From e32302c1a62f5b0736826bc3e241a705097ba223 Mon Sep 17 00:00:00 2001
From: Olivier Ortigues <o.ortigues@gmail.com>
Date: Wed, 22 Apr 2020 13:57:54 +0200
Subject: [PATCH 0001/3533] esp8266/esppwm: Fix PWM glitch when setting duty on
 different channel.

The PWM driver uses a double buffer for the PWM timing array, one in
current use and the other one to update when changing duty parameters.
The issue was that once the duty parameters were changed the updated buffer
was applied immediately without synchronising to the start of the PWM
period.  By moving the buffer toggling/swapping to the interrupt when the
cycle is done there are no more glitches.
---
 ports/esp8266/esppwm.c | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/ports/esp8266/esppwm.c b/ports/esp8266/esppwm.c
index 6116a468957fa..d5bcea9acd8cc 100644
--- a/ports/esp8266/esppwm.c
+++ b/ports/esp8266/esppwm.c
@@ -57,6 +57,7 @@ STATIC uint8_t pwm_timer_down = 1;
 STATIC uint8_t pwm_current_channel = 0;
 STATIC uint16_t pwm_gpio = 0;
 STATIC uint8_t pwm_channel_num = 0;
+STATIC volatile uint8_t pwm_toggle_request = 0;
 
 // XXX: 0xffffffff/(80000000/16)=35A
 #define US_TO_RTC_TIMER_TICKS(t)          \
@@ -126,6 +127,9 @@ pwm_start(void) {
 
     LOCK_PWM(critical);   // enter critical
 
+    // if a toggle is pending, we reset it since we're changing the settings again
+    pwm_toggle_request = 0;
+
     struct pwm_single_param *local_single = pwm_single_toggle[pwm_toggle ^ 0x01];
     uint8 *local_channel = &pwm_channel_toggle[pwm_toggle ^ 0x01];
 
@@ -188,14 +192,14 @@ pwm_start(void) {
         // start
         gpio_output_set(local_single[0].gpio_set, local_single[0].gpio_clear, pwm_gpio, 0);
 
+        // do the first toggle because timer has to have a valid set to do it's job
+        pwm_toggle ^= 0x01;
+
         pwm_timer_down = 0;
         RTC_REG_WRITE(FRC1_LOAD_ADDRESS, local_single[0].h_time);
-    }
-
-    if (pwm_toggle == 1) {
-        pwm_toggle = 0;
     } else {
-        pwm_toggle = 1;
+        // request pwm_tim1_intr_handler to swap the timing buffers
+        pwm_toggle_request = 1;
     }
 
     UNLOCK_PWM(critical);   // leave critical
@@ -297,12 +301,18 @@ pwm_get_freq(uint8 channel) {
 STATIC void ICACHE_RAM_ATTR
 pwm_tim1_intr_handler(void *dummy) {
     (void)dummy;
-    uint8 local_toggle = pwm_toggle;                        // pwm_toggle may change outside
+
     RTC_CLR_REG_MASK(FRC1_INT_ADDRESS, FRC1_INT_CLR_MASK);
 
     if (pwm_current_channel >= (*pwm_channel - 1)) {        // *pwm_channel may change outside
-        pwm_single = pwm_single_toggle[local_toggle];
-        pwm_channel = &pwm_channel_toggle[local_toggle];
+
+        if (pwm_toggle_request != 0) {
+            pwm_toggle ^= 1;
+            pwm_toggle_request = 0;
+        }
+
+        pwm_single = pwm_single_toggle[pwm_toggle];
+        pwm_channel = &pwm_channel_toggle[pwm_toggle];
 
         gpio_output_set(pwm_single[*pwm_channel - 1].gpio_set,
             pwm_single[*pwm_channel - 1].gpio_clear,

From b3bc9808f2d1396a946ae899b7d81d043eac1ddd Mon Sep 17 00:00:00 2001
From: Albort Xue <yao.xue@nxp.com>
Date: Thu, 7 May 2020 16:47:48 +0800
Subject: [PATCH 0002/3533] mimxrt/boards: Add MIMXRT1060_EVK board.

---
 .../evkmimxrt1060_flexspi_nor_config.h        | 268 ++++++++++++++++++
 .../boards/MIMXRT1060_EVK/flash_config.c      |  48 ++++
 .../boards/MIMXRT1060_EVK/mpconfigboard.h     |   8 +
 .../boards/MIMXRT1060_EVK/mpconfigboard.mk    |   7 +
 4 files changed, 331 insertions(+)
 create mode 100644 ports/mimxrt/boards/MIMXRT1060_EVK/evkmimxrt1060_flexspi_nor_config.h
 create mode 100644 ports/mimxrt/boards/MIMXRT1060_EVK/flash_config.c
 create mode 100644 ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.h
 create mode 100644 ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.mk

diff --git a/ports/mimxrt/boards/MIMXRT1060_EVK/evkmimxrt1060_flexspi_nor_config.h b/ports/mimxrt/boards/MIMXRT1060_EVK/evkmimxrt1060_flexspi_nor_config.h
new file mode 100644
index 0000000000000..8bb771fd8ad44
--- /dev/null
+++ b/ports/mimxrt/boards/MIMXRT1060_EVK/evkmimxrt1060_flexspi_nor_config.h
@@ -0,0 +1,268 @@
+/*
+ * Copyright 2018 NXP
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#ifndef __EVKMIMXRT1060_FLEXSPI_NOR_CONFIG__
+#define __EVKMIMXRT1060_FLEXSPI_NOR_CONFIG__
+
+#include <stdint.h>
+#include <stdbool.h>
+#include "fsl_common.h"
+
+/*! @name Driver version */
+/*@{*/
+/*! @brief XIP_BOARD driver version 2.0.0. */
+#define FSL_XIP_BOARD_DRIVER_VERSION (MAKE_VERSION(2, 0, 0))
+/*@}*/
+
+/* FLEXSPI memory config block related defintions */
+#define FLEXSPI_CFG_BLK_TAG     (0x42464346UL) // ascii "FCFB" Big Endian
+#define FLEXSPI_CFG_BLK_VERSION (0x56010400UL) // V1.4.0
+#define FLEXSPI_CFG_BLK_SIZE    (512)
+
+/* FLEXSPI Feature related definitions */
+#define FLEXSPI_FEATURE_HAS_PARALLEL_MODE 1
+
+/* Lookup table related defintions */
+#define CMD_INDEX_READ        0
+#define CMD_INDEX_READSTATUS  1
+#define CMD_INDEX_WRITEENABLE 2
+#define CMD_INDEX_WRITE       4
+
+#define CMD_LUT_SEQ_IDX_READ        0
+#define CMD_LUT_SEQ_IDX_READSTATUS  1
+#define CMD_LUT_SEQ_IDX_WRITEENABLE 3
+#define CMD_LUT_SEQ_IDX_WRITE       9
+
+#define CMD_SDR        0x01
+#define CMD_DDR        0x21
+#define RADDR_SDR      0x02
+#define RADDR_DDR      0x22
+#define CADDR_SDR      0x03
+#define CADDR_DDR      0x23
+#define MODE1_SDR      0x04
+#define MODE1_DDR      0x24
+#define MODE2_SDR      0x05
+#define MODE2_DDR      0x25
+#define MODE4_SDR      0x06
+#define MODE4_DDR      0x26
+#define MODE8_SDR      0x07
+#define MODE8_DDR      0x27
+#define WRITE_SDR      0x08
+#define WRITE_DDR      0x28
+#define READ_SDR       0x09
+#define READ_DDR       0x29
+#define LEARN_SDR      0x0A
+#define LEARN_DDR      0x2A
+#define DATSZ_SDR      0x0B
+#define DATSZ_DDR      0x2B
+#define DUMMY_SDR      0x0C
+#define DUMMY_DDR      0x2C
+#define DUMMY_RWDS_SDR 0x0D
+#define DUMMY_RWDS_DDR 0x2D
+#define JMP_ON_CS      0x1F
+#define STOP           0
+
+#define FLEXSPI_1PAD 0
+#define FLEXSPI_2PAD 1
+#define FLEXSPI_4PAD 2
+#define FLEXSPI_8PAD 3
+
+#define FLEXSPI_LUT_SEQ(cmd0, pad0, op0, cmd1, pad1, op1)                                                              \
+    (FLEXSPI_LUT_OPERAND0(op0) | FLEXSPI_LUT_NUM_PADS0(pad0) | FLEXSPI_LUT_OPCODE0(cmd0) | FLEXSPI_LUT_OPERAND1(op1) | \
+     FLEXSPI_LUT_NUM_PADS1(pad1) | FLEXSPI_LUT_OPCODE1(cmd1))
+
+//!@brief Definitions for FlexSPI Serial Clock Frequency
+typedef enum _FlexSpiSerialClockFreq
+{
+    kFlexSpiSerialClk_30MHz  = 1,
+    kFlexSpiSerialClk_50MHz  = 2,
+    kFlexSpiSerialClk_60MHz  = 3,
+    kFlexSpiSerialClk_75MHz  = 4,
+    kFlexSpiSerialClk_80MHz  = 5,
+    kFlexSpiSerialClk_100MHz = 6,
+    kFlexSpiSerialClk_120MHz = 7,
+    kFlexSpiSerialClk_133MHz = 8,
+    kFlexSpiSerialClk_166MHz = 9,
+} flexspi_serial_clk_freq_t;
+
+//!@brief FlexSPI clock configuration type
+enum
+{
+    kFlexSpiClk_SDR, //!< Clock configure for SDR mode
+    kFlexSpiClk_DDR, //!< Clock configurat for DDR mode
+};
+
+//!@brief FlexSPI Read Sample Clock Source definition
+typedef enum _FlashReadSampleClkSource
+{
+    kFlexSPIReadSampleClk_LoopbackInternally      = 0,
+    kFlexSPIReadSampleClk_LoopbackFromDqsPad      = 1,
+    kFlexSPIReadSampleClk_LoopbackFromSckPad      = 2,
+    kFlexSPIReadSampleClk_ExternalInputFromDqsPad = 3,
+} flexspi_read_sample_clk_t;
+
+//!@brief Misc feature bit definitions
+enum
+{
+    kFlexSpiMiscOffset_DiffClkEnable            = 0, //!< Bit for Differential clock enable
+    kFlexSpiMiscOffset_Ck2Enable                = 1, //!< Bit for CK2 enable
+    kFlexSpiMiscOffset_ParallelEnable           = 2, //!< Bit for Parallel mode enable
+    kFlexSpiMiscOffset_WordAddressableEnable    = 3, //!< Bit for Word Addressable enable
+    kFlexSpiMiscOffset_SafeConfigFreqEnable     = 4, //!< Bit for Safe Configuration Frequency enable
+    kFlexSpiMiscOffset_PadSettingOverrideEnable = 5, //!< Bit for Pad setting override enable
+    kFlexSpiMiscOffset_DdrModeEnable            = 6, //!< Bit for DDR clock confiuration indication.
+};
+
+//!@brief Flash Type Definition
+enum
+{
+    kFlexSpiDeviceType_SerialNOR    = 1,    //!< Flash devices are Serial NOR
+    kFlexSpiDeviceType_SerialNAND   = 2,    //!< Flash devices are Serial NAND
+    kFlexSpiDeviceType_SerialRAM    = 3,    //!< Flash devices are Serial RAM/HyperFLASH
+    kFlexSpiDeviceType_MCP_NOR_NAND = 0x12, //!< Flash device is MCP device, A1 is Serial NOR, A2 is Serial NAND
+    kFlexSpiDeviceType_MCP_NOR_RAM  = 0x13, //!< Flash deivce is MCP device, A1 is Serial NOR, A2 is Serial RAMs
+};
+
+//!@brief Flash Pad Definitions
+enum
+{
+    kSerialFlash_1Pad  = 1,
+    kSerialFlash_2Pads = 2,
+    kSerialFlash_4Pads = 4,
+    kSerialFlash_8Pads = 8,
+};
+
+//!@brief FlexSPI LUT Sequence structure
+typedef struct _lut_sequence
+{
+    uint8_t seqNum; //!< Sequence Number, valid number: 1-16
+    uint8_t seqId;  //!< Sequence Index, valid number: 0-15
+    uint16_t reserved;
+} flexspi_lut_seq_t;
+
+//!@brief Flash Configuration Command Type
+enum
+{
+    kDeviceConfigCmdType_Generic,    //!< Generic command, for example: configure dummy cycles, drive strength, etc
+    kDeviceConfigCmdType_QuadEnable, //!< Quad Enable command
+    kDeviceConfigCmdType_Spi2Xpi,    //!< Switch from SPI to DPI/QPI/OPI mode
+    kDeviceConfigCmdType_Xpi2Spi,    //!< Switch from DPI/QPI/OPI to SPI mode
+    kDeviceConfigCmdType_Spi2NoCmd,  //!< Switch to 0-4-4/0-8-8 mode
+    kDeviceConfigCmdType_Reset,      //!< Reset device command
+};
+
+//!@brief FlexSPI Memory Configuration Block
+typedef struct _FlexSPIConfig
+{
+    uint32_t tag;               //!< [0x000-0x003] Tag, fixed value 0x42464346UL
+    uint32_t version;           //!< [0x004-0x007] Version,[31:24] -'V', [23:16] - Major, [15:8] - Minor, [7:0] - bugfix
+    uint32_t reserved0;         //!< [0x008-0x00b] Reserved for future use
+    uint8_t readSampleClkSrc;   //!< [0x00c-0x00c] Read Sample Clock Source, valid value: 0/1/3
+    uint8_t csHoldTime;         //!< [0x00d-0x00d] CS hold time, default value: 3
+    uint8_t csSetupTime;        //!< [0x00e-0x00e] CS setup time, default value: 3
+    uint8_t columnAddressWidth; //!< [0x00f-0x00f] Column Address with, for HyperBus protocol, it is fixed to 3, For
+    //! Serial NAND, need to refer to datasheet
+    uint8_t deviceModeCfgEnable; //!< [0x010-0x010] Device Mode Configure enable flag, 1 - Enable, 0 - Disable
+    uint8_t deviceModeType; //!< [0x011-0x011] Specify the configuration command type:Quad Enable, DPI/QPI/OPI switch,
+    //! Generic configuration, etc.
+    uint16_t waitTimeCfgCommands; //!< [0x012-0x013] Wait time for all configuration commands, unit: 100us, Used for
+    //! DPI/QPI/OPI switch or reset command
+    flexspi_lut_seq_t deviceModeSeq; //!< [0x014-0x017] Device mode sequence info, [7:0] - LUT sequence id, [15:8] - LUt
+    //! sequence number, [31:16] Reserved
+    uint32_t deviceModeArg;    //!< [0x018-0x01b] Argument/Parameter for device configuration
+    uint8_t configCmdEnable;   //!< [0x01c-0x01c] Configure command Enable Flag, 1 - Enable, 0 - Disable
+    uint8_t configModeType[3]; //!< [0x01d-0x01f] Configure Mode Type, similar as deviceModeTpe
+    flexspi_lut_seq_t
+        configCmdSeqs[3]; //!< [0x020-0x02b] Sequence info for Device Configuration command, similar as deviceModeSeq
+    uint32_t reserved1;   //!< [0x02c-0x02f] Reserved for future use
+    uint32_t configCmdArgs[3];     //!< [0x030-0x03b] Arguments/Parameters for device Configuration commands
+    uint32_t reserved2;            //!< [0x03c-0x03f] Reserved for future use
+    uint32_t controllerMiscOption; //!< [0x040-0x043] Controller Misc Options, see Misc feature bit definitions for more
+    //! details
+    uint8_t deviceType;    //!< [0x044-0x044] Device Type:  See Flash Type Definition for more details
+    uint8_t sflashPadType; //!< [0x045-0x045] Serial Flash Pad Type: 1 - Single, 2 - Dual, 4 - Quad, 8 - Octal
+    uint8_t serialClkFreq; //!< [0x046-0x046] Serial Flash Frequencey, device specific definitions, See System Boot
+    //! Chapter for more details
+    uint8_t lutCustomSeqEnable; //!< [0x047-0x047] LUT customization Enable, it is required if the program/erase cannot
+    //! be done using 1 LUT sequence, currently, only applicable to HyperFLASH
+    uint32_t reserved3[2];           //!< [0x048-0x04f] Reserved for future use
+    uint32_t sflashA1Size;           //!< [0x050-0x053] Size of Flash connected to A1
+    uint32_t sflashA2Size;           //!< [0x054-0x057] Size of Flash connected to A2
+    uint32_t sflashB1Size;           //!< [0x058-0x05b] Size of Flash connected to B1
+    uint32_t sflashB2Size;           //!< [0x05c-0x05f] Size of Flash connected to B2
+    uint32_t csPadSettingOverride;   //!< [0x060-0x063] CS pad setting override value
+    uint32_t sclkPadSettingOverride; //!< [0x064-0x067] SCK pad setting override value
+    uint32_t dataPadSettingOverride; //!< [0x068-0x06b] data pad setting override value
+    uint32_t dqsPadSettingOverride;  //!< [0x06c-0x06f] DQS pad setting override value
+    uint32_t timeoutInMs;            //!< [0x070-0x073] Timeout threshold for read status command
+    uint32_t commandInterval;        //!< [0x074-0x077] CS deselect interval between two commands
+    uint16_t dataValidTime[2]; //!< [0x078-0x07b] CLK edge to data valid time for PORT A and PORT B, in terms of 0.1ns
+    uint16_t busyOffset;       //!< [0x07c-0x07d] Busy offset, valid value: 0-31
+    uint16_t busyBitPolarity;  //!< [0x07e-0x07f] Busy flag polarity, 0 - busy flag is 1 when flash device is busy, 1 -
+    //! busy flag is 0 when flash device is busy
+    uint32_t lookupTable[64];           //!< [0x080-0x17f] Lookup table holds Flash command sequences
+    flexspi_lut_seq_t lutCustomSeq[12]; //!< [0x180-0x1af] Customizable LUT Sequences
+    uint32_t reserved4[4];              //!< [0x1b0-0x1bf] Reserved for future use
+} flexspi_mem_config_t;
+
+/*  */
+#define NOR_CMD_INDEX_READ        CMD_INDEX_READ        //!< 0
+#define NOR_CMD_INDEX_READSTATUS  CMD_INDEX_READSTATUS  //!< 1
+#define NOR_CMD_INDEX_WRITEENABLE CMD_INDEX_WRITEENABLE //!< 2
+#define NOR_CMD_INDEX_ERASESECTOR 3                     //!< 3
+#define NOR_CMD_INDEX_PAGEPROGRAM CMD_INDEX_WRITE       //!< 4
+#define NOR_CMD_INDEX_CHIPERASE   5                     //!< 5
+#define NOR_CMD_INDEX_DUMMY       6                     //!< 6
+#define NOR_CMD_INDEX_ERASEBLOCK  7                     //!< 7
+
+#define NOR_CMD_LUT_SEQ_IDX_READ CMD_LUT_SEQ_IDX_READ //!< 0  READ LUT sequence id in lookupTable stored in config block
+#define NOR_CMD_LUT_SEQ_IDX_READSTATUS \
+    CMD_LUT_SEQ_IDX_READSTATUS //!< 1  Read Status LUT sequence id in lookupTable stored in config block
+#define NOR_CMD_LUT_SEQ_IDX_READSTATUS_XPI \
+    2 //!< 2  Read status DPI/QPI/OPI sequence id in lookupTable stored in config block
+#define NOR_CMD_LUT_SEQ_IDX_WRITEENABLE \
+    CMD_LUT_SEQ_IDX_WRITEENABLE //!< 3  Write Enable sequence id in lookupTable stored in config block
+#define NOR_CMD_LUT_SEQ_IDX_WRITEENABLE_XPI \
+    4 //!< 4  Write Enable DPI/QPI/OPI sequence id in lookupTable stored in config block
+#define NOR_CMD_LUT_SEQ_IDX_ERASESECTOR 5 //!< 5  Erase Sector sequence id in lookupTable stored in config block
+#define NOR_CMD_LUT_SEQ_IDX_ERASEBLOCK  8 //!< 8 Erase Block sequence id in lookupTable stored in config block
+#define NOR_CMD_LUT_SEQ_IDX_PAGEPROGRAM \
+    CMD_LUT_SEQ_IDX_WRITE                //!< 9  Program sequence id in lookupTable stored in config block
+#define NOR_CMD_LUT_SEQ_IDX_CHIPERASE 11 //!< 11 Chip Erase sequence in lookupTable id stored in config block
+#define NOR_CMD_LUT_SEQ_IDX_READ_SFDP 13 //!< 13 Read SFDP sequence in lookupTable id stored in config block
+#define NOR_CMD_LUT_SEQ_IDX_RESTORE_NOCMD \
+    14 //!< 14 Restore 0-4-4/0-8-8 mode sequence id in lookupTable stored in config block
+#define NOR_CMD_LUT_SEQ_IDX_EXIT_NOCMD \
+    15 //!< 15 Exit 0-4-4/0-8-8 mode sequence id in lookupTable stored in config blobk
+
+/*
+ *  Serial NOR configuration block
+ */
+typedef struct _flexspi_nor_config
+{
+    flexspi_mem_config_t memConfig; //!< Common memory configuration info via FlexSPI
+    uint32_t pageSize;              //!< Page size of Serial NOR
+    uint32_t sectorSize;            //!< Sector size of Serial NOR
+    uint8_t ipcmdSerialClkFreq;     //!< Clock frequency for IP command
+    uint8_t isUniformBlockSize;     //!< Sector/Block size is the same
+    uint8_t reserved0[2];           //!< Reserved for future use
+    uint8_t serialNorType;          //!< Serial NOR Flash type: 0/1/2/3
+    uint8_t needExitNoCmdMode;      //!< Need to exit NoCmd mode before other IP command
+    uint8_t halfClkForNonReadCmd;   //!< Half the Serial Clock for non-read command: true/false
+    uint8_t needRestoreNoCmdMode;   //!< Need to Restore NoCmd mode after IP commmand execution
+    uint32_t blockSize;             //!< Block size
+    uint32_t reserve2[11];          //!< Reserved for future use
+} flexspi_nor_config_t;
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* __EVKMIMXRT1060_FLEXSPI_NOR_CONFIG__ */
diff --git a/ports/mimxrt/boards/MIMXRT1060_EVK/flash_config.c b/ports/mimxrt/boards/MIMXRT1060_EVK/flash_config.c
new file mode 100644
index 0000000000000..095a922e9efe1
--- /dev/null
+++ b/ports/mimxrt/boards/MIMXRT1060_EVK/flash_config.c
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2018 NXP
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#include "evkmimxrt1060_flexspi_nor_config.h"
+
+/* Component ID definition, used by tools. */
+#ifndef FSL_COMPONENT_ID
+#define FSL_COMPONENT_ID "platform.drivers.xip_board"
+#endif
+
+/*******************************************************************************
+ * Code
+ ******************************************************************************/
+#if defined(XIP_BOOT_HEADER_ENABLE) && (XIP_BOOT_HEADER_ENABLE == 1)
+#if defined(__CC_ARM) || defined(__ARMCC_VERSION) || defined(__GNUC__)
+__attribute__((section(".boot_hdr.conf")))
+#elif defined(__ICCARM__)
+#pragma location = ".boot_hdr.conf"
+#endif
+
+const flexspi_nor_config_t qspiflash_config = {
+    .memConfig =
+        {
+            .tag              = FLEXSPI_CFG_BLK_TAG,
+            .version          = FLEXSPI_CFG_BLK_VERSION,
+            .readSampleClkSrc = kFlexSPIReadSampleClk_LoopbackFromDqsPad,
+            .csHoldTime       = 3u,
+            .csSetupTime      = 3u,
+            .sflashPadType    = kSerialFlash_4Pads,
+            .serialClkFreq    = kFlexSpiSerialClk_100MHz,
+            .sflashA1Size     = 8u * 1024u * 1024u,
+            .lookupTable =
+                {
+                    // Read LUTs
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0xEB, RADDR_SDR, FLEXSPI_4PAD, 0x18),
+                    FLEXSPI_LUT_SEQ(DUMMY_SDR, FLEXSPI_4PAD, 0x06, READ_SDR, FLEXSPI_4PAD, 0x04),
+                },
+        },
+    .pageSize           = 256u,
+    .sectorSize         = 4u * 1024u,
+    .blockSize          = 64u * 1024u,
+    .isUniformBlockSize = false,
+};
+#endif /* XIP_BOOT_HEADER_ENABLE */
diff --git a/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.h b/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.h
new file mode 100644
index 0000000000000..714f987a54c9d
--- /dev/null
+++ b/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.h
@@ -0,0 +1,8 @@
+#define MICROPY_HW_BOARD_NAME "i.MX RT1060 EVK"
+#define MICROPY_HW_MCU_NAME   "MIMXRT1062DVJ6A"
+
+#define BOARD_FLASH_SIZE (8 * 1024 * 1024)
+
+#define MICROPY_HW_LED_PINMUX  IOMUXC_GPIO_AD_B0_09_GPIO1_IO09
+#define MICROPY_HW_LED_PORT    GPIO1
+#define MICROPY_HW_LED_PIN     9
diff --git a/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.mk b/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.mk
new file mode 100644
index 0000000000000..b34169801b900
--- /dev/null
+++ b/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.mk
@@ -0,0 +1,7 @@
+MCU_SERIES = MIMXRT1062
+MCU_VARIANT = MIMXRT1062DVJ6A
+
+JLINK_PATH ?= /media/RT1060-EVK/
+
+deploy: $(BUILD)/firmware.bin
+	cp $< $(JLINK_PATH)

From 25bc42e754e76f7dd45048bcfb139fdba22e3e29 Mon Sep 17 00:00:00 2001
From: Joel Stanley <joel@jms.id.au>
Date: Tue, 26 May 2020 13:08:35 +0930
Subject: [PATCH 0003/3533] powerpc: Fix Makefile rule when linking.

The linker script was included in the "$^" inputs, causing the build to
fail:

 LINK build/firmware.elf
 powerpc64le-linux-gnu-ld: error: linker script file 'powerpc.lds' appears multiple times

As a fix the linker script is left as a dependency of the elf, but only the
object files are linked.
---
 ports/powerpc/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/powerpc/Makefile b/ports/powerpc/Makefile
index 7aa4f1449c508..2e4dd0fd0261c 100644
--- a/ports/powerpc/Makefile
+++ b/ports/powerpc/Makefile
@@ -52,7 +52,7 @@ $(BUILD)/_frozen_mpy.c: frozentest.mpy $(BUILD)/genhdr/qstrdefs.generated.h
 
 $(BUILD)/firmware.elf: $(OBJ) powerpc.lds
 	$(ECHO) "LINK $@"
-	$(Q)$(LD) $(LDFLAGS) -o $@ $^ $(LIBS)
+	$(Q)$(LD) $(LDFLAGS) -o $@ $(OBJ) $(LIBS)
 	$(Q)$(SIZE) $@
 
 $(BUILD)/firmware.bin: $(BUILD)/firmware.elf

From b65482ffa8715f3eeeb593e26d96d80bd77e0dfd Mon Sep 17 00:00:00 2001
From: Joel Stanley <joel@jms.id.au>
Date: Tue, 26 May 2020 13:07:09 +0930
Subject: [PATCH 0004/3533] powerpc: Set better default compiler.

Most developers use a compiler which is called powerpc64le-linux-gnu-gcc.
---
 ports/powerpc/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/powerpc/Makefile b/ports/powerpc/Makefile
index 2e4dd0fd0261c..5f17a93557e5c 100644
--- a/ports/powerpc/Makefile
+++ b/ports/powerpc/Makefile
@@ -9,7 +9,7 @@ include $(TOP)/py/py.mk
 ARCH = $(shell uname -m)
 ifneq ("$(ARCH)", "ppc64")
 ifneq ("$(ARCH)", "ppc64le")
-	CROSS_COMPILE ?= powerpc64le-linux-
+	CROSS_COMPILE ?= powerpc64le-linux-gnu-
 endif
 endif
 

From a9d96499b8f7310b9e43b4a8cda2f6e17cbd4248 Mon Sep 17 00:00:00 2001
From: Joel Stanley <joel@jms.id.au>
Date: Tue, 26 May 2020 13:24:19 +0930
Subject: [PATCH 0005/3533] travis: Run apt commands once, to slightly speed up
 the CI.

---
 .travis.yml | 23 +++++++----------------
 1 file changed, 7 insertions(+), 16 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 5460bf601f484..84f58625640bc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -64,8 +64,7 @@ jobs:
         # need newer gcc version for Cortex-M7 support
         - sudo add-apt-repository -y ppa:team-gcc-arm-embedded/ppa
         - sudo apt-get update -qq || true
-        - sudo apt-get install gcc-arm-embedded
-        - sudo apt-get install libnewlib-arm-none-eabi
+        - sudo apt-get install gcc-arm-embedded libnewlib-arm-none-eabi
         - arm-none-eabi-gcc --version
       script:
         - make ${MAKEOPTS} -C mpy-cross
@@ -86,9 +85,7 @@ jobs:
       dist: bionic # needed for more recent version of qemu-system-arm with mps2-an385 target
       env: NAME="qemu-arm port build and tests"
       install:
-        - sudo apt-get install gcc-arm-none-eabi
-        - sudo apt-get install libnewlib-arm-none-eabi
-        - sudo apt-get install qemu-system
+        - sudo apt-get install gcc-arm-none-eabi libnewlib-arm-none-eabi qemu-system
         - arm-none-eabi-gcc --version
         - qemu-system-arm --version
       script:
@@ -304,9 +301,7 @@ jobs:
     - stage: test
       env: NAME="bare-arm and minimal ports build and size-diff check"
       install:
-        - sudo apt-get install gcc-multilib libffi-dev:i386
-        - sudo apt-get install gcc-arm-none-eabi
-        - sudo apt-get install libnewlib-arm-none-eabi
+        - sudo apt-get install gcc-multilib libffi-dev:i386 gcc-arm-none-eabi libnewlib-arm-none-eabi
         - gcc --version
         - arm-none-eabi-gcc --version
       script:
@@ -332,8 +327,7 @@ jobs:
     - stage: test
       env: NAME="cc3200 port build"
       install:
-        - sudo apt-get install gcc-arm-none-eabi
-        - sudo apt-get install libnewlib-arm-none-eabi
+        - sudo apt-get install gcc-arm-none-eabi libnewlib-arm-none-eabi
       script:
         - make ${MAKEOPTS} -C ports/cc3200 BTARGET=application BTYPE=release
         - make ${MAKEOPTS} -C ports/cc3200 BTARGET=bootloader  BTYPE=release
@@ -342,8 +336,7 @@ jobs:
     - stage: test
       env: NAME="samd port build"
       install:
-        - sudo apt-get install gcc-arm-none-eabi
-        - sudo apt-get install libnewlib-arm-none-eabi
+        - sudo apt-get install gcc-arm-none-eabi libnewlib-arm-none-eabi
       script:
         - make ${MAKEOPTS} -C ports/samd submodules
         - make ${MAKEOPTS} -C ports/samd
@@ -352,8 +345,7 @@ jobs:
     - stage: test
       env: NAME="teensy port build"
       install:
-        - sudo apt-get install gcc-arm-none-eabi
-        - sudo apt-get install libnewlib-arm-none-eabi
+        - sudo apt-get install gcc-arm-none-eabi libnewlib-arm-none-eabi
       script:
         - make ${MAKEOPTS} -C ports/teensy
 
@@ -361,7 +353,6 @@ jobs:
     - stage: test
       env: NAME="powerpc port build"
       install:
-        - sudo apt-get install gcc-powerpc64le-linux-gnu
-        - sudo apt-get install libc6-dev-ppc64el-cross
+        - sudo apt-get install gcc-powerpc64le-linux-gnu libc6-dev-ppc64el-cross
       script:
         - make ${MAKEOPTS} -C ports/powerpc CROSS_COMPILE=powerpc64le-linux-gnu-

From d6803067c0a15c03af0639aa02b68898a3f9cc81 Mon Sep 17 00:00:00 2001
From: Joel Stanley <joel@jms.id.au>
Date: Tue, 26 May 2020 13:27:33 +0930
Subject: [PATCH 0006/3533] travis: Set build name so it appears in the web
 interfaces.

The env NAME="foo" syntax doesn't appear to set the name in the Travis web
interface.  Instead use the syntax from the docs:

 https://docs.travis-ci.com/user/build-stages/#naming-your-jobs-within-build-stages
---
 .travis.yml | 42 +++++++++++++++++++++---------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 84f58625640bc..133035949d484 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,7 +25,7 @@ jobs:
     - stage: test
       os: linux
       dist: bionic
-      env: NAME="code formatting"
+      name: "code formatting"
       before_install:
         - sudo apt-add-repository --yes --update ppa:pybricks/ppa
       install:
@@ -41,8 +41,8 @@ jobs:
     - stage: test
       os: osx
       osx_image: xcode11.3
+      name: "unix port build with clang on OSX"
       env:
-        - NAME="unix port build with clang on OSX"
         - PKG_CONFIG_PATH=/usr/local/opt/libffi/lib/pkgconfig
       script:
         - make ${MAKEOPTS} -C mpy-cross
@@ -59,7 +59,7 @@ jobs:
 
     # stm32 port
     - stage: test
-      env: NAME="stm32 port build"
+      name: "stm32 port build"
       install:
         # need newer gcc version for Cortex-M7 support
         - sudo add-apt-repository -y ppa:team-gcc-arm-embedded/ppa
@@ -83,7 +83,7 @@ jobs:
     # qemu-arm port
     - stage: test
       dist: bionic # needed for more recent version of qemu-system-arm with mps2-an385 target
-      env: NAME="qemu-arm port build and tests"
+      name: "qemu-arm port build and tests"
       install:
         - sudo apt-get install gcc-arm-none-eabi libnewlib-arm-none-eabi qemu-system
         - arm-none-eabi-gcc --version
@@ -96,7 +96,7 @@ jobs:
 
     # unix coverage
     - stage: test
-      env: NAME="unix coverage build and tests"
+      name: "unix coverage build and tests"
       install:
         - sudo apt-get install python3-pip
         - sudo pip install cpp-coveralls
@@ -131,7 +131,7 @@ jobs:
 
     # unix coverage 32-bit
     - stage: test
-      env: NAME="unix coverage 32-bit build and tests"
+      name: "unix coverage 32-bit build and tests"
       install:
         - sudo apt-get install gcc-multilib libffi-dev:i386
         - sudo apt-get install python3-pip
@@ -163,7 +163,7 @@ jobs:
 
     # standard unix port
     - stage: test
-      env: NAME="unix port build and tests"
+      name: "unix port build and tests"
       script:
         - make ${MAKEOPTS} -C mpy-cross
         - make ${MAKEOPTS} -C ports/unix submodules
@@ -176,7 +176,7 @@ jobs:
 
     # unix nanbox/float (and using Python 2 to check it can run the build scripts)
     - stage: test
-      env: NAME="unix nanbox/float port build and tests"
+      name: "unix nanbox/float port build and tests"
       install:
         - sudo apt-get install gcc-multilib libffi-dev:i386
       script:
@@ -193,7 +193,7 @@ jobs:
 
     # unix stackless/float with clang
     - stage: test
-      env: NAME="unix stackless/float port build and tests with clang"
+      name: "unix stackless/float port build and tests with clang"
       install:
         - sudo apt-get install clang
       script:
@@ -209,7 +209,7 @@ jobs:
 
     # unix with sys.settrace
     - stage: test
-      env: NAME="unix port with sys.settrace build and tests"
+      name: "unix port with sys.settrace build and tests"
       script:
         - make ${MAKEOPTS} -C mpy-cross
         - make ${MAKEOPTS} -C ports/unix MICROPY_PY_BTREE=0 MICROPY_PY_FFI=0 MICROPY_PY_USSL=0 CFLAGS_EXTRA="-DMICROPY_PY_SYS_SETTRACE=1" test || travis_terminate 1
@@ -220,7 +220,7 @@ jobs:
 
     # minimal unix port with tests
     - stage: test
-      env: NAME="minimal unix port build and tests"
+      name: "minimal unix port build and tests"
       script:
         - make ${MAKEOPTS} -C ports/unix VARIANT=minimal
         - (cd tests && MICROPY_CPYTHON3=python3 MICROPY_MICROPYTHON=../ports/unix/micropython-minimal ./run-tests -e exception_chain -e self_type_check -e subclass_native_init -d basics)
@@ -229,7 +229,7 @@ jobs:
 
     # windows port via mingw
     - stage: test
-      env: NAME="windows port build via mingw"
+      name: "windows port build via mingw"
       install:
         - sudo apt-get install gcc-mingw-w64
       script:
@@ -238,7 +238,7 @@ jobs:
 
     # esp32 w/ESP-IDFv3 port
     - stage: test
-      env: NAME="esp32 ESP-IDFv3 port build"
+      name: "esp32 ESP-IDFv3 port build"
       install:
         - sudo apt-get install python3-pip
         - sudo pip3 install 'pyparsing<2.4'
@@ -255,7 +255,7 @@ jobs:
 
     # esp32 w/ESP-IDFv4 port
     - stage: test
-      env: NAME="esp32 ESP-IDFv4 port build"
+      name: "esp32 ESP-IDFv4 port build"
       install:
         - sudo apt-get install python3-pip
         - sudo pip3 install 'pyparsing<2.4'
@@ -272,7 +272,7 @@ jobs:
 
     # esp8266 port
     - stage: test
-      env: NAME="esp8266 port build"
+      name: "esp8266 port build"
       install:
         - wget https://github.com/jepler/esp-open-sdk/releases/download/2018-06-10/xtensa-lx106-elf-standalone.tar.gz
         - zcat xtensa-lx106-elf-standalone.tar.gz | tar x
@@ -286,7 +286,7 @@ jobs:
 
     # nrf port
     - stage: test
-      env: NAME="nrf port build"
+      name: "nrf port build"
       install:
         - sudo apt-get install gcc-arm-none-eabi
         - sudo apt-get install libnewlib-arm-none-eabi
@@ -299,7 +299,7 @@ jobs:
 
     # bare-arm and minimal ports, with size-diff check
     - stage: test
-      env: NAME="bare-arm and minimal ports build and size-diff check"
+      name: "bare-arm and minimal ports build and size-diff check"
       install:
         - sudo apt-get install gcc-multilib libffi-dev:i386 gcc-arm-none-eabi libnewlib-arm-none-eabi
         - gcc --version
@@ -325,7 +325,7 @@ jobs:
 
     # cc3200 port
     - stage: test
-      env: NAME="cc3200 port build"
+      name: "cc3200 port build"
       install:
         - sudo apt-get install gcc-arm-none-eabi libnewlib-arm-none-eabi
       script:
@@ -334,7 +334,7 @@ jobs:
 
     # samd port
     - stage: test
-      env: NAME="samd port build"
+      name: "samd port build"
       install:
         - sudo apt-get install gcc-arm-none-eabi libnewlib-arm-none-eabi
       script:
@@ -343,7 +343,7 @@ jobs:
 
     # teensy port
     - stage: test
-      env: NAME="teensy port build"
+      name: "teensy port build"
       install:
         - sudo apt-get install gcc-arm-none-eabi libnewlib-arm-none-eabi
       script:
@@ -351,7 +351,7 @@ jobs:
 
     # powerpc port
     - stage: test
-      env: NAME="powerpc port build"
+      name: "powerpc port build"
       install:
         - sudo apt-get install gcc-powerpc64le-linux-gnu libc6-dev-ppc64el-cross
       script:

From 4bbba3060d451d4dfa147ebc793acd1cc7364e5a Mon Sep 17 00:00:00 2001
From: Damien George <damien.p.george@gmail.com>
Date: Wed, 27 May 2020 17:53:31 +1000
Subject: [PATCH 0007/3533] lib/utils: Lock the scheduler when executing hard
 callback functions.

Otherwise scheduled functions may execute during the hard callback and then
fail if they try to allocate heap memory.
---
 lib/utils/mpirq.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/lib/utils/mpirq.c b/lib/utils/mpirq.c
index d04fab68bbb52..8de13b0b6a3c8 100644
--- a/lib/utils/mpirq.c
+++ b/lib/utils/mpirq.c
@@ -62,8 +62,10 @@ mp_irq_obj_t *mp_irq_new(const mp_irq_methods_t *methods, mp_obj_t parent) {
 void mp_irq_handler(mp_irq_obj_t *self) {
     if (self->handler != mp_const_none) {
         if (self->ishard) {
-            // When executing code within a handler we must lock the GC to prevent
-            // any memory allocations.
+            // When executing code within a handler we must lock the scheduler to
+            // prevent any scheduled callbacks from running, and lock the GC to
+            // prevent any memory allocations.
+            mp_sched_lock();
             gc_lock();
             nlr_buf_t nlr;
             if (nlr_push(&nlr) == 0) {
@@ -77,6 +79,7 @@ void mp_irq_handler(mp_irq_obj_t *self) {
                 mp_obj_print_exception(&mp_plat_print, MP_OBJ_FROM_PTR(nlr.ret_val));
             }
             gc_unlock();
+            mp_sched_unlock();
         } else {
             // Schedule call to user function
             mp_sched_schedule(self->handler, self->parent);

From a902b69dd51de0e3fe3bb6955296591d6a93abab Mon Sep 17 00:00:00 2001
From: Damien George <damien.p.george@gmail.com>
Date: Thu, 21 May 2020 11:27:09 +1000
Subject: [PATCH 0008/3533] py/py.mk: Use additional CFLAGS to compile
 string0.c.

Otherwise functions like memset might get optimised to call themselves (eg
with gcc 10).  And provide CFLAGS_BUILTIN so these options can be changed
by a port if needed.

Fixes issue #6053.
---
 py/py.mk | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/py/py.mk b/py/py.mk
index 0a98ccc00ca0f..d864a7ed3d843 100644
--- a/py/py.mk
+++ b/py/py.mk
@@ -266,6 +266,11 @@ $(HEADER_BUILD)/moduledefs.h: $(SRC_QSTR) $(QSTR_GLOBAL_DEPENDENCIES) | $(HEADER
 
 SRC_QSTR += $(HEADER_BUILD)/moduledefs.h
 
+# Standard C functions like memset need to be compiled with special flags so
+# the compiler does not optimise these functions in terms of themselves.
+CFLAGS_BUILTIN ?= -ffreestanding -fno-builtin -fno-lto
+$(BUILD)/lib/libc/string0.o: CFLAGS += $(CFLAGS_BUILTIN)
+
 # Force nlr code to always be compiled with space-saving optimisation so
 # that the function preludes are of a minimal and predictable form.
 $(PY_BUILD)/nlr%.o: CFLAGS += -Os

From 81db22f693d06468d45571a29fc0648a8f5664ce Mon Sep 17 00:00:00 2001
From: stijn <stijn@ignitron.net>
Date: Sun, 17 May 2020 12:29:25 +0200
Subject: [PATCH 0009/3533] py/modmath: Work around msvc float bugs in atan2,
 fmod and modf.

Older implementations deal with infinity/negative zero incorrectly.  This
commit adds generic fixes that can be enabled by any port that needs them,
along with new tests cases.
---
 ports/windows/mpconfigport.h |  8 ++++++++
 py/modmath.c                 | 27 ++++++++++++++++++++++++++-
 py/mpconfig.h                | 15 +++++++++++++++
 tests/float/math_domain.py   |  4 ++--
 4 files changed, 51 insertions(+), 3 deletions(-)

diff --git a/ports/windows/mpconfigport.h b/ports/windows/mpconfigport.h
index 84c196e11fa9c..fa09dda7527e0 100644
--- a/ports/windows/mpconfigport.h
+++ b/ports/windows/mpconfigport.h
@@ -227,6 +227,14 @@ extern const struct _mp_obj_module_t mp_module_time;
 #define MP_SSIZE_MAX                _I32_MAX
 #endif
 
+// VC++ 12.0 fixes
+#if (_MSC_VER <= 1800)
+#define MICROPY_PY_MATH_ATAN2_FIX_INFNAN (1)
+#define MICROPY_PY_MATH_FMOD_FIX_INFNAN (1)
+#ifdef _WIN64
+#define MICROPY_PY_MATH_MODF_FIX_NEGZERO (1)
+#endif
+#endif
 
 // CL specific definitions
 
diff --git a/py/modmath.c b/py/modmath.c
index 5ff892ba112c8..b312eeb3d2c01 100644
--- a/py/modmath.c
+++ b/py/modmath.c
@@ -34,6 +34,8 @@
 // M_PI is not part of the math.h standard and may not be defined
 // And by defining our own we can ensure it uses the correct const format.
 #define MP_PI MICROPY_FLOAT_CONST(3.14159265358979323846)
+#define MP_PI_4 MICROPY_FLOAT_CONST(0.78539816339744830962)
+#define MP_3_PI_4 MICROPY_FLOAT_CONST(2.35619449019234492885)
 
 STATIC NORETURN void math_error(void) {
     mp_raise_ValueError(MP_ERROR_TEXT("math domain error"));
@@ -132,7 +134,17 @@ MATH_FUN_1(asin, asin)
 // atan(x)
 MATH_FUN_1(atan, atan)
 // atan2(y, x)
+#if MICROPY_PY_MATH_ATAN2_FIX_INFNAN
+mp_float_t atan2_func(mp_float_t x, mp_float_t y) {
+    if (isinf(x) && isinf(y)) {
+        return copysign(y < 0 ? MP_3_PI_4 : MP_PI_4, x);
+    }
+    return atan2(x, y);
+}
+MATH_FUN_2(atan2, atan2_func)
+#else
 MATH_FUN_2(atan2, atan2)
+#endif
 // ceil(x)
 MATH_FUN_1_TO_INT(ceil, ceil)
 // copysign(x, y)
@@ -148,7 +160,14 @@ MATH_FUN_1(fabs, fabs_func)
 // floor(x)
 MATH_FUN_1_TO_INT(floor, floor) // TODO: delegate to x.__floor__() if x is not a float
 // fmod(x, y)
+#if MICROPY_PY_MATH_FMOD_FIX_INFNAN
+mp_float_t fmod_func(mp_float_t x, mp_float_t y) {
+    return (!isinf(x) && isinf(y)) ? x : fmod(x, y);
+}
+MATH_FUN_2(fmod, fmod_func)
+#else
 MATH_FUN_2(fmod, fmod)
+#endif
 // isfinite(x)
 MATH_FUN_1_TO_BOOL(isfinite, isfinite)
 // isinf(x)
@@ -246,7 +265,13 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_math_frexp_obj, mp_math_frexp);
 // modf(x)
 STATIC mp_obj_t mp_math_modf(mp_obj_t x_obj) {
     mp_float_t int_part = 0.0;
-    mp_float_t fractional_part = MICROPY_FLOAT_C_FUN(modf)(mp_obj_get_float(x_obj), &int_part);
+    mp_float_t x = mp_obj_get_float(x_obj);
+    mp_float_t fractional_part = MICROPY_FLOAT_C_FUN(modf)(x, &int_part);
+    #if MICROPY_PY_MATH_MODF_FIX_NEGZERO
+    if (fractional_part == MICROPY_FLOAT_CONST(0.0)) {
+        fractional_part = copysign(fractional_part, x);
+    }
+    #endif
     mp_obj_t tuple[2];
     tuple[0] = mp_obj_new_float(fractional_part);
     tuple[1] = mp_obj_new_float(int_part);
diff --git a/py/mpconfig.h b/py/mpconfig.h
index f2b3af1f2a314..27df3f483a0e1 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -1128,6 +1128,21 @@ typedef double mp_float_t;
 #define MICROPY_PY_MATH_ISCLOSE (0)
 #endif
 
+// Whether to provide fix for atan2 Inf handling.
+#ifndef MICROPY_PY_MATH_ATAN2_FIX_INFNAN
+#define MICROPY_PY_MATH_ATAN2_FIX_INFNAN (0)
+#endif
+
+// Whether to provide fix for fmod Inf handling.
+#ifndef MICROPY_PY_MATH_FMOD_FIX_INFNAN
+#define MICROPY_PY_MATH_FMOD_FIX_INFNAN (0)
+#endif
+
+// Whether to provide fix for modf negative zero handling.
+#ifndef MICROPY_PY_MATH_MODF_FIX_NEGZERO
+#define MICROPY_PY_MATH_MODF_FIX_NEGZERO (0)
+#endif
+
 // Whether to provide "cmath" module
 #ifndef MICROPY_PY_CMATH
 #define MICROPY_PY_CMATH (0)
diff --git a/tests/float/math_domain.py b/tests/float/math_domain.py
index 2d4670f75dd48..e63628cf5078a 100644
--- a/tests/float/math_domain.py
+++ b/tests/float/math_domain.py
@@ -39,8 +39,8 @@
 # double argument functions
 for name, f, args in (
     ("pow", math.pow, ((0, 2), (-1, 2), (0, -1), (-1, 2.3))),
-    ("fmod", math.fmod, ((1.2, inf), (1.2, 0), (inf, 1.2))),
-    ("atan2", math.atan2, ((0, 0),)),
+    ("fmod", math.fmod, ((1.2, inf), (1.2, -inf), (1.2, 0), (inf, 1.2))),
+    ("atan2", math.atan2, ((0, 0), (-inf, inf), (-inf, -inf), (inf, -inf))),
     ("copysign", math.copysign, ()),
 ):
     for x in args + ((0, inf), (inf, 0), (inf, inf), (inf, nan), (nan, inf), (nan, nan)):

From 97ccde0c431674113f56b4c9d421b2bc1acb1b56 Mon Sep 17 00:00:00 2001
From: stijn <stijn@ignitron.net>
Date: Sun, 17 May 2020 10:57:51 +0200
Subject: [PATCH 0010/3533] py/ringbuf: Fix compilation with msvc.

Older versions do not have "inline" so fetch the definition from
mpconfigport.h.
---
 py/ringbuf.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/py/ringbuf.h b/py/ringbuf.h
index 4d316d961b2b5..293e418306051 100644
--- a/py/ringbuf.h
+++ b/py/ringbuf.h
@@ -29,6 +29,10 @@
 #include <stddef.h>
 #include <stdint.h>
 
+#ifdef _MSC_VER
+#include "py/mpconfig.h" // For inline.
+#endif
+
 typedef struct _ringbuf_t {
     uint8_t *buf;
     uint16_t size;

From 9523ca92e03e699494560ec964bea748b291c7a0 Mon Sep 17 00:00:00 2001
From: stijn <stijn@ignitron.net>
Date: Sun, 17 May 2020 09:39:59 +0200
Subject: [PATCH 0011/3533] windows: Make appveyor.yml self-contained.

Add configuration which otherwise has to be set via the UI so the file is
more self-contained, and remove configuration which is not needed because
it's the same as the default.  The major change here is that for a while
now Appveyor has been using Visual Studio 2015 by default while we still
want to support 2013.
---
 ports/windows/.appveyor.yml | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/ports/windows/.appveyor.yml b/ports/windows/.appveyor.yml
index 2e0dbdea5d116..2965543b05942 100644
--- a/ports/windows/.appveyor.yml
+++ b/ports/windows/.appveyor.yml
@@ -1,3 +1,7 @@
+image: Visual Studio 2013
+clone_depth: 1
+skip_tags: true
+
 environment:
   # Python version used
   MICROPY_CPYTHON3: c:/python34/python.exe
@@ -71,10 +75,3 @@ after_test:
     if ($LASTEXITCODE -ne 0) {
       throw "$env:MSYSTEM mpy-cross tests exited with code $LASTEXITCODE"
     }
-
-skip_tags: true
-
-deploy: off
-
-nuget:
-  disable_publish_on_pr: true

From 093fd807606d088cfaf874e79060a6c68484cbfa Mon Sep 17 00:00:00 2001
From: David Lechner <david@pybricks.com>
Date: Fri, 22 May 2020 11:10:15 -0500
Subject: [PATCH 0012/3533] py/modsys: Use consistent naming pattern for
 module-level const objects.

This renames a few identifiers to follow the usual naming convention of
mp_<module>_<name>.  This makes them easier to find, e.g. when grep'ing.
---
 py/modsys.c          | 10 +++++-----
 py/objint.h          |  2 +-
 py/objint_longlong.c |  2 +-
 py/objint_mpz.c      |  2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/py/modsys.c b/py/modsys.c
index 8092d9799d81f..586b13e747130 100644
--- a/py/modsys.c
+++ b/py/modsys.c
@@ -53,7 +53,7 @@ const mp_print_t mp_sys_stdout_print = {&mp_sys_stdout_obj, mp_stream_write_adap
 #endif
 
 // version - Python language version that this implementation conforms to, as a string
-STATIC const MP_DEFINE_STR_OBJ(version_obj, "3.4.0");
+STATIC const MP_DEFINE_STR_OBJ(mp_sys_version_obj, "3.4.0");
 
 // version_info - Python language version that this implementation conforms to, as a tuple of ints
 #define I(n) MP_OBJ_NEW_SMALL_INT(n)
@@ -105,7 +105,7 @@ STATIC const mp_rom_obj_tuple_t mp_sys_implementation_obj = {
 
 #ifdef MICROPY_PY_SYS_PLATFORM
 // platform - the platform that MicroPython is running on
-STATIC const MP_DEFINE_STR_OBJ(platform_obj, MICROPY_PY_SYS_PLATFORM);
+STATIC const MP_DEFINE_STR_OBJ(mp_sys_platform_obj, MICROPY_PY_SYS_PLATFORM);
 #endif
 
 // exit([retval]): raise SystemExit, with optional argument given to the exception
@@ -189,11 +189,11 @@ STATIC const mp_rom_map_elem_t mp_module_sys_globals_table[] = {
 
     { MP_ROM_QSTR(MP_QSTR_path), MP_ROM_PTR(&MP_STATE_VM(mp_sys_path_obj)) },
     { MP_ROM_QSTR(MP_QSTR_argv), MP_ROM_PTR(&MP_STATE_VM(mp_sys_argv_obj)) },
-    { MP_ROM_QSTR(MP_QSTR_version), MP_ROM_PTR(&version_obj) },
+    { MP_ROM_QSTR(MP_QSTR_version), MP_ROM_PTR(&mp_sys_version_obj) },
     { MP_ROM_QSTR(MP_QSTR_version_info), MP_ROM_PTR(&mp_sys_version_info_obj) },
     { MP_ROM_QSTR(MP_QSTR_implementation), MP_ROM_PTR(&mp_sys_implementation_obj) },
     #ifdef MICROPY_PY_SYS_PLATFORM
-    { MP_ROM_QSTR(MP_QSTR_platform), MP_ROM_PTR(&platform_obj) },
+    { MP_ROM_QSTR(MP_QSTR_platform), MP_ROM_PTR(&mp_sys_platform_obj) },
     #endif
     #if MP_ENDIANNESS_LITTLE
     { MP_ROM_QSTR(MP_QSTR_byteorder), MP_ROM_QSTR(MP_QSTR_little) },
@@ -210,7 +210,7 @@ STATIC const mp_rom_map_elem_t mp_module_sys_globals_table[] = {
     // of "one" bits in sys.maxsize.
     { MP_ROM_QSTR(MP_QSTR_maxsize), MP_ROM_INT(MP_SMALL_INT_MAX) },
     #else
-    { MP_ROM_QSTR(MP_QSTR_maxsize), MP_ROM_PTR(&mp_maxsize_obj) },
+    { MP_ROM_QSTR(MP_QSTR_maxsize), MP_ROM_PTR(&mp_sys_maxsize_obj) },
     #endif
     #endif
 
diff --git a/py/objint.h b/py/objint.h
index c4752384e04db..5eed87705dedb 100644
--- a/py/objint.h
+++ b/py/objint.h
@@ -38,7 +38,7 @@ typedef struct _mp_obj_int_t {
     #endif
 } mp_obj_int_t;
 
-extern const mp_obj_int_t mp_maxsize_obj;
+extern const mp_obj_int_t mp_sys_maxsize_obj;
 
 #if MICROPY_PY_BUILTINS_FLOAT
 mp_float_t mp_obj_int_as_float_impl(mp_obj_t self_in);
diff --git a/py/objint_longlong.c b/py/objint_longlong.c
index 619b4d2b54475..f2e88c3ea5643 100644
--- a/py/objint_longlong.c
+++ b/py/objint_longlong.c
@@ -40,7 +40,7 @@
 
 #if MICROPY_PY_SYS_MAXSIZE
 // Export value for sys.maxsize
-const mp_obj_int_t mp_maxsize_obj = {{&mp_type_int}, MP_SSIZE_MAX};
+const mp_obj_int_t mp_sys_maxsize_obj = {{&mp_type_int}, MP_SSIZE_MAX};
 #endif
 
 mp_obj_t mp_obj_int_from_bytes_impl(bool big_endian, size_t len, const byte *buf) {
diff --git a/py/objint_mpz.c b/py/objint_mpz.c
index f2f0dbc3a51cf..6e52073a6e85b 100644
--- a/py/objint_mpz.c
+++ b/py/objint_mpz.c
@@ -66,7 +66,7 @@ STATIC const mpz_dig_t maxsize_dig[] = {
     #endif
 };
 // *FORMAT-ON*
-const mp_obj_int_t mp_maxsize_obj = {
+const mp_obj_int_t mp_sys_maxsize_obj = {
     {&mp_type_int},
     {.fixed_dig = 1, .len = NUM_DIG, .alloc = NUM_DIG, .dig = (mpz_dig_t *)maxsize_dig}
 };

From 2d1fef709664f5dc39bd7abac21bc063db90df61 Mon Sep 17 00:00:00 2001
From: David Lechner <david@pybricks.com>
Date: Tue, 26 May 2020 12:49:41 -0500
Subject: [PATCH 0013/3533] tools/codeformat.py: Use -q option on uncrustify to
 make output quiet.

This suppresses the Parsing: <file> as language C lines.  This makes
parsing run a bit faster and on CI it makes for less scrolling through logs
(and black already uses the -q option).
---
 tools/codeformat.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/codeformat.py b/tools/codeformat.py
index 0a8bf2e0f4e8c..2fe72ef33d570 100755
--- a/tools/codeformat.py
+++ b/tools/codeformat.py
@@ -168,7 +168,7 @@ def batch(cmd, files, N=200):
 
     # Format C files with uncrustify.
     if format_c:
-        batch(["uncrustify", "-c", UNCRUSTIFY_CFG, "-lC", "--no-backup"], lang_files(C_EXTS))
+        batch(["uncrustify", "-q", "-c", UNCRUSTIFY_CFG, "-lC", "--no-backup"], lang_files(C_EXTS))
         for file in lang_files(C_EXTS):
             fixup_c(file)
 

From 1662a0b06f2ad58aa4a632a88d0b3836c08bded2 Mon Sep 17 00:00:00 2001
From: cccc <cuiwei_cv@163.com>
Date: Tue, 25 Feb 2020 23:09:59 +0800
Subject: [PATCH 0014/3533] esp32/machine_sdcard: Add "freq" keyword arg to
 SDCard constructor.

To allow high speed access.
---
 docs/library/machine.SDCard.rst | 4 +++-
 ports/esp32/machine_sdcard.c    | 6 ++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/docs/library/machine.SDCard.rst b/docs/library/machine.SDCard.rst
index cf86b1fcb25e6..b1cf42ec0285b 100644
--- a/docs/library/machine.SDCard.rst
+++ b/docs/library/machine.SDCard.rst
@@ -23,7 +23,7 @@ arguments that might need to be set in order to use either a non-standard slot
 or a non-standard pin assignment. The exact subset of arguments supported will
 vary from platform to platform.
 
-.. class:: SDCard(slot=1, width=1, cd=None, wp=None, sck=None, miso=None, mosi=None, cs=None)
+.. class:: SDCard(slot=1, width=1, cd=None, wp=None, sck=None, miso=None, mosi=None, cs=None, freq=20000000)
 
     This class provides access to SD or MMC storage cards using either
     a dedicated SD/MMC interface hardware or through an SPI channel.
@@ -50,6 +50,8 @@ vary from platform to platform.
      - *mosi* can be used to specify an SPI mosi pin.
 
      - *cs* can be used to specify an SPI chip select pin.
+     
+     - *freq* selects the SD/MMC interface frequency in Hz (only supported on the ESP32).
 
 Implementation-specific details
 -------------------------------
diff --git a/ports/esp32/machine_sdcard.c b/ports/esp32/machine_sdcard.c
index 0fd4e86211e86..40686508a1e20 100644
--- a/ports/esp32/machine_sdcard.c
+++ b/ports/esp32/machine_sdcard.c
@@ -126,6 +126,7 @@ STATIC mp_obj_t machine_sdcard_make_new(const mp_obj_type_t *type, size_t n_args
         ARG_mosi,
         ARG_sck,
         ARG_cs,
+        ARG_freq,
     };
     STATIC const mp_arg_t allowed_args[] = {
         { MP_QSTR_slot,     MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 1} },
@@ -137,6 +138,8 @@ STATIC mp_obj_t machine_sdcard_make_new(const mp_obj_type_t *type, size_t n_args
         { MP_QSTR_mosi,     MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = mp_const_none} },
         { MP_QSTR_sck,      MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = mp_const_none} },
         { MP_QSTR_cs,       MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = mp_const_none} },
+        // freq is valid for both SPI and SDMMC interfaces
+        { MP_QSTR_freq,     MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 20000000} },
     };
     mp_arg_val_t arg_vals[MP_ARRAY_SIZE(allowed_args)];
     mp_map_t kw_args;
@@ -175,11 +178,14 @@ STATIC mp_obj_t machine_sdcard_make_new(const mp_obj_type_t *type, size_t n_args
     self->flags = 0;
     // Note that these defaults are macros that expand to structure
     // constants so we can't directly assign them to fields.
+    int freq = arg_vals[ARG_freq].u_int;
     if (is_spi) {
         sdmmc_host_t _temp_host = SDSPI_HOST_DEFAULT();
+        _temp_host.max_freq_khz = freq / 1000;
         self->host = _temp_host;
     } else {
         sdmmc_host_t _temp_host = SDMMC_HOST_DEFAULT();
+        _temp_host.max_freq_khz = freq / 1000;
         self->host = _temp_host;
     }
 

From 50a7ba234850183693d2b236e48ec0b76399123d Mon Sep 17 00:00:00 2001
From: Thorsten von Eicken <tve@voneicken.com>
Date: Sat, 2 May 2020 01:36:53 -0700
Subject: [PATCH 0015/3533] esp32/modmachine: Fix machine.reset_cause to use
 IDF's esp_reset_reason.

The code previously called rtc_get_reset_reason which is a "raw" reset
cause.  The ESP-IDF massages that for the proper reset cause available from
esp_reset_reason.

Fixes issue #5134.
---
 ports/esp32/modmachine.c | 32 +++++++++++++-------------------
 1 file changed, 13 insertions(+), 19 deletions(-)

diff --git a/ports/esp32/modmachine.c b/ports/esp32/modmachine.c
index 8d8df995c294b..82a02522f7b41 100644
--- a/ports/esp32/modmachine.c
+++ b/ports/esp32/modmachine.c
@@ -146,36 +146,30 @@ STATIC mp_obj_t machine_deepsleep(size_t n_args, const mp_obj_t *pos_args, mp_ma
 STATIC MP_DEFINE_CONST_FUN_OBJ_KW(machine_deepsleep_obj, 0,  machine_deepsleep);
 
 STATIC mp_obj_t machine_reset_cause(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
-    switch (rtc_get_reset_reason(0)) {
-        case POWERON_RESET:
+    switch (esp_reset_reason()) {
+        case ESP_RST_POWERON:
+        case ESP_RST_BROWNOUT:
             return MP_OBJ_NEW_SMALL_INT(MP_PWRON_RESET);
             break;
-        case SW_RESET:
-        case SW_CPU_RESET:
-            return MP_OBJ_NEW_SMALL_INT(MP_SOFT_RESET);
-            break;
-        case OWDT_RESET:
-        case TG0WDT_SYS_RESET:
-        case TG1WDT_SYS_RESET:
-        case RTCWDT_SYS_RESET:
-        case RTCWDT_BROWN_OUT_RESET:
-        case RTCWDT_CPU_RESET:
-        case RTCWDT_RTC_RESET:
-        case TGWDT_CPU_RESET:
+
+        case ESP_RST_INT_WDT:
+        case ESP_RST_TASK_WDT:
+        case ESP_RST_WDT:
             return MP_OBJ_NEW_SMALL_INT(MP_WDT_RESET);
             break;
 
-        case DEEPSLEEP_RESET:
+        case ESP_RST_DEEPSLEEP:
             return MP_OBJ_NEW_SMALL_INT(MP_DEEPSLEEP_RESET);
             break;
 
-        case EXT_CPU_RESET:
+        case ESP_RST_SW:
+        case ESP_RST_PANIC:
+        case ESP_RST_EXT: // Comment in ESP-IDF: "For ESP32, ESP_RST_EXT is never returned"
             return MP_OBJ_NEW_SMALL_INT(MP_HARD_RESET);
             break;
 
-        case NO_MEAN:
-        case SDIO_RESET:
-        case INTRUSION_RESET:
+        case ESP_RST_SDIO:
+        case ESP_RST_UNKNOWN:
         default:
             return MP_OBJ_NEW_SMALL_INT(0);
             break;

From f03d030080ccf89c6ad677c818c949c3bd71ec37 Mon Sep 17 00:00:00 2001
From: Joel Stanley <joel@jms.id.au>
Date: Tue, 26 May 2020 12:59:55 +0930
Subject: [PATCH 0016/3533] powerpc/uart: Choose which UART to use at build
 time, not runtime.

Microwatt may have firmware that places data in r3, which was used to
detect microwatt vs powernv.  This breaks the existing probing of the UART
type in this powerpc port.

Instead build only the appropriate UART into the firmware, selected by
passing the option UART=potato or UART=lpc_serial to the Makefile.

A future enhancement would be to parse the device tree and configure
MicroPython based on the settings.
---
 ports/powerpc/Makefile          |  7 ++--
 ports/powerpc/README.md         |  6 ++-
 ports/powerpc/main.c            |  1 -
 ports/powerpc/uart_core.c       | 73 ---------------------------------
 ports/powerpc/uart_lpc_serial.c | 16 +++++---
 ports/powerpc/uart_potato.c     | 31 ++++++++------
 6 files changed, 38 insertions(+), 96 deletions(-)
 delete mode 100644 ports/powerpc/uart_core.c

diff --git a/ports/powerpc/Makefile b/ports/powerpc/Makefile
index 5f17a93557e5c..1f5ec80d43653 100644
--- a/ports/powerpc/Makefile
+++ b/ports/powerpc/Makefile
@@ -6,6 +6,9 @@ QSTR_DEFS = qstrdefsport.h
 # include py core make definitions
 include $(TOP)/py/py.mk
 
+# potato or lpc_serial
+UART ?= potato
+
 ARCH = $(shell uname -m)
 ifneq ("$(ARCH)", "ppc64")
 ifneq ("$(ARCH)", "ppc64le")
@@ -30,9 +33,7 @@ LIBS =
 
 SRC_C = \
 	main.c \
-	uart_core.c \
-	uart_potato.c \
-	uart_lpc_serial.c \
+	uart_$(UART).c \
 	lib/utils/printf.c \
 	lib/utils/stdout_helpers.c \
 	lib/utils/pyexec.c \
diff --git a/ports/powerpc/README.md b/ports/powerpc/README.md
index 862bfcd3c5002..631924c7c0afb 100644
--- a/ports/powerpc/README.md
+++ b/ports/powerpc/README.md
@@ -6,10 +6,14 @@ potato UART.
 
 ## Building
 
-By default the port will be built for the host machine:
+By default the port will be built with the potato uart for microwatt:
 
     $ make
 
+To instead build for a machine with LPC serial, such as QEMU powernv:
+
+    $ make UART=lpc_serial
+
 ## Cross compilation for POWERPC
 
 If you need to cross compilers you'll want to grab a powerpc64le
diff --git a/ports/powerpc/main.c b/ports/powerpc/main.c
index 421f9be714c90..fdeec13abe0a5 100644
--- a/ports/powerpc/main.c
+++ b/ports/powerpc/main.c
@@ -65,7 +65,6 @@ int main(int argc, char **argv) {
     int stack_dummy;
     stack_top = (char *)&stack_dummy;
 
-    // microwatt has argc/r3 = 0 whereas QEMU has r3 set in head.S
     uart_init_ppc(argc);
 
     #if MICROPY_ENABLE_PYSTACK
diff --git a/ports/powerpc/uart_core.c b/ports/powerpc/uart_core.c
deleted file mode 100644
index b0dcd031a5ad2..0000000000000
--- a/ports/powerpc/uart_core.c
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2019, Michael Neuling, IBM Corporation.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#include <unistd.h>
-#include <stdbool.h>
-
-#include "py/mpconfig.h"
-#include "uart_potato.h"
-#include "uart_lpc_serial.h"
-
-static int lpc_console;
-static int potato_console;
-
-void uart_init_ppc(int lpc) {
-    lpc_console = lpc;
-
-    if (!lpc_console) {
-        potato_console = 1;
-
-        potato_uart_init();
-    } else {
-        lpc_uart_init();
-    }
-}
-
-// Receive single character
-int mp_hal_stdin_rx_chr(void) {
-    unsigned char c = 0;
-    if (lpc_console) {
-        c = lpc_uart_read();
-    } else if (potato_console) {
-        c = potato_uart_read();
-    }
-    return c;
-}
-
-// Send string of given length
-void mp_hal_stdout_tx_strn(const char *str, mp_uint_t len) {
-    if (lpc_console) {
-        int i;
-        for (i = 0; i < len; i++) {
-            lpc_uart_write(str[i]);
-        }
-    } else if (potato_console) {
-        int i;
-        for (i = 0; i < len; i++) {
-            potato_uart_write(str[i]);
-        }
-    }
-}
diff --git a/ports/powerpc/uart_lpc_serial.c b/ports/powerpc/uart_lpc_serial.c
index c15fc049b9d5a..760615041cf94 100644
--- a/ports/powerpc/uart_lpc_serial.c
+++ b/ports/powerpc/uart_lpc_serial.c
@@ -96,20 +96,24 @@ static int lpc_uart_rx_empty(void) {
     return !(lpc_uart_reg_read(REG_LSR) & LSR_DR);
 }
 
-void lpc_uart_init(void) {
+void uart_init_ppc(void) {
     lpc_uart_base = LPC_UART_BASE;
 }
 
-char lpc_uart_read(void) {
+int mp_hal_stdin_rx_chr(void) {
     while (lpc_uart_rx_empty()) {
         ;
     }
     return lpc_uart_reg_read(REG_THR);
 }
 
-void lpc_uart_write(char c) {
-    while (lpc_uart_tx_full()) {
-        ;
+
+void mp_hal_stdout_tx_strn(const char *str, mp_uint_t len) {
+    int i;
+    for (i = 0; i < len; i++) {
+        while (lpc_uart_tx_full()) {
+            ;
+        }
+        lpc_uart_reg_write(REG_RBR, str[i]);
     }
-    lpc_uart_reg_write(REG_RBR, c);
 }
diff --git a/ports/powerpc/uart_potato.c b/ports/powerpc/uart_potato.c
index 4a487f30322da..29f21934ddf44 100644
--- a/ports/powerpc/uart_potato.c
+++ b/ports/powerpc/uart_potato.c
@@ -34,10 +34,12 @@
 #include <stdbool.h>
 #include "py/mpconfig.h"
 
-#define PROC_FREQ                           50000000
+#define SYSCON_BASE     0xc0000000  /* System control regs */
+#define SYS_REG_CLKINFO                 0x20
+
 #define UART_FREQ                           115200
 #define POTATO_UART_BASE                    0xc0002000
-uint64_t potato_uart_base;
+static uint64_t potato_uart_base;
 
 #define POTATO_CONSOLE_TX                   0x00
 #define POTATO_CONSOLE_RX                   0x08
@@ -60,7 +62,7 @@ static uint64_t potato_uart_reg_read(int offset) {
     return val;
 }
 
-void potato_uart_reg_write(int offset, uint64_t val) {
+static void potato_uart_reg_write(int offset, uint64_t val) {
     uint64_t addr;
 
     addr = potato_uart_base + offset;
@@ -96,13 +98,16 @@ static unsigned long potato_uart_divisor(unsigned long proc_freq, unsigned long
     return proc_freq / (uart_freq * 16) - 1;
 }
 
-void potato_uart_init(void) {
+void uart_init_ppc(void) {
+    uint64_t proc_freq;
+
     potato_uart_base = POTATO_UART_BASE;
-    potato_uart_reg_write(POTATO_CONSOLE_CLOCK_DIV, potato_uart_divisor(PROC_FREQ, UART_FREQ));
+    proc_freq = *(volatile uint64_t *)(SYSCON_BASE + SYS_REG_CLKINFO);
+    potato_uart_reg_write(POTATO_CONSOLE_CLOCK_DIV, potato_uart_divisor(proc_freq, UART_FREQ));
 
 }
 
-char potato_uart_read(void) {
+int mp_hal_stdin_rx_chr(void) {
     uint64_t val;
 
     while (potato_uart_rx_empty()) {
@@ -113,13 +118,15 @@ char potato_uart_read(void) {
     return (char)(val & 0x000000ff);
 }
 
-void potato_uart_write(char c) {
-    uint64_t val;
+void mp_hal_stdout_tx_strn(const char *str, mp_uint_t len) {
+    int i;
 
-    val = c;
+    for (i = 0; i < len; i++) {
+        uint64_t val = str[i];
 
-    while (potato_uart_tx_full()) {
-        ;
+        while (potato_uart_tx_full()) {
+            ;
+        }
+        potato_uart_reg_write(POTATO_CONSOLE_TX, val);
     }
-    potato_uart_reg_write(POTATO_CONSOLE_TX, val);
 }

From 5cfc09ffca3203eb474aec478b8baf1f35fd2a0b Mon Sep 17 00:00:00 2001
From: Joel Stanley <joel@jms.id.au>
Date: Tue, 26 May 2020 13:18:41 +0930
Subject: [PATCH 0017/3533] travis: For powerpc job, build both UART variants.

The powerpc port can be built with two different UART drivers, so build
both in CI.

The default compiler is now powerpc64le-linux-gnu- so it does not need to
be specified on the command line.
---
 .travis.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 133035949d484..414fe2b59d108 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -355,4 +355,5 @@ jobs:
       install:
         - sudo apt-get install gcc-powerpc64le-linux-gnu libc6-dev-ppc64el-cross
       script:
-        - make ${MAKEOPTS} -C ports/powerpc CROSS_COMPILE=powerpc64le-linux-gnu-
+        - make ${MAKEOPTS} -C ports/powerpc UART=potato
+        - make ${MAKEOPTS} -C ports/powerpc UART=lpc_serial

From 8f642677f724e725813155f74e5934b8c94fc1c4 Mon Sep 17 00:00:00 2001
From: David Lechner <david@pybricks.com>
Date: Wed, 27 May 2020 11:10:40 -0500
Subject: [PATCH 0018/3533] tools/codeformat.py: Add verbose option to pass to
 uncrustify and black.

This adds a new command line option `-v` to `tools/codeformat.py` to enable
verbose printing of all files that are scanned.

Normally `uncrustify` and `black` are called with the `-q` option so
setting verbose suppresses the `-q` option and on `black` also enables the
`-v` option which makes it print out all file names matching the filter
similar to how `uncrustify` does by default.
---
 tools/codeformat.py | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/tools/codeformat.py b/tools/codeformat.py
index 2fe72ef33d570..5aef4ccfbf242 100755
--- a/tools/codeformat.py
+++ b/tools/codeformat.py
@@ -138,6 +138,7 @@ def main():
     cmd_parser = argparse.ArgumentParser(description="Auto-format C and Python files.")
     cmd_parser.add_argument("-c", action="store_true", help="Format C code only")
     cmd_parser.add_argument("-p", action="store_true", help="Format Python code only")
+    cmd_parser.add_argument("-v", action="store_true", help="Enable verbose output")
     cmd_parser.add_argument("files", nargs="*", help="Run on specific globs")
     args = cmd_parser.parse_args()
 
@@ -168,13 +169,21 @@ def batch(cmd, files, N=200):
 
     # Format C files with uncrustify.
     if format_c:
-        batch(["uncrustify", "-q", "-c", UNCRUSTIFY_CFG, "-lC", "--no-backup"], lang_files(C_EXTS))
+        command = ["uncrustify", "-c", UNCRUSTIFY_CFG, "-lC", "--no-backup"]
+        if not args.v:
+            command.append("-q")
+        batch(command, lang_files(C_EXTS))
         for file in lang_files(C_EXTS):
             fixup_c(file)
 
     # Format Python files with black.
     if format_py:
-        batch(["black", "-q", "--fast", "--line-length=99"], lang_files(PY_EXTS))
+        command = ["black", "--fast", "--line-length=99"]
+        if args.v:
+            command.append("-v")
+        else:
+            command.append("-q")
+        batch(command, lang_files(PY_EXTS))
 
 
 if __name__ == "__main__":

From 22806ed5df27c10131af0cedb2f7e8b134fe6e7a Mon Sep 17 00:00:00 2001
From: Damien George <damien.p.george@gmail.com>
Date: Thu, 28 May 2020 12:50:44 +1000
Subject: [PATCH 0019/3533] extmod/vfs: Retain previous working directory if
 chdir fails.

Fixes issue #6069.
---
 extmod/vfs.c                  |  3 ++-
 tests/extmod/vfs_basic.py     | 20 +++++++++++++++++++-
 tests/extmod/vfs_basic.py.exp |  6 ++++++
 3 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/extmod/vfs.c b/extmod/vfs.c
index 79a8e8509ded1..d1291068ad8d6 100644
--- a/extmod/vfs.c
+++ b/extmod/vfs.c
@@ -322,7 +322,6 @@ MP_DEFINE_CONST_FUN_OBJ_KW(mp_vfs_open_obj, 0, mp_vfs_open);
 mp_obj_t mp_vfs_chdir(mp_obj_t path_in) {
     mp_obj_t path_out;
     mp_vfs_mount_t *vfs = lookup_path(path_in, &path_out);
-    MP_STATE_VM(vfs_cur) = vfs;
     if (vfs == MP_VFS_ROOT) {
         // If we change to the root dir and a VFS is mounted at the root then
         // we must change that VFS's current dir to the root dir so that any
@@ -334,9 +333,11 @@ mp_obj_t mp_vfs_chdir(mp_obj_t path_in) {
                 break;
             }
         }
+        vfs = MP_VFS_ROOT;
     } else {
         mp_vfs_proxy_call(vfs, MP_QSTR_chdir, 1, &path_out);
     }
+    MP_STATE_VM(vfs_cur) = vfs;
     return mp_const_none;
 }
 MP_DEFINE_CONST_FUN_OBJ_1(mp_vfs_chdir_obj, mp_vfs_chdir);
diff --git a/tests/extmod/vfs_basic.py b/tests/extmod/vfs_basic.py
index c8e203b3df882..62b2a277381d6 100644
--- a/tests/extmod/vfs_basic.py
+++ b/tests/extmod/vfs_basic.py
@@ -10,8 +10,9 @@
 
 
 class Filesystem:
-    def __init__(self, id):
+    def __init__(self, id, fail=0):
         self.id = id
+        self.fail = fail
 
     def mount(self, readonly, mkfs):
         print(self.id, "mount", readonly, mkfs)
@@ -25,6 +26,8 @@ def ilistdir(self, dir):
 
     def chdir(self, dir):
         print(self.id, "chdir", dir)
+        if self.fail:
+            raise OSError(self.fail)
 
     def getcwd(self):
         print(self.id, "getcwd")
@@ -158,3 +161,18 @@ def open(self, file, mode):
 uos.umount("/")
 print(uos.listdir("/"))
 uos.umount("/mnt")
+
+# chdir to a non-existent mount point (current directory should remain unchanged)
+try:
+    uos.chdir("/foo")
+except OSError:
+    print("OSError")
+print(uos.getcwd())
+
+# chdir to a non-existent subdirectory in a mounted filesystem
+uos.mount(Filesystem(5, 1), "/mnt")
+try:
+    uos.chdir("/mnt/subdir")
+except OSError:
+    print("OSError")
+print(uos.getcwd())
diff --git a/tests/extmod/vfs_basic.py.exp b/tests/extmod/vfs_basic.py.exp
index 0ae2c2cc975c4..ebca31030451b 100644
--- a/tests/extmod/vfs_basic.py.exp
+++ b/tests/extmod/vfs_basic.py.exp
@@ -58,3 +58,9 @@ OSError
 3 umount
 ['mnt']
 4 umount
+OSError
+/
+5 mount False False
+5 chdir /subdir
+OSError
+/

From 88971342b17f48fb91619620f4c4c1b5da40aaa4 Mon Sep 17 00:00:00 2001
From: Damien George <damien.p.george@gmail.com>
Date: Mon, 1 Jun 2020 21:22:03 +1000
Subject: [PATCH 0020/3533] stm32/machine_uart: Retain attached-to-repl setting
 when init'ing UART.

---
 ports/stm32/machine_uart.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/ports/stm32/machine_uart.c b/ports/stm32/machine_uart.c
index 232f3629ee6b9..1cf5817e010f7 100644
--- a/ports/stm32/machine_uart.c
+++ b/ports/stm32/machine_uart.c
@@ -283,11 +283,17 @@ STATIC mp_obj_t pyb_uart_init_helper(pyb_uart_obj_t *self, size_t n_args, const
     // flow control
     uint32_t flow = args.flow.u_int;
 
+    // Save attach_to_repl setting because uart_init will disable it.
+    bool attach_to_repl = self->attached_to_repl;
+
     // init UART (if it fails, it's because the port doesn't exist)
     if (!uart_init(self, baudrate, bits, parity, stop, flow)) {
         mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("UART(%d) doesn't exist"), self->uart_id);
     }
 
+    // Restore attach_to_repl setting so UART still works if attached to dupterm.
+    uart_attach_to_repl(self, attach_to_repl);
+
     // set timeout
     self->timeout = args.timeout.u_int;
 

From 9ae50d22c90f05bb03c6b6e97df7dffa69628fe7 Mon Sep 17 00:00:00 2001
From: Damien George <damien.p.george@gmail.com>
Date: Mon, 1 Jun 2020 21:22:32 +1000
Subject: [PATCH 0021/3533] stm32/machine_uart: Allow re-init'ing a static UART
 object.

Just disallow changing the rxbuf which will be some static RAM (can't free
it and soft-reset would lose any dynamically allocated buffer).
---
 ports/stm32/machine_uart.c | 39 ++++++++++++++++++++------------------
 1 file changed, 21 insertions(+), 18 deletions(-)

diff --git a/ports/stm32/machine_uart.c b/ports/stm32/machine_uart.c
index 1cf5817e010f7..39a45a2a16060 100644
--- a/ports/stm32/machine_uart.c
+++ b/ports/stm32/machine_uart.c
@@ -237,11 +237,6 @@ STATIC mp_obj_t pyb_uart_init_helper(pyb_uart_obj_t *self, size_t n_args, const
     mp_arg_parse_all(n_args, pos_args, kw_args,
         MP_ARRAY_SIZE(allowed_args), allowed_args, (mp_arg_val_t *)&args);
 
-    // static UARTs are used for internal purposes and shouldn't be reconfigured
-    if (self->is_static) {
-        mp_raise_ValueError(MP_ERROR_TEXT("UART is static and can't be init'd"));
-    }
-
     // baudrate
     uint32_t baudrate = args.baudrate.u_int;
 
@@ -306,20 +301,28 @@ STATIC mp_obj_t pyb_uart_init_helper(pyb_uart_obj_t *self, size_t n_args, const
         self->timeout_char = min_timeout_char;
     }
 
-    // setup the read buffer
-    m_del(byte, self->read_buf, self->read_buf_len << self->char_width);
-    if (args.rxbuf.u_int >= 0) {
-        // rxbuf overrides legacy read_buf_len
-        args.read_buf_len.u_int = args.rxbuf.u_int;
-    }
-    if (args.read_buf_len.u_int <= 0) {
-        // no read buffer
-        uart_set_rxbuf(self, 0, NULL);
+    if (self->is_static) {
+        // Static UARTs have fixed memory for the rxbuf and can't be reconfigured.
+        if (args.rxbuf.u_int >= 0) {
+            mp_raise_ValueError(MP_ERROR_TEXT("UART is static and rxbuf can't be changed"));
+        }
+        uart_set_rxbuf(self, self->read_buf_len, self->read_buf);
     } else {
-        // read buffer using interrupts
-        size_t len = args.read_buf_len.u_int + 1; // +1 to adjust for usable length of buffer
-        uint8_t *buf = m_new(byte, len << self->char_width);
-        uart_set_rxbuf(self, len, buf);
+        // setup the read buffer
+        m_del(byte, self->read_buf, self->read_buf_len << self->char_width);
+        if (args.rxbuf.u_int >= 0) {
+            // rxbuf overrides legacy read_buf_len
+            args.read_buf_len.u_int = args.rxbuf.u_int;
+        }
+        if (args.read_buf_len.u_int <= 0) {
+            // no read buffer
+            uart_set_rxbuf(self, 0, NULL);
+        } else {
+            // read buffer using interrupts
+            size_t len = args.read_buf_len.u_int + 1; // +1 to adjust for usable length of buffer
+            uint8_t *buf = m_new(byte, len << self->char_width);
+            uart_set_rxbuf(self, len, buf);
+        }
     }
 
     // compute actual baudrate that was configured

From 68d053c66eb14b29ea16efba89cf01cb879eca3e Mon Sep 17 00:00:00 2001
From: Damien George <damien.p.george@gmail.com>
Date: Mon, 1 Jun 2020 21:24:48 +1000
Subject: [PATCH 0022/3533] stm32/modmachine: Allow changing AHB and APB bus
 frequencies on STM32WB.

For now SYSCLK cannot be changed and must remain at 64MHz.
---
 ports/stm32/modmachine.c |  7 ++++++-
 ports/stm32/powerctrl.c  | 32 +++++++++++++++++++++++++++++++-
 2 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/ports/stm32/modmachine.c b/ports/stm32/modmachine.c
index 0795d2ccf04b8..6fd2488a5ae7b 100644
--- a/ports/stm32/modmachine.c
+++ b/ports/stm32/modmachine.c
@@ -307,7 +307,7 @@ STATIC mp_obj_t machine_freq(size_t n_args, const mp_obj_t *args) {
         return mp_obj_new_tuple(MP_ARRAY_SIZE(tuple), tuple);
     } else {
         // set
-        #if defined(STM32F0) || defined(STM32L0) || defined(STM32L4) || defined(STM32WB)
+        #if defined(STM32F0) || defined(STM32L0) || defined(STM32L4)
         mp_raise_NotImplementedError(MP_ERROR_TEXT("machine.freq set not supported yet"));
         #else
         mp_int_t sysclk = mp_obj_get_int(args[0]);
@@ -317,8 +317,13 @@ STATIC mp_obj_t machine_freq(size_t n_args, const mp_obj_t *args) {
             ahb /= 2;
         }
         #endif
+        #if defined(STM32WB)
+        mp_int_t apb1 = ahb;
+        mp_int_t apb2 = ahb;
+        #else
         mp_int_t apb1 = ahb / 4;
         mp_int_t apb2 = ahb / 2;
+        #endif
         if (n_args > 1) {
             ahb = mp_obj_get_int(args[1]);
             if (n_args > 2) {
diff --git a/ports/stm32/powerctrl.c b/ports/stm32/powerctrl.c
index e11de8b021fd9..946185fba09d3 100644
--- a/ports/stm32/powerctrl.c
+++ b/ports/stm32/powerctrl.c
@@ -201,7 +201,7 @@ int powerctrl_rcc_clock_config_pll(RCC_ClkInitTypeDef *rcc_init, uint32_t sysclk
 
 #endif
 
-#if !defined(STM32F0) && !defined(STM32L0) && !defined(STM32L4) && !defined(STM32WB)
+#if !defined(STM32F0) && !defined(STM32L0) && !defined(STM32L4)
 
 STATIC uint32_t calc_ahb_div(uint32_t wanted_div) {
     #if defined(STM32H7)
@@ -293,6 +293,8 @@ STATIC uint32_t calc_apb2_div(uint32_t wanted_div) {
     #endif
 }
 
+#if defined(STM32F4) || defined(STM32F7) || defined(STM32H7)
+
 int powerctrl_set_sysclk(uint32_t sysclk, uint32_t ahb, uint32_t apb1, uint32_t apb2) {
     // Return straightaway if the clocks are already at the desired frequency
     if (sysclk == HAL_RCC_GetSysClockFreq()
@@ -455,8 +457,36 @@ int powerctrl_set_sysclk(uint32_t sysclk, uint32_t ahb, uint32_t apb1, uint32_t
     return 0;
 }
 
+#elif defined(STM32WB)
+
+int powerctrl_set_sysclk(uint32_t sysclk, uint32_t ahb, uint32_t apb1, uint32_t apb2) {
+    // For now it's not supported to change SYSCLK (only bus dividers).
+    if (sysclk != HAL_RCC_GetSysClockFreq()) {
+        return -MP_EINVAL;
+    }
+
+    // Return straightaway if the clocks are already at the desired frequency.
+    if (ahb == HAL_RCC_GetHCLKFreq()
+        && apb1 == HAL_RCC_GetPCLK1Freq()
+        && apb2 == HAL_RCC_GetPCLK2Freq()) {
+        return 0;
+    }
+
+    // Calculate and configure the bus clock dividers.
+    uint32_t cfgr = RCC->CFGR;
+    cfgr &= ~(7 << RCC_CFGR_PPRE2_Pos | 7 << RCC_CFGR_PPRE1_Pos | 0xf << RCC_CFGR_HPRE_Pos);
+    cfgr |= calc_ahb_div(sysclk / ahb);
+    cfgr |= calc_apb1_div(ahb / apb1);
+    cfgr |= calc_apb2_div(ahb / apb2) << (RCC_CFGR_PPRE2_Pos - RCC_CFGR_PPRE1_Pos);
+    RCC->CFGR = cfgr;
+
+    return 0;
+}
+
 #endif
 
+#endif // !defined(STM32F0) && !defined(STM32L0) && !defined(STM32L4)
+
 void powerctrl_enter_stop_mode(void) {
     // Disable IRQs so that the IRQ that wakes the device from stop mode is not
     // executed until after the clocks are reconfigured

From 5210fc51ec251e5331cddd305ae0da012e00af3e Mon Sep 17 00:00:00 2001
From: Damien George <damien.p.george@gmail.com>
Date: Mon, 1 Jun 2020 21:29:11 +1000
Subject: [PATCH 0023/3533] stm32/adc: Add support to pyb.ADC for STM32WB MCUs.

---
 ports/stm32/adc.c                            | 37 ++++++++++++--------
 ports/stm32/boards/stm32l4xx_hal_conf_base.h |  1 +
 2 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/ports/stm32/adc.c b/ports/stm32/adc.c
index bdd4ec1aeb8e8..3793ef5ff28a2 100644
--- a/ports/stm32/adc.c
+++ b/ports/stm32/adc.c
@@ -110,14 +110,14 @@
 #define ADC_CAL2                ((uint16_t *)(0x1FF1E840))
 #define ADC_CAL_BITS            (16)
 
-#elif defined(STM32L4)
+#elif defined(STM32L4) || defined(STM32WB)
 
 #define ADC_FIRST_GPIO_CHANNEL  (1)
 #define ADC_LAST_GPIO_CHANNEL   (16)
-#define ADC_SCALE_V             (3.0f)
-#define ADC_CAL_ADDRESS         (0x1fff75aa)
-#define ADC_CAL1                ((uint16_t *)(ADC_CAL_ADDRESS - 2))
-#define ADC_CAL2                ((uint16_t *)(ADC_CAL_ADDRESS + 0x20))
+#define ADC_SCALE_V             (VREFINT_CAL_VREF / 1000.0f)
+#define ADC_CAL_ADDRESS         (VREFINT_CAL_ADDR)
+#define ADC_CAL1                (TEMPSENSOR_CAL1_ADDR)
+#define ADC_CAL2                (TEMPSENSOR_CAL2_ADDR)
 #define ADC_CAL_BITS            (12)
 
 #else
@@ -147,7 +147,8 @@
 #elif defined(STM32L432xx) || \
     defined(STM32L451xx) || defined(STM32L452xx) || \
     defined(STM32L462xx) || defined(STM32L475xx) || \
-    defined(STM32L476xx) || defined(STM32L496xx)
+    defined(STM32L476xx) || defined(STM32L496xx) || \
+    defined(STM32WB55xx)
 #define VBAT_DIV (3)
 #else
 #error Unsupported processor
@@ -203,6 +204,11 @@ STATIC bool is_adcx_channel(int channel) {
     ADC_HandleTypeDef handle;
     handle.Instance = ADCx;
     return IS_ADC_CHANNEL(&handle, channel);
+    #elif defined(STM32WB)
+    ADC_HandleTypeDef handle;
+    handle.Instance = ADCx;
+    return __HAL_ADC_IS_CHANNEL_INTERNAL(channel)
+           || IS_ADC_CHANNEL(&handle, __HAL_ADC_DECIMAL_NB_TO_CHANNEL(channel));
     #else
     #error Unsupported processor
     #endif
@@ -212,7 +218,7 @@ STATIC void adc_wait_for_eoc_or_timeout(int32_t timeout) {
     uint32_t tickstart = HAL_GetTick();
     #if defined(STM32F4) || defined(STM32F7)
     while ((ADCx->SR & ADC_FLAG_EOC) != ADC_FLAG_EOC) {
-    #elif defined(STM32F0) || defined(STM32H7) || defined(STM32L4)
+    #elif defined(STM32F0) || defined(STM32H7) || defined(STM32L4) || defined(STM32WB)
     while (READ_BIT(ADCx->ISR, ADC_FLAG_EOC) != ADC_FLAG_EOC) {
     #else
     #error Unsupported processor
@@ -229,7 +235,10 @@ STATIC void adcx_clock_enable(void) {
     #elif defined(STM32H7)
     __HAL_RCC_ADC3_CLK_ENABLE();
     __HAL_RCC_ADC_CONFIG(RCC_ADCCLKSOURCE_CLKP);
-    #elif defined(STM32L4)
+    #elif defined(STM32L4) || defined(STM32WB)
+    if (__HAL_RCC_GET_ADC_SOURCE() == RCC_ADCCLKSOURCE_NONE) {
+        __HAL_RCC_ADC_CONFIG(RCC_ADCCLKSOURCE_SYSCLK);
+    }
     __HAL_RCC_ADC_CLK_ENABLE();
     #else
     #error Unsupported processor
@@ -269,7 +278,7 @@ STATIC void adcx_init_periph(ADC_HandleTypeDef *adch, uint32_t resolution) {
     adch->Init.OversamplingMode = DISABLE;
     adch->Init.LeftBitShift = ADC_LEFTBITSHIFT_NONE;
     adch->Init.ConversionDataManagement = ADC_CONVERSIONDATA_DR;
-    #elif defined(STM32L4)
+    #elif defined(STM32L4) || defined(STM32WB)
     adch->Init.ClockPrescaler = ADC_CLOCK_ASYNC_DIV1;
     adch->Init.ScanConvMode = ADC_SCAN_DISABLE;
     adch->Init.LowPowerAutoWait = DISABLE;
@@ -286,7 +295,7 @@ STATIC void adcx_init_periph(ADC_HandleTypeDef *adch, uint32_t resolution) {
     #if defined(STM32H7)
     HAL_ADCEx_Calibration_Start(adch, ADC_CALIB_OFFSET, ADC_SINGLE_ENDED);
     #endif
-    #if defined(STM32L4)
+    #if defined(STM32L4) || defined(STM32WB)
     HAL_ADCEx_Calibration_Start(adch, ADC_SINGLE_ENDED);
     #endif
 }
@@ -313,7 +322,7 @@ STATIC void adc_init_single(pyb_obj_adc_t *adc_obj) {
 STATIC void adc_config_channel(ADC_HandleTypeDef *adc_handle, uint32_t channel) {
     ADC_ChannelConfTypeDef sConfig;
 
-    #if defined(STM32H7)
+    #if defined(STM32H7) || defined(STM32WB)
     sConfig.Rank = ADC_REGULAR_RANK_1;
     if (__HAL_ADC_IS_CHANNEL_INTERNAL(channel) == 0) {
         channel = __HAL_ADC_DECIMAL_NB_TO_CHANNEL(channel);
@@ -337,7 +346,7 @@ STATIC void adc_config_channel(ADC_HandleTypeDef *adc_handle, uint32_t channel)
     sConfig.OffsetNumber = ADC_OFFSET_NONE;
     sConfig.OffsetRightShift = DISABLE;
     sConfig.OffsetSignedSaturation = DISABLE;
-    #elif defined(STM32L4)
+    #elif defined(STM32L4) || defined(STM32WB)
     if (__HAL_ADC_IS_CHANNEL_INTERNAL(channel)) {
         sConfig.SamplingTime = ADC_SAMPLETIME_247CYCLES_5;
     } else {
@@ -523,7 +532,7 @@ STATIC mp_obj_t adc_read_timed(mp_obj_t self_in, mp_obj_t buf_in, mp_obj_t freq_
             // for subsequent samples we can just set the "start sample" bit
             #if defined(STM32F4) || defined(STM32F7)
             ADCx->CR2 |= (uint32_t)ADC_CR2_SWSTART;
-            #elif defined(STM32F0) || defined(STM32H7) || defined(STM32L4)
+            #elif defined(STM32F0) || defined(STM32H7) || defined(STM32L4) || defined(STM32WB)
             SET_BIT(ADCx->CR, ADC_CR_ADSTART);
             #else
             #error Unsupported processor
@@ -633,7 +642,7 @@ STATIC mp_obj_t adc_read_timed_multi(mp_obj_t adc_array_in, mp_obj_t buf_array_i
             // ADC is started: set the "start sample" bit
             #if defined(STM32F4) || defined(STM32F7)
             ADCx->CR2 |= (uint32_t)ADC_CR2_SWSTART;
-            #elif defined(STM32F0) || defined(STM32H7) || defined(STM32L4)
+            #elif defined(STM32F0) || defined(STM32H7) || defined(STM32L4) || defined(STM32WB)
             SET_BIT(ADCx->CR, ADC_CR_ADSTART);
             #else
             #error Unsupported processor
diff --git a/ports/stm32/boards/stm32l4xx_hal_conf_base.h b/ports/stm32/boards/stm32l4xx_hal_conf_base.h
index 7e249138f566e..cfffcffbbe134 100644
--- a/ports/stm32/boards/stm32l4xx_hal_conf_base.h
+++ b/ports/stm32/boards/stm32l4xx_hal_conf_base.h
@@ -50,6 +50,7 @@
 #include "stm32l4xx_hal_uart.h"
 #include "stm32l4xx_hal_usart.h"
 #include "stm32l4xx_hal_wwdg.h"
+#include "stm32l4xx_ll_adc.h"
 
 // Enable various HAL modules
 #define HAL_MODULE_ENABLED

From 0f7b5cceeaf48e0d9710d9a1b1be766018cc812f Mon Sep 17 00:00:00 2001
From: Damien George <damien.p.george@gmail.com>
Date: Mon, 1 Jun 2020 21:31:07 +1000
Subject: [PATCH 0024/3533] stm32/machine_adc: Make setting of ADC1_COMMON->CCR
 clearer on STM32WB.

---
 ports/stm32/machine_adc.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ports/stm32/machine_adc.c b/ports/stm32/machine_adc.c
index 5ba000a2338c8..f29896d37cf26 100644
--- a/ports/stm32/machine_adc.c
+++ b/ports/stm32/machine_adc.c
@@ -132,8 +132,10 @@ STATIC void adc_config(ADC_TypeDef *adc, uint32_t bits) {
     #elif defined(STM32H7)
     ADC12_COMMON->CCR = 3 << ADC_CCR_CKMODE_Pos;
     ADC3_COMMON->CCR = 3 << ADC_CCR_CKMODE_Pos;
-    #elif defined(STM32L0) || defined(STM32WB)
+    #elif defined(STM32L0)
     ADC1_COMMON->CCR = 0; // ADCPR=PCLK/2
+    #elif defined(STM32WB)
+    ADC1_COMMON->CCR = 0 << ADC_CCR_PRESC_Pos | 0 << ADC_CCR_CKMODE_Pos; // PRESC=1, MODE=ASYNC
     #endif
 
     #if defined(STM32H7) || defined(STM32L4) || defined(STM32WB)

From c8985d52d3fde45cea2020573a78fecc4d0de142 Mon Sep 17 00:00:00 2001
From: Damien George <damien.p.george@gmail.com>
Date: Mon, 1 Jun 2020 21:32:03 +1000
Subject: [PATCH 0025/3533] stm32/dma: Add support for DMA on STM32WB, with SPI
 settings provided.

---
 ports/stm32/dma.c | 75 +++++++++++++++++++++++++++++++++--------------
 1 file changed, 53 insertions(+), 22 deletions(-)

diff --git a/ports/stm32/dma.c b/ports/stm32/dma.c
index cbcc8542a19a2..4320315ba4e5d 100644
--- a/ports/stm32/dma.c
+++ b/ports/stm32/dma.c
@@ -34,18 +34,6 @@
 #include "dma.h"
 #include "irq.h"
 
-#if defined(STM32WB)
-
-// DMA is currently not implemented for this MCU
-
-void dma_init(DMA_HandleTypeDef *dma, const dma_descr_t *dma_descr, uint32_t dir, void *data) {
-}
-
-void dma_deinit(const dma_descr_t *dma_descr) {
-}
-
-#else
-
 #define DMA_IDLE_ENABLED()  (dma_idle.enabled != 0)
 #define DMA_SYSTICK_LOG2    (3)
 #define DMA_SYSTICK_MASK    ((1 << DMA_SYSTICK_LOG2) - 1)
@@ -82,7 +70,7 @@ typedef union {
 struct _dma_descr_t {
     #if defined(STM32F4) || defined(STM32F7) || defined(STM32H7)
     DMA_Stream_TypeDef *instance;
-    #elif defined(STM32F0) || defined(STM32L0) || defined(STM32L4)
+    #elif defined(STM32F0) || defined(STM32L0) || defined(STM32L4) || defined(STM32WB)
     DMA_Channel_TypeDef *instance;
     #else
     #error "Unsupported Processor"
@@ -97,7 +85,7 @@ struct _dma_descr_t {
 static const DMA_InitTypeDef dma_init_struct_spi_i2c = {
     #if defined(STM32F4) || defined(STM32F7)
     .Channel = 0,
-    #elif defined(STM32H7) || defined(STM32L0) || defined(STM32L4)
+    #elif defined(STM32H7) || defined(STM32L0) || defined(STM32L4) || defined(STM32WB)
     .Request = 0,
     #endif
     .Direction = 0,
@@ -120,7 +108,7 @@ static const DMA_InitTypeDef dma_init_struct_spi_i2c = {
 static const DMA_InitTypeDef dma_init_struct_sdio = {
     #if defined(STM32F4) || defined(STM32F7)
     .Channel = 0,
-    #elif defined(STM32L0) || defined(STM32L4)
+    #elif defined(STM32L0) || defined(STM32L4) || defined(STM32WB)
     .Request = 0,
     #endif
     .Direction = 0,
@@ -130,7 +118,7 @@ static const DMA_InitTypeDef dma_init_struct_sdio = {
     .MemDataAlignment = DMA_MDATAALIGN_WORD,
     #if defined(STM32F4) || defined(STM32F7)
     .Mode = DMA_PFCTRL,
-    #elif defined(STM32L0) || defined(STM32L4)
+    #elif defined(STM32L0) || defined(STM32L4) || defined(STM32WB)
     .Mode = DMA_NORMAL,
     #endif
     .Priority = DMA_PRIORITY_VERY_HIGH,
@@ -148,7 +136,7 @@ static const DMA_InitTypeDef dma_init_struct_sdio = {
 static const DMA_InitTypeDef dma_init_struct_dac = {
     #if defined(STM32F4) || defined(STM32F7)
     .Channel = 0,
-    #elif defined(STM32H7) || defined(STM32L0) || defined(STM32L4)
+    #elif defined(STM32H7) || defined(STM32L0) || defined(STM32L4) || defined(STM32WB)
     .Request = 0,
     #endif
     .Direction = 0,
@@ -438,6 +426,40 @@ static const uint8_t dma_irqn[NSTREAM] = {
     DMA2_Channel7_IRQn,
 };
 
+#elif defined(STM32WB)
+
+#define NCONTROLLERS            (2)
+#define NSTREAMS_PER_CONTROLLER (7)
+#define NSTREAM                 (NCONTROLLERS * NSTREAMS_PER_CONTROLLER)
+
+#define DMA_SUB_INSTANCE_AS_UINT8(dma_request) (dma_request)
+
+#define DMA1_ENABLE_MASK (0x007f) // Bits in dma_enable_mask corresponding to DMA1
+#define DMA2_ENABLE_MASK (0x3f80) // Bits in dma_enable_mask corresponding to DMA2
+
+// DMA1 streams
+const dma_descr_t dma_SPI_1_RX = { DMA1_Channel1, DMA_REQUEST_SPI1_RX, dma_id_0, &dma_init_struct_spi_i2c };
+const dma_descr_t dma_SPI_1_TX = { DMA1_Channel2, DMA_REQUEST_SPI1_TX, dma_id_1, &dma_init_struct_spi_i2c };
+const dma_descr_t dma_SPI_2_RX = { DMA1_Channel3, DMA_REQUEST_SPI2_RX, dma_id_2, &dma_init_struct_spi_i2c };
+const dma_descr_t dma_SPI_2_TX = { DMA1_Channel4, DMA_REQUEST_SPI2_TX, dma_id_3, &dma_init_struct_spi_i2c };
+
+static const uint8_t dma_irqn[NSTREAM] = {
+    DMA1_Channel1_IRQn,
+    DMA1_Channel2_IRQn,
+    DMA1_Channel3_IRQn,
+    DMA1_Channel4_IRQn,
+    DMA1_Channel5_IRQn,
+    DMA1_Channel6_IRQn,
+    DMA1_Channel7_IRQn,
+    DMA2_Channel1_IRQn,
+    DMA2_Channel2_IRQn,
+    DMA2_Channel3_IRQn,
+    DMA2_Channel4_IRQn,
+    DMA2_Channel5_IRQn,
+    DMA2_Channel6_IRQn,
+    DMA2_Channel7_IRQn,
+};
+
 #elif defined(STM32H7)
 
 #define NCONTROLLERS            (2)
@@ -717,7 +739,7 @@ void DMA1_Channel4_5_6_7_IRQHandler(void) {
     IRQ_EXIT(DMA1_Channel4_5_6_7_IRQn);
 }
 
-#elif defined(STM32L4)
+#elif defined(STM32L4) || defined(STM32WB)
 
 void DMA1_Channel1_IRQHandler(void) {
     IRQ_ENTER(DMA1_Channel1_IRQn);
@@ -836,6 +858,13 @@ static void dma_enable_clock(dma_id_t dma_id) {
     dma_enable_mask |= (1 << dma_id);
     MICROPY_END_ATOMIC_SECTION(irq_state);
 
+    #if defined(STM32WB)
+    // This MCU has a DMAMUX peripheral which needs to be enabled to multiplex the channels.
+    if (!__HAL_RCC_DMAMUX1_IS_CLK_ENABLED()) {
+        __HAL_RCC_DMAMUX1_CLK_ENABLE();
+    }
+    #endif
+
     if (dma_id < NSTREAMS_PER_CONTROLLER) {
         if (((old_enable_mask & DMA1_ENABLE_MASK) == 0) && !DMA1_IS_CLK_ENABLED()) {
             __HAL_RCC_DMA1_CLK_ENABLE();
@@ -877,7 +906,7 @@ void dma_init_handle(DMA_HandleTypeDef *dma, const dma_descr_t *dma_descr, uint3
     dma->Instance = dma_descr->instance;
     dma->Init = *dma_descr->init;
     dma->Init.Direction = dir;
-    #if defined(STM32L0) || defined(STM32L4) || defined(STM32H7)
+    #if defined(STM32L0) || defined(STM32L4) || defined(STM32H7) || defined(STM32WB)
     dma->Init.Request = dma_descr->sub_instance;
     #else
     #if !defined(STM32F0)
@@ -904,7 +933,7 @@ void dma_init(DMA_HandleTypeDef *dma, const dma_descr_t *dma_descr, uint32_t dir
 
         dma_enable_clock(dma_id);
 
-        #if defined(STM32H7) || defined(STM32L0) || defined(STM32L4)
+        #if defined(STM32H7) || defined(STM32L0) || defined(STM32L4) || defined(STM32WB)
         // Always reset and configure the H7 and L0/L4 DMA peripheral
         // (dma->State is set to HAL_DMA_STATE_RESET by memset above)
         // TODO: understand how L0/L4 DMA works so this is not needed
@@ -1062,6 +1091,10 @@ void dma_nohal_start(const dma_descr_t *descr, uint32_t src_addr, uint32_t dst_a
     dma->CCR |= DMA_CCR_EN;
 }
 
+#elif defined(STM32WB)
+
+// These functions are currently not implemented or needed for this MCU.
+
 #else
 
 void dma_nohal_init(const dma_descr_t *descr, uint32_t config) {
@@ -1135,5 +1168,3 @@ void dma_nohal_start(const dma_descr_t *descr, uint32_t src_addr, uint32_t dst_a
 }
 
 #endif
-
-#endif // defined(STM32WB)

From 246f3f640dd635f67269bfdbebe23408f77cd2b0 Mon Sep 17 00:00:00 2001
From: Damien George <damien.p.george@gmail.com>
Date: Mon, 1 Jun 2020 21:38:11 +1000
Subject: [PATCH 0026/3533] stm32/boards/xxx_WB55: Enable pyb.ADC and hardware
 SPI on WB55 boards.

These features are now supported (although machine.ADC is recommended over
pyb.ADC).
---
 ports/stm32/boards/NUCLEO_WB55/mpconfigboard.h    | 3 ---
 ports/stm32/boards/USBDONGLE_WB55/mpconfigboard.h | 6 +++++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/ports/stm32/boards/NUCLEO_WB55/mpconfigboard.h b/ports/stm32/boards/NUCLEO_WB55/mpconfigboard.h
index 2992ccce71772..2061349417c64 100644
--- a/ports/stm32/boards/NUCLEO_WB55/mpconfigboard.h
+++ b/ports/stm32/boards/NUCLEO_WB55/mpconfigboard.h
@@ -10,7 +10,6 @@
 #define MICROPY_HW_HAS_FLASH        (1)
 #define MICROPY_HW_ENABLE_RTC       (1)
 #define MICROPY_HW_ENABLE_RNG       (1)
-#define MICROPY_HW_ENABLE_ADC       (0)
 #define MICROPY_HW_ENABLE_USB       (1)
 #define MICROPY_HW_HAS_SWITCH       (1)
 
@@ -34,7 +33,6 @@
 #define MICROPY_HW_I2C3_SDA         (pin_C1)    // Arduino A1, pin 30 on CN7
 
 // SPI buses
-#if 0 // TODO need working DMA
 #define MICROPY_HW_SPI1_NSS         (pin_A4)    // Arduino D10  pin 17 on CN10
 #define MICROPY_HW_SPI1_SCK         (pin_A5)    // Arduino D13, pin 11 on CN10
 #define MICROPY_HW_SPI1_MISO        (pin_A6)    // Arduino D12, pin 13 on CN10
@@ -43,7 +41,6 @@
 #define MICROPY_HW_SPI2_SCK         (pin_B13)   //              pin 30 on CN10
 #define MICROPY_HW_SPI2_MISO        (pin_B14)   //              pin 28 on CN10
 #define MICROPY_HW_SPI2_MOSI        (pin_B15)   //              pin 26 on CN10
-#endif
 
 // User switch; pressing the button makes the input go low
 #define MICROPY_HW_USRSW_PIN        (pin_C4)
diff --git a/ports/stm32/boards/USBDONGLE_WB55/mpconfigboard.h b/ports/stm32/boards/USBDONGLE_WB55/mpconfigboard.h
index 0ff751d613a54..fdb061900b898 100644
--- a/ports/stm32/boards/USBDONGLE_WB55/mpconfigboard.h
+++ b/ports/stm32/boards/USBDONGLE_WB55/mpconfigboard.h
@@ -10,7 +10,6 @@
 #define MICROPY_HW_HAS_FLASH        (1)
 #define MICROPY_HW_ENABLE_RTC       (1)
 #define MICROPY_HW_ENABLE_RNG       (1)
-#define MICROPY_HW_ENABLE_ADC       (0)
 #define MICROPY_HW_ENABLE_USB       (1)
 #define MICROPY_HW_HAS_SWITCH       (1)
 
@@ -24,6 +23,11 @@
 #define MICROPY_HW_I2C1_SCL         (pin_B8)
 #define MICROPY_HW_I2C1_SDA         (pin_B9)
 
+// SPI buses
+#define MICROPY_HW_SPI1_SCK         (pin_A5) // pin 8 on CN1
+#define MICROPY_HW_SPI1_MISO        (pin_A6) // pin 9 on CN1
+#define MICROPY_HW_SPI1_MOSI        (pin_A7) // pin 10 on CN1
+
 // User switch; pressing the button makes the input go low
 #define MICROPY_HW_USRSW_PIN        (pin_A10)
 #define MICROPY_HW_USRSW_PULL       (GPIO_PULLUP)

From a4086a2f13732c88f81f535982288e6729a9f7db Mon Sep 17 00:00:00 2001
From: David Spickett <david.spickett@linaro.org>
Date: Fri, 29 May 2020 13:42:08 +0100
Subject: [PATCH 0027/3533] qemu-arm/README: Update link to toolchain.

New releases have moved from launchpad to developer.arm.com.
---
 ports/qemu-arm/README.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/ports/qemu-arm/README.md b/ports/qemu-arm/README.md
index 4f1e79b101772..2c815c54b088a 100644
--- a/ports/qemu-arm/README.md
+++ b/ports/qemu-arm/README.md
@@ -15,8 +15,9 @@ The purposes of this port are to enable:
     - no need to use OpenOCD or anything else that might slow down the
       process in terms of plugging things together, pressing buttons, etc.
 
-This port will only work with with [GCC ARM Embedded](launchpad.net/gcc-arm-embedded)
-toolchain and not with CodeSourcery toolchain. You will need to modify
+This port will only work with the [GNU ARM Embedded Toolchain](
+https://developer.arm.com/tools-and-software/open-source-software/developer-tools/gnu-toolchain/gnu-rm)
+ and not with CodeSourcery toolchain. You will need to modify
 `LDFLAGS` if you want to use CodeSourcery's version of `arm-none-eabi`.
 The difference is that CodeSourcery needs `-T generic-m-hosted.ld` while
 ARM's version  requires `--specs=nano.specs --specs=rdimon.specs` to be

From da71f55e23a97102d241481e410fdb22d7c55758 Mon Sep 17 00:00:00 2001
From: stinos <stinos@users.noreply.github.com>
Date: Fri, 29 May 2020 20:46:46 +0200
Subject: [PATCH 0028/3533] stm32/Makefile: Quote libgcc path so spaces are not
 an issue.

Fixes #3116.
---
 ports/stm32/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/stm32/Makefile b/ports/stm32/Makefile
index fdea95e92f5c9..2614d4aa0fcf0 100644
--- a/ports/stm32/Makefile
+++ b/ports/stm32/Makefile
@@ -124,7 +124,7 @@ endif
 
 LDFLAGS = -nostdlib -L $(LD_DIR) $(addprefix -T,$(LD_FILES)) -Map=$(@:.elf=.map) --cref
 LDFLAGS += --defsym=_estack_reserve=8
-LIBS = $(shell $(CC) $(CFLAGS) -print-libgcc-file-name)
+LIBS = "$(shell $(CC) $(CFLAGS) -print-libgcc-file-name)"
 
 # Remove uncalled code from the final image.
 CFLAGS += -fdata-sections -ffunction-sections

From 203b10703e5df20939b88a2ce29bb961cce7e4b6 Mon Sep 17 00:00:00 2001
From: Damien George <damien.p.george@gmail.com>
Date: Fri, 29 May 2020 10:28:38 +1000
Subject: [PATCH 0029/3533] py/modbuiltins: Fix getattr to work with class
 raising AttributeError.

Fixes issue #6089.
---
 py/modbuiltins.c                |  6 +++++-
 tests/basics/builtin_getattr.py | 12 ++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/py/modbuiltins.c b/py/modbuiltins.c
index 85d30ab66d052..cfbfc5a25683e 100644
--- a/py/modbuiltins.c
+++ b/py/modbuiltins.c
@@ -558,7 +558,11 @@ MP_DEFINE_CONST_FUN_OBJ_KW(mp_builtin_sorted_obj, 1, mp_builtin_sorted);
 static inline mp_obj_t mp_load_attr_default(mp_obj_t base, qstr attr, mp_obj_t defval) {
     mp_obj_t dest[2];
     // use load_method, raising or not raising exception
-    ((defval == MP_OBJ_NULL) ? mp_load_method : mp_load_method_maybe)(base, attr, dest);
+    if (defval == MP_OBJ_NULL) {
+        mp_load_method(base, attr, dest);
+    } else {
+        mp_load_method_protected(base, attr, dest, false);
+    }
     if (dest[0] == MP_OBJ_NULL) {
         return defval;
     } else if (dest[1] == MP_OBJ_NULL) {
diff --git a/tests/basics/builtin_getattr.py b/tests/basics/builtin_getattr.py
index 59cb7e7f7a4b1..afa4ab3293ca6 100644
--- a/tests/basics/builtin_getattr.py
+++ b/tests/basics/builtin_getattr.py
@@ -16,3 +16,15 @@ def meth(self, i):
 print(getattr(a, "_none_such", 123))
 print(getattr(list, "foo", 456))
 print(getattr(a, "va" + "r2"))
+
+# test a class that defines __getattr__ and may raise AttributeError
+class B:
+    def __getattr__(self, attr):
+        if attr == "a":
+            return attr
+        else:
+            raise AttributeError
+b = B()
+print(getattr(b, "a"))
+print(getattr(b, "a", "default"))
+print(getattr(b, "b", "default"))

From b2030e1661ccf58cb0f62cba0c2009f97ebbf455 Mon Sep 17 00:00:00 2001
From: Damien George <damien.p.george@gmail.com>
Date: Sat, 30 May 2020 07:34:40 +1000
Subject: [PATCH 0030/3533] lib/utils/pyexec: Add missing MP_ERROR_TEXT when
 compiler disabled.

---
 lib/utils/pyexec.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/utils/pyexec.c b/lib/utils/pyexec.c
index ec20daff4b23d..2c8ca2de0cecc 100644
--- a/lib/utils/pyexec.c
+++ b/lib/utils/pyexec.c
@@ -96,7 +96,7 @@ STATIC int parse_compile_execute(const void *source, mp_parse_input_kind_t input
             mp_parse_tree_t parse_tree = mp_parse(lex, input_kind);
             module_fun = mp_compile(&parse_tree, source_name, exec_flags & EXEC_FLAG_IS_REPL);
             #else
-            mp_raise_msg(&mp_type_RuntimeError, "script compilation not supported");
+            mp_raise_msg(&mp_type_RuntimeError, MP_ERROR_TEXT("script compilation not supported"));
             #endif
         }
 

From 8e591d412a9922d71629f4fea74954d547f0c955 Mon Sep 17 00:00:00 2001
From: Damien George <damien.p.george@gmail.com>
Date: Sat, 30 May 2020 07:35:19 +1000
Subject: [PATCH 0031/3533] minimal: Make build more flexible and work as
 64-bit build.

Changes are:
- string0 is no longer built when building for host as the target, because
  it'll be provided by the system libc and may in some cases clash with the
  system one (eg on OSX).
- mp_int_t/mp_uint_t are defined in terms of intptr_t/uintptr_t to support
  both 32-bit and 64-bit builds.
- Configuration values which are the default in py/mpconfig.h are removed
  from mpconfigport.h to make the configuration a bit more minimal, eg as
  a better starting point for new ports.
---
 ports/minimal/Makefile       |  5 ++++-
 ports/minimal/main.c         |  2 ++
 ports/minimal/mpconfigport.h | 32 ++------------------------------
 3 files changed, 8 insertions(+), 31 deletions(-)

diff --git a/ports/minimal/Makefile b/ports/minimal/Makefile
index 5801d64087b21..bce544ec176b5 100644
--- a/ports/minimal/Makefile
+++ b/ports/minimal/Makefile
@@ -49,10 +49,13 @@ SRC_C = \
 	lib/utils/printf.c \
 	lib/utils/stdout_helpers.c \
 	lib/utils/pyexec.c \
-	lib/libc/string0.c \
 	lib/mp-readline/readline.c \
 	$(BUILD)/_frozen_mpy.c \
 
+ifeq ($(CROSS), 1)
+SRC_C += lib/libc/string0.c
+endif
+
 OBJ = $(PY_CORE_O) $(addprefix $(BUILD)/, $(SRC_C:.c=.o))
 
 ifeq ($(CROSS), 1)
diff --git a/ports/minimal/main.c b/ports/minimal/main.c
index 6943ee7589f39..aa6d10ee3750c 100644
--- a/ports/minimal/main.c
+++ b/ports/minimal/main.c
@@ -60,6 +60,7 @@ int main(int argc, char **argv) {
     return 0;
 }
 
+#if MICROPY_ENABLE_GC
 void gc_collect(void) {
     // WARNING: This gc_collect implementation doesn't try to get root
     // pointers from CPU registers, and thus may function incorrectly.
@@ -69,6 +70,7 @@ void gc_collect(void) {
     gc_collect_end();
     gc_dump_info();
 }
+#endif
 
 mp_lexer_t *mp_lexer_new_from_file(const char *filename) {
     mp_raise_OSError(MP_ENOENT);
diff --git a/ports/minimal/mpconfigport.h b/ports/minimal/mpconfigport.h
index 2507d0124d1ca..c3bdf66c10ae2 100644
--- a/ports/minimal/mpconfigport.h
+++ b/ports/minimal/mpconfigport.h
@@ -11,31 +11,18 @@
 #define MICROPY_QSTR_EXTRA_POOL     mp_qstr_frozen_const_pool
 #define MICROPY_ALLOC_PATH_MAX      (256)
 #define MICROPY_ALLOC_PARSE_CHUNK_INIT (16)
-#define MICROPY_EMIT_X64            (0)
-#define MICROPY_EMIT_THUMB          (0)
-#define MICROPY_EMIT_INLINE_THUMB   (0)
-#define MICROPY_COMP_MODULE_CONST   (0)
 #define MICROPY_COMP_CONST          (0)
 #define MICROPY_COMP_DOUBLE_TUPLE_ASSIGN (0)
-#define MICROPY_COMP_TRIPLE_TUPLE_ASSIGN (0)
-#define MICROPY_MEM_STATS           (0)
-#define MICROPY_DEBUG_PRINTERS      (0)
 #define MICROPY_ENABLE_GC           (1)
 #define MICROPY_GC_ALLOC_THRESHOLD  (0)
-#define MICROPY_REPL_EVENT_DRIVEN   (0)
 #define MICROPY_HELPER_REPL         (1)
-#define MICROPY_HELPER_LEXER_UNIX   (0)
-#define MICROPY_ENABLE_SOURCE_LINE  (0)
-#define MICROPY_ENABLE_DOC_STRING   (0)
 #define MICROPY_ERROR_REPORTING     (MICROPY_ERROR_REPORTING_TERSE)
 #define MICROPY_BUILTIN_METHOD_CHECK_SELF_ARG (0)
 #define MICROPY_PY_ASYNC_AWAIT      (0)
 #define MICROPY_PY_BUILTINS_BYTEARRAY (0)
 #define MICROPY_PY_BUILTINS_DICT_FROMKEYS (0)
-#define MICROPY_PY_BUILTINS_MEMORYVIEW (0)
 #define MICROPY_PY_BUILTINS_ENUMERATE (0)
 #define MICROPY_PY_BUILTINS_FILTER  (0)
-#define MICROPY_PY_BUILTINS_FROZENSET (0)
 #define MICROPY_PY_BUILTINS_REVERSED (0)
 #define MICROPY_PY_BUILTINS_SET     (0)
 #define MICROPY_PY_BUILTINS_SLICE   (0)
@@ -48,34 +35,19 @@
 #define MICROPY_PY_ARRAY            (0)
 #define MICROPY_PY_ATTRTUPLE        (0)
 #define MICROPY_PY_COLLECTIONS      (0)
-#define MICROPY_PY_MATH             (0)
-#define MICROPY_PY_CMATH            (0)
 #define MICROPY_PY_IO               (0)
 #define MICROPY_PY_STRUCT           (0)
 #define MICROPY_PY_SYS              (0)
 #define MICROPY_MODULE_FROZEN_MPY   (1)
 #define MICROPY_CPYTHON_COMPAT      (0)
 #define MICROPY_MODULE_GETATTR      (0)
-#define MICROPY_LONGINT_IMPL        (MICROPY_LONGINT_IMPL_NONE)
-#define MICROPY_FLOAT_IMPL          (MICROPY_FLOAT_IMPL_NONE)
 
 // type definitions for the specific machine
 
-#define MICROPY_MAKE_POINTER_CALLABLE(p) ((void *)((mp_uint_t)(p) | 1))
-
-// This port is intended to be 32-bit, but unfortunately, int32_t for
-// different targets may be defined in different ways - either as int
-// or as long. This requires different printf formatting specifiers
-// to print such value. So, we avoid int32_t and use int directly.
-#define UINT_FMT "%u"
-#define INT_FMT "%d"
-typedef int mp_int_t; // must be pointer size
-typedef unsigned mp_uint_t; // must be pointer size
-
+typedef intptr_t mp_int_t; // must be pointer size
+typedef uintptr_t mp_uint_t; // must be pointer size
 typedef long mp_off_t;
 
-#define MP_PLAT_PRINT_STRN(str, len) mp_hal_stdout_tx_strn_cooked(str, len)
-
 // extra built in names to add to the global namespace
 #define MICROPY_PORT_BUILTINS \
     { MP_ROM_QSTR(MP_QSTR_open), MP_ROM_PTR(&mp_builtin_open_obj) },

From e54626f4c1b5cb4de0b5dc86d820bb36c1d6499f Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew@alelec.net>
Date: Mon, 1 Jun 2020 16:16:25 +1000
Subject: [PATCH 0032/3533] docs/reference: Add note about multiple exceptions
 when heap is locked.

---
 docs/reference/isr_rules.rst | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/docs/reference/isr_rules.rst b/docs/reference/isr_rules.rst
index 57690ac212c64..7f466ab42f41c 100644
--- a/docs/reference/isr_rules.rst
+++ b/docs/reference/isr_rules.rst
@@ -43,6 +43,11 @@ for the purpose. Debugging is simplified if the following code is included in an
     import micropython
     micropython.alloc_emergency_exception_buf(100)
 
+The emergency exception buffer can only hold one exception stack trace. This means that if a second exception is
+thrown during the handling of an exception while the heap is locked, that second exception's stack trace will
+replace the original one - even if the second exception is cleanly handled. This can lead to confusing exception
+messages if the buffer is later printed.
+
 Simplicity
 ~~~~~~~~~~
 

From 02cc4462b70729a42cb127c840fee891dd08a0d4 Mon Sep 17 00:00:00 2001
From: Philipp Ebensberger <philipp.ebensberger@3bricks-software.de>
Date: Sun, 12 Apr 2020 22:00:06 +0200
Subject: [PATCH 0033/3533] mimxrt: Add initial impl of machine.LED class, and
 basic pin support.

This commit implements an LED class with rudimentary parts of a pin C API
to support it.  The LED class does not yet support setting an intensity.

This LED class is put in the machine module for the time being, until a
better place is found.

One LED is supported on TEENSY40 and MIMXRT1010_EVK boards.
---
 ports/mimxrt/Makefile                         |  11 +-
 ports/mimxrt/board_init.c                     |  14 ---
 .../boards/MIMXRT1010_EVK/mpconfigboard.h     |   7 +-
 ports/mimxrt/boards/MIMXRT1010_EVK/pins.c     |  33 ++++++
 ports/mimxrt/boards/MIMXRT1010_EVK/pins.h     |  30 ++++++
 ports/mimxrt/boards/TEENSY40/mpconfigboard.h  |   7 +-
 ports/mimxrt/boards/TEENSY40/pins.c           |  33 ++++++
 ports/mimxrt/boards/TEENSY40/pins.h           |  30 ++++++
 ports/mimxrt/led.c                            | 102 ++++++++++++++++++
 ports/mimxrt/led.h                            |  56 ++++++++++
 ports/mimxrt/machine_led.c                    |  91 ++++++++++++++++
 ports/mimxrt/main.c                           |   2 +
 ports/mimxrt/modmachine.c                     |   4 +
 ports/mimxrt/mphalport.h                      |   4 +
 ports/mimxrt/pin.c                            |  37 +++++++
 ports/mimxrt/pin.h                            | 100 +++++++++++++++++
 16 files changed, 540 insertions(+), 21 deletions(-)
 create mode 100644 ports/mimxrt/boards/MIMXRT1010_EVK/pins.c
 create mode 100644 ports/mimxrt/boards/MIMXRT1010_EVK/pins.h
 create mode 100644 ports/mimxrt/boards/TEENSY40/pins.c
 create mode 100644 ports/mimxrt/boards/TEENSY40/pins.h
 create mode 100644 ports/mimxrt/led.c
 create mode 100644 ports/mimxrt/led.h
 create mode 100644 ports/mimxrt/machine_led.c
 create mode 100644 ports/mimxrt/pin.c
 create mode 100644 ports/mimxrt/pin.h

diff --git a/ports/mimxrt/Makefile b/ports/mimxrt/Makefile
index cbd2b8595791a..c4ea70128e0ad 100644
--- a/ports/mimxrt/Makefile
+++ b/ports/mimxrt/Makefile
@@ -88,9 +88,13 @@ SRC_TINYUSB_IMX_C += \
 
 SRC_C = \
 	main.c \
+	led.c \
+	pin.c \
 	tusb_port.c \
 	board_init.c \
 	$(BOARD_DIR)/flash_config.c \
+	$(BOARD_DIR)/pins.c \
+	machine_led.c \
 	modutime.c \
 	modmachine.c \
 	mphalport.c \
@@ -108,7 +112,12 @@ SRC_SS = $(MCU_DIR)/gcc/startup_$(MCU_SERIES).S
 SRC_S = lib/utils/gchelper_m3.s \
 
 # List of sources for qstr extraction
-SRC_QSTR += modutime.c modmachine.c
+SRC_QSTR += \
+	machine_led.c \
+	modutime.c \
+	modmachine.c \
+	pin.c \
+	$(BOARD_DIR)/pins.c \
 
 OBJ += $(PY_O)
 OBJ += $(addprefix $(BUILD)/, $(SRC_C:.c=.o))
diff --git a/ports/mimxrt/board_init.c b/ports/mimxrt/board_init.c
index a3c27b045bba5..6f5235d3b635b 100644
--- a/ports/mimxrt/board_init.c
+++ b/ports/mimxrt/board_init.c
@@ -45,8 +45,6 @@ volatile uint32_t systick_ms = 0;
 
 const uint8_t dcd_data[] = { 0x00 };
 
-void board_led_write(bool state);
-
 void board_init(void) {
     // Init clock
     BOARD_BootClockRUN();
@@ -58,14 +56,6 @@ void board_init(void) {
     // 1ms tick timer
     SysTick_Config(SystemCoreClock / 1000);
 
-    // LED
-    IOMUXC_SetPinMux(MICROPY_HW_LED_PINMUX, 0U);
-    IOMUXC_SetPinConfig(MICROPY_HW_LED_PINMUX, 0x10B0U);
-
-    gpio_pin_config_t led_config = { kGPIO_DigitalOutput, 0, kGPIO_NoIntmode };
-    GPIO_PinInit(MICROPY_HW_LED_PORT, MICROPY_HW_LED_PIN, &led_config);
-    board_led_write(true);
-
     // ------------- USB0 ------------- //
 
     // Clock
@@ -95,10 +85,6 @@ void board_init(void) {
     //  CLOCK_EnableUsbhs1Clock(kCLOCK_Usb480M, 480000000U);
 }
 
-void board_led_write(bool state) {
-    GPIO_PinWrite(MICROPY_HW_LED_PORT, MICROPY_HW_LED_PIN, state ? LED_STATE_ON : (1 - LED_STATE_ON));
-}
-
 void SysTick_Handler(void) {
     systick_ms++;
 }
diff --git a/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.h b/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.h
index 02d34fc42f052..eeddd0e0213fb 100644
--- a/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.h
+++ b/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.h
@@ -3,6 +3,7 @@
 
 #define BOARD_FLASH_SIZE (16 * 1024 * 1024)
 
-#define MICROPY_HW_LED_PINMUX  IOMUXC_GPIO_11_GPIOMUX_IO11
-#define MICROPY_HW_LED_PORT    GPIO1
-#define MICROPY_HW_LED_PIN     11
+// i.MX RT1010 EVK has 1 board LED
+#define MICROPY_HW_LED1_PIN (GPIO_11)
+#define MICROPY_HW_LED_ON(pin) (mp_hal_pin_high(pin))
+#define MICROPY_HW_LED_OFF(pin) (mp_hal_pin_low(pin))
diff --git a/ports/mimxrt/boards/MIMXRT1010_EVK/pins.c b/ports/mimxrt/boards/MIMXRT1010_EVK/pins.c
new file mode 100644
index 0000000000000..e0397e09edb21
--- /dev/null
+++ b/ports/mimxrt/boards/MIMXRT1010_EVK/pins.c
@@ -0,0 +1,33 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 Philipp Ebensberger
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "pin.h"
+
+static pin_af_obj_t GPIO_11_af[] = {
+    PIN_AF(GPIOMUX_IO11, PIN_AF_MODE_ALT5, GPIO1, 0x10B0U),
+};
+
+pin_obj_t GPIO_11 = PIN(GPIO_11, GPIO1, 5, GPIO_11_af);
diff --git a/ports/mimxrt/boards/MIMXRT1010_EVK/pins.h b/ports/mimxrt/boards/MIMXRT1010_EVK/pins.h
new file mode 100644
index 0000000000000..99534932a19d5
--- /dev/null
+++ b/ports/mimxrt/boards/MIMXRT1010_EVK/pins.h
@@ -0,0 +1,30 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 Philipp Ebensberger
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+// NOTE: pins.h shall only be included in in pin.h
+// hence no include guards are needed since they will be provided by pin.h
+
+extern pin_obj_t GPIO_11;
diff --git a/ports/mimxrt/boards/TEENSY40/mpconfigboard.h b/ports/mimxrt/boards/TEENSY40/mpconfigboard.h
index 10c8b7a6d1ffa..7d564785797ad 100644
--- a/ports/mimxrt/boards/TEENSY40/mpconfigboard.h
+++ b/ports/mimxrt/boards/TEENSY40/mpconfigboard.h
@@ -3,6 +3,7 @@
 
 #define BOARD_FLASH_SIZE (2 * 1024 * 1024)
 
-#define MICROPY_HW_LED_PINMUX   IOMUXC_GPIO_B0_03_GPIO2_IO03 // D13
-#define MICROPY_HW_LED_PORT     GPIO2
-#define MICROPY_HW_LED_PIN      3
+// Teensy 4.0 has 1 board LED
+#define MICROPY_HW_LED1_PIN (GPIO_B0_03)
+#define MICROPY_HW_LED_ON(pin) (mp_hal_pin_high(pin))
+#define MICROPY_HW_LED_OFF(pin) (mp_hal_pin_low(pin))
diff --git a/ports/mimxrt/boards/TEENSY40/pins.c b/ports/mimxrt/boards/TEENSY40/pins.c
new file mode 100644
index 0000000000000..c7bfc102d4350
--- /dev/null
+++ b/ports/mimxrt/boards/TEENSY40/pins.c
@@ -0,0 +1,33 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 Philipp Ebensberger
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "pin.h"
+
+static pin_af_obj_t GPIO_B0_03_af[] = {
+    PIN_AF(GPIO2_IO03, PIN_AF_MODE_ALT5, GPIO2, 0x10B0U),
+};
+
+pin_obj_t GPIO_B0_03 = PIN(GPIO_B0_03, GPIO2, 3, GPIO_B0_03_af);
diff --git a/ports/mimxrt/boards/TEENSY40/pins.h b/ports/mimxrt/boards/TEENSY40/pins.h
new file mode 100644
index 0000000000000..c0b6dcdfa9576
--- /dev/null
+++ b/ports/mimxrt/boards/TEENSY40/pins.h
@@ -0,0 +1,30 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 Philipp Ebensberger
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+// NOTE: pins.h shall only be included in in pin.h
+// hence no include guards are needed since they will be provided by pin.h
+
+extern pin_obj_t GPIO_B0_03;
diff --git a/ports/mimxrt/led.c b/ports/mimxrt/led.c
new file mode 100644
index 0000000000000..bec97dd8f7cc4
--- /dev/null
+++ b/ports/mimxrt/led.c
@@ -0,0 +1,102 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 Philipp Ebensberger
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "fsl_gpio.h"
+#include "fsl_iomuxc.h"
+
+#include "py/runtime.h"
+#include "py/mphal.h"
+#include "led.h"
+
+#if NUM_LEDS
+
+const machine_led_obj_t machine_led_obj[NUM_LEDS] = {
+    {
+        .base = {&machine_led_type},
+        .led_id = 1U,
+        .led_pin = &MICROPY_HW_LED1_PIN,
+    }
+};
+
+void led_init(void) {
+    // Turn off LEDs and initialize
+    for (mp_int_t led = 0; led < NUM_LEDS; led++) {
+        const pin_obj_t *led_pin = machine_led_obj[led].led_pin;
+
+        gpio_pin_config_t pin_config = {
+            .outputLogic = 1U,
+            .direction = kGPIO_DigitalOutput,
+            .interruptMode = kGPIO_NoIntmode,
+        };
+
+        GPIO_PinInit(led_pin->gpio, led_pin->pin, &pin_config);
+
+        // ALT mode for GPIO is always 5
+        IOMUXC_SetPinMux(led_pin->muxRegister, 5U, 0, 0, led_pin->configRegister,
+            1U);                 // Software Input On Field: Input Path is determined by functionality
+        IOMUXC_SetPinConfig(led_pin->muxRegister, 5U, 0, 0, led_pin->configRegister, 0x10B0U);
+        MICROPY_HW_LED_OFF(led_pin);
+    }
+}
+
+void led_state(machine_led_t led, int state) {
+    if (led < 1 || led > NUM_LEDS) {
+        return;
+    }
+
+    const pin_obj_t *led_pin = machine_led_obj[led - 1].led_pin;
+
+    if (state == 0) {
+        // turn LED off
+        MICROPY_HW_LED_OFF(led_pin);
+    } else {
+        // turn LED on
+        MICROPY_HW_LED_ON(led_pin);
+    }
+}
+
+void led_toggle(machine_led_t led) {
+    if (led < 1 || led > NUM_LEDS) {
+        return;
+    }
+
+    const pin_obj_t *led_pin = machine_led_obj[led - 1].led_pin;
+    mp_hal_pin_toggle(led_pin);
+}
+
+void led_debug(int value, int delay) {
+    for (mp_int_t i = 0; i < NUM_LEDS; i++) {
+        led_state(i + 1, (value & (1 << i)));
+    }
+    mp_hal_delay_ms(delay);
+}
+
+#else
+
+void led_init(void) {
+}
+
+#endif
diff --git a/ports/mimxrt/led.h b/ports/mimxrt/led.h
new file mode 100644
index 0000000000000..35418321d173d
--- /dev/null
+++ b/ports/mimxrt/led.h
@@ -0,0 +1,56 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 Philipp Ebensberger
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#ifndef MICROPY_INCLUDED_MIMXRT_LED_H
+#define MICROPY_INCLUDED_MIMXRT_LED_H
+
+#include "pin.h"
+
+#if defined(MICROPY_HW_LED1_PIN)
+#define NUM_LEDS (1)
+#else
+#define NUM_LEDS (0)
+#endif
+
+typedef enum {
+    MACHINE_BOARD_LED = 1,
+} machine_led_t;
+
+typedef struct _machine_led_obj_t {
+    mp_obj_base_t base;
+    mp_uint_t led_id;
+    const pin_obj_t *led_pin;
+} machine_led_obj_t;
+
+void led_init(void);
+void led_state(machine_led_t led, int state);
+void led_toggle(machine_led_t led);
+void led_debug(int value, int delay);
+
+extern const mp_obj_type_t machine_led_type;
+extern const machine_led_obj_t machine_led_obj[NUM_LEDS];
+
+#endif // MICROPY_INCLUDED_MIMXRT_LED_H
diff --git a/ports/mimxrt/machine_led.c b/ports/mimxrt/machine_led.c
new file mode 100644
index 0000000000000..07c7b180a10e6
--- /dev/null
+++ b/ports/mimxrt/machine_led.c
@@ -0,0 +1,91 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 Philipp Ebensberger
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "py/runtime.h"
+#include "py/mphal.h"
+#include "led.h"
+
+#if NUM_LEDS
+
+STATIC void led_obj_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+    (void)kind;
+    machine_led_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    mp_printf(print, "LED(%u)", self->led_id);
+}
+
+STATIC mp_obj_t led_obj_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
+    mp_arg_check_num(n_args, n_kw, 1, 1, false);
+
+    // Extract arguments
+    mp_int_t led_id = mp_obj_get_int(args[0]);
+
+    // Check led id is in range
+    if (!(1 <= led_id && led_id <= NUM_LEDS)) {
+        nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError, "LED(%d) doesn't exist", led_id));
+    }
+
+    // Return reference to static object
+    return MP_OBJ_FROM_PTR(&machine_led_obj[led_id - 1]);
+}
+
+STATIC mp_obj_t led_obj_on(mp_obj_t self_in) {
+    machine_led_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    MICROPY_HW_LED_ON(self->led_pin);
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(led_obj_on_obj, led_obj_on);
+
+STATIC mp_obj_t led_obj_off(mp_obj_t self_in) {
+    machine_led_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    MICROPY_HW_LED_OFF(self->led_pin);
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(led_obj_off_obj, led_obj_off);
+
+STATIC mp_obj_t led_obj_toggle(mp_obj_t self_in) {
+    machine_led_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    mp_hal_pin_toggle(self->led_pin);
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(led_obj_toggle_obj, led_obj_toggle);
+
+STATIC const mp_rom_map_elem_t led_locals_dict_table[] = {
+    {MP_ROM_QSTR(MP_QSTR_on), MP_ROM_PTR(&led_obj_on_obj)},
+    {MP_ROM_QSTR(MP_QSTR_off), MP_ROM_PTR(&led_obj_off_obj)},
+    {MP_ROM_QSTR(MP_QSTR_toggle), MP_ROM_PTR(&led_obj_toggle_obj)},
+};
+
+STATIC MP_DEFINE_CONST_DICT(led_locals_dict, led_locals_dict_table);
+
+const mp_obj_type_t machine_led_type = {
+    {&mp_type_type},
+    .name = MP_QSTR_LED,
+    .print = led_obj_print,
+    .make_new = led_obj_make_new,
+    .locals_dict = (mp_obj_dict_t *)&led_locals_dict,
+};
+
+#endif
diff --git a/ports/mimxrt/main.c b/ports/mimxrt/main.c
index d94bf24412452..e06283a8ab37b 100644
--- a/ports/mimxrt/main.c
+++ b/ports/mimxrt/main.c
@@ -33,6 +33,7 @@
 #include "lib/utils/gchelper.h"
 #include "lib/utils/pyexec.h"
 #include "tusb.h"
+#include "led.h"
 
 extern uint8_t _sstack, _estack, _gc_heap_start, _gc_heap_end;
 
@@ -41,6 +42,7 @@ void board_init(void);
 int main(void) {
     board_init();
     tusb_init();
+    led_init();
 
     mp_stack_set_top(&_estack);
     mp_stack_set_limit(&_estack - &_sstack - 1024);
diff --git a/ports/mimxrt/modmachine.c b/ports/mimxrt/modmachine.c
index 747b7bc27f56d..a6aab7b4aba53 100644
--- a/ports/mimxrt/modmachine.c
+++ b/ports/mimxrt/modmachine.c
@@ -27,6 +27,7 @@
 
 #include "py/runtime.h"
 #include "extmod/machine_mem.h"
+#include "led.h"
 
 #include CPU_HEADER_H
 
@@ -48,6 +49,9 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_mem8),                MP_ROM_PTR(&machine_mem8_obj) },
     { MP_ROM_QSTR(MP_QSTR_mem16),               MP_ROM_PTR(&machine_mem16_obj) },
     { MP_ROM_QSTR(MP_QSTR_mem32),               MP_ROM_PTR(&machine_mem32_obj) },
+    #if NUM_LEDS
+    { MP_ROM_QSTR(MP_QSTR_LED),                 MP_ROM_PTR(&machine_led_type) },
+    #endif
 };
 STATIC MP_DEFINE_CONST_DICT(machine_module_globals, machine_module_globals_table);
 
diff --git a/ports/mimxrt/mphalport.h b/ports/mimxrt/mphalport.h
index e1cf84f6c2cc7..2b9e49432cc0f 100644
--- a/ports/mimxrt/mphalport.h
+++ b/ports/mimxrt/mphalport.h
@@ -29,6 +29,10 @@
 
 #include <stdint.h>
 
+#define mp_hal_pin_high(p) (GPIO_PinWrite(p->gpio, p->pin, 1U))
+#define mp_hal_pin_low(p) (GPIO_PinWrite(p->gpio, p->pin, 0U))
+#define mp_hal_pin_toggle(p) (GPIO_PortToggle(p->gpio, (1 << p->pin)))
+
 extern volatile uint32_t systick_ms;
 
 void mp_hal_set_interrupt_char(int c);
diff --git a/ports/mimxrt/pin.c b/ports/mimxrt/pin.c
new file mode 100644
index 0000000000000..b30f4be41ceae
--- /dev/null
+++ b/ports/mimxrt/pin.c
@@ -0,0 +1,37 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 Philipp Ebensberger
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "pin.h"
+
+const mp_obj_type_t pin_type = {
+    .base = {&mp_type_type},
+    .name = MP_QSTR_Pin,
+};
+
+const mp_obj_type_t pin_af_type = {
+    {&mp_type_type},
+    .name = MP_QSTR_PinAF,
+};
diff --git a/ports/mimxrt/pin.h b/ports/mimxrt/pin.h
new file mode 100644
index 0000000000000..cfb1e6b572502
--- /dev/null
+++ b/ports/mimxrt/pin.h
@@ -0,0 +1,100 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 Philipp Ebensberger
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#ifndef MICROPY_INCLUDED_MIMXRT_PIN_H
+#define MICROPY_INCLUDED_MIMXRT_PIN_H
+
+#include "fsl_gpio.h"
+#include "py/obj.h"
+
+enum {
+    PIN_MODE_IN = 0,
+    PIN_MODE_OUT,
+    PIN_MODE_ALT,
+};
+
+enum {
+    PIN_AF_MODE_ALT1 = 1,
+    PIN_AF_MODE_ALT2,
+    PIN_AF_MODE_ALT3,
+    PIN_AF_MODE_ALT4,
+    PIN_AF_MODE_ALT5,
+    PIN_AF_MODE_ALT6,
+    PIN_AF_MODE_ALT7,
+    PIN_AF_MODE_ALT8,
+};
+
+typedef struct {
+    mp_obj_base_t base;
+    qstr name;  // port name
+    uint32_t af_mode;  // alternate function
+    void *instance;  // pointer to peripheral instance for alternate function
+    uint32_t pad_config;  // pad configuration for alternate function
+} pin_af_obj_t;
+
+typedef struct {
+    mp_obj_base_t base;
+    qstr name;  // pad name
+    GPIO_Type *gpio;  // gpio instance for pin
+    uint32_t pin;  // pin number
+    uint32_t muxRegister;
+    uint32_t configRegister;
+    uint32_t mode;  // current pin mode
+    uint32_t af_mode;  // current alternate function mode
+    size_t af_list_len;  // length of available alternate functions list
+    const pin_af_obj_t *af_list;  // pointer tolist with alternate functions
+} pin_obj_t;
+
+extern const mp_obj_type_t pin_type;
+extern const mp_obj_type_t pin_af_type;
+
+#define PIN_AF(_name, _af_mode, _instance, _pad_config) \
+    { \
+        .base = { &pin_af_type }, \
+        .name = MP_QSTR_##_name, \
+        .af_mode = (uint32_t)(_af_mode), \
+        .instance = (void *)(_instance), \
+        .pad_config = (uint32_t)(_pad_config), \
+    } \
+
+#define PIN(_name, _gpio, _pin, _af_list) \
+    { \
+        .base = { &pin_type }, \
+        .name = MP_QSTR_##_name, \
+        .gpio = (_gpio), \
+        .pin = (uint32_t)(_pin), \
+        .muxRegister = (uint32_t)&(IOMUXC->SW_MUX_CTL_PAD[kIOMUXC_SW_MUX_CTL_PAD_##_name]), \
+        .configRegister = (uint32_t)&(IOMUXC->SW_PAD_CTL_PAD[kIOMUXC_SW_PAD_CTL_PAD_##_name]), \
+        .mode = PIN_MODE_IN, \
+        .af_mode = PIN_AF_MODE_ALT5, \
+        .af_list_len = (size_t)(sizeof((_af_list)) / sizeof(pin_af_obj_t)), \
+        .af_list = (_af_list), \
+    } \
+
+// Include board specific pins
+#include "pins.h"
+
+#endif // MICROPY_INCLUDED_MIMXRT_PIN_H

From e6881f08292d03f089185718c131f543d095089b Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Mon, 11 May 2020 21:20:07 +1000
Subject: [PATCH 0034/3533] extmod/modbluetooth: Make modbluetooth event not a
 bitfield.

There doesn't appear to be any use for only triggering on specific events,
so it's just easier to number them sequentially.  This makes them smaller
values so they take up only 1 byte in the ringbuf, only 1 byte for the
opcode in the bytecode, and makes room for more events.

Also add a couple of new event types that need to be implemented (to avoid
re-numbering later).

And rename _COMPLETE and _STATUS to _DONE for consistency.

In the future the "trigger" keyword argument can be reinstated by requiring
the user to compute the bitmask, eg:

    ble.irq(handler, 1 << _IRQ_SCAN_RESULT | 1 << _IRQ_SCAN_DONE)
---
 examples/bluetooth/ble_temperature.py         |  4 +-
 examples/bluetooth/ble_temperature_central.py | 37 +++++----
 examples/bluetooth/ble_uart_peripheral.py     |  6 +-
 extmod/modbluetooth.c                         | 37 ++++-----
 extmod/modbluetooth.h                         | 80 ++++++++++---------
 extmod/nimble/modbluetooth_nimble.c           |  4 +-
 py/ringbuf.h                                  |  7 ++
 7 files changed, 92 insertions(+), 83 deletions(-)

diff --git a/examples/bluetooth/ble_temperature.py b/examples/bluetooth/ble_temperature.py
index 01d2f7441fa17..fd24e74d7498a 100644
--- a/examples/bluetooth/ble_temperature.py
+++ b/examples/bluetooth/ble_temperature.py
@@ -11,8 +11,8 @@
 
 from micropython import const
 
-_IRQ_CENTRAL_CONNECT = const(1 << 0)
-_IRQ_CENTRAL_DISCONNECT = const(1 << 1)
+_IRQ_CENTRAL_CONNECT = const(1)
+_IRQ_CENTRAL_DISCONNECT = const(2)
 
 # org.bluetooth.service.environmental_sensing
 _ENV_SENSE_UUID = bluetooth.UUID(0x181A)
diff --git a/examples/bluetooth/ble_temperature_central.py b/examples/bluetooth/ble_temperature_central.py
index 04fed0a299078..8b679b9b807be 100644
--- a/examples/bluetooth/ble_temperature_central.py
+++ b/examples/bluetooth/ble_temperature_central.py
@@ -10,22 +10,25 @@
 
 from micropython import const
 
-_IRQ_CENTRAL_CONNECT = const(1 << 0)
-_IRQ_CENTRAL_DISCONNECT = const(1 << 1)
-_IRQ_GATTS_WRITE = const(1 << 2)
-_IRQ_GATTS_READ_REQUEST = const(1 << 3)
-_IRQ_SCAN_RESULT = const(1 << 4)
-_IRQ_SCAN_COMPLETE = const(1 << 5)
-_IRQ_PERIPHERAL_CONNECT = const(1 << 6)
-_IRQ_PERIPHERAL_DISCONNECT = const(1 << 7)
-_IRQ_GATTC_SERVICE_RESULT = const(1 << 8)
-_IRQ_GATTC_CHARACTERISTIC_RESULT = const(1 << 9)
-_IRQ_GATTC_DESCRIPTOR_RESULT = const(1 << 10)
-_IRQ_GATTC_READ_RESULT = const(1 << 11)
-_IRQ_GATTC_WRITE_STATUS = const(1 << 12)
-_IRQ_GATTC_NOTIFY = const(1 << 13)
-_IRQ_GATTC_INDICATE = const(1 << 14)
-_IRQ_ALL = const(0xFFFF)
+_IRQ_CENTRAL_CONNECT = const(1)
+_IRQ_CENTRAL_DISCONNECT = const(2)
+_IRQ_GATTS_WRITE = const(3)
+_IRQ_GATTS_READ_REQUEST = const(4)
+_IRQ_SCAN_RESULT = const(5)
+_IRQ_SCAN_DONE = const(6)
+_IRQ_PERIPHERAL_CONNECT = const(7)
+_IRQ_PERIPHERAL_DISCONNECT = const(8)
+_IRQ_GATTC_SERVICE_RESULT = const(9)
+_IRQ_GATTC_SERVICE_DONE = const(10)
+_IRQ_GATTC_CHARACTERISTIC_RESULT = const(11)
+_IRQ_GATTC_CHARACTERISTIC_DONE = const(12)
+_IRQ_GATTC_DESCRIPTOR_RESULT = const(13)
+_IRQ_GATTC_DESCRIPTOR_DONE = const(14)
+_IRQ_GATTC_READ_RESULT = const(15)
+_IRQ_GATTC_READ_DONE = const(16)
+_IRQ_GATTC_WRITE_DONE = const(17)
+_IRQ_GATTC_NOTIFY = const(18)
+_IRQ_GATTC_INDICATE = const(19)
 
 _ADV_IND = const(0x00)
 _ADV_DIRECT_IND = const(0x01)
@@ -93,7 +96,7 @@ def _irq(self, event, data):
                 self._name = decode_name(adv_data) or "?"
                 self._ble.gap_scan(None)
 
-        elif event == _IRQ_SCAN_COMPLETE:
+        elif event == _IRQ_SCAN_DONE:
             if self._scan_callback:
                 if self._addr:
                     # Found a device during the scan (and the scan was explicitly stopped).
diff --git a/examples/bluetooth/ble_uart_peripheral.py b/examples/bluetooth/ble_uart_peripheral.py
index c013d96ec9ef1..cc8d589b0e35f 100644
--- a/examples/bluetooth/ble_uart_peripheral.py
+++ b/examples/bluetooth/ble_uart_peripheral.py
@@ -5,9 +5,9 @@
 
 from micropython import const
 
-_IRQ_CENTRAL_CONNECT = const(1 << 0)
-_IRQ_CENTRAL_DISCONNECT = const(1 << 1)
-_IRQ_GATTS_WRITE = const(1 << 2)
+_IRQ_CENTRAL_CONNECT = const(1)
+_IRQ_CENTRAL_DISCONNECT = const(2)
+_IRQ_GATTS_WRITE = const(3)
 
 _UART_UUID = bluetooth.UUID("6E400001-B5A3-F393-E0A9-E50E24DCCA9E")
 _UART_TX = (
diff --git a/extmod/modbluetooth.c b/extmod/modbluetooth.c
index 7e6abb54909ca..b43bec0178df8 100644
--- a/extmod/modbluetooth.c
+++ b/extmod/modbluetooth.c
@@ -4,7 +4,7 @@
  * The MIT License (MIT)
  *
  * Copyright (c) 2018 Ayke van Laethem
- * Copyright (c) 2019 Jim Mussared
+ * Copyright (c) 2019-2020 Jim Mussared
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -57,7 +57,6 @@ STATIC const mp_obj_type_t bluetooth_uuid_type;
 typedef struct {
     mp_obj_base_t base;
     mp_obj_t irq_handler;
-    uint16_t irq_trigger;
     bool irq_scheduled;
     mp_obj_t irq_data_tuple;
     uint8_t irq_data_addr_bytes[6];
@@ -249,7 +248,6 @@ STATIC mp_obj_t bluetooth_ble_make_new(const mp_obj_type_t *type, size_t n_args,
         o->base.type = &bluetooth_ble_type;
 
         o->irq_handler = mp_const_none;
-        o->irq_trigger = 0;
 
         // Pre-allocate the event data tuple to prevent needing to allocate in the IRQ handler.
         o->irq_data_tuple = mp_obj_new_tuple(MICROPY_PY_BLUETOOTH_MAX_EVENT_DATA_TUPLE_LEN, NULL);
@@ -372,10 +370,9 @@ STATIC mp_obj_t bluetooth_ble_config(size_t n_args, const mp_obj_t *args, mp_map
 STATIC MP_DEFINE_CONST_FUN_OBJ_KW(bluetooth_ble_config_obj, 1, bluetooth_ble_config);
 
 STATIC mp_obj_t bluetooth_ble_irq(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
-    enum { ARG_handler, ARG_trigger };
+    enum { ARG_handler };
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_handler, MP_ARG_OBJ | MP_ARG_REQUIRED, {.u_rom_obj = MP_ROM_NONE} },
-        { MP_QSTR_trigger, MP_ARG_INT, {.u_int = MP_BLUETOOTH_IRQ_ALL} },
     };
     mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
     mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
@@ -388,7 +385,6 @@ STATIC mp_obj_t bluetooth_ble_irq(size_t n_args, const mp_obj_t *pos_args, mp_ma
     MICROPY_PY_BLUETOOTH_ENTER
     mp_obj_bluetooth_ble_t *o = MP_OBJ_TO_PTR(MP_STATE_VM(bluetooth));
     o->irq_handler = callback;
-    o->irq_trigger = args[ARG_trigger].u_int;
     MICROPY_PY_BLUETOOTH_EXIT
 
     return mp_const_none;
@@ -854,7 +850,7 @@ STATIC mp_obj_t bluetooth_ble_invoke_irq(mp_obj_t none_in) {
     for (;;) {
         MICROPY_PY_BLUETOOTH_ENTER
 
-        mp_int_t event = event = ringbuf_get16(&o->ringbuf);
+        mp_int_t event = ringbuf_get(&o->ringbuf);
         if (event < 0) {
             // Nothing available in ringbuf.
             MICROPY_PY_BLUETOOTH_EXIT
@@ -878,7 +874,7 @@ STATIC mp_obj_t bluetooth_ble_invoke_irq(mp_obj_t none_in) {
         } else if (event == MP_BLUETOOTH_IRQ_SCAN_RESULT) {
             // addr_type, addr, adv_type, rssi, adv_data
             ringbuf_extract(&o->ringbuf, data_tuple, 0, 1, &o->irq_data_addr, 2, NULL, &o->irq_data_data);
-        } else if (event == MP_BLUETOOTH_IRQ_SCAN_COMPLETE) {
+        } else if (event == MP_BLUETOOTH_IRQ_SCAN_DONE) {
             // No params required.
             data_tuple->len = 0;
         } else if (event == MP_BLUETOOTH_IRQ_GATTC_SERVICE_RESULT) {
@@ -893,7 +889,7 @@ STATIC mp_obj_t bluetooth_ble_invoke_irq(mp_obj_t none_in) {
         } else if (event == MP_BLUETOOTH_IRQ_GATTC_READ_RESULT || event == MP_BLUETOOTH_IRQ_GATTC_NOTIFY || event == MP_BLUETOOTH_IRQ_GATTC_INDICATE) {
             // conn_handle, value_handle, data
             ringbuf_extract(&o->ringbuf, data_tuple, 2, 0, NULL, 0, NULL, &o->irq_data_data);
-        } else if (event == MP_BLUETOOTH_IRQ_GATTC_WRITE_STATUS) {
+        } else if (event == MP_BLUETOOTH_IRQ_GATTC_WRITE_DONE) {
             // conn_handle, value_handle, status
             ringbuf_extract(&o->ringbuf, data_tuple, 3, 0, NULL, 0, NULL, NULL);
         #endif // MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE
@@ -915,23 +911,24 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(bluetooth_ble_invoke_irq_obj, bluetooth_ble_inv
 // Callbacks are called in interrupt context (i.e. can't allocate), so we need to push the data
 // into the ringbuf and schedule the callback via mp_sched_schedule.
 
-STATIC bool enqueue_irq(mp_obj_bluetooth_ble_t *o, size_t len, uint16_t event) {
-    if (!o || !(o->irq_trigger & event) || o->irq_handler == mp_const_none) {
+STATIC bool enqueue_irq(mp_obj_bluetooth_ble_t *o, size_t len, uint8_t event) {
+    if (!o || o->irq_handler == mp_const_none) {
         return false;
     }
 
-    if (ringbuf_free(&o->ringbuf) < len + 2) {
+    // Check if there is enough room for <event-type><payload>.
+    if (ringbuf_free(&o->ringbuf) < len + 1) {
         // Ringbuffer doesn't have room (and is therefore non-empty).
 
         // If this is another scan result, or the front of the ringbuffer isn't a scan result, then nothing to do.
-        if (event == MP_BLUETOOTH_IRQ_SCAN_RESULT || ringbuf_peek16(&o->ringbuf) != MP_BLUETOOTH_IRQ_SCAN_RESULT) {
+        if (event == MP_BLUETOOTH_IRQ_SCAN_RESULT || ringbuf_peek(&o->ringbuf) != MP_BLUETOOTH_IRQ_SCAN_RESULT) {
             return false;
         }
 
         // Front of the queue is a scan result, remove it.
 
         // event, addr_type, addr, adv_type, rssi
-        int n = 2 + 1 + 6 + 1 + 1;
+        int n = 1 + 1 + 6 + 1 + 1;
         for (int i = 0; i < n; ++i) {
             ringbuf_get(&o->ringbuf);
         }
@@ -943,7 +940,7 @@ STATIC bool enqueue_irq(mp_obj_bluetooth_ble_t *o, size_t len, uint16_t event) {
     }
 
     // Append this event, the caller will then append the arguments.
-    ringbuf_put16(&o->ringbuf, event);
+    ringbuf_put(&o->ringbuf, event);
     return true;
 }
 
@@ -959,7 +956,7 @@ STATIC void schedule_ringbuf(mp_uint_t atomic_state) {
     }
 }
 
-void mp_bluetooth_gap_on_connected_disconnected(uint16_t event, uint16_t conn_handle, uint8_t addr_type, const uint8_t *addr) {
+void mp_bluetooth_gap_on_connected_disconnected(uint8_t event, uint16_t conn_handle, uint8_t addr_type, const uint8_t *addr) {
     MICROPY_PY_BLUETOOTH_ENTER
     mp_obj_bluetooth_ble_t *o = MP_OBJ_TO_PTR(MP_STATE_VM(bluetooth));
     if (enqueue_irq(o, 2 + 1 + 6, event)) {
@@ -986,7 +983,7 @@ void mp_bluetooth_gatts_on_write(uint16_t conn_handle, uint16_t value_handle) {
 void mp_bluetooth_gap_on_scan_complete(void) {
     MICROPY_PY_BLUETOOTH_ENTER
     mp_obj_bluetooth_ble_t *o = MP_OBJ_TO_PTR(MP_STATE_VM(bluetooth));
-    if (enqueue_irq(o, 0, MP_BLUETOOTH_IRQ_SCAN_COMPLETE)) {
+    if (enqueue_irq(o, 0, MP_BLUETOOTH_IRQ_SCAN_DONE)) {
     }
     schedule_ringbuf(atomic_state);
 }
@@ -1048,7 +1045,7 @@ void mp_bluetooth_gattc_on_descriptor_result(uint16_t conn_handle, uint16_t hand
     schedule_ringbuf(atomic_state);
 }
 
-size_t mp_bluetooth_gattc_on_data_available_start(uint16_t event, uint16_t conn_handle, uint16_t value_handle, size_t data_len, mp_uint_t *atomic_state_out) {
+size_t mp_bluetooth_gattc_on_data_available_start(uint8_t event, uint16_t conn_handle, uint16_t value_handle, size_t data_len, mp_uint_t *atomic_state_out) {
     MICROPY_PY_BLUETOOTH_ENTER
     *atomic_state_out = atomic_state;
     mp_obj_bluetooth_ble_t *o = MP_OBJ_TO_PTR(MP_STATE_VM(bluetooth));
@@ -1077,7 +1074,7 @@ void mp_bluetooth_gattc_on_data_available_end(mp_uint_t atomic_state) {
 void mp_bluetooth_gattc_on_write_status(uint16_t conn_handle, uint16_t value_handle, uint16_t status) {
     MICROPY_PY_BLUETOOTH_ENTER
     mp_obj_bluetooth_ble_t *o = MP_OBJ_TO_PTR(MP_STATE_VM(bluetooth));
-    if (enqueue_irq(o, 2 + 2 + 2, MP_BLUETOOTH_IRQ_GATTC_WRITE_STATUS)) {
+    if (enqueue_irq(o, 2 + 2 + 2, MP_BLUETOOTH_IRQ_GATTC_WRITE_DONE)) {
         ringbuf_put16(&o->ringbuf, conn_handle);
         ringbuf_put16(&o->ringbuf, value_handle);
         ringbuf_put16(&o->ringbuf, status);
@@ -1092,7 +1089,7 @@ void mp_bluetooth_gattc_on_write_status(uint16_t conn_handle, uint16_t value_han
 // On ESP32, for example, this is not the case.
 bool mp_bluetooth_gatts_on_read_request(uint16_t conn_handle, uint16_t value_handle) {
     mp_obj_bluetooth_ble_t *o = MP_OBJ_TO_PTR(MP_STATE_VM(bluetooth));
-    if ((o->irq_trigger & MP_BLUETOOTH_IRQ_GATTS_READ_REQUEST) && o->irq_handler != mp_const_none) {
+    if (o->irq_handler != mp_const_none) {
         // Use pre-allocated tuple because this is a hard IRQ.
         mp_obj_tuple_t *data = MP_OBJ_TO_PTR(o->irq_data_tuple);
         data->items[0] = MP_OBJ_NEW_SMALL_INT(conn_handle);
diff --git a/extmod/modbluetooth.h b/extmod/modbluetooth.h
index 4e658a7a0a426..091a62c845ceb 100644
--- a/extmod/modbluetooth.h
+++ b/extmod/modbluetooth.h
@@ -4,7 +4,7 @@
  * The MIT License (MIT)
  *
  * Copyright (c) 2018 Ayke van Laethem
- * Copyright (c) 2019 Jim Mussared
+ * Copyright (c) 2019-2020 Jim Mussared
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -88,48 +88,50 @@
 #define MP_BLUETOOTH_ADDR_RANDOM_PRIVATE_NON_RESOLVABLE (0x13) // Random private non-resolvable address. (NRF SD 0x03)
 
 // Event codes for the IRQ handler.
-// Can also be combined to pass to the trigger param to select which events you
-// are interested in.
-// Note this is currently stored in a uint16_t (in irq_trigger, and the event
-// arg to the irq handler), so one spare value remaining.
-#define MP_BLUETOOTH_IRQ_CENTRAL_CONNECT              (1 << 0)
-#define MP_BLUETOOTH_IRQ_CENTRAL_DISCONNECT           (1 << 1)
-#define MP_BLUETOOTH_IRQ_GATTS_WRITE                  (1 << 2)
-#define MP_BLUETOOTH_IRQ_GATTS_READ_REQUEST           (1 << 3)
-#define MP_BLUETOOTH_IRQ_SCAN_RESULT                  (1 << 4)
-#define MP_BLUETOOTH_IRQ_SCAN_COMPLETE                (1 << 5)
-#define MP_BLUETOOTH_IRQ_PERIPHERAL_CONNECT           (1 << 6)
-#define MP_BLUETOOTH_IRQ_PERIPHERAL_DISCONNECT        (1 << 7)
-#define MP_BLUETOOTH_IRQ_GATTC_SERVICE_RESULT         (1 << 8)
-#define MP_BLUETOOTH_IRQ_GATTC_CHARACTERISTIC_RESULT  (1 << 9)
-#define MP_BLUETOOTH_IRQ_GATTC_DESCRIPTOR_RESULT      (1 << 10)
-#define MP_BLUETOOTH_IRQ_GATTC_READ_RESULT            (1 << 11)
-#define MP_BLUETOOTH_IRQ_GATTC_WRITE_STATUS           (1 << 12)
-#define MP_BLUETOOTH_IRQ_GATTC_NOTIFY                 (1 << 13)
-#define MP_BLUETOOTH_IRQ_GATTC_INDICATE               (1 << 14)
-#define MP_BLUETOOTH_IRQ_ALL                          (0xffff)
+#define MP_BLUETOOTH_IRQ_CENTRAL_CONNECT                (1)
+#define MP_BLUETOOTH_IRQ_CENTRAL_DISCONNECT             (2)
+#define MP_BLUETOOTH_IRQ_GATTS_WRITE                    (3)
+#define MP_BLUETOOTH_IRQ_GATTS_READ_REQUEST             (4)
+#define MP_BLUETOOTH_IRQ_SCAN_RESULT                    (5)
+#define MP_BLUETOOTH_IRQ_SCAN_DONE                      (6)
+#define MP_BLUETOOTH_IRQ_PERIPHERAL_CONNECT             (7)
+#define MP_BLUETOOTH_IRQ_PERIPHERAL_DISCONNECT          (8)
+#define MP_BLUETOOTH_IRQ_GATTC_SERVICE_RESULT           (9)
+#define MP_BLUETOOTH_IRQ_GATTC_SERVICE_DONE             (10)
+#define MP_BLUETOOTH_IRQ_GATTC_CHARACTERISTIC_RESULT    (11)
+#define MP_BLUETOOTH_IRQ_GATTC_CHARACTERISTIC_DONE      (12)
+#define MP_BLUETOOTH_IRQ_GATTC_DESCRIPTOR_RESULT        (13)
+#define MP_BLUETOOTH_IRQ_GATTC_DESCRIPTOR_DONE          (14)
+#define MP_BLUETOOTH_IRQ_GATTC_READ_RESULT              (15)
+#define MP_BLUETOOTH_IRQ_GATTC_READ_DONE                (16)
+#define MP_BLUETOOTH_IRQ_GATTC_WRITE_DONE               (17)
+#define MP_BLUETOOTH_IRQ_GATTC_NOTIFY                   (18)
+#define MP_BLUETOOTH_IRQ_GATTC_INDICATE                 (19)
 
 /*
 These aren't included in the module for space reasons, but can be used
 in your Python code if necessary.
 
 from micropython import const
-_IRQ_CENTRAL_CONNECT                 = const(1 << 0)
-_IRQ_CENTRAL_DISCONNECT              = const(1 << 1)
-_IRQ_GATTS_WRITE                     = const(1 << 2)
-_IRQ_GATTS_READ_REQUEST              = const(1 << 3)
-_IRQ_SCAN_RESULT                     = const(1 << 4)
-_IRQ_SCAN_COMPLETE                   = const(1 << 5)
-_IRQ_PERIPHERAL_CONNECT              = const(1 << 6)
-_IRQ_PERIPHERAL_DISCONNECT           = const(1 << 7)
-_IRQ_GATTC_SERVICE_RESULT            = const(1 << 8)
-_IRQ_GATTC_CHARACTERISTIC_RESULT     = const(1 << 9)
-_IRQ_GATTC_DESCRIPTOR_RESULT         = const(1 << 10)
-_IRQ_GATTC_READ_RESULT               = const(1 << 11)
-_IRQ_GATTC_WRITE_STATUS              = const(1 << 12)
-_IRQ_GATTC_NOTIFY                    = const(1 << 13)
-_IRQ_GATTC_INDICATE                  = const(1 << 14)
-_IRQ_ALL                             = const(0xffff)
+_IRQ_CENTRAL_CONNECT = const(1)
+_IRQ_CENTRAL_DISCONNECT = const(2)
+_IRQ_GATTS_WRITE = const(3)
+_IRQ_GATTS_READ_REQUEST = const(4)
+_IRQ_SCAN_RESULT = const(5)
+_IRQ_SCAN_DONE = const(6)
+_IRQ_PERIPHERAL_CONNECT = const(7)
+_IRQ_PERIPHERAL_DISCONNECT = const(8)
+_IRQ_GATTC_SERVICE_RESULT = const(9)
+_IRQ_GATTC_SERVICE_DONE = const(10)
+_IRQ_GATTC_CHARACTERISTIC_RESULT = const(11)
+_IRQ_GATTC_CHARACTERISTIC_DONE = const(12)
+_IRQ_GATTC_DESCRIPTOR_RESULT = const(13)
+_IRQ_GATTC_DESCRIPTOR_DONE = const(14)
+_IRQ_GATTC_READ_RESULT = const(15)
+_IRQ_GATTC_READ_DONE = const(16)
+_IRQ_GATTC_WRITE_DONE = const(17)
+_IRQ_GATTC_NOTIFY = const(18)
+_IRQ_GATTC_INDICATE = const(19)
 */
 
 // Common UUID type.
@@ -238,7 +240,7 @@ int mp_bluetooth_gattc_write(uint16_t conn_handle, uint16_t value_handle, const
 // API implemented by modbluetooth (called by port-specific implementations):
 
 // Notify modbluetooth that a connection/disconnection event has occurred.
-void mp_bluetooth_gap_on_connected_disconnected(uint16_t event, uint16_t conn_handle, uint8_t addr_type, const uint8_t *addr);
+void mp_bluetooth_gap_on_connected_disconnected(uint8_t event, uint16_t conn_handle, uint8_t addr_type, const uint8_t *addr);
 
 // Call this when a characteristic is written to.
 void mp_bluetooth_gatts_on_write(uint16_t conn_handle, uint16_t value_handle);
@@ -267,7 +269,7 @@ void mp_bluetooth_gattc_on_descriptor_result(uint16_t conn_handle, uint16_t hand
 // Notify modbluetooth that a read has completed with data (or notify/indicate data available, use `event` to disambiguate).
 // Note: these functions are to be called in a group protected by MICROPY_PY_BLUETOOTH_ENTER/EXIT.
 // _start returns the number of bytes to submit to the calls to _chunk, followed by a call to _end.
-size_t mp_bluetooth_gattc_on_data_available_start(uint16_t event, uint16_t conn_handle, uint16_t value_handle, size_t data_len, mp_uint_t *atomic_state_out);
+size_t mp_bluetooth_gattc_on_data_available_start(uint8_t event, uint16_t conn_handle, uint16_t value_handle, size_t data_len, mp_uint_t *atomic_state_out);
 void mp_bluetooth_gattc_on_data_available_chunk(const uint8_t *data, size_t data_len);
 void mp_bluetooth_gattc_on_data_available_end(mp_uint_t atomic_state);
 
diff --git a/extmod/nimble/modbluetooth_nimble.c b/extmod/nimble/modbluetooth_nimble.c
index e2e95aa74eb6b..656b99a564006 100644
--- a/extmod/nimble/modbluetooth_nimble.c
+++ b/extmod/nimble/modbluetooth_nimble.c
@@ -4,7 +4,7 @@
  * The MIT License (MIT)
  *
  * Copyright (c) 2019 Damien P. George
- * Copyright (c) 2019 Jim Mussared
+ * Copyright (c) 2019-2020 Jim Mussared
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -612,7 +612,7 @@ int mp_bluetooth_gatts_set_buffer(uint16_t value_handle, size_t len, bool append
 
 #if MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE
 
-STATIC void gattc_on_data_available(uint16_t event, uint16_t conn_handle, uint16_t value_handle, const struct os_mbuf *om) {
+STATIC void gattc_on_data_available(uint8_t event, uint16_t conn_handle, uint16_t value_handle, const struct os_mbuf *om) {
     size_t len = OS_MBUF_PKTLEN(om);
     mp_uint_t atomic_state;
     len = mp_bluetooth_gattc_on_data_available_start(event, conn_handle, value_handle, len, &atomic_state);
diff --git a/py/ringbuf.h b/py/ringbuf.h
index 293e418306051..4685848961c52 100644
--- a/py/ringbuf.h
+++ b/py/ringbuf.h
@@ -63,6 +63,13 @@ static inline int ringbuf_get(ringbuf_t *r) {
     return v;
 }
 
+static inline int ringbuf_peek(ringbuf_t *r) {
+    if (r->iget == r->iput) {
+        return -1;
+    }
+    return r->buf[r->iget];
+}
+
 static inline int ringbuf_put(ringbuf_t *r, uint8_t v) {
     uint32_t iput_new = r->iput + 1;
     if (iput_new >= r->size) {

From 6a3c89d584db4f14c7e2432b7c5ad87951e6c2d5 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Mon, 11 May 2020 21:46:56 +1000
Subject: [PATCH 0035/3533] extmod/modbluetooth: Add discover complete events
 for svc/char/desc.

Without this it's difficult to implement a state machine correctly if the
desired services are not found.
---
 examples/bluetooth/ble_temperature_central.py | 17 +++-
 extmod/btstack/modbluetooth_btstack.c         | 89 +++++++++++++------
 extmod/modbluetooth.c                         | 13 +++
 extmod/modbluetooth.h                         |  3 +
 extmod/nimble/modbluetooth_nimble.c           |  6 ++
 5 files changed, 100 insertions(+), 28 deletions(-)

diff --git a/examples/bluetooth/ble_temperature_central.py b/examples/bluetooth/ble_temperature_central.py
index 8b679b9b807be..19dc93409e291 100644
--- a/examples/bluetooth/ble_temperature_central.py
+++ b/examples/bluetooth/ble_temperature_central.py
@@ -80,6 +80,8 @@ def _reset(self):
 
         # Connected device.
         self._conn_handle = None
+        self._start_handle = None
+        self._end_handle = None
         self._value_handle = None
 
     def _irq(self, event, data):
@@ -124,18 +126,31 @@ def _irq(self, event, data):
             # Connected device returned a service.
             conn_handle, start_handle, end_handle, uuid = data
             if conn_handle == self._conn_handle and uuid == _ENV_SENSE_UUID:
+                self._start_handle, self._end_handle = start_handle, end_handle
+
+        elif event == _IRQ_GATTC_SERVICES_DONE:
+            # Service query complete.
+            if self._start_handle and self._end_handle:
                 self._ble.gattc_discover_characteristics(
-                    self._conn_handle, start_handle, end_handle
+                    self._conn_handle, self._start_handle, self._end_handle
                 )
+            else:
+                print("Failed to find environmental sensing service.")
 
         elif event == _IRQ_GATTC_CHARACTERISTIC_RESULT:
             # Connected device returned a characteristic.
             conn_handle, def_handle, value_handle, properties, uuid = data
             if conn_handle == self._conn_handle and uuid == _TEMP_UUID:
                 self._value_handle = value_handle
+
+        elif event == _IRQ_GATTC_CHARACTERISTICS_DONE:
+            # Characteristic query complete.
+            if self._value_handle:
                 # We've finished connecting and discovering device, fire the connect callback.
                 if self._conn_callback:
                     self._conn_callback()
+            else:
+                print("Failed to find temperature characteristic.")
 
         elif event == _IRQ_GATTC_READ_RESULT:
             # A read completed successfully.
diff --git a/extmod/btstack/modbluetooth_btstack.c b/extmod/btstack/modbluetooth_btstack.c
index 772fe4bed1054..625ccf4c4ad99 100644
--- a/extmod/btstack/modbluetooth_btstack.c
+++ b/extmod/btstack/modbluetooth_btstack.c
@@ -56,10 +56,17 @@ volatile int mp_bluetooth_btstack_state = MP_BLUETOOTH_BTSTACK_STATE_OFF;
 STATIC btstack_packet_callback_registration_t hci_event_callback_registration;
 
 STATIC int btstack_error_to_errno(int err) {
+    DEBUG_EVENT_printf("  --> btstack error: %d\n", err);
     if (err == ERROR_CODE_SUCCESS) {
         return 0;
-    } else if (err == BTSTACK_ACL_BUFFERS_FULL) {
+    } else if (err == BTSTACK_ACL_BUFFERS_FULL || err == BTSTACK_MEMORY_ALLOC_FAILED) {
         return MP_ENOMEM;
+    } else if (err == GATT_CLIENT_IN_WRONG_STATE) {
+        return MP_EALREADY;
+    } else if (err == GATT_CLIENT_BUSY) {
+        return MP_EBUSY;
+    } else if (err == GATT_CLIENT_NOT_CONNECTED) {
+        return MP_ENOTCONN;
     } else {
         return MP_EINVAL;
     }
@@ -78,10 +85,8 @@ STATIC mp_obj_bluetooth_uuid_t create_mp_uuid(uint16_t uuid16, const uint8_t *uu
     return result;
 }
 
-STATIC void btstack_packet_handler(uint8_t packet_type, uint16_t channel, uint8_t *packet, uint16_t size) {
-    (void)channel;
-    (void)size;
-    DEBUG_EVENT_printf("btstack_packet_handler(packet_type=%u, channel=%u, packet=%p, size=%u)\n", packet_type, channel, packet, size);
+STATIC void btstack_packet_handler(uint8_t packet_type, uint8_t *packet, uint8_t irq) {
+    DEBUG_EVENT_printf("btstack_packet_handler(packet_type=%u, packet=%p)\n", packet_type, packet);
     if (packet_type != HCI_EVENT_PACKET) {
         return;
     }
@@ -157,6 +162,18 @@ STATIC void btstack_packet_handler(uint8_t packet_type, uint16_t channel, uint8_
     #if MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE
     } else if (event_type == GATT_EVENT_QUERY_COMPLETE) {
         DEBUG_EVENT_printf("  --> gatt query complete\n");
+        uint16_t conn_handle = gatt_event_query_complete_get_handle(packet);
+        uint16_t status = gatt_event_query_complete_get_att_status(packet);
+        if (irq == MP_BLUETOOTH_IRQ_GATTC_READ_DONE || irq == MP_BLUETOOTH_IRQ_GATTC_WRITE_DONE) {
+            // TODO there is no value_handle available to pass here
+            mp_bluetooth_gattc_on_read_write_status(irq, conn_handle, 0, status);
+        } else if (irq == MP_BLUETOOTH_IRQ_GATTC_SERVICE_DONE ||
+                   irq == MP_BLUETOOTH_IRQ_GATTC_CHARACTERISTIC_DONE ||
+                   irq == MP_BLUETOOTH_IRQ_GATTC_DESCRIPTOR_DONE) {
+            mp_bluetooth_gattc_on_discover_complete(irq, conn_handle, status);
+        } else {
+            // Note that query complete is fired for other operations like query value too.
+        }
     } else if (event_type == GATT_EVENT_SERVICE_QUERY_RESULT) {
         DEBUG_EVENT_printf("  --> gatt service query result\n");
         uint16_t conn_handle = gatt_event_service_query_result_get_handle(packet);
@@ -208,31 +225,50 @@ STATIC void btstack_packet_handler(uint8_t packet_type, uint16_t channel, uint8_
         len = mp_bluetooth_gattc_on_data_available_start(MP_BLUETOOTH_IRQ_GATTC_INDICATE, conn_handle, value_handle, len, &atomic_state);
         mp_bluetooth_gattc_on_data_available_chunk(data, len);
         mp_bluetooth_gattc_on_data_available_end(atomic_state);
-    #endif
+    #endif // MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE
     } else {
         DEBUG_EVENT_printf("  --> hci event type: unknown (0x%02x)\n", event_type);
     }
 }
 
+// Because the packet handler callbacks don't support an argument, we use a specific
+// handler when we need to provide additional state to the handler (in the "irq" parameter).
+// This is the generic handler for when you don't need extra state.
+STATIC void btstack_packet_handler_generic(uint8_t packet_type, uint16_t channel, uint8_t *packet, uint16_t size) {
+    (void)channel;
+    (void)size;
+    btstack_packet_handler(packet_type, packet, 0);
+}
+
 #if MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE
-STATIC void btstack_packet_handler_write_with_response(uint8_t packet_type, uint16_t channel, uint8_t *packet, uint16_t size) {
+// For when the handler is being used for service discovery.
+STATIC void btstack_packet_handler_discover_services(uint8_t packet_type, uint16_t channel, uint8_t *packet, uint16_t size) {
     (void)channel;
     (void)size;
-    DEBUG_EVENT_printf("btstack_packet_handler_write_with_response(packet_type=%u, channel=%u, packet=%p, size=%u)\n", packet_type, channel, packet, size);
-    if (packet_type != HCI_EVENT_PACKET) {
-        return;
-    }
+    btstack_packet_handler(packet_type, packet, MP_BLUETOOTH_IRQ_GATTC_SERVICE_DONE);
+}
 
-    uint8_t event_type = hci_event_packet_get_type(packet);
-    if (event_type == GATT_EVENT_QUERY_COMPLETE) {
-        DEBUG_EVENT_printf("  --> gatt query complete\n");
-        uint16_t conn_handle = gatt_event_query_complete_get_handle(packet);
-        uint8_t status = gatt_event_query_complete_get_att_status(packet);
-        // TODO there is no value_handle to pass here
-        mp_bluetooth_gattc_on_write_status(conn_handle, 0, status);
-    }
+// For when the handler is being used for characteristic discovery.
+STATIC void btstack_packet_handler_discover_characteristics(uint8_t packet_type, uint16_t channel, uint8_t *packet, uint16_t size) {
+    (void)channel;
+    (void)size;
+    btstack_packet_handler(packet_type, packet, MP_BLUETOOTH_IRQ_GATTC_CHARACTERISTIC_DONE);
 }
-#endif
+
+// For when the handler is being used for descriptor discovery.
+STATIC void btstack_packet_handler_discover_descriptors(uint8_t packet_type, uint16_t channel, uint8_t *packet, uint16_t size) {
+    (void)channel;
+    (void)size;
+    btstack_packet_handler(packet_type, packet, MP_BLUETOOTH_IRQ_GATTC_DESCRIPTOR_DONE);
+}
+
+// For when the handler is being used for write-with-response.
+STATIC void btstack_packet_handler_write_with_response(uint8_t packet_type, uint16_t channel, uint8_t *packet, uint16_t size) {
+    (void)channel;
+    (void)size;
+    btstack_packet_handler(packet_type, packet, MP_BLUETOOTH_IRQ_GATTC_WRITE_DONE);
+}
+#endif // MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE
 
 STATIC btstack_timer_source_t btstack_init_deinit_timeout;
 
@@ -285,7 +321,7 @@ int mp_bluetooth_init(void) {
     #endif
 
     // Register for HCI events.
-    hci_event_callback_registration.callback = &btstack_packet_handler;
+    hci_event_callback_registration.callback = &btstack_packet_handler_generic;
     hci_add_event_handler(&hci_event_callback_registration);
 
     // Set a timeout for HCI initialisation.
@@ -314,7 +350,7 @@ int mp_bluetooth_init(void) {
 
     #if MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE
     // Enable GATT_EVENT_NOTIFICATION/GATT_EVENT_INDICATION for all connections and handles.
-    gatt_client_listen_for_characteristic_value_updates(&MP_STATE_PORT(bluetooth_btstack_root_pointers)->notification, &btstack_packet_handler, GATT_CLIENT_ANY_CONNECTION, NULL);
+    gatt_client_listen_for_characteristic_value_updates(&MP_STATE_PORT(bluetooth_btstack_root_pointers)->notification, &btstack_packet_handler_generic, GATT_CLIENT_ANY_CONNECTION, NULL);
     #endif
 
     return 0;
@@ -643,12 +679,11 @@ int mp_bluetooth_gap_peripheral_connect(uint8_t addr_type, const uint8_t *addr,
 
 int mp_bluetooth_gattc_discover_primary_services(uint16_t conn_handle) {
     DEBUG_EVENT_printf("mp_bluetooth_gattc_discover_primary_services\n");
-    return btstack_error_to_errno(gatt_client_discover_primary_services(&btstack_packet_handler, conn_handle));
+    return btstack_error_to_errno(gatt_client_discover_primary_services(&btstack_packet_handler_discover_services, conn_handle));
 }
 
 int mp_bluetooth_gattc_discover_characteristics(uint16_t conn_handle, uint16_t start_handle, uint16_t end_handle) {
     DEBUG_EVENT_printf("mp_bluetooth_gattc_discover_characteristics\n");
-
     gatt_client_service_t service = {
         // Only start/end handles needed for gatt_client_discover_characteristics_for_service.
         .start_group_handle = start_handle,
@@ -656,7 +691,7 @@ int mp_bluetooth_gattc_discover_characteristics(uint16_t conn_handle, uint16_t s
         .uuid16 = 0,
         .uuid128 = {0},
     };
-    return btstack_error_to_errno(gatt_client_discover_characteristics_for_service(&btstack_packet_handler, conn_handle, &service));
+    return btstack_error_to_errno(gatt_client_discover_characteristics_for_service(&btstack_packet_handler_discover_characteristics, conn_handle, &service));
 }
 
 int mp_bluetooth_gattc_discover_descriptors(uint16_t conn_handle, uint16_t start_handle, uint16_t end_handle) {
@@ -670,12 +705,12 @@ int mp_bluetooth_gattc_discover_descriptors(uint16_t conn_handle, uint16_t start
         .uuid16 = 0,
         .uuid128 = {0},
     };
-    return btstack_error_to_errno(gatt_client_discover_characteristic_descriptors(&btstack_packet_handler, conn_handle, &characteristic));
+    return btstack_error_to_errno(gatt_client_discover_characteristic_descriptors(&btstack_packet_handler_discover_descriptors, conn_handle, &characteristic));
 }
 
 int mp_bluetooth_gattc_read(uint16_t conn_handle, uint16_t value_handle) {
     DEBUG_EVENT_printf("mp_bluetooth_gattc_read\n");
-    return btstack_error_to_errno(gatt_client_read_value_of_characteristic_using_value_handle(&btstack_packet_handler, conn_handle, value_handle));
+    return btstack_error_to_errno(gatt_client_read_value_of_characteristic_using_value_handle(&btstack_packet_handler_generic, conn_handle, value_handle));
 }
 
 int mp_bluetooth_gattc_write(uint16_t conn_handle, uint16_t value_handle, const uint8_t *value, size_t *value_len, unsigned int mode) {
diff --git a/extmod/modbluetooth.c b/extmod/modbluetooth.c
index b43bec0178df8..7664e182951f2 100644
--- a/extmod/modbluetooth.c
+++ b/extmod/modbluetooth.c
@@ -886,6 +886,9 @@ STATIC mp_obj_t bluetooth_ble_invoke_irq(mp_obj_t none_in) {
         } else if (event == MP_BLUETOOTH_IRQ_GATTC_DESCRIPTOR_RESULT) {
             // conn_handle, handle, uuid
             ringbuf_extract(&o->ringbuf, data_tuple, 2, 0, NULL, 0, &o->irq_data_uuid, NULL);
+        } else if (event == MP_BLUETOOTH_IRQ_GATTC_SERVICE_DONE || event == MP_BLUETOOTH_IRQ_GATTC_CHARACTERISTIC_DONE || event == MP_BLUETOOTH_IRQ_GATTC_DESCRIPTOR_DONE) {
+            // conn_handle, status
+            ringbuf_extract(&o->ringbuf, data_tuple, 2, 0, NULL, 0, NULL, NULL);
         } else if (event == MP_BLUETOOTH_IRQ_GATTC_READ_RESULT || event == MP_BLUETOOTH_IRQ_GATTC_NOTIFY || event == MP_BLUETOOTH_IRQ_GATTC_INDICATE) {
             // conn_handle, value_handle, data
             ringbuf_extract(&o->ringbuf, data_tuple, 2, 0, NULL, 0, NULL, &o->irq_data_data);
@@ -1045,6 +1048,16 @@ void mp_bluetooth_gattc_on_descriptor_result(uint16_t conn_handle, uint16_t hand
     schedule_ringbuf(atomic_state);
 }
 
+void mp_bluetooth_gattc_on_discover_complete(uint8_t event, uint16_t conn_handle, uint16_t status) {
+    MICROPY_PY_BLUETOOTH_ENTER
+    mp_obj_bluetooth_ble_t *o = MP_OBJ_TO_PTR(MP_STATE_VM(bluetooth));
+    if (enqueue_irq(o, 2 + 2, event)) {
+        ringbuf_put16(&o->ringbuf, conn_handle);
+        ringbuf_put16(&o->ringbuf, status);
+    }
+    schedule_ringbuf(atomic_state);
+}
+
 size_t mp_bluetooth_gattc_on_data_available_start(uint8_t event, uint16_t conn_handle, uint16_t value_handle, size_t data_len, mp_uint_t *atomic_state_out) {
     MICROPY_PY_BLUETOOTH_ENTER
     *atomic_state_out = atomic_state;
diff --git a/extmod/modbluetooth.h b/extmod/modbluetooth.h
index 091a62c845ceb..235622389801b 100644
--- a/extmod/modbluetooth.h
+++ b/extmod/modbluetooth.h
@@ -266,6 +266,9 @@ void mp_bluetooth_gattc_on_characteristic_result(uint16_t conn_handle, uint16_t
 // Notify modbluetooth that a descriptor was found.
 void mp_bluetooth_gattc_on_descriptor_result(uint16_t conn_handle, uint16_t handle, mp_obj_bluetooth_uuid_t *descriptor_uuid);
 
+// Notify modbluetooth that service, characteristic or descriptor discovery has finished.
+void mp_bluetooth_gattc_on_discover_complete(uint8_t event, uint16_t conn_handle, uint16_t status);
+
 // Notify modbluetooth that a read has completed with data (or notify/indicate data available, use `event` to disambiguate).
 // Note: these functions are to be called in a group protected by MICROPY_PY_BLUETOOTH_ENTER/EXIT.
 // _start returns the number of bytes to submit to the calls to _chunk, followed by a call to _end.
diff --git a/extmod/nimble/modbluetooth_nimble.c b/extmod/nimble/modbluetooth_nimble.c
index 656b99a564006..abe38d1f182a8 100644
--- a/extmod/nimble/modbluetooth_nimble.c
+++ b/extmod/nimble/modbluetooth_nimble.c
@@ -763,6 +763,8 @@ STATIC int peripheral_discover_service_cb(uint16_t conn_handle, const struct ble
     if (error->status == 0) {
         mp_obj_bluetooth_uuid_t service_uuid = create_mp_uuid(&service->uuid);
         mp_bluetooth_gattc_on_primary_service_result(conn_handle, service->start_handle, service->end_handle, &service_uuid);
+    } else {
+        mp_bluetooth_gattc_on_discover_complete(MP_BLUETOOTH_IRQ_GATTC_SERVICE_DONE, conn_handle, error->status);
     }
     return 0;
 }
@@ -783,6 +785,8 @@ STATIC int ble_gatt_characteristic_cb(uint16_t conn_handle, const struct ble_gat
     if (error->status == 0) {
         mp_obj_bluetooth_uuid_t characteristic_uuid = create_mp_uuid(&characteristic->uuid);
         mp_bluetooth_gattc_on_characteristic_result(conn_handle, characteristic->def_handle, characteristic->val_handle, characteristic->properties, &characteristic_uuid);
+    } else {
+        mp_bluetooth_gattc_on_discover_complete(MP_BLUETOOTH_IRQ_GATTC_CHARACTERISTIC_DONE, conn_handle, error->status);
     }
     return 0;
 }
@@ -803,6 +807,8 @@ STATIC int ble_gatt_descriptor_cb(uint16_t conn_handle, const struct ble_gatt_er
     if (error->status == 0) {
         mp_obj_bluetooth_uuid_t descriptor_uuid = create_mp_uuid(&descriptor->uuid);
         mp_bluetooth_gattc_on_descriptor_result(conn_handle, descriptor->handle, &descriptor_uuid);
+    } else {
+        mp_bluetooth_gattc_on_discover_complete(MP_BLUETOOTH_IRQ_GATTC_DESCRIPTOR_DONE, conn_handle, error->status);
     }
     return 0;
 }

From 919d640aec637004110d9f4df9814523a3bfd847 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Tue, 12 May 2020 23:55:49 +1000
Subject: [PATCH 0036/3533] extmod/modbluetooth: Allow discovery of svc/char by
 uuid.

In most situations this is a more efficient way of going straight to the
service and characteristic you need.
---
 extmod/btstack/modbluetooth_btstack.c | 38 ++++++++++++++++++++++++---
 extmod/modbluetooth.c                 | 22 ++++++++++------
 extmod/modbluetooth.h                 |  4 +--
 extmod/nimble/modbluetooth_nimble.c   | 36 +++++++++++++++++--------
 extmod/nimble/nimble/npl_os.c         |  6 +++++
 5 files changed, 81 insertions(+), 25 deletions(-)

diff --git a/extmod/btstack/modbluetooth_btstack.c b/extmod/btstack/modbluetooth_btstack.c
index 625ccf4c4ad99..112c11a65eac6 100644
--- a/extmod/btstack/modbluetooth_btstack.c
+++ b/extmod/btstack/modbluetooth_btstack.c
@@ -677,12 +677,27 @@ int mp_bluetooth_gap_peripheral_connect(uint8_t addr_type, const uint8_t *addr,
     return btstack_error_to_errno(gap_connect(btstack_addr, addr_type));
 }
 
-int mp_bluetooth_gattc_discover_primary_services(uint16_t conn_handle) {
+int mp_bluetooth_gattc_discover_primary_services(uint16_t conn_handle, const mp_obj_bluetooth_uuid_t *uuid) {
     DEBUG_EVENT_printf("mp_bluetooth_gattc_discover_primary_services\n");
-    return btstack_error_to_errno(gatt_client_discover_primary_services(&btstack_packet_handler_discover_services, conn_handle));
+    uint8_t err;
+    if (uuid) {
+        if (uuid->type == MP_BLUETOOTH_UUID_TYPE_16) {
+            err = gatt_client_discover_primary_services_by_uuid16(&btstack_packet_handler_discover_services, conn_handle, get_uuid16(uuid));
+        } else if (uuid->type == MP_BLUETOOTH_UUID_TYPE_128) {
+            uint8_t buffer[16];
+            reverse_128(uuid->data, buffer);
+            err = gatt_client_discover_primary_services_by_uuid128(&btstack_packet_handler_discover_services, conn_handle, buffer);
+        } else {
+            DEBUG_EVENT_printf("  --> unknown UUID size\n");
+            return MP_EINVAL;
+        }
+    } else {
+        err = gatt_client_discover_primary_services(&btstack_packet_handler_discover_services, conn_handle);
+    }
+    return btstack_error_to_errno(err);
 }
 
-int mp_bluetooth_gattc_discover_characteristics(uint16_t conn_handle, uint16_t start_handle, uint16_t end_handle) {
+int mp_bluetooth_gattc_discover_characteristics(uint16_t conn_handle, uint16_t start_handle, uint16_t end_handle, const mp_obj_bluetooth_uuid_t *uuid) {
     DEBUG_EVENT_printf("mp_bluetooth_gattc_discover_characteristics\n");
     gatt_client_service_t service = {
         // Only start/end handles needed for gatt_client_discover_characteristics_for_service.
@@ -691,7 +706,22 @@ int mp_bluetooth_gattc_discover_characteristics(uint16_t conn_handle, uint16_t s
         .uuid16 = 0,
         .uuid128 = {0},
     };
-    return btstack_error_to_errno(gatt_client_discover_characteristics_for_service(&btstack_packet_handler_discover_characteristics, conn_handle, &service));
+    uint8_t err;
+    if (uuid) {
+        if (uuid->type == MP_BLUETOOTH_UUID_TYPE_16) {
+            err = gatt_client_discover_characteristics_for_service_by_uuid16(&btstack_packet_handler_discover_characteristics, conn_handle, &service, get_uuid16(uuid));
+        } else if (uuid->type == MP_BLUETOOTH_UUID_TYPE_128) {
+            uint8_t buffer[16];
+            reverse_128(uuid->data, buffer);
+            err = gatt_client_discover_characteristics_for_service_by_uuid128(&btstack_packet_handler_discover_characteristics, conn_handle, &service, buffer);
+        } else {
+            DEBUG_EVENT_printf("  --> unknown UUID size\n");
+            return MP_EINVAL;
+        }
+    } else {
+        err = gatt_client_discover_characteristics_for_service(&btstack_packet_handler_discover_characteristics, conn_handle, &service);
+    }
+    return btstack_error_to_errno(err);
 }
 
 int mp_bluetooth_gattc_discover_descriptors(uint16_t conn_handle, uint16_t start_handle, uint16_t end_handle) {
diff --git a/extmod/modbluetooth.c b/extmod/modbluetooth.c
index 7664e182951f2..3d66bc84c3564 100644
--- a/extmod/modbluetooth.c
+++ b/extmod/modbluetooth.c
@@ -688,21 +688,27 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(bluetooth_ble_gatts_set_buffer_obj, 3
 
 #if MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE
 
-STATIC mp_obj_t bluetooth_ble_gattc_discover_services(mp_obj_t self_in, mp_obj_t conn_handle_in) {
-    (void)self_in;
-    mp_int_t conn_handle = mp_obj_get_int(conn_handle_in);
-    return bluetooth_handle_errno(mp_bluetooth_gattc_discover_primary_services(conn_handle));
+STATIC mp_obj_t bluetooth_ble_gattc_discover_services(size_t n_args, const mp_obj_t *args) {
+    mp_int_t conn_handle = mp_obj_get_int(args[1]);
+    mp_obj_bluetooth_uuid_t *uuid = NULL;
+    if (n_args == 3) {
+        uuid = MP_OBJ_TO_PTR(args[2]);
+    }
+    return bluetooth_handle_errno(mp_bluetooth_gattc_discover_primary_services(conn_handle, uuid));
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(bluetooth_ble_gattc_discover_services_obj, bluetooth_ble_gattc_discover_services);
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(bluetooth_ble_gattc_discover_services_obj, 2, 3, bluetooth_ble_gattc_discover_services);
 
 STATIC mp_obj_t bluetooth_ble_gattc_discover_characteristics(size_t n_args, const mp_obj_t *args) {
-    (void)n_args;
     mp_int_t conn_handle = mp_obj_get_int(args[1]);
     mp_int_t start_handle = mp_obj_get_int(args[2]);
     mp_int_t end_handle = mp_obj_get_int(args[3]);
-    return bluetooth_handle_errno(mp_bluetooth_gattc_discover_characteristics(conn_handle, start_handle, end_handle));
+    mp_obj_bluetooth_uuid_t *uuid = NULL;
+    if (n_args == 3) {
+        uuid = MP_OBJ_TO_PTR(args[4]);
+    }
+    return bluetooth_handle_errno(mp_bluetooth_gattc_discover_characteristics(conn_handle, start_handle, end_handle, uuid));
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(bluetooth_ble_gattc_discover_characteristics_obj, 4, 4, bluetooth_ble_gattc_discover_characteristics);
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(bluetooth_ble_gattc_discover_characteristics_obj, 4, 5, bluetooth_ble_gattc_discover_characteristics);
 
 STATIC mp_obj_t bluetooth_ble_gattc_discover_descriptors(size_t n_args, const mp_obj_t *args) {
     (void)n_args;
diff --git a/extmod/modbluetooth.h b/extmod/modbluetooth.h
index 235622389801b..5d02d96e3c4c5 100644
--- a/extmod/modbluetooth.h
+++ b/extmod/modbluetooth.h
@@ -221,10 +221,10 @@ int mp_bluetooth_gap_scan_stop(void);
 int mp_bluetooth_gap_peripheral_connect(uint8_t addr_type, const uint8_t *addr, int32_t duration_ms);
 
 // Find all primary services on the connected peripheral.
-int mp_bluetooth_gattc_discover_primary_services(uint16_t conn_handle);
+int mp_bluetooth_gattc_discover_primary_services(uint16_t conn_handle, const mp_obj_bluetooth_uuid_t *uuid);
 
 // Find all characteristics on the specified service on a connected peripheral.
-int mp_bluetooth_gattc_discover_characteristics(uint16_t conn_handle, uint16_t start_handle, uint16_t end_handle);
+int mp_bluetooth_gattc_discover_characteristics(uint16_t conn_handle, uint16_t start_handle, uint16_t end_handle, const mp_obj_bluetooth_uuid_t *uuid);
 
 // Find all descriptors on the specified characteristic on a connected peripheral.
 int mp_bluetooth_gattc_discover_descriptors(uint16_t conn_handle, uint16_t start_handle, uint16_t end_handle);
diff --git a/extmod/nimble/modbluetooth_nimble.c b/extmod/nimble/modbluetooth_nimble.c
index abe38d1f182a8..4b0f258481c23 100644
--- a/extmod/nimble/modbluetooth_nimble.c
+++ b/extmod/nimble/modbluetooth_nimble.c
@@ -74,19 +74,19 @@ STATIC int ble_hs_err_to_errno(int err) {
 }
 
 // Note: modbluetooth UUIDs store their data in LE.
-STATIC ble_uuid_t *create_nimble_uuid(const mp_obj_bluetooth_uuid_t *uuid) {
+STATIC ble_uuid_t *create_nimble_uuid(const mp_obj_bluetooth_uuid_t *uuid, ble_uuid_any_t *storage) {
     if (uuid->type == MP_BLUETOOTH_UUID_TYPE_16) {
-        ble_uuid16_t *result = m_new(ble_uuid16_t, 1);
+        ble_uuid16_t *result = storage ? &storage->u16 : m_new(ble_uuid16_t, 1);
         result->u.type = BLE_UUID_TYPE_16;
         result->value = (uuid->data[1] << 8) | uuid->data[0];
         return (ble_uuid_t *)result;
     } else if (uuid->type == MP_BLUETOOTH_UUID_TYPE_32) {
-        ble_uuid32_t *result = m_new(ble_uuid32_t, 1);
+        ble_uuid32_t *result = storage ? &storage->u32 : m_new(ble_uuid32_t, 1);
         result->u.type = BLE_UUID_TYPE_32;
         result->value = (uuid->data[1] << 24) | (uuid->data[1] << 16) | (uuid->data[1] << 8) | uuid->data[0];
         return (ble_uuid_t *)result;
     } else if (uuid->type == MP_BLUETOOTH_UUID_TYPE_128) {
-        ble_uuid128_t *result = m_new(ble_uuid128_t, 1);
+        ble_uuid128_t *result = storage ? &storage->u128 : m_new(ble_uuid128_t, 1);
         result->u.type = BLE_UUID_TYPE_128;
         memcpy(result->value, uuid->data, 16);
         return (ble_uuid_t *)result;
@@ -498,7 +498,7 @@ int mp_bluetooth_gatts_register_service(mp_obj_bluetooth_uuid_t *service_uuid, m
 
     struct ble_gatt_chr_def *characteristics = m_new(struct ble_gatt_chr_def, num_characteristics + 1);
     for (size_t i = 0; i < num_characteristics; ++i) {
-        characteristics[i].uuid = create_nimble_uuid(characteristic_uuids[i]);
+        characteristics[i].uuid = create_nimble_uuid(characteristic_uuids[i], NULL);
         characteristics[i].access_cb = characteristic_access_cb;
         characteristics[i].arg = NULL;
         characteristics[i].flags = characteristic_flags[i];
@@ -512,7 +512,7 @@ int mp_bluetooth_gatts_register_service(mp_obj_bluetooth_uuid_t *service_uuid, m
             struct ble_gatt_dsc_def *descriptors = m_new(struct ble_gatt_dsc_def, num_descriptors[i] + 1);
 
             for (size_t j = 0; j < num_descriptors[i]; ++j) {
-                descriptors[j].uuid = create_nimble_uuid(descriptor_uuids[descriptor_index]);
+                descriptors[j].uuid = create_nimble_uuid(descriptor_uuids[descriptor_index], NULL);
                 descriptors[j].access_cb = characteristic_access_cb;
                 descriptors[j].att_flags = descriptor_flags[descriptor_index];
                 descriptors[j].min_key_size = 0;
@@ -530,7 +530,7 @@ int mp_bluetooth_gatts_register_service(mp_obj_bluetooth_uuid_t *service_uuid, m
 
     struct ble_gatt_svc_def *service = m_new(struct ble_gatt_svc_def, 2);
     service[0].type = BLE_GATT_SVC_TYPE_PRIMARY;
-    service[0].uuid = create_nimble_uuid(service_uuid);
+    service[0].uuid = create_nimble_uuid(service_uuid, NULL);
     service[0].includes = NULL;
     service[0].characteristics = characteristics;
     service[1].type = 0; // no more services
@@ -769,11 +769,18 @@ STATIC int peripheral_discover_service_cb(uint16_t conn_handle, const struct ble
     return 0;
 }
 
-int mp_bluetooth_gattc_discover_primary_services(uint16_t conn_handle) {
+int mp_bluetooth_gattc_discover_primary_services(uint16_t conn_handle, const mp_obj_bluetooth_uuid_t *uuid) {
     if (!mp_bluetooth_is_active()) {
         return ERRNO_BLUETOOTH_NOT_ACTIVE;
     }
-    int err = ble_gattc_disc_all_svcs(conn_handle, &peripheral_discover_service_cb, NULL);
+    int err;
+    if (uuid) {
+        ble_uuid_any_t nimble_uuid;
+        create_nimble_uuid(uuid, &nimble_uuid);
+        err = ble_gattc_disc_svc_by_uuid(conn_handle, &nimble_uuid.u, &peripheral_discover_service_cb, NULL);
+    } else {
+        err = ble_gattc_disc_all_svcs(conn_handle, &peripheral_discover_service_cb, NULL);
+    }
     return ble_hs_err_to_errno(err);
 }
 
@@ -791,11 +798,18 @@ STATIC int ble_gatt_characteristic_cb(uint16_t conn_handle, const struct ble_gat
     return 0;
 }
 
-int mp_bluetooth_gattc_discover_characteristics(uint16_t conn_handle, uint16_t start_handle, uint16_t end_handle) {
+int mp_bluetooth_gattc_discover_characteristics(uint16_t conn_handle, uint16_t start_handle, uint16_t end_handle, const mp_obj_bluetooth_uuid_t *uuid) {
     if (!mp_bluetooth_is_active()) {
         return ERRNO_BLUETOOTH_NOT_ACTIVE;
     }
-    int err = ble_gattc_disc_all_chrs(conn_handle, start_handle, end_handle, &ble_gatt_characteristic_cb, NULL);
+    int err;
+    if (uuid) {
+        ble_uuid_any_t nimble_uuid;
+        create_nimble_uuid(uuid, &nimble_uuid);
+        err = ble_gattc_disc_chrs_by_uuid(conn_handle, start_handle, end_handle, &nimble_uuid.u, &ble_gatt_characteristic_cb, NULL);
+    } else {
+        err = ble_gattc_disc_all_chrs(conn_handle, start_handle, end_handle, &ble_gatt_characteristic_cb, NULL);
+    }
     return ble_hs_err_to_errno(err);
 }
 
diff --git a/extmod/nimble/nimble/npl_os.c b/extmod/nimble/nimble/npl_os.c
index 620dcb0aec13c..20c260405444f 100644
--- a/extmod/nimble/nimble/npl_os.c
+++ b/extmod/nimble/nimble/npl_os.c
@@ -127,6 +127,12 @@ void *nimble_realloc(void *ptr, size_t size) {
     return ptr2;
 }
 
+// No-op implementation (only used by NimBLE logging).
+int nimble_sprintf(char *str, const char *fmt, ...) {
+    str[0] = 0;
+    return 0;
+}
+
 /******************************************************************************/
 // EVENTQ
 

From c07ea3e4c2cfd9fe75a8b207a39d8bb0295fcc3b Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Tue, 2 Jun 2020 14:22:47 +1000
Subject: [PATCH 0037/3533] extmod/modbluetooth: Implement read done event.

On btstack there's no status associated with the read result, it comes
through as a separate event.  This allows you to detect read failures or
timeouts.
---
 examples/bluetooth/ble_temperature_central.py |  4 ++++
 extmod/btstack/modbluetooth_btstack.c         | 11 ++++++++---
 extmod/modbluetooth.c                         |  6 +++---
 extmod/modbluetooth.h                         |  4 ++--
 extmod/nimble/modbluetooth_nimble.c           |  3 ++-
 5 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/examples/bluetooth/ble_temperature_central.py b/examples/bluetooth/ble_temperature_central.py
index 19dc93409e291..6195784622093 100644
--- a/examples/bluetooth/ble_temperature_central.py
+++ b/examples/bluetooth/ble_temperature_central.py
@@ -161,6 +161,10 @@ def _irq(self, event, data):
                     self._read_callback(self._value)
                     self._read_callback = None
 
+        elif event == _IRQ_GATTC_READ_DONE:
+            # Read completed.
+            conn_handle, value_handle, status = data
+
         elif event == _IRQ_GATTC_NOTIFY:
             # The ble_temperature.py demo periodically notifies its value.
             conn_handle, value_handle, notify_data = data
diff --git a/extmod/btstack/modbluetooth_btstack.c b/extmod/btstack/modbluetooth_btstack.c
index 112c11a65eac6..31b2825758434 100644
--- a/extmod/btstack/modbluetooth_btstack.c
+++ b/extmod/btstack/modbluetooth_btstack.c
@@ -171,8 +171,6 @@ STATIC void btstack_packet_handler(uint8_t packet_type, uint8_t *packet, uint8_t
                    irq == MP_BLUETOOTH_IRQ_GATTC_CHARACTERISTIC_DONE ||
                    irq == MP_BLUETOOTH_IRQ_GATTC_DESCRIPTOR_DONE) {
             mp_bluetooth_gattc_on_discover_complete(irq, conn_handle, status);
-        } else {
-            // Note that query complete is fired for other operations like query value too.
         }
     } else if (event_type == GATT_EVENT_SERVICE_QUERY_RESULT) {
         DEBUG_EVENT_printf("  --> gatt service query result\n");
@@ -262,6 +260,13 @@ STATIC void btstack_packet_handler_discover_descriptors(uint8_t packet_type, uin
     btstack_packet_handler(packet_type, packet, MP_BLUETOOTH_IRQ_GATTC_DESCRIPTOR_DONE);
 }
 
+// For when the handler is being used for a read query.
+STATIC void btstack_packet_handler_read(uint8_t packet_type, uint16_t channel, uint8_t *packet, uint16_t size) {
+    (void)channel;
+    (void)size;
+    btstack_packet_handler(packet_type, packet, MP_BLUETOOTH_IRQ_GATTC_READ_DONE);
+}
+
 // For when the handler is being used for write-with-response.
 STATIC void btstack_packet_handler_write_with_response(uint8_t packet_type, uint16_t channel, uint8_t *packet, uint16_t size) {
     (void)channel;
@@ -740,7 +745,7 @@ int mp_bluetooth_gattc_discover_descriptors(uint16_t conn_handle, uint16_t start
 
 int mp_bluetooth_gattc_read(uint16_t conn_handle, uint16_t value_handle) {
     DEBUG_EVENT_printf("mp_bluetooth_gattc_read\n");
-    return btstack_error_to_errno(gatt_client_read_value_of_characteristic_using_value_handle(&btstack_packet_handler_generic, conn_handle, value_handle));
+    return btstack_error_to_errno(gatt_client_read_value_of_characteristic_using_value_handle(&btstack_packet_handler_read, conn_handle, value_handle));
 }
 
 int mp_bluetooth_gattc_write(uint16_t conn_handle, uint16_t value_handle, const uint8_t *value, size_t *value_len, unsigned int mode) {
diff --git a/extmod/modbluetooth.c b/extmod/modbluetooth.c
index 3d66bc84c3564..34d18b0b74776 100644
--- a/extmod/modbluetooth.c
+++ b/extmod/modbluetooth.c
@@ -898,7 +898,7 @@ STATIC mp_obj_t bluetooth_ble_invoke_irq(mp_obj_t none_in) {
         } else if (event == MP_BLUETOOTH_IRQ_GATTC_READ_RESULT || event == MP_BLUETOOTH_IRQ_GATTC_NOTIFY || event == MP_BLUETOOTH_IRQ_GATTC_INDICATE) {
             // conn_handle, value_handle, data
             ringbuf_extract(&o->ringbuf, data_tuple, 2, 0, NULL, 0, NULL, &o->irq_data_data);
-        } else if (event == MP_BLUETOOTH_IRQ_GATTC_WRITE_DONE) {
+        } else if (event == MP_BLUETOOTH_IRQ_GATTC_READ_DONE || event == MP_BLUETOOTH_IRQ_GATTC_WRITE_DONE) {
             // conn_handle, value_handle, status
             ringbuf_extract(&o->ringbuf, data_tuple, 3, 0, NULL, 0, NULL, NULL);
         #endif // MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE
@@ -1090,10 +1090,10 @@ void mp_bluetooth_gattc_on_data_available_end(mp_uint_t atomic_state) {
     schedule_ringbuf(atomic_state);
 }
 
-void mp_bluetooth_gattc_on_write_status(uint16_t conn_handle, uint16_t value_handle, uint16_t status) {
+void mp_bluetooth_gattc_on_read_write_status(uint8_t event, uint16_t conn_handle, uint16_t value_handle, uint16_t status) {
     MICROPY_PY_BLUETOOTH_ENTER
     mp_obj_bluetooth_ble_t *o = MP_OBJ_TO_PTR(MP_STATE_VM(bluetooth));
-    if (enqueue_irq(o, 2 + 2 + 2, MP_BLUETOOTH_IRQ_GATTC_WRITE_DONE)) {
+    if (enqueue_irq(o, 2 + 2 + 2, event)) {
         ringbuf_put16(&o->ringbuf, conn_handle);
         ringbuf_put16(&o->ringbuf, value_handle);
         ringbuf_put16(&o->ringbuf, status);
diff --git a/extmod/modbluetooth.h b/extmod/modbluetooth.h
index 5d02d96e3c4c5..c8b8dc63f2a67 100644
--- a/extmod/modbluetooth.h
+++ b/extmod/modbluetooth.h
@@ -276,8 +276,8 @@ size_t mp_bluetooth_gattc_on_data_available_start(uint8_t event, uint16_t conn_h
 void mp_bluetooth_gattc_on_data_available_chunk(const uint8_t *data, size_t data_len);
 void mp_bluetooth_gattc_on_data_available_end(mp_uint_t atomic_state);
 
-// Notify modbluetooth that a write has completed.
-void mp_bluetooth_gattc_on_write_status(uint16_t conn_handle, uint16_t value_handle, uint16_t status);
+// Notify modbluetooth that a read or write operation has completed.
+void mp_bluetooth_gattc_on_read_write_status(uint8_t event, uint16_t conn_handle, uint16_t value_handle, uint16_t status);
 #endif
 
 // For stacks that don't manage attribute value data (currently all of them), helpers
diff --git a/extmod/nimble/modbluetooth_nimble.c b/extmod/nimble/modbluetooth_nimble.c
index 4b0f258481c23..9b95d05f32890 100644
--- a/extmod/nimble/modbluetooth_nimble.c
+++ b/extmod/nimble/modbluetooth_nimble.c
@@ -844,6 +844,7 @@ STATIC int ble_gatt_attr_read_cb(uint16_t conn_handle, const struct ble_gatt_err
     if (error->status == 0) {
         gattc_on_data_available(MP_BLUETOOTH_IRQ_GATTC_READ_RESULT, conn_handle, attr->handle, attr->om);
     }
+    mp_bluetooth_gattc_on_read_write_status(MP_BLUETOOTH_IRQ_GATTC_READ_DONE, conn_handle, attr->handle, error->status);
     return 0;
 }
 
@@ -861,7 +862,7 @@ STATIC int ble_gatt_attr_write_cb(uint16_t conn_handle, const struct ble_gatt_er
     if (!mp_bluetooth_is_active()) {
         return 0;
     }
-    mp_bluetooth_gattc_on_write_status(conn_handle, attr->handle, error->status);
+    mp_bluetooth_gattc_on_read_write_status(MP_BLUETOOTH_IRQ_GATTC_WRITE_DONE, conn_handle, attr->handle, error->status);
     return 0;
 }
 

From 9902ce12eb59e0503072d9d980d5712e32b78fd2 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Wed, 13 May 2020 14:35:32 +1000
Subject: [PATCH 0038/3533] tests/multi_bluetooth: Update to work with new BLE
 events.

Updates the tests to use non-bitmask events, event renames, as well as some
of the new completion events to improve reliability of the tests.
---
 tests/multi_bluetooth/ble_characteristic.py   | 72 +++++++++-------
 .../multi_bluetooth/ble_characteristic.py.exp | 10 ++-
 tests/multi_bluetooth/ble_gap_advertise.py    |  6 +-
 tests/multi_bluetooth/ble_gap_connect.py      | 55 ++++++------
 tests/multi_bluetooth/ble_gap_device_name.py  | 53 ++++++------
 .../multi_bluetooth/ble_gatt_data_transfer.py | 86 +++++++++++--------
 .../ble_gatt_data_transfer.py.exp             | 13 +--
 .../ble_gattc_discover_services.py            | 45 ++++++----
 tests/run-multitests.py                       |  2 +-
 9 files changed, 197 insertions(+), 145 deletions(-)

diff --git a/tests/multi_bluetooth/ble_characteristic.py b/tests/multi_bluetooth/ble_characteristic.py
index b5dfefc840dd6..33d92b823bbb2 100644
--- a/tests/multi_bluetooth/ble_characteristic.py
+++ b/tests/multi_bluetooth/ble_characteristic.py
@@ -5,15 +5,17 @@
 
 TIMEOUT_MS = 5000
 
-_IRQ_CENTRAL_CONNECT = const(1 << 0)
-_IRQ_CENTRAL_DISCONNECT = const(1 << 1)
-_IRQ_GATTS_WRITE = const(1 << 2)
-_IRQ_PERIPHERAL_CONNECT = const(1 << 6)
-_IRQ_PERIPHERAL_DISCONNECT = const(1 << 7)
-_IRQ_GATTC_CHARACTERISTIC_RESULT = const(1 << 9)
-_IRQ_GATTC_READ_RESULT = const(1 << 11)
-_IRQ_GATTC_WRITE_STATUS = const(1 << 12)
-_IRQ_GATTC_NOTIFY = const(1 << 13)
+_IRQ_CENTRAL_CONNECT = const(1)
+_IRQ_CENTRAL_DISCONNECT = const(2)
+_IRQ_GATTS_WRITE = const(3)
+_IRQ_PERIPHERAL_CONNECT = const(7)
+_IRQ_PERIPHERAL_DISCONNECT = const(8)
+_IRQ_GATTC_CHARACTERISTIC_RESULT = const(11)
+_IRQ_GATTC_CHARACTERISTIC_DONE = const(12)
+_IRQ_GATTC_READ_RESULT = const(15)
+_IRQ_GATTC_READ_DONE = const(16)
+_IRQ_GATTC_WRITE_DONE = const(17)
+_IRQ_GATTC_NOTIFY = const(18)
 
 SERVICE_UUID = bluetooth.UUID("A5A5A5A5-FFFF-9999-1111-5A5A5A5A5A5A")
 CHAR_UUID = bluetooth.UUID("00000000-1111-2222-3333-444444444444")
@@ -27,15 +29,13 @@
 )
 SERVICES = (SERVICE,)
 
-last_event = None
-last_data = None
+waiting_event = None
+waiting_data = None
 value_handle = 0
 
 
 def irq(event, data):
-    global last_event, last_data, value_handle
-    last_event = event
-    last_data = data
+    global waiting_event, waiting_data, value_handle
     if event == _IRQ_CENTRAL_CONNECT:
         print("_IRQ_CENTRAL_CONNECT")
     elif event == _IRQ_CENTRAL_DISCONNECT:
@@ -53,21 +53,32 @@ def irq(event, data):
             value_handle = data[2]
     elif event == _IRQ_GATTC_READ_RESULT:
         print("_IRQ_GATTC_READ_RESULT", data[-1])
-    elif event == _IRQ_GATTC_WRITE_STATUS:
-        print("_IRQ_GATTC_WRITE_STATUS", data[-1])
+    elif event == _IRQ_GATTC_READ_DONE:
+        print("_IRQ_GATTC_READ_DONE", data[-1])
+    elif event == _IRQ_GATTC_WRITE_DONE:
+        print("_IRQ_GATTC_WRITE_DONE", data[-1])
     elif event == _IRQ_GATTC_NOTIFY:
         print("_IRQ_GATTC_NOTIFY", data[-1])
 
+    if waiting_event is not None:
+        if (isinstance(waiting_event, int) and event == waiting_event) or (
+            not isinstance(waiting_event, int) and waiting_event(event, data)
+        ):
+            waiting_event = None
+            waiting_data = data
+
 
 def wait_for_event(event, timeout_ms):
+    global waiting_event, waiting_data
+    waiting_event = event
+    waiting_data = None
+
     t0 = time.ticks_ms()
     while time.ticks_diff(time.ticks_ms(), t0) < timeout_ms:
-        if isinstance(event, int):
-            if last_event == event:
-                break
-        elif event():
-            break
+        if waiting_data:
+            return True
         machine.idle()
+    return False
 
 
 # Acting in peripheral role.
@@ -82,17 +93,18 @@ def instance0():
         ble.gatts_write(char_handle, "periph0")
 
         # Wait for central to connect to us.
-        wait_for_event(_IRQ_CENTRAL_CONNECT, TIMEOUT_MS)
-        if last_event != _IRQ_CENTRAL_CONNECT:
+        if not wait_for_event(_IRQ_CENTRAL_CONNECT, TIMEOUT_MS):
             return
-        conn_handle, _, _ = last_data
+        conn_handle, _, _ = waiting_data
 
         # Wait for a write to the characteristic from the central.
         wait_for_event(_IRQ_GATTS_WRITE, TIMEOUT_MS)
 
         # Wait a bit, then write the characteristic and notify it.
         time.sleep_ms(1000)
+        print("gatts_write")
         ble.gatts_write(char_handle, "periph1")
+        print("gatts_notify")
         ble.gatts_notify(conn_handle, char_handle)
 
         # Wait for a write to the characteristic from the central.
@@ -100,6 +112,7 @@ def instance0():
 
         # Wait a bit, then notify a new value on the characteristic.
         time.sleep_ms(1000)
+        print("gatts_notify")
         ble.gatts_notify(conn_handle, char_handle, "periph2")
 
         # Wait for the central to disconnect.
@@ -115,14 +128,13 @@ def instance1():
         # Connect to peripheral and then disconnect.
         print("gap_connect")
         ble.gap_connect(0, BDADDR)
-        wait_for_event(_IRQ_PERIPHERAL_CONNECT, TIMEOUT_MS)
-        if last_event != _IRQ_PERIPHERAL_CONNECT:
+        if not wait_for_event(_IRQ_PERIPHERAL_CONNECT, TIMEOUT_MS):
             return
-        conn_handle, _, _ = last_data
+        conn_handle, _, _ = waiting_data
 
         # Discover characteristics.
         ble.gattc_discover_characteristics(conn_handle, 1, 65535)
-        wait_for_event(lambda: value_handle, TIMEOUT_MS)
+        wait_for_event(lambda event, data: value_handle, TIMEOUT_MS)
 
         # Issue read of characteristic, should get initial value.
         print("gattc_read")
@@ -132,7 +144,7 @@ def instance1():
         # Write to the characteristic, and ask for a response.
         print("gattc_write")
         ble.gattc_write(conn_handle, value_handle, "central0", 1)
-        wait_for_event(_IRQ_GATTC_WRITE_STATUS, TIMEOUT_MS)
+        wait_for_event(_IRQ_GATTC_WRITE_DONE, TIMEOUT_MS)
 
         # Wait for a notify, then read new value.
         wait_for_event(_IRQ_GATTC_NOTIFY, TIMEOUT_MS)
@@ -143,7 +155,7 @@ def instance1():
         # Write to the characteristic, and ask for a response.
         print("gattc_write")
         ble.gattc_write(conn_handle, value_handle, "central1", 1)
-        wait_for_event(_IRQ_GATTC_WRITE_STATUS, TIMEOUT_MS)
+        wait_for_event(_IRQ_GATTC_WRITE_DONE, TIMEOUT_MS)
 
         # Wait for a notify (should have new data), then read old value (should be unchanged).
         wait_for_event(_IRQ_GATTC_NOTIFY, TIMEOUT_MS)
diff --git a/tests/multi_bluetooth/ble_characteristic.py.exp b/tests/multi_bluetooth/ble_characteristic.py.exp
index 1532574d9882c..d89842ef7b097 100644
--- a/tests/multi_bluetooth/ble_characteristic.py.exp
+++ b/tests/multi_bluetooth/ble_characteristic.py.exp
@@ -2,7 +2,10 @@
 gap_advertise
 _IRQ_CENTRAL_CONNECT
 _IRQ_GATTS_WRITE b'central0'
+gatts_write
+gatts_notify
 _IRQ_GATTS_WRITE b'central1'
+gatts_notify
 _IRQ_CENTRAL_DISCONNECT
 --- instance1 ---
 gap_connect
@@ -10,15 +13,18 @@ _IRQ_PERIPHERAL_CONNECT
 _IRQ_GATTC_CHARACTERISTIC_RESULT UUID128('00000000-1111-2222-3333-444444444444')
 gattc_read
 _IRQ_GATTC_READ_RESULT b'periph0'
+_IRQ_GATTC_READ_DONE 0
 gattc_write
-_IRQ_GATTC_WRITE_STATUS 0
+_IRQ_GATTC_WRITE_DONE 0
 _IRQ_GATTC_NOTIFY b'periph1'
 gattc_read
 _IRQ_GATTC_READ_RESULT b'periph1'
+_IRQ_GATTC_READ_DONE 0
 gattc_write
-_IRQ_GATTC_WRITE_STATUS 0
+_IRQ_GATTC_WRITE_DONE 0
 _IRQ_GATTC_NOTIFY b'periph2'
 gattc_read
 _IRQ_GATTC_READ_RESULT b'central1'
+_IRQ_GATTC_READ_DONE 0
 gap_disconnect: True
 _IRQ_PERIPHERAL_DISCONNECT
diff --git a/tests/multi_bluetooth/ble_gap_advertise.py b/tests/multi_bluetooth/ble_gap_advertise.py
index 644b1fe28d3e8..71a5b58a56f7a 100644
--- a/tests/multi_bluetooth/ble_gap_advertise.py
+++ b/tests/multi_bluetooth/ble_gap_advertise.py
@@ -3,8 +3,8 @@
 from micropython import const
 import time, machine, bluetooth
 
-_IRQ_SCAN_RESULT = const(1 << 4)
-_IRQ_SCAN_COMPLETE = const(1 << 5)
+_IRQ_SCAN_RESULT = const(5)
+_IRQ_SCAN_DONE = const(6)
 
 ADV_TIME_S = 3
 
@@ -43,7 +43,7 @@ def irq(ev, data):
                 else:
                     if adv_data != data[4]:
                         adv_data = b"MISMATCH"
-        elif ev == _IRQ_SCAN_COMPLETE:
+        elif ev == _IRQ_SCAN_DONE:
             finished = True
 
     ble.config(rxbuf=2000)
diff --git a/tests/multi_bluetooth/ble_gap_connect.py b/tests/multi_bluetooth/ble_gap_connect.py
index def256f2c8f51..8e3ed8b816b3a 100644
--- a/tests/multi_bluetooth/ble_gap_connect.py
+++ b/tests/multi_bluetooth/ble_gap_connect.py
@@ -5,19 +5,17 @@
 
 TIMEOUT_MS = 4000
 
-_IRQ_CENTRAL_CONNECT = const(1 << 0)
-_IRQ_CENTRAL_DISCONNECT = const(1 << 1)
-_IRQ_PERIPHERAL_CONNECT = const(1 << 6)
-_IRQ_PERIPHERAL_DISCONNECT = const(1 << 7)
+_IRQ_CENTRAL_CONNECT = const(1)
+_IRQ_CENTRAL_DISCONNECT = const(2)
+_IRQ_PERIPHERAL_CONNECT = const(7)
+_IRQ_PERIPHERAL_DISCONNECT = const(8)
 
-last_event = None
-last_data = None
+waiting_event = None
+waiting_data = None
 
 
 def irq(event, data):
-    global last_event, last_data
-    last_event = event
-    last_data = data
+    global waiting_event, waiting_data
     if event == _IRQ_CENTRAL_CONNECT:
         print("_IRQ_CENTRAL_CONNECT")
     elif event == _IRQ_CENTRAL_DISCONNECT:
@@ -27,11 +25,23 @@ def irq(event, data):
     elif event == _IRQ_PERIPHERAL_DISCONNECT:
         print("_IRQ_PERIPHERAL_DISCONNECT")
 
+    if waiting_event is not None:
+        if event == waiting_event:
+            waiting_event = None
+            waiting_data = data
+
 
 def wait_for_event(event, timeout_ms):
+    global waiting_event, waiting_data
+    waiting_event = event
+    waiting_data = None
+
     t0 = time.ticks_ms()
-    while last_event != event and time.ticks_diff(time.ticks_ms(), t0) < timeout_ms:
+    while time.ticks_diff(time.ticks_ms(), t0) < timeout_ms:
+        if waiting_data:
+            return True
         machine.idle()
+    return False
 
 
 # Acting in peripheral role.
@@ -42,20 +52,20 @@ def instance0():
     multitest.next()
     try:
         # Wait for central to connect, then wait for it to disconnect.
-        wait_for_event(_IRQ_CENTRAL_CONNECT, TIMEOUT_MS)
-        wait_for_event(_IRQ_CENTRAL_DISCONNECT, TIMEOUT_MS)
-        if last_event != _IRQ_CENTRAL_DISCONNECT:
+        if not wait_for_event(_IRQ_CENTRAL_CONNECT, TIMEOUT_MS):
+            return
+        if not wait_for_event(_IRQ_CENTRAL_DISCONNECT, TIMEOUT_MS):
             return
 
         # Start advertising again.
         ble.gap_advertise(20_000, b"\x02\x01\x06\x04\xffMPY")
 
         # Wait for central to connect, then disconnect it.
-        wait_for_event(_IRQ_CENTRAL_CONNECT, TIMEOUT_MS)
-        if last_event != _IRQ_CENTRAL_CONNECT:
+        if not wait_for_event(_IRQ_CENTRAL_CONNECT, TIMEOUT_MS):
+            return
+        print("gap_disconnect:", ble.gap_disconnect(waiting_data[0]))
+        if not wait_for_event(_IRQ_CENTRAL_DISCONNECT, TIMEOUT_MS):
             return
-        print("gap_disconnect:", ble.gap_disconnect(last_data[0]))
-        wait_for_event(_IRQ_CENTRAL_DISCONNECT, TIMEOUT_MS)
     finally:
         ble.active(0)
 
@@ -67,12 +77,10 @@ def instance1():
         # Connect to peripheral and then disconnect.
         print("gap_connect")
         ble.gap_connect(0, BDADDR)
-        wait_for_event(_IRQ_PERIPHERAL_CONNECT, TIMEOUT_MS)
-        if last_event != _IRQ_PERIPHERAL_CONNECT:
+        if not wait_for_event(_IRQ_PERIPHERAL_CONNECT, TIMEOUT_MS):
             return
-        print("gap_disconnect:", ble.gap_disconnect(last_data[0]))
-        wait_for_event(_IRQ_PERIPHERAL_DISCONNECT, TIMEOUT_MS)
-        if last_event != _IRQ_PERIPHERAL_DISCONNECT:
+        print("gap_disconnect:", ble.gap_disconnect(waiting_data[0]))
+        if not wait_for_event(_IRQ_PERIPHERAL_DISCONNECT, TIMEOUT_MS):
             return
 
         # Wait for peripheral to start advertising again.
@@ -81,8 +89,7 @@ def instance1():
         # Connect to peripheral and then let the peripheral disconnect us.
         print("gap_connect")
         ble.gap_connect(0, BDADDR)
-        wait_for_event(_IRQ_PERIPHERAL_CONNECT, TIMEOUT_MS)
-        if last_event != _IRQ_PERIPHERAL_CONNECT:
+        if not wait_for_event(_IRQ_PERIPHERAL_CONNECT, TIMEOUT_MS):
             return
         wait_for_event(_IRQ_PERIPHERAL_DISCONNECT, TIMEOUT_MS)
     finally:
diff --git a/tests/multi_bluetooth/ble_gap_device_name.py b/tests/multi_bluetooth/ble_gap_device_name.py
index ee4a7a544042c..dafa367128b49 100644
--- a/tests/multi_bluetooth/ble_gap_device_name.py
+++ b/tests/multi_bluetooth/ble_gap_device_name.py
@@ -5,24 +5,24 @@
 
 TIMEOUT_MS = 5000
 
-_IRQ_CENTRAL_CONNECT = const(1 << 0)
-_IRQ_CENTRAL_DISCONNECT = const(1 << 1)
-_IRQ_PERIPHERAL_CONNECT = const(1 << 6)
-_IRQ_PERIPHERAL_DISCONNECT = const(1 << 7)
-_IRQ_GATTC_CHARACTERISTIC_RESULT = const(1 << 9)
-_IRQ_GATTC_READ_RESULT = const(1 << 11)
+_IRQ_CENTRAL_CONNECT = const(1)
+_IRQ_CENTRAL_DISCONNECT = const(2)
+_IRQ_PERIPHERAL_CONNECT = const(7)
+_IRQ_PERIPHERAL_DISCONNECT = const(8)
+_IRQ_GATTC_CHARACTERISTIC_RESULT = const(11)
+_IRQ_GATTC_CHARACTERISTIC_DONE = const(12)
+_IRQ_GATTC_READ_RESULT = const(15)
+_IRQ_GATTC_READ_DONE = const(16)
 
 GAP_DEVICE_NAME_UUID = bluetooth.UUID(0x2A00)
 
-last_event = None
-last_data = None
+waiting_event = None
+waiting_data = None
 value_handle = 0
 
 
 def irq(event, data):
-    global last_event, last_data, value_handle
-    last_event = event
-    last_data = data
+    global waiting_event, waiting_data, value_handle
     if event == _IRQ_CENTRAL_CONNECT:
         print("_IRQ_CENTRAL_CONNECT")
     elif event == _IRQ_CENTRAL_DISCONNECT:
@@ -38,16 +38,23 @@ def irq(event, data):
     elif event == _IRQ_GATTC_READ_RESULT:
         print("_IRQ_GATTC_READ_RESULT", data[-1])
 
+    if waiting_event is not None:
+        if isinstance(waiting_event, int) and event == waiting_event:
+            waiting_event = None
+            waiting_data = data
+
 
 def wait_for_event(event, timeout_ms):
+    global waiting_event, waiting_data
+    waiting_event = event
+    waiting_data = None
+
     t0 = time.ticks_ms()
     while time.ticks_diff(time.ticks_ms(), t0) < timeout_ms:
-        if isinstance(event, int):
-            if last_event == event:
-                break
-        elif event():
-            break
+        if waiting_data:
+            return True
         machine.idle()
+    return False
 
 
 # Acting in peripheral role.
@@ -72,9 +79,9 @@ def instance0():
             ble.gap_advertise(20_000)
 
             # Wait for central to connect, then wait for it to disconnect.
-            wait_for_event(_IRQ_CENTRAL_CONNECT, TIMEOUT_MS)
-            wait_for_event(_IRQ_CENTRAL_DISCONNECT, 4 * TIMEOUT_MS)
-            if last_event != _IRQ_CENTRAL_DISCONNECT:
+            if not wait_for_event(_IRQ_CENTRAL_CONNECT, TIMEOUT_MS):
+                return
+            if not wait_for_event(_IRQ_CENTRAL_DISCONNECT, 4 * TIMEOUT_MS):
                 return
     finally:
         ble.active(0)
@@ -91,10 +98,9 @@ def instance1():
             # Connect to peripheral.
             print("gap_connect")
             ble.gap_connect(0, BDADDR)
-            wait_for_event(_IRQ_PERIPHERAL_CONNECT, TIMEOUT_MS)
-            if last_event != _IRQ_PERIPHERAL_CONNECT:
+            if not wait_for_event(_IRQ_PERIPHERAL_CONNECT, TIMEOUT_MS):
                 return
-            conn_handle, _, _ = last_data
+            conn_handle, _, _ = waiting_data
 
             if iteration == 0:
                 print("gattc_discover_characteristics")
@@ -111,8 +117,7 @@ def instance1():
 
             # Disconnect from peripheral.
             print("gap_disconnect:", ble.gap_disconnect(conn_handle))
-            wait_for_event(_IRQ_PERIPHERAL_DISCONNECT, TIMEOUT_MS)
-            if last_event != _IRQ_PERIPHERAL_DISCONNECT:
+            if not wait_for_event(_IRQ_PERIPHERAL_DISCONNECT, TIMEOUT_MS):
                 return
     finally:
         ble.active(0)
diff --git a/tests/multi_bluetooth/ble_gatt_data_transfer.py b/tests/multi_bluetooth/ble_gatt_data_transfer.py
index 1be557f9b938a..dba0c333be672 100644
--- a/tests/multi_bluetooth/ble_gatt_data_transfer.py
+++ b/tests/multi_bluetooth/ble_gatt_data_transfer.py
@@ -5,16 +5,19 @@
 
 TIMEOUT_MS = 5000
 
-_IRQ_CENTRAL_CONNECT = const(1 << 0)
-_IRQ_CENTRAL_DISCONNECT = const(1 << 1)
-_IRQ_GATTS_WRITE = const(1 << 2)
-_IRQ_PERIPHERAL_CONNECT = const(1 << 6)
-_IRQ_PERIPHERAL_DISCONNECT = const(1 << 7)
-_IRQ_GATTC_SERVICE_RESULT = const(1 << 8)
-_IRQ_GATTC_CHARACTERISTIC_RESULT = const(1 << 9)
-_IRQ_GATTC_READ_RESULT = const(1 << 11)
-_IRQ_GATTC_WRITE_STATUS = const(1 << 12)
-_IRQ_GATTC_NOTIFY = const(1 << 13)
+_IRQ_CENTRAL_CONNECT = const(1)
+_IRQ_CENTRAL_DISCONNECT = const(2)
+_IRQ_GATTS_WRITE = const(3)
+_IRQ_PERIPHERAL_CONNECT = const(7)
+_IRQ_PERIPHERAL_DISCONNECT = const(8)
+_IRQ_GATTC_SERVICE_RESULT = const(9)
+_IRQ_GATTC_SERVICE_DONE = const(10)
+_IRQ_GATTC_CHARACTERISTIC_RESULT = const(11)
+_IRQ_GATTC_CHARACTERISTIC_DONE = const(12)
+_IRQ_GATTC_READ_RESULT = const(15)
+_IRQ_GATTC_READ_DONE = const(16)
+_IRQ_GATTC_WRITE_DONE = const(17)
+_IRQ_GATTC_NOTIFY = const(18)
 
 SERVICE_UUID = bluetooth.UUID("00000001-1111-2222-3333-444444444444")
 CHAR_CTRL_UUID = bluetooth.UUID("00000002-1111-2222-3333-444444444444")
@@ -26,17 +29,15 @@
 SERVICE = (SERVICE_UUID, (CHAR_CTRL, CHAR_RX, CHAR_TX))
 SERVICES = (SERVICE,)
 
-last_event = None
-last_data = None
+waiting_event = None
+waiting_data = None
 ctrl_value_handle = 0
 rx_value_handle = 0
 tx_value_handle = 0
 
 
 def irq(event, data):
-    global last_event, last_data, ctrl_value_handle, rx_value_handle, tx_value_handle
-    last_event = event
-    last_data = data
+    global waiting_event, waiting_data, ctrl_value_handle, rx_value_handle, tx_value_handle
     if event == _IRQ_CENTRAL_CONNECT:
         print("_IRQ_CENTRAL_CONNECT")
     elif event == _IRQ_CENTRAL_DISCONNECT:
@@ -49,31 +50,44 @@ def irq(event, data):
         print("_IRQ_PERIPHERAL_DISCONNECT")
     elif event == _IRQ_GATTC_CHARACTERISTIC_RESULT:
         if data[-1] == CHAR_CTRL_UUID:
-            print("_IRQ_GATTC_SERVICE_RESULT", data[-1])
+            print("_IRQ_GATTC_CHARACTERISTIC_RESULT", data[-1])
             ctrl_value_handle = data[2]
         elif data[-1] == CHAR_RX_UUID:
-            print("_IRQ_GATTC_SERVICE_RESULT", data[-1])
+            print("_IRQ_GATTC_CHARACTERISTIC_RESULT", data[-1])
             rx_value_handle = data[2]
         elif data[-1] == CHAR_TX_UUID:
-            print("_IRQ_GATTC_SERVICE_RESULT", data[-1])
+            print("_IRQ_GATTC_CHARACTERISTIC_RESULT", data[-1])
             tx_value_handle = data[2]
+    elif event == _IRQ_GATTC_CHARACTERISTIC_DONE:
+        print("_IRQ_GATTC_CHARACTERISTIC_DONE")
     elif event == _IRQ_GATTC_READ_RESULT:
         print("_IRQ_GATTC_READ_RESULT", data[-1])
-    elif event == _IRQ_GATTC_WRITE_STATUS:
-        print("_IRQ_GATTC_WRITE_STATUS", data[-1])
+    elif event == _IRQ_GATTC_READ_DONE:
+        print("_IRQ_GATTC_READ_DONE", data[-1])
+    elif event == _IRQ_GATTC_WRITE_DONE:
+        print("_IRQ_GATTC_WRITE_DONE", data[-1])
     elif event == _IRQ_GATTC_NOTIFY:
         print("_IRQ_GATTC_NOTIFY", data[-1])
 
+    if waiting_event is not None:
+        if (isinstance(waiting_event, int) and event == waiting_event) or (
+            not isinstance(waiting_event, int) and waiting_event(event, data)
+        ):
+            waiting_event = None
+            waiting_data = data
+
 
 def wait_for_event(event, timeout_ms):
+    global waiting_event, waiting_data
+    waiting_event = event
+    waiting_data = None
+
     t0 = time.ticks_ms()
     while time.ticks_diff(time.ticks_ms(), t0) < timeout_ms:
-        if isinstance(event, int):
-            if last_event == event:
-                break
-        elif event():
-            break
+        if waiting_data:
+            return True
         machine.idle()
+    return False
 
 
 # Acting in peripheral role.
@@ -89,14 +103,13 @@ def instance0():
     multitest.next()
     try:
         # Wait for central to connect to us.
-        wait_for_event(_IRQ_CENTRAL_CONNECT, TIMEOUT_MS)
-        if last_event != _IRQ_CENTRAL_CONNECT:
+        if not wait_for_event(_IRQ_CENTRAL_CONNECT, TIMEOUT_MS):
             return
-        conn_handle, _, _ = last_data
+        conn_handle, _, _ = waiting_data
 
         # Wait for the central to signal that it's done with its part of the test.
         wait_for_event(
-            lambda: last_event == _IRQ_GATTS_WRITE and last_data[1] == char_ctrl_handle,
+            lambda event, data: event == _IRQ_GATTS_WRITE and data[1] == char_ctrl_handle,
             2 * TIMEOUT_MS,
         )
 
@@ -125,32 +138,33 @@ def instance1():
         # Connect to peripheral and then disconnect.
         print("gap_connect")
         ble.gap_connect(0, BDADDR)
-        wait_for_event(_IRQ_PERIPHERAL_CONNECT, TIMEOUT_MS)
-        if last_event != _IRQ_PERIPHERAL_CONNECT:
+        if not wait_for_event(_IRQ_PERIPHERAL_CONNECT, TIMEOUT_MS):
             return
-        conn_handle, _, _ = last_data
+        conn_handle, _, _ = waiting_data
 
         # Discover characteristics.
         ble.gattc_discover_characteristics(conn_handle, 1, 65535)
         wait_for_event(
-            lambda: ctrl_value_handle and rx_value_handle and tx_value_handle, TIMEOUT_MS
+            lambda event, data: ctrl_value_handle and rx_value_handle and tx_value_handle,
+            TIMEOUT_MS,
         )
+        wait_for_event(_IRQ_GATTC_CHARACTERISTIC_DONE, TIMEOUT_MS)
 
         # Write to the characteristic a few times, with and without response.
         for i in range(4):
             print("gattc_write")
             ble.gattc_write(conn_handle, rx_value_handle, "central{}".format(i), i & 1)
             if i & 1:
-                wait_for_event(_IRQ_GATTC_WRITE_STATUS, TIMEOUT_MS)
+                wait_for_event(_IRQ_GATTC_WRITE_DONE, TIMEOUT_MS)
             time.sleep_ms(400)
 
         # Write to say that we are done with our part of the test.
         ble.gattc_write(conn_handle, ctrl_value_handle, "OK", 1)
-        wait_for_event(_IRQ_GATTC_WRITE_STATUS, TIMEOUT_MS)
+        wait_for_event(_IRQ_GATTC_WRITE_DONE, TIMEOUT_MS)
 
         # Wait for notification that peripheral is done with its part of the test.
         wait_for_event(
-            lambda: last_event == _IRQ_GATTC_NOTIFY and last_data[1] == ctrl_value_handle,
+            lambda event, data: event == _IRQ_GATTC_NOTIFY and data[1] == ctrl_value_handle,
             TIMEOUT_MS,
         )
 
diff --git a/tests/multi_bluetooth/ble_gatt_data_transfer.py.exp b/tests/multi_bluetooth/ble_gatt_data_transfer.py.exp
index 6ecd48225f5fe..a1b3cbcd07374 100644
--- a/tests/multi_bluetooth/ble_gatt_data_transfer.py.exp
+++ b/tests/multi_bluetooth/ble_gatt_data_transfer.py.exp
@@ -11,16 +11,17 @@ _IRQ_CENTRAL_DISCONNECT
 --- instance1 ---
 gap_connect
 _IRQ_PERIPHERAL_CONNECT
-_IRQ_GATTC_SERVICE_RESULT UUID128('00000002-1111-2222-3333-444444444444')
-_IRQ_GATTC_SERVICE_RESULT UUID128('00000003-1111-2222-3333-444444444444')
-_IRQ_GATTC_SERVICE_RESULT UUID128('00000004-1111-2222-3333-444444444444')
+_IRQ_GATTC_CHARACTERISTIC_RESULT UUID128('00000002-1111-2222-3333-444444444444')
+_IRQ_GATTC_CHARACTERISTIC_RESULT UUID128('00000003-1111-2222-3333-444444444444')
+_IRQ_GATTC_CHARACTERISTIC_RESULT UUID128('00000004-1111-2222-3333-444444444444')
+_IRQ_GATTC_CHARACTERISTIC_DONE
 gattc_write
 gattc_write
-_IRQ_GATTC_WRITE_STATUS 0
+_IRQ_GATTC_WRITE_DONE 0
 gattc_write
 gattc_write
-_IRQ_GATTC_WRITE_STATUS 0
-_IRQ_GATTC_WRITE_STATUS 0
+_IRQ_GATTC_WRITE_DONE 0
+_IRQ_GATTC_WRITE_DONE 0
 _IRQ_GATTC_NOTIFY b'message0'
 _IRQ_GATTC_NOTIFY b'message1'
 _IRQ_GATTC_NOTIFY b'message2'
diff --git a/tests/multi_bluetooth/ble_gattc_discover_services.py b/tests/multi_bluetooth/ble_gattc_discover_services.py
index b01a890c72038..e746b87458e1b 100644
--- a/tests/multi_bluetooth/ble_gattc_discover_services.py
+++ b/tests/multi_bluetooth/ble_gattc_discover_services.py
@@ -5,11 +5,12 @@
 
 TIMEOUT_MS = 5000
 
-_IRQ_CENTRAL_CONNECT = const(1 << 0)
-_IRQ_CENTRAL_DISCONNECT = const(1 << 1)
-_IRQ_PERIPHERAL_CONNECT = const(1 << 6)
-_IRQ_PERIPHERAL_DISCONNECT = const(1 << 7)
-_IRQ_GATTC_SERVICE_RESULT = const(1 << 8)
+_IRQ_CENTRAL_CONNECT = const(1)
+_IRQ_CENTRAL_DISCONNECT = const(2)
+_IRQ_PERIPHERAL_CONNECT = const(7)
+_IRQ_PERIPHERAL_DISCONNECT = const(8)
+_IRQ_GATTC_SERVICE_RESULT = const(9)
+_IRQ_GATTC_SERVICE_DONE = const(10)
 
 UUID_A = bluetooth.UUID(0x180D)
 UUID_B = bluetooth.UUID("A5A5A5A5-FFFF-9999-1111-5A5A5A5A5A5A")
@@ -23,15 +24,13 @@
 )
 SERVICES = (SERVICE_A, SERVICE_B)
 
-last_event = None
-last_data = None
+waiting_event = None
+waiting_data = None
 num_service_result = 0
 
 
 def irq(event, data):
-    global last_event, last_data, num_service_result
-    last_event = event
-    last_data = data
+    global waiting_event, waiting_data, num_service_result
     if event == _IRQ_CENTRAL_CONNECT:
         print("_IRQ_CENTRAL_CONNECT")
     elif event == _IRQ_CENTRAL_DISCONNECT:
@@ -45,16 +44,25 @@ def irq(event, data):
             print("_IRQ_GATTC_SERVICE_RESULT", data[3])
             num_service_result += 1
 
+    if waiting_event is not None:
+        if (isinstance(waiting_event, int) and event == waiting_event) or (
+            not isinstance(waiting_event, int) and waiting_event(event, data)
+        ):
+            waiting_event = None
+            waiting_data = data
+
 
 def wait_for_event(event, timeout_ms):
+    global waiting_event, waiting_data
+    waiting_event = event
+    waiting_data = None
+
     t0 = time.ticks_ms()
     while time.ticks_diff(time.ticks_ms(), t0) < timeout_ms:
-        if isinstance(event, int):
-            if last_event == event:
-                break
-        elif event():
-            break
+        if waiting_data:
+            return True
         machine.idle()
+    return False
 
 
 # Acting in peripheral role.
@@ -78,14 +86,13 @@ def instance1():
         # Connect to peripheral and then disconnect.
         print("gap_connect")
         ble.gap_connect(0, BDADDR)
-        wait_for_event(_IRQ_PERIPHERAL_CONNECT, TIMEOUT_MS)
-        if last_event != _IRQ_PERIPHERAL_CONNECT:
+        if not wait_for_event(_IRQ_PERIPHERAL_CONNECT, TIMEOUT_MS):
             return
-        conn_handle, _, _ = last_data
+        conn_handle, _, _ = waiting_data
 
         # Discover services.
         ble.gattc_discover_services(conn_handle)
-        wait_for_event(lambda: num_service_result == 2, TIMEOUT_MS)
+        wait_for_event(lambda event, data: num_service_result == 2, TIMEOUT_MS)
 
         # Disconnect from peripheral.
         print("gap_disconnect:", ble.gap_disconnect(conn_handle))
diff --git a/tests/run-multitests.py b/tests/run-multitests.py
index c83895fb65f37..567e9b5ffa388 100755
--- a/tests/run-multitests.py
+++ b/tests/run-multitests.py
@@ -289,7 +289,7 @@ def run_test_on_instances(test_file, num_instances, instances):
                     continue
                 num_output += 1
                 last_read_time[idx] = time.time()
-                if out is not None:
+                if out is not None and not any(m in out for m in IGNORE_OUTPUT_MATCHES):
                     trace_instance_output(idx, out)
                     output[idx].append(out)
                 if err is not None:

From 9708fe8788eebb87bf3b0d6232dbed2012cf7358 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Wed, 13 May 2020 16:49:57 +1000
Subject: [PATCH 0039/3533] docs/library: Update ubluetooth for new events and
 discover by uuid.

---
 docs/library/ubluetooth.rst | 84 ++++++++++++++++++++++++-------------
 1 file changed, 54 insertions(+), 30 deletions(-)

diff --git a/docs/library/ubluetooth.rst b/docs/library/ubluetooth.rst
index fd2efe87d913f..ee8fd75ade227 100644
--- a/docs/library/ubluetooth.rst
+++ b/docs/library/ubluetooth.rst
@@ -65,15 +65,12 @@ Configuration
 Event Handling
 --------------
 
-.. method:: BLE.irq(handler, trigger=0xffff)
+.. method:: BLE.irq(handler)
 
     Registers a callback for events from the BLE stack. The *handler* takes two
     arguments, ``event`` (which will be one of the codes below) and ``data``
     (which is an event-specific tuple of values).
 
-    The optional *trigger* parameter allows you to set a mask of events that
-    your program is interested in. The default is all events.
-
     Note: the ``addr``, ``adv_data``, ``char_data``, ``notify_data``, and
     ``uuid`` entries in the tuples are
     references to data managed by the :mod:`ubluetooth` module (i.e. the same
@@ -101,7 +98,7 @@ Event Handling
             elif event == _IRQ_SCAN_RESULT:
                 # A single scan result.
                 addr_type, addr, adv_type, rssi, adv_data = data
-            elif event == _IRQ_SCAN_COMPLETE:
+            elif event == _IRQ_SCAN_DONE:
                 # Scan duration finished or manually stopped.
                 pass
             elif event == _IRQ_PERIPHERAL_CONNECT:
@@ -113,17 +110,31 @@ Event Handling
             elif event == _IRQ_GATTC_SERVICE_RESULT:
                 # Called for each service found by gattc_discover_services().
                 conn_handle, start_handle, end_handle, uuid = data
+            elif event == _IRQ_GATTC_SERVICE_DONE:
+                # Called once service discovery is complete.
+                conn_handle, status = data
             elif event == _IRQ_GATTC_CHARACTERISTIC_RESULT:
                 # Called for each characteristic found by gattc_discover_services().
                 conn_handle, def_handle, value_handle, properties, uuid = data
+            elif event == _IRQ_GATTC_CHARACTERISTIC_DONE:
+                # Called once service discovery is complete.
+                conn_handle, status = data
             elif event == _IRQ_GATTC_DESCRIPTOR_RESULT:
                 # Called for each descriptor found by gattc_discover_descriptors().
                 conn_handle, dsc_handle, uuid = data
+            elif event == _IRQ_GATTC_DESCRIPTOR_DONE:
+                # Called once service discovery is complete.
+                conn_handle, status = data
             elif event == _IRQ_GATTC_READ_RESULT:
                 # A gattc_read() has completed.
                 conn_handle, value_handle, char_data = data
-            elif event == _IRQ_GATTC_WRITE_STATUS:
+            elif event == _IRQ_GATTC_READ_DONE:
+                # A gattc_read() has completed.
+                # Note: The value_handle will be zero on btstack (but present on NimBLE).
+                conn_handle, value_handle, status = data
+            elif event == _IRQ_GATTC_WRITE_DONE:
                 # A gattc_write() has completed.
+                # Note: The value_handle will be zero on btstack (but present on NimBLE).
                 conn_handle, value_handle, status = data
             elif event == _IRQ_GATTC_NOTIFY:
                 # A peripheral has sent a notify request.
@@ -135,21 +146,25 @@ Event Handling
 The event codes are::
 
     from micropython import const
-    _IRQ_CENTRAL_CONNECT                 = const(1 << 0)
-    _IRQ_CENTRAL_DISCONNECT              = const(1 << 1)
-    _IRQ_GATTS_WRITE                     = const(1 << 2)
-    _IRQ_GATTS_READ_REQUEST              = const(1 << 3)
-    _IRQ_SCAN_RESULT                     = const(1 << 4)
-    _IRQ_SCAN_COMPLETE                   = const(1 << 5)
-    _IRQ_PERIPHERAL_CONNECT              = const(1 << 6)
-    _IRQ_PERIPHERAL_DISCONNECT           = const(1 << 7)
-    _IRQ_GATTC_SERVICE_RESULT            = const(1 << 8)
-    _IRQ_GATTC_CHARACTERISTIC_RESULT     = const(1 << 9)
-    _IRQ_GATTC_DESCRIPTOR_RESULT         = const(1 << 10)
-    _IRQ_GATTC_READ_RESULT               = const(1 << 11)
-    _IRQ_GATTC_WRITE_STATUS              = const(1 << 12)
-    _IRQ_GATTC_NOTIFY                    = const(1 << 13)
-    _IRQ_GATTC_INDICATE                  = const(1 << 14)
+    _IRQ_CENTRAL_CONNECT = const(1)
+    _IRQ_CENTRAL_DISCONNECT = const(2)
+    _IRQ_GATTS_WRITE = const(3)
+    _IRQ_GATTS_READ_REQUEST = const(4)
+    _IRQ_SCAN_RESULT = const(5)
+    _IRQ_SCAN_DONE = const(6)
+    _IRQ_PERIPHERAL_CONNECT = const(7)
+    _IRQ_PERIPHERAL_DISCONNECT = const(8)
+    _IRQ_GATTC_SERVICE_RESULT = const(9)
+    _IRQ_GATTC_SERVICE_DONE = const(10)
+    _IRQ_GATTC_CHARACTERISTIC_RESULT = const(11)
+    _IRQ_GATTC_CHARACTERISTIC_DONE = const(12)
+    _IRQ_GATTC_DESCRIPTOR_RESULT = const(13)
+    _IRQ_GATTC_DESCRIPTOR_DONE = const(14)
+    _IRQ_GATTC_READ_RESULT = const(15)
+    _IRQ_GATTC_READ_DONE = const(16)
+    _IRQ_GATTC_WRITE_DONE = const(17)
+    _IRQ_GATTC_NOTIFY = const(18)
+    _IRQ_GATTC_INDICATE = const(19)
 
 In order to save space in the firmware, these constants are not included on the
 :mod:`ubluetooth` module. Add the ones that you need from the list above to your
@@ -203,7 +218,7 @@ Observer Role (Scanner)
         * 0x04 - SCAN_RSP - scan response
 
     When scanning is stopped (either due to the duration finishing or when
-    explicitly stopped), the ``_IRQ_SCAN_COMPLETE`` event will be raised.
+    explicitly stopped), the ``_IRQ_SCAN_DONE`` event will be raised.
 
 
 Peripheral Role (GATT Server)
@@ -313,33 +328,42 @@ Central Role (GATT Client)
     Returns ``False`` if the connection handle wasn't connected, and ``True``
     otherwise.
 
-.. method:: BLE.gattc_discover_services(conn_handle)
+.. method:: BLE.gattc_discover_services(conn_handle, [uuid])
 
     Query a connected peripheral for its services.
 
-    For each service discovered, the ``_IRQ_GATTC_SERVICE_RESULT`` event will be
-    raised.
+    Optionally specify a service *uuid* to query for that service only.
 
-.. method:: BLE.gattc_discover_characteristics(conn_handle, start_handle, end_handle)
+    For each service discovered, the ``_IRQ_GATTC_SERVICE_RESULT`` event will
+    be raised, followed by ``_IRQ_GATTC_SERVICE_DONE`` on completion.
+
+.. method:: BLE.gattc_discover_characteristics(conn_handle, start_handle, end_handle, [uuid])
 
     Query a connected peripheral for characteristics in the specified range.
 
+    Optionally specify a characteristic *uuid* to query for that
+    characteristic only.
+
+    You can use ``start_handle=1``, ``end_handle=0xffff`` to search for a
+    characteristic in any service.
+
     For each characteristic discovered, the ``_IRQ_GATTC_CHARACTERISTIC_RESULT``
-    event will be raised.
+    event will be raised, followed by ``_IRQ_GATTC_CHARACTERISTIC_DONE`` on completion.
 
 .. method:: BLE.gattc_discover_descriptors(conn_handle, start_handle, end_handle)
 
     Query a connected peripheral for descriptors in the specified range.
 
     For each descriptor discovered, the ``_IRQ_GATTC_DESCRIPTOR_RESULT`` event
-    will be raised.
+    will be raised, followed by ``_IRQ_GATTC_DESCRIPTOR_DONE`` on completion.
 
 .. method:: BLE.gattc_read(conn_handle, value_handle)
 
     Issue a remote read to a connected peripheral for the specified
     characteristic or descriptor handle.
 
-    On success, the ``_IRQ_GATTC_READ_RESULT`` event will be raised.
+    When a value is available, the ``_IRQ_GATTC_READ_RESULT`` event will be
+    raised. Additionally, the ``_IRQ_GATTC_READ_DONE`` will be raised.
 
 .. method:: BLE.gattc_write(conn_handle, value_handle, data, mode=0, /)
 
@@ -357,7 +381,7 @@ Central Role (GATT Client)
           data.
 
     If a response is received from the remote peripheral the
-    ``_IRQ_GATTC_WRITE_STATUS`` event will be raised.
+    ``_IRQ_GATTC_WRITE_DONE`` event will be raised.
 
 
 class UUID

From 1cad63c0bcf63b12436a1438aa8512cd05ad4da0 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Tue, 19 May 2020 16:00:23 +1000
Subject: [PATCH 0040/3533] extmod/modbluetooth: Ensure status=0 always on
 success.

This commit makes sure that all discovery complete and read/write status
events set the status to zero on success.

The status value will be implementation-dependent on non-success cases.
---
 docs/library/ubluetooth.rst                   | 5 +++++
 examples/bluetooth/ble_temperature_central.py | 2 +-
 extmod/nimble/modbluetooth_nimble.c           | 7 +++----
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/docs/library/ubluetooth.rst b/docs/library/ubluetooth.rst
index ee8fd75ade227..f96a7caaf828e 100644
--- a/docs/library/ubluetooth.rst
+++ b/docs/library/ubluetooth.rst
@@ -112,18 +112,21 @@ Event Handling
                 conn_handle, start_handle, end_handle, uuid = data
             elif event == _IRQ_GATTC_SERVICE_DONE:
                 # Called once service discovery is complete.
+                # Note: Status will be zero on success, implementation-specific value otherwise.
                 conn_handle, status = data
             elif event == _IRQ_GATTC_CHARACTERISTIC_RESULT:
                 # Called for each characteristic found by gattc_discover_services().
                 conn_handle, def_handle, value_handle, properties, uuid = data
             elif event == _IRQ_GATTC_CHARACTERISTIC_DONE:
                 # Called once service discovery is complete.
+                # Note: Status will be zero on success, implementation-specific value otherwise.
                 conn_handle, status = data
             elif event == _IRQ_GATTC_DESCRIPTOR_RESULT:
                 # Called for each descriptor found by gattc_discover_descriptors().
                 conn_handle, dsc_handle, uuid = data
             elif event == _IRQ_GATTC_DESCRIPTOR_DONE:
                 # Called once service discovery is complete.
+                # Note: Status will be zero on success, implementation-specific value otherwise.
                 conn_handle, status = data
             elif event == _IRQ_GATTC_READ_RESULT:
                 # A gattc_read() has completed.
@@ -131,10 +134,12 @@ Event Handling
             elif event == _IRQ_GATTC_READ_DONE:
                 # A gattc_read() has completed.
                 # Note: The value_handle will be zero on btstack (but present on NimBLE).
+                # Note: Status will be zero on success, implementation-specific value otherwise.
                 conn_handle, value_handle, status = data
             elif event == _IRQ_GATTC_WRITE_DONE:
                 # A gattc_write() has completed.
                 # Note: The value_handle will be zero on btstack (but present on NimBLE).
+                # Note: Status will be zero on success, implementation-specific value otherwise.
                 conn_handle, value_handle, status = data
             elif event == _IRQ_GATTC_NOTIFY:
                 # A peripheral has sent a notify request.
diff --git a/examples/bluetooth/ble_temperature_central.py b/examples/bluetooth/ble_temperature_central.py
index 6195784622093..1ce99728b37d3 100644
--- a/examples/bluetooth/ble_temperature_central.py
+++ b/examples/bluetooth/ble_temperature_central.py
@@ -162,7 +162,7 @@ def _irq(self, event, data):
                     self._read_callback = None
 
         elif event == _IRQ_GATTC_READ_DONE:
-            # Read completed.
+            # Read completed (no-op).
             conn_handle, value_handle, status = data
 
         elif event == _IRQ_GATTC_NOTIFY:
diff --git a/extmod/nimble/modbluetooth_nimble.c b/extmod/nimble/modbluetooth_nimble.c
index 9b95d05f32890..05ec6117791da 100644
--- a/extmod/nimble/modbluetooth_nimble.c
+++ b/extmod/nimble/modbluetooth_nimble.c
@@ -764,7 +764,7 @@ STATIC int peripheral_discover_service_cb(uint16_t conn_handle, const struct ble
         mp_obj_bluetooth_uuid_t service_uuid = create_mp_uuid(&service->uuid);
         mp_bluetooth_gattc_on_primary_service_result(conn_handle, service->start_handle, service->end_handle, &service_uuid);
     } else {
-        mp_bluetooth_gattc_on_discover_complete(MP_BLUETOOTH_IRQ_GATTC_SERVICE_DONE, conn_handle, error->status);
+        mp_bluetooth_gattc_on_discover_complete(MP_BLUETOOTH_IRQ_GATTC_SERVICE_DONE, conn_handle, error->status == BLE_HS_EDONE ? 0 : error->status);
     }
     return 0;
 }
@@ -793,7 +793,7 @@ STATIC int ble_gatt_characteristic_cb(uint16_t conn_handle, const struct ble_gat
         mp_obj_bluetooth_uuid_t characteristic_uuid = create_mp_uuid(&characteristic->uuid);
         mp_bluetooth_gattc_on_characteristic_result(conn_handle, characteristic->def_handle, characteristic->val_handle, characteristic->properties, &characteristic_uuid);
     } else {
-        mp_bluetooth_gattc_on_discover_complete(MP_BLUETOOTH_IRQ_GATTC_CHARACTERISTIC_DONE, conn_handle, error->status);
+        mp_bluetooth_gattc_on_discover_complete(MP_BLUETOOTH_IRQ_GATTC_CHARACTERISTIC_DONE, conn_handle, error->status == BLE_HS_EDONE ? 0 : error->status);
     }
     return 0;
 }
@@ -822,7 +822,7 @@ STATIC int ble_gatt_descriptor_cb(uint16_t conn_handle, const struct ble_gatt_er
         mp_obj_bluetooth_uuid_t descriptor_uuid = create_mp_uuid(&descriptor->uuid);
         mp_bluetooth_gattc_on_descriptor_result(conn_handle, descriptor->handle, &descriptor_uuid);
     } else {
-        mp_bluetooth_gattc_on_discover_complete(MP_BLUETOOTH_IRQ_GATTC_DESCRIPTOR_DONE, conn_handle, error->status);
+        mp_bluetooth_gattc_on_discover_complete(MP_BLUETOOTH_IRQ_GATTC_DESCRIPTOR_DONE, conn_handle, error->status == BLE_HS_EDONE ? 0 : error->status);
     }
     return 0;
 }
@@ -840,7 +840,6 @@ STATIC int ble_gatt_attr_read_cb(uint16_t conn_handle, const struct ble_gatt_err
     if (!mp_bluetooth_is_active()) {
         return 0;
     }
-    // TODO: Maybe send NULL if error->status non-zero.
     if (error->status == 0) {
         gattc_on_data_available(MP_BLUETOOTH_IRQ_GATTC_READ_RESULT, conn_handle, attr->handle, attr->om);
     }

From 8b7ae4e099c18d839d1999c49dd8a1795bf9d1ae Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Thu, 28 May 2020 10:51:45 +1000
Subject: [PATCH 0041/3533] extmod/modbluetooth: Support bigger characteristic
 values.

The ring buffer previously used a single unsigned byte field to save the
length, meaning that it would overflow for large characteristic value
responses.

With this commit it now use a 16-bit length instead and has code to
explicitly truncate at UINT16_MAX (although this should be impossible to
achieve in practice).
---
 extmod/modbluetooth.c | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/extmod/modbluetooth.c b/extmod/modbluetooth.c
index 34d18b0b74776..da40a1548541d 100644
--- a/extmod/modbluetooth.c
+++ b/extmod/modbluetooth.c
@@ -835,7 +835,7 @@ STATIC void ringbuf_extract(ringbuf_t *ringbuf, mp_obj_tuple_t *data_tuple, size
     // put more than bt->irq_data_data_alloc bytes into the ringbuf, because
     // that's what's available here in bt->irq_data_bytes.
     if (bytes_data) {
-        bytes_data->len = ringbuf_get(ringbuf);
+        bytes_data->len = ringbuf_get16(ringbuf);
         for (size_t i = 0; i < bytes_data->len; ++i) {
             // cast away const, this is actually bt->irq_data_bytes.
             ((uint8_t *)bytes_data->data)[i] = ringbuf_get(ringbuf);
@@ -1001,7 +1001,7 @@ void mp_bluetooth_gap_on_scan_result(uint8_t addr_type, const uint8_t *addr, uin
     MICROPY_PY_BLUETOOTH_ENTER
     mp_obj_bluetooth_ble_t *o = MP_OBJ_TO_PTR(MP_STATE_VM(bluetooth));
     data_len = MIN(o->irq_data_data_alloc, data_len);
-    if (enqueue_irq(o, 1 + 6 + 1 + 1 + 1 + data_len, MP_BLUETOOTH_IRQ_SCAN_RESULT)) {
+    if (enqueue_irq(o, 1 + 6 + 1 + 1 + 2 + data_len, MP_BLUETOOTH_IRQ_SCAN_RESULT)) {
         ringbuf_put(&o->ringbuf, addr_type);
         for (int i = 0; i < 6; ++i) {
             ringbuf_put(&o->ringbuf, addr[i]);
@@ -1010,7 +1010,9 @@ void mp_bluetooth_gap_on_scan_result(uint8_t addr_type, const uint8_t *addr, uin
         ringbuf_put(&o->ringbuf, adv_type);
         // Note conversion of int8_t rssi to uint8_t. Must un-convert on the way out.
         ringbuf_put(&o->ringbuf, (uint8_t)rssi);
-        ringbuf_put(&o->ringbuf, data_len);
+        // Length field is 16-bit.
+        data_len = MIN(UINT16_MAX, data_len);
+        ringbuf_put16(&o->ringbuf, data_len);
         for (size_t i = 0; i < data_len; ++i) {
             ringbuf_put(&o->ringbuf, data[i]);
         }
@@ -1069,10 +1071,12 @@ size_t mp_bluetooth_gattc_on_data_available_start(uint8_t event, uint16_t conn_h
     *atomic_state_out = atomic_state;
     mp_obj_bluetooth_ble_t *o = MP_OBJ_TO_PTR(MP_STATE_VM(bluetooth));
     data_len = MIN(o->irq_data_data_alloc, data_len);
-    if (enqueue_irq(o, 2 + 2 + 1 + data_len, event)) {
+    if (enqueue_irq(o, 2 + 2 + 2 + data_len, event)) {
         ringbuf_put16(&o->ringbuf, conn_handle);
         ringbuf_put16(&o->ringbuf, value_handle);
-        ringbuf_put(&o->ringbuf, data_len);
+        // Length field is 16-bit.
+        data_len = MIN(UINT16_MAX, data_len);
+        ringbuf_put16(&o->ringbuf, data_len);
         return data_len;
     } else {
         return 0;

From 834b482e67ebb1b9ad250d62ddfa1275824a7e19 Mon Sep 17 00:00:00 2001
From: jxltom <jxltom@gmail.com>
Date: Sat, 9 May 2020 14:34:15 +0800
Subject: [PATCH 0042/3533] examples/bluetooth: Fix incorrect value of BR/EDR
 flag in advertising.

According to Supplement to the Bluetooth Core Specification v8 Part A
1.3.1, to support BR/EDR the code should set the fifth bit (Simultaneous LE
and BR/EDR to Same Device Capable (Controller)) and fourth bit
(Simultaneous LE and BR/EDR to Same Device Capable (Host)) of the flag.
---
 examples/bluetooth/ble_advertising.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/bluetooth/ble_advertising.py b/examples/bluetooth/ble_advertising.py
index 3fb1281f636ee..a496119967a5d 100644
--- a/examples/bluetooth/ble_advertising.py
+++ b/examples/bluetooth/ble_advertising.py
@@ -30,7 +30,7 @@ def _append(adv_type, value):
 
     _append(
         _ADV_TYPE_FLAGS,
-        struct.pack("B", (0x01 if limited_disc else 0x02) + (0x00 if br_edr else 0x04)),
+        struct.pack("B", (0x01 if limited_disc else 0x02) + (0x18 if br_edr else 0x04)),
     )
 
     if name:

From 596fb73927df4f9202729ff9d92a1db479a95ed7 Mon Sep 17 00:00:00 2001
From: Damien George <damien.p.george@gmail.com>
Date: Tue, 2 Jun 2020 16:24:53 +1000
Subject: [PATCH 0043/3533] qemu-arm: Support building in debug mode with
 DEBUG=1.

Fixes issue #6095.
---
 ports/qemu-arm/Makefile  | 4 ++--
 ports/qemu-arm/startup.c | 9 +++++++++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/ports/qemu-arm/Makefile b/ports/qemu-arm/Makefile
index 430740ccf73f7..e7b6523f88c2f 100644
--- a/ports/qemu-arm/Makefile
+++ b/ports/qemu-arm/Makefile
@@ -43,9 +43,9 @@ INC += -I$(BUILD)
 CFLAGS += $(INC) -Wall -Wpointer-arith -Wdouble-promotion -Wfloat-conversion -Werror -std=gnu99 $(COPT) \
 	 -ffunction-sections -fdata-sections
 
-#Debugging/Optimization
+# Debugging/Optimization
 ifeq ($(DEBUG), 1)
-CFLAGS += -g -DPENDSV_DEBUG
+CFLAGS += -g
 COPT = -O0
 else
 COPT += -Os -DNDEBUG
diff --git a/ports/qemu-arm/startup.c b/ports/qemu-arm/startup.c
index 002d5ef62418a..58bdf7af9e98e 100644
--- a/ports/qemu-arm/startup.c
+++ b/ports/qemu-arm/startup.c
@@ -1,4 +1,5 @@
 #include <stdint.h>
+#include <stdio.h>
 #include <stdlib.h>
 
 #include "uart.h"
@@ -73,6 +74,14 @@ __attribute__((naked)) void exit(int status) {
     }
 }
 
+#ifndef NDEBUG
+void __assert_func(const char *file, int line, const char *func, const char *expr) {
+    (void)func;
+    printf("Assertion '%s' failed, at file %s:%d\n", expr, file, line);
+    exit(1);
+}
+#endif
+
 // The following are needed for tinytest
 
 #include <stdio.h>

From 621f40b12c272788533dcafcef62ed2a3449bb3b Mon Sep 17 00:00:00 2001
From: Damien George <damien.p.george@gmail.com>
Date: Tue, 2 Jun 2020 16:42:37 +1000
Subject: [PATCH 0044/3533] esp32/mpthreadport: Fix calculation of thread stack
 size.

With this commit the code should work correctly regardless of the size of
StackType_t (it's actually 1 byte in size for the esp32's custom FreeRTOS).

Fixes issue #6072.
---
 ports/esp32/main.c         |  5 ++---
 ports/esp32/mpthreadport.c | 10 +++++-----
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/ports/esp32/main.c b/ports/esp32/main.c
index 81e4a64346180..6f9ab82d0512a 100644
--- a/ports/esp32/main.c
+++ b/ports/esp32/main.c
@@ -65,7 +65,6 @@
 // MicroPython runs as a task under FreeRTOS
 #define MP_TASK_PRIORITY        (ESP_TASK_PRIO_MIN + 1)
 #define MP_TASK_STACK_SIZE      (16 * 1024)
-#define MP_TASK_STACK_LEN       (MP_TASK_STACK_SIZE / sizeof(StackType_t))
 
 int vprintf_null(const char *format, va_list ap) {
     // do nothing: this is used as a log target during raw repl mode
@@ -75,7 +74,7 @@ int vprintf_null(const char *format, va_list ap) {
 void mp_task(void *pvParameter) {
     volatile uint32_t sp = (uint32_t)get_sp();
     #if MICROPY_PY_THREAD
-    mp_thread_init(pxTaskGetStackStart(NULL), MP_TASK_STACK_LEN);
+    mp_thread_init(pxTaskGetStackStart(NULL), MP_TASK_STACK_SIZE / sizeof(uintptr_t));
     #endif
     uart_init();
 
@@ -169,7 +168,7 @@ void app_main(void) {
         nvs_flash_erase();
         nvs_flash_init();
     }
-    xTaskCreatePinnedToCore(mp_task, "mp_task", MP_TASK_STACK_LEN, NULL, MP_TASK_PRIORITY, &mp_main_task_handle, MP_TASK_COREID);
+    xTaskCreatePinnedToCore(mp_task, "mp_task", MP_TASK_STACK_SIZE / sizeof(StackType_t), NULL, MP_TASK_PRIORITY, &mp_main_task_handle, MP_TASK_COREID);
 }
 
 void nlr_jump_fail(void *val) {
diff --git a/ports/esp32/mpthreadport.c b/ports/esp32/mpthreadport.c
index f39c99b68d41a..d294c92727bf9 100644
--- a/ports/esp32/mpthreadport.c
+++ b/ports/esp32/mpthreadport.c
@@ -83,7 +83,7 @@ void mp_thread_gc_others(void) {
         if (!th->ready) {
             continue;
         }
-        gc_collect_root(th->stack, th->stack_len); // probably not needed
+        gc_collect_root(th->stack, th->stack_len);
     }
     mp_thread_mutex_unlock(&thread_mutex);
 }
@@ -140,17 +140,17 @@ void mp_thread_create_ex(void *(*entry)(void *), void *arg, size_t *stack_size,
         mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("can't create thread"));
     }
 
-    // adjust the stack_size to provide room to recover from hitting the limit
-    *stack_size -= 1024;
-
     // add thread to linked list of all threads
     th->ready = 0;
     th->arg = arg;
     th->stack = pxTaskGetStackStart(th->id);
-    th->stack_len = *stack_size / sizeof(StackType_t);
+    th->stack_len = *stack_size / sizeof(uintptr_t);
     th->next = thread;
     thread = th;
 
+    // adjust the stack_size to provide room to recover from hitting the limit
+    *stack_size -= 1024;
+
     mp_thread_mutex_unlock(&thread_mutex);
 }
 

From eeca2c3cbe84975ffabd7fda932b2f5674e8b0fc Mon Sep 17 00:00:00 2001
From: David Lechner <david@pybricks.com>
Date: Wed, 3 Jun 2020 18:44:27 -0500
Subject: [PATCH 0045/3533] github: Add GitHub action to build docs.

This builds docs, but only on pull requests that change a file in the
docs/ directory.
---
 .github/workflows/docs.yml | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 .github/workflows/docs.yml

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
new file mode 100644
index 0000000000000..ec6b4c7f1962a
--- /dev/null
+++ b/.github/workflows/docs.yml
@@ -0,0 +1,18 @@
+name: Build docs
+
+on:
+  pull_request:
+    paths:
+      - docs/**
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - uses: actions/setup-python@v1
+    - name: Install Python packages
+      run: pip install Sphinx
+    - name: Build docs
+      run: make -C docs/ html

From 1e6d18c915ccea0b6a19ffec9710d33dd7e5f866 Mon Sep 17 00:00:00 2001
From: David Lechner <david@pybricks.com>
Date: Wed, 3 Jun 2020 20:38:45 -0500
Subject: [PATCH 0046/3533] docs: Fix Sphinx 3.x warnings, and enable
 warnings-as-errors on build.

This enables warnings as errors and fixes all current errors, namely:

- reference to terms in the glossary must now be explicit (:term:)
- method overloads must not be declared as a separate method or must
  use :noindex:
- 2 cases where `` should have been used instead of `
---
 docs/Makefile                 |  2 +-
 docs/library/esp32.rst        |  4 ++--
 docs/library/index.rst        |  4 ++--
 docs/library/micropython.rst  |  2 +-
 docs/library/network.WLAN.rst |  4 ++--
 docs/library/network.rst      |  2 +-
 docs/library/pyb.Flash.rst    |  5 +++--
 docs/library/uerrno.rst       |  4 ++--
 docs/library/uio.rst          |  2 ++
 docs/library/uos.rst          |  4 ++--
 docs/library/ure.rst          | 10 +++++-----
 docs/library/usocket.rst      | 20 ++++++++++----------
 docs/library/ussl.rst         |  2 +-
 docs/make.bat                 |  1 +
 docs/reference/packages.rst   | 34 +++++++++++++++++-----------------
 docs/reference/pyboard.py.rst |  2 +-
 docs/templates/replace.inc    |  2 +-
 17 files changed, 54 insertions(+), 50 deletions(-)

diff --git a/docs/Makefile b/docs/Makefile
index e9c128e900788..05709617c35b9 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -3,7 +3,7 @@
 
 # You can set these variables from the command line.
 PYTHON        = python3
-SPHINXOPTS    =
+SPHINXOPTS    = -W --keep-going
 SPHINXBUILD   = sphinx-build
 PAPER         =
 BUILDDIR      = build/$(MICROPY_PORT)
diff --git a/docs/library/esp32.rst b/docs/library/esp32.rst
index f3be3692e3267..33b779a214336 100644
--- a/docs/library/esp32.rst
+++ b/docs/library/esp32.rst
@@ -84,9 +84,9 @@ methods to enable over-the-air (OTA) updates.
     Returns a 6-tuple ``(type, subtype, addr, size, label, encrypted)``.
 
 .. method:: Partition.readblocks(block_num, buf)
-.. method:: Partition.readblocks(block_num, buf, offset)
+            Partition.readblocks(block_num, buf, offset)
 .. method:: Partition.writeblocks(block_num, buf)
-.. method:: Partition.writeblocks(block_num, buf, offset)
+            Partition.writeblocks(block_num, buf, offset)
 .. method:: Partition.ioctl(cmd, arg)
 
     These methods implement the simple and :ref:`extended
diff --git a/docs/library/index.rst b/docs/library/index.rst
index 7b1636ce61b33..952e67d43ccec 100644
--- a/docs/library/index.rst
+++ b/docs/library/index.rst
@@ -23,7 +23,7 @@ into MicroPython. There are a few categories of such modules:
 * Modules which implement a subset of Python functionality, with a provision
   for extension by the user (via Python code).
 * Modules which implement MicroPython extensions to the Python standard libraries.
-* Modules specific to a particular `MicroPython port` and thus not portable.
+* Modules specific to a particular :term:`MicroPython port` and thus not portable.
 
 Note about the availability of the modules and their contents: This documentation
 in general aspires to describe all modules and functions/classes which are
@@ -38,7 +38,7 @@ in a module (or even the entire module) described in this documentation **may be
 unavailable** in a particular build of MicroPython on a particular system. The
 best place to find general information of the availability/non-availability
 of a particular feature is the "General Information" section which contains
-information pertaining to a specific `MicroPython port`.
+information pertaining to a specific :term:`MicroPython port`.
 
 On some ports you are able to discover the available, built-in libraries that
 can be imported by entering the following at the REPL::
diff --git a/docs/library/micropython.rst b/docs/library/micropython.rst
index ded52deb0d268..7106a1a2ff16d 100644
--- a/docs/library/micropython.rst
+++ b/docs/library/micropython.rst
@@ -100,7 +100,7 @@ Functions
    unlocked.
 
    Note: `heap_locked()` is not enabled on most ports by default,
-   requires `MICROPY_PY_MICROPYTHON_HEAP_LOCKED`.
+   requires ``MICROPY_PY_MICROPYTHON_HEAP_LOCKED``.
 
 .. function:: kbd_intr(chr)
 
diff --git a/docs/library/network.WLAN.rst b/docs/library/network.WLAN.rst
index 46a27a8fe462d..885a4460c56d4 100644
--- a/docs/library/network.WLAN.rst
+++ b/docs/library/network.WLAN.rst
@@ -101,7 +101,7 @@ Methods
     nic.ifconfig(('192.168.0.4', '255.255.255.0', '192.168.0.1', '8.8.8.8'))
 
 .. method:: WLAN.config('param')
-.. method:: WLAN.config(param=value, ...)
+            WLAN.config(param=value, ...)
 
    Get or set general network interface parameters. These methods allow to work
    with additional parameters beyond standard IP configuration (as dealt with by
@@ -117,7 +117,7 @@ Methods
     print(ap.config('channel'))
 
    Following are commonly supported parameters (availability of a specific parameter
-   depends on network technology type, driver, and `MicroPython port`).
+   depends on network technology type, driver, and :term:`MicroPython port`).
 
    =============  ===========
    Parameter      Description
diff --git a/docs/library/network.rst b/docs/library/network.rst
index 01e6f61369a40..208c58f852e6b 100644
--- a/docs/library/network.rst
+++ b/docs/library/network.rst
@@ -39,7 +39,7 @@ Common network adapter interface
 ================================
 
 This section describes an (implied) abstract base class for all network
-interface classes implemented by `MicroPython ports <MicroPython port>`
+interface classes implemented by :term:`MicroPython ports <MicroPython port>`
 for different hardware. This means that MicroPython does not actually
 provide ``AbstractNIC`` class, but any actual NIC class, as described
 in the following sections, implements methods as described here.
diff --git a/docs/library/pyb.Flash.rst b/docs/library/pyb.Flash.rst
index 2d2f83da1c6ad..13f2097871913 100644
--- a/docs/library/pyb.Flash.rst
+++ b/docs/library/pyb.Flash.rst
@@ -26,6 +26,7 @@ Constructors
    This constructor is deprecated and will be removed in a future version of MicroPython.
 
 .. class:: pyb.Flash(\*, start=-1, len=-1)
+   :noindex:
 
    Create and return a block device that accesses the flash at the specified offset. The length defaults to the remaining size of the device.
 
@@ -35,9 +36,9 @@ Methods
 -------
 
 .. method:: Flash.readblocks(block_num, buf)
-.. method:: Flash.readblocks(block_num, buf, offset)
+            Flash.readblocks(block_num, buf, offset)
 .. method:: Flash.writeblocks(block_num, buf)
-.. method:: Flash.writeblocks(block_num, buf, offset)
+            Flash.writeblocks(block_num, buf, offset)
 .. method:: Flash.ioctl(cmd, arg)
 
     These methods implement the simple and :ref:`extended
diff --git a/docs/library/uerrno.rst b/docs/library/uerrno.rst
index e336eb5c5c85c..def01362f1387 100644
--- a/docs/library/uerrno.rst
+++ b/docs/library/uerrno.rst
@@ -7,7 +7,7 @@
 |see_cpython_module| :mod:`python:errno`.
 
 This module provides access to symbolic error codes for `OSError` exception.
-A particular inventory of codes depends on `MicroPython port`.
+A particular inventory of codes depends on :term:`MicroPython port`.
 
 Constants
 ---------
@@ -16,7 +16,7 @@ Constants
 
     Error codes, based on ANSI C/POSIX standard. All error codes start with
     "E". As mentioned above, inventory of the codes depends on
-    `MicroPython port`. Errors are usually accessible as ``exc.args[0]``
+    :term:`MicroPython port`. Errors are usually accessible as ``exc.args[0]``
     where ``exc`` is an instance of `OSError`. Usage example::
 
         try:
diff --git a/docs/library/uio.rst b/docs/library/uio.rst
index 1a64b36582e52..dddb83a170750 100644
--- a/docs/library/uio.rst
+++ b/docs/library/uio.rst
@@ -114,7 +114,9 @@ Classes
         Get the current contents of the underlying buffer which holds data.
 
 .. class:: StringIO(alloc_size)
+    :noindex:
 .. class:: BytesIO(alloc_size)
+    :noindex:
 
     Create an empty `StringIO`/`BytesIO` object, preallocated to hold up
     to *alloc_size* number of bytes. That means that writing that amount
diff --git a/docs/library/uos.rst b/docs/library/uos.rst
index c49b13a5f5bca..ad10d9129713d 100644
--- a/docs/library/uos.rst
+++ b/docs/library/uos.rst
@@ -252,7 +252,7 @@ that the block device supports the extended interface.
     dependent on the specific block device.
 
     .. method:: readblocks(block_num, buf)
-    .. method:: readblocks(block_num, buf, offset)
+                readblocks(block_num, buf, offset)
 
         The first form reads aligned, multiples of blocks.
         Starting at the block given by the index *block_num*, read blocks from
@@ -267,7 +267,7 @@ that the block device supports the extended interface.
         The number of bytes to read is given by the length of *buf*.
 
     .. method:: writeblocks(block_num, buf)
-    .. method:: writeblocks(block_num, buf, offset)
+                writeblocks(block_num, buf, offset)
 
         The first form writes aligned, multiples of blocks, and requires that the
         blocks that are written to be first erased (if necessary) by this method.
diff --git a/docs/library/ure.rst b/docs/library/ure.rst
index ca5f35b70302c..e94d286175cef 100644
--- a/docs/library/ure.rst
+++ b/docs/library/ure.rst
@@ -138,12 +138,12 @@ Functions
    If *count* is specified and non-zero then substitution will stop after
    this many substitutions are made.  The *flags* argument is ignored.
 
-   Note: availability of this function depends on `MicroPython port`.
+   Note: availability of this function depends on :term:`MicroPython port`.
 
 .. data:: DEBUG
 
    Flag value, display debug information about compiled expression.
-   (Availability depends on `MicroPython port`.)
+   (Availability depends on :term:`MicroPython port`.)
 
 
 .. _regex:
@@ -184,7 +184,7 @@ to the replacement function in `sub()`.
 
    Return a tuple containing all the substrings of the groups of the match.
 
-   Note: availability of this method depends on `MicroPython port`.
+   Note: availability of this method depends on :term:`MicroPython port`.
 
 .. method:: match.start([index])
             match.end([index])
@@ -193,10 +193,10 @@ to the replacement function in `sub()`.
    substring group that was matched.  *index* defaults to the entire
    group, otherwise it will select a group.
 
-   Note: availability of these methods depends on `MicroPython port`.
+   Note: availability of these methods depends on :term:`MicroPython port`.
 
 .. method:: match.span([index])
 
    Returns the 2-tuple ``(match.start(index), match.end(index))``.
 
-   Note: availability of this method depends on `MicroPython port`.
+   Note: availability of this method depends on :term:`MicroPython port`.
diff --git a/docs/library/usocket.rst b/docs/library/usocket.rst
index e3b9d279a051e..bc4b4b6d5a952 100644
--- a/docs/library/usocket.rst
+++ b/docs/library/usocket.rst
@@ -37,8 +37,8 @@ power) and portable way to work with addresses.
 However, ``socket`` module (note the difference with native MicroPython
 ``usocket`` module described here) provides CPython-compatible way to specify
 addresses using tuples, as described below. Note that depending on a
-`MicroPython port`, ``socket`` module can be builtin or need to be
-installed from `micropython-lib` (as in the case of `MicroPython Unix port`),
+:term:`MicroPython port`, ``socket`` module can be builtin or need to be
+installed from `micropython-lib` (as in the case of :term:`MicroPython Unix port`),
 and some ports still accept only numeric addresses in the tuple format,
 and require to use `getaddrinfo` function to resolve domain names.
 
@@ -61,7 +61,7 @@ Tuple address format for ``socket`` module:
   must be 0. *scopeid* is the interface scope identifier for link-local
   addresses. Note the domain names are not accepted as *ipv6_address*,
   they should be resolved first using `usocket.getaddrinfo()`. Availability
-  of IPv6 support depends on a `MicroPython port`.
+  of IPv6 support depends on a :term:`MicroPython port`.
 
 Functions
 ---------
@@ -81,7 +81,7 @@ Functions
 
 .. function:: getaddrinfo(host, port, af=0, type=0, proto=0, flags=0, /)
 
-   Translate the host/port argument into a sequence of 5-tuples that contain all the 
+   Translate the host/port argument into a sequence of 5-tuples that contain all the
    necessary arguments for creating a socket connected to that service. Arguments
    *af*, *type*, and *proto* (which have the same meaning as for the `socket()` function)
    can be used to filter which kind of addresses are returned. If a parameter is not
@@ -141,7 +141,7 @@ Constants
 .. data:: AF_INET
           AF_INET6
 
-   Address family types. Availability depends on a particular `MicroPython port`.
+   Address family types. Availability depends on a particular :term:`MicroPython port`.
 
 .. data:: SOCK_STREAM
           SOCK_DGRAM
@@ -151,7 +151,7 @@ Constants
 .. data:: IPPROTO_UDP
           IPPROTO_TCP
 
-   IP protocol numbers. Availability depends on a particular `MicroPython port`.
+   IP protocol numbers. Availability depends on a particular :term:`MicroPython port`.
    Note that you don't need to specify these in a call to `usocket.socket()`,
    because `SOCK_STREAM` socket type automatically selects `IPPROTO_TCP`, and
    `SOCK_DGRAM` - `IPPROTO_UDP`. Thus, the only real use of these constants
@@ -160,12 +160,12 @@ Constants
 .. data:: usocket.SOL_*
 
    Socket option levels (an argument to `setsockopt()`). The exact
-   inventory depends on a `MicroPython port`.
+   inventory depends on a :term:`MicroPython port`.
 
 .. data:: usocket.SO_*
 
    Socket options (an argument to `setsockopt()`). The exact
-   inventory depends on a `MicroPython port`.
+   inventory depends on a :term:`MicroPython port`.
 
 Constants specific to WiPy:
 
@@ -185,7 +185,7 @@ Methods
    on the socket object will fail. The remote end will receive EOF indication if
    supported by protocol.
 
-   Sockets are automatically closed when they are garbage-collected, but it is recommended 
+   Sockets are automatically closed when they are garbage-collected, but it is recommended
    to `close()` them explicitly as soon you finished working with them.
 
 .. method:: socket.bind(address)
@@ -259,7 +259,7 @@ Methods
    completed. If zero is given, the socket is put in non-blocking mode. If None is given, the socket
    is put in blocking mode.
 
-   Not every `MicroPython port` supports this method. A more portable and
+   Not every :term:`MicroPython port` supports this method. A more portable and
    generic solution is to use `uselect.poll` object. This allows to wait on
    multiple objects at the same time (and not just on sockets, but on generic
    `stream` objects which support polling). Example::
diff --git a/docs/library/ussl.rst b/docs/library/ussl.rst
index be84dc0545003..ffe146331ca08 100644
--- a/docs/library/ussl.rst
+++ b/docs/library/ussl.rst
@@ -24,7 +24,7 @@ Functions
    :meth:`~usocket.socket.accept()` on a non-SSL listening server socket.
 
    Depending on the underlying module implementation in a particular
-   `MicroPython port`, some or all keyword arguments above may be not supported.
+   :term:`MicroPython port`, some or all keyword arguments above may be not supported.
 
 .. warning::
 
diff --git a/docs/make.bat b/docs/make.bat
index 44f9682790ef5..c09487fb741ef 100644
--- a/docs/make.bat
+++ b/docs/make.bat
@@ -6,6 +6,7 @@ if "%SPHINXBUILD%" == "" (
 	set SPHINXBUILD=sphinx-build
 )
 set BUILDDIR=_build
+set SPHINXOPTS=-W --keep-going
 set ALLSPHINXOPTS=-d %BUILDDIR%/doctrees %SPHINXOPTS% .
 set I18NSPHINXOPTS=%SPHINXOPTS% .
 if NOT "%PAPER%" == "" (
diff --git a/docs/reference/packages.rst b/docs/reference/packages.rst
index 43217493e52a4..2854df23a0240 100644
--- a/docs/reference/packages.rst
+++ b/docs/reference/packages.rst
@@ -14,8 +14,8 @@ packages:
 
 1. Python modules and packages are turned into distribution package
    archives, and published at the Python Package Index (PyPI).
-2. `upip` package manager can be used to install a distribution package
-   on a `MicroPython port` with networking capabilities (for example,
+2. :term:`upip` package manager can be used to install a distribution package
+   on a :term:`MicroPython port` with networking capabilities (for example,
    on the Unix port).
 3. For ports without networking capabilities, an "installation image"
    can be prepared on the Unix port, and transferred to a device by
@@ -51,14 +51,14 @@ even by the smallest devices.
 Besides the small compression dictionary size, MicroPython distribution
 packages also have other optimizations, like removing any files from
 the archive which aren't used by the installation process. In particular,
-`upip` package manager doesn't execute ``setup.py`` during installation
+:term:`upip` package manager doesn't execute ``setup.py`` during installation
 (see below), and thus that file is not included in the archive.
 
 At the same time, these optimizations make MicroPython distribution
-packages not compatible with `CPython`'s package manager, ``pip``.
+packages not compatible with :term:`CPython`'s package manager, ``pip``.
 This isn't considered a big problem, because:
 
-1. Packages can be installed with `upip`, and then can be used with
+1. Packages can be installed with :term:`upip`, and then can be used with
    CPython (if they are compatible with it).
 2. In the other direction, majority of CPython packages would be
    incompatible with MicroPython by various reasons, first of all,
@@ -73,12 +73,12 @@ resource constrained devices.
 ------------------------
 
 MicroPython distribution packages are intended to be installed using
-the `upip` package manager. `upip` is a Python application which is
+the :term:`upip` package manager. :term:`upip` is a Python application which is
 usually distributed (as frozen bytecode) with network-enabled
-`MicroPython ports <MicroPython port>`. At the very least,
-`upip` is available in the `MicroPython Unix port`.
+:term:`MicroPython ports <MicroPython port>`. At the very least,
+:term:`upip` is available in the :term:`MicroPython Unix port`.
 
-On any `MicroPython port` providing `upip`, it can be accessed as
+On any :term:`MicroPython port` providing :term:`upip`, it can be accessed as
 following::
 
     import upip
@@ -123,12 +123,12 @@ commands which corresponds to the example above are::
 Cross-installing packages
 -------------------------
 
-For `MicroPython ports <MicroPython port>` without native networking
+For :term:`MicroPython ports <MicroPython port>` without native networking
 capabilities, the recommend process is "cross-installing" them into a
-"directory image" using the `MicroPython Unix port`, and then
+"directory image" using the :term:`MicroPython Unix port`, and then
 transferring this image to a device by suitable means.
 
-Installing to a directory image involves using ``-p`` switch to `upip`::
+Installing to a directory image involves using ``-p`` switch to :term:`upip`::
 
     micropython -m upip install -p install_dir micropython-pystone_lowmem
 
@@ -137,13 +137,13 @@ packages) will be available in the ``install_dir/`` subdirectory. You
 would need to transfer contents of this directory (without the
 ``install_dir/`` prefix) to the device, at the suitable location, where
 it can be found by the Python ``import`` statement (see discussion of
-the `upip` installation path above).
+the :term:`upip` installation path above).
 
 
 Cross-installing packages with freezing
 ---------------------------------------
 
-For the low-memory `MicroPython ports <MicroPython port>`, the process
+For the low-memory :term:`MicroPython ports <MicroPython port>`, the process
 described in the previous section does not provide the most efficient
 resource usage,because the packages are installed in the source form,
 so need to be compiled to the bytecome on each import. This compilation
@@ -160,7 +160,7 @@ mentioned above:
 * Filesystem is not required for frozen packages.
 
 Using frozen bytecode requires building the executable (firmware)
-for a given `MicroPython port` from the C source code. Consequently,
+for a given :term:`MicroPython port` from the C source code. Consequently,
 the process is:
 
 1. Follow the instructions for a particular port on setting up a
@@ -168,7 +168,7 @@ the process is:
    study instructions in ``ports/esp8266/README.md`` and follow them.
    Make sure you can build the port and deploy the resulting
    executable/firmware successfully before proceeding to the next steps.
-2. Build `MicroPython Unix port` and make sure it is in your PATH and
+2. Build :term:`MicroPython Unix port` and make sure it is in your PATH and
    you can execute ``micropython``.
 3. Change to port's directory (e.g. ``ports/esp8266/`` for ESP8266).
 4. Run ``make clean-frozen``. This step cleans up any previous
@@ -281,7 +281,7 @@ following calls::
     pkg_resources.resource_stream(__name__, "data/page.html")
     pkg_resources.resource_stream(__name__, "data/image.png")
 
-You can develop and debug using the `MicroPython Unix port` as usual.
+You can develop and debug using the :term:`MicroPython Unix port` as usual.
 When time comes to make a distribution package out of it, just use
 overridden "sdist" command from sdist_upip.py module as described in
 the previous section.
diff --git a/docs/reference/pyboard.py.rst b/docs/reference/pyboard.py.rst
index d404c738f1d26..30230eebc3bf4 100644
--- a/docs/reference/pyboard.py.rst
+++ b/docs/reference/pyboard.py.rst
@@ -68,7 +68,7 @@ example::
     $ pyboard.py -c 'print(1+1)'
 
 Similarly, the ``PYBOARD_BAUDRATE`` environment variable can be used
-to set the default for the `--baudrate` option.
+to set the default for the ``--baudrate`` option.
 
 Running a script on the device
 ------------------------------
diff --git a/docs/templates/replace.inc b/docs/templates/replace.inc
index 319c53735fc28..14f1875eeec6a 100644
--- a/docs/templates/replace.inc
+++ b/docs/templates/replace.inc
@@ -4,6 +4,6 @@
 
 .. |see_cpython_module| replace::
 
-    *This module implements a subset of the corresponding* `CPython` *module,
+    *This module implements a subset of the corresponding* :term:`CPython` *module,
     as described below. For more information, refer to the original
     CPython documentation:*

From 6ac05af8e1408a1f5cd27d57c8581a9f4197a2f5 Mon Sep 17 00:00:00 2001
From: Philipp Ebensberger <philipp.ebensberger@3bricks-software.de>
Date: Sun, 7 Jun 2020 18:23:36 +0200
Subject: [PATCH 0047/3533] mimxrt/tusb_config.h: Preliminary fix for TinyUSB
 HS endpoint overflow.

Sending more than 64 bytes to the USB CDC endpoint in HS mode will lead to
a hard crash.  This commit fixes the issue, although there may be a better
fix from upstream TinyUSB in the future.
---
 ports/mimxrt/tusb_config.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/ports/mimxrt/tusb_config.h b/ports/mimxrt/tusb_config.h
index f2367c2044384..c7ec05e632323 100644
--- a/ports/mimxrt/tusb_config.h
+++ b/ports/mimxrt/tusb_config.h
@@ -30,7 +30,8 @@
 #define CFG_TUSB_OS             (OPT_OS_NONE)
 
 #define CFG_TUD_CDC             (1)
-#define CFG_TUD_CDC_RX_BUFSIZE  (256)
-#define CFG_TUD_CDC_TX_BUFSIZE  (256)
+#define CFG_TUD_CDC_RX_BUFSIZE  (512)
+#define CFG_TUD_CDC_TX_BUFSIZE  (512)
+#define CFG_TUD_CDC_EPSIZE      (512)
 
 #endif // MICROPY_INCLUDED_MIMXRT_TUSB_CONFIG_H

From bd06c698f05b7b53070263653e74eb078b5278a9 Mon Sep 17 00:00:00 2001
From: Damien George <damien.p.george@gmail.com>
Date: Mon, 8 Jun 2020 14:31:35 +1000
Subject: [PATCH 0048/3533] py/dynruntime.h: Make mp_obj_str_get_str raise if
 arg not a str/bytes.

---
 py/dynruntime.h | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/py/dynruntime.h b/py/dynruntime.h
index 9f2803c53520f..696746f7510ff 100644
--- a/py/dynruntime.h
+++ b/py/dynruntime.h
@@ -114,7 +114,7 @@ static inline void *m_realloc_dyn(void *ptr, size_t new_num_bytes) {
 #define mp_obj_cast_to_native_base(o, t)    (mp_obj_cast_to_native_base_dyn((o), (t)))
 #define mp_obj_get_int(o)                   (mp_fun_table.native_from_obj(o, MP_NATIVE_TYPE_INT))
 #define mp_obj_get_int_truncated(o)         (mp_fun_table.native_from_obj(o, MP_NATIVE_TYPE_UINT))
-#define mp_obj_str_get_str(s)               ((void *)mp_fun_table.native_from_obj(s, MP_NATIVE_TYPE_PTR))
+#define mp_obj_str_get_str(s)               (mp_obj_str_get_data_dyn((s), NULL))
 #define mp_obj_str_get_data(o, len)         (mp_obj_str_get_data_dyn((o), (len)))
 #define mp_get_buffer_raise(o, bufinfo, fl) (mp_fun_table.get_buffer_raise((o), (bufinfo), (fl)))
 #define mp_get_stream_raise(s, flags)       (mp_fun_table.get_stream_raise((s), (flags)))
@@ -149,7 +149,9 @@ static inline mp_obj_t mp_obj_cast_to_native_base_dyn(mp_obj_t self_in, mp_const
 static inline void *mp_obj_str_get_data_dyn(mp_obj_t o, size_t *l) {
     mp_buffer_info_t bufinfo;
     mp_get_buffer_raise(o, &bufinfo, MP_BUFFER_READ);
-    *l = bufinfo.len;
+    if (l != NULL) {
+        *l = bufinfo.len;
+    }
     return bufinfo.buf;
 }
 

From 51fd6c97773a7e0d76bb61e220b35b98f392e27e Mon Sep 17 00:00:00 2001
From: stijn <stijn@ignitron.net>
Date: Wed, 3 Jun 2020 10:18:49 +0200
Subject: [PATCH 0049/3533] extmod/ure: Use single function for
 match/search/sub.

Saves about 500 bytes on unix x64 and enables CPython-conform
usage of passing a re object to these functions.
---
 examples/natmod/ure/ure.c |  4 +--
 extmod/modure.c           | 58 ++++++++++++++-------------------------
 tests/extmod/ure1.py      | 11 ++++++++
 tests/extmod/ure_sub.py   |  9 ++++++
 4 files changed, 43 insertions(+), 39 deletions(-)

diff --git a/examples/natmod/ure/ure.c b/examples/natmod/ure/ure.c
index 00ca2e9eb4c71..175b93e395ef9 100644
--- a/examples/natmod/ure/ure.c
+++ b/examples/natmod/ure/ure.c
@@ -71,8 +71,8 @@ mp_obj_t mpy_init(mp_obj_fun_bc_t *self, size_t n_args, size_t n_kw, mp_obj_t *a
     re_type.locals_dict = (void*)&re_locals_dict;
 
     mp_store_global(MP_QSTR_compile, MP_OBJ_FROM_PTR(&mod_re_compile_obj));
-    mp_store_global(MP_QSTR_match, MP_OBJ_FROM_PTR(&mod_re_match_obj));
-    mp_store_global(MP_QSTR_search, MP_OBJ_FROM_PTR(&mod_re_search_obj));
+    mp_store_global(MP_QSTR_match, MP_OBJ_FROM_PTR(&re_match_obj));
+    mp_store_global(MP_QSTR_search, MP_OBJ_FROM_PTR(&re_search_obj));
 
     MP_DYNRUNTIME_INIT_EXIT
 }
diff --git a/extmod/modure.c b/extmod/modure.c
index 1847ec288075d..328c897d8890b 100644
--- a/extmod/modure.c
+++ b/extmod/modure.c
@@ -53,6 +53,10 @@ typedef struct _mp_obj_match_t {
     const char *caps[0];
 } mp_obj_match_t;
 
+STATIC mp_obj_t mod_re_compile(size_t n_args, const mp_obj_t *args);
+#if !MICROPY_ENABLE_DYNRUNTIME
+STATIC const mp_obj_type_t re_type;
+#endif
 
 STATIC void match_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     (void)kind;
@@ -175,7 +179,12 @@ STATIC void re_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t
 
 STATIC mp_obj_t ure_exec(bool is_anchored, uint n_args, const mp_obj_t *args) {
     (void)n_args;
-    mp_obj_re_t *self = MP_OBJ_TO_PTR(args[0]);
+    mp_obj_re_t *self;
+    if (mp_obj_is_type(args[0], &re_type)) {
+        self = MP_OBJ_TO_PTR(args[0]);
+    } else {
+        self = MP_OBJ_TO_PTR(mod_re_compile(1, args));
+    }
     Subject subj;
     size_t len;
     subj.begin = mp_obj_str_get_data(args[1], &len);
@@ -253,8 +262,13 @@ MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(re_split_obj, 2, 3, re_split);
 
 #if MICROPY_PY_URE_SUB
 
-STATIC mp_obj_t re_sub_helper(mp_obj_t self_in, size_t n_args, const mp_obj_t *args) {
-    mp_obj_re_t *self = MP_OBJ_TO_PTR(self_in);
+STATIC mp_obj_t re_sub_helper(size_t n_args, const mp_obj_t *args) {
+    mp_obj_re_t *self;
+    if (mp_obj_is_type(args[0], &re_type)) {
+        self = MP_OBJ_TO_PTR(args[0]);
+    } else {
+        self = MP_OBJ_TO_PTR(mod_re_compile(1, args));
+    }
     mp_obj_t replace = args[1];
     mp_obj_t where = args[2];
     mp_int_t count = 0;
@@ -358,10 +372,7 @@ STATIC mp_obj_t re_sub_helper(mp_obj_t self_in, size_t n_args, const mp_obj_t *a
     return mp_obj_new_str_from_vstr(mp_obj_get_type(where), &vstr_return);
 }
 
-STATIC mp_obj_t re_sub(size_t n_args, const mp_obj_t *args) {
-    return re_sub_helper(args[0], n_args, args);
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(re_sub_obj, 3, 5, re_sub);
+MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(re_sub_obj, 3, 5, re_sub_helper);
 
 #endif
 
@@ -414,41 +425,14 @@ STATIC mp_obj_t mod_re_compile(size_t n_args, const mp_obj_t *args) {
 }
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_re_compile_obj, 1, 2, mod_re_compile);
 
-STATIC mp_obj_t mod_re_exec(bool is_anchored, uint n_args, const mp_obj_t *args) {
-    (void)n_args;
-    mp_obj_t self = mod_re_compile(1, args);
-
-    const mp_obj_t args2[] = {self, args[1]};
-    mp_obj_t match = ure_exec(is_anchored, 2, args2);
-    return match;
-}
-
-STATIC mp_obj_t mod_re_match(size_t n_args, const mp_obj_t *args) {
-    return mod_re_exec(true, n_args, args);
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_re_match_obj, 2, 4, mod_re_match);
-
-STATIC mp_obj_t mod_re_search(size_t n_args, const mp_obj_t *args) {
-    return mod_re_exec(false, n_args, args);
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_re_search_obj, 2, 4, mod_re_search);
-
-#if MICROPY_PY_URE_SUB
-STATIC mp_obj_t mod_re_sub(size_t n_args, const mp_obj_t *args) {
-    mp_obj_t self = mod_re_compile(1, args);
-    return re_sub_helper(self, n_args, args);
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_re_sub_obj, 3, 5, mod_re_sub);
-#endif
-
 #if !MICROPY_ENABLE_DYNRUNTIME
 STATIC const mp_rom_map_elem_t mp_module_re_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_ure) },
     { MP_ROM_QSTR(MP_QSTR_compile), MP_ROM_PTR(&mod_re_compile_obj) },
-    { MP_ROM_QSTR(MP_QSTR_match), MP_ROM_PTR(&mod_re_match_obj) },
-    { MP_ROM_QSTR(MP_QSTR_search), MP_ROM_PTR(&mod_re_search_obj) },
+    { MP_ROM_QSTR(MP_QSTR_match), MP_ROM_PTR(&re_match_obj) },
+    { MP_ROM_QSTR(MP_QSTR_search), MP_ROM_PTR(&re_search_obj) },
     #if MICROPY_PY_URE_SUB
-    { MP_ROM_QSTR(MP_QSTR_sub), MP_ROM_PTR(&mod_re_sub_obj) },
+    { MP_ROM_QSTR(MP_QSTR_sub), MP_ROM_PTR(&re_sub_obj) },
     #endif
     #if MICROPY_PY_URE_DEBUG
     { MP_ROM_QSTR(MP_QSTR_DEBUG), MP_ROM_INT(FLAG_DEBUG) },
diff --git a/tests/extmod/ure1.py b/tests/extmod/ure1.py
index 9e1be5fc796bc..2bdf2d0cfb4f3 100644
--- a/tests/extmod/ure1.py
+++ b/tests/extmod/ure1.py
@@ -125,3 +125,14 @@
 print(re.compile(r"[a\-x]").split("foo-bar"))
 print(re.compile(r"[\-ax]").split("foo-bar"))
 print("===")
+
+# Module functions take str/bytes/re.
+for f in (re.match, re.search):
+    print(f(".", "foo").group(0))
+    print(f(b".", b"foo").group(0))
+    print(f(re.compile("."), "foo").group(0))
+    try:
+        f(123, "a")
+    except TypeError:
+        print("TypeError")
+print("===")
diff --git a/tests/extmod/ure_sub.py b/tests/extmod/ure_sub.py
index 6bb332077dd29..953e7bf62a478 100644
--- a/tests/extmod/ure_sub.py
+++ b/tests/extmod/ure_sub.py
@@ -60,3 +60,12 @@ def A():
     re.sub("(a)", "b\\199999999999999999999999999999999999999", "a")
 except:
     print("invalid group")
+
+# Module function takes str/bytes/re.
+print(re.sub("a", "a", "a"))
+print(re.sub(b".", b"a", b"a"))
+print(re.sub(re.compile("a"), "a", "a"))
+try:
+    re.sub(123, "a", "a")
+except TypeError:
+    print("TypeError")

From 8e8dcdd34b39be58c4d9b64ee23ad40acb2a6b1d Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Wed, 1 Apr 2020 15:16:03 +1100
Subject: [PATCH 0050/3533] esp32: Update IDF v4.0 supported hash to v4.0.1.

The main fix relevant to MicroPython is https://github.com/espressif/esp-idf/issues/4196

Release notes here
https://github.com/espressif/esp-idf/releases/tag/v4.0.1
---
 ports/esp32/Makefile | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/ports/esp32/Makefile b/ports/esp32/Makefile
index bd89e8b0c5610..0f6a1969a6208 100644
--- a/ports/esp32/Makefile
+++ b/ports/esp32/Makefile
@@ -54,9 +54,9 @@ SDKCONFIG_COMBINED = $(BUILD)/sdkconfig.combined
 SDKCONFIG_H = $(BUILD)/sdkconfig.h
 
 # The git hash of the currently supported ESP IDF version.
-# These correspond to v3.3.2 and v4.0.
+# These correspond to v3.3.2 and v4.0.1.
 ESPIDF_SUPHASH_V3 := 9e70825d1e1cbf7988cf36981774300066580ea7
-ESPIDF_SUPHASH_V4 := 463a9d8b7f9af8205222b80707f9bdbba7c530e1
+ESPIDF_SUPHASH_V4 := 4c81978a3e2220674a432a588292a4c860eef27b
 
 define print_supported_git_hash
 $(info Supported git hash (v3.3): $(ESPIDF_SUPHASH_V3))
@@ -515,7 +515,7 @@ ESPIDF_MBEDTLS_O = $(patsubst %.c,%.o,\
 ESPIDF_MDNS_O = $(patsubst %.c,%.o,$(wildcard $(ESPCOMP)/mdns/*.c))
 
 ifeq ($(ESPIDF_CURHASH),$(ESPIDF_SUPHASH_V4))
-$(BUILD)/$(ESPCOMP)/wpa_supplicant/%.o: CFLAGS += -DESP_SUPPLICANT -DIEEE8021X_EAPOL -DEAP_PEER_METHOD -DEAP_TLS -DEAP_TTLS -DEAP_PEAP -DEAP_MSCHAPv2 -DUSE_WPA2_TASK -DCONFIG_WPS2 -DCONFIG_WPS_PIN -DUSE_WPS_TASK -DESPRESSIF_USE -DESP32_WORKAROUND -DCONFIG_ECC -D__ets__ -Wno-strict-aliasing -I$(ESPCOMP)/wpa_supplicant/src -Wno-implicit-function-declaration
+$(BUILD)/$(ESPCOMP)/wpa_supplicant/%.o: CFLAGS += -DCONFIG_WPA3_SAE -DCONFIG_IEEE80211W -DESP_SUPPLICANT -DIEEE8021X_EAPOL -DEAP_PEER_METHOD -DEAP_TLS -DEAP_TTLS -DEAP_PEAP -DEAP_MSCHAPv2 -DUSE_WPA2_TASK -DCONFIG_WPS2 -DCONFIG_WPS_PIN -DUSE_WPS_TASK -DESPRESSIF_USE -DESP32_WORKAROUND -DCONFIG_ECC -D__ets__ -Wno-strict-aliasing -I$(ESPCOMP)/wpa_supplicant/src -Wno-implicit-function-declaration
 else
 $(BUILD)/$(ESPCOMP)/wpa_supplicant/%.o: CFLAGS += -DEMBEDDED_SUPP -DIEEE8021X_EAPOL -DEAP_PEER_METHOD -DEAP_MSCHAPv2 -DEAP_TTLS -DEAP_TLS -DEAP_PEAP -DUSE_WPA2_TASK -DCONFIG_WPS2 -DCONFIG_WPS_PIN -DUSE_WPS_TASK -DESPRESSIF_USE -DESP32_WORKAROUND -DALLOW_EVEN_MOD -D__ets__ -Wno-strict-aliasing
 endif
@@ -555,6 +555,7 @@ ESPIDF_BT_NIMBLE_O = $(patsubst %.c,%.o,\
 	$(wildcard $(ESPCOMP)/bt/host/nimble/nimble/nimble/src/*.c) \
 	$(wildcard $(ESPCOMP)/bt/host/nimble/nimble/porting/nimble/src/*.c) \
 	$(wildcard $(ESPCOMP)/bt/host/nimble/nimble/porting/npl/freertos/src/*.c) \
+	$(wildcard $(ESPCOMP)/bt/host/nimble/port/src/*.c) \
 	)
 endif
 

From e0d539f79d4ec020636ba7b043fac08030234112 Mon Sep 17 00:00:00 2001
From: Albort Xue <yao.xue@nxp.com>
Date: Sun, 7 Jun 2020 11:20:19 +0800
Subject: [PATCH 0051/3533] mimxrt/boards: Enable LED class for MIMXRT1060_EVK
 board.

---
 .../boards/MIMXRT1060_EVK/mpconfigboard.h     |  7 ++--
 ports/mimxrt/boards/MIMXRT1060_EVK/pins.c     | 33 +++++++++++++++++++
 ports/mimxrt/boards/MIMXRT1060_EVK/pins.h     | 30 +++++++++++++++++
 3 files changed, 67 insertions(+), 3 deletions(-)
 create mode 100644 ports/mimxrt/boards/MIMXRT1060_EVK/pins.c
 create mode 100644 ports/mimxrt/boards/MIMXRT1060_EVK/pins.h

diff --git a/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.h b/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.h
index 714f987a54c9d..8bd2a579174aa 100644
--- a/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.h
+++ b/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.h
@@ -3,6 +3,7 @@
 
 #define BOARD_FLASH_SIZE (8 * 1024 * 1024)
 
-#define MICROPY_HW_LED_PINMUX  IOMUXC_GPIO_AD_B0_09_GPIO1_IO09
-#define MICROPY_HW_LED_PORT    GPIO1
-#define MICROPY_HW_LED_PIN     9
+// MIMXRT1060_EVK has 1 user LED
+#define MICROPY_HW_LED1_PIN (GPIO_AD_B0_09)
+#define MICROPY_HW_LED_ON(pin) (mp_hal_pin_low(pin))
+#define MICROPY_HW_LED_OFF(pin) (mp_hal_pin_high(pin))
diff --git a/ports/mimxrt/boards/MIMXRT1060_EVK/pins.c b/ports/mimxrt/boards/MIMXRT1060_EVK/pins.c
new file mode 100644
index 0000000000000..d5da9c6f99275
--- /dev/null
+++ b/ports/mimxrt/boards/MIMXRT1060_EVK/pins.c
@@ -0,0 +1,33 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 NXP
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "pin.h"
+
+static pin_af_obj_t GPIO_AD_B0_09_af[] = {
+    PIN_AF(GPIO1_IO09, PIN_AF_MODE_ALT5, GPIO1, 0x10B0U),
+};
+
+pin_obj_t GPIO_AD_B0_09 = PIN(GPIO_AD_B0_09, GPIO1, 9, GPIO_AD_B0_09_af);
diff --git a/ports/mimxrt/boards/MIMXRT1060_EVK/pins.h b/ports/mimxrt/boards/MIMXRT1060_EVK/pins.h
new file mode 100644
index 0000000000000..baef51c6c8612
--- /dev/null
+++ b/ports/mimxrt/boards/MIMXRT1060_EVK/pins.h
@@ -0,0 +1,30 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 NXP
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+// NOTE: pins.h shall only be included in in pin.h
+// hence no include guards are needed since they will be provided by pin.h
+
+extern pin_obj_t GPIO_AD_B0_09;

From 29e258611ace8e4de51d810d5ff14364a5fbb950 Mon Sep 17 00:00:00 2001
From: Philipp Ebensberger <philipp.ebensberger@3bricks-software.de>
Date: Tue, 14 Apr 2020 21:08:59 +0200
Subject: [PATCH 0052/3533] mimxrt/boards: Integrate support for MIMXRT1020_EVK
 board.

---
 .../evkmimxrt1020_flexspi_nor_config.h        | 270 ++++++++++++++++++
 .../boards/MIMXRT1020_EVK/flash_config.c      |  51 ++++
 .../boards/MIMXRT1020_EVK/mpconfigboard.h     |   9 +
 .../boards/MIMXRT1020_EVK/mpconfigboard.mk    |   7 +
 ports/mimxrt/boards/MIMXRT1020_EVK/pins.c     |  33 +++
 ports/mimxrt/boards/MIMXRT1020_EVK/pins.h     |  30 ++
 ports/mimxrt/boards/MIMXRT1021.ld             |   8 +
 7 files changed, 408 insertions(+)
 create mode 100644 ports/mimxrt/boards/MIMXRT1020_EVK/evkmimxrt1020_flexspi_nor_config.h
 create mode 100644 ports/mimxrt/boards/MIMXRT1020_EVK/flash_config.c
 create mode 100644 ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.h
 create mode 100644 ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.mk
 create mode 100644 ports/mimxrt/boards/MIMXRT1020_EVK/pins.c
 create mode 100644 ports/mimxrt/boards/MIMXRT1020_EVK/pins.h
 create mode 100644 ports/mimxrt/boards/MIMXRT1021.ld

diff --git a/ports/mimxrt/boards/MIMXRT1020_EVK/evkmimxrt1020_flexspi_nor_config.h b/ports/mimxrt/boards/MIMXRT1020_EVK/evkmimxrt1020_flexspi_nor_config.h
new file mode 100644
index 0000000000000..c0c6ea243672c
--- /dev/null
+++ b/ports/mimxrt/boards/MIMXRT1020_EVK/evkmimxrt1020_flexspi_nor_config.h
@@ -0,0 +1,270 @@
+/*
+ * Copyright 2019 NXP.
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+// Based on tinyusb/hw/bsp/teensy_40/evkmimxrt1020_flexspi_nor_config.h
+
+#ifndef __EVKMIMXRT1020_FLEXSPI_NOR_CONFIG__
+#define __EVKMIMXRT1020_FLEXSPI_NOR_CONFIG__
+
+#include <stdint.h>
+#include <stdbool.h>
+#include "fsl_common.h"
+
+/*! @name Driver version */
+/*@{*/
+/*! @brief XIP_BOARD driver version 2.0.0. */
+#define FSL_XIP_BOARD_DRIVER_VERSION (MAKE_VERSION(2, 0, 0))
+/*@}*/
+
+/* FLEXSPI memory config block related defintions */
+#define FLEXSPI_CFG_BLK_TAG (0x42464346UL)     // ascii "FCFB" Big Endian
+#define FLEXSPI_CFG_BLK_VERSION (0x56010400UL) // V1.4.0
+#define FLEXSPI_CFG_BLK_SIZE (512)
+
+/* FLEXSPI Feature related definitions */
+#define FLEXSPI_FEATURE_HAS_PARALLEL_MODE 1
+
+/* Lookup table related defintions */
+#define CMD_INDEX_READ 0
+#define CMD_INDEX_READSTATUS 1
+#define CMD_INDEX_WRITEENABLE 2
+#define CMD_INDEX_WRITE 4
+
+#define CMD_LUT_SEQ_IDX_READ 0
+#define CMD_LUT_SEQ_IDX_READSTATUS 1
+#define CMD_LUT_SEQ_IDX_WRITEENABLE 3
+#define CMD_LUT_SEQ_IDX_WRITE 9
+
+#define CMD_SDR 0x01
+#define CMD_DDR 0x21
+#define RADDR_SDR 0x02
+#define RADDR_DDR 0x22
+#define CADDR_SDR 0x03
+#define CADDR_DDR 0x23
+#define MODE1_SDR 0x04
+#define MODE1_DDR 0x24
+#define MODE2_SDR 0x05
+#define MODE2_DDR 0x25
+#define MODE4_SDR 0x06
+#define MODE4_DDR 0x26
+#define MODE8_SDR 0x07
+#define MODE8_DDR 0x27
+#define WRITE_SDR 0x08
+#define WRITE_DDR 0x28
+#define READ_SDR 0x09
+#define READ_DDR 0x29
+#define LEARN_SDR 0x0A
+#define LEARN_DDR 0x2A
+#define DATSZ_SDR 0x0B
+#define DATSZ_DDR 0x2B
+#define DUMMY_SDR 0x0C
+#define DUMMY_DDR 0x2C
+#define DUMMY_RWDS_SDR 0x0D
+#define DUMMY_RWDS_DDR 0x2D
+#define JMP_ON_CS 0x1F
+#define STOP 0
+
+#define FLEXSPI_1PAD 0
+#define FLEXSPI_2PAD 1
+#define FLEXSPI_4PAD 2
+#define FLEXSPI_8PAD 3
+
+#define FLEXSPI_LUT_SEQ(cmd0, pad0, op0, cmd1, pad1, op1)                                                              \
+    (FLEXSPI_LUT_OPERAND0(op0) | FLEXSPI_LUT_NUM_PADS0(pad0) | FLEXSPI_LUT_OPCODE0(cmd0) | FLEXSPI_LUT_OPERAND1(op1) | \
+     FLEXSPI_LUT_NUM_PADS1(pad1) | FLEXSPI_LUT_OPCODE1(cmd1))
+
+//!@brief Definitions for FlexSPI Serial Clock Frequency
+typedef enum _FlexSpiSerialClockFreq
+{
+    kFlexSpiSerialClk_30MHz  = 1,
+    kFlexSpiSerialClk_50MHz  = 2,
+    kFlexSpiSerialClk_60MHz  = 3,
+    kFlexSpiSerialClk_75MHz  = 4,
+    kFlexSpiSerialClk_80MHz  = 5,
+    kFlexSpiSerialClk_100MHz = 6,
+    kFlexSpiSerialClk_133MHz = 7,
+    kFlexSpiSerialClk_166MHz = 8,
+    kFlexSpiSerialClk_200MHz = 9,
+} flexspi_serial_clk_freq_t;
+
+//!@brief FlexSPI clock configuration type
+enum
+{
+    kFlexSpiClk_SDR, //!< Clock configure for SDR mode
+    kFlexSpiClk_DDR, //!< Clock configurat for DDR mode
+};
+
+//!@brief FlexSPI Read Sample Clock Source definition
+typedef enum _FlashReadSampleClkSource
+{
+    kFlexSPIReadSampleClk_LoopbackInternally      = 0,
+    kFlexSPIReadSampleClk_LoopbackFromDqsPad      = 1,
+    kFlexSPIReadSampleClk_LoopbackFromSckPad      = 2,
+    kFlexSPIReadSampleClk_ExternalInputFromDqsPad = 3,
+} flexspi_read_sample_clk_t;
+
+//!@brief Misc feature bit definitions
+enum
+{
+    kFlexSpiMiscOffset_DiffClkEnable            = 0, //!< Bit for Differential clock enable
+    kFlexSpiMiscOffset_Ck2Enable                = 1, //!< Bit for CK2 enable
+    kFlexSpiMiscOffset_ParallelEnable           = 2, //!< Bit for Parallel mode enable
+    kFlexSpiMiscOffset_WordAddressableEnable    = 3, //!< Bit for Word Addressable enable
+    kFlexSpiMiscOffset_SafeConfigFreqEnable     = 4, //!< Bit for Safe Configuration Frequency enable
+    kFlexSpiMiscOffset_PadSettingOverrideEnable = 5, //!< Bit for Pad setting override enable
+    kFlexSpiMiscOffset_DdrModeEnable            = 6, //!< Bit for DDR clock confiuration indication.
+};
+
+//!@brief Flash Type Definition
+enum
+{
+    kFlexSpiDeviceType_SerialNOR    = 1,    //!< Flash devices are Serial NOR
+    kFlexSpiDeviceType_SerialNAND   = 2,    //!< Flash devices are Serial NAND
+    kFlexSpiDeviceType_SerialRAM    = 3,    //!< Flash devices are Serial RAM/HyperFLASH
+    kFlexSpiDeviceType_MCP_NOR_NAND = 0x12, //!< Flash device is MCP device, A1 is Serial NOR, A2 is Serial NAND
+    kFlexSpiDeviceType_MCP_NOR_RAM  = 0x13, //!< Flash deivce is MCP device, A1 is Serial NOR, A2 is Serial RAMs
+};
+
+//!@brief Flash Pad Definitions
+enum
+{
+    kSerialFlash_1Pad  = 1,
+    kSerialFlash_2Pads = 2,
+    kSerialFlash_4Pads = 4,
+    kSerialFlash_8Pads = 8,
+};
+
+//!@brief FlexSPI LUT Sequence structure
+typedef struct _lut_sequence
+{
+    uint8_t seqNum; //!< Sequence Number, valid number: 1-16
+    uint8_t seqId;  //!< Sequence Index, valid number: 0-15
+    uint16_t reserved;
+} flexspi_lut_seq_t;
+
+//!@brief Flash Configuration Command Type
+enum
+{
+    kDeviceConfigCmdType_Generic,    //!< Generic command, for example: configure dummy cycles, drive strength, etc
+    kDeviceConfigCmdType_QuadEnable, //!< Quad Enable command
+    kDeviceConfigCmdType_Spi2Xpi,    //!< Switch from SPI to DPI/QPI/OPI mode
+    kDeviceConfigCmdType_Xpi2Spi,    //!< Switch from DPI/QPI/OPI to SPI mode
+    kDeviceConfigCmdType_Spi2NoCmd,  //!< Switch to 0-4-4/0-8-8 mode
+    kDeviceConfigCmdType_Reset,      //!< Reset device command
+};
+
+//!@brief FlexSPI Memory Configuration Block
+typedef struct _FlexSPIConfig
+{
+    uint32_t tag;               //!< [0x000-0x003] Tag, fixed value 0x42464346UL
+    uint32_t version;           //!< [0x004-0x007] Version,[31:24] -'V', [23:16] - Major, [15:8] - Minor, [7:0] - bugfix
+    uint32_t reserved0;         //!< [0x008-0x00b] Reserved for future use
+    uint8_t readSampleClkSrc;   //!< [0x00c-0x00c] Read Sample Clock Source, valid value: 0/1/3
+    uint8_t csHoldTime;         //!< [0x00d-0x00d] CS hold time, default value: 3
+    uint8_t csSetupTime;        //!< [0x00e-0x00e] CS setup time, default value: 3
+    uint8_t columnAddressWidth; //!< [0x00f-0x00f] Column Address with, for HyperBus protocol, it is fixed to 3, For
+    //! Serial NAND, need to refer to datasheet
+    uint8_t deviceModeCfgEnable; //!< [0x010-0x010] Device Mode Configure enable flag, 1 - Enable, 0 - Disable
+    uint8_t deviceModeType; //!< [0x011-0x011] Specify the configuration command type:Quad Enable, DPI/QPI/OPI switch,
+    //! Generic configuration, etc.
+    uint16_t waitTimeCfgCommands; //!< [0x012-0x013] Wait time for all configuration commands, unit: 100us, Used for
+    //! DPI/QPI/OPI switch or reset command
+    flexspi_lut_seq_t deviceModeSeq; //!< [0x014-0x017] Device mode sequence info, [7:0] - LUT sequence id, [15:8] - LUt
+    //! sequence number, [31:16] Reserved
+    uint32_t deviceModeArg;    //!< [0x018-0x01b] Argument/Parameter for device configuration
+    uint8_t configCmdEnable;   //!< [0x01c-0x01c] Configure command Enable Flag, 1 - Enable, 0 - Disable
+    uint8_t configModeType[3]; //!< [0x01d-0x01f] Configure Mode Type, similar as deviceModeTpe
+    flexspi_lut_seq_t
+        configCmdSeqs[3]; //!< [0x020-0x02b] Sequence info for Device Configuration command, similar as deviceModeSeq
+    uint32_t reserved1;   //!< [0x02c-0x02f] Reserved for future use
+    uint32_t configCmdArgs[3];     //!< [0x030-0x03b] Arguments/Parameters for device Configuration commands
+    uint32_t reserved2;            //!< [0x03c-0x03f] Reserved for future use
+    uint32_t controllerMiscOption; //!< [0x040-0x043] Controller Misc Options, see Misc feature bit definitions for more
+    //! details
+    uint8_t deviceType;    //!< [0x044-0x044] Device Type:  See Flash Type Definition for more details
+    uint8_t sflashPadType; //!< [0x045-0x045] Serial Flash Pad Type: 1 - Single, 2 - Dual, 4 - Quad, 8 - Octal
+    uint8_t serialClkFreq; //!< [0x046-0x046] Serial Flash Frequencey, device specific definitions, See System Boot
+    //! Chapter for more details
+    uint8_t lutCustomSeqEnable; //!< [0x047-0x047] LUT customization Enable, it is required if the program/erase cannot
+    //! be done using 1 LUT sequence, currently, only applicable to HyperFLASH
+    uint32_t reserved3[2];           //!< [0x048-0x04f] Reserved for future use
+    uint32_t sflashA1Size;           //!< [0x050-0x053] Size of Flash connected to A1
+    uint32_t sflashA2Size;           //!< [0x054-0x057] Size of Flash connected to A2
+    uint32_t sflashB1Size;           //!< [0x058-0x05b] Size of Flash connected to B1
+    uint32_t sflashB2Size;           //!< [0x05c-0x05f] Size of Flash connected to B2
+    uint32_t csPadSettingOverride;   //!< [0x060-0x063] CS pad setting override value
+    uint32_t sclkPadSettingOverride; //!< [0x064-0x067] SCK pad setting override value
+    uint32_t dataPadSettingOverride; //!< [0x068-0x06b] data pad setting override value
+    uint32_t dqsPadSettingOverride;  //!< [0x06c-0x06f] DQS pad setting override value
+    uint32_t timeoutInMs;            //!< [0x070-0x073] Timeout threshold for read status command
+    uint32_t commandInterval;        //!< [0x074-0x077] CS deselect interval between two commands
+    uint16_t dataValidTime[2]; //!< [0x078-0x07b] CLK edge to data valid time for PORT A and PORT B, in terms of 0.1ns
+    uint16_t busyOffset;       //!< [0x07c-0x07d] Busy offset, valid value: 0-31
+    uint16_t busyBitPolarity;  //!< [0x07e-0x07f] Busy flag polarity, 0 - busy flag is 1 when flash device is busy, 1 -
+    //! busy flag is 0 when flash device is busy
+    uint32_t lookupTable[64];           //!< [0x080-0x17f] Lookup table holds Flash command sequences
+    flexspi_lut_seq_t lutCustomSeq[12]; //!< [0x180-0x1af] Customizable LUT Sequences
+    uint32_t reserved4[4];              //!< [0x1b0-0x1bf] Reserved for future use
+} flexspi_mem_config_t;
+
+/*  */
+#define NOR_CMD_INDEX_READ CMD_INDEX_READ               //!< 0
+#define NOR_CMD_INDEX_READSTATUS CMD_INDEX_READSTATUS   //!< 1
+#define NOR_CMD_INDEX_WRITEENABLE CMD_INDEX_WRITEENABLE //!< 2
+#define NOR_CMD_INDEX_ERASESECTOR 3                     //!< 3
+#define NOR_CMD_INDEX_PAGEPROGRAM CMD_INDEX_WRITE       //!< 4
+#define NOR_CMD_INDEX_CHIPERASE 5                       //!< 5
+#define NOR_CMD_INDEX_DUMMY 6                           //!< 6
+#define NOR_CMD_INDEX_ERASEBLOCK 7                      //!< 7
+
+#define NOR_CMD_LUT_SEQ_IDX_READ CMD_LUT_SEQ_IDX_READ //!< 0  READ LUT sequence id in lookupTable stored in config block
+#define NOR_CMD_LUT_SEQ_IDX_READSTATUS \
+    CMD_LUT_SEQ_IDX_READSTATUS //!< 1  Read Status LUT sequence id in lookupTable stored in config block
+#define NOR_CMD_LUT_SEQ_IDX_READSTATUS_XPI \
+    2 //!< 2  Read status DPI/QPI/OPI sequence id in lookupTable stored in config block
+#define NOR_CMD_LUT_SEQ_IDX_WRITEENABLE \
+    CMD_LUT_SEQ_IDX_WRITEENABLE //!< 3  Write Enable sequence id in lookupTable stored in config block
+#define NOR_CMD_LUT_SEQ_IDX_WRITEENABLE_XPI \
+    4 //!< 4  Write Enable DPI/QPI/OPI sequence id in lookupTable stored in config block
+#define NOR_CMD_LUT_SEQ_IDX_ERASESECTOR 5 //!< 5  Erase Sector sequence id in lookupTable stored in config block
+#define NOR_CMD_LUT_SEQ_IDX_ERASEBLOCK 8  //!< 8 Erase Block sequence id in lookupTable stored in config block
+#define NOR_CMD_LUT_SEQ_IDX_PAGEPROGRAM \
+    CMD_LUT_SEQ_IDX_WRITE                //!< 9  Program sequence id in lookupTable stored in config block
+#define NOR_CMD_LUT_SEQ_IDX_CHIPERASE 11 //!< 11 Chip Erase sequence in lookupTable id stored in config block
+#define NOR_CMD_LUT_SEQ_IDX_READ_SFDP 13 //!< 13 Read SFDP sequence in lookupTable id stored in config block
+#define NOR_CMD_LUT_SEQ_IDX_RESTORE_NOCMD \
+    14 //!< 14 Restore 0-4-4/0-8-8 mode sequence id in lookupTable stored in config block
+#define NOR_CMD_LUT_SEQ_IDX_EXIT_NOCMD \
+    15 //!< 15 Exit 0-4-4/0-8-8 mode sequence id in lookupTable stored in config blobk
+
+/*
+ *  Serial NOR configuration block
+ */
+typedef struct _flexspi_nor_config
+{
+    flexspi_mem_config_t memConfig; //!< Common memory configuration info via FlexSPI
+    uint32_t pageSize;              //!< Page size of Serial NOR
+    uint32_t sectorSize;            //!< Sector size of Serial NOR
+    uint8_t ipcmdSerialClkFreq;     //!< Clock frequency for IP command
+    uint8_t isUniformBlockSize;     //!< Sector/Block size is the same
+    uint8_t reserved0[2];           //!< Reserved for future use
+    uint8_t serialNorType;          //!< Serial NOR Flash type: 0/1/2/3
+    uint8_t needExitNoCmdMode;      //!< Need to exit NoCmd mode before other IP command
+    uint8_t halfClkForNonReadCmd;   //!< Half the Serial Clock for non-read command: true/false
+    uint8_t needRestoreNoCmdMode;   //!< Need to Restore NoCmd mode after IP commmand execution
+    uint32_t blockSize;             //!< Block size
+    uint32_t reserve2[11];          //!< Reserved for future use
+} flexspi_nor_config_t;
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* __EVKMIMXRT1020_FLEXSPI_NOR_CONFIG__ */
diff --git a/ports/mimxrt/boards/MIMXRT1020_EVK/flash_config.c b/ports/mimxrt/boards/MIMXRT1020_EVK/flash_config.c
new file mode 100644
index 0000000000000..56007931a90d7
--- /dev/null
+++ b/ports/mimxrt/boards/MIMXRT1020_EVK/flash_config.c
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2019 NXP.
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+// Based on tinyusb/hw/bsp/teensy_40/evkmimxrt1010_flexspi_nor_config.c
+
+#include "evkmimxrt1020_flexspi_nor_config.h"
+
+/* Component ID definition, used by tools. */
+#ifndef FSL_COMPONENT_ID
+#define FSL_COMPONENT_ID "platform.drivers.xip_board"
+#endif
+
+/*******************************************************************************
+ * Code
+ ******************************************************************************/
+#if defined(XIP_BOOT_HEADER_ENABLE) && (XIP_BOOT_HEADER_ENABLE == 1)
+#if defined(__ARMCC_VERSION) || defined(__GNUC__)
+__attribute__((section(".boot_hdr.conf")))
+#elif defined(__ICCARM__)
+#pragma location = ".boot_hdr.conf"
+#endif
+
+const flexspi_nor_config_t qspiflash_config = {
+    .memConfig =
+        {
+            .tag              = FLEXSPI_CFG_BLK_TAG,
+            .version          = FLEXSPI_CFG_BLK_VERSION,
+            .readSampleClkSrc = kFlexSPIReadSampleClk_LoopbackFromDqsPad,
+            .csHoldTime       = 3u,
+            .csSetupTime      = 3u,
+            // Enable DDR mode, Wordaddassable, Safe configuration, Differential clock
+            .sflashPadType = kSerialFlash_4Pads,
+            .serialClkFreq = kFlexSpiSerialClk_100MHz,
+            .sflashA1Size  = 8u * 1024u * 1024u,
+            .lookupTable =
+                {
+                    // Read LUTs
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0xEB, RADDR_SDR, FLEXSPI_4PAD, 0x18),
+                    FLEXSPI_LUT_SEQ(DUMMY_SDR, FLEXSPI_4PAD, 0x06, READ_SDR, FLEXSPI_4PAD, 0x04),
+                },
+        },
+    .pageSize           = 256u,
+    .sectorSize         = 4u * 1024u,
+    .blockSize          = 256u * 1024u,
+    .isUniformBlockSize = false,
+};
+#endif /* XIP_BOOT_HEADER_ENABLE */
diff --git a/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.h b/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.h
new file mode 100644
index 0000000000000..8598f76bf1833
--- /dev/null
+++ b/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.h
@@ -0,0 +1,9 @@
+#define MICROPY_HW_BOARD_NAME "i.MX RT1020 EVK"
+#define MICROPY_HW_MCU_NAME   "MIMXRT1021DAG5A"
+
+#define BOARD_FLASH_SIZE (8 * 1024 * 1024)
+
+// i.MX RT1020 EVK has 1 board LED
+#define MICROPY_HW_LED1_PIN (GPIO_AD_B0_05)
+#define MICROPY_HW_LED_ON(pin) (mp_hal_pin_low(pin))
+#define MICROPY_HW_LED_OFF(pin) (mp_hal_pin_high(pin))
diff --git a/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.mk b/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.mk
new file mode 100644
index 0000000000000..f3b1689524e29
--- /dev/null
+++ b/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.mk
@@ -0,0 +1,7 @@
+MCU_SERIES = MIMXRT1021
+MCU_VARIANT = MIMXRT1021DAG5A
+
+JLINK_PATH ?= /media/RT1020-EVK/
+
+deploy: $(BUILD)/firmware.bin
+	cp $< $(JLINK_PATH)
diff --git a/ports/mimxrt/boards/MIMXRT1020_EVK/pins.c b/ports/mimxrt/boards/MIMXRT1020_EVK/pins.c
new file mode 100644
index 0000000000000..946b6efca8b27
--- /dev/null
+++ b/ports/mimxrt/boards/MIMXRT1020_EVK/pins.c
@@ -0,0 +1,33 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 Philipp Ebensberger
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "pin.h"
+
+static pin_af_obj_t GPIO_AD_B0_05_af[] = {
+    PIN_AF(GPIO1_IO05, PIN_AF_MODE_ALT5, GPIO1, 0x10B0U),
+};
+
+pin_obj_t GPIO_AD_B0_05 = PIN(GPIO_AD_B0_05, GPIO1, 5, GPIO_AD_B0_05_af);
diff --git a/ports/mimxrt/boards/MIMXRT1020_EVK/pins.h b/ports/mimxrt/boards/MIMXRT1020_EVK/pins.h
new file mode 100644
index 0000000000000..158929911c7a5
--- /dev/null
+++ b/ports/mimxrt/boards/MIMXRT1020_EVK/pins.h
@@ -0,0 +1,30 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 Philipp Ebensberger
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+// NOTE: pins.h shall only be included in in pin.h
+// hence no include guards are needed since they will be provided by pin.h
+
+extern pin_obj_t GPIO_AD_B0_05;
diff --git a/ports/mimxrt/boards/MIMXRT1021.ld b/ports/mimxrt/boards/MIMXRT1021.ld
new file mode 100644
index 0000000000000..6b59649fcaf7e
--- /dev/null
+++ b/ports/mimxrt/boards/MIMXRT1021.ld
@@ -0,0 +1,8 @@
+/* 24kiB stack. */
+__stack_size__ = 0x6000;
+_estack = __StackTop;
+_sstack = __StackLimit;
+
+/* Use second OCRAM bank for GC heap. */
+_gc_heap_start = ORIGIN(m_data2);
+_gc_heap_end = ORIGIN(m_data2) + LENGTH(m_data2);

From 28370c04509a6255cd3d6b9424443a5b57bb7467 Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Wed, 10 Jun 2020 10:45:24 +1000
Subject: [PATCH 0053/3533] py/objtype: Add __dict__ attribute for class
 objects.

The behavior mirrors the instance object dict attribute where a copy of the
local attributes are provided (unless the dict is read-only, then that dict
itself is returned, as an optimisation).  MicroPython does not support
modifying this dict because the changes will not be reflected in the class.

The feature is only enabled if MICROPY_CPYTHON_COMPAT is set, the same as
the instance version.
---
 py/obj.h                   |  1 +
 py/objdict.c               |  4 ++--
 py/objtype.c               | 15 +++++++++++++++
 tests/basics/class_dict.py | 19 +++++++++++++++++++
 4 files changed, 37 insertions(+), 2 deletions(-)
 create mode 100644 tests/basics/class_dict.py

diff --git a/py/obj.h b/py/obj.h
index 125acf118f08d..468125eb75699 100644
--- a/py/obj.h
+++ b/py/obj.h
@@ -895,6 +895,7 @@ size_t mp_obj_dict_len(mp_obj_t self_in);
 mp_obj_t mp_obj_dict_get(mp_obj_t self_in, mp_obj_t index);
 mp_obj_t mp_obj_dict_store(mp_obj_t self_in, mp_obj_t key, mp_obj_t value);
 mp_obj_t mp_obj_dict_delete(mp_obj_t self_in, mp_obj_t key);
+mp_obj_t mp_obj_dict_copy(mp_obj_t self_in);
 static inline mp_map_t *mp_obj_dict_get_map(mp_obj_t dict) {
     return &((mp_obj_dict_t *)MP_OBJ_TO_PTR(dict))->map;
 }
diff --git a/py/objdict.c b/py/objdict.c
index 7690eeab29af1..69eda99738eec 100644
--- a/py/objdict.c
+++ b/py/objdict.c
@@ -227,7 +227,7 @@ STATIC mp_obj_t dict_clear(mp_obj_t self_in) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(dict_clear_obj, dict_clear);
 
-STATIC mp_obj_t dict_copy(mp_obj_t self_in) {
+mp_obj_t mp_obj_dict_copy(mp_obj_t self_in) {
     mp_check_self(mp_obj_is_dict_type(self_in));
     mp_obj_dict_t *self = MP_OBJ_TO_PTR(self_in);
     mp_obj_t other_out = mp_obj_new_dict(self->map.alloc);
@@ -240,7 +240,7 @@ STATIC mp_obj_t dict_copy(mp_obj_t self_in) {
     memcpy(other->map.table, self->map.table, self->map.alloc * sizeof(mp_map_elem_t));
     return other_out;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(dict_copy_obj, dict_copy);
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(dict_copy_obj, mp_obj_dict_copy);
 
 #if MICROPY_PY_BUILTINS_DICT_FROMKEYS
 // this is a classmethod
diff --git a/py/objtype.c b/py/objtype.c
index d08c69e284b3e..cb0fb267c8165 100644
--- a/py/objtype.c
+++ b/py/objtype.c
@@ -1013,6 +1013,21 @@ STATIC void type_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
             dest[0] = MP_OBJ_NEW_QSTR(self->name);
             return;
         }
+        #if MICROPY_CPYTHON_COMPAT
+        if (attr == MP_QSTR___dict__) {
+            // Returns a read-only dict of the class attributes.
+            // If the internal locals is not fixed, a copy will be created.
+            mp_obj_dict_t *dict = self->locals_dict;
+            if (dict->map.is_fixed) {
+                dest[0] = MP_OBJ_FROM_PTR(dict);
+            } else {
+                dest[0] = mp_obj_dict_copy(MP_OBJ_FROM_PTR(dict));
+                dict = MP_OBJ_TO_PTR(dest[0]);
+                dict->map.is_fixed = 1;
+            }
+            return;
+        }
+        #endif
         if (attr == MP_QSTR___bases__) {
             if (self == &mp_type_object) {
                 dest[0] = mp_const_empty_tuple;
diff --git a/tests/basics/class_dict.py b/tests/basics/class_dict.py
new file mode 100644
index 0000000000000..f80ded678b0f8
--- /dev/null
+++ b/tests/basics/class_dict.py
@@ -0,0 +1,19 @@
+# test __dict__ attribute of a class
+
+if not hasattr(int, "__dict__"):
+    print("SKIP")
+    raise SystemExit
+
+
+# dict of a built-in type
+print("from_bytes" in int.__dict__)
+
+
+# dict of a user class
+class Foo:
+    a = 1
+    b = "bar"
+
+
+d = Foo.__dict__
+print(d["a"], d["b"])

From 95cbe6b65ec84793f0f5ac2fd89c1375969a3bea Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Wed, 10 Jun 2020 10:46:38 +1000
Subject: [PATCH 0054/3533] py/objtype: Use mp_obj_dict_copy() for creating
 obj.__dict__ attribute.

The resulting dict is now marked as read-only (is_fixed=1) to enforce the
fact that changes to this dict will not be reflected in the class instance.

This commit reduces code size by about 20 bytes, and should be more
efficient because it creates a direct copy of the dict rather than
reinserting all elements.
---
 py/objtype.c | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/py/objtype.c b/py/objtype.c
index cb0fb267c8165..a539fcab29414 100644
--- a/py/objtype.c
+++ b/py/objtype.c
@@ -588,16 +588,13 @@ STATIC void mp_obj_instance_load_attr(mp_obj_t self_in, qstr attr, mp_obj_t *des
     #if MICROPY_CPYTHON_COMPAT
     if (attr == MP_QSTR___dict__) {
         // Create a new dict with a copy of the instance's map items.
-        // This creates, unlike CPython, a 'read-only' __dict__: modifying
-        // it will not result in modifications to the actual instance members.
-        mp_map_t *map = &self->members;
-        mp_obj_t attr_dict = mp_obj_new_dict(map->used);
-        for (size_t i = 0; i < map->alloc; ++i) {
-            if (mp_map_slot_is_filled(map, i)) {
-                mp_obj_dict_store(attr_dict, map->table[i].key, map->table[i].value);
-            }
-        }
-        dest[0] = attr_dict;
+        // This creates, unlike CPython, a read-only __dict__ that can't be modified.
+        mp_obj_dict_t dict;
+        dict.base.type = &mp_type_dict;
+        dict.map = self->members;
+        dest[0] = mp_obj_dict_copy(MP_OBJ_FROM_PTR(&dict));
+        mp_obj_dict_t *dest_dict = MP_OBJ_TO_PTR(dest[0]);
+        dest_dict->map.is_fixed = 1;
         return;
     }
     #endif

From f3062b5cbdeea5900486a38902e3155117ebf820 Mon Sep 17 00:00:00 2001
From: Damien George <damien.p.george@gmail.com>
Date: Tue, 9 Jun 2020 14:46:57 +1000
Subject: [PATCH 0055/3533] py/obj.h: Clarify comments about mp_map_t is_fixed
 and is_ordered.

Long ago, prior to 0ef01d0a75b8b2f48a72f0041e048a390b9e75b6, fixed and
ordered maps were the same setting with the "table_is_fixed_array" member
of mp_map_t.  But these settings are actually independent, and it is
possible to have is_fixed=1, is_ordered=0 (although this can currently
only be done by tools/cc1).  So update the comments to reflect this.
---
 py/obj.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/py/obj.h b/py/obj.h
index 468125eb75699..f80f00031dc77 100644
--- a/py/obj.h
+++ b/py/obj.h
@@ -407,8 +407,8 @@ typedef struct _mp_rom_map_elem_t {
 
 typedef struct _mp_map_t {
     size_t all_keys_are_qstrs : 1;
-    size_t is_fixed : 1;    // a fixed array that can't be modified; must also be ordered
-    size_t is_ordered : 1;  // an ordered array
+    size_t is_fixed : 1;    // if set, table is fixed/read-only and can't be modified
+    size_t is_ordered : 1;  // if set, table is an ordered array, not a hash map
     size_t used : (8 * sizeof(size_t) - 3);
     size_t alloc;
     mp_map_elem_t *table;

From a4c96fb3b0c5e3bf83238a0edd0fbcbfd96208c8 Mon Sep 17 00:00:00 2001
From: Damien George <damien.p.george@gmail.com>
Date: Fri, 5 Jun 2020 21:26:27 +1000
Subject: [PATCH 0056/3533] extmod/uasyncio: Add asyncio.wait_for_ms function.

Fixes issue #6107.
---
 docs/library/uasyncio.rst                |  6 ++++
 extmod/uasyncio/__init__.py              |  1 +
 extmod/uasyncio/funcs.py                 | 12 +++++---
 tests/extmod/uasyncio_micropython.py     | 37 ++++++++++++++++++++++++
 tests/extmod/uasyncio_micropython.py.exp |  7 +++++
 5 files changed, 59 insertions(+), 4 deletions(-)
 create mode 100644 tests/extmod/uasyncio_micropython.py
 create mode 100644 tests/extmod/uasyncio_micropython.py.exp

diff --git a/docs/library/uasyncio.rst b/docs/library/uasyncio.rst
index 0f363a076ea3b..31b38a4e05f2f 100644
--- a/docs/library/uasyncio.rst
+++ b/docs/library/uasyncio.rst
@@ -74,6 +74,12 @@ Additional functions
 
     This is a coroutine.
 
+.. function:: wait_for_ms(awaitable, timeout)
+
+    Similar to `wait_for` but *timeout* is an integer in milliseconds.
+
+    This is a coroutine, and a MicroPython extension.
+
 .. function:: gather(\*awaitables, return_exceptions=False)
 
     Run all *awaitables* concurrently.  Any *awaitables* that are not tasks are
diff --git a/extmod/uasyncio/__init__.py b/extmod/uasyncio/__init__.py
index da8b58061e6ca..08f924cf29b9b 100644
--- a/extmod/uasyncio/__init__.py
+++ b/extmod/uasyncio/__init__.py
@@ -7,6 +7,7 @@
 
 _attrs = {
     "wait_for": "funcs",
+    "wait_for_ms": "funcs",
     "gather": "funcs",
     "Event": "event",
     "Lock": "lock",
diff --git a/extmod/uasyncio/funcs.py b/extmod/uasyncio/funcs.py
index 7a4bddf25695a..6e1305c94f418 100644
--- a/extmod/uasyncio/funcs.py
+++ b/extmod/uasyncio/funcs.py
@@ -4,16 +4,16 @@
 from . import core
 
 
-async def wait_for(aw, timeout):
+async def wait_for(aw, timeout, sleep=core.sleep):
     aw = core._promote_to_task(aw)
     if timeout is None:
         return await aw
 
-    def cancel(aw, timeout):
-        await core.sleep(timeout)
+    def cancel(aw, timeout, sleep):
+        await sleep(timeout)
         aw.cancel()
 
-    cancel_task = core.create_task(cancel(aw, timeout))
+    cancel_task = core.create_task(cancel(aw, timeout, sleep))
     try:
         ret = await aw
     except core.CancelledError:
@@ -29,6 +29,10 @@ def cancel(aw, timeout):
     return ret
 
 
+def wait_for_ms(aw, timeout):
+    return wait_for(aw, timeout, core.sleep_ms)
+
+
 async def gather(*aws, return_exceptions=False):
     ts = [core._promote_to_task(aw) for aw in aws]
     for i in range(len(ts)):
diff --git a/tests/extmod/uasyncio_micropython.py b/tests/extmod/uasyncio_micropython.py
new file mode 100644
index 0000000000000..69e5fa3224df7
--- /dev/null
+++ b/tests/extmod/uasyncio_micropython.py
@@ -0,0 +1,37 @@
+# Test MicroPython extensions on CPython asyncio:
+# - sleep_ms
+# - wait_for_ms
+
+try:
+    import utime, uasyncio
+except ImportError:
+    print("SKIP")
+    raise SystemExit
+
+
+async def task(id, t):
+    print("task start", id)
+    await uasyncio.sleep_ms(t)
+    print("task end", id)
+    return id * 2
+
+
+async def main():
+    # Simple sleep_ms
+    t0 = utime.ticks_ms()
+    await uasyncio.sleep_ms(1)
+    print(utime.ticks_diff(utime.ticks_ms(), t0) < 100)
+
+    # When task finished before the timeout
+    print(await uasyncio.wait_for_ms(task(1, 5), 50))
+
+    # When timeout passes and task is cancelled
+    try:
+        print(await uasyncio.wait_for_ms(task(2, 50), 5))
+    except uasyncio.TimeoutError:
+        print("timeout")
+
+    print("finish")
+
+
+uasyncio.run(main())
diff --git a/tests/extmod/uasyncio_micropython.py.exp b/tests/extmod/uasyncio_micropython.py.exp
new file mode 100644
index 0000000000000..f5be1dc75a254
--- /dev/null
+++ b/tests/extmod/uasyncio_micropython.py.exp
@@ -0,0 +1,7 @@
+True
+task start 1
+task end 1
+2
+task start 2
+timeout
+finish

From 3705bc418cadd9d6ad87f2bcd5443ba82f730e15 Mon Sep 17 00:00:00 2001
From: jp-96 <h.kuroyanagi.css@gmail.com>
Date: Mon, 8 Jun 2020 12:19:56 +0900
Subject: [PATCH 0057/3533] extmod/modbluetooth: Register default GATT service
 and fix esp32 init.

This is for the NimBLE bindings, to make sure the default GATT service
appears and that the esp32 initialises NimBLE correctly (it now matches
stm32).
---
 extmod/nimble/modbluetooth_nimble.c | 7 +++++--
 ports/esp32/nimble.c                | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/extmod/nimble/modbluetooth_nimble.c b/extmod/nimble/modbluetooth_nimble.c
index 05ec6117791da..035ec3d26fc6d 100644
--- a/extmod/nimble/modbluetooth_nimble.c
+++ b/extmod/nimble/modbluetooth_nimble.c
@@ -39,6 +39,7 @@
 #include "nimble/ble.h"
 #include "nimble/nimble_port.h"
 #include "services/gap/ble_svc_gap.h"
+#include "services/gatt/ble_svc_gatt.h"
 
 #ifndef MICROPY_PY_BLUETOOTH_DEFAULT_GAP_NAME
 #define MICROPY_PY_BLUETOOTH_DEFAULT_GAP_NAME "MPY NIMBLE"
@@ -271,8 +272,9 @@ int mp_bluetooth_init(void) {
     nimble_port_init();
     mp_bluetooth_nimble_port_postinit();
 
-    // By default, just register the default gap service.
+    // By default, just register the default gap/gatt service.
     ble_svc_gap_init();
+    ble_svc_gatt_init();
 
     mp_bluetooth_nimble_port_start();
 
@@ -466,8 +468,9 @@ int mp_bluetooth_gatts_register_service_begin(bool append) {
     // Reset the gatt characteristic value db.
     mp_bluetooth_gatts_db_reset(MP_STATE_PORT(bluetooth_nimble_root_pointers)->gatts_db);
 
-    // By default, just register the default gap service.
+    // By default, just register the default gap/gatt service.
     ble_svc_gap_init();
+    ble_svc_gatt_init();
 
     if (!append) {
         // Unref any previous service definitions.
diff --git a/ports/esp32/nimble.c b/ports/esp32/nimble.c
index e60e08badfbe1..16829732c30e5 100644
--- a/ports/esp32/nimble.c
+++ b/ports/esp32/nimble.c
@@ -44,7 +44,6 @@ void mp_bluetooth_nimble_port_preinit(void) {
 }
 
 void mp_bluetooth_nimble_port_postinit(void) {
-    nimble_port_freertos_init(ble_host_task);
 }
 
 void mp_bluetooth_nimble_port_deinit(void) {
@@ -52,6 +51,7 @@ void mp_bluetooth_nimble_port_deinit(void) {
 }
 
 void mp_bluetooth_nimble_port_start(void) {
+    nimble_port_freertos_init(ble_host_task);
 }
 
 #endif

From c6fd6a0d728fea590e7f731e41a33754111770bd Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Fri, 5 Jun 2020 15:40:29 +1000
Subject: [PATCH 0058/3533] examples/bluetooth: Fix event code in
 ble_temperature_central.py.

---
 examples/bluetooth/ble_temperature_central.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/examples/bluetooth/ble_temperature_central.py b/examples/bluetooth/ble_temperature_central.py
index 1ce99728b37d3..f9db225c16942 100644
--- a/examples/bluetooth/ble_temperature_central.py
+++ b/examples/bluetooth/ble_temperature_central.py
@@ -128,7 +128,7 @@ def _irq(self, event, data):
             if conn_handle == self._conn_handle and uuid == _ENV_SENSE_UUID:
                 self._start_handle, self._end_handle = start_handle, end_handle
 
-        elif event == _IRQ_GATTC_SERVICES_DONE:
+        elif event == _IRQ_GATTC_SERVICE_DONE:
             # Service query complete.
             if self._start_handle and self._end_handle:
                 self._ble.gattc_discover_characteristics(
@@ -143,7 +143,7 @@ def _irq(self, event, data):
             if conn_handle == self._conn_handle and uuid == _TEMP_UUID:
                 self._value_handle = value_handle
 
-        elif event == _IRQ_GATTC_CHARACTERISTICS_DONE:
+        elif event == _IRQ_GATTC_CHARACTERISTIC_DONE:
             # Characteristic query complete.
             if self._value_handle:
                 # We've finished connecting and discovering device, fire the connect callback.

From 3f77f2c60ca80ea9189f85193dbd746e9a6034a9 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Fri, 5 Jun 2020 15:41:08 +1000
Subject: [PATCH 0059/3533] unix/btstack_usb: Allow choosing adaptor via
 environment variable.

This allows running (for example):

    env MICROPYBTUSB=2-2 ./micropython-dev ../../examples/bluetooth/ble_temperature_central.py
---
 ports/unix/btstack_usb.c | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/ports/unix/btstack_usb.c b/ports/unix/btstack_usb.c
index da9d72fe15258..76f32d6d27cfa 100644
--- a/ports/unix/btstack_usb.c
+++ b/ports/unix/btstack_usb.c
@@ -110,7 +110,23 @@ void mp_bluetooth_btstack_port_init(void) {
         btstack_run_loop_embedded_get_instance()->init();
     }
 
-    // TODO: allow setting USB device path via cmdline/env var.
+    // MICROPYBTUSB can be a ':'' or '-' separated port list.
+    char *path = getenv("MICROPYBTUSB");
+    if (path != NULL) {
+        uint8_t usb_path[7] = {0};
+        size_t usb_path_len = 0;
+
+        while (usb_path_len < MP_ARRAY_SIZE(usb_path)) {
+            char *delimiter;
+            usb_path[usb_path_len++] = strtol(path, &delimiter, 16);
+            if (!delimiter || (*delimiter != ':' && *delimiter != '-')) {
+                break;
+            }
+            path = delimiter + 1;
+        }
+
+        hci_transport_usb_set_path(usb_path_len, usb_path);
+    }
 
     // hci_dump_open(NULL, HCI_DUMP_STDOUT);
     hci_init(hci_transport_usb_instance(), NULL);

From 00c3e2156a7b5447966019ad46a1c9763f0890ee Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Fri, 5 Jun 2020 15:41:40 +1000
Subject: [PATCH 0060/3533] tests/run-multitests.py: Allow passing unique env
 vars to each instance.

For example, to run the BLE multitests entirely with the unix port:

    env MICROPY_MICROPYTHON=../ports/unix/micropython-dev ./run-multitests.py \
        -i micropython,MICROPYBTUSB=01 \
        -i micropython,MICROPYBTUSB=02:02 \
        multi_bluetooth/ble_*.py
---
 tests/run-multitests.py | 41 +++++++++++++++++++++++++++--------------
 1 file changed, 27 insertions(+), 14 deletions(-)

diff --git a/tests/run-multitests.py b/tests/run-multitests.py
index 567e9b5ffa388..7ab4e85c57d79 100755
--- a/tests/run-multitests.py
+++ b/tests/run-multitests.py
@@ -92,20 +92,25 @@ def start_file(self, filename, prepend="", append=""):
 
 
 class PyInstanceSubProcess(PyInstance):
-    def __init__(self, cmd):
-        self.cmd = cmd
+    def __init__(self, argv, env=None):
+        self.argv = argv
+        self.env = {n: v for n, v in (i.split("=") for i in env)} if env else None
         self.popen = None
         self.finished = True
 
     def __str__(self):
-        return self.cmd[0].rsplit("/")[-1]
+        return self.argv[0].rsplit("/")[-1]
 
     def run_script(self, script):
         output = b""
         err = None
         try:
             p = subprocess.run(
-                self.cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, input=script
+                self.argv,
+                stdout=subprocess.PIPE,
+                stderr=subprocess.STDOUT,
+                input=script,
+                env=self.env,
             )
             output = p.stdout
         except subprocess.CalledProcessError as er:
@@ -114,7 +119,11 @@ def run_script(self, script):
 
     def start_script(self, script):
         self.popen = subprocess.Popen(
-            self.cmd, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.STDOUT
+            self.argv,
+            stdin=subprocess.PIPE,
+            stdout=subprocess.PIPE,
+            stderr=subprocess.STDOUT,
+            env=self.env,
         )
         self.popen.stdin.write(script)
         self.popen.stdin.close()
@@ -404,16 +413,20 @@ def main():
 
     instances_test = []
     for i in cmd_args.instance:
-        if i.startswith("exec:"):
-            instances_test.append(PyInstanceSubProcess([i[len("exec:") :]]))
-        elif i == "micropython":
-            instances_test.append(PyInstanceSubProcess([MICROPYTHON]))
-        elif i == "cpython":
-            instances_test.append(PyInstanceSubProcess([CPYTHON3]))
-        elif i.startswith("pyb:"):
-            instances_test.append(PyInstancePyboard(i[len("pyb:") :]))
+        # Each instance arg is <cmd>,ENV=VAR,ENV=VAR...
+        i = i.split(",")
+        cmd = i[0]
+        env = i[1:]
+        if cmd.startswith("exec:"):
+            instances_test.append(PyInstanceSubProcess([cmd[len("exec:") :]], env))
+        elif cmd == "micropython":
+            instances_test.append(PyInstanceSubProcess([MICROPYTHON], env))
+        elif cmd == "cpython":
+            instances_test.append(PyInstanceSubProcess([CPYTHON3], env))
+        elif cmd.startswith("pyb:"):
+            instances_test.append(PyInstancePyboard(cmd[len("pyb:") :]))
         else:
-            print("unknown instance string: {}".format(i), file=sys.stderr)
+            print("unknown instance string: {}".format(cmd), file=sys.stderr)
             sys.exit(1)
 
     for _ in range(max_instances - len(instances_test)):

From 2934e41df0938b26cffc8eb1ea9f24a077990b61 Mon Sep 17 00:00:00 2001
From: Nick Crabtree <nickcrabtree@gmail.com>
Date: Sun, 7 Jun 2020 11:42:54 +0100
Subject: [PATCH 0061/3533] docs/esp8266: Add quickref documentation for UART
 on esp8266.

This patch adds quickref documentation for the change in commit
afd0701bf7a9dcb50c5ab46b0ae88b303fec6ed3.  This commit added the ability to
disable the REPL and hence use UART0 for serial communication on the
esp8266, but was not previously documented anywhere.

The text is largely taken from the commit message, with generic information
on using the UART duplicated from the Wipy quickref document.
---
 docs/esp8266/quickref.rst | 39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/docs/esp8266/quickref.rst b/docs/esp8266/quickref.rst
index 9c7db3205a7e6..c884d93fc9940 100644
--- a/docs/esp8266/quickref.rst
+++ b/docs/esp8266/quickref.rst
@@ -138,6 +138,45 @@ Also note that Pin(16) is a special pin (used for wakeup from deepsleep
 mode) and may be not available for use with higher-level classes like
 ``Neopixel``.
 
+UART (serial bus)
+-----------------
+
+See :ref:`machine.UART <machine.UART>`. ::
+
+    from machine import UART
+    uart = UART(0, baudrate=9600)
+    uart.write('hello')
+    uart.read(5) # read up to 5 bytes
+
+Two UARTs are available. UART0 is on Pins 1 (TX) and 3 (RX). UART0 is
+bidirectional, and by default is used for the REPL. UART1 is on Pins 2
+(TX) and 8 (RX) however Pin 8 is used to connect the flash chip, so
+UART1 is TX only.
+
+When UART0 is attached to the REPL, all incoming chars on UART(0) go
+straight to stdin so uart.read() will always return None.  Use
+sys.stdin.read() if it's needed to read characters from the UART(0)
+while it's also used for the REPL (or detach, read, then reattach).
+When detached the UART(0) can be used for other purposes.
+
+If there are no objects in any of the dupterm slots when the REPL is
+started (on hard or soft reset) then UART(0) is automatically attached.
+Without this, the only way to recover a board without a REPL would be to
+completely erase and reflash (which would install the default boot.py which
+attaches the REPL).
+
+To detach the REPL from UART0, use::
+
+    import uos
+    uos.dupterm(None, 1)
+
+The REPL is attached by default. If you have detached it, to reattach
+it use::
+
+    import uos, machine
+    uart = machine.UART(0, 115200)
+    uos.dupterm(uart, 1)
+
 PWM (pulse width modulation)
 ----------------------------
 

From 05e5d411b53dcba9529b6ac1e9388bab65f8c11b Mon Sep 17 00:00:00 2001
From: Albort Xue <yao.xue@nxp.com>
Date: Wed, 10 Jun 2020 17:11:30 +0800
Subject: [PATCH 0062/3533] mimxrt/boards: Set __heap_size__ to 0 in
 MIMXRT1011.ld.

Do not use the traditional C heap in order to save memory, because the
traditional C heap is unused in MicroPython.
---
 ports/mimxrt/boards/MIMXRT1011.ld | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ports/mimxrt/boards/MIMXRT1011.ld b/ports/mimxrt/boards/MIMXRT1011.ld
index 6b59649fcaf7e..0512c48a7f2d9 100644
--- a/ports/mimxrt/boards/MIMXRT1011.ld
+++ b/ports/mimxrt/boards/MIMXRT1011.ld
@@ -3,6 +3,9 @@ __stack_size__ = 0x6000;
 _estack = __StackTop;
 _sstack = __StackLimit;
 
+/* Do not use the traditional C heap. */
+__heap_size__ = 0;
+
 /* Use second OCRAM bank for GC heap. */
 _gc_heap_start = ORIGIN(m_data2);
 _gc_heap_end = ORIGIN(m_data2) + LENGTH(m_data2);

From 38b4f1569e7755f78b991352ae5d53055ad67790 Mon Sep 17 00:00:00 2001
From: Maureen Helm <maureen.helm@nxp.com>
Date: Sat, 2 May 2020 11:21:48 -0500
Subject: [PATCH 0063/3533] zephyr: Fix and rename stacks_analyze function in
 zephyr module.

Zephyr deprecated and then removed its stack_analyze function because it
was unsafe.  Use the new zephyr thread analyzer instead and rename the
MicroPython function to zephyr.thread_analyze() to be more consistent with
the implementation.

Tested on mimxrt1050_evk.

The output now looks like this:

>>> zephyr.thread_analyze()
Thread analyze:
 80004ff4            : unused 400 usage 112 / 512 (21 %)
 rx_workq            : unused 1320 usage 180 / 1500 (12 %)
 tx_workq            : unused 992 usage 208 / 1200 (17 %)
 net_mgmt            : unused 656 usage 112 / 768 (14 %)
 sysworkq            : unused 564 usage 460 / 1024 (44 %)
 idle                : unused 256 usage 64 / 320 (20 %)
 main                : unused 2952 usage 1784 / 4736 (37 %)
---
 ports/zephyr/modzephyr.c | 29 +++++++----------------------
 ports/zephyr/prj.conf    |  5 ++---
 2 files changed, 9 insertions(+), 25 deletions(-)

diff --git a/ports/zephyr/modzephyr.c b/ports/zephyr/modzephyr.c
index d4ee610b204c6..71b44d7df1611 100644
--- a/ports/zephyr/modzephyr.c
+++ b/ports/zephyr/modzephyr.c
@@ -30,7 +30,7 @@
 
 #include <stdio.h>
 #include <zephyr.h>
-#include <debug/stack.h>
+#include <debug/thread_analyzer.h>
 
 #include "modzephyr.h"
 #include "py/runtime.h"
@@ -45,27 +45,12 @@ STATIC mp_obj_t mod_current_tid(void) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_0(mod_current_tid_obj, mod_current_tid);
 
-#ifdef CONFIG_THREAD_STACK_INFO
-extern k_tid_t const _main_thread;
-extern k_tid_t const _idle_thread;
-
-static void thread_stack_dump(const struct k_thread *thread, void *user_data) {
-    const char *th_name = k_thread_name_get((k_tid_t)thread);
-
-    if (th_name == NULL) {
-        static char tid[9];
-        snprintf(tid, sizeof(tid), "%08x", (int)thread);
-        th_name = tid;
-    }
-
-    stack_analyze(th_name, (char *)thread->stack_info.start, thread->stack_info.size);
-}
-
-STATIC mp_obj_t mod_stacks_analyze(void) {
-    k_thread_foreach(thread_stack_dump, NULL);
+#ifdef CONFIG_THREAD_ANALYZER
+STATIC mp_obj_t mod_thread_analyze(void) {
+    thread_analyzer_print();
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(mod_stacks_analyze_obj, mod_stacks_analyze);
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(mod_thread_analyze_obj, mod_thread_analyze);
 #endif
 
 #ifdef CONFIG_NET_SHELL
@@ -84,8 +69,8 @@ STATIC const mp_rom_map_elem_t mp_module_time_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_zephyr) },
     { MP_ROM_QSTR(MP_QSTR_is_preempt_thread), MP_ROM_PTR(&mod_is_preempt_thread_obj) },
     { MP_ROM_QSTR(MP_QSTR_current_tid), MP_ROM_PTR(&mod_current_tid_obj) },
-    #ifdef CONFIG_THREAD_STACK_INFO
-    { MP_ROM_QSTR(MP_QSTR_stacks_analyze), MP_ROM_PTR(&mod_stacks_analyze_obj) },
+    #ifdef CONFIG_THREAD_ANALYZER
+    { MP_ROM_QSTR(MP_QSTR_thread_analyze), MP_ROM_PTR(&mod_thread_analyze_obj) },
     #endif
 
     #ifdef CONFIG_NET_SHELL
diff --git a/ports/zephyr/prj.conf b/ports/zephyr/prj.conf
index 993dfdc26f9ec..e6ccdadcf063b 100644
--- a/ports/zephyr/prj.conf
+++ b/ports/zephyr/prj.conf
@@ -50,10 +50,9 @@ CONFIG_NET_DHCPV4=y
 # Diagnostics and debugging
 
 # Required for zephyr.stack_analyze()
-CONFIG_INIT_STACKS=y
-CONFIG_THREAD_MONITOR=y
+CONFIG_THREAD_ANALYZER=y
+CONFIG_THREAD_ANALYZER_USE_PRINTK=y
 CONFIG_THREAD_NAME=y
-CONFIG_THREAD_STACK_INFO=y
 
 # Required for usocket.pkt_get_info()
 CONFIG_NET_BUF_POOL_USAGE=y

From 8b061f2d799d120f06d68023eb17e5b5e24d50cc Mon Sep 17 00:00:00 2001
From: Maureen Helm <maureen.helm@nxp.com>
Date: Sat, 2 May 2020 11:38:58 -0500
Subject: [PATCH 0064/3533] zephyr: Fix floating point configuration.

Zephyr renamed CONFIG_FLOAT to CONFIG_FPU to better reflect its semantics
of enabling the hardware floating point unit (FPU) rather than enabling
toolchain-level floating point support (i.e., software floating point for
FPU-less socs).
---
 ports/zephyr/prj.conf         | 2 +-
 ports/zephyr/prj_minimal.conf | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/zephyr/prj.conf b/ports/zephyr/prj.conf
index e6ccdadcf063b..50cfa005025dc 100644
--- a/ports/zephyr/prj.conf
+++ b/ports/zephyr/prj.conf
@@ -11,7 +11,7 @@ CONFIG_CONSOLE_GETCHAR_BUFSIZE=128
 CONFIG_CONSOLE_PUTCHAR_BUFSIZE=128
 
 CONFIG_NEWLIB_LIBC=y
-CONFIG_FLOAT=y
+CONFIG_FPU=y
 CONFIG_MAIN_STACK_SIZE=4736
 
 # Enable sensor subsystem (doesn't add code if not used).
diff --git a/ports/zephyr/prj_minimal.conf b/ports/zephyr/prj_minimal.conf
index d9c2894e6f2de..8b2104925ab67 100644
--- a/ports/zephyr/prj_minimal.conf
+++ b/ports/zephyr/prj_minimal.conf
@@ -1,5 +1,5 @@
 CONFIG_NEWLIB_LIBC=y
-CONFIG_FLOAT=y
+CONFIG_FPU=y
 CONFIG_MAIN_STACK_SIZE=4096
 
 CONFIG_UART_INTERRUPT_DRIVEN=y

From db02cb061d8ecd4c7dec90f37e314197a6030ee8 Mon Sep 17 00:00:00 2001
From: Maureen Helm <maureen.helm@nxp.com>
Date: Thu, 14 May 2020 08:07:49 -0500
Subject: [PATCH 0065/3533] zephyr: Update for refactored zephyr device
 structures.

Updates the zephyr port to use refactored device structures introduced in
zephyr 2.3.
---
 ports/zephyr/machine_i2c.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/zephyr/machine_i2c.c b/ports/zephyr/machine_i2c.c
index f00c1d34225ac..4b29f41d1ef71 100644
--- a/ports/zephyr/machine_i2c.c
+++ b/ports/zephyr/machine_i2c.c
@@ -48,7 +48,7 @@ typedef struct _machine_hard_i2c_obj_t {
 
 STATIC void machine_hard_i2c_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     machine_hard_i2c_obj_t *self = self_in;
-    mp_printf(print, "%s", self->dev->config->name);
+    mp_printf(print, "%s", self->dev->name);
 }
 
 mp_obj_t machine_hard_i2c_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {

From 6aff27ac3c2115734e5b0181956de0c04cfbb651 Mon Sep 17 00:00:00 2001
From: Maureen Helm <maureen.helm@nxp.com>
Date: Thu, 14 May 2020 08:32:32 -0500
Subject: [PATCH 0066/3533] zephyr: Update to new zephyr timeout API.

Updates the zephyr port to use the new timeout api introduced in zephyr
2.3.
---
 ports/zephyr/mphalport.h | 2 +-
 ports/zephyr/uart_core.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/zephyr/mphalport.h b/ports/zephyr/mphalport.h
index 594f6a1f69830..8434a388b0a5e 100644
--- a/ports/zephyr/mphalport.h
+++ b/ports/zephyr/mphalport.h
@@ -21,7 +21,7 @@ static inline void mp_hal_delay_us(mp_uint_t delay) {
 }
 
 static inline void mp_hal_delay_ms(mp_uint_t delay) {
-    k_sleep(delay);
+    k_msleep(delay);
 }
 
 #define mp_hal_delay_us_fast(us)   (mp_hal_delay_us(us))
diff --git a/ports/zephyr/uart_core.c b/ports/zephyr/uart_core.c
index fef9f00ab1625..63ecc8289e3c9 100644
--- a/ports/zephyr/uart_core.c
+++ b/ports/zephyr/uart_core.c
@@ -49,7 +49,7 @@ void mp_hal_stdout_tx_strn(const char *str, mp_uint_t len) {
     while (len--) {
         char c = *str++;
         while (console_putchar(c) == -1) {
-            k_sleep(1);
+            k_msleep(1);
         }
     }
     #else

From 4837b1caa2b7a149769a8e3302350acc4f4bd4d9 Mon Sep 17 00:00:00 2001
From: Maureen Helm <maureen.helm@nxp.com>
Date: Tue, 9 Jun 2020 18:10:40 -0500
Subject: [PATCH 0067/3533] zephyr: Convert DT_FLASH_AREA usages to new dts
 macros.

Converts DT_FLASH_AREA usages in the zephyr port to new device tree macros
introduced in zephyr 2.3.

Tested with littlefs on the reel_board.
---
 ports/zephyr/main.c           | 8 ++++++--
 ports/zephyr/zephyr_storage.c | 4 ++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/ports/zephyr/main.c b/ports/zephyr/main.c
index e304dfd25824d..104954f595c0a 100644
--- a/ports/zephyr/main.c
+++ b/ports/zephyr/main.c
@@ -38,6 +38,10 @@
 #include <usb/usb_device.h>
 #endif
 
+#ifdef CONFIG_FLASH_MAP
+#include <storage/flash_map.h>
+#endif
+
 #include "py/mperrno.h"
 #include "py/compile.h"
 #include "py/runtime.h"
@@ -100,8 +104,8 @@ STATIC void vfs_init(void) {
     mp_obj_t args[] = { mp_obj_new_str(CONFIG_DISK_SDHC_VOLUME_NAME, strlen(CONFIG_DISK_SDHC_VOLUME_NAME)) };
     bdev = zephyr_disk_access_type.make_new(&zephyr_disk_access_type, ARRAY_SIZE(args), 0, args);
     mount_point_str = "/sd";
-    #elif defined(CONFIG_FLASH_MAP) && defined(DT_FLASH_AREA_STORAGE_ID)
-    mp_obj_t args[] = { MP_OBJ_NEW_SMALL_INT(DT_FLASH_AREA_STORAGE_ID), MP_OBJ_NEW_SMALL_INT(4096) };
+    #elif defined(CONFIG_FLASH_MAP) && FLASH_AREA_LABEL_EXISTS(storage)
+    mp_obj_t args[] = { MP_OBJ_NEW_SMALL_INT(FLASH_AREA_ID(storage)), MP_OBJ_NEW_SMALL_INT(4096) };
     bdev = zephyr_flash_area_type.make_new(&zephyr_flash_area_type, ARRAY_SIZE(args), 0, args);
     mount_point_str = "/flash";
     #endif
diff --git a/ports/zephyr/zephyr_storage.c b/ports/zephyr/zephyr_storage.c
index c533cb8fd721b..83f19a8feeadd 100644
--- a/ports/zephyr/zephyr_storage.c
+++ b/ports/zephyr/zephyr_storage.c
@@ -245,8 +245,8 @@ STATIC const mp_rom_map_elem_t zephyr_flash_area_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_readblocks), MP_ROM_PTR(&zephyr_flash_area_readblocks_obj) },
     { MP_ROM_QSTR(MP_QSTR_writeblocks), MP_ROM_PTR(&zephyr_flash_area_writeblocks_obj) },
     { MP_ROM_QSTR(MP_QSTR_ioctl), MP_ROM_PTR(&zephyr_flash_area_ioctl_obj) },
-    #ifdef DT_FLASH_AREA_STORAGE_ID
-    { MP_ROM_QSTR(MP_QSTR_STORAGE), MP_ROM_INT(DT_FLASH_AREA_STORAGE_ID) },
+    #if FLASH_AREA_LABEL_EXISTS(storage)
+    { MP_ROM_QSTR(MP_QSTR_STORAGE), MP_ROM_INT(FLASH_AREA_ID(storage)) },
     #endif
 };
 STATIC MP_DEFINE_CONST_DICT(zephyr_flash_area_locals_dict, zephyr_flash_area_locals_dict_table);

From b1651ff092e86099b39cba6fe5abfb3ad7514daf Mon Sep 17 00:00:00 2001
From: Maureen Helm <maureen.helm@nxp.com>
Date: Tue, 9 Jun 2020 18:22:04 -0500
Subject: [PATCH 0068/3533] zephyr: Increase minimum required cmake version to
 3.13.1.

The minimum required cmake version has been 3.13.1 since zephyr 1.14.0.
---
 ports/zephyr/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/zephyr/CMakeLists.txt b/ports/zephyr/CMakeLists.txt
index 017b0689cef58..2cc19a93f1a4d 100644
--- a/ports/zephyr/CMakeLists.txt
+++ b/ports/zephyr/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.8)
+cmake_minimum_required(VERSION 3.13.1)
 
 include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE)
 project(NONE)

From 1ae861819dbe8a57cdfda882b093d8d564d8f1c9 Mon Sep 17 00:00:00 2001
From: Maureen Helm <maureen.helm@nxp.com>
Date: Tue, 9 Jun 2020 18:28:09 -0500
Subject: [PATCH 0069/3533] zephyr: Use cmake find_package to locate zephyr.

Updates the zephyr port to use the ZEPHYR_BASE environment variable only to
locate the zephyr cmake package, allowing cmake to cache the variable.
---
 ports/zephyr/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/zephyr/CMakeLists.txt b/ports/zephyr/CMakeLists.txt
index 2cc19a93f1a4d..50cd031d4dd08 100644
--- a/ports/zephyr/CMakeLists.txt
+++ b/ports/zephyr/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.13.1)
 
-include($ENV{ZEPHYR_BASE}/cmake/app/boilerplate.cmake NO_POLICY_SCOPE)
+find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 project(NONE)
 
 target_sources(app PRIVATE src/zephyr_start.c src/zephyr_getchar.c)

From 2b9900380ad2d0ab232e5e3a93c64aaddf90c55a Mon Sep 17 00:00:00 2001
From: Damien George <damien.p.george@gmail.com>
Date: Fri, 12 Jun 2020 10:15:25 +1000
Subject: [PATCH 0070/3533] stm32/boards/STM32F769DISC: Use macro instead of
 const for flash size.

So that the flash size can be changed in just one place.  Also remove the
duplicate cache entry.
---
 ports/stm32/boards/STM32F769DISC/board_init.c    | 1 -
 ports/stm32/boards/STM32F769DISC/mpconfigboard.h | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/ports/stm32/boards/STM32F769DISC/board_init.c b/ports/stm32/boards/STM32F769DISC/board_init.c
index 67fad407a0e28..6bb3dfb1f6178 100644
--- a/ports/stm32/boards/STM32F769DISC/board_init.c
+++ b/ports/stm32/boards/STM32F769DISC/board_init.c
@@ -9,7 +9,6 @@ const mp_spiflash_config_t spiflash_config = {
     .bus_kind = MP_SPIFLASH_BUS_QSPI,
     .bus.u_qspi.data = NULL,
     .bus.u_qspi.proto = &qspi_proto,
-    .cache = NULL,
     .cache = &spi_bdev_cache,
 };
 
diff --git a/ports/stm32/boards/STM32F769DISC/mpconfigboard.h b/ports/stm32/boards/STM32F769DISC/mpconfigboard.h
index 8dbac2d01574a..e1fe93bb0ed44 100644
--- a/ports/stm32/boards/STM32F769DISC/mpconfigboard.h
+++ b/ports/stm32/boards/STM32F769DISC/mpconfigboard.h
@@ -41,7 +41,7 @@ extern struct _spi_bdev_t spi_bdev;
 #if !USE_QSPI_XIP
 #define MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE (0)
 #define MICROPY_HW_BDEV_IOCTL(op, arg) ( \
-    (op) == BDEV_IOCTL_NUM_BLOCKS ? (64 * 1024 * 1024 / FLASH_BLOCK_SIZE) : \
+    (op) == BDEV_IOCTL_NUM_BLOCKS ? ((1 << MICROPY_HW_QSPIFLASH_SIZE_BITS_LOG2) / 8 / FLASH_BLOCK_SIZE) : \
     (op) == BDEV_IOCTL_INIT ? spi_bdev_ioctl(&spi_bdev, (op), (uint32_t)&spiflash_config) : \
     spi_bdev_ioctl(&spi_bdev, (op), (arg)) \
 )

From 5093597542de86714a1eb5a8a4463d4234c2f2cd Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 12 Jun 2020 11:38:24 +1000
Subject: [PATCH 0071/3533] top: Update contribution and commit guide to
 include optional sign-off.

MicroPython already requires contributors to implicitly sign-off on a set
of points, which are listed in CODECONVENTIONS.md.

This commit adjusts this wording to allow explicit sign-off using the git
"Signed-off-by:" feature.  There is no reference made to
https://developercertificate.org/ because the project already has its own
version of this.

Signed-off-by: Damien George <damien@micropython.org>
---
 CODECONVENTIONS.md | 16 +++++++++++-----
 CONTRIBUTING.md    |  2 +-
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/CODECONVENTIONS.md b/CODECONVENTIONS.md
index b18c9818ade25..78fb912a6ab75 100644
--- a/CODECONVENTIONS.md
+++ b/CODECONVENTIONS.md
@@ -27,9 +27,12 @@ change beyond 5 lines would likely require such detailed description.
 To get good practical examples of good commits and their messages, browse
 the `git log` of the project.
 
-MicroPython doesn't require explicit sign-off for patches ("Signed-off-by"
-lines and similar). Instead, the commit message, and your name and email
-address on it construes your sign-off of the following:
+When committing you are encouraged to sign-off your commit by adding
+"Signed-off-by" lines and similar, eg using "git commit -s".  If you don't
+explicitly sign-off in this way then the commit message, which includes your
+name and email address in the "Author" line, implies your sign-off.  In either
+case, of explicit or implicit sign-off, you are certifying and signing off
+against the following:
 
 * That you wrote the change yourself, or took it from a project with
   a compatible license (in the latter case the commit message, and possibly
@@ -43,8 +46,11 @@ address on it construes your sign-off of the following:
   copyright for your changes (for smaller changes, the commit message
   conveys your copyright; if you make significant changes to a particular
   source module, you're welcome to add your name to the file header).
-* Your signature for all of the above, which is the 'Author' line in
-  the commit message, and which should include your full real name and
+* Your contribution including commit message will be publicly and
+  indefinitely available for anyone to access, including redistribution
+  under the terms of the project's license.
+* Your signature for all of the above, which is the "Signed-off-by" line
+  or the "Author" line in the commit message, includes your full real name and
   a valid and active email address by which you can be contacted in the
   foreseeable future.
 
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 06f970607b9bb..73004ac5181ab 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -3,6 +3,6 @@ make sure that you are acquainted with Contributor Guidelines:
 
 https://github.com/micropython/micropython/wiki/ContributorGuidelines
 
-and Code Conventions:
+as well as the Code Conventions, which includes details of how to commit:
 
 https://github.com/micropython/micropython/blob/master/CODECONVENTIONS.md

From bd7c92e17d7544ad840038ef74b1998854060090 Mon Sep 17 00:00:00 2001
From: David Lechner <david@pybricks.com>
Date: Sat, 13 Jun 2020 13:03:00 -0500
Subject: [PATCH 0072/3533] tools/uncrustify.cfg: Remove deprecated
 sp_word_brace option.

This option was removed in uncrustify v0.71.

Signed-off-by: David Lechner <david@pybricks.com>
---
 tools/uncrustify.cfg | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/tools/uncrustify.cfg b/tools/uncrustify.cfg
index b0b1239b1a1fb..da422ceb0f4d7 100644
--- a/tools/uncrustify.cfg
+++ b/tools/uncrustify.cfg
@@ -1,4 +1,4 @@
-# Uncrustify-0.70.1
+# Uncrustify-0.71.0
 
 #
 # General options
@@ -669,12 +669,6 @@ sp_try_brace                    = ignore   # ignore/add/remove/force
 # Add or remove space between get/set and '{' if on the same line.
 sp_getset_brace                 = ignore   # ignore/add/remove/force
 
-# Add or remove space between a variable and '{' for C++ uniform
-# initialization.
-#
-# Default: add
-sp_word_brace                   = add      # ignore/add/remove/force
-
 # Add or remove space between a variable and '{' for a namespace.
 #
 # Default: add

From ecd782631608636f300d6b885b4f310e546a2b3f Mon Sep 17 00:00:00 2001
From: David Lechner <david@pybricks.com>
Date: Sat, 13 Jun 2020 13:05:48 -0500
Subject: [PATCH 0073/3533] tools/codeformat.py: Remove sizeof fixup.

Formatting for `* sizeof` was fixed in uncrustify v0.71, so we no longer
need the fixups for it.  Also, there was one file where the updated
uncrustify caught a problem that the regex didn't pick up, which is updated
in this commit.

Signed-off-by: David Lechner <david@pybricks.com>
---
 py/objfun.c         | 4 ++--
 tools/codeformat.py | 7 -------
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/py/objfun.c b/py/objfun.c
index 3a63d8f439d2b..f9a6b4ebc2727 100644
--- a/py/objfun.c
+++ b/py/objfun.c
@@ -197,8 +197,8 @@ STATIC void dump_args(const mp_obj_t *a, size_t sz) {
         MP_BC_PRELUDE_SIG_DECODE_INTO(ip, n_state_out_var, n_exc_stack, scope_flags, n_pos_args, n_kwonly_args, n_def_args); \
                                     \
         /* state size in bytes */                                                 \
-        state_size_out_var = n_state_out_var *sizeof(mp_obj_t)                   \
-            + n_exc_stack *sizeof(mp_exc_stack_t);                \
+        state_size_out_var = n_state_out_var * sizeof(mp_obj_t)                   \
+            + n_exc_stack * sizeof(mp_exc_stack_t);                \
     }
 
 #define INIT_CODESTATE(code_state, _fun_bc, _n_state, n_args, n_kw, args) \
diff --git a/tools/codeformat.py b/tools/codeformat.py
index 5aef4ccfbf242..364037d2fac86 100755
--- a/tools/codeformat.py
+++ b/tools/codeformat.py
@@ -76,9 +76,6 @@
 PY_EXTS = (".py",)
 
 
-FIXUP_REPLACEMENTS = ((re.compile("sizeof\(([a-z_]+)\) \*\(([a-z_]+)\)"), r"sizeof(\1) * (\2)"),)
-
-
 def list_files(paths, exclusions=None, prefix=""):
     files = set()
     for pattern in paths:
@@ -124,10 +121,6 @@ def fixup_c(filename):
                     if directive == "endif":
                         dedent_stack.pop()
 
-            # Apply general regex-based fixups.
-            for regex, replacement in FIXUP_REPLACEMENTS:
-                l = regex.sub(replacement, l)
-
             # Write out line.
             f.write(l)
 

From b4d0d7bf03a787237740b80d2ecdeb0a3ce1d4ff Mon Sep 17 00:00:00 2001
From: David Lechner <david@pybricks.com>
Date: Sun, 14 Jun 2020 11:02:19 -0500
Subject: [PATCH 0074/3533] tools/uncrustify: Update config for v0.71.0.

This is the result of running...

    uncrustify -c tools/uncrustify.cfg --update-config-with-doc -o tools/uncrustify.cfg

...with some manual fixups to correct places where it changed things it
should not have.

Essentially it just adds new config parameters introduced in v0.71.0
with their default values.

Signed-off-by: David Lechner <david@pybricks.com>
---
 tools/uncrustify.cfg | 118 +++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 114 insertions(+), 4 deletions(-)

diff --git a/tools/uncrustify.cfg b/tools/uncrustify.cfg
index da422ceb0f4d7..96b471742cc51 100644
--- a/tools/uncrustify.cfg
+++ b/tools/uncrustify.cfg
@@ -1,4 +1,4 @@
-# Uncrustify-0.71.0
+# Uncrustify-0.71.0_f
 
 #
 # General options
@@ -37,13 +37,18 @@ string_replace_tab_chars        = false    # true/false
 # Improvements to template detection may make this option obsolete.
 tok_split_gte                   = false    # true/false
 
+# Disable formatting of NL_CONT ('\\n') ended lines (e.g. multiline macros)
+disable_processing_nl_cont      = false    # true/false
+
 # Specify the marker used in comments to disable processing of part of the
 # file.
+# The comment should be used alone in one line.
 #
 # Default:  *INDENT-OFF*
 disable_processing_cmt          = " *FORMAT-OFF*"      # string
 
 # Specify the marker used in comments to (re)enable processing in a file.
+# The comment should be used alone in one line.
 #
 # Default:  *INDENT-ON*
 enable_processing_cmt           = " *FORMAT-ON*"     # string
@@ -604,6 +609,10 @@ sp_catch_paren                  = ignore   # ignore/add/remove/force
 # in '@catch (something) { }'. If set to ignore, sp_catch_paren is used.
 sp_oc_catch_paren               = ignore   # ignore/add/remove/force
 
+# (OC) Add or remove space before Objective-C protocol list
+# as in '@protocol Protocol<here><Protocol_A>' or '@interface MyClass : NSObject<here><MyProtocol>'.
+sp_before_oc_proto_list         = ignore   # ignore/add/remove/force
+
 # (OC) Add or remove space between class name and '('
 # in '@interface className(categoryName)<ProtocolName>:BaseClass'
 sp_oc_classname_paren           = ignore   # ignore/add/remove/force
@@ -669,6 +678,10 @@ sp_try_brace                    = ignore   # ignore/add/remove/force
 # Add or remove space between get/set and '{' if on the same line.
 sp_getset_brace                 = ignore   # ignore/add/remove/force
 
+# Add or remove space between a variable and '{' for C++ uniform
+# initialization.
+sp_word_brace_init_lst          = ignore   # ignore/add/remove/force
+
 # Add or remove space between a variable and '{' for a namespace.
 #
 # Default: add
@@ -1107,6 +1120,10 @@ indent_member_single            = false    # true/false
 # Spaces to indent single line ('//') comments on lines before code.
 indent_sing_line_comments       = 0        # unsigned number
 
+# When opening a paren for a control statement (if, for, while, etc), increase
+# the indent level by this value. Negative values decrease the indent level.
+indent_sparen_extra             = 0        # number
+
 # Whether to indent trailing single line ('//') comments relative to the code
 # instead of trying to keep the same absolute column.
 indent_relative_single_line_comments = false    # true/false
@@ -1213,12 +1230,19 @@ indent_preserve_sql             = false    # true/false
 # Default: true
 indent_align_assign             = false    # true/false
 
+# If true, the indentation of the chunks after a '=' sequence will be set at
+# LHS token indentation column before '='.
+indent_off_after_assign         = false    # true/false
+
 # Whether to align continued statements at the '('. If false or the '(' is
 # followed by a newline, the next line indent is one tab.
 #
 # Default: true
 indent_align_paren              = false    # true/false
 
+# (OC) Whether to indent Objective-C code inside message selectors.
+indent_oc_inside_msg_sel        = false    # true/false
+
 # (OC) Whether to indent Objective-C blocks at brace level instead of usual
 # rules.
 indent_oc_block                 = false    # true/false
@@ -1278,6 +1302,15 @@ indent_token_after_brace        = true     # true/false
 # Whether to indent the body of a C++11 lambda.
 indent_cpp_lambda_body          = false    # true/false
 
+# How to indent compound literals that are being returned.
+# true: add both the indent from return & the compound literal open brace (ie:
+#       2 indent levels)
+# false: only indent 1 level, don't add the indent for the open brace, only add
+#        the indent for the return.
+#
+# Default: true
+indent_compound_literal_return  = true     # true/false
+
 # (C#) Whether to indent a 'using' block if no braces are used.
 #
 # Default: true
@@ -1290,6 +1323,12 @@ indent_using_block              = true     # true/false
 # 2: When the `:` is a continuation, indent it under `?`
 indent_ternary_operator         = 0        # unsigned number
 
+# Whether to indent the statments inside ternary operator.
+indent_inside_ternary_operator  = false    # true/false
+
+# If true, the indentation of the chunks after a `return` sequence will be set at return indentation column.
+indent_off_after_return         = false    # true/false
+
 # If true, the indentation of the chunks after a `return new` sequence will be set at return indentation column.
 indent_off_after_return_new     = false    # true/false
 
@@ -1323,7 +1362,7 @@ nl_getset_leave_one_liners      = false    # true/false
 nl_cs_property_leave_one_liners = false    # true/false
 
 # Don't split one-line function definitions, as in 'int foo() { return 0; }'.
-# night modify nl_func_type_name
+# might modify nl_func_type_name
 nl_func_leave_one_liners        = false    # true/false
 
 # Don't split one-line C++11 lambdas, as in '[]() { return 0; }'.
@@ -1430,6 +1469,9 @@ nl_else_brace                   = remove   # ignore/add/remove/force
 # Add or remove newline between 'else' and 'if'.
 nl_else_if                      = ignore   # ignore/add/remove/force
 
+# Add or remove newline before '{' opening brace
+nl_before_opening_brace_func_class_def = ignore   # ignore/add/remove/force
+
 # Add or remove newline before 'if'/'else if' closing parenthesis.
 nl_before_if_closing_paren      = ignore   # ignore/add/remove/force
 
@@ -1678,6 +1720,9 @@ nl_func_decl_args               = ignore   # ignore/add/remove/force
 # Add or remove newline after each ',' in a function definition.
 nl_func_def_args                = ignore   # ignore/add/remove/force
 
+# Add or remove newline after each ',' in a function call.
+nl_func_call_args               = ignore   # ignore/add/remove/force
+
 # Whether to add a newline after each ',' in a function declaration if '('
 # and ')' are in different lines. If false, nl_func_decl_args is used instead.
 nl_func_decl_args_multi_line    = false    # true/false
@@ -1719,6 +1764,9 @@ nl_func_call_empty              = ignore   # ignore/add/remove/force
 # has preference over nl_func_call_start_multi_line.
 nl_func_call_start              = ignore   # ignore/add/remove/force
 
+# Whether to add a newline before ')' in a function call.
+nl_func_call_end                = ignore   # ignore/add/remove/force
+
 # Whether to add a newline after '(' in a function call if '(' and ')' are in
 # different lines.
 nl_func_call_start_multi_line   = false    # true/false
@@ -1731,6 +1779,9 @@ nl_func_call_args_multi_line    = false    # true/false
 # different lines.
 nl_func_call_end_multi_line     = false    # true/false
 
+# Whether to respect nl_func_call_XXX option incase of closure args.
+nl_func_call_args_multi_line_ignore_closures = false    # true/false
+
 # Whether to add a newline after '<' of a template parameter list.
 nl_template_start               = false    # true/false
 
@@ -1865,7 +1916,7 @@ nl_before_return                = false    # true/false
 # close brace.
 nl_after_return                 = false    # true/false
 
-# (Java) Whether to put a blank line before a member '.' or '->' operators.
+# Whether to put a blank line before a member '.' or '->' operators.
 nl_before_member                = ignore   # ignore/add/remove/force
 
 # (Java) Whether to put a blank line after a member '.' or '->' operators.
@@ -2128,6 +2179,26 @@ nl_after_annotation             = ignore   # ignore/add/remove/force
 # (Java) Add or remove newline between two annotations.
 nl_between_annotation           = ignore   # ignore/add/remove/force
 
+# The number of newlines before a whole-file #ifdef.
+#
+# 0: No change (default).
+nl_before_whole_file_ifdef      = 0        # unsigned number
+
+# The number of newlines after a whole-file #ifdef.
+#
+# 0: No change (default).
+nl_after_whole_file_ifdef       = 0        # unsigned number
+
+# The number of newlines before a whole-file #endif.
+#
+# 0: No change (default).
+nl_before_whole_file_endif      = 0        # unsigned number
+
+# The number of newlines after a whole-file #endif.
+#
+# 0: No change (default).
+nl_after_whole_file_endif       = 0        # unsigned number
+
 #
 # Positioning options
 #
@@ -2497,6 +2568,11 @@ align_oc_msg_colon_first        = false    # true/false
 # on the ':'.
 align_oc_decl_colon             = false    # true/false
 
+# (OC) Whether to not align parameters in an Objectve-C message call if first
+# colon is not on next line of the message call (the same way Xcode does
+# aligment)
+align_oc_msg_colon_xcode_like   = false    # true/false
+
 #
 # Comment modification options
 #
@@ -2728,6 +2804,25 @@ mod_sort_using                  = false    # true/false
 # break your code if your includes/imports have ordering dependencies.
 mod_sort_include                = false    # true/false
 
+# Whether to prioritize '#include' and '#import' statements that contain
+# filename without extension when sorting is enabled.
+mod_sort_incl_import_prioritize_filename = false    # true/false
+
+# Whether to prioritize '#include' and '#import' statements that does not
+# contain extensions when sorting is enabled.
+mod_sort_incl_import_prioritize_extensionless = false    # true/false
+
+# Whether to prioritize '#include' and '#import' statements that contain
+# angle over quotes when sorting is enabled.
+mod_sort_incl_import_prioritize_angle_over_quotes = false    # true/false
+
+# Whether to ignore file extension in '#include' and '#import' statements
+# for sorting comparison.
+mod_sort_incl_import_ignore_extension = false    # true/false
+
+# Whether to group '#include' and '#import' statements when sorting is enabled.
+mod_sort_incl_import_grouping_enabled = false    # true/false
+
 # Whether to move a 'break' that appears after a fully braced 'case' before
 # the close brace, as in 'case X: { ... } break;' => 'case X: { ... break; }'.
 mod_move_case_break             = false    # true/false
@@ -2914,6 +3009,11 @@ use_sp_after_angle_always       = false    # true/false
 # Default: true
 use_options_overriding_for_qt_macros = true     # true/false
 
+# If true: the form feed character is removed from the list
+# of whitespace characters.
+# See https://en.cppreference.com/w/cpp/string/byte/isspace
+use_form_feed_no_more_as_whitespace_character = false    # true/false
+
 #
 # Warn levels - 1: error, 2: warning (default), 3: note
 #
@@ -2924,6 +3024,16 @@ use_options_overriding_for_qt_macros = true     # true/false
 # Default: 2
 warn_level_tabs_found_in_verbatim_string_literals = 2        # unsigned number
 
+# Limit the number of loops.
+# Used by uncrustify.cpp to exit from infinite loop.
+# 0: no limit.
+debug_max_number_of_loops       = 0        # number
+
+# Set the number of the line to protocol;
+# Used in the function prot_the_line if the 2. parameter is zero.
+# 0: nothing protocol.
+debug_line_number_to_protocol   = 0        # number
+
 # Meaning of the settings:
 #   Ignore - do not do any changes
 #   Add    - makes sure there is 1 or more space/brace/newline/etc
@@ -2976,7 +3086,7 @@ warn_level_tabs_found_in_verbatim_string_literals = 2        # unsigned number
 #       `macro-close END_MESSAGE_MAP`
 #
 #
-# option(s) with 'not default' value: 0
+# option(s) with 'not default' value: 67
 #
 
 # Custom types for MicroPython

From 0fd91e39b1711772c88cfe4e0aaf817fe3387ba6 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 16 Jun 2020 21:42:37 +1000
Subject: [PATCH 0075/3533] py/compile: Convert scope test to
 SCOPE_IS_COMP_LIKE macro.

This macro can be used elsewhere.
---
 py/compile.c | 2 +-
 py/scope.h   | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/py/compile.c b/py/compile.c
index 22f47ee0d295f..8835ec2f8d06d 100644
--- a/py/compile.c
+++ b/py/compile.c
@@ -3083,7 +3083,7 @@ STATIC void compile_scope(compiler_t *comp, scope_t *scope, pass_kind_t pass) {
             EMIT_ARG(load_const_tok, MP_TOKEN_KW_NONE);
         }
         EMIT(return_value);
-    } else if (scope->kind == SCOPE_LIST_COMP || scope->kind == SCOPE_DICT_COMP || scope->kind == SCOPE_SET_COMP || scope->kind == SCOPE_GEN_EXPR) {
+    } else if (SCOPE_IS_COMP_LIKE(scope->kind)) {
         // a bit of a hack at the moment
 
         assert(MP_PARSE_NODE_IS_STRUCT(scope->pn));
diff --git a/py/scope.h b/py/scope.h
index ba07c39498b5a..b52d98ea1c72d 100644
--- a/py/scope.h
+++ b/py/scope.h
@@ -55,6 +55,7 @@ typedef struct _id_info_t {
 } id_info_t;
 
 #define SCOPE_IS_FUNC_LIKE(s) ((s) >= SCOPE_LAMBDA)
+#define SCOPE_IS_COMP_LIKE(s) (SCOPE_LIST_COMP <= (s) && (s) <= SCOPE_GEN_EXPR)
 
 // scope is a "block" in Python parlance
 typedef enum {

From 178395031157f61af5426add2de1d76d91440b21 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 16 Jun 2020 21:42:44 +1000
Subject: [PATCH 0076/3533] py/compile: Implement PEP 572, assignment
 expressions with := operator.

The syntax matches CPython and the semantics are equivalent except that,
unlike CPython, MicroPython allows using := to assign to comprehension
iteration variables, because disallowing this would take a lot of code to
check for it.

The new compile-time option MICROPY_PY_ASSIGN_EXPR selects this feature and
is enabled by default, following MICROPY_PY_ASYNC_AWAIT.
---
 py/compile.c                       | 29 ++++++++++++++++++++++++++++-
 py/grammar.h                       | 21 ++++++++++++++++-----
 py/lexer.c                         |  6 ++++--
 py/lexer.h                         |  1 +
 py/mpconfig.h                      |  5 +++++
 tests/cmdline/cmd_parsetree.py.exp |  2 +-
 6 files changed, 55 insertions(+), 9 deletions(-)

diff --git a/py/compile.c b/py/compile.c
index 8835ec2f8d06d..da5c9190a3ef4 100644
--- a/py/compile.c
+++ b/py/compile.c
@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2013-2015 Damien P. George
+ * Copyright (c) 2013-2020 Damien P. George
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -2108,6 +2108,27 @@ STATIC void compile_lambdef(compiler_t *comp, mp_parse_node_struct_t *pns) {
     compile_funcdef_lambdef(comp, this_scope, pns->nodes[0], PN_varargslist);
 }
 
+#if MICROPY_PY_ASSIGN_EXPR
+STATIC void compile_namedexpr_helper(compiler_t *comp, mp_parse_node_t pn_name, mp_parse_node_t pn_expr) {
+    if (!MP_PARSE_NODE_IS_ID(pn_name)) {
+        compile_syntax_error(comp, (mp_parse_node_t)pn_name, MP_ERROR_TEXT("can't assign to expression"));
+    }
+    compile_node(comp, pn_expr);
+    EMIT(dup_top);
+    scope_t *old_scope = comp->scope_cur;
+    if (SCOPE_IS_COMP_LIKE(comp->scope_cur->kind)) {
+        // Use parent's scope for assigned value so it can "escape"
+        comp->scope_cur = comp->scope_cur->parent;
+    }
+    compile_store_id(comp, MP_PARSE_NODE_LEAF_ARG(pn_name));
+    comp->scope_cur = old_scope;
+}
+
+STATIC void compile_namedexpr(compiler_t *comp, mp_parse_node_struct_t *pns) {
+    compile_namedexpr_helper(comp, pns->nodes[0], pns->nodes[1]);
+}
+#endif
+
 STATIC void compile_or_and_test(compiler_t *comp, mp_parse_node_struct_t *pns) {
     bool cond = MP_PARSE_NODE_STRUCT_KIND(pns) == PN_or_test;
     uint l_end = comp_next_label(comp);
@@ -2353,6 +2374,12 @@ STATIC void compile_trailer_paren_helper(compiler_t *comp, mp_parse_node_t pn_ar
                 star_flags |= MP_EMIT_STAR_FLAG_DOUBLE;
                 dblstar_args_node = pns_arg;
             } else if (MP_PARSE_NODE_STRUCT_KIND(pns_arg) == PN_argument) {
+                #if MICROPY_PY_ASSIGN_EXPR
+                if (MP_PARSE_NODE_IS_STRUCT_KIND(pns_arg->nodes[1], PN_argument_4)) {
+                    compile_namedexpr_helper(comp, pns_arg->nodes[0], ((mp_parse_node_struct_t *)pns_arg->nodes[1])->nodes[0]);
+                    n_positional++;
+                } else
+                #endif
                 if (!MP_PARSE_NODE_IS_STRUCT_KIND(pns_arg->nodes[1], PN_comp_for)) {
                     if (!MP_PARSE_NODE_IS_ID(pns_arg->nodes[0])) {
                         compile_syntax_error(comp, (mp_parse_node_t)pns_arg, MP_ERROR_TEXT("LHS of keyword arg must be an id"));
diff --git a/py/grammar.h b/py/grammar.h
index c3d30cdf7c467..f5f1ff666d9e3 100644
--- a/py/grammar.h
+++ b/py/grammar.h
@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2013-2015 Damien P. George
+ * Copyright (c) 2013-2020 Damien P. George
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -184,10 +184,10 @@ DEF_RULE_NC(async_stmt_2, or(3), rule(funcdef), rule(with_stmt), rule(for_stmt))
 #else
 DEF_RULE_NC(compound_stmt, or(8), rule(if_stmt), rule(while_stmt), rule(for_stmt), rule(try_stmt), rule(with_stmt), rule(funcdef), rule(classdef), rule(decorated))
 #endif
-DEF_RULE(if_stmt, c(if_stmt), and(6), tok(KW_IF), rule(test), tok(DEL_COLON), rule(suite), opt_rule(if_stmt_elif_list), opt_rule(else_stmt))
+DEF_RULE(if_stmt, c(if_stmt), and(6), tok(KW_IF), rule(namedexpr_test), tok(DEL_COLON), rule(suite), opt_rule(if_stmt_elif_list), opt_rule(else_stmt))
 DEF_RULE_NC(if_stmt_elif_list, one_or_more, rule(if_stmt_elif))
-DEF_RULE_NC(if_stmt_elif, and(4), tok(KW_ELIF), rule(test), tok(DEL_COLON), rule(suite))
-DEF_RULE(while_stmt, c(while_stmt), and(5), tok(KW_WHILE), rule(test), tok(DEL_COLON), rule(suite), opt_rule(else_stmt))
+DEF_RULE_NC(if_stmt_elif, and(4), tok(KW_ELIF), rule(namedexpr_test), tok(DEL_COLON), rule(suite))
+DEF_RULE(while_stmt, c(while_stmt), and(5), tok(KW_WHILE), rule(namedexpr_test), tok(DEL_COLON), rule(suite), opt_rule(else_stmt))
 DEF_RULE(for_stmt, c(for_stmt), and(7), tok(KW_FOR), rule(exprlist), tok(KW_IN), rule(testlist), tok(DEL_COLON), rule(suite), opt_rule(else_stmt))
 DEF_RULE(try_stmt, c(try_stmt), and(4), tok(KW_TRY), tok(DEL_COLON), rule(suite), rule(try_stmt_2))
 DEF_RULE_NC(try_stmt_2, or(2), rule(try_stmt_except_and_more), rule(try_stmt_finally))
@@ -210,6 +210,12 @@ DEF_RULE(suite_block_stmts, c(generic_all_nodes), one_or_more, rule(stmt))
 // lambdef: 'lambda' [varargslist] ':' test
 // lambdef_nocond: 'lambda' [varargslist] ':' test_nocond
 
+#if MICROPY_PY_ASSIGN_EXPR
+DEF_RULE(namedexpr_test, c(namedexpr), and_ident(2), rule(test), opt_rule(namedexpr_test_2))
+DEF_RULE_NC(namedexpr_test_2, and_ident(2), tok(OP_ASSIGN), rule(test))
+#else
+DEF_RULE_NC(namedexpr_test, or(1), rule(test))
+#endif
 DEF_RULE_NC(test, or(2), rule(lambdef), rule(test_if_expr))
 DEF_RULE(test_if_expr, c(test_if_expr), and_ident(2), rule(or_test), opt_rule(test_if_else))
 DEF_RULE_NC(test_if_else, and(4), tok(KW_IF), rule(or_test), tok(KW_ELSE), rule(test))
@@ -276,7 +282,7 @@ DEF_RULE_NC(atom_2b, or(2), rule(yield_expr), rule(testlist_comp))
 DEF_RULE(atom_bracket, c(atom_bracket), and(3), tok(DEL_BRACKET_OPEN), opt_rule(testlist_comp), tok(DEL_BRACKET_CLOSE))
 DEF_RULE(atom_brace, c(atom_brace), and(3), tok(DEL_BRACE_OPEN), opt_rule(dictorsetmaker), tok(DEL_BRACE_CLOSE))
 DEF_RULE_NC(testlist_comp, and_ident(2), rule(testlist_comp_2), opt_rule(testlist_comp_3))
-DEF_RULE_NC(testlist_comp_2, or(2), rule(star_expr), rule(test))
+DEF_RULE_NC(testlist_comp_2, or(2), rule(star_expr), rule(namedexpr_test))
 DEF_RULE_NC(testlist_comp_3, or(2), rule(comp_for), rule(testlist_comp_3b))
 DEF_RULE_NC(testlist_comp_3b, and_ident(2), tok(DEL_COMMA), opt_rule(testlist_comp_3c))
 DEF_RULE_NC(testlist_comp_3c, list_with_end, rule(testlist_comp_2), tok(DEL_COMMA))
@@ -342,7 +348,12 @@ DEF_RULE_NC(arglist_dbl_star, and(2), tok(OP_DBL_STAR), rule(test))
 // comp_if: 'if' test_nocond [comp_iter]
 
 DEF_RULE_NC(argument, and_ident(2), rule(test), opt_rule(argument_2))
+#if MICROPY_PY_ASSIGN_EXPR
+DEF_RULE_NC(argument_2, or(3), rule(comp_for), rule(argument_3), rule(argument_4))
+DEF_RULE_NC(argument_4, and(2), tok(OP_ASSIGN), rule(test))
+#else
 DEF_RULE_NC(argument_2, or(2), rule(comp_for), rule(argument_3))
+#endif
 DEF_RULE_NC(argument_3, and_ident(2), tok(DEL_EQUAL), rule(test))
 DEF_RULE_NC(comp_iter, or(2), rule(comp_for), rule(comp_if))
 DEF_RULE_NC(comp_for, and_blank(5), tok(KW_FOR), rule(exprlist), tok(KW_IN), rule(or_test), opt_rule(comp_iter))
diff --git a/py/lexer.c b/py/lexer.c
index 10bb999af6b70..7d2a251d41d75 100644
--- a/py/lexer.c
+++ b/py/lexer.c
@@ -174,7 +174,8 @@ STATIC void indent_pop(mp_lexer_t *lex) {
 // this means if the start of two ops are the same then they are equal til the last char
 
 STATIC const char *const tok_enc =
-    "()[]{},:;~" // singles
+    "()[]{},;~"   // singles
+    ":e="         // : :=
     "<e=c<e="     // < <= << <<=
     ">e=c>e="     // > >= >> >>=
     "*e=c*e="     // * *= ** **=
@@ -194,8 +195,9 @@ STATIC const uint8_t tok_enc_kind[] = {
     MP_TOKEN_DEL_PAREN_OPEN, MP_TOKEN_DEL_PAREN_CLOSE,
     MP_TOKEN_DEL_BRACKET_OPEN, MP_TOKEN_DEL_BRACKET_CLOSE,
     MP_TOKEN_DEL_BRACE_OPEN, MP_TOKEN_DEL_BRACE_CLOSE,
-    MP_TOKEN_DEL_COMMA, MP_TOKEN_DEL_COLON, MP_TOKEN_DEL_SEMICOLON, MP_TOKEN_OP_TILDE,
+    MP_TOKEN_DEL_COMMA, MP_TOKEN_DEL_SEMICOLON, MP_TOKEN_OP_TILDE,
 
+    MP_TOKEN_DEL_COLON, MP_TOKEN_OP_ASSIGN,
     MP_TOKEN_OP_LESS, MP_TOKEN_OP_LESS_EQUAL, MP_TOKEN_OP_DBL_LESS, MP_TOKEN_DEL_DBL_LESS_EQUAL,
     MP_TOKEN_OP_MORE, MP_TOKEN_OP_MORE_EQUAL, MP_TOKEN_OP_DBL_MORE, MP_TOKEN_DEL_DBL_MORE_EQUAL,
     MP_TOKEN_OP_STAR, MP_TOKEN_DEL_STAR_EQUAL, MP_TOKEN_OP_DBL_STAR, MP_TOKEN_DEL_DBL_STAR_EQUAL,
diff --git a/py/lexer.h b/py/lexer.h
index b9f97013a1bd9..91767a44bf991 100644
--- a/py/lexer.h
+++ b/py/lexer.h
@@ -96,6 +96,7 @@ typedef enum _mp_token_kind_t {
     MP_TOKEN_KW_WITH,
     MP_TOKEN_KW_YIELD,
 
+    MP_TOKEN_OP_ASSIGN,
     MP_TOKEN_OP_TILDE,
 
     // Order of these 6 matches corresponding mp_binary_op_t operator
diff --git a/py/mpconfig.h b/py/mpconfig.h
index 27df3f483a0e1..287b15aaef32f 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -835,6 +835,11 @@ typedef double mp_float_t;
 #define MICROPY_PY_ASYNC_AWAIT (1)
 #endif
 
+// Support for assignment expressions with := (see PEP 572, Python 3.8+)
+#ifndef MICROPY_PY_ASSIGN_EXPR
+#define MICROPY_PY_ASSIGN_EXPR (1)
+#endif
+
 // Non-standard .pend_throw() method for generators, allowing for
 // Future-like behavior with respect to exception handling: an
 // exception set with .pend_throw() will activate on the next call
diff --git a/tests/cmdline/cmd_parsetree.py.exp b/tests/cmdline/cmd_parsetree.py.exp
index 18986318a02b4..42a8228fb77e1 100644
--- a/tests/cmdline/cmd_parsetree.py.exp
+++ b/tests/cmdline/cmd_parsetree.py.exp
@@ -3,7 +3,7 @@
          tok(4)
 [   4]   rule(22) (n=4)
            id(i)
-[   4]     rule(44) (n=1)
+[   4]     rule(45) (n=1)
              NULL
 [   5]     rule(8) (n=0)
            NULL

From 2c5993c59e083d11ba8b85e82eeea9c5020ac553 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 16 Jun 2020 21:42:48 +1000
Subject: [PATCH 0077/3533] ports: Disable MICROPY_PY_ASSIGN_EXPR in bare-arm
 and minimal ports.

To keep these ports as minimal as possible.
---
 ports/bare-arm/mpconfigport.h | 1 +
 ports/minimal/mpconfigport.h  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/ports/bare-arm/mpconfigport.h b/ports/bare-arm/mpconfigport.h
index 4567676580324..7fd236bfba9e4 100644
--- a/ports/bare-arm/mpconfigport.h
+++ b/ports/bare-arm/mpconfigport.h
@@ -21,6 +21,7 @@
 #define MICROPY_ERROR_REPORTING     (MICROPY_ERROR_REPORTING_TERSE)
 #define MICROPY_BUILTIN_METHOD_CHECK_SELF_ARG (0)
 #define MICROPY_PY_ASYNC_AWAIT (0)
+#define MICROPY_PY_ASSIGN_EXPR      (0)
 #define MICROPY_PY_BUILTINS_BYTEARRAY (0)
 #define MICROPY_PY_BUILTINS_DICT_FROMKEYS (0)
 #define MICROPY_PY_BUILTINS_MEMORYVIEW (0)
diff --git a/ports/minimal/mpconfigport.h b/ports/minimal/mpconfigport.h
index c3bdf66c10ae2..b34217f68019a 100644
--- a/ports/minimal/mpconfigport.h
+++ b/ports/minimal/mpconfigport.h
@@ -19,6 +19,7 @@
 #define MICROPY_ERROR_REPORTING     (MICROPY_ERROR_REPORTING_TERSE)
 #define MICROPY_BUILTIN_METHOD_CHECK_SELF_ARG (0)
 #define MICROPY_PY_ASYNC_AWAIT      (0)
+#define MICROPY_PY_ASSIGN_EXPR      (0)
 #define MICROPY_PY_BUILTINS_BYTEARRAY (0)
 #define MICROPY_PY_BUILTINS_DICT_FROMKEYS (0)
 #define MICROPY_PY_BUILTINS_ENUMERATE (0)

From e0fe8ea644b54406ca82cefdc73c98cc2e9cbe9f Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 16 Jun 2020 21:42:50 +1000
Subject: [PATCH 0078/3533] tests/basics: Add tests for assignment operator :=.

---
 tests/basics/assign_expr.py                 | 29 +++++++++++++++++++++
 tests/basics/assign_expr.py.exp             | 14 ++++++++++
 tests/basics/assign_expr_syntaxerror.py     | 16 ++++++++++++
 tests/basics/assign_expr_syntaxerror.py.exp |  6 +++++
 4 files changed, 65 insertions(+)
 create mode 100644 tests/basics/assign_expr.py
 create mode 100644 tests/basics/assign_expr.py.exp
 create mode 100644 tests/basics/assign_expr_syntaxerror.py
 create mode 100644 tests/basics/assign_expr_syntaxerror.py.exp

diff --git a/tests/basics/assign_expr.py b/tests/basics/assign_expr.py
new file mode 100644
index 0000000000000..f243905dc2a63
--- /dev/null
+++ b/tests/basics/assign_expr.py
@@ -0,0 +1,29 @@
+(x := 4)
+print(x)
+
+if x := 2:
+    print(True)
+print(x)
+
+print(4, x := 5)
+print(x)
+
+x = 1
+print(x, x := 5, x)
+print(x)
+
+
+def foo():
+    print("any", any((hit := i) % 5 == 3 and (hit % 2) == 0 for i in range(10)))
+    return hit
+
+
+hit = 123
+print(foo())
+print(hit)  # shouldn't be changed by foo
+
+print("any", any((hit := i) % 5 == 3 and (hit % 2) == 0 for i in range(10)))
+print(hit)  # should be changed by above
+
+print([((m := k + 1), k * m) for k in range(4)])
+print(m)
diff --git a/tests/basics/assign_expr.py.exp b/tests/basics/assign_expr.py.exp
new file mode 100644
index 0000000000000..e38e1ae7a626c
--- /dev/null
+++ b/tests/basics/assign_expr.py.exp
@@ -0,0 +1,14 @@
+4
+True
+2
+4 5
+5
+1 5 5
+5
+any True
+8
+123
+any True
+8
+[(1, 0), (2, 2), (3, 6), (4, 12)]
+4
diff --git a/tests/basics/assign_expr_syntaxerror.py b/tests/basics/assign_expr_syntaxerror.py
new file mode 100644
index 0000000000000..11b3501292546
--- /dev/null
+++ b/tests/basics/assign_expr_syntaxerror.py
@@ -0,0 +1,16 @@
+# test SyntaxError with := operator
+
+def test(code):
+    try:
+        print(eval(code))
+    except SyntaxError:
+        print('SyntaxError')
+
+test("x := 1")
+test("((x, y) := 1)")
+
+# these are currently all allowed in MicroPython, but not in CPython
+test("([i := i + 1 for i in range(4)])")
+test("([i := -1 for i, j in [(1, 2)]])")
+test("([[(i := j) for i in range(2)] for j in range(2)])")
+test("([[(j := i) for i in range(2)] for j in range(2)])")
diff --git a/tests/basics/assign_expr_syntaxerror.py.exp b/tests/basics/assign_expr_syntaxerror.py.exp
new file mode 100644
index 0000000000000..2ba7d7df869eb
--- /dev/null
+++ b/tests/basics/assign_expr_syntaxerror.py.exp
@@ -0,0 +1,6 @@
+SyntaxError
+SyntaxError
+[1, 2, 3, 4]
+[-1]
+[[0, 0], [1, 1]]
+[[0, 1], [0, 1]]

From a3c89cf907a3c2b7235ea86e9a229335212b9020 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 16 Jun 2020 21:42:52 +1000
Subject: [PATCH 0079/3533] tests/cpydiff: Add CPy diff test for assignment
 expression behaviour.

---
 tests/cpydiff/syntax_assign_expr.py | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 tests/cpydiff/syntax_assign_expr.py

diff --git a/tests/cpydiff/syntax_assign_expr.py b/tests/cpydiff/syntax_assign_expr.py
new file mode 100644
index 0000000000000..d4ed063b39ae7
--- /dev/null
+++ b/tests/cpydiff/syntax_assign_expr.py
@@ -0,0 +1,7 @@
+"""
+categories: Syntax,Operators
+description: MicroPython allows using := to assign to the variable of a comprehension, CPython raises a SyntaxError.
+cause: MicroPython is optimised for code size and doesn't check this case.
+workaround: Do not rely on this behaviour if writing CPython compatible code.
+"""
+print([i := -1 for i in range(4)])

From 131b0de70a47861c266d2ac7c26ae643f679d2f7 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 16 Jun 2020 22:48:46 +1000
Subject: [PATCH 0080/3533] py/grammar.h: Consolidate duplicate sub-rules for
 :test and =test.

---
 py/compile.c |  2 +-
 py/grammar.h | 26 +++++++++++++-------------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/py/compile.c b/py/compile.c
index da5c9190a3ef4..614e851a3d8ac 100644
--- a/py/compile.c
+++ b/py/compile.c
@@ -2375,7 +2375,7 @@ STATIC void compile_trailer_paren_helper(compiler_t *comp, mp_parse_node_t pn_ar
                 dblstar_args_node = pns_arg;
             } else if (MP_PARSE_NODE_STRUCT_KIND(pns_arg) == PN_argument) {
                 #if MICROPY_PY_ASSIGN_EXPR
-                if (MP_PARSE_NODE_IS_STRUCT_KIND(pns_arg->nodes[1], PN_argument_4)) {
+                if (MP_PARSE_NODE_IS_STRUCT_KIND(pns_arg->nodes[1], PN_argument_3)) {
                     compile_namedexpr_helper(comp, pns_arg->nodes[0], ((mp_parse_node_struct_t *)pns_arg->nodes[1])->nodes[0]);
                     n_positional++;
                 } else
diff --git a/py/grammar.h b/py/grammar.h
index f5f1ff666d9e3..ff8e61828e862 100644
--- a/py/grammar.h
+++ b/py/grammar.h
@@ -30,6 +30,11 @@
 // - zero_or_more is implemented using opt_rule around a one_or_more rule
 // - don't put opt_rule in arguments of or rule; instead, wrap the call to this or rule in opt_rule
 
+// Generic sub-rules used by multiple rules below.
+
+DEF_RULE_NC(generic_colon_test, and_ident(2), tok(DEL_COLON), rule(test))
+DEF_RULE_NC(generic_equal_test, and_ident(2), tok(DEL_EQUAL), rule(test))
+
 // # Start symbols for the grammar:
 // #       single_input is a single interactive statement;
 // #       file_input is a module or sequence of commands read from an input file;
@@ -71,19 +76,16 @@ DEF_RULE_NC(funcdefrettype, and_ident(2), tok(DEL_MINUS_MORE), rule(test))
 // note: typedargslist lets through more than is allowed, compiler does further checks
 DEF_RULE_NC(typedargslist, list_with_end, rule(typedargslist_item), tok(DEL_COMMA))
 DEF_RULE_NC(typedargslist_item, or(3), rule(typedargslist_name), rule(typedargslist_star), rule(typedargslist_dbl_star))
-DEF_RULE_NC(typedargslist_name, and_ident(3), tok(NAME), opt_rule(typedargslist_colon), opt_rule(typedargslist_equal))
+DEF_RULE_NC(typedargslist_name, and_ident(3), tok(NAME), opt_rule(generic_colon_test), opt_rule(generic_equal_test))
 DEF_RULE_NC(typedargslist_star, and(2), tok(OP_STAR), opt_rule(tfpdef))
-DEF_RULE_NC(typedargslist_dbl_star, and(3), tok(OP_DBL_STAR), tok(NAME), opt_rule(typedargslist_colon))
-DEF_RULE_NC(typedargslist_colon, and_ident(2), tok(DEL_COLON), rule(test))
-DEF_RULE_NC(typedargslist_equal, and_ident(2), tok(DEL_EQUAL), rule(test))
-DEF_RULE_NC(tfpdef, and(2), tok(NAME), opt_rule(typedargslist_colon))
+DEF_RULE_NC(typedargslist_dbl_star, and(3), tok(OP_DBL_STAR), tok(NAME), opt_rule(generic_colon_test))
+DEF_RULE_NC(tfpdef, and(2), tok(NAME), opt_rule(generic_colon_test))
 // note: varargslist lets through more than is allowed, compiler does further checks
 DEF_RULE_NC(varargslist, list_with_end, rule(varargslist_item), tok(DEL_COMMA))
 DEF_RULE_NC(varargslist_item, or(3), rule(varargslist_name), rule(varargslist_star), rule(varargslist_dbl_star))
-DEF_RULE_NC(varargslist_name, and_ident(2), tok(NAME), opt_rule(varargslist_equal))
+DEF_RULE_NC(varargslist_name, and_ident(2), tok(NAME), opt_rule(generic_equal_test))
 DEF_RULE_NC(varargslist_star, and(2), tok(OP_STAR), opt_rule(vfpdef))
 DEF_RULE_NC(varargslist_dbl_star, and(2), tok(OP_DBL_STAR), tok(NAME))
-DEF_RULE_NC(varargslist_equal, and_ident(2), tok(DEL_EQUAL), rule(test))
 DEF_RULE_NC(vfpdef, and_ident(1), tok(NAME))
 
 // stmt: compound_stmt | simple_stmt
@@ -318,8 +320,7 @@ DEF_RULE(testlist, c(generic_tuple), list_with_end, rule(test), tok(DEL_COMMA))
 // TODO dictorsetmaker lets through more than is allowed
 DEF_RULE_NC(dictorsetmaker, and_ident(2), rule(dictorsetmaker_item), opt_rule(dictorsetmaker_tail))
 #if MICROPY_PY_BUILTINS_SET
-DEF_RULE(dictorsetmaker_item, c(dictorsetmaker_item), and_ident(2), rule(test), opt_rule(dictorsetmaker_colon))
-DEF_RULE_NC(dictorsetmaker_colon, and_ident(2), tok(DEL_COLON), rule(test))
+DEF_RULE(dictorsetmaker_item, c(dictorsetmaker_item), and_ident(2), rule(test), opt_rule(generic_colon_test))
 #else
 DEF_RULE(dictorsetmaker_item, c(dictorsetmaker_item), and(3), rule(test), tok(DEL_COLON), rule(test))
 #endif
@@ -349,12 +350,11 @@ DEF_RULE_NC(arglist_dbl_star, and(2), tok(OP_DBL_STAR), rule(test))
 
 DEF_RULE_NC(argument, and_ident(2), rule(test), opt_rule(argument_2))
 #if MICROPY_PY_ASSIGN_EXPR
-DEF_RULE_NC(argument_2, or(3), rule(comp_for), rule(argument_3), rule(argument_4))
-DEF_RULE_NC(argument_4, and(2), tok(OP_ASSIGN), rule(test))
+DEF_RULE_NC(argument_2, or(3), rule(comp_for), rule(generic_equal_test), rule(argument_3))
+DEF_RULE_NC(argument_3, and(2), tok(OP_ASSIGN), rule(test))
 #else
-DEF_RULE_NC(argument_2, or(2), rule(comp_for), rule(argument_3))
+DEF_RULE_NC(argument_2, or(2), rule(comp_for), rule(generic_equal_test))
 #endif
-DEF_RULE_NC(argument_3, and_ident(2), tok(DEL_EQUAL), rule(test))
 DEF_RULE_NC(comp_iter, or(2), rule(comp_for), rule(comp_if))
 DEF_RULE_NC(comp_for, and_blank(5), tok(KW_FOR), rule(exprlist), tok(KW_IN), rule(or_test), opt_rule(comp_iter))
 DEF_RULE_NC(comp_if, and(3), tok(KW_IF), rule(test_nocond), opt_rule(comp_iter))

From f2e267da68bf85f3f12fa77155e469352bdc6c09 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 16 Jun 2020 22:49:25 +1000
Subject: [PATCH 0081/3533] py/compile: Implement PEP 526, syntax for variable
 annotations.

This addition to the grammar was introduced in Python 3.6.  It allows
annotating the type of a varilable, like:

    x: int = 123
    s: str

The implementation in this commit is quite simple and just ignores the
annotation (the int and str bits above).  The reason to implement this is
to allow Python 3.6+ code that uses this feature to compile under
MicroPython without change, and for users to use type checkers.

In the future viper could use this syntax as a way to give types to
variables, which is currently done in a bit of an ad-hoc way, eg
x = int(123).  And this syntax could potentially be used in the inline
assembler to define labels in an way that's easier to read.
---
 py/compile.c | 31 ++++++++++++++++++++++++-------
 py/grammar.h |  8 +++++---
 2 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/py/compile.c b/py/compile.c
index 614e851a3d8ac..53108b7062b78 100644
--- a/py/compile.c
+++ b/py/compile.c
@@ -1981,7 +1981,8 @@ STATIC void compile_async_stmt(compiler_t *comp, mp_parse_node_struct_t *pns) {
 #endif
 
 STATIC void compile_expr_stmt(compiler_t *comp, mp_parse_node_struct_t *pns) {
-    if (MP_PARSE_NODE_IS_NULL(pns->nodes[1])) {
+    mp_parse_node_t pn_rhs = pns->nodes[1];
+    if (MP_PARSE_NODE_IS_NULL(pn_rhs)) {
         if (comp->is_repl && comp->scope_cur->kind == SCOPE_MODULE) {
             // for REPL, evaluate then print the expression
             compile_load_id(comp, MP_QSTR___repl_print__);
@@ -1999,10 +2000,26 @@ STATIC void compile_expr_stmt(compiler_t *comp, mp_parse_node_struct_t *pns) {
                 EMIT(pop_top); // discard last result since this is a statement and leaves nothing on the stack
             }
         }
-    } else if (MP_PARSE_NODE_IS_STRUCT(pns->nodes[1])) {
-        mp_parse_node_struct_t *pns1 = (mp_parse_node_struct_t *)pns->nodes[1];
+    } else if (MP_PARSE_NODE_IS_STRUCT(pn_rhs)) {
+        mp_parse_node_struct_t *pns1 = (mp_parse_node_struct_t *)pn_rhs;
         int kind = MP_PARSE_NODE_STRUCT_KIND(pns1);
-        if (kind == PN_expr_stmt_augassign) {
+        if (kind == PN_annassign) {
+            // the annotation is in pns1->nodes[0] and is ignored
+            if (MP_PARSE_NODE_IS_NULL(pns1->nodes[1])) {
+                // an annotation of the form "x: y"
+                // inside a function this declares "x" as a local
+                if (comp->scope_cur->kind == SCOPE_FUNCTION) {
+                    if (MP_PARSE_NODE_IS_ID(pns->nodes[0])) {
+                        qstr lhs = MP_PARSE_NODE_LEAF_ARG(pns->nodes[0]);
+                        scope_find_or_add_id(comp->scope_cur, lhs, ID_INFO_KIND_LOCAL);
+                    }
+                }
+            } else {
+                // an assigned annotation of the form "x: y = z"
+                pn_rhs = pns1->nodes[1];
+                goto plain_assign;
+            }
+        } else if (kind == PN_expr_stmt_augassign) {
             c_assign(comp, pns->nodes[0], ASSIGN_AUG_LOAD); // lhs load for aug assign
             compile_node(comp, pns1->nodes[1]); // rhs
             assert(MP_PARSE_NODE_IS_TOKEN(pns1->nodes[0]));
@@ -2027,10 +2044,10 @@ STATIC void compile_expr_stmt(compiler_t *comp, mp_parse_node_struct_t *pns) {
         } else {
         plain_assign:
             #if MICROPY_COMP_DOUBLE_TUPLE_ASSIGN
-            if (MP_PARSE_NODE_IS_STRUCT_KIND(pns->nodes[1], PN_testlist_star_expr)
+            if (MP_PARSE_NODE_IS_STRUCT_KIND(pn_rhs, PN_testlist_star_expr)
                 && MP_PARSE_NODE_IS_STRUCT_KIND(pns->nodes[0], PN_testlist_star_expr)) {
                 mp_parse_node_struct_t *pns0 = (mp_parse_node_struct_t *)pns->nodes[0];
-                pns1 = (mp_parse_node_struct_t *)pns->nodes[1];
+                pns1 = (mp_parse_node_struct_t *)pn_rhs;
                 uint32_t n_pns0 = MP_PARSE_NODE_STRUCT_NUM_NODES(pns0);
                 // Can only optimise a tuple-to-tuple assignment when all of the following hold:
                 //  - equal number of items in LHS and RHS tuples
@@ -2070,7 +2087,7 @@ STATIC void compile_expr_stmt(compiler_t *comp, mp_parse_node_struct_t *pns) {
             }
             #endif
 
-            compile_node(comp, pns->nodes[1]); // rhs
+            compile_node(comp, pn_rhs); // rhs
             c_assign(comp, pns->nodes[0], ASSIGN_STORE); // lhs store
         }
     } else {
diff --git a/py/grammar.h b/py/grammar.h
index ff8e61828e862..285fbded2fdae 100644
--- a/py/grammar.h
+++ b/py/grammar.h
@@ -98,20 +98,22 @@ DEF_RULE_NC(simple_stmt, and_ident(2), rule(simple_stmt_2), tok(NEWLINE))
 DEF_RULE(simple_stmt_2, c(generic_all_nodes), list_with_end, rule(small_stmt), tok(DEL_SEMICOLON))
 
 // small_stmt: expr_stmt | del_stmt | pass_stmt | flow_stmt | import_stmt | global_stmt | nonlocal_stmt | assert_stmt
-// expr_stmt: testlist_star_expr (augassign (yield_expr|testlist) | ('=' (yield_expr|testlist_star_expr))*)
+// expr_stmt: testlist_star_expr (annassign | augassign (yield_expr|testlist) | ('=' (yield_expr|testlist_star_expr))*)
 // testlist_star_expr: (test|star_expr) (',' (test|star_expr))* [',']
+// annassign: ':' test ['=' (yield_expr|testlist_star_expr)]
 // augassign: '+=' | '-=' | '*=' | '@=' | '/=' | '%=' | '&=' | '|=' | '^=' | '<<=' | '>>=' | '**=' | '//='
-// # For normal assignments, additional restrictions enforced by the interpreter
+// # For normal and annotated assignments, additional restrictions enforced by the interpreter
 
 DEF_RULE_NC(small_stmt, or(8), rule(del_stmt), rule(pass_stmt), rule(flow_stmt), rule(import_stmt), rule(global_stmt), rule(nonlocal_stmt), rule(assert_stmt), rule(expr_stmt))
 DEF_RULE(expr_stmt, c(expr_stmt), and(2), rule(testlist_star_expr), opt_rule(expr_stmt_2))
-DEF_RULE_NC(expr_stmt_2, or(2), rule(expr_stmt_augassign), rule(expr_stmt_assign_list))
+DEF_RULE_NC(expr_stmt_2, or(3), rule(annassign), rule(expr_stmt_augassign), rule(expr_stmt_assign_list))
 DEF_RULE_NC(expr_stmt_augassign, and_ident(2), rule(augassign), rule(expr_stmt_6))
 DEF_RULE_NC(expr_stmt_assign_list, one_or_more, rule(expr_stmt_assign))
 DEF_RULE_NC(expr_stmt_assign, and_ident(2), tok(DEL_EQUAL), rule(expr_stmt_6))
 DEF_RULE_NC(expr_stmt_6, or(2), rule(yield_expr), rule(testlist_star_expr))
 DEF_RULE(testlist_star_expr, c(generic_tuple), list_with_end, rule(testlist_star_expr_2), tok(DEL_COMMA))
 DEF_RULE_NC(testlist_star_expr_2, or(2), rule(star_expr), rule(test))
+DEF_RULE_NC(annassign, and(3), tok(DEL_COLON), rule(test), opt_rule(expr_stmt_assign))
 DEF_RULE_NC(augassign, or(13), tok(DEL_PLUS_EQUAL), tok(DEL_MINUS_EQUAL), tok(DEL_STAR_EQUAL), tok(DEL_AT_EQUAL), tok(DEL_SLASH_EQUAL), tok(DEL_PERCENT_EQUAL), tok(DEL_AMPERSAND_EQUAL), tok(DEL_PIPE_EQUAL), tok(DEL_CARET_EQUAL), tok(DEL_DBL_LESS_EQUAL), tok(DEL_DBL_MORE_EQUAL), tok(DEL_DBL_STAR_EQUAL), tok(DEL_DBL_SLASH_EQUAL))
 
 // del_stmt: 'del' exprlist

From a51eef4471e01ee60d53ee184bc4feabf6ebd855 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 16 Jun 2020 22:49:38 +1000
Subject: [PATCH 0082/3533] tests/basics: Add tests for variable annotations.

---
 tests/basics/annotate_var.py     | 25 +++++++++++++++++++++++++
 tests/basics/annotate_var.py.exp |  5 +++++
 tests/run-tests                  |  1 +
 3 files changed, 31 insertions(+)
 create mode 100644 tests/basics/annotate_var.py
 create mode 100644 tests/basics/annotate_var.py.exp

diff --git a/tests/basics/annotate_var.py b/tests/basics/annotate_var.py
new file mode 100644
index 0000000000000..3f767e4a73505
--- /dev/null
+++ b/tests/basics/annotate_var.py
@@ -0,0 +1,25 @@
+# test PEP 526, varible annotations
+
+x: int
+print("x" in globals())
+
+x: int = 1
+print(x)
+
+t: tuple = 1, 2
+print(t)
+
+# a pure annotation in a function makes that variable local
+def f():
+    x: int
+    try:
+        print(x)
+    except NameError:
+        print("NameError")
+f()
+
+# here, "x" should remain a global
+def f():
+    x.y: int
+    print(x)
+f()
diff --git a/tests/basics/annotate_var.py.exp b/tests/basics/annotate_var.py.exp
new file mode 100644
index 0000000000000..9b6536e966b0e
--- /dev/null
+++ b/tests/basics/annotate_var.py.exp
@@ -0,0 +1,5 @@
+False
+1
+(1, 2)
+NameError
+1
diff --git a/tests/run-tests b/tests/run-tests
index 74e2f71ac6480..f9e4de4b34a20 100755
--- a/tests/run-tests
+++ b/tests/run-tests
@@ -414,6 +414,7 @@ def run_tests(pyb, tests, args, base_path="."):
         skip_tests.update({'basics/%s.py' % t for t in 'gen_yield_from_close generator_name'.split()}) # require raise_varargs, generator name
         skip_tests.update({'basics/async_%s.py' % t for t in 'with with2 with_break with_return'.split()}) # require async_with
         skip_tests.update({'basics/%s.py' % t for t in 'try_reraise try_reraise2'.split()}) # require raise_varargs
+        skip_tests.add('basics/annotate_var.py') # requires checking for unbound local
         skip_tests.add('basics/del_deref.py') # requires checking for unbound local
         skip_tests.add('basics/del_local.py') # requires checking for unbound local
         skip_tests.add('basics/exception_chain.py') # raise from is not supported

From 1678f417445703750e187b1b8a83c8c3e0e3796f Mon Sep 17 00:00:00 2001
From: Jon Rob <mr.jonrob@gmail.com>
Date: Mon, 8 Jun 2020 06:29:43 +0000
Subject: [PATCH 0083/3533] esp32/esp32_rmt: Extend RMT to support carrier
 feature.

The ESP32 RMT peripheral has hardware support for a carrier frequency, and
this commit exposes it to Python with the keyword arguments carrier_freq
and carrier_duty_percent in the constructor.  Example usage:

    r = esp32.RMT(0, pin=Pin(2), clock_div=80, carrier_freq=38000, carrier_duty_percent=50)
---
 docs/library/esp32.rst  | 17 ++++++++++++++---
 ports/esp32/esp32_rmt.c | 30 ++++++++++++++++++++++++++----
 2 files changed, 40 insertions(+), 7 deletions(-)

diff --git a/docs/library/esp32.rst b/docs/library/esp32.rst
index 33b779a214336..715afdddeb169 100644
--- a/docs/library/esp32.rst
+++ b/docs/library/esp32.rst
@@ -151,6 +151,11 @@ used to transmit or receive many other types of digital signals::
 
     r = esp32.RMT(0, pin=Pin(18), clock_div=8)
     r  # RMT(channel=0, pin=18, source_freq=80000000, clock_div=8)
+
+    # To use carrier frequency
+    r = esp32.RMT(0, pin=Pin(18), clock_div=8, carrier_freq=38000)
+    r  # RMT(channel=0, pin=18, source_freq=80000000, clock_div=8, carrier_freq=38000, carrier_duty_percent=50)
+
     # The channel resolution is 100ns (1/(source_freq/clock_div)).
     r.write_pulses((1, 20, 2, 40), start=0)  # Send 0 for 100ns, 1 for 2000ns, 0 for 200ns, 1 for 4000ns
 
@@ -164,6 +169,9 @@ define the pulses.
 multiplying the resolution by a 15-bit (0-32,768) number. There are eight
 channels (0-7) and each can have a different clock divider.
 
+To enable the carrier frequency feature of the esp32 hardware, specify the
+``carrier_freq`` as something like 38000, a typical IR carrier frequency.
+
 So, in the example above, the 80MHz clock is divided by 8. Thus the
 resolution is (1/(80Mhz/8)) 100ns. Since the ``start`` level is 0 and toggles
 with each number, the bitstream is ``0101`` with durations of [100ns, 2000ns,
@@ -174,17 +182,20 @@ For more details see Espressif's `ESP-IDF RMT documentation.
 
 .. Warning::
    The current MicroPython RMT implementation lacks some features, most notably
-   receiving pulses and carrier transmit. RMT should be considered a
+   receiving pulses. RMT should be considered a
    *beta feature* and the interface may change in the future.
 
 
-.. class:: RMT(channel, \*, pin=None, clock_div=8)
+.. class:: RMT(channel, \*, pin=None, clock_div=8, carrier_freq=0, carrier_duty_percent=50)
 
     This class provides access to one of the eight RMT channels. *channel* is
     required and identifies which RMT channel (0-7) will be configured. *pin*,
     also required, configures which Pin is bound to the RMT channel. *clock_div*
     is an 8-bit clock divider that divides the source clock (80MHz) to the RMT
-    channel allowing the resolution to be specified.
+    channel allowing the resolution to be specified. *carrier_freq* is used to
+    enable the carrier feature and specify its frequency, default value is ``0``
+    (not enabled).  To enable, specify a positive integer.  *carrier_duty_percent*
+    defaults to 50.
 
 .. method:: RMT.source_freq()
 
diff --git a/ports/esp32/esp32_rmt.c b/ports/esp32/esp32_rmt.c
index 25b7b3808981c..846c80d478f0b 100644
--- a/ports/esp32/esp32_rmt.c
+++ b/ports/esp32/esp32_rmt.c
@@ -52,6 +52,8 @@ typedef struct _esp32_rmt_obj_t {
     uint8_t channel_id;
     gpio_num_t pin;
     uint8_t clock_div;
+    uint16_t carrier_duty_percent;
+    uint32_t carrier_freq;
     mp_uint_t num_items;
     rmt_item32_t *items;
 } esp32_rmt_obj_t;
@@ -61,6 +63,8 @@ STATIC mp_obj_t esp32_rmt_make_new(const mp_obj_type_t *type, size_t n_args, siz
         { MP_QSTR_id,        MP_ARG_REQUIRED | MP_ARG_INT, {.u_int = -1} },
         { MP_QSTR_pin,       MP_ARG_REQUIRED | MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = mp_const_none} },
         { MP_QSTR_clock_div,                   MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 8} }, // 100ns resolution
+        { MP_QSTR_carrier_duty_percent,        MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 50} },
+        { MP_QSTR_carrier_freq,                MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 0} },
     };
     mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
     mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
@@ -68,6 +72,16 @@ STATIC mp_obj_t esp32_rmt_make_new(const mp_obj_type_t *type, size_t n_args, siz
     gpio_num_t pin_id = machine_pin_get_id(args[1].u_obj);
     mp_uint_t clock_div = args[2].u_int;
 
+    bool carrier_en = false;
+    mp_uint_t carrier_duty_percent = 0;
+    mp_uint_t carrier_freq = 0;
+
+    if (args[4].u_int > 0) {
+        carrier_en = true;
+        carrier_duty_percent = args[3].u_int;
+        carrier_freq = args[4].u_int;
+    }
+
     if (clock_div < 1 || clock_div > 255) {
         mp_raise_ValueError(MP_ERROR_TEXT("clock_div must be between 1 and 255"));
     }
@@ -77,6 +91,8 @@ STATIC mp_obj_t esp32_rmt_make_new(const mp_obj_type_t *type, size_t n_args, siz
     self->channel_id = channel_id;
     self->pin = pin_id;
     self->clock_div = clock_div;
+    self->carrier_duty_percent = carrier_duty_percent;
+    self->carrier_freq = carrier_freq;
 
     rmt_config_t config;
     config.rmt_mode = RMT_MODE_TX;
@@ -85,11 +101,11 @@ STATIC mp_obj_t esp32_rmt_make_new(const mp_obj_type_t *type, size_t n_args, siz
     config.mem_block_num = 1;
     config.tx_config.loop_en = 0;
 
-    config.tx_config.carrier_en = 0;
+    config.tx_config.carrier_en = carrier_en;
     config.tx_config.idle_output_en = 1;
     config.tx_config.idle_level = 0;
-    config.tx_config.carrier_duty_percent = 0;
-    config.tx_config.carrier_freq_hz = 0;
+    config.tx_config.carrier_duty_percent = self->carrier_duty_percent;
+    config.tx_config.carrier_freq_hz = self->carrier_freq;
     config.tx_config.carrier_level = 1;
 
     config.clk_div = self->clock_div;
@@ -103,8 +119,14 @@ STATIC mp_obj_t esp32_rmt_make_new(const mp_obj_type_t *type, size_t n_args, siz
 STATIC void esp32_rmt_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     esp32_rmt_obj_t *self = MP_OBJ_TO_PTR(self_in);
     if (self->pin != -1) {
-        mp_printf(print, "RMT(channel=%u, pin=%u, source_freq=%u, clock_div=%u)",
+        mp_printf(print, "RMT(channel=%u, pin=%u, source_freq=%u, clock_div=%u",
             self->channel_id, self->pin, APB_CLK_FREQ, self->clock_div);
+        if (self->carrier_freq > 0) {
+            mp_printf(print, ", carrier_freq=%u, carrier_duty_percent=%u)",
+                self->carrier_freq, self->carrier_duty_percent);
+        } else {
+            mp_printf(print, ")");
+        }
     } else {
         mp_printf(print, "RMT()");
     }

From da99e0f97911864d1803b804249b38344385de11 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 16 Jun 2020 12:23:29 +1000
Subject: [PATCH 0084/3533] stm32/factoryreset: Provide empty create-FS
 function when FAT disabled.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/factoryreset.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/ports/stm32/factoryreset.c b/ports/stm32/factoryreset.c
index 04591101e87df..725ecd12a871c 100644
--- a/ports/stm32/factoryreset.c
+++ b/ports/stm32/factoryreset.c
@@ -34,6 +34,8 @@
 
 #if MICROPY_HW_ENABLE_STORAGE
 
+#if MICROPY_VFS_FAT
+
 static const char fresh_boot_py[] =
     "# boot.py -- run on boot-up\r\n"
     "# can run arbitrary Python, but best to keep it minimal\r\n"
@@ -128,4 +130,13 @@ MP_WEAK int factory_reset_create_filesystem(void) {
     return 0; // success
 }
 
+#else
+
+// If FAT is not enabled then it's up to the board to create a fresh filesystem.
+MP_WEAK int factory_reset_create_filesystem(void) {
+    return 0; // success
+}
+
+#endif
+
 #endif // MICROPY_HW_ENABLE_STORAGE

From 289be6b352e30e97363c1db98a582eb84c9dd12e Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 16 Jun 2020 12:25:41 +1000
Subject: [PATCH 0085/3533] stm32/usb: Add support for 2xVCP on L0, L432 and WB
 MCUs.

There are a maximum of 8 USB endpoints and each has 2 buffer slots
(in/out).  This commit add support for up to 8 endpoints and adds FIFO
configuration for USB profiles with 2xVCP on MCUs that have device-only USB
peripherals.

Tested on NUCLEO_WB55 in 2xVCP, 2xVCP+MSC and 2xVCP+MSC+HID mode.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/usb.c       | 25 +++++++++++++++++++++++--
 ports/stm32/usbd_conf.h |  2 +-
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/ports/stm32/usb.c b/ports/stm32/usb.c
index cd5238172188e..657d4cb6e7402 100644
--- a/ports/stm32/usb.c
+++ b/ports/stm32/usb.c
@@ -93,8 +93,29 @@ pyb_usb_storage_medium_t pyb_usb_storage_medium = PYB_USB_STORAGE_MEDIUM_NONE;
 // Units of FIFO size arrays below are 4x 16-bit words = 8 bytes
 // There are 512x 16-bit words it total to use here (when using PCD_SNG_BUF)
 
-// EP0(out), EP0(in), MSC/HID(out), MSC/HID(in), unused, CDC_CMD(in), CDC_DATA(out), CDC_DATA(in)
-STATIC const uint8_t usbd_fifo_size_cdc1[] = {16, 16, 16, 16, 0, 16, 16, 16};
+STATIC const uint8_t usbd_fifo_size_cdc1[USBD_PMA_NUM_FIFO] = {
+    16, 16, 16, 16,         // EP0(out), EP0(in), MSC/HID(out), MSC/HID(in)
+    0, 16, 16, 16,          // unused, CDC_CMD(in), CDC_DATA(out), CDC_DATA(in)
+    0, 0, 0, 0, 0, 0, 0, 0, // 8x unused
+};
+
+#if MICROPY_HW_USB_CDC_NUM >= 2
+STATIC const uint8_t usbd_fifo_size_cdc2[USBD_PMA_NUM_FIFO] = {
+    8, 8, 16, 16,           // EP0(out), EP0(in), MSC/HID(out), MSC/HID(in)
+    0, 8, 12, 12,           // unused, CDC_CMD(in), CDC_DATA(out), CDC_DATA(in)
+    0, 8, 12, 12,           // unused, CDC2_CMD(in), CDC2_DATA(out), CDC2_DATA(in)
+    0, 0, 0, 0,             // 4x unused
+};
+
+// RX; EP0(in), MSC/HID, CDC_CMD, CDC_DATA, CDC2_CMD/HID, CDC2_DATA, HID
+STATIC const uint8_t usbd_fifo_size_cdc2_msc_hid[USBD_PMA_NUM_FIFO] = {
+    8, 8, 16, 16,           // EP0(out), EP0(in), MSC/HID(out), MSC/HID(in)
+    0, 8, 8, 8,             // unused, CDC_CMD(in), CDC_DATA(out), CDC_DATA(in)
+    0, 8, 8, 8,             // unused, CDC2_CMD(in), CDC2_DATA(out), CDC2_DATA(in)
+    8, 8,                   // HID(out), HID(in)
+    0, 0,                   // 2x unused
+};
+#endif
 
 #else
 
diff --git a/ports/stm32/usbd_conf.h b/ports/stm32/usbd_conf.h
index 5237ba3a96e72..83805a6e4d801 100644
--- a/ports/stm32/usbd_conf.h
+++ b/ports/stm32/usbd_conf.h
@@ -51,7 +51,7 @@
 
 // For MCUs with a device-only USB peripheral
 #define USBD_PMA_RESERVE                      (64)
-#define USBD_PMA_NUM_FIFO                     (8)
+#define USBD_PMA_NUM_FIFO                     (16) // Maximum 8 endpoints, 2 FIFOs each
 
 // For MCUs with multiple OTG USB peripherals
 #define USBD_FS_NUM_TX_FIFO                   (6)

From 4b5dd012e0fe615001bbd1edf2f85ea30371a1d6 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 16 Jun 2020 12:29:02 +1000
Subject: [PATCH 0086/3533] stm32/rfcore: Leave txpower level as default when
 initialising rfcore.

And provide a convenient API function to change it (currently unused).

Fixes issue #5985.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/rfcore.c | 7 ++++++-
 ports/stm32/rfcore.h | 1 +
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/ports/stm32/rfcore.c b/ports/stm32/rfcore.c
index 602ef974b262b..54b3393435e1e 100644
--- a/ports/stm32/rfcore.c
+++ b/ports/stm32/rfcore.c
@@ -416,8 +416,13 @@ void rfcore_ble_check_msg(int (*cb)(void *, const uint8_t *, size_t), void *env)
         SWAP_UINT8(buf[3], buf[6]);
         SWAP_UINT8(buf[4], buf[5]);
         tl_ble_hci_cmd_resp(HCI_OPCODE(OGF_VENDOR, OCF_WRITE_CONFIG), 8, buf); // set BDADDR
-        tl_ble_hci_cmd_resp(HCI_OPCODE(OGF_VENDOR, OCF_SET_TX_POWER), 2, (const uint8_t *)"\x00\x06"); // 0 dBm
     }
 }
 
+// "level" is 0x00-0x1f, ranging from -40 dBm to +6 dBm (not linear).
+void rfcore_ble_set_txpower(uint8_t level) {
+    uint8_t buf[2] = { 0x00, level };
+    tl_ble_hci_cmd_resp(HCI_OPCODE(OGF_VENDOR, OCF_SET_TX_POWER), 2, buf);
+}
+
 #endif // defined(STM32WB)
diff --git a/ports/stm32/rfcore.h b/ports/stm32/rfcore.h
index 138c438f12eae..fbe111e1ebdcd 100644
--- a/ports/stm32/rfcore.h
+++ b/ports/stm32/rfcore.h
@@ -33,5 +33,6 @@ void rfcore_init(void);
 void rfcore_ble_init(void);
 void rfcore_ble_hci_cmd(size_t len, const uint8_t *src);
 void rfcore_ble_check_msg(int (*cb)(void *, const uint8_t *, size_t), void *env);
+void rfcore_ble_set_txpower(uint8_t level);
 
 #endif // MICROPY_INCLUDED_STM32_RFCORE_H

From 8d71cc2e7da7a77aeca66bc8fac0bb0e28690344 Mon Sep 17 00:00:00 2001
From: Glenn Ruben Bakke <glennbakke@gmail.com>
Date: Thu, 11 Jun 2020 20:40:04 +0200
Subject: [PATCH 0087/3533] nrf/bluetooth: Use MP_ERROR_TEXT for all error
 messages.

This follows up on commit def76fe4d9bbc2c342594dc05861b24d7165d274.

Fixes issue #6152.
---
 ports/nrf/drivers/bluetooth/ble_drv.c | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/ports/nrf/drivers/bluetooth/ble_drv.c b/ports/nrf/drivers/bluetooth/ble_drv.c
index 7619dc0399455..47f7f98885a91 100644
--- a/ports/nrf/drivers/bluetooth/ble_drv.c
+++ b/ports/nrf/drivers/bluetooth/ble_drv.c
@@ -607,12 +607,12 @@ bool ble_drv_advertise_data(ubluepy_advertise_data_t * p_adv_params) {
 #if (BLUETOOTH_SD == 110)
     if ((err_code = sd_ble_gap_adv_data_set(adv_data, byte_pos, NULL, 0)) != 0) {
         mp_raise_msg_varg(&mp_type_OSError,
-            "Can not apply advertisment data. status: 0x" HEX2_FMT, (uint16_t)err_code);
+            MP_ERROR_TEXT("Can not apply advertisment data. status: 0x" HEX2_FMT), (uint16_t)err_code);
     }
 #else
     if ((err_code = sd_ble_gap_adv_set_configure(&m_adv_handle, &m_adv_data, &m_adv_params)) != 0) {
         mp_raise_msg_varg(&mp_type_OSError,
-            "Can not apply advertisment data. status: 0x" HEX2_FMT, (uint16_t)err_code);
+            MP_ERROR_TEXT("Can not apply advertisment data. status: 0x" HEX2_FMT), (uint16_t)err_code);
     }
 #endif
     BLE_DRIVER_LOG("Set Adv data size: " UINT_FMT "\n", byte_pos);
@@ -627,7 +627,7 @@ bool ble_drv_advertise_data(ubluepy_advertise_data_t * p_adv_params) {
 #endif
     if (err_code != 0) {
         mp_raise_msg_varg(&mp_type_OSError,
-            "Can not start advertisment. status: 0x" HEX2_FMT, (uint16_t)err_code);
+            MP_ERROR_TEXT("Can not start advertisment. status: 0x" HEX2_FMT), (uint16_t)err_code);
     }
 
     m_adv_in_progress = true;
@@ -642,12 +642,12 @@ void ble_drv_advertise_stop(void) {
 #if (BLUETOOTH_SD == 110)
         if ((err_code = sd_ble_gap_adv_stop()) != 0) {
             mp_raise_msg_varg(&mp_type_OSError,
-                "Can not stop advertisment. status: 0x" HEX2_FMT, (uint16_t)err_code);
+                MP_ERROR_TEXT("Can not stop advertisment. status: 0x" HEX2_FMT), (uint16_t)err_code);
         }
 #else
         if ((err_code = sd_ble_gap_adv_stop(m_adv_handle)) != 0) {
             mp_raise_msg_varg(&mp_type_OSError,
-                "Can not stop advertisment. status: 0x" HEX2_FMT, (uint16_t)err_code);
+                MP_ERROR_TEXT("Can not stop advertisment. status: 0x" HEX2_FMT), (uint16_t)err_code);
         }
 #endif
     }
@@ -667,7 +667,7 @@ void ble_drv_attr_s_read(uint16_t conn_handle, uint16_t handle, uint16_t len, ui
                                                &gatts_value);
     if (err_code != 0) {
         mp_raise_msg_varg(&mp_type_OSError,
-            "Can not read attribute value. status: 0x" HEX2_FMT, (uint16_t)err_code);
+            MP_ERROR_TEXT("Can not read attribute value. status: 0x" HEX2_FMT), (uint16_t)err_code);
     }
 
 }
@@ -684,7 +684,7 @@ void ble_drv_attr_s_write(uint16_t conn_handle, uint16_t handle, uint16_t len, u
 
     if (err_code != 0) {
         mp_raise_msg_varg(&mp_type_OSError,
-            "Can not write attribute value. status: 0x" HEX2_FMT, (uint16_t)err_code);
+            MP_ERROR_TEXT("Can not write attribute value. status: 0x" HEX2_FMT), (uint16_t)err_code);
     }
 }
 
@@ -708,7 +708,7 @@ void ble_drv_attr_s_notify(uint16_t conn_handle, uint16_t handle, uint16_t len,
     uint32_t err_code;
     if ((err_code = sd_ble_gatts_hvx(conn_handle, &hvx_params)) != 0) {
         mp_raise_msg_varg(&mp_type_OSError,
-            "Can not notify attribute value. status: 0x" HEX2_FMT, (uint16_t)err_code);
+            MP_ERROR_TEXT("Can not notify attribute value. status: 0x" HEX2_FMT), (uint16_t)err_code);
     }
     m_tx_in_progress++;
     BLE_DRIVER_LOG("Queued TX, m_tx_in_progress: %u\n", m_tx_in_progress);
@@ -747,7 +747,7 @@ void ble_drv_attr_c_read(uint16_t conn_handle, uint16_t handle, mp_obj_t obj, bl
                                           0);
     if (err_code != 0) {
         mp_raise_msg_varg(&mp_type_OSError,
-            "Can not read attribute value. status: 0x" HEX2_FMT, (uint16_t)err_code);
+            MP_ERROR_TEXT("Can not read attribute value. status: 0x" HEX2_FMT), (uint16_t)err_code);
     }
 
     while (gattc_char_data_handle != NULL) {
@@ -777,7 +777,7 @@ void ble_drv_attr_c_write(uint16_t conn_handle, uint16_t handle, uint16_t len, u
 
     if (err_code != 0) {
         mp_raise_msg_varg(&mp_type_OSError,
-            "Can not write attribute value. status: 0x" HEX2_FMT, (uint16_t)err_code);
+            MP_ERROR_TEXT("Can not write attribute value. status: 0x" HEX2_FMT), (uint16_t)err_code);
     }
 
     while (m_write_done != true) {
@@ -808,7 +808,7 @@ void ble_drv_scan_start(bool cont) {
     }
     if ((err_code = sd_ble_gap_scan_start(p_scan_params, &scan_buffer)) != 0) {
         mp_raise_msg_varg(&mp_type_OSError,
-            "Can not start scanning. status: 0x" HEX2_FMT, (uint16_t)err_code);
+            MP_ERROR_TEXT("Can not start scanning. status: 0x" HEX2_FMT), (uint16_t)err_code);
     }
 }
 
@@ -854,7 +854,7 @@ void ble_drv_connect(uint8_t * p_addr, uint8_t addr_type) {
                                        &conn_params,
                                        conn_tag)) != 0) {
         mp_raise_msg_varg(&mp_type_OSError,
-            "Can not connect. status: 0x" HEX2_FMT, (uint16_t)err_code);
+            MP_ERROR_TEXT("Can not connect. status: 0x" HEX2_FMT), (uint16_t)err_code);
     }
 }
 

From cba3e25cb33007e4c0b1a0c476ecce7166fb089f Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 17 Jun 2020 11:39:52 +1000
Subject: [PATCH 0088/3533] travis: Change nrf pca10056 board to build with
 soft-device enabled.

To test building with SD which enables a lot of additional code.

Signed-off-by: Damien George <damien@micropython.org>
---
 .travis.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 414fe2b59d108..1cb5575c73636 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -292,10 +292,11 @@ jobs:
         - sudo apt-get install libnewlib-arm-none-eabi
         - arm-none-eabi-gcc --version
       script:
+        - ports/nrf/drivers/bluetooth/download_ble_stack.sh s132_nrf52_6_1_1
         - make ${MAKEOPTS} -C ports/nrf submodules
         - make ${MAKEOPTS} -C ports/nrf BOARD=pca10040
         - make ${MAKEOPTS} -C ports/nrf BOARD=microbit
-        - make ${MAKEOPTS} -C ports/nrf BOARD=pca10056
+        - make ${MAKEOPTS} -C ports/nrf BOARD=pca10056 SD=s132
 
     # bare-arm and minimal ports, with size-diff check
     - stage: test

From c521c178e9d113a27c50f6e0265c75d87fd7c99c Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 17 Jun 2020 23:48:33 +1000
Subject: [PATCH 0089/3533] github: Add FUNDING.yml file pointing to
 micropython GitHub sponsorship.

Signed-off-by: Damien George <damien@micropython.org>
---
 .github/FUNDING.yml | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 .github/FUNDING.yml

diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
new file mode 100644
index 0000000000000..15186fd5c1916
--- /dev/null
+++ b/.github/FUNDING.yml
@@ -0,0 +1 @@
+github: micropython

From ce02d5e3486ca0665e175e9690be910a06392edf Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 18 Jun 2020 10:48:24 +1000
Subject: [PATCH 0090/3533] stm32/boards/NUCLEO_WB55: Add more CPU pins and
 aliases to SW1/2/3.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/boards/NUCLEO_WB55/pins.csv | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/ports/stm32/boards/NUCLEO_WB55/pins.csv b/ports/stm32/boards/NUCLEO_WB55/pins.csv
index 49fdab0c28c58..d7e0babf36d25 100644
--- a/ports/stm32/boards/NUCLEO_WB55/pins.csv
+++ b/ports/stm32/boards/NUCLEO_WB55/pins.csv
@@ -6,6 +6,14 @@
 ,PA5
 ,PA6
 ,PA7
+,PA8
+,PA9
+,PA10
+,PA11
+,PA12
+,PA13
+,PA14
+,PA15
 ,PB0
 ,PB1
 ,PB2
@@ -26,7 +34,20 @@
 ,PC1
 ,PC2
 ,PC3
+,PC4
+,PC5
+,PC6
+,PC10
+,PC11
+,PC12
+,PC13
+,PD0
+,PD1
+,PE4
 SW,PC4
+SW1,PC4
+SW2,PD0
+SW3,PD1
 LED_GREEN,PB0
 LED_RED,PB1
 LED_BLUE,PB5

From 026fda605e03113d6e753290d65fed774418bc53 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 18 Jun 2020 22:20:20 +1000
Subject: [PATCH 0091/3533] tools/codeformat.py: Include
 extmod/{btstack,nimble} in code formatting.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/btstack/modbluetooth_btstack.c | 2 +-
 extmod/nimble/modbluetooth_nimble.c   | 2 +-
 tools/codeformat.py                   | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/extmod/btstack/modbluetooth_btstack.c b/extmod/btstack/modbluetooth_btstack.c
index 31b2825758434..206bc98f9ff71 100644
--- a/extmod/btstack/modbluetooth_btstack.c
+++ b/extmod/btstack/modbluetooth_btstack.c
@@ -35,7 +35,7 @@
 
 #include "lib/btstack/src/btstack.h"
 
-#define DEBUG_EVENT_printf(...) //printf(__VA_ARGS__)
+#define DEBUG_EVENT_printf(...) // printf(__VA_ARGS__)
 
 #ifndef MICROPY_PY_BLUETOOTH_DEFAULT_GAP_NAME
 #define MICROPY_PY_BLUETOOTH_DEFAULT_GAP_NAME "MPY BTSTACK"
diff --git a/extmod/nimble/modbluetooth_nimble.c b/extmod/nimble/modbluetooth_nimble.c
index 035ec3d26fc6d..4e0ca88efa468 100644
--- a/extmod/nimble/modbluetooth_nimble.c
+++ b/extmod/nimble/modbluetooth_nimble.c
@@ -45,7 +45,7 @@
 #define MICROPY_PY_BLUETOOTH_DEFAULT_GAP_NAME "MPY NIMBLE"
 #endif
 
-#define DEBUG_EVENT_printf(...) //printf(__VA_ARGS__)
+#define DEBUG_EVENT_printf(...) // printf(__VA_ARGS__)
 
 #define ERRNO_BLUETOOTH_NOT_ACTIVE MP_ENODEV
 
diff --git a/tools/codeformat.py b/tools/codeformat.py
index 364037d2fac86..653529460c079 100755
--- a/tools/codeformat.py
+++ b/tools/codeformat.py
@@ -36,6 +36,8 @@
 PATHS = [
     # C
     "extmod/*.[ch]",
+    "extmod/btstack/*.[ch]",
+    "extmod/nimble/*.[ch]",
     "lib/netutils/*.[ch]",
     "lib/timeutils/*.[ch]",
     "lib/utils/*.[ch]",

From 77ed6f69ac35c1663a5633a8ee1d8a2446542204 Mon Sep 17 00:00:00 2001
From: David Lechner <david@pybricks.com>
Date: Tue, 16 Jun 2020 09:34:51 -0500
Subject: [PATCH 0092/3533] tools/uncrustify: Enable more opts to remove space
 between func and '('.

With only `sp_func_proto_paren = remove` set there are some cases where
uncrustify misses removing a space between the function name and the
opening '('.  This sets all of the related options to `force` as well.
---
 extmod/vfs_fat_diskio.c    |  6 +++---
 lib/utils/printf.c         |  2 +-
 ports/cc3200/main.c        | 14 +++++++-------
 ports/cc3200/mptask.c      | 18 +++++++++---------
 ports/cc3200/serverstask.c | 30 +++++++++++++++---------------
 tools/uncrustify.cfg       | 20 ++++++++++----------
 6 files changed, 45 insertions(+), 45 deletions(-)

diff --git a/extmod/vfs_fat_diskio.c b/extmod/vfs_fat_diskio.c
index ae1bef57d5e07..1bcd471f2162e 100644
--- a/extmod/vfs_fat_diskio.c
+++ b/extmod/vfs_fat_diskio.c
@@ -52,7 +52,7 @@ STATIC fs_user_mount_t *disk_get_device(void *bdev) {
 /* Read Sector(s)                                                        */
 /*-----------------------------------------------------------------------*/
 
-DRESULT disk_read (
+DRESULT disk_read(
     bdev_t pdrv,      /* Physical drive nmuber (0..) */
     BYTE *buff,        /* Data buffer to store read data */
     DWORD sector,    /* Sector address (LBA) */
@@ -72,7 +72,7 @@ DRESULT disk_read (
 /* Write Sector(s)                                                       */
 /*-----------------------------------------------------------------------*/
 
-DRESULT disk_write (
+DRESULT disk_write(
     bdev_t pdrv,          /* Physical drive nmuber (0..) */
     const BYTE *buff,    /* Data to be written */
     DWORD sector,        /* Sector address (LBA) */
@@ -98,7 +98,7 @@ DRESULT disk_write (
 /* Miscellaneous Functions                                               */
 /*-----------------------------------------------------------------------*/
 
-DRESULT disk_ioctl (
+DRESULT disk_ioctl(
     bdev_t pdrv,      /* Physical drive nmuber (0..) */
     BYTE cmd,        /* Control code */
     void *buff        /* Buffer to send/receive control data */
diff --git a/lib/utils/printf.c b/lib/utils/printf.c
index 6266ab66d3cdc..e8db2b999c123 100644
--- a/lib/utils/printf.c
+++ b/lib/utils/printf.c
@@ -104,7 +104,7 @@ STATIC void strn_print_strn(void *data, const char *str, size_t len) {
 // when linkings against it statically.
 // GCC 9 gives a warning about missing attributes so it's excluded until
 // uClibc+GCC9 support is needed.
-int __GI_vsnprintf(char *str, size_t size, const char *fmt, va_list ap) __attribute__((weak, alias ("vsnprintf")));
+int __GI_vsnprintf(char *str, size_t size, const char *fmt, va_list ap) __attribute__((weak, alias("vsnprintf")));
 #endif
 
 int vsnprintf(char *str, size_t size, const char *fmt, va_list ap) {
diff --git a/ports/cc3200/main.c b/ports/cc3200/main.c
index b9f67194b6fc0..bdd73e7bf9ba7 100644
--- a/ports/cc3200/main.c
+++ b/ports/cc3200/main.c
@@ -51,8 +51,8 @@
  ******************************************************************************/
 
 // This is the static memory (TCB and stack) for the idle task
-static StaticTask_t xIdleTaskTCB __attribute__ ((section (".rtos_heap")));
-static StackType_t uxIdleTaskStack[configMINIMAL_STACK_SIZE] __attribute__ ((section (".rtos_heap"))) __attribute__((aligned (8)));
+static StaticTask_t xIdleTaskTCB __attribute__ ((section(".rtos_heap")));
+static StackType_t uxIdleTaskStack[configMINIMAL_STACK_SIZE] __attribute__ ((section(".rtos_heap"))) __attribute__((aligned(8)));
 
 /******************************************************************************
  DECLARE PUBLIC DATA
@@ -62,18 +62,18 @@ OsiTaskHandle mpTaskHandle;
 #endif
 
 // This is the FreeRTOS heap, defined here so we can put it in a special segment
-uint8_t ucHeap[ configTOTAL_HEAP_SIZE ] __attribute__ ((section (".rtos_heap"))) __attribute__((aligned (8)));
+uint8_t ucHeap[ configTOTAL_HEAP_SIZE ] __attribute__ ((section(".rtos_heap"))) __attribute__((aligned(8)));
 
 // This is the static memory (TCB and stack) for the main MicroPython task
-StaticTask_t mpTaskTCB __attribute__ ((section (".rtos_heap")));
-StackType_t mpTaskStack[MICROPY_TASK_STACK_LEN] __attribute__ ((section (".rtos_heap"))) __attribute__((aligned (8)));
+StaticTask_t mpTaskTCB __attribute__ ((section(".rtos_heap")));
+StackType_t mpTaskStack[MICROPY_TASK_STACK_LEN] __attribute__ ((section(".rtos_heap"))) __attribute__((aligned(8)));
 
 /******************************************************************************
  DEFINE PUBLIC FUNCTIONS
  ******************************************************************************/
 
-__attribute__ ((section (".boot")))
-int main (void) {
+__attribute__ ((section(".boot")))
+int main(void) {
 
     // Initialize the clocks and the interrupt system
     HAL_SystemInit();
diff --git a/ports/cc3200/mptask.c b/ports/cc3200/mptask.c
index f06a502776087..71b650ff858c8 100644
--- a/ports/cc3200/mptask.c
+++ b/ports/cc3200/mptask.c
@@ -113,7 +113,7 @@ static const char fresh_boot_py[] = "# boot.py -- run on boot-up\r\n"
 
 uintptr_t cortex_m3_get_sp(void);
 
-void TASK_MicroPython (void *pvParameters) {
+void TASK_MicroPython(void *pvParameters) {
     // get the top of the stack to initialize the garbage collector
     uint32_t sp = cortex_m3_get_sp();
 
@@ -262,16 +262,16 @@ void TASK_MicroPython (void *pvParameters) {
 /******************************************************************************
  DEFINE PRIVATE FUNCTIONS
  ******************************************************************************/
-__attribute__ ((section (".boot")))
-STATIC void mptask_pre_init (void) {
+__attribute__ ((section(".boot")))
+STATIC void mptask_pre_init(void) {
     // this one only makes sense after a poweron reset
     pyb_rtc_pre_init();
 
     // Create the simple link spawn task
-    ASSERT (OSI_OK == VStartSimpleLinkSpawnTask(SIMPLELINK_SPAWN_TASK_PRIORITY));
+    ASSERT(OSI_OK == VStartSimpleLinkSpawnTask(SIMPLELINK_SPAWN_TASK_PRIORITY));
 
     // Allocate memory for the flash file system
-    ASSERT ((sflash_vfs_fat = mem_Malloc(sizeof(*sflash_vfs_fat))) != NULL);
+    ASSERT((sflash_vfs_fat = mem_Malloc(sizeof(*sflash_vfs_fat))) != NULL);
 
     // this one allocates memory for the nvic vault
     pyb_sleep_pre_init();
@@ -295,7 +295,7 @@ STATIC void mptask_pre_init (void) {
     ASSERT(svTaskHandle != NULL);
 }
 
-STATIC void mptask_init_sflash_filesystem (void) {
+STATIC void mptask_init_sflash_filesystem(void) {
     FILINFO fno;
 
     // Initialise the local flash filesystem.
@@ -378,16 +378,16 @@ STATIC void mptask_init_sflash_filesystem (void) {
     }
 }
 
-STATIC void mptask_enter_ap_mode (void) {
+STATIC void mptask_enter_ap_mode(void) {
     // append the mac only if it's not the first boot
     bool add_mac = !PRCMGetSpecialBit(PRCM_FIRST_BOOT_BIT);
     // enable simplelink in ap mode (use the MAC address to make the ssid unique)
-    wlan_sl_init (ROLE_AP, MICROPY_PORT_WLAN_AP_SSID, strlen(MICROPY_PORT_WLAN_AP_SSID),
+    wlan_sl_init(ROLE_AP, MICROPY_PORT_WLAN_AP_SSID, strlen(MICROPY_PORT_WLAN_AP_SSID),
         MICROPY_PORT_WLAN_AP_SECURITY, MICROPY_PORT_WLAN_AP_KEY, strlen(MICROPY_PORT_WLAN_AP_KEY),
         MICROPY_PORT_WLAN_AP_CHANNEL, ANTENNA_TYPE_INTERNAL, add_mac);
 }
 
-STATIC void mptask_create_main_py (void) {
+STATIC void mptask_create_main_py(void) {
     // create empty main.py
     FIL fp;
     f_open(&sflash_vfs_fat->fatfs, &fp, "/main.py", FA_WRITE | FA_CREATE_ALWAYS);
diff --git a/ports/cc3200/serverstask.c b/ports/cc3200/serverstask.c
index 517a7a2281bdb..03eed8eeb0cf4 100644
--- a/ports/cc3200/serverstask.c
+++ b/ports/cc3200/serverstask.c
@@ -68,8 +68,8 @@ static volatile bool sleep_sockets = false;
  ******************************************************************************/
 
 // This is the static memory (TCB and stack) for the servers task
-StaticTask_t svTaskTCB __attribute__ ((section (".rtos_heap")));
-StackType_t svTaskStack[SERVERS_STACK_LEN] __attribute__ ((section (".rtos_heap"))) __attribute__((aligned (8)));
+StaticTask_t svTaskTCB __attribute__ ((section(".rtos_heap")));
+StackType_t svTaskStack[SERVERS_STACK_LEN] __attribute__ ((section(".rtos_heap"))) __attribute__((aligned(8)));
 
 char servers_user[SERVERS_USER_PASS_LEN_MAX + 1];
 char servers_pass[SERVERS_USER_PASS_LEN_MAX + 1];
@@ -77,12 +77,12 @@ char servers_pass[SERVERS_USER_PASS_LEN_MAX + 1];
 /******************************************************************************
  DECLARE PUBLIC FUNCTIONS
  ******************************************************************************/
-void TASK_Servers (void *pvParameters) {
+void TASK_Servers(void *pvParameters) {
 
     bool cycle = false;
 
-    strcpy (servers_user, SERVERS_DEF_USER);
-    strcpy (servers_pass, SERVERS_DEF_PASS);
+    strcpy(servers_user, SERVERS_DEF_USER);
+    strcpy(servers_pass, SERVERS_DEF_PASS);
 
     telnet_init();
     ftp_init();
@@ -143,12 +143,12 @@ void TASK_Servers (void *pvParameters) {
     }
 }
 
-void servers_start (void) {
+void servers_start(void) {
     servers_data.do_enable = true;
     mp_hal_delay_ms(SERVERS_CYCLE_TIME_MS * 3);
 }
 
-void servers_stop (void) {
+void servers_stop(void) {
     servers_data.do_disable = true;
     do {
         mp_hal_delay_ms(SERVERS_CYCLE_TIME_MS);
@@ -156,24 +156,24 @@ void servers_stop (void) {
     mp_hal_delay_ms(SERVERS_CYCLE_TIME_MS * 3);
 }
 
-void servers_reset (void) {
+void servers_reset(void) {
     servers_data.do_reset = true;
 }
 
-void servers_wlan_cycle_power (void) {
+void servers_wlan_cycle_power(void) {
     servers_data.do_wlan_cycle_power = true;
 }
 
-bool servers_are_enabled (void) {
+bool servers_are_enabled(void) {
     return servers_data.enabled;
 }
 
-void server_sleep_sockets (void) {
+void server_sleep_sockets(void) {
     sleep_sockets = true;
     mp_hal_delay_ms(SERVERS_CYCLE_TIME_MS + 1);
 }
 
-void servers_close_socket (int16_t *sd) {
+void servers_close_socket(int16_t *sd) {
     if (*sd > 0) {
         modusocket_socket_delete(*sd);
         sl_Close(*sd);
@@ -181,7 +181,7 @@ void servers_close_socket (int16_t *sd) {
     }
 }
 
-void servers_set_login (char *user, char *pass) {
+void servers_set_login(char *user, char *pass) {
     if (strlen(user) > SERVERS_USER_PASS_LEN_MAX || strlen(pass) > SERVERS_USER_PASS_LEN_MAX) {
         mp_raise_ValueError(MP_ERROR_TEXT("invalid argument(s) value"));
     }
@@ -189,7 +189,7 @@ void servers_set_login (char *user, char *pass) {
     memcpy(servers_pass, pass, SERVERS_USER_PASS_LEN_MAX);
 }
 
-void servers_set_timeout (uint32_t timeout) {
+void servers_set_timeout(uint32_t timeout) {
     if (timeout < SERVERS_MIN_TIMEOUT_MS) {
         // timeout is too low
         mp_raise_ValueError(MP_ERROR_TEXT("invalid argument(s) value"));
@@ -197,7 +197,7 @@ void servers_set_timeout (uint32_t timeout) {
     servers_data.timeout = timeout;
 }
 
-uint32_t servers_get_timeout (void) {
+uint32_t servers_get_timeout(void) {
     return servers_data.timeout;
 }
 
diff --git a/tools/uncrustify.cfg b/tools/uncrustify.cfg
index 96b471742cc51..80542b903e79e 100644
--- a/tools/uncrustify.cfg
+++ b/tools/uncrustify.cfg
@@ -512,35 +512,35 @@ sp_func_proto_paren             = remove   # ignore/add/remove/force
 
 # Add or remove space between function name and '()' on function declaration
 # without parameters.
-sp_func_proto_paren_empty       = ignore   # ignore/add/remove/force
+sp_func_proto_paren_empty       = remove   # ignore/add/remove/force
 
 # Add or remove space between function name and '(' with a typedef specifier.
-sp_func_type_paren              = ignore   # ignore/add/remove/force
+sp_func_type_paren              = remove   # ignore/add/remove/force
 
 # Add or remove space between alias name and '(' of a non-pointer function type typedef.
-sp_func_def_paren               = ignore   # ignore/add/remove/force
+sp_func_def_paren               = remove   # ignore/add/remove/force
 
 # Add or remove space between function name and '()' on function definition
 # without parameters.
-sp_func_def_paren_empty         = ignore   # ignore/add/remove/force
+sp_func_def_paren_empty         = remove   # ignore/add/remove/force
 
 # Add or remove space inside empty function '()'.
 # Overrides sp_after_angle unless use_sp_after_angle_always is set to true.
-sp_inside_fparens               = ignore   # ignore/add/remove/force
+sp_inside_fparens               = remove   # ignore/add/remove/force
 
 # Add or remove space inside function '(' and ')'.
 sp_inside_fparen                = remove   # ignore/add/remove/force
 
 # Add or remove space inside the first parentheses in a function type, as in
 # 'void (*x)(...)'.
-sp_inside_tparen                = ignore   # ignore/add/remove/force
+sp_inside_tparen                = remove   # ignore/add/remove/force
 
 # Add or remove space between the ')' and '(' in a function type, as in
 # 'void (*x)(...)'.
-sp_after_tparen_close           = ignore   # ignore/add/remove/force
+sp_after_tparen_close           = remove   # ignore/add/remove/force
 
 # Add or remove space between ']' and '(' when part of a function call.
-sp_square_fparen                = ignore   # ignore/add/remove/force
+sp_square_fparen                = remove   # ignore/add/remove/force
 
 # Add or remove space between ')' and '{' of function.
 sp_fparen_brace                 = force    # ignore/add/remove/force
@@ -555,11 +555,11 @@ sp_fparen_brace_initializer     = ignore   # ignore/add/remove/force
 sp_fparen_dbrace                = ignore   # ignore/add/remove/force
 
 # Add or remove space between function name and '(' on function calls.
-sp_func_call_paren              = ignore   # ignore/add/remove/force
+sp_func_call_paren              = remove   # ignore/add/remove/force
 
 # Add or remove space between function name and '()' on function calls without
 # parameters. If set to ignore (the default), sp_func_call_paren is used.
-sp_func_call_paren_empty        = ignore   # ignore/add/remove/force
+sp_func_call_paren_empty        = remove   # ignore/add/remove/force
 
 # Add or remove space between the user function name and '(' on function
 # calls. You need to set a keyword to be a user function in the config file,

From 3a9d948032e27f690e1fb09084c36bd47b1a75a0 Mon Sep 17 00:00:00 2001
From: Jonathan Hogg <me@jonathanhogg.com>
Date: Thu, 18 Jun 2020 12:44:54 +0100
Subject: [PATCH 0093/3533] esp32/esp32_rmt: Call rmt_driver_install before
 rmt_config.

Otherwise the RMT will repeat pulses when using loop(True).  This repeating
is due to a bug in the IDF which will be fixed in an upcoming release, but
for now the accepted workaround is to swap these calls, which should still
work in the fixed version of the IDF.

Fixes issue #6167.
---
 ports/esp32/esp32_rmt.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/esp32/esp32_rmt.c b/ports/esp32/esp32_rmt.c
index 846c80d478f0b..2ed4c9f6968c4 100644
--- a/ports/esp32/esp32_rmt.c
+++ b/ports/esp32/esp32_rmt.c
@@ -110,8 +110,8 @@ STATIC mp_obj_t esp32_rmt_make_new(const mp_obj_type_t *type, size_t n_args, siz
 
     config.clk_div = self->clock_div;
 
-    check_esp_err(rmt_config(&config));
     check_esp_err(rmt_driver_install(config.channel, 0, 0));
+    check_esp_err(rmt_config(&config));
 
     return MP_OBJ_FROM_PTR(self);
 }

From 6164c7e666fdd0aba232191768a66ab4434a7222 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 18 Jun 2020 10:58:51 +1000
Subject: [PATCH 0094/3533] py/misc.h: Add missing semi-colon in
 mp_float_union_t for big-endian.

Fixes issue #6161.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/misc.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/py/misc.h b/py/misc.h
index c7060ddf9d223..2dd20365c934c 100644
--- a/py/misc.h
+++ b/py/misc.h
@@ -247,7 +247,7 @@ typedef union _mp_float_union_t {
     } p;
     #else
     struct {
-        mp_float_uint_t sgn : 1
+        mp_float_uint_t sgn : 1;
         mp_float_uint_t exp : MP_FLOAT_EXP_BITS;
         mp_float_uint_t frc : MP_FLOAT_FRAC_BITS;
     } p;

From f1ba2c9d88078df8758ee9072b02d48e70c0b305 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 18 Jun 2020 10:59:29 +1000
Subject: [PATCH 0095/3533] qemu-arm/Makefile: Add CFLAGS_EXTRA to CFLAGS.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/qemu-arm/Makefile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/qemu-arm/Makefile b/ports/qemu-arm/Makefile
index e7b6523f88c2f..aebc5afaeb773 100644
--- a/ports/qemu-arm/Makefile
+++ b/ports/qemu-arm/Makefile
@@ -42,6 +42,7 @@ INC += -I$(BUILD)
 
 CFLAGS += $(INC) -Wall -Wpointer-arith -Wdouble-promotion -Wfloat-conversion -Werror -std=gnu99 $(COPT) \
 	 -ffunction-sections -fdata-sections
+CFLAGS += $(CFLAGS_EXTRA)
 
 # Debugging/Optimization
 ifeq ($(DEBUG), 1)

From ac15be9365808919dc18c6fbfee55e074671c2aa Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 18 Jun 2020 10:59:53 +1000
Subject: [PATCH 0096/3533] travis: Build qemu-arm with MP_ENDIANNESS_BIG=1 to
 test bigendian build.

Eventually it would be good to run the full test suite on a big-endian
system, but for now this will help to catch build errors with the
big-endian configuration.

Signed-off-by: Damien George <damien@micropython.org>
---
 .travis.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 1cb5575c73636..09da9598e2018 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -90,6 +90,8 @@ jobs:
         - qemu-system-arm --version
       script:
         - make ${MAKEOPTS} -C mpy-cross
+        - make ${MAKEOPTS} -C ports/qemu-arm CFLAGS_EXTRA=-DMP_ENDIANNESS_BIG=1
+        - make ${MAKEOPTS} -C ports/qemu-arm clean
         - make ${MAKEOPTS} -C ports/qemu-arm -f Makefile.test test
       after_failure:
         - grep --text "FAIL" ports/qemu-arm/build/console.out

From 5f3c2f1fa8e7a41ff85aaaea98bfb3d98459e136 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 18 Jun 2020 12:19:04 +1000
Subject: [PATCH 0097/3533] stm32/irq: Clean up irq.h so it does not depend on
 core uPy defines.

The irq.h file now just provides low-level IRQ definitions and priorities.
All Python binding definitions are moved to modmachine.h, with some
renaming of pyb -> machine, and also the machine_idle definition (was
pyb_wfi) is moved to modmachine.c.

The cc3200 and teensy ports are updated to build with these changes.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/cc3200/mods/modmachine.c |  8 ++++---
 ports/stm32/irq.c              | 38 ++++++++++------------------------
 ports/stm32/irq.h              |  7 +------
 ports/stm32/modmachine.c       | 15 +++++++++++---
 ports/stm32/modmachine.h       |  7 +++++++
 ports/stm32/modpyb.c           |  6 +++---
 ports/teensy/modpyb.c          | 12 ++++++++---
 7 files changed, 48 insertions(+), 45 deletions(-)

diff --git a/ports/cc3200/mods/modmachine.c b/ports/cc3200/mods/modmachine.c
index f70b399c07ebd..ddecd47f2b013 100644
--- a/ports/cc3200/mods/modmachine.c
+++ b/ports/cc3200/mods/modmachine.c
@@ -29,7 +29,6 @@
 
 #include "py/runtime.h"
 #include "py/mphal.h"
-#include "irq.h"
 #include "inc/hw_types.h"
 #include "inc/hw_gpio.h"
 #include "inc/hw_ints.h"
@@ -69,6 +68,9 @@ extern OsiTaskHandle    xSimpleLinkSpawnTaskHndl;
 /// \module machine - functions related to the SoC
 ///
 
+MP_DECLARE_CONST_FUN_OBJ_0(machine_disable_irq_obj);
+MP_DECLARE_CONST_FUN_OBJ_VAR_BETWEEN(machine_enable_irq_obj);
+
 /******************************************************************************/
 // MicroPython bindings;
 
@@ -176,8 +178,8 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_reset_cause),         MP_ROM_PTR(&machine_reset_cause_obj) },
     { MP_ROM_QSTR(MP_QSTR_wake_reason),         MP_ROM_PTR(&machine_wake_reason_obj) },
 
-    { MP_ROM_QSTR(MP_QSTR_disable_irq),         MP_ROM_PTR(&pyb_disable_irq_obj) },
-    { MP_ROM_QSTR(MP_QSTR_enable_irq),          MP_ROM_PTR(&pyb_enable_irq_obj) },
+    { MP_ROM_QSTR(MP_QSTR_disable_irq),         MP_ROM_PTR(&machine_disable_irq_obj) },
+    { MP_ROM_QSTR(MP_QSTR_enable_irq),          MP_ROM_PTR(&machine_enable_irq_obj) },
 
     { MP_ROM_QSTR(MP_QSTR_RTC),                 MP_ROM_PTR(&pyb_rtc_type) },
     { MP_ROM_QSTR(MP_QSTR_Pin),                 MP_ROM_PTR(&pin_type) },
diff --git a/ports/stm32/irq.c b/ports/stm32/irq.c
index 0100899733098..fdaf2385cc9d1 100644
--- a/ports/stm32/irq.c
+++ b/ports/stm32/irq.c
@@ -27,44 +27,28 @@
 #include "py/obj.h"
 #include "py/mphal.h"
 #include "irq.h"
-
-/// \moduleref pyb
+#include "modmachine.h"
 
 #if IRQ_ENABLE_STATS
 uint32_t irq_stats[IRQ_STATS_MAX] = {0};
 #endif
 
-/// \function wfi()
-/// Wait for an interrupt.
-/// This executies a `wfi` instruction which reduces power consumption
-/// of the MCU until an interrupt occurs, at which point execution continues.
-STATIC mp_obj_t pyb_wfi(void) {
-    __WFI();
-    return mp_const_none;
-}
-MP_DEFINE_CONST_FUN_OBJ_0(pyb_wfi_obj, pyb_wfi);
-
-/// \function disable_irq()
-/// Disable interrupt requests.
-/// Returns the previous IRQ state: `False`/`True` for disabled/enabled IRQs
-/// respectively.  This return value can be passed to enable_irq to restore
-/// the IRQ to its original state.
-STATIC mp_obj_t pyb_disable_irq(void) {
+// disable_irq()
+// Disable interrupt requests.
+// Returns the previous IRQ state which can be passed to enable_irq.
+STATIC mp_obj_t machine_disable_irq(void) {
     return mp_obj_new_bool(disable_irq() == IRQ_STATE_ENABLED);
 }
-MP_DEFINE_CONST_FUN_OBJ_0(pyb_disable_irq_obj, pyb_disable_irq);
+MP_DEFINE_CONST_FUN_OBJ_0(machine_disable_irq_obj, machine_disable_irq);
 
-/// \function enable_irq(state=True)
-/// Enable interrupt requests.
-/// If `state` is `True` (the default value) then IRQs are enabled.
-/// If `state` is `False` then IRQs are disabled.  The most common use of
-/// this function is to pass it the value returned by `disable_irq` to
-/// exit a critical section.
-STATIC mp_obj_t pyb_enable_irq(uint n_args, const mp_obj_t *arg) {
+// enable_irq(state=True)
+// Enable interrupt requests, based on the argument, which is usually the
+// value returned by a previous call to disable_irq.
+STATIC mp_obj_t machine_enable_irq(uint n_args, const mp_obj_t *arg) {
     enable_irq((n_args == 0 || mp_obj_is_true(arg[0])) ? IRQ_STATE_ENABLED : IRQ_STATE_DISABLED);
     return mp_const_none;
 }
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pyb_enable_irq_obj, 0, 1, pyb_enable_irq);
+MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_enable_irq_obj, 0, 1, machine_enable_irq);
 
 #if IRQ_ENABLE_STATS
 // return a memoryview of the irq statistics array
diff --git a/ports/stm32/irq.h b/ports/stm32/irq.h
index 4b1251666c202..6c10f5e1b07f5 100644
--- a/ports/stm32/irq.h
+++ b/ports/stm32/irq.h
@@ -52,7 +52,7 @@ extern uint32_t irq_stats[IRQ_STATS_MAX];
 #define IRQ_EXIT(irq)
 #endif
 
-static inline mp_uint_t query_irq(void) {
+static inline uint32_t query_irq(void) {
     return __get_PRIMASK();
 }
 
@@ -92,11 +92,6 @@ static inline void restore_irq_pri(uint32_t state) {
 
 #endif
 
-MP_DECLARE_CONST_FUN_OBJ_0(pyb_wfi_obj);
-MP_DECLARE_CONST_FUN_OBJ_0(pyb_disable_irq_obj);
-MP_DECLARE_CONST_FUN_OBJ_VAR_BETWEEN(pyb_enable_irq_obj);
-MP_DECLARE_CONST_FUN_OBJ_0(pyb_irq_stats_obj);
-
 // IRQ priority definitions.
 //
 // Lower number implies higher interrupt priority.
diff --git a/ports/stm32/modmachine.c b/ports/stm32/modmachine.c
index 6fd2488a5ae7b..ac4d8712397e4 100644
--- a/ports/stm32/modmachine.c
+++ b/ports/stm32/modmachine.c
@@ -346,6 +346,15 @@ STATIC mp_obj_t machine_freq(size_t n_args, const mp_obj_t *args) {
 }
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_freq_obj, 0, 4, machine_freq);
 
+// idle()
+// This executies a wfi machine instruction which reduces power consumption
+// of the MCU until an interrupt occurs, at which point execution continues.
+STATIC mp_obj_t machine_idle(void) {
+    __WFI();
+    return mp_const_none;
+}
+MP_DEFINE_CONST_FUN_OBJ_0(machine_idle_obj, machine_idle);
+
 STATIC mp_obj_t machine_lightsleep(size_t n_args, const mp_obj_t *args) {
     if (n_args != 0) {
         mp_obj_t args2[2] = {MP_OBJ_NULL, args[0]};
@@ -382,7 +391,7 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     #if MICROPY_HW_ENABLE_RNG
     { MP_ROM_QSTR(MP_QSTR_rng),                 MP_ROM_PTR(&pyb_rng_get_obj) },
     #endif
-    { MP_ROM_QSTR(MP_QSTR_idle),                MP_ROM_PTR(&pyb_wfi_obj) },
+    { MP_ROM_QSTR(MP_QSTR_idle),                MP_ROM_PTR(&machine_idle_obj) },
     { MP_ROM_QSTR(MP_QSTR_sleep),               MP_ROM_PTR(&machine_lightsleep_obj) },
     { MP_ROM_QSTR(MP_QSTR_lightsleep),          MP_ROM_PTR(&machine_lightsleep_obj) },
     { MP_ROM_QSTR(MP_QSTR_deepsleep),           MP_ROM_PTR(&machine_deepsleep_obj) },
@@ -391,8 +400,8 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_wake_reason),         MP_ROM_PTR(&machine_wake_reason_obj) },
     #endif
 
-    { MP_ROM_QSTR(MP_QSTR_disable_irq),         MP_ROM_PTR(&pyb_disable_irq_obj) },
-    { MP_ROM_QSTR(MP_QSTR_enable_irq),          MP_ROM_PTR(&pyb_enable_irq_obj) },
+    { MP_ROM_QSTR(MP_QSTR_disable_irq),         MP_ROM_PTR(&machine_disable_irq_obj) },
+    { MP_ROM_QSTR(MP_QSTR_enable_irq),          MP_ROM_PTR(&machine_enable_irq_obj) },
 
     { MP_ROM_QSTR(MP_QSTR_time_pulse_us),       MP_ROM_PTR(&machine_time_pulse_us_obj) },
 
diff --git a/ports/stm32/modmachine.h b/ports/stm32/modmachine.h
index f04bfb486bb81..e4ccf638855e8 100644
--- a/ports/stm32/modmachine.h
+++ b/ports/stm32/modmachine.h
@@ -39,7 +39,14 @@ MP_DECLARE_CONST_FUN_OBJ_0(machine_unique_id_obj);
 MP_DECLARE_CONST_FUN_OBJ_0(machine_reset_obj);
 MP_DECLARE_CONST_FUN_OBJ_VAR_BETWEEN(machine_bootloader_obj);
 MP_DECLARE_CONST_FUN_OBJ_VAR_BETWEEN(machine_freq_obj);
+
+MP_DECLARE_CONST_FUN_OBJ_0(machine_idle_obj);
 MP_DECLARE_CONST_FUN_OBJ_VAR_BETWEEN(machine_lightsleep_obj);
 MP_DECLARE_CONST_FUN_OBJ_VAR_BETWEEN(machine_deepsleep_obj);
 
+MP_DECLARE_CONST_FUN_OBJ_0(machine_disable_irq_obj);
+MP_DECLARE_CONST_FUN_OBJ_VAR_BETWEEN(machine_enable_irq_obj);
+
+MP_DECLARE_CONST_FUN_OBJ_0(pyb_irq_stats_obj);
+
 #endif // MICROPY_INCLUDED_STM32_MODMACHINE_H
diff --git a/ports/stm32/modpyb.c b/ports/stm32/modpyb.c
index 321fb62e9a162..c92090699108e 100644
--- a/ports/stm32/modpyb.c
+++ b/ports/stm32/modpyb.c
@@ -146,9 +146,9 @@ STATIC const mp_rom_map_elem_t pyb_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_repl_info), MP_ROM_PTR(&pyb_set_repl_info_obj) },
     #endif
 
-    { MP_ROM_QSTR(MP_QSTR_wfi), MP_ROM_PTR(&pyb_wfi_obj) },
-    { MP_ROM_QSTR(MP_QSTR_disable_irq), MP_ROM_PTR(&pyb_disable_irq_obj) },
-    { MP_ROM_QSTR(MP_QSTR_enable_irq), MP_ROM_PTR(&pyb_enable_irq_obj) },
+    { MP_ROM_QSTR(MP_QSTR_wfi), MP_ROM_PTR(&machine_idle_obj) },
+    { MP_ROM_QSTR(MP_QSTR_disable_irq), MP_ROM_PTR(&machine_disable_irq_obj) },
+    { MP_ROM_QSTR(MP_QSTR_enable_irq), MP_ROM_PTR(&machine_enable_irq_obj) },
     #if IRQ_ENABLE_STATS
     { MP_ROM_QSTR(MP_QSTR_irq_stats), MP_ROM_PTR(&pyb_irq_stats_obj) },
     #endif
diff --git a/ports/teensy/modpyb.c b/ports/teensy/modpyb.c
index 26e3f4c43a0dc..f4384a885426e 100644
--- a/ports/teensy/modpyb.c
+++ b/ports/teensy/modpyb.c
@@ -36,7 +36,6 @@
 #include "lib/utils/pyexec.h"
 
 #include "gccollect.h"
-#include "irq.h"
 #include "systick.h"
 #include "led.h"
 #include "pin.h"
@@ -53,6 +52,7 @@
 #include "dac.h"
 #include "usb.h"
 #include "portmodules.h"
+#include "modmachine.h"
 
 /// \module pyb - functions related to the pyboard
 ///
@@ -230,6 +230,12 @@ STATIC mp_obj_t pyb_udelay(mp_obj_t usec_in) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(pyb_udelay_obj, pyb_udelay);
 
+STATIC mp_obj_t pyb_wfi(void) {
+    __WFI();
+    return mp_const_none;
+}
+MP_DEFINE_CONST_FUN_OBJ_0(pyb_wfi_obj, pyb_wfi);
+
 STATIC mp_obj_t pyb_stop(void) {
     printf("stop not currently implemented\n");
     return mp_const_none;
@@ -285,8 +291,8 @@ STATIC const mp_rom_map_elem_t pyb_module_globals_table[] = {
     #endif
 
     { MP_ROM_QSTR(MP_QSTR_wfi), MP_ROM_PTR(&pyb_wfi_obj) },
-    { MP_ROM_QSTR(MP_QSTR_disable_irq), MP_ROM_PTR(&pyb_disable_irq_obj) },
-    { MP_ROM_QSTR(MP_QSTR_enable_irq), MP_ROM_PTR(&pyb_enable_irq_obj) },
+    { MP_ROM_QSTR(MP_QSTR_disable_irq), MP_ROM_PTR(&machine_disable_irq_obj) },
+    { MP_ROM_QSTR(MP_QSTR_enable_irq), MP_ROM_PTR(&machine_enable_irq_obj) },
 
     { MP_ROM_QSTR(MP_QSTR_stop), MP_ROM_PTR(&pyb_stop_obj) },
     { MP_ROM_QSTR(MP_QSTR_standby), MP_ROM_PTR(&pyb_standby_obj) },

From ce326699d7bb4e618600475c856f2ee1fe333442 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 18 Jun 2020 13:33:31 +1000
Subject: [PATCH 0098/3533] stm32/powerctrlboot: Include irq.h to get
 definitions of IRQ priorities.

irq.h is included by py/mphal.h but it's better to be explicit, eg if mboot
uses powerctrlboot.c.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/powerctrlboot.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/stm32/powerctrlboot.c b/ports/stm32/powerctrlboot.c
index 749cb5505caaa..206b19b75067a 100644
--- a/ports/stm32/powerctrlboot.c
+++ b/ports/stm32/powerctrlboot.c
@@ -25,6 +25,7 @@
  */
 
 #include "py/mphal.h"
+#include "irq.h"
 #include "powerctrl.h"
 
 static inline void powerctrl_config_systick(void) {

From afd47d58ac25b292bb7ff5ba3b1c53dbf3750d81 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 18 Jun 2020 13:35:53 +1000
Subject: [PATCH 0099/3533] stm32/flash: Make flash C-API reusable, and funcs
 return an error code.

This commit makes the low-level flash C functions usable by code other than
flashbdev.c (eg by mboot).  Changes in this commit are:
- flash_erase() and flash_write() now return an errno error code, a
  negative value on error.
- flash_erase() now automatically locks the flash, as well as unlocking it.
- flash_write() now automatically unlocks the flash, as well as locking it.
- flashbdev.c is modified for the above changes.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/flash.c     | 68 +++++++++++++++++++++--------------------
 ports/stm32/flash.h     |  4 +--
 ports/stm32/mphalport.h |  4 +++
 3 files changed, 41 insertions(+), 35 deletions(-)

diff --git a/ports/stm32/flash.c b/ports/stm32/flash.c
index 99c95f7d993ed..7c7d2f7b6e0dd 100644
--- a/ports/stm32/flash.c
+++ b/ports/stm32/flash.c
@@ -26,6 +26,7 @@
 
 #include "py/mpconfig.h"
 #include "py/misc.h"
+#include "py/mphal.h"
 #include "flash.h"
 
 typedef struct {
@@ -162,17 +163,18 @@ uint32_t flash_get_sector_info(uint32_t addr, uint32_t *start_addr, uint32_t *si
     return 0;
 }
 
-void flash_erase(uint32_t flash_dest, uint32_t num_word32) {
+int flash_erase(uint32_t flash_dest, uint32_t num_word32) {
     // check there is something to write
     if (num_word32 == 0) {
-        return;
+        return 0;
     }
 
-    // unlock
+    // Unlock the flash for erase.
     HAL_FLASH_Unlock();
 
-    FLASH_EraseInitTypeDef EraseInitStruct;
+    // Clear pending flags (if any) and set up EraseInitStruct.
 
+    FLASH_EraseInitTypeDef EraseInitStruct;
     #if defined(STM32F0)
     __HAL_FLASH_CLEAR_FLAG(FLASH_FLAG_EOP | FLASH_FLAG_WRPERR | FLASH_FLAG_PGERR);
     EraseInitStruct.TypeErase = FLASH_TYPEERASE_PAGES;
@@ -190,17 +192,14 @@ void flash_erase(uint32_t flash_dest, uint32_t num_word32) {
     EraseInitStruct.NbPages = (4 * num_word32 + FLASH_PAGE_SIZE - 4) / FLASH_PAGE_SIZE;
     #elif defined(STM32L4)
     __HAL_FLASH_CLEAR_FLAG(FLASH_FLAG_ALL_ERRORS);
-
-    // erase the sector(s)
     // The sector returned by flash_get_sector_info can not be used
     // as the flash has on each bank 0/1 pages 0..255
     EraseInitStruct.TypeErase = FLASH_TYPEERASE_PAGES;
     EraseInitStruct.Banks = get_bank(flash_dest);
     EraseInitStruct.Page = get_page(flash_dest);
     EraseInitStruct.NbPages = get_page(flash_dest + 4 * num_word32 - 1) - EraseInitStruct.Page + 1;
-    ;
     #else
-    // Clear pending flags (if any)
+
     #if defined(STM32H7)
     __HAL_FLASH_CLEAR_FLAG(FLASH_FLAG_ALL_ERRORS_BANK1 | FLASH_FLAG_ALL_ERRORS_BANK2);
     #else
@@ -208,7 +207,6 @@ void flash_erase(uint32_t flash_dest, uint32_t num_word32) {
         FLASH_FLAG_PGAERR | FLASH_FLAG_PGPERR | FLASH_FLAG_PGSERR);
     #endif
 
-    // erase the sector(s)
     EraseInitStruct.TypeErase = TYPEERASE_SECTORS;
     EraseInitStruct.VoltageRange = VOLTAGE_RANGE_3; // voltage range needs to be 2.7V to 3.6V
     #if defined(STM32H7)
@@ -216,14 +214,17 @@ void flash_erase(uint32_t flash_dest, uint32_t num_word32) {
     #endif
     EraseInitStruct.Sector = flash_get_sector_info(flash_dest, NULL, NULL);
     EraseInitStruct.NbSectors = flash_get_sector_info(flash_dest + 4 * num_word32 - 1, NULL, NULL) - EraseInitStruct.Sector + 1;
+
     #endif
 
+    // Erase the sectors.
     uint32_t SectorError = 0;
-    if (HAL_FLASHEx_Erase(&EraseInitStruct, &SectorError) != HAL_OK) {
-        // error occurred during sector erase
-        HAL_FLASH_Lock(); // lock the flash
-        return;
-    }
+    HAL_StatusTypeDef status = HAL_FLASHEx_Erase(&EraseInitStruct, &SectorError);
+
+    // Lock the flash after erase.
+    HAL_FLASH_Lock();
+
+    return mp_hal_status_to_neg_errno(status);
 }
 
 /*
@@ -255,16 +256,21 @@ void flash_erase_it(uint32_t flash_dest, uint32_t num_word32) {
 }
 */
 
-void flash_write(uint32_t flash_dest, const uint32_t *src, uint32_t num_word32) {
+int flash_write(uint32_t flash_dest, const uint32_t *src, uint32_t num_word32) {
+    // Unlock the flash for write.
+    HAL_FLASH_Unlock();
+
+    HAL_StatusTypeDef status = HAL_OK;
+
     #if defined(STM32L4) || defined(STM32WB)
 
     // program the flash uint64 by uint64
     for (int i = 0; i < num_word32 / 2; i++) {
         uint64_t val = *(uint64_t *)src;
-        if (HAL_FLASH_Program(FLASH_TYPEPROGRAM_DOUBLEWORD, flash_dest, val) != HAL_OK) {
-            // error occurred during flash write
-            HAL_FLASH_Lock(); // lock the flash
-            return;
+        status = HAL_FLASH_Program(FLASH_TYPEPROGRAM_DOUBLEWORD, flash_dest, val);
+        if (status != HAL_OK) {
+            num_word32 = 0; // don't write any odd word after this loop
+            break;
         }
         flash_dest += 8;
         src += 2;
@@ -272,21 +278,16 @@ void flash_write(uint32_t flash_dest, const uint32_t *src, uint32_t num_word32)
     if ((num_word32 & 0x01) == 1) {
         uint64_t val = *(uint64_t *)flash_dest;
         val = (val & 0xffffffff00000000uL) | (*src);
-        if (HAL_FLASH_Program(FLASH_TYPEPROGRAM_DOUBLEWORD, flash_dest, val) != HAL_OK) {
-            // error occurred during flash write
-            HAL_FLASH_Lock(); // lock the flash
-            return;
-        }
+        status = HAL_FLASH_Program(FLASH_TYPEPROGRAM_DOUBLEWORD, flash_dest, val);
     }
 
     #elif defined(STM32H7)
 
     // program the flash 256 bits at a time
     for (int i = 0; i < num_word32 / 8; i++) {
-        if (HAL_FLASH_Program(FLASH_TYPEPROGRAM_FLASHWORD, flash_dest, (uint64_t)(uint32_t)src) != HAL_OK) {
-            // error occurred during flash write
-            HAL_FLASH_Lock(); // lock the flash
-            return;
+        status = HAL_FLASH_Program(FLASH_TYPEPROGRAM_FLASHWORD, flash_dest, (uint64_t)(uint32_t)src);
+        if (status != HAL_OK) {
+            break;
         }
         flash_dest += 32;
         src += 8;
@@ -296,10 +297,9 @@ void flash_write(uint32_t flash_dest, const uint32_t *src, uint32_t num_word32)
 
     // program the flash word by word
     for (int i = 0; i < num_word32; i++) {
-        if (HAL_FLASH_Program(FLASH_TYPEPROGRAM_WORD, flash_dest, *src) != HAL_OK) {
-            // error occurred during flash write
-            HAL_FLASH_Lock(); // lock the flash
-            return;
+        status = HAL_FLASH_Program(FLASH_TYPEPROGRAM_WORD, flash_dest, *src);
+        if (status != HAL_OK) {
+            break;
         }
         flash_dest += 4;
         src += 1;
@@ -307,8 +307,10 @@ void flash_write(uint32_t flash_dest, const uint32_t *src, uint32_t num_word32)
 
     #endif
 
-    // lock the flash
+    // Lock the flash after write.
     HAL_FLASH_Lock();
+
+    return mp_hal_status_to_neg_errno(status);
 }
 
 /*
diff --git a/ports/stm32/flash.h b/ports/stm32/flash.h
index b9edf610610cb..048914e501e22 100644
--- a/ports/stm32/flash.h
+++ b/ports/stm32/flash.h
@@ -27,7 +27,7 @@
 #define MICROPY_INCLUDED_STM32_FLASH_H
 
 uint32_t flash_get_sector_info(uint32_t addr, uint32_t *start_addr, uint32_t *size);
-void flash_erase(uint32_t flash_dest, uint32_t num_word32);
-void flash_write(uint32_t flash_dest, const uint32_t *src, uint32_t num_word32);
+int flash_erase(uint32_t flash_dest, uint32_t num_word32);
+int flash_write(uint32_t flash_dest, const uint32_t *src, uint32_t num_word32);
 
 #endif // MICROPY_INCLUDED_STM32_FLASH_H
diff --git a/ports/stm32/mphalport.h b/ports/stm32/mphalport.h
index fe9378a1c7252..a76945db5fea7 100644
--- a/ports/stm32/mphalport.h
+++ b/ports/stm32/mphalport.h
@@ -4,6 +4,10 @@
 
 extern const unsigned char mp_hal_status_to_errno_table[4];
 
+static inline int mp_hal_status_to_neg_errno(HAL_StatusTypeDef status) {
+    return -mp_hal_status_to_errno_table[status];
+}
+
 NORETURN void mp_hal_raise(HAL_StatusTypeDef status);
 void mp_hal_set_interrupt_char(int c); // -1 to disable
 

From 4c8a68df6f25ed98d097b0defd3180739c813654 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 18 Jun 2020 13:40:30 +1000
Subject: [PATCH 0100/3533] stm32/i2cslave: Add support for WB MCUs.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/i2cslave.c | 2 +-
 ports/stm32/i2cslave.h | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/ports/stm32/i2cslave.c b/ports/stm32/i2cslave.c
index cacc00e0c4141..149e105ee8207 100644
--- a/ports/stm32/i2cslave.c
+++ b/ports/stm32/i2cslave.c
@@ -60,7 +60,7 @@ void i2c_slave_ev_irq_handler(i2c_slave_t *i2c) {
     }
 }
 
-#elif defined(STM32F7) || defined(STM32H7)
+#elif defined(STM32F7) || defined(STM32H7) || defined(STM32WB)
 
 void i2c_slave_init_helper(i2c_slave_t *i2c, int addr) {
     i2c->CR1 = I2C_CR1_STOPIE | I2C_CR1_ADDRIE | I2C_CR1_RXIE | I2C_CR1_TXIE;
diff --git a/ports/stm32/i2cslave.h b/ports/stm32/i2cslave.h
index 55882acd8eb2e..f335c9291226c 100644
--- a/ports/stm32/i2cslave.h
+++ b/ports/stm32/i2cslave.h
@@ -28,6 +28,11 @@
 
 #include STM32_HAL_H
 
+#if !defined(I2C2_BASE)
+// This MCU doesn't have I2C2_BASE, define it so that the i2c_idx calculation works.
+#define I2C2_BASE (I2C1_BASE + ((I2C3_BASE - I2C1_BASE) / 2))
+#endif
+
 typedef I2C_TypeDef i2c_slave_t;
 
 void i2c_slave_init_helper(i2c_slave_t *i2c, int addr);
@@ -42,6 +47,10 @@ static inline void i2c_slave_init(i2c_slave_t *i2c, int irqn, int irq_pri, int a
     RCC->APB1LENR |= 1 << (RCC_APB1LENR_I2C1EN_Pos + i2c_idx);
     volatile uint32_t tmp = RCC->APB1LENR; // Delay after enabling clock
     (void)tmp;
+    #elif defined(STM32WB)
+    RCC->APB1ENR1 |= 1 << (RCC_APB1ENR1_I2C1EN_Pos + i2c_idx);
+    volatile uint32_t tmp = RCC->APB1ENR1; // Delay after enabling clock
+    (void)tmp;
     #endif
 
     i2c_slave_init_helper(i2c, addr);

From 736daebfc8c7dce2fab10ee311519034d702c8b6 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 18 Jun 2020 15:12:25 +1000
Subject: [PATCH 0101/3533] stm32/flash: Add flash_is_valid_addr, and extend
 sectors for 2MB F7.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/flash.c | 12 ++++++++++++
 ports/stm32/flash.h |  1 +
 2 files changed, 13 insertions(+)

diff --git a/ports/stm32/flash.c b/ports/stm32/flash.c
index 7c7d2f7b6e0dd..5f96696a9ffd7 100644
--- a/ports/stm32/flash.c
+++ b/ports/stm32/flash.c
@@ -70,10 +70,15 @@ static const flash_layout_t flash_layout[] = {
     { 0x08020000, 0x20000, 3 },
 };
 #else
+// This is for dual-bank mode disabled
 static const flash_layout_t flash_layout[] = {
     { 0x08000000, 0x08000, 4 },
     { 0x08020000, 0x20000, 1 },
+    #if FLASH_SECTOR_TOTAL == 8
     { 0x08040000, 0x40000, 3 },
+    #else
+    { 0x08040000, 0x40000, 7 },
+    #endif
 };
 #endif
 
@@ -139,6 +144,13 @@ static uint32_t get_page(uint32_t addr) {
 
 #endif
 
+bool flash_is_valid_addr(uint32_t addr) {
+    uint8_t last = MP_ARRAY_SIZE(flash_layout) - 1;
+    uint32_t end_of_flash = flash_layout[last].base_address +
+        flash_layout[last].sector_count * flash_layout[last].sector_size;
+    return flash_layout[0].base_address <= addr && addr < end_of_flash;
+}
+
 uint32_t flash_get_sector_info(uint32_t addr, uint32_t *start_addr, uint32_t *size) {
     if (addr >= flash_layout[0].base_address) {
         uint32_t sector_index = 0;
diff --git a/ports/stm32/flash.h b/ports/stm32/flash.h
index 048914e501e22..12cdaca55aab9 100644
--- a/ports/stm32/flash.h
+++ b/ports/stm32/flash.h
@@ -26,6 +26,7 @@
 #ifndef MICROPY_INCLUDED_STM32_FLASH_H
 #define MICROPY_INCLUDED_STM32_FLASH_H
 
+bool flash_is_valid_addr(uint32_t addr);
 uint32_t flash_get_sector_info(uint32_t addr, uint32_t *start_addr, uint32_t *size);
 int flash_erase(uint32_t flash_dest, uint32_t num_word32);
 int flash_write(uint32_t flash_dest, const uint32_t *src, uint32_t num_word32);

From a8778c8dc8849dfba14fb17ba148e4d0f78f0467 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 18 Jun 2020 17:27:52 +1000
Subject: [PATCH 0102/3533] stm32/mboot: Use flash routines from main stm32
 code rather than custom.

The flash functions in ports/stm32/flash.c are almost identical to those in
ports/stm32/mboot/main.c, so remove the duplicated code in mboot and use
instead the main stm32 code.  This also allows supporting other MCU series.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/mboot/Makefile    |   3 +-
 ports/stm32/mboot/main.c      | 162 ++++------------------------------
 ports/stm32/mboot/mphalport.h |   5 ++
 3 files changed, 25 insertions(+), 145 deletions(-)

diff --git a/ports/stm32/mboot/Makefile b/ports/stm32/mboot/Makefile
index 43aae2a6785f3..a5db1666dd313 100755
--- a/ports/stm32/mboot/Makefile
+++ b/ports/stm32/mboot/Makefile
@@ -99,9 +99,10 @@ SRC_C = \
 	drivers/bus/softspi.c \
 	drivers/bus/softqspi.c \
 	drivers/memory/spiflash.c \
+	ports/stm32/flash.c \
+	ports/stm32/flashbdev.c \
 	ports/stm32/i2cslave.c \
 	ports/stm32/qspi.c \
-	ports/stm32/flashbdev.c \
 	ports/stm32/spibdev.c \
 	ports/stm32/usbd_conf.c \
 	$(wildcard $(BOARD_DIR)/*.c)
diff --git a/ports/stm32/mboot/main.c b/ports/stm32/mboot/main.c
index 4ae575f3ddf41..c53920ccf0244 100644
--- a/ports/stm32/mboot/main.c
+++ b/ports/stm32/mboot/main.c
@@ -31,6 +31,7 @@
 #include "extmod/crypto-algorithms/sha256.c"
 #include "usbd_core.h"
 #include "storage.h"
+#include "flash.h"
 #include "i2cslave.h"
 #include "mboot.h"
 #include "dfu.h"
@@ -500,115 +501,26 @@ static int usrbtn_state(void) {
 #define MBOOT_SPIFLASH2_LAYOUT ""
 #endif
 
-typedef struct {
-    uint32_t base_address;
-    uint32_t sector_size;
-    uint32_t sector_count;
-} flash_layout_t;
-
-#if defined(STM32F7)
-// FLASH_FLAG_PGSERR (Programming Sequence Error) was renamed to
-// FLASH_FLAG_ERSERR (Erasing Sequence Error) in STM32F7
-#define FLASH_FLAG_PGSERR FLASH_FLAG_ERSERR
-#endif
-
 #if defined(STM32F4) \
     || defined(STM32F722xx) \
     || defined(STM32F723xx) \
     || defined(STM32F732xx) \
     || defined(STM32F733xx)
-
 #define FLASH_LAYOUT_STR "@Internal Flash  /0x08000000/04*016Kg,01*064Kg,07*128Kg" MBOOT_SPIFLASH_LAYOUT MBOOT_SPIFLASH2_LAYOUT
-
-static const flash_layout_t flash_layout[] = {
-    { 0x08000000, 0x04000, 4 },
-    { 0x08010000, 0x10000, 1 },
-    { 0x08020000, 0x20000, 3 },
-    #if defined(FLASH_SECTOR_8)
-    { 0x08080000, 0x20000, 4 },
-    #endif
-    #if defined(FLASH_SECTOR_12)
-    { 0x08100000, 0x04000, 4 },
-    { 0x08110000, 0x10000, 1 },
-    { 0x08120000, 0x20000, 7 },
-    #endif
-};
-
 #elif defined(STM32F765xx) || defined(STM32F767xx) || defined(STM32F769xx)
-
 #define FLASH_LAYOUT_STR "@Internal Flash  /0x08000000/04*032Kg,01*128Kg,07*256Kg" MBOOT_SPIFLASH_LAYOUT MBOOT_SPIFLASH2_LAYOUT
-
-// This is for dual-bank mode disabled
-static const flash_layout_t flash_layout[] = {
-    { 0x08000000, 0x08000, 4 },
-    { 0x08020000, 0x20000, 1 },
-    { 0x08040000, 0x40000, 7 },
-};
-
 #elif defined(STM32H743xx)
-
 #define FLASH_LAYOUT_STR "@Internal Flash  /0x08000000/16*128Kg" MBOOT_SPIFLASH_LAYOUT MBOOT_SPIFLASH2_LAYOUT
-
-static const flash_layout_t flash_layout[] = {
-    { 0x08000000, 0x20000, 16 },
-};
-
-#endif
-
-static inline bool flash_is_valid_addr(uint32_t addr) {
-    uint8_t last = MP_ARRAY_SIZE(flash_layout) - 1;
-    uint32_t end_of_flash = flash_layout[last].base_address +
-        flash_layout[last].sector_count * flash_layout[last].sector_size;
-    return flash_layout[0].base_address <= addr && addr < end_of_flash;
-}
-
-static uint32_t flash_get_sector_index(uint32_t addr, uint32_t *sector_size) {
-    if (addr >= flash_layout[0].base_address) {
-        uint32_t sector_index = 0;
-        for (int i = 0; i < MP_ARRAY_SIZE(flash_layout); ++i) {
-            for (int j = 0; j < flash_layout[i].sector_count; ++j) {
-                uint32_t sector_start_next = flash_layout[i].base_address
-                    + (j + 1) * flash_layout[i].sector_size;
-                if (addr < sector_start_next) {
-                    *sector_size = flash_layout[i].sector_size;
-                    return sector_index;
-                }
-                ++sector_index;
-            }
-        }
-    }
-    return 0;
-}
-
-#if defined(STM32H7)
-// get the bank of a given flash address
-static uint32_t get_bank(uint32_t addr) {
-    if (READ_BIT(FLASH->OPTCR, FLASH_OPTCR_SWAP_BANK) == 0) {
-        // no bank swap
-        if (addr < (FLASH_BASE + FLASH_BANK_SIZE)) {
-            return FLASH_BANK_1;
-        } else {
-            return FLASH_BANK_2;
-        }
-    } else {
-        // bank swap
-        if (addr < (FLASH_BASE + FLASH_BANK_SIZE)) {
-            return FLASH_BANK_2;
-        } else {
-            return FLASH_BANK_1;
-        }
-    }
-}
 #endif
 
-static int flash_mass_erase(void) {
+static int mboot_flash_mass_erase(void) {
     // TODO
     return -1;
 }
 
-static int flash_page_erase(uint32_t addr, uint32_t *next_addr) {
+static int mboot_flash_page_erase(uint32_t addr, uint32_t *next_addr) {
     uint32_t sector_size = 0;
-    uint32_t sector = flash_get_sector_index(addr, &sector_size);
+    uint32_t sector = flash_get_sector_info(addr, NULL, &sector_size);
     if (sector == 0) {
         // Don't allow to erase the sector with this bootloader in it
         dfu_context.status = DFU_STATUS_ERROR_ADDRESS;
@@ -618,30 +530,10 @@ static int flash_page_erase(uint32_t addr, uint32_t *next_addr) {
 
     *next_addr = addr + sector_size;
 
-    HAL_FLASH_Unlock();
-
-    // Clear pending flags (if any)
-    #if defined(STM32H7)
-    __HAL_FLASH_CLEAR_FLAG(FLASH_FLAG_ALL_ERRORS_BANK1 | FLASH_FLAG_ALL_ERRORS_BANK2);
-    #else
-    __HAL_FLASH_CLEAR_FLAG(FLASH_FLAG_EOP | FLASH_FLAG_OPERR | FLASH_FLAG_WRPERR |
-                           FLASH_FLAG_PGAERR | FLASH_FLAG_PGPERR | FLASH_FLAG_PGSERR);
-    #endif
-
-    // erase the sector(s)
-    FLASH_EraseInitTypeDef EraseInitStruct;
-    EraseInitStruct.TypeErase = TYPEERASE_SECTORS;
-    EraseInitStruct.VoltageRange = VOLTAGE_RANGE_3; // voltage range needs to be 2.7V to 3.6V
-    #if defined(STM32H7)
-    EraseInitStruct.Banks = get_bank(addr);
-    #endif
-    EraseInitStruct.Sector = sector;
-    EraseInitStruct.NbSectors = 1;
-
-    uint32_t SectorError = 0;
-    if (HAL_FLASHEx_Erase(&EraseInitStruct, &SectorError) != HAL_OK) {
-        // error occurred during sector erase
-        return -1;
+    // Erase the flash page.
+    int ret = flash_erase(addr, sector_size / sizeof(uint32_t));
+    if (ret != 0) {
+        return ret;
     }
 
     // Check the erase set bits to 1, at least for the first 256 bytes
@@ -654,8 +546,9 @@ static int flash_page_erase(uint32_t addr, uint32_t *next_addr) {
     return 0;
 }
 
-static int flash_write(uint32_t addr, const uint8_t *src8, size_t len) {
-    if (addr >= flash_layout[0].base_address && addr < flash_layout[0].base_address + flash_layout[0].sector_size) {
+static int mboot_flash_write(uint32_t addr, const uint8_t *src8, size_t len) {
+    uint32_t sector = flash_get_sector_info(addr, NULL, NULL);
+    if (sector == 0) {
         // Don't allow to write the sector with this bootloader in it
         dfu_context.status = DFU_STATUS_ERROR_ADDRESS;
         dfu_context.error = MBOOT_ERROR_STR_OVERWRITE_BOOTLOADER_IDX;
@@ -664,32 +557,13 @@ static int flash_write(uint32_t addr, const uint8_t *src8, size_t len) {
 
     const uint32_t *src = (const uint32_t*)src8;
     size_t num_word32 = (len + 3) / 4;
-    HAL_FLASH_Unlock();
 
-    #if defined(STM32H7)
-
-    // program the flash 256 bits at a time
-    for (int i = 0; i < num_word32 / 8; ++i) {
-        if (HAL_FLASH_Program(FLASH_TYPEPROGRAM_FLASHWORD, addr, (uint64_t)(uint32_t)src) != HAL_OK) {
-            return - 1;
-        }
-        addr += 32;
-        src += 8;
+    // Write the data to flash.
+    int ret = flash_write(addr, src, num_word32);
+    if (ret != 0) {
+        return ret;
     }
 
-    #else
-
-    // program the flash word by word
-    for (size_t i = 0; i < num_word32; i++) {
-        if (HAL_FLASH_Program(TYPEPROGRAM_WORD, addr, *src) != HAL_OK) {
-            return -1;
-        }
-        addr += 4;
-        src += 1;
-    }
-
-    #endif
-
     // TODO verify data
 
     return 0;
@@ -700,7 +574,7 @@ static int flash_write(uint32_t addr, const uint8_t *src8, size_t len) {
 
 static int do_mass_erase(void) {
     // TODO
-    return flash_mass_erase();
+    return mboot_flash_mass_erase();
 }
 
 #if defined(MBOOT_SPIFLASH_ADDR) || defined(MBOOT_SPIFLASH2_ADDR)
@@ -735,7 +609,7 @@ int do_page_erase(uint32_t addr, uint32_t *next_addr) {
     } else
     #endif
     {
-        ret = flash_page_erase(addr, next_addr);
+        ret = mboot_flash_page_erase(addr, next_addr);
     }
 
     led0_state((ret == 0) ? LED0_STATE_SLOW_FLASH : LED0_STATE_SLOW_INVERTED_FLASH);
@@ -775,7 +649,7 @@ int do_write(uint32_t addr, const uint8_t *src8, size_t len) {
     } else
     #endif
     if (flash_is_valid_addr(addr)) {
-        ret = flash_write(addr, src8, len);
+        ret = mboot_flash_write(addr, src8, len);
     } else {
         dfu_context.status = DFU_STATUS_ERROR_ADDRESS;
         dfu_context.error = MBOOT_ERROR_STR_INVALID_ADDRESS_IDX;
diff --git a/ports/stm32/mboot/mphalport.h b/ports/stm32/mboot/mphalport.h
index 0c8cb91a6883a..56d18a9b05d1d 100644
--- a/ports/stm32/mboot/mphalport.h
+++ b/ports/stm32/mboot/mphalport.h
@@ -28,6 +28,11 @@
 
 #include "genhdr/pins.h"
 
+// For simplicity just convert all HAL errors to one errno.
+static inline int mp_hal_status_to_neg_errno(HAL_StatusTypeDef status) {
+    return status == HAL_OK ? 0 : -1;
+}
+
 #define mp_hal_delay_us_fast(us) mp_hal_delay_us(us)
 
 #define MP_HAL_PIN_MODE_INPUT           (0)

From 8675858465f3d83aab709170eab6dc141570acf4 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 18 Jun 2020 18:18:30 +1000
Subject: [PATCH 0103/3533] stm32/mboot: Use CMSIS system source code for
 SystemInit function.

There's no need to duplicate this functionality in mboot, the code provided
in stm32lib/CMSIS does the same thing and makes it easier to support other
MCU series.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/mboot/Makefile |  2 +
 ports/stm32/mboot/main.c   | 87 +++++++-------------------------------
 2 files changed, 18 insertions(+), 71 deletions(-)

diff --git a/ports/stm32/mboot/Makefile b/ports/stm32/mboot/Makefile
index a5db1666dd313..a504c2314d3f9 100755
--- a/ports/stm32/mboot/Makefile
+++ b/ports/stm32/mboot/Makefile
@@ -34,6 +34,7 @@ STFLASH ?= st-flash
 OPENOCD ?= openocd
 OPENOCD_CONFIG ?= boards/openocd_stm32f4.cfg
 STARTUP_FILE ?= lib/stm32lib/CMSIS/STM32$(MCU_SERIES_UPPER)xx/Source/Templates/gcc/startup_$(CMSIS_MCU_LOWER).o
+SYSTEM_FILE ?= lib/stm32lib/CMSIS/STM32$(MCU_SERIES_UPPER)xx/Source/Templates/system_stm32$(MCU_SERIES)xx.o
 
 CROSS_COMPILE ?= arm-none-eabi-
 
@@ -109,6 +110,7 @@ SRC_C = \
 
 SRC_O = \
 	$(STARTUP_FILE) \
+	$(SYSTEM_FILE) \
 	ports/stm32/resethandler.o \
 
 $(BUILD)/$(HAL_DIR)/Src/stm32$(MCU_SERIES)xx_ll_usb.o: CFLAGS += -Wno-attributes
diff --git a/ports/stm32/mboot/main.c b/ports/stm32/mboot/main.c
index c53920ccf0244..c8cd7ba60e673 100644
--- a/ports/stm32/mboot/main.c
+++ b/ports/stm32/mboot/main.c
@@ -140,72 +140,6 @@ static void __fatal_error(const char *msg) {
 /******************************************************************************/
 // CLOCK
 
-#if defined(STM32F4) || defined(STM32F7)
-
-#define CONFIG_RCC_CR_1ST (RCC_CR_HSION)
-#define CONFIG_RCC_CR_2ND (RCC_CR_HSEON || RCC_CR_CSSON || RCC_CR_PLLON)
-#define CONFIG_RCC_PLLCFGR (0x24003010)
-
-#elif defined(STM32H7)
-
-#define CONFIG_RCC_CR_1ST (RCC_CR_HSION)
-#define CONFIG_RCC_CR_2ND (RCC_CR_PLL3ON | RCC_CR_PLL2ON | RCC_CR_PLL1ON | RCC_CR_CSSHSEON \
-    | RCC_CR_HSEON | RCC_CR_HSI48ON | RCC_CR_CSIKERON | RCC_CR_CSION)
-#define CONFIG_RCC_PLLCFGR (0x00000000)
-
-#else
-#error Unknown processor
-#endif
-
-void SystemInit(void) {
-    #if defined(STM32H7)
-    // Configure write-once power options, and wait for voltage levels to be ready
-    PWR->CR3 = PWR_CR3_LDOEN;
-    while (!(PWR->CSR1 & PWR_CSR1_ACTVOSRDY)) {
-    }
-    #endif
-
-    // Set HSION bit
-    RCC->CR |= CONFIG_RCC_CR_1ST;
-
-    // Reset CFGR register
-    RCC->CFGR = 0x00000000;
-
-    // Reset HSEON, CSSON and PLLON bits
-    RCC->CR &= ~CONFIG_RCC_CR_2ND;
-
-    // Reset PLLCFGR register
-    RCC->PLLCFGR = CONFIG_RCC_PLLCFGR;
-
-    #if defined(STM32H7)
-    // Reset PLL and clock configuration registers
-    RCC->D1CFGR = 0x00000000;
-    RCC->D2CFGR = 0x00000000;
-    RCC->D3CFGR = 0x00000000;
-    RCC->PLLCKSELR = 0x00000000;
-    RCC->D1CCIPR = 0x00000000;
-    RCC->D2CCIP1R = 0x00000000;
-    RCC->D2CCIP2R = 0x00000000;
-    RCC->D3CCIPR = 0x00000000;
-    #endif
-
-    // Reset HSEBYP bit
-    RCC->CR &= (uint32_t)0xFFFBFFFF;
-
-    // Disable all interrupts
-    #if defined(STM32F4) || defined(STM32F7)
-    RCC->CIR = 0x00000000;
-    #elif defined(STM32H7)
-    RCC->CIER = 0x00000000;
-    #endif
-
-    // Set location of vector table
-    SCB->VTOR = FLASH_BASE;
-
-    // Enable 8-byte stack alignment for IRQ handlers, in accord with EABI
-    SCB->CCR |= SCB_CCR_STKALIGN_Msk;
-}
-
 void systick_init(void) {
     // Configure SysTick as 1ms ticker
     SysTick_Config(SystemCoreClock / 1000);
@@ -1311,12 +1245,26 @@ static void do_reset(void) {
     NVIC_SystemReset();
 }
 
-uint32_t SystemCoreClock;
-
 extern PCD_HandleTypeDef pcd_fs_handle;
 extern PCD_HandleTypeDef pcd_hs_handle;
 
 void stm32_main(int initial_r0) {
+    #if defined(STM32H7)
+    // Configure write-once power options, and wait for voltage levels to be ready
+    PWR->CR3 = PWR_CR3_LDOEN;
+    while (!(PWR->CSR1 & PWR_CSR1_ACTVOSRDY)) {
+    }
+
+    // Reset the kernel clock configuration registers for all domains.
+    RCC->D1CCIPR = 0x00000000;
+    RCC->D2CCIP1R = 0x00000000;
+    RCC->D2CCIP2R = 0x00000000;
+    RCC->D3CCIPR = 0x00000000;
+    #endif
+
+    // Enable 8-byte stack alignment for IRQ handlers, in accord with EABI
+    SCB->CCR |= SCB_CCR_STKALIGN_Msk;
+
     #if defined(STM32F4)
     #if INSTRUCTION_CACHE_ENABLE
     __HAL_FLASH_INSTRUCTION_CACHE_ENABLE();
@@ -1355,9 +1303,6 @@ void stm32_main(int initial_r0) {
         goto enter_bootloader;
     }
 
-    // MCU starts up with HSI
-    SystemCoreClock = HSI_VALUE;
-
     int reset_mode = get_reset_mode();
     uint32_t msp = *(volatile uint32_t*)APPLICATION_ADDR;
     if (reset_mode != 4 && (msp & APP_VALIDITY_BITS) == 0) {

From 705728369d7422905825e8e4d4c8001524b990e7 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 18 Jun 2020 19:35:52 +1000
Subject: [PATCH 0104/3533] stm32/mboot: Add support for using mboot with WB
 MCUs.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/mboot/Makefile |  2 ++
 ports/stm32/mboot/main.c   | 44 +++++++++++++++++++++++++++++++++-----
 2 files changed, 41 insertions(+), 5 deletions(-)

diff --git a/ports/stm32/mboot/Makefile b/ports/stm32/mboot/Makefile
index a504c2314d3f9..79aa3316f9b65 100755
--- a/ports/stm32/mboot/Makefile
+++ b/ports/stm32/mboot/Makefile
@@ -55,6 +55,7 @@ CFLAGS_MCU_f4 = $(CFLAGS_CORTEX_M) -mtune=cortex-m4 -mcpu=cortex-m4
 CFLAGS_MCU_f7 = $(CFLAGS_CORTEX_M) -mtune=cortex-m7 -mcpu=cortex-m7
 CFLAGS_MCU_h7 = $(CFLAGS_CORTEX_M) -mtune=cortex-m7 -mcpu=cortex-m7
 CFLAGS_MCU_l4 = $(CFLAGS_CORTEX_M) -mtune=cortex-m4 -mcpu=cortex-m4
+CFLAGS_MCU_wb = $(CFLAGS_CORTEX_M) -mtune=cortex-m4 -mcpu=cortex-m4
 
 CFLAGS = $(INC) -Wall -Wpointer-arith -Wdouble-promotion -Wfloat-conversion -Werror -std=gnu99 -nostdlib $(CFLAGS_MOD) $(CFLAGS_EXTRA)
 CFLAGS += -D$(CMSIS_MCU)
@@ -103,6 +104,7 @@ SRC_C = \
 	ports/stm32/flash.c \
 	ports/stm32/flashbdev.c \
 	ports/stm32/i2cslave.c \
+	ports/stm32/powerctrlboot.c \
 	ports/stm32/qspi.c \
 	ports/stm32/spibdev.c \
 	ports/stm32/usbd_conf.c \
diff --git a/ports/stm32/mboot/main.c b/ports/stm32/mboot/main.c
index c8cd7ba60e673..b3af495261a14 100644
--- a/ports/stm32/mboot/main.c
+++ b/ports/stm32/mboot/main.c
@@ -33,29 +33,36 @@
 #include "storage.h"
 #include "flash.h"
 #include "i2cslave.h"
+#include "irq.h"
 #include "mboot.h"
+#include "powerctrl.h"
 #include "dfu.h"
 
 // Using polling is about 10% faster than not using it (and using IRQ instead)
 // This DFU code with polling runs in about 70% of the time of the ST bootloader
+// With STM32WB MCUs only non-polling/IRQ mode is supported.
+#if defined(STM32WB)
+#define USE_USB_POLLING (0)
+#else
 #define USE_USB_POLLING (1)
+#endif
 
 // Using cache probably won't make it faster because we run at a low frequency, and best
 // to keep the MCU config as minimal as possible.
 #define USE_CACHE (0)
 
 // IRQ priorities (encoded values suitable for NVIC_SetPriority)
-#define IRQ_PRI_SYSTICK (NVIC_EncodePriority(NVIC_PRIORITYGROUP_4, 0, 0))
+// Most values are defined in irq.h.
 #define IRQ_PRI_I2C (NVIC_EncodePriority(NVIC_PRIORITYGROUP_4, 1, 0))
 
 // Configure PLL to give the desired CPU freq
 #undef MICROPY_HW_FLASH_LATENCY
-#if defined(STM32H7)
-#define CORE_PLL_FREQ (96000000)
-#define MICROPY_HW_FLASH_LATENCY FLASH_LATENCY_2
-#else
+#if defined(STM32F4) || defined(STM32F7)
 #define CORE_PLL_FREQ (48000000)
 #define MICROPY_HW_FLASH_LATENCY FLASH_LATENCY_1
+#elif defined(STM32H7)
+#define CORE_PLL_FREQ (96000000)
+#define MICROPY_HW_FLASH_LATENCY FLASH_LATENCY_2
 #endif
 #undef MICROPY_HW_CLK_PLLM
 #undef MICROPY_HW_CLK_PLLN
@@ -93,7 +100,11 @@ uint32_t get_le32(const uint8_t *b) {
 void mp_hal_delay_us(mp_uint_t usec) {
     // use a busy loop for the delay
     // sys freq is always a multiple of 2MHz, so division here won't lose precision
+    #if defined(CORE_PLL_FREQ)
     const uint32_t ucount = CORE_PLL_FREQ / 2000000 * usec / 2;
+    #else
+    const uint32_t ucount = SystemCoreClock / 2000000 * usec / 2;
+    #endif
     for (uint32_t count = 0; ++count <= ucount;) {
     }
 }
@@ -313,6 +324,9 @@ uint32_t HAL_RCC_GetHCLKFreq(void) {
 #elif defined(STM32H7)
 #define AHBxENR AHB4ENR
 #define AHBxENR_GPIOAEN_Pos RCC_AHB4ENR_GPIOAEN_Pos
+#elif defined(STM32WB)
+#define AHBxENR AHB2ENR
+#define AHBxENR_GPIOAEN_Pos RCC_AHB2ENR_GPIOAEN_Pos
 #endif
 
 void mp_hal_pin_config(mp_hal_pin_obj_t port_pin, uint32_t mode, uint32_t pull, uint32_t alt) {
@@ -445,6 +459,8 @@ static int usrbtn_state(void) {
 #define FLASH_LAYOUT_STR "@Internal Flash  /0x08000000/04*032Kg,01*128Kg,07*256Kg" MBOOT_SPIFLASH_LAYOUT MBOOT_SPIFLASH2_LAYOUT
 #elif defined(STM32H743xx)
 #define FLASH_LAYOUT_STR "@Internal Flash  /0x08000000/16*128Kg" MBOOT_SPIFLASH_LAYOUT MBOOT_SPIFLASH2_LAYOUT
+#elif defined(STM32WB)
+#define FLASH_LAYOUT_STR "@Internal Flash  /0x08000000/256*04Kg" MBOOT_SPIFLASH_LAYOUT MBOOT_SPIFLASH2_LAYOUT
 #endif
 
 static int mboot_flash_mass_erase(void) {
@@ -924,12 +940,19 @@ typedef struct _pyb_usbdd_obj_t {
 #define MBOOT_USB_PID BOOTLOADER_DFU_USB_PID
 #endif
 
+#if !MICROPY_HW_USB_IS_MULTI_OTG
+STATIC const uint8_t usbd_fifo_size[USBD_PMA_NUM_FIFO] = {
+    32, 32, // EP0(out), EP0(in)
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 14x unused
+};
+#else
 static const uint8_t usbd_fifo_size[] = {
     32, 8, 16, 8, 16, 0, 0, // FS: RX, EP0(in), 5x IN endpoints
     #if MICROPY_HW_USB_HS
     116, 8, 64, 4, 64, 0, 0, 0, 0, 0, // HS: RX, EP0(in), 8x IN endpoints
     #endif
 };
+#endif
 
 __ALIGN_BEGIN static const uint8_t USBD_LangIDDesc[USB_LEN_LANGID_STR_DESC] __ALIGN_END = {
     USB_LEN_LANGID_STR_DESC,
@@ -1455,6 +1478,15 @@ void I2Cx_EV_IRQHandler(void) {
 #endif
 
 #if !USE_USB_POLLING
+
+#if defined(STM32WB)
+
+void USB_LP_IRQHandler(void) {
+    HAL_PCD_IRQHandler(&pcd_fs_handle);
+}
+
+#else
+
 #if MBOOT_USB_AUTODETECT_PORT || MICROPY_HW_USB_MAIN_DEV == USB_PHY_FS_ID
 void OTG_FS_IRQHandler(void) {
     HAL_PCD_IRQHandler(&pcd_fs_handle);
@@ -1467,3 +1499,5 @@ void OTG_HS_IRQHandler(void) {
 }
 #endif
 #endif
+
+#endif

From 6f40e6e131b666b373ff3245a095c7e710578c16 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 18 Jun 2020 19:36:16 +1000
Subject: [PATCH 0105/3533] stm32/boards: Add build-time option for NUCLEO_WB55
 to use mboot.

As an example of how to use mboot on a WB series MCU.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/boards/NUCLEO_WB55/mpconfigboard.mk | 11 ++++++++++-
 ports/stm32/boards/stm32wb55xg.ld               |  1 +
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/ports/stm32/boards/NUCLEO_WB55/mpconfigboard.mk b/ports/stm32/boards/NUCLEO_WB55/mpconfigboard.mk
index 416364df9ef6d..dcec788ed443f 100644
--- a/ports/stm32/boards/NUCLEO_WB55/mpconfigboard.mk
+++ b/ports/stm32/boards/NUCLEO_WB55/mpconfigboard.mk
@@ -1,9 +1,18 @@
 MCU_SERIES = wb
 CMSIS_MCU = STM32WB55xx
 AF_FILE = boards/stm32wb55_af.csv
-LD_FILES = boards/stm32wb55xg.ld boards/common_basic.ld
 STARTUP_FILE = lib/stm32lib/CMSIS/STM32WBxx/Source/Templates/gcc/startup_stm32wb55xx_cm4.o
 
+ifeq ($(USE_MBOOT),1)
+# When using Mboot all the text goes together after the bootloader
+LD_FILES = boards/stm32wb55xg.ld boards/common_bl.ld
+TEXT0_ADDR = 0x08004000
+else
+# When not using Mboot the text goes at the start of flash
+LD_FILES = boards/stm32wb55xg.ld boards/common_basic.ld
+TEXT0_ADDR = 0x08000000
+endif
+
 # MicroPython settings
 MICROPY_PY_BLUETOOTH = 1
 MICROPY_BLUETOOTH_NIMBLE = 1
diff --git a/ports/stm32/boards/stm32wb55xg.ld b/ports/stm32/boards/stm32wb55xg.ld
index 77596d7759689..dbeccc1895775 100644
--- a/ports/stm32/boards/stm32wb55xg.ld
+++ b/ports/stm32/boards/stm32wb55xg.ld
@@ -6,6 +6,7 @@
 MEMORY
 {
     FLASH (rx)      : ORIGIN = 0x08000000, LENGTH = 512K /* sectors 0-127 */
+    FLASH_APP (rx)  : ORIGIN = 0x08004000, LENGTH = 496K /* sectors 4-127 */
     FLASH_FS (r)    : ORIGIN = 0x08080000, LENGTH = 256K /* sectors 128-191 */
     RAM (xrw)       : ORIGIN = 0x20000000, LENGTH = 192K /* SRAM1 */
     RAM2A (xrw)     : ORIGIN = 0x20030020, LENGTH = 8K /* SRAM2A */

From 13ad1a4f06f2d114c821279f58fa7462e8bd0d41 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 18 Jun 2020 19:59:54 +1000
Subject: [PATCH 0106/3533] travis: In stm32 job, build mboot for NUCLEO_WB55.

Signed-off-by: Damien George <damien@micropython.org>
---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index 09da9598e2018..b7aac0bd0d0fc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -79,6 +79,7 @@ jobs:
         - make ${MAKEOPTS} -C ports/stm32 BOARD=STM32L476DISC
         - make ${MAKEOPTS} -C ports/stm32 BOARD=NUCLEO_WB55
         - make ${MAKEOPTS} -C ports/stm32/mboot BOARD=PYBD_SF6
+        - make ${MAKEOPTS} -C ports/stm32/mboot BOARD=NUCLEO_WB55
 
     # qemu-arm port
     - stage: test

From 81a7293ed63bb39e05e4303f7ad297807748c7ea Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 23 Jun 2020 13:56:20 +1000
Subject: [PATCH 0107/3533] stm32/mboot: Set VTOR on start up to ensure it has
 the correct value.

Commit 8675858465f3d83aab709170eab6dc141570acf4 switched to using the CMSIS
provided SystemInit function which sets VTOR to 0x00000000 (previously it
was 0x08000000).  A VTOR of 0x00000000 will be correct on some MCUs but not
on others where the built-in bootloader is remapped to this address, via
__HAL_SYSCFG_REMAPMEMORY_SYSTEMFLASH().

To make sure mboot has the correct vector table, this commit explicitly
sets VTOR to the correct value of 0x08000000.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/mboot/main.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ports/stm32/mboot/main.c b/ports/stm32/mboot/main.c
index b3af495261a14..b3e63ccc26626 100644
--- a/ports/stm32/mboot/main.c
+++ b/ports/stm32/mboot/main.c
@@ -1285,6 +1285,9 @@ void stm32_main(int initial_r0) {
     RCC->D3CCIPR = 0x00000000;
     #endif
 
+    // Make sure IRQ vector table points to flash where this bootloader lives.
+    SCB->VTOR = FLASH_BASE;
+
     // Enable 8-byte stack alignment for IRQ handlers, in accord with EABI
     SCB->CCR |= SCB_CCR_STKALIGN_Msk;
 

From b4dc4c5b9a1e6df620a14d85f18721a0bcb17d83 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 23 Jun 2020 14:00:16 +1000
Subject: [PATCH 0108/3533] stm32/mboot: Use additional CFLAGS to compile
 string0.c.

This is the same as a902b69dd51de0e3fe3bb6955296591d6a93abab but applied to
mboot's Makefile.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/mboot/Makefile | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/ports/stm32/mboot/Makefile b/ports/stm32/mboot/Makefile
index 79aa3316f9b65..a72b752ac9430 100755
--- a/ports/stm32/mboot/Makefile
+++ b/ports/stm32/mboot/Makefile
@@ -57,6 +57,10 @@ CFLAGS_MCU_h7 = $(CFLAGS_CORTEX_M) -mtune=cortex-m7 -mcpu=cortex-m7
 CFLAGS_MCU_l4 = $(CFLAGS_CORTEX_M) -mtune=cortex-m4 -mcpu=cortex-m4
 CFLAGS_MCU_wb = $(CFLAGS_CORTEX_M) -mtune=cortex-m4 -mcpu=cortex-m4
 
+# Standard C functions like memset need to be compiled with special flags so
+# the compiler does not optimise these functions in terms of themselves.
+CFLAGS_BUILTIN ?= -ffreestanding -fno-builtin -fno-lto
+
 CFLAGS = $(INC) -Wall -Wpointer-arith -Wdouble-promotion -Wfloat-conversion -Werror -std=gnu99 -nostdlib $(CFLAGS_MOD) $(CFLAGS_EXTRA)
 CFLAGS += -D$(CMSIS_MCU)
 CFLAGS += $(CFLAGS_MCU_$(MCU_SERIES))
@@ -84,6 +88,7 @@ else
 COPT += -Os -DNDEBUG
 endif
 
+$(BUILD)/lib/libc/string0.o: CFLAGS += $(CFLAGS_BUILTIN)
 LIB_SRC_C = \
 	lib/libc/string0.c \
 	lib/oofatfs/ff.c \

From 456a3abe8dbcd8ee822d81d6780db72d55e89d61 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sun, 21 Jun 2020 17:10:20 +1000
Subject: [PATCH 0109/3533] py/obj.h: Add public
 mp_obj_is_dict_or_ordereddict() helper macro.

And use it in py/objdict.c instead of mp_obj_is_dict_type.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/obj.h     |  2 ++
 py/objdict.c | 26 ++++++++++++--------------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/py/obj.h b/py/obj.h
index f80f00031dc77..590b9c4b6a4a1 100644
--- a/py/obj.h
+++ b/py/obj.h
@@ -708,6 +708,7 @@ extern const struct _mp_obj_exception_t mp_const_GeneratorExit_obj;
 #define mp_obj_is_int(o) (mp_obj_is_small_int(o) || mp_obj_is_type(o, &mp_type_int))
 #define mp_obj_is_str(o) (mp_obj_is_qstr(o) || mp_obj_is_type(o, &mp_type_str))
 #define mp_obj_is_str_or_bytes(o) (mp_obj_is_qstr(o) || (mp_obj_is_obj(o) && ((mp_obj_base_t *)MP_OBJ_TO_PTR(o))->type->binary_op == mp_obj_str_binary_op))
+#define mp_obj_is_dict_or_ordereddict(o) (mp_obj_is_obj(o) && ((mp_obj_base_t *)MP_OBJ_TO_PTR(o))->type->make_new == mp_obj_dict_make_new)
 #define mp_obj_is_fun(o) (mp_obj_is_obj(o) && (((mp_obj_base_t *)MP_OBJ_TO_PTR(o))->type->name == MP_QSTR_function))
 
 mp_obj_t mp_obj_new_type(qstr name, mp_obj_t bases_tuple, mp_obj_t locals_dict);
@@ -890,6 +891,7 @@ typedef struct _mp_obj_dict_t {
     mp_obj_base_t base;
     mp_map_t map;
 } mp_obj_dict_t;
+mp_obj_t mp_obj_dict_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args);
 void mp_obj_dict_init(mp_obj_dict_t *dict, size_t n_args);
 size_t mp_obj_dict_len(mp_obj_t self_in);
 mp_obj_t mp_obj_dict_get(mp_obj_t self_in, mp_obj_t index);
diff --git a/py/objdict.c b/py/objdict.c
index 69eda99738eec..4fa59f4634cb0 100644
--- a/py/objdict.c
+++ b/py/objdict.c
@@ -33,8 +33,6 @@
 #include "py/objtype.h"
 #include "py/objstr.h"
 
-#define mp_obj_is_dict_type(o) (mp_obj_is_obj(o) && ((mp_obj_base_t *)MP_OBJ_TO_PTR(o))->type->make_new == dict_make_new)
-
 STATIC mp_obj_t dict_update(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs);
 
 // This is a helper function to iterate through a dictionary.  The state of
@@ -90,7 +88,7 @@ STATIC void dict_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_
     }
 }
 
-STATIC mp_obj_t dict_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
+mp_obj_t mp_obj_dict_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
     mp_obj_t dict_out = mp_obj_new_dict(0);
     mp_obj_dict_t *dict = MP_OBJ_TO_PTR(dict_out);
     dict->base.type = type;
@@ -217,7 +215,7 @@ STATIC void mp_ensure_not_fixed(const mp_obj_dict_t *dict) {
 }
 
 STATIC mp_obj_t dict_clear(mp_obj_t self_in) {
-    mp_check_self(mp_obj_is_dict_type(self_in));
+    mp_check_self(mp_obj_is_dict_or_ordereddict(self_in));
     mp_obj_dict_t *self = MP_OBJ_TO_PTR(self_in);
     mp_ensure_not_fixed(self);
 
@@ -228,7 +226,7 @@ STATIC mp_obj_t dict_clear(mp_obj_t self_in) {
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(dict_clear_obj, dict_clear);
 
 mp_obj_t mp_obj_dict_copy(mp_obj_t self_in) {
-    mp_check_self(mp_obj_is_dict_type(self_in));
+    mp_check_self(mp_obj_is_dict_or_ordereddict(self_in));
     mp_obj_dict_t *self = MP_OBJ_TO_PTR(self_in);
     mp_obj_t other_out = mp_obj_new_dict(self->map.alloc);
     mp_obj_dict_t *other = MP_OBJ_TO_PTR(other_out);
@@ -275,7 +273,7 @@ STATIC MP_DEFINE_CONST_CLASSMETHOD_OBJ(dict_fromkeys_obj, MP_ROM_PTR(&dict_fromk
 #endif
 
 STATIC mp_obj_t dict_get_helper(size_t n_args, const mp_obj_t *args, mp_map_lookup_kind_t lookup_kind) {
-    mp_check_self(mp_obj_is_dict_type(args[0]));
+    mp_check_self(mp_obj_is_dict_or_ordereddict(args[0]));
     mp_obj_dict_t *self = MP_OBJ_TO_PTR(args[0]);
     if (lookup_kind != MP_MAP_LOOKUP) {
         mp_ensure_not_fixed(self);
@@ -320,7 +318,7 @@ STATIC mp_obj_t dict_setdefault(size_t n_args, const mp_obj_t *args) {
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(dict_setdefault_obj, 2, 3, dict_setdefault);
 
 STATIC mp_obj_t dict_popitem(mp_obj_t self_in) {
-    mp_check_self(mp_obj_is_dict_type(self_in));
+    mp_check_self(mp_obj_is_dict_or_ordereddict(self_in));
     mp_obj_dict_t *self = MP_OBJ_TO_PTR(self_in);
     mp_ensure_not_fixed(self);
     if (self->map.used == 0) {
@@ -345,7 +343,7 @@ STATIC mp_obj_t dict_popitem(mp_obj_t self_in) {
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(dict_popitem_obj, dict_popitem);
 
 STATIC mp_obj_t dict_update(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs) {
-    mp_check_self(mp_obj_is_dict_type(args[0]));
+    mp_check_self(mp_obj_is_dict_or_ordereddict(args[0]));
     mp_obj_dict_t *self = MP_OBJ_TO_PTR(args[0]);
     mp_ensure_not_fixed(self);
 
@@ -354,7 +352,7 @@ STATIC mp_obj_t dict_update(size_t n_args, const mp_obj_t *args, mp_map_t *kwarg
     if (n_args == 2) {
         // given a positional argument
 
-        if (mp_obj_is_dict_type(args[1])) {
+        if (mp_obj_is_dict_or_ordereddict(args[1])) {
             // update from other dictionary (make sure other is not self)
             if (args[1] != args[0]) {
                 size_t cur = 0;
@@ -512,7 +510,7 @@ STATIC mp_obj_t mp_obj_new_dict_view(mp_obj_t dict, mp_dict_view_kind_t kind) {
 }
 
 STATIC mp_obj_t dict_view(mp_obj_t self_in, mp_dict_view_kind_t kind) {
-    mp_check_self(mp_obj_is_dict_type(self_in));
+    mp_check_self(mp_obj_is_dict_or_ordereddict(self_in));
     return mp_obj_new_dict_view(self_in, kind);
 }
 
@@ -536,7 +534,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(dict_values_obj, dict_values);
 
 STATIC mp_obj_t dict_getiter(mp_obj_t self_in, mp_obj_iter_buf_t *iter_buf) {
     assert(sizeof(mp_obj_dict_view_it_t) <= sizeof(mp_obj_iter_buf_t));
-    mp_check_self(mp_obj_is_dict_type(self_in));
+    mp_check_self(mp_obj_is_dict_or_ordereddict(self_in));
     mp_obj_dict_view_it_t *o = (mp_obj_dict_view_it_t *)iter_buf;
     o->base.type = &dict_view_it_type;
     o->kind = MP_DICT_VIEW_KEYS;
@@ -573,7 +571,7 @@ const mp_obj_type_t mp_type_dict = {
     { &mp_type_type },
     .name = MP_QSTR_dict,
     .print = dict_print,
-    .make_new = dict_make_new,
+    .make_new = mp_obj_dict_make_new,
     .unary_op = dict_unary_op,
     .binary_op = dict_binary_op,
     .subscr = dict_subscr,
@@ -586,7 +584,7 @@ const mp_obj_type_t mp_type_ordereddict = {
     { &mp_type_type },
     .name = MP_QSTR_OrderedDict,
     .print = dict_print,
-    .make_new = dict_make_new,
+    .make_new = mp_obj_dict_make_new,
     .unary_op = dict_unary_op,
     .binary_op = dict_binary_op,
     .subscr = dict_subscr,
@@ -613,7 +611,7 @@ size_t mp_obj_dict_len(mp_obj_t self_in) {
 }
 
 mp_obj_t mp_obj_dict_store(mp_obj_t self_in, mp_obj_t key, mp_obj_t value) {
-    mp_check_self(mp_obj_is_dict_type(self_in));
+    mp_check_self(mp_obj_is_dict_or_ordereddict(self_in));
     mp_obj_dict_t *self = MP_OBJ_TO_PTR(self_in);
     mp_ensure_not_fixed(self);
     mp_map_lookup(&self->map, key, MP_MAP_LOOKUP_ADD_IF_NOT_FOUND)->value = value;

From 7dd480ad5505a40bb33ee52d01c5fa78b1273083 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sun, 21 Jun 2020 17:14:18 +1000
Subject: [PATCH 0110/3533] extmod/moductypes: Use
 mp_obj_is_dict_or_ordereddict to simplify code.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/moductypes.c | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

diff --git a/extmod/moductypes.c b/extmod/moductypes.c
index f7d2be1bc1487..811258424a3bf 100644
--- a/extmod/moductypes.c
+++ b/extmod/moductypes.c
@@ -137,11 +137,7 @@ STATIC void uctypes_struct_print(const mp_print_t *print, mp_obj_t self_in, mp_p
     (void)kind;
     mp_obj_uctypes_struct_t *self = MP_OBJ_TO_PTR(self_in);
     const char *typen = "unk";
-    if (mp_obj_is_type(self->desc, &mp_type_dict)
-        #if MICROPY_PY_COLLECTIONS_ORDEREDDICT
-        || mp_obj_is_type(self->desc, &mp_type_ordereddict)
-        #endif
-        ) {
+    if (mp_obj_is_dict_or_ordereddict(self->desc)) {
         typen = "STRUCT";
     } else if (mp_obj_is_type(self->desc, &mp_type_tuple)) {
         mp_obj_tuple_t *t = MP_OBJ_TO_PTR(self->desc);
@@ -214,11 +210,7 @@ STATIC mp_uint_t uctypes_struct_agg_size(mp_obj_tuple_t *t, int layout_type, mp_
 }
 
 STATIC mp_uint_t uctypes_struct_size(mp_obj_t desc_in, int layout_type, mp_uint_t *max_field_size) {
-    if (!mp_obj_is_type(desc_in, &mp_type_dict)
-        #if MICROPY_PY_COLLECTIONS_ORDEREDDICT
-        && !mp_obj_is_type(desc_in, &mp_type_ordereddict)
-        #endif
-        ) {
+    if (!mp_obj_is_dict_or_ordereddict(desc_in)) {
         if (mp_obj_is_type(desc_in, &mp_type_tuple)) {
             return uctypes_struct_agg_size((mp_obj_tuple_t *)MP_OBJ_TO_PTR(desc_in), layout_type, max_field_size);
         } else if (mp_obj_is_small_int(desc_in)) {
@@ -418,11 +410,7 @@ STATIC void set_aligned(uint val_type, void *p, mp_int_t index, mp_obj_t val) {
 STATIC mp_obj_t uctypes_struct_attr_op(mp_obj_t self_in, qstr attr, mp_obj_t set_val) {
     mp_obj_uctypes_struct_t *self = MP_OBJ_TO_PTR(self_in);
 
-    if (!mp_obj_is_type(self->desc, &mp_type_dict)
-        #if MICROPY_PY_COLLECTIONS_ORDEREDDICT
-        && !mp_obj_is_type(self->desc, &mp_type_ordereddict)
-        #endif
-        ) {
+    if (!mp_obj_is_dict_or_ordereddict(self->desc)) {
         mp_raise_TypeError(MP_ERROR_TEXT("struct: no fields"));
     }
 

From 457fdf61c3bca550b4ad3fb2c6822c838984dac0 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sun, 21 Jun 2020 17:25:44 +1000
Subject: [PATCH 0111/3533] py/objtype: Support passing in an OrderedDict to
 type() as the locals.

An OrderedDict can now be used for the locals when creating a type
explicitly via type(name, bases, locals).

Signed-off-by: Damien George <damien@micropython.org>
---
 py/objtype.c                          |  6 +++---
 tests/basics/class_ordereddict.py     | 18 ++++++++++++++++++
 tests/basics/class_ordereddict.py.exp |  1 +
 3 files changed, 22 insertions(+), 3 deletions(-)
 create mode 100644 tests/basics/class_ordereddict.py
 create mode 100644 tests/basics/class_ordereddict.py.exp

diff --git a/py/objtype.c b/py/objtype.c
index a539fcab29414..40900dc050358 100644
--- a/py/objtype.c
+++ b/py/objtype.c
@@ -153,7 +153,7 @@ STATIC void mp_obj_class_lookup(struct class_lookup_data *lookup, const mp_obj_t
 
         if (type->locals_dict != NULL) {
             // search locals_dict (the set of methods/attributes)
-            assert(type->locals_dict->base.type == &mp_type_dict); // MicroPython restriction, for now
+            assert(mp_obj_is_dict_or_ordereddict(MP_OBJ_FROM_PTR(type->locals_dict))); // MicroPython restriction, for now
             mp_map_t *locals_map = &type->locals_dict->map;
             mp_map_elem_t *elem = mp_map_lookup(locals_map, MP_OBJ_NEW_QSTR(lookup->attr), MP_MAP_LOOKUP);
             if (elem != NULL) {
@@ -1053,7 +1053,7 @@ STATIC void type_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
         // delete/store attribute
 
         if (self->locals_dict != NULL) {
-            assert(self->locals_dict->base.type == &mp_type_dict); // MicroPython restriction, for now
+            assert(mp_obj_is_dict_or_ordereddict(MP_OBJ_FROM_PTR(self->locals_dict))); // MicroPython restriction, for now
             mp_map_t *locals_map = &self->locals_dict->map;
             if (locals_map->is_fixed) {
                 // can't apply delete/store to a fixed map
@@ -1103,7 +1103,7 @@ mp_obj_t mp_obj_new_type(qstr name, mp_obj_t bases_tuple, mp_obj_t locals_dict)
     if (!mp_obj_is_type(bases_tuple, &mp_type_tuple)) {
         mp_raise_TypeError(NULL);
     }
-    if (!mp_obj_is_type(locals_dict, &mp_type_dict)) {
+    if (!mp_obj_is_dict_or_ordereddict(locals_dict)) {
         mp_raise_TypeError(NULL);
     }
 
diff --git a/tests/basics/class_ordereddict.py b/tests/basics/class_ordereddict.py
new file mode 100644
index 0000000000000..4dd25eb6e15b4
--- /dev/null
+++ b/tests/basics/class_ordereddict.py
@@ -0,0 +1,18 @@
+# test using an OrderedDict as the locals to construct a class
+
+try:
+    from ucollections import OrderedDict
+except ImportError:
+    try:
+        from collections import OrderedDict
+    except ImportError:
+        print("SKIP")
+        raise SystemExit
+
+if not hasattr(int, "__dict__"):
+    print("SKIP")
+    raise SystemExit
+
+
+A = type("A", (), OrderedDict(a=1, b=2, c=3, d=4, e=5))
+print([k for k in A.__dict__.keys() if not k.startswith("_")])
diff --git a/tests/basics/class_ordereddict.py.exp b/tests/basics/class_ordereddict.py.exp
new file mode 100644
index 0000000000000..b723e327515c7
--- /dev/null
+++ b/tests/basics/class_ordereddict.py.exp
@@ -0,0 +1 @@
+['a', 'b', 'c', 'd', 'e']

From 76faeed098ec4ee70202202cb11e64b78a77f14e Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 23 Jun 2020 17:20:59 +1000
Subject: [PATCH 0112/3533] tools/makemanifest.py: Support freezing a
 subdirectory recursively.

This adds support for freezing an entire directory while keeping the
directory as part of the import path.  For example

    freeze("path/to/library", "module")

will recursively freeze all scripts in "path/to/library/module" and have
them importable as "from module import ...".

Signed-off-by: Damien George <damien@micropython.org>
---
 tools/makemanifest.py | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/tools/makemanifest.py b/tools/makemanifest.py
index 2cee6aebc796a..babce7fa73f4b 100644
--- a/tools/makemanifest.py
+++ b/tools/makemanifest.py
@@ -76,9 +76,10 @@ def freeze(path, script=None, opt=0):
     If `script` is an iterable then freeze() is called on all items of the
     iterable (with the same `path` and `opt` passed through).
 
-    If `script` is a string then it specifies the filename to freeze, and
-    can include extra directories before the file.  The file will be
-    searched for in `path`.
+    If `script` is a string then it specifies the file or directory to
+    freeze, and can include extra directories before the file or last
+    directory.  The file or directory will be searched for in `path`.  If
+    `script` is a directory then all files in that directory will be frozen.
 
     `opt` is the optimisation level to pass to mpy-cross when compiling .py
     to .mpy.
@@ -182,14 +183,22 @@ def freeze_internal(kind, path, script, opt):
         if any(f[0] == KIND_AS_STR for f in manifest_list):
             raise FreezeError("can only freeze one str directory")
         manifest_list.append((KIND_AS_STR, path, script, opt))
-    elif script is None:
-        for dirpath, dirnames, filenames in os.walk(path, followlinks=True):
+    elif script is None or isinstance(script, str) and script.find(".") == -1:
+        # Recursively search `path` for files to freeze, optionally restricted
+        # to a subdirectory specified by `script`
+        if script is None:
+            subdir = ""
+        else:
+            subdir = "/" + script
+        for dirpath, dirnames, filenames in os.walk(path + subdir, followlinks=True):
             for f in filenames:
                 freeze_internal(kind, path, (dirpath + "/" + f)[len(path) + 1 :], opt)
     elif not isinstance(script, str):
+        # `script` is an iterable of items to freeze
         for s in script:
             freeze_internal(kind, path, s, opt)
     else:
+        # `script` should specify an individual file to be frozen
         extension_kind = {KIND_AS_MPY: ".py", KIND_MPY: ".mpy"}
         if kind == KIND_AUTO:
             for k, ext in extension_kind.items():

From 0c77668d11a0b8db7af57311828169e3fdc9678f Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 25 Jun 2020 16:31:33 +1000
Subject: [PATCH 0113/3533] extmod/vfs_lfs: Fix littlefs bindings to build in
 nan-box mode.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/vfs_lfsx.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extmod/vfs_lfsx.c b/extmod/vfs_lfsx.c
index c6240967822aa..24816433be015 100644
--- a/extmod/vfs_lfsx.c
+++ b/extmod/vfs_lfsx.c
@@ -442,7 +442,7 @@ STATIC mp_import_stat_t MP_VFS_LFSx(import_stat)(void *self_in, const char *path
     MP_OBJ_VFS_LFSx *self = self_in;
     struct LFSx_API (info) info;
     mp_obj_str_t path_obj = { { &mp_type_str }, 0, 0, (const byte *)path };
-    path = MP_VFS_LFSx(make_path)(self, &path_obj);
+    path = MP_VFS_LFSx(make_path)(self, MP_OBJ_FROM_PTR(&path_obj));
     int ret = LFSx_API(stat)(&self->lfs, path, &info);
     if (ret == 0) {
         if (info.type == LFSx_MACRO(_TYPE_REG)) {

From eb9850ef6cbb1d5a05d18a1e050f7a78b106c502 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 25 Jun 2020 16:08:05 +1000
Subject: [PATCH 0114/3533] stm32/mpconfigport.h: Enable PY_IO_FILEIO when any
 VFS is enabled.

Previously, if FAT was not enabled but LFS1/2 was then MICROPY_PY_IO_FILEIO
would be disabled and file binary-mode was not supported.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/mpconfigport.h | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/ports/stm32/mpconfigport.h b/ports/stm32/mpconfigport.h
index 13dce6e96d334..6f38d90e8d800 100644
--- a/ports/stm32/mpconfigport.h
+++ b/ports/stm32/mpconfigport.h
@@ -120,7 +120,7 @@
 #define MICROPY_PY_CMATH            (1)
 #define MICROPY_PY_IO               (1)
 #define MICROPY_PY_IO_IOBASE        (1)
-#define MICROPY_PY_IO_FILEIO        (MICROPY_VFS_FAT) // because mp_type_fileio/textio point to fatfs impl
+#define MICROPY_PY_IO_FILEIO        (MICROPY_VFS_FAT || MICROPY_VFS_LFS1 || MICROPY_VFS_LFS2)
 #define MICROPY_PY_SYS_MAXSIZE      (1)
 #define MICROPY_PY_SYS_EXIT         (1)
 #define MICROPY_PY_SYS_STDFILES     (1)
@@ -210,9 +210,17 @@
 #define MICROPY_FATFS_RPATH            (2)
 #define MICROPY_FATFS_MULTI_PARTITION  (1)
 
-// TODO these should be generic, not bound to fatfs
+// TODO these should be generic, not bound to a particular FS implementation
+#if MICROPY_VFS_FAT
 #define mp_type_fileio mp_type_vfs_fat_fileio
 #define mp_type_textio mp_type_vfs_fat_textio
+#elif MICROPY_VFS_LFS1
+#define mp_type_fileio mp_type_vfs_lfs1_fileio
+#define mp_type_textio mp_type_vfs_lfs1_textio
+#elif MICROPY_VFS_LFS2
+#define mp_type_fileio mp_type_vfs_lfs2_fileio
+#define mp_type_textio mp_type_vfs_lfs2_textio
+#endif
 
 // use vfs's functions for import stat and builtin open
 #define mp_import_stat mp_vfs_import_stat

From c5af3217d985f517287c6b85bda16c5b7f9fa677 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 25 Jun 2020 16:10:00 +1000
Subject: [PATCH 0115/3533] stm32/timer: Support TIM1 on WB MCUs.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/stm32_it.c | 2 +-
 ports/stm32/timer.c    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/stm32/stm32_it.c b/ports/stm32/stm32_it.c
index b84f4adfaeb81..8e96da177b583 100644
--- a/ports/stm32/stm32_it.c
+++ b/ports/stm32/stm32_it.c
@@ -602,7 +602,7 @@ void TIM1_UP_TIM10_IRQHandler(void) {
     IRQ_EXIT(TIM1_UP_TIM10_IRQn);
 }
 
-#if defined(STM32L4)
+#if defined(STM32L4) || defined(STM32WB)
 void TIM1_UP_TIM16_IRQHandler(void) {
     IRQ_ENTER(TIM1_UP_TIM16_IRQn);
     timer_irq_handler(1);
diff --git a/ports/stm32/timer.c b/ports/stm32/timer.c
index 491221ec2a7de..c6f3d21f8671e 100644
--- a/ports/stm32/timer.c
+++ b/ports/stm32/timer.c
@@ -805,7 +805,7 @@ STATIC const uint32_t tim_instance_table[MICROPY_HW_MAX_TIMER] = {
     TIM_ENTRY(1, TIM1_UP_TIM10_IRQn),
     #elif defined(STM32H7)
     TIM_ENTRY(1, TIM1_UP_IRQn),
-    #elif defined(STM32L4)
+    #elif defined(STM32L4) || defined(STM32WB)
     TIM_ENTRY(1, TIM1_UP_TIM16_IRQn),
     #endif
     #endif

From 717b5073aa7295164f3c06a889b648071b435bc3 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 25 Jun 2020 16:11:48 +1000
Subject: [PATCH 0116/3533] stm32/boards: Enable LFS2 on PYBD_SF3 and PYBD_SF6.

This was missed in commit 120368ba1ab444b2f1c17d1eb69bc6f09072ec5d

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/boards/PYBD_SF3/mpconfigboard.mk | 1 +
 ports/stm32/boards/PYBD_SF6/mpconfigboard.mk | 1 +
 2 files changed, 2 insertions(+)

diff --git a/ports/stm32/boards/PYBD_SF3/mpconfigboard.mk b/ports/stm32/boards/PYBD_SF3/mpconfigboard.mk
index 119ec8f825b42..abe3dcd862373 100644
--- a/ports/stm32/boards/PYBD_SF3/mpconfigboard.mk
+++ b/ports/stm32/boards/PYBD_SF3/mpconfigboard.mk
@@ -17,6 +17,7 @@ MICROPY_PY_LWIP = 1
 MICROPY_PY_NETWORK_CYW43 = 1
 MICROPY_PY_USSL = 1
 MICROPY_SSL_MBEDTLS = 1
+MICROPY_VFS_LFS2 = 1
 
 # PYBD-specific frozen modules
 FROZEN_MANIFEST = boards/PYBD_SF2/manifest.py
diff --git a/ports/stm32/boards/PYBD_SF6/mpconfigboard.mk b/ports/stm32/boards/PYBD_SF6/mpconfigboard.mk
index ddc176e9cd422..bac516ab7949f 100644
--- a/ports/stm32/boards/PYBD_SF6/mpconfigboard.mk
+++ b/ports/stm32/boards/PYBD_SF6/mpconfigboard.mk
@@ -14,6 +14,7 @@ MICROPY_PY_LWIP = 1
 MICROPY_PY_NETWORK_CYW43 = 1
 MICROPY_PY_USSL = 1
 MICROPY_SSL_MBEDTLS = 1
+MICROPY_VFS_LFS2 = 1
 
 # PYBD-specific frozen modules
 FROZEN_MANIFEST = boards/PYBD_SF2/manifest.py

From 763bd448a4348b36db08cbae41337507e47cb892 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 23 Jun 2020 16:16:21 +1000
Subject: [PATCH 0117/3533] stm32/mboot: Don't search for firmware on FS, just
 attempt to open it.

There's no need to do a directory listing to search for the given firmware
filename, it just takes extra time and code size.  Instead this commit
changes it so that the requested firmware file is opened immediately and
will abort if the file couldn't be opened.  This also allows to specify
files in a directory.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/mboot/fsload.c | 43 ++++++++++++--------------------------
 1 file changed, 13 insertions(+), 30 deletions(-)

diff --git a/ports/stm32/mboot/fsload.c b/ports/stm32/mboot/fsload.c
index 64eb2a3a5ba72..12f39c65b360d 100644
--- a/ports/stm32/mboot/fsload.c
+++ b/ports/stm32/mboot/fsload.c
@@ -204,7 +204,7 @@ static int fsload_program_file(FATFS *fatfs, const char *filename, bool write_to
     return 0;
 }
 
-static int fsload_process_fatfs(uint32_t base_addr, uint32_t byte_len, size_t fname_len, const char *fname) {
+static int fsload_process_fatfs(uint32_t base_addr, uint32_t byte_len, const char *fname) {
     fsload_bdev_t bdev = {base_addr, byte_len};
     FATFS fatfs;
     fatfs.drv = &bdev;
@@ -213,34 +213,14 @@ static int fsload_process_fatfs(uint32_t base_addr, uint32_t byte_len, size_t fn
         return -1;
     }
 
-    FF_DIR dp;
-    res = f_opendir(&fatfs, &dp, "/");
-    if (res != FR_OK) {
-        return -1;
-    }
+    // Validate firmware
+    led_state_all(2);
+    int r = fsload_program_file(&fatfs, fname, false);
 
-    // Search for firmware file with correct name
-    int r;
-    for (;;) {
-        FILINFO fno;
-        res = f_readdir(&dp, &fno);
-        char *fn = fno.fname;
-        if (res != FR_OK || fn[0] == 0) {
-            // Finished listing dir, no firmware found
-            r = -1;
-            break;
-        }
-        if (memcmp(fn, fname, fname_len) == 0 && fn[fname_len] == '\0') {
-            // Found firmware
-            led_state_all(2);
-            r = fsload_program_file(&fatfs, fn, false);
-            if (r == 0) {
-                // Firmware is valid, program it
-                led_state_all(4);
-                r = fsload_program_file(&fatfs, fn, true);
-            }
-            break;
-        }
+    if (r == 0) {
+        // Firmware is valid, program it
+        led_state_all(4);
+        r = fsload_program_file(&fatfs, fname, true);
     }
 
     return r;
@@ -252,9 +232,12 @@ int fsload_process(void) {
         return -1;
     }
 
+    // Get mount point id and create null-terminated filename
     uint8_t mount_point = elem[0];
     uint8_t fname_len = elem[-1] - 1;
-    const char *fname = (const char*)&elem[1];
+    char fname[256];
+    memcpy(fname, &elem[1], fname_len);
+    fname[fname_len] = '\0';
 
     elem = ELEM_DATA_START;
     for (;;) {
@@ -267,7 +250,7 @@ int fsload_process(void) {
             uint32_t base_addr = get_le32(&elem[2]);
             uint32_t byte_len = get_le32(&elem[6]);
             if (elem[1] == ELEM_MOUNT_FAT) {
-                int ret = fsload_process_fatfs(base_addr, byte_len, fname_len, fname);
+                int ret = fsload_process_fatfs(base_addr, byte_len, fname);
                 // Flash LEDs based on success/failure of update
                 for (int i = 0; i < 4; ++i) {
                     if (ret == 0) {

From 390f32922d81b56495198d3d93b7258f450c03b6 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 23 Jun 2020 22:57:16 +1000
Subject: [PATCH 0118/3533] stm32/mboot: Decouple stream, filesystem and
 top-level loading code.

This commit factors the code for files and streaming to separate source
files (vfs_fat.c and gzstream.c respectively) and introduces an abstract
gzstream interface to make it easier to plug in different filesystems.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/mboot/Makefile                |   3 +-
 ports/stm32/mboot/fsload.c                | 110 +++++-----------------
 ports/stm32/mboot/gzstream.c              |  94 ++++++++++++++++++
 ports/stm32/mboot/gzstream.h              |  45 +++++++++
 ports/stm32/mboot/mboot.h                 |   5 -
 ports/stm32/mboot/vfs.h                   |  43 +++++++++
 ports/stm32/mboot/{diskio.c => vfs_fat.c} |  54 +++++++++--
 7 files changed, 256 insertions(+), 98 deletions(-)
 create mode 100644 ports/stm32/mboot/gzstream.c
 create mode 100644 ports/stm32/mboot/gzstream.h
 create mode 100644 ports/stm32/mboot/vfs.h
 rename ports/stm32/mboot/{diskio.c => vfs_fat.c} (60%)

diff --git a/ports/stm32/mboot/Makefile b/ports/stm32/mboot/Makefile
index a72b752ac9430..9ab186412ea93 100755
--- a/ports/stm32/mboot/Makefile
+++ b/ports/stm32/mboot/Makefile
@@ -102,7 +102,8 @@ SRC_C = \
 	main.c \
 	elem.c \
 	fsload.c \
-	diskio.c \
+	gzstream.c \
+	vfs_fat.c \
 	drivers/bus/softspi.c \
 	drivers/bus/softqspi.c \
 	drivers/memory/spiflash.c \
diff --git a/ports/stm32/mboot/fsload.c b/ports/stm32/mboot/fsload.c
index 12f39c65b360d..dc40a28ea02d4 100644
--- a/ports/stm32/mboot/fsload.c
+++ b/ports/stm32/mboot/fsload.c
@@ -27,81 +27,18 @@
 #include <string.h>
 
 #include "py/mphal.h"
-#include "lib/oofatfs/ff.h"
-#include "extmod/uzlib/uzlib.h"
 #include "mboot.h"
+#include "vfs.h"
 
 #if MBOOT_FSLOAD
 
-#define DICT_SIZE (1 << 15)
-
-typedef struct _gz_stream_t {
-    FIL fp;
-    TINF_DATA tinf;
-    uint8_t buf[512];
-    uint8_t dict[DICT_SIZE];
-} gz_stream_t;
-
-static gz_stream_t gz_stream SECTION_NOZERO_BSS;
-
-static int gz_stream_read_src(TINF_DATA *tinf) {
-    UINT n;
-    FRESULT res = f_read(&gz_stream.fp, gz_stream.buf, sizeof(gz_stream.buf), &n);
-    if (res != FR_OK) {
-        return -1;
-    }
-    if (n == 0) {
-        return -1;
-    }
-    tinf->source = gz_stream.buf + 1;
-    tinf->source_limit = gz_stream.buf + n;
-    return gz_stream.buf[0];
-}
-
-static int gz_stream_open(FATFS *fatfs, const char *filename) {
-    FRESULT res = f_open(fatfs, &gz_stream.fp, filename, FA_READ);
-    if (res != FR_OK) {
-        return -1;
-    }
-    memset(&gz_stream.tinf, 0, sizeof(gz_stream.tinf));
-    gz_stream.tinf.readSource = gz_stream_read_src;
-
-    int st = uzlib_gzip_parse_header(&gz_stream.tinf);
-    if (st != TINF_OK) {
-        f_close(&gz_stream.fp);
-        return -1;
-    }
-
-    uzlib_uncompress_init(&gz_stream.tinf, gz_stream.dict, DICT_SIZE);
-
-    return 0;
-}
-
-static int gz_stream_read(size_t len, uint8_t *buf) {
-    gz_stream.tinf.dest = buf;
-    gz_stream.tinf.dest_limit = buf + len;
-    int st = uzlib_uncompress_chksum(&gz_stream.tinf);
-    if (st == TINF_DONE) {
-        return 0;
-    }
-    if (st < 0) {
-        return st;
-    }
-    return gz_stream.tinf.dest - buf;
-}
-
-static int fsload_program_file(FATFS *fatfs, const char *filename, bool write_to_flash) {
-    int res = gz_stream_open(fatfs, filename);
-    if (res != 0) {
-        return res;
-    }
-
+static int fsload_program_file(bool write_to_flash) {
     // Parse DFU
     uint8_t buf[512];
     size_t file_offset;
 
     // Read file header, <5sBIB
-    res = gz_stream_read(11, buf);
+    int res = gz_stream_read(11, buf);
     if (res != 11) {
         return -1;
     }
@@ -204,26 +141,23 @@ static int fsload_program_file(FATFS *fatfs, const char *filename, bool write_to
     return 0;
 }
 
-static int fsload_process_fatfs(uint32_t base_addr, uint32_t byte_len, const char *fname) {
-    fsload_bdev_t bdev = {base_addr, byte_len};
-    FATFS fatfs;
-    fatfs.drv = &bdev;
-    FRESULT res = f_mount(&fatfs);
-    if (res != FR_OK) {
-        return -1;
-    }
-
-    // Validate firmware
-    led_state_all(2);
-    int r = fsload_program_file(&fatfs, fname, false);
-
-    if (r == 0) {
-        // Firmware is valid, program it
-        led_state_all(4);
-        r = fsload_program_file(&fatfs, fname, true);
+static int fsload_validate_and_program_file(void *stream, const stream_methods_t *meth, const char *fname) {
+    // First pass verifies the file, second pass programs it
+    for (unsigned int pass = 0; pass <= 1; ++pass) {
+        led_state_all(pass == 0 ? 2 : 4);
+        int res = meth->open(stream, fname);
+        if (res == 0) {
+            res = gz_stream_init(stream, meth->read);
+            if (res == 0) {
+                res = fsload_program_file(pass == 0 ? false : true);
+            }
+        }
+        meth->close(stream);
+        if (res != 0) {
+            return res;
+        }
     }
-
-    return r;
+    return 0;
 }
 
 int fsload_process(void) {
@@ -250,7 +184,11 @@ int fsload_process(void) {
             uint32_t base_addr = get_le32(&elem[2]);
             uint32_t byte_len = get_le32(&elem[6]);
             if (elem[1] == ELEM_MOUNT_FAT) {
-                int ret = fsload_process_fatfs(base_addr, byte_len, fname);
+                vfs_fat_context_t ctx;
+                int ret = vfs_fat_mount(&ctx, base_addr, byte_len);
+                if (ret == 0) {
+                    ret = fsload_validate_and_program_file(&ctx, &vfs_fat_stream_methods, fname);
+                }
                 // Flash LEDs based on success/failure of update
                 for (int i = 0; i < 4; ++i) {
                     if (ret == 0) {
diff --git a/ports/stm32/mboot/gzstream.c b/ports/stm32/mboot/gzstream.c
new file mode 100644
index 0000000000000..20ba33045f8d8
--- /dev/null
+++ b/ports/stm32/mboot/gzstream.c
@@ -0,0 +1,94 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2019-2020 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include <string.h>
+
+#include "py/mphal.h"
+#include "extmod/uzlib/uzlib.h"
+#include "gzstream.h"
+#include "mboot.h"
+
+#if MBOOT_FSLOAD
+
+#define DICT_SIZE (1 << 15)
+
+typedef struct _gz_stream_t {
+    void *stream_data;
+    stream_read_t stream_read;
+    TINF_DATA tinf;
+    uint8_t buf[512];
+    uint8_t dict[DICT_SIZE];
+} gz_stream_t;
+
+static gz_stream_t gz_stream SECTION_NOZERO_BSS;
+
+static int gz_stream_read_src(TINF_DATA *tinf) {
+    int n = gz_stream.stream_read(gz_stream.stream_data, gz_stream.buf, sizeof(gz_stream.buf));
+    if (n < 0) {
+        // Stream error
+        return -1;
+    }
+    if (n == 0) {
+        // No data / EOF
+        return -1;
+    }
+
+    tinf->source = gz_stream.buf + 1;
+    tinf->source_limit = gz_stream.buf + n;
+    return gz_stream.buf[0];
+}
+
+int gz_stream_init(void *stream_data, stream_read_t stream_read) {
+    gz_stream.stream_data = stream_data;
+    gz_stream.stream_read = stream_read;
+
+    memset(&gz_stream.tinf, 0, sizeof(gz_stream.tinf));
+    gz_stream.tinf.readSource = gz_stream_read_src;
+
+    int st = uzlib_gzip_parse_header(&gz_stream.tinf);
+    if (st != TINF_OK) {
+        return -1;
+    }
+
+    uzlib_uncompress_init(&gz_stream.tinf, gz_stream.dict, DICT_SIZE);
+
+    return 0;
+}
+
+int gz_stream_read(size_t len, uint8_t *buf) {
+    gz_stream.tinf.dest = buf;
+    gz_stream.tinf.dest_limit = buf + len;
+    int st = uzlib_uncompress_chksum(&gz_stream.tinf);
+    if (st == TINF_DONE) {
+        return 0;
+    }
+    if (st < 0) {
+        return st;
+    }
+    return gz_stream.tinf.dest - buf;
+}
+
+#endif // MBOOT_FSLOAD
diff --git a/ports/stm32/mboot/gzstream.h b/ports/stm32/mboot/gzstream.h
new file mode 100644
index 0000000000000..ec11ba79bbb02
--- /dev/null
+++ b/ports/stm32/mboot/gzstream.h
@@ -0,0 +1,45 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2019-2020 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+#ifndef MICROPY_INCLUDED_STM32_MBOOT_GZSTREAM_H
+#define MICROPY_INCLUDED_STM32_MBOOT_GZSTREAM_H
+
+#include <stddef.h>
+#include <stdint.h>
+
+typedef int (*stream_open_t)(void *stream, const char *fname);
+typedef void (*stream_close_t)(void *stream);
+typedef int (*stream_read_t)(void *stream, uint8_t *buf, size_t len);
+
+typedef struct _stream_methods_t {
+    stream_open_t open;
+    stream_close_t close;
+    stream_read_t read;
+} stream_methods_t;
+
+int gz_stream_init(void *stream_data, stream_read_t stream_read);
+int gz_stream_read(size_t len, uint8_t *buf);
+
+#endif // MICROPY_INCLUDED_STM32_MBOOT_GZSTREAM_H
diff --git a/ports/stm32/mboot/mboot.h b/ports/stm32/mboot/mboot.h
index 7dc1ada0c32f6..ef9af7854b894 100644
--- a/ports/stm32/mboot/mboot.h
+++ b/ports/stm32/mboot/mboot.h
@@ -44,11 +44,6 @@ enum {
     ELEM_MOUNT_FAT = 1,
 };
 
-typedef struct _fsload_bdev_t {
-    uint32_t base_addr;
-    uint32_t byte_len;
-} fsload_bdev_t;
-
 extern uint8_t _estack[ELEM_DATA_SIZE];
 
 uint32_t get_le32(const uint8_t *b);
diff --git a/ports/stm32/mboot/vfs.h b/ports/stm32/mboot/vfs.h
new file mode 100644
index 0000000000000..9ee1c5ff3cd42
--- /dev/null
+++ b/ports/stm32/mboot/vfs.h
@@ -0,0 +1,43 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2019-2020 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+#ifndef MICROPY_INCLUDED_STM32_MBOOT_VFS_H
+#define MICROPY_INCLUDED_STM32_MBOOT_VFS_H
+
+#include "lib/oofatfs/ff.h"
+#include "gzstream.h"
+
+typedef struct _vfs_fat_context_t {
+    uint32_t bdev_base_addr;
+    uint32_t bdev_byte_len;
+    FATFS fatfs;
+    FIL fp;
+} vfs_fat_context_t;
+
+extern const stream_methods_t vfs_fat_stream_methods;
+
+int vfs_fat_mount(vfs_fat_context_t *ctx, uint32_t base_addr, uint32_t byte_len);
+
+#endif // MICROPY_INCLUDED_STM32_MBOOT_VFS_H
diff --git a/ports/stm32/mboot/diskio.c b/ports/stm32/mboot/vfs_fat.c
similarity index 60%
rename from ports/stm32/mboot/diskio.c
rename to ports/stm32/mboot/vfs_fat.c
index 5f68f26a8e669..20994c8b4c00d 100644
--- a/ports/stm32/mboot/diskio.c
+++ b/ports/stm32/mboot/vfs_fat.c
@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2019 Damien P. George
+ * Copyright (c) 2019-2020 Damien P. George
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -28,6 +28,7 @@
 #include "lib/oofatfs/ff.h"
 #include "lib/oofatfs/diskio.h"
 #include "mboot.h"
+#include "vfs.h"
 
 #if MBOOT_FSLOAD
 
@@ -38,10 +39,10 @@
 #endif
 
 DRESULT disk_read(void *pdrv, BYTE *buf, DWORD sector, UINT count) {
-    fsload_bdev_t *bdev = pdrv;
+    vfs_fat_context_t *ctx = pdrv;
 
-    if (0 <= sector && sector < bdev->byte_len / 512) {
-        do_read(bdev->base_addr + sector * SECSIZE, count * SECSIZE, buf);
+    if (0 <= sector && sector < ctx->bdev_byte_len / 512) {
+        do_read(ctx->bdev_base_addr + sector * SECSIZE, count * SECSIZE, buf);
         return RES_OK;
     }
 
@@ -49,14 +50,14 @@ DRESULT disk_read(void *pdrv, BYTE *buf, DWORD sector, UINT count) {
 }
 
 DRESULT disk_ioctl(void *pdrv, BYTE cmd, void *buf) {
-    fsload_bdev_t *bdev = pdrv;
+    vfs_fat_context_t *ctx = pdrv;
 
     switch (cmd) {
         case CTRL_SYNC:
             return RES_OK;
 
         case GET_SECTOR_COUNT:
-            *((DWORD*)buf) = bdev->byte_len / SECSIZE;
+            *((DWORD*)buf) = ctx->bdev_byte_len / SECSIZE;
             return RES_OK;
 
         case GET_SECTOR_SIZE:
@@ -77,4 +78,45 @@ DRESULT disk_ioctl(void *pdrv, BYTE cmd, void *buf) {
     }
 }
 
+int vfs_fat_mount(vfs_fat_context_t *ctx, uint32_t base_addr, uint32_t byte_len) {
+    ctx->bdev_base_addr = base_addr;
+    ctx->bdev_byte_len = byte_len;
+    ctx->fatfs.drv = ctx;
+    FRESULT res = f_mount(&ctx->fatfs);
+    if (res != FR_OK) {
+        return -1;
+    }
+    return 0;
+}
+
+static int vfs_fat_stream_open(void *stream_in, const char *fname) {
+    vfs_fat_context_t *stream = stream_in;
+    FRESULT res = f_open(&stream->fatfs, &stream->fp, fname, FA_READ);
+    if (res != FR_OK) {
+        return -1;
+    }
+    return 0;
+}
+
+static void vfs_fat_stream_close(void *stream_in) {
+    vfs_fat_context_t *stream = stream_in;
+    f_close(&stream->fp);
+}
+
+static int vfs_fat_stream_read(void *stream_in, uint8_t *buf, size_t len) {
+    vfs_fat_context_t *stream = stream_in;
+    UINT n;
+    FRESULT res = f_read(&stream->fp, buf, len, &n);
+    if (res != FR_OK) {
+        return -1;
+    }
+    return n;
+}
+
+const stream_methods_t vfs_fat_stream_methods = {
+    vfs_fat_stream_open,
+    vfs_fat_stream_close,
+    vfs_fat_stream_read,
+};
+
 #endif // MBOOT_FSLOAD

From 67fd58bbd212badff9cd66d0f5f215834844e6aa Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 23 Jun 2020 23:58:26 +1000
Subject: [PATCH 0119/3533] stm32/mboot: Add support for littlefs.

Mboot now supports FAT, LFS1 and LFS2 filesystems, to load firmware from.
The filesystem needed by the board must be explicitly enabled by the
configuration variables MBOOT_VFS_FAT, MBOOT_VFS_LFS1 and MBOOT_VFS_LFS2.
Boards that previously used FAT implicitly (with MBOOT_FSLOAD enabled) must
now add the following config to mpconfigboard.h:

    #define MBOOT_VFS_FAT (1)

Signed-off-by: Damien George <damien@micropython.org>
---
 .../MIKROE_CLICKER2_STM32/mpconfigboard.h     |   1 +
 ports/stm32/boards/PYBD_SF2/mpconfigboard.h   |   1 +
 ports/stm32/mboot/Makefile                    |   7 +
 ports/stm32/mboot/fsload.c                    |  71 +++++--
 ports/stm32/mboot/fwupdate.py                 |  13 +-
 ports/stm32/mboot/mboot.h                     |   8 +-
 ports/stm32/mboot/vfs.h                       |  55 +++++-
 ports/stm32/mboot/vfs_fat.c                   |   4 +-
 ports/stm32/mboot/vfs_lfs.c                   | 177 ++++++++++++++++++
 9 files changed, 309 insertions(+), 28 deletions(-)
 create mode 100644 ports/stm32/mboot/vfs_lfs.c

diff --git a/ports/stm32/boards/MIKROE_CLICKER2_STM32/mpconfigboard.h b/ports/stm32/boards/MIKROE_CLICKER2_STM32/mpconfigboard.h
index eb622cd296a84..71af3ce03823d 100644
--- a/ports/stm32/boards/MIKROE_CLICKER2_STM32/mpconfigboard.h
+++ b/ports/stm32/boards/MIKROE_CLICKER2_STM32/mpconfigboard.h
@@ -83,3 +83,4 @@
 #define MBOOT_BOOTPIN_PULL          (MP_HAL_PIN_PULL_NONE)
 #define MBOOT_BOOTPIN_ACTIVE        (0)
 #define MBOOT_FSLOAD                (1)
+#define MBOOT_VFS_FAT               (1)
diff --git a/ports/stm32/boards/PYBD_SF2/mpconfigboard.h b/ports/stm32/boards/PYBD_SF2/mpconfigboard.h
index 757dacf9a7c18..f6e130eb57eaf 100644
--- a/ports/stm32/boards/PYBD_SF2/mpconfigboard.h
+++ b/ports/stm32/boards/PYBD_SF2/mpconfigboard.h
@@ -188,6 +188,7 @@ extern struct _spi_bdev_t spi_bdev2;
 
 #define MBOOT_USB_AUTODETECT_PORT   (1)
 #define MBOOT_FSLOAD                (1)
+#define MBOOT_VFS_FAT               (1)
 
 #define MBOOT_I2C_PERIPH_ID         1
 #define MBOOT_I2C_SCL               (pin_B8)
diff --git a/ports/stm32/mboot/Makefile b/ports/stm32/mboot/Makefile
index 9ab186412ea93..c901dfb3344a4 100755
--- a/ports/stm32/mboot/Makefile
+++ b/ports/stm32/mboot/Makefile
@@ -70,6 +70,8 @@ CFLAGS += -DSTM32_HAL_H='<stm32$(MCU_SERIES)xx_hal.h>'
 CFLAGS += -DBOARD_$(BOARD)
 CFLAGS += -DAPPLICATION_ADDR=$(TEXT0_ADDR)
 CFLAGS += -DFFCONF_H=\"ports/stm32/mboot/ffconf.h\"
+CFLAGS += -DLFS1_NO_MALLOC -DLFS1_NO_DEBUG -DLFS1_NO_WARN -DLFS1_NO_ERROR -DLFS1_NO_ASSERT
+CFLAGS += -DLFS2_NO_MALLOC -DLFS2_NO_DEBUG -DLFS2_NO_WARN -DLFS2_NO_ERROR -DLFS2_NO_ASSERT
 CFLAGS += -DBUILDING_MBOOT=1
 CFLAGS += -DBOOTLOADER_DFU_USB_VID=$(BOOTLOADER_DFU_USB_VID) -DBOOTLOADER_DFU_USB_PID=$(BOOTLOADER_DFU_USB_PID)
 
@@ -91,6 +93,10 @@ endif
 $(BUILD)/lib/libc/string0.o: CFLAGS += $(CFLAGS_BUILTIN)
 LIB_SRC_C = \
 	lib/libc/string0.c \
+	lib/littlefs/lfs1.c \
+	lib/littlefs/lfs1_util.c \
+	lib/littlefs/lfs2.c \
+	lib/littlefs/lfs2_util.c \
 	lib/oofatfs/ff.c \
 	lib/oofatfs/ffunicode.c \
 	extmod/uzlib/crc32.c \
@@ -104,6 +110,7 @@ SRC_C = \
 	fsload.c \
 	gzstream.c \
 	vfs_fat.c \
+	vfs_lfs.c \
 	drivers/bus/softspi.c \
 	drivers/bus/softqspi.c \
 	drivers/memory/spiflash.c \
diff --git a/ports/stm32/mboot/fsload.c b/ports/stm32/mboot/fsload.c
index dc40a28ea02d4..1e1ad7a04d015 100644
--- a/ports/stm32/mboot/fsload.c
+++ b/ports/stm32/mboot/fsload.c
@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2019 Damien P. George
+ * Copyright (c) 2019-2020 Damien P. George
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -32,6 +32,10 @@
 
 #if MBOOT_FSLOAD
 
+#if !(MBOOT_VFS_FAT || MBOOT_VFS_LFS1 || MBOOT_VFS_LFS2)
+#error Must enable at least one VFS component
+#endif
+
 static int fsload_program_file(bool write_to_flash) {
     // Parse DFU
     uint8_t buf[512];
@@ -183,27 +187,58 @@ int fsload_process(void) {
         if (elem[0] == mount_point) {
             uint32_t base_addr = get_le32(&elem[2]);
             uint32_t byte_len = get_le32(&elem[6]);
+            int ret;
+            union {
+                #if MBOOT_VFS_FAT
+                vfs_fat_context_t fat;
+                #endif
+                #if MBOOT_VFS_LFS1
+                vfs_lfs1_context_t lfs1;
+                #endif
+                #if MBOOT_VFS_LFS2
+                vfs_lfs2_context_t lfs2;
+                #endif
+            } ctx;
+            const stream_methods_t *methods;
+            #if MBOOT_VFS_FAT
             if (elem[1] == ELEM_MOUNT_FAT) {
-                vfs_fat_context_t ctx;
-                int ret = vfs_fat_mount(&ctx, base_addr, byte_len);
+                ret = vfs_fat_mount(&ctx.fat, base_addr, byte_len);
+                methods = &vfs_fat_stream_methods;
+            } else
+            #endif
+            #if MBOOT_VFS_LFS1
+            if (elem[1] == ELEM_MOUNT_LFS1) {
+                ret = vfs_lfs1_mount(&ctx.lfs1, base_addr, byte_len);
+                methods = &vfs_lfs1_stream_methods;
+            } else
+            #endif
+            #if MBOOT_VFS_LFS2
+            if (elem[1] == ELEM_MOUNT_LFS2) {
+                ret = vfs_lfs2_mount(&ctx.lfs2, base_addr, byte_len);
+                methods = &vfs_lfs2_stream_methods;
+            } else
+            #endif
+            {
+                // Unknown filesystem type
+                return -1;
+            }
+
+            if (ret == 0) {
+                ret = fsload_validate_and_program_file(&ctx, methods, fname);
+            }
+
+            // Flash LEDs based on success/failure of update
+            for (int i = 0; i < 4; ++i) {
                 if (ret == 0) {
-                    ret = fsload_validate_and_program_file(&ctx, &vfs_fat_stream_methods, fname);
+                    led_state_all(7);
+                } else {
+                    led_state_all(1);
                 }
-                // Flash LEDs based on success/failure of update
-                for (int i = 0; i < 4; ++i) {
-                    if (ret == 0) {
-                        led_state_all(7);
-                    } else {
-                        led_state_all(1);
-                    }
-                    mp_hal_delay_ms(100);
-                    led_state_all(0);
-                    mp_hal_delay_ms(100);
-                }
-                return ret;
+                mp_hal_delay_ms(100);
+                led_state_all(0);
+                mp_hal_delay_ms(100);
             }
-            // Unknown filesystem type
-            return -1;
+            return ret;
         }
         elem += elem[-1];
     }
diff --git a/ports/stm32/mboot/fwupdate.py b/ports/stm32/mboot/fwupdate.py
index b44ed772c3047..dab5fa6632e99 100644
--- a/ports/stm32/mboot/fwupdate.py
+++ b/ports/stm32/mboot/fwupdate.py
@@ -1,9 +1,13 @@
 # Update Mboot or MicroPython from a .dfu.gz file on the board's filesystem
-# MIT license; Copyright (c) 2019 Damien P. George
+# MIT license; Copyright (c) 2019-2020 Damien P. George
 
 import struct, time
 import uzlib, machine, stm
 
+# Constants to be used with update_mpy
+VFS_FAT = 1
+VFS_LFS1 = 2
+VFS_LFS2 = 3
 
 FLASH_KEY1 = 0x45670123
 FLASH_KEY2 = 0xCDEF89AB
@@ -152,7 +156,7 @@ def update_mboot(filename):
     print("Programming finished, can now reset or turn off.")
 
 
-def update_mpy(filename, fs_base, fs_len):
+def update_mpy(filename, fs_base, fs_len, fs_type=VFS_FAT):
     # Check firmware is of .dfu.gz type
     try:
         with open(filename, "rb") as f:
@@ -166,11 +170,8 @@ def update_mpy(filename, fs_base, fs_len):
     ELEM_TYPE_END = 1
     ELEM_TYPE_MOUNT = 2
     ELEM_TYPE_FSLOAD = 3
-    ELEM_MOUNT_FAT = 1
     mount_point = 1
-    mount = struct.pack(
-        "<BBBBLL", ELEM_TYPE_MOUNT, 10, mount_point, ELEM_MOUNT_FAT, fs_base, fs_len
-    )
+    mount = struct.pack("<BBBBLL", ELEM_TYPE_MOUNT, 10, mount_point, fs_type, fs_base, fs_len)
     fsup = struct.pack("<BBB", ELEM_TYPE_FSLOAD, 1 + len(filename), mount_point) + bytes(
         filename, "ascii"
     )
diff --git a/ports/stm32/mboot/mboot.h b/ports/stm32/mboot/mboot.h
index ef9af7854b894..37929665ebe95 100644
--- a/ports/stm32/mboot/mboot.h
+++ b/ports/stm32/mboot/mboot.h
@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2019 Damien P. George
+ * Copyright (c) 2019-2020 Damien P. George
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -23,6 +23,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+#ifndef MICROPY_INCLUDED_STM32_MBOOT_MBOOT_H
+#define MICROPY_INCLUDED_STM32_MBOOT_MBOOT_H
 
 #include <stdint.h>
 #include <stddef.h>
@@ -42,6 +44,8 @@ enum {
 
 enum {
     ELEM_MOUNT_FAT = 1,
+    ELEM_MOUNT_LFS1,
+    ELEM_MOUNT_LFS2,
 };
 
 extern uint8_t _estack[ELEM_DATA_SIZE];
@@ -55,3 +59,5 @@ int do_write(uint32_t addr, const uint8_t *src8, size_t len);
 
 const uint8_t *elem_search(const uint8_t *elem, uint8_t elem_id);
 int fsload_process(void);
+
+#endif // MICROPY_INCLUDED_STM32_MBOOT_MBOOT_H
diff --git a/ports/stm32/mboot/vfs.h b/ports/stm32/mboot/vfs.h
index 9ee1c5ff3cd42..6cf883a13975a 100644
--- a/ports/stm32/mboot/vfs.h
+++ b/ports/stm32/mboot/vfs.h
@@ -26,8 +26,12 @@
 #ifndef MICROPY_INCLUDED_STM32_MBOOT_VFS_H
 #define MICROPY_INCLUDED_STM32_MBOOT_VFS_H
 
-#include "lib/oofatfs/ff.h"
 #include "gzstream.h"
+#include "mboot.h"
+
+#if MBOOT_VFS_FAT
+
+#include "lib/oofatfs/ff.h"
 
 typedef struct _vfs_fat_context_t {
     uint32_t bdev_base_addr;
@@ -40,4 +44,53 @@ extern const stream_methods_t vfs_fat_stream_methods;
 
 int vfs_fat_mount(vfs_fat_context_t *ctx, uint32_t base_addr, uint32_t byte_len);
 
+#endif
+
+#if MBOOT_VFS_LFS1
+
+#include "lib/littlefs/lfs1.h"
+
+#define LFS_READ_SIZE (32)
+#define LFS_PROG_SIZE (32)
+#define LFS_LOOKAHEAD_SIZE (32)
+
+typedef struct _vfs_lfs1_context_t {
+    uint32_t bdev_base_addr;
+    struct lfs1_config config;
+    lfs1_t lfs;
+    struct lfs1_file_config filecfg;
+    uint8_t filebuf[LFS_PROG_SIZE];
+    lfs1_file_t file;
+} vfs_lfs1_context_t;
+
+extern const stream_methods_t vfs_lfs1_stream_methods;
+
+int vfs_lfs1_mount(vfs_lfs1_context_t *ctx, uint32_t base_addr, uint32_t byte_len);
+
+#endif
+
+#if MBOOT_VFS_LFS2
+
+#include "lib/littlefs/lfs2.h"
+
+#define LFS_READ_SIZE (32)
+#define LFS_PROG_SIZE (32)
+#define LFS_CACHE_SIZE (4 * LFS_READ_SIZE)
+#define LFS_LOOKAHEAD_SIZE (32)
+
+typedef struct _vfs_lfs2_context_t {
+    uint32_t bdev_base_addr;
+    struct lfs2_config config;
+    lfs2_t lfs;
+    struct lfs2_file_config filecfg;
+    uint8_t filebuf[LFS_CACHE_SIZE]; // lfs2 specific
+    lfs2_file_t file;
+} vfs_lfs2_context_t;
+
+extern const stream_methods_t vfs_lfs2_stream_methods;
+
+int vfs_lfs2_mount(vfs_lfs2_context_t *ctx, uint32_t base_addr, uint32_t byte_len);
+
+#endif
+
 #endif // MICROPY_INCLUDED_STM32_MBOOT_VFS_H
diff --git a/ports/stm32/mboot/vfs_fat.c b/ports/stm32/mboot/vfs_fat.c
index 20994c8b4c00d..20de074f0dcf0 100644
--- a/ports/stm32/mboot/vfs_fat.c
+++ b/ports/stm32/mboot/vfs_fat.c
@@ -30,7 +30,7 @@
 #include "mboot.h"
 #include "vfs.h"
 
-#if MBOOT_FSLOAD
+#if MBOOT_FSLOAD && MBOOT_VFS_FAT
 
 #if FF_MAX_SS == FF_MIN_SS
 #define SECSIZE (FF_MIN_SS)
@@ -119,4 +119,4 @@ const stream_methods_t vfs_fat_stream_methods = {
     vfs_fat_stream_read,
 };
 
-#endif // MBOOT_FSLOAD
+#endif // MBOOT_FSLOAD && MBOOT_VFS_FAT
diff --git a/ports/stm32/mboot/vfs_lfs.c b/ports/stm32/mboot/vfs_lfs.c
new file mode 100644
index 0000000000000..dec7c015fc087
--- /dev/null
+++ b/ports/stm32/mboot/vfs_lfs.c
@@ -0,0 +1,177 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include <string.h>
+
+#include "py/mphal.h"
+#include "mboot.h"
+#include "vfs.h"
+
+#if MBOOT_FSLOAD && (MBOOT_VFS_LFS1 || MBOOT_VFS_LFS2)
+
+#if MBOOT_VFS_LFS1
+#if MBOOT_VFS_LFS2
+#error Unsupported
+#endif
+
+#define LFSx_MACRO(s) LFS1##s
+#define LFSx_API(x) lfs1_ ## x
+#define VFS_LFSx_CONTEXT_T vfs_lfs1_context_t
+#define VFS_LFSx_MOUNT vfs_lfs1_mount
+#define VFS_LFSx_STREAM_METHODS vfs_lfs1_stream_methods
+
+#define SUPERBLOCK_MAGIC_OFFSET (40)
+#define SUPERBLOCK_BLOCK_SIZE_OFFSET (28)
+#define SUPERBLOCK_BLOCK_COUNT_OFFSET (32)
+
+static uint8_t lfs_read_buffer[LFS_READ_SIZE];
+static uint8_t lfs_prog_buffer[LFS_PROG_SIZE];
+static uint8_t lfs_lookahead_buffer[LFS_LOOKAHEAD_SIZE / 8];
+
+#else
+
+#define LFSx_MACRO(s) LFS2##s
+#define LFSx_API(x) lfs2_ ## x
+#define VFS_LFSx_CONTEXT_T vfs_lfs2_context_t
+#define VFS_LFSx_MOUNT vfs_lfs2_mount
+#define VFS_LFSx_STREAM_METHODS vfs_lfs2_stream_methods
+
+#define SUPERBLOCK_MAGIC_OFFSET (8)
+#define SUPERBLOCK_BLOCK_SIZE_OFFSET (24)
+#define SUPERBLOCK_BLOCK_COUNT_OFFSET (28)
+
+static uint8_t lfs_read_buffer[LFS_CACHE_SIZE];
+static uint8_t lfs_prog_buffer[LFS_CACHE_SIZE];
+static uint8_t lfs_lookahead_buffer[LFS_LOOKAHEAD_SIZE];
+
+#endif
+
+static int dev_read(const struct LFSx_API (config) * c, LFSx_API(block_t) block, LFSx_API(off_t) off, void *buffer, LFSx_API(size_t) size) {
+    VFS_LFSx_CONTEXT_T *ctx = c->context;
+    if (0 <= block && block < ctx->config.block_count) {
+        do_read(ctx->bdev_base_addr + block * ctx->config.block_size + off, size, buffer);
+        return LFSx_MACRO(_ERR_OK);
+    }
+    return LFSx_MACRO(_ERR_IO);
+}
+
+static int dev_prog(const struct LFSx_API (config) * c, LFSx_API(block_t) block, LFSx_API(off_t) off, const void *buffer, LFSx_API(size_t) size) {
+    return LFSx_MACRO(_ERR_IO);
+}
+
+static int dev_erase(const struct LFSx_API (config) * c, LFSx_API(block_t) block) {
+    return LFSx_MACRO(_ERR_IO);
+}
+
+static int dev_sync(const struct LFSx_API (config) * c) {
+    return LFSx_MACRO(_ERR_OK);
+}
+
+int VFS_LFSx_MOUNT(VFS_LFSx_CONTEXT_T *ctx, uint32_t base_addr, uint32_t byte_len) {
+    // Read start of superblock.
+    uint8_t buf[48];
+    do_read(base_addr, sizeof(buf), buf);
+
+    // Verify littlefs and detect block size.
+    if (memcmp(&buf[SUPERBLOCK_MAGIC_OFFSET], "littlefs", 8) != 0) {
+        return -1;
+    }
+    uint32_t block_size = get_le32(&buf[SUPERBLOCK_BLOCK_SIZE_OFFSET]);
+    uint32_t block_count = get_le32(&buf[SUPERBLOCK_BLOCK_COUNT_OFFSET]);
+
+    // Verify size of volume.
+    if (block_size * block_count != byte_len) {
+        return -1;
+    }
+
+    ctx->bdev_base_addr = base_addr;
+
+    struct LFSx_API (config) *config = &ctx->config;
+    memset(config, 0, sizeof(*config));
+
+    config->context = ctx;
+
+    config->read = dev_read;
+    config->prog = dev_prog;
+    config->erase = dev_erase;
+    config->sync = dev_sync;
+
+    config->read_size = LFS_READ_SIZE;
+    config->prog_size = LFS_PROG_SIZE;
+    config->block_size = block_size;
+    config->block_count = byte_len / block_size;
+
+    #if MBOOT_VFS_LFS1
+    config->lookahead = LFS_LOOKAHEAD_SIZE;
+    config->read_buffer = lfs_read_buffer;
+    config->prog_buffer = lfs_prog_buffer;
+    config->lookahead_buffer = lfs_lookahead_buffer;
+    #else
+    config->block_cycles = 100;
+    config->cache_size = LFS_CACHE_SIZE;
+    config->lookahead_size = LFS_LOOKAHEAD_SIZE;
+    config->read_buffer = lfs_read_buffer;
+    config->prog_buffer = lfs_prog_buffer;
+    config->lookahead_buffer = lfs_lookahead_buffer;
+    #endif
+
+    int ret = LFSx_API(mount)(&ctx->lfs, &ctx->config);
+    if (ret < 0) {
+        return -1;
+    }
+    return 0;
+}
+
+static int vfs_lfs_stream_open(void *stream_in, const char *fname) {
+    VFS_LFSx_CONTEXT_T *ctx = stream_in;
+    memset(&ctx->file, 0, sizeof(ctx->file));
+    memset(&ctx->filecfg, 0, sizeof(ctx->filecfg));
+    ctx->filecfg.buffer = &ctx->filebuf[0];
+    LFSx_API(file_opencfg)(&ctx->lfs, &ctx->file, fname, LFSx_MACRO(_O_RDONLY), &ctx->filecfg);
+    return 0;
+}
+
+static void vfs_lfs_stream_close(void *stream_in) {
+    VFS_LFSx_CONTEXT_T *ctx = stream_in;
+    LFSx_API(file_close)(&ctx->lfs, &ctx->file);
+}
+
+static int vfs_lfs_stream_read(void *stream_in, uint8_t *buf, size_t len) {
+    VFS_LFSx_CONTEXT_T *ctx = stream_in;
+    LFSx_API(ssize_t) sz = LFSx_API(file_read)(&ctx->lfs, &ctx->file, buf, len);
+    if (sz < 0) {
+        return -1;
+    }
+    return sz;
+}
+
+const stream_methods_t VFS_LFSx_STREAM_METHODS = {
+    vfs_lfs_stream_open,
+    vfs_lfs_stream_close,
+    vfs_lfs_stream_read,
+};
+
+#endif // MBOOT_FSLOAD && (MBOOT_VFS_LFS1 || MBOOT_VFS_LFS2)

From 0a8ce0d56899b02a18ee4260446d31e732fe71e8 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 26 Jun 2020 21:26:06 +1000
Subject: [PATCH 0120/3533] stm32/mboot: Update README to describe WB and
 littlefs support.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/mboot/README.md | 29 +++++++++++++++++++++++------
 1 file changed, 23 insertions(+), 6 deletions(-)

diff --git a/ports/stm32/mboot/README.md b/ports/stm32/mboot/README.md
index 52bbf55675414..d8aa6d456f19e 100644
--- a/ports/stm32/mboot/README.md
+++ b/ports/stm32/mboot/README.md
@@ -2,11 +2,11 @@ Mboot - MicroPython boot loader
 ===============================
 
 Mboot is a custom bootloader for STM32 MCUs, and currently supports the
-STM32F4xx and STM32F7xx families.  It can provide a standard USB DFU interface
-on either the FS or HS peripherals, as well as a sophisticated, custom I2C
+STM32F4xx, STM32F7xx and STM32WBxx families.  It can provide a standard USB DFU
+interface on either the FS or HS peripherals, as well as a sophisticated, custom I2C
 interface.  It can also load and program firmware in .dfu.gz format from a
-filesystem.  It can fit in 16k of flash space, but all features enabled requires
-32k.
+filesystem, either FAT, littlefs 1 or littlfs 2.
+It can fit in 16k of flash space, but all features enabled requires 32k.
 
 How to use
 ----------
@@ -63,6 +63,15 @@ How to use
 
     #define MBOOT_FSLOAD (1)
 
+   and then enable one or more of the following depending on what filesystem
+   support is required in Mboot (note that the FAT driver is read-only and
+   quite compact, but littlefs supports both read and write so is rather
+   large):
+
+    #define MBOOT_VFS_FAT (1)
+    #define MBOOT_VFS_LFS1 (1)
+    #define MBOOT_VFS_LFS2 (1)
+
 2. Build the board's main application firmware as usual.
 
 3. Build mboot via:
@@ -133,10 +142,18 @@ are located and what filename to program.  The elements to use are:
 `u32` means unsigned 32-bit little-endian integer.
 
 The firmware to load must be a gzip'd DfuSe file (.dfu.gz) and stored within a
-FAT formatted partition.
+FAT or littlefs formatted partition.
 
 The provided fwupdate.py script contains helper functions to call into Mboot
-with the correct data, and also to update Mboot itself.
+with the correct data, and also to update Mboot itself.  For example on PYBD
+the following will update the main MicroPython firmware from the file
+firmware.dfu.gz stored on the default FAT filesystem:
+
+    import fwupdate
+    fwupdate.update_mpy('firmware.dfu.gz', 0x80000000, 2 * 1024 * 1024)
+
+The 0x80000000 value is the address understood by Mboot as the location of
+the external SPI flash, configured via `MBOOT_SPIFLASH_ADDR`.
 
 Example: Mboot on PYBv1.x
 -------------------------

From 6475cdb7d06cc1a7bf273e66d0bbfc9aef890622 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 26 Jun 2020 21:29:32 +1000
Subject: [PATCH 0121/3533] travis: Build mboot for PYBV10 with LFS2 enabled in
 stm32 job.

Signed-off-by: Damien George <damien@micropython.org>
---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index b7aac0bd0d0fc..f6fe3e1e4e39f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -78,6 +78,7 @@ jobs:
         - make ${MAKEOPTS} -C ports/stm32 BOARD=NUCLEO_L073RZ
         - make ${MAKEOPTS} -C ports/stm32 BOARD=STM32L476DISC
         - make ${MAKEOPTS} -C ports/stm32 BOARD=NUCLEO_WB55
+        - make ${MAKEOPTS} -C ports/stm32/mboot BOARD=PYBV10 CFLAGS_EXTRA='-DMBOOT_FSLOAD=1 -DMBOOT_VFS_LFS2=1'
         - make ${MAKEOPTS} -C ports/stm32/mboot BOARD=PYBD_SF6
         - make ${MAKEOPTS} -C ports/stm32/mboot BOARD=NUCLEO_WB55
 

From 137df817575e06b7bd765fb230a99d108f1d4f61 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 26 Jun 2020 23:56:45 +1000
Subject: [PATCH 0122/3533] stm32/i2cslave: Pass I2C instance to callbacks to
 support multi I2Cs.

By passing through the I2C instance to the application callbacks, the
application can implement multiple I2C slave devices on different
peripherals (eg I2C1 and I2C2).

This commit also adds a proper rw argument to i2c_slave_process_addr_match
for F7/H7/WB MCUs, and enables the i2c_slave_process_tx_end callback.
Mboot is also updated for these changes.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/i2cslave.c   | 18 +++++++++---------
 ports/stm32/i2cslave.h   |  9 +++++----
 ports/stm32/mboot/main.c | 11 +++++++----
 3 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/ports/stm32/i2cslave.c b/ports/stm32/i2cslave.c
index 149e105ee8207..a575c53085168 100644
--- a/ports/stm32/i2cslave.c
+++ b/ports/stm32/i2cslave.c
@@ -42,20 +42,20 @@ void i2c_slave_ev_irq_handler(i2c_slave_t *i2c) {
         // Read of SR1, SR2 needed to clear ADDR bit
         sr1 = i2c->SR1;
         uint32_t sr2 = i2c->SR2;
-        i2c_slave_process_addr_match((sr2 >> I2C_SR2_TRA_Pos) & 1);
+        i2c_slave_process_addr_match(i2c, (sr2 >> I2C_SR2_TRA_Pos) & 1);
     }
     if (sr1 & I2C_SR1_TXE) {
-        i2c->DR = i2c_slave_process_tx_byte();
+        i2c->DR = i2c_slave_process_tx_byte(i2c);
     }
     if (sr1 & I2C_SR1_RXNE) {
-        i2c_slave_process_rx_byte(i2c->DR);
+        i2c_slave_process_rx_byte(i2c, i2c->DR);
     }
     if (sr1 & I2C_SR1_STOPF) {
         // STOPF only set at end of RX mode (in TX mode AF is set on NACK)
         // Read of SR1, write CR1 needed to clear STOPF bit
         sr1 = i2c->SR1;
         i2c->CR1 &= ~I2C_CR1_ACK;
-        i2c_slave_process_rx_end();
+        i2c_slave_process_rx_end(i2c);
         i2c->CR1 |= I2C_CR1_ACK;
     }
 }
@@ -77,22 +77,22 @@ void i2c_slave_ev_irq_handler(i2c_slave_t *i2c) {
         // Set TXE so that TXDR is flushed and ready for the first byte
         i2c->ISR = I2C_ISR_TXE;
         i2c->ICR = I2C_ICR_ADDRCF;
-        i2c_slave_process_addr_match(0);
+        i2c_slave_process_addr_match(i2c, (i2c->ISR >> I2C_ISR_DIR_Pos) & 1);
     }
     if (isr & I2C_ISR_TXIS) {
-        i2c->TXDR = i2c_slave_process_tx_byte();
+        i2c->TXDR = i2c_slave_process_tx_byte(i2c);
     }
     if (isr & I2C_ISR_RXNE) {
-        i2c_slave_process_rx_byte(i2c->RXDR);
+        i2c_slave_process_rx_byte(i2c, i2c->RXDR);
     }
     if (isr & I2C_ISR_STOPF) {
         // STOPF only set for STOP condition, not a repeated START
         i2c->ICR = I2C_ICR_STOPCF;
         i2c->OAR1 &= ~I2C_OAR1_OA1EN;
         if (i2c->ISR & I2C_ISR_DIR) {
-            // i2c_slave_process_tx_end();
+            i2c_slave_process_tx_end(i2c);
         } else {
-            i2c_slave_process_rx_end();
+            i2c_slave_process_rx_end(i2c);
         }
         i2c->OAR1 |= I2C_OAR1_OA1EN;
     }
diff --git a/ports/stm32/i2cslave.h b/ports/stm32/i2cslave.h
index f335c9291226c..4a51bf378e924 100644
--- a/ports/stm32/i2cslave.h
+++ b/ports/stm32/i2cslave.h
@@ -67,9 +67,10 @@ static inline void i2c_slave_shutdown(i2c_slave_t *i2c, int irqn) {
 void i2c_slave_ev_irq_handler(i2c_slave_t *i2c);
 
 // These should be provided externally
-int i2c_slave_process_addr_match(int rw);
-int i2c_slave_process_rx_byte(uint8_t val);
-void i2c_slave_process_rx_end(void);
-uint8_t i2c_slave_process_tx_byte(void);
+int i2c_slave_process_addr_match(i2c_slave_t *i2c, int rw);
+int i2c_slave_process_rx_byte(i2c_slave_t *i2c, uint8_t val);
+void i2c_slave_process_rx_end(i2c_slave_t *i2c);
+uint8_t i2c_slave_process_tx_byte(i2c_slave_t *i2c);
+void i2c_slave_process_tx_end(i2c_slave_t *i2c);
 
 #endif // MICROPY_INCLUDED_STM32_I2CSLAVE_H
diff --git a/ports/stm32/mboot/main.c b/ports/stm32/mboot/main.c
index b3e63ccc26626..87618e7f410ad 100644
--- a/ports/stm32/mboot/main.c
+++ b/ports/stm32/mboot/main.c
@@ -664,7 +664,7 @@ void i2c_init(int addr) {
     i2c_slave_init(MBOOT_I2Cx, I2Cx_EV_IRQn, IRQ_PRI_I2C, addr);
 }
 
-int i2c_slave_process_addr_match(int rw) {
+int i2c_slave_process_addr_match(i2c_slave_t *i2c, int rw) {
     if (i2c_obj.cmd_arg_sent) {
         i2c_obj.cmd_send_arg = false;
     }
@@ -672,14 +672,14 @@ int i2c_slave_process_addr_match(int rw) {
     return 0; // ACK
 }
 
-int i2c_slave_process_rx_byte(uint8_t val) {
+int i2c_slave_process_rx_byte(i2c_slave_t *i2c, uint8_t val) {
     if (i2c_obj.cmd_buf_pos < sizeof(i2c_obj.cmd_buf)) {
         i2c_obj.cmd_buf[i2c_obj.cmd_buf_pos++] = val;
     }
     return 0; // ACK
 }
 
-void i2c_slave_process_rx_end(void) {
+void i2c_slave_process_rx_end(i2c_slave_t *i2c) {
     if (i2c_obj.cmd_buf_pos == 0) {
         return;
     }
@@ -764,7 +764,7 @@ void i2c_slave_process_rx_end(void) {
     i2c_obj.cmd_arg_sent = false;
 }
 
-uint8_t i2c_slave_process_tx_byte(void) {
+uint8_t i2c_slave_process_tx_byte(i2c_slave_t *i2c) {
     if (i2c_obj.cmd_send_arg) {
         i2c_obj.cmd_arg_sent = true;
         return i2c_obj.cmd_arg;
@@ -775,6 +775,9 @@ uint8_t i2c_slave_process_tx_byte(void) {
     }
 }
 
+void i2c_slave_process_tx_end(i2c_slave_t *i2c) {
+}
+
 #endif // defined(MBOOT_I2C_SCL)
 
 /******************************************************************************/

From aa26fe62d8728c95d447475ced9b4a03380025ea Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 25 Jun 2020 13:09:07 +1000
Subject: [PATCH 0123/3533] py/asm: Add funcs/macros to emit machine code for
 logical-shift-right.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/asmarm.c    | 5 +++++
 py/asmarm.h    | 2 ++
 py/asmthumb.h  | 1 +
 py/asmx64.c    | 5 +++++
 py/asmx64.h    | 2 ++
 py/asmx86.c    | 5 +++++
 py/asmx86.h    | 2 ++
 py/asmxtensa.h | 9 +++++++++
 8 files changed, 31 insertions(+)

diff --git a/py/asmarm.c b/py/asmarm.c
index 72b37f73a02f5..e91421578b274 100644
--- a/py/asmarm.c
+++ b/py/asmarm.c
@@ -303,6 +303,11 @@ void asm_arm_lsl_reg_reg(asm_arm_t *as, uint rd, uint rs) {
     emit_al(as, 0x1a00010 | (rd << 12) | (rs << 8) | rd);
 }
 
+void asm_arm_lsr_reg_reg(asm_arm_t *as, uint rd, uint rs) {
+    // mov rd, rd, lsr rs
+    emit_al(as, 0x1a00030 | (rd << 12) | (rs << 8) | rd);
+}
+
 void asm_arm_asr_reg_reg(asm_arm_t *as, uint rd, uint rs) {
     // mov rd, rd, asr rs
     emit_al(as, 0x1a00050 | (rd << 12) | (rs << 8) | rd);
diff --git a/py/asmarm.h b/py/asmarm.h
index 825fd884005ff..46da661faa9ba 100644
--- a/py/asmarm.h
+++ b/py/asmarm.h
@@ -101,6 +101,7 @@ void asm_arm_orr_reg_reg_reg(asm_arm_t *as, uint rd, uint rn, uint rm);
 void asm_arm_mov_reg_local_addr(asm_arm_t *as, uint rd, int local_num);
 void asm_arm_mov_reg_pcrel(asm_arm_t *as, uint reg_dest, uint label);
 void asm_arm_lsl_reg_reg(asm_arm_t *as, uint rd, uint rs);
+void asm_arm_lsr_reg_reg(asm_arm_t *as, uint rd, uint rs);
 void asm_arm_asr_reg_reg(asm_arm_t *as, uint rd, uint rs);
 
 // memory
@@ -187,6 +188,7 @@ void asm_arm_bx_reg(asm_arm_t *as, uint reg_src);
 #define ASM_MOV_REG_PCREL(as, reg_dest, label) asm_arm_mov_reg_pcrel((as), (reg_dest), (label))
 
 #define ASM_LSL_REG_REG(as, reg_dest, reg_shift) asm_arm_lsl_reg_reg((as), (reg_dest), (reg_shift))
+#define ASM_LSR_REG_REG(as, reg_dest, reg_shift) asm_arm_lsr_reg_reg((as), (reg_dest), (reg_shift))
 #define ASM_ASR_REG_REG(as, reg_dest, reg_shift) asm_arm_asr_reg_reg((as), (reg_dest), (reg_shift))
 #define ASM_OR_REG_REG(as, reg_dest, reg_src) asm_arm_orr_reg_reg_reg((as), (reg_dest), (reg_dest), (reg_src))
 #define ASM_XOR_REG_REG(as, reg_dest, reg_src) asm_arm_eor_reg_reg_reg((as), (reg_dest), (reg_dest), (reg_src))
diff --git a/py/asmthumb.h b/py/asmthumb.h
index 6d0ee4b76e50e..9e6f242ccaeb3 100644
--- a/py/asmthumb.h
+++ b/py/asmthumb.h
@@ -345,6 +345,7 @@ void asm_thumb_bl_ind(asm_thumb_t *as, uint fun_id, uint reg_temp); // convenien
 #define ASM_MOV_REG_PCREL(as, rlo_dest, label) asm_thumb_mov_reg_pcrel((as), (rlo_dest), (label))
 
 #define ASM_LSL_REG_REG(as, reg_dest, reg_shift) asm_thumb_format_4((as), ASM_THUMB_FORMAT_4_LSL, (reg_dest), (reg_shift))
+#define ASM_LSR_REG_REG(as, reg_dest, reg_shift) asm_thumb_format_4((as), ASM_THUMB_FORMAT_4_LSR, (reg_dest), (reg_shift))
 #define ASM_ASR_REG_REG(as, reg_dest, reg_shift) asm_thumb_format_4((as), ASM_THUMB_FORMAT_4_ASR, (reg_dest), (reg_shift))
 #define ASM_OR_REG_REG(as, reg_dest, reg_src) asm_thumb_format_4((as), ASM_THUMB_FORMAT_4_ORR, (reg_dest), (reg_src))
 #define ASM_XOR_REG_REG(as, reg_dest, reg_src) asm_thumb_format_4((as), ASM_THUMB_FORMAT_4_EOR, (reg_dest), (reg_src))
diff --git a/py/asmx64.c b/py/asmx64.c
index 723671d5a3558..fd64eaf98b1c1 100644
--- a/py/asmx64.c
+++ b/py/asmx64.c
@@ -67,6 +67,7 @@
 // #define OPCODE_SHR_RM32_BY_I8    (0xc1) /* /5 */
 // #define OPCODE_SAR_RM32_BY_I8    (0xc1) /* /7 */
 #define OPCODE_SHL_RM64_CL       (0xd3) /* /4 */
+#define OPCODE_SHR_RM64_CL       (0xd3) /* /5 */
 #define OPCODE_SAR_RM64_CL       (0xd3) /* /7 */
 // #define OPCODE_CMP_I32_WITH_RM32 (0x81) /* /7 */
 // #define OPCODE_CMP_I8_WITH_RM32  (0x83) /* /7 */
@@ -382,6 +383,10 @@ void asm_x64_shl_r64_cl(asm_x64_t *as, int dest_r64) {
     asm_x64_generic_r64_r64(as, dest_r64, 4, OPCODE_SHL_RM64_CL);
 }
 
+void asm_x64_shr_r64_cl(asm_x64_t *as, int dest_r64) {
+    asm_x64_generic_r64_r64(as, dest_r64, 5, OPCODE_SHR_RM64_CL);
+}
+
 void asm_x64_sar_r64_cl(asm_x64_t *as, int dest_r64) {
     asm_x64_generic_r64_r64(as, dest_r64, 7, OPCODE_SAR_RM64_CL);
 }
diff --git a/py/asmx64.h b/py/asmx64.h
index 28b1bd255fd21..e73e3c5c57b87 100644
--- a/py/asmx64.h
+++ b/py/asmx64.h
@@ -98,6 +98,7 @@ void asm_x64_and_r64_r64(asm_x64_t *as, int dest_r64, int src_r64);
 void asm_x64_or_r64_r64(asm_x64_t *as, int dest_r64, int src_r64);
 void asm_x64_xor_r64_r64(asm_x64_t *as, int dest_r64, int src_r64);
 void asm_x64_shl_r64_cl(asm_x64_t *as, int dest_r64);
+void asm_x64_shr_r64_cl(asm_x64_t *as, int dest_r64);
 void asm_x64_sar_r64_cl(asm_x64_t *as, int dest_r64);
 void asm_x64_add_r64_r64(asm_x64_t *as, int dest_r64, int src_r64);
 void asm_x64_sub_r64_r64(asm_x64_t *as, int dest_r64, int src_r64);
@@ -190,6 +191,7 @@ void asm_x64_call_ind(asm_x64_t *as, size_t fun_id, int temp_r32);
 #define ASM_MOV_REG_PCREL(as, reg_dest, label) asm_x64_mov_reg_pcrel((as), (reg_dest), (label))
 
 #define ASM_LSL_REG(as, reg) asm_x64_shl_r64_cl((as), (reg))
+#define ASM_LSR_REG(as, reg) asm_x64_shr_r64_cl((as), (reg))
 #define ASM_ASR_REG(as, reg) asm_x64_sar_r64_cl((as), (reg))
 #define ASM_OR_REG_REG(as, reg_dest, reg_src) asm_x64_or_r64_r64((as), (reg_dest), (reg_src))
 #define ASM_XOR_REG_REG(as, reg_dest, reg_src) asm_x64_xor_r64_r64((as), (reg_dest), (reg_src))
diff --git a/py/asmx86.c b/py/asmx86.c
index 96de372aec0c2..4b0f8047f6eb7 100644
--- a/py/asmx86.c
+++ b/py/asmx86.c
@@ -67,6 +67,7 @@
 // #define OPCODE_SHR_RM32_BY_I8    (0xc1) /* /5 */
 // #define OPCODE_SAR_RM32_BY_I8    (0xc1) /* /7 */
 #define OPCODE_SHL_RM32_CL       (0xd3) /* /4 */
+#define OPCODE_SHR_RM32_CL       (0xd3) /* /5 */
 #define OPCODE_SAR_RM32_CL       (0xd3) /* /7 */
 // #define OPCODE_CMP_I32_WITH_RM32 (0x81) /* /7 */
 // #define OPCODE_CMP_I8_WITH_RM32  (0x83) /* /7 */
@@ -259,6 +260,10 @@ void asm_x86_shl_r32_cl(asm_x86_t *as, int dest_r32) {
     asm_x86_generic_r32_r32(as, dest_r32, 4, OPCODE_SHL_RM32_CL);
 }
 
+void asm_x86_shr_r32_cl(asm_x86_t *as, int dest_r32) {
+    asm_x86_generic_r32_r32(as, dest_r32, 5, OPCODE_SHR_RM32_CL);
+}
+
 void asm_x86_sar_r32_cl(asm_x86_t *as, int dest_r32) {
     asm_x86_generic_r32_r32(as, dest_r32, 7, OPCODE_SAR_RM32_CL);
 }
diff --git a/py/asmx86.h b/py/asmx86.h
index 4855cd7ee4e8a..f28040abf444c 100644
--- a/py/asmx86.h
+++ b/py/asmx86.h
@@ -93,6 +93,7 @@ void asm_x86_and_r32_r32(asm_x86_t *as, int dest_r32, int src_r32);
 void asm_x86_or_r32_r32(asm_x86_t *as, int dest_r32, int src_r32);
 void asm_x86_xor_r32_r32(asm_x86_t *as, int dest_r32, int src_r32);
 void asm_x86_shl_r32_cl(asm_x86_t *as, int dest_r32);
+void asm_x86_shr_r32_cl(asm_x86_t *as, int dest_r32);
 void asm_x86_sar_r32_cl(asm_x86_t *as, int dest_r32);
 void asm_x86_add_r32_r32(asm_x86_t *as, int dest_r32, int src_r32);
 void asm_x86_sub_r32_r32(asm_x86_t *as, int dest_r32, int src_r32);
@@ -185,6 +186,7 @@ void asm_x86_call_ind(asm_x86_t *as, size_t fun_id, mp_uint_t n_args, int temp_r
 #define ASM_MOV_REG_PCREL(as, reg_dest, label) asm_x86_mov_reg_pcrel((as), (reg_dest), (label))
 
 #define ASM_LSL_REG(as, reg) asm_x86_shl_r32_cl((as), (reg))
+#define ASM_LSR_REG(as, reg) asm_x86_shr_r32_cl((as), (reg))
 #define ASM_ASR_REG(as, reg) asm_x86_sar_r32_cl((as), (reg))
 #define ASM_OR_REG_REG(as, reg_dest, reg_src) asm_x86_or_r32_r32((as), (reg_dest), (reg_src))
 #define ASM_XOR_REG_REG(as, reg_dest, reg_src) asm_x86_xor_r32_r32((as), (reg_dest), (reg_src))
diff --git a/py/asmxtensa.h b/py/asmxtensa.h
index 5eb40daf7887c..43f1b608edd1c 100644
--- a/py/asmxtensa.h
+++ b/py/asmxtensa.h
@@ -243,6 +243,10 @@ static inline void asm_xtensa_op_sll(asm_xtensa_t *as, uint reg_dest, uint reg_s
     asm_xtensa_op24(as, ASM_XTENSA_ENCODE_RRR(0, 1, 10, reg_dest, reg_src, 0));
 }
 
+static inline void asm_xtensa_op_srl(asm_xtensa_t *as, uint reg_dest, uint reg_src) {
+    asm_xtensa_op24(as, ASM_XTENSA_ENCODE_RRR(0, 1, 9, reg_dest, 0, reg_src));
+}
+
 static inline void asm_xtensa_op_sra(asm_xtensa_t *as, uint reg_dest, uint reg_src) {
     asm_xtensa_op24(as, ASM_XTENSA_ENCODE_RRR(0, 1, 11, reg_dest, 0, reg_src));
 }
@@ -372,6 +376,11 @@ void asm_xtensa_call_ind_win(asm_xtensa_t *as, uint idx);
         asm_xtensa_op_ssl((as), (reg_shift)); \
         asm_xtensa_op_sll((as), (reg_dest), (reg_dest)); \
     } while (0)
+#define ASM_LSR_REG_REG(as, reg_dest, reg_shift) \
+    do { \
+        asm_xtensa_op_ssr((as), (reg_shift)); \
+        asm_xtensa_op_srl((as), (reg_dest), (reg_dest)); \
+    } while (0)
 #define ASM_ASR_REG_REG(as, reg_dest, reg_shift) \
     do { \
         asm_xtensa_op_ssr((as), (reg_shift)); \

From b3b8706d27cffbfc4cdd447b204ae7083283d13c Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 26 Jun 2020 18:26:01 +1000
Subject: [PATCH 0124/3533] py/asm: Add condition codes for signed comparisons.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/asmthumb.h | 7 +++++++
 py/asmx64.h   | 3 +++
 py/asmx86.h   | 3 +++
 3 files changed, 13 insertions(+)

diff --git a/py/asmthumb.h b/py/asmthumb.h
index 9e6f242ccaeb3..17b694a74dfdd 100644
--- a/py/asmthumb.h
+++ b/py/asmthumb.h
@@ -80,12 +80,19 @@ void asm_thumb_exit(asm_thumb_t *as);
 
 #define ASM_THUMB_OP_IT (0xbf00)
 #define ASM_THUMB_OP_ITE_EQ (0xbf0c)
+#define ASM_THUMB_OP_ITE_NE (0xbf14)
 #define ASM_THUMB_OP_ITE_CS (0xbf2c)
+#define ASM_THUMB_OP_ITE_CC (0xbf34)
 #define ASM_THUMB_OP_ITE_MI (0xbf4c)
+#define ASM_THUMB_OP_ITE_PL (0xbf54)
 #define ASM_THUMB_OP_ITE_VS (0xbf6c)
+#define ASM_THUMB_OP_ITE_VC (0xbf74)
 #define ASM_THUMB_OP_ITE_HI (0xbf8c)
+#define ASM_THUMB_OP_ITE_LS (0xbf94)
 #define ASM_THUMB_OP_ITE_GE (0xbfac)
+#define ASM_THUMB_OP_ITE_LT (0xbfb4)
 #define ASM_THUMB_OP_ITE_GT (0xbfcc)
+#define ASM_THUMB_OP_ITE_LE (0xbfd4)
 
 #define ASM_THUMB_OP_NOP        (0xbf00)
 #define ASM_THUMB_OP_WFI        (0xbf30)
diff --git a/py/asmx64.h b/py/asmx64.h
index e73e3c5c57b87..1a4987f5cbbaf 100644
--- a/py/asmx64.h
+++ b/py/asmx64.h
@@ -61,10 +61,13 @@
 
 // condition codes, used for jcc and setcc (despite their j-name!)
 #define ASM_X64_CC_JB  (0x2) // below, unsigned
+#define ASM_X64_CC_JAE (0x3) // above or equal, unsigned
 #define ASM_X64_CC_JZ  (0x4)
 #define ASM_X64_CC_JE  (0x4)
 #define ASM_X64_CC_JNZ (0x5)
 #define ASM_X64_CC_JNE (0x5)
+#define ASM_X64_CC_JBE (0x6) // below or equal, unsigned
+#define ASM_X64_CC_JA  (0x7) // above, unsigned
 #define ASM_X64_CC_JL  (0xc) // less, signed
 #define ASM_X64_CC_JGE (0xd) // greater or equal, signed
 #define ASM_X64_CC_JLE (0xe) // less or equal, signed
diff --git a/py/asmx86.h b/py/asmx86.h
index f28040abf444c..8f1b06d220e83 100644
--- a/py/asmx86.h
+++ b/py/asmx86.h
@@ -63,10 +63,13 @@
 
 // condition codes, used for jcc and setcc (despite their j-name!)
 #define ASM_X86_CC_JB  (0x2) // below, unsigned
+#define ASM_X86_CC_JAE (0x3) // above or equal, unsigned
 #define ASM_X86_CC_JZ  (0x4)
 #define ASM_X86_CC_JE  (0x4)
 #define ASM_X86_CC_JNZ (0x5)
 #define ASM_X86_CC_JNE (0x5)
+#define ASM_X86_CC_JBE (0x6) // below or equal, unsigned
+#define ASM_X86_CC_JA  (0x7) // above, unsigned
 #define ASM_X86_CC_JL  (0xc) // less, signed
 #define ASM_X86_CC_JGE (0xd) // greater or equal, signed
 #define ASM_X86_CC_JLE (0xe) // less or equal, signed

From 41fa8b5482089bdd7fa5478fe24f32913b23967c Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 26 Jun 2020 18:26:39 +1000
Subject: [PATCH 0125/3533] py/emitnative: Implement binary operations for
 viper uint operands.

uint types in viper mode can now be used for all binary operators except
floor-divide and modulo.

Fixes issue #1847 and issue #6177.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/emitnative.c                               | 113 +++++++++++++-----
 tests/micropython/viper_binop_arith_uint.py   |  32 +++++
 .../micropython/viper_binop_arith_uint.py.exp |  10 ++
 tests/micropython/viper_binop_bitwise_uint.py |  58 +++++++++
 .../viper_binop_bitwise_uint.py.exp           |  22 ++++
 tests/micropython/viper_binop_comp_uint.py    |  31 +++++
 .../micropython/viper_binop_comp_uint.py.exp  |   6 +
 tests/micropython/viper_error.py              |   3 +
 tests/micropython/viper_error.py.exp          |   3 +
 9 files changed, 251 insertions(+), 27 deletions(-)
 create mode 100644 tests/micropython/viper_binop_arith_uint.py
 create mode 100644 tests/micropython/viper_binop_arith_uint.py.exp
 create mode 100644 tests/micropython/viper_binop_bitwise_uint.py
 create mode 100644 tests/micropython/viper_binop_bitwise_uint.py.exp
 create mode 100644 tests/micropython/viper_binop_comp_uint.py
 create mode 100644 tests/micropython/viper_binop_comp_uint.py.exp

diff --git a/py/emitnative.c b/py/emitnative.c
index 6c8e9feebaee9..2a657b6964daa 100644
--- a/py/emitnative.c
+++ b/py/emitnative.c
@@ -2289,7 +2289,8 @@ STATIC void emit_native_binary_op(emit_t *emit, mp_binary_op_t op) {
     DEBUG_printf("binary_op(" UINT_FMT ")\n", op);
     vtype_kind_t vtype_lhs = peek_vtype(emit, 1);
     vtype_kind_t vtype_rhs = peek_vtype(emit, 0);
-    if (vtype_lhs == VTYPE_INT && vtype_rhs == VTYPE_INT) {
+    if ((vtype_lhs == VTYPE_INT || vtype_lhs == VTYPE_UINT)
+        && (vtype_rhs == VTYPE_INT || vtype_rhs == VTYPE_UINT)) {
         // for integers, inplace and normal ops are equivalent, so use just normal ops
         if (MP_BINARY_OP_INPLACE_OR <= op && op <= MP_BINARY_OP_INPLACE_POWER) {
             op += MP_BINARY_OP_OR - MP_BINARY_OP_INPLACE_OR;
@@ -2306,9 +2307,13 @@ STATIC void emit_native_binary_op(emit_t *emit, mp_binary_op_t op) {
             if (op == MP_BINARY_OP_LSHIFT) {
                 ASM_LSL_REG(emit->as, REG_RET);
             } else {
-                ASM_ASR_REG(emit->as, REG_RET);
+                if (vtype_lhs == VTYPE_UINT) {
+                    ASM_LSR_REG(emit->as, REG_RET);
+                } else {
+                    ASM_ASR_REG(emit->as, REG_RET);
+                }
             }
-            emit_post_push_reg(emit, VTYPE_INT, REG_RET);
+            emit_post_push_reg(emit, vtype_lhs, REG_RET);
             return;
         }
         #endif
@@ -2316,6 +2321,10 @@ STATIC void emit_native_binary_op(emit_t *emit, mp_binary_op_t op) {
         // special cases for floor-divide and module because we dispatch to helper functions
         if (op == MP_BINARY_OP_FLOOR_DIVIDE || op == MP_BINARY_OP_MODULO) {
             emit_pre_pop_reg_reg(emit, &vtype_rhs, REG_ARG_2, &vtype_lhs, REG_ARG_1);
+            if (vtype_lhs != VTYPE_INT) {
+                EMIT_NATIVE_VIPER_TYPE_ERROR(emit,
+                    MP_ERROR_TEXT("div/mod not implemented for uint"), mp_binary_op_method_name[op]);
+            }
             if (op == MP_BINARY_OP_FLOOR_DIVIDE) {
                 emit_call(emit, MP_F_SMALL_INT_FLOOR_DIVIDE);
             } else {
@@ -2334,31 +2343,35 @@ STATIC void emit_native_binary_op(emit_t *emit, mp_binary_op_t op) {
             if (op == MP_BINARY_OP_LSHIFT) {
                 ASM_LSL_REG_REG(emit->as, REG_ARG_2, reg_rhs);
             } else {
-                ASM_ASR_REG_REG(emit->as, REG_ARG_2, reg_rhs);
+                if (vtype_lhs == VTYPE_UINT) {
+                    ASM_LSR_REG_REG(emit->as, REG_ARG_2, reg_rhs);
+                } else {
+                    ASM_ASR_REG_REG(emit->as, REG_ARG_2, reg_rhs);
+                }
             }
-            emit_post_push_reg(emit, VTYPE_INT, REG_ARG_2);
+            emit_post_push_reg(emit, vtype_lhs, REG_ARG_2);
             return;
         }
         #endif
 
         if (op == MP_BINARY_OP_OR) {
             ASM_OR_REG_REG(emit->as, REG_ARG_2, reg_rhs);
-            emit_post_push_reg(emit, VTYPE_INT, REG_ARG_2);
+            emit_post_push_reg(emit, vtype_lhs, REG_ARG_2);
         } else if (op == MP_BINARY_OP_XOR) {
             ASM_XOR_REG_REG(emit->as, REG_ARG_2, reg_rhs);
-            emit_post_push_reg(emit, VTYPE_INT, REG_ARG_2);
+            emit_post_push_reg(emit, vtype_lhs, REG_ARG_2);
         } else if (op == MP_BINARY_OP_AND) {
             ASM_AND_REG_REG(emit->as, REG_ARG_2, reg_rhs);
-            emit_post_push_reg(emit, VTYPE_INT, REG_ARG_2);
+            emit_post_push_reg(emit, vtype_lhs, REG_ARG_2);
         } else if (op == MP_BINARY_OP_ADD) {
             ASM_ADD_REG_REG(emit->as, REG_ARG_2, reg_rhs);
-            emit_post_push_reg(emit, VTYPE_INT, REG_ARG_2);
+            emit_post_push_reg(emit, vtype_lhs, REG_ARG_2);
         } else if (op == MP_BINARY_OP_SUBTRACT) {
             ASM_SUB_REG_REG(emit->as, REG_ARG_2, reg_rhs);
-            emit_post_push_reg(emit, VTYPE_INT, REG_ARG_2);
+            emit_post_push_reg(emit, vtype_lhs, REG_ARG_2);
         } else if (op == MP_BINARY_OP_MULTIPLY) {
             ASM_MUL_REG_REG(emit->as, REG_ARG_2, reg_rhs);
-            emit_post_push_reg(emit, VTYPE_INT, REG_ARG_2);
+            emit_post_push_reg(emit, vtype_lhs, REG_ARG_2);
         } else if (MP_BINARY_OP_LESS <= op && op <= MP_BINARY_OP_NOT_EQUAL) {
             // comparison ops are (in enum order):
             //  MP_BINARY_OP_LESS
@@ -2367,11 +2380,26 @@ STATIC void emit_native_binary_op(emit_t *emit, mp_binary_op_t op) {
             //  MP_BINARY_OP_LESS_EQUAL
             //  MP_BINARY_OP_MORE_EQUAL
             //  MP_BINARY_OP_NOT_EQUAL
+
+            if (vtype_lhs != vtype_rhs) {
+                EMIT_NATIVE_VIPER_TYPE_ERROR(emit, MP_ERROR_TEXT("comparison of int and uint"));
+            }
+
+            size_t op_idx = op - MP_BINARY_OP_LESS + (vtype_lhs == VTYPE_UINT ? 0 : 6);
+
             need_reg_single(emit, REG_RET, 0);
             #if N_X64
             asm_x64_xor_r64_r64(emit->as, REG_RET, REG_RET);
             asm_x64_cmp_r64_with_r64(emit->as, reg_rhs, REG_ARG_2);
-            static byte ops[6] = {
+            static byte ops[6 + 6] = {
+                // unsigned
+                ASM_X64_CC_JB,
+                ASM_X64_CC_JA,
+                ASM_X64_CC_JE,
+                ASM_X64_CC_JBE,
+                ASM_X64_CC_JAE,
+                ASM_X64_CC_JNE,
+                // signed
                 ASM_X64_CC_JL,
                 ASM_X64_CC_JG,
                 ASM_X64_CC_JE,
@@ -2379,11 +2407,19 @@ STATIC void emit_native_binary_op(emit_t *emit, mp_binary_op_t op) {
                 ASM_X64_CC_JGE,
                 ASM_X64_CC_JNE,
             };
-            asm_x64_setcc_r8(emit->as, ops[op - MP_BINARY_OP_LESS], REG_RET);
+            asm_x64_setcc_r8(emit->as, ops[op_idx], REG_RET);
             #elif N_X86
             asm_x86_xor_r32_r32(emit->as, REG_RET, REG_RET);
             asm_x86_cmp_r32_with_r32(emit->as, reg_rhs, REG_ARG_2);
-            static byte ops[6] = {
+            static byte ops[6 + 6] = {
+                // unsigned
+                ASM_X86_CC_JB,
+                ASM_X86_CC_JA,
+                ASM_X86_CC_JE,
+                ASM_X86_CC_JBE,
+                ASM_X86_CC_JAE,
+                ASM_X86_CC_JNE,
+                // signed
                 ASM_X86_CC_JL,
                 ASM_X86_CC_JG,
                 ASM_X86_CC_JE,
@@ -2391,24 +2427,39 @@ STATIC void emit_native_binary_op(emit_t *emit, mp_binary_op_t op) {
                 ASM_X86_CC_JGE,
                 ASM_X86_CC_JNE,
             };
-            asm_x86_setcc_r8(emit->as, ops[op - MP_BINARY_OP_LESS], REG_RET);
+            asm_x86_setcc_r8(emit->as, ops[op_idx], REG_RET);
             #elif N_THUMB
             asm_thumb_cmp_rlo_rlo(emit->as, REG_ARG_2, reg_rhs);
-            static uint16_t ops[6] = {
-                ASM_THUMB_OP_ITE_GE,
-                ASM_THUMB_OP_ITE_GT,
+            static uint16_t ops[6 + 6] = {
+                // unsigned
+                ASM_THUMB_OP_ITE_CC,
+                ASM_THUMB_OP_ITE_HI,
                 ASM_THUMB_OP_ITE_EQ,
+                ASM_THUMB_OP_ITE_LS,
+                ASM_THUMB_OP_ITE_CS,
+                ASM_THUMB_OP_ITE_NE,
+                // signed
+                ASM_THUMB_OP_ITE_LT,
                 ASM_THUMB_OP_ITE_GT,
-                ASM_THUMB_OP_ITE_GE,
                 ASM_THUMB_OP_ITE_EQ,
+                ASM_THUMB_OP_ITE_LE,
+                ASM_THUMB_OP_ITE_GE,
+                ASM_THUMB_OP_ITE_NE,
             };
-            static byte ret[6] = { 0, 1, 1, 0, 1, 0, };
-            asm_thumb_op16(emit->as, ops[op - MP_BINARY_OP_LESS]);
-            asm_thumb_mov_rlo_i8(emit->as, REG_RET, ret[op - MP_BINARY_OP_LESS]);
-            asm_thumb_mov_rlo_i8(emit->as, REG_RET, ret[op - MP_BINARY_OP_LESS] ^ 1);
+            asm_thumb_op16(emit->as, ops[op_idx]);
+            asm_thumb_mov_rlo_i8(emit->as, REG_RET, 1);
+            asm_thumb_mov_rlo_i8(emit->as, REG_RET, 0);
             #elif N_ARM
             asm_arm_cmp_reg_reg(emit->as, REG_ARG_2, reg_rhs);
-            static uint ccs[6] = {
+            static uint ccs[6 + 6] = {
+                // unsigned
+                ASM_ARM_CC_CC,
+                ASM_ARM_CC_HI,
+                ASM_ARM_CC_EQ,
+                ASM_ARM_CC_LS,
+                ASM_ARM_CC_CS,
+                ASM_ARM_CC_NE,
+                // signed
                 ASM_ARM_CC_LT,
                 ASM_ARM_CC_GT,
                 ASM_ARM_CC_EQ,
@@ -2416,9 +2467,17 @@ STATIC void emit_native_binary_op(emit_t *emit, mp_binary_op_t op) {
                 ASM_ARM_CC_GE,
                 ASM_ARM_CC_NE,
             };
-            asm_arm_setcc_reg(emit->as, REG_RET, ccs[op - MP_BINARY_OP_LESS]);
+            asm_arm_setcc_reg(emit->as, REG_RET, ccs[op_idx]);
             #elif N_XTENSA || N_XTENSAWIN
-            static uint8_t ccs[6] = {
+            static uint8_t ccs[6 + 6] = {
+                // unsigned
+                ASM_XTENSA_CC_LTU,
+                0x80 | ASM_XTENSA_CC_LTU, // for GTU we'll swap args
+                ASM_XTENSA_CC_EQ,
+                0x80 | ASM_XTENSA_CC_GEU, // for LEU we'll swap args
+                ASM_XTENSA_CC_GEU,
+                ASM_XTENSA_CC_NE,
+                // signed
                 ASM_XTENSA_CC_LT,
                 0x80 | ASM_XTENSA_CC_LT, // for GT we'll swap args
                 ASM_XTENSA_CC_EQ,
@@ -2426,7 +2485,7 @@ STATIC void emit_native_binary_op(emit_t *emit, mp_binary_op_t op) {
                 ASM_XTENSA_CC_GE,
                 ASM_XTENSA_CC_NE,
             };
-            uint8_t cc = ccs[op - MP_BINARY_OP_LESS];
+            uint8_t cc = ccs[op_idx];
             if ((cc & 0x80) == 0) {
                 asm_xtensa_setcc_reg_reg_reg(emit->as, cc, REG_RET, REG_ARG_2, reg_rhs);
             } else {
diff --git a/tests/micropython/viper_binop_arith_uint.py b/tests/micropython/viper_binop_arith_uint.py
new file mode 100644
index 0000000000000..e4270a10a79a9
--- /dev/null
+++ b/tests/micropython/viper_binop_arith_uint.py
@@ -0,0 +1,32 @@
+# test arithmetic operators with uint type
+
+
+@micropython.viper
+def add(x: uint, y: uint):
+    return x + y, y + x
+
+
+print("add")
+print(*add(1, 2))
+print(*(x & 0xFFFFFFFF for x in add(-1, -2)))
+
+
+@micropython.viper
+def sub(x: uint, y: uint):
+    return x - y, y - x
+
+
+print("sub")
+print(*(x & 0xFFFFFFFF for x in sub(1, 2)))
+print(*(x & 0xFFFFFFFF for x in sub(-1, -2)))
+
+
+@micropython.viper
+def mul(x: uint, y: uint):
+    return x * y, y * x
+
+
+print("mul")
+print(*mul(2, 3))
+print(*(x & 0xFFFFFFFF for x in mul(2, -3)))
+print(*mul(-2, -3))
diff --git a/tests/micropython/viper_binop_arith_uint.py.exp b/tests/micropython/viper_binop_arith_uint.py.exp
new file mode 100644
index 0000000000000..72f84b716a4dd
--- /dev/null
+++ b/tests/micropython/viper_binop_arith_uint.py.exp
@@ -0,0 +1,10 @@
+add
+3 3
+4294967293 4294967293
+sub
+4294967295 1
+1 4294967295
+mul
+6 6
+4294967290 4294967290
+6 6
diff --git a/tests/micropython/viper_binop_bitwise_uint.py b/tests/micropython/viper_binop_bitwise_uint.py
new file mode 100644
index 0000000000000..3bc7ba8d1113f
--- /dev/null
+++ b/tests/micropython/viper_binop_bitwise_uint.py
@@ -0,0 +1,58 @@
+# test bitwise operators on uint type
+
+
+@micropython.viper
+def shl(x: uint, y: uint) -> uint:
+    return x << y
+
+
+print("shl")
+print(shl(1, 0))
+print(shl(1, 30))
+print(shl(-1, 10) & 0xFFFFFFFF)
+
+
+@micropython.viper
+def shr(x: uint, y: uint) -> uint:
+    return x >> y
+
+
+print("shr")
+print(shr(1, 0))
+print(shr(16, 3))
+print(shr(-1, 1) in (0x7FFFFFFF, 0x7FFFFFFF_FFFFFFFF))
+
+
+@micropython.viper
+def and_(x: uint, y: uint):
+    return x & y, y & x
+
+
+print("and")
+print(*and_(1, 0))
+print(*and_(1, 3))
+print(*and_(-1, 2))
+print(*(x & 0xFFFFFFFF for x in and_(-1, -2)))
+
+
+@micropython.viper
+def or_(x: uint, y: uint):
+    return x | y, y | x
+
+
+print("or")
+print(*or_(1, 0))
+print(*or_(1, 2))
+print(*(x & 0xFFFFFFFF for x in or_(-1, 2)))
+
+
+@micropython.viper
+def xor(x: uint, y: uint):
+    return x ^ y, y ^ x
+
+
+print("xor")
+print(*xor(1, 0))
+print(*xor(1, 3))
+print(*(x & 0xFFFFFFFF for x in xor(-1, 3)))
+print(*xor(-1, -3))
diff --git a/tests/micropython/viper_binop_bitwise_uint.py.exp b/tests/micropython/viper_binop_bitwise_uint.py.exp
new file mode 100644
index 0000000000000..3ad6469a2fc78
--- /dev/null
+++ b/tests/micropython/viper_binop_bitwise_uint.py.exp
@@ -0,0 +1,22 @@
+shl
+1
+1073741824
+4294966272
+shr
+1
+2
+True
+and
+0 0
+1 1
+2 2
+4294967294 4294967294
+or
+1 1
+3 3
+4294967295 4294967295
+xor
+1 1
+2 2
+4294967292 4294967292
+2 2
diff --git a/tests/micropython/viper_binop_comp_uint.py b/tests/micropython/viper_binop_comp_uint.py
new file mode 100644
index 0000000000000..85aa32c78c733
--- /dev/null
+++ b/tests/micropython/viper_binop_comp_uint.py
@@ -0,0 +1,31 @@
+# test comparison operators with uint type
+
+
+@micropython.viper
+def f(x: uint, y: uint):
+    if x < y:
+        print(" <", end="")
+    if x > y:
+        print(" >", end="")
+    if x == y:
+        print(" ==", end="")
+    if x <= y:
+        print(" <=", end="")
+    if x >= y:
+        print(" >=", end="")
+    if x != y:
+        print(" !=", end="")
+
+
+def test(a, b):
+    print(a, b, end="")
+    f(a, b)
+    print()
+
+
+test(1, 1)
+test(2, 1)
+test(1, 2)
+test(2, -1)
+test(-2, 1)
+test(-2, -1)
diff --git a/tests/micropython/viper_binop_comp_uint.py.exp b/tests/micropython/viper_binop_comp_uint.py.exp
new file mode 100644
index 0000000000000..cacce62b6e380
--- /dev/null
+++ b/tests/micropython/viper_binop_comp_uint.py.exp
@@ -0,0 +1,6 @@
+1 1 == <= >=
+2 1 > >= !=
+1 2 < <= !=
+2 -1 < <= !=
+-2 1 > >= !=
+-2 -1 < <= !=
diff --git a/tests/micropython/viper_error.py b/tests/micropython/viper_error.py
index 790f3d75c4f0e..80617af0c1f29 100644
--- a/tests/micropython/viper_error.py
+++ b/tests/micropython/viper_error.py
@@ -52,6 +52,7 @@ def f():
 
 # can't do binary op between incompatible types
 test("@micropython.viper\ndef f(): 1 + []")
+test("@micropython.viper\ndef f(x:int, y:uint): x < y")
 
 # can't load
 test("@micropython.viper\ndef f(): 1[0]")
@@ -73,6 +74,8 @@ def f():
 test("@micropython.viper\ndef f(x:int): ~x")
 
 # binary op not implemented
+test("@micropython.viper\ndef f(x:uint, y:uint): res = x // y")
+test("@micropython.viper\ndef f(x:uint, y:uint): res = x % y")
 test("@micropython.viper\ndef f(x:int): res = x in x")
 
 # yield (from) not implemented
diff --git a/tests/micropython/viper_error.py.exp b/tests/micropython/viper_error.py.exp
index da9a0ca93ee34..31c85b1d872af 100644
--- a/tests/micropython/viper_error.py.exp
+++ b/tests/micropython/viper_error.py.exp
@@ -6,6 +6,7 @@ ViperTypeError("local 'x' has type 'int' but source is 'object'",)
 ViperTypeError("can't implicitly convert 'ptr' to 'bool'",)
 ViperTypeError("return expected 'int' but got 'object'",)
 ViperTypeError("can't do binary op between 'int' and 'object'",)
+ViperTypeError('comparison of int and uint',)
 ViperTypeError("can't load from 'int'",)
 ViperTypeError("can't load from 'int'",)
 ViperTypeError("can't store to 'int'",)
@@ -17,6 +18,8 @@ ViperTypeError('must raise an object',)
 ViperTypeError('unary op __pos__ not implemented',)
 ViperTypeError('unary op __neg__ not implemented',)
 ViperTypeError('unary op __invert__ not implemented',)
+ViperTypeError('div/mod not implemented for uint',)
+ViperTypeError('div/mod not implemented for uint',)
 ViperTypeError('binary op  not implemented',)
 NotImplementedError('native yield',)
 NotImplementedError('native yield',)

From 9f911d822ee97edaa94873823db5eb10c31f5f77 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 22 Jun 2020 10:21:02 +1000
Subject: [PATCH 0126/3533] py/objcomplex: Add mp_obj_get_complex_maybe for use
 in complex bin-op.

This allows complex binary operations to fail gracefully with unsupported
operation rather than raising an exception, so that special methods work
correctly.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/obj.c                              |  9 ++++++++-
 py/obj.h                              |  1 +
 py/objcomplex.c                       |  5 ++++-
 tests/float/cmath_fun.py              |  6 ++++++
 tests/float/complex_special_mehods.py | 15 +++++++++++++++
 tests/run-tests                       |  1 +
 6 files changed, 35 insertions(+), 2 deletions(-)
 create mode 100644 tests/float/complex_special_mehods.py

diff --git a/py/obj.c b/py/obj.c
index 07b1612552548..ed047acc39f76 100644
--- a/py/obj.c
+++ b/py/obj.c
@@ -371,7 +371,7 @@ mp_float_t mp_obj_get_float(mp_obj_t arg) {
 }
 
 #if MICROPY_PY_BUILTINS_COMPLEX
-void mp_obj_get_complex(mp_obj_t arg, mp_float_t *real, mp_float_t *imag) {
+bool mp_obj_get_complex_maybe(mp_obj_t arg, mp_float_t *real, mp_float_t *imag) {
     if (arg == mp_const_false) {
         *real = 0;
         *imag = 0;
@@ -392,6 +392,13 @@ void mp_obj_get_complex(mp_obj_t arg, mp_float_t *real, mp_float_t *imag) {
     } else if (mp_obj_is_type(arg, &mp_type_complex)) {
         mp_obj_complex_get(arg, real, imag);
     } else {
+        return false;
+    }
+    return true;
+}
+
+void mp_obj_get_complex(mp_obj_t arg, mp_float_t *real, mp_float_t *imag) {
+    if (!mp_obj_get_complex_maybe(arg, real, imag)) {
         #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
         mp_raise_TypeError(MP_ERROR_TEXT("can't convert to complex"));
         #else
diff --git a/py/obj.h b/py/obj.h
index 590b9c4b6a4a1..1fa24eb18c903 100644
--- a/py/obj.h
+++ b/py/obj.h
@@ -778,6 +778,7 @@ bool mp_obj_get_int_maybe(mp_const_obj_t arg, mp_int_t *value);
 mp_float_t mp_obj_get_float(mp_obj_t self_in);
 bool mp_obj_get_float_maybe(mp_obj_t arg, mp_float_t *value);
 void mp_obj_get_complex(mp_obj_t self_in, mp_float_t *real, mp_float_t *imag);
+bool mp_obj_get_complex_maybe(mp_obj_t self_in, mp_float_t *real, mp_float_t *imag);
 #endif
 void mp_obj_get_array(mp_obj_t o, size_t *len, mp_obj_t **items); // *items may point inside a GC block
 void mp_obj_get_array_fixed_n(mp_obj_t o, size_t len, mp_obj_t **items); // *items may point inside a GC block
diff --git a/py/objcomplex.c b/py/objcomplex.c
index 91e4402309d88..f4c4aeffcb91d 100644
--- a/py/objcomplex.c
+++ b/py/objcomplex.c
@@ -178,7 +178,10 @@ void mp_obj_complex_get(mp_obj_t self_in, mp_float_t *real, mp_float_t *imag) {
 
 mp_obj_t mp_obj_complex_binary_op(mp_binary_op_t op, mp_float_t lhs_real, mp_float_t lhs_imag, mp_obj_t rhs_in) {
     mp_float_t rhs_real, rhs_imag;
-    mp_obj_get_complex(rhs_in, &rhs_real, &rhs_imag); // can be any type, this function will convert to float (if possible)
+    if (!mp_obj_get_complex_maybe(rhs_in, &rhs_real, &rhs_imag)) {
+        return MP_OBJ_NULL; // op not supported
+    }
+
     switch (op) {
         case MP_BINARY_OP_ADD:
         case MP_BINARY_OP_INPLACE_ADD:
diff --git a/tests/float/cmath_fun.py b/tests/float/cmath_fun.py
index 7b5e692452765..15b72e7a6203b 100644
--- a/tests/float/cmath_fun.py
+++ b/tests/float/cmath_fun.py
@@ -57,3 +57,9 @@
             if abs(real) < 1e-6:
                 real = 0.0
             print("complex(%.5g, %.5g)" % (real, ret.imag))
+
+# test invalid type passed to cmath function
+try:
+    log([])
+except TypeError:
+    print("TypeError")
diff --git a/tests/float/complex_special_mehods.py b/tests/float/complex_special_mehods.py
new file mode 100644
index 0000000000000..6789013fa6e0d
--- /dev/null
+++ b/tests/float/complex_special_mehods.py
@@ -0,0 +1,15 @@
+# test complex interacting with special methods
+
+
+class A:
+    def __add__(self, x):
+        print("__add__")
+        return 1
+
+    def __radd__(self, x):
+        print("__radd__")
+        return 2
+
+
+print(A() + 1j)
+print(1j + A())
diff --git a/tests/run-tests b/tests/run-tests
index f9e4de4b34a20..102b0f7790e14 100755
--- a/tests/run-tests
+++ b/tests/run-tests
@@ -355,6 +355,7 @@ def run_tests(pyb, tests, args, base_path="."):
     if not has_complex:
         skip_tests.add('float/complex1.py')
         skip_tests.add('float/complex1_intbig.py')
+        skip_tests.add('float/complex_special_mehods.py')
         skip_tests.add('float/int_big_float.py')
         skip_tests.add('float/true_value.py')
         skip_tests.add('float/types.py')

From e4fcd216e02eef0b389c84ecd67be3114aac0a5d Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Fri, 26 Jun 2020 10:20:27 +1000
Subject: [PATCH 0127/3533] stm32/usbd_cdc_interface: Remove full==size-1
 limitation on tx ringbuf.

Before this commit the USB VCP TX ring-buffer used the basic implementation
where it can only be filled to a maximum of buffer size-1.  For a 1024 size
buffer this means the largest packet that can be sent is 1023.  Once a
packet of this size is sent the next byte copied in goes to the final byte
in the buffer, so must be sent as a 1 byte packet before the read pointer
can be wrapped around to the beginning.  So in large streaming transfers,
watching the USB sniffer you basically get alternating 1023 byte packets
then 1 byte packets.

This commit changes the ring-buffer implementation to a scheme that doesn't
have the full-size limitation, and the USB VCP driver can now achieve a
constant stream of full-sized packets.  This scheme introduces a
restriction on the size of the buffer: it must be a power of 2, and the
maximum size is half of the size of the index (in this case the index is
16-bit, so the maximum size would be 32767 bytes rounded to 16384 for a
power-of-2).  But this is not a big limitation because the size of the
ring-buffer prior to this commit was restricted to powers of 2 because it
was using a mask-based method to wrap the indices.

For an explanation of the new scheme see
https://www.snellman.net/blog/archive/2016-12-13-ring-buffers/

The RX buffer could likely do with a similar change, though as it's not
read from in chunks like the TX buffer it doesn't present the same issue,
all that's lost is one byte capacity of the buffer.

USB VCP TX throughput is improved by this change, potentially doubling the
speed in certain cases.
---
 ports/stm32/usbd_cdc_interface.c | 72 ++++++++++++++++++++------------
 ports/stm32/usbd_cdc_interface.h |  4 +-
 2 files changed, 47 insertions(+), 29 deletions(-)

diff --git a/ports/stm32/usbd_cdc_interface.c b/ports/stm32/usbd_cdc_interface.c
index a0e19de9750aa..7a09128527cec 100644
--- a/ports/stm32/usbd_cdc_interface.c
+++ b/ports/stm32/usbd_cdc_interface.c
@@ -171,32 +171,56 @@ int8_t usbd_cdc_control(usbd_cdc_state_t *cdc_in, uint8_t cmd, uint8_t *pbuf, ui
     return USBD_OK;
 }
 
+static inline uint16_t usbd_cdc_tx_buffer_mask(uint16_t val) {
+    return val & (USBD_CDC_TX_DATA_SIZE - 1);
+}
+
+static inline uint16_t usbd_cdc_tx_buffer_size(usbd_cdc_itf_t *cdc) {
+    return cdc->tx_buf_ptr_in - cdc->tx_buf_ptr_out;
+}
+
+static inline bool usbd_cdc_tx_buffer_empty(usbd_cdc_itf_t *cdc) {
+    return cdc->tx_buf_ptr_out == cdc->tx_buf_ptr_in;
+}
+
+static inline bool usbd_cdc_tx_buffer_will_be_empty(usbd_cdc_itf_t *cdc) {
+    return cdc->tx_buf_ptr_out_next == cdc->tx_buf_ptr_in;
+}
+
+static inline bool usbd_cdc_tx_buffer_full(usbd_cdc_itf_t *cdc) {
+    return usbd_cdc_tx_buffer_size(cdc) == USBD_CDC_TX_DATA_SIZE;
+}
+
+static uint16_t usbd_cdc_tx_send_length(usbd_cdc_itf_t *cdc) {
+    uint16_t to_end = USBD_CDC_TX_DATA_SIZE - usbd_cdc_tx_buffer_mask(cdc->tx_buf_ptr_out);
+    return MIN(usbd_cdc_tx_buffer_size(cdc), to_end);
+}
+
+static void usbd_cdc_tx_buffer_put(usbd_cdc_itf_t *cdc, uint8_t data) {
+    cdc->tx_buf[usbd_cdc_tx_buffer_mask(cdc->tx_buf_ptr_in)] = data;
+    cdc->tx_buf_ptr_in++;
+}
+
+static uint8_t *usbd_cdc_tx_buffer_getp(usbd_cdc_itf_t *cdc, uint16_t len) {
+    cdc->tx_buf_ptr_out_next += len;
+    return &cdc->tx_buf[usbd_cdc_tx_buffer_mask(cdc->tx_buf_ptr_out)];
+}
+
 // Called when the USB IN endpoint is ready to receive more data
 // (cdc.base.tx_in_progress must be 0)
 void usbd_cdc_tx_ready(usbd_cdc_state_t *cdc_in) {
 
     usbd_cdc_itf_t *cdc = (usbd_cdc_itf_t *)cdc_in;
-    cdc->tx_buf_ptr_out = cdc->tx_buf_ptr_out_shadow;
+    cdc->tx_buf_ptr_out = cdc->tx_buf_ptr_out_next;
 
-    if (cdc->tx_buf_ptr_out == cdc->tx_buf_ptr_in && !cdc->tx_need_empty_packet) {
+    if (usbd_cdc_tx_buffer_empty(cdc) && !cdc->tx_need_empty_packet) {
         // No outstanding data to send
         return;
     }
-
-    uint32_t len;
-    if (cdc->tx_buf_ptr_out > cdc->tx_buf_ptr_in) { // rollback
-        len = USBD_CDC_TX_DATA_SIZE - cdc->tx_buf_ptr_out;
-    } else {
-        len = cdc->tx_buf_ptr_in - cdc->tx_buf_ptr_out;
-    }
-
+    uint16_t len = usbd_cdc_tx_send_length(cdc);
     // Should always succeed because cdc.base.tx_in_progress==0
-    USBD_CDC_TransmitPacket(&cdc->base, len, &cdc->tx_buf[cdc->tx_buf_ptr_out]);
+    USBD_CDC_TransmitPacket(&cdc->base, len, usbd_cdc_tx_buffer_getp(cdc, len));
 
-    cdc->tx_buf_ptr_out_shadow += len;
-    if (cdc->tx_buf_ptr_out_shadow == USBD_CDC_TX_DATA_SIZE) {
-        cdc->tx_buf_ptr_out_shadow = 0;
-    }
 
     // According to the USB specification, a packet size of 64 bytes (CDC_DATA_FS_MAX_PACKET_SIZE)
     // gets held at the USB host until the next packet is sent.  This is because a
@@ -204,7 +228,7 @@ void usbd_cdc_tx_ready(usbd_cdc_state_t *cdc_in) {
     // the host waits for all data to arrive (ie, waits for a packet < max packet size).
     // To flush a packet of exactly max packet size, we need to send a zero-size packet.
     // See eg http://www.cypress.com/?id=4&rID=92719
-    cdc->tx_need_empty_packet = (len > 0 && len % usbd_cdc_max_packet(cdc->base.usbd->pdev) == 0 && cdc->tx_buf_ptr_out_shadow == cdc->tx_buf_ptr_in);
+    cdc->tx_need_empty_packet = (len > 0 && len % usbd_cdc_max_packet(cdc->base.usbd->pdev) == 0 && usbd_cdc_tx_buffer_will_be_empty(cdc));
 }
 
 // Attempt to queue data on the USB IN endpoint
@@ -291,10 +315,7 @@ int8_t usbd_cdc_receive(usbd_cdc_state_t *cdc_in, size_t len) {
 }
 
 int usbd_cdc_tx_half_empty(usbd_cdc_itf_t *cdc) {
-    int32_t tx_waiting = (int32_t)cdc->tx_buf_ptr_in - (int32_t)cdc->tx_buf_ptr_out;
-    if (tx_waiting < 0) {
-        tx_waiting += USBD_CDC_TX_DATA_SIZE;
-    }
+    int32_t tx_waiting = usbd_cdc_tx_buffer_size(cdc);
     return tx_waiting <= USBD_CDC_TX_DATA_SIZE / 2;
 }
 
@@ -317,8 +338,7 @@ int usbd_cdc_tx(usbd_cdc_itf_t *cdc, const uint8_t *buf, uint32_t len, uint32_t
     for (uint32_t i = 0; i < len; i++) {
         // Wait until the device is connected and the buffer has space, with a given timeout
         uint32_t start = HAL_GetTick();
-        while (cdc->connect_state == USBD_CDC_CONNECT_STATE_DISCONNECTED
-               || ((cdc->tx_buf_ptr_in + 1) & (USBD_CDC_TX_DATA_SIZE - 1)) == cdc->tx_buf_ptr_out) {
+        while (cdc->connect_state == USBD_CDC_CONNECT_STATE_DISCONNECTED || usbd_cdc_tx_buffer_full(cdc)) {
             usbd_cdc_try_tx(cdc);
             // Wraparound of tick is taken care of by 2's complement arithmetic.
             if (HAL_GetTick() - start >= timeout) {
@@ -333,8 +353,7 @@ int usbd_cdc_tx(usbd_cdc_itf_t *cdc, const uint8_t *buf, uint32_t len, uint32_t
         }
 
         // Write data to device buffer
-        cdc->tx_buf[cdc->tx_buf_ptr_in] = buf[i];
-        cdc->tx_buf_ptr_in = (cdc->tx_buf_ptr_in + 1) & (USBD_CDC_TX_DATA_SIZE - 1);
+        usbd_cdc_tx_buffer_put(cdc, buf[i]);
     }
 
     usbd_cdc_try_tx(cdc);
@@ -357,7 +376,7 @@ void usbd_cdc_tx_always(usbd_cdc_itf_t *cdc, const uint8_t *buf, uint32_t len) {
             // If the buffer is full, wait until it gets drained, with a timeout of 500ms
             // (wraparound of tick is taken care of by 2's complement arithmetic).
             uint32_t start = HAL_GetTick();
-            while (((cdc->tx_buf_ptr_in + 1) & (USBD_CDC_TX_DATA_SIZE - 1)) == cdc->tx_buf_ptr_out && HAL_GetTick() - start <= 500) {
+            while (usbd_cdc_tx_buffer_full(cdc) && HAL_GetTick() - start <= 500) {
                 usbd_cdc_try_tx(cdc);
                 if (query_irq() == IRQ_STATE_DISABLED) {
                     // IRQs disabled so buffer will never be drained; exit loop
@@ -367,8 +386,7 @@ void usbd_cdc_tx_always(usbd_cdc_itf_t *cdc, const uint8_t *buf, uint32_t len) {
             }
         }
 
-        cdc->tx_buf[cdc->tx_buf_ptr_in] = buf[i];
-        cdc->tx_buf_ptr_in = (cdc->tx_buf_ptr_in + 1) & (USBD_CDC_TX_DATA_SIZE - 1);
+        usbd_cdc_tx_buffer_put(cdc, buf[i]);
     }
     usbd_cdc_try_tx(cdc);
 }
diff --git a/ports/stm32/usbd_cdc_interface.h b/ports/stm32/usbd_cdc_interface.h
index 1847b3a6b0eb1..d0509b09f9a99 100644
--- a/ports/stm32/usbd_cdc_interface.h
+++ b/ports/stm32/usbd_cdc_interface.h
@@ -35,7 +35,7 @@
 #define USBD_CDC_RX_DATA_SIZE (1024) // this must be 2 or greater, and a power of 2
 #endif
 #ifndef USBD_CDC_TX_DATA_SIZE
-#define USBD_CDC_TX_DATA_SIZE (1024) // I think this can be any value (was 2048)
+#define USBD_CDC_TX_DATA_SIZE (1024) // This must be a power of 2 and no greater than 16384
 #endif
 
 // Values for connect_state
@@ -60,7 +60,7 @@ typedef struct _usbd_cdc_itf_t {
     uint8_t tx_buf[USBD_CDC_TX_DATA_SIZE]; // data for USB IN endpoind is stored in this buffer
     uint16_t tx_buf_ptr_in; // increment this pointer modulo USBD_CDC_TX_DATA_SIZE when new data is available
     volatile uint16_t tx_buf_ptr_out; // increment this pointer modulo USBD_CDC_TX_DATA_SIZE when data is drained
-    uint16_t tx_buf_ptr_out_shadow; // shadow of above
+    uint16_t tx_buf_ptr_out_next; // next position of above once transmission finished
     uint8_t tx_need_empty_packet; // used to flush the USB IN endpoint if the last packet was exactly the endpoint packet size
 
     volatile uint8_t connect_state; // indicates if we are connected

From 048a1d675dc92ff49b1a00adedba0a0dea8d5ea0 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 29 Jun 2020 16:06:30 +1000
Subject: [PATCH 0128/3533] stm32/timer: Properly initialise timer deadtime/brk
 on WB MCUs.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/timer.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/ports/stm32/timer.c b/ports/stm32/timer.c
index c6f3d21f8671e..9b8c14c0da552 100644
--- a/ports/stm32/timer.c
+++ b/ports/stm32/timer.c
@@ -477,7 +477,7 @@ STATIC void config_deadtime(pyb_timer_obj_t *self, mp_int_t ticks, mp_int_t brk)
     deadTimeConfig.DeadTime = compute_dtg_from_ticks(ticks);
     deadTimeConfig.BreakState = brk == BRK_OFF ? TIM_BREAK_DISABLE : TIM_BREAK_ENABLE;
     deadTimeConfig.BreakPolarity = brk == BRK_LOW ? TIM_BREAKPOLARITY_LOW : TIM_BREAKPOLARITY_HIGH;
-    #if defined(STM32F7) || defined(STM32H7) | defined(STM32L4)
+    #if defined(STM32F7) || defined(STM32H7) || defined(STM32L4) || defined(STM32WB)
     deadTimeConfig.BreakFilter = 0;
     deadTimeConfig.Break2State = TIM_BREAK_DISABLE;
     deadTimeConfig.Break2Polarity = TIM_BREAKPOLARITY_LOW;
@@ -769,14 +769,14 @@ STATIC mp_obj_t pyb_timer_init_helper(pyb_timer_obj_t *self, size_t n_args, cons
     HAL_TIM_Base_Init(&self->tim);
     #if !defined(STM32L0)
     #if defined(IS_TIM_ADVANCED_INSTANCE)
-    if (IS_TIM_ADVANCED_INSTANCE(self->tim.Instance)) {
+    if (IS_TIM_ADVANCED_INSTANCE(self->tim.Instance))
     #elif defined(IS_TIM_BREAK_INSTANCE)
-    if (IS_TIM_BREAK_INSTANCE(self->tim.Instance)) {
+    if (IS_TIM_BREAK_INSTANCE(self->tim.Instance))
     #else
-    if (0) {
-        #endif
+    if (0)
+    #endif
+    {
         config_deadtime(self, args[ARG_deadtime].u_int, args[ARG_brk].u_int);
-
     }
     #endif
 

From 4d6f60d4286b3e6ea8c9fb0141ba13e4978882b6 Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Thu, 5 Mar 2020 15:51:20 +1100
Subject: [PATCH 0129/3533] tools/pydfu.py: Respect longer timeouts requested
 by DFU device/mboot.

---
 tools/pydfu.py | 52 ++++++++++++++++++++++++++++++++++++++++----------
 1 file changed, 42 insertions(+), 10 deletions(-)

diff --git a/tools/pydfu.py b/tools/pydfu.py
index 030f56bf852e3..8b8e338981b49 100755
--- a/tools/pydfu.py
+++ b/tools/pydfu.py
@@ -22,6 +22,8 @@
 import usb.core
 import usb.util
 import zlib
+import time
+import math
 
 # VID/PID
 __VID = 0x0483
@@ -29,6 +31,8 @@
 
 # USB request __TIMEOUT
 __TIMEOUT = 4000
+__NEXT_TIMEOUT = 0
+__STATUS_TIMEOUT = 20000
 
 # DFU commands
 __DFU_DETACH = 0
@@ -95,6 +99,13 @@ def get_string(dev, index):
         return usb.util.get_string(dev, index)
 
 
+def timeout():
+    global __NEXT_TIMEOUT
+    t = max(__TIMEOUT, __NEXT_TIMEOUT)
+    __NEXT_TIMEOUT = 0
+    return int(math.ceil(t))
+
+
 def find_dfu_cfg_descr(descr):
     if len(descr) == 9 and descr[0] == 9 and descr[1] == _DFU_DESCRIPTOR_TYPE:
         nt = collections.namedtuple(
@@ -150,17 +161,32 @@ def init():
 
 def abort_request():
     """Sends an abort request."""
-    __dev.ctrl_transfer(0x21, __DFU_ABORT, 0, __DFU_INTERFACE, None, __TIMEOUT)
+    __dev.ctrl_transfer(0x21, __DFU_ABORT, 0, __DFU_INTERFACE, None, timeout())
 
 
 def clr_status():
     """Clears any error status (perhaps left over from a previous session)."""
-    __dev.ctrl_transfer(0x21, __DFU_CLRSTATUS, 0, __DFU_INTERFACE, None, __TIMEOUT)
+    __dev.ctrl_transfer(0x21, __DFU_CLRSTATUS, 0, __DFU_INTERFACE, None, timeout())
 
 
 def get_status():
     """Get the status of the last operation."""
-    stat = __dev.ctrl_transfer(0xA1, __DFU_GETSTATUS, 0, __DFU_INTERFACE, 6, 20000)
+    _timeout = time.time() + max(__STATUS_TIMEOUT, timeout())
+    stat = None
+    while time.time() < _timeout:
+        try:
+            stat = __dev.ctrl_transfer(
+                0xA1, __DFU_GETSTATUS, 0, __DFU_INTERFACE, 6, int(_timeout - time.time())
+            )
+            break
+        except usb.core.USBError as ex:
+            # If the firmware is blocked the transfer can timeout much quicker than
+            # the supplied timeout. If so, retry until the overall timeout is used up.
+            if "Operation timed out" not in str(ex):
+                raise
+
+    if stat is None:
+        raise SystemExit("DFU: get_status timed out")
 
     # firmware can provide an optional string for any error
     if stat[5]:
@@ -168,6 +194,12 @@ def get_status():
         if message:
             print(message)
 
+    # firmware can send a longer timeout request while it's performing slow operation eg. erase
+    timeout_ms = stat[1] << 16 | stat[2] << 8 | stat[3]
+    if timeout_ms:
+        global __NEXT_TIMEOUT
+        __NEXT_TIMEOUT = __TIMEOUT + timeout_ms
+
     return stat[4]
 
 
@@ -180,9 +212,9 @@ def check_status(stage, expected):
 def mass_erase():
     """Performs a MASS erase (i.e. erases the entire device)."""
     # Send DNLOAD with first byte=0x41
-    __dev.ctrl_transfer(0x21, __DFU_DNLOAD, 0, __DFU_INTERFACE, "\x41", __TIMEOUT)
+    __dev.ctrl_transfer(0x21, __DFU_DNLOAD, 0, __DFU_INTERFACE, "\x41", timeout())
 
-    # Execute last command
+    # Execute erase and wait until complete
     check_status("erase", __DFU_STATE_DFU_DOWNLOAD_BUSY)
 
     # Check command state
@@ -196,7 +228,7 @@ def page_erase(addr):
 
     # Send DNLOAD with first byte=0x41 and page address
     buf = struct.pack("<BI", 0x41, addr)
-    __dev.ctrl_transfer(0x21, __DFU_DNLOAD, 0, __DFU_INTERFACE, buf, __TIMEOUT)
+    __dev.ctrl_transfer(0x21, __DFU_DNLOAD, 0, __DFU_INTERFACE, buf, timeout())
 
     # Execute last command
     check_status("erase", __DFU_STATE_DFU_DOWNLOAD_BUSY)
@@ -209,7 +241,7 @@ def set_address(addr):
     """Sets the address for the next operation."""
     # Send DNLOAD with first byte=0x21 and page address
     buf = struct.pack("<BI", 0x21, addr)
-    __dev.ctrl_transfer(0x21, __DFU_DNLOAD, 0, __DFU_INTERFACE, buf, __TIMEOUT)
+    __dev.ctrl_transfer(0x21, __DFU_DNLOAD, 0, __DFU_INTERFACE, buf, timeout())
 
     # Execute last command
     check_status("set address", __DFU_STATE_DFU_DOWNLOAD_BUSY)
@@ -243,7 +275,7 @@ def write_memory(addr, buf, progress=None, progress_addr=0, progress_size=0):
         # Send DNLOAD with fw data
         chunk = min(__cfg_descr.wTransferSize, xfer_total - xfer_bytes)
         __dev.ctrl_transfer(
-            0x21, __DFU_DNLOAD, 2, __DFU_INTERFACE, buf[xfer_bytes : xfer_bytes + chunk], __TIMEOUT
+            0x21, __DFU_DNLOAD, 2, __DFU_INTERFACE, buf[xfer_bytes : xfer_bytes + chunk], timeout()
         )
 
         # Execute last command
@@ -267,7 +299,7 @@ def write_page(buf, xfer_offset):
     set_address(xfer_base + xfer_offset)
 
     # Send DNLOAD with fw data
-    __dev.ctrl_transfer(0x21, __DFU_DNLOAD, 2, __DFU_INTERFACE, buf, __TIMEOUT)
+    __dev.ctrl_transfer(0x21, __DFU_DNLOAD, 2, __DFU_INTERFACE, buf, timeout())
 
     # Execute last command
     check_status("write memory", __DFU_STATE_DFU_DOWNLOAD_BUSY)
@@ -285,7 +317,7 @@ def exit_dfu():
     set_address(0x08000000)
 
     # Send DNLOAD with 0 length to exit DFU
-    __dev.ctrl_transfer(0x21, __DFU_DNLOAD, 0, __DFU_INTERFACE, None, __TIMEOUT)
+    __dev.ctrl_transfer(0x21, __DFU_DNLOAD, 0, __DFU_INTERFACE, None, timeout())
 
     try:
         # Execute last command

From 8bbaa20227285a724446bffdb89120f03cce1f40 Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Thu, 5 Mar 2020 16:05:36 +1100
Subject: [PATCH 0130/3533] stm32/mboot: Implement DFU mass erase.

The implementation internally uses sector erase to wipe everything except
the sector(s) that mboot lives in (by erasing starting from
APPLICATION_ADDR).

The erase command can take some time (eg an STM32F765 with 2MB of flash
takes 8 to 10 seconds).  This time is normally enough to make pydfu.py fail
with a timeout.  The DFU standard includes a mechanism for the DFU device
to request a longer timeout as part of the get-status response just before
starting an operation.  This timeout functionality has been implemented
here.
---
 ports/stm32/mboot/dfu.h  |  6 +++++
 ports/stm32/mboot/main.c | 57 ++++++++++++++++++++++++++++++++--------
 2 files changed, 52 insertions(+), 11 deletions(-)

diff --git a/ports/stm32/mboot/dfu.h b/ports/stm32/mboot/dfu.h
index e826e217f032f..a1d4d10d0ef90 100644
--- a/ports/stm32/mboot/dfu.h
+++ b/ports/stm32/mboot/dfu.h
@@ -67,6 +67,12 @@ typedef enum {
     DFU_CMD_DNLOAD = 8,
 } dfu_cmd_t;
 
+enum {
+    DFU_CMD_DNLOAD_SET_ADDRESS = 0x21,
+    DFU_CMD_DNLOAD_ERASE = 0x41,
+    DFU_CMD_DNLOAD_READ_UNPROTECT = 0x92,
+};
+
 // Error status flags
 typedef enum {
     DFU_STATUS_OK = 0x00,  // No error condition is present.
diff --git a/ports/stm32/mboot/main.c b/ports/stm32/mboot/main.c
index 87618e7f410ad..d4527874120ad 100644
--- a/ports/stm32/mboot/main.c
+++ b/ports/stm32/mboot/main.c
@@ -441,6 +441,11 @@ static int usrbtn_state(void) {
 /******************************************************************************/
 // FLASH
 
+#if defined(STM32WB)
+#define FLASH_END FLASH_END_ADDR
+#endif
+#define APPLICATION_FLASH_LENGTH (FLASH_END + 1 - APPLICATION_ADDR)
+
 #ifndef MBOOT_SPIFLASH_LAYOUT
 #define MBOOT_SPIFLASH_LAYOUT ""
 #endif
@@ -464,8 +469,9 @@ static int usrbtn_state(void) {
 #endif
 
 static int mboot_flash_mass_erase(void) {
-    // TODO
-    return -1;
+    // Erase all flash pages after mboot.
+    int ret = flash_erase(APPLICATION_ADDR, APPLICATION_FLASH_LENGTH / sizeof(uint32_t));
+    return ret;
 }
 
 static int mboot_flash_page_erase(uint32_t addr, uint32_t *next_addr) {
@@ -523,7 +529,7 @@ static int mboot_flash_write(uint32_t addr, const uint8_t *src8, size_t len) {
 // Writable address space interface
 
 static int do_mass_erase(void) {
-    // TODO
+    // TODO spiflash erase ?
     return mboot_flash_mass_erase();
 }
 
@@ -791,20 +797,45 @@ static void dfu_init(void) {
     dfu_context.addr = 0x08000000;
 }
 
+// The DFU_GETSTATUS response before dfu_process_dnload is run should include the needed timeout adjustments
+static size_t get_timeout_ms(void) {
+    if (dfu_context.wBlockNum == 0) {
+        // download control commands
+        if (dfu_context.wLength >= 1 && dfu_context.buf[0] == DFU_CMD_DNLOAD_ERASE) {
+            if (dfu_context.wLength == 1) {
+                // mass erase command
+                // It takes 10-12 seconds to erase a 2MB stm part. Extrapolate a suitable timeout from this.
+                return APPLICATION_FLASH_LENGTH / 170;
+
+            } else if (dfu_context.wLength == 5) {
+                // erase page command
+                return 500;
+            }
+        }
+    } else if (dfu_context.wBlockNum > 1) {
+        // write data to memory command
+        return 500;
+    }
+    return 0;
+}
+
 static int dfu_process_dnload(void) {
     int ret = -1;
     if (dfu_context.wBlockNum == 0) {
         // download control commands
-        if (dfu_context.wLength >= 1 && dfu_context.buf[0] == 0x41) {
+        if (dfu_context.wLength >= 1 && dfu_context.buf[0] == DFU_CMD_DNLOAD_ERASE) {
             if (dfu_context.wLength == 1) {
                 // mass erase
                 ret = do_mass_erase();
+                if (ret != 0) {
+                    dfu_context.cmd = DFU_CMD_NONE;
+                }
             } else if (dfu_context.wLength == 5) {
                 // erase page
                 uint32_t next_addr;
                 ret = do_page_erase(get_le32(&dfu_context.buf[1]), &next_addr);
             }
-        } else if (dfu_context.wLength >= 1 && dfu_context.buf[0] == 0x21) {
+        } else if (dfu_context.wLength >= 1 && dfu_context.buf[0] == DFU_CMD_DNLOAD_SET_ADDRESS) {
             if (dfu_context.wLength == 5) {
                 // set address
                 dfu_context.addr = get_le32(&dfu_context.buf[1]);
@@ -888,12 +919,16 @@ static int dfu_handle_tx(int cmd, int arg, int len, uint8_t *buf, int max_len) {
             default:
                 dfu_context.state = DFU_STATE_BUSY;
         }
-        buf[0] = dfu_context.status; // bStatus
-        buf[1] = 0; // bwPollTimeout (ms)
-        buf[2] = 0; // bwPollTimeout (ms)
-        buf[3] = 0; // bwPollTimeout (ms)
-        buf[4] = dfu_context.state; // bState
-        buf[5] = dfu_context.error; // iString
+        size_t timeout_ms = get_timeout_ms();
+        buf[0] = dfu_context.status;          // bStatus
+        buf[1] = (timeout_ms >> 16) & 0xFF;   // bwPollTimeout (ms)
+        buf[2] = (timeout_ms >> 8) & 0xFF;    // bwPollTimeout (ms)
+        buf[3] = timeout_ms & 0xFF;           // bwPollTimeout (ms)
+        buf[4] = dfu_context.state;           // bState
+        buf[5] = dfu_context.error;           // iString
+        // Clear errors now they've been sent
+        dfu_context.status = DFU_STATUS_OK;
+        dfu_context.error = 0;
         return 6;
     }
     return -1;

From 40006813c3e053e4cf952bfdd32866ce9496b0f8 Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Tue, 30 Jun 2020 16:33:32 +1000
Subject: [PATCH 0131/3533] stm32/flash: Update flash_get_sector_info to return
 -1 on invalid addr.

So the caller can tell when an invalid address is used and can take
appropriate action.
---
 ports/stm32/flash.c      |  4 ++--
 ports/stm32/flash.h      |  2 +-
 ports/stm32/flashbdev.c  |  4 ++--
 ports/stm32/mboot/main.c | 23 +++++++++++++----------
 4 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/ports/stm32/flash.c b/ports/stm32/flash.c
index 5f96696a9ffd7..499129a6f3e5d 100644
--- a/ports/stm32/flash.c
+++ b/ports/stm32/flash.c
@@ -151,7 +151,7 @@ bool flash_is_valid_addr(uint32_t addr) {
     return flash_layout[0].base_address <= addr && addr < end_of_flash;
 }
 
-uint32_t flash_get_sector_info(uint32_t addr, uint32_t *start_addr, uint32_t *size) {
+int32_t flash_get_sector_info(uint32_t addr, uint32_t *start_addr, uint32_t *size) {
     if (addr >= flash_layout[0].base_address) {
         uint32_t sector_index = 0;
         for (int i = 0; i < MP_ARRAY_SIZE(flash_layout); ++i) {
@@ -172,7 +172,7 @@ uint32_t flash_get_sector_info(uint32_t addr, uint32_t *start_addr, uint32_t *si
             }
         }
     }
-    return 0;
+    return -1;
 }
 
 int flash_erase(uint32_t flash_dest, uint32_t num_word32) {
diff --git a/ports/stm32/flash.h b/ports/stm32/flash.h
index 12cdaca55aab9..ecda923db7826 100644
--- a/ports/stm32/flash.h
+++ b/ports/stm32/flash.h
@@ -27,7 +27,7 @@
 #define MICROPY_INCLUDED_STM32_FLASH_H
 
 bool flash_is_valid_addr(uint32_t addr);
-uint32_t flash_get_sector_info(uint32_t addr, uint32_t *start_addr, uint32_t *size);
+int32_t flash_get_sector_info(uint32_t addr, uint32_t *start_addr, uint32_t *size);
 int flash_erase(uint32_t flash_dest, uint32_t num_word32);
 int flash_write(uint32_t flash_dest, const uint32_t *src, uint32_t num_word32);
 
diff --git a/ports/stm32/flashbdev.c b/ports/stm32/flashbdev.c
index e105bd35381b9..4153a713c8636 100644
--- a/ports/stm32/flashbdev.c
+++ b/ports/stm32/flashbdev.c
@@ -181,7 +181,7 @@ int32_t flash_bdev_ioctl(uint32_t op, uint32_t arg) {
 static uint8_t *flash_cache_get_addr_for_write(uint32_t flash_addr) {
     uint32_t flash_sector_start;
     uint32_t flash_sector_size;
-    uint32_t flash_sector_id = flash_get_sector_info(flash_addr, &flash_sector_start, &flash_sector_size);
+    int32_t flash_sector_id = flash_get_sector_info(flash_addr, &flash_sector_start, &flash_sector_size);
     if (flash_sector_size > FLASH_SECTOR_SIZE_MAX) {
         flash_sector_size = FLASH_SECTOR_SIZE_MAX;
     }
@@ -201,7 +201,7 @@ static uint8_t *flash_cache_get_addr_for_write(uint32_t flash_addr) {
 static uint8_t *flash_cache_get_addr_for_read(uint32_t flash_addr) {
     uint32_t flash_sector_start;
     uint32_t flash_sector_size;
-    uint32_t flash_sector_id = flash_get_sector_info(flash_addr, &flash_sector_start, &flash_sector_size);
+    int32_t flash_sector_id = flash_get_sector_info(flash_addr, &flash_sector_start, &flash_sector_size);
     if (flash_cache_sector_id == flash_sector_id) {
         // in cache, copy from there
         return (uint8_t *)CACHE_MEM_START_ADDR + flash_addr - flash_sector_start;
diff --git a/ports/stm32/mboot/main.c b/ports/stm32/mboot/main.c
index d4527874120ad..8cc14c2ac99cb 100644
--- a/ports/stm32/mboot/main.c
+++ b/ports/stm32/mboot/main.c
@@ -476,25 +476,27 @@ static int mboot_flash_mass_erase(void) {
 
 static int mboot_flash_page_erase(uint32_t addr, uint32_t *next_addr) {
     uint32_t sector_size = 0;
-    uint32_t sector = flash_get_sector_info(addr, NULL, &sector_size);
-    if (sector == 0) {
-        // Don't allow to erase the sector with this bootloader in it
+    uint32_t sector_start = 0;
+    int32_t sector = flash_get_sector_info(addr, &sector_start, &sector_size);
+    if (sector <= 0) {
+        // Don't allow to erase the sector with this bootloader in it, or invalid sectors
         dfu_context.status = DFU_STATUS_ERROR_ADDRESS;
-        dfu_context.error = MBOOT_ERROR_STR_OVERWRITE_BOOTLOADER_IDX;
+        dfu_context.error = (sector == 0) ? MBOOT_ERROR_STR_OVERWRITE_BOOTLOADER_IDX
+                                          : MBOOT_ERROR_STR_INVALID_ADDRESS_IDX;
         return -1;
     }
 
-    *next_addr = addr + sector_size;
+    *next_addr = sector_start + sector_size;
 
     // Erase the flash page.
-    int ret = flash_erase(addr, sector_size / sizeof(uint32_t));
+    int ret = flash_erase(sector_start, sector_size / sizeof(uint32_t));
     if (ret != 0) {
         return ret;
     }
 
     // Check the erase set bits to 1, at least for the first 256 bytes
     for (int i = 0; i < 64; ++i) {
-        if (((volatile uint32_t*)addr)[i] != 0xffffffff) {
+        if (((volatile uint32_t*)sector_start)[i] != 0xffffffff) {
             return -2;
         }
     }
@@ -503,11 +505,12 @@ static int mboot_flash_page_erase(uint32_t addr, uint32_t *next_addr) {
 }
 
 static int mboot_flash_write(uint32_t addr, const uint8_t *src8, size_t len) {
-    uint32_t sector = flash_get_sector_info(addr, NULL, NULL);
-    if (sector == 0) {
+    int32_t sector = flash_get_sector_info(addr, NULL, NULL);
+    if (sector <= 0) {
         // Don't allow to write the sector with this bootloader in it
         dfu_context.status = DFU_STATUS_ERROR_ADDRESS;
-        dfu_context.error = MBOOT_ERROR_STR_OVERWRITE_BOOTLOADER_IDX;
+        dfu_context.error = (sector == 0) ? MBOOT_ERROR_STR_OVERWRITE_BOOTLOADER_IDX
+                                          : MBOOT_ERROR_STR_INVALID_ADDRESS_IDX;
         return -1;
     }
 

From 65a7e00078fae27521dd9df78e328c6fa1e3b288 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 30 Jun 2020 14:23:50 +1000
Subject: [PATCH 0132/3533] stm32/mboot: Add DFU logic to respond to
 DFU_GETSTATE request.

This is required for some DFU programmers, eg ST's DfuSe demo PC app.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/mboot/main.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ports/stm32/mboot/main.c b/ports/stm32/mboot/main.c
index 8cc14c2ac99cb..ba0c35b8bfe4c 100644
--- a/ports/stm32/mboot/main.c
+++ b/ports/stm32/mboot/main.c
@@ -933,6 +933,9 @@ static int dfu_handle_tx(int cmd, int arg, int len, uint8_t *buf, int max_len) {
         dfu_context.status = DFU_STATUS_OK;
         dfu_context.error = 0;
         return 6;
+    } else if (cmd == DFU_GETSTATE && len == 1) {
+        buf[0] = dfu_context.state; // bState
+        return 1;
     }
     return -1;
 }

From cb9aafbf8f0ee912e5f4d0a32d5f9765d9e8f30c Mon Sep 17 00:00:00 2001
From: victor <victorkrook96@gmail.com>
Date: Sun, 28 Jun 2020 23:41:04 +0200
Subject: [PATCH 0133/3533] docs/library: Clarify that the arg to esp.deepsleep
 is in microseconds.

---
 docs/library/esp.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/library/esp.rst b/docs/library/esp.rst
index cb2bc7af8d538..b9ae57bd9757f 100644
--- a/docs/library/esp.rst
+++ b/docs/library/esp.rst
@@ -31,7 +31,7 @@ Functions
 
     The system enters the set sleep mode automatically when possible.
 
-.. function:: deepsleep(time=0, /)
+.. function:: deepsleep(time_us=0, /)
 
     **Note**: ESP8266 only - use `machine.deepsleep()` on ESP32
 

From b572aa5721e3516367c56fba9e0d09ac0edbbd2c Mon Sep 17 00:00:00 2001
From: spacemanspiff2007 <accounts@sgerber.de>
Date: Thu, 25 Jun 2020 15:35:58 +0200
Subject: [PATCH 0134/3533] docs/esp32: Add info about PWM duty cycle range to
 esp32 quickref.

See related #4581.
---
 docs/esp32/quickref.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/esp32/quickref.rst b/docs/esp32/quickref.rst
index 8861ca4ac87ed..b4f443a910009 100644
--- a/docs/esp32/quickref.rst
+++ b/docs/esp32/quickref.rst
@@ -175,6 +175,7 @@ range from 1Hz to 40MHz but there is a tradeoff; as the base frequency
 *increases* the duty resolution *decreases*. See 
 `LED Control <https://docs.espressif.com/projects/esp-idf/en/latest/api-reference/peripherals/ledc.html>`_
 for more details.
+Currently the duty cycle has to be in the range of 0-1023.
 
 Use the ``machine.PWM`` class::
 

From 9d5edb35596b0ff5943bf1cb756dc3c42e8566d9 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sun, 14 Jun 2020 16:22:29 +1000
Subject: [PATCH 0135/3533] lib/utils: Protect all of mpirq.c with
 MICROPY_ENABLE_SCHEDULER.

So it can be unconditionally included in a port's build even if certain
configurations in that port do not use its features, to simplify the
Makefile.

Signed-off-by: Damien George <damien@micropython.org>
---
 lib/utils/mpirq.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/utils/mpirq.c b/lib/utils/mpirq.c
index 8de13b0b6a3c8..663be182248cc 100644
--- a/lib/utils/mpirq.c
+++ b/lib/utils/mpirq.c
@@ -31,6 +31,8 @@
 #include "py/gc.h"
 #include "lib/utils/mpirq.h"
 
+#if MICROPY_ENABLE_SCHEDULER
+
 /******************************************************************************
  DECLARE PUBLIC DATA
  ******************************************************************************/
@@ -125,3 +127,5 @@ const mp_obj_type_t mp_irq_type = {
     .call = mp_irq_call,
     .locals_dict = (mp_obj_dict_t *)&mp_irq_locals_dict,
 };
+
+#endif // MICROPY_ENABLE_SCHEDULER

From f84145bea1bc962b5aecf24bef6ea64202d905ee Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sun, 14 Jun 2020 16:22:56 +1000
Subject: [PATCH 0136/3533] zephyr: Implement machine.Pin.irq() for setting
 callbacks on pin change.

Supports hard and soft interrupts.  In the current implementation, soft
interrupt callbacks will only be called when the VM is executing, ie they
will not be called during a blocking kernel call like k_msleep.  And the
behaviour of hard interrupt callbacks will depend on the underlying device,
as well as the amount of ISR stack space.

Soft and hard interrupts tested on frdm_k64f and nucleo_f767zi boards.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/zephyr/Makefile       |   1 +
 ports/zephyr/machine_pin.c  | 133 ++++++++++++++++++++++++++++++++++++
 ports/zephyr/main.c         |   6 ++
 ports/zephyr/modmachine.h   |   3 +
 ports/zephyr/mpconfigport.h |   7 +-
 5 files changed, 149 insertions(+), 1 deletion(-)

diff --git a/ports/zephyr/Makefile b/ports/zephyr/Makefile
index 4fe6552846aab..169aebc26772e 100644
--- a/ports/zephyr/Makefile
+++ b/ports/zephyr/Makefile
@@ -52,6 +52,7 @@ SRC_C = main.c \
 	uart_core.c \
 	zephyr_storage.c \
 	lib/timeutils/timeutils.c \
+	lib/utils/mpirq.c \
 	lib/utils/stdout_helpers.c \
 	lib/utils/printf.c \
 	lib/utils/pyexec.c \
diff --git a/ports/zephyr/machine_pin.c b/ports/zephyr/machine_pin.c
index ad5f54baafb92..79d759eb28bf3 100644
--- a/ports/zephyr/machine_pin.c
+++ b/ports/zephyr/machine_pin.c
@@ -35,10 +35,50 @@
 #include "py/runtime.h"
 #include "py/gc.h"
 #include "py/mphal.h"
+#include "lib/utils/mpirq.h"
 #include "modmachine.h"
 
+#if MICROPY_PY_MACHINE
+
+typedef struct _machine_pin_irq_obj_t {
+    mp_irq_obj_t base;
+    struct _machine_pin_irq_obj_t *next;
+    struct gpio_callback callback;
+} machine_pin_irq_obj_t;
+
+STATIC const mp_irq_methods_t machine_pin_irq_methods;
 const mp_obj_base_t machine_pin_obj_template = {&machine_pin_type};
 
+void machine_pin_deinit(void) {
+    for (machine_pin_irq_obj_t *irq = MP_STATE_PORT(machine_pin_irq_list); irq != NULL; irq = irq->next) {
+        machine_pin_obj_t *pin = MP_OBJ_TO_PTR(irq->base.parent);
+        gpio_pin_interrupt_configure(pin->port, pin->pin, GPIO_INT_DISABLE);
+        gpio_remove_callback(pin->port, &irq->callback);
+    }
+    MP_STATE_PORT(machine_pin_irq_list) = NULL;
+}
+
+STATIC void gpio_callback_handler(struct device *port, struct gpio_callback *cb, gpio_port_pins_t pins) {
+    machine_pin_irq_obj_t *irq = CONTAINER_OF(cb, machine_pin_irq_obj_t, callback);
+
+    #if MICROPY_STACK_CHECK
+    // This callback executes in an ISR context so the stack-limit check must be changed to
+    // use the ISR stack for the duration of this function (so that hard IRQ callbacks work).
+    char *orig_stack_top = MP_STATE_THREAD(stack_top);
+    size_t orig_stack_limit = MP_STATE_THREAD(stack_limit);
+    MP_STATE_THREAD(stack_top) = (void *)&irq;
+    MP_STATE_THREAD(stack_limit) = CONFIG_ISR_STACK_SIZE - 512;
+    #endif
+
+    mp_irq_handler(&irq->base);
+
+    #if MICROPY_STACK_CHECK
+    // Restore original stack-limit checking values.
+    MP_STATE_THREAD(stack_top) = orig_stack_top;
+    MP_STATE_THREAD(stack_limit) = orig_stack_limit;
+    #endif
+}
+
 STATIC void machine_pin_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     machine_pin_obj_t *self = self_in;
     mp_printf(print, "<Pin %p %d>", self->port, self->pin);
@@ -151,6 +191,66 @@ STATIC mp_obj_t machine_pin_on(mp_obj_t self_in) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_pin_on_obj, machine_pin_on);
 
+// pin.irq(handler=None, trigger=IRQ_FALLING|IRQ_RISING, hard=False)
+STATIC mp_obj_t machine_pin_irq(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    enum { ARG_handler, ARG_trigger, ARG_hard };
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_handler, MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
+        { MP_QSTR_trigger, MP_ARG_INT, {.u_int = GPIO_INT_EDGE_BOTH} },
+        { MP_QSTR_hard, MP_ARG_BOOL, {.u_bool = false} },
+    };
+    machine_pin_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]);
+    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
+    mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
+
+    if (self->irq == NULL) {
+        machine_pin_irq_obj_t *irq;
+        for (irq = MP_STATE_PORT(machine_pin_irq_list); irq != NULL; irq = irq->next) {
+            machine_pin_obj_t *irq_pin = MP_OBJ_TO_PTR(irq->base.parent);
+            if (irq_pin->port == self->port && irq_pin->pin == self->pin) {
+                break;
+            }
+        }
+        if (irq == NULL) {
+            irq = m_new_obj(machine_pin_irq_obj_t);
+            irq->base.base.type = &mp_irq_type;
+            irq->base.methods = (mp_irq_methods_t *)&machine_pin_irq_methods;
+            irq->base.parent = MP_OBJ_FROM_PTR(self);
+            irq->base.handler = mp_const_none;
+            irq->base.ishard = false;
+            irq->next = MP_STATE_PORT(machine_pin_irq_list);
+            gpio_init_callback(&irq->callback, gpio_callback_handler, BIT(self->pin));
+            int ret = gpio_add_callback(self->port, &irq->callback);
+            if (ret != 0) {
+                mp_raise_OSError(-ret);
+            }
+            MP_STATE_PORT(machine_pin_irq_list) = irq;
+        }
+        self->irq = irq;
+    }
+
+    if (n_args > 1 || kw_args->used != 0) {
+        // configure irq
+        int ret = gpio_pin_interrupt_configure(self->port, self->pin, GPIO_INT_DISABLE);
+        if (ret != 0) {
+            mp_raise_OSError(-ret);
+        }
+
+        self->irq->base.handler = args[ARG_handler].u_obj;
+        self->irq->base.ishard = args[ARG_hard].u_bool;
+
+        if (args[ARG_handler].u_obj != mp_const_none) {
+            ret = gpio_pin_interrupt_configure(self->port, self->pin, args[ARG_trigger].u_int);
+            if (ret != 0) {
+                mp_raise_OSError(-ret);
+            }
+        }
+    }
+
+    return MP_OBJ_FROM_PTR(self->irq);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_KW(machine_pin_irq_obj, 1, machine_pin_irq);
+
 STATIC mp_uint_t machine_pin_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_t arg, int *errcode) {
     (void)errcode;
     machine_pin_obj_t *self = self_in;
@@ -172,12 +272,15 @@ STATIC const mp_rom_map_elem_t machine_pin_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_value),   MP_ROM_PTR(&machine_pin_value_obj) },
     { MP_ROM_QSTR(MP_QSTR_off),     MP_ROM_PTR(&machine_pin_off_obj) },
     { MP_ROM_QSTR(MP_QSTR_on),      MP_ROM_PTR(&machine_pin_on_obj) },
+    { MP_ROM_QSTR(MP_QSTR_irq),     MP_ROM_PTR(&machine_pin_irq_obj) },
 
     // class constants
     { MP_ROM_QSTR(MP_QSTR_IN),        MP_ROM_INT(GPIO_INPUT) },
     { MP_ROM_QSTR(MP_QSTR_OUT),       MP_ROM_INT(GPIO_OUTPUT) },
     { MP_ROM_QSTR(MP_QSTR_PULL_UP),   MP_ROM_INT(GPIO_PULL_UP) },
     { MP_ROM_QSTR(MP_QSTR_PULL_DOWN), MP_ROM_INT(GPIO_PULL_DOWN) },
+    { MP_ROM_QSTR(MP_QSTR_IRQ_RISING), MP_ROM_INT(GPIO_INT_EDGE_RISING) },
+    { MP_ROM_QSTR(MP_QSTR_IRQ_FALLING), MP_ROM_INT(GPIO_INT_EDGE_FALLING) },
 };
 
 STATIC MP_DEFINE_CONST_DICT(machine_pin_locals_dict, machine_pin_locals_dict_table);
@@ -195,3 +298,33 @@ const mp_obj_type_t machine_pin_type = {
     .protocol = &machine_pin_pin_p,
     .locals_dict = (mp_obj_t)&machine_pin_locals_dict,
 };
+
+STATIC mp_uint_t machine_pin_irq_trigger(mp_obj_t self_in, mp_uint_t new_trigger) {
+    machine_pin_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    if (new_trigger == 0) {
+        new_trigger = GPIO_INT_DISABLE;
+    }
+    int ret = gpio_pin_interrupt_configure(self->port, self->pin, new_trigger);
+    if (ret != 0) {
+        mp_raise_OSError(-ret);
+    }
+    return 0;
+}
+
+STATIC mp_uint_t machine_pin_irq_info(mp_obj_t self_in, mp_uint_t info_type) {
+    machine_pin_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    if (info_type == MP_IRQ_INFO_FLAGS) {
+        return gpio_get_pending_int(self->port);
+    } else if (info_type == MP_IRQ_INFO_TRIGGERS) {
+        return 0; // TODO
+    }
+    return 0;
+}
+
+STATIC const mp_irq_methods_t machine_pin_irq_methods = {
+    .init = machine_pin_irq,
+    .trigger = machine_pin_irq_trigger,
+    .info = machine_pin_irq_info,
+};
+
+#endif // MICROPY_PY_MACHINE
diff --git a/ports/zephyr/main.c b/ports/zephyr/main.c
index 104954f595c0a..78b947d7af9b9 100644
--- a/ports/zephyr/main.c
+++ b/ports/zephyr/main.c
@@ -55,6 +55,7 @@
 #include "extmod/vfs.h"
 #endif
 
+#include "modmachine.h"
 #include "modzephyr.h"
 
 #ifdef TEST
@@ -166,6 +167,11 @@ int real_main(void) {
     }
 
     printf("soft reboot\n");
+
+    #if MICROPY_PY_MACHINE
+    machine_pin_deinit();
+    #endif
+
     goto soft_reset;
 
     return 0;
diff --git a/ports/zephyr/modmachine.h b/ports/zephyr/modmachine.h
index 84e4d10a885ae..766a9d7ea3874 100644
--- a/ports/zephyr/modmachine.h
+++ b/ports/zephyr/modmachine.h
@@ -11,6 +11,9 @@ typedef struct _machine_pin_obj_t {
     mp_obj_base_t base;
     struct device *port;
     uint32_t pin;
+    struct _machine_pin_irq_obj_t *irq;
 } machine_pin_obj_t;
 
+void machine_pin_deinit(void);
+
 #endif // MICROPY_INCLUDED_ZEPHYR_MODMACHINE_H
diff --git a/ports/zephyr/mpconfigport.h b/ports/zephyr/mpconfigport.h
index 7044c175d030c..f94ee72707d47 100644
--- a/ports/zephyr/mpconfigport.h
+++ b/ports/zephyr/mpconfigport.h
@@ -81,6 +81,7 @@
 #define MICROPY_LONGINT_IMPL (MICROPY_LONGINT_IMPL_LONGLONG)
 #define MICROPY_FLOAT_IMPL (MICROPY_FLOAT_IMPL_FLOAT)
 #define MICROPY_PY_BUILTINS_COMPLEX (0)
+#define MICROPY_ENABLE_SCHEDULER    (1)
 #define MICROPY_VFS                 (1)
 #define MICROPY_READER_VFS          (MICROPY_VFS)
 
@@ -119,7 +120,8 @@ typedef long mp_off_t;
 #define MP_STATE_PORT MP_STATE_VM
 
 #define MICROPY_PORT_ROOT_POINTERS \
-    const char *readline_hist[8];
+    const char *readline_hist[8]; \
+    void *machine_pin_irq_list; /* Linked list of pin irq objects */
 
 extern const struct _mp_obj_module_t mp_module_machine;
 extern const struct _mp_obj_module_t mp_module_time;
@@ -169,3 +171,6 @@ extern const struct _mp_obj_module_t mp_module_zsensor;
 // extra built in names to add to the global namespace
 #define MICROPY_PORT_BUILTINS \
     { MP_ROM_QSTR(MP_QSTR_open), MP_ROM_PTR(&mp_builtin_open_obj) },
+
+#define MICROPY_BEGIN_ATOMIC_SECTION irq_lock
+#define MICROPY_END_ATOMIC_SECTION irq_unlock

From 41b7734c464cbdcd0d447a4de697ce9b3fcd9e04 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sun, 14 Jun 2020 16:23:09 +1000
Subject: [PATCH 0137/3533] zephyr/make-minimal: Disable FAT and LFS2 options
 to make it build.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/zephyr/make-minimal | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ports/zephyr/make-minimal b/ports/zephyr/make-minimal
index 1fc143e4d6af0..d7dddc33427df 100755
--- a/ports/zephyr/make-minimal
+++ b/ports/zephyr/make-minimal
@@ -11,6 +11,8 @@
 make \
     CONF_FILE=prj_minimal.conf \
     CFLAGS_EXTRA='-DMP_CONFIGFILE="<mpconfigport_minimal.h>"' \
+    MICROPY_VFS_FAT=0 \
+    MICROPY_VFS_LFS2=0 \
     FROZEN_DIR= \
     QEMU_NET=0 \
     "$@"

From d06ae1d2b11d03e45b6d12a41b9435ae0ca1690c Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 30 Jun 2020 23:52:35 +1000
Subject: [PATCH 0138/3533] py/obj.h: Make existing MP_TYPE_FLAG_xxx macros
 sequential.

There's no reason to have them non-sequential, this was likely a typo from
commit 9ec1caf42e7733b5141b7aecf1b6e58834a94bf7.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/obj.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/py/obj.h b/py/obj.h
index 1fa24eb18c903..6bec57c35293c 100644
--- a/py/obj.h
+++ b/py/obj.h
@@ -475,8 +475,8 @@ typedef mp_obj_t (*mp_fun_kw_t)(size_t n, const mp_obj_t *, mp_map_t *);
 // operator and not the __ne__ operator.  If it's set then __ne__ may be implemented.
 #define MP_TYPE_FLAG_IS_SUBCLASSED (0x0001)
 #define MP_TYPE_FLAG_HAS_SPECIAL_ACCESSORS (0x0002)
-#define MP_TYPE_FLAG_EQ_NOT_REFLEXIVE (0x0040)
-#define MP_TYPE_FLAG_EQ_CHECKS_OTHER_TYPE (0x0080)
+#define MP_TYPE_FLAG_EQ_NOT_REFLEXIVE (0x0004)
+#define MP_TYPE_FLAG_EQ_CHECKS_OTHER_TYPE (0x0008)
 #define MP_TYPE_FLAG_EQ_HAS_NEQ_TEST (0x0010)
 
 typedef enum {

From 332d83343fb3ef5d2b94b4f058aa53fd0493779e Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sun, 28 Jun 2020 09:39:20 +1000
Subject: [PATCH 0139/3533] py: Rework mp_convert_member_lookup to properly
 handle built-ins.

This commit fixes lookups of class members to make it so that built-in
functions that are used as methods/functions of a class work correctly.

The mp_convert_member_lookup() function is pretty much completely changed
by this commit, but for the most part it's just reorganised and the
indenting changed.  The functional changes are:

- staticmethod and classmethod checks moved to later in the if-logic,
  because they are less common and so should be checked after the more
  common cases.

- The explicit mp_obj_is_type(member, &mp_type_type) check is removed
  because it's now subsumed by other, more general tests in this function.

- MP_TYPE_FLAG_BINDS_SELF and MP_TYPE_FLAG_BUILTIN_FUN type flags added to
  make the checks in this function much simpler (now they just test this
  bit in type->flags).

- An extra check is made for mp_obj_is_instance_type(type) to fix lookup of
  built-in functions.

Fixes #1326 and #6198.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/obj.h                        |  4 ++
 py/objclosure.c                 |  1 +
 py/objfun.c                     |  8 ++++
 py/objgenerator.c               |  2 +
 py/runtime.c                    | 82 ++++++++++++++++++---------------
 tests/basics/class_bind_self.py |  9 +++-
 6 files changed, 67 insertions(+), 39 deletions(-)

diff --git a/py/obj.h b/py/obj.h
index 6bec57c35293c..f621b1dadd492 100644
--- a/py/obj.h
+++ b/py/obj.h
@@ -473,11 +473,15 @@ typedef mp_obj_t (*mp_fun_kw_t)(size_t n, const mp_obj_t *, mp_map_t *);
 // then the type may check for equality against a different type.
 // If MP_TYPE_FLAG_EQ_HAS_NEQ_TEST is clear then the type only implements the __eq__
 // operator and not the __ne__ operator.  If it's set then __ne__ may be implemented.
+// If MP_TYPE_FLAG_BINDS_SELF is set then the type as a method binds self as the first arg.
+// If MP_TYPE_FLAG_BUILTIN_FUN is set then the type is a built-in function type.
 #define MP_TYPE_FLAG_IS_SUBCLASSED (0x0001)
 #define MP_TYPE_FLAG_HAS_SPECIAL_ACCESSORS (0x0002)
 #define MP_TYPE_FLAG_EQ_NOT_REFLEXIVE (0x0004)
 #define MP_TYPE_FLAG_EQ_CHECKS_OTHER_TYPE (0x0008)
 #define MP_TYPE_FLAG_EQ_HAS_NEQ_TEST (0x0010)
+#define MP_TYPE_FLAG_BINDS_SELF (0x0020)
+#define MP_TYPE_FLAG_BUILTIN_FUN (0x0040)
 
 typedef enum {
     PRINT_STR = 0,
diff --git a/py/objclosure.c b/py/objclosure.c
index f5038ffc46513..9a8c7631c2bea 100644
--- a/py/objclosure.c
+++ b/py/objclosure.c
@@ -80,6 +80,7 @@ STATIC void closure_print(const mp_print_t *print, mp_obj_t o_in, mp_print_kind_
 
 const mp_obj_type_t closure_type = {
     { &mp_type_type },
+    .flags = MP_TYPE_FLAG_BINDS_SELF,
     .name = MP_QSTR_closure,
     #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_DETAILED
     .print = closure_print,
diff --git a/py/objfun.c b/py/objfun.c
index f9a6b4ebc2727..052f4b1cedfd2 100644
--- a/py/objfun.c
+++ b/py/objfun.c
@@ -58,6 +58,7 @@ STATIC mp_obj_t fun_builtin_0_call(mp_obj_t self_in, size_t n_args, size_t n_kw,
 
 const mp_obj_type_t mp_type_fun_builtin_0 = {
     { &mp_type_type },
+    .flags = MP_TYPE_FLAG_BINDS_SELF | MP_TYPE_FLAG_BUILTIN_FUN,
     .name = MP_QSTR_function,
     .call = fun_builtin_0_call,
     .unary_op = mp_generic_unary_op,
@@ -72,6 +73,7 @@ STATIC mp_obj_t fun_builtin_1_call(mp_obj_t self_in, size_t n_args, size_t n_kw,
 
 const mp_obj_type_t mp_type_fun_builtin_1 = {
     { &mp_type_type },
+    .flags = MP_TYPE_FLAG_BINDS_SELF | MP_TYPE_FLAG_BUILTIN_FUN,
     .name = MP_QSTR_function,
     .call = fun_builtin_1_call,
     .unary_op = mp_generic_unary_op,
@@ -86,6 +88,7 @@ STATIC mp_obj_t fun_builtin_2_call(mp_obj_t self_in, size_t n_args, size_t n_kw,
 
 const mp_obj_type_t mp_type_fun_builtin_2 = {
     { &mp_type_type },
+    .flags = MP_TYPE_FLAG_BINDS_SELF | MP_TYPE_FLAG_BUILTIN_FUN,
     .name = MP_QSTR_function,
     .call = fun_builtin_2_call,
     .unary_op = mp_generic_unary_op,
@@ -100,6 +103,7 @@ STATIC mp_obj_t fun_builtin_3_call(mp_obj_t self_in, size_t n_args, size_t n_kw,
 
 const mp_obj_type_t mp_type_fun_builtin_3 = {
     { &mp_type_type },
+    .flags = MP_TYPE_FLAG_BINDS_SELF | MP_TYPE_FLAG_BUILTIN_FUN,
     .name = MP_QSTR_function,
     .call = fun_builtin_3_call,
     .unary_op = mp_generic_unary_op,
@@ -130,6 +134,7 @@ STATIC mp_obj_t fun_builtin_var_call(mp_obj_t self_in, size_t n_args, size_t n_k
 
 const mp_obj_type_t mp_type_fun_builtin_var = {
     { &mp_type_type },
+    .flags = MP_TYPE_FLAG_BINDS_SELF | MP_TYPE_FLAG_BUILTIN_FUN,
     .name = MP_QSTR_function,
     .call = fun_builtin_var_call,
     .unary_op = mp_generic_unary_op,
@@ -355,6 +360,7 @@ void mp_obj_fun_bc_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
 
 const mp_obj_type_t mp_type_fun_bc = {
     { &mp_type_type },
+    .flags = MP_TYPE_FLAG_BINDS_SELF,
     .name = MP_QSTR_function,
     #if MICROPY_CPYTHON_COMPAT
     .print = fun_bc_print,
@@ -406,6 +412,7 @@ STATIC mp_obj_t fun_native_call(mp_obj_t self_in, size_t n_args, size_t n_kw, co
 
 STATIC const mp_obj_type_t mp_type_fun_native = {
     { &mp_type_type },
+    .flags = MP_TYPE_FLAG_BINDS_SELF,
     .name = MP_QSTR_function,
     .call = fun_native_call,
     .unary_op = mp_generic_unary_op,
@@ -513,6 +520,7 @@ STATIC mp_obj_t fun_asm_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const
 
 STATIC const mp_obj_type_t mp_type_fun_asm = {
     { &mp_type_type },
+    .flags = MP_TYPE_FLAG_BINDS_SELF,
     .name = MP_QSTR_function,
     .call = fun_asm_call,
     .unary_op = mp_generic_unary_op,
diff --git a/py/objgenerator.c b/py/objgenerator.c
index 5e140ba234474..543685fac7860 100644
--- a/py/objgenerator.c
+++ b/py/objgenerator.c
@@ -73,6 +73,7 @@ STATIC mp_obj_t gen_wrap_call(mp_obj_t self_in, size_t n_args, size_t n_kw, cons
 
 const mp_obj_type_t mp_type_gen_wrap = {
     { &mp_type_type },
+    .flags = MP_TYPE_FLAG_BINDS_SELF,
     .name = MP_QSTR_generator,
     .call = gen_wrap_call,
     .unary_op = mp_generic_unary_op,
@@ -126,6 +127,7 @@ STATIC mp_obj_t native_gen_wrap_call(mp_obj_t self_in, size_t n_args, size_t n_k
 
 const mp_obj_type_t mp_type_native_gen_wrap = {
     { &mp_type_type },
+    .flags = MP_TYPE_FLAG_BINDS_SELF,
     .name = MP_QSTR_generator,
     .call = native_gen_wrap_call,
     .unary_op = mp_generic_unary_op,
diff --git a/py/runtime.c b/py/runtime.c
index 157bc74a8dfb4..78da386919532 100644
--- a/py/runtime.c
+++ b/py/runtime.c
@@ -993,6 +993,7 @@ STATIC mp_obj_t checked_fun_call(mp_obj_t self_in, size_t n_args, size_t n_kw, c
 
 STATIC const mp_obj_type_t mp_type_checked_fun = {
     { &mp_type_type },
+    .flags = MP_TYPE_FLAG_BINDS_SELF,
     .name = MP_QSTR_function,
     .call = checked_fun_call,
 };
@@ -1011,49 +1012,54 @@ STATIC mp_obj_t mp_obj_new_checked_fun(const mp_obj_type_t *type, mp_obj_t fun)
 // and put the result in the dest[] array for a possible method call.
 // Conversion means dealing with static/class methods, callables, and values.
 // see http://docs.python.org/3/howto/descriptor.html
+// and also https://mail.python.org/pipermail/python-dev/2015-March/138950.html
 void mp_convert_member_lookup(mp_obj_t self, const mp_obj_type_t *type, mp_obj_t member, mp_obj_t *dest) {
-    if (mp_obj_is_type(member, &mp_type_staticmethod)) {
-        // return just the function
-        dest[0] = ((mp_obj_static_class_method_t *)MP_OBJ_TO_PTR(member))->fun;
-    } else if (mp_obj_is_type(member, &mp_type_classmethod)) {
-        // return a bound method, with self being the type of this object
-        // this type should be the type of the original instance, not the base
-        // type (which is what is passed in the 'type' argument to this function)
-        if (self != MP_OBJ_NULL) {
-            type = mp_obj_get_type(self);
-        }
-        dest[0] = ((mp_obj_static_class_method_t *)MP_OBJ_TO_PTR(member))->fun;
-        dest[1] = MP_OBJ_FROM_PTR(type);
-    } else if (mp_obj_is_type(member, &mp_type_type)) {
-        // Don't try to bind types (even though they're callable)
-        dest[0] = member;
-    } else if (mp_obj_is_fun(member)
-               || (mp_obj_is_obj(member)
-                   && (((mp_obj_base_t *)MP_OBJ_TO_PTR(member))->type->name == MP_QSTR_closure
-                       || ((mp_obj_base_t *)MP_OBJ_TO_PTR(member))->type->name == MP_QSTR_generator))) {
-        // only functions, closures and generators objects can be bound to self
-        #if MICROPY_BUILTIN_METHOD_CHECK_SELF_ARG
+    if (mp_obj_is_obj(member)) {
         const mp_obj_type_t *m_type = ((mp_obj_base_t *)MP_OBJ_TO_PTR(member))->type;
-        if (self == MP_OBJ_NULL
-            && (m_type == &mp_type_fun_builtin_0
-                || m_type == &mp_type_fun_builtin_1
-                || m_type == &mp_type_fun_builtin_2
-                || m_type == &mp_type_fun_builtin_3
-                || m_type == &mp_type_fun_builtin_var)
-            && type != &mp_type_object) {
-            // we extracted a builtin method without a first argument, so we must
-            // wrap this function in a type checker
-            // Note that object will do its own checking so shouldn't be wrapped.
-            dest[0] = mp_obj_new_checked_fun(type, member);
-        } else
-        #endif
-        {
-            // return a bound method, with self being this object
+        if (m_type->flags & MP_TYPE_FLAG_BINDS_SELF) {
+            // `member` is a function that binds self as its first argument.
+            if (m_type->flags & MP_TYPE_FLAG_BUILTIN_FUN) {
+                // `member` is a built-in function, which has special behaviour.
+                if (mp_obj_is_instance_type(type)) {
+                    // Built-in functions on user types always behave like a staticmethod.
+                    dest[0] = member;
+                }
+                #if MICROPY_BUILTIN_METHOD_CHECK_SELF_ARG
+                else if (self == MP_OBJ_NULL && type != &mp_type_object) {
+                    // `member` is a built-in method without a first argument, so wrap
+                    // it in a type checker that will check self when it's supplied.
+                    // Note that object will do its own checking so shouldn't be wrapped.
+                    dest[0] = mp_obj_new_checked_fun(type, member);
+                }
+                #endif
+                else {
+                    // Return a (built-in) bound method, with self being this object.
+                    dest[0] = member;
+                    dest[1] = self;
+                }
+            } else {
+                // Return a bound method, with self being this object.
+                dest[0] = member;
+                dest[1] = self;
+            }
+        } else if (m_type == &mp_type_staticmethod) {
+            // `member` is a staticmethod, return the function that it wraps.
+            dest[0] = ((mp_obj_static_class_method_t *)MP_OBJ_TO_PTR(member))->fun;
+        } else if (m_type == &mp_type_classmethod) {
+            // `member` is a classmethod, return a bound method with self being the type of
+            // this object.  This type should be the type of the original instance, not the
+            // base type (which is what is passed in the `type` argument to this function).
+            if (self != MP_OBJ_NULL) {
+                type = mp_obj_get_type(self);
+            }
+            dest[0] = ((mp_obj_static_class_method_t *)MP_OBJ_TO_PTR(member))->fun;
+            dest[1] = MP_OBJ_FROM_PTR(type);
+        } else {
+            // `member` is a value, so just return that value.
             dest[0] = member;
-            dest[1] = self;
         }
     } else {
-        // class member is a value, so just return that value
+        // `member` is a value, so just return that value.
         dest[0] = member;
     }
 }
diff --git a/tests/basics/class_bind_self.py b/tests/basics/class_bind_self.py
index 16e4f5ac95ade..813f876446ef2 100644
--- a/tests/basics/class_bind_self.py
+++ b/tests/basics/class_bind_self.py
@@ -40,11 +40,18 @@ def f4(self, arg): # generator
 print(c.f3())
 print(next(c.f4(4)))
 print(c.f5(5))
-#print(c.f6(-6)) not working in uPy
+print(c.f6(-6))
 print(c.f7(7))
 print(c.f8(8))
 print(c.f9(9))
 
+# test calling the functions accessed via the class itself
+print(C.f5(10))
+print(C.f6(-11))
+print(C.f7(12))
+print(C.f8(13))
+print(C.f9(14))
+
 # not working in uPy
 #class C(list):
 #    # this acts like a method and binds self

From 95ec0debec1064695b9b0ecdbfa2146f17f898bb Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Wed, 1 Jul 2020 15:05:03 +1000
Subject: [PATCH 0140/3533] stm32/mboot: Remove the use of timeout in
 DFU_GETSTATUS.

This is treated more like a "delay before continuing" in the spec and
official tools and does not appear to be really needed.  In particular,
downloading firmware is much slower with non-zero timeouts because the host
must pause by the timeout between sending each DFU_GETSTATUS to poll for
download/erase complete.
---
 ports/stm32/mboot/main.c | 29 +++--------------------------
 1 file changed, 3 insertions(+), 26 deletions(-)

diff --git a/ports/stm32/mboot/main.c b/ports/stm32/mboot/main.c
index ba0c35b8bfe4c..03620e6a3bdb2 100644
--- a/ports/stm32/mboot/main.c
+++ b/ports/stm32/mboot/main.c
@@ -800,28 +800,6 @@ static void dfu_init(void) {
     dfu_context.addr = 0x08000000;
 }
 
-// The DFU_GETSTATUS response before dfu_process_dnload is run should include the needed timeout adjustments
-static size_t get_timeout_ms(void) {
-    if (dfu_context.wBlockNum == 0) {
-        // download control commands
-        if (dfu_context.wLength >= 1 && dfu_context.buf[0] == DFU_CMD_DNLOAD_ERASE) {
-            if (dfu_context.wLength == 1) {
-                // mass erase command
-                // It takes 10-12 seconds to erase a 2MB stm part. Extrapolate a suitable timeout from this.
-                return APPLICATION_FLASH_LENGTH / 170;
-
-            } else if (dfu_context.wLength == 5) {
-                // erase page command
-                return 500;
-            }
-        }
-    } else if (dfu_context.wBlockNum > 1) {
-        // write data to memory command
-        return 500;
-    }
-    return 0;
-}
-
 static int dfu_process_dnload(void) {
     int ret = -1;
     if (dfu_context.wBlockNum == 0) {
@@ -922,11 +900,10 @@ static int dfu_handle_tx(int cmd, int arg, int len, uint8_t *buf, int max_len) {
             default:
                 dfu_context.state = DFU_STATE_BUSY;
         }
-        size_t timeout_ms = get_timeout_ms();
         buf[0] = dfu_context.status;          // bStatus
-        buf[1] = (timeout_ms >> 16) & 0xFF;   // bwPollTimeout (ms)
-        buf[2] = (timeout_ms >> 8) & 0xFF;    // bwPollTimeout (ms)
-        buf[3] = timeout_ms & 0xFF;           // bwPollTimeout (ms)
+        buf[1] = 0;                           // bwPollTimeout_lsb (ms)
+        buf[2] = 0;                           // bwPollTimeout     (ms)
+        buf[3] = 0;                           // bwPollTimeout_msb (ms)
         buf[4] = dfu_context.state;           // bState
         buf[5] = dfu_context.error;           // iString
         // Clear errors now they've been sent

From 494bcad8aba37966297470419b3c690a362495bb Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Wed, 1 Jul 2020 15:06:14 +1000
Subject: [PATCH 0141/3533] stm32/mboot: Disable polling mode by default and
 use IRQ mode instead.

Polling mode will cause failures with the mass-erase command due to USB
timeouts, because the USB IRQs are not being serviced.  Swiching from
polling to IRQ mode fixes this because the USB IRQs can be serviced between
page erases.

Note that when the flash is being programmed or erased the MCU is halted
and cannot respond to USB IRQs, because mboot runs from flash, as opposed
to the built-in bootloader which is in system ROM.  But the maximum delay
in responding to an IRQ is the time taken to erase a single page, about
100ms for large pages, and that is short enough that the USB does not
timeout on the host side.

Recent tests have shown that in the current mboot code IRQ mode is pretty
much the same speed as polling mode (within timing error), code size is
slightly reduced in IRQ mode, and IRQ mode idles at about half of the power
consumption as polling mode.
---
 ports/stm32/mboot/main.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/ports/stm32/mboot/main.c b/ports/stm32/mboot/main.c
index 03620e6a3bdb2..99187e3ef8406 100644
--- a/ports/stm32/mboot/main.c
+++ b/ports/stm32/mboot/main.c
@@ -38,14 +38,12 @@
 #include "powerctrl.h"
 #include "dfu.h"
 
-// Using polling is about 10% faster than not using it (and using IRQ instead)
-// This DFU code with polling runs in about 70% of the time of the ST bootloader
+// This option selects whether to use explicit polling or IRQs for USB events.
+// In some test cases polling mode can run slightly faster, but it uses more power.
+// Polling mode will also cause failures with the mass-erase command because USB
+// events will not be serviced for the duration of the mass erase.
 // With STM32WB MCUs only non-polling/IRQ mode is supported.
-#if defined(STM32WB)
 #define USE_USB_POLLING (0)
-#else
-#define USE_USB_POLLING (1)
-#endif
 
 // Using cache probably won't make it faster because we run at a low frequency, and best
 // to keep the MCU config as minimal as possible.

From 07f181a216dc2fe323f0511cf3a5f9dc37545c22 Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Wed, 1 Jul 2020 15:01:16 +1000
Subject: [PATCH 0142/3533] Revert "tools/pydfu.py: Respect longer timeouts
 requested by DFU dev..."

This reverts commit 4d6f60d4286b3e6ea8c9fb0141ba13e4978882b6.

This implementation used the timeout as a maximum amount of time needed for
the operation, when actually the spec and other tools suggest that it's the
minumum delay needed between subsequent USB transfers.
---
 tools/pydfu.py | 52 ++++++++++----------------------------------------
 1 file changed, 10 insertions(+), 42 deletions(-)

diff --git a/tools/pydfu.py b/tools/pydfu.py
index 8b8e338981b49..030f56bf852e3 100755
--- a/tools/pydfu.py
+++ b/tools/pydfu.py
@@ -22,8 +22,6 @@
 import usb.core
 import usb.util
 import zlib
-import time
-import math
 
 # VID/PID
 __VID = 0x0483
@@ -31,8 +29,6 @@
 
 # USB request __TIMEOUT
 __TIMEOUT = 4000
-__NEXT_TIMEOUT = 0
-__STATUS_TIMEOUT = 20000
 
 # DFU commands
 __DFU_DETACH = 0
@@ -99,13 +95,6 @@ def get_string(dev, index):
         return usb.util.get_string(dev, index)
 
 
-def timeout():
-    global __NEXT_TIMEOUT
-    t = max(__TIMEOUT, __NEXT_TIMEOUT)
-    __NEXT_TIMEOUT = 0
-    return int(math.ceil(t))
-
-
 def find_dfu_cfg_descr(descr):
     if len(descr) == 9 and descr[0] == 9 and descr[1] == _DFU_DESCRIPTOR_TYPE:
         nt = collections.namedtuple(
@@ -161,32 +150,17 @@ def init():
 
 def abort_request():
     """Sends an abort request."""
-    __dev.ctrl_transfer(0x21, __DFU_ABORT, 0, __DFU_INTERFACE, None, timeout())
+    __dev.ctrl_transfer(0x21, __DFU_ABORT, 0, __DFU_INTERFACE, None, __TIMEOUT)
 
 
 def clr_status():
     """Clears any error status (perhaps left over from a previous session)."""
-    __dev.ctrl_transfer(0x21, __DFU_CLRSTATUS, 0, __DFU_INTERFACE, None, timeout())
+    __dev.ctrl_transfer(0x21, __DFU_CLRSTATUS, 0, __DFU_INTERFACE, None, __TIMEOUT)
 
 
 def get_status():
     """Get the status of the last operation."""
-    _timeout = time.time() + max(__STATUS_TIMEOUT, timeout())
-    stat = None
-    while time.time() < _timeout:
-        try:
-            stat = __dev.ctrl_transfer(
-                0xA1, __DFU_GETSTATUS, 0, __DFU_INTERFACE, 6, int(_timeout - time.time())
-            )
-            break
-        except usb.core.USBError as ex:
-            # If the firmware is blocked the transfer can timeout much quicker than
-            # the supplied timeout. If so, retry until the overall timeout is used up.
-            if "Operation timed out" not in str(ex):
-                raise
-
-    if stat is None:
-        raise SystemExit("DFU: get_status timed out")
+    stat = __dev.ctrl_transfer(0xA1, __DFU_GETSTATUS, 0, __DFU_INTERFACE, 6, 20000)
 
     # firmware can provide an optional string for any error
     if stat[5]:
@@ -194,12 +168,6 @@ def get_status():
         if message:
             print(message)
 
-    # firmware can send a longer timeout request while it's performing slow operation eg. erase
-    timeout_ms = stat[1] << 16 | stat[2] << 8 | stat[3]
-    if timeout_ms:
-        global __NEXT_TIMEOUT
-        __NEXT_TIMEOUT = __TIMEOUT + timeout_ms
-
     return stat[4]
 
 
@@ -212,9 +180,9 @@ def check_status(stage, expected):
 def mass_erase():
     """Performs a MASS erase (i.e. erases the entire device)."""
     # Send DNLOAD with first byte=0x41
-    __dev.ctrl_transfer(0x21, __DFU_DNLOAD, 0, __DFU_INTERFACE, "\x41", timeout())
+    __dev.ctrl_transfer(0x21, __DFU_DNLOAD, 0, __DFU_INTERFACE, "\x41", __TIMEOUT)
 
-    # Execute erase and wait until complete
+    # Execute last command
     check_status("erase", __DFU_STATE_DFU_DOWNLOAD_BUSY)
 
     # Check command state
@@ -228,7 +196,7 @@ def page_erase(addr):
 
     # Send DNLOAD with first byte=0x41 and page address
     buf = struct.pack("<BI", 0x41, addr)
-    __dev.ctrl_transfer(0x21, __DFU_DNLOAD, 0, __DFU_INTERFACE, buf, timeout())
+    __dev.ctrl_transfer(0x21, __DFU_DNLOAD, 0, __DFU_INTERFACE, buf, __TIMEOUT)
 
     # Execute last command
     check_status("erase", __DFU_STATE_DFU_DOWNLOAD_BUSY)
@@ -241,7 +209,7 @@ def set_address(addr):
     """Sets the address for the next operation."""
     # Send DNLOAD with first byte=0x21 and page address
     buf = struct.pack("<BI", 0x21, addr)
-    __dev.ctrl_transfer(0x21, __DFU_DNLOAD, 0, __DFU_INTERFACE, buf, timeout())
+    __dev.ctrl_transfer(0x21, __DFU_DNLOAD, 0, __DFU_INTERFACE, buf, __TIMEOUT)
 
     # Execute last command
     check_status("set address", __DFU_STATE_DFU_DOWNLOAD_BUSY)
@@ -275,7 +243,7 @@ def write_memory(addr, buf, progress=None, progress_addr=0, progress_size=0):
         # Send DNLOAD with fw data
         chunk = min(__cfg_descr.wTransferSize, xfer_total - xfer_bytes)
         __dev.ctrl_transfer(
-            0x21, __DFU_DNLOAD, 2, __DFU_INTERFACE, buf[xfer_bytes : xfer_bytes + chunk], timeout()
+            0x21, __DFU_DNLOAD, 2, __DFU_INTERFACE, buf[xfer_bytes : xfer_bytes + chunk], __TIMEOUT
         )
 
         # Execute last command
@@ -299,7 +267,7 @@ def write_page(buf, xfer_offset):
     set_address(xfer_base + xfer_offset)
 
     # Send DNLOAD with fw data
-    __dev.ctrl_transfer(0x21, __DFU_DNLOAD, 2, __DFU_INTERFACE, buf, timeout())
+    __dev.ctrl_transfer(0x21, __DFU_DNLOAD, 2, __DFU_INTERFACE, buf, __TIMEOUT)
 
     # Execute last command
     check_status("write memory", __DFU_STATE_DFU_DOWNLOAD_BUSY)
@@ -317,7 +285,7 @@ def exit_dfu():
     set_address(0x08000000)
 
     # Send DNLOAD with 0 length to exit DFU
-    __dev.ctrl_transfer(0x21, __DFU_DNLOAD, 0, __DFU_INTERFACE, None, timeout())
+    __dev.ctrl_transfer(0x21, __DFU_DNLOAD, 0, __DFU_INTERFACE, None, __TIMEOUT)
 
     try:
         # Execute last command

From 27abac95d87b69f4282e2ca21ab19eff7bf6012b Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Tue, 9 Jun 2020 16:45:17 +1000
Subject: [PATCH 0143/3533] unix: Make manifest selection match other ports.

Changes are:
- The default manifest.py is moved to the variants directory (it's in
  "boards" in other ports).
- The coverage variant now uses a custom manifest in its variant directory
  to add frzmpy/frzstr.
- The frzmpy/frzstr tests are moved to variants/coverage/.
---
 ports/unix/Makefile                                             | 2 +-
 ports/unix/manifest_coverage.py                                 | 2 --
 .../{coverage-frzmpy => variants/coverage/frzmpy}/frzmpy1.py    | 0
 .../{coverage-frzmpy => variants/coverage/frzmpy}/frzmpy2.py    | 0
 .../coverage/frzmpy}/frzmpy_pkg1/__init__.py                    | 0
 .../coverage/frzmpy}/frzmpy_pkg2/mod.py                         | 0
 .../{coverage-frzmpy => variants/coverage/frzmpy}/frzqstr.py    | 0
 .../{coverage-frzstr => variants/coverage/frzstr}/frzstr1.py    | 0
 .../coverage/frzstr}/frzstr_pkg1/__init__.py                    | 0
 .../coverage/frzstr}/frzstr_pkg2/mod.py                         | 0
 ports/unix/variants/coverage/manifest.py                        | 2 ++
 ports/unix/variants/coverage/mpconfigvariant.mk                 | 2 +-
 ports/unix/{ => variants}/manifest.py                           | 0
 13 files changed, 4 insertions(+), 4 deletions(-)
 delete mode 100644 ports/unix/manifest_coverage.py
 rename ports/unix/{coverage-frzmpy => variants/coverage/frzmpy}/frzmpy1.py (100%)
 rename ports/unix/{coverage-frzmpy => variants/coverage/frzmpy}/frzmpy2.py (100%)
 rename ports/unix/{coverage-frzmpy => variants/coverage/frzmpy}/frzmpy_pkg1/__init__.py (100%)
 rename ports/unix/{coverage-frzmpy => variants/coverage/frzmpy}/frzmpy_pkg2/mod.py (100%)
 rename ports/unix/{coverage-frzmpy => variants/coverage/frzmpy}/frzqstr.py (100%)
 rename ports/unix/{coverage-frzstr => variants/coverage/frzstr}/frzstr1.py (100%)
 rename ports/unix/{coverage-frzstr => variants/coverage/frzstr}/frzstr_pkg1/__init__.py (100%)
 rename ports/unix/{coverage-frzstr => variants/coverage/frzstr}/frzstr_pkg2/mod.py (100%)
 create mode 100644 ports/unix/variants/coverage/manifest.py
 rename ports/unix/{ => variants}/manifest.py (100%)

diff --git a/ports/unix/Makefile b/ports/unix/Makefile
index ec14166149ba8..3e2fa63a16c3b 100644
--- a/ports/unix/Makefile
+++ b/ports/unix/Makefile
@@ -14,7 +14,7 @@ include ../../py/mkenv.mk
 include $(VARIANT_DIR)/mpconfigvariant.mk
 
 # use FROZEN_MANIFEST for new projects, others are legacy
-FROZEN_MANIFEST ?= manifest.py
+FROZEN_MANIFEST ?= variants/manifest.py
 FROZEN_DIR =
 FROZEN_MPY_DIR =
 
diff --git a/ports/unix/manifest_coverage.py b/ports/unix/manifest_coverage.py
deleted file mode 100644
index 0c32d08578e94..0000000000000
--- a/ports/unix/manifest_coverage.py
+++ /dev/null
@@ -1,2 +0,0 @@
-freeze_as_str('coverage-frzstr')
-freeze_as_mpy('coverage-frzmpy')
diff --git a/ports/unix/coverage-frzmpy/frzmpy1.py b/ports/unix/variants/coverage/frzmpy/frzmpy1.py
similarity index 100%
rename from ports/unix/coverage-frzmpy/frzmpy1.py
rename to ports/unix/variants/coverage/frzmpy/frzmpy1.py
diff --git a/ports/unix/coverage-frzmpy/frzmpy2.py b/ports/unix/variants/coverage/frzmpy/frzmpy2.py
similarity index 100%
rename from ports/unix/coverage-frzmpy/frzmpy2.py
rename to ports/unix/variants/coverage/frzmpy/frzmpy2.py
diff --git a/ports/unix/coverage-frzmpy/frzmpy_pkg1/__init__.py b/ports/unix/variants/coverage/frzmpy/frzmpy_pkg1/__init__.py
similarity index 100%
rename from ports/unix/coverage-frzmpy/frzmpy_pkg1/__init__.py
rename to ports/unix/variants/coverage/frzmpy/frzmpy_pkg1/__init__.py
diff --git a/ports/unix/coverage-frzmpy/frzmpy_pkg2/mod.py b/ports/unix/variants/coverage/frzmpy/frzmpy_pkg2/mod.py
similarity index 100%
rename from ports/unix/coverage-frzmpy/frzmpy_pkg2/mod.py
rename to ports/unix/variants/coverage/frzmpy/frzmpy_pkg2/mod.py
diff --git a/ports/unix/coverage-frzmpy/frzqstr.py b/ports/unix/variants/coverage/frzmpy/frzqstr.py
similarity index 100%
rename from ports/unix/coverage-frzmpy/frzqstr.py
rename to ports/unix/variants/coverage/frzmpy/frzqstr.py
diff --git a/ports/unix/coverage-frzstr/frzstr1.py b/ports/unix/variants/coverage/frzstr/frzstr1.py
similarity index 100%
rename from ports/unix/coverage-frzstr/frzstr1.py
rename to ports/unix/variants/coverage/frzstr/frzstr1.py
diff --git a/ports/unix/coverage-frzstr/frzstr_pkg1/__init__.py b/ports/unix/variants/coverage/frzstr/frzstr_pkg1/__init__.py
similarity index 100%
rename from ports/unix/coverage-frzstr/frzstr_pkg1/__init__.py
rename to ports/unix/variants/coverage/frzstr/frzstr_pkg1/__init__.py
diff --git a/ports/unix/coverage-frzstr/frzstr_pkg2/mod.py b/ports/unix/variants/coverage/frzstr/frzstr_pkg2/mod.py
similarity index 100%
rename from ports/unix/coverage-frzstr/frzstr_pkg2/mod.py
rename to ports/unix/variants/coverage/frzstr/frzstr_pkg2/mod.py
diff --git a/ports/unix/variants/coverage/manifest.py b/ports/unix/variants/coverage/manifest.py
new file mode 100644
index 0000000000000..6111050884222
--- /dev/null
+++ b/ports/unix/variants/coverage/manifest.py
@@ -0,0 +1,2 @@
+freeze_as_str("frzstr")
+freeze_as_mpy("frzmpy")
diff --git a/ports/unix/variants/coverage/mpconfigvariant.mk b/ports/unix/variants/coverage/mpconfigvariant.mk
index ddb5027a97ef7..66e694e0a9ea0 100644
--- a/ports/unix/variants/coverage/mpconfigvariant.mk
+++ b/ports/unix/variants/coverage/mpconfigvariant.mk
@@ -11,7 +11,7 @@ CFLAGS += \
 
 LDFLAGS += -fprofile-arcs -ftest-coverage
 
-FROZEN_MANIFEST = manifest_coverage.py
+FROZEN_MANIFEST ?= $(VARIANT_DIR)/manifest.py
 
 MICROPY_ROM_TEXT_COMPRESSION = 1
 MICROPY_VFS_FAT = 1
diff --git a/ports/unix/manifest.py b/ports/unix/variants/manifest.py
similarity index 100%
rename from ports/unix/manifest.py
rename to ports/unix/variants/manifest.py

From 4050281311744ae5946aa1faec8aa75339bcab2b Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Tue, 9 Jun 2020 16:45:30 +1000
Subject: [PATCH 0144/3533] unix: Enable uasyncio on dev variant.

---
 ports/unix/variants/dev/manifest.py        | 3 +++
 ports/unix/variants/dev/mpconfigvariant.h  | 4 ++++
 ports/unix/variants/dev/mpconfigvariant.mk | 2 ++
 3 files changed, 9 insertions(+)
 create mode 100644 ports/unix/variants/dev/manifest.py

diff --git a/ports/unix/variants/dev/manifest.py b/ports/unix/variants/dev/manifest.py
new file mode 100644
index 0000000000000..92a681116a687
--- /dev/null
+++ b/ports/unix/variants/dev/manifest.py
@@ -0,0 +1,3 @@
+include("$(PORT_DIR)/variants/manifest.py")
+
+include("$(MPY_DIR)/extmod/uasyncio/manifest.py")
diff --git a/ports/unix/variants/dev/mpconfigvariant.h b/ports/unix/variants/dev/mpconfigvariant.h
index eb65134717c6d..c2b959572abaa 100644
--- a/ports/unix/variants/dev/mpconfigvariant.h
+++ b/ports/unix/variants/dev/mpconfigvariant.h
@@ -30,3 +30,7 @@
 
 #define MICROPY_PY_SYS_SETTRACE (1)
 #define MICROPY_PY_URANDOM_EXTRA_FUNCS (1)
+
+#ifndef MICROPY_PY_UASYNCIO
+#define MICROPY_PY_UASYNCIO (1)
+#endif
diff --git a/ports/unix/variants/dev/mpconfigvariant.mk b/ports/unix/variants/dev/mpconfigvariant.mk
index bbd30b6238248..8a63b233d814e 100644
--- a/ports/unix/variants/dev/mpconfigvariant.mk
+++ b/ports/unix/variants/dev/mpconfigvariant.mk
@@ -1,5 +1,7 @@
 PROG ?= micropython-dev
 
+FROZEN_MANIFEST ?= $(VARIANT_DIR)/manifest.py
+
 MICROPY_ROM_TEXT_COMPRESSION = 1
 
 MICROPY_PY_BLUETOOTH = 1

From 9dfb4ae6aacd5eb4317f7a474b9da00c1cec9088 Mon Sep 17 00:00:00 2001
From: Glenn Ruben Bakke <glennbakke@gmail.com>
Date: Thu, 25 Jun 2020 22:55:40 +0200
Subject: [PATCH 0145/3533] nrf/bluetooth/ble_uart: Fix implicit declaration of
 function.

mp_keyboard_interrupt() triggers a compiler error because the function is
implicitly declared.  This commit adds "py/runtime.h" to the includes.

Fixes issue #5732.
---
 ports/nrf/drivers/bluetooth/ble_uart.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/nrf/drivers/bluetooth/ble_uart.c b/ports/nrf/drivers/bluetooth/ble_uart.c
index b94780e26011b..f6bc7f719c63c 100644
--- a/ports/nrf/drivers/bluetooth/ble_uart.c
+++ b/ports/nrf/drivers/bluetooth/ble_uart.c
@@ -31,6 +31,7 @@
 #include "ringbuffer.h"
 #include "mphalport.h"
 #include "lib/utils/interrupt_char.h"
+#include "py/runtime.h"
 
 #if MICROPY_PY_BLE_NUS
 

From fc1f22a097ac2c6eb418605f36b53936e5138451 Mon Sep 17 00:00:00 2001
From: Glenn Ruben Bakke <glennbakke@gmail.com>
Date: Thu, 25 Jun 2020 23:06:00 +0200
Subject: [PATCH 0146/3533] nrf/bluetooth: Handle data length update request.

The Bluetooth link gets disconnected when connecting from a PC after 30-40
seconds.  This commit adds handling of the data length update request.  The
data length parameter pointer is set to NULL in the reply,  letting the
SoftDevice automatically set values and use them in the data length update
procedure.
---
 ports/nrf/drivers/bluetooth/ble_drv.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/ports/nrf/drivers/bluetooth/ble_drv.c b/ports/nrf/drivers/bluetooth/ble_drv.c
index 47f7f98885a91..1a64cdfbd24b9 100644
--- a/ports/nrf/drivers/bluetooth/ble_drv.c
+++ b/ports/nrf/drivers/bluetooth/ble_drv.c
@@ -1131,6 +1131,12 @@ static void ble_evt_handler(ble_evt_t * p_ble_evt) {
             BLE_DRIVER_LOG("GATTS EVT EXCHANGE MTU REQUEST\n");
             (void)sd_ble_gatts_exchange_mtu_reply(p_ble_evt->evt.gatts_evt.conn_handle, 23); // MAX MTU size
             break;
+
+        case BLE_GAP_EVT_DATA_LENGTH_UPDATE_REQUEST:
+            BLE_DRIVER_LOG("BLE GAP EVT DATA LENGTH UPDATE REQUEST\n");
+            sd_ble_gap_data_length_update(p_ble_evt->evt.gap_evt.conn_handle, NULL, NULL);
+            break;
+
 #endif // (BLUETOOTH_SD == 132) || (BLUETOOTH_SD == 140)
 
         default:

From ab0c14dba014d0ac27b8a5472bd795809a9be885 Mon Sep 17 00:00:00 2001
From: Glenn Ruben Bakke <glennbakke@gmail.com>
Date: Thu, 25 Jun 2020 23:32:28 +0200
Subject: [PATCH 0147/3533] nrf/bluetooth/ble_uart: Add mp_hal_stdio_poll
 function.

This adds support for enabling MICROPY_PY_SYS_STDFILES when running UART
over Bluetooth (NUS).
---
 ports/nrf/drivers/bluetooth/ble_uart.c | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/ports/nrf/drivers/bluetooth/ble_uart.c b/ports/nrf/drivers/bluetooth/ble_uart.c
index f6bc7f719c63c..86cd084746cd0 100644
--- a/ports/nrf/drivers/bluetooth/ble_uart.c
+++ b/ports/nrf/drivers/bluetooth/ble_uart.c
@@ -33,6 +33,10 @@
 #include "lib/utils/interrupt_char.h"
 #include "py/runtime.h"
 
+#if MICROPY_PY_SYS_STDFILES
+#include "py/stream.h"
+#endif
+
 #if MICROPY_PY_BLE_NUS
 
 static ubluepy_uuid_obj_t uuid_obj_service = {
@@ -136,6 +140,17 @@ void mp_hal_stdout_tx_strn_cooked(const char *str, mp_uint_t len) {
     mp_hal_stdout_tx_strn(str, len);
 }
 
+#if MICROPY_PY_SYS_STDFILES
+uintptr_t mp_hal_stdio_poll(uintptr_t poll_flags) {
+    uintptr_t ret = 0;
+    if ((poll_flags & MP_STREAM_POLL_RD) && ble_uart_enabled()
+        && !isBufferEmpty(mp_rx_ring_buffer)) {
+        ret |= MP_STREAM_POLL_RD;
+    }
+    return ret;
+}
+#endif
+
 STATIC void gap_event_handler(mp_obj_t self_in, uint16_t event_id, uint16_t conn_handle, uint16_t length, uint8_t * data) {
     ubluepy_peripheral_obj_t * self = MP_OBJ_TO_PTR(self_in);
 

From 5996bf72f134dd8f1b72ecd20757dcb1c98cfc89 Mon Sep 17 00:00:00 2001
From: Glenn Ruben Bakke <glennbakke@gmail.com>
Date: Thu, 25 Jun 2020 23:41:35 +0200
Subject: [PATCH 0148/3533] nrf/bluetooth/ble_uart: Fix random advertisement
 name.

The storage space of the advertisement name is not declared static, leading
to a random advertisement name.  This commit fixes the issue by declaring
it static.
---
 ports/nrf/drivers/bluetooth/ble_uart.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/nrf/drivers/bluetooth/ble_uart.c b/ports/nrf/drivers/bluetooth/ble_uart.c
index 86cd084746cd0..b2e79ba44d65a 100644
--- a/ports/nrf/drivers/bluetooth/ble_uart.c
+++ b/ports/nrf/drivers/bluetooth/ble_uart.c
@@ -228,7 +228,7 @@ void ble_uart_init0(void) {
 
     ble_uart_peripheral.conn_handle = 0xFFFF;
 
-    char device_name[] = "mpus";
+    static char device_name[] = "mpus";
 
     mp_obj_t service_list = mp_obj_new_list(0, NULL);
     mp_obj_list_append(service_list, MP_OBJ_FROM_PTR(&ble_uart_service));

From f22f7b285e69aa05ce2dcf1e26de626dd1b1599d Mon Sep 17 00:00:00 2001
From: Glenn Ruben Bakke <glennbakke@gmail.com>
Date: Thu, 25 Jun 2020 23:49:12 +0200
Subject: [PATCH 0149/3533] nrf/bluetooth/ble_uart: Swap end character on
 cooked strings.

Changing line ending character of cooked strings makes rshell/pyboard.py
work correctly over Bluetooth socat/pts devices.
---
 ports/nrf/drivers/bluetooth/ble_uart.c | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/ports/nrf/drivers/bluetooth/ble_uart.c b/ports/nrf/drivers/bluetooth/ble_uart.c
index b2e79ba44d65a..64e3a05f93192 100644
--- a/ports/nrf/drivers/bluetooth/ble_uart.c
+++ b/ports/nrf/drivers/bluetooth/ble_uart.c
@@ -136,8 +136,25 @@ void mp_hal_stdout_tx_strn(const char *str, size_t len) {
     }
 }
 
+void ble_uart_tx_char(char c) {
+    // Not connected: drop output
+    if (!ble_uart_enabled()) return;
+
+    ubluepy_characteristic_obj_t * p_char = &ble_uart_char_tx;
+
+    ble_drv_attr_s_notify(p_char->p_service->p_periph->conn_handle,
+                          p_char->handle,
+                          1,
+                          (uint8_t *)&c);
+}
+
 void mp_hal_stdout_tx_strn_cooked(const char *str, mp_uint_t len) {
-    mp_hal_stdout_tx_strn(str, len);
+    for (const char *top = str + len; str < top; str++) {
+        if (*str == '\n') {
+            ble_uart_tx_char('\r');
+        }
+        ble_uart_tx_char(*str);
+    }
 }
 
 #if MICROPY_PY_SYS_STDFILES

From c2317a3a8d5f184de2f816078d91be699274b94e Mon Sep 17 00:00:00 2001
From: Glenn Ruben Bakke <glennbakke@gmail.com>
Date: Sat, 27 Jun 2020 13:07:39 +0200
Subject: [PATCH 0150/3533] nrf/Makefile: Disable ROM text compression when
 compiling for debug.

When compiling for debug (-O0) the .text segment cannot fit the flash
region when MICROPY_ROM_TEXT_COMPRESSION=1, because the compiler does not
optimise away the large if-else chain used to select the correct compressed
string.

This commit enforces MICROPY_ROM_TEXT_COMPRESSION=0 when compiling for
debug (DEBUG=1).
---
 ports/nrf/Makefile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ports/nrf/Makefile b/ports/nrf/Makefile
index 23d5cd20d0d00..8f73336e0b1e8 100644
--- a/ports/nrf/Makefile
+++ b/ports/nrf/Makefile
@@ -39,7 +39,9 @@ endif
 QSTR_DEFS = qstrdefsport.h $(BUILD)/pins_qstr.h
 
 # MicroPython feature configurations
+ifeq ($(DEBUG), 0)
 MICROPY_ROM_TEXT_COMPRESSION ?= 1
+endif
 
 # include py core make definitions
 include ../../py/py.mk

From 15574cd665a8e66157aa97447e3869513da81d45 Mon Sep 17 00:00:00 2001
From: Martin Fischer <fischer.carlito@gmail.com>
Date: Thu, 2 Jul 2020 22:19:00 +0200
Subject: [PATCH 0151/3533] nrf: Add support for time.ticks_xxx functions using
 RTC1.

This commit adds time.ticks_ms/us support using RTC1 as the timebase.  It
also adds the time.ticks_add/diff helper functions.  This feature can be
enabled using MICROPY_PY_TIME_TICKS.  If disabled the system uses the
legacy sleep methods and does not have any ticks functions.

In addition support for MICROPY_EVENT_POLL_HOOK was added to the
time.sleep_ms(x) function, making this function more power efficient and
allows support for select.poll/asyncio.  To support this, the RTC's CCR0
was used to schedule a ~1msec event to wakeup the CPU.

Some important notes about the RTC timebase:

- Since the granularity of RTC1's ticks are approx 30usec, time.ticks_us is
not perfect, does not have 1us resolution, but is otherwise quite usable.
For tighter measurments the ticker's 1MHz counter should be used.

- time.ticks_ms(x) should *not* be called in an IRQ with higher prio than
the RTC overflow irq (3).  If so it introduces a race condition and
possibly leads to wrong tick calculations.

See #6171 and #6202.
---
 ports/nrf/main.c                      |   5 +
 ports/nrf/modules/machine/rtcounter.c |   7 ++
 ports/nrf/modules/utime/modutime.c    |   4 +
 ports/nrf/mpconfigport.h              |  10 ++
 ports/nrf/mphalport.c                 | 143 +++++++++++++++++++++++++-
 ports/nrf/mphalport.h                 |  13 ++-
 6 files changed, 174 insertions(+), 8 deletions(-)

diff --git a/ports/nrf/main.c b/ports/nrf/main.c
index 3c5d0a05d87f1..670c88e7cad9d 100644
--- a/ports/nrf/main.c
+++ b/ports/nrf/main.c
@@ -52,6 +52,8 @@
 #include "i2c.h"
 #include "adc.h"
 #include "rtcounter.h"
+#include "mphalport.h"
+
 #if MICROPY_PY_MACHINE_HW_PWM
 #include "pwm.h"
 #endif
@@ -101,6 +103,9 @@ int main(int argc, char **argv) {
 
 
 soft_reset:
+    #if MICROPY_PY_TIME_TICKS
+    rtc1_init_time_ticks();
+    #endif
 
     led_init();
 
diff --git a/ports/nrf/modules/machine/rtcounter.c b/ports/nrf/modules/machine/rtcounter.c
index 5fb28557d8230..c9f907774e6a3 100644
--- a/ports/nrf/modules/machine/rtcounter.c
+++ b/ports/nrf/modules/machine/rtcounter.c
@@ -153,6 +153,13 @@ STATIC mp_obj_t machine_rtc_make_new(const mp_obj_type_t *type, size_t n_args, s
 
     int rtc_id = rtc_find(args[ARG_id].u_obj);
 
+    #if MICROPY_PY_TIME_TICKS
+    if (rtc_id == 1) {
+        // time module uses RTC1, prevent using it
+        mp_raise_ValueError(MP_ERROR_TEXT("RTC1 reserved by time module"));
+    }
+    #endif
+
     // const and non-const part of the RTC object.
     const machine_rtc_obj_t * self = &machine_rtc_obj[rtc_id];
     machine_rtc_config_t *config = self->config;
diff --git a/ports/nrf/modules/utime/modutime.c b/ports/nrf/modules/utime/modutime.c
index 60cdbe4f33140..bb29141011eab 100644
--- a/ports/nrf/modules/utime/modutime.c
+++ b/ports/nrf/modules/utime/modutime.c
@@ -42,6 +42,10 @@ STATIC const mp_rom_map_elem_t time_module_globals_table[] = {
 
     { MP_ROM_QSTR(MP_QSTR_sleep_ms), MP_ROM_PTR(&mp_utime_sleep_ms_obj) },
     { MP_ROM_QSTR(MP_QSTR_sleep_us), MP_ROM_PTR(&mp_utime_sleep_us_obj) },
+    { MP_ROM_QSTR(MP_QSTR_ticks_ms), MP_ROM_PTR(&mp_utime_ticks_ms_obj) },
+    { MP_ROM_QSTR(MP_QSTR_ticks_us), MP_ROM_PTR(&mp_utime_ticks_us_obj) },
+    { MP_ROM_QSTR(MP_QSTR_ticks_add), MP_ROM_PTR(&mp_utime_ticks_add_obj) },
+    { MP_ROM_QSTR(MP_QSTR_ticks_diff), MP_ROM_PTR(&mp_utime_ticks_diff_obj) },
 };
 
 STATIC MP_DEFINE_CONST_DICT(time_module_globals, time_module_globals_table);
diff --git a/ports/nrf/mpconfigport.h b/ports/nrf/mpconfigport.h
index 28076114fe42a..fc34a7cf268df 100644
--- a/ports/nrf/mpconfigport.h
+++ b/ports/nrf/mpconfigport.h
@@ -174,6 +174,9 @@
 #define MICROPY_PY_MACHINE_RTCOUNTER (0)
 #endif
 
+#ifndef MICROPY_PY_TIME_TICKS
+#define MICROPY_PY_TIME_TICKS       (0)
+#endif
 
 #define MICROPY_ENABLE_EMERGENCY_EXCEPTION_BUF   (1)
 #define MICROPY_EMERGENCY_EXCEPTION_BUF_SIZE  (0)
@@ -317,6 +320,13 @@ extern const struct _mp_obj_module_t ble_module;
     /* micro:bit root pointers */ \
     void *async_data[2]; \
 
+#define MICROPY_EVENT_POLL_HOOK \
+    do { \
+        extern void mp_handle_pending(bool); \
+        mp_handle_pending(true); \
+        __WFI(); \
+    } while (0);
+
 #define MP_PLAT_PRINT_STRN(str, len) mp_hal_stdout_tx_strn_cooked(str, len)
 
 // We need to provide a declaration/definition of alloca()
diff --git a/ports/nrf/mphalport.c b/ports/nrf/mphalport.c
index 4469adc80d84f..b8e4c2e4d8b55 100644
--- a/ports/nrf/mphalport.c
+++ b/ports/nrf/mphalport.c
@@ -35,6 +35,121 @@
 #include "nrfx_errors.h"
 #include "nrfx_config.h"
 
+#if MICROPY_PY_TIME_TICKS
+#include "nrfx_rtc.h"
+#include "nrf_clock.h"
+#endif
+
+#if MICROPY_PY_TIME_TICKS
+
+// Use RTC1 for time ticks generation (ms and us) with 32kHz tick resolution
+// and overflow handling in RTC IRQ.
+
+#define RTC_TICK_INCREASE_MSEC (33)
+
+#define RTC_RESCHEDULE_CC(rtc, cc_nr, ticks) \
+    do { \
+        nrfx_rtc_cc_set(&rtc, cc_nr, nrfx_rtc_counter_get(&rtc) + ticks, true); \
+    } while (0);
+
+// RTC overflow irq handling notes:
+// - If has_overflowed is set it could be before or after COUNTER is read.
+//   If before then an adjustment must be made, if after then no adjustment is necessary.
+// - The before case is when COUNTER is very small (because it just overflowed and was set to zero),
+//   the after case is when COUNTER is very large (because it's just about to overflow
+//   but we read it right before it overflows).
+// - The extra check for counter is to distinguish these cases. 1<<23 because it's halfway
+//   between min and max values of COUNTER.
+#define RTC1_GET_TICKS_ATOMIC(rtc, overflows, counter) \
+    do { \
+        rtc.p_reg->INTENCLR = RTC_INTENCLR_OVRFLW_Msk; \
+        overflows = rtc_overflows; \
+        counter = rtc.p_reg->COUNTER; \
+        uint32_t has_overflowed = rtc.p_reg->EVENTS_OVRFLW; \
+        if (has_overflowed && counter < (1 << 23)) { \
+            overflows += 1; \
+        } \
+        rtc.p_reg->INTENSET = RTC_INTENSET_OVRFLW_Msk; \
+    } while (0);
+
+nrfx_rtc_t rtc1 = NRFX_RTC_INSTANCE(1);
+volatile mp_uint_t rtc_overflows = 0;
+
+const nrfx_rtc_config_t rtc_config_time_ticks = {
+    .prescaler = 0,
+    .reliable = 0,
+    .tick_latency = 0,
+    #ifdef NRF51
+    .interrupt_priority = 1,
+    #else
+    .interrupt_priority = 3,
+    #endif
+};
+
+STATIC void rtc_irq_time(nrfx_rtc_int_type_t event) {
+    // irq handler for overflow
+    if (event == NRFX_RTC_INT_OVERFLOW) {
+        rtc_overflows += 1;
+    }
+    // irq handler for wakeup from WFI (~1msec)
+    if (event == NRFX_RTC_INT_COMPARE0) {
+        RTC_RESCHEDULE_CC(rtc1, 0, RTC_TICK_INCREASE_MSEC)
+    }
+}
+
+void rtc1_init_time_ticks(void) {
+    // Start the low-frequency clock (if it hasn't been started already)
+    if (!nrf_clock_lf_is_running(NRF_CLOCK)) {
+        nrf_clock_task_trigger(NRF_CLOCK, NRF_CLOCK_TASK_LFCLKSTART);
+    }
+    // Uninitialize first, then set overflow IRQ and first CC event
+    nrfx_rtc_uninit(&rtc1);
+    nrfx_rtc_init(&rtc1, &rtc_config_time_ticks, rtc_irq_time);
+    nrfx_rtc_overflow_enable(&rtc1, true);
+    RTC_RESCHEDULE_CC(rtc1, 0, RTC_TICK_INCREASE_MSEC)
+    nrfx_rtc_enable(&rtc1);
+}
+
+mp_uint_t mp_hal_ticks_ms(void) {
+    // Compute: (rtc_overflows << 24 + COUNTER) * 1000 / 32768
+    //
+    // Note that COUNTER * 1000 / 32768 would overflow during calculation, so use
+    // the less obvious * 125 / 4096 calculation (overflow secure).
+    //
+    // Make sure not to call this function within an irq with higher prio than the
+    // RTC's irq.  This would introduce the danger of preempting the RTC irq and
+    // calling mp_hal_ticks_ms() at that time would return a false result.
+    uint32_t overflows;
+    uint32_t counter;
+    // guard against overflow irq
+    RTC1_GET_TICKS_ATOMIC(rtc1, overflows, counter)
+    return (overflows << 9) * 1000 + (counter * 125 / 4096);
+}
+
+mp_uint_t mp_hal_ticks_us(void) {
+    // Compute: ticks_us = (overflows << 24 + counter) * 1000000 / 32768
+    //    = (overflows << 15 * 15625) + (counter * 15625 / 512)
+    // Since this function is likely to be called in a poll loop it must
+    // be fast, using an optimized 64bit mult/divide.
+    uint32_t overflows;
+    uint32_t counter;
+    // guard against overflow irq
+    RTC1_GET_TICKS_ATOMIC(rtc1, overflows, counter)
+    // first compute counter * 15625
+    uint32_t counter_lo = (counter & 0xffff) * 15625;
+    uint32_t counter_hi = (counter >> 16) * 15625;
+    // actual value is counter_hi << 16 + counter_lo
+    return ((overflows << 15) * 15625) + ((counter_hi << 7) + (counter_lo >> 9));
+}
+
+#else
+
+mp_uint_t mp_hal_ticks_ms(void) {
+    return 0;
+}
+
+#endif
+
 // this table converts from HAL_StatusTypeDef to POSIX errno
 const byte mp_hal_status_to_errno_table[4] = {
     [HAL_OK] = 0,
@@ -70,7 +185,7 @@ int mp_hal_stdin_rx_chr(void) {
         if (MP_STATE_PORT(board_stdio_uart) != NULL && uart_rx_any(MP_STATE_PORT(board_stdio_uart))) {
             return uart_rx_char(MP_STATE_PORT(board_stdio_uart));
         }
-        __WFI();
+        MICROPY_EVENT_POLL_HOOK
     }
 
     return 0;
@@ -93,6 +208,31 @@ void mp_hal_stdout_tx_str(const char *str) {
     mp_hal_stdout_tx_strn(str, strlen(str));
 }
 
+#if MICROPY_PY_TIME_TICKS
+
+void mp_hal_delay_us(mp_uint_t us) {
+    uint32_t now;
+    if (us == 0) {
+        return;
+    }
+    now = mp_hal_ticks_us();
+    while (mp_hal_ticks_us() - now < us) {
+    }
+}
+
+void mp_hal_delay_ms(mp_uint_t ms) {
+    uint32_t now;
+    if (ms == 0) {
+        return;
+    }
+    now = mp_hal_ticks_ms();
+    while (mp_hal_ticks_ms() - now < ms) {
+        MICROPY_EVENT_POLL_HOOK
+    }
+}
+
+#else
+
 void mp_hal_delay_us(mp_uint_t us) {
     if (us == 0) {
         return;
@@ -175,6 +315,7 @@ void mp_hal_delay_ms(mp_uint_t ms) {
         mp_hal_delay_us(999);
     }
 }
+#endif
 
 #if defined(NRFX_LOG_ENABLED) && (NRFX_LOG_ENABLED == 1)
 
diff --git a/ports/nrf/mphalport.h b/ports/nrf/mphalport.h
index 5614be29fa29f..15b37b7ef22d2 100644
--- a/ports/nrf/mphalport.h
+++ b/ports/nrf/mphalport.h
@@ -41,12 +41,6 @@ typedef enum
     HAL_TIMEOUT  = 0x03
 } HAL_StatusTypeDef;
 
-static inline uint32_t hal_tick_fake(void) {
-    return 0;
-}
-
-#define mp_hal_ticks_ms hal_tick_fake // TODO: implement. Right now, return 0 always
-
 extern const unsigned char mp_hal_status_to_errno_table[4];
 
 NORETURN void mp_hal_raise(HAL_StatusTypeDef status);
@@ -70,10 +64,15 @@ const char *nrfx_error_code_lookup(uint32_t err_code);
 #define mp_hal_pin_od_high(p)    mp_hal_pin_high(p)
 #define mp_hal_pin_open_drain(p) nrf_gpio_cfg_input(p->pin, NRF_GPIO_PIN_NOPULL)
 
+#if MICROPY_PY_TIME_TICKS
+void rtc1_init_time_ticks();
+#else
+mp_uint_t mp_hal_ticks_ms(void);
+#define mp_hal_ticks_us() (0)
+#endif
 
 // TODO: empty implementation for now. Used by machine_spi.c:69
 #define mp_hal_delay_us_fast(p)
-#define mp_hal_ticks_us() (0)
 #define mp_hal_ticks_cpu() (0)
 
 #endif

From 59ed3bdd9fa8dc6e0677cf8d4478a5a32fee4500 Mon Sep 17 00:00:00 2001
From: Martin Fischer <fischer.carlito@gmail.com>
Date: Thu, 2 Jul 2020 22:19:11 +0200
Subject: [PATCH 0152/3533] nrf: Enable nrf tick support on all boards by
 default.

Having time.ticks_ms/us/add/diff is very useful and used by many drivers,
libraries and components.
---
 ports/nrf/mpconfigport.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/nrf/mpconfigport.h b/ports/nrf/mpconfigport.h
index fc34a7cf268df..c5304b20d0d3e 100644
--- a/ports/nrf/mpconfigport.h
+++ b/ports/nrf/mpconfigport.h
@@ -175,7 +175,7 @@
 #endif
 
 #ifndef MICROPY_PY_TIME_TICKS
-#define MICROPY_PY_TIME_TICKS       (0)
+#define MICROPY_PY_TIME_TICKS       (1)
 #endif
 
 #define MICROPY_ENABLE_EMERGENCY_EXCEPTION_BUF   (1)

From f5dd46b4791249c5989859b07c4886c69d8b98b3 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 2 Jul 2020 16:12:59 +1000
Subject: [PATCH 0153/3533] unix/variants: Enable VFS and all supported
 filesystems on dev variant.

So that micropython-dev can be used to test VFS code, and inspect and build
filesystem images that are compatible with bare-metal systems.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/unix/variants/dev/mpconfigvariant.h  | 21 +++++++++++++++------
 ports/unix/variants/dev/mpconfigvariant.mk |  4 +++-
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/ports/unix/variants/dev/mpconfigvariant.h b/ports/unix/variants/dev/mpconfigvariant.h
index c2b959572abaa..7c3e84cc44e11 100644
--- a/ports/unix/variants/dev/mpconfigvariant.h
+++ b/ports/unix/variants/dev/mpconfigvariant.h
@@ -24,13 +24,22 @@
  * THE SOFTWARE.
  */
 
-#define MICROPY_REPL_EMACS_WORDS_MOVE (1)
-#define MICROPY_REPL_EMACS_EXTRA_WORDS_MOVE (1)
-#define MICROPY_ENABLE_SCHEDULER (1)
+#define MICROPY_READER_VFS                      (1)
+#define MICROPY_REPL_EMACS_WORDS_MOVE           (1)
+#define MICROPY_REPL_EMACS_EXTRA_WORDS_MOVE     (1)
+#define MICROPY_ENABLE_SCHEDULER                (1)
+#define MICROPY_VFS                             (1)
+#define MICROPY_VFS_POSIX                       (1)
 
-#define MICROPY_PY_SYS_SETTRACE (1)
-#define MICROPY_PY_URANDOM_EXTRA_FUNCS (1)
+#define MICROPY_PY_SYS_SETTRACE                 (1)
+#define MICROPY_PY_UOS_VFS                      (1)
+#define MICROPY_PY_URANDOM_EXTRA_FUNCS          (1)
 
 #ifndef MICROPY_PY_UASYNCIO
-#define MICROPY_PY_UASYNCIO (1)
+#define MICROPY_PY_UASYNCIO                     (1)
 #endif
+
+// Use vfs's functions for import stat and builtin open.
+#define mp_import_stat mp_vfs_import_stat
+#define mp_builtin_open mp_vfs_open
+#define mp_builtin_open_obj mp_vfs_open_obj
diff --git a/ports/unix/variants/dev/mpconfigvariant.mk b/ports/unix/variants/dev/mpconfigvariant.mk
index 8a63b233d814e..1f8611b6fc30b 100644
--- a/ports/unix/variants/dev/mpconfigvariant.mk
+++ b/ports/unix/variants/dev/mpconfigvariant.mk
@@ -3,5 +3,7 @@ PROG ?= micropython-dev
 FROZEN_MANIFEST ?= $(VARIANT_DIR)/manifest.py
 
 MICROPY_ROM_TEXT_COMPRESSION = 1
-
+MICROPY_VFS_FAT = 1
+MICROPY_VFS_LFS1 = 1
+MICROPY_VFS_LFS2 = 1
 MICROPY_PY_BLUETOOTH = 1

From 8594389fe75efc3903970db319f07f89fdb8c8cc Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Tue, 30 Jun 2020 22:59:28 +0200
Subject: [PATCH 0154/3533] stm32/fdcan: Use the right FIFO to calc element
 address in can_receive.

---
 ports/stm32/fdcan.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/ports/stm32/fdcan.c b/ports/stm32/fdcan.c
index b3b1da998c79d..bafc7e3f5ad7f 100644
--- a/ports/stm32/fdcan.c
+++ b/ports/stm32/fdcan.c
@@ -218,8 +218,14 @@ int can_receive(FDCAN_HandleTypeDef *can, int fifo, FDCAN_RxHeaderTypeDef *hdr,
     }
 
     // Get pointer to incoming message
-    uint32_t index = (can->Instance->RXF0S & FDCAN_RXF0S_F0GI) >> 8;
-    uint32_t *address = (uint32_t *)(can->msgRam.RxFIFO0SA + (index * can->Init.RxFifo0ElmtSize * 4));
+    uint32_t index, *address;
+    if (fifo == FDCAN_RX_FIFO0) {
+        index = (*rxf & FDCAN_RXF0S_F0GI) >> FDCAN_RXF0S_F0GI_Pos;
+        address = (uint32_t *)(can->msgRam.RxFIFO0SA + (index * can->Init.RxFifo0ElmtSize * 4));
+    } else {
+        index = (*rxf & FDCAN_RXF1S_F1GI) >> FDCAN_RXF1S_F1GI_Pos;
+        address = (uint32_t *)(can->msgRam.RxFIFO1SA + (index * can->Init.RxFifo1ElmtSize * 4));
+    }
 
     // Parse header of message
     hdr->IdType = *address & FDCAN_ELEMENT_MASK_XTD;

From 63b2eb27d44a9beb9f66abd77d3b6526fdb2482d Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Tue, 30 Jun 2020 23:04:57 +0200
Subject: [PATCH 0155/3533] stm32/fdcan: Use FDCAN_RXFxS_FxFL instead of
 hard-coded value.

---
 ports/stm32/fdcan.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/ports/stm32/fdcan.c b/ports/stm32/fdcan.c
index bafc7e3f5ad7f..3ab72cdace1a8 100644
--- a/ports/stm32/fdcan.c
+++ b/ports/stm32/fdcan.c
@@ -200,17 +200,21 @@ void can_clearfilter(pyb_can_obj_t *self, uint32_t f, uint8_t bank) {
 
 int can_receive(FDCAN_HandleTypeDef *can, int fifo, FDCAN_RxHeaderTypeDef *hdr, uint8_t *data, uint32_t timeout_ms) {
     volatile uint32_t *rxf, *rxa;
+    uint32_t fl;
+
     if (fifo == FDCAN_RX_FIFO0) {
         rxf = &can->Instance->RXF0S;
         rxa = &can->Instance->RXF0A;
+        fl = FDCAN_RXF0S_F0FL;
     } else {
         rxf = &can->Instance->RXF1S;
         rxa = &can->Instance->RXF1A;
+        fl = FDCAN_RXF1S_F1FL;
     }
 
     // Wait for a message to become available, with timeout
     uint32_t start = HAL_GetTick();
-    while ((*rxf & 7) == 0) {
+    while ((*rxf & fl) == 0) {
         MICROPY_EVENT_POLL_HOOK
         if (HAL_GetTick() - start >= timeout_ms) {
             return -MP_ETIMEDOUT;

From d07073f4e2f37d9614340f7544985dfee834532e Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Tue, 30 Jun 2020 23:08:20 +0200
Subject: [PATCH 0156/3533] stm32/fdcan: Support maximum timeout of
 HAL_MAX_DELAY in can_receive.

---
 ports/stm32/fdcan.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/ports/stm32/fdcan.c b/ports/stm32/fdcan.c
index 3ab72cdace1a8..2892572f40a96 100644
--- a/ports/stm32/fdcan.c
+++ b/ports/stm32/fdcan.c
@@ -215,10 +215,12 @@ int can_receive(FDCAN_HandleTypeDef *can, int fifo, FDCAN_RxHeaderTypeDef *hdr,
     // Wait for a message to become available, with timeout
     uint32_t start = HAL_GetTick();
     while ((*rxf & fl) == 0) {
-        MICROPY_EVENT_POLL_HOOK
-        if (HAL_GetTick() - start >= timeout_ms) {
-            return -MP_ETIMEDOUT;
+        if (timeout_ms != HAL_MAX_DELAY) {
+            if (HAL_GetTick() - start >= timeout_ms) {
+                return -MP_ETIMEDOUT;
+            }
         }
+        MICROPY_EVENT_POLL_HOOK
     }
 
     // Get pointer to incoming message

From c299cc94e334a5a9576e15e0f046e24810c4c75a Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Tue, 30 Jun 2020 23:13:57 +0200
Subject: [PATCH 0157/3533] stm32/pyb_can: Handle timeout arg for FDCAN in
 pyb_can_send.

Following the documented pyb can_send behavior in pyb.CAN docs.
---
 ports/stm32/pyb_can.c | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/ports/stm32/pyb_can.c b/ports/stm32/pyb_can.c
index ad2efbef4be1a..224b8f28b0eab 100644
--- a/ports/stm32/pyb_can.c
+++ b/ports/stm32/pyb_can.c
@@ -432,6 +432,20 @@ STATIC mp_obj_t pyb_can_send(size_t n_args, const mp_obj_t *pos_args, mp_map_t *
 
     HAL_StatusTypeDef status;
     #if MICROPY_HW_ENABLE_FDCAN
+    uint32_t timeout_ms = args[ARG_timeout].u_int;
+    uint32_t start = HAL_GetTick();
+    while (HAL_FDCAN_GetTxFifoFreeLevel(&self->can) == 0) {
+        if (timeout_ms == 0) {
+            mp_raise_OSError(MP_ETIMEDOUT);
+        }
+        // Check for the Timeout
+        if (timeout_ms != HAL_MAX_DELAY) {
+            if (HAL_GetTick() - start >= timeout_ms) {
+                mp_raise_OSError(MP_ETIMEDOUT);
+            }
+        }
+        MICROPY_EVENT_POLL_HOOK
+    }
     status = HAL_FDCAN_AddMessageToTxFifoQ(&self->can, &tx_msg, tx_data);
     #else
     self->can.pTxMsg = &tx_msg;

From b6146ca1a11d9db6fa2276920f2c3c32d9bc4457 Mon Sep 17 00:00:00 2001
From: Thomas Friebel <yaron.de@gmail.com>
Date: Sun, 5 Jul 2020 16:48:27 +0200
Subject: [PATCH 0158/3533] extmod/nimble: Fix attr NULL ptr dereference in
 ble_gatt_attr_read_cb.

In case of error, NimBLE calls the read callback with attr = NULL.
---
 extmod/nimble/modbluetooth_nimble.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extmod/nimble/modbluetooth_nimble.c b/extmod/nimble/modbluetooth_nimble.c
index 4e0ca88efa468..be7d13d9e6f5d 100644
--- a/extmod/nimble/modbluetooth_nimble.c
+++ b/extmod/nimble/modbluetooth_nimble.c
@@ -846,7 +846,7 @@ STATIC int ble_gatt_attr_read_cb(uint16_t conn_handle, const struct ble_gatt_err
     if (error->status == 0) {
         gattc_on_data_available(MP_BLUETOOTH_IRQ_GATTC_READ_RESULT, conn_handle, attr->handle, attr->om);
     }
-    mp_bluetooth_gattc_on_read_write_status(MP_BLUETOOTH_IRQ_GATTC_READ_DONE, conn_handle, attr->handle, error->status);
+    mp_bluetooth_gattc_on_read_write_status(MP_BLUETOOTH_IRQ_GATTC_READ_DONE, conn_handle, attr ? attr->handle : -1, error->status);
     return 0;
 }
 

From f743bd3d2581596ecc06973ffc52b429931b19fe Mon Sep 17 00:00:00 2001
From: Alex Tsamakos <alex@actinius.com>
Date: Tue, 23 Jun 2020 02:17:17 +0200
Subject: [PATCH 0159/3533] nrf/boards: Add initial support for Actinius
 Icarus.

Example make command:

make BOARD=actinius_icarus
---
 ports/nrf/README.md                           |  2 +
 .../boards/actinius_icarus/mpconfigboard.h    | 81 +++++++++++++++++++
 .../boards/actinius_icarus/mpconfigboard.mk   |  6 ++
 ports/nrf/boards/actinius_icarus/pins.csv     | 32 ++++++++
 4 files changed, 121 insertions(+)
 create mode 100644 ports/nrf/boards/actinius_icarus/mpconfigboard.h
 create mode 100644 ports/nrf/boards/actinius_icarus/mpconfigboard.mk
 create mode 100644 ports/nrf/boards/actinius_icarus/pins.csv

diff --git a/ports/nrf/README.md b/ports/nrf/README.md
index b5f39267ebf2f..a02548afe1f9a 100644
--- a/ports/nrf/README.md
+++ b/ports/nrf/README.md
@@ -43,6 +43,7 @@ This is a port of MicroPython to the Nordic Semiconductor nRF series of chips.
   * [Particle Xenon](https://docs.particle.io/xenon/)
 * nRF9160
   * [PCA10090](https://www.nordicsemi.com/Software-and-Tools/Development-Kits/nRF9160-DK)
+  * [Actinius Icarus](https://www.actinius.com/icarus)
 
 ## Compile and Flash
 
@@ -135,6 +136,7 @@ pca10056             | s140                    | Peripheral and Central | [Segge
 pca10059             | s140                    | Peripheral and Central | Manual, SWDIO and SWCLK solder points on the sides.
 particle_xenon       | s140                    | Peripheral and Central | [Black Magic Probe](#black-magic-probe-targets)
 pca10090             | None (bsdlib.a)         | None (LTE/GNSS)        | [Segger](#segger-targets)
+actinius_icarus      | None (bsdlib.a)         | None (LTE/GNSS)        | [Segger](#segger-targets)
 
 ## IDAP-M/IDAP-Link Targets
 
diff --git a/ports/nrf/boards/actinius_icarus/mpconfigboard.h b/ports/nrf/boards/actinius_icarus/mpconfigboard.h
new file mode 100644
index 0000000000000..e344d2d6d0968
--- /dev/null
+++ b/ports/nrf/boards/actinius_icarus/mpconfigboard.h
@@ -0,0 +1,81 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 Actinius
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#define ACTINIUS_ICARUS
+
+#define MICROPY_HW_BOARD_NAME       "Actinius Icarus"
+#define MICROPY_HW_MCU_NAME         "NRF9160"
+#define MICROPY_PY_SYS_PLATFORM     "nrf9160"
+
+#define MICROPY_PY_MACHINE_UART     (1)
+#define MICROPY_PY_MACHINE_HW_PWM   (0)
+#define MICROPY_PY_MACHINE_HW_SPI   (1)
+#define MICROPY_PY_MACHINE_TIMER    (1)
+#define MICROPY_PY_MACHINE_RTCOUNTER (0)
+#define MICROPY_PY_MACHINE_I2C      (1)
+#define MICROPY_PY_MACHINE_ADC      (0)
+#define MICROPY_PY_MACHINE_TEMP     (0)
+#define MICROPY_PY_RANDOM_HW_RNG    (0)
+
+#define MICROPY_MBFS                (0)
+#define MICROPY_VFS                 (1)
+
+#define MICROPY_HW_HAS_LED          (1)
+#define MICROPY_HW_HAS_SWITCH       (1)
+#define MICROPY_HW_HAS_FLASH        (0)
+#define MICROPY_HW_HAS_SDCARD       (0)
+#define MICROPY_HW_HAS_MMA7660      (0)
+#define MICROPY_HW_HAS_LIS3DSH      (0)
+#define MICROPY_HW_HAS_LCD          (0)
+#define MICROPY_HW_ENABLE_RNG       (0)
+#define MICROPY_HW_ENABLE_RTC       (0)
+#define MICROPY_HW_ENABLE_TIMER     (0)
+#define MICROPY_HW_ENABLE_SERVO     (0)
+#define MICROPY_HW_ENABLE_DAC       (0)
+#define MICROPY_HW_ENABLE_CAN       (0)
+
+#define MICROPY_HW_LED_TRICOLOR     (1)
+#define MICROPY_HW_LED_PULLUP       (1)
+
+#define MICROPY_HW_LED_RED          (10) // LED1 / RED
+#define MICROPY_HW_LED_GREEN        (11) // LED2 / GREEN
+#define MICROPY_HW_LED_BLUE         (12) // LED3 / BLUE
+
+// UART config
+#define MICROPY_HW_UART1_RX         (6)
+#define MICROPY_HW_UART1_TX         (9)
+#define MICROPY_HW_UART1_CTS        (25)
+#define MICROPY_HW_UART1_RTS        (7)
+#define MICROPY_HW_UART1_HWFC       (1)
+
+// SPI0 config
+#define MICROPY_HW_SPI0_NAME        "SPI0"
+
+#define MICROPY_HW_SPI0_SCK         (20)
+#define MICROPY_HW_SPI0_MOSI        (21)
+#define MICROPY_HW_SPI0_MISO        (22)
+
+#define HELP_TEXT_BOARD_LED         "1,2,3"
diff --git a/ports/nrf/boards/actinius_icarus/mpconfigboard.mk b/ports/nrf/boards/actinius_icarus/mpconfigboard.mk
new file mode 100644
index 0000000000000..c1e05fd306272
--- /dev/null
+++ b/ports/nrf/boards/actinius_icarus/mpconfigboard.mk
@@ -0,0 +1,6 @@
+MCU_SERIES = m33
+MCU_VARIANT = nrf91
+MCU_SUB_VARIANT = nrf9160
+LD_FILES += boards/nrf9160_1M_256k.ld
+
+NRF_DEFINES += -DNRF9160_XXAA -DNRF_TRUSTZONE_NONSECURE 
diff --git a/ports/nrf/boards/actinius_icarus/pins.csv b/ports/nrf/boards/actinius_icarus/pins.csv
new file mode 100644
index 0000000000000..50c284dfdc5cc
--- /dev/null
+++ b/ports/nrf/boards/actinius_icarus/pins.csv
@@ -0,0 +1,32 @@
+P0,P0
+P1,P1
+P2,P2
+P3,P3
+P4,P4
+BUTTON,P5
+UART_RX,P6
+UART_RTS,P7
+SIM_SELECT,P8
+UART_TX,P9
+LED1,P10
+LED2,P11
+LED3,P12
+BAT_SENSE,P13
+A1,P14
+A2,P15
+A3,P16
+A4,P17
+A5,P18
+A6,P19
+SPI_SCK,P20
+SPI_MOSI,P21
+SPI_MISO,P22
+P23,P23
+P24,P24
+UART_CTS,P25
+I2C_SDA,P26
+I2C_SCL,P27
+ACCEL_INT1,P28
+ACCEL_INT2,P29
+P30,P30
+P31,P31

From b776fe69692e92497c7aae0f38dfcbe14b2ca024 Mon Sep 17 00:00:00 2001
From: Glenn Ruben Bakke <glennbakke@gmail.com>
Date: Thu, 9 Jul 2020 20:41:11 +0200
Subject: [PATCH 0160/3533] nrf/nrfx_config: Disable RTC2 for nRF9160 targets.

nRF9160 does not have any RTC2. Disable the configuration in
case of NRF9160_XXAA.
---
 ports/nrf/nrfx_config.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/nrf/nrfx_config.h b/ports/nrf/nrfx_config.h
index 19c744510feb5..beb6b34ab368d 100644
--- a/ports/nrf/nrfx_config.h
+++ b/ports/nrf/nrfx_config.h
@@ -130,7 +130,7 @@
 #define NRFX_RTC_ENABLED (MICROPY_PY_MACHINE_RTCOUNTER)
 #define NRFX_RTC0_ENABLED 1
 #define NRFX_RTC1_ENABLED 1
-#define NRFX_RTC2_ENABLED (!NRF51)
+#define NRFX_RTC2_ENABLED (!NRF51) && (!NRF9160_XXAA)
 
 #define NRFX_TIMER_ENABLED (MICROPY_PY_MACHINE_TIMER)
 #define NRFX_TIMER0_ENABLED 1

From 95d0d1c48675c946a3c3dd1c2f9ab293f21bb943 Mon Sep 17 00:00:00 2001
From: Glenn Ruben Bakke <glennbakke@gmail.com>
Date: Thu, 9 Jul 2020 21:03:09 +0200
Subject: [PATCH 0161/3533] nrf/boards: Enable RTCounter machine module for
 nrf9160 boards.

Resolves dependencies for MICROPY_PY_TIME_TICKS which
requires to link against nrfx_rtc.c functions by setting
MICROPY_PY_MACHINE_RTCOUNTER to 1.
---
 ports/nrf/boards/actinius_icarus/mpconfigboard.h | 2 +-
 ports/nrf/boards/pca10090/mpconfigboard.h        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/nrf/boards/actinius_icarus/mpconfigboard.h b/ports/nrf/boards/actinius_icarus/mpconfigboard.h
index e344d2d6d0968..e99d731df941d 100644
--- a/ports/nrf/boards/actinius_icarus/mpconfigboard.h
+++ b/ports/nrf/boards/actinius_icarus/mpconfigboard.h
@@ -34,7 +34,7 @@
 #define MICROPY_PY_MACHINE_HW_PWM   (0)
 #define MICROPY_PY_MACHINE_HW_SPI   (1)
 #define MICROPY_PY_MACHINE_TIMER    (1)
-#define MICROPY_PY_MACHINE_RTCOUNTER (0)
+#define MICROPY_PY_MACHINE_RTCOUNTER (1)
 #define MICROPY_PY_MACHINE_I2C      (1)
 #define MICROPY_PY_MACHINE_ADC      (0)
 #define MICROPY_PY_MACHINE_TEMP     (0)
diff --git a/ports/nrf/boards/pca10090/mpconfigboard.h b/ports/nrf/boards/pca10090/mpconfigboard.h
index e4e514290949b..28381c40d1e6f 100644
--- a/ports/nrf/boards/pca10090/mpconfigboard.h
+++ b/ports/nrf/boards/pca10090/mpconfigboard.h
@@ -34,7 +34,7 @@
 #define MICROPY_PY_MACHINE_HW_PWM   (0)
 #define MICROPY_PY_MACHINE_HW_SPI   (1)
 #define MICROPY_PY_MACHINE_TIMER    (0)
-#define MICROPY_PY_MACHINE_RTCOUNTER (0)
+#define MICROPY_PY_MACHINE_RTCOUNTER (1)
 #define MICROPY_PY_MACHINE_I2C      (1)
 #define MICROPY_PY_MACHINE_ADC      (0)
 #define MICROPY_PY_MACHINE_TEMP     (0)

From 411e1157e7ea9ee65db5e78bdd5d2ee577d92cc2 Mon Sep 17 00:00:00 2001
From: Glenn Ruben Bakke <glennbakke@gmail.com>
Date: Fri, 10 Jul 2020 19:55:35 +0200
Subject: [PATCH 0162/3533] travis: Install newer toolchain for nrf job.

Update toolchain to GNU Arm Embedded Toolchain.
---
 .travis.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index f6fe3e1e4e39f..2f86345ae8bcb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -292,7 +292,10 @@ jobs:
     - stage: test
       name: "nrf port build"
       install:
-        - sudo apt-get install gcc-arm-none-eabi
+        # need newer gcc version for Cortex-M33 support
+        - sudo add-apt-repository -y ppa:team-gcc-arm-embedded/ppa
+        - sudo apt-get update -qq || true
+        - sudo apt-get install gcc-arm-embedded
         - sudo apt-get install libnewlib-arm-none-eabi
         - arm-none-eabi-gcc --version
       script:

From d9e8edc8bcff7102d655b63c672ccb44adeca688 Mon Sep 17 00:00:00 2001
From: Glenn Ruben Bakke <glennbakke@gmail.com>
Date: Fri, 10 Jul 2020 09:19:34 +0200
Subject: [PATCH 0163/3533] travis: Add pca10090 build to nrf job.

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index 2f86345ae8bcb..8eb5ef6bae514 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -304,6 +304,7 @@ jobs:
         - make ${MAKEOPTS} -C ports/nrf BOARD=pca10040
         - make ${MAKEOPTS} -C ports/nrf BOARD=microbit
         - make ${MAKEOPTS} -C ports/nrf BOARD=pca10056 SD=s132
+        - make ${MAKEOPTS} -C ports/nrf BOARD=pca10090
 
     # bare-arm and minimal ports, with size-diff check
     - stage: test

From 486cb6dd4a1a17ff2567f721855d4626fdf69412 Mon Sep 17 00:00:00 2001
From: Matt Trentini <matthew.trentini@planetinnovation.com.au>
Date: Mon, 18 May 2020 14:45:46 +1000
Subject: [PATCH 0164/3533] nrf: Add board definition for
 nRF52840-MDK-USB-Dongle.

---
 ports/nrf/README.md                           |  1 +
 ports/nrf/boards/memory.ld                    |  7 +-
 .../boards/nrf52840-mdk-usb-dongle/README.md  | 49 +++++++++++++
 .../nrf52840-mdk-usb-dongle/mpconfigboard.h   | 71 +++++++++++++++++++
 .../nrf52840-mdk-usb-dongle/mpconfigboard.mk  |  7 ++
 .../nrf52840_open_bootloader.ld               |  2 +
 .../boards/nrf52840-mdk-usb-dongle/pins.csv   | 17 +++++
 7 files changed, 152 insertions(+), 2 deletions(-)
 create mode 100644 ports/nrf/boards/nrf52840-mdk-usb-dongle/README.md
 create mode 100644 ports/nrf/boards/nrf52840-mdk-usb-dongle/mpconfigboard.h
 create mode 100644 ports/nrf/boards/nrf52840-mdk-usb-dongle/mpconfigboard.mk
 create mode 100644 ports/nrf/boards/nrf52840-mdk-usb-dongle/nrf52840_open_bootloader.ld
 create mode 100644 ports/nrf/boards/nrf52840-mdk-usb-dongle/pins.csv

diff --git a/ports/nrf/README.md b/ports/nrf/README.md
index a02548afe1f9a..b08a034561e0c 100644
--- a/ports/nrf/README.md
+++ b/ports/nrf/README.md
@@ -41,6 +41,7 @@ This is a port of MicroPython to the Nordic Semiconductor nRF series of chips.
   * [PCA10056](http://www.nordicsemi.com/eng/Products/nRF52840-Preview-DK)
   * [PCA10059](https://www.nordicsemi.com/Software-and-Tools/Development-Kits/nRF52840-Dongle)
   * [Particle Xenon](https://docs.particle.io/xenon/)
+  * [nRF52840 MDK USB Dongle](boards/nrf52840-mdk-usb-dongle/README.md)
 * nRF9160
   * [PCA10090](https://www.nordicsemi.com/Software-and-Tools/Development-Kits/nRF9160-DK)
   * [Actinius Icarus](https://www.actinius.com/icarus)
diff --git a/ports/nrf/boards/memory.ld b/ports/nrf/boards/memory.ld
index c95daf3d94fa0..f1f9a2a4c48b8 100644
--- a/ports/nrf/boards/memory.ld
+++ b/ports/nrf/boards/memory.ld
@@ -1,14 +1,17 @@
 
 /* Flash layout: softdevice     | application     | filesystem */
 /* RAM layout:   softdevice RAM | application RAM */
-_sd_size       = DEFINED(_sd_size) ? _sd_size : 0;
+
+_ram_start     = DEFINED(_ram_start) ? _ram_start : 0x20000000;
+_flash_start   = DEFINED(_flash_start) ? _flash_start : 0;
+_sd_size       = DEFINED(_sd_size) ? _sd_size : _flash_start;
 _sd_ram        = DEFINED(_sd_ram)  ? _sd_ram : 0;
 _fs_size       = DEFINED(_fs_size) ? _fs_size : 64K; /* TODO: set to 0 if not using the filesystem */
 _app_size      = _flash_size - _sd_size - _fs_size;
 _app_start     = _sd_size;
 _fs_start      = _sd_size + _app_size;
 _fs_end        = _fs_start + _fs_size;
-_app_ram_start = 0x20000000 + _sd_ram;
+_app_ram_start = _ram_start + _sd_ram;
 _app_ram_size  = _ram_size - _sd_ram;
 _heap_start    = _ebss;
 _heap_end      = _ram_end - _stack_size;
diff --git a/ports/nrf/boards/nrf52840-mdk-usb-dongle/README.md b/ports/nrf/boards/nrf52840-mdk-usb-dongle/README.md
new file mode 100644
index 0000000000000..c39a800d776cf
--- /dev/null
+++ b/ports/nrf/boards/nrf52840-mdk-usb-dongle/README.md
@@ -0,0 +1,49 @@
+nRF52840 MDK USB Dongle
+=======================
+
+The *[nRF52840 MDK USB
+Dongle](https://wiki.makerdiary.com/nrf52840-mdk-usb-dongle)* is a small,
+low-cost development board in a USB dongle form-factor powered by an nRF52840
+with 1MB flash and 256KB RAM.
+
+This device is pre-installed with [Open
+Bootloader](https://wiki.makerdiary.com/nrf52840-mdk-usb-dongle/programming/),
+allowing DFU upgrades over USB using Nordic [nRF
+Connect](https://www.nordicsemi.com/Software-and-tools/Development-Tools/nRF-Connect-for-desktop)
+or [nrfutil](https://github.com/NordicSemiconductor/pc-nrfutil/). To support
+Open Bootloader, the flash and memory layout must be adjusted slightly (details
+[here](https://devzone.nordicsemi.com/nordic/short-range-guides/b/getting-started/posts/nrf52840-dongle-programming-tutorial))
+from the typical nRF build; this board definition ensure the appropriate build
+configuration is used for MicroPython.
+
+
+Pinout
+------
+
+The [pinout
+diagram](https://wiki.makerdiary.com/nrf52840-mdk-usb-dongle/#pinout-diagram)
+provides an overview of the available pins and their capabilities. All pins are
+available in MicroPython, using the pin numbers labelled in the diagram
+(excluding the leading port number, *P0*).
+
+The three LEDs are available either through the usual `Pin` mechanism - pins
+22-24 - or by `board.LED(n)` where n can be 1, 2 or 3.
+
+
+Build instructions
+------------------
+
+Follow the standard [nRF Port build instructions](../../README.md); but use
+`nrf52840-mdk-usb-dongle` as the value for `BOARD`:
+
+    make BOARD=nrf52840-mdk-usb-dongle
+
+The build artifacts will be created in `build-nrf52840-mdk-usb-dongle`. Once
+built, the easiest way to deploy to the device is to open `firmware.hex` using
+*nRF Connect* and select *Write*. Detailed instructions can be found on the
+[developer
+wiki](https://wiki.makerdiary.com/nrf52840-mdk-usb-dongle/programming/). 
+
+**Note** that the regular method of deployment for the MicroPython nRF port
+(using `make deploy`) will *not* operate correctly and will overwrite the
+bootloader.
diff --git a/ports/nrf/boards/nrf52840-mdk-usb-dongle/mpconfigboard.h b/ports/nrf/boards/nrf52840-mdk-usb-dongle/mpconfigboard.h
new file mode 100644
index 0000000000000..f048c39e0efdd
--- /dev/null
+++ b/ports/nrf/boards/nrf52840-mdk-usb-dongle/mpconfigboard.h
@@ -0,0 +1,71 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 Matt Trentini
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#define MICROPY_HW_BOARD_NAME        "MDK-USB-DONGLE"
+#define MICROPY_HW_MCU_NAME          "NRF52840"
+#define MICROPY_PY_SYS_PLATFORM      "nrf52840-MDK-USB-Dongle"
+
+#define MICROPY_PY_MACHINE_UART      (1)
+#define MICROPY_PY_MACHINE_HW_PWM    (1)
+#define MICROPY_PY_MACHINE_HW_SPI    (1)
+#define MICROPY_PY_MACHINE_TIMER     (1)
+#define MICROPY_PY_MACHINE_RTCOUNTER (1)
+#define MICROPY_PY_MACHINE_I2C       (1)
+#define MICROPY_PY_MACHINE_ADC       (1)
+#define MICROPY_PY_MACHINE_TEMP      (1)
+
+#define MICROPY_HW_ENABLE_RNG        (1)
+
+#define MICROPY_HW_USB_CDC           (1)
+
+#define MICROPY_HW_HAS_LED           (1)
+#define MICROPY_HW_LED_COUNT         (3)
+#define MICROPY_HW_LED_PULLUP        (1)
+
+#define MICROPY_HW_LED1              (22)  // LED1 GREEN
+#define MICROPY_HW_LED2              (23)  // LED2 RED
+#define MICROPY_HW_LED3              (24)  // LED3 BLUE
+
+// UART config
+#define MICROPY_HW_UART1_RX          (7)
+#define MICROPY_HW_UART1_TX          (8)
+#define MICROPY_HW_UART1_CTS         (9)
+#define MICROPY_HW_UART1_RTS         (10)
+#define MICROPY_HW_UART1_HWFC        (1)
+
+// SPI0 config
+#define MICROPY_HW_SPI0_NAME         "SPI0"
+
+#define MICROPY_HW_SPI0_SCK          (19)
+#define MICROPY_HW_SPI0_MOSI         (20)
+#define MICROPY_HW_SPI0_MISO         (21)
+
+#define MICROPY_HW_PWM0_NAME         "PWM0"
+#define MICROPY_HW_PWM1_NAME         "PWM1"
+#define MICROPY_HW_PWM2_NAME         "PWM2"
+#define MICROPY_HW_PWM3_NAME         "PWM3"
+
+#define HELP_TEXT_BOARD_LED          "1,2,3"
diff --git a/ports/nrf/boards/nrf52840-mdk-usb-dongle/mpconfigboard.mk b/ports/nrf/boards/nrf52840-mdk-usb-dongle/mpconfigboard.mk
new file mode 100644
index 0000000000000..f98d5c88a9076
--- /dev/null
+++ b/ports/nrf/boards/nrf52840-mdk-usb-dongle/mpconfigboard.mk
@@ -0,0 +1,7 @@
+MCU_SERIES = m4
+MCU_VARIANT = nrf52
+MCU_SUB_VARIANT = nrf52840
+SOFTDEV_VERSION = 6.1.1
+LD_FILES += boards/nrf52840-mdk-usb-dongle/nrf52840_open_bootloader.ld boards/nrf52840_1M_256k.ld
+
+NRF_DEFINES += -DNRF52840_XXAA
diff --git a/ports/nrf/boards/nrf52840-mdk-usb-dongle/nrf52840_open_bootloader.ld b/ports/nrf/boards/nrf52840-mdk-usb-dongle/nrf52840_open_bootloader.ld
new file mode 100644
index 0000000000000..d6c6e743a4daf
--- /dev/null
+++ b/ports/nrf/boards/nrf52840-mdk-usb-dongle/nrf52840_open_bootloader.ld
@@ -0,0 +1,2 @@
+_ram_start   = 0x20000008;
+_flash_start = 0x1000;
diff --git a/ports/nrf/boards/nrf52840-mdk-usb-dongle/pins.csv b/ports/nrf/boards/nrf52840-mdk-usb-dongle/pins.csv
new file mode 100644
index 0000000000000..57162863778eb
--- /dev/null
+++ b/ports/nrf/boards/nrf52840-mdk-usb-dongle/pins.csv
@@ -0,0 +1,17 @@
+P2,P2,ADC1_CH0
+P3,P3,ADC1_CH1
+P4,P4,ADC1_CH2
+P5,P5,ADC1_CH3
+P6,P6
+P7,P7
+P8,P8
+P9,P9
+P10,P10
+USER,P18,P18
+P19,P19
+P20,P20
+P21,P21
+LED_G,P22,P22
+LED_R,P23,P23
+LED_B,P24,P24
+P25,P25

From 342800c9a24e4a6b6453d3e0a7b96ddfb2ed33db Mon Sep 17 00:00:00 2001
From: Glenn Ruben Bakke <glennbakke@gmail.com>
Date: Thu, 16 Jul 2020 12:10:45 +0200
Subject: [PATCH 0165/3533] travis: Change nrf pca10056 board to build with
 s140 SoftDevice.

It might compile fine with S132 as SoftDevice for nRF52840.
However, there might be different hardware on the SoC which in
turn could make it fail.

SoftDevice S140 is correct BLE stack for nRF52840 SoC and would
provide a more accurate test build.
---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8eb5ef6bae514..48ce39f60ad89 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -299,11 +299,11 @@ jobs:
         - sudo apt-get install libnewlib-arm-none-eabi
         - arm-none-eabi-gcc --version
       script:
-        - ports/nrf/drivers/bluetooth/download_ble_stack.sh s132_nrf52_6_1_1
+        - ports/nrf/drivers/bluetooth/download_ble_stack.sh s140_nrf52_6_1_1
         - make ${MAKEOPTS} -C ports/nrf submodules
         - make ${MAKEOPTS} -C ports/nrf BOARD=pca10040
         - make ${MAKEOPTS} -C ports/nrf BOARD=microbit
-        - make ${MAKEOPTS} -C ports/nrf BOARD=pca10056 SD=s132
+        - make ${MAKEOPTS} -C ports/nrf BOARD=pca10056 SD=s140
         - make ${MAKEOPTS} -C ports/nrf BOARD=pca10090
 
     # bare-arm and minimal ports, with size-diff check

From 5d0be97bd9d8e9511852d2917fe0c6560232e85e Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Wed, 17 Jun 2020 15:10:55 +1000
Subject: [PATCH 0166/3533] unix: Make the MICROPY_xxx_ATOMIC_SECTION mutex
 recursive.

This mutex is used to make the unix port behave more like bare metal, i.e.
it allows "IRQ handlers" to run exclusively by making the mutex recursive.
---
 ports/unix/btstack_usb.c  | 3 +++
 ports/unix/mpthreadport.c | 9 ++++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/ports/unix/btstack_usb.c b/ports/unix/btstack_usb.c
index 76f32d6d27cfa..ab6a49f39ae73 100644
--- a/ports/unix/btstack_usb.c
+++ b/ports/unix/btstack_usb.c
@@ -156,7 +156,10 @@ STATIC void *btstack_thread(void *arg) {
     // Or, if a timeout results in it being set to TIMEOUT.
 
     while (mp_bluetooth_btstack_state == MP_BLUETOOTH_BTSTACK_STATE_STARTING || mp_bluetooth_btstack_state == MP_BLUETOOTH_BTSTACK_STATE_ACTIVE) {
+        // Pretend like we're running in IRQ context (i.e. other things can't be running at the same time).
+        mp_uint_t atomic_state = MICROPY_BEGIN_ATOMIC_SECTION();
         btstack_run_loop_embedded_execute_once();
+        MICROPY_END_ATOMIC_SECTION(atomic_state);
 
         // The USB transport schedules events to the run loop at 1ms intervals,
         // and the implementation currently polls rather than selects.
diff --git a/ports/unix/mpthreadport.c b/ports/unix/mpthreadport.c
index 711cf2a6bbffa..de0f5923bafe9 100644
--- a/ports/unix/mpthreadport.c
+++ b/ports/unix/mpthreadport.c
@@ -65,7 +65,7 @@ STATIC pthread_key_t tls_key;
 // The mutex is used for any code in this port that needs to be thread safe.
 // Specifically for thread management, access to the linked list is one example.
 // But also, e.g. scheduler state.
-STATIC pthread_mutex_t thread_mutex = PTHREAD_MUTEX_INITIALIZER;
+STATIC pthread_mutex_t thread_mutex;
 STATIC thread_t *thread;
 
 // this is used to synchronise the signal handler of the thread
@@ -111,6 +111,13 @@ void mp_thread_init(void) {
     pthread_key_create(&tls_key, NULL);
     pthread_setspecific(tls_key, &mp_state_ctx.thread);
 
+    // Needs to be a recursive mutex to emulate the behavior of
+    // BEGIN_ATOMIC_SECTION on bare metal.
+    pthread_mutexattr_t thread_mutex_attr;
+    pthread_mutexattr_init(&thread_mutex_attr);
+    pthread_mutexattr_settype(&thread_mutex_attr, PTHREAD_MUTEX_RECURSIVE);
+    pthread_mutex_init(&thread_mutex, &thread_mutex_attr);
+
     // create first entry in linked list of all threads
     thread = malloc(sizeof(thread_t));
     thread->id = pthread_self();

From 07aec4681f6ea5173315e660c6ba39cd12a2aa58 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Wed, 17 Jun 2020 13:54:31 +1000
Subject: [PATCH 0167/3533] examples/bluetooth: In ble_advertising.py, skip
 appearance if not set.

---
 examples/bluetooth/ble_advertising.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/examples/bluetooth/ble_advertising.py b/examples/bluetooth/ble_advertising.py
index a496119967a5d..eed527f55d210 100644
--- a/examples/bluetooth/ble_advertising.py
+++ b/examples/bluetooth/ble_advertising.py
@@ -47,7 +47,8 @@ def _append(adv_type, value):
                 _append(_ADV_TYPE_UUID128_COMPLETE, b)
 
     # See org.bluetooth.characteristic.gap.appearance.xml
-    _append(_ADV_TYPE_APPEARANCE, struct.pack("<h", appearance))
+    if appearance:
+        _append(_ADV_TYPE_APPEARANCE, struct.pack("<h", appearance))
 
     return payload
 

From e152d0c19769f26e5416f86fe81afb9376fb531b Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Tue, 16 Jun 2020 21:53:22 +1000
Subject: [PATCH 0168/3533] extmod/btstack: Schedule notify/indicate/write ops
 for bg completion.

The goal of this commit is to allow using ble.gatts_notify() at any time,
even if the stack is not ready to send the notification right now.  It also
addresses the same issue for ble.gatts_indicate() and ble.gattc_write()
(without response).  In addition this commit fixes the case where the
buffer passed to write-with-response wasn't copied, meaning it could be
modified by the caller, affecting the in-progress write.

The changes are:

- gatts_notify/indicate will now run in the background if the ACL buffer is
  currently full, meaning that notify/indicate can be called at any time.

- gattc_write(mode=0) (no response) will now allow for one outstanding
  write.

- gattc_write(mode=1) (with response) will now copy the buffer so that it
  can't be modified by the caller while the write is in progress.

All four paths also now track the buffer while the operation is in
progress, which prevents the GC free'ing the buffer while it's still
needed.
---
 extmod/btstack/modbluetooth_btstack.c         | 284 ++++++++++++++++--
 extmod/btstack/modbluetooth_btstack.h         |   3 +
 extmod/modbluetooth.c                         |  85 ++++--
 extmod/modbluetooth.h                         |   2 +-
 extmod/nimble/modbluetooth_nimble.c           |   6 +-
 tests/multi_bluetooth/ble_characteristic.py   |  24 ++
 .../multi_bluetooth/ble_characteristic.py.exp |   9 +
 7 files changed, 353 insertions(+), 60 deletions(-)

diff --git a/extmod/btstack/modbluetooth_btstack.c b/extmod/btstack/modbluetooth_btstack.c
index 206bc98f9ff71..5b2aec67da247 100644
--- a/extmod/btstack/modbluetooth_btstack.c
+++ b/extmod/btstack/modbluetooth_btstack.c
@@ -53,8 +53,6 @@ STATIC const uint16_t BTSTACK_GAP_DEVICE_NAME_HANDLE = 3;
 
 volatile int mp_bluetooth_btstack_state = MP_BLUETOOTH_BTSTACK_STATE_OFF;
 
-STATIC btstack_packet_callback_registration_t hci_event_callback_registration;
-
 STATIC int btstack_error_to_errno(int err) {
     DEBUG_EVENT_printf("  --> btstack error: %d\n", err);
     if (err == ERROR_CODE_SUCCESS) {
@@ -85,6 +83,159 @@ STATIC mp_obj_bluetooth_uuid_t create_mp_uuid(uint16_t uuid16, const uint8_t *uu
     return result;
 }
 
+// Notes on supporting background ops (e.g. an attempt to gatts_notify while
+// an existing notification is in progress):
+
+// GATTS Notify/Indicate (att_server_notify/indicate)
+// * When available, copies buffer immediately.
+// * Otherwise fails with BTSTACK_ACL_BUFFERS_FULL
+// * Use att_server_request_to_send_notification/indication to get callback
+//   * Takes btstack_context_callback_registration_t (and takes ownership) and conn_handle.
+//   * Callback is invoked with just the context member of the btstack_context_callback_registration_t
+
+// GATTC Write without response (gatt_client_write_value_of_characteristic_without_response)
+// * When available, copies buffer immediately.
+// * Otherwise, fails with GATT_CLIENT_BUSY.
+// * Use gatt_client_request_can_write_without_response_event to get callback
+//   * Takes btstack_packet_handler_t (function pointer) and conn_handle
+//   * Callback is invoked, use gatt_event_can_write_without_response_get_handle to get the conn_handle (no other context)
+//   * There can only be one pending gatt_client_request_can_write_without_response_event (otherwise we fail with EALREADY).
+
+// GATTC Write with response (gatt_client_write_value_of_characteristic)
+// * When peripheral is available, takes ownership of buffer.
+// * Otherwise, fails with GATT_CLIENT_IN_WRONG_STATE (we fail the operation).
+// * Raises GATT_EVENT_QUERY_COMPLETE to the supplied packet handler.
+
+// For notify/indicate/write-without-response that proceed immediately, nothing extra required.
+// For all other cases, buffer needs to be copied and protected from GC.
+// For notify/indicate:
+//  * btstack_context_callback_registration_t:
+//     * needs to be malloc'ed
+//     * needs to be protected from GC
+//     * context arg needs to point back to the callback registration so it can be freed and un-protected
+// For write-without-response
+//  * only the conn_handle is available in the callback
+//  * so we need a queue of conn_handle->(value_handle, copied buffer)
+
+// Pending operation types.
+enum {
+    // Queued for sending when possible.
+    MP_BLUETOOTH_BTSTACK_PENDING_NOTIFY, // Waiting for context callback
+    MP_BLUETOOTH_BTSTACK_PENDING_INDICATE, // Waiting for context callback
+    MP_BLUETOOTH_BTSTACK_PENDING_WRITE_NO_RESPONSE, // Waiting for conn handle
+    // Hold buffer pointer until complete.
+    MP_BLUETOOTH_BTSTACK_PENDING_WRITE, // Waiting for write done event
+};
+
+// Pending operation:
+//  - Holds a GC reference to the copied outgoing buffer.
+//  - Provides enough information for the callback handler to execute the desired operation.
+struct _mp_btstack_pending_op_t {
+    btstack_linked_item_t *next; // Must be first field to match btstack_linked_item.
+
+    // See enum above.
+    uint16_t op_type;
+
+    // For all op types.
+    uint16_t conn_handle;
+    uint16_t value_handle;
+
+    // For notify/indicate only.
+    // context_registration.context will point back to this struct.
+    btstack_context_callback_registration_t context_registration;
+
+    // For notify/indicate/write-without-response, this is the actual buffer to send.
+    // For write-with-response, just holding onto the buffer for GC ref.
+    size_t len;
+    uint8_t buf[];
+};
+
+// Must hold MICROPY_PY_BLUETOOTH_ENTER.
+STATIC void btstack_remove_pending_operation(mp_btstack_pending_op_t *pending_op, bool del) {
+    bool removed = btstack_linked_list_remove(&MP_STATE_PORT(bluetooth_btstack_root_pointers)->pending_ops, (btstack_linked_item_t *)pending_op);
+    assert(removed);
+    (void)removed;
+    if (del) {
+        m_del_var(mp_btstack_pending_op_t, uint8_t, pending_op->len, pending_op);
+    }
+}
+
+// Called in response to a gatts_notify/indicate being unable to complete, which then calls
+// att_server_request_to_send_notification.
+// We now have an opportunity to re-try the operation with an empty ACL buffer.
+STATIC void btstack_notify_indicate_ready_handler(void *context) {
+    MICROPY_PY_BLUETOOTH_ENTER
+    mp_btstack_pending_op_t *pending_op = (mp_btstack_pending_op_t *)context;
+    DEBUG_EVENT_printf("btstack_notify_indicate_ready_handler op_type=%d conn_handle=%d value_handle=%d len=%lu\n", pending_op->op_type, pending_op->conn_handle, pending_op->value_handle, pending_op->len);
+    if (pending_op->op_type == MP_BLUETOOTH_BTSTACK_PENDING_NOTIFY) {
+        int err = att_server_notify(pending_op->conn_handle, pending_op->value_handle, pending_op->buf, pending_op->len);
+        DEBUG_EVENT_printf("btstack_notify_indicate_ready_handler: sending notification err=%d\n", err);
+        assert(err == ERROR_CODE_SUCCESS);
+        (void)err;
+    } else {
+        assert(pending_op->op_type == MP_BLUETOOTH_BTSTACK_PENDING_INDICATE);
+        int err = att_server_indicate(pending_op->conn_handle, pending_op->value_handle, NULL, 0);
+        DEBUG_EVENT_printf("btstack_notify_indicate_ready_handler: sending indication err=%d\n", err);
+        assert(err == ERROR_CODE_SUCCESS);
+        (void)err;
+    }
+    // Can't free the pending op as we're in IRQ context. Leave it for the GC.
+    btstack_remove_pending_operation(pending_op, false /* del */);
+    MICROPY_PY_BLUETOOTH_EXIT
+}
+
+// Register a pending background operation -- copies the buffer, and makes it known to the GC.
+STATIC mp_btstack_pending_op_t *btstack_enqueue_pending_operation(uint16_t op_type, uint16_t conn_handle, uint16_t value_handle, const uint8_t *buf, size_t len) {
+    DEBUG_EVENT_printf("btstack_enqueue_pending_operation op_type=%d conn_handle=%d value_handle=%d len=%lu\n", op_type, conn_handle, value_handle, len);
+    mp_btstack_pending_op_t *pending_op = m_new_obj_var(mp_btstack_pending_op_t, uint8_t, len);
+    pending_op->op_type = op_type;
+    pending_op->conn_handle = conn_handle;
+    pending_op->value_handle = value_handle;
+    pending_op->len = len;
+    memcpy(pending_op->buf, buf, len);
+
+    if (op_type == MP_BLUETOOTH_BTSTACK_PENDING_NOTIFY || op_type == MP_BLUETOOTH_BTSTACK_PENDING_INDICATE) {
+        pending_op->context_registration.callback = &btstack_notify_indicate_ready_handler;
+        pending_op->context_registration.context = pending_op;
+    }
+
+    MICROPY_PY_BLUETOOTH_ENTER
+    bool added = btstack_linked_list_add(&MP_STATE_PORT(bluetooth_btstack_root_pointers)->pending_ops, (btstack_linked_item_t *)pending_op);
+    assert(added);
+    (void)added;
+    MICROPY_PY_BLUETOOTH_EXIT
+
+    return pending_op;
+}
+
+#if MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE
+
+// Cleans up a pending op of the specified type for this conn_handle (and if specified, value_handle).
+// Used by MP_BLUETOOTH_BTSTACK_PENDING_WRITE and MP_BLUETOOTH_BTSTACK_PENDING_WRITE_NO_RESPONSE.
+// At the moment, both will set value_handle=0xffff as the events do not know their value_handle.
+// TODO: Can we make btstack give us the value_handle for regular write (with response) so that we
+// know for sure that we're using the correct entry.
+STATIC mp_btstack_pending_op_t *btstack_finish_pending_operation(uint16_t op_type, uint16_t conn_handle, uint16_t value_handle, bool del) {
+    MICROPY_PY_BLUETOOTH_ENTER
+    DEBUG_EVENT_printf("btstack_finish_pending_operation op_type=%d conn_handle=%d value_handle=%d\n", op_type, conn_handle, value_handle);
+    btstack_linked_list_iterator_t it;
+    btstack_linked_list_iterator_init(&it, &MP_STATE_PORT(bluetooth_btstack_root_pointers)->pending_ops);
+    while (btstack_linked_list_iterator_has_next(&it)) {
+        mp_btstack_pending_op_t *pending_op = (mp_btstack_pending_op_t *)btstack_linked_list_iterator_next(&it);
+
+        if (pending_op->op_type == op_type && pending_op->conn_handle == conn_handle && (value_handle == 0xffff || pending_op->value_handle == value_handle)) {
+            DEBUG_EVENT_printf("btstack_finish_pending_operation: found value_handle=%d len=%lu\n", pending_op->value_handle, pending_op->len);
+            btstack_remove_pending_operation(pending_op, del);
+            MICROPY_PY_BLUETOOTH_EXIT
+            return del ? NULL : pending_op;
+        }
+    }
+    DEBUG_EVENT_printf("btstack_finish_pending_operation: not found\n");
+    MICROPY_PY_BLUETOOTH_EXIT
+    return NULL;
+}
+#endif
+
 STATIC void btstack_packet_handler(uint8_t packet_type, uint8_t *packet, uint8_t irq) {
     DEBUG_EVENT_printf("btstack_packet_handler(packet_type=%u, packet=%p)\n", packet_type, packet);
     if (packet_type != HCI_EVENT_PACKET) {
@@ -161,12 +312,17 @@ STATIC void btstack_packet_handler(uint8_t packet_type, uint8_t *packet, uint8_t
         mp_bluetooth_gap_on_connected_disconnected(irq_event, conn_handle, 0xff, addr);
     #if MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE
     } else if (event_type == GATT_EVENT_QUERY_COMPLETE) {
-        DEBUG_EVENT_printf("  --> gatt query complete\n");
         uint16_t conn_handle = gatt_event_query_complete_get_handle(packet);
         uint16_t status = gatt_event_query_complete_get_att_status(packet);
+        DEBUG_EVENT_printf("  --> gatt query complete irq=%d conn_handle=%d status=%d\n", irq, conn_handle, status);
         if (irq == MP_BLUETOOTH_IRQ_GATTC_READ_DONE || irq == MP_BLUETOOTH_IRQ_GATTC_WRITE_DONE) {
-            // TODO there is no value_handle available to pass here
-            mp_bluetooth_gattc_on_read_write_status(irq, conn_handle, 0, status);
+            // TODO there is no value_handle available to pass here.
+            // TODO try and get this implemented in btstack.
+            mp_bluetooth_gattc_on_read_write_status(irq, conn_handle, 0xffff, status);
+            // Unref the saved buffer for the write operation on this conn_handle.
+            if (irq == MP_BLUETOOTH_IRQ_GATTC_WRITE_DONE) {
+                btstack_finish_pending_operation(MP_BLUETOOTH_BTSTACK_PENDING_WRITE, conn_handle, 0xffff, false /* del */);
+            }
         } else if (irq == MP_BLUETOOTH_IRQ_GATTC_SERVICE_DONE ||
                    irq == MP_BLUETOOTH_IRQ_GATTC_CHARACTERISTIC_DONE ||
                    irq == MP_BLUETOOTH_IRQ_GATTC_DESCRIPTOR_DONE) {
@@ -223,6 +379,16 @@ STATIC void btstack_packet_handler(uint8_t packet_type, uint8_t *packet, uint8_t
         len = mp_bluetooth_gattc_on_data_available_start(MP_BLUETOOTH_IRQ_GATTC_INDICATE, conn_handle, value_handle, len, &atomic_state);
         mp_bluetooth_gattc_on_data_available_chunk(data, len);
         mp_bluetooth_gattc_on_data_available_end(atomic_state);
+    } else if (event_type == GATT_EVENT_CAN_WRITE_WITHOUT_RESPONSE) {
+        uint16_t conn_handle = gatt_event_can_write_without_response_get_handle(packet);
+        DEBUG_EVENT_printf("  --> gatt can write without response %d\n", conn_handle);
+        mp_btstack_pending_op_t *pending_op = btstack_finish_pending_operation(MP_BLUETOOTH_BTSTACK_PENDING_WRITE_NO_RESPONSE, conn_handle, 0xffff, false /* !del */);
+        if (pending_op) {
+            DEBUG_EVENT_printf("  --> ready for value_handle=%d len=%lu\n", pending_op->value_handle, pending_op->len);
+            gatt_client_write_value_of_characteristic_without_response(pending_op->conn_handle, pending_op->value_handle, pending_op->len, (uint8_t *)pending_op->buf);
+            // Note: Can't "del" the pending_op from IRQ context. Leave it for the GC.
+        }
+
     #endif // MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE
     } else {
         DEBUG_EVENT_printf("  --> hci event type: unknown (0x%02x)\n", event_type);
@@ -238,6 +404,10 @@ STATIC void btstack_packet_handler_generic(uint8_t packet_type, uint16_t channel
     btstack_packet_handler(packet_type, packet, 0);
 }
 
+STATIC btstack_packet_callback_registration_t hci_event_callback_registration = {
+    .callback = &btstack_packet_handler_generic
+};
+
 #if MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE
 // For when the handler is being used for service discovery.
 STATIC void btstack_packet_handler_discover_services(uint8_t packet_type, uint16_t channel, uint8_t *packet, uint16_t size) {
@@ -326,7 +496,6 @@ int mp_bluetooth_init(void) {
     #endif
 
     // Register for HCI events.
-    hci_event_callback_registration.callback = &btstack_packet_handler_generic;
     hci_add_event_handler(&hci_event_callback_registration);
 
     // Set a timeout for HCI initialisation.
@@ -410,8 +579,7 @@ size_t mp_bluetooth_gap_get_device_name(const uint8_t **buf) {
 }
 
 int mp_bluetooth_gap_set_device_name(const uint8_t *buf, size_t len) {
-    mp_bluetooth_gatts_db_write(MP_STATE_PORT(bluetooth_btstack_root_pointers)->gatts_db, BTSTACK_GAP_DEVICE_NAME_HANDLE, buf, len);
-    return 0;
+    return mp_bluetooth_gatts_db_write(MP_STATE_PORT(bluetooth_btstack_root_pointers)->gatts_db, BTSTACK_GAP_DEVICE_NAME_HANDLE, buf, len);
 }
 
 int mp_bluetooth_gap_advertise_start(bool connectable, int32_t interval_us, const uint8_t *adv_data, size_t adv_data_len, const uint8_t *sr_data, size_t sr_data_len) {
@@ -556,7 +724,10 @@ int mp_bluetooth_gatts_register_service(mp_obj_bluetooth_uuid_t *service_uuid, m
         if (props & (ATT_PROPERTY_NOTIFY | ATT_PROPERTY_INDICATE)) {
             // btstack creates the CCCB as the next handle.
             mp_bluetooth_gatts_db_create_entry(MP_STATE_PORT(bluetooth_btstack_root_pointers)->gatts_db, handles[handle_index] + 1, MP_BLUETOOTH_CCCB_LEN);
-            mp_bluetooth_gatts_db_write(MP_STATE_PORT(bluetooth_btstack_root_pointers)->gatts_db, handles[handle_index] + 1, cccb_buf, sizeof(cccb_buf));
+            int ret = mp_bluetooth_gatts_db_write(MP_STATE_PORT(bluetooth_btstack_root_pointers)->gatts_db, handles[handle_index] + 1, cccb_buf, sizeof(cccb_buf));
+            if (ret) {
+                return ret;
+            }
         }
         DEBUG_EVENT_printf("Registered char with handle %u\n", handles[handle_index]);
         ++handle_index;
@@ -607,19 +778,63 @@ int mp_bluetooth_gatts_notify(uint16_t conn_handle, uint16_t value_handle) {
     uint8_t *data = NULL;
     size_t len = 0;
     mp_bluetooth_gatts_db_read(MP_STATE_PORT(bluetooth_btstack_root_pointers)->gatts_db, value_handle, &data, &len);
-    return mp_bluetooth_gatts_notify_send(conn_handle, value_handle, data, &len);
+    return mp_bluetooth_gatts_notify_send(conn_handle, value_handle, data, len);
 }
 
-int mp_bluetooth_gatts_notify_send(uint16_t conn_handle, uint16_t value_handle, const uint8_t *value, size_t *value_len) {
+int mp_bluetooth_gatts_notify_send(uint16_t conn_handle, uint16_t value_handle, const uint8_t *value, size_t value_len) {
     DEBUG_EVENT_printf("mp_bluetooth_gatts_notify_send\n");
-    // TODO: We need to use att_server_request_to_send_notification here as the stack may not be ready to send a notification.
-    int err = att_server_notify(conn_handle, value_handle, value, *value_len);
-    return btstack_error_to_errno(err);
+
+    // Attempt to send immediately. If it succeeds, btstack will copy the buffer.
+    MICROPY_PY_BLUETOOTH_ENTER
+    int err = att_server_notify(conn_handle, value_handle, value, value_len);
+    MICROPY_PY_BLUETOOTH_EXIT
+
+    if (err == BTSTACK_ACL_BUFFERS_FULL) {
+        DEBUG_EVENT_printf("mp_bluetooth_gatts_notify_send: ACL buffer full, scheduling callback\n");
+        // Schedule callback, making a copy of the buffer.
+        mp_btstack_pending_op_t *pending_op = btstack_enqueue_pending_operation(MP_BLUETOOTH_BTSTACK_PENDING_NOTIFY, conn_handle, value_handle, value, value_len);
+
+        err = att_server_request_to_send_notification(&pending_op->context_registration, conn_handle);
+
+        if (err != ERROR_CODE_SUCCESS) {
+            // Failure. Unref and free the pending operation.
+            btstack_remove_pending_operation(pending_op, true /* del */);
+        }
+
+        return 0;
+    } else {
+        return btstack_error_to_errno(err);
+    }
 }
 
 int mp_bluetooth_gatts_indicate(uint16_t conn_handle, uint16_t value_handle) {
     DEBUG_EVENT_printf("mp_bluetooth_gatts_indicate\n");
-    return btstack_error_to_errno(att_server_indicate(conn_handle, value_handle, NULL, 0));
+
+    uint8_t *data = NULL;
+    size_t len = 0;
+    mp_bluetooth_gatts_db_read(MP_STATE_PORT(bluetooth_btstack_root_pointers)->gatts_db, value_handle, &data, &len);
+
+    // Attempt to send immediately, will copy buffer.
+    MICROPY_PY_BLUETOOTH_ENTER
+    int err = att_server_indicate(conn_handle, value_handle, data, len);
+    MICROPY_PY_BLUETOOTH_EXIT
+
+    if (err == BTSTACK_ACL_BUFFERS_FULL) {
+        DEBUG_EVENT_printf("mp_bluetooth_gatts_indicate: ACL buffer full, scheduling callback\n");
+        // Schedule callback, making a copy of the buffer.
+        mp_btstack_pending_op_t *pending_op = btstack_enqueue_pending_operation(MP_BLUETOOTH_BTSTACK_PENDING_INDICATE, conn_handle, value_handle, data, len);
+
+        err = att_server_request_to_send_indication(&pending_op->context_registration, conn_handle);
+
+        if (err != ERROR_CODE_SUCCESS) {
+            // Failure. Unref and free the pending operation.
+            btstack_remove_pending_operation(pending_op, true /* del */);
+        }
+
+        return 0;
+    } else {
+        return btstack_error_to_errno(err);
+    }
 }
 
 int mp_bluetooth_gatts_set_buffer(uint16_t value_handle, size_t len, bool append) {
@@ -751,19 +966,42 @@ int mp_bluetooth_gattc_read(uint16_t conn_handle, uint16_t value_handle) {
 int mp_bluetooth_gattc_write(uint16_t conn_handle, uint16_t value_handle, const uint8_t *value, size_t *value_len, unsigned int mode) {
     DEBUG_EVENT_printf("mp_bluetooth_gattc_write\n");
 
-    // TODO the below gatt_client functions do not copy the data and require it to be valid
-    // until the write is done, so there should be some kind of buffering done here.
+    // We should be distinguishing between gatt_client_write_value_of_characteristic vs
+    // gatt_client_write_characteristic_descriptor_using_descriptor_handle.
+    // However both are implemented using send_gatt_write_attribute_value_request under the hood,
+    // and we get the exact same event to the packet handler.
+    // Same story for the "without response" version.
+
+    int err;
+    mp_btstack_pending_op_t *pending_op = NULL;
 
     if (mode == MP_BLUETOOTH_WRITE_MODE_NO_RESPONSE) {
-        // TODO need to call gatt_client_request_can_write_without_response_event then do
-        // the actual write on the callback from that.
-        return btstack_error_to_errno(gatt_client_write_value_of_characteristic_without_response(conn_handle, value_handle, *value_len, (uint8_t *)value));
+        // If possible, this will send immediately, copying the buffer directly to the ACL buffer.
+        err = gatt_client_write_value_of_characteristic_without_response(conn_handle, value_handle, *value_len, (uint8_t *)value);
+        if (err == GATT_CLIENT_BUSY) {
+            DEBUG_EVENT_printf("mp_bluetooth_gattc_write: client busy\n");
+            // Can't send right now, need to take a copy of the buffer and add it to the queue.
+            pending_op = btstack_enqueue_pending_operation(MP_BLUETOOTH_BTSTACK_PENDING_WRITE_NO_RESPONSE, conn_handle, value_handle, value, *value_len);
+            // Notify when this conn_handle can write.
+            err = gatt_client_request_can_write_without_response_event(&btstack_packet_handler_generic, conn_handle);
+        } else {
+            DEBUG_EVENT_printf("mp_bluetooth_gattc_write: other failure: %d\n", err);
+        }
+    } else if (mode == MP_BLUETOOTH_WRITE_MODE_WITH_RESPONSE) {
+        // Pending operation copies the value buffer and keeps a GC reference
+        // until the response comes back (there is always a response).
+        pending_op = btstack_enqueue_pending_operation(MP_BLUETOOTH_BTSTACK_PENDING_WRITE, conn_handle, value_handle, value, *value_len);
+        err = gatt_client_write_value_of_characteristic(&btstack_packet_handler_write_with_response, conn_handle, value_handle, pending_op->len, pending_op->buf);
+    } else {
+        return MP_EINVAL;
     }
-    if (mode == MP_BLUETOOTH_WRITE_MODE_WITH_RESPONSE) {
-        return btstack_error_to_errno(gatt_client_write_value_of_characteristic(&btstack_packet_handler_write_with_response, conn_handle, value_handle, *value_len, (uint8_t *)value));
+
+    if (pending_op && err != ERROR_CODE_SUCCESS) {
+        // Failure. Unref and free the pending operation.
+        btstack_remove_pending_operation(pending_op, true /* del */);
     }
 
-    return MP_EINVAL;
+    return btstack_error_to_errno(err);
 }
 #endif // MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE
 
diff --git a/extmod/btstack/modbluetooth_btstack.h b/extmod/btstack/modbluetooth_btstack.h
index 3bdb5f271e5dd..c943b6d72d548 100644
--- a/extmod/btstack/modbluetooth_btstack.h
+++ b/extmod/btstack/modbluetooth_btstack.h
@@ -33,6 +33,8 @@
 
 #include "lib/btstack/src/btstack.h"
 
+typedef struct _mp_btstack_pending_op_t mp_btstack_pending_op_t;
+
 typedef struct _mp_bluetooth_btstack_root_pointers_t {
     // This stores both the advertising data and the scan response data, concatenated together.
     uint8_t *adv_data;
@@ -45,6 +47,7 @@ typedef struct _mp_bluetooth_btstack_root_pointers_t {
     #if MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE
     // Registration for notify/indicate events.
     gatt_client_notification_t notification;
+    btstack_linked_list_t pending_ops;
     #endif
 } mp_bluetooth_btstack_root_pointers_t;
 
diff --git a/extmod/modbluetooth.c b/extmod/modbluetooth.c
index da40a1548541d..d94e5aec91ef2 100644
--- a/extmod/modbluetooth.c
+++ b/extmod/modbluetooth.c
@@ -321,8 +321,7 @@ STATIC mp_obj_t bluetooth_ble_config(size_t n_args, const mp_obj_t *args, mp_map
                     case MP_QSTR_gap_name: {
                         mp_buffer_info_t bufinfo;
                         mp_get_buffer_raise(e->value, &bufinfo, MP_BUFFER_READ);
-                        int ret = mp_bluetooth_gap_set_device_name(bufinfo.buf, bufinfo.len);
-                        bluetooth_handle_errno(ret);
+                        bluetooth_handle_errno(mp_bluetooth_gap_set_device_name(bufinfo.buf, bufinfo.len));
                         break;
                     }
                     case MP_QSTR_rxbuf: {
@@ -663,10 +662,9 @@ STATIC mp_obj_t bluetooth_ble_gatts_notify(size_t n_args, const mp_obj_t *args)
     if (n_args == 4) {
         mp_buffer_info_t bufinfo = {0};
         mp_get_buffer_raise(args[3], &bufinfo, MP_BUFFER_READ);
-        size_t len = bufinfo.len;
-        int err = mp_bluetooth_gatts_notify_send(conn_handle, value_handle, bufinfo.buf, &len);
+        int err = mp_bluetooth_gatts_notify_send(conn_handle, value_handle, bufinfo.buf, bufinfo.len);
         bluetooth_handle_errno(err);
-        return MP_OBJ_NEW_SMALL_INT(len);
+        return mp_const_none;
     } else {
         int err = mp_bluetooth_gatts_notify(conn_handle, value_handle);
         return bluetooth_handle_errno(err);
@@ -674,6 +672,15 @@ STATIC mp_obj_t bluetooth_ble_gatts_notify(size_t n_args, const mp_obj_t *args)
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(bluetooth_ble_gatts_notify_obj, 3, 4, bluetooth_ble_gatts_notify);
 
+STATIC mp_obj_t bluetooth_ble_gatts_indicate(mp_obj_t self_in, mp_obj_t conn_handle_in, mp_obj_t value_handle_in) {
+    mp_int_t conn_handle = mp_obj_get_int(conn_handle_in);
+    mp_int_t value_handle = mp_obj_get_int(value_handle_in);
+
+    int err = mp_bluetooth_gatts_indicate(conn_handle, value_handle);
+    return bluetooth_handle_errno(err);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_3(bluetooth_ble_gatts_indicate_obj, bluetooth_ble_gatts_indicate);
+
 STATIC mp_obj_t bluetooth_ble_gatts_set_buffer(size_t n_args, const mp_obj_t *args) {
     mp_int_t value_handle = mp_obj_get_int(args[1]);
     mp_int_t len = mp_obj_get_int(args[2]);
@@ -765,6 +772,7 @@ STATIC const mp_rom_map_elem_t bluetooth_ble_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_gatts_read), MP_ROM_PTR(&bluetooth_ble_gatts_read_obj) },
     { MP_ROM_QSTR(MP_QSTR_gatts_write), MP_ROM_PTR(&bluetooth_ble_gatts_write_obj) },
     { MP_ROM_QSTR(MP_QSTR_gatts_notify), MP_ROM_PTR(&bluetooth_ble_gatts_notify_obj) },
+    { MP_ROM_QSTR(MP_QSTR_gatts_indicate), MP_ROM_PTR(&bluetooth_ble_gatts_indicate_obj) },
     { MP_ROM_QSTR(MP_QSTR_gatts_set_buffer), MP_ROM_PTR(&bluetooth_ble_gatts_set_buffer_obj) },
     #if MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE
     // GATT Client (i.e. central/scanner role)
@@ -1147,47 +1155,58 @@ mp_bluetooth_gatts_db_entry_t *mp_bluetooth_gatts_db_lookup(mp_gatts_db_t db, ui
 }
 
 int mp_bluetooth_gatts_db_read(mp_gatts_db_t db, uint16_t handle, uint8_t **value, size_t *value_len) {
+    MICROPY_PY_BLUETOOTH_ENTER
     mp_bluetooth_gatts_db_entry_t *entry = mp_bluetooth_gatts_db_lookup(db, handle);
-    if (!entry) {
-        return MP_EINVAL;
-    }
-
-    *value = entry->data;
-    *value_len = entry->data_len;
-    if (entry->append) {
-        entry->data_len = 0;
+    if (entry) {
+        *value = entry->data;
+        *value_len = entry->data_len;
+        if (entry->append) {
+            entry->data_len = 0;
+        }
     }
-
-    return 0;
+    MICROPY_PY_BLUETOOTH_EXIT
+    return entry ? 0 : MP_EINVAL;
 }
 
 int mp_bluetooth_gatts_db_write(mp_gatts_db_t db, uint16_t handle, const uint8_t *value, size_t value_len) {
+    MICROPY_PY_BLUETOOTH_ENTER
     mp_bluetooth_gatts_db_entry_t *entry = mp_bluetooth_gatts_db_lookup(db, handle);
-    if (!entry) {
-        return MP_EINVAL;
-    }
+    if (entry) {
+        if (value_len > entry->data_alloc) {
+            uint8_t *data = m_new_maybe(uint8_t, value_len);
+            if (data) {
+                entry->data = data;
+                entry->data_alloc = value_len;
+            } else {
+                MICROPY_PY_BLUETOOTH_EXIT
+                return MP_ENOMEM;
+            }
+        }
 
-    if (value_len > entry->data_alloc) {
-        entry->data = m_new(uint8_t, value_len);
-        entry->data_alloc = value_len;
+        memcpy(entry->data, value, value_len);
+        entry->data_len = value_len;
     }
-
-    memcpy(entry->data, value, value_len);
-    entry->data_len = value_len;
-
-    return 0;
+    MICROPY_PY_BLUETOOTH_EXIT
+    return entry ? 0 : MP_EINVAL;
 }
 
 int mp_bluetooth_gatts_db_resize(mp_gatts_db_t db, uint16_t handle, size_t len, bool append) {
+    MICROPY_PY_BLUETOOTH_ENTER
     mp_bluetooth_gatts_db_entry_t *entry = mp_bluetooth_gatts_db_lookup(db, handle);
-    if (!entry) {
-        return MP_EINVAL;
+    if (entry) {
+        uint8_t *data = m_renew_maybe(uint8_t, entry->data, entry->data_alloc, len, true);
+        if (data) {
+            entry->data = data;
+            entry->data_alloc = len;
+            entry->data_len = 0;
+            entry->append = append;
+        } else {
+            MICROPY_PY_BLUETOOTH_EXIT
+            return MP_ENOMEM;
+        }
     }
-    entry->data = m_renew(uint8_t, entry->data, entry->data_alloc, len);
-    entry->data_alloc = len;
-    entry->data_len = 0;
-    entry->append = append;
-    return 0;
+    MICROPY_PY_BLUETOOTH_EXIT
+    return entry ? 0 : MP_EINVAL;
 }
 
 #endif // MICROPY_PY_BLUETOOTH
diff --git a/extmod/modbluetooth.h b/extmod/modbluetooth.h
index c8b8dc63f2a67..a232ee2d1d095 100644
--- a/extmod/modbluetooth.h
+++ b/extmod/modbluetooth.h
@@ -199,7 +199,7 @@ int mp_bluetooth_gatts_write(uint16_t value_handle, const uint8_t *value, size_t
 // Notify the central that it should do a read.
 int mp_bluetooth_gatts_notify(uint16_t conn_handle, uint16_t value_handle);
 // Notify the central, including a data payload. (Note: does not set the gatts db value).
-int mp_bluetooth_gatts_notify_send(uint16_t conn_handle, uint16_t value_handle, const uint8_t *value, size_t *value_len);
+int mp_bluetooth_gatts_notify_send(uint16_t conn_handle, uint16_t value_handle, const uint8_t *value, size_t value_len);
 // Indicate the central.
 int mp_bluetooth_gatts_indicate(uint16_t conn_handle, uint16_t value_handle);
 
diff --git a/extmod/nimble/modbluetooth_nimble.c b/extmod/nimble/modbluetooth_nimble.c
index be7d13d9e6f5d..2e94685131d87 100644
--- a/extmod/nimble/modbluetooth_nimble.c
+++ b/extmod/nimble/modbluetooth_nimble.c
@@ -587,13 +587,13 @@ int mp_bluetooth_gatts_notify(uint16_t conn_handle, uint16_t value_handle) {
     return ble_hs_err_to_errno(ble_gattc_notify(conn_handle, value_handle));
 }
 
-int mp_bluetooth_gatts_notify_send(uint16_t conn_handle, uint16_t value_handle, const uint8_t *value, size_t *value_len) {
+int mp_bluetooth_gatts_notify_send(uint16_t conn_handle, uint16_t value_handle, const uint8_t *value, size_t value_len) {
     if (!mp_bluetooth_is_active()) {
         return ERRNO_BLUETOOTH_NOT_ACTIVE;
     }
-    struct os_mbuf *om = ble_hs_mbuf_from_flat(value, *value_len);
+    struct os_mbuf *om = ble_hs_mbuf_from_flat(value, value_len);
     if (om == NULL) {
-        return -1;
+        return MP_ENOMEM;
     }
     // TODO: check that notify_custom takes ownership of om, if not os_mbuf_free_chain(om).
     return ble_hs_err_to_errno(ble_gattc_notify_custom(conn_handle, value_handle, om));
diff --git a/tests/multi_bluetooth/ble_characteristic.py b/tests/multi_bluetooth/ble_characteristic.py
index 33d92b823bbb2..fd6fd467248de 100644
--- a/tests/multi_bluetooth/ble_characteristic.py
+++ b/tests/multi_bluetooth/ble_characteristic.py
@@ -16,6 +16,7 @@
 _IRQ_GATTC_READ_DONE = const(16)
 _IRQ_GATTC_WRITE_DONE = const(17)
 _IRQ_GATTC_NOTIFY = const(18)
+_IRQ_GATTC_INDICATE = const(19)
 
 SERVICE_UUID = bluetooth.UUID("A5A5A5A5-FFFF-9999-1111-5A5A5A5A5A5A")
 CHAR_UUID = bluetooth.UUID("00000000-1111-2222-3333-444444444444")
@@ -59,6 +60,8 @@ def irq(event, data):
         print("_IRQ_GATTC_WRITE_DONE", data[-1])
     elif event == _IRQ_GATTC_NOTIFY:
         print("_IRQ_GATTC_NOTIFY", data[-1])
+    elif event == _IRQ_GATTC_INDICATE:
+        print("_IRQ_GATTC_INDICATE", data[-1])
 
     if waiting_event is not None:
         if (isinstance(waiting_event, int) and event == waiting_event) or (
@@ -115,6 +118,16 @@ def instance0():
         print("gatts_notify")
         ble.gatts_notify(conn_handle, char_handle, "periph2")
 
+        # Wait for a write to the characteristic from the central.
+        wait_for_event(_IRQ_GATTS_WRITE, TIMEOUT_MS)
+
+        # Wait a bit, then notify a new value on the characteristic.
+        time.sleep_ms(1000)
+        print("gatts_write")
+        ble.gatts_write(char_handle, "periph3")
+        print("gatts_indicate")
+        ble.gatts_indicate(conn_handle, char_handle)
+
         # Wait for the central to disconnect.
         wait_for_event(_IRQ_CENTRAL_DISCONNECT, TIMEOUT_MS)
     finally:
@@ -163,6 +176,17 @@ def instance1():
         ble.gattc_read(conn_handle, value_handle)
         wait_for_event(_IRQ_GATTC_READ_RESULT, TIMEOUT_MS)
 
+        # Write to the characteristic, and ask for a response.
+        print("gattc_write")
+        ble.gattc_write(conn_handle, value_handle, "central2", 1)
+        wait_for_event(_IRQ_GATTC_WRITE_DONE, TIMEOUT_MS)
+
+        # Wait for a indicate (should have new data), then read new value.
+        wait_for_event(_IRQ_GATTC_INDICATE, TIMEOUT_MS)
+        print("gattc_read")
+        ble.gattc_read(conn_handle, value_handle)
+        wait_for_event(_IRQ_GATTC_READ_RESULT, TIMEOUT_MS)
+
         # Disconnect from peripheral.
         print("gap_disconnect:", ble.gap_disconnect(conn_handle))
         wait_for_event(_IRQ_PERIPHERAL_DISCONNECT, TIMEOUT_MS)
diff --git a/tests/multi_bluetooth/ble_characteristic.py.exp b/tests/multi_bluetooth/ble_characteristic.py.exp
index d89842ef7b097..7f66a4d907455 100644
--- a/tests/multi_bluetooth/ble_characteristic.py.exp
+++ b/tests/multi_bluetooth/ble_characteristic.py.exp
@@ -6,6 +6,9 @@ gatts_write
 gatts_notify
 _IRQ_GATTS_WRITE b'central1'
 gatts_notify
+_IRQ_GATTS_WRITE b'central2'
+gatts_write
+gatts_indicate
 _IRQ_CENTRAL_DISCONNECT
 --- instance1 ---
 gap_connect
@@ -26,5 +29,11 @@ _IRQ_GATTC_NOTIFY b'periph2'
 gattc_read
 _IRQ_GATTC_READ_RESULT b'central1'
 _IRQ_GATTC_READ_DONE 0
+gattc_write
+_IRQ_GATTC_WRITE_DONE 0
+_IRQ_GATTC_INDICATE b'periph3'
+gattc_read
+_IRQ_GATTC_READ_RESULT b'periph3'
+_IRQ_GATTC_READ_DONE 0
 gap_disconnect: True
 _IRQ_PERIPHERAL_DISCONNECT

From 89a95b7c85cd90967020b80a0a4649b2f745bea8 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Wed, 17 Jun 2020 14:57:52 +1000
Subject: [PATCH 0169/3533] examples/bluetooth: Add simple UART demo with
 central and peripheral.

---
 examples/bluetooth/ble_simple_central.py    | 245 ++++++++++++++++++++
 examples/bluetooth/ble_simple_peripheral.py |  98 ++++++++
 2 files changed, 343 insertions(+)
 create mode 100644 examples/bluetooth/ble_simple_central.py
 create mode 100644 examples/bluetooth/ble_simple_peripheral.py

diff --git a/examples/bluetooth/ble_simple_central.py b/examples/bluetooth/ble_simple_central.py
new file mode 100644
index 0000000000000..f6996366e3da1
--- /dev/null
+++ b/examples/bluetooth/ble_simple_central.py
@@ -0,0 +1,245 @@
+# This example finds and connects to a peripheral running the
+# UART service (e.g. ble_simple_peripheral.py).
+
+import bluetooth
+import random
+import struct
+import time
+import micropython
+
+from ble_advertising import decode_services, decode_name
+
+from micropython import const
+
+_IRQ_CENTRAL_CONNECT = const(1)
+_IRQ_CENTRAL_DISCONNECT = const(2)
+_IRQ_GATTS_WRITE = const(3)
+_IRQ_GATTS_READ_REQUEST = const(4)
+_IRQ_SCAN_RESULT = const(5)
+_IRQ_SCAN_DONE = const(6)
+_IRQ_PERIPHERAL_CONNECT = const(7)
+_IRQ_PERIPHERAL_DISCONNECT = const(8)
+_IRQ_GATTC_SERVICE_RESULT = const(9)
+_IRQ_GATTC_SERVICE_DONE = const(10)
+_IRQ_GATTC_CHARACTERISTIC_RESULT = const(11)
+_IRQ_GATTC_CHARACTERISTIC_DONE = const(12)
+_IRQ_GATTC_DESCRIPTOR_RESULT = const(13)
+_IRQ_GATTC_DESCRIPTOR_DONE = const(14)
+_IRQ_GATTC_READ_RESULT = const(15)
+_IRQ_GATTC_READ_DONE = const(16)
+_IRQ_GATTC_WRITE_DONE = const(17)
+_IRQ_GATTC_NOTIFY = const(18)
+_IRQ_GATTC_INDICATE = const(19)
+
+_ADV_IND = const(0x00)
+_ADV_DIRECT_IND = const(0x01)
+_ADV_SCAN_IND = const(0x02)
+_ADV_NONCONN_IND = const(0x03)
+
+_UART_SERVICE_UUID = bluetooth.UUID("6E400001-B5A3-F393-E0A9-E50E24DCCA9E")
+_UART_RX_CHAR_UUID = bluetooth.UUID("6E400002-B5A3-F393-E0A9-E50E24DCCA9E")
+_UART_TX_CHAR_UUID = bluetooth.UUID("6E400003-B5A3-F393-E0A9-E50E24DCCA9E")
+
+
+class BLESimpleCentral:
+    def __init__(self, ble):
+        self._ble = ble
+        self._ble.active(True)
+        self._ble.irq(handler=self._irq)
+
+        self._reset()
+
+    def _reset(self):
+        # Cached name and address from a successful scan.
+        self._name = None
+        self._addr_type = None
+        self._addr = None
+
+        # Callbacks for completion of various operations.
+        # These reset back to None after being invoked.
+        self._scan_callback = None
+        self._conn_callback = None
+        self._read_callback = None
+
+        # Persistent callback for when new data is notified from the device.
+        self._notify_callback = None
+
+        # Connected device.
+        self._conn_handle = None
+        self._start_handle = None
+        self._end_handle = None
+        self._tx_handle = None
+        self._rx_handle = None
+
+    def _irq(self, event, data):
+        if event == _IRQ_SCAN_RESULT:
+            addr_type, addr, adv_type, rssi, adv_data = data
+            if adv_type in (_ADV_IND, _ADV_DIRECT_IND,) and _UART_SERVICE_UUID in decode_services(
+                adv_data
+            ):
+                # Found a potential device, remember it and stop scanning.
+                self._addr_type = addr_type
+                self._addr = bytes(
+                    addr
+                )  # Note: addr buffer is owned by caller so need to copy it.
+                self._name = decode_name(adv_data) or "?"
+                self._ble.gap_scan(None)
+
+        elif event == _IRQ_SCAN_DONE:
+            if self._scan_callback:
+                if self._addr:
+                    # Found a device during the scan (and the scan was explicitly stopped).
+                    self._scan_callback(self._addr_type, self._addr, self._name)
+                    self._scan_callback = None
+                else:
+                    # Scan timed out.
+                    self._scan_callback(None, None, None)
+
+        elif event == _IRQ_PERIPHERAL_CONNECT:
+            # Connect successful.
+            conn_handle, addr_type, addr, = data
+            if addr_type == self._addr_type and addr == self._addr:
+                self._conn_handle = conn_handle
+                self._ble.gattc_discover_services(self._conn_handle)
+
+        elif event == _IRQ_PERIPHERAL_DISCONNECT:
+            # Disconnect (either initiated by us or the remote end).
+            conn_handle, _, _, = data
+            if conn_handle == self._conn_handle:
+                # If it was initiated by us, it'll already be reset.
+                self._reset()
+
+        elif event == _IRQ_GATTC_SERVICE_RESULT:
+            # Connected device returned a service.
+            conn_handle, start_handle, end_handle, uuid = data
+            print("service", data)
+            if conn_handle == self._conn_handle and uuid == _UART_SERVICE_UUID:
+                self._start_handle, self._end_handle = start_handle, end_handle
+
+        elif event == _IRQ_GATTC_SERVICE_DONE:
+            # Service query complete.
+            if self._start_handle and self._end_handle:
+                self._ble.gattc_discover_characteristics(
+                    self._conn_handle, self._start_handle, self._end_handle
+                )
+            else:
+                print("Failed to find uart service.")
+
+        elif event == _IRQ_GATTC_CHARACTERISTIC_RESULT:
+            # Connected device returned a characteristic.
+            conn_handle, def_handle, value_handle, properties, uuid = data
+            if conn_handle == self._conn_handle and uuid == _UART_RX_CHAR_UUID:
+                self._rx_handle = value_handle
+            if conn_handle == self._conn_handle and uuid == _UART_TX_CHAR_UUID:
+                self._tx_handle = value_handle
+
+        elif event == _IRQ_GATTC_CHARACTERISTIC_DONE:
+            # Characteristic query complete.
+            if self._tx_handle is not None and self._rx_handle is not None:
+                # We've finished connecting and discovering device, fire the connect callback.
+                if self._conn_callback:
+                    self._conn_callback()
+            else:
+                print("Failed to find uart rx characteristic.")
+
+        elif event == _IRQ_GATTC_WRITE_DONE:
+            conn_handle, value_handle, status = data
+            print("TX complete")
+
+        elif event == _IRQ_GATTC_NOTIFY:
+            conn_handle, value_handle, notify_data = data
+            if conn_handle == self._conn_handle and value_handle == self._tx_handle:
+                if self._notify_callback:
+                    self._notify_callback(notify_data)
+
+    # Returns true if we've successfully connected and discovered characteristics.
+    def is_connected(self):
+        return (
+            self._conn_handle is not None
+            and self._tx_handle is not None
+            and self._rx_handle is not None
+        )
+
+    # Find a device advertising the environmental sensor service.
+    def scan(self, callback=None):
+        self._addr_type = None
+        self._addr = None
+        self._scan_callback = callback
+        self._ble.gap_scan(2000, 30000, 30000)
+
+    # Connect to the specified device (otherwise use cached address from a scan).
+    def connect(self, addr_type=None, addr=None, callback=None):
+        self._addr_type = addr_type or self._addr_type
+        self._addr = addr or self._addr
+        self._conn_callback = callback
+        if self._addr_type is None or self._addr is None:
+            return False
+        self._ble.gap_connect(self._addr_type, self._addr)
+        return True
+
+    # Disconnect from current device.
+    def disconnect(self):
+        if not self._conn_handle:
+            return
+        self._ble.gap_disconnect(self._conn_handle)
+        self._reset()
+
+    # Send data over the UART
+    def write(self, v, response=False):
+        if not self.is_connected():
+            return
+        self._ble.gattc_write(self._conn_handle, self._rx_handle, v, 1 if response else 0)
+
+    # Set handler for when data is received over the UART.
+    def on_notify(self, callback):
+        self._notify_callback = callback
+
+
+def demo():
+    ble = bluetooth.BLE()
+    central = BLESimpleCentral(ble)
+
+    not_found = False
+
+    def on_scan(addr_type, addr, name):
+        if addr_type is not None:
+            print("Found peripheral:", addr_type, addr, name)
+            central.connect()
+        else:
+            nonlocal not_found
+            not_found = True
+            print("No peripheral found.")
+
+    central.scan(callback=on_scan)
+
+    # Wait for connection...
+    while not central.is_connected():
+        time.sleep_ms(100)
+        if not_found:
+            return
+
+    print("Connected")
+
+    def on_rx(v):
+        print("RX", v)
+
+    central.on_notify(on_rx)
+
+    with_response = False
+
+    i = 0
+    while central.is_connected():
+        try:
+            v = str(i) + "_"
+            print("TX", v)
+            central.write(v, with_response)
+        except:
+            print("TX failed")
+        i += 1
+        time.sleep_ms(400 if with_response else 30)
+
+    print("Disconnected")
+
+
+if __name__ == "__main__":
+    demo()
diff --git a/examples/bluetooth/ble_simple_peripheral.py b/examples/bluetooth/ble_simple_peripheral.py
new file mode 100644
index 0000000000000..08cd7fa98d69c
--- /dev/null
+++ b/examples/bluetooth/ble_simple_peripheral.py
@@ -0,0 +1,98 @@
+# This example demonstrates a UART periperhal.
+
+import bluetooth
+import random
+import struct
+import time
+from ble_advertising import advertising_payload
+
+from micropython import const
+
+_IRQ_CENTRAL_CONNECT = const(1)
+_IRQ_CENTRAL_DISCONNECT = const(2)
+_IRQ_GATTS_WRITE = const(3)
+
+_UART_UUID = bluetooth.UUID("6E400001-B5A3-F393-E0A9-E50E24DCCA9E")
+_UART_TX = (
+    bluetooth.UUID("6E400003-B5A3-F393-E0A9-E50E24DCCA9E"),
+    bluetooth.FLAG_READ | bluetooth.FLAG_NOTIFY,
+)
+_UART_RX = (
+    bluetooth.UUID("6E400002-B5A3-F393-E0A9-E50E24DCCA9E"),
+    bluetooth.FLAG_WRITE | bluetooth.FLAG_WRITE_NO_RESPONSE,
+)
+_UART_SERVICE = (
+    _UART_UUID,
+    (_UART_TX, _UART_RX,),
+)
+
+
+class BLESimplePeripheral:
+    def __init__(self, ble, name="mpy-uart"):
+        self._ble = ble
+        self._ble.active(True)
+        self._ble.irq(handler=self._irq)
+        ((self._handle_tx, self._handle_rx,),) = self._ble.gatts_register_services(
+            (_UART_SERVICE,)
+        )
+        self._connections = set()
+        self._write_callback = None
+        self._payload = advertising_payload(name=name, services=[_UART_UUID],)
+        self._advertise()
+
+    def _irq(self, event, data):
+        # Track connections so we can send notifications.
+        if event == _IRQ_CENTRAL_CONNECT:
+            conn_handle, _, _, = data
+            print("New connection", conn_handle)
+            self._connections.add(conn_handle)
+        elif event == _IRQ_CENTRAL_DISCONNECT:
+            conn_handle, _, _, = data
+            print("Disconnected", conn_handle)
+            self._connections.remove(conn_handle)
+            # Start advertising again to allow a new connection.
+            self._advertise()
+        elif event == _IRQ_GATTS_WRITE:
+            conn_handle, value_handle = data
+            value = self._ble.gatts_read(value_handle)
+            if value_handle == self._handle_rx and self._write_callback:
+                self._write_callback(value)
+
+    def send(self, data):
+        for conn_handle in self._connections:
+            self._ble.gatts_notify(conn_handle, self._handle_tx, data)
+
+    def is_connected(self):
+        return len(self._connections) > 0
+
+    def _advertise(self, interval_us=500000):
+        print("Starting advertising")
+        self._ble.gap_advertise(interval_us, adv_data=self._payload)
+
+    def on_write(self, callback):
+        self._write_callback = callback
+
+
+def demo():
+    ble = bluetooth.BLE()
+    p = BLESimplePeripheral(ble)
+
+    def on_rx(v):
+        print("RX", v)
+
+    p.on_write(on_rx)
+
+    i = 0
+    while True:
+        if p.is_connected():
+            # Short burst of queued notifications.
+            for _ in range(3):
+                data = str(i) + "_"
+                print("TX", data)
+                p.send(data)
+                i += 1
+        time.sleep_ms(100)
+
+
+if __name__ == "__main__":
+    demo()

From b7698841b20cd20a6729ba9d9f19a93f4fd33a5c Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Fri, 17 Jul 2020 15:18:32 +1000
Subject: [PATCH 0170/3533] docs/library: Add gatts_indicate() doc to
 ubluetooth.rst.

Also clarify behavior of `gatts_notify` and add some TODOs about adding an
event for indication acknowledgement.
---
 docs/library/ubluetooth.rst           | 43 +++++++++++++++++----------
 extmod/btstack/modbluetooth_btstack.c |  2 ++
 extmod/nimble/modbluetooth_nimble.c   |  2 ++
 3 files changed, 32 insertions(+), 15 deletions(-)

diff --git a/docs/library/ubluetooth.rst b/docs/library/ubluetooth.rst
index f96a7caaf828e..ed2ffefe750ad 100644
--- a/docs/library/ubluetooth.rst
+++ b/docs/library/ubluetooth.rst
@@ -48,7 +48,8 @@ Configuration
     - ``'mac'``: Returns the device MAC address. If a device has a fixed address
       (e.g. PYBD) then it will be returned. Otherwise (e.g. ESP32) a random
       address will be generated when the BLE interface is made active.
-      Note: on some ports, accessing this value requires that the interface is
+
+      **Note:** on some ports, accessing this value requires that the interface is
       active (so that the MAC address can be queried from the controller).
 
     - ``'gap_name'``: Get/set the GAP device name used by service 0x1800,
@@ -71,12 +72,12 @@ Event Handling
     arguments, ``event`` (which will be one of the codes below) and ``data``
     (which is an event-specific tuple of values).
 
-    Note: the ``addr``, ``adv_data``, ``char_data``, ``notify_data``, and
-    ``uuid`` entries in the tuples are
-    references to data managed by the :mod:`ubluetooth` module (i.e. the same
-    instance will be re-used across multiple calls to the event handler). If
-    your program wants to use this data outside of the handler, then it must
-    copy them first, e.g. by using ``bytes(addr)`` or ``bluetooth.UUID(uuid)``.
+    **Note:** the ``addr``, ``adv_data``, ``char_data``, ``notify_data``, and
+    ``uuid`` entries in the tuples are references to data managed by the
+    :mod:`ubluetooth` module (i.e. the same instance will be re-used across
+    multiple calls to the event handler). If your program wants to use this
+    data outside of the handler, then it must copy them first, e.g. by using
+    ``bytes(addr)`` or ``bluetooth.UUID(uuid)``.
 
     An event handler showing all possible events::
 
@@ -189,7 +190,7 @@ Broadcaster Role (Advertiser)
     protocol (e.g. ``bytes``, ``bytearray``, ``str``). *adv_data* is included
     in all broadcasts, and *resp_data* is send in reply to an active scan.
 
-    Note: if *adv_data* (or *resp_data*) is ``None``, then the data passed
+    **Note:** if *adv_data* (or *resp_data*) is ``None``, then the data passed
     to the previous call to ``gap_advertise`` will be re-used. This allows a
     broadcaster to resume advertising with just ``gap_advertise(interval_us)``.
     To clear the advertising payload pass an empty ``bytes``, i.e. ``b''``.
@@ -280,8 +281,8 @@ writes from a central to a given characteristic, use
         ( (hr,), (tx, rx,), ) = bt.gatts_register_services(SERVICES)
 
     The three value handles (``hr``, ``tx``, ``rx``) can be used with
-    :meth:`gatts_read <BLE.gatts_read>`, :meth:`gatts_write <BLE.gatts_write>`,
-    and :meth:`gatts_notify <BLE.gatts_notify>`.
+    :meth:`gatts_read <BLE.gatts_read>`, :meth:`gatts_write <BLE.gatts_write>`, :meth:`gatts_notify <BLE.gatts_notify>`, and
+    :meth:`gatts_indicate <BLE.gatts_indicate>`.
 
     **Note:** Advertising must be stopped before registering services.
 
@@ -296,12 +297,24 @@ writes from a central to a given characteristic, use
 
 .. method:: BLE.gatts_notify(conn_handle, value_handle, [data])
 
-    Notifies a connected central that this value has changed and that it should
-    issue a read of the current value from this peripheral.
+    Sends a notification request to a connected central.
+
+    If *data* is specified, then that value is sent to the central as part of
+    the notification. The local value will not be modified.
+
+    Otherwise, if *data* is not specified, then the current local value (as
+    set with :meth:`gatts_write <BLE.gatts_write>`) will be sent.
+
+.. method:: BLE.gatts_indicate(conn_handle, value_handle)
+
+    Sends an indication request to a connected central.
+
+    **Note:** This does not currently support sending a custom value, it will
+    always send the current local value (as set with :meth:`gatts_write
+    <BLE.gatts_write>`).
 
-    If *data* is specified, then the that value is sent to the central as part
-    of the notification, avoiding the need for a separate read request. Note
-    that this will not update the local value stored.
+    **Note:** This does not currently support generating an event for sucessful
+    acknowledgment of the indication.
 
 .. method:: BLE.gatts_set_buffer(value_handle, len, append=False, /)
 
diff --git a/extmod/btstack/modbluetooth_btstack.c b/extmod/btstack/modbluetooth_btstack.c
index 5b2aec67da247..b114275b6e87c 100644
--- a/extmod/btstack/modbluetooth_btstack.c
+++ b/extmod/btstack/modbluetooth_btstack.c
@@ -814,6 +814,8 @@ int mp_bluetooth_gatts_indicate(uint16_t conn_handle, uint16_t value_handle) {
     size_t len = 0;
     mp_bluetooth_gatts_db_read(MP_STATE_PORT(bluetooth_btstack_root_pointers)->gatts_db, value_handle, &data, &len);
 
+    // TODO: Handle ATT_EVENT_HANDLE_VALUE_INDICATION_COMPLETE to generate acknowledgment event.
+
     // Attempt to send immediately, will copy buffer.
     MICROPY_PY_BLUETOOTH_ENTER
     int err = att_server_indicate(conn_handle, value_handle, data, len);
diff --git a/extmod/nimble/modbluetooth_nimble.c b/extmod/nimble/modbluetooth_nimble.c
index 2e94685131d87..b859213aabd3d 100644
--- a/extmod/nimble/modbluetooth_nimble.c
+++ b/extmod/nimble/modbluetooth_nimble.c
@@ -603,6 +603,8 @@ int mp_bluetooth_gatts_indicate(uint16_t conn_handle, uint16_t value_handle) {
     if (!mp_bluetooth_is_active()) {
         return ERRNO_BLUETOOTH_NOT_ACTIVE;
     }
+    // TODO: catch BLE_GAP_EVENT_NOTIFY_TX to raise an event for completed
+    // indication transaction.
     return ble_hs_err_to_errno(ble_gattc_indicate(conn_handle, value_handle));
 }
 

From 43ceadac5503ac6854dd0d400bd13b93f36dd6a6 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Mon, 20 Jul 2020 11:29:19 +1000
Subject: [PATCH 0171/3533] extmod/modbluetooth: Ignore unused self_in in
 ble_gatts_indicate.

---
 extmod/modbluetooth.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/extmod/modbluetooth.c b/extmod/modbluetooth.c
index d94e5aec91ef2..ced67365a68ad 100644
--- a/extmod/modbluetooth.c
+++ b/extmod/modbluetooth.c
@@ -673,6 +673,7 @@ STATIC mp_obj_t bluetooth_ble_gatts_notify(size_t n_args, const mp_obj_t *args)
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(bluetooth_ble_gatts_notify_obj, 3, 4, bluetooth_ble_gatts_notify);
 
 STATIC mp_obj_t bluetooth_ble_gatts_indicate(mp_obj_t self_in, mp_obj_t conn_handle_in, mp_obj_t value_handle_in) {
+    (void)self_in;
     mp_int_t conn_handle = mp_obj_get_int(conn_handle_in);
     mp_int_t value_handle = mp_obj_get_int(value_handle_in);
 

From 3c7ca2004c78ec386e136b947ed5e05a39b61aaf Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Mon, 20 Jul 2020 11:46:55 +1000
Subject: [PATCH 0172/3533] extmod/modbluetooth: Fix so it builds in
 peripheral-only mode.

---
 extmod/btstack/modbluetooth_btstack.c | 22 ++++++++++++----------
 extmod/btstack/modbluetooth_btstack.h |  3 ++-
 extmod/modbluetooth.c                 |  2 ++
 extmod/nimble/modbluetooth_nimble.c   | 14 +++++++-------
 4 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/extmod/btstack/modbluetooth_btstack.c b/extmod/btstack/modbluetooth_btstack.c
index b114275b6e87c..d25b01d815591 100644
--- a/extmod/btstack/modbluetooth_btstack.c
+++ b/extmod/btstack/modbluetooth_btstack.c
@@ -70,6 +70,7 @@ STATIC int btstack_error_to_errno(int err) {
     }
 }
 
+#if MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE
 STATIC mp_obj_bluetooth_uuid_t create_mp_uuid(uint16_t uuid16, const uint8_t *uuid128) {
     mp_obj_bluetooth_uuid_t result;
     if (uuid16 != 0) {
@@ -82,6 +83,7 @@ STATIC mp_obj_bluetooth_uuid_t create_mp_uuid(uint16_t uuid16, const uint8_t *uu
     }
     return result;
 }
+#endif
 
 // Notes on supporting background ops (e.g. an attempt to gatts_notify while
 // an existing notification is in progress):
@@ -286,16 +288,6 @@ STATIC void btstack_packet_handler(uint8_t packet_type, uint8_t *packet, uint8_t
         DEBUG_EVENT_printf("  --> btstack # conns changed\n");
     } else if (event_type == HCI_EVENT_VENDOR_SPECIFIC) {
         DEBUG_EVENT_printf("  --> hci vendor specific\n");
-    } else if (event_type == GAP_EVENT_ADVERTISING_REPORT) {
-        DEBUG_EVENT_printf("  --> gap advertising report\n");
-        bd_addr_t address;
-        gap_event_advertising_report_get_address(packet, address);
-        uint8_t adv_event_type = gap_event_advertising_report_get_advertising_event_type(packet);
-        uint8_t address_type = gap_event_advertising_report_get_address_type(packet);
-        int8_t rssi = gap_event_advertising_report_get_rssi(packet);
-        uint8_t length = gap_event_advertising_report_get_data_length(packet);
-        const uint8_t *data = gap_event_advertising_report_get_data(packet);
-        mp_bluetooth_gap_on_scan_result(address_type, address, adv_event_type, rssi, data, length);
     } else if (event_type == HCI_EVENT_DISCONNECTION_COMPLETE) {
         DEBUG_EVENT_printf("  --> hci disconnect complete\n");
         uint16_t conn_handle = hci_event_disconnection_complete_get_connection_handle(packet);
@@ -311,6 +303,16 @@ STATIC void btstack_packet_handler(uint8_t packet_type, uint8_t *packet, uint8_t
         uint8_t addr[6] = {0};
         mp_bluetooth_gap_on_connected_disconnected(irq_event, conn_handle, 0xff, addr);
     #if MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE
+    } else if (event_type == GAP_EVENT_ADVERTISING_REPORT) {
+        DEBUG_EVENT_printf("  --> gap advertising report\n");
+        bd_addr_t address;
+        gap_event_advertising_report_get_address(packet, address);
+        uint8_t adv_event_type = gap_event_advertising_report_get_advertising_event_type(packet);
+        uint8_t address_type = gap_event_advertising_report_get_address_type(packet);
+        int8_t rssi = gap_event_advertising_report_get_rssi(packet);
+        uint8_t length = gap_event_advertising_report_get_data_length(packet);
+        const uint8_t *data = gap_event_advertising_report_get_data(packet);
+        mp_bluetooth_gap_on_scan_result(address_type, address, adv_event_type, rssi, data, length);
     } else if (event_type == GATT_EVENT_QUERY_COMPLETE) {
         uint16_t conn_handle = gatt_event_query_complete_get_handle(packet);
         uint16_t status = gatt_event_query_complete_get_att_status(packet);
diff --git a/extmod/btstack/modbluetooth_btstack.h b/extmod/btstack/modbluetooth_btstack.h
index c943b6d72d548..2fad86f22605e 100644
--- a/extmod/btstack/modbluetooth_btstack.h
+++ b/extmod/btstack/modbluetooth_btstack.h
@@ -44,10 +44,11 @@ typedef struct _mp_bluetooth_btstack_root_pointers_t {
     // Characteristic (and descriptor) value storage.
     mp_gatts_db_t gatts_db;
 
+    btstack_linked_list_t pending_ops;
+
     #if MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE
     // Registration for notify/indicate events.
     gatt_client_notification_t notification;
-    btstack_linked_list_t pending_ops;
     #endif
 } mp_bluetooth_btstack_root_pointers_t;
 
diff --git a/extmod/modbluetooth.c b/extmod/modbluetooth.c
index ced67365a68ad..fb5c6ac8c99ab 100644
--- a/extmod/modbluetooth.c
+++ b/extmod/modbluetooth.c
@@ -836,10 +836,12 @@ STATIC void ringbuf_extract(ringbuf_t *ringbuf, mp_obj_tuple_t *data_tuple, size
         // Note the int8_t got packed into the ringbuf as a uint8_t.
         data_tuple->items[j++] = MP_OBJ_NEW_SMALL_INT((int8_t)ringbuf_get(ringbuf));
     }
+    #if MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE
     if (uuid) {
         ringbuf_get_uuid(ringbuf, uuid);
         data_tuple->items[j++] = MP_OBJ_FROM_PTR(uuid);
     }
+    #endif
     // The code that enqueues into the ringbuf should ensure that it doesn't
     // put more than bt->irq_data_data_alloc bytes into the ringbuf, because
     // that's what's available here in bt->irq_data_bytes.
diff --git a/extmod/nimble/modbluetooth_nimble.c b/extmod/nimble/modbluetooth_nimble.c
index b859213aabd3d..d60e23ecb4b9b 100644
--- a/extmod/nimble/modbluetooth_nimble.c
+++ b/extmod/nimble/modbluetooth_nimble.c
@@ -96,6 +96,13 @@ STATIC ble_uuid_t *create_nimble_uuid(const mp_obj_bluetooth_uuid_t *uuid, ble_u
     }
 }
 
+// modbluetooth (and the layers above it) work in BE for addresses, Nimble works in LE.
+STATIC void reverse_addr_byte_order(uint8_t *addr_out, const uint8_t *addr_in) {
+    for (int i = 0; i < 6; ++i) {
+        addr_out[i] = addr_in[5 - i];
+    }
+}
+
 #if MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE
 
 STATIC mp_obj_bluetooth_uuid_t create_mp_uuid(const ble_uuid_any_t *uuid) {
@@ -123,13 +130,6 @@ STATIC mp_obj_bluetooth_uuid_t create_mp_uuid(const ble_uuid_any_t *uuid) {
     return result;
 }
 
-// modbluetooth (and the layers above it) work in BE for addresses, Nimble works in LE.
-STATIC void reverse_addr_byte_order(uint8_t *addr_out, const uint8_t *addr_in) {
-    for (int i = 0; i < 6; ++i) {
-        addr_out[i] = addr_in[5 - i];
-    }
-}
-
 STATIC ble_addr_t create_nimble_addr(uint8_t addr_type, const uint8_t *addr) {
     ble_addr_t addr_nimble;
     addr_nimble.type = addr_type;

From 9d823a5d9a6730edde8e1df1e5ff4add1ad17094 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Mon, 20 Jul 2020 16:58:10 +1000
Subject: [PATCH 0173/3533] extmod/modbluetooth: Add event for "indicate
 acknowledgement".

This commit adds the IRQ_GATTS_INDICATE_DONE BLE event which will be raised
with the status of gatts_indicate (unlike notify, indications require
acknowledgement).

An example of its use is added to ble_temperature.py, and to the multitests
in ble_characteristic.py.

Implemented for btstack and nimble bindings, tested in both directions
between unix/btstack and pybd/nimble.
---
 examples/bluetooth/ble_temperature.py         | 19 +++++---
 extmod/btstack/modbluetooth_btstack.c         | 44 ++++++++++++++++---
 extmod/modbluetooth.c                         | 15 +++++++
 extmod/modbluetooth.h                         |  6 +++
 extmod/nimble/modbluetooth_nimble.c           | 13 +++++-
 tests/multi_bluetooth/ble_characteristic.py   |  8 +++-
 .../multi_bluetooth/ble_characteristic.py.exp |  1 +
 7 files changed, 92 insertions(+), 14 deletions(-)

diff --git a/examples/bluetooth/ble_temperature.py b/examples/bluetooth/ble_temperature.py
index fd24e74d7498a..0e2da2239d50a 100644
--- a/examples/bluetooth/ble_temperature.py
+++ b/examples/bluetooth/ble_temperature.py
@@ -13,13 +13,14 @@
 
 _IRQ_CENTRAL_CONNECT = const(1)
 _IRQ_CENTRAL_DISCONNECT = const(2)
+_IRQ_GATTS_INDICATE_DONE = const(20)
 
 # org.bluetooth.service.environmental_sensing
 _ENV_SENSE_UUID = bluetooth.UUID(0x181A)
 # org.bluetooth.characteristic.temperature
 _TEMP_CHAR = (
     bluetooth.UUID(0x2A6E),
-    bluetooth.FLAG_READ | bluetooth.FLAG_NOTIFY,
+    bluetooth.FLAG_READ | bluetooth.FLAG_NOTIFY | bluetooth.FLAG_INDICATE,
 )
 _ENV_SENSE_SERVICE = (
     _ENV_SENSE_UUID,
@@ -52,15 +53,21 @@ def _irq(self, event, data):
             self._connections.remove(conn_handle)
             # Start advertising again to allow a new connection.
             self._advertise()
+        elif event == _IRQ_GATTS_INDICATE_DONE:
+            conn_handle, value_handle, status, = data
 
-    def set_temperature(self, temp_deg_c, notify=False):
+    def set_temperature(self, temp_deg_c, notify=False, indicate=False):
         # Data is sint16 in degrees Celsius with a resolution of 0.01 degrees Celsius.
         # Write the local value, ready for a central to read.
         self._ble.gatts_write(self._handle, struct.pack("<h", int(temp_deg_c * 100)))
-        if notify:
+        if notify or indicate:
             for conn_handle in self._connections:
-                # Notify connected centrals to issue a read.
-                self._ble.gatts_notify(conn_handle, self._handle)
+                if notify:
+                    # Notify connected centrals.
+                    self._ble.gatts_notify(conn_handle, self._handle)
+                if indicate:
+                    # Indicate connected centrals.
+                    self._ble.gatts_indicate(conn_handle, self._handle)
 
     def _advertise(self, interval_us=500000):
         self._ble.gap_advertise(interval_us, adv_data=self._payload)
@@ -76,7 +83,7 @@ def demo():
     while True:
         # Write every second, notify every 10 seconds.
         i = (i + 1) % 10
-        temp.set_temperature(t, notify=i == 0)
+        temp.set_temperature(t, notify=i == 0, indicate=False)
         # Random walk the temperature.
         t += random.uniform(-0.5, 0.5)
         time.sleep_ms(1000)
diff --git a/extmod/btstack/modbluetooth_btstack.c b/extmod/btstack/modbluetooth_btstack.c
index d25b01d815591..c7269d33ed5ca 100644
--- a/extmod/btstack/modbluetooth_btstack.c
+++ b/extmod/btstack/modbluetooth_btstack.c
@@ -238,18 +238,46 @@ STATIC mp_btstack_pending_op_t *btstack_finish_pending_operation(uint16_t op_typ
 }
 #endif
 
-STATIC void btstack_packet_handler(uint8_t packet_type, uint8_t *packet, uint8_t irq) {
-    DEBUG_EVENT_printf("btstack_packet_handler(packet_type=%u, packet=%p)\n", packet_type, packet);
+// This needs to be separate to btstack_packet_handler otherwise we get
+// dual-delivery of the HCI_EVENT_LE_META event.
+STATIC void btstack_packet_handler_att_server(uint8_t packet_type, uint16_t channel, uint8_t *packet, uint16_t size) {
+    (void)channel;
+    (void)size;
+    DEBUG_EVENT_printf("btstack_packet_handler_att_server(packet_type=%u, packet=%p)\n", packet_type, packet);
     if (packet_type != HCI_EVENT_PACKET) {
         return;
     }
 
     uint8_t event_type = hci_event_packet_get_type(packet);
+
     if (event_type == ATT_EVENT_CONNECTED) {
         DEBUG_EVENT_printf("  --> att connected\n");
+        // The ATT_EVENT_*CONNECTED events are fired for both peripheral and central role, with no way to tell which.
+        // So we use the HCI_EVENT_LE_META event directly in the main packet handler.
     } else if (event_type == ATT_EVENT_DISCONNECTED) {
         DEBUG_EVENT_printf("  --> att disconnected\n");
-    } else if (event_type == HCI_EVENT_LE_META) {
+    } else if (event_type == ATT_EVENT_HANDLE_VALUE_INDICATION_COMPLETE) {
+        DEBUG_EVENT_printf("  --> att indication complete\n");
+        uint16_t conn_handle = att_event_handle_value_indication_complete_get_conn_handle(packet);
+        uint16_t value_handle = att_event_handle_value_indication_complete_get_attribute_handle(packet);
+        uint8_t status = att_event_handle_value_indication_complete_get_status(packet);
+        mp_bluetooth_gatts_on_indicate_complete(conn_handle, value_handle, status);
+    } else if (event_type == HCI_EVENT_LE_META || event_type == HCI_EVENT_DISCONNECTION_COMPLETE) {
+        // Ignore, duplicated by att_server.c.
+    } else {
+        DEBUG_EVENT_printf("  --> hci att server event type: unknown (0x%02x)\n", event_type);
+    }
+}
+
+STATIC void btstack_packet_handler(uint8_t packet_type, uint8_t *packet, uint8_t irq) {
+    DEBUG_EVENT_printf("btstack_packet_handler(packet_type=%u, packet=%p)\n", packet_type, packet);
+    if (packet_type != HCI_EVENT_PACKET) {
+        return;
+    }
+
+    uint8_t event_type = hci_event_packet_get_type(packet);
+
+    if (event_type == HCI_EVENT_LE_META) {
         DEBUG_EVENT_printf("  --> hci le meta\n");
         if (hci_event_le_meta_get_subevent_code(packet) == HCI_SUBEVENT_LE_CONNECTION_COMPLETE) {
             uint16_t conn_handle = hci_subevent_le_connection_complete_get_connection_handle(packet);
@@ -277,7 +305,7 @@ STATIC void btstack_packet_handler(uint8_t packet_type, uint8_t *packet, uint8_t
             mp_bluetooth_btstack_state = MP_BLUETOOTH_BTSTACK_STATE_OFF;
         }
     } else if (event_type == HCI_EVENT_TRANSPORT_PACKET_SENT) {
-        DEBUG_EVENT_printf("  --> hci transport packet set\n");
+        DEBUG_EVENT_printf("  --> hci transport packet sent\n");
     } else if (event_type == HCI_EVENT_COMMAND_COMPLETE) {
         DEBUG_EVENT_printf("  --> hci command complete\n");
     } else if (event_type == HCI_EVENT_COMMAND_STATUS) {
@@ -288,6 +316,8 @@ STATIC void btstack_packet_handler(uint8_t packet_type, uint8_t *packet, uint8_t
         DEBUG_EVENT_printf("  --> btstack # conns changed\n");
     } else if (event_type == HCI_EVENT_VENDOR_SPECIFIC) {
         DEBUG_EVENT_printf("  --> hci vendor specific\n");
+    } else if (event_type == GATT_EVENT_MTU) {
+        DEBUG_EVENT_printf("  --> hci MTU\n");
     } else if (event_type == HCI_EVENT_DISCONNECTION_COMPLETE) {
         DEBUG_EVENT_printf("  --> hci disconnect complete\n");
         uint16_t conn_handle = hci_event_disconnection_complete_get_connection_handle(packet);
@@ -500,6 +530,9 @@ int mp_bluetooth_init(void) {
     // Register for HCI events.
     hci_add_event_handler(&hci_event_callback_registration);
 
+    // Register for ATT server events.
+    att_server_register_packet_handler(&btstack_packet_handler_att_server);
+
     // Set a timeout for HCI initialisation.
     btstack_run_loop_set_timer(&btstack_init_deinit_timeout, BTSTACK_INIT_DEINIT_TIMEOUT_MS);
     btstack_run_loop_set_timer_handler(&btstack_init_deinit_timeout, btstack_init_deinit_timeout_handler);
@@ -816,7 +849,8 @@ int mp_bluetooth_gatts_indicate(uint16_t conn_handle, uint16_t value_handle) {
     size_t len = 0;
     mp_bluetooth_gatts_db_read(MP_STATE_PORT(bluetooth_btstack_root_pointers)->gatts_db, value_handle, &data, &len);
 
-    // TODO: Handle ATT_EVENT_HANDLE_VALUE_INDICATION_COMPLETE to generate acknowledgment event.
+    // Indicate will raise ATT_EVENT_HANDLE_VALUE_INDICATION_COMPLETE when
+    // acknowledged (or timeout/error).
 
     // Attempt to send immediately, will copy buffer.
     MICROPY_PY_BLUETOOTH_ENTER
diff --git a/extmod/modbluetooth.c b/extmod/modbluetooth.c
index fb5c6ac8c99ab..7bfb774782048 100644
--- a/extmod/modbluetooth.c
+++ b/extmod/modbluetooth.c
@@ -800,6 +800,7 @@ STATIC const mp_rom_map_elem_t mp_module_bluetooth_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_FLAG_READ), MP_ROM_INT(MP_BLUETOOTH_CHARACTERISTIC_FLAG_READ) },
     { MP_ROM_QSTR(MP_QSTR_FLAG_WRITE), MP_ROM_INT(MP_BLUETOOTH_CHARACTERISTIC_FLAG_WRITE) },
     { MP_ROM_QSTR(MP_QSTR_FLAG_NOTIFY), MP_ROM_INT(MP_BLUETOOTH_CHARACTERISTIC_FLAG_NOTIFY) },
+    { MP_ROM_QSTR(MP_QSTR_FLAG_INDICATE), MP_ROM_INT(MP_BLUETOOTH_CHARACTERISTIC_FLAG_INDICATE) },
     { MP_ROM_QSTR(MP_QSTR_FLAG_WRITE_NO_RESPONSE), MP_ROM_INT(MP_BLUETOOTH_CHARACTERISTIC_FLAG_WRITE_NO_RESPONSE) },
 };
 
@@ -887,6 +888,9 @@ STATIC mp_obj_t bluetooth_ble_invoke_irq(mp_obj_t none_in) {
         } else if (event == MP_BLUETOOTH_IRQ_GATTS_WRITE) {
             // conn_handle, value_handle
             ringbuf_extract(&o->ringbuf, data_tuple, 2, 0, NULL, 0, NULL, NULL);
+        } else if (event == MP_BLUETOOTH_IRQ_GATTS_INDICATE_DONE) {
+            // conn_handle, value_handle, status
+            ringbuf_extract(&o->ringbuf, data_tuple, 2, 1, NULL, 0, NULL, NULL);
         #if MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE
         } else if (event == MP_BLUETOOTH_IRQ_SCAN_RESULT) {
             // addr_type, addr, adv_type, rssi, adv_data
@@ -999,6 +1003,17 @@ void mp_bluetooth_gatts_on_write(uint16_t conn_handle, uint16_t value_handle) {
     schedule_ringbuf(atomic_state);
 }
 
+void mp_bluetooth_gatts_on_indicate_complete(uint16_t conn_handle, uint16_t value_handle, uint8_t status) {
+    MICROPY_PY_BLUETOOTH_ENTER
+    mp_obj_bluetooth_ble_t *o = MP_OBJ_TO_PTR(MP_STATE_VM(bluetooth));
+    if (enqueue_irq(o, 2 + 2 + 1, MP_BLUETOOTH_IRQ_GATTS_INDICATE_DONE)) {
+        ringbuf_put16(&o->ringbuf, conn_handle);
+        ringbuf_put16(&o->ringbuf, value_handle);
+        ringbuf_put(&o->ringbuf, status);
+    }
+    schedule_ringbuf(atomic_state);
+}
+
 #if MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE
 void mp_bluetooth_gap_on_scan_complete(void) {
     MICROPY_PY_BLUETOOTH_ENTER
diff --git a/extmod/modbluetooth.h b/extmod/modbluetooth.h
index a232ee2d1d095..cdb86e5e63c44 100644
--- a/extmod/modbluetooth.h
+++ b/extmod/modbluetooth.h
@@ -68,6 +68,7 @@
 #define MP_BLUETOOTH_CHARACTERISTIC_FLAG_WRITE_NO_RESPONSE (1 << 2)
 #define MP_BLUETOOTH_CHARACTERISTIC_FLAG_WRITE    (1 << 3)
 #define MP_BLUETOOTH_CHARACTERISTIC_FLAG_NOTIFY   (1 << 4)
+#define MP_BLUETOOTH_CHARACTERISTIC_FLAG_INDICATE (1 << 5)
 
 // For mp_bluetooth_gattc_write, the mode parameter
 #define MP_BLUETOOTH_WRITE_MODE_NO_RESPONSE     (0)
@@ -107,6 +108,7 @@
 #define MP_BLUETOOTH_IRQ_GATTC_WRITE_DONE               (17)
 #define MP_BLUETOOTH_IRQ_GATTC_NOTIFY                   (18)
 #define MP_BLUETOOTH_IRQ_GATTC_INDICATE                 (19)
+#define MP_BLUETOOTH_IRQ_GATTS_INDICATE_DONE            (20)
 
 /*
 These aren't included in the module for space reasons, but can be used
@@ -132,6 +134,7 @@ _IRQ_GATTC_READ_DONE = const(16)
 _IRQ_GATTC_WRITE_DONE = const(17)
 _IRQ_GATTC_NOTIFY = const(18)
 _IRQ_GATTC_INDICATE = const(19)
+_IRQ_GATTS_INDICATE_DONE = const(20)
 */
 
 // Common UUID type.
@@ -245,6 +248,9 @@ void mp_bluetooth_gap_on_connected_disconnected(uint8_t event, uint16_t conn_han
 // Call this when a characteristic is written to.
 void mp_bluetooth_gatts_on_write(uint16_t conn_handle, uint16_t value_handle);
 
+// Call this when an acknowledgment is received for an indication.
+void mp_bluetooth_gatts_on_indicate_complete(uint16_t conn_handle, uint16_t value_handle, uint8_t status);
+
 #if MICROPY_PY_BLUETOOTH_GATTS_ON_READ_CALLBACK
 // Call this when a characteristic is read from. Return false to deny the read.
 bool mp_bluetooth_gatts_on_read_request(uint16_t conn_handle, uint16_t value_handle);
diff --git a/extmod/nimble/modbluetooth_nimble.c b/extmod/nimble/modbluetooth_nimble.c
index d60e23ecb4b9b..843989b2b8986 100644
--- a/extmod/nimble/modbluetooth_nimble.c
+++ b/extmod/nimble/modbluetooth_nimble.c
@@ -248,6 +248,15 @@ STATIC int gap_event_cb(struct ble_gap_event *event, void *arg) {
             reverse_addr_byte_order(addr, event->disconnect.conn.peer_id_addr.val);
             mp_bluetooth_gap_on_connected_disconnected(MP_BLUETOOTH_IRQ_CENTRAL_DISCONNECT, event->disconnect.conn.conn_handle, event->disconnect.conn.peer_id_addr.type, addr);
             break;
+
+        case BLE_GAP_EVENT_NOTIFY_TX: {
+            DEBUG_EVENT_printf("gap_event_cb: notify_tx: %d %d\n", event->notify_tx.indication, event->notify_tx.status);
+            // This event corresponds to either a sent notify/indicate (status == 0), or an indication confirmation (status != 0).
+            if (event->notify_tx.indication && event->notify_tx.status != 0) {
+                // Map "done/ack" to 0, otherwise pass the status directly.
+                mp_bluetooth_gatts_on_indicate_complete(event->notify_tx.conn_handle, event->notify_tx.attr_handle, event->notify_tx.status == BLE_HS_EDONE ? 0 : event->notify_tx.status);
+            }
+        }
     }
 
     return 0;
@@ -603,8 +612,8 @@ int mp_bluetooth_gatts_indicate(uint16_t conn_handle, uint16_t value_handle) {
     if (!mp_bluetooth_is_active()) {
         return ERRNO_BLUETOOTH_NOT_ACTIVE;
     }
-    // TODO: catch BLE_GAP_EVENT_NOTIFY_TX to raise an event for completed
-    // indication transaction.
+    // This will raise BLE_GAP_EVENT_NOTIFY_TX with a status when it is
+    // acknowledged (or timeout/error).
     return ble_hs_err_to_errno(ble_gattc_indicate(conn_handle, value_handle));
 }
 
diff --git a/tests/multi_bluetooth/ble_characteristic.py b/tests/multi_bluetooth/ble_characteristic.py
index fd6fd467248de..0d72c181fdec6 100644
--- a/tests/multi_bluetooth/ble_characteristic.py
+++ b/tests/multi_bluetooth/ble_characteristic.py
@@ -17,12 +17,13 @@
 _IRQ_GATTC_WRITE_DONE = const(17)
 _IRQ_GATTC_NOTIFY = const(18)
 _IRQ_GATTC_INDICATE = const(19)
+_IRQ_GATTS_INDICATE_DONE = const(20)
 
 SERVICE_UUID = bluetooth.UUID("A5A5A5A5-FFFF-9999-1111-5A5A5A5A5A5A")
 CHAR_UUID = bluetooth.UUID("00000000-1111-2222-3333-444444444444")
 CHAR = (
     CHAR_UUID,
-    bluetooth.FLAG_READ | bluetooth.FLAG_WRITE | bluetooth.FLAG_NOTIFY,
+    bluetooth.FLAG_READ | bluetooth.FLAG_WRITE | bluetooth.FLAG_NOTIFY | bluetooth.FLAG_INDICATE,
 )
 SERVICE = (
     SERVICE_UUID,
@@ -62,6 +63,8 @@ def irq(event, data):
         print("_IRQ_GATTC_NOTIFY", data[-1])
     elif event == _IRQ_GATTC_INDICATE:
         print("_IRQ_GATTC_INDICATE", data[-1])
+    elif event == _IRQ_GATTS_INDICATE_DONE:
+        print("_IRQ_GATTS_INDICATE_DONE", data[-1])
 
     if waiting_event is not None:
         if (isinstance(waiting_event, int) and event == waiting_event) or (
@@ -128,6 +131,9 @@ def instance0():
         print("gatts_indicate")
         ble.gatts_indicate(conn_handle, char_handle)
 
+        # Wait for the indicate ack.
+        wait_for_event(_IRQ_GATTS_INDICATE_DONE, TIMEOUT_MS)
+
         # Wait for the central to disconnect.
         wait_for_event(_IRQ_CENTRAL_DISCONNECT, TIMEOUT_MS)
     finally:
diff --git a/tests/multi_bluetooth/ble_characteristic.py.exp b/tests/multi_bluetooth/ble_characteristic.py.exp
index 7f66a4d907455..25b5544efc459 100644
--- a/tests/multi_bluetooth/ble_characteristic.py.exp
+++ b/tests/multi_bluetooth/ble_characteristic.py.exp
@@ -9,6 +9,7 @@ gatts_notify
 _IRQ_GATTS_WRITE b'central2'
 gatts_write
 gatts_indicate
+_IRQ_GATTS_INDICATE_DONE 0
 _IRQ_CENTRAL_DISCONNECT
 --- instance1 ---
 gap_connect

From c7f7c0214c433d52204fe73613bd6162507a0482 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Mon, 20 Jul 2020 17:33:12 +1000
Subject: [PATCH 0174/3533] docs/library: For ubluetooth, add docs for
 _IRQ_GATTS_INDICATE_DONE.

---
 docs/library/ubluetooth.rst | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/docs/library/ubluetooth.rst b/docs/library/ubluetooth.rst
index ed2ffefe750ad..e103932efd2f6 100644
--- a/docs/library/ubluetooth.rst
+++ b/docs/library/ubluetooth.rst
@@ -148,6 +148,10 @@ Event Handling
             elif event == _IRQ_GATTC_INDICATE:
                 # A peripheral has sent an indicate request.
                 conn_handle, value_handle, notify_data = data
+            elif event == _IRQ_GATTS_INDICATE_DONE:
+                # A central has acknowledged the indication.
+                # Note: Status will be zero on successful acknowledgment, implementation-specific value otherwise.
+                conn_handle, value_handle, status = data
 
 The event codes are::
 
@@ -171,6 +175,7 @@ The event codes are::
     _IRQ_GATTC_WRITE_DONE = const(17)
     _IRQ_GATTC_NOTIFY = const(18)
     _IRQ_GATTC_INDICATE = const(19)
+    _IRQ_GATTS_INDICATE_DONE = const(20)
 
 In order to save space in the firmware, these constants are not included on the
 :mod:`ubluetooth` module. Add the ones that you need from the list above to your
@@ -313,8 +318,8 @@ writes from a central to a given characteristic, use
     always send the current local value (as set with :meth:`gatts_write
     <BLE.gatts_write>`).
 
-    **Note:** This does not currently support generating an event for sucessful
-    acknowledgment of the indication.
+    On acknowledgment (or failure, e.g. timeout), the
+    ``_IRQ_GATTS_INDICATE_DONE`` event will be raised.
 
 .. method:: BLE.gatts_set_buffer(value_handle, len, append=False, /)
 

From 9aa214077e6d1e0fba1a775431fedea4c8d76558 Mon Sep 17 00:00:00 2001
From: Thorsten von Eicken <tve@voneicken.com>
Date: Thu, 26 Mar 2020 23:17:35 -0700
Subject: [PATCH 0175/3533] extmod/modussl: Improve exception error messages.

This commit adds human readable error messages when mbedtls or axtls raise
an exception.  Currently often just an EIO error is raised so the user is
lost and can't tell whether it's a cert error, buffer overrun, connecting
to a non-ssl port, etc.  The axtls and mbedtls error raising in the ussl
module is modified to raise:

    OSError(-err_num, "error string")

For axtls a small error table of strings is added and used for the second
argument of the OSErrer.  For mbedtls the code uses mbedtls' built-in
strerror function, and if there is an out of memory condition it just
produces OSError(-err_num).  Producing the error string for mbedtls is
conditional on them being included in the mbedtls build, via
MBEDTLS_ERROR_C.
---
 extmod/modussl_axtls.c               | 55 ++++++++++++++++++++++++++--
 extmod/modussl_mbedtls.c             | 43 ++++++++++++++++++++--
 tests/extmod/ussl_basic.py           |  2 +-
 tests/extmod/ussl_basic.py.exp       |  3 +-
 tests/net_inet/tls_num_errors.py     | 44 ++++++++++++++++++++++
 tests/net_inet/tls_num_errors.py.exp |  2 +
 tests/net_inet/tls_text_errors.py    | 33 +++++++++++++++++
 7 files changed, 173 insertions(+), 9 deletions(-)
 create mode 100644 tests/net_inet/tls_num_errors.py
 create mode 100644 tests/net_inet/tls_num_errors.py.exp
 create mode 100644 tests/net_inet/tls_text_errors.py

diff --git a/extmod/modussl_axtls.c b/extmod/modussl_axtls.c
index 7b0e3cbcbc327..0b0ce35fc8711 100644
--- a/extmod/modussl_axtls.c
+++ b/extmod/modussl_axtls.c
@@ -29,6 +29,7 @@
 
 #include "py/runtime.h"
 #include "py/stream.h"
+#include "py/objstr.h"
 
 #if MICROPY_PY_USSL && MICROPY_SSL_AXTLS
 
@@ -54,6 +55,56 @@ struct ssl_args {
 
 STATIC const mp_obj_type_t ussl_socket_type;
 
+// Table of errors
+struct ssl_errs {
+    int16_t errnum;
+    const char *errstr;
+};
+STATIC const struct ssl_errs ssl_error_tab[] = {
+    { SSL_NOT_OK, "NOT_OK" },
+    { SSL_ERROR_DEAD, "DEAD" },
+    { SSL_CLOSE_NOTIFY, "CLOSE_NOTIFY" },
+    { SSL_EAGAIN, "EAGAIN" },
+    { SSL_ERROR_CONN_LOST, "CONN_LOST" },
+    { SSL_ERROR_RECORD_OVERFLOW, "RECORD_OVERFLOW" },
+    { SSL_ERROR_SOCK_SETUP_FAILURE, "SOCK_SETUP_FAILURE" },
+    { SSL_ERROR_INVALID_HANDSHAKE, "INVALID_HANDSHAKE" },
+    { SSL_ERROR_INVALID_PROT_MSG, "INVALID_PROT_MSG" },
+    { SSL_ERROR_INVALID_HMAC, "INVALID_HMAC" },
+    { SSL_ERROR_INVALID_VERSION, "INVALID_VERSION" },
+    { SSL_ERROR_UNSUPPORTED_EXTENSION, "UNSUPPORTED_EXTENSION" },
+    { SSL_ERROR_INVALID_SESSION, "INVALID_SESSION" },
+    { SSL_ERROR_NO_CIPHER, "NO_CIPHER" },
+    { SSL_ERROR_INVALID_CERT_HASH_ALG, "INVALID_CERT_HASH_ALG" },
+    { SSL_ERROR_BAD_CERTIFICATE, "BAD_CERTIFICATE" },
+    { SSL_ERROR_INVALID_KEY, "INVALID_KEY" },
+    { SSL_ERROR_FINISHED_INVALID, "FINISHED_INVALID" },
+    { SSL_ERROR_NO_CERT_DEFINED, "NO_CERT_DEFINED" },
+    { SSL_ERROR_NO_CLIENT_RENOG, "NO_CLIENT_RENOG" },
+    { SSL_ERROR_NOT_SUPPORTED, "NOT_SUPPORTED" },
+};
+
+STATIC NORETURN void ussl_raise_error(int err) {
+    for (size_t i = 0; i < MP_ARRAY_SIZE(ssl_error_tab); i++) {
+        if (ssl_error_tab[i].errnum == err) {
+            // construct string object
+            mp_obj_str_t *o_str = m_new_obj_maybe(mp_obj_str_t);
+            if (o_str == NULL) {
+                break;
+            }
+            o_str->base.type = &mp_type_str;
+            o_str->data = (const byte *)ssl_error_tab[i].errstr;
+            o_str->len = strlen((char *)o_str->data);
+            o_str->hash = qstr_compute_hash(o_str->data, o_str->len);
+            // raise
+            mp_obj_t args[2] = { MP_OBJ_NEW_SMALL_INT(err), MP_OBJ_FROM_PTR(o_str)};
+            nlr_raise(mp_obj_exception_make_new(&mp_type_OSError, 2, 0, args));
+        }
+    }
+    mp_raise_OSError(err);
+}
+
+
 STATIC mp_obj_ssl_socket_t *ussl_socket_new(mp_obj_t sock, struct ssl_args *args) {
     #if MICROPY_PY_USSL_FINALISER
     mp_obj_ssl_socket_t *o = m_new_obj_with_finaliser(mp_obj_ssl_socket_t);
@@ -107,9 +158,7 @@ STATIC mp_obj_ssl_socket_t *ussl_socket_new(mp_obj_t sock, struct ssl_args *args
             int res = ssl_handshake_status(o->ssl_sock);
 
             if (res != SSL_OK) {
-                printf("ssl_handshake_status: %d\n", res);
-                ssl_display_error(res);
-                mp_raise_OSError(MP_EIO);
+                ussl_raise_error(res);
             }
         }
 
diff --git a/extmod/modussl_mbedtls.c b/extmod/modussl_mbedtls.c
index 9e117c82ccf34..94061ddc8b946 100644
--- a/extmod/modussl_mbedtls.c
+++ b/extmod/modussl_mbedtls.c
@@ -34,6 +34,7 @@
 
 #include "py/runtime.h"
 #include "py/stream.h"
+#include "py/objstr.h"
 
 // mbedtls_time_t
 #include "mbedtls/platform.h"
@@ -43,6 +44,7 @@
 #include "mbedtls/entropy.h"
 #include "mbedtls/ctr_drbg.h"
 #include "mbedtls/debug.h"
+#include "mbedtls/error.h"
 
 typedef struct _mp_obj_ssl_socket_t {
     mp_obj_base_t base;
@@ -74,6 +76,42 @@ STATIC void mbedtls_debug(void *ctx, int level, const char *file, int line, cons
 }
 #endif
 
+STATIC NORETURN void mbedtls_raise_error(int err) {
+    #if defined(MBEDTLS_ERROR_C)
+    // Including mbedtls_strerror takes about 16KB on the esp32 due to all the strings.
+    // MBEDTLS_ERROR_C is the define used by mbedtls to conditionally include mbedtls_strerror.
+    // It is set/unset in the MBEDTLS_CONFIG_FILE which is defined in the Makefile.
+    // "small" negative integer error codes come from underlying stream/sockets, not mbedtls
+    if (err < 0 && err > -256) {
+        mp_raise_OSError(-err);
+    }
+
+    // Try to allocate memory for the message
+    #define ERR_STR_MAX 100  // mbedtls_strerror truncates if it doesn't fit
+    mp_obj_str_t *o_str = m_new_obj_maybe(mp_obj_str_t);
+    byte *o_str_buf = m_new_maybe(byte, ERR_STR_MAX);
+    if (o_str == NULL || o_str_buf == NULL) {
+        mp_raise_OSError(err);
+    }
+
+    // print the error message into the allocated buffer
+    mbedtls_strerror(err, (char *)o_str_buf, ERR_STR_MAX);
+    size_t len = strnlen((char *)o_str_buf, ERR_STR_MAX);
+
+    // Put the exception object together
+    o_str->base.type = &mp_type_str;
+    o_str->data = o_str_buf;
+    o_str->len = len;
+    o_str->hash = qstr_compute_hash(o_str->data, o_str->len);
+    // raise
+    mp_obj_t args[2] = { MP_OBJ_NEW_SMALL_INT(err), MP_OBJ_FROM_PTR(o_str)};
+    nlr_raise(mp_obj_exception_make_new(&mp_type_OSError, 2, 0, args));
+    #else
+    // mbedtls is compiled without error strings so we simply return the err number
+    mp_raise_OSError(err); // typ. err is negative
+    #endif
+}
+
 STATIC int _mbedtls_ssl_send(void *ctx, const byte *buf, size_t len) {
     mp_obj_t sock = *(mp_obj_t *)ctx;
 
@@ -85,7 +123,7 @@ STATIC int _mbedtls_ssl_send(void *ctx, const byte *buf, size_t len) {
         if (mp_is_nonblocking_error(err)) {
             return MBEDTLS_ERR_SSL_WANT_WRITE;
         }
-        return -err;
+        return -err; // convert an MP_ERRNO to something mbedtls passes through as error
     } else {
         return out_sz;
     }
@@ -197,7 +235,6 @@ STATIC mp_obj_ssl_socket_t *socket_new(mp_obj_t sock, struct ssl_args *args) {
     if (args->do_handshake.u_bool) {
         while ((ret = mbedtls_ssl_handshake(&o->ssl)) != 0) {
             if (ret != MBEDTLS_ERR_SSL_WANT_READ && ret != MBEDTLS_ERR_SSL_WANT_WRITE) {
-                printf("mbedtls_ssl_handshake error: -%x\n", -ret);
                 goto cleanup;
             }
         }
@@ -221,7 +258,7 @@ STATIC mp_obj_ssl_socket_t *socket_new(mp_obj_t sock, struct ssl_args *args) {
     } else if (ret == MBEDTLS_ERR_X509_BAD_INPUT_DATA) {
         mp_raise_ValueError(MP_ERROR_TEXT("invalid cert"));
     } else {
-        mp_raise_OSError(MP_EIO);
+        mbedtls_raise_error(ret);
     }
 }
 
diff --git a/tests/extmod/ussl_basic.py b/tests/extmod/ussl_basic.py
index b4e21c7dce660..9e1821dca9981 100644
--- a/tests/extmod/ussl_basic.py
+++ b/tests/extmod/ussl_basic.py
@@ -9,7 +9,7 @@
 
 # create in client mode
 try:
-    ss = ssl.wrap_socket(io.BytesIO())
+    ss = ssl.wrap_socket(io.BytesIO(), server_hostname="test.example.com")
 except OSError as er:
     print("wrap_socket:", repr(er))
 
diff --git a/tests/extmod/ussl_basic.py.exp b/tests/extmod/ussl_basic.py.exp
index 5282338319efb..eb7df855aa099 100644
--- a/tests/extmod/ussl_basic.py.exp
+++ b/tests/extmod/ussl_basic.py.exp
@@ -1,5 +1,4 @@
-ssl_handshake_status: -256
-wrap_socket: OSError(5,)
+wrap_socket: OSError(-256, 'CONN_LOST')
 <_SSLSocket 
 4
 b''
diff --git a/tests/net_inet/tls_num_errors.py b/tests/net_inet/tls_num_errors.py
new file mode 100644
index 0000000000000..dd7f714e6ef7e
--- /dev/null
+++ b/tests/net_inet/tls_num_errors.py
@@ -0,0 +1,44 @@
+# test that modtls produces a numerical error message when out of heap
+
+try:
+    import usocket as socket, ussl as ssl, sys
+except:
+    import socket, ssl, sys
+try:
+    from micropython import alloc_emergency_exception_buf, heap_lock, heap_unlock
+except:
+    print("SKIP")
+    raise SystemExit
+
+
+# test with heap locked to see it switch to number-only error message
+def test(addr):
+    alloc_emergency_exception_buf(256)
+    s = socket.socket()
+    s.connect(addr)
+    try:
+        s.setblocking(False)
+        s = ssl.wrap_socket(s, do_handshake=False)
+        heap_lock()
+        print("heap is locked")
+        while True:
+            ret = s.write("foo")
+            if ret:
+                break
+        heap_unlock()
+        print("wrap: no exception")
+    except OSError as e:
+        heap_unlock()
+        # mbedtls produces "-29184"
+        # axtls produces "RECORD_OVERFLOW"
+        ok = "-29184" in str(e) or "RECORD_OVERFLOW" in str(e)
+        print("wrap:", ok)
+        if not ok:
+            print("got exception:", e)
+    s.close()
+
+
+if __name__ == "__main__":
+    # connect to plain HTTP port, oops!
+    addr = socket.getaddrinfo("micropython.org", 80)[0][-1]
+    test(addr)
diff --git a/tests/net_inet/tls_num_errors.py.exp b/tests/net_inet/tls_num_errors.py.exp
new file mode 100644
index 0000000000000..e6a15634d00ae
--- /dev/null
+++ b/tests/net_inet/tls_num_errors.py.exp
@@ -0,0 +1,2 @@
+heap is locked
+wrap: True
diff --git a/tests/net_inet/tls_text_errors.py b/tests/net_inet/tls_text_errors.py
new file mode 100644
index 0000000000000..2ba167b868ef8
--- /dev/null
+++ b/tests/net_inet/tls_text_errors.py
@@ -0,0 +1,33 @@
+# test that modtls produces a text error message
+
+try:
+    import usocket as socket, ussl as ssl, sys
+except:
+    import socket, ssl, sys
+
+
+def test(addr):
+    s = socket.socket()
+    s.connect(addr)
+    try:
+        s = ssl.wrap_socket(s)
+        print("wrap: no exception")
+    except OSError as e:
+        # mbedtls produces "mbedtls -0x7200: SSL - An invalid SSL record was received"
+        # axtls produces "RECORD_OVERFLOW"
+        # CPython produces "[SSL: WRONG_VERSION_NUMBER] wrong version number (_ssl.c:1108)"
+        ok = (
+            "invalid SSL record" in str(e)
+            or "RECORD_OVERFLOW" in str(e)
+            or "wrong version" in str(e)
+        )
+        print("wrap:", ok)
+        if not ok:
+            print("got exception:", e)
+    s.close()
+
+
+if __name__ == "__main__":
+    # connect to plain HTTP port, oops!
+    addr = socket.getaddrinfo("micropython.org", 80)[0][-1]
+    test(addr)

From 98e583430fb7b793119db27bad9f98119e81579f Mon Sep 17 00:00:00 2001
From: Thorsten von Eicken <tve@voneicken.com>
Date: Thu, 2 Jul 2020 12:48:16 -0700
Subject: [PATCH 0176/3533] lib/libc: Add implementation of strncpy.

---
 lib/libc/string0.c | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/lib/libc/string0.c b/lib/libc/string0.c
index 8c86bf65f7b40..5f40a71e3e284 100644
--- a/lib/libc/string0.c
+++ b/lib/libc/string0.c
@@ -169,6 +169,23 @@ char *strcpy(char *dest, const char *src) {
     return dest;
 }
 
+// Public Domain implementation of strncpy from:
+// http://en.wikibooks.org/wiki/C_Programming/Strings#The_strncpy_function
+char *strncpy(char *s1, const char *s2, size_t n) {
+     char *dst = s1;
+     const char *src = s2;
+     /* Copy bytes, one at a time.  */
+     while (n > 0) {
+         n--;
+         if ((*dst++ = *src++) == '\0') {
+             /* If we get here, we found a null character at the end of s2 */
+             *dst = '\0';
+             break;
+         }
+     }
+     return s1;
+ }
+
 // needed because gcc optimises strcpy + strcat to this
 char *stpcpy(char *dest, const char *src) {
     while (*src) {

From 3e758ef235793502061edd122cd5cd91172faf51 Mon Sep 17 00:00:00 2001
From: Thorsten von Eicken <tve@voneicken.com>
Date: Fri, 29 May 2020 13:05:47 -0700
Subject: [PATCH 0177/3533] lib/mbedtls_errors: Add code to patch mbedtls for
 shortened error strs.

The file `mbedtls_errors/mp_mbedtls_errors.c` can be used instead of
`mbedtls/library/error.c` to give shorter error strings, reducing the build
size of the error strings from about 12-16kB down to about 2-5kB.
---
 lib/mbedtls_errors/README.md            |  42 ++
 lib/mbedtls_errors/do-esp32.sh          |   7 +
 lib/mbedtls_errors/do-mp.sh             |   4 +
 lib/mbedtls_errors/do-test.sh           |   4 +
 lib/mbedtls_errors/error.fmt            | 165 ++++++
 lib/mbedtls_errors/generate_errors.diff |  22 +
 lib/mbedtls_errors/mp_mbedtls_errors.c  | 705 ++++++++++++++++++++++++
 lib/mbedtls_errors/tester.c             |  58 ++
 tools/codeformat.py                     |   1 +
 9 files changed, 1008 insertions(+)
 create mode 100644 lib/mbedtls_errors/README.md
 create mode 100755 lib/mbedtls_errors/do-esp32.sh
 create mode 100755 lib/mbedtls_errors/do-mp.sh
 create mode 100755 lib/mbedtls_errors/do-test.sh
 create mode 100644 lib/mbedtls_errors/error.fmt
 create mode 100644 lib/mbedtls_errors/generate_errors.diff
 create mode 100644 lib/mbedtls_errors/mp_mbedtls_errors.c
 create mode 100644 lib/mbedtls_errors/tester.c

diff --git a/lib/mbedtls_errors/README.md b/lib/mbedtls_errors/README.md
new file mode 100644
index 0000000000000..0e13021eb1910
--- /dev/null
+++ b/lib/mbedtls_errors/README.md
@@ -0,0 +1,42 @@
+MBEDTLS Error Strings for MicroPython
+=====================================
+
+This directory contains source code and tools to rework the Mbedtls error strings for
+micropython to use less space. In short, instead of storing and printing something like
+"SSL - Our own certificate(s) is/are too large to send in an SSL message" it prints
+the name of the error #define, which would be "MBEDTLS_ERR_SSL_CERTIFICATE_TOO_LARGE" in
+this case, and only stores `SSL_CERTIFICATE_TOO_LARGE` in flash. The exact Mbedtls error
+defines are used because they're easy to search for to find more detailed information.
+
+Mbedtls defines a specific format for error value #defines and
+includes a Perl script to gather all `MBEDTLS_ERR` defines from includes files together with
+english error text. From that the Perl script generates `mbedtls_strerror()`. The files in this
+directory modify this process to produce a more space efficient error lookup table with
+shorter error strings.
+
+The files are as follows:
+- `generate_errors.diff` - diff for original mbedtls perl script
+- `error.fmt` - modified code template for MicroPython
+- `mp_mbedtls_errors.c` - source file with `mbedtls_strerror` this is built using the include
+  files in `../mbedtls`
+- `do-mp.sh` - shell script to produce `mp_mbedtls_errors.c`
+- `tester.c` - simple C main to test `mp_mbedtls_errors.c` locally on a dev box
+- `do-test.sh` - shell script to produce `mp_mbedtls_errors.c` and compile the `tester` app
+- `do-esp32.sh` - shell script to produce `esp32_mbedtls_errors.c` -- see below
+
+In order not to store multiple copies of `mbedtls_errors.c`
+([https://github.com/micropython/micropython/pull/5819#discussion_r445528006](see))
+it is assumed that all ports use the same version of mbedtls with the same error #defines.
+This is true as of MP v1.13, and ESP-IDF versions 3.3.2 and 4.0.1. If anything changes in the
+future the `do-esp32.sh` script can be used to generate an esp32-specific version.
+
+### How-to
+
+- To build MicroPython all that is needed is to include the `mp_mbedtls_errors.c` into the build
+  (the Makefiles do this automatically). Note that Perl is not needed for routine MicroPython
+  builds.
+- When a new version of Mbedtls is pulled-in the `do-mp.sh` script should be run to
+  re-generate `mp_mbedtls_errors.c`.
+- The `tester` app should be run if changes to the string handling in `error.fmt` are made:
+  it tests that there is not an off-by-one error in the string copying/appending, etc.
+- To include `mbedtls_strerror` error strings define `MBEDTLS_ERROR_C` in the build.
diff --git a/lib/mbedtls_errors/do-esp32.sh b/lib/mbedtls_errors/do-esp32.sh
new file mode 100755
index 0000000000000..6fd4682415c3f
--- /dev/null
+++ b/lib/mbedtls_errors/do-esp32.sh
@@ -0,0 +1,7 @@
+#! /bin/bash -e
+# Generate esp32_mbedtls_errors.c for use in the Esp32 port, with the ESP-IDF version of mbedtls
+# The IDF_PATH env var must be set to the top-level dir of ESPIDF
+echo "IDF_PATH=$IDF_PATH"
+MBEDTLS=$IDF_PATH/components/mbedtls/mbedtls
+patch -o esp32_generate_errors.pl $MBEDTLS/scripts/generate_errors.pl <generate_errors.diff
+perl ./esp32_generate_errors.pl $MBEDTLS/include/mbedtls . esp32_mbedtls_errors.c
diff --git a/lib/mbedtls_errors/do-mp.sh b/lib/mbedtls_errors/do-mp.sh
new file mode 100755
index 0000000000000..5c6b971179479
--- /dev/null
+++ b/lib/mbedtls_errors/do-mp.sh
@@ -0,0 +1,4 @@
+#! /bin/bash -e
+# Generate mp_mbedtls_errors.c for inclusion in ports that use $MPY/lib/mbedtls
+patch -o mp_generate_errors.pl ../mbedtls/scripts/generate_errors.pl <generate_errors.diff
+perl ./mp_generate_errors.pl ../mbedtls/include/mbedtls . mp_mbedtls_errors.c
diff --git a/lib/mbedtls_errors/do-test.sh b/lib/mbedtls_errors/do-test.sh
new file mode 100755
index 0000000000000..c15d038c76b41
--- /dev/null
+++ b/lib/mbedtls_errors/do-test.sh
@@ -0,0 +1,4 @@
+#! /bin/bash -e
+# Generate mp_mbedtls_errors.c and build the tester app
+./do-mp.sh
+cc -o tester -I../mbedtls/include/ mp_mbedtls_errors.c tester.c
diff --git a/lib/mbedtls_errors/error.fmt b/lib/mbedtls_errors/error.fmt
new file mode 100644
index 0000000000000..5beeb6e7c96b0
--- /dev/null
+++ b/lib/mbedtls_errors/error.fmt
@@ -0,0 +1,165 @@
+/*
+ *  Error message information
+ *
+ *  Copyright (C) 2006-2015, ARM Limited, All Rights Reserved
+ *  SPDX-License-Identifier: Apache-2.0
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License"); you may
+ *  not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ *  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ *  This file is part of mbed TLS (https://tls.mbed.org)
+ */
+
+#if !defined(MBEDTLS_CONFIG_FILE)
+#include "mbedtls/config.h"
+#else
+#include MBEDTLS_CONFIG_FILE
+#endif
+
+#if defined(MBEDTLS_ERROR_C) || defined(MBEDTLS_ERROR_STRERROR_DUMMY)
+#include "mbedtls/error.h"
+#include <string.h>
+#endif
+
+#if defined(MBEDTLS_PLATFORM_C)
+#include "mbedtls/platform.h"
+#else
+#define mbedtls_snprintf snprintf
+#define mbedtls_time_t   time_t
+#endif
+
+#if defined(MBEDTLS_ERROR_C)
+
+#include <stdio.h>
+
+HEADER_INCLUDED
+
+// Error code table type
+struct ssl_errs {
+    int16_t errnum;
+    const char *errstr;
+};
+
+// Table of high level error codes
+static const struct ssl_errs mbedtls_high_level_error_tab[] = {
+// BEGIN generated code
+HIGH_LEVEL_CODE_CHECKS
+// END generated code
+};
+
+static const struct ssl_errs mbedtls_low_level_error_tab[] = {
+// Low level error codes
+//
+// BEGIN generated code
+LOW_LEVEL_CODE_CHECKS
+// END generated code
+};
+
+static const char *mbedtls_err_prefix = "MBEDTLS_ERR_";
+#define MBEDTLS_ERR_PREFIX_LEN ( sizeof("MBEDTLS_ERR_")-1 )
+
+// copy error text into buffer, ensure null termination, return strlen of result
+static size_t mbedtls_err_to_str(int err, const struct ssl_errs tab[], int tab_len, char *buf, size_t buflen) {
+    if (buflen == 0) return 0;
+
+    // prefix for all error names
+    strncpy(buf, mbedtls_err_prefix, buflen);
+    if (buflen <= MBEDTLS_ERR_PREFIX_LEN+1) {
+        buf[buflen-1] = 0;
+        return buflen-1;
+    }
+
+    // append error name from table
+    for (int i = 0; i < tab_len; i++) {
+        if (tab[i].errnum == err) {
+            strncpy(buf+MBEDTLS_ERR_PREFIX_LEN, tab[i].errstr, buflen-MBEDTLS_ERR_PREFIX_LEN);
+            buf[buflen-1] = 0;
+            return strlen(buf);
+        }
+    }
+
+    mbedtls_snprintf(buf+MBEDTLS_ERR_PREFIX_LEN, buflen-MBEDTLS_ERR_PREFIX_LEN, "UNKNOWN (0x%04X)",
+            err);
+    return strlen(buf);
+}
+
+#define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0]))
+
+void mbedtls_strerror(int ret, char *buf, size_t buflen) {
+    int use_ret;
+
+    if (buflen == 0) return;
+
+    buf[buflen-1] = 0;
+
+    if (ret < 0) ret = -ret;
+
+    //
+    // High-level error codes
+    //
+    uint8_t got_hl = (ret & 0xFF80) != 0;
+    if (got_hl) {
+        use_ret = ret & 0xFF80;
+
+        // special case
+#if defined(MBEDTLS_SSL_TLS_C)
+        if (use_ret == -(MBEDTLS_ERR_SSL_FATAL_ALERT_MESSAGE)) {
+            strncpy(buf, "MBEDTLS_ERR_SSL_FATAL_ALERT_MESSAGE", buflen);
+            buf[buflen-1] = 0;
+            return;
+        }
+#endif
+
+        size_t len = mbedtls_err_to_str(use_ret, mbedtls_high_level_error_tab,
+                ARRAY_SIZE(mbedtls_high_level_error_tab), buf, buflen);
+
+        buf += len;
+        buflen -= len;
+        if (buflen == 0) return;
+    }
+
+    //
+    // Low-level error codes
+    //
+    use_ret = ret & ~0xFF80;
+
+    if (use_ret == 0) return;
+
+    // If high level code is present, make a concatenation between both error strings.
+    if (got_hl) {
+        if (buflen < 2) return;
+        *buf++ = '+';
+        buflen--;
+    }
+
+    mbedtls_err_to_str(use_ret, mbedtls_low_level_error_tab,
+            ARRAY_SIZE(mbedtls_low_level_error_tab), buf, buflen);
+}
+
+#else /* MBEDTLS_ERROR_C */
+
+#if defined(MBEDTLS_ERROR_STRERROR_DUMMY)
+
+/*
+ * Provide an non-function in case MBEDTLS_ERROR_C is not defined
+ */
+void mbedtls_strerror( int ret, char *buf, size_t buflen )
+{
+    ((void) ret);
+
+    if( buflen > 0 )
+        buf[0] = '\0';
+}
+
+#endif /* MBEDTLS_ERROR_STRERROR_DUMMY */
+
+#endif /* MBEDTLS_ERROR_C */
diff --git a/lib/mbedtls_errors/generate_errors.diff b/lib/mbedtls_errors/generate_errors.diff
new file mode 100644
index 0000000000000..ad24c372faed7
--- /dev/null
+++ b/lib/mbedtls_errors/generate_errors.diff
@@ -0,0 +1,22 @@
+--- generate_errors_orig.pl	2020-06-20 08:40:38.819060379 -0700
++++ generate_errors.pl	2020-06-20 08:47:26.511163591 -0700
+@@ -162,16 +162,12 @@
+ 
+     if ($error_name eq "MBEDTLS_ERR_SSL_FATAL_ALERT_MESSAGE")
+     {
+-        ${$code_check} .= "${white_space}if( use_ret == -($error_name) )\n".
+-                          "${white_space}\{\n".
+-                          "${white_space}    mbedtls_snprintf( buf, buflen, \"$module_name - $description\" );\n".
+-                          "${white_space}    return;\n".
+-                          "${white_space}}\n"
++        # no-op, this case is hard-coded in error.fmt
+     }
+     else
+     {
+-        ${$code_check} .= "${white_space}if( use_ret == -($error_name) )\n".
+-                          "${white_space}    mbedtls_snprintf( buf, buflen, \"$module_name - $description\" );\n"
++         my $error_text = $error_name =~ s/^MBEDTLS_ERR_//r;
++         ${$code_check} .= "${white_space}{ -($error_name), \"$error_text\" },\n"
+     }
+ };
+ 
diff --git a/lib/mbedtls_errors/mp_mbedtls_errors.c b/lib/mbedtls_errors/mp_mbedtls_errors.c
new file mode 100644
index 0000000000000..03a91f0dc9495
--- /dev/null
+++ b/lib/mbedtls_errors/mp_mbedtls_errors.c
@@ -0,0 +1,705 @@
+/*
+ *  Error message information
+ *
+ *  Copyright (C) 2006-2015, ARM Limited, All Rights Reserved
+ *  SPDX-License-Identifier: Apache-2.0
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License"); you may
+ *  not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ *  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ *  This file is part of mbed TLS (https://tls.mbed.org)
+ */
+
+#if !defined(MBEDTLS_CONFIG_FILE)
+#include "mbedtls/config.h"
+#else
+#include MBEDTLS_CONFIG_FILE
+#endif
+
+#if defined(MBEDTLS_ERROR_C) || defined(MBEDTLS_ERROR_STRERROR_DUMMY)
+#include "mbedtls/error.h"
+#include <string.h>
+#endif
+
+#if defined(MBEDTLS_PLATFORM_C)
+#include "mbedtls/platform.h"
+#else
+#define mbedtls_snprintf snprintf
+#define mbedtls_time_t   time_t
+#endif
+
+#if defined(MBEDTLS_ERROR_C)
+
+#include <stdio.h>
+
+#if defined(MBEDTLS_AES_C)
+#include "mbedtls/aes.h"
+#endif
+
+#if defined(MBEDTLS_ARC4_C)
+#include "mbedtls/arc4.h"
+#endif
+
+#if defined(MBEDTLS_ARIA_C)
+#include "mbedtls/aria.h"
+#endif
+
+#if defined(MBEDTLS_BASE64_C)
+#include "mbedtls/base64.h"
+#endif
+
+#if defined(MBEDTLS_BIGNUM_C)
+#include "mbedtls/bignum.h"
+#endif
+
+#if defined(MBEDTLS_BLOWFISH_C)
+#include "mbedtls/blowfish.h"
+#endif
+
+#if defined(MBEDTLS_CAMELLIA_C)
+#include "mbedtls/camellia.h"
+#endif
+
+#if defined(MBEDTLS_CCM_C)
+#include "mbedtls/ccm.h"
+#endif
+
+#if defined(MBEDTLS_CHACHA20_C)
+#include "mbedtls/chacha20.h"
+#endif
+
+#if defined(MBEDTLS_CHACHAPOLY_C)
+#include "mbedtls/chachapoly.h"
+#endif
+
+#if defined(MBEDTLS_CIPHER_C)
+#include "mbedtls/cipher.h"
+#endif
+
+#if defined(MBEDTLS_CMAC_C)
+#include "mbedtls/cmac.h"
+#endif
+
+#if defined(MBEDTLS_CTR_DRBG_C)
+#include "mbedtls/ctr_drbg.h"
+#endif
+
+#if defined(MBEDTLS_DES_C)
+#include "mbedtls/des.h"
+#endif
+
+#if defined(MBEDTLS_DHM_C)
+#include "mbedtls/dhm.h"
+#endif
+
+#if defined(MBEDTLS_ECP_C)
+#include "mbedtls/ecp.h"
+#endif
+
+#if defined(MBEDTLS_ENTROPY_C)
+#include "mbedtls/entropy.h"
+#endif
+
+#if defined(MBEDTLS_GCM_C)
+#include "mbedtls/gcm.h"
+#endif
+
+#if defined(MBEDTLS_HKDF_C)
+#include "mbedtls/hkdf.h"
+#endif
+
+#if defined(MBEDTLS_HMAC_DRBG_C)
+#include "mbedtls/hmac_drbg.h"
+#endif
+
+#if defined(MBEDTLS_MD_C)
+#include "mbedtls/md.h"
+#endif
+
+#if defined(MBEDTLS_MD2_C)
+#include "mbedtls/md2.h"
+#endif
+
+#if defined(MBEDTLS_MD4_C)
+#include "mbedtls/md4.h"
+#endif
+
+#if defined(MBEDTLS_MD5_C)
+#include "mbedtls/md5.h"
+#endif
+
+#if defined(MBEDTLS_NET_C)
+#include "mbedtls/net_sockets.h"
+#endif
+
+#if defined(MBEDTLS_OID_C)
+#include "mbedtls/oid.h"
+#endif
+
+#if defined(MBEDTLS_PADLOCK_C)
+#include "mbedtls/padlock.h"
+#endif
+
+#if defined(MBEDTLS_PEM_PARSE_C) || defined(MBEDTLS_PEM_WRITE_C)
+#include "mbedtls/pem.h"
+#endif
+
+#if defined(MBEDTLS_PK_C)
+#include "mbedtls/pk.h"
+#endif
+
+#if defined(MBEDTLS_PKCS12_C)
+#include "mbedtls/pkcs12.h"
+#endif
+
+#if defined(MBEDTLS_PKCS5_C)
+#include "mbedtls/pkcs5.h"
+#endif
+
+#if defined(MBEDTLS_PLATFORM_C)
+#include "mbedtls/platform.h"
+#endif
+
+#if defined(MBEDTLS_POLY1305_C)
+#include "mbedtls/poly1305.h"
+#endif
+
+#if defined(MBEDTLS_RIPEMD160_C)
+#include "mbedtls/ripemd160.h"
+#endif
+
+#if defined(MBEDTLS_RSA_C)
+#include "mbedtls/rsa.h"
+#endif
+
+#if defined(MBEDTLS_SHA1_C)
+#include "mbedtls/sha1.h"
+#endif
+
+#if defined(MBEDTLS_SHA256_C)
+#include "mbedtls/sha256.h"
+#endif
+
+#if defined(MBEDTLS_SHA512_C)
+#include "mbedtls/sha512.h"
+#endif
+
+#if defined(MBEDTLS_SSL_TLS_C)
+#include "mbedtls/ssl.h"
+#endif
+
+#if defined(MBEDTLS_THREADING_C)
+#include "mbedtls/threading.h"
+#endif
+
+#if defined(MBEDTLS_X509_USE_C) || defined(MBEDTLS_X509_CREATE_C)
+#include "mbedtls/x509.h"
+#endif
+
+#if defined(MBEDTLS_XTEA_C)
+#include "mbedtls/xtea.h"
+#endif
+
+
+// Error code table type
+struct ssl_errs {
+    int16_t errnum;
+    const char *errstr;
+};
+
+// Table of high level error codes
+static const struct ssl_errs mbedtls_high_level_error_tab[] = {
+// BEGIN generated code
+#if defined(MBEDTLS_CIPHER_C)
+        { -(MBEDTLS_ERR_CIPHER_FEATURE_UNAVAILABLE), "CIPHER_FEATURE_UNAVAILABLE" },
+        { -(MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA), "CIPHER_BAD_INPUT_DATA" },
+        { -(MBEDTLS_ERR_CIPHER_ALLOC_FAILED), "CIPHER_ALLOC_FAILED" },
+        { -(MBEDTLS_ERR_CIPHER_INVALID_PADDING), "CIPHER_INVALID_PADDING" },
+        { -(MBEDTLS_ERR_CIPHER_FULL_BLOCK_EXPECTED), "CIPHER_FULL_BLOCK_EXPECTED" },
+        { -(MBEDTLS_ERR_CIPHER_AUTH_FAILED), "CIPHER_AUTH_FAILED" },
+        { -(MBEDTLS_ERR_CIPHER_INVALID_CONTEXT), "CIPHER_INVALID_CONTEXT" },
+        { -(MBEDTLS_ERR_CIPHER_HW_ACCEL_FAILED), "CIPHER_HW_ACCEL_FAILED" },
+#endif /* MBEDTLS_CIPHER_C */
+
+#if defined(MBEDTLS_DHM_C)
+        { -(MBEDTLS_ERR_DHM_BAD_INPUT_DATA), "DHM_BAD_INPUT_DATA" },
+        { -(MBEDTLS_ERR_DHM_READ_PARAMS_FAILED), "DHM_READ_PARAMS_FAILED" },
+        { -(MBEDTLS_ERR_DHM_MAKE_PARAMS_FAILED), "DHM_MAKE_PARAMS_FAILED" },
+        { -(MBEDTLS_ERR_DHM_READ_PUBLIC_FAILED), "DHM_READ_PUBLIC_FAILED" },
+        { -(MBEDTLS_ERR_DHM_MAKE_PUBLIC_FAILED), "DHM_MAKE_PUBLIC_FAILED" },
+        { -(MBEDTLS_ERR_DHM_CALC_SECRET_FAILED), "DHM_CALC_SECRET_FAILED" },
+        { -(MBEDTLS_ERR_DHM_INVALID_FORMAT), "DHM_INVALID_FORMAT" },
+        { -(MBEDTLS_ERR_DHM_ALLOC_FAILED), "DHM_ALLOC_FAILED" },
+        { -(MBEDTLS_ERR_DHM_FILE_IO_ERROR), "DHM_FILE_IO_ERROR" },
+        { -(MBEDTLS_ERR_DHM_HW_ACCEL_FAILED), "DHM_HW_ACCEL_FAILED" },
+        { -(MBEDTLS_ERR_DHM_SET_GROUP_FAILED), "DHM_SET_GROUP_FAILED" },
+#endif /* MBEDTLS_DHM_C */
+
+#if defined(MBEDTLS_ECP_C)
+        { -(MBEDTLS_ERR_ECP_BAD_INPUT_DATA), "ECP_BAD_INPUT_DATA" },
+        { -(MBEDTLS_ERR_ECP_BUFFER_TOO_SMALL), "ECP_BUFFER_TOO_SMALL" },
+        { -(MBEDTLS_ERR_ECP_FEATURE_UNAVAILABLE), "ECP_FEATURE_UNAVAILABLE" },
+        { -(MBEDTLS_ERR_ECP_VERIFY_FAILED), "ECP_VERIFY_FAILED" },
+        { -(MBEDTLS_ERR_ECP_ALLOC_FAILED), "ECP_ALLOC_FAILED" },
+        { -(MBEDTLS_ERR_ECP_RANDOM_FAILED), "ECP_RANDOM_FAILED" },
+        { -(MBEDTLS_ERR_ECP_INVALID_KEY), "ECP_INVALID_KEY" },
+        { -(MBEDTLS_ERR_ECP_SIG_LEN_MISMATCH), "ECP_SIG_LEN_MISMATCH" },
+        { -(MBEDTLS_ERR_ECP_HW_ACCEL_FAILED), "ECP_HW_ACCEL_FAILED" },
+        { -(MBEDTLS_ERR_ECP_IN_PROGRESS), "ECP_IN_PROGRESS" },
+#endif /* MBEDTLS_ECP_C */
+
+#if defined(MBEDTLS_MD_C)
+        { -(MBEDTLS_ERR_MD_FEATURE_UNAVAILABLE), "MD_FEATURE_UNAVAILABLE" },
+        { -(MBEDTLS_ERR_MD_BAD_INPUT_DATA), "MD_BAD_INPUT_DATA" },
+        { -(MBEDTLS_ERR_MD_ALLOC_FAILED), "MD_ALLOC_FAILED" },
+        { -(MBEDTLS_ERR_MD_FILE_IO_ERROR), "MD_FILE_IO_ERROR" },
+        { -(MBEDTLS_ERR_MD_HW_ACCEL_FAILED), "MD_HW_ACCEL_FAILED" },
+#endif /* MBEDTLS_MD_C */
+
+#if defined(MBEDTLS_PEM_PARSE_C) || defined(MBEDTLS_PEM_WRITE_C)
+        { -(MBEDTLS_ERR_PEM_NO_HEADER_FOOTER_PRESENT), "PEM_NO_HEADER_FOOTER_PRESENT" },
+        { -(MBEDTLS_ERR_PEM_INVALID_DATA), "PEM_INVALID_DATA" },
+        { -(MBEDTLS_ERR_PEM_ALLOC_FAILED), "PEM_ALLOC_FAILED" },
+        { -(MBEDTLS_ERR_PEM_INVALID_ENC_IV), "PEM_INVALID_ENC_IV" },
+        { -(MBEDTLS_ERR_PEM_UNKNOWN_ENC_ALG), "PEM_UNKNOWN_ENC_ALG" },
+        { -(MBEDTLS_ERR_PEM_PASSWORD_REQUIRED), "PEM_PASSWORD_REQUIRED" },
+        { -(MBEDTLS_ERR_PEM_PASSWORD_MISMATCH), "PEM_PASSWORD_MISMATCH" },
+        { -(MBEDTLS_ERR_PEM_FEATURE_UNAVAILABLE), "PEM_FEATURE_UNAVAILABLE" },
+        { -(MBEDTLS_ERR_PEM_BAD_INPUT_DATA), "PEM_BAD_INPUT_DATA" },
+#endif /* MBEDTLS_PEM_PARSE_C || MBEDTLS_PEM_WRITE_C */
+
+#if defined(MBEDTLS_PK_C)
+        { -(MBEDTLS_ERR_PK_ALLOC_FAILED), "PK_ALLOC_FAILED" },
+        { -(MBEDTLS_ERR_PK_TYPE_MISMATCH), "PK_TYPE_MISMATCH" },
+        { -(MBEDTLS_ERR_PK_BAD_INPUT_DATA), "PK_BAD_INPUT_DATA" },
+        { -(MBEDTLS_ERR_PK_FILE_IO_ERROR), "PK_FILE_IO_ERROR" },
+        { -(MBEDTLS_ERR_PK_KEY_INVALID_VERSION), "PK_KEY_INVALID_VERSION" },
+        { -(MBEDTLS_ERR_PK_KEY_INVALID_FORMAT), "PK_KEY_INVALID_FORMAT" },
+        { -(MBEDTLS_ERR_PK_UNKNOWN_PK_ALG), "PK_UNKNOWN_PK_ALG" },
+        { -(MBEDTLS_ERR_PK_PASSWORD_REQUIRED), "PK_PASSWORD_REQUIRED" },
+        { -(MBEDTLS_ERR_PK_PASSWORD_MISMATCH), "PK_PASSWORD_MISMATCH" },
+        { -(MBEDTLS_ERR_PK_INVALID_PUBKEY), "PK_INVALID_PUBKEY" },
+        { -(MBEDTLS_ERR_PK_INVALID_ALG), "PK_INVALID_ALG" },
+        { -(MBEDTLS_ERR_PK_UNKNOWN_NAMED_CURVE), "PK_UNKNOWN_NAMED_CURVE" },
+        { -(MBEDTLS_ERR_PK_FEATURE_UNAVAILABLE), "PK_FEATURE_UNAVAILABLE" },
+        { -(MBEDTLS_ERR_PK_SIG_LEN_MISMATCH), "PK_SIG_LEN_MISMATCH" },
+        { -(MBEDTLS_ERR_PK_HW_ACCEL_FAILED), "PK_HW_ACCEL_FAILED" },
+#endif /* MBEDTLS_PK_C */
+
+#if defined(MBEDTLS_PKCS12_C)
+        { -(MBEDTLS_ERR_PKCS12_BAD_INPUT_DATA), "PKCS12_BAD_INPUT_DATA" },
+        { -(MBEDTLS_ERR_PKCS12_FEATURE_UNAVAILABLE), "PKCS12_FEATURE_UNAVAILABLE" },
+        { -(MBEDTLS_ERR_PKCS12_PBE_INVALID_FORMAT), "PKCS12_PBE_INVALID_FORMAT" },
+        { -(MBEDTLS_ERR_PKCS12_PASSWORD_MISMATCH), "PKCS12_PASSWORD_MISMATCH" },
+#endif /* MBEDTLS_PKCS12_C */
+
+#if defined(MBEDTLS_PKCS5_C)
+        { -(MBEDTLS_ERR_PKCS5_BAD_INPUT_DATA), "PKCS5_BAD_INPUT_DATA" },
+        { -(MBEDTLS_ERR_PKCS5_INVALID_FORMAT), "PKCS5_INVALID_FORMAT" },
+        { -(MBEDTLS_ERR_PKCS5_FEATURE_UNAVAILABLE), "PKCS5_FEATURE_UNAVAILABLE" },
+        { -(MBEDTLS_ERR_PKCS5_PASSWORD_MISMATCH), "PKCS5_PASSWORD_MISMATCH" },
+#endif /* MBEDTLS_PKCS5_C */
+
+#if defined(MBEDTLS_RSA_C)
+        { -(MBEDTLS_ERR_RSA_BAD_INPUT_DATA), "RSA_BAD_INPUT_DATA" },
+        { -(MBEDTLS_ERR_RSA_INVALID_PADDING), "RSA_INVALID_PADDING" },
+        { -(MBEDTLS_ERR_RSA_KEY_GEN_FAILED), "RSA_KEY_GEN_FAILED" },
+        { -(MBEDTLS_ERR_RSA_KEY_CHECK_FAILED), "RSA_KEY_CHECK_FAILED" },
+        { -(MBEDTLS_ERR_RSA_PUBLIC_FAILED), "RSA_PUBLIC_FAILED" },
+        { -(MBEDTLS_ERR_RSA_PRIVATE_FAILED), "RSA_PRIVATE_FAILED" },
+        { -(MBEDTLS_ERR_RSA_VERIFY_FAILED), "RSA_VERIFY_FAILED" },
+        { -(MBEDTLS_ERR_RSA_OUTPUT_TOO_LARGE), "RSA_OUTPUT_TOO_LARGE" },
+        { -(MBEDTLS_ERR_RSA_RNG_FAILED), "RSA_RNG_FAILED" },
+        { -(MBEDTLS_ERR_RSA_UNSUPPORTED_OPERATION), "RSA_UNSUPPORTED_OPERATION" },
+        { -(MBEDTLS_ERR_RSA_HW_ACCEL_FAILED), "RSA_HW_ACCEL_FAILED" },
+#endif /* MBEDTLS_RSA_C */
+
+#if defined(MBEDTLS_SSL_TLS_C)
+        { -(MBEDTLS_ERR_SSL_FEATURE_UNAVAILABLE), "SSL_FEATURE_UNAVAILABLE" },
+        { -(MBEDTLS_ERR_SSL_BAD_INPUT_DATA), "SSL_BAD_INPUT_DATA" },
+        { -(MBEDTLS_ERR_SSL_INVALID_MAC), "SSL_INVALID_MAC" },
+        { -(MBEDTLS_ERR_SSL_INVALID_RECORD), "SSL_INVALID_RECORD" },
+        { -(MBEDTLS_ERR_SSL_CONN_EOF), "SSL_CONN_EOF" },
+        { -(MBEDTLS_ERR_SSL_UNKNOWN_CIPHER), "SSL_UNKNOWN_CIPHER" },
+        { -(MBEDTLS_ERR_SSL_NO_CIPHER_CHOSEN), "SSL_NO_CIPHER_CHOSEN" },
+        { -(MBEDTLS_ERR_SSL_NO_RNG), "SSL_NO_RNG" },
+        { -(MBEDTLS_ERR_SSL_NO_CLIENT_CERTIFICATE), "SSL_NO_CLIENT_CERTIFICATE" },
+        { -(MBEDTLS_ERR_SSL_CERTIFICATE_TOO_LARGE), "SSL_CERTIFICATE_TOO_LARGE" },
+        { -(MBEDTLS_ERR_SSL_CERTIFICATE_REQUIRED), "SSL_CERTIFICATE_REQUIRED" },
+        { -(MBEDTLS_ERR_SSL_PRIVATE_KEY_REQUIRED), "SSL_PRIVATE_KEY_REQUIRED" },
+        { -(MBEDTLS_ERR_SSL_CA_CHAIN_REQUIRED), "SSL_CA_CHAIN_REQUIRED" },
+        { -(MBEDTLS_ERR_SSL_UNEXPECTED_MESSAGE), "SSL_UNEXPECTED_MESSAGE" },
+        { -(MBEDTLS_ERR_SSL_PEER_VERIFY_FAILED), "SSL_PEER_VERIFY_FAILED" },
+        { -(MBEDTLS_ERR_SSL_PEER_CLOSE_NOTIFY), "SSL_PEER_CLOSE_NOTIFY" },
+        { -(MBEDTLS_ERR_SSL_BAD_HS_CLIENT_HELLO), "SSL_BAD_HS_CLIENT_HELLO" },
+        { -(MBEDTLS_ERR_SSL_BAD_HS_SERVER_HELLO), "SSL_BAD_HS_SERVER_HELLO" },
+        { -(MBEDTLS_ERR_SSL_BAD_HS_CERTIFICATE), "SSL_BAD_HS_CERTIFICATE" },
+        { -(MBEDTLS_ERR_SSL_BAD_HS_CERTIFICATE_REQUEST), "SSL_BAD_HS_CERTIFICATE_REQUEST" },
+        { -(MBEDTLS_ERR_SSL_BAD_HS_SERVER_KEY_EXCHANGE), "SSL_BAD_HS_SERVER_KEY_EXCHANGE" },
+        { -(MBEDTLS_ERR_SSL_BAD_HS_SERVER_HELLO_DONE), "SSL_BAD_HS_SERVER_HELLO_DONE" },
+        { -(MBEDTLS_ERR_SSL_BAD_HS_CLIENT_KEY_EXCHANGE), "SSL_BAD_HS_CLIENT_KEY_EXCHANGE" },
+        { -(MBEDTLS_ERR_SSL_BAD_HS_CLIENT_KEY_EXCHANGE_RP), "SSL_BAD_HS_CLIENT_KEY_EXCHANGE_RP" },
+        { -(MBEDTLS_ERR_SSL_BAD_HS_CLIENT_KEY_EXCHANGE_CS), "SSL_BAD_HS_CLIENT_KEY_EXCHANGE_CS" },
+        { -(MBEDTLS_ERR_SSL_BAD_HS_CERTIFICATE_VERIFY), "SSL_BAD_HS_CERTIFICATE_VERIFY" },
+        { -(MBEDTLS_ERR_SSL_BAD_HS_CHANGE_CIPHER_SPEC), "SSL_BAD_HS_CHANGE_CIPHER_SPEC" },
+        { -(MBEDTLS_ERR_SSL_BAD_HS_FINISHED), "SSL_BAD_HS_FINISHED" },
+        { -(MBEDTLS_ERR_SSL_ALLOC_FAILED), "SSL_ALLOC_FAILED" },
+        { -(MBEDTLS_ERR_SSL_HW_ACCEL_FAILED), "SSL_HW_ACCEL_FAILED" },
+        { -(MBEDTLS_ERR_SSL_HW_ACCEL_FALLTHROUGH), "SSL_HW_ACCEL_FALLTHROUGH" },
+        { -(MBEDTLS_ERR_SSL_COMPRESSION_FAILED), "SSL_COMPRESSION_FAILED" },
+        { -(MBEDTLS_ERR_SSL_BAD_HS_PROTOCOL_VERSION), "SSL_BAD_HS_PROTOCOL_VERSION" },
+        { -(MBEDTLS_ERR_SSL_BAD_HS_NEW_SESSION_TICKET), "SSL_BAD_HS_NEW_SESSION_TICKET" },
+        { -(MBEDTLS_ERR_SSL_SESSION_TICKET_EXPIRED), "SSL_SESSION_TICKET_EXPIRED" },
+        { -(MBEDTLS_ERR_SSL_PK_TYPE_MISMATCH), "SSL_PK_TYPE_MISMATCH" },
+        { -(MBEDTLS_ERR_SSL_UNKNOWN_IDENTITY), "SSL_UNKNOWN_IDENTITY" },
+        { -(MBEDTLS_ERR_SSL_INTERNAL_ERROR), "SSL_INTERNAL_ERROR" },
+        { -(MBEDTLS_ERR_SSL_COUNTER_WRAPPING), "SSL_COUNTER_WRAPPING" },
+        { -(MBEDTLS_ERR_SSL_WAITING_SERVER_HELLO_RENEGO), "SSL_WAITING_SERVER_HELLO_RENEGO" },
+        { -(MBEDTLS_ERR_SSL_HELLO_VERIFY_REQUIRED), "SSL_HELLO_VERIFY_REQUIRED" },
+        { -(MBEDTLS_ERR_SSL_BUFFER_TOO_SMALL), "SSL_BUFFER_TOO_SMALL" },
+        { -(MBEDTLS_ERR_SSL_NO_USABLE_CIPHERSUITE), "SSL_NO_USABLE_CIPHERSUITE" },
+        { -(MBEDTLS_ERR_SSL_WANT_READ), "SSL_WANT_READ" },
+        { -(MBEDTLS_ERR_SSL_WANT_WRITE), "SSL_WANT_WRITE" },
+        { -(MBEDTLS_ERR_SSL_TIMEOUT), "SSL_TIMEOUT" },
+        { -(MBEDTLS_ERR_SSL_CLIENT_RECONNECT), "SSL_CLIENT_RECONNECT" },
+        { -(MBEDTLS_ERR_SSL_UNEXPECTED_RECORD), "SSL_UNEXPECTED_RECORD" },
+        { -(MBEDTLS_ERR_SSL_NON_FATAL), "SSL_NON_FATAL" },
+        { -(MBEDTLS_ERR_SSL_INVALID_VERIFY_HASH), "SSL_INVALID_VERIFY_HASH" },
+        { -(MBEDTLS_ERR_SSL_CONTINUE_PROCESSING), "SSL_CONTINUE_PROCESSING" },
+        { -(MBEDTLS_ERR_SSL_ASYNC_IN_PROGRESS), "SSL_ASYNC_IN_PROGRESS" },
+        { -(MBEDTLS_ERR_SSL_EARLY_MESSAGE), "SSL_EARLY_MESSAGE" },
+        { -(MBEDTLS_ERR_SSL_CRYPTO_IN_PROGRESS), "SSL_CRYPTO_IN_PROGRESS" },
+#endif /* MBEDTLS_SSL_TLS_C */
+
+#if defined(MBEDTLS_X509_USE_C) || defined(MBEDTLS_X509_CREATE_C)
+        { -(MBEDTLS_ERR_X509_FEATURE_UNAVAILABLE), "X509_FEATURE_UNAVAILABLE" },
+        { -(MBEDTLS_ERR_X509_UNKNOWN_OID), "X509_UNKNOWN_OID" },
+        { -(MBEDTLS_ERR_X509_INVALID_FORMAT), "X509_INVALID_FORMAT" },
+        { -(MBEDTLS_ERR_X509_INVALID_VERSION), "X509_INVALID_VERSION" },
+        { -(MBEDTLS_ERR_X509_INVALID_SERIAL), "X509_INVALID_SERIAL" },
+        { -(MBEDTLS_ERR_X509_INVALID_ALG), "X509_INVALID_ALG" },
+        { -(MBEDTLS_ERR_X509_INVALID_NAME), "X509_INVALID_NAME" },
+        { -(MBEDTLS_ERR_X509_INVALID_DATE), "X509_INVALID_DATE" },
+        { -(MBEDTLS_ERR_X509_INVALID_SIGNATURE), "X509_INVALID_SIGNATURE" },
+        { -(MBEDTLS_ERR_X509_INVALID_EXTENSIONS), "X509_INVALID_EXTENSIONS" },
+        { -(MBEDTLS_ERR_X509_UNKNOWN_VERSION), "X509_UNKNOWN_VERSION" },
+        { -(MBEDTLS_ERR_X509_UNKNOWN_SIG_ALG), "X509_UNKNOWN_SIG_ALG" },
+        { -(MBEDTLS_ERR_X509_SIG_MISMATCH), "X509_SIG_MISMATCH" },
+        { -(MBEDTLS_ERR_X509_CERT_VERIFY_FAILED), "X509_CERT_VERIFY_FAILED" },
+        { -(MBEDTLS_ERR_X509_CERT_UNKNOWN_FORMAT), "X509_CERT_UNKNOWN_FORMAT" },
+        { -(MBEDTLS_ERR_X509_BAD_INPUT_DATA), "X509_BAD_INPUT_DATA" },
+        { -(MBEDTLS_ERR_X509_ALLOC_FAILED), "X509_ALLOC_FAILED" },
+        { -(MBEDTLS_ERR_X509_FILE_IO_ERROR), "X509_FILE_IO_ERROR" },
+        { -(MBEDTLS_ERR_X509_BUFFER_TOO_SMALL), "X509_BUFFER_TOO_SMALL" },
+        { -(MBEDTLS_ERR_X509_FATAL_ERROR), "X509_FATAL_ERROR" },
+#endif /* MBEDTLS_X509_USE_C || MBEDTLS_X509_CREATE_C */
+// END generated code
+};
+
+static const struct ssl_errs mbedtls_low_level_error_tab[] = {
+// Low level error codes
+//
+// BEGIN generated code
+#if defined(MBEDTLS_AES_C)
+    { -(MBEDTLS_ERR_AES_INVALID_KEY_LENGTH), "AES_INVALID_KEY_LENGTH" },
+    { -(MBEDTLS_ERR_AES_INVALID_INPUT_LENGTH), "AES_INVALID_INPUT_LENGTH" },
+    { -(MBEDTLS_ERR_AES_BAD_INPUT_DATA), "AES_BAD_INPUT_DATA" },
+    { -(MBEDTLS_ERR_AES_FEATURE_UNAVAILABLE), "AES_FEATURE_UNAVAILABLE" },
+    { -(MBEDTLS_ERR_AES_HW_ACCEL_FAILED), "AES_HW_ACCEL_FAILED" },
+#endif /* MBEDTLS_AES_C */
+
+#if defined(MBEDTLS_ARC4_C)
+    { -(MBEDTLS_ERR_ARC4_HW_ACCEL_FAILED), "ARC4_HW_ACCEL_FAILED" },
+#endif /* MBEDTLS_ARC4_C */
+
+#if defined(MBEDTLS_ARIA_C)
+    { -(MBEDTLS_ERR_ARIA_BAD_INPUT_DATA), "ARIA_BAD_INPUT_DATA" },
+    { -(MBEDTLS_ERR_ARIA_INVALID_INPUT_LENGTH), "ARIA_INVALID_INPUT_LENGTH" },
+    { -(MBEDTLS_ERR_ARIA_FEATURE_UNAVAILABLE), "ARIA_FEATURE_UNAVAILABLE" },
+    { -(MBEDTLS_ERR_ARIA_HW_ACCEL_FAILED), "ARIA_HW_ACCEL_FAILED" },
+#endif /* MBEDTLS_ARIA_C */
+
+#if defined(MBEDTLS_ASN1_PARSE_C)
+    { -(MBEDTLS_ERR_ASN1_OUT_OF_DATA), "ASN1_OUT_OF_DATA" },
+    { -(MBEDTLS_ERR_ASN1_UNEXPECTED_TAG), "ASN1_UNEXPECTED_TAG" },
+    { -(MBEDTLS_ERR_ASN1_INVALID_LENGTH), "ASN1_INVALID_LENGTH" },
+    { -(MBEDTLS_ERR_ASN1_LENGTH_MISMATCH), "ASN1_LENGTH_MISMATCH" },
+    { -(MBEDTLS_ERR_ASN1_INVALID_DATA), "ASN1_INVALID_DATA" },
+    { -(MBEDTLS_ERR_ASN1_ALLOC_FAILED), "ASN1_ALLOC_FAILED" },
+    { -(MBEDTLS_ERR_ASN1_BUF_TOO_SMALL), "ASN1_BUF_TOO_SMALL" },
+#endif /* MBEDTLS_ASN1_PARSE_C */
+
+#if defined(MBEDTLS_BASE64_C)
+    { -(MBEDTLS_ERR_BASE64_BUFFER_TOO_SMALL), "BASE64_BUFFER_TOO_SMALL" },
+    { -(MBEDTLS_ERR_BASE64_INVALID_CHARACTER), "BASE64_INVALID_CHARACTER" },
+#endif /* MBEDTLS_BASE64_C */
+
+#if defined(MBEDTLS_BIGNUM_C)
+    { -(MBEDTLS_ERR_MPI_FILE_IO_ERROR), "MPI_FILE_IO_ERROR" },
+    { -(MBEDTLS_ERR_MPI_BAD_INPUT_DATA), "MPI_BAD_INPUT_DATA" },
+    { -(MBEDTLS_ERR_MPI_INVALID_CHARACTER), "MPI_INVALID_CHARACTER" },
+    { -(MBEDTLS_ERR_MPI_BUFFER_TOO_SMALL), "MPI_BUFFER_TOO_SMALL" },
+    { -(MBEDTLS_ERR_MPI_NEGATIVE_VALUE), "MPI_NEGATIVE_VALUE" },
+    { -(MBEDTLS_ERR_MPI_DIVISION_BY_ZERO), "MPI_DIVISION_BY_ZERO" },
+    { -(MBEDTLS_ERR_MPI_NOT_ACCEPTABLE), "MPI_NOT_ACCEPTABLE" },
+    { -(MBEDTLS_ERR_MPI_ALLOC_FAILED), "MPI_ALLOC_FAILED" },
+#endif /* MBEDTLS_BIGNUM_C */
+
+#if defined(MBEDTLS_BLOWFISH_C)
+    { -(MBEDTLS_ERR_BLOWFISH_BAD_INPUT_DATA), "BLOWFISH_BAD_INPUT_DATA" },
+    { -(MBEDTLS_ERR_BLOWFISH_INVALID_INPUT_LENGTH), "BLOWFISH_INVALID_INPUT_LENGTH" },
+    { -(MBEDTLS_ERR_BLOWFISH_HW_ACCEL_FAILED), "BLOWFISH_HW_ACCEL_FAILED" },
+#endif /* MBEDTLS_BLOWFISH_C */
+
+#if defined(MBEDTLS_CAMELLIA_C)
+    { -(MBEDTLS_ERR_CAMELLIA_BAD_INPUT_DATA), "CAMELLIA_BAD_INPUT_DATA" },
+    { -(MBEDTLS_ERR_CAMELLIA_INVALID_INPUT_LENGTH), "CAMELLIA_INVALID_INPUT_LENGTH" },
+    { -(MBEDTLS_ERR_CAMELLIA_HW_ACCEL_FAILED), "CAMELLIA_HW_ACCEL_FAILED" },
+#endif /* MBEDTLS_CAMELLIA_C */
+
+#if defined(MBEDTLS_CCM_C)
+    { -(MBEDTLS_ERR_CCM_BAD_INPUT), "CCM_BAD_INPUT" },
+    { -(MBEDTLS_ERR_CCM_AUTH_FAILED), "CCM_AUTH_FAILED" },
+    { -(MBEDTLS_ERR_CCM_HW_ACCEL_FAILED), "CCM_HW_ACCEL_FAILED" },
+#endif /* MBEDTLS_CCM_C */
+
+#if defined(MBEDTLS_CHACHA20_C)
+    { -(MBEDTLS_ERR_CHACHA20_BAD_INPUT_DATA), "CHACHA20_BAD_INPUT_DATA" },
+    { -(MBEDTLS_ERR_CHACHA20_FEATURE_UNAVAILABLE), "CHACHA20_FEATURE_UNAVAILABLE" },
+    { -(MBEDTLS_ERR_CHACHA20_HW_ACCEL_FAILED), "CHACHA20_HW_ACCEL_FAILED" },
+#endif /* MBEDTLS_CHACHA20_C */
+
+#if defined(MBEDTLS_CHACHAPOLY_C)
+    { -(MBEDTLS_ERR_CHACHAPOLY_BAD_STATE), "CHACHAPOLY_BAD_STATE" },
+    { -(MBEDTLS_ERR_CHACHAPOLY_AUTH_FAILED), "CHACHAPOLY_AUTH_FAILED" },
+#endif /* MBEDTLS_CHACHAPOLY_C */
+
+#if defined(MBEDTLS_CMAC_C)
+    { -(MBEDTLS_ERR_CMAC_HW_ACCEL_FAILED), "CMAC_HW_ACCEL_FAILED" },
+#endif /* MBEDTLS_CMAC_C */
+
+#if defined(MBEDTLS_CTR_DRBG_C)
+    { -(MBEDTLS_ERR_CTR_DRBG_ENTROPY_SOURCE_FAILED), "CTR_DRBG_ENTROPY_SOURCE_FAILED" },
+    { -(MBEDTLS_ERR_CTR_DRBG_REQUEST_TOO_BIG), "CTR_DRBG_REQUEST_TOO_BIG" },
+    { -(MBEDTLS_ERR_CTR_DRBG_INPUT_TOO_BIG), "CTR_DRBG_INPUT_TOO_BIG" },
+    { -(MBEDTLS_ERR_CTR_DRBG_FILE_IO_ERROR), "CTR_DRBG_FILE_IO_ERROR" },
+#endif /* MBEDTLS_CTR_DRBG_C */
+
+#if defined(MBEDTLS_DES_C)
+    { -(MBEDTLS_ERR_DES_INVALID_INPUT_LENGTH), "DES_INVALID_INPUT_LENGTH" },
+    { -(MBEDTLS_ERR_DES_HW_ACCEL_FAILED), "DES_HW_ACCEL_FAILED" },
+#endif /* MBEDTLS_DES_C */
+
+#if defined(MBEDTLS_ENTROPY_C)
+    { -(MBEDTLS_ERR_ENTROPY_SOURCE_FAILED), "ENTROPY_SOURCE_FAILED" },
+    { -(MBEDTLS_ERR_ENTROPY_MAX_SOURCES), "ENTROPY_MAX_SOURCES" },
+    { -(MBEDTLS_ERR_ENTROPY_NO_SOURCES_DEFINED), "ENTROPY_NO_SOURCES_DEFINED" },
+    { -(MBEDTLS_ERR_ENTROPY_NO_STRONG_SOURCE), "ENTROPY_NO_STRONG_SOURCE" },
+    { -(MBEDTLS_ERR_ENTROPY_FILE_IO_ERROR), "ENTROPY_FILE_IO_ERROR" },
+#endif /* MBEDTLS_ENTROPY_C */
+
+#if defined(MBEDTLS_GCM_C)
+    { -(MBEDTLS_ERR_GCM_AUTH_FAILED), "GCM_AUTH_FAILED" },
+    { -(MBEDTLS_ERR_GCM_HW_ACCEL_FAILED), "GCM_HW_ACCEL_FAILED" },
+    { -(MBEDTLS_ERR_GCM_BAD_INPUT), "GCM_BAD_INPUT" },
+#endif /* MBEDTLS_GCM_C */
+
+#if defined(MBEDTLS_HKDF_C)
+    { -(MBEDTLS_ERR_HKDF_BAD_INPUT_DATA), "HKDF_BAD_INPUT_DATA" },
+#endif /* MBEDTLS_HKDF_C */
+
+#if defined(MBEDTLS_HMAC_DRBG_C)
+    { -(MBEDTLS_ERR_HMAC_DRBG_REQUEST_TOO_BIG), "HMAC_DRBG_REQUEST_TOO_BIG" },
+    { -(MBEDTLS_ERR_HMAC_DRBG_INPUT_TOO_BIG), "HMAC_DRBG_INPUT_TOO_BIG" },
+    { -(MBEDTLS_ERR_HMAC_DRBG_FILE_IO_ERROR), "HMAC_DRBG_FILE_IO_ERROR" },
+    { -(MBEDTLS_ERR_HMAC_DRBG_ENTROPY_SOURCE_FAILED), "HMAC_DRBG_ENTROPY_SOURCE_FAILED" },
+#endif /* MBEDTLS_HMAC_DRBG_C */
+
+#if defined(MBEDTLS_MD2_C)
+    { -(MBEDTLS_ERR_MD2_HW_ACCEL_FAILED), "MD2_HW_ACCEL_FAILED" },
+#endif /* MBEDTLS_MD2_C */
+
+#if defined(MBEDTLS_MD4_C)
+    { -(MBEDTLS_ERR_MD4_HW_ACCEL_FAILED), "MD4_HW_ACCEL_FAILED" },
+#endif /* MBEDTLS_MD4_C */
+
+#if defined(MBEDTLS_MD5_C)
+    { -(MBEDTLS_ERR_MD5_HW_ACCEL_FAILED), "MD5_HW_ACCEL_FAILED" },
+#endif /* MBEDTLS_MD5_C */
+
+#if defined(MBEDTLS_NET_C)
+    { -(MBEDTLS_ERR_NET_SOCKET_FAILED), "NET_SOCKET_FAILED" },
+    { -(MBEDTLS_ERR_NET_CONNECT_FAILED), "NET_CONNECT_FAILED" },
+    { -(MBEDTLS_ERR_NET_BIND_FAILED), "NET_BIND_FAILED" },
+    { -(MBEDTLS_ERR_NET_LISTEN_FAILED), "NET_LISTEN_FAILED" },
+    { -(MBEDTLS_ERR_NET_ACCEPT_FAILED), "NET_ACCEPT_FAILED" },
+    { -(MBEDTLS_ERR_NET_RECV_FAILED), "NET_RECV_FAILED" },
+    { -(MBEDTLS_ERR_NET_SEND_FAILED), "NET_SEND_FAILED" },
+    { -(MBEDTLS_ERR_NET_CONN_RESET), "NET_CONN_RESET" },
+    { -(MBEDTLS_ERR_NET_UNKNOWN_HOST), "NET_UNKNOWN_HOST" },
+    { -(MBEDTLS_ERR_NET_BUFFER_TOO_SMALL), "NET_BUFFER_TOO_SMALL" },
+    { -(MBEDTLS_ERR_NET_INVALID_CONTEXT), "NET_INVALID_CONTEXT" },
+    { -(MBEDTLS_ERR_NET_POLL_FAILED), "NET_POLL_FAILED" },
+    { -(MBEDTLS_ERR_NET_BAD_INPUT_DATA), "NET_BAD_INPUT_DATA" },
+#endif /* MBEDTLS_NET_C */
+
+#if defined(MBEDTLS_OID_C)
+    { -(MBEDTLS_ERR_OID_NOT_FOUND), "OID_NOT_FOUND" },
+    { -(MBEDTLS_ERR_OID_BUF_TOO_SMALL), "OID_BUF_TOO_SMALL" },
+#endif /* MBEDTLS_OID_C */
+
+#if defined(MBEDTLS_PADLOCK_C)
+    { -(MBEDTLS_ERR_PADLOCK_DATA_MISALIGNED), "PADLOCK_DATA_MISALIGNED" },
+#endif /* MBEDTLS_PADLOCK_C */
+
+#if defined(MBEDTLS_PLATFORM_C)
+    { -(MBEDTLS_ERR_PLATFORM_HW_ACCEL_FAILED), "PLATFORM_HW_ACCEL_FAILED" },
+    { -(MBEDTLS_ERR_PLATFORM_FEATURE_UNSUPPORTED), "PLATFORM_FEATURE_UNSUPPORTED" },
+#endif /* MBEDTLS_PLATFORM_C */
+
+#if defined(MBEDTLS_POLY1305_C)
+    { -(MBEDTLS_ERR_POLY1305_BAD_INPUT_DATA), "POLY1305_BAD_INPUT_DATA" },
+    { -(MBEDTLS_ERR_POLY1305_FEATURE_UNAVAILABLE), "POLY1305_FEATURE_UNAVAILABLE" },
+    { -(MBEDTLS_ERR_POLY1305_HW_ACCEL_FAILED), "POLY1305_HW_ACCEL_FAILED" },
+#endif /* MBEDTLS_POLY1305_C */
+
+#if defined(MBEDTLS_RIPEMD160_C)
+    { -(MBEDTLS_ERR_RIPEMD160_HW_ACCEL_FAILED), "RIPEMD160_HW_ACCEL_FAILED" },
+#endif /* MBEDTLS_RIPEMD160_C */
+
+#if defined(MBEDTLS_SHA1_C)
+    { -(MBEDTLS_ERR_SHA1_HW_ACCEL_FAILED), "SHA1_HW_ACCEL_FAILED" },
+    { -(MBEDTLS_ERR_SHA1_BAD_INPUT_DATA), "SHA1_BAD_INPUT_DATA" },
+#endif /* MBEDTLS_SHA1_C */
+
+#if defined(MBEDTLS_SHA256_C)
+    { -(MBEDTLS_ERR_SHA256_HW_ACCEL_FAILED), "SHA256_HW_ACCEL_FAILED" },
+    { -(MBEDTLS_ERR_SHA256_BAD_INPUT_DATA), "SHA256_BAD_INPUT_DATA" },
+#endif /* MBEDTLS_SHA256_C */
+
+#if defined(MBEDTLS_SHA512_C)
+    { -(MBEDTLS_ERR_SHA512_HW_ACCEL_FAILED), "SHA512_HW_ACCEL_FAILED" },
+    { -(MBEDTLS_ERR_SHA512_BAD_INPUT_DATA), "SHA512_BAD_INPUT_DATA" },
+#endif /* MBEDTLS_SHA512_C */
+
+#if defined(MBEDTLS_THREADING_C)
+    { -(MBEDTLS_ERR_THREADING_FEATURE_UNAVAILABLE), "THREADING_FEATURE_UNAVAILABLE" },
+    { -(MBEDTLS_ERR_THREADING_BAD_INPUT_DATA), "THREADING_BAD_INPUT_DATA" },
+    { -(MBEDTLS_ERR_THREADING_MUTEX_ERROR), "THREADING_MUTEX_ERROR" },
+#endif /* MBEDTLS_THREADING_C */
+
+#if defined(MBEDTLS_XTEA_C)
+    { -(MBEDTLS_ERR_XTEA_INVALID_INPUT_LENGTH), "XTEA_INVALID_INPUT_LENGTH" },
+    { -(MBEDTLS_ERR_XTEA_HW_ACCEL_FAILED), "XTEA_HW_ACCEL_FAILED" },
+#endif /* MBEDTLS_XTEA_C */
+// END generated code
+};
+
+static const char *mbedtls_err_prefix = "MBEDTLS_ERR_";
+#define MBEDTLS_ERR_PREFIX_LEN ( sizeof("MBEDTLS_ERR_")-1 )
+
+// copy error text into buffer, ensure null termination, return strlen of result
+static size_t mbedtls_err_to_str(int err, const struct ssl_errs tab[], int tab_len, char *buf, size_t buflen) {
+    if (buflen == 0) return 0;
+
+    // prefix for all error names
+    strncpy(buf, mbedtls_err_prefix, buflen);
+    if (buflen <= MBEDTLS_ERR_PREFIX_LEN+1) {
+        buf[buflen-1] = 0;
+        return buflen-1;
+    }
+
+    // append error name from table
+    for (int i = 0; i < tab_len; i++) {
+        if (tab[i].errnum == err) {
+            strncpy(buf+MBEDTLS_ERR_PREFIX_LEN, tab[i].errstr, buflen-MBEDTLS_ERR_PREFIX_LEN);
+            buf[buflen-1] = 0;
+            return strlen(buf);
+        }
+    }
+
+    mbedtls_snprintf(buf+MBEDTLS_ERR_PREFIX_LEN, buflen-MBEDTLS_ERR_PREFIX_LEN, "UNKNOWN (0x%04X)",
+            err);
+    return strlen(buf);
+}
+
+#define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0]))
+
+void mbedtls_strerror(int ret, char *buf, size_t buflen) {
+    int use_ret;
+
+    if (buflen == 0) return;
+
+    buf[buflen-1] = 0;
+
+    if (ret < 0) ret = -ret;
+
+    //
+    // High-level error codes
+    //
+    uint8_t got_hl = (ret & 0xFF80) != 0;
+    if (got_hl) {
+        use_ret = ret & 0xFF80;
+
+        // special case
+#if defined(MBEDTLS_SSL_TLS_C)
+        if (use_ret == -(MBEDTLS_ERR_SSL_FATAL_ALERT_MESSAGE)) {
+            strncpy(buf, "MBEDTLS_ERR_SSL_FATAL_ALERT_MESSAGE", buflen);
+            buf[buflen-1] = 0;
+            return;
+        }
+#endif
+
+        size_t len = mbedtls_err_to_str(use_ret, mbedtls_high_level_error_tab,
+                ARRAY_SIZE(mbedtls_high_level_error_tab), buf, buflen);
+
+        buf += len;
+        buflen -= len;
+        if (buflen == 0) return;
+    }
+
+    //
+    // Low-level error codes
+    //
+    use_ret = ret & ~0xFF80;
+
+    if (use_ret == 0) return;
+
+    // If high level code is present, make a concatenation between both error strings.
+    if (got_hl) {
+        if (buflen < 2) return;
+        *buf++ = '+';
+        buflen--;
+    }
+
+    mbedtls_err_to_str(use_ret, mbedtls_low_level_error_tab,
+            ARRAY_SIZE(mbedtls_low_level_error_tab), buf, buflen);
+}
+
+#else /* MBEDTLS_ERROR_C */
+
+#if defined(MBEDTLS_ERROR_STRERROR_DUMMY)
+
+/*
+ * Provide an non-function in case MBEDTLS_ERROR_C is not defined
+ */
+void mbedtls_strerror( int ret, char *buf, size_t buflen )
+{
+    ((void) ret);
+
+    if( buflen > 0 )
+        buf[0] = '\0';
+}
+
+#endif /* MBEDTLS_ERROR_STRERROR_DUMMY */
+
+#endif /* MBEDTLS_ERROR_C */
diff --git a/lib/mbedtls_errors/tester.c b/lib/mbedtls_errors/tester.c
new file mode 100644
index 0000000000000..6f1c788f50ad8
--- /dev/null
+++ b/lib/mbedtls_errors/tester.c
@@ -0,0 +1,58 @@
+#include "mbedtls/error.h"
+#include <string.h>
+#include <stdio.h>
+
+// test_code checks that the provided code results in the provided error string for any size
+// buffer. It calls mbedtls_strerror() to fill a buffer that is from 1 to 100 bytes in length
+// and then checks that the buffer contents is OK and that a few guard bytes before and after
+// the buffer were not overwritten.
+int test_code(int code, char *str) {
+    char buf[100];
+    int ok = 1;
+    int res;
+
+    // test zero-length buffer
+    memset(buf, -3, 100);
+    mbedtls_strerror(code, buf + 4, 0);
+    for (int i = 0; i < 10; i++) {
+        if (buf[i] != -3) {
+            printf("Error: guard overwritten buflen=0 i=%d buf[i]=%d\n", i, buf[i]);
+            ok = 0;
+        }
+    }
+
+    // test
+    for (size_t buflen = 1; buflen < 90; buflen++) {
+        memset(buf, -3, 100);
+        mbedtls_strerror(code, buf + 4, buflen);
+        for (int i = 0; i < 4; i++) {
+            if (buf[i] != -3) {
+                printf("Error: pre-guard overwritten buflen=%d i=%d buf[i]=%d\n", buflen, i, buf[i]);
+                ok = 0;
+            }
+        }
+        for (int i = 4 + buflen; i < 100; i++) {
+            if (buf[i] != -3) {
+                printf("Error: post-guard overwritten buflen=%d i=%d buf[i]=%d\n", buflen, i, buf[i]);
+                ok = 0;
+            }
+        }
+        char exp[100];
+        strncpy(exp, str, buflen);
+        exp[buflen - 1] = 0;
+        if (strcmp(buf + 4, exp) != 0) {
+            printf("Error: expected %s, got %s\n", exp, buf);
+            ok = 0;
+        }
+    }
+
+    printf("Test %x -> %s is %s\n", code, str, ok?"OK":"*** BAD ***");
+}
+
+int main() {
+    test_code(0x7200, "MBEDTLS_ERR_SSL_INVALID_RECORD");
+    test_code(0x7780, "MBEDTLS_ERR_SSL_FATAL_ALERT_MESSAGE");
+    test_code(0x0074, "MBEDTLS_ERR_SHA256_BAD_INPUT_DATA");
+    test_code(0x6600 | 0x0074, "MBEDTLS_ERR_SSL_INVALID_VERIFY_HASH+MBEDTLS_ERR_SHA256_BAD_INPUT_DATA");
+    test_code(103, "MBEDTLS_ERR_UNKNOWN (0x0067)");
+}
diff --git a/tools/codeformat.py b/tools/codeformat.py
index 653529460c079..81a3cdcf8e5a2 100755
--- a/tools/codeformat.py
+++ b/tools/codeformat.py
@@ -38,6 +38,7 @@
     "extmod/*.[ch]",
     "extmod/btstack/*.[ch]",
     "extmod/nimble/*.[ch]",
+    "lib/mbedtls_errors/tester.c",
     "lib/netutils/*.[ch]",
     "lib/timeutils/*.[ch]",
     "lib/utils/*.[ch]",

From 5264478007c78b7737972404bda18ab39d792e17 Mon Sep 17 00:00:00 2001
From: Thorsten von Eicken <tve@voneicken.com>
Date: Thu, 2 Jul 2020 12:34:36 -0700
Subject: [PATCH 0178/3533] extmod/modussl_mbedtls: Integrate shorter error
 strings.

The stm32 and esp32 ports now use shorter error strings for mbedtls errors.
Also, MBEDTLS_ERROR_C is enabled on stm32 by default to get these strings.
---
 extmod/modussl_mbedtls.c             | 20 ++++++++++++--------
 ports/esp32/Makefile                 |  6 ++++--
 ports/stm32/Makefile                 |  3 +++
 ports/stm32/mbedtls/mbedtls_config.h |  1 +
 tests/net_inet/test_tls_sites.py     |  2 +-
 tests/net_inet/tls_text_errors.py    |  4 ++--
 6 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/extmod/modussl_mbedtls.c b/extmod/modussl_mbedtls.c
index 94061ddc8b946..1677dc6e1ca70 100644
--- a/extmod/modussl_mbedtls.c
+++ b/extmod/modussl_mbedtls.c
@@ -77,17 +77,21 @@ STATIC void mbedtls_debug(void *ctx, int level, const char *file, int line, cons
 #endif
 
 STATIC NORETURN void mbedtls_raise_error(int err) {
-    #if defined(MBEDTLS_ERROR_C)
-    // Including mbedtls_strerror takes about 16KB on the esp32 due to all the strings.
-    // MBEDTLS_ERROR_C is the define used by mbedtls to conditionally include mbedtls_strerror.
-    // It is set/unset in the MBEDTLS_CONFIG_FILE which is defined in the Makefile.
-    // "small" negative integer error codes come from underlying stream/sockets, not mbedtls
+    // _mbedtls_ssl_send and _mbedtls_ssl_recv (below) turn positive error codes from the
+    // underlying socket into negative codes to pass them through mbedtls. Here we turn them
+    // positive again so they get interpreted as the OSError they really are. The
+    // cut-off of -256 is a bit hacky, sigh.
     if (err < 0 && err > -256) {
         mp_raise_OSError(-err);
     }
 
+    #if defined(MBEDTLS_ERROR_C)
+    // Including mbedtls_strerror takes about 1.5KB due to the error strings.
+    // MBEDTLS_ERROR_C is the define used by mbedtls to conditionally include mbedtls_strerror.
+    // It is set/unset in the MBEDTLS_CONFIG_FILE which is defined in the Makefile.
+
     // Try to allocate memory for the message
-    #define ERR_STR_MAX 100  // mbedtls_strerror truncates if it doesn't fit
+    #define ERR_STR_MAX 80  // mbedtls_strerror truncates if it doesn't fit
     mp_obj_str_t *o_str = m_new_obj_maybe(mp_obj_str_t);
     byte *o_str_buf = m_new_maybe(byte, ERR_STR_MAX);
     if (o_str == NULL || o_str_buf == NULL) {
@@ -96,7 +100,7 @@ STATIC NORETURN void mbedtls_raise_error(int err) {
 
     // print the error message into the allocated buffer
     mbedtls_strerror(err, (char *)o_str_buf, ERR_STR_MAX);
-    size_t len = strnlen((char *)o_str_buf, ERR_STR_MAX);
+    size_t len = strlen((char *)o_str_buf);
 
     // Put the exception object together
     o_str->base.type = &mp_type_str;
@@ -108,7 +112,7 @@ STATIC NORETURN void mbedtls_raise_error(int err) {
     nlr_raise(mp_obj_exception_make_new(&mp_type_OSError, 2, 0, args));
     #else
     // mbedtls is compiled without error strings so we simply return the err number
-    mp_raise_OSError(err); // typ. err is negative
+    mp_raise_OSError(err); // err is typically a large negative number
     #endif
 }
 
diff --git a/ports/esp32/Makefile b/ports/esp32/Makefile
index 0f6a1969a6208..2cbe9f6be57f9 100644
--- a/ports/esp32/Makefile
+++ b/ports/esp32/Makefile
@@ -362,6 +362,7 @@ EXTMOD_SRC_C += $(addprefix extmod/,\
 	)
 
 LIB_SRC_C = $(addprefix lib/,\
+	mbedtls_errors/mp_mbedtls_errors.c \
 	mp-readline/readline.c \
 	netutils/netutils.c \
 	timeutils/timeutils.c \
@@ -506,11 +507,12 @@ ESPIDF_LWIP_O = $(patsubst %.c,%.o,\
 	$(wildcard $(ESPCOMP)/lwip/port/esp32/*/*.c) \
 	)
 
-ESPIDF_MBEDTLS_O = $(patsubst %.c,%.o,\
+# Mbedtls source files, exclude error.c in favor of lib/mbedtls_errors/mp_mbedtls_errors.c
+ESPIDF_MBEDTLS_O = $(patsubst %.c,%.o, $(filter-out %/error.c,\
 	$(wildcard $(ESPCOMP)/mbedtls/mbedtls/library/*.c) \
 	$(wildcard $(ESPCOMP)/mbedtls/port/*.c) \
 	$(wildcard $(ESPCOMP)/mbedtls/port/esp32/*.c) \
-	)
+	))
 
 ESPIDF_MDNS_O = $(patsubst %.c,%.o,$(wildcard $(ESPCOMP)/mdns/*.c))
 
diff --git a/ports/stm32/Makefile b/ports/stm32/Makefile
index 2614d4aa0fcf0..fe8f0b8711f0f 100644
--- a/ports/stm32/Makefile
+++ b/ports/stm32/Makefile
@@ -472,6 +472,9 @@ endif
 ifeq ($(MICROPY_SSL_MBEDTLS),1)
 CFLAGS_MOD += -DMBEDTLS_CONFIG_FILE='"mbedtls/mbedtls_config.h"'
 SRC_MOD += mbedtls/mbedtls_port.c
+# replace mbedtls' error.c by ours
+SRC_MOD := $(filter-out %/mbedtls/library/error.c, $(SRC_MOD))
+LIB_SRC_C += lib/mbedtls_errors/mp_mbedtls_errors.c
 endif
 
 ifeq ($(MICROPY_PY_BLUETOOTH),1)
diff --git a/ports/stm32/mbedtls/mbedtls_config.h b/ports/stm32/mbedtls/mbedtls_config.h
index 338c8b354146b..56fbbf3aaf086 100644
--- a/ports/stm32/mbedtls/mbedtls_config.h
+++ b/ports/stm32/mbedtls/mbedtls_config.h
@@ -67,6 +67,7 @@
 #define MBEDTLS_CTR_DRBG_C
 //#define MBEDTLS_ECP_C
 #define MBEDTLS_ENTROPY_C
+#define MBEDTLS_ERROR_C
 #define MBEDTLS_MD_C
 #define MBEDTLS_MD5_C
 #define MBEDTLS_OID_C
diff --git a/tests/net_inet/test_tls_sites.py b/tests/net_inet/test_tls_sites.py
index 876343acfc1d3..d2cb928c8d5b9 100644
--- a/tests/net_inet/test_tls_sites.py
+++ b/tests/net_inet/test_tls_sites.py
@@ -54,7 +54,7 @@ def main():
             test_one(site, opts)
             print(site, "ok")
         except Exception as e:
-            print(site, repr(e))
+            print(site, e)
 
 
 main()
diff --git a/tests/net_inet/tls_text_errors.py b/tests/net_inet/tls_text_errors.py
index 2ba167b868ef8..9e8ccfaf9ec77 100644
--- a/tests/net_inet/tls_text_errors.py
+++ b/tests/net_inet/tls_text_errors.py
@@ -14,10 +14,10 @@ def test(addr):
         print("wrap: no exception")
     except OSError as e:
         # mbedtls produces "mbedtls -0x7200: SSL - An invalid SSL record was received"
-        # axtls produces "RECORD_OVERFLOW"
+        # axtls produces "RECORD_OVERFLOW" but also prints "TLS buffer overflow,..."
         # CPython produces "[SSL: WRONG_VERSION_NUMBER] wrong version number (_ssl.c:1108)"
         ok = (
-            "invalid SSL record" in str(e)
+            "SSL_INVALID_RECORD" in str(e)
             or "RECORD_OVERFLOW" in str(e)
             or "wrong version" in str(e)
         )

From 7dbef5377cd86a4f20a16acd3ad7798c4160aabc Mon Sep 17 00:00:00 2001
From: Jonathan Hogg <me@jonathanhogg.com>
Date: Fri, 26 Jun 2020 14:55:07 +0100
Subject: [PATCH 0179/3533] esp32/esp32_rmt: Properly fix looping behaviour of
 RMT.

A previous commit 3a9d948032e27f690e1fb09084c36bd47b1a75a0 can cause
lock-ups of the RMT driver, so this commit reverses that, adds a loop_en
flag, and explicitly controls the TX interrupt in write_pulses().  This
provides correct looping, non-blocking writes and sensible behaviour for
wait_done().

See also #6167.
---
 ports/esp32/esp32_rmt.c | 30 ++++++++++++++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)

diff --git a/ports/esp32/esp32_rmt.c b/ports/esp32/esp32_rmt.c
index 2ed4c9f6968c4..7971ca5d1c5af 100644
--- a/ports/esp32/esp32_rmt.c
+++ b/ports/esp32/esp32_rmt.c
@@ -56,6 +56,7 @@ typedef struct _esp32_rmt_obj_t {
     uint32_t carrier_freq;
     mp_uint_t num_items;
     rmt_item32_t *items;
+    bool loop_en;
 } esp32_rmt_obj_t;
 
 STATIC mp_obj_t esp32_rmt_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
@@ -93,6 +94,7 @@ STATIC mp_obj_t esp32_rmt_make_new(const mp_obj_type_t *type, size_t n_args, siz
     self->clock_div = clock_div;
     self->carrier_duty_percent = carrier_duty_percent;
     self->carrier_freq = carrier_freq;
+    self->loop_en = false;
 
     rmt_config_t config;
     config.rmt_mode = RMT_MODE_TX;
@@ -110,8 +112,8 @@ STATIC mp_obj_t esp32_rmt_make_new(const mp_obj_type_t *type, size_t n_args, siz
 
     config.clk_div = self->clock_div;
 
-    check_esp_err(rmt_driver_install(config.channel, 0, 0));
     check_esp_err(rmt_config(&config));
+    check_esp_err(rmt_driver_install(config.channel, 0, 0));
 
     return MP_OBJ_FROM_PTR(self);
 }
@@ -180,7 +182,15 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_KW(esp32_rmt_wait_done_obj, 1, esp32_rmt_wait_don
 
 STATIC mp_obj_t esp32_rmt_loop(mp_obj_t self_in, mp_obj_t loop) {
     esp32_rmt_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    check_esp_err(rmt_set_tx_loop_mode(self->channel_id, mp_obj_get_int(loop)));
+    self->loop_en = mp_obj_get_int(loop);
+    if (!self->loop_en) {
+        bool loop_en;
+        check_esp_err(rmt_get_tx_loop_mode(self->channel_id, &loop_en));
+        if (loop_en) {
+            check_esp_err(rmt_set_tx_loop_mode(self->channel_id, false));
+            check_esp_err(rmt_set_tx_intr_en(self->channel_id, true));
+        }
+    }
     return mp_const_none;
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_2(esp32_rmt_loop_obj, esp32_rmt_loop);
@@ -222,8 +232,24 @@ STATIC mp_obj_t esp32_rmt_write_pulses(size_t n_args, const mp_obj_t *pos_args,
             self->items[item_index].level1 = start++;
         }
     }
+
+    if (self->loop_en) {
+        bool loop_en;
+        check_esp_err(rmt_get_tx_loop_mode(self->channel_id, &loop_en));
+        if (loop_en) {
+            check_esp_err(rmt_set_tx_intr_en(self->channel_id, true));
+            check_esp_err(rmt_set_tx_loop_mode(self->channel_id, false));
+        }
+        check_esp_err(rmt_wait_tx_done(self->channel_id, portMAX_DELAY));
+        check_esp_err(rmt_set_tx_intr_en(self->channel_id, false));
+    }
+
     check_esp_err(rmt_write_items(self->channel_id, self->items, num_items, false /* non-blocking */));
 
+    if (self->loop_en) {
+        check_esp_err(rmt_set_tx_loop_mode(self->channel_id, true));
+    }
+
     return mp_const_none;
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_KW(esp32_rmt_write_pulses_obj, 2, esp32_rmt_write_pulses);

From 5f0e9d1bace44715e906cd0dbcb30f455b042ec2 Mon Sep 17 00:00:00 2001
From: Jonathan Hogg <me@jonathanhogg.com>
Date: Fri, 3 Jul 2020 14:14:33 +0100
Subject: [PATCH 0180/3533] docs/library: Update documentation of esp32's RMT.

This explains how looping now works, and removes the warning about calling
wait_done().
---
 docs/library/esp32.rst | 27 +++++++++++++++++++--------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/docs/library/esp32.rst b/docs/library/esp32.rst
index 715afdddeb169..dfde840a2141a 100644
--- a/docs/library/esp32.rst
+++ b/docs/library/esp32.rst
@@ -209,19 +209,21 @@ For more details see Espressif's `ESP-IDF RMT documentation.
 
 .. method:: RMT.wait_done(timeout=0)
 
-    Returns True if `RMT.write_pulses` has completed.
+    Returns ``True`` if the channel is currently transmitting a stream of pulses
+    started with a call to `RMT.write_pulses`.
 
     If *timeout* (defined in ticks of ``source_freq / clock_div``) is specified
-    the method will wait for *timeout* or until `RMT.write_pulses` is complete,
-    returning ``False`` if the channel continues to transmit.
-
-.. Warning::
-    Avoid using ``wait_done()`` if looping is enabled.
+    the method will wait for *timeout* or until transmission is complete,
+    returning ``False`` if the channel continues to transmit. If looping is
+    enabled with `RMT.loop` and a stream has started, then this method will
+    always (wait and) return ``False``.
 
 .. method:: RMT.loop(enable_loop)
 
-    Configure looping on the channel, allowing a stream of pulses to be
-    indefinitely repeated. *enable_loop* is bool, set to True to enable looping.
+    Configure looping on the channel. *enable_loop* is bool, set to ``True`` to
+    enable looping on the *next* call to `RMT.write_pulses`. If called with
+    ``False`` while a looping stream is currently being transmitted then the
+    current set of pulses will be completed before transmission stops.
 
 .. method:: RMT.write_pulses(pulses, start)
 
@@ -230,6 +232,15 @@ For more details see Espressif's `ESP-IDF RMT documentation.
     resolution ``(1 / (source_freq / clock_div))``. *start* defines whether the
     stream starts at 0 or 1.
 
+    If transmission of a stream is currently in progress then this method will
+    block until transmission of that stream has ended before beginning sending
+    *pulses*.
+
+    If looping is enabled with `RMT.loop`, the stream of pulses will be repeated
+    indefinitely. Further calls to `RMT.write_pulses` will end the previous
+    stream - blocking until the last set of pulses has been transmitted -
+    before starting the next stream.
+
 
 Ultra-Low-Power co-processor
 ----------------------------

From 76fefad18bb3f29d747d6f20adc722f7c8e44f84 Mon Sep 17 00:00:00 2001
From: Kenneth Ryerson <kenneth.ryerson@gmail.com>
Date: Mon, 20 Apr 2020 09:51:11 -0500
Subject: [PATCH 0181/3533] esp32/network_lan: Add support for IP101 PHY.

Signed-off-by: Kenneth Ryerson <kenneth.ryerson@gmail.com>
---
 ports/esp32/modnetwork.c  | 1 +
 ports/esp32/modnetwork.h  | 2 +-
 ports/esp32/network_lan.c | 8 +++++++-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/ports/esp32/modnetwork.c b/ports/esp32/modnetwork.c
index 975029121ed0b..325b27f74b262 100644
--- a/ports/esp32/modnetwork.c
+++ b/ports/esp32/modnetwork.c
@@ -776,6 +776,7 @@ STATIC const mp_rom_map_elem_t mp_module_network_globals_table[] = {
 
     { MP_ROM_QSTR(MP_QSTR_PHY_LAN8720), MP_ROM_INT(PHY_LAN8720) },
     { MP_ROM_QSTR(MP_QSTR_PHY_TLK110), MP_ROM_INT(PHY_TLK110) },
+    { MP_ROM_QSTR(MP_QSTR_PHY_IP101), MP_ROM_INT(PHY_IP101) },
 
     // ETH Clock modes from ESP-IDF
     #if !MICROPY_ESP_IDF_4
diff --git a/ports/esp32/modnetwork.h b/ports/esp32/modnetwork.h
index 64d2da018c056..db1b3d1300932 100644
--- a/ports/esp32/modnetwork.h
+++ b/ports/esp32/modnetwork.h
@@ -26,7 +26,7 @@
 #ifndef MICROPY_INCLUDED_ESP32_MODNETWORK_H
 #define MICROPY_INCLUDED_ESP32_MODNETWORK_H
 
-enum { PHY_LAN8720, PHY_TLK110 };
+enum { PHY_LAN8720, PHY_TLK110, PHY_IP101 };
 
 MP_DECLARE_CONST_FUN_OBJ_KW(get_lan_obj);
 MP_DECLARE_CONST_FUN_OBJ_1(ppp_make_new_obj);
diff --git a/ports/esp32/network_lan.c b/ports/esp32/network_lan.c
index 1f9a733a7aef1..7a4ad49e01ceb 100644
--- a/ports/esp32/network_lan.c
+++ b/ports/esp32/network_lan.c
@@ -33,6 +33,7 @@
 #include "eth_phy/phy.h"
 #include "eth_phy/phy_tlk110.h"
 #include "eth_phy/phy_lan8720.h"
+#include "eth_phy/phy_ip101.h"
 #include "tcpip_adapter.h"
 
 #include "modnetwork.h"
@@ -123,7 +124,9 @@ STATIC mp_obj_t get_lan(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_ar
         mp_raise_ValueError(MP_ERROR_TEXT("invalid phy address"));
     }
 
-    if (args[ARG_phy_type].u_int != PHY_LAN8720 && args[ARG_phy_type].u_int != PHY_TLK110) {
+    if (args[ARG_phy_type].u_int != PHY_LAN8720 &&
+        args[ARG_phy_type].u_int != PHY_TLK110 &&
+        args[ARG_phy_type].u_int != PHY_IP101) {
         mp_raise_ValueError(MP_ERROR_TEXT("invalid phy type"));
     }
 
@@ -145,6 +148,9 @@ STATIC mp_obj_t get_lan(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_ar
         case PHY_LAN8720:
             config = phy_lan8720_default_ethernet_config;
             break;
+        case PHY_IP101:
+            config = phy_ip101_default_ethernet_config;
+            break;
     }
 
     self->link_func = config.phy_check_link;

From f80b1d853599787597abe6ead9e04ef8e775818b Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sun, 19 Jul 2020 14:45:47 +1000
Subject: [PATCH 0182/3533] lib/stm32lib: Update library for H7 v1.6.0 and WB
 v1.6.0.

Changes in this new library version are:
- Update H7 HAL to v1.6.0.
- Update WB HAL to v1.6.0.
- Add patches to fix F4 ll_uart clock selection for UART9/UART10.

Signed-off-by: Damien George <damien@micropython.org>
---
 lib/stm32lib | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/stm32lib b/lib/stm32lib
index 668d7a9e54aea..58fee7c92bd57 160000
--- a/lib/stm32lib
+++ b/lib/stm32lib
@@ -1 +1 @@
-Subproject commit 668d7a9e54aea98f8fe8a858eac1d3daa80fa824
+Subproject commit 58fee7c92bd576814d3f2afd92fbc62990270ecc

From 895b1dbdda132b115bb0b5102962f4f46adb7adb Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 16 Jul 2020 23:20:30 +1000
Subject: [PATCH 0183/3533] tests/basics: Split out memoryview slice-assign
 tests to separate file.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/basics/memoryview1.py             | 48 -------------------
 tests/basics/memoryview_slice_assign.py | 63 +++++++++++++++++++++++++
 2 files changed, 63 insertions(+), 48 deletions(-)
 create mode 100644 tests/basics/memoryview_slice_assign.py

diff --git a/tests/basics/memoryview1.py b/tests/basics/memoryview1.py
index 1bfeabdfdc824..4c20c91f4947f 100644
--- a/tests/basics/memoryview1.py
+++ b/tests/basics/memoryview1.py
@@ -54,54 +54,6 @@
 m[2] = 6
 print(a)
 
-# test slice assignment between memoryviews
-b1 = bytearray(b'1234')
-b2 = bytearray(b'5678')
-b3 = bytearray(b'5678')
-m1 = memoryview(b1)
-m2 = memoryview(b2)
-m3 = memoryview(b3)
-m2[1:3] = m1[0:2]
-print(b2)
-b3[1:3] = m1[0:2]
-print(b3)
-m1[2:4] = b3[1:3]
-print(b1)
-
-try:
-    m2[1:3] = b1[0:4]
-except ValueError:
-    print("ValueError")
-
-try:
-    m2[1:3] = m1[0:4]
-except ValueError:
-    print("ValueError")
-
-try:
-    m2[0:4] = m1[1:3]
-except ValueError:
-    print("ValueError")
-
-# test memoryview of arrays with items sized larger than 1
-a1 = array.array('i', [0]*5)
-m4 = memoryview(a1)
-a2 = array.array('i', [3]*5)
-m5 = memoryview(a2)
-m4[1:3] = m5[1:3]
-print(a1)
-
-try:
-    m4[1:3] = m2[1:3]
-except ValueError:
-    print("ValueError")
-
-# invalid assignment on RHS
-try:
-    memoryview(array.array('i'))[0:2] = b'1234'
-except ValueError:
-    print('ValueError')
-
 # invalid attribute
 try:
     memoryview(b'a').noexist
diff --git a/tests/basics/memoryview_slice_assign.py b/tests/basics/memoryview_slice_assign.py
new file mode 100644
index 0000000000000..b730dceba6e5d
--- /dev/null
+++ b/tests/basics/memoryview_slice_assign.py
@@ -0,0 +1,63 @@
+# test slice assignment to memoryview
+
+try:
+    memoryview(bytearray(1))[:] = memoryview(bytearray(1))
+except (NameError, TypeError):
+    print("SKIP")
+    raise SystemExit
+
+try:
+    import uarray as array
+except ImportError:
+    try:
+        import array
+    except ImportError:
+        print("SKIP")
+        raise SystemExit
+
+# test slice assignment between memoryviews
+b1 = bytearray(b'1234')
+b2 = bytearray(b'5678')
+b3 = bytearray(b'5678')
+m1 = memoryview(b1)
+m2 = memoryview(b2)
+m3 = memoryview(b3)
+m2[1:3] = m1[0:2]
+print(b2)
+b3[1:3] = m1[0:2]
+print(b3)
+m1[2:4] = b3[1:3]
+print(b1)
+
+# invalid slice assignments
+try:
+    m2[1:3] = b1[0:4]
+except ValueError:
+    print("ValueError")
+try:
+    m2[1:3] = m1[0:4]
+except ValueError:
+    print("ValueError")
+try:
+    m2[0:4] = m1[1:3]
+except ValueError:
+    print("ValueError")
+
+# test memoryview of arrays with items sized larger than 1
+a1 = array.array('i', [0]*5)
+m4 = memoryview(a1)
+a2 = array.array('i', [3]*5)
+m5 = memoryview(a2)
+m4[1:3] = m5[1:3]
+print(a1)
+
+try:
+    m4[1:3] = m2[1:3]
+except ValueError:
+    print("ValueError")
+
+# invalid assignment on RHS
+try:
+    memoryview(array.array('i'))[0:2] = b'1234'
+except ValueError:
+    print('ValueError')

From a853fff838c1f995b9eeb0ebef5f117cfa3d5f0a Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 16 Jul 2020 23:23:42 +1000
Subject: [PATCH 0184/3533] py/obj.h: Fix mp_seq_replace_slice_no_grow to use
 memmove not memcpy.

Because the argument arrays may overlap, as show by the new tests in this
commit.

Also remove the debugging comments for these macros, add a new comment
about overlapping regions, and separate the macros by blank lines to make
them easier to read.

Fixes issue #6244.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/obj.h                                |  8 ++++----
 tests/basics/memoryview_slice_assign.py | 24 ++++++++++++++++++++++++
 2 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/py/obj.h b/py/obj.h
index f621b1dadd492..31542a7f9bd7c 100644
--- a/py/obj.h
+++ b/py/obj.h
@@ -992,17 +992,17 @@ bool mp_seq_cmp_objs(mp_uint_t op, const mp_obj_t *items1, size_t len1, const mp
 mp_obj_t mp_seq_index_obj(const mp_obj_t *items, size_t len, size_t n_args, const mp_obj_t *args);
 mp_obj_t mp_seq_count_obj(const mp_obj_t *items, size_t len, mp_obj_t value);
 mp_obj_t mp_seq_extract_slice(size_t len, const mp_obj_t *seq, mp_bound_slice_t *indexes);
+
 // Helper to clear stale pointers from allocated, but unused memory, to preclude GC problems
 #define mp_seq_clear(start, len, alloc_len, item_sz) memset((byte *)(start) + (len) * (item_sz), 0, ((alloc_len) - (len)) * (item_sz))
+
+// Note: dest and slice regions may overlap
 #define mp_seq_replace_slice_no_grow(dest, dest_len, beg, end, slice, slice_len, item_sz) \
-    /*printf("memcpy(%p, %p, %d)\n", dest + beg, slice, slice_len * (item_sz));*/ \
-    memcpy(((char *)dest) + (beg) * (item_sz), slice, slice_len * (item_sz)); \
-    /*printf("memmove(%p, %p, %d)\n", dest + (beg + slice_len), dest + end, (dest_len - end) * (item_sz));*/ \
+    memmove(((char *)dest) + (beg) * (item_sz), slice, slice_len * (item_sz)); \
     memmove(((char *)dest) + (beg + slice_len) * (item_sz), ((char *)dest) + (end) * (item_sz), (dest_len - end) * (item_sz));
 
 // Note: dest and slice regions may overlap
 #define mp_seq_replace_slice_grow_inplace(dest, dest_len, beg, end, slice, slice_len, len_adj, item_sz) \
-    /*printf("memmove(%p, %p, %d)\n", dest + beg + len_adj, dest + beg, (dest_len - beg) * (item_sz));*/ \
     memmove(((char *)dest) + (beg + slice_len) * (item_sz), ((char *)dest) + (end) * (item_sz), ((dest_len) + (len_adj) - ((beg) + (slice_len))) * (item_sz)); \
     memmove(((char *)dest) + (beg) * (item_sz), slice, slice_len * (item_sz));
 
diff --git a/tests/basics/memoryview_slice_assign.py b/tests/basics/memoryview_slice_assign.py
index b730dceba6e5d..74f6fae6f788d 100644
--- a/tests/basics/memoryview_slice_assign.py
+++ b/tests/basics/memoryview_slice_assign.py
@@ -61,3 +61,27 @@
     memoryview(array.array('i'))[0:2] = b'1234'
 except ValueError:
     print('ValueError')
+
+# test shift left of bytearray
+b = bytearray(range(10))
+mv = memoryview(b)
+mv[1:] = mv[:-1]
+print(b)
+
+# test shift right of bytearray
+b = bytearray(range(10))
+mv = memoryview(b)
+mv[:-1] = mv[1:]
+print(b)
+
+# test shift left of array
+a = array.array('I', range(10))
+mv = memoryview(a)
+mv[1:] = mv[:-1]
+print(a)
+
+# test shift right of array
+a = array.array('I', range(10))
+mv = memoryview(a)
+mv[:-1] = mv[1:]
+print(a)

From 27767aafa21754e6cdbf52a719e7ce395f0fe672 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolt=C3=A1n=20V=C3=B6r=C3=B6s?= <zvoros@gmail.com>
Date: Sat, 15 Feb 2020 19:28:56 +0100
Subject: [PATCH 0185/3533] lib/libm_dbl: Add round.c source code.

This code is imported from musl, to match existing code in libm_dbl.

The file is also added to the build in stm32/Makefile.  It's not needed by
the core code but, similar to c5cc64175be32cb1e4f3f1a249667bc9f5a12613,
allows round() to be used by user C modules or board extensions.
---
 lib/libm_dbl/round.c | 35 +++++++++++++++++++++++++++++++++++
 ports/stm32/Makefile |  1 +
 2 files changed, 36 insertions(+)
 create mode 100644 lib/libm_dbl/round.c

diff --git a/lib/libm_dbl/round.c b/lib/libm_dbl/round.c
new file mode 100644
index 0000000000000..130d58d2571e7
--- /dev/null
+++ b/lib/libm_dbl/round.c
@@ -0,0 +1,35 @@
+#include "libm.h"
+
+#if FLT_EVAL_METHOD==0 || FLT_EVAL_METHOD==1
+#define EPS DBL_EPSILON
+#elif FLT_EVAL_METHOD==2
+#define EPS LDBL_EPSILON
+#endif
+static const double_t toint = 1/EPS;
+
+double round(double x)
+{
+	union {double f; uint64_t i;} u = {x};
+	int e = u.i >> 52 & 0x7ff;
+	double_t y;
+
+	if (e >= 0x3ff+52)
+		return x;
+	if (u.i >> 63)
+		x = -x;
+	if (e < 0x3ff-1) {
+		/* raise inexact if x!=0 */
+		FORCE_EVAL(x + toint);
+		return 0*u.f;
+	}
+	y = x + toint - toint - x;
+	if (y > 0.5)
+		y = y + x - 1;
+	else if (y <= -0.5)
+		y = y + x + 1;
+	else
+		y = y + x;
+	if (u.i >> 63)
+		y = -y;
+	return y;
+}
diff --git a/ports/stm32/Makefile b/ports/stm32/Makefile
index fe8f0b8711f0f..e7d2e2abc2caf 100644
--- a/ports/stm32/Makefile
+++ b/ports/stm32/Makefile
@@ -191,6 +191,7 @@ LIBM_SRC_C = $(addprefix lib/libm_dbl/,\
 	nearbyint.c \
 	pow.c \
 	rint.c \
+	round.c \
 	scalbn.c \
 	sin.c \
 	sinh.c \

From d9b726102429f555aec12275bb740f315ae9a795 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 22 Jul 2020 16:28:46 +1000
Subject: [PATCH 0186/3533] lib/libc: Fix string0's implementation of strncpy.

Fixing 98e583430fb7b793119db27bad9f98119e81579f, the semantics of strncpy
require that the remainder of dst be filled with null bytes.

Signed-off-by: Damien George <damien@micropython.org>
---
 lib/libc/string0.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/libc/string0.c b/lib/libc/string0.c
index 5f40a71e3e284..19ad14d0f7a77 100644
--- a/lib/libc/string0.c
+++ b/lib/libc/string0.c
@@ -178,8 +178,10 @@ char *strncpy(char *s1, const char *s2, size_t n) {
      while (n > 0) {
          n--;
          if ((*dst++ = *src++) == '\0') {
-             /* If we get here, we found a null character at the end of s2 */
-             *dst = '\0';
+             /* If we get here, we found a null character at the end
+                of s2, so use memset to put null bytes at the end of
+                s1.  */
+             memset(dst, '\0', n);
              break;
          }
      }

From 0a79e183984fabb3d33b7879a2d0dc79948dd0de Mon Sep 17 00:00:00 2001
From: Glenn Ruben Bakke <glennbakke@gmail.com>
Date: Sun, 19 Jul 2020 12:42:09 +0200
Subject: [PATCH 0187/3533] nrf: Split mpconfigport.h into multiple files.

Splitting mpconfigport.h into multiple device specific
files in order to facilitate variations between devices.

Due to the fact that the devices might have variations in
features and also variations in flash size it makes sense
that some devices offers more functionality than others
without being limited by restricted devices.

For example more micropython features can be activated for
nrf52840 with 1MB flash, compared to nrf51 with 256KB.
---
 ports/nrf/mpconfigdevice_nrf51822.h | 37 +++++++++++++++++++++++++++++
 ports/nrf/mpconfigdevice_nrf52832.h | 37 +++++++++++++++++++++++++++++
 ports/nrf/mpconfigdevice_nrf52840.h | 37 +++++++++++++++++++++++++++++
 ports/nrf/mpconfigdevice_nrf9160.h  | 37 +++++++++++++++++++++++++++++
 ports/nrf/mpconfigport.h            | 12 ++++++++++
 5 files changed, 160 insertions(+)
 create mode 100644 ports/nrf/mpconfigdevice_nrf51822.h
 create mode 100644 ports/nrf/mpconfigdevice_nrf52832.h
 create mode 100644 ports/nrf/mpconfigdevice_nrf52840.h
 create mode 100644 ports/nrf/mpconfigdevice_nrf9160.h

diff --git a/ports/nrf/mpconfigdevice_nrf51822.h b/ports/nrf/mpconfigdevice_nrf51822.h
new file mode 100644
index 0000000000000..55d540be98b90
--- /dev/null
+++ b/ports/nrf/mpconfigdevice_nrf51822.h
@@ -0,0 +1,37 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 Glenn Ruben Bakke
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+// Board overridable build configuration.
+
+#ifndef MICROPY_MBFS
+#define MICROPY_MBFS                       (1)
+#endif
+
+#ifndef MICROPY_VFS
+#define MICROPY_VFS                        (0)
+#endif
+
+// Board overridable feature configuration.
diff --git a/ports/nrf/mpconfigdevice_nrf52832.h b/ports/nrf/mpconfigdevice_nrf52832.h
new file mode 100644
index 0000000000000..55d540be98b90
--- /dev/null
+++ b/ports/nrf/mpconfigdevice_nrf52832.h
@@ -0,0 +1,37 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 Glenn Ruben Bakke
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+// Board overridable build configuration.
+
+#ifndef MICROPY_MBFS
+#define MICROPY_MBFS                       (1)
+#endif
+
+#ifndef MICROPY_VFS
+#define MICROPY_VFS                        (0)
+#endif
+
+// Board overridable feature configuration.
diff --git a/ports/nrf/mpconfigdevice_nrf52840.h b/ports/nrf/mpconfigdevice_nrf52840.h
new file mode 100644
index 0000000000000..55d540be98b90
--- /dev/null
+++ b/ports/nrf/mpconfigdevice_nrf52840.h
@@ -0,0 +1,37 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 Glenn Ruben Bakke
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+// Board overridable build configuration.
+
+#ifndef MICROPY_MBFS
+#define MICROPY_MBFS                       (1)
+#endif
+
+#ifndef MICROPY_VFS
+#define MICROPY_VFS                        (0)
+#endif
+
+// Board overridable feature configuration.
diff --git a/ports/nrf/mpconfigdevice_nrf9160.h b/ports/nrf/mpconfigdevice_nrf9160.h
new file mode 100644
index 0000000000000..55d540be98b90
--- /dev/null
+++ b/ports/nrf/mpconfigdevice_nrf9160.h
@@ -0,0 +1,37 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 Glenn Ruben Bakke
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+// Board overridable build configuration.
+
+#ifndef MICROPY_MBFS
+#define MICROPY_MBFS                       (1)
+#endif
+
+#ifndef MICROPY_VFS
+#define MICROPY_VFS                        (0)
+#endif
+
+// Board overridable feature configuration.
diff --git a/ports/nrf/mpconfigport.h b/ports/nrf/mpconfigport.h
index c5304b20d0d3e..e84709c49dda8 100644
--- a/ports/nrf/mpconfigport.h
+++ b/ports/nrf/mpconfigport.h
@@ -29,6 +29,18 @@
 
 #include <mpconfigboard.h>
 
+#if defined(NRF51822)
+  #include "mpconfigdevice_nrf51822.h"
+#elif defined(NRF52832)
+  #include "mpconfigdevice_nrf52832.h"
+#elif defined(NRF52840)
+  #include "mpconfigdevice_nrf52840.h"
+#elif defined(NRF9160)
+  #include "mpconfigdevice_nrf9160.h"
+#else
+  #pragma error "Device not defined"
+#endif
+
 // options to control how MicroPython is built
 #ifndef MICROPY_VFS
 #define MICROPY_VFS                 (0)

From caaaa2b1f4645b72929a957cf5ceed182e619f4c Mon Sep 17 00:00:00 2001
From: Glenn Ruben Bakke <glennbakke@gmail.com>
Date: Sun, 19 Jul 2020 12:49:30 +0200
Subject: [PATCH 0188/3533] nrf: Enable more features for all targets.

Enabling the following features for all targets, except for nrf51
targets compiled to be used with SoftDevice:

- MICROPY_PY_ARRAY_SLICE_ASSIGN
- MICROPY_PY_SYS_STDFILES
- MICROPY_PY_UBINASCII
---
 ports/nrf/mpconfigdevice_nrf51822.h | 24 ++++++++++++++++++++++++
 ports/nrf/mpconfigdevice_nrf52832.h | 12 ++++++++++++
 ports/nrf/mpconfigdevice_nrf52840.h | 12 ++++++++++++
 ports/nrf/mpconfigdevice_nrf9160.h  | 12 ++++++++++++
 ports/nrf/mpconfigport.h            |  3 ---
 5 files changed, 60 insertions(+), 3 deletions(-)

diff --git a/ports/nrf/mpconfigdevice_nrf51822.h b/ports/nrf/mpconfigdevice_nrf51822.h
index 55d540be98b90..2f85c9f4c5468 100644
--- a/ports/nrf/mpconfigdevice_nrf51822.h
+++ b/ports/nrf/mpconfigdevice_nrf51822.h
@@ -35,3 +35,27 @@
 #endif
 
 // Board overridable feature configuration.
+
+#ifndef MICROPY_PY_ARRAY_SLICE_ASSIGN
+#if defined(BLUETOOTH_SD)
+#define MICROPY_PY_ARRAY_SLICE_ASSIGN      (0)
+#else
+#define MICROPY_PY_ARRAY_SLICE_ASSIGN      (1)
+#endif
+#endif
+
+#ifndef MICROPY_PY_SYS_STDFILES
+#if defined(BLUETOOTH_SD)
+#define MICROPY_PY_SYS_STDFILES            (0)
+#else
+#define MICROPY_PY_SYS_STDFILES            (1)
+#endif
+#endif
+
+#ifndef MICROPY_PY_UBINASCII
+#if defined(BLUETOOTH_SD)
+#define MICROPY_PY_UBINASCII               (0)
+#else
+#define MICROPY_PY_UBINASCII               (1)
+#endif
+#endif
diff --git a/ports/nrf/mpconfigdevice_nrf52832.h b/ports/nrf/mpconfigdevice_nrf52832.h
index 55d540be98b90..2bfd047ca1456 100644
--- a/ports/nrf/mpconfigdevice_nrf52832.h
+++ b/ports/nrf/mpconfigdevice_nrf52832.h
@@ -35,3 +35,15 @@
 #endif
 
 // Board overridable feature configuration.
+
+#ifndef MICROPY_PY_ARRAY_SLICE_ASSIGN
+#define MICROPY_PY_ARRAY_SLICE_ASSIGN      (1)
+#endif
+
+#ifndef MICROPY_PY_SYS_STDFILES
+#define MICROPY_PY_SYS_STDFILES            (1)
+#endif
+
+#ifndef MICROPY_PY_UBINASCII
+#define MICROPY_PY_UBINASCII               (1)
+#endif
diff --git a/ports/nrf/mpconfigdevice_nrf52840.h b/ports/nrf/mpconfigdevice_nrf52840.h
index 55d540be98b90..2bfd047ca1456 100644
--- a/ports/nrf/mpconfigdevice_nrf52840.h
+++ b/ports/nrf/mpconfigdevice_nrf52840.h
@@ -35,3 +35,15 @@
 #endif
 
 // Board overridable feature configuration.
+
+#ifndef MICROPY_PY_ARRAY_SLICE_ASSIGN
+#define MICROPY_PY_ARRAY_SLICE_ASSIGN      (1)
+#endif
+
+#ifndef MICROPY_PY_SYS_STDFILES
+#define MICROPY_PY_SYS_STDFILES            (1)
+#endif
+
+#ifndef MICROPY_PY_UBINASCII
+#define MICROPY_PY_UBINASCII               (1)
+#endif
diff --git a/ports/nrf/mpconfigdevice_nrf9160.h b/ports/nrf/mpconfigdevice_nrf9160.h
index 55d540be98b90..2bfd047ca1456 100644
--- a/ports/nrf/mpconfigdevice_nrf9160.h
+++ b/ports/nrf/mpconfigdevice_nrf9160.h
@@ -35,3 +35,15 @@
 #endif
 
 // Board overridable feature configuration.
+
+#ifndef MICROPY_PY_ARRAY_SLICE_ASSIGN
+#define MICROPY_PY_ARRAY_SLICE_ASSIGN      (1)
+#endif
+
+#ifndef MICROPY_PY_SYS_STDFILES
+#define MICROPY_PY_SYS_STDFILES            (1)
+#endif
+
+#ifndef MICROPY_PY_UBINASCII
+#define MICROPY_PY_UBINASCII               (1)
+#endif
diff --git a/ports/nrf/mpconfigport.h b/ports/nrf/mpconfigport.h
index e84709c49dda8..1197df016cce9 100644
--- a/ports/nrf/mpconfigport.h
+++ b/ports/nrf/mpconfigport.h
@@ -117,11 +117,9 @@
 #define MICROPY_MODULE_BUILTIN_INIT (1)
 #define MICROPY_PY_ALL_SPECIAL_METHODS (0)
 #define MICROPY_PY_MICROPYTHON_MEM_INFO (1)
-#define MICROPY_PY_ARRAY_SLICE_ASSIGN (0)
 #define MICROPY_PY_BUILTINS_SLICE_ATTRS (0)
 #define MICROPY_PY_SYS_EXIT         (1)
 #define MICROPY_PY_SYS_MAXSIZE      (1)
-#define MICROPY_PY_SYS_STDFILES     (0)
 #define MICROPY_PY_SYS_STDIO_BUFFER (0)
 #define MICROPY_PY_COLLECTIONS_ORDEREDDICT (0)
 #define MICROPY_PY_MATH_SPECIAL_FUNCTIONS (0)
@@ -129,7 +127,6 @@
 #define MICROPY_PY_IO               (0)
 #define MICROPY_PY_IO_FILEIO        (0)
 #define MICROPY_PY_UERRNO           (0)
-#define MICROPY_PY_UBINASCII        (0)
 #define MICROPY_PY_URANDOM          (1)
 #define MICROPY_PY_URANDOM_EXTRA_FUNCS (1)
 #define MICROPY_PY_UCTYPES          (0)

From cf9be201d780eedcdb8a6c05f5ea7c796f892f07 Mon Sep 17 00:00:00 2001
From: Howard Lovatt <howard.lovatt@gmail.com>
Date: Thu, 2 Jul 2020 11:08:25 +1000
Subject: [PATCH 0189/3533] docs/library: Update pyb.SPI init method to add
 descr about "ti" arg.

---
 docs/library/pyb.SPI.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/library/pyb.SPI.rst b/docs/library/pyb.SPI.rst
index a1910be49b7fb..181bdd3b6ec5d 100644
--- a/docs/library/pyb.SPI.rst
+++ b/docs/library/pyb.SPI.rst
@@ -64,6 +64,7 @@ Methods
        respectively.
      - ``bits`` can be 8 or 16, and is the number of bits in each transferred word.
      - ``firstbit`` can be ``SPI.MSB`` or ``SPI.LSB``.
+     - ``ti`` True indicates Texas Instruments, as opposed to Motorola, signal conventions.
      - ``crc`` can be None for no CRC, or a polynomial specifier.
 
    Note that the SPI clock frequency will not always be the requested baudrate.

From 4a7c2731c5190d3bb7781f91a24a273d52acb289 Mon Sep 17 00:00:00 2001
From: Howard Lovatt <howard.lovatt@gmail.com>
Date: Thu, 2 Jul 2020 12:34:45 +1000
Subject: [PATCH 0190/3533] docs/library: Update pyb.Timer to add missing args
 and defaults to init.

---
 docs/library/pyb.Timer.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/library/pyb.Timer.rst b/docs/library/pyb.Timer.rst
index bb7e7e52d5648..532b64da8e93c 100644
--- a/docs/library/pyb.Timer.rst
+++ b/docs/library/pyb.Timer.rst
@@ -62,7 +62,7 @@ Constructors
 Methods
 -------
 
-.. method:: Timer.init(\*, freq, prescaler, period)
+.. method:: Timer.init(\*, freq, prescaler, period, mode=Timer.UP, div=1, callback=None, deadtime=0)
 
    Initialise the timer.  Initialisation must be either by frequency (in Hz)
    or by prescaler and period::

From 47289f4bc94c02acd49144ba15d91e58342807ee Mon Sep 17 00:00:00 2001
From: Howard Lovatt <howard.lovatt@gmail.com>
Date: Fri, 3 Jul 2020 15:17:50 +1000
Subject: [PATCH 0191/3533] docs/library: Update pyb.UART to correct pyboard
 UART availability.

On original pyboard UART 5 isn't available; added pyboard D availability.
---
 docs/library/pyb.UART.rst | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/docs/library/pyb.UART.rst b/docs/library/pyb.UART.rst
index ab7ab2fb882a4..0a611a72566da 100644
--- a/docs/library/pyb.UART.rst
+++ b/docs/library/pyb.UART.rst
@@ -48,13 +48,16 @@ Constructors
 
 .. class:: pyb.UART(bus, ...)
 
-   Construct a UART object on the given bus.  ``bus`` can be 1-6, or 'XA', 'XB', 'YA', or 'YB'.
+   Construct a UART object on the given bus.
+   For Pyboard ``bus`` can be 1-4, 6, 'XA', 'XB', 'YA', or 'YB'.
+   For Pyboard Lite ``bus`` can be 1, 2, 6, 'XB', or 'YA'.
+   For Pyboard D ``bus`` can be 1-4, 'XA', 'YA' or 'YB'.
    With no additional parameters, the UART object is created but not
    initialised (it has the settings from the last initialisation of
    the bus, if any).  If extra arguments are given, the bus is initialised.
    See ``init`` for parameters of initialisation.
 
-   The physical pins of the UART busses are:
+   The physical pins of the UART busses on Pyboard are:
 
      - ``UART(4)`` is on ``XA``: ``(TX, RX) = (X1, X2) = (PA0, PA1)``
      - ``UART(1)`` is on ``XB``: ``(TX, RX) = (X9, X10) = (PB6, PB7)``
@@ -62,10 +65,22 @@ Constructors
      - ``UART(3)`` is on ``YB``: ``(TX, RX) = (Y9, Y10) = (PB10, PB11)``
      - ``UART(2)`` is on: ``(TX, RX) = (X3, X4) = (PA2, PA3)``
 
-   The Pyboard Lite supports UART(1), UART(2) and UART(6) only. Pins are as above except:
+   The Pyboard Lite supports UART(1), UART(2) and UART(6) only, pins are:
 
+     - ``UART(1)`` is on ``XB``: ``(TX, RX) = (X9, X10) = (PB6, PB7)``
+     - ``UART(6)`` is on ``YA``: ``(TX, RX) = (Y1, Y2) = (PC6, PC7)``
      - ``UART(2)`` is on: ``(TX, RX) = (X1, X2) = (PA2, PA3)``
 
+   The Pyboard D supports UART(1), UART(2), UART(3) and UART(4) only, pins are:
+
+     - ``UART(4)`` is on ``XA``: ``(TX, RX) = (X1, X2) = (PA0, PA1)``
+     - ``UART(1)`` is on ``YA``: ``(TX, RX) = (Y1, Y2) = (PA9, PA10)``
+     - ``UART(3)`` is on ``YB``: ``(TX, RX) = (Y9, Y10) = (PB10, PB11)``
+     - ``UART(2)`` is on: ``(TX, RX) = (X3, X4) = (PA2, PA3)``
+
+   *Note:* Pyboard D has ``UART(1)`` on ``YA``, unlike Pyboard and Pyboard Lite that both
+   have ``UART(1)`` on ``XB`` and ``UART(6)`` on ``YA``.
+
 Methods
 -------
 

From fe7d47971f7de0cc094b28ae34e49f40b41d456d Mon Sep 17 00:00:00 2001
From: Josh Lloyd <j.nevercast@gmail.com>
Date: Mon, 20 Jul 2020 11:06:12 +1200
Subject: [PATCH 0192/3533] docs/esp32: Fix machine.Timer quickref to specify
 HW timers.

Also remove trailing spaces on other lines.
---
 docs/esp32/quickref.rst | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/docs/esp32/quickref.rst b/docs/esp32/quickref.rst
index b4f443a910009..d5c222f3a1eef 100644
--- a/docs/esp32/quickref.rst
+++ b/docs/esp32/quickref.rst
@@ -118,17 +118,21 @@ Use the :mod:`time <utime>` module::
 Timers
 ------
 
-Virtual (RTOS-based) timers are supported. Use the :ref:`machine.Timer <machine.Timer>` class
-with timer ID of -1::
+The ESP32 port has four hardware timers. Use the :ref:`machine.Timer <machine.Timer>` class
+with a timer ID from 0 to 3 (inclusive)::
 
     from machine import Timer
 
-    tim = Timer(-1)
-    tim.init(period=5000, mode=Timer.ONE_SHOT, callback=lambda t:print(1))
-    tim.init(period=2000, mode=Timer.PERIODIC, callback=lambda t:print(2))
+    tim0 = Timer(0)
+    tim0.init(period=5000, mode=Timer.ONE_SHOT, callback=lambda t:print(0))
+
+    tim1 = Timer(1)
+    tim1.init(period=2000, mode=Timer.PERIODIC, callback=lambda t:print(1))
 
 The period is in milliseconds.
 
+Virtual timers are not currently supported on this port.
+
 .. _Pins_and_GPIO:
 
 Pins and GPIO
@@ -172,7 +176,7 @@ PWM (pulse width modulation)
 
 PWM can be enabled on all output-enabled pins. The base frequency can
 range from 1Hz to 40MHz but there is a tradeoff; as the base frequency
-*increases* the duty resolution *decreases*. See 
+*increases* the duty resolution *decreases*. See
 `LED Control <https://docs.espressif.com/projects/esp-idf/en/latest/api-reference/peripherals/ledc.html>`_
 for more details.
 Currently the duty cycle has to be in the range of 0-1023.
@@ -273,7 +277,7 @@ class::
 
 .. Warning::
    Currently *all* of ``sck``, ``mosi`` and ``miso`` *must* be specified when
-   initialising Software SPI. 
+   initialising Software SPI.
 
 Hardware SPI bus
 ----------------
@@ -445,11 +449,11 @@ Use the ``TouchPad`` class in the ``machine`` module::
     from machine import TouchPad, Pin
 
     t = TouchPad(Pin(14))
-    t.read()              # Returns a smaller number when touched 
+    t.read()              # Returns a smaller number when touched
 
 ``TouchPad.read`` returns a value relative to the capacitive variation. Small numbers (typically in
-the *tens*) are common when a pin is touched, larger numbers (above *one thousand*) when 
-no touch is present. However the values are *relative* and can vary depending on the board 
+the *tens*) are common when a pin is touched, larger numbers (above *one thousand*) when
+no touch is present. However the values are *relative* and can vary depending on the board
 and surrounding composition so some calibration may be required.
 
 There are ten capacitive touch-enabled pins that can be used on the ESP32: 0, 2, 4, 12, 13

From 37e1b5c891f9964bb6c95228bc2d718511507a69 Mon Sep 17 00:00:00 2001
From: Jonathan Hogg <me@jonathanhogg.com>
Date: Tue, 21 Jul 2020 18:47:28 +0100
Subject: [PATCH 0193/3533] py/compile: Don't await __aiter__ special method in
 async-for.

MicroPython's original implementation of __aiter__ was correct for an
earlier (provisional) version of PEP492 (CPython 3.5), where __aiter__ was
an async-def function.  But that changed in the final version of PEP492 (in
CPython 3.5.2) where the function was changed to a normal one.  See
https://www.python.org/dev/peps/pep-0492/#why-aiter-does-not-return-an-awaitable
See also the note at the end of this subsection in the docs:
https://docs.python.org/3.5/reference/datamodel.html#asynchronous-iterators
And for completeness the BPO: https://bugs.python.org/issue27243

To be consistent with the Python spec as it stands today (and now that
PEP492 is final) this commit changes MicroPython's behaviour to match
CPython:  __aiter__ should return an async-iterable object, but is not
itself awaitable.

The relevant tests are updated to match.

See #6267.
---
 py/compile.c                   | 3 ++-
 tests/basics/async_for.py      | 2 +-
 tests/basics/async_for2.py     | 5 ++---
 tests/basics/async_for2.py.exp | 4 ----
 4 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/py/compile.c b/py/compile.c
index 53108b7062b78..d1a4d65c8bb51 100644
--- a/py/compile.c
+++ b/py/compile.c
@@ -1798,7 +1798,8 @@ STATIC void compile_async_for_stmt(compiler_t *comp, mp_parse_node_struct_t *pns
     uint try_finally_label = comp_next_label(comp);
 
     compile_node(comp, pns->nodes[1]); // iterator
-    compile_await_object_method(comp, MP_QSTR___aiter__);
+    EMIT_ARG(load_method, MP_QSTR___aiter__, false);
+    EMIT_ARG(call_method, 0, 0, 0);
     compile_store_id(comp, context);
 
     START_BREAK_CONTINUE_BLOCK
diff --git a/tests/basics/async_for.py b/tests/basics/async_for.py
index 6b4e136d593d4..5fd0540828afe 100644
--- a/tests/basics/async_for.py
+++ b/tests/basics/async_for.py
@@ -6,7 +6,7 @@ def __init__(self, obj):
         print('init')
         self._it = iter(obj)
 
-    async def __aiter__(self):
+    def __aiter__(self):
         print('aiter')
         return self
 
diff --git a/tests/basics/async_for2.py b/tests/basics/async_for2.py
index 89584fcb100f3..aad23a3e5ad8c 100644
--- a/tests/basics/async_for2.py
+++ b/tests/basics/async_for2.py
@@ -1,4 +1,4 @@
-# test waiting within "async for" aiter/anext functions
+# test waiting within "async for" __anext__ function
 
 import sys
 if sys.implementation.name == 'micropython':
@@ -21,9 +21,8 @@ def __init__(self, high):
         self.cur = 0
         self.high = high
 
-    async def __aiter__(self):
+    def __aiter__(self):
         print('aiter')
-        print('f returned:', await f(10))
         return self
 
     async def __anext__(self):
diff --git a/tests/basics/async_for2.py.exp b/tests/basics/async_for2.py.exp
index 886232f7bab73..52bbe90c85376 100644
--- a/tests/basics/async_for2.py.exp
+++ b/tests/basics/async_for2.py.exp
@@ -1,9 +1,5 @@
 init
 aiter
-f start: 10
-coro yielded: 11
-coro yielded: 12
-f returned: 13
 anext
 f start: 20
 coro yielded: 21

From fd2ff867a08fd174f0bbf7a03aa59547634e91ac Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 22 Jul 2020 23:45:08 +1000
Subject: [PATCH 0194/3533] stm32/usbdev: Fix calculation of SCSI LUN size with
 multiple LUNs.

The SCSI driver calls GetCapacity to get the block size and number of
blocks of the underlying block-device/LUN.  It caches these values and uses
them later on to verify that reads/writes are within the bounds of the LUN.
But, prior to this commit, there was only one set of cached values for all
LUNs, so the bounds checking for a LUN could use incorrect values, values
from one of the other LUNs that most recently updated the cached values.
This would lead to failed SCSI requests.

This commit fixes this issue by having separate cached values for each LUN.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/usbd_msc_interface.h              |  2 --
 .../stm32/usbdev/class/inc/usbd_cdc_msc_hid.h |  7 ++--
 ports/stm32/usbdev/class/src/usbd_msc_scsi.c  | 34 ++++++++++---------
 3 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/ports/stm32/usbd_msc_interface.h b/ports/stm32/usbd_msc_interface.h
index 411c707cab7df..9d25a72a3a4ba 100644
--- a/ports/stm32/usbd_msc_interface.h
+++ b/ports/stm32/usbd_msc_interface.h
@@ -26,8 +26,6 @@
 #ifndef MICROPY_INCLUDED_STM32_USBD_MSC_INTERFACE_H
 #define MICROPY_INCLUDED_STM32_USBD_MSC_INTERFACE_H
 
-#define USBD_MSC_MAX_LUN (2)
-
 extern const USBD_StorageTypeDef usbd_msc_fops;
 
 void usbd_msc_init_lu(size_t lu_n, const void *lu_data);
diff --git a/ports/stm32/usbdev/class/inc/usbd_cdc_msc_hid.h b/ports/stm32/usbdev/class/inc/usbd_cdc_msc_hid.h
index d934f4676c4df..d6c38bbd07e34 100644
--- a/ports/stm32/usbdev/class/inc/usbd_cdc_msc_hid.h
+++ b/ports/stm32/usbdev/class/inc/usbd_cdc_msc_hid.h
@@ -34,6 +34,9 @@
 #define MSC_MEDIA_PACKET            (2048) // was 8192; how low can it go whilst still working?
 #define HID_DATA_FS_MAX_PACKET_SIZE (64) // endpoint IN & OUT packet size
 
+// Maximum number of LUN that can be exposed on the MSC interface
+#define USBD_MSC_MAX_LUN (2)
+
 // Need to define here for BOT and SCSI layers
 #define MSC_IN_EP     (0x81)
 #define MSC_OUT_EP    (0x01)
@@ -78,8 +81,8 @@ typedef struct {
   uint8_t                  scsi_sense_head;
   uint8_t                  scsi_sense_tail;
   
-  uint16_t                 scsi_blk_size;
-  uint32_t                 scsi_blk_nbr;
+  uint16_t                 scsi_blk_size[USBD_MSC_MAX_LUN];
+  uint32_t                 scsi_blk_nbr[USBD_MSC_MAX_LUN];
   
   uint32_t                 scsi_blk_addr_in_blks;
   uint32_t                 scsi_blk_len;
diff --git a/ports/stm32/usbdev/class/src/usbd_msc_scsi.c b/ports/stm32/usbdev/class/src/usbd_msc_scsi.c
index d0413b758a5d6..2eb716ccde438 100644
--- a/ports/stm32/usbdev/class/src/usbd_msc_scsi.c
+++ b/ports/stm32/usbdev/class/src/usbd_msc_scsi.c
@@ -247,7 +247,7 @@ static int8_t SCSI_ReadCapacity10(USBD_HandleTypeDef  *pdev, uint8_t lun, uint8_
 {
   USBD_MSC_BOT_HandleTypeDef *hmsc = &((usbd_cdc_msc_hid_state_t*)pdev->pClassData)->MSC_BOT_ClassData;
 
-  if(hmsc->bdev_ops->GetCapacity(lun, &hmsc->scsi_blk_nbr, &hmsc->scsi_blk_size) != 0)
+  if(hmsc->bdev_ops->GetCapacity(lun, &hmsc->scsi_blk_nbr[lun], &hmsc->scsi_blk_size[lun]) != 0)
   {
     SCSI_SenseCode(pdev,
                    lun,
@@ -258,15 +258,17 @@ static int8_t SCSI_ReadCapacity10(USBD_HandleTypeDef  *pdev, uint8_t lun, uint8_
   else
   {
 
-    hmsc->bot_data[0] = (uint8_t)((hmsc->scsi_blk_nbr - 1) >> 24);
-    hmsc->bot_data[1] = (uint8_t)((hmsc->scsi_blk_nbr - 1) >> 16);
-    hmsc->bot_data[2] = (uint8_t)((hmsc->scsi_blk_nbr - 1) >>  8);
-    hmsc->bot_data[3] = (uint8_t)(hmsc->scsi_blk_nbr - 1);
+    uint32_t blk_nbr = hmsc->scsi_blk_nbr[lun];
+    hmsc->bot_data[0] = (uint8_t)((blk_nbr - 1) >> 24);
+    hmsc->bot_data[1] = (uint8_t)((blk_nbr - 1) >> 16);
+    hmsc->bot_data[2] = (uint8_t)((blk_nbr - 1) >>  8);
+    hmsc->bot_data[3] = (uint8_t)(blk_nbr - 1);
 
-    hmsc->bot_data[4] = (uint8_t)(hmsc->scsi_blk_size >>  24);
-    hmsc->bot_data[5] = (uint8_t)(hmsc->scsi_blk_size >>  16);
-    hmsc->bot_data[6] = (uint8_t)(hmsc->scsi_blk_size >>  8);
-    hmsc->bot_data[7] = (uint8_t)(hmsc->scsi_blk_size);
+    uint32_t blk_size = hmsc->scsi_blk_size[lun];
+    hmsc->bot_data[4] = (uint8_t)(blk_size >> 24);
+    hmsc->bot_data[5] = (uint8_t)(blk_size >> 16);
+    hmsc->bot_data[6] = (uint8_t)(blk_size >> 8);
+    hmsc->bot_data[7] = (uint8_t)(blk_size);
 
     hmsc->bot_data_length = 8;
     return 0;
@@ -516,7 +518,7 @@ static int8_t SCSI_Read10(USBD_HandleTypeDef  *pdev, uint8_t lun , uint8_t *para
     }
 
     hmsc->bot_state = USBD_BOT_DATA_IN;
-    hmsc->scsi_blk_len  *= hmsc->scsi_blk_size;
+    hmsc->scsi_blk_len *= hmsc->scsi_blk_size[lun];
 
     /* cases 4,5 : Hi <> Dn */
     if (hmsc->cbw.dDataLength != hmsc->scsi_blk_len)
@@ -596,7 +598,7 @@ static int8_t SCSI_Write10 (USBD_HandleTypeDef  *pdev, uint8_t lun , uint8_t *pa
       return -1; /* error */
     }
 
-    hmsc->scsi_blk_len  *= hmsc->scsi_blk_size;
+    hmsc->scsi_blk_len *= hmsc->scsi_blk_size[lun];
 
     /* cases 3,11,13 : Hn,Ho <> D0 */
     if (hmsc->cbw.dDataLength != hmsc->scsi_blk_len)
@@ -670,7 +672,7 @@ static int8_t SCSI_CheckAddressRange (USBD_HandleTypeDef  *pdev, uint8_t lun , u
 {
   USBD_MSC_BOT_HandleTypeDef *hmsc = &((usbd_cdc_msc_hid_state_t*)pdev->pClassData)->MSC_BOT_ClassData;
 
-  if ((blk_offset + blk_nbr) > hmsc->scsi_blk_nbr )
+  if ((blk_offset + blk_nbr) > hmsc->scsi_blk_nbr[lun])
   {
     SCSI_SenseCode(pdev,
                    lun,
@@ -697,7 +699,7 @@ static int8_t SCSI_ProcessRead (USBD_HandleTypeDef  *pdev, uint8_t lun)
   if( hmsc->bdev_ops->Read(lun ,
                               hmsc->bot_data,
                               hmsc->scsi_blk_addr_in_blks,
-                              len / hmsc->scsi_blk_size) < 0)
+                              len / hmsc->scsi_blk_size[lun]) < 0)
   {
 
     SCSI_SenseCode(pdev,
@@ -714,7 +716,7 @@ static int8_t SCSI_ProcessRead (USBD_HandleTypeDef  *pdev, uint8_t lun)
              len);
 
 
-  hmsc->scsi_blk_addr_in_blks += len / hmsc->scsi_blk_size;
+  hmsc->scsi_blk_addr_in_blks += len / hmsc->scsi_blk_size[lun];
   hmsc->scsi_blk_len    -= len;
 
   /* case 6 : Hi = Di */
@@ -744,7 +746,7 @@ static int8_t SCSI_ProcessWrite (USBD_HandleTypeDef  *pdev, uint8_t lun)
   if(hmsc->bdev_ops->Write(lun ,
                               hmsc->bot_data,
                               hmsc->scsi_blk_addr_in_blks,
-                              len / hmsc->scsi_blk_size) < 0)
+                              len / hmsc->scsi_blk_size[lun]) < 0)
   {
     SCSI_SenseCode(pdev,
                    lun,
@@ -754,7 +756,7 @@ static int8_t SCSI_ProcessWrite (USBD_HandleTypeDef  *pdev, uint8_t lun)
   }
 
 
-  hmsc->scsi_blk_addr_in_blks += len / hmsc->scsi_blk_size;
+  hmsc->scsi_blk_addr_in_blks += len / hmsc->scsi_blk_size[lun];
   hmsc->scsi_blk_len   -= len;
 
   /* case 12 : Ho = Do */

From 441460d81ff2b1faee7d044d859896f754361b93 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sat, 25 Jul 2020 23:05:41 +1000
Subject: [PATCH 0195/3533] extmod/uasyncio: Add StreamReader.readexactly(n)
 method.

It raises on EOFError instead of an IncompleteReadError (which is what
CPython does).  But the latter is derived from EOFError so code compatible
with MicroPython and CPython can be written by catching EOFError (eg see
included test).

Fixes issue #6156.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/uasyncio/stream.py                     | 12 ++++
 tests/multi_net/uasyncio_tcp_readexactly.py   | 68 +++++++++++++++++++
 .../multi_net/uasyncio_tcp_readexactly.py.exp | 10 +++
 3 files changed, 90 insertions(+)
 create mode 100644 tests/multi_net/uasyncio_tcp_readexactly.py
 create mode 100644 tests/multi_net/uasyncio_tcp_readexactly.py.exp

diff --git a/extmod/uasyncio/stream.py b/extmod/uasyncio/stream.py
index 2a1efd1a17bfc..b6d787e4f0336 100644
--- a/extmod/uasyncio/stream.py
+++ b/extmod/uasyncio/stream.py
@@ -30,6 +30,18 @@ async def read(self, n):
         yield core._io_queue.queue_read(self.s)
         return self.s.read(n)
 
+    async def readexactly(self, n):
+        r = b""
+        while n:
+            yield core._io_queue.queue_read(self.s)
+            r2 = self.s.read(n)
+            if r2 is not None:
+                if not len(r2):
+                    raise EOFError
+                r += r2
+                n -= len(r2)
+        return r
+
     async def readline(self):
         l = b""
         while True:
diff --git a/tests/multi_net/uasyncio_tcp_readexactly.py b/tests/multi_net/uasyncio_tcp_readexactly.py
new file mode 100644
index 0000000000000..71d8c6d0e9323
--- /dev/null
+++ b/tests/multi_net/uasyncio_tcp_readexactly.py
@@ -0,0 +1,68 @@
+# Test uasyncio stream readexactly() method using TCP server/client
+
+try:
+    import uasyncio as asyncio
+except ImportError:
+    try:
+        import asyncio
+    except ImportError:
+        print("SKIP")
+        raise SystemExit
+
+PORT = 8000
+
+
+async def handle_connection(reader, writer):
+    writer.write(b"a")
+    await writer.drain()
+
+    # Split the first 2 bytes up so the client must wait for the second one
+    await asyncio.sleep(0.1)
+
+    writer.write(b"b")
+    await writer.drain()
+
+    writer.write(b"c")
+    await writer.drain()
+
+    writer.write(b"d")
+    await writer.drain()
+
+    print("close")
+    writer.close()
+    await writer.wait_closed()
+
+    print("done")
+    ev.set()
+
+
+async def tcp_server():
+    global ev
+    ev = asyncio.Event()
+    server = await asyncio.start_server(handle_connection, "0.0.0.0", PORT)
+    print("server running")
+    multitest.next()
+    async with server:
+        await asyncio.wait_for(ev.wait(), 10)
+
+
+async def tcp_client():
+    reader, writer = await asyncio.open_connection(IP, PORT)
+    print(await reader.readexactly(2))
+    print(await reader.readexactly(0))
+    print(await reader.readexactly(1))
+    try:
+        print(await reader.readexactly(2))
+    except EOFError as er:
+        print("EOFError")
+    print(await reader.readexactly(0))
+
+
+def instance0():
+    multitest.globals(IP=multitest.get_network_ip())
+    asyncio.run(tcp_server())
+
+
+def instance1():
+    multitest.next()
+    asyncio.run(tcp_client())
diff --git a/tests/multi_net/uasyncio_tcp_readexactly.py.exp b/tests/multi_net/uasyncio_tcp_readexactly.py.exp
new file mode 100644
index 0000000000000..65ce6d628dd4f
--- /dev/null
+++ b/tests/multi_net/uasyncio_tcp_readexactly.py.exp
@@ -0,0 +1,10 @@
+--- instance0 ---
+server running
+close
+done
+--- instance1 ---
+b'ab'
+b''
+b'c'
+EOFError
+b''

From 952de5cb77208f519a88752cd5de43337686f7f4 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sun, 26 Jul 2020 10:56:24 +1000
Subject: [PATCH 0196/3533] tools/makemanifest.py: Use errno.EEXIST instead of
 number 17.

To make this code more portable, across different platforms.

Signed-off-by: Damien George <damien@micropython.org>
---
 tools/makemanifest.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tools/makemanifest.py b/tools/makemanifest.py
index babce7fa73f4b..6779198c47c00 100644
--- a/tools/makemanifest.py
+++ b/tools/makemanifest.py
@@ -25,6 +25,7 @@
 # THE SOFTWARE.
 
 from __future__ import print_function
+import errno
 import sys
 import os
 import subprocess
@@ -171,7 +172,7 @@ def mkdir(path):
         try:
             os.mkdir(cur_path)
         except OSError as er:
-            if er.args[0] == 17:  # file exists
+            if er.args[0] == errno.EEXIST:
                 pass
             else:
                 raise er

From 0c0cef9870e8215d67c79fefa6582849842001f9 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sun, 26 Jul 2020 14:30:56 +1000
Subject: [PATCH 0197/3533] tests: Move .mpy import tests from import/ to
 micropython/ dir.

These tests are specific to MicroPython so have a better home in the
micropython/ test subdir, and putting them here allows them to be run by
all targets, not just those that have access to the local filesystem (eg
the unix port).

Signed-off-by: Damien George <damien@micropython.org>
---
 .../{import/mpy_invalid.py => micropython/import_mpy_invalid.py}  | 0
 .../mpy_invalid.py.exp => micropython/import_mpy_invalid.py.exp}  | 0
 .../mpy_native.py => micropython/import_mpy_native_x64.py}        | 0
 .../import_mpy_native_x64.py.exp}                                 | 0
 4 files changed, 0 insertions(+), 0 deletions(-)
 rename tests/{import/mpy_invalid.py => micropython/import_mpy_invalid.py} (100%)
 rename tests/{import/mpy_invalid.py.exp => micropython/import_mpy_invalid.py.exp} (100%)
 rename tests/{import/mpy_native.py => micropython/import_mpy_native_x64.py} (100%)
 rename tests/{import/mpy_native.py.exp => micropython/import_mpy_native_x64.py.exp} (100%)

diff --git a/tests/import/mpy_invalid.py b/tests/micropython/import_mpy_invalid.py
similarity index 100%
rename from tests/import/mpy_invalid.py
rename to tests/micropython/import_mpy_invalid.py
diff --git a/tests/import/mpy_invalid.py.exp b/tests/micropython/import_mpy_invalid.py.exp
similarity index 100%
rename from tests/import/mpy_invalid.py.exp
rename to tests/micropython/import_mpy_invalid.py.exp
diff --git a/tests/import/mpy_native.py b/tests/micropython/import_mpy_native_x64.py
similarity index 100%
rename from tests/import/mpy_native.py
rename to tests/micropython/import_mpy_native_x64.py
diff --git a/tests/import/mpy_native.py.exp b/tests/micropython/import_mpy_native_x64.py.exp
similarity index 100%
rename from tests/import/mpy_native.py.exp
rename to tests/micropython/import_mpy_native_x64.py.exp

From 8da40baa47ee9fe7aac228af2c0addd1f4ce3646 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sun, 26 Jul 2020 14:43:13 +1000
Subject: [PATCH 0198/3533] tests/micropython: Improve .mpy import tests to run
 on more targets.

All imports are now tested to see if the test should be skipped,
UserFile.read is removed, and UserFile.readinto is made more efficient.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/micropython/import_mpy_invalid.py    | 19 ++++++-------------
 tests/micropython/import_mpy_native_x64.py | 19 ++++++-------------
 2 files changed, 12 insertions(+), 26 deletions(-)

diff --git a/tests/micropython/import_mpy_invalid.py b/tests/micropython/import_mpy_invalid.py
index d6d01e7f1fc0c..00973fe3f9f12 100644
--- a/tests/micropython/import_mpy_invalid.py
+++ b/tests/micropython/import_mpy_invalid.py
@@ -1,11 +1,9 @@
 # test importing of invalid .mpy files
 
-import sys, uio
-
 try:
-    uio.IOBase
-    import uos
+    import sys, uio, uos
 
+    uio.IOBase
     uos.mount
 except (ImportError, AttributeError):
     print("SKIP")
@@ -14,18 +12,13 @@
 
 class UserFile(uio.IOBase):
     def __init__(self, data):
-        self.data = data
+        self.data = memoryview(data)
         self.pos = 0
 
-    def read(self):
-        return self.data
-
     def readinto(self, buf):
-        n = 0
-        while n < len(buf) and self.pos < len(self.data):
-            buf[n] = self.data[self.pos]
-            n += 1
-            self.pos += 1
+        n = min(len(buf), len(self.data) - self.pos)
+        buf[:n] = self.data[self.pos : self.pos + n]
+        self.pos += n
         return n
 
     def ioctl(self, req, arg):
diff --git a/tests/micropython/import_mpy_native_x64.py b/tests/micropython/import_mpy_native_x64.py
index 5d7bdab4a2aaa..d0de507d44234 100644
--- a/tests/micropython/import_mpy_native_x64.py
+++ b/tests/micropython/import_mpy_native_x64.py
@@ -1,11 +1,9 @@
 # test importing of .mpy files with native code (x64 only)
 
-import sys, uio
-
 try:
-    uio.IOBase
-    import uos
+    import sys, uio, uos
 
+    uio.IOBase
     uos.mount
 except (ImportError, AttributeError):
     print("SKIP")
@@ -18,18 +16,13 @@
 
 class UserFile(uio.IOBase):
     def __init__(self, data):
-        self.data = data
+        self.data = memoryview(data)
         self.pos = 0
 
-    def read(self):
-        return self.data
-
     def readinto(self, buf):
-        n = 0
-        while n < len(buf) and self.pos < len(self.data):
-            buf[n] = self.data[self.pos]
-            n += 1
-            self.pos += 1
+        n = min(len(buf), len(self.data) - self.pos)
+        buf[:n] = self.data[self.pos : self.pos + n]
+        self.pos += n
         return n
 
     def ioctl(self, req, arg):

From 9883d8e818feba112935676eb5aa4ce211d7779c Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 27 Jul 2020 23:52:38 +1000
Subject: [PATCH 0199/3533] py/persistentcode: Maintain root ptr list of
 imported native .mpy code.

On ports where normal heap memory can contain executable code (eg ARM-based
ports such as stm32), native code loaded from an .mpy file may be reclaimed
by the GC because there's no reference to the very start of the native
machine code block that is reachable from root pointers (only pointers to
internal parts of the machine code block are reachable, but that doesn't
help the GC find the memory).

This commit fixes this issue by maintaining an explicit list of root
pointers pointing to native code that is loaded from an .mpy file.  This
is not needed for all ports so is selectable by the new configuration
option MICROPY_PERSISTENT_CODE_TRACK_RELOC_CODE.  It's enabled by default
if a port does not specify any special functions to allocate or commit
executable memory.

A test is included to test that native code loaded from an .mpy file does
not get reclaimed by the GC.

Fixes #6045.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/mpconfig.h                                 | 12 +++
 py/mpstate.h                                  |  5 +
 py/persistentcode.c                           | 14 ++-
 py/runtime.c                                  |  4 +
 tests/micropython/import_mpy_native_gc.py     | 91 +++++++++++++++++++
 tests/micropython/import_mpy_native_gc.py.exp |  1 +
 6 files changed, 126 insertions(+), 1 deletion(-)
 create mode 100644 tests/micropython/import_mpy_native_gc.py
 create mode 100644 tests/micropython/import_mpy_native_gc.py.exp

diff --git a/py/mpconfig.h b/py/mpconfig.h
index 287b15aaef32f..3d9ce8bb55c95 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -351,6 +351,18 @@
 // Convenience definition for whether any native or inline assembler emitter is enabled
 #define MICROPY_EMIT_MACHINE_CODE (MICROPY_EMIT_NATIVE || MICROPY_EMIT_INLINE_ASM)
 
+// Whether native relocatable code loaded from .mpy files is explicitly tracked
+// so that the GC cannot reclaim it.  Needed on architectures that allocate
+// executable memory on the MicroPython heap and don't explicitly track this
+// data some other way.
+#ifndef MICROPY_PERSISTENT_CODE_TRACK_RELOC_CODE
+#if !MICROPY_EMIT_MACHINE_CODE || defined(MP_PLAT_ALLOC_EXEC) || defined(MP_PLAT_COMMIT_EXEC)
+#define MICROPY_PERSISTENT_CODE_TRACK_RELOC_CODE (0)
+#else
+#define MICROPY_PERSISTENT_CODE_TRACK_RELOC_CODE (1)
+#endif
+#endif
+
 /*****************************************************************************/
 /* Compiler configuration                                                    */
 
diff --git a/py/mpstate.h b/py/mpstate.h
index 5f6cf55936a32..2519c77e2d647 100644
--- a/py/mpstate.h
+++ b/py/mpstate.h
@@ -167,6 +167,11 @@ typedef struct _mp_state_vm_t {
     mp_obj_dict_t *mp_module_builtins_override_dict;
     #endif
 
+    #if MICROPY_PERSISTENT_CODE_TRACK_RELOC_CODE
+    // An mp_obj_list_t that tracks relocated native code to prevent the GC from reclaiming them.
+    mp_obj_t track_reloc_code_list;
+    #endif
+
     // include any root pointers defined by a port
     MICROPY_PORT_ROOT_POINTERS
 
diff --git a/py/persistentcode.c b/py/persistentcode.c
index 386ea49477f6b..da3234a5fe9cd 100644
--- a/py/persistentcode.c
+++ b/py/persistentcode.c
@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2013-2016 Damien P. George
+ * Copyright (c) 2013-2020 Damien P. George
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -516,6 +516,18 @@ STATIC mp_raw_code_t *load_raw_code(mp_reader_t *reader, qstr_window_t *qw) {
         fun_data = MP_PLAT_COMMIT_EXEC(fun_data, fun_data_len, opt_ri);
         #else
         if (prelude.scope_flags & MP_SCOPE_FLAG_VIPERRELOC) {
+            #if MICROPY_PERSISTENT_CODE_TRACK_RELOC_CODE
+            // If native code needs relocations then it's not guaranteed that a pointer to
+            // the head of `buf` (containing the machine code) will be retained for the GC
+            // to trace.  This is because native functions can start inside `buf` and so
+            // it's possible that the only GC-reachable pointers are pointers inside `buf`.
+            // So put this `buf` on a list of reachable root pointers.
+            if (MP_STATE_PORT(track_reloc_code_list) == MP_OBJ_NULL) {
+                MP_STATE_PORT(track_reloc_code_list) = mp_obj_new_list(0, NULL);
+            }
+            mp_obj_list_append(MP_STATE_PORT(track_reloc_code_list), MP_OBJ_FROM_PTR(fun_data));
+            #endif
+            // Do the relocations.
             mp_native_relocate(&ri, fun_data, (uintptr_t)fun_data);
         }
         #endif
diff --git a/py/runtime.c b/py/runtime.c
index 78da386919532..38da2f4538e97 100644
--- a/py/runtime.c
+++ b/py/runtime.c
@@ -106,6 +106,10 @@ void mp_init(void) {
     MP_STATE_VM(mp_module_builtins_override_dict) = NULL;
     #endif
 
+    #if MICROPY_PERSISTENT_CODE_TRACK_RELOC_CODE
+    MP_STATE_VM(track_reloc_code_list) = MP_OBJ_NULL;
+    #endif
+
     #if MICROPY_PY_OS_DUPTERM
     for (size_t i = 0; i < MICROPY_PY_OS_DUPTERM; ++i) {
         MP_STATE_VM(dupterm_objs[i]) = MP_OBJ_NULL;
diff --git a/tests/micropython/import_mpy_native_gc.py b/tests/micropython/import_mpy_native_gc.py
new file mode 100644
index 0000000000000..e8fac8f179371
--- /dev/null
+++ b/tests/micropython/import_mpy_native_gc.py
@@ -0,0 +1,91 @@
+# Test that native code loaded from a .mpy file is retained after a GC.
+
+try:
+    import gc, sys, uio, uos
+
+    sys.implementation.mpy
+    uio.IOBase
+    uos.mount
+except (ImportError, AttributeError):
+    print("SKIP")
+    raise SystemExit
+
+
+class UserFile(uio.IOBase):
+    def __init__(self, data):
+        self.data = memoryview(data)
+        self.pos = 0
+
+    def readinto(self, buf):
+        n = min(len(buf), len(self.data) - self.pos)
+        buf[:n] = self.data[self.pos : self.pos + n]
+        self.pos += n
+        return n
+
+    def ioctl(self, req, arg):
+        return 0
+
+
+class UserFS:
+    def __init__(self, files):
+        self.files = files
+
+    def mount(self, readonly, mksfs):
+        pass
+
+    def umount(self):
+        pass
+
+    def stat(self, path):
+        if path in self.files:
+            return (32768, 0, 0, 0, 0, 0, 0, 0, 0, 0)
+        raise OSError
+
+    def open(self, path, mode):
+        return UserFile(self.files[path])
+
+
+# Pre-compiled examples/natmod/features0 example for various architectures, keyed
+# by the required value of sys.implementation.mpy.
+features0_file_contents = {
+    # -march=x64 -mcache-lookup-bc
+    0xB05: b'M\x05\x0b\x1f \x84b\xe9/\x00\x00\x00SH\x8b\x1ds\x00\x00\x00\xbe\x02\x00\x00\x00\xffS\x18\xbf\x01\x00\x00\x00H\x85\xc0u\x0cH\x8bC \xbe\x02\x00\x00\x00[\xff\xe0H\x0f\xaf\xf8H\xff\xc8\xeb\xe6ATUSH\x8b\x1dA\x00\x00\x00H\x8b\x7f\x08L\x8bc(A\xff\xd4H\x8d5\x1f\x00\x00\x00H\x89\xc5H\x8b\x05-\x00\x00\x00\x0f\xb78\xffShH\x89\xefA\xff\xd4H\x8b\x03[]A\\\xc3\x00\x00\x00\x00\x00\x00\x00\x00\x00\x05\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x90\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x84@\x12factorial\x10\x00\x00\r \x01"\x9f\x1c\x01\x1e\xff',
+    # -march=armv7m
+    0x1605: b"M\x05\x16\x1f \x84\x12\x1a\xe0\x00\x00\x13\xb5\nK\nJ{D\x9cX\x02!\xe3h\x98G\x03F\x01 3\xb9\x02!#i\x01\x93\x02\xb0\xbd\xe8\x10@\x18GXC\x01;\xf4\xe7\x00\xbfj\x00\x00\x00\x00\x00\x00\x00\xf8\xb5\tN\tK~D\xf4X@hgi\xb8G\x05F\x07K\x07I\xf2XyD\x10\x88ck\x98G(F\xb8G h\xf8\xbd6\x00\x00\x00\x00\x00\x00\x00\x04\x00\x00\x00\x1c\x00\x00\x00\x00\x00\x00\x00\x05\x00\x00\x00\x00\x00\x00\x00\x80\x00\x00\x00\x00\x00\x00\x00\x01\x84\x00\x12factorial\x10\x00\x00\r<\x01>\x9f8\x01:\xff",
+}
+
+# Populate other armv7m-derived archs based on armv7m.
+for arch in (0x1A05, 0x1E05, 0x2205):
+    features0_file_contents[arch] = features0_file_contents[0x1605]
+
+if sys.implementation.mpy not in features0_file_contents:
+    print("SKIP")
+    raise SystemExit
+
+# These are the test .mpy files.
+user_files = {"/features0.mpy": features0_file_contents[sys.implementation.mpy]}
+
+# Create and mount a user filesystem.
+uos.mount(UserFS(user_files), "/userfs")
+sys.path.append("/userfs")
+
+# Import the native function.
+gc.collect()
+from features0 import factorial
+
+# Free the module that contained the function.
+del sys.modules["features0"]
+
+# Run a GC cycle which should reclaim the module but not the function.
+gc.collect()
+
+# Allocate lots of fragmented memory to overwrite anything that was just freed by the GC.
+for i in range(1000):
+    []
+
+# Run the native function, it should not have been freed or overwritten.
+print(factorial(10))
+
+# Unmount and undo path addition.
+uos.umount("/userfs")
+sys.path.pop()
diff --git a/tests/micropython/import_mpy_native_gc.py.exp b/tests/micropython/import_mpy_native_gc.py.exp
new file mode 100644
index 0000000000000..3fbd4a8698fa3
--- /dev/null
+++ b/tests/micropython/import_mpy_native_gc.py.exp
@@ -0,0 +1 @@
+3628800

From b731bd0ce6f05796dd642804bf2469646d7a063c Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sat, 8 Aug 2020 14:46:05 +1000
Subject: [PATCH 0200/3533] tools/makemanifest.py: Print nicely formatted
 errors from mpy-cross.

If mpy-cross exits with an error be sure to print that error in a way that
is readable, instead of a long bytes object.

Signed-off-by: Damien George <damien@micropython.org>
---
 tools/makemanifest.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tools/makemanifest.py b/tools/makemanifest.py
index 6779198c47c00..b7d4a4d4a68af 100644
--- a/tools/makemanifest.py
+++ b/tools/makemanifest.py
@@ -288,7 +288,8 @@ def main():
                     + ["-o", outfile, "-s", script, "-O{}".format(opt), infile]
                 )
                 if res != 0:
-                    print("error compiling {}: {}".format(infile, out))
+                    print("error compiling {}:".format(infile))
+                    sys.stdout.buffer.write(out)
                     raise SystemExit(1)
                 ts_outfile = get_timestamp(outfile)
             mpy_files.append(outfile)

From 60f5b941e096aba270a7d4af8faa33169de8364f Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sat, 8 Aug 2020 15:39:56 +1000
Subject: [PATCH 0201/3533] extmod/vfs_reader: Fix mp_reader_new_file to open
 file in "rb" mode.

mp_reader_new_file() is used to read in files for importing, either .py or
.mpy files, for the lexer and persistent code loader respectively.  In both
cases the file should be opened in raw bytes mode: the lexer handles
unicode characters itself, and .mpy files contain 8-bit bytes by nature.

Before this commit importing was working correctly because, although the
file was opened in text mode, all native filesystem implementations (POSIX,
FAT, LFS) would access the file in raw bytes mode via mp_stream_rw()
calling mp_stream_p_t.read().  So it was only an issue for non-native
filesystems, such as those implemented in Python.  For Python-based
filesystem implementations, a call to mp_stream_rw() would go via IOBase
and then to readinto() at the Python level, and readinto() is only defined
on files opened in raw bytes mode.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/vfs_reader.c            |  7 +++++--
 tests/extmod/vfs_userfs.py     | 14 ++++++++++----
 tests/extmod/vfs_userfs.py.exp |  6 +++---
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/extmod/vfs_reader.c b/extmod/vfs_reader.c
index db13ce3c33141..d3904c5c50693 100644
--- a/extmod/vfs_reader.c
+++ b/extmod/vfs_reader.c
@@ -71,8 +71,11 @@ STATIC void mp_reader_vfs_close(void *data) {
 
 void mp_reader_new_file(mp_reader_t *reader, const char *filename) {
     mp_reader_vfs_t *rf = m_new_obj(mp_reader_vfs_t);
-    mp_obj_t arg = mp_obj_new_str(filename, strlen(filename));
-    rf->file = mp_vfs_open(1, &arg, (mp_map_t *)&mp_const_empty_map);
+    mp_obj_t args[2] = {
+        mp_obj_new_str(filename, strlen(filename)),
+        MP_OBJ_NEW_QSTR(MP_QSTR_rb),
+    };
+    rf->file = mp_vfs_open(MP_ARRAY_SIZE(args), &args[0], (mp_map_t *)&mp_const_empty_map);
     int errcode;
     rf->len = mp_stream_rw(rf->file, rf->buf, sizeof(rf->buf), &errcode, MP_STREAM_RW_READ | MP_STREAM_RW_ONCE);
     if (errcode != 0) {
diff --git a/tests/extmod/vfs_userfs.py b/tests/extmod/vfs_userfs.py
index 06e546b081a97..3cdfe82eea8dc 100644
--- a/tests/extmod/vfs_userfs.py
+++ b/tests/extmod/vfs_userfs.py
@@ -16,14 +16,20 @@
 
 
 class UserFile(uio.IOBase):
-    def __init__(self, data):
+    def __init__(self, mode, data):
+        assert isinstance(data, bytes)
+        self.is_text = mode.find("b") == -1
         self.data = data
         self.pos = 0
 
     def read(self):
-        return self.data
+        if self.is_text:
+            return str(self.data, "utf8")
+        else:
+            return self.data
 
     def readinto(self, buf):
+        assert not self.is_text
         n = 0
         while n < len(buf) and self.pos < len(self.data):
             buf[n] = self.data[self.pos]
@@ -54,12 +60,12 @@ def stat(self, path):
 
     def open(self, path, mode):
         print("open", path, mode)
-        return UserFile(self.files[path])
+        return UserFile(mode, self.files[path])
 
 
 # create and mount a user filesystem
 user_files = {
-    "/data.txt": b"some data in a text file\n",
+    "/data.txt": b"some data in a text file",
     "/usermod1.py": b"print('in usermod1')\nimport usermod2",
     "/usermod2.py": b"print('in usermod2')",
 }
diff --git a/tests/extmod/vfs_userfs.py.exp b/tests/extmod/vfs_userfs.py.exp
index 6a4d925b91e8b..00ddd95fca508 100644
--- a/tests/extmod/vfs_userfs.py.exp
+++ b/tests/extmod/vfs_userfs.py.exp
@@ -1,12 +1,12 @@
 open /data.txt r
-b'some data in a text file\n'
+some data in a text file
 stat /usermod1
 stat /usermod1.py
-open /usermod1.py r
+open /usermod1.py rb
 ioctl 4 0
 in usermod1
 stat /usermod2
 stat /usermod2.py
-open /usermod2.py r
+open /usermod2.py rb
 ioctl 4 0
 in usermod2

From ac94e06f0ba818157490587af1e4d0fb4cf3e962 Mon Sep 17 00:00:00 2001
From: Maureen Helm <maureen.helm@nxp.com>
Date: Fri, 7 Aug 2020 14:39:13 -0500
Subject: [PATCH 0202/3533] zephyr: Include storage/flash_map.h
 unconditionally.

Include storage/flash_map.h unconditionally so we always have access to the
FLASH_AREA_LABEL_EXISTS macro, even if CONFIG_FLASH_MAP is not defined.

This fixes a build error for the qemu_x86 board:

main.c:108:63: error: missing binary operator before token "("
  108 |     #elif defined(CONFIG_FLASH_MAP) && FLASH_AREA_LABEL_EXISTS(storage)
      |                                                               ^
../../py/mkrules.mk:88: recipe for target 'build/genhdr/qstr.i.last' failed

Signed-off-by: Maureen Helm <maureen.helm@nxp.com>
---
 ports/zephyr/main.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/ports/zephyr/main.c b/ports/zephyr/main.c
index 78b947d7af9b9..74785cc830420 100644
--- a/ports/zephyr/main.c
+++ b/ports/zephyr/main.c
@@ -38,9 +38,7 @@
 #include <usb/usb_device.h>
 #endif
 
-#ifdef CONFIG_FLASH_MAP
 #include <storage/flash_map.h>
-#endif
 
 #include "py/mperrno.h"
 #include "py/compile.h"

From 17689a71f66bcf96c09f8700fa3e0f5aa5be225c Mon Sep 17 00:00:00 2001
From: Maureen Helm <maureen.helm@nxp.com>
Date: Mon, 27 Jul 2020 12:58:02 -0500
Subject: [PATCH 0203/3533] travis: Add zephyr build to CI.

Adds a job to build the zephyr port in CI using the same docker container
that the zephyr project uses for its own CI.

Always make clean zephyr builds to ensure we don't just rebuild C code, but
we also rebuild Kconfig and dts.  This is required when switching between
boards, which have different Kconfigs and device trees.

Uses the tagged zephyr 2.3.0 release.

Signed-off-by: Maureen Helm <maureen.helm@nxp.com>
---
 .travis.yml | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 48ce39f60ad89..ebf9b55899dc9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -37,6 +37,33 @@ jobs:
         - tools/codeformat.py
         - git diff --exit-code
 
+    # zephyr port
+    - stage: test
+      name: "zephyr port build"
+      services:
+        - docker
+      before_install:
+        - docker pull zephyrprojectrtos/ci:v0.11.8
+        - >
+          docker run --name zephyr-ci -d -it
+          -v "$(pwd)":/micropython
+          -e ZEPHYR_SDK_INSTALL_DIR=/opt/sdk/zephyr-sdk-0.11.3
+          -e ZEPHYR_TOOLCHAIN_VARIANT=zephyr
+          -w /micropython/ports/zephyr
+          zephyrprojectrtos/ci:v0.11.8
+        - docker ps -a
+      install:
+        - docker exec zephyr-ci west init --mr v2.3.0 /zephyrproject
+        - docker exec -w /zephyrproject zephyr-ci west update
+        - docker exec -w /zephyrproject zephyr-ci west zephyr-export
+      script:
+        - docker exec zephyr-ci bash -c "make clean; ./make-minimal ${MAKEOPTS}"
+        - docker exec zephyr-ci bash -c "make clean; ./make-minimal ${MAKEOPTS} BOARD=frdm_k64f"
+        - docker exec zephyr-ci bash -c "make clean; make ${MAKEOPTS}"
+        - docker exec zephyr-ci bash -c "make clean; make ${MAKEOPTS} BOARD=frdm_k64f"
+        - docker exec zephyr-ci bash -c "make clean; make ${MAKEOPTS} BOARD=mimxrt1050_evk"
+        - docker exec zephyr-ci bash -c "make clean; make ${MAKEOPTS} BOARD=reel_board"
+
     # unix port on OSX (first in list because the build VM takes a long time to start)
     - stage: test
       os: osx

From e76c7466b62c940150cf1b5000e18f60a5efa2e3 Mon Sep 17 00:00:00 2001
From: Zenix27 <30363000+Zenix27@users.noreply.github.com>
Date: Sat, 11 Jul 2020 12:23:26 +0530
Subject: [PATCH 0204/3533] docs: Change `\*` to `*` in argument lists.

Latest versions of Sphinx (at least 3.1.0) do not need the `*` escaped and
will render the `\` in the output if it is there, so remove it.

Fixes issue #6209.
---
 docs/library/btree.rst             |  2 +-
 docs/library/esp32.rst             |  2 +-
 docs/library/lcd160cr.rst          |  2 +-
 docs/library/machine.ADCWiPy.rst   |  4 ++--
 docs/library/machine.I2C.rst       | 10 +++++-----
 docs/library/machine.Pin.rst       |  6 +++---
 docs/library/machine.RTC.rst       |  4 ++--
 docs/library/machine.SPI.rst       |  2 +-
 docs/library/machine.Signal.rst    |  2 +-
 docs/library/machine.Timer.rst     |  2 +-
 docs/library/machine.TimerWiPy.rst |  6 +++---
 docs/library/machine.UART.rst      |  2 +-
 docs/library/network.CC3K.rst      |  2 +-
 docs/library/network.WLAN.rst      |  2 +-
 docs/library/network.WLANWiPy.rst  |  6 +++---
 docs/library/network.rst           |  4 ++--
 docs/library/pyb.CAN.rst           |  8 ++++----
 docs/library/pyb.DAC.rst           |  6 +++---
 docs/library/pyb.Flash.rst         |  2 +-
 docs/library/pyb.I2C.rst           | 10 +++++-----
 docs/library/pyb.SPI.rst           |  8 ++++----
 docs/library/pyb.Timer.rst         |  2 +-
 docs/library/pyb.UART.rst          |  2 +-
 docs/library/pyb.USB_HID.rst       |  2 +-
 docs/library/pyb.USB_VCP.rst       |  6 +++---
 docs/library/pyb.rst               |  2 +-
 docs/library/uasyncio.rst          |  2 +-
 docs/library/uos.rst               |  2 +-
 28 files changed, 55 insertions(+), 55 deletions(-)

diff --git a/docs/library/btree.rst b/docs/library/btree.rst
index a1f7a5420f15e..de52ef7e7e44e 100644
--- a/docs/library/btree.rst
+++ b/docs/library/btree.rst
@@ -76,7 +76,7 @@ Example::
 Functions
 ---------
 
-.. function:: open(stream, \*, flags=0, pagesize=0, cachesize=0, minkeypage=0)
+.. function:: open(stream, *, flags=0, pagesize=0, cachesize=0, minkeypage=0)
 
    Open a database from a random-access `stream` (like an open file). All
    other parameters are optional and keyword-only, and allow to tweak advanced
diff --git a/docs/library/esp32.rst b/docs/library/esp32.rst
index dfde840a2141a..c6777b8a7da33 100644
--- a/docs/library/esp32.rst
+++ b/docs/library/esp32.rst
@@ -186,7 +186,7 @@ For more details see Espressif's `ESP-IDF RMT documentation.
    *beta feature* and the interface may change in the future.
 
 
-.. class:: RMT(channel, \*, pin=None, clock_div=8, carrier_freq=0, carrier_duty_percent=50)
+.. class:: RMT(channel, *, pin=None, clock_div=8, carrier_freq=0, carrier_duty_percent=50)
 
     This class provides access to one of the eight RMT channels. *channel* is
     required and identifies which RMT channel (0-7) will be configured. *pin*,
diff --git a/docs/library/lcd160cr.rst b/docs/library/lcd160cr.rst
index e31ed94651ca5..85e4b8f07a1f6 100644
--- a/docs/library/lcd160cr.rst
+++ b/docs/library/lcd160cr.rst
@@ -37,7 +37,7 @@ For example::
 Constructors
 ------------
 
-.. class:: LCD160CR(connect=None, \*, pwr=None, i2c=None, spi=None, i2c_addr=98)
+.. class:: LCD160CR(connect=None, *, pwr=None, i2c=None, spi=None, i2c_addr=98)
 
     Construct an LCD160CR object.  The parameters are:
 
diff --git a/docs/library/machine.ADCWiPy.rst b/docs/library/machine.ADCWiPy.rst
index 4a4f0524c8f0b..e500d00890f3a 100644
--- a/docs/library/machine.ADCWiPy.rst
+++ b/docs/library/machine.ADCWiPy.rst
@@ -22,7 +22,7 @@ Usage::
 Constructors
 ------------
 
-.. class:: ADCWiPy(id=0, \*, bits=12)
+.. class:: ADCWiPy(id=0, *, bits=12)
 
    Create an ADC object associated with the given pin.
    This allows you to then read analog values on that pin.
@@ -39,7 +39,7 @@ Constructors
 Methods
 -------
 
-.. method:: ADCWiPy.channel(id, \*, pin)
+.. method:: ADCWiPy.channel(id, *, pin)
 
    Create an analog pin. If only channel ID is given, the correct pin will
    be selected. Alternatively, only the pin can be passed and the correct
diff --git a/docs/library/machine.I2C.rst b/docs/library/machine.I2C.rst
index 2cbfec1ba83bf..743554bc76650 100644
--- a/docs/library/machine.I2C.rst
+++ b/docs/library/machine.I2C.rst
@@ -33,7 +33,7 @@ Example usage::
 Constructors
 ------------
 
-.. class:: I2C(id=-1, \*, scl, sda, freq=400000)
+.. class:: I2C(id=-1, *, scl, sda, freq=400000)
 
    Construct and return a new I2C object using the following parameters:
 
@@ -52,7 +52,7 @@ Constructors
 General Methods
 ---------------
 
-.. method:: I2C.init(scl, sda, \*, freq=400000)
+.. method:: I2C.init(scl, sda, *, freq=400000)
 
   Initialise the I2C bus with the given arguments:
 
@@ -153,14 +153,14 @@ from and written to.  In this case there are two addresses associated with an
 I2C transaction: the slave address and the memory address.  The following
 methods are convenience functions to communicate with such devices.
 
-.. method:: I2C.readfrom_mem(addr, memaddr, nbytes, \*, addrsize=8)
+.. method:: I2C.readfrom_mem(addr, memaddr, nbytes, *, addrsize=8)
 
    Read *nbytes* from the slave specified by *addr* starting from the memory
    address specified by *memaddr*.
    The argument *addrsize* specifies the address size in bits.
    Returns a `bytes` object with the data read.
 
-.. method:: I2C.readfrom_mem_into(addr, memaddr, buf, \*, addrsize=8)
+.. method:: I2C.readfrom_mem_into(addr, memaddr, buf, *, addrsize=8)
 
    Read into *buf* from the slave specified by *addr* starting from the
    memory address specified by *memaddr*.  The number of bytes read is the
@@ -170,7 +170,7 @@ methods are convenience functions to communicate with such devices.
 
    The method returns ``None``.
 
-.. method:: I2C.writeto_mem(addr, memaddr, buf, \*, addrsize=8)
+.. method:: I2C.writeto_mem(addr, memaddr, buf, *, addrsize=8)
 
    Write *buf* to the slave specified by *addr* starting from the
    memory address specified by *memaddr*.
diff --git a/docs/library/machine.Pin.rst b/docs/library/machine.Pin.rst
index 3055491ebbba8..095240fe1499a 100644
--- a/docs/library/machine.Pin.rst
+++ b/docs/library/machine.Pin.rst
@@ -42,7 +42,7 @@ Usage Model::
 Constructors
 ------------
 
-.. class:: Pin(id, mode=-1, pull=-1, \*, value, drive, alt)
+.. class:: Pin(id, mode=-1, pull=-1, *, value, drive, alt)
 
    Access the pin peripheral (GPIO pin) associated with the given ``id``.  If
    additional arguments are given in the constructor then they are used to initialise
@@ -106,7 +106,7 @@ Constructors
 Methods
 -------
 
-.. method:: Pin.init(mode=-1, pull=-1, \*, value, drive, alt)
+.. method:: Pin.init(mode=-1, pull=-1, *, value, drive, alt)
 
    Re-initialise the pin using the given parameters.  Only those arguments that
    are specified will be set.  The rest of the pin peripheral state will remain
@@ -179,7 +179,7 @@ Methods
 
    Availability: WiPy.
 
-.. method:: Pin.irq(handler=None, trigger=(Pin.IRQ_FALLING | Pin.IRQ_RISING), \*, priority=1, wake=None, hard=False)
+.. method:: Pin.irq(handler=None, trigger=(Pin.IRQ_FALLING | Pin.IRQ_RISING), *, priority=1, wake=None, hard=False)
 
    Configure an interrupt handler to be called when the trigger source of the
    pin is active.  If the pin mode is ``Pin.IN`` then the trigger source is
diff --git a/docs/library/machine.RTC.rst b/docs/library/machine.RTC.rst
index 548ad007e0dc3..d5a4f390b512b 100644
--- a/docs/library/machine.RTC.rst
+++ b/docs/library/machine.RTC.rst
@@ -38,7 +38,7 @@ Methods
 
    Resets the RTC to the time of January 1, 2015 and starts running it again.
 
-.. method:: RTC.alarm(id, time, \*, repeat=False)
+.. method:: RTC.alarm(id, time, *, repeat=False)
 
    Set the RTC alarm. Time might be either a millisecond value to program the alarm to
    current time + time_in_ms in the future, or a datetimetuple. If the time passed is in
@@ -52,7 +52,7 @@ Methods
 
    Cancel a running alarm.
 
-.. method:: RTC.irq(\*, trigger, handler=None, wake=machine.IDLE)
+.. method:: RTC.irq(*, trigger, handler=None, wake=machine.IDLE)
 
    Create an irq object triggered by a real time clock alarm.
 
diff --git a/docs/library/machine.SPI.rst b/docs/library/machine.SPI.rst
index a9fcc719c8956..ea460a7b81282 100644
--- a/docs/library/machine.SPI.rst
+++ b/docs/library/machine.SPI.rst
@@ -29,7 +29,7 @@ Constructors
 Methods
 -------
 
-.. method:: SPI.init(baudrate=1000000, \*, polarity=0, phase=0, bits=8, firstbit=SPI.MSB, sck=None, mosi=None, miso=None, pins=(SCK, MOSI, MISO))
+.. method:: SPI.init(baudrate=1000000, *, polarity=0, phase=0, bits=8, firstbit=SPI.MSB, sck=None, mosi=None, miso=None, pins=(SCK, MOSI, MISO))
 
    Initialise the SPI bus with the given parameters:
 
diff --git a/docs/library/machine.Signal.rst b/docs/library/machine.Signal.rst
index a1a29164b2cfd..651c8c8497fd8 100644
--- a/docs/library/machine.Signal.rst
+++ b/docs/library/machine.Signal.rst
@@ -75,7 +75,7 @@ Constructors
 ------------
 
 .. class:: Signal(pin_obj, invert=False)
-           Signal(pin_arguments..., \*, invert=False)
+           Signal(pin_arguments..., *, invert=False)
 
    Create a Signal object. There're two ways to create it:
 
diff --git a/docs/library/machine.Timer.rst b/docs/library/machine.Timer.rst
index b16ad52d597f5..2d1287f325780 100644
--- a/docs/library/machine.Timer.rst
+++ b/docs/library/machine.Timer.rst
@@ -35,7 +35,7 @@ Constructors
 Methods
 -------
 
-.. method:: Timer.init(\*, mode=Timer.PERIODIC, period=-1, callback=None)
+.. method:: Timer.init(*, mode=Timer.PERIODIC, period=-1, callback=None)
 
    Initialise the timer. Example::
 
diff --git a/docs/library/machine.TimerWiPy.rst b/docs/library/machine.TimerWiPy.rst
index 904a958c69b16..f5b748c62e1d5 100644
--- a/docs/library/machine.TimerWiPy.rst
+++ b/docs/library/machine.TimerWiPy.rst
@@ -39,7 +39,7 @@ Constructors
 Methods
 -------
 
-.. method:: TimerWiPy.init(mode, \*, width=16)
+.. method:: TimerWiPy.init(mode, *, width=16)
 
    Initialise the timer. Example::
 
@@ -64,7 +64,7 @@ Methods
 
    Deinitialises the timer. Stops the timer, and disables the timer peripheral.
 
-.. method:: TimerWiPy.channel(channel, \**, freq, period, polarity=TimerWiPy.POSITIVE, duty_cycle=0)
+.. method:: TimerWiPy.channel(channel, **, freq, period, polarity=TimerWiPy.POSITIVE, duty_cycle=0)
 
    If only a channel identifier passed, then a previously initialized channel
    object is returned (or ``None`` if there is no previous channel).
@@ -113,7 +113,7 @@ TimerChannel objects are created using the Timer.channel() method.
 Methods
 -------
 
-.. method:: timerchannel.irq(\*, trigger, priority=1, handler=None)
+.. method:: timerchannel.irq(*, trigger, priority=1, handler=None)
 
     The behavior of this callback is heavily dependent on the operating
     mode of the timer channel:
diff --git a/docs/library/machine.UART.rst b/docs/library/machine.UART.rst
index 70984dfb2fff1..957d58ca18256 100644
--- a/docs/library/machine.UART.rst
+++ b/docs/library/machine.UART.rst
@@ -43,7 +43,7 @@ Constructors
 Methods
 -------
 
-.. method:: UART.init(baudrate=9600, bits=8, parity=None, stop=1, \*, ...)
+.. method:: UART.init(baudrate=9600, bits=8, parity=None, stop=1, *, ...)
 
    Initialise the UART bus with the given parameters:
 
diff --git a/docs/library/network.CC3K.rst b/docs/library/network.CC3K.rst
index 212a1e3bd771f..18210e2d26d59 100644
--- a/docs/library/network.CC3K.rst
+++ b/docs/library/network.CC3K.rst
@@ -51,7 +51,7 @@ Constructors
 Methods
 -------
 
-.. method:: CC3K.connect(ssid, key=None, \*, security=WPA2, bssid=None)
+.. method:: CC3K.connect(ssid, key=None, *, security=WPA2, bssid=None)
 
    Connect to a WiFi access point using the given SSID, and other security
    parameters.
diff --git a/docs/library/network.WLAN.rst b/docs/library/network.WLAN.rst
index 885a4460c56d4..fcdaa41b36345 100644
--- a/docs/library/network.WLAN.rst
+++ b/docs/library/network.WLAN.rst
@@ -32,7 +32,7 @@ Methods
     argument is passed. Otherwise, query current state if no argument is
     provided. Most other methods require active interface.
 
-.. method:: WLAN.connect(ssid=None, password=None, \*, bssid=None)
+.. method:: WLAN.connect(ssid=None, password=None, *, bssid=None)
 
     Connect to the specified wireless network, using the specified password.
     If *bssid* is given then the connection will be restricted to the
diff --git a/docs/library/network.WLANWiPy.rst b/docs/library/network.WLANWiPy.rst
index b6e3279597ac9..2a5ba118454bc 100644
--- a/docs/library/network.WLANWiPy.rst
+++ b/docs/library/network.WLANWiPy.rst
@@ -43,7 +43,7 @@ Constructors
 Methods
 -------
 
-.. method:: WLANWiPy.init(mode, \*, ssid, auth, channel, antenna)
+.. method:: WLANWiPy.init(mode, *, ssid, auth, channel, antenna)
 
    Set or get the WiFi network processor configuration.
 
@@ -69,7 +69,7 @@ Methods
       # configure as an station
       wlan.init(mode=WLAN.STA)
 
-.. method:: WLANWiPy.connect(ssid, \*, auth=None, bssid=None, timeout=None)
+.. method:: WLANWiPy.connect(ssid, *, auth=None, bssid=None, timeout=None)
 
    Connect to a WiFi access point using the given SSID, and other security
    parameters.
@@ -131,7 +131,7 @@ Methods
 
    Get or set a 6-byte long bytes object with the MAC address.
 
-.. method:: WLANWiPy.irq(\*, handler, wake)
+.. method:: WLANWiPy.irq(*, handler, wake)
 
     Create a callback to be triggered when a WLAN event occurs during ``machine.SLEEP``
     mode. Events are triggered by socket activity or by WLAN connection/disconnection.
diff --git a/docs/library/network.rst b/docs/library/network.rst
index 208c58f852e6b..bd3bc6f34ba81 100644
--- a/docs/library/network.rst
+++ b/docs/library/network.rst
@@ -58,7 +58,7 @@ parameter should be `id`.
         interface (behavior of calling them on inactive interface is
         undefined).
 
-.. method:: AbstractNIC.connect([service_id, key=None, \*, ...])
+.. method:: AbstractNIC.connect([service_id, key=None, *, ...])
 
        Connect the interface to a network. This method is optional, and
        available only for interfaces which are not "always connected".
@@ -82,7 +82,7 @@ parameter should be `id`.
 
        Returns ``True`` if connected to network, otherwise returns ``False``.
 
-.. method:: AbstractNIC.scan(\*, ...)
+.. method:: AbstractNIC.scan(*, ...)
 
        Scan for the available network services/connections. Returns a
        list of tuples with discovered service parameters. For various
diff --git a/docs/library/pyb.CAN.rst b/docs/library/pyb.CAN.rst
index ba935abfd5c4e..8078e29e0cc8d 100644
--- a/docs/library/pyb.CAN.rst
+++ b/docs/library/pyb.CAN.rst
@@ -49,7 +49,7 @@ Class Methods
 Methods
 -------
 
-.. method:: CAN.init(mode, extframe=False, prescaler=100, \*, sjw=1, bs1=6, bs2=8, auto_restart=False)
+.. method:: CAN.init(mode, extframe=False, prescaler=100, *, sjw=1, bs1=6, bs2=8, auto_restart=False)
 
    Initialise the CAN bus with the given parameters:
 
@@ -135,7 +135,7 @@ Methods
    - number of pending RX messages on fifo 0
    - number of pending RX messages on fifo 1
 
-.. method:: CAN.setfilter(bank, mode, fifo, params, \*, rtr)
+.. method:: CAN.setfilter(bank, mode, fifo, params, *, rtr)
 
    Configure a filter bank:
 
@@ -187,7 +187,7 @@ Methods
 
    Return ``True`` if any message waiting on the FIFO, else ``False``.
 
-.. method:: CAN.recv(fifo, list=None, \*, timeout=5000)
+.. method:: CAN.recv(fifo, list=None, *, timeout=5000)
 
    Receive data on the bus:
 
@@ -220,7 +220,7 @@ Methods
         # No heap memory is allocated in the following call
         can.recv(0, lst)
 
-.. method:: CAN.send(data, id, \*, timeout=0, rtr=False)
+.. method:: CAN.send(data, id, *, timeout=0, rtr=False)
 
    Send a message on the bus:
 
diff --git a/docs/library/pyb.DAC.rst b/docs/library/pyb.DAC.rst
index 9a465b9ce25d8..bf07119ada166 100644
--- a/docs/library/pyb.DAC.rst
+++ b/docs/library/pyb.DAC.rst
@@ -49,7 +49,7 @@ To output a continuous sine-wave at 12-bit resolution::
 Constructors
 ------------
 
-.. class:: pyb.DAC(port, bits=8, \*, buffering=None)
+.. class:: pyb.DAC(port, bits=8, *, buffering=None)
 
    Construct a new DAC object.
 
@@ -76,7 +76,7 @@ Constructors
 Methods
 -------
 
-.. method:: DAC.init(bits=8, \*, buffering=None)
+.. method:: DAC.init(bits=8, *, buffering=None)
 
    Reinitialise the DAC.  *bits* can be 8 or 12.  *buffering* can be
    ``None``, ``False`` or ``True``; see above constructor for the meaning
@@ -103,7 +103,7 @@ Methods
    value is 2\*\*``bits``-1, where ``bits`` is set when creating the DAC
    object or by using the ``init`` method.
 
-.. method:: DAC.write_timed(data, freq, \*, mode=DAC.NORMAL)
+.. method:: DAC.write_timed(data, freq, *, mode=DAC.NORMAL)
 
    Initiates a burst of RAM to DAC using a DMA transfer.
    The input data is treated as an array of bytes in 8-bit mode, and
diff --git a/docs/library/pyb.Flash.rst b/docs/library/pyb.Flash.rst
index 13f2097871913..4b0c2ce2aaa2f 100644
--- a/docs/library/pyb.Flash.rst
+++ b/docs/library/pyb.Flash.rst
@@ -25,7 +25,7 @@ Constructors
 
    This constructor is deprecated and will be removed in a future version of MicroPython.
 
-.. class:: pyb.Flash(\*, start=-1, len=-1)
+.. class:: pyb.Flash(*, start=-1, len=-1)
    :noindex:
 
    Create and return a block device that accesses the flash at the specified offset. The length defaults to the remaining size of the device.
diff --git a/docs/library/pyb.I2C.rst b/docs/library/pyb.I2C.rst
index d549c1a81207d..641dcb8815873 100644
--- a/docs/library/pyb.I2C.rst
+++ b/docs/library/pyb.I2C.rst
@@ -84,7 +84,7 @@ Methods
 
    Turn off the I2C bus.
 
-.. method:: I2C.init(mode, \*, addr=0x12, baudrate=400000, gencall=False, dma=False)
+.. method:: I2C.init(mode, *, addr=0x12, baudrate=400000, gencall=False, dma=False)
 
   Initialise the I2C bus with the given parameters:
 
@@ -100,7 +100,7 @@ Methods
 
    Check if an I2C device responds to the given address.  Only valid when in master mode.
 
-.. method:: I2C.mem_read(data, addr, memaddr, \*, timeout=5000, addr_size=8)
+.. method:: I2C.mem_read(data, addr, memaddr, *, timeout=5000, addr_size=8)
 
    Read from the memory of an I2C device:
 
@@ -113,7 +113,7 @@ Methods
    Returns the read data.
    This is only valid in master mode.
 
-.. method:: I2C.mem_write(data, addr, memaddr, \*, timeout=5000, addr_size=8)
+.. method:: I2C.mem_write(data, addr, memaddr, *, timeout=5000, addr_size=8)
 
    Write to the memory of an I2C device:
 
@@ -126,7 +126,7 @@ Methods
    Returns ``None``.
    This is only valid in master mode.
 
-.. method:: I2C.recv(recv, addr=0x00, \*, timeout=5000)
+.. method:: I2C.recv(recv, addr=0x00, *, timeout=5000)
 
    Receive data on the bus:
 
@@ -138,7 +138,7 @@ Methods
    Return value: if ``recv`` is an integer then a new buffer of the bytes received,
    otherwise the same buffer that was passed in to ``recv``.
 
-.. method:: I2C.send(send, addr=0x00, \*, timeout=5000)
+.. method:: I2C.send(send, addr=0x00, *, timeout=5000)
 
    Send data on the bus:
 
diff --git a/docs/library/pyb.SPI.rst b/docs/library/pyb.SPI.rst
index 181bdd3b6ec5d..24e2ec5a73d2c 100644
--- a/docs/library/pyb.SPI.rst
+++ b/docs/library/pyb.SPI.rst
@@ -51,7 +51,7 @@ Methods
 
    Turn off the SPI bus.
 
-.. method:: SPI.init(mode, baudrate=328125, \*, prescaler, polarity=1, phase=0, bits=8, firstbit=SPI.MSB, ti=False, crc=None)
+.. method:: SPI.init(mode, baudrate=328125, *, prescaler, polarity=1, phase=0, bits=8, firstbit=SPI.MSB, ti=False, crc=None)
 
    Initialise the SPI bus with the given parameters:
 
@@ -77,7 +77,7 @@ Methods
    Printing the SPI object will show you the computed baudrate and the chosen
    prescaler.
 
-.. method:: SPI.recv(recv, \*, timeout=5000)
+.. method:: SPI.recv(recv, *, timeout=5000)
 
    Receive data on the bus:
 
@@ -88,7 +88,7 @@ Methods
    Return value: if ``recv`` is an integer then a new buffer of the bytes received,
    otherwise the same buffer that was passed in to ``recv``.
 
-.. method:: SPI.send(send, \*, timeout=5000)
+.. method:: SPI.send(send, *, timeout=5000)
 
    Send data on the bus:
 
@@ -97,7 +97,7 @@ Methods
 
    Return value: ``None``.
 
-.. method:: SPI.send_recv(send, recv=None, \*, timeout=5000)
+.. method:: SPI.send_recv(send, recv=None, *, timeout=5000)
 
    Send and receive data on the bus at the same time:
 
diff --git a/docs/library/pyb.Timer.rst b/docs/library/pyb.Timer.rst
index 532b64da8e93c..34fe71155fc15 100644
--- a/docs/library/pyb.Timer.rst
+++ b/docs/library/pyb.Timer.rst
@@ -62,7 +62,7 @@ Constructors
 Methods
 -------
 
-.. method:: Timer.init(\*, freq, prescaler, period, mode=Timer.UP, div=1, callback=None, deadtime=0)
+.. method:: Timer.init(*, freq, prescaler, period, mode=Timer.UP, div=1, callback=None, deadtime=0)
 
    Initialise the timer.  Initialisation must be either by frequency (in Hz)
    or by prescaler and period::
diff --git a/docs/library/pyb.UART.rst b/docs/library/pyb.UART.rst
index 0a611a72566da..a1d6e59002551 100644
--- a/docs/library/pyb.UART.rst
+++ b/docs/library/pyb.UART.rst
@@ -84,7 +84,7 @@ Constructors
 Methods
 -------
 
-.. method:: UART.init(baudrate, bits=8, parity=None, stop=1, \*, timeout=0, flow=0, timeout_char=0, read_buf_len=64)
+.. method:: UART.init(baudrate, bits=8, parity=None, stop=1, *, timeout=0, flow=0, timeout_char=0, read_buf_len=64)
 
    Initialise the UART bus with the given parameters:
 
diff --git a/docs/library/pyb.USB_HID.rst b/docs/library/pyb.USB_HID.rst
index 649dc3df4a605..7e23d1313d0da 100644
--- a/docs/library/pyb.USB_HID.rst
+++ b/docs/library/pyb.USB_HID.rst
@@ -21,7 +21,7 @@ Constructors
 Methods
 -------
 
-.. method:: USB_HID.recv(data, \*, timeout=5000)
+.. method:: USB_HID.recv(data, *, timeout=5000)
 
    Receive data on the bus:
 
diff --git a/docs/library/pyb.USB_VCP.rst b/docs/library/pyb.USB_VCP.rst
index b16924cf60b2e..bbcbc0701b3b4 100644
--- a/docs/library/pyb.USB_VCP.rst
+++ b/docs/library/pyb.USB_VCP.rst
@@ -21,7 +21,7 @@ Constructors
 Methods
 -------
 
-.. method:: USB_VCP.init(\*, flow=-1)
+.. method:: USB_VCP.init(*, flow=-1)
 
    Configure the USB VCP port.  If the *flow* argument is not -1 then the value sets
    the flow control, which can be a bitwise-or of ``USB_VCP.RTS`` and ``USB_VCP.CTS``.
@@ -89,7 +89,7 @@ Methods
 
    Returns the number of bytes written.
 
-.. method:: USB_VCP.recv(data, \*, timeout=5000)
+.. method:: USB_VCP.recv(data, *, timeout=5000)
 
    Receive data on the bus:
 
@@ -100,7 +100,7 @@ Methods
    Return value: if ``data`` is an integer then a new buffer of the bytes received,
    otherwise the number of bytes read into ``data`` is returned.
 
-.. method:: USB_VCP.send(data, \*, timeout=5000)
+.. method:: USB_VCP.send(data, *, timeout=5000)
 
    Send data over the USB VCP:
 
diff --git a/docs/library/pyb.rst b/docs/library/pyb.rst
index 34103195ddd1c..addcd20a91aeb 100644
--- a/docs/library/pyb.rst
+++ b/docs/library/pyb.rst
@@ -210,7 +210,7 @@ Miscellaneous functions
 
    It only makes sense to call this function from within boot.py.
 
-.. function:: mount(device, mountpoint, \*, readonly=False, mkfs=False)
+.. function:: mount(device, mountpoint, *, readonly=False, mkfs=False)
 
    .. note:: This function is deprecated. Mounting and unmounting devices should
       be performed by :meth:`uos.mount` and :meth:`uos.umount` instead.
diff --git a/docs/library/uasyncio.rst b/docs/library/uasyncio.rst
index 31b38a4e05f2f..a81e532d7fd25 100644
--- a/docs/library/uasyncio.rst
+++ b/docs/library/uasyncio.rst
@@ -80,7 +80,7 @@ Additional functions
 
     This is a coroutine, and a MicroPython extension.
 
-.. function:: gather(\*awaitables, return_exceptions=False)
+.. function:: gather(*awaitables, return_exceptions=False)
 
     Run all *awaitables* concurrently.  Any *awaitables* that are not tasks are
     promoted to tasks.
diff --git a/docs/library/uos.rst b/docs/library/uos.rst
index ad10d9129713d..051247b717419 100644
--- a/docs/library/uos.rst
+++ b/docs/library/uos.rst
@@ -144,7 +144,7 @@ programs.  Ports that have this functionality provide the :func:`mount` and
 :func:`umount` functions, and possibly various filesystem implementations
 represented by VFS classes.
 
-.. function:: mount(fsobj, mount_point, \*, readonly)
+.. function:: mount(fsobj, mount_point, *, readonly)
 
     Mount the filesystem object *fsobj* at the location in the VFS given by the
     *mount_point* string.  *fsobj* can be a a VFS object that has a ``mount()``

From 8727c4e2eca9026494c173061c5905d54fa5f73d Mon Sep 17 00:00:00 2001
From: Dave Hylands <davehylands@fullstory.com>
Date: Tue, 11 Aug 2020 12:44:51 -0700
Subject: [PATCH 0205/3533] stm32/pin_defs_stm32: Fix pin printing to show IN
 mode correctly.

Prior to this commit, if you configure a pin as an output type (I2C in this
example) and then later configure it back as an input, then it will report
the type incorrectly.  Example:

    >>> import machine
    >>> b6 = machine.Pin('B6')
    >>> b6
    Pin(Pin.cpu.B6, mode=Pin.IN)
    >>> machine.I2C(1)
    I2C(1, scl=B6, sda=B7, freq=420000)
    >>> b6
    Pin(Pin.cpu.B6, mode=Pin.ALT_OPEN_DRAIN, pull=Pin.PULL_UP, af=Pin.AF4_I2C1)
    >>> b6.init(machine.Pin.IN)
    >>> b6
    Pin(Pin.cpu.B6, mode=Pin.ALT_OPEN_DRAIN, af=Pin.AF4_I2C1)

With this commit the last print now works:

    >>> b6
    Pin(Pin.cpu.B6, mode=Pin.IN)
---
 ports/stm32/pin_defs_stm32.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/stm32/pin_defs_stm32.c b/ports/stm32/pin_defs_stm32.c
index 0aef5f95fa294..a3f9d039d6320 100644
--- a/ports/stm32/pin_defs_stm32.c
+++ b/ports/stm32/pin_defs_stm32.c
@@ -8,9 +8,9 @@
 uint32_t pin_get_mode(const pin_obj_t *pin) {
     GPIO_TypeDef *gpio = pin->gpio;
     uint32_t mode = (gpio->MODER >> (pin->pin * 2)) & 3;
-    if (mode != GPIO_MODE_ANALOG) {
+    if (mode == GPIO_MODE_OUTPUT_PP || mode == GPIO_MODE_AF_PP) {
         if (gpio->OTYPER & pin->pin_mask) {
-            mode |= 1 << 4;
+            mode |= 1 << 4;     // Converts from xxx_PP to xxx_OD
         }
     }
     return mode;

From 60cf2c0959ed2668c01df664a2e7c3cd1f5c6d89 Mon Sep 17 00:00:00 2001
From: Michael Buesch <m@bues.ch>
Date: Wed, 12 Aug 2020 21:30:33 +0200
Subject: [PATCH 0206/3533] tools/pyboard.py: Replace eval() of received data
 with alternative.

Prior to this commit, pyboard.py used eval() to "parse" file data received
from the board.  Using eval() on received data from a device is dangerous,
because a malicious device may inject arbitrary code execution on the PC
that is doing the operation.

Consider the following scenario:

Eve may write a malicious script to Bob's board in his absence.  On return
Bob notices that something is wrong with the board, because it doesn't work
as expected anymore.  He wants to read out boot.py (or any other file) to
see what is wrong.  What he gets is a remote code execution on his PC.

Proof of concept:

Eve:

  $ cat boot.py
  _print = print
  print = lambda *x, **y: _print("os.system('ls /; echo Pwned!')", end="\r\n\x04")
  $ ./pyboard.py -f cp boot.py :
  cp boot.py :boot.py

Bob:

  $ ./pyboard.py -f cp :boot.py /tmp/foo
  cp :boot.py /tmp/foo
  bin   chroot  dev  home  lib32  media  opt   root  sbin  sys  usr
  boot  config  etc  lib   lib64  mnt    proc  run   srv   tmp  var
  Pwned!

There's also the possibility that the device is malfunctioning and sends
random and possibly dangerous data back to the PC, to be eval'd.

Fix this problem by using ast.literal_eval() to parse the received bytes,
instead of eval().

Signed-off-by: Michael Buesch <m@bues.ch>
---
 tools/pyboard.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/tools/pyboard.py b/tools/pyboard.py
index 6376b13c7e333..c97ddbe487be3 100755
--- a/tools/pyboard.py
+++ b/tools/pyboard.py
@@ -70,6 +70,7 @@
 import sys
 import time
 import os
+import ast
 
 try:
     stdout = sys.stdout.buffer
@@ -426,7 +427,12 @@ def fs_get(self, src, dest, chunk_size=256):
                 data = bytearray()
                 self.exec_("print(r(%u))" % chunk_size, data_consumer=lambda d: data.extend(d))
                 assert data.endswith(b"\r\n\x04")
-                data = eval(str(data[:-3], "ascii"))
+                try:
+                    data = ast.literal_eval(str(data[:-3], "ascii"))
+                    if not isinstance(data, bytes):
+                        raise ValueError("Not bytes")
+                except (UnicodeError, ValueError) as e:
+                    raise PyboardError("fs_get: Could not interpret received data: %s" % str(e))
                 if not data:
                     break
                 f.write(data)

From 492cf34fd860330f44a74732d89e9db8bc02a4e8 Mon Sep 17 00:00:00 2001
From: Martin Milata <martin@martinmilata.cz>
Date: Thu, 13 Aug 2020 15:20:08 +0200
Subject: [PATCH 0207/3533] tools/mpy-tool.py: Fix offset of line number info.

Signed-off-by: Martin Milata <martin@martinmilata.cz>
---
 tools/mpy-tool.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/tools/mpy-tool.py b/tools/mpy-tool.py
index 43d35503eb564..1ac6c93d7d8b2 100755
--- a/tools/mpy-tool.py
+++ b/tools/mpy-tool.py
@@ -253,6 +253,7 @@ def __init__(self, code_kind, bytecode, prelude_offset, qstrs, objs, raw_codes):
             self.ip, self.ip2, self.prelude = extract_prelude(self.bytecode, self.prelude_offset)
             self.simple_name = self._unpack_qstr(self.ip2)
             self.source_file = self._unpack_qstr(self.ip2 + 2)
+            self.line_info_offset = self.ip2 + 4
 
     def _unpack_qstr(self, ip):
         qst = self.bytecode[ip] | self.bytecode[ip + 1] << 8
@@ -404,7 +405,10 @@ def freeze_module(self, qstr_links=(), type_sig=0):
             print("        .n_def_pos_args = %u," % self.prelude[5])
             print("        .qstr_block_name = %s," % self.simple_name.qstr_id)
             print("        .qstr_source_file = %s," % self.source_file.qstr_id)
-            print("        .line_info = fun_data_%s + %u," % (self.escaped_name, 0))  # TODO
+            print(
+                "        .line_info = fun_data_%s + %u,"
+                % (self.escaped_name, self.line_info_offset)
+            )
             print("        .opcodes = fun_data_%s + %u," % (self.escaped_name, self.ip))
             print("    },")
             print("    .line_of_definition = %u," % 0)  # TODO

From 448319a7450714efd72ae527e184a247a82ee39d Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sat, 22 Aug 2020 01:07:57 +1000
Subject: [PATCH 0208/3533] tools/makemanifest.py: Use os.makedirs to make path
 for generated files.

The existing implementation of mkdir() in this file is not sophisticated
enough to work correctly on all operating systems (eg Mac can raise
EISDIR).  Using the standard os.makedirs() function handles all cases
correctly.

Signed-off-by: Damien George <damien@micropython.org>
---
 tools/makemanifest.py | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/tools/makemanifest.py b/tools/makemanifest.py
index b7d4a4d4a68af..377f245596fe9 100644
--- a/tools/makemanifest.py
+++ b/tools/makemanifest.py
@@ -25,7 +25,6 @@
 # THE SOFTWARE.
 
 from __future__ import print_function
-import errno
 import sys
 import os
 import subprocess
@@ -165,17 +164,10 @@ def get_timestamp_newest(path):
     return ts_newest
 
 
-def mkdir(path):
-    cur_path = ""
-    for p in path.split("/")[:-1]:
-        cur_path += p + "/"
-        try:
-            os.mkdir(cur_path)
-        except OSError as er:
-            if er.args[0] == errno.EEXIST:
-                pass
-            else:
-                raise er
+def mkdir(filename):
+    path = os.path.dirname(filename)
+    if not os.path.isdir(path):
+        os.makedirs(path)
 
 
 def freeze_internal(kind, path, script, opt):

From 5f9b105244bb9f605f3ca157cd421967c665bd6e Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 21 Aug 2020 10:30:09 +1000
Subject: [PATCH 0209/3533] py/runtime: Fix builtin compile() in "single" mode
 so it prints exprs.

As per CPython behaviour, compile(stmt, "file", "single") should create
code which prints to stdout (via __repl_print__) the results of any
expressions in stmt.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/runtime.c                    |  2 +-
 tests/basics/builtin_compile.py | 22 +++++++++-------------
 2 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/py/runtime.c b/py/runtime.c
index 38da2f4538e97..c12271f4e2cf5 100644
--- a/py/runtime.c
+++ b/py/runtime.c
@@ -1473,7 +1473,7 @@ mp_obj_t mp_parse_compile_execute(mp_lexer_t *lex, mp_parse_input_kind_t parse_i
     if (nlr_push(&nlr) == 0) {
         qstr source_name = lex->source_name;
         mp_parse_tree_t parse_tree = mp_parse(lex, parse_input_kind);
-        mp_obj_t module_fun = mp_compile(&parse_tree, source_name, false);
+        mp_obj_t module_fun = mp_compile(&parse_tree, source_name, parse_input_kind == MP_PARSE_SINGLE_INPUT);
 
         mp_obj_t ret;
         if (MICROPY_PY_BUILTINS_COMPILE && globals == NULL) {
diff --git a/tests/basics/builtin_compile.py b/tests/basics/builtin_compile.py
index bf272aca15d43..a2f2cbe550131 100644
--- a/tests/basics/builtin_compile.py
+++ b/tests/basics/builtin_compile.py
@@ -1,11 +1,10 @@
 # test compile builtin
 
-def have_compile():
-    try:
-        compile
-        return True
-    except NameError:
-        return False
+try:
+    compile
+except NameError:
+    print("SKIP")
+    raise SystemExit
 
 def test():
     global x
@@ -26,8 +25,9 @@ def test():
     exec(c, {}, {"x":3})
 
     # single/eval mode
-    exec(compile('print(1 + 1)', 'file', 'single'))
-    print(eval(compile('1 + 1', 'file', 'eval')))
+    exec(compile("if 1: 10 + 1\n", "file", "single"))
+    exec(compile("print(10 + 2)", "file", "single"))
+    print(eval(compile("10 + 3", "file", "eval")))
 
     # bad mode
     try:
@@ -42,8 +42,4 @@ def test():
         print("NameError")
     print(x) # check 'x' still exists as a global
 
-if have_compile():
-    test()
-else:
-    print("SKIP")
-    raise SystemExit
+test()

From 20948a3d54ff560a3d029b8bfc9761dcbbad9312 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 20 Aug 2020 23:11:44 +1000
Subject: [PATCH 0210/3533] tests/extmod: Add test for uasyncio.sleep of a
 negative time.

It should take 0 time to await on a negative sleep.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/extmod/uasyncio_basic.py     | 12 ++++++++++--
 tests/extmod/uasyncio_basic.py.exp |  3 ++-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/tests/extmod/uasyncio_basic.py b/tests/extmod/uasyncio_basic.py
index f6685fa674676..c88908d99b320 100644
--- a/tests/extmod/uasyncio_basic.py
+++ b/tests/extmod/uasyncio_basic.py
@@ -36,8 +36,16 @@ async def main():
     t1 = ticks()
     await delay_print(0.04, "long")
     t2 = ticks()
-
-    print("took {} {}".format(round(ticks_diff(t1, t0), -1), round(ticks_diff(t2, t1), -1)))
+    await delay_print(-1, "negative")
+    t3 = ticks()
+
+    print(
+        "took {} {} {}".format(
+            round(ticks_diff(t1, t0), -1),
+            round(ticks_diff(t2, t1), -1),
+            round(ticks_diff(t3, t2), -1),
+        )
+    )
 
 
 asyncio.run(main())
diff --git a/tests/extmod/uasyncio_basic.py.exp b/tests/extmod/uasyncio_basic.py.exp
index 447d05d5e0984..6673978769fbf 100644
--- a/tests/extmod/uasyncio_basic.py.exp
+++ b/tests/extmod/uasyncio_basic.py.exp
@@ -2,4 +2,5 @@ start
 after sleep
 short
 long
-took 20 40
+negative
+took 20 40 0

From 55c76eaac12af4e93f8de11bb25c835e8b65c623 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 20 Aug 2020 23:13:25 +1000
Subject: [PATCH 0211/3533] extmod/uasyncio: Truncate negative sleeps to 0.

Otherwise a task that continuously awaits on a large negative sleep can
monopolise the scheduler (because its wake time is always less than
everything else in the pairing heap).

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/uasyncio/core.py           | 2 +-
 tests/extmod/uasyncio_fair.py     | 1 +
 tests/extmod/uasyncio_fair.py.exp | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/extmod/uasyncio/core.py b/extmod/uasyncio/core.py
index 689487d36a6fd..045b4cd139182 100644
--- a/extmod/uasyncio/core.py
+++ b/extmod/uasyncio/core.py
@@ -53,7 +53,7 @@ def __next__(self):
 # Use a SingletonGenerator to do it without allocating on the heap
 def sleep_ms(t, sgen=SingletonGenerator()):
     assert sgen.state is None
-    sgen.state = ticks_add(ticks(), t)
+    sgen.state = ticks_add(ticks(), max(0, t))
     return sgen
 
 
diff --git a/tests/extmod/uasyncio_fair.py b/tests/extmod/uasyncio_fair.py
index 9b04454bc1f50..e0ee811a9b046 100644
--- a/tests/extmod/uasyncio_fair.py
+++ b/tests/extmod/uasyncio_fair.py
@@ -22,6 +22,7 @@ async def main():
     t1 = asyncio.create_task(task(1, -0.01))
     t2 = asyncio.create_task(task(2, 0.1))
     t3 = asyncio.create_task(task(3, 0.2))
+    t3 = asyncio.create_task(task(4, -100))
     await asyncio.sleep(0.5)
     t1.cancel()
     t2.cancel()
diff --git a/tests/extmod/uasyncio_fair.py.exp b/tests/extmod/uasyncio_fair.py.exp
index 4428943f46287..b4b6481db019f 100644
--- a/tests/extmod/uasyncio_fair.py.exp
+++ b/tests/extmod/uasyncio_fair.py.exp
@@ -3,6 +3,7 @@ task start 2
 task work 2
 task start 3
 task work 3
+task start 4
 task work 2
 task work 3
 task work 2

From 92899354d96a5b5463f3002b2476a73c11ebe626 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 29 Jul 2020 01:01:31 +1000
Subject: [PATCH 0212/3533] unix/fatfs_port: Implement get_fattime.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/unix/fatfs_port.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/ports/unix/fatfs_port.c b/ports/unix/fatfs_port.c
index 30f1959f52063..4ec5b919ab54b 100644
--- a/ports/unix/fatfs_port.c
+++ b/ports/unix/fatfs_port.c
@@ -1,5 +1,13 @@
+#include <time.h>
 #include "lib/oofatfs/ff.h"
 
 DWORD get_fattime(void) {
-    return 0;
+    time_t now = time(NULL);
+    struct tm *tm = localtime(&now);
+    return ((1900 + tm->tm_year - 1980) << 25)
+           | (tm->tm_mon << 21)
+           | (tm->tm_mday << 16)
+           | (tm->tm_hour << 11)
+           | (tm->tm_min << 5)
+           | (tm->tm_sec / 2);
 }

From badd351150df70bea6644db98f48fbc3a1e5ffea Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sun, 2 Aug 2020 00:32:38 +1000
Subject: [PATCH 0213/3533] lib/timeutils: Add helper functions to deal with
 nanosecs since 1970.

Signed-off-by: Damien George <damien@micropython.org>
---
 lib/timeutils/timeutils.h | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/lib/timeutils/timeutils.h b/lib/timeutils/timeutils.h
index cb7a72123a119..08b0dc2e8559a 100644
--- a/lib/timeutils/timeutils.h
+++ b/lib/timeutils/timeutils.h
@@ -27,6 +27,10 @@
 #ifndef MICROPY_INCLUDED_LIB_TIMEUTILS_TIMEUTILS_H
 #define MICROPY_INCLUDED_LIB_TIMEUTILS_TIMEUTILS_H
 
+// The number of seconds between 1970/1/1 and 2000/1/1 is calculated using:
+// time.mktime((2000,1,1,0,0,0,0,0,0)) - time.mktime((1970,1,1,0,0,0,0,0,0))
+#define TIMEUTILS_SECONDS_1970_TO_2000 (946684800ULL)
+
 typedef struct _timeutils_struct_time_t {
     uint16_t tm_year;       // i.e. 2014
     uint8_t tm_mon;         // 1..12
@@ -38,6 +42,14 @@ typedef struct _timeutils_struct_time_t {
     uint16_t tm_yday;       // 1..366
 } timeutils_struct_time_t;
 
+static inline uint64_t timeutils_seconds_since_2000_to_nanoseconds_since_1970(mp_uint_t s) {
+    return ((uint64_t)s + TIMEUTILS_SECONDS_1970_TO_2000) * 1000000000ULL;
+}
+
+static inline mp_uint_t timeutils_seconds_since_2000_from_nanoseconds_since_1970(uint64_t ns) {
+    return ns / 1000000000ULL - TIMEUTILS_SECONDS_1970_TO_2000;
+}
+
 bool timeutils_is_leap_year(mp_uint_t year);
 mp_uint_t timeutils_days_in_month(mp_uint_t year, mp_uint_t month);
 mp_uint_t timeutils_year_day(mp_uint_t year, mp_uint_t month, mp_uint_t date);
@@ -51,4 +63,10 @@ mp_uint_t timeutils_seconds_since_2000(mp_uint_t year, mp_uint_t month,
 mp_uint_t timeutils_mktime(mp_uint_t year, mp_int_t month, mp_int_t mday,
     mp_int_t hours, mp_int_t minutes, mp_int_t seconds);
 
+static inline uint64_t timeutils_nanoseconds_since_1970(mp_uint_t year, mp_uint_t month,
+    mp_uint_t date, mp_uint_t hour, mp_uint_t minute, mp_uint_t second) {
+    return timeutils_seconds_since_2000_to_nanoseconds_since_1970(
+        timeutils_seconds_since_2000(year, month, date, hour, minute, second));
+}
+
 #endif // MICROPY_INCLUDED_LIB_TIMEUTILS_TIMEUTILS_H

From ee50a6effebf315c38d4a129dc9f65ee722eb5b6 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sat, 1 Aug 2020 23:50:23 +1000
Subject: [PATCH 0214/3533] py/mphal.h: Introduce mp_hal_time_ns and implement
 on various ports.

This should return a 64-bit value being the number of nanoseconds since
1970/1/1.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/mphalport.c   |  7 +++++++
 ports/esp8266/esp_mphal.c |  4 ++++
 ports/stm32/rtc.c         | 18 ++++++++++++++++++
 ports/unix/unix_mphal.c   |  5 +++++
 ports/zephyr/mphalport.h  |  5 +++++
 py/mphal.h                |  6 ++++++
 6 files changed, 45 insertions(+)

diff --git a/ports/esp32/mphalport.c b/ports/esp32/mphalport.c
index 99548ad627be5..5e526df6673cb 100644
--- a/ports/esp32/mphalport.c
+++ b/ports/esp32/mphalport.c
@@ -28,6 +28,7 @@
 
 #include <stdio.h>
 #include <string.h>
+#include <sys/time.h>
 
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"
@@ -195,6 +196,12 @@ void mp_hal_delay_us(uint32_t us) {
     }
 }
 
+uint64_t mp_hal_time_ns(void) {
+    struct timeval tv;
+    gettimeofday(&tv, NULL);
+    return (uint64_t)tv.tv_sec * 1000000000ULL + (uint64_t)tv.tv_usec * 1000ULL;
+}
+
 // Wake up the main task if it is sleeping
 void mp_hal_wake_main_task_from_isr(void) {
     BaseType_t xHigherPriorityTaskWoken = pdFALSE;
diff --git a/ports/esp8266/esp_mphal.c b/ports/esp8266/esp_mphal.c
index c467ab72db7ec..9e1b72e438ad7 100644
--- a/ports/esp8266/esp_mphal.c
+++ b/ports/esp8266/esp_mphal.c
@@ -138,6 +138,10 @@ void MP_FASTCODE(mp_hal_delay_ms)(uint32_t delay) {
     mp_hal_delay_us(delay * 1000);
 }
 
+uint64_t mp_hal_time_ns(void) {
+    return pyb_rtc_get_us_since_2000() * 1000ULL;
+}
+
 void ets_event_poll(void) {
     ets_loop_iter();
     mp_handle_pending(true);
diff --git a/ports/stm32/rtc.c b/ports/stm32/rtc.c
index de26352004771..4f759c4bc74f0 100644
--- a/ports/stm32/rtc.c
+++ b/ports/stm32/rtc.c
@@ -27,6 +27,7 @@
 #include <stdio.h>
 
 #include "py/runtime.h"
+#include "lib/timeutils/timeutils.h"
 #include "extint.h"
 #include "rtc.h"
 #include "irq.h"
@@ -442,6 +443,23 @@ STATIC void RTC_CalendarConfig(void) {
     }
 }
 
+uint64_t mp_hal_time_ns(void) {
+    uint64_t ns = 0;
+    #if MICROPY_HW_ENABLE_RTC
+    // Get current according to the RTC.
+    rtc_init_finalise();
+    RTC_TimeTypeDef time;
+    RTC_DateTypeDef date;
+    HAL_RTC_GetTime(&RTCHandle, &time, RTC_FORMAT_BIN);
+    HAL_RTC_GetDate(&RTCHandle, &date, RTC_FORMAT_BIN);
+    ns = timeutils_nanoseconds_since_1970(
+        2000 + date.Year, date.Month, date.Date, time.Hours, time.Minutes, time.Seconds);
+    uint32_t usec = ((RTC_SYNCH_PREDIV - time.SubSeconds) * (1000000 / 64)) / ((RTC_SYNCH_PREDIV + 1) / 64);
+    ns += usec * 1000;
+    #endif
+    return ns;
+}
+
 /******************************************************************************/
 // MicroPython bindings
 
diff --git a/ports/unix/unix_mphal.c b/ports/unix/unix_mphal.c
index 42c22f7b50482..f43067f646ba9 100644
--- a/ports/unix/unix_mphal.c
+++ b/ports/unix/unix_mphal.c
@@ -214,3 +214,8 @@ mp_uint_t mp_hal_ticks_us(void) {
     return tv.tv_sec * 1000000 + tv.tv_usec;
     #endif
 }
+
+uint64_t mp_hal_time_ns(void) {
+    time_t now = time(NULL);
+    return (uint64_t)now * 1000000000ULL;
+}
diff --git a/ports/zephyr/mphalport.h b/ports/zephyr/mphalport.h
index 8434a388b0a5e..9ef213ddb0809 100644
--- a/ports/zephyr/mphalport.h
+++ b/ports/zephyr/mphalport.h
@@ -24,6 +24,11 @@ static inline void mp_hal_delay_ms(mp_uint_t delay) {
     k_msleep(delay);
 }
 
+static inline uint64_t mp_hal_time_ns(void) {
+    // Not currently implemented.
+    return 0;
+}
+
 #define mp_hal_delay_us_fast(us)   (mp_hal_delay_us(us))
 #define mp_hal_pin_od_low(p)       (mp_raise_NotImplementedError("mp_hal_pin_od_low"))
 #define mp_hal_pin_od_high(p)      (mp_raise_NotImplementedError("mp_hal_pin_od_high"))
diff --git a/py/mphal.h b/py/mphal.h
index 66d80705a60ee..6d11f6ddc0836 100644
--- a/py/mphal.h
+++ b/py/mphal.h
@@ -26,6 +26,7 @@
 #ifndef MICROPY_INCLUDED_PY_MPHAL_H
 #define MICROPY_INCLUDED_PY_MPHAL_H
 
+#include <stdint.h>
 #include "py/mpconfig.h"
 
 #ifdef MICROPY_MPHALPORT_H
@@ -74,6 +75,11 @@ mp_uint_t mp_hal_ticks_us(void);
 mp_uint_t mp_hal_ticks_cpu(void);
 #endif
 
+#ifndef mp_hal_time_ns
+// Nanoseconds since 1970/1/1.
+uint64_t mp_hal_time_ns(void);
+#endif
+
 // If port HAL didn't define its own pin API, use generic
 // "virtual pin" API from the core.
 #ifndef mp_hal_pin_obj_t

From 2acc087880de39d7e17abc9344b8d2faba3478dd Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 29 Jul 2020 01:01:48 +1000
Subject: [PATCH 0215/3533] extmod/vfs_lfs: Add mtime support to littlefs
 files.

This commit adds support for modification time of files on littlefs v2
filesystems, using file attributes.  For some background see issue #6114.

Features/properties of this implementation:
- Only supported on littlefs2 (not littlefs1).
- Uses littlefs2's general file attributes to store the timestamp.
- The timestamp is 64-bits and stores nanoseconds since 1970/1/1 (if the
  range to the year 2554 is not enough then additional bits can be added to
  this timestamp by adding another file attribute).
- mtime is enabled by default but can be disabled in the constructor, eg:
  uos.mount(uos.VfsLfs2(bdev, mtime=False), '/flash')
- It's fully backwards compatible, existing littlefs2 filesystems will work
  without reformatting and timestamps will be added transparently to
  existing files (once they are opened for writing).
- Files without timestamps will open correctly, and stat will just return 0
  for their timestamp.
- mtime can be disabled or enabled each mount time and timestamps will only
  be updated if mtime is enabled (otherwise they will be untouched).

Signed-off-by: Damien George <damien@micropython.org>
---
 docs/library/uos.rst              | 16 +++--
 extmod/vfs_lfs.c                  | 21 ++++++-
 extmod/vfs_lfsx.c                 | 25 ++++++--
 extmod/vfs_lfsx_file.c            | 18 +++++-
 tests/extmod/vfs_lfs.py           | 13 ++--
 tests/extmod/vfs_lfs.py.exp       | 16 ++---
 tests/extmod/vfs_lfs_mtime.py     | 98 +++++++++++++++++++++++++++++++
 tests/extmod/vfs_lfs_mtime.py.exp | 13 ++++
 8 files changed, 197 insertions(+), 23 deletions(-)
 create mode 100644 tests/extmod/vfs_lfs_mtime.py
 create mode 100644 tests/extmod/vfs_lfs_mtime.py.exp

diff --git a/docs/library/uos.rst b/docs/library/uos.rst
index 051247b717419..edc94556b1722 100644
--- a/docs/library/uos.rst
+++ b/docs/library/uos.rst
@@ -178,7 +178,7 @@ represented by VFS classes.
 
         Build a FAT filesystem on *block_dev*.
 
-.. class:: VfsLfs1(block_dev)
+.. class:: VfsLfs1(block_dev, readsize=32, progsize=32, lookahead=32)
 
     Create a filesystem object that uses the `littlefs v1 filesystem format`_.
     Storage of the littlefs filesystem is provided by *block_dev*, which must
@@ -187,23 +187,31 @@ represented by VFS classes.
 
     See :ref:`filesystem` for more information.
 
-    .. staticmethod:: mkfs(block_dev)
+    .. staticmethod:: mkfs(block_dev, readsize=32, progsize=32, lookahead=32)
 
         Build a Lfs1 filesystem on *block_dev*.
 
     .. note:: There are reports of littlefs v1 failing in certain situations,
               for details see `littlefs issue 347`_.
 
-.. class:: VfsLfs2(block_dev)
+.. class:: VfsLfs2(block_dev, readsize=32, progsize=32, lookahead=32, mtime=True)
 
     Create a filesystem object that uses the `littlefs v2 filesystem format`_.
     Storage of the littlefs filesystem is provided by *block_dev*, which must
     support the :ref:`extended interface <block-device-interface>`.
     Objects created by this constructor can be mounted using :func:`mount`.
 
+    The *mtime* argument enables modification timestamps for files, stored using
+    littlefs attributes.  This option can be disabled or enabled differently each
+    mount time and timestamps will only be added or updated if *mtime* is enabled,
+    otherwise the timestamps will remain untouched.  Littlefs v2 filesystems without
+    timestamps will work without reformatting and timestamps will be added
+    transparently to existing files once they are opened for writing.  When *mtime*
+    is enabled `uos.stat` on files without timestamps will return 0 for the timestamp.
+
     See :ref:`filesystem` for more information.
 
-    .. staticmethod:: mkfs(block_dev)
+    .. staticmethod:: mkfs(block_dev, readsize=32, progsize=32, lookahead=32)
 
         Build a Lfs2 filesystem on *block_dev*.
 
diff --git a/extmod/vfs_lfs.c b/extmod/vfs_lfs.c
index 90a1996f9ce4a..a53f66f2d63c8 100644
--- a/extmod/vfs_lfs.c
+++ b/extmod/vfs_lfs.c
@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2019 Damien P. George
+ * Copyright (c) 2019-2020 Damien P. George
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -25,18 +25,20 @@
  */
 
 #include "py/runtime.h"
+#include "py/mphal.h"
 #include "extmod/vfs.h"
 #include "extmod/vfs_lfs.h"
 
 #if MICROPY_VFS && (MICROPY_VFS_LFS1 || MICROPY_VFS_LFS2)
 
-enum { LFS_MAKE_ARG_bdev, LFS_MAKE_ARG_readsize, LFS_MAKE_ARG_progsize, LFS_MAKE_ARG_lookahead };
+enum { LFS_MAKE_ARG_bdev, LFS_MAKE_ARG_readsize, LFS_MAKE_ARG_progsize, LFS_MAKE_ARG_lookahead, LFS_MAKE_ARG_mtime };
 
 static const mp_arg_t lfs_make_allowed_args[] = {
     { MP_QSTR_, MP_ARG_REQUIRED | MP_ARG_OBJ },
     { MP_QSTR_readsize, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 32} },
     { MP_QSTR_progsize, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 32} },
     { MP_QSTR_lookahead, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 32} },
+    { MP_QSTR_mtime, MP_ARG_KW_ONLY | MP_ARG_BOOL, {.u_bool = true} },
 };
 
 #if MICROPY_VFS_LFS1
@@ -98,9 +100,13 @@ mp_obj_t mp_vfs_lfs1_file_open(mp_obj_t self_in, mp_obj_t path_in, mp_obj_t mode
 #define MP_TYPE_VFS_LFSx mp_type_vfs_lfs2
 #define MP_TYPE_VFS_LFSx_(s) mp_type_vfs_lfs2##s
 
+// Attribute ids for lfs2_attr.type.
+#define LFS_ATTR_MTIME (1) // 64-bit little endian, nanoseconds since 1970/1/1
+
 typedef struct _mp_obj_vfs_lfs2_t {
     mp_obj_base_t base;
     mp_vfs_blockdev_t blockdev;
+    bool enable_mtime;
     vstr_t cur_dir;
     struct lfs2_config config;
     lfs2_t lfs;
@@ -109,14 +115,25 @@ typedef struct _mp_obj_vfs_lfs2_t {
 typedef struct _mp_obj_vfs_lfs2_file_t {
     mp_obj_base_t base;
     mp_obj_vfs_lfs2_t *vfs;
+    uint8_t mtime[8];
     lfs2_file_t file;
     struct lfs2_file_config cfg;
+    struct lfs2_attr attrs[1];
     uint8_t file_buffer[0];
 } mp_obj_vfs_lfs2_file_t;
 
 const char *mp_vfs_lfs2_make_path(mp_obj_vfs_lfs2_t *self, mp_obj_t path_in);
 mp_obj_t mp_vfs_lfs2_file_open(mp_obj_t self_in, mp_obj_t path_in, mp_obj_t mode_in);
 
+STATIC void lfs_get_mtime(uint8_t buf[8]) {
+    uint64_t ns = mp_hal_time_ns();
+    // Store "ns" to "buf" in little-endian format (essentially htole64).
+    for (size_t i = 0; i < 8; ++i) {
+        buf[i] = ns;
+        ns >>= 8;
+    }
+}
+
 #include "extmod/vfs_lfsx.c"
 #include "extmod/vfs_lfsx_file.c"
 
diff --git a/extmod/vfs_lfsx.c b/extmod/vfs_lfsx.c
index 24816433be015..511b741b0dec1 100644
--- a/extmod/vfs_lfsx.c
+++ b/extmod/vfs_lfsx.c
@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2019 Damien P. George
+ * Copyright (c) 2019-2020 Damien P. George
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -34,6 +34,7 @@
 #include "py/objstr.h"
 #include "py/mperrno.h"
 #include "extmod/vfs.h"
+#include "lib/timeutils/timeutils.h"
 
 STATIC int MP_VFS_LFSx(dev_ioctl)(const struct LFSx_API (config) * c, int cmd, int arg, bool must_return_int) {
     mp_obj_t ret = mp_vfs_blockdev_ioctl(c->context, cmd, arg);
@@ -120,6 +121,9 @@ STATIC mp_obj_t MP_VFS_LFSx(make_new)(const mp_obj_type_t * type, size_t n_args,
     self->base.type = type;
     vstr_init(&self->cur_dir, 16);
     vstr_add_byte(&self->cur_dir, '/');
+    #if LFS_BUILD_VERSION == 2
+    self->enable_mtime = args[LFS_MAKE_ARG_mtime].u_bool;
+    #endif
     MP_VFS_LFSx(init_config)(self, args[LFS_MAKE_ARG_bdev].u_obj,
         args[LFS_MAKE_ARG_readsize].u_int, args[LFS_MAKE_ARG_progsize].u_int, args[LFS_MAKE_ARG_lookahead].u_int);
     int ret = LFSx_API(mount)(&self->lfs, &self->config);
@@ -352,6 +356,19 @@ STATIC mp_obj_t MP_VFS_LFSx(stat)(mp_obj_t self_in, mp_obj_t path_in) {
         mp_raise_OSError(-ret);
     }
 
+    mp_uint_t mtime = 0;
+    #if LFS_BUILD_VERSION == 2
+    uint8_t mtime_buf[8];
+    lfs2_ssize_t sz = lfs2_getattr(&self->lfs, path, LFS_ATTR_MTIME, &mtime_buf, sizeof(mtime_buf));
+    if (sz == sizeof(mtime_buf)) {
+        uint64_t ns = 0;
+        for (size_t i = sizeof(mtime_buf); i > 0; --i) {
+            ns = ns << 8 | mtime_buf[i - 1];
+        }
+        mtime = timeutils_seconds_since_2000_from_nanoseconds_since_1970(ns);
+    }
+    #endif
+
     mp_obj_tuple_t *t = MP_OBJ_TO_PTR(mp_obj_new_tuple(10, NULL));
     t->items[0] = MP_OBJ_NEW_SMALL_INT(info.type == LFSx_MACRO(_TYPE_REG) ? MP_S_IFREG : MP_S_IFDIR); // st_mode
     t->items[1] = MP_OBJ_NEW_SMALL_INT(0); // st_ino
@@ -360,9 +377,9 @@ STATIC mp_obj_t MP_VFS_LFSx(stat)(mp_obj_t self_in, mp_obj_t path_in) {
     t->items[4] = MP_OBJ_NEW_SMALL_INT(0); // st_uid
     t->items[5] = MP_OBJ_NEW_SMALL_INT(0); // st_gid
     t->items[6] = mp_obj_new_int_from_uint(info.size); // st_size
-    t->items[7] = MP_OBJ_NEW_SMALL_INT(0); // st_atime
-    t->items[8] = MP_OBJ_NEW_SMALL_INT(0); // st_mtime
-    t->items[9] = MP_OBJ_NEW_SMALL_INT(0); // st_ctime
+    t->items[7] = MP_OBJ_NEW_SMALL_INT(mtime); // st_atime
+    t->items[8] = MP_OBJ_NEW_SMALL_INT(mtime); // st_mtime
+    t->items[9] = MP_OBJ_NEW_SMALL_INT(mtime); // st_ctime
 
     return MP_OBJ_FROM_PTR(t);
 }
diff --git a/extmod/vfs_lfsx_file.c b/extmod/vfs_lfsx_file.c
index f74b41837d32d..bc1a37b90bdb8 100644
--- a/extmod/vfs_lfsx_file.c
+++ b/extmod/vfs_lfsx_file.c
@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2019 Damien P. George
+ * Copyright (c) 2019-2020 Damien P. George
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -101,6 +101,17 @@ mp_obj_t MP_VFS_LFSx(file_open)(mp_obj_t self_in, mp_obj_t path_in, mp_obj_t mod
     #endif
     o->cfg.buffer = &o->file_buffer[0];
 
+    #if LFS_BUILD_VERSION == 2
+    if (self->enable_mtime) {
+        lfs_get_mtime(&o->mtime[0]);
+        o->attrs[0].type = LFS_ATTR_MTIME;
+        o->attrs[0].buffer = &o->mtime[0];
+        o->attrs[0].size = sizeof(o->mtime);
+        o->cfg.attrs = &o->attrs[0];
+        o->cfg.attr_count = MP_ARRAY_SIZE(o->attrs);
+    }
+    #endif
+
     const char *path = MP_VFS_LFSx(make_path)(self, path_in);
     int ret = LFSx_API(file_opencfg)(&self->lfs, &o->file, path, flags, &o->cfg);
     if (ret < 0) {
@@ -131,6 +142,11 @@ STATIC mp_uint_t MP_VFS_LFSx(file_read)(mp_obj_t self_in, void *buf, mp_uint_t s
 STATIC mp_uint_t MP_VFS_LFSx(file_write)(mp_obj_t self_in, const void *buf, mp_uint_t size, int *errcode) {
     MP_OBJ_VFS_LFSx_FILE *self = MP_OBJ_TO_PTR(self_in);
     MP_VFS_LFSx(check_open)(self);
+    #if LFS_BUILD_VERSION == 2
+    if (self->vfs->enable_mtime) {
+        lfs_get_mtime(&self->mtime[0]);
+    }
+    #endif
     LFSx_API(ssize_t) sz = LFSx_API(file_write)(&self->vfs->lfs, &self->file, buf, size);
     if (sz < 0) {
         *errcode = -sz;
diff --git a/tests/extmod/vfs_lfs.py b/tests/extmod/vfs_lfs.py
index 609d9f949e17d..8e56400df3c2b 100644
--- a/tests/extmod/vfs_lfs.py
+++ b/tests/extmod/vfs_lfs.py
@@ -35,6 +35,11 @@ def ioctl(self, op, arg):
             return 0
 
 
+def print_stat(st, print_size=True):
+    # don't print times (just check that they have the correct type)
+    print(st[:6], st[6] if print_size else -1, type(st[7]), type(st[8]), type(st[9]))
+
+
 def test(bdev, vfs_class):
     print("test", vfs_class)
 
@@ -69,10 +74,10 @@ def test(bdev, vfs_class):
     vfs.mkdir("testdir")
 
     # stat a file
-    print(vfs.stat("test"))
+    print_stat(vfs.stat("test"))
 
     # stat a dir (size seems to vary on LFS2 so don't print that)
-    print(vfs.stat("testdir")[:6])
+    print_stat(vfs.stat("testdir"), False)
 
     # read
     with vfs.open("test", "r") as f:
@@ -112,8 +117,8 @@ def test(bdev, vfs_class):
 
     # create file in directory to make sure paths are relative
     vfs.open("test2", "w").close()
-    print(vfs.stat("test2"))
-    print(vfs.stat("/testdir/test2"))
+    print_stat(vfs.stat("test2"))
+    print_stat(vfs.stat("/testdir/test2"))
     vfs.remove("test2")
 
     # chdir back to root and remove testdir
diff --git a/tests/extmod/vfs_lfs.py.exp b/tests/extmod/vfs_lfs.py.exp
index a7025577449d0..a0450c84b79f8 100644
--- a/tests/extmod/vfs_lfs.py.exp
+++ b/tests/extmod/vfs_lfs.py.exp
@@ -7,8 +7,8 @@ test <class 'VfsLfs1'>
 [('test', 32768, 0, 8), ('testdir', 16384, 0, 0)]
 []
 [('test', 32768, 0, 8)]
-(32768, 0, 0, 0, 0, 0, 8, 0, 0, 0)
-(16384, 0, 0, 0, 0, 0)
+(32768, 0, 0, 0, 0, 0) 8 <class 'int'> <class 'int'> <class 'int'>
+(16384, 0, 0, 0, 0, 0) -1 <class 'int'> <class 'int'> <class 'int'>
 littlefs
 data length: 4096
 write 0
@@ -22,8 +22,8 @@ write 3
 [('test', 32768, 0, 8), ('testdir', 16384, 0, 0)]
 /
 /testdir
-(32768, 0, 0, 0, 0, 0, 0, 0, 0, 0)
-(32768, 0, 0, 0, 0, 0, 0, 0, 0, 0)
+(32768, 0, 0, 0, 0, 0) 0 <class 'int'> <class 'int'> <class 'int'>
+(32768, 0, 0, 0, 0, 0) 0 <class 'int'> <class 'int'> <class 'int'>
 /
 /testdir
 /
@@ -44,8 +44,8 @@ test <class 'VfsLfs2'>
 [('testdir', 16384, 0, 0), ('test', 32768, 0, 8)]
 []
 [('test', 32768, 0, 8)]
-(32768, 0, 0, 0, 0, 0, 8, 0, 0, 0)
-(16384, 0, 0, 0, 0, 0)
+(32768, 0, 0, 0, 0, 0) 8 <class 'int'> <class 'int'> <class 'int'>
+(16384, 0, 0, 0, 0, 0) -1 <class 'int'> <class 'int'> <class 'int'>
 littlefs
 data length: 4096
 write 0
@@ -59,8 +59,8 @@ write 3
 [('test', 32768, 0, 8), ('testdir', 16384, 0, 0)]
 /
 /testdir
-(32768, 0, 0, 0, 0, 0, 0, 0, 0, 0)
-(32768, 0, 0, 0, 0, 0, 0, 0, 0, 0)
+(32768, 0, 0, 0, 0, 0) 0 <class 'int'> <class 'int'> <class 'int'>
+(32768, 0, 0, 0, 0, 0) 0 <class 'int'> <class 'int'> <class 'int'>
 /
 /testdir
 /
diff --git a/tests/extmod/vfs_lfs_mtime.py b/tests/extmod/vfs_lfs_mtime.py
new file mode 100644
index 0000000000000..0108076884055
--- /dev/null
+++ b/tests/extmod/vfs_lfs_mtime.py
@@ -0,0 +1,98 @@
+# Test for VfsLfs using a RAM device, mtime feature
+
+try:
+    import utime, uos
+
+    utime.sleep
+    uos.VfsLfs2
+except (ImportError, AttributeError):
+    print("SKIP")
+    raise SystemExit
+
+
+class RAMBlockDevice:
+    ERASE_BLOCK_SIZE = 1024
+
+    def __init__(self, blocks):
+        self.data = bytearray(blocks * self.ERASE_BLOCK_SIZE)
+
+    def readblocks(self, block, buf, off):
+        addr = block * self.ERASE_BLOCK_SIZE + off
+        for i in range(len(buf)):
+            buf[i] = self.data[addr + i]
+
+    def writeblocks(self, block, buf, off):
+        addr = block * self.ERASE_BLOCK_SIZE + off
+        for i in range(len(buf)):
+            self.data[addr + i] = buf[i]
+
+    def ioctl(self, op, arg):
+        if op == 4:  # block count
+            return len(self.data) // self.ERASE_BLOCK_SIZE
+        if op == 5:  # block size
+            return self.ERASE_BLOCK_SIZE
+        if op == 6:  # erase block
+            return 0
+
+
+def test(bdev, vfs_class):
+    print("test", vfs_class)
+
+    # Initial format of block device.
+    vfs_class.mkfs(bdev)
+
+    # construction
+    print("mtime=True")
+    vfs = vfs_class(bdev, mtime=True)
+
+    # Create an empty file, should have a timestamp.
+    vfs.open("test1", "wt").close()
+
+    # Wait 1 second so mtime will increase by at least 1.
+    utime.sleep(1)
+
+    # Create another empty file, should have a timestamp.
+    vfs.open("test2", "wt").close()
+
+    # Stat the files and check that test1 is older than test2.
+    stat1 = vfs.stat("test1")
+    stat2 = vfs.stat("test2")
+    print(stat1[8] != 0, stat2[8] != 0)
+    print(stat1[8] < stat2[8])
+
+    # Wait 1 second so mtime will increase by at least 1.
+    utime.sleep(1)
+
+    # Open test1 for reading and ensure mtime did not change.
+    vfs.open("test1", "rt").close()
+    print(vfs.stat("test1") == stat1)
+
+    # Open test1 for writing and ensure mtime increased from the previous value.
+    vfs.open("test1", "wt").close()
+    stat1_old = stat1
+    stat1 = vfs.stat("test1")
+    print(stat1_old[8] < stat1[8])
+
+    # Unmount.
+    vfs.umount()
+
+    # Check that remounting with mtime=False can read the timestamps.
+    print("mtime=False")
+    vfs = vfs_class(bdev, mtime=False)
+    print(vfs.stat("test1") == stat1)
+    print(vfs.stat("test2") == stat2)
+    f = vfs.open("test1", "wt")
+    f.close()
+    print(vfs.stat("test1") == stat1)
+    vfs.umount()
+
+    # Check that remounting with mtime=True still has the timestamps.
+    print("mtime=True")
+    vfs = vfs_class(bdev, mtime=True)
+    print(vfs.stat("test1") == stat1)
+    print(vfs.stat("test2") == stat2)
+    vfs.umount()
+
+
+bdev = RAMBlockDevice(30)
+test(bdev, uos.VfsLfs2)
diff --git a/tests/extmod/vfs_lfs_mtime.py.exp b/tests/extmod/vfs_lfs_mtime.py.exp
new file mode 100644
index 0000000000000..2e3d7491bcbd8
--- /dev/null
+++ b/tests/extmod/vfs_lfs_mtime.py.exp
@@ -0,0 +1,13 @@
+test <class 'VfsLfs2'>
+mtime=True
+True True
+True
+True
+True
+mtime=False
+True
+True
+True
+mtime=True
+True
+True

From 3d9a7ed02f4e50ee2eb541ac2f4d7f6f5b5d316e Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Fri, 14 Aug 2020 15:43:37 +1000
Subject: [PATCH 0216/3533] extmod/btstack: Implement GAP scan duration_ms
 parameter.

This commit makes scanning work when duration_ms is set to zero.  Prior to
this it would not work with duration_ms set to zero.
---
 extmod/btstack/modbluetooth_btstack.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/extmod/btstack/modbluetooth_btstack.c b/extmod/btstack/modbluetooth_btstack.c
index c7269d33ed5ca..89e396dfd08e7 100644
--- a/extmod/btstack/modbluetooth_btstack.c
+++ b/extmod/btstack/modbluetooth_btstack.c
@@ -889,7 +889,7 @@ int mp_bluetooth_gap_disconnect(uint16_t conn_handle) {
 #if MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE
 STATIC btstack_timer_source_t scan_duration_timeout;
 
-STATIC void hci_initialization_timeout_handler(btstack_timer_source_t *ds) {
+STATIC void scan_duration_timeout_handler(btstack_timer_source_t *ds) {
     (void)ds;
     mp_bluetooth_gap_scan_stop();
 }
@@ -897,9 +897,11 @@ STATIC void hci_initialization_timeout_handler(btstack_timer_source_t *ds) {
 int mp_bluetooth_gap_scan_start(int32_t duration_ms, int32_t interval_us, int32_t window_us) {
     DEBUG_EVENT_printf("mp_bluetooth_gap_scan_start\n");
 
-    btstack_run_loop_set_timer(&scan_duration_timeout, duration_ms);
-    btstack_run_loop_set_timer_handler(&scan_duration_timeout, hci_initialization_timeout_handler);
-    btstack_run_loop_add_timer(&scan_duration_timeout);
+    if (duration_ms > 0) {
+        btstack_run_loop_set_timer(&scan_duration_timeout, duration_ms);
+        btstack_run_loop_set_timer_handler(&scan_duration_timeout, scan_duration_timeout_handler);
+        btstack_run_loop_add_timer(&scan_duration_timeout);
+    }
 
     // 0 = passive scan (we don't handle scan response).
     gap_set_scan_parameters(0, interval_us / 625, window_us / 625);

From 0bc2c1c1057d7f5c1e4987139062386a8f9fe5f2 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Mon, 17 Aug 2020 10:21:27 +1000
Subject: [PATCH 0217/3533] extmod/modbluetooth: Fix race between READ_REQUEST
 and other IRQs.

The READ_REQUEST callback is handled as a hard interrupt (because the BLE
stack needs an immediate response from it so it can continue) and so calls
to Python require extra protection:

- the caller-owned tuple passed into the callback must be separate from the
  tuple used by other callback events (which are soft interrupts);

- the GC and scheduler must be locked during callback execution.
---
 extmod/modbluetooth.c | 29 ++++++++++++++++++++++++-----
 1 file changed, 24 insertions(+), 5 deletions(-)

diff --git a/extmod/modbluetooth.c b/extmod/modbluetooth.c
index 7bfb774782048..730c288ee7885 100644
--- a/extmod/modbluetooth.c
+++ b/extmod/modbluetooth.c
@@ -26,14 +26,15 @@
  */
 
 #include "py/binary.h"
+#include "py/gc.h"
 #include "py/misc.h"
 #include "py/mperrno.h"
+#include "py/mphal.h"
 #include "py/obj.h"
-#include "py/objstr.h"
 #include "py/objarray.h"
+#include "py/objstr.h"
 #include "py/qstr.h"
 #include "py/runtime.h"
-#include "py/mphal.h"
 #include "extmod/modbluetooth.h"
 #include <string.h>
 
@@ -66,6 +67,9 @@ typedef struct {
     mp_obj_str_t irq_data_data;
     mp_obj_bluetooth_uuid_t irq_data_uuid;
     ringbuf_t ringbuf;
+    #if MICROPY_PY_BLUETOOTH_GATTS_ON_READ_CALLBACK
+    mp_obj_t irq_read_request_data_tuple;
+    #endif
 } mp_obj_bluetooth_ble_t;
 
 // TODO: this seems like it could be generic?
@@ -252,6 +256,11 @@ STATIC mp_obj_t bluetooth_ble_make_new(const mp_obj_type_t *type, size_t n_args,
         // Pre-allocate the event data tuple to prevent needing to allocate in the IRQ handler.
         o->irq_data_tuple = mp_obj_new_tuple(MICROPY_PY_BLUETOOTH_MAX_EVENT_DATA_TUPLE_LEN, NULL);
 
+        #if MICROPY_PY_BLUETOOTH_GATTS_ON_READ_CALLBACK
+        // Pre-allocate a separate data tuple for the read request "hard" irq.
+        o->irq_read_request_data_tuple = mp_obj_new_tuple(2, NULL);
+        #endif
+
         // Pre-allocated buffers for address, payload and uuid.
         o->irq_data_addr.base.type = &mp_type_bytes;
         o->irq_data_addr.data = o->irq_data_addr_bytes;
@@ -1139,12 +1148,22 @@ void mp_bluetooth_gattc_on_read_write_status(uint8_t event, uint16_t conn_handle
 bool mp_bluetooth_gatts_on_read_request(uint16_t conn_handle, uint16_t value_handle) {
     mp_obj_bluetooth_ble_t *o = MP_OBJ_TO_PTR(MP_STATE_VM(bluetooth));
     if (o->irq_handler != mp_const_none) {
-        // Use pre-allocated tuple because this is a hard IRQ.
-        mp_obj_tuple_t *data = MP_OBJ_TO_PTR(o->irq_data_tuple);
+        // When executing code within a handler we must lock the scheduler to
+        // prevent any scheduled callbacks from running, and lock the GC to
+        // prevent any memory allocations.
+        mp_sched_lock();
+        gc_lock();
+
+        // Use pre-allocated tuple distinct to the one used by the "soft" IRQs.
+        mp_obj_tuple_t *data = MP_OBJ_TO_PTR(o->irq_read_request_data_tuple);
         data->items[0] = MP_OBJ_NEW_SMALL_INT(conn_handle);
         data->items[1] = MP_OBJ_NEW_SMALL_INT(value_handle);
         data->len = 2;
-        mp_obj_t irq_ret = mp_call_function_2_protected(o->irq_handler, MP_OBJ_NEW_SMALL_INT(MP_BLUETOOTH_IRQ_GATTS_READ_REQUEST), o->irq_data_tuple);
+        mp_obj_t irq_ret = mp_call_function_2_protected(o->irq_handler, MP_OBJ_NEW_SMALL_INT(MP_BLUETOOTH_IRQ_GATTS_READ_REQUEST), o->irq_read_request_data_tuple);
+
+        gc_unlock();
+        mp_sched_unlock();
+
         // If the IRQ handler explicitly returned false, then deny the read. Otherwise if it returns None/True, allow it.
         return irq_ret != MP_OBJ_NULL && (irq_ret == mp_const_none || mp_obj_is_true(irq_ret));
     } else {

From a80a146858b3c9a7fbae4030a524666ab19f7a47 Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Fri, 14 Aug 2020 11:49:41 +1000
Subject: [PATCH 0218/3533] extmod/bluetooth: Support active scanning in
 BLE.gap_scan().

This adds an additional optional parameter to gap_scan() to select active
scanning, where scan responses are returned as well as normal scan results.
This parameter is False by default which retains the existing behaviour.
---
 docs/library/ubluetooth.rst           | 4 +++-
 extmod/btstack/modbluetooth_btstack.c | 5 ++---
 extmod/modbluetooth.c                 | 8 ++++++--
 extmod/modbluetooth.h                 | 2 +-
 extmod/nimble/modbluetooth_nimble.c   | 4 ++--
 5 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/docs/library/ubluetooth.rst b/docs/library/ubluetooth.rst
index e103932efd2f6..0cac16f5f4ad9 100644
--- a/docs/library/ubluetooth.rst
+++ b/docs/library/ubluetooth.rst
@@ -204,7 +204,7 @@ Broadcaster Role (Advertiser)
 Observer Role (Scanner)
 -----------------------
 
-.. method:: BLE.gap_scan(duration_ms, [interval_us], [window_us])
+.. method:: BLE.gap_scan(duration_ms, [interval_us], [window_us], [active])
 
     Run a scan operation lasting for the specified duration (in **milli**\ seconds).
 
@@ -228,6 +228,8 @@ Observer Role (Scanner)
         * 0x03 - ADV_NONCONN_IND - non-connectable undirected advertising
         * 0x04 - SCAN_RSP - scan response
 
+    ``active`` can be set ``True`` if you want to receive scan responses in the results.
+    
     When scanning is stopped (either due to the duration finishing or when
     explicitly stopped), the ``_IRQ_SCAN_DONE`` event will be raised.
 
diff --git a/extmod/btstack/modbluetooth_btstack.c b/extmod/btstack/modbluetooth_btstack.c
index 89e396dfd08e7..8f0c82974c316 100644
--- a/extmod/btstack/modbluetooth_btstack.c
+++ b/extmod/btstack/modbluetooth_btstack.c
@@ -894,7 +894,7 @@ STATIC void scan_duration_timeout_handler(btstack_timer_source_t *ds) {
     mp_bluetooth_gap_scan_stop();
 }
 
-int mp_bluetooth_gap_scan_start(int32_t duration_ms, int32_t interval_us, int32_t window_us) {
+int mp_bluetooth_gap_scan_start(int32_t duration_ms, int32_t interval_us, int32_t window_us, bool active_scan) {
     DEBUG_EVENT_printf("mp_bluetooth_gap_scan_start\n");
 
     if (duration_ms > 0) {
@@ -903,8 +903,7 @@ int mp_bluetooth_gap_scan_start(int32_t duration_ms, int32_t interval_us, int32_
         btstack_run_loop_add_timer(&scan_duration_timeout);
     }
 
-    // 0 = passive scan (we don't handle scan response).
-    gap_set_scan_parameters(0, interval_us / 625, window_us / 625);
+    gap_set_scan_parameters(active_scan ? 1 : 0, interval_us / 625, window_us / 625);
     gap_start_scan();
 
     return 0;
diff --git a/extmod/modbluetooth.c b/extmod/modbluetooth.c
index 730c288ee7885..82efe49385377 100644
--- a/extmod/modbluetooth.c
+++ b/extmod/modbluetooth.c
@@ -609,6 +609,7 @@ STATIC mp_obj_t bluetooth_ble_gap_scan(size_t n_args, const mp_obj_t *args) {
     mp_int_t duration_ms = 0;
     mp_int_t interval_us = 1280000;
     mp_int_t window_us = 11250;
+    bool active_scan = false;
     if (n_args > 1) {
         if (args[1] == mp_const_none) {
             // scan(None) --> stop scan.
@@ -619,12 +620,15 @@ STATIC mp_obj_t bluetooth_ble_gap_scan(size_t n_args, const mp_obj_t *args) {
             interval_us = mp_obj_get_int(args[2]);
             if (n_args > 3) {
                 window_us = mp_obj_get_int(args[3]);
+                if (n_args > 4) {
+                    active_scan = mp_obj_is_true(args[4]);
+                }
             }
         }
     }
-    return bluetooth_handle_errno(mp_bluetooth_gap_scan_start(duration_ms, interval_us, window_us));
+    return bluetooth_handle_errno(mp_bluetooth_gap_scan_start(duration_ms, interval_us, window_us, active_scan));
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(bluetooth_ble_gap_scan_obj, 1, 4, bluetooth_ble_gap_scan);
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(bluetooth_ble_gap_scan_obj, 1, 5, bluetooth_ble_gap_scan);
 #endif // MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE
 
 STATIC mp_obj_t bluetooth_ble_gap_disconnect(mp_obj_t self_in, mp_obj_t conn_handle_in) {
diff --git a/extmod/modbluetooth.h b/extmod/modbluetooth.h
index cdb86e5e63c44..2c07683124232 100644
--- a/extmod/modbluetooth.h
+++ b/extmod/modbluetooth.h
@@ -215,7 +215,7 @@ int mp_bluetooth_gap_disconnect(uint16_t conn_handle);
 
 #if MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE
 // Start a discovery (scan). Set duration to zero to run continuously.
-int mp_bluetooth_gap_scan_start(int32_t duration_ms, int32_t interval_us, int32_t window_us);
+int mp_bluetooth_gap_scan_start(int32_t duration_ms, int32_t interval_us, int32_t window_us, bool active_scan);
 
 // Stop discovery (if currently active).
 int mp_bluetooth_gap_scan_stop(void);
diff --git a/extmod/nimble/modbluetooth_nimble.c b/extmod/nimble/modbluetooth_nimble.c
index 843989b2b8986..e51f2747ec5c8 100644
--- a/extmod/nimble/modbluetooth_nimble.c
+++ b/extmod/nimble/modbluetooth_nimble.c
@@ -661,7 +661,7 @@ STATIC int gap_scan_cb(struct ble_gap_event *event, void *arg) {
     return 0;
 }
 
-int mp_bluetooth_gap_scan_start(int32_t duration_ms, int32_t interval_us, int32_t window_us) {
+int mp_bluetooth_gap_scan_start(int32_t duration_ms, int32_t interval_us, int32_t window_us, bool active_scan) {
     if (!mp_bluetooth_is_active()) {
         return ERRNO_BLUETOOTH_NOT_ACTIVE;
     }
@@ -673,7 +673,7 @@ int mp_bluetooth_gap_scan_start(int32_t duration_ms, int32_t interval_us, int32_
         .window = MAX(BLE_HCI_SCAN_WINDOW_MIN, MIN(BLE_HCI_SCAN_WINDOW_MAX, window_us / BLE_HCI_SCAN_ITVL)),
         .filter_policy = BLE_HCI_CONN_FILT_NO_WL,
         .limited = 0,
-        .passive = 1,  // TODO: Handle BLE_HCI_ADV_RPT_EVTYPE_SCAN_RSP in gap_scan_cb above.
+        .passive = active_scan ? 0 : 1,
         .filter_duplicates = 0,
     };
     int err = ble_gap_disc(BLE_OWN_ADDR_PUBLIC, duration_ms, &discover_params, gap_scan_cb, NULL);

From 5fb276de33c238d0a56696c701b8274d070684d8 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 26 Aug 2020 16:02:39 +1000
Subject: [PATCH 0219/3533] tests/extmod: Make uasyncio_fair test more reliable
 by adjusting sleeps.

With sleep(0.2) a multiple of sleep(0.1), the order of task 2 and 3
execution is not well defined, and depends on the precision of the system
clock and how fast the rest of the code runs.  So change 0.2 to 0.18 to
make the test more reliable.

Also fix a typo of t3/t4, and cancel t4 at the end.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/extmod/uasyncio_fair.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tests/extmod/uasyncio_fair.py b/tests/extmod/uasyncio_fair.py
index e0ee811a9b046..e2257060548bb 100644
--- a/tests/extmod/uasyncio_fair.py
+++ b/tests/extmod/uasyncio_fair.py
@@ -21,12 +21,13 @@ async def task(id, t):
 async def main():
     t1 = asyncio.create_task(task(1, -0.01))
     t2 = asyncio.create_task(task(2, 0.1))
-    t3 = asyncio.create_task(task(3, 0.2))
-    t3 = asyncio.create_task(task(4, -100))
+    t3 = asyncio.create_task(task(3, 0.18))
+    t4 = asyncio.create_task(task(4, -100))
     await asyncio.sleep(0.5)
     t1.cancel()
     t2.cancel()
     t3.cancel()
+    t4.cancel()
     print("finish")
 
 

From 91c5d168c061ec45a548876a76a5540316d02594 Mon Sep 17 00:00:00 2001
From: Roberto Colistete Jr <roberto.colistete@gmail.com>
Date: Sat, 15 Aug 2020 02:35:02 -0300
Subject: [PATCH 0220/3533] nrf/Makefile: Improve user C modules support.

Add CFLAGS_EXTRA to CFLAGS. Include LDFLAGS_MOD to the compilation.
And, add SRC_MOD to SRC_QSTR.
---
 ports/nrf/Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ports/nrf/Makefile b/ports/nrf/Makefile
index 8f73336e0b1e8..e5a1b471a35d7 100644
--- a/ports/nrf/Makefile
+++ b/ports/nrf/Makefile
@@ -113,7 +113,7 @@ endif
 
 
 CFLAGS += $(CFLAGS_MCU_$(MCU_SERIES))
-CFLAGS += $(INC) -Wall -Werror -g -ansi -std=c11 -nostdlib $(COPT) $(NRF_DEFINES) $(CFLAGS_MOD)
+CFLAGS += $(INC) -Wall -Werror -g -ansi -std=c11 -nostdlib $(COPT) $(NRF_DEFINES) $(CFLAGS_MOD) $(CFLAGS_EXTRA)
 CFLAGS += -fno-strict-aliasing
 CFLAGS += -Iboards/$(BOARD)
 CFLAGS += -DNRF5_HAL_H='<$(MCU_VARIANT)_hal.h>'
@@ -445,11 +445,11 @@ flash: deploy
 
 $(BUILD)/$(OUTPUT_FILENAME).elf: $(OBJ)
 	$(ECHO) "LINK $@"
-	$(Q)$(CC) $(LDFLAGS) -o $@ $(OBJ) $(LIBS)
+	$(Q)$(CC) $(LDFLAGS) -o $@ $(OBJ) $(LDFLAGS_MOD) $(LIBS)
 	$(Q)$(SIZE) $@
 
 # List of sources for qstr extraction
-SRC_QSTR += $(SRC_C) $(SRC_LIB) $(DRIVERS_SRC_C) $(SRC_BOARD_MODULES)
+SRC_QSTR += $(SRC_C) $(SRC_LIB) $(DRIVERS_SRC_C) $(SRC_BOARD_MODULES) $(SRC_MOD) 
 
 # Append any auto-generated sources that are needed by sources listed in
 # SRC_QSTR

From 405893afc6654ed2ace9a6475bfd2095133e614a Mon Sep 17 00:00:00 2001
From: stijn <stijn@ignitron.net>
Date: Wed, 8 Apr 2020 08:01:58 +0200
Subject: [PATCH 0221/3533] tests/run-tests: Use absolute paths where possible.

Replace some usages of paths relative to the current working directory
with absolute paths relative to the tests directory.

Fixes and resulting changes:
- default values of MICROPYTHON and MPYCROSS are absolute paths and
  always correct
- likewise, the correct full paths for tools and extmod directories
  are appended to sys.path
- printing/cleaning failures works properly since it expects the .exp
  and .out files in the tests directory which is also where they
  are written to now, plus no more need for changing directories

This fixes #5872 and allows running custom tests which use run-tests
without having to cd to the tests directory first, and the test output
still is in the tests/ directory instead of the current working directory.

Discovery of tests and all skip test logic based on paths relative to
the current working directory remains unchanged which essentially means
that for running most of MicroPython's own tests, run-tests must still
be ran from within it's directory, so document that.
---
 tests/run-tests | 54 ++++++++++++++++++++++++++++---------------------
 1 file changed, 31 insertions(+), 23 deletions(-)

diff --git a/tests/run-tests b/tests/run-tests
index 102b0f7790e14..c2831614a3599 100755
--- a/tests/run-tests
+++ b/tests/run-tests
@@ -5,21 +5,29 @@ import subprocess
 import sys
 import platform
 import argparse
+import inspect
 import re
 from glob import glob
 
+# See stackoverflow.com/questions/2632199: __file__ nor sys.argv[0]
+# are guaranteed to always work, this one should though.
+BASEPATH = os.path.dirname(os.path.abspath(inspect.getsourcefile(lambda: None)))
+
+def base_path(*p):
+    return os.path.abspath(os.path.join(BASEPATH, *p)).replace('\\', '/')
+
 # Tests require at least CPython 3.3. If your default python3 executable
 # is of lower version, you can point MICROPY_CPYTHON3 environment var
 # to the correct executable.
 if os.name == 'nt':
     CPYTHON3 = os.getenv('MICROPY_CPYTHON3', 'python3.exe')
-    MICROPYTHON = os.getenv('MICROPY_MICROPYTHON', '../ports/windows/micropython.exe')
+    MICROPYTHON = os.getenv('MICROPY_MICROPYTHON', base_path('../ports/windows/micropython.exe'))
 else:
     CPYTHON3 = os.getenv('MICROPY_CPYTHON3', 'python3')
-    MICROPYTHON = os.getenv('MICROPY_MICROPYTHON', '../ports/unix/micropython')
+    MICROPYTHON = os.getenv('MICROPY_MICROPYTHON', base_path('../ports/unix/micropython'))
 
 # mpy-cross is only needed if --via-mpy command-line arg is passed
-MPYCROSS = os.getenv('MICROPY_MPYCROSS', '../mpy-cross/mpy-cross')
+MPYCROSS = os.getenv('MICROPY_MPYCROSS', base_path('../mpy-cross/mpy-cross'))
 
 # For diff'ing test output
 DIFF = os.getenv('MICROPY_DIFF', 'diff -u')
@@ -61,7 +69,7 @@ def run_micropython(pyb, args, test_file, is_special=False):
     had_crash = False
     if pyb is None:
         # run on PC
-        if test_file.startswith(('cmdline/', 'feature_check/')) or test_file in special_tests:
+        if test_file.startswith(('cmdline/', base_path('feature_check/'))) or test_file in special_tests:
             # special handling for tests of the unix cmdline program
             is_special = True
 
@@ -215,10 +223,10 @@ def run_feature_check(pyb, args, base_path, test_file):
     if pyb is not None and test_file.startswith("repl_"):
         # REPL feature tests will not run via pyboard because they require prompt interactivity
         return b""
-    return run_micropython(pyb, args, base_path + "/feature_check/" + test_file, is_special=True)
+    return run_micropython(pyb, args, base_path("feature_check", test_file), is_special=True)
 
 
-def run_tests(pyb, tests, args, base_path="."):
+def run_tests(pyb, tests, args):
     test_count = 0
     testcase_count = 0
     passed_count = 0
@@ -244,6 +252,10 @@ def run_tests(pyb, tests, args, base_path="."):
     # If we're asked to --list-tests, we can't assume that there's a
     # connection to target, so we can't run feature checks usefully.
     if not (args.list_tests or args.write_exp):
+        # Even if we run completely different tests in a different directory,
+        # we need to access feature_checks from the same directory as the
+        # run-tests script itself so use base_path.
+
         # Check if micropython.native is supported, and skip such tests if it's not
         output = run_feature_check(pyb, args, base_path, 'native_check.py')
         if output == b'CRASH':
@@ -307,7 +319,7 @@ def run_tests(pyb, tests, args, base_path="."):
             upy_float_precision = int(upy_float_precision)
         has_complex = run_feature_check(pyb, args, base_path, 'complex.py') == b'complex\n'
         has_coverage = run_feature_check(pyb, args, base_path, 'coverage.py') == b'coverage\n'
-        cpy_byteorder = subprocess.check_output([CPYTHON3, base_path + '/feature_check/byteorder.py'])
+        cpy_byteorder = subprocess.check_output([CPYTHON3, base_path('feature_check/byteorder.py')])
         skip_endian = (upy_byteorder != cpy_byteorder)
 
     # These tests don't test slice explicitly but rather use it to perform the test
@@ -509,8 +521,8 @@ def run_tests(pyb, tests, args, base_path="."):
 
         testcase_count += len(output_expected.splitlines())
 
-        filename_expected = test_basename + ".exp"
-        filename_mupy = test_basename + ".out"
+        filename_expected = base_path(test_basename + ".exp")
+        filename_mupy = base_path(test_basename + ".out")
 
         if output_expected == output_mupy:
             print("pass ", test_file)
@@ -563,6 +575,10 @@ def main():
         formatter_class=argparse.RawDescriptionHelpFormatter,
         description='''Run and manage tests for MicroPython.
 
+Tests are discovered by scanning test directories for .py files or using the
+specified test files. If test files nor directories are specified, the script
+expects to be ran in the tests directory (where this file is located) and the
+builtin tests suitable for the target platform are ran.
 When running tests, run-tests compares the MicroPython output of the test with the output
 produced by running the test through CPython unless a <test>.exp file is found, in which
 case it is used as comparison.
@@ -598,10 +614,8 @@ the last matching regex is used:
     args = cmd_parser.parse_args()
 
     if args.print_failures:
-        os.chdir(os.path.abspath(os.path.dirname(__file__)))
-
-        for exp in glob("*.exp"):
-            testbase = os.path.basename(exp)[:-4]
+        for exp in glob(base_path("*.exp")):
+            testbase = exp[:-4]
             print()
             print("FAILURE {0}".format(testbase))
             os.system("{0} {1}.exp {1}.out".format(DIFF, testbase))
@@ -609,9 +623,7 @@ the last matching regex is used:
         sys.exit(0)
 
     if args.clean_failures:
-        os.chdir(os.path.abspath(os.path.dirname(__file__)))
-
-        for f in glob("*.exp") + glob("*.out"):
+        for f in glob(base_path("*.exp")) + glob(base_path("*.out")):
             os.remove(f)
 
         sys.exit(0)
@@ -622,7 +634,7 @@ the last matching regex is used:
         pyb = None
     elif args.target in EXTERNAL_TARGETS:
         global pyboard
-        sys.path.append('../tools')
+        sys.path.append(base_path('../tools'))
         import pyboard
         pyb = pyboard.Pyboard(args.device, args.baudrate, args.user, args.password)
         pyb.enter_raw_repl()
@@ -659,14 +671,10 @@ the last matching regex is used:
 
     if not args.keep_path:
         # clear search path to make sure tests use only builtin modules and those in extmod
-        os.environ['MICROPYPATH'] = os.pathsep + '../extmod'
+        os.environ['MICROPYPATH'] = os.pathsep + base_path('../extmod')
 
-    # Even if we run completely different tests in a different directory,
-    # we need to access feature_check's from the same directory as the
-    # run-tests script itself.
-    base_path = os.path.dirname(sys.argv[0]) or "."
     try:
-        res = run_tests(pyb, tests, args, base_path)
+        res = run_tests(pyb, tests, args)
     finally:
         if pyb:
             pyb.close()

From 0c3f9d58a5dcf0480460548a416f27d9c8350f3c Mon Sep 17 00:00:00 2001
From: stijn <stijn@ignitron.net>
Date: Tue, 7 Apr 2020 16:19:49 +0200
Subject: [PATCH 0222/3533] tests/run-tests: Make test output directory
 configurable.

A configurable result directory is advantageous because it enables
using a dedicated location, eventually outside of the source tree,
instead of forcing the output files into a fixed directory which might
also contain other files already. For that reason the default output
directory also has been changed to tests/results/.
---
 .gitignore      |  3 +--
 tests/run-tests | 16 +++++++++-------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index 50bd30e877e87..c52f59eec74e6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,8 +27,7 @@ build-*/
 
 # Test failure outputs
 ######################
-tests/*.exp
-tests/*.out
+tests/results/*
 
 # Python cache files
 ######################
diff --git a/tests/run-tests b/tests/run-tests
index c2831614a3599..49811d9b78845 100755
--- a/tests/run-tests
+++ b/tests/run-tests
@@ -226,7 +226,7 @@ def run_feature_check(pyb, args, base_path, test_file):
     return run_micropython(pyb, args, base_path("feature_check", test_file), is_special=True)
 
 
-def run_tests(pyb, tests, args):
+def run_tests(pyb, tests, args, result_dir):
     test_count = 0
     testcase_count = 0
     passed_count = 0
@@ -521,8 +521,8 @@ def run_tests(pyb, tests, args):
 
         testcase_count += len(output_expected.splitlines())
 
-        filename_expected = base_path(test_basename + ".exp")
-        filename_mupy = base_path(test_basename + ".out")
+        filename_expected = os.path.join(result_dir, test_basename + ".exp")
+        filename_mupy = os.path.join(result_dir, test_basename + ".out")
 
         if output_expected == output_mupy:
             print("pass ", test_file)
@@ -582,7 +582,7 @@ builtin tests suitable for the target platform are ran.
 When running tests, run-tests compares the MicroPython output of the test with the output
 produced by running the test through CPython unless a <test>.exp file is found, in which
 case it is used as comparison.
-If a test fails, run-tests produces a pair of <test>.out and <test>.exp files in the current
+If a test fails, run-tests produces a pair of <test>.out and <test>.exp files in the result
 directory with the MicroPython output and the expectations, respectively.
 ''',
         epilog='''\
@@ -599,6 +599,7 @@ the last matching regex is used:
     cmd_parser.add_argument('-u', '--user', default='micro', help='the telnet login username')
     cmd_parser.add_argument('-p', '--password', default='python', help='the telnet login password')
     cmd_parser.add_argument('-d', '--test-dirs', nargs='*', help='input test directories (if no files given)')
+    cmd_parser.add_argument('-r', '--result-dir', default=base_path('results'), help='directory for test results')
     cmd_parser.add_argument('-e', '--exclude', action=append_filter, metavar='REGEX', dest='filters', help='exclude test by regex on path/name.py')
     cmd_parser.add_argument('-i', '--include', action=append_filter, metavar='REGEX', dest='filters', help='include test by regex on path/name.py')
     cmd_parser.add_argument('--write-exp', action='store_true', help='use CPython to generate .exp files to run tests w/o CPython')
@@ -614,7 +615,7 @@ the last matching regex is used:
     args = cmd_parser.parse_args()
 
     if args.print_failures:
-        for exp in glob(base_path("*.exp")):
+        for exp in glob(os.path.join(args.result_dir, "*.exp")):
             testbase = exp[:-4]
             print()
             print("FAILURE {0}".format(testbase))
@@ -623,7 +624,7 @@ the last matching regex is used:
         sys.exit(0)
 
     if args.clean_failures:
-        for f in glob(base_path("*.exp")) + glob(base_path("*.out")):
+        for f in glob(os.path.join(args.result_dir, "*.exp")) + glob(os.path.join(args.result_dir, "*.out")):
             os.remove(f)
 
         sys.exit(0)
@@ -674,7 +675,8 @@ the last matching regex is used:
         os.environ['MICROPYPATH'] = os.pathsep + base_path('../extmod')
 
     try:
-        res = run_tests(pyb, tests, args)
+        os.makedirs(args.result_dir, exist_ok=True)
+        res = run_tests(pyb, tests, args, args.result_dir)
     finally:
         if pyb:
             pyb.close()

From cef678b2dbab528a54bc36bd6c3be84a38857629 Mon Sep 17 00:00:00 2001
From: Michael Buesch <m@bues.ch>
Date: Sun, 23 Aug 2020 15:16:00 +0200
Subject: [PATCH 0223/3533] extmod/machine_i2c: Fix buffer overrun if
 'addrsize' is bigger than 32.

The memory operation functions read_mem() and write_mem() create a
temporary buffer on the local C stack for the address bytes with the size
of 4 bytes.  This buffer is filled in a loop from the user supplied address
and address length.  If the user supplied 'addrsize' is bigger than 32, the
local buffer is overrun.

Fix this by raising an exception for invalid 'addrsize' values.

Signed-off-by: Michael Buesch <m@bues.ch>
---
 extmod/machine_i2c.c | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/extmod/machine_i2c.c b/extmod/machine_i2c.c
index 14cba962365e1..c804cf570385d 100644
--- a/extmod/machine_i2c.c
+++ b/extmod/machine_i2c.c
@@ -526,13 +526,24 @@ STATIC mp_obj_t machine_i2c_writevto(size_t n_args, const mp_obj_t *args) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_i2c_writevto_obj, 3, 4, machine_i2c_writevto);
 
-STATIC int read_mem(mp_obj_t self_in, uint16_t addr, uint32_t memaddr, uint8_t addrsize, uint8_t *buf, size_t len) {
-    mp_obj_base_t *self = (mp_obj_base_t *)MP_OBJ_TO_PTR(self_in);
-    uint8_t memaddr_buf[4];
+STATIC size_t fill_memaddr_buf(uint8_t *memaddr_buf, uint32_t memaddr, uint8_t addrsize) {
     size_t memaddr_len = 0;
+    if ((addrsize & 7) != 0 || addrsize > 32) {
+        mp_raise_ValueError(MP_ERROR_TEXT("invalid addrsize"));
+    }
     for (int16_t i = addrsize - 8; i >= 0; i -= 8) {
         memaddr_buf[memaddr_len++] = memaddr >> i;
     }
+    return memaddr_len;
+}
+
+STATIC int read_mem(mp_obj_t self_in, uint16_t addr, uint32_t memaddr, uint8_t addrsize, uint8_t *buf, size_t len) {
+    mp_obj_base_t *self = (mp_obj_base_t *)MP_OBJ_TO_PTR(self_in);
+
+    // Create buffer with memory address
+    uint8_t memaddr_buf[4];
+    size_t memaddr_len = fill_memaddr_buf(&memaddr_buf[0], memaddr, addrsize);
+
     int ret = mp_machine_i2c_writeto(self, addr, memaddr_buf, memaddr_len, false);
     if (ret != memaddr_len) {
         // must generate STOP
@@ -546,11 +557,8 @@ STATIC int write_mem(mp_obj_t self_in, uint16_t addr, uint32_t memaddr, uint8_t
     mp_obj_base_t *self = (mp_obj_base_t *)MP_OBJ_TO_PTR(self_in);
 
     // Create buffer with memory address
-    size_t memaddr_len = 0;
     uint8_t memaddr_buf[4];
-    for (int16_t i = addrsize - 8; i >= 0; i -= 8) {
-        memaddr_buf[memaddr_len++] = memaddr >> i;
-    }
+    size_t memaddr_len = fill_memaddr_buf(&memaddr_buf[0], memaddr, addrsize);
 
     // Create partial write buffers
     mp_machine_i2c_buf_t bufs[2] = {

From a93a378e933abc294de6ae26fb86a421e858fbcf Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 28 Aug 2020 16:42:32 +1000
Subject: [PATCH 0224/3533] zephyr/README: Update required Zephyr version and
 mention new features.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/zephyr/README.md | 54 +++++++++++++++++++++++++++++++++++-------
 1 file changed, 46 insertions(+), 8 deletions(-)

diff --git a/ports/zephyr/README.md b/ports/zephyr/README.md
index 6bcbccd8b36a3..a2fb393d90d0f 100644
--- a/ports/zephyr/README.md
+++ b/ports/zephyr/README.md
@@ -1,10 +1,11 @@
 MicroPython port to Zephyr RTOS
 ===============================
 
-This is an work-in-progress port of MicroPython to Zephyr RTOS
+This is a work-in-progress port of MicroPython to Zephyr RTOS
 (http://zephyrproject.org).
 
-This port requires Zephyr version 1.8 or higher. All boards supported
+This port requires Zephyr version 2.3.0, and may also work on higher
+versions.  All boards supported
 by Zephyr (with standard level of features support, like UART console)
 should work with MicroPython (but not all were tested).
 
@@ -12,12 +13,14 @@ Features supported at this time:
 
 * REPL (interactive prompt) over Zephyr UART console.
 * `utime` module for time measurements and delays.
-* `machine.Pin` class for GPIO control.
+* `machine.Pin` class for GPIO control, with IRQ support.
 * `machine.I2C` class for I2C control.
 * `usocket` module for networking (IPv4/IPv6).
 * "Frozen modules" support to allow to bundle Python modules together
   with firmware. Including complete applications, including with
   run-on-boot capability.
+* virtual filesystem with FAT and littlefs formats, backed by either
+  DiskAccess or FlashArea (flash map).
 
 Over time, bindings for various Zephyr subsystems may be added.
 
@@ -28,17 +31,35 @@ Building
 Follow to Zephyr web site for Getting Started instruction of installing
 Zephyr SDK, getting Zephyr source code, and setting up development
 environment. (Direct link:
-https://www.zephyrproject.org/doc/getting_started/getting_started.html).
+https://docs.zephyrproject.org/latest/getting_started/index.html).
 You may want to build Zephyr's own sample applications to make sure your
 setup is correct.
 
-To build MicroPython port, in the port subdirectory (zephyr/), run:
+If you already have Zephyr installed but are having issues building the
+MicroPython port then try installing the correct version of Zephyr via:
 
-    make BOARD=<board>
+    $ west init zephyrproject -m https://github.com/zephyrproject-rtos/zephyr --mr v2.3.0
+
+Alternatively, you don't have to redo the Zephyr installation to just
+switch from master to a tagged release, you can instead do:
+
+    $ cd zephyrproject/zephyr
+    $ git checkout v2.3.0
+    $ west update
+
+With Zephyr installed you may then need to configure your environment,
+for example by sourcing `zephyrproject/zephyr/zephyr-env.sh`.
+
+Once Zephyr is ready to use you can build the MicroPython port.
+In the port subdirectory `ports/zephyr/` run:
+
+    $ make BOARD=<board>
 
 If you don't specify BOARD, the default is `qemu_x86` (x86 target running
-in QEMU emulator). Consult Zephyr documentation above for the list of
-supported boards.
+in QEMU emulator).  Consult the Zephyr documentation above for the list of
+supported boards.  Board configuration files appearing in `ports/zephyr/boards/`
+correspond to boards that have been tested with MicroPython and may have
+additional options enabled, like filesystem support.
 
 
 Running
@@ -66,6 +87,10 @@ cf. for example QEMU networking requirements above; real hardware boards
 generally should not have any special requirements, unless there're known
 issues).
 
+For example, to deploy firmware on the FRDM-K64F board run:
+
+    $ make BOARD=frdm_k64f flash
+
 
 Quick example
 -------------
@@ -89,6 +114,19 @@ reference materials). To execute the above sample, copy it to clipboard, in
 MicroPython REPL enter "paste mode" using Ctrl+E, paste clipboard, press
 Ctrl+D to finish paste mode and start execution.
 
+To respond to Pin change IRQs, on a FRDM-K64F board run:
+
+    from machine import Pin
+
+    SW2 = Pin(("GPIO_2", 6), Pin.IN)
+    SW3 = Pin(("GPIO_0", 4), Pin.IN)
+
+    SW2.irq(lambda t: print("SW2 changed"))
+    SW3.irq(lambda t: print("SW3 changed"))
+
+    while True:
+        pass
+
 Example of using I2C to scan for I2C slaves:
 
     from machine import I2C

From 338b12d3c840ea56504c83d9c51e4d0f628684f4 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sat, 29 Aug 2020 13:58:20 +1000
Subject: [PATCH 0225/3533] LICENSE,docs: Update copyright year range to
 include 2020.

Signed-off-by: Damien George <damien@micropython.org>
---
 LICENSE      | 2 +-
 docs/conf.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/LICENSE b/LICENSE
index e6a54cf269947..8c5e4fe4c359a 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2013-2019 Damien P. George
+Copyright (c) 2013-2020 Damien P. George
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/docs/conf.py b/docs/conf.py
index 36f99cd2c441b..7dc039d6ca599 100755
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -66,7 +66,7 @@
 
 # General information about the project.
 project = 'MicroPython'
-copyright = '2014-2019, Damien P. George, Paul Sokolovsky, and contributors'
+copyright = '2014-2020, Damien P. George, Paul Sokolovsky, and contributors'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the

From 40d174ac7d1cc5c548756bb75b4f36b9b450b8bf Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sat, 29 Aug 2020 14:00:24 +1000
Subject: [PATCH 0226/3533] stm32/powerctrl.h: Include stdbool.h to get
 definition of bool.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/powerctrl.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/stm32/powerctrl.h b/ports/stm32/powerctrl.h
index 6e5f899a4cd1b..9f223e794a984 100644
--- a/ports/stm32/powerctrl.h
+++ b/ports/stm32/powerctrl.h
@@ -26,6 +26,7 @@
 #ifndef MICROPY_INCLUDED_STM32_POWERCTRL_H
 #define MICROPY_INCLUDED_STM32_POWERCTRL_H
 
+#include <stdbool.h>
 #include <stdint.h>
 
 void SystemClock_Config(void);

From 0c7354afaf91da3dac2c5ec471603c9e7acc8eac Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sat, 29 Aug 2020 14:04:59 +1000
Subject: [PATCH 0227/3533] tests: Split out complex reverse-op tests to
 separate test file.

So they can be skipped if __rOP__'s are not supported on the target.  Also
fix the typo in the complex_special_methods.py filename.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/float/complex_reverse_op.py                      | 10 ++++++++++
 ...ex_special_mehods.py => complex_special_methods.py} |  5 -----
 tests/run-tests                                        |  4 ++--
 3 files changed, 12 insertions(+), 7 deletions(-)
 create mode 100644 tests/float/complex_reverse_op.py
 rename tests/float/{complex_special_mehods.py => complex_special_methods.py} (62%)

diff --git a/tests/float/complex_reverse_op.py b/tests/float/complex_reverse_op.py
new file mode 100644
index 0000000000000..a7351949d0cea
--- /dev/null
+++ b/tests/float/complex_reverse_op.py
@@ -0,0 +1,10 @@
+# test complex interacting with special reverse methods
+
+
+class A:
+    def __radd__(self, x):
+        print("__radd__")
+        return 2
+
+
+print(1j + A())
diff --git a/tests/float/complex_special_mehods.py b/tests/float/complex_special_methods.py
similarity index 62%
rename from tests/float/complex_special_mehods.py
rename to tests/float/complex_special_methods.py
index 6789013fa6e0d..7e54905e495ad 100644
--- a/tests/float/complex_special_mehods.py
+++ b/tests/float/complex_special_methods.py
@@ -6,10 +6,5 @@ def __add__(self, x):
         print("__add__")
         return 1
 
-    def __radd__(self, x):
-        print("__radd__")
-        return 2
-
 
 print(A() + 1j)
-print(1j + A())
diff --git a/tests/run-tests b/tests/run-tests
index 49811d9b78845..a7b88ecdd3265 100755
--- a/tests/run-tests
+++ b/tests/run-tests
@@ -367,7 +367,7 @@ def run_tests(pyb, tests, args, result_dir):
     if not has_complex:
         skip_tests.add('float/complex1.py')
         skip_tests.add('float/complex1_intbig.py')
-        skip_tests.add('float/complex_special_mehods.py')
+        skip_tests.add('float/complex_special_methods.py')
         skip_tests.add('float/int_big_float.py')
         skip_tests.add('float/true_value.py')
         skip_tests.add('float/types.py')
@@ -476,7 +476,7 @@ def run_tests(pyb, tests, args, result_dir):
         skip_it |= skip_slice and is_slice
         skip_it |= skip_async and is_async
         skip_it |= skip_const and is_const
-        skip_it |= skip_revops and test_name.startswith("class_reverse_op")
+        skip_it |= skip_revops and "reverse_op" in test_name
         skip_it |= skip_io_module and is_io_module
 
         if args.list_tests:

From 06659077a81b85882254cf0953c33b27614e018e Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sat, 29 Aug 2020 15:14:29 +1000
Subject: [PATCH 0228/3533] all: Update Python code to conform to latest black
 formatting.

Updating to Black v20.8b1 there are two changes that affect the code in
this repository:

- If there is a trailing comma in a list (eg [], () or function call) then
  that list is now written out with one line per element.  So remove such
  trailing commas where the list should stay on one line.

- Spaces at the start of """ doc strings are removed.

Signed-off-by: Damien George <damien@micropython.org>
---
 examples/bluetooth/ble_simple_central.py      |  6 +++---
 examples/bluetooth/ble_simple_peripheral.py   | 12 +++++-------
 examples/bluetooth/ble_temperature.py         |  6 +++---
 examples/bluetooth/ble_temperature_central.py |  6 +++---
 examples/bluetooth/ble_uart_peripheral.py     | 12 +++++-------
 extmod/webrepl/manifest.py                    |  2 +-
 ports/cc3200/boards/make-pins.py              |  5 ++++-
 ports/nrf/boards/make-pins.py                 |  5 ++++-
 ports/stm32/boards/make-pins.py               |  5 ++++-
 ports/teensy/make-pins.py                     |  5 ++++-
 py/makemoduledefs.py                          |  6 +++---
 tests/extmod/uasyncio_gather.py               |  2 +-
 tests/extmod/uctypes_le.py                    |  2 +-
 tests/extmod/uctypes_native_le.py             |  2 +-
 tests/extmod/uctypes_sizeof_native.py         |  2 +-
 tests/float/cmath_fun.py                      |  2 +-
 tests/float/math_fun.py                       |  8 ++++----
 tests/float/math_fun_special.py               |  2 +-
 tools/mpy_ld.py                               |  2 +-
 19 files changed, 50 insertions(+), 42 deletions(-)

diff --git a/examples/bluetooth/ble_simple_central.py b/examples/bluetooth/ble_simple_central.py
index f6996366e3da1..f0a3297d322e1 100644
--- a/examples/bluetooth/ble_simple_central.py
+++ b/examples/bluetooth/ble_simple_central.py
@@ -74,7 +74,7 @@ def _reset(self):
     def _irq(self, event, data):
         if event == _IRQ_SCAN_RESULT:
             addr_type, addr, adv_type, rssi, adv_data = data
-            if adv_type in (_ADV_IND, _ADV_DIRECT_IND,) and _UART_SERVICE_UUID in decode_services(
+            if adv_type in (_ADV_IND, _ADV_DIRECT_IND) and _UART_SERVICE_UUID in decode_services(
                 adv_data
             ):
                 # Found a potential device, remember it and stop scanning.
@@ -97,14 +97,14 @@ def _irq(self, event, data):
 
         elif event == _IRQ_PERIPHERAL_CONNECT:
             # Connect successful.
-            conn_handle, addr_type, addr, = data
+            conn_handle, addr_type, addr = data
             if addr_type == self._addr_type and addr == self._addr:
                 self._conn_handle = conn_handle
                 self._ble.gattc_discover_services(self._conn_handle)
 
         elif event == _IRQ_PERIPHERAL_DISCONNECT:
             # Disconnect (either initiated by us or the remote end).
-            conn_handle, _, _, = data
+            conn_handle, _, _ = data
             if conn_handle == self._conn_handle:
                 # If it was initiated by us, it'll already be reset.
                 self._reset()
diff --git a/examples/bluetooth/ble_simple_peripheral.py b/examples/bluetooth/ble_simple_peripheral.py
index 08cd7fa98d69c..f5e7661926ba8 100644
--- a/examples/bluetooth/ble_simple_peripheral.py
+++ b/examples/bluetooth/ble_simple_peripheral.py
@@ -23,7 +23,7 @@
 )
 _UART_SERVICE = (
     _UART_UUID,
-    (_UART_TX, _UART_RX,),
+    (_UART_TX, _UART_RX),
 )
 
 
@@ -32,22 +32,20 @@ def __init__(self, ble, name="mpy-uart"):
         self._ble = ble
         self._ble.active(True)
         self._ble.irq(handler=self._irq)
-        ((self._handle_tx, self._handle_rx,),) = self._ble.gatts_register_services(
-            (_UART_SERVICE,)
-        )
+        ((self._handle_tx, self._handle_rx),) = self._ble.gatts_register_services((_UART_SERVICE,))
         self._connections = set()
         self._write_callback = None
-        self._payload = advertising_payload(name=name, services=[_UART_UUID],)
+        self._payload = advertising_payload(name=name, services=[_UART_UUID])
         self._advertise()
 
     def _irq(self, event, data):
         # Track connections so we can send notifications.
         if event == _IRQ_CENTRAL_CONNECT:
-            conn_handle, _, _, = data
+            conn_handle, _, _ = data
             print("New connection", conn_handle)
             self._connections.add(conn_handle)
         elif event == _IRQ_CENTRAL_DISCONNECT:
-            conn_handle, _, _, = data
+            conn_handle, _, _ = data
             print("Disconnected", conn_handle)
             self._connections.remove(conn_handle)
             # Start advertising again to allow a new connection.
diff --git a/examples/bluetooth/ble_temperature.py b/examples/bluetooth/ble_temperature.py
index 0e2da2239d50a..001a26b114a0a 100644
--- a/examples/bluetooth/ble_temperature.py
+++ b/examples/bluetooth/ble_temperature.py
@@ -46,15 +46,15 @@ def __init__(self, ble, name="mpy-temp"):
     def _irq(self, event, data):
         # Track connections so we can send notifications.
         if event == _IRQ_CENTRAL_CONNECT:
-            conn_handle, _, _, = data
+            conn_handle, _, _ = data
             self._connections.add(conn_handle)
         elif event == _IRQ_CENTRAL_DISCONNECT:
-            conn_handle, _, _, = data
+            conn_handle, _, _ = data
             self._connections.remove(conn_handle)
             # Start advertising again to allow a new connection.
             self._advertise()
         elif event == _IRQ_GATTS_INDICATE_DONE:
-            conn_handle, value_handle, status, = data
+            conn_handle, value_handle, status = data
 
     def set_temperature(self, temp_deg_c, notify=False, indicate=False):
         # Data is sint16 in degrees Celsius with a resolution of 0.01 degrees Celsius.
diff --git a/examples/bluetooth/ble_temperature_central.py b/examples/bluetooth/ble_temperature_central.py
index f9db225c16942..79830341789d4 100644
--- a/examples/bluetooth/ble_temperature_central.py
+++ b/examples/bluetooth/ble_temperature_central.py
@@ -87,7 +87,7 @@ def _reset(self):
     def _irq(self, event, data):
         if event == _IRQ_SCAN_RESULT:
             addr_type, addr, adv_type, rssi, adv_data = data
-            if adv_type in (_ADV_IND, _ADV_DIRECT_IND,) and _ENV_SENSE_UUID in decode_services(
+            if adv_type in (_ADV_IND, _ADV_DIRECT_IND) and _ENV_SENSE_UUID in decode_services(
                 adv_data
             ):
                 # Found a potential device, remember it and stop scanning.
@@ -110,14 +110,14 @@ def _irq(self, event, data):
 
         elif event == _IRQ_PERIPHERAL_CONNECT:
             # Connect successful.
-            conn_handle, addr_type, addr, = data
+            conn_handle, addr_type, addr = data
             if addr_type == self._addr_type and addr == self._addr:
                 self._conn_handle = conn_handle
                 self._ble.gattc_discover_services(self._conn_handle)
 
         elif event == _IRQ_PERIPHERAL_DISCONNECT:
             # Disconnect (either initiated by us or the remote end).
-            conn_handle, _, _, = data
+            conn_handle, _, _ = data
             if conn_handle == self._conn_handle:
                 # If it was initiated by us, it'll already be reset.
                 self._reset()
diff --git a/examples/bluetooth/ble_uart_peripheral.py b/examples/bluetooth/ble_uart_peripheral.py
index cc8d589b0e35f..59b35f7e6ad5e 100644
--- a/examples/bluetooth/ble_uart_peripheral.py
+++ b/examples/bluetooth/ble_uart_peripheral.py
@@ -20,7 +20,7 @@
 )
 _UART_SERVICE = (
     _UART_UUID,
-    (_UART_TX, _UART_RX,),
+    (_UART_TX, _UART_RX),
 )
 
 # org.bluetooth.characteristic.gap.appearance.xml
@@ -32,9 +32,7 @@ def __init__(self, ble, name="mpy-uart", rxbuf=100):
         self._ble = ble
         self._ble.active(True)
         self._ble.irq(handler=self._irq)
-        ((self._tx_handle, self._rx_handle,),) = self._ble.gatts_register_services(
-            (_UART_SERVICE,)
-        )
+        ((self._tx_handle, self._rx_handle),) = self._ble.gatts_register_services((_UART_SERVICE,))
         # Increase the size of the rx buffer and enable append mode.
         self._ble.gatts_set_buffer(self._rx_handle, rxbuf, True)
         self._connections = set()
@@ -50,16 +48,16 @@ def irq(self, handler):
     def _irq(self, event, data):
         # Track connections so we can send notifications.
         if event == _IRQ_CENTRAL_CONNECT:
-            conn_handle, _, _, = data
+            conn_handle, _, _ = data
             self._connections.add(conn_handle)
         elif event == _IRQ_CENTRAL_DISCONNECT:
-            conn_handle, _, _, = data
+            conn_handle, _, _ = data
             if conn_handle in self._connections:
                 self._connections.remove(conn_handle)
             # Start advertising again to allow a new connection.
             self._advertise()
         elif event == _IRQ_GATTS_WRITE:
-            conn_handle, value_handle, = data
+            conn_handle, value_handle = data
             if conn_handle in self._connections and value_handle == self._rx_handle:
                 self._rx_buffer += self._ble.gatts_read(self._rx_handle)
                 if self._handler:
diff --git a/extmod/webrepl/manifest.py b/extmod/webrepl/manifest.py
index 6ce7d85466c06..6eceb3eeb6c56 100644
--- a/extmod/webrepl/manifest.py
+++ b/extmod/webrepl/manifest.py
@@ -1 +1 @@
-freeze(".", ("webrepl.py", "webrepl_setup.py", "websocket_helper.py",))
+freeze(".", ("webrepl.py", "webrepl_setup.py", "websocket_helper.py"))
diff --git a/ports/cc3200/boards/make-pins.py b/ports/cc3200/boards/make-pins.py
index a204561cfbc32..0cf0d565606f2 100644
--- a/ports/cc3200/boards/make-pins.py
+++ b/ports/cc3200/boards/make-pins.py
@@ -216,7 +216,10 @@ def main():
         default="cc3200_af.csv",
     )
     parser.add_argument(
-        "-b", "--board", dest="board_filename", help="Specifies the board file",
+        "-b",
+        "--board",
+        dest="board_filename",
+        help="Specifies the board file",
     )
     parser.add_argument(
         "-p",
diff --git a/ports/nrf/boards/make-pins.py b/ports/nrf/boards/make-pins.py
index 56c56ae5f42f3..347ed15b21b31 100644
--- a/ports/nrf/boards/make-pins.py
+++ b/ports/nrf/boards/make-pins.py
@@ -381,7 +381,10 @@ def main():
         default="build/pins_af.py",
     )
     parser.add_argument(
-        "-b", "--board", dest="board_filename", help="Specifies the board file",
+        "-b",
+        "--board",
+        dest="board_filename",
+        help="Specifies the board file",
     )
     parser.add_argument(
         "-p",
diff --git a/ports/stm32/boards/make-pins.py b/ports/stm32/boards/make-pins.py
index 692387f404ea5..a91ed8a2c9150 100755
--- a/ports/stm32/boards/make-pins.py
+++ b/ports/stm32/boards/make-pins.py
@@ -515,7 +515,10 @@ def main():
         action="store_true",
     )
     parser.add_argument(
-        "-b", "--board", dest="board_filename", help="Specifies the board file",
+        "-b",
+        "--board",
+        dest="board_filename",
+        help="Specifies the board file",
     )
     parser.add_argument(
         "-p",
diff --git a/ports/teensy/make-pins.py b/ports/teensy/make-pins.py
index ddefae8521c50..4e46a8c244969 100755
--- a/ports/teensy/make-pins.py
+++ b/ports/teensy/make-pins.py
@@ -370,7 +370,10 @@ def main():
         default="build/pins_af.py",
     )
     parser.add_argument(
-        "-b", "--board", dest="board_filename", help="Specifies the board file",
+        "-b",
+        "--board",
+        dest="board_filename",
+        help="Specifies the board file",
     )
     parser.add_argument(
         "-p",
diff --git a/py/makemoduledefs.py b/py/makemoduledefs.py
index d718da6e02513..612f3d29a3660 100644
--- a/py/makemoduledefs.py
+++ b/py/makemoduledefs.py
@@ -17,7 +17,7 @@
 
 
 def find_c_file(obj_file, vpath):
-    """ Search vpaths for the c file that matches the provided object_file.
+    """Search vpaths for the c file that matches the provided object_file.
 
     :param str obj_file: object file to find the matching c file for
     :param List[str] vpath: List of base paths, similar to gcc vpath
@@ -36,7 +36,7 @@ def find_c_file(obj_file, vpath):
 
 
 def find_module_registrations(c_file):
-    """ Find any MP_REGISTER_MODULE definitions in the provided c file.
+    """Find any MP_REGISTER_MODULE definitions in the provided c file.
 
     :param str c_file: path to c file to check
     :return: List[(module_name, obj_module, enabled_define)]
@@ -52,7 +52,7 @@ def find_module_registrations(c_file):
 
 
 def generate_module_table_header(modules):
-    """ Generate header with module table entries for builtin modules.
+    """Generate header with module table entries for builtin modules.
 
     :param List[(module_name, obj_module, enabled_define)] modules: module defs
     :return: None
diff --git a/tests/extmod/uasyncio_gather.py b/tests/extmod/uasyncio_gather.py
index 2697a6278b08c..0e2948b07caa4 100644
--- a/tests/extmod/uasyncio_gather.py
+++ b/tests/extmod/uasyncio_gather.py
@@ -34,7 +34,7 @@ async def gather_task():
 
 async def main():
     # Simple gather with return values
-    print(await asyncio.gather(factorial("A", 2), factorial("B", 3), factorial("C", 4),))
+    print(await asyncio.gather(factorial("A", 2), factorial("B", 3), factorial("C", 4)))
 
     # Cancel a multi gather
     # TODO doesn't work, Task should not forward cancellation from gather to sub-task
diff --git a/tests/extmod/uctypes_le.py b/tests/extmod/uctypes_le.py
index 23f2af982a1a9..f69da30b61ea7 100644
--- a/tests/extmod/uctypes_le.py
+++ b/tests/extmod/uctypes_le.py
@@ -6,7 +6,7 @@
 
 desc = {
     "s0": uctypes.UINT16 | 0,
-    "sub": (0, {"b0": uctypes.UINT8 | 0, "b1": uctypes.UINT8 | 1,}),
+    "sub": (0, {"b0": uctypes.UINT8 | 0, "b1": uctypes.UINT8 | 1}),
     "arr": (uctypes.ARRAY | 0, uctypes.UINT8 | 2),
     "arr2": (uctypes.ARRAY | 0, 2, {"b": uctypes.UINT8 | 0}),
     "bitf0": uctypes.BFUINT16 | 0 | 0 << uctypes.BF_POS | 8 << uctypes.BF_LEN,
diff --git a/tests/extmod/uctypes_native_le.py b/tests/extmod/uctypes_native_le.py
index c161539c624f8..7958e5c22ada9 100644
--- a/tests/extmod/uctypes_native_le.py
+++ b/tests/extmod/uctypes_native_le.py
@@ -16,7 +16,7 @@
 
 desc = {
     "s0": uctypes.UINT16 | 0,
-    "sub": (0, {"b0": uctypes.UINT8 | 0, "b1": uctypes.UINT8 | 1,}),
+    "sub": (0, {"b0": uctypes.UINT8 | 0, "b1": uctypes.UINT8 | 1}),
     "arr": (uctypes.ARRAY | 0, uctypes.UINT8 | 2),
     "arr2": (uctypes.ARRAY | 0, 2, {"b": uctypes.UINT8 | 0}),
     "bitf0": uctypes.BFUINT16 | 0 | 0 << uctypes.BF_POS | 8 << uctypes.BF_LEN,
diff --git a/tests/extmod/uctypes_sizeof_native.py b/tests/extmod/uctypes_sizeof_native.py
index 352c191e0d8a6..157e554b09d47 100644
--- a/tests/extmod/uctypes_sizeof_native.py
+++ b/tests/extmod/uctypes_sizeof_native.py
@@ -28,7 +28,7 @@
     "b": uctypes.UINT32 | 4,
     "c": uctypes.UINT8 | 8,
     "d": uctypes.UINT32 | 0,
-    "sub": (4, {"b0": uctypes.UINT8 | 0, "b1": uctypes.UINT8 | 1,}),
+    "sub": (4, {"b0": uctypes.UINT8 | 0, "b1": uctypes.UINT8 | 1}),
 }
 
 assert uctypes.sizeof(S5) == 12
diff --git a/tests/float/cmath_fun.py b/tests/float/cmath_fun.py
index 15b72e7a6203b..39011733b02b4 100644
--- a/tests/float/cmath_fun.py
+++ b/tests/float/cmath_fun.py
@@ -22,7 +22,7 @@
             test_values_non_zero.append(complex(r, -i))
         if r != 0.0 and i != 0.0:
             test_values_non_zero.append(complex(-r, -i))
-test_values = [complex(0.0, 0.0),] + test_values_non_zero
+test_values = [complex(0.0, 0.0)] + test_values_non_zero
 print(test_values)
 
 functions = [
diff --git a/tests/float/math_fun.py b/tests/float/math_fun.py
index 7b6bb86489b7d..0d443a4754521 100644
--- a/tests/float/math_fun.py
+++ b/tests/float/math_fun.py
@@ -62,10 +62,10 @@
         copysign,
         [(23.0, 42.0), (-23.0, 42.0), (23.0, -42.0), (-23.0, -42.0), (1.0, 0.0), (1.0, -0.0)],
     ),
-    ("pow", pow, ((1.0, 0.0), (0.0, 1.0), (2.0, 0.5), (-3.0, 5.0), (-3.0, -4.0),)),
-    ("atan2", atan2, ((1.0, 0.0), (0.0, 1.0), (2.0, 0.5), (-3.0, 5.0), (-3.0, -4.0),)),
-    ("fmod", fmod, ((1.0, 1.0), (0.0, 1.0), (2.0, 0.5), (-3.0, 5.0), (-3.0, -4.0),)),
-    ("ldexp", ldexp, ((1.0, 0), (0.0, 1), (2.0, 2), (3.0, -2), (-3.0, -4),)),
+    ("pow", pow, ((1.0, 0.0), (0.0, 1.0), (2.0, 0.5), (-3.0, 5.0), (-3.0, -4.0))),
+    ("atan2", atan2, ((1.0, 0.0), (0.0, 1.0), (2.0, 0.5), (-3.0, 5.0), (-3.0, -4.0))),
+    ("fmod", fmod, ((1.0, 1.0), (0.0, 1.0), (2.0, 0.5), (-3.0, 5.0), (-3.0, -4.0))),
+    ("ldexp", ldexp, ((1.0, 0), (0.0, 1), (2.0, 2), (3.0, -2), (-3.0, -4))),
     (
         "log",
         log,
diff --git a/tests/float/math_fun_special.py b/tests/float/math_fun_special.py
index c101a7e5019db..614470c0f15dd 100644
--- a/tests/float/math_fun_special.py
+++ b/tests/float/math_fun_special.py
@@ -40,7 +40,7 @@
     ("erf", erf, test_values),
     ("erfc", erfc, test_values),
     ("gamma", gamma, pos_test_values),
-    ("lgamma", lgamma, pos_test_values + [50.0, 100.0,]),
+    ("lgamma", lgamma, pos_test_values + [50.0, 100.0]),
 ]
 
 for function_name, function, test_vals in functions:
diff --git a/tools/mpy_ld.py b/tools/mpy_ld.py
index 32bc176cb71c4..774966a7f68a0 100755
--- a/tools/mpy_ld.py
+++ b/tools/mpy_ld.py
@@ -908,7 +908,7 @@ def build_mpy(env, entry_offset, fmpy, native_qstr_vals, native_qstr_objs):
     # MPY: header
     out.write_bytes(
         bytearray(
-            [ord("M"), MPY_VERSION, env.arch.mpy_feature, MP_SMALL_INT_BITS, QSTR_WINDOW_SIZE,]
+            [ord("M"), MPY_VERSION, env.arch.mpy_feature, MP_SMALL_INT_BITS, QSTR_WINDOW_SIZE]
         )
     )
 

From d1995e50ebda074f8151609bb4c95d4c31072513 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sun, 30 Aug 2020 13:20:51 +1000
Subject: [PATCH 0229/3533] extmod/modlwip: Fix error return for TCP recv when
 not connected.

This commit fixes the cases when a TCP socket is in STATE_NEW,
STATE_LISTENING or STATE_CONNECTING and recv() is called on it.  It now
raises ENOTCONN instead of a random error code due to it previously
indexing beyond the start of error_lookup_table[].

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/modlwip.c                  |  7 +++++--
 tests/extmod/usocket_tcp_basic.py | 17 +++++++++++++++++
 2 files changed, 22 insertions(+), 2 deletions(-)
 create mode 100644 tests/extmod/usocket_tcp_basic.py

diff --git a/extmod/modlwip.c b/extmod/modlwip.c
index 216e81749d1c3..1d557a6a84b5a 100644
--- a/extmod/modlwip.c
+++ b/extmod/modlwip.c
@@ -757,8 +757,11 @@ STATIC mp_uint_t lwip_tcp_receive(lwip_socket_obj_t *socket, byte *buf, mp_uint_
                 return 0;
             }
         } else if (socket->state != STATE_CONNECTED) {
-            assert(socket->state < 0);
-            *_errno = error_lookup_table[-socket->state];
+            if (socket->state >= STATE_NEW) {
+                *_errno = MP_ENOTCONN;
+            } else {
+                *_errno = error_lookup_table[-socket->state];
+            }
             return -1;
         }
     }
diff --git a/tests/extmod/usocket_tcp_basic.py b/tests/extmod/usocket_tcp_basic.py
new file mode 100644
index 0000000000000..368dfe3c98f4a
--- /dev/null
+++ b/tests/extmod/usocket_tcp_basic.py
@@ -0,0 +1,17 @@
+# Test basic, stand-alone TCP socket functionality
+
+try:
+    import usocket as socket, uerrno as errno
+except ImportError:
+    try:
+        import socket, errno
+    except ImportError:
+        print("SKIP")
+        raise SystemExit
+
+# recv() on a fresh socket should raise ENOTCONN
+s = socket.socket()
+try:
+    s.recv(1)
+except OSError as er:
+    print("ENOTCONN:", er.args[0] == errno.ENOTCONN)

From 836bca9956d9f02b9c0f6f396dc76cbd1586de10 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sun, 30 Aug 2020 13:48:26 +1000
Subject: [PATCH 0230/3533] unix/variants: Fix fast and freedos variants so
 they build again.

This regressed in bd2fff66875ed5adab8ce163a7f2bdafbd0332f9

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/unix/variants/fast/mpconfigvariant.h    | 2 --
 ports/unix/variants/fast/mpconfigvariant.mk   | 2 +-
 ports/unix/variants/freedos/mpconfigvariant.h | 2 --
 3 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/ports/unix/variants/fast/mpconfigvariant.h b/ports/unix/variants/fast/mpconfigvariant.h
index 6d73275fdebfc..8a531b056ab71 100644
--- a/ports/unix/variants/fast/mpconfigvariant.h
+++ b/ports/unix/variants/fast/mpconfigvariant.h
@@ -32,5 +32,3 @@
 // 91 is a magic number proposed by @dpgeorge, which make pystone run ~ at tie
 // with CPython 3.4.
 #define MICROPY_MODULE_DICT_SIZE (91)
-
-#include "variants/DEV/mpconfigvariant.h"
diff --git a/ports/unix/variants/fast/mpconfigvariant.mk b/ports/unix/variants/fast/mpconfigvariant.mk
index d67f7c8f38388..595e5756457c9 100644
--- a/ports/unix/variants/fast/mpconfigvariant.mk
+++ b/ports/unix/variants/fast/mpconfigvariant.mk
@@ -1,6 +1,6 @@
 # build synthetically fast interpreter for benchmarking
 
-COPT += "-fno-crossjumping -O2"
+COPT += -fno-crossjumping -O2
 
 PROG = micropython-fast
 
diff --git a/ports/unix/variants/freedos/mpconfigvariant.h b/ports/unix/variants/freedos/mpconfigvariant.h
index 338b34492de7f..562c783ca35fb 100644
--- a/ports/unix/variants/freedos/mpconfigvariant.h
+++ b/ports/unix/variants/freedos/mpconfigvariant.h
@@ -36,5 +36,3 @@
 #undef _DIRENT_HAVE_D_INO
 
 #define MICROPY_USE_INTERNAL_ERRNO  (1)
-
-#include "variants/DEV/mpconfigvariant.h"

From 40153b800a8324f6cf3e47dd71cafcf90c3c4718 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 31 Aug 2020 00:49:19 +1000
Subject: [PATCH 0231/3533] esp32/mphalport: Fix mp_hal_time_ns offset.

gettimeofday returns seconds since 2000/1/1 so needs to be adjusted to
seconds since 1970/1/1 to give the correct return value of mp_hal_time_ns.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/mphalport.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/ports/esp32/mphalport.c b/ports/esp32/mphalport.c
index 5e526df6673cb..3a46edf1f75c1 100644
--- a/ports/esp32/mphalport.c
+++ b/ports/esp32/mphalport.c
@@ -45,6 +45,7 @@
 #include "py/mpstate.h"
 #include "py/mphal.h"
 #include "extmod/misc.h"
+#include "lib/timeutils/timeutils.h"
 #include "lib/utils/pyexec.h"
 #include "mphalport.h"
 
@@ -199,7 +200,10 @@ void mp_hal_delay_us(uint32_t us) {
 uint64_t mp_hal_time_ns(void) {
     struct timeval tv;
     gettimeofday(&tv, NULL);
-    return (uint64_t)tv.tv_sec * 1000000000ULL + (uint64_t)tv.tv_usec * 1000ULL;
+    // gettimeofday returns seconds since 2000/1/1
+    uint64_t ns = timeutils_seconds_since_2000_to_nanoseconds_since_1970(tv.tv_sec);
+    ns += (uint64_t)tv.tv_usec * 1000ULL;
+    return ns;
 }
 
 // Wake up the main task if it is sleeping

From c70e59965977df97d1134f0dcadb9cd4ed58139f Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 31 Aug 2020 14:25:20 +1000
Subject: [PATCH 0232/3533] extmod/vfs: Support larger integer range in VFS
 stat time fields.

On ports like unix where the Epoch is 1970/1/1 and atime/mtime/ctime are in
seconds since the Epoch, this value will overflow a small-int on 32-bit
systems.  So far this is only an issue on 32-bit unix builds that use the
VFS layer (eg dev and coverage unix variants) but the fix (using
mp_obj_new_int_from_uint instead of MP_OBJ_NEW_SMALL_INT) is there for all
ports so as to not complicate the code, and because they will need the
range one day.

Also apply a similar fix to other fields in VfsPosix.stat because they may
also be large.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/vfs_fat.c   |  6 +++---
 extmod/vfs_lfsx.c  |  6 +++---
 extmod/vfs_posix.c | 18 +++++++++---------
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/extmod/vfs_fat.c b/extmod/vfs_fat.c
index e7af4057b7433..79b0fc119b2fc 100644
--- a/extmod/vfs_fat.c
+++ b/extmod/vfs_fat.c
@@ -326,9 +326,9 @@ STATIC mp_obj_t fat_vfs_stat(mp_obj_t vfs_in, mp_obj_t path_in) {
     t->items[4] = MP_OBJ_NEW_SMALL_INT(0); // st_uid
     t->items[5] = MP_OBJ_NEW_SMALL_INT(0); // st_gid
     t->items[6] = mp_obj_new_int_from_uint(fno.fsize); // st_size
-    t->items[7] = MP_OBJ_NEW_SMALL_INT(seconds); // st_atime
-    t->items[8] = MP_OBJ_NEW_SMALL_INT(seconds); // st_mtime
-    t->items[9] = MP_OBJ_NEW_SMALL_INT(seconds); // st_ctime
+    t->items[7] = mp_obj_new_int_from_uint(seconds); // st_atime
+    t->items[8] = mp_obj_new_int_from_uint(seconds); // st_mtime
+    t->items[9] = mp_obj_new_int_from_uint(seconds); // st_ctime
 
     return MP_OBJ_FROM_PTR(t);
 }
diff --git a/extmod/vfs_lfsx.c b/extmod/vfs_lfsx.c
index 511b741b0dec1..9f5d9ce6db7f7 100644
--- a/extmod/vfs_lfsx.c
+++ b/extmod/vfs_lfsx.c
@@ -377,9 +377,9 @@ STATIC mp_obj_t MP_VFS_LFSx(stat)(mp_obj_t self_in, mp_obj_t path_in) {
     t->items[4] = MP_OBJ_NEW_SMALL_INT(0); // st_uid
     t->items[5] = MP_OBJ_NEW_SMALL_INT(0); // st_gid
     t->items[6] = mp_obj_new_int_from_uint(info.size); // st_size
-    t->items[7] = MP_OBJ_NEW_SMALL_INT(mtime); // st_atime
-    t->items[8] = MP_OBJ_NEW_SMALL_INT(mtime); // st_mtime
-    t->items[9] = MP_OBJ_NEW_SMALL_INT(mtime); // st_ctime
+    t->items[7] = mp_obj_new_int_from_uint(mtime); // st_atime
+    t->items[8] = mp_obj_new_int_from_uint(mtime); // st_mtime
+    t->items[9] = mp_obj_new_int_from_uint(mtime); // st_ctime
 
     return MP_OBJ_FROM_PTR(t);
 }
diff --git a/extmod/vfs_posix.c b/extmod/vfs_posix.c
index f14f56e81ec82..719afe28fe87f 100644
--- a/extmod/vfs_posix.c
+++ b/extmod/vfs_posix.c
@@ -295,15 +295,15 @@ STATIC mp_obj_t vfs_posix_stat(mp_obj_t self_in, mp_obj_t path_in) {
     MP_HAL_RETRY_SYSCALL(ret, stat(path, &sb), mp_raise_OSError(err));
     mp_obj_tuple_t *t = MP_OBJ_TO_PTR(mp_obj_new_tuple(10, NULL));
     t->items[0] = MP_OBJ_NEW_SMALL_INT(sb.st_mode);
-    t->items[1] = MP_OBJ_NEW_SMALL_INT(sb.st_ino);
-    t->items[2] = MP_OBJ_NEW_SMALL_INT(sb.st_dev);
-    t->items[3] = MP_OBJ_NEW_SMALL_INT(sb.st_nlink);
-    t->items[4] = MP_OBJ_NEW_SMALL_INT(sb.st_uid);
-    t->items[5] = MP_OBJ_NEW_SMALL_INT(sb.st_gid);
-    t->items[6] = MP_OBJ_NEW_SMALL_INT(sb.st_size);
-    t->items[7] = MP_OBJ_NEW_SMALL_INT(sb.st_atime);
-    t->items[8] = MP_OBJ_NEW_SMALL_INT(sb.st_mtime);
-    t->items[9] = MP_OBJ_NEW_SMALL_INT(sb.st_ctime);
+    t->items[1] = mp_obj_new_int_from_uint(sb.st_ino);
+    t->items[2] = mp_obj_new_int_from_uint(sb.st_dev);
+    t->items[3] = mp_obj_new_int_from_uint(sb.st_nlink);
+    t->items[4] = mp_obj_new_int_from_uint(sb.st_uid);
+    t->items[5] = mp_obj_new_int_from_uint(sb.st_gid);
+    t->items[6] = mp_obj_new_int_from_uint(sb.st_size);
+    t->items[7] = mp_obj_new_int_from_uint(sb.st_atime);
+    t->items[8] = mp_obj_new_int_from_uint(sb.st_mtime);
+    t->items[9] = mp_obj_new_int_from_uint(sb.st_ctime);
     return MP_OBJ_FROM_PTR(t);
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_2(vfs_posix_stat_obj, vfs_posix_stat);

From 0385b21597a3e5dc3d1a84cd37848fc2ac2a0e20 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 31 Aug 2020 14:39:02 +1000
Subject: [PATCH 0233/3533] unix/modos: Support larger integer range in
 uos.stat fields.

On 32-bit builds these stat fields will overflow a small-int, so use
mp_obj_new_int_from_uint to construct the int object.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/unix/modos.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/ports/unix/modos.c b/ports/unix/modos.c
index 82b1b11425679..5e719c5736c1c 100644
--- a/ports/unix/modos.c
+++ b/ports/unix/modos.c
@@ -58,15 +58,15 @@ STATIC mp_obj_t mod_os_stat(mp_obj_t path_in) {
 
     mp_obj_tuple_t *t = MP_OBJ_TO_PTR(mp_obj_new_tuple(10, NULL));
     t->items[0] = MP_OBJ_NEW_SMALL_INT(sb.st_mode);
-    t->items[1] = MP_OBJ_NEW_SMALL_INT(sb.st_ino);
-    t->items[2] = MP_OBJ_NEW_SMALL_INT(sb.st_dev);
-    t->items[3] = MP_OBJ_NEW_SMALL_INT(sb.st_nlink);
-    t->items[4] = MP_OBJ_NEW_SMALL_INT(sb.st_uid);
-    t->items[5] = MP_OBJ_NEW_SMALL_INT(sb.st_gid);
+    t->items[1] = mp_obj_new_int_from_uint(sb.st_ino);
+    t->items[2] = mp_obj_new_int_from_uint(sb.st_dev);
+    t->items[3] = mp_obj_new_int_from_uint(sb.st_nlink);
+    t->items[4] = mp_obj_new_int_from_uint(sb.st_uid);
+    t->items[5] = mp_obj_new_int_from_uint(sb.st_gid);
     t->items[6] = mp_obj_new_int_from_uint(sb.st_size);
-    t->items[7] = MP_OBJ_NEW_SMALL_INT(sb.st_atime);
-    t->items[8] = MP_OBJ_NEW_SMALL_INT(sb.st_mtime);
-    t->items[9] = MP_OBJ_NEW_SMALL_INT(sb.st_ctime);
+    t->items[7] = mp_obj_new_int_from_uint(sb.st_atime);
+    t->items[8] = mp_obj_new_int_from_uint(sb.st_mtime);
+    t->items[9] = mp_obj_new_int_from_uint(sb.st_ctime);
     return MP_OBJ_FROM_PTR(t);
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_os_stat_obj, mod_os_stat);

From 2a72e90ab8969b69304d84aa7070720d63c60d06 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 31 Aug 2020 14:55:54 +1000
Subject: [PATCH 0234/3533] extmod/vfs: Add option to use 1970 as Epoch.

By setting MICROPY_EPOCH_IS_1970 a port can opt to use 1970/1/1 as the
Epoch for timestamps returned by stat().  And this setting is enabled on
the unix and windows ports because that's what they use.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/vfs_fat.c             | 3 +++
 extmod/vfs_lfsx.c            | 3 +++
 ports/unix/mpconfigport.h    | 3 +++
 ports/windows/mpconfigport.h | 3 +++
 4 files changed, 12 insertions(+)

diff --git a/extmod/vfs_fat.c b/extmod/vfs_fat.c
index 79b0fc119b2fc..ace5ba5b6547f 100644
--- a/extmod/vfs_fat.c
+++ b/extmod/vfs_fat.c
@@ -319,6 +319,9 @@ STATIC mp_obj_t fat_vfs_stat(mp_obj_t vfs_in, mp_obj_t path_in) {
         (fno.ftime >> 5) & 0x3f,
         2 * (fno.ftime & 0x1f)
         );
+    #if MICROPY_EPOCH_IS_1970
+    seconds += TIMEUTILS_SECONDS_1970_TO_2000;
+    #endif
     t->items[0] = MP_OBJ_NEW_SMALL_INT(mode); // st_mode
     t->items[1] = MP_OBJ_NEW_SMALL_INT(0); // st_ino
     t->items[2] = MP_OBJ_NEW_SMALL_INT(0); // st_dev
diff --git a/extmod/vfs_lfsx.c b/extmod/vfs_lfsx.c
index 9f5d9ce6db7f7..d00df53104f6f 100644
--- a/extmod/vfs_lfsx.c
+++ b/extmod/vfs_lfsx.c
@@ -366,6 +366,9 @@ STATIC mp_obj_t MP_VFS_LFSx(stat)(mp_obj_t self_in, mp_obj_t path_in) {
             ns = ns << 8 | mtime_buf[i - 1];
         }
         mtime = timeutils_seconds_since_2000_from_nanoseconds_since_1970(ns);
+        #if MICROPY_EPOCH_IS_1970
+        mtime += TIMEUTILS_SECONDS_1970_TO_2000;
+        #endif
     }
     #endif
 
diff --git a/ports/unix/mpconfigport.h b/ports/unix/mpconfigport.h
index f3c61c18f100d..08605842fd5bd 100644
--- a/ports/unix/mpconfigport.h
+++ b/ports/unix/mpconfigport.h
@@ -176,6 +176,9 @@
 #define MICROPY_ERROR_PRINTER       (&mp_stderr_print)
 #define MICROPY_PY_STR_BYTES_CMP_WARN (1)
 
+// VFS stat functions should return time values relative to 1970/1/1
+#define MICROPY_EPOCH_IS_1970       (1)
+
 extern const struct _mp_print_t mp_stderr_print;
 
 #if !(defined(MICROPY_GCREGS_SETJMP) || defined(__x86_64__) || defined(__i386__) || defined(__thumb2__) || defined(__thumb__) || defined(__arm__))
diff --git a/ports/windows/mpconfigport.h b/ports/windows/mpconfigport.h
index fa09dda7527e0..30389c700eac3 100644
--- a/ports/windows/mpconfigport.h
+++ b/ports/windows/mpconfigport.h
@@ -123,6 +123,9 @@
 #define MICROPY_WARNINGS            (1)
 #define MICROPY_PY_STR_BYTES_CMP_WARN (1)
 
+// VFS stat functions should return time values relative to 1970/1/1
+#define MICROPY_EPOCH_IS_1970       (1)
+
 extern const struct _mp_print_t mp_stderr_print;
 
 #ifdef _MSC_VER

From a909c215879d94e7e76046f71f38e881949fe7dc Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 31 Aug 2020 14:59:10 +1000
Subject: [PATCH 0235/3533] unix/fatfs_port: Fix month offset in timestamp
 calculation.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/unix/fatfs_port.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/unix/fatfs_port.c b/ports/unix/fatfs_port.c
index 4ec5b919ab54b..9e0f444ce2576 100644
--- a/ports/unix/fatfs_port.c
+++ b/ports/unix/fatfs_port.c
@@ -5,7 +5,7 @@ DWORD get_fattime(void) {
     time_t now = time(NULL);
     struct tm *tm = localtime(&now);
     return ((1900 + tm->tm_year - 1980) << 25)
-           | (tm->tm_mon << 21)
+           | ((tm->tm_mon + 1) << 21)
            | (tm->tm_mday << 16)
            | (tm->tm_hour << 11)
            | (tm->tm_min << 5)

From 0e6ef403598a7a5fbc44b28e43c264c24aa02416 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 31 Aug 2020 15:01:10 +1000
Subject: [PATCH 0236/3533] tests/extmod: Add tests for verifying FAT and
 littlefs mtime values.

Verifies mtime timestamps on files match the value returned by time.time().

Also update vfs_fat_ramdisk.py so it doesn't check FAT timestamp of the
root, because that may change across runs/ports.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/extmod/vfs_fat_mtime.py       | 74 +++++++++++++++++++++++++++++
 tests/extmod/vfs_fat_mtime.py.exp   |  3 ++
 tests/extmod/vfs_fat_ramdisk.py     |  2 +-
 tests/extmod/vfs_fat_ramdisk.py.exp |  2 +-
 tests/extmod/vfs_lfs_mtime.py       |  9 +++-
 tests/extmod/vfs_lfs_mtime.py.exp   |  1 +
 6 files changed, 88 insertions(+), 3 deletions(-)
 create mode 100644 tests/extmod/vfs_fat_mtime.py
 create mode 100644 tests/extmod/vfs_fat_mtime.py.exp

diff --git a/tests/extmod/vfs_fat_mtime.py b/tests/extmod/vfs_fat_mtime.py
new file mode 100644
index 0000000000000..d8fd66b75f769
--- /dev/null
+++ b/tests/extmod/vfs_fat_mtime.py
@@ -0,0 +1,74 @@
+# Test for VfsFat using a RAM device, mtime feature
+
+try:
+    import utime, uos
+
+    utime.time
+    utime.sleep
+    uos.VfsFat
+except (ImportError, AttributeError):
+    print("SKIP")
+    raise SystemExit
+
+
+class RAMBlockDevice:
+    ERASE_BLOCK_SIZE = 512
+
+    def __init__(self, blocks):
+        self.data = bytearray(blocks * self.ERASE_BLOCK_SIZE)
+
+    def readblocks(self, block, buf):
+        addr = block * self.ERASE_BLOCK_SIZE
+        for i in range(len(buf)):
+            buf[i] = self.data[addr + i]
+
+    def writeblocks(self, block, buf):
+        addr = block * self.ERASE_BLOCK_SIZE
+        for i in range(len(buf)):
+            self.data[addr + i] = buf[i]
+
+    def ioctl(self, op, arg):
+        if op == 4:  # block count
+            return len(self.data) // self.ERASE_BLOCK_SIZE
+        if op == 5:  # block size
+            return self.ERASE_BLOCK_SIZE
+
+
+def test(bdev, vfs_class):
+    print("test", vfs_class)
+
+    # Initial format of block device.
+    vfs_class.mkfs(bdev)
+
+    # construction
+    vfs = vfs_class(bdev)
+
+    # Create an empty file, should have a timestamp.
+    current_time = int(utime.time())
+    vfs.open("test1", "wt").close()
+
+    # Wait 2 seconds so mtime will increase (FAT has 2 second resolution).
+    utime.sleep(2)
+
+    # Create another empty file, should have a timestamp.
+    vfs.open("test2", "wt").close()
+
+    # Stat the files and check mtime is non-zero.
+    stat1 = vfs.stat("test1")
+    stat2 = vfs.stat("test2")
+    print(stat1[8] != 0, stat2[8] != 0)
+
+    # Check that test1 has mtime which matches time.time() at point of creation.
+    # TODO this currently fails on the unix port because FAT stores timestamps
+    # in localtime and stat() is UTC based.
+    # print(current_time - 1 <= stat1[8] <= current_time + 1)
+
+    # Check that test1 is older than test2.
+    print(stat1[8] < stat2[8])
+
+    # Unmount.
+    vfs.umount()
+
+
+bdev = RAMBlockDevice(50)
+test(bdev, uos.VfsFat)
diff --git a/tests/extmod/vfs_fat_mtime.py.exp b/tests/extmod/vfs_fat_mtime.py.exp
new file mode 100644
index 0000000000000..55550b9834e5b
--- /dev/null
+++ b/tests/extmod/vfs_fat_mtime.py.exp
@@ -0,0 +1,3 @@
+test <class 'VfsFat'>
+True True
+True
diff --git a/tests/extmod/vfs_fat_ramdisk.py b/tests/extmod/vfs_fat_ramdisk.py
index 5f758bf89c87a..9a68d94fedefa 100644
--- a/tests/extmod/vfs_fat_ramdisk.py
+++ b/tests/extmod/vfs_fat_ramdisk.py
@@ -63,7 +63,7 @@ def ioctl(self, op, arg):
     f.write("hello!")
 print(list(vfs.ilistdir()))
 
-print("stat root:", vfs.stat("/"))
+print("stat root:", vfs.stat("/")[:-3])  # timestamps differ across runs
 print("stat file:", vfs.stat("foo_file.txt")[:-3])  # timestamps differ across runs
 
 print(b"FOO_FILETXT" in bdev.data)
diff --git a/tests/extmod/vfs_fat_ramdisk.py.exp b/tests/extmod/vfs_fat_ramdisk.py.exp
index ef6cf1e72b62f..384fa64c76510 100644
--- a/tests/extmod/vfs_fat_ramdisk.py.exp
+++ b/tests/extmod/vfs_fat_ramdisk.py.exp
@@ -4,7 +4,7 @@ statvfs: (512, 512, 16, 16, 16, 0, 0, 0, 0, 255)
 getcwd: /
 True
 [('foo_file.txt', 32768, 0, 6)]
-stat root: (16384, 0, 0, 0, 0, 0, 0, 0, 0, 0)
+stat root: (16384, 0, 0, 0, 0, 0, 0)
 stat file: (32768, 0, 0, 0, 0, 0, 6)
 True
 True
diff --git a/tests/extmod/vfs_lfs_mtime.py b/tests/extmod/vfs_lfs_mtime.py
index 0108076884055..bacdd2246c6d6 100644
--- a/tests/extmod/vfs_lfs_mtime.py
+++ b/tests/extmod/vfs_lfs_mtime.py
@@ -3,6 +3,7 @@
 try:
     import utime, uos
 
+    utime.time
     utime.sleep
     uos.VfsLfs2
 except (ImportError, AttributeError):
@@ -46,6 +47,7 @@ def test(bdev, vfs_class):
     vfs = vfs_class(bdev, mtime=True)
 
     # Create an empty file, should have a timestamp.
+    current_time = int(utime.time())
     vfs.open("test1", "wt").close()
 
     # Wait 1 second so mtime will increase by at least 1.
@@ -54,10 +56,15 @@ def test(bdev, vfs_class):
     # Create another empty file, should have a timestamp.
     vfs.open("test2", "wt").close()
 
-    # Stat the files and check that test1 is older than test2.
+    # Stat the files and check mtime is non-zero.
     stat1 = vfs.stat("test1")
     stat2 = vfs.stat("test2")
     print(stat1[8] != 0, stat2[8] != 0)
+
+    # Check that test1 has mtime which matches time.time() at point of creation.
+    print(current_time <= stat1[8] <= current_time + 1)
+
+    # Check that test1 is older than test2.
     print(stat1[8] < stat2[8])
 
     # Wait 1 second so mtime will increase by at least 1.
diff --git a/tests/extmod/vfs_lfs_mtime.py.exp b/tests/extmod/vfs_lfs_mtime.py.exp
index 2e3d7491bcbd8..cf6455c04015b 100644
--- a/tests/extmod/vfs_lfs_mtime.py.exp
+++ b/tests/extmod/vfs_lfs_mtime.py.exp
@@ -4,6 +4,7 @@ True True
 True
 True
 True
+True
 mtime=False
 True
 True

From b0932fcf2e2f9a81abf7737ed4b2573bd9ad4a49 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 2 Sep 2020 12:01:26 +1000
Subject: [PATCH 0237/3533] all: Bump version to 1.13.

Signed-off-by: Damien George <damien@micropython.org>
---
 docs/conf.py  | 2 +-
 py/mpconfig.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/conf.py b/docs/conf.py
index 7dc039d6ca599..460886b4da2e8 100755
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -74,7 +74,7 @@
 #
 # We don't follow "The short X.Y version" vs "The full version, including alpha/beta/rc tags"
 # breakdown, so use the same version identifier for both to avoid confusion.
-version = release = '1.12'
+version = release = '1.13'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/py/mpconfig.h b/py/mpconfig.h
index 3d9ce8bb55c95..ae4cabfdcf0f2 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -28,7 +28,7 @@
 
 // Current version of MicroPython
 #define MICROPY_VERSION_MAJOR 1
-#define MICROPY_VERSION_MINOR 12
+#define MICROPY_VERSION_MINOR 13
 #define MICROPY_VERSION_MICRO 0
 
 // Combined version as a 32-bit number for convenience

From 40ad8f1666b265dafc7844d765f45cfae4b6299f Mon Sep 17 00:00:00 2001
From: stijn <stijn@ignitron.net>
Date: Thu, 18 Jun 2020 11:19:14 +0200
Subject: [PATCH 0238/3533] all: Rename "sys" module to "usys".

This is consistent with the other 'micro' modules and allows implementing
additional features in Python via e.g. micropython-lib's sys.

Note this is a breaking change (not backwards compatible) for ports which
do not enable weak links, as "import sys" must now be replaced with
"import usys".
---
 docs/library/index.rst                             |  2 +-
 docs/library/{sys.rst => usys.rst}                 | 14 +++++++-------
 drivers/nrf24l01/nrf24l01test.py                   | 10 +++++-----
 extmod/webrepl/websocket_helper.py                 |  5 ++++-
 py/objmodule.c                                     |  2 +-
 tests/basics/async_await2.py                       |  5 ++++-
 tests/basics/async_for2.py                         |  5 ++++-
 tests/basics/async_with2.py                        |  5 ++++-
 tests/basics/attrtuple1.py                         |  5 ++++-
 tests/basics/builtin_callable.py                   |  5 ++++-
 tests/basics/builtin_dir.py                        |  5 ++++-
 tests/basics/int_big1.py                           |  5 ++++-
 tests/basics/module2.py                            |  4 ++--
 tests/basics/python34.py                           |  6 +++---
 tests/basics/string_compare.py                     |  5 ++++-
 tests/basics/sys1.py                               |  5 ++++-
 tests/basics/sys_exit.py                           |  5 ++++-
 tests/basics/sys_getsizeof.py                      |  5 ++++-
 tests/extmod/uctypes_array_assign_native_le.py     |  4 ++--
 .../uctypes_array_assign_native_le_intbig.py       |  4 ++--
 tests/extmod/uctypes_native_le.py                  |  4 ++--
 tests/extmod/uctypes_ptr_le.py                     |  4 ++--
 tests/extmod/uctypes_ptr_native_le.py              |  4 ++--
 tests/extmod/vfs_fat_more.py                       |  6 +++---
 tests/extmod/vfs_lfs_mount.py                      | 10 +++++-----
 tests/extmod/vfs_userfs.py                         |  6 +++---
 tests/feature_check/byteorder.py                   |  5 ++++-
 tests/float/float2int_doubleprec_intbig.py         |  4 ++--
 tests/float/float2int_fp30_intbig.py               |  4 ++--
 tests/float/float2int_intbig.py                    |  4 ++--
 tests/io/argv.py                                   |  5 ++++-
 tests/io/builtin_print_file.py                     |  5 ++++-
 tests/io/file_stdio.py                             |  5 ++++-
 tests/io/resource_stream.py                        |  4 ++--
 tests/micropython/emg_exc.py                       |  4 ++--
 tests/micropython/heapalloc_traceback.py           |  4 ++--
 tests/micropython/import_mpy_invalid.py            |  6 +++---
 tests/micropython/import_mpy_native_x64.py         |  8 ++++----
 tests/micropython/opt_level_lineno.py              |  2 +-
 tests/micropython/viper_misc_intbig.py             |  4 ++--
 tests/misc/print_exception.py                      |  4 ++--
 tests/misc/sys_atexit.py                           |  6 +++---
 tests/misc/sys_exc_info.py                         |  5 ++++-
 tests/run-natmodtests.py                           |  4 ++--
 tests/run-tests-exp.py                             |  2 +-
 tests/thread/thread_stacksize1.py                  |  6 ++++--
 46 files changed, 142 insertions(+), 89 deletions(-)
 rename docs/library/{sys.rst => usys.rst} (93%)

diff --git a/docs/library/index.rst b/docs/library/index.rst
index 952e67d43ccec..43d9e87f3cda7 100644
--- a/docs/library/index.rst
+++ b/docs/library/index.rst
@@ -77,7 +77,6 @@ it will fallback to loading the built-in ``ujson`` module.
    cmath.rst
    gc.rst
    math.rst
-   sys.rst
    uarray.rst
    uasyncio.rst
    ubinascii.rst
@@ -93,6 +92,7 @@ it will fallback to loading the built-in ``ujson`` module.
    usocket.rst
    ussl.rst
    ustruct.rst
+   usys.rst
    utime.rst
    uzlib.rst
    _thread.rst
diff --git a/docs/library/sys.rst b/docs/library/usys.rst
similarity index 93%
rename from docs/library/sys.rst
rename to docs/library/usys.rst
index 24f9e353bb006..96016438507cf 100644
--- a/docs/library/sys.rst
+++ b/docs/library/usys.rst
@@ -1,7 +1,7 @@
-:mod:`sys` -- system specific functions
-=======================================
+:mod:`usys` -- system specific functions
+========================================
 
-.. module:: sys
+.. module:: usys
    :synopsis: system specific functions
 
 |see_cpython_module| :mod:`python:sys`.
@@ -28,10 +28,10 @@ Functions
       This function is a MicroPython extension intended to provide similar
       functionality to the :mod:`atexit` module in CPython.
 
-.. function:: print_exception(exc, file=sys.stdout, /)
+.. function:: print_exception(exc, file=usys.stdout, /)
 
    Print exception with a traceback to a file-like object *file* (or
-   `sys.stdout` by default).
+   `usys.stdout` by default).
 
    .. admonition:: Difference to CPython
       :class: attention
@@ -84,7 +84,7 @@ Constants
    value directly, but instead count number of bits in it::
 
     bits = 0
-    v = sys.maxsize
+    v = usys.maxsize
     while v:
         bits += 1
         v >>= 1
@@ -113,7 +113,7 @@ Constants
    is an identifier of a board, e.g. ``"pyboard"`` for the original MicroPython
    reference board. It thus can be used to distinguish one board from another.
    If you need to check whether your program runs on MicroPython (vs other
-   Python implementation), use `sys.implementation` instead.
+   Python implementation), use `usys.implementation` instead.
 
 .. data:: stderr
 
diff --git a/drivers/nrf24l01/nrf24l01test.py b/drivers/nrf24l01/nrf24l01test.py
index 14efbffd2aba1..56bdb6e26eb9c 100644
--- a/drivers/nrf24l01/nrf24l01test.py
+++ b/drivers/nrf24l01/nrf24l01test.py
@@ -1,6 +1,6 @@
 """Test for nrf24l01 module.  Portable between MicroPython targets."""
 
-import sys
+import usys
 import ustruct as struct
 import utime
 from machine import Pin, SPI
@@ -14,14 +14,14 @@
 # master may be a slow device. Value tested with Pyboard, ESP32 and ESP8266.
 _SLAVE_SEND_DELAY = const(10)
 
-if sys.platform == "pyboard":
+if usys.platform == "pyboard":
     cfg = {"spi": 2, "miso": "Y7", "mosi": "Y8", "sck": "Y6", "csn": "Y5", "ce": "Y4"}
-elif sys.platform == "esp8266":  # Hardware SPI
+elif usys.platform == "esp8266":  # Hardware SPI
     cfg = {"spi": 1, "miso": 12, "mosi": 13, "sck": 14, "csn": 4, "ce": 5}
-elif sys.platform == "esp32":  # Software SPI
+elif usys.platform == "esp32":  # Software SPI
     cfg = {"spi": -1, "miso": 32, "mosi": 33, "sck": 25, "csn": 26, "ce": 27}
 else:
-    raise ValueError("Unsupported platform {}".format(sys.platform))
+    raise ValueError("Unsupported platform {}".format(usys.platform))
 
 # Addresses are in little-endian format. They correspond to big-endian
 # 0xf0f0f0f0e1, 0xf0f0f0f0d2
diff --git a/extmod/webrepl/websocket_helper.py b/extmod/webrepl/websocket_helper.py
index 5ca80534eb33f..3260acc52f377 100644
--- a/extmod/webrepl/websocket_helper.py
+++ b/extmod/webrepl/websocket_helper.py
@@ -1,4 +1,7 @@
-import sys
+try:
+    import usys as sys
+except ImportError:
+    import sys
 
 try:
     import ubinascii as binascii
diff --git a/py/objmodule.c b/py/objmodule.c
index 060e1bc1e6c2d..a1f9d9d7f146a 100644
--- a/py/objmodule.c
+++ b/py/objmodule.c
@@ -159,7 +159,7 @@ STATIC const mp_rom_map_elem_t mp_builtin_module_table[] = {
     #endif
     #endif
     #if MICROPY_PY_SYS
-    { MP_ROM_QSTR(MP_QSTR_sys), MP_ROM_PTR(&mp_module_sys) },
+    { MP_ROM_QSTR(MP_QSTR_usys), MP_ROM_PTR(&mp_module_sys) },
     #endif
     #if MICROPY_PY_GC && MICROPY_ENABLE_GC
     { MP_ROM_QSTR(MP_QSTR_gc), MP_ROM_PTR(&mp_module_gc) },
diff --git a/tests/basics/async_await2.py b/tests/basics/async_await2.py
index 1e3164df93372..56f77604ac1be 100644
--- a/tests/basics/async_await2.py
+++ b/tests/basics/async_await2.py
@@ -1,6 +1,9 @@
 # test await expression
 
-import sys
+try:
+    import usys as sys
+except ImportError:
+    import sys
 if sys.implementation.name == 'micropython':
     # uPy allows normal generators to be awaitables
     coroutine = lambda f: f
diff --git a/tests/basics/async_for2.py b/tests/basics/async_for2.py
index aad23a3e5ad8c..4af3be4c6df32 100644
--- a/tests/basics/async_for2.py
+++ b/tests/basics/async_for2.py
@@ -1,6 +1,9 @@
 # test waiting within "async for" __anext__ function
 
-import sys
+try:
+    import usys as sys
+except ImportError:
+    import sys
 if sys.implementation.name == 'micropython':
     # uPy allows normal generators to be awaitables
     coroutine = lambda f: f
diff --git a/tests/basics/async_with2.py b/tests/basics/async_with2.py
index 44421ae91798e..4dd1386240f2c 100644
--- a/tests/basics/async_with2.py
+++ b/tests/basics/async_with2.py
@@ -1,6 +1,9 @@
 # test waiting within async with enter/exit functions
 
-import sys
+try:
+    import usys as sys
+except ImportError:
+    import sys
 if sys.implementation.name == 'micropython':
     # uPy allows normal generators to be awaitables
     coroutine = lambda f: f
diff --git a/tests/basics/attrtuple1.py b/tests/basics/attrtuple1.py
index 78a0fbed1b73a..249c030bb4fdb 100644
--- a/tests/basics/attrtuple1.py
+++ b/tests/basics/attrtuple1.py
@@ -1,7 +1,10 @@
 # test attrtuple
 # we can't test this type directly so we use sys.implementation object
 
-import sys
+try:
+    import usys as sys
+except ImportError:
+    import sys
 t = sys.implementation
 
 # It can be just a normal tuple on small ports
diff --git a/tests/basics/builtin_callable.py b/tests/basics/builtin_callable.py
index 3ae49f004d18a..c0a9d0c473a5a 100644
--- a/tests/basics/builtin_callable.py
+++ b/tests/basics/builtin_callable.py
@@ -7,7 +7,10 @@
 print(callable("dfsd"))
 
 # modules should not be callabe
-import sys
+try:
+    import usys as sys
+except ImportError:
+    import sys
 print(callable(sys))
 
 # builtins should be callable
diff --git a/tests/basics/builtin_dir.py b/tests/basics/builtin_dir.py
index 1eecbd044b7b0..1f2b498d77f77 100644
--- a/tests/basics/builtin_dir.py
+++ b/tests/basics/builtin_dir.py
@@ -4,7 +4,10 @@
 print('__name__' in dir())
 
 # dir of module
-import sys
+try:
+    import usys as sys
+except ImportError:
+    import sys
 print('version' in dir(sys))
 
 # dir of type
diff --git a/tests/basics/int_big1.py b/tests/basics/int_big1.py
index 40d16c455bf38..108e3ee5c9626 100644
--- a/tests/basics/int_big1.py
+++ b/tests/basics/int_big1.py
@@ -102,7 +102,10 @@
 x = -4611686018427387904 # big
 
 # sys.maxsize is a constant mpz, so test it's compatible with dynamic ones
-import sys
+try:
+    import usys as sys
+except ImportError:
+    import sys
 print(sys.maxsize + 1 - 1 == sys.maxsize)
 
 # test extraction of big int value via mp_obj_get_int_maybe
diff --git a/tests/basics/module2.py b/tests/basics/module2.py
index a135601579cd7..5923a27e08d42 100644
--- a/tests/basics/module2.py
+++ b/tests/basics/module2.py
@@ -1,6 +1,6 @@
 # uPy behaviour only: builtin modules are read-only
-import sys
+import usys
 try:
-    sys.x = 1
+    usys.x = 1
 except AttributeError:
     print("AttributeError")
diff --git a/tests/basics/python34.py b/tests/basics/python34.py
index 4030db143c4d7..0f6e4bafd0b9e 100644
--- a/tests/basics/python34.py
+++ b/tests/basics/python34.py
@@ -33,9 +33,9 @@ def test_syntax(code):
 
 # from basics/sys1.py
 # uPy prints version 3.4
-import sys
-print(sys.version[:3])
-print(sys.version_info[0], sys.version_info[1])
+import usys
+print(usys.version[:3])
+print(usys.version_info[0], usys.version_info[1])
 
 # from basics/exception1.py
 # in 3.7 no comma is printed if there is only 1 arg (in 3.4-3.6 one is printed)
diff --git a/tests/basics/string_compare.py b/tests/basics/string_compare.py
index 6515809b3642d..f34879df25bcb 100644
--- a/tests/basics/string_compare.py
+++ b/tests/basics/string_compare.py
@@ -51,7 +51,10 @@
 
 # this tests an internal string that doesn't have a hash with a string
 # that does have a hash, but the lengths of the two strings are different
-import sys
+try:
+    import usys as sys
+except ImportError:
+    import sys
 print(sys.version == 'a long string that has a hash')
 
 # this special string would have a hash of 0 but is incremented to 1
diff --git a/tests/basics/sys1.py b/tests/basics/sys1.py
index 095824afaf1fc..0947ea1964bf9 100644
--- a/tests/basics/sys1.py
+++ b/tests/basics/sys1.py
@@ -1,6 +1,9 @@
 # test sys module
 
-import sys
+try:
+    import usys as sys
+except ImportError:
+    import sys
 
 print(sys.__name__)
 print(type(sys.path))
diff --git a/tests/basics/sys_exit.py b/tests/basics/sys_exit.py
index b1f71549db1c5..4d640ae60e4e9 100644
--- a/tests/basics/sys_exit.py
+++ b/tests/basics/sys_exit.py
@@ -1,6 +1,9 @@
 # test sys module's exit function
 
-import sys
+try:
+    import usys as sys
+except ImportError:
+    import sys
 
 try:
     sys.exit
diff --git a/tests/basics/sys_getsizeof.py b/tests/basics/sys_getsizeof.py
index fe1b403e04bbf..4dc919848ca4c 100644
--- a/tests/basics/sys_getsizeof.py
+++ b/tests/basics/sys_getsizeof.py
@@ -1,6 +1,9 @@
 # test sys.getsizeof() function
 
-import sys
+try:
+    import usys as sys
+except ImportError:
+    import sys
 try:
     sys.getsizeof
 except AttributeError:
diff --git a/tests/extmod/uctypes_array_assign_native_le.py b/tests/extmod/uctypes_array_assign_native_le.py
index d4c27fc4b3f5a..5bddfcdf2f601 100644
--- a/tests/extmod/uctypes_array_assign_native_le.py
+++ b/tests/extmod/uctypes_array_assign_native_le.py
@@ -1,4 +1,4 @@
-import sys
+import usys
 
 try:
     import uctypes
@@ -6,7 +6,7 @@
     print("SKIP")
     raise SystemExit
 
-if sys.byteorder != "little":
+if usys.byteorder != "little":
     print("SKIP")
     raise SystemExit
 
diff --git a/tests/extmod/uctypes_array_assign_native_le_intbig.py b/tests/extmod/uctypes_array_assign_native_le_intbig.py
index f33c63b4ef959..42583b8afefef 100644
--- a/tests/extmod/uctypes_array_assign_native_le_intbig.py
+++ b/tests/extmod/uctypes_array_assign_native_le_intbig.py
@@ -1,4 +1,4 @@
-import sys
+import usys
 
 try:
     import uctypes
@@ -6,7 +6,7 @@
     print("SKIP")
     raise SystemExit
 
-if sys.byteorder != "little":
+if usys.byteorder != "little":
     print("SKIP")
     raise SystemExit
 
diff --git a/tests/extmod/uctypes_native_le.py b/tests/extmod/uctypes_native_le.py
index 7958e5c22ada9..9889b98e9d00f 100644
--- a/tests/extmod/uctypes_native_le.py
+++ b/tests/extmod/uctypes_native_le.py
@@ -1,7 +1,7 @@
 # This test is exactly like uctypes_le.py, but uses native structure layout.
 # Codepaths for packed vs native structures are different. This test only works
 # on little-endian machine (no matter if 32 or 64 bit).
-import sys
+import usys
 
 try:
     import uctypes
@@ -9,7 +9,7 @@
     print("SKIP")
     raise SystemExit
 
-if sys.byteorder != "little":
+if usys.byteorder != "little":
     print("SKIP")
     raise SystemExit
 
diff --git a/tests/extmod/uctypes_ptr_le.py b/tests/extmod/uctypes_ptr_le.py
index 5d8094ee48a79..f475465ae80f8 100644
--- a/tests/extmod/uctypes_ptr_le.py
+++ b/tests/extmod/uctypes_ptr_le.py
@@ -1,4 +1,4 @@
-import sys
+import usys
 
 try:
     import uctypes
@@ -6,7 +6,7 @@
     print("SKIP")
     raise SystemExit
 
-if sys.byteorder != "little":
+if usys.byteorder != "little":
     print("SKIP")
     raise SystemExit
 
diff --git a/tests/extmod/uctypes_ptr_native_le.py b/tests/extmod/uctypes_ptr_native_le.py
index 8ca4d2c55cf9c..ca2b316c54a5d 100644
--- a/tests/extmod/uctypes_ptr_native_le.py
+++ b/tests/extmod/uctypes_ptr_native_le.py
@@ -1,4 +1,4 @@
-import sys
+import usys
 
 try:
     import uctypes
@@ -6,7 +6,7 @@
     print("SKIP")
     raise SystemExit
 
-if sys.byteorder != "little":
+if usys.byteorder != "little":
     print("SKIP")
     raise SystemExit
 
diff --git a/tests/extmod/vfs_fat_more.py b/tests/extmod/vfs_fat_more.py
index d8449829deacb..076802f6ad5eb 100644
--- a/tests/extmod/vfs_fat_more.py
+++ b/tests/extmod/vfs_fat_more.py
@@ -111,10 +111,10 @@ def ioctl(self, op, arg):
 print(uos.listdir("sys"))
 
 # test importing a file from a mounted FS
-import sys
+import usys
 
-sys.path.clear()
-sys.path.append("/sys")
+usys.path.clear()
+usys.path.append("/sys")
 with open("sys/test_module.py", "w") as f:
     f.write('print("test_module!")')
 import test_module
diff --git a/tests/extmod/vfs_lfs_mount.py b/tests/extmod/vfs_lfs_mount.py
index 9207f4a8c6d05..2c40b2989796f 100644
--- a/tests/extmod/vfs_lfs_mount.py
+++ b/tests/extmod/vfs_lfs_mount.py
@@ -68,17 +68,17 @@ def test(bdev, vfs_class):
     uos.umount("/lfs")
 
     # clear imported modules
-    sys.modules.clear()
+    usys.modules.clear()
 
 
 bdev = RAMBlockDevice(30)
 
 # initialise path
-import sys
+import usys
 
-sys.path.clear()
-sys.path.append("/lfs")
-sys.path.append("")
+usys.path.clear()
+usys.path.append("/lfs")
+usys.path.append("")
 
 # run tests
 test(bdev, uos.VfsLfs1)
diff --git a/tests/extmod/vfs_userfs.py b/tests/extmod/vfs_userfs.py
index 3cdfe82eea8dc..570b8335341e1 100644
--- a/tests/extmod/vfs_userfs.py
+++ b/tests/extmod/vfs_userfs.py
@@ -1,7 +1,7 @@
 # test VFS functionality with a user-defined filesystem
 # also tests parts of uio.IOBase implementation
 
-import sys
+import usys
 
 try:
     import uio
@@ -76,9 +76,9 @@ def open(self, path, mode):
 print(f.read())
 
 # import files from the user filesystem
-sys.path.append("/userfs")
+usys.path.append("/userfs")
 import usermod1
 
 # unmount and undo path addition
 uos.umount("/userfs")
-sys.path.pop()
+usys.path.pop()
diff --git a/tests/feature_check/byteorder.py b/tests/feature_check/byteorder.py
index c82a41a24b1c0..509bd8b1b51de 100644
--- a/tests/feature_check/byteorder.py
+++ b/tests/feature_check/byteorder.py
@@ -1,3 +1,6 @@
-import sys
+try:
+    import usys as sys
+except ImportError:
+    import sys
 
 print(sys.byteorder)
diff --git a/tests/float/float2int_doubleprec_intbig.py b/tests/float/float2int_doubleprec_intbig.py
index 84fa2d25360e1..418eddb60781a 100644
--- a/tests/float/float2int_doubleprec_intbig.py
+++ b/tests/float/float2int_doubleprec_intbig.py
@@ -2,10 +2,10 @@
 
 try:
     import ustruct as struct
+    import usys as sys
 except:
     import struct
-
-import sys
+    import sys
 
 maxsize_bits = 0
 maxsize = sys.maxsize
diff --git a/tests/float/float2int_fp30_intbig.py b/tests/float/float2int_fp30_intbig.py
index 75ff52f39dd49..fcbe2e309f0be 100644
--- a/tests/float/float2int_fp30_intbig.py
+++ b/tests/float/float2int_fp30_intbig.py
@@ -2,10 +2,10 @@
 
 try:
     import ustruct as struct
+    import usys as sys
 except:
     import struct
-
-import sys
+    import sys
 
 maxsize_bits = 0
 maxsize = sys.maxsize
diff --git a/tests/float/float2int_intbig.py b/tests/float/float2int_intbig.py
index 62aca39634968..865aeea7b9171 100644
--- a/tests/float/float2int_intbig.py
+++ b/tests/float/float2int_intbig.py
@@ -2,10 +2,10 @@
 
 try:
     import ustruct as struct
+    import usys as sys
 except:
     import struct
-
-import sys
+    import sys
 
 maxsize_bits = 0
 maxsize = sys.maxsize
diff --git a/tests/io/argv.py b/tests/io/argv.py
index 53254da11906b..834292504d05d 100644
--- a/tests/io/argv.py
+++ b/tests/io/argv.py
@@ -1,3 +1,6 @@
-import sys
+try:
+    import usys as sys
+except ImportError:
+    import sys
 
 print(sys.argv)
diff --git a/tests/io/builtin_print_file.py b/tests/io/builtin_print_file.py
index 822356a6cc305..e5c20b64e4bec 100644
--- a/tests/io/builtin_print_file.py
+++ b/tests/io/builtin_print_file.py
@@ -1,6 +1,9 @@
 # test builtin print function, using file= argument
 
-import sys
+try:
+    import usys as sys
+except ImportError:
+    import sys
 
 try:
     sys.stdout
diff --git a/tests/io/file_stdio.py b/tests/io/file_stdio.py
index cbdb070163c31..6c08f35d78784 100644
--- a/tests/io/file_stdio.py
+++ b/tests/io/file_stdio.py
@@ -1,4 +1,7 @@
-import sys
+try:
+    import usys as sys
+except ImportError:
+    import sys
 
 print(sys.stdin.fileno())
 print(sys.stdout.fileno())
diff --git a/tests/io/resource_stream.py b/tests/io/resource_stream.py
index 5656205b692d6..b589ff99bf2ba 100644
--- a/tests/io/resource_stream.py
+++ b/tests/io/resource_stream.py
@@ -1,5 +1,5 @@
 import uio
-import sys
+import usys
 
 try:
     uio.resource_stream
@@ -11,5 +11,5 @@
 print(buf.read())
 
 # resource_stream(None, ...) look ups from current dir, hence sys.path[0] hack
-buf = uio.resource_stream(None, sys.path[0] + "/data/file2")
+buf = uio.resource_stream(None, usys.path[0] + "/data/file2")
 print(buf.read())
diff --git a/tests/micropython/emg_exc.py b/tests/micropython/emg_exc.py
index bca4d2d9fbaca..b8df94b071af8 100644
--- a/tests/micropython/emg_exc.py
+++ b/tests/micropython/emg_exc.py
@@ -1,7 +1,7 @@
 # test that emergency exceptions work
 
 import micropython
-import sys
+import usys
 
 try:
     import uio
@@ -26,7 +26,7 @@ def f():
 
     # print the exception
     buf = uio.StringIO()
-    sys.print_exception(exc, buf)
+    usys.print_exception(exc, buf)
     for l in buf.getvalue().split("\n"):
         if l.startswith("  File "):
             print(l.split('"')[2])
diff --git a/tests/micropython/heapalloc_traceback.py b/tests/micropython/heapalloc_traceback.py
index eabd09388b90b..09a2ad2c14d6e 100644
--- a/tests/micropython/heapalloc_traceback.py
+++ b/tests/micropython/heapalloc_traceback.py
@@ -1,7 +1,7 @@
 # test that we can generate a traceback without allocating
 
 import micropython
-import sys
+import usys
 
 try:
     import uio
@@ -33,7 +33,7 @@ def test():
 
 # print the exception that was raised
 buf = uio.StringIO()
-sys.print_exception(global_exc, buf)
+usys.print_exception(global_exc, buf)
 for l in buf.getvalue().split("\n"):
     # uPy on pyboard prints <stdin> as file, so remove filename.
     if l.startswith("  File "):
diff --git a/tests/micropython/import_mpy_invalid.py b/tests/micropython/import_mpy_invalid.py
index 00973fe3f9f12..02fd4b1254971 100644
--- a/tests/micropython/import_mpy_invalid.py
+++ b/tests/micropython/import_mpy_invalid.py
@@ -1,7 +1,7 @@
 # test importing of invalid .mpy files
 
 try:
-    import sys, uio, uos
+    import usys, uio, uos
 
     uio.IOBase
     uos.mount
@@ -54,7 +54,7 @@ def open(self, path, mode):
 
 # create and mount a user filesystem
 uos.mount(UserFS(user_files), "/userfs")
-sys.path.append("/userfs")
+usys.path.append("/userfs")
 
 # import .mpy files from the user filesystem
 for i in range(len(user_files)):
@@ -66,4 +66,4 @@ def open(self, path, mode):
 
 # unmount and undo path addition
 uos.umount("/userfs")
-sys.path.pop()
+usys.path.pop()
diff --git a/tests/micropython/import_mpy_native_x64.py b/tests/micropython/import_mpy_native_x64.py
index d0de507d44234..3e7b2058eb812 100644
--- a/tests/micropython/import_mpy_native_x64.py
+++ b/tests/micropython/import_mpy_native_x64.py
@@ -1,7 +1,7 @@
 # test importing of .mpy files with native code (x64 only)
 
 try:
-    import sys, uio, uos
+    import usys, uio, uos
 
     uio.IOBase
     uos.mount
@@ -9,7 +9,7 @@
     print("SKIP")
     raise SystemExit
 
-if not (sys.platform == "linux" and sys.maxsize > 2 ** 32):
+if not (usys.platform == "linux" and usys.maxsize > 2 ** 32):
     print("SKIP")
     raise SystemExit
 
@@ -101,7 +101,7 @@ def open(self, path, mode):
 
 # create and mount a user filesystem
 uos.mount(UserFS(user_files), "/userfs")
-sys.path.append("/userfs")
+usys.path.append("/userfs")
 
 # import .mpy files from the user filesystem
 for i in range(len(user_files)):
@@ -114,4 +114,4 @@ def open(self, path, mode):
 
 # unmount and undo path addition
 uos.umount("/userfs")
-sys.path.pop()
+usys.path.pop()
diff --git a/tests/micropython/opt_level_lineno.py b/tests/micropython/opt_level_lineno.py
index d8253e54b41f0..1cbf2fb1a8548 100644
--- a/tests/micropython/opt_level_lineno.py
+++ b/tests/micropython/opt_level_lineno.py
@@ -3,4 +3,4 @@
 # check that level 3 doesn't store line numbers
 # the expected output is that any line is printed as "line 1"
 micropython.opt_level(3)
-exec("try:\n xyz\nexcept NameError as er:\n import sys\n sys.print_exception(er)")
+exec("try:\n xyz\nexcept NameError as er:\n import usys\n usys.print_exception(er)")
diff --git a/tests/micropython/viper_misc_intbig.py b/tests/micropython/viper_misc_intbig.py
index 055c08d8e53dc..eda873ca63dee 100644
--- a/tests/micropython/viper_misc_intbig.py
+++ b/tests/micropython/viper_misc_intbig.py
@@ -6,6 +6,6 @@ def viper_uint() -> uint:
     return uint(-1)
 
 
-import sys
+import usys
 
-print(viper_uint() == (sys.maxsize << 1 | 1))
+print(viper_uint() == (usys.maxsize << 1 | 1))
diff --git a/tests/misc/print_exception.py b/tests/misc/print_exception.py
index f26c1fd5ac867..9b3467b0a0f84 100644
--- a/tests/misc/print_exception.py
+++ b/tests/misc/print_exception.py
@@ -1,10 +1,10 @@
-import sys
-
 try:
     try:
         import uio as io
+        import usys as sys
     except ImportError:
         import io
+        import sys
 except ImportError:
     print("SKIP")
     raise SystemExit
diff --git a/tests/misc/sys_atexit.py b/tests/misc/sys_atexit.py
index e9c5693f975e3..141b24cc9f62b 100644
--- a/tests/misc/sys_atexit.py
+++ b/tests/misc/sys_atexit.py
@@ -1,9 +1,9 @@
 # test sys.atexit() function
 
-import sys
+import usys
 
 try:
-    sys.atexit
+    usys.atexit
 except AttributeError:
     print("SKIP")
     raise SystemExit
@@ -15,7 +15,7 @@ def do_at_exit():
     print("done at exit:", some_var)
 
 
-sys.atexit(do_at_exit)
+usys.atexit(do_at_exit)
 
 some_var = "ok"
 print("done before exit")
diff --git a/tests/misc/sys_exc_info.py b/tests/misc/sys_exc_info.py
index d7e8a2d943b5e..3a8c4a6c8d3ed 100644
--- a/tests/misc/sys_exc_info.py
+++ b/tests/misc/sys_exc_info.py
@@ -1,4 +1,7 @@
-import sys
+try:
+    import usys as sys
+except ImportError:
+    import sys
 
 try:
     sys.exc_info
diff --git a/tests/run-natmodtests.py b/tests/run-natmodtests.py
index f88ca0b788971..8eb27169c4ca1 100755
--- a/tests/run-natmodtests.py
+++ b/tests/run-natmodtests.py
@@ -30,7 +30,7 @@
 
 # Code to allow a target MicroPython to import an .mpy from RAM
 injected_import_hook_code = """\
-import sys, uos, uio
+import usys, uos, uio
 class __File(uio.IOBase):
   def __init__(self):
     self.off = 0
@@ -54,7 +54,7 @@ def open(self, path, mode):
     return __File()
 uos.mount(__FS(), '/__remote')
 uos.chdir('/__remote')
-sys.modules['{}'] = __import__('__injected')
+usys.modules['{}'] = __import__('__injected')
 """
 
 
diff --git a/tests/run-tests-exp.py b/tests/run-tests-exp.py
index 34c6f650f83b6..ac32fe9869c36 100644
--- a/tests/run-tests-exp.py
+++ b/tests/run-tests-exp.py
@@ -5,7 +5,7 @@
 # This script is intended to be run by the same interpreter executable
 # which is to be tested, so should use minimal language functionality.
 #
-import sys
+import usys as sys
 import uos as os
 
 
diff --git a/tests/thread/thread_stacksize1.py b/tests/thread/thread_stacksize1.py
index 5827237a175eb..5d25509b763a0 100644
--- a/tests/thread/thread_stacksize1.py
+++ b/tests/thread/thread_stacksize1.py
@@ -1,8 +1,10 @@
 # test setting the thread stack size
 #
 # MIT license; Copyright (c) 2016 Damien P. George on behalf of Pycom Ltd
-
-import sys
+try:
+    import usys as sys
+except ImportError:
+    import sys
 import _thread
 
 # different implementations have different minimum sizes

From 38959ed8f11970d47f4e07b720a590e65e80dc35 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 4 Sep 2020 00:32:39 +1000
Subject: [PATCH 0239/3533] lib/libm: Reduce size of static two_over_pi array.

Thanks to Jeff Epler for the idea.

Signed-off-by: Damien George <damien@micropython.org>
---
 lib/libm/ef_rem_pio2.c | 4 ++--
 lib/libm/fdlibm.h      | 2 +-
 lib/libm/kf_rem_pio2.c | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/libm/ef_rem_pio2.c b/lib/libm/ef_rem_pio2.c
index 8111ca197f0e4..fcdfb18287e67 100644
--- a/lib/libm/ef_rem_pio2.c
+++ b/lib/libm/ef_rem_pio2.c
@@ -35,9 +35,9 @@
  * Table of constants for 2/pi, 396 Hex digits (476 decimal) of 2/pi 
  */
 #ifdef __STDC__
-static const __int32_t two_over_pi[] = {
+static const __uint8_t two_over_pi[] = {
 #else
-static __int32_t two_over_pi[] = {
+static __uint8_t two_over_pi[] = {
 #endif
 0xA2, 0xF9, 0x83, 0x6E, 0x4E, 0x44, 0x15, 0x29, 0xFC,
 0x27, 0x57, 0xD1, 0xF5, 0x34, 0xDD, 0xC0, 0xDB, 0x62, 
diff --git a/lib/libm/fdlibm.h b/lib/libm/fdlibm.h
index ace3b2da22f94..22cd8f16b4c12 100644
--- a/lib/libm/fdlibm.h
+++ b/lib/libm/fdlibm.h
@@ -188,7 +188,7 @@ extern float __ieee754_scalbf __P((float,float));
 extern float __kernel_sinf __P((float,float,int));
 extern float __kernel_cosf __P((float,float));
 extern float __kernel_tanf __P((float,float,int));
-extern int   __kernel_rem_pio2f __P((float*,float*,int,int,int,const __int32_t*));
+extern int   __kernel_rem_pio2f __P((float*,float*,int,int,int,const __uint8_t*));
 
 /* A union which permits us to convert between a float and a 32 bit
    int.  */
diff --git a/lib/libm/kf_rem_pio2.c b/lib/libm/kf_rem_pio2.c
index 6bd4d287e6905..43e4b4687f506 100644
--- a/lib/libm/kf_rem_pio2.c
+++ b/lib/libm/kf_rem_pio2.c
@@ -62,10 +62,10 @@ two8   =  2.5600000000e+02f, /* 0x43800000 */
 twon8  =  3.9062500000e-03f; /* 0x3b800000 */
 
 #ifdef __STDC__
-	int __kernel_rem_pio2f(float *x, float *y, int e0, int nx, int prec, const __int32_t *ipio2) 
+	int __kernel_rem_pio2f(float *x, float *y, int e0, int nx, int prec, const __uint8_t *ipio2) 
 #else
 	int __kernel_rem_pio2f(x,y,e0,nx,prec,ipio2) 	
-	float x[], y[]; int e0,nx,prec; __int32_t ipio2[];
+	float x[], y[]; int e0,nx,prec; __uint8_t ipio2[];
 #endif
 {
 	__int32_t jz,jx,jv,jp,jk,carry,n,iq[20],i,j,k,m,q0,ih;

From 5e69926ea06cc035e831fcb657e756764682e0b5 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 4 Sep 2020 01:04:08 +1000
Subject: [PATCH 0240/3533] stm32/mpconfigport.h: Enable
 MICROPY_PY_REVERSE_SPECIAL_METHODS.

It's a useful core feature.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/mpconfigport.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/stm32/mpconfigport.h b/ports/stm32/mpconfigport.h
index 6f38d90e8d800..14a05898951ba 100644
--- a/ports/stm32/mpconfigport.h
+++ b/ports/stm32/mpconfigport.h
@@ -100,6 +100,7 @@
 #define MICROPY_PY_BUILTINS_SLICE_INDICES (1)
 #define MICROPY_PY_BUILTINS_ROUND_INT (1)
 #define MICROPY_PY_ALL_SPECIAL_METHODS (1)
+#define MICROPY_PY_REVERSE_SPECIAL_METHODS (1)
 #define MICROPY_PY_BUILTINS_COMPILE (MICROPY_ENABLE_COMPILER)
 #define MICROPY_PY_BUILTINS_EXECFILE (MICROPY_ENABLE_COMPILER)
 #define MICROPY_PY_BUILTINS_NOTIMPLEMENTED (1)

From 3ff70792770e4591fec22fa6a1b50f492236fcde Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 4 Sep 2020 12:40:38 +1000
Subject: [PATCH 0241/3533] lib/utils/mpirq: Add mp_irq_init func, and clean up
 unused init method.

mp_irq_init() is useful when the IRQ object is allocated by the caller.

The mp_irq_methods_t.init method is not used anywhere so has been removed.

Signed-off-by: Damien George <damien@micropython.org>
---
 lib/utils/mpirq.c          |  6 +++++-
 lib/utils/mpirq.h          | 14 +++++++-------
 ports/stm32/machine_uart.c |  1 -
 ports/zephyr/machine_pin.c |  7 +------
 4 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/lib/utils/mpirq.c b/lib/utils/mpirq.c
index 663be182248cc..02139f24dc5fc 100644
--- a/lib/utils/mpirq.c
+++ b/lib/utils/mpirq.c
@@ -53,12 +53,16 @@ const mp_arg_t mp_irq_init_args[] = {
 
 mp_irq_obj_t *mp_irq_new(const mp_irq_methods_t *methods, mp_obj_t parent) {
     mp_irq_obj_t *self = m_new0(mp_irq_obj_t, 1);
+    mp_irq_init(self, methods, parent);
+    return self;
+}
+
+void mp_irq_init(mp_irq_obj_t *self, const mp_irq_methods_t *methods, mp_obj_t parent) {
     self->base.type = &mp_irq_type;
     self->methods = (mp_irq_methods_t *)methods;
     self->parent = parent;
     self->handler = mp_const_none;
     self->ishard = false;
-    return self;
 }
 
 void mp_irq_handler(mp_irq_obj_t *self) {
diff --git a/lib/utils/mpirq.h b/lib/utils/mpirq.h
index 548185b531147..186c9e1b0b92b 100644
--- a/lib/utils/mpirq.h
+++ b/lib/utils/mpirq.h
@@ -26,6 +26,8 @@
 #ifndef MICROPY_INCLUDED_LIB_UTILS_MPIRQ_H
 #define MICROPY_INCLUDED_LIB_UTILS_MPIRQ_H
 
+#include "py/obj.h"
+
 /******************************************************************************
  DEFINE CONSTANTS
  ******************************************************************************/
@@ -41,20 +43,17 @@ enum {
  DEFINE TYPES
  ******************************************************************************/
 
-typedef mp_obj_t (*mp_irq_init_t)(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args);
-typedef mp_uint_t (*mp_irq_uint_method_one_uint_para_t)(mp_obj_t self, mp_uint_t trigger);
-typedef mp_uint_t (*mp_irq_int_method_one_para_t)(mp_obj_t self, mp_uint_t info_type);
+typedef mp_uint_t (*mp_irq_trigger_fun_t)(mp_obj_t self, mp_uint_t trigger);
+typedef mp_uint_t (*mp_irq_info_fun_t)(mp_obj_t self, mp_uint_t info_type);
 
 enum {
     MP_IRQ_INFO_FLAGS,
     MP_IRQ_INFO_TRIGGERS,
-    MP_IRQ_INFO_CNT
 };
 
 typedef struct _mp_irq_methods_t {
-    mp_irq_init_t init;
-    mp_irq_uint_method_one_uint_para_t trigger;
-    mp_irq_int_method_one_para_t info;
+    mp_irq_trigger_fun_t trigger;
+    mp_irq_info_fun_t info;
 } mp_irq_methods_t;
 
 typedef struct _mp_irq_obj_t {
@@ -77,6 +76,7 @@ extern const mp_obj_type_t mp_irq_type;
  ******************************************************************************/
 
 mp_irq_obj_t *mp_irq_new(const mp_irq_methods_t *methods, mp_obj_t parent);
+void mp_irq_init(mp_irq_obj_t *self, const mp_irq_methods_t *methods, mp_obj_t parent);
 void mp_irq_handler(mp_irq_obj_t *self);
 
 #endif // MICROPY_INCLUDED_LIB_UTILS_MPIRQ_H
diff --git a/ports/stm32/machine_uart.c b/ports/stm32/machine_uart.c
index 39a45a2a16060..631f46e81f6e1 100644
--- a/ports/stm32/machine_uart.c
+++ b/ports/stm32/machine_uart.c
@@ -139,7 +139,6 @@ STATIC mp_uint_t pyb_uart_irq_info(mp_obj_t self_in, mp_uint_t info_type) {
 }
 
 STATIC const mp_irq_methods_t pyb_uart_irq_methods = {
-    .init = pyb_uart_irq,
     .trigger = pyb_uart_irq_trigger,
     .info = pyb_uart_irq_info,
 };
diff --git a/ports/zephyr/machine_pin.c b/ports/zephyr/machine_pin.c
index 79d759eb28bf3..c9c6a8c8936e0 100644
--- a/ports/zephyr/machine_pin.c
+++ b/ports/zephyr/machine_pin.c
@@ -213,11 +213,7 @@ STATIC mp_obj_t machine_pin_irq(size_t n_args, const mp_obj_t *pos_args, mp_map_
         }
         if (irq == NULL) {
             irq = m_new_obj(machine_pin_irq_obj_t);
-            irq->base.base.type = &mp_irq_type;
-            irq->base.methods = (mp_irq_methods_t *)&machine_pin_irq_methods;
-            irq->base.parent = MP_OBJ_FROM_PTR(self);
-            irq->base.handler = mp_const_none;
-            irq->base.ishard = false;
+            mp_irq_init(&irq->base, &machine_pin_irq_methods, MP_OBJ_FROM_PTR(self));
             irq->next = MP_STATE_PORT(machine_pin_irq_list);
             gpio_init_callback(&irq->callback, gpio_callback_handler, BIT(self->pin));
             int ret = gpio_add_callback(self->port, &irq->callback);
@@ -322,7 +318,6 @@ STATIC mp_uint_t machine_pin_irq_info(mp_obj_t self_in, mp_uint_t info_type) {
 }
 
 STATIC const mp_irq_methods_t machine_pin_irq_methods = {
-    .init = machine_pin_irq,
     .trigger = machine_pin_irq_trigger,
     .info = machine_pin_irq_info,
 };

From 23109988c29447067b15f1943f72c0b486819c6c Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Fri, 14 Aug 2020 15:21:23 +1000
Subject: [PATCH 0242/3533] stm32/uart: Allow static IRQ handler registration.

This will allow the HCI UART to use a non-heap mp_irq_obj_t, which avoids
needing to make a root pointer for it.
---
 lib/utils/mpirq.h          |  2 +-
 ports/stm32/machine_uart.c | 78 ++------------------------------------
 ports/stm32/uart.c         | 62 ++++++++++++++++++++++++++++++
 ports/stm32/uart.h         | 12 +++++-
 4 files changed, 77 insertions(+), 77 deletions(-)

diff --git a/lib/utils/mpirq.h b/lib/utils/mpirq.h
index 186c9e1b0b92b..dd423c0101137 100644
--- a/lib/utils/mpirq.h
+++ b/lib/utils/mpirq.h
@@ -26,7 +26,7 @@
 #ifndef MICROPY_INCLUDED_LIB_UTILS_MPIRQ_H
 #define MICROPY_INCLUDED_LIB_UTILS_MPIRQ_H
 
-#include "py/obj.h"
+#include "py/runtime.h"
 
 /******************************************************************************
  DEFINE CONSTANTS
diff --git a/ports/stm32/machine_uart.c b/ports/stm32/machine_uart.c
index 631f46e81f6e1..2862f4c0e7b15 100644
--- a/ports/stm32/machine_uart.c
+++ b/ports/stm32/machine_uart.c
@@ -73,76 +73,6 @@
 ///
 ///     uart.any()               # returns True if any characters waiting
 
-typedef struct _pyb_uart_irq_map_t {
-    uint16_t irq_en;
-    uint16_t flag;
-} pyb_uart_irq_map_t;
-
-STATIC const pyb_uart_irq_map_t mp_irq_map[] = {
-    { USART_CR1_IDLEIE, UART_FLAG_IDLE}, // RX idle
-    { USART_CR1_PEIE,   UART_FLAG_PE},   // parity error
-    { USART_CR1_TXEIE,  UART_FLAG_TXE},  // TX register empty
-    { USART_CR1_TCIE,   UART_FLAG_TC},   // TX complete
-    { USART_CR1_RXNEIE, UART_FLAG_RXNE}, // RX register not empty
-    #if 0
-    // For now only IRQs selected by CR1 are supported
-    #if defined(STM32F4)
-    { USART_CR2_LBDIE,  UART_FLAG_LBD},  // LIN break detection
-    #else
-    { USART_CR2_LBDIE,  UART_FLAG_LBDF}, // LIN break detection
-    #endif
-    { USART_CR3_CTSIE,  UART_FLAG_CTS},  // CTS
-    #endif
-};
-
-// OR-ed IRQ flags which should not be touched by the user
-STATIC const uint32_t mp_irq_reserved = UART_FLAG_RXNE;
-
-// OR-ed IRQ flags which are allowed to be used by the user
-STATIC const uint32_t mp_irq_allowed = UART_FLAG_IDLE;
-
-STATIC mp_obj_t pyb_uart_irq(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args);
-
-STATIC void pyb_uart_irq_config(pyb_uart_obj_t *self, bool enable) {
-    if (self->mp_irq_trigger) {
-        for (size_t entry = 0; entry < MP_ARRAY_SIZE(mp_irq_map); ++entry) {
-            if (mp_irq_map[entry].flag & mp_irq_reserved) {
-                continue;
-            }
-            if (mp_irq_map[entry].flag & self->mp_irq_trigger) {
-                if (enable) {
-                    self->uartx->CR1 |= mp_irq_map[entry].irq_en;
-                } else {
-                    self->uartx->CR1 &= ~mp_irq_map[entry].irq_en;
-                }
-            }
-        }
-    }
-}
-
-STATIC mp_uint_t pyb_uart_irq_trigger(mp_obj_t self_in, mp_uint_t new_trigger) {
-    pyb_uart_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    pyb_uart_irq_config(self, false);
-    self->mp_irq_trigger = new_trigger;
-    pyb_uart_irq_config(self, true);
-    return 0;
-}
-
-STATIC mp_uint_t pyb_uart_irq_info(mp_obj_t self_in, mp_uint_t info_type) {
-    pyb_uart_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    if (info_type == MP_IRQ_INFO_FLAGS) {
-        return self->mp_irq_flags;
-    } else if (info_type == MP_IRQ_INFO_TRIGGERS) {
-        return self->mp_irq_trigger;
-    }
-    return 0;
-}
-
-STATIC const mp_irq_methods_t pyb_uart_irq_methods = {
-    .trigger = pyb_uart_irq_trigger,
-    .info = pyb_uart_irq_info,
-};
-
 STATIC void pyb_uart_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     pyb_uart_obj_t *self = MP_OBJ_TO_PTR(self_in);
     if (!self->is_enabled) {
@@ -518,7 +448,7 @@ STATIC mp_obj_t pyb_uart_irq(size_t n_args, const mp_obj_t *pos_args, mp_map_t *
 
     if (self->mp_irq_obj == NULL) {
         self->mp_irq_trigger = 0;
-        self->mp_irq_obj = mp_irq_new(&pyb_uart_irq_methods, MP_OBJ_FROM_PTR(self));
+        self->mp_irq_obj = mp_irq_new(&uart_irq_methods, MP_OBJ_FROM_PTR(self));
     }
 
     if (n_args > 1 || kw_args->used != 0) {
@@ -530,17 +460,17 @@ STATIC mp_obj_t pyb_uart_irq(size_t n_args, const mp_obj_t *pos_args, mp_map_t *
 
         // Check the trigger
         mp_uint_t trigger = args[MP_IRQ_ARG_INIT_trigger].u_int;
-        mp_uint_t not_supported = trigger & ~mp_irq_allowed;
+        mp_uint_t not_supported = trigger & ~MP_UART_ALLOWED_FLAGS;
         if (trigger != 0 && not_supported) {
             mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("trigger 0x%08x unsupported"), not_supported);
         }
 
         // Reconfigure user IRQs
-        pyb_uart_irq_config(self, false);
+        uart_irq_config(self, false);
         self->mp_irq_obj->handler = handler;
         self->mp_irq_obj->ishard = args[MP_IRQ_ARG_INIT_hard].u_bool;
         self->mp_irq_trigger = trigger;
-        pyb_uart_irq_config(self, true);
+        uart_irq_config(self, true);
     }
 
     return MP_OBJ_FROM_PTR(self->mp_irq_obj);
diff --git a/ports/stm32/uart.c b/ports/stm32/uart.c
index 8693813fa4413..b14a18c6ddfa6 100644
--- a/ports/stm32/uart.c
+++ b/ports/stm32/uart.c
@@ -93,6 +93,28 @@
 
 extern void NORETURN __fatal_error(const char *msg);
 
+typedef struct _pyb_uart_irq_map_t {
+    uint16_t irq_en;
+    uint16_t flag;
+} pyb_uart_irq_map_t;
+
+STATIC const pyb_uart_irq_map_t mp_uart_irq_map[] = {
+    { USART_CR1_IDLEIE, UART_FLAG_IDLE}, // RX idle
+    { USART_CR1_PEIE,   UART_FLAG_PE},   // parity error
+    { USART_CR1_TXEIE,  UART_FLAG_TXE},  // TX register empty
+    { USART_CR1_TCIE,   UART_FLAG_TC},   // TX complete
+    { USART_CR1_RXNEIE, UART_FLAG_RXNE}, // RX register not empty
+    #if 0
+    // For now only IRQs selected by CR1 are supported
+    #if defined(STM32F4)
+    { USART_CR2_LBDIE,  UART_FLAG_LBD},  // LIN break detection
+    #else
+    { USART_CR2_LBDIE,  UART_FLAG_LBDF}, // LIN break detection
+    #endif
+    { USART_CR3_CTSIE,  UART_FLAG_CTS},  // CTS
+    #endif
+};
+
 void uart_init0(void) {
     #if defined(STM32H7)
     RCC_PeriphCLKInitTypeDef RCC_PeriphClkInit = {0};
@@ -444,6 +466,23 @@ bool uart_init(pyb_uart_obj_t *uart_obj,
     return true;
 }
 
+void uart_irq_config(pyb_uart_obj_t *self, bool enable) {
+    if (self->mp_irq_trigger) {
+        for (size_t entry = 0; entry < MP_ARRAY_SIZE(mp_uart_irq_map); ++entry) {
+            if (mp_uart_irq_map[entry].flag & MP_UART_RESERVED_FLAGS) {
+                continue;
+            }
+            if (mp_uart_irq_map[entry].flag & self->mp_irq_trigger) {
+                if (enable) {
+                    self->uartx->CR1 |= mp_uart_irq_map[entry].irq_en;
+                } else {
+                    self->uartx->CR1 &= ~mp_uart_irq_map[entry].irq_en;
+                }
+            }
+        }
+    }
+}
+
 void uart_set_rxbuf(pyb_uart_obj_t *self, size_t len, void *buf) {
     self->read_buf_head = 0;
     self->read_buf_tail = 0;
@@ -864,3 +903,26 @@ void uart_irq_handler(mp_uint_t uart_id) {
         mp_irq_handler(self->mp_irq_obj);
     }
 }
+
+STATIC mp_uint_t uart_irq_trigger(mp_obj_t self_in, mp_uint_t new_trigger) {
+    pyb_uart_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    uart_irq_config(self, false);
+    self->mp_irq_trigger = new_trigger;
+    uart_irq_config(self, true);
+    return 0;
+}
+
+STATIC mp_uint_t uart_irq_info(mp_obj_t self_in, mp_uint_t info_type) {
+    pyb_uart_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    if (info_type == MP_IRQ_INFO_FLAGS) {
+        return self->mp_irq_flags;
+    } else if (info_type == MP_IRQ_INFO_TRIGGERS) {
+        return self->mp_irq_trigger;
+    }
+    return 0;
+}
+
+const mp_irq_methods_t uart_irq_methods = {
+    .trigger = uart_irq_trigger,
+    .info = uart_irq_info,
+};
diff --git a/ports/stm32/uart.h b/ports/stm32/uart.h
index 62676fb91be51..9a38db593d4fc 100644
--- a/ports/stm32/uart.h
+++ b/ports/stm32/uart.h
@@ -26,7 +26,7 @@
 #ifndef MICROPY_INCLUDED_STM32_UART_H
 #define MICROPY_INCLUDED_STM32_UART_H
 
-struct _mp_irq_obj_t;
+#include "lib/utils/mpirq.h"
 
 typedef enum {
     PYB_UART_NONE = 0,
@@ -45,6 +45,12 @@ typedef enum {
 #define CHAR_WIDTH_8BIT (0)
 #define CHAR_WIDTH_9BIT (1)
 
+// OR-ed IRQ flags which are allowed to be used by the user
+#define MP_UART_ALLOWED_FLAGS UART_FLAG_IDLE
+
+// OR-ed IRQ flags which should not be touched by the user
+#define MP_UART_RESERVED_FLAGS UART_FLAG_RXNE
+
 typedef struct _pyb_uart_obj_t {
     mp_obj_base_t base;
     USART_TypeDef *uartx;
@@ -62,16 +68,18 @@ typedef struct _pyb_uart_obj_t {
     byte *read_buf;                     // byte or uint16_t, depending on char size
     uint16_t mp_irq_trigger;            // user IRQ trigger mask
     uint16_t mp_irq_flags;              // user IRQ active IRQ flags
-    struct _mp_irq_obj_t *mp_irq_obj;   // user IRQ object
+    mp_irq_obj_t *mp_irq_obj;           // user IRQ object
 } pyb_uart_obj_t;
 
 extern const mp_obj_type_t pyb_uart_type;
+extern const mp_irq_methods_t uart_irq_methods;
 
 void uart_init0(void);
 void uart_deinit_all(void);
 bool uart_exists(int uart_id);
 bool uart_init(pyb_uart_obj_t *uart_obj,
     uint32_t baudrate, uint32_t bits, uint32_t parity, uint32_t stop, uint32_t flow);
+void uart_irq_config(pyb_uart_obj_t *self, bool enable);
 void uart_set_rxbuf(pyb_uart_obj_t *self, size_t len, void *buf);
 void uart_deinit(pyb_uart_obj_t *uart_obj);
 void uart_irq_handler(mp_uint_t uart_id);

From 5ff265a3db998fd86a45d83ccca98fda153991c4 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Fri, 14 Aug 2020 16:35:25 +1000
Subject: [PATCH 0243/3533] stm32/modbluetooth_hci: Use a static mp_irq_obj_t
 for BT HCI UART IRQ.

So that the IRQ handler does not need to be traced by the GC.
---
 ports/stm32/modbluetooth_hci.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/ports/stm32/modbluetooth_hci.c b/ports/stm32/modbluetooth_hci.c
index 4e016eae8451c..54c60adc01181 100644
--- a/ports/stm32/modbluetooth_hci.c
+++ b/ports/stm32/modbluetooth_hci.c
@@ -135,6 +135,7 @@ int mp_bluetooth_hci_uart_readchar(void) {
 #include "uart.h"
 
 pyb_uart_obj_t mp_bluetooth_hci_uart_obj;
+mp_irq_obj_t mp_bluetooth_hci_uart_irq_obj;
 
 static uint8_t hci_uart_rxbuf[512];
 
@@ -163,15 +164,14 @@ int mp_bluetooth_hci_uart_set_baudrate(uint32_t baudrate) {
 }
 
 int mp_bluetooth_hci_uart_activate(void) {
-    // Interrupt on RX chunk received (idle)
-    // Trigger stack poll when this happens
-    mp_obj_t uart_irq_fn = mp_load_attr(MP_OBJ_FROM_PTR(&mp_bluetooth_hci_uart_obj), MP_QSTR_irq);
-    mp_obj_t uargs[] = {
-        MP_OBJ_FROM_PTR(&mp_uart_interrupt_obj),
-        MP_OBJ_NEW_SMALL_INT(UART_FLAG_IDLE),
-        mp_const_true,
-    };
-    mp_call_function_n_kw(uart_irq_fn, 3, 0, uargs);
+    // Add IRQ handler for IDLE (i.e. packet finished).
+    uart_irq_config(&mp_bluetooth_hci_uart_obj, false);
+    mp_irq_init(&mp_bluetooth_hci_uart_irq_obj, &uart_irq_methods, MP_OBJ_FROM_PTR(&mp_bluetooth_hci_uart_obj));
+    mp_bluetooth_hci_uart_obj.mp_irq_obj = &mp_bluetooth_hci_uart_irq_obj;
+    mp_bluetooth_hci_uart_obj.mp_irq_trigger = UART_FLAG_IDLE;
+    mp_bluetooth_hci_uart_irq_obj.handler = MP_OBJ_FROM_PTR(&mp_uart_interrupt_obj);
+    mp_bluetooth_hci_uart_irq_obj.ishard = true;
+    uart_irq_config(&mp_bluetooth_hci_uart_obj, true);
 
     mp_bluetooth_hci_controller_init();
     mp_bluetooth_hci_controller_activate();

From e46aac24bacdafcb5323fbfc702a3bd597f66072 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Fri, 14 Aug 2020 16:04:31 +1000
Subject: [PATCH 0244/3533] extmod/modbluetooth: Rename logging macro to be
 just DEBUG_printf.

And prefix the debug message with "btstack:" or "nimble:", depending on the
context.  Also use correct format specifier for %zu.
---
 extmod/btstack/modbluetooth_btstack.c | 146 ++++++++++++++------------
 extmod/nimble/modbluetooth_nimble.c   |  44 ++++----
 2 files changed, 100 insertions(+), 90 deletions(-)

diff --git a/extmod/btstack/modbluetooth_btstack.c b/extmod/btstack/modbluetooth_btstack.c
index 8f0c82974c316..9aef7e6879fb0 100644
--- a/extmod/btstack/modbluetooth_btstack.c
+++ b/extmod/btstack/modbluetooth_btstack.c
@@ -35,7 +35,7 @@
 
 #include "lib/btstack/src/btstack.h"
 
-#define DEBUG_EVENT_printf(...) // printf(__VA_ARGS__)
+#define DEBUG_printf(...) // printf("btstack: " __VA_ARGS__)
 
 #ifndef MICROPY_PY_BLUETOOTH_DEFAULT_GAP_NAME
 #define MICROPY_PY_BLUETOOTH_DEFAULT_GAP_NAME "MPY BTSTACK"
@@ -54,7 +54,7 @@ STATIC const uint16_t BTSTACK_GAP_DEVICE_NAME_HANDLE = 3;
 volatile int mp_bluetooth_btstack_state = MP_BLUETOOTH_BTSTACK_STATE_OFF;
 
 STATIC int btstack_error_to_errno(int err) {
-    DEBUG_EVENT_printf("  --> btstack error: %d\n", err);
+    DEBUG_printf("  --> btstack error: %d\n", err);
     if (err == ERROR_CODE_SUCCESS) {
         return 0;
     } else if (err == BTSTACK_ACL_BUFFERS_FULL || err == BTSTACK_MEMORY_ALLOC_FAILED) {
@@ -168,16 +168,16 @@ STATIC void btstack_remove_pending_operation(mp_btstack_pending_op_t *pending_op
 STATIC void btstack_notify_indicate_ready_handler(void *context) {
     MICROPY_PY_BLUETOOTH_ENTER
     mp_btstack_pending_op_t *pending_op = (mp_btstack_pending_op_t *)context;
-    DEBUG_EVENT_printf("btstack_notify_indicate_ready_handler op_type=%d conn_handle=%d value_handle=%d len=%lu\n", pending_op->op_type, pending_op->conn_handle, pending_op->value_handle, pending_op->len);
+    DEBUG_printf("btstack_notify_indicate_ready_handler op_type=%d conn_handle=%d value_handle=%d len=%zu\n", pending_op->op_type, pending_op->conn_handle, pending_op->value_handle, pending_op->len);
     if (pending_op->op_type == MP_BLUETOOTH_BTSTACK_PENDING_NOTIFY) {
         int err = att_server_notify(pending_op->conn_handle, pending_op->value_handle, pending_op->buf, pending_op->len);
-        DEBUG_EVENT_printf("btstack_notify_indicate_ready_handler: sending notification err=%d\n", err);
+        DEBUG_printf("btstack_notify_indicate_ready_handler: sending notification err=%d\n", err);
         assert(err == ERROR_CODE_SUCCESS);
         (void)err;
     } else {
         assert(pending_op->op_type == MP_BLUETOOTH_BTSTACK_PENDING_INDICATE);
         int err = att_server_indicate(pending_op->conn_handle, pending_op->value_handle, NULL, 0);
-        DEBUG_EVENT_printf("btstack_notify_indicate_ready_handler: sending indication err=%d\n", err);
+        DEBUG_printf("btstack_notify_indicate_ready_handler: sending indication err=%d\n", err);
         assert(err == ERROR_CODE_SUCCESS);
         (void)err;
     }
@@ -188,7 +188,7 @@ STATIC void btstack_notify_indicate_ready_handler(void *context) {
 
 // Register a pending background operation -- copies the buffer, and makes it known to the GC.
 STATIC mp_btstack_pending_op_t *btstack_enqueue_pending_operation(uint16_t op_type, uint16_t conn_handle, uint16_t value_handle, const uint8_t *buf, size_t len) {
-    DEBUG_EVENT_printf("btstack_enqueue_pending_operation op_type=%d conn_handle=%d value_handle=%d len=%lu\n", op_type, conn_handle, value_handle, len);
+    DEBUG_printf("btstack_enqueue_pending_operation op_type=%d conn_handle=%d value_handle=%d len=%zu\n", op_type, conn_handle, value_handle, len);
     mp_btstack_pending_op_t *pending_op = m_new_obj_var(mp_btstack_pending_op_t, uint8_t, len);
     pending_op->op_type = op_type;
     pending_op->conn_handle = conn_handle;
@@ -219,20 +219,20 @@ STATIC mp_btstack_pending_op_t *btstack_enqueue_pending_operation(uint16_t op_ty
 // know for sure that we're using the correct entry.
 STATIC mp_btstack_pending_op_t *btstack_finish_pending_operation(uint16_t op_type, uint16_t conn_handle, uint16_t value_handle, bool del) {
     MICROPY_PY_BLUETOOTH_ENTER
-    DEBUG_EVENT_printf("btstack_finish_pending_operation op_type=%d conn_handle=%d value_handle=%d\n", op_type, conn_handle, value_handle);
+    DEBUG_printf("btstack_finish_pending_operation op_type=%d conn_handle=%d value_handle=%d\n", op_type, conn_handle, value_handle);
     btstack_linked_list_iterator_t it;
     btstack_linked_list_iterator_init(&it, &MP_STATE_PORT(bluetooth_btstack_root_pointers)->pending_ops);
     while (btstack_linked_list_iterator_has_next(&it)) {
         mp_btstack_pending_op_t *pending_op = (mp_btstack_pending_op_t *)btstack_linked_list_iterator_next(&it);
 
         if (pending_op->op_type == op_type && pending_op->conn_handle == conn_handle && (value_handle == 0xffff || pending_op->value_handle == value_handle)) {
-            DEBUG_EVENT_printf("btstack_finish_pending_operation: found value_handle=%d len=%lu\n", pending_op->value_handle, pending_op->len);
+            DEBUG_printf("btstack_finish_pending_operation: found value_handle=%d len=%zu\n", pending_op->value_handle, pending_op->len);
             btstack_remove_pending_operation(pending_op, del);
             MICROPY_PY_BLUETOOTH_EXIT
             return del ? NULL : pending_op;
         }
     }
-    DEBUG_EVENT_printf("btstack_finish_pending_operation: not found\n");
+    DEBUG_printf("btstack_finish_pending_operation: not found\n");
     MICROPY_PY_BLUETOOTH_EXIT
     return NULL;
 }
@@ -243,7 +243,7 @@ STATIC mp_btstack_pending_op_t *btstack_finish_pending_operation(uint16_t op_typ
 STATIC void btstack_packet_handler_att_server(uint8_t packet_type, uint16_t channel, uint8_t *packet, uint16_t size) {
     (void)channel;
     (void)size;
-    DEBUG_EVENT_printf("btstack_packet_handler_att_server(packet_type=%u, packet=%p)\n", packet_type, packet);
+    DEBUG_printf("btstack_packet_handler_att_server(packet_type=%u, packet=%p)\n", packet_type, packet);
     if (packet_type != HCI_EVENT_PACKET) {
         return;
     }
@@ -251,13 +251,13 @@ STATIC void btstack_packet_handler_att_server(uint8_t packet_type, uint16_t chan
     uint8_t event_type = hci_event_packet_get_type(packet);
 
     if (event_type == ATT_EVENT_CONNECTED) {
-        DEBUG_EVENT_printf("  --> att connected\n");
+        DEBUG_printf("  --> att connected\n");
         // The ATT_EVENT_*CONNECTED events are fired for both peripheral and central role, with no way to tell which.
         // So we use the HCI_EVENT_LE_META event directly in the main packet handler.
     } else if (event_type == ATT_EVENT_DISCONNECTED) {
-        DEBUG_EVENT_printf("  --> att disconnected\n");
+        DEBUG_printf("  --> att disconnected\n");
     } else if (event_type == ATT_EVENT_HANDLE_VALUE_INDICATION_COMPLETE) {
-        DEBUG_EVENT_printf("  --> att indication complete\n");
+        DEBUG_printf("  --> att indication complete\n");
         uint16_t conn_handle = att_event_handle_value_indication_complete_get_conn_handle(packet);
         uint16_t value_handle = att_event_handle_value_indication_complete_get_attribute_handle(packet);
         uint8_t status = att_event_handle_value_indication_complete_get_status(packet);
@@ -265,12 +265,12 @@ STATIC void btstack_packet_handler_att_server(uint8_t packet_type, uint16_t chan
     } else if (event_type == HCI_EVENT_LE_META || event_type == HCI_EVENT_DISCONNECTION_COMPLETE) {
         // Ignore, duplicated by att_server.c.
     } else {
-        DEBUG_EVENT_printf("  --> hci att server event type: unknown (0x%02x)\n", event_type);
+        DEBUG_printf("  --> hci att server event type: unknown (0x%02x)\n", event_type);
     }
 }
 
 STATIC void btstack_packet_handler(uint8_t packet_type, uint8_t *packet, uint8_t irq) {
-    DEBUG_EVENT_printf("btstack_packet_handler(packet_type=%u, packet=%p)\n", packet_type, packet);
+    DEBUG_printf("btstack_packet_handler(packet_type=%u, packet=%p)\n", packet_type, packet);
     if (packet_type != HCI_EVENT_PACKET) {
         return;
     }
@@ -278,7 +278,7 @@ STATIC void btstack_packet_handler(uint8_t packet_type, uint8_t *packet, uint8_t
     uint8_t event_type = hci_event_packet_get_type(packet);
 
     if (event_type == HCI_EVENT_LE_META) {
-        DEBUG_EVENT_printf("  --> hci le meta\n");
+        DEBUG_printf("  --> hci le meta\n");
         if (hci_event_le_meta_get_subevent_code(packet) == HCI_SUBEVENT_LE_CONNECTION_COMPLETE) {
             uint16_t conn_handle = hci_subevent_le_connection_complete_get_connection_handle(packet);
             uint8_t addr_type = hci_subevent_le_connection_complete_get_peer_address_type(packet);
@@ -296,7 +296,7 @@ STATIC void btstack_packet_handler(uint8_t packet_type, uint8_t *packet, uint8_t
         }
     } else if (event_type == BTSTACK_EVENT_STATE) {
         uint8_t state = btstack_event_state_get_state(packet);
-        DEBUG_EVENT_printf("  --> btstack event state 0x%02x\n", state);
+        DEBUG_printf("  --> btstack event state 0x%02x\n", state);
         if (state == HCI_STATE_WORKING) {
             // Signal that initialisation has completed.
             mp_bluetooth_btstack_state = MP_BLUETOOTH_BTSTACK_STATE_ACTIVE;
@@ -305,21 +305,21 @@ STATIC void btstack_packet_handler(uint8_t packet_type, uint8_t *packet, uint8_t
             mp_bluetooth_btstack_state = MP_BLUETOOTH_BTSTACK_STATE_OFF;
         }
     } else if (event_type == HCI_EVENT_TRANSPORT_PACKET_SENT) {
-        DEBUG_EVENT_printf("  --> hci transport packet sent\n");
+        DEBUG_printf("  --> hci transport packet sent\n");
     } else if (event_type == HCI_EVENT_COMMAND_COMPLETE) {
-        DEBUG_EVENT_printf("  --> hci command complete\n");
+        DEBUG_printf("  --> hci command complete\n");
     } else if (event_type == HCI_EVENT_COMMAND_STATUS) {
-        DEBUG_EVENT_printf("  --> hci command status\n");
+        DEBUG_printf("  --> hci command status\n");
     } else if (event_type == HCI_EVENT_NUMBER_OF_COMPLETED_PACKETS) {
-        DEBUG_EVENT_printf("  --> hci number of completed packets\n");
+        DEBUG_printf("  --> hci number of completed packets\n");
     } else if (event_type == BTSTACK_EVENT_NR_CONNECTIONS_CHANGED) {
-        DEBUG_EVENT_printf("  --> btstack # conns changed\n");
+        DEBUG_printf("  --> btstack # conns changed\n");
     } else if (event_type == HCI_EVENT_VENDOR_SPECIFIC) {
-        DEBUG_EVENT_printf("  --> hci vendor specific\n");
+        DEBUG_printf("  --> hci vendor specific\n");
     } else if (event_type == GATT_EVENT_MTU) {
-        DEBUG_EVENT_printf("  --> hci MTU\n");
+        DEBUG_printf("  --> hci MTU\n");
     } else if (event_type == HCI_EVENT_DISCONNECTION_COMPLETE) {
-        DEBUG_EVENT_printf("  --> hci disconnect complete\n");
+        DEBUG_printf("  --> hci disconnect complete\n");
         uint16_t conn_handle = hci_event_disconnection_complete_get_connection_handle(packet);
         const hci_connection_t *conn = hci_connection_for_handle(conn_handle);
         uint16_t irq_event;
@@ -334,7 +334,7 @@ STATIC void btstack_packet_handler(uint8_t packet_type, uint8_t *packet, uint8_t
         mp_bluetooth_gap_on_connected_disconnected(irq_event, conn_handle, 0xff, addr);
     #if MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE
     } else if (event_type == GAP_EVENT_ADVERTISING_REPORT) {
-        DEBUG_EVENT_printf("  --> gap advertising report\n");
+        DEBUG_printf("  --> gap advertising report\n");
         bd_addr_t address;
         gap_event_advertising_report_get_address(packet, address);
         uint8_t adv_event_type = gap_event_advertising_report_get_advertising_event_type(packet);
@@ -346,7 +346,7 @@ STATIC void btstack_packet_handler(uint8_t packet_type, uint8_t *packet, uint8_t
     } else if (event_type == GATT_EVENT_QUERY_COMPLETE) {
         uint16_t conn_handle = gatt_event_query_complete_get_handle(packet);
         uint16_t status = gatt_event_query_complete_get_att_status(packet);
-        DEBUG_EVENT_printf("  --> gatt query complete irq=%d conn_handle=%d status=%d\n", irq, conn_handle, status);
+        DEBUG_printf("  --> gatt query complete irq=%d conn_handle=%d status=%d\n", irq, conn_handle, status);
         if (irq == MP_BLUETOOTH_IRQ_GATTC_READ_DONE || irq == MP_BLUETOOTH_IRQ_GATTC_WRITE_DONE) {
             // TODO there is no value_handle available to pass here.
             // TODO try and get this implemented in btstack.
@@ -361,28 +361,28 @@ STATIC void btstack_packet_handler(uint8_t packet_type, uint8_t *packet, uint8_t
             mp_bluetooth_gattc_on_discover_complete(irq, conn_handle, status);
         }
     } else if (event_type == GATT_EVENT_SERVICE_QUERY_RESULT) {
-        DEBUG_EVENT_printf("  --> gatt service query result\n");
+        DEBUG_printf("  --> gatt service query result\n");
         uint16_t conn_handle = gatt_event_service_query_result_get_handle(packet);
         gatt_client_service_t service;
         gatt_event_service_query_result_get_service(packet, &service);
         mp_obj_bluetooth_uuid_t service_uuid = create_mp_uuid(service.uuid16, service.uuid128);
         mp_bluetooth_gattc_on_primary_service_result(conn_handle, service.start_group_handle, service.end_group_handle, &service_uuid);
     } else if (event_type == GATT_EVENT_CHARACTERISTIC_QUERY_RESULT) {
-        DEBUG_EVENT_printf("  --> gatt characteristic query result\n");
+        DEBUG_printf("  --> gatt characteristic query result\n");
         uint16_t conn_handle = gatt_event_characteristic_query_result_get_handle(packet);
         gatt_client_characteristic_t characteristic;
         gatt_event_characteristic_query_result_get_characteristic(packet, &characteristic);
         mp_obj_bluetooth_uuid_t characteristic_uuid = create_mp_uuid(characteristic.uuid16, characteristic.uuid128);
         mp_bluetooth_gattc_on_characteristic_result(conn_handle, characteristic.start_handle, characteristic.value_handle, characteristic.properties, &characteristic_uuid);
     } else if (event_type == GATT_EVENT_CHARACTERISTIC_DESCRIPTOR_QUERY_RESULT) {
-        DEBUG_EVENT_printf("  --> gatt descriptor query result\n");
+        DEBUG_printf("  --> gatt descriptor query result\n");
         uint16_t conn_handle = gatt_event_all_characteristic_descriptors_query_result_get_handle(packet);
         gatt_client_characteristic_descriptor_t descriptor;
         gatt_event_all_characteristic_descriptors_query_result_get_characteristic_descriptor(packet, &descriptor);
         mp_obj_bluetooth_uuid_t descriptor_uuid = create_mp_uuid(descriptor.uuid16, descriptor.uuid128);
         mp_bluetooth_gattc_on_descriptor_result(conn_handle, descriptor.handle, &descriptor_uuid);
     } else if (event_type == GATT_EVENT_CHARACTERISTIC_VALUE_QUERY_RESULT) {
-        DEBUG_EVENT_printf("  --> gatt characteristic value query result\n");
+        DEBUG_printf("  --> gatt characteristic value query result\n");
         uint16_t conn_handle = gatt_event_characteristic_value_query_result_get_handle(packet);
         uint16_t value_handle = gatt_event_characteristic_value_query_result_get_value_handle(packet);
         uint16_t len = gatt_event_characteristic_value_query_result_get_value_length(packet);
@@ -392,7 +392,7 @@ STATIC void btstack_packet_handler(uint8_t packet_type, uint8_t *packet, uint8_t
         mp_bluetooth_gattc_on_data_available_chunk(data, len);
         mp_bluetooth_gattc_on_data_available_end(atomic_state);
     } else if (event_type == GATT_EVENT_NOTIFICATION) {
-        DEBUG_EVENT_printf("  --> gatt notification\n");
+        DEBUG_printf("  --> gatt notification\n");
         uint16_t conn_handle = gatt_event_notification_get_handle(packet);
         uint16_t value_handle = gatt_event_notification_get_value_handle(packet);
         uint16_t len = gatt_event_notification_get_value_length(packet);
@@ -402,7 +402,7 @@ STATIC void btstack_packet_handler(uint8_t packet_type, uint8_t *packet, uint8_t
         mp_bluetooth_gattc_on_data_available_chunk(data, len);
         mp_bluetooth_gattc_on_data_available_end(atomic_state);
     } else if (event_type == GATT_EVENT_INDICATION) {
-        DEBUG_EVENT_printf("  --> gatt indication\n");
+        DEBUG_printf("  --> gatt indication\n");
         uint16_t conn_handle = gatt_event_indication_get_handle(packet);
         uint16_t value_handle = gatt_event_indication_get_value_handle(packet);
         uint16_t len = gatt_event_indication_get_value_length(packet);
@@ -413,17 +413,17 @@ STATIC void btstack_packet_handler(uint8_t packet_type, uint8_t *packet, uint8_t
         mp_bluetooth_gattc_on_data_available_end(atomic_state);
     } else if (event_type == GATT_EVENT_CAN_WRITE_WITHOUT_RESPONSE) {
         uint16_t conn_handle = gatt_event_can_write_without_response_get_handle(packet);
-        DEBUG_EVENT_printf("  --> gatt can write without response %d\n", conn_handle);
+        DEBUG_printf("  --> gatt can write without response %d\n", conn_handle);
         mp_btstack_pending_op_t *pending_op = btstack_finish_pending_operation(MP_BLUETOOTH_BTSTACK_PENDING_WRITE_NO_RESPONSE, conn_handle, 0xffff, false /* !del */);
         if (pending_op) {
-            DEBUG_EVENT_printf("  --> ready for value_handle=%d len=%lu\n", pending_op->value_handle, pending_op->len);
+            DEBUG_printf("  --> ready for value_handle=%d len=%zu\n", pending_op->value_handle, pending_op->len);
             gatt_client_write_value_of_characteristic_without_response(pending_op->conn_handle, pending_op->value_handle, pending_op->len, (uint8_t *)pending_op->buf);
             // Note: Can't "del" the pending_op from IRQ context. Leave it for the GC.
         }
 
     #endif // MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE
     } else {
-        DEBUG_EVENT_printf("  --> hci event type: unknown (0x%02x)\n", event_type);
+        DEBUG_printf("  --> hci event type: unknown (0x%02x)\n", event_type);
     }
 }
 
@@ -489,7 +489,7 @@ STATIC void btstack_init_deinit_timeout_handler(btstack_timer_source_t *ds) {
 }
 
 int mp_bluetooth_init(void) {
-    DEBUG_EVENT_printf("mp_bluetooth_init\n");
+    DEBUG_printf("mp_bluetooth_init\n");
 
     if (mp_bluetooth_btstack_state == MP_BLUETOOTH_BTSTACK_STATE_ACTIVE) {
         return 0;
@@ -538,6 +538,8 @@ int mp_bluetooth_init(void) {
     btstack_run_loop_set_timer_handler(&btstack_init_deinit_timeout, btstack_init_deinit_timeout_handler);
     btstack_run_loop_add_timer(&btstack_init_deinit_timeout);
 
+    DEBUG_printf("mp_bluetooth_init: waiting for stack startup\n");
+
     // Either the HCI event will set state to ACTIVE, or the timeout will set it to TIMEOUT.
     mp_bluetooth_btstack_port_start();
     while (mp_bluetooth_btstack_state == MP_BLUETOOTH_BTSTACK_STATE_STARTING) {
@@ -547,6 +549,8 @@ int mp_bluetooth_init(void) {
 
     // Check for timeout.
     if (mp_bluetooth_btstack_state != MP_BLUETOOTH_BTSTACK_STATE_ACTIVE) {
+        DEBUG_printf("mp_bluetooth_init: stack startup timed out\n");
+
         // Required to stop the polling loop.
         mp_bluetooth_btstack_state = MP_BLUETOOTH_BTSTACK_STATE_OFF;
         // Attempt a shutdown (may not do anything).
@@ -566,7 +570,7 @@ int mp_bluetooth_init(void) {
 }
 
 void mp_bluetooth_deinit(void) {
-    DEBUG_EVENT_printf("mp_bluetooth_deinit\n");
+    DEBUG_printf("mp_bluetooth_deinit\n");
 
     // Nothing to do if not initialised.
     if (!MP_STATE_PORT(bluetooth_btstack_root_pointers)) {
@@ -595,6 +599,8 @@ void mp_bluetooth_deinit(void) {
 
     mp_bluetooth_btstack_state = MP_BLUETOOTH_BTSTACK_STATE_OFF;
     MP_STATE_PORT(bluetooth_btstack_root_pointers) = NULL;
+
+    DEBUG_printf("mp_bluetooth_deinit: complete\n");
 }
 
 bool mp_bluetooth_is_active(void) {
@@ -618,7 +624,7 @@ int mp_bluetooth_gap_set_device_name(const uint8_t *buf, size_t len) {
 }
 
 int mp_bluetooth_gap_advertise_start(bool connectable, int32_t interval_us, const uint8_t *adv_data, size_t adv_data_len, const uint8_t *sr_data, size_t sr_data_len) {
-    DEBUG_EVENT_printf("mp_bluetooth_gap_advertise_start\n");
+    DEBUG_printf("mp_bluetooth_gap_advertise_start\n");
     uint16_t adv_int_min = interval_us / 625;
     uint16_t adv_int_max = interval_us / 625;
     uint8_t adv_type = connectable ? 0 : 2;
@@ -654,14 +660,14 @@ int mp_bluetooth_gap_advertise_start(bool connectable, int32_t interval_us, cons
 }
 
 void mp_bluetooth_gap_advertise_stop(void) {
-    DEBUG_EVENT_printf("mp_bluetooth_gap_advertise_stop\n");
+    DEBUG_printf("mp_bluetooth_gap_advertise_stop\n");
     gap_advertisements_enable(false);
     MP_STATE_PORT(bluetooth_btstack_root_pointers)->adv_data_alloc = 0;
     MP_STATE_PORT(bluetooth_btstack_root_pointers)->adv_data = NULL;
 }
 
 int mp_bluetooth_gatts_register_service_begin(bool append) {
-    DEBUG_EVENT_printf("mp_bluetooth_gatts_register_service_begin\n");
+    DEBUG_printf("mp_bluetooth_gatts_register_service_begin\n");
     if (!append) {
         // This will reset the DB.
         // Becase the DB is statically allocated, there's no problem with just re-initing it.
@@ -682,10 +688,10 @@ int mp_bluetooth_gatts_register_service_begin(bool append) {
 
 STATIC uint16_t att_read_callback(hci_con_handle_t connection_handle, uint16_t att_handle, uint16_t offset, uint8_t *buffer, uint16_t buffer_size) {
     (void)connection_handle;
-    DEBUG_EVENT_printf("btstack: att_read_callback (handle: %u, offset: %u, buffer: %p, size: %u)\n", att_handle, offset, buffer, buffer_size);
+    DEBUG_printf("btstack: att_read_callback (handle: %u, offset: %u, buffer: %p, size: %u)\n", att_handle, offset, buffer, buffer_size);
     mp_bluetooth_gatts_db_entry_t *entry = mp_bluetooth_gatts_db_lookup(MP_STATE_PORT(bluetooth_btstack_root_pointers)->gatts_db, att_handle);
     if (!entry) {
-        DEBUG_EVENT_printf("btstack: att_read_callback handle not found\n");
+        DEBUG_printf("btstack: att_read_callback handle not found\n");
         return 0; // TODO: Find status code for not-found.
     }
 
@@ -695,10 +701,10 @@ STATIC uint16_t att_read_callback(hci_con_handle_t connection_handle, uint16_t a
 STATIC int att_write_callback(hci_con_handle_t connection_handle, uint16_t att_handle, uint16_t transaction_mode, uint16_t offset, uint8_t *buffer, uint16_t buffer_size) {
     (void)offset;
     (void)transaction_mode;
-    DEBUG_EVENT_printf("btstack: att_write_callback (handle: %u, mode: %u, offset: %u, buffer: %p, size: %u)\n", att_handle, transaction_mode, offset, buffer, buffer_size);
+    DEBUG_printf("btstack: att_write_callback (handle: %u, mode: %u, offset: %u, buffer: %p, size: %u)\n", att_handle, transaction_mode, offset, buffer, buffer_size);
     mp_bluetooth_gatts_db_entry_t *entry = mp_bluetooth_gatts_db_lookup(MP_STATE_PORT(bluetooth_btstack_root_pointers)->gatts_db, att_handle);
     if (!entry) {
-        DEBUG_EVENT_printf("btstack: att_write_callback handle not found\n");
+        DEBUG_printf("btstack: att_write_callback handle not found\n");
         return 0; // TODO: Find status code for not-found.
     }
 
@@ -720,7 +726,7 @@ STATIC inline uint16_t get_uuid16(const mp_obj_bluetooth_uuid_t *uuid) {
 }
 
 int mp_bluetooth_gatts_register_service(mp_obj_bluetooth_uuid_t *service_uuid, mp_obj_bluetooth_uuid_t **characteristic_uuids, uint8_t *characteristic_flags, mp_obj_bluetooth_uuid_t **descriptor_uuids, uint8_t *descriptor_flags, uint8_t *num_descriptors, uint16_t *handles, size_t num_characteristics) {
-    DEBUG_EVENT_printf("mp_bluetooth_gatts_register_service\n");
+    DEBUG_printf("mp_bluetooth_gatts_register_service\n");
     // Note: btstack expects BE UUIDs (which it immediately convertes to LE).
     // So we have to convert all our modbluetooth LE UUIDs to BE just for the att_db_util_add_* methods (using get_uuid16 above, and reverse_128 from btstackutil.h).
 
@@ -764,7 +770,7 @@ int mp_bluetooth_gatts_register_service(mp_obj_bluetooth_uuid_t *service_uuid, m
                 return ret;
             }
         }
-        DEBUG_EVENT_printf("Registered char with handle %u\n", handles[handle_index]);
+        DEBUG_printf("mp_bluetooth_gatts_register_service: Registered char with handle %u\n", handles[handle_index]);
         ++handle_index;
 
         for (size_t j = 0; j < num_descriptors[i]; ++j) {
@@ -782,7 +788,7 @@ int mp_bluetooth_gatts_register_service(mp_obj_bluetooth_uuid_t *service_uuid, m
                 return MP_EINVAL;
             }
             mp_bluetooth_gatts_db_create_entry(MP_STATE_PORT(bluetooth_btstack_root_pointers)->gatts_db, handles[handle_index], MP_BLUETOOTH_DEFAULT_ATTR_LEN);
-            DEBUG_EVENT_printf("Registered desc with handle %u\n", handles[handle_index]);
+            DEBUG_printf("mp_bluetooth_gatts_register_service: Registered desc with handle %u\n", handles[handle_index]);
             ++descriptor_index;
             ++handle_index;
         }
@@ -792,23 +798,23 @@ int mp_bluetooth_gatts_register_service(mp_obj_bluetooth_uuid_t *service_uuid, m
 }
 
 int mp_bluetooth_gatts_register_service_end(void) {
-    DEBUG_EVENT_printf("mp_bluetooth_gatts_register_service_end\n");
+    DEBUG_printf("mp_bluetooth_gatts_register_service_end\n");
     att_server_init(att_db_util_get_address(), &att_read_callback, &att_write_callback);
     return 0;
 }
 
 int mp_bluetooth_gatts_read(uint16_t value_handle, uint8_t **value, size_t *value_len) {
-    DEBUG_EVENT_printf("mp_bluetooth_gatts_read\n");
+    DEBUG_printf("mp_bluetooth_gatts_read\n");
     return mp_bluetooth_gatts_db_read(MP_STATE_PORT(bluetooth_btstack_root_pointers)->gatts_db, value_handle, value, value_len);
 }
 
 int mp_bluetooth_gatts_write(uint16_t value_handle, const uint8_t *value, size_t value_len) {
-    DEBUG_EVENT_printf("mp_bluetooth_gatts_write\n");
+    DEBUG_printf("mp_bluetooth_gatts_write\n");
     return mp_bluetooth_gatts_db_write(MP_STATE_PORT(bluetooth_btstack_root_pointers)->gatts_db, value_handle, value, value_len);
 }
 
 int mp_bluetooth_gatts_notify(uint16_t conn_handle, uint16_t value_handle) {
-    DEBUG_EVENT_printf("mp_bluetooth_gatts_notify\n");
+    DEBUG_printf("mp_bluetooth_gatts_notify\n");
     // Note: btstack doesn't appear to support sending a notification without a value, so include the stored value.
     uint8_t *data = NULL;
     size_t len = 0;
@@ -817,7 +823,7 @@ int mp_bluetooth_gatts_notify(uint16_t conn_handle, uint16_t value_handle) {
 }
 
 int mp_bluetooth_gatts_notify_send(uint16_t conn_handle, uint16_t value_handle, const uint8_t *value, size_t value_len) {
-    DEBUG_EVENT_printf("mp_bluetooth_gatts_notify_send\n");
+    DEBUG_printf("mp_bluetooth_gatts_notify_send\n");
 
     // Attempt to send immediately. If it succeeds, btstack will copy the buffer.
     MICROPY_PY_BLUETOOTH_ENTER
@@ -825,7 +831,7 @@ int mp_bluetooth_gatts_notify_send(uint16_t conn_handle, uint16_t value_handle,
     MICROPY_PY_BLUETOOTH_EXIT
 
     if (err == BTSTACK_ACL_BUFFERS_FULL) {
-        DEBUG_EVENT_printf("mp_bluetooth_gatts_notify_send: ACL buffer full, scheduling callback\n");
+        DEBUG_printf("mp_bluetooth_gatts_notify_send: ACL buffer full, scheduling callback\n");
         // Schedule callback, making a copy of the buffer.
         mp_btstack_pending_op_t *pending_op = btstack_enqueue_pending_operation(MP_BLUETOOTH_BTSTACK_PENDING_NOTIFY, conn_handle, value_handle, value, value_len);
 
@@ -843,7 +849,7 @@ int mp_bluetooth_gatts_notify_send(uint16_t conn_handle, uint16_t value_handle,
 }
 
 int mp_bluetooth_gatts_indicate(uint16_t conn_handle, uint16_t value_handle) {
-    DEBUG_EVENT_printf("mp_bluetooth_gatts_indicate\n");
+    DEBUG_printf("mp_bluetooth_gatts_indicate\n");
 
     uint8_t *data = NULL;
     size_t len = 0;
@@ -858,7 +864,7 @@ int mp_bluetooth_gatts_indicate(uint16_t conn_handle, uint16_t value_handle) {
     MICROPY_PY_BLUETOOTH_EXIT
 
     if (err == BTSTACK_ACL_BUFFERS_FULL) {
-        DEBUG_EVENT_printf("mp_bluetooth_gatts_indicate: ACL buffer full, scheduling callback\n");
+        DEBUG_printf("mp_bluetooth_gatts_indicate: ACL buffer full, scheduling callback\n");
         // Schedule callback, making a copy of the buffer.
         mp_btstack_pending_op_t *pending_op = btstack_enqueue_pending_operation(MP_BLUETOOTH_BTSTACK_PENDING_INDICATE, conn_handle, value_handle, data, len);
 
@@ -876,12 +882,12 @@ int mp_bluetooth_gatts_indicate(uint16_t conn_handle, uint16_t value_handle) {
 }
 
 int mp_bluetooth_gatts_set_buffer(uint16_t value_handle, size_t len, bool append) {
-    DEBUG_EVENT_printf("mp_bluetooth_gatts_set_buffer\n");
+    DEBUG_printf("mp_bluetooth_gatts_set_buffer\n");
     return mp_bluetooth_gatts_db_resize(MP_STATE_PORT(bluetooth_btstack_root_pointers)->gatts_db, value_handle, len, append);
 }
 
 int mp_bluetooth_gap_disconnect(uint16_t conn_handle) {
-    DEBUG_EVENT_printf("mp_bluetooth_gap_disconnect\n");
+    DEBUG_printf("mp_bluetooth_gap_disconnect\n");
     gap_disconnect(conn_handle);
     return 0;
 }
@@ -895,7 +901,7 @@ STATIC void scan_duration_timeout_handler(btstack_timer_source_t *ds) {
 }
 
 int mp_bluetooth_gap_scan_start(int32_t duration_ms, int32_t interval_us, int32_t window_us, bool active_scan) {
-    DEBUG_EVENT_printf("mp_bluetooth_gap_scan_start\n");
+    DEBUG_printf("mp_bluetooth_gap_scan_start\n");
 
     if (duration_ms > 0) {
         btstack_run_loop_set_timer(&scan_duration_timeout, duration_ms);
@@ -910,7 +916,7 @@ int mp_bluetooth_gap_scan_start(int32_t duration_ms, int32_t interval_us, int32_
 }
 
 int mp_bluetooth_gap_scan_stop(void) {
-    DEBUG_EVENT_printf("mp_bluetooth_gap_scan_stop\n");
+    DEBUG_printf("mp_bluetooth_gap_scan_stop\n");
     btstack_run_loop_remove_timer(&scan_duration_timeout);
     gap_stop_scan();
     mp_bluetooth_gap_on_scan_complete();
@@ -918,7 +924,7 @@ int mp_bluetooth_gap_scan_stop(void) {
 }
 
 int mp_bluetooth_gap_peripheral_connect(uint8_t addr_type, const uint8_t *addr, int32_t duration_ms) {
-    DEBUG_EVENT_printf("mp_bluetooth_gap_peripheral_connect\n");
+    DEBUG_printf("mp_bluetooth_gap_peripheral_connect\n");
 
     uint16_t conn_scan_interval = 60000 / 625;
     uint16_t conn_scan_window = 30000 / 625;
@@ -937,7 +943,7 @@ int mp_bluetooth_gap_peripheral_connect(uint8_t addr_type, const uint8_t *addr,
 }
 
 int mp_bluetooth_gattc_discover_primary_services(uint16_t conn_handle, const mp_obj_bluetooth_uuid_t *uuid) {
-    DEBUG_EVENT_printf("mp_bluetooth_gattc_discover_primary_services\n");
+    DEBUG_printf("mp_bluetooth_gattc_discover_primary_services\n");
     uint8_t err;
     if (uuid) {
         if (uuid->type == MP_BLUETOOTH_UUID_TYPE_16) {
@@ -947,7 +953,7 @@ int mp_bluetooth_gattc_discover_primary_services(uint16_t conn_handle, const mp_
             reverse_128(uuid->data, buffer);
             err = gatt_client_discover_primary_services_by_uuid128(&btstack_packet_handler_discover_services, conn_handle, buffer);
         } else {
-            DEBUG_EVENT_printf("  --> unknown UUID size\n");
+            DEBUG_printf("  --> unknown UUID size\n");
             return MP_EINVAL;
         }
     } else {
@@ -957,7 +963,7 @@ int mp_bluetooth_gattc_discover_primary_services(uint16_t conn_handle, const mp_
 }
 
 int mp_bluetooth_gattc_discover_characteristics(uint16_t conn_handle, uint16_t start_handle, uint16_t end_handle, const mp_obj_bluetooth_uuid_t *uuid) {
-    DEBUG_EVENT_printf("mp_bluetooth_gattc_discover_characteristics\n");
+    DEBUG_printf("mp_bluetooth_gattc_discover_characteristics\n");
     gatt_client_service_t service = {
         // Only start/end handles needed for gatt_client_discover_characteristics_for_service.
         .start_group_handle = start_handle,
@@ -974,7 +980,7 @@ int mp_bluetooth_gattc_discover_characteristics(uint16_t conn_handle, uint16_t s
             reverse_128(uuid->data, buffer);
             err = gatt_client_discover_characteristics_for_service_by_uuid128(&btstack_packet_handler_discover_characteristics, conn_handle, &service, buffer);
         } else {
-            DEBUG_EVENT_printf("  --> unknown UUID size\n");
+            DEBUG_printf("  --> unknown UUID size\n");
             return MP_EINVAL;
         }
     } else {
@@ -984,7 +990,7 @@ int mp_bluetooth_gattc_discover_characteristics(uint16_t conn_handle, uint16_t s
 }
 
 int mp_bluetooth_gattc_discover_descriptors(uint16_t conn_handle, uint16_t start_handle, uint16_t end_handle) {
-    DEBUG_EVENT_printf("mp_bluetooth_gattc_discover_descriptors\n");
+    DEBUG_printf("mp_bluetooth_gattc_discover_descriptors\n");
     gatt_client_characteristic_t characteristic = {
         // Only start/end handles needed for gatt_client_discover_characteristic_descriptors.
         .start_handle = start_handle,
@@ -998,12 +1004,12 @@ int mp_bluetooth_gattc_discover_descriptors(uint16_t conn_handle, uint16_t start
 }
 
 int mp_bluetooth_gattc_read(uint16_t conn_handle, uint16_t value_handle) {
-    DEBUG_EVENT_printf("mp_bluetooth_gattc_read\n");
+    DEBUG_printf("mp_bluetooth_gattc_read\n");
     return btstack_error_to_errno(gatt_client_read_value_of_characteristic_using_value_handle(&btstack_packet_handler_read, conn_handle, value_handle));
 }
 
 int mp_bluetooth_gattc_write(uint16_t conn_handle, uint16_t value_handle, const uint8_t *value, size_t *value_len, unsigned int mode) {
-    DEBUG_EVENT_printf("mp_bluetooth_gattc_write\n");
+    DEBUG_printf("mp_bluetooth_gattc_write\n");
 
     // We should be distinguishing between gatt_client_write_value_of_characteristic vs
     // gatt_client_write_characteristic_descriptor_using_descriptor_handle.
@@ -1018,13 +1024,13 @@ int mp_bluetooth_gattc_write(uint16_t conn_handle, uint16_t value_handle, const
         // If possible, this will send immediately, copying the buffer directly to the ACL buffer.
         err = gatt_client_write_value_of_characteristic_without_response(conn_handle, value_handle, *value_len, (uint8_t *)value);
         if (err == GATT_CLIENT_BUSY) {
-            DEBUG_EVENT_printf("mp_bluetooth_gattc_write: client busy\n");
+            DEBUG_printf("mp_bluetooth_gattc_write: client busy\n");
             // Can't send right now, need to take a copy of the buffer and add it to the queue.
             pending_op = btstack_enqueue_pending_operation(MP_BLUETOOTH_BTSTACK_PENDING_WRITE_NO_RESPONSE, conn_handle, value_handle, value, *value_len);
             // Notify when this conn_handle can write.
             err = gatt_client_request_can_write_without_response_event(&btstack_packet_handler_generic, conn_handle);
         } else {
-            DEBUG_EVENT_printf("mp_bluetooth_gattc_write: other failure: %d\n", err);
+            DEBUG_printf("mp_bluetooth_gattc_write: other failure: %d\n", err);
         }
     } else if (mode == MP_BLUETOOTH_WRITE_MODE_WITH_RESPONSE) {
         // Pending operation copies the value buffer and keeps a GC reference
diff --git a/extmod/nimble/modbluetooth_nimble.c b/extmod/nimble/modbluetooth_nimble.c
index e51f2747ec5c8..36bfa6cccfa61 100644
--- a/extmod/nimble/modbluetooth_nimble.c
+++ b/extmod/nimble/modbluetooth_nimble.c
@@ -45,7 +45,7 @@
 #define MICROPY_PY_BLUETOOTH_DEFAULT_GAP_NAME "MPY NIMBLE"
 #endif
 
-#define DEBUG_EVENT_printf(...) // printf(__VA_ARGS__)
+#define DEBUG_printf(...) // printf("nimble: " __VA_ARGS__)
 
 #define ERRNO_BLUETOOTH_NOT_ACTIVE MP_ENODEV
 
@@ -172,10 +172,12 @@ STATIC void sync_cb(void) {
     }
 
     if (MP_BLUETOOTH_DEFAULT_ATTR_LEN > 20) {
+        DEBUG_printf("sync_cb: Setting MTU\n");
         rc = ble_att_set_preferred_mtu(MP_BLUETOOTH_DEFAULT_ATTR_LEN + 3);
         assert(rc == 0);
     }
 
+    DEBUG_printf("sync_cb: Setting device name\n");
     ble_svc_gap_device_name_set(MICROPY_PY_BLUETOOTH_DEFAULT_GAP_NAME);
 
     mp_bluetooth_nimble_ble_state = MP_BLUETOOTH_NIMBLE_BLE_STATE_ACTIVE;
@@ -188,12 +190,12 @@ STATIC void gatts_register_cb(struct ble_gatt_register_ctxt *ctxt, void *arg) {
     switch (ctxt->op) {
         case BLE_GATT_REGISTER_OP_SVC:
             // Called when a service is successfully registered.
-            DEBUG_EVENT_printf("gatts_register_cb: svc uuid=%p handle=%d\n", &ctxt->svc.svc_def->uuid, ctxt->svc.handle);
+            DEBUG_printf("gatts_register_cb: svc uuid=%p handle=%d\n", &ctxt->svc.svc_def->uuid, ctxt->svc.handle);
             break;
 
         case BLE_GATT_REGISTER_OP_CHR:
             // Called when a characteristic is successfully registered.
-            DEBUG_EVENT_printf("gatts_register_cb: chr uuid=%p def_handle=%d val_handle=%d\n", &ctxt->chr.chr_def->uuid, ctxt->chr.def_handle, ctxt->chr.val_handle);
+            DEBUG_printf("gatts_register_cb: chr uuid=%p def_handle=%d val_handle=%d\n", &ctxt->chr.chr_def->uuid, ctxt->chr.def_handle, ctxt->chr.val_handle);
 
             // Note: We will get this event for the default GAP Service, meaning that we allocate storage for the
             // "device name" and "appearance" characteristics, even though we never see the reads for them.
@@ -207,7 +209,7 @@ STATIC void gatts_register_cb(struct ble_gatt_register_ctxt *ctxt, void *arg) {
         case BLE_GATT_REGISTER_OP_DSC:
             // Called when a descriptor is successfully registered.
             // Note: This is event is not called for the CCCD.
-            DEBUG_EVENT_printf("gatts_register_cb: dsc uuid=%p handle=%d\n", &ctxt->dsc.dsc_def->uuid, ctxt->dsc.handle);
+            DEBUG_printf("gatts_register_cb: dsc uuid=%p handle=%d\n", &ctxt->dsc.dsc_def->uuid, ctxt->dsc.handle);
 
             // See above, safe to alloc.
             mp_bluetooth_gatts_db_create_entry(MP_STATE_PORT(bluetooth_nimble_root_pointers)->gatts_db, ctxt->dsc.handle, MP_BLUETOOTH_DEFAULT_ATTR_LEN);
@@ -217,13 +219,13 @@ STATIC void gatts_register_cb(struct ble_gatt_register_ctxt *ctxt, void *arg) {
             break;
 
         default:
-            DEBUG_EVENT_printf("gatts_register_cb: unknown op %d\n", ctxt->op);
+            DEBUG_printf("gatts_register_cb: unknown op %d\n", ctxt->op);
             break;
     }
 }
 
 STATIC int gap_event_cb(struct ble_gap_event *event, void *arg) {
-    DEBUG_EVENT_printf("gap_event_cb: type=%d\n", event->type);
+    DEBUG_printf("gap_event_cb: type=%d\n", event->type);
     if (!mp_bluetooth_is_active()) {
         return 0;
     }
@@ -250,7 +252,7 @@ STATIC int gap_event_cb(struct ble_gap_event *event, void *arg) {
             break;
 
         case BLE_GAP_EVENT_NOTIFY_TX: {
-            DEBUG_EVENT_printf("gap_event_cb: notify_tx: %d %d\n", event->notify_tx.indication, event->notify_tx.status);
+            DEBUG_printf("gap_event_cb: notify_tx: %d %d\n", event->notify_tx.indication, event->notify_tx.status);
             // This event corresponds to either a sent notify/indicate (status == 0), or an indication confirmation (status != 0).
             if (event->notify_tx.indication && event->notify_tx.status != 0) {
                 // Map "done/ack" to 0, otherwise pass the status directly.
@@ -263,7 +265,7 @@ STATIC int gap_event_cb(struct ble_gap_event *event, void *arg) {
 }
 
 int mp_bluetooth_init(void) {
-    DEBUG_EVENT_printf("mp_bluetooth_init\n");
+    DEBUG_printf("mp_bluetooth_init\n");
     // Clean up if necessary.
     mp_bluetooth_deinit();
 
@@ -291,7 +293,7 @@ int mp_bluetooth_init(void) {
     while (mp_bluetooth_nimble_ble_state != MP_BLUETOOTH_NIMBLE_BLE_STATE_ACTIVE) {
         MICROPY_EVENT_POLL_HOOK
     }
-    DEBUG_EVENT_printf("mp_bluetooth_init: ready\n");
+    DEBUG_printf("mp_bluetooth_init: ready\n");
 
     return 0;
 }
@@ -304,7 +306,7 @@ STATIC void ble_hs_shutdown_stop_cb(int status, void *arg) {
 STATIC struct ble_hs_stop_listener ble_hs_shutdown_stop_listener;
 
 void mp_bluetooth_deinit(void) {
-    DEBUG_EVENT_printf("mp_bluetooth_deinit\n");
+    DEBUG_printf("mp_bluetooth_deinit\n");
     if (mp_bluetooth_nimble_ble_state == MP_BLUETOOTH_NIMBLE_BLE_STATE_OFF) {
         return;
     }
@@ -325,7 +327,7 @@ void mp_bluetooth_deinit(void) {
     mp_bluetooth_nimble_port_deinit();
 
     MP_STATE_PORT(bluetooth_nimble_root_pointers) = NULL;
-    DEBUG_EVENT_printf("mp_bluetooth_deinit: shut down\n");
+    DEBUG_printf("mp_bluetooth_deinit: shut down\n");
 }
 
 bool mp_bluetooth_is_active(void) {
@@ -409,7 +411,7 @@ int mp_bluetooth_gap_advertise_start(bool connectable, int32_t interval_us, cons
     if (ret == 0) {
         return 0;
     }
-    DEBUG_EVENT_printf("ble_gap_adv_start: %d\n", ret);
+    DEBUG_printf("ble_gap_adv_start: %d\n", ret);
 
     return ble_hs_err_to_errno(ret);
 }
@@ -421,7 +423,7 @@ void mp_bluetooth_gap_advertise_stop(void) {
 }
 
 static int characteristic_access_cb(uint16_t conn_handle, uint16_t value_handle, struct ble_gatt_access_ctxt *ctxt, void *arg) {
-    DEBUG_EVENT_printf("characteristic_access_cb: conn_handle=%u value_handle=%u op=%u\n", conn_handle, value_handle, ctxt->op);
+    DEBUG_printf("characteristic_access_cb: conn_handle=%u value_handle=%u op=%u\n", conn_handle, value_handle, ctxt->op);
     if (!mp_bluetooth_is_active()) {
         return 0;
     }
@@ -640,7 +642,7 @@ STATIC void gattc_on_data_available(uint8_t event, uint16_t conn_handle, uint16_
 }
 
 STATIC int gap_scan_cb(struct ble_gap_event *event, void *arg) {
-    DEBUG_EVENT_printf("gap_scan_cb: event=%d type=%d\n", event->type, event->type == BLE_GAP_EVENT_DISC ? event->disc.event_type : -1);
+    DEBUG_printf("gap_scan_cb: event=%d type=%d\n", event->type, event->type == BLE_GAP_EVENT_DISC ? event->disc.event_type : -1);
     if (!mp_bluetooth_is_active()) {
         return 0;
     }
@@ -681,6 +683,7 @@ int mp_bluetooth_gap_scan_start(int32_t duration_ms, int32_t interval_us, int32_
 }
 
 int mp_bluetooth_gap_scan_stop(void) {
+    DEBUG_printf("mp_bluetooth_gap_scan_stop\n");
     if (!mp_bluetooth_is_active()) {
         return ERRNO_BLUETOOTH_NOT_ACTIVE;
     }
@@ -697,7 +700,7 @@ int mp_bluetooth_gap_scan_stop(void) {
 
 // Central role: GAP events for a connected peripheral.
 STATIC int peripheral_gap_event_cb(struct ble_gap_event *event, void *arg) {
-    DEBUG_EVENT_printf("peripheral_gap_event_cb: event=%d\n", event->type);
+    DEBUG_printf("peripheral_gap_event_cb: event=%d\n", event->type);
     if (!mp_bluetooth_is_active()) {
         return 0;
     }
@@ -745,6 +748,7 @@ STATIC int peripheral_gap_event_cb(struct ble_gap_event *event, void *arg) {
 }
 
 int mp_bluetooth_gap_peripheral_connect(uint8_t addr_type, const uint8_t *addr, int32_t duration_ms) {
+    DEBUG_printf("mp_bluetooth_gap_peripheral_connect\n");
     if (!mp_bluetooth_is_active()) {
         return ERRNO_BLUETOOTH_NOT_ACTIVE;
     }
@@ -770,7 +774,7 @@ int mp_bluetooth_gap_peripheral_connect(uint8_t addr_type, const uint8_t *addr,
 }
 
 STATIC int peripheral_discover_service_cb(uint16_t conn_handle, const struct ble_gatt_error *error, const struct ble_gatt_svc *service, void *arg) {
-    DEBUG_EVENT_printf("peripheral_discover_service_cb: conn_handle=%d status=%d start_handle=%d\n", conn_handle, error->status, service ? service->start_handle : -1);
+    DEBUG_printf("peripheral_discover_service_cb: conn_handle=%d status=%d start_handle=%d\n", conn_handle, error->status, service ? service->start_handle : -1);
     if (!mp_bluetooth_is_active()) {
         return 0;
     }
@@ -799,7 +803,7 @@ int mp_bluetooth_gattc_discover_primary_services(uint16_t conn_handle, const mp_
 }
 
 STATIC int ble_gatt_characteristic_cb(uint16_t conn_handle, const struct ble_gatt_error *error, const struct ble_gatt_chr *characteristic, void *arg) {
-    DEBUG_EVENT_printf("ble_gatt_characteristic_cb: conn_handle=%d status=%d def_handle=%d val_handle=%d\n", conn_handle, error->status, characteristic ? characteristic->def_handle : -1, characteristic ? characteristic->val_handle : -1);
+    DEBUG_printf("ble_gatt_characteristic_cb: conn_handle=%d status=%d def_handle=%d val_handle=%d\n", conn_handle, error->status, characteristic ? characteristic->def_handle : -1, characteristic ? characteristic->val_handle : -1);
     if (!mp_bluetooth_is_active()) {
         return 0;
     }
@@ -828,7 +832,7 @@ int mp_bluetooth_gattc_discover_characteristics(uint16_t conn_handle, uint16_t s
 }
 
 STATIC int ble_gatt_descriptor_cb(uint16_t conn_handle, const struct ble_gatt_error *error, uint16_t characteristic_val_handle, const struct ble_gatt_dsc *descriptor, void *arg) {
-    DEBUG_EVENT_printf("ble_gatt_descriptor_cb: conn_handle=%d status=%d chr_handle=%d dsc_handle=%d\n", conn_handle, error->status, characteristic_val_handle, descriptor ? descriptor->handle : -1);
+    DEBUG_printf("ble_gatt_descriptor_cb: conn_handle=%d status=%d chr_handle=%d dsc_handle=%d\n", conn_handle, error->status, characteristic_val_handle, descriptor ? descriptor->handle : -1);
     if (!mp_bluetooth_is_active()) {
         return 0;
     }
@@ -850,7 +854,7 @@ int mp_bluetooth_gattc_discover_descriptors(uint16_t conn_handle, uint16_t start
 }
 
 STATIC int ble_gatt_attr_read_cb(uint16_t conn_handle, const struct ble_gatt_error *error, struct ble_gatt_attr *attr, void *arg) {
-    DEBUG_EVENT_printf("ble_gatt_attr_read_cb: conn_handle=%d status=%d handle=%d\n", conn_handle, error->status, attr ? attr->handle : -1);
+    DEBUG_printf("ble_gatt_attr_read_cb: conn_handle=%d status=%d handle=%d\n", conn_handle, error->status, attr ? attr->handle : -1);
     if (!mp_bluetooth_is_active()) {
         return 0;
     }
@@ -871,7 +875,7 @@ int mp_bluetooth_gattc_read(uint16_t conn_handle, uint16_t value_handle) {
 }
 
 STATIC int ble_gatt_attr_write_cb(uint16_t conn_handle, const struct ble_gatt_error *error, struct ble_gatt_attr *attr, void *arg) {
-    DEBUG_EVENT_printf("ble_gatt_attr_write_cb: conn_handle=%d status=%d handle=%d\n", conn_handle, error->status, attr ? attr->handle : -1);
+    DEBUG_printf("ble_gatt_attr_write_cb: conn_handle=%d status=%d handle=%d\n", conn_handle, error->status, attr ? attr->handle : -1);
     if (!mp_bluetooth_is_active()) {
         return 0;
     }

From ed14435a8e6199b845c3404a9052f9ff4213292c Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Fri, 14 Aug 2020 15:43:09 +1000
Subject: [PATCH 0245/3533] extmod/modbluetooth: Refactor stack/hci/driver/port
 bindings.

Previously the interaction between the different layers of the Bluetooth
stack was different on each port and each stack.  This commit defines
common interfaces between them and implements them for cyw43, btstack,
nimble, stm32, unix.
---
 drivers/cyw43/cywbt.c                         |  14 +-
 extmod/btstack/btstack.mk                     |  11 ++
 extmod/btstack/btstack_config.h               |   1 +
 .../btstack/btstack_hci_uart.c                |  94 ++++----------
 .../btstack_hci_uart.h}                       |  21 ++-
 extmod/btstack/modbluetooth_btstack.c         |   5 +
 extmod/btstack/modbluetooth_btstack.h         |   1 +
 extmod/mpbthci.c                              |  38 ++++++
 extmod/{modbluetooth_hci.h => mpbthci.h}      |  25 ++--
 extmod/nimble/hal/hal_uart.c                  |  25 ++--
 extmod/nimble/hal/hal_uart.h                  |  31 ++++-
 extmod/nimble/logcfg/logcfg.h                 |  45 +++++++
 extmod/nimble/modbluetooth_nimble.c           | 122 ++++++++++++++----
 extmod/nimble/modbluetooth_nimble.h           |  18 ++-
 extmod/nimble/nimble.mk                       |  13 +-
 .../nimble/{npl_os.c => nimble_npl_os.c}      |  64 ++++++---
 extmod/nimble/nimble/nimble_npl_os.h          |  19 ++-
 extmod/nimble/syscfg/syscfg.h                 |   5 +-
 ports/esp32/Makefile                          |   2 +-
 ports/esp32/{nimble.c => mpnimbleport.c}      |  30 ++++-
 ports/stm32/Makefile                          |   7 +-
 .../{modbluetooth_hci.c => mpbthciport.c}     |  97 +++++++++-----
 ports/stm32/mpbtstackport.c                   | 107 +++++++++++++++
 ports/stm32/mpbtstackport.h                   |  34 +++++
 ports/stm32/mpconfigport.h                    |  21 ++-
 ports/stm32/{nimble.c => mpnimbleport.c}      |  61 ++++-----
 ports/stm32/mpnimbleport.h                    |  34 +++++
 ports/unix/Makefile                           |   9 +-
 ports/unix/mpbtstackport.h                    |  39 ++++++
 ports/unix/mpbtstackport_common.c             |  92 +++++++++++++
 .../{btstack_usb.c => mpbtstackport_usb.c}    | 101 ++-------------
 ports/unix/mpconfigport.h                     |   4 +-
 32 files changed, 849 insertions(+), 341 deletions(-)
 rename ports/stm32/btstack.c => extmod/btstack/btstack_hci_uart.c (67%)
 rename extmod/{nimble/nimble/nimble_hci_uart.h => btstack/btstack_hci_uart.h} (66%)
 create mode 100644 extmod/mpbthci.c
 rename extmod/{modbluetooth_hci.h => mpbthci.h} (71%)
 create mode 100644 extmod/nimble/logcfg/logcfg.h
 rename extmod/nimble/nimble/{npl_os.c => nimble_npl_os.c} (85%)
 rename ports/esp32/{nimble.c => mpnimbleport.c} (66%)
 rename ports/stm32/{modbluetooth_hci.c => mpbthciport.c} (75%)
 create mode 100644 ports/stm32/mpbtstackport.c
 create mode 100644 ports/stm32/mpbtstackport.h
 rename ports/stm32/{nimble.c => mpnimbleport.c} (56%)
 create mode 100644 ports/stm32/mpnimbleport.h
 create mode 100644 ports/unix/mpbtstackport.h
 create mode 100644 ports/unix/mpbtstackport_common.c
 rename ports/unix/{btstack_usb.c => mpbtstackport_usb.c} (54%)

diff --git a/drivers/cyw43/cywbt.c b/drivers/cyw43/cywbt.c
index 79318f4483ba4..defe670683ffd 100644
--- a/drivers/cyw43/cywbt.c
+++ b/drivers/cyw43/cywbt.c
@@ -31,13 +31,19 @@
 #include "py/mphal.h"
 #include "pin_static_af.h"
 #include "uart.h"
-#include "extmod/modbluetooth_hci.h"
+#include "extmod/mpbthci.h"
 
 #if MICROPY_PY_NETWORK_CYW43
 
 extern const char fw_4343WA1_7_45_98_50_start;
 #define CYWBT_FW_ADDR (&fw_4343WA1_7_45_98_50_start + 749 * 512 + 29 * 256)
 
+// Provided by the port.
+extern pyb_uart_obj_t mp_bluetooth_hci_uart_obj;
+
+// Provided by the port, and also possibly shared with the stack.
+extern uint8_t mp_bluetooth_hci_cmd_buf[4 + 256];
+
 /******************************************************************************/
 // CYW BT HCI low-level driver
 
@@ -168,10 +174,6 @@ int mp_bluetooth_hci_controller_init(void) {
     mp_hal_pin_config(pyb_pin_WL_GPIO_4, MP_HAL_PIN_MODE_OUTPUT, MP_HAL_PIN_PULL_NONE, 0); // RF-switch power
     mp_hal_pin_high(pyb_pin_WL_GPIO_4); // Turn the RF-switch on
 
-    return 0;
-}
-
-int mp_bluetooth_hci_controller_activate(void) {
     uint8_t buf[256];
 
     mp_hal_pin_low(pyb_pin_BT_REG_ON);
@@ -219,7 +221,7 @@ int mp_bluetooth_hci_controller_activate(void) {
     return 0;
 }
 
-int mp_bluetooth_hci_controller_deactivate(void) {
+int mp_bluetooth_hci_controller_deinit(void) {
     mp_hal_pin_low(pyb_pin_BT_REG_ON);
 
     return 0;
diff --git a/extmod/btstack/btstack.mk b/extmod/btstack/btstack.mk
index dd96e6337943e..3084601b85415 100644
--- a/extmod/btstack/btstack.mk
+++ b/extmod/btstack/btstack.mk
@@ -38,6 +38,17 @@ CFLAGS  += $(shell pkg-config libusb-1.0 --cflags)
 LDFLAGS += $(shell pkg-config libusb-1.0 --libs)
 endif
 
+ifeq ($(MICROPY_BLUETOOTH_BTSTACK_H4),1)
+SRC_BTSTACK += \
+	lib/btstack/src/hci_transport_h4.c \
+	lib/btstack/chipset/zephyr/btstack_chipset_zephyr.c
+
+EXTMOD_SRC_C += \
+	extmod/btstack/btstack_hci_uart.c \
+
+CFLAGS_MOD += -DMICROPY_BLUETOOTH_BTSTACK_H4=1
+endif
+
 ifeq ($(MICROPY_BLUETOOTH_BTSTACK_ENABLE_CLASSIC),1)
 include $(BTSTACK_DIR)/src/classic/Makefile.inc
 SRC_BTSTACK += \
diff --git a/extmod/btstack/btstack_config.h b/extmod/btstack/btstack_config.h
index f420f47a5bee5..e56a84f94a16d 100644
--- a/extmod/btstack/btstack_config.h
+++ b/extmod/btstack/btstack_config.h
@@ -8,6 +8,7 @@
 // #define ENABLE_CLASSIC
 #define ENABLE_LE_DATA_CHANNELS
 // #define ENABLE_LOG_INFO
+// #define ENABLE_LOG_DEBUG
 #define ENABLE_LOG_ERROR
 
 // BTstack configuration. buffers, sizes, ...
diff --git a/ports/stm32/btstack.c b/extmod/btstack/btstack_hci_uart.c
similarity index 67%
rename from ports/stm32/btstack.c
rename to extmod/btstack/btstack_hci_uart.c
index cbb15a86cb972..5c96e02dc0fed 100644
--- a/ports/stm32/btstack.c
+++ b/extmod/btstack/btstack_hci_uart.c
@@ -4,6 +4,7 @@
  * The MIT License (MIT)
  *
  * Copyright (c) 2020 Damien P. George
+ * Copyright (c) 2020 Jim Mussared
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -31,12 +32,14 @@
 #if MICROPY_PY_BLUETOOTH && MICROPY_BLUETOOTH_BTSTACK
 
 #include "lib/btstack/src/btstack.h"
-#include "lib/btstack/platform/embedded/btstack_run_loop_embedded.h"
-#include "lib/btstack/platform/embedded/hal_cpu.h"
-#include "lib/btstack/platform/embedded/hal_time_ms.h"
 
-#include "extmod/modbluetooth_hci.h"
-#include "extmod/btstack/modbluetooth_btstack.h"
+#include "extmod/mpbthci.h"
+#include "extmod/btstack/btstack_hci_uart.h"
+
+#include "mpbtstackport.h"
+
+// Implements a btstack btstack_uart_block_t on top of the mphciuart.h
+// interface to an HCI UART provided by the port.
 
 // We pass the bytes directly to the UART during a send, but then notify btstack in the next poll.
 STATIC bool send_done;
@@ -48,42 +51,29 @@ STATIC size_t recv_len;
 STATIC size_t recv_idx;
 STATIC void (*recv_handler)(void);
 
-// The IRQ functionality in btstack_run_loop_embedded.c is not used, so the
-// following three functions are empty.
-
-void hal_cpu_disable_irqs(void) {
-}
-
-void hal_cpu_enable_irqs(void) {
-}
-
-void hal_cpu_enable_irqs_and_sleep(void) {
-}
-
-uint32_t hal_time_ms(void) {
-    return mp_hal_ticks_ms();
-}
-
 STATIC int btstack_uart_init(const btstack_uart_config_t *uart_config) {
+    (void)uart_config;
+
     send_done = false;
     recv_len = 0;
     recv_idx = 0;
     recv_handler = NULL;
     send_handler = NULL;
 
-    // Set up the UART periperhal.
-    mp_bluetooth_hci_uart_init(MICROPY_HW_BLE_UART_ID);
+    // Set up the UART peripheral, attach IRQ and power up the HCI controller.
+    // We haven't been told the baud rate yet, so defer that until btstack_uart_set_baudrate.
+    mp_bluetooth_hci_uart_init(MICROPY_HW_BLE_UART_ID, 0);
+    mp_bluetooth_hci_controller_init();
 
     return 0;
 }
 
 STATIC int btstack_uart_open(void) {
-    // Attach IRQ and power up the HCI controller.
-    mp_bluetooth_hci_uart_activate();
     return 0;
 }
 
 STATIC int btstack_uart_close(void) {
+    mp_bluetooth_hci_controller_deinit();
     return 0;
 }
 
@@ -101,10 +91,12 @@ STATIC int btstack_uart_set_baudrate(uint32_t baudrate) {
 }
 
 STATIC int btstack_uart_set_parity(int parity) {
+    (void)parity;
     return 0;
 }
 
 STATIC int btstack_uart_set_flowcontrol(int flowcontrol) {
+    (void)flowcontrol;
     return 0;
 }
 
@@ -123,14 +115,16 @@ STATIC int btstack_uart_get_supported_sleep_modes(void) {
 }
 
 STATIC void btstack_uart_set_sleep(btstack_uart_sleep_mode_t sleep_mode) {
+    (void)sleep_mode;
     // printf("btstack_uart_set_sleep %u\n", sleep_mode);
 }
 
 STATIC void btstack_uart_set_wakeup_handler(void (*wakeup_handler)(void)) {
+    (void)wakeup_handler;
     // printf("btstack_uart_set_wakeup_handler\n");
 }
 
-STATIC const btstack_uart_block_t btstack_uart_block = {
+const btstack_uart_block_t mp_bluetooth_btstack_hci_uart_block = {
     &btstack_uart_init,
     &btstack_uart_open,
     &btstack_uart_close,
@@ -146,15 +140,9 @@ STATIC const btstack_uart_block_t btstack_uart_block = {
     &btstack_uart_set_wakeup_handler,
 };
 
-STATIC const hci_transport_config_uart_t hci_transport_config_uart = {
-    HCI_TRANSPORT_CONFIG_UART,
-    MICROPY_HW_BLE_UART_BAUDRATE,
-    3000000,
-    0,
-    NULL,
-};
+void mp_bluetooth_btstack_hci_uart_process(void) {
+    bool host_wake = mp_bluetooth_hci_controller_woken();
 
-STATIC void btstack_uart_process(void) {
     if (send_done) {
         // If we'd done a TX in the last interval, notify btstack that it's complete.
         send_done = false;
@@ -176,48 +164,10 @@ STATIC void btstack_uart_process(void) {
             }
         }
     }
-}
-
-void mp_bluetooth_hci_poll(void) {
-    if (mp_bluetooth_btstack_state == MP_BLUETOOTH_BTSTACK_STATE_OFF) {
-        return;
-    }
 
-    // Process uart data.
-    bool host_wake = mp_bluetooth_hci_controller_woken();
-    btstack_uart_process();
     if (host_wake) {
         mp_bluetooth_hci_controller_sleep_maybe();
     }
-
-    // Call the BTstack run loop.
-    btstack_run_loop_embedded_execute_once();
-}
-
-void mp_bluetooth_btstack_port_init(void) {
-    static bool run_loop_init = false;
-    if (!run_loop_init) {
-        run_loop_init = true;
-        btstack_run_loop_init(btstack_run_loop_embedded_get_instance());
-    } else {
-        btstack_run_loop_embedded_get_instance()->init();
-    }
-
-    // hci_dump_open(NULL, HCI_DUMP_STDOUT);
-    const hci_transport_t *transport = hci_transport_h4_instance(&btstack_uart_block);
-    hci_init(transport, &hci_transport_config_uart);
-
-    // TODO: Probably not necessary for BCM (we have our own firmware loader),
-    // but might be worth investigating for other controllers in the future.
-    // hci_set_chipset(btstack_chipset_bcm_instance());
-}
-
-void mp_bluetooth_btstack_port_deinit(void) {
-    hci_power_control(HCI_POWER_OFF);
-}
-
-void mp_bluetooth_btstack_port_start(void) {
-    hci_power_control(HCI_POWER_ON);
 }
 
 #endif // MICROPY_PY_BLUETOOTH && MICROPY_BLUETOOTH_BTSTACK
diff --git a/extmod/nimble/nimble/nimble_hci_uart.h b/extmod/btstack/btstack_hci_uart.h
similarity index 66%
rename from extmod/nimble/nimble/nimble_hci_uart.h
rename to extmod/btstack/btstack_hci_uart.h
index 646a12dac1460..8011e587dee3f 100644
--- a/extmod/nimble/nimble/nimble_hci_uart.h
+++ b/extmod/btstack/btstack_hci_uart.h
@@ -3,7 +3,8 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2019 Damien P. George
+ * Copyright (c) 2020 Damien P. George
+ * Copyright (c) 2020 Jim Mussared
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -23,18 +24,16 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#ifndef MICROPY_INCLUDED_EXTMOD_NIMBLE_NIMBLE_NIMBLE_HCI_UART_H
-#define MICROPY_INCLUDED_EXTMOD_NIMBLE_NIMBLE_NIMBLE_HCI_UART_H
 
-// Extensions to extmod/modbluetooth_hci.h specific to NimBLE.
+#ifndef MICROPY_INCLUDED_EXTMOD_BTSTACK_HCI_UART_H
+#define MICROPY_INCLUDED_EXTMOD_BTSTACK_HCI_UART_H
 
-#include "extmod/nimble/hal/hal_uart.h"
+#include "lib/btstack/src/btstack.h"
 
-// Helpers called from ports.
-void mp_bluetooth_nimble_hci_uart_process(void);
+// --- Used by the port to create the HCI transport ---------------------------
+extern const btstack_uart_block_t mp_bluetooth_btstack_hci_uart_block;
 
-// Must be provided by the port.
-void mp_bluetooth_nimble_hci_uart_rx(hal_uart_rx_cb_t rx_cb, void *rx_arg);
-void mp_bluetooth_nimble_hci_uart_tx_strn(const char *str, uint len);
+// --- Called by the MicroPython port when UART data is available -------------
+void mp_bluetooth_btstack_hci_uart_process(void);
 
-#endif // MICROPY_INCLUDED_EXTMOD_NIMBLE_NIMBLE_NIMBLE_HCI_UART_H
+#endif // MICROPY_INCLUDED_EXTMOD_BTSTACK_MODBLUETOOTH_BTSTACK_H
diff --git a/extmod/btstack/modbluetooth_btstack.c b/extmod/btstack/modbluetooth_btstack.c
index 9aef7e6879fb0..03ec12b734346 100644
--- a/extmod/btstack/modbluetooth_btstack.c
+++ b/extmod/btstack/modbluetooth_btstack.c
@@ -53,6 +53,8 @@ STATIC const uint16_t BTSTACK_GAP_DEVICE_NAME_HANDLE = 3;
 
 volatile int mp_bluetooth_btstack_state = MP_BLUETOOTH_BTSTACK_STATE_OFF;
 
+#define ERRNO_BLUETOOTH_NOT_ACTIVE MP_ENODEV
+
 STATIC int btstack_error_to_errno(int err) {
     DEBUG_printf("  --> btstack error: %d\n", err);
     if (err == ERROR_CODE_SUCCESS) {
@@ -300,6 +302,9 @@ STATIC void btstack_packet_handler(uint8_t packet_type, uint8_t *packet, uint8_t
         if (state == HCI_STATE_WORKING) {
             // Signal that initialisation has completed.
             mp_bluetooth_btstack_state = MP_BLUETOOTH_BTSTACK_STATE_ACTIVE;
+        } else if (state == HCI_STATE_HALTING) {
+            // Signal that de-initialisation has begun.
+            mp_bluetooth_btstack_state = MP_BLUETOOTH_BTSTACK_STATE_HALTING;
         } else if (state == HCI_STATE_OFF) {
             // Signal that de-initialisation has completed.
             mp_bluetooth_btstack_state = MP_BLUETOOTH_BTSTACK_STATE_OFF;
diff --git a/extmod/btstack/modbluetooth_btstack.h b/extmod/btstack/modbluetooth_btstack.h
index 2fad86f22605e..7890bbfae2c4a 100644
--- a/extmod/btstack/modbluetooth_btstack.h
+++ b/extmod/btstack/modbluetooth_btstack.h
@@ -56,6 +56,7 @@ enum {
     MP_BLUETOOTH_BTSTACK_STATE_OFF,
     MP_BLUETOOTH_BTSTACK_STATE_STARTING,
     MP_BLUETOOTH_BTSTACK_STATE_ACTIVE,
+    MP_BLUETOOTH_BTSTACK_STATE_HALTING,
     MP_BLUETOOTH_BTSTACK_STATE_TIMEOUT,
 };
 
diff --git a/extmod/mpbthci.c b/extmod/mpbthci.c
new file mode 100644
index 0000000000000..79a865424233d
--- /dev/null
+++ b/extmod/mpbthci.c
@@ -0,0 +1,38 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 Jim Mussared
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+// Default definitions in case a controller doesn't implement this.
+
+#include "py/mphal.h"
+
+#if MICROPY_PY_BLUETOOTH
+
+#define DEBUG_printf(...) // printf(__VA_ARGS__)
+
+#include "extmod/mpbthci.h"
+
+
+#endif // MICROPY_PY_BLUETOOTH
diff --git a/extmod/modbluetooth_hci.h b/extmod/mpbthci.h
similarity index 71%
rename from extmod/modbluetooth_hci.h
rename to extmod/mpbthci.h
index d6b432d224710..acb5b832bab11 100644
--- a/extmod/modbluetooth_hci.h
+++ b/extmod/mpbthci.h
@@ -24,15 +24,15 @@
  * THE SOFTWARE.
  */
 
-#ifndef MICROPY_INCLUDED_EXTMOD_MODBLUETOOTH_HCI_H
-#define MICROPY_INCLUDED_EXTMOD_MODBLUETOOTH_HCI_H
+#ifndef MICROPY_INCLUDED_EXTMOD_MPBTHCI_H
+#define MICROPY_INCLUDED_EXTMOD_MPBTHCI_H
 
-#include "uart.h"
+// --- Optionally can be implemented by the driver. ---------------------------
 
-// Optionally can be implemented by the driver.
+// Start/stop the HCI controller.
+// Requires the UART to this HCI controller is available.
 int mp_bluetooth_hci_controller_init(void);
-int mp_bluetooth_hci_controller_activate(void);
-int mp_bluetooth_hci_controller_deactivate(void);
+int mp_bluetooth_hci_controller_deinit(void);
 
 // Tell the controller to go to sleep (e.g. on RX if we don't think we're expecting anything more).
 int mp_bluetooth_hci_controller_sleep_maybe(void);
@@ -41,16 +41,11 @@ bool mp_bluetooth_hci_controller_woken(void);
 // Wake up the controller (e.g. we're about to TX).
 int mp_bluetooth_hci_controller_wakeup(void);
 
-// Storage and bindings that need to be implemented by the port.
-// These are used by the stack bindings (e.g. nimble/hal_uart.c)
-// as well as potentially the driver (e.g. cywbt.c).
-extern uint8_t mp_bluetooth_hci_cmd_buf[4 + 256];
-extern pyb_uart_obj_t mp_bluetooth_hci_uart_obj;
-
-int mp_bluetooth_hci_uart_init(uint32_t port);
-int mp_bluetooth_hci_uart_activate(void);
+// --- Bindings that need to be implemented by the port. ----------------------
+int mp_bluetooth_hci_uart_init(uint32_t port, uint32_t baudrate);
+int mp_bluetooth_hci_uart_deinit(void);
 int mp_bluetooth_hci_uart_set_baudrate(uint32_t baudrate);
 int mp_bluetooth_hci_uart_readchar(void);
 int mp_bluetooth_hci_uart_write(const uint8_t *buf, size_t len);
 
-#endif // MICROPY_INCLUDED_EXTMOD_MODBLUETOOTH_HCI_H
+#endif // MICROPY_INCLUDED_EXTMOD_MPBTHCI_H
diff --git a/extmod/nimble/hal/hal_uart.c b/extmod/nimble/hal/hal_uart.c
index fba82b830438a..c6d0850fea993 100644
--- a/extmod/nimble/hal/hal_uart.c
+++ b/extmod/nimble/hal/hal_uart.c
@@ -26,11 +26,9 @@
 
 #include "py/runtime.h"
 #include "py/mphal.h"
-#include "pin_static_af.h"
 #include "nimble/ble.h"
 #include "extmod/nimble/hal/hal_uart.h"
-#include "extmod/modbluetooth_hci.h"
-#include "extmod/nimble/nimble/nimble_hci_uart.h"
+#include "extmod/mpbthci.h"
 
 #if MICROPY_PY_BLUETOOTH && MICROPY_BLUETOOTH_NIMBLE
 
@@ -39,6 +37,9 @@ static void *hal_uart_tx_arg;
 static hal_uart_rx_cb_t hal_uart_rx_cb;
 static void *hal_uart_rx_arg;
 
+// Provided by the port, and also possibly shared with the driver.
+extern uint8_t mp_bluetooth_hci_cmd_buf[4 + 256];
+
 int hal_uart_init_cbs(uint32_t port, hal_uart_tx_cb_t tx_cb, void *tx_arg, hal_uart_rx_cb_t rx_cb, void *rx_arg) {
     hal_uart_tx_cb = tx_cb;
     hal_uart_tx_arg = tx_arg;
@@ -48,9 +49,7 @@ int hal_uart_init_cbs(uint32_t port, hal_uart_tx_cb_t tx_cb, void *tx_arg, hal_u
 }
 
 int hal_uart_config(uint32_t port, uint32_t baudrate, uint32_t bits, uint32_t stop, uint32_t parity, uint32_t flow) {
-    mp_bluetooth_hci_uart_init(port);
-    mp_bluetooth_hci_uart_set_baudrate(baudrate);
-    return mp_bluetooth_hci_uart_activate();
+    return mp_bluetooth_hci_uart_init(port, baudrate);
 }
 
 void hal_uart_start_tx(uint32_t port) {
@@ -71,7 +70,7 @@ void hal_uart_start_tx(uint32_t port) {
     printf("\n");
     #endif
 
-    mp_bluetooth_nimble_hci_uart_tx_strn((void*)mp_bluetooth_hci_cmd_buf, len);
+    mp_bluetooth_hci_uart_write(mp_bluetooth_hci_cmd_buf, len);
 }
 
 int hal_uart_close(uint32_t port) {
@@ -79,7 +78,17 @@ int hal_uart_close(uint32_t port) {
 }
 
 void mp_bluetooth_nimble_hci_uart_process(void) {
-    mp_bluetooth_nimble_hci_uart_rx(hal_uart_rx_cb, hal_uart_rx_arg);
+    bool host_wake = mp_bluetooth_hci_controller_woken();
+
+    int chr;
+    while ((chr = mp_bluetooth_hci_uart_readchar()) >= 0) {
+        // printf("UART RX: %02x\n", data);
+        hal_uart_rx_cb(hal_uart_rx_arg, chr);
+    }
+
+    if (host_wake) {
+        mp_bluetooth_hci_controller_sleep_maybe();
+    }
 }
 
 #endif // MICROPY_PY_BLUETOOTH && MICROPY_BLUETOOTH_NIMBLE
diff --git a/extmod/nimble/hal/hal_uart.h b/extmod/nimble/hal/hal_uart.h
index 0ef04bc81e026..1ff1c17436dae 100644
--- a/extmod/nimble/hal/hal_uart.h
+++ b/extmod/nimble/hal/hal_uart.h
@@ -1,3 +1,29 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 Jim Mussared
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
 #ifndef MICROPY_INCLUDED_EXTMOD_NIMBLE_HAL_HAL_UART_H
 #define MICROPY_INCLUDED_EXTMOD_NIMBLE_HAL_HAL_UART_H
 
@@ -10,10 +36,13 @@
 typedef int (*hal_uart_tx_cb_t)(void *arg);
 typedef int (*hal_uart_rx_cb_t)(void *arg, uint8_t data);
 
-// Called by NimBLE, implemented in hal_uart.c.
+// --- Called by NimBLE, implemented in hal_uart.c. ---------------------------
 int hal_uart_init_cbs(uint32_t port, hal_uart_tx_cb_t tx_cb, void *tx_arg, hal_uart_rx_cb_t rx_cb, void *rx_arg);
 int hal_uart_config(uint32_t port, uint32_t baud, uint32_t bits, uint32_t stop, uint32_t parity, uint32_t flow);
 void hal_uart_start_tx(uint32_t port);
 int hal_uart_close(uint32_t port);
 
+// --- Called by the MicroPython port when UART data is available -------------
+void mp_bluetooth_nimble_hci_uart_process(void);
+
 #endif // MICROPY_INCLUDED_EXTMOD_NIMBLE_HAL_HAL_UART_H
diff --git a/extmod/nimble/logcfg/logcfg.h b/extmod/nimble/logcfg/logcfg.h
new file mode 100644
index 0000000000000..e9023dae65b5d
--- /dev/null
+++ b/extmod/nimble/logcfg/logcfg.h
@@ -0,0 +1,45 @@
+/**
+ * This file was generated by Apache newt version: 1.8.0-dev
+ */
+
+#ifndef MICROPY_INCLUDED_EXTMOD_NIMBLE_LOGCFG_LOGCFG_H
+#define MICROPY_INCLUDED_EXTMOD_NIMBLE_LOGCFG_LOGCFG_H
+
+#include "py/mphal.h"
+#include "modlog/modlog.h"
+#include "log_common/log_common.h"
+
+#define MICROPY_PY_BLUETOOTH_DIAGNOSTIC_LOGGING (1)
+
+#if MICROPY_PY_BLUETOOTH_DIAGNOSTIC_LOGGING
+#define DFLT_LOG_DEBUG(...) MODLOG_DEBUG(4, __VA_ARGS__)
+#else
+#define DFLT_LOG_DEBUG(...) IGNORE(__VA_ARGS__)
+#endif
+
+#if MICROPY_PY_BLUETOOTH_DIAGNOSTIC_LOGGING > 1
+#define BLE_HS_LOG_DEBUG(...) MODLOG_DEBUG(4, __VA_ARGS__)
+#else
+#define BLE_HS_LOG_DEBUG(...) IGNORE(__VA_ARGS__)
+#endif
+
+#define BLE_HS_LOG_INFO(...) MODLOG_INFO(4, __VA_ARGS__)
+#define BLE_HS_LOG_WARN(...) MODLOG_WARN(4, __VA_ARGS__)
+#define BLE_HS_LOG_ERROR(...) MODLOG_ERROR(4, __VA_ARGS__)
+#define BLE_HS_LOG_CRITICAL(...) MODLOG_CRITICAL(4, __VA_ARGS__)
+#define BLE_HS_LOG_DISABLED(...) MODLOG_DISABLED(4, __VA_ARGS__)
+
+#define DFLT_LOG_INFO(...) MODLOG_INFO(0, __VA_ARGS__)
+#define DFLT_LOG_WARN(...) MODLOG_WARN(0, __VA_ARGS__)
+#define DFLT_LOG_ERROR(...) MODLOG_ERROR(0, __VA_ARGS__)
+#define DFLT_LOG_CRITICAL(...) MODLOG_CRITICAL(0, __VA_ARGS__)
+#define DFLT_LOG_DISABLED(...) MODLOG_DISABLED(0, __VA_ARGS__)
+
+#define MFG_LOG_DEBUG(...) IGNORE(__VA_ARGS__)
+#define MFG_LOG_INFO(...) IGNORE(__VA_ARGS__)
+#define MFG_LOG_WARN(...) IGNORE(__VA_ARGS__)
+#define MFG_LOG_ERROR(...) IGNORE(__VA_ARGS__)
+#define MFG_LOG_CRITICAL(...) IGNORE(__VA_ARGS__)
+#define MFG_LOG_DISABLED(...) MODLOG_DISABLED(128, __VA_ARGS__)
+
+#endif // MICROPY_INCLUDED_EXTMOD_NIMBLE_LOGCFG_LOGCFG_H
diff --git a/extmod/nimble/modbluetooth_nimble.c b/extmod/nimble/modbluetooth_nimble.c
index 36bfa6cccfa61..61ba3a3aba696 100644
--- a/extmod/nimble/modbluetooth_nimble.c
+++ b/extmod/nimble/modbluetooth_nimble.c
@@ -33,6 +33,7 @@
 
 #include "extmod/nimble/modbluetooth_nimble.h"
 #include "extmod/modbluetooth.h"
+#include "extmod/mpbthci.h"
 
 #include "host/ble_hs.h"
 #include "host/util/util.h"
@@ -64,10 +65,11 @@ STATIC int8_t ble_hs_err_to_errno_table[] = {
 };
 
 STATIC int ble_hs_err_to_errno(int err) {
+    DEBUG_printf("ble_hs_err_to_errno: %d\n", err);
     if (!err) {
         return 0;
     }
-    if (0 <= err && err < MP_ARRAY_SIZE(ble_hs_err_to_errno_table) && ble_hs_err_to_errno_table[err]) {
+    if (err >= 0 && (unsigned)err < MP_ARRAY_SIZE(ble_hs_err_to_errno_table) && ble_hs_err_to_errno_table[err]) {
         return ble_hs_err_to_errno_table[err];
     } else {
         return MP_EIO;
@@ -150,6 +152,12 @@ STATIC void sync_cb(void) {
     int rc;
     ble_addr_t addr;
 
+    DEBUG_printf("sync_cb: state=%d\n", mp_bluetooth_nimble_ble_state);
+
+    if (mp_bluetooth_nimble_ble_state != MP_BLUETOOTH_NIMBLE_BLE_STATE_WAITING_FOR_SYNC) {
+        return;
+    }
+
     rc = ble_hs_util_ensure_addr(0); // prefer public address
     if (rc != 0) {
         // https://mynewt.apache.org/latest/tutorials/ble/eddystone.html#configure-the-nimble-stack-with-an-address
@@ -264,11 +272,67 @@ STATIC int gap_event_cb(struct ble_gap_event *event, void *arg) {
     return 0;
 }
 
+#if !MICROPY_BLUETOOTH_NIMBLE_BINDINGS_ONLY
+
+// On ports such as ESP32 where we only implement the bindings, then
+// the port must provide these functions.
+// But for STM32 / Unix-H4, we provide a default implementation of the
+// port-specific functionality.
+// TODO: In the future if a port ever needs to customise these functions
+// then investigate using MP_WEAK or splitting them out to another .c file.
+
+#include "transport/uart/ble_hci_uart.h"
+
+void mp_bluetooth_nimble_port_hci_init(void) {
+    DEBUG_printf("mp_bluetooth_nimble_port_hci_init (nimble default)\n");
+    // This calls mp_bluetooth_hci_uart_init (via ble_hci_uart_init --> hal_uart_config --> mp_bluetooth_hci_uart_init).
+    ble_hci_uart_init();
+    mp_bluetooth_hci_controller_init();
+}
+
+void mp_bluetooth_nimble_port_hci_deinit(void) {
+    DEBUG_printf("mp_bluetooth_nimble_port_hci_deinit (nimble default)\n");
+    mp_bluetooth_hci_controller_deinit();
+    mp_bluetooth_hci_uart_deinit();
+}
+
+void mp_bluetooth_nimble_port_start(void) {
+    DEBUG_printf("mp_bluetooth_nimble_port_start (nimble default)\n");
+    // By default, assume port is already running its own background task (e.g. SysTick on STM32).
+    // ESP32 runs a FreeRTOS task, Unix has a thread.
+}
+
+// Called when the host stop procedure has completed.
+STATIC void ble_hs_shutdown_stop_cb(int status, void *arg) {
+    (void)status;
+    (void)arg;
+    mp_bluetooth_nimble_ble_state = MP_BLUETOOTH_NIMBLE_BLE_STATE_OFF;
+}
+
+STATIC struct ble_hs_stop_listener ble_hs_shutdown_stop_listener;
+
+void mp_bluetooth_nimble_port_shutdown(void) {
+    DEBUG_printf("mp_bluetooth_nimble_port_shutdown (nimble default)\n");
+    // By default, just call ble_hs_stop directly and wait for the stack to stop.
+
+    mp_bluetooth_nimble_ble_state = MP_BLUETOOTH_NIMBLE_BLE_STATE_STOPPING;
+
+    ble_hs_stop(&ble_hs_shutdown_stop_listener, ble_hs_shutdown_stop_cb, NULL);
+
+    while (mp_bluetooth_nimble_ble_state != MP_BLUETOOTH_NIMBLE_BLE_STATE_OFF) {
+        MICROPY_EVENT_POLL_HOOK
+    }
+}
+
+#endif // !MICROPY_BLUETOOTH_NIMBLE_BINDINGS_ONLY
+
 int mp_bluetooth_init(void) {
     DEBUG_printf("mp_bluetooth_init\n");
     // Clean up if necessary.
     mp_bluetooth_deinit();
 
+    mp_bluetooth_nimble_ble_state = MP_BLUETOOTH_NIMBLE_BLE_STATE_STARTING;
+
     ble_hs_cfg.reset_cb = reset_cb;
     ble_hs_cfg.sync_cb = sync_cb;
     ble_hs_cfg.gatts_register_cb = gatts_register_cb;
@@ -277,56 +341,70 @@ int mp_bluetooth_init(void) {
     MP_STATE_PORT(bluetooth_nimble_root_pointers) = m_new0(mp_bluetooth_nimble_root_pointers_t, 1);
     mp_bluetooth_gatts_db_create(&MP_STATE_PORT(bluetooth_nimble_root_pointers)->gatts_db);
 
-    mp_bluetooth_nimble_ble_state = MP_BLUETOOTH_NIMBLE_BLE_STATE_STARTING;
+    #if !MICROPY_BLUETOOTH_NIMBLE_BINDINGS_ONLY
+    // Dereference any previous NimBLE mallocs.
+    MP_STATE_PORT(bluetooth_nimble_memory) = NULL;
+    #endif
 
-    mp_bluetooth_nimble_port_preinit();
+    // Allow port (ESP32) to override NimBLE's HCI init.
+    // Otherwise default implementation above calls ble_hci_uart_init().
+    mp_bluetooth_nimble_port_hci_init();
+
+    // Initialise NimBLE memory and data structures.
     nimble_port_init();
-    mp_bluetooth_nimble_port_postinit();
 
     // By default, just register the default gap/gatt service.
     ble_svc_gap_init();
     ble_svc_gatt_init();
 
+    // Make sure that the HCI UART and event handling task is running.
     mp_bluetooth_nimble_port_start();
 
+    // Static initialization is complete, can start processing events.
+    mp_bluetooth_nimble_ble_state = MP_BLUETOOTH_NIMBLE_BLE_STATE_WAITING_FOR_SYNC;
+
     // Wait for sync callback
     while (mp_bluetooth_nimble_ble_state != MP_BLUETOOTH_NIMBLE_BLE_STATE_ACTIVE) {
         MICROPY_EVENT_POLL_HOOK
     }
+
     DEBUG_printf("mp_bluetooth_init: ready\n");
 
     return 0;
 }
 
-// Called when the host stop procedure has completed.
-STATIC void ble_hs_shutdown_stop_cb(int status, void *arg) {
-    mp_bluetooth_nimble_ble_state = MP_BLUETOOTH_NIMBLE_BLE_STATE_OFF;
-}
-
-STATIC struct ble_hs_stop_listener ble_hs_shutdown_stop_listener;
-
 void mp_bluetooth_deinit(void) {
     DEBUG_printf("mp_bluetooth_deinit\n");
     if (mp_bluetooth_nimble_ble_state == MP_BLUETOOTH_NIMBLE_BLE_STATE_OFF) {
         return;
     }
 
-    mp_bluetooth_gap_advertise_stop();
-    #if MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE
-    mp_bluetooth_gap_scan_stop();
-    #endif
-
-    mp_bluetooth_nimble_ble_state = MP_BLUETOOTH_NIMBLE_BLE_STATE_STOPPING;
+    // Must call ble_hs_stop() in a port-specific way to stop the background
+    // task. Default implementation provided above.
+    if (mp_bluetooth_nimble_ble_state == MP_BLUETOOTH_NIMBLE_BLE_STATE_ACTIVE) {
+        mp_bluetooth_gap_advertise_stop();
+        #if MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE
+        mp_bluetooth_gap_scan_stop();
+        #endif
 
-    ble_hs_stop(&ble_hs_shutdown_stop_listener, ble_hs_shutdown_stop_cb, NULL);
+        DEBUG_printf("mp_bluetooth_deinit: starting port shutdown\n");
 
-    while (mp_bluetooth_nimble_ble_state != MP_BLUETOOTH_NIMBLE_BLE_STATE_OFF) {
-        MICROPY_EVENT_POLL_HOOK
+        mp_bluetooth_nimble_port_shutdown();
+        assert(mp_bluetooth_nimble_ble_state == MP_BLUETOOTH_NIMBLE_BLE_STATE_OFF);
+    } else {
+        mp_bluetooth_nimble_ble_state = MP_BLUETOOTH_NIMBLE_BLE_STATE_OFF;
     }
 
-    mp_bluetooth_nimble_port_deinit();
+    // Shutdown the HCI controller.
+    mp_bluetooth_nimble_port_hci_deinit();
 
     MP_STATE_PORT(bluetooth_nimble_root_pointers) = NULL;
+
+    #if !MICROPY_BLUETOOTH_NIMBLE_BINDINGS_ONLY
+    // Dereference any previous NimBLE mallocs.
+    MP_STATE_PORT(bluetooth_nimble_memory) = NULL;
+    #endif
+
     DEBUG_printf("mp_bluetooth_deinit: shut down\n");
 }
 
@@ -485,7 +563,7 @@ int mp_bluetooth_gatts_register_service_begin(bool append) {
 
     if (!append) {
         // Unref any previous service definitions.
-        for (int i = 0; i < MP_STATE_PORT(bluetooth_nimble_root_pointers)->n_services; ++i) {
+        for (size_t i = 0; i < MP_STATE_PORT(bluetooth_nimble_root_pointers)->n_services; ++i) {
             MP_STATE_PORT(bluetooth_nimble_root_pointers)->services[i] = NULL;
         }
         MP_STATE_PORT(bluetooth_nimble_root_pointers)->n_services = 0;
diff --git a/extmod/nimble/modbluetooth_nimble.h b/extmod/nimble/modbluetooth_nimble.h
index f44e1d69dca52..7e401781e7f9c 100644
--- a/extmod/nimble/modbluetooth_nimble.h
+++ b/extmod/nimble/modbluetooth_nimble.h
@@ -43,15 +43,27 @@ typedef struct _mp_bluetooth_nimble_root_pointers_t {
 enum {
     MP_BLUETOOTH_NIMBLE_BLE_STATE_OFF,
     MP_BLUETOOTH_NIMBLE_BLE_STATE_STARTING,
+    MP_BLUETOOTH_NIMBLE_BLE_STATE_WAITING_FOR_SYNC,
     MP_BLUETOOTH_NIMBLE_BLE_STATE_ACTIVE,
     MP_BLUETOOTH_NIMBLE_BLE_STATE_STOPPING,
 };
 
 extern volatile int mp_bluetooth_nimble_ble_state;
 
-void mp_bluetooth_nimble_port_preinit(void);
-void mp_bluetooth_nimble_port_postinit(void);
-void mp_bluetooth_nimble_port_deinit(void);
+// --- Optionally provided by the MicroPython port. ---------------------------
+// (default implementations provided by modbluetooth_nimble.c)
+
+// Tell the port to init the UART and start the HCI controller.
+void mp_bluetooth_nimble_port_hci_init(void);
+
+// Tell the port to deinit the UART and shutdown the HCI controller.
+void mp_bluetooth_nimble_port_hci_deinit(void);
+
+// Tell the port to run its background task (i.e. poll the UART and pump events).
 void mp_bluetooth_nimble_port_start(void);
 
+// Tell the port to stop its background task.
+void mp_bluetooth_nimble_port_shutdown(void);
+
+
 #endif // MICROPY_INCLUDED_EXTMOD_NIMBLE_MODBLUETOOTH_NIMBLE_H
diff --git a/extmod/nimble/nimble.mk b/extmod/nimble/nimble.mk
index 4e1642c98a998..f8a68bc6f52b6 100644
--- a/extmod/nimble/nimble.mk
+++ b/extmod/nimble/nimble.mk
@@ -2,16 +2,19 @@
 
 ifeq ($(MICROPY_BLUETOOTH_NIMBLE),1)
 
-EXTMOD_SRC_C += extmod/nimble/modbluetooth_nimble.c
+EXTMOD_DIR = extmod
+NIMBLE_EXTMOD_DIR = $(EXTMOD_DIR)/nimble
 
-CFLAGS_MOD += -DMICROPY_BLUETOOTH_NIMBLE=1
+EXTMOD_SRC_C += $(NIMBLE_EXTMOD_DIR)/modbluetooth_nimble.c
 
-NIMBLE_EXTMOD_DIR = extmod/nimble
+CFLAGS_MOD += -DMICROPY_BLUETOOTH_NIMBLE=1
 
 # Use NimBLE from the submodule in lib/mynewt-nimble by default,
 # allowing a port to use their own system version (e.g. ESP32).
 MICROPY_BLUETOOTH_NIMBLE_BINDINGS_ONLY ?= 0
 
+CFLAGS_MOD += -DMICROPY_BLUETOOTH_NIMBLE_BINDINGS_ONLY=$(MICROPY_BLUETOOTH_NIMBLE_BINDINGS_ONLY)
+
 ifeq ($(MICROPY_BLUETOOTH_NIMBLE_BINDINGS_ONLY),0)
 
 NIMBLE_LIB_DIR = lib/mynewt-nimble
@@ -82,7 +85,7 @@ LIB_SRC_C += $(addprefix $(NIMBLE_LIB_DIR)/, \
 	)
 
 EXTMOD_SRC_C += $(addprefix $(NIMBLE_EXTMOD_DIR)/, \
-	nimble/npl_os.c \
+	nimble/nimble_npl_os.c \
 	hal/hal_uart.c \
 	)
 
@@ -98,7 +101,7 @@ INC += -I$(TOP)/$(NIMBLE_LIB_DIR)/nimble/include
 INC += -I$(TOP)/$(NIMBLE_LIB_DIR)/nimble/transport/uart/include
 INC += -I$(TOP)/$(NIMBLE_LIB_DIR)/porting/nimble/include
 
-$(BUILD)/$(NIMBLE_LIB_DIR)/%.o: CFLAGS += -Wno-maybe-uninitialized -Wno-pointer-arith -Wno-unused-but-set-variable -Wno-format
+$(BUILD)/$(NIMBLE_LIB_DIR)/%.o: CFLAGS += -Wno-maybe-uninitialized -Wno-pointer-arith -Wno-unused-but-set-variable -Wno-format -Wno-sign-compare
 
 endif
 
diff --git a/extmod/nimble/nimble/npl_os.c b/extmod/nimble/nimble/nimble_npl_os.c
similarity index 85%
rename from extmod/nimble/nimble/npl_os.c
rename to extmod/nimble/nimble/nimble_npl_os.c
index 20c260405444f..ba3031a8ff694 100644
--- a/extmod/nimble/nimble/npl_os.c
+++ b/extmod/nimble/nimble/nimble_npl_os.c
@@ -29,16 +29,18 @@
 #include "py/runtime.h"
 #include "nimble/ble.h"
 #include "nimble/nimble_npl.h"
-#include "nimble/nimble_hci_uart.h"
+#include "extmod/nimble/hal/hal_uart.h"
 
-#define DEBUG_OS_printf(...) //printf(__VA_ARGS__)
-#define DEBUG_MALLOC_printf(...) //printf(__VA_ARGS__)
-#define DEBUG_EVENT_printf(...) //printf(__VA_ARGS__)
-#define DEBUG_MUTEX_printf(...) //printf(__VA_ARGS__)
-#define DEBUG_SEM_printf(...) //printf(__VA_ARGS__)
-#define DEBUG_CALLOUT_printf(...) //printf(__VA_ARGS__)
-#define DEBUG_TIME_printf(...) //printf(__VA_ARGS__)
-#define DEBUG_CRIT_printf(...) //printf(__VA_ARGS__)
+#include "extmod/modbluetooth.h"
+
+#define DEBUG_OS_printf(...) // printf(__VA_ARGS__)
+#define DEBUG_MALLOC_printf(...) // printf(__VA_ARGS__)
+#define DEBUG_EVENT_printf(...) // printf(__VA_ARGS__)
+#define DEBUG_MUTEX_printf(...) // printf(__VA_ARGS__)
+#define DEBUG_SEM_printf(...) // printf(__VA_ARGS__)
+#define DEBUG_CALLOUT_printf(...) // printf(__VA_ARGS__)
+#define DEBUG_TIME_printf(...) // printf(__VA_ARGS__)
+#define DEBUG_CRIT_printf(...) // printf(__VA_ARGS__)
 
 bool ble_npl_os_started(void) {
     DEBUG_OS_printf("ble_npl_os_started\n");
@@ -138,7 +140,7 @@ int nimble_sprintf(char *str, const char *fmt, ...) {
 
 struct ble_npl_eventq *global_eventq = NULL;
 
-void os_eventq_run_all(void) {
+void mp_bluetooth_nimble_os_eventq_run_all(void) {
     for (struct ble_npl_eventq *evq = global_eventq; evq != NULL; evq = evq->nextq) {
         while (evq->head != NULL) {
             struct ble_npl_event *ev = evq->head;
@@ -238,23 +240,39 @@ ble_npl_error_t ble_npl_sem_init(struct ble_npl_sem *sem, uint16_t tokens) {
 
 ble_npl_error_t ble_npl_sem_pend(struct ble_npl_sem *sem, ble_npl_time_t timeout) {
     DEBUG_SEM_printf("ble_npl_sem_pend(%p, %u) count=%u\n", sem, (uint)timeout, (uint)sem->count);
+
+    // This is called by NimBLE to synchronously wait for an HCI ACK. The
+    // corresponding ble_npl_sem_release is called directly by the UART rx
+    // handler (i.e. hal_uart_rx_cb in extmod/nimble/hal/hal_uart.c).
+
+    // So this implementation just polls the UART until either the semaphore
+    // is released, or the timeout occurs.
+
     if (sem->count == 0) {
         uint32_t t0 = mp_hal_ticks_ms();
         while (sem->count == 0 && mp_hal_ticks_ms() - t0 < timeout) {
-            // This function may be called at thread-level, so execute
-            // mp_bluetooth_nimble_hci_uart_process at raised priority.
+            // This can be called either from code running in NimBLE's "task"
+            // (i.e. PENDSV) or directly by application code, so for the
+            // latter case, prevent the "task" from running while we poll the
+            // UART directly.
             MICROPY_PY_BLUETOOTH_ENTER
             mp_bluetooth_nimble_hci_uart_process();
             MICROPY_PY_BLUETOOTH_EXIT
+
             if (sem->count != 0) {
                 break;
             }
-            __WFI();
+
+            // Because we're polling, might as well wait for a UART IRQ indicating
+            // more data available.
+            mp_bluetooth_nimble_hci_uart_wfi();
         }
+
         if (sem->count == 0) {
-            printf("timeout\n");
+            printf("NimBLE: HCI ACK timeout\n");
             return BLE_NPL_TIMEOUT;
         }
+
         DEBUG_SEM_printf("got response in %u ms\n", (int)(mp_hal_ticks_ms() - t0));
     }
     sem->count -= 1;
@@ -277,7 +295,7 @@ uint16_t ble_npl_sem_get_count(struct ble_npl_sem *sem) {
 
 static struct ble_npl_callout *global_callout = NULL;
 
-void os_callout_process(void) {
+void mp_bluetooth_nimble_os_callout_process(void) {
     uint32_t tnow = mp_hal_ticks_ms();
     for (struct ble_npl_callout *c = global_callout; c != NULL; c = c->nextc) {
         if (!c->active) {
@@ -386,12 +404,24 @@ void ble_npl_time_delay(ble_npl_time_t ticks) {
 /******************************************************************************/
 // CRITICAL
 
+// This is used anywhere NimBLE modifies global data structures.
+// We need to protect between:
+//  - A MicroPython VM thread.
+//  - The NimBLE "task" (e.g. PENDSV on STM32, pthread on Unix).
+// On STM32, by disabling PENDSV, we ensure that either:
+//  - If we're in the NimBLE task, we're exclusive anyway.
+//  - If we're in a VM thread, we can't be interrupted by the NimBLE task, or switched to another thread.
+// On Unix, there's a global mutex.
+
+// TODO: Both ports currently use MICROPY_PY_BLUETOOTH_ENTER in their implementation,
+// maybe this doesn't need to be port-specific?
+
 uint32_t ble_npl_hw_enter_critical(void) {
     DEBUG_CRIT_printf("ble_npl_hw_enter_critical()\n");
-    return raise_irq_pri(15);
+    return mp_bluetooth_nimble_hci_uart_enter_critical();
 }
 
 void ble_npl_hw_exit_critical(uint32_t ctx) {
     DEBUG_CRIT_printf("ble_npl_hw_exit_critical(%u)\n", (uint)ctx);
-    restore_irq_pri(ctx);
+    mp_bluetooth_nimble_hci_uart_exit_critical(ctx);
 }
diff --git a/extmod/nimble/nimble/nimble_npl_os.h b/extmod/nimble/nimble/nimble_npl_os.h
index 3d886fedb58fd..55425206612ae 100644
--- a/extmod/nimble/nimble/nimble_npl_os.h
+++ b/extmod/nimble/nimble/nimble_npl_os.h
@@ -24,11 +24,15 @@
  * THE SOFTWARE.
  */
 
-#ifndef MICROPY_INCLUDED_STM32_NIMBLE_NIMBLE_NPL_OS_H
-#define MICROPY_INCLUDED_STM32_NIMBLE_NIMBLE_NPL_OS_H
+#ifndef MICROPY_INCLUDED_STM32_NIMBLE_NIMBLE_NIMBLE_NPL_OS_H
+#define MICROPY_INCLUDED_STM32_NIMBLE_NIMBLE_NIMBLE_NPL_OS_H
+
+// This is included by nimble/nimble_npl.h -- include that rather than this file directly.
 
 #include <stdint.h>
 
+// --- Configuration of NimBLE data structures --------------------------------
+
 #define BLE_NPL_OS_ALIGNMENT (4)
 #define BLE_NPL_TIME_FOREVER (0xffffffff)
 
@@ -63,4 +67,15 @@ struct ble_npl_sem {
     volatile uint16_t count;
 };
 
+// --- Called by the MicroPython port -----------------------------------------
+
+void mp_bluetooth_nimble_os_eventq_run_all(void);
+void mp_bluetooth_nimble_os_callout_process(void);
+
+// --- Must be provided by the MicroPython port -------------------------------
+
+void mp_bluetooth_nimble_hci_uart_wfi(void);
+uint32_t mp_bluetooth_nimble_hci_uart_enter_critical(void);
+void mp_bluetooth_nimble_hci_uart_exit_critical(uint32_t atomic_state);
+
 #endif // MICROPY_INCLUDED_STM32_NIMBLE_NIMBLE_NPL_OS_H
diff --git a/extmod/nimble/syscfg/syscfg.h b/extmod/nimble/syscfg/syscfg.h
index 6ac420f35e550..8a6f2338be2ab 100644
--- a/extmod/nimble/syscfg/syscfg.h
+++ b/extmod/nimble/syscfg/syscfg.h
@@ -2,12 +2,14 @@
 #define MICROPY_INCLUDED_EXTMOD_NIMBLE_SYSCFG_H
 
 #include "py/mphal.h"
-#include "uart.h"
+
+#include "mpnimbleport.h"
 
 void *nimble_malloc(size_t size);
 void nimble_free(void *ptr);
 void *nimble_realloc(void *ptr, size_t size);
 
+// Redirect NimBLE malloc to the GC heap.
 #define malloc(size) nimble_malloc(size)
 #define free(ptr) nimble_free(ptr)
 #define realloc(ptr, size) nimble_realloc(ptr, size)
@@ -88,6 +90,7 @@ int nimble_sprintf(char *str, const char *fmt, ...);
 #define MYNEWT_VAL_BLE_GATT_WRITE_NO_RSP (MYNEWT_VAL_BLE_ROLE_CENTRAL)
 #define MYNEWT_VAL_BLE_GATT_WRITE_RELIABLE (MYNEWT_VAL_BLE_ROLE_CENTRAL)
 #define MYNEWT_VAL_BLE_HOST (1)
+#define MYNEWT_VAL_BLE_HS_AUTO_START (1)
 #define MYNEWT_VAL_BLE_HS_DEBUG (0)
 #define MYNEWT_VAL_BLE_HS_FLOW_CTRL (0)
 #define MYNEWT_VAL_BLE_HS_FLOW_CTRL_ITVL (1000)
diff --git a/ports/esp32/Makefile b/ports/esp32/Makefile
index 2cbe9f6be57f9..dcf4110cfc913 100644
--- a/ports/esp32/Makefile
+++ b/ports/esp32/Makefile
@@ -341,7 +341,7 @@ SRC_C = \
 	modnetwork.c \
 	network_lan.c \
 	network_ppp.c \
-	nimble.c \
+	mpnimbleport.c \
 	modsocket.c \
 	modesp.c \
 	esp32_partition.c \
diff --git a/ports/esp32/nimble.c b/ports/esp32/mpnimbleport.c
similarity index 66%
rename from ports/esp32/nimble.c
rename to ports/esp32/mpnimbleport.c
index 16829732c30e5..a58fcbdbf49f4 100644
--- a/ports/esp32/nimble.c
+++ b/ports/esp32/mpnimbleport.c
@@ -30,28 +30,48 @@
 
 #if MICROPY_PY_BLUETOOTH && MICROPY_BLUETOOTH_NIMBLE
 
+#define DEBUG_printf(...) // printf("nimble (esp32): " __VA_ARGS__)
+
 #include "esp_nimble_hci.h"
 #include "nimble/nimble_port.h"
 #include "nimble/nimble_port_freertos.h"
 
+#include "extmod/nimble/modbluetooth_nimble.h"
+
 STATIC void ble_host_task(void *param) {
+    DEBUG_printf("ble_host_task\n");
     nimble_port_run(); // This function will return only when nimble_port_stop() is executed.
     nimble_port_freertos_deinit();
 }
 
-void mp_bluetooth_nimble_port_preinit(void) {
+void mp_bluetooth_nimble_port_hci_init(void) {
+    DEBUG_printf("mp_bluetooth_nimble_port_hci_init\n");
     esp_nimble_hci_and_controller_init();
 }
 
-void mp_bluetooth_nimble_port_postinit(void) {
-}
+void mp_bluetooth_nimble_port_hci_deinit(void) {
+    DEBUG_printf("mp_bluetooth_nimble_port_hci_deinit\n");
 
-void mp_bluetooth_nimble_port_deinit(void) {
-    nimble_port_stop();
+    esp_nimble_hci_and_controller_deinit();
 }
 
 void mp_bluetooth_nimble_port_start(void) {
+    DEBUG_printf("mp_bluetooth_nimble_port_start\n");
     nimble_port_freertos_init(ble_host_task);
 }
 
+void mp_bluetooth_nimble_port_shutdown(void) {
+    DEBUG_printf("mp_bluetooth_nimble_port_shutdown\n");
+
+    // Despite the name, these is an ESP32-specific (no other NimBLE ports have these functions).
+    // Calls ble_hs_stop() and waits for stack shutdown.
+    nimble_port_stop();
+
+    // Shuts down the event queue.
+    nimble_port_deinit();
+
+    // Mark stack as shutdown.
+    mp_bluetooth_nimble_ble_state = MP_BLUETOOTH_NIMBLE_BLE_STATE_OFF;
+}
+
 #endif
diff --git a/ports/stm32/Makefile b/ports/stm32/Makefile
index e7d2e2abc2caf..7b68299e04f70 100644
--- a/ports/stm32/Makefile
+++ b/ports/stm32/Makefile
@@ -480,7 +480,7 @@ endif
 
 ifeq ($(MICROPY_PY_BLUETOOTH),1)
 
-SRC_C += modbluetooth_hci.c
+SRC_C += mpbthciport.c
 
 ifeq ($(MICROPY_BLUETOOTH_NIMBLE),1)
 ifeq ($(MICROPY_BLUETOOTH_BTSTACK),1)
@@ -490,12 +490,13 @@ endif
 
 ifeq ($(MICROPY_BLUETOOTH_NIMBLE),1)
 include $(TOP)/extmod/nimble/nimble.mk
-SRC_C += nimble.c
+SRC_C += mpnimbleport.c
 endif
 
 ifeq ($(MICROPY_BLUETOOTH_BTSTACK),1)
+MICROPY_BLUETOOTH_BTSTACK_H4 ?= 1
 include $(TOP)/extmod/btstack/btstack.mk
-SRC_C += btstack.c
+SRC_C += mpbtstackport.c
 endif
 
 ifeq ($(MICROPY_PY_NETWORK_CYW43),1)
diff --git a/ports/stm32/modbluetooth_hci.c b/ports/stm32/mpbthciport.c
similarity index 75%
rename from ports/stm32/modbluetooth_hci.c
rename to ports/stm32/mpbthciport.c
index 54c60adc01181..71a9e4fc7f433 100644
--- a/ports/stm32/modbluetooth_hci.c
+++ b/ports/stm32/mpbthciport.c
@@ -26,17 +26,20 @@
 
 #include "py/runtime.h"
 #include "py/mphal.h"
-#include "extmod/modbluetooth_hci.h"
+#include "extmod/mpbthci.h"
 #include "systick.h"
 #include "pendsv.h"
+#include "lib/utils/mpirq.h"
 
 #include "py/obj.h"
 
 #if MICROPY_PY_BLUETOOTH
 
+#define DEBUG_printf(...) // printf(__VA_ARGS__)
+
 uint8_t mp_bluetooth_hci_cmd_buf[4 + 256];
 
-// Must be provided by the stack bindings.
+// Must be provided by the stack bindings (e.g. mpnimbleport.c or mpbtstackport.c).
 extern void mp_bluetooth_hci_poll(void);
 
 // Hook for pendsv poller to run this periodically every 128ms
@@ -61,34 +64,19 @@ STATIC uint16_t hci_uart_rx_buf_cur;
 STATIC uint16_t hci_uart_rx_buf_len;
 STATIC uint8_t hci_uart_rx_buf_data[256];
 
-int mp_bluetooth_hci_controller_deactivate(void) {
-    return 0;
-}
-
-int mp_bluetooth_hci_controller_sleep_maybe(void) {
-    return 0;
-}
-
-bool mp_bluetooth_hci_controller_woken(void) {
-    return true;
-}
-
-int mp_bluetooth_hci_controller_wakeup(void) {
-    return 0;
-}
-
-int mp_bluetooth_hci_uart_init(uint32_t port) {
+int mp_bluetooth_hci_uart_init(uint32_t port, uint32_t baudrate) {
     (void)port;
-    return 0;
-}
-
-int mp_bluetooth_hci_uart_activate(void) {
+    (void)baudrate;
     rfcore_ble_init();
     hci_uart_rx_buf_cur = 0;
     hci_uart_rx_buf_len = 0;
     return 0;
 }
 
+int mp_bluetooth_hci_uart_deinit(void) {
+    return 0;
+}
+
 int mp_bluetooth_hci_uart_set_baudrate(uint32_t baudrate) {
     (void)baudrate;
     return 0;
@@ -140,13 +128,16 @@ mp_irq_obj_t mp_bluetooth_hci_uart_irq_obj;
 static uint8_t hci_uart_rxbuf[512];
 
 mp_obj_t mp_uart_interrupt(mp_obj_t self_in) {
-    // New HCI data, schedule mp_bluetooth_hci_poll to make the stack handle it.
+    // DEBUG_printf("mp_uart_interrupt\n");
+    // New HCI data, schedule mp_bluetooth_hci_poll via PENDSV to make the stack handle it.
     mp_bluetooth_hci_poll_wrapper(0);
     return mp_const_none;
 }
 MP_DEFINE_CONST_FUN_OBJ_1(mp_uart_interrupt_obj, mp_uart_interrupt);
 
-int mp_bluetooth_hci_uart_init(uint32_t port) {
+int mp_bluetooth_hci_uart_init(uint32_t port, uint32_t baudrate) {
+    DEBUG_printf("mp_bluetooth_hci_uart_init (stm32)\n");
+
     // bits (8), stop (1), parity (none) and flow (rts/cts) are assumed to match MYNEWT_VAL_BLE_HCI_UART_ constants in syscfg.h.
     mp_bluetooth_hci_uart_obj.base.type = &pyb_uart_type;
     mp_bluetooth_hci_uart_obj.uart_id = port;
@@ -154,16 +145,29 @@ int mp_bluetooth_hci_uart_init(uint32_t port) {
     mp_bluetooth_hci_uart_obj.timeout = 2;
     mp_bluetooth_hci_uart_obj.timeout_char = 2;
     MP_STATE_PORT(pyb_uart_obj_all)[mp_bluetooth_hci_uart_obj.uart_id - 1] = &mp_bluetooth_hci_uart_obj;
+
+    // This also initialises the UART.
+    mp_bluetooth_hci_uart_set_baudrate(baudrate);
+
+    return 0;
+}
+
+int mp_bluetooth_hci_uart_deinit(void) {
+    DEBUG_printf("mp_bluetooth_hci_uart_deinit (stm32)\n");
+    // TODO: deinit mp_bluetooth_hci_uart_obj
+
     return 0;
 }
 
 int mp_bluetooth_hci_uart_set_baudrate(uint32_t baudrate) {
+    DEBUG_printf("mp_bluetooth_hci_uart_set_baudrate(%lu) (stm32)\n", baudrate);
+    if (!baudrate) {
+        return -1;
+    }
+
     uart_init(&mp_bluetooth_hci_uart_obj, baudrate, UART_WORDLENGTH_8B, UART_PARITY_NONE, UART_STOPBITS_1, UART_HWCONTROL_RTS | UART_HWCONTROL_CTS);
     uart_set_rxbuf(&mp_bluetooth_hci_uart_obj, sizeof(hci_uart_rxbuf), hci_uart_rxbuf);
-    return 0;
-}
 
-int mp_bluetooth_hci_uart_activate(void) {
     // Add IRQ handler for IDLE (i.e. packet finished).
     uart_irq_config(&mp_bluetooth_hci_uart_obj, false);
     mp_irq_init(&mp_bluetooth_hci_uart_irq_obj, &uart_irq_methods, MP_OBJ_FROM_PTR(&mp_bluetooth_hci_uart_obj));
@@ -173,13 +177,12 @@ int mp_bluetooth_hci_uart_activate(void) {
     mp_bluetooth_hci_uart_irq_obj.ishard = true;
     uart_irq_config(&mp_bluetooth_hci_uart_obj, true);
 
-    mp_bluetooth_hci_controller_init();
-    mp_bluetooth_hci_controller_activate();
-
     return 0;
 }
 
 int mp_bluetooth_hci_uart_write(const uint8_t *buf, size_t len) {
+    // DEBUG_printf("mp_bluetooth_hci_uart_write (stm32)\n");
+
     mp_bluetooth_hci_controller_wakeup();
     uart_tx_strn(&mp_bluetooth_hci_uart_obj, (void *)buf, len);
     return 0;
@@ -188,7 +191,10 @@ int mp_bluetooth_hci_uart_write(const uint8_t *buf, size_t len) {
 // This function expects the controller to be in the wake state via a previous call
 // to mp_bluetooth_hci_controller_woken.
 int mp_bluetooth_hci_uart_readchar(void) {
+    // DEBUG_printf("mp_bluetooth_hci_uart_readchar (stm32)\n");
+
     if (uart_rx_any(&mp_bluetooth_hci_uart_obj)) {
+        // DEBUG_printf("... available\n");
         return uart_rx_char(&mp_bluetooth_hci_uart_obj);
     } else {
         return -1;
@@ -197,4 +203,33 @@ int mp_bluetooth_hci_uart_readchar(void) {
 
 #endif // defined(STM32WB)
 
+// Default (weak) implementation of the HCI controller interface.
+// A driver (e.g. cywbt43.c) can override these for controller-specific
+// functionality (i.e. power management).
+
+MP_WEAK int mp_bluetooth_hci_controller_init(void) {
+    DEBUG_printf("mp_bluetooth_hci_controller_init (default)\n");
+    return 0;
+}
+
+MP_WEAK int mp_bluetooth_hci_controller_deinit(void) {
+    DEBUG_printf("mp_bluetooth_hci_controller_deinit (default)\n");
+    return 0;
+}
+
+MP_WEAK int mp_bluetooth_hci_controller_sleep_maybe(void) {
+    DEBUG_printf("mp_bluetooth_hci_controller_sleep_maybe (default)\n");
+    return 0;
+}
+
+MP_WEAK bool mp_bluetooth_hci_controller_woken(void) {
+    DEBUG_printf("mp_bluetooth_hci_controller_woken (default)\n");
+    return true;
+}
+
+MP_WEAK int mp_bluetooth_hci_controller_wakeup(void) {
+    DEBUG_printf("mp_bluetooth_hci_controller_wakeup (default)\n");
+    return 0;
+}
+
 #endif // MICROPY_PY_BLUETOOTH
diff --git a/ports/stm32/mpbtstackport.c b/ports/stm32/mpbtstackport.c
new file mode 100644
index 0000000000000..a031a6a151aff
--- /dev/null
+++ b/ports/stm32/mpbtstackport.c
@@ -0,0 +1,107 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "py/runtime.h"
+#include "py/mperrno.h"
+#include "py/mphal.h"
+
+#if MICROPY_PY_BLUETOOTH && MICROPY_BLUETOOTH_BTSTACK
+
+#include "lib/btstack/src/btstack.h"
+#include "lib/btstack/platform/embedded/btstack_run_loop_embedded.h"
+#include "lib/btstack/platform/embedded/hal_cpu.h"
+#include "lib/btstack/platform/embedded/hal_time_ms.h"
+
+#include "extmod/mpbthci.h"
+#include "extmod/btstack/btstack_hci_uart.h"
+#include "extmod/btstack/modbluetooth_btstack.h"
+
+// The IRQ functionality in btstack_run_loop_embedded.c is not used, so the
+// following three functions are empty.
+
+void hal_cpu_disable_irqs(void) {
+}
+
+void hal_cpu_enable_irqs(void) {
+}
+
+void hal_cpu_enable_irqs_and_sleep(void) {
+}
+
+uint32_t hal_time_ms(void) {
+    return mp_hal_ticks_ms();
+}
+
+STATIC const hci_transport_config_uart_t hci_transport_config_uart = {
+    HCI_TRANSPORT_CONFIG_UART,
+    MICROPY_HW_BLE_UART_BAUDRATE,
+    3000000,
+    0,
+    NULL,
+};
+
+void mp_bluetooth_hci_poll(void) {
+    if (mp_bluetooth_btstack_state == MP_BLUETOOTH_BTSTACK_STATE_OFF) {
+        return;
+    }
+
+    // Process uart data.
+    if (mp_bluetooth_btstack_state != MP_BLUETOOTH_BTSTACK_STATE_HALTING) {
+        mp_bluetooth_btstack_hci_uart_process();
+    }
+
+    // Call the BTstack run loop.
+    btstack_run_loop_embedded_execute_once();
+}
+
+void mp_bluetooth_btstack_port_init(void) {
+    static bool run_loop_init = false;
+    if (!run_loop_init) {
+        run_loop_init = true;
+        btstack_run_loop_init(btstack_run_loop_embedded_get_instance());
+    } else {
+        btstack_run_loop_embedded_get_instance()->init();
+    }
+
+    // hci_dump_open(NULL, HCI_DUMP_STDOUT);
+    const hci_transport_t *transport = hci_transport_h4_instance(&mp_bluetooth_btstack_hci_uart_block);
+    hci_init(transport, &hci_transport_config_uart);
+
+    // TODO: Probably not necessary for BCM (we have our own firmware loader in the cyw43 driver),
+    // but might be worth investigating for other controllers in the future.
+    // hci_set_chipset(btstack_chipset_bcm_instance());
+}
+
+void mp_bluetooth_btstack_port_deinit(void) {
+    hci_power_control(HCI_POWER_OFF);
+    hci_close();
+}
+
+void mp_bluetooth_btstack_port_start(void) {
+    hci_power_control(HCI_POWER_ON);
+}
+
+#endif // MICROPY_PY_BLUETOOTH && MICROPY_BLUETOOTH_BTSTACK
diff --git a/ports/stm32/mpbtstackport.h b/ports/stm32/mpbtstackport.h
new file mode 100644
index 0000000000000..110f921d9a9f8
--- /dev/null
+++ b/ports/stm32/mpbtstackport.h
@@ -0,0 +1,34 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 Jim Mussared
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#ifndef MICROPY_INCLUDED_STM32_BTSTACK_PORT_H
+#define MICROPY_INCLUDED_STM32_BTSTACK_PORT_H
+
+// To allow MICROPY_HW_BLE_UART_ID to be resolved.
+
+#include "uart.h"
+
+#endif // MICROPY_INCLUDED_STM32_BTSTACK_PORT_H
diff --git a/ports/stm32/mpconfigport.h b/ports/stm32/mpconfigport.h
index 14a05898951ba..e1e1491d64c6d 100644
--- a/ports/stm32/mpconfigport.h
+++ b/ports/stm32/mpconfigport.h
@@ -298,6 +298,7 @@ extern const struct _mp_obj_module_t mp_module_onewire;
 
 #if MICROPY_BLUETOOTH_NIMBLE
 struct _mp_bluetooth_nimble_root_pointers_t;
+struct _mp_bluetooth_nimble_malloc_t;
 #define MICROPY_PORT_ROOT_POINTER_BLUETOOTH_NIMBLE void **bluetooth_nimble_memory; struct _mp_bluetooth_nimble_root_pointers_t *bluetooth_nimble_root_pointers;
 #else
 #define MICROPY_PORT_ROOT_POINTER_BLUETOOTH_NIMBLE
@@ -410,14 +411,20 @@ static inline mp_uint_t disable_irq(void) {
 #define MICROPY_THREAD_YIELD()
 #endif
 
-// The LwIP interface must run at a raised IRQ priority
-#define MICROPY_PY_LWIP_ENTER   uint32_t atomic_state = raise_irq_pri(IRQ_PRI_PENDSV);
-#define MICROPY_PY_LWIP_REENTER atomic_state = raise_irq_pri(IRQ_PRI_PENDSV);
-#define MICROPY_PY_LWIP_EXIT    restore_irq_pri(atomic_state);
+// For regular code that wants to prevent "background tasks" from running.
+// These background tasks (LWIP, Bluetooth) run in PENDSV context.
+#define MICROPY_PY_PENDSV_ENTER   uint32_t atomic_state = raise_irq_pri(IRQ_PRI_PENDSV);
+#define MICROPY_PY_PENDSV_REENTER atomic_state = raise_irq_pri(IRQ_PRI_PENDSV);
+#define MICROPY_PY_PENDSV_EXIT    restore_irq_pri(atomic_state);
 
-// Bluetooth calls must run at a raised IRQ priority
-#define MICROPY_PY_BLUETOOTH_ENTER MICROPY_PY_LWIP_ENTER
-#define MICROPY_PY_BLUETOOTH_EXIT MICROPY_PY_LWIP_EXIT
+// Prevent the "LWIP task" from running.
+#define MICROPY_PY_LWIP_ENTER   MICROPY_PY_PENDSV_ENTER
+#define MICROPY_PY_LWIP_REENTER MICROPY_PY_PENDSV_REENTER
+#define MICROPY_PY_LWIP_EXIT    MICROPY_PY_PENDSV_EXIT
+
+// Prevent the "Bluetooth task" from running (either NimBLE or btstack).
+#define MICROPY_PY_BLUETOOTH_ENTER MICROPY_PY_PENDSV_ENTER
+#define MICROPY_PY_BLUETOOTH_EXIT  MICROPY_PY_PENDSV_EXIT
 
 // We need an implementation of the log2 function which is not a macro
 #define MP_NEED_LOG2 (1)
diff --git a/ports/stm32/nimble.c b/ports/stm32/mpnimbleport.c
similarity index 56%
rename from ports/stm32/nimble.c
rename to ports/stm32/mpnimbleport.c
index 0d349585fb1ae..1d7c095139cde 100644
--- a/ports/stm32/nimble.c
+++ b/ports/stm32/mpnimbleport.c
@@ -31,58 +31,41 @@
 
 #if MICROPY_PY_BLUETOOTH && MICROPY_BLUETOOTH_NIMBLE
 
-#include "transport/uart/ble_hci_uart.h"
 #include "host/ble_hs.h"
+#include "nimble/nimble_npl.h"
 
-#include "extmod/modbluetooth_hci.h"
+#include "extmod/mpbthci.h"
 #include "extmod/nimble/modbluetooth_nimble.h"
-#include "extmod/nimble/nimble/nimble_hci_uart.h"
-
-extern void os_eventq_run_all(void);
-extern void os_callout_process(void);
+#include "extmod/nimble/hal/hal_uart.h"
 
+// This implements the Nimble "background task". It's called at PENDSV
+// priority, either every 128ms or whenever there's UART data available.
+// Because it's called via PENDSV, you can implicitly consider that it
+// is surrounded by MICROPY_PY_BLUETOOTH_ENTER / MICROPY_PY_BLUETOOTH_EXIT.
 void mp_bluetooth_hci_poll(void) {
-    if (mp_bluetooth_nimble_ble_state == MP_BLUETOOTH_NIMBLE_BLE_STATE_OFF) {
-        return;
-    }
-
-    mp_bluetooth_nimble_hci_uart_process();
-    os_callout_process();
-    os_eventq_run_all();
-}
-
-void mp_bluetooth_nimble_port_preinit(void) {
-    MP_STATE_PORT(bluetooth_nimble_memory) = NULL;
-    ble_hci_uart_init();
-}
+    if (mp_bluetooth_nimble_ble_state >= MP_BLUETOOTH_NIMBLE_BLE_STATE_WAITING_FOR_SYNC) {
+        // Ask NimBLE to process UART data.
+        mp_bluetooth_nimble_hci_uart_process();
 
-void mp_bluetooth_nimble_port_postinit(void) {
+        // Run pending background operations and events, but only after HCI sync.
+        mp_bluetooth_nimble_os_callout_process();
+        mp_bluetooth_nimble_os_eventq_run_all();
+    }
 }
 
-void mp_bluetooth_nimble_port_deinit(void) {
-    mp_bluetooth_hci_controller_deactivate();
-}
+// --- Port-specific helpers for the generic NimBLE bindings. -----------------
 
-void mp_bluetooth_nimble_port_start(void) {
-    ble_hs_start();
+void mp_bluetooth_nimble_hci_uart_wfi(void) {
+    __WFI();
 }
 
-void mp_bluetooth_nimble_hci_uart_rx(hal_uart_rx_cb_t rx_cb, void *rx_arg) {
-    bool host_wake = mp_bluetooth_hci_controller_woken();
-
-    int chr;
-    while ((chr = mp_bluetooth_hci_uart_readchar()) >= 0) {
-        // printf("UART RX: %02x\n", data);
-        rx_cb(rx_arg, chr);
-    }
-
-    if (host_wake) {
-        mp_bluetooth_hci_controller_sleep_maybe();
-    }
+uint32_t mp_bluetooth_nimble_hci_uart_enter_critical(void) {
+    MICROPY_PY_BLUETOOTH_ENTER
+    return atomic_state;
 }
 
-void mp_bluetooth_nimble_hci_uart_tx_strn(const char *str, uint len) {
-    mp_bluetooth_hci_uart_write((const uint8_t *)str, len);
+void mp_bluetooth_nimble_hci_uart_exit_critical(uint32_t atomic_state) {
+    MICROPY_PY_BLUETOOTH_EXIT
 }
 
 #endif // MICROPY_PY_BLUETOOTH && MICROPY_BLUETOOTH_NIMBLE
diff --git a/ports/stm32/mpnimbleport.h b/ports/stm32/mpnimbleport.h
new file mode 100644
index 0000000000000..f3ee597183a04
--- /dev/null
+++ b/ports/stm32/mpnimbleport.h
@@ -0,0 +1,34 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 Jim Mussared
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#ifndef MICROPY_INCLUDED_STM32_NIMBLE_PORT_H
+#define MICROPY_INCLUDED_STM32_NIMBLE_PORT_H
+
+// To allow MICROPY_HW_BLE_UART_ID to be resolved.
+
+#include "uart.h"
+
+#endif // MICROPY_INCLUDED_STM32_NIMBLE_PORT_H
diff --git a/ports/unix/Makefile b/ports/unix/Makefile
index 3e2fa63a16c3b..a9ba5edfad9af 100644
--- a/ports/unix/Makefile
+++ b/ports/unix/Makefile
@@ -140,18 +140,19 @@ ifeq ($(HAVE_LIBUSB),1)
 
 CFLAGS_MOD += -DMICROPY_PY_BLUETOOTH=1
 CFLAGS_MOD += -DMICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE=1
-CFLAGS_MOD += -DMICROPY_PY_BLUETOOTH_GATTS_ON_READ_CALLBACK=1
+# Runs in a thread, cannot make calls into the VM.
+CFLAGS_MOD += -DMICROPY_PY_BLUETOOTH_GATTS_ON_READ_CALLBACK=0
 
 MICROPY_BLUETOOTH_BTSTACK ?= 1
 MICROPY_BLUETOOTH_BTSTACK_USB ?= 1
 
 ifeq ($(MICROPY_BLUETOOTH_BTSTACK),1)
 GIT_SUBMODULES += lib/btstack
-
 include $(TOP)/extmod/btstack/btstack.mk
 endif
 
 endif
+
 endif
 
 ifeq ($(MICROPY_PY_FFI),1)
@@ -198,7 +199,9 @@ SRC_C = \
 	alloc.c \
 	coverage.c \
 	fatfs_port.c \
-	btstack_usb.c \
+	mpbtstackport_common.c \
+	mpbtstackport_usb.c \
+	mpnimbleport.c \
 	$(SRC_MOD) \
 	$(wildcard $(VARIANT_DIR)/*.c)
 
diff --git a/ports/unix/mpbtstackport.h b/ports/unix/mpbtstackport.h
new file mode 100644
index 0000000000000..29433cc7fb006
--- /dev/null
+++ b/ports/unix/mpbtstackport.h
@@ -0,0 +1,39 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 Jim Mussared
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#ifndef MICROPY_INCLUDED_UNIX_BTSTACK_PORT_H
+#define MICROPY_INCLUDED_UNIX_BTSTACK_PORT_H
+
+#define MICROPY_HW_BLE_UART_ID (0)
+#define MICROPY_HW_BLE_UART_BAUDRATE (1000000)
+
+bool mp_bluetooth_hci_poll(void);
+
+#if MICROPY_BLUETOOTH_BTSTACK_USB
+void mp_bluetooth_btstack_port_init_usb(void);
+#endif
+
+#endif // MICROPY_INCLUDED_UNIX_BTSTACK_PORT_H
diff --git a/ports/unix/mpbtstackport_common.c b/ports/unix/mpbtstackport_common.c
new file mode 100644
index 0000000000000..402cf95283441
--- /dev/null
+++ b/ports/unix/mpbtstackport_common.c
@@ -0,0 +1,92 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 Jim Mussared
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "py/runtime.h"
+#include "py/mperrno.h"
+#include "py/mphal.h"
+
+#if MICROPY_PY_BLUETOOTH && MICROPY_BLUETOOTH_BTSTACK
+
+#include "lib/btstack/src/btstack.h"
+
+#include "lib/btstack/platform/embedded/btstack_run_loop_embedded.h"
+#include "lib/btstack/platform/embedded/hal_cpu.h"
+#include "lib/btstack/platform/embedded/hal_time_ms.h"
+
+#include "extmod/btstack/modbluetooth_btstack.h"
+
+#include "mpbtstackport.h"
+
+// Called by the UART polling thread in mpbthciport.c, or by the USB polling thread in mpbtstackport_usb.c.
+bool mp_bluetooth_hci_poll(void) {
+    if (mp_bluetooth_btstack_state == MP_BLUETOOTH_BTSTACK_STATE_STARTING || mp_bluetooth_btstack_state == MP_BLUETOOTH_BTSTACK_STATE_ACTIVE || mp_bluetooth_btstack_state == MP_BLUETOOTH_BTSTACK_STATE_HALTING) {
+        // Pretend like we're running in IRQ context (i.e. other things can't be running at the same time).
+        mp_uint_t atomic_state = MICROPY_BEGIN_ATOMIC_SECTION();
+        btstack_run_loop_embedded_execute_once();
+        MICROPY_END_ATOMIC_SECTION(atomic_state);
+
+        return true;
+    }
+
+    return false;
+}
+
+// The IRQ functionality in btstack_run_loop_embedded.c is not used, so the
+// following three functions are empty.
+
+void hal_cpu_disable_irqs(void) {
+}
+
+void hal_cpu_enable_irqs(void) {
+}
+
+void hal_cpu_enable_irqs_and_sleep(void) {
+}
+
+uint32_t hal_time_ms(void) {
+    return mp_hal_ticks_ms();
+}
+
+void mp_bluetooth_btstack_port_init(void) {
+    static bool run_loop_init = false;
+    if (!run_loop_init) {
+        run_loop_init = true;
+        btstack_run_loop_init(btstack_run_loop_embedded_get_instance());
+    } else {
+        btstack_run_loop_embedded_get_instance()->init();
+    }
+
+    // hci_dump_open(NULL, HCI_DUMP_STDOUT);
+
+    #if MICROPY_BLUETOOTH_BTSTACK_USB
+    mp_bluetooth_btstack_port_init_usb();
+    #endif
+}
+
+void mp_hal_get_mac(int idx, uint8_t buf[6]) {
+}
+
+#endif // MICROPY_PY_BLUETOOTH && MICROPY_BLUETOOTH_BTSTACK
diff --git a/ports/unix/btstack_usb.c b/ports/unix/mpbtstackport_usb.c
similarity index 54%
rename from ports/unix/btstack_usb.c
rename to ports/unix/mpbtstackport_usb.c
index ab6a49f39ae73..28d2c8c543f71 100644
--- a/ports/unix/btstack_usb.c
+++ b/ports/unix/mpbtstackport_usb.c
@@ -31,7 +31,7 @@
 #include "py/mperrno.h"
 #include "py/mphal.h"
 
-#if MICROPY_PY_BLUETOOTH && MICROPY_BLUETOOTH_BTSTACK
+#if MICROPY_PY_BLUETOOTH && MICROPY_BLUETOOTH_BTSTACK && MICROPY_BLUETOOTH_BTSTACK_USB
 
 #include "lib/btstack/src/btstack.h"
 #include "lib/btstack/platform/embedded/btstack_run_loop_embedded.h"
@@ -40,76 +40,15 @@
 
 #include "extmod/btstack/modbluetooth_btstack.h"
 
+#include "mpbtstackport.h"
+
 #if !MICROPY_PY_THREAD
 #error Unix btstack requires MICROPY_PY_THREAD
 #endif
 
 STATIC const useconds_t USB_POLL_INTERVAL_US = 1000;
 
-STATIC const uint8_t read_static_address_command_complete_prefix[] = { 0x0e, 0x1b, 0x01, 0x09, 0xfc };
-
-STATIC uint8_t local_addr[6] = {0};
-STATIC uint8_t static_address[6] = {0};
-STATIC volatile bool have_addr = false;
-STATIC bool using_static_address = false;
-
-STATIC btstack_packet_callback_registration_t hci_event_callback_registration;
-
-STATIC void packet_handler(uint8_t packet_type, uint16_t channel, uint8_t *packet, uint16_t size) {
-    (void)channel;
-    (void)size;
-    if (packet_type != HCI_EVENT_PACKET) {
-        return;
-    }
-    switch (hci_event_packet_get_type(packet)) {
-        case BTSTACK_EVENT_STATE:
-            if (btstack_event_state_get_state(packet) != HCI_STATE_WORKING) {
-                return;
-            }
-            gap_local_bd_addr(local_addr);
-            if (using_static_address) {
-                memcpy(local_addr, static_address, sizeof(local_addr));
-            }
-            have_addr = true;
-            break;
-        case HCI_EVENT_COMMAND_COMPLETE:
-            if (memcmp(packet, read_static_address_command_complete_prefix, sizeof(read_static_address_command_complete_prefix)) == 0) {
-                reverse_48(&packet[7], static_address);
-                gap_random_address_set(static_address);
-                using_static_address = true;
-                have_addr = true;
-            }
-            break;
-        default:
-            break;
-    }
-}
-
-// The IRQ functionality in btstack_run_loop_embedded.c is not used, so the
-// following three functions are empty.
-
-void hal_cpu_disable_irqs(void) {
-}
-
-void hal_cpu_enable_irqs(void) {
-}
-
-void hal_cpu_enable_irqs_and_sleep(void) {
-}
-
-uint32_t hal_time_ms(void) {
-    return mp_hal_ticks_ms();
-}
-
-void mp_bluetooth_btstack_port_init(void) {
-    static bool run_loop_init = false;
-    if (!run_loop_init) {
-        run_loop_init = true;
-        btstack_run_loop_init(btstack_run_loop_embedded_get_instance());
-    } else {
-        btstack_run_loop_embedded_get_instance()->init();
-    }
-
+void mp_bluetooth_btstack_port_init_usb(void) {
     // MICROPYBTUSB can be a ':'' or '-' separated port list.
     char *path = getenv("MICROPYBTUSB");
     if (path != NULL) {
@@ -128,11 +67,7 @@ void mp_bluetooth_btstack_port_init(void) {
         hci_transport_usb_set_path(usb_path_len, usb_path);
     }
 
-    // hci_dump_open(NULL, HCI_DUMP_STDOUT);
     hci_init(hci_transport_usb_instance(), NULL);
-
-    hci_event_callback_registration.callback = &packet_handler;
-    hci_add_event_handler(&hci_event_callback_registration);
 }
 
 STATIC pthread_t bstack_thread_id;
@@ -142,9 +77,12 @@ void mp_bluetooth_btstack_port_deinit(void) {
 
     // Wait for the poll loop to terminate when the state is set to OFF.
     pthread_join(bstack_thread_id, NULL);
-    have_addr = false;
 }
 
+
+// Provided by mpbstackport_common.c.
+extern bool mp_bluetooth_hci_poll(void);
+
 STATIC void *btstack_thread(void *arg) {
     (void)arg;
     hci_power_control(HCI_POWER_ON);
@@ -155,19 +93,15 @@ STATIC void *btstack_thread(void *arg) {
     // in modbluetooth_btstack.c setting the state back to OFF.
     // Or, if a timeout results in it being set to TIMEOUT.
 
-    while (mp_bluetooth_btstack_state == MP_BLUETOOTH_BTSTACK_STATE_STARTING || mp_bluetooth_btstack_state == MP_BLUETOOTH_BTSTACK_STATE_ACTIVE) {
-        // Pretend like we're running in IRQ context (i.e. other things can't be running at the same time).
-        mp_uint_t atomic_state = MICROPY_BEGIN_ATOMIC_SECTION();
-        btstack_run_loop_embedded_execute_once();
-        MICROPY_END_ATOMIC_SECTION(atomic_state);
+    while (true) {
+        if (!mp_bluetooth_hci_poll()) {
+            break;
+        }
 
         // The USB transport schedules events to the run loop at 1ms intervals,
         // and the implementation currently polls rather than selects.
         usleep(USB_POLL_INTERVAL_US);
     }
-
-    hci_close();
-
     return NULL;
 }
 
@@ -179,13 +113,4 @@ void mp_bluetooth_btstack_port_start(void) {
     pthread_create(&bstack_thread_id, &attr, &btstack_thread, NULL);
 }
 
-void mp_hal_get_mac(int idx, uint8_t buf[6]) {
-    if (idx == MP_HAL_MAC_BDADDR) {
-        if (!have_addr) {
-            mp_raise_OSError(MP_ENODEV);
-        }
-        memcpy(buf, local_addr, sizeof(local_addr));
-    }
-}
-
-#endif // MICROPY_PY_BLUETOOTH && MICROPY_BLUETOOTH_BTSTACK
+#endif // MICROPY_PY_BLUETOOTH && MICROPY_BLUETOOTH_BTSTACK && MICROPY_BLUETOOTH_BTSTACK_USB
diff --git a/ports/unix/mpconfigport.h b/ports/unix/mpconfigport.h
index 08605842fd5bd..9e24ab10cd263 100644
--- a/ports/unix/mpconfigport.h
+++ b/ports/unix/mpconfigport.h
@@ -309,9 +309,11 @@ void mp_unix_mark_exec(void);
 
 #define MP_STATE_PORT MP_STATE_VM
 
-#if MICROPY_PY_BLUETOOTH && MICROPY_BLUETOOTH_BTSTACK
+#if MICROPY_PY_BLUETOOTH
+#if MICROPY_BLUETOOTH_BTSTACK
 struct _mp_bluetooth_btstack_root_pointers_t;
 #define MICROPY_BLUETOOTH_ROOT_POINTERS struct _mp_bluetooth_btstack_root_pointers_t *bluetooth_btstack_root_pointers;
+#endif
 #else
 #define MICROPY_BLUETOOTH_ROOT_POINTERS
 #endif

From 5b08676d6a644487c4ec6f63aef02888f8da8b19 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Mon, 17 Aug 2020 18:12:20 +1000
Subject: [PATCH 0246/3533] extmod/nimble: Set struct alignment correctly on
 64-bit arch.

---
 extmod/nimble/nimble/nimble_npl_os.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extmod/nimble/nimble/nimble_npl_os.h b/extmod/nimble/nimble/nimble_npl_os.h
index 55425206612ae..bfa35d0952f25 100644
--- a/extmod/nimble/nimble/nimble_npl_os.h
+++ b/extmod/nimble/nimble/nimble_npl_os.h
@@ -33,7 +33,7 @@
 
 // --- Configuration of NimBLE data structures --------------------------------
 
-#define BLE_NPL_OS_ALIGNMENT (4)
+#define BLE_NPL_OS_ALIGNMENT (sizeof(uintptr_t))
 #define BLE_NPL_TIME_FOREVER (0xffffffff)
 
 typedef uint32_t ble_npl_time_t;

From f3f31ac9599fcf1c94dca20046da69773cc3418a Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Fri, 14 Aug 2020 16:28:55 +1000
Subject: [PATCH 0247/3533] extmod/nimble: Make nimble_malloc work with
 allocated size.

---
 extmod/nimble/nimble/nimble_npl_os.c | 104 ++++++++++++++++++---------
 ports/stm32/mpconfigport.h           |   2 +-
 2 files changed, 72 insertions(+), 34 deletions(-)

diff --git a/extmod/nimble/nimble/nimble_npl_os.c b/extmod/nimble/nimble/nimble_npl_os.c
index ba3031a8ff694..500f7c0a51e0b 100644
--- a/extmod/nimble/nimble/nimble_npl_os.c
+++ b/extmod/nimble/nimble/nimble_npl_os.c
@@ -58,44 +58,58 @@ void *ble_npl_get_current_task_id(void) {
 // Maintain a linked list of heap memory that we've passed to Nimble,
 // discoverable via the bluetooth_nimble_memory root pointer.
 
-// MP_STATE_PORT(bluetooth_nimble_memory) is a pointer to [next, prev, data...].
+typedef struct _mp_bluetooth_nimble_malloc_t {
+    struct _mp_bluetooth_nimble_malloc_t *prev;
+    struct _mp_bluetooth_nimble_malloc_t *next;
+    size_t size;
+    uint8_t data[];
+} mp_bluetooth_nimble_malloc_t;
 
 // TODO: This is duplicated from mbedtls. Perhaps make this a generic feature?
-void *m_malloc_bluetooth(size_t size) {
-    void **ptr = m_malloc0(size + 2 * sizeof(uintptr_t));
-    if (MP_STATE_PORT(bluetooth_nimble_memory) != NULL) {
-        MP_STATE_PORT(bluetooth_nimble_memory)[0] = ptr;
+STATIC void *m_malloc_bluetooth(size_t size) {
+    size += sizeof(mp_bluetooth_nimble_malloc_t);
+    mp_bluetooth_nimble_malloc_t *alloc = m_malloc0(size);
+    alloc->size = size;
+    alloc->next = MP_STATE_PORT(bluetooth_nimble_memory);
+    if (alloc->next) {
+        alloc->next->prev = alloc;
     }
-    ptr[0] = NULL;
-    ptr[1] = MP_STATE_PORT(bluetooth_nimble_memory);
-    MP_STATE_PORT(bluetooth_nimble_memory) = ptr;
-    return &ptr[2];
+    MP_STATE_PORT(bluetooth_nimble_memory) = alloc;
+    return alloc->data;
 }
 
-void m_free_bluetooth(void *ptr_in) {
-    void **ptr = &((void**)ptr_in)[-2];
-    if (ptr[1] != NULL) {
-        ((void**)ptr[1])[0] = ptr[0];
+STATIC mp_bluetooth_nimble_malloc_t* get_nimble_malloc(void *ptr) {
+    return (mp_bluetooth_nimble_malloc_t*)((uintptr_t)ptr - sizeof(mp_bluetooth_nimble_malloc_t));
+}
+
+STATIC void m_free_bluetooth(void *ptr) {
+    mp_bluetooth_nimble_malloc_t *alloc = get_nimble_malloc(ptr);
+    if (alloc->next) {
+        alloc->next->prev = alloc->prev;
     }
-    if (ptr[0] != NULL) {
-        ((void**)ptr[0])[1] = ptr[1];
+    if (alloc->prev) {
+        alloc->prev->next = alloc->next;
     } else {
-        MP_STATE_PORT(bluetooth_nimble_memory) = ptr[1];
+        MP_STATE_PORT(bluetooth_nimble_memory) = NULL;
     }
-    m_free(ptr);
+    m_free(alloc
+    #if MICROPY_MALLOC_USES_ALLOCATED_SIZE
+           , alloc->size
+    #endif
+    );
 }
 
 // Check if a nimble ptr is tracked.
 // If it isn't, that means that it's from a previous soft-reset cycle.
 STATIC bool is_valid_nimble_malloc(void *ptr) {
     DEBUG_MALLOC_printf("NIMBLE is_valid_nimble_malloc(%p)\n", ptr);
-    void** search = MP_STATE_PORT(bluetooth_nimble_memory);
-    while (search) {
-        if (&search[2] == ptr) {
+    mp_bluetooth_nimble_malloc_t *alloc = MP_STATE_PORT(bluetooth_nimble_memory);
+    while (alloc) {
+        DEBUG_MALLOC_printf("NIMBLE   checking: %p\n", alloc->data);
+        if (alloc->data == ptr) {
             return true;
         }
-
-        search = (void**)search[1];
+        alloc = alloc->next;
     }
     return false;
 }
@@ -110,22 +124,46 @@ void *nimble_malloc(size_t size) {
 // Only free if it's still a valid pointer.
 void nimble_free(void *ptr) {
     DEBUG_MALLOC_printf("NIMBLE free(%p)\n", ptr);
-    if (ptr && is_valid_nimble_malloc(ptr)) {
-        m_free_bluetooth(ptr);
+
+    if (ptr) {
+        // After a stack re-init, NimBLE has variables in BSS that might be
+        // still pointing to old allocations from a previous init. We can't do
+        // anything about this (e.g. ble_gatts_free_mem is private). But we
+        // can identify that this is a non-null, invalid alloc because it
+        // won't be in our list, so ignore it because it is effectively free'd
+        // anyway (it's not referenced by anything the GC can find).
+        if (is_valid_nimble_malloc(ptr)) {
+            m_free_bluetooth(ptr);
+        }
     }
 }
 
 // Only realloc if it's still a valid pointer. Otherwise just malloc.
-void *nimble_realloc(void *ptr, size_t size) {
-    // This is only used by ble_gatts.c to grow the queue of pending services to be registered.
-    DEBUG_MALLOC_printf("NIMBLE realloc(%p, %u)\n", ptr, (uint)size);
-    void *ptr2 = nimble_malloc(size);
-    if (ptr && is_valid_nimble_malloc(ptr)) {
-        // If it's a realloc and we still have the old data, then copy it.
-        // This will happen as we add services.
-        memcpy(ptr2, ptr, size);
-        m_free_bluetooth(ptr);
+void *nimble_realloc(void *ptr, size_t new_size) {
+    DEBUG_MALLOC_printf("NIMBLE realloc(%p, %u)\n", ptr, (uint)new_size);
+
+    if (!ptr) {
+        return nimble_malloc(new_size);
     }
+
+    assert(is_valid_nimble_malloc(ptr));
+
+    // Existing alloc is big enough.
+    mp_bluetooth_nimble_malloc_t *alloc = get_nimble_malloc(ptr);
+    size_t old_size = alloc->size - sizeof(mp_bluetooth_nimble_malloc_t);
+    if (old_size >= new_size) {
+        return ptr;
+    }
+
+    // Allocate a new, larger region.
+    void *ptr2 = m_malloc_bluetooth(new_size);
+
+    // Copy old, smaller region into new region.
+    memcpy(ptr2, ptr, old_size);
+    m_free_bluetooth(ptr);
+
+    DEBUG_MALLOC_printf("  --> %p\n", ptr2);
+
     return ptr2;
 }
 
diff --git a/ports/stm32/mpconfigport.h b/ports/stm32/mpconfigport.h
index e1e1491d64c6d..95b539603fb95 100644
--- a/ports/stm32/mpconfigport.h
+++ b/ports/stm32/mpconfigport.h
@@ -299,7 +299,7 @@ extern const struct _mp_obj_module_t mp_module_onewire;
 #if MICROPY_BLUETOOTH_NIMBLE
 struct _mp_bluetooth_nimble_root_pointers_t;
 struct _mp_bluetooth_nimble_malloc_t;
-#define MICROPY_PORT_ROOT_POINTER_BLUETOOTH_NIMBLE void **bluetooth_nimble_memory; struct _mp_bluetooth_nimble_root_pointers_t *bluetooth_nimble_root_pointers;
+#define MICROPY_PORT_ROOT_POINTER_BLUETOOTH_NIMBLE struct _mp_bluetooth_nimble_malloc_t *bluetooth_nimble_memory; struct _mp_bluetooth_nimble_root_pointers_t *bluetooth_nimble_root_pointers;
 #else
 #define MICROPY_PORT_ROOT_POINTER_BLUETOOTH_NIMBLE
 #endif

From aa18ab7db2a055440cb4798487c12809c74935c5 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Fri, 14 Aug 2020 16:29:22 +1000
Subject: [PATCH 0248/3533] extmod/nimble: Implement NimBLE mutex.

---
 extmod/nimble/nimble/nimble_npl_os.c | 49 +++++++++++++++++++++++++---
 extmod/nimble/nimble/nimble_npl_os.h |  1 +
 2 files changed, 46 insertions(+), 4 deletions(-)

diff --git a/extmod/nimble/nimble/nimble_npl_os.c b/extmod/nimble/nimble/nimble_npl_os.c
index 500f7c0a51e0b..46f7a0b291303 100644
--- a/extmod/nimble/nimble/nimble_npl_os.c
+++ b/extmod/nimble/nimble/nimble_npl_os.c
@@ -249,21 +249,62 @@ void ble_npl_event_set_arg(struct ble_npl_event *ev, void *arg) {
 /******************************************************************************/
 // MUTEX
 
+// This is what MICROPY_BEGIN_ATOMIC_SECTION returns on Unix (i.e. we don't
+// need to preserve the atomic state to unlock).
+#define ATOMIC_STATE_MUTEX_NOT_HELD 0xffffffff
+
 ble_npl_error_t ble_npl_mutex_init(struct ble_npl_mutex *mu) {
     DEBUG_MUTEX_printf("ble_npl_mutex_init(%p)\n", mu);
     mu->locked = 0;
+    mu->atomic_state = ATOMIC_STATE_MUTEX_NOT_HELD;
     return BLE_NPL_OK;
 }
 
 ble_npl_error_t ble_npl_mutex_pend(struct ble_npl_mutex *mu, ble_npl_time_t timeout) {
-    DEBUG_MUTEX_printf("ble_npl_mutex_pend(%p, %u) locked=%u\n", mu, (uint)timeout, (uint)mu->locked);
-    mu->locked = 1;
+    DEBUG_MUTEX_printf("ble_npl_mutex_pend(%p, %u) locked=%u irq=%d\n", mu, (uint)timeout, (uint)mu->locked);
+
+    // This is a recursive mutex which we implement on top of the IRQ priority
+    // scheme. Unfortunately we have a single piece of global storage, where
+    // enter/exit critical needs an "atomic state".
+
+    // There are two different acquirers, either running in a VM thread (i.e.
+    // a direct Python call into NimBLE), or in the NimBLE task (i.e. polling
+    // or UART RX).
+
+    // On STM32 the NimBLE task runs in PENDSV, so cannot be interrupted by a VM thread.
+    // Therefore we only need to ensure that a VM thread that acquires a currently-unlocked mutex
+    // now raises the priority (thus preventing context switches to other VM threads and
+    // the PENDSV irq). If the mutex is already locked, then it must have been acquired
+    // by us.
+
+    // On Unix, the critical section is completely recursive and doesn't require us to manage
+    // state so we just acquire and release every time.
+
+    // TODO: The "volatile" on locked/atomic_state isn't enough to protect against memory re-ordering.
+
+    // First acquirer of this mutex always enters the critical section, unless
+    // we're on Unix where it happens every time.
+    if (mu->atomic_state == ATOMIC_STATE_MUTEX_NOT_HELD) {
+        mu->atomic_state = mp_bluetooth_nimble_hci_uart_enter_critical();
+    }
+
+    ++mu->locked;
+
     return BLE_NPL_OK;
 }
 
 ble_npl_error_t ble_npl_mutex_release(struct ble_npl_mutex *mu) {
-    DEBUG_MUTEX_printf("ble_npl_mutex_release(%p) locked=%u\n", mu, (uint)mu->locked);
-    mu->locked = 0;
+    DEBUG_MUTEX_printf("ble_npl_mutex_release(%p) locked=%u irq=%d\n", mu, (uint)mu->locked);
+    assert(mu->locked > 0);
+
+    --mu->locked;
+
+    // Only exit the critical section for the final release, unless we're on Unix.
+    if (mu->locked == 0 || mu->atomic_state == ATOMIC_STATE_MUTEX_NOT_HELD) {
+        mp_bluetooth_nimble_hci_uart_exit_critical(mu->atomic_state);
+        mu->atomic_state = ATOMIC_STATE_MUTEX_NOT_HELD;
+    }
+
     return BLE_NPL_OK;
 }
 
diff --git a/extmod/nimble/nimble/nimble_npl_os.h b/extmod/nimble/nimble/nimble_npl_os.h
index bfa35d0952f25..3ef07aa9ccd12 100644
--- a/extmod/nimble/nimble/nimble_npl_os.h
+++ b/extmod/nimble/nimble/nimble_npl_os.h
@@ -61,6 +61,7 @@ struct ble_npl_callout {
 
 struct ble_npl_mutex {
     volatile uint8_t locked;
+    volatile uint32_t atomic_state;
 };
 
 struct ble_npl_sem {

From feed69aa5c4e9fda037497a1b63c05a27b164920 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Fri, 14 Aug 2020 16:40:55 +1000
Subject: [PATCH 0249/3533] unix/Makefile: Always enable -f*-sections
 regardless of DEBUG setting.

---
 ports/unix/Makefile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ports/unix/Makefile b/ports/unix/Makefile
index a9ba5edfad9af..090b58d8ec4e2 100644
--- a/ports/unix/Makefile
+++ b/ports/unix/Makefile
@@ -47,10 +47,12 @@ ifdef DEBUG
 COPT ?= -O0
 else
 COPT ?= -Os
-COPT += -fdata-sections -ffunction-sections
 COPT += -DNDEBUG
 endif
 
+# Remove unused sections.
+COPT += -fdata-sections -ffunction-sections
+
 # Always enable symbols -- They're occasionally useful, and don't make it into the
 # final .bin/.hex/.dfu so the extra size doesn't matter.
 CFLAGS += -g

From 1b1b22905e1aa7676c51078f75b1bd73d8383a4a Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Fri, 14 Aug 2020 15:46:53 +1000
Subject: [PATCH 0250/3533] unix: Implement BLE H4 HCI UART for btstack/nimble.

This commit adds support for using Bluetooth on the unix port via a H4
serial interface (distinct from a USB dongle), with both BTstack and NimBLE
Bluetooth stacks.

Note that MICROPY_PY_BLUETOOTH is now disabled for the coverage variant.
Prior to this commit Bluetooth was anyway not being built on Travis because
libusb was not detected.  But now that bluetooth works in H4 mode it will
be built, and will lead to a large decrease in coverage because Bluetooth
tests cannot be run on Travis.
---
 extmod/btstack/btstack.mk                     |   8 +
 ports/unix/Makefile                           |  45 +++-
 ports/unix/mpbthciport.c                      | 219 ++++++++++++++++++
 ports/unix/mpbtstackport.h                    |   5 +
 ports/unix/mpbtstackport_common.c             |   7 +
 ports/unix/mpbtstackport_h4.c                 |  80 +++++++
 ports/unix/mpconfigport.h                     |   7 +-
 ports/unix/mpnimbleport.c                     |  84 +++++++
 ports/unix/mpnimbleport.h                     |  33 +++
 .../unix/variants/coverage/mpconfigvariant.mk |   1 -
 ports/unix/variants/dev/mpconfigvariant.mk    |   3 +-
 11 files changed, 484 insertions(+), 8 deletions(-)
 create mode 100644 ports/unix/mpbthciport.c
 create mode 100644 ports/unix/mpbtstackport_h4.c
 create mode 100644 ports/unix/mpnimbleport.c
 create mode 100644 ports/unix/mpnimbleport.h

diff --git a/extmod/btstack/btstack.mk b/extmod/btstack/btstack.mk
index 3084601b85415..7e5d2f646d14c 100644
--- a/extmod/btstack/btstack.mk
+++ b/extmod/btstack/btstack.mk
@@ -30,10 +30,18 @@ SRC_BTSTACK = \
 	$(addprefix lib/btstack/src/ble/, $(filter-out %_tlv.c, $(SRC_BLE_FILES))) \
 	lib/btstack/platform/embedded/btstack_run_loop_embedded.c
 
+ifeq ($(MICROPY_BLUETOOTH_BTSTACK_USB),1)
+ifeq ($(MICROPY_BLUETOOTH_BTSTACK_H4),1)
+	$(error Cannot specifiy both MICROPY_BLUETOOTH_BTSTACK_USB and MICROPY_BLUETOOTH_BTSTACK_H4)
+endif
+endif
+
 ifeq ($(MICROPY_BLUETOOTH_BTSTACK_USB),1)
 SRC_BTSTACK += \
 	lib/btstack/platform/libusb/hci_transport_h2_libusb.c
 
+CFLAGS_MOD += -DMICROPY_BLUETOOTH_BTSTACK_USB=1
+
 CFLAGS  += $(shell pkg-config libusb-1.0 --cflags)
 LDFLAGS += $(shell pkg-config libusb-1.0 --libs)
 endif
diff --git a/ports/unix/Makefile b/ports/unix/Makefile
index 090b58d8ec4e2..ff5f355022bc5 100644
--- a/ports/unix/Makefile
+++ b/ports/unix/Makefile
@@ -134,24 +134,57 @@ CFLAGS_MOD += -DMICROPY_PY_THREAD=1 -DMICROPY_PY_THREAD_GIL=0
 LDFLAGS_MOD += $(LIBPTHREAD)
 endif
 
-# If the variant enables it and we have libusb, enable BTStack support for USB adaptors.
+# If the variant enables it, enable modbluetooth.
 ifeq ($(MICROPY_PY_BLUETOOTH),1)
 
 HAVE_LIBUSB := $(shell (which pkg-config > /dev/null && pkg-config --exists libusb-1.0) 2>/dev/null && echo '1')
-ifeq ($(HAVE_LIBUSB),1)
+
+# Only one stack can be enabled.
+ifeq ($(MICROPY_BLUETOOTH_NIMBLE),1)
+ifeq ($(MICROPY_BLUETOOTH_BTSTACK),1)
+$(error Cannot enable both NimBLE and BTstack at the same time)
+endif
+endif
+
+# Default to btstack, but a variant (or make command line) can set NimBLE
+# explicitly (which is always via H4 UART).
+ifneq ($(MICROPY_BLUETOOTH_NIMBLE),1)
+ifneq ($(MICROPY_BLUETOOTH_BTSTACK),1)
+MICROPY_BLUETOOTH_BTSTACK ?= 1
+endif
+endif
 
 CFLAGS_MOD += -DMICROPY_PY_BLUETOOTH=1
 CFLAGS_MOD += -DMICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE=1
 # Runs in a thread, cannot make calls into the VM.
 CFLAGS_MOD += -DMICROPY_PY_BLUETOOTH_GATTS_ON_READ_CALLBACK=0
 
-MICROPY_BLUETOOTH_BTSTACK ?= 1
+ifeq ($(MICROPY_BLUETOOTH_BTSTACK),1)
+
+# Figure out which BTstack transport to use.
+ifeq ($(MICROPY_BLUETOOTH_BTSTACK_H4),1)
+ifeq ($(MICROPY_BLUETOOTH_BTSTACK_USB),1)
+$(error Cannot enable BTstack support for USB and H4 UART at the same time)
+endif
+else
+ifeq ($(HAVE_LIBUSB),1)
+# Default to btstack-over-usb.
 MICROPY_BLUETOOTH_BTSTACK_USB ?= 1
+else
+# Fallback to HCI controller via a H4 UART (e.g. Zephyr on nRF) over a /dev/tty serial port.
+MICROPY_BLUETOOTH_BTSTACK_H4 ?= 1
+endif
+endif
 
-ifeq ($(MICROPY_BLUETOOTH_BTSTACK),1)
+# BTstack is enabled.
 GIT_SUBMODULES += lib/btstack
 include $(TOP)/extmod/btstack/btstack.mk
-endif
+
+else
+
+# NimBLE is enabled.
+GIT_SUBMODULES += lib/mynewt-nimble
+include $(TOP)/extmod/nimble/nimble.mk
 
 endif
 
@@ -201,7 +234,9 @@ SRC_C = \
 	alloc.c \
 	coverage.c \
 	fatfs_port.c \
+	mpbthciport.c \
 	mpbtstackport_common.c \
+	mpbtstackport_h4.c \
 	mpbtstackport_usb.c \
 	mpnimbleport.c \
 	$(SRC_MOD) \
diff --git a/ports/unix/mpbthciport.c b/ports/unix/mpbthciport.c
new file mode 100644
index 0000000000000..5a5c1d4a4e79d
--- /dev/null
+++ b/ports/unix/mpbthciport.c
@@ -0,0 +1,219 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 Jim Mussared
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "py/runtime.h"
+#include "py/mperrno.h"
+#include "py/mphal.h"
+
+#if MICROPY_PY_BLUETOOTH && (MICROPY_BLUETOOTH_NIMBLE || (MICROPY_BLUETOOTH_BTSTACK && MICROPY_BLUETOOTH_BTSTACK_H4))
+
+#if !MICROPY_PY_THREAD
+#error Unix HCI UART requires MICROPY_PY_THREAD
+#endif
+
+#include "extmod/modbluetooth.h"
+#include "extmod/mpbthci.h"
+
+#include <pthread.h>
+#include <unistd.h>
+
+#include <termios.h>
+#include <fcntl.h>
+#include <stdlib.h>
+#include <string.h>
+
+#define DEBUG_printf(...) // printf(__VA_ARGS__)
+#define DEBUG_HCI_DUMP (0)
+
+uint8_t mp_bluetooth_hci_cmd_buf[4 + 256];
+
+// Must be provided by the stack bindings (e.g. mpnimbleport.c or mpbtstackport.c).
+extern bool mp_bluetooth_hci_poll(void);
+
+STATIC const useconds_t UART_POLL_INTERVAL_US = 1000;
+
+STATIC int uart_fd = -1;
+STATIC pthread_t hci_poll_thread_id;
+
+STATIC void *hci_poll_thread(void *arg) {
+    (void)arg;
+
+    // This will return false when the stack is shutdown.
+    while (mp_bluetooth_hci_poll()) {
+        usleep(UART_POLL_INTERVAL_US);
+    }
+
+    return NULL;
+}
+
+STATIC int configure_uart(void) {
+    struct termios toptions;
+
+    // Get existing config.
+    if (tcgetattr(uart_fd, &toptions) < 0) {
+        DEBUG_printf("Couldn't get term attributes");
+        return -1;
+    }
+
+    // Raw mode (disable all processing).
+    cfmakeraw(&toptions);
+
+    // 8N1, no parity.
+    toptions.c_cflag &= ~CSTOPB;
+    toptions.c_cflag |= CS8;
+    toptions.c_cflag &= ~PARENB;
+
+    // Enable receiver, ignore modem control lines
+    toptions.c_cflag |= CREAD | CLOCAL;
+
+    // Blocking, single-byte reads.
+    toptions.c_cc[VMIN] = 1;
+    toptions.c_cc[VTIME] = 0;
+
+    // Enable HW RTS/CTS flow control.
+    toptions.c_iflag &= ~(IXON | IXOFF | IXANY);
+    toptions.c_cflag |= CRTSCTS;
+
+    // 1Mbit (TODO: make this configurable).
+    speed_t brate = B1000000;
+    cfsetospeed(&toptions, brate);
+    cfsetispeed(&toptions, brate);
+
+    // Apply immediately.
+    if (tcsetattr(uart_fd, TCSANOW, &toptions) < 0) {
+        DEBUG_printf("Couldn't set term attributes");
+        return -1;
+    }
+
+    return 0;
+}
+
+// HCI UART bindings.
+int mp_bluetooth_hci_uart_init(uint32_t port, uint32_t baudrate) {
+    (void)port;
+    (void)baudrate;
+
+    DEBUG_printf("mp_bluetooth_hci_uart_init (unix)\n");
+
+    char uart_device_name[256] = "/dev/ttyUSB0";
+
+    char *path = getenv("MICROPYBTUART");
+    if (path != NULL) {
+        strcpy(uart_device_name, path);
+    }
+    DEBUG_printf("Using HCI UART: %s\n", uart_device_name);
+
+    int flags = O_RDWR | O_NOCTTY | O_NONBLOCK;
+    uart_fd = open(uart_device_name, flags);
+    if (uart_fd == -1) {
+        DEBUG_printf("Unable to open port %s", uart_device_name);
+        return -1;
+    }
+
+    if (configure_uart()) {
+        return -1;
+    }
+
+    // Create a thread to run the polling loop.
+    pthread_attr_t attr;
+    pthread_attr_init(&attr);
+    pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
+    pthread_create(&hci_poll_thread_id, &attr, &hci_poll_thread, NULL);
+
+    return 0;
+}
+
+int mp_bluetooth_hci_uart_deinit(void) {
+    DEBUG_printf("mp_bluetooth_hci_uart_deinit\n");
+
+    // Wait for the poll loop to terminate when the state is set to OFF.
+    pthread_join(hci_poll_thread_id, NULL);
+
+    // Close the UART.
+    close(uart_fd);
+    uart_fd = -1;
+
+    return 0;
+}
+
+int mp_bluetooth_hci_uart_set_baudrate(uint32_t baudrate) {
+    (void)baudrate;
+    DEBUG_printf("mp_bluetooth_hci_uart_set_baudrate\n");
+    return 0;
+}
+
+int mp_bluetooth_hci_uart_readchar(void) {
+    // DEBUG_printf("mp_bluetooth_hci_uart_readchar\n");
+
+    uint8_t c;
+    ssize_t bytes_read = read(uart_fd, &c, 1);
+
+    if (bytes_read == 1) {
+        #if DEBUG_HCI_DUMP
+        printf("[% 8ld] RX: %02x\n", mp_hal_ticks_ms(), c);
+        #endif
+        return c;
+    } else {
+        return -1;
+    }
+}
+
+int mp_bluetooth_hci_uart_write(const uint8_t *buf, size_t len) {
+    // DEBUG_printf("mp_bluetooth_hci_uart_write\n");
+
+    #if DEBUG_HCI_DUMP
+    printf("[% 8ld] TX: %02x", mp_hal_ticks_ms(), buf[0]);
+    for (size_t i = 1; i < len; ++i) {
+        printf(":%02x", buf[i]);
+    }
+    printf("\n");
+    #endif
+
+    return write(uart_fd, buf, len);
+}
+
+// No-op implementations of HCI controller interface.
+int mp_bluetooth_hci_controller_init(void) {
+    return 0;
+}
+
+int mp_bluetooth_hci_controller_deinit(void) {
+    return 0;
+}
+
+int mp_bluetooth_hci_controller_sleep_maybe(void) {
+    return 0;
+}
+
+bool mp_bluetooth_hci_controller_woken(void) {
+    return true;
+}
+
+int mp_bluetooth_hci_controller_wakeup(void) {
+    return 0;
+}
+
+#endif // MICROPY_PY_BLUETOOTH && (MICROPY_BLUETOOTH_NIMBLE || (MICROPY_BLUETOOTH_BTSTACK && MICROPY_BLUETOOTH_BTSTACK_H4))
diff --git a/ports/unix/mpbtstackport.h b/ports/unix/mpbtstackport.h
index 29433cc7fb006..c82e8bd812d7a 100644
--- a/ports/unix/mpbtstackport.h
+++ b/ports/unix/mpbtstackport.h
@@ -32,6 +32,11 @@
 
 bool mp_bluetooth_hci_poll(void);
 
+#if MICROPY_BLUETOOTH_BTSTACK_H4
+void mp_bluetooth_hci_poll_h4(void);
+void mp_bluetooth_btstack_port_init_h4(void);
+#endif
+
 #if MICROPY_BLUETOOTH_BTSTACK_USB
 void mp_bluetooth_btstack_port_init_usb(void);
 #endif
diff --git a/ports/unix/mpbtstackport_common.c b/ports/unix/mpbtstackport_common.c
index 402cf95283441..eb1b1c9c8042b 100644
--- a/ports/unix/mpbtstackport_common.c
+++ b/ports/unix/mpbtstackport_common.c
@@ -45,6 +45,9 @@ bool mp_bluetooth_hci_poll(void) {
     if (mp_bluetooth_btstack_state == MP_BLUETOOTH_BTSTACK_STATE_STARTING || mp_bluetooth_btstack_state == MP_BLUETOOTH_BTSTACK_STATE_ACTIVE || mp_bluetooth_btstack_state == MP_BLUETOOTH_BTSTACK_STATE_HALTING) {
         // Pretend like we're running in IRQ context (i.e. other things can't be running at the same time).
         mp_uint_t atomic_state = MICROPY_BEGIN_ATOMIC_SECTION();
+        #if MICROPY_BLUETOOTH_BTSTACK_H4
+        mp_bluetooth_hci_poll_h4();
+        #endif
         btstack_run_loop_embedded_execute_once();
         MICROPY_END_ATOMIC_SECTION(atomic_state);
 
@@ -81,6 +84,10 @@ void mp_bluetooth_btstack_port_init(void) {
 
     // hci_dump_open(NULL, HCI_DUMP_STDOUT);
 
+    #if MICROPY_BLUETOOTH_BTSTACK_H4
+    mp_bluetooth_btstack_port_init_h4();
+    #endif
+
     #if MICROPY_BLUETOOTH_BTSTACK_USB
     mp_bluetooth_btstack_port_init_usb();
     #endif
diff --git a/ports/unix/mpbtstackport_h4.c b/ports/unix/mpbtstackport_h4.c
new file mode 100644
index 0000000000000..4fdc20c22b69b
--- /dev/null
+++ b/ports/unix/mpbtstackport_h4.c
@@ -0,0 +1,80 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 Jim Mussared
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include <pthread.h>
+
+#include "py/runtime.h"
+#include "py/mperrno.h"
+#include "py/mphal.h"
+
+#if MICROPY_PY_BLUETOOTH && MICROPY_BLUETOOTH_BTSTACK && MICROPY_BLUETOOTH_BTSTACK_H4
+
+#include "lib/btstack/chipset/zephyr/btstack_chipset_zephyr.h"
+
+#include "extmod/btstack/btstack_hci_uart.h"
+#include "extmod/btstack/modbluetooth_btstack.h"
+
+#include "mpbtstackport.h"
+
+#define DEBUG_printf(...) // printf(__VA_ARGS__)
+
+STATIC hci_transport_config_uart_t hci_transport_config_uart = {
+    HCI_TRANSPORT_CONFIG_UART,
+    1000000, // initial baudrate
+    0,       // main baudrate
+    1,       // flow control
+    NULL,    // device name
+};
+
+void mp_bluetooth_hci_poll_h4(void) {
+    if (mp_bluetooth_btstack_state == MP_BLUETOOTH_BTSTACK_STATE_STARTING || mp_bluetooth_btstack_state == MP_BLUETOOTH_BTSTACK_STATE_ACTIVE) {
+        mp_bluetooth_btstack_hci_uart_process();
+    }
+}
+
+void mp_bluetooth_btstack_port_init_h4(void) {
+    DEBUG_printf("mp_bluetooth_btstack_port_init_h4\n");
+
+    const hci_transport_t *transport = hci_transport_h4_instance(&mp_bluetooth_btstack_hci_uart_block);
+    hci_init(transport, &hci_transport_config_uart);
+
+    hci_set_chipset(btstack_chipset_zephyr_instance());
+}
+
+void mp_bluetooth_btstack_port_deinit(void) {
+    DEBUG_printf("mp_bluetooth_btstack_port_deinit\n");
+
+    hci_power_control(HCI_POWER_OFF);
+    hci_close();
+}
+
+void mp_bluetooth_btstack_port_start(void) {
+    DEBUG_printf("mp_bluetooth_btstack_port_start\n");
+
+    hci_power_control(HCI_POWER_ON);
+}
+
+#endif // MICROPY_PY_BLUETOOTH && MICROPY_BLUETOOTH_BTSTACK && MICROPY_BLUETOOTH_BTSTACK_H4
diff --git a/ports/unix/mpconfigport.h b/ports/unix/mpconfigport.h
index 9e24ab10cd263..c74d2fd84aa5f 100644
--- a/ports/unix/mpconfigport.h
+++ b/ports/unix/mpconfigport.h
@@ -314,6 +314,11 @@ void mp_unix_mark_exec(void);
 struct _mp_bluetooth_btstack_root_pointers_t;
 #define MICROPY_BLUETOOTH_ROOT_POINTERS struct _mp_bluetooth_btstack_root_pointers_t *bluetooth_btstack_root_pointers;
 #endif
+#if MICROPY_BLUETOOTH_NIMBLE
+struct _mp_bluetooth_nimble_root_pointers_t;
+struct _mp_bluetooth_nimble_malloc_t;
+#define MICROPY_BLUETOOTH_ROOT_POINTERS struct _mp_bluetooth_nimble_malloc_t *bluetooth_nimble_memory; struct _mp_bluetooth_nimble_root_pointers_t *bluetooth_nimble_root_pointers;
+#endif
 #else
 #define MICROPY_BLUETOOTH_ROOT_POINTERS
 #endif
@@ -353,7 +358,7 @@ struct _mp_bluetooth_btstack_root_pointers_t;
 #endif
 
 #if MICROPY_PY_THREAD
-#define MICROPY_BEGIN_ATOMIC_SECTION() (mp_thread_unix_begin_atomic_section(), 0)
+#define MICROPY_BEGIN_ATOMIC_SECTION() (mp_thread_unix_begin_atomic_section(), 0xffffffff)
 #define MICROPY_END_ATOMIC_SECTION(x) (void)x; mp_thread_unix_end_atomic_section()
 #endif
 
diff --git a/ports/unix/mpnimbleport.c b/ports/unix/mpnimbleport.c
new file mode 100644
index 0000000000000..8961910098c42
--- /dev/null
+++ b/ports/unix/mpnimbleport.c
@@ -0,0 +1,84 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 Jim Mussared
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "py/runtime.h"
+#include "py/mperrno.h"
+#include "py/mphal.h"
+
+#if MICROPY_PY_BLUETOOTH && MICROPY_BLUETOOTH_NIMBLE
+
+#include "nimble/nimble_npl.h"
+
+#include "extmod/nimble/modbluetooth_nimble.h"
+#include "extmod/nimble/hal/hal_uart.h"
+
+#define DEBUG_printf(...) // printf(__VA_ARGS__)
+
+// Called by the UART polling thread in mpbthciport.c.
+bool mp_bluetooth_hci_poll(void) {
+    // DEBUG_printf("mp_bluetooth_hci_poll (unix nimble) %d\n", mp_bluetooth_nimble_ble_state);
+
+    if (mp_bluetooth_nimble_ble_state == MP_BLUETOOTH_NIMBLE_BLE_STATE_OFF) {
+        DEBUG_printf("mp_bluetooth_hci_poll (unix nimble) -- shutdown\n");
+        return false;
+    }
+
+    if (mp_bluetooth_nimble_ble_state >= MP_BLUETOOTH_NIMBLE_BLE_STATE_WAITING_FOR_SYNC) {
+
+        // Pretend like we're running in IRQ context (i.e. other things can't be running at the same time).
+        mp_uint_t atomic_state = MICROPY_BEGIN_ATOMIC_SECTION();
+
+        // Ask NimBLE to process UART data.
+        mp_bluetooth_nimble_hci_uart_process();
+
+        // Run pending background operations and events, but only after HCI sync.
+        mp_bluetooth_nimble_os_callout_process();
+        mp_bluetooth_nimble_os_eventq_run_all();
+
+        MICROPY_END_ATOMIC_SECTION(atomic_state);
+    }
+
+    return true;
+}
+
+// Extra port-specific helpers.
+void mp_bluetooth_nimble_hci_uart_wfi(void) {
+    // DEBUG_printf("mp_bluetooth_nimble_hci_uart_wfi\n");
+    // TODO: this should do a select() on the uart_fd.
+}
+
+uint32_t mp_bluetooth_nimble_hci_uart_enter_critical(void) {
+    // DEBUG_printf("mp_bluetooth_nimble_hci_uart_enter_critical\n");
+    MICROPY_PY_BLUETOOTH_ENTER
+    return atomic_state; // Always 0xffffffff
+}
+
+void mp_bluetooth_nimble_hci_uart_exit_critical(uint32_t atomic_state) {
+    MICROPY_PY_BLUETOOTH_EXIT
+    // DEBUG_printf("mp_bluetooth_nimble_hci_uart_exit_critical\n");
+}
+
+#endif // MICROPY_PY_BLUETOOTH && MICROPY_BLUETOOTH_NIMBLE
diff --git a/ports/unix/mpnimbleport.h b/ports/unix/mpnimbleport.h
new file mode 100644
index 0000000000000..a2935e6fdf44a
--- /dev/null
+++ b/ports/unix/mpnimbleport.h
@@ -0,0 +1,33 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 Jim Mussared
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#ifndef MICROPY_INCLUDED_UNIX_NIMBLE_PORT_H
+#define MICROPY_INCLUDED_UNIX_NIMBLE_PORT_H
+
+#define MICROPY_HW_BLE_UART_ID (0)
+#define MICROPY_HW_BLE_UART_BAUDRATE (1000000)
+
+#endif // MICROPY_INCLUDED_UNIX_NIMBLE_PORT_H
diff --git a/ports/unix/variants/coverage/mpconfigvariant.mk b/ports/unix/variants/coverage/mpconfigvariant.mk
index 66e694e0a9ea0..f11d0b0d28f75 100644
--- a/ports/unix/variants/coverage/mpconfigvariant.mk
+++ b/ports/unix/variants/coverage/mpconfigvariant.mk
@@ -17,4 +17,3 @@ MICROPY_ROM_TEXT_COMPRESSION = 1
 MICROPY_VFS_FAT = 1
 MICROPY_VFS_LFS1 = 1
 MICROPY_VFS_LFS2 = 1
-MICROPY_PY_BLUETOOTH = 1
diff --git a/ports/unix/variants/dev/mpconfigvariant.mk b/ports/unix/variants/dev/mpconfigvariant.mk
index 1f8611b6fc30b..91bd28da9bd85 100644
--- a/ports/unix/variants/dev/mpconfigvariant.mk
+++ b/ports/unix/variants/dev/mpconfigvariant.mk
@@ -6,4 +6,5 @@ MICROPY_ROM_TEXT_COMPRESSION = 1
 MICROPY_VFS_FAT = 1
 MICROPY_VFS_LFS1 = 1
 MICROPY_VFS_LFS2 = 1
-MICROPY_PY_BLUETOOTH = 1
+
+MICROPY_PY_BLUETOOTH ?= 1

From c4af714d58213bb23b81f3736f785d897e60ac77 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Fri, 14 Aug 2020 15:47:21 +1000
Subject: [PATCH 0251/3533] extmod/modbluetooth: Implement configuration of
 address modes.

Changes `BLE.config('mac')` to return a tuple (addr_mode, addr).

Adds `BLE.config(addr_mode=...)` to set the addressing mode.
---
 extmod/btstack/modbluetooth_btstack.c | 122 ++++++++++++++++++++++++-
 extmod/modbluetooth.c                 |  11 ++-
 extmod/modbluetooth.h                 |  21 ++---
 extmod/nimble/modbluetooth_nimble.c   | 127 +++++++++++++++++---------
 ports/unix/mpbtstackport_common.c     |   3 -
 5 files changed, 222 insertions(+), 62 deletions(-)

diff --git a/extmod/btstack/modbluetooth_btstack.c b/extmod/btstack/modbluetooth_btstack.c
index 03ec12b734346..b028a5d1ac94c 100644
--- a/extmod/btstack/modbluetooth_btstack.c
+++ b/extmod/btstack/modbluetooth_btstack.c
@@ -271,6 +271,14 @@ STATIC void btstack_packet_handler_att_server(uint8_t packet_type, uint16_t chan
     }
 }
 
+#if MICROPY_BLUETOOTH_BTSTACK_ZEPHYR_STATIC_ADDRESS
+// During startup, the controller (e.g. Zephyr) might give us a static address that we can use.
+STATIC uint8_t controller_static_addr[6] = {0};
+STATIC bool controller_static_addr_available = false;
+
+STATIC const uint8_t read_static_address_command_complete_prefix[] = { 0x0e, 0x1b, 0x01, 0x09, 0xfc };
+#endif
+
 STATIC void btstack_packet_handler(uint8_t packet_type, uint8_t *packet, uint8_t irq) {
     DEBUG_printf("btstack_packet_handler(packet_type=%u, packet=%p)\n", packet_type, packet);
     if (packet_type != HCI_EVENT_PACKET) {
@@ -313,6 +321,13 @@ STATIC void btstack_packet_handler(uint8_t packet_type, uint8_t *packet, uint8_t
         DEBUG_printf("  --> hci transport packet sent\n");
     } else if (event_type == HCI_EVENT_COMMAND_COMPLETE) {
         DEBUG_printf("  --> hci command complete\n");
+        #if MICROPY_BLUETOOTH_BTSTACK_ZEPHYR_STATIC_ADDRESS
+        if (memcmp(packet, read_static_address_command_complete_prefix, sizeof(read_static_address_command_complete_prefix)) == 0) {
+            DEBUG_printf("  --> static address available\n");
+            reverse_48(&packet[7], controller_static_addr);
+            controller_static_addr_available = true;
+        }
+        #endif // MICROPY_BLUETOOTH_BTSTACK_ZEPHYR_STATIC_ADDRESS
     } else if (event_type == HCI_EVENT_COMMAND_STATUS) {
         DEBUG_printf("  --> hci command status\n");
     } else if (event_type == HCI_EVENT_NUMBER_OF_COMPLETED_PACKETS) {
@@ -493,6 +508,60 @@ STATIC void btstack_init_deinit_timeout_handler(btstack_timer_source_t *ds) {
     mp_bluetooth_btstack_state = MP_BLUETOOTH_BTSTACK_STATE_TIMEOUT;
 }
 
+STATIC void btstack_static_address_ready(void *arg) {
+    DEBUG_printf("btstack_static_address_ready.\n");
+    *(volatile bool *)arg = true;
+}
+
+STATIC bool set_public_address(void) {
+    bd_addr_t local_addr;
+    gap_local_bd_addr(local_addr);
+    bd_addr_t null_addr = {0};
+    if (memcmp(local_addr, null_addr, 6) == 0) {
+        DEBUG_printf("set_public_address: No public address available.\n");
+        return false;
+    }
+    DEBUG_printf("set_public_address: Using controller's public address.\n");
+    gap_random_address_set_mode(GAP_RANDOM_ADDRESS_TYPE_OFF);
+    return true;
+}
+
+STATIC void set_random_address(void) {
+    #if MICROPY_BLUETOOTH_BTSTACK_ZEPHYR_STATIC_ADDRESS
+    if (controller_static_addr_available) {
+        DEBUG_printf("set_random_address: Using static address supplied by controller.\n");
+        gap_random_address_set(controller_static_addr);
+    } else
+    #endif // MICROPY_BLUETOOTH_BTSTACK_ZEPHYR_STATIC_ADDRESS
+    {
+        DEBUG_printf("set_random_address: Generating random static address.\n");
+        btstack_crypto_random_t sm_crypto_random_request;
+        bd_addr_t static_addr;
+        volatile bool ready = false;
+        btstack_crypto_random_generate(&sm_crypto_random_request, static_addr, 6, &btstack_static_address_ready, (void *)&ready);
+        while (!ready) {
+            MICROPY_EVENT_POLL_HOOK
+        }
+        DEBUG_printf("set_random_address: Address generated.\n");
+        gap_random_address_set(static_addr);
+    }
+
+    // Wait for the controller to accept this address.
+    while (true) {
+        uint8_t addr_type;
+        bd_addr_t addr;
+        gap_le_get_own_address(&addr_type, addr);
+
+        bd_addr_t null_addr = {0};
+        if (memcmp(addr, null_addr, 6) != 0) {
+            break;
+        }
+
+        MICROPY_EVENT_POLL_HOOK
+    }
+    DEBUG_printf("set_random_address: Address loaded by controller\n");
+}
+
 int mp_bluetooth_init(void) {
     DEBUG_printf("mp_bluetooth_init\n");
 
@@ -505,6 +574,10 @@ int mp_bluetooth_init(void) {
 
     btstack_memory_init();
 
+    #if MICROPY_BLUETOOTH_BTSTACK_ZEPHYR_STATIC_ADDRESS
+    controller_static_addr_available = false;
+    #endif
+
     MP_STATE_PORT(bluetooth_btstack_root_pointers) = m_new0(mp_bluetooth_btstack_root_pointers_t, 1);
     mp_bluetooth_gatts_db_create(&MP_STATE_PORT(bluetooth_btstack_root_pointers)->gatts_db);
 
@@ -563,9 +636,23 @@ int mp_bluetooth_init(void) {
 
         // Clean up.
         MP_STATE_PORT(bluetooth_btstack_root_pointers) = NULL;
+
         return MP_ETIMEDOUT;
     }
 
+    DEBUG_printf("mp_bluetooth_init: stack startup complete\n");
+
+    // At this point if the controller has its own public address, btstack will know this.
+    // However, if this is not available, then attempt to get a static address:
+    //  - For a Zephyr controller on nRF, a static address will be available during startup.
+    //  - Otherwise we ask the controller to generate a static address for us.
+    // In either case, calling gap_random_address_set will set the mode to STATIC, and then
+    // immediately set the address on the controller. We then wait until this address becomes available.
+
+    if (!set_public_address()) {
+        set_random_address();
+    }
+
     #if MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE
     // Enable GATT_EVENT_NOTIFICATION/GATT_EVENT_INDICATION for all connections and handles.
     gatt_client_listen_for_characteristic_value_updates(&MP_STATE_PORT(bluetooth_btstack_root_pointers)->notification, &btstack_packet_handler_generic, GATT_CLIENT_ANY_CONNECTION, NULL);
@@ -612,8 +699,39 @@ bool mp_bluetooth_is_active(void) {
     return mp_bluetooth_btstack_state == MP_BLUETOOTH_BTSTACK_STATE_ACTIVE;
 }
 
-void mp_bluetooth_get_device_addr(uint8_t *addr) {
-    mp_hal_get_mac(MP_HAL_MAC_BDADDR, addr);
+void mp_bluetooth_get_current_address(uint8_t *addr_type, uint8_t *addr) {
+    if (!mp_bluetooth_is_active()) {
+        mp_raise_OSError(ERRNO_BLUETOOTH_NOT_ACTIVE);
+    }
+
+    DEBUG_printf("mp_bluetooth_get_current_address\n");
+    gap_le_get_own_address(addr_type, addr);
+}
+
+void mp_bluetooth_set_address_mode(uint8_t addr_mode) {
+    if (!mp_bluetooth_is_active()) {
+        mp_raise_OSError(ERRNO_BLUETOOTH_NOT_ACTIVE);
+    }
+
+    switch (addr_mode) {
+        case MP_BLUETOOTH_ADDRESS_MODE_PUBLIC: {
+            DEBUG_printf("mp_bluetooth_set_address_mode: public\n");
+            if (!set_public_address()) {
+                // No public address available.
+                mp_raise_OSError(MP_EINVAL);
+            }
+            break;
+        }
+        case MP_BLUETOOTH_ADDRESS_MODE_RANDOM: {
+            DEBUG_printf("mp_bluetooth_set_address_mode: random\n");
+            set_random_address();
+            break;
+        }
+        case MP_BLUETOOTH_ADDRESS_MODE_RPA:
+        case MP_BLUETOOTH_ADDRESS_MODE_NRPA:
+            // Not yet supported.
+            mp_raise_OSError(MP_EINVAL);
+    }
 }
 
 size_t mp_bluetooth_gap_get_device_name(const uint8_t **buf) {
diff --git a/extmod/modbluetooth.c b/extmod/modbluetooth.c
index 82efe49385377..a8a762ce32f24 100644
--- a/extmod/modbluetooth.c
+++ b/extmod/modbluetooth.c
@@ -308,9 +308,11 @@ STATIC mp_obj_t bluetooth_ble_config(size_t n_args, const mp_obj_t *args, mp_map
                 return mp_obj_new_bytes(buf, len);
             }
             case MP_QSTR_mac: {
+                uint8_t addr_type;
                 uint8_t addr[6];
-                mp_bluetooth_get_device_addr(addr);
-                return mp_obj_new_bytes(addr, MP_ARRAY_SIZE(addr));
+                mp_bluetooth_get_current_address(&addr_type, addr);
+                mp_obj_t items[] = { MP_OBJ_NEW_SMALL_INT(addr_type), mp_obj_new_bytes(addr, MP_ARRAY_SIZE(addr)) };
+                return mp_obj_new_tuple(2, items);
             }
             case MP_QSTR_rxbuf:
                 return mp_obj_new_int(self->ringbuf.size);
@@ -366,6 +368,11 @@ STATIC mp_obj_t bluetooth_ble_config(size_t n_args, const mp_obj_t *args, mp_map
                         m_del(uint8_t, old_irq_data_buf, old_irq_data_alloc);
                         break;
                     }
+                    case MP_QSTR_addr_mode: {
+                        mp_int_t addr_mode = mp_obj_get_int(e->value);
+                        mp_bluetooth_set_address_mode(addr_mode);
+                        break;
+                    }
                     default:
                         mp_raise_ValueError(MP_ERROR_TEXT("unknown config param"));
                 }
diff --git a/extmod/modbluetooth.h b/extmod/modbluetooth.h
index 2c07683124232..23ff97bc61806 100644
--- a/extmod/modbluetooth.h
+++ b/extmod/modbluetooth.h
@@ -79,15 +79,6 @@
 #define MP_BLUETOOTH_UUID_TYPE_32  (4)
 #define MP_BLUETOOTH_UUID_TYPE_128 (16)
 
-// Address types (for the addr_type params).
-// Ports will need to map these to their own values.
-#define MP_BLUETOOTH_ADDR_PUBLIC                        (0x00)  // Public (identity) address. (Same as NimBLE and NRF SD)
-#define MP_BLUETOOTH_ADDR_RANDOM_STATIC                 (0x01)  // Random static (identity) address. (Same as NimBLE and NRF SD)
-#define MP_BLUETOOTH_ADDR_PUBLIC_ID                     (0x02)  // (Same as NimBLE)
-#define MP_BLUETOOTH_ADDR_RANDOM_ID                     (0x03)  // (Same as NimBLE)
-#define MP_BLUETOOTH_ADDR_RANDOM_PRIVATE_RESOLVABLE     (0x12) // Random private resolvable address. (NRF SD 0x02)
-#define MP_BLUETOOTH_ADDR_RANDOM_PRIVATE_NON_RESOLVABLE (0x13) // Random private non-resolvable address. (NRF SD 0x03)
-
 // Event codes for the IRQ handler.
 #define MP_BLUETOOTH_IRQ_CENTRAL_CONNECT                (1)
 #define MP_BLUETOOTH_IRQ_CENTRAL_DISCONNECT             (2)
@@ -110,6 +101,11 @@
 #define MP_BLUETOOTH_IRQ_GATTC_INDICATE                 (19)
 #define MP_BLUETOOTH_IRQ_GATTS_INDICATE_DONE            (20)
 
+#define MP_BLUETOOTH_ADDRESS_MODE_PUBLIC (0)
+#define MP_BLUETOOTH_ADDRESS_MODE_RANDOM (1)
+#define MP_BLUETOOTH_ADDRESS_MODE_RPA (2)
+#define MP_BLUETOOTH_ADDRESS_MODE_NRPA (3)
+
 /*
 These aren't included in the module for space reasons, but can be used
 in your Python code if necessary.
@@ -173,8 +169,11 @@ void mp_bluetooth_deinit(void);
 // Returns true when the Bluetooth stack is active.
 bool mp_bluetooth_is_active(void);
 
-// Gets the MAC addr of this device in big-endian format.
-void mp_bluetooth_get_device_addr(uint8_t *addr);
+// Gets the current address of this device in big-endian format.
+void mp_bluetooth_get_current_address(uint8_t *addr_type, uint8_t *addr);
+
+// Sets the addressing mode to use.
+void mp_bluetooth_set_address_mode(uint8_t addr_mode);
 
 // Get or set the GAP device name that will be used by service 0x1800, characteristic 0x2a00.
 size_t mp_bluetooth_gap_get_device_name(const uint8_t **buf);
diff --git a/extmod/nimble/modbluetooth_nimble.c b/extmod/nimble/modbluetooth_nimble.c
index 61ba3a3aba696..1c782943ab485 100644
--- a/extmod/nimble/modbluetooth_nimble.c
+++ b/extmod/nimble/modbluetooth_nimble.c
@@ -50,6 +50,8 @@
 
 #define ERRNO_BLUETOOTH_NOT_ACTIVE MP_ENODEV
 
+STATIC uint8_t nimble_address_mode = BLE_OWN_ADDR_RANDOM;
+
 // Any BLE_HS_xxx code not in this table will default to MP_EIO.
 STATIC int8_t ble_hs_err_to_errno_table[] = {
     [BLE_HS_EAGAIN] = MP_EAGAIN,
@@ -148,9 +150,26 @@ STATIC void reset_cb(int reason) {
     (void)reason;
 }
 
-STATIC void sync_cb(void) {
+STATIC bool has_public_address(void) {
+    return ble_hs_id_copy_addr(BLE_ADDR_PUBLIC, NULL, NULL) == 0;
+}
+
+STATIC void set_random_address(bool nrpa) {
     int rc;
+    (void)rc;
+    DEBUG_printf("sync_cb: Generating random static address\n");
     ble_addr_t addr;
+    rc = ble_hs_id_gen_rnd(nrpa ? 1 : 0, &addr);
+    assert(rc == 0);
+    rc = ble_hs_id_set_rnd(addr.val);
+    assert(rc == 0);
+    rc = ble_hs_util_ensure_addr(1);
+    assert(rc == 0);
+}
+
+STATIC void sync_cb(void) {
+    int rc;
+    (void)rc;
 
     DEBUG_printf("sync_cb: state=%d\n", mp_bluetooth_nimble_ble_state);
 
@@ -158,25 +177,11 @@ STATIC void sync_cb(void) {
         return;
     }
 
-    rc = ble_hs_util_ensure_addr(0); // prefer public address
-    if (rc != 0) {
-        // https://mynewt.apache.org/latest/tutorials/ble/eddystone.html#configure-the-nimble-stack-with-an-address
-        #if MICROPY_PY_BLUETOOTH_RANDOM_ADDR
-        rc = ble_hs_id_gen_rnd(1, &addr);
-        assert(rc == 0);
-        rc = ble_hs_id_set_rnd(addr.val);
-        assert(rc == 0);
-        #else
-        uint8_t addr_be[6];
-        mp_hal_get_mac(MP_HAL_MAC_BDADDR, addr_be);
-        reverse_addr_byte_order(addr.val, addr_be);
-        // ble_hs_id_set_pub(addr.val);
-        rc = ble_hs_id_set_rnd(addr.val);
-        assert(rc == 0);
-        #endif
-
-        rc = ble_hs_util_ensure_addr(0); // prefer public address
-        assert(rc == 0);
+    if (has_public_address()) {
+        nimble_address_mode = BLE_OWN_ADDR_PUBLIC;
+    } else {
+        nimble_address_mode = BLE_OWN_ADDR_RANDOM;
+        set_random_address(false);
     }
 
     if (MP_BLUETOOTH_DEFAULT_ATTR_LEN > 20) {
@@ -412,19 +417,65 @@ bool mp_bluetooth_is_active(void) {
     return mp_bluetooth_nimble_ble_state == MP_BLUETOOTH_NIMBLE_BLE_STATE_ACTIVE;
 }
 
-void mp_bluetooth_get_device_addr(uint8_t *addr) {
-    #if MICROPY_PY_BLUETOOTH_RANDOM_ADDR
+void mp_bluetooth_get_current_address(uint8_t *addr_type, uint8_t *addr) {
+    if (!mp_bluetooth_is_active()) {
+        mp_raise_OSError(ERRNO_BLUETOOTH_NOT_ACTIVE);
+    }
+
     uint8_t addr_le[6];
-    int rc = ble_hs_id_copy_addr(BLE_ADDR_RANDOM, addr_le, NULL);
+
+    switch (nimble_address_mode) {
+        case BLE_OWN_ADDR_PUBLIC:
+            *addr_type = BLE_ADDR_PUBLIC;
+            break;
+        case BLE_OWN_ADDR_RANDOM:
+            *addr_type = BLE_ADDR_RANDOM;
+            break;
+        case BLE_OWN_ADDR_RPA_PUBLIC_DEFAULT:
+        case BLE_OWN_ADDR_RPA_RANDOM_DEFAULT:
+        default:
+            // TODO: If RPA/NRPA in use, get the current value.
+            // Is this even possible in NimBLE?
+            mp_raise_OSError(MP_EINVAL);
+    }
+
+    int rc = ble_hs_id_copy_addr(*addr_type, addr_le, NULL);
     if (rc != 0) {
-        // Even with MICROPY_PY_BLUETOOTH_RANDOM_ADDR enabled the public address may
-        // be used instead, in which case there is no random address.
-        ble_hs_id_copy_addr(BLE_ADDR_PUBLIC, addr_le, NULL);
+        mp_raise_OSError(MP_EINVAL);
     }
     reverse_addr_byte_order(addr, addr_le);
-    #else
-    mp_hal_get_mac(MP_HAL_MAC_BDADDR, addr);
-    #endif
+}
+
+void mp_bluetooth_set_address_mode(uint8_t addr_mode) {
+    switch (addr_mode) {
+        case MP_BLUETOOTH_ADDRESS_MODE_PUBLIC:
+            if (!has_public_address()) {
+                // No public address available.
+                mp_raise_OSError(MP_EINVAL);
+            }
+            nimble_address_mode = BLE_OWN_ADDR_PUBLIC;
+            break;
+        case MP_BLUETOOTH_ADDRESS_MODE_RANDOM:
+            // Generate an static random address.
+            set_random_address(false);
+            nimble_address_mode = BLE_OWN_ADDR_RANDOM;
+            break;
+        case MP_BLUETOOTH_ADDRESS_MODE_RPA:
+            if (has_public_address()) {
+                nimble_address_mode = BLE_OWN_ADDR_RPA_PUBLIC_DEFAULT;
+            } else {
+                // Generate an static random address to use as the identity address.
+                set_random_address(false);
+                nimble_address_mode = BLE_OWN_ADDR_RPA_RANDOM_DEFAULT;
+            }
+            break;
+        case MP_BLUETOOTH_ADDRESS_MODE_NRPA:
+            // Generate an NRPA.
+            set_random_address(true);
+            // In NimBLE, NRPA is treated like a static random address that happens to be an NRPA.
+            nimble_address_mode = BLE_OWN_ADDR_RANDOM;
+            break;
+    }
 }
 
 size_t mp_bluetooth_gap_get_device_name(const uint8_t **buf) {
@@ -473,19 +524,7 @@ int mp_bluetooth_gap_advertise_start(bool connectable, int32_t interval_us, cons
         .channel_map = 7, // all 3 channels.
     };
 
-    ret = ble_gap_adv_start(BLE_OWN_ADDR_PUBLIC, NULL, BLE_HS_FOREVER, &adv_params, gap_event_cb, NULL);
-    if (ret == 0) {
-        return 0;
-    }
-    ret = ble_gap_adv_start(BLE_OWN_ADDR_RPA_PUBLIC_DEFAULT, NULL, BLE_HS_FOREVER, &adv_params, gap_event_cb, NULL);
-    if (ret == 0) {
-        return 0;
-    }
-    ret = ble_gap_adv_start(BLE_OWN_ADDR_RPA_RANDOM_DEFAULT, NULL, BLE_HS_FOREVER, &adv_params, gap_event_cb, NULL);
-    if (ret == 0) {
-        return 0;
-    }
-    ret = ble_gap_adv_start(BLE_OWN_ADDR_RANDOM, NULL, BLE_HS_FOREVER, &adv_params, gap_event_cb, NULL);
+    ret = ble_gap_adv_start(nimble_address_mode, NULL, BLE_HS_FOREVER, &adv_params, gap_event_cb, NULL);
     if (ret == 0) {
         return 0;
     }
@@ -756,7 +795,7 @@ int mp_bluetooth_gap_scan_start(int32_t duration_ms, int32_t interval_us, int32_
         .passive = active_scan ? 0 : 1,
         .filter_duplicates = 0,
     };
-    int err = ble_gap_disc(BLE_OWN_ADDR_PUBLIC, duration_ms, &discover_params, gap_scan_cb, NULL);
+    int err = ble_gap_disc(nimble_address_mode, duration_ms, &discover_params, gap_scan_cb, NULL);
     return ble_hs_err_to_errno(err);
 }
 
@@ -847,7 +886,7 @@ int mp_bluetooth_gap_peripheral_connect(uint8_t addr_type, const uint8_t *addr,
     };
 
     ble_addr_t addr_nimble = create_nimble_addr(addr_type, addr);
-    int err = ble_gap_connect(BLE_OWN_ADDR_PUBLIC, &addr_nimble, duration_ms, &params, &peripheral_gap_event_cb, NULL);
+    int err = ble_gap_connect(nimble_address_mode, &addr_nimble, duration_ms, &params, &peripheral_gap_event_cb, NULL);
     return ble_hs_err_to_errno(err);
 }
 
diff --git a/ports/unix/mpbtstackport_common.c b/ports/unix/mpbtstackport_common.c
index eb1b1c9c8042b..621e661f9eba3 100644
--- a/ports/unix/mpbtstackport_common.c
+++ b/ports/unix/mpbtstackport_common.c
@@ -93,7 +93,4 @@ void mp_bluetooth_btstack_port_init(void) {
     #endif
 }
 
-void mp_hal_get_mac(int idx, uint8_t buf[6]) {
-}
-
 #endif // MICROPY_PY_BLUETOOTH && MICROPY_BLUETOOTH_BTSTACK

From 26b66804e96b78395cddc37e195fc36862837d97 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Fri, 14 Aug 2020 15:16:29 +1000
Subject: [PATCH 0252/3533] tests/multi_bluetooth: Update to new config('mac')
 behaviour.

---
 tests/multi_bluetooth/ble_characteristic.py          | 2 +-
 tests/multi_bluetooth/ble_gap_advertise.py           | 2 +-
 tests/multi_bluetooth/ble_gap_connect.py             | 4 ++--
 tests/multi_bluetooth/ble_gap_device_name.py         | 2 +-
 tests/multi_bluetooth/ble_gatt_data_transfer.py      | 2 +-
 tests/multi_bluetooth/ble_gattc_discover_services.py | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/tests/multi_bluetooth/ble_characteristic.py b/tests/multi_bluetooth/ble_characteristic.py
index 0d72c181fdec6..d918d9aefcf03 100644
--- a/tests/multi_bluetooth/ble_characteristic.py
+++ b/tests/multi_bluetooth/ble_characteristic.py
@@ -146,7 +146,7 @@ def instance1():
     try:
         # Connect to peripheral and then disconnect.
         print("gap_connect")
-        ble.gap_connect(0, BDADDR)
+        ble.gap_connect(*BDADDR)
         if not wait_for_event(_IRQ_PERIPHERAL_CONNECT, TIMEOUT_MS):
             return
         conn_handle, _, _ = waiting_data
diff --git a/tests/multi_bluetooth/ble_gap_advertise.py b/tests/multi_bluetooth/ble_gap_advertise.py
index 71a5b58a56f7a..bb6ff8e425461 100644
--- a/tests/multi_bluetooth/ble_gap_advertise.py
+++ b/tests/multi_bluetooth/ble_gap_advertise.py
@@ -36,7 +36,7 @@ def instance1():
     def irq(ev, data):
         nonlocal finished, adv_types, adv_data
         if ev == _IRQ_SCAN_RESULT:
-            if data[1] == BDADDR:
+            if data[0] == BDADDR[0] and data[1] == BDADDR[1]:
                 adv_types.add(data[2])
                 if adv_data is None:
                     adv_data = bytes(data[4])
diff --git a/tests/multi_bluetooth/ble_gap_connect.py b/tests/multi_bluetooth/ble_gap_connect.py
index 8e3ed8b816b3a..ba9c28230d7da 100644
--- a/tests/multi_bluetooth/ble_gap_connect.py
+++ b/tests/multi_bluetooth/ble_gap_connect.py
@@ -76,7 +76,7 @@ def instance1():
     try:
         # Connect to peripheral and then disconnect.
         print("gap_connect")
-        ble.gap_connect(0, BDADDR)
+        ble.gap_connect(*BDADDR)
         if not wait_for_event(_IRQ_PERIPHERAL_CONNECT, TIMEOUT_MS):
             return
         print("gap_disconnect:", ble.gap_disconnect(waiting_data[0]))
@@ -88,7 +88,7 @@ def instance1():
 
         # Connect to peripheral and then let the peripheral disconnect us.
         print("gap_connect")
-        ble.gap_connect(0, BDADDR)
+        ble.gap_connect(*BDADDR)
         if not wait_for_event(_IRQ_PERIPHERAL_CONNECT, TIMEOUT_MS):
             return
         wait_for_event(_IRQ_PERIPHERAL_DISCONNECT, TIMEOUT_MS)
diff --git a/tests/multi_bluetooth/ble_gap_device_name.py b/tests/multi_bluetooth/ble_gap_device_name.py
index dafa367128b49..92ea94278a647 100644
--- a/tests/multi_bluetooth/ble_gap_device_name.py
+++ b/tests/multi_bluetooth/ble_gap_device_name.py
@@ -97,7 +97,7 @@ def instance1():
 
             # Connect to peripheral.
             print("gap_connect")
-            ble.gap_connect(0, BDADDR)
+            ble.gap_connect(*BDADDR)
             if not wait_for_event(_IRQ_PERIPHERAL_CONNECT, TIMEOUT_MS):
                 return
             conn_handle, _, _ = waiting_data
diff --git a/tests/multi_bluetooth/ble_gatt_data_transfer.py b/tests/multi_bluetooth/ble_gatt_data_transfer.py
index dba0c333be672..240f048607c92 100644
--- a/tests/multi_bluetooth/ble_gatt_data_transfer.py
+++ b/tests/multi_bluetooth/ble_gatt_data_transfer.py
@@ -137,7 +137,7 @@ def instance1():
     try:
         # Connect to peripheral and then disconnect.
         print("gap_connect")
-        ble.gap_connect(0, BDADDR)
+        ble.gap_connect(*BDADDR)
         if not wait_for_event(_IRQ_PERIPHERAL_CONNECT, TIMEOUT_MS):
             return
         conn_handle, _, _ = waiting_data
diff --git a/tests/multi_bluetooth/ble_gattc_discover_services.py b/tests/multi_bluetooth/ble_gattc_discover_services.py
index e746b87458e1b..57f95bf0125e7 100644
--- a/tests/multi_bluetooth/ble_gattc_discover_services.py
+++ b/tests/multi_bluetooth/ble_gattc_discover_services.py
@@ -85,7 +85,7 @@ def instance1():
     try:
         # Connect to peripheral and then disconnect.
         print("gap_connect")
-        ble.gap_connect(0, BDADDR)
+        ble.gap_connect(*BDADDR)
         if not wait_for_event(_IRQ_PERIPHERAL_CONNECT, TIMEOUT_MS):
             return
         conn_handle, _, _ = waiting_data

From 67d8139e2b4cbaba5c722feef4e5478ae647344d Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Fri, 14 Aug 2020 15:17:14 +1000
Subject: [PATCH 0253/3533] docs/library/ubluetooth.rst: Document BLE address
 modes.

---
 docs/library/ubluetooth.rst | 31 ++++++++++++++++++++++++-------
 1 file changed, 24 insertions(+), 7 deletions(-)

diff --git a/docs/library/ubluetooth.rst b/docs/library/ubluetooth.rst
index 0cac16f5f4ad9..f8dad7b8d1ed2 100644
--- a/docs/library/ubluetooth.rst
+++ b/docs/library/ubluetooth.rst
@@ -45,12 +45,22 @@ Configuration
 
     Currently supported values are:
 
-    - ``'mac'``: Returns the device MAC address. If a device has a fixed address
-      (e.g. PYBD) then it will be returned. Otherwise (e.g. ESP32) a random
-      address will be generated when the BLE interface is made active.
+    - ``'mac'``: The current address in use, depending on the current address mode.
+      This returns a tuple of ``(addr_type, addr)``.
 
-      **Note:** on some ports, accessing this value requires that the interface is
-      active (so that the MAC address can be queried from the controller).
+      See :meth:`gatts_write <BLE.gap_scan>` for details about address type.
+
+      This may only be queried while the interface is currently active.
+
+    - ``'addr_mode'``: Sets the address mode. Values can be:
+
+        * 0x00 - PUBLIC - Use the controller's public address.
+        * 0x01 - RANDOM - Use a generated static address.
+        * 0x02 - RPA - Use resolvable private addresses.
+        * 0x03 - NRPA - Use non-resolvable private addresses.
+
+      By default the interface mode will use a PUBLIC address if available, otherwise
+      it will use a RANDOM address.
 
     - ``'gap_name'``: Get/set the GAP device name used by service 0x1800,
       characteristic 0x2a00.  This can be set at any time and changed multiple
@@ -219,8 +229,13 @@ Observer Role (Scanner)
     (background scanning).
 
     For each scan result the ``_IRQ_SCAN_RESULT`` event will be raised, with event
-    data ``(addr_type, addr, adv_type, rssi, adv_data)``.  ``adv_type`` values correspond
-    to the Bluetooth Specification:
+    data ``(addr_type, addr, adv_type, rssi, adv_data)``.
+
+    ``addr_type`` values indicate public or random addresses:
+        * 0x00 - PUBLIC
+        * 0x01 - RANDOM (either static, RPA, or NRPA, the type is encoded in the address itself)
+
+    ``adv_type`` values correspond to the Bluetooth Specification:
 
         * 0x00 - ADV_IND - connectable and scannable undirected advertising
         * 0x01 - ADV_DIRECT_IND - connectable directed advertising
@@ -342,6 +357,8 @@ Central Role (GATT Client)
 
     Connect to a peripheral.
 
+    See :meth:`gatts_write <BLE.gap_scan>` for details about address types.
+
     On success, the ``_IRQ_PERIPHERAL_CONNECT`` event will be raised.
 
 .. method:: BLE.gap_disconnect(conn_handle)

From 52a2ce45de353267776aaa25856c9d144653f142 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Mon, 17 Aug 2020 10:53:00 +1000
Subject: [PATCH 0254/3533] extmod/modbluetooth: Allow using mp_hal_get_mac as
 a static address.

Generally a controller should either have its own public address hardcoded,
or loaded by the driver (e.g. cywbt43).

However, for a controller that has no public address where you still want a
long-term stable address, this allows you to use a static address generated
by the port.  Typically on STM32 this will be an LAA, but a board might
override this.
---
 extmod/btstack/modbluetooth_btstack.c | 17 ++++++++++++++++-
 extmod/nimble/modbluetooth_nimble.c   | 18 +++++++++++++++---
 2 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/extmod/btstack/modbluetooth_btstack.c b/extmod/btstack/modbluetooth_btstack.c
index b028a5d1ac94c..773234b9b2600 100644
--- a/extmod/btstack/modbluetooth_btstack.c
+++ b/extmod/btstack/modbluetooth_btstack.c
@@ -508,10 +508,12 @@ STATIC void btstack_init_deinit_timeout_handler(btstack_timer_source_t *ds) {
     mp_bluetooth_btstack_state = MP_BLUETOOTH_BTSTACK_STATE_TIMEOUT;
 }
 
+#if !MICROPY_BLUETOOTH_USE_MP_HAL_GET_MAC_STATIC_ADDRESS
 STATIC void btstack_static_address_ready(void *arg) {
     DEBUG_printf("btstack_static_address_ready.\n");
     *(volatile bool *)arg = true;
 }
+#endif
 
 STATIC bool set_public_address(void) {
     bd_addr_t local_addr;
@@ -534,14 +536,27 @@ STATIC void set_random_address(void) {
     } else
     #endif // MICROPY_BLUETOOTH_BTSTACK_ZEPHYR_STATIC_ADDRESS
     {
+        bd_addr_t static_addr;
+
+        #if MICROPY_BLUETOOTH_USE_MP_HAL_GET_MAC_STATIC_ADDRESS
+
+        DEBUG_printf("set_random_address: Generating static address using mp_hal_get_mac\n");
+        mp_hal_get_mac(MP_HAL_MAC_BDADDR, static_addr);
+        // Mark it as STATIC (not RPA or NRPA).
+        static_addr[0] |= 0xc0;
+
+        #else
+
         DEBUG_printf("set_random_address: Generating random static address.\n");
         btstack_crypto_random_t sm_crypto_random_request;
-        bd_addr_t static_addr;
         volatile bool ready = false;
         btstack_crypto_random_generate(&sm_crypto_random_request, static_addr, 6, &btstack_static_address_ready, (void *)&ready);
         while (!ready) {
             MICROPY_EVENT_POLL_HOOK
         }
+
+        #endif // MICROPY_BLUETOOTH_USE_MP_HAL_GET_MAC_STATIC_ADDRESS
+
         DEBUG_printf("set_random_address: Address generated.\n");
         gap_random_address_set(static_addr);
     }
diff --git a/extmod/nimble/modbluetooth_nimble.c b/extmod/nimble/modbluetooth_nimble.c
index 1c782943ab485..4222f58fa8812 100644
--- a/extmod/nimble/modbluetooth_nimble.c
+++ b/extmod/nimble/modbluetooth_nimble.c
@@ -157,10 +157,22 @@ STATIC bool has_public_address(void) {
 STATIC void set_random_address(bool nrpa) {
     int rc;
     (void)rc;
-    DEBUG_printf("sync_cb: Generating random static address\n");
     ble_addr_t addr;
-    rc = ble_hs_id_gen_rnd(nrpa ? 1 : 0, &addr);
-    assert(rc == 0);
+    #if MICROPY_BLUETOOTH_USE_MP_HAL_GET_MAC_STATIC_ADDRESS
+    if (!nrpa) {
+        DEBUG_printf("set_random_address: Generating static address using mp_hal_get_mac\n");
+        uint8_t hal_mac_addr[6];
+        mp_hal_get_mac(MP_HAL_MAC_BDADDR, hal_mac_addr);
+        addr = create_nimble_addr(BLE_ADDR_RANDOM, hal_mac_addr);
+        // Mark it as STATIC (not RPA or NRPA).
+        addr.val[5] |= 0xc0;
+    } else
+    #endif
+    {
+        DEBUG_printf("set_random_address: Generating random static address\n");
+        rc = ble_hs_id_gen_rnd(nrpa ? 1 : 0, &addr);
+        assert(rc == 0);
+    }
     rc = ble_hs_id_set_rnd(addr.val);
     assert(rc == 0);
     rc = ble_hs_util_ensure_addr(1);

From 8b00aeab8fd20f8b8920cf322b5cfb7021ef1504 Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Sat, 15 Aug 2020 14:06:19 +1000
Subject: [PATCH 0255/3533] extmod/btstack: Add btstack support for
 _IRQ_GATTS_READ_REQUEST.

---
 extmod/btstack/modbluetooth_btstack.c | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/extmod/btstack/modbluetooth_btstack.c b/extmod/btstack/modbluetooth_btstack.c
index 773234b9b2600..2e1bd47cfa462 100644
--- a/extmod/btstack/modbluetooth_btstack.c
+++ b/extmod/btstack/modbluetooth_btstack.c
@@ -825,24 +825,37 @@ int mp_bluetooth_gatts_register_service_begin(bool append) {
 }
 
 STATIC uint16_t att_read_callback(hci_con_handle_t connection_handle, uint16_t att_handle, uint16_t offset, uint8_t *buffer, uint16_t buffer_size) {
+    // Should return data length, 0 for error, or -1 for delayed response.
+    // For more details search "*att_read_callback*" in micropython/lib/btstack/doc/manual/docs/profiles.md
     (void)connection_handle;
-    DEBUG_printf("btstack: att_read_callback (handle: %u, offset: %u, buffer: %p, size: %u)\n", att_handle, offset, buffer, buffer_size);
+    DEBUG_printf("att_read_callback (handle: %u, offset: %u, buffer: %p, size: %u)\n", att_handle, offset, buffer, buffer_size);
     mp_bluetooth_gatts_db_entry_t *entry = mp_bluetooth_gatts_db_lookup(MP_STATE_PORT(bluetooth_btstack_root_pointers)->gatts_db, att_handle);
     if (!entry) {
-        DEBUG_printf("btstack: att_read_callback handle not found\n");
-        return 0; // TODO: Find status code for not-found.
+        DEBUG_printf("att_read_callback handle not found\n");
+        return 0;
+    }
+
+    #if MICROPY_PY_BLUETOOTH_GATTS_ON_READ_CALLBACK
+    // Allow Python code to override value (by using gatts_write), or deny (by returning false) the read.
+    if ((buffer == NULL) && (buffer_size == 0)) {
+        if (!mp_bluetooth_gatts_on_read_request(connection_handle, att_handle)) {
+            DEBUG_printf("att_read_callback: read request denied\n");
+            return 0;
+        }
     }
+    #endif
 
-    return att_read_callback_handle_blob(entry->data, entry->data_len, offset, buffer, buffer_size);
+    uint16_t ret = att_read_callback_handle_blob(entry->data, entry->data_len, offset, buffer, buffer_size);
+    return ret;
 }
 
 STATIC int att_write_callback(hci_con_handle_t connection_handle, uint16_t att_handle, uint16_t transaction_mode, uint16_t offset, uint8_t *buffer, uint16_t buffer_size) {
     (void)offset;
     (void)transaction_mode;
-    DEBUG_printf("btstack: att_write_callback (handle: %u, mode: %u, offset: %u, buffer: %p, size: %u)\n", att_handle, transaction_mode, offset, buffer, buffer_size);
+    DEBUG_printf("att_write_callback (handle: %u, mode: %u, offset: %u, buffer: %p, size: %u)\n", att_handle, transaction_mode, offset, buffer, buffer_size);
     mp_bluetooth_gatts_db_entry_t *entry = mp_bluetooth_gatts_db_lookup(MP_STATE_PORT(bluetooth_btstack_root_pointers)->gatts_db, att_handle);
     if (!entry) {
-        DEBUG_printf("btstack: att_write_callback handle not found\n");
+        DEBUG_printf("att_write_callback handle not found\n");
         return 0; // TODO: Find status code for not-found.
     }
 

From 6077c63a450d7c2ab5e31e5845ecb5f1a4634b26 Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Sun, 16 Aug 2020 08:30:19 +1000
Subject: [PATCH 0256/3533] stm32/mpbthciport: Increase char timeout of BT HCI
 UART.

The 2ms used previously was not long enough and it could lose HCI sync.

Also print error on tx failure to make this more obvious in the future.
---
 ports/stm32/mpbthciport.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/ports/stm32/mpbthciport.c b/ports/stm32/mpbthciport.c
index 71a9e4fc7f433..a5977ff12c210 100644
--- a/ports/stm32/mpbthciport.c
+++ b/ports/stm32/mpbthciport.c
@@ -142,8 +142,9 @@ int mp_bluetooth_hci_uart_init(uint32_t port, uint32_t baudrate) {
     mp_bluetooth_hci_uart_obj.base.type = &pyb_uart_type;
     mp_bluetooth_hci_uart_obj.uart_id = port;
     mp_bluetooth_hci_uart_obj.is_static = true;
-    mp_bluetooth_hci_uart_obj.timeout = 2;
-    mp_bluetooth_hci_uart_obj.timeout_char = 2;
+    // We don't want to block indefinitely, but expect flow control is doing its job.
+    mp_bluetooth_hci_uart_obj.timeout = 200;
+    mp_bluetooth_hci_uart_obj.timeout_char = 200;
     MP_STATE_PORT(pyb_uart_obj_all)[mp_bluetooth_hci_uart_obj.uart_id - 1] = &mp_bluetooth_hci_uart_obj;
 
     // This also initialises the UART.
@@ -184,7 +185,11 @@ int mp_bluetooth_hci_uart_write(const uint8_t *buf, size_t len) {
     // DEBUG_printf("mp_bluetooth_hci_uart_write (stm32)\n");
 
     mp_bluetooth_hci_controller_wakeup();
-    uart_tx_strn(&mp_bluetooth_hci_uart_obj, (void *)buf, len);
+    int errcode;
+    uart_tx_data(&mp_bluetooth_hci_uart_obj, (void *)buf, len, &errcode);
+    if (errcode != 0) {
+        printf("\nmp_bluetooth_hci_uart_write: failed to write to UART %d\n", errcode);
+    }
     return 0;
 }
 

From 99a29ec705b463290d5a2ac1eabc46fb7f2a83b0 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Tue, 18 Aug 2020 11:05:34 +1000
Subject: [PATCH 0257/3533] extmod/btstack: Detect HCI UART init failure.

---
 extmod/btstack/btstack_hci_uart.c     | 14 +++++++++++---
 extmod/btstack/modbluetooth_btstack.c |  7 ++++++-
 ports/unix/mpbthciport.c              |  4 ++--
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/extmod/btstack/btstack_hci_uart.c b/extmod/btstack/btstack_hci_uart.c
index 5c96e02dc0fed..ae18628a9cf0e 100644
--- a/extmod/btstack/btstack_hci_uart.c
+++ b/extmod/btstack/btstack_hci_uart.c
@@ -50,6 +50,7 @@ STATIC uint8_t *recv_buf;
 STATIC size_t recv_len;
 STATIC size_t recv_idx;
 STATIC void (*recv_handler)(void);
+STATIC bool init_success = false;
 
 STATIC int btstack_uart_init(const btstack_uart_config_t *uart_config) {
     (void)uart_config;
@@ -62,14 +63,21 @@ STATIC int btstack_uart_init(const btstack_uart_config_t *uart_config) {
 
     // Set up the UART peripheral, attach IRQ and power up the HCI controller.
     // We haven't been told the baud rate yet, so defer that until btstack_uart_set_baudrate.
-    mp_bluetooth_hci_uart_init(MICROPY_HW_BLE_UART_ID, 0);
-    mp_bluetooth_hci_controller_init();
+    if (mp_bluetooth_hci_uart_init(MICROPY_HW_BLE_UART_ID, 0)) {
+        init_success = false;
+        return -1;
+    }
+    if (mp_bluetooth_hci_controller_init()) {
+        init_success = false;
+        return -1;
+    }
 
+    init_success = true;
     return 0;
 }
 
 STATIC int btstack_uart_open(void) {
-    return 0;
+    return init_success ? 0 : 1;
 }
 
 STATIC int btstack_uart_close(void) {
diff --git a/extmod/btstack/modbluetooth_btstack.c b/extmod/btstack/modbluetooth_btstack.c
index 2e1bd47cfa462..cde802a61f5f4 100644
--- a/extmod/btstack/modbluetooth_btstack.c
+++ b/extmod/btstack/modbluetooth_btstack.c
@@ -317,6 +317,9 @@ STATIC void btstack_packet_handler(uint8_t packet_type, uint8_t *packet, uint8_t
             // Signal that de-initialisation has completed.
             mp_bluetooth_btstack_state = MP_BLUETOOTH_BTSTACK_STATE_OFF;
         }
+    } else if (event_type == BTSTACK_EVENT_POWERON_FAILED) {
+        // Signal that initialisation has failed.
+        mp_bluetooth_btstack_state = MP_BLUETOOTH_BTSTACK_STATE_OFF;
     } else if (event_type == HCI_EVENT_TRANSPORT_PACKET_SENT) {
         DEBUG_printf("  --> hci transport packet sent\n");
     } else if (event_type == HCI_EVENT_COMMAND_COMPLETE) {
@@ -644,6 +647,8 @@ int mp_bluetooth_init(void) {
     if (mp_bluetooth_btstack_state != MP_BLUETOOTH_BTSTACK_STATE_ACTIVE) {
         DEBUG_printf("mp_bluetooth_init: stack startup timed out\n");
 
+        bool timeout = mp_bluetooth_btstack_state == MP_BLUETOOTH_BTSTACK_STATE_TIMEOUT;
+
         // Required to stop the polling loop.
         mp_bluetooth_btstack_state = MP_BLUETOOTH_BTSTACK_STATE_OFF;
         // Attempt a shutdown (may not do anything).
@@ -652,7 +657,7 @@ int mp_bluetooth_init(void) {
         // Clean up.
         MP_STATE_PORT(bluetooth_btstack_root_pointers) = NULL;
 
-        return MP_ETIMEDOUT;
+        return timeout ? MP_ETIMEDOUT : MP_EINVAL;
     }
 
     DEBUG_printf("mp_bluetooth_init: stack startup complete\n");
diff --git a/ports/unix/mpbthciport.c b/ports/unix/mpbthciport.c
index 5a5c1d4a4e79d..dbfb5e0d0e5f7 100644
--- a/ports/unix/mpbthciport.c
+++ b/ports/unix/mpbthciport.c
@@ -124,12 +124,12 @@ int mp_bluetooth_hci_uart_init(uint32_t port, uint32_t baudrate) {
     if (path != NULL) {
         strcpy(uart_device_name, path);
     }
-    DEBUG_printf("Using HCI UART: %s\n", uart_device_name);
+    DEBUG_printf("mp_bluetooth_hci_uart_init: Using HCI UART: %s\n", uart_device_name);
 
     int flags = O_RDWR | O_NOCTTY | O_NONBLOCK;
     uart_fd = open(uart_device_name, flags);
     if (uart_fd == -1) {
-        DEBUG_printf("Unable to open port %s", uart_device_name);
+        printf("mp_bluetooth_hci_uart_init: Unable to open port %s\n", uart_device_name);
         return -1;
     }
 

From 311b8519af75be9fe4215b5ee8f77e91d089d5df Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Wed, 19 Aug 2020 10:46:09 +1000
Subject: [PATCH 0258/3533] esp32: Pin MicroPython and NimBLE tasks to core 0.

MicroPython and NimBLE must be on the same core, for synchronisation of the
BLE ringbuf and the MicroPython scheduler.  However, in the current IDF
versions (3.3 and 4.0) there are issues (see e.g. #5489) with running
NimBLE on core 1.

This change - pinning both tasks to core 0 - makes it possible to reliably
run the BLE multitests on esp32 boards.
---
 ports/esp32/boards/sdkconfig.ble | 9 ++++++---
 ports/esp32/mphalport.h          | 7 +++++--
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/ports/esp32/boards/sdkconfig.ble b/ports/esp32/boards/sdkconfig.ble
index cdbb621a63112..f714ce4629b32 100644
--- a/ports/esp32/boards/sdkconfig.ble
+++ b/ports/esp32/boards/sdkconfig.ble
@@ -9,9 +9,12 @@ CONFIG_BT_NIMBLE_ENABLED=y
 CONFIG_BT_NIMBLE_MAX_CONNECTIONS=4
 
 # Pin to the same core as MP.
-CONFIG_BT_NIMBLE_PINNED_TO_CORE_0=n
-CONFIG_BT_NIMBLE_PINNED_TO_CORE_1=y
-CONFIG_BT_NIMBLE_PINNED_TO_CORE=1
+# Until we move to IDF 4.2+, we need NimBLE on core 0, and for synchronisation
+# with the ringbuffer and scheduler MP needs to be on the same core.
+# See https://github.com/micropython/micropython/issues/5489
+CONFIG_BT_NIMBLE_PINNED_TO_CORE_0=y
+CONFIG_BT_NIMBLE_PINNED_TO_CORE_1=n
+CONFIG_BT_NIMBLE_PINNED_TO_CORE=0
 
 # v3.3-only (renamed in 4.0)
 CONFIG_BTDM_CONTROLLER_MODE_BLE_ONLY=y
diff --git a/ports/esp32/mphalport.h b/ports/esp32/mphalport.h
index 1f78d820a3f17..60cc308d68275 100644
--- a/ports/esp32/mphalport.h
+++ b/ports/esp32/mphalport.h
@@ -35,8 +35,11 @@
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"
 
-// The core that the MicroPython task(s) are pinned to
-#define MP_TASK_COREID (1)
+// The core that the MicroPython task(s) are pinned to.
+// Until we move to IDF 4.2+, we need NimBLE on core 0, and for synchronisation
+// with the ringbuffer and scheduler MP needs to be on the same core.
+// See https://github.com/micropython/micropython/issues/5489
+#define MP_TASK_COREID (0)
 
 extern TaskHandle_t mp_main_task_handle;
 

From 126f972c34f25bffc07d0d1cb3e536921fec0979 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Wed, 19 Aug 2020 12:55:38 +1000
Subject: [PATCH 0259/3533] extmod/nimble: Add timeout for HCI sync on startup.

This allows `ble.active(1)` to fail correctly if the HCI controller is
unavailable.

It also avoids an infine loop in the NimBLE event handler where NimBLE
doesn't correctly detect that the HCI controller is unavailable and keeps
trying to reset.

Furthermore, it fixes an issue where GATT service registrations were left
allocated, which led to a bad realloc if the stack was activated multiple
times.
---
 extmod/nimble/modbluetooth_nimble.c  | 28 +++++++++++++++++++++-------
 extmod/nimble/nimble/nimble_npl_os.c | 15 ++++++++++++---
 ports/unix/mpbthciport.c             | 16 ++++++++++++++++
 3 files changed, 49 insertions(+), 10 deletions(-)

diff --git a/extmod/nimble/modbluetooth_nimble.c b/extmod/nimble/modbluetooth_nimble.c
index 4222f58fa8812..9ca90b602476f 100644
--- a/extmod/nimble/modbluetooth_nimble.c
+++ b/extmod/nimble/modbluetooth_nimble.c
@@ -52,6 +52,9 @@
 
 STATIC uint8_t nimble_address_mode = BLE_OWN_ADDR_RANDOM;
 
+#define NIMBLE_STARTUP_TIMEOUT 2000
+STATIC struct ble_npl_sem startup_sem;
+
 // Any BLE_HS_xxx code not in this table will default to MP_EIO.
 STATIC int8_t ble_hs_err_to_errno_table[] = {
     [BLE_HS_EAGAIN] = MP_EAGAIN,
@@ -206,6 +209,8 @@ STATIC void sync_cb(void) {
     ble_svc_gap_device_name_set(MICROPY_PY_BLUETOOTH_DEFAULT_GAP_NAME);
 
     mp_bluetooth_nimble_ble_state = MP_BLUETOOTH_NIMBLE_BLE_STATE_ACTIVE;
+
+    ble_npl_sem_release(&startup_sem);
 }
 
 STATIC void gatts_register_cb(struct ble_gatt_register_ctxt *ctxt, void *arg) {
@@ -355,6 +360,8 @@ int mp_bluetooth_init(void) {
     ble_hs_cfg.gatts_register_cb = gatts_register_cb;
     ble_hs_cfg.store_status_cb = ble_store_util_status_rr;
 
+    ble_npl_sem_init(&startup_sem, 0);
+
     MP_STATE_PORT(bluetooth_nimble_root_pointers) = m_new0(mp_bluetooth_nimble_root_pointers_t, 1);
     mp_bluetooth_gatts_db_create(&MP_STATE_PORT(bluetooth_nimble_root_pointers)->gatts_db);
 
@@ -370,21 +377,28 @@ int mp_bluetooth_init(void) {
     // Initialise NimBLE memory and data structures.
     nimble_port_init();
 
-    // By default, just register the default gap/gatt service.
-    ble_svc_gap_init();
-    ble_svc_gatt_init();
-
     // Make sure that the HCI UART and event handling task is running.
     mp_bluetooth_nimble_port_start();
 
     // Static initialization is complete, can start processing events.
     mp_bluetooth_nimble_ble_state = MP_BLUETOOTH_NIMBLE_BLE_STATE_WAITING_FOR_SYNC;
 
-    // Wait for sync callback
-    while (mp_bluetooth_nimble_ble_state != MP_BLUETOOTH_NIMBLE_BLE_STATE_ACTIVE) {
-        MICROPY_EVENT_POLL_HOOK
+    ble_npl_sem_pend(&startup_sem, NIMBLE_STARTUP_TIMEOUT);
+
+    if (mp_bluetooth_nimble_ble_state != MP_BLUETOOTH_NIMBLE_BLE_STATE_ACTIVE) {
+        mp_bluetooth_deinit();
+        return MP_ETIMEDOUT;
     }
 
+    // By default, just register the default gap/gatt service.
+    ble_svc_gap_init();
+    ble_svc_gatt_init();
+    // The preceeding two calls allocate service definitions on the heap,
+    // then we must now call gatts_start to register those services
+    // and free the heap memory.
+    // Otherwise it will be realloc'ed on the next stack startup.
+    ble_gatts_start();
+
     DEBUG_printf("mp_bluetooth_init: ready\n");
 
     return 0;
diff --git a/extmod/nimble/nimble/nimble_npl_os.c b/extmod/nimble/nimble/nimble_npl_os.c
index 46f7a0b291303..2ec012940f763 100644
--- a/extmod/nimble/nimble/nimble_npl_os.c
+++ b/extmod/nimble/nimble/nimble_npl_os.c
@@ -32,6 +32,7 @@
 #include "extmod/nimble/hal/hal_uart.h"
 
 #include "extmod/modbluetooth.h"
+#include "extmod/nimble/modbluetooth_nimble.h"
 
 #define DEBUG_OS_printf(...) // printf(__VA_ARGS__)
 #define DEBUG_MALLOC_printf(...) // printf(__VA_ARGS__)
@@ -180,7 +181,8 @@ struct ble_npl_eventq *global_eventq = NULL;
 
 void mp_bluetooth_nimble_os_eventq_run_all(void) {
     for (struct ble_npl_eventq *evq = global_eventq; evq != NULL; evq = evq->nextq) {
-        while (evq->head != NULL) {
+        int n = 0;
+        while (evq->head != NULL && mp_bluetooth_nimble_ble_state > MP_BLUETOOTH_NIMBLE_BLE_STATE_OFF) {
             struct ble_npl_event *ev = evq->head;
             evq->head = ev->next;
             if (ev->next) {
@@ -191,6 +193,13 @@ void mp_bluetooth_nimble_os_eventq_run_all(void) {
             DEBUG_EVENT_printf("event_run(%p)\n", ev);
             ev->fn(ev);
             DEBUG_EVENT_printf("event_run(%p) done\n", ev);
+
+            if (++n > 3) {
+                // Limit to running 3 tasks per queue.
+                // Some tasks (such as reset) can enqueue themselves
+                // making this an infinite loop (while in PENDSV).
+                break;
+            }
         }
     }
 }
@@ -348,11 +357,11 @@ ble_npl_error_t ble_npl_sem_pend(struct ble_npl_sem *sem, ble_npl_time_t timeout
         }
 
         if (sem->count == 0) {
-            printf("NimBLE: HCI ACK timeout\n");
+            DEBUG_SEM_printf("ble_npl_sem_pend: semaphore timeout\n");
             return BLE_NPL_TIMEOUT;
         }
 
-        DEBUG_SEM_printf("got response in %u ms\n", (int)(mp_hal_ticks_ms() - t0));
+        DEBUG_SEM_printf("ble_npl_sem_pend: acquired in %u ms\n", (int)(mp_hal_ticks_ms() - t0));
     }
     sem->count -= 1;
     return BLE_NPL_OK;
diff --git a/ports/unix/mpbthciport.c b/ports/unix/mpbthciport.c
index dbfb5e0d0e5f7..316a8831fe97b 100644
--- a/ports/unix/mpbthciport.c
+++ b/ports/unix/mpbthciport.c
@@ -105,6 +105,10 @@ STATIC int configure_uart(void) {
     // Apply immediately.
     if (tcsetattr(uart_fd, TCSANOW, &toptions) < 0) {
         DEBUG_printf("Couldn't set term attributes");
+
+        close(uart_fd);
+        uart_fd = -1;
+
         return -1;
     }
 
@@ -149,6 +153,10 @@ int mp_bluetooth_hci_uart_init(uint32_t port, uint32_t baudrate) {
 int mp_bluetooth_hci_uart_deinit(void) {
     DEBUG_printf("mp_bluetooth_hci_uart_deinit\n");
 
+    if (uart_fd == -1) {
+        return 0;
+    }
+
     // Wait for the poll loop to terminate when the state is set to OFF.
     pthread_join(hci_poll_thread_id, NULL);
 
@@ -168,6 +176,10 @@ int mp_bluetooth_hci_uart_set_baudrate(uint32_t baudrate) {
 int mp_bluetooth_hci_uart_readchar(void) {
     // DEBUG_printf("mp_bluetooth_hci_uart_readchar\n");
 
+    if (uart_fd == -1) {
+        return -1;
+    }
+
     uint8_t c;
     ssize_t bytes_read = read(uart_fd, &c, 1);
 
@@ -184,6 +196,10 @@ int mp_bluetooth_hci_uart_readchar(void) {
 int mp_bluetooth_hci_uart_write(const uint8_t *buf, size_t len) {
     // DEBUG_printf("mp_bluetooth_hci_uart_write\n");
 
+    if (uart_fd == -1) {
+        return 0;
+    }
+
     #if DEBUG_HCI_DUMP
     printf("[% 8ld] TX: %02x", mp_hal_ticks_ms(), buf[0]);
     for (size_t i = 1; i < len; ++i) {

From b27edb8073409a3caee921dd4e2c1b182bd4c0fb Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Thu, 20 Aug 2020 23:21:06 +1000
Subject: [PATCH 0260/3533] stm32/make-stmconst.py: Add support for WB55 header
 files.

---
 ports/stm32/make-stmconst.py | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/ports/stm32/make-stmconst.py b/ports/stm32/make-stmconst.py
index 1b3cc08d951f3..ac5c56f5c79f5 100644
--- a/ports/stm32/make-stmconst.py
+++ b/ports/stm32/make-stmconst.py
@@ -46,7 +46,7 @@ def __init__(self, line):
 
 class Lexer:
     re_io_reg = r"__IO uint(?P<bits>8|16|32)_t +(?P<reg>[A-Z0-9]+)"
-    re_comment = r"(?P<comment>[A-Za-z0-9 \-/_()&]+)"
+    re_comment = r"(?P<comment>[A-Za-z0-9 \-/_()&:]+)"
     re_addr_offset = r"Address offset: (?P<offset>0x[0-9A-Z]{2,3})"
     regexs = (
         (
@@ -78,16 +78,16 @@ class Lexer:
         (
             "IO reg",
             re.compile(
-                re_io_reg + r"; */\*!< *" + re_comment + r", +" + re_addr_offset + r" *\*/"
+                re_io_reg + r" *; */\*!< *" + re_comment + r",? +" + re_addr_offset + r" *\*/"
             ),
         ),
         (
             "IO reg array",
             re.compile(
                 re_io_reg
-                + r"\[(?P<array>[2-8])\]; */\*!< *"
+                + r"\[(?P<array>[2-8])\] *; */\*!< *"
                 + re_comment
-                + r", +"
+                + r",? +"
                 + re_addr_offset
                 + r"-(0x[0-9A-Z]{2,3}) *\*/"
             ),
@@ -160,7 +160,11 @@ def parse_file(filename):
             if m[0] == "}":
                 pass
             elif m[0] == "} TypeDef":
-                reg_defs[m[1].groupdict()["id"]] = regs
+                d = m[1].groupdict()
+                n = d["id"]
+                g = d["global"]
+                if n not in reg_defs or not g:
+                    reg_defs[n] = regs
             else:
                 raise LexerError(lexer.line_number)
 
@@ -298,6 +302,7 @@ def main():
         "USART",
         "WWDG",
         "RNG",
+        "IPCC",
     ):
         if reg in reg_defs:
             print_regs(reg, reg_defs[reg], needed_qstrs, needed_mpzs)

From 30e8162ac49d333b00bae4a7f719a1f24692b062 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Thu, 20 Aug 2020 18:12:44 +1000
Subject: [PATCH 0261/3533] stm32/rfcore: Update rfcore.c to match how ST
 examples work.

- Split tables and buffers into SRAM2A/2B.
- Use structs rather than word offsets to access tables.
- Use FLASH_IPCCDBA register value rather than option bytes directly.
---
 ports/stm32/boards/stm32wb55xg.ld |  13 ++-
 ports/stm32/rfcore.c              | 178 ++++++++++++++++++++++--------
 2 files changed, 141 insertions(+), 50 deletions(-)

diff --git a/ports/stm32/boards/stm32wb55xg.ld b/ports/stm32/boards/stm32wb55xg.ld
index dbeccc1895775..c3dc5f5197a00 100644
--- a/ports/stm32/boards/stm32wb55xg.ld
+++ b/ports/stm32/boards/stm32wb55xg.ld
@@ -9,7 +9,8 @@ MEMORY
     FLASH_APP (rx)  : ORIGIN = 0x08004000, LENGTH = 496K /* sectors 4-127 */
     FLASH_FS (r)    : ORIGIN = 0x08080000, LENGTH = 256K /* sectors 128-191 */
     RAM (xrw)       : ORIGIN = 0x20000000, LENGTH = 192K /* SRAM1 */
-    RAM2A (xrw)     : ORIGIN = 0x20030020, LENGTH = 8K /* SRAM2A */
+    RAM2A (xrw)     : ORIGIN = 0x20030000, LENGTH = 10K  /* SRAM2A */
+    RAM2B (xrw)     : ORIGIN = 0x20038000, LENGTH = 10K  /* SRAM2B */
 }
 
 /* produce a link error if there is not this amount of RAM for these sections */
@@ -36,10 +37,20 @@ _flash_fs_end   = ORIGIN(FLASH_FS) + LENGTH(FLASH_FS);
 
 SECTIONS
 {
+    /* Put all IPCC tables into SRAM2A. */
     .ram2a_bss :
     {
         . = ALIGN(4);
+        . = . + 64; /* Leave room for the mb_ref_table_t (assuming IPCCDBA==0). */
         *rfcore.o(.bss.ipcc_mem_*)
         . = ALIGN(4);
     } >RAM2A
+
+    /* Put all IPCC buffers into SRAM2B. */
+    .ram2b_bss :
+    {
+        . = ALIGN(4);
+        *rfcore.o(.bss.ipcc_membuf_*)
+        . = ALIGN(4);
+    } >RAM2B
 }
diff --git a/ports/stm32/rfcore.c b/ports/stm32/rfcore.c
index 54b3393435e1e..3565c03898444 100644
--- a/ports/stm32/rfcore.c
+++ b/ports/stm32/rfcore.c
@@ -4,6 +4,7 @@
  * The MIT License (MIT)
  *
  * Copyright (c) 2019 Damien P. George
+ * Copyright (c) 2020 Jim Mussared
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -34,6 +35,10 @@
 
 #if defined(STM32WB)
 
+#include "stm32wbxx_ll_ipcc.h"
+
+#define DEBUG_printf(...) // printf("rfcore: " __VA_ARGS__)
+
 // Define to 1 to print traces of HCI packets
 #define HCI_TRACE (0)
 
@@ -61,23 +66,88 @@ typedef struct _parse_hci_info_t {
     bool was_hci_reset_evt;
 } parse_hci_info_t;
 
-static volatile uint32_t ipcc_mem_dev_info_tab[8];
-static volatile uint32_t ipcc_mem_ble_tab[4];
-static volatile uint32_t ipcc_mem_sys_tab[2];
-static volatile uint32_t ipcc_mem_memmgr_tab[7];
-
-static volatile uint32_t ipcc_mem_sys_cmd_buf[272 / 4];
-static volatile tl_list_node_t ipcc_mem_sys_queue;
-
-static volatile tl_list_node_t ipcc_mem_memmgr_free_buf_queue;
-static volatile uint32_t ipcc_mem_memmgr_ble_spare_evt_buf[272 / 4];
-static volatile uint32_t ipcc_mem_memmgr_sys_spare_evt_buf[272 / 4];
-static volatile uint32_t ipcc_mem_memmgr_evt_pool[6 * 272 / 4];
-
-static volatile uint32_t ipcc_mem_ble_cmd_buf[272 / 4];
-static volatile uint32_t ipcc_mem_ble_cs_buf[272 / 4];
-static volatile tl_list_node_t ipcc_mem_ble_evt_queue;
-static volatile uint32_t ipcc_mem_ble_hci_acl_data_buf[272 / 4];
+// Version
+// [0:3]   = Build - 0: Untracked - 15:Released - x: Tracked version
+// [4:7]   = branch - 0: Mass Market - x: ...
+// [8:15]  = Subversion
+// [16:23] = Version minor
+// [24:31] = Version major
+
+// Memory Size
+// [0:7]   = Flash (Number of 4k sectors)
+// [8:15]  = Reserved (Shall be set to 0 - may be used as flash extension)
+// [16:23] = SRAM2b (Number of 1k sectors)
+// [24:31] = SRAM2a (Number of 1k sectors)
+
+typedef struct __attribute__((packed)) _ipcc_device_info_table_t {
+    uint32_t safeboot_version;
+    uint32_t fus_version;
+    uint32_t fus_memorysize;
+    uint32_t fus_info;
+    uint32_t fw_version;
+    uint32_t fw_memorysize;
+    uint32_t fw_infostack;
+    uint32_t fw_reserved;
+} ipcc_device_info_table_t;
+
+typedef struct __attribute__((packed)) _ipcc_ble_table_t {
+    uint8_t *pcmd_buffer;
+    uint8_t *pcs_buffer;
+    tl_list_node_t *pevt_queue;
+    uint8_t *phci_acl_data_buffer;
+} ipcc_ble_table_t;
+
+// msg
+// [0:7]  = cmd/evt
+// [8:31] = Reserved
+typedef struct __attribute__((packed)) _ipcc_sys_table_t {
+    uint8_t *pcmd_buffer;
+    tl_list_node_t *sys_queue;
+} ipcc_sys_table_t;
+
+typedef struct __attribute__((packed)) _ipcc_mem_manager_table_t {
+    uint8_t *spare_ble_buffer;
+    uint8_t *spare_sys_buffer;
+    uint8_t *blepool;
+    uint32_t blepoolsize;
+    tl_list_node_t *pevt_free_buffer_queue;
+    uint8_t *traces_evt_pool;
+    uint32_t tracespoolsize;
+} ipcc_mem_manager_table_t;
+
+typedef struct __attribute__((packed)) _ipcc_ref_table_t {
+    ipcc_device_info_table_t *p_device_info_table;
+    ipcc_ble_table_t *p_ble_table;
+    void *p_thread_table;
+    ipcc_sys_table_t *p_sys_table;
+    ipcc_mem_manager_table_t *p_mem_manager_table;
+    void *p_traces_table;
+    void *p_mac_802_15_4_table;
+    void *p_zigbee_table;
+    void *p_lld_tests_table;
+    void *p_lld_ble_table;
+} ipcc_ref_table_t;
+
+// The stm32wb55xg.ld script puts .bss.ipcc_mem_* into SRAM2A and .bss_ipcc_membuf_* into SRAM2B.
+// It also leaves 64 bytes at the start of SRAM2A for the ref table.
+
+STATIC ipcc_device_info_table_t ipcc_mem_dev_info_tab; // mem1
+STATIC ipcc_ble_table_t ipcc_mem_ble_tab; // mem1
+STATIC ipcc_sys_table_t ipcc_mem_sys_tab; // mem1
+STATIC ipcc_mem_manager_table_t ipcc_mem_memmgr_tab; // mem1
+
+STATIC uint8_t ipcc_membuf_sys_cmd_buf[272];  // mem2
+STATIC tl_list_node_t ipcc_mem_sys_queue; // mem1
+
+STATIC tl_list_node_t ipcc_mem_memmgr_free_buf_queue; // mem1
+STATIC uint8_t ipcc_membuf_memmgr_ble_spare_evt_buf[272]; // mem2
+STATIC uint8_t ipcc_membuf_memmgr_sys_spare_evt_buf[272]; // mem2
+STATIC uint8_t ipcc_membuf_memmgr_evt_pool[6 * 272];  // mem2
+
+STATIC uint8_t ipcc_membuf_ble_cmd_buf[272]; // mem2
+STATIC uint8_t ipcc_membuf_ble_cs_buf[272]; // mem2
+STATIC tl_list_node_t ipcc_mem_ble_evt_queue; // mem1
+STATIC uint8_t ipcc_membuf_ble_hci_acl_data_buf[272]; // mem2
 
 /******************************************************************************/
 // Transport layer linked list
@@ -105,21 +175,21 @@ STATIC void tl_list_append(volatile tl_list_node_t *head, volatile tl_list_node_
 /******************************************************************************/
 // IPCC interface
 
-STATIC uint32_t get_ipccdba(void) {
-    return *(uint32_t *)(OPTION_BYTE_BASE + 0x68) & 0x3fff;
-}
-
-STATIC volatile void **get_buffer_table(void) {
-    return (volatile void **)(SRAM2A_BASE + get_ipccdba());
+STATIC volatile ipcc_ref_table_t *get_buffer_table(void) {
+    // The IPCCDBA option bytes must not be changed without
+    // making a corresponding change to the linker script.
+    return (volatile ipcc_ref_table_t *)(SRAM2A_BASE + LL_FLASH_GetIPCCBufferAddr() * 4);
 }
 
 void ipcc_init(uint32_t irq_pri) {
+    DEBUG_printf("ipcc_init\n");
+
     // Setup buffer table pointers
-    volatile void **tab = get_buffer_table();
-    tab[0] = &ipcc_mem_dev_info_tab[0];
-    tab[1] = &ipcc_mem_ble_tab[0];
-    tab[3] = &ipcc_mem_sys_tab[0];
-    tab[4] = &ipcc_mem_memmgr_tab[0];
+    volatile ipcc_ref_table_t *tab = get_buffer_table();
+    tab->p_device_info_table = &ipcc_mem_dev_info_tab;
+    tab->p_ble_table = &ipcc_mem_ble_tab;
+    tab->p_sys_table = &ipcc_mem_sys_tab;
+    tab->p_mem_manager_table = &ipcc_mem_memmgr_tab;
 
     // Start IPCC peripheral
     __HAL_RCC_IPCC_CLK_ENABLE();
@@ -130,32 +200,34 @@ void ipcc_init(uint32_t irq_pri) {
     NVIC_SetPriority(IPCC_C1_RX_IRQn, irq_pri);
     HAL_NVIC_EnableIRQ(IPCC_C1_RX_IRQn);
 
-    // Device info table will be populated by FUS/WS
+    // Device info table will be populated by FUS/WS on CPU2 boot.
 
     // Populate system table
     tl_list_init(&ipcc_mem_sys_queue);
-    ipcc_mem_sys_tab[0] = (uint32_t)&ipcc_mem_sys_cmd_buf[0];
-    ipcc_mem_sys_tab[1] = (uint32_t)&ipcc_mem_sys_queue;
+    ipcc_mem_sys_tab.pcmd_buffer = ipcc_membuf_sys_cmd_buf;
+    ipcc_mem_sys_tab.sys_queue = &ipcc_mem_sys_queue;
 
     // Populate memory manager table
     tl_list_init(&ipcc_mem_memmgr_free_buf_queue);
-    ipcc_mem_memmgr_tab[0] = (uint32_t)&ipcc_mem_memmgr_ble_spare_evt_buf[0];
-    ipcc_mem_memmgr_tab[1] = (uint32_t)&ipcc_mem_memmgr_sys_spare_evt_buf[0];
-    ipcc_mem_memmgr_tab[2] = (uint32_t)&ipcc_mem_memmgr_evt_pool[0];
-    ipcc_mem_memmgr_tab[3] = sizeof(ipcc_mem_memmgr_evt_pool);
-    ipcc_mem_memmgr_tab[4] = (uint32_t)&ipcc_mem_memmgr_free_buf_queue;
-    ipcc_mem_memmgr_tab[5] = 0;
-    ipcc_mem_memmgr_tab[6] = 0;
+    ipcc_mem_memmgr_tab.spare_ble_buffer = ipcc_membuf_memmgr_ble_spare_evt_buf;
+    ipcc_mem_memmgr_tab.spare_sys_buffer = ipcc_membuf_memmgr_sys_spare_evt_buf;
+    ipcc_mem_memmgr_tab.blepool = ipcc_membuf_memmgr_evt_pool;
+    ipcc_mem_memmgr_tab.blepoolsize = sizeof(ipcc_membuf_memmgr_evt_pool);
+    ipcc_mem_memmgr_tab.pevt_free_buffer_queue = &ipcc_mem_memmgr_free_buf_queue;
+    ipcc_mem_memmgr_tab.traces_evt_pool = NULL;
+    ipcc_mem_memmgr_tab.tracespoolsize = 0;
 
     // Populate BLE table
     tl_list_init(&ipcc_mem_ble_evt_queue);
-    ipcc_mem_ble_tab[0] = (uint32_t)&ipcc_mem_ble_cmd_buf[0];
-    ipcc_mem_ble_tab[1] = (uint32_t)&ipcc_mem_ble_cs_buf[0];
-    ipcc_mem_ble_tab[2] = (uint32_t)&ipcc_mem_ble_evt_queue;
-    ipcc_mem_ble_tab[3] = (uint32_t)&ipcc_mem_ble_hci_acl_data_buf[0];
+    ipcc_mem_ble_tab.pcmd_buffer = ipcc_membuf_ble_cmd_buf;
+    ipcc_mem_ble_tab.pcs_buffer = ipcc_membuf_ble_cs_buf;
+    ipcc_mem_ble_tab.pevt_queue = &ipcc_mem_ble_evt_queue;
+    ipcc_mem_ble_tab.phci_acl_data_buffer = ipcc_membuf_ble_hci_acl_data_buf;
 }
 
 STATIC int ipcc_wait_ack(unsigned int ch, uint32_t timeout_ms) {
+    DEBUG_printf("ipcc_wait_ack\n");
+
     uint32_t t0 = mp_hal_ticks_ms();
     while (IPCC->C1TOC2SR & ch) {
         if (mp_hal_ticks_ms() - t0 > timeout_ms) {
@@ -168,6 +240,8 @@ STATIC int ipcc_wait_ack(unsigned int ch, uint32_t timeout_ms) {
 }
 
 STATIC int ipcc_wait_msg(unsigned int ch, uint32_t timeout_ms) {
+    DEBUG_printf("ipcc_wait_msg\n");
+
     uint32_t t0 = mp_hal_ticks_ms();
     while (!(IPCC->C2TOC1SR & ch)) {
         if (mp_hal_ticks_ms() - t0 > timeout_ms) {
@@ -254,8 +328,8 @@ STATIC void tl_check_msg(volatile tl_list_node_t *head, unsigned int ch, parse_h
         while (cur != head) {
             tl_parse_hci_msg((uint8_t *)cur->body, parse);
             volatile tl_list_node_t *next = tl_list_unlink(cur);
-            if ((void *)&ipcc_mem_memmgr_evt_pool[0] <= (void *)cur
-                && (void *)cur < (void *)&ipcc_mem_memmgr_evt_pool[MP_ARRAY_SIZE(ipcc_mem_memmgr_evt_pool)]) {
+            if ((void *)&ipcc_membuf_memmgr_evt_pool[0] <= (void *)cur
+                && (void *)cur < (void *)&ipcc_membuf_memmgr_evt_pool[MP_ARRAY_SIZE(ipcc_membuf_memmgr_evt_pool)]) {
                 // Place memory back in free pool
                 tl_list_append(&ipcc_mem_memmgr_free_buf_queue, cur);
                 free = true;
@@ -291,12 +365,12 @@ STATIC void tl_sys_wait_resp(const uint8_t *buf, unsigned int ch) {
 }
 
 STATIC void tl_sys_hci_cmd_resp(uint16_t opcode, size_t len, const uint8_t *buf) {
-    tl_hci_cmd((uint8_t *)&ipcc_mem_sys_cmd_buf, IPCC_CH_SYS, 0x10, opcode, len, buf);
-    tl_sys_wait_resp((uint8_t *)&ipcc_mem_sys_cmd_buf, IPCC_CH_SYS);
+    tl_hci_cmd((uint8_t *)&ipcc_membuf_sys_cmd_buf, IPCC_CH_SYS, 0x10, opcode, len, buf);
+    tl_sys_wait_resp((uint8_t *)&ipcc_membuf_sys_cmd_buf, IPCC_CH_SYS);
 }
 
 STATIC void tl_ble_hci_cmd_resp(uint16_t opcode, size_t len, const uint8_t *buf) {
-    tl_hci_cmd((uint8_t *)&ipcc_mem_ble_cmd_buf[0], IPCC_CH_BLE, 0x01, opcode, len, buf);
+    tl_hci_cmd((uint8_t *)&ipcc_membuf_ble_cmd_buf[0], IPCC_CH_BLE, 0x01, opcode, len, buf);
     ipcc_wait_msg(IPCC_CH_BLE, 250);
     tl_check_msg(&ipcc_mem_ble_evt_queue, IPCC_CH_BLE, NULL);
 }
@@ -305,6 +379,8 @@ STATIC void tl_ble_hci_cmd_resp(uint16_t opcode, size_t len, const uint8_t *buf)
 // RF core interface
 
 void rfcore_init(void) {
+    DEBUG_printf("rfcore_init\n");
+
     // Ensure LSE is running
     rtc_init_finalise();
 
@@ -361,6 +437,8 @@ static const struct {
 };
 
 void rfcore_ble_init(void) {
+    DEBUG_printf("rfcore_ble_init\n");
+
     // Clear any outstanding messages from ipcc_init
     tl_check_msg(&ipcc_mem_sys_queue, IPCC_CH_SYS, NULL);
     tl_check_msg(&ipcc_mem_ble_evt_queue, IPCC_CH_BLE, NULL);
@@ -371,6 +449,8 @@ void rfcore_ble_init(void) {
 }
 
 void rfcore_ble_hci_cmd(size_t len, const uint8_t *src) {
+    DEBUG_printf("rfcore_ble_hci_cmd\n");
+
     #if HCI_TRACE
     printf("[% 8d] HCI_CMD(%02x", mp_hal_ticks_ms(), src[0]);
     for (int i = 1; i < len; ++i) {
@@ -382,10 +462,10 @@ void rfcore_ble_hci_cmd(size_t len, const uint8_t *src) {
     tl_list_node_t *n;
     uint32_t ch;
     if (src[0] == 0x01) {
-        n = (tl_list_node_t *)&ipcc_mem_ble_cmd_buf[0];
+        n = (tl_list_node_t *)&ipcc_membuf_ble_cmd_buf[0];
         ch = IPCC_CH_BLE;
     } else if (src[0] == 0x02) {
-        n = (tl_list_node_t *)&ipcc_mem_ble_hci_acl_data_buf[0];
+        n = (tl_list_node_t *)&ipcc_membuf_ble_hci_acl_data_buf[0];
         ch = IPCC_CH_HCI_ACL;
     } else {
         printf("** UNEXPECTED HCI HDR: 0x%02x **\n", src[0]);

From 9c9cc7a02f6f998d0141989040d68219d6ad0625 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Tue, 8 Sep 2020 17:00:41 +1000
Subject: [PATCH 0262/3533] stm32/boards/USBDONGLE_WB55: Add USE_MBOOT support.

---
 ports/stm32/boards/USBDONGLE_WB55/mpconfigboard.mk | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/ports/stm32/boards/USBDONGLE_WB55/mpconfigboard.mk b/ports/stm32/boards/USBDONGLE_WB55/mpconfigboard.mk
index 416364df9ef6d..dcec788ed443f 100644
--- a/ports/stm32/boards/USBDONGLE_WB55/mpconfigboard.mk
+++ b/ports/stm32/boards/USBDONGLE_WB55/mpconfigboard.mk
@@ -1,9 +1,18 @@
 MCU_SERIES = wb
 CMSIS_MCU = STM32WB55xx
 AF_FILE = boards/stm32wb55_af.csv
-LD_FILES = boards/stm32wb55xg.ld boards/common_basic.ld
 STARTUP_FILE = lib/stm32lib/CMSIS/STM32WBxx/Source/Templates/gcc/startup_stm32wb55xx_cm4.o
 
+ifeq ($(USE_MBOOT),1)
+# When using Mboot all the text goes together after the bootloader
+LD_FILES = boards/stm32wb55xg.ld boards/common_bl.ld
+TEXT0_ADDR = 0x08004000
+else
+# When not using Mboot the text goes at the start of flash
+LD_FILES = boards/stm32wb55xg.ld boards/common_basic.ld
+TEXT0_ADDR = 0x08000000
+endif
+
 # MicroPython settings
 MICROPY_PY_BLUETOOTH = 1
 MICROPY_BLUETOOTH_NIMBLE = 1

From 0f28020a68b190d973dc5ef2049c76eb28acddee Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Fri, 28 Aug 2020 14:59:24 +1000
Subject: [PATCH 0263/3533] stm32/powerctrlboot: Acquire HSEM5 on STM32WB
 during SystemClock_Config.

This is required to allow using WS firmware newer than 1.1.1 concurrently
with USB (e.g. USB VCP).  It prevents CPU2 from modifying the CLK48 config
on boot.

Tested on WS=1.8 FUS=1.1.

See AN5289 and https://github.com/micropython/micropython/issues/6316
---
 ports/stm32/powerctrlboot.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/ports/stm32/powerctrlboot.c b/ports/stm32/powerctrlboot.c
index 206b19b75067a..880e43e04c2a2 100644
--- a/ports/stm32/powerctrlboot.c
+++ b/ports/stm32/powerctrlboot.c
@@ -154,12 +154,23 @@ void SystemClock_Config(void) {
 
 #elif defined(STM32WB)
 
+#include "stm32wbxx_ll_hsem.h"
+
+// This semaphore protected access to the CLK48 configuration.
+// CPU1 should hold this semaphore while the USB peripheral is in use.
+// See AN5289 and https://github.com/micropython/micropython/issues/6316.
+#define CLK48_SEMID (5)
+
 void SystemClock_Config(void) {
     // Enable the 32MHz external oscillator
     RCC->CR |= RCC_CR_HSEON;
     while (!(RCC->CR & RCC_CR_HSERDY)) {
     }
 
+    // Prevent CPU2 from disabling CLK48.
+    while (LL_HSEM_1StepLock(HSEM, CLK48_SEMID)) {
+    }
+
     // Use HSE and the PLL to get a 64MHz SYSCLK
     #define PLLM (HSE_VALUE / 8000000) // VCO input is 8MHz
     #define PLLN (24) // 24*8MHz = 192MHz

From 5eda362e0a7ed0eda6a4becdebf76a53cf69f944 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Mon, 31 Aug 2020 15:54:20 +1000
Subject: [PATCH 0264/3533] tests/multi_bluetooth: Make ble_gap_connect robust
 against event timing.

---
 tests/multi_bluetooth/ble_gap_connect.py     | 61 ++++++++++++--------
 tests/multi_bluetooth/ble_gap_connect.py.exp |  1 +
 2 files changed, 38 insertions(+), 24 deletions(-)

diff --git a/tests/multi_bluetooth/ble_gap_connect.py b/tests/multi_bluetooth/ble_gap_connect.py
index ba9c28230d7da..8b40a29163119 100644
--- a/tests/multi_bluetooth/ble_gap_connect.py
+++ b/tests/multi_bluetooth/ble_gap_connect.py
@@ -10,35 +10,36 @@
 _IRQ_PERIPHERAL_CONNECT = const(7)
 _IRQ_PERIPHERAL_DISCONNECT = const(8)
 
-waiting_event = None
-waiting_data = None
+central_connected = False
+central_disconnected = False
+peripheral_connected = False
+peripheral_disconnected = False
+conn_handle = None
 
 
 def irq(event, data):
-    global waiting_event, waiting_data
+    global central_connected, central_disconnected, peripheral_connected, peripheral_disconnected, conn_handle
     if event == _IRQ_CENTRAL_CONNECT:
         print("_IRQ_CENTRAL_CONNECT")
+        central_connected = True
+        conn_handle = data[0]
     elif event == _IRQ_CENTRAL_DISCONNECT:
         print("_IRQ_CENTRAL_DISCONNECT")
+        central_disconnected = True
     elif event == _IRQ_PERIPHERAL_CONNECT:
         print("_IRQ_PERIPHERAL_CONNECT")
+        peripheral_connected = True
+        conn_handle = data[0]
     elif event == _IRQ_PERIPHERAL_DISCONNECT:
         print("_IRQ_PERIPHERAL_DISCONNECT")
+        peripheral_disconnected = True
+        remote_addr = data[0]
 
-    if waiting_event is not None:
-        if event == waiting_event:
-            waiting_event = None
-            waiting_data = data
-
-
-def wait_for_event(event, timeout_ms):
-    global waiting_event, waiting_data
-    waiting_event = event
-    waiting_data = None
 
+def wait_for(fn, timeout_ms):
     t0 = time.ticks_ms()
     while time.ticks_diff(time.ticks_ms(), t0) < timeout_ms:
-        if waiting_data:
+        if fn():
             return True
         machine.idle()
     return False
@@ -46,25 +47,31 @@ def wait_for_event(event, timeout_ms):
 
 # Acting in peripheral role.
 def instance0():
+    global central_connected, central_disconnected
+
     multitest.globals(BDADDR=ble.config("mac"))
     print("gap_advertise")
     ble.gap_advertise(20_000, b"\x02\x01\x06\x04\xffMPY")
     multitest.next()
     try:
         # Wait for central to connect, then wait for it to disconnect.
-        if not wait_for_event(_IRQ_CENTRAL_CONNECT, TIMEOUT_MS):
+        if not wait_for(lambda: central_connected, TIMEOUT_MS):
             return
-        if not wait_for_event(_IRQ_CENTRAL_DISCONNECT, TIMEOUT_MS):
+        if not wait_for(lambda: central_disconnected, TIMEOUT_MS):
             return
 
+        central_connected = False
+        central_disconnected = False
+
         # Start advertising again.
+        print("gap_advertise")
         ble.gap_advertise(20_000, b"\x02\x01\x06\x04\xffMPY")
 
         # Wait for central to connect, then disconnect it.
-        if not wait_for_event(_IRQ_CENTRAL_CONNECT, TIMEOUT_MS):
+        if not wait_for(lambda: central_connected, TIMEOUT_MS):
             return
-        print("gap_disconnect:", ble.gap_disconnect(waiting_data[0]))
-        if not wait_for_event(_IRQ_CENTRAL_DISCONNECT, TIMEOUT_MS):
+        print("gap_disconnect:", ble.gap_disconnect(conn_handle))
+        if not wait_for(lambda: central_disconnected, TIMEOUT_MS):
             return
     finally:
         ble.active(0)
@@ -72,26 +79,32 @@ def instance0():
 
 # Acting in central role.
 def instance1():
+    global peripheral_connected, peripheral_disconnected
+
     multitest.next()
     try:
         # Connect to peripheral and then disconnect.
         print("gap_connect")
         ble.gap_connect(*BDADDR)
-        if not wait_for_event(_IRQ_PERIPHERAL_CONNECT, TIMEOUT_MS):
+        if not wait_for(lambda: peripheral_connected, TIMEOUT_MS):
             return
-        print("gap_disconnect:", ble.gap_disconnect(waiting_data[0]))
-        if not wait_for_event(_IRQ_PERIPHERAL_DISCONNECT, TIMEOUT_MS):
+        print("gap_disconnect:", ble.gap_disconnect(conn_handle))
+        if not wait_for(lambda: peripheral_disconnected, TIMEOUT_MS):
             return
 
+        peripheral_connected = False
+        peripheral_disconnected = False
+
         # Wait for peripheral to start advertising again.
         time.sleep_ms(100)
 
         # Connect to peripheral and then let the peripheral disconnect us.
         print("gap_connect")
         ble.gap_connect(*BDADDR)
-        if not wait_for_event(_IRQ_PERIPHERAL_CONNECT, TIMEOUT_MS):
+        if not wait_for(lambda: peripheral_connected, TIMEOUT_MS):
+            return
+        if not wait_for(lambda: peripheral_disconnected, TIMEOUT_MS):
             return
-        wait_for_event(_IRQ_PERIPHERAL_DISCONNECT, TIMEOUT_MS)
     finally:
         ble.active(0)
 
diff --git a/tests/multi_bluetooth/ble_gap_connect.py.exp b/tests/multi_bluetooth/ble_gap_connect.py.exp
index 1c96f1d48ac07..d0dc020703214 100644
--- a/tests/multi_bluetooth/ble_gap_connect.py.exp
+++ b/tests/multi_bluetooth/ble_gap_connect.py.exp
@@ -2,6 +2,7 @@
 gap_advertise
 _IRQ_CENTRAL_CONNECT
 _IRQ_CENTRAL_DISCONNECT
+gap_advertise
 _IRQ_CENTRAL_CONNECT
 gap_disconnect: True
 _IRQ_CENTRAL_DISCONNECT

From 01f2d776141d94b8d15d91aa1e0f0cef4244d5f7 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Mon, 31 Aug 2020 15:55:09 +1000
Subject: [PATCH 0265/3533] stm32/rfcore: Fix length matching in HCI parser.

---
 ports/stm32/rfcore.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/ports/stm32/rfcore.c b/ports/stm32/rfcore.c
index 3565c03898444..99bb405630ba7 100644
--- a/ports/stm32/rfcore.c
+++ b/ports/stm32/rfcore.c
@@ -258,11 +258,13 @@ STATIC int ipcc_wait_msg(unsigned int ch, uint32_t timeout_ms) {
 
 STATIC void tl_parse_hci_msg(const uint8_t *buf, parse_hci_info_t *parse) {
     const char *kind;
-    size_t len = 3 + buf[2];
+    size_t len = 0;
     switch (buf[0]) {
         case 0x02: {
             // Standard BT HCI ACL packet
             kind = "HCI_ACL";
+            // <kind><?><?><len LSB><len MSB>
+            len = 5 + buf[3] + (buf[4] << 8);
             if (parse != NULL) {
                 parse->cb_fun(parse->cb_env, buf, len);
             }
@@ -271,6 +273,8 @@ STATIC void tl_parse_hci_msg(const uint8_t *buf, parse_hci_info_t *parse) {
         case 0x04: {
             // Standard BT HCI event packet
             kind = "HCI_EVT";
+            // <kind><op><len><data...>
+            len = 3 + buf[2];
             if (parse != NULL) {
                 bool fix = false;
                 if (buf[1] == 0x0e && len == 7 && buf[3] == 0x01 && buf[4] == 0x63 && buf[5] == 0x0c && buf[6] == 0x01) {

From 8b4ebd716613ba981c6714510a7adf5c860d7bdf Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Tue, 1 Sep 2020 14:13:44 +1000
Subject: [PATCH 0266/3533] stm32/rfcore: Refactor some helper funcs, and
 remove some magic numbers.

Also explain what the payload fixup code is doing.
---
 ports/stm32/rfcore.c | 262 +++++++++++++++++++++++++------------------
 1 file changed, 153 insertions(+), 109 deletions(-)

diff --git a/ports/stm32/rfcore.c b/ports/stm32/rfcore.c
index 99bb405630ba7..5630ea7132db8 100644
--- a/ports/stm32/rfcore.c
+++ b/ports/stm32/rfcore.c
@@ -42,18 +42,33 @@
 // Define to 1 to print traces of HCI packets
 #define HCI_TRACE (0)
 
-#define IPCC_CH_BLE         (0x01) // BLE HCI command and response
-#define IPCC_CH_SYS         (0x02) // system HCI command and response
-#define IPCC_CH_MM          (0x08) // release buffer
-#define IPCC_CH_HCI_ACL     (0x20) // HCI ACL outgoing data
+#define IPCC_CH_BLE         (LL_IPCC_CHANNEL_1) // BLE HCI command and response
+#define IPCC_CH_SYS         (LL_IPCC_CHANNEL_2) // system HCI command and response
+#define IPCC_CH_MM          (LL_IPCC_CHANNEL_4) // release buffer
+#define IPCC_CH_HCI_ACL     (LL_IPCC_CHANNEL_6) // HCI ACL outgoing data
 
-#define OGF_VENDOR          (0x3f)
-#define OCF_WRITE_CONFIG    (0x0c)
-#define OCF_SET_TX_POWER    (0x0f)
-#define OCF_BLE_INIT        (0x66)
+#define OGF_CTLR_BASEBAND        (0x03)
+#define OCF_CB_RESET             (0x03)
+#define OCF_CB_SET_EVENT_MASK2   (0x63)
+
+#define OGF_VENDOR               (0x3f)
+#define OCF_WRITE_CONFIG         (0x0c)
+#define OCF_SET_TX_POWER         (0x0f)
+#define OCF_BLE_INIT             (0x66)
 
 #define HCI_OPCODE(ogf, ocf) ((ogf) << 10 | (ocf))
 
+#define HCI_KIND_BT_CMD (0x01) // <kind=1>...?
+#define HCI_KIND_BT_ACL (0x02) // <kind=2><?><?><len LSB><len MSB>
+#define HCI_KIND_BT_EVENT (0x04) // <kind=4><op><len><data...>
+#define HCI_KIND_VENDOR_RESPONSE (0x11)
+#define HCI_KIND_VENDOR_EVENT (0x12)
+
+#define HCI_EVENT_COMMAND_COMPLETE     (0x0E) // <num packets><opcode 16><status><data...>
+
+#define SYS_ACK_TIMEOUT_MS (250)
+#define BLE_ACK_TIMEOUT_MS (250)
+
 typedef struct _tl_list_node_t {
     volatile struct _tl_list_node_t *next;
     volatile struct _tl_list_node_t *prev;
@@ -194,12 +209,6 @@ void ipcc_init(uint32_t irq_pri) {
     // Start IPCC peripheral
     __HAL_RCC_IPCC_CLK_ENABLE();
 
-    // Enable wanted IRQs
-    IPCC->C1CR = 0; // IPCC_C1CR_RXOIE;
-    IPCC->C1MR = 0xffffffff;
-    NVIC_SetPriority(IPCC_C1_RX_IRQn, irq_pri);
-    HAL_NVIC_EnableIRQ(IPCC_C1_RX_IRQn);
-
     // Device info table will be populated by FUS/WS on CPU2 boot.
 
     // Populate system table
@@ -225,127 +234,136 @@ void ipcc_init(uint32_t irq_pri) {
     ipcc_mem_ble_tab.phci_acl_data_buffer = ipcc_membuf_ble_hci_acl_data_buf;
 }
 
-STATIC int ipcc_wait_ack(unsigned int ch, uint32_t timeout_ms) {
-    DEBUG_printf("ipcc_wait_ack\n");
-
-    uint32_t t0 = mp_hal_ticks_ms();
-    while (IPCC->C1TOC2SR & ch) {
-        if (mp_hal_ticks_ms() - t0 > timeout_ms) {
-            printf("ipcc_wait_ack: timeout\n");
-            return -MP_ETIMEDOUT;
-        }
-    }
-    // C2 cleared IPCC flag
-    return 0;
-}
-
-STATIC int ipcc_wait_msg(unsigned int ch, uint32_t timeout_ms) {
-    DEBUG_printf("ipcc_wait_msg\n");
-
-    uint32_t t0 = mp_hal_ticks_ms();
-    while (!(IPCC->C2TOC1SR & ch)) {
-        if (mp_hal_ticks_ms() - t0 > timeout_ms) {
-            printf("ipcc_wait_msg: timeout\n");
-            return -MP_ETIMEDOUT;
-        }
-    }
-    // C2 set IPCC flag
-    return 0;
-}
-
 /******************************************************************************/
 // Transport layer HCI interface
 
 STATIC void tl_parse_hci_msg(const uint8_t *buf, parse_hci_info_t *parse) {
-    const char *kind;
+    const char *info;
     size_t len = 0;
+    bool applied_set_event_event_mask2_fix = false;
     switch (buf[0]) {
-        case 0x02: {
-            // Standard BT HCI ACL packet
-            kind = "HCI_ACL";
-            // <kind><?><?><len LSB><len MSB>
+        case HCI_KIND_BT_ACL: {
+            info = "HCI_ACL";
+
             len = 5 + buf[3] + (buf[4] << 8);
             if (parse != NULL) {
                 parse->cb_fun(parse->cb_env, buf, len);
             }
             break;
         }
-        case 0x04: {
-            // Standard BT HCI event packet
-            kind = "HCI_EVT";
-            // <kind><op><len><data...>
+        case HCI_KIND_BT_EVENT: {
+            info = "HCI_EVT";
+
             len = 3 + buf[2];
             if (parse != NULL) {
-                bool fix = false;
-                if (buf[1] == 0x0e && len == 7 && buf[3] == 0x01 && buf[4] == 0x63 && buf[5] == 0x0c && buf[6] == 0x01) {
-                    len -= 1;
-                    fix = true;
+
+                if (buf[1] == HCI_EVENT_COMMAND_COMPLETE && len == 7) {
+                    uint16_t opcode = (buf[5] << 8) | buf[4];
+                    uint8_t status = buf[6];
+
+                    if (opcode == HCI_OPCODE(OGF_CTLR_BASEBAND, OCF_CB_SET_EVENT_MASK2) && status != 0) {
+                        // The WB doesn't support this command (despite being in CS 4.1), so pretend like
+                        // it succeeded by replacing the final byte (status) with a zero.
+                        applied_set_event_event_mask2_fix = true;
+                        len -= 1;
+                    }
+
+                    if (opcode == HCI_OPCODE(OGF_CTLR_BASEBAND, OCF_CB_RESET) && status == 0) {
+                        // Controller acknowledged reset command.
+                        // This will trigger setting the MAC address.
+                        parse->was_hci_reset_evt = true;
+                    }
                 }
+
                 parse->cb_fun(parse->cb_env, buf, len);
-                if (fix) {
-                    len += 1;
-                    uint8_t data = 0x00; // success
+
+                if (applied_set_event_event_mask2_fix) {
+                    // Inject the zero status.
+                    uint8_t data = 0;
                     parse->cb_fun(parse->cb_env, &data, 1);
+                    // Restore the length for the HCI tracing below.
+                    len += 1;
                 }
-                // Check for successful HCI_Reset event
-                parse->was_hci_reset_evt = buf[1] == 0x0e && buf[2] == 0x04 && buf[3] == 0x01
-                    && buf[4] == 0x03 && buf[5] == 0x0c && buf[6] == 0x00;
             }
             break;
         }
-        case 0x11: {
-            // Response packet
+        case HCI_KIND_VENDOR_RESPONSE: {
             // assert(buf[1] == 0x0e);
-            kind = "VEND_RESP";
+            info = "VEND_RESP";
+            len = 3 + buf[2]; // ???
             // uint16_t cmd = buf[4] | buf[5] << 8;
             // uint8_t status = buf[6];
             break;
         }
-        case 0x12: {
-            // Event packet
+        case HCI_KIND_VENDOR_EVENT: {
             // assert(buf[1] == 0xff);
-            kind = "VEND_EVT";
+            info = "VEND_EVT";
+            len = 3 + buf[2]; // ???
             // uint16_t evt = buf[3] | buf[4] << 8;
             break;
         }
         default:
-            kind = "HCI_UNKNOWN";
+            info = "HCI_UNKNOWN";
             break;
     }
 
     #if HCI_TRACE
-    printf("[% 8d] %s(%02x", mp_hal_ticks_ms(), kind, buf[0]);
+    printf("[% 8d] <%s(%02x", mp_hal_ticks_ms(), info, buf[0]);
     for (int i = 1; i < len; ++i) {
         printf(":%02x", buf[i]);
     }
-    printf(")\n");
+    printf(")");
+    if (parse && parse->was_hci_reset_evt) {
+        printf(" (reset)");
+    }
+    if (applied_set_event_event_mask2_fix) {
+        printf(" (mask2 fix)");
+    }
+    printf("\n");
+
     #else
-    (void)kind;
+    (void)info;
     #endif
 }
 
-STATIC void tl_check_msg(volatile tl_list_node_t *head, unsigned int ch, parse_hci_info_t *parse) {
-    if (IPCC->C2TOC1SR & ch) {
-        // Message available on CH2
-        volatile tl_list_node_t *cur = head->next;
-        bool free = false;
-        while (cur != head) {
-            tl_parse_hci_msg((uint8_t *)cur->body, parse);
-            volatile tl_list_node_t *next = tl_list_unlink(cur);
-            if ((void *)&ipcc_membuf_memmgr_evt_pool[0] <= (void *)cur
-                && (void *)cur < (void *)&ipcc_membuf_memmgr_evt_pool[MP_ARRAY_SIZE(ipcc_membuf_memmgr_evt_pool)]) {
-                // Place memory back in free pool
-                tl_list_append(&ipcc_mem_memmgr_free_buf_queue, cur);
-                free = true;
-            }
-            cur = next;
-        }
-        if (free) {
-            // Notify change in free pool
-            IPCC->C1SCR = IPCC_CH_MM << 16;
+STATIC void tl_process_msg(volatile tl_list_node_t *head, unsigned int ch, parse_hci_info_t *parse) {
+    volatile tl_list_node_t *cur = head->next;
+    bool added_to_free_queue = false;
+    while (cur != head) {
+        tl_parse_hci_msg((uint8_t *)cur->body, parse);
+
+        volatile tl_list_node_t *next = tl_list_unlink(cur);
+
+        // If this node is allocated from the memmgr event pool, then place it into the free buffer.
+        if ((uint8_t *)cur >= ipcc_membuf_memmgr_evt_pool && (uint8_t *)cur < ipcc_membuf_memmgr_evt_pool + sizeof(ipcc_membuf_memmgr_evt_pool)) {
+            // Place memory back in free pool.
+            tl_list_append(&ipcc_mem_memmgr_free_buf_queue, cur);
+            added_to_free_queue = true;
         }
-        // Clear receive channel
-        IPCC->C1SCR = ch;
+
+        cur = next;
+    }
+
+    if (added_to_free_queue) {
+        // Notify change in free pool.
+        LL_C1_IPCC_SetFlag_CHx(IPCC, IPCC_CH_MM);
+    }
+}
+
+STATIC void tl_check_msg(volatile tl_list_node_t *head, unsigned int ch, parse_hci_info_t *parse) {
+    if (LL_C2_IPCC_IsActiveFlag_CHx(IPCC, ch)) {
+        tl_process_msg(head, ch, parse);
+
+        // Clear receive channel.
+        LL_C1_IPCC_ClearFlag_CHx(IPCC, ch);
+    }
+}
+
+STATIC void tl_check_msg_ble(volatile tl_list_node_t *head, parse_hci_info_t *parse) {
+    if (LL_C2_IPCC_IsActiveFlag_CHx(IPCC, IPCC_CH_BLE)) {
+        tl_process_msg(head, IPCC_CH_BLE, parse);
+
+        LL_C1_IPCC_ClearFlag_CHx(IPCC, IPCC_CH_BLE);
     }
 }
 
@@ -358,25 +376,51 @@ STATIC void tl_hci_cmd(uint8_t *cmd, unsigned int ch, uint8_t hdr, uint16_t opco
     cmd[10] = opcode >> 8;
     cmd[11] = len;
     memcpy(&cmd[12], buf, len);
-    // IPCC indicate
-    IPCC->C1SCR = ch << 16;
+
+    // Indicate that this channel is ready.
+    LL_C1_IPCC_SetFlag_CHx(IPCC, ch);
 }
 
-STATIC void tl_sys_wait_resp(const uint8_t *buf, unsigned int ch) {
-    if (ipcc_wait_ack(ch, 250) == 0) {
-        tl_parse_hci_msg(buf, NULL);
+STATIC int tl_sys_wait_ack(const uint8_t *buf) {
+    uint32_t t0 = mp_hal_ticks_ms();
+
+    // C2 will clear this bit to acknowledge the request.
+    while (LL_C1_IPCC_IsActiveFlag_CHx(IPCC, IPCC_CH_SYS)) {
+        if (mp_hal_ticks_ms() - t0 > SYS_ACK_TIMEOUT_MS) {
+            printf("tl_sys_wait_ack: timeout\n");
+            return -MP_ETIMEDOUT;
+        }
     }
+
+    // C1-to-C2 bit cleared, so process (but ignore) the response.
+    tl_parse_hci_msg(buf, NULL);
+    return 0;
 }
 
 STATIC void tl_sys_hci_cmd_resp(uint16_t opcode, size_t len, const uint8_t *buf) {
-    tl_hci_cmd((uint8_t *)&ipcc_membuf_sys_cmd_buf, IPCC_CH_SYS, 0x10, opcode, len, buf);
-    tl_sys_wait_resp((uint8_t *)&ipcc_membuf_sys_cmd_buf, IPCC_CH_SYS);
+    tl_hci_cmd(ipcc_membuf_sys_cmd_buf, IPCC_CH_SYS, 0x10, opcode, len, buf);
+    tl_sys_wait_ack(ipcc_membuf_sys_cmd_buf);
+}
+
+STATIC int tl_ble_wait_resp(void) {
+    uint32_t t0 = mp_hal_ticks_ms();
+    while (!LL_C2_IPCC_IsActiveFlag_CHx(IPCC, IPCC_CH_BLE)) {
+        if (mp_hal_ticks_ms() - t0 > BLE_ACK_TIMEOUT_MS) {
+            printf("tl_ble_wait_resp: timeout\n");
+            return -MP_ETIMEDOUT;
+        }
+    }
+
+    // C2 set IPCC flag.
+    tl_check_msg_ble(&ipcc_mem_ble_evt_queue, NULL);
+    return 0;
 }
 
+// Synchronously send a BLE command.
 STATIC void tl_ble_hci_cmd_resp(uint16_t opcode, size_t len, const uint8_t *buf) {
-    tl_hci_cmd((uint8_t *)&ipcc_membuf_ble_cmd_buf[0], IPCC_CH_BLE, 0x01, opcode, len, buf);
-    ipcc_wait_msg(IPCC_CH_BLE, 250);
-    tl_check_msg(&ipcc_mem_ble_evt_queue, IPCC_CH_BLE, NULL);
+    tl_hci_cmd(ipcc_membuf_ble_cmd_buf, IPCC_CH_BLE, HCI_KIND_BT_CMD, opcode, len, buf);
+    tl_ble_wait_resp();
+
 }
 
 /******************************************************************************/
@@ -445,7 +489,7 @@ void rfcore_ble_init(void) {
 
     // Clear any outstanding messages from ipcc_init
     tl_check_msg(&ipcc_mem_sys_queue, IPCC_CH_SYS, NULL);
-    tl_check_msg(&ipcc_mem_ble_evt_queue, IPCC_CH_BLE, NULL);
+    tl_check_msg_ble(&ipcc_mem_ble_evt_queue, NULL);
 
     // Configure and reset the BLE controller
     tl_sys_hci_cmd_resp(HCI_OPCODE(OGF_VENDOR, OCF_BLE_INIT), sizeof(ble_init_params), (const uint8_t *)&ble_init_params);
@@ -456,7 +500,7 @@ void rfcore_ble_hci_cmd(size_t len, const uint8_t *src) {
     DEBUG_printf("rfcore_ble_hci_cmd\n");
 
     #if HCI_TRACE
-    printf("[% 8d] HCI_CMD(%02x", mp_hal_ticks_ms(), src[0]);
+    printf("[% 8d] >HCI_CMD(%02x", mp_hal_ticks_ms(), src[0]);
     for (int i = 1; i < len; ++i) {
         printf(":%02x", src[i]);
     }
@@ -465,10 +509,10 @@ void rfcore_ble_hci_cmd(size_t len, const uint8_t *src) {
 
     tl_list_node_t *n;
     uint32_t ch;
-    if (src[0] == 0x01) {
+    if (src[0] == HCI_KIND_BT_CMD) {
         n = (tl_list_node_t *)&ipcc_membuf_ble_cmd_buf[0];
         ch = IPCC_CH_BLE;
-    } else if (src[0] == 0x02) {
+    } else if (src[0] == HCI_KIND_BT_ACL) {
         n = (tl_list_node_t *)&ipcc_membuf_ble_hci_acl_data_buf[0];
         ch = IPCC_CH_HCI_ACL;
     } else {
@@ -480,13 +524,13 @@ void rfcore_ble_hci_cmd(size_t len, const uint8_t *src) {
     n->prev = n;
     memcpy(n->body, src, len);
 
-    // IPCC indicate
-    IPCC->C1SCR = ch << 16;
+    // IPCC indicate.
+    LL_C1_IPCC_SetFlag_CHx(IPCC, ch);
 }
 
 void rfcore_ble_check_msg(int (*cb)(void *, const uint8_t *, size_t), void *env) {
     parse_hci_info_t parse = { cb, env, false };
-    tl_check_msg(&ipcc_mem_ble_evt_queue, IPCC_CH_BLE, &parse);
+    tl_check_msg_ble(&ipcc_mem_ble_evt_queue, &parse);
 
     // Intercept HCI_Reset events and reconfigure the controller following the reset
     if (parse.was_hci_reset_evt) {

From e2390d5a2f4f18912878596965b0c794ac153cb4 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Tue, 1 Sep 2020 14:13:44 +1000
Subject: [PATCH 0267/3533] stm32/rfcore: Enable RX IRQ on BLE IPCC channel for
 better performance.

Before this change there was up to a 128ms delay on incoming payloads from
CPU2 as it was polled by SysTick.  Now the RX IRQ immediately schedules the
PendSV.
---
 ports/stm32/rfcore.c | 38 +++++++++++++++++++++++++++++++++++---
 1 file changed, 35 insertions(+), 3 deletions(-)

diff --git a/ports/stm32/rfcore.c b/ports/stm32/rfcore.c
index 5630ea7132db8..ca2ad747c4bb8 100644
--- a/ports/stm32/rfcore.c
+++ b/ports/stm32/rfcore.c
@@ -164,6 +164,9 @@ STATIC uint8_t ipcc_membuf_ble_cs_buf[272]; // mem2
 STATIC tl_list_node_t ipcc_mem_ble_evt_queue; // mem1
 STATIC uint8_t ipcc_membuf_ble_hci_acl_data_buf[272]; // mem2
 
+// Set by the RX IRQ handler on incoming HCI payload.
+STATIC volatile bool had_ble_irq = false;
+
 /******************************************************************************/
 // Transport layer linked list
 
@@ -209,6 +212,13 @@ void ipcc_init(uint32_t irq_pri) {
     // Start IPCC peripheral
     __HAL_RCC_IPCC_CLK_ENABLE();
 
+    // Enable receive IRQ on the BLE channel.
+    LL_C1_IPCC_EnableIT_RXO(IPCC);
+    LL_C1_IPCC_DisableReceiveChannel(IPCC, LL_IPCC_CHANNEL_1 | LL_IPCC_CHANNEL_2 | LL_IPCC_CHANNEL_3 | LL_IPCC_CHANNEL_4 | LL_IPCC_CHANNEL_5 | LL_IPCC_CHANNEL_6);
+    LL_C1_IPCC_EnableReceiveChannel(IPCC, IPCC_CH_BLE);
+    NVIC_SetPriority(IPCC_C1_RX_IRQn, irq_pri);
+    HAL_NVIC_EnableIRQ(IPCC_C1_RX_IRQn);
+
     // Device info table will be populated by FUS/WS on CPU2 boot.
 
     // Populate system table
@@ -360,10 +370,10 @@ STATIC void tl_check_msg(volatile tl_list_node_t *head, unsigned int ch, parse_h
 }
 
 STATIC void tl_check_msg_ble(volatile tl_list_node_t *head, parse_hci_info_t *parse) {
-    if (LL_C2_IPCC_IsActiveFlag_CHx(IPCC, IPCC_CH_BLE)) {
+    if (had_ble_irq) {
         tl_process_msg(head, IPCC_CH_BLE, parse);
 
-        LL_C1_IPCC_ClearFlag_CHx(IPCC, IPCC_CH_BLE);
+        had_ble_irq = false;
     }
 }
 
@@ -404,7 +414,7 @@ STATIC void tl_sys_hci_cmd_resp(uint16_t opcode, size_t len, const uint8_t *buf)
 
 STATIC int tl_ble_wait_resp(void) {
     uint32_t t0 = mp_hal_ticks_ms();
-    while (!LL_C2_IPCC_IsActiveFlag_CHx(IPCC, IPCC_CH_BLE)) {
+    while (!had_ble_irq) {
         if (mp_hal_ticks_ms() - t0 > BLE_ACK_TIMEOUT_MS) {
             printf("tl_ble_wait_resp: timeout\n");
             return -MP_ETIMEDOUT;
@@ -553,4 +563,26 @@ void rfcore_ble_set_txpower(uint8_t level) {
     tl_ble_hci_cmd_resp(HCI_OPCODE(OGF_VENDOR, OCF_SET_TX_POWER), 2, buf);
 }
 
+// IPCC IRQ Handlers
+void IPCC_C1_TX_IRQHandler(void) {
+    IRQ_ENTER(IPCC_C1_TX_IRQn);
+    IRQ_EXIT(IPCC_C1_TX_IRQn);
+}
+
+void IPCC_C1_RX_IRQHandler(void) {
+    IRQ_ENTER(IPCC_C1_RX_IRQn);
+
+    if (LL_C2_IPCC_IsActiveFlag_CHx(IPCC, IPCC_CH_BLE)) {
+        had_ble_irq = true;
+
+        LL_C1_IPCC_ClearFlag_CHx(IPCC, IPCC_CH_BLE);
+
+        // Schedule PENDSV to process incoming HCI payload.
+        extern void mp_bluetooth_hci_poll_wrapper(uint32_t ticks_ms);
+        mp_bluetooth_hci_poll_wrapper(0);
+    }
+
+    IRQ_EXIT(IPCC_C1_RX_IRQn);
+}
+
 #endif // defined(STM32WB)

From 632e3b7acc51b3b28f310ef5e23b0983c8e8b700 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Fri, 28 Aug 2020 15:51:15 +1000
Subject: [PATCH 0268/3533] stm32/boards/NUCLEO_WB55: Add Python helper code
 for rfcore.

This allows prototyping rfcore.c improvements from Python.

This was mostly written by @dpgeorge with small modifications to work after
rfcore_init() by @jimmo.
---
 ports/stm32/boards/NUCLEO_WB55/rfcore.py | 347 +++++++++++++++++++++++
 1 file changed, 347 insertions(+)
 create mode 100644 ports/stm32/boards/NUCLEO_WB55/rfcore.py

diff --git a/ports/stm32/boards/NUCLEO_WB55/rfcore.py b/ports/stm32/boards/NUCLEO_WB55/rfcore.py
new file mode 100644
index 0000000000000..e612499a7829f
--- /dev/null
+++ b/ports/stm32/boards/NUCLEO_WB55/rfcore.py
@@ -0,0 +1,347 @@
+# This file is part of the MicroPython project, http://micropython.org/
+#
+# The MIT License (MIT)
+#
+# Copyright (c) 2020 Damien P. George
+# Copyright (c) 2020 Jim Mussared
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+# This script provides some helpers to allow Python code to access the IPCC
+# mechanism in the WB55, and works with the memory layout configured in
+# ports/stm32/rfcore.c -- i.e. it expects that rfcore_init() has been run.
+
+# At this stage this is useful for debugging, but can be extended to support
+# FUS/WS firmware updates.
+# e.g.
+# ../../tools/pyboard.py --device /dev/ttyACM0 boards/NUCLEO_WB55/rfcore.py
+# to print out SRAM2A, register state and FUS/WS info.
+
+from machine import mem8, mem16, mem32
+import time, struct, uctypes
+import stm
+
+
+class Flash:
+    FLASH_KEY1 = 0x45670123
+    FLASH_KEY2 = 0xCDEF89AB
+
+    def wait_not_busy(self):
+        while mem32[stm.FLASH + stm.FLASH_SR] & 1 << 16:
+            machine.idle()
+
+    def unlock(self):
+        mem32[stm.FLASH + stm.FLASH_KEYR] = Flash.FLASH_KEY1
+        mem32[stm.FLASH + stm.FLASH_KEYR] = Flash.FLASH_KEY2
+
+    def lock(self):
+        mem32[stm.FLASH + stm.FLASH_CR] = 1 << 31  # LOCK
+
+    def erase_page(self, page):
+        print("erase", page)
+        assert 0 <= page <= 255  # 1MiB range (4k page)
+        self.wait_not_busy()
+        cr = page << 3 | 1 << 1  # PNB  # PER
+        mem32[stm.FLASH + stm.FLASH_CR] = cr
+        mem32[stm.FLASH + stm.FLASH_CR] = cr | 1 << 16  # STRT
+        self.wait_not_busy()
+        mem32[stm.FLASH + stm.FLASH_CR] = 0
+
+    def write(self, addr, buf):
+        assert len(buf) % 4 == 0
+        self.wait_not_busy()
+        cr = 1 << 0  # PG
+        mem32[stm.FLASH + stm.FLASH_CR] = cr
+        buf_addr = uctypes.addressof(buf)
+        off = 0
+        while off < len(buf):
+            mem32[addr + off] = mem32[buf_addr + off]
+            off += 4
+            if off % 8 == 0:
+                self.wait_not_busy()
+        if off % 8:
+            mem32[addr + off] = 0
+            self.wait_not_busy()
+        mem32[stm.FLASH + stm.FLASH_CR] = 0
+
+
+def copy_file_to_flash(filename, addr):
+    flash = Flash()
+    flash.unlock()
+    try:
+        with open(filename, "rb") as f:
+            buf = bytearray(4096)
+            while 1:
+                sz = f.readinto(buf)
+                if sz == 0:
+                    break
+                print("write", hex(addr), sz)
+                flash.erase_page((addr - 0x08000000) // 4096)
+                print("done e")
+                flash.write(addr, buf)
+                print("done")
+                addr += 4096
+    finally:
+        flash.lock()
+
+
+SRAM2A_BASE = const(0x2003_0000)
+
+# for vendor OGF
+OGF_VENDOR = const(0x3F)
+OCF_FUS_GET_STATE = const(0x52)
+OCF_FUS_FW_UPGRADE = const(0x54)
+OCF_FUS_FW_DELETE = const(0x55)
+OCF_FUS_START_WS = const(0x5A)
+OCF_BLE_INIT = const(0x66)
+
+
+@micropython.asm_thumb
+def asm_sev_wfe():
+    data(2, 0xBF40)  # sev
+    data(2, 0xBF20)  # wfe
+
+
+TABLE_DEVICE_INFO = const(0)
+TABLE_BLE = const(1)
+TABLE_SYS = const(3)
+TABLE_MEM_MANAGER = const(4)
+
+CHANNEL_BLE = const(1)
+CHANNEL_SYS = const(2)
+CHANNEL_TRACES = const(4)
+CHANNEL_ACL = const(6)
+
+INDICATOR_HCI_COMMAND = const(0x01)
+INDICATOR_HCI_EVENT = const(0x04)
+INDICATOR_FUS_COMMAND = const(0x10)
+INDICATOR_FUS_RESPONSE = const(0x11)
+INDICATOR_FUS_EVENT = const(0x12)
+
+MAGIC_FUS_ACTIVE = const(0xA94656B9)
+
+
+def get_ipccdba():
+    return mem32[stm.FLASH + stm.FLASH_IPCCBR] & 0x3FFF
+
+
+def get_ipcc_table(table):
+    return mem32[SRAM2A_BASE + get_ipccdba() + table * 4]
+
+
+def get_ipcc_table_word(table, offset):
+    return mem32[get_ipcc_table(table) + offset * 4] & 0xFFFFFFFF
+
+
+def get_ipcc_table_byte(table, offset):
+    return mem8[get_ipcc_table(table) + offset] & 0xFF
+
+
+def sram2a_dump(num_words=64, width=8):
+    print("SRAM2A @%08x" % SRAM2A_BASE)
+    for i in range((num_words + width - 1) // width):
+        print("  %04x " % (i * 4 * width), end="")
+        for j in range(width):
+            print(" %08x" % (mem32[SRAM2A_BASE + (i * width + j) * 4] & 0xFFFFFFFF), end="")
+        print()
+
+
+SYS_CMD_BUF = 0  # next*,prev*,type8,...; 272 bytes
+SYS_SYS_QUEUE = 0  # next*,prev*
+
+MM_BLE_SPARE_EVT_BUF = 0  # next*,prev*; 272 bytes
+MM_SYS_SPARE_EVT_BUF = 0  # next*,prev*; 272 bytes
+MM_BLE_POOL = 0  # ?
+MM_BLE_POOL_SIZE = 0  # ?
+MM_FREE_BUF_QUEUE = 0  # next*,prev*
+MM_EV_POOL = 0  # ?
+MM_EV_POOL_SIZE = 0  # ?
+
+BLE_CMD_BUF = 0
+BLE_CS_BUF = 0
+BLE_EVT_QUEUE = 0
+BLE_HCI_ACL_DATA_BUF = 0
+
+
+def ipcc_init():
+    global SYS_CMD_BUF, SYS_SYS_QUEUE
+    SYS_CMD_BUF = get_ipcc_table_word(TABLE_SYS, 0)
+    SYS_SYS_QUEUE = get_ipcc_table_word(TABLE_SYS, 1)
+
+    global MM_BLE_SPARE_EVT_BUF, MM_SYS_SPARE_EVT_BUF, MM_BLE_POOL, MM_BLE_POOL_SIZE, MM_FREE_BUF_QUEUE, MM_EV_POOL, MM_EV_POOL_SIZE
+    MM_BLE_SPARE_EVT_BUF = get_ipcc_table_word(TABLE_MEM_MANAGER, 0)
+    MM_SYS_SPARE_EVT_BUF = get_ipcc_table_word(TABLE_MEM_MANAGER, 1)
+    MM_BLE_POOL = get_ipcc_table_word(TABLE_MEM_MANAGER, 2)
+    MM_BLE_POOL_SIZE = get_ipcc_table_word(TABLE_MEM_MANAGER, 3)
+    MM_FREE_BUF_QUEUE = get_ipcc_table_word(TABLE_MEM_MANAGER, 4)
+    MM_EV_POOL = get_ipcc_table_word(TABLE_MEM_MANAGER, 5)
+    MM_EV_POOL_SIZE = get_ipcc_table_word(TABLE_MEM_MANAGER, 6)
+
+    global BLE_CMD_BUF, BLE_CS_BUF, BLE_EVT_QUEUE, BLE_HCI_ACL_DATA_BUF
+    BLE_CMD_BUF = get_ipcc_table_word(TABLE_BLE, 0)
+    BLE_CS_BUF = get_ipcc_table_word(TABLE_BLE, 1)
+    BLE_EVT_QUEUE = get_ipcc_table_word(TABLE_BLE, 2)
+    BLE_HCI_ACL_DATA_BUF = get_ipcc_table_word(TABLE_BLE, 3)
+
+    print("IPCC initialised")
+    print("SYS: 0x%08x 0x%08x" % (SYS_CMD_BUF, SYS_SYS_QUEUE))
+    print("BLE: 0x%08x 0x%08x 0x%08x" % (BLE_CMD_BUF, BLE_CS_BUF, BLE_EVT_QUEUE))
+
+
+def tl_list_init(addr):
+    mem32[addr] = addr  # next
+    mem32[addr + 4] = addr  # prev
+
+
+def tl_list_append(head, n):
+    sram2a_dump(1024)
+    print("Appending 0x%08x to 0x%08x" % (head, n))
+    # item->next = head
+    mem32[n] = head
+    # item->prev = head->prev
+    mem32[n + 4] = mem32[head + 4]
+    # head->prev->next = item
+    mem32[mem32[head + 4]] = n
+    # head->prev = item
+    mem32[head + 4] = n
+
+
+def tl_list_unlink(n):
+    # next = item->next
+    next = mem32[n]
+    # prev = item->prev
+    prev = mem32[n + 4]
+    # prev->next = item->next
+    mem32[prev] = next
+    # item->next->prev = prev
+    mem32[next + 4] = prev
+
+    return next
+
+
+def tl_list_dump(head):
+    print(
+        "list(%08x, %08x, %08x):" % (head, mem32[head] & 0xFFFFFFFF, mem32[head + 4] & 0xFFFFFFFF),
+        end="",
+    )
+    cur = mem32[head]
+    while cur != head:
+        print(" %08x" % (cur & 0xFFFFFFFF), end="")
+        cur = mem32[cur]
+    print()
+
+
+def fus_active():
+    return get_ipcc_table_word(TABLE_DEVICE_INFO, 0) == MAGIC_FUS_ACTIVE
+
+
+def info():
+    sfr = mem32[stm.FLASH + stm.FLASH_SFR]
+    srrvr = mem32[stm.FLASH + stm.FLASH_SRRVR]
+
+    print("IPCCDBA  : 0x%08x" % (get_ipccdba() & 0x3FFF))
+    print("DDS      : %r" % bool(sfr & (1 << 12)))
+    print("FSD      : %r" % bool(sfr & (1 << 8)))
+    print("SFSA     : 0x%08x" % (sfr & 0xFF))
+    print("C2OPT    : %r" % bool(srrvr & (1 << 31)))
+    print("NBRSD    : %r" % bool(srrvr & (1 << 30)))
+    print("SNBRSA   : 0x%08x" % ((srrvr >> 25) & 0x1F))
+    print("BRSD     : %r" % bool(srrvr & (1 << 23)))
+    print("SBRSA    : 0x%08x" % ((srrvr >> 18) & 0x1F))
+    print("SBRV     : 0x%08x" % (srrvr & 0x3FFFF))
+
+
+def dev_info():
+    def dump_version(offset):
+        x = get_ipcc_table_word(TABLE_DEVICE_INFO, offset)
+        print(
+            "0x%08x (%u.%u.%u.%u.%u)"
+            % (x, x >> 24, x >> 16 & 0xFF, x >> 8 & 0xFF, x >> 4 & 0xF, x & 0xF)
+        )
+
+    def dump_memory_size(offset):
+        x = get_ipcc_table_word(TABLE_DEVICE_INFO, offset)
+        print(
+            "0x%08x (SRAM2b=%uk SRAM2a=%uk flash=%uk)"
+            % (x, x >> 24, x >> 16 & 0xFF, (x & 0xFF) * 4)
+        )
+
+    print("Device information table @%08x:" % get_ipcc_table(TABLE_DEVICE_INFO))
+    if fus_active():
+        # layout when running FUS
+        print("FUS is active")
+        print("state                    : 0x%08x" % get_ipcc_table_word(TABLE_DEVICE_INFO, 0))
+        print("last FUS active state    : 0x%02x" % get_ipcc_table_byte(TABLE_DEVICE_INFO, 5))
+        print("last wireless stack state: 0x%02x" % get_ipcc_table_byte(TABLE_DEVICE_INFO, 6))
+        print("cur wireless stack type  : 0x%02x" % get_ipcc_table_byte(TABLE_DEVICE_INFO, 7))
+        print("safe boot version        : ", end="")
+        dump_version(2)
+        print("FUS version              : ", end="")
+        dump_version(3)
+        print("FUS memory size          : ", end="")
+        dump_memory_size(4)
+        print("wireless stack version   : ", end="")
+        dump_version(5)
+        print("wireless stack mem size  : ", end="")
+        dump_memory_size(6)
+        print("wireless FW-BLE info     : 0x%08x" % get_ipcc_table_word(TABLE_DEVICE_INFO, 7))
+        print("wireless FW-thread info  : 0x%08x" % get_ipcc_table_word(TABLE_DEVICE_INFO, 8))
+        print(
+            "UID64                    : 0x%08x 0x%08x"
+            % (
+                get_ipcc_table_word(TABLE_DEVICE_INFO, 9),
+                get_ipcc_table_word(TABLE_DEVICE_INFO, 10),
+            )
+        )
+        print("device ID                : 0x%04x" % get_ipcc_table_word(TABLE_DEVICE_INFO, 11))
+    else:
+        # layout when running WS
+        print("WS is active")
+        print("safe boot version        : ", end="")
+        dump_version(0)
+        print("FUS version              : ", end="")
+        dump_version(1)
+        print("FUS memory size          : ", end="")
+        dump_memory_size(2)
+        print("FUS info                 : 0x%08x" % get_ipcc_table_word(TABLE_DEVICE_INFO, 3))
+        print("wireless stack version   : ", end="")
+        dump_version(4)
+        print("wireless stack mem size  : ", end="")
+        dump_memory_size(5)
+        print("wireless stack info      : 0x%08x" % get_ipcc_table_word(TABLE_DEVICE_INFO, 7))
+        print("wireless reserved        : 0x%08x" % get_ipcc_table_word(TABLE_DEVICE_INFO, 7))
+
+
+def ipcc_state():
+    print("IPCC:")
+    print("  C1CR:     0x%08x" % (mem32[stm.IPCC + stm.IPCC_C1CR] & 0xFFFFFFFF), end="")
+    print("  C2CR:     0x%08x" % (mem32[stm.IPCC + stm.IPCC_C2CR] & 0xFFFFFFFF))
+    print("  C1MR:     0x%08x" % (mem32[stm.IPCC + stm.IPCC_C1MR] & 0xFFFFFFFF), end="")
+    print("  C2MR:     0x%08x" % (mem32[stm.IPCC + stm.IPCC_C2MR] & 0xFFFFFFFF))
+    # these always read 0
+    # print('  C1SCR:    0x%08x' % (mem32[stm.IPCC + stm.IPCC_C1SCR] & 0xffffffff), end='')
+    # print('  C2SCR:    0x%08x' % (mem32[stm.IPCC + stm.IPCC_C2SCR] & 0xffffffff))
+    print("  C1TOC2SR: 0x%08x" % (mem32[stm.IPCC + stm.IPCC_C1TOC2SR] & 0xFFFFFFFF), end="")
+    print("  C2TOC1SR: 0x%08x" % (mem32[stm.IPCC + stm.IPCC_C2TOC1SR] & 0xFFFFFFFF))
+
+
+sram2a_dump(264)
+ipcc_init()
+info()
+dev_info()

From 5f50568b1f7ab4f917b8d782d643ac55612910dd Mon Sep 17 00:00:00 2001
From: Albort Xue <yao.xue@nxp.com>
Date: Tue, 7 Apr 2020 15:54:01 +0800
Subject: [PATCH 0269/3533] mimxrt/boards: Add MIMXRT1064_EVK board.

---
 ports/mimxrt/Makefile                         |   2 +-
 ports/mimxrt/boards/MIMXRT1064.ld             |   8 +
 .../evkmimxrt1064_flexspi_nor_config.h        | 268 ++++++++++++++++++
 .../boards/MIMXRT1064_EVK/flash_config.c      |  49 ++++
 .../boards/MIMXRT1064_EVK/mpconfigboard.h     |   8 +
 .../boards/MIMXRT1064_EVK/mpconfigboard.mk    |   9 +
 ports/mimxrt/boards/MIMXRT1064_EVK/pins.c     |  33 +++
 ports/mimxrt/boards/MIMXRT1064_EVK/pins.h     |  30 ++
 8 files changed, 406 insertions(+), 1 deletion(-)
 create mode 100644 ports/mimxrt/boards/MIMXRT1064.ld
 create mode 100644 ports/mimxrt/boards/MIMXRT1064_EVK/evkmimxrt1064_flexspi_nor_config.h
 create mode 100644 ports/mimxrt/boards/MIMXRT1064_EVK/flash_config.c
 create mode 100644 ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.h
 create mode 100644 ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.mk
 create mode 100644 ports/mimxrt/boards/MIMXRT1064_EVK/pins.c
 create mode 100644 ports/mimxrt/boards/MIMXRT1064_EVK/pins.h

diff --git a/ports/mimxrt/Makefile b/ports/mimxrt/Makefile
index c4ea70128e0ad..85e77b978e9f0 100644
--- a/ports/mimxrt/Makefile
+++ b/ports/mimxrt/Makefile
@@ -40,7 +40,7 @@ INC += -I$(TOP)/lib/tinyusb/hw
 INC += -I$(TOP)/lib/tinyusb/hw/bsp/teensy_40
 
 CFLAGS_MCU = -mtune=cortex-m7 -mcpu=cortex-m7 -mfloat-abi=hard -mfpu=fpv5-d16
-CFLAGS = $(INC) -Wall -Werror -Wdouble-promotion -Wfloat-conversion -std=c99 -nostdlib -mthumb $(CFLAGS_MCU)
+CFLAGS += $(INC) -Wall -Werror -Wdouble-promotion -Wfloat-conversion -std=c99 -nostdlib -mthumb $(CFLAGS_MCU)
 CFLAGS += -DCPU_$(MCU_SERIES) -DCPU_$(MCU_VARIANT)
 CFLAGS += -DXIP_EXTERNAL_FLASH=1 \
 	-DXIP_BOOT_HEADER_ENABLE=1 \
diff --git a/ports/mimxrt/boards/MIMXRT1064.ld b/ports/mimxrt/boards/MIMXRT1064.ld
new file mode 100644
index 0000000000000..bf37c21802581
--- /dev/null
+++ b/ports/mimxrt/boards/MIMXRT1064.ld
@@ -0,0 +1,8 @@
+/* 24kiB stack. */
+__stack_size__ = 0x6000;
+_estack = __StackTop;
+_sstack = __StackLimit;
+
+/* Use second OCRAM bank for GC heap. */
+_gc_heap_start = ORIGIN(m_data2);
+_gc_heap_end = ORIGIN(m_data2) + LENGTH(m_data2);
\ No newline at end of file
diff --git a/ports/mimxrt/boards/MIMXRT1064_EVK/evkmimxrt1064_flexspi_nor_config.h b/ports/mimxrt/boards/MIMXRT1064_EVK/evkmimxrt1064_flexspi_nor_config.h
new file mode 100644
index 0000000000000..efdfe583fb82c
--- /dev/null
+++ b/ports/mimxrt/boards/MIMXRT1064_EVK/evkmimxrt1064_flexspi_nor_config.h
@@ -0,0 +1,268 @@
+/*
+ * Copyright 2018 NXP
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#ifndef __EVKMIMXRT1064_FLEXSPI_NOR_CONFIG__
+#define __EVKMIMXRT1064_FLEXSPI_NOR_CONFIG__
+
+#include <stdint.h>
+#include <stdbool.h>
+#include "fsl_common.h"
+
+/*! @name Driver version */
+/*@{*/
+/*! @brief XIP_BOARD driver version 2.0.0. */
+#define FSL_XIP_BOARD_DRIVER_VERSION (MAKE_VERSION(2, 0, 0))
+/*@}*/
+
+/* FLEXSPI memory config block related defintions */
+#define FLEXSPI_CFG_BLK_TAG (0x42464346UL)     // ascii "FCFB" Big Endian
+#define FLEXSPI_CFG_BLK_VERSION (0x56010400UL) // V1.4.0
+#define FLEXSPI_CFG_BLK_SIZE (512)
+
+/* FLEXSPI Feature related definitions */
+#define FLEXSPI_FEATURE_HAS_PARALLEL_MODE 1
+
+/* Lookup table related defintions */
+#define CMD_INDEX_READ 0
+#define CMD_INDEX_READSTATUS 1
+#define CMD_INDEX_WRITEENABLE 2
+#define CMD_INDEX_WRITE 4
+
+#define CMD_LUT_SEQ_IDX_READ 0
+#define CMD_LUT_SEQ_IDX_READSTATUS 1
+#define CMD_LUT_SEQ_IDX_WRITEENABLE 3
+#define CMD_LUT_SEQ_IDX_WRITE 9
+
+#define CMD_SDR 0x01
+#define CMD_DDR 0x21
+#define RADDR_SDR 0x02
+#define RADDR_DDR 0x22
+#define CADDR_SDR 0x03
+#define CADDR_DDR 0x23
+#define MODE1_SDR 0x04
+#define MODE1_DDR 0x24
+#define MODE2_SDR 0x05
+#define MODE2_DDR 0x25
+#define MODE4_SDR 0x06
+#define MODE4_DDR 0x26
+#define MODE8_SDR 0x07
+#define MODE8_DDR 0x27
+#define WRITE_SDR 0x08
+#define WRITE_DDR 0x28
+#define READ_SDR 0x09
+#define READ_DDR 0x29
+#define LEARN_SDR 0x0A
+#define LEARN_DDR 0x2A
+#define DATSZ_SDR 0x0B
+#define DATSZ_DDR 0x2B
+#define DUMMY_SDR 0x0C
+#define DUMMY_DDR 0x2C
+#define DUMMY_RWDS_SDR 0x0D
+#define DUMMY_RWDS_DDR 0x2D
+#define JMP_ON_CS 0x1F
+#define STOP 0
+
+#define FLEXSPI_1PAD 0
+#define FLEXSPI_2PAD 1
+#define FLEXSPI_4PAD 2
+#define FLEXSPI_8PAD 3
+
+#define FLEXSPI_LUT_SEQ(cmd0, pad0, op0, cmd1, pad1, op1)                                                              \
+    (FLEXSPI_LUT_OPERAND0(op0) | FLEXSPI_LUT_NUM_PADS0(pad0) | FLEXSPI_LUT_OPCODE0(cmd0) | FLEXSPI_LUT_OPERAND1(op1) | \
+     FLEXSPI_LUT_NUM_PADS1(pad1) | FLEXSPI_LUT_OPCODE1(cmd1))
+
+//!@brief Definitions for FlexSPI Serial Clock Frequency
+typedef enum _FlexSpiSerialClockFreq
+{
+    kFlexSpiSerialClk_30MHz  = 1,
+    kFlexSpiSerialClk_50MHz  = 2,
+    kFlexSpiSerialClk_60MHz  = 3,
+    kFlexSpiSerialClk_75MHz  = 4,
+    kFlexSpiSerialClk_80MHz  = 5,
+    kFlexSpiSerialClk_100MHz = 6,
+    kFlexSpiSerialClk_120MHz = 7,
+    kFlexSpiSerialClk_133MHz = 8,
+    kFlexSpiSerialClk_166MHz = 9,
+} flexspi_serial_clk_freq_t;
+
+//!@brief FlexSPI clock configuration type
+enum
+{
+    kFlexSpiClk_SDR, //!< Clock configure for SDR mode
+    kFlexSpiClk_DDR, //!< Clock configurat for DDR mode
+};
+
+//!@brief FlexSPI Read Sample Clock Source definition
+typedef enum _FlashReadSampleClkSource
+{
+    kFlexSPIReadSampleClk_LoopbackInternally      = 0,
+    kFlexSPIReadSampleClk_LoopbackFromDqsPad      = 1,
+    kFlexSPIReadSampleClk_LoopbackFromSckPad      = 2,
+    kFlexSPIReadSampleClk_ExternalInputFromDqsPad = 3,
+} flexspi_read_sample_clk_t;
+
+//!@brief Misc feature bit definitions
+enum
+{
+    kFlexSpiMiscOffset_DiffClkEnable            = 0, //!< Bit for Differential clock enable
+    kFlexSpiMiscOffset_Ck2Enable                = 1, //!< Bit for CK2 enable
+    kFlexSpiMiscOffset_ParallelEnable           = 2, //!< Bit for Parallel mode enable
+    kFlexSpiMiscOffset_WordAddressableEnable    = 3, //!< Bit for Word Addressable enable
+    kFlexSpiMiscOffset_SafeConfigFreqEnable     = 4, //!< Bit for Safe Configuration Frequency enable
+    kFlexSpiMiscOffset_PadSettingOverrideEnable = 5, //!< Bit for Pad setting override enable
+    kFlexSpiMiscOffset_DdrModeEnable            = 6, //!< Bit for DDR clock confiuration indication.
+};
+
+//!@brief Flash Type Definition
+enum
+{
+    kFlexSpiDeviceType_SerialNOR    = 1,    //!< Flash devices are Serial NOR
+    kFlexSpiDeviceType_SerialNAND   = 2,    //!< Flash devices are Serial NAND
+    kFlexSpiDeviceType_SerialRAM    = 3,    //!< Flash devices are Serial RAM/HyperFLASH
+    kFlexSpiDeviceType_MCP_NOR_NAND = 0x12, //!< Flash device is MCP device, A1 is Serial NOR, A2 is Serial NAND
+    kFlexSpiDeviceType_MCP_NOR_RAM  = 0x13, //!< Flash deivce is MCP device, A1 is Serial NOR, A2 is Serial RAMs
+};
+
+//!@brief Flash Pad Definitions
+enum
+{
+    kSerialFlash_1Pad  = 1,
+    kSerialFlash_2Pads = 2,
+    kSerialFlash_4Pads = 4,
+    kSerialFlash_8Pads = 8,
+};
+
+//!@brief FlexSPI LUT Sequence structure
+typedef struct _lut_sequence
+{
+    uint8_t seqNum; //!< Sequence Number, valid number: 1-16
+    uint8_t seqId;  //!< Sequence Index, valid number: 0-15
+    uint16_t reserved;
+} flexspi_lut_seq_t;
+
+//!@brief Flash Configuration Command Type
+enum
+{
+    kDeviceConfigCmdType_Generic,    //!< Generic command, for example: configure dummy cycles, drive strength, etc
+    kDeviceConfigCmdType_QuadEnable, //!< Quad Enable command
+    kDeviceConfigCmdType_Spi2Xpi,    //!< Switch from SPI to DPI/QPI/OPI mode
+    kDeviceConfigCmdType_Xpi2Spi,    //!< Switch from DPI/QPI/OPI to SPI mode
+    kDeviceConfigCmdType_Spi2NoCmd,  //!< Switch to 0-4-4/0-8-8 mode
+    kDeviceConfigCmdType_Reset,      //!< Reset device command
+};
+
+//!@brief FlexSPI Memory Configuration Block
+typedef struct _FlexSPIConfig
+{
+    uint32_t tag;               //!< [0x000-0x003] Tag, fixed value 0x42464346UL
+    uint32_t version;           //!< [0x004-0x007] Version,[31:24] -'V', [23:16] - Major, [15:8] - Minor, [7:0] - bugfix
+    uint32_t reserved0;         //!< [0x008-0x00b] Reserved for future use
+    uint8_t readSampleClkSrc;   //!< [0x00c-0x00c] Read Sample Clock Source, valid value: 0/1/3
+    uint8_t csHoldTime;         //!< [0x00d-0x00d] CS hold time, default value: 3
+    uint8_t csSetupTime;        //!< [0x00e-0x00e] CS setup time, default value: 3
+    uint8_t columnAddressWidth; //!< [0x00f-0x00f] Column Address with, for HyperBus protocol, it is fixed to 3, For
+    //! Serial NAND, need to refer to datasheet
+    uint8_t deviceModeCfgEnable; //!< [0x010-0x010] Device Mode Configure enable flag, 1 - Enable, 0 - Disable
+    uint8_t deviceModeType; //!< [0x011-0x011] Specify the configuration command type:Quad Enable, DPI/QPI/OPI switch,
+    //! Generic configuration, etc.
+    uint16_t waitTimeCfgCommands; //!< [0x012-0x013] Wait time for all configuration commands, unit: 100us, Used for
+    //! DPI/QPI/OPI switch or reset command
+    flexspi_lut_seq_t deviceModeSeq; //!< [0x014-0x017] Device mode sequence info, [7:0] - LUT sequence id, [15:8] - LUt
+    //! sequence number, [31:16] Reserved
+    uint32_t deviceModeArg;    //!< [0x018-0x01b] Argument/Parameter for device configuration
+    uint8_t configCmdEnable;   //!< [0x01c-0x01c] Configure command Enable Flag, 1 - Enable, 0 - Disable
+    uint8_t configModeType[3]; //!< [0x01d-0x01f] Configure Mode Type, similar as deviceModeTpe
+    flexspi_lut_seq_t
+        configCmdSeqs[3]; //!< [0x020-0x02b] Sequence info for Device Configuration command, similar as deviceModeSeq
+    uint32_t reserved1;   //!< [0x02c-0x02f] Reserved for future use
+    uint32_t configCmdArgs[3];     //!< [0x030-0x03b] Arguments/Parameters for device Configuration commands
+    uint32_t reserved2;            //!< [0x03c-0x03f] Reserved for future use
+    uint32_t controllerMiscOption; //!< [0x040-0x043] Controller Misc Options, see Misc feature bit definitions for more
+    //! details
+    uint8_t deviceType;    //!< [0x044-0x044] Device Type:  See Flash Type Definition for more details
+    uint8_t sflashPadType; //!< [0x045-0x045] Serial Flash Pad Type: 1 - Single, 2 - Dual, 4 - Quad, 8 - Octal
+    uint8_t serialClkFreq; //!< [0x046-0x046] Serial Flash Frequencey, device specific definitions, See System Boot
+    //! Chapter for more details
+    uint8_t lutCustomSeqEnable; //!< [0x047-0x047] LUT customization Enable, it is required if the program/erase cannot
+    //! be done using 1 LUT sequence, currently, only applicable to HyperFLASH
+    uint32_t reserved3[2];           //!< [0x048-0x04f] Reserved for future use
+    uint32_t sflashA1Size;           //!< [0x050-0x053] Size of Flash connected to A1
+    uint32_t sflashA2Size;           //!< [0x054-0x057] Size of Flash connected to A2
+    uint32_t sflashB1Size;           //!< [0x058-0x05b] Size of Flash connected to B1
+    uint32_t sflashB2Size;           //!< [0x05c-0x05f] Size of Flash connected to B2
+    uint32_t csPadSettingOverride;   //!< [0x060-0x063] CS pad setting override value
+    uint32_t sclkPadSettingOverride; //!< [0x064-0x067] SCK pad setting override value
+    uint32_t dataPadSettingOverride; //!< [0x068-0x06b] data pad setting override value
+    uint32_t dqsPadSettingOverride;  //!< [0x06c-0x06f] DQS pad setting override value
+    uint32_t timeoutInMs;            //!< [0x070-0x073] Timeout threshold for read status command
+    uint32_t commandInterval;        //!< [0x074-0x077] CS deselect interval between two commands
+    uint16_t dataValidTime[2]; //!< [0x078-0x07b] CLK edge to data valid time for PORT A and PORT B, in terms of 0.1ns
+    uint16_t busyOffset;       //!< [0x07c-0x07d] Busy offset, valid value: 0-31
+    uint16_t busyBitPolarity;  //!< [0x07e-0x07f] Busy flag polarity, 0 - busy flag is 1 when flash device is busy, 1 -
+    //! busy flag is 0 when flash device is busy
+    uint32_t lookupTable[64];           //!< [0x080-0x17f] Lookup table holds Flash command sequences
+    flexspi_lut_seq_t lutCustomSeq[12]; //!< [0x180-0x1af] Customizable LUT Sequences
+    uint32_t reserved4[4];              //!< [0x1b0-0x1bf] Reserved for future use
+} flexspi_mem_config_t;
+
+/*  */
+#define NOR_CMD_INDEX_READ CMD_INDEX_READ               //!< 0
+#define NOR_CMD_INDEX_READSTATUS CMD_INDEX_READSTATUS   //!< 1
+#define NOR_CMD_INDEX_WRITEENABLE CMD_INDEX_WRITEENABLE //!< 2
+#define NOR_CMD_INDEX_ERASESECTOR 3                     //!< 3
+#define NOR_CMD_INDEX_PAGEPROGRAM CMD_INDEX_WRITE       //!< 4
+#define NOR_CMD_INDEX_CHIPERASE 5                       //!< 5
+#define NOR_CMD_INDEX_DUMMY 6                           //!< 6
+#define NOR_CMD_INDEX_ERASEBLOCK 7                      //!< 7
+
+#define NOR_CMD_LUT_SEQ_IDX_READ CMD_LUT_SEQ_IDX_READ //!< 0  READ LUT sequence id in lookupTable stored in config block
+#define NOR_CMD_LUT_SEQ_IDX_READSTATUS \
+    CMD_LUT_SEQ_IDX_READSTATUS //!< 1  Read Status LUT sequence id in lookupTable stored in config block
+#define NOR_CMD_LUT_SEQ_IDX_READSTATUS_XPI \
+    2 //!< 2  Read status DPI/QPI/OPI sequence id in lookupTable stored in config block
+#define NOR_CMD_LUT_SEQ_IDX_WRITEENABLE \
+    CMD_LUT_SEQ_IDX_WRITEENABLE //!< 3  Write Enable sequence id in lookupTable stored in config block
+#define NOR_CMD_LUT_SEQ_IDX_WRITEENABLE_XPI \
+    4 //!< 4  Write Enable DPI/QPI/OPI sequence id in lookupTable stored in config block
+#define NOR_CMD_LUT_SEQ_IDX_ERASESECTOR 5 //!< 5  Erase Sector sequence id in lookupTable stored in config block
+#define NOR_CMD_LUT_SEQ_IDX_ERASEBLOCK 8  //!< 8 Erase Block sequence id in lookupTable stored in config block
+#define NOR_CMD_LUT_SEQ_IDX_PAGEPROGRAM \
+    CMD_LUT_SEQ_IDX_WRITE                //!< 9  Program sequence id in lookupTable stored in config block
+#define NOR_CMD_LUT_SEQ_IDX_CHIPERASE 11 //!< 11 Chip Erase sequence in lookupTable id stored in config block
+#define NOR_CMD_LUT_SEQ_IDX_READ_SFDP 13 //!< 13 Read SFDP sequence in lookupTable id stored in config block
+#define NOR_CMD_LUT_SEQ_IDX_RESTORE_NOCMD \
+    14 //!< 14 Restore 0-4-4/0-8-8 mode sequence id in lookupTable stored in config block
+#define NOR_CMD_LUT_SEQ_IDX_EXIT_NOCMD \
+    15 //!< 15 Exit 0-4-4/0-8-8 mode sequence id in lookupTable stored in config blobk
+
+/*
+ *  Serial NOR configuration block
+ */
+typedef struct _flexspi_nor_config
+{
+    flexspi_mem_config_t memConfig; //!< Common memory configuration info via FlexSPI
+    uint32_t pageSize;              //!< Page size of Serial NOR
+    uint32_t sectorSize;            //!< Sector size of Serial NOR
+    uint8_t ipcmdSerialClkFreq;     //!< Clock frequency for IP command
+    uint8_t isUniformBlockSize;     //!< Sector/Block size is the same
+    uint8_t reserved0[2];           //!< Reserved for future use
+    uint8_t serialNorType;          //!< Serial NOR Flash type: 0/1/2/3
+    uint8_t needExitNoCmdMode;      //!< Need to exit NoCmd mode before other IP command
+    uint8_t halfClkForNonReadCmd;   //!< Half the Serial Clock for non-read command: true/false
+    uint8_t needRestoreNoCmdMode;   //!< Need to Restore NoCmd mode after IP commmand execution
+    uint32_t blockSize;             //!< Block size
+    uint32_t reserve2[11];          //!< Reserved for future use
+} flexspi_nor_config_t;
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* __EVKMIMXRT1064_FLEXSPI_NOR_CONFIG__ */
diff --git a/ports/mimxrt/boards/MIMXRT1064_EVK/flash_config.c b/ports/mimxrt/boards/MIMXRT1064_EVK/flash_config.c
new file mode 100644
index 0000000000000..bfb1c2d59aa25
--- /dev/null
+++ b/ports/mimxrt/boards/MIMXRT1064_EVK/flash_config.c
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2018 NXP
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#include "evkmimxrt1064_flexspi_nor_config.h"
+
+/* Component ID definition, used by tools. */
+#ifndef FSL_COMPONENT_ID
+#define FSL_COMPONENT_ID "platform.drivers.xip_board"
+#endif
+
+/*******************************************************************************
+ * Code
+ ******************************************************************************/
+#if defined(XIP_BOOT_HEADER_ENABLE) && (XIP_BOOT_HEADER_ENABLE == 1)
+#if defined(__CC_ARM) || defined(__ARMCC_VERSION) || defined(__GNUC__)
+__attribute__((section(".boot_hdr.conf")))
+#elif defined(__ICCARM__)
+#pragma location = ".boot_hdr.conf"
+#endif
+
+const flexspi_nor_config_t qspiflash_config = {
+    .memConfig =
+        {
+            .tag              = FLEXSPI_CFG_BLK_TAG,
+            .version          = FLEXSPI_CFG_BLK_VERSION,
+            .readSampleClkSrc = kFlexSPIReadSampleClk_LoopbackFromDqsPad,
+            .csHoldTime       = 3u,
+            .csSetupTime      = 3u,
+            // Enable DDR mode, Wordaddassable, Safe configuration, Differential clock
+            .sflashPadType = kSerialFlash_4Pads,
+            .serialClkFreq = kFlexSpiSerialClk_100MHz,
+            .sflashA1Size  = 8u * 1024u * 1024u,
+            .lookupTable =
+                {
+                    // Read LUTs
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0xEB, RADDR_SDR, FLEXSPI_4PAD, 0x18),
+                    FLEXSPI_LUT_SEQ(DUMMY_SDR, FLEXSPI_4PAD, 0x06, READ_SDR, FLEXSPI_4PAD, 0x04),
+                },
+        },
+    .pageSize           = 256u,
+    .sectorSize         = 4u * 1024u,
+    .blockSize          = 256u * 1024u,
+    .isUniformBlockSize = false,
+};
+#endif /* XIP_BOOT_HEADER_ENABLE */
diff --git a/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.h b/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.h
new file mode 100644
index 0000000000000..e05c8824d26ce
--- /dev/null
+++ b/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.h
@@ -0,0 +1,8 @@
+#define MICROPY_HW_BOARD_NAME "i.MX RT1064 EVK"
+#define MICROPY_HW_MCU_NAME   "MIMXRT1064DVL6A"
+
+
+// MIMXRT1064_EVK has 1 user LED
+#define MICROPY_HW_LED1_PIN (GPIO_AD_B0_09)
+#define MICROPY_HW_LED_ON(pin) (mp_hal_pin_low(pin))
+#define MICROPY_HW_LED_OFF(pin) (mp_hal_pin_high(pin))
diff --git a/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.mk b/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.mk
new file mode 100644
index 0000000000000..700988919146d
--- /dev/null
+++ b/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.mk
@@ -0,0 +1,9 @@
+MCU_SERIES = MIMXRT1064
+MCU_VARIANT = MIMXRT1064DVL6A
+
+JLINK_PATH ?= /media/RT1064-EVK/
+
+CFLAGS += -DBOARD_FLASH_SIZE=0x400000
+
+deploy: $(BUILD)/firmware.bin
+	cp $< $(JLINK_PATH)
diff --git a/ports/mimxrt/boards/MIMXRT1064_EVK/pins.c b/ports/mimxrt/boards/MIMXRT1064_EVK/pins.c
new file mode 100644
index 0000000000000..d5da9c6f99275
--- /dev/null
+++ b/ports/mimxrt/boards/MIMXRT1064_EVK/pins.c
@@ -0,0 +1,33 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 NXP
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "pin.h"
+
+static pin_af_obj_t GPIO_AD_B0_09_af[] = {
+    PIN_AF(GPIO1_IO09, PIN_AF_MODE_ALT5, GPIO1, 0x10B0U),
+};
+
+pin_obj_t GPIO_AD_B0_09 = PIN(GPIO_AD_B0_09, GPIO1, 9, GPIO_AD_B0_09_af);
diff --git a/ports/mimxrt/boards/MIMXRT1064_EVK/pins.h b/ports/mimxrt/boards/MIMXRT1064_EVK/pins.h
new file mode 100644
index 0000000000000..baef51c6c8612
--- /dev/null
+++ b/ports/mimxrt/boards/MIMXRT1064_EVK/pins.h
@@ -0,0 +1,30 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 NXP
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+// NOTE: pins.h shall only be included in in pin.h
+// hence no include guards are needed since they will be provided by pin.h
+
+extern pin_obj_t GPIO_AD_B0_09;

From 4f2fe346239b6b3f720708021c868a88d97bb16d Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 4 Sep 2020 16:12:09 +1000
Subject: [PATCH 0270/3533] tools/mpy-tool.py: Fix merge of multiple mpy files
 to POP_TOP correctly.

MP_BC_CALL_FUNCTION will leave the result on the Python stack, so that
result must be discarded by MP_BC_POP_TOP.

Signed-off-by: Damien George <damien@micropython.org>
---
 tools/mpy-tool.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/mpy-tool.py b/tools/mpy-tool.py
index 1ac6c93d7d8b2..de7cfe5d631c7 100755
--- a/tools/mpy-tool.py
+++ b/tools/mpy-tool.py
@@ -938,7 +938,7 @@ def merge_mpy(raw_codes, output_file):
         merged_mpy.extend(header)
 
         bytecode = bytearray()
-        bytecode_len = 6 + len(raw_codes) * 4 + 2
+        bytecode_len = 6 + len(raw_codes) * 5 + 2
         bytecode.append(bytecode_len << 2)  # kind and length
         bytecode.append(0b00000000)  # signature prelude
         bytecode.append(0b00001000)  # size prelude
@@ -947,7 +947,7 @@ def merge_mpy(raw_codes, output_file):
         for idx in range(len(raw_codes)):
             bytecode.append(0x32)  # MP_BC_MAKE_FUNCTION
             bytecode.append(idx)  # index raw code
-            bytecode.extend(b"\x34\x00")  # MP_BC_CALL_FUNCTION, 0 args
+            bytecode.extend(b"\x34\x00\x59")  # MP_BC_CALL_FUNCTION, 0 args, MP_BC_POP_TOP
         bytecode.extend(b"\x51\x63")  # MP_BC_LOAD_NONE, MP_BC_RETURN_VALUE
 
         bytecode.append(0)  # n_obj

From 75344af4cada48b8b044ae35d0e62c38c601d899 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 8 Sep 2020 13:52:13 +1000
Subject: [PATCH 0271/3533] nrf/main: Make mp_builtin_open signature match that
 in py/builtin.h.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/nrf/main.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ports/nrf/main.c b/ports/nrf/main.c
index 670c88e7cad9d..86ba83342b9f3 100644
--- a/ports/nrf/main.c
+++ b/ports/nrf/main.c
@@ -280,10 +280,10 @@ mp_import_stat_t mp_import_stat(const char *path) {
     return uos_mbfs_import_stat(path);
 }
 
-STATIC mp_obj_t mp_builtin_open(size_t n_args, const mp_obj_t *args) {
+mp_obj_t mp_builtin_open(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs) {
     return uos_mbfs_open(n_args, args);
 }
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_builtin_open_obj, 1, 2, mp_builtin_open);
+MP_DEFINE_CONST_FUN_OBJ_KW(mp_builtin_open_obj, 1, mp_builtin_open);
 
 #else
 // use dummy functions - no filesystem available
@@ -295,7 +295,7 @@ mp_import_stat_t mp_import_stat(const char *path) {
     return MP_IMPORT_STAT_NO_EXIST;
 }
 
-STATIC mp_obj_t mp_builtin_open(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs) {
+mp_obj_t mp_builtin_open(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs) {
     mp_raise_OSError(MP_EPERM);
 }
 MP_DEFINE_CONST_FUN_OBJ_KW(mp_builtin_open_obj, 1, mp_builtin_open);

From 27e117307d7d5b63955940866e6094bedb7d299e Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 8 Sep 2020 13:52:56 +1000
Subject: [PATCH 0272/3533] nrf: Remove unnecessary includes of mpconfigport.h
 and its header guard.

The mpconfigport.h file is an internal header and should only ever be
included once by mpconfig.h.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/nrf/drivers/bluetooth/ble_drv.c | 1 -
 ports/nrf/modules/uos/microbitfs.c    | 1 -
 ports/nrf/mpconfigport.h              | 5 -----
 3 files changed, 7 deletions(-)

diff --git a/ports/nrf/drivers/bluetooth/ble_drv.c b/ports/nrf/drivers/bluetooth/ble_drv.c
index 1a64cdfbd24b9..3a15025cb4978 100644
--- a/ports/nrf/drivers/bluetooth/ble_drv.c
+++ b/ports/nrf/drivers/bluetooth/ble_drv.c
@@ -32,7 +32,6 @@
 
 #include "py/runtime.h"
 #include "ble_drv.h"
-#include "mpconfigport.h"
 #include "nrf_sdm.h"
 #include "ble_gap.h"
 #include "ble.h" // sd_ble_uuid_encode
diff --git a/ports/nrf/modules/uos/microbitfs.c b/ports/nrf/modules/uos/microbitfs.c
index 7f16372cf2224..e8628f4945c20 100644
--- a/ports/nrf/modules/uos/microbitfs.c
+++ b/ports/nrf/modules/uos/microbitfs.c
@@ -36,7 +36,6 @@
 #include "py/stream.h"
 #include "py/runtime.h"
 #include "extmod/vfs.h"
-#include "mpconfigport.h"
 
 #if MICROPY_MBFS
 
diff --git a/ports/nrf/mpconfigport.h b/ports/nrf/mpconfigport.h
index 1197df016cce9..76bb6d7bdf0df 100644
--- a/ports/nrf/mpconfigport.h
+++ b/ports/nrf/mpconfigport.h
@@ -24,9 +24,6 @@
  * THE SOFTWARE.
  */
 
-#ifndef NRF5_MPCONFIGPORT_H__
-#define NRF5_MPCONFIGPORT_H__
-
 #include <mpconfigboard.h>
 
 #if defined(NRF51822)
@@ -342,5 +339,3 @@ extern const struct _mp_obj_module_t ble_module;
 #include <alloca.h>
 
 #define MICROPY_PIN_DEFS_PORT_H "pin_defs_nrf5.h"
-
-#endif

From 547688c58cce3436082cc9338929c2699410c0e1 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 10 Sep 2020 20:43:07 +1000
Subject: [PATCH 0273/3533] stm32/usb: Don't nul pyb_hid_report_desc if
 MICROPY_HW_USB_HID disabled.

So this code can be used if pyb_hid_report_desc is not included in the
port's root pointer list.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/usb.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ports/stm32/usb.c b/ports/stm32/usb.c
index 657d4cb6e7402..968b2999ced37 100644
--- a/ports/stm32/usb.c
+++ b/ports/stm32/usb.c
@@ -221,7 +221,9 @@ void pyb_usb_init0(void) {
     for (int i = 0; i < MICROPY_HW_USB_CDC_NUM; ++i) {
         usb_device.usbd_cdc_itf[i].attached_to_repl = false;
     }
+    #if MICROPY_HW_USB_HID
     MP_STATE_PORT(pyb_hid_report_desc) = MP_OBJ_NULL;
+    #endif
 
     pyb_usb_vcp_init0();
 }

From 709398daae14b3630de7050e08b9e77ea1232716 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 10 Sep 2020 20:46:40 +1000
Subject: [PATCH 0274/3533] stm32/rtc.h: Include py/obj.h to make header self
 contained.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/rtc.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ports/stm32/rtc.h b/ports/stm32/rtc.h
index d3840c1b73592..5c454b3e3937f 100644
--- a/ports/stm32/rtc.h
+++ b/ports/stm32/rtc.h
@@ -26,6 +26,8 @@
 #ifndef MICROPY_INCLUDED_STM32_RTC_H
 #define MICROPY_INCLUDED_STM32_RTC_H
 
+#include "py/obj.h"
+
 extern RTC_HandleTypeDef RTCHandle;
 extern const mp_obj_type_t pyb_rtc_type;
 

From 8d5a40c86e384bf3cddb2f687374e0bb1ae6df7d Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 4 Sep 2020 11:04:46 +1000
Subject: [PATCH 0275/3533] py/objfloat: Fix handling of negative float to
 power of nan.

Prior to this commit, pow(-2, float('nan')) would return (nan+nanj), or
raise an exception on targets that don't support complex numbers.  This is
fixed to return simply nan, as CPython does.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/objfloat.c                |  2 +-
 tests/float/inf_nan_arith.py | 20 ++++++++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 tests/float/inf_nan_arith.py

diff --git a/py/objfloat.c b/py/objfloat.c
index 09b73c8cda525..f1e401eccecfe 100644
--- a/py/objfloat.c
+++ b/py/objfloat.c
@@ -293,7 +293,7 @@ mp_obj_t mp_obj_float_binary_op(mp_binary_op_t op, mp_float_t lhs_val, mp_obj_t
             if (lhs_val == 0 && rhs_val < 0 && !isinf(rhs_val)) {
                 goto zero_division_error;
             }
-            if (lhs_val < 0 && rhs_val != MICROPY_FLOAT_C_FUN(floor)(rhs_val)) {
+            if (lhs_val < 0 && rhs_val != MICROPY_FLOAT_C_FUN(floor)(rhs_val) && !isnan(rhs_val)) {
                 #if MICROPY_PY_BUILTINS_COMPLEX
                 return mp_obj_complex_binary_op(MP_BINARY_OP_POWER, lhs_val, 0, rhs_in);
                 #else
diff --git a/tests/float/inf_nan_arith.py b/tests/float/inf_nan_arith.py
new file mode 100644
index 0000000000000..c27e38bc520be
--- /dev/null
+++ b/tests/float/inf_nan_arith.py
@@ -0,0 +1,20 @@
+# Test behaviour of inf and nan in basic float operations
+
+inf = float("inf")
+nan = float("nan")
+
+values = (-2, -1, 0, 1, 2, inf, nan)
+
+for x in values:
+    for y in values:
+        print(x, y)
+        print("  + - *", x + y, x - y, x * y)
+        try:
+            print("  /", x / y)
+        except ZeroDivisionError:
+            print("  / ZeroDivisionError")
+        try:
+            print("  ** pow", x ** y, pow(x, y))
+        except ZeroDivisionError:
+            print("  ** pow ZeroDivisionError")
+        print("  == != < <= > >=", x == y, x != y, x < y, x <= y, x > y, x >= y)

From 2e54d9d146b34d7ad00e4394c9767f4319244cdf Mon Sep 17 00:00:00 2001
From: stijn <stijn@ignitron.net>
Date: Tue, 8 Sep 2020 15:22:34 +0200
Subject: [PATCH 0276/3533] py: Fix handling of NaN in certain pow
 implementations.

Adds a new compile-time option MICROPY_PY_MATH_POW_FIX_NAN for use with
toolchains that don't handle pow-of-NaN correctly.
---
 ports/windows/mpconfigport.h |  2 ++
 py/modmath.c                 | 12 ++++++++++++
 py/mpconfig.h                |  5 +++++
 py/objfloat.c                |  6 ++++++
 tests/float/math_domain.py   |  2 +-
 5 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/ports/windows/mpconfigport.h b/ports/windows/mpconfigport.h
index 30389c700eac3..faf10752ee203 100644
--- a/ports/windows/mpconfigport.h
+++ b/ports/windows/mpconfigport.h
@@ -236,6 +236,8 @@ extern const struct _mp_obj_module_t mp_module_time;
 #define MICROPY_PY_MATH_FMOD_FIX_INFNAN (1)
 #ifdef _WIN64
 #define MICROPY_PY_MATH_MODF_FIX_NEGZERO (1)
+#else
+#define MICROPY_PY_MATH_POW_FIX_NAN (1)
 #endif
 #endif
 
diff --git a/py/modmath.c b/py/modmath.c
index b312eeb3d2c01..b7948f39e7c91 100644
--- a/py/modmath.c
+++ b/py/modmath.c
@@ -98,7 +98,19 @@ mp_float_t MICROPY_FLOAT_C_FUN(log2)(mp_float_t x) {
 // sqrt(x): returns the square root of x
 MATH_FUN_1(sqrt, sqrt)
 // pow(x, y): returns x to the power of y
+#if MICROPY_PY_MATH_POW_FIX_NAN
+mp_float_t pow_func(mp_float_t x, mp_float_t y) {
+    // pow(base, 0) returns 1 for any base, even when base is NaN
+    // pow(+1, exponent) returns 1 for any exponent, even when exponent is NaN
+    if (x == MICROPY_FLOAT_CONST(1.0) || y == MICROPY_FLOAT_CONST(0.0)) {
+        return MICROPY_FLOAT_CONST(1.0);
+    }
+    return MICROPY_FLOAT_C_FUN(pow)(x, y);
+}
+MATH_FUN_2(pow, pow_func)
+#else
 MATH_FUN_2(pow, pow)
+#endif
 // exp(x)
 MATH_FUN_1(exp, exp)
 #if MICROPY_PY_MATH_SPECIAL_FUNCTIONS
diff --git a/py/mpconfig.h b/py/mpconfig.h
index ae4cabfdcf0f2..12517316c6c80 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -1160,6 +1160,11 @@ typedef double mp_float_t;
 #define MICROPY_PY_MATH_MODF_FIX_NEGZERO (0)
 #endif
 
+// Whether to provide fix for pow(1, NaN) and pow(NaN, 0), which both should be 1 not NaN.
+#ifndef MICROPY_PY_MATH_POW_FIX_NAN
+#define MICROPY_PY_MATH_POW_FIX_NAN (0)
+#endif
+
 // Whether to provide "cmath" module
 #ifndef MICROPY_PY_CMATH
 #define MICROPY_PY_CMATH (0)
diff --git a/py/objfloat.c b/py/objfloat.c
index f1e401eccecfe..451609492e5c1 100644
--- a/py/objfloat.c
+++ b/py/objfloat.c
@@ -300,6 +300,12 @@ mp_obj_t mp_obj_float_binary_op(mp_binary_op_t op, mp_float_t lhs_val, mp_obj_t
                 mp_raise_ValueError(MP_ERROR_TEXT("complex values not supported"));
                 #endif
             }
+            #if MICROPY_PY_MATH_POW_FIX_NAN // Also see modmath.c.
+            if (lhs_val == MICROPY_FLOAT_CONST(1.0) || rhs_val == MICROPY_FLOAT_CONST(0.0)) {
+                lhs_val = MICROPY_FLOAT_CONST(1.0);
+                break;
+            }
+            #endif
             lhs_val = MICROPY_FLOAT_C_FUN(pow)(lhs_val, rhs_val);
             break;
         case MP_BINARY_OP_DIVMOD: {
diff --git a/tests/float/math_domain.py b/tests/float/math_domain.py
index e63628cf5078a..0c25dc08b6649 100644
--- a/tests/float/math_domain.py
+++ b/tests/float/math_domain.py
@@ -38,7 +38,7 @@
 
 # double argument functions
 for name, f, args in (
-    ("pow", math.pow, ((0, 2), (-1, 2), (0, -1), (-1, 2.3))),
+    ("pow", math.pow, ((0, 2), (-1, 2), (0, -1), (-1, 2.3), (nan, 0), (1, nan))),
     ("fmod", math.fmod, ((1.2, inf), (1.2, -inf), (1.2, 0), (inf, 1.2))),
     ("atan2", math.atan2, ((0, 0), (-inf, inf), (-inf, -inf), (inf, -inf))),
     ("copysign", math.copysign, ()),

From 373b400632bb5371f1e259983850814d2384e667 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 4 Sep 2020 00:53:18 +1000
Subject: [PATCH 0277/3533] extmod/modussl_axtls: Reduce size of code that
 makes exception.

Change in code size (for ports that use axtls) is:

   unix x64:  -152 -0.030% [incl -160(data)]
unix nanbox:  -112 -0.025% [incl -96(data)]
    esp8266:   -64 -0.009% GENERIC

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/modussl_axtls.c | 96 ++++++++++++++++++++++++------------------
 1 file changed, 54 insertions(+), 42 deletions(-)

diff --git a/extmod/modussl_axtls.c b/extmod/modussl_axtls.c
index 0b0ce35fc8711..da5941a55b33e 100644
--- a/extmod/modussl_axtls.c
+++ b/extmod/modussl_axtls.c
@@ -55,53 +55,65 @@ struct ssl_args {
 
 STATIC const mp_obj_type_t ussl_socket_type;
 
-// Table of errors
-struct ssl_errs {
-    int16_t errnum;
-    const char *errstr;
+// Table of error strings corresponding to SSL_xxx error codes.
+STATIC const char *const ssl_error_tab1[] = {
+    "NOT_OK",
+    "DEAD",
+    "CLOSE_NOTIFY",
+    "EAGAIN",
 };
-STATIC const struct ssl_errs ssl_error_tab[] = {
-    { SSL_NOT_OK, "NOT_OK" },
-    { SSL_ERROR_DEAD, "DEAD" },
-    { SSL_CLOSE_NOTIFY, "CLOSE_NOTIFY" },
-    { SSL_EAGAIN, "EAGAIN" },
-    { SSL_ERROR_CONN_LOST, "CONN_LOST" },
-    { SSL_ERROR_RECORD_OVERFLOW, "RECORD_OVERFLOW" },
-    { SSL_ERROR_SOCK_SETUP_FAILURE, "SOCK_SETUP_FAILURE" },
-    { SSL_ERROR_INVALID_HANDSHAKE, "INVALID_HANDSHAKE" },
-    { SSL_ERROR_INVALID_PROT_MSG, "INVALID_PROT_MSG" },
-    { SSL_ERROR_INVALID_HMAC, "INVALID_HMAC" },
-    { SSL_ERROR_INVALID_VERSION, "INVALID_VERSION" },
-    { SSL_ERROR_UNSUPPORTED_EXTENSION, "UNSUPPORTED_EXTENSION" },
-    { SSL_ERROR_INVALID_SESSION, "INVALID_SESSION" },
-    { SSL_ERROR_NO_CIPHER, "NO_CIPHER" },
-    { SSL_ERROR_INVALID_CERT_HASH_ALG, "INVALID_CERT_HASH_ALG" },
-    { SSL_ERROR_BAD_CERTIFICATE, "BAD_CERTIFICATE" },
-    { SSL_ERROR_INVALID_KEY, "INVALID_KEY" },
-    { SSL_ERROR_FINISHED_INVALID, "FINISHED_INVALID" },
-    { SSL_ERROR_NO_CERT_DEFINED, "NO_CERT_DEFINED" },
-    { SSL_ERROR_NO_CLIENT_RENOG, "NO_CLIENT_RENOG" },
-    { SSL_ERROR_NOT_SUPPORTED, "NOT_SUPPORTED" },
+STATIC const char *const ssl_error_tab2[] = {
+    "CONN_LOST",
+    "RECORD_OVERFLOW",
+    "SOCK_SETUP_FAILURE",
+    NULL,
+    "INVALID_HANDSHAKE",
+    "INVALID_PROT_MSG",
+    "INVALID_HMAC",
+    "INVALID_VERSION",
+    "UNSUPPORTED_EXTENSION",
+    "INVALID_SESSION",
+    "NO_CIPHER",
+    "INVALID_CERT_HASH_ALG",
+    "BAD_CERTIFICATE",
+    "INVALID_KEY",
+    NULL,
+    "FINISHED_INVALID",
+    "NO_CERT_DEFINED",
+    "NO_CLIENT_RENOG",
+    "NOT_SUPPORTED",
 };
 
 STATIC NORETURN void ussl_raise_error(int err) {
-    for (size_t i = 0; i < MP_ARRAY_SIZE(ssl_error_tab); i++) {
-        if (ssl_error_tab[i].errnum == err) {
-            // construct string object
-            mp_obj_str_t *o_str = m_new_obj_maybe(mp_obj_str_t);
-            if (o_str == NULL) {
-                break;
-            }
-            o_str->base.type = &mp_type_str;
-            o_str->data = (const byte *)ssl_error_tab[i].errstr;
-            o_str->len = strlen((char *)o_str->data);
-            o_str->hash = qstr_compute_hash(o_str->data, o_str->len);
-            // raise
-            mp_obj_t args[2] = { MP_OBJ_NEW_SMALL_INT(err), MP_OBJ_FROM_PTR(o_str)};
-            nlr_raise(mp_obj_exception_make_new(&mp_type_OSError, 2, 0, args));
-        }
+    MP_STATIC_ASSERT(SSL_NOT_OK - 3 == SSL_EAGAIN);
+    MP_STATIC_ASSERT(SSL_ERROR_CONN_LOST - 18 == SSL_ERROR_NOT_SUPPORTED);
+
+    // Check if err corresponds to something in one of the error string tables.
+    const char *errstr = NULL;
+    if (SSL_NOT_OK >= err && err >= SSL_EAGAIN) {
+        errstr = ssl_error_tab1[SSL_NOT_OK - err];
+    } else if (SSL_ERROR_CONN_LOST >= err && err >= SSL_ERROR_NOT_SUPPORTED) {
+        errstr = ssl_error_tab2[SSL_ERROR_CONN_LOST - err];
+    }
+
+    // Unknown error, just raise the error code.
+    if (errstr == NULL) {
+        mp_raise_OSError(err);
+    }
+
+    // Construct string object.
+    mp_obj_str_t *o_str = m_new_obj_maybe(mp_obj_str_t);
+    if (o_str == NULL) {
+        mp_raise_OSError(err);
     }
-    mp_raise_OSError(err);
+    o_str->base.type = &mp_type_str;
+    o_str->data = (const byte *)errstr;
+    o_str->len = strlen((char *)o_str->data);
+    o_str->hash = qstr_compute_hash(o_str->data, o_str->len);
+
+    // Raise OSError(err, str).
+    mp_obj_t args[2] = { MP_OBJ_NEW_SMALL_INT(err), MP_OBJ_FROM_PTR(o_str)};
+    nlr_raise(mp_obj_exception_make_new(&mp_type_OSError, 2, 0, args));
 }
 
 

From 4b35aa5730cf26992453e3ce7cf74ced4128fe20 Mon Sep 17 00:00:00 2001
From: stijn <stijn@ignitron.net>
Date: Thu, 10 Sep 2020 12:22:49 +0200
Subject: [PATCH 0278/3533] tools: Write msvc-compatible frozen content.

The msvc compiler doesn't accept zero-sized arrays so let the freezing
process generate compatible C code in case no modules are found and the
involved arrays are all empty.  This doesn't affect the functionality in
any way because those arrays only get accessed when mp_frozen_mpy_names
contains names, i.e.  when modules are actually found.
---
 tools/make-frozen.py  | 4 ++--
 tools/makemanifest.py | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/make-frozen.py b/tools/make-frozen.py
index a8706bf784fdc..bc35d383429d6 100755
--- a/tools/make-frozen.py
+++ b/tools/make-frozen.py
@@ -50,7 +50,7 @@ def module_name(f):
 for f, st in modules:
     print("%d," % st.st_size)
 
-print("};")
+print("0};")
 
 print("const char mp_frozen_str_content[] = {")
 for f, st in modules:
@@ -82,4 +82,4 @@ def module_name(f):
     chrs.append('\\0"')
     print("".join(chrs))
 
-print("};")
+print('"\\0"};')
diff --git a/tools/makemanifest.py b/tools/makemanifest.py
index 377f245596fe9..9ef03682607dc 100644
--- a/tools/makemanifest.py
+++ b/tools/makemanifest.py
@@ -327,7 +327,7 @@ def main():
             b"    (qstr_pool_t*)&mp_qstr_const_pool, MP_QSTRnumber_of, 0, 0\n"
             b"};\n"
             b'const char mp_frozen_mpy_names[1] = {"\\0"};\n'
-            b"const mp_raw_code_t *const mp_frozen_mpy_content[0] = {};\n"
+            b"const mp_raw_code_t *const mp_frozen_mpy_content[1] = {NULL};\n"
         )
 
     # Generate output

From 2a9ea69fa93b1b940b802f981f8835f6decdb085 Mon Sep 17 00:00:00 2001
From: stijn <stijn@ignitron.net>
Date: Thu, 10 Sep 2020 12:11:58 +0200
Subject: [PATCH 0279/3533] windows/msvc: Support freezing modules.

Support freezing modules via manifest.py for consistency with the other
ports.  In essence this comes down to calling makemanifest.py and adding
the resulting .c file to the build.  Note the file with preprocessed qstrs
has been renamed to match what makemanifest.py expects and which is also
the name all other ports use.
---
 ports/windows/micropython.vcxproj |  2 +-
 ports/windows/msvc/genhdr.targets | 17 ++++++++++++++---
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/ports/windows/micropython.vcxproj b/ports/windows/micropython.vcxproj
index f70fe96158d07..73a837a8408ab 100644
--- a/ports/windows/micropython.vcxproj
+++ b/ports/windows/micropython.vcxproj
@@ -104,7 +104,7 @@
   </ItemGroup>
   <Import Project="msvc/genhdr.targets" />
   <Import Project="$(CustomPropsFile)" Condition="exists('$(CustomPropsFile)')" />
-  <Target Name="GenHeaders" BeforeTargets="BuildGenerateSources" DependsOnTargets="GenerateHeaders">
+  <Target Name="GenerateMicroPythonSources" BeforeTargets="BuildGenerateSources" DependsOnTargets="GenerateHeaders;FreezeModules">
   </Target>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/ports/windows/msvc/genhdr.targets b/ports/windows/msvc/genhdr.targets
index 327f922e4a162..3af0ea263699b 100644
--- a/ports/windows/msvc/genhdr.targets
+++ b/ports/windows/msvc/genhdr.targets
@@ -55,7 +55,7 @@ using(var outFile = System.IO.File.CreateText(OutputFile)) {
     <ItemGroup>
       <PyIncDirs Include="$(PyIncDirs)"/>
       <PreProcDefs Include="%(ClCompile.PreProcessorDefinitions);NO_QSTR"/>
-      <PyQstrSourceFiles Include="@(ClCompile)">
+      <PyQstrSourceFiles Include="@(ClCompile)" Exclude="$(PyBuildDir)\frozen_content.c">
         <OutFile>$([System.String]::new('%(FullPath)').Replace('$(PyBaseDir)', '$(DestDir)qstr\'))</OutFile>
       </PyQstrSourceFiles>
       <PyQstrSourceFiles>
@@ -101,8 +101,8 @@ using(var outFile = System.IO.File.CreateText(OutputFile)) {
     <PropertyGroup>
       <TmpFile>$(QstrGen).tmp</TmpFile>
     </PropertyGroup>
-    <Exec Command="$(PyClTool) /nologo /I@(PyIncDirs, ' /I') /D@(PreProcDefs, ' /D') /E $(PyQstrDefs) $(QstrDefs) > $(DestDir)qstrdefspreprocessed.h"/>
-    <Exec Command="$(PyPython) $(PySrcDir)makeqstrdata.py $(DestDir)qstrdefspreprocessed.h $(QstrDefsCollected) > $(TmpFile)"/>
+    <Exec Command="$(PyClTool) /nologo /I@(PyIncDirs, ' /I') /D@(PreProcDefs, ' /D') /E $(PyQstrDefs) $(QstrDefs) > $(DestDir)qstrdefs.preprocessed.h"/>
+    <Exec Command="$(PyPython) $(PySrcDir)makeqstrdata.py $(DestDir)qstrdefs.preprocessed.h $(QstrDefsCollected) > $(TmpFile)"/>
     <MSBuild Projects="$(MSBuildThisFileFullPath)" Targets="CopyFileIfDifferent" Properties="SourceFile=$(TmpFile);DestFile=$(QstrGen)"/>
   </Target>
 
@@ -115,6 +115,17 @@ using(var outFile = System.IO.File.CreateText(OutputFile)) {
     <MSBuild Projects="$(MSBuildThisFileFullPath)" Targets="CopyFileIfDifferent" Properties="SourceFile=$(TmpFile);DestFile=$(DestFile)"/>
   </Target>
 
+  <Target Name="FreezeModules" Condition="'$(FrozenManifest)' != ''" DependsOnTargets="MakeQstrData" Inputs="$(FrozenManifest)" Outputs="$(PyBuildDir)frozen_content.c">
+    <ItemGroup>
+      <ClCompile Include="$(PyBuildDir)frozen_content.c"/>
+      <ClCompile>
+        <PreprocessorDefinitions>MICROPY_MODULE_FROZEN_MPY=1;MICROPY_QSTR_EXTRA_POOL=mp_qstr_frozen_const_pool;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      </ClCompile>
+    </ItemGroup>
+    <Exec Command="$(PyPython) $(PyBaseDir)tools\makemanifest.py -v MPY_DIR=$(PyBaseDir) -v MPY_LIB_DIR=$(PyBaseDir)../micropython-lib -v PORT_DIR=$(PyWinDir) -f&quot;-mcache-lookup-bc&quot; -o $(PyBuildDir)frozen_content.c -b $(PyBuildDir) $(FrozenManifest)"/>
+    <WriteLinesToFile File="$(TLogLocation)frozen.read.1.tlog" Lines="$(FrozenManifest)" Overwrite="True"/>
+  </Target>
+
   <Target Name="RemoveGeneratedFiles" AfterTargets="Clean">
     <RemoveDir Directories="$(DestDir)"/>
   </Target>

From 5b94c610971334019e7301026e0fbbf5950e094d Mon Sep 17 00:00:00 2001
From: stijn <stijn@ignitron.net>
Date: Thu, 10 Sep 2020 14:13:25 +0200
Subject: [PATCH 0280/3533] windows/Makefile: Support freezing modules.

Alter the build flags as needed to support freezing modules with a
manifest.  This makes freezing works just like it does for e.g. the unix
port.
---
 ports/windows/Makefile | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/ports/windows/Makefile b/ports/windows/Makefile
index b2d11872ed3a6..3bfbc18304818 100644
--- a/ports/windows/Makefile
+++ b/ports/windows/Makefile
@@ -58,4 +58,9 @@ SRC_QSTR += $(SRC_C)
 # SRC_QSTR
 SRC_QSTR_AUTO_DEPS +=
 
+ifneq ($(FROZEN_MANIFEST),)
+CFLAGS += -DMICROPY_QSTR_EXTRA_POOL=mp_qstr_frozen_const_pool -DMICROPY_MODULE_FROZEN_MPY=1 -DMPZ_DIG_SIZE=16
+MPY_CROSS_FLAGS += -mcache-lookup-bc
+endif
+
 include $(TOP)/py/mkrules.mk

From 70bec41089eef26122d6c2cbd06bf359bc0ab253 Mon Sep 17 00:00:00 2001
From: stijn <stijn@ignitron.net>
Date: Thu, 10 Sep 2020 13:21:21 +0200
Subject: [PATCH 0281/3533] windows: Show test failures in the Appveyor builds.

---
 ports/windows/.appveyor.yml | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/ports/windows/.appveyor.yml b/ports/windows/.appveyor.yml
index 2965543b05942..4d2d6bd11dc87 100644
--- a/ports/windows/.appveyor.yml
+++ b/ports/windows/.appveyor.yml
@@ -38,7 +38,15 @@ test_script:
 - ps: |
     cd (Join-Path $env:APPVEYOR_BUILD_FOLDER 'tests')
     & $env:MICROPY_CPYTHON3 run-tests
+    if ($LASTEXITCODE -ne 0) {
+      & $env:MICROPY_CPYTHON3 run-tests --print-failures
+      throw "Test failure"
+    }
     & $env:MICROPY_CPYTHON3 run-tests --via-mpy -d basics float micropython
+    if ($LASTEXITCODE -ne 0) {
+      & $env:MICROPY_CPYTHON3 run-tests --print-failures
+      throw "Test failure"
+    }
 
 # After the build/test phase for the MSVC build completes,
 # build and test with mingw-w64, release versions only.
@@ -69,9 +77,11 @@ after_test:
     }
     & $env:MICROPY_CPYTHON3 $testArgs
     if ($LASTEXITCODE -ne 0) {
-      throw "$env:MSYSTEM tests exited with code $LASTEXITCODE"
+      & $env:MICROPY_CPYTHON3 run-tests --print-failures
+      throw "Test failure"
     }
     & $env:MICROPY_CPYTHON3 ($testArgs + @('--via-mpy', '-d', 'basics', 'float', 'micropython'))
     if ($LASTEXITCODE -ne 0) {
-      throw "$env:MSYSTEM mpy-cross tests exited with code $LASTEXITCODE"
+      & $env:MICROPY_CPYTHON3 run-tests --print-failures
+      throw "Test failure"
     }

From 50efce81740901fee6f5191db36a48ada13ef6df Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Thu, 10 Sep 2020 11:31:01 +1000
Subject: [PATCH 0282/3533] esp32/mpconfigport.h: Remove duplicate uhashlib
 registration.

---
 ports/esp32/mpconfigport.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h
index 7c09bdbd9218c..663fed3f683a4 100644
--- a/ports/esp32/mpconfigport.h
+++ b/ports/esp32/mpconfigport.h
@@ -200,7 +200,6 @@ extern const struct _mp_obj_module_t mp_module_onewire;
     { MP_OBJ_NEW_QSTR(MP_QSTR_machine), (mp_obj_t)&mp_module_machine }, \
     { MP_OBJ_NEW_QSTR(MP_QSTR_network), (mp_obj_t)&mp_module_network }, \
     { MP_OBJ_NEW_QSTR(MP_QSTR__onewire), (mp_obj_t)&mp_module_onewire }, \
-    { MP_OBJ_NEW_QSTR(MP_QSTR_uhashlib), (mp_obj_t)&mp_module_uhashlib }, \
 
 #define MP_STATE_PORT MP_STATE_VM
 

From 85f2b239d8ff8d29155c63799717e3f88b2f33f3 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 11 Sep 2020 17:22:28 +1000
Subject: [PATCH 0283/3533] py/showbc: Pass in an mp_print_t struct to all
 bytecode-print functions.

So the output can be redirected if needed.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/bc.h       |   8 +-
 py/emitglue.c |   2 +-
 py/showbc.c   | 209 +++++++++++++++++++++++++-------------------------
 py/vm.c       |   2 +-
 4 files changed, 109 insertions(+), 112 deletions(-)

diff --git a/py/bc.h b/py/bc.h
index 0c19c516595ac..16f314e19936f 100644
--- a/py/bc.h
+++ b/py/bc.h
@@ -226,10 +226,10 @@ const byte *mp_decode_uint_skip(const byte *ptr);
 mp_vm_return_kind_t mp_execute_bytecode(mp_code_state_t *code_state, volatile mp_obj_t inject_exc);
 mp_code_state_t *mp_obj_fun_bc_prepare_codestate(mp_obj_t func, size_t n_args, size_t n_kw, const mp_obj_t *args);
 void mp_setup_code_state(mp_code_state_t *code_state, size_t n_args, size_t n_kw, const mp_obj_t *args);
-void mp_bytecode_print(const void *descr, const byte *code, mp_uint_t len, const mp_uint_t *const_table);
-void mp_bytecode_print2(const byte *code, size_t len, const mp_uint_t *const_table);
-const byte *mp_bytecode_print_str(const byte *ip);
-#define mp_bytecode_print_inst(code, const_table) mp_bytecode_print2(code, 1, const_table)
+void mp_bytecode_print(const mp_print_t *print, const void *descr, const byte *code, mp_uint_t len, const mp_uint_t *const_table);
+void mp_bytecode_print2(const mp_print_t *print, const byte *code, size_t len, const mp_uint_t *const_table);
+const byte *mp_bytecode_print_str(const mp_print_t *print, const byte *ip);
+#define mp_bytecode_print_inst(print, code, const_table) mp_bytecode_print2(print, code, 1, const_table)
 
 // Helper macros to access pointer with least significant bits holding flags
 #define MP_TAGPTR_PTR(x) ((void *)((uintptr_t)(x) & ~((uintptr_t)3)))
diff --git a/py/emitglue.c b/py/emitglue.c
index 98320c426bc63..0ef708a3f3f56 100644
--- a/py/emitglue.c
+++ b/py/emitglue.c
@@ -92,7 +92,7 @@ void mp_emit_glue_assign_bytecode(mp_raw_code_t *rc, const byte *code,
     #endif
     #if MICROPY_DEBUG_PRINTERS
     if (mp_verbose_flag >= 2) {
-        mp_bytecode_print(rc, code, len, const_table);
+        mp_bytecode_print(&mp_plat_print, rc, code, len, const_table);
     }
     #endif
 }
diff --git a/py/showbc.c b/py/showbc.c
index 4d6527fae2e45..8941dd7544487 100644
--- a/py/showbc.c
+++ b/py/showbc.c
@@ -32,9 +32,6 @@
 
 #if MICROPY_DEBUG_PRINTERS
 
-// redirect all printfs in this file to the platform print stream
-#define printf(...) mp_printf(&mp_plat_print, __VA_ARGS__)
-
 #define DECODE_UINT { \
         unum = 0; \
         do { \
@@ -80,7 +77,7 @@
 const byte *mp_showbc_code_start;
 const mp_uint_t *mp_showbc_const_table;
 
-void mp_bytecode_print(const void *descr, const byte *ip, mp_uint_t len, const mp_uint_t *const_table) {
+void mp_bytecode_print(const mp_print_t *print, const void *descr, const byte *ip, mp_uint_t len, const mp_uint_t *const_table) {
     mp_showbc_code_start = ip;
 
     // Decode prelude
@@ -96,30 +93,30 @@ void mp_bytecode_print(const void *descr, const byte *ip, mp_uint_t len, const m
     qstr block_name = mp_decode_uint(&code_info);
     qstr source_file = mp_decode_uint(&code_info);
     #endif
-    printf("File %s, code block '%s' (descriptor: %p, bytecode @%p " UINT_FMT " bytes)\n",
+    mp_printf(print, "File %s, code block '%s' (descriptor: %p, bytecode @%p " UINT_FMT " bytes)\n",
         qstr_str(source_file), qstr_str(block_name), descr, mp_showbc_code_start, len);
 
     // raw bytecode dump
     size_t prelude_size = ip - mp_showbc_code_start + n_info + n_cell;
-    printf("Raw bytecode (code_info_size=" UINT_FMT ", bytecode_size=" UINT_FMT "):\n",
+    mp_printf(print, "Raw bytecode (code_info_size=" UINT_FMT ", bytecode_size=" UINT_FMT "):\n",
         prelude_size, len - prelude_size);
     for (mp_uint_t i = 0; i < len; i++) {
         if (i > 0 && i % 16 == 0) {
-            printf("\n");
+            mp_printf(print, "\n");
         }
-        printf(" %02x", mp_showbc_code_start[i]);
+        mp_printf(print, " %02x", mp_showbc_code_start[i]);
     }
-    printf("\n");
+    mp_printf(print, "\n");
 
     // bytecode prelude: arg names (as qstr objects)
-    printf("arg names:");
+    mp_printf(print, "arg names:");
     for (mp_uint_t i = 0; i < n_pos_args + n_kwonly_args; i++) {
-        printf(" %s", qstr_str(MP_OBJ_QSTR_VALUE(const_table[i])));
+        mp_printf(print, " %s", qstr_str(MP_OBJ_QSTR_VALUE(const_table[i])));
     }
-    printf("\n");
+    mp_printf(print, "\n");
 
-    printf("(N_STATE %u)\n", (unsigned)n_state);
-    printf("(N_EXC_STACK %u)\n", (unsigned)n_exc_stack);
+    mp_printf(print, "(N_STATE %u)\n", (unsigned)n_state);
+    mp_printf(print, "(N_EXC_STACK %u)\n", (unsigned)n_exc_stack);
 
     // skip over code_info
     ip += n_info;
@@ -127,14 +124,14 @@ void mp_bytecode_print(const void *descr, const byte *ip, mp_uint_t len, const m
     // bytecode prelude: initialise closed over variables
     for (size_t i = 0; i < n_cell; ++i) {
         uint local_num = *ip++;
-        printf("(INIT_CELL %u)\n", local_num);
+        mp_printf(print, "(INIT_CELL %u)\n", local_num);
     }
 
     // print out line number info
     {
         mp_int_t bc = 0;
         mp_uint_t source_line = 1;
-        printf("  bc=" INT_FMT " line=" UINT_FMT "\n", bc, source_line);
+        mp_printf(print, "  bc=" INT_FMT " line=" UINT_FMT "\n", bc, source_line);
         for (const byte *ci = code_info; *ci;) {
             if ((ci[0] & 0x80) == 0) {
                 // 0b0LLBBBBB encoding
@@ -147,27 +144,27 @@ void mp_bytecode_print(const void *descr, const byte *ip, mp_uint_t len, const m
                 source_line += ((ci[0] << 4) & 0x700) | ci[1];
                 ci += 2;
             }
-            printf("  bc=" INT_FMT " line=" UINT_FMT "\n", bc, source_line);
+            mp_printf(print, "  bc=" INT_FMT " line=" UINT_FMT "\n", bc, source_line);
         }
     }
-    mp_bytecode_print2(ip, len - prelude_size, const_table);
+    mp_bytecode_print2(print, ip, len - prelude_size, const_table);
 }
 
-const byte *mp_bytecode_print_str(const byte *ip) {
+const byte *mp_bytecode_print_str(const mp_print_t *print, const byte *ip) {
     mp_uint_t unum;
     qstr qst;
 
     switch (*ip++) {
         case MP_BC_LOAD_CONST_FALSE:
-            printf("LOAD_CONST_FALSE");
+            mp_printf(print, "LOAD_CONST_FALSE");
             break;
 
         case MP_BC_LOAD_CONST_NONE:
-            printf("LOAD_CONST_NONE");
+            mp_printf(print, "LOAD_CONST_NONE");
             break;
 
         case MP_BC_LOAD_CONST_TRUE:
-            printf("LOAD_CONST_TRUE");
+            mp_printf(print, "LOAD_CONST_TRUE");
             break;
 
         case MP_BC_LOAD_CONST_SMALL_INT: {
@@ -179,197 +176,197 @@ const byte *mp_bytecode_print_str(const byte *ip) {
             do {
                 num = (num << 7) | (*ip & 0x7f);
             } while ((*ip++ & 0x80) != 0);
-            printf("LOAD_CONST_SMALL_INT " INT_FMT, num);
+            mp_printf(print, "LOAD_CONST_SMALL_INT " INT_FMT, num);
             break;
         }
 
         case MP_BC_LOAD_CONST_STRING:
             DECODE_QSTR;
-            printf("LOAD_CONST_STRING '%s'", qstr_str(qst));
+            mp_printf(print, "LOAD_CONST_STRING '%s'", qstr_str(qst));
             break;
 
         case MP_BC_LOAD_CONST_OBJ:
             DECODE_OBJ;
-            printf("LOAD_CONST_OBJ %p=", MP_OBJ_TO_PTR(unum));
-            mp_obj_print_helper(&mp_plat_print, (mp_obj_t)unum, PRINT_REPR);
+            mp_printf(print, "LOAD_CONST_OBJ %p=", MP_OBJ_TO_PTR(unum));
+            mp_obj_print_helper(print, (mp_obj_t)unum, PRINT_REPR);
             break;
 
         case MP_BC_LOAD_NULL:
-            printf("LOAD_NULL");
+            mp_printf(print, "LOAD_NULL");
             break;
 
         case MP_BC_LOAD_FAST_N:
             DECODE_UINT;
-            printf("LOAD_FAST_N " UINT_FMT, unum);
+            mp_printf(print, "LOAD_FAST_N " UINT_FMT, unum);
             break;
 
         case MP_BC_LOAD_DEREF:
             DECODE_UINT;
-            printf("LOAD_DEREF " UINT_FMT, unum);
+            mp_printf(print, "LOAD_DEREF " UINT_FMT, unum);
             break;
 
         case MP_BC_LOAD_NAME:
             DECODE_QSTR;
-            printf("LOAD_NAME %s", qstr_str(qst));
+            mp_printf(print, "LOAD_NAME %s", qstr_str(qst));
             if (MICROPY_OPT_CACHE_MAP_LOOKUP_IN_BYTECODE) {
-                printf(" (cache=%u)", *ip++);
+                mp_printf(print, " (cache=%u)", *ip++);
             }
             break;
 
         case MP_BC_LOAD_GLOBAL:
             DECODE_QSTR;
-            printf("LOAD_GLOBAL %s", qstr_str(qst));
+            mp_printf(print, "LOAD_GLOBAL %s", qstr_str(qst));
             if (MICROPY_OPT_CACHE_MAP_LOOKUP_IN_BYTECODE) {
-                printf(" (cache=%u)", *ip++);
+                mp_printf(print, " (cache=%u)", *ip++);
             }
             break;
 
         case MP_BC_LOAD_ATTR:
             DECODE_QSTR;
-            printf("LOAD_ATTR %s", qstr_str(qst));
+            mp_printf(print, "LOAD_ATTR %s", qstr_str(qst));
             if (MICROPY_OPT_CACHE_MAP_LOOKUP_IN_BYTECODE) {
-                printf(" (cache=%u)", *ip++);
+                mp_printf(print, " (cache=%u)", *ip++);
             }
             break;
 
         case MP_BC_LOAD_METHOD:
             DECODE_QSTR;
-            printf("LOAD_METHOD %s", qstr_str(qst));
+            mp_printf(print, "LOAD_METHOD %s", qstr_str(qst));
             break;
 
         case MP_BC_LOAD_SUPER_METHOD:
             DECODE_QSTR;
-            printf("LOAD_SUPER_METHOD %s", qstr_str(qst));
+            mp_printf(print, "LOAD_SUPER_METHOD %s", qstr_str(qst));
             break;
 
         case MP_BC_LOAD_BUILD_CLASS:
-            printf("LOAD_BUILD_CLASS");
+            mp_printf(print, "LOAD_BUILD_CLASS");
             break;
 
         case MP_BC_LOAD_SUBSCR:
-            printf("LOAD_SUBSCR");
+            mp_printf(print, "LOAD_SUBSCR");
             break;
 
         case MP_BC_STORE_FAST_N:
             DECODE_UINT;
-            printf("STORE_FAST_N " UINT_FMT, unum);
+            mp_printf(print, "STORE_FAST_N " UINT_FMT, unum);
             break;
 
         case MP_BC_STORE_DEREF:
             DECODE_UINT;
-            printf("STORE_DEREF " UINT_FMT, unum);
+            mp_printf(print, "STORE_DEREF " UINT_FMT, unum);
             break;
 
         case MP_BC_STORE_NAME:
             DECODE_QSTR;
-            printf("STORE_NAME %s", qstr_str(qst));
+            mp_printf(print, "STORE_NAME %s", qstr_str(qst));
             break;
 
         case MP_BC_STORE_GLOBAL:
             DECODE_QSTR;
-            printf("STORE_GLOBAL %s", qstr_str(qst));
+            mp_printf(print, "STORE_GLOBAL %s", qstr_str(qst));
             break;
 
         case MP_BC_STORE_ATTR:
             DECODE_QSTR;
-            printf("STORE_ATTR %s", qstr_str(qst));
+            mp_printf(print, "STORE_ATTR %s", qstr_str(qst));
             if (MICROPY_OPT_CACHE_MAP_LOOKUP_IN_BYTECODE) {
-                printf(" (cache=%u)", *ip++);
+                mp_printf(print, " (cache=%u)", *ip++);
             }
             break;
 
         case MP_BC_STORE_SUBSCR:
-            printf("STORE_SUBSCR");
+            mp_printf(print, "STORE_SUBSCR");
             break;
 
         case MP_BC_DELETE_FAST:
             DECODE_UINT;
-            printf("DELETE_FAST " UINT_FMT, unum);
+            mp_printf(print, "DELETE_FAST " UINT_FMT, unum);
             break;
 
         case MP_BC_DELETE_DEREF:
             DECODE_UINT;
-            printf("DELETE_DEREF " UINT_FMT, unum);
+            mp_printf(print, "DELETE_DEREF " UINT_FMT, unum);
             break;
 
         case MP_BC_DELETE_NAME:
             DECODE_QSTR;
-            printf("DELETE_NAME %s", qstr_str(qst));
+            mp_printf(print, "DELETE_NAME %s", qstr_str(qst));
             break;
 
         case MP_BC_DELETE_GLOBAL:
             DECODE_QSTR;
-            printf("DELETE_GLOBAL %s", qstr_str(qst));
+            mp_printf(print, "DELETE_GLOBAL %s", qstr_str(qst));
             break;
 
         case MP_BC_DUP_TOP:
-            printf("DUP_TOP");
+            mp_printf(print, "DUP_TOP");
             break;
 
         case MP_BC_DUP_TOP_TWO:
-            printf("DUP_TOP_TWO");
+            mp_printf(print, "DUP_TOP_TWO");
             break;
 
         case MP_BC_POP_TOP:
-            printf("POP_TOP");
+            mp_printf(print, "POP_TOP");
             break;
 
         case MP_BC_ROT_TWO:
-            printf("ROT_TWO");
+            mp_printf(print, "ROT_TWO");
             break;
 
         case MP_BC_ROT_THREE:
-            printf("ROT_THREE");
+            mp_printf(print, "ROT_THREE");
             break;
 
         case MP_BC_JUMP:
             DECODE_SLABEL;
-            printf("JUMP " UINT_FMT, (mp_uint_t)(ip + unum - mp_showbc_code_start));
+            mp_printf(print, "JUMP " UINT_FMT, (mp_uint_t)(ip + unum - mp_showbc_code_start));
             break;
 
         case MP_BC_POP_JUMP_IF_TRUE:
             DECODE_SLABEL;
-            printf("POP_JUMP_IF_TRUE " UINT_FMT, (mp_uint_t)(ip + unum - mp_showbc_code_start));
+            mp_printf(print, "POP_JUMP_IF_TRUE " UINT_FMT, (mp_uint_t)(ip + unum - mp_showbc_code_start));
             break;
 
         case MP_BC_POP_JUMP_IF_FALSE:
             DECODE_SLABEL;
-            printf("POP_JUMP_IF_FALSE " UINT_FMT, (mp_uint_t)(ip + unum - mp_showbc_code_start));
+            mp_printf(print, "POP_JUMP_IF_FALSE " UINT_FMT, (mp_uint_t)(ip + unum - mp_showbc_code_start));
             break;
 
         case MP_BC_JUMP_IF_TRUE_OR_POP:
             DECODE_SLABEL;
-            printf("JUMP_IF_TRUE_OR_POP " UINT_FMT, (mp_uint_t)(ip + unum - mp_showbc_code_start));
+            mp_printf(print, "JUMP_IF_TRUE_OR_POP " UINT_FMT, (mp_uint_t)(ip + unum - mp_showbc_code_start));
             break;
 
         case MP_BC_JUMP_IF_FALSE_OR_POP:
             DECODE_SLABEL;
-            printf("JUMP_IF_FALSE_OR_POP " UINT_FMT, (mp_uint_t)(ip + unum - mp_showbc_code_start));
+            mp_printf(print, "JUMP_IF_FALSE_OR_POP " UINT_FMT, (mp_uint_t)(ip + unum - mp_showbc_code_start));
             break;
 
         case MP_BC_SETUP_WITH:
             DECODE_ULABEL; // loop-like labels are always forward
-            printf("SETUP_WITH " UINT_FMT, (mp_uint_t)(ip + unum - mp_showbc_code_start));
+            mp_printf(print, "SETUP_WITH " UINT_FMT, (mp_uint_t)(ip + unum - mp_showbc_code_start));
             break;
 
         case MP_BC_WITH_CLEANUP:
-            printf("WITH_CLEANUP");
+            mp_printf(print, "WITH_CLEANUP");
             break;
 
         case MP_BC_UNWIND_JUMP:
             DECODE_SLABEL;
-            printf("UNWIND_JUMP " UINT_FMT " %d", (mp_uint_t)(ip + unum - mp_showbc_code_start), *ip);
+            mp_printf(print, "UNWIND_JUMP " UINT_FMT " %d", (mp_uint_t)(ip + unum - mp_showbc_code_start), *ip);
             ip += 1;
             break;
 
         case MP_BC_SETUP_EXCEPT:
             DECODE_ULABEL; // except labels are always forward
-            printf("SETUP_EXCEPT " UINT_FMT, (mp_uint_t)(ip + unum - mp_showbc_code_start));
+            mp_printf(print, "SETUP_EXCEPT " UINT_FMT, (mp_uint_t)(ip + unum - mp_showbc_code_start));
             break;
 
         case MP_BC_SETUP_FINALLY:
             DECODE_ULABEL; // except labels are always forward
-            printf("SETUP_FINALLY " UINT_FMT, (mp_uint_t)(ip + unum - mp_showbc_code_start));
+            mp_printf(print, "SETUP_FINALLY " UINT_FMT, (mp_uint_t)(ip + unum - mp_showbc_code_start));
             break;
 
         case MP_BC_END_FINALLY:
@@ -377,169 +374,169 @@ const byte *mp_bytecode_print_str(const byte *ip) {
             // if TOS is an integer, does something else
             // if TOS is None, just pops it and continues
             // else error
-            printf("END_FINALLY");
+            mp_printf(print, "END_FINALLY");
             break;
 
         case MP_BC_GET_ITER:
-            printf("GET_ITER");
+            mp_printf(print, "GET_ITER");
             break;
 
         case MP_BC_GET_ITER_STACK:
-            printf("GET_ITER_STACK");
+            mp_printf(print, "GET_ITER_STACK");
             break;
 
         case MP_BC_FOR_ITER:
             DECODE_ULABEL; // the jump offset if iteration finishes; for labels are always forward
-            printf("FOR_ITER " UINT_FMT, (mp_uint_t)(ip + unum - mp_showbc_code_start));
+            mp_printf(print, "FOR_ITER " UINT_FMT, (mp_uint_t)(ip + unum - mp_showbc_code_start));
             break;
 
         case MP_BC_POP_EXCEPT_JUMP:
             DECODE_ULABEL; // these labels are always forward
-            printf("POP_EXCEPT_JUMP " UINT_FMT, (mp_uint_t)(ip + unum - mp_showbc_code_start));
+            mp_printf(print, "POP_EXCEPT_JUMP " UINT_FMT, (mp_uint_t)(ip + unum - mp_showbc_code_start));
             break;
 
         case MP_BC_BUILD_TUPLE:
             DECODE_UINT;
-            printf("BUILD_TUPLE " UINT_FMT, unum);
+            mp_printf(print, "BUILD_TUPLE " UINT_FMT, unum);
             break;
 
         case MP_BC_BUILD_LIST:
             DECODE_UINT;
-            printf("BUILD_LIST " UINT_FMT, unum);
+            mp_printf(print, "BUILD_LIST " UINT_FMT, unum);
             break;
 
         case MP_BC_BUILD_MAP:
             DECODE_UINT;
-            printf("BUILD_MAP " UINT_FMT, unum);
+            mp_printf(print, "BUILD_MAP " UINT_FMT, unum);
             break;
 
         case MP_BC_STORE_MAP:
-            printf("STORE_MAP");
+            mp_printf(print, "STORE_MAP");
             break;
 
         case MP_BC_BUILD_SET:
             DECODE_UINT;
-            printf("BUILD_SET " UINT_FMT, unum);
+            mp_printf(print, "BUILD_SET " UINT_FMT, unum);
             break;
 
         #if MICROPY_PY_BUILTINS_SLICE
         case MP_BC_BUILD_SLICE:
             DECODE_UINT;
-            printf("BUILD_SLICE " UINT_FMT, unum);
+            mp_printf(print, "BUILD_SLICE " UINT_FMT, unum);
             break;
         #endif
 
         case MP_BC_STORE_COMP:
             DECODE_UINT;
-            printf("STORE_COMP " UINT_FMT, unum);
+            mp_printf(print, "STORE_COMP " UINT_FMT, unum);
             break;
 
         case MP_BC_UNPACK_SEQUENCE:
             DECODE_UINT;
-            printf("UNPACK_SEQUENCE " UINT_FMT, unum);
+            mp_printf(print, "UNPACK_SEQUENCE " UINT_FMT, unum);
             break;
 
         case MP_BC_UNPACK_EX:
             DECODE_UINT;
-            printf("UNPACK_EX " UINT_FMT, unum);
+            mp_printf(print, "UNPACK_EX " UINT_FMT, unum);
             break;
 
         case MP_BC_MAKE_FUNCTION:
             DECODE_PTR;
-            printf("MAKE_FUNCTION %p", (void *)(uintptr_t)unum);
+            mp_printf(print, "MAKE_FUNCTION %p", (void *)(uintptr_t)unum);
             break;
 
         case MP_BC_MAKE_FUNCTION_DEFARGS:
             DECODE_PTR;
-            printf("MAKE_FUNCTION_DEFARGS %p", (void *)(uintptr_t)unum);
+            mp_printf(print, "MAKE_FUNCTION_DEFARGS %p", (void *)(uintptr_t)unum);
             break;
 
         case MP_BC_MAKE_CLOSURE: {
             DECODE_PTR;
             mp_uint_t n_closed_over = *ip++;
-            printf("MAKE_CLOSURE %p " UINT_FMT, (void *)(uintptr_t)unum, n_closed_over);
+            mp_printf(print, "MAKE_CLOSURE %p " UINT_FMT, (void *)(uintptr_t)unum, n_closed_over);
             break;
         }
 
         case MP_BC_MAKE_CLOSURE_DEFARGS: {
             DECODE_PTR;
             mp_uint_t n_closed_over = *ip++;
-            printf("MAKE_CLOSURE_DEFARGS %p " UINT_FMT, (void *)(uintptr_t)unum, n_closed_over);
+            mp_printf(print, "MAKE_CLOSURE_DEFARGS %p " UINT_FMT, (void *)(uintptr_t)unum, n_closed_over);
             break;
         }
 
         case MP_BC_CALL_FUNCTION:
             DECODE_UINT;
-            printf("CALL_FUNCTION n=" UINT_FMT " nkw=" UINT_FMT, unum & 0xff, (unum >> 8) & 0xff);
+            mp_printf(print, "CALL_FUNCTION n=" UINT_FMT " nkw=" UINT_FMT, unum & 0xff, (unum >> 8) & 0xff);
             break;
 
         case MP_BC_CALL_FUNCTION_VAR_KW:
             DECODE_UINT;
-            printf("CALL_FUNCTION_VAR_KW n=" UINT_FMT " nkw=" UINT_FMT, unum & 0xff, (unum >> 8) & 0xff);
+            mp_printf(print, "CALL_FUNCTION_VAR_KW n=" UINT_FMT " nkw=" UINT_FMT, unum & 0xff, (unum >> 8) & 0xff);
             break;
 
         case MP_BC_CALL_METHOD:
             DECODE_UINT;
-            printf("CALL_METHOD n=" UINT_FMT " nkw=" UINT_FMT, unum & 0xff, (unum >> 8) & 0xff);
+            mp_printf(print, "CALL_METHOD n=" UINT_FMT " nkw=" UINT_FMT, unum & 0xff, (unum >> 8) & 0xff);
             break;
 
         case MP_BC_CALL_METHOD_VAR_KW:
             DECODE_UINT;
-            printf("CALL_METHOD_VAR_KW n=" UINT_FMT " nkw=" UINT_FMT, unum & 0xff, (unum >> 8) & 0xff);
+            mp_printf(print, "CALL_METHOD_VAR_KW n=" UINT_FMT " nkw=" UINT_FMT, unum & 0xff, (unum >> 8) & 0xff);
             break;
 
         case MP_BC_RETURN_VALUE:
-            printf("RETURN_VALUE");
+            mp_printf(print, "RETURN_VALUE");
             break;
 
         case MP_BC_RAISE_LAST:
-            printf("RAISE_LAST");
+            mp_printf(print, "RAISE_LAST");
             break;
 
         case MP_BC_RAISE_OBJ:
-            printf("RAISE_OBJ");
+            mp_printf(print, "RAISE_OBJ");
             break;
 
         case MP_BC_RAISE_FROM:
-            printf("RAISE_FROM");
+            mp_printf(print, "RAISE_FROM");
             break;
 
         case MP_BC_YIELD_VALUE:
-            printf("YIELD_VALUE");
+            mp_printf(print, "YIELD_VALUE");
             break;
 
         case MP_BC_YIELD_FROM:
-            printf("YIELD_FROM");
+            mp_printf(print, "YIELD_FROM");
             break;
 
         case MP_BC_IMPORT_NAME:
             DECODE_QSTR;
-            printf("IMPORT_NAME '%s'", qstr_str(qst));
+            mp_printf(print, "IMPORT_NAME '%s'", qstr_str(qst));
             break;
 
         case MP_BC_IMPORT_FROM:
             DECODE_QSTR;
-            printf("IMPORT_FROM '%s'", qstr_str(qst));
+            mp_printf(print, "IMPORT_FROM '%s'", qstr_str(qst));
             break;
 
         case MP_BC_IMPORT_STAR:
-            printf("IMPORT_STAR");
+            mp_printf(print, "IMPORT_STAR");
             break;
 
         default:
             if (ip[-1] < MP_BC_LOAD_CONST_SMALL_INT_MULTI + 64) {
-                printf("LOAD_CONST_SMALL_INT " INT_FMT, (mp_int_t)ip[-1] - MP_BC_LOAD_CONST_SMALL_INT_MULTI - 16);
+                mp_printf(print, "LOAD_CONST_SMALL_INT " INT_FMT, (mp_int_t)ip[-1] - MP_BC_LOAD_CONST_SMALL_INT_MULTI - 16);
             } else if (ip[-1] < MP_BC_LOAD_FAST_MULTI + 16) {
-                printf("LOAD_FAST " UINT_FMT, (mp_uint_t)ip[-1] - MP_BC_LOAD_FAST_MULTI);
+                mp_printf(print, "LOAD_FAST " UINT_FMT, (mp_uint_t)ip[-1] - MP_BC_LOAD_FAST_MULTI);
             } else if (ip[-1] < MP_BC_STORE_FAST_MULTI + 16) {
-                printf("STORE_FAST " UINT_FMT, (mp_uint_t)ip[-1] - MP_BC_STORE_FAST_MULTI);
+                mp_printf(print, "STORE_FAST " UINT_FMT, (mp_uint_t)ip[-1] - MP_BC_STORE_FAST_MULTI);
             } else if (ip[-1] < MP_BC_UNARY_OP_MULTI + MP_UNARY_OP_NUM_BYTECODE) {
-                printf("UNARY_OP " UINT_FMT, (mp_uint_t)ip[-1] - MP_BC_UNARY_OP_MULTI);
+                mp_printf(print, "UNARY_OP " UINT_FMT, (mp_uint_t)ip[-1] - MP_BC_UNARY_OP_MULTI);
             } else if (ip[-1] < MP_BC_BINARY_OP_MULTI + MP_BINARY_OP_NUM_BYTECODE) {
                 mp_uint_t op = ip[-1] - MP_BC_BINARY_OP_MULTI;
-                printf("BINARY_OP " UINT_FMT " %s", op, qstr_str(mp_binary_op_method_name[op]));
+                mp_printf(print, "BINARY_OP " UINT_FMT " %s", op, qstr_str(mp_binary_op_method_name[op]));
             } else {
-                printf("code %p, byte code 0x%02x not implemented\n", ip - 1, ip[-1]);
+                mp_printf(print, "code %p, byte code 0x%02x not implemented\n", ip - 1, ip[-1]);
                 assert(0);
                 return ip;
             }
@@ -549,13 +546,13 @@ const byte *mp_bytecode_print_str(const byte *ip) {
     return ip;
 }
 
-void mp_bytecode_print2(const byte *ip, size_t len, const mp_uint_t *const_table) {
+void mp_bytecode_print2(const mp_print_t *print, const byte *ip, size_t len, const mp_uint_t *const_table) {
     mp_showbc_code_start = ip;
     mp_showbc_const_table = const_table;
     while (ip < len + mp_showbc_code_start) {
-        printf("%02u ", (uint)(ip - mp_showbc_code_start));
-        ip = mp_bytecode_print_str(ip);
-        printf("\n");
+        mp_printf(print, "%02u ", (uint)(ip - mp_showbc_code_start));
+        ip = mp_bytecode_print_str(print, ip);
+        mp_printf(print, "\n");
     }
 }
 
diff --git a/py/vm.c b/py/vm.c
index f30aed8ff1e36..393a2bbbd6513 100644
--- a/py/vm.c
+++ b/py/vm.c
@@ -39,7 +39,7 @@
 // *FORMAT-OFF*
 
 #if 0
-#define TRACE(ip) printf("sp=%d ", (int)(sp - &code_state->state[0] + 1)); mp_bytecode_print2(ip, 1, code_state->fun_bc->const_table);
+#define TRACE(ip) printf("sp=%d ", (int)(sp - &code_state->state[0] + 1)); mp_bytecode_print2(&mp_plat_print, ip, 1, code_state->fun_bc->const_table);
 #else
 #define TRACE(ip)
 #endif

From acdb0608b7622cc7af0bdbfc89b2696583c948ae Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 11 Sep 2020 23:00:03 +1000
Subject: [PATCH 0284/3533] py/parse: Pass in an mp_print_t to
 mp_parse_node_print.

So the output can be redirected if needed.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/unix/main.c |  2 +-
 py/parse.c        | 36 ++++++++++++++++++------------------
 py/parse.h        |  2 +-
 3 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/ports/unix/main.c b/ports/unix/main.c
index c38b7b0c287a9..0fe492a554cbd 100644
--- a/ports/unix/main.c
+++ b/ports/unix/main.c
@@ -133,7 +133,7 @@ STATIC int execute_from_lexer(int source_kind, const void *source, mp_parse_inpu
         // allow to print the parse tree in the coverage build
         if (mp_verbose_flag >= 3) {
             printf("----------------\n");
-            mp_parse_node_print(parse_tree.root, 0);
+            mp_parse_node_print(&mp_plat_print, parse_tree.root, 0);
             printf("----------------\n");
         }
         #endif
diff --git a/py/parse.c b/py/parse.c
index b93282165f88a..38cd215a9ff71 100644
--- a/py/parse.c
+++ b/py/parse.c
@@ -368,35 +368,35 @@ size_t mp_parse_node_extract_list(mp_parse_node_t *pn, size_t pn_kind, mp_parse_
 }
 
 #if MICROPY_DEBUG_PRINTERS
-void mp_parse_node_print(mp_parse_node_t pn, size_t indent) {
+void mp_parse_node_print(const mp_print_t *print, mp_parse_node_t pn, size_t indent) {
     if (MP_PARSE_NODE_IS_STRUCT(pn)) {
-        printf("[% 4d] ", (int)((mp_parse_node_struct_t *)pn)->source_line);
+        mp_printf(print, "[% 4d] ", (int)((mp_parse_node_struct_t *)pn)->source_line);
     } else {
-        printf("       ");
+        mp_printf(print, "       ");
     }
     for (size_t i = 0; i < indent; i++) {
-        printf(" ");
+        mp_printf(print, " ");
     }
     if (MP_PARSE_NODE_IS_NULL(pn)) {
-        printf("NULL\n");
+        mp_printf(print, "NULL\n");
     } else if (MP_PARSE_NODE_IS_SMALL_INT(pn)) {
         mp_int_t arg = MP_PARSE_NODE_LEAF_SMALL_INT(pn);
-        printf("int(" INT_FMT ")\n", arg);
+        mp_printf(print, "int(" INT_FMT ")\n", arg);
     } else if (MP_PARSE_NODE_IS_LEAF(pn)) {
         uintptr_t arg = MP_PARSE_NODE_LEAF_ARG(pn);
         switch (MP_PARSE_NODE_LEAF_KIND(pn)) {
             case MP_PARSE_NODE_ID:
-                printf("id(%s)\n", qstr_str(arg));
+                mp_printf(print, "id(%s)\n", qstr_str(arg));
                 break;
             case MP_PARSE_NODE_STRING:
-                printf("str(%s)\n", qstr_str(arg));
+                mp_printf(print, "str(%s)\n", qstr_str(arg));
                 break;
             case MP_PARSE_NODE_BYTES:
-                printf("bytes(%s)\n", qstr_str(arg));
+                mp_printf(print, "bytes(%s)\n", qstr_str(arg));
                 break;
             default:
                 assert(MP_PARSE_NODE_LEAF_KIND(pn) == MP_PARSE_NODE_TOKEN);
-                printf("tok(%u)\n", (uint)arg);
+                mp_printf(print, "tok(%u)\n", (uint)arg);
                 break;
         }
     } else {
@@ -404,19 +404,19 @@ void mp_parse_node_print(mp_parse_node_t pn, size_t indent) {
         mp_parse_node_struct_t *pns = (mp_parse_node_struct_t *)pn;
         if (MP_PARSE_NODE_STRUCT_KIND(pns) == RULE_const_object) {
             #if MICROPY_OBJ_REPR == MICROPY_OBJ_REPR_D
-            printf("literal const(%016llx)\n", (uint64_t)pns->nodes[0] | ((uint64_t)pns->nodes[1] << 32));
+            mp_printf(print, "literal const(%016llx)\n", (uint64_t)pns->nodes[0] | ((uint64_t)pns->nodes[1] << 32));
             #else
-            printf("literal const(%p)\n", (mp_obj_t)pns->nodes[0]);
+            mp_printf(print, "literal const(%p)\n", (mp_obj_t)pns->nodes[0]);
             #endif
         } else {
             size_t n = MP_PARSE_NODE_STRUCT_NUM_NODES(pns);
             #if USE_RULE_NAME
-            printf("%s(%u) (n=%u)\n", rule_name_table[MP_PARSE_NODE_STRUCT_KIND(pns)], (uint)MP_PARSE_NODE_STRUCT_KIND(pns), (uint)n);
+            mp_printf(print, "%s(%u) (n=%u)\n", rule_name_table[MP_PARSE_NODE_STRUCT_KIND(pns)], (uint)MP_PARSE_NODE_STRUCT_KIND(pns), (uint)n);
             #else
-            printf("rule(%u) (n=%u)\n", (uint)MP_PARSE_NODE_STRUCT_KIND(pns), (uint)n);
+            mp_printf(print, "rule(%u) (n=%u)\n", (uint)MP_PARSE_NODE_STRUCT_KIND(pns), (uint)n);
             #endif
             for (size_t i = 0; i < n; i++) {
-                mp_parse_node_print(pns->nodes[i], indent + 2);
+                mp_parse_node_print(print, pns->nodes[i], indent + 2);
             }
         }
     }
@@ -424,10 +424,10 @@ void mp_parse_node_print(mp_parse_node_t pn, size_t indent) {
 #endif // MICROPY_DEBUG_PRINTERS
 
 /*
-STATIC void result_stack_show(parser_t *parser) {
-    printf("result stack, most recent first\n");
+STATIC void result_stack_show(const mp_print_t *print, parser_t *parser) {
+    mp_printf(print, "result stack, most recent first\n");
     for (ssize_t i = parser->result_stack_top - 1; i >= 0; i--) {
-        mp_parse_node_print(parser->result_stack[i], 0);
+        mp_parse_node_print(print, parser->result_stack[i], 0);
     }
 }
 */
diff --git a/py/parse.h b/py/parse.h
index 4ed8a7ad12324..a6eb380047dc3 100644
--- a/py/parse.h
+++ b/py/parse.h
@@ -86,7 +86,7 @@ bool mp_parse_node_is_const_false(mp_parse_node_t pn);
 bool mp_parse_node_is_const_true(mp_parse_node_t pn);
 bool mp_parse_node_get_int_maybe(mp_parse_node_t pn, mp_obj_t *o);
 size_t mp_parse_node_extract_list(mp_parse_node_t *pn, size_t pn_kind, mp_parse_node_t **nodes);
-void mp_parse_node_print(mp_parse_node_t pn, size_t indent);
+void mp_parse_node_print(const mp_print_t *print, mp_parse_node_t pn, size_t indent);
 
 typedef enum {
     MP_PARSE_SINGLE_INPUT,

From b31cb21a3936b97af4a52b082e1f40c2061aeab7 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sat, 12 Sep 2020 13:47:59 +1000
Subject: [PATCH 0285/3533] stm32/servo: Fix angle and speed methods to work
 again with -ve args.

Fixes a regression introduced by 70affd9ba22e7f62666a9a2fafc2a3c0be9ef95a

Fixes issue #6403

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/servo.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/stm32/servo.c b/ports/stm32/servo.c
index a347c6bbd06d4..17084224637ec 100644
--- a/ports/stm32/servo.c
+++ b/ports/stm32/servo.c
@@ -278,7 +278,7 @@ STATIC mp_obj_t pyb_servo_angle(size_t n_args, const mp_obj_t *args) {
         return mp_obj_new_int((self->pulse_cur - self->pulse_centre) * 90 / self->pulse_angle_90);
     } else {
         #if MICROPY_PY_BUILTINS_FLOAT
-        self->pulse_dest = self->pulse_centre + (uint16_t)((mp_float_t)self->pulse_angle_90 * mp_obj_get_float(args[1]) / MICROPY_FLOAT_CONST(90.0));
+        self->pulse_dest = self->pulse_centre + (int16_t)((mp_float_t)self->pulse_angle_90 * mp_obj_get_float(args[1]) / MICROPY_FLOAT_CONST(90.0));
         #else
         self->pulse_dest = self->pulse_centre + self->pulse_angle_90 * mp_obj_get_int(args[1]) / 90;
         #endif
@@ -308,7 +308,7 @@ STATIC mp_obj_t pyb_servo_speed(size_t n_args, const mp_obj_t *args) {
         return mp_obj_new_int((self->pulse_cur - self->pulse_centre) * 100 / self->pulse_speed_100);
     } else {
         #if MICROPY_PY_BUILTINS_FLOAT
-        self->pulse_dest = self->pulse_centre + (uint16_t)((mp_float_t)self->pulse_speed_100 * mp_obj_get_float(args[1]) / MICROPY_FLOAT_CONST(100.0));
+        self->pulse_dest = self->pulse_centre + (int16_t)((mp_float_t)self->pulse_speed_100 * mp_obj_get_float(args[1]) / MICROPY_FLOAT_CONST(100.0));
         #else
         self->pulse_dest = self->pulse_centre + self->pulse_speed_100 * mp_obj_get_int(args[1]) / 100;
         #endif

From 504522bd02f9d9f9848d5a6e38427df3d1e4a6e3 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Fri, 11 Sep 2020 10:53:09 +1000
Subject: [PATCH 0286/3533] extmod/modbluetooth: Fix handling of optional
 data/uuid args.

For the following 3 functions, previously the code relied on whether the
arg was passed at all, to make it optional.  Now it allows them to be
explicitly `None` to indicate they are not used:

- gatts_notify(..., [data])
- gattc_discover_services(..., [uuid])
- gattc_discover_characteristics(..., [uuid])

Also ensure that the uuid arguments are actually instances of the uuid
type, and fix handling of the 5th arg in gattc_discover_characteristics().
---
 extmod/modbluetooth.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/extmod/modbluetooth.c b/extmod/modbluetooth.c
index a8a762ce32f24..14d0921c84f4d 100644
--- a/extmod/modbluetooth.c
+++ b/extmod/modbluetooth.c
@@ -679,7 +679,7 @@ STATIC mp_obj_t bluetooth_ble_gatts_notify(size_t n_args, const mp_obj_t *args)
     mp_int_t conn_handle = mp_obj_get_int(args[1]);
     mp_int_t value_handle = mp_obj_get_int(args[2]);
 
-    if (n_args == 4) {
+    if (n_args == 4 && args[3] != mp_const_none) {
         mp_buffer_info_t bufinfo = {0};
         mp_get_buffer_raise(args[3], &bufinfo, MP_BUFFER_READ);
         int err = mp_bluetooth_gatts_notify_send(conn_handle, value_handle, bufinfo.buf, bufinfo.len);
@@ -719,7 +719,10 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(bluetooth_ble_gatts_set_buffer_obj, 3
 STATIC mp_obj_t bluetooth_ble_gattc_discover_services(size_t n_args, const mp_obj_t *args) {
     mp_int_t conn_handle = mp_obj_get_int(args[1]);
     mp_obj_bluetooth_uuid_t *uuid = NULL;
-    if (n_args == 3) {
+    if (n_args == 3 && args[2] != mp_const_none) {
+        if (!mp_obj_is_type(args[2], &bluetooth_uuid_type)) {
+            mp_raise_TypeError(MP_ERROR_TEXT("UUID"));
+        }
         uuid = MP_OBJ_TO_PTR(args[2]);
     }
     return bluetooth_handle_errno(mp_bluetooth_gattc_discover_primary_services(conn_handle, uuid));
@@ -731,7 +734,10 @@ STATIC mp_obj_t bluetooth_ble_gattc_discover_characteristics(size_t n_args, cons
     mp_int_t start_handle = mp_obj_get_int(args[2]);
     mp_int_t end_handle = mp_obj_get_int(args[3]);
     mp_obj_bluetooth_uuid_t *uuid = NULL;
-    if (n_args == 3) {
+    if (n_args == 5 && args[4] != mp_const_none) {
+        if (!mp_obj_is_type(args[4], &bluetooth_uuid_type)) {
+            mp_raise_TypeError(MP_ERROR_TEXT("UUID"));
+        }
         uuid = MP_OBJ_TO_PTR(args[4]);
     }
     return bluetooth_handle_errno(mp_bluetooth_gattc_discover_characteristics(conn_handle, start_handle, end_handle, uuid));

From 6a6a5f9e151473bdcc1d14725d680691ff665a82 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Fri, 11 Sep 2020 11:43:53 +1000
Subject: [PATCH 0287/3533] extmod/modbluetooth: Make BLE.irq() method
 positional only.

Simplifcation now that the trigger arg has been removed.
---
 extmod/modbluetooth.c | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/extmod/modbluetooth.c b/extmod/modbluetooth.c
index 14d0921c84f4d..64cd383525665 100644
--- a/extmod/modbluetooth.c
+++ b/extmod/modbluetooth.c
@@ -384,27 +384,21 @@ STATIC mp_obj_t bluetooth_ble_config(size_t n_args, const mp_obj_t *args, mp_map
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_KW(bluetooth_ble_config_obj, 1, bluetooth_ble_config);
 
-STATIC mp_obj_t bluetooth_ble_irq(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
-    enum { ARG_handler };
-    static const mp_arg_t allowed_args[] = {
-        { MP_QSTR_handler, MP_ARG_OBJ | MP_ARG_REQUIRED, {.u_rom_obj = MP_ROM_NONE} },
-    };
-    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
-    mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
-    mp_obj_t callback = args[ARG_handler].u_obj;
-    if (callback != mp_const_none && !mp_obj_is_callable(callback)) {
-        mp_raise_ValueError(MP_ERROR_TEXT("invalid callback"));
+STATIC mp_obj_t bluetooth_ble_irq(mp_obj_t self_in, mp_obj_t handler_in) {
+    (void)self_in;
+    if (handler_in != mp_const_none && !mp_obj_is_callable(handler_in)) {
+        mp_raise_ValueError(MP_ERROR_TEXT("invalid handler"));
     }
 
     // Update the callback.
     MICROPY_PY_BLUETOOTH_ENTER
     mp_obj_bluetooth_ble_t *o = MP_OBJ_TO_PTR(MP_STATE_VM(bluetooth));
-    o->irq_handler = callback;
+    o->irq_handler = handler_in;
     MICROPY_PY_BLUETOOTH_EXIT
 
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(bluetooth_ble_irq_obj, 1, bluetooth_ble_irq);
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(bluetooth_ble_irq_obj, bluetooth_ble_irq);
 
 // ----------------------------------------------------------------------------
 // Bluetooth object: GAP

From 19faf550904c4e93427450994b7babe367eb9add Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Fri, 11 Sep 2020 11:45:09 +1000
Subject: [PATCH 0288/3533] docs/library/ubluetooth.rst: Clarify position/kw
 arguments.

Almost all ubluetooth functions are positional-only, but some have optional
args.  Make this clearer and show what the defaults are.
---
 docs/library/ubluetooth.rst | 40 ++++++++++++++++++-------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/docs/library/ubluetooth.rst b/docs/library/ubluetooth.rst
index f8dad7b8d1ed2..5635f4d69a763 100644
--- a/docs/library/ubluetooth.rst
+++ b/docs/library/ubluetooth.rst
@@ -28,15 +28,15 @@ Constructor
 Configuration
 -------------
 
-.. method:: BLE.active([active])
+.. method:: BLE.active([active], /)
 
     Optionally changes the active state of the BLE radio, and returns the
     current state.
 
     The radio must be made active before using any other methods on this class.
 
-.. method:: BLE.config('param')
-            BLE.config(param=value, ...)
+.. method:: BLE.config('param', /)
+            BLE.config(*, param=value, ...)
 
     Get or set configuration values of the BLE interface.  To get a value the
     parameter name should be quoted as a string, and just one parameter is
@@ -76,7 +76,7 @@ Configuration
 Event Handling
 --------------
 
-.. method:: BLE.irq(handler)
+.. method:: BLE.irq(handler, /)
 
     Registers a callback for events from the BLE stack. The *handler* takes two
     arguments, ``event`` (which will be one of the codes below) and ``data``
@@ -195,7 +195,7 @@ program.
 Broadcaster Role (Advertiser)
 -----------------------------
 
-.. method:: BLE.gap_advertise(interval_us, adv_data=None, resp_data=None, connectable=True)
+.. method:: BLE.gap_advertise(interval_us, adv_data=None, *, resp_data=None, connectable=True)
 
     Starts advertising at the specified interval (in **micro**\ seconds). This
     interval will be rounded down to the nearest 625us. To stop advertising, set
@@ -214,7 +214,7 @@ Broadcaster Role (Advertiser)
 Observer Role (Scanner)
 -----------------------
 
-.. method:: BLE.gap_scan(duration_ms, [interval_us], [window_us], [active])
+.. method:: BLE.gap_scan(duration_ms, interval_us=1280000, window_us=11250, active=False, /)
 
     Run a scan operation lasting for the specified duration (in **milli**\ seconds).
 
@@ -244,7 +244,7 @@ Observer Role (Scanner)
         * 0x04 - SCAN_RSP - scan response
 
     ``active`` can be set ``True`` if you want to receive scan responses in the results.
-    
+
     When scanning is stopped (either due to the duration finishing or when
     explicitly stopped), the ``_IRQ_SCAN_DONE`` event will be raised.
 
@@ -268,7 +268,7 @@ writes from a central to a given characteristic, use
 :meth:`gatts_write<BLE.gatts_write>` after registration. e.g.
 ``gatts_write(char_handle, bytes(100))``.
 
-.. method:: BLE.gatts_register_services(services_definition)
+.. method:: BLE.gatts_register_services(services_definition, /)
 
     Configures the peripheral with the specified services, replacing any
     existing services.
@@ -308,26 +308,26 @@ writes from a central to a given characteristic, use
 
     **Note:** Advertising must be stopped before registering services.
 
-.. method:: BLE.gatts_read(value_handle)
+.. method:: BLE.gatts_read(value_handle, /)
 
     Reads the local value for this handle (which has either been written by
     :meth:`gatts_write <BLE.gatts_write>` or by a remote central).
 
-.. method:: BLE.gatts_write(value_handle, data)
+.. method:: BLE.gatts_write(value_handle, data, /)
 
     Writes the local value for this handle, which can be read by a central.
 
-.. method:: BLE.gatts_notify(conn_handle, value_handle, [data])
+.. method:: BLE.gatts_notify(conn_handle, value_handle, data=None, /)
 
     Sends a notification request to a connected central.
 
-    If *data* is specified, then that value is sent to the central as part of
+    If *data* is not ``None``, then that value is sent to the central as part of
     the notification. The local value will not be modified.
 
-    Otherwise, if *data* is not specified, then the current local value (as
+    Otherwise, if *data* is ``None``, then the current local value (as
     set with :meth:`gatts_write <BLE.gatts_write>`) will be sent.
 
-.. method:: BLE.gatts_indicate(conn_handle, value_handle)
+.. method:: BLE.gatts_indicate(conn_handle, value_handle, /)
 
     Sends an indication request to a connected central.
 
@@ -361,7 +361,7 @@ Central Role (GATT Client)
 
     On success, the ``_IRQ_PERIPHERAL_CONNECT`` event will be raised.
 
-.. method:: BLE.gap_disconnect(conn_handle)
+.. method:: BLE.gap_disconnect(conn_handle, /)
 
     Disconnect the specified connection handle.
 
@@ -370,7 +370,7 @@ Central Role (GATT Client)
     Returns ``False`` if the connection handle wasn't connected, and ``True``
     otherwise.
 
-.. method:: BLE.gattc_discover_services(conn_handle, [uuid])
+.. method:: BLE.gattc_discover_services(conn_handle, uuid=None, /)
 
     Query a connected peripheral for its services.
 
@@ -379,7 +379,7 @@ Central Role (GATT Client)
     For each service discovered, the ``_IRQ_GATTC_SERVICE_RESULT`` event will
     be raised, followed by ``_IRQ_GATTC_SERVICE_DONE`` on completion.
 
-.. method:: BLE.gattc_discover_characteristics(conn_handle, start_handle, end_handle, [uuid])
+.. method:: BLE.gattc_discover_characteristics(conn_handle, start_handle, end_handle, uuid=None, /)
 
     Query a connected peripheral for characteristics in the specified range.
 
@@ -392,14 +392,14 @@ Central Role (GATT Client)
     For each characteristic discovered, the ``_IRQ_GATTC_CHARACTERISTIC_RESULT``
     event will be raised, followed by ``_IRQ_GATTC_CHARACTERISTIC_DONE`` on completion.
 
-.. method:: BLE.gattc_discover_descriptors(conn_handle, start_handle, end_handle)
+.. method:: BLE.gattc_discover_descriptors(conn_handle, start_handle, end_handle, /)
 
     Query a connected peripheral for descriptors in the specified range.
 
     For each descriptor discovered, the ``_IRQ_GATTC_DESCRIPTOR_RESULT`` event
     will be raised, followed by ``_IRQ_GATTC_DESCRIPTOR_DONE`` on completion.
 
-.. method:: BLE.gattc_read(conn_handle, value_handle)
+.. method:: BLE.gattc_read(conn_handle, value_handle, /)
 
     Issue a remote read to a connected peripheral for the specified
     characteristic or descriptor handle.
@@ -433,7 +433,7 @@ class UUID
 Constructor
 -----------
 
-.. class:: UUID(value)
+.. class:: UUID(value, /)
 
     Creates a UUID instance with the specified **value**.
 

From 5be3bfcb7e065bd95eb8460d2069524b934bcd0f Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Tue, 15 Sep 2020 11:38:58 +1000
Subject: [PATCH 0289/3533] extmod/modbluetooth: Print UUIDs correctly.

In particular, the printed string can now be re-evaluated to construct the
same UUID object.
---
 extmod/modbluetooth.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extmod/modbluetooth.c b/extmod/modbluetooth.c
index 64cd383525665..f77c7eb63cf22 100644
--- a/extmod/modbluetooth.c
+++ b/extmod/modbluetooth.c
@@ -181,7 +181,7 @@ STATIC void bluetooth_uuid_print(const mp_print_t *print, mp_obj_t self_in, mp_p
     (void)kind;
 
     mp_obj_bluetooth_uuid_t *self = MP_OBJ_TO_PTR(self_in);
-    mp_printf(print, "UUID%u(%s", self->type * 8, self->type <= 4 ? "0x" : "'");
+    mp_printf(print, "UUID(%s", self->type <= 4 ? "0x" : "'");
     for (int i = 0; i < self->type; ++i) {
         if (i == 4 || i == 6 || i == 8 || i == 10) {
             mp_printf(print, "-");

From c200759290bae8ceb74c91d29c0a521292d925f4 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Fri, 11 Sep 2020 12:26:09 +1000
Subject: [PATCH 0290/3533] docs/library/ubluetooth.rst: Clarify
 peripheral/central vs server/client

Previously this documentation assumed peripheral=server and central=client,
but this is not accurate or true to the implementation.
---
 docs/library/ubluetooth.rst | 130 +++++++++++++++++++++++-------------
 1 file changed, 82 insertions(+), 48 deletions(-)

diff --git a/docs/library/ubluetooth.rst b/docs/library/ubluetooth.rst
index 5635f4d69a763..e4471f8054a82 100644
--- a/docs/library/ubluetooth.rst
+++ b/docs/library/ubluetooth.rst
@@ -6,8 +6,8 @@
 
 This module provides an interface to a Bluetooth controller on a board.
 Currently this supports Bluetooth Low Energy (BLE) in Central, Peripheral,
-Broadcaster, and Observer roles, and a device may operate in multiple
-roles concurrently.
+Broadcaster, and Observer roles, as well as GATT Server and Client. A device
+may operate in multiple roles concurrently.
 
 This API is intended to match the low-level Bluetooth protocol and provide
 building-blocks for higher-level abstractions such as specific device types.
@@ -70,8 +70,7 @@ Configuration
       incoming events.  This buffer is global to the entire BLE driver and so
       handles incoming data for all events, including all characteristics.
       Increasing this allows better handling of bursty incoming data (for
-      example scan results) and the ability for a central role to receive
-      larger characteristic values.
+      example scan results) and the ability to receive larger characteristic values.
 
 Event Handling
 --------------
@@ -99,10 +98,10 @@ Event Handling
                 # A central has disconnected from this peripheral.
                 conn_handle, addr_type, addr = data
             elif event == _IRQ_GATTS_WRITE:
-                # A central has written to this characteristic or descriptor.
+                # A client has written to this characteristic or descriptor.
                 conn_handle, attr_handle = data
             elif event == _IRQ_GATTS_READ_REQUEST:
-                # A central has issued a read. Note: this is a hard IRQ.
+                # A client has issued a read. Note: this is a hard IRQ.
                 # Return None to deny the read.
                 # Note: This event is not supported on ESP32.
                 conn_handle, attr_handle = data
@@ -153,13 +152,13 @@ Event Handling
                 # Note: Status will be zero on success, implementation-specific value otherwise.
                 conn_handle, value_handle, status = data
             elif event == _IRQ_GATTC_NOTIFY:
-                # A peripheral has sent a notify request.
+                # A server has sent a notify request.
                 conn_handle, value_handle, notify_data = data
             elif event == _IRQ_GATTC_INDICATE:
-                # A peripheral has sent an indicate request.
+                # A server has sent an indicate request.
                 conn_handle, value_handle, notify_data = data
             elif event == _IRQ_GATTS_INDICATE_DONE:
-                # A central has acknowledged the indication.
+                # A client has acknowledged the indication.
                 # Note: Status will be zero on successful acknowledgment, implementation-specific value otherwise.
                 conn_handle, value_handle, status = data
 
@@ -249,28 +248,74 @@ Observer Role (Scanner)
     explicitly stopped), the ``_IRQ_SCAN_DONE`` event will be raised.
 
 
-Peripheral Role (GATT Server)
------------------------------
+Central Role
+------------
+
+A central device can connect to peripherals that it has discovered using the observer role (see :meth:`gap_scan<BLE.gap_scan>`) or with a known address.
+
+.. method:: BLE.gap_connect(addr_type, addr, scan_duration_ms=2000, /)
+
+    Connect to a peripheral.
+
+    See :meth:`gap_scan <BLE.gap_scan>` for details about address types.
+
+    On success, the ``_IRQ_PERIPHERAL_CONNECT`` event will be raised.
+
+
+Peripheral Role
+---------------
+
+A peripheral device is expected to send connectable advertisements (see
+:meth:`gap_advertise<BLE.gap_advertise>`). It will usually be acting as a GATT
+server, having first registered services and characteristics using
+:meth:`gatts_register_services<BLE.gatts_register_services>`.
+
+When a central connects, the ``_IRQ_CENTRAL_CONNECT`` event will be raised.
+
+
+Central & Peripheral Roles
+--------------------------
+
+.. method:: BLE.gap_disconnect(conn_handle, /)
+
+    Disconnect the specified connection handle. This can either be a
+    central that has connected to this device (if acting as a peripheral)
+    or a peripheral that was previously connected to by this device (if acting
+    as a central).
+
+    On success, the ``_IRQ_PERIPHERAL_DISCONNECT`` or ``_IRQ_CENTRAL_DISCONNECT``
+    event will be raised.
+
+    Returns ``False`` if the connection handle wasn't connected, and ``True``
+    otherwise.
+
 
-A BLE peripheral has a set of registered services. Each service may contain
+GATT Server
+-----------
+
+A GATT server has a set of registered services. Each service may contain
 characteristics, which each have a value. Characteristics can also contain
 descriptors, which themselves have values.
 
 These values are stored locally, and are accessed by their "value handle" which
 is generated during service registration. They can also be read from or written
-to by a remote central device. Additionally, a peripheral can "notify" a
-characteristic to a connected central via a connection handle.
+to by a remote client device. Additionally, a server can "notify" a
+characteristic to a connected client via a connection handle.
+
+A device in either central or peripheral roles may function as a GATT server,
+however in most cases it will be more common for a peripheral device to act
+as the server.
 
 Characteristics and descriptors have a default maximum size of 20 bytes.
-Anything written to them by a central will be truncated to this length. However,
+Anything written to them by a client will be truncated to this length. However,
 any local write will increase the maximum size, so if you want to allow larger
-writes from a central to a given characteristic, use
+writes from a client to a given characteristic, use
 :meth:`gatts_write<BLE.gatts_write>` after registration. e.g.
 ``gatts_write(char_handle, bytes(100))``.
 
 .. method:: BLE.gatts_register_services(services_definition, /)
 
-    Configures the peripheral with the specified services, replacing any
+    Configures the server with the specified services, replacing any
     existing services.
 
     *services_definition* is a list of **services**, where each **service** is a
@@ -311,17 +356,17 @@ writes from a central to a given characteristic, use
 .. method:: BLE.gatts_read(value_handle, /)
 
     Reads the local value for this handle (which has either been written by
-    :meth:`gatts_write <BLE.gatts_write>` or by a remote central).
+    :meth:`gatts_write <BLE.gatts_write>` or by a remote client).
 
 .. method:: BLE.gatts_write(value_handle, data, /)
 
-    Writes the local value for this handle, which can be read by a central.
+    Writes the local value for this handle, which can be read by a client.
 
 .. method:: BLE.gatts_notify(conn_handle, value_handle, data=None, /)
 
-    Sends a notification request to a connected central.
+    Sends a notification request to a connected client.
 
-    If *data* is not ``None``, then that value is sent to the central as part of
+    If *data* is not ``None``, then that value is sent to the client as part of
     the notification. The local value will not be modified.
 
     Otherwise, if *data* is ``None``, then the current local value (as
@@ -329,7 +374,7 @@ writes from a central to a given characteristic, use
 
 .. method:: BLE.gatts_indicate(conn_handle, value_handle, /)
 
-    Sends an indication request to a connected central.
+    Sends an indication request to a connected client.
 
     **Note:** This does not currently support sending a custom value, it will
     always send the current local value (as set with :meth:`gatts_write
@@ -349,30 +394,19 @@ writes from a central to a given characteristic, use
     be cleared after reading. This feature is useful when implementing something
     like the Nordic UART Service.
 
+GATT Client
+-----------
 
-Central Role (GATT Client)
---------------------------
-
-.. method:: BLE.gap_connect(addr_type, addr, scan_duration_ms=2000, /)
-
-    Connect to a peripheral.
-
-    See :meth:`gatts_write <BLE.gap_scan>` for details about address types.
-
-    On success, the ``_IRQ_PERIPHERAL_CONNECT`` event will be raised.
-
-.. method:: BLE.gap_disconnect(conn_handle, /)
-
-    Disconnect the specified connection handle.
-
-    On success, the ``_IRQ_PERIPHERAL_DISCONNECT`` event will be raised.
+A GATT client can discover and read/write characteristics on a remote GATT server.
 
-    Returns ``False`` if the connection handle wasn't connected, and ``True``
-    otherwise.
+It is more common for a central role device to act as the GATT client, however
+it's also possible for a peripheral to act as a client in order to discover
+information about the central that has connected to it (e.g. to read the
+device name from the device information service).
 
 .. method:: BLE.gattc_discover_services(conn_handle, uuid=None, /)
 
-    Query a connected peripheral for its services.
+    Query a connected server for its services.
 
     Optionally specify a service *uuid* to query for that service only.
 
@@ -381,7 +415,7 @@ Central Role (GATT Client)
 
 .. method:: BLE.gattc_discover_characteristics(conn_handle, start_handle, end_handle, uuid=None, /)
 
-    Query a connected peripheral for characteristics in the specified range.
+    Query a connected server for characteristics in the specified range.
 
     Optionally specify a characteristic *uuid* to query for that
     characteristic only.
@@ -394,14 +428,14 @@ Central Role (GATT Client)
 
 .. method:: BLE.gattc_discover_descriptors(conn_handle, start_handle, end_handle, /)
 
-    Query a connected peripheral for descriptors in the specified range.
+    Query a connected server for descriptors in the specified range.
 
     For each descriptor discovered, the ``_IRQ_GATTC_DESCRIPTOR_RESULT`` event
     will be raised, followed by ``_IRQ_GATTC_DESCRIPTOR_DONE`` on completion.
 
 .. method:: BLE.gattc_read(conn_handle, value_handle, /)
 
-    Issue a remote read to a connected peripheral for the specified
+    Issue a remote read to a connected server for the specified
     characteristic or descriptor handle.
 
     When a value is available, the ``_IRQ_GATTC_READ_RESULT`` event will be
@@ -409,20 +443,20 @@ Central Role (GATT Client)
 
 .. method:: BLE.gattc_write(conn_handle, value_handle, data, mode=0, /)
 
-    Issue a remote write to a connected peripheral for the specified
+    Issue a remote write to a connected server for the specified
     characteristic or descriptor handle.
 
     The argument *mode* specifies the write behaviour, with the currently
     supported values being:
 
         * ``mode=0`` (default) is a write-without-response: the write will
-          be sent to the remote peripheral but no confirmation will be
+          be sent to the remote server but no confirmation will be
           returned, and no event will be raised.
-        * ``mode=1`` is a write-with-response: the remote peripheral is
+        * ``mode=1`` is a write-with-response: the remote server is
           requested to send a response/acknowledgement that it received the
           data.
 
-    If a response is received from the remote peripheral the
+    If a response is received from the remote server the
     ``_IRQ_GATTC_WRITE_DONE`` event will be raised.
 
 

From fe642ced43809f932eaa8e3396c8bd0f8265de09 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Fri, 18 Sep 2020 12:50:05 +1000
Subject: [PATCH 0291/3533] tests/multi_bluetooth: Update UUID format in .exp
 files.

---
 tests/multi_bluetooth/ble_characteristic.py.exp          | 2 +-
 tests/multi_bluetooth/ble_gap_device_name.py.exp         | 2 +-
 tests/multi_bluetooth/ble_gatt_data_transfer.py.exp      | 6 +++---
 tests/multi_bluetooth/ble_gattc_discover_services.py.exp | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/tests/multi_bluetooth/ble_characteristic.py.exp b/tests/multi_bluetooth/ble_characteristic.py.exp
index 25b5544efc459..90dc46c06fd57 100644
--- a/tests/multi_bluetooth/ble_characteristic.py.exp
+++ b/tests/multi_bluetooth/ble_characteristic.py.exp
@@ -14,7 +14,7 @@ _IRQ_CENTRAL_DISCONNECT
 --- instance1 ---
 gap_connect
 _IRQ_PERIPHERAL_CONNECT
-_IRQ_GATTC_CHARACTERISTIC_RESULT UUID128('00000000-1111-2222-3333-444444444444')
+_IRQ_GATTC_CHARACTERISTIC_RESULT UUID('00000000-1111-2222-3333-444444444444')
 gattc_read
 _IRQ_GATTC_READ_RESULT b'periph0'
 _IRQ_GATTC_READ_DONE 0
diff --git a/tests/multi_bluetooth/ble_gap_device_name.py.exp b/tests/multi_bluetooth/ble_gap_device_name.py.exp
index 377df90dee356..0f4ee6e3dc576 100644
--- a/tests/multi_bluetooth/ble_gap_device_name.py.exp
+++ b/tests/multi_bluetooth/ble_gap_device_name.py.exp
@@ -11,7 +11,7 @@ _IRQ_CENTRAL_DISCONNECT
 gap_connect
 _IRQ_PERIPHERAL_CONNECT
 gattc_discover_characteristics
-_IRQ_GATTC_CHARACTERISTIC_RESULT UUID16(0x2a00)
+_IRQ_GATTC_CHARACTERISTIC_RESULT UUID(0x2a00)
 gattc_read
 _IRQ_GATTC_READ_RESULT b'GAP_NAME0'
 gap_disconnect: True
diff --git a/tests/multi_bluetooth/ble_gatt_data_transfer.py.exp b/tests/multi_bluetooth/ble_gatt_data_transfer.py.exp
index a1b3cbcd07374..94a0718108c1e 100644
--- a/tests/multi_bluetooth/ble_gatt_data_transfer.py.exp
+++ b/tests/multi_bluetooth/ble_gatt_data_transfer.py.exp
@@ -11,9 +11,9 @@ _IRQ_CENTRAL_DISCONNECT
 --- instance1 ---
 gap_connect
 _IRQ_PERIPHERAL_CONNECT
-_IRQ_GATTC_CHARACTERISTIC_RESULT UUID128('00000002-1111-2222-3333-444444444444')
-_IRQ_GATTC_CHARACTERISTIC_RESULT UUID128('00000003-1111-2222-3333-444444444444')
-_IRQ_GATTC_CHARACTERISTIC_RESULT UUID128('00000004-1111-2222-3333-444444444444')
+_IRQ_GATTC_CHARACTERISTIC_RESULT UUID('00000002-1111-2222-3333-444444444444')
+_IRQ_GATTC_CHARACTERISTIC_RESULT UUID('00000003-1111-2222-3333-444444444444')
+_IRQ_GATTC_CHARACTERISTIC_RESULT UUID('00000004-1111-2222-3333-444444444444')
 _IRQ_GATTC_CHARACTERISTIC_DONE
 gattc_write
 gattc_write
diff --git a/tests/multi_bluetooth/ble_gattc_discover_services.py.exp b/tests/multi_bluetooth/ble_gattc_discover_services.py.exp
index 06c36b249368a..7f4d8da81ad8c 100644
--- a/tests/multi_bluetooth/ble_gattc_discover_services.py.exp
+++ b/tests/multi_bluetooth/ble_gattc_discover_services.py.exp
@@ -5,7 +5,7 @@ _IRQ_CENTRAL_DISCONNECT
 --- instance1 ---
 gap_connect
 _IRQ_PERIPHERAL_CONNECT
-_IRQ_GATTC_SERVICE_RESULT UUID16(0x180d)
-_IRQ_GATTC_SERVICE_RESULT UUID128('a5a5a5a5-ffff-9999-1111-5a5a5a5a5a5a')
+_IRQ_GATTC_SERVICE_RESULT UUID(0x180d)
+_IRQ_GATTC_SERVICE_RESULT UUID('a5a5a5a5-ffff-9999-1111-5a5a5a5a5a5a')
 gap_disconnect: True
 _IRQ_PERIPHERAL_DISCONNECT

From f271b96b5c8d6a4abedc81459a1c5710eb187abb Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Fri, 11 Sep 2020 13:24:12 +1000
Subject: [PATCH 0292/3533] docs/library/ubluetooth.rst: Add docs for MTU API.

---
 docs/library/ubluetooth.rst | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/docs/library/ubluetooth.rst b/docs/library/ubluetooth.rst
index e4471f8054a82..03d03583a1cce 100644
--- a/docs/library/ubluetooth.rst
+++ b/docs/library/ubluetooth.rst
@@ -72,6 +72,13 @@ Configuration
       Increasing this allows better handling of bursty incoming data (for
       example scan results) and the ability to receive larger characteristic values.
 
+    - ``'mtu'``: Get/set the MTU that will be used during an MTU exchange. The
+      resulting MTU will be the minimum of this and the remote device's MTU.
+      MTU exchange will not happen automatically (unless the remote device initiates
+      it), and must be manually initiated with
+      :meth:`gattc_exchange_mtu<BLE.gattc_exchange_mtu>`.
+      Use the ``_IRQ_MTU_EXCHANGED`` event to discover the MTU for a given connection.
+
 Event Handling
 --------------
 
@@ -161,6 +168,9 @@ Event Handling
                 # A client has acknowledged the indication.
                 # Note: Status will be zero on successful acknowledgment, implementation-specific value otherwise.
                 conn_handle, value_handle, status = data
+            elif event == _IRQ_MTU_EXCHANGED:
+                # MTU exchange complete (either initiated by us or the remote device).
+                conn_handle, mtu = data
 
 The event codes are::
 
@@ -185,6 +195,7 @@ The event codes are::
     _IRQ_GATTC_NOTIFY = const(18)
     _IRQ_GATTC_INDICATE = const(19)
     _IRQ_GATTS_INDICATE_DONE = const(20)
+    _IRQ_MTU_EXCHANGED = const(21)
 
 In order to save space in the firmware, these constants are not included on the
 :mod:`ubluetooth` module. Add the ones that you need from the list above to your
@@ -459,6 +470,18 @@ device name from the device information service).
     If a response is received from the remote server the
     ``_IRQ_GATTC_WRITE_DONE`` event will be raised.
 
+.. method:: BLE.gattc_exchange_mtu(conn_handle, /)
+
+    Initiate MTU exchange with a connected server, using the preferred MTU
+    set using ``BLE.config(mtu=value)``.
+
+    The ``_IRQ_MTU_EXCHANGED`` event will be raised when MTU exchange
+    completes.
+
+    **Note:** MTU exchange is typically initiated by the central. When using
+    the BlueKitchen stack in the central role, it does not support a remote
+    peripheral initiating the MTU exchange. NimBLE works for both roles.
+
 
 class UUID
 ----------

From 857e2c8fd54bc1d5ec3d3c0a38e4ac989e91413a Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Fri, 11 Sep 2020 18:12:36 +1000
Subject: [PATCH 0293/3533] extmod/modbluetooth: Implement MTU.

---
 extmod/btstack/modbluetooth_btstack.c | 36 ++++++++++++++++++++--
 extmod/modbluetooth.c                 | 28 +++++++++++++++++
 extmod/modbluetooth.h                 | 12 ++++++++
 extmod/nimble/modbluetooth_nimble.c   | 44 +++++++++++++++++++++++++--
 4 files changed, 116 insertions(+), 4 deletions(-)

diff --git a/extmod/btstack/modbluetooth_btstack.c b/extmod/btstack/modbluetooth_btstack.c
index cde802a61f5f4..ae96035868877 100644
--- a/extmod/btstack/modbluetooth_btstack.c
+++ b/extmod/btstack/modbluetooth_btstack.c
@@ -264,6 +264,11 @@ STATIC void btstack_packet_handler_att_server(uint8_t packet_type, uint16_t chan
         uint16_t value_handle = att_event_handle_value_indication_complete_get_attribute_handle(packet);
         uint8_t status = att_event_handle_value_indication_complete_get_status(packet);
         mp_bluetooth_gatts_on_indicate_complete(conn_handle, value_handle, status);
+    } else if (event_type == ATT_EVENT_MTU_EXCHANGE_COMPLETE) {
+        // This is triggered in peripheral mode, when exchange initiated by us or remote.
+        uint16_t conn_handle = att_event_mtu_exchange_complete_get_handle(packet);
+        uint16_t mtu = att_event_mtu_exchange_complete_get_MTU(packet);
+        mp_bluetooth_gatts_on_mtu_exchanged(conn_handle, mtu);
     } else if (event_type == HCI_EVENT_LE_META || event_type == HCI_EVENT_DISCONNECTION_COMPLETE) {
         // Ignore, duplicated by att_server.c.
     } else {
@@ -339,8 +344,6 @@ STATIC void btstack_packet_handler(uint8_t packet_type, uint8_t *packet, uint8_t
         DEBUG_printf("  --> btstack # conns changed\n");
     } else if (event_type == HCI_EVENT_VENDOR_SPECIFIC) {
         DEBUG_printf("  --> hci vendor specific\n");
-    } else if (event_type == GATT_EVENT_MTU) {
-        DEBUG_printf("  --> hci MTU\n");
     } else if (event_type == HCI_EVENT_DISCONNECTION_COMPLETE) {
         DEBUG_printf("  --> hci disconnect complete\n");
         uint16_t conn_handle = hci_event_disconnection_complete_get_connection_handle(packet);
@@ -621,6 +624,9 @@ int mp_bluetooth_init(void) {
 
     #if MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE
     gatt_client_init();
+
+    // We always require explicitly exchanging MTU with ble.gattc_exchange_mtu().
+    gatt_client_mtu_enable_auto_negotiation(false);
     #endif
 
     // Register for HCI events.
@@ -1042,6 +1048,24 @@ int mp_bluetooth_gatts_set_buffer(uint16_t value_handle, size_t len, bool append
     return mp_bluetooth_gatts_db_resize(MP_STATE_PORT(bluetooth_btstack_root_pointers)->gatts_db, value_handle, len, append);
 }
 
+int mp_bluetooth_get_preferred_mtu(void) {
+    if (!mp_bluetooth_is_active()) {
+        mp_raise_OSError(ERRNO_BLUETOOTH_NOT_ACTIVE);
+    }
+    return l2cap_max_le_mtu();
+}
+
+int mp_bluetooth_set_preferred_mtu(uint16_t mtu) {
+    if (!mp_bluetooth_is_active()) {
+        return ERRNO_BLUETOOTH_NOT_ACTIVE;
+    }
+    l2cap_set_max_le_mtu(mtu);
+    if (l2cap_max_le_mtu() != mtu) {
+        return MP_EINVAL;
+    }
+    return 0;
+}
+
 int mp_bluetooth_gap_disconnect(uint16_t conn_handle) {
     DEBUG_printf("mp_bluetooth_gap_disconnect\n");
     gap_disconnect(conn_handle);
@@ -1204,6 +1228,14 @@ int mp_bluetooth_gattc_write(uint16_t conn_handle, uint16_t value_handle, const
 
     return btstack_error_to_errno(err);
 }
+
+int mp_bluetooth_gattc_exchange_mtu(uint16_t conn_handle) {
+    DEBUG_printf("mp_bluetooth_exchange_mtu: conn_handle=%d mtu=%d\n", conn_handle, l2cap_max_le_mtu());
+
+    gatt_client_send_mtu_negotiation(&btstack_packet_handler_att_server, conn_handle);
+
+    return 0;
+}
 #endif // MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE
 
 #endif // MICROPY_PY_BLUETOOTH && MICROPY_BLUETOOTH_BTSTACK
diff --git a/extmod/modbluetooth.c b/extmod/modbluetooth.c
index f77c7eb63cf22..daf9cd0d1984b 100644
--- a/extmod/modbluetooth.c
+++ b/extmod/modbluetooth.c
@@ -316,6 +316,8 @@ STATIC mp_obj_t bluetooth_ble_config(size_t n_args, const mp_obj_t *args, mp_map
             }
             case MP_QSTR_rxbuf:
                 return mp_obj_new_int(self->ringbuf.size);
+            case MP_QSTR_mtu:
+                return mp_obj_new_int(mp_bluetooth_get_preferred_mtu());
             default:
                 mp_raise_ValueError(MP_ERROR_TEXT("unknown config param"));
         }
@@ -368,6 +370,11 @@ STATIC mp_obj_t bluetooth_ble_config(size_t n_args, const mp_obj_t *args, mp_map
                         m_del(uint8_t, old_irq_data_buf, old_irq_data_alloc);
                         break;
                     }
+                    case MP_QSTR_mtu: {
+                        mp_int_t mtu = mp_obj_get_int(e->value);
+                        bluetooth_handle_errno(mp_bluetooth_set_preferred_mtu(mtu));
+                        break;
+                    }
                     case MP_QSTR_addr_mode: {
                         mp_int_t addr_mode = mp_obj_get_int(e->value);
                         mp_bluetooth_set_address_mode(addr_mode);
@@ -770,6 +777,13 @@ STATIC mp_obj_t bluetooth_ble_gattc_write(size_t n_args, const mp_obj_t *args) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(bluetooth_ble_gattc_write_obj, 4, 5, bluetooth_ble_gattc_write);
 
+STATIC mp_obj_t bluetooth_ble_gattc_exchange_mtu(mp_obj_t self_in, mp_obj_t conn_handle_in) {
+    (void)self_in;
+    uint16_t conn_handle = mp_obj_get_int(conn_handle_in);
+    return bluetooth_handle_errno(mp_bluetooth_gattc_exchange_mtu(conn_handle));
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(bluetooth_ble_gattc_exchange_mtu_obj, bluetooth_ble_gattc_exchange_mtu);
+
 #endif // MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE
 
 // ----------------------------------------------------------------------------
@@ -802,6 +816,7 @@ STATIC const mp_rom_map_elem_t bluetooth_ble_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_gattc_discover_descriptors), MP_ROM_PTR(&bluetooth_ble_gattc_discover_descriptors_obj) },
     { MP_ROM_QSTR(MP_QSTR_gattc_read), MP_ROM_PTR(&bluetooth_ble_gattc_read_obj) },
     { MP_ROM_QSTR(MP_QSTR_gattc_write), MP_ROM_PTR(&bluetooth_ble_gattc_write_obj) },
+    { MP_ROM_QSTR(MP_QSTR_gattc_exchange_mtu), MP_ROM_PTR(&bluetooth_ble_gattc_exchange_mtu_obj) },
     #endif
 };
 STATIC MP_DEFINE_CONST_DICT(bluetooth_ble_locals_dict, bluetooth_ble_locals_dict_table);
@@ -911,6 +926,9 @@ STATIC mp_obj_t bluetooth_ble_invoke_irq(mp_obj_t none_in) {
         } else if (event == MP_BLUETOOTH_IRQ_GATTS_INDICATE_DONE) {
             // conn_handle, value_handle, status
             ringbuf_extract(&o->ringbuf, data_tuple, 2, 1, NULL, 0, NULL, NULL);
+        } else if (event == MP_BLUETOOTH_IRQ_MTU_EXCHANGED) {
+            // conn_handle, mtu
+            ringbuf_extract(&o->ringbuf, data_tuple, 2, 0, NULL, 0, NULL, NULL);
         #if MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE
         } else if (event == MP_BLUETOOTH_IRQ_SCAN_RESULT) {
             // addr_type, addr, adv_type, rssi, adv_data
@@ -1184,6 +1202,16 @@ bool mp_bluetooth_gatts_on_read_request(uint16_t conn_handle, uint16_t value_han
 }
 #endif
 
+void mp_bluetooth_gatts_on_mtu_exchanged(uint16_t conn_handle, uint16_t value) {
+    MICROPY_PY_BLUETOOTH_ENTER
+    mp_obj_bluetooth_ble_t *o = MP_OBJ_TO_PTR(MP_STATE_VM(bluetooth));
+    if (enqueue_irq(o, 2 + 2, MP_BLUETOOTH_IRQ_MTU_EXCHANGED)) {
+        ringbuf_put16(&o->ringbuf, conn_handle);
+        ringbuf_put16(&o->ringbuf, value);
+    }
+    schedule_ringbuf(atomic_state);
+}
+
 void mp_bluetooth_gatts_db_create_entry(mp_gatts_db_t db, uint16_t handle, size_t len) {
     mp_map_elem_t *elem = mp_map_lookup(db, MP_OBJ_NEW_SMALL_INT(handle), MP_MAP_LOOKUP_ADD_IF_NOT_FOUND);
     mp_bluetooth_gatts_db_entry_t *entry = m_new(mp_bluetooth_gatts_db_entry_t, 1);
diff --git a/extmod/modbluetooth.h b/extmod/modbluetooth.h
index 23ff97bc61806..2df4c3c25f17b 100644
--- a/extmod/modbluetooth.h
+++ b/extmod/modbluetooth.h
@@ -100,6 +100,7 @@
 #define MP_BLUETOOTH_IRQ_GATTC_NOTIFY                   (18)
 #define MP_BLUETOOTH_IRQ_GATTC_INDICATE                 (19)
 #define MP_BLUETOOTH_IRQ_GATTS_INDICATE_DONE            (20)
+#define MP_BLUETOOTH_IRQ_MTU_EXCHANGED                  (21)
 
 #define MP_BLUETOOTH_ADDRESS_MODE_PUBLIC (0)
 #define MP_BLUETOOTH_ADDRESS_MODE_RANDOM (1)
@@ -131,6 +132,7 @@ _IRQ_GATTC_WRITE_DONE = const(17)
 _IRQ_GATTC_NOTIFY = const(18)
 _IRQ_GATTC_INDICATE = const(19)
 _IRQ_GATTS_INDICATE_DONE = const(20)
+_IRQ_MTU_EXCHANGED = const(21)
 */
 
 // Common UUID type.
@@ -212,6 +214,10 @@ int mp_bluetooth_gatts_set_buffer(uint16_t value_handle, size_t len, bool append
 // Disconnect from a central or peripheral.
 int mp_bluetooth_gap_disconnect(uint16_t conn_handle);
 
+// Set/get the MTU that we will respond to a MTU exchange with.
+int mp_bluetooth_get_preferred_mtu(void);
+int mp_bluetooth_set_preferred_mtu(uint16_t mtu);
+
 #if MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE
 // Start a discovery (scan). Set duration to zero to run continuously.
 int mp_bluetooth_gap_scan_start(int32_t duration_ms, int32_t interval_us, int32_t window_us, bool active_scan);
@@ -236,6 +242,9 @@ int mp_bluetooth_gattc_read(uint16_t conn_handle, uint16_t value_handle);
 
 // Write the value to the remote peripheral.
 int mp_bluetooth_gattc_write(uint16_t conn_handle, uint16_t value_handle, const uint8_t *value, size_t *value_len, unsigned int mode);
+
+// Initiate MTU exchange for a specific connection using the preferred MTU.
+int mp_bluetooth_gattc_exchange_mtu(uint16_t conn_handle);
 #endif
 
 /////////////////////////////////////////////////////////////////////////////
@@ -255,6 +264,9 @@ void mp_bluetooth_gatts_on_indicate_complete(uint16_t conn_handle, uint16_t valu
 bool mp_bluetooth_gatts_on_read_request(uint16_t conn_handle, uint16_t value_handle);
 #endif
 
+// Call this when an MTU exchange completes.
+void mp_bluetooth_gatts_on_mtu_exchanged(uint16_t conn_handle, uint16_t value);
+
 #if MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE
 // Notify modbluetooth that scan has finished, either timeout, manually, or by some other action (e.g. connecting).
 void mp_bluetooth_gap_on_scan_complete(void);
diff --git a/extmod/nimble/modbluetooth_nimble.c b/extmod/nimble/modbluetooth_nimble.c
index 9ca90b602476f..c0d6d64cfc1f0 100644
--- a/extmod/nimble/modbluetooth_nimble.c
+++ b/extmod/nimble/modbluetooth_nimble.c
@@ -288,9 +288,17 @@ STATIC int gap_event_cb(struct ble_gap_event *event, void *arg) {
                 // Map "done/ack" to 0, otherwise pass the status directly.
                 mp_bluetooth_gatts_on_indicate_complete(event->notify_tx.conn_handle, event->notify_tx.attr_handle, event->notify_tx.status == BLE_HS_EDONE ? 0 : event->notify_tx.status);
             }
+            break;
         }
-    }
 
+        case BLE_GAP_EVENT_MTU: {
+            if (event->mtu.channel_id == BLE_L2CAP_CID_ATT) {
+                DEBUG_printf("gap_event_cb: mtu update: conn_handle=%d cid=%d mtu=%d\n", event->mtu.conn_handle, event->mtu.channel_id, event->mtu.value);
+                mp_bluetooth_gatts_on_mtu_exchanged(event->mtu.conn_handle, event->mtu.value);
+            }
+            break;
+        }
+    }
     return 0;
 }
 
@@ -637,7 +645,7 @@ int mp_bluetooth_gatts_register_service_begin(bool append) {
     return 0;
 }
 
-int mp_bluetooth_gatts_register_service_end() {
+int mp_bluetooth_gatts_register_service_end(void) {
     int ret = ble_gatts_start();
     if (ret != 0) {
         return ble_hs_err_to_errno(ret);
@@ -769,6 +777,23 @@ int mp_bluetooth_gatts_set_buffer(uint16_t value_handle, size_t len, bool append
     return mp_bluetooth_gatts_db_resize(MP_STATE_PORT(bluetooth_nimble_root_pointers)->gatts_db, value_handle, len, append);
 }
 
+int mp_bluetooth_get_preferred_mtu(void) {
+    if (!mp_bluetooth_is_active()) {
+        mp_raise_OSError(ERRNO_BLUETOOTH_NOT_ACTIVE);
+    }
+    return ble_att_preferred_mtu();
+}
+
+int mp_bluetooth_set_preferred_mtu(uint16_t mtu) {
+    if (!mp_bluetooth_is_active()) {
+        return ERRNO_BLUETOOTH_NOT_ACTIVE;
+    }
+    if (ble_att_set_preferred_mtu(mtu)) {
+        return MP_EINVAL;
+    }
+    return 0;
+}
+
 #if MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE
 
 STATIC void gattc_on_data_available(uint8_t event, uint16_t conn_handle, uint16_t value_handle, const struct os_mbuf *om) {
@@ -884,6 +909,14 @@ STATIC int peripheral_gap_event_cb(struct ble_gap_event *event, void *arg) {
             // TODO
             break;
 
+        case BLE_GAP_EVENT_MTU: {
+            if (event->mtu.channel_id == BLE_L2CAP_CID_ATT) {
+                DEBUG_printf("peripheral_gap_event_cb: mtu update: conn_handle=%d cid=%d mtu=%d\n", event->mtu.conn_handle, event->mtu.channel_id, event->mtu.value);
+                mp_bluetooth_gatts_on_mtu_exchanged(event->mtu.conn_handle, event->mtu.value);
+            }
+            break;
+        }
+
         default:
             break;
     }
@@ -1042,6 +1075,13 @@ int mp_bluetooth_gattc_write(uint16_t conn_handle, uint16_t value_handle, const
     return ble_hs_err_to_errno(err);
 }
 
+int mp_bluetooth_gattc_exchange_mtu(uint16_t conn_handle) {
+    DEBUG_printf("mp_bluetooth_exchange_mtu: conn_handle=%d mtu=%d\n", conn_handle, ble_att_preferred_mtu());
+
+    // Using NULL callback (we'll get notified in gap_event_cb instead).
+    return ble_hs_err_to_errno(ble_gattc_exchange_mtu(conn_handle, NULL, NULL));
+}
+
 #endif // MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE
 
 #endif // MICROPY_PY_BLUETOOTH && MICROPY_BLUETOOTH_NIMBLE

From 06dda48144be94ff6bef92b5bbf3fa87dea32cfa Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Mon, 14 Sep 2020 18:11:19 +1000
Subject: [PATCH 0294/3533] tests/run-multitests.py: Show test/truth diff.

---
 tests/run-multitests.py | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/tests/run-multitests.py b/tests/run-multitests.py
index 7ab4e85c57d79..ad032df38b238 100755
--- a/tests/run-multitests.py
+++ b/tests/run-multitests.py
@@ -7,6 +7,7 @@
 import sys, os, time, re, select
 import argparse
 import subprocess
+import tempfile
 
 sys.path.append("../tools")
 import pyboard
@@ -18,6 +19,9 @@
     CPYTHON3 = os.getenv("MICROPY_CPYTHON3", "python3")
     MICROPYTHON = os.getenv("MICROPY_MICROPYTHON", "../ports/unix/micropython")
 
+# For diff'ing test output
+DIFF = os.getenv("MICROPY_DIFF", "diff -u")
+
 PYTHON_TRUTH = CPYTHON3
 
 INSTANCE_READ_TIMEOUT_S = 10
@@ -323,6 +327,18 @@ def run_test_on_instances(test_file, num_instances, instances):
     return error, skip, output_str
 
 
+def print_diff(a, b):
+    a_fd, a_path = tempfile.mkstemp(text=True)
+    b_fd, b_path = tempfile.mkstemp(text=True)
+    os.write(a_fd, a.encode())
+    os.write(b_fd, b.encode())
+    os.close(a_fd)
+    os.close(b_fd)
+    subprocess.run(DIFF.split(" ") + [a_path, b_path])
+    os.unlink(a_path)
+    os.unlink(b_path)
+
+
 def run_tests(test_files, instances_truth, instances_test):
     skipped_tests = []
     passed_tests = []
@@ -372,6 +388,8 @@ def run_tests(test_files, instances_truth, instances_test):
                 print(output_test, end="")
                 print("### TRUTH ###")
                 print(output_truth, end="")
+                print("### DIFF ###")
+                print_diff(output_test, output_truth)
 
         if cmd_args.show_output:
             print()

From 3086d35e1637ba2bdc05ae676034d029ddbf302f Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Mon, 14 Sep 2020 18:11:46 +1000
Subject: [PATCH 0295/3533] tests/multi_bluetooth/ble_mtu.py: Add multitest for
 BLE MTU.

---
 tests/multi_bluetooth/ble_mtu.py     | 208 +++++++++++++++++++++++++++
 tests/multi_bluetooth/ble_mtu.py.exp | 143 ++++++++++++++++++
 2 files changed, 351 insertions(+)
 create mode 100644 tests/multi_bluetooth/ble_mtu.py
 create mode 100644 tests/multi_bluetooth/ble_mtu.py.exp

diff --git a/tests/multi_bluetooth/ble_mtu.py b/tests/multi_bluetooth/ble_mtu.py
new file mode 100644
index 0000000000000..ef3199c5bbb04
--- /dev/null
+++ b/tests/multi_bluetooth/ble_mtu.py
@@ -0,0 +1,208 @@
+# Test MTU exchange (initiated by both central and peripheral) and the effect on
+# notify and write size.
+
+# Seven connections are made (four central->peripheral, three peripheral->central).
+#
+# Test | Requested | Preferred | Result | Notes
+#   0  |  300 (C)  |  256 (P)  |  256   |
+#   1  |  300 (C)  |  200 (P)  |  200   |
+#   2  |  300 (C)  |  400 (P)  |  300   |
+#   3  |  300 (C)  |  50  (P)  |  50    | Shorter than 64 so the notification is truncated.
+#   4  |  290 (P)  |  256 (C)  |  256   |
+#   5  |  290 (P)  |  190 (C)  |  190   |
+#   6  |  290 (P)  |  350 (C)  |  290   |
+#
+# For each connection a notification is sent by the server (peripheral) and a characteristic
+# is written by the client (central) to ensure that the expected size is transmitted.
+#
+# Note: This currently fails on btstack for two reasons:
+# - btstack doesn't truncate writes to the MTU (it fails instead)
+# - btstack (in central mode) doesn't handle the peripheral initiating the MTU exchange
+
+from micropython import const
+import time, machine, bluetooth
+
+TIMEOUT_MS = 5000
+
+_IRQ_CENTRAL_CONNECT = const(1)
+_IRQ_CENTRAL_DISCONNECT = const(2)
+_IRQ_GATTS_WRITE = const(3)
+_IRQ_PERIPHERAL_CONNECT = const(7)
+_IRQ_PERIPHERAL_DISCONNECT = const(8)
+_IRQ_GATTC_CHARACTERISTIC_RESULT = const(11)
+_IRQ_GATTC_CHARACTERISTIC_DONE = const(12)
+_IRQ_GATTC_WRITE_DONE = const(17)
+_IRQ_GATTC_NOTIFY = const(18)
+_IRQ_MTU_EXCHANGED = const(21)
+
+SERVICE_UUID = bluetooth.UUID("A5A5A5A5-FFFF-9999-1111-5A5A5A5A5A5A")
+CHAR_UUID = bluetooth.UUID("00000000-1111-2222-3333-444444444444")
+CHAR = (
+    CHAR_UUID,
+    bluetooth.FLAG_READ | bluetooth.FLAG_WRITE | bluetooth.FLAG_NOTIFY,
+)
+SERVICE = (
+    SERVICE_UUID,
+    (CHAR,),
+)
+SERVICES = (SERVICE,)
+
+waiting_events = {}
+
+
+def irq(event, data):
+    global value_handle
+    if event == _IRQ_CENTRAL_CONNECT:
+        print("_IRQ_CENTRAL_CONNECT")
+        waiting_events[event] = data[0]
+    elif event == _IRQ_CENTRAL_DISCONNECT:
+        print("_IRQ_CENTRAL_DISCONNECT")
+    elif event == _IRQ_GATTS_WRITE:
+        print("_IRQ_GATTS_WRITE")
+    elif event == _IRQ_PERIPHERAL_CONNECT:
+        print("_IRQ_PERIPHERAL_CONNECT")
+        waiting_events[event] = data[0]
+    elif event == _IRQ_PERIPHERAL_DISCONNECT:
+        print("_IRQ_PERIPHERAL_DISCONNECT")
+    elif event == _IRQ_GATTC_CHARACTERISTIC_RESULT:
+        if data[-1] == CHAR_UUID:
+            print("_IRQ_GATTC_CHARACTERISTIC_RESULT", data[-1])
+            waiting_events[event] = data[2]
+    elif event == _IRQ_GATTC_CHARACTERISTIC_DONE:
+        print("_IRQ_GATTC_CHARACTERISTIC_DONE")
+    elif event == _IRQ_GATTC_WRITE_DONE:
+        print("_IRQ_GATTC_WRITE_DONE")
+    elif event == _IRQ_GATTC_NOTIFY:
+        print("_IRQ_GATTC_NOTIFY", len(data[-1]), chr(data[-1][0]))
+    elif event == _IRQ_MTU_EXCHANGED:
+        print("_IRQ_MTU_EXCHANGED", data[-1])
+        waiting_events[event] = data[-1]
+
+    if event not in waiting_events:
+        waiting_events[event] = None
+
+
+def wait_for_event(event, timeout_ms):
+    t0 = time.ticks_ms()
+    while time.ticks_diff(time.ticks_ms(), t0) < timeout_ms:
+        if event in waiting_events:
+            return True
+        machine.idle()
+    return False
+
+
+# Acting in peripheral role.
+def instance0():
+    multitest.globals(BDADDR=ble.config("mac"))
+    ((char_handle,),) = ble.gatts_register_services(SERVICES)
+    ble.gatts_set_buffer(char_handle, 500, False)
+    print("gap_advertise")
+    ble.gap_advertise(20_000, b"\x02\x01\x06\x04\xffMPY")
+    multitest.next()
+    try:
+        for i in range(7):
+            waiting_events.clear()
+
+            if i == 1:
+                ble.config(mtu=200)
+            elif i == 2:
+                ble.config(mtu=400)
+            elif i == 3:
+                ble.config(mtu=50)
+            elif i >= 4:
+                ble.config(mtu=290)
+            else:
+                # This is the NimBLE default.
+                ble.config(mtu=256)
+
+            # Wait for central to connect to us.
+            if not wait_for_event(_IRQ_CENTRAL_CONNECT, TIMEOUT_MS):
+                return
+            conn_handle = waiting_events[_IRQ_CENTRAL_CONNECT]
+
+            if i >= 4:
+                print("gattc_exchange_mtu")
+                ble.gattc_exchange_mtu(conn_handle)
+
+            if not wait_for_event(_IRQ_MTU_EXCHANGED, TIMEOUT_MS):
+                return
+            mtu = waiting_events[_IRQ_MTU_EXCHANGED]
+
+            print("gatts_notify")
+            ble.gatts_notify(conn_handle, char_handle, str(i) * 64)
+
+            if not wait_for_event(_IRQ_GATTS_WRITE, TIMEOUT_MS):
+                return
+
+            print("gatts_read")
+            data = ble.gatts_read(char_handle)
+            print("characteristic len:", len(data), chr(data[0]))
+
+            # Wait for the central to disconnect.
+            if not wait_for_event(_IRQ_CENTRAL_DISCONNECT, TIMEOUT_MS):
+                return
+
+            print("gap_advertise")
+            ble.gap_advertise(20_000, b"\x02\x01\x06\x04\xffMPY")
+
+    finally:
+        ble.active(0)
+
+
+# Acting in central role.
+def instance1():
+    multitest.next()
+    try:
+        for i in range(7):
+            waiting_events.clear()
+
+            if i < 4:
+                ble.config(mtu=300)
+            elif i == 5:
+                ble.config(mtu=190)
+            elif i == 6:
+                ble.config(mtu=350)
+            else:
+                ble.config(mtu=256)
+
+            # Connect to peripheral and then disconnect.
+            print("gap_connect")
+            ble.gap_connect(*BDADDR)
+            if not wait_for_event(_IRQ_PERIPHERAL_CONNECT, TIMEOUT_MS):
+                return
+            conn_handle = waiting_events[_IRQ_PERIPHERAL_CONNECT]
+
+            if i < 4:
+                print("gattc_exchange_mtu")
+                ble.gattc_exchange_mtu(conn_handle)
+
+            if not wait_for_event(_IRQ_MTU_EXCHANGED, TIMEOUT_MS):
+                return
+            mtu = waiting_events[_IRQ_MTU_EXCHANGED]
+
+            if not wait_for_event(_IRQ_GATTC_NOTIFY, TIMEOUT_MS):
+                return
+
+            print("gattc_discover_characteristics")
+            ble.gattc_discover_characteristics(conn_handle, 1, 65535)
+            if not wait_for_event(_IRQ_GATTC_CHARACTERISTIC_DONE, TIMEOUT_MS):
+                return
+            value_handle = waiting_events[_IRQ_GATTC_CHARACTERISTIC_RESULT]
+
+            # Write 20 more than the MTU to test truncation.
+            print("gattc_write")
+            ble.gattc_write(conn_handle, value_handle, chr(ord("a") + i) * (mtu + 20), 1)
+            if not wait_for_event(_IRQ_GATTC_WRITE_DONE, TIMEOUT_MS):
+                return
+
+            # Disconnect from peripheral.
+            print("gap_disconnect:", ble.gap_disconnect(conn_handle))
+            if not wait_for_event(_IRQ_PERIPHERAL_DISCONNECT, TIMEOUT_MS):
+                return
+    finally:
+        ble.active(0)
+
+
+ble = bluetooth.BLE()
+ble.active(1)
+ble.irq(irq)
diff --git a/tests/multi_bluetooth/ble_mtu.py.exp b/tests/multi_bluetooth/ble_mtu.py.exp
new file mode 100644
index 0000000000000..1039a5da13c22
--- /dev/null
+++ b/tests/multi_bluetooth/ble_mtu.py.exp
@@ -0,0 +1,143 @@
+--- instance0 ---
+gap_advertise
+_IRQ_CENTRAL_CONNECT
+_IRQ_MTU_EXCHANGED 256
+gatts_notify
+_IRQ_GATTS_WRITE
+gatts_read
+characteristic len: 253 a
+_IRQ_CENTRAL_DISCONNECT
+gap_advertise
+_IRQ_CENTRAL_CONNECT
+_IRQ_MTU_EXCHANGED 200
+gatts_notify
+_IRQ_GATTS_WRITE
+gatts_read
+characteristic len: 197 b
+_IRQ_CENTRAL_DISCONNECT
+gap_advertise
+_IRQ_CENTRAL_CONNECT
+_IRQ_MTU_EXCHANGED 300
+gatts_notify
+_IRQ_GATTS_WRITE
+gatts_read
+characteristic len: 297 c
+_IRQ_CENTRAL_DISCONNECT
+gap_advertise
+_IRQ_CENTRAL_CONNECT
+_IRQ_MTU_EXCHANGED 50
+gatts_notify
+_IRQ_GATTS_WRITE
+gatts_read
+characteristic len: 47 d
+_IRQ_CENTRAL_DISCONNECT
+gap_advertise
+_IRQ_CENTRAL_CONNECT
+gattc_exchange_mtu
+_IRQ_MTU_EXCHANGED 256
+gatts_notify
+_IRQ_GATTS_WRITE
+gatts_read
+characteristic len: 253 e
+_IRQ_CENTRAL_DISCONNECT
+gap_advertise
+_IRQ_CENTRAL_CONNECT
+gattc_exchange_mtu
+_IRQ_MTU_EXCHANGED 190
+gatts_notify
+_IRQ_GATTS_WRITE
+gatts_read
+characteristic len: 187 f
+_IRQ_CENTRAL_DISCONNECT
+gap_advertise
+_IRQ_CENTRAL_CONNECT
+gattc_exchange_mtu
+_IRQ_MTU_EXCHANGED 290
+gatts_notify
+_IRQ_GATTS_WRITE
+gatts_read
+characteristic len: 287 g
+_IRQ_CENTRAL_DISCONNECT
+gap_advertise
+--- instance1 ---
+gap_connect
+_IRQ_PERIPHERAL_CONNECT
+gattc_exchange_mtu
+_IRQ_MTU_EXCHANGED 256
+_IRQ_GATTC_NOTIFY 64 0
+gattc_discover_characteristics
+_IRQ_GATTC_CHARACTERISTIC_RESULT UUID('00000000-1111-2222-3333-444444444444')
+_IRQ_GATTC_CHARACTERISTIC_DONE
+gattc_write
+_IRQ_GATTC_WRITE_DONE
+gap_disconnect: True
+_IRQ_PERIPHERAL_DISCONNECT
+gap_connect
+_IRQ_PERIPHERAL_CONNECT
+gattc_exchange_mtu
+_IRQ_MTU_EXCHANGED 200
+_IRQ_GATTC_NOTIFY 64 1
+gattc_discover_characteristics
+_IRQ_GATTC_CHARACTERISTIC_RESULT UUID('00000000-1111-2222-3333-444444444444')
+_IRQ_GATTC_CHARACTERISTIC_DONE
+gattc_write
+_IRQ_GATTC_WRITE_DONE
+gap_disconnect: True
+_IRQ_PERIPHERAL_DISCONNECT
+gap_connect
+_IRQ_PERIPHERAL_CONNECT
+gattc_exchange_mtu
+_IRQ_MTU_EXCHANGED 300
+_IRQ_GATTC_NOTIFY 64 2
+gattc_discover_characteristics
+_IRQ_GATTC_CHARACTERISTIC_RESULT UUID('00000000-1111-2222-3333-444444444444')
+_IRQ_GATTC_CHARACTERISTIC_DONE
+gattc_write
+_IRQ_GATTC_WRITE_DONE
+gap_disconnect: True
+_IRQ_PERIPHERAL_DISCONNECT
+gap_connect
+_IRQ_PERIPHERAL_CONNECT
+gattc_exchange_mtu
+_IRQ_MTU_EXCHANGED 50
+_IRQ_GATTC_NOTIFY 47 3
+gattc_discover_characteristics
+_IRQ_GATTC_CHARACTERISTIC_RESULT UUID('00000000-1111-2222-3333-444444444444')
+_IRQ_GATTC_CHARACTERISTIC_DONE
+gattc_write
+_IRQ_GATTC_WRITE_DONE
+gap_disconnect: True
+_IRQ_PERIPHERAL_DISCONNECT
+gap_connect
+_IRQ_PERIPHERAL_CONNECT
+_IRQ_MTU_EXCHANGED 256
+_IRQ_GATTC_NOTIFY 64 4
+gattc_discover_characteristics
+_IRQ_GATTC_CHARACTERISTIC_RESULT UUID('00000000-1111-2222-3333-444444444444')
+_IRQ_GATTC_CHARACTERISTIC_DONE
+gattc_write
+_IRQ_GATTC_WRITE_DONE
+gap_disconnect: True
+_IRQ_PERIPHERAL_DISCONNECT
+gap_connect
+_IRQ_PERIPHERAL_CONNECT
+_IRQ_MTU_EXCHANGED 190
+_IRQ_GATTC_NOTIFY 64 5
+gattc_discover_characteristics
+_IRQ_GATTC_CHARACTERISTIC_RESULT UUID('00000000-1111-2222-3333-444444444444')
+_IRQ_GATTC_CHARACTERISTIC_DONE
+gattc_write
+_IRQ_GATTC_WRITE_DONE
+gap_disconnect: True
+_IRQ_PERIPHERAL_DISCONNECT
+gap_connect
+_IRQ_PERIPHERAL_CONNECT
+_IRQ_MTU_EXCHANGED 290
+_IRQ_GATTC_NOTIFY 64 6
+gattc_discover_characteristics
+_IRQ_GATTC_CHARACTERISTIC_RESULT UUID('00000000-1111-2222-3333-444444444444')
+_IRQ_GATTC_CHARACTERISTIC_DONE
+gattc_write
+_IRQ_GATTC_WRITE_DONE
+gap_disconnect: True
+_IRQ_PERIPHERAL_DISCONNECT

From 5c503de52166f6ebd4ef59b58b130a730782823d Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 16 Sep 2020 16:34:09 +1000
Subject: [PATCH 0296/3533] travis: Install setuptools for black code
 formatting.

Signed-off-by: Damien George <damien@micropython.org>
---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index ebf9b55899dc9..45b67dc9fedc2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -31,6 +31,7 @@ jobs:
       install:
         - sudo apt-get install uncrustify python3-pip
         - uncrustify --version
+        - pip3 install --user setuptools
         - pip3 install --user black
         - black --version
       script:

From 52d6eeb409e0d4ff3a1fd6811f75b4953912eb38 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Thu, 10 Sep 2020 11:13:13 +1000
Subject: [PATCH 0297/3533] esp32/boards/sdkconfig.base: Set default IDF log
 level to ERROR.

This commit changes the default logging level on all esp32 boards to ERROR.
The esp32 port is now stable enough that it makes sense to remove the info
logs to make the output cleaner, and to match other ports.  More verbose
logging can always be reenabled via esp.osdebug().

This also fixes issue #6354, error messages from NimBLE: the problem is
that ble.active(True) will cause the IDF's NimBLE port to reset the
"NimBLE" tag back to the default level (which was INFO prior to this
commit).  Even if the user had previously called esp.osdebug(None), because
the IDF is setting the "NimBLE" tag back to the default (INFO), the
messages will continue to be shown.

The one quirk is that if the user does want to see the additional logging,
then they must call esp.osdebug(0, 3) after ble.active(True) to undo the
IDF setting the level back to the default (now ERROR).  This means that
it's impossible (via Python/esp.osdebug) to see stack-startup logging,
you'd have to recompile with the default level changed back to INFO.
---
 ports/esp32/boards/sdkconfig.base | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/ports/esp32/boards/sdkconfig.base b/ports/esp32/boards/sdkconfig.base
index f44ec4e173e9b..67e2424a1246d 100644
--- a/ports/esp32/boards/sdkconfig.base
+++ b/ports/esp32/boards/sdkconfig.base
@@ -11,6 +11,11 @@ CONFIG_APP_EXCLUDE_PROJECT_NAME_VAR=y
 # Bootloader config
 CONFIG_BOOTLOADER_LOG_LEVEL_WARN=y
 
+# Change default log level to "ERROR" (instead of "INFO")
+CONFIG_LOG_DEFAULT_LEVEL_INFO=n
+CONFIG_LOG_DEFAULT_LEVEL_ERROR=y
+CONFIG_LOG_DEFAULT_LEVEL=1
+
 # ESP32-specific
 CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU0=n
 CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU1=n

From ecb36d243915958e118a2c1d6b4bef8b490f0bc0 Mon Sep 17 00:00:00 2001
From: Mirko Vogt <mirko.vogt@sensorberg.com>
Date: Wed, 16 Sep 2020 23:57:40 +0000
Subject: [PATCH 0298/3533] esp32/modnetwork: Re-enable PPP support for IDF-SDK
 >=v4.

PPP support was disabled in 96008ff59a8af9883af17d01b951029d9d02eec9 -
marked as "unsupported" due to an early IDF v4 release.  With the currently
supported IDF v4.x version - 4c81978a - it appears to be working just fine.
---
 ports/esp32/modnetwork.c  | 2 +-
 ports/esp32/network_ppp.c | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/ports/esp32/modnetwork.c b/ports/esp32/modnetwork.c
index 325b27f74b262..029a8d143127c 100644
--- a/ports/esp32/modnetwork.c
+++ b/ports/esp32/modnetwork.c
@@ -755,8 +755,8 @@ STATIC const mp_rom_map_elem_t mp_module_network_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_WLAN), MP_ROM_PTR(&get_wlan_obj) },
     #if !MICROPY_ESP_IDF_4
     { MP_ROM_QSTR(MP_QSTR_LAN), MP_ROM_PTR(&get_lan_obj) },
-    { MP_ROM_QSTR(MP_QSTR_PPP), MP_ROM_PTR(&ppp_make_new_obj) },
     #endif
+    { MP_ROM_QSTR(MP_QSTR_PPP), MP_ROM_PTR(&ppp_make_new_obj) },
     { MP_ROM_QSTR(MP_QSTR_phy_mode), MP_ROM_PTR(&esp_phy_mode_obj) },
 
     #if MODNETWORK_INCLUDE_CONSTANTS
diff --git a/ports/esp32/network_ppp.c b/ports/esp32/network_ppp.c
index c3046c9fc77b9..df57b817251d8 100644
--- a/ports/esp32/network_ppp.c
+++ b/ports/esp32/network_ppp.c
@@ -26,7 +26,6 @@
  * THE SOFTWARE.
  */
 
-#if !MICROPY_ESP_IDF_4
 #include "py/runtime.h"
 #include "py/mphal.h"
 #include "py/objtype.h"
@@ -284,5 +283,3 @@ const mp_obj_type_t ppp_if_type = {
     .name = MP_QSTR_PPP,
     .locals_dict = (mp_obj_dict_t *)&ppp_if_locals_dict,
 };
-
-#endif // !MICROPY_ESP_IDF_4

From b28758054b586fe41f56e462856d89f28c5e3f6a Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 11 Sep 2020 16:47:29 +1000
Subject: [PATCH 0299/3533] esp8266: Remove release-specific manifest, disable
 osdebug by default.

This commit removes release-specific builds for the esp8266 and makes the
normal build of the GENERIC board more like the release build.  This makes
esp8266 like all the other ports, for which there is no difference between
a daily build and a release build, making things less confusing.

Release builds were previously defined by UART_OS=-1 (disable OS messages)
and using manifest_release.py to include more frozen modules.

The changes in this commit are:
- Remove manifest_release.py.
- Add existing modules from manifest_release.py (except example code)
  to the GENERIC board's manifest.py file.
- Change UART_OS default to -1 to disable OS messages by default.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp8266/Makefile                   |  2 +-
 ports/esp8266/boards/GENERIC/manifest.py | 19 +++++++++++++++++++
 ports/esp8266/boards/manifest_release.py | 23 -----------------------
 3 files changed, 20 insertions(+), 24 deletions(-)
 delete mode 100644 ports/esp8266/boards/manifest_release.py

diff --git a/ports/esp8266/Makefile b/ports/esp8266/Makefile
index 38b91a545dea3..02ea05f76e064 100644
--- a/ports/esp8266/Makefile
+++ b/ports/esp8266/Makefile
@@ -50,7 +50,7 @@ INC += -I$(ESP_SDK)/include
 
 # UART for "os" messages. 0 is normal UART as used by MicroPython REPL,
 # 1 is debug UART (tx only), -1 to disable.
-UART_OS = 0
+UART_OS = -1
 
 CFLAGS_XTENSA = -fsingle-precision-constant -Wdouble-promotion \
 	-D__ets__ -DICACHE_FLASH \
diff --git a/ports/esp8266/boards/GENERIC/manifest.py b/ports/esp8266/boards/GENERIC/manifest.py
index 4e65b256f92c8..46f3b837be07f 100644
--- a/ports/esp8266/boards/GENERIC/manifest.py
+++ b/ports/esp8266/boards/GENERIC/manifest.py
@@ -1,2 +1,21 @@
+# base modules
 include("$(PORT_DIR)/boards/manifest.py")
+
+# uasyncio
 include("$(MPY_DIR)/extmod/uasyncio/manifest.py")
+
+# drivers
+freeze("$(MPY_DIR)/drivers/display", "ssd1306.py")
+
+# Libraries from micropython-lib, include only if the library directory exists
+if os.path.isdir(convert_path("$(MPY_LIB_DIR)")):
+    # file utilities
+    freeze("$(MPY_LIB_DIR)/upysh", "upysh.py")
+
+    # requests
+    freeze("$(MPY_LIB_DIR)/urequests", "urequests.py")
+    freeze("$(MPY_LIB_DIR)/urllib.urequest", "urllib/urequest.py")
+
+    # umqtt
+    freeze("$(MPY_LIB_DIR)/umqtt.simple", "umqtt/simple.py")
+    freeze("$(MPY_LIB_DIR)/umqtt.robust", "umqtt/robust.py")
diff --git a/ports/esp8266/boards/manifest_release.py b/ports/esp8266/boards/manifest_release.py
deleted file mode 100644
index 5a3194ae9bd45..0000000000000
--- a/ports/esp8266/boards/manifest_release.py
+++ /dev/null
@@ -1,23 +0,0 @@
-include("manifest.py")
-
-# drivers
-freeze("$(MPY_DIR)/drivers/display", "ssd1306.py")
-
-# file utilities
-freeze("$(MPY_LIB_DIR)/upysh", "upysh.py")
-
-# requests
-freeze("$(MPY_LIB_DIR)/urequests", "urequests.py")
-freeze("$(MPY_LIB_DIR)/urllib.urequest", "urllib/urequest.py")
-
-# umqtt with examples
-freeze("$(MPY_LIB_DIR)/umqtt.simple", "umqtt/simple.py")
-freeze("$(MPY_LIB_DIR)/umqtt.robust", "umqtt/robust.py")
-freeze("$(MPY_LIB_DIR)/umqtt.simple", "example_pub_button.py")
-freeze("$(MPY_LIB_DIR)/umqtt.simple", "example_sub_led.py")
-
-# HTTP examples
-freeze("$(MPY_DIR)/examples/network", "http_client.py")
-freeze("$(MPY_DIR)/examples/network", "http_client_ssl.py")
-freeze("$(MPY_DIR)/examples/network", "http_server.py")
-freeze("$(MPY_DIR)/examples/network", "http_server_ssl.py")

From bd7af6151d605d3fc8f70cb9ddf45b2fd7881f08 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 14 Sep 2020 00:07:12 +1000
Subject: [PATCH 0300/3533] ports: Add utime.gmtime() function.

To portably get the Epoch.  This is simply aliased to localtime() on ports
that are not timezone aware.

Signed-off-by: Damien George <damien@micropython.org>
---
 docs/library/utime.rst           | 14 ++++++++++----
 ports/cc3200/mods/modutime.c     |  1 +
 ports/esp32/modutime.c           |  1 +
 ports/esp8266/modules/ntptime.py |  5 ++---
 ports/esp8266/modutime.c         |  1 +
 ports/stm32/modutime.c           |  1 +
 ports/unix/modtime.c             | 14 ++++++++++++--
 7 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/docs/library/utime.rst b/docs/library/utime.rst
index 7fe83f5abe0cd..8c222ede5f80b 100644
--- a/docs/library/utime.rst
+++ b/docs/library/utime.rst
@@ -36,11 +36,17 @@ behave not as expected.
 Functions
 ---------
 
-.. function:: localtime([secs])
+.. function:: gmtime([secs])
+              localtime([secs])
 
-   Convert a time expressed in seconds since the Epoch (see above) into an 8-tuple which
-   contains: (year, month, mday, hour, minute, second, weekday, yearday)
-   If secs is not provided or None, then the current time from the RTC is used.
+   Convert the time *secs* expressed in seconds since the Epoch (see above) into an
+   8-tuple which contains: ``(year, month, mday, hour, minute, second, weekday, yearday)``
+   If *secs* is not provided or None, then the current time from the RTC is used.
+
+   The `gmtime()` function returns a date-time tuple in UTC, and `localtime()` returns a
+   date-time tuple in local time.
+
+   The format of the entries in the 8-tuple are:
 
    * year includes the century (for example 2014).
    * month   is 1-12
diff --git a/ports/cc3200/mods/modutime.c b/ports/cc3200/mods/modutime.c
index a729d62f9cbb2..e77065ef450db 100644
--- a/ports/cc3200/mods/modutime.c
+++ b/ports/cc3200/mods/modutime.c
@@ -133,6 +133,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(time_sleep_obj, time_sleep);
 STATIC const mp_rom_map_elem_t time_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__),        MP_ROM_QSTR(MP_QSTR_utime) },
 
+    { MP_ROM_QSTR(MP_QSTR_gmtime),          MP_ROM_PTR(&time_localtime_obj) },
     { MP_ROM_QSTR(MP_QSTR_localtime),       MP_ROM_PTR(&time_localtime_obj) },
     { MP_ROM_QSTR(MP_QSTR_mktime),          MP_ROM_PTR(&time_mktime_obj) },
     { MP_ROM_QSTR(MP_QSTR_time),            MP_ROM_PTR(&time_time_obj) },
diff --git a/ports/esp32/modutime.c b/ports/esp32/modutime.c
index 0325bd469391d..1f93ce6c30c36 100644
--- a/ports/esp32/modutime.c
+++ b/ports/esp32/modutime.c
@@ -85,6 +85,7 @@ MP_DEFINE_CONST_FUN_OBJ_0(time_time_obj, time_time);
 STATIC const mp_rom_map_elem_t time_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_utime) },
 
+    { MP_ROM_QSTR(MP_QSTR_gmtime), MP_ROM_PTR(&time_localtime_obj) },
     { MP_ROM_QSTR(MP_QSTR_localtime), MP_ROM_PTR(&time_localtime_obj) },
     { MP_ROM_QSTR(MP_QSTR_mktime), MP_ROM_PTR(&time_mktime_obj) },
     { MP_ROM_QSTR(MP_QSTR_time), MP_ROM_PTR(&time_time_obj) },
diff --git a/ports/esp8266/modules/ntptime.py b/ports/esp8266/modules/ntptime.py
index 92ae6ab077cfb..dd07e46f1d3b4 100644
--- a/ports/esp8266/modules/ntptime.py
+++ b/ports/esp8266/modules/ntptime.py
@@ -29,12 +29,11 @@ def time():
     return val - NTP_DELTA
 
 
-# There's currently no timezone support in MicroPython, so
-# utime.localtime() will return UTC time (as if it was .gmtime())
+# There's currently no timezone support in MicroPython, and the RTC is set in UTC time.
 def settime():
     t = time()
     import machine
     import utime
 
-    tm = utime.localtime(t)
+    tm = utime.gmtime(t)
     machine.RTC().datetime((tm[0], tm[1], tm[2], tm[6] + 1, tm[3], tm[4], tm[5], 0))
diff --git a/ports/esp8266/modutime.c b/ports/esp8266/modutime.c
index 9e924121bbc78..a951f8f8d2ccc 100644
--- a/ports/esp8266/modutime.c
+++ b/ports/esp8266/modutime.c
@@ -108,6 +108,7 @@ MP_DEFINE_CONST_FUN_OBJ_0(time_time_obj, time_time);
 STATIC const mp_rom_map_elem_t time_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_utime) },
 
+    { MP_ROM_QSTR(MP_QSTR_gmtime), MP_ROM_PTR(&time_localtime_obj) },
     { MP_ROM_QSTR(MP_QSTR_localtime), MP_ROM_PTR(&time_localtime_obj) },
     { MP_ROM_QSTR(MP_QSTR_mktime), MP_ROM_PTR(&time_mktime_obj) },
     { MP_ROM_QSTR(MP_QSTR_sleep), MP_ROM_PTR(&mp_utime_sleep_obj) },
diff --git a/ports/stm32/modutime.c b/ports/stm32/modutime.c
index 77ec7468c99b6..9641ddb4733bf 100644
--- a/ports/stm32/modutime.c
+++ b/ports/stm32/modutime.c
@@ -132,6 +132,7 @@ MP_DEFINE_CONST_FUN_OBJ_0(time_time_obj, time_time);
 STATIC const mp_rom_map_elem_t time_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_utime) },
 
+    { MP_ROM_QSTR(MP_QSTR_gmtime), MP_ROM_PTR(&time_localtime_obj) },
     { MP_ROM_QSTR(MP_QSTR_localtime), MP_ROM_PTR(&time_localtime_obj) },
     { MP_ROM_QSTR(MP_QSTR_mktime), MP_ROM_PTR(&time_mktime_obj) },
     { MP_ROM_QSTR(MP_QSTR_time), MP_ROM_PTR(&time_time_obj) },
diff --git a/ports/unix/modtime.c b/ports/unix/modtime.c
index 84c83da268627..5343e479c7d92 100644
--- a/ports/unix/modtime.c
+++ b/ports/unix/modtime.c
@@ -132,7 +132,7 @@ STATIC mp_obj_t mod_time_sleep(mp_obj_t arg) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_time_sleep_obj, mod_time_sleep);
 
-STATIC mp_obj_t mod_time_localtime(size_t n_args, const mp_obj_t *args) {
+STATIC mp_obj_t mod_time_gm_local_time(size_t n_args, const mp_obj_t *args, struct tm *(*time_func)(const time_t *timep)) {
     time_t t;
     if (n_args == 0) {
         t = time(NULL);
@@ -144,7 +144,7 @@ STATIC mp_obj_t mod_time_localtime(size_t n_args, const mp_obj_t *args) {
         t = mp_obj_get_int(args[0]);
         #endif
     }
-    struct tm *tm = localtime(&t);
+    struct tm *tm = time_func(&t);
 
     mp_obj_t ret = mp_obj_new_tuple(9, NULL);
 
@@ -165,6 +165,15 @@ STATIC mp_obj_t mod_time_localtime(size_t n_args, const mp_obj_t *args) {
 
     return ret;
 }
+
+STATIC mp_obj_t mod_time_gmtime(size_t n_args, const mp_obj_t *args) {
+    return mod_time_gm_local_time(n_args, args, gmtime);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_time_gmtime_obj, 0, 1, mod_time_gmtime);
+
+STATIC mp_obj_t mod_time_localtime(size_t n_args, const mp_obj_t *args) {
+    return mod_time_gm_local_time(n_args, args, localtime);
+}
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_time_localtime_obj, 0, 1, mod_time_localtime);
 
 STATIC mp_obj_t mod_time_mktime(mp_obj_t tuple) {
@@ -210,6 +219,7 @@ STATIC const mp_rom_map_elem_t mp_module_time_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_ticks_cpu), MP_ROM_PTR(&mp_utime_ticks_cpu_obj) },
     { MP_ROM_QSTR(MP_QSTR_ticks_add), MP_ROM_PTR(&mp_utime_ticks_add_obj) },
     { MP_ROM_QSTR(MP_QSTR_ticks_diff), MP_ROM_PTR(&mp_utime_ticks_diff_obj) },
+    { MP_ROM_QSTR(MP_QSTR_gmtime), MP_ROM_PTR(&mod_time_gmtime_obj) },
     { MP_ROM_QSTR(MP_QSTR_localtime), MP_ROM_PTR(&mod_time_localtime_obj) },
     { MP_ROM_QSTR(MP_QSTR_mktime), MP_ROM_PTR(&mod_time_mktime_obj) },
 };

From 8f20cdc353a9d1c1e5d43484b58e1eaf81ec52e0 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 14 Sep 2020 12:15:03 +1000
Subject: [PATCH 0301/3533] all: Rename absolute time-based functions to
 include "epoch".

For time-based functions that work with absolute time there is the need for
an Epoch, to set the zero-point at which the absolute time starts counting.
Such functions include time.time() and filesystem stat return values.  And
different ports may use a different Epoch.

To make it clearer what functions use the Epoch (whatever it may be), and
make the ports more consistent with their use of the Epoch, this commit
renames all Epoch related functions to include the word "epoch" in their
name (and remove references to "2000").

Along with this rename, the following things have changed:

- mp_hal_time_ns() is now specified to return the number of nanoseconds
  since the Epoch, rather than since 1970 (but since this is an internal
  function it doesn't change anything for the user).

- littlefs timestamps on the esp8266 have been fixed (they were previously
  off by 30 years in nanoseconds).

Otherwise, there is no functional change made by this commit.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/vfs_fat.c            |  5 +----
 extmod/vfs_lfs.c            |  4 +++-
 extmod/vfs_lfsx.c           |  6 ++----
 lib/timeutils/timeutils.h   | 43 +++++++++++++++++++++++++++----------
 ports/esp32/fatfs_port.c    |  2 +-
 ports/esp32/machine_rtc.c   |  4 ++--
 ports/esp32/modutime.c      |  2 +-
 ports/esp32/mphalport.c     |  3 +--
 ports/esp8266/esp_mphal.c   |  2 +-
 ports/esp8266/fatfs_port.c  |  4 ++--
 ports/esp8266/machine_rtc.c | 18 ++++++++--------
 ports/esp8266/modmachine.c  |  2 +-
 ports/esp8266/modmachine.h  |  4 ++--
 ports/esp8266/modutime.c    |  8 +++----
 ports/stm32/modutime.c      |  4 ++--
 ports/stm32/rtc.c           |  4 ++--
 py/mphal.h                  |  2 +-
 17 files changed, 67 insertions(+), 50 deletions(-)

diff --git a/extmod/vfs_fat.c b/extmod/vfs_fat.c
index ace5ba5b6547f..95b7ad9944116 100644
--- a/extmod/vfs_fat.c
+++ b/extmod/vfs_fat.c
@@ -311,7 +311,7 @@ STATIC mp_obj_t fat_vfs_stat(mp_obj_t vfs_in, mp_obj_t path_in) {
     } else {
         mode |= MP_S_IFREG;
     }
-    mp_int_t seconds = timeutils_seconds_since_2000(
+    mp_int_t seconds = timeutils_seconds_since_epoch(
         1980 + ((fno.fdate >> 9) & 0x7f),
         (fno.fdate >> 5) & 0x0f,
         fno.fdate & 0x1f,
@@ -319,9 +319,6 @@ STATIC mp_obj_t fat_vfs_stat(mp_obj_t vfs_in, mp_obj_t path_in) {
         (fno.ftime >> 5) & 0x3f,
         2 * (fno.ftime & 0x1f)
         );
-    #if MICROPY_EPOCH_IS_1970
-    seconds += TIMEUTILS_SECONDS_1970_TO_2000;
-    #endif
     t->items[0] = MP_OBJ_NEW_SMALL_INT(mode); // st_mode
     t->items[1] = MP_OBJ_NEW_SMALL_INT(0); // st_ino
     t->items[2] = MP_OBJ_NEW_SMALL_INT(0); // st_dev
diff --git a/extmod/vfs_lfs.c b/extmod/vfs_lfs.c
index a53f66f2d63c8..9cf3eb11083cf 100644
--- a/extmod/vfs_lfs.c
+++ b/extmod/vfs_lfs.c
@@ -26,6 +26,7 @@
 
 #include "py/runtime.h"
 #include "py/mphal.h"
+#include "lib/timeutils/timeutils.h"
 #include "extmod/vfs.h"
 #include "extmod/vfs_lfs.h"
 
@@ -126,7 +127,8 @@ const char *mp_vfs_lfs2_make_path(mp_obj_vfs_lfs2_t *self, mp_obj_t path_in);
 mp_obj_t mp_vfs_lfs2_file_open(mp_obj_t self_in, mp_obj_t path_in, mp_obj_t mode_in);
 
 STATIC void lfs_get_mtime(uint8_t buf[8]) {
-    uint64_t ns = mp_hal_time_ns();
+    // On-disk storage of timestamps uses 1970 as the Epoch, so convert from host's Epoch.
+    uint64_t ns = timeutils_nanoseconds_since_epoch_to_nanoseconds_since_1970(mp_hal_time_ns());
     // Store "ns" to "buf" in little-endian format (essentially htole64).
     for (size_t i = 0; i < 8; ++i) {
         buf[i] = ns;
diff --git a/extmod/vfs_lfsx.c b/extmod/vfs_lfsx.c
index d00df53104f6f..35d5f03c59a2c 100644
--- a/extmod/vfs_lfsx.c
+++ b/extmod/vfs_lfsx.c
@@ -365,10 +365,8 @@ STATIC mp_obj_t MP_VFS_LFSx(stat)(mp_obj_t self_in, mp_obj_t path_in) {
         for (size_t i = sizeof(mtime_buf); i > 0; --i) {
             ns = ns << 8 | mtime_buf[i - 1];
         }
-        mtime = timeutils_seconds_since_2000_from_nanoseconds_since_1970(ns);
-        #if MICROPY_EPOCH_IS_1970
-        mtime += TIMEUTILS_SECONDS_1970_TO_2000;
-        #endif
+        // On-disk storage of timestamps uses 1970 as the Epoch, so convert to host's Epoch.
+        mtime = timeutils_seconds_since_epoch_from_nanoseconds_since_1970(ns);
     }
     #endif
 
diff --git a/lib/timeutils/timeutils.h b/lib/timeutils/timeutils.h
index 08b0dc2e8559a..14da831dc8b58 100644
--- a/lib/timeutils/timeutils.h
+++ b/lib/timeutils/timeutils.h
@@ -42,14 +42,6 @@ typedef struct _timeutils_struct_time_t {
     uint16_t tm_yday;       // 1..366
 } timeutils_struct_time_t;
 
-static inline uint64_t timeutils_seconds_since_2000_to_nanoseconds_since_1970(mp_uint_t s) {
-    return ((uint64_t)s + TIMEUTILS_SECONDS_1970_TO_2000) * 1000000000ULL;
-}
-
-static inline mp_uint_t timeutils_seconds_since_2000_from_nanoseconds_since_1970(uint64_t ns) {
-    return ns / 1000000000ULL - TIMEUTILS_SECONDS_1970_TO_2000;
-}
-
 bool timeutils_is_leap_year(mp_uint_t year);
 mp_uint_t timeutils_days_in_month(mp_uint_t year, mp_uint_t month);
 mp_uint_t timeutils_year_day(mp_uint_t year, mp_uint_t month, mp_uint_t date);
@@ -63,10 +55,39 @@ mp_uint_t timeutils_seconds_since_2000(mp_uint_t year, mp_uint_t month,
 mp_uint_t timeutils_mktime(mp_uint_t year, mp_int_t month, mp_int_t mday,
     mp_int_t hours, mp_int_t minutes, mp_int_t seconds);
 
-static inline uint64_t timeutils_nanoseconds_since_1970(mp_uint_t year, mp_uint_t month,
+// Select the Epoch used by the port.
+#if MICROPY_EPOCH_IS_1970
+
+static inline uint64_t timeutils_seconds_since_epoch(mp_uint_t year, mp_uint_t month,
     mp_uint_t date, mp_uint_t hour, mp_uint_t minute, mp_uint_t second) {
-    return timeutils_seconds_since_2000_to_nanoseconds_since_1970(
-        timeutils_seconds_since_2000(year, month, date, hour, minute, second));
+    return timeutils_seconds_since_2000(year, month, date, hour, minute, second) + TIMEUTILS_SECONDS_1970_TO_2000;
+}
+
+static inline mp_uint_t timeutils_seconds_since_epoch_from_nanoseconds_since_1970(uint64_t ns) {
+    return ns / 1000000000ULL;
+}
+
+static inline uint64_t timeutils_nanoseconds_since_epoch_to_nanoseconds_since_1970(uint64_t ns) {
+    return ns;
 }
 
+#else // Epoch is 2000
+
+#define timeutils_seconds_since_epoch_to_struct_time timeutils_seconds_since_2000_to_struct_time
+#define timeutils_seconds_since_epoch timeutils_seconds_since_2000
+
+static inline uint64_t timeutils_seconds_since_epoch_to_nanoseconds_since_1970(mp_uint_t s) {
+    return ((uint64_t)s + TIMEUTILS_SECONDS_1970_TO_2000) * 1000000000ULL;
+}
+
+static inline mp_uint_t timeutils_seconds_since_epoch_from_nanoseconds_since_1970(uint64_t ns) {
+    return ns / 1000000000ULL - TIMEUTILS_SECONDS_1970_TO_2000;
+}
+
+static inline int64_t timeutils_nanoseconds_since_epoch_to_nanoseconds_since_1970(int64_t ns) {
+    return ns + TIMEUTILS_SECONDS_1970_TO_2000 * 1000000000ULL;
+}
+
+#endif
+
 #endif // MICROPY_INCLUDED_LIB_TIMEUTILS_TIMEUTILS_H
diff --git a/ports/esp32/fatfs_port.c b/ports/esp32/fatfs_port.c
index 779ba1c88accc..cfc52853d08a9 100644
--- a/ports/esp32/fatfs_port.c
+++ b/ports/esp32/fatfs_port.c
@@ -34,7 +34,7 @@ DWORD get_fattime(void) {
     struct timeval tv;
     gettimeofday(&tv, NULL);
     timeutils_struct_time_t tm;
-    timeutils_seconds_since_2000_to_struct_time(tv.tv_sec, &tm);
+    timeutils_seconds_since_epoch_to_struct_time(tv.tv_sec, &tm);
 
     return ((DWORD)(tm.tm_year - 1980) << 25) | ((DWORD)tm.tm_mon << 21) | ((DWORD)tm.tm_mday << 16) |
            ((DWORD)tm.tm_hour << 11) | ((DWORD)tm.tm_min << 5) | ((DWORD)tm.tm_sec >> 1);
diff --git a/ports/esp32/machine_rtc.c b/ports/esp32/machine_rtc.c
index c776eaa8d3d1c..6902ce85fd2c7 100644
--- a/ports/esp32/machine_rtc.c
+++ b/ports/esp32/machine_rtc.c
@@ -93,7 +93,7 @@ STATIC mp_obj_t machine_rtc_datetime_helper(mp_uint_t n_args, const mp_obj_t *ar
         gettimeofday(&tv, NULL);
         timeutils_struct_time_t tm;
 
-        timeutils_seconds_since_2000_to_struct_time(tv.tv_sec, &tm);
+        timeutils_seconds_since_epoch_to_struct_time(tv.tv_sec, &tm);
 
         mp_obj_t tuple[8] = {
             mp_obj_new_int(tm.tm_year),
@@ -114,7 +114,7 @@ STATIC mp_obj_t machine_rtc_datetime_helper(mp_uint_t n_args, const mp_obj_t *ar
         mp_obj_get_array_fixed_n(args[1], 8, &items);
 
         struct timeval tv = {0};
-        tv.tv_sec = timeutils_seconds_since_2000(mp_obj_get_int(items[0]), mp_obj_get_int(items[1]), mp_obj_get_int(items[2]), mp_obj_get_int(items[4]), mp_obj_get_int(items[5]), mp_obj_get_int(items[6]));
+        tv.tv_sec = timeutils_seconds_since_epoch(mp_obj_get_int(items[0]), mp_obj_get_int(items[1]), mp_obj_get_int(items[2]), mp_obj_get_int(items[4]), mp_obj_get_int(items[5]), mp_obj_get_int(items[6]));
         tv.tv_usec = mp_obj_get_int(items[7]);
         settimeofday(&tv, NULL);
 
diff --git a/ports/esp32/modutime.c b/ports/esp32/modutime.c
index 1f93ce6c30c36..ac3edb4e9b76f 100644
--- a/ports/esp32/modutime.c
+++ b/ports/esp32/modutime.c
@@ -44,7 +44,7 @@ STATIC mp_obj_t time_localtime(size_t n_args, const mp_obj_t *args) {
     } else {
         seconds = mp_obj_get_int(args[0]);
     }
-    timeutils_seconds_since_2000_to_struct_time(seconds, &tm);
+    timeutils_seconds_since_epoch_to_struct_time(seconds, &tm);
     mp_obj_t tuple[8] = {
         tuple[0] = mp_obj_new_int(tm.tm_year),
         tuple[1] = mp_obj_new_int(tm.tm_mon),
diff --git a/ports/esp32/mphalport.c b/ports/esp32/mphalport.c
index 3a46edf1f75c1..ad571bf961886 100644
--- a/ports/esp32/mphalport.c
+++ b/ports/esp32/mphalport.c
@@ -200,8 +200,7 @@ void mp_hal_delay_us(uint32_t us) {
 uint64_t mp_hal_time_ns(void) {
     struct timeval tv;
     gettimeofday(&tv, NULL);
-    // gettimeofday returns seconds since 2000/1/1
-    uint64_t ns = timeutils_seconds_since_2000_to_nanoseconds_since_1970(tv.tv_sec);
+    uint64_t ns = tv.tv_sec * 1000000000ULL;
     ns += (uint64_t)tv.tv_usec * 1000ULL;
     return ns;
 }
diff --git a/ports/esp8266/esp_mphal.c b/ports/esp8266/esp_mphal.c
index 9e1b72e438ad7..54f9611e56233 100644
--- a/ports/esp8266/esp_mphal.c
+++ b/ports/esp8266/esp_mphal.c
@@ -139,7 +139,7 @@ void MP_FASTCODE(mp_hal_delay_ms)(uint32_t delay) {
 }
 
 uint64_t mp_hal_time_ns(void) {
-    return pyb_rtc_get_us_since_2000() * 1000ULL;
+    return pyb_rtc_get_us_since_epoch() * 1000ULL;
 }
 
 void ets_event_poll(void) {
diff --git a/ports/esp8266/fatfs_port.c b/ports/esp8266/fatfs_port.c
index 8cef0acec3c62..bbd10519359a0 100644
--- a/ports/esp8266/fatfs_port.c
+++ b/ports/esp8266/fatfs_port.c
@@ -33,10 +33,10 @@ DWORD get_fattime(void) {
 
     // TODO: Optimize division (there's no HW division support on ESP8266,
     // so it's expensive).
-    uint32_t secs = (uint32_t)(pyb_rtc_get_us_since_2000() / 1000000);
+    uint32_t secs = (uint32_t)(pyb_rtc_get_us_since_epoch() / 1000000);
 
     timeutils_struct_time_t tm;
-    timeutils_seconds_since_2000_to_struct_time(secs, &tm);
+    timeutils_seconds_since_epoch_to_struct_time(secs, &tm);
 
     return ((DWORD)(tm.tm_year - 1980) << 25) | ((DWORD)tm.tm_mon << 21) | ((DWORD)tm.tm_mday << 16) |
            ((DWORD)tm.tm_hour << 11) | ((DWORD)tm.tm_min << 5) | ((DWORD)tm.tm_sec >> 1);
diff --git a/ports/esp8266/machine_rtc.c b/ports/esp8266/machine_rtc.c
index 1aa73f9b317f8..e7b750fd92c8d 100644
--- a/ports/esp8266/machine_rtc.c
+++ b/ports/esp8266/machine_rtc.c
@@ -84,7 +84,7 @@ STATIC mp_obj_t pyb_rtc_make_new(const mp_obj_type_t *type, size_t n_args, size_
     return (mp_obj_t)&pyb_rtc_obj;
 }
 
-void pyb_rtc_set_us_since_2000(uint64_t nowus) {
+void pyb_rtc_set_us_since_epoch(uint64_t nowus) {
     uint32_t cal = system_rtc_clock_cali_proc();
     // Save RTC ticks for overflow detection.
     rtc_last_ticks = system_get_rtc_time();
@@ -96,7 +96,7 @@ void pyb_rtc_set_us_since_2000(uint64_t nowus) {
     system_rtc_mem_write(MEM_DELTA_ADDR, &delta, sizeof(delta));
 };
 
-uint64_t pyb_rtc_get_us_since_2000() {
+uint64_t pyb_rtc_get_us_since_epoch() {
     uint32_t cal;
     int64_t delta;
     uint32_t rtc_ticks;
@@ -120,17 +120,17 @@ uint64_t pyb_rtc_get_us_since_2000() {
 
 void rtc_prepare_deepsleep(uint64_t sleep_us) {
     // RTC time will reset at wake up. Let's be preared for this.
-    int64_t delta = pyb_rtc_get_us_since_2000() + sleep_us;
+    int64_t delta = pyb_rtc_get_us_since_epoch() + sleep_us;
     system_rtc_mem_write(MEM_DELTA_ADDR, &delta, sizeof(delta));
 }
 
 STATIC mp_obj_t pyb_rtc_datetime(size_t n_args, const mp_obj_t *args) {
     if (n_args == 1) {
         // Get time
-        uint64_t msecs = pyb_rtc_get_us_since_2000() / 1000;
+        uint64_t msecs = pyb_rtc_get_us_since_epoch() / 1000;
 
         timeutils_struct_time_t tm;
-        timeutils_seconds_since_2000_to_struct_time(msecs / 1000, &tm);
+        timeutils_seconds_since_epoch_to_struct_time(msecs / 1000, &tm);
 
         mp_obj_t tuple[8] = {
             mp_obj_new_int(tm.tm_year),
@@ -149,8 +149,8 @@ STATIC mp_obj_t pyb_rtc_datetime(size_t n_args, const mp_obj_t *args) {
         mp_obj_t *items;
         mp_obj_get_array_fixed_n(args[1], 8, &items);
 
-        pyb_rtc_set_us_since_2000(
-            ((uint64_t)timeutils_seconds_since_2000(
+        pyb_rtc_set_us_since_epoch(
+            ((uint64_t)timeutils_seconds_since_epoch(
                 mp_obj_get_int(items[0]),
                 mp_obj_get_int(items[1]),
                 mp_obj_get_int(items[2]),
@@ -209,7 +209,7 @@ STATIC mp_obj_t pyb_rtc_alarm(mp_obj_t self_in, mp_obj_t alarm_id, mp_obj_t time
     }
 
     // set expiry time (in microseconds)
-    pyb_rtc_alarm0_expiry = pyb_rtc_get_us_since_2000() + (uint64_t)mp_obj_get_int(time_in) * 1000;
+    pyb_rtc_alarm0_expiry = pyb_rtc_get_us_since_epoch() + (uint64_t)mp_obj_get_int(time_in) * 1000;
 
     return mp_const_none;
 
@@ -222,7 +222,7 @@ STATIC mp_obj_t pyb_rtc_alarm_left(size_t n_args, const mp_obj_t *args) {
         mp_raise_ValueError(MP_ERROR_TEXT("invalid alarm"));
     }
 
-    uint64_t now = pyb_rtc_get_us_since_2000();
+    uint64_t now = pyb_rtc_get_us_since_epoch();
     if (pyb_rtc_alarm0_expiry <= now) {
         return MP_OBJ_NEW_SMALL_INT(0);
     } else {
diff --git a/ports/esp8266/modmachine.c b/ports/esp8266/modmachine.c
index bc838b420645d..cb28d5b144827 100644
--- a/ports/esp8266/modmachine.c
+++ b/ports/esp8266/modmachine.c
@@ -132,7 +132,7 @@ STATIC mp_obj_t machine_deepsleep(size_t n_args, const mp_obj_t *args) {
 
     // see if RTC.ALARM0 should wake the device
     if (pyb_rtc_alarm0_wake & MACHINE_WAKE_DEEPSLEEP) {
-        uint64_t t = pyb_rtc_get_us_since_2000();
+        uint64_t t = pyb_rtc_get_us_since_epoch();
         if (pyb_rtc_alarm0_expiry <= t) {
             sleep_us = 1; // alarm already expired so wake immediately
         } else {
diff --git a/ports/esp8266/modmachine.h b/ports/esp8266/modmachine.h
index f5cfc0fa2cd52..be4debd335a64 100644
--- a/ports/esp8266/modmachine.h
+++ b/ports/esp8266/modmachine.h
@@ -32,8 +32,8 @@ void pin_set(uint pin, int value);
 extern uint32_t pyb_rtc_alarm0_wake;
 extern uint64_t pyb_rtc_alarm0_expiry;
 
-void pyb_rtc_set_us_since_2000(uint64_t nowus);
-uint64_t pyb_rtc_get_us_since_2000();
+void pyb_rtc_set_us_since_epoch(uint64_t nowus);
+uint64_t pyb_rtc_get_us_since_epoch();
 void rtc_prepare_deepsleep(uint64_t sleep_us);
 
 #endif // MICROPY_INCLUDED_ESP8266_MODMACHINE_H
diff --git a/ports/esp8266/modutime.c b/ports/esp8266/modutime.c
index a951f8f8d2ccc..86534722c792f 100644
--- a/ports/esp8266/modutime.c
+++ b/ports/esp8266/modutime.c
@@ -58,11 +58,11 @@ STATIC mp_obj_t time_localtime(size_t n_args, const mp_obj_t *args) {
     timeutils_struct_time_t tm;
     mp_int_t seconds;
     if (n_args == 0 || args[0] == mp_const_none) {
-        seconds = pyb_rtc_get_us_since_2000() / 1000 / 1000;
+        seconds = pyb_rtc_get_us_since_epoch() / 1000 / 1000;
     } else {
         seconds = mp_obj_get_int(args[0]);
     }
-    timeutils_seconds_since_2000_to_struct_time(seconds, &tm);
+    timeutils_seconds_since_epoch_to_struct_time(seconds, &tm);
     mp_obj_t tuple[8] = {
         tuple[0] = mp_obj_new_int(tm.tm_year),
         tuple[1] = mp_obj_new_int(tm.tm_mon),
@@ -98,10 +98,10 @@ STATIC mp_obj_t time_mktime(mp_obj_t tuple) {
 MP_DEFINE_CONST_FUN_OBJ_1(time_mktime_obj, time_mktime);
 
 /// \function time()
-/// Returns the number of seconds, as an integer, since 1/1/2000.
+/// Returns the number of seconds, as an integer, since the Epoch.
 STATIC mp_obj_t time_time(void) {
     // get date and time
-    return mp_obj_new_int(pyb_rtc_get_us_since_2000() / 1000 / 1000);
+    return mp_obj_new_int(pyb_rtc_get_us_since_epoch() / 1000 / 1000);
 }
 MP_DEFINE_CONST_FUN_OBJ_0(time_time_obj, time_time);
 
diff --git a/ports/stm32/modutime.c b/ports/stm32/modutime.c
index 9641ddb4733bf..2a37a130df2bb 100644
--- a/ports/stm32/modutime.c
+++ b/ports/stm32/modutime.c
@@ -76,7 +76,7 @@ STATIC mp_obj_t time_localtime(size_t n_args, const mp_obj_t *args) {
     } else {
         mp_int_t seconds = mp_obj_get_int(args[0]);
         timeutils_struct_time_t tm;
-        timeutils_seconds_since_2000_to_struct_time(seconds, &tm);
+        timeutils_seconds_since_epoch_to_struct_time(seconds, &tm);
         mp_obj_t tuple[8] = {
             tuple[0] = mp_obj_new_int(tm.tm_year),
             tuple[1] = mp_obj_new_int(tm.tm_mon),
@@ -125,7 +125,7 @@ STATIC mp_obj_t time_time(void) {
     RTC_TimeTypeDef time;
     HAL_RTC_GetTime(&RTCHandle, &time, RTC_FORMAT_BIN);
     HAL_RTC_GetDate(&RTCHandle, &date, RTC_FORMAT_BIN);
-    return mp_obj_new_int(timeutils_seconds_since_2000(2000 + date.Year, date.Month, date.Date, time.Hours, time.Minutes, time.Seconds));
+    return mp_obj_new_int(timeutils_seconds_since_epoch(2000 + date.Year, date.Month, date.Date, time.Hours, time.Minutes, time.Seconds));
 }
 MP_DEFINE_CONST_FUN_OBJ_0(time_time_obj, time_time);
 
diff --git a/ports/stm32/rtc.c b/ports/stm32/rtc.c
index 4f759c4bc74f0..18ecf7750513b 100644
--- a/ports/stm32/rtc.c
+++ b/ports/stm32/rtc.c
@@ -452,8 +452,8 @@ uint64_t mp_hal_time_ns(void) {
     RTC_DateTypeDef date;
     HAL_RTC_GetTime(&RTCHandle, &time, RTC_FORMAT_BIN);
     HAL_RTC_GetDate(&RTCHandle, &date, RTC_FORMAT_BIN);
-    ns = timeutils_nanoseconds_since_1970(
-        2000 + date.Year, date.Month, date.Date, time.Hours, time.Minutes, time.Seconds);
+    ns = timeutils_seconds_since_epoch(2000 + date.Year, date.Month, date.Date, time.Hours, time.Minutes, time.Seconds);
+    ns *= 1000000000ULL;
     uint32_t usec = ((RTC_SYNCH_PREDIV - time.SubSeconds) * (1000000 / 64)) / ((RTC_SYNCH_PREDIV + 1) / 64);
     ns += usec * 1000;
     #endif
diff --git a/py/mphal.h b/py/mphal.h
index 6d11f6ddc0836..0d4b1224e5cec 100644
--- a/py/mphal.h
+++ b/py/mphal.h
@@ -76,7 +76,7 @@ mp_uint_t mp_hal_ticks_cpu(void);
 #endif
 
 #ifndef mp_hal_time_ns
-// Nanoseconds since 1970/1/1.
+// Nanoseconds since the Epoch.
 uint64_t mp_hal_time_ns(void);
 #endif
 

From 9d1983f078150b0f1da7bfb2e55c0ac823c328b6 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Wed, 16 Sep 2020 12:11:26 +1000
Subject: [PATCH 0302/3533] py/dynruntime.h: Add mp_import_* and
 mp_load/store_*.

These functions already exist in the fun table, and this commit just adds
convenience macros for them.
---
 py/dynruntime.h | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/py/dynruntime.h b/py/dynruntime.h
index 696746f7510ff..eb8301284e1fc 100644
--- a/py/dynruntime.h
+++ b/py/dynruntime.h
@@ -163,9 +163,15 @@ static inline mp_obj_t mp_obj_len_dyn(mp_obj_t o) {
 /******************************************************************************/
 // General runtime functions
 
-#define mp_load_name(qst)           (mp_fun_table.load_name(qst))
-#define mp_load_global(qst)         (mp_fun_table.load_global(qst))
-#define mp_store_global(qst, obj)   (mp_fun_table.store_global((qst), (obj)))
+#define mp_load_name(qst)                 (mp_fun_table.load_name((qst)))
+#define mp_load_global(qst)               (mp_fun_table.load_global((qst)))
+#define mp_load_attr(base, attr)          (mp_fun_table.load_attr((base), (attr)))
+#define mp_load_method(base, attr, dest)  (mp_fun_table.load_method((base), (attr), (dest)))
+#define mp_load_super_method(attr, dest)  (mp_fun_table.load_super_method((attr), (dest)))
+#define mp_store_name(qst, obj)           (mp_fun_table.store_name((qst), (obj)))
+#define mp_store_global(qst, obj)         (mp_fun_table.store_global((qst), (obj)))
+#define mp_store_attr(base, attr, val)    (mp_fun_table.store_attr((base), (attr), (val)))
+
 #define mp_unary_op(op, obj)        (mp_fun_table.unary_op((op), (obj)))
 #define mp_binary_op(op, lhs, rhs)  (mp_fun_table.binary_op((op), (lhs), (rhs)))
 
@@ -193,6 +199,13 @@ static inline mp_obj_t mp_obj_len_dyn(mp_obj_t o) {
 #define MP_DYNRUNTIME_MAKE_FUNCTION(f) \
     (mp_make_function_from_raw_code((rc.fun_data = (f), &rc), MP_OBJ_NULL, MP_OBJ_NULL))
 
+#define mp_import_name(name, fromlist, level) \
+    (mp_fun_table.import_name((name), (fromlist), (level)))
+#define mp_import_from(module, name) \
+    (mp_fun_table.import_from((module), (name)))
+#define mp_import_all(module) \
+    (mp_fun_table.import_all((module))
+
 /******************************************************************************/
 // Exceptions
 

From 8af9796b1642189f590520062b1a00e965d5985e Mon Sep 17 00:00:00 2001
From: Tweako <tweako@live.nl>
Date: Wed, 16 Sep 2020 10:29:33 +0200
Subject: [PATCH 0303/3533] stm32/led: Support PWM output without TIM3.

For example, the STM32WB55 doesn't have TIM3 but can still drive LEDs using
PWM on other timers.
---
 ports/stm32/led.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ports/stm32/led.c b/ports/stm32/led.c
index 923171884629f..adcb240cc0cc6 100644
--- a/ports/stm32/led.c
+++ b/ports/stm32/led.c
@@ -141,9 +141,11 @@ STATIC void led_pwm_init(int led) {
         case 2:
             __TIM2_CLK_ENABLE();
             break;
+        #if defined(TIM3)
         case 3:
             __TIM3_CLK_ENABLE();
             break;
+        #endif
         default:
             assert(0);
     }

From c410a86814abde8ce05aaf46383f38ef9f981a8c Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 17 Sep 2020 13:26:24 +1000
Subject: [PATCH 0304/3533] tests/basics: Enable == and != special-method tests
 now that they work.

These work since 3aab54bf434e7f025a91ea05052f1bac439fad8c

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/basics/special_methods.py  | 4 ++++
 tests/basics/special_methods2.py | 9 ---------
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/tests/basics/special_methods.py b/tests/basics/special_methods.py
index b56bc1c9c479d..d8af8e07979f2 100644
--- a/tests/basics/special_methods.py
+++ b/tests/basics/special_methods.py
@@ -100,6 +100,10 @@ def __int__(self):
 cud2 = Cud()
 
 str(cud1)
+cud1 == cud1
+cud1 == cud2
+cud1 != cud1
+cud1 != cud2
 cud1 < cud2
 cud1 <= cud2
 cud1 == cud2
diff --git a/tests/basics/special_methods2.py b/tests/basics/special_methods2.py
index 09e43fff29973..31f330ab42b9d 100644
--- a/tests/basics/special_methods2.py
+++ b/tests/basics/special_methods2.py
@@ -129,12 +129,3 @@ def __dir__(self):
 
 # test that dir() does not delegate to __dir__ for the type
 print('a' in dir(Cud))
-
-# TODO: the following operations are not supported on every ports
-#
-# ne is not supported, !(eq) is called instead
-#cud1 != cud2
-#
-# in the following test, cpython still calls __eq__
-# cud3=cud1
-# cud3==cud1

From 42342fa3cb30e2eac56ceb1d21b4eb60a0f406f3 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 17 Sep 2020 13:37:31 +1000
Subject: [PATCH 0305/3533] tests/basics: Add test for
 MICROPY_PY_ALL_INPLACE_SPECIAL_METHODS ops.

And enable this feature on unix, the coverage variant.  The .exp test file
is needed so the test can run on CPython versions prior to "@=" operator
support.

Signed-off-by: Damien George <damien@micropython.org>
---
 .../unix/variants/coverage/mpconfigvariant.h  |  1 +
 tests/basics/class_inplace_op2.py             | 73 +++++++++++++++++++
 tests/basics/class_inplace_op2.py.exp         | 12 +++
 3 files changed, 86 insertions(+)
 create mode 100644 tests/basics/class_inplace_op2.py
 create mode 100644 tests/basics/class_inplace_op2.py.exp

diff --git a/ports/unix/variants/coverage/mpconfigvariant.h b/ports/unix/variants/coverage/mpconfigvariant.h
index 802c2fe5f7203..3de5294322502 100644
--- a/ports/unix/variants/coverage/mpconfigvariant.h
+++ b/ports/unix/variants/coverage/mpconfigvariant.h
@@ -39,6 +39,7 @@
 #define MICROPY_WARNINGS_CATEGORY      (1)
 #define MICROPY_MODULE_GETATTR         (1)
 #define MICROPY_PY_DELATTR_SETATTR     (1)
+#define MICROPY_PY_ALL_INPLACE_SPECIAL_METHODS (1)
 #define MICROPY_PY_REVERSE_SPECIAL_METHODS (1)
 #define MICROPY_PY_BUILTINS_MEMORYVIEW_ITEMSIZE (1)
 #define MICROPY_PY_BUILTINS_NEXT2      (1)
diff --git a/tests/basics/class_inplace_op2.py b/tests/basics/class_inplace_op2.py
new file mode 100644
index 0000000000000..0e3f2add412c2
--- /dev/null
+++ b/tests/basics/class_inplace_op2.py
@@ -0,0 +1,73 @@
+# Test inplace special methods enabled by MICROPY_PY_ALL_INPLACE_SPECIAL_METHODS
+
+
+class A:
+    def __imul__(self, other):
+        print("__imul__")
+        return self
+
+    def __imatmul__(self, other):
+        print("__imatmul__")
+        return self
+
+    def __ifloordiv__(self, other):
+        print("__ifloordiv__")
+        return self
+
+    def __itruediv__(self, other):
+        print("__itruediv__")
+        return self
+
+    def __imod__(self, other):
+        print("__imod__")
+        return self
+
+    def __ipow__(self, other):
+        print("__ipow__")
+        return self
+
+    def __ior__(self, other):
+        print("__ior__")
+        return self
+
+    def __ixor__(self, other):
+        print("__ixor__")
+        return self
+
+    def __iand__(self, other):
+        print("__iand__")
+        return self
+
+    def __ilshift__(self, other):
+        print("__ilshift__")
+        return self
+
+    def __irshift__(self, other):
+        print("__irshift__")
+        return self
+
+
+a = A()
+
+try:
+    a *= None
+except TypeError:
+    print("SKIP")
+    raise SystemExit
+
+a @= None
+a //= None
+a /= None
+a %= None
+a **= None
+a |= None
+a ^= None
+a &= None
+a <<= None
+a >>= None
+
+# Normal operator should not fallback to inplace operator
+try:
+    a * None
+except TypeError:
+    print("TypeError")
diff --git a/tests/basics/class_inplace_op2.py.exp b/tests/basics/class_inplace_op2.py.exp
new file mode 100644
index 0000000000000..8c323b5178ef4
--- /dev/null
+++ b/tests/basics/class_inplace_op2.py.exp
@@ -0,0 +1,12 @@
+__imul__
+__imatmul__
+__ifloordiv__
+__itruediv__
+__imod__
+__ipow__
+__ior__
+__ixor__
+__iand__
+__ilshift__
+__irshift__
+TypeError

From 3e16763201d879cfdd58fdf269fbe03a3d326675 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 22 Sep 2020 14:08:22 +1000
Subject: [PATCH 0306/3533] stm32/rfcore: Fix FUS layout and size of
 ipcc_device_info_table_t.

The device info table has a different layout when core 2 is in FUS mode.
In particular it's larger than the 32 bytes used when in WS mode and if the
correct amount of space is not allocated then the end of the table may be
overwritten with other data (eg with FUS version 0.5.3).  So update the
structure to fix this.

Also update rfcore.py to disable IRQs (which are enabled by rfcore.c), to
not depend on uctypes, and to not require the asm_thumb emitter.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/boards/NUCLEO_WB55/rfcore.py | 19 ++++++------
 ports/stm32/rfcore.c                     | 38 ++++++++++++++++++------
 2 files changed, 39 insertions(+), 18 deletions(-)

diff --git a/ports/stm32/boards/NUCLEO_WB55/rfcore.py b/ports/stm32/boards/NUCLEO_WB55/rfcore.py
index e612499a7829f..cfe315605e541 100644
--- a/ports/stm32/boards/NUCLEO_WB55/rfcore.py
+++ b/ports/stm32/boards/NUCLEO_WB55/rfcore.py
@@ -34,10 +34,15 @@
 # to print out SRAM2A, register state and FUS/WS info.
 
 from machine import mem8, mem16, mem32
-import time, struct, uctypes
+import time, struct
 import stm
 
 
+def addressof(buf):
+    assert type(buf) is bytearray
+    return mem32[id(buf) + 12]
+
+
 class Flash:
     FLASH_KEY1 = 0x45670123
     FLASH_KEY2 = 0xCDEF89AB
@@ -68,7 +73,7 @@ def write(self, addr, buf):
         self.wait_not_busy()
         cr = 1 << 0  # PG
         mem32[stm.FLASH + stm.FLASH_CR] = cr
-        buf_addr = uctypes.addressof(buf)
+        buf_addr = addressof(buf)
         off = 0
         while off < len(buf):
             mem32[addr + off] = mem32[buf_addr + off]
@@ -111,13 +116,6 @@ def copy_file_to_flash(filename, addr):
 OCF_FUS_START_WS = const(0x5A)
 OCF_BLE_INIT = const(0x66)
 
-
-@micropython.asm_thumb
-def asm_sev_wfe():
-    data(2, 0xBF40)  # sev
-    data(2, 0xBF20)  # wfe
-
-
 TABLE_DEVICE_INFO = const(0)
 TABLE_BLE = const(1)
 TABLE_SYS = const(3)
@@ -199,6 +197,9 @@ def ipcc_init():
     BLE_EVT_QUEUE = get_ipcc_table_word(TABLE_BLE, 2)
     BLE_HCI_ACL_DATA_BUF = get_ipcc_table_word(TABLE_BLE, 3)
 
+    # Disable interrupts, the code here uses polling
+    mem32[stm.IPCC + stm.IPCC_C1CR] = 0
+
     print("IPCC initialised")
     print("SYS: 0x%08x 0x%08x" % (SYS_CMD_BUF, SYS_SYS_QUEUE))
     print("BLE: 0x%08x 0x%08x 0x%08x" % (BLE_CMD_BUF, BLE_CS_BUF, BLE_EVT_QUEUE))
diff --git a/ports/stm32/rfcore.c b/ports/stm32/rfcore.c
index ca2ad747c4bb8..dc23bbe0b2a69 100644
--- a/ports/stm32/rfcore.c
+++ b/ports/stm32/rfcore.c
@@ -94,15 +94,35 @@ typedef struct _parse_hci_info_t {
 // [16:23] = SRAM2b (Number of 1k sectors)
 // [24:31] = SRAM2a (Number of 1k sectors)
 
-typedef struct __attribute__((packed)) _ipcc_device_info_table_t {
-    uint32_t safeboot_version;
-    uint32_t fus_version;
-    uint32_t fus_memorysize;
-    uint32_t fus_info;
-    uint32_t fw_version;
-    uint32_t fw_memorysize;
-    uint32_t fw_infostack;
-    uint32_t fw_reserved;
+typedef union __attribute__((packed)) _ipcc_device_info_table_t {
+    struct {
+        uint32_t table_state;
+        uint8_t reserved0;
+        uint8_t last_fus_state;
+        uint8_t last_ws_state;
+        uint8_t ws_type;
+        uint32_t safeboot_version;
+        uint32_t fus_version;
+        uint32_t fus_memorysize;
+        uint32_t ws_version;
+        uint32_t ws_memorysize;
+        uint32_t ws_ble_info;
+        uint32_t ws_thread_info;
+        uint32_t reserved1;
+        uint64_t uid64;
+        uint16_t device_id;
+        uint16_t pad;
+    } fus;
+    struct {
+        uint32_t safeboot_version;
+        uint32_t fus_version;
+        uint32_t fus_memorysize;
+        uint32_t fus_info;
+        uint32_t fw_version;
+        uint32_t fw_memorysize;
+        uint32_t fw_infostack;
+        uint32_t fw_reserved;
+    } ws;
 } ipcc_device_info_table_t;
 
 typedef struct __attribute__((packed)) _ipcc_ble_table_t {

From 71adf506ce43b55b859f81f191ac0826928bbdd5 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 22 Sep 2020 15:05:00 +1000
Subject: [PATCH 0307/3533] extmod/vfs: Fix lookup of entry in root dir so it
 fails correctly.

Prior to this commit, uos.chdir('/') followed by uos.stat('noexist') would
succeed that stat even though the entry did not exist (some other functions
like listdir would have similar issues).  This is because, if the current
directory was the root and the path was relative, mp_vfs_lookup_path would
return success for bad paths.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/vfs.c                  |  8 ++------
 tests/extmod/vfs_basic.py     |  8 ++++++++
 tests/extmod/vfs_basic.py.exp | 12 ++++++++++++
 3 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/extmod/vfs.c b/extmod/vfs.c
index d1291068ad8d6..3cb7af1b434f9 100644
--- a/extmod/vfs.c
+++ b/extmod/vfs.c
@@ -83,12 +83,8 @@ mp_vfs_mount_t *mp_vfs_lookup_path(const char *path, const char **path_out) {
             }
         }
 
-        // if we get here then there's nothing mounted on /
-
-        if (is_abs) {
-            // path began with / and was not found
-            return MP_VFS_NONE;
-        }
+        // if we get here then there's nothing mounted on /, so the path doesn't exist
+        return MP_VFS_NONE;
     }
 
     // a relative path within a mounted device
diff --git a/tests/extmod/vfs_basic.py b/tests/extmod/vfs_basic.py
index 62b2a277381d6..9a9ef2ca61be3 100644
--- a/tests/extmod/vfs_basic.py
+++ b/tests/extmod/vfs_basic.py
@@ -74,6 +74,14 @@ def open(self, file, mode):
 # getcwd when in root dir
 print(uos.getcwd())
 
+# test operations on the root directory with nothing mounted, they should all fail
+for func in ("chdir", "listdir", "mkdir", "remove", "rmdir", "stat"):
+    for arg in ("x", "/x"):
+        try:
+            getattr(uos, func)(arg)
+        except OSError:
+            print(func, arg, "OSError")
+
 # basic mounting and listdir
 uos.mount(Filesystem(1), "/test_mnt")
 print(uos.listdir())
diff --git a/tests/extmod/vfs_basic.py.exp b/tests/extmod/vfs_basic.py.exp
index ebca31030451b..536bb4c805d30 100644
--- a/tests/extmod/vfs_basic.py.exp
+++ b/tests/extmod/vfs_basic.py.exp
@@ -1,6 +1,18 @@
 (16384, 0, 0, 0, 0, 0, 0, 0, 0, 0)
 True
 /
+chdir x OSError
+chdir /x OSError
+listdir x OSError
+listdir /x OSError
+mkdir x OSError
+mkdir /x OSError
+remove x OSError
+remove /x OSError
+rmdir x OSError
+rmdir /x OSError
+stat x OSError
+stat /x OSError
 1 mount False False
 ['test_mnt']
 ('test_mnt', 16384, 0)

From bada8c923195622aee80faf7acf003bc7852459d Mon Sep 17 00:00:00 2001
From: stijn <stijn@ignitron.net>
Date: Tue, 22 Sep 2020 13:59:47 +0200
Subject: [PATCH 0308/3533] windows: Update build instructions in README.

Make the instructions more complete by documenting all needed steps for
starting from scratch.  Also add a section for MSYS2 since the Travis build
uses it as well and it's a good alternative for Cygwin.  Remove the mingw32
reference since it's not readily available anymore in most Linux distros
nor compiles successfully.
---
 ports/windows/README.md | 60 ++++++++++++++++++++++++++++++++++-------
 1 file changed, 50 insertions(+), 10 deletions(-)

diff --git a/ports/windows/README.md b/ports/windows/README.md
index f1bd405513b99..8d907d1b7243a 100644
--- a/ports/windows/README.md
+++ b/ports/windows/README.md
@@ -3,46 +3,73 @@ It is based on Unix port, and expected to remain so.
 The port requires additional testing, debugging, and patches. Please
 consider to contribute.
 
+All gcc-based builds use the gcc compiler from [Mingw-w64](mingw-w64.org),
+which is the advancement of the original mingw project. The latter is
+getting obsolete and is not actively supported by MicroPython.
+
+Build instruction assume you're in the ports/windows directory.
 
 Building on Debian/Ubuntu Linux system
 ---------------------------------------
 
-    sudo apt-get install gcc-mingw-w64
+    sudo apt-get install python3 build-essential gcc-mingw-w64
+    make -C ../../mpy-cross
     make CROSS_COMPILE=i686-w64-mingw32-
 
-If for some reason the mingw-w64 crosscompiler is not available, you can try
-mingw32 instead, but it comes with a really old gcc which may produce some
-spurious errors (you may need to disable -Werror):
-
-    sudo apt-get install mingw32 mingw32-binutils mingw32-runtime
-    make CROSS_COMPILE=i586-mingw32msvc-
-
 
 Building under Cygwin
 ---------------------
 
-Install following packages using cygwin's setup.exe:
+Install Cygwin, then install following packages using Cygwin's setup.exe:
 
 * mingw64-i686-gcc-core
 * mingw64-x86_64-gcc-core
 * make
 
+Also install the python3 package, or install Python globally for Windows (see below).
+
 Build using:
 
+    make -C ../../mpy-cross CROSS_COMPILE=i686-w64-mingw32-
     make CROSS_COMPILE=i686-w64-mingw32-
 
 Or for 64bit:
 
+    make -C ../../mpy-cross CROSS_COMPILE=x86_64-w64-mingw32-
     make CROSS_COMPILE=x86_64-w64-mingw32-
 
 
+Building under MSYS2
+--------------------
+
+Install MSYS2 from http://repo.msys2.org/distrib, start the msys2.exe shell and
+install the build tools:
+
+    pacman -Syuu
+    pacman -S make mingw-w64-x86_64-gcc pkg-config python3
+
+Start the mingw64.exe shell and build:
+
+    make -C ../../mpy-cross STRIP=echo SIZE=echo
+    make
+
+
 Building using MS Visual Studio 2013 (or higher)
 ------------------------------------------------
 
-In the IDE, open `micropython.vcxproj` and build.
+Install Python. There are several ways to do this, for example: download and install the
+latest Python 3 release from https://www.python.org/downloads/windows or from
+https://docs.conda.io/en/latest/miniconda.html,
+or open the Microsoft Store app and search for Python and install it.
+
+Install Visual Studio and the C++ toolset (for recent versions: install
+the free Visual Studio Community edition and the *Desktop development with C++* workload).
+
+In the IDE, open `micropython-cross.vcxproj` and `micropython.vcxproj` and build.
 
 To build from the command line:
 
+    msbuild ../../mpy-cross/mpy-cross.vcxproj
     msbuild micropython.vcxproj
 
 __Stack usage__
@@ -57,6 +84,19 @@ There are several ways to deal with this:
 See [issue 2927](https://github.com/micropython/micropython/issues/2927) for more information.
 
 
+Running the tests
+-----------------
+
+This is similar for all ports:
+
+    cd ../../tests
+    python3 ./run-tests
+
+Depending on the combination of platform and Python version used it might be
+needed to first set the MICROPY_MICROPYTHON environment variable to
+the full path of micropython.exe.
+
+
 Running on Linux using Wine
 ---------------------------
 

From ca017841d65b5f9da5eb4e6e3ca66b009bc54fc4 Mon Sep 17 00:00:00 2001
From: Iyassou Shimels <s.iyassou@gmail.com>
Date: Wed, 23 Sep 2020 22:45:22 +0300
Subject: [PATCH 0309/3533] py/objstr: Make bytes(bytes_obj) return bytes_obj.

Calling the bytes constructor on a bytes object returns the original bytes
object.  This saves allocating a new instance, and matches CPython.

Signed-off-by: Iyassou Shimels <s.iyassou@gmail.com>
---
 py/objstr.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/py/objstr.c b/py/objstr.c
index a276a255e516f..84728e6f2d919 100644
--- a/py/objstr.c
+++ b/py/objstr.c
@@ -205,6 +205,10 @@ STATIC mp_obj_t bytes_make_new(const mp_obj_type_t *type_in, size_t n_args, size
         return mp_const_empty_bytes;
     }
 
+    if (mp_obj_is_type(args[0], &mp_type_bytes)) {
+        return args[0];
+    }
+
     if (mp_obj_is_str(args[0])) {
         if (n_args < 2 || n_args > 3) {
             goto wrong_args;

From 50e34f979c90584273a67ecd9189640417a60960 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 23 Sep 2020 23:17:56 +1000
Subject: [PATCH 0310/3533] py/objarray.h: Add mp_obj_memoryview_init() helper
 function.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/objarray.h | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/py/objarray.h b/py/objarray.h
index 2fb6e2c9158f4..94c31c969386b 100644
--- a/py/objarray.h
+++ b/py/objarray.h
@@ -49,4 +49,14 @@ typedef struct _mp_obj_array_t {
     void *items;
 } mp_obj_array_t;
 
+#if MICROPY_PY_BUILTINS_MEMORYVIEW
+static inline void mp_obj_memoryview_init(mp_obj_array_t *self, size_t typecode, size_t offset, size_t len, void *items) {
+    self->base.type = &mp_type_memoryview;
+    self->typecode = typecode;
+    self->free = offset;
+    self->len = len;
+    self->items = items;
+}
+#endif
+
 #endif // MICROPY_INCLUDED_PY_OBJARRAY_H

From 81f2162ca0e926c9a4a1787a3863d94d86be0b36 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 23 Sep 2020 23:18:16 +1000
Subject: [PATCH 0311/3533] extmod/modbluetooth: Change module-owned bytes
 objects to memoryview.

A read-only memoryview object is a better representation of the data, which
is owned by the ubluetooth module and may change between calls to the
user's irq callback function.

Signed-off-by: Damien George <damien@micropython.org>
---
 docs/library/ubluetooth.rst                   | 22 +++++++++++-----
 extmod/modbluetooth.c                         | 26 +++++++------------
 tests/multi_bluetooth/ble_characteristic.py   |  6 ++---
 tests/multi_bluetooth/ble_gap_device_name.py  |  2 +-
 .../multi_bluetooth/ble_gatt_data_transfer.py |  2 +-
 5 files changed, 31 insertions(+), 27 deletions(-)

diff --git a/docs/library/ubluetooth.rst b/docs/library/ubluetooth.rst
index 03d03583a1cce..f94ad3a612c07 100644
--- a/docs/library/ubluetooth.rst
+++ b/docs/library/ubluetooth.rst
@@ -88,12 +88,22 @@ Event Handling
     arguments, ``event`` (which will be one of the codes below) and ``data``
     (which is an event-specific tuple of values).
 
-    **Note:** the ``addr``, ``adv_data``, ``char_data``, ``notify_data``, and
-    ``uuid`` entries in the tuples are references to data managed by the
-    :mod:`ubluetooth` module (i.e. the same instance will be re-used across
-    multiple calls to the event handler). If your program wants to use this
-    data outside of the handler, then it must copy them first, e.g. by using
-    ``bytes(addr)`` or ``bluetooth.UUID(uuid)``.
+    **Note:** As an optimisation to prevent unnecessary allocations, the ``addr``,
+    ``adv_data``, ``char_data``, ``notify_data``, and ``uuid`` entries in the
+    tuples are read-only memoryview instances pointing to ubluetooth's internal
+    ringbuffer, and are only valid during the invocation of the IRQ handler
+    function.  If your program needs to save one of these values to access after
+    the IRQ handler has returned (e.g. by saving it in a class instance or global
+    variable), then it needs to take a copy of the data, either by using ``bytes()``
+    or ``bluetooth.UUID()``, like this::
+
+        connected_addr = bytes(addr)  # equivalently: adv_data, char_data, or notify_data
+        matched_uuid = bluetooth.UUID(uuid)
+
+    For example, the IRQ handler for a scan result might inspect the ``adv_data``
+    to decide if it's the correct device, and only then copy the address data to be
+    used elsewhere in the program.  And to print data from within the IRQ handler,
+    ``print(bytes(addr))`` will be needed.
 
     An event handler showing all possible events::
 
diff --git a/extmod/modbluetooth.c b/extmod/modbluetooth.c
index daf9cd0d1984b..57f69433a1a97 100644
--- a/extmod/modbluetooth.c
+++ b/extmod/modbluetooth.c
@@ -32,7 +32,6 @@
 #include "py/mphal.h"
 #include "py/obj.h"
 #include "py/objarray.h"
-#include "py/objstr.h"
 #include "py/qstr.h"
 #include "py/runtime.h"
 #include "extmod/modbluetooth.h"
@@ -62,9 +61,8 @@ typedef struct {
     mp_obj_t irq_data_tuple;
     uint8_t irq_data_addr_bytes[6];
     uint16_t irq_data_data_alloc;
-    uint8_t *irq_data_data_bytes;
-    mp_obj_str_t irq_data_addr;
-    mp_obj_str_t irq_data_data;
+    mp_obj_array_t irq_data_addr;
+    mp_obj_array_t irq_data_data;
     mp_obj_bluetooth_uuid_t irq_data_uuid;
     ringbuf_t ringbuf;
     #if MICROPY_PY_BLUETOOTH_GATTS_ON_READ_CALLBACK
@@ -262,11 +260,9 @@ STATIC mp_obj_t bluetooth_ble_make_new(const mp_obj_type_t *type, size_t n_args,
         #endif
 
         // Pre-allocated buffers for address, payload and uuid.
-        o->irq_data_addr.base.type = &mp_type_bytes;
-        o->irq_data_addr.data = o->irq_data_addr_bytes;
+        mp_obj_memoryview_init(&o->irq_data_addr, 'B', 0, 0, o->irq_data_addr_bytes);
         o->irq_data_data_alloc = MICROPY_PY_BLUETOOTH_MAX_EVENT_DATA_BYTES_LEN(MICROPY_PY_BLUETOOTH_RINGBUF_SIZE);
-        o->irq_data_data.base.type = &mp_type_bytes;
-        o->irq_data_data.data = m_new(uint8_t, o->irq_data_data_alloc);
+        mp_obj_memoryview_init(&o->irq_data_data, 'B', 0, 0, m_new(uint8_t, o->irq_data_data_alloc));
         o->irq_data_uuid.base.type = &bluetooth_uuid_type;
 
         // Allocate the default ringbuf.
@@ -352,7 +348,7 @@ STATIC mp_obj_t bluetooth_ble_config(size_t n_args, const mp_obj_t *args, mp_map
                         // Get old buffer sizes and pointers
                         uint8_t *old_ringbuf_buf = self->ringbuf.buf;
                         size_t old_ringbuf_alloc = self->ringbuf.size;
-                        uint8_t *old_irq_data_buf = (uint8_t *)self->irq_data_data.data;
+                        uint8_t *old_irq_data_buf = (uint8_t *)self->irq_data_data.items;
                         size_t old_irq_data_alloc = self->irq_data_data_alloc;
 
                         // Atomically update the ringbuf and irq data
@@ -362,7 +358,7 @@ STATIC mp_obj_t bluetooth_ble_config(size_t n_args, const mp_obj_t *args, mp_map
                         self->ringbuf.iget = 0;
                         self->ringbuf.iput = 0;
                         self->irq_data_data_alloc = irq_data_alloc;
-                        self->irq_data_data.data = irq_data;
+                        self->irq_data_data.items = irq_data;
                         MICROPY_PY_BLUETOOTH_EXIT
 
                         // Free old buffers
@@ -850,7 +846,7 @@ const mp_obj_module_t mp_module_ubluetooth = {
 
 #include <stdio.h>
 
-STATIC void ringbuf_extract(ringbuf_t *ringbuf, mp_obj_tuple_t *data_tuple, size_t n_u16, size_t n_u8, mp_obj_str_t *bytes_addr, size_t n_i8, mp_obj_bluetooth_uuid_t *uuid, mp_obj_str_t *bytes_data) {
+STATIC void ringbuf_extract(ringbuf_t *ringbuf, mp_obj_tuple_t *data_tuple, size_t n_u16, size_t n_u8, mp_obj_array_t *bytes_addr, size_t n_i8, mp_obj_bluetooth_uuid_t *uuid, mp_obj_array_t *bytes_data) {
     assert(ringbuf_avail(ringbuf) >= n_u16 * 2 + n_u8 + (bytes_addr ? 6 : 0) + n_i8 + (uuid ? 1 : 0) + (bytes_data ? 1 : 0));
     size_t j = 0;
 
@@ -863,8 +859,7 @@ STATIC void ringbuf_extract(ringbuf_t *ringbuf, mp_obj_tuple_t *data_tuple, size
     if (bytes_addr) {
         bytes_addr->len = 6;
         for (size_t i = 0; i < bytes_addr->len; ++i) {
-            // cast away const, this is actually bt->irq_addr_bytes.
-            ((uint8_t *)bytes_addr->data)[i] = ringbuf_get(ringbuf);
+            ((uint8_t *)bytes_addr->items)[i] = ringbuf_get(ringbuf);
         }
         data_tuple->items[j++] = MP_OBJ_FROM_PTR(bytes_addr);
     }
@@ -880,12 +875,11 @@ STATIC void ringbuf_extract(ringbuf_t *ringbuf, mp_obj_tuple_t *data_tuple, size
     #endif
     // The code that enqueues into the ringbuf should ensure that it doesn't
     // put more than bt->irq_data_data_alloc bytes into the ringbuf, because
-    // that's what's available here in bt->irq_data_bytes.
+    // that's what's available here.
     if (bytes_data) {
         bytes_data->len = ringbuf_get16(ringbuf);
         for (size_t i = 0; i < bytes_data->len; ++i) {
-            // cast away const, this is actually bt->irq_data_bytes.
-            ((uint8_t *)bytes_data->data)[i] = ringbuf_get(ringbuf);
+            ((uint8_t *)bytes_data->items)[i] = ringbuf_get(ringbuf);
         }
         data_tuple->items[j++] = MP_OBJ_FROM_PTR(bytes_data);
     }
diff --git a/tests/multi_bluetooth/ble_characteristic.py b/tests/multi_bluetooth/ble_characteristic.py
index d918d9aefcf03..026b9d551c2b9 100644
--- a/tests/multi_bluetooth/ble_characteristic.py
+++ b/tests/multi_bluetooth/ble_characteristic.py
@@ -54,15 +54,15 @@ def irq(event, data):
             print("_IRQ_GATTC_CHARACTERISTIC_RESULT", data[-1])
             value_handle = data[2]
     elif event == _IRQ_GATTC_READ_RESULT:
-        print("_IRQ_GATTC_READ_RESULT", data[-1])
+        print("_IRQ_GATTC_READ_RESULT", bytes(data[-1]))
     elif event == _IRQ_GATTC_READ_DONE:
         print("_IRQ_GATTC_READ_DONE", data[-1])
     elif event == _IRQ_GATTC_WRITE_DONE:
         print("_IRQ_GATTC_WRITE_DONE", data[-1])
     elif event == _IRQ_GATTC_NOTIFY:
-        print("_IRQ_GATTC_NOTIFY", data[-1])
+        print("_IRQ_GATTC_NOTIFY", bytes(data[-1]))
     elif event == _IRQ_GATTC_INDICATE:
-        print("_IRQ_GATTC_INDICATE", data[-1])
+        print("_IRQ_GATTC_INDICATE", bytes(data[-1]))
     elif event == _IRQ_GATTS_INDICATE_DONE:
         print("_IRQ_GATTS_INDICATE_DONE", data[-1])
 
diff --git a/tests/multi_bluetooth/ble_gap_device_name.py b/tests/multi_bluetooth/ble_gap_device_name.py
index 92ea94278a647..fbc9d80baeb08 100644
--- a/tests/multi_bluetooth/ble_gap_device_name.py
+++ b/tests/multi_bluetooth/ble_gap_device_name.py
@@ -36,7 +36,7 @@ def irq(event, data):
             print("_IRQ_GATTC_CHARACTERISTIC_RESULT", data[-1])
             value_handle = data[2]
     elif event == _IRQ_GATTC_READ_RESULT:
-        print("_IRQ_GATTC_READ_RESULT", data[-1])
+        print("_IRQ_GATTC_READ_RESULT", bytes(data[-1]))
 
     if waiting_event is not None:
         if isinstance(waiting_event, int) and event == waiting_event:
diff --git a/tests/multi_bluetooth/ble_gatt_data_transfer.py b/tests/multi_bluetooth/ble_gatt_data_transfer.py
index 240f048607c92..944c9e2d2a55f 100644
--- a/tests/multi_bluetooth/ble_gatt_data_transfer.py
+++ b/tests/multi_bluetooth/ble_gatt_data_transfer.py
@@ -67,7 +67,7 @@ def irq(event, data):
     elif event == _IRQ_GATTC_WRITE_DONE:
         print("_IRQ_GATTC_WRITE_DONE", data[-1])
     elif event == _IRQ_GATTC_NOTIFY:
-        print("_IRQ_GATTC_NOTIFY", data[-1])
+        print("_IRQ_GATTC_NOTIFY", bytes(data[-1]))
 
     if waiting_event is not None:
         if (isinstance(waiting_event, int) and event == waiting_event) or (

From c8ade2bd7f5d0e089098bcc07eb77a770f3da726 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 23 Sep 2020 22:47:25 +1000
Subject: [PATCH 0312/3533] docs/develop: Add notes on prerequisite tools for
 building native .mpy.

Signed-off-by: Damien George <damien@micropython.org>
---
 docs/develop/natmod.rst | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/docs/develop/natmod.rst b/docs/develop/natmod.rst
index dc9f82e773874..a4c188719a4d9 100644
--- a/docs/develop/natmod.rst
+++ b/docs/develop/natmod.rst
@@ -21,7 +21,8 @@ language which can be compiled to stand-alone machine code can be put into a
 
 A native .mpy module is built using the ``mpy_ld.py`` tool, which is found in the
 ``tools/`` directory of the project.  This tool takes a set of object files
-(.o files) and links them together to create a native .mpy files.
+(.o files) and links them together to create a native .mpy files.  It requires
+CPython 3 and the library pyelftools v0.25 or greater.
 
 Supported features and limitations
 ----------------------------------
@@ -179,6 +180,14 @@ The file ``Makefile`` contains:
 Compiling the module
 --------------------
 
+The prerequisite tools needed to build a native .mpy file are:
+
+* The MicroPython repository (at least the ``py/`` and ``tools/`` directories).
+* CPython 3, and the library pyelftools (eg ``pip install 'pyelftools>=0.25'``).
+* GNU make.
+* A C compiler for the target architecture (if C source is used).
+* Optionally ``mpy-cross``, built from the MicroPython repository (if .py source is used).
+
 Be sure to select the correct ``ARCH`` for the target you are going to run on.
 Then build with::
 

From 9123b67d641ba708a4ea3e5cd50665f0a73c6c8a Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 24 Sep 2020 12:03:30 +1000
Subject: [PATCH 0313/3533] tests/run-tests: Use -BS flags when running
 CPython.

The use of -S ensures that only the CPython standard library is accessible,
which makes tests run the same regardless of any site-packages that are
installed.  It also improves start-up time of CPython, reducing the overall
time spent running the test suite.

tests/basics/containment.py is updated to work around issue with old Python
versions not being able to str-format a dict-keys object, which becomes
apparent when -S is used.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/basics/containment.py | 4 ++--
 tests/run-tests             | 8 ++++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/tests/basics/containment.py b/tests/basics/containment.py
index 4c94a9bae4c81..24317ddd233b9 100644
--- a/tests/basics/containment.py
+++ b/tests/basics/containment.py
@@ -1,8 +1,8 @@
 # sets, see set_containment
 for i in 1, 2:
     for o in {1:2}, {1:2}.keys():
-        print("{} in {}: {}".format(i, o, i in o))
-        print("{} not in {}: {}".format(i, o, i not in o))
+        print("{} in {}: {}".format(i, str(o), i in o))
+        print("{} not in {}: {}".format(i, str(o), i not in o))
 
 haystack = "supercalifragilistc"
 for needle in [haystack[i:] for i in range(len(haystack))]:
diff --git a/tests/run-tests b/tests/run-tests
index a7b88ecdd3265..eebc8c4252700 100755
--- a/tests/run-tests
+++ b/tests/run-tests
@@ -26,6 +26,10 @@ else:
     CPYTHON3 = os.getenv('MICROPY_CPYTHON3', 'python3')
     MICROPYTHON = os.getenv('MICROPY_MICROPYTHON', base_path('../ports/unix/micropython'))
 
+# Use CPython options to not save .pyc files, to only access the core standard library
+# (not site packages which may clash with u-module names), and improve start up time.
+CPYTHON3_CMD = [CPYTHON3, "-BS"]
+
 # mpy-cross is only needed if --via-mpy command-line arg is passed
 MPYCROSS = os.getenv('MICROPY_MPYCROSS', base_path('../mpy-cross/mpy-cross'))
 
@@ -319,7 +323,7 @@ def run_tests(pyb, tests, args, result_dir):
             upy_float_precision = int(upy_float_precision)
         has_complex = run_feature_check(pyb, args, base_path, 'complex.py') == b'complex\n'
         has_coverage = run_feature_check(pyb, args, base_path, 'coverage.py') == b'coverage\n'
-        cpy_byteorder = subprocess.check_output([CPYTHON3, base_path('feature_check/byteorder.py')])
+        cpy_byteorder = subprocess.check_output(CPYTHON3_CMD + [base_path('feature_check/byteorder.py')])
         skip_endian = (upy_byteorder != cpy_byteorder)
 
     # These tests don't test slice explicitly but rather use it to perform the test
@@ -498,7 +502,7 @@ def run_tests(pyb, tests, args, result_dir):
         else:
             # run CPython to work out expected output
             try:
-                output_expected = subprocess.check_output([CPYTHON3, '-B', test_file])
+                output_expected = subprocess.check_output(CPYTHON3_CMD + [test_file])
                 if args.write_exp:
                     with open(test_file_expected, 'wb') as f:
                         f.write(output_expected)

From 0fd0eb00aa5b9d311046d48d73a8cfabb30d7dd6 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Fri, 25 Sep 2020 03:15:22 +1000
Subject: [PATCH 0314/3533] examples/bluetooth: Update to use positional-only
 args to irq().

To match 6a6a5f9e151473bdcc1d14725d680691ff665a82.
---
 examples/bluetooth/ble_simple_central.py      | 2 +-
 examples/bluetooth/ble_simple_peripheral.py   | 2 +-
 examples/bluetooth/ble_temperature.py         | 2 +-
 examples/bluetooth/ble_temperature_central.py | 2 +-
 examples/bluetooth/ble_uart_peripheral.py     | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/examples/bluetooth/ble_simple_central.py b/examples/bluetooth/ble_simple_central.py
index f0a3297d322e1..a6bbdc6ee0795 100644
--- a/examples/bluetooth/ble_simple_central.py
+++ b/examples/bluetooth/ble_simple_central.py
@@ -45,7 +45,7 @@ class BLESimpleCentral:
     def __init__(self, ble):
         self._ble = ble
         self._ble.active(True)
-        self._ble.irq(handler=self._irq)
+        self._ble.irq(self._irq)
 
         self._reset()
 
diff --git a/examples/bluetooth/ble_simple_peripheral.py b/examples/bluetooth/ble_simple_peripheral.py
index f5e7661926ba8..d2b134e7149e9 100644
--- a/examples/bluetooth/ble_simple_peripheral.py
+++ b/examples/bluetooth/ble_simple_peripheral.py
@@ -31,7 +31,7 @@ class BLESimplePeripheral:
     def __init__(self, ble, name="mpy-uart"):
         self._ble = ble
         self._ble.active(True)
-        self._ble.irq(handler=self._irq)
+        self._ble.irq(self._irq)
         ((self._handle_tx, self._handle_rx),) = self._ble.gatts_register_services((_UART_SERVICE,))
         self._connections = set()
         self._write_callback = None
diff --git a/examples/bluetooth/ble_temperature.py b/examples/bluetooth/ble_temperature.py
index 001a26b114a0a..d375a62ffb8ac 100644
--- a/examples/bluetooth/ble_temperature.py
+++ b/examples/bluetooth/ble_temperature.py
@@ -35,7 +35,7 @@ class BLETemperature:
     def __init__(self, ble, name="mpy-temp"):
         self._ble = ble
         self._ble.active(True)
-        self._ble.irq(handler=self._irq)
+        self._ble.irq(self._irq)
         ((self._handle,),) = self._ble.gatts_register_services((_ENV_SENSE_SERVICE,))
         self._connections = set()
         self._payload = advertising_payload(
diff --git a/examples/bluetooth/ble_temperature_central.py b/examples/bluetooth/ble_temperature_central.py
index 79830341789d4..96c4aad1445a1 100644
--- a/examples/bluetooth/ble_temperature_central.py
+++ b/examples/bluetooth/ble_temperature_central.py
@@ -56,7 +56,7 @@ class BLETemperatureCentral:
     def __init__(self, ble):
         self._ble = ble
         self._ble.active(True)
-        self._ble.irq(handler=self._irq)
+        self._ble.irq(self._irq)
 
         self._reset()
 
diff --git a/examples/bluetooth/ble_uart_peripheral.py b/examples/bluetooth/ble_uart_peripheral.py
index 59b35f7e6ad5e..6d167a871a75e 100644
--- a/examples/bluetooth/ble_uart_peripheral.py
+++ b/examples/bluetooth/ble_uart_peripheral.py
@@ -31,7 +31,7 @@ class BLEUART:
     def __init__(self, ble, name="mpy-uart", rxbuf=100):
         self._ble = ble
         self._ble.active(True)
-        self._ble.irq(handler=self._irq)
+        self._ble.irq(self._irq)
         ((self._tx_handle, self._rx_handle),) = self._ble.gatts_register_services((_UART_SERVICE,))
         # Increase the size of the rx buffer and enable append mode.
         self._ble.gatts_set_buffer(self._rx_handle, rxbuf, True)

From 319437d4bd7c97ab18275d3eaf1bc190554f9df7 Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Fri, 25 Sep 2020 12:27:02 +1000
Subject: [PATCH 0315/3533] extmod/modure: Allow \\ in re.sub replacements.

---
 extmod/modure.c         | 3 +++
 tests/extmod/ure_sub.py | 6 ++++++
 2 files changed, 9 insertions(+)

diff --git a/extmod/modure.c b/extmod/modure.c
index 328c897d8890b..220587b42f9a3 100644
--- a/extmod/modure.c
+++ b/extmod/modure.c
@@ -343,6 +343,9 @@ STATIC mp_obj_t re_sub_helper(size_t n_args, const mp_obj_t *args) {
                         const char *end_match = match->caps[match_no * 2 + 1];
                         vstr_add_strn(&vstr_return, start_match, end_match - start_match);
                     }
+                } else if (*repl == '\\') {
+                    // Add the \ character
+                    vstr_add_byte(&vstr_return, *repl++);
                 }
             } else {
                 // Just add the current byte from the replacement string
diff --git a/tests/extmod/ure_sub.py b/tests/extmod/ure_sub.py
index 953e7bf62a478..ae6ad28d621f4 100644
--- a/tests/extmod/ure_sub.py
+++ b/tests/extmod/ure_sub.py
@@ -43,6 +43,9 @@ def A():
     )
 )
 
+# \g immediately followed by another \g
+print(re.sub("(abc)", r"\g<1>\g<1>", "abc"))
+
 # no matches at all
 print(re.sub("a", "b", "c"))
 
@@ -69,3 +72,6 @@ def A():
     re.sub(123, "a", "a")
 except TypeError:
     print("TypeError")
+
+# Include \ in the sub replacement
+print(re.sub("b", "\\\\b", "abc"))

From ce49be43b1ac7582edcfec20c56928781a512a7d Mon Sep 17 00:00:00 2001
From: Maureen Helm <maureen.helm@nxp.com>
Date: Sat, 12 Sep 2020 14:46:05 -0500
Subject: [PATCH 0316/3533] zephyr: Replace zephyr integer types with C99
 types.

Zephyr v2.4.0 stopped using custom integer types in favor of C99 types
instead.

Signed-off-by: Maureen Helm <maureen.helm@nxp.com>
---
 ports/zephyr/machine_i2c.c    | 2 +-
 ports/zephyr/zephyr_storage.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/zephyr/machine_i2c.c b/ports/zephyr/machine_i2c.c
index 4b29f41d1ef71..576cb197777ed 100644
--- a/ports/zephyr/machine_i2c.c
+++ b/ports/zephyr/machine_i2c.c
@@ -97,7 +97,7 @@ STATIC int machine_hard_i2c_transfer_single(mp_obj_base_t *self_in, uint16_t add
     struct i2c_msg msg;
     int ret;
 
-    msg.buf = (u8_t *)buf;
+    msg.buf = (uint8_t *)buf;
     msg.len = len;
     msg.flags = 0;
 
diff --git a/ports/zephyr/zephyr_storage.c b/ports/zephyr/zephyr_storage.c
index 83f19a8feeadd..1c25b32771e66 100644
--- a/ports/zephyr/zephyr_storage.c
+++ b/ports/zephyr/zephyr_storage.c
@@ -146,7 +146,7 @@ typedef struct _zephyr_flash_area_obj_t {
     const struct flash_area *area;
     int block_size;
     int block_count;
-    u8_t id;
+    uint8_t id;
 } zephyr_flash_area_obj_t;
 
 STATIC void zephyr_flash_area_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {

From f842e32155d38038f3a2657238be57724b1e0bf1 Mon Sep 17 00:00:00 2001
From: Maureen Helm <maureen.helm@nxp.com>
Date: Sat, 12 Sep 2020 14:50:21 -0500
Subject: [PATCH 0317/3533] zephyr: Const-ify struct device instance pointers.

Zephyr v2.4.0 added a const qualifier to usages of struct device to
allow storing device driver instances exclusively in flash and thereby
reduce ram footprint.

Signed-off-by: Maureen Helm <maureen.helm@nxp.com>
---
 ports/zephyr/machine_i2c.c | 4 ++--
 ports/zephyr/machine_pin.c | 4 ++--
 ports/zephyr/modmachine.h  | 2 +-
 ports/zephyr/modzsensor.c  | 2 +-
 ports/zephyr/uart_core.c   | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/ports/zephyr/machine_i2c.c b/ports/zephyr/machine_i2c.c
index 576cb197777ed..0efcd331fc4d1 100644
--- a/ports/zephyr/machine_i2c.c
+++ b/ports/zephyr/machine_i2c.c
@@ -42,7 +42,7 @@ STATIC const mp_obj_type_t machine_hard_i2c_type;
 
 typedef struct _machine_hard_i2c_obj_t {
     mp_obj_base_t base;
-    struct device *dev;
+    const struct device *dev;
     bool restart;
 } machine_hard_i2c_obj_t;
 
@@ -65,7 +65,7 @@ mp_obj_t machine_hard_i2c_make_new(const mp_obj_type_t *type, size_t n_args, siz
     mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
 
     const char *dev_name = mp_obj_str_get_str(args[ARG_id].u_obj);
-    struct device *dev = device_get_binding(dev_name);
+    const struct device *dev = device_get_binding(dev_name);
 
     if (dev == NULL) {
         mp_raise_ValueError(MP_ERROR_TEXT("device not found"));
diff --git a/ports/zephyr/machine_pin.c b/ports/zephyr/machine_pin.c
index c9c6a8c8936e0..34c822c2f05a5 100644
--- a/ports/zephyr/machine_pin.c
+++ b/ports/zephyr/machine_pin.c
@@ -58,7 +58,7 @@ void machine_pin_deinit(void) {
     MP_STATE_PORT(machine_pin_irq_list) = NULL;
 }
 
-STATIC void gpio_callback_handler(struct device *port, struct gpio_callback *cb, gpio_port_pins_t pins) {
+STATIC void gpio_callback_handler(const struct device *port, struct gpio_callback *cb, gpio_port_pins_t pins) {
     machine_pin_irq_obj_t *irq = CONTAINER_OF(cb, machine_pin_irq_obj_t, callback);
 
     #if MICROPY_STACK_CHECK
@@ -132,7 +132,7 @@ mp_obj_t mp_pin_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw,
     mp_obj_get_array_fixed_n(args[0], 2, &items);
     const char *drv_name = mp_obj_str_get_str(items[0]);
     int wanted_pin = mp_obj_get_int(items[1]);
-    struct device *wanted_port = device_get_binding(drv_name);
+    const struct device *wanted_port = device_get_binding(drv_name);
     if (!wanted_port) {
         mp_raise_ValueError(MP_ERROR_TEXT("invalid port"));
     }
diff --git a/ports/zephyr/modmachine.h b/ports/zephyr/modmachine.h
index 766a9d7ea3874..5d7b2e1ed847a 100644
--- a/ports/zephyr/modmachine.h
+++ b/ports/zephyr/modmachine.h
@@ -9,7 +9,7 @@ MP_DECLARE_CONST_FUN_OBJ_0(machine_info_obj);
 
 typedef struct _machine_pin_obj_t {
     mp_obj_base_t base;
-    struct device *port;
+    const struct device *port;
     uint32_t pin;
     struct _machine_pin_irq_obj_t *irq;
 } machine_pin_obj_t;
diff --git a/ports/zephyr/modzsensor.c b/ports/zephyr/modzsensor.c
index b01ce2693c232..01f05aacd64a0 100644
--- a/ports/zephyr/modzsensor.c
+++ b/ports/zephyr/modzsensor.c
@@ -35,7 +35,7 @@
 
 typedef struct _mp_obj_sensor_t {
     mp_obj_base_t base;
-    struct device *dev;
+    const struct device *dev;
 } mp_obj_sensor_t;
 
 STATIC mp_obj_t sensor_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
diff --git a/ports/zephyr/uart_core.c b/ports/zephyr/uart_core.c
index 63ecc8289e3c9..44bdeb5c2784c 100644
--- a/ports/zephyr/uart_core.c
+++ b/ports/zephyr/uart_core.c
@@ -53,7 +53,7 @@ void mp_hal_stdout_tx_strn(const char *str, mp_uint_t len) {
         }
     }
     #else
-    static struct device *uart_console_dev;
+    static const struct device *uart_console_dev;
     if (uart_console_dev == NULL) {
         uart_console_dev = device_get_binding(CONFIG_UART_CONSOLE_ON_DEV_NAME);
     }

From c2a7aac906a31b0d361b7177fae7fc88736a7705 Mon Sep 17 00:00:00 2001
From: Maureen Helm <maureen.helm@nxp.com>
Date: Sat, 12 Sep 2020 15:35:29 -0500
Subject: [PATCH 0318/3533] travis: Update zephyr build to v2.4.0.

Updates CI to use the latest zephyr release tag.

Signed-off-by: Maureen Helm <maureen.helm@nxp.com>
---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 45b67dc9fedc2..c9fcc21336efd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -54,7 +54,7 @@ jobs:
           zephyrprojectrtos/ci:v0.11.8
         - docker ps -a
       install:
-        - docker exec zephyr-ci west init --mr v2.3.0 /zephyrproject
+        - docker exec zephyr-ci west init --mr v2.4.0 /zephyrproject
         - docker exec -w /zephyrproject zephyr-ci west update
         - docker exec -w /zephyrproject zephyr-ci west zephyr-export
       script:

From 997ec9e8ccaf4f1d8a950ef025e098e6b033c66c Mon Sep 17 00:00:00 2001
From: Maureen Helm <maureen.helm@nxp.com>
Date: Mon, 28 Sep 2020 09:23:10 -0500
Subject: [PATCH 0319/3533] zephyr: Update build instructions to v2.4.0.

Updates the zephyr port build instructions to use the latest zephyr
release tag.

Signed-off-by: Maureen Helm <maureen.helm@nxp.com>
---
 ports/zephyr/README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ports/zephyr/README.md b/ports/zephyr/README.md
index a2fb393d90d0f..d69030dc2c712 100644
--- a/ports/zephyr/README.md
+++ b/ports/zephyr/README.md
@@ -4,7 +4,7 @@ MicroPython port to Zephyr RTOS
 This is a work-in-progress port of MicroPython to Zephyr RTOS
 (http://zephyrproject.org).
 
-This port requires Zephyr version 2.3.0, and may also work on higher
+This port requires Zephyr version 2.4.0, and may also work on higher
 versions.  All boards supported
 by Zephyr (with standard level of features support, like UART console)
 should work with MicroPython (but not all were tested).
@@ -38,13 +38,13 @@ setup is correct.
 If you already have Zephyr installed but are having issues building the
 MicroPython port then try installing the correct version of Zephyr via:
 
-    $ west init zephyrproject -m https://github.com/zephyrproject-rtos/zephyr --mr v2.3.0
+    $ west init zephyrproject -m https://github.com/zephyrproject-rtos/zephyr --mr v2.4.0
 
 Alternatively, you don't have to redo the Zephyr installation to just
 switch from master to a tagged release, you can instead do:
 
     $ cd zephyrproject/zephyr
-    $ git checkout v2.3.0
+    $ git checkout v2.4.0
     $ west update
 
 With Zephyr installed you may then need to configure your environment,

From ee7568ca8d4f1a5d09a123cf5f7a1e430b8f4c9d Mon Sep 17 00:00:00 2001
From: David Lechner <david@pybricks.com>
Date: Fri, 25 Sep 2020 10:47:59 -0500
Subject: [PATCH 0320/3533] docs/reference/packages.rst: Fix typo, remove
 duplicate "port".

Fixes #6485.
---
 docs/reference/packages.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/reference/packages.rst b/docs/reference/packages.rst
index 2854df23a0240..e9adfc176ea73 100644
--- a/docs/reference/packages.rst
+++ b/docs/reference/packages.rst
@@ -188,7 +188,7 @@ Few notes:
 1. Step 5 in the sequence above assumes that the distribution package
    is available from PyPI. If that is not the case, you would need
    to copy Python source files manually to ``modules/`` subdirectory
-   of the port port directory. (Note that upip does not support
+   of the port directory. (Note that upip does not support
    installing from e.g. version control repositories).
 2. The firmware for baremetal devices usually has size restrictions,
    so adding too many frozen modules may overflow it. Usually, you

From c711c0049e5f12cae048d2b0e77bc70e68804ea5 Mon Sep 17 00:00:00 2001
From: Mike Wadsten <Mike.Wadsten@digi.com>
Date: Tue, 22 Sep 2020 11:07:20 -0500
Subject: [PATCH 0321/3533] py/makeversionhdr.py: Match only git tags which
 look like versions.

Some downstream projects may use tags in their repositories for more than
just designating MicroPython releases.  In those cases, the
makeversionhdr.py script would end up using a different tag than intended.
So tell `git describe` to only match tags that look like a MicroPython
version tag, such as `v1.12` or `v2.0`.
---
 py/makeversionhdr.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/py/makeversionhdr.py b/py/makeversionhdr.py
index 567b3b8322f9f..970a86e6ca3ab 100644
--- a/py/makeversionhdr.py
+++ b/py/makeversionhdr.py
@@ -23,7 +23,7 @@ def get_version_info_from_git():
     # Note: git describe doesn't work if no tag is available
     try:
         git_tag = subprocess.check_output(
-            ["git", "describe", "--dirty", "--always"],
+            ["git", "describe", "--dirty", "--always", "--match", "v[1-9].*"],
             stderr=subprocess.STDOUT,
             universal_newlines=True,
         ).strip()

From c35deb2625efc877b3a0d03d5654e27232b2d101 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 16 Sep 2020 13:30:48 +1000
Subject: [PATCH 0322/3533] extmod/machine_i2c: Rename type to SoftI2C and add
 custom print method.

Also rename machine_i2c_type to mp_machine_soft_i2c_type.  These changes
make it clear that it's a soft-I2C implementation, and match SoftSPI.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/machine_i2c.c                   | 17 ++++++++++++-----
 extmod/machine_i2c.h                   |  3 ++-
 ports/esp32/modmachine.c               |  2 +-
 ports/esp8266/modmachine.c             |  2 +-
 ports/nrf/modules/machine/i2c.h        |  2 +-
 ports/nrf/modules/machine/modmachine.c |  2 +-
 ports/nrf/mphalport.h                  |  2 ++
 ports/stm32/modmachine.c               |  2 +-
 ports/zephyr/modmachine.c              |  2 +-
 9 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/extmod/machine_i2c.c b/extmod/machine_i2c.c
index c804cf570385d..8aad001f1e42f 100644
--- a/extmod/machine_i2c.c
+++ b/extmod/machine_i2c.c
@@ -302,6 +302,12 @@ STATIC int mp_machine_i2c_writeto(mp_obj_base_t *self, uint16_t addr, const uint
 /******************************************************************************/
 // MicroPython bindings for I2C
 
+STATIC void mp_machine_soft_i2c_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+    mp_machine_soft_i2c_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    mp_printf(print, "SoftI2C(scl=" MP_HAL_PIN_FMT ", sda=" MP_HAL_PIN_FMT ", freq=%u)",
+        mp_hal_pin_name(self->scl), mp_hal_pin_name(self->sda), 500000 / self->us_delay);
+}
+
 STATIC void machine_i2c_obj_init_helper(machine_i2c_obj_t *self, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_scl, ARG_sda, ARG_freq, ARG_timeout };
     static const mp_arg_t allowed_args[] = {
@@ -318,7 +324,7 @@ STATIC void machine_i2c_obj_init_helper(machine_i2c_obj_t *self, size_t n_args,
     mp_hal_i2c_init(self, args[ARG_freq].u_int);
 }
 
-STATIC mp_obj_t machine_i2c_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
+STATIC mp_obj_t mp_machine_soft_i2c_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
     // check the id argument, if given
     if (n_args > 0) {
         if (args[0] != MP_OBJ_NEW_SMALL_INT(-1)) {
@@ -336,7 +342,7 @@ STATIC mp_obj_t machine_i2c_make_new(const mp_obj_type_t *type, size_t n_args, s
 
     // create new soft I2C object
     machine_i2c_obj_t *self = m_new_obj(machine_i2c_obj_t);
-    self->base.type = &machine_i2c_type;
+    self->base.type = &mp_machine_soft_i2c_type;
     mp_map_t kw_args;
     mp_map_init_fixed_table(&kw_args, n_kw, args + n_args);
     machine_i2c_obj_init_helper(self, n_args, args, &kw_args);
@@ -700,10 +706,11 @@ STATIC const mp_machine_i2c_p_t mp_machine_soft_i2c_p = {
     .transfer = mp_machine_soft_i2c_transfer,
 };
 
-const mp_obj_type_t machine_i2c_type = {
+const mp_obj_type_t mp_machine_soft_i2c_type = {
     { &mp_type_type },
-    .name = MP_QSTR_I2C,
-    .make_new = machine_i2c_make_new,
+    .name = MP_QSTR_SoftI2C,
+    .print = mp_machine_soft_i2c_print,
+    .make_new = mp_machine_soft_i2c_make_new,
     .protocol = &mp_machine_soft_i2c_p,
     .locals_dict = (mp_obj_dict_t *)&mp_machine_soft_i2c_locals_dict,
 };
diff --git a/extmod/machine_i2c.h b/extmod/machine_i2c.h
index f951c1f214973..9723069d56c99 100644
--- a/extmod/machine_i2c.h
+++ b/extmod/machine_i2c.h
@@ -27,6 +27,7 @@
 #define MICROPY_INCLUDED_EXTMOD_MACHINE_I2C_H
 
 #include "py/obj.h"
+#include "py/mphal.h"
 
 #define MP_MACHINE_I2C_FLAG_READ (0x01) // if not set then it's a write
 #define MP_MACHINE_I2C_FLAG_STOP (0x02)
@@ -56,7 +57,7 @@ typedef struct _mp_machine_soft_i2c_obj_t {
     mp_hal_pin_obj_t sda;
 } mp_machine_soft_i2c_obj_t;
 
-extern const mp_obj_type_t machine_i2c_type;
+extern const mp_obj_type_t mp_machine_soft_i2c_type;
 extern const mp_obj_dict_t mp_machine_soft_i2c_locals_dict;
 
 int mp_machine_i2c_transfer_adaptor(mp_obj_base_t *self, uint16_t addr, size_t n, mp_machine_i2c_buf_t *bufs, unsigned int flags);
diff --git a/ports/esp32/modmachine.c b/ports/esp32/modmachine.c
index 82a02522f7b41..d56f6fcef12ec 100644
--- a/ports/esp32/modmachine.c
+++ b/ports/esp32/modmachine.c
@@ -255,7 +255,7 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_TouchPad), MP_ROM_PTR(&machine_touchpad_type) },
     { MP_ROM_QSTR(MP_QSTR_ADC), MP_ROM_PTR(&machine_adc_type) },
     { MP_ROM_QSTR(MP_QSTR_DAC), MP_ROM_PTR(&machine_dac_type) },
-    { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&machine_i2c_type) },
+    { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&mp_machine_soft_i2c_type) },
     { MP_ROM_QSTR(MP_QSTR_PWM), MP_ROM_PTR(&machine_pwm_type) },
     { MP_ROM_QSTR(MP_QSTR_RTC), MP_ROM_PTR(&machine_rtc_type) },
     { MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&mp_machine_soft_spi_type) },
diff --git a/ports/esp8266/modmachine.c b/ports/esp8266/modmachine.c
index cb28d5b144827..4917ed9b904fe 100644
--- a/ports/esp8266/modmachine.c
+++ b/ports/esp8266/modmachine.c
@@ -421,7 +421,7 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_ADC), MP_ROM_PTR(&machine_adc_type) },
     { MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&pyb_uart_type) },
     #if MICROPY_PY_MACHINE_I2C
-    { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&machine_i2c_type) },
+    { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&mp_machine_soft_i2c_type) },
     #endif
     #if MICROPY_PY_MACHINE_SPI
     { MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&machine_hspi_type) },
diff --git a/ports/nrf/modules/machine/i2c.h b/ports/nrf/modules/machine/i2c.h
index 92194ce75763f..3c4fde983a62a 100644
--- a/ports/nrf/modules/machine/i2c.h
+++ b/ports/nrf/modules/machine/i2c.h
@@ -27,7 +27,7 @@
 #ifndef I2C_H__
 #define I2C_H__
 
-extern const mp_obj_type_t machine_i2c_type;
+#include "extmod/machine_i2c.h"
 
 void i2c_init0(void);
 
diff --git a/ports/nrf/modules/machine/modmachine.c b/ports/nrf/modules/machine/modmachine.c
index 48730c849f6bf..786abac7c1ea9 100644
--- a/ports/nrf/modules/machine/modmachine.c
+++ b/ports/nrf/modules/machine/modmachine.c
@@ -208,7 +208,7 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_SPI),                MP_ROM_PTR(&machine_hard_spi_type) },
 #endif
 #if MICROPY_PY_MACHINE_I2C
-    { MP_ROM_QSTR(MP_QSTR_I2C),                MP_ROM_PTR(&machine_i2c_type) },
+    { MP_ROM_QSTR(MP_QSTR_I2C),                MP_ROM_PTR(&mp_machine_soft_i2c_type) },
 #endif
 #if MICROPY_PY_MACHINE_ADC
     { MP_ROM_QSTR(MP_QSTR_ADC),                MP_ROM_PTR(&machine_adc_type) },
diff --git a/ports/nrf/mphalport.h b/ports/nrf/mphalport.h
index 15b37b7ef22d2..5900559b5dd76 100644
--- a/ports/nrf/mphalport.h
+++ b/ports/nrf/mphalport.h
@@ -54,8 +54,10 @@ void mp_hal_delay_us(mp_uint_t us);
 
 const char *nrfx_error_code_lookup(uint32_t err_code);
 
+#define MP_HAL_PIN_FMT           "%q"
 #define mp_hal_pin_obj_t const pin_obj_t *
 #define mp_hal_get_pin_obj(o)    pin_find(o)
+#define mp_hal_pin_name(p)       ((p)->name)
 #define mp_hal_pin_high(p)       nrf_gpio_pin_set(p->pin)
 #define mp_hal_pin_low(p)        nrf_gpio_pin_clear(p->pin)
 #define mp_hal_pin_read(p)       (nrf_gpio_pin_dir_get(p->pin) == NRF_GPIO_PIN_DIR_OUTPUT) ? nrf_gpio_pin_out_read(p->pin) : nrf_gpio_pin_read(p->pin)
diff --git a/ports/stm32/modmachine.c b/ports/stm32/modmachine.c
index ac4d8712397e4..ff3b842c870f1 100644
--- a/ports/stm32/modmachine.c
+++ b/ports/stm32/modmachine.c
@@ -415,7 +415,7 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_RTC),                 MP_ROM_PTR(&pyb_rtc_type) },
     { MP_ROM_QSTR(MP_QSTR_ADC),                 MP_ROM_PTR(&machine_adc_type) },
     #if MICROPY_PY_MACHINE_I2C
-    { MP_ROM_QSTR(MP_QSTR_I2C),                 MP_ROM_PTR(&machine_i2c_type) },
+    { MP_ROM_QSTR(MP_QSTR_I2C),                 MP_ROM_PTR(&mp_machine_soft_i2c_type) },
     #endif
     { MP_ROM_QSTR(MP_QSTR_SPI),                 MP_ROM_PTR(&machine_hard_spi_type) },
     { MP_ROM_QSTR(MP_QSTR_UART),                MP_ROM_PTR(&pyb_uart_type) },
diff --git a/ports/zephyr/modmachine.c b/ports/zephyr/modmachine.c
index 72078cf9deabc..fc4d3b3ca8706 100644
--- a/ports/zephyr/modmachine.c
+++ b/ports/zephyr/modmachine.c
@@ -60,7 +60,7 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     #endif
     { MP_ROM_QSTR(MP_QSTR_reset_cause), MP_ROM_PTR(&machine_reset_cause_obj) },
 
-    { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&machine_i2c_type) },
+    { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&mp_machine_soft_i2c_type) },
     { MP_ROM_QSTR(MP_QSTR_Pin), MP_ROM_PTR(&machine_pin_type) },
     { MP_ROM_QSTR(MP_QSTR_Signal), MP_ROM_PTR(&machine_signal_type) },
 

From aaed33896b0fec67a0e2ec7daf3fe908253d8cf7 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 16 Sep 2020 13:37:31 +1000
Subject: [PATCH 0323/3533] extmod/machine_i2c: Remove "id" arg in SoftI2C
 constructor.

The SoftI2C constructor is now used soley to create SoftI2C instances, it
can no longer delegate to create a hardware-based I2C instance.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/machine_i2c.c        | 15 ---------------
 ports/esp32/mpconfigport.h  |  1 -
 ports/nrf/mpconfigport.h    |  1 -
 ports/stm32/mpconfigport.h  |  3 ---
 ports/zephyr/mpconfigport.h |  1 -
 5 files changed, 21 deletions(-)

diff --git a/extmod/machine_i2c.c b/extmod/machine_i2c.c
index 8aad001f1e42f..9203f16f6d785 100644
--- a/extmod/machine_i2c.c
+++ b/extmod/machine_i2c.c
@@ -325,21 +325,6 @@ STATIC void machine_i2c_obj_init_helper(machine_i2c_obj_t *self, size_t n_args,
 }
 
 STATIC mp_obj_t mp_machine_soft_i2c_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
-    // check the id argument, if given
-    if (n_args > 0) {
-        if (args[0] != MP_OBJ_NEW_SMALL_INT(-1)) {
-            #if defined(MICROPY_PY_MACHINE_I2C_MAKE_NEW)
-            // dispatch to port-specific constructor
-            extern mp_obj_t MICROPY_PY_MACHINE_I2C_MAKE_NEW(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args);
-            return MICROPY_PY_MACHINE_I2C_MAKE_NEW(type, n_args, n_kw, args);
-            #else
-            mp_raise_ValueError(MP_ERROR_TEXT("invalid I2C peripheral"));
-            #endif
-        }
-        --n_args;
-        ++args;
-    }
-
     // create new soft I2C object
     machine_i2c_obj_t *self = m_new_obj(machine_i2c_obj_t);
     self->base.type = &mp_machine_soft_i2c_type;
diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h
index 663fed3f683a4..00abab3afd8bd 100644
--- a/ports/esp32/mpconfigport.h
+++ b/ports/esp32/mpconfigport.h
@@ -145,7 +145,6 @@
 #define MICROPY_PY_MACHINE_PIN_MAKE_NEW     mp_pin_make_new
 #define MICROPY_PY_MACHINE_PULSE            (1)
 #define MICROPY_PY_MACHINE_I2C              (1)
-#define MICROPY_PY_MACHINE_I2C_MAKE_NEW     machine_hw_i2c_make_new
 #define MICROPY_PY_MACHINE_SPI              (1)
 #define MICROPY_PY_MACHINE_SPI_MSB          (0)
 #define MICROPY_PY_MACHINE_SPI_LSB          (1)
diff --git a/ports/nrf/mpconfigport.h b/ports/nrf/mpconfigport.h
index 76bb6d7bdf0df..a025feb2ec65a 100644
--- a/ports/nrf/mpconfigport.h
+++ b/ports/nrf/mpconfigport.h
@@ -135,7 +135,6 @@
 #define MICROPY_PY_UTIME_MP_HAL     (1)
 #define MICROPY_PY_MACHINE          (1)
 #define MICROPY_PY_MACHINE_PULSE    (0)
-#define MICROPY_PY_MACHINE_I2C_MAKE_NEW machine_hard_i2c_make_new
 #define MICROPY_PY_MACHINE_SPI      (0)
 #define MICROPY_PY_MACHINE_SPI_MIN_DELAY (0)
 #define MICROPY_PY_FRAMEBUF         (0)
diff --git a/ports/stm32/mpconfigport.h b/ports/stm32/mpconfigport.h
index 95b539603fb95..9ff4765ac25cc 100644
--- a/ports/stm32/mpconfigport.h
+++ b/ports/stm32/mpconfigport.h
@@ -183,9 +183,6 @@
 #define MICROPY_PY_MACHINE_PULSE    (1)
 #define MICROPY_PY_MACHINE_PIN_MAKE_NEW mp_pin_make_new
 #define MICROPY_PY_MACHINE_I2C      (1)
-#if MICROPY_HW_ENABLE_HW_I2C
-#define MICROPY_PY_MACHINE_I2C_MAKE_NEW machine_hard_i2c_make_new
-#endif
 #define MICROPY_PY_MACHINE_SPI      (1)
 #define MICROPY_PY_MACHINE_SPI_MSB  (SPI_FIRSTBIT_MSB)
 #define MICROPY_PY_MACHINE_SPI_LSB  (SPI_FIRSTBIT_LSB)
diff --git a/ports/zephyr/mpconfigport.h b/ports/zephyr/mpconfigport.h
index f94ee72707d47..6bfd9ff884f1b 100644
--- a/ports/zephyr/mpconfigport.h
+++ b/ports/zephyr/mpconfigport.h
@@ -61,7 +61,6 @@
 #define MICROPY_PY_MICROPYTHON_MEM_INFO (1)
 #define MICROPY_PY_MACHINE          (1)
 #define MICROPY_PY_MACHINE_I2C      (1)
-#define MICROPY_PY_MACHINE_I2C_MAKE_NEW machine_hard_i2c_make_new
 #define MICROPY_PY_MACHINE_PIN_MAKE_NEW mp_pin_make_new
 #define MICROPY_MODULE_WEAK_LINKS   (1)
 #define MICROPY_PY_STRUCT           (0)

From 9e0533b9e158a455be9284b70011d0515096a5f6 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 16 Sep 2020 14:07:39 +1000
Subject: [PATCH 0324/3533] extmod/machine_spi: Remove "id" arg in SoftSPI
 constructor.

The SoftSPI constructor is now used soley to create SoftSPI instances, it
can no longer delegate to create a hardware-based SPI instance.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/machine_spi.c         | 24 +-----------------------
 ports/esp32/mpconfigport.h   |  1 -
 ports/esp8266/machine_hspi.c |  2 +-
 ports/esp8266/mpconfigport.h |  1 -
 ports/stm32/machine_spi.c    |  4 ++--
 ports/stm32/mpconfigport.h   |  1 -
 6 files changed, 4 insertions(+), 29 deletions(-)

diff --git a/extmod/machine_spi.c b/extmod/machine_spi.c
index a7f96573a720e..c951a5137c5ce 100644
--- a/extmod/machine_spi.c
+++ b/extmod/machine_spi.c
@@ -41,28 +41,6 @@
 /******************************************************************************/
 // MicroPython bindings for generic machine.SPI
 
-STATIC mp_obj_t mp_machine_soft_spi_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args);
-
-mp_obj_t mp_machine_spi_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
-    // check the id argument, if given
-    if (n_args > 0) {
-        if (args[0] != MP_OBJ_NEW_SMALL_INT(-1)) {
-            #if defined(MICROPY_PY_MACHINE_SPI_MAKE_NEW)
-            // dispatch to port-specific constructor
-            extern mp_obj_t MICROPY_PY_MACHINE_SPI_MAKE_NEW(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args);
-            return MICROPY_PY_MACHINE_SPI_MAKE_NEW(type, n_args, n_kw, args);
-            #else
-            mp_raise_ValueError(MP_ERROR_TEXT("invalid SPI peripheral"));
-            #endif
-        }
-        --n_args;
-        ++args;
-    }
-
-    // software SPI
-    return mp_machine_soft_spi_make_new(type, n_args, n_kw, args);
-}
-
 STATIC mp_obj_t machine_spi_init(size_t n_args, const mp_obj_t *args, mp_map_t *kw_args) {
     mp_obj_base_t *s = (mp_obj_base_t *)MP_OBJ_TO_PTR(args[0]);
     mp_machine_spi_p_t *spi_p = (mp_machine_spi_p_t *)s->type->protocol;
@@ -275,7 +253,7 @@ const mp_obj_type_t mp_machine_soft_spi_type = {
     { &mp_type_type },
     .name = MP_QSTR_SoftSPI,
     .print = mp_machine_soft_spi_print,
-    .make_new = mp_machine_spi_make_new, // delegate to master constructor
+    .make_new = mp_machine_soft_spi_make_new,
     .protocol = &mp_machine_soft_spi_p,
     .locals_dict = (mp_obj_dict_t *)&mp_machine_spi_locals_dict,
 };
diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h
index 00abab3afd8bd..5bf0676b238e3 100644
--- a/ports/esp32/mpconfigport.h
+++ b/ports/esp32/mpconfigport.h
@@ -148,7 +148,6 @@
 #define MICROPY_PY_MACHINE_SPI              (1)
 #define MICROPY_PY_MACHINE_SPI_MSB          (0)
 #define MICROPY_PY_MACHINE_SPI_LSB          (1)
-#define MICROPY_PY_MACHINE_SPI_MAKE_NEW     machine_hw_spi_make_new
 #define MICROPY_HW_ENABLE_SDCARD            (1)
 #define MICROPY_HW_SOFTSPI_MIN_DELAY        (0)
 #define MICROPY_HW_SOFTSPI_MAX_BAUDRATE     (ets_get_cpu_frequency() * 1000000 / 200) // roughly
diff --git a/ports/esp8266/machine_hspi.c b/ports/esp8266/machine_hspi.c
index 7319194d763d3..55bbcf9f58b46 100644
--- a/ports/esp8266/machine_hspi.c
+++ b/ports/esp8266/machine_hspi.c
@@ -178,7 +178,7 @@ const mp_obj_type_t machine_hspi_type = {
     { &mp_type_type },
     .name = MP_QSTR_HSPI,
     .print = machine_hspi_print,
-    .make_new = mp_machine_spi_make_new, // delegate to master constructor
+    .make_new = machine_hspi_make_new,
     .protocol = &machine_hspi_p,
     .locals_dict = (mp_obj_dict_t *)&mp_machine_spi_locals_dict,
 };
diff --git a/ports/esp8266/mpconfigport.h b/ports/esp8266/mpconfigport.h
index 5344a98d6a548..974310f84da6e 100644
--- a/ports/esp8266/mpconfigport.h
+++ b/ports/esp8266/mpconfigport.h
@@ -80,7 +80,6 @@
 #define MICROPY_PY_MACHINE_PULSE    (1)
 #define MICROPY_PY_MACHINE_I2C      (1)
 #define MICROPY_PY_MACHINE_SPI      (1)
-#define MICROPY_PY_MACHINE_SPI_MAKE_NEW machine_hspi_make_new
 #define MICROPY_PY_UWEBSOCKET       (1)
 #define MICROPY_PY_WEBREPL          (1)
 #define MICROPY_PY_WEBREPL_DELAY    (20)
diff --git a/ports/stm32/machine_spi.c b/ports/stm32/machine_spi.c
index cf6e96ab67bf6..edbd500b3c073 100644
--- a/ports/stm32/machine_spi.c
+++ b/ports/stm32/machine_spi.c
@@ -48,7 +48,7 @@ STATIC void machine_hard_spi_print(const mp_print_t *print, mp_obj_t self_in, mp
 mp_obj_t machine_hard_spi_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
     enum { ARG_id, ARG_baudrate, ARG_polarity, ARG_phase, ARG_bits, ARG_firstbit, ARG_sck, ARG_mosi, ARG_miso };
     static const mp_arg_t allowed_args[] = {
-        { MP_QSTR_id,       MP_ARG_OBJ, {.u_obj = MP_OBJ_NEW_SMALL_INT(-1)} },
+        { MP_QSTR_id,       MP_ARG_REQUIRED | MP_ARG_OBJ },
         { MP_QSTR_baudrate, MP_ARG_INT, {.u_int = 500000} },
         { MP_QSTR_polarity, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 0} },
         { MP_QSTR_phase,    MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 0} },
@@ -137,7 +137,7 @@ const mp_obj_type_t machine_hard_spi_type = {
     { &mp_type_type },
     .name = MP_QSTR_SPI,
     .print = machine_hard_spi_print,
-    .make_new = mp_machine_spi_make_new, // delegate to master constructor
+    .make_new = machine_hard_spi_make_new,
     .protocol = &machine_hard_spi_p,
     .locals_dict = (mp_obj_dict_t *)&mp_machine_spi_locals_dict,
 };
diff --git a/ports/stm32/mpconfigport.h b/ports/stm32/mpconfigport.h
index 9ff4765ac25cc..7ea41bb6f4655 100644
--- a/ports/stm32/mpconfigport.h
+++ b/ports/stm32/mpconfigport.h
@@ -186,7 +186,6 @@
 #define MICROPY_PY_MACHINE_SPI      (1)
 #define MICROPY_PY_MACHINE_SPI_MSB  (SPI_FIRSTBIT_MSB)
 #define MICROPY_PY_MACHINE_SPI_LSB  (SPI_FIRSTBIT_LSB)
-#define MICROPY_PY_MACHINE_SPI_MAKE_NEW machine_hard_spi_make_new
 #define MICROPY_HW_SOFTSPI_MIN_DELAY (0)
 #define MICROPY_HW_SOFTSPI_MAX_BAUDRATE (HAL_RCC_GetSysClockFreq() / 48)
 #define MICROPY_PY_UWEBSOCKET       (MICROPY_PY_LWIP)

From 39d50d129ce428858332523548f0594503d0f45b Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 16 Sep 2020 14:09:49 +1000
Subject: [PATCH 0325/3533] ports: Add SoftI2C and SoftSPI to machine module
 where appropriate.

Previous commits removed the ability for one I2C/SPI constructor to
construct both software- or hardware-based peripheral instances.  Such
construction is now split to explicit soft and non-soft types.

This commit makes both types available in all ports that previously could
create both software and hardware peripherals: machine.I2C and machine.SPI
construct hardware instances, while machine.SoftI2C and machine.SoftSPI
create software instances.

This is a breaking change for use of software-based I2C and SPI.  Code that
constructed I2C/SPI peripherals in the following way will need to be
changed:

    machine.I2C(-1, ...)            ->  machine.SoftI2C(...)
    machine.I2C(scl=scl, sda=sda)   ->  machine.SoftI2C(scl=scl, sda=sda)

    machine.SPI(-1, ...)            ->  machine.SoftSPI(...)
    machine.SPI(sck=sck, mosi=mosi, miso=miso)
                        ->  machine.SoftSPI(sck=sck, mosi=mosi, miso=miso)

Code which uses machine.I2C and machine.SPI classes to access hardware
peripherals does not need to change.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/machine_i2c.c              | 4 ++--
 ports/esp32/modmachine.c               | 6 ++++--
 ports/esp32/modmachine.h               | 1 +
 ports/esp8266/modmachine.c             | 3 +++
 ports/nrf/modules/machine/i2c.c        | 4 +---
 ports/nrf/modules/machine/i2c.h        | 2 ++
 ports/nrf/modules/machine/modmachine.c | 3 ++-
 ports/stm32/machine_i2c.c              | 5 ++---
 ports/stm32/modmachine.c               | 7 +++++++
 ports/stm32/modmachine.h               | 1 +
 ports/stm32/spi.h                      | 1 -
 ports/zephyr/machine_i2c.c             | 5 ++---
 ports/zephyr/modmachine.c              | 2 +-
 ports/zephyr/modmachine.h              | 1 +
 ports/zephyr/mphalport.h               | 4 ++++
 15 files changed, 33 insertions(+), 16 deletions(-)

diff --git a/ports/esp32/machine_i2c.c b/ports/esp32/machine_i2c.c
index 8362ed5e7be5a..075d0ded6c475 100644
--- a/ports/esp32/machine_i2c.c
+++ b/ports/esp32/machine_i2c.c
@@ -28,6 +28,7 @@
 #include "py/mphal.h"
 #include "py/mperrno.h"
 #include "extmod/machine_i2c.h"
+#include "modmachine.h"
 
 #include "driver/i2c.h"
 
@@ -45,7 +46,6 @@ typedef struct _machine_hw_i2c_obj_t {
     gpio_num_t sda : 8;
 } machine_hw_i2c_obj_t;
 
-STATIC const mp_obj_type_t machine_hw_i2c_type;
 STATIC machine_hw_i2c_obj_t machine_hw_i2c_obj[I2C_NUM_MAX];
 
 STATIC void machine_hw_i2c_init(machine_hw_i2c_obj_t *self, uint32_t freq, uint32_t timeout_us, bool first_init) {
@@ -169,7 +169,7 @@ STATIC const mp_machine_i2c_p_t machine_hw_i2c_p = {
     .transfer = machine_hw_i2c_transfer,
 };
 
-STATIC const mp_obj_type_t machine_hw_i2c_type = {
+const mp_obj_type_t machine_hw_i2c_type = {
     { &mp_type_type },
     .name = MP_QSTR_I2C,
     .print = machine_hw_i2c_print,
diff --git a/ports/esp32/modmachine.c b/ports/esp32/modmachine.c
index d56f6fcef12ec..303d25ee8b2d1 100644
--- a/ports/esp32/modmachine.c
+++ b/ports/esp32/modmachine.c
@@ -255,10 +255,12 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_TouchPad), MP_ROM_PTR(&machine_touchpad_type) },
     { MP_ROM_QSTR(MP_QSTR_ADC), MP_ROM_PTR(&machine_adc_type) },
     { MP_ROM_QSTR(MP_QSTR_DAC), MP_ROM_PTR(&machine_dac_type) },
-    { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&mp_machine_soft_i2c_type) },
+    { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&machine_hw_i2c_type) },
+    { MP_ROM_QSTR(MP_QSTR_SoftI2C), MP_ROM_PTR(&mp_machine_soft_i2c_type) },
     { MP_ROM_QSTR(MP_QSTR_PWM), MP_ROM_PTR(&machine_pwm_type) },
     { MP_ROM_QSTR(MP_QSTR_RTC), MP_ROM_PTR(&machine_rtc_type) },
-    { MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&mp_machine_soft_spi_type) },
+    { MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&machine_hw_spi_type) },
+    { MP_ROM_QSTR(MP_QSTR_SoftSPI), MP_ROM_PTR(&mp_machine_soft_spi_type) },
     { MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&machine_uart_type) },
 
     // Reset reasons
diff --git a/ports/esp32/modmachine.h b/ports/esp32/modmachine.h
index fbb43250ff42e..98b36e32b0231 100644
--- a/ports/esp32/modmachine.h
+++ b/ports/esp32/modmachine.h
@@ -16,6 +16,7 @@ extern const mp_obj_type_t machine_touchpad_type;
 extern const mp_obj_type_t machine_adc_type;
 extern const mp_obj_type_t machine_dac_type;
 extern const mp_obj_type_t machine_pwm_type;
+extern const mp_obj_type_t machine_hw_i2c_type;
 extern const mp_obj_type_t machine_hw_spi_type;
 extern const mp_obj_type_t machine_uart_type;
 extern const mp_obj_type_t machine_rtc_type;
diff --git a/ports/esp8266/modmachine.c b/ports/esp8266/modmachine.c
index 4917ed9b904fe..86c1d728d5369 100644
--- a/ports/esp8266/modmachine.c
+++ b/ports/esp8266/modmachine.c
@@ -39,6 +39,7 @@
 #include "extmod/machine_signal.h"
 #include "extmod/machine_pulse.h"
 #include "extmod/machine_i2c.h"
+#include "extmod/machine_spi.h"
 #include "modmachine.h"
 
 #include "xtirq.h"
@@ -422,9 +423,11 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&pyb_uart_type) },
     #if MICROPY_PY_MACHINE_I2C
     { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&mp_machine_soft_i2c_type) },
+    { MP_ROM_QSTR(MP_QSTR_SoftI2C), MP_ROM_PTR(&mp_machine_soft_i2c_type) },
     #endif
     #if MICROPY_PY_MACHINE_SPI
     { MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&machine_hspi_type) },
+    { MP_ROM_QSTR(MP_QSTR_SoftSPI), MP_ROM_PTR(&mp_machine_soft_spi_type) },
     #endif
 
     // wake abilities
diff --git a/ports/nrf/modules/machine/i2c.c b/ports/nrf/modules/machine/i2c.c
index afa906c3598d7..704d8615a810d 100644
--- a/ports/nrf/modules/machine/i2c.c
+++ b/ports/nrf/modules/machine/i2c.c
@@ -63,8 +63,6 @@
 
 #endif
 
-STATIC const mp_obj_type_t machine_hard_i2c_type;
-
 typedef struct _machine_hard_i2c_obj_t {
     mp_obj_base_t base;
     nrfx_twi_t    p_twi;  // Driver instance
@@ -161,7 +159,7 @@ STATIC const mp_machine_i2c_p_t machine_hard_i2c_p = {
     .transfer_single = machine_hard_i2c_transfer_single,
 };
 
-STATIC const mp_obj_type_t machine_hard_i2c_type = {
+const mp_obj_type_t machine_hard_i2c_type = {
     { &mp_type_type },
     .name = MP_QSTR_I2C,
     .print = machine_hard_i2c_print,
diff --git a/ports/nrf/modules/machine/i2c.h b/ports/nrf/modules/machine/i2c.h
index 3c4fde983a62a..1dfb1f077a446 100644
--- a/ports/nrf/modules/machine/i2c.h
+++ b/ports/nrf/modules/machine/i2c.h
@@ -29,6 +29,8 @@
 
 #include "extmod/machine_i2c.h"
 
+extern const mp_obj_type_t machine_hard_i2c_type;
+
 void i2c_init0(void);
 
 #endif // I2C_H__
diff --git a/ports/nrf/modules/machine/modmachine.c b/ports/nrf/modules/machine/modmachine.c
index 786abac7c1ea9..3330349cd5963 100644
--- a/ports/nrf/modules/machine/modmachine.c
+++ b/ports/nrf/modules/machine/modmachine.c
@@ -208,7 +208,8 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_SPI),                MP_ROM_PTR(&machine_hard_spi_type) },
 #endif
 #if MICROPY_PY_MACHINE_I2C
-    { MP_ROM_QSTR(MP_QSTR_I2C),                MP_ROM_PTR(&mp_machine_soft_i2c_type) },
+    { MP_ROM_QSTR(MP_QSTR_I2C),                MP_ROM_PTR(&machine_hard_i2c_type) },
+    { MP_ROM_QSTR(MP_QSTR_SoftI2C),            MP_ROM_PTR(&mp_machine_soft_i2c_type) },
 #endif
 #if MICROPY_PY_MACHINE_ADC
     { MP_ROM_QSTR(MP_QSTR_ADC),                MP_ROM_PTR(&machine_adc_type) },
diff --git a/ports/stm32/machine_i2c.c b/ports/stm32/machine_i2c.c
index 14dd88b78f4dc..31defcb17a117 100644
--- a/ports/stm32/machine_i2c.c
+++ b/ports/stm32/machine_i2c.c
@@ -32,11 +32,10 @@
 #include "py/mperrno.h"
 #include "extmod/machine_i2c.h"
 #include "i2c.h"
+#include "modmachine.h"
 
 #if MICROPY_HW_ENABLE_HW_I2C
 
-STATIC const mp_obj_type_t machine_hard_i2c_type;
-
 #define I2C_POLL_DEFAULT_TIMEOUT_US (50000) // 50ms
 
 #if defined(STM32F0) || defined(STM32F4) || defined(STM32F7)
@@ -266,7 +265,7 @@ STATIC const mp_machine_i2c_p_t machine_hard_i2c_p = {
     .transfer = machine_hard_i2c_transfer,
 };
 
-STATIC const mp_obj_type_t machine_hard_i2c_type = {
+const mp_obj_type_t machine_hard_i2c_type = {
     { &mp_type_type },
     .name = MP_QSTR_I2C,
     .print = machine_hard_i2c_print,
diff --git a/ports/stm32/modmachine.c b/ports/stm32/modmachine.c
index ff3b842c870f1..9fa00a915186f 100644
--- a/ports/stm32/modmachine.c
+++ b/ports/stm32/modmachine.c
@@ -37,6 +37,7 @@
 #include "extmod/machine_signal.h"
 #include "extmod/machine_pulse.h"
 #include "extmod/machine_i2c.h"
+#include "extmod/machine_spi.h"
 #include "lib/utils/pyexec.h"
 #include "lib/oofatfs/ff.h"
 #include "extmod/vfs.h"
@@ -415,9 +416,15 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_RTC),                 MP_ROM_PTR(&pyb_rtc_type) },
     { MP_ROM_QSTR(MP_QSTR_ADC),                 MP_ROM_PTR(&machine_adc_type) },
     #if MICROPY_PY_MACHINE_I2C
+    #if MICROPY_HW_ENABLE_HW_I2C
+    { MP_ROM_QSTR(MP_QSTR_I2C),                 MP_ROM_PTR(&machine_hard_i2c_type) },
+    #else
     { MP_ROM_QSTR(MP_QSTR_I2C),                 MP_ROM_PTR(&mp_machine_soft_i2c_type) },
     #endif
+    { MP_ROM_QSTR(MP_QSTR_SoftI2C),             MP_ROM_PTR(&mp_machine_soft_i2c_type) },
+    #endif
     { MP_ROM_QSTR(MP_QSTR_SPI),                 MP_ROM_PTR(&machine_hard_spi_type) },
+    { MP_ROM_QSTR(MP_QSTR_SoftSPI),             MP_ROM_PTR(&mp_machine_soft_spi_type) },
     { MP_ROM_QSTR(MP_QSTR_UART),                MP_ROM_PTR(&pyb_uart_type) },
     { MP_ROM_QSTR(MP_QSTR_WDT),                 MP_ROM_PTR(&pyb_wdt_type) },
     { MP_ROM_QSTR(MP_QSTR_Timer),               MP_ROM_PTR(&machine_timer_type) },
diff --git a/ports/stm32/modmachine.h b/ports/stm32/modmachine.h
index e4ccf638855e8..e846208540f72 100644
--- a/ports/stm32/modmachine.h
+++ b/ports/stm32/modmachine.h
@@ -30,6 +30,7 @@
 
 extern const mp_obj_type_t machine_adc_type;
 extern const mp_obj_type_t machine_timer_type;
+extern const mp_obj_type_t machine_hard_i2c_type;
 
 void machine_init(void);
 void machine_deinit(void);
diff --git a/ports/stm32/spi.h b/ports/stm32/spi.h
index 885fb0bd6fc8c..17f1bf6c4ab90 100644
--- a/ports/stm32/spi.h
+++ b/ports/stm32/spi.h
@@ -65,7 +65,6 @@ extern const spi_t spi_obj[6];
 
 extern const mp_spi_proto_t spi_proto;
 extern const mp_obj_type_t pyb_spi_type;
-extern const mp_obj_type_t machine_soft_spi_type;
 extern const mp_obj_type_t machine_hard_spi_type;
 
 // A transfer of "len" bytes should take len*8*1000/baudrate milliseconds.
diff --git a/ports/zephyr/machine_i2c.c b/ports/zephyr/machine_i2c.c
index 0efcd331fc4d1..2d1c7d5c54e8b 100644
--- a/ports/zephyr/machine_i2c.c
+++ b/ports/zephyr/machine_i2c.c
@@ -37,8 +37,7 @@
 #include "py/mphal.h"
 #include "py/mperrno.h"
 #include "extmod/machine_i2c.h"
-
-STATIC const mp_obj_type_t machine_hard_i2c_type;
+#include "modmachine.h"
 
 typedef struct _machine_hard_i2c_obj_t {
     mp_obj_base_t base;
@@ -127,7 +126,7 @@ STATIC const mp_machine_i2c_p_t machine_hard_i2c_p = {
     .transfer_single = machine_hard_i2c_transfer_single,
 };
 
-STATIC const mp_obj_type_t machine_hard_i2c_type = {
+const mp_obj_type_t machine_hard_i2c_type = {
     { &mp_type_type },
     .name = MP_QSTR_I2C,
     .print = machine_hard_i2c_print,
diff --git a/ports/zephyr/modmachine.c b/ports/zephyr/modmachine.c
index fc4d3b3ca8706..29e6c889c4cef 100644
--- a/ports/zephyr/modmachine.c
+++ b/ports/zephyr/modmachine.c
@@ -60,7 +60,7 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     #endif
     { MP_ROM_QSTR(MP_QSTR_reset_cause), MP_ROM_PTR(&machine_reset_cause_obj) },
 
-    { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&mp_machine_soft_i2c_type) },
+    { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&machine_hard_i2c_type) },
     { MP_ROM_QSTR(MP_QSTR_Pin), MP_ROM_PTR(&machine_pin_type) },
     { MP_ROM_QSTR(MP_QSTR_Signal), MP_ROM_PTR(&machine_signal_type) },
 
diff --git a/ports/zephyr/modmachine.h b/ports/zephyr/modmachine.h
index 5d7b2e1ed847a..b67da55338cd7 100644
--- a/ports/zephyr/modmachine.h
+++ b/ports/zephyr/modmachine.h
@@ -4,6 +4,7 @@
 #include "py/obj.h"
 
 extern const mp_obj_type_t machine_pin_type;
+extern const mp_obj_type_t machine_hard_i2c_type;
 
 MP_DECLARE_CONST_FUN_OBJ_0(machine_info_obj);
 
diff --git a/ports/zephyr/mphalport.h b/ports/zephyr/mphalport.h
index 9ef213ddb0809..b3154b649bbda 100644
--- a/ports/zephyr/mphalport.h
+++ b/ports/zephyr/mphalport.h
@@ -30,6 +30,10 @@ static inline uint64_t mp_hal_time_ns(void) {
 }
 
 #define mp_hal_delay_us_fast(us)   (mp_hal_delay_us(us))
+
+// C-level pin API is not currently implemented
+#define MP_HAL_PIN_FMT             "%d"
+#define mp_hal_pin_name(p)         (0)
 #define mp_hal_pin_od_low(p)       (mp_raise_NotImplementedError("mp_hal_pin_od_low"))
 #define mp_hal_pin_od_high(p)      (mp_raise_NotImplementedError("mp_hal_pin_od_high"))
 #define mp_hal_pin_open_drain(p)   (mp_raise_NotImplementedError("mp_hal_pin_open_drain"))

From 71f3ade770fa7f2637d94f5ba5840b64a16a95db Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 25 Sep 2020 14:47:34 +1000
Subject: [PATCH 0326/3533] ports: Support legacy soft I2C/SPI construction via
 id=-1 arg.

With a warning that this way of constructing software I2C/SPI is
deprecated.  The check and warning will be removed in a future release.

This should help existing code to migrate to the new SoftI2C/SoftSPI types.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/machine_i2c.h            | 13 +++++++++++++
 extmod/machine_spi.h            | 13 +++++++++++++
 ports/esp32/machine_hw_spi.c    |  2 ++
 ports/esp32/machine_i2c.c       |  2 ++
 ports/esp8266/machine_hspi.c    |  2 ++
 ports/nrf/modules/machine/i2c.c |  2 ++
 ports/stm32/machine_i2c.c       |  2 ++
 ports/stm32/machine_spi.c       |  2 ++
 ports/zephyr/machine_i2c.c      |  2 ++
 9 files changed, 40 insertions(+)

diff --git a/extmod/machine_i2c.h b/extmod/machine_i2c.h
index 9723069d56c99..e3a87e282a0fe 100644
--- a/extmod/machine_i2c.h
+++ b/extmod/machine_i2c.h
@@ -29,6 +29,19 @@
 #include "py/obj.h"
 #include "py/mphal.h"
 
+// Temporary support for legacy construction of SoftI2C via I2C type.
+#define MP_MACHINE_I2C_CHECK_FOR_LEGACY_SOFTI2C_CONSTRUCTION(n_args, n_kw, all_args) \
+    do { \
+        if (n_args == 0 || all_args[0] == MP_OBJ_NEW_SMALL_INT(-1)) { \
+            mp_print_str(MICROPY_ERROR_PRINTER, "Warning: I2C(-1, ...) is deprecated, use SoftI2C(...) instead\n"); \
+            if (n_args != 0) { \
+                --n_args; \
+                ++all_args; \
+            } \
+            return mp_machine_soft_i2c_type.make_new(&mp_machine_soft_i2c_type, n_args, n_kw, all_args); \
+        } \
+    } while (0)
+
 #define MP_MACHINE_I2C_FLAG_READ (0x01) // if not set then it's a write
 #define MP_MACHINE_I2C_FLAG_STOP (0x02)
 
diff --git a/extmod/machine_spi.h b/extmod/machine_spi.h
index db21e1cd31919..ca92c719a8b5a 100644
--- a/extmod/machine_spi.h
+++ b/extmod/machine_spi.h
@@ -30,6 +30,19 @@
 #include "py/mphal.h"
 #include "drivers/bus/spi.h"
 
+// Temporary support for legacy construction of SoftSPI via SPI type.
+#define MP_MACHINE_SPI_CHECK_FOR_LEGACY_SOFTSPI_CONSTRUCTION(n_args, n_kw, all_args) \
+    do { \
+        if (n_args == 0 || all_args[0] == MP_OBJ_NEW_SMALL_INT(-1)) { \
+            mp_print_str(MICROPY_ERROR_PRINTER, "Warning: SPI(-1, ...) is deprecated, use SoftSPI(...) instead\n"); \
+            if (n_args != 0) { \
+                --n_args; \
+                ++all_args; \
+            } \
+            return mp_machine_soft_spi_type.make_new(&mp_machine_soft_spi_type, n_args, n_kw, all_args); \
+        } \
+    } while (0)
+
 // SPI protocol
 typedef struct _mp_machine_spi_p_t {
     void (*init)(mp_obj_base_t *obj, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args);
diff --git a/ports/esp32/machine_hw_spi.c b/ports/esp32/machine_hw_spi.c
index 3962e26b78610..3790b4e0cf142 100644
--- a/ports/esp32/machine_hw_spi.c
+++ b/ports/esp32/machine_hw_spi.c
@@ -351,6 +351,8 @@ STATIC void machine_hw_spi_init(mp_obj_base_t *self_in, size_t n_args, const mp_
 }
 
 mp_obj_t machine_hw_spi_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
+    MP_MACHINE_SPI_CHECK_FOR_LEGACY_SOFTSPI_CONSTRUCTION(n_args, n_kw, all_args);
+
     enum { ARG_id, ARG_baudrate, ARG_polarity, ARG_phase, ARG_bits, ARG_firstbit, ARG_sck, ARG_mosi, ARG_miso };
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_id,       MP_ARG_REQUIRED | MP_ARG_INT, {.u_int = -1} },
diff --git a/ports/esp32/machine_i2c.c b/ports/esp32/machine_i2c.c
index 075d0ded6c475..a1d0ad0f4d93c 100644
--- a/ports/esp32/machine_i2c.c
+++ b/ports/esp32/machine_i2c.c
@@ -115,6 +115,8 @@ STATIC void machine_hw_i2c_print(const mp_print_t *print, mp_obj_t self_in, mp_p
 }
 
 mp_obj_t machine_hw_i2c_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
+    MP_MACHINE_I2C_CHECK_FOR_LEGACY_SOFTI2C_CONSTRUCTION(n_args, n_kw, all_args);
+
     // Parse args
     enum { ARG_id, ARG_scl, ARG_sda, ARG_freq, ARG_timeout };
     static const mp_arg_t allowed_args[] = {
diff --git a/ports/esp8266/machine_hspi.c b/ports/esp8266/machine_hspi.c
index 55bbcf9f58b46..ff3ba17255358 100644
--- a/ports/esp8266/machine_hspi.c
+++ b/ports/esp8266/machine_hspi.c
@@ -151,6 +151,8 @@ STATIC void machine_hspi_init(mp_obj_base_t *self_in, size_t n_args, const mp_ob
 }
 
 mp_obj_t machine_hspi_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
+    MP_MACHINE_SPI_CHECK_FOR_LEGACY_SOFTSPI_CONSTRUCTION(n_args, n_kw, args);
+
     // args[0] holds the id of the peripheral
     if (args[0] != MP_OBJ_NEW_SMALL_INT(1)) {
         // FlashROM is on SPI0, so far we don't support its usage
diff --git a/ports/nrf/modules/machine/i2c.c b/ports/nrf/modules/machine/i2c.c
index 704d8615a810d..ab4d516621bc7 100644
--- a/ports/nrf/modules/machine/i2c.c
+++ b/ports/nrf/modules/machine/i2c.c
@@ -94,6 +94,8 @@ STATIC void machine_hard_i2c_print(const mp_print_t *print, mp_obj_t self_in, mp
 /* MicroPython bindings for machine API                                       */
 
 mp_obj_t machine_hard_i2c_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
+    MP_MACHINE_I2C_CHECK_FOR_LEGACY_SOFTI2C_CONSTRUCTION(n_args, n_kw, all_args);
+
     enum { ARG_id, ARG_scl, ARG_sda };
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_id,       MP_ARG_REQUIRED | MP_ARG_OBJ },
diff --git a/ports/stm32/machine_i2c.c b/ports/stm32/machine_i2c.c
index 31defcb17a117..e0c408c6d07c2 100644
--- a/ports/stm32/machine_i2c.c
+++ b/ports/stm32/machine_i2c.c
@@ -193,6 +193,8 @@ STATIC void machine_hard_i2c_init(machine_hard_i2c_obj_t *self, uint32_t freq, u
 #endif
 
 mp_obj_t machine_hard_i2c_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
+    MP_MACHINE_I2C_CHECK_FOR_LEGACY_SOFTI2C_CONSTRUCTION(n_args, n_kw, all_args);
+
     // parse args
     enum { ARG_id, ARG_scl, ARG_sda, ARG_freq, ARG_timeout, ARG_timingr };
     static const mp_arg_t allowed_args[] = {
diff --git a/ports/stm32/machine_spi.c b/ports/stm32/machine_spi.c
index edbd500b3c073..37c026cefc33a 100644
--- a/ports/stm32/machine_spi.c
+++ b/ports/stm32/machine_spi.c
@@ -46,6 +46,8 @@ STATIC void machine_hard_spi_print(const mp_print_t *print, mp_obj_t self_in, mp
 }
 
 mp_obj_t machine_hard_spi_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
+    MP_MACHINE_SPI_CHECK_FOR_LEGACY_SOFTSPI_CONSTRUCTION(n_args, n_kw, all_args);
+
     enum { ARG_id, ARG_baudrate, ARG_polarity, ARG_phase, ARG_bits, ARG_firstbit, ARG_sck, ARG_mosi, ARG_miso };
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_id,       MP_ARG_REQUIRED | MP_ARG_OBJ },
diff --git a/ports/zephyr/machine_i2c.c b/ports/zephyr/machine_i2c.c
index 2d1c7d5c54e8b..ec4b8620a5014 100644
--- a/ports/zephyr/machine_i2c.c
+++ b/ports/zephyr/machine_i2c.c
@@ -51,6 +51,8 @@ STATIC void machine_hard_i2c_print(const mp_print_t *print, mp_obj_t self_in, mp
 }
 
 mp_obj_t machine_hard_i2c_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
+    MP_MACHINE_I2C_CHECK_FOR_LEGACY_SOFTI2C_CONSTRUCTION(n_args, n_kw, all_args);
+
     enum { ARG_id, ARG_scl, ARG_sda, ARG_freq, ARG_timeout };
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_id, MP_ARG_REQUIRED | MP_ARG_OBJ },

From 98182a97c5a9229938406beb722966eacceeb823 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 29 Sep 2020 16:50:23 +1000
Subject: [PATCH 0327/3533] docs: Update I2C and SPI docs to add reference to
 SoftI2C and SoftSPI.

Signed-off-by: Damien George <damien@micropython.org>
---
 docs/esp32/quickref.rst      | 62 ++++++++++++++++++++++--------------
 docs/esp8266/quickref.rst    |  9 +++---
 docs/library/machine.I2C.rst | 38 ++++++++++++++++------
 docs/library/machine.SPI.rst | 20 ++++++++++--
 4 files changed, 89 insertions(+), 40 deletions(-)

diff --git a/docs/esp32/quickref.rst b/docs/esp32/quickref.rst
index d5c222f3a1eef..79e61a10b6dfd 100644
--- a/docs/esp32/quickref.rst
+++ b/docs/esp32/quickref.rst
@@ -249,16 +249,15 @@ ESP32 specific ADC class method reference:
 Software SPI bus
 ----------------
 
-There are two SPI drivers. One is implemented in software (bit-banging)
-and works on all pins, and is accessed via the :ref:`machine.SPI <machine.SPI>`
-class::
+Software SPI (using bit-banging) works on all pins, and is accessed via the
+:ref:`machine.SoftSPI <machine.SoftSPI>` class::
 
-    from machine import Pin, SPI
+    from machine import Pin, SoftSPI
 
-    # construct an SPI bus on the given pins
+    # construct a SoftSPI bus on the given pins
     # polarity is the idle state of SCK
     # phase=0 means sample on the first edge of SCK, phase=1 means the second
-    spi = SPI(baudrate=100000, polarity=1, phase=0, sck=Pin(0), mosi=Pin(2), miso=Pin(4))
+    spi = SoftSPI(baudrate=100000, polarity=1, phase=0, sck=Pin(0), mosi=Pin(2), miso=Pin(4))
 
     spi.init(baudrate=200000) # set the baudrate
 
@@ -298,39 +297,54 @@ mosi   13           23
 miso   12           19
 =====  ===========  ============
 
-Hardware SPI has the same methods as Software SPI above::
+Hardware SPI is accessed via the :ref:`machine.SPI <machine.SPI>` class and
+has the same methods as software SPI above::
 
     from machine import Pin, SPI
 
     hspi = SPI(1, 10000000, sck=Pin(14), mosi=Pin(13), miso=Pin(12))
     vspi = SPI(2, baudrate=80000000, polarity=0, phase=0, bits=8, firstbit=0, sck=Pin(18), mosi=Pin(23), miso=Pin(19))
 
+Software I2C bus
+----------------
 
-I2C bus
--------
-
-The I2C driver has both software and hardware implementations, and the two
-hardware peripherals have identifiers 0 and 1.  Any available output-capable
-pins can be used for SCL and SDA.  The driver is accessed via the
-:ref:`machine.I2C <machine.I2C>` class::
-
-    from machine import Pin, I2C
+Software I2C (using bit-banging) works on all output-capable pins, and is
+accessed via the :ref:`machine.SoftI2C <machine.SoftI2C>` class::
 
-    # construct a software I2C bus
-    i2c = I2C(scl=Pin(5), sda=Pin(4), freq=100000)
+    from machine import Pin, SoftI2C
 
-    # construct a hardware I2C bus
-    i2c = I2C(0)
-    i2c = I2C(1, scl=Pin(5), sda=Pin(4), freq=400000)
+    i2c = SoftI2C(scl=Pin(5), sda=Pin(4), freq=100000)
 
-    i2c.scan()              # scan for slave devices
+    i2c.scan()              # scan for devices
 
-    i2c.readfrom(0x3a, 4)   # read 4 bytes from slave device with address 0x3a
-    i2c.writeto(0x3a, '12') # write '12' to slave device with address 0x3a
+    i2c.readfrom(0x3a, 4)   # read 4 bytes from device with address 0x3a
+    i2c.writeto(0x3a, '12') # write '12' to device with address 0x3a
 
     buf = bytearray(10)     # create a buffer with 10 bytes
     i2c.writeto(0x3a, buf)  # write the given buffer to the slave
 
+Hardware I2C bus
+----------------
+
+There are two hardware I2C peripherals with identifiers 0 and 1.  Any available
+output-capable pins can be used for SCL and SDA but the defaults are given
+below.
+
+=====  ===========  ============
+\      I2C(0)       I2C(1)
+=====  ===========  ============
+scl    18           25
+sda    19           26
+=====  ===========  ============
+
+The driver is accessed via the :ref:`machine.I2C <machine.I2C>` class and
+has the same methods as software I2C above::
+
+    from machine import Pin, I2C
+
+    i2c = I2C(0)
+    i2c = I2C(1, scl=Pin(5), sda=Pin(4), freq=400000)
+
 Real time clock (RTC)
 ---------------------
 
diff --git a/docs/esp8266/quickref.rst b/docs/esp8266/quickref.rst
index c884d93fc9940..1a22bd50a5ac2 100644
--- a/docs/esp8266/quickref.rst
+++ b/docs/esp8266/quickref.rst
@@ -214,15 +214,15 @@ Software SPI bus
 ----------------
 
 There are two SPI drivers. One is implemented in software (bit-banging)
-and works on all pins, and is accessed via the :ref:`machine.SPI <machine.SPI>`
+and works on all pins, and is accessed via the :ref:`machine.SoftSPI <machine.SoftSPI>`
 class::
 
-    from machine import Pin, SPI
+    from machine import Pin, SoftSPI
 
     # construct an SPI bus on the given pins
     # polarity is the idle state of SCK
     # phase=0 means sample on the first edge of SCK, phase=1 means the second
-    spi = SPI(-1, baudrate=100000, polarity=1, phase=0, sck=Pin(0), mosi=Pin(2), miso=Pin(4))
+    spi = SoftSPI(baudrate=100000, polarity=1, phase=0, sck=Pin(0), mosi=Pin(2), miso=Pin(4))
 
     spi.init(baudrate=200000) # set the baudrate
 
@@ -258,7 +258,8 @@ I2C bus
 -------
 
 The I2C driver is implemented in software and works on all pins,
-and is accessed via the :ref:`machine.I2C <machine.I2C>` class::
+and is accessed via the :ref:`machine.I2C <machine.I2C>` class (which is an
+alias of :ref:`machine.SoftI2C <machine.SoftI2C>`)::
 
     from machine import Pin, I2C
 
diff --git a/docs/library/machine.I2C.rst b/docs/library/machine.I2C.rst
index 743554bc76650..f9b951564611b 100644
--- a/docs/library/machine.I2C.rst
+++ b/docs/library/machine.I2C.rst
@@ -12,6 +12,14 @@ when created, or initialised later on.
 
 Printing the I2C object gives you information about its configuration.
 
+Both hardware and software I2C implementations exist via the
+:ref:`machine.I2C <machine.I2C>` and `machine.SoftI2C` classes.  Hardware I2C uses
+underlying hardware support of the system to perform the reads/writes and is
+usually efficient and fast but may have restrictions on which pins can be used.
+Software I2C is implemented by bit-banging and can be used on any pin but is not
+as efficient.  These classes have the same methods available and differ primarily
+in the way they are constructed.
+
 Example usage::
 
     from machine import I2C
@@ -33,21 +41,33 @@ Example usage::
 Constructors
 ------------
 
-.. class:: I2C(id=-1, *, scl, sda, freq=400000)
+.. class:: I2C(id, *, scl, sda, freq=400000)
 
    Construct and return a new I2C object using the following parameters:
 
-      - *id* identifies a particular I2C peripheral.  The default
-        value of -1 selects a software implementation of I2C which can
-        work (in most cases) with arbitrary pins for SCL and SDA.
-        If *id* is -1 then *scl* and *sda* must be specified.  Other
-        allowed values for *id* depend on the particular port/board,
-        and specifying *scl* and *sda* may or may not be required or
-        allowed in this case.
+      - *id* identifies a particular I2C peripheral.  Allowed values for
+        depend on the particular port/board
+      - *scl* should be a pin object specifying the pin to use for SCL.
+      - *sda* should be a pin object specifying the pin to use for SDA.
+      - *freq* should be an integer which sets the maximum frequency
+        for SCL.
+
+   Note that some ports/boards will have default values of *scl* and *sda*
+   that can be changed in this constructor.  Others will have fixed values
+   of *scl* and *sda* that cannot be changed.
+
+.. _machine.SoftI2C:
+.. class:: SoftI2C(scl, sda, *, freq=400000, timeout=255)
+
+   Construct a new software I2C object.  The parameters are:
+
       - *scl* should be a pin object specifying the pin to use for SCL.
       - *sda* should be a pin object specifying the pin to use for SDA.
       - *freq* should be an integer which sets the maximum frequency
         for SCL.
+      - *timeout* is the maximum time in microseconds to wait for clock
+        stretching (SCL held low by another device on the bus), after
+        which an ``OSError(ETIMEDOUT)`` exception is raised.
 
 General Methods
 ---------------
@@ -79,7 +99,7 @@ The following methods implement the primitive I2C master bus operations and can
 be combined to make any I2C transaction.  They are provided if you need more
 control over the bus, otherwise the standard methods (see below) can be used.
 
-These methods are available on software I2C only.
+These methods are only available on the `machine.SoftI2C` class.
 
 .. method:: I2C.start()
 
diff --git a/docs/library/machine.SPI.rst b/docs/library/machine.SPI.rst
index ea460a7b81282..7565241eb1cd2 100644
--- a/docs/library/machine.SPI.rst
+++ b/docs/library/machine.SPI.rst
@@ -11,21 +11,35 @@ SS (Slave Select), to select a particular device on a bus with which
 communication takes place. Management of an SS signal should happen in
 user code (via machine.Pin class).
 
+Both hardware and software SPI implementations exist via the
+:ref:`machine.SPI <machine.SPI>` and `machine.SoftSPI` classes.  Hardware SPI uses underlying
+hardware support of the system to perform the reads/writes and is usually
+efficient and fast but may have restrictions on which pins can be used.
+Software SPI is implemented by bit-banging and can be used on any pin but
+is not as efficient.  These classes have the same methods available and
+differ primarily in the way they are constructed.
+
 Constructors
 ------------
 
 .. class:: SPI(id, ...)
 
-   Construct an SPI object on the given bus, ``id``. Values of ``id`` depend
+   Construct an SPI object on the given bus, *id*. Values of *id* depend
    on a particular port and its hardware. Values 0, 1, etc. are commonly used
-   to select hardware SPI block #0, #1, etc. Value -1 can be used for
-   bitbanging (software) implementation of SPI (if supported by a port).
+   to select hardware SPI block #0, #1, etc.
 
    With no additional parameters, the SPI object is created but not
    initialised (it has the settings from the last initialisation of
    the bus, if any).  If extra arguments are given, the bus is initialised.
    See ``init`` for parameters of initialisation.
 
+.. _machine.SoftSPI:
+.. class:: SoftSPI(baudrate=500000, *, polarity=0, phase=0, bits=8, firstbit=MSB, sck=None, mosi=None, miso=None)
+
+   Construct a new software SPI object.  Additional parameters must be
+   given, usually at least *sck*, *mosi* and *miso*, and these are used
+   to initialise the bus.  See `SPI.init` for a description of the parameters.
+
 Methods
 -------
 

From 905a18aafefbe04aa2beceb84885c29aa156b975 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 24 Sep 2020 14:37:01 +1000
Subject: [PATCH 0328/3533] unix,windows: Implement mp_hal_time_ns using
 gettimeofday.

This provides microsecond accuracy.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/unix/unix_mphal.c       | 5 +++--
 ports/windows/windows_mphal.c | 6 ++++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/ports/unix/unix_mphal.c b/ports/unix/unix_mphal.c
index f43067f646ba9..3fe2fa9fec21d 100644
--- a/ports/unix/unix_mphal.c
+++ b/ports/unix/unix_mphal.c
@@ -216,6 +216,7 @@ mp_uint_t mp_hal_ticks_us(void) {
 }
 
 uint64_t mp_hal_time_ns(void) {
-    time_t now = time(NULL);
-    return (uint64_t)now * 1000000000ULL;
+    struct timeval tv;
+    gettimeofday(&tv, NULL);
+    return (uint64_t)tv.tv_sec * 1000000000ULL + (uint64_t)tv.tv_usec * 1000ULL;
 }
diff --git a/ports/windows/windows_mphal.c b/ports/windows/windows_mphal.c
index 8ed087358f567..b442b59147e4e 100644
--- a/ports/windows/windows_mphal.c
+++ b/ports/windows/windows_mphal.c
@@ -255,3 +255,9 @@ mp_uint_t mp_hal_ticks_cpu(void) {
     return value.LowPart;
     #endif
 }
+
+uint64_t mp_hal_time_ns(void) {
+    struct timeval tv;
+    gettimeofday(&tv, NULL);
+    return (uint64_t)tv.tv_sec * 1000000000ULL + (uint64_t)tv.tv_usec * 1000ULL;
+}

From d4b61b00172ccc231307e3ef33f66f28cb6b051f Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 24 Sep 2020 12:37:02 +1000
Subject: [PATCH 0329/3533] extmod/utime_mphal: Add generic utime.time_ns()
 function.

It requires mp_hal_time_ns() to be provided by a port.  This function
allows very accurate absolute timestamps.

Enabled on unix, windows, stm32, esp8266 and esp32.

Signed-off-by: Damien George <damien@micropython.org>
---
 docs/library/utime.rst            | 10 ++++++++--
 extmod/utime_mphal.c              |  6 ++++++
 extmod/utime_mphal.h              |  1 +
 ports/esp32/modutime.c            |  1 +
 ports/esp8266/modutime.c          |  1 +
 ports/stm32/modutime.c            |  1 +
 ports/unix/modtime.c              |  1 +
 tests/extmod/utime_time_ns.py     | 24 ++++++++++++++++++++++++
 tests/extmod/utime_time_ns.py.exp |  2 ++
 9 files changed, 45 insertions(+), 2 deletions(-)
 create mode 100644 tests/extmod/utime_time_ns.py
 create mode 100644 tests/extmod/utime_time_ns.py.exp

diff --git a/docs/library/utime.rst b/docs/library/utime.rst
index 8c222ede5f80b..86fd27b3a5ac8 100644
--- a/docs/library/utime.rst
+++ b/docs/library/utime.rst
@@ -216,8 +216,9 @@ Functions
    function returns number of seconds since a port-specific reference point in time (for
    embedded boards without a battery-backed RTC, usually since power up or reset). If you
    want to develop portable MicroPython application, you should not rely on this function
-   to provide higher than second precision. If you need higher precision, use
-   `ticks_ms()` and `ticks_us()` functions, if you need calendar time,
+   to provide higher than second precision.  If you need higher precision, absolute
+   timestamps, use `time_ns()`.  If relative times are acceptable then use the
+   `ticks_ms()` and `ticks_us()` functions.  If you need calendar time, `gmtime()` or
    `localtime()` without an argument is a better choice.
 
    .. admonition:: Difference to CPython
@@ -233,3 +234,8 @@ Functions
       hardware also lacks battery-powered RTC, so returns number of seconds
       since last power-up or from other relative, hardware-specific point
       (e.g. reset).
+
+.. function:: time_ns()
+
+    Similar to `time()` but returns nanoseconds since the Epoch, as an integer (usually
+    a big integer, so will allocate on the heap).
diff --git a/extmod/utime_mphal.c b/extmod/utime_mphal.c
index 6aff2cac725c2..d053cf128b871 100644
--- a/extmod/utime_mphal.c
+++ b/extmod/utime_mphal.c
@@ -99,4 +99,10 @@ STATIC mp_obj_t time_ticks_add(mp_obj_t ticks_in, mp_obj_t delta_in) {
 }
 MP_DEFINE_CONST_FUN_OBJ_2(mp_utime_ticks_add_obj, time_ticks_add);
 
+// Returns the number of nanoseconds since the Epoch, as an integer.
+STATIC mp_obj_t time_time_ns(void) {
+    return mp_obj_new_int_from_ull(mp_hal_time_ns());
+}
+MP_DEFINE_CONST_FUN_OBJ_0(mp_utime_time_ns_obj, time_time_ns);
+
 #endif // MICROPY_PY_UTIME_MP_HAL
diff --git a/extmod/utime_mphal.h b/extmod/utime_mphal.h
index 88a9ed4d3756d..57fc348832812 100644
--- a/extmod/utime_mphal.h
+++ b/extmod/utime_mphal.h
@@ -37,5 +37,6 @@ MP_DECLARE_CONST_FUN_OBJ_0(mp_utime_ticks_us_obj);
 MP_DECLARE_CONST_FUN_OBJ_0(mp_utime_ticks_cpu_obj);
 MP_DECLARE_CONST_FUN_OBJ_2(mp_utime_ticks_diff_obj);
 MP_DECLARE_CONST_FUN_OBJ_2(mp_utime_ticks_add_obj);
+MP_DECLARE_CONST_FUN_OBJ_0(mp_utime_time_ns_obj);
 
 #endif // MICROPY_INCLUDED_EXTMOD_UTIME_MPHAL_H
diff --git a/ports/esp32/modutime.c b/ports/esp32/modutime.c
index ac3edb4e9b76f..cf7178e0b1c2d 100644
--- a/ports/esp32/modutime.c
+++ b/ports/esp32/modutime.c
@@ -97,6 +97,7 @@ STATIC const mp_rom_map_elem_t time_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_ticks_cpu), MP_ROM_PTR(&mp_utime_ticks_cpu_obj) },
     { MP_ROM_QSTR(MP_QSTR_ticks_add), MP_ROM_PTR(&mp_utime_ticks_add_obj) },
     { MP_ROM_QSTR(MP_QSTR_ticks_diff), MP_ROM_PTR(&mp_utime_ticks_diff_obj) },
+    { MP_ROM_QSTR(MP_QSTR_time_ns), MP_ROM_PTR(&mp_utime_time_ns_obj) },
 };
 
 STATIC MP_DEFINE_CONST_DICT(time_module_globals, time_module_globals_table);
diff --git a/ports/esp8266/modutime.c b/ports/esp8266/modutime.c
index 86534722c792f..bcfbf7baf2c66 100644
--- a/ports/esp8266/modutime.c
+++ b/ports/esp8266/modutime.c
@@ -120,6 +120,7 @@ STATIC const mp_rom_map_elem_t time_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_ticks_add), MP_ROM_PTR(&mp_utime_ticks_add_obj) },
     { MP_ROM_QSTR(MP_QSTR_ticks_diff), MP_ROM_PTR(&mp_utime_ticks_diff_obj) },
     { MP_ROM_QSTR(MP_QSTR_time), MP_ROM_PTR(&time_time_obj) },
+    { MP_ROM_QSTR(MP_QSTR_time_ns), MP_ROM_PTR(&mp_utime_time_ns_obj) },
 };
 
 STATIC MP_DEFINE_CONST_DICT(time_module_globals, time_module_globals_table);
diff --git a/ports/stm32/modutime.c b/ports/stm32/modutime.c
index 2a37a130df2bb..4bce45eb33315 100644
--- a/ports/stm32/modutime.c
+++ b/ports/stm32/modutime.c
@@ -144,6 +144,7 @@ STATIC const mp_rom_map_elem_t time_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_ticks_cpu), MP_ROM_PTR(&mp_utime_ticks_cpu_obj) },
     { MP_ROM_QSTR(MP_QSTR_ticks_add), MP_ROM_PTR(&mp_utime_ticks_add_obj) },
     { MP_ROM_QSTR(MP_QSTR_ticks_diff), MP_ROM_PTR(&mp_utime_ticks_diff_obj) },
+    { MP_ROM_QSTR(MP_QSTR_time_ns), MP_ROM_PTR(&mp_utime_time_ns_obj) },
 };
 
 STATIC MP_DEFINE_CONST_DICT(time_module_globals, time_module_globals_table);
diff --git a/ports/unix/modtime.c b/ports/unix/modtime.c
index 5343e479c7d92..e08409e20e3e9 100644
--- a/ports/unix/modtime.c
+++ b/ports/unix/modtime.c
@@ -219,6 +219,7 @@ STATIC const mp_rom_map_elem_t mp_module_time_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_ticks_cpu), MP_ROM_PTR(&mp_utime_ticks_cpu_obj) },
     { MP_ROM_QSTR(MP_QSTR_ticks_add), MP_ROM_PTR(&mp_utime_ticks_add_obj) },
     { MP_ROM_QSTR(MP_QSTR_ticks_diff), MP_ROM_PTR(&mp_utime_ticks_diff_obj) },
+    { MP_ROM_QSTR(MP_QSTR_time_ns), MP_ROM_PTR(&mp_utime_time_ns_obj) },
     { MP_ROM_QSTR(MP_QSTR_gmtime), MP_ROM_PTR(&mod_time_gmtime_obj) },
     { MP_ROM_QSTR(MP_QSTR_localtime), MP_ROM_PTR(&mod_time_localtime_obj) },
     { MP_ROM_QSTR(MP_QSTR_mktime), MP_ROM_PTR(&mod_time_mktime_obj) },
diff --git a/tests/extmod/utime_time_ns.py b/tests/extmod/utime_time_ns.py
new file mode 100644
index 0000000000000..8f3890f1cb85e
--- /dev/null
+++ b/tests/extmod/utime_time_ns.py
@@ -0,0 +1,24 @@
+# test utime.time_ns()
+
+try:
+    import utime
+
+    utime.sleep_us
+    utime.time_ns
+except (ImportError, AttributeError):
+    print("SKIP")
+    raise SystemExit
+
+
+t0 = utime.time_ns()
+utime.sleep_us(1000)
+t1 = utime.time_ns()
+
+# Check that time_ns increases.
+print(t0 < t1)
+
+# Check that time_ns counts correctly, but be very lenient with the upper bound (50ms).
+if 950000 < t1 - t0 < 50000000:
+    print(True)
+else:
+    print(t0, t1, t1 - t0)
diff --git a/tests/extmod/utime_time_ns.py.exp b/tests/extmod/utime_time_ns.py.exp
new file mode 100644
index 0000000000000..dbde422651c9a
--- /dev/null
+++ b/tests/extmod/utime_time_ns.py.exp
@@ -0,0 +1,2 @@
+True
+True

From 843dcd4f8515c62b32b4b25dc3b01fba107622e2 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 30 Sep 2020 23:34:42 +1000
Subject: [PATCH 0330/3533] py/parse: Expose rule-name printing as
 MICROPY_DEBUG_PARSE_RULE_NAME.

So it can be enabled without modifying the source.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/mpconfig.h | 5 +++++
 py/parse.c    | 7 ++-----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/py/mpconfig.h b/py/mpconfig.h
index 12517316c6c80..cc83f3850d695 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -454,6 +454,11 @@
 #define MICROPY_DEBUG_MP_OBJ_SENTINELS (0)
 #endif
 
+// Whether to print parse rule names (rather than integers) in mp_parse_node_print
+#ifndef MICROPY_DEBUG_PARSE_RULE_NAME
+#define MICROPY_DEBUG_PARSE_RULE_NAME (0)
+#endif
+
 // Whether to enable a simple VM stack overflow check
 #ifndef MICROPY_DEBUG_VM_STACK_OVERFLOW
 #define MICROPY_DEBUG_VM_STACK_OVERFLOW (0)
diff --git a/py/parse.c b/py/parse.c
index 38cd215a9ff71..da2f5e796d9be 100644
--- a/py/parse.c
+++ b/py/parse.c
@@ -55,9 +55,6 @@
 #define RULE_ARG_RULE           (0x2000)
 #define RULE_ARG_OPT_RULE       (0x3000)
 
-// (un)comment to use rule names; for debugging
-// #define USE_RULE_NAME (1)
-
 // *FORMAT-OFF*
 
 enum {
@@ -192,7 +189,7 @@ static const size_t FIRST_RULE_WITH_OFFSET_ABOVE_255 =
 #undef DEF_RULE_NC
 0;
 
-#if USE_RULE_NAME
+#if MICROPY_DEBUG_PARSE_RULE_NAME
 // Define an array of rule names corresponding to each rule
 STATIC const char *const rule_name_table[] = {
 #define DEF_RULE(rule, comp, kind, ...) #rule,
@@ -410,7 +407,7 @@ void mp_parse_node_print(const mp_print_t *print, mp_parse_node_t pn, size_t ind
             #endif
         } else {
             size_t n = MP_PARSE_NODE_STRUCT_NUM_NODES(pns);
-            #if USE_RULE_NAME
+            #if MICROPY_DEBUG_PARSE_RULE_NAME
             mp_printf(print, "%s(%u) (n=%u)\n", rule_name_table[MP_PARSE_NODE_STRUCT_KIND(pns)], (uint)MP_PARSE_NODE_STRUCT_KIND(pns), (uint)n);
             #else
             mp_printf(print, "rule(%u) (n=%u)\n", (uint)MP_PARSE_NODE_STRUCT_KIND(pns), (uint)n);

From 817b80a102a413b6458ea391bb2c463aff99672e Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 30 Sep 2020 23:35:55 +1000
Subject: [PATCH 0331/3533] unix/variants: Enable MICROPY_DEBUG_PARSE_RULE_NAME
 on coverage build.

Signed-off-by: Damien George <damien@micropython.org>
---
 .../unix/variants/coverage/mpconfigvariant.h  |  1 +
 tests/cmdline/cmd_parsetree.py.exp            | 22 +++++++++----------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/ports/unix/variants/coverage/mpconfigvariant.h b/ports/unix/variants/coverage/mpconfigvariant.h
index 3de5294322502..942117608fab1 100644
--- a/ports/unix/variants/coverage/mpconfigvariant.h
+++ b/ports/unix/variants/coverage/mpconfigvariant.h
@@ -30,6 +30,7 @@
 #define MICROPY_VFS                    (1)
 #define MICROPY_PY_UOS_VFS             (1)
 
+#define MICROPY_DEBUG_PARSE_RULE_NAME  (1)
 #define MICROPY_OPT_MATH_FACTORIAL     (1)
 #define MICROPY_FLOAT_HIGH_QUALITY_HASH (1)
 #define MICROPY_ENABLE_SCHEDULER       (1)
diff --git a/tests/cmdline/cmd_parsetree.py.exp b/tests/cmdline/cmd_parsetree.py.exp
index 42a8228fb77e1..e64f4f782951a 100644
--- a/tests/cmdline/cmd_parsetree.py.exp
+++ b/tests/cmdline/cmd_parsetree.py.exp
@@ -1,31 +1,31 @@
 ----------------
-[   4] rule(1) (n=9)
+[   4] \(rule\|file_input_2\)(1) (n=9)
          tok(4)
-[   4]   rule(22) (n=4)
+[   4]   \(rule\|for_stmt\)(22) (n=4)
            id(i)
-[   4]     rule(45) (n=1)
+[   4]     \(rule\|atom_paren\)(45) (n=1)
              NULL
-[   5]     rule(8) (n=0)
+[   5]     \(rule\|pass_stmt\)(8) (n=0)
            NULL
-[   6]   rule(5) (n=2)
+[   6]   \(rule\|expr_stmt\)(5) (n=2)
            id(a)
            tok(14)
-[   7]   rule(5) (n=2)
+[   7]   \(rule\|expr_stmt\)(5) (n=2)
            id(b)
            str(str)
-[   8]   rule(5) (n=2)
+[   8]   \(rule\|expr_stmt\)(5) (n=2)
            id(c)
 [   8]     literal \.\+
-[   9]   rule(5) (n=2)
+[   9]   \(rule\|expr_stmt\)(5) (n=2)
            id(d)
            bytes(bytes)
-[  10]   rule(5) (n=2)
+[  10]   \(rule\|expr_stmt\)(5) (n=2)
            id(e)
 [  10]     literal \.\+
-[  11]   rule(5) (n=2)
+[  11]   \(rule\|expr_stmt\)(5) (n=2)
            id(f)
 [  11]     literal \.\+
-[  12]   rule(5) (n=2)
+[  12]   \(rule\|expr_stmt\)(5) (n=2)
            id(g)
            int(123)
 ----------------

From 0fff2e03fe07471997a6df6f92c6960cfd225dc0 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 2 Oct 2020 15:46:13 +1000
Subject: [PATCH 0332/3533] stm32/Makefile: Allow boards to extend SRC_C, SRC_O
 and OBJ variables.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/Makefile | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/ports/stm32/Makefile b/ports/stm32/Makefile
index 7b68299e04f70..cf3a589ca9087 100644
--- a/ports/stm32/Makefile
+++ b/ports/stm32/Makefile
@@ -259,7 +259,7 @@ DRIVERS_SRC_C = $(addprefix drivers/,\
 	dht/dht.c \
 	)
 
-SRC_C = \
+SRC_C += \
 	main.c \
 	stm32_it.c \
 	usbd_conf.c \
@@ -330,7 +330,7 @@ SRC_C = \
 	adc.c \
 	$(wildcard $(BOARD_DIR)/*.c)
 
-SRC_O = \
+SRC_O += \
 	$(STARTUP_FILE) \
 	$(SYSTEM_FILE)
 
@@ -505,7 +505,6 @@ endif
 
 endif
 
-OBJ =
 OBJ += $(PY_O)
 OBJ += $(addprefix $(BUILD)/, $(LIB_SRC_C:.c=.o))
 OBJ += $(LIBM_O)

From 1dc64359dab733b3c77f07d9d79589010f6fd8e0 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 23 Sep 2020 15:54:58 +1000
Subject: [PATCH 0333/3533] esp32: Use path relative to root for
 netutils/timeutils headers.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/Makefile      | 3 ---
 ports/esp32/fatfs_port.c  | 2 +-
 ports/esp32/machine_rtc.c | 2 +-
 ports/esp32/modesp32.c    | 2 +-
 ports/esp32/modnetwork.c  | 2 +-
 ports/esp32/network_ppp.c | 2 +-
 6 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/ports/esp32/Makefile b/ports/esp32/Makefile
index dcf4110cfc913..be282577229c4 100644
--- a/ports/esp32/Makefile
+++ b/ports/esp32/Makefile
@@ -136,9 +136,6 @@ include $(SDKCONFIG)
 
 INC += -I.
 INC += -I$(TOP)
-INC += -I$(TOP)/lib/mp-readline
-INC += -I$(TOP)/lib/netutils
-INC += -I$(TOP)/lib/timeutils
 INC += -I$(BUILD)
 
 INC_ESPCOMP += -I$(ESPCOMP)/bootloader_support/include
diff --git a/ports/esp32/fatfs_port.c b/ports/esp32/fatfs_port.c
index cfc52853d08a9..7fce654c0997c 100644
--- a/ports/esp32/fatfs_port.c
+++ b/ports/esp32/fatfs_port.c
@@ -28,7 +28,7 @@
 
 #include <sys/time.h>
 #include "lib/oofatfs/ff.h"
-#include "timeutils.h"
+#include "lib/timeutils/timeutils.h"
 
 DWORD get_fattime(void) {
     struct timeval tv;
diff --git a/ports/esp32/machine_rtc.c b/ports/esp32/machine_rtc.c
index 6902ce85fd2c7..1b6a71b5b4181 100644
--- a/ports/esp32/machine_rtc.c
+++ b/ports/esp32/machine_rtc.c
@@ -36,7 +36,7 @@
 #include "py/obj.h"
 #include "py/runtime.h"
 #include "py/mphal.h"
-#include "timeutils.h"
+#include "lib/timeutils/timeutils.h"
 #include "modmachine.h"
 #include "machine_rtc.h"
 
diff --git a/ports/esp32/modesp32.c b/ports/esp32/modesp32.c
index 8e248370ffb6d..28d1762d240de 100644
--- a/ports/esp32/modesp32.c
+++ b/ports/esp32/modesp32.c
@@ -41,7 +41,7 @@
 #include "py/obj.h"
 #include "py/runtime.h"
 #include "py/mphal.h"
-#include "timeutils.h"
+#include "lib/timeutils/timeutils.h"
 #include "modmachine.h"
 #include "machine_rtc.h"
 #include "modesp32.h"
diff --git a/ports/esp32/modnetwork.c b/ports/esp32/modnetwork.c
index 029a8d143127c..44263350409fc 100644
--- a/ports/esp32/modnetwork.c
+++ b/ports/esp32/modnetwork.c
@@ -40,7 +40,7 @@
 #include "py/runtime.h"
 #include "py/mphal.h"
 #include "py/mperrno.h"
-#include "netutils.h"
+#include "lib/netutils/netutils.h"
 #include "esp_eth.h"
 #include "esp_wifi.h"
 #include "esp_log.h"
diff --git a/ports/esp32/network_ppp.c b/ports/esp32/network_ppp.c
index df57b817251d8..db2292ca03f7e 100644
--- a/ports/esp32/network_ppp.c
+++ b/ports/esp32/network_ppp.c
@@ -30,7 +30,7 @@
 #include "py/mphal.h"
 #include "py/objtype.h"
 #include "py/stream.h"
-#include "netutils.h"
+#include "lib/netutils/netutils.h"
 #include "modmachine.h"
 
 #include "netif/ppp/ppp.h"

From 7497d891a7cfade68d8c7d26b64080c56e0579e5 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Fri, 2 Oct 2020 21:23:09 +0200
Subject: [PATCH 0334/3533] stm32/sdio: Don't change any DMA2 settings on H7
 MCUs.

DMA2 clock and registers should be left in their current state in the H7
build.
---
 ports/stm32/sdio.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/ports/stm32/sdio.c b/ports/stm32/sdio.c
index 79cc9c9a323a9..87f550e3a6f5d 100644
--- a/ports/stm32/sdio.c
+++ b/ports/stm32/sdio.c
@@ -76,7 +76,9 @@ void sdio_init(uint32_t irq_pri) {
     #endif
     mp_hal_delay_us(10);
 
+    #if defined(STM32F7)
     __HAL_RCC_DMA2_CLK_ENABLE(); // enable DMA2 peripheral
+    #endif
 
     NVIC_SetPriority(SDMMC1_IRQn, irq_pri);
 
@@ -216,7 +218,9 @@ int sdio_transfer(uint32_t cmd, uint32_t arg, uint32_t *resp) {
     }
     #endif
 
+    #if defined(STM32F7)
     DMA2_Stream3->CR = 0; // ensure DMA is reset
+    #endif
     SDMMC1->ICR = SDMMC_STATIC_FLAGS; // clear interrupts
     SDMMC1->ARG = arg;
     SDMMC1->CMD = cmd | SDMMC_CMD_WAITRESP_0 | SDMMC_CMD_CPSMEN;
@@ -296,7 +300,9 @@ int sdio_transfer_cmd53(bool write, uint32_t block_size, uint32_t arg, size_t le
     SDMMC1->DTIMER = 0x2000000; // about 700ms running at 48MHz
     SDMMC1->DLEN = (len + block_size - 1) & ~(block_size - 1);
 
+    #if defined(STM32F7)
     DMA2_Stream3->CR = 0;
+    #endif
 
     if (dma) {
         // prepare DMA so it's ready when the DPSM starts its transfer

From 9855b9cd82f9d2e9108fd54ab7d4602134ebae1d Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Fri, 2 Oct 2020 21:44:15 +0200
Subject: [PATCH 0335/3533] stm32/sdcard: Fix H7 build when using SDMMC2.

Changes are:
- Fix missing IRQ handler when SDMMC2 is used instead of SDMMC1 with H7
  MCUs.
- Removed outdated H7 series compatibility macros.
- Defined common IRQ handler macro for F4 series.
---
 ports/stm32/sdcard.c | 21 ++++++---------------
 1 file changed, 6 insertions(+), 15 deletions(-)

diff --git a/ports/stm32/sdcard.c b/ports/stm32/sdcard.c
index 9d77722302c99..7d79e9f47b1a8 100644
--- a/ports/stm32/sdcard.c
+++ b/ports/stm32/sdcard.c
@@ -48,12 +48,14 @@
 
 #if defined(MICROPY_HW_SDMMC2_CK)
 #define SDIO SDMMC2
+#define SDMMC_IRQHandler SDMMC2_IRQHandler
 #define SDMMC_CLK_ENABLE() __HAL_RCC_SDMMC2_CLK_ENABLE()
 #define SDMMC_CLK_DISABLE() __HAL_RCC_SDMMC2_CLK_DISABLE()
 #define SDMMC_IRQn SDMMC2_IRQn
 #define SDMMC_DMA dma_SDMMC_2
 #else
 #define SDIO SDMMC1
+#define SDMMC_IRQHandler SDMMC1_IRQHandler
 #define SDMMC_CLK_ENABLE() __HAL_RCC_SDMMC1_CLK_ENABLE()
 #define SDMMC_CLK_DISABLE() __HAL_RCC_SDMMC1_CLK_DISABLE()
 #define SDMMC_IRQn SDMMC1_IRQn
@@ -86,8 +88,6 @@
 #define SDIO_HARDWARE_FLOW_CONTROL_ENABLE   SDMMC_HARDWARE_FLOW_CONTROL_ENABLE
 
 #if defined(STM32H7)
-#define GPIO_AF12_SDIO                      GPIO_AF12_SDIO1
-#define SDIO_IRQHandler                     SDMMC1_IRQHandler
 #define SDIO_TRANSFER_CLK_DIV               SDMMC_NSpeed_CLK_DIV
 #define SDIO_USE_GPDMA                      0
 #else
@@ -102,6 +102,7 @@
 #define SDMMC_CLK_ENABLE() __SDIO_CLK_ENABLE()
 #define SDMMC_CLK_DISABLE() __SDIO_CLK_DISABLE()
 #define SDMMC_IRQn SDIO_IRQn
+#define SDMMC_IRQHandler SDIO_IRQHandler
 #define SDMMC_DMA dma_SDIO_0
 #define SDIO_USE_GPDMA 1
 #define STATIC_AF_SDMMC_CK STATIC_AF_SDIO_CK
@@ -398,21 +399,11 @@ STATIC void sdmmc_irq_handler(void) {
     }
 }
 
-#if !defined(MICROPY_HW_SDMMC2_CK)
-void SDIO_IRQHandler(void) {
-    IRQ_ENTER(SDIO_IRQn);
+void SDMMC_IRQHandler(void) {
+    IRQ_ENTER(SDMMC_IRQn);
     sdmmc_irq_handler();
-    IRQ_EXIT(SDIO_IRQn);
+    IRQ_EXIT(SDMMC_IRQn);
 }
-#endif
-
-#if defined(STM32F7)
-void SDMMC2_IRQHandler(void) {
-    IRQ_ENTER(SDMMC2_IRQn);
-    sdmmc_irq_handler();
-    IRQ_EXIT(SDMMC2_IRQn);
-}
-#endif
 
 STATIC void sdcard_reset_periph(void) {
     // Fully reset the SDMMC peripheral before calling HAL SD DMA functions.

From 7c76a2dfcffa853e73464434861af185b3e5a9f4 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Thu, 1 Oct 2020 14:47:00 +1000
Subject: [PATCH 0336/3533] stm32/rfcore: Add Python API for basic rfcore
 operations.

The new functions provide FUS/WS status, version and SYS HCI commands:
- stm.rfcore_status()
- stm.rfcore_fw_version(fw_id)
- stm.rfcore_sys_hci(ogf, ocf, cmd)
---
 ports/stm32/modstm.c |   7 +++
 ports/stm32/rfcore.c | 103 +++++++++++++++++++++++++++++++++++--------
 ports/stm32/rfcore.h |   4 ++
 3 files changed, 96 insertions(+), 18 deletions(-)

diff --git a/ports/stm32/modstm.c b/ports/stm32/modstm.c
index 418b8bde2a14e..3f4f33979afd5 100644
--- a/ports/stm32/modstm.c
+++ b/ports/stm32/modstm.c
@@ -30,6 +30,7 @@
 #include "py/obj.h"
 #include "py/objint.h"
 #include "extmod/machine_mem.h"
+#include "rfcore.h"
 #include "portmodules.h"
 
 #if MICROPY_PY_STM
@@ -44,6 +45,12 @@ STATIC const mp_rom_map_elem_t stm_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_mem32), MP_ROM_PTR(&machine_mem32_obj) },
 
     #include "genhdr/modstm_const.h"
+
+    #if defined(STM32WB)
+    { MP_ROM_QSTR(MP_QSTR_rfcore_status), MP_ROM_PTR(&rfcore_status_obj) },
+    { MP_ROM_QSTR(MP_QSTR_rfcore_fw_version), MP_ROM_PTR(&rfcore_fw_version_obj) },
+    { MP_ROM_QSTR(MP_QSTR_rfcore_sys_hci), MP_ROM_PTR(&rfcore_sys_hci_obj) },
+    #endif
 };
 
 STATIC MP_DEFINE_CONST_DICT(stm_module_globals, stm_module_globals_table);
diff --git a/ports/stm32/rfcore.c b/ports/stm32/rfcore.c
index dc23bbe0b2a69..436042cc2ecc6 100644
--- a/ports/stm32/rfcore.c
+++ b/ports/stm32/rfcore.c
@@ -30,6 +30,7 @@
 
 #include "py/mperrno.h"
 #include "py/mphal.h"
+#include "py/runtime.h"
 #include "rtc.h"
 #include "rfcore.h"
 
@@ -66,9 +67,16 @@
 
 #define HCI_EVENT_COMMAND_COMPLETE     (0x0E) // <num packets><opcode 16><status><data...>
 
-#define SYS_ACK_TIMEOUT_MS (250)
+// There can be quite long delays during firmware update.
+#define SYS_ACK_TIMEOUT_MS (1000)
+
 #define BLE_ACK_TIMEOUT_MS (250)
 
+// AN5185
+#define MAGIC_FUS_ACTIVE 0xA94656B9
+// AN5289
+#define MAGIC_IPCC_MEM_INCORRECT 0x3DE96F61
+
 typedef struct _tl_list_node_t {
     volatile struct _tl_list_node_t *next;
     volatile struct _tl_list_node_t *prev;
@@ -267,10 +275,10 @@ void ipcc_init(uint32_t irq_pri) {
 /******************************************************************************/
 // Transport layer HCI interface
 
-STATIC void tl_parse_hci_msg(const uint8_t *buf, parse_hci_info_t *parse) {
+STATIC size_t tl_parse_hci_msg(const uint8_t *buf, parse_hci_info_t *parse) {
     const char *info;
-    size_t len = 0;
     bool applied_set_event_event_mask2_fix = false;
+    size_t len;
     switch (buf[0]) {
         case HCI_KIND_BT_ACL: {
             info = "HCI_ACL";
@@ -334,6 +342,7 @@ STATIC void tl_parse_hci_msg(const uint8_t *buf, parse_hci_info_t *parse) {
         }
         default:
             info = "HCI_UNKNOWN";
+            len = 0;
             break;
     }
 
@@ -354,6 +363,8 @@ STATIC void tl_parse_hci_msg(const uint8_t *buf, parse_hci_info_t *parse) {
     #else
     (void)info;
     #endif
+
+    return len;
 }
 
 STATIC void tl_process_msg(volatile tl_list_node_t *head, unsigned int ch, parse_hci_info_t *parse) {
@@ -397,7 +408,7 @@ STATIC void tl_check_msg_ble(volatile tl_list_node_t *head, parse_hci_info_t *pa
     }
 }
 
-STATIC void tl_hci_cmd(uint8_t *cmd, unsigned int ch, uint8_t hdr, uint16_t opcode, size_t len, const uint8_t *buf) {
+STATIC void tl_hci_cmd(uint8_t *cmd, unsigned int ch, uint8_t hdr, uint16_t opcode, const uint8_t *buf, size_t len) {
     tl_list_node_t *n = (tl_list_node_t *)cmd;
     n->next = n;
     n->prev = n;
@@ -407,11 +418,19 @@ STATIC void tl_hci_cmd(uint8_t *cmd, unsigned int ch, uint8_t hdr, uint16_t opco
     cmd[11] = len;
     memcpy(&cmd[12], buf, len);
 
+    #if HCI_TRACE
+    printf("[% 8d] >HCI(", mp_hal_ticks_ms());
+    for (int i = 0; i < len + 4; ++i) {
+        printf(":%02x", cmd[i + 8]);
+    }
+    printf(")\n");
+    #endif
+
     // Indicate that this channel is ready.
     LL_C1_IPCC_SetFlag_CHx(IPCC, ch);
 }
 
-STATIC int tl_sys_wait_ack(const uint8_t *buf) {
+STATIC ssize_t tl_sys_wait_ack(const uint8_t *buf) {
     uint32_t t0 = mp_hal_ticks_ms();
 
     // C2 will clear this bit to acknowledge the request.
@@ -422,14 +441,14 @@ STATIC int tl_sys_wait_ack(const uint8_t *buf) {
         }
     }
 
-    // C1-to-C2 bit cleared, so process (but ignore) the response.
-    tl_parse_hci_msg(buf, NULL);
-    return 0;
+    // C1-to-C2 bit cleared, so process the response (just get the length, do
+    // not parse any further).
+    return (ssize_t)tl_parse_hci_msg(buf, NULL);
 }
 
-STATIC void tl_sys_hci_cmd_resp(uint16_t opcode, size_t len, const uint8_t *buf) {
-    tl_hci_cmd(ipcc_membuf_sys_cmd_buf, IPCC_CH_SYS, 0x10, opcode, len, buf);
-    tl_sys_wait_ack(ipcc_membuf_sys_cmd_buf);
+STATIC ssize_t tl_sys_hci_cmd_resp(uint16_t opcode, const uint8_t *buf, size_t len) {
+    tl_hci_cmd(ipcc_membuf_sys_cmd_buf, IPCC_CH_SYS, 0x10, opcode, buf, len);
+    return tl_sys_wait_ack(ipcc_membuf_sys_cmd_buf);
 }
 
 STATIC int tl_ble_wait_resp(void) {
@@ -447,10 +466,9 @@ STATIC int tl_ble_wait_resp(void) {
 }
 
 // Synchronously send a BLE command.
-STATIC void tl_ble_hci_cmd_resp(uint16_t opcode, size_t len, const uint8_t *buf) {
-    tl_hci_cmd(ipcc_membuf_ble_cmd_buf, IPCC_CH_BLE, HCI_KIND_BT_CMD, opcode, len, buf);
+STATIC void tl_ble_hci_cmd_resp(uint16_t opcode, const uint8_t *buf, size_t len) {
+    tl_hci_cmd(ipcc_membuf_ble_cmd_buf, IPCC_CH_BLE, HCI_KIND_BT_CMD, opcode, buf, len);
     tl_ble_wait_resp();
-
 }
 
 /******************************************************************************/
@@ -522,8 +540,8 @@ void rfcore_ble_init(void) {
     tl_check_msg_ble(&ipcc_mem_ble_evt_queue, NULL);
 
     // Configure and reset the BLE controller
-    tl_sys_hci_cmd_resp(HCI_OPCODE(OGF_VENDOR, OCF_BLE_INIT), sizeof(ble_init_params), (const uint8_t *)&ble_init_params);
-    tl_ble_hci_cmd_resp(HCI_OPCODE(0x03, 0x0003), 0, NULL);
+    tl_sys_hci_cmd_resp(HCI_OPCODE(OGF_VENDOR, OCF_BLE_INIT), (const uint8_t *)&ble_init_params, sizeof(ble_init_params));
+    tl_ble_hci_cmd_resp(HCI_OPCODE(0x03, 0x0003), NULL, 0);
 }
 
 void rfcore_ble_hci_cmd(size_t len, const uint8_t *src) {
@@ -573,14 +591,14 @@ void rfcore_ble_check_msg(int (*cb)(void *, const uint8_t *, size_t), void *env)
         SWAP_UINT8(buf[2], buf[7]);
         SWAP_UINT8(buf[3], buf[6]);
         SWAP_UINT8(buf[4], buf[5]);
-        tl_ble_hci_cmd_resp(HCI_OPCODE(OGF_VENDOR, OCF_WRITE_CONFIG), 8, buf); // set BDADDR
+        tl_ble_hci_cmd_resp(HCI_OPCODE(OGF_VENDOR, OCF_WRITE_CONFIG), buf, 8); // set BDADDR
     }
 }
 
 // "level" is 0x00-0x1f, ranging from -40 dBm to +6 dBm (not linear).
 void rfcore_ble_set_txpower(uint8_t level) {
     uint8_t buf[2] = { 0x00, level };
-    tl_ble_hci_cmd_resp(HCI_OPCODE(OGF_VENDOR, OCF_SET_TX_POWER), 2, buf);
+    tl_ble_hci_cmd_resp(HCI_OPCODE(OGF_VENDOR, OCF_SET_TX_POWER), buf, 2);
 }
 
 // IPCC IRQ Handlers
@@ -605,4 +623,53 @@ void IPCC_C1_RX_IRQHandler(void) {
     IRQ_EXIT(IPCC_C1_RX_IRQn);
 }
 
+/******************************************************************************/
+// MicroPython bindings
+
+STATIC mp_obj_t rfcore_status(void) {
+    return mp_obj_new_int_from_uint(ipcc_mem_dev_info_tab.fus.table_state);
+}
+MP_DEFINE_CONST_FUN_OBJ_0(rfcore_status_obj, rfcore_status);
+
+STATIC mp_obj_t get_version_tuple(uint32_t data) {
+    mp_obj_t items[] = {
+        MP_OBJ_NEW_SMALL_INT(data >> 24), MP_OBJ_NEW_SMALL_INT(data >> 16 & 0xFF), MP_OBJ_NEW_SMALL_INT(data >> 8 & 0xFF), MP_OBJ_NEW_SMALL_INT(data >> 4 & 0xF), MP_OBJ_NEW_SMALL_INT(data & 0xF)
+    };
+    return mp_obj_new_tuple(5, items);
+}
+
+STATIC mp_obj_t rfcore_fw_version(mp_obj_t fw_id_in) {
+    if (ipcc_mem_dev_info_tab.fus.table_state == MAGIC_IPCC_MEM_INCORRECT) {
+        mp_raise_OSError(MP_EINVAL);
+    }
+    mp_int_t fw_id = mp_obj_get_int(fw_id_in);
+    bool fus_active = ipcc_mem_dev_info_tab.fus.table_state == MAGIC_FUS_ACTIVE;
+    uint32_t v;
+    if (fw_id == 0) {
+        // FUS
+        v = fus_active ? ipcc_mem_dev_info_tab.fus.fus_version : ipcc_mem_dev_info_tab.ws.fus_version;
+    } else {
+        // WS
+        v = fus_active ? ipcc_mem_dev_info_tab.fus.ws_version : ipcc_mem_dev_info_tab.ws.fw_version;
+    }
+    return get_version_tuple(v);
+}
+MP_DEFINE_CONST_FUN_OBJ_1(rfcore_fw_version_obj, rfcore_fw_version);
+
+STATIC mp_obj_t rfcore_sys_hci(mp_obj_t ogf_in, mp_obj_t ocf_in, mp_obj_t cmd_in) {
+    if (ipcc_mem_dev_info_tab.fus.table_state == MAGIC_IPCC_MEM_INCORRECT) {
+        mp_raise_OSError(MP_EINVAL);
+    }
+    mp_int_t ogf = mp_obj_get_int(ogf_in);
+    mp_int_t ocf = mp_obj_get_int(ocf_in);
+    mp_buffer_info_t bufinfo = {0};
+    mp_get_buffer_raise(cmd_in, &bufinfo, MP_BUFFER_READ);
+    ssize_t len = tl_sys_hci_cmd_resp(HCI_OPCODE(ogf, ocf), bufinfo.buf, bufinfo.len);
+    if (len < 0) {
+        mp_raise_OSError(-len);
+    }
+    return mp_obj_new_bytes(ipcc_membuf_sys_cmd_buf, len);
+}
+MP_DEFINE_CONST_FUN_OBJ_3(rfcore_sys_hci_obj, rfcore_sys_hci);
+
 #endif // defined(STM32WB)
diff --git a/ports/stm32/rfcore.h b/ports/stm32/rfcore.h
index fbe111e1ebdcd..39f6220a32d26 100644
--- a/ports/stm32/rfcore.h
+++ b/ports/stm32/rfcore.h
@@ -35,4 +35,8 @@ void rfcore_ble_hci_cmd(size_t len, const uint8_t *src);
 void rfcore_ble_check_msg(int (*cb)(void *, const uint8_t *, size_t), void *env);
 void rfcore_ble_set_txpower(uint8_t level);
 
+MP_DECLARE_CONST_FUN_OBJ_0(rfcore_status_obj);
+MP_DECLARE_CONST_FUN_OBJ_1(rfcore_fw_version_obj);
+MP_DECLARE_CONST_FUN_OBJ_3(rfcore_sys_hci_obj);
+
 #endif // MICROPY_INCLUDED_STM32_RFCORE_H

From 222ec1a4a86cdcfa9546c30243e4e244bec9697f Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Tue, 29 Sep 2020 18:37:45 +1000
Subject: [PATCH 0337/3533] stm32/boards/NUCLEO_WB55: Add standalone WB55
 FUS/WS firmware updater.

This commit adds a script that can be run on-device to install FUS and WS
binaries from the filesystem.  Instructions for use are provided in
the rfcore_firmware.py file.

The commit also removes unneeded functionality from the existing rfcore.py
debug script (and renames it rfcore_debug.py).
---
 .../{rfcore.py => rfcore_debug.py}            | 119 +---
 .../boards/NUCLEO_WB55/rfcore_firmware.py     | 547 ++++++++++++++++++
 .../boards/NUCLEO_WB55/rfcore_makefirmware.py |  79 +++
 3 files changed, 630 insertions(+), 115 deletions(-)
 rename ports/stm32/boards/NUCLEO_WB55/{rfcore.py => rfcore_debug.py} (74%)
 create mode 100644 ports/stm32/boards/NUCLEO_WB55/rfcore_firmware.py
 create mode 100755 ports/stm32/boards/NUCLEO_WB55/rfcore_makefirmware.py

diff --git a/ports/stm32/boards/NUCLEO_WB55/rfcore.py b/ports/stm32/boards/NUCLEO_WB55/rfcore_debug.py
similarity index 74%
rename from ports/stm32/boards/NUCLEO_WB55/rfcore.py
rename to ports/stm32/boards/NUCLEO_WB55/rfcore_debug.py
index cfe315605e541..4dbead0acc63d 100644
--- a/ports/stm32/boards/NUCLEO_WB55/rfcore.py
+++ b/ports/stm32/boards/NUCLEO_WB55/rfcore_debug.py
@@ -27,85 +27,16 @@
 # mechanism in the WB55, and works with the memory layout configured in
 # ports/stm32/rfcore.c -- i.e. it expects that rfcore_init() has been run.
 
-# At this stage this is useful for debugging, but can be extended to support
-# FUS/WS firmware updates.
 # e.g.
 # ../../tools/pyboard.py --device /dev/ttyACM0 boards/NUCLEO_WB55/rfcore.py
 # to print out SRAM2A, register state and FUS/WS info.
+#
+# The `stm` module provides some helper functions to access rfcore functionality.
+# See rfcore_firmware.py for more information.
 
 from machine import mem8, mem16, mem32
-import time, struct
 import stm
 
-
-def addressof(buf):
-    assert type(buf) is bytearray
-    return mem32[id(buf) + 12]
-
-
-class Flash:
-    FLASH_KEY1 = 0x45670123
-    FLASH_KEY2 = 0xCDEF89AB
-
-    def wait_not_busy(self):
-        while mem32[stm.FLASH + stm.FLASH_SR] & 1 << 16:
-            machine.idle()
-
-    def unlock(self):
-        mem32[stm.FLASH + stm.FLASH_KEYR] = Flash.FLASH_KEY1
-        mem32[stm.FLASH + stm.FLASH_KEYR] = Flash.FLASH_KEY2
-
-    def lock(self):
-        mem32[stm.FLASH + stm.FLASH_CR] = 1 << 31  # LOCK
-
-    def erase_page(self, page):
-        print("erase", page)
-        assert 0 <= page <= 255  # 1MiB range (4k page)
-        self.wait_not_busy()
-        cr = page << 3 | 1 << 1  # PNB  # PER
-        mem32[stm.FLASH + stm.FLASH_CR] = cr
-        mem32[stm.FLASH + stm.FLASH_CR] = cr | 1 << 16  # STRT
-        self.wait_not_busy()
-        mem32[stm.FLASH + stm.FLASH_CR] = 0
-
-    def write(self, addr, buf):
-        assert len(buf) % 4 == 0
-        self.wait_not_busy()
-        cr = 1 << 0  # PG
-        mem32[stm.FLASH + stm.FLASH_CR] = cr
-        buf_addr = addressof(buf)
-        off = 0
-        while off < len(buf):
-            mem32[addr + off] = mem32[buf_addr + off]
-            off += 4
-            if off % 8 == 0:
-                self.wait_not_busy()
-        if off % 8:
-            mem32[addr + off] = 0
-            self.wait_not_busy()
-        mem32[stm.FLASH + stm.FLASH_CR] = 0
-
-
-def copy_file_to_flash(filename, addr):
-    flash = Flash()
-    flash.unlock()
-    try:
-        with open(filename, "rb") as f:
-            buf = bytearray(4096)
-            while 1:
-                sz = f.readinto(buf)
-                if sz == 0:
-                    break
-                print("write", hex(addr), sz)
-                flash.erase_page((addr - 0x08000000) // 4096)
-                print("done e")
-                flash.write(addr, buf)
-                print("done")
-                addr += 4096
-    finally:
-        flash.lock()
-
-
 SRAM2A_BASE = const(0x2003_0000)
 
 # for vendor OGF
@@ -205,49 +136,6 @@ def ipcc_init():
     print("BLE: 0x%08x 0x%08x 0x%08x" % (BLE_CMD_BUF, BLE_CS_BUF, BLE_EVT_QUEUE))
 
 
-def tl_list_init(addr):
-    mem32[addr] = addr  # next
-    mem32[addr + 4] = addr  # prev
-
-
-def tl_list_append(head, n):
-    sram2a_dump(1024)
-    print("Appending 0x%08x to 0x%08x" % (head, n))
-    # item->next = head
-    mem32[n] = head
-    # item->prev = head->prev
-    mem32[n + 4] = mem32[head + 4]
-    # head->prev->next = item
-    mem32[mem32[head + 4]] = n
-    # head->prev = item
-    mem32[head + 4] = n
-
-
-def tl_list_unlink(n):
-    # next = item->next
-    next = mem32[n]
-    # prev = item->prev
-    prev = mem32[n + 4]
-    # prev->next = item->next
-    mem32[prev] = next
-    # item->next->prev = prev
-    mem32[next + 4] = prev
-
-    return next
-
-
-def tl_list_dump(head):
-    print(
-        "list(%08x, %08x, %08x):" % (head, mem32[head] & 0xFFFFFFFF, mem32[head + 4] & 0xFFFFFFFF),
-        end="",
-    )
-    cur = mem32[head]
-    while cur != head:
-        print(" %08x" % (cur & 0xFFFFFFFF), end="")
-        cur = mem32[cur]
-    print()
-
-
 def fus_active():
     return get_ipcc_table_word(TABLE_DEVICE_INFO, 0) == MAGIC_FUS_ACTIVE
 
@@ -346,3 +234,4 @@ def ipcc_state():
 ipcc_init()
 info()
 dev_info()
+ipcc_state()
diff --git a/ports/stm32/boards/NUCLEO_WB55/rfcore_firmware.py b/ports/stm32/boards/NUCLEO_WB55/rfcore_firmware.py
new file mode 100644
index 0000000000000..53c96a552a34c
--- /dev/null
+++ b/ports/stm32/boards/NUCLEO_WB55/rfcore_firmware.py
@@ -0,0 +1,547 @@
+# This file is part of the MicroPython project, http://micropython.org/
+#
+# The MIT License (MIT)
+#
+# Copyright (c) 2020 Damien P. George
+# Copyright (c) 2020 Jim Mussared
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+# This script provides helpers for working with the FUS/WS firmware on the WB55.
+# It can be frozen into the MicroPython firmware (via manifest.py)
+#
+# The current FUS and WS firmware version and state can be queried via the
+# `stm` module, e.g.
+# stm.rfcore_status()  (returns the first word of the device info table)
+# stm.rfcore_fw_version(id)  (returns a 5-tuple indicating fw version; id is: 0=FUS, 1=WS)
+# stm.rfcore_sys_hci(ogf, ocf, cmd_buf)  (synchronously execute HCI command on SYS channel)
+#
+# To perform a firmware update:
+#
+# 1. Generate "obfuscated" binary images using rfcore_makefirmware.py
+#  ./boards/NUCLEO_WB55/rfcore_makefirmware.py ~/src/github.com/STMicroelectronics/STM32CubeWB/Projects/STM32WB_Copro_Wireless_Binaries/STM32WB5x/ /tmp
+#  This will generate /tmp/{fus_102,fus_110,ws_ble_hci}.bin
+#
+# 2. Copy required files to the device filesystem.
+# In general, it's always safe to copy all three files and the updater will
+# figure out what needs to be done. This is the recommended option.
+# However, if you already have the latest FUS (1.1.0) installed, then just the
+# WS firmware is required.
+# If a FUS binary is present, then the existing WS will be removed so it's a good
+# idea to always include the WS binary if updating FUS.
+# Note that a WS binary will not be installed unless FUS 1.1.0 is installed.
+#
+# 3. Ensure boot.py calls `rfcore_firmware.resume()`.
+# The WB55 will reset several times during the firmware update process, so this
+# script manages the update state using RTC backup registers.
+# `rfcore_firmware.resume()` will continue the update operation on startup to
+# resume any in-progress update operation, and either trigger another reset, or
+# return 0 to indicate that the operation completed successfully, or a reason
+# code (see REASON_* below) to indicate failure.
+#
+# 4. Call rfcore_firmware.check_for_updates() to start the update process.
+# The device will then immediately reboot and when the firmware update completes,
+# the status will be returned from rfcore_firmware.resume(). See the REASON_ codes below.
+# You can use the built-in stm.rfcore_fw_version() to query the installed version
+# from your application code.
+
+import struct, os
+import machine, stm
+from micropython import const
+
+_OGF_VENDOR = const(0x3F)
+
+_OCF_FUS_GET_STATE = const(0x52)
+_OCF_FUS_FW_UPGRADE = const(0x54)
+_OCF_FUS_FW_DELETE = const(0x55)
+_OCF_FUS_START_WS = const(0x5A)
+_OCF_BLE_INIT = const(0x66)
+
+_HCI_KIND_VENDOR_RESPONSE = const(0x11)
+
+
+# The firmware updater will search all of flash for the image to install, so
+# it's important that the file doesn't exist anywhere on the filesystem and
+# that the updater only finds the version that we copy into the reserved area.
+# Otherwise it will find matching headers/footers in the flash filesystem and
+# get confused leading to either "FUS_STATE_IMG_NOT_AUTHENTIC" or (worse)
+# corrupting the FUS.
+# See footnote [1] referenced by Table 9 in AN5185 - Rev 4 -- the address
+# passed to FUS_FW_UPGRADE is ignored (implying that it must be searching the
+# flash). This requires that the firmware files have been pre-processed by
+# rfcore_makefirmware.py and this key must match the one there.
+_OBFUSCATION_KEY = const(0x0573B55AA)
+
+# On boards using the internal flash filesystem, this must match the
+# `_flash_fs_end` symbol defined by the linker script (boards/stm32wb55xg.ld).
+# We erase everything from here until the start of the secure area (defined by
+# SFSA) just to ensure that no other fragments of firmware files are left
+# behind. On boards with external flash, this just needs to ensure that it
+# includes any regions that may contain partial firmware data.
+# This is non-const so it can be override.
+STAGING_AREA_START = 0x80C0000
+
+# First word of device info table indicating FUS state (returned by `stm.rfcore_status()`).
+_MAGIC_FUS_ACTIVE = const(0xA94656B9)  # AN5185
+_MAGIC_IPCC_MEM_INCORRECT = const(0x3DE96F61)  # # AN5185
+
+# Argument to `stm.rfcore_fw_version()`.
+_FW_VERSION_FUS = const(0)
+_FW_VERSION_WS = const(1)
+
+# No firmware update in progress. Boot normally.
+_STATE_IDLE = const(0)
+
+# A previous firmware update failed. Will return reason code from resume().
+_STATE_FAILED = const(1)
+
+# Trying to get into the FUS. Keep issuing GET_STATE until the FUS is active.
+_STATE_WAITING_FOR_FUS = const(2)
+
+# Trying to get into the WS. Keep issuing START_WS until the WS is active (or fails).
+_STATE_WAITING_FOR_WS = const(3)
+
+# FW_DELETE has been issued. Waiting for the WS version to report zero.
+_STATE_DELETING_WS = const(4)
+
+# Flash copy has started for FUS/WS. If a reboot occurs, then fail.
+_STATE_COPYING_FUS = const(5)
+_STATE_COPYING_WS = const(6)
+
+# Flash write fully completed, ready for install.
+_STATE_COPIED_FUS = const(7)
+_STATE_COPIED_WS = const(8)
+
+# Check for next update to perform.
+# Either we've just gotten into the FUS, or the first update in a sequence
+# has completed. (e.g. FUS done, now do WS).
+_STATE_CHECK_UPDATES = const(9)
+
+# Installation has started, keep polling GET_STATE.
+_STATE_INSTALLING_WS = const(10)
+_STATE_INSTALLING_FUS = const(11)
+
+# Update completed successfully.
+REASON_OK = const(0)
+# The device reset during flash copy. Possibly WS still installed.
+REASON_FLASH_COPY_FAILED = const(1)
+# Unable to start the WS after firmware update.
+REASON_NO_WS = const(2)
+# Copying FUS image to staging area caused FUS to fail.
+REASON_FLASH_FUS_BAD_STATE = const(3)
+# Copying WS image to staging area caused FUS to fail.
+REASON_FLASH_WS_BAD_STATE = const(4)
+# Cannot get into the FUS. Perhaps rfcore misconfigured.
+REASON_FUS_NOT_RESPONDING = const(5)
+# After a FUS install, unable to get back to the FUS.
+REASON_FUS_NOT_RESPONDING_AFTER_FUS = const(6)
+# After a WS install, unable to get back to the FUS.
+REASON_FUS_NOT_RESPONDING_AFTER_WS = const(7)
+# Unable to query rfcore version/active.
+REASON_RFCORE_NOT_CONFIGURED = const(8)
+# The WS deletion didn't have any effect.
+REASON_WS_STILL_PRESENT = const(9)
+# FUS refused to delete the WS.
+REASON_WS_DELETION_FAILED = const(10)
+# FUS returned a specific code for a FUS update.
+# See AN5185 Rev 4, Table 12. Reason between 0x00-0x11 will be added.
+REASON_FUS_VENDOR = const(0x10)
+# FUS returned a specific code for a WS update. Values as for the FUS update.
+REASON_WS_VENDOR = const(0x30)
+
+# FUS 1.0.2 must be installed before FUS 1.1.0 can be installed.
+# A factory Nucleo board has FUS (0, 5, 3, 0, 0) and WS (0, 5, 1, 0, 0).
+_FUS_VERSION_102 = (1, 0, 2, 0, 0)
+_FUS_VERSION_110 = (1, 1, 0, 0, 0)
+_PATH_FUS_102 = "fus_102.bin"
+_PATH_FUS_110 = "fus_110.bin"
+_PATH_WS_BLE_HCI = "ws_ble_hci.bin"
+
+# This address is correct for versions up to v1.8 (assuming existing firmware deleted).
+# Note any address from the end of the filesystem to the SFSA would be fine, but if
+# the FUS is fixed in the future to use the specified address then these are the "correct"
+# ones.
+_ADDR_FUS = 0x080EC000
+_ADDR_WS_BLE_HCI = 0x080DC000
+
+
+def log(msg, *args, **kwargs):
+    print("[rfcore update]", msg.format(*args, **kwargs))
+
+
+class _Flash:
+    _FLASH_KEY1 = 0x45670123
+    _FLASH_KEY2 = 0xCDEF89AB
+
+    def wait_not_busy(self):
+        while machine.mem32[stm.FLASH + stm.FLASH_SR] & 1 << 16:
+            machine.idle()
+
+    def unlock(self):
+        machine.mem32[stm.FLASH + stm.FLASH_KEYR] = _Flash._FLASH_KEY1
+        machine.mem32[stm.FLASH + stm.FLASH_KEYR] = _Flash._FLASH_KEY2
+
+    def lock(self):
+        machine.mem32[stm.FLASH + stm.FLASH_CR] = 1 << 31  # LOCK
+
+    def erase_page(self, page):
+        assert 0 <= page <= 255  # 1MiB range (4k page)
+        self.wait_not_busy()
+        cr = page << 3 | 1 << 1  # PNB  # PER
+        machine.mem32[stm.FLASH + stm.FLASH_CR] = cr
+        machine.mem32[stm.FLASH + stm.FLASH_CR] = cr | 1 << 16  # STRT
+        self.wait_not_busy()
+        machine.mem32[stm.FLASH + stm.FLASH_CR] = 0
+
+    def write(self, addr, buf, sz, key=0):
+        assert sz % 4 == 0
+        self.wait_not_busy()
+        cr = 1 << 0  # PG
+        machine.mem32[stm.FLASH + stm.FLASH_CR] = cr
+        off = 0
+        while off < sz:
+            v = (buf[off]) | (buf[off + 1] << 8) | (buf[off + 2] << 16) | (buf[off + 3] << 24)
+            machine.mem32[addr + off] = v ^ key
+            off += 4
+            if off % 8 == 0:
+                self.wait_not_busy()
+        if off % 8:
+            machine.mem32[addr + off] = 0
+            self.wait_not_busy()
+        machine.mem32[stm.FLASH + stm.FLASH_CR] = 0
+
+
+def _copy_file_to_flash(filename, addr):
+    flash = _Flash()
+    flash.unlock()
+    try:
+        # Erase the entire staging area in flash.
+        erase_addr = STAGING_AREA_START
+        sfr_sfsa = machine.mem32[stm.FLASH + stm.FLASH_SFR] & 0xFF
+        erase_limit = 0x08000000 + sfr_sfsa * 4096
+        while erase_addr < erase_limit:
+            flash.erase_page((erase_addr - 0x08000000) // 4096)
+            erase_addr += 4096
+
+        # Write the contents of the firmware (note flash.write will apply the
+        # XOR de-obfuscation).
+        with open(filename, "rb") as f:
+            buf = bytearray(4096)
+
+            while 1:
+                sz = f.readinto(buf)
+                if sz == 0:
+                    break
+                flash.write(addr, buf, sz, _OBFUSCATION_KEY)
+                addr += 4096
+
+    finally:
+        flash.lock()
+
+
+def _parse_vendor_response(data):
+    assert len(data) >= 7
+    assert data[0] == _HCI_KIND_VENDOR_RESPONSE
+    assert data[1] == 0x0E
+    # assert data[3] == 0xff # "Num HCI" -- docs say 0xff, but we see 0x01
+    op = (data[5] << 8) | data[4]
+    return (op >> 10, op & 0x3FF, data[6], data[7] if len(data) > 7 else 0)
+
+
+def _run_sys_hci_cmd(ogf, ocf, buf=b""):
+    try:
+        ogf_out, ocf_out, status, result = _parse_vendor_response(
+            stm.rfcore_sys_hci(ogf, ocf, buf)
+        )
+    except OSError:
+        # Timeout or FUS not active.
+        return (0xFF, 0xFF)
+    assert ogf_out == ogf
+    assert ocf_out == ocf
+    return (status, result)
+
+
+def fus_get_state():
+    return _run_sys_hci_cmd(_OGF_VENDOR, _OCF_FUS_GET_STATE)
+
+
+def fus_is_idle():
+    return fus_get_state() == (0, 0)
+
+
+def fus_start_ws():
+    return _run_sys_hci_cmd(_OGF_VENDOR, _OCF_FUS_START_WS)
+
+
+def _fus_fwdelete():
+    return _run_sys_hci_cmd(_OGF_VENDOR, _OCF_FUS_FW_DELETE)
+
+
+def _fus_run_fwupgrade(addr):
+    # Note: Address is ignored by the FUS (see comments above).
+    return _run_sys_hci_cmd(_OGF_VENDOR, _OCF_FUS_FW_UPGRADE, struct.pack("<I", addr))
+
+
+# Get/set current state/reason to RTC Backup Domain.
+# Using the second- and third-last registers (17, 18) as the final one (19)
+# is reserved by powerctrl.c for restoring the frequency.
+# Can be overridden if necessary.
+REG_RTC_STATE = stm.RTC + stm.RTC_BKP18R
+REG_RTC_REASON = stm.RTC + stm.RTC_BKP17R
+
+
+def _read_state():
+    return machine.mem32[REG_RTC_STATE]
+
+
+def _write_state(state):
+    machine.mem32[REG_RTC_STATE] = state
+
+
+def _read_failure_reason():
+    return machine.mem32[REG_RTC_REASON]
+
+
+def _write_failure_state(reason):
+    machine.mem32[REG_RTC_REASON] = reason
+    _write_state(_STATE_FAILED)
+    return reason
+
+
+# Check for the presence of a given file and attempt to start installing it.
+def _stat_and_start_copy(path, addr, copying_state, copied_state):
+    try:
+        os.stat(path)
+    except OSError:
+        log("{} not found", path)
+        return False
+
+    log("{} update is available", path)
+    if sum(stm.rfcore_fw_version(_FW_VERSION_WS)):
+        # There was some WS firmware already installed. Need to remove that
+        # before copying to flash (both FUS or WS copy require this).
+        log("Removing existing WS firmware")
+        _write_state(_STATE_DELETING_WS)
+        _fus_fwdelete()
+    else:
+        log("Copying {} to flash", path)
+        # Mark that the flash write has started. Any failure should result in an overall failure.
+        _write_state(copying_state)  # Either _STATE_COPYING_FUS or _STATE_COPYING_WS
+        _copy_file_to_flash(path, addr)
+        log("Copying complete")
+        # The entire write has completed successfully, start the install.
+        _write_state(copied_state)  # Either _STATE_COPIED_FUS or _STATE_COPIED_WS
+
+    return True
+
+
+# This should be called in boot.py to resume any in-progress update.
+# If there's nothing to do, it will return 0 and the app can continue as normal.
+# If a previous update has failed, then it will return the failure reason.
+# Otherwise it will attempt to continue the update from where it left off.
+def resume():
+    log("Checking firmware update progress...")
+
+    if stm.rfcore_status() == _MAGIC_IPCC_MEM_INCORRECT:
+        return _write_failure_state(REASON_RFCORE_NOT_CONFIGURED)
+
+    while True:
+        _STATE_id = _read_state()
+
+        if _STATE_id == _STATE_IDLE:
+            log("Firmware update complete")
+            return 0
+
+        elif _STATE_id == _STATE_FAILED:
+            log("Firmware update failed")
+            return _read_failure_reason()
+
+        # Keep calling GET_STATE until error or FUS.
+        elif _STATE_id == _STATE_WAITING_FOR_FUS:
+            log("Querying FUS state")
+            status, result = fus_get_state()
+            log("FUS state: {} {}", status, result)
+
+            if status == 0xFF and result == 0xFF:
+                _write_failure_state(REASON_FUS_NOT_RESPONDING)
+            elif status != 0:
+                log("Operation in progress. Re-querying FUS state")
+            elif stm.rfcore_status() == _MAGIC_FUS_ACTIVE:
+                log("FUS active")
+                _write_state(_STATE_CHECK_UPDATES)
+
+        # Keep trying to start the WS until !fus_active() (or error).
+        elif _STATE_id == _STATE_WAITING_FOR_WS:
+            if stm.rfcore_status() != _MAGIC_FUS_ACTIVE:
+                log("WS active")
+                _write_state(_STATE_IDLE)
+                # Need to force a reset otherwise BLE will fail if FUS has changed.
+                machine.reset()
+            else:
+                log("Starting WS")
+                status, result = fus_start_ws()
+                if status != 0:
+                    log("Can't start WS")
+                    log("WS version: {}", stm.rfcore_fw_version(_FW_VERSION_WS))
+                    _write_failure_state(REASON_NO_WS)
+
+        # Sequence the FUS 1.0.2 -> FUS 1.1.0 -> WS (depending on what's available).
+        elif _STATE_id == _STATE_CHECK_UPDATES:
+            log("Checking for updates")
+            fus_version = stm.rfcore_fw_version(_FW_VERSION_FUS)
+            log("FUS version {}", fus_version)
+            if fus_version < _FUS_VERSION_102:
+                log("Factory FUS detected")
+                if _stat_and_start_copy(
+                    _PATH_FUS_102, _ADDR_FUS, _STATE_COPYING_FUS, _STATE_COPIED_FUS
+                ):
+                    continue
+            elif fus_version >= _FUS_VERSION_102 and fus_version < _FUS_VERSION_110:
+                log("FUS 1.0.2 detected")
+                if _stat_and_start_copy(
+                    _PATH_FUS_110, _ADDR_FUS, _STATE_COPYING_FUS, _STATE_COPIED_FUS
+                ):
+                    continue
+            else:
+                log("FUS is up-to-date")
+
+            if fus_version >= _FUS_VERSION_110:
+                if _stat_and_start_copy(
+                    _PATH_WS_BLE_HCI, _ADDR_WS_BLE_HCI, _STATE_COPYING_WS, _STATE_COPIED_WS
+                ):
+                    continue
+                else:
+                    log("No WS updates available")
+            else:
+                # Don't attempt to install WS if we're running an old FUS.
+                log("Need latest FUS to install WS")
+
+            # Attempt to go back to WS.
+            # Either this will fail (because WS was removed due to FUS install), or
+            # this whole thing was a no-op and we should be fine to restart WS.
+            _write_state(_STATE_WAITING_FOR_WS)
+
+        # This shouldn't happen - the flash write should always complete and
+        # move straight onto the COPIED state. Failure here indicates that
+        # the rfcore is misconfigured or the WS firmware was not deleted first.
+        elif _STATE_id == _STATE_COPYING_FUS or _STATE_id == _STATE_COPYING_WS:
+            log("Flash copy failed mid-write")
+            _write_failure_state(REASON_FLASH_COPY_FAILED)
+
+        # Flash write completed, we should immediately see GET_STATE return 0,0
+        # so we can start the FUS install.
+        elif _STATE_id == _STATE_COPIED_FUS:
+            if fus_is_idle():
+                log("FUS copy complete, installing")
+                _write_state(_STATE_INSTALLING_FUS)
+                _fus_run_fwupgrade(_ADDR_FUS)
+            else:
+                log("FUS copy bad state")
+                _write_failure_state(REASON_FLASH_FUS_BAD_STATE)
+
+        # Keep polling the state until we see a 0,0 (success) or non-transient
+        # error. In general we should expect to see (16,0) several times,
+        # followed by a (255,0), followed by (0, 0).
+        elif _STATE_id == _STATE_INSTALLING_FUS:
+            log("Installing FUS...")
+            status, result = fus_get_state()
+            log("FUS state: {} {}", status, result)
+            if 0x20 <= status <= 0x2F and result == 0:
+                # FUS_STATE_FUS_UPGRD_ONGOING
+                log("FUS still in progress...")
+            elif 0x10 <= status <= 0x1F and result == 0x11:
+                # FUS_STATE_FW_UPGRD_ONGOING and FUS_FW_ROLLBACK_ERROR
+                # Confusingly this is a "FW_UPGRD" (0x10) not "FUS_UPRD" (0x20).
+                log("Attempted to install same FUS version... re-querying FUS state to resume.")
+            elif status == 0:
+                log("FUS update successful")
+                _write_state(_STATE_CHECK_UPDATES)
+                # Need to force a reset after FUS install otherwise a subsequent flash copy will fail.
+                machine.reset()
+            elif result == 0:
+                # See below (for equivalent path for WS install -- we
+                # sometimes see (255,0) right at the end).
+                log("Re-querying FUS state...")
+            elif result == 0xFF:
+                _write_failure_state(REASON_FUS_NOT_RESPONDING_AFTER_FUS)
+            else:
+                _write_failure_state(REASON_FUS_VENDOR + result)
+
+        # Keep polling the state until we see 0,0 or failure (1,0). Any other
+        # result means retry (but the docs say that 0 and 1 are the only
+        # status values).
+        elif _STATE_id == _STATE_DELETING_WS:
+            log("Deleting WS...")
+            status, result = fus_get_state()
+            log("FUS state: {} {}", status, result)
+            if status == 0:
+                if sum(stm.rfcore_fw_version(_FW_VERSION_WS)) == 0:
+                    log("WS deletion complete")
+                    _write_state(_STATE_CHECK_UPDATES)
+                else:
+                    log("WS deletion no effect")
+                    _write_failure_state(REASON_WS_STILL_PRESENT)
+            elif status == 1:
+                log("WS deletion failed")
+                _write_failure_state(REASON_WS_DELETION_FAILED)
+
+        # As for _STATE_COPIED_FUS above. We should immediately see 0,0.
+        elif _STATE_id == _STATE_COPIED_WS:
+            if fus_is_idle():
+                log("WS copy complete, installing")
+                _write_state(_STATE_INSTALLING_WS)
+                _fus_run_fwupgrade(_ADDR_WS_BLE_HCI)
+            else:
+                log("WS copy bad state")
+                _write_failure_state(REASON_FLASH_WS_BAD_STATE)
+
+        # As for _STATE_INSTALLING_FUS above.
+        elif _STATE_id == _STATE_INSTALLING_WS:
+            log("Installing WS...")
+            status, result = fus_get_state()
+            log("FUS state: {} {}", status, result)
+            if 0x10 <= status <= 0x1F and result == 0:
+                # FUS_STATE_FW_UPGRD_ONGOING
+                log("WS still in progress...")
+            elif 0x10 <= status <= 0x1F and result == 0x11:
+                # FUS_FW_ROLLBACK_ERROR
+                log("Attempted to install same WS version... re-querying FUS state to resume.")
+            elif status == 0:
+                log("WS update successful")
+                _write_state(_STATE_WAITING_FOR_WS)
+            elif result == 0:
+                # We get a error response with no payload sometimes at the end
+                # of the update (this is not in AN5185). Re-try the GET_STATE.
+                # The same thing happens transitioning from WS to FUS mode.
+                # The actual HCI response has no payload, the result=0 comes from
+                # _parse_vendor_response above when len=7.
+                log("Re-querying FUS state...")
+            elif result == 0xFF:
+                # This is specifically a failure sending the HCI command.
+                _write_failure_state(REASON_FUS_NOT_RESPONDING_AFTER_WS)
+            else:
+                _write_failure_state(REASON_WS_VENDOR + result)
+
+
+# Start a firmware update.
+# This will immediately trigger a reset and start the update process on boot.
+def check_for_updates():
+    log("Starting firmware update")
+    _write_state(_STATE_WAITING_FOR_FUS)
+    machine.reset()
diff --git a/ports/stm32/boards/NUCLEO_WB55/rfcore_makefirmware.py b/ports/stm32/boards/NUCLEO_WB55/rfcore_makefirmware.py
new file mode 100755
index 0000000000000..23f3d20f0c9ce
--- /dev/null
+++ b/ports/stm32/boards/NUCLEO_WB55/rfcore_makefirmware.py
@@ -0,0 +1,79 @@
+#!/usr/bin/env python3
+#
+# This file is part of the MicroPython project, http://micropython.org/
+#
+# The MIT License (MIT)
+#
+# Copyright (c) 2020 Jim Mussared
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+# This script obfuscates the ST wireless binaries so they can be safely copied
+# to the flash filesystem and not be accidentally discovered by the FUS during
+# an update. See more information (and the corresponding de-obfuscation) in
+# rfcore_firmware.py as well as instructions on how to use.
+
+import os
+import struct
+import sys
+
+# Must match rfcore_firmware.py.
+_OBFUSCATION_KEY = 0x0573B55AA
+
+_FIRMWARE_FILES = {
+    "stm32wb5x_FUS_fw_1_0_2.bin": "fus_102.bin",
+    "stm32wb5x_FUS_fw.bin": "fus_110.bin",
+    "stm32wb5x_BLE_HCILayer_fw.bin": "ws_ble_hci.bin",
+}
+
+
+def main(src_path, dest_path):
+    for src_file, dest_file in _FIRMWARE_FILES.items():
+        src_file = os.path.join(src_path, src_file)
+        dest_file = os.path.join(dest_path, dest_file)
+        if not os.path.exists(src_file):
+            print("Unable to find: {}".format(src_file))
+            continue
+        sz = 0
+        with open(src_file, "rb") as src:
+            with open(dest_file, "wb") as dest:
+                while True:
+                    b = src.read(4)
+                    if not b:
+                        break
+                    (v,) = struct.unpack("<I", b)
+                    v ^= _OBFUSCATION_KEY
+                    dest.write(struct.pack("<I", v))
+                    sz += 4
+        print("Written {} ({} bytes)".format(dest_file, sz))
+
+
+if __name__ == "__main__":
+    if len(sys.argv) != 3:
+        print("Usage: {} src_path dest_path".format(sys.argv[0]))
+        print()
+        print(
+            '"src_path" should be the location of the ST binaries from https://github.com/STMicroelectronics/STM32CubeWB/tree/master/Projects/STM32WB_Copro_Wireless_Binaries/STM32WB5x'
+        )
+        print(
+            '"dest_path" will be where fus_102.bin, fus_110.bin, and ws_ble_hci.bin will be written to.'
+        )
+        sys.exit(1)
+
+    main(sys.argv[1], sys.argv[2])

From fa12bfc227be47a10314576f02ee9d9cb2c1d67c Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Fri, 9 Oct 2020 16:51:47 +1100
Subject: [PATCH 0338/3533] stm32/rfcore: Update to support WS=1.9.0.0.4.

This WS update to 1.9.0.0.4 broke the workaround used in rfcore for
OCF_CB_SET_EVENT_MASK2, so fix it to support WS 1.8 and 1.9.
---
 ports/stm32/rfcore.c | 45 +++++++++++++++++++++++++++++++-------------
 1 file changed, 32 insertions(+), 13 deletions(-)

diff --git a/ports/stm32/rfcore.c b/ports/stm32/rfcore.c
index 436042cc2ecc6..3850a17dae642 100644
--- a/ports/stm32/rfcore.c
+++ b/ports/stm32/rfcore.c
@@ -66,6 +66,7 @@
 #define HCI_KIND_VENDOR_EVENT (0x12)
 
 #define HCI_EVENT_COMMAND_COMPLETE     (0x0E) // <num packets><opcode 16><status><data...>
+#define HCI_EVENT_COMMAND_STATUS       (0x0F) // <status><num_packets><opcode 16>
 
 // There can be quite long delays during firmware update.
 #define SYS_ACK_TIMEOUT_MS (1000)
@@ -275,9 +276,19 @@ void ipcc_init(uint32_t irq_pri) {
 /******************************************************************************/
 // Transport layer HCI interface
 
+// The WS firmware doesn't support OCF_CB_SET_EVENT_MASK2, and fails with:
+//  v1.8.0.0.4 (and below): HCI_EVENT_COMMAND_COMPLETE with a non-zero status
+//  v1.9.0.0.4 (and above): HCI_EVENT_COMMAND_STATUS with a non-zero status
+// In either case we detect the failure response and inject this response
+// instead (which is HCI_EVENT_COMMAND_COMPLETE for OCF_CB_SET_EVENT_MASK2
+// with status=0).
+STATIC const uint8_t set_event_event_mask2_fix_payload[] = { 0x04, 0x0e, 0x04, 0x01, 0x63, 0x0c, 0x00 };
+
 STATIC size_t tl_parse_hci_msg(const uint8_t *buf, parse_hci_info_t *parse) {
     const char *info;
-    bool applied_set_event_event_mask2_fix = false;
+    #if HCI_TRACE
+    int applied_set_event_event_mask2_fix = 0;
+    #endif
     size_t len;
     switch (buf[0]) {
         case HCI_KIND_BT_ACL: {
@@ -300,10 +311,12 @@ STATIC size_t tl_parse_hci_msg(const uint8_t *buf, parse_hci_info_t *parse) {
                     uint8_t status = buf[6];
 
                     if (opcode == HCI_OPCODE(OGF_CTLR_BASEBAND, OCF_CB_SET_EVENT_MASK2) && status != 0) {
-                        // The WB doesn't support this command (despite being in CS 4.1), so pretend like
-                        // it succeeded by replacing the final byte (status) with a zero.
-                        applied_set_event_event_mask2_fix = true;
-                        len -= 1;
+                        // For WS firmware v1.8.0.0.4 and below. Reply with the "everything OK" payload.
+                        parse->cb_fun(parse->cb_env, set_event_event_mask2_fix_payload, sizeof(set_event_event_mask2_fix_payload));
+                        #if HCI_TRACE
+                        applied_set_event_event_mask2_fix = 18;
+                        #endif
+                        break; // Don't send the original payload.
                     }
 
                     if (opcode == HCI_OPCODE(OGF_CTLR_BASEBAND, OCF_CB_RESET) && status == 0) {
@@ -313,15 +326,21 @@ STATIC size_t tl_parse_hci_msg(const uint8_t *buf, parse_hci_info_t *parse) {
                     }
                 }
 
-                parse->cb_fun(parse->cb_env, buf, len);
+                if (buf[1] == HCI_EVENT_COMMAND_STATUS && len == 7) {
+                    uint16_t opcode = (buf[6] << 8) | buf[5];
+                    uint8_t status = buf[3];
 
-                if (applied_set_event_event_mask2_fix) {
-                    // Inject the zero status.
-                    uint8_t data = 0;
-                    parse->cb_fun(parse->cb_env, &data, 1);
-                    // Restore the length for the HCI tracing below.
-                    len += 1;
+                    if (opcode == HCI_OPCODE(OGF_CTLR_BASEBAND, OCF_CB_SET_EVENT_MASK2) && status != 0) {
+                        // For WS firmware v1.9.0.0.4 and higher. Reply with the "everything OK" payload.
+                        parse->cb_fun(parse->cb_env, set_event_event_mask2_fix_payload, sizeof(set_event_event_mask2_fix_payload));
+                        #if HCI_TRACE
+                        applied_set_event_event_mask2_fix = 19;
+                        #endif
+                        break;  // Don't send the original payload.
+                    }
                 }
+
+                parse->cb_fun(parse->cb_env, buf, len);
             }
             break;
         }
@@ -356,7 +375,7 @@ STATIC size_t tl_parse_hci_msg(const uint8_t *buf, parse_hci_info_t *parse) {
         printf(" (reset)");
     }
     if (applied_set_event_event_mask2_fix) {
-        printf(" (mask2 fix)");
+        printf(" (mask2 fix %d)", applied_set_event_event_mask2_fix);
     }
     printf("\n");
 

From 880875bea1d825b8fa0d1c4a779ff767377f7655 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Fri, 9 Oct 2020 17:10:29 +1100
Subject: [PATCH 0339/3533] py/objdict: Add mp_const_empty_dict_obj, use it for
 mp_const_empty_map.

---
 py/map.c     | 11 -----------
 py/obj.h     |  9 ++++++---
 py/objdict.c | 12 ++++++++++++
 3 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/py/map.c b/py/map.c
index 676c364da76a1..54f4b0204b87f 100644
--- a/py/map.c
+++ b/py/map.c
@@ -40,17 +40,6 @@
 #define DEBUG_printf(...) (void)0
 #endif
 
-// Fixed empty map. Useful when need to call kw-receiving functions
-// without any keywords from C, etc.
-const mp_map_t mp_const_empty_map = {
-    .all_keys_are_qstrs = 0,
-    .is_fixed = 1,
-    .is_ordered = 1,
-    .used = 0,
-    .alloc = 0,
-    .table = NULL,
-};
-
 // This table of sizes is used to control the growth of hash tables.
 // The first set of sizes are chosen so the allocation fits exactly in a
 // 4-word GC block, and it's not so important for these small values to be
diff --git a/py/obj.h b/py/obj.h
index 31542a7f9bd7c..6a040b77739c2 100644
--- a/py/obj.h
+++ b/py/obj.h
@@ -422,8 +422,6 @@ typedef enum _mp_map_lookup_kind_t {
     MP_MAP_LOOKUP_ADD_IF_NOT_FOUND_OR_REMOVE_IF_FOUND = 3, // only valid for mp_set_lookup
 } mp_map_lookup_kind_t;
 
-extern const mp_map_t mp_const_empty_map;
-
 static inline bool mp_map_slot_is_filled(const mp_map_t *map, size_t pos) {
     assert(pos < map->alloc);
     return (map)->table[pos].key != MP_OBJ_NULL && (map)->table[pos].key != MP_OBJ_SENTINEL;
@@ -685,17 +683,22 @@ extern const struct _mp_obj_bool_t mp_const_false_obj;
 extern const struct _mp_obj_bool_t mp_const_true_obj;
 #endif
 
-// Constant objects, globally accessible: b'', (), Ellipsis, NotImplemented, GeneratorExit()
+// Constant objects, globally accessible: b'', (), {}, Ellipsis, NotImplemented, GeneratorExit()
 // The below macros are for convenience only.
 #define mp_const_empty_bytes (MP_OBJ_FROM_PTR(&mp_const_empty_bytes_obj))
 #define mp_const_empty_tuple (MP_OBJ_FROM_PTR(&mp_const_empty_tuple_obj))
 #define mp_const_notimplemented (MP_OBJ_FROM_PTR(&mp_const_notimplemented_obj))
 extern const struct _mp_obj_str_t mp_const_empty_bytes_obj;
 extern const struct _mp_obj_tuple_t mp_const_empty_tuple_obj;
+extern const struct _mp_obj_dict_t mp_const_empty_dict_obj;
 extern const struct _mp_obj_singleton_t mp_const_ellipsis_obj;
 extern const struct _mp_obj_singleton_t mp_const_notimplemented_obj;
 extern const struct _mp_obj_exception_t mp_const_GeneratorExit_obj;
 
+// Fixed empty map. Useful when calling keyword-receiving functions
+// without any keywords from C, etc.
+#define mp_const_empty_map (mp_const_empty_dict_obj.map)
+
 // General API for objects
 
 // These macros are derived from more primitive ones and are used to
diff --git a/py/objdict.c b/py/objdict.c
index 4fa59f4634cb0..4e51f259e7ff4 100644
--- a/py/objdict.c
+++ b/py/objdict.c
@@ -33,6 +33,18 @@
 #include "py/objtype.h"
 #include "py/objstr.h"
 
+const mp_obj_dict_t mp_const_empty_dict_obj = {
+    .base = { .type = &mp_type_dict },
+    .map = {
+        .all_keys_are_qstrs = 0,
+        .is_fixed = 1,
+        .is_ordered = 1,
+        .used = 0,
+        .alloc = 0,
+        .table = NULL,
+    }
+};
+
 STATIC mp_obj_t dict_update(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs);
 
 // This is a helper function to iterate through a dictionary.  The state of

From b137d064e9e0bfebd2a59a9b312935031252e742 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Tue, 4 Aug 2020 14:28:06 +1000
Subject: [PATCH 0340/3533] py/objtype: Handle __dict__ attribute when type has
 no locals.

---
 py/objtype.c               | 9 ++++++---
 tests/basics/class_dict.py | 5 +++++
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/py/objtype.c b/py/objtype.c
index 40900dc050358..7f75232941046 100644
--- a/py/objtype.c
+++ b/py/objtype.c
@@ -1014,13 +1014,16 @@ STATIC void type_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
         if (attr == MP_QSTR___dict__) {
             // Returns a read-only dict of the class attributes.
             // If the internal locals is not fixed, a copy will be created.
-            mp_obj_dict_t *dict = self->locals_dict;
+            const mp_obj_dict_t *dict = self->locals_dict;
+            if (!dict) {
+                dict = &mp_const_empty_dict_obj;
+            }
             if (dict->map.is_fixed) {
                 dest[0] = MP_OBJ_FROM_PTR(dict);
             } else {
                 dest[0] = mp_obj_dict_copy(MP_OBJ_FROM_PTR(dict));
-                dict = MP_OBJ_TO_PTR(dest[0]);
-                dict->map.is_fixed = 1;
+                mp_obj_dict_t *dict_copy = MP_OBJ_TO_PTR(dest[0]);
+                dict_copy->map.is_fixed = 1;
             }
             return;
         }
diff --git a/tests/basics/class_dict.py b/tests/basics/class_dict.py
index f80ded678b0f8..508ae5e2e543e 100644
--- a/tests/basics/class_dict.py
+++ b/tests/basics/class_dict.py
@@ -17,3 +17,8 @@ class Foo:
 
 d = Foo.__dict__
 print(d["a"], d["b"])
+
+
+# dict of a class that has no locals_dict (return empty dict).
+d = type(type('')).__dict__
+print(d is not None)

From 520bb88d70893287b2c2728259cd020ddc710eaf Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Thu, 15 Oct 2020 20:09:04 +1100
Subject: [PATCH 0341/3533] stm32/boards/NUCLEO_WB55/rfcore_firmware.py: Fix
 flash unlock.

The flash can sometimes be in an already-unlocked state, and attempting to
unlock it again will cause an immediate reset.  So make _Flash.unlock()
check FLASH_CR_LOCK to get the current state.

Also fix some magic numbers for FLASH_CR_LOCK AND FLASH_CR_STRT.

The machine.reset() could be removed because it no longer crashes now that
the flash unlock is fixed.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 .../boards/NUCLEO_WB55/rfcore_firmware.py     | 20 ++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/ports/stm32/boards/NUCLEO_WB55/rfcore_firmware.py b/ports/stm32/boards/NUCLEO_WB55/rfcore_firmware.py
index 53c96a552a34c..de98d97430445 100644
--- a/ports/stm32/boards/NUCLEO_WB55/rfcore_firmware.py
+++ b/ports/stm32/boards/NUCLEO_WB55/rfcore_firmware.py
@@ -189,23 +189,31 @@ class _Flash:
     _FLASH_KEY1 = 0x45670123
     _FLASH_KEY2 = 0xCDEF89AB
 
+    _FLASH_CR_STRT_MASK = 1 << 16
+    _FLASH_CR_LOCK_MASK = 1 << 31
+    _FLASH_SR_BSY_MASK = 1 << 16
+
     def wait_not_busy(self):
-        while machine.mem32[stm.FLASH + stm.FLASH_SR] & 1 << 16:
+        while machine.mem32[stm.FLASH + stm.FLASH_SR] & _Flash._FLASH_SR_BSY_MASK:
             machine.idle()
 
     def unlock(self):
-        machine.mem32[stm.FLASH + stm.FLASH_KEYR] = _Flash._FLASH_KEY1
-        machine.mem32[stm.FLASH + stm.FLASH_KEYR] = _Flash._FLASH_KEY2
+        if machine.mem32[stm.FLASH + stm.FLASH_CR] & _Flash._FLASH_CR_LOCK_MASK:
+            # Only unlock if already locked (i.e. FLASH_CR_LOCK is set).
+            machine.mem32[stm.FLASH + stm.FLASH_KEYR] = _Flash._FLASH_KEY1
+            machine.mem32[stm.FLASH + stm.FLASH_KEYR] = _Flash._FLASH_KEY2
+        else:
+            log("Flash was already unlocked.")
 
     def lock(self):
-        machine.mem32[stm.FLASH + stm.FLASH_CR] = 1 << 31  # LOCK
+        machine.mem32[stm.FLASH + stm.FLASH_CR] = _Flash._FLASH_CR_LOCK_MASK
 
     def erase_page(self, page):
         assert 0 <= page <= 255  # 1MiB range (4k page)
         self.wait_not_busy()
         cr = page << 3 | 1 << 1  # PNB  # PER
         machine.mem32[stm.FLASH + stm.FLASH_CR] = cr
-        machine.mem32[stm.FLASH + stm.FLASH_CR] = cr | 1 << 16  # STRT
+        machine.mem32[stm.FLASH + stm.FLASH_CR] = cr | _Flash._FLASH_CR_STRT_MASK
         self.wait_not_busy()
         machine.mem32[stm.FLASH + stm.FLASH_CR] = 0
 
@@ -472,8 +480,6 @@ def resume():
             elif status == 0:
                 log("FUS update successful")
                 _write_state(_STATE_CHECK_UPDATES)
-                # Need to force a reset after FUS install otherwise a subsequent flash copy will fail.
-                machine.reset()
             elif result == 0:
                 # See below (for equivalent path for WS install -- we
                 # sometimes see (255,0) right at the end).

From dfb63b56134dc054b2e0023d9a404dea749d1fee Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Thu, 15 Oct 2020 20:11:43 +1100
Subject: [PATCH 0342/3533] stm32/boards/NUCLEO_WB55/rfcore_firmware.py: Fix
 bad variable name.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 .../boards/NUCLEO_WB55/rfcore_firmware.py     | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/ports/stm32/boards/NUCLEO_WB55/rfcore_firmware.py b/ports/stm32/boards/NUCLEO_WB55/rfcore_firmware.py
index de98d97430445..3358b246d064c 100644
--- a/ports/stm32/boards/NUCLEO_WB55/rfcore_firmware.py
+++ b/ports/stm32/boards/NUCLEO_WB55/rfcore_firmware.py
@@ -370,18 +370,18 @@ def resume():
         return _write_failure_state(REASON_RFCORE_NOT_CONFIGURED)
 
     while True:
-        _STATE_id = _read_state()
+        state = _read_state()
 
-        if _STATE_id == _STATE_IDLE:
+        if state == _STATE_IDLE:
             log("Firmware update complete")
             return 0
 
-        elif _STATE_id == _STATE_FAILED:
+        elif state == _STATE_FAILED:
             log("Firmware update failed")
             return _read_failure_reason()
 
         # Keep calling GET_STATE until error or FUS.
-        elif _STATE_id == _STATE_WAITING_FOR_FUS:
+        elif state == _STATE_WAITING_FOR_FUS:
             log("Querying FUS state")
             status, result = fus_get_state()
             log("FUS state: {} {}", status, result)
@@ -395,7 +395,7 @@ def resume():
                 _write_state(_STATE_CHECK_UPDATES)
 
         # Keep trying to start the WS until !fus_active() (or error).
-        elif _STATE_id == _STATE_WAITING_FOR_WS:
+        elif state == _STATE_WAITING_FOR_WS:
             if stm.rfcore_status() != _MAGIC_FUS_ACTIVE:
                 log("WS active")
                 _write_state(_STATE_IDLE)
@@ -410,7 +410,7 @@ def resume():
                     _write_failure_state(REASON_NO_WS)
 
         # Sequence the FUS 1.0.2 -> FUS 1.1.0 -> WS (depending on what's available).
-        elif _STATE_id == _STATE_CHECK_UPDATES:
+        elif state == _STATE_CHECK_UPDATES:
             log("Checking for updates")
             fus_version = stm.rfcore_fw_version(_FW_VERSION_FUS)
             log("FUS version {}", fus_version)
@@ -448,13 +448,13 @@ def resume():
         # This shouldn't happen - the flash write should always complete and
         # move straight onto the COPIED state. Failure here indicates that
         # the rfcore is misconfigured or the WS firmware was not deleted first.
-        elif _STATE_id == _STATE_COPYING_FUS or _STATE_id == _STATE_COPYING_WS:
+        elif state == _STATE_COPYING_FUS or state == _STATE_COPYING_WS:
             log("Flash copy failed mid-write")
             _write_failure_state(REASON_FLASH_COPY_FAILED)
 
         # Flash write completed, we should immediately see GET_STATE return 0,0
         # so we can start the FUS install.
-        elif _STATE_id == _STATE_COPIED_FUS:
+        elif state == _STATE_COPIED_FUS:
             if fus_is_idle():
                 log("FUS copy complete, installing")
                 _write_state(_STATE_INSTALLING_FUS)
@@ -466,7 +466,7 @@ def resume():
         # Keep polling the state until we see a 0,0 (success) or non-transient
         # error. In general we should expect to see (16,0) several times,
         # followed by a (255,0), followed by (0, 0).
-        elif _STATE_id == _STATE_INSTALLING_FUS:
+        elif state == _STATE_INSTALLING_FUS:
             log("Installing FUS...")
             status, result = fus_get_state()
             log("FUS state: {} {}", status, result)
@@ -492,7 +492,7 @@ def resume():
         # Keep polling the state until we see 0,0 or failure (1,0). Any other
         # result means retry (but the docs say that 0 and 1 are the only
         # status values).
-        elif _STATE_id == _STATE_DELETING_WS:
+        elif state == _STATE_DELETING_WS:
             log("Deleting WS...")
             status, result = fus_get_state()
             log("FUS state: {} {}", status, result)
@@ -508,7 +508,7 @@ def resume():
                 _write_failure_state(REASON_WS_DELETION_FAILED)
 
         # As for _STATE_COPIED_FUS above. We should immediately see 0,0.
-        elif _STATE_id == _STATE_COPIED_WS:
+        elif state == _STATE_COPIED_WS:
             if fus_is_idle():
                 log("WS copy complete, installing")
                 _write_state(_STATE_INSTALLING_WS)
@@ -518,7 +518,7 @@ def resume():
                 _write_failure_state(REASON_FLASH_WS_BAD_STATE)
 
         # As for _STATE_INSTALLING_FUS above.
-        elif _STATE_id == _STATE_INSTALLING_WS:
+        elif state == _STATE_INSTALLING_WS:
             log("Installing WS...")
             status, result = fus_get_state()
             log("FUS state: {} {}", status, result)

From 893f75546c4e65ca5b72bc7ef9b91003372c4705 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Thu, 15 Oct 2020 20:35:11 +1100
Subject: [PATCH 0343/3533] stm32/boards/NUCLEO_WB55/rfcore_firmware.py:
 Increase GET_STATE timeout.

When installing WS firmware, the very first GET_STATE can take several
seconds to respond (especially with the larger binaries like
BLE_stack_full).

Allows stm.rfcore_sys_hci to take an optional timeout, defaulting to
SYS_ACK_TIMEOUT_MS (which is 250ms).

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 .../boards/NUCLEO_WB55/rfcore_firmware.py     | 18 +++++++----
 ports/stm32/rfcore.c                          | 32 +++++++++++--------
 ports/stm32/rfcore.h                          |  2 +-
 3 files changed, 31 insertions(+), 21 deletions(-)

diff --git a/ports/stm32/boards/NUCLEO_WB55/rfcore_firmware.py b/ports/stm32/boards/NUCLEO_WB55/rfcore_firmware.py
index 3358b246d064c..b5f1d0072e349 100644
--- a/ports/stm32/boards/NUCLEO_WB55/rfcore_firmware.py
+++ b/ports/stm32/boards/NUCLEO_WB55/rfcore_firmware.py
@@ -180,6 +180,12 @@
 _ADDR_FUS = 0x080EC000
 _ADDR_WS_BLE_HCI = 0x080DC000
 
+# When installing the FUS/WS it can take a long time to return to the first
+# GET_STATE HCI command.
+# e.g. Installing stm32wb5x_BLE_Stack_full_fw.bin takes 3600ms to respond.
+_INSTALLING_FUS_GET_STATE_TIMEOUT = const(1000)
+_INSTALLING_WS_GET_STATE_TIMEOUT = const(6000)
+
 
 def log(msg, *args, **kwargs):
     print("[rfcore update]", msg.format(*args, **kwargs))
@@ -272,10 +278,10 @@ def _parse_vendor_response(data):
     return (op >> 10, op & 0x3FF, data[6], data[7] if len(data) > 7 else 0)
 
 
-def _run_sys_hci_cmd(ogf, ocf, buf=b""):
+def _run_sys_hci_cmd(ogf, ocf, buf=b"", timeout=0):
     try:
         ogf_out, ocf_out, status, result = _parse_vendor_response(
-            stm.rfcore_sys_hci(ogf, ocf, buf)
+            stm.rfcore_sys_hci(ogf, ocf, buf, timeout)
         )
     except OSError:
         # Timeout or FUS not active.
@@ -285,8 +291,8 @@ def _run_sys_hci_cmd(ogf, ocf, buf=b""):
     return (status, result)
 
 
-def fus_get_state():
-    return _run_sys_hci_cmd(_OGF_VENDOR, _OCF_FUS_GET_STATE)
+def fus_get_state(timeout=0):
+    return _run_sys_hci_cmd(_OGF_VENDOR, _OCF_FUS_GET_STATE, timeout=timeout)
 
 
 def fus_is_idle():
@@ -468,7 +474,7 @@ def resume():
         # followed by a (255,0), followed by (0, 0).
         elif state == _STATE_INSTALLING_FUS:
             log("Installing FUS...")
-            status, result = fus_get_state()
+            status, result = fus_get_state(_INSTALLING_FUS_GET_STATE_TIMEOUT)
             log("FUS state: {} {}", status, result)
             if 0x20 <= status <= 0x2F and result == 0:
                 # FUS_STATE_FUS_UPGRD_ONGOING
@@ -520,7 +526,7 @@ def resume():
         # As for _STATE_INSTALLING_FUS above.
         elif state == _STATE_INSTALLING_WS:
             log("Installing WS...")
-            status, result = fus_get_state()
+            status, result = fus_get_state(_INSTALLING_WS_GET_STATE_TIMEOUT)
             log("FUS state: {} {}", status, result)
             if 0x10 <= status <= 0x1F and result == 0:
                 # FUS_STATE_FW_UPGRD_ONGOING
diff --git a/ports/stm32/rfcore.c b/ports/stm32/rfcore.c
index 3850a17dae642..1fc0c9531d03b 100644
--- a/ports/stm32/rfcore.c
+++ b/ports/stm32/rfcore.c
@@ -68,9 +68,7 @@
 #define HCI_EVENT_COMMAND_COMPLETE     (0x0E) // <num packets><opcode 16><status><data...>
 #define HCI_EVENT_COMMAND_STATUS       (0x0F) // <status><num_packets><opcode 16>
 
-// There can be quite long delays during firmware update.
-#define SYS_ACK_TIMEOUT_MS (1000)
-
+#define SYS_ACK_TIMEOUT_MS (250)
 #define BLE_ACK_TIMEOUT_MS (250)
 
 // AN5185
@@ -449,12 +447,14 @@ STATIC void tl_hci_cmd(uint8_t *cmd, unsigned int ch, uint8_t hdr, uint16_t opco
     LL_C1_IPCC_SetFlag_CHx(IPCC, ch);
 }
 
-STATIC ssize_t tl_sys_wait_ack(const uint8_t *buf) {
+STATIC ssize_t tl_sys_wait_ack(const uint8_t *buf, mp_int_t timeout_ms) {
     uint32_t t0 = mp_hal_ticks_ms();
 
+    timeout_ms = MAX(SYS_ACK_TIMEOUT_MS, timeout_ms);
+
     // C2 will clear this bit to acknowledge the request.
     while (LL_C1_IPCC_IsActiveFlag_CHx(IPCC, IPCC_CH_SYS)) {
-        if (mp_hal_ticks_ms() - t0 > SYS_ACK_TIMEOUT_MS) {
+        if (mp_hal_ticks_ms() - t0 > timeout_ms) {
             printf("tl_sys_wait_ack: timeout\n");
             return -MP_ETIMEDOUT;
         }
@@ -465,9 +465,9 @@ STATIC ssize_t tl_sys_wait_ack(const uint8_t *buf) {
     return (ssize_t)tl_parse_hci_msg(buf, NULL);
 }
 
-STATIC ssize_t tl_sys_hci_cmd_resp(uint16_t opcode, const uint8_t *buf, size_t len) {
+STATIC ssize_t tl_sys_hci_cmd_resp(uint16_t opcode, const uint8_t *buf, size_t len, mp_int_t timeout_ms) {
     tl_hci_cmd(ipcc_membuf_sys_cmd_buf, IPCC_CH_SYS, 0x10, opcode, buf, len);
-    return tl_sys_wait_ack(ipcc_membuf_sys_cmd_buf);
+    return tl_sys_wait_ack(ipcc_membuf_sys_cmd_buf, timeout_ms);
 }
 
 STATIC int tl_ble_wait_resp(void) {
@@ -559,7 +559,7 @@ void rfcore_ble_init(void) {
     tl_check_msg_ble(&ipcc_mem_ble_evt_queue, NULL);
 
     // Configure and reset the BLE controller
-    tl_sys_hci_cmd_resp(HCI_OPCODE(OGF_VENDOR, OCF_BLE_INIT), (const uint8_t *)&ble_init_params, sizeof(ble_init_params));
+    tl_sys_hci_cmd_resp(HCI_OPCODE(OGF_VENDOR, OCF_BLE_INIT), (const uint8_t *)&ble_init_params, sizeof(ble_init_params), 0);
     tl_ble_hci_cmd_resp(HCI_OPCODE(0x03, 0x0003), NULL, 0);
 }
 
@@ -675,20 +675,24 @@ STATIC mp_obj_t rfcore_fw_version(mp_obj_t fw_id_in) {
 }
 MP_DEFINE_CONST_FUN_OBJ_1(rfcore_fw_version_obj, rfcore_fw_version);
 
-STATIC mp_obj_t rfcore_sys_hci(mp_obj_t ogf_in, mp_obj_t ocf_in, mp_obj_t cmd_in) {
+STATIC mp_obj_t rfcore_sys_hci(size_t n_args, const mp_obj_t *args) {
     if (ipcc_mem_dev_info_tab.fus.table_state == MAGIC_IPCC_MEM_INCORRECT) {
         mp_raise_OSError(MP_EINVAL);
     }
-    mp_int_t ogf = mp_obj_get_int(ogf_in);
-    mp_int_t ocf = mp_obj_get_int(ocf_in);
+    mp_int_t ogf = mp_obj_get_int(args[0]);
+    mp_int_t ocf = mp_obj_get_int(args[1]);
     mp_buffer_info_t bufinfo = {0};
-    mp_get_buffer_raise(cmd_in, &bufinfo, MP_BUFFER_READ);
-    ssize_t len = tl_sys_hci_cmd_resp(HCI_OPCODE(ogf, ocf), bufinfo.buf, bufinfo.len);
+    mp_get_buffer_raise(args[2], &bufinfo, MP_BUFFER_READ);
+    mp_int_t timeout_ms = 0;
+    if (n_args >= 4) {
+        timeout_ms = mp_obj_get_int(args[3]);
+    }
+    ssize_t len = tl_sys_hci_cmd_resp(HCI_OPCODE(ogf, ocf), bufinfo.buf, bufinfo.len, timeout_ms);
     if (len < 0) {
         mp_raise_OSError(-len);
     }
     return mp_obj_new_bytes(ipcc_membuf_sys_cmd_buf, len);
 }
-MP_DEFINE_CONST_FUN_OBJ_3(rfcore_sys_hci_obj, rfcore_sys_hci);
+MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(rfcore_sys_hci_obj, 3, 4, rfcore_sys_hci);
 
 #endif // defined(STM32WB)
diff --git a/ports/stm32/rfcore.h b/ports/stm32/rfcore.h
index 39f6220a32d26..6a3c85f67dfe8 100644
--- a/ports/stm32/rfcore.h
+++ b/ports/stm32/rfcore.h
@@ -37,6 +37,6 @@ void rfcore_ble_set_txpower(uint8_t level);
 
 MP_DECLARE_CONST_FUN_OBJ_0(rfcore_status_obj);
 MP_DECLARE_CONST_FUN_OBJ_1(rfcore_fw_version_obj);
-MP_DECLARE_CONST_FUN_OBJ_3(rfcore_sys_hci_obj);
+MP_DECLARE_CONST_FUN_OBJ_VAR_BETWEEN(rfcore_sys_hci_obj);
 
 #endif // MICROPY_INCLUDED_STM32_RFCORE_H

From 18518e26a7a92345fdcf8ad79e4c8b3a753f2d06 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 13 Oct 2020 11:06:49 +1100
Subject: [PATCH 0344/3533] ports: Use correct in/out endpoint size in
 TUD_CDC_DESCRIPTOR.

The last argument of TUD_CDC_DESCRIPTOR() is the endpoint size (or
wMaxPacketSize), not the CDC RX buffer size (which can be larger than the
endpoint size).

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/mimxrt/tusb_port.c                | 3 ++-
 ports/nrf/drivers/usb/usb_descriptors.c | 3 ++-
 ports/samd/tusb_port.c                  | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/ports/mimxrt/tusb_port.c b/ports/mimxrt/tusb_port.c
index 70f8ef527cd0d..f6b09a362d18a 100644
--- a/ports/mimxrt/tusb_port.c
+++ b/ports/mimxrt/tusb_port.c
@@ -39,6 +39,7 @@
 #define USBD_CDC_EP_OUT (0x02)
 #define USBD_CDC_EP_IN (0x82)
 #define USBD_CDC_CMD_MAX_SIZE (8)
+#define USBD_CDC_IN_OUT_MAX_SIZE (512)
 
 #define USBD_STR_0 (0x00)
 #define USBD_STR_MANUF (0x01)
@@ -70,7 +71,7 @@ static const uint8_t usbd_desc_cfg[USBD_DESC_LEN] = {
         TUSB_DESC_CONFIG_ATT_REMOTE_WAKEUP, USBD_MAX_POWER_MA),
 
     TUD_CDC_DESCRIPTOR(USBD_ITF_CDC, USBD_STR_CDC, USBD_CDC_EP_CMD,
-        USBD_CDC_CMD_MAX_SIZE, USBD_CDC_EP_OUT, USBD_CDC_EP_IN, CFG_TUD_CDC_RX_BUFSIZE),
+        USBD_CDC_CMD_MAX_SIZE, USBD_CDC_EP_OUT, USBD_CDC_EP_IN, USBD_CDC_IN_OUT_MAX_SIZE),
 };
 
 static const char *const usbd_desc_str[] = {
diff --git a/ports/nrf/drivers/usb/usb_descriptors.c b/ports/nrf/drivers/usb/usb_descriptors.c
index 3704e5d0dd180..f6724c1bc078c 100644
--- a/ports/nrf/drivers/usb/usb_descriptors.c
+++ b/ports/nrf/drivers/usb/usb_descriptors.c
@@ -39,6 +39,7 @@
 #define USBD_CDC_EP_OUT (0x02)
 #define USBD_CDC_EP_IN (0x82)
 #define USBD_CDC_CMD_MAX_SIZE (8)
+#define USBD_CDC_IN_OUT_MAX_SIZE (64)
 
 #define USBD_STR_0 (0x00)
 #define USBD_STR_MANUF (0x01)
@@ -70,7 +71,7 @@ static const uint8_t usbd_desc_cfg[USBD_DESC_LEN] = {
         TUSB_DESC_CONFIG_ATT_REMOTE_WAKEUP, USBD_MAX_POWER_MA),
 
     TUD_CDC_DESCRIPTOR(USBD_ITF_CDC, USBD_STR_CDC, USBD_CDC_EP_CMD,
-        USBD_CDC_CMD_MAX_SIZE, USBD_CDC_EP_OUT, USBD_CDC_EP_IN, CFG_TUD_CDC_RX_BUFSIZE),
+        USBD_CDC_CMD_MAX_SIZE, USBD_CDC_EP_OUT, USBD_CDC_EP_IN, USBD_CDC_IN_OUT_MAX_SIZE),
 };
 
 static const char *const usbd_desc_str[] = {
diff --git a/ports/samd/tusb_port.c b/ports/samd/tusb_port.c
index 019e3a891c262..f3d417f1a182e 100644
--- a/ports/samd/tusb_port.c
+++ b/ports/samd/tusb_port.c
@@ -40,6 +40,7 @@
 #define USBD_CDC_EP_OUT (0x02)
 #define USBD_CDC_EP_IN (0x82)
 #define USBD_CDC_CMD_MAX_SIZE (8)
+#define USBD_CDC_IN_OUT_MAX_SIZE (64)
 
 #define USBD_STR_0 (0x00)
 #define USBD_STR_MANUF (0x01)
@@ -71,7 +72,7 @@ static const uint8_t usbd_desc_cfg[USBD_DESC_LEN] = {
         TUSB_DESC_CONFIG_ATT_REMOTE_WAKEUP, USBD_MAX_POWER_MA),
 
     TUD_CDC_DESCRIPTOR(USBD_ITF_CDC, USBD_STR_CDC, USBD_CDC_EP_CMD,
-        USBD_CDC_CMD_MAX_SIZE, USBD_CDC_EP_OUT, USBD_CDC_EP_IN, CFG_TUD_CDC_RX_BUFSIZE),
+        USBD_CDC_CMD_MAX_SIZE, USBD_CDC_EP_OUT, USBD_CDC_EP_IN, USBD_CDC_IN_OUT_MAX_SIZE),
 };
 
 static const char *const usbd_desc_str[] = {

From 56e0932485af51ec175c8f43432eee67d657b334 Mon Sep 17 00:00:00 2001
From: awachtler <axel@uracoli.de>
Date: Tue, 6 Oct 2020 22:19:05 +0200
Subject: [PATCH 0345/3533] tools/upip.py: Support explicit port number in
 host.

Adding a port number other then 443 to a PyPI URL may be needed if a local
server like devpi is used.
---
 tools/upip.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/tools/upip.py b/tools/upip.py
index 0036eac25db7b..aa8aecedfc23f 100644
--- a/tools/upip.py
+++ b/tools/upip.py
@@ -129,7 +129,11 @@ def url_open(url):
 
     proto, _, host, urlpath = url.split("/", 3)
     try:
-        ai = usocket.getaddrinfo(host, 443, 0, usocket.SOCK_STREAM)
+        port = 443
+        if ":" in host:
+            host, port = host.split(":")
+            port = int(port)
+        ai = usocket.getaddrinfo(host, port, 0, usocket.SOCK_STREAM)
     except OSError as e:
         fatal("Unable to resolve %s (no Internet?)" % host, e)
     # print("Address infos:", ai)
@@ -147,7 +151,7 @@ def url_open(url):
                 warn_ussl = False
 
         # MicroPython rawsocket module supports file interface directly
-        s.write("GET /%s HTTP/1.0\r\nHost: %s\r\n\r\n" % (urlpath, host))
+        s.write("GET /%s HTTP/1.0\r\nHost: %s:%s\r\n\r\n" % (urlpath, host, port))
         l = s.readline()
         protover, status, msg = l.split(None, 2)
         if status != b"200":

From 3bc0ecbcd974716920b860904a47ee7f69afb717 Mon Sep 17 00:00:00 2001
From: Howard Lovatt <howard.lovatt@gmail.com>
Date: Fri, 9 Oct 2020 20:40:17 +1100
Subject: [PATCH 0346/3533] docs/library/btree.rst: Correct method typo:
 __detitem__ to __delitem__.

---
 docs/library/btree.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/library/btree.rst b/docs/library/btree.rst
index de52ef7e7e44e..ba910852102d1 100644
--- a/docs/library/btree.rst
+++ b/docs/library/btree.rst
@@ -118,7 +118,7 @@ Methods
 .. method:: btree.__getitem__(key)
             btree.get(key, default=None, /)
             btree.__setitem__(key, val)
-            btree.__detitem__(key)
+            btree.__delitem__(key)
             btree.__contains__(key)
 
    Standard dictionary methods.

From 23f9439f441173dae961de4d2fe73986c166ff8f Mon Sep 17 00:00:00 2001
From: Howard Lovatt <howard.lovatt@gmail.com>
Date: Sat, 10 Oct 2020 08:14:38 +1100
Subject: [PATCH 0347/3533] docs/library/machine.rst: Correct minor typo:
 timout to timeout.

---
 docs/library/machine.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/library/machine.rst b/docs/library/machine.rst
index b580353d6b564..18dc6f2afaa59 100644
--- a/docs/library/machine.rst
+++ b/docs/library/machine.rst
@@ -79,7 +79,7 @@ Power related functions
    If *time_ms* is specified then this will be the maximum time in milliseconds that
    the sleep will last for.  Otherwise the sleep can last indefinitely.
 
-   With or without a timout, execution may resume at any time if there are events
+   With or without a timeout, execution may resume at any time if there are events
    that require processing.  Such events, or wake sources, should be configured before
    sleeping, like `Pin` change or `RTC` timeout.
 

From cf6845b1cf4680bb2eade175aaab00428bedf8ba Mon Sep 17 00:00:00 2001
From: Howard Lovatt <howard.lovatt@gmail.com>
Date: Sat, 10 Oct 2020 08:18:24 +1100
Subject: [PATCH 0348/3533] docs/library/machine.Signal.rst: Correct typo:
 usecases to use cases.

---
 docs/library/machine.Signal.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/library/machine.Signal.rst b/docs/library/machine.Signal.rst
index 651c8c8497fd8..1e1fcb5483a86 100644
--- a/docs/library/machine.Signal.rst
+++ b/docs/library/machine.Signal.rst
@@ -55,7 +55,7 @@ Following is the guide when Signal vs Pin should be used:
 * Use Pin: If you implement a higher-level protocol or bus to communicate
   with more complex devices.
 
-The split between Pin and Signal come from the usecases above and the
+The split between Pin and Signal come from the use cases above and the
 architecture of MicroPython: Pin offers the lowest overhead, which may
 be important when bit-banging protocols. But Signal adds additional
 flexibility on top of Pin, at the cost of minor overhead (much smaller

From 4842060366a88d8f50155538ce5fc3a12c8c709a Mon Sep 17 00:00:00 2001
From: Howard Lovatt <howard.lovatt@gmail.com>
Date: Sat, 10 Oct 2020 08:31:00 +1100
Subject: [PATCH 0349/3533] docs/library/machine.Timer.rst: Add mention of
 constructor arguments.

---
 docs/library/machine.Timer.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/library/machine.Timer.rst b/docs/library/machine.Timer.rst
index 2d1287f325780..9991d3aebc2fc 100644
--- a/docs/library/machine.Timer.rst
+++ b/docs/library/machine.Timer.rst
@@ -31,6 +31,8 @@ Constructors
 
    Construct a new timer object of the given id. Id of -1 constructs a
    virtual timer (if supported by a board).
+   
+   See ``init`` for parameters of initialisation.
 
 Methods
 -------

From 32c99174e143b45d056c83a33f8de7502a82370c Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew@alelec.net>
Date: Thu, 10 Sep 2020 17:46:25 +1000
Subject: [PATCH 0350/3533] unix/mpconfigport.h: Enable
 MICROPY_PY_DELATTR_SETATTR.

This is a generally useful feature and because it's part of the object
model it cannot be added at runtime by some loadable Python code, so enable
it on the standard unix build.
---
 ports/unix/mpconfigport.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/unix/mpconfigport.h b/ports/unix/mpconfigport.h
index c74d2fd84aa5f..17f4895573ed5 100644
--- a/ports/unix/mpconfigport.h
+++ b/ports/unix/mpconfigport.h
@@ -87,6 +87,7 @@
 #define MICROPY_VFS_POSIX_FILE      (1)
 #define MICROPY_PY_FUNCTION_ATTRS   (1)
 #define MICROPY_PY_DESCRIPTORS      (1)
+#define MICROPY_PY_DELATTR_SETATTR  (1)
 #define MICROPY_PY_BUILTINS_STR_UNICODE (1)
 #define MICROPY_PY_BUILTINS_STR_CENTER (1)
 #define MICROPY_PY_BUILTINS_STR_PARTITION (1)

From 97108fce5730f2342903e55d533ef2c30ebdfc13 Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew@alelec.net>
Date: Wed, 21 Oct 2020 08:54:46 +1100
Subject: [PATCH 0351/3533] esp32/mpconfigport.h: Enable
 MICROPY_PY_DELATTR_SETATTR.

To align with unix and stm32 ports.
---
 ports/esp32/mpconfigport.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h
index 5bf0676b238e3..b63d1f89558c0 100644
--- a/ports/esp32/mpconfigport.h
+++ b/ports/esp32/mpconfigport.h
@@ -63,6 +63,7 @@
 // control over Python builtins
 #define MICROPY_PY_FUNCTION_ATTRS           (1)
 #define MICROPY_PY_DESCRIPTORS              (1)
+#define MICROPY_PY_DELATTR_SETATTR          (1)
 #define MICROPY_PY_STR_BYTES_CMP_WARN       (1)
 #define MICROPY_PY_BUILTINS_STR_UNICODE     (1)
 #define MICROPY_PY_BUILTINS_STR_CENTER      (1)

From a93d9b8c2d4f7b020a906007702e01a1485e8043 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Fri, 9 Oct 2020 22:02:46 +0200
Subject: [PATCH 0352/3533] stm32: Fix broken build when FAT FS multi-partition
 is disabled.

---
 ports/stm32/sdcard.c  | 2 ++
 ports/stm32/storage.c | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/ports/stm32/sdcard.c b/ports/stm32/sdcard.c
index 7d79e9f47b1a8..b255ee82ca9be 100644
--- a/ports/stm32/sdcard.c
+++ b/ports/stm32/sdcard.c
@@ -866,7 +866,9 @@ void sdcard_init_vfs(fs_user_mount_t *vfs, int part) {
     vfs->base.type = &mp_fat_vfs_type;
     vfs->blockdev.flags |= MP_BLOCKDEV_FLAG_NATIVE | MP_BLOCKDEV_FLAG_HAVE_IOCTL;
     vfs->fatfs.drv = vfs;
+    #if MICROPY_FATFS_MULTI_PARTITION
     vfs->fatfs.part = part;
+    #endif
     vfs->blockdev.readblocks[0] = MP_OBJ_FROM_PTR(&pyb_sdcard_readblocks_obj);
     vfs->blockdev.readblocks[1] = MP_OBJ_FROM_PTR(&pyb_sdcard_obj);
     vfs->blockdev.readblocks[2] = MP_OBJ_FROM_PTR(sdcard_read_blocks); // native version
diff --git a/ports/stm32/storage.c b/ports/stm32/storage.c
index 0fefcbab9063c..c8805d682986b 100644
--- a/ports/stm32/storage.c
+++ b/ports/stm32/storage.c
@@ -453,7 +453,9 @@ void pyb_flash_init_vfs(fs_user_mount_t *vfs) {
     vfs->base.type = &mp_fat_vfs_type;
     vfs->blockdev.flags |= MP_BLOCKDEV_FLAG_NATIVE | MP_BLOCKDEV_FLAG_HAVE_IOCTL;
     vfs->fatfs.drv = vfs;
+    #if MICROPY_FATFS_MULTI_PARTITION
     vfs->fatfs.part = 1; // flash filesystem lives on first partition
+    #endif
     vfs->blockdev.readblocks[0] = MP_OBJ_FROM_PTR(&pyb_flash_readblocks_obj);
     vfs->blockdev.readblocks[1] = MP_OBJ_FROM_PTR(&pyb_flash_obj);
     vfs->blockdev.readblocks[2] = MP_OBJ_FROM_PTR(storage_read_blocks); // native version

From 581d43b7742628907e5a77115350e9eadd59092a Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 22 Oct 2020 11:54:38 +1100
Subject: [PATCH 0353/3533] stm32/usbd_cdc_interface: Check and handle CDC TX
 wrap-overflow.

If the device is not connected over USB CDC to a host then all output to
the CDC (eg initial boot messages) is written to the CDC TX buffer with
wrapping, so that the most recent data is retained when the USB CDC is
eventually connected (eg so the REPL banner is displayed upon connection).

This commit fixes a bug in this behaviour, which was likely introduced in
e4fcd216e02eef0b389c84ecd67be3114aac0a5d, where the initial data in the CDC
TX buffer is repeated multiple times on first connection of the device to
the host.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/usbd_cdc_interface.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/ports/stm32/usbd_cdc_interface.c b/ports/stm32/usbd_cdc_interface.c
index 7a09128527cec..a8261a958aa09 100644
--- a/ports/stm32/usbd_cdc_interface.c
+++ b/ports/stm32/usbd_cdc_interface.c
@@ -196,9 +196,13 @@ static uint16_t usbd_cdc_tx_send_length(usbd_cdc_itf_t *cdc) {
     return MIN(usbd_cdc_tx_buffer_size(cdc), to_end);
 }
 
-static void usbd_cdc_tx_buffer_put(usbd_cdc_itf_t *cdc, uint8_t data) {
+static void usbd_cdc_tx_buffer_put(usbd_cdc_itf_t *cdc, uint8_t data, bool check_overflow) {
     cdc->tx_buf[usbd_cdc_tx_buffer_mask(cdc->tx_buf_ptr_in)] = data;
     cdc->tx_buf_ptr_in++;
+    if (check_overflow && usbd_cdc_tx_buffer_size(cdc) > USBD_CDC_TX_DATA_SIZE) {
+        cdc->tx_buf_ptr_out++;
+        cdc->tx_buf_ptr_out_next = cdc->tx_buf_ptr_out;
+    }
 }
 
 static uint8_t *usbd_cdc_tx_buffer_getp(usbd_cdc_itf_t *cdc, uint16_t len) {
@@ -353,7 +357,7 @@ int usbd_cdc_tx(usbd_cdc_itf_t *cdc, const uint8_t *buf, uint32_t len, uint32_t
         }
 
         // Write data to device buffer
-        usbd_cdc_tx_buffer_put(cdc, buf[i]);
+        usbd_cdc_tx_buffer_put(cdc, buf[i], false);
     }
 
     usbd_cdc_try_tx(cdc);
@@ -386,7 +390,7 @@ void usbd_cdc_tx_always(usbd_cdc_itf_t *cdc, const uint8_t *buf, uint32_t len) {
             }
         }
 
-        usbd_cdc_tx_buffer_put(cdc, buf[i]);
+        usbd_cdc_tx_buffer_put(cdc, buf[i], true);
     }
     usbd_cdc_try_tx(cdc);
 }

From 6eebdbc495a52d1965d7e9255816db310041f96a Mon Sep 17 00:00:00 2001
From: Kevin Thomas <kevin@mytechnotalent.com>
Date: Sat, 3 Oct 2020 08:35:41 -0400
Subject: [PATCH 0354/3533] docs/reference/glossary.rst: Fix minor grammar
 error, An -> A.

---
 docs/reference/glossary.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/reference/glossary.rst b/docs/reference/glossary.rst
index d63f372298f9e..27a66aa76c075 100644
--- a/docs/reference/glossary.rst
+++ b/docs/reference/glossary.rst
@@ -177,7 +177,7 @@ Glossary
         typically accessible on a host PC via USB.
 
     stream
-        Also known as a "file-like object". An Python object which provides
+        Also known as a "file-like object". A Python object which provides
         sequential read-write access to the underlying data. A stream object
         implements a corresponding interface, which consists of methods like
         ``read()``, ``write()``, ``readinto()``, ``seek()``, ``flush()``,

From 6324c3e05499a31c5a80ad58f030e693f459f294 Mon Sep 17 00:00:00 2001
From: Emil Renner Berthing <esmil@mailme.dk>
Date: Sat, 3 Oct 2020 10:42:57 +0200
Subject: [PATCH 0355/3533] py/scope: Name and use id_kind_type_t.

The function scope_find_or_add_id used to take a scope_kind_t enum and
save it in an uint8_t. Saving an enum in a uint8_t is fine, but
everywhere this function is called it is not actually given a
scope_kind_t but an anonymous enum instead. Let's give this enum a name
and use that as the argument type.

This doesn't change the generated code, but is a C type mismatch that
unfortunately doesn't show up unless you enable -Wenum-conversion.
---
 py/scope.c | 2 +-
 py/scope.h | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/py/scope.c b/py/scope.c
index 073c2a38c2c21..98e02fb53fe31 100644
--- a/py/scope.c
+++ b/py/scope.c
@@ -72,7 +72,7 @@ void scope_free(scope_t *scope) {
     m_del(scope_t, scope, 1);
 }
 
-id_info_t *scope_find_or_add_id(scope_t *scope, qstr qst, scope_kind_t kind) {
+id_info_t *scope_find_or_add_id(scope_t *scope, qstr qst, id_info_kind_t kind) {
     id_info_t *id_info = scope_find(scope, qst);
     if (id_info != NULL) {
         return id_info;
diff --git a/py/scope.h b/py/scope.h
index b52d98ea1c72d..edf164c4adace 100644
--- a/py/scope.h
+++ b/py/scope.h
@@ -29,14 +29,14 @@
 #include "py/parse.h"
 #include "py/emitglue.h"
 
-enum {
+typedef enum {
     ID_INFO_KIND_UNDECIDED,
     ID_INFO_KIND_GLOBAL_IMPLICIT,
     ID_INFO_KIND_GLOBAL_EXPLICIT,
     ID_INFO_KIND_LOCAL, // in a function f, written and only referenced by f
     ID_INFO_KIND_CELL,  // in a function f, read/written by children of f
     ID_INFO_KIND_FREE,  // in a function f, belongs to the parent of f
-};
+} id_info_kind_t;
 
 enum {
     ID_FLAG_IS_PARAM = 0x01,
@@ -92,7 +92,7 @@ typedef struct _scope_t {
 
 scope_t *scope_new(scope_kind_t kind, mp_parse_node_t pn, qstr source_file, mp_uint_t emit_options);
 void scope_free(scope_t *scope);
-id_info_t *scope_find_or_add_id(scope_t *scope, qstr qstr, scope_kind_t kind);
+id_info_t *scope_find_or_add_id(scope_t *scope, qstr qstr, id_info_kind_t kind);
 id_info_t *scope_find(scope_t *scope, qstr qstr);
 id_info_t *scope_find_global(scope_t *scope, qstr qstr);
 void scope_check_to_close_over(scope_t *scope, id_info_t *id);

From 6d3aa16443c3eeef3945bf3d31429a655f690e0c Mon Sep 17 00:00:00 2001
From: Emil Renner Berthing <esmil@mailme.dk>
Date: Fri, 13 Dec 2019 08:24:18 +0100
Subject: [PATCH 0356/3533] py/objexcept: Compare
 mp_emergency_exception_buf_size signed.

mp_emergency_exception_buf_size is signed, so let's make sure we compare
it as such.
---
 py/objexcept.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/py/objexcept.c b/py/objexcept.c
index 517427ed71365..885032c3e3eed 100644
--- a/py/objexcept.c
+++ b/py/objexcept.c
@@ -208,7 +208,7 @@ mp_obj_t mp_obj_exception_make_new(const mp_obj_type_t *type, size_t n_args, siz
         // reserved room (after the traceback data) for a tuple with 1 element.
         // Otherwise we are free to use the whole buffer after the traceback data.
         if (o_tuple == NULL && mp_emergency_exception_buf_size >=
-            EMG_BUF_TUPLE_OFFSET + EMG_BUF_TUPLE_SIZE(n_args)) {
+            (mp_int_t)(EMG_BUF_TUPLE_OFFSET + EMG_BUF_TUPLE_SIZE(n_args))) {
             o_tuple = (mp_obj_tuple_t *)
                 ((uint8_t *)MP_STATE_VM(mp_emergency_exception_buf) + EMG_BUF_TUPLE_OFFSET);
         }
@@ -383,7 +383,7 @@ mp_obj_t mp_obj_new_exception_msg(const mp_obj_type_t *exc_type, mp_rom_error_te
     // that buffer to store the string object, reserving room at the start for the
     // traceback and 1-tuple.
     if (o_str == NULL
-        && mp_emergency_exception_buf_size >= EMG_BUF_STR_OFFSET + sizeof(mp_obj_str_t)) {
+        && mp_emergency_exception_buf_size >= (mp_int_t)(EMG_BUF_STR_OFFSET + sizeof(mp_obj_str_t))) {
         o_str = (mp_obj_str_t *)((uint8_t *)MP_STATE_VM(mp_emergency_exception_buf)
             + EMG_BUF_STR_OFFSET);
     }
@@ -465,7 +465,7 @@ mp_obj_t mp_obj_new_exception_msg_vlist(const mp_obj_type_t *exc_type, mp_rom_er
     // that buffer to store the string object and its data (at least 16 bytes for
     // the string data), reserving room at the start for the traceback and 1-tuple.
     if ((o_str == NULL || o_str_buf == NULL)
-        && mp_emergency_exception_buf_size >= EMG_BUF_STR_OFFSET + sizeof(mp_obj_str_t) + 16) {
+        && mp_emergency_exception_buf_size >= (mp_int_t)(EMG_BUF_STR_OFFSET + sizeof(mp_obj_str_t) + 16)) {
         used_emg_buf = true;
         o_str = (mp_obj_str_t *)((uint8_t *)MP_STATE_VM(mp_emergency_exception_buf) + EMG_BUF_STR_OFFSET);
         o_str_buf = (byte *)((uint8_t *)MP_STATE_VM(mp_emergency_exception_buf) + EMG_BUF_STR_BUF_OFFSET);
@@ -573,7 +573,7 @@ void mp_obj_exception_add_traceback(mp_obj_t self_in, qstr file, size_t line, qs
         self->traceback_data = m_new_maybe(size_t, TRACEBACK_ENTRY_LEN);
         if (self->traceback_data == NULL) {
             #if MICROPY_ENABLE_EMERGENCY_EXCEPTION_BUF
-            if (mp_emergency_exception_buf_size >= EMG_BUF_TRACEBACK_OFFSET + EMG_BUF_TRACEBACK_SIZE) {
+            if (mp_emergency_exception_buf_size >= (mp_int_t)(EMG_BUF_TRACEBACK_OFFSET + EMG_BUF_TRACEBACK_SIZE)) {
                 // There is room in the emergency buffer for traceback data
                 size_t *tb = (size_t *)((uint8_t *)MP_STATE_VM(mp_emergency_exception_buf)
                     + EMG_BUF_TRACEBACK_OFFSET);

From fdd6fa389ed68a5d0761f7cb71c94db5e927d741 Mon Sep 17 00:00:00 2001
From: Emil Renner Berthing <esmil@mailme.dk>
Date: Sat, 3 Oct 2020 10:51:59 +0200
Subject: [PATCH 0357/3533] py: Use unsigned comparison of chars.

On x86 chars are signed, but we're comparing a char to '0' + unsigned int,
which is promoted to an unsigned int. Let's promote the char to unsigned
before doing the comparison to avoid weird corner cases.
---
 py/emitinlinethumb.c  | 2 +-
 py/emitinlinextensa.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/py/emitinlinethumb.c b/py/emitinlinethumb.c
index 2853da26c5465..cffaa4bb89950 100644
--- a/py/emitinlinethumb.c
+++ b/py/emitinlinethumb.c
@@ -108,7 +108,7 @@ STATIC mp_uint_t emit_inline_thumb_count_params(emit_inline_asm_t *emit, mp_uint
             return 0;
         }
         const char *p = qstr_str(MP_PARSE_NODE_LEAF_ARG(pn_params[i]));
-        if (!(strlen(p) == 2 && p[0] == 'r' && p[1] == '0' + i)) {
+        if (!(strlen(p) == 2 && p[0] == 'r' && (mp_uint_t)p[1] == '0' + i)) {
             emit_inline_thumb_error_msg(emit, MP_ERROR_TEXT("parameters must be registers in sequence r0 to r3"));
             return 0;
         }
diff --git a/py/emitinlinextensa.c b/py/emitinlinextensa.c
index 6cc2e4d34b6a8..5dac2ae3907f1 100644
--- a/py/emitinlinextensa.c
+++ b/py/emitinlinextensa.c
@@ -92,7 +92,7 @@ STATIC mp_uint_t emit_inline_xtensa_count_params(emit_inline_asm_t *emit, mp_uin
             return 0;
         }
         const char *p = qstr_str(MP_PARSE_NODE_LEAF_ARG(pn_params[i]));
-        if (!(strlen(p) == 2 && p[0] == 'a' && p[1] == '2' + i)) {
+        if (!(strlen(p) == 2 && p[0] == 'a' && (mp_uint_t)p[1] == '2' + i)) {
             emit_inline_xtensa_error_msg(emit, MP_ERROR_TEXT("parameters must be registers in sequence a2 to a5"));
             return 0;
         }

From 9aa58cf8bac353297ff5e7b4f3331e5618046095 Mon Sep 17 00:00:00 2001
From: Emil Renner Berthing <esmil@mailme.dk>
Date: Sat, 3 Oct 2020 11:23:12 +0200
Subject: [PATCH 0358/3533] py, extmod: Add explicit initializers for default
 values.

When compiling with -Wextra which includes -Wmissing-field-initializers
GCC will warn that the defval field of mp_arg_val_t is not initialized.
This is just a warning as it is defined to be zero initialized, but since
it is a union it makes sense to be explicit about which member we're
going to use, so add the explicit initializers and get rid of the
warning.
---
 extmod/machine_i2c.c | 4 ++--
 extmod/vfs_lfs.c     | 2 +-
 py/modmath.c         | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/extmod/machine_i2c.c b/extmod/machine_i2c.c
index 9203f16f6d785..12c9abbcbaece 100644
--- a/extmod/machine_i2c.c
+++ b/extmod/machine_i2c.c
@@ -311,8 +311,8 @@ STATIC void mp_machine_soft_i2c_print(const mp_print_t *print, mp_obj_t self_in,
 STATIC void machine_i2c_obj_init_helper(machine_i2c_obj_t *self, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_scl, ARG_sda, ARG_freq, ARG_timeout };
     static const mp_arg_t allowed_args[] = {
-        { MP_QSTR_scl, MP_ARG_REQUIRED | MP_ARG_OBJ },
-        { MP_QSTR_sda, MP_ARG_REQUIRED | MP_ARG_OBJ },
+        { MP_QSTR_scl, MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
+        { MP_QSTR_sda, MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
         { MP_QSTR_freq, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 400000} },
         { MP_QSTR_timeout, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 255} },
     };
diff --git a/extmod/vfs_lfs.c b/extmod/vfs_lfs.c
index 9cf3eb11083cf..dd78269a460ab 100644
--- a/extmod/vfs_lfs.c
+++ b/extmod/vfs_lfs.c
@@ -35,7 +35,7 @@
 enum { LFS_MAKE_ARG_bdev, LFS_MAKE_ARG_readsize, LFS_MAKE_ARG_progsize, LFS_MAKE_ARG_lookahead, LFS_MAKE_ARG_mtime };
 
 static const mp_arg_t lfs_make_allowed_args[] = {
-    { MP_QSTR_, MP_ARG_REQUIRED | MP_ARG_OBJ },
+    { MP_QSTR_, MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
     { MP_QSTR_readsize, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 32} },
     { MP_QSTR_progsize, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 32} },
     { MP_QSTR_lookahead, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 32} },
diff --git a/py/modmath.c b/py/modmath.c
index b7948f39e7c91..3ab3ff334c41b 100644
--- a/py/modmath.c
+++ b/py/modmath.c
@@ -206,8 +206,8 @@ MATH_FUN_1(lgamma, lgamma)
 STATIC mp_obj_t mp_math_isclose(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_a, ARG_b, ARG_rel_tol, ARG_abs_tol };
     static const mp_arg_t allowed_args[] = {
-        {MP_QSTR_, MP_ARG_REQUIRED | MP_ARG_OBJ},
-        {MP_QSTR_, MP_ARG_REQUIRED | MP_ARG_OBJ},
+        {MP_QSTR_, MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL}},
+        {MP_QSTR_, MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL}},
         {MP_QSTR_rel_tol, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL}},
         {MP_QSTR_abs_tol, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = MP_OBJ_NEW_SMALL_INT(0)}},
     };

From f1f6ef7b17dc97f784a4cdb33154800129dc6d26 Mon Sep 17 00:00:00 2001
From: Emil Renner Berthing <esmil@mailme.dk>
Date: Thu, 28 Nov 2019 12:50:08 +0100
Subject: [PATCH 0359/3533] py/vmentrytable: Ignore GCC -Woverride-init.

Like Clang, GCC warns about this file, but only with -Woverride-init
which is enabled by -Wextra. Disable the warnings for this file just
like we do for Clang to make -Wextra happy.
---
 py/vmentrytable.h | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/py/vmentrytable.h b/py/vmentrytable.h
index 068214bf916cf..7912270872759 100644
--- a/py/vmentrytable.h
+++ b/py/vmentrytable.h
@@ -30,6 +30,10 @@
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Winitializer-overrides"
 #endif // __clang__
+#if __GNUC__ >= 5
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Woverride-init"
+#endif // __GNUC__ >= 5
 
 static const void *const entry_table[256] = {
     [0 ... 255] = &&entry_default,
@@ -119,3 +123,6 @@ static const void *const entry_table[256] = {
 #if __clang__
 #pragma clang diagnostic pop
 #endif // __clang__
+#if __GNUC__ >= 5
+#pragma GCC diagnostic pop
+#endif // __GNUC__ >= 5

From dde3db21fcd8d810bb59e0c56dfa5fd9208e1544 Mon Sep 17 00:00:00 2001
From: Emil Renner Berthing <esmil@mailme.dk>
Date: Sat, 3 Oct 2020 12:19:48 +0200
Subject: [PATCH 0360/3533] extmod: Disable -Wmissing-field-initializers for
 lfs2.

---
 extmod/extmod.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/extmod/extmod.mk b/extmod/extmod.mk
index e312acba86db4..b000b058d7bd4 100644
--- a/extmod/extmod.mk
+++ b/extmod/extmod.mk
@@ -37,6 +37,8 @@ SRC_MOD += $(addprefix $(LITTLEFS_DIR)/,\
 	lfs2.c \
 	lfs2_util.c \
 	)
+
+$(BUILD)/$(LITTLEFS_DIR)/lfs2.o: CFLAGS += -Wno-missing-field-initializers
 endif
 
 ################################################################################

From ccd92335a11f03597f94da2ac937811ff3fa50cf Mon Sep 17 00:00:00 2001
From: Emil Renner Berthing <esmil@mailme.dk>
Date: Thu, 28 Nov 2019 12:47:21 +0100
Subject: [PATCH 0361/3533] py, extmod: Introduce and use MP_FALLTHROUGH macro.

Newer GCC versions are able to warn about switch cases that fall
through.  This is usually a sign of a forgotten break statement, but in
the few cases where a fall through is intended we annotate it with this
macro to avoid the warning.
---
 extmod/moductypes.c          | 3 ++-
 extmod/re1.5/compilecode.c   | 1 +
 extmod/re1.5/recursiveloop.c | 1 +
 py/gc.c                      | 3 ++-
 py/lexer.c                   | 3 ++-
 py/mpconfig.h                | 7 +++++++
 py/objset.c                  | 1 +
 7 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/extmod/moductypes.c b/extmod/moductypes.c
index 811258424a3bf..c5fbf12e42b9d 100644
--- a/extmod/moductypes.c
+++ b/extmod/moductypes.c
@@ -506,6 +506,7 @@ STATIC mp_obj_t uctypes_struct_attr_op(mp_obj_t self_in, qstr attr, mp_obj_t set
                 return mp_obj_new_bytearray_by_ref(uctypes_struct_agg_size(sub, self->flags, &dummy), self->addr + offset);
             }
             // Fall thru to return uctypes struct object
+            MP_FALLTHROUGH
         }
         case PTR: {
             mp_obj_uctypes_struct_t *o = m_new_obj(mp_obj_uctypes_struct_t);
@@ -627,7 +628,7 @@ STATIC mp_obj_t uctypes_struct_unary_op(mp_unary_op_t op, mp_obj_t self_in) {
                     return mp_obj_new_int((mp_int_t)(uintptr_t)p);
                 }
             }
-        /* fallthru */
+            MP_FALLTHROUGH
 
         default:
             return MP_OBJ_NULL;      // op not supported
diff --git a/extmod/re1.5/compilecode.c b/extmod/re1.5/compilecode.c
index 3f54b3993fd36..c4d12af87a32e 100644
--- a/extmod/re1.5/compilecode.c
+++ b/extmod/re1.5/compilecode.c
@@ -29,6 +29,7 @@ static const char *_compilecode(const char *re, ByteProg *prog, int sizecode)
                 prog->len++;
                 break;
             }
+            MP_FALLTHROUGH
         default:
             term = PC;
             EMIT(PC++, Char);
diff --git a/extmod/re1.5/recursiveloop.c b/extmod/re1.5/recursiveloop.c
index bb337decfbc95..f8cb92629200a 100644
--- a/extmod/re1.5/recursiveloop.c
+++ b/extmod/re1.5/recursiveloop.c
@@ -22,6 +22,7 @@ recursiveloop(char *pc, const char *sp, Subject *input, const char **subp, int n
 		case Char:
 			if(*sp != *pc++)
 				return 0;
+			MP_FALLTHROUGH
 		case Any:
 			sp++;
 			continue;
diff --git a/py/gc.c b/py/gc.c
index 9c6336852a0cd..767f1b81c4dfa 100644
--- a/py/gc.c
+++ b/py/gc.c
@@ -298,7 +298,8 @@ STATIC void gc_sweep(void) {
                 #if MICROPY_PY_GC_COLLECT_RETVAL
                 MP_STATE_MEM(gc_collected)++;
                 #endif
-            // fall through to free the head
+                // fall through to free the head
+                MP_FALLTHROUGH
 
             case AT_TAIL:
                 if (free_tail) {
diff --git a/py/lexer.c b/py/lexer.c
index 7d2a251d41d75..07ea2b96ab578 100644
--- a/py/lexer.c
+++ b/py/lexer.c
@@ -346,7 +346,8 @@ STATIC void parse_string_literal(mp_lexer_t *lex, bool is_raw) {
                                 vstr_add_char(&lex->vstr, '\\');
                                 break;
                             }
-                        // Otherwise fall through.
+                            // Otherwise fall through.
+                            MP_FALLTHROUGH
                         case 'x': {
                             mp_uint_t num = 0;
                             if (!get_hex(lex, (c == 'x' ? 2 : c == 'u' ? 4 : 8), &num)) {
diff --git a/py/mpconfig.h b/py/mpconfig.h
index cc83f3850d695..854188b66b585 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -1643,6 +1643,13 @@ typedef double mp_float_t;
 #endif
 #endif
 
+// Explicitly annotate switch case fall throughs
+#if defined(__GNUC__) && __GNUC__ >= 7
+#define MP_FALLTHROUGH __attribute__((fallthrough));
+#else
+#define MP_FALLTHROUGH
+#endif
+
 #ifndef MP_HTOBE16
 #if MP_ENDIANNESS_LITTLE
 #define MP_HTOBE16(x) ((uint16_t)((((x) & 0xff) << 8) | (((x) >> 8) & 0xff)))
diff --git a/py/objset.c b/py/objset.c
index f31a901a7008a..dac9b1138291e 100644
--- a/py/objset.c
+++ b/py/objset.c
@@ -445,6 +445,7 @@ STATIC mp_obj_t set_unary_op(mp_unary_op_t op, mp_obj_t self_in) {
                 }
                 return MP_OBJ_NEW_SMALL_INT(hash);
             }
+            MP_FALLTHROUGH
         #endif
         default:
             return MP_OBJ_NULL;      // op not supported

From bef412789ea93c521bd9c2dddc22b9b3484da574 Mon Sep 17 00:00:00 2001
From: Emil Renner Berthing <esmil@mailme.dk>
Date: Sat, 3 Oct 2020 11:29:16 +0200
Subject: [PATCH 0362/3533] mpy-cross: Enable more warnings.

---
 mpy-cross/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mpy-cross/Makefile b/mpy-cross/Makefile
index f80ee761b7bcf..971f2f81aa593 100644
--- a/mpy-cross/Makefile
+++ b/mpy-cross/Makefile
@@ -18,7 +18,7 @@ INC += -I$(TOP)
 
 # compiler settings
 CWARN = -Wall -Werror
-CWARN += -Wpointer-arith -Wuninitialized
+CWARN += -Wextra -Wno-unused-parameter -Wpointer-arith
 CFLAGS = $(INC) $(CWARN) -std=gnu99 $(CFLAGS_MOD) $(COPT) $(CFLAGS_EXTRA)
 CFLAGS += -fdata-sections -ffunction-sections -fno-asynchronous-unwind-tables
 

From 05f95682e7ddfb08c317e83826df9a1d636676f3 Mon Sep 17 00:00:00 2001
From: Emil Renner Berthing <esmil@mailme.dk>
Date: Sat, 3 Oct 2020 11:31:13 +0200
Subject: [PATCH 0363/3533] unix: Enable more warnings.

---
 ports/unix/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/unix/Makefile b/ports/unix/Makefile
index ff5f355022bc5..7380e5e41259c 100644
--- a/ports/unix/Makefile
+++ b/ports/unix/Makefile
@@ -39,7 +39,7 @@ INC += -I$(BUILD)
 
 # compiler settings
 CWARN = -Wall -Werror
-CWARN += -Wpointer-arith -Wuninitialized -Wdouble-promotion -Wsign-compare -Wfloat-conversion
+CWARN += -Wextra -Wno-unused-parameter -Wpointer-arith -Wdouble-promotion -Wfloat-conversion
 CFLAGS += $(INC) $(CWARN) -std=gnu99 -DUNIX $(CFLAGS_MOD) $(COPT) -I$(VARIANT_DIR) $(CFLAGS_EXTRA)
 
 # Debugging/Optimization

From 368c1a09611f2a139c0e401eeb4359f9cc2a7c57 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 28 Oct 2020 00:54:30 +1100
Subject: [PATCH 0364/3533] tests/thread/stress_schedule.py: Assign globals
 before running test.

When threading is enabled without the GIL then there can be races between
the threads accessing the globals dict.  Avoid this issue by making sure
all globals variables are allocated before starting the threads.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/thread/stress_schedule.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/tests/thread/stress_schedule.py b/tests/thread/stress_schedule.py
index c5a402b3a3c36..8be7f2d737874 100644
--- a/tests/thread/stress_schedule.py
+++ b/tests/thread/stress_schedule.py
@@ -14,7 +14,11 @@
 
 gc.disable()
 
+_NUM_TASKS = 10000
+_TIMEOUT_MS = 10000
+
 n = 0  # How many times the task successfully ran.
+t = None  # Start time of test, assigned here to preallocate entry in globals dict.
 
 
 def task(x):
@@ -34,9 +38,6 @@ def thread():
 for i in range(8):
     _thread.start_new_thread(thread, ())
 
-_NUM_TASKS = const(10000)
-_TIMEOUT_MS = const(10000)
-
 # Wait up to 10 seconds for 10000 tasks to be scheduled.
 t = utime.ticks_ms()
 while n < _NUM_TASKS and utime.ticks_diff(utime.ticks_ms(), t) < _TIMEOUT_MS:

From 0118c07916c24a6ccb6dbd0ea904312f01798b40 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 28 Oct 2020 17:19:52 +1100
Subject: [PATCH 0365/3533] stm32/machine_adc: Fix ADC auto-calibration to run
 when ADC not enabled.

Prior to this commit, the ADC calibration code was never executing because
ADVREGEN bit was set making the CR register always non-zero.

This commit changes the logic so that ADC calibration is always run when
the ADC is disabled and an ADC channel is initialised.  It also uses the LL
API functions to do the calibration, to make sure it is done correctly on
each MCU variant.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/boards/stm32f0xx_hal_conf_base.h |  1 +
 ports/stm32/boards/stm32h7xx_hal_conf_base.h |  1 +
 ports/stm32/boards/stm32l0xx_hal_conf_base.h |  1 +
 ports/stm32/boards/stm32wbxx_hal_conf_base.h |  1 +
 ports/stm32/machine_adc.c                    | 14 ++++++++++----
 5 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/ports/stm32/boards/stm32f0xx_hal_conf_base.h b/ports/stm32/boards/stm32f0xx_hal_conf_base.h
index 9cb7761ac2ca4..faceda2f4fa90 100644
--- a/ports/stm32/boards/stm32f0xx_hal_conf_base.h
+++ b/ports/stm32/boards/stm32f0xx_hal_conf_base.h
@@ -47,6 +47,7 @@
 #include "stm32f0xx_hal_uart.h"
 #include "stm32f0xx_hal_usart.h"
 #include "stm32f0xx_hal_wwdg.h"
+#include "stm32f0xx_ll_adc.h"
 
 // Enable various HAL modules
 #define HAL_MODULE_ENABLED
diff --git a/ports/stm32/boards/stm32h7xx_hal_conf_base.h b/ports/stm32/boards/stm32h7xx_hal_conf_base.h
index 5c97e2c44b720..9f43da40308f7 100644
--- a/ports/stm32/boards/stm32h7xx_hal_conf_base.h
+++ b/ports/stm32/boards/stm32h7xx_hal_conf_base.h
@@ -53,6 +53,7 @@
 #include "stm32h7xx_hal_uart.h"
 #include "stm32h7xx_hal_usart.h"
 #include "stm32h7xx_hal_wwdg.h"
+#include "stm32h7xx_ll_adc.h"
 
 // Enable various HAL modules
 #define HAL_ADC_MODULE_ENABLED
diff --git a/ports/stm32/boards/stm32l0xx_hal_conf_base.h b/ports/stm32/boards/stm32l0xx_hal_conf_base.h
index ed524fecca9c3..b100daaa98eb3 100644
--- a/ports/stm32/boards/stm32l0xx_hal_conf_base.h
+++ b/ports/stm32/boards/stm32l0xx_hal_conf_base.h
@@ -46,6 +46,7 @@
 #include "stm32l0xx_hal_uart.h"
 #include "stm32l0xx_hal_usart.h"
 #include "stm32l0xx_hal_wwdg.h"
+#include "stm32l0xx_ll_adc.h"
 
 // Enable various HAL modules
 #define HAL_MODULE_ENABLED
diff --git a/ports/stm32/boards/stm32wbxx_hal_conf_base.h b/ports/stm32/boards/stm32wbxx_hal_conf_base.h
index 8dbc9ecea7f12..83d07ad5b1c3b 100644
--- a/ports/stm32/boards/stm32wbxx_hal_conf_base.h
+++ b/ports/stm32/boards/stm32wbxx_hal_conf_base.h
@@ -41,6 +41,7 @@
 #include "stm32wbxx_hal_tim.h"
 #include "stm32wbxx_hal_uart.h"
 #include "stm32wbxx_hal_usart.h"
+#include "stm32wbxx_ll_adc.h"
 
 // Enable various HAL modules
 #define HAL_MODULE_ENABLED
diff --git a/ports/stm32/machine_adc.c b/ports/stm32/machine_adc.c
index f29896d37cf26..9c20f0f954989 100644
--- a/ports/stm32/machine_adc.c
+++ b/ports/stm32/machine_adc.c
@@ -156,10 +156,16 @@ STATIC void adc_config(ADC_TypeDef *adc, uint32_t bits) {
     #endif
 
     #if ADC_V2
-    if (adc->CR == 0) {
-        // ADC hasn't been enabled so calibrate it
-        adc->CR |= ADC_CR_ADCAL;
-        while (adc->CR & ADC_CR_ADCAL) {
+    if (!(adc->CR & ADC_CR_ADEN)) {
+        // ADC isn't enabled so calibrate it now
+        #if defined(STM32F0) || defined(STM32L0)
+        LL_ADC_StartCalibration(adc);
+        #elif defined(STM32L4) || defined(STM32WB)
+        LL_ADC_StartCalibration(adc, LL_ADC_SINGLE_ENDED);
+        #else
+        LL_ADC_StartCalibration(adc, LL_ADC_CALIB_OFFSET_LINEARITY, LL_ADC_SINGLE_ENDED);
+        #endif
+        while (LL_ADC_IsCalibrationOnGoing(adc)) {
         }
     }
 

From 03a1f94ea16a532bd4219092edb06e251d9a0ca5 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 29 Oct 2020 11:31:53 +1100
Subject: [PATCH 0366/3533] extmod/vfs_lfs: Support mounting LFS filesystems in
 read-only mode.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/vfs_lfsx.c                 | 12 +++++++++---
 tests/extmod/vfs_lfs_mount.py     | 17 +++++++++++++++++
 tests/extmod/vfs_lfs_mount.py.exp |  6 ++++++
 3 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/extmod/vfs_lfsx.c b/extmod/vfs_lfsx.c
index 35d5f03c59a2c..f865e46060234 100644
--- a/extmod/vfs_lfsx.c
+++ b/extmod/vfs_lfsx.c
@@ -423,10 +423,16 @@ STATIC mp_obj_t MP_VFS_LFSx(statvfs)(mp_obj_t self_in, mp_obj_t path_in) {
 STATIC MP_DEFINE_CONST_FUN_OBJ_2(MP_VFS_LFSx(statvfs_obj), MP_VFS_LFSx(statvfs));
 
 STATIC mp_obj_t MP_VFS_LFSx(mount)(mp_obj_t self_in, mp_obj_t readonly, mp_obj_t mkfs) {
-    (void)self_in;
-    (void)readonly;
+    MP_OBJ_VFS_LFSx *self = MP_OBJ_TO_PTR(self_in);
     (void)mkfs;
-    // already called LFSx_API(mount) in MP_VFS_LFSx(make_new)
+
+    // Make block device read-only if requested.
+    if (mp_obj_is_true(readonly)) {
+        self->blockdev.writeblocks[0] = MP_OBJ_NULL;
+    }
+
+    // Already called LFSx_API(mount) in MP_VFS_LFSx(make_new) so the filesystem is ready.
+
     return mp_const_none;
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_3(MP_VFS_LFSx(mount_obj), MP_VFS_LFSx(mount));
diff --git a/tests/extmod/vfs_lfs_mount.py b/tests/extmod/vfs_lfs_mount.py
index 2c40b2989796f..3d8cec6075c86 100644
--- a/tests/extmod/vfs_lfs_mount.py
+++ b/tests/extmod/vfs_lfs_mount.py
@@ -67,6 +67,23 @@ def test(bdev, vfs_class):
     # umount
     uos.umount("/lfs")
 
+    # mount read-only
+    vfs = vfs_class(bdev)
+    uos.mount(vfs, "/lfs", readonly=True)
+
+    # test reading works
+    with open("/lfs/subdir/lfsmod2.py") as f:
+        print("lfsmod2.py:", f.read())
+
+    # test writing fails
+    try:
+        open("/lfs/test_write", "w")
+    except OSError as er:
+        print(repr(er))
+
+    # umount
+    uos.umount("/lfs")
+
     # clear imported modules
     usys.modules.clear()
 
diff --git a/tests/extmod/vfs_lfs_mount.py.exp b/tests/extmod/vfs_lfs_mount.py.exp
index b5c52153141a2..aa654ebe05f12 100644
--- a/tests/extmod/vfs_lfs_mount.py.exp
+++ b/tests/extmod/vfs_lfs_mount.py.exp
@@ -2,7 +2,13 @@ test <class 'VfsLfs1'>
 hello from lfs
 package
 hello from lfs
+lfsmod2.py: print("hello from lfs")
+
+OSError(30,)
 test <class 'VfsLfs2'>
 hello from lfs
 package
 hello from lfs
+lfsmod2.py: print("hello from lfs")
+
+OSError(36,)

From b4062894df8e17e11179dcb5f5b28b27eed33aff Mon Sep 17 00:00:00 2001
From: robert <robert@hammelrath.com>
Date: Sat, 22 Aug 2020 20:56:26 +0200
Subject: [PATCH 0367/3533] esp32/mpconfigport.h: Seed the urandom module on
 import.

For seeding, the RNG function of the ESP-IDF is used, which is told to be a
true RNG, at least when WiFi or Bluetooth is enabled.  Seeding on import is
as per CPython.  To obtain a reproducible sequence of pseudo-random numbers
one must explicitly seed with a known value.
---
 ports/esp32/mpconfigport.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h
index b63d1f89558c0..f170d70708b79 100644
--- a/ports/esp32/mpconfigport.h
+++ b/ports/esp32/mpconfigport.h
@@ -6,6 +6,7 @@
 
 #include <stdint.h>
 #include <alloca.h>
+#include "esp_system.h"
 
 #if !MICROPY_ESP_IDF_4
 #include "rom/ets_sys.h"
@@ -141,6 +142,7 @@
 #define MICROPY_PY_UBINASCII_CRC32          (1)
 #define MICROPY_PY_URANDOM                  (1)
 #define MICROPY_PY_URANDOM_EXTRA_FUNCS      (1)
+#define MICROPY_PY_URANDOM_SEED_INIT_FUNC   (esp_random())
 #define MICROPY_PY_OS_DUPTERM               (1)
 #define MICROPY_PY_MACHINE                  (1)
 #define MICROPY_PY_MACHINE_PIN_MAKE_NEW     mp_pin_make_new

From 057193e855ca0b5873191c327184052765781ddf Mon Sep 17 00:00:00 2001
From: robert <robert@hammelrath.com>
Date: Sun, 23 Aug 2020 12:12:11 +0200
Subject: [PATCH 0368/3533] esp8266/mpconfigport.h: Seed the urandom module on
 import.

For seeding, the hardware RNG of the esp8266 is used.
---
 ports/esp8266/mpconfigport.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ports/esp8266/mpconfigport.h b/ports/esp8266/mpconfigport.h
index 974310f84da6e..99cf2ade4dec3 100644
--- a/ports/esp8266/mpconfigport.h
+++ b/ports/esp8266/mpconfigport.h
@@ -26,6 +26,7 @@
 #define MICROPY_HELPER_REPL         (1)
 #define MICROPY_HELPER_LEXER_UNIX   (0)
 #define MICROPY_ENABLE_SOURCE_LINE  (1)
+#define MICROPY_MODULE_BUILTIN_INIT (1)
 #define MICROPY_MODULE_WEAK_LINKS   (1)
 #define MICROPY_CAN_OVERRIDE_BUILTINS (1)
 #define MICROPY_USE_INTERNAL_ERRNO  (1)
@@ -69,6 +70,7 @@
 #define MICROPY_PY_UTIMEQ           (1)
 #define MICROPY_PY_UJSON            (1)
 #define MICROPY_PY_URANDOM          (1)
+#define MICROPY_PY_URANDOM_SEED_INIT_FUNC (*WDEV_HWRNG)
 #define MICROPY_PY_URE              (1)
 #define MICROPY_PY_USELECT          (1)
 #define MICROPY_PY_UTIME_MP_HAL     (1)
@@ -197,4 +199,6 @@ extern const struct _mp_obj_module_t mp_module_onewire;
 #define MICROPY_WRAP_MP_KEYBOARD_INTERRUPT(f) MP_FASTCODE(f)
 #define MICROPY_WRAP_MP_SCHED_SCHEDULE(f) MP_FASTCODE(f)
 
+#define WDEV_HWRNG ((volatile uint32_t *)0x3ff20e44)
+
 #define _assert(expr) ((expr) ? (void)0 : __assert_func(__FILE__, __LINE__, __func__, #expr))

From 59019d7f759c78dedd8d353d24c8d64a7a9981c7 Mon Sep 17 00:00:00 2001
From: robert <robert@hammelrath.com>
Date: Sun, 23 Aug 2020 12:14:23 +0200
Subject: [PATCH 0369/3533] stm32/mpconfigport.h: Seed the urandom module on
 import.

For seeding the rng_get function is used, which is also the heart of
uos.urandom and pyb.rng, and is a hardware RNG where available.
---
 ports/stm32/mpconfigport.h | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/ports/stm32/mpconfigport.h b/ports/stm32/mpconfigport.h
index 7ea41bb6f4655..5f8e7ec2de1c1 100644
--- a/ports/stm32/mpconfigport.h
+++ b/ports/stm32/mpconfigport.h
@@ -79,6 +79,7 @@
 #define MICROPY_FLOAT_IMPL          (MICROPY_FLOAT_IMPL_FLOAT)
 #endif
 #define MICROPY_STREAMS_NON_BLOCK   (1)
+#define MICROPY_MODULE_BUILTIN_INIT (1)
 #define MICROPY_MODULE_WEAK_LINKS   (1)
 #define MICROPY_CAN_OVERRIDE_BUILTINS (1)
 #define MICROPY_USE_INTERNAL_ERRNO  (1)
@@ -167,6 +168,7 @@
 #endif
 #ifndef MICROPY_PY_URANDOM
 #define MICROPY_PY_URANDOM          (1)
+#define MICROPY_PY_URANDOM_SEED_INIT_FUNC (rng_get())
 #endif
 #ifndef MICROPY_PY_URANDOM_EXTRA_FUNCS
 #define MICROPY_PY_URANDOM_EXTRA_FUNCS (1)
@@ -427,3 +429,6 @@ static inline mp_uint_t disable_irq(void) {
 
 // We need to provide a declaration/definition of alloca()
 #include <alloca.h>
+
+// Needed for MICROPY_PY_URANDOM_SEED_INIT_FUNC.
+uint32_t rng_get(void);

From 3e455e9792b5851a21ed2d94d518b21557d2a361 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 20 Oct 2020 14:17:46 +1100
Subject: [PATCH 0370/3533] stm32/rng: Use SysTick+RTC+unique-id to seed pRNG
 for MCUs without RNG.

The same seed will only occur if the board is the same, the RTC has the
same time (eg freshly powered up) and the first call to this function (eg
via an "import random") is done at exactly the same time since reset.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/rng.c | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/ports/stm32/rng.c b/ports/stm32/rng.c
index b23941998a475..eea02f72657de 100644
--- a/ports/stm32/rng.c
+++ b/ports/stm32/rng.c
@@ -24,6 +24,7 @@
  * THE SOFTWARE.
  */
 
+#include "rtc.h"
 #include "rng.h"
 
 #if MICROPY_HW_ENABLE_RNG
@@ -63,16 +64,26 @@ MP_DEFINE_CONST_FUN_OBJ_0(pyb_rng_get_obj, pyb_rng_get);
 #else // MICROPY_HW_ENABLE_RNG
 
 // For MCUs that don't have an RNG we still need to provide a rng_get() function,
-// eg for lwIP.  A pseudo-RNG is not really ideal but we go with it for now.  We
+// eg for lwIP and random.seed().  A pseudo-RNG is not really ideal but we go with
+// it for now, seeding with numbers which will be somewhat different each time.  We
 // don't want to use urandom's pRNG because then the user won't see a reproducible
 // random stream.
 
 // Yasmarang random number generator by Ilya Levin
 // http://www.literatecode.com/yasmarang
 STATIC uint32_t pyb_rng_yasmarang(void) {
-    static uint32_t pad = 0xeda4baba, n = 69, d = 233;
+    static bool seeded = false;
+    static uint32_t pad = 0, n = 0, d = 0;
     static uint8_t dat = 0;
 
+    if (!seeded) {
+        seeded = true;
+        rtc_init_finalise();
+        pad = *(uint32_t *)MP_HAL_UNIQUE_ID_ADDRESS ^ SysTick->VAL;
+        n = RTC->TR;
+        d = RTC->SSR;
+    }
+
     pad += dat + d * n;
     pad = (pad << 3) + (pad >> 29);
     n = pad | 2;

From 6f34800884f0a9a0c7116a7c5b94c6db38c4b417 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 20 Oct 2020 14:20:00 +1100
Subject: [PATCH 0371/3533] extmod/modurandom: Support urandom.seed() without
 an argument.

If a port provides MICROPY_PY_URANDOM_SEED_INIT_FUNC as a source of
randomness then this will be used when urandom.seed() is called without
an argument (or with None as the argument) to seed the pRNG.

Other related changes in this commit:
- mod_urandom___init__ is changed to call seed() without arguments, instead
  of explicitly passing in the result of MICROPY_PY_URANDOM_SEED_INIT_FUNC.
- mod_urandom___init__ will only ever seed the pRNG once (before it could
  seed it again if imported by, eg, random and then urandom).
- The Yasmarang state is moved to the BSS for builds where the state is
  guaranteed to be initialised on import of the (u)random module.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/modurandom.c                  | 41 ++++++++++++++++++++++++----
 tests/extmod/urandom_seed_default.py | 30 ++++++++++++++++++++
 2 files changed, 65 insertions(+), 6 deletions(-)
 create mode 100644 tests/extmod/urandom_seed_default.py

diff --git a/extmod/modurandom.c b/extmod/modurandom.c
index ab83b0f701234..5a736c1ebc628 100644
--- a/extmod/modurandom.c
+++ b/extmod/modurandom.c
@@ -31,15 +31,29 @@
 
 #if MICROPY_PY_URANDOM
 
+// Work out if the seed will be set on import or not.
+#if MICROPY_MODULE_BUILTIN_INIT && defined(MICROPY_PY_URANDOM_SEED_INIT_FUNC)
+#define SEED_ON_IMPORT (1)
+#else
+#define SEED_ON_IMPORT (0)
+#endif
+
 // Yasmarang random number generator
 // by Ilya Levin
 // http://www.literatecode.com/yasmarang
 // Public Domain
 
 #if !MICROPY_ENABLE_DYNRUNTIME
+#if SEED_ON_IMPORT
+// If the state is seeded on import then keep these variables in the BSS.
+STATIC uint32_t yasmarang_pad, yasmarang_n, yasmarang_d;
+STATIC uint8_t yasmarang_dat;
+#else
+// Without seed-on-import these variables must be initialised via the data section.
 STATIC uint32_t yasmarang_pad = 0xeda4baba, yasmarang_n = 69, yasmarang_d = 233;
 STATIC uint8_t yasmarang_dat = 0;
 #endif
+#endif
 
 STATIC uint32_t yasmarang(void) {
     yasmarang_pad += yasmarang_dat + yasmarang_d * yasmarang_n;
@@ -83,15 +97,24 @@ STATIC mp_obj_t mod_urandom_getrandbits(mp_obj_t num_in) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_urandom_getrandbits_obj, mod_urandom_getrandbits);
 
-STATIC mp_obj_t mod_urandom_seed(mp_obj_t seed_in) {
-    mp_uint_t seed = mp_obj_get_int_truncated(seed_in);
+STATIC mp_obj_t mod_urandom_seed(size_t n_args, const mp_obj_t *args) {
+    mp_uint_t seed;
+    if (n_args == 0 || args[0] == mp_const_none) {
+        #ifdef MICROPY_PY_URANDOM_SEED_INIT_FUNC
+        seed = MICROPY_PY_URANDOM_SEED_INIT_FUNC;
+        #else
+        mp_raise_ValueError(MP_ERROR_TEXT("no default seed"));
+        #endif
+    } else {
+        seed = mp_obj_get_int_truncated(args[0]);
+    }
     yasmarang_pad = seed;
     yasmarang_n = 69;
     yasmarang_d = 233;
     yasmarang_dat = 0;
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_urandom_seed_obj, mod_urandom_seed);
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_urandom_seed_obj, 0, 1, mod_urandom_seed);
 
 #if MICROPY_PY_URANDOM_EXTRA_FUNCS
 
@@ -189,9 +212,15 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_urandom_uniform_obj, mod_urandom_uniform);
 
 #endif // MICROPY_PY_URANDOM_EXTRA_FUNCS
 
-#ifdef MICROPY_PY_URANDOM_SEED_INIT_FUNC
+#if SEED_ON_IMPORT
 STATIC mp_obj_t mod_urandom___init__() {
-    mod_urandom_seed(MP_OBJ_NEW_SMALL_INT(MICROPY_PY_URANDOM_SEED_INIT_FUNC));
+    // This module may be imported by more than one name so need to ensure
+    // that it's only ever seeded once.
+    static bool seeded = false;
+    if (!seeded) {
+        seeded = true;
+        mod_urandom_seed(0, NULL);
+    }
     return mp_const_none;
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_0(mod_urandom___init___obj, mod_urandom___init__);
@@ -200,7 +229,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_0(mod_urandom___init___obj, mod_urandom___init__)
 #if !MICROPY_ENABLE_DYNRUNTIME
 STATIC const mp_rom_map_elem_t mp_module_urandom_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_urandom) },
-    #ifdef MICROPY_PY_URANDOM_SEED_INIT_FUNC
+    #if SEED_ON_IMPORT
     { MP_ROM_QSTR(MP_QSTR___init__), MP_ROM_PTR(&mod_urandom___init___obj) },
     #endif
     { MP_ROM_QSTR(MP_QSTR_getrandbits), MP_ROM_PTR(&mod_urandom_getrandbits_obj) },
diff --git a/tests/extmod/urandom_seed_default.py b/tests/extmod/urandom_seed_default.py
new file mode 100644
index 0000000000000..a032b9362b701
--- /dev/null
+++ b/tests/extmod/urandom_seed_default.py
@@ -0,0 +1,30 @@
+# test urandom.seed() without any arguments
+
+try:
+    import urandom as random
+except ImportError:
+    try:
+        import random
+    except ImportError:
+        print("SKIP")
+        raise SystemExit
+
+try:
+    random.seed()
+except ValueError:
+    # no default seed on this platform
+    print("SKIP")
+    raise SystemExit
+
+
+def rng_seq():
+    return [random.getrandbits(16) for _ in range(10)]
+
+
+# seed with default and check that doesn't produce the same RNG sequence
+random.seed()
+seq = rng_seq()
+random.seed()
+print(seq == rng_seq())
+random.seed(None)
+print(seq == rng_seq())

From 1b723937e3fe4012ac878ded833ff6a39455e0b8 Mon Sep 17 00:00:00 2001
From: stijn <stijn@ignitron.net>
Date: Wed, 26 Aug 2020 11:23:10 +0200
Subject: [PATCH 0372/3533] py/makeqstrdefs.py: Fix beaviour when scanning
 non-C preprocessed files.

When process_file() is passed a preprocessed C++ file for instance it won't
find any lines containing .c files and the last_fname variable remains
None, so handle that gracefully.
---
 py/makeqstrdefs.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/py/makeqstrdefs.py b/py/makeqstrdefs.py
index 9449a46ee924a..47afe0adb9775 100644
--- a/py/makeqstrdefs.py
+++ b/py/makeqstrdefs.py
@@ -58,7 +58,8 @@ def process_file(f):
             elif args.mode == _MODE_COMPRESS:
                 output.append(match)
 
-    write_out(last_fname, output)
+    if last_fname:
+        write_out(last_fname, output)
     return ""
 
 

From 2b9f0586e7a37a673aa2c8ef298751c8d30b2667 Mon Sep 17 00:00:00 2001
From: stijn <stijn@ignitron.net>
Date: Thu, 22 Oct 2020 14:09:33 +0200
Subject: [PATCH 0373/3533] py/makeqstrdefs.py: Process C++ files as well.

Preprocessed C++ code isn't different from C code when it comes to QSTR
instances so process it as well.
---
 py/makeqstrdefs.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/py/makeqstrdefs.py b/py/makeqstrdefs.py
index 47afe0adb9775..1db00d963356f 100644
--- a/py/makeqstrdefs.py
+++ b/py/makeqstrdefs.py
@@ -44,7 +44,7 @@ def process_file(f):
             m = re_line.match(line)
             assert m is not None
             fname = m.group(1)
-            if not fname.endswith(".c"):
+            if os.path.splitext(fname)[1] not in [".c", ".cpp"]:
                 continue
             if fname != last_fname:
                 write_out(last_fname, output)

From f1666419a8aaee846f7175ccdb8799ab9deea376 Mon Sep 17 00:00:00 2001
From: stijn <stijn@ignitron.net>
Date: Thu, 8 Oct 2020 16:19:26 +0200
Subject: [PATCH 0374/3533] py/mkrules.mk: Add target for compiling C++ files.

Move the target from the ESP32 Makefile since that does what is needed
already, but also include files from user C modules as is done for the C
files.
---
 ports/esp32/Makefile | 16 ----------------
 py/mkrules.mk        | 16 ++++++++++++++++
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/ports/esp32/Makefile b/ports/esp32/Makefile
index be282577229c4..94374eb1c4f98 100644
--- a/ports/esp32/Makefile
+++ b/ports/esp32/Makefile
@@ -781,22 +781,6 @@ $(BUILD)/application.elf: $(OBJ) $(LIB) $(BUILD)/esp32_out.ld $(BUILD)/esp32.pro
 	$(Q)$(LD) $(LDFLAGS) -o $@ $(APP_LD_ARGS)
 	$(Q)$(SIZE) $@
 
-define compile_cxx
-$(ECHO) "CXX $<"
-$(Q)$(CXX) $(CXXFLAGS) -c -MD -o $@ $<
-@# The following fixes the dependency file.
-@# See http://make.paulandlesley.org/autodep.html for details.
-@# Regex adjusted from the above to play better with Windows paths, etc.
-@$(CP) $(@:.o=.d) $(@:.o=.P); \
-  $(SED) -e 's/#.*//' -e 's/^.*:  *//' -e 's/ *\\$$//' \
-      -e '/^$$/ d' -e 's/$$/ :/' < $(@:.o=.d) >> $(@:.o=.P); \
-  $(RM) -f $(@:.o=.d)
-endef
-
-vpath %.cpp . $(TOP)
-$(BUILD)/%.o: %.cpp
-	$(call compile_cxx)
-
 ################################################################################
 # Declarations to build the bootloader
 
diff --git a/py/mkrules.mk b/py/mkrules.mk
index c37c25db4bd2f..f003174ea5449 100644
--- a/py/mkrules.mk
+++ b/py/mkrules.mk
@@ -58,12 +58,28 @@ $(Q)$(CC) $(CFLAGS) -c -MD -o $@ $<
   $(RM) -f $(@:.o=.d)
 endef
 
+define compile_cxx
+$(ECHO) "CXX $<"
+$(Q)$(CXX) $(CXXFLAGS) -c -MD -o $@ $<
+@# The following fixes the dependency file.
+@# See http://make.paulandlesley.org/autodep.html for details.
+@# Regex adjusted from the above to play better with Windows paths, etc.
+@$(CP) $(@:.o=.d) $(@:.o=.P); \
+  $(SED) -e 's/#.*//' -e 's/^.*:  *//' -e 's/ *\\$$//' \
+      -e '/^$$/ d' -e 's/$$/ :/' < $(@:.o=.d) >> $(@:.o=.P); \
+  $(RM) -f $(@:.o=.d)
+endef
+
 vpath %.c . $(TOP) $(USER_C_MODULES)
 $(BUILD)/%.o: %.c
 	$(call compile_c)
 
 vpath %.c . $(TOP) $(USER_C_MODULES)
 
+vpath %.cpp . $(TOP) $(USER_C_MODULES)
+$(BUILD)/%.o: %.cpp
+	$(call compile_cxx)
+
 $(BUILD)/%.pp: %.c
 	$(ECHO) "PreProcess $<"
 	$(Q)$(CPP) $(CFLAGS) -Wp,-C,-dD,-dI -o $@ $<

From 8e94fa0d2eb94483f387b1ae2e081d1998575a7f Mon Sep 17 00:00:00 2001
From: stijn <stijn@ignitron.net>
Date: Thu, 8 Oct 2020 16:40:17 +0200
Subject: [PATCH 0375/3533] py/makeqstrdefs.py: Support preprocessing C++ files
 for QSTR generation.

When SCR_QSTR contains C++ files they should be preprocessed with the same
compiler flags (CXXFLAGS) as they will be compiled with, to make sure code
scanned for QSTR occurrences is effectively the code used in the rest of
the build.  The 'split SCR_QSTR in .c and .cpp files and process each with
different flags' logic isn't trivial to express in a Makefile and the
existing principle for deciding which files to preprocess was already
rather complicated, so the actual preprocessing is moved into
makeqstrdefs.py completely.
---
 py/makeqstrdefs.py | 59 +++++++++++++++++++++++++++++++++++++++++++++-
 py/mkrules.mk      | 10 ++++----
 2 files changed, 64 insertions(+), 5 deletions(-)

diff --git a/py/makeqstrdefs.py b/py/makeqstrdefs.py
index 1db00d963356f..f514ae0c1052f 100644
--- a/py/makeqstrdefs.py
+++ b/py/makeqstrdefs.py
@@ -8,6 +8,7 @@
 from __future__ import print_function
 
 import re
+import subprocess
 import sys
 import io
 import os
@@ -20,6 +21,31 @@
 _MODE_COMPRESS = "compress"
 
 
+def preprocess():
+    if any(src in args.dependencies for src in args.changed_sources):
+        sources = args.sources
+    elif any(args.changed_sources):
+        sources = args.changed_sources
+    else:
+        sources = args.sources
+    csources = []
+    cxxsources = []
+    for source in sources:
+        if source.endswith(".cpp"):
+            cxxsources.append(source)
+        else:
+            csources.append(source)
+    try:
+        os.makedirs(os.path.dirname(args.output[0]))
+    except OSError:
+        pass
+    with open(args.output[0], "w") as out_file:
+        if csources:
+            subprocess.check_call(args.pp + args.cflags + csources, stdout=out_file)
+        if cxxsources:
+            subprocess.check_call(args.pp + args.cxxflags + cxxsources, stdout=out_file)
+
+
 def write_out(fname, output):
     if output:
         for m, r in [("/", "__"), ("\\", "__"), (":", "@"), ("..", "@@")]:
@@ -105,7 +131,7 @@ def cat_together():
 
 
 if __name__ == "__main__":
-    if len(sys.argv) != 6:
+    if len(sys.argv) < 6:
         print("usage: %s command mode input_filename output_dir output_file" % sys.argv[0])
         sys.exit(2)
 
@@ -114,6 +140,37 @@ class Args:
 
     args = Args()
     args.command = sys.argv[1]
+
+    if args.command == "pp":
+        named_args = {
+            s: []
+            for s in [
+                "pp",
+                "output",
+                "cflags",
+                "cxxflags",
+                "sources",
+                "changed_sources",
+                "dependencies",
+            ]
+        }
+
+        for arg in sys.argv[1:]:
+            if arg in named_args:
+                current_tok = arg
+            else:
+                named_args[current_tok].append(arg)
+
+        if not named_args["pp"] or len(named_args["output"]) != 1:
+            print("usage: %s %s ..." % (sys.argv[0], " ... ".join(named_args)))
+            sys.exit(2)
+
+        for k, v in named_args.items():
+            setattr(args, k, v)
+
+        preprocess()
+        sys.exit(0)
+
     args.mode = sys.argv[2]
     args.input_filename = sys.argv[3]  # Unused for command=cat
     args.output_dir = sys.argv[4]
diff --git a/py/mkrules.mk b/py/mkrules.mk
index f003174ea5449..3bfe64d7536a1 100644
--- a/py/mkrules.mk
+++ b/py/mkrules.mk
@@ -15,10 +15,12 @@ CFLAGS += -DMICROPY_ROM_TEXT_COMPRESSION=1
 endif
 
 # QSTR generation uses the same CFLAGS, with these modifications.
+QSTR_GEN_FLAGS = -DNO_QSTR -I$(BUILD)/tmp
 # Note: := to force evalulation immediately.
 QSTR_GEN_CFLAGS := $(CFLAGS)
-QSTR_GEN_CFLAGS += -DNO_QSTR
-QSTR_GEN_CFLAGS += -I$(BUILD)/tmp
+QSTR_GEN_CFLAGS += $(QSTR_GEN_FLAGS)
+QSTR_GEN_CXXFLAGS := $(CXXFLAGS)
+QSTR_GEN_CXXFLAGS += $(QSTR_GEN_FLAGS)
 
 # This file expects that OBJ contains a list of all of the object files.
 # The directory portion of each object file is used to locate the source
@@ -95,14 +97,14 @@ $(BUILD)/%.pp: %.c
 # to get built before we try to compile any of them.
 $(OBJ): | $(HEADER_BUILD)/qstrdefs.generated.h $(HEADER_BUILD)/mpversion.h $(OBJ_EXTRA_ORDER_DEPS)
 
-# The logic for qstr regeneration is:
+# The logic for qstr regeneration (applied by makeqstrdefs.py) is:
 # - if anything in QSTR_GLOBAL_DEPENDENCIES is newer, then process all source files ($^)
 # - else, if list of newer prerequisites ($?) is not empty, then process just these ($?)
 # - else, process all source files ($^) [this covers "make -B" which can set $? to empty]
 # See more information about this process in docs/develop/qstr.rst.
 $(HEADER_BUILD)/qstr.i.last: $(SRC_QSTR) $(QSTR_GLOBAL_DEPENDENCIES) | $(QSTR_GLOBAL_REQUIREMENTS)
 	$(ECHO) "GEN $@"
-	$(Q)$(CPP) $(QSTR_GEN_CFLAGS) $(if $(filter $?,$(QSTR_GLOBAL_DEPENDENCIES)),$^,$(if $?,$?,$^)) >$(HEADER_BUILD)/qstr.i.last
+	$(Q)$(PYTHON) $(PY_SRC)/makeqstrdefs.py pp $(CPP) output $(HEADER_BUILD)/qstr.i.last cflags $(QSTR_GEN_CFLAGS) cxxflags $(QSTR_GEN_CXXFLAGS) sources $^ dependencies $(QSTR_GLOBAL_DEPENDENCIES) changed_sources $?
 
 $(HEADER_BUILD)/qstr.split: $(HEADER_BUILD)/qstr.i.last
 	$(ECHO) "GEN $@"

From e498a8bd13a0ecdf1cc50f57eb6d3630e8c0c078 Mon Sep 17 00:00:00 2001
From: stijn <stijn@ignitron.net>
Date: Wed, 14 Oct 2020 15:42:18 +0200
Subject: [PATCH 0376/3533] py: Workaround clang error when building misc.h
 with C++ compiler.

---
 py/misc.h | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/py/misc.h b/py/misc.h
index 2dd20365c934c..aac90724460cf 100644
--- a/py/misc.h
+++ b/py/misc.h
@@ -272,7 +272,12 @@ typedef union _mp_float_union_t {
 // Map MP_COMPRESSED_ROM_TEXT to the compressed strings.
 
 // Force usage of the MP_ERROR_TEXT macro by requiring an opaque type.
-typedef struct {} *mp_rom_error_text_t;
+typedef struct {
+    #ifdef __clang__
+    // Fix "error: empty struct has size 0 in C, size 1 in C++".
+    char dummy;
+    #endif
+} *mp_rom_error_text_t;
 
 #include <string.h>
 

From 78c8b55067b2a3da8a2237fe8acd351d188902cb Mon Sep 17 00:00:00 2001
From: stijn <stijn@ignitron.net>
Date: Thu, 8 Oct 2020 16:39:33 +0200
Subject: [PATCH 0377/3533] docs: Fix reference to QSTR_GEN_CFLAGS Makefile
 flag.

---
 docs/develop/qstr.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/develop/qstr.rst b/docs/develop/qstr.rst
index 1b3b9f903bc91..3550a8bd425f2 100644
--- a/docs/develop/qstr.rst
+++ b/docs/develop/qstr.rst
@@ -51,7 +51,7 @@ Processing happens in the following stages:
    through the C pre-processor.  This means that any conditionally disabled code
    will be removed, and macros expanded.  This means we don't add strings to the
    pool that won't be used in the final firmware.  Because at this stage (thanks
-   to the ``NO_QSTR`` macro added by ``QSTR_GEN_EXTRA_CFLAGS``) there is no
+   to the ``NO_QSTR`` macro added by ``QSTR_GEN_CFLAGS``) there is no
    definition for ``MP_QSTR_Foo`` it passes through this stage unaffected.  This
    file also includes comments from the preprocessor that include line number
    information.  Note that this step only uses files that have changed, which

From 0153148fd26308e4ce921a4287ac4a26af15a9fe Mon Sep 17 00:00:00 2001
From: stijn <stijn@ignitron.net>
Date: Thu, 8 Oct 2020 16:44:55 +0200
Subject: [PATCH 0378/3533] py/py.mk: Support C++ code for user C modules.

Support C++ code in .cpp files by providing CXX counterparts of the
_USERMOD_ flags we have for C already.  This merely enables the Makefile of
user C modules to use variables specific to C++ compilation, it is still up
to each port's main Makefile to also include these in the build.
---
 docs/develop/cmodules.rst | 9 +++++----
 py/py.mk                  | 4 ++++
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/docs/develop/cmodules.rst b/docs/develop/cmodules.rst
index e616adad03353..849d0e60a2ea2 100644
--- a/docs/develop/cmodules.rst
+++ b/docs/develop/cmodules.rst
@@ -8,7 +8,8 @@ limitations with the Python environment, often due to an inability to access
 certain hardware resources or Python speed limitations.
 
 If your limitations can't be resolved with suggestions in :ref:`speed_python`,
-writing some or all of your module in C is a viable option.
+writing some or all of your module in C (and/or C++ if implemented for your port)
+is a viable option.
 
 If your module is designed to access or work with commonly available
 hardware or libraries please consider implementing it inside the MicroPython
@@ -29,7 +30,7 @@ Structure of an external C module
 
 A MicroPython user C module is a directory with the following files:
 
-* ``*.c`` and/or ``*.h`` source code files for your module.
+* ``*.c`` / ``*.cpp`` / ``*.h`` source code files for your module.
 
   These will typically include the low level functionality being implemented and
   the MicroPython binding functions to expose the functions and module(s).
@@ -44,12 +45,12 @@ A MicroPython user C module is a directory with the following files:
   in your ``micropython.mk`` to a local make variable,
   eg ``EXAMPLE_MOD_DIR := $(USERMOD_DIR)``
 
-  Your ``micropython.mk`` must add your modules C files relative to your
+  Your ``micropython.mk`` must add your modules source files relative to your
   expanded copy of ``$(USERMOD_DIR)`` to ``SRC_USERMOD``, eg
   ``SRC_USERMOD += $(EXAMPLE_MOD_DIR)/example.c``
 
   If you have custom ``CFLAGS`` settings or include folders to define, these
-  should be added to ``CFLAGS_USERMOD``.
+  should be added to ``CFLAGS_USERMOD``, or ``CXXFLAGS_USERMOD``.
 
   See below for full usage example.
 
diff --git a/py/py.mk b/py/py.mk
index d864a7ed3d843..bac38f07412f9 100644
--- a/py/py.mk
+++ b/py/py.mk
@@ -33,7 +33,9 @@ ifneq ($(USER_C_MODULES),)
 # pre-define USERMOD variables as expanded so that variables are immediate
 # expanded as they're added to them
 SRC_USERMOD :=
+SRC_USERMOD_CXX :=
 CFLAGS_USERMOD :=
+CXXFLAGS_USERMOD :=
 LDFLAGS_USERMOD :=
 $(foreach module, $(wildcard $(USER_C_MODULES)/*/micropython.mk), \
     $(eval USERMOD_DIR = $(patsubst %/,%,$(dir $(module))))\
@@ -42,7 +44,9 @@ $(foreach module, $(wildcard $(USER_C_MODULES)/*/micropython.mk), \
 )
 
 SRC_MOD += $(patsubst $(USER_C_MODULES)/%.c,%.c,$(SRC_USERMOD))
+SRC_MOD_CXX += $(patsubst $(USER_C_MODULES)/%.cpp,%.cpp,$(SRC_USERMOD_CXX))
 CFLAGS_MOD += $(CFLAGS_USERMOD)
+CXXFLAGS_MOD += $(CXXFLAGS_USERMOD)
 LDFLAGS_MOD += $(LDFLAGS_USERMOD)
 endif
 

From fad4079778f46bc21dd19a674b31b4c3c7eb6a91 Mon Sep 17 00:00:00 2001
From: stijn <stijn@ignitron.net>
Date: Thu, 8 Oct 2020 16:52:25 +0200
Subject: [PATCH 0379/3533] esp32,unix: Support building C++ code.

Support building .cpp files and linking them into the micropython
executable in a way similar to how it is done for .c files.  The main
incentive here is to enable user C modules to use C++ files (which are put
in SRC_MOD_CXX by py.mk) since the core itself does not utilize C++.

However, to verify build functionality a unix overage test is added.  The
esp32 port already has CXXFLAGS so just add the user modules' flags to it.
For the unix port use a copy of the CFLAGS but strip the ones which are not
usable for C++.
---
 .travis.yml                      |  2 +-
 ports/esp32/Makefile             |  8 ++++++--
 ports/unix/Makefile              | 15 ++++++++++++++-
 ports/unix/coveragecpp.cpp       | 23 +++++++++++++++++++++++
 ports/unix/main.c                |  2 ++
 tests/unix/extra_coverage.py     |  3 +++
 tests/unix/extra_coverage.py.exp |  1 +
 7 files changed, 50 insertions(+), 4 deletions(-)
 create mode 100644 ports/unix/coveragecpp.cpp

diff --git a/.travis.yml b/.travis.yml
index c9fcc21336efd..3b399804e37a3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -165,7 +165,7 @@ jobs:
     - stage: test
       name: "unix coverage 32-bit build and tests"
       install:
-        - sudo apt-get install gcc-multilib libffi-dev:i386
+        - sudo apt-get install gcc-multilib g++-multilib libffi-dev:i386
         - sudo apt-get install python3-pip
         - sudo pip3 install setuptools
         - sudo pip3 install pyelftools
diff --git a/ports/esp32/Makefile b/ports/esp32/Makefile
index 94374eb1c4f98..756bc8f8940c5 100644
--- a/ports/esp32/Makefile
+++ b/ports/esp32/Makefile
@@ -268,7 +268,7 @@ CFLAGS += -DMICROPY_ESP_IDF_4=1
 endif
 
 # this is what ESPIDF uses for c++ compilation
-CXXFLAGS = -std=gnu++11 $(CFLAGS_COMMON) $(INC) $(INC_ESPCOMP)
+CXXFLAGS = -std=gnu++11 $(CFLAGS_COMMON) $(INC) $(INC_ESPCOMP) $(CXXFLAGS_MOD)
 
 LDFLAGS = -nostdlib -Map=$(@:.elf=.map) --cref
 LDFLAGS += --gc-sections -static -EL
@@ -354,6 +354,9 @@ SRC_C = \
 	$(wildcard $(BOARD_DIR)/*.c) \
 	$(SRC_MOD)
 
+SRC_CXX += \
+	$(SRC_MOD_CXX)
+
 EXTMOD_SRC_C += $(addprefix extmod/,\
 	modonewire.c \
 	)
@@ -376,6 +379,7 @@ DRIVERS_SRC_C = $(addprefix drivers/,\
 OBJ_MP =
 OBJ_MP += $(PY_O)
 OBJ_MP += $(addprefix $(BUILD)/, $(SRC_C:.c=.o))
+OBJ_MP += $(addprefix $(BUILD)/, $(SRC_CXX:.cpp=.o))
 OBJ_MP += $(addprefix $(BUILD)/, $(EXTMOD_SRC_C:.c=.o))
 OBJ_MP += $(addprefix $(BUILD)/, $(LIB_SRC_C:.c=.o))
 OBJ_MP += $(addprefix $(BUILD)/, $(DRIVERS_SRC_C:.c=.o))
@@ -384,7 +388,7 @@ OBJ_MP += $(addprefix $(BUILD)/, $(DRIVERS_SRC_C:.c=.o))
 $(OBJ_MP): CFLAGS += -Wdouble-promotion -Wfloat-conversion
 
 # List of sources for qstr extraction
-SRC_QSTR += $(SRC_C) $(EXTMOD_SRC_C) $(LIB_SRC_C) $(DRIVERS_SRC_C)
+SRC_QSTR += $(SRC_C) $(SRC_CXX) $(EXTMOD_SRC_C) $(LIB_SRC_C) $(DRIVERS_SRC_C)
 # Append any auto-generated sources that are needed by sources listed in SRC_QSTR
 SRC_QSTR_AUTO_DEPS +=
 
diff --git a/ports/unix/Makefile b/ports/unix/Makefile
index 7380e5e41259c..3388d67a2d6f8 100644
--- a/ports/unix/Makefile
+++ b/ports/unix/Makefile
@@ -248,13 +248,18 @@ LIB_SRC_C += $(addprefix lib/,\
 	utils/gchelper_generic.c \
 	)
 
+SRC_CXX += \
+	coveragecpp.cpp \
+	$(SRC_MOD_CXX)
+
 OBJ = $(PY_O)
 OBJ += $(addprefix $(BUILD)/, $(SRC_C:.c=.o))
+OBJ += $(addprefix $(BUILD)/, $(SRC_CXX:.cpp=.o))
 OBJ += $(addprefix $(BUILD)/, $(LIB_SRC_C:.c=.o))
 OBJ += $(addprefix $(BUILD)/, $(EXTMOD_SRC_C:.c=.o))
 
 # List of sources for qstr extraction
-SRC_QSTR += $(SRC_C) $(LIB_SRC_C) $(EXTMOD_SRC_C)
+SRC_QSTR += $(SRC_C) $(SRC_CXX) $(LIB_SRC_C) $(EXTMOD_SRC_C)
 # Append any auto-generated sources that are needed by sources listed in
 # SRC_QSTR
 SRC_QSTR_AUTO_DEPS +=
@@ -272,6 +277,14 @@ ifneq ($(FROZEN_MANIFEST)$(FROZEN_DIR),)
 CFLAGS += -DMICROPY_MODULE_FROZEN_STR
 endif
 
+HASCPP17 = $(shell expr `$(CC) -dumpversion | cut -f1 -d.` \>= 7)
+ifeq ($(HASCPP17), 1)
+	CXXFLAGS += -std=c++17
+else
+	CXXFLAGS += -std=c++11
+endif
+CXXFLAGS += $(filter-out -Wmissing-prototypes -Wold-style-definition -std=gnu99,$(CFLAGS) $(CXXFLAGS_MOD))
+
 ifeq ($(MICROPY_FORCE_32BIT),1)
 RUN_TESTS_MPY_CROSS_FLAGS = --mpy-cross-flags='-mcache-lookup-bc -march=x86'
 else
diff --git a/ports/unix/coveragecpp.cpp b/ports/unix/coveragecpp.cpp
new file mode 100644
index 0000000000000..ea7418e1dd46a
--- /dev/null
+++ b/ports/unix/coveragecpp.cpp
@@ -0,0 +1,23 @@
+extern "C" {
+#include "py/obj.h"
+}
+
+#if defined(MICROPY_UNIX_COVERAGE)
+
+// Just to test building of C++ code.
+STATIC mp_obj_t extra_cpp_coverage_impl() {
+    return mp_const_none;
+}
+
+extern "C" {
+mp_obj_t extra_cpp_coverage(void);
+mp_obj_t extra_cpp_coverage(void) {
+    return extra_cpp_coverage_impl();
+}
+
+// This is extern to avoid name mangling.
+extern const mp_obj_fun_builtin_fixed_t extra_cpp_coverage_obj = {{&mp_type_fun_builtin_0}, {extra_cpp_coverage}};
+
+}
+
+#endif
diff --git a/ports/unix/main.c b/ports/unix/main.c
index 0fe492a554cbd..6f85cbf8d021d 100644
--- a/ports/unix/main.c
+++ b/ports/unix/main.c
@@ -531,7 +531,9 @@ MP_NOINLINE int main_(int argc, char **argv) {
     #if defined(MICROPY_UNIX_COVERAGE)
     {
         MP_DECLARE_CONST_FUN_OBJ_0(extra_coverage_obj);
+        MP_DECLARE_CONST_FUN_OBJ_0(extra_cpp_coverage_obj);
         mp_store_global(QSTR_FROM_STR_STATIC("extra_coverage"), MP_OBJ_FROM_PTR(&extra_coverage_obj));
+        mp_store_global(QSTR_FROM_STR_STATIC("extra_cpp_coverage"), MP_OBJ_FROM_PTR(&extra_cpp_coverage_obj));
     }
     #endif
 
diff --git a/tests/unix/extra_coverage.py b/tests/unix/extra_coverage.py
index 36105f6bad18c..1c028506e3fcc 100644
--- a/tests/unix/extra_coverage.py
+++ b/tests/unix/extra_coverage.py
@@ -46,6 +46,9 @@
 buf = uio.BufferedWriter(stream, 8)
 print(buf.write(bytearray(16)))
 
+# function defined in C++ code
+print("cpp", extra_cpp_coverage())
+
 # test basic import of frozen scripts
 import frzstr1
 
diff --git a/tests/unix/extra_coverage.py.exp b/tests/unix/extra_coverage.py.exp
index 7d7b7dd9f92f2..514ff9437bfee 100644
--- a/tests/unix/extra_coverage.py.exp
+++ b/tests/unix/extra_coverage.py.exp
@@ -144,6 +144,7 @@ OSError
 0
 None
 None
+cpp None
 frzstr1
 frzstr1.py
 frzmpy1

From 25c4563f26c2270cde01b01dca0e8b801c9c8282 Mon Sep 17 00:00:00 2001
From: stijn <stijn@ignitron.net>
Date: Wed, 21 Oct 2020 11:13:47 +0200
Subject: [PATCH 0380/3533] examples: Add example code for user C modules, both
 C and C++.

Add working example code to provide a starting point for users with files
that they can just copy, and include the modules in the coverage test to
verify the complete user C module build functionality.  The cexample module
uses the code originally found in cmodules.rst, which has been updated to
reflect this and partially rewritten with more complete information.
---
 docs/develop/cmodules.rst                     | 160 ++++++++----------
 examples/usercmodule/cexample/examplemodule.c |  34 ++++
 examples/usercmodule/cexample/micropython.mk  |   9 +
 examples/usercmodule/cppexample/example.cpp   |  17 ++
 .../usercmodule/cppexample/examplemodule.c    |  25 +++
 .../usercmodule/cppexample/examplemodule.h    |   5 +
 .../usercmodule/cppexample/micropython.mk     |  12 ++
 .../unix/variants/coverage/mpconfigvariant.mk |   4 +-
 tests/unix/extra_coverage.py                  |  10 ++
 tests/unix/extra_coverage.py.exp              |   2 +
 10 files changed, 192 insertions(+), 86 deletions(-)
 create mode 100644 examples/usercmodule/cexample/examplemodule.c
 create mode 100644 examples/usercmodule/cexample/micropython.mk
 create mode 100644 examples/usercmodule/cppexample/example.cpp
 create mode 100644 examples/usercmodule/cppexample/examplemodule.c
 create mode 100644 examples/usercmodule/cppexample/examplemodule.h
 create mode 100644 examples/usercmodule/cppexample/micropython.mk

diff --git a/docs/develop/cmodules.rst b/docs/develop/cmodules.rst
index 849d0e60a2ea2..2d08df82820d9 100644
--- a/docs/develop/cmodules.rst
+++ b/docs/develop/cmodules.rst
@@ -49,8 +49,9 @@ A MicroPython user C module is a directory with the following files:
   expanded copy of ``$(USERMOD_DIR)`` to ``SRC_USERMOD``, eg
   ``SRC_USERMOD += $(EXAMPLE_MOD_DIR)/example.c``
 
-  If you have custom ``CFLAGS`` settings or include folders to define, these
-  should be added to ``CFLAGS_USERMOD``, or ``CXXFLAGS_USERMOD``.
+  If you have custom compiler options (like ``-I`` to add directories to search
+  for header files), these should be added to ``CFLAGS_USERMOD`` for C code
+  and to ``CXXFLAGS_USERMOD`` for C++ code.
 
   See below for full usage example.
 
@@ -58,124 +59,113 @@ A MicroPython user C module is a directory with the following files:
 Basic example
 -------------
 
-This simple module named ``example`` provides a single function
-``example.add_ints(a, b)`` which adds the two integer args together and returns
-the result.
+This simple module named ``cexample`` provides a single function
+``cexample.add_ints(a, b)`` which adds the two integer args together and returns
+the result. It can be found in the MicroPython source tree and has
+a source file and a Makefile fragment with content as descibed above::
 
-Directory::
+    micropython/
+    └──examples/
+       └──usercmodule/
+          └──cexample/
+             ├── examplemodule.c
+             └── micropython.mk
 
-    example/
-    ├── example.c
-    └── micropython.mk
+Refer to the comments in these 2 files for additional explanation.
+Next to the ``cexample`` module there's also ``cppexample`` which
+works in the same way but shows one way of mixing C and C++ code
+in MicroPython.
 
 
-``example.c``
-
-.. code-block:: c
-
-    // Include required definitions first.
-    #include "py/obj.h"
-    #include "py/runtime.h"
-    #include "py/builtin.h"
-
-    // This is the function which will be called from Python as example.add_ints(a, b).
-    STATIC mp_obj_t example_add_ints(mp_obj_t a_obj, mp_obj_t b_obj) {
-        // Extract the ints from the micropython input objects
-        int a = mp_obj_get_int(a_obj);
-        int b = mp_obj_get_int(b_obj);
+Compiling the cmodule into MicroPython
+--------------------------------------
 
-        // Calculate the addition and convert to MicroPython object.
-        return mp_obj_new_int(a + b);
-    }
-    // Define a Python reference to the function above
-    STATIC MP_DEFINE_CONST_FUN_OBJ_2(example_add_ints_obj, example_add_ints);
+To build such a module, compile MicroPython (see `getting started
+<https://github.com/micropython/micropython/wiki/Getting-Started>`_),
+applying 2 modifications:
 
-    // Define all properties of the example module.
-    // Table entries are key/value pairs of the attribute name (a string)
-    // and the MicroPython object reference.
-    // All identifiers and strings are written as MP_QSTR_xxx and will be
-    // optimized to word-sized integers by the build system (interned strings).
-    STATIC const mp_rom_map_elem_t example_module_globals_table[] = {
-        { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_example) },
-        { MP_ROM_QSTR(MP_QSTR_add_ints), MP_ROM_PTR(&example_add_ints_obj) },
-    };
-    STATIC MP_DEFINE_CONST_DICT(example_module_globals, example_module_globals_table);
+- an extra ``make`` flag named ``USER_C_MODULES`` set to the directory
+  containing all modules you want included (not to the module itself).
+  For building the example modules which come with MicroPython,
+  set ``USER_C_MODULES`` to the ``examples/usercmodule`` directory.
+  For your own projects it's more convenient to keep custom code out of
+  the main source tree so a typical project directory structure will look
+  like this::
 
-    // Define module object.
-    const mp_obj_module_t example_user_cmodule = {
-        .base = { &mp_type_module },
-        .globals = (mp_obj_dict_t*)&example_module_globals,
-    };
+      my_project/
+      ├── modules/
+      │   └──example1/
+      │       ├──example1.c
+      │       └──micropython.mk
+      │   └──example2/
+      │       ├──example2.c
+      │       └──micropython.mk
+      └── micropython/
+          ├──ports/
+         ... ├──stm32/
+            ...
 
-    // Register the module to make it available in Python
-    MP_REGISTER_MODULE(MP_QSTR_example, example_user_cmodule, MODULE_EXAMPLE_ENABLED);
 
+  with ``USER_C_MODULES`` set to the ``my_project/modules`` directory.
 
-``micropython.mk``
+- all modules found in this directory will be compiled, but only those
+  which are explicitly enabled will be availabe for importing. Enabling a
+  module is done by setting the preprocessor define from its module
+  registration to 1. For example if the source code defines the module with
 
-.. code-block:: make
+  .. code-block:: c
 
-    EXAMPLE_MOD_DIR := $(USERMOD_DIR)
+      MP_REGISTER_MODULE(MP_QSTR_cexample, example_user_cmodule, MODULE_CEXAMPLE_ENABLED);
 
-    # Add all C files to SRC_USERMOD.
-    SRC_USERMOD += $(EXAMPLE_MOD_DIR)/example.c
 
-    # We can add our module folder to include paths if needed
-    # This is not actually needed in this example.
-    CFLAGS_USERMOD += -I$(EXAMPLE_MOD_DIR)
+  then ``MODULE_CEXAMPLE_ENABLED`` has to be set to 1 to make the module available.
+  This can be done by adding ``CFLAGS_EXTRA=-DMODULE_CEXAMPLE_ENABLED=1`` to
+  the ``make`` command, or editing ``mpconfigport.h`` or ``mpconfigboard.h``
+  to add
 
-Finally you will need to define ``MODULE_EXAMPLE_ENABLED`` to 1. This
-can be done by adding ``CFLAGS_EXTRA=-DMODULE_EXAMPLE_ENABLED=1`` to
-the ``make`` command, or editing ``mpconfigport.h`` or
-``mpconfigboard.h`` to add
+  .. code-block:: c
 
-.. code-block:: c
+      #define MODULE_CEXAMPLE_ENABLED (1)
 
-    #define MODULE_EXAMPLE_ENABLED (1)
 
-Note that the exact method depends on the port as they have different
-structures. If not done correctly it will compile but importing will
-fail to find the module.
+  Note that the exact method depends on the port as they have different
+  structures. If not done correctly it will compile but importing will
+  fail to find the module.
 
+To sum up, here's how the ``cexample`` module from the ``examples/usercmodule``
+directory can be built for the unix port:
 
-Compiling the cmodule into MicroPython
---------------------------------------
+.. code-block:: bash
 
-To build such a module, compile MicroPython (see `getting started
-<https://github.com/micropython/micropython/wiki/Getting-Started>`_) with an
-extra ``make`` flag named ``USER_C_MODULES`` set to the directory containing
-all modules you want included (not to the module itself). For example:
+    cd micropython/ports/unix
+    make USER_C_MODULES=../../examples/usercmodule CFLAGS_EXTRA=-DMODULE_CEXAMPLE_ENABLED=1 all
 
+The build output will show the modules found::
 
-Directory::
+    ...
+    Including User C Module from ../../examples/usercmodule/cexample
+    Including User C Module from ../../examples/usercmodule/cppexample
+    ...
 
-    my_project/
-    ├── modules/
-    │   └──example/
-    │       ├──example.c
-    │       └──micropython.mk
-    └── micropython/
-        ├──ports/
-       ... ├──stm32/
-          ...
 
-Building for stm32 port:
+Or for your own project with a directory structure as shown above,
+including both modules and building the stm32 port for example:
 
 .. code-block:: bash
 
     cd my_project/micropython/ports/stm32
-    make USER_C_MODULES=../../../modules CFLAGS_EXTRA=-DMODULE_EXAMPLE_ENABLED=1 all
+    make USER_C_MODULES=../../../modules \
+      CFLAGS_EXTRA="-DMODULE_EXAMPLE1_ENABLED=1 -DMODULE_EXAMPLE2_ENABLED=1" all
 
 
 Module usage in MicroPython
 ---------------------------
 
-Once built into your copy of MicroPython, the module implemented
-in ``example.c`` above can now be accessed in Python just
-like any other builtin module, eg
+Once built into your copy of MicroPython, the module
+can now be accessed in Python just like any other builtin module, e.g.
 
 .. code-block:: python
 
-    import example
-    print(example.add_ints(1, 3))
+    import cexample
+    print(cexample.add_ints(1, 3))
     # should display 4
diff --git a/examples/usercmodule/cexample/examplemodule.c b/examples/usercmodule/cexample/examplemodule.c
new file mode 100644
index 0000000000000..f608823c9e51c
--- /dev/null
+++ b/examples/usercmodule/cexample/examplemodule.c
@@ -0,0 +1,34 @@
+// Include MicroPython API.
+#include "py/runtime.h"
+
+// This is the function which will be called from Python as cexample.add_ints(a, b).
+STATIC mp_obj_t example_add_ints(mp_obj_t a_obj, mp_obj_t b_obj) {
+    // Extract the ints from the micropython input objects.
+    int a = mp_obj_get_int(a_obj);
+    int b = mp_obj_get_int(b_obj);
+
+    // Calculate the addition and convert to MicroPython object.
+    return mp_obj_new_int(a + b);
+}
+// Define a Python reference to the function above.
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(example_add_ints_obj, example_add_ints);
+
+// Define all properties of the module.
+// Table entries are key/value pairs of the attribute name (a string)
+// and the MicroPython object reference.
+// All identifiers and strings are written as MP_QSTR_xxx and will be
+// optimized to word-sized integers by the build system (interned strings).
+STATIC const mp_rom_map_elem_t example_module_globals_table[] = {
+    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_cexample) },
+    { MP_ROM_QSTR(MP_QSTR_add_ints), MP_ROM_PTR(&example_add_ints_obj) },
+};
+STATIC MP_DEFINE_CONST_DICT(example_module_globals, example_module_globals_table);
+
+// Define module object.
+const mp_obj_module_t example_user_cmodule = {
+    .base = { &mp_type_module },
+    .globals = (mp_obj_dict_t *)&example_module_globals,
+};
+
+// Register the module to make it available in Python.
+MP_REGISTER_MODULE(MP_QSTR_cexample, example_user_cmodule, MODULE_CEXAMPLE_ENABLED);
diff --git a/examples/usercmodule/cexample/micropython.mk b/examples/usercmodule/cexample/micropython.mk
new file mode 100644
index 0000000000000..dbfe3c5cbdb1f
--- /dev/null
+++ b/examples/usercmodule/cexample/micropython.mk
@@ -0,0 +1,9 @@
+EXAMPLE_MOD_DIR := $(USERMOD_DIR)
+
+# Add all C files to SRC_USERMOD.
+SRC_USERMOD += $(EXAMPLE_MOD_DIR)/examplemodule.c
+
+# We can add our module folder to include paths if needed
+# This is not actually needed in this example.
+CFLAGS_USERMOD += -I$(EXAMPLE_MOD_DIR)
+CEXAMPLE_MOD_DIR := $(USERMOD_DIR)
diff --git a/examples/usercmodule/cppexample/example.cpp b/examples/usercmodule/cppexample/example.cpp
new file mode 100644
index 0000000000000..06809732a4d7b
--- /dev/null
+++ b/examples/usercmodule/cppexample/example.cpp
@@ -0,0 +1,17 @@
+extern "C" {
+#include <examplemodule.h>
+
+// Here we implement the function using C++ code, but since it's
+// declaration has to be compatible with C everything goes in extern "C" scope.
+mp_obj_t cppfunc(mp_obj_t a_obj, mp_obj_t b_obj) {
+    // Prove we have (at least) C++11 features.
+    const auto a = mp_obj_get_int(a_obj);
+    const auto b = mp_obj_get_int(b_obj);
+    const auto sum = [&]() {
+        return mp_obj_new_int(a + b);
+    } ();
+    // Prove we're being scanned for QSTRs.
+    mp_obj_t tup[] = {sum, MP_ROM_QSTR(MP_QSTR_hellocpp)};
+    return mp_obj_new_tuple(2, tup);
+}
+}
diff --git a/examples/usercmodule/cppexample/examplemodule.c b/examples/usercmodule/cppexample/examplemodule.c
new file mode 100644
index 0000000000000..ceb588bef6b30
--- /dev/null
+++ b/examples/usercmodule/cppexample/examplemodule.c
@@ -0,0 +1,25 @@
+#include <examplemodule.h>
+
+// Define a Python reference to the function we'll make available.
+// See example.cpp for the definition.
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(cppfunc_obj, cppfunc);
+
+// Define all properties of the module.
+// Table entries are key/value pairs of the attribute name (a string)
+// and the MicroPython object reference.
+// All identifiers and strings are written as MP_QSTR_xxx and will be
+// optimized to word-sized integers by the build system (interned strings).
+STATIC const mp_rom_map_elem_t cppexample_module_globals_table[] = {
+    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_cppexample) },
+    { MP_ROM_QSTR(MP_QSTR_cppfunc), MP_ROM_PTR(&cppfunc_obj) },
+};
+STATIC MP_DEFINE_CONST_DICT(cppexample_module_globals, cppexample_module_globals_table);
+
+// Define module object.
+const mp_obj_module_t cppexample_user_cmodule = {
+    .base = { &mp_type_module },
+    .globals = (mp_obj_dict_t *)&cppexample_module_globals,
+};
+
+// Register the module to make it available in Python.
+MP_REGISTER_MODULE(MP_QSTR_cppexample, cppexample_user_cmodule, MODULE_CPPEXAMPLE_ENABLED);
diff --git a/examples/usercmodule/cppexample/examplemodule.h b/examples/usercmodule/cppexample/examplemodule.h
new file mode 100644
index 0000000000000..d89384a630060
--- /dev/null
+++ b/examples/usercmodule/cppexample/examplemodule.h
@@ -0,0 +1,5 @@
+// Include MicroPython API.
+#include "py/runtime.h"
+
+// Declare the function we'll make available in Python as cppexample.cppfunc().
+extern mp_obj_t cppfunc(mp_obj_t a_obj, mp_obj_t b_obj);
diff --git a/examples/usercmodule/cppexample/micropython.mk b/examples/usercmodule/cppexample/micropython.mk
new file mode 100644
index 0000000000000..e10d965a0011e
--- /dev/null
+++ b/examples/usercmodule/cppexample/micropython.mk
@@ -0,0 +1,12 @@
+CPPEXAMPLE_MOD_DIR := $(USERMOD_DIR)
+
+# Add our source files to the respective variables.
+SRC_USERMOD += $(CPPEXAMPLE_MOD_DIR)/examplemodule.c
+SRC_USERMOD_CXX += $(CPPEXAMPLE_MOD_DIR)/example.cpp
+
+# Add our module directory to the include path.
+CFLAGS_USERMOD += -I$(CPPEXAMPLE_MOD_DIR)
+CXXFLAGS_USERMOD += -I$(CPPEXAMPLE_MOD_DIR)
+
+# We use C++ features so have to link against the standard library.
+LDFLAGS_USERMOD += -lstdc++
diff --git a/ports/unix/variants/coverage/mpconfigvariant.mk b/ports/unix/variants/coverage/mpconfigvariant.mk
index f11d0b0d28f75..55399831aaa0a 100644
--- a/ports/unix/variants/coverage/mpconfigvariant.mk
+++ b/ports/unix/variants/coverage/mpconfigvariant.mk
@@ -7,11 +7,13 @@ CFLAGS += \
 	-fprofile-arcs -ftest-coverage \
 	-Wformat -Wmissing-declarations -Wmissing-prototypes \
 	-Wold-style-definition -Wpointer-arith -Wshadow -Wuninitialized -Wunused-parameter \
-	-DMICROPY_UNIX_COVERAGE
+	-DMICROPY_UNIX_COVERAGE \
+	-DMODULE_CEXAMPLE_ENABLED=1 -DMODULE_CPPEXAMPLE_ENABLED=1
 
 LDFLAGS += -fprofile-arcs -ftest-coverage
 
 FROZEN_MANIFEST ?= $(VARIANT_DIR)/manifest.py
+USER_C_MODULES = $(TOP)/examples/usercmodule
 
 MICROPY_ROM_TEXT_COMPRESSION = 1
 MICROPY_VFS_FAT = 1
diff --git a/tests/unix/extra_coverage.py b/tests/unix/extra_coverage.py
index 1c028506e3fcc..b4808993a760e 100644
--- a/tests/unix/extra_coverage.py
+++ b/tests/unix/extra_coverage.py
@@ -49,6 +49,16 @@
 # function defined in C++ code
 print("cpp", extra_cpp_coverage())
 
+# test user C module
+import cexample
+
+print(cexample.add_ints(3, 2))
+
+# test user C module mixed with C++ code
+import cppexample
+
+print(cppexample.cppfunc(1, 2))
+
 # test basic import of frozen scripts
 import frzstr1
 
diff --git a/tests/unix/extra_coverage.py.exp b/tests/unix/extra_coverage.py.exp
index 514ff9437bfee..257224108a4c5 100644
--- a/tests/unix/extra_coverage.py.exp
+++ b/tests/unix/extra_coverage.py.exp
@@ -145,6 +145,8 @@ OSError
 None
 None
 cpp None
+5
+(3, 'hellocpp')
 frzstr1
 frzstr1.py
 frzmpy1

From dbb13104ca612d1b2b289adc51c028a1bd1f7d1d Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 29 Oct 2020 17:32:39 +1100
Subject: [PATCH 0381/3533] docs/develop/cmodules.rst: Add link to source code
 for user C example.

Signed-off-by: Damien George <damien@micropython.org>
---
 docs/develop/cmodules.rst | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/docs/develop/cmodules.rst b/docs/develop/cmodules.rst
index 2d08df82820d9..2db1f65f2e488 100644
--- a/docs/develop/cmodules.rst
+++ b/docs/develop/cmodules.rst
@@ -61,8 +61,9 @@ Basic example
 
 This simple module named ``cexample`` provides a single function
 ``cexample.add_ints(a, b)`` which adds the two integer args together and returns
-the result. It can be found in the MicroPython source tree and has
-a source file and a Makefile fragment with content as descibed above::
+the result. It can be found in the MicroPython source tree
+`in the examples directory <https://github.com/micropython/micropython/tree/master/examples/usercmodule/cexample>`_
+and has a source file and a Makefile fragment with content as descibed above::
 
     micropython/
     └──examples/

From a866f868f87e50b9aa86a2f2bec8cfc9fb687437 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 29 Oct 2020 17:33:34 +1100
Subject: [PATCH 0382/3533] unix/Makefile: Move coverage.c and coveragecpp.cpp
 to coverage variant.

So that g++ is not needed to build a non-coverage unix variant.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/unix/Makefile                             | 4 +---
 ports/unix/variants/coverage/mpconfigvariant.mk | 3 +++
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/ports/unix/Makefile b/ports/unix/Makefile
index 3388d67a2d6f8..048ef97f77531 100644
--- a/ports/unix/Makefile
+++ b/ports/unix/Makefile
@@ -220,7 +220,7 @@ SRC_MOD += modjni.c
 endif
 
 # source files
-SRC_C = \
+SRC_C += \
 	main.c \
 	gccollect.c \
 	unix_mphal.c \
@@ -232,7 +232,6 @@ SRC_C = \
 	modtime.c \
 	moduselect.c \
 	alloc.c \
-	coverage.c \
 	fatfs_port.c \
 	mpbthciport.c \
 	mpbtstackport_common.c \
@@ -249,7 +248,6 @@ LIB_SRC_C += $(addprefix lib/,\
 	)
 
 SRC_CXX += \
-	coveragecpp.cpp \
 	$(SRC_MOD_CXX)
 
 OBJ = $(PY_O)
diff --git a/ports/unix/variants/coverage/mpconfigvariant.mk b/ports/unix/variants/coverage/mpconfigvariant.mk
index 55399831aaa0a..ef81975d9da8c 100644
--- a/ports/unix/variants/coverage/mpconfigvariant.mk
+++ b/ports/unix/variants/coverage/mpconfigvariant.mk
@@ -19,3 +19,6 @@ MICROPY_ROM_TEXT_COMPRESSION = 1
 MICROPY_VFS_FAT = 1
 MICROPY_VFS_LFS1 = 1
 MICROPY_VFS_LFS2 = 1
+
+SRC_C += coverage.c
+SRC_CXX += coveragecpp.cpp

From df3b466d6c44af494e404e54861b4c25cf4d54c8 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 29 Oct 2020 23:07:51 +1100
Subject: [PATCH 0383/3533] stm32/boards: Factor out common data/bss/heap/stack
 linker sections.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/boards/PYBD_SF2/f722_qspi.ld      | 37 +-------------
 ports/stm32/boards/PYBD_SF6/f767.ld           | 36 +-------------
 ports/stm32/boards/STM32F769DISC/f769_qspi.ld | 41 +---------------
 ports/stm32/boards/common_basic.ld            | 48 +------------------
 ports/stm32/boards/common_bl.ld               | 48 +------------------
 ports/stm32/boards/common_blifs.ld            | 48 +------------------
 ports/stm32/boards/common_bss_heap_stack.ld   | 28 +++++++++++
 .../boards/common_extratext_data_in_flash.ld  | 14 ++++++
 .../common_extratext_data_in_flash_app.ld     | 14 ++++++
 .../common_extratext_data_in_flash_text.ld    | 14 ++++++
 ports/stm32/boards/common_ifs.ld              | 48 +------------------
 11 files changed, 84 insertions(+), 292 deletions(-)
 create mode 100644 ports/stm32/boards/common_bss_heap_stack.ld
 create mode 100644 ports/stm32/boards/common_extratext_data_in_flash.ld
 create mode 100644 ports/stm32/boards/common_extratext_data_in_flash_app.ld
 create mode 100644 ports/stm32/boards/common_extratext_data_in_flash_text.ld

diff --git a/ports/stm32/boards/PYBD_SF2/f722_qspi.ld b/ports/stm32/boards/PYBD_SF2/f722_qspi.ld
index 3b2e45d9b6a11..c9199b341bfd4 100644
--- a/ports/stm32/boards/PYBD_SF2/f722_qspi.ld
+++ b/ports/stm32/boards/PYBD_SF2/f722_qspi.ld
@@ -72,39 +72,6 @@ SECTIONS
         _etext = .;
     } >FLASH_APP
 
-    _sidata = LOADADDR(.data);
-
-    .data :
-    {
-        . = ALIGN(4);
-        _sdata = .;
-        *(.data*)
-
-        . = ALIGN(4);
-        _edata = .;
-    } >RAM AT> FLASH_APP
-
-    .bss :
-    {
-        . = ALIGN(4);
-        _sbss = .;
-        *(.bss*)
-        *(COMMON)
-        . = ALIGN(4);
-        _ebss = .;
-    } >RAM
-
-    .heap :
-    {
-        . = ALIGN(4);
-        . = . + _minimum_heap_size;
-        . = ALIGN(4);
-    } >RAM
-
-    .stack :
-    {
-        . = ALIGN(4);
-        . = . + _minimum_stack_size;
-        . = ALIGN(4);
-    } >RAM
+    INCLUDE common_extratext_data_in_flash_app.ld
+    INCLUDE common_bss_heap_stack.ld
 }
diff --git a/ports/stm32/boards/PYBD_SF6/f767.ld b/ports/stm32/boards/PYBD_SF6/f767.ld
index 1dd4c11ed9898..5866f0b5cc2d5 100644
--- a/ports/stm32/boards/PYBD_SF6/f767.ld
+++ b/ports/stm32/boards/PYBD_SF6/f767.ld
@@ -62,38 +62,6 @@ SECTIONS
         _etext = .;
     } >FLASH_APP
 
-    _sidata = LOADADDR(.data);
-
-    .data :
-    {
-        . = ALIGN(4);
-        _sdata = .;
-        *(.data*)
-        . = ALIGN(4);
-        _edata = .;
-    } >RAM AT> FLASH_APP
-
-    .bss :
-    {
-        . = ALIGN(4);
-        _sbss = .;
-        *(.bss*)
-        *(COMMON)
-        . = ALIGN(4);
-        _ebss = .;
-    } >RAM
-
-    .heap :
-    {
-        . = ALIGN(4);
-        . = . + _minimum_heap_size;
-        . = ALIGN(4);
-    } >RAM
-
-    .stack :
-    {
-        . = ALIGN(4);
-        . = . + _minimum_stack_size;
-        . = ALIGN(4);
-    } >RAM
+    INCLUDE common_extratext_data_in_flash_app.ld
+    INCLUDE common_bss_heap_stack.ld
 }
diff --git a/ports/stm32/boards/STM32F769DISC/f769_qspi.ld b/ports/stm32/boards/STM32F769DISC/f769_qspi.ld
index 5f920b417fdde..b6957a321332c 100644
--- a/ports/stm32/boards/STM32F769DISC/f769_qspi.ld
+++ b/ports/stm32/boards/STM32F769DISC/f769_qspi.ld
@@ -68,43 +68,6 @@ SECTIONS
         _etext = .;
     } >FLASH_APP
 
-    /* Used by the startup to initialize data */
-    _sidata = LOADADDR(.data);
-
-    /* The initialized data section */
-    .data :
-    {
-        . = ALIGN(4);
-        _sdata = .;
-        *(.data*)
-        . = ALIGN(4);
-        _edata = .;
-    } >RAM AT> FLASH_APP
-
-    /* The uninitialized (zeroed) data section */
-    .bss :
-    {
-        . = ALIGN(4);
-        _sbss = .;
-        *(.bss*)
-        *(COMMON)
-        . = ALIGN(4);
-        _ebss = .;
-    } >RAM
-
-    /* Define the start of the heap, and make sure we have a minimum size */
-    .heap :
-    {
-        . = ALIGN(4);
-        . = . + _minimum_heap_size;
-        . = ALIGN(4);
-    } >RAM
-
-    /* Just checks there is enough RAM for the stack */
-    .stack :
-    {
-        . = ALIGN(4);
-        . = . + _minimum_stack_size;
-        . = ALIGN(4);
-    } >RAM
+    INCLUDE common_extratext_data_in_flash_app.ld
+    INCLUDE common_bss_heap_stack.ld
 }
diff --git a/ports/stm32/boards/common_basic.ld b/ports/stm32/boards/common_basic.ld
index 2e428aa62c573..dbda1b8b68ba4 100644
--- a/ports/stm32/boards/common_basic.ld
+++ b/ports/stm32/boards/common_basic.ld
@@ -37,50 +37,6 @@ SECTIONS
         _etext = .;        /* define a global symbol at end of code */
     } >FLASH
 
-    /* used by the startup to initialize data */
-    _sidata = LOADADDR(.data);
-
-    /* This is the initialized data section
-    The program executes knowing that the data is in the RAM
-    but the loader puts the initial values in the FLASH (inidata).
-    It is one task of the startup to copy the initial values from FLASH to RAM. */
-    .data :
-    {
-        . = ALIGN(4);
-        _sdata = .;        /* create a global symbol at data start; used by startup code in order to initialise the .data section in RAM */
-        *(.data*)          /* .data* sections */
-
-        . = ALIGN(4);
-        _edata = .;        /* define a global symbol at data end; used by startup code in order to initialise the .data section in RAM */
-    } >RAM AT> FLASH
-
-    /* Uninitialized data section */
-    .bss :
-    {
-        . = ALIGN(4);
-        _sbss = .;         /* define a global symbol at bss start; used by startup code */
-        *(.bss*)
-        *(COMMON)
-
-        . = ALIGN(4);
-        _ebss = .;         /* define a global symbol at bss end; used by startup code and GC */
-    } >RAM
-
-    /* this is to define the start of the heap, and make sure we have a minimum size */
-    .heap :
-    {
-        . = ALIGN(4);
-        . = . + _minimum_heap_size;
-        . = ALIGN(4);
-    } >RAM
-
-    /* this just checks there is enough RAM for the stack */
-    .stack :
-    {
-        . = ALIGN(4);
-        . = . + _minimum_stack_size;
-        . = ALIGN(4);
-    } >RAM
-
-    .ARM.attributes 0 : { *(.ARM.attributes) }
+    INCLUDE common_extratext_data_in_flash.ld
+    INCLUDE common_bss_heap_stack.ld
 }
diff --git a/ports/stm32/boards/common_bl.ld b/ports/stm32/boards/common_bl.ld
index 52b2a677d706d..21d809a3d2339 100644
--- a/ports/stm32/boards/common_bl.ld
+++ b/ports/stm32/boards/common_bl.ld
@@ -37,50 +37,6 @@ SECTIONS
         _etext = .;        /* define a global symbol at end of code */
     } >FLASH_APP
 
-    /* used by the startup to initialize data */
-    _sidata = LOADADDR(.data);
-
-    /* This is the initialized data section
-    The program executes knowing that the data is in the RAM
-    but the loader puts the initial values in the FLASH (inidata).
-    It is one task of the startup to copy the initial values from FLASH to RAM. */
-    .data :
-    {
-        . = ALIGN(4);
-        _sdata = .;        /* create a global symbol at data start; used by startup code in order to initialise the .data section in RAM */
-        *(.data*)          /* .data* sections */
-
-        . = ALIGN(4);
-        _edata = .;        /* define a global symbol at data end; used by startup code in order to initialise the .data section in RAM */
-    } >RAM AT> FLASH_APP
-
-    /* Uninitialized data section */
-    .bss :
-    {
-        . = ALIGN(4);
-        _sbss = .;         /* define a global symbol at bss start; used by startup code */
-        *(.bss*)
-        *(COMMON)
-
-        . = ALIGN(4);
-        _ebss = .;         /* define a global symbol at bss end; used by startup code and GC */
-    } >RAM
-
-    /* this is to define the start of the heap, and make sure we have a minimum size */
-    .heap :
-    {
-        . = ALIGN(4);
-        . = . + _minimum_heap_size;
-        . = ALIGN(4);
-    } >RAM
-
-    /* this just checks there is enough RAM for the stack */
-    .stack :
-    {
-        . = ALIGN(4);
-        . = . + _minimum_stack_size;
-        . = ALIGN(4);
-    } >RAM
-
-    .ARM.attributes 0 : { *(.ARM.attributes) }
+    INCLUDE common_extratext_data_in_flash_app.ld
+    INCLUDE common_bss_heap_stack.ld
 }
diff --git a/ports/stm32/boards/common_blifs.ld b/ports/stm32/boards/common_blifs.ld
index 65722f2e57e8d..5517a2d09c69c 100644
--- a/ports/stm32/boards/common_blifs.ld
+++ b/ports/stm32/boards/common_blifs.ld
@@ -37,50 +37,6 @@ SECTIONS
         _etext = .;        /* define a global symbol at end of code */
     } >FLASH_TEXT
 
-    /* used by the startup to initialize data */
-    _sidata = LOADADDR(.data);
-
-    /* This is the initialized data section
-    The program executes knowing that the data is in the RAM
-    but the loader puts the initial values in the FLASH (inidata).
-    It is one task of the startup to copy the initial values from FLASH to RAM. */
-    .data :
-    {
-        . = ALIGN(4);
-        _sdata = .;        /* create a global symbol at data start; used by startup code in order to initialise the .data section in RAM */
-        *(.data*)          /* .data* sections */
-
-        . = ALIGN(4);
-        _edata = .;        /* define a global symbol at data end; used by startup code in order to initialise the .data section in RAM */
-    } >RAM AT> FLASH_TEXT
-
-    /* Uninitialized data section */
-    .bss :
-    {
-        . = ALIGN(4);
-        _sbss = .;         /* define a global symbol at bss start; used by startup code */
-        *(.bss*)
-        *(COMMON)
-
-        . = ALIGN(4);
-        _ebss = .;         /* define a global symbol at bss end; used by startup code and GC */
-    } >RAM
-
-    /* this is to define the start of the heap, and make sure we have a minimum size */
-    .heap :
-    {
-        . = ALIGN(4);
-        . = . + _minimum_heap_size;
-        . = ALIGN(4);
-    } >RAM
-
-    /* this just checks there is enough RAM for the stack */
-    .stack :
-    {
-        . = ALIGN(4);
-        . = . + _minimum_stack_size;
-        . = ALIGN(4);
-    } >RAM
-
-    .ARM.attributes 0 : { *(.ARM.attributes) }
+    INCLUDE common_extratext_data_in_flash_text.ld
+    INCLUDE common_bss_heap_stack.ld
 }
diff --git a/ports/stm32/boards/common_bss_heap_stack.ld b/ports/stm32/boards/common_bss_heap_stack.ld
new file mode 100644
index 0000000000000..1bb2249e96c9b
--- /dev/null
+++ b/ports/stm32/boards/common_bss_heap_stack.ld
@@ -0,0 +1,28 @@
+/* This linker script fragment is intended to be included in SECTIONS. */
+
+/* Zeroed-out data section */
+.bss :
+{
+    . = ALIGN(4);
+    _sbss = .;
+    *(.bss*)
+    *(COMMON)
+    . = ALIGN(4);
+    _ebss = .;
+} >RAM
+
+/* This is to define the start of the heap, and make sure there is a minimum size */
+.heap :
+{
+    . = ALIGN(4);
+    . = . + _minimum_heap_size;
+    . = ALIGN(4);
+} >RAM
+
+/* This checks there is enough RAM for the stack */
+.stack :
+{
+    . = ALIGN(4);
+    . = . + _minimum_stack_size;
+    . = ALIGN(4);
+} >RAM
diff --git a/ports/stm32/boards/common_extratext_data_in_flash.ld b/ports/stm32/boards/common_extratext_data_in_flash.ld
new file mode 100644
index 0000000000000..e5f25a3c6f649
--- /dev/null
+++ b/ports/stm32/boards/common_extratext_data_in_flash.ld
@@ -0,0 +1,14 @@
+/* This linker script fragment is intended to be included in SECTIONS. */
+
+/* Used by the start-up code to initialise data */
+_sidata = LOADADDR(.data);
+
+/* Initialised data section, start-up code will copy it from flash to RAM */
+.data :
+{
+    . = ALIGN(4);
+    _sdata = .;
+    *(.data*)
+    . = ALIGN(4);
+    _edata = .;
+} >RAM AT> FLASH
diff --git a/ports/stm32/boards/common_extratext_data_in_flash_app.ld b/ports/stm32/boards/common_extratext_data_in_flash_app.ld
new file mode 100644
index 0000000000000..8230f8f9b2c38
--- /dev/null
+++ b/ports/stm32/boards/common_extratext_data_in_flash_app.ld
@@ -0,0 +1,14 @@
+/* This linker script fragment is intended to be included in SECTIONS. */
+
+/* Used by the start-up code to initialise data */
+_sidata = LOADADDR(.data);
+
+/* Initialised data section, start-up code will copy it from flash to RAM */
+.data :
+{
+    . = ALIGN(4);
+    _sdata = .;
+    *(.data*)
+    . = ALIGN(4);
+    _edata = .;
+} >RAM AT> FLASH_APP
diff --git a/ports/stm32/boards/common_extratext_data_in_flash_text.ld b/ports/stm32/boards/common_extratext_data_in_flash_text.ld
new file mode 100644
index 0000000000000..526d2519f7bff
--- /dev/null
+++ b/ports/stm32/boards/common_extratext_data_in_flash_text.ld
@@ -0,0 +1,14 @@
+/* This linker script fragment is intended to be included in SECTIONS. */
+
+/* Used by the start-up code to initialise data */
+_sidata = LOADADDR(.data);
+
+/* Initialised data section, start-up code will copy it from flash to RAM */
+.data :
+{
+    . = ALIGN(4);
+    _sdata = .;
+    *(.data*)
+    . = ALIGN(4);
+    _edata = .;
+} >RAM AT> FLASH_TEXT
diff --git a/ports/stm32/boards/common_ifs.ld b/ports/stm32/boards/common_ifs.ld
index 74b2ffb419406..733ca12f675bf 100644
--- a/ports/stm32/boards/common_ifs.ld
+++ b/ports/stm32/boards/common_ifs.ld
@@ -54,50 +54,6 @@ SECTIONS
         _etext = .;        /* define a global symbol at end of code */
     } >FLASH_TEXT
 
-    /* used by the startup to initialize data */
-    _sidata = LOADADDR(.data);
-
-    /* This is the initialized data section
-    The program executes knowing that the data is in the RAM
-    but the loader puts the initial values in the FLASH (inidata).
-    It is one task of the startup to copy the initial values from FLASH to RAM. */
-    .data :
-    {
-        . = ALIGN(4);
-        _sdata = .;        /* create a global symbol at data start; used by startup code in order to initialise the .data section in RAM */
-        *(.data*)          /* .data* sections */
-
-        . = ALIGN(4);
-        _edata = .;        /* define a global symbol at data end; used by startup code in order to initialise the .data section in RAM */
-    } >RAM AT> FLASH_TEXT
-
-    /* Uninitialized data section */
-    .bss :
-    {
-        . = ALIGN(4);
-        _sbss = .;         /* define a global symbol at bss start; used by startup code */
-        *(.bss*)
-        *(COMMON)
-
-        . = ALIGN(4);
-        _ebss = .;         /* define a global symbol at bss end; used by startup code and GC */
-    } >RAM
-
-    /* this is to define the start of the heap, and make sure we have a minimum size */
-    .heap :
-    {
-        . = ALIGN(4);
-        . = . + _minimum_heap_size;
-        . = ALIGN(4);
-    } >RAM
-
-    /* this just checks there is enough RAM for the stack */
-    .stack :
-    {
-        . = ALIGN(4);
-        . = . + _minimum_stack_size;
-        . = ALIGN(4);
-    } >RAM
-
-    .ARM.attributes 0 : { *(.ARM.attributes) }
+    INCLUDE common_extratext_data_in_flash_text.ld
+    INCLUDE common_bss_heap_stack.ld
 }

From 97960dc7deb7a0e691fca5944402cd03386b744b Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 29 Oct 2020 17:34:38 +1100
Subject: [PATCH 0384/3533] stm32: Support C++ code and user C modules written
 in C++.

Also build user C modules as part of the stm32 CI.

Signed-off-by: Damien George <damien@micropython.org>
---
 .travis.yml                                         |  2 +-
 ports/stm32/Makefile                                | 13 ++++++++++++-
 .../stm32/boards/common_extratext_data_in_flash.ld  |  8 ++++++++
 .../boards/common_extratext_data_in_flash_app.ld    |  8 ++++++++
 .../boards/common_extratext_data_in_flash_text.ld   |  8 ++++++++
 ports/stm32/main.c                                  |  4 ++++
 6 files changed, 41 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 3b399804e37a3..14595ddeb1d39 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -99,7 +99,7 @@ jobs:
         - make ${MAKEOPTS} -C ports/stm32 submodules
         - git submodule update --init lib/btstack
         - make ${MAKEOPTS} -C ports/stm32 BOARD=NUCLEO_F091RC
-        - make ${MAKEOPTS} -C ports/stm32 BOARD=PYBV11 MICROPY_PY_WIZNET5K=5200 MICROPY_PY_CC3K=1
+        - make ${MAKEOPTS} -C ports/stm32 BOARD=PYBV11 MICROPY_PY_WIZNET5K=5200 MICROPY_PY_CC3K=1 USER_C_MODULES=../../examples/usercmodule CFLAGS_EXTRA="-DMODULE_CEXAMPLE_ENABLED=1 -DMODULE_CPPEXAMPLE_ENABLED=1"
         - make ${MAKEOPTS} -C ports/stm32 BOARD=PYBD_SF2
         - make ${MAKEOPTS} -C ports/stm32 BOARD=PYBD_SF6 NANBOX=1 MICROPY_BLUETOOTH_NIMBLE=0 MICROPY_BLUETOOTH_BTSTACK=1
         - make ${MAKEOPTS} -C ports/stm32 BOARD=NUCLEO_H743ZI CFLAGS_EXTRA='-DMICROPY_PY_THREAD=1'
diff --git a/ports/stm32/Makefile b/ports/stm32/Makefile
index cf3a589ca9087..61da9cc9807aa 100644
--- a/ports/stm32/Makefile
+++ b/ports/stm32/Makefile
@@ -138,6 +138,13 @@ else
 COPT += -Os -DNDEBUG
 endif
 
+# Flags for optional C++ source code
+CXXFLAGS += $(filter-out -Wmissing-prototypes -Wold-style-definition -std=gnu99,$(CFLAGS))
+CXXFLAGS += $(CXXFLAGS_MOD)
+ifneq ($(SRC_CXX)$(SRC_MOD_CXX),)
+LDFLAGS += -L$(dir $(shell $(CXX) $(CXXFLAGS) -print-file-name=libstdc++.a))
+endif
+
 # Options for mpy-cross
 MPY_CROSS_FLAGS += -march=armv7m
 
@@ -330,6 +337,9 @@ SRC_C += \
 	adc.c \
 	$(wildcard $(BOARD_DIR)/*.c)
 
+SRC_CXX += \
+	$(SRC_MOD_CXX)
+
 SRC_O += \
 	$(STARTUP_FILE) \
 	$(SYSTEM_FILE)
@@ -511,6 +521,7 @@ OBJ += $(LIBM_O)
 OBJ += $(addprefix $(BUILD)/, $(EXTMOD_SRC_C:.c=.o))
 OBJ += $(addprefix $(BUILD)/, $(DRIVERS_SRC_C:.c=.o))
 OBJ += $(addprefix $(BUILD)/, $(SRC_C:.c=.o))
+OBJ += $(addprefix $(BUILD)/, $(SRC_CXX:.cpp=.o))
 OBJ += $(addprefix $(BUILD)/, $(SRC_O))
 OBJ += $(addprefix $(BUILD)/, $(SRC_HAL:.c=.o))
 OBJ += $(addprefix $(BUILD)/, $(SRC_USBDEV:.c=.o))
@@ -644,7 +655,7 @@ GEN_CDCINF_FILE = $(HEADER_BUILD)/pybcdc.inf
 GEN_CDCINF_HEADER = $(HEADER_BUILD)/pybcdc_inf.h
 
 # List of sources for qstr extraction
-SRC_QSTR += $(SRC_C) $(SRC_MOD) $(LIB_SRC_C) $(EXTMOD_SRC_C)
+SRC_QSTR += $(SRC_C) $(SRC_CXX) $(SRC_MOD) $(LIB_SRC_C) $(EXTMOD_SRC_C)
 # Append any auto-generated sources that are needed by sources listed in
 # SRC_QSTR
 SRC_QSTR_AUTO_DEPS += $(GEN_CDCINF_HEADER)
diff --git a/ports/stm32/boards/common_extratext_data_in_flash.ld b/ports/stm32/boards/common_extratext_data_in_flash.ld
index e5f25a3c6f649..eb9b86f49d8e0 100644
--- a/ports/stm32/boards/common_extratext_data_in_flash.ld
+++ b/ports/stm32/boards/common_extratext_data_in_flash.ld
@@ -1,5 +1,13 @@
 /* This linker script fragment is intended to be included in SECTIONS. */
 
+/* For C++ exception handling */
+.ARM :
+{
+    __exidx_start = .;
+    *(.ARM.exidx*)
+    __exidx_end = .;
+} >FLASH
+
 /* Used by the start-up code to initialise data */
 _sidata = LOADADDR(.data);
 
diff --git a/ports/stm32/boards/common_extratext_data_in_flash_app.ld b/ports/stm32/boards/common_extratext_data_in_flash_app.ld
index 8230f8f9b2c38..aba6bf57c88af 100644
--- a/ports/stm32/boards/common_extratext_data_in_flash_app.ld
+++ b/ports/stm32/boards/common_extratext_data_in_flash_app.ld
@@ -1,5 +1,13 @@
 /* This linker script fragment is intended to be included in SECTIONS. */
 
+/* For C++ exception handling */
+.ARM :
+{
+    __exidx_start = .;
+    *(.ARM.exidx*)
+    __exidx_end = .;
+} >FLASH_APP
+
 /* Used by the start-up code to initialise data */
 _sidata = LOADADDR(.data);
 
diff --git a/ports/stm32/boards/common_extratext_data_in_flash_text.ld b/ports/stm32/boards/common_extratext_data_in_flash_text.ld
index 526d2519f7bff..5a29e47307a6b 100644
--- a/ports/stm32/boards/common_extratext_data_in_flash_text.ld
+++ b/ports/stm32/boards/common_extratext_data_in_flash_text.ld
@@ -1,5 +1,13 @@
 /* This linker script fragment is intended to be included in SECTIONS. */
 
+/* For C++ exception handling */
+.ARM :
+{
+    __exidx_start = .;
+    *(.ARM.exidx*)
+    __exidx_end = .;
+} >FLASH_TEXT
+
 /* Used by the start-up code to initialise data */
 _sidata = LOADADDR(.data);
 
diff --git a/ports/stm32/main.c b/ports/stm32/main.c
index b5dbfa50fd5cc..f19dac0e7947b 100644
--- a/ports/stm32/main.c
+++ b/ports/stm32/main.c
@@ -133,6 +133,10 @@ void nlr_jump_fail(void *val) {
     __fatal_error("");
 }
 
+void abort(void) {
+    __fatal_error("abort");
+}
+
 #ifndef NDEBUG
 void MP_WEAK __assert_func(const char *file, int line, const char *func, const char *expr) {
     (void)func;

From ed7ddd4dd436fb84e602fee4dbdc4882eca642ab Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 29 Oct 2020 17:36:04 +1100
Subject: [PATCH 0385/3533] tests/micropython/extreme_exc.py: Unlink alloc'd
 lists earlier in chain.

To help the GC collect this memory that's no longer needed after the test.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/micropython/extreme_exc.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/micropython/extreme_exc.py b/tests/micropython/extreme_exc.py
index dae5b151860fc..9d2f24745f933 100644
--- a/tests/micropython/extreme_exc.py
+++ b/tests/micropython/extreme_exc.py
@@ -126,7 +126,7 @@ def f():
         )
     except Exception as er:
         e = er
-    lst[0] = None
+    lst[0][0] = None
     lst = None
     print(repr(e)[:10])
 

From 2ae3c890bd923b4c39bba3d2e2f2d75eca5dcc06 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Thu, 29 Oct 2020 15:47:20 +1100
Subject: [PATCH 0386/3533] extmod/btstack/btstack.mk: Add
 -Wimplicit-fallthrough=0.

This is needed since -Wextra was added to the build in
bef412789ea93c521bd9c2dddc22b9b3484da574

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 extmod/btstack/btstack.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/extmod/btstack/btstack.mk b/extmod/btstack/btstack.mk
index 7e5d2f646d14c..e3309b61db7a4 100644
--- a/extmod/btstack/btstack.mk
+++ b/extmod/btstack/btstack.mk
@@ -66,11 +66,12 @@ endif
 LIB_SRC_C += $(SRC_BTSTACK)
 
 # Suppress some warnings.
-BTSTACK_WARNING_CFLAGS = -Wno-old-style-definition -Wno-unused-variable -Wno-unused-parameter
+BTSTACK_WARNING_CFLAGS = -Wno-old-style-definition -Wno-unused-variable -Wno-unused-parameter -Wimplicit-fallthrough=0
 ifneq ($(CC),clang)
 BTSTACK_WARNING_CFLAGS += -Wno-format
 endif
 $(BUILD)/lib/btstack/src/%.o: CFLAGS += $(BTSTACK_WARNING_CFLAGS)
+$(BUILD)/lib/btstack/platform/%.o: CFLAGS += $(BTSTACK_WARNING_CFLAGS)
 
 endif
 endif

From b7883ce74c5a9b9689d812d134117d625fd42e73 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Wed, 4 Nov 2020 10:04:26 +1100
Subject: [PATCH 0387/3533] extmod/nimble/nimble.mk: Add
 -Wno-old-style-declaration.

This is needed since -Wextra was added to the build in
bef412789ea93c521bd9c2dddc22b9b3484da574

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 extmod/nimble/nimble.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extmod/nimble/nimble.mk b/extmod/nimble/nimble.mk
index f8a68bc6f52b6..fbd031b3e3e16 100644
--- a/extmod/nimble/nimble.mk
+++ b/extmod/nimble/nimble.mk
@@ -101,7 +101,7 @@ INC += -I$(TOP)/$(NIMBLE_LIB_DIR)/nimble/include
 INC += -I$(TOP)/$(NIMBLE_LIB_DIR)/nimble/transport/uart/include
 INC += -I$(TOP)/$(NIMBLE_LIB_DIR)/porting/nimble/include
 
-$(BUILD)/$(NIMBLE_LIB_DIR)/%.o: CFLAGS += -Wno-maybe-uninitialized -Wno-pointer-arith -Wno-unused-but-set-variable -Wno-format -Wno-sign-compare
+$(BUILD)/$(NIMBLE_LIB_DIR)/%.o: CFLAGS += -Wno-maybe-uninitialized -Wno-pointer-arith -Wno-unused-but-set-variable -Wno-format -Wno-sign-compare -Wno-old-style-declaration
 
 endif
 

From 1e297c88989592258965b69cb740039e26c7636c Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 2 Oct 2020 17:38:56 +1000
Subject: [PATCH 0388/3533] stm32/main: Move update_reset_mode to outside the
 soft-reset loop.

Running the update inside the soft-reset loop will mean that (on boards
like PYBD that use a bootloader) the same reset mode is used each
reset loop, eg factory reset occurs each time.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/main.c | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/ports/stm32/main.c b/ports/stm32/main.c
index f19dac0e7947b..7f8ee84fd4d6b 100644
--- a/ports/stm32/main.c
+++ b/ports/stm32/main.c
@@ -552,6 +552,11 @@ void stm32_main(uint32_t reset_mode) {
     MP_STATE_PORT(pyb_uart_obj_all)[MICROPY_HW_UART_REPL - 1] = &pyb_uart_repl_obj;
     #endif
 
+    #if !MICROPY_HW_USES_BOOTLOADER
+    // check if user switch held to select the reset mode
+    reset_mode = update_reset_mode(1);
+    #endif
+
 soft_reset:
 
     #if defined(MICROPY_HW_LED2)
@@ -564,11 +569,6 @@ void stm32_main(uint32_t reset_mode) {
     led_state(3, 0);
     led_state(4, 0);
 
-    #if !MICROPY_HW_USES_BOOTLOADER
-    // check if user switch held to select the reset mode
-    reset_mode = update_reset_mode(1);
-    #endif
-
     // Python threading init
     #if MICROPY_PY_THREAD
     mp_thread_init();
@@ -776,5 +776,8 @@ void stm32_main(uint32_t reset_mode) {
 
     gc_sweep_all();
 
+    // Set reset_mode to normal boot.
+    reset_mode = 1;
+
     goto soft_reset;
 }

From 4c3976bbcaf58266fdcaab264fee5b7a94a682e5 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 28 Oct 2020 00:44:18 +1100
Subject: [PATCH 0389/3533] stm32: Add MICROPY_BOARD calls in various places in
 stm32_main.

For a board to have full configurability of the soft reset loop.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/Makefile    |   1 +
 ports/stm32/boardctrl.c | 183 ++++++++++++++++++++++++++++++++++++++++
 ports/stm32/boardctrl.h |  80 ++++++++++++++++++
 ports/stm32/main.c      | 164 ++++++++---------------------------
 4 files changed, 298 insertions(+), 130 deletions(-)
 create mode 100644 ports/stm32/boardctrl.c
 create mode 100644 ports/stm32/boardctrl.h

diff --git a/ports/stm32/Makefile b/ports/stm32/Makefile
index 61da9cc9807aa..fa9998a8e078b 100644
--- a/ports/stm32/Makefile
+++ b/ports/stm32/Makefile
@@ -267,6 +267,7 @@ DRIVERS_SRC_C = $(addprefix drivers/,\
 	)
 
 SRC_C += \
+	boardctrl.c \
 	main.c \
 	stm32_it.c \
 	usbd_conf.c \
diff --git a/ports/stm32/boardctrl.c b/ports/stm32/boardctrl.c
new file mode 100644
index 0000000000000..188068d705a2a
--- /dev/null
+++ b/ports/stm32/boardctrl.c
@@ -0,0 +1,183 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013-2020 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "py/mphal.h"
+#include "lib/utils/pyexec.h"
+#include "boardctrl.h"
+#include "led.h"
+#include "usrsw.h"
+
+STATIC void flash_error(int n) {
+    for (int i = 0; i < n; i++) {
+        led_state(PYB_LED_RED, 1);
+        led_state(PYB_LED_GREEN, 0);
+        mp_hal_delay_ms(250);
+        led_state(PYB_LED_RED, 0);
+        led_state(PYB_LED_GREEN, 1);
+        mp_hal_delay_ms(250);
+    }
+    led_state(PYB_LED_GREEN, 0);
+}
+
+#if !MICROPY_HW_USES_BOOTLOADER
+STATIC uint update_reset_mode(uint reset_mode) {
+    #if MICROPY_HW_HAS_SWITCH
+    if (switch_get()) {
+
+        // The original method used on the pyboard is appropriate if you have 2
+        // or more LEDs.
+        #if defined(MICROPY_HW_LED2)
+        for (uint i = 0; i < 3000; i++) {
+            if (!switch_get()) {
+                break;
+            }
+            mp_hal_delay_ms(20);
+            if (i % 30 == 29) {
+                if (++reset_mode > 3) {
+                    reset_mode = 1;
+                }
+                led_state(2, reset_mode & 1);
+                led_state(3, reset_mode & 2);
+                led_state(4, reset_mode & 4);
+            }
+        }
+        // flash the selected reset mode
+        for (uint i = 0; i < 6; i++) {
+            led_state(2, 0);
+            led_state(3, 0);
+            led_state(4, 0);
+            mp_hal_delay_ms(50);
+            led_state(2, reset_mode & 1);
+            led_state(3, reset_mode & 2);
+            led_state(4, reset_mode & 4);
+            mp_hal_delay_ms(50);
+        }
+        mp_hal_delay_ms(400);
+
+        #elif defined(MICROPY_HW_LED1)
+
+        // For boards with only a single LED, we'll flash that LED the
+        // appropriate number of times, with a pause between each one
+        for (uint i = 0; i < 10; i++) {
+            led_state(1, 0);
+            for (uint j = 0; j < reset_mode; j++) {
+                if (!switch_get()) {
+                    break;
+                }
+                led_state(1, 1);
+                mp_hal_delay_ms(100);
+                led_state(1, 0);
+                mp_hal_delay_ms(200);
+            }
+            mp_hal_delay_ms(400);
+            if (!switch_get()) {
+                break;
+            }
+            if (++reset_mode > 3) {
+                reset_mode = 1;
+            }
+        }
+        // Flash the selected reset mode
+        for (uint i = 0; i < 2; i++) {
+            for (uint j = 0; j < reset_mode; j++) {
+                led_state(1, 1);
+                mp_hal_delay_ms(100);
+                led_state(1, 0);
+                mp_hal_delay_ms(200);
+            }
+            mp_hal_delay_ms(400);
+        }
+        #else
+        #error Need a reset mode update method
+        #endif
+    }
+    #endif
+    return reset_mode;
+}
+#endif
+
+void boardctrl_before_soft_reset_loop(boardctrl_state_t *state) {
+    #if !MICROPY_HW_USES_BOOTLOADER
+    // Update the reset_mode via the default
+    // method which uses the board switch/button and LEDs.
+    state->reset_mode = update_reset_mode(1);
+    #endif
+}
+
+void boardctrl_top_soft_reset_loop(boardctrl_state_t *state) {
+    // Turn on a single LED to indicate start up.
+    #if defined(MICROPY_HW_LED2)
+    led_state(1, 0);
+    led_state(2, 1);
+    #else
+    led_state(1, 1);
+    led_state(2, 0);
+    #endif
+    led_state(3, 0);
+    led_state(4, 0);
+}
+
+void boardctrl_before_boot_py(boardctrl_state_t *state) {
+    state->run_boot_py = state->reset_mode == 1 || state->reset_mode == 3;
+}
+
+void boardctrl_after_boot_py(boardctrl_state_t *state) {
+    if (state->run_boot_py && !state->last_ret) {
+        flash_error(4);
+    }
+
+    // Turn boot-up LEDs off
+
+    #if !defined(MICROPY_HW_LED2)
+    // If there is only one LED on the board then it's used to signal boot-up
+    // and so we turn it off here.  Otherwise LED(1) is used to indicate dirty
+    // flash cache and so we shouldn't change its state.
+    led_state(1, 0);
+    #endif
+    led_state(2, 0);
+    led_state(3, 0);
+    led_state(4, 0);
+}
+
+void boardctrl_before_main_py(boardctrl_state_t *state) {
+    state->run_main_py = (state->reset_mode == 1 || state->reset_mode == 3)
+        && pyexec_mode_kind == PYEXEC_MODE_FRIENDLY_REPL;
+}
+
+void boardctrl_after_main_py(boardctrl_state_t *state) {
+    if (state->run_main_py && !state->last_ret) {
+        flash_error(3);
+    }
+}
+
+void boardctrl_start_soft_reset(boardctrl_state_t *state) {
+    state->log_soft_reset = true;
+}
+
+void boardctrl_end_soft_reset(boardctrl_state_t *state) {
+    // Set reset_mode to normal boot.
+    state->reset_mode = 1;
+}
diff --git a/ports/stm32/boardctrl.h b/ports/stm32/boardctrl.h
new file mode 100644
index 0000000000000..05bade305c254
--- /dev/null
+++ b/ports/stm32/boardctrl.h
@@ -0,0 +1,80 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+#ifndef MICROPY_INCLUDED_STM32_BOARDCTRL_H
+#define MICROPY_INCLUDED_STM32_BOARDCTRL_H
+
+#include "py/mpconfig.h"
+
+#ifndef MICROPY_BOARD_BEFORE_SOFT_RESET_LOOP
+#define MICROPY_BOARD_BEFORE_SOFT_RESET_LOOP boardctrl_before_soft_reset_loop
+#endif
+
+#ifndef MICROPY_BOARD_TOP_SOFT_RESET_LOOP
+#define MICROPY_BOARD_TOP_SOFT_RESET_LOOP boardctrl_top_soft_reset_loop
+#endif
+
+#ifndef MICROPY_BOARD_BEFORE_BOOT_PY
+#define MICROPY_BOARD_BEFORE_BOOT_PY boardctrl_before_boot_py
+#endif
+
+#ifndef MICROPY_BOARD_AFTER_BOOT_PY
+#define MICROPY_BOARD_AFTER_BOOT_PY boardctrl_after_boot_py
+#endif
+
+#ifndef MICROPY_BOARD_BEFORE_MAIN_PY
+#define MICROPY_BOARD_BEFORE_MAIN_PY boardctrl_before_main_py
+#endif
+
+#ifndef MICROPY_BOARD_AFTER_MAIN_PY
+#define MICROPY_BOARD_AFTER_MAIN_PY boardctrl_after_main_py
+#endif
+
+#ifndef MICROPY_BOARD_START_SOFT_RESET
+#define MICROPY_BOARD_START_SOFT_RESET boardctrl_start_soft_reset
+#endif
+
+#ifndef MICROPY_BOARD_END_SOFT_RESET
+#define MICROPY_BOARD_END_SOFT_RESET boardctrl_end_soft_reset
+#endif
+
+typedef struct _boardctrl_state_t {
+    uint8_t reset_mode;
+    bool run_boot_py;
+    bool run_main_py;
+    bool log_soft_reset;
+    int last_ret;
+} boardctrl_state_t;
+
+void boardctrl_before_soft_reset_loop(boardctrl_state_t *state);
+void boardctrl_top_soft_reset_loop(boardctrl_state_t *state);
+void boardctrl_before_boot_py(boardctrl_state_t *state);
+void boardctrl_after_boot_py(boardctrl_state_t *state);
+void boardctrl_before_main_py(boardctrl_state_t *state);
+void boardctrl_after_main_py(boardctrl_state_t *state);
+void boardctrl_start_soft_reset(boardctrl_state_t *state);
+void boardctrl_end_soft_reset(boardctrl_state_t *state);
+
+#endif // MICROPY_INCLUDED_STM32_BOARDCTRL_H
diff --git a/ports/stm32/main.c b/ports/stm32/main.c
index 7f8ee84fd4d6b..c749cac978ba8 100644
--- a/ports/stm32/main.c
+++ b/ports/stm32/main.c
@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2013-2018 Damien P. George
+ * Copyright (c) 2013-2020 Damien P. George
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -53,6 +53,7 @@
 #include "extmod/modbluetooth.h"
 #endif
 
+#include "boardctrl.h"
 #include "mpu.h"
 #include "rfcore.h"
 #include "systick.h"
@@ -95,18 +96,6 @@ STATIC pyb_uart_obj_t pyb_uart_repl_obj;
 STATIC uint8_t pyb_uart_repl_rxbuf[MICROPY_HW_UART_REPL_RXBUF];
 #endif
 
-void flash_error(int n) {
-    for (int i = 0; i < n; i++) {
-        led_state(PYB_LED_RED, 1);
-        led_state(PYB_LED_GREEN, 0);
-        mp_hal_delay_ms(250);
-        led_state(PYB_LED_RED, 0);
-        led_state(PYB_LED_GREEN, 1);
-        mp_hal_delay_ms(250);
-    }
-    led_state(PYB_LED_GREEN, 0);
-}
-
 void NORETURN __fatal_error(const char *msg) {
     for (volatile uint delay = 0; delay < 10000000; delay++) {
     }
@@ -310,83 +299,6 @@ STATIC bool init_sdcard_fs(void) {
 }
 #endif
 
-#if !MICROPY_HW_USES_BOOTLOADER
-STATIC uint update_reset_mode(uint reset_mode) {
-    #if MICROPY_HW_HAS_SWITCH
-    if (switch_get()) {
-
-        // The original method used on the pyboard is appropriate if you have 2
-        // or more LEDs.
-        #if defined(MICROPY_HW_LED2)
-        for (uint i = 0; i < 3000; i++) {
-            if (!switch_get()) {
-                break;
-            }
-            mp_hal_delay_ms(20);
-            if (i % 30 == 29) {
-                if (++reset_mode > 3) {
-                    reset_mode = 1;
-                }
-                led_state(2, reset_mode & 1);
-                led_state(3, reset_mode & 2);
-                led_state(4, reset_mode & 4);
-            }
-        }
-        // flash the selected reset mode
-        for (uint i = 0; i < 6; i++) {
-            led_state(2, 0);
-            led_state(3, 0);
-            led_state(4, 0);
-            mp_hal_delay_ms(50);
-            led_state(2, reset_mode & 1);
-            led_state(3, reset_mode & 2);
-            led_state(4, reset_mode & 4);
-            mp_hal_delay_ms(50);
-        }
-        mp_hal_delay_ms(400);
-
-        #elif defined(MICROPY_HW_LED1)
-
-        // For boards with only a single LED, we'll flash that LED the
-        // appropriate number of times, with a pause between each one
-        for (uint i = 0; i < 10; i++) {
-            led_state(1, 0);
-            for (uint j = 0; j < reset_mode; j++) {
-                if (!switch_get()) {
-                    break;
-                }
-                led_state(1, 1);
-                mp_hal_delay_ms(100);
-                led_state(1, 0);
-                mp_hal_delay_ms(200);
-            }
-            mp_hal_delay_ms(400);
-            if (!switch_get()) {
-                break;
-            }
-            if (++reset_mode > 3) {
-                reset_mode = 1;
-            }
-        }
-        // Flash the selected reset mode
-        for (uint i = 0; i < 2; i++) {
-            for (uint j = 0; j < reset_mode; j++) {
-                led_state(1, 1);
-                mp_hal_delay_ms(100);
-                led_state(1, 0);
-                mp_hal_delay_ms(200);
-            }
-            mp_hal_delay_ms(400);
-        }
-        #else
-        #error Need a reset mode update method
-        #endif
-    }
-    #endif
-    return reset_mode;
-}
-#endif
-
 void stm32_main(uint32_t reset_mode) {
     #if !defined(STM32F0) && defined(MICROPY_HW_VTOR)
     // Change IRQ vector table if configured differently
@@ -552,22 +464,17 @@ void stm32_main(uint32_t reset_mode) {
     MP_STATE_PORT(pyb_uart_obj_all)[MICROPY_HW_UART_REPL - 1] = &pyb_uart_repl_obj;
     #endif
 
-    #if !MICROPY_HW_USES_BOOTLOADER
-    // check if user switch held to select the reset mode
-    reset_mode = update_reset_mode(1);
-    #endif
+    boardctrl_state_t state;
+    state.reset_mode = reset_mode;
+    state.run_boot_py = false;
+    state.run_main_py = false;
+    state.last_ret = 0;
+
+    MICROPY_BOARD_BEFORE_SOFT_RESET_LOOP(&state);
 
 soft_reset:
 
-    #if defined(MICROPY_HW_LED2)
-    led_state(1, 0);
-    led_state(2, 1);
-    #else
-    led_state(1, 1);
-    led_state(2, 0);
-    #endif
-    led_state(3, 0);
-    led_state(4, 0);
+    MICROPY_BOARD_TOP_SOFT_RESET_LOOP(&state);
 
     // Python threading init
     #if MICROPY_PY_THREAD
@@ -656,29 +563,19 @@ void stm32_main(uint32_t reset_mode) {
     // reset config variables; they should be set by boot.py
     MP_STATE_PORT(pyb_config_main) = MP_OBJ_NULL;
 
+    MICROPY_BOARD_BEFORE_BOOT_PY(&state);
+
     // run boot.py, if it exists
     // TODO perhaps have pyb.reboot([bootpy]) function to soft-reboot and execute custom boot.py
-    if (reset_mode == 1 || reset_mode == 3) {
+    if (state.run_boot_py) {
         const char *boot_py = "boot.py";
-        int ret = pyexec_file_if_exists(boot_py);
-        if (ret & PYEXEC_FORCED_EXIT) {
+        state.last_ret = pyexec_file_if_exists(boot_py);
+        if (state.last_ret & PYEXEC_FORCED_EXIT) {
             goto soft_reset_exit;
         }
-        if (!ret) {
-            flash_error(4);
-        }
     }
 
-    // turn boot-up LEDs off
-    #if !defined(MICROPY_HW_LED2)
-    // If there is only one LED on the board then it's used to signal boot-up
-    // and so we turn it off here.  Otherwise LED(1) is used to indicate dirty
-    // flash cache and so we shouldn't change its state.
-    led_state(1, 0);
-    #endif
-    led_state(2, 0);
-    led_state(3, 0);
-    led_state(4, 0);
+    MICROPY_BOARD_AFTER_BOOT_PY(&state);
 
     // Now we initialise sub-systems that need configuration from boot.py,
     // or whose initialisation can be safely deferred until after running
@@ -713,23 +610,24 @@ void stm32_main(uint32_t reset_mode) {
 
     // At this point everything is fully configured and initialised.
 
+    MICROPY_BOARD_BEFORE_MAIN_PY(&state);
+
     // Run the main script from the current directory.
-    if ((reset_mode == 1 || reset_mode == 3) && pyexec_mode_kind == PYEXEC_MODE_FRIENDLY_REPL) {
+    if (state.run_main_py) {
         const char *main_py;
         if (MP_STATE_PORT(pyb_config_main) == MP_OBJ_NULL) {
             main_py = "main.py";
         } else {
             main_py = mp_obj_str_get_str(MP_STATE_PORT(pyb_config_main));
         }
-        int ret = pyexec_file_if_exists(main_py);
-        if (ret & PYEXEC_FORCED_EXIT) {
+        state.last_ret = pyexec_file_if_exists(main_py);
+        if (state.last_ret & PYEXEC_FORCED_EXIT) {
             goto soft_reset_exit;
         }
-        if (!ret) {
-            flash_error(3);
-        }
     }
 
+    MICROPY_BOARD_AFTER_MAIN_PY(&state);
+
     #if MICROPY_ENABLE_COMPILER
     // Main script is finished, so now go into REPL mode.
     // The REPL mode can change, or it can request a soft reset.
@@ -750,12 +648,19 @@ void stm32_main(uint32_t reset_mode) {
 
     // soft reset
 
+    MICROPY_BOARD_START_SOFT_RESET(&state);
+
     #if MICROPY_HW_ENABLE_STORAGE
-    printf("MPY: sync filesystems\n");
+    if (state.log_soft_reset) {
+        mp_printf(&mp_plat_print, "MPY: sync filesystems\n");
+    }
     storage_flush();
     #endif
 
-    printf("MPY: soft reboot\n");
+    if (state.log_soft_reset) {
+        mp_printf(&mp_plat_print, "MPY: soft reboot\n");
+    }
+
     #if MICROPY_PY_BLUETOOTH
     mp_bluetooth_deinit();
     #endif
@@ -774,10 +679,9 @@ void stm32_main(uint32_t reset_mode) {
     pyb_thread_deinit();
     #endif
 
-    gc_sweep_all();
+    MICROPY_BOARD_END_SOFT_RESET(&state);
 
-    // Set reset_mode to normal boot.
-    reset_mode = 1;
+    gc_sweep_all();
 
     goto soft_reset;
 }

From b99300b53ecc8db1ced8d96953ba4eaf2026f069 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 11 Nov 2020 18:14:50 +1100
Subject: [PATCH 0390/3533] stm32/boardctrl: Define MICROPY_BOARD_EARLY_INIT
 alongside others.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/boardctrl.h | 4 ++++
 ports/stm32/main.c      | 3 ---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/ports/stm32/boardctrl.h b/ports/stm32/boardctrl.h
index 05bade305c254..6f79dfb890707 100644
--- a/ports/stm32/boardctrl.h
+++ b/ports/stm32/boardctrl.h
@@ -28,6 +28,10 @@
 
 #include "py/mpconfig.h"
 
+#ifndef MICROPY_BOARD_EARLY_INIT
+#define MICROPY_BOARD_EARLY_INIT()
+#endif
+
 #ifndef MICROPY_BOARD_BEFORE_SOFT_RESET_LOOP
 #define MICROPY_BOARD_BEFORE_SOFT_RESET_LOOP boardctrl_before_soft_reset_loop
 #endif
diff --git a/ports/stm32/main.c b/ports/stm32/main.c
index c749cac978ba8..db8222479b0f6 100644
--- a/ports/stm32/main.c
+++ b/ports/stm32/main.c
@@ -385,10 +385,7 @@ void stm32_main(uint32_t reset_mode) {
     __HAL_RCC_D2SRAM3_CLK_ENABLE();
     #endif
 
-
-    #if defined(MICROPY_BOARD_EARLY_INIT)
     MICROPY_BOARD_EARLY_INIT();
-    #endif
 
     // basic sub-system init
     #if defined(STM32WB)

From 7789cd5f16b068f032e58be8e5e60bf17cb03d40 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sat, 31 Oct 2020 00:22:11 +1100
Subject: [PATCH 0391/3533] lib/utils/pyexec: Add MICROPY_BOARD hooks
 before/after executing code.

Signed-off-by: Damien George <damien@micropython.org>
---
 lib/utils/pyexec.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/lib/utils/pyexec.c b/lib/utils/pyexec.c
index 2c8ca2de0cecc..2b86af3bbaadd 100644
--- a/lib/utils/pyexec.c
+++ b/lib/utils/pyexec.c
@@ -68,10 +68,15 @@ STATIC int parse_compile_execute(const void *source, mp_parse_input_kind_t input
     uint32_t start = 0;
     #endif
 
+    #ifdef MICROPY_BOARD_BEFORE_PYTHON_EXEC
+    MICROPY_BOARD_BEFORE_PYTHON_EXEC(input_kind, exec_flags);
+    #endif
+
     // by default a SystemExit exception returns 0
     pyexec_system_exit = 0;
 
     nlr_buf_t nlr;
+    nlr.ret_val = NULL;
     if (nlr_push(&nlr) == 0) {
         mp_obj_t module_fun;
         #if MICROPY_MODULE_FROZEN_MPY
@@ -157,6 +162,10 @@ STATIC int parse_compile_execute(const void *source, mp_parse_input_kind_t input
         mp_hal_stdout_tx_strn("\x04", 1);
     }
 
+    #ifdef MICROPY_BOARD_AFTER_PYTHON_EXEC
+    MICROPY_BOARD_AFTER_PYTHON_EXEC(input_kind, exec_flags, nlr.ret_val, &ret);
+    #endif
+
     return ret;
 }
 

From 1fef5662ab96a27c2b279082607103bbe5da9de5 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 5 Nov 2020 22:35:02 +1100
Subject: [PATCH 0392/3533] py/mpz: Do sign extension in mpz_as_bytes for
 negative values.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/mpz.c                       | 10 +++++++++-
 py/objint_mpz.c                |  1 -
 tests/basics/struct1_intbig.py |  8 ++++++++
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/py/mpz.c b/py/mpz.c
index b3d88067929fd..75159305382a1 100644
--- a/py/mpz.c
+++ b/py/mpz.c
@@ -1609,7 +1609,6 @@ bool mpz_as_uint_checked(const mpz_t *i, mp_uint_t *value) {
     return true;
 }
 
-// writes at most len bytes to buf (so buf should be zeroed before calling)
 void mpz_as_bytes(const mpz_t *z, bool big_endian, size_t len, byte *buf) {
     byte *b = buf;
     if (big_endian) {
@@ -1641,6 +1640,15 @@ void mpz_as_bytes(const mpz_t *z, bool big_endian, size_t len, byte *buf) {
             }
         }
     }
+
+    // fill remainder of buf with zero/sign extension of the integer
+    if (big_endian) {
+        len = b - buf;
+    } else {
+        len = buf + len - b;
+        buf = b;
+    }
+    memset(buf, z->neg ? 0xff : 0x00, len);
 }
 
 #if MICROPY_PY_BUILTINS_FLOAT
diff --git a/py/objint_mpz.c b/py/objint_mpz.c
index 6e52073a6e85b..ef3e017967857 100644
--- a/py/objint_mpz.c
+++ b/py/objint_mpz.c
@@ -116,7 +116,6 @@ mp_obj_t mp_obj_int_from_bytes_impl(bool big_endian, size_t len, const byte *buf
 void mp_obj_int_to_bytes_impl(mp_obj_t self_in, bool big_endian, size_t len, byte *buf) {
     assert(mp_obj_is_type(self_in, &mp_type_int));
     mp_obj_int_t *self = MP_OBJ_TO_PTR(self_in);
-    memset(buf, 0, len);
     mpz_as_bytes(&self->mpz, big_endian, len, buf);
 }
 
diff --git a/tests/basics/struct1_intbig.py b/tests/basics/struct1_intbig.py
index 380293f36cea7..24541c8a42509 100644
--- a/tests/basics/struct1_intbig.py
+++ b/tests/basics/struct1_intbig.py
@@ -36,3 +36,11 @@
 # check small int overflow
 print(struct.unpack("<i", b'\xff\xff\xff\x7f'))
 print(struct.unpack("<q", b'\xff\xff\xff\xff\xff\xff\xff\x7f'))
+
+# test with negative big integers that are actually small in magnitude
+bigzero = (1 << 70) - (1 << 70)
+for endian in "<>":
+    for type_ in "bhiq":
+        fmt = endian + type_
+        b = struct.pack(fmt, -2 + bigzero)
+        print(fmt, b, struct.unpack(fmt, b))

From bdfb584b294bf1379921b08ec020386b8ff6257b Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 5 Nov 2020 22:39:54 +1100
Subject: [PATCH 0393/3533] extmod/moductypes: Fix storing to (U)INT64 arrays
 on 32-bit archs.

Fixes issue #6583.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/moductypes.c                          |  2 +-
 tests/extmod/uctypes_array_load_store.py     | 19 ++++++++++++++++
 tests/extmod/uctypes_array_load_store.py.exp | 24 ++++++++++++++++++++
 3 files changed, 44 insertions(+), 1 deletion(-)
 create mode 100644 tests/extmod/uctypes_array_load_store.py
 create mode 100644 tests/extmod/uctypes_array_load_store.py.exp

diff --git a/extmod/moductypes.c b/extmod/moductypes.c
index c5fbf12e42b9d..79a49d5c329c2 100644
--- a/extmod/moductypes.c
+++ b/extmod/moductypes.c
@@ -399,7 +399,7 @@ STATIC void set_aligned(uint val_type, void *p, mp_int_t index, mp_obj_t val) {
                 ((uint64_t *)p)[index] = (uint64_t)v;
             } else {
                 // TODO: Doesn't offer atomic store semantics, but should at least try
-                set_unaligned(val_type, p, MP_ENDIANNESS_BIG, val);
+                set_unaligned(val_type, (void *)&((uint64_t *)p)[index], MP_ENDIANNESS_BIG, val);
             }
             return;
         default:
diff --git a/tests/extmod/uctypes_array_load_store.py b/tests/extmod/uctypes_array_load_store.py
new file mode 100644
index 0000000000000..709b9f5c29b18
--- /dev/null
+++ b/tests/extmod/uctypes_array_load_store.py
@@ -0,0 +1,19 @@
+# Test uctypes array, load and store, with array size > 1
+
+try:
+    import uctypes
+except ImportError:
+    print("SKIP")
+    raise SystemExit
+
+N = 3
+
+for endian in ("NATIVE", "LITTLE_ENDIAN", "BIG_ENDIAN"):
+    for type_ in ("INT8", "UINT8", "INT16", "UINT16", "INT32", "UINT32", "INT64", "UINT64"):
+        desc = {"arr": (uctypes.ARRAY | 0, getattr(uctypes, type_) | N)}
+        sz = uctypes.sizeof(desc)
+        data = bytearray(sz)
+        s = uctypes.struct(uctypes.addressof(data), desc, getattr(uctypes, endian))
+        for i in range(N):
+            s.arr[i] = i
+        print(endian, type_, sz, *(s.arr[i] for i in range(N)))
diff --git a/tests/extmod/uctypes_array_load_store.py.exp b/tests/extmod/uctypes_array_load_store.py.exp
new file mode 100644
index 0000000000000..f6f7bc96ef1a0
--- /dev/null
+++ b/tests/extmod/uctypes_array_load_store.py.exp
@@ -0,0 +1,24 @@
+NATIVE INT8 3 0 1 2
+NATIVE UINT8 3 0 1 2
+NATIVE INT16 6 0 1 2
+NATIVE UINT16 6 0 1 2
+NATIVE INT32 12 0 1 2
+NATIVE UINT32 12 0 1 2
+NATIVE INT64 24 0 1 2
+NATIVE UINT64 24 0 1 2
+LITTLE_ENDIAN INT8 3 0 1 2
+LITTLE_ENDIAN UINT8 3 0 1 2
+LITTLE_ENDIAN INT16 6 0 1 2
+LITTLE_ENDIAN UINT16 6 0 1 2
+LITTLE_ENDIAN INT32 12 0 1 2
+LITTLE_ENDIAN UINT32 12 0 1 2
+LITTLE_ENDIAN INT64 24 0 1 2
+LITTLE_ENDIAN UINT64 24 0 1 2
+BIG_ENDIAN INT8 3 0 1 2
+BIG_ENDIAN UINT8 3 0 1 2
+BIG_ENDIAN INT16 6 0 1 2
+BIG_ENDIAN UINT16 6 0 1 2
+BIG_ENDIAN INT32 12 0 1 2
+BIG_ENDIAN UINT32 12 0 1 2
+BIG_ENDIAN INT64 24 0 1 2
+BIG_ENDIAN UINT64 24 0 1 2

From d7e1526593151b33ab52af445647c6d1315a96dc Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 5 Nov 2020 22:42:28 +1100
Subject: [PATCH 0394/3533] py/binary: Fix sign extension setting wide integer
 on 32-bit archs.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/binary.c                                  |  2 +-
 tests/extmod/uctypes_array_load_store.py     |  4 +-
 tests/extmod/uctypes_array_load_store.py.exp | 48 ++++++++++----------
 3 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/py/binary.c b/py/binary.c
index d0f72ec23c49c..1847894b71068 100644
--- a/py/binary.c
+++ b/py/binary.c
@@ -343,7 +343,7 @@ void mp_binary_set_val(char struct_type, char val_type, mp_obj_t val_in, byte *p
             val = mp_obj_get_int(val_in);
             // zero/sign extend if needed
             if (BYTES_PER_WORD < 8 && size > sizeof(val)) {
-                int c = (is_signed(val_type) && (mp_int_t)val < 0) ? 0xff : 0x00;
+                int c = (mp_int_t)val < 0 ? 0xff : 0x00;
                 memset(p, c, size);
                 if (struct_type == '>') {
                     p += size - sizeof(val);
diff --git a/tests/extmod/uctypes_array_load_store.py b/tests/extmod/uctypes_array_load_store.py
index 709b9f5c29b18..3b9bb6d7308ca 100644
--- a/tests/extmod/uctypes_array_load_store.py
+++ b/tests/extmod/uctypes_array_load_store.py
@@ -6,7 +6,7 @@
     print("SKIP")
     raise SystemExit
 
-N = 3
+N = 5
 
 for endian in ("NATIVE", "LITTLE_ENDIAN", "BIG_ENDIAN"):
     for type_ in ("INT8", "UINT8", "INT16", "UINT16", "INT32", "UINT32", "INT64", "UINT64"):
@@ -15,5 +15,5 @@
         data = bytearray(sz)
         s = uctypes.struct(uctypes.addressof(data), desc, getattr(uctypes, endian))
         for i in range(N):
-            s.arr[i] = i
+            s.arr[i] = i - 2
         print(endian, type_, sz, *(s.arr[i] for i in range(N)))
diff --git a/tests/extmod/uctypes_array_load_store.py.exp b/tests/extmod/uctypes_array_load_store.py.exp
index f6f7bc96ef1a0..10de8046454ba 100644
--- a/tests/extmod/uctypes_array_load_store.py.exp
+++ b/tests/extmod/uctypes_array_load_store.py.exp
@@ -1,24 +1,24 @@
-NATIVE INT8 3 0 1 2
-NATIVE UINT8 3 0 1 2
-NATIVE INT16 6 0 1 2
-NATIVE UINT16 6 0 1 2
-NATIVE INT32 12 0 1 2
-NATIVE UINT32 12 0 1 2
-NATIVE INT64 24 0 1 2
-NATIVE UINT64 24 0 1 2
-LITTLE_ENDIAN INT8 3 0 1 2
-LITTLE_ENDIAN UINT8 3 0 1 2
-LITTLE_ENDIAN INT16 6 0 1 2
-LITTLE_ENDIAN UINT16 6 0 1 2
-LITTLE_ENDIAN INT32 12 0 1 2
-LITTLE_ENDIAN UINT32 12 0 1 2
-LITTLE_ENDIAN INT64 24 0 1 2
-LITTLE_ENDIAN UINT64 24 0 1 2
-BIG_ENDIAN INT8 3 0 1 2
-BIG_ENDIAN UINT8 3 0 1 2
-BIG_ENDIAN INT16 6 0 1 2
-BIG_ENDIAN UINT16 6 0 1 2
-BIG_ENDIAN INT32 12 0 1 2
-BIG_ENDIAN UINT32 12 0 1 2
-BIG_ENDIAN INT64 24 0 1 2
-BIG_ENDIAN UINT64 24 0 1 2
+NATIVE INT8 5 -2 -1 0 1 2
+NATIVE UINT8 5 254 255 0 1 2
+NATIVE INT16 10 -2 -1 0 1 2
+NATIVE UINT16 10 65534 65535 0 1 2
+NATIVE INT32 20 -2 -1 0 1 2
+NATIVE UINT32 20 4294967294 4294967295 0 1 2
+NATIVE INT64 40 -2 -1 0 1 2
+NATIVE UINT64 40 18446744073709551614 18446744073709551615 0 1 2
+LITTLE_ENDIAN INT8 5 -2 -1 0 1 2
+LITTLE_ENDIAN UINT8 5 254 255 0 1 2
+LITTLE_ENDIAN INT16 10 -2 -1 0 1 2
+LITTLE_ENDIAN UINT16 10 65534 65535 0 1 2
+LITTLE_ENDIAN INT32 20 -2 -1 0 1 2
+LITTLE_ENDIAN UINT32 20 4294967294 4294967295 0 1 2
+LITTLE_ENDIAN INT64 40 -2 -1 0 1 2
+LITTLE_ENDIAN UINT64 40 18446744073709551614 18446744073709551615 0 1 2
+BIG_ENDIAN INT8 5 -2 -1 0 1 2
+BIG_ENDIAN UINT8 5 254 255 0 1 2
+BIG_ENDIAN INT16 10 -2 -1 0 1 2
+BIG_ENDIAN UINT16 10 65534 65535 0 1 2
+BIG_ENDIAN INT32 20 -2 -1 0 1 2
+BIG_ENDIAN UINT32 20 4294967294 4294967295 0 1 2
+BIG_ENDIAN INT64 40 -2 -1 0 1 2
+BIG_ENDIAN UINT64 40 18446744073709551614 18446744073709551615 0 1 2

From a7932ae4e66bd1c354eee357f18393bd83144144 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Thu, 29 Oct 2020 16:38:13 +1100
Subject: [PATCH 0395/3533] tools/makeqstrdefs.py: Run qstr preprocessing in
 parallel.

This gives a substantial speedup of the preprocessing step, i.e. the
generation of qstr.i.last.  For example on a clean build, making
qstr.i.last:

    21s -> 4s on STM32 (WB55)
    8.9 -> 1.8s on Unix (dev).

Done in collaboration with @stinos.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 py/makeqstrdefs.py | 31 ++++++++++++++++++++++++-------
 1 file changed, 24 insertions(+), 7 deletions(-)

diff --git a/py/makeqstrdefs.py b/py/makeqstrdefs.py
index f514ae0c1052f..ad4f22d5e4cf3 100644
--- a/py/makeqstrdefs.py
+++ b/py/makeqstrdefs.py
@@ -7,11 +7,12 @@
 
 from __future__ import print_function
 
+import io
+import os
 import re
 import subprocess
 import sys
-import io
-import os
+import multiprocessing, multiprocessing.dummy
 
 
 # Extract MP_QSTR_FOO macros.
@@ -39,11 +40,27 @@ def preprocess():
         os.makedirs(os.path.dirname(args.output[0]))
     except OSError:
         pass
-    with open(args.output[0], "w") as out_file:
-        if csources:
-            subprocess.check_call(args.pp + args.cflags + csources, stdout=out_file)
-        if cxxsources:
-            subprocess.check_call(args.pp + args.cxxflags + cxxsources, stdout=out_file)
+
+    def pp(flags):
+        def run(files):
+            return subprocess.check_output(args.pp + flags + files)
+
+        return run
+
+    try:
+        cpus = multiprocessing.cpu_count()
+    except NotImplementedError:
+        cpus = 1
+    p = multiprocessing.dummy.Pool(cpus)
+    with open(args.output[0], "wb") as out_file:
+        for flags, sources in (
+            (args.cflags, csources),
+            (args.cxxflags, cxxsources),
+        ):
+            batch_size = (len(sources) + cpus - 1) // cpus
+            chunks = [sources[i : i + batch_size] for i in range(0, len(sources), batch_size or 1)]
+            for output in p.imap(pp(flags), chunks):
+                out_file.write(output)
 
 
 def write_out(fname, output):

From b04240cb77c5305a63b4ca7b36229d410eca2072 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20NEDJAR?= <sebastien.nedjar@univ-amu.fr>
Date: Wed, 4 Nov 2020 14:26:56 +0200
Subject: [PATCH 0396/3533] stm32/Makefile: Make the generation of
 `firmware.bin` explicit.

The file `$(BUILD)/firmware.bin` was used by the target `deploy-stlink` and
`deploy-openocd` but it was generated indirectly by the target
`firmware.dfu`.

As this file could be used to program boards directly by a Mass Storage
copy, it's better to make it explicitly generated.

Additionally, some target are refactored to remove redundancy and be more
explicit on dependencies.
---
 ports/stm32/Makefile | 112 +++++++++++++++++++++++++++----------------
 1 file changed, 71 insertions(+), 41 deletions(-)

diff --git a/ports/stm32/Makefile b/ports/stm32/Makefile
index fa9998a8e078b..8f7cdd93ca5fe 100644
--- a/ports/stm32/Makefile
+++ b/ports/stm32/Makefile
@@ -564,15 +564,56 @@ CFLAGS += -DMICROPY_QSTR_EXTRA_POOL=mp_qstr_frozen_const_pool
 CFLAGS += -DMICROPY_MODULE_FROZEN_MPY
 endif
 
-.PHONY: deploy
+define RUN_DFU
+	$(ECHO) "Writing $(1) to the board"
+	$(if $(filter $(USE_PYDFU),1),\
+	$(Q)$(PYTHON) $(PYDFU) --vid $(BOOTLOADER_DFU_USB_VID) --pid $(BOOTLOADER_DFU_USB_PID) -u $(1),
+	$(Q)$(DFU_UTIL) -a 0 -d $(BOOTLOADER_DFU_USB_VID):$(BOOTLOADER_DFU_USB_PID) -D $(1))
+endef
+
+define RUN_STLINK
+	$(ECHO) "Writing $(1) to the board via ST-LINK"
+	$(Q)$(STFLASH) write $(1) $(2)
+endef
+
+define RUN_OPENOCD
+	$(ECHO) "Writing $(1) to the board via ST-LINK using OpenOCD"
+	$(Q)$(OPENOCD) -f $(OPENOCD_CONFIG) -c "stm_flash $(1) $(2) $(3) $(4)"
+endef
+
+define GENERATE_ELF
+	$(ECHO) "LINK $(1)"
+	$(Q)$(LD) $(LDFLAGS) -o $(1) $(2) $(LDFLAGS_MOD) $(LIBS)
+	$(Q)$(SIZE) $(1)
+	$(if $(filter-out $(TEXT0_ADDR),0x08000000), \
+		$(ECHO) "INFO: this build requires mboot to be installed first")
+	$(if $(filter $(TEXT1_ADDR),0x90000000), \
+		$(ECHO) "INFO: this build places firmware in external QSPI flash")
+endef
+
+define GENERATE_BIN
+	$(ECHO) "GEN $(1)"
+	$(Q)$(OBJCOPY) -O binary $(addprefix -j ,$(3)) $(2) $(1)
+endef
+
+define GENERATE_DFU
+	$(ECHO) "GEN $(1)"
+	$(Q)$(PYTHON) $(DFU) \
+	-D $(BOOTLOADER_DFU_USB_VID):$(BOOTLOADER_DFU_USB_PID) \
+	$(if $(2),$(addprefix -b ,$(3):$(2))) \
+	$(if $(4),$(addprefix -b ,$(5):$(4))) \
+	$(1)
+endef
+
+define GENERATE_HEX
+	$(ECHO) "GEN $(1)"
+	$(Q)$(OBJCOPY) -O ihex $(2) $(1)
+endef
+
+.PHONY: deploy deploy-stlink deploy-openocd
 
 deploy: $(BUILD)/firmware.dfu
-	$(ECHO) "Writing $< to the board"
-ifeq ($(USE_PYDFU),1)
-	$(Q)$(PYTHON) $(PYDFU) --vid $(BOOTLOADER_DFU_USB_VID) --pid $(BOOTLOADER_DFU_USB_PID) -u $<
-else
-	$(Q)$(DFU_UTIL) -a 0 -d $(BOOTLOADER_DFU_USB_VID):$(BOOTLOADER_DFU_USB_PID) -D $<
-endif
+	$(call RUN_DFU,$^)
 
 # A board should specify TEXT0_ADDR if to use a different location than the
 # default for the firmware memory location.  A board can also optionally define
@@ -584,18 +625,17 @@ ifeq ($(TEXT1_ADDR),)
 
 TEXT0_SECTIONS ?= .isr_vector .text .data
 
-deploy-stlink: $(BUILD)/firmware.dfu
-	$(ECHO) "Writing $(BUILD)/firmware.bin to the board via ST-LINK"
-	$(Q)$(STFLASH) write $(BUILD)/firmware.bin $(TEXT0_ADDR)
+deploy-stlink: $(BUILD)/firmware.bin
+	$(call RUN_STLINK,$^,$(TEXT0_ADDR))
 
-deploy-openocd: $(BUILD)/firmware.dfu
-	$(ECHO) "Writing $(BUILD)/firmware.bin to the board via ST-LINK using OpenOCD"
-	$(Q)$(OPENOCD) -f $(OPENOCD_CONFIG) -c "stm_flash $(BUILD)/firmware.bin $(TEXT0_ADDR)"
+deploy-openocd: $(BUILD)/firmware.bin
+	$(call RUN_OPENOCD,$^,$(TEXT0_ADDR))
 
-$(BUILD)/firmware.dfu: $(BUILD)/firmware.elf
-	$(ECHO) "Create $@"
-	$(Q)$(OBJCOPY) -O binary $(addprefix -j ,$(TEXT0_SECTIONS)) $^ $(BUILD)/firmware.bin
-	$(Q)$(PYTHON) $(DFU) -D $(BOOTLOADER_DFU_USB_VID):$(BOOTLOADER_DFU_USB_PID) -b $(TEXT0_ADDR):$(BUILD)/firmware.bin $@
+$(BUILD)/firmware.bin: $(BUILD)/firmware.elf
+	$(call GENERATE_BIN,$@,$^,$(TEXT0_SECTIONS))
+
+$(BUILD)/firmware.dfu: $(BUILD)/firmware.bin
+	$(call GENERATE_DFU,$@,$^,$(TEXT0_ADDR))
 
 else
 # TEXT0_ADDR and TEXT1_ADDR are specified so split firmware between these locations
@@ -603,38 +643,28 @@ else
 TEXT0_SECTIONS ?= .isr_vector
 TEXT1_SECTIONS ?= .text .data
 
-deploy-stlink: $(BUILD)/firmware.dfu
-	$(ECHO) "Writing $(BUILD)/firmware0.bin to the board via ST-LINK"
-	$(Q)$(STFLASH) write $(BUILD)/firmware0.bin $(TEXT0_ADDR)
-	$(ECHO) "Writing $(BUILD)/firmware1.bin to the board via ST-LINK"
-	$(Q)$(STFLASH) --reset write $(BUILD)/firmware1.bin $(TEXT1_ADDR)
+deploy-stlink: $(BUILD)/firmware0.bin $(BUILD)/firmware1.bin
+	$(call RUN_STLINK,$(word 1,$^),$(TEXT0_ADDR))
+	$(call RUN_STLINK,$(word 2,$^),$(TEXT1_ADDR))
 
-deploy-openocd: $(BUILD)/firmware.dfu
-	$(ECHO) "Writing $(BUILD)/firmware{0,1}.bin to the board via ST-LINK using OpenOCD"
-	$(Q)$(OPENOCD) -f $(OPENOCD_CONFIG) -c "stm_flash $(BUILD)/firmware0.bin $(TEXT0_ADDR) $(BUILD)/firmware1.bin $(TEXT1_ADDR)"
+deploy-openocd: $(BUILD)/firmware0.bin $(BUILD)/firmware1.bin
+	$(call RUN_OPENOCD,$(word 1,$^),$(TEXT0_ADDR),$(word 2,$^),$(TEXT1_ADDR))
 
-$(BUILD)/firmware.dfu: $(BUILD)/firmware.elf
-	$(ECHO) "GEN $@"
-	$(Q)$(OBJCOPY) -O binary $(addprefix -j ,$(TEXT0_SECTIONS)) $^ $(BUILD)/firmware0.bin
-	$(Q)$(OBJCOPY) -O binary $(addprefix -j ,$(TEXT1_SECTIONS)) $^ $(BUILD)/firmware1.bin
-	$(Q)$(PYTHON) $(DFU) -D $(BOOTLOADER_DFU_USB_VID):$(BOOTLOADER_DFU_USB_PID) -b $(TEXT0_ADDR):$(BUILD)/firmware0.bin -b $(TEXT1_ADDR):$(BUILD)/firmware1.bin $@
+$(BUILD)/firmware0.bin: $(BUILD)/firmware.elf
+	$(call GENERATE_BIN,$@,$^,$(TEXT0_SECTIONS))
 
+$(BUILD)/firmware1.bin: $(BUILD)/firmware.elf
+	$(call GENERATE_BIN,$@,$^,$(TEXT1_SECTIONS))
+
+$(BUILD)/firmware.dfu: $(BUILD)/firmware0.bin $(BUILD)/firmware1.bin
+	$(call GENERATE_DFU,$@,$(word 1,$^),$(TEXT0_ADDR),$(word 2,$^),$(TEXT1_ADDR))
 endif
 
 $(BUILD)/firmware.hex: $(BUILD)/firmware.elf
-	$(ECHO) "GEN $@"
-	$(Q)$(OBJCOPY) -O ihex $< $@
+	$(call GENERATE_HEX,$@,$^)
 
 $(BUILD)/firmware.elf: $(OBJ)
-	$(ECHO) "LINK $@"
-	$(Q)$(LD) $(LDFLAGS) -o $@ $^ $(LDFLAGS_MOD) $(LIBS)
-	$(Q)$(SIZE) $@
-ifneq ($(TEXT0_ADDR),0x08000000)
-	$(ECHO) "INFO: this build requires mboot to be installed first"
-endif
-ifeq ($(TEXT1_ADDR),0x90000000)
-	$(ECHO) "INFO: this build places firmware in external QSPI flash"
-endif
+	$(call GENERATE_ELF,$@,$^)
 
 PLLVALUES = boards/pllvalues.py
 MAKE_PINS = boards/make-pins.py

From 8a917ad2529ea3df5f47e2be5b4edf362d2d03f6 Mon Sep 17 00:00:00 2001
From: Jonathan Hogg <me@jonathanhogg.com>
Date: Mon, 9 Nov 2020 13:11:52 +0000
Subject: [PATCH 0397/3533] esp32/machine_pin: Reset pin if init sets mode.

This will forcibly grab the pin back from the ADC if it has previously been
associated with it.

Fixes #5771.
---
 ports/esp32/machine_pin.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/ports/esp32/machine_pin.c b/ports/esp32/machine_pin.c
index a55cc1f4abaca..dcdd53be92378 100644
--- a/ports/esp32/machine_pin.c
+++ b/ports/esp32/machine_pin.c
@@ -150,6 +150,11 @@ STATIC mp_obj_t machine_pin_obj_init_helper(const machine_pin_obj_t *self, size_
     mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
     mp_arg_parse_all(n_args, pos_args, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
 
+    // reset the pin first if this is a mode-setting init (grab it back from ADC)
+    if (args[ARG_mode].u_obj != mp_const_none) {
+        gpio_reset_pin(self->id);
+    }
+
     // configure the pin for gpio
     gpio_pad_select_gpio(self->id);
 

From 922f81dfd1b94e23f23f05aac0ecafac8645ce46 Mon Sep 17 00:00:00 2001
From: Arrowana <pierre.duval@gadz.org>
Date: Sat, 31 Oct 2020 13:34:58 +1100
Subject: [PATCH 0398/3533] extmod/machine_mem: Only allow integers in
 machine.memX subscript.

Prior to this change machine.mem32['foo'] (or using any other non-integer
subscript) could result in a fault due to 'foo' being interpreted as an
integer.  And when writing code it's hard to tell if the fault is due to a
bad subscript type, or an integer subscript that specifies an invalid
memory address.

The type of the object used in the subscript is now tested to be an
integer by using mp_obj_get_int_truncated instead of
mp_obj_int_get_truncated.  The performance hit of this change is minimal,
and machine.memX objects are more for convenience than performance (there
are many other ways to read/write memory in a faster way),

Fixes issue #6588.
---
 extmod/machine_mem.c         |  2 +-
 ports/unix/modmachine.c      |  2 +-
 tests/extmod/machine1.py     | 20 ++++++++++++++++++++
 tests/extmod/machine1.py.exp |  4 ++++
 4 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/extmod/machine_mem.c b/extmod/machine_mem.c
index a1494bd51ad17..73e2f7fd1fcb0 100644
--- a/extmod/machine_mem.c
+++ b/extmod/machine_mem.c
@@ -40,7 +40,7 @@
 
 #if !defined(MICROPY_MACHINE_MEM_GET_READ_ADDR) || !defined(MICROPY_MACHINE_MEM_GET_WRITE_ADDR)
 STATIC uintptr_t machine_mem_get_addr(mp_obj_t addr_o, uint align) {
-    uintptr_t addr = mp_obj_int_get_truncated(addr_o);
+    uintptr_t addr = mp_obj_get_int_truncated(addr_o);
     if ((addr & (align - 1)) != 0) {
         mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("address %08x is not aligned to %d bytes"), addr, align);
     }
diff --git a/ports/unix/modmachine.c b/ports/unix/modmachine.c
index a6eb8c01edd05..5b462a3b1534b 100644
--- a/ports/unix/modmachine.c
+++ b/ports/unix/modmachine.c
@@ -47,7 +47,7 @@
 #if MICROPY_PY_MACHINE
 
 uintptr_t mod_machine_mem_get_addr(mp_obj_t addr_o, uint align) {
-    uintptr_t addr = mp_obj_int_get_truncated(addr_o);
+    uintptr_t addr = mp_obj_get_int_truncated(addr_o);
     if ((addr & (align - 1)) != 0) {
         mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("address %08x is not aligned to %d bytes"), addr, align);
     }
diff --git a/tests/extmod/machine1.py b/tests/extmod/machine1.py
index 6ff38cc05179d..0c7f8122f4ae4 100644
--- a/tests/extmod/machine1.py
+++ b/tests/extmod/machine1.py
@@ -26,3 +26,23 @@
     del machine.mem8[0]
 except TypeError:
     print("TypeError")
+
+try:
+    machine.mem8[0:1]
+except TypeError:
+    print("TypeError")
+
+try:
+    machine.mem8[0:1] = 10
+except TypeError:
+    print("TypeError")
+
+try:
+    machine.mem8["hello"]
+except TypeError:
+    print("TypeError")
+
+try:
+    machine.mem8["hello"] = 10
+except TypeError:
+    print("TypeError")
diff --git a/tests/extmod/machine1.py.exp b/tests/extmod/machine1.py.exp
index bb421ea5cfa42..250485969086e 100644
--- a/tests/extmod/machine1.py.exp
+++ b/tests/extmod/machine1.py.exp
@@ -2,3 +2,7 @@
 ValueError
 ValueError
 TypeError
+TypeError
+TypeError
+TypeError
+TypeError

From a0623a081c0dde50aa8d87b464232f2d7866f951 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 12 Nov 2020 12:04:56 +1100
Subject: [PATCH 0399/3533] stm32/Makefile: Allow boards to extend all SRC
 variables.

And rename SRC_HAL -> HAL_SRC_C and SRC_USBDEV -> USBDEV_SRC_C for
consistency with other source variables.

Follow on from 0fff2e03fe07471997a6df6f92c6960cfd225dc0

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/Makefile | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/ports/stm32/Makefile b/ports/stm32/Makefile
index 8f7cdd93ca5fe..18f7e8a1a10d8 100644
--- a/ports/stm32/Makefile
+++ b/ports/stm32/Makefile
@@ -148,7 +148,7 @@ endif
 # Options for mpy-cross
 MPY_CROSS_FLAGS += -march=armv7m
 
-LIB_SRC_C = $(addprefix lib/,\
+LIB_SRC_C += $(addprefix lib/,\
 	libc/string0.c \
 	mp-readline/readline.c \
 	netutils/netutils.c \
@@ -163,7 +163,7 @@ LIB_SRC_C = $(addprefix lib/,\
 	)
 
 ifeq ($(MICROPY_FLOAT_IMPL),double)
-LIBM_SRC_C = $(addprefix lib/libm_dbl/,\
+LIBM_SRC_C += $(addprefix lib/libm_dbl/,\
 	__cos.c \
 	__expo2.c \
 	__fpclassify.c \
@@ -213,7 +213,7 @@ else
 LIBM_SRC_C += lib/libm_dbl/sqrt.c
 endif
 else
-LIBM_SRC_C = $(addprefix lib/libm/,\
+LIBM_SRC_C += $(addprefix lib/libm/,\
 	math.c \
 	acoshf.c \
 	asinfacosf.c \
@@ -255,11 +255,11 @@ ifeq ($(MICROPY_FLOAT_IMPL),double)
 $(LIBM_O): CFLAGS := $(filter-out -Wdouble-promotion -Wfloat-conversion, $(CFLAGS))
 endif
 
-EXTMOD_SRC_C = $(addprefix extmod/,\
+EXTMOD_SRC_C += $(addprefix extmod/,\
 	modonewire.c \
         )
 
-DRIVERS_SRC_C = $(addprefix drivers/,\
+DRIVERS_SRC_C += $(addprefix drivers/,\
 	bus/softspi.c \
 	bus/softqspi.c \
 	memory/spiflash.c \
@@ -363,7 +363,7 @@ SRC_O += \
 endif
 endif
 
-SRC_HAL = $(addprefix $(HAL_DIR)/Src/stm32$(MCU_SERIES)xx_,\
+HAL_SRC_C += $(addprefix $(HAL_DIR)/Src/stm32$(MCU_SERIES)xx_,\
 	hal.c \
 	hal_adc.c \
 	hal_adc_ex.c \
@@ -388,13 +388,13 @@ SRC_HAL = $(addprefix $(HAL_DIR)/Src/stm32$(MCU_SERIES)xx_,\
 	)
 
 ifeq ($(MCU_SERIES),$(filter $(MCU_SERIES),f4 f7 h7 l0 l4 wb))
-SRC_HAL += $(addprefix $(HAL_DIR)/Src/stm32$(MCU_SERIES)xx_,\
+HAL_SRC_C += $(addprefix $(HAL_DIR)/Src/stm32$(MCU_SERIES)xx_,\
 	ll_usb.c \
 	)
 endif
 
 ifeq ($(MCU_SERIES),$(filter $(MCU_SERIES),f4 f7 h7 l4))
-SRC_HAL += $(addprefix $(HAL_DIR)/Src/stm32$(MCU_SERIES)xx_,\
+HAL_SRC_C += $(addprefix $(HAL_DIR)/Src/stm32$(MCU_SERIES)xx_,\
 	hal_sd.c \
 	ll_sdmmc.c \
 	ll_fmc.c \
@@ -402,7 +402,7 @@ SRC_HAL += $(addprefix $(HAL_DIR)/Src/stm32$(MCU_SERIES)xx_,\
 endif
 
 ifeq ($(MCU_SERIES),$(filter $(MCU_SERIES),f4 f7 h7))
-SRC_HAL += $(addprefix $(HAL_DIR)/Src/stm32$(MCU_SERIES)xx_,\
+HAL_SRC_C += $(addprefix $(HAL_DIR)/Src/stm32$(MCU_SERIES)xx_,\
 	hal_mmc.c \
 	hal_sdram.c \
 	hal_dma_ex.c \
@@ -411,14 +411,14 @@ SRC_HAL += $(addprefix $(HAL_DIR)/Src/stm32$(MCU_SERIES)xx_,\
 endif
 
 ifeq ($(CMSIS_MCU),$(filter $(CMSIS_MCU),STM32H743xx))
-    SRC_HAL += $(addprefix $(HAL_DIR)/Src/stm32$(MCU_SERIES)xx_, hal_fdcan.c)
+    HAL_SRC_C += $(addprefix $(HAL_DIR)/Src/stm32$(MCU_SERIES)xx_, hal_fdcan.c)
 else
 ifeq ($(MCU_SERIES),$(filter $(MCU_SERIES),f0 f4 f7 h7 l4))
-    SRC_HAL += $(addprefix $(HAL_DIR)/Src/stm32$(MCU_SERIES)xx_, hal_can.c)
+    HAL_SRC_C += $(addprefix $(HAL_DIR)/Src/stm32$(MCU_SERIES)xx_, hal_can.c)
 endif
 endif
 
-SRC_USBDEV = $(addprefix $(USBDEV_DIR)/,\
+USBDEV_SRC_C += $(addprefix $(USBDEV_DIR)/,\
 	core/src/usbd_core.c \
 	core/src/usbd_ctlreq.c \
 	core/src/usbd_ioreq.c \
@@ -521,11 +521,11 @@ OBJ += $(addprefix $(BUILD)/, $(LIB_SRC_C:.c=.o))
 OBJ += $(LIBM_O)
 OBJ += $(addprefix $(BUILD)/, $(EXTMOD_SRC_C:.c=.o))
 OBJ += $(addprefix $(BUILD)/, $(DRIVERS_SRC_C:.c=.o))
+OBJ += $(addprefix $(BUILD)/, $(HAL_SRC_C:.c=.o))
+OBJ += $(addprefix $(BUILD)/, $(USBDEV_SRC_C:.c=.o))
 OBJ += $(addprefix $(BUILD)/, $(SRC_C:.c=.o))
 OBJ += $(addprefix $(BUILD)/, $(SRC_CXX:.cpp=.o))
 OBJ += $(addprefix $(BUILD)/, $(SRC_O))
-OBJ += $(addprefix $(BUILD)/, $(SRC_HAL:.c=.o))
-OBJ += $(addprefix $(BUILD)/, $(SRC_USBDEV:.c=.o))
 OBJ += $(addprefix $(BUILD)/, $(SRC_MOD:.c=.o))
 OBJ += $(BUILD)/pins_$(BOARD).o
 

From cc2a35b7b241e7eda031db424bf9b3afb8b6204b Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 12 Nov 2020 14:35:43 +1100
Subject: [PATCH 0400/3533] stm32/rtc: Validate the RTC prescaler on boot and
 change if incorrect.

Devices with RTC backup-batteries have been shown (very rarely) to have
incorrect RTC prescaler values.  Such incorrect values mean the RTC counts
fast or slow, and will be wrong forever if the power/backup-battery is
always present.

This commit detects such a state at start up (hard reset) and corrects it
by reconfiguring the RTC prescaler values.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/boards/stm32f0xx_hal_conf_base.h |  1 +
 ports/stm32/boards/stm32f4xx_hal_conf_base.h |  1 +
 ports/stm32/boards/stm32f7xx_hal_conf_base.h |  1 +
 ports/stm32/boards/stm32h7xx_hal_conf_base.h |  1 +
 ports/stm32/boards/stm32l0xx_hal_conf_base.h |  1 +
 ports/stm32/boards/stm32l4xx_hal_conf_base.h |  1 +
 ports/stm32/boards/stm32wbxx_hal_conf_base.h |  1 +
 ports/stm32/rtc.c                            | 40 ++++++++++++++++++--
 8 files changed, 44 insertions(+), 3 deletions(-)

diff --git a/ports/stm32/boards/stm32f0xx_hal_conf_base.h b/ports/stm32/boards/stm32f0xx_hal_conf_base.h
index faceda2f4fa90..5c6f31d1dd81b 100644
--- a/ports/stm32/boards/stm32f0xx_hal_conf_base.h
+++ b/ports/stm32/boards/stm32f0xx_hal_conf_base.h
@@ -48,6 +48,7 @@
 #include "stm32f0xx_hal_usart.h"
 #include "stm32f0xx_hal_wwdg.h"
 #include "stm32f0xx_ll_adc.h"
+#include "stm32f0xx_ll_rtc.h"
 
 // Enable various HAL modules
 #define HAL_MODULE_ENABLED
diff --git a/ports/stm32/boards/stm32f4xx_hal_conf_base.h b/ports/stm32/boards/stm32f4xx_hal_conf_base.h
index cdae0c5629e20..8d8bb8f4eeccc 100644
--- a/ports/stm32/boards/stm32f4xx_hal_conf_base.h
+++ b/ports/stm32/boards/stm32f4xx_hal_conf_base.h
@@ -53,6 +53,7 @@
 #include "stm32f4xx_hal_uart.h"
 #include "stm32f4xx_hal_usart.h"
 #include "stm32f4xx_hal_wwdg.h"
+#include "stm32f4xx_ll_rtc.h"
 
 // Enable various HAL modules
 #define HAL_ADC_MODULE_ENABLED
diff --git a/ports/stm32/boards/stm32f7xx_hal_conf_base.h b/ports/stm32/boards/stm32f7xx_hal_conf_base.h
index 05ab10fea08ad..83a144f8fe7f0 100644
--- a/ports/stm32/boards/stm32f7xx_hal_conf_base.h
+++ b/ports/stm32/boards/stm32f7xx_hal_conf_base.h
@@ -53,6 +53,7 @@
 #include "stm32f7xx_hal_uart.h"
 #include "stm32f7xx_hal_usart.h"
 #include "stm32f7xx_hal_wwdg.h"
+#include "stm32f7xx_ll_rtc.h"
 
 // Enable various HAL modules
 #define HAL_ADC_MODULE_ENABLED
diff --git a/ports/stm32/boards/stm32h7xx_hal_conf_base.h b/ports/stm32/boards/stm32h7xx_hal_conf_base.h
index 9f43da40308f7..231f1ac7f4d28 100644
--- a/ports/stm32/boards/stm32h7xx_hal_conf_base.h
+++ b/ports/stm32/boards/stm32h7xx_hal_conf_base.h
@@ -54,6 +54,7 @@
 #include "stm32h7xx_hal_usart.h"
 #include "stm32h7xx_hal_wwdg.h"
 #include "stm32h7xx_ll_adc.h"
+#include "stm32h7xx_ll_rtc.h"
 
 // Enable various HAL modules
 #define HAL_ADC_MODULE_ENABLED
diff --git a/ports/stm32/boards/stm32l0xx_hal_conf_base.h b/ports/stm32/boards/stm32l0xx_hal_conf_base.h
index b100daaa98eb3..6b5ece766a83c 100644
--- a/ports/stm32/boards/stm32l0xx_hal_conf_base.h
+++ b/ports/stm32/boards/stm32l0xx_hal_conf_base.h
@@ -47,6 +47,7 @@
 #include "stm32l0xx_hal_usart.h"
 #include "stm32l0xx_hal_wwdg.h"
 #include "stm32l0xx_ll_adc.h"
+#include "stm32l0xx_ll_rtc.h"
 
 // Enable various HAL modules
 #define HAL_MODULE_ENABLED
diff --git a/ports/stm32/boards/stm32l4xx_hal_conf_base.h b/ports/stm32/boards/stm32l4xx_hal_conf_base.h
index cfffcffbbe134..215e798b92f2e 100644
--- a/ports/stm32/boards/stm32l4xx_hal_conf_base.h
+++ b/ports/stm32/boards/stm32l4xx_hal_conf_base.h
@@ -51,6 +51,7 @@
 #include "stm32l4xx_hal_usart.h"
 #include "stm32l4xx_hal_wwdg.h"
 #include "stm32l4xx_ll_adc.h"
+#include "stm32l4xx_ll_rtc.h"
 
 // Enable various HAL modules
 #define HAL_MODULE_ENABLED
diff --git a/ports/stm32/boards/stm32wbxx_hal_conf_base.h b/ports/stm32/boards/stm32wbxx_hal_conf_base.h
index 83d07ad5b1c3b..91309e286fa1e 100644
--- a/ports/stm32/boards/stm32wbxx_hal_conf_base.h
+++ b/ports/stm32/boards/stm32wbxx_hal_conf_base.h
@@ -42,6 +42,7 @@
 #include "stm32wbxx_hal_uart.h"
 #include "stm32wbxx_hal_usart.h"
 #include "stm32wbxx_ll_adc.h"
+#include "stm32wbxx_ll_rtc.h"
 
 // Enable various HAL modules
 #define HAL_MODULE_ENABLED
diff --git a/ports/stm32/rtc.c b/ports/stm32/rtc.c
index 18ecf7750513b..bd898d4558570 100644
--- a/ports/stm32/rtc.c
+++ b/ports/stm32/rtc.c
@@ -114,20 +114,22 @@ void rtc_init_start(bool force_init) {
     rtc_need_init_finalise = false;
 
     if (!force_init) {
+        bool rtc_running = false;
         uint32_t bdcr = RCC->BDCR;
         if ((bdcr & (RCC_BDCR_RTCEN | RCC_BDCR_RTCSEL | RCC_BDCR_LSEON | RCC_BDCR_LSERDY))
             == (RCC_BDCR_RTCEN | RCC_BDCR_RTCSEL_0 | RCC_BDCR_LSEON | RCC_BDCR_LSERDY)) {
             // LSE is enabled & ready --> no need to (re-)init RTC
+            rtc_running = true;
             // remove Backup Domain write protection
             HAL_PWR_EnableBkUpAccess();
             // Clear source Reset Flag
             __HAL_RCC_CLEAR_RESET_FLAGS();
             // provide some status information
-            rtc_info |= 0x40000 | (RCC->BDCR & 7) | (RCC->CSR & 3) << 8;
-            return;
+            rtc_info |= 0x40000;
         } else if ((bdcr & (RCC_BDCR_RTCEN | RCC_BDCR_RTCSEL))
                    == (RCC_BDCR_RTCEN | RCC_BDCR_RTCSEL_1)) {
             // LSI configured as the RTC clock source --> no need to (re-)init RTC
+            rtc_running = true;
             // remove Backup Domain write protection
             HAL_PWR_EnableBkUpAccess();
             // Clear source Reset Flag
@@ -135,7 +137,39 @@ void rtc_init_start(bool force_init) {
             // Turn the LSI on (it may need this even if the RTC is running)
             RCC->CSR |= RCC_CSR_LSION;
             // provide some status information
-            rtc_info |= 0x80000 | (RCC->BDCR & 7) | (RCC->CSR & 3) << 8;
+            rtc_info |= 0x80000;
+        }
+
+        if (rtc_running) {
+            // Provide information about the registers that indicated the RTC is running.
+            rtc_info |= (RCC->BDCR & 7) | (RCC->CSR & 3) << 8;
+
+            // Check that the sync and async prescaler values are correct.  If the RTC
+            // gets into a state where they are wrong then it will run slow or fast and
+            // never be corrected.  In such a situation, attempt to reconfigure the values
+            // without changing the data/time.
+            if (LL_RTC_GetSynchPrescaler(RTC) != RTC_SYNCH_PREDIV
+                || LL_RTC_GetAsynchPrescaler(RTC) != RTC_ASYNCH_PREDIV) {
+                // Values are wrong, attempt to enter RTC init mode and change them.
+                LL_RTC_DisableWriteProtection(RTC);
+                LL_RTC_EnableInitMode(RTC);
+                uint32_t ticks_ms = HAL_GetTick();
+                while (HAL_GetTick() - ticks_ms < RTC_TIMEOUT_VALUE) {
+                    if (LL_RTC_IsActiveFlag_INIT(RTC)) {
+                        // Reconfigure the RTC prescaler register PRER.
+                        LL_RTC_SetSynchPrescaler(RTC, RTC_SYNCH_PREDIV);
+                        LL_RTC_SetAsynchPrescaler(RTC, RTC_ASYNCH_PREDIV);
+                        LL_RTC_DisableInitMode(RTC);
+                        break;
+                    }
+                }
+                LL_RTC_EnableWriteProtection(RTC);
+
+                // Provide information that the prescaler was changed.
+                rtc_info |= 0x100000;
+            }
+
+            // The RTC is up and running, so return without any further configuration.
             return;
         }
     }

From 309fb822e6f24de54dbd107d4573a3bedac0bf9e Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Tue, 3 Nov 2020 17:38:09 +1100
Subject: [PATCH 0401/3533] tests/run-multitests.py: Fix diff order, show
 changes relative to truth.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 tests/run-multitests.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/run-multitests.py b/tests/run-multitests.py
index ad032df38b238..5b8e70e921a7a 100755
--- a/tests/run-multitests.py
+++ b/tests/run-multitests.py
@@ -389,7 +389,7 @@ def run_tests(test_files, instances_truth, instances_test):
                 print("### TRUTH ###")
                 print(output_truth, end="")
                 print("### DIFF ###")
-                print_diff(output_test, output_truth)
+                print_diff(output_truth, output_test)
 
         if cmd_args.show_output:
             print()

From ccfd535af48f2ffc00f7306648b60624894d3004 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Tue, 3 Nov 2020 17:41:28 +1100
Subject: [PATCH 0402/3533] tests/multi_bluetooth: Improve reliability of event
 waiting.

Use the same `wait_for_event` in all tests that doesn't hold a reference to
the event data tuple and handles repeat events.

Also fix a few misc reliability issues around timeouts and sequencing.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 tests/multi_bluetooth/ble_characteristic.py   | 91 ++++++++-----------
 .../multi_bluetooth/ble_characteristic.py.exp |  1 +
 tests/multi_bluetooth/ble_gap_advertise.py    |  5 +-
 tests/multi_bluetooth/ble_gap_connect.py      | 70 +++++---------
 tests/multi_bluetooth/ble_gap_device_name.py  | 53 +++++------
 .../ble_gap_device_name.py.exp                |  1 +
 .../multi_bluetooth/ble_gatt_data_transfer.py | 62 +++++--------
 .../ble_gattc_discover_services.py            | 37 ++++----
 .../ble_gattc_discover_services.py.exp        |  2 +
 tests/multi_bluetooth/ble_mtu.py              | 54 +++++------
 10 files changed, 155 insertions(+), 221 deletions(-)

diff --git a/tests/multi_bluetooth/ble_characteristic.py b/tests/multi_bluetooth/ble_characteristic.py
index 026b9d551c2b9..0f22daff88f0a 100644
--- a/tests/multi_bluetooth/ble_characteristic.py
+++ b/tests/multi_bluetooth/ble_characteristic.py
@@ -31,28 +31,31 @@
 )
 SERVICES = (SERVICE,)
 
-waiting_event = None
-waiting_data = None
-value_handle = 0
+waiting_events = {}
 
 
 def irq(event, data):
-    global waiting_event, waiting_data, value_handle
     if event == _IRQ_CENTRAL_CONNECT:
         print("_IRQ_CENTRAL_CONNECT")
+        waiting_events[event] = data[0]
     elif event == _IRQ_CENTRAL_DISCONNECT:
         print("_IRQ_CENTRAL_DISCONNECT")
     elif event == _IRQ_GATTS_WRITE:
         print("_IRQ_GATTS_WRITE", ble.gatts_read(data[-1]))
     elif event == _IRQ_PERIPHERAL_CONNECT:
         print("_IRQ_PERIPHERAL_CONNECT")
+        waiting_events[event] = data[0]
     elif event == _IRQ_PERIPHERAL_DISCONNECT:
         print("_IRQ_PERIPHERAL_DISCONNECT")
     elif event == _IRQ_GATTC_CHARACTERISTIC_RESULT:
         # conn_handle, def_handle, value_handle, properties, uuid = data
         if data[-1] == CHAR_UUID:
             print("_IRQ_GATTC_CHARACTERISTIC_RESULT", data[-1])
-            value_handle = data[2]
+            waiting_events[event] = data[2]
+        else:
+            return
+    elif event == _IRQ_GATTC_CHARACTERISTIC_DONE:
+        print("_IRQ_GATTC_CHARACTERISTIC_DONE")
     elif event == _IRQ_GATTC_READ_RESULT:
         print("_IRQ_GATTC_READ_RESULT", bytes(data[-1]))
     elif event == _IRQ_GATTC_READ_DONE:
@@ -66,25 +69,19 @@ def irq(event, data):
     elif event == _IRQ_GATTS_INDICATE_DONE:
         print("_IRQ_GATTS_INDICATE_DONE", data[-1])
 
-    if waiting_event is not None:
-        if (isinstance(waiting_event, int) and event == waiting_event) or (
-            not isinstance(waiting_event, int) and waiting_event(event, data)
-        ):
-            waiting_event = None
-            waiting_data = data
+    if event not in waiting_events:
+        waiting_events[event] = None
 
 
 def wait_for_event(event, timeout_ms):
-    global waiting_event, waiting_data
-    waiting_event = event
-    waiting_data = None
-
     t0 = time.ticks_ms()
     while time.ticks_diff(time.ticks_ms(), t0) < timeout_ms:
-        if waiting_data:
-            return True
+        if event in waiting_events:
+            result = waiting_events[event]
+            del waiting_events[event]
+            return result
         machine.idle()
-    return False
+    raise ValueError("Timeout waiting for {}".format(event))
 
 
 # Acting in peripheral role.
@@ -99,39 +96,35 @@ def instance0():
         ble.gatts_write(char_handle, "periph0")
 
         # Wait for central to connect to us.
-        if not wait_for_event(_IRQ_CENTRAL_CONNECT, TIMEOUT_MS):
-            return
-        conn_handle, _, _ = waiting_data
+        conn_handle = wait_for_event(_IRQ_CENTRAL_CONNECT, TIMEOUT_MS)
 
-        # Wait for a write to the characteristic from the central.
-        wait_for_event(_IRQ_GATTS_WRITE, TIMEOUT_MS)
+        # A
 
-        # Wait a bit, then write the characteristic and notify it.
-        time.sleep_ms(1000)
+        # Wait for a write to the characteristic from the central,
+        # then reply with a notification.
+        wait_for_event(_IRQ_GATTS_WRITE, TIMEOUT_MS)
         print("gatts_write")
         ble.gatts_write(char_handle, "periph1")
         print("gatts_notify")
         ble.gatts_notify(conn_handle, char_handle)
 
-        # Wait for a write to the characteristic from the central.
-        wait_for_event(_IRQ_GATTS_WRITE, TIMEOUT_MS)
+        # B
 
-        # Wait a bit, then notify a new value on the characteristic.
-        time.sleep_ms(1000)
+        # Wait for a write to the characteristic from the central,
+        # then reply with value-included notification.
+        wait_for_event(_IRQ_GATTS_WRITE, TIMEOUT_MS)
         print("gatts_notify")
         ble.gatts_notify(conn_handle, char_handle, "periph2")
 
-        # Wait for a write to the characteristic from the central.
-        wait_for_event(_IRQ_GATTS_WRITE, TIMEOUT_MS)
+        # C
 
-        # Wait a bit, then notify a new value on the characteristic.
-        time.sleep_ms(1000)
+        # Wait for a write to the characteristic from the central,
+        # then reply with an indication.
+        wait_for_event(_IRQ_GATTS_WRITE, TIMEOUT_MS)
         print("gatts_write")
         ble.gatts_write(char_handle, "periph3")
         print("gatts_indicate")
         ble.gatts_indicate(conn_handle, char_handle)
-
-        # Wait for the indicate ack.
         wait_for_event(_IRQ_GATTS_INDICATE_DONE, TIMEOUT_MS)
 
         # Wait for the central to disconnect.
@@ -147,49 +140,45 @@ def instance1():
         # Connect to peripheral and then disconnect.
         print("gap_connect")
         ble.gap_connect(*BDADDR)
-        if not wait_for_event(_IRQ_PERIPHERAL_CONNECT, TIMEOUT_MS):
-            return
-        conn_handle, _, _ = waiting_data
+        conn_handle = wait_for_event(_IRQ_PERIPHERAL_CONNECT, TIMEOUT_MS)
 
         # Discover characteristics.
         ble.gattc_discover_characteristics(conn_handle, 1, 65535)
-        wait_for_event(lambda event, data: value_handle, TIMEOUT_MS)
+        value_handle = wait_for_event(_IRQ_GATTC_CHARACTERISTIC_RESULT, TIMEOUT_MS)
+        wait_for_event(_IRQ_GATTC_CHARACTERISTIC_DONE, TIMEOUT_MS)
 
         # Issue read of characteristic, should get initial value.
         print("gattc_read")
         ble.gattc_read(conn_handle, value_handle)
         wait_for_event(_IRQ_GATTC_READ_RESULT, TIMEOUT_MS)
 
-        # Write to the characteristic, and ask for a response.
+        # Write to the characteristic, which will trigger a notification.
         print("gattc_write")
         ble.gattc_write(conn_handle, value_handle, "central0", 1)
         wait_for_event(_IRQ_GATTC_WRITE_DONE, TIMEOUT_MS)
-
-        # Wait for a notify, then read new value.
+        # A
         wait_for_event(_IRQ_GATTC_NOTIFY, TIMEOUT_MS)
-        print("gattc_read")
+        print("gattc_read")  # Read the new value set immediately before notification.
         ble.gattc_read(conn_handle, value_handle)
         wait_for_event(_IRQ_GATTC_READ_RESULT, TIMEOUT_MS)
 
-        # Write to the characteristic, and ask for a response.
+        # Write to the characteristic, which will trigger a value-included notification.
         print("gattc_write")
         ble.gattc_write(conn_handle, value_handle, "central1", 1)
         wait_for_event(_IRQ_GATTC_WRITE_DONE, TIMEOUT_MS)
-
-        # Wait for a notify (should have new data), then read old value (should be unchanged).
+        # B
         wait_for_event(_IRQ_GATTC_NOTIFY, TIMEOUT_MS)
-        print("gattc_read")
+        print("gattc_read")  # Read value should be unchanged.
         ble.gattc_read(conn_handle, value_handle)
         wait_for_event(_IRQ_GATTC_READ_RESULT, TIMEOUT_MS)
 
-        # Write to the characteristic, and ask for a response.
+        # Write to the characteristic, which will trigger an indication.
         print("gattc_write")
         ble.gattc_write(conn_handle, value_handle, "central2", 1)
         wait_for_event(_IRQ_GATTC_WRITE_DONE, TIMEOUT_MS)
-
-        # Wait for a indicate (should have new data), then read new value.
+        # C
         wait_for_event(_IRQ_GATTC_INDICATE, TIMEOUT_MS)
-        print("gattc_read")
+        print("gattc_read")  # Read the new value set immediately before indication.
         ble.gattc_read(conn_handle, value_handle)
         wait_for_event(_IRQ_GATTC_READ_RESULT, TIMEOUT_MS)
 
diff --git a/tests/multi_bluetooth/ble_characteristic.py.exp b/tests/multi_bluetooth/ble_characteristic.py.exp
index 90dc46c06fd57..31667415eebf8 100644
--- a/tests/multi_bluetooth/ble_characteristic.py.exp
+++ b/tests/multi_bluetooth/ble_characteristic.py.exp
@@ -15,6 +15,7 @@ _IRQ_CENTRAL_DISCONNECT
 gap_connect
 _IRQ_PERIPHERAL_CONNECT
 _IRQ_GATTC_CHARACTERISTIC_RESULT UUID('00000000-1111-2222-3333-444444444444')
+_IRQ_GATTC_CHARACTERISTIC_DONE
 gattc_read
 _IRQ_GATTC_READ_RESULT b'periph0'
 _IRQ_GATTC_READ_DONE 0
diff --git a/tests/multi_bluetooth/ble_gap_advertise.py b/tests/multi_bluetooth/ble_gap_advertise.py
index bb6ff8e425461..bb1ef94a71e7b 100644
--- a/tests/multi_bluetooth/ble_gap_advertise.py
+++ b/tests/multi_bluetooth/ble_gap_advertise.py
@@ -46,7 +46,10 @@ def irq(ev, data):
         elif ev == _IRQ_SCAN_DONE:
             finished = True
 
-    ble.config(rxbuf=2000)
+    try:
+        ble.config(rxbuf=2000)
+    except:
+        pass
     ble.irq(irq)
     ble.gap_scan(2 * ADV_TIME_S * 1000, 10000, 10000)
     while not finished:
diff --git a/tests/multi_bluetooth/ble_gap_connect.py b/tests/multi_bluetooth/ble_gap_connect.py
index 8b40a29163119..2c1d2cbbc55dc 100644
--- a/tests/multi_bluetooth/ble_gap_connect.py
+++ b/tests/multi_bluetooth/ble_gap_connect.py
@@ -10,101 +10,77 @@
 _IRQ_PERIPHERAL_CONNECT = const(7)
 _IRQ_PERIPHERAL_DISCONNECT = const(8)
 
-central_connected = False
-central_disconnected = False
-peripheral_connected = False
-peripheral_disconnected = False
-conn_handle = None
+waiting_events = {}
 
 
 def irq(event, data):
-    global central_connected, central_disconnected, peripheral_connected, peripheral_disconnected, conn_handle
     if event == _IRQ_CENTRAL_CONNECT:
         print("_IRQ_CENTRAL_CONNECT")
-        central_connected = True
-        conn_handle = data[0]
+        waiting_events[event] = data[0]
     elif event == _IRQ_CENTRAL_DISCONNECT:
         print("_IRQ_CENTRAL_DISCONNECT")
-        central_disconnected = True
     elif event == _IRQ_PERIPHERAL_CONNECT:
         print("_IRQ_PERIPHERAL_CONNECT")
-        peripheral_connected = True
-        conn_handle = data[0]
+        waiting_events[event] = data[0]
     elif event == _IRQ_PERIPHERAL_DISCONNECT:
         print("_IRQ_PERIPHERAL_DISCONNECT")
-        peripheral_disconnected = True
-        remote_addr = data[0]
 
+    if event not in waiting_events:
+        waiting_events[event] = None
 
-def wait_for(fn, timeout_ms):
+
+def wait_for_event(event, timeout_ms):
     t0 = time.ticks_ms()
     while time.ticks_diff(time.ticks_ms(), t0) < timeout_ms:
-        if fn():
-            return True
+        if event in waiting_events:
+            result = waiting_events[event]
+            del waiting_events[event]
+            return result
         machine.idle()
-    return False
+    raise ValueError("Timeout waiting for {}".format(event))
 
 
 # Acting in peripheral role.
 def instance0():
-    global central_connected, central_disconnected
-
     multitest.globals(BDADDR=ble.config("mac"))
     print("gap_advertise")
     ble.gap_advertise(20_000, b"\x02\x01\x06\x04\xffMPY")
     multitest.next()
     try:
         # Wait for central to connect, then wait for it to disconnect.
-        if not wait_for(lambda: central_connected, TIMEOUT_MS):
-            return
-        if not wait_for(lambda: central_disconnected, TIMEOUT_MS):
-            return
-
-        central_connected = False
-        central_disconnected = False
+        wait_for_event(_IRQ_CENTRAL_CONNECT, TIMEOUT_MS)
+        wait_for_event(_IRQ_CENTRAL_DISCONNECT, TIMEOUT_MS)
 
         # Start advertising again.
         print("gap_advertise")
         ble.gap_advertise(20_000, b"\x02\x01\x06\x04\xffMPY")
 
         # Wait for central to connect, then disconnect it.
-        if not wait_for(lambda: central_connected, TIMEOUT_MS):
-            return
+        conn_handle = wait_for_event(_IRQ_CENTRAL_CONNECT, TIMEOUT_MS)
         print("gap_disconnect:", ble.gap_disconnect(conn_handle))
-        if not wait_for(lambda: central_disconnected, TIMEOUT_MS):
-            return
+        wait_for_event(_IRQ_CENTRAL_DISCONNECT, TIMEOUT_MS)
     finally:
         ble.active(0)
 
 
 # Acting in central role.
 def instance1():
-    global peripheral_connected, peripheral_disconnected
-
     multitest.next()
     try:
         # Connect to peripheral and then disconnect.
         print("gap_connect")
         ble.gap_connect(*BDADDR)
-        if not wait_for(lambda: peripheral_connected, TIMEOUT_MS):
-            return
+        conn_handle = wait_for_event(_IRQ_PERIPHERAL_CONNECT, TIMEOUT_MS)
         print("gap_disconnect:", ble.gap_disconnect(conn_handle))
-        if not wait_for(lambda: peripheral_disconnected, TIMEOUT_MS):
-            return
-
-        peripheral_connected = False
-        peripheral_disconnected = False
-
-        # Wait for peripheral to start advertising again.
-        time.sleep_ms(100)
+        wait_for_event(_IRQ_PERIPHERAL_DISCONNECT, TIMEOUT_MS)
 
         # Connect to peripheral and then let the peripheral disconnect us.
+        # Extra scan timeout allows for the peripheral to receive the disconnect
+        # event and start advertising again.
         print("gap_connect")
-        ble.gap_connect(*BDADDR)
-        if not wait_for(lambda: peripheral_connected, TIMEOUT_MS):
-            return
-        if not wait_for(lambda: peripheral_disconnected, TIMEOUT_MS):
-            return
+        ble.gap_connect(BDADDR[0], BDADDR[1], 5000)
+        wait_for_event(_IRQ_PERIPHERAL_CONNECT, TIMEOUT_MS)
+        wait_for_event(_IRQ_PERIPHERAL_DISCONNECT, TIMEOUT_MS)
     finally:
         ble.active(0)
 
diff --git a/tests/multi_bluetooth/ble_gap_device_name.py b/tests/multi_bluetooth/ble_gap_device_name.py
index fbc9d80baeb08..e7202170bd8a4 100644
--- a/tests/multi_bluetooth/ble_gap_device_name.py
+++ b/tests/multi_bluetooth/ble_gap_device_name.py
@@ -16,45 +16,44 @@
 
 GAP_DEVICE_NAME_UUID = bluetooth.UUID(0x2A00)
 
-waiting_event = None
-waiting_data = None
-value_handle = 0
+waiting_events = {}
 
 
 def irq(event, data):
-    global waiting_event, waiting_data, value_handle
     if event == _IRQ_CENTRAL_CONNECT:
         print("_IRQ_CENTRAL_CONNECT")
+        waiting_events[event] = data[0]
     elif event == _IRQ_CENTRAL_DISCONNECT:
         print("_IRQ_CENTRAL_DISCONNECT")
     elif event == _IRQ_PERIPHERAL_CONNECT:
         print("_IRQ_PERIPHERAL_CONNECT")
+        waiting_events[event] = data[0]
     elif event == _IRQ_PERIPHERAL_DISCONNECT:
         print("_IRQ_PERIPHERAL_DISCONNECT")
     elif event == _IRQ_GATTC_CHARACTERISTIC_RESULT:
         if data[-1] == GAP_DEVICE_NAME_UUID:
             print("_IRQ_GATTC_CHARACTERISTIC_RESULT", data[-1])
-            value_handle = data[2]
+            waiting_events[event] = data[2]
+        else:
+            return
+    elif event == _IRQ_GATTC_CHARACTERISTIC_DONE:
+        print("_IRQ_GATTC_CHARACTERISTIC_DONE")
     elif event == _IRQ_GATTC_READ_RESULT:
         print("_IRQ_GATTC_READ_RESULT", bytes(data[-1]))
 
-    if waiting_event is not None:
-        if isinstance(waiting_event, int) and event == waiting_event:
-            waiting_event = None
-            waiting_data = data
+    if event not in waiting_events:
+        waiting_events[event] = None
 
 
 def wait_for_event(event, timeout_ms):
-    global waiting_event, waiting_data
-    waiting_event = event
-    waiting_data = None
-
     t0 = time.ticks_ms()
     while time.ticks_diff(time.ticks_ms(), t0) < timeout_ms:
-        if waiting_data:
-            return True
+        if event in waiting_events:
+            result = waiting_events[event]
+            del waiting_events[event]
+            return result
         machine.idle()
-    return False
+    raise ValueError("Timeout waiting for {}".format(event))
 
 
 # Acting in peripheral role.
@@ -79,10 +78,8 @@ def instance0():
             ble.gap_advertise(20_000)
 
             # Wait for central to connect, then wait for it to disconnect.
-            if not wait_for_event(_IRQ_CENTRAL_CONNECT, TIMEOUT_MS):
-                return
-            if not wait_for_event(_IRQ_CENTRAL_DISCONNECT, 4 * TIMEOUT_MS):
-                return
+            wait_for_event(_IRQ_CENTRAL_CONNECT, TIMEOUT_MS)
+            wait_for_event(_IRQ_CENTRAL_DISCONNECT, 4 * TIMEOUT_MS)
     finally:
         ble.active(0)
 
@@ -91,6 +88,7 @@ def instance0():
 def instance1():
     multitest.next()
     try:
+        value_handle = None
         for iteration in range(2):
             # Wait for peripheral to start advertising.
             time.sleep_ms(500)
@@ -98,17 +96,15 @@ def instance1():
             # Connect to peripheral.
             print("gap_connect")
             ble.gap_connect(*BDADDR)
-            if not wait_for_event(_IRQ_PERIPHERAL_CONNECT, TIMEOUT_MS):
-                return
-            conn_handle, _, _ = waiting_data
+            conn_handle = wait_for_event(_IRQ_PERIPHERAL_CONNECT, TIMEOUT_MS)
 
             if iteration == 0:
+                # Only do characteristic discovery on the first iteration,
+                # assume value_handle is unchanged on the second.
                 print("gattc_discover_characteristics")
                 ble.gattc_discover_characteristics(conn_handle, 1, 65535)
-                wait_for_event(lambda: value_handle, TIMEOUT_MS)
-
-                # Wait for all characteristic results to come in (there should be an event for it).
-                time.sleep_ms(500)
+                value_handle = wait_for_event(_IRQ_GATTC_CHARACTERISTIC_RESULT, TIMEOUT_MS)
+                wait_for_event(_IRQ_GATTC_CHARACTERISTIC_DONE, TIMEOUT_MS)
 
             # Read the peripheral's GAP device name.
             print("gattc_read")
@@ -117,8 +113,7 @@ def instance1():
 
             # Disconnect from peripheral.
             print("gap_disconnect:", ble.gap_disconnect(conn_handle))
-            if not wait_for_event(_IRQ_PERIPHERAL_DISCONNECT, TIMEOUT_MS):
-                return
+            wait_for_event(_IRQ_PERIPHERAL_DISCONNECT, TIMEOUT_MS)
     finally:
         ble.active(0)
 
diff --git a/tests/multi_bluetooth/ble_gap_device_name.py.exp b/tests/multi_bluetooth/ble_gap_device_name.py.exp
index 0f4ee6e3dc576..a7a7aa367016a 100644
--- a/tests/multi_bluetooth/ble_gap_device_name.py.exp
+++ b/tests/multi_bluetooth/ble_gap_device_name.py.exp
@@ -12,6 +12,7 @@ gap_connect
 _IRQ_PERIPHERAL_CONNECT
 gattc_discover_characteristics
 _IRQ_GATTC_CHARACTERISTIC_RESULT UUID(0x2a00)
+_IRQ_GATTC_CHARACTERISTIC_DONE
 gattc_read
 _IRQ_GATTC_READ_RESULT b'GAP_NAME0'
 gap_disconnect: True
diff --git a/tests/multi_bluetooth/ble_gatt_data_transfer.py b/tests/multi_bluetooth/ble_gatt_data_transfer.py
index 944c9e2d2a55f..e8249b3da8962 100644
--- a/tests/multi_bluetooth/ble_gatt_data_transfer.py
+++ b/tests/multi_bluetooth/ble_gatt_data_transfer.py
@@ -29,35 +29,33 @@
 SERVICE = (SERVICE_UUID, (CHAR_CTRL, CHAR_RX, CHAR_TX))
 SERVICES = (SERVICE,)
 
-waiting_event = None
-waiting_data = None
-ctrl_value_handle = 0
-rx_value_handle = 0
-tx_value_handle = 0
+waiting_events = {}
 
 
 def irq(event, data):
-    global waiting_event, waiting_data, ctrl_value_handle, rx_value_handle, tx_value_handle
     if event == _IRQ_CENTRAL_CONNECT:
         print("_IRQ_CENTRAL_CONNECT")
+        waiting_events[event] = data[0]
     elif event == _IRQ_CENTRAL_DISCONNECT:
         print("_IRQ_CENTRAL_DISCONNECT")
     elif event == _IRQ_GATTS_WRITE:
         print("_IRQ_GATTS_WRITE")
+        waiting_events[(event, data[1])] = None
     elif event == _IRQ_PERIPHERAL_CONNECT:
         print("_IRQ_PERIPHERAL_CONNECT")
+        waiting_events[event] = data[0]
     elif event == _IRQ_PERIPHERAL_DISCONNECT:
         print("_IRQ_PERIPHERAL_DISCONNECT")
     elif event == _IRQ_GATTC_CHARACTERISTIC_RESULT:
         if data[-1] == CHAR_CTRL_UUID:
             print("_IRQ_GATTC_CHARACTERISTIC_RESULT", data[-1])
-            ctrl_value_handle = data[2]
+            waiting_events[(event, CHAR_CTRL_UUID)] = data[2]
         elif data[-1] == CHAR_RX_UUID:
             print("_IRQ_GATTC_CHARACTERISTIC_RESULT", data[-1])
-            rx_value_handle = data[2]
+            waiting_events[(event, CHAR_RX_UUID)] = data[2]
         elif data[-1] == CHAR_TX_UUID:
             print("_IRQ_GATTC_CHARACTERISTIC_RESULT", data[-1])
-            tx_value_handle = data[2]
+            waiting_events[(event, CHAR_TX_UUID)] = data[2]
     elif event == _IRQ_GATTC_CHARACTERISTIC_DONE:
         print("_IRQ_GATTC_CHARACTERISTIC_DONE")
     elif event == _IRQ_GATTC_READ_RESULT:
@@ -68,26 +66,21 @@ def irq(event, data):
         print("_IRQ_GATTC_WRITE_DONE", data[-1])
     elif event == _IRQ_GATTC_NOTIFY:
         print("_IRQ_GATTC_NOTIFY", bytes(data[-1]))
+        waiting_events[(event, data[1])] = None
 
-    if waiting_event is not None:
-        if (isinstance(waiting_event, int) and event == waiting_event) or (
-            not isinstance(waiting_event, int) and waiting_event(event, data)
-        ):
-            waiting_event = None
-            waiting_data = data
+    if event not in waiting_events:
+        waiting_events[event] = None
 
 
 def wait_for_event(event, timeout_ms):
-    global waiting_event, waiting_data
-    waiting_event = event
-    waiting_data = None
-
     t0 = time.ticks_ms()
     while time.ticks_diff(time.ticks_ms(), t0) < timeout_ms:
-        if waiting_data:
-            return True
+        if event in waiting_events:
+            result = waiting_events[event]
+            del waiting_events[event]
+            return result
         machine.idle()
-    return False
+    raise ValueError("Timeout waiting for {}".format(event))
 
 
 # Acting in peripheral role.
@@ -103,15 +96,10 @@ def instance0():
     multitest.next()
     try:
         # Wait for central to connect to us.
-        if not wait_for_event(_IRQ_CENTRAL_CONNECT, TIMEOUT_MS):
-            return
-        conn_handle, _, _ = waiting_data
+        conn_handle = wait_for_event(_IRQ_CENTRAL_CONNECT, TIMEOUT_MS)
 
         # Wait for the central to signal that it's done with its part of the test.
-        wait_for_event(
-            lambda event, data: event == _IRQ_GATTS_WRITE and data[1] == char_ctrl_handle,
-            2 * TIMEOUT_MS,
-        )
+        wait_for_event((_IRQ_GATTS_WRITE, char_ctrl_handle), 2 * TIMEOUT_MS)
 
         # Read all accumulated data from the central.
         print("gatts_read:", ble.gatts_read(char_rx_handle))
@@ -138,17 +126,14 @@ def instance1():
         # Connect to peripheral and then disconnect.
         print("gap_connect")
         ble.gap_connect(*BDADDR)
-        if not wait_for_event(_IRQ_PERIPHERAL_CONNECT, TIMEOUT_MS):
-            return
-        conn_handle, _, _ = waiting_data
+        conn_handle = wait_for_event(_IRQ_PERIPHERAL_CONNECT, TIMEOUT_MS)
 
         # Discover characteristics.
         ble.gattc_discover_characteristics(conn_handle, 1, 65535)
-        wait_for_event(
-            lambda event, data: ctrl_value_handle and rx_value_handle and tx_value_handle,
-            TIMEOUT_MS,
-        )
         wait_for_event(_IRQ_GATTC_CHARACTERISTIC_DONE, TIMEOUT_MS)
+        ctrl_value_handle = waiting_events[(_IRQ_GATTC_CHARACTERISTIC_RESULT, CHAR_CTRL_UUID)]
+        rx_value_handle = waiting_events[(_IRQ_GATTC_CHARACTERISTIC_RESULT, CHAR_RX_UUID)]
+        tx_value_handle = waiting_events[(_IRQ_GATTC_CHARACTERISTIC_RESULT, CHAR_TX_UUID)]
 
         # Write to the characteristic a few times, with and without response.
         for i in range(4):
@@ -163,10 +148,7 @@ def instance1():
         wait_for_event(_IRQ_GATTC_WRITE_DONE, TIMEOUT_MS)
 
         # Wait for notification that peripheral is done with its part of the test.
-        wait_for_event(
-            lambda event, data: event == _IRQ_GATTC_NOTIFY and data[1] == ctrl_value_handle,
-            TIMEOUT_MS,
-        )
+        wait_for_event((_IRQ_GATTC_NOTIFY, ctrl_value_handle), TIMEOUT_MS)
 
         # Disconnect from peripheral.
         print("gap_disconnect:", ble.gap_disconnect(conn_handle))
diff --git a/tests/multi_bluetooth/ble_gattc_discover_services.py b/tests/multi_bluetooth/ble_gattc_discover_services.py
index 57f95bf0125e7..00bb94bba0ba8 100644
--- a/tests/multi_bluetooth/ble_gattc_discover_services.py
+++ b/tests/multi_bluetooth/ble_gattc_discover_services.py
@@ -24,45 +24,42 @@
 )
 SERVICES = (SERVICE_A, SERVICE_B)
 
-waiting_event = None
-waiting_data = None
+waiting_events = {}
 num_service_result = 0
 
 
 def irq(event, data):
-    global waiting_event, waiting_data, num_service_result
+    global num_service_result
     if event == _IRQ_CENTRAL_CONNECT:
         print("_IRQ_CENTRAL_CONNECT")
+        waiting_events[event] = data[0]
     elif event == _IRQ_CENTRAL_DISCONNECT:
         print("_IRQ_CENTRAL_DISCONNECT")
     elif event == _IRQ_PERIPHERAL_CONNECT:
         print("_IRQ_PERIPHERAL_CONNECT")
+        waiting_events[event] = data[0]
     elif event == _IRQ_PERIPHERAL_DISCONNECT:
         print("_IRQ_PERIPHERAL_DISCONNECT")
     elif event == _IRQ_GATTC_SERVICE_RESULT:
         if data[3] == UUID_A or data[3] == UUID_B:
             print("_IRQ_GATTC_SERVICE_RESULT", data[3])
             num_service_result += 1
+    elif event == _IRQ_GATTC_SERVICE_DONE:
+        print("_IRQ_GATTC_SERVICE_DONE")
 
-    if waiting_event is not None:
-        if (isinstance(waiting_event, int) and event == waiting_event) or (
-            not isinstance(waiting_event, int) and waiting_event(event, data)
-        ):
-            waiting_event = None
-            waiting_data = data
+    if event not in waiting_events:
+        waiting_events[event] = None
 
 
 def wait_for_event(event, timeout_ms):
-    global waiting_event, waiting_data
-    waiting_event = event
-    waiting_data = None
-
     t0 = time.ticks_ms()
     while time.ticks_diff(time.ticks_ms(), t0) < timeout_ms:
-        if waiting_data:
-            return True
+        if event in waiting_events:
+            result = waiting_events[event]
+            del waiting_events[event]
+            return result
         machine.idle()
-    return False
+    raise ValueError("Timeout waiting for {}".format(event))
 
 
 # Acting in peripheral role.
@@ -86,13 +83,13 @@ def instance1():
         # Connect to peripheral and then disconnect.
         print("gap_connect")
         ble.gap_connect(*BDADDR)
-        if not wait_for_event(_IRQ_PERIPHERAL_CONNECT, TIMEOUT_MS):
-            return
-        conn_handle, _, _ = waiting_data
+        conn_handle = wait_for_event(_IRQ_PERIPHERAL_CONNECT, TIMEOUT_MS)
 
         # Discover services.
         ble.gattc_discover_services(conn_handle)
-        wait_for_event(lambda event, data: num_service_result == 2, TIMEOUT_MS)
+        wait_for_event(_IRQ_GATTC_SERVICE_DONE, TIMEOUT_MS)
+
+        print("discovered:", num_service_result)
 
         # Disconnect from peripheral.
         print("gap_disconnect:", ble.gap_disconnect(conn_handle))
diff --git a/tests/multi_bluetooth/ble_gattc_discover_services.py.exp b/tests/multi_bluetooth/ble_gattc_discover_services.py.exp
index 7f4d8da81ad8c..d14f802377ca1 100644
--- a/tests/multi_bluetooth/ble_gattc_discover_services.py.exp
+++ b/tests/multi_bluetooth/ble_gattc_discover_services.py.exp
@@ -7,5 +7,7 @@ gap_connect
 _IRQ_PERIPHERAL_CONNECT
 _IRQ_GATTC_SERVICE_RESULT UUID(0x180d)
 _IRQ_GATTC_SERVICE_RESULT UUID('a5a5a5a5-ffff-9999-1111-5a5a5a5a5a5a')
+_IRQ_GATTC_SERVICE_DONE
+discovered: 2
 gap_disconnect: True
 _IRQ_PERIPHERAL_DISCONNECT
diff --git a/tests/multi_bluetooth/ble_mtu.py b/tests/multi_bluetooth/ble_mtu.py
index ef3199c5bbb04..73c77e2460c65 100644
--- a/tests/multi_bluetooth/ble_mtu.py
+++ b/tests/multi_bluetooth/ble_mtu.py
@@ -51,7 +51,6 @@
 
 
 def irq(event, data):
-    global value_handle
     if event == _IRQ_CENTRAL_CONNECT:
         print("_IRQ_CENTRAL_CONNECT")
         waiting_events[event] = data[0]
@@ -68,6 +67,8 @@ def irq(event, data):
         if data[-1] == CHAR_UUID:
             print("_IRQ_GATTC_CHARACTERISTIC_RESULT", data[-1])
             waiting_events[event] = data[2]
+        else:
+            return
     elif event == _IRQ_GATTC_CHARACTERISTIC_DONE:
         print("_IRQ_GATTC_CHARACTERISTIC_DONE")
     elif event == _IRQ_GATTC_WRITE_DONE:
@@ -86,9 +87,11 @@ def wait_for_event(event, timeout_ms):
     t0 = time.ticks_ms()
     while time.ticks_diff(time.ticks_ms(), t0) < timeout_ms:
         if event in waiting_events:
-            return True
+            result = waiting_events[event]
+            del waiting_events[event]
+            return result
         machine.idle()
-    return False
+    raise ValueError("Timeout waiting for {}".format(event))
 
 
 # Acting in peripheral role.
@@ -101,8 +104,6 @@ def instance0():
     multitest.next()
     try:
         for i in range(7):
-            waiting_events.clear()
-
             if i == 1:
                 ble.config(mtu=200)
             elif i == 2:
@@ -116,31 +117,26 @@ def instance0():
                 ble.config(mtu=256)
 
             # Wait for central to connect to us.
-            if not wait_for_event(_IRQ_CENTRAL_CONNECT, TIMEOUT_MS):
-                return
-            conn_handle = waiting_events[_IRQ_CENTRAL_CONNECT]
+            conn_handle = wait_for_event(_IRQ_CENTRAL_CONNECT, TIMEOUT_MS)
 
             if i >= 4:
                 print("gattc_exchange_mtu")
                 ble.gattc_exchange_mtu(conn_handle)
 
-            if not wait_for_event(_IRQ_MTU_EXCHANGED, TIMEOUT_MS):
-                return
-            mtu = waiting_events[_IRQ_MTU_EXCHANGED]
+            mtu = wait_for_event(_IRQ_MTU_EXCHANGED, TIMEOUT_MS)
 
             print("gatts_notify")
             ble.gatts_notify(conn_handle, char_handle, str(i) * 64)
 
-            if not wait_for_event(_IRQ_GATTS_WRITE, TIMEOUT_MS):
-                return
+            # Extra timeout while client does service discovery.
+            wait_for_event(_IRQ_GATTS_WRITE, TIMEOUT_MS * 2)
 
             print("gatts_read")
             data = ble.gatts_read(char_handle)
             print("characteristic len:", len(data), chr(data[0]))
 
             # Wait for the central to disconnect.
-            if not wait_for_event(_IRQ_CENTRAL_DISCONNECT, TIMEOUT_MS):
-                return
+            wait_for_event(_IRQ_CENTRAL_DISCONNECT, TIMEOUT_MS)
 
             print("gap_advertise")
             ble.gap_advertise(20_000, b"\x02\x01\x06\x04\xffMPY")
@@ -154,8 +150,6 @@ def instance1():
     multitest.next()
     try:
         for i in range(7):
-            waiting_events.clear()
-
             if i < 4:
                 ble.config(mtu=300)
             elif i == 5:
@@ -166,39 +160,33 @@ def instance1():
                 ble.config(mtu=256)
 
             # Connect to peripheral and then disconnect.
+            # Extra scan timeout allows for the peripheral to receive the previous disconnect
+            # event and start advertising again.
             print("gap_connect")
-            ble.gap_connect(*BDADDR)
-            if not wait_for_event(_IRQ_PERIPHERAL_CONNECT, TIMEOUT_MS):
-                return
-            conn_handle = waiting_events[_IRQ_PERIPHERAL_CONNECT]
+            ble.gap_connect(BDADDR[0], BDADDR[1], 5000)
+            conn_handle = wait_for_event(_IRQ_PERIPHERAL_CONNECT, TIMEOUT_MS)
 
             if i < 4:
                 print("gattc_exchange_mtu")
                 ble.gattc_exchange_mtu(conn_handle)
 
-            if not wait_for_event(_IRQ_MTU_EXCHANGED, TIMEOUT_MS):
-                return
-            mtu = waiting_events[_IRQ_MTU_EXCHANGED]
+            mtu = wait_for_event(_IRQ_MTU_EXCHANGED, TIMEOUT_MS)
 
-            if not wait_for_event(_IRQ_GATTC_NOTIFY, TIMEOUT_MS):
-                return
+            wait_for_event(_IRQ_GATTC_NOTIFY, TIMEOUT_MS)
 
             print("gattc_discover_characteristics")
             ble.gattc_discover_characteristics(conn_handle, 1, 65535)
-            if not wait_for_event(_IRQ_GATTC_CHARACTERISTIC_DONE, TIMEOUT_MS):
-                return
-            value_handle = waiting_events[_IRQ_GATTC_CHARACTERISTIC_RESULT]
+            value_handle = wait_for_event(_IRQ_GATTC_CHARACTERISTIC_RESULT, TIMEOUT_MS)
+            wait_for_event(_IRQ_GATTC_CHARACTERISTIC_DONE, TIMEOUT_MS)
 
             # Write 20 more than the MTU to test truncation.
             print("gattc_write")
             ble.gattc_write(conn_handle, value_handle, chr(ord("a") + i) * (mtu + 20), 1)
-            if not wait_for_event(_IRQ_GATTC_WRITE_DONE, TIMEOUT_MS):
-                return
+            wait_for_event(_IRQ_GATTC_WRITE_DONE, TIMEOUT_MS)
 
             # Disconnect from peripheral.
             print("gap_disconnect:", ble.gap_disconnect(conn_handle))
-            if not wait_for_event(_IRQ_PERIPHERAL_DISCONNECT, TIMEOUT_MS):
-                return
+            wait_for_event(_IRQ_PERIPHERAL_DISCONNECT, TIMEOUT_MS)
     finally:
         ble.active(0)
 

From c75ce379100993f41a7502986146e735367cf8aa Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Tue, 3 Nov 2020 17:41:58 +1100
Subject: [PATCH 0403/3533] tests/run-multitests.py: Add a -p flag to run
 permutations of instances.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 tests/run-multitests.py | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/tests/run-multitests.py b/tests/run-multitests.py
index 5b8e70e921a7a..cdb2730edabbd 100755
--- a/tests/run-multitests.py
+++ b/tests/run-multitests.py
@@ -6,6 +6,7 @@
 
 import sys, os, time, re, select
 import argparse
+import itertools
 import subprocess
 import tempfile
 
@@ -418,6 +419,13 @@ def main():
     cmd_parser.add_argument(
         "-i", "--instance", action="append", default=[], help="instance(s) to run the tests on"
     )
+    cmd_parser.add_argument(
+        "-p",
+        "--permutations",
+        type=int,
+        default=1,
+        help="repeat the test with this many permutations of the instance order",
+    )
     cmd_parser.add_argument("files", nargs="+", help="input test files")
     cmd_args = cmd_parser.parse_args()
 
@@ -450,8 +458,14 @@ def main():
     for _ in range(max_instances - len(instances_test)):
         instances_test.append(PyInstanceSubProcess([MICROPYTHON]))
 
+    all_pass = True
     try:
-        all_pass = run_tests(test_files, instances_truth, instances_test)
+        for i, instances_test_permutation in enumerate(itertools.permutations(instances_test)):
+            if i >= cmd_args.permutations:
+                break
+
+            all_pass &= run_tests(test_files, instances_truth, instances_test_permutation)
+
     finally:
         for i in instances_truth:
             i.close()

From 3d890e7ab4b3d85a6fa9e57a9a596a23eeaa6aa7 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Wed, 28 Oct 2020 13:17:23 +1100
Subject: [PATCH 0404/3533] extmod/modbluetooth: Make UUID type accessible
 outside modbluetooth.c.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 extmod/btstack/modbluetooth_btstack.c |  1 +
 extmod/modbluetooth.c                 | 33 ++++++++++++++-------------
 extmod/modbluetooth.h                 |  4 +++-
 extmod/nimble/modbluetooth_nimble.c   |  1 +
 4 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/extmod/btstack/modbluetooth_btstack.c b/extmod/btstack/modbluetooth_btstack.c
index ae96035868877..fd5d343637b5a 100644
--- a/extmod/btstack/modbluetooth_btstack.c
+++ b/extmod/btstack/modbluetooth_btstack.c
@@ -75,6 +75,7 @@ STATIC int btstack_error_to_errno(int err) {
 #if MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE
 STATIC mp_obj_bluetooth_uuid_t create_mp_uuid(uint16_t uuid16, const uint8_t *uuid128) {
     mp_obj_bluetooth_uuid_t result;
+    result.base.type = &mp_type_bluetooth_uuid;
     if (uuid16 != 0) {
         result.data[0] = uuid16 & 0xff;
         result.data[1] = (uuid16 >> 8) & 0xff;
diff --git a/extmod/modbluetooth.c b/extmod/modbluetooth.c
index 57f69433a1a97..90ed495462b28 100644
--- a/extmod/modbluetooth.c
+++ b/extmod/modbluetooth.c
@@ -51,9 +51,8 @@
 // while still leaving room for a couple of normal (small, fixed size) events.
 #define MICROPY_PY_BLUETOOTH_MAX_EVENT_DATA_BYTES_LEN(ringbuf_size) (MAX((int)((ringbuf_size) / 2), (int)(ringbuf_size) - 64))
 
-STATIC const mp_obj_type_t bluetooth_ble_type;
-STATIC const mp_obj_type_t bluetooth_uuid_type;
-
+// bluetooth.BLE type. This is currently a singleton, however in the future
+// this could allow having multiple BLE interfaces on different UARTs.
 typedef struct {
     mp_obj_base_t base;
     mp_obj_t irq_handler;
@@ -70,6 +69,8 @@ typedef struct {
     #endif
 } mp_obj_bluetooth_ble_t;
 
+STATIC const mp_obj_type_t mp_type_bluetooth_ble;
+
 // TODO: this seems like it could be generic?
 STATIC mp_obj_t bluetooth_handle_errno(int err) {
     if (err != 0) {
@@ -88,7 +89,7 @@ STATIC mp_obj_t bluetooth_uuid_make_new(const mp_obj_type_t *type, size_t n_args
     mp_arg_check_num(n_args, n_kw, 1, 1, false);
 
     mp_obj_bluetooth_uuid_t *self = m_new_obj(mp_obj_bluetooth_uuid_t);
-    self->base.type = &bluetooth_uuid_type;
+    self->base.type = &mp_type_bluetooth_uuid;
 
     if (mp_obj_is_int(all_args[0])) {
         self->type = MP_BLUETOOTH_UUID_TYPE_16;
@@ -152,7 +153,7 @@ STATIC mp_obj_t bluetooth_uuid_unary_op(mp_unary_op_t op, mp_obj_t self_in) {
 }
 
 STATIC mp_obj_t bluetooth_uuid_binary_op(mp_binary_op_t op, mp_obj_t lhs_in, mp_obj_t rhs_in) {
-    if (!mp_obj_is_type(rhs_in, &bluetooth_uuid_type)) {
+    if (!mp_obj_is_type(rhs_in, &mp_type_bluetooth_uuid)) {
         return MP_OBJ_NULL;
     }
 
@@ -225,7 +226,7 @@ STATIC void ringbuf_get_uuid(ringbuf_t *ringbuf, mp_obj_bluetooth_uuid_t *uuid)
 }
 #endif // MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE
 
-STATIC const mp_obj_type_t bluetooth_uuid_type = {
+const mp_obj_type_t mp_type_bluetooth_uuid = {
     { &mp_type_type },
     .name = MP_QSTR_UUID,
     .make_new = bluetooth_uuid_make_new,
@@ -247,7 +248,7 @@ STATIC mp_obj_t bluetooth_ble_make_new(const mp_obj_type_t *type, size_t n_args,
     (void)all_args;
     if (MP_STATE_VM(bluetooth) == MP_OBJ_NULL) {
         mp_obj_bluetooth_ble_t *o = m_new0(mp_obj_bluetooth_ble_t, 1);
-        o->base.type = &bluetooth_ble_type;
+        o->base.type = &mp_type_bluetooth_ble;
 
         o->irq_handler = mp_const_none;
 
@@ -263,7 +264,7 @@ STATIC mp_obj_t bluetooth_ble_make_new(const mp_obj_type_t *type, size_t n_args,
         mp_obj_memoryview_init(&o->irq_data_addr, 'B', 0, 0, o->irq_data_addr_bytes);
         o->irq_data_data_alloc = MICROPY_PY_BLUETOOTH_MAX_EVENT_DATA_BYTES_LEN(MICROPY_PY_BLUETOOTH_RINGBUF_SIZE);
         mp_obj_memoryview_init(&o->irq_data_data, 'B', 0, 0, m_new(uint8_t, o->irq_data_data_alloc));
-        o->irq_data_uuid.base.type = &bluetooth_uuid_type;
+        o->irq_data_uuid.base.type = &mp_type_bluetooth_uuid;
 
         // Allocate the default ringbuf.
         ringbuf_alloc(&o->ringbuf, MICROPY_PY_BLUETOOTH_RINGBUF_SIZE);
@@ -441,7 +442,7 @@ STATIC mp_obj_t bluetooth_ble_gap_advertise(size_t n_args, const mp_obj_t *pos_a
 STATIC MP_DEFINE_CONST_FUN_OBJ_KW(bluetooth_ble_gap_advertise_obj, 1, bluetooth_ble_gap_advertise);
 
 STATIC int bluetooth_gatts_register_service(mp_obj_t uuid_in, mp_obj_t characteristics_in, uint16_t **handles, size_t *num_handles) {
-    if (!mp_obj_is_type(uuid_in, &bluetooth_uuid_type)) {
+    if (!mp_obj_is_type(uuid_in, &mp_type_bluetooth_uuid)) {
         mp_raise_ValueError(MP_ERROR_TEXT("invalid service UUID"));
     }
     mp_obj_bluetooth_uuid_t *service_uuid = MP_OBJ_TO_PTR(uuid_in);
@@ -482,7 +483,7 @@ STATIC int bluetooth_gatts_register_service(mp_obj_t uuid_in, mp_obj_t character
             mp_raise_ValueError(MP_ERROR_TEXT("invalid characteristic tuple"));
         }
         mp_obj_t uuid_obj = characteristic_items[0];
-        if (!mp_obj_is_type(uuid_obj, &bluetooth_uuid_type)) {
+        if (!mp_obj_is_type(uuid_obj, &mp_type_bluetooth_uuid)) {
             mp_raise_ValueError(MP_ERROR_TEXT("invalid characteristic UUID"));
         }
 
@@ -514,7 +515,7 @@ STATIC int bluetooth_gatts_register_service(mp_obj_t uuid_in, mp_obj_t character
                 mp_obj_t *descriptor_items;
                 mp_obj_get_array_fixed_n(descriptor_obj, 2, &descriptor_items);
                 mp_obj_t desc_uuid_obj = descriptor_items[0];
-                if (!mp_obj_is_type(desc_uuid_obj, &bluetooth_uuid_type)) {
+                if (!mp_obj_is_type(desc_uuid_obj, &mp_type_bluetooth_uuid)) {
                     mp_raise_ValueError(MP_ERROR_TEXT("invalid descriptor UUID"));
                 }
 
@@ -717,7 +718,7 @@ STATIC mp_obj_t bluetooth_ble_gattc_discover_services(size_t n_args, const mp_ob
     mp_int_t conn_handle = mp_obj_get_int(args[1]);
     mp_obj_bluetooth_uuid_t *uuid = NULL;
     if (n_args == 3 && args[2] != mp_const_none) {
-        if (!mp_obj_is_type(args[2], &bluetooth_uuid_type)) {
+        if (!mp_obj_is_type(args[2], &mp_type_bluetooth_uuid)) {
             mp_raise_TypeError(MP_ERROR_TEXT("UUID"));
         }
         uuid = MP_OBJ_TO_PTR(args[2]);
@@ -732,7 +733,7 @@ STATIC mp_obj_t bluetooth_ble_gattc_discover_characteristics(size_t n_args, cons
     mp_int_t end_handle = mp_obj_get_int(args[3]);
     mp_obj_bluetooth_uuid_t *uuid = NULL;
     if (n_args == 5 && args[4] != mp_const_none) {
-        if (!mp_obj_is_type(args[4], &bluetooth_uuid_type)) {
+        if (!mp_obj_is_type(args[4], &mp_type_bluetooth_uuid)) {
             mp_raise_TypeError(MP_ERROR_TEXT("UUID"));
         }
         uuid = MP_OBJ_TO_PTR(args[4]);
@@ -817,7 +818,7 @@ STATIC const mp_rom_map_elem_t bluetooth_ble_locals_dict_table[] = {
 };
 STATIC MP_DEFINE_CONST_DICT(bluetooth_ble_locals_dict, bluetooth_ble_locals_dict_table);
 
-STATIC const mp_obj_type_t bluetooth_ble_type = {
+STATIC const mp_obj_type_t mp_type_bluetooth_ble = {
     { &mp_type_type },
     .name = MP_QSTR_BLE,
     .make_new = bluetooth_ble_make_new,
@@ -826,8 +827,8 @@ STATIC const mp_obj_type_t bluetooth_ble_type = {
 
 STATIC const mp_rom_map_elem_t mp_module_bluetooth_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_ubluetooth) },
-    { MP_ROM_QSTR(MP_QSTR_BLE), MP_ROM_PTR(&bluetooth_ble_type) },
-    { MP_ROM_QSTR(MP_QSTR_UUID), MP_ROM_PTR(&bluetooth_uuid_type) },
+    { MP_ROM_QSTR(MP_QSTR_BLE), MP_ROM_PTR(&mp_type_bluetooth_ble) },
+    { MP_ROM_QSTR(MP_QSTR_UUID), MP_ROM_PTR(&mp_type_bluetooth_uuid) },
     { MP_ROM_QSTR(MP_QSTR_FLAG_READ), MP_ROM_INT(MP_BLUETOOTH_CHARACTERISTIC_FLAG_READ) },
     { MP_ROM_QSTR(MP_QSTR_FLAG_WRITE), MP_ROM_INT(MP_BLUETOOTH_CHARACTERISTIC_FLAG_WRITE) },
     { MP_ROM_QSTR(MP_QSTR_FLAG_NOTIFY), MP_ROM_INT(MP_BLUETOOTH_CHARACTERISTIC_FLAG_NOTIFY) },
diff --git a/extmod/modbluetooth.h b/extmod/modbluetooth.h
index 2df4c3c25f17b..618939ab18f0e 100644
--- a/extmod/modbluetooth.h
+++ b/extmod/modbluetooth.h
@@ -135,7 +135,7 @@ _IRQ_GATTS_INDICATE_DONE = const(20)
 _IRQ_MTU_EXCHANGED = const(21)
 */
 
-// Common UUID type.
+// bluetooth.UUID type.
 // Ports are expected to map this to their own internal UUID types.
 // Internally the UUID data is little-endian, but the user should only
 // ever see this if they use the buffer protocol, e.g. in order to
@@ -147,6 +147,8 @@ typedef struct {
     uint8_t data[16];
 } mp_obj_bluetooth_uuid_t;
 
+extern const mp_obj_type_t mp_type_bluetooth_uuid;
+
 //////////////////////////////////////////////////////////////
 // API implemented by ports (i.e. called from modbluetooth.c):
 
diff --git a/extmod/nimble/modbluetooth_nimble.c b/extmod/nimble/modbluetooth_nimble.c
index c0d6d64cfc1f0..acb4c03dc32f5 100644
--- a/extmod/nimble/modbluetooth_nimble.c
+++ b/extmod/nimble/modbluetooth_nimble.c
@@ -114,6 +114,7 @@ STATIC void reverse_addr_byte_order(uint8_t *addr_out, const uint8_t *addr_in) {
 
 STATIC mp_obj_bluetooth_uuid_t create_mp_uuid(const ble_uuid_any_t *uuid) {
     mp_obj_bluetooth_uuid_t result;
+    result.base.type = &mp_type_bluetooth_uuid;
     switch (uuid->u.type) {
         case BLE_UUID_TYPE_16:
             result.type = MP_BLUETOOTH_UUID_TYPE_16;

From de60aa7d6bef3dc25559ae88e36bd05283e927e5 Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Fri, 16 Oct 2020 10:10:26 +1100
Subject: [PATCH 0405/3533] unix: Handle pending events/scheduler in
 MICROPY_EVENT_POLL_HOOK.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/unix/mpconfigport.h | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/ports/unix/mpconfigport.h b/ports/unix/mpconfigport.h
index 17f4895573ed5..d838f42b3f3dc 100644
--- a/ports/unix/mpconfigport.h
+++ b/ports/unix/mpconfigport.h
@@ -363,7 +363,12 @@ struct _mp_bluetooth_nimble_malloc_t;
 #define MICROPY_END_ATOMIC_SECTION(x) (void)x; mp_thread_unix_end_atomic_section()
 #endif
 
-#define MICROPY_EVENT_POLL_HOOK mp_hal_delay_us(500);
+#define MICROPY_EVENT_POLL_HOOK \
+    do { \
+        extern void mp_handle_pending(bool); \
+        mp_handle_pending(true); \
+        mp_hal_delay_us(500); \
+    } while (0);
 
 #include <sched.h>
 #define MICROPY_UNIX_MACHINE_IDLE sched_yield();

From 4559bcb4679e04e0a5e24030675676ff6a9803f2 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Tue, 3 Nov 2020 23:21:18 +1100
Subject: [PATCH 0406/3533] unix: Make mp_hal_delay_ms run
 MICROPY_EVENT_POLL_HOOK.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/unix/mphalport.h        |  5 -----
 ports/unix/unix_mphal.c       | 14 ++++++++++++++
 ports/windows/windows_mphal.c |  6 ++++++
 3 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/ports/unix/mphalport.h b/ports/unix/mphalport.h
index 95ad63221ef95..89d23ca5d22e9 100644
--- a/ports/unix/mphalport.h
+++ b/ports/unix/mphalport.h
@@ -64,11 +64,6 @@ static inline int mp_hal_readline(vstr_t *vstr, const char *p) {
 
 #endif
 
-// TODO: POSIX et al. define usleep() as guaranteedly capable only of 1s sleep:
-// "The useconds argument shall be less than one million."
-static inline void mp_hal_delay_ms(mp_uint_t ms) {
-    usleep((ms) * 1000);
-}
 static inline void mp_hal_delay_us(mp_uint_t us) {
     usleep(us);
 }
diff --git a/ports/unix/unix_mphal.c b/ports/unix/unix_mphal.c
index 3fe2fa9fec21d..28a4ca2c4a8e9 100644
--- a/ports/unix/unix_mphal.c
+++ b/ports/unix/unix_mphal.c
@@ -220,3 +220,17 @@ uint64_t mp_hal_time_ns(void) {
     gettimeofday(&tv, NULL);
     return (uint64_t)tv.tv_sec * 1000000000ULL + (uint64_t)tv.tv_usec * 1000ULL;
 }
+
+void mp_hal_delay_ms(mp_uint_t ms) {
+    #ifdef MICROPY_EVENT_POLL_HOOK
+    mp_uint_t start = mp_hal_ticks_ms();
+    while (mp_hal_ticks_ms() - start < ms) {
+        // MICROPY_EVENT_POLL_HOOK does mp_hal_delay_us(500) (i.e. usleep(500)).
+        MICROPY_EVENT_POLL_HOOK
+    }
+    #else
+    // TODO: POSIX et al. define usleep() as guaranteedly capable only of 1s sleep:
+    // "The useconds argument shall be less than one million."
+    usleep(ms * 1000);
+    #endif
+}
diff --git a/ports/windows/windows_mphal.c b/ports/windows/windows_mphal.c
index b442b59147e4e..49daa0542868f 100644
--- a/ports/windows/windows_mphal.c
+++ b/ports/windows/windows_mphal.c
@@ -261,3 +261,9 @@ uint64_t mp_hal_time_ns(void) {
     gettimeofday(&tv, NULL);
     return (uint64_t)tv.tv_sec * 1000000000ULL + (uint64_t)tv.tv_usec * 1000ULL;
 }
+
+// TODO: POSIX et al. define usleep() as guaranteedly capable only of 1s sleep:
+// "The useconds argument shall be less than one million."
+void mp_hal_delay_ms(mp_uint_t ms) {
+    usleep((ms) * 1000);
+}

From c398e46b29f5c780b8016f2e88afe4c6984c54d8 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Tue, 3 Nov 2020 17:46:11 +1100
Subject: [PATCH 0407/3533] extmod/modbluetooth: Combine gattc-data-available
 callbacks into one.

Instead of having the stack indicate a "start", "data"..., "end", pass
through the data in one callback as an array of chunks of data.

This is because the upcoming non-ringbuffer modbluetooth implementation
cannot buffer the data in the ringbuffer and requires instead a single
callback with all the data, to pass to the Python callback.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 extmod/btstack/modbluetooth_btstack.c | 15 ++--------
 extmod/modbluetooth.c                 | 41 ++++++++++++++-------------
 extmod/modbluetooth.h                 |  6 +---
 extmod/nimble/modbluetooth_nimble.c   | 35 +++++++++++++++++------
 4 files changed, 53 insertions(+), 44 deletions(-)

diff --git a/extmod/btstack/modbluetooth_btstack.c b/extmod/btstack/modbluetooth_btstack.c
index fd5d343637b5a..a4cc601746b1e 100644
--- a/extmod/btstack/modbluetooth_btstack.c
+++ b/extmod/btstack/modbluetooth_btstack.c
@@ -414,30 +414,21 @@ STATIC void btstack_packet_handler(uint8_t packet_type, uint8_t *packet, uint8_t
         uint16_t value_handle = gatt_event_characteristic_value_query_result_get_value_handle(packet);
         uint16_t len = gatt_event_characteristic_value_query_result_get_value_length(packet);
         const uint8_t *data = gatt_event_characteristic_value_query_result_get_value(packet);
-        mp_uint_t atomic_state;
-        len = mp_bluetooth_gattc_on_data_available_start(MP_BLUETOOTH_IRQ_GATTC_READ_RESULT, conn_handle, value_handle, len, &atomic_state);
-        mp_bluetooth_gattc_on_data_available_chunk(data, len);
-        mp_bluetooth_gattc_on_data_available_end(atomic_state);
+        mp_bluetooth_gattc_on_data_available(MP_BLUETOOTH_IRQ_GATTC_READ_RESULT, conn_handle, value_handle, &data, &len, 1);
     } else if (event_type == GATT_EVENT_NOTIFICATION) {
         DEBUG_printf("  --> gatt notification\n");
         uint16_t conn_handle = gatt_event_notification_get_handle(packet);
         uint16_t value_handle = gatt_event_notification_get_value_handle(packet);
         uint16_t len = gatt_event_notification_get_value_length(packet);
         const uint8_t *data = gatt_event_notification_get_value(packet);
-        mp_uint_t atomic_state;
-        len = mp_bluetooth_gattc_on_data_available_start(MP_BLUETOOTH_IRQ_GATTC_NOTIFY, conn_handle, value_handle, len, &atomic_state);
-        mp_bluetooth_gattc_on_data_available_chunk(data, len);
-        mp_bluetooth_gattc_on_data_available_end(atomic_state);
+        mp_bluetooth_gattc_on_data_available(MP_BLUETOOTH_IRQ_GATTC_NOTIFY, conn_handle, value_handle, &data, &len, 1);
     } else if (event_type == GATT_EVENT_INDICATION) {
         DEBUG_printf("  --> gatt indication\n");
         uint16_t conn_handle = gatt_event_indication_get_handle(packet);
         uint16_t value_handle = gatt_event_indication_get_value_handle(packet);
         uint16_t len = gatt_event_indication_get_value_length(packet);
         const uint8_t *data = gatt_event_indication_get_value(packet);
-        mp_uint_t atomic_state;
-        len = mp_bluetooth_gattc_on_data_available_start(MP_BLUETOOTH_IRQ_GATTC_INDICATE, conn_handle, value_handle, len, &atomic_state);
-        mp_bluetooth_gattc_on_data_available_chunk(data, len);
-        mp_bluetooth_gattc_on_data_available_end(atomic_state);
+        mp_bluetooth_gattc_on_data_available(MP_BLUETOOTH_IRQ_GATTC_INDICATE, conn_handle, value_handle, &data, &len, 1);
     } else if (event_type == GATT_EVENT_CAN_WRITE_WITHOUT_RESPONSE) {
         uint16_t conn_handle = gatt_event_can_write_without_response_get_handle(packet);
         DEBUG_printf("  --> gatt can write without response %d\n", conn_handle);
diff --git a/extmod/modbluetooth.c b/extmod/modbluetooth.c
index 90ed495462b28..6bad134959271 100644
--- a/extmod/modbluetooth.c
+++ b/extmod/modbluetooth.c
@@ -1125,31 +1125,34 @@ void mp_bluetooth_gattc_on_discover_complete(uint8_t event, uint16_t conn_handle
     schedule_ringbuf(atomic_state);
 }
 
-size_t mp_bluetooth_gattc_on_data_available_start(uint8_t event, uint16_t conn_handle, uint16_t value_handle, size_t data_len, mp_uint_t *atomic_state_out) {
+void mp_bluetooth_gattc_on_data_available(uint8_t event, uint16_t conn_handle, uint16_t value_handle, const uint8_t **data, uint16_t *data_len, size_t num) {
     MICROPY_PY_BLUETOOTH_ENTER
-    *atomic_state_out = atomic_state;
     mp_obj_bluetooth_ble_t *o = MP_OBJ_TO_PTR(MP_STATE_VM(bluetooth));
-    data_len = MIN(o->irq_data_data_alloc, data_len);
-    if (enqueue_irq(o, 2 + 2 + 2 + data_len, event)) {
+
+    // Get the total length of the fragmented buffers.
+    uint16_t total_len = 0;
+    for (size_t i = 0; i < num; ++i) {
+        total_len += data_len[i];
+    }
+
+    // Truncate the data at what we'll be able to pass to Python.
+    total_len = MIN(o->irq_data_data_alloc, total_len);
+
+    if (enqueue_irq(o, 2 + 2 + 2 + total_len, event)) {
         ringbuf_put16(&o->ringbuf, conn_handle);
         ringbuf_put16(&o->ringbuf, value_handle);
-        // Length field is 16-bit.
-        data_len = MIN(UINT16_MAX, data_len);
-        ringbuf_put16(&o->ringbuf, data_len);
-        return data_len;
-    } else {
-        return 0;
-    }
-}
 
-void mp_bluetooth_gattc_on_data_available_chunk(const uint8_t *data, size_t data_len) {
-    mp_obj_bluetooth_ble_t *o = MP_OBJ_TO_PTR(MP_STATE_VM(bluetooth));
-    for (size_t i = 0; i < data_len; ++i) {
-        ringbuf_put(&o->ringbuf, data[i]);
-    }
-}
+        ringbuf_put16(&o->ringbuf, total_len);
 
-void mp_bluetooth_gattc_on_data_available_end(mp_uint_t atomic_state) {
+        // Copy total_len from the fragments to the ringbuffer.
+        uint16_t copied_bytes = 0;
+        for (size_t i = 0; i < num; ++i) {
+            for (size_t j = 0; i < data_len[i] && copied_bytes < total_len; ++j) {
+                ringbuf_put(&o->ringbuf, data[i][j]);
+                ++copied_bytes;
+            }
+        }
+    }
     schedule_ringbuf(atomic_state);
 }
 
diff --git a/extmod/modbluetooth.h b/extmod/modbluetooth.h
index 618939ab18f0e..dee7186a2db3f 100644
--- a/extmod/modbluetooth.h
+++ b/extmod/modbluetooth.h
@@ -289,11 +289,7 @@ void mp_bluetooth_gattc_on_descriptor_result(uint16_t conn_handle, uint16_t hand
 void mp_bluetooth_gattc_on_discover_complete(uint8_t event, uint16_t conn_handle, uint16_t status);
 
 // Notify modbluetooth that a read has completed with data (or notify/indicate data available, use `event` to disambiguate).
-// Note: these functions are to be called in a group protected by MICROPY_PY_BLUETOOTH_ENTER/EXIT.
-// _start returns the number of bytes to submit to the calls to _chunk, followed by a call to _end.
-size_t mp_bluetooth_gattc_on_data_available_start(uint8_t event, uint16_t conn_handle, uint16_t value_handle, size_t data_len, mp_uint_t *atomic_state_out);
-void mp_bluetooth_gattc_on_data_available_chunk(const uint8_t *data, size_t data_len);
-void mp_bluetooth_gattc_on_data_available_end(mp_uint_t atomic_state);
+void mp_bluetooth_gattc_on_data_available(uint8_t event, uint16_t conn_handle, uint16_t value_handle, const uint8_t **data, uint16_t *data_len, size_t num);
 
 // Notify modbluetooth that a read or write operation has completed.
 void mp_bluetooth_gattc_on_read_write_status(uint8_t event, uint16_t conn_handle, uint16_t value_handle, uint16_t status);
diff --git a/extmod/nimble/modbluetooth_nimble.c b/extmod/nimble/modbluetooth_nimble.c
index acb4c03dc32f5..621278e0f15c8 100644
--- a/extmod/nimble/modbluetooth_nimble.c
+++ b/extmod/nimble/modbluetooth_nimble.c
@@ -798,16 +798,35 @@ int mp_bluetooth_set_preferred_mtu(uint16_t mtu) {
 #if MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE
 
 STATIC void gattc_on_data_available(uint8_t event, uint16_t conn_handle, uint16_t value_handle, const struct os_mbuf *om) {
-    size_t len = OS_MBUF_PKTLEN(om);
-    mp_uint_t atomic_state;
-    len = mp_bluetooth_gattc_on_data_available_start(event, conn_handle, value_handle, len, &atomic_state);
-    while (len > 0 && om != NULL) {
-        size_t n = MIN(om->om_len, len);
-        mp_bluetooth_gattc_on_data_available_chunk(OS_MBUF_DATA(om, const uint8_t *), n);
-        len -= n;
+    // When the HCI data for an ATT payload arrives, the L2CAP channel will
+    // buffer it into its receive buffer. We set BLE_L2CAP_JOIN_RX_FRAGS=1 in
+    // syscfg.h so it should be rare that the mbuf is fragmented, but we do need
+    // to be able to handle it. We pass all the fragments up to modbluetooth.c
+    // which will create a temporary buffer on the MicroPython heap if necessary
+    // to re-assemble them.
+
+    // Count how many links are in the mbuf chain.
+    size_t n = 0;
+    const struct os_mbuf *elem = om;
+    while (elem) {
+        n += 1;
+        elem = SLIST_NEXT(elem, om_next);
+    }
+
+    // Grab data pointers and lengths for each of the links.
+    const uint8_t **data = mp_local_alloc(sizeof(uint8_t *) * n);
+    uint16_t *data_len = mp_local_alloc(sizeof(uint16_t) * n);
+    for (size_t i = 0; i < n; ++i) {
+        data[i] = OS_MBUF_DATA(om, const uint8_t *);
+        data_len[i] = om->om_len;
         om = SLIST_NEXT(om, om_next);
     }
-    mp_bluetooth_gattc_on_data_available_end(atomic_state);
+
+    // Pass all the fragments together.
+    mp_bluetooth_gattc_on_data_available(event, conn_handle, value_handle, data, data_len, n);
+
+    mp_local_free(data_len);
+    mp_local_free(data);
 }
 
 STATIC int gap_scan_cb(struct ble_gap_event *event, void *arg) {

From 6d9fdff8d07f3fa2a05eddb05e1a55754ae3542f Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Tue, 3 Nov 2020 17:48:55 +1100
Subject: [PATCH 0408/3533] extmod/nimble: Poll startup directly rather than
 using NimBLE sem.

Using a semaphore (the previous approach) will only run the UART, whereas
for startup we need to also run the event queue.

This change makes it run the full scheduler hook.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 extmod/nimble/modbluetooth_nimble.c | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/extmod/nimble/modbluetooth_nimble.c b/extmod/nimble/modbluetooth_nimble.c
index 621278e0f15c8..b387e6ae1f979 100644
--- a/extmod/nimble/modbluetooth_nimble.c
+++ b/extmod/nimble/modbluetooth_nimble.c
@@ -53,7 +53,6 @@
 STATIC uint8_t nimble_address_mode = BLE_OWN_ADDR_RANDOM;
 
 #define NIMBLE_STARTUP_TIMEOUT 2000
-STATIC struct ble_npl_sem startup_sem;
 
 // Any BLE_HS_xxx code not in this table will default to MP_EIO.
 STATIC int8_t ble_hs_err_to_errno_table[] = {
@@ -210,8 +209,6 @@ STATIC void sync_cb(void) {
     ble_svc_gap_device_name_set(MICROPY_PY_BLUETOOTH_DEFAULT_GAP_NAME);
 
     mp_bluetooth_nimble_ble_state = MP_BLUETOOTH_NIMBLE_BLE_STATE_ACTIVE;
-
-    ble_npl_sem_release(&startup_sem);
 }
 
 STATIC void gatts_register_cb(struct ble_gatt_register_ctxt *ctxt, void *arg) {
@@ -369,8 +366,6 @@ int mp_bluetooth_init(void) {
     ble_hs_cfg.gatts_register_cb = gatts_register_cb;
     ble_hs_cfg.store_status_cb = ble_store_util_status_rr;
 
-    ble_npl_sem_init(&startup_sem, 0);
-
     MP_STATE_PORT(bluetooth_nimble_root_pointers) = m_new0(mp_bluetooth_nimble_root_pointers_t, 1);
     mp_bluetooth_gatts_db_create(&MP_STATE_PORT(bluetooth_nimble_root_pointers)->gatts_db);
 
@@ -383,16 +378,24 @@ int mp_bluetooth_init(void) {
     // Otherwise default implementation above calls ble_hci_uart_init().
     mp_bluetooth_nimble_port_hci_init();
 
+    // Static initialization is complete, can start processing events.
+    mp_bluetooth_nimble_ble_state = MP_BLUETOOTH_NIMBLE_BLE_STATE_WAITING_FOR_SYNC;
+
     // Initialise NimBLE memory and data structures.
     nimble_port_init();
 
     // Make sure that the HCI UART and event handling task is running.
     mp_bluetooth_nimble_port_start();
 
-    // Static initialization is complete, can start processing events.
-    mp_bluetooth_nimble_ble_state = MP_BLUETOOTH_NIMBLE_BLE_STATE_WAITING_FOR_SYNC;
-
-    ble_npl_sem_pend(&startup_sem, NIMBLE_STARTUP_TIMEOUT);
+    // Run the scheduler while we wait for stack startup.
+    // On non-ringbuffer builds (NimBLE on STM32/Unix) this will also poll the UART and run the event queue.
+    mp_uint_t timeout_start_ticks_ms = mp_hal_ticks_ms();
+    while (mp_bluetooth_nimble_ble_state != MP_BLUETOOTH_NIMBLE_BLE_STATE_ACTIVE) {
+        if (mp_hal_ticks_ms() - timeout_start_ticks_ms > NIMBLE_STARTUP_TIMEOUT) {
+            break;
+        }
+        MICROPY_EVENT_POLL_HOOK
+    }
 
     if (mp_bluetooth_nimble_ble_state != MP_BLUETOOTH_NIMBLE_BLE_STATE_ACTIVE) {
         mp_bluetooth_deinit();

From 81e92d3d6e1a605a6115821ac24dcbc2546ba0f9 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Wed, 28 Oct 2020 13:06:45 +1100
Subject: [PATCH 0409/3533] extmod/modbluetooth: Re-instate optional no-ringbuf
 modbluetooth.

This requires that the event handlers are called from non-interrupt context
(i.e. the MicroPython scheduler).

This will allow the BLE stack (e.g. NimBLE) to run from the scheduler
rather than an IRQ like PENDSV, and therefore be able to invoke Python
callbacks directly/synchronously.  This allows writing Python BLE handlers
for events that require immediate response such as _IRQ_READ_REQUEST (which
was previous a hard IRQ) and future events relating to pairing/bonding.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 extmod/btstack/modbluetooth_btstack.c |   4 +-
 extmod/modbluetooth.c                 | 224 +++++++++++++++++++++-----
 extmod/modbluetooth.h                 |   8 +-
 extmod/nimble/modbluetooth_nimble.c   |   4 +-
 ports/stm32/Makefile                  |   1 -
 ports/unix/Makefile                   |   2 -
 6 files changed, 189 insertions(+), 54 deletions(-)

diff --git a/extmod/btstack/modbluetooth_btstack.c b/extmod/btstack/modbluetooth_btstack.c
index a4cc601746b1e..97dd2cbb53f5c 100644
--- a/extmod/btstack/modbluetooth_btstack.c
+++ b/extmod/btstack/modbluetooth_btstack.c
@@ -838,15 +838,15 @@ STATIC uint16_t att_read_callback(hci_con_handle_t connection_handle, uint16_t a
         return 0;
     }
 
-    #if MICROPY_PY_BLUETOOTH_GATTS_ON_READ_CALLBACK
     // Allow Python code to override value (by using gatts_write), or deny (by returning false) the read.
+    // Note this will be a no-op if the ringbuffer implementation is being used, as the Python callback cannot
+    // be executed synchronously. This is currently always the case for btstack.
     if ((buffer == NULL) && (buffer_size == 0)) {
         if (!mp_bluetooth_gatts_on_read_request(connection_handle, att_handle)) {
             DEBUG_printf("att_read_callback: read request denied\n");
             return 0;
         }
     }
-    #endif
 
     uint16_t ret = att_read_callback_handle_blob(entry->data, entry->data_len, offset, buffer, buffer_size);
     return ret;
diff --git a/extmod/modbluetooth.c b/extmod/modbluetooth.c
index 6bad134959271..d8068df594538 100644
--- a/extmod/modbluetooth.c
+++ b/extmod/modbluetooth.c
@@ -47,15 +47,18 @@
 
 #define MICROPY_PY_BLUETOOTH_MAX_EVENT_DATA_TUPLE_LEN 5
 
+#if !MICROPY_PY_BLUETOOTH_USE_SYNC_EVENTS
 // This formula is intended to allow queuing the data of a large characteristic
 // while still leaving room for a couple of normal (small, fixed size) events.
 #define MICROPY_PY_BLUETOOTH_MAX_EVENT_DATA_BYTES_LEN(ringbuf_size) (MAX((int)((ringbuf_size) / 2), (int)(ringbuf_size) - 64))
+#endif
 
 // bluetooth.BLE type. This is currently a singleton, however in the future
 // this could allow having multiple BLE interfaces on different UARTs.
 typedef struct {
     mp_obj_base_t base;
     mp_obj_t irq_handler;
+    #if !MICROPY_PY_BLUETOOTH_USE_SYNC_EVENTS
     bool irq_scheduled;
     mp_obj_t irq_data_tuple;
     uint8_t irq_data_addr_bytes[6];
@@ -64,8 +67,6 @@ typedef struct {
     mp_obj_array_t irq_data_data;
     mp_obj_bluetooth_uuid_t irq_data_uuid;
     ringbuf_t ringbuf;
-    #if MICROPY_PY_BLUETOOTH_GATTS_ON_READ_CALLBACK
-    mp_obj_t irq_read_request_data_tuple;
     #endif
 } mp_obj_bluetooth_ble_t;
 
@@ -206,8 +207,7 @@ STATIC mp_int_t bluetooth_uuid_get_buffer(mp_obj_t self_in, mp_buffer_info_t *bu
     return 0;
 }
 
-#if MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE
-
+#if !MICROPY_PY_BLUETOOTH_USE_SYNC_EVENTS && MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE
 STATIC void ringbuf_put_uuid(ringbuf_t *ringbuf, mp_obj_bluetooth_uuid_t *uuid) {
     assert(ringbuf_free(ringbuf) >= (size_t)uuid->type + 1);
     ringbuf_put(ringbuf, uuid->type);
@@ -252,14 +252,10 @@ STATIC mp_obj_t bluetooth_ble_make_new(const mp_obj_type_t *type, size_t n_args,
 
         o->irq_handler = mp_const_none;
 
+        #if !MICROPY_PY_BLUETOOTH_USE_SYNC_EVENTS
         // Pre-allocate the event data tuple to prevent needing to allocate in the IRQ handler.
         o->irq_data_tuple = mp_obj_new_tuple(MICROPY_PY_BLUETOOTH_MAX_EVENT_DATA_TUPLE_LEN, NULL);
 
-        #if MICROPY_PY_BLUETOOTH_GATTS_ON_READ_CALLBACK
-        // Pre-allocate a separate data tuple for the read request "hard" irq.
-        o->irq_read_request_data_tuple = mp_obj_new_tuple(2, NULL);
-        #endif
-
         // Pre-allocated buffers for address, payload and uuid.
         mp_obj_memoryview_init(&o->irq_data_addr, 'B', 0, 0, o->irq_data_addr_bytes);
         o->irq_data_data_alloc = MICROPY_PY_BLUETOOTH_MAX_EVENT_DATA_BYTES_LEN(MICROPY_PY_BLUETOOTH_RINGBUF_SIZE);
@@ -268,6 +264,7 @@ STATIC mp_obj_t bluetooth_ble_make_new(const mp_obj_type_t *type, size_t n_args,
 
         // Allocate the default ringbuf.
         ringbuf_alloc(&o->ringbuf, MICROPY_PY_BLUETOOTH_RINGBUF_SIZE);
+        #endif
 
         MP_STATE_VM(bluetooth) = MP_OBJ_FROM_PTR(o);
     }
@@ -290,8 +287,6 @@ STATIC mp_obj_t bluetooth_ble_active(size_t n_args, const mp_obj_t *args) {
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(bluetooth_ble_active_obj, 1, 2, bluetooth_ble_active);
 
 STATIC mp_obj_t bluetooth_ble_config(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs) {
-    mp_obj_bluetooth_ble_t *self = MP_OBJ_TO_PTR(args[0]);
-
     if (kwargs->used == 0) {
         // Get config value
         if (n_args != 2) {
@@ -311,8 +306,12 @@ STATIC mp_obj_t bluetooth_ble_config(size_t n_args, const mp_obj_t *args, mp_map
                 mp_obj_t items[] = { MP_OBJ_NEW_SMALL_INT(addr_type), mp_obj_new_bytes(addr, MP_ARRAY_SIZE(addr)) };
                 return mp_obj_new_tuple(2, items);
             }
-            case MP_QSTR_rxbuf:
+            #if !MICROPY_PY_BLUETOOTH_USE_SYNC_EVENTS
+            case MP_QSTR_rxbuf: {
+                mp_obj_bluetooth_ble_t *self = MP_OBJ_TO_PTR(args[0]);
                 return mp_obj_new_int(self->ringbuf.size);
+            }
+            #endif
             case MP_QSTR_mtu:
                 return mp_obj_new_int(mp_bluetooth_get_preferred_mtu());
             default:
@@ -334,6 +333,7 @@ STATIC mp_obj_t bluetooth_ble_config(size_t n_args, const mp_obj_t *args, mp_map
                         bluetooth_handle_errno(mp_bluetooth_gap_set_device_name(bufinfo.buf, bufinfo.len));
                         break;
                     }
+                    #if !MICROPY_PY_BLUETOOTH_USE_SYNC_EVENTS
                     case MP_QSTR_rxbuf: {
                         // Determine new buffer sizes
                         mp_int_t ringbuf_alloc = mp_obj_get_int(e->value);
@@ -347,6 +347,7 @@ STATIC mp_obj_t bluetooth_ble_config(size_t n_args, const mp_obj_t *args, mp_map
                         uint8_t *irq_data = m_new(uint8_t, irq_data_alloc);
 
                         // Get old buffer sizes and pointers
+                        mp_obj_bluetooth_ble_t *self = MP_OBJ_TO_PTR(args[0]);
                         uint8_t *old_ringbuf_buf = self->ringbuf.buf;
                         size_t old_ringbuf_alloc = self->ringbuf.size;
                         uint8_t *old_irq_data_buf = (uint8_t *)self->irq_data_data.items;
@@ -367,6 +368,7 @@ STATIC mp_obj_t bluetooth_ble_config(size_t n_args, const mp_obj_t *args, mp_map
                         m_del(uint8_t, old_irq_data_buf, old_irq_data_alloc);
                         break;
                     }
+                    #endif
                     case MP_QSTR_mtu: {
                         mp_int_t mtu = mp_obj_get_int(e->value);
                         bluetooth_handle_errno(mp_bluetooth_set_preferred_mtu(mtu));
@@ -845,8 +847,7 @@ const mp_obj_module_t mp_module_ubluetooth = {
 
 // Helpers
 
-#include <stdio.h>
-
+#if !MICROPY_PY_BLUETOOTH_USE_SYNC_EVENTS
 STATIC void ringbuf_extract(ringbuf_t *ringbuf, mp_obj_tuple_t *data_tuple, size_t n_u16, size_t n_u8, mp_obj_array_t *bytes_addr, size_t n_i8, mp_obj_bluetooth_uuid_t *uuid, mp_obj_array_t *bytes_data) {
     assert(ringbuf_avail(ringbuf) >= n_u16 * 2 + n_u8 + (bytes_addr ? 6 : 0) + n_i8 + (uuid ? 1 : 0) + (bytes_data ? 1 : 0));
     size_t j = 0;
@@ -854,7 +855,7 @@ STATIC void ringbuf_extract(ringbuf_t *ringbuf, mp_obj_tuple_t *data_tuple, size
     for (size_t i = 0; i < n_u16; ++i) {
         data_tuple->items[j++] = MP_OBJ_NEW_SMALL_INT(ringbuf_get16(ringbuf));
     }
-    if (n_u8) {
+    for (size_t i = 0; i < n_u8; ++i) {
         data_tuple->items[j++] = MP_OBJ_NEW_SMALL_INT(ringbuf_get(ringbuf));
     }
     if (bytes_addr) {
@@ -960,11 +961,166 @@ STATIC mp_obj_t bluetooth_ble_invoke_irq(mp_obj_t none_in) {
     return mp_const_none;
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(bluetooth_ble_invoke_irq_obj, bluetooth_ble_invoke_irq);
+#endif // !MICROPY_PY_BLUETOOTH_USE_SYNC_EVENTS
 
 // ----------------------------------------------------------------------------
 // Port API
 // ----------------------------------------------------------------------------
 
+#if MICROPY_PY_BLUETOOTH_USE_SYNC_EVENTS
+
+STATIC mp_obj_t invoke_irq_handler(uint16_t event,
+    const uint16_t *u16, size_t n_u16,
+    const uint8_t *u8, size_t n_u8,
+    const uint8_t *addr,
+    const int8_t *i8, size_t n_i8,
+    const mp_obj_bluetooth_uuid_t *uuid,
+    const uint8_t *data, size_t data_len) {
+    mp_obj_bluetooth_ble_t *o = MP_OBJ_TO_PTR(MP_STATE_VM(bluetooth));
+    if (o->irq_handler == mp_const_none) {
+        return mp_const_none;
+    }
+
+    mp_obj_array_t mv_addr;
+    mp_obj_array_t mv_data;
+
+    mp_obj_tuple_t *data_tuple = mp_local_alloc(sizeof(mp_obj_tuple_t) + sizeof(mp_obj_t) * MICROPY_PY_BLUETOOTH_MAX_EVENT_DATA_TUPLE_LEN);
+    data_tuple->base.type = &mp_type_tuple;
+    data_tuple->len = 0;
+
+    for (size_t i = 0; i < n_u16; ++i) {
+        data_tuple->items[data_tuple->len++] = MP_OBJ_NEW_SMALL_INT(u16[i]);
+    }
+    for (size_t i = 0; i < n_u8; ++i) {
+        data_tuple->items[data_tuple->len++] = MP_OBJ_NEW_SMALL_INT(u8[i]);
+    }
+    if (addr) {
+        mp_obj_memoryview_init(&mv_addr, 'B', 0, 6, (void *)addr);
+        data_tuple->items[data_tuple->len++] = MP_OBJ_FROM_PTR(&mv_addr);
+    }
+    for (size_t i = 0; i < n_i8; ++i) {
+        data_tuple->items[data_tuple->len++] = MP_OBJ_NEW_SMALL_INT(i8[i]);
+    }
+    #if MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE
+    if (uuid) {
+        data_tuple->items[data_tuple->len++] = MP_OBJ_FROM_PTR(uuid);
+    }
+    #endif
+    if (data) {
+        mp_obj_memoryview_init(&mv_data, 'B', 0, data_len, (void *)data);
+        data_tuple->items[data_tuple->len++] = MP_OBJ_FROM_PTR(&mv_data);
+    }
+    assert(data_tuple->len <= MICROPY_PY_BLUETOOTH_MAX_EVENT_DATA_TUPLE_LEN);
+
+    mp_obj_t result = mp_call_function_2(o->irq_handler, MP_OBJ_NEW_SMALL_INT(event), MP_OBJ_FROM_PTR(data_tuple));
+
+    mp_local_free(data_tuple);
+
+    return result;
+}
+
+#define NULL_U16 NULL
+#define NULL_U8 NULL
+#define NULL_ADDR NULL
+#define NULL_I8 NULL
+#define NULL_UUID NULL
+#define NULL_DATA NULL
+
+void mp_bluetooth_gap_on_connected_disconnected(uint8_t event, uint16_t conn_handle, uint8_t addr_type, const uint8_t *addr) {
+    invoke_irq_handler(event, &conn_handle, 1, &addr_type, 1, addr, NULL_I8, 0, NULL_UUID, NULL_DATA, 0);
+}
+
+void mp_bluetooth_gatts_on_write(uint16_t conn_handle, uint16_t value_handle) {
+    uint16_t args[] = {conn_handle, value_handle};
+    invoke_irq_handler(MP_BLUETOOTH_IRQ_GATTS_WRITE, args, 2, NULL_U8, 0, NULL_ADDR, NULL_I8, 0, NULL_UUID, NULL_DATA, 0);
+}
+
+void mp_bluetooth_gatts_on_indicate_complete(uint16_t conn_handle, uint16_t value_handle, uint8_t status) {
+    uint16_t args[] = {conn_handle, value_handle};
+    invoke_irq_handler(MP_BLUETOOTH_IRQ_GATTS_INDICATE_DONE, args, 2, &status, 1, NULL_ADDR, NULL_I8, 0, NULL_UUID, NULL_DATA, 0);
+}
+
+bool mp_bluetooth_gatts_on_read_request(uint16_t conn_handle, uint16_t value_handle) {
+    uint16_t args[] = {conn_handle, value_handle};
+    mp_obj_t result = invoke_irq_handler(MP_BLUETOOTH_IRQ_GATTS_READ_REQUEST, args, 2, NULL, 0, NULL_ADDR, NULL_I8, 0, NULL_UUID, NULL_DATA, 0);
+    return result == mp_const_none || mp_obj_is_true(result);
+}
+
+void mp_bluetooth_gatts_on_mtu_exchanged(uint16_t conn_handle, uint16_t value) {
+    uint16_t args[] = {conn_handle, value};
+    invoke_irq_handler(MP_BLUETOOTH_IRQ_MTU_EXCHANGED, args, 2, NULL_U8, 0, NULL_ADDR, NULL_I8, 0, NULL_UUID, NULL_DATA, 0);
+}
+
+#if MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE
+void mp_bluetooth_gap_on_scan_complete(void) {
+    invoke_irq_handler(MP_BLUETOOTH_IRQ_SCAN_DONE, NULL_U16, 0, NULL_U8, 0, NULL_ADDR, NULL_I8, 0, NULL_UUID, NULL_DATA, 0);
+}
+
+void mp_bluetooth_gap_on_scan_result(uint8_t addr_type, const uint8_t *addr, uint8_t adv_type, const int8_t rssi, const uint8_t *data, size_t data_len) {
+    int8_t args[] = {adv_type, rssi};
+    invoke_irq_handler(MP_BLUETOOTH_IRQ_SCAN_RESULT, NULL_U16, 0, &addr_type, 1, addr, args, 2, NULL_UUID, data, data_len);
+}
+
+void mp_bluetooth_gattc_on_primary_service_result(uint16_t conn_handle, uint16_t start_handle, uint16_t end_handle, mp_obj_bluetooth_uuid_t *service_uuid) {
+    uint16_t args[] = {conn_handle, start_handle, end_handle};
+    invoke_irq_handler(MP_BLUETOOTH_IRQ_GATTC_SERVICE_RESULT, args, 3, NULL_U8, 0, NULL_ADDR, NULL_I8, 0, service_uuid, NULL_DATA, 0);
+}
+
+void mp_bluetooth_gattc_on_characteristic_result(uint16_t conn_handle, uint16_t def_handle, uint16_t value_handle, uint8_t properties, mp_obj_bluetooth_uuid_t *characteristic_uuid) {
+    uint16_t args[] = {conn_handle, def_handle, value_handle};
+    invoke_irq_handler(MP_BLUETOOTH_IRQ_GATTC_CHARACTERISTIC_RESULT, args, 3, &properties, 1, NULL_ADDR, NULL_I8, 0, characteristic_uuid, NULL_DATA, 0);
+}
+
+void mp_bluetooth_gattc_on_descriptor_result(uint16_t conn_handle, uint16_t handle, mp_obj_bluetooth_uuid_t *descriptor_uuid) {
+    uint16_t args[] = {conn_handle, handle};
+    invoke_irq_handler(MP_BLUETOOTH_IRQ_GATTC_DESCRIPTOR_RESULT, args, 2, NULL_U8, 0, NULL_ADDR, NULL_I8, 0, descriptor_uuid, NULL_DATA, 0);
+}
+
+void mp_bluetooth_gattc_on_discover_complete(uint8_t event, uint16_t conn_handle, uint16_t status) {
+    uint16_t args[] = {conn_handle, status};
+    invoke_irq_handler(event, args, 2, NULL_U8, 0, NULL_ADDR, NULL_I8, 0, NULL_UUID, NULL_DATA, 0);
+}
+
+void mp_bluetooth_gattc_on_data_available(uint8_t event, uint16_t conn_handle, uint16_t value_handle, const uint8_t **data, uint16_t *data_len, size_t num) {
+    const uint8_t *combined_data;
+    uint16_t total_len;
+
+    if (num > 1) {
+        // Fragmented buffer, need to combine into a new heap-allocated buffer
+        // in order to pass to Python.
+        total_len = 0;
+        for (size_t i = 0; i < num; ++i) {
+            total_len += data_len[i];
+        }
+        uint8_t *buf = m_new(uint8_t, total_len);
+        uint8_t *p = buf;
+        for (size_t i = 0; i < num; ++i) {
+            memcpy(p, data[i], data_len[i]);
+            p += data_len[i];
+        }
+        combined_data = buf;
+    } else {
+        // Single buffer, use directly.
+        combined_data = *data;
+        total_len = *data_len;
+    }
+
+    uint16_t args[] = {conn_handle, value_handle};
+    invoke_irq_handler(event, args, 2, NULL_U8, 0, NULL_ADDR, NULL_I8, 0, NULL_UUID, combined_data, total_len);
+
+    if (num > 1) {
+        m_del(uint8_t, (uint8_t *)combined_data, total_len);
+    }
+}
+
+void mp_bluetooth_gattc_on_read_write_status(uint8_t event, uint16_t conn_handle, uint16_t value_handle, uint16_t status) {
+    uint16_t args[] = {conn_handle, value_handle, status};
+    invoke_irq_handler(event, args, 3, NULL_U8, 0, NULL_ADDR, NULL_I8, 0, NULL_UUID, NULL_DATA, 0);
+}
+
+#endif // MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE
+
+#else // !MICROPY_PY_BLUETOOTH_USE_SYNC_EVENTS
 // Callbacks are called in interrupt context (i.e. can't allocate), so we need to push the data
 // into the ringbuf and schedule the callback via mp_sched_schedule.
 
@@ -1169,36 +1325,12 @@ void mp_bluetooth_gattc_on_read_write_status(uint8_t event, uint16_t conn_handle
 
 #endif // MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE
 
-#if MICROPY_PY_BLUETOOTH_GATTS_ON_READ_CALLBACK
-// This can only be enabled when the thread invoking this is a MicroPython thread.
-// On ESP32, for example, this is not the case.
 bool mp_bluetooth_gatts_on_read_request(uint16_t conn_handle, uint16_t value_handle) {
-    mp_obj_bluetooth_ble_t *o = MP_OBJ_TO_PTR(MP_STATE_VM(bluetooth));
-    if (o->irq_handler != mp_const_none) {
-        // When executing code within a handler we must lock the scheduler to
-        // prevent any scheduled callbacks from running, and lock the GC to
-        // prevent any memory allocations.
-        mp_sched_lock();
-        gc_lock();
-
-        // Use pre-allocated tuple distinct to the one used by the "soft" IRQs.
-        mp_obj_tuple_t *data = MP_OBJ_TO_PTR(o->irq_read_request_data_tuple);
-        data->items[0] = MP_OBJ_NEW_SMALL_INT(conn_handle);
-        data->items[1] = MP_OBJ_NEW_SMALL_INT(value_handle);
-        data->len = 2;
-        mp_obj_t irq_ret = mp_call_function_2_protected(o->irq_handler, MP_OBJ_NEW_SMALL_INT(MP_BLUETOOTH_IRQ_GATTS_READ_REQUEST), o->irq_read_request_data_tuple);
-
-        gc_unlock();
-        mp_sched_unlock();
-
-        // If the IRQ handler explicitly returned false, then deny the read. Otherwise if it returns None/True, allow it.
-        return irq_ret != MP_OBJ_NULL && (irq_ret == mp_const_none || mp_obj_is_true(irq_ret));
-    } else {
-        // No IRQ handler, allow the read.
-        return true;
-    }
+    (void)conn_handle;
+    (void)value_handle;
+    // This must be handled synchronously and therefore cannot implemented with the ringbuffer.
+    return true;
 }
-#endif
 
 void mp_bluetooth_gatts_on_mtu_exchanged(uint16_t conn_handle, uint16_t value) {
     MICROPY_PY_BLUETOOTH_ENTER
@@ -1210,6 +1342,12 @@ void mp_bluetooth_gatts_on_mtu_exchanged(uint16_t conn_handle, uint16_t value) {
     schedule_ringbuf(atomic_state);
 }
 
+#endif // MICROPY_PY_BLUETOOTH_USE_SYNC_EVENTS
+
+// ----------------------------------------------------------------------------
+// GATTS DB
+// ----------------------------------------------------------------------------
+
 void mp_bluetooth_gatts_db_create_entry(mp_gatts_db_t db, uint16_t handle, size_t len) {
     mp_map_elem_t *elem = mp_map_lookup(db, MP_OBJ_NEW_SMALL_INT(handle), MP_MAP_LOOKUP_ADD_IF_NOT_FOUND);
     mp_bluetooth_gatts_db_entry_t *entry = m_new(mp_bluetooth_gatts_db_entry_t, 1);
diff --git a/extmod/modbluetooth.h b/extmod/modbluetooth.h
index dee7186a2db3f..6ed086d553f05 100644
--- a/extmod/modbluetooth.h
+++ b/extmod/modbluetooth.h
@@ -43,8 +43,10 @@
 #define MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE (0)
 #endif
 
-#ifndef MICROPY_PY_BLUETOOTH_GATTS_ON_READ_CALLBACK
-#define MICROPY_PY_BLUETOOTH_GATTS_ON_READ_CALLBACK (0)
+#ifndef MICROPY_PY_BLUETOOTH_USE_SYNC_EVENTS
+// This can be enabled if the BLE stack runs entirely in scheduler context
+// and therefore is able to call directly into the VM to run Python callbacks.
+#define MICROPY_PY_BLUETOOTH_USE_SYNC_EVENTS (0)
 #endif
 
 // This is used to protect the ringbuffer.
@@ -261,10 +263,8 @@ void mp_bluetooth_gatts_on_write(uint16_t conn_handle, uint16_t value_handle);
 // Call this when an acknowledgment is received for an indication.
 void mp_bluetooth_gatts_on_indicate_complete(uint16_t conn_handle, uint16_t value_handle, uint8_t status);
 
-#if MICROPY_PY_BLUETOOTH_GATTS_ON_READ_CALLBACK
 // Call this when a characteristic is read from. Return false to deny the read.
 bool mp_bluetooth_gatts_on_read_request(uint16_t conn_handle, uint16_t value_handle);
-#endif
 
 // Call this when an MTU exchange completes.
 void mp_bluetooth_gatts_on_mtu_exchanged(uint16_t conn_handle, uint16_t value);
diff --git a/extmod/nimble/modbluetooth_nimble.c b/extmod/nimble/modbluetooth_nimble.c
index b387e6ae1f979..7ee6ae8677e8b 100644
--- a/extmod/nimble/modbluetooth_nimble.c
+++ b/extmod/nimble/modbluetooth_nimble.c
@@ -586,12 +586,12 @@ static int characteristic_access_cb(uint16_t conn_handle, uint16_t value_handle,
     switch (ctxt->op) {
         case BLE_GATT_ACCESS_OP_READ_CHR:
         case BLE_GATT_ACCESS_OP_READ_DSC:
-            #if MICROPY_PY_BLUETOOTH_GATTS_ON_READ_CALLBACK
             // Allow Python code to override (by using gatts_write), or deny (by returning false) the read.
+            // Note this will be a no-op if the ringbuffer implementation is being used (i.e. the stack isn't
+            // run in the scheduler). The ringbuffer is not used on STM32 and Unix-H4 only.
             if (!mp_bluetooth_gatts_on_read_request(conn_handle, value_handle)) {
                 return BLE_ATT_ERR_READ_NOT_PERMITTED;
             }
-            #endif
 
             entry = mp_bluetooth_gatts_db_lookup(MP_STATE_PORT(bluetooth_nimble_root_pointers)->gatts_db, value_handle);
             if (!entry) {
diff --git a/ports/stm32/Makefile b/ports/stm32/Makefile
index 18f7e8a1a10d8..75090a077e2bf 100644
--- a/ports/stm32/Makefile
+++ b/ports/stm32/Makefile
@@ -430,7 +430,6 @@ USBDEV_SRC_C += $(addprefix $(USBDEV_DIR)/,\
 ifeq ($(MICROPY_PY_BLUETOOTH),1)
 CFLAGS_MOD += -DMICROPY_PY_BLUETOOTH=1
 CFLAGS_MOD += -DMICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE=1
-CFLAGS_MOD += -DMICROPY_PY_BLUETOOTH_GATTS_ON_READ_CALLBACK=1
 endif
 
 ifeq ($(MICROPY_PY_NETWORK_CYW43),1)
diff --git a/ports/unix/Makefile b/ports/unix/Makefile
index 048ef97f77531..f72c05f1add78 100644
--- a/ports/unix/Makefile
+++ b/ports/unix/Makefile
@@ -156,8 +156,6 @@ endif
 
 CFLAGS_MOD += -DMICROPY_PY_BLUETOOTH=1
 CFLAGS_MOD += -DMICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE=1
-# Runs in a thread, cannot make calls into the VM.
-CFLAGS_MOD += -DMICROPY_PY_BLUETOOTH_GATTS_ON_READ_CALLBACK=0
 
 ifeq ($(MICROPY_BLUETOOTH_BTSTACK),1)
 

From 61d1e4b01b1bf77e5ca478e18065f0691ae274a7 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Tue, 3 Nov 2020 23:27:47 +1100
Subject: [PATCH 0410/3533] extmod/nimble: Make stm32 and unix NimBLE ports use
 synchronous events.

This changes stm32 from using PENDSV to run NimBLE to use the MicroPython
scheduler instead.  This allows Python BLE callbacks to be invoked directly
(and therefore synchronously) rather than via the ringbuffer.

The NimBLE UART HCI and event processing now happens in a scheduled task
every 128ms.  When RX IRQ idle events arrive, it will also schedule this
task to improve latency.

There is a similar change for the unix port where the background thread now
queues the scheduled task.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 extmod/modbluetooth.h                |   1 +
 extmod/nimble/hal/hal_uart.c         |  23 +++-
 extmod/nimble/hal/hal_uart.h         |   2 +-
 extmod/nimble/modbluetooth_nimble.c  |   5 +-
 extmod/nimble/nimble.mk              |   7 +
 extmod/nimble/nimble/nimble_npl_os.c | 189 ++++++++++++++-------------
 extmod/nimble/nimble/nimble_npl_os.h |   4 +-
 ports/stm32/main.c                   |   4 +-
 ports/stm32/mpbthciport.c            |  65 ++++++++-
 ports/stm32/mpconfigport.h           |   9 +-
 ports/stm32/mpnimbleport.c           |  30 ++---
 ports/stm32/pendsv.h                 |   2 +-
 ports/stm32/rfcore.c                 |   6 +-
 ports/unix/mpbthciport.c             |  54 +++++++-
 ports/unix/mpnimbleport.c            |  34 ++---
 15 files changed, 279 insertions(+), 156 deletions(-)

diff --git a/extmod/modbluetooth.h b/extmod/modbluetooth.h
index 6ed086d553f05..52e3446ff3b94 100644
--- a/extmod/modbluetooth.h
+++ b/extmod/modbluetooth.h
@@ -50,6 +50,7 @@
 #endif
 
 // This is used to protect the ringbuffer.
+// A port may no-op this if MICROPY_PY_BLUETOOTH_USE_SYNC_EVENTS is enabled.
 #ifndef MICROPY_PY_BLUETOOTH_ENTER
 #define MICROPY_PY_BLUETOOTH_ENTER mp_uint_t atomic_state = MICROPY_BEGIN_ATOMIC_SECTION();
 #define MICROPY_PY_BLUETOOTH_EXIT MICROPY_END_ATOMIC_SECTION(atomic_state);
diff --git a/extmod/nimble/hal/hal_uart.c b/extmod/nimble/hal/hal_uart.c
index c6d0850fea993..230970b089c55 100644
--- a/extmod/nimble/hal/hal_uart.c
+++ b/extmod/nimble/hal/hal_uart.c
@@ -28,10 +28,13 @@
 #include "py/mphal.h"
 #include "nimble/ble.h"
 #include "extmod/nimble/hal/hal_uart.h"
+#include "extmod/nimble/nimble/nimble_npl_os.h"
 #include "extmod/mpbthci.h"
 
 #if MICROPY_PY_BLUETOOTH && MICROPY_BLUETOOTH_NIMBLE
 
+#define HCI_TRACE (0)
+
 static hal_uart_tx_cb_t hal_uart_tx_cb;
 static void *hal_uart_tx_arg;
 static hal_uart_rx_cb_t hal_uart_rx_cb;
@@ -62,10 +65,10 @@ void hal_uart_start_tx(uint32_t port) {
         mp_bluetooth_hci_cmd_buf[len++] = data;
     }
 
-    #if 0
-    printf("[% 8d] BTUTX: %02x", mp_hal_ticks_ms(), hci_cmd_buf[0]);
-    for (int i = 1; i < len; ++i) {
-        printf(":%02x", hci_cmd_buf[i]);
+    #if HCI_TRACE
+    printf("< [% 8d] %02x", mp_hal_ticks_ms(), mp_bluetooth_hci_cmd_buf[0]);
+    for (size_t i = 1; i < len; ++i) {
+        printf(":%02x", mp_bluetooth_hci_cmd_buf[i]);
     }
     printf("\n");
     #endif
@@ -77,13 +80,21 @@ int hal_uart_close(uint32_t port) {
     return 0; // success
 }
 
-void mp_bluetooth_nimble_hci_uart_process(void) {
+void mp_bluetooth_nimble_hci_uart_process(bool run_events) {
     bool host_wake = mp_bluetooth_hci_controller_woken();
 
     int chr;
     while ((chr = mp_bluetooth_hci_uart_readchar()) >= 0) {
-        // printf("UART RX: %02x\n", data);
+        #if HCI_TRACE
+        printf("> %02x (%d)\n", chr);
+        #endif
         hal_uart_rx_cb(hal_uart_rx_arg, chr);
+
+        // Incoming data may result in events being enqueued. If we're in
+        // scheduler context then we can run those events immediately.
+        if (run_events) {
+            mp_bluetooth_nimble_os_eventq_run_all();
+        }
     }
 
     if (host_wake) {
diff --git a/extmod/nimble/hal/hal_uart.h b/extmod/nimble/hal/hal_uart.h
index 1ff1c17436dae..647e8ab4772e2 100644
--- a/extmod/nimble/hal/hal_uart.h
+++ b/extmod/nimble/hal/hal_uart.h
@@ -43,6 +43,6 @@ void hal_uart_start_tx(uint32_t port);
 int hal_uart_close(uint32_t port);
 
 // --- Called by the MicroPython port when UART data is available -------------
-void mp_bluetooth_nimble_hci_uart_process(void);
+void mp_bluetooth_nimble_hci_uart_process(bool run_events);
 
 #endif // MICROPY_INCLUDED_EXTMOD_NIMBLE_HAL_HAL_UART_H
diff --git a/extmod/nimble/modbluetooth_nimble.c b/extmod/nimble/modbluetooth_nimble.c
index 7ee6ae8677e8b..c961aee3262c9 100644
--- a/extmod/nimble/modbluetooth_nimble.c
+++ b/extmod/nimble/modbluetooth_nimble.c
@@ -382,6 +382,7 @@ int mp_bluetooth_init(void) {
     mp_bluetooth_nimble_ble_state = MP_BLUETOOTH_NIMBLE_BLE_STATE_WAITING_FOR_SYNC;
 
     // Initialise NimBLE memory and data structures.
+    DEBUG_printf("mp_bluetooth_init: nimble_port_init\n");
     nimble_port_init();
 
     // Make sure that the HCI UART and event handling task is running.
@@ -402,6 +403,8 @@ int mp_bluetooth_init(void) {
         return MP_ETIMEDOUT;
     }
 
+    DEBUG_printf("mp_bluetooth_init: starting services\n");
+
     // By default, just register the default gap/gatt service.
     ble_svc_gap_init();
     ble_svc_gatt_init();
@@ -417,7 +420,7 @@ int mp_bluetooth_init(void) {
 }
 
 void mp_bluetooth_deinit(void) {
-    DEBUG_printf("mp_bluetooth_deinit\n");
+    DEBUG_printf("mp_bluetooth_deinit %d\n", mp_bluetooth_nimble_ble_state);
     if (mp_bluetooth_nimble_ble_state == MP_BLUETOOTH_NIMBLE_BLE_STATE_OFF) {
         return;
     }
diff --git a/extmod/nimble/nimble.mk b/extmod/nimble/nimble.mk
index fbd031b3e3e16..00a244d6eac77 100644
--- a/extmod/nimble/nimble.mk
+++ b/extmod/nimble/nimble.mk
@@ -17,6 +17,13 @@ CFLAGS_MOD += -DMICROPY_BLUETOOTH_NIMBLE_BINDINGS_ONLY=$(MICROPY_BLUETOOTH_NIMBL
 
 ifeq ($(MICROPY_BLUETOOTH_NIMBLE_BINDINGS_ONLY),0)
 
+# On all ports where we provide the full implementation (i.e. not just
+# bindings like on ESP32), then we don't need to use the ringbuffer. In this
+# case, all NimBLE events are run by the MicroPython scheduler. On Unix, the
+# scheduler is also responsible for polling the UART, whereas on STM32 the
+# UART is also polled by the RX IRQ.
+CFLAGS_MOD += -DMICROPY_PY_BLUETOOTH_USE_SYNC_EVENTS=1
+
 NIMBLE_LIB_DIR = lib/mynewt-nimble
 
 LIB_SRC_C += $(addprefix $(NIMBLE_LIB_DIR)/, \
diff --git a/extmod/nimble/nimble/nimble_npl_os.c b/extmod/nimble/nimble/nimble_npl_os.c
index 2ec012940f763..b68957fabf385 100644
--- a/extmod/nimble/nimble/nimble_npl_os.c
+++ b/extmod/nimble/nimble/nimble_npl_os.c
@@ -179,63 +179,100 @@ int nimble_sprintf(char *str, const char *fmt, ...) {
 
 struct ble_npl_eventq *global_eventq = NULL;
 
+// This must not be called recursively or concurrently with the UART handler.
 void mp_bluetooth_nimble_os_eventq_run_all(void) {
-    for (struct ble_npl_eventq *evq = global_eventq; evq != NULL; evq = evq->nextq) {
-        int n = 0;
-        while (evq->head != NULL && mp_bluetooth_nimble_ble_state > MP_BLUETOOTH_NIMBLE_BLE_STATE_OFF) {
-            struct ble_npl_event *ev = evq->head;
-            evq->head = ev->next;
-            if (ev->next) {
-                ev->next->prev = NULL;
-                ev->next = NULL;
-            }
-            ev->prev = NULL;
-            DEBUG_EVENT_printf("event_run(%p)\n", ev);
-            ev->fn(ev);
-            DEBUG_EVENT_printf("event_run(%p) done\n", ev);
-
-            if (++n > 3) {
-                // Limit to running 3 tasks per queue.
-                // Some tasks (such as reset) can enqueue themselves
-                // making this an infinite loop (while in PENDSV).
+    if (mp_bluetooth_nimble_ble_state == MP_BLUETOOTH_NIMBLE_BLE_STATE_OFF) {
+        return;
+    }
+
+    // Keep running while there are pending events.
+    while (true) {
+        struct ble_npl_event *ev = NULL;
+
+        os_sr_t sr;
+        OS_ENTER_CRITICAL(sr);
+        // Search all queues for an event.
+        for (struct ble_npl_eventq *evq = global_eventq; evq != NULL; evq = evq->nextq) {
+            ev = evq->head;
+            if (ev) {
+                // Remove this event from the queue.
+                evq->head = ev->next;
+                if (ev->next) {
+                    ev->next->prev = NULL;
+                    ev->next = NULL;
+                }
+                ev->prev = NULL;
+
+                ev->pending = false;
+
+                // Stop searching and execute this event.
                 break;
             }
         }
+        OS_EXIT_CRITICAL(sr);
+
+        if (!ev) {
+            break;
+        }
+
+        // Run the event handler.
+        DEBUG_EVENT_printf("event_run(%p)\n", ev);
+        ev->fn(ev);
+        DEBUG_EVENT_printf("event_run(%p) done\n", ev);
+
+        if (ev->pending) {
+            // If this event has been re-enqueued while it was running, then
+            // stop running further events. This prevents an infinite loop
+            // where the reset event re-enqueues itself on HCI timeout.
+            break;
+        }
     }
 }
 
 void ble_npl_eventq_init(struct ble_npl_eventq *evq) {
     DEBUG_EVENT_printf("ble_npl_eventq_init(%p)\n", evq);
+    os_sr_t sr;
+    OS_ENTER_CRITICAL(sr);
     evq->head = NULL;
     struct ble_npl_eventq **evq2;
     for (evq2 = &global_eventq; *evq2 != NULL; evq2 = &(*evq2)->nextq) {
     }
     *evq2 = evq;
     evq->nextq = NULL;
+    OS_EXIT_CRITICAL(sr);
 }
 
 void ble_npl_eventq_put(struct ble_npl_eventq *evq, struct ble_npl_event *ev) {
     DEBUG_EVENT_printf("ble_npl_eventq_put(%p, %p (%p, %p))\n", evq, ev, ev->fn, ev->arg);
+    os_sr_t sr;
+    OS_ENTER_CRITICAL(sr);
     ev->next = NULL;
+    ev->pending = true;
     if (evq->head == NULL) {
+        // Empty list, make this the first item.
         evq->head = ev;
         ev->prev = NULL;
     } else {
-        struct ble_npl_event *ev2 = evq->head;
+        // Find the tail of this list.
+        struct ble_npl_event *tail = evq->head;
         while (true) {
-            if (ev2 == ev) {
+            if (tail == ev) {
                 DEBUG_EVENT_printf("  --> already in queue\n");
-                return;
+                // Already in the list (e.g. a fragmented ACL will enqueue an
+                // event to process it for each fragment).
+                break;
             }
-            if (ev2->next == NULL) {
+            if (tail->next == NULL) {
+                // Found the end of the list, add this event as the tail.
+                tail->next = ev;
+                ev->prev = tail;
                 break;
             }
-            DEBUG_EVENT_printf("  --> %p\n", ev2->next);
-            ev2 = ev2->next;
+            DEBUG_EVENT_printf("  --> %p\n", tail->next);
+            tail = tail->next;
         }
-        ev2->next = ev;
-        ev->prev = ev2;
     }
+    OS_EXIT_CRITICAL(sr);
 }
 
 void ble_npl_event_init(struct ble_npl_event *ev, ble_npl_event_fn *fn, void *arg) {
@@ -243,6 +280,7 @@ void ble_npl_event_init(struct ble_npl_event *ev, ble_npl_event_fn *fn, void *ar
     ev->fn = fn;
     ev->arg = arg;
     ev->next = NULL;
+    ev->pending = false;
 }
 
 void *ble_npl_event_get_arg(struct ble_npl_event *ev) {
@@ -258,44 +296,17 @@ void ble_npl_event_set_arg(struct ble_npl_event *ev, void *arg) {
 /******************************************************************************/
 // MUTEX
 
-// This is what MICROPY_BEGIN_ATOMIC_SECTION returns on Unix (i.e. we don't
-// need to preserve the atomic state to unlock).
-#define ATOMIC_STATE_MUTEX_NOT_HELD 0xffffffff
-
 ble_npl_error_t ble_npl_mutex_init(struct ble_npl_mutex *mu) {
     DEBUG_MUTEX_printf("ble_npl_mutex_init(%p)\n", mu);
     mu->locked = 0;
-    mu->atomic_state = ATOMIC_STATE_MUTEX_NOT_HELD;
     return BLE_NPL_OK;
 }
 
 ble_npl_error_t ble_npl_mutex_pend(struct ble_npl_mutex *mu, ble_npl_time_t timeout) {
-    DEBUG_MUTEX_printf("ble_npl_mutex_pend(%p, %u) locked=%u irq=%d\n", mu, (uint)timeout, (uint)mu->locked);
+    DEBUG_MUTEX_printf("ble_npl_mutex_pend(%p, %u) locked=%u\n", mu, (uint)timeout, (uint)mu->locked);
 
-    // This is a recursive mutex which we implement on top of the IRQ priority
-    // scheme. Unfortunately we have a single piece of global storage, where
-    // enter/exit critical needs an "atomic state".
-
-    // There are two different acquirers, either running in a VM thread (i.e.
-    // a direct Python call into NimBLE), or in the NimBLE task (i.e. polling
-    // or UART RX).
-
-    // On STM32 the NimBLE task runs in PENDSV, so cannot be interrupted by a VM thread.
-    // Therefore we only need to ensure that a VM thread that acquires a currently-unlocked mutex
-    // now raises the priority (thus preventing context switches to other VM threads and
-    // the PENDSV irq). If the mutex is already locked, then it must have been acquired
-    // by us.
-
-    // On Unix, the critical section is completely recursive and doesn't require us to manage
-    // state so we just acquire and release every time.
-
-    // TODO: The "volatile" on locked/atomic_state isn't enough to protect against memory re-ordering.
-
-    // First acquirer of this mutex always enters the critical section, unless
-    // we're on Unix where it happens every time.
-    if (mu->atomic_state == ATOMIC_STATE_MUTEX_NOT_HELD) {
-        mu->atomic_state = mp_bluetooth_nimble_hci_uart_enter_critical();
-    }
+    // All NimBLE code is executed by the scheduler (and is therefore
+    // implicitly mutexed) so this mutex implementation is a no-op.
 
     ++mu->locked;
 
@@ -303,17 +314,11 @@ ble_npl_error_t ble_npl_mutex_pend(struct ble_npl_mutex *mu, ble_npl_time_t time
 }
 
 ble_npl_error_t ble_npl_mutex_release(struct ble_npl_mutex *mu) {
-    DEBUG_MUTEX_printf("ble_npl_mutex_release(%p) locked=%u irq=%d\n", mu, (uint)mu->locked);
+    DEBUG_MUTEX_printf("ble_npl_mutex_release(%p) locked=%u\n", mu, (uint)mu->locked);
     assert(mu->locked > 0);
 
     --mu->locked;
 
-    // Only exit the critical section for the final release, unless we're on Unix.
-    if (mu->locked == 0 || mu->atomic_state == ATOMIC_STATE_MUTEX_NOT_HELD) {
-        mp_bluetooth_nimble_hci_uart_exit_critical(mu->atomic_state);
-        mu->atomic_state = ATOMIC_STATE_MUTEX_NOT_HELD;
-    }
-
     return BLE_NPL_OK;
 }
 
@@ -329,30 +334,19 @@ ble_npl_error_t ble_npl_sem_init(struct ble_npl_sem *sem, uint16_t tokens) {
 ble_npl_error_t ble_npl_sem_pend(struct ble_npl_sem *sem, ble_npl_time_t timeout) {
     DEBUG_SEM_printf("ble_npl_sem_pend(%p, %u) count=%u\n", sem, (uint)timeout, (uint)sem->count);
 
-    // This is called by NimBLE to synchronously wait for an HCI ACK. The
-    // corresponding ble_npl_sem_release is called directly by the UART rx
-    // handler (i.e. hal_uart_rx_cb in extmod/nimble/hal/hal_uart.c).
-
-    // So this implementation just polls the UART until either the semaphore
-    // is released, or the timeout occurs.
+    // This is only called by NimBLE in ble_hs_hci_cmd_tx to synchronously
+    // wait for an HCI ACK. The corresponding ble_npl_sem_release is called
+    // directly by the UART rx handler (i.e. hal_uart_rx_cb in
+    // extmod/nimble/hal/hal_uart.c). So this loop needs to run only the HCI
+    // UART processing but not run any events.
 
     if (sem->count == 0) {
         uint32_t t0 = mp_hal_ticks_ms();
         while (sem->count == 0 && mp_hal_ticks_ms() - t0 < timeout) {
-            // This can be called either from code running in NimBLE's "task"
-            // (i.e. PENDSV) or directly by application code, so for the
-            // latter case, prevent the "task" from running while we poll the
-            // UART directly.
-            MICROPY_PY_BLUETOOTH_ENTER
-            mp_bluetooth_nimble_hci_uart_process();
-            MICROPY_PY_BLUETOOTH_EXIT
-
             if (sem->count != 0) {
                 break;
             }
 
-            // Because we're polling, might as well wait for a UART IRQ indicating
-            // more data available.
             mp_bluetooth_nimble_hci_uart_wfi();
         }
 
@@ -384,6 +378,8 @@ uint16_t ble_npl_sem_get_count(struct ble_npl_sem *sem) {
 static struct ble_npl_callout *global_callout = NULL;
 
 void mp_bluetooth_nimble_os_callout_process(void) {
+    os_sr_t sr;
+    OS_ENTER_CRITICAL(sr);
     uint32_t tnow = mp_hal_ticks_ms();
     for (struct ble_npl_callout *c = global_callout; c != NULL; c = c->nextc) {
         if (!c->active) {
@@ -393,17 +389,24 @@ void mp_bluetooth_nimble_os_callout_process(void) {
             DEBUG_CALLOUT_printf("callout_run(%p) tnow=%u ticks=%u evq=%p\n", c, (uint)tnow, (uint)c->ticks, c->evq);
             c->active = false;
             if (c->evq) {
+                // Enqueue this callout for execution in the event queue.
                 ble_npl_eventq_put(c->evq, &c->ev);
             } else {
+                // Execute this callout directly.
+                OS_EXIT_CRITICAL(sr);
                 c->ev.fn(&c->ev);
+                OS_ENTER_CRITICAL(sr);
             }
             DEBUG_CALLOUT_printf("callout_run(%p) done\n", c);
         }
     }
+    OS_EXIT_CRITICAL(sr);
 }
 
 void ble_npl_callout_init(struct ble_npl_callout *c, struct ble_npl_eventq *evq, ble_npl_event_fn *ev_cb, void *ev_arg) {
     DEBUG_CALLOUT_printf("ble_npl_callout_init(%p, %p, %p, %p)\n", c, evq, ev_cb, ev_arg);
+    os_sr_t sr;
+    OS_ENTER_CRITICAL(sr);
     c->active = false;
     c->ticks = 0;
     c->evq = evq;
@@ -413,17 +416,22 @@ void ble_npl_callout_init(struct ble_npl_callout *c, struct ble_npl_eventq *evq,
     for (c2 = &global_callout; *c2 != NULL; c2 = &(*c2)->nextc) {
         if (c == *c2) {
             // callout already in linked list so don't link it in again
+            OS_EXIT_CRITICAL(sr);
             return;
         }
     }
     *c2 = c;
     c->nextc = NULL;
+    OS_EXIT_CRITICAL(sr);
 }
 
 ble_npl_error_t ble_npl_callout_reset(struct ble_npl_callout *c, ble_npl_time_t ticks) {
     DEBUG_CALLOUT_printf("ble_npl_callout_reset(%p, %u) tnow=%u\n", c, (uint)ticks, (uint)mp_hal_ticks_ms());
+    os_sr_t sr;
+    OS_ENTER_CRITICAL(sr);
     c->active = true;
     c->ticks = ble_npl_time_get() + ticks;
+    OS_EXIT_CRITICAL(sr);
     return BLE_NPL_OK;
 }
 
@@ -493,23 +501,20 @@ void ble_npl_time_delay(ble_npl_time_t ticks) {
 // CRITICAL
 
 // This is used anywhere NimBLE modifies global data structures.
-// We need to protect between:
-//  - A MicroPython VM thread.
-//  - The NimBLE "task" (e.g. PENDSV on STM32, pthread on Unix).
-// On STM32, by disabling PENDSV, we ensure that either:
-//  - If we're in the NimBLE task, we're exclusive anyway.
-//  - If we're in a VM thread, we can't be interrupted by the NimBLE task, or switched to another thread.
-// On Unix, there's a global mutex.
 
-// TODO: Both ports currently use MICROPY_PY_BLUETOOTH_ENTER in their implementation,
-// maybe this doesn't need to be port-specific?
+// Currently all NimBLE code is invoked by the scheduler so there should be no
+// races, so on STM32 MICROPY_PY_BLUETOOTH_ENTER/MICROPY_PY_BLUETOOTH_EXIT are
+// no-ops. However, in the future we may wish to make HCI UART processing
+// happen asynchronously (e.g. on RX IRQ), so the port can implement these
+// macros accordingly.
 
 uint32_t ble_npl_hw_enter_critical(void) {
     DEBUG_CRIT_printf("ble_npl_hw_enter_critical()\n");
-    return mp_bluetooth_nimble_hci_uart_enter_critical();
+    MICROPY_PY_BLUETOOTH_ENTER
+    return atomic_state;
 }
 
-void ble_npl_hw_exit_critical(uint32_t ctx) {
-    DEBUG_CRIT_printf("ble_npl_hw_exit_critical(%u)\n", (uint)ctx);
-    mp_bluetooth_nimble_hci_uart_exit_critical(ctx);
+void ble_npl_hw_exit_critical(uint32_t atomic_state) {
+    MICROPY_PY_BLUETOOTH_EXIT
+    DEBUG_CRIT_printf("ble_npl_hw_exit_critical(%u)\n", (uint)atomic_state);
 }
diff --git a/extmod/nimble/nimble/nimble_npl_os.h b/extmod/nimble/nimble/nimble_npl_os.h
index 3ef07aa9ccd12..bfabe56e895c0 100644
--- a/extmod/nimble/nimble/nimble_npl_os.h
+++ b/extmod/nimble/nimble/nimble_npl_os.h
@@ -42,6 +42,7 @@ typedef int32_t ble_npl_stime_t;
 struct ble_npl_event {
     ble_npl_event_fn *fn;
     void *arg;
+    bool pending;
     struct ble_npl_event *prev;
     struct ble_npl_event *next;
 };
@@ -61,7 +62,6 @@ struct ble_npl_callout {
 
 struct ble_npl_mutex {
     volatile uint8_t locked;
-    volatile uint32_t atomic_state;
 };
 
 struct ble_npl_sem {
@@ -76,7 +76,5 @@ void mp_bluetooth_nimble_os_callout_process(void);
 // --- Must be provided by the MicroPython port -------------------------------
 
 void mp_bluetooth_nimble_hci_uart_wfi(void);
-uint32_t mp_bluetooth_nimble_hci_uart_enter_critical(void);
-void mp_bluetooth_nimble_hci_uart_exit_critical(uint32_t atomic_state);
 
 #endif // MICROPY_INCLUDED_STM32_NIMBLE_NIMBLE_NPL_OS_H
diff --git a/ports/stm32/main.c b/ports/stm32/main.c
index db8222479b0f6..d00c2ec713f61 100644
--- a/ports/stm32/main.c
+++ b/ports/stm32/main.c
@@ -433,8 +433,8 @@ void stm32_main(uint32_t reset_mode) {
     systick_enable_dispatch(SYSTICK_DISPATCH_LWIP, mod_network_lwip_poll_wrapper);
     #endif
     #if MICROPY_PY_BLUETOOTH
-    extern void mp_bluetooth_hci_poll_wrapper(uint32_t ticks_ms);
-    systick_enable_dispatch(SYSTICK_DISPATCH_BLUETOOTH_HCI, mp_bluetooth_hci_poll_wrapper);
+    extern void mp_bluetooth_hci_systick(uint32_t ticks_ms);
+    systick_enable_dispatch(SYSTICK_DISPATCH_BLUETOOTH_HCI, mp_bluetooth_hci_systick);
     #endif
 
     #if MICROPY_PY_NETWORK_CYW43
diff --git a/ports/stm32/mpbthciport.c b/ports/stm32/mpbthciport.c
index a5977ff12c210..ee9f4e31eb2ba 100644
--- a/ports/stm32/mpbthciport.c
+++ b/ports/stm32/mpbthciport.c
@@ -27,6 +27,7 @@
 #include "py/runtime.h"
 #include "py/mphal.h"
 #include "extmod/mpbthci.h"
+#include "extmod/modbluetooth.h"
 #include "systick.h"
 #include "pendsv.h"
 #include "lib/utils/mpirq.h"
@@ -35,23 +36,58 @@
 
 #if MICROPY_PY_BLUETOOTH
 
-#define DEBUG_printf(...) // printf(__VA_ARGS__)
+#define DEBUG_printf(...) // printf("mpbthciport.c: " __VA_ARGS__)
 
 uint8_t mp_bluetooth_hci_cmd_buf[4 + 256];
 
 // Must be provided by the stack bindings (e.g. mpnimbleport.c or mpbtstackport.c).
+// Request new data from the uart and pass to the stack, and run pending events/callouts.
 extern void mp_bluetooth_hci_poll(void);
 
 // Hook for pendsv poller to run this periodically every 128ms
 #define BLUETOOTH_HCI_TICK(tick) (((tick) & ~(SYSTICK_DISPATCH_NUM_SLOTS - 1) & 0x7f) == 0)
 
+#if MICROPY_PY_BLUETOOTH_USE_SYNC_EVENTS
+
+// For synchronous mode, we run all BLE stack code inside a scheduled task.
+// This task is scheduled periodically (every 128ms) via SysTick, or
+// immediately on HCI UART RXIDLE.
+
+// Prevent double-enqueuing of the scheduled task.
+STATIC volatile bool events_task_is_scheduled = false;
+
+STATIC mp_obj_t run_events_scheduled_task(mp_obj_t none_in) {
+    (void)none_in;
+    events_task_is_scheduled = false;
+    // This will process all buffered HCI UART data, and run any callouts or events.
+    mp_bluetooth_hci_poll();
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(run_events_scheduled_task_obj, run_events_scheduled_task);
+
+// Called periodically (systick) or directly (e.g. UART RX IRQ) in order to
+// request that processing happens ASAP in the scheduler.
+void mp_bluetooth_hci_systick(uint32_t ticks_ms) {
+    if (events_task_is_scheduled) {
+        return;
+    }
+
+    if (ticks_ms == 0 || BLUETOOTH_HCI_TICK(ticks_ms)) {
+        events_task_is_scheduled = mp_sched_schedule(MP_OBJ_FROM_PTR(&run_events_scheduled_task_obj), mp_const_none);
+    }
+}
+
+#else // !MICROPY_PY_BLUETOOTH_USE_SYNC_EVENTS
+
 // Called periodically (systick) or directly (e.g. uart irq).
-void mp_bluetooth_hci_poll_wrapper(uint32_t ticks_ms) {
+void mp_bluetooth_hci_systick(uint32_t ticks_ms) {
     if (ticks_ms == 0 || BLUETOOTH_HCI_TICK(ticks_ms)) {
         pendsv_schedule_dispatch(PENDSV_DISPATCH_BLUETOOTH_HCI, mp_bluetooth_hci_poll);
     }
 }
 
+#endif
+
 #if defined(STM32WB)
 
 /******************************************************************************/
@@ -67,13 +103,23 @@ STATIC uint8_t hci_uart_rx_buf_data[256];
 int mp_bluetooth_hci_uart_init(uint32_t port, uint32_t baudrate) {
     (void)port;
     (void)baudrate;
+
+    DEBUG_printf("mp_bluetooth_hci_uart_init (stm32 rfcore)\n");
+
+    #if MICROPY_PY_BLUETOOTH_USE_SYNC_EVENTS
+    events_task_is_scheduled = false;
+    #endif
+
     rfcore_ble_init();
     hci_uart_rx_buf_cur = 0;
     hci_uart_rx_buf_len = 0;
+
     return 0;
 }
 
 int mp_bluetooth_hci_uart_deinit(void) {
+    DEBUG_printf("mp_bluetooth_hci_uart_deinit (stm32 rfcore)\n");
+
     return 0;
 }
 
@@ -125,12 +171,12 @@ int mp_bluetooth_hci_uart_readchar(void) {
 pyb_uart_obj_t mp_bluetooth_hci_uart_obj;
 mp_irq_obj_t mp_bluetooth_hci_uart_irq_obj;
 
-static uint8_t hci_uart_rxbuf[512];
+static uint8_t hci_uart_rxbuf[768];
 
 mp_obj_t mp_uart_interrupt(mp_obj_t self_in) {
-    // DEBUG_printf("mp_uart_interrupt\n");
-    // New HCI data, schedule mp_bluetooth_hci_poll via PENDSV to make the stack handle it.
-    mp_bluetooth_hci_poll_wrapper(0);
+    // Queue up the scheduler to run the HCI UART and event processing ASAP.
+    mp_bluetooth_hci_systick(0);
+
     return mp_const_none;
 }
 MP_DEFINE_CONST_FUN_OBJ_1(mp_uart_interrupt_obj, mp_uart_interrupt);
@@ -138,6 +184,10 @@ MP_DEFINE_CONST_FUN_OBJ_1(mp_uart_interrupt_obj, mp_uart_interrupt);
 int mp_bluetooth_hci_uart_init(uint32_t port, uint32_t baudrate) {
     DEBUG_printf("mp_bluetooth_hci_uart_init (stm32)\n");
 
+    #if MICROPY_PY_BLUETOOTH_USE_SYNC_EVENTS
+    events_task_is_scheduled = false;
+    #endif
+
     // bits (8), stop (1), parity (none) and flow (rts/cts) are assumed to match MYNEWT_VAL_BLE_HCI_UART_ constants in syscfg.h.
     mp_bluetooth_hci_uart_obj.base.type = &pyb_uart_type;
     mp_bluetooth_hci_uart_obj.uart_id = port;
@@ -147,7 +197,7 @@ int mp_bluetooth_hci_uart_init(uint32_t port, uint32_t baudrate) {
     mp_bluetooth_hci_uart_obj.timeout_char = 200;
     MP_STATE_PORT(pyb_uart_obj_all)[mp_bluetooth_hci_uart_obj.uart_id - 1] = &mp_bluetooth_hci_uart_obj;
 
-    // This also initialises the UART.
+    // This also initialises the UART and adds the RXIDLE IRQ handler.
     mp_bluetooth_hci_uart_set_baudrate(baudrate);
 
     return 0;
@@ -155,6 +205,7 @@ int mp_bluetooth_hci_uart_init(uint32_t port, uint32_t baudrate) {
 
 int mp_bluetooth_hci_uart_deinit(void) {
     DEBUG_printf("mp_bluetooth_hci_uart_deinit (stm32)\n");
+
     // TODO: deinit mp_bluetooth_hci_uart_obj
 
     return 0;
diff --git a/ports/stm32/mpconfigport.h b/ports/stm32/mpconfigport.h
index 5f8e7ec2de1c1..b6906ef998c2e 100644
--- a/ports/stm32/mpconfigport.h
+++ b/ports/stm32/mpconfigport.h
@@ -420,9 +420,16 @@ static inline mp_uint_t disable_irq(void) {
 #define MICROPY_PY_LWIP_REENTER MICROPY_PY_PENDSV_REENTER
 #define MICROPY_PY_LWIP_EXIT    MICROPY_PY_PENDSV_EXIT
 
-// Prevent the "Bluetooth task" from running (either NimBLE or btstack).
+#if MICROPY_PY_BLUETOOTH_USE_SYNC_EVENTS
+// Bluetooth code only runs in the scheduler, no locking/mutex required.
+#define MICROPY_PY_BLUETOOTH_ENTER uint32_t atomic_state = 0;
+#define MICROPY_PY_BLUETOOTH_EXIT (void)atomic_state;
+#else
+// When async events are enabled, need to prevent PendSV execution racing with
+// scheduler execution.
 #define MICROPY_PY_BLUETOOTH_ENTER MICROPY_PY_PENDSV_ENTER
 #define MICROPY_PY_BLUETOOTH_EXIT  MICROPY_PY_PENDSV_EXIT
+#endif
 
 // We need an implementation of the log2 function which is not a macro
 #define MP_NEED_LOG2 (1)
diff --git a/ports/stm32/mpnimbleport.c b/ports/stm32/mpnimbleport.c
index 1d7c095139cde..0ba76fb277ea2 100644
--- a/ports/stm32/mpnimbleport.c
+++ b/ports/stm32/mpnimbleport.c
@@ -31,24 +31,29 @@
 
 #if MICROPY_PY_BLUETOOTH && MICROPY_BLUETOOTH_NIMBLE
 
+#define DEBUG_printf(...) // printf("mpnimbleport.c: " __VA_ARGS__)
+
 #include "host/ble_hs.h"
 #include "nimble/nimble_npl.h"
 
 #include "extmod/mpbthci.h"
+#include "extmod/modbluetooth.h"
 #include "extmod/nimble/modbluetooth_nimble.h"
 #include "extmod/nimble/hal/hal_uart.h"
 
-// This implements the Nimble "background task". It's called at PENDSV
-// priority, either every 128ms or whenever there's UART data available.
-// Because it's called via PENDSV, you can implicitly consider that it
-// is surrounded by MICROPY_PY_BLUETOOTH_ENTER / MICROPY_PY_BLUETOOTH_EXIT.
+// Get any pending data from the UART and send it to NimBLE's HCI buffers.
+// Any further processing by NimBLE will be run via its event queue.
 void mp_bluetooth_hci_poll(void) {
     if (mp_bluetooth_nimble_ble_state >= MP_BLUETOOTH_NIMBLE_BLE_STATE_WAITING_FOR_SYNC) {
-        // Ask NimBLE to process UART data.
-        mp_bluetooth_nimble_hci_uart_process();
+        // DEBUG_printf("mp_bluetooth_hci_poll_uart %d\n", mp_bluetooth_nimble_ble_state);
 
-        // Run pending background operations and events, but only after HCI sync.
+        // Run any timers.
         mp_bluetooth_nimble_os_callout_process();
+
+        // Process incoming UART data, and run events as they are generated.
+        mp_bluetooth_nimble_hci_uart_process(true);
+
+        // Run any remaining events (e.g. if there was no UART data).
         mp_bluetooth_nimble_os_eventq_run_all();
     }
 }
@@ -57,15 +62,10 @@ void mp_bluetooth_hci_poll(void) {
 
 void mp_bluetooth_nimble_hci_uart_wfi(void) {
     __WFI();
-}
-
-uint32_t mp_bluetooth_nimble_hci_uart_enter_critical(void) {
-    MICROPY_PY_BLUETOOTH_ENTER
-    return atomic_state;
-}
 
-void mp_bluetooth_nimble_hci_uart_exit_critical(uint32_t atomic_state) {
-    MICROPY_PY_BLUETOOTH_EXIT
+    // This is called while NimBLE is waiting in ble_npl_sem_pend, i.e. waiting for an HCI ACK.
+    // Do not need to run events here (it must not invoke Python code), only processing incoming HCI data.
+    mp_bluetooth_nimble_hci_uart_process(false);
 }
 
 #endif // MICROPY_PY_BLUETOOTH && MICROPY_BLUETOOTH_NIMBLE
diff --git a/ports/stm32/pendsv.h b/ports/stm32/pendsv.h
index 585f81e8bd441..aa8f90e3e428f 100644
--- a/ports/stm32/pendsv.h
+++ b/ports/stm32/pendsv.h
@@ -34,7 +34,7 @@ enum {
     PENDSV_DISPATCH_CYW43,
     #endif
     #endif
-    #if MICROPY_PY_BLUETOOTH
+    #if MICROPY_PY_BLUETOOTH && !MICROPY_PY_BLUETOOTH_USE_SYNC_EVENTS
     PENDSV_DISPATCH_BLUETOOTH_HCI,
     #endif
     PENDSV_DISPATCH_MAX
diff --git a/ports/stm32/rfcore.c b/ports/stm32/rfcore.c
index 1fc0c9531d03b..08338fcdc25c5 100644
--- a/ports/stm32/rfcore.c
+++ b/ports/stm32/rfcore.c
@@ -634,9 +634,9 @@ void IPCC_C1_RX_IRQHandler(void) {
 
         LL_C1_IPCC_ClearFlag_CHx(IPCC, IPCC_CH_BLE);
 
-        // Schedule PENDSV to process incoming HCI payload.
-        extern void mp_bluetooth_hci_poll_wrapper(uint32_t ticks_ms);
-        mp_bluetooth_hci_poll_wrapper(0);
+        // Queue up the scheduler to process UART data and run events.
+        extern void mp_bluetooth_hci_systick(uint32_t ticks_ms);
+        mp_bluetooth_hci_systick(0);
     }
 
     IRQ_EXIT(IPCC_C1_RX_IRQn);
diff --git a/ports/unix/mpbthciport.c b/ports/unix/mpbthciport.c
index 316a8831fe97b..14afbebcd7ec5 100644
--- a/ports/unix/mpbthciport.c
+++ b/ports/unix/mpbthciport.c
@@ -50,22 +50,67 @@
 
 uint8_t mp_bluetooth_hci_cmd_buf[4 + 256];
 
+STATIC int uart_fd = -1;
+
 // Must be provided by the stack bindings (e.g. mpnimbleport.c or mpbtstackport.c).
 extern bool mp_bluetooth_hci_poll(void);
 
-STATIC const useconds_t UART_POLL_INTERVAL_US = 1000;
+#if MICROPY_PY_BLUETOOTH_USE_SYNC_EVENTS
 
-STATIC int uart_fd = -1;
+// For synchronous mode, we run all BLE stack code inside a scheduled task.
+// This task is scheduled periodically (every 1ms) by a background thread.
+
+// Allows the stack to tell us that we should stop trying to schedule.
+extern bool mp_bluetooth_hci_active(void);
+
+// Prevent double-enqueuing of the scheduled task.
+STATIC volatile bool events_task_is_scheduled = false;
+
+STATIC mp_obj_t run_events_scheduled_task(mp_obj_t none_in) {
+    (void)none_in;
+    MICROPY_PY_BLUETOOTH_ENTER
+        events_task_is_scheduled = false;
+    MICROPY_PY_BLUETOOTH_EXIT
+    mp_bluetooth_hci_poll();
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(run_events_scheduled_task_obj, run_events_scheduled_task);
+
+#endif // MICROPY_PY_BLUETOOTH_USE_SYNC_EVENTS
+
+STATIC const useconds_t UART_POLL_INTERVAL_US = 1000;
 STATIC pthread_t hci_poll_thread_id;
 
 STATIC void *hci_poll_thread(void *arg) {
     (void)arg;
 
+    DEBUG_printf("hci_poll_thread: starting\n");
+
+    #if MICROPY_PY_BLUETOOTH_USE_SYNC_EVENTS
+
+    events_task_is_scheduled = false;
+
+    while (mp_bluetooth_hci_active()) {
+        MICROPY_PY_BLUETOOTH_ENTER
+        if (!events_task_is_scheduled) {
+            events_task_is_scheduled = mp_sched_schedule(MP_OBJ_FROM_PTR(&run_events_scheduled_task_obj), mp_const_none);
+        }
+        MICROPY_PY_BLUETOOTH_EXIT
+        usleep(UART_POLL_INTERVAL_US);
+    }
+
+    #else
+
+    // In asynchronous (i.e. ringbuffer) mode, we run the BLE stack directly from the thread.
     // This will return false when the stack is shutdown.
     while (mp_bluetooth_hci_poll()) {
         usleep(UART_POLL_INTERVAL_US);
     }
 
+    #endif
+
+    DEBUG_printf("hci_poll_thread: stopped\n");
+
     return NULL;
 }
 
@@ -122,6 +167,11 @@ int mp_bluetooth_hci_uart_init(uint32_t port, uint32_t baudrate) {
 
     DEBUG_printf("mp_bluetooth_hci_uart_init (unix)\n");
 
+    if (uart_fd != -1) {
+        DEBUG_printf("mp_bluetooth_hci_uart_init: already active\n");
+        return 0;
+    }
+
     char uart_device_name[256] = "/dev/ttyUSB0";
 
     char *path = getenv("MICROPYBTUART");
diff --git a/ports/unix/mpnimbleport.c b/ports/unix/mpnimbleport.c
index 8961910098c42..29f558f74db51 100644
--- a/ports/unix/mpnimbleport.c
+++ b/ports/unix/mpnimbleport.c
@@ -47,38 +47,28 @@ bool mp_bluetooth_hci_poll(void) {
     }
 
     if (mp_bluetooth_nimble_ble_state >= MP_BLUETOOTH_NIMBLE_BLE_STATE_WAITING_FOR_SYNC) {
+        // Run any timers.
+        mp_bluetooth_nimble_os_callout_process();
 
-        // Pretend like we're running in IRQ context (i.e. other things can't be running at the same time).
-        mp_uint_t atomic_state = MICROPY_BEGIN_ATOMIC_SECTION();
-
-        // Ask NimBLE to process UART data.
-        mp_bluetooth_nimble_hci_uart_process();
+        // Process incoming UART data, and run events as they are generated.
+        mp_bluetooth_nimble_hci_uart_process(true);
 
-        // Run pending background operations and events, but only after HCI sync.
-        mp_bluetooth_nimble_os_callout_process();
+        // Run any remaining events (e.g. if there was no UART data).
         mp_bluetooth_nimble_os_eventq_run_all();
-
-        MICROPY_END_ATOMIC_SECTION(atomic_state);
     }
 
     return true;
 }
 
-// Extra port-specific helpers.
-void mp_bluetooth_nimble_hci_uart_wfi(void) {
-    // DEBUG_printf("mp_bluetooth_nimble_hci_uart_wfi\n");
-    // TODO: this should do a select() on the uart_fd.
-}
-
-uint32_t mp_bluetooth_nimble_hci_uart_enter_critical(void) {
-    // DEBUG_printf("mp_bluetooth_nimble_hci_uart_enter_critical\n");
-    MICROPY_PY_BLUETOOTH_ENTER
-    return atomic_state; // Always 0xffffffff
+bool mp_bluetooth_hci_active(void) {
+    return mp_bluetooth_nimble_ble_state != MP_BLUETOOTH_NIMBLE_BLE_STATE_OFF;
 }
 
-void mp_bluetooth_nimble_hci_uart_exit_critical(uint32_t atomic_state) {
-    MICROPY_PY_BLUETOOTH_EXIT
-    // DEBUG_printf("mp_bluetooth_nimble_hci_uart_exit_critical\n");
+// Extra port-specific helpers.
+void mp_bluetooth_nimble_hci_uart_wfi(void) {
+    // This is called while NimBLE is waiting in ble_npl_sem_pend, i.e. waiting for an HCI ACK.
+    // Do not need to run events here, only processing incoming HCI data.
+    mp_bluetooth_nimble_hci_uart_process(false);
 }
 
 #endif // MICROPY_PY_BLUETOOTH && MICROPY_BLUETOOTH_NIMBLE

From 7e75245d549d01ac4f01ee615c193c00cf3269a7 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Thu, 12 Nov 2020 23:05:47 +1100
Subject: [PATCH 0411/3533] tests/multi_bluetooth: Change dict index-and-del to
 pop, to clear event.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 tests/multi_bluetooth/ble_characteristic.py          | 4 +---
 tests/multi_bluetooth/ble_gap_connect.py             | 4 +---
 tests/multi_bluetooth/ble_gap_device_name.py         | 4 +---
 tests/multi_bluetooth/ble_gatt_data_transfer.py      | 4 +---
 tests/multi_bluetooth/ble_gattc_discover_services.py | 4 +---
 tests/multi_bluetooth/ble_mtu.py                     | 4 +---
 6 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/tests/multi_bluetooth/ble_characteristic.py b/tests/multi_bluetooth/ble_characteristic.py
index 0f22daff88f0a..327822a01ee15 100644
--- a/tests/multi_bluetooth/ble_characteristic.py
+++ b/tests/multi_bluetooth/ble_characteristic.py
@@ -77,9 +77,7 @@ def wait_for_event(event, timeout_ms):
     t0 = time.ticks_ms()
     while time.ticks_diff(time.ticks_ms(), t0) < timeout_ms:
         if event in waiting_events:
-            result = waiting_events[event]
-            del waiting_events[event]
-            return result
+            return waiting_events.pop(event)
         machine.idle()
     raise ValueError("Timeout waiting for {}".format(event))
 
diff --git a/tests/multi_bluetooth/ble_gap_connect.py b/tests/multi_bluetooth/ble_gap_connect.py
index 2c1d2cbbc55dc..95d1be7baa2e4 100644
--- a/tests/multi_bluetooth/ble_gap_connect.py
+++ b/tests/multi_bluetooth/ble_gap_connect.py
@@ -33,9 +33,7 @@ def wait_for_event(event, timeout_ms):
     t0 = time.ticks_ms()
     while time.ticks_diff(time.ticks_ms(), t0) < timeout_ms:
         if event in waiting_events:
-            result = waiting_events[event]
-            del waiting_events[event]
-            return result
+            return waiting_events.pop(event)
         machine.idle()
     raise ValueError("Timeout waiting for {}".format(event))
 
diff --git a/tests/multi_bluetooth/ble_gap_device_name.py b/tests/multi_bluetooth/ble_gap_device_name.py
index e7202170bd8a4..556068114bbbc 100644
--- a/tests/multi_bluetooth/ble_gap_device_name.py
+++ b/tests/multi_bluetooth/ble_gap_device_name.py
@@ -49,9 +49,7 @@ def wait_for_event(event, timeout_ms):
     t0 = time.ticks_ms()
     while time.ticks_diff(time.ticks_ms(), t0) < timeout_ms:
         if event in waiting_events:
-            result = waiting_events[event]
-            del waiting_events[event]
-            return result
+            return waiting_events.pop(event)
         machine.idle()
     raise ValueError("Timeout waiting for {}".format(event))
 
diff --git a/tests/multi_bluetooth/ble_gatt_data_transfer.py b/tests/multi_bluetooth/ble_gatt_data_transfer.py
index e8249b3da8962..861cb49fc34f2 100644
--- a/tests/multi_bluetooth/ble_gatt_data_transfer.py
+++ b/tests/multi_bluetooth/ble_gatt_data_transfer.py
@@ -76,9 +76,7 @@ def wait_for_event(event, timeout_ms):
     t0 = time.ticks_ms()
     while time.ticks_diff(time.ticks_ms(), t0) < timeout_ms:
         if event in waiting_events:
-            result = waiting_events[event]
-            del waiting_events[event]
-            return result
+            return waiting_events.pop(event)
         machine.idle()
     raise ValueError("Timeout waiting for {}".format(event))
 
diff --git a/tests/multi_bluetooth/ble_gattc_discover_services.py b/tests/multi_bluetooth/ble_gattc_discover_services.py
index 00bb94bba0ba8..f6ee5fa00e1fa 100644
--- a/tests/multi_bluetooth/ble_gattc_discover_services.py
+++ b/tests/multi_bluetooth/ble_gattc_discover_services.py
@@ -55,9 +55,7 @@ def wait_for_event(event, timeout_ms):
     t0 = time.ticks_ms()
     while time.ticks_diff(time.ticks_ms(), t0) < timeout_ms:
         if event in waiting_events:
-            result = waiting_events[event]
-            del waiting_events[event]
-            return result
+            return waiting_events.pop(event)
         machine.idle()
     raise ValueError("Timeout waiting for {}".format(event))
 
diff --git a/tests/multi_bluetooth/ble_mtu.py b/tests/multi_bluetooth/ble_mtu.py
index 73c77e2460c65..f202ec764de9b 100644
--- a/tests/multi_bluetooth/ble_mtu.py
+++ b/tests/multi_bluetooth/ble_mtu.py
@@ -87,9 +87,7 @@ def wait_for_event(event, timeout_ms):
     t0 = time.ticks_ms()
     while time.ticks_diff(time.ticks_ms(), t0) < timeout_ms:
         if event in waiting_events:
-            result = waiting_events[event]
-            del waiting_events[event]
-            return result
+            return waiting_events.pop(event)
         machine.idle()
     raise ValueError("Timeout waiting for {}".format(event))
 

From efc0800132f7c85a55718ba71f5d2729d244f85f Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Wed, 4 Nov 2020 12:54:46 +1100
Subject: [PATCH 0412/3533] tests/multi_bluetooth: Add a test for WB55
 concurrent flash access.

This test currently passes on Unix/PYBD, but fails on WB55 because it lacks
synchronisation of the internal flash.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 .../multi_bluetooth/stress_log_filesystem.py  | 188 ++++++++++++++++++
 .../stress_log_filesystem.py.exp              |  84 ++++++++
 2 files changed, 272 insertions(+)
 create mode 100644 tests/multi_bluetooth/stress_log_filesystem.py
 create mode 100644 tests/multi_bluetooth/stress_log_filesystem.py.exp

diff --git a/tests/multi_bluetooth/stress_log_filesystem.py b/tests/multi_bluetooth/stress_log_filesystem.py
new file mode 100644
index 0000000000000..83df555ce4d8f
--- /dev/null
+++ b/tests/multi_bluetooth/stress_log_filesystem.py
@@ -0,0 +1,188 @@
+# Test concurrency between filesystem access and BLE host. This is
+# particularly relevant on STM32WB where the second core is stalled while
+# flash operations are in progress.
+
+from micropython import const
+import time, machine, bluetooth, os
+
+TIMEOUT_MS = 10000
+
+LOG_PATH_INSTANCE0 = "stress_log_filesystem_0.log"
+LOG_PATH_INSTANCE1 = "stress_log_filesystem_1.log"
+
+_IRQ_CENTRAL_CONNECT = const(1)
+_IRQ_CENTRAL_DISCONNECT = const(2)
+_IRQ_GATTS_WRITE = const(3)
+_IRQ_GATTS_READ_REQUEST = const(4)
+_IRQ_PERIPHERAL_CONNECT = const(7)
+_IRQ_PERIPHERAL_DISCONNECT = const(8)
+_IRQ_GATTC_SERVICE_RESULT = const(9)
+_IRQ_GATTC_SERVICE_DONE = const(10)
+_IRQ_GATTC_CHARACTERISTIC_RESULT = const(11)
+_IRQ_GATTC_CHARACTERISTIC_DONE = const(12)
+_IRQ_GATTC_READ_RESULT = const(15)
+_IRQ_GATTC_READ_DONE = const(16)
+_IRQ_GATTC_WRITE_DONE = const(17)
+
+SERVICE_UUID = bluetooth.UUID("A5A5A5A5-FFFF-9999-1111-5A5A5A5A5A5A")
+CHAR_UUID = bluetooth.UUID("00000000-1111-2222-3333-444444444444")
+CHAR = (
+    CHAR_UUID,
+    bluetooth.FLAG_READ | bluetooth.FLAG_WRITE | bluetooth.FLAG_NOTIFY | bluetooth.FLAG_INDICATE,
+)
+SERVICE = (
+    SERVICE_UUID,
+    (CHAR,),
+)
+SERVICES = (SERVICE,)
+
+
+waiting_events = {}
+log_file = None
+
+
+def write_log(*args):
+    if log_file:
+        print(*args, file=log_file)
+        log_file.flush()
+
+
+last_file_write = 0
+
+
+def periodic_log_write():
+    global last_file_write
+    t = time.ticks_ms()
+    if time.ticks_diff(t, last_file_write) > 50:
+        write_log("tick")
+        last_file_write = t
+
+
+def irq(event, data):
+    write_log("event", event)
+
+    if event == _IRQ_CENTRAL_CONNECT:
+        print("_IRQ_CENTRAL_CONNECT")
+        waiting_events[event] = data[0]
+    elif event == _IRQ_CENTRAL_DISCONNECT:
+        print("_IRQ_CENTRAL_DISCONNECT")
+    elif event == _IRQ_PERIPHERAL_CONNECT:
+        print("_IRQ_PERIPHERAL_CONNECT")
+        waiting_events[event] = data[0]
+    elif event == _IRQ_PERIPHERAL_DISCONNECT:
+        print("_IRQ_PERIPHERAL_DISCONNECT")
+    elif event == _IRQ_GATTC_SERVICE_RESULT:
+        # conn_handle, start_handle, end_handle, uuid = data
+        if data[-1] == SERVICE_UUID:
+            print("_IRQ_GATTC_SERVICE_RESULT", data[3])
+            waiting_events[event] = (data[1], data[2])
+        else:
+            return
+    elif event == _IRQ_GATTC_SERVICE_DONE:
+        print("_IRQ_GATTC_SERVICE_DONE")
+    elif event == _IRQ_GATTC_CHARACTERISTIC_RESULT:
+        # conn_handle, def_handle, value_handle, properties, uuid = data
+        if data[-1] == CHAR_UUID:
+            print("_IRQ_GATTC_CHARACTERISTIC_RESULT", data[-1])
+            waiting_events[event] = data[2]
+        else:
+            return
+    elif event == _IRQ_GATTC_CHARACTERISTIC_DONE:
+        print("_IRQ_GATTC_CHARACTERISTIC_DONE")
+    elif event == _IRQ_GATTC_READ_RESULT:
+        print("_IRQ_GATTC_READ_RESULT", bytes(data[-1]))
+    elif event == _IRQ_GATTC_READ_DONE:
+        print("_IRQ_GATTC_READ_DONE", data[-1])
+    elif event == _IRQ_GATTC_WRITE_DONE:
+        print("_IRQ_GATTC_WRITE_DONE", data[-1])
+    elif event == _IRQ_GATTS_WRITE:
+        print("_IRQ_GATTS_WRITE")
+    elif event == _IRQ_GATTS_READ_REQUEST:
+        print("_IRQ_GATTS_READ_REQUEST")
+
+    if event not in waiting_events:
+        waiting_events[event] = None
+
+
+def wait_for_event(event, timeout_ms):
+    t0 = time.ticks_ms()
+    while time.ticks_diff(time.ticks_ms(), t0) < timeout_ms:
+        periodic_log_write()
+        if event in waiting_events:
+            return waiting_events.pop(event)
+        machine.idle()
+    raise ValueError("Timeout waiting for {}".format(event))
+
+
+# Acting in peripheral role.
+def instance0():
+    global log_file
+    log_file = open(LOG_PATH_INSTANCE0, "w")
+    write_log("start")
+    ble.active(1)
+    ble.irq(irq)
+    multitest.globals(BDADDR=ble.config("mac"))
+    ((char_handle,),) = ble.gatts_register_services(SERVICES)
+    multitest.next()
+    try:
+        for repeat in range(2):
+            print("gap_advertise")
+            ble.gap_advertise(50_000, b"\x02\x01\x06\x04\xffMPY")
+            # Wait for central to connect, do a sequence of read/write, then disconnect.
+            wait_for_event(_IRQ_CENTRAL_CONNECT, TIMEOUT_MS)
+            for op in range(4):
+                wait_for_event(_IRQ_GATTS_READ_REQUEST, TIMEOUT_MS)
+                wait_for_event(_IRQ_GATTS_WRITE, TIMEOUT_MS)
+            wait_for_event(_IRQ_CENTRAL_DISCONNECT, 2 * TIMEOUT_MS)
+    finally:
+        ble.active(0)
+        log_file.close()
+        os.unlink(LOG_PATH_INSTANCE0)
+
+
+# Acting in central role.
+def instance1():
+    global log_file
+    log_file = open(LOG_PATH_INSTANCE1, "w")
+    write_log("start")
+    ble.active(1)
+    ble.irq(irq)
+    multitest.next()
+    try:
+        for repeat in range(2):
+            # Connect to peripheral and then disconnect.
+            print("gap_connect")
+            ble.gap_connect(BDADDR[0], BDADDR[1], 5000)
+            conn_handle = wait_for_event(_IRQ_PERIPHERAL_CONNECT, TIMEOUT_MS)
+
+            # Discover services.
+            print("gattc_discover_services")
+            ble.gattc_discover_services(conn_handle)
+            start_handle, end_handle = wait_for_event(_IRQ_GATTC_SERVICE_RESULT, TIMEOUT_MS)
+            wait_for_event(_IRQ_GATTC_SERVICE_DONE, TIMEOUT_MS)
+
+            # Discover characteristics.
+            print("gattc_discover_characteristics")
+            ble.gattc_discover_characteristics(conn_handle, start_handle, end_handle)
+            value_handle = wait_for_event(_IRQ_GATTC_CHARACTERISTIC_RESULT, TIMEOUT_MS)
+            wait_for_event(_IRQ_GATTC_CHARACTERISTIC_DONE, TIMEOUT_MS)
+
+            for op in range(4):
+                print("gattc_read")
+                ble.gattc_read(conn_handle, value_handle)
+                wait_for_event(_IRQ_GATTC_READ_RESULT, TIMEOUT_MS)
+                wait_for_event(_IRQ_GATTC_READ_DONE, TIMEOUT_MS)
+                print("gattc_write")
+                ble.gattc_write(conn_handle, value_handle, "{}".format(op), 1)
+                wait_for_event(_IRQ_GATTC_WRITE_DONE, TIMEOUT_MS)
+
+            # Disconnect.
+            print("gap_disconnect:", ble.gap_disconnect(conn_handle))
+            wait_for_event(_IRQ_PERIPHERAL_DISCONNECT, 2 * TIMEOUT_MS)
+    finally:
+        ble.active(0)
+        log_file.close()
+        os.unlink(LOG_PATH_INSTANCE1)
+
+
+ble = bluetooth.BLE()
diff --git a/tests/multi_bluetooth/stress_log_filesystem.py.exp b/tests/multi_bluetooth/stress_log_filesystem.py.exp
new file mode 100644
index 0000000000000..8e1144b78748e
--- /dev/null
+++ b/tests/multi_bluetooth/stress_log_filesystem.py.exp
@@ -0,0 +1,84 @@
+--- instance0 ---
+gap_advertise
+_IRQ_CENTRAL_CONNECT
+_IRQ_GATTS_READ_REQUEST
+_IRQ_GATTS_WRITE
+_IRQ_GATTS_READ_REQUEST
+_IRQ_GATTS_WRITE
+_IRQ_GATTS_READ_REQUEST
+_IRQ_GATTS_WRITE
+_IRQ_GATTS_READ_REQUEST
+_IRQ_GATTS_WRITE
+_IRQ_CENTRAL_DISCONNECT
+gap_advertise
+_IRQ_CENTRAL_CONNECT
+_IRQ_GATTS_READ_REQUEST
+_IRQ_GATTS_WRITE
+_IRQ_GATTS_READ_REQUEST
+_IRQ_GATTS_WRITE
+_IRQ_GATTS_READ_REQUEST
+_IRQ_GATTS_WRITE
+_IRQ_GATTS_READ_REQUEST
+_IRQ_GATTS_WRITE
+_IRQ_CENTRAL_DISCONNECT
+--- instance1 ---
+gap_connect
+_IRQ_PERIPHERAL_CONNECT
+gattc_discover_services
+_IRQ_GATTC_SERVICE_RESULT UUID('a5a5a5a5-ffff-9999-1111-5a5a5a5a5a5a')
+_IRQ_GATTC_SERVICE_DONE
+gattc_discover_characteristics
+_IRQ_GATTC_CHARACTERISTIC_RESULT UUID('00000000-1111-2222-3333-444444444444')
+_IRQ_GATTC_CHARACTERISTIC_DONE
+gattc_read
+_IRQ_GATTC_READ_RESULT b''
+_IRQ_GATTC_READ_DONE 0
+gattc_write
+_IRQ_GATTC_WRITE_DONE 0
+gattc_read
+_IRQ_GATTC_READ_RESULT b'0'
+_IRQ_GATTC_READ_DONE 0
+gattc_write
+_IRQ_GATTC_WRITE_DONE 0
+gattc_read
+_IRQ_GATTC_READ_RESULT b'1'
+_IRQ_GATTC_READ_DONE 0
+gattc_write
+_IRQ_GATTC_WRITE_DONE 0
+gattc_read
+_IRQ_GATTC_READ_RESULT b'2'
+_IRQ_GATTC_READ_DONE 0
+gattc_write
+_IRQ_GATTC_WRITE_DONE 0
+gap_disconnect: True
+_IRQ_PERIPHERAL_DISCONNECT
+gap_connect
+_IRQ_PERIPHERAL_CONNECT
+gattc_discover_services
+_IRQ_GATTC_SERVICE_RESULT UUID('a5a5a5a5-ffff-9999-1111-5a5a5a5a5a5a')
+_IRQ_GATTC_SERVICE_DONE
+gattc_discover_characteristics
+_IRQ_GATTC_CHARACTERISTIC_RESULT UUID('00000000-1111-2222-3333-444444444444')
+_IRQ_GATTC_CHARACTERISTIC_DONE
+gattc_read
+_IRQ_GATTC_READ_RESULT b'3'
+_IRQ_GATTC_READ_DONE 0
+gattc_write
+_IRQ_GATTC_WRITE_DONE 0
+gattc_read
+_IRQ_GATTC_READ_RESULT b'0'
+_IRQ_GATTC_READ_DONE 0
+gattc_write
+_IRQ_GATTC_WRITE_DONE 0
+gattc_read
+_IRQ_GATTC_READ_RESULT b'1'
+_IRQ_GATTC_READ_DONE 0
+gattc_write
+_IRQ_GATTC_WRITE_DONE 0
+gattc_read
+_IRQ_GATTC_READ_RESULT b'2'
+_IRQ_GATTC_READ_DONE 0
+gattc_write
+_IRQ_GATTC_WRITE_DONE 0
+gap_disconnect: True
+_IRQ_PERIPHERAL_DISCONNECT

From a64121b0d48ccd2d7212b6ff996d730eb85bfaad Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Wed, 4 Nov 2020 14:37:16 +1100
Subject: [PATCH 0413/3533] stm32/rfcore: Make RX IRQ schedule the NimBLE
 handler.

This commit switches the STM32WB HCI interface (between the two CPUs) to
require the use of MICROPY_PY_BLUETOOTH_USE_SYNC_EVENTS, and as a
consequence to require NimBLE.  IPCC RX IRQs now schedule the NimBLE
handler to run via mp_sched_schedule.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/stm32/rfcore.c | 34 +++++++++++++++-------------------
 1 file changed, 15 insertions(+), 19 deletions(-)

diff --git a/ports/stm32/rfcore.c b/ports/stm32/rfcore.c
index 08338fcdc25c5..550e5323e8526 100644
--- a/ports/stm32/rfcore.c
+++ b/ports/stm32/rfcore.c
@@ -31,6 +31,7 @@
 #include "py/mperrno.h"
 #include "py/mphal.h"
 #include "py/runtime.h"
+#include "extmod/modbluetooth.h"
 #include "rtc.h"
 #include "rfcore.h"
 
@@ -40,6 +41,10 @@
 
 #define DEBUG_printf(...) // printf("rfcore: " __VA_ARGS__)
 
+#if !MICROPY_PY_BLUETOOTH_USE_SYNC_EVENTS
+#error "STM32WB must use synchronous events in the BLE implementation."
+#endif
+
 // Define to 1 to print traces of HCI packets
 #define HCI_TRACE (0)
 
@@ -191,9 +196,6 @@ STATIC uint8_t ipcc_membuf_ble_cs_buf[272]; // mem2
 STATIC tl_list_node_t ipcc_mem_ble_evt_queue; // mem1
 STATIC uint8_t ipcc_membuf_ble_hci_acl_data_buf[272]; // mem2
 
-// Set by the RX IRQ handler on incoming HCI payload.
-STATIC volatile bool had_ble_irq = false;
-
 /******************************************************************************/
 // Transport layer linked list
 
@@ -408,6 +410,7 @@ STATIC void tl_process_msg(volatile tl_list_node_t *head, unsigned int ch, parse
     }
 }
 
+// Only call this when IRQs are disabled on this channel.
 STATIC void tl_check_msg(volatile tl_list_node_t *head, unsigned int ch, parse_hci_info_t *parse) {
     if (LL_C2_IPCC_IsActiveFlag_CHx(IPCC, ch)) {
         tl_process_msg(head, ch, parse);
@@ -417,14 +420,6 @@ STATIC void tl_check_msg(volatile tl_list_node_t *head, unsigned int ch, parse_h
     }
 }
 
-STATIC void tl_check_msg_ble(volatile tl_list_node_t *head, parse_hci_info_t *parse) {
-    if (had_ble_irq) {
-        tl_process_msg(head, IPCC_CH_BLE, parse);
-
-        had_ble_irq = false;
-    }
-}
-
 STATIC void tl_hci_cmd(uint8_t *cmd, unsigned int ch, uint8_t hdr, uint16_t opcode, const uint8_t *buf, size_t len) {
     tl_list_node_t *n = (tl_list_node_t *)cmd;
     n->next = n;
@@ -472,7 +467,7 @@ STATIC ssize_t tl_sys_hci_cmd_resp(uint16_t opcode, const uint8_t *buf, size_t l
 
 STATIC int tl_ble_wait_resp(void) {
     uint32_t t0 = mp_hal_ticks_ms();
-    while (!had_ble_irq) {
+    while (!LL_C2_IPCC_IsActiveFlag_CHx(IPCC, IPCC_CH_BLE)) {
         if (mp_hal_ticks_ms() - t0 > BLE_ACK_TIMEOUT_MS) {
             printf("tl_ble_wait_resp: timeout\n");
             return -MP_ETIMEDOUT;
@@ -480,14 +475,16 @@ STATIC int tl_ble_wait_resp(void) {
     }
 
     // C2 set IPCC flag.
-    tl_check_msg_ble(&ipcc_mem_ble_evt_queue, NULL);
+    tl_check_msg(&ipcc_mem_ble_evt_queue, IPCC_CH_BLE, NULL);
     return 0;
 }
 
 // Synchronously send a BLE command.
 STATIC void tl_ble_hci_cmd_resp(uint16_t opcode, const uint8_t *buf, size_t len) {
+    LL_C1_IPCC_DisableReceiveChannel(IPCC, IPCC_CH_BLE);
     tl_hci_cmd(ipcc_membuf_ble_cmd_buf, IPCC_CH_BLE, HCI_KIND_BT_CMD, opcode, buf, len);
     tl_ble_wait_resp();
+    LL_C1_IPCC_EnableReceiveChannel(IPCC, IPCC_CH_BLE);
 }
 
 /******************************************************************************/
@@ -554,11 +551,10 @@ static const struct {
 void rfcore_ble_init(void) {
     DEBUG_printf("rfcore_ble_init\n");
 
-    // Clear any outstanding messages from ipcc_init
+    // Clear any outstanding messages from ipcc_init.
     tl_check_msg(&ipcc_mem_sys_queue, IPCC_CH_SYS, NULL);
-    tl_check_msg_ble(&ipcc_mem_ble_evt_queue, NULL);
 
-    // Configure and reset the BLE controller
+    // Configure and reset the BLE controller.
     tl_sys_hci_cmd_resp(HCI_OPCODE(OGF_VENDOR, OCF_BLE_INIT), (const uint8_t *)&ble_init_params, sizeof(ble_init_params), 0);
     tl_ble_hci_cmd_resp(HCI_OPCODE(0x03, 0x0003), NULL, 0);
 }
@@ -597,7 +593,7 @@ void rfcore_ble_hci_cmd(size_t len, const uint8_t *src) {
 
 void rfcore_ble_check_msg(int (*cb)(void *, const uint8_t *, size_t), void *env) {
     parse_hci_info_t parse = { cb, env, false };
-    tl_check_msg_ble(&ipcc_mem_ble_evt_queue, &parse);
+    tl_process_msg(&ipcc_mem_ble_evt_queue, IPCC_CH_BLE, &parse);
 
     // Intercept HCI_Reset events and reconfigure the controller following the reset
     if (parse.was_hci_reset_evt) {
@@ -629,9 +625,9 @@ void IPCC_C1_TX_IRQHandler(void) {
 void IPCC_C1_RX_IRQHandler(void) {
     IRQ_ENTER(IPCC_C1_RX_IRQn);
 
-    if (LL_C2_IPCC_IsActiveFlag_CHx(IPCC, IPCC_CH_BLE)) {
-        had_ble_irq = true;
+    DEBUG_printf("IPCC_C1_RX_IRQHandler\n");
 
+    if (LL_C2_IPCC_IsActiveFlag_CHx(IPCC, IPCC_CH_BLE)) {
         LL_C1_IPCC_ClearFlag_CHx(IPCC, IPCC_CH_BLE);
 
         // Queue up the scheduler to process UART data and run events.

From 119c88ef17c390e43828b825c3df99ffc1dc39b9 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Wed, 4 Nov 2020 15:29:31 +1100
Subject: [PATCH 0414/3533] stm32/flash: Implement WB55 flash locking.

This is needed to moderate concurrent access to the internal flash, as
while an erase/write is in progress execution will stall on the wireless
core due to the bus being locked.

This implements Figure 10 from AN5289 Rev 3.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/stm32/flash.c                | 93 ++++++++++++++++++++++++++++++
 ports/stm32/mboot/Makefile         |  1 +
 ports/stm32/mpconfigboard_common.h |  4 ++
 ports/stm32/rfcore.c               | 24 ++++++--
 ports/stm32/rfcore.h               |  3 +
 5 files changed, 121 insertions(+), 4 deletions(-)

diff --git a/ports/stm32/flash.c b/ports/stm32/flash.c
index 499129a6f3e5d..d399ece866e99 100644
--- a/ports/stm32/flash.c
+++ b/ports/stm32/flash.c
@@ -29,6 +29,21 @@
 #include "py/mphal.h"
 #include "flash.h"
 
+#if MICROPY_HW_STM32WB_FLASH_SYNCRONISATION
+// See WB55 specific documentation in AN5289 Rev 3, and in particular, Figure 10.
+
+#include "rfcore.h"
+#include "stm32wbxx_ll_hsem.h"
+
+// Protects all flash registers.
+#define SEMID_FLASH_REGISTERS (2)
+// Used by CPU1 to prevent CPU2 from writing/erasing data in flash memory.
+#define SEMID_FLASH_CPU1 (6)
+// Used by CPU2 to prevent CPU1 from writing/erasing data in flash memory.
+#define SEMID_FLASH_CPU2 (7)
+
+#endif
+
 typedef struct {
     uint32_t base_address;
     uint32_t sector_size;
@@ -181,9 +196,27 @@ int flash_erase(uint32_t flash_dest, uint32_t num_word32) {
         return 0;
     }
 
+    #if MICROPY_HW_STM32WB_FLASH_SYNCRONISATION
+    // Acquire lock on the flash peripheral.
+    while (LL_HSEM_1StepLock(HSEM, SEMID_FLASH_REGISTERS)) {
+    }
+    #endif
+
     // Unlock the flash for erase.
     HAL_FLASH_Unlock();
 
+    #if MICROPY_HW_STM32WB_FLASH_SYNCRONISATION
+    // Tell the HCI controller stack we're starting an erase, so it
+    // avoids radio activity for a while.
+    rfcore_start_flash_erase();
+    // Wait for PES.
+    while (LL_FLASH_IsActiveFlag_OperationSuspended()) {
+    }
+    // Wait for flash lock.
+    while (LL_HSEM_1StepLock(HSEM, SEMID_FLASH_CPU2)) {
+    }
+    #endif
+
     // Clear pending flags (if any) and set up EraseInitStruct.
 
     FLASH_EraseInitTypeDef EraseInitStruct;
@@ -233,9 +266,23 @@ int flash_erase(uint32_t flash_dest, uint32_t num_word32) {
     uint32_t SectorError = 0;
     HAL_StatusTypeDef status = HAL_FLASHEx_Erase(&EraseInitStruct, &SectorError);
 
+    #if MICROPY_HW_STM32WB_FLASH_SYNCRONISATION
+    // Release flash lock.
+    while (__HAL_FLASH_GET_FLAG(FLASH_FLAG_CFGBSY)) {
+    }
+    LL_HSEM_ReleaseLock(HSEM, SEMID_FLASH_CPU2, 0);
+    // Tell HCI controller that erase is over.
+    rfcore_end_flash_erase();
+    #endif
+
     // Lock the flash after erase.
     HAL_FLASH_Lock();
 
+    #if MICROPY_HW_STM32WB_FLASH_SYNCRONISATION
+    // Release lock on the flash peripheral.
+    LL_HSEM_ReleaseLock(HSEM, SEMID_FLASH_REGISTERS, 0);
+    #endif
+
     return mp_hal_status_to_neg_errno(status);
 }
 
@@ -269,9 +316,21 @@ void flash_erase_it(uint32_t flash_dest, uint32_t num_word32) {
 */
 
 int flash_write(uint32_t flash_dest, const uint32_t *src, uint32_t num_word32) {
+    #if MICROPY_HW_STM32WB_FLASH_SYNCRONISATION
+    // Acquire lock on the flash peripheral.
+    while (LL_HSEM_1StepLock(HSEM, SEMID_FLASH_REGISTERS)) {
+    }
+    #endif
+
     // Unlock the flash for write.
     HAL_FLASH_Unlock();
 
+    #if MICROPY_HW_STM32WB_FLASH_SYNCRONISATION
+    // Wait for PES.
+    while (LL_FLASH_IsActiveFlag_OperationSuspended()) {
+    }
+    #endif
+
     HAL_StatusTypeDef status = HAL_OK;
 
     #if defined(STM32L4) || defined(STM32WB)
@@ -279,7 +338,22 @@ int flash_write(uint32_t flash_dest, const uint32_t *src, uint32_t num_word32) {
     // program the flash uint64 by uint64
     for (int i = 0; i < num_word32 / 2; i++) {
         uint64_t val = *(uint64_t *)src;
+
+        #if MICROPY_HW_STM32WB_FLASH_SYNCRONISATION
+        // Wait for flash lock.
+        while (LL_HSEM_1StepLock(HSEM, SEMID_FLASH_CPU2)) {
+        }
+        #endif
+
         status = HAL_FLASH_Program(FLASH_TYPEPROGRAM_DOUBLEWORD, flash_dest, val);
+
+        #if MICROPY_HW_STM32WB_FLASH_SYNCRONISATION
+        // Release flash lock.
+        LL_HSEM_ReleaseLock(HSEM, SEMID_FLASH_CPU2, 0);
+        while (__HAL_FLASH_GET_FLAG(FLASH_FLAG_CFGBSY)) {
+        }
+        #endif
+
         if (status != HAL_OK) {
             num_word32 = 0; // don't write any odd word after this loop
             break;
@@ -290,7 +364,21 @@ int flash_write(uint32_t flash_dest, const uint32_t *src, uint32_t num_word32) {
     if ((num_word32 & 0x01) == 1) {
         uint64_t val = *(uint64_t *)flash_dest;
         val = (val & 0xffffffff00000000uL) | (*src);
+
+        #if MICROPY_HW_STM32WB_FLASH_SYNCRONISATION
+        // Wait for flash lock.
+        while (LL_HSEM_1StepLock(HSEM, SEMID_FLASH_CPU2)) {
+        }
+        #endif
+
         status = HAL_FLASH_Program(FLASH_TYPEPROGRAM_DOUBLEWORD, flash_dest, val);
+
+        #if MICROPY_HW_STM32WB_FLASH_SYNCRONISATION
+        // Release flash lock.
+        LL_HSEM_ReleaseLock(HSEM, SEMID_FLASH_CPU2, 0);
+        while (__HAL_FLASH_GET_FLAG(FLASH_FLAG_CFGBSY)) {
+        }
+        #endif
     }
 
     #elif defined(STM32H7)
@@ -322,6 +410,11 @@ int flash_write(uint32_t flash_dest, const uint32_t *src, uint32_t num_word32) {
     // Lock the flash after write.
     HAL_FLASH_Lock();
 
+    #if MICROPY_HW_STM32WB_FLASH_SYNCRONISATION
+    // Release lock on the flash peripheral.
+    LL_HSEM_ReleaseLock(HSEM, SEMID_FLASH_REGISTERS, 0);
+    #endif
+
     return mp_hal_status_to_neg_errno(status);
 }
 
diff --git a/ports/stm32/mboot/Makefile b/ports/stm32/mboot/Makefile
index c901dfb3344a4..3d041e1c141ea 100755
--- a/ports/stm32/mboot/Makefile
+++ b/ports/stm32/mboot/Makefile
@@ -73,6 +73,7 @@ CFLAGS += -DFFCONF_H=\"ports/stm32/mboot/ffconf.h\"
 CFLAGS += -DLFS1_NO_MALLOC -DLFS1_NO_DEBUG -DLFS1_NO_WARN -DLFS1_NO_ERROR -DLFS1_NO_ASSERT
 CFLAGS += -DLFS2_NO_MALLOC -DLFS2_NO_DEBUG -DLFS2_NO_WARN -DLFS2_NO_ERROR -DLFS2_NO_ASSERT
 CFLAGS += -DBUILDING_MBOOT=1
+CFLAGS += -DMICROPY_HW_STM32WB_FLASH_SYNCRONISATION=0
 CFLAGS += -DBOOTLOADER_DFU_USB_VID=$(BOOTLOADER_DFU_USB_VID) -DBOOTLOADER_DFU_USB_PID=$(BOOTLOADER_DFU_USB_PID)
 
 LDFLAGS = -nostdlib -L . -T stm32_generic.ld -Map=$(@:.elf=.map) --cref
diff --git a/ports/stm32/mpconfigboard_common.h b/ports/stm32/mpconfigboard_common.h
index 127696b19374a..a73a26b1627b4 100644
--- a/ports/stm32/mpconfigboard_common.h
+++ b/ports/stm32/mpconfigboard_common.h
@@ -216,6 +216,10 @@
 #define MICROPY_HW_MAX_TIMER (17)
 #define MICROPY_HW_MAX_UART (1)
 
+#ifndef MICROPY_HW_STM32WB_FLASH_SYNCRONISATION
+#define MICROPY_HW_STM32WB_FLASH_SYNCRONISATION (1)
+#endif
+
 #else
 #error Unsupported MCU series
 #endif
diff --git a/ports/stm32/rfcore.c b/ports/stm32/rfcore.c
index 550e5323e8526..6133720958093 100644
--- a/ports/stm32/rfcore.c
+++ b/ports/stm32/rfcore.c
@@ -57,10 +57,12 @@
 #define OCF_CB_RESET             (0x03)
 #define OCF_CB_SET_EVENT_MASK2   (0x63)
 
-#define OGF_VENDOR               (0x3f)
-#define OCF_WRITE_CONFIG         (0x0c)
-#define OCF_SET_TX_POWER         (0x0f)
-#define OCF_BLE_INIT             (0x66)
+#define OGF_VENDOR                        (0x3f)
+#define OCF_WRITE_CONFIG                  (0x0c)
+#define OCF_SET_TX_POWER                  (0x0f)
+#define OCF_BLE_INIT                      (0x66)
+#define OCF_C2_FLASH_ERASE_ACTIVITY       (0x69)
+#define OCF_C2_SET_FLASH_ACTIVITY_CONTROL (0x73)
 
 #define HCI_OPCODE(ogf, ocf) ((ogf) << 10 | (ocf))
 
@@ -557,6 +559,10 @@ void rfcore_ble_init(void) {
     // Configure and reset the BLE controller.
     tl_sys_hci_cmd_resp(HCI_OPCODE(OGF_VENDOR, OCF_BLE_INIT), (const uint8_t *)&ble_init_params, sizeof(ble_init_params), 0);
     tl_ble_hci_cmd_resp(HCI_OPCODE(0x03, 0x0003), NULL, 0);
+
+    // Enable PES rather than SEM7 to moderate flash access between the cores.
+    uint8_t buf = 0; // FLASH_ACTIVITY_CONTROL_PES
+    tl_sys_hci_cmd_resp(HCI_OPCODE(OGF_VENDOR, OCF_C2_SET_FLASH_ACTIVITY_CONTROL), &buf, 1, 0);
 }
 
 void rfcore_ble_hci_cmd(size_t len, const uint8_t *src) {
@@ -616,6 +622,16 @@ void rfcore_ble_set_txpower(uint8_t level) {
     tl_ble_hci_cmd_resp(HCI_OPCODE(OGF_VENDOR, OCF_SET_TX_POWER), buf, 2);
 }
 
+void rfcore_start_flash_erase(void) {
+    uint8_t buf = 1; // ERASE_ACTIVITY_ON
+    tl_sys_hci_cmd_resp(HCI_OPCODE(OGF_VENDOR, OCF_C2_FLASH_ERASE_ACTIVITY), &buf, 1, 0);
+}
+
+void rfcore_end_flash_erase(void) {
+    uint8_t buf = 0; // ERASE_ACTIVITY_OFF
+    tl_sys_hci_cmd_resp(HCI_OPCODE(OGF_VENDOR, OCF_C2_FLASH_ERASE_ACTIVITY), &buf, 1, 0);
+}
+
 // IPCC IRQ Handlers
 void IPCC_C1_TX_IRQHandler(void) {
     IRQ_ENTER(IPCC_C1_TX_IRQn);
diff --git a/ports/stm32/rfcore.h b/ports/stm32/rfcore.h
index 6a3c85f67dfe8..fe29ac612ccc6 100644
--- a/ports/stm32/rfcore.h
+++ b/ports/stm32/rfcore.h
@@ -35,6 +35,9 @@ void rfcore_ble_hci_cmd(size_t len, const uint8_t *src);
 void rfcore_ble_check_msg(int (*cb)(void *, const uint8_t *, size_t), void *env);
 void rfcore_ble_set_txpower(uint8_t level);
 
+void rfcore_start_flash_erase(void);
+void rfcore_end_flash_erase(void);
+
 MP_DECLARE_CONST_FUN_OBJ_0(rfcore_status_obj);
 MP_DECLARE_CONST_FUN_OBJ_1(rfcore_fw_version_obj);
 MP_DECLARE_CONST_FUN_OBJ_VAR_BETWEEN(rfcore_sys_hci_obj);

From 21c293fbcd1f9d5bafac300b5da265b4efd2be52 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Tue, 10 Nov 2020 12:55:24 +1100
Subject: [PATCH 0415/3533] stm32/rfcore: Don't send HCI ACL cmds while another
 is pending.

And, for TX, the next/prev entries ane unused so set them to NULL to
indicate this.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/stm32/rfcore.c | 33 +++++++++++++++++++++++++++------
 1 file changed, 27 insertions(+), 6 deletions(-)

diff --git a/ports/stm32/rfcore.c b/ports/stm32/rfcore.c
index 6133720958093..da77be6117d38 100644
--- a/ports/stm32/rfcore.c
+++ b/ports/stm32/rfcore.c
@@ -32,6 +32,7 @@
 #include "py/mphal.h"
 #include "py/runtime.h"
 #include "extmod/modbluetooth.h"
+#include "nimble/nimble_npl.h"
 #include "rtc.h"
 #include "rfcore.h"
 
@@ -72,8 +73,9 @@
 #define HCI_KIND_VENDOR_RESPONSE (0x11)
 #define HCI_KIND_VENDOR_EVENT (0x12)
 
-#define HCI_EVENT_COMMAND_COMPLETE     (0x0E) // <num packets><opcode 16><status><data...>
-#define HCI_EVENT_COMMAND_STATUS       (0x0F) // <status><num_packets><opcode 16>
+#define HCI_EVENT_COMMAND_COMPLETE            (0x0E) // <num packets><opcode 16><status><data...>
+#define HCI_EVENT_COMMAND_STATUS              (0x0F) // <status><num_packets><opcode 16>
+#define HCI_EVENT_NUMBER_OF_COMPLETED_PACKETS (0x13) // <num>(<handle 16><completed 16>)*
 
 #define SYS_ACK_TIMEOUT_MS (250)
 #define BLE_ACK_TIMEOUT_MS (250)
@@ -83,6 +85,8 @@
 // AN5289
 #define MAGIC_IPCC_MEM_INCORRECT 0x3DE96F61
 
+volatile bool hci_acl_cmd_pending = false;
+
 typedef struct _tl_list_node_t {
     volatile struct _tl_list_node_t *next;
     volatile struct _tl_list_node_t *prev;
@@ -305,6 +309,11 @@ STATIC size_t tl_parse_hci_msg(const uint8_t *buf, parse_hci_info_t *parse) {
         case HCI_KIND_BT_EVENT: {
             info = "HCI_EVT";
 
+            // Acknowledgment of a pending ACL request, allow another one to be sent.
+            if (buf[1] == HCI_EVENT_NUMBER_OF_COMPLETED_PACKETS) {
+                hci_acl_cmd_pending = false;
+            }
+
             len = 3 + buf[2];
             if (parse != NULL) {
 
@@ -424,8 +433,8 @@ STATIC void tl_check_msg(volatile tl_list_node_t *head, unsigned int ch, parse_h
 
 STATIC void tl_hci_cmd(uint8_t *cmd, unsigned int ch, uint8_t hdr, uint16_t opcode, const uint8_t *buf, size_t len) {
     tl_list_node_t *n = (tl_list_node_t *)cmd;
-    n->next = n;
-    n->prev = n;
+    n->next = NULL;
+    n->prev = NULL;
     cmd[8] = hdr;
     cmd[9] = opcode;
     cmd[10] = opcode >> 8;
@@ -584,13 +593,25 @@ void rfcore_ble_hci_cmd(size_t len, const uint8_t *src) {
     } else if (src[0] == HCI_KIND_BT_ACL) {
         n = (tl_list_node_t *)&ipcc_membuf_ble_hci_acl_data_buf[0];
         ch = IPCC_CH_HCI_ACL;
+
+        // Give the previous ACL command up to 100ms to complete.
+        mp_uint_t timeout_start_ticks_ms = mp_hal_ticks_ms();
+        while (hci_acl_cmd_pending) {
+            if (mp_hal_ticks_ms() - timeout_start_ticks_ms > 100) {
+                break;
+            }
+            mp_bluetooth_nimble_hci_uart_wfi();
+        }
+
+        // Prevent sending another command until this one returns with HCI_EVENT_COMMAND_{COMPLETE,STATUS}.
+        hci_acl_cmd_pending = true;
     } else {
         printf("** UNEXPECTED HCI HDR: 0x%02x **\n", src[0]);
         return;
     }
 
-    n->next = n;
-    n->prev = n;
+    n->next = NULL;
+    n->prev = NULL;
     memcpy(n->body, src, len);
 
     // IPCC indicate.

From 240b3de8bc0c0bf5ad04b92e4faae85c0f3a929c Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Wed, 18 Nov 2020 13:32:41 +1100
Subject: [PATCH 0416/3533] stm32/rfcore: Depend on NimBLE only when BLE
 enabled.

This fixes the build for non-STM32WB based boards when the NimBLE submodule
has not been fetched, and also allows STM32WB boards to build with BLE
disabled.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/stm32/rfcore.c | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/ports/stm32/rfcore.c b/ports/stm32/rfcore.c
index da77be6117d38..7d0a8520a6fc4 100644
--- a/ports/stm32/rfcore.c
+++ b/ports/stm32/rfcore.c
@@ -32,7 +32,6 @@
 #include "py/mphal.h"
 #include "py/runtime.h"
 #include "extmod/modbluetooth.h"
-#include "nimble/nimble_npl.h"
 #include "rtc.h"
 #include "rfcore.h"
 
@@ -40,12 +39,23 @@
 
 #include "stm32wbxx_ll_ipcc.h"
 
-#define DEBUG_printf(...) // printf("rfcore: " __VA_ARGS__)
+#if MICROPY_PY_BLUETOOTH
+
+#if MICROPY_BLUETOOTH_NIMBLE
+// For mp_bluetooth_nimble_hci_uart_wfi
+#include "nimble/nimble_npl.h"
+#else
+#error "STM32WB must use NimBLE."
+#endif
 
 #if !MICROPY_PY_BLUETOOTH_USE_SYNC_EVENTS
-#error "STM32WB must use synchronous events in the BLE implementation."
+#error "STM32WB must use synchronous BLE events."
 #endif
 
+#endif
+
+#define DEBUG_printf(...) // printf("rfcore: " __VA_ARGS__)
+
 // Define to 1 to print traces of HCI packets
 #define HCI_TRACE (0)
 
@@ -600,7 +610,9 @@ void rfcore_ble_hci_cmd(size_t len, const uint8_t *src) {
             if (mp_hal_ticks_ms() - timeout_start_ticks_ms > 100) {
                 break;
             }
+            #if MICROPY_PY_BLUETOOTH && MICROPY_BLUETOOTH_NIMBLE
             mp_bluetooth_nimble_hci_uart_wfi();
+            #endif
         }
 
         // Prevent sending another command until this one returns with HCI_EVENT_COMMAND_{COMPLETE,STATUS}.
@@ -653,7 +665,9 @@ void rfcore_end_flash_erase(void) {
     tl_sys_hci_cmd_resp(HCI_OPCODE(OGF_VENDOR, OCF_C2_FLASH_ERASE_ACTIVITY), &buf, 1, 0);
 }
 
+/******************************************************************************/
 // IPCC IRQ Handlers
+
 void IPCC_C1_TX_IRQHandler(void) {
     IRQ_ENTER(IPCC_C1_TX_IRQn);
     IRQ_EXIT(IPCC_C1_TX_IRQn);
@@ -667,9 +681,11 @@ void IPCC_C1_RX_IRQHandler(void) {
     if (LL_C2_IPCC_IsActiveFlag_CHx(IPCC, IPCC_CH_BLE)) {
         LL_C1_IPCC_ClearFlag_CHx(IPCC, IPCC_CH_BLE);
 
+        #if MICROPY_PY_BLUETOOTH
         // Queue up the scheduler to process UART data and run events.
         extern void mp_bluetooth_hci_systick(uint32_t ticks_ms);
         mp_bluetooth_hci_systick(0);
+        #endif
     }
 
     IRQ_EXIT(IPCC_C1_RX_IRQn);

From 5af3c046c7bfc1108094e53aea8b612c2ff86fd4 Mon Sep 17 00:00:00 2001
From: robert <robert@hammelrath.com>
Date: Mon, 16 Nov 2020 20:51:37 +0100
Subject: [PATCH 0417/3533] esp32,esp8266: Remove "FAT" from warning message in
 inisetup.py.

Because FAT is not any more the only filesystem used.
---
 ports/esp32/modules/inisetup.py   | 2 +-
 ports/esp8266/modules/inisetup.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/esp32/modules/inisetup.py b/ports/esp32/modules/inisetup.py
index 9995d6bc07dd2..426a47a6b45e5 100644
--- a/ports/esp32/modules/inisetup.py
+++ b/ports/esp32/modules/inisetup.py
@@ -21,7 +21,7 @@ def fs_corrupted():
     while 1:
         print(
             """\
-FAT filesystem appears to be corrupted. If you had important data there, you
+The filesystem appears to be corrupted. If you had important data there, you
 may want to make a flash snapshot to try to recover it. Otherwise, perform
 factory reprogramming of MicroPython firmware (completely erase flash, followed
 by firmware programming).
diff --git a/ports/esp8266/modules/inisetup.py b/ports/esp8266/modules/inisetup.py
index 79576e9d62aa7..e711a57d4b609 100644
--- a/ports/esp8266/modules/inisetup.py
+++ b/ports/esp8266/modules/inisetup.py
@@ -30,7 +30,7 @@ def fs_corrupted():
     while 1:
         print(
             """\
-The FAT filesystem starting at sector %d with size %d sectors appears to
+The filesystem starting at sector %d with size %d sectors appears to
 be corrupted. If you had important data there, you may want to make a flash
 snapshot to try to recover it. Otherwise, perform factory reprogramming
 of MicroPython firmware (completely erase flash, followed by firmware

From 3dcb551d8981bfb370bfe8f467fcde59dd7a916a Mon Sep 17 00:00:00 2001
From: JPFrancoia <jeanpatrick.francoia@gmail.com>
Date: Thu, 1 Oct 2020 09:51:58 +0200
Subject: [PATCH 0418/3533] nrf/README: Describe Pin numbering scheme for
 nRF52840.

Clarify that the nRF52840's GPIO 1.00 to 1.15 maps to Pin(32-47) in
MicroPython.
---
 ports/nrf/README.md | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/ports/nrf/README.md b/ports/nrf/README.md
index b08a034561e0c..5fceb6705f6d2 100644
--- a/ports/nrf/README.md
+++ b/ports/nrf/README.md
@@ -187,3 +187,12 @@ Other:
 * nRF UART application for IPhone/Android
 
 WebBluetooth mode can also be configured by editing `bluetooth_conf.h` and set `BLUETOOTH_WEBBLUETOOTH_REPL` to 1. This will alternate advertisement between Eddystone URL and regular connectable advertisement. The Eddystone URL will point the phone or PC to download [WebBluetooth REPL](https://aykevl.nl/apps/nus/) (experimental), which subsequently can be used to connect to the Bluetooth REPL from the PC or Phone browser.
+
+
+## Pin numbering scheme for nrf52840-based boards
+
+Software Pins 0-31 correspond to physical pins 0.x and software Pins 32-47
+correspond to physical pins 1.x.
+
+Example:
+`Pin(47)` would be 1.15 on the PCA10059

From 64180f0742a1926162b784c68bafa49b9b58596c Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 18 Nov 2020 14:50:43 +1100
Subject: [PATCH 0419/3533] extmod/machine_i2c: Add init protocol method for
 generic I2C bindings.

Hardware I2C implementations must provide a .init() protocol method if they
want to support reconfiguration.  Otherwise the default is that i2c.init()
raises an OSError (currently the case for all ports).

mp_machine_soft_i2c_locals_dict is renamed to mp_machine_i2c_locals_dict to
match the generic SPI bindings.

Fixes issue #6623 (where calling .init() on a HW I2C would crash).

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/machine_i2c.c            | 87 +++++++++++++++++++--------------
 extmod/machine_i2c.h            |  9 ++--
 ports/esp32/machine_i2c.c       |  2 +-
 ports/nrf/modules/machine/i2c.c |  2 +-
 ports/stm32/machine_i2c.c       |  2 +-
 ports/zephyr/machine_i2c.c      |  2 +-
 6 files changed, 59 insertions(+), 45 deletions(-)

diff --git a/extmod/machine_i2c.c b/extmod/machine_i2c.c
index 12c9abbcbaece..44161fbbb967a 100644
--- a/extmod/machine_i2c.c
+++ b/extmod/machine_i2c.c
@@ -300,45 +300,18 @@ STATIC int mp_machine_i2c_writeto(mp_obj_base_t *self, uint16_t addr, const uint
 }
 
 /******************************************************************************/
-// MicroPython bindings for I2C
+// MicroPython bindings for generic machine.I2C
 
-STATIC void mp_machine_soft_i2c_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
-    mp_machine_soft_i2c_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    mp_printf(print, "SoftI2C(scl=" MP_HAL_PIN_FMT ", sda=" MP_HAL_PIN_FMT ", freq=%u)",
-        mp_hal_pin_name(self->scl), mp_hal_pin_name(self->sda), 500000 / self->us_delay);
-}
-
-STATIC void machine_i2c_obj_init_helper(machine_i2c_obj_t *self, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
-    enum { ARG_scl, ARG_sda, ARG_freq, ARG_timeout };
-    static const mp_arg_t allowed_args[] = {
-        { MP_QSTR_scl, MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
-        { MP_QSTR_sda, MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
-        { MP_QSTR_freq, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 400000} },
-        { MP_QSTR_timeout, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 255} },
-    };
-    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
-    mp_arg_parse_all(n_args, pos_args, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
-    self->scl = mp_hal_get_pin_obj(args[ARG_scl].u_obj);
-    self->sda = mp_hal_get_pin_obj(args[ARG_sda].u_obj);
-    self->us_timeout = args[ARG_timeout].u_int;
-    mp_hal_i2c_init(self, args[ARG_freq].u_int);
-}
-
-STATIC mp_obj_t mp_machine_soft_i2c_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
-    // create new soft I2C object
-    machine_i2c_obj_t *self = m_new_obj(machine_i2c_obj_t);
-    self->base.type = &mp_machine_soft_i2c_type;
-    mp_map_t kw_args;
-    mp_map_init_fixed_table(&kw_args, n_kw, args + n_args);
-    machine_i2c_obj_init_helper(self, n_args, args, &kw_args);
-    return MP_OBJ_FROM_PTR(self);
-}
-
-STATIC mp_obj_t machine_i2c_obj_init(size_t n_args, const mp_obj_t *args, mp_map_t *kw_args) {
-    machine_i2c_obj_init_helper(MP_OBJ_TO_PTR(args[0]), n_args - 1, args + 1, kw_args);
+STATIC mp_obj_t machine_i2c_init(size_t n_args, const mp_obj_t *args, mp_map_t *kw_args) {
+    mp_obj_base_t *self = (mp_obj_base_t *)MP_OBJ_TO_PTR(args[0]);
+    mp_machine_i2c_p_t *i2c_p = (mp_machine_i2c_p_t *)self->type->protocol;
+    if (i2c_p->init == NULL) {
+        mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("I2C operation not supported"));
+    }
+    i2c_p->init(self, n_args - 1, args + 1, kw_args);
     return mp_const_none;
 }
-MP_DEFINE_CONST_FUN_OBJ_KW(machine_i2c_init_obj, 1, machine_i2c_obj_init);
+MP_DEFINE_CONST_FUN_OBJ_KW(machine_i2c_init_obj, 1, machine_i2c_init);
 
 STATIC mp_obj_t machine_i2c_scan(mp_obj_t self_in) {
     mp_obj_base_t *self = MP_OBJ_TO_PTR(self_in);
@@ -653,8 +626,45 @@ STATIC const mp_rom_map_elem_t machine_i2c_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_readfrom_mem_into), MP_ROM_PTR(&machine_i2c_readfrom_mem_into_obj) },
     { MP_ROM_QSTR(MP_QSTR_writeto_mem), MP_ROM_PTR(&machine_i2c_writeto_mem_obj) },
 };
+MP_DEFINE_CONST_DICT(mp_machine_i2c_locals_dict, machine_i2c_locals_dict_table);
 
-MP_DEFINE_CONST_DICT(mp_machine_soft_i2c_locals_dict, machine_i2c_locals_dict_table);
+/******************************************************************************/
+// Implementation of soft I2C
+
+STATIC void mp_machine_soft_i2c_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+    mp_machine_soft_i2c_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    mp_printf(print, "SoftI2C(scl=" MP_HAL_PIN_FMT ", sda=" MP_HAL_PIN_FMT ", freq=%u)",
+        mp_hal_pin_name(self->scl), mp_hal_pin_name(self->sda), 500000 / self->us_delay);
+}
+
+STATIC void mp_machine_soft_i2c_init(mp_obj_base_t *self_in, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    enum { ARG_scl, ARG_sda, ARG_freq, ARG_timeout };
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_scl, MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
+        { MP_QSTR_sda, MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
+        { MP_QSTR_freq, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 400000} },
+        { MP_QSTR_timeout, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 255} },
+    };
+
+    mp_machine_soft_i2c_obj_t *self = (mp_machine_soft_i2c_obj_t *)self_in;
+    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
+    mp_arg_parse_all(n_args, pos_args, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
+
+    self->scl = mp_hal_get_pin_obj(args[ARG_scl].u_obj);
+    self->sda = mp_hal_get_pin_obj(args[ARG_sda].u_obj);
+    self->us_timeout = args[ARG_timeout].u_int;
+    mp_hal_i2c_init(self, args[ARG_freq].u_int);
+}
+
+STATIC mp_obj_t mp_machine_soft_i2c_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
+    // create new soft I2C object
+    machine_i2c_obj_t *self = m_new_obj(machine_i2c_obj_t);
+    self->base.type = &mp_machine_soft_i2c_type;
+    mp_map_t kw_args;
+    mp_map_init_fixed_table(&kw_args, n_kw, args + n_args);
+    mp_machine_soft_i2c_init(&self->base, n_args, args, &kw_args);
+    return MP_OBJ_FROM_PTR(self);
+}
 
 int mp_machine_soft_i2c_read(mp_obj_base_t *self_in, uint8_t *dest, size_t len, bool nack) {
     machine_i2c_obj_t *self = (machine_i2c_obj_t *)self_in;
@@ -684,6 +694,7 @@ int mp_machine_soft_i2c_write(mp_obj_base_t *self_in, const uint8_t *src, size_t
 }
 
 STATIC const mp_machine_i2c_p_t mp_machine_soft_i2c_p = {
+    .init = mp_machine_soft_i2c_init,
     .start = (int (*)(mp_obj_base_t *))mp_hal_i2c_start,
     .stop = (int (*)(mp_obj_base_t *))mp_hal_i2c_stop,
     .read = mp_machine_soft_i2c_read,
@@ -697,7 +708,7 @@ const mp_obj_type_t mp_machine_soft_i2c_type = {
     .print = mp_machine_soft_i2c_print,
     .make_new = mp_machine_soft_i2c_make_new,
     .protocol = &mp_machine_soft_i2c_p,
-    .locals_dict = (mp_obj_dict_t *)&mp_machine_soft_i2c_locals_dict,
+    .locals_dict = (mp_obj_dict_t *)&mp_machine_i2c_locals_dict,
 };
 
 #endif // MICROPY_PY_MACHINE_I2C
diff --git a/extmod/machine_i2c.h b/extmod/machine_i2c.h
index e3a87e282a0fe..9e43747323840 100644
--- a/extmod/machine_i2c.h
+++ b/extmod/machine_i2c.h
@@ -51,9 +51,12 @@ typedef struct _mp_machine_i2c_buf_t {
 } mp_machine_i2c_buf_t;
 
 // I2C protocol
-// the first 4 methods can be NULL, meaning operation is not supported
-// transfer_single only needs to be set if transfer=mp_machine_i2c_transfer_adaptor
+// - init must be non-NULL
+// - start/stop/read/write can be NULL, meaning operation is not supported
+// - transfer must be non-NULL
+// - transfer_single only needs to be set if transfer=mp_machine_i2c_transfer_adaptor
 typedef struct _mp_machine_i2c_p_t {
+    void (*init)(mp_obj_base_t *obj, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args);
     int (*start)(mp_obj_base_t *obj);
     int (*stop)(mp_obj_base_t *obj);
     int (*read)(mp_obj_base_t *obj, uint8_t *dest, size_t len, bool nack);
@@ -71,7 +74,7 @@ typedef struct _mp_machine_soft_i2c_obj_t {
 } mp_machine_soft_i2c_obj_t;
 
 extern const mp_obj_type_t mp_machine_soft_i2c_type;
-extern const mp_obj_dict_t mp_machine_soft_i2c_locals_dict;
+extern const mp_obj_dict_t mp_machine_i2c_locals_dict;
 
 int mp_machine_i2c_transfer_adaptor(mp_obj_base_t *self, uint16_t addr, size_t n, mp_machine_i2c_buf_t *bufs, unsigned int flags);
 int mp_machine_soft_i2c_transfer(mp_obj_base_t *self, uint16_t addr, size_t n, mp_machine_i2c_buf_t *bufs, unsigned int flags);
diff --git a/ports/esp32/machine_i2c.c b/ports/esp32/machine_i2c.c
index a1d0ad0f4d93c..87b08fc9bc6e6 100644
--- a/ports/esp32/machine_i2c.c
+++ b/ports/esp32/machine_i2c.c
@@ -177,5 +177,5 @@ const mp_obj_type_t machine_hw_i2c_type = {
     .print = machine_hw_i2c_print,
     .make_new = machine_hw_i2c_make_new,
     .protocol = &machine_hw_i2c_p,
-    .locals_dict = (mp_obj_dict_t *)&mp_machine_soft_i2c_locals_dict,
+    .locals_dict = (mp_obj_dict_t *)&mp_machine_i2c_locals_dict,
 };
diff --git a/ports/nrf/modules/machine/i2c.c b/ports/nrf/modules/machine/i2c.c
index ab4d516621bc7..aac9320873207 100644
--- a/ports/nrf/modules/machine/i2c.c
+++ b/ports/nrf/modules/machine/i2c.c
@@ -167,7 +167,7 @@ const mp_obj_type_t machine_hard_i2c_type = {
     .print = machine_hard_i2c_print,
     .make_new = machine_hard_i2c_make_new,
     .protocol = &machine_hard_i2c_p,
-    .locals_dict = (mp_obj_dict_t*)&mp_machine_soft_i2c_locals_dict,
+    .locals_dict = (mp_obj_dict_t*)&mp_machine_i2c_locals_dict,
 };
 
 #endif // MICROPY_PY_MACHINE_I2C
diff --git a/ports/stm32/machine_i2c.c b/ports/stm32/machine_i2c.c
index e0c408c6d07c2..cfa00b86d830b 100644
--- a/ports/stm32/machine_i2c.c
+++ b/ports/stm32/machine_i2c.c
@@ -273,7 +273,7 @@ const mp_obj_type_t machine_hard_i2c_type = {
     .print = machine_hard_i2c_print,
     .make_new = machine_hard_i2c_make_new,
     .protocol = &machine_hard_i2c_p,
-    .locals_dict = (mp_obj_dict_t *)&mp_machine_soft_i2c_locals_dict,
+    .locals_dict = (mp_obj_dict_t *)&mp_machine_i2c_locals_dict,
 };
 
 #endif // MICROPY_HW_ENABLE_HW_I2C
diff --git a/ports/zephyr/machine_i2c.c b/ports/zephyr/machine_i2c.c
index ec4b8620a5014..efd4bdcb21b58 100644
--- a/ports/zephyr/machine_i2c.c
+++ b/ports/zephyr/machine_i2c.c
@@ -134,5 +134,5 @@ const mp_obj_type_t machine_hard_i2c_type = {
     .print = machine_hard_i2c_print,
     .make_new = machine_hard_i2c_make_new,
     .protocol = &machine_hard_i2c_p,
-    .locals_dict = (mp_obj_dict_t *)&mp_machine_soft_i2c_locals_dict,
+    .locals_dict = (mp_obj_dict_t *)&mp_machine_i2c_locals_dict,
 };

From 0e8af2b3708ab3e499491836d481b10e030408f8 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Fri, 16 Oct 2020 00:15:16 +1100
Subject: [PATCH 0420/3533] extmod/modbluetooth: Add API for L2CAP channels.

Also known as L2CAP "connection oriented channels". This provides a
socket-like data transfer mechanism for BLE.

Currently only implemented for NimBLE on STM32 / Unix.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 extmod/modbluetooth.c                | 129 +++++++++--
 extmod/modbluetooth.h                |  35 ++-
 extmod/nimble/modbluetooth_nimble.c  | 332 +++++++++++++++++++++++++++
 extmod/nimble/modbluetooth_nimble.h  |   6 +
 extmod/nimble/nimble/nimble_npl_os.h |  13 ++
 extmod/nimble/syscfg/syscfg.h        |   6 +-
 ports/stm32/Makefile                 |   1 +
 ports/unix/Makefile                  |   1 +
 py/misc.h                            |   3 +
 9 files changed, 504 insertions(+), 22 deletions(-)

diff --git a/extmod/modbluetooth.c b/extmod/modbluetooth.c
index d8068df594538..2cff386f125d5 100644
--- a/extmod/modbluetooth.c
+++ b/extmod/modbluetooth.c
@@ -43,6 +43,10 @@
 #error modbluetooth requires MICROPY_ENABLE_SCHEDULER
 #endif
 
+#if MICROPY_PY_BLUETOOTH_ENABLE_L2CAP_CHANNELS && !MICROPY_PY_BLUETOOTH_USE_SYNC_EVENTS
+#error l2cap channels require synchronous modbluetooth events
+#endif
+
 #define MP_BLUETOOTH_CONNECT_DEFAULT_SCAN_DURATION_MS 2000
 
 #define MICROPY_PY_BLUETOOTH_MAX_EVENT_DATA_TUPLE_LEN 5
@@ -785,6 +789,58 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(bluetooth_ble_gattc_exchange_mtu_obj, bluetooth
 
 #endif // MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE
 
+#if MICROPY_PY_BLUETOOTH_ENABLE_L2CAP_CHANNELS
+
+STATIC mp_obj_t bluetooth_ble_l2cap_listen(mp_obj_t self_in, mp_obj_t psm_in, mp_obj_t mtu_in) {
+    (void)self_in;
+    mp_int_t psm = mp_obj_get_int(psm_in);
+    mp_int_t mtu = mp_obj_get_int(mtu_in);
+    return bluetooth_handle_errno(mp_bluetooth_l2cap_listen(psm, mtu));
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_3(bluetooth_ble_l2cap_listen_obj, bluetooth_ble_l2cap_listen);
+
+STATIC mp_obj_t bluetooth_ble_l2cap_connect(size_t n_args, const mp_obj_t *args) {
+    mp_int_t conn_handle = mp_obj_get_int(args[1]);
+    mp_int_t psm = mp_obj_get_int(args[2]);
+    mp_int_t mtu = mp_obj_get_int(args[3]);
+    return bluetooth_handle_errno(mp_bluetooth_l2cap_connect(conn_handle, psm, mtu));
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(bluetooth_ble_l2cap_connect_obj, 4, 4, bluetooth_ble_l2cap_connect);
+
+STATIC mp_obj_t bluetooth_ble_l2cap_disconnect(mp_obj_t self_in, mp_obj_t conn_handle_in, mp_obj_t cid_in) {
+    (void)self_in;
+    mp_int_t conn_handle = mp_obj_get_int(conn_handle_in);
+    mp_int_t cid = mp_obj_get_int(cid_in);
+    return bluetooth_handle_errno(mp_bluetooth_l2cap_disconnect(conn_handle, cid));
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_3(bluetooth_ble_l2cap_disconnect_obj, bluetooth_ble_l2cap_disconnect);
+
+STATIC mp_obj_t bluetooth_ble_l2cap_send(size_t n_args, const mp_obj_t *args) {
+    mp_int_t conn_handle = mp_obj_get_int(args[1]);
+    mp_int_t cid = mp_obj_get_int(args[2]);
+    mp_buffer_info_t bufinfo;
+    mp_get_buffer_raise(args[3], &bufinfo, MP_BUFFER_READ);
+    bool stalled = false;
+    bluetooth_handle_errno(mp_bluetooth_l2cap_send(conn_handle, cid, bufinfo.buf, bufinfo.len, &stalled));
+    // Return True if the channel is still ready to send.
+    return mp_obj_new_bool(!stalled);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(bluetooth_ble_l2cap_send_obj, 4, 4, bluetooth_ble_l2cap_send);
+
+STATIC mp_obj_t bluetooth_ble_l2cap_recvinto(size_t n_args, const mp_obj_t *args) {
+    mp_int_t conn_handle = mp_obj_get_int(args[1]);
+    mp_int_t cid = mp_obj_get_int(args[2]);
+    mp_buffer_info_t bufinfo = {0};
+    if (args[3] != mp_const_none) {
+        mp_get_buffer_raise(args[3], &bufinfo, MP_BUFFER_WRITE);
+    }
+    bluetooth_handle_errno(mp_bluetooth_l2cap_recvinto(conn_handle, cid, bufinfo.buf, &bufinfo.len));
+    return MP_OBJ_NEW_SMALL_INT(bufinfo.len);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(bluetooth_ble_l2cap_recvinto_obj, 4, 4, bluetooth_ble_l2cap_recvinto);
+
+#endif // MICROPY_PY_BLUETOOTH_ENABLE_L2CAP_CHANNELS
+
 // ----------------------------------------------------------------------------
 // Bluetooth object: Definition
 // ----------------------------------------------------------------------------
@@ -817,6 +873,13 @@ STATIC const mp_rom_map_elem_t bluetooth_ble_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_gattc_write), MP_ROM_PTR(&bluetooth_ble_gattc_write_obj) },
     { MP_ROM_QSTR(MP_QSTR_gattc_exchange_mtu), MP_ROM_PTR(&bluetooth_ble_gattc_exchange_mtu_obj) },
     #endif
+    #if MICROPY_PY_BLUETOOTH_ENABLE_L2CAP_CHANNELS
+    { MP_ROM_QSTR(MP_QSTR_l2cap_listen), MP_ROM_PTR(&bluetooth_ble_l2cap_listen_obj) },
+    { MP_ROM_QSTR(MP_QSTR_l2cap_connect), MP_ROM_PTR(&bluetooth_ble_l2cap_connect_obj) },
+    { MP_ROM_QSTR(MP_QSTR_l2cap_disconnect), MP_ROM_PTR(&bluetooth_ble_l2cap_disconnect_obj) },
+    { MP_ROM_QSTR(MP_QSTR_l2cap_send), MP_ROM_PTR(&bluetooth_ble_l2cap_send_obj) },
+    { MP_ROM_QSTR(MP_QSTR_l2cap_recvinto), MP_ROM_PTR(&bluetooth_ble_l2cap_recvinto_obj) },
+    #endif
 };
 STATIC MP_DEFINE_CONST_DICT(bluetooth_ble_locals_dict, bluetooth_ble_locals_dict_table);
 
@@ -1051,6 +1114,37 @@ void mp_bluetooth_gatts_on_mtu_exchanged(uint16_t conn_handle, uint16_t value) {
     invoke_irq_handler(MP_BLUETOOTH_IRQ_MTU_EXCHANGED, args, 2, NULL_U8, 0, NULL_ADDR, NULL_I8, 0, NULL_UUID, NULL_DATA, 0);
 }
 
+#if MICROPY_PY_BLUETOOTH_ENABLE_L2CAP_CHANNELS
+mp_int_t mp_bluetooth_gattc_on_l2cap_accept(uint16_t conn_handle, uint16_t cid, uint16_t psm, uint16_t our_mtu, uint16_t peer_mtu) {
+    uint16_t args[] = {conn_handle, cid, psm, our_mtu, peer_mtu};
+    mp_obj_t result = invoke_irq_handler(MP_BLUETOOTH_IRQ_L2CAP_ACCEPT, args, 5, NULL_U8, 0, NULL_ADDR, NULL_I8, 0, NULL_UUID, NULL_DATA, 0);
+    // Return non-zero from IRQ handler to fail the accept.
+    mp_int_t ret = 0;
+    mp_obj_get_int_maybe(result, &ret);
+    return ret;
+}
+
+void mp_bluetooth_gattc_on_l2cap_connect(uint16_t conn_handle, uint16_t cid, uint16_t psm, uint16_t our_mtu, uint16_t peer_mtu) {
+    uint16_t args[] = {conn_handle, cid, psm, our_mtu, peer_mtu};
+    invoke_irq_handler(MP_BLUETOOTH_IRQ_L2CAP_CONNECT, args, 5, NULL_U8, 0, NULL_ADDR, NULL_I8, 0, NULL_UUID, NULL_DATA, 0);
+}
+
+void mp_bluetooth_gattc_on_l2cap_disconnect(uint16_t conn_handle, uint16_t cid, uint16_t psm, uint16_t status) {
+    uint16_t args[] = {conn_handle, cid, psm, status};
+    invoke_irq_handler(MP_BLUETOOTH_IRQ_L2CAP_DISCONNECT, args, 4, NULL_U8, 0, NULL_ADDR, NULL_I8, 0, NULL_UUID, NULL_DATA, 0);
+}
+
+void mp_bluetooth_gattc_on_l2cap_send_ready(uint16_t conn_handle, uint16_t cid, uint8_t status) {
+    uint16_t args[] = {conn_handle, cid};
+    invoke_irq_handler(MP_BLUETOOTH_IRQ_L2CAP_SEND_READY, args, 2, &status, 1, NULL_ADDR, NULL_I8, 0, NULL_UUID, NULL_DATA, 0);
+}
+
+void mp_bluetooth_gattc_on_l2cap_recv(uint16_t conn_handle, uint16_t cid) {
+    uint16_t args[] = {conn_handle, cid};
+    invoke_irq_handler(MP_BLUETOOTH_IRQ_L2CAP_RECV, args, 2, NULL_U8, 0, NULL_ADDR, NULL_I8, 0, NULL_UUID, NULL_DATA, 0);
+}
+#endif // MICROPY_PY_BLUETOOTH_ENABLE_L2CAP_CHANNELS
+
 #if MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE
 void mp_bluetooth_gap_on_scan_complete(void) {
     invoke_irq_handler(MP_BLUETOOTH_IRQ_SCAN_DONE, NULL_U16, 0, NULL_U8, 0, NULL_ADDR, NULL_I8, 0, NULL_UUID, NULL_DATA, 0);
@@ -1203,6 +1297,23 @@ void mp_bluetooth_gatts_on_indicate_complete(uint16_t conn_handle, uint16_t valu
     schedule_ringbuf(atomic_state);
 }
 
+bool mp_bluetooth_gatts_on_read_request(uint16_t conn_handle, uint16_t value_handle) {
+    (void)conn_handle;
+    (void)value_handle;
+    // This must be handled synchronously and therefore cannot implemented with the ringbuffer.
+    return true;
+}
+
+void mp_bluetooth_gatts_on_mtu_exchanged(uint16_t conn_handle, uint16_t value) {
+    MICROPY_PY_BLUETOOTH_ENTER
+    mp_obj_bluetooth_ble_t *o = MP_OBJ_TO_PTR(MP_STATE_VM(bluetooth));
+    if (enqueue_irq(o, 2 + 2, MP_BLUETOOTH_IRQ_MTU_EXCHANGED)) {
+        ringbuf_put16(&o->ringbuf, conn_handle);
+        ringbuf_put16(&o->ringbuf, value);
+    }
+    schedule_ringbuf(atomic_state);
+}
+
 #if MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE
 void mp_bluetooth_gap_on_scan_complete(void) {
     MICROPY_PY_BLUETOOTH_ENTER
@@ -1322,26 +1433,8 @@ void mp_bluetooth_gattc_on_read_write_status(uint8_t event, uint16_t conn_handle
     }
     schedule_ringbuf(atomic_state);
 }
-
 #endif // MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE
 
-bool mp_bluetooth_gatts_on_read_request(uint16_t conn_handle, uint16_t value_handle) {
-    (void)conn_handle;
-    (void)value_handle;
-    // This must be handled synchronously and therefore cannot implemented with the ringbuffer.
-    return true;
-}
-
-void mp_bluetooth_gatts_on_mtu_exchanged(uint16_t conn_handle, uint16_t value) {
-    MICROPY_PY_BLUETOOTH_ENTER
-    mp_obj_bluetooth_ble_t *o = MP_OBJ_TO_PTR(MP_STATE_VM(bluetooth));
-    if (enqueue_irq(o, 2 + 2, MP_BLUETOOTH_IRQ_MTU_EXCHANGED)) {
-        ringbuf_put16(&o->ringbuf, conn_handle);
-        ringbuf_put16(&o->ringbuf, value);
-    }
-    schedule_ringbuf(atomic_state);
-}
-
 #endif // MICROPY_PY_BLUETOOTH_USE_SYNC_EVENTS
 
 // ----------------------------------------------------------------------------
diff --git a/extmod/modbluetooth.h b/extmod/modbluetooth.h
index 52e3446ff3b94..9caddb0f3f89e 100644
--- a/extmod/modbluetooth.h
+++ b/extmod/modbluetooth.h
@@ -49,6 +49,11 @@
 #define MICROPY_PY_BLUETOOTH_USE_SYNC_EVENTS (0)
 #endif
 
+// A port can optionally enable support for L2CAP "Connection Oriented Channels".
+#ifndef MICROPY_PY_BLUETOOTH_ENABLE_L2CAP_CHANNELS
+#define MICROPY_PY_BLUETOOTH_ENABLE_L2CAP_CHANNELS (0)
+#endif
+
 // This is used to protect the ringbuffer.
 // A port may no-op this if MICROPY_PY_BLUETOOTH_USE_SYNC_EVENTS is enabled.
 #ifndef MICROPY_PY_BLUETOOTH_ENTER
@@ -104,6 +109,11 @@
 #define MP_BLUETOOTH_IRQ_GATTC_INDICATE                 (19)
 #define MP_BLUETOOTH_IRQ_GATTS_INDICATE_DONE            (20)
 #define MP_BLUETOOTH_IRQ_MTU_EXCHANGED                  (21)
+#define MP_BLUETOOTH_IRQ_L2CAP_ACCEPT                   (22)
+#define MP_BLUETOOTH_IRQ_L2CAP_CONNECT                  (23)
+#define MP_BLUETOOTH_IRQ_L2CAP_DISCONNECT               (24)
+#define MP_BLUETOOTH_IRQ_L2CAP_RECV                     (25)
+#define MP_BLUETOOTH_IRQ_L2CAP_SEND_READY               (26)
 
 #define MP_BLUETOOTH_ADDRESS_MODE_PUBLIC (0)
 #define MP_BLUETOOTH_ADDRESS_MODE_RANDOM (1)
@@ -136,6 +146,11 @@ _IRQ_GATTC_NOTIFY = const(18)
 _IRQ_GATTC_INDICATE = const(19)
 _IRQ_GATTS_INDICATE_DONE = const(20)
 _IRQ_MTU_EXCHANGED = const(21)
+_IRQ_L2CAP_ACCEPT = const(22)
+_IRQ_L2CAP_CONNECT = const(23)
+_IRQ_L2CAP_DISCONNECT = const(24)
+_IRQ_L2CAP_RECV = const(25)
+_IRQ_L2CAP_SEND_READY = const(26)
 */
 
 // bluetooth.UUID type.
@@ -250,7 +265,15 @@ int mp_bluetooth_gattc_write(uint16_t conn_handle, uint16_t value_handle, const
 
 // Initiate MTU exchange for a specific connection using the preferred MTU.
 int mp_bluetooth_gattc_exchange_mtu(uint16_t conn_handle);
-#endif
+#endif // MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE
+
+#if MICROPY_PY_BLUETOOTH_ENABLE_L2CAP_CHANNELS
+int mp_bluetooth_l2cap_listen(uint16_t psm, uint16_t mtu);
+int mp_bluetooth_l2cap_connect(uint16_t conn_handle, uint16_t psm, uint16_t mtu);
+int mp_bluetooth_l2cap_disconnect(uint16_t conn_handle, uint16_t cid);
+int mp_bluetooth_l2cap_send(uint16_t conn_handle, uint16_t cid, const uint8_t *buf, size_t len, bool *stalled);
+int mp_bluetooth_l2cap_recvinto(uint16_t conn_handle, uint16_t cid, uint8_t *buf, size_t *len);
+#endif // MICROPY_PY_BLUETOOTH_ENABLE_L2CAP_CHANNELS
 
 /////////////////////////////////////////////////////////////////////////////
 // API implemented by modbluetooth (called by port-specific implementations):
@@ -294,7 +317,15 @@ void mp_bluetooth_gattc_on_data_available(uint8_t event, uint16_t conn_handle, u
 
 // Notify modbluetooth that a read or write operation has completed.
 void mp_bluetooth_gattc_on_read_write_status(uint8_t event, uint16_t conn_handle, uint16_t value_handle, uint16_t status);
-#endif
+#endif // MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE
+
+#if MICROPY_PY_BLUETOOTH_ENABLE_L2CAP_CHANNELS
+mp_int_t mp_bluetooth_gattc_on_l2cap_accept(uint16_t conn_handle, uint16_t cid, uint16_t psm, uint16_t our_mtu, uint16_t peer_mtu);
+void mp_bluetooth_gattc_on_l2cap_connect(uint16_t conn_handle, uint16_t cid, uint16_t psm, uint16_t our_mtu, uint16_t peer_mtu);
+void mp_bluetooth_gattc_on_l2cap_disconnect(uint16_t conn_handle, uint16_t cid, uint16_t psm, uint16_t status);
+void mp_bluetooth_gattc_on_l2cap_send_ready(uint16_t conn_handle, uint16_t cid, uint8_t status);
+void mp_bluetooth_gattc_on_l2cap_recv(uint16_t conn_handle, uint16_t cid);
+#endif // MICROPY_PY_BLUETOOTH_ENABLE_L2CAP_CHANNELS
 
 // For stacks that don't manage attribute value data (currently all of them), helpers
 // to store this in a map, keyed by value handle.
diff --git a/extmod/nimble/modbluetooth_nimble.c b/extmod/nimble/modbluetooth_nimble.c
index c961aee3262c9..fa416ebc3f529 100644
--- a/extmod/nimble/modbluetooth_nimble.c
+++ b/extmod/nimble/modbluetooth_nimble.c
@@ -42,6 +42,10 @@
 #include "services/gap/ble_svc_gap.h"
 #include "services/gatt/ble_svc_gatt.h"
 
+// We need the definition of "struct ble_l2cap_chan".
+// See l2cap_channel_event() for details.
+#include "nimble/host/src/ble_l2cap_priv.h"
+
 #ifndef MICROPY_PY_BLUETOOTH_DEFAULT_GAP_NAME
 #define MICROPY_PY_BLUETOOTH_DEFAULT_GAP_NAME "MPY NIMBLE"
 #endif
@@ -66,6 +70,7 @@ STATIC int8_t ble_hs_err_to_errno_table[] = {
     [BLE_HS_ETIMEOUT] = MP_ETIMEDOUT,
     [BLE_HS_EDONE] = MP_EIO,               // TODO: Maybe should be MP_EISCONN (connect uses this for "already connected").
     [BLE_HS_EBUSY] = MP_EBUSY,
+    [BLE_HS_EBADDATA] = MP_EINVAL,
 };
 
 STATIC int ble_hs_err_to_errno(int err) {
@@ -1110,4 +1115,331 @@ int mp_bluetooth_gattc_exchange_mtu(uint16_t conn_handle) {
 
 #endif // MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE
 
+#if MICROPY_PY_BLUETOOTH_ENABLE_L2CAP_CHANNELS
+
+// Fortunately NimBLE uses mbuf chains correctly with L2CAP COC (rather than
+// accessing the mbuf internals directly), so we can use a small block size to
+// avoid excessive fragmentation and rely on them chaining together for larger
+// payloads.
+#define L2CAP_BUF_BLOCK_SIZE (128)
+
+// This gives us enough room to have one MTU-size transmit buffer and two
+// MTU-sized receive buffers. Note that we use the local MTU to calculate
+// the buffer size. This means that if the peer MTU is larger, then
+// there might not be enough space in the pool to send a full peer-MTU
+// sized payload and mp_bluetooth_l2cap_send will return ENOMEM.
+#define L2CAP_BUF_SIZE_MTUS_PER_CHANNEL (3)
+
+typedef struct _mp_bluetooth_nimble_l2cap_channel_t {
+    struct ble_l2cap_chan *chan;
+    struct os_mbuf_pool sdu_mbuf_pool;
+    struct os_mempool sdu_mempool;
+    struct os_mbuf *rx_pending;
+    uint16_t mtu;
+    os_membuf_t sdu_mem[];
+} mp_bluetooth_nimble_l2cap_channel_t;
+
+STATIC void destroy_l2cap_channel() {
+    // Only free the l2cap channel if we're the one that initiated the connection.
+    // Listeners continue listening on the same channel.
+    if (!MP_STATE_PORT(bluetooth_nimble_root_pointers)->l2cap_listening) {
+        MP_STATE_PORT(bluetooth_nimble_root_pointers)->l2cap_chan = NULL;
+    }
+}
+
+STATIC int l2cap_channel_event(struct ble_l2cap_event *event, void *arg) {
+    DEBUG_printf("l2cap_channel_event: type=%d\n", event->type);
+    mp_bluetooth_nimble_l2cap_channel_t *chan = (mp_bluetooth_nimble_l2cap_channel_t *)arg;
+    struct ble_l2cap_chan_info info;
+
+    switch (event->type) {
+        case BLE_L2CAP_EVENT_COC_CONNECTED: {
+            DEBUG_printf("l2cap_channel_event: connect: conn_handle=%d status=%d\n", event->connect.conn_handle, event->connect.status);
+            chan->chan = event->connect.chan;
+
+            ble_l2cap_get_chan_info(event->connect.chan, &info);
+            if (event->connect.status == 0) {
+                mp_bluetooth_gattc_on_l2cap_connect(event->connect.conn_handle, info.scid, info.psm, info.our_coc_mtu, info.peer_coc_mtu);
+            } else {
+                mp_bluetooth_gattc_on_l2cap_disconnect(event->connect.conn_handle, info.scid, info.psm, event->connect.status);
+                destroy_l2cap_channel();
+            }
+            break;
+        }
+        case BLE_L2CAP_EVENT_COC_DISCONNECTED: {
+            DEBUG_printf("l2cap_channel_event: disconnect: conn_handle=%d\n", event->disconnect.conn_handle);
+            ble_l2cap_get_chan_info(event->disconnect.chan, &info);
+            mp_bluetooth_gattc_on_l2cap_disconnect(event->disconnect.conn_handle, info.scid, info.psm, 0);
+            destroy_l2cap_channel();
+            break;
+        }
+        case BLE_L2CAP_EVENT_COC_ACCEPT: {
+            DEBUG_printf("l2cap_channel_event: accept: conn_handle=%d peer_sdu_size=%d\n", event->accept.conn_handle, event->accept.peer_sdu_size);
+            chan->chan = event->accept.chan;
+            ble_l2cap_get_chan_info(event->accept.chan, &info);
+            int ret = mp_bluetooth_gattc_on_l2cap_accept(event->accept.conn_handle, info.scid, info.psm, info.our_coc_mtu, info.peer_coc_mtu);
+            if (ret != 0) {
+                return ret;
+            }
+            struct os_mbuf *sdu_rx = os_mbuf_get_pkthdr(&chan->sdu_mbuf_pool, 0);
+            assert(sdu_rx);
+            return ble_l2cap_recv_ready(chan->chan, sdu_rx);
+        }
+        case BLE_L2CAP_EVENT_COC_DATA_RECEIVED: {
+            DEBUG_printf("l2cap_channel_event: receive: conn_handle=%d len=%d\n", event->receive.conn_handle, OS_MBUF_PKTLEN(event->receive.sdu_rx));
+
+            if (chan->rx_pending) {
+                // Ideally this doesn't happen, as the sender should not get
+                // any more credits to send more data until we call
+                // ble_l2cap_recv_ready. However there might be multiple
+                // in-flight packets if the sender was able to send more than
+                // one before stalling.
+                DEBUG_printf("l2cap_channel_event: receive: appending to rx pending\n");
+                // Note: os_mbuf_concat will just join the two together, so
+                // sdu_rx is now "owned" by rx_pending.
+                os_mbuf_concat(chan->rx_pending, event->receive.sdu_rx);
+            } else {
+                // Normal case is when the first payload arrives since calling
+                // ble_l2cap_recv_ready.
+                DEBUG_printf("l2cap_event: receive: new payload\n");
+                // Take ownership of sdu_rx.
+                chan->rx_pending = event->receive.sdu_rx;
+            }
+
+            struct os_mbuf *sdu_rx = os_mbuf_get_pkthdr(&chan->sdu_mbuf_pool, 0);
+            assert(sdu_rx);
+
+            // ble_l2cap_coc_rx_fn invokes this event handler when a complete payload arrives.
+            // However, it NULLs chan->chan->coc_rx.sdu before doing so, expecting that
+            // ble_l2cap_recv_ready will be called to give it a new mbuf.
+            // This means that if another payload arrives before we call ble_l2cap_recv_ready
+            // then ble_l2cap_coc_rx_fn will NULL-deref coc_rx.sdu.
+
+            // Because we're not yet ready to grant new credits to the channel, we can't call
+            // ble_l2cap_recv_ready yet, so instead we just give it a new mbuf. This requires
+            // ble_l2cap_priv.h for the definition of chan->chan (i.e. struct ble_l2cap_chan).
+            chan->chan->coc_rx.sdu = sdu_rx;
+
+            ble_l2cap_get_chan_info(event->receive.chan, &info);
+            mp_bluetooth_gattc_on_l2cap_recv(event->receive.conn_handle, info.scid);
+            break;
+        }
+        case BLE_L2CAP_EVENT_COC_TX_UNSTALLED: {
+            DEBUG_printf("l2cap_channel_event: tx_unstalled: conn_handle=%d status=%d\n", event->tx_unstalled.conn_handle, event->tx_unstalled.status);
+            ble_l2cap_get_chan_info(event->receive.chan, &info);
+            // Map status to {0,1} (i.e. "sent everything", or "partial send").
+            mp_bluetooth_gattc_on_l2cap_send_ready(event->tx_unstalled.conn_handle, info.scid, event->tx_unstalled.status == 0 ? 0 : 1);
+            break;
+        }
+        case BLE_L2CAP_EVENT_COC_RECONFIG_COMPLETED: {
+            DEBUG_printf("l2cap_channel_event: reconfig_completed: conn_handle=%d\n", event->reconfigured.conn_handle);
+            break;
+        }
+        case BLE_L2CAP_EVENT_COC_PEER_RECONFIGURED: {
+            DEBUG_printf("l2cap_channel_event: peer_reconfigured: conn_handle=%d\n", event->reconfigured.conn_handle);
+            break;
+        }
+        default: {
+            DEBUG_printf("l2cap_channel_event: unknown event\n");
+            break;
+        }
+    }
+
+    return 0;
+}
+
+STATIC mp_bluetooth_nimble_l2cap_channel_t *get_l2cap_channel_for_conn_cid(uint16_t conn_handle, uint16_t cid) {
+    // TODO: Support more than one concurrent L2CAP channel. At the moment we
+    // just verify that the cid refers to the current channel.
+    mp_bluetooth_nimble_l2cap_channel_t *chan = MP_STATE_PORT(bluetooth_nimble_root_pointers)->l2cap_chan;
+
+    if (!chan) {
+        return NULL;
+    }
+
+    struct ble_l2cap_chan_info info;
+    ble_l2cap_get_chan_info(chan->chan, &info);
+
+    if (info.scid != cid || ble_l2cap_get_conn_handle(chan->chan) != conn_handle) {
+        return NULL;
+    }
+
+    return chan;
+}
+
+STATIC int create_l2cap_channel(uint16_t mtu, mp_bluetooth_nimble_l2cap_channel_t **out) {
+    if (MP_STATE_PORT(bluetooth_nimble_root_pointers)->l2cap_chan) {
+        // Only one L2CAP channel allowed.
+        // Additionally, if we're listening, then no connections may be initiated.
+        DEBUG_printf("create_l2cap_channel: channel already in use\n");
+        return MP_EALREADY;
+    }
+
+    // We want the TX and RX buffers to share a pool that is some multiple of
+    // the MTU size. Figure out how many blocks per MTU (rounding up), then
+    // multiply that by the "MTUs per channel" (set to 3 above).
+    const size_t buf_blocks = MP_CEIL_DIVIDE(mtu, L2CAP_BUF_BLOCK_SIZE) * L2CAP_BUF_SIZE_MTUS_PER_CHANNEL;
+
+    mp_bluetooth_nimble_l2cap_channel_t *chan = m_new_obj_var(mp_bluetooth_nimble_l2cap_channel_t, uint8_t, OS_MEMPOOL_SIZE(buf_blocks, L2CAP_BUF_BLOCK_SIZE) * sizeof(os_membuf_t));
+    MP_STATE_PORT(bluetooth_nimble_root_pointers)->l2cap_chan = chan;
+
+    // Will be set in BLE_L2CAP_EVENT_COC_CONNECTED or BLE_L2CAP_EVENT_COC_ACCEPT.
+    chan->chan = NULL;
+
+    chan->mtu = mtu;
+    chan->rx_pending = NULL;
+
+    int err = os_mempool_init(&chan->sdu_mempool, buf_blocks, L2CAP_BUF_BLOCK_SIZE, chan->sdu_mem, "l2cap_sdu_pool");
+    if (err != 0) {
+        DEBUG_printf("mp_bluetooth_l2cap_connect: os_mempool_init failed %d\n", err);
+        return MP_ENOMEM;
+    }
+
+    err = os_mbuf_pool_init(&chan->sdu_mbuf_pool, &chan->sdu_mempool, L2CAP_BUF_BLOCK_SIZE, buf_blocks);
+    if (err != 0) {
+        DEBUG_printf("mp_bluetooth_l2cap_connect: os_mbuf_pool_init failed %d\n", err);
+        return MP_ENOMEM;
+    }
+
+    *out = chan;
+    return 0;
+}
+
+int mp_bluetooth_l2cap_listen(uint16_t psm, uint16_t mtu) {
+    DEBUG_printf("mp_bluetooth_l2cap_listen: psm=%d, mtu=%d\n", psm, mtu);
+
+    mp_bluetooth_nimble_l2cap_channel_t *chan;
+    int err = create_l2cap_channel(mtu, &chan);
+    if (err != 0) {
+        return err;
+    }
+
+    MP_STATE_PORT(bluetooth_nimble_root_pointers)->l2cap_listening = true;
+
+    return ble_hs_err_to_errno(ble_l2cap_create_server(psm, mtu, &l2cap_channel_event, chan));
+}
+
+int mp_bluetooth_l2cap_connect(uint16_t conn_handle, uint16_t psm, uint16_t mtu) {
+    DEBUG_printf("mp_bluetooth_l2cap_connect: conn_handle=%d, psm=%d, mtu=%d\n", conn_handle, psm, mtu);
+
+    mp_bluetooth_nimble_l2cap_channel_t *chan;
+    int err = create_l2cap_channel(mtu, &chan);
+    if (err != 0) {
+        return err;
+    }
+
+    struct os_mbuf *sdu_rx = os_mbuf_get_pkthdr(&chan->sdu_mbuf_pool, 0);
+    assert(sdu_rx);
+    return ble_hs_err_to_errno(ble_l2cap_connect(conn_handle, psm, mtu, sdu_rx, &l2cap_channel_event, chan));
+}
+
+int mp_bluetooth_l2cap_disconnect(uint16_t conn_handle, uint16_t cid) {
+    DEBUG_printf("mp_bluetooth_l2cap_disconnect: conn_handle=%d, cid=%d\n", conn_handle, cid);
+    mp_bluetooth_nimble_l2cap_channel_t *chan = get_l2cap_channel_for_conn_cid(conn_handle, cid);
+    if (!chan) {
+        return MP_EINVAL;
+    }
+    return ble_hs_err_to_errno(ble_l2cap_disconnect(chan->chan));
+}
+
+int mp_bluetooth_l2cap_send(uint16_t conn_handle, uint16_t cid, const uint8_t *buf, size_t len, bool *stalled) {
+    DEBUG_printf("mp_bluetooth_l2cap_send: conn_handle=%d, cid=%d, len=%d\n", conn_handle, cid, (int)len);
+
+    mp_bluetooth_nimble_l2cap_channel_t *chan = get_l2cap_channel_for_conn_cid(conn_handle, cid);
+    if (!chan) {
+        return MP_EINVAL;
+    }
+
+    struct ble_l2cap_chan_info info;
+    ble_l2cap_get_chan_info(chan->chan, &info);
+    if (len > info.peer_coc_mtu) {
+        // This is verified by ble_l2cap_send anyway, but this lets us
+        // avoid copying a too-large buffer into an mbuf.
+        return MP_EINVAL;
+    }
+
+    if (len > (L2CAP_BUF_SIZE_MTUS_PER_CHANNEL - 1) * info.our_coc_mtu) {
+        // Always ensure there's at least one local MTU of space left in the buffer
+        // for the RX buffer.
+        return MP_EINVAL;
+    }
+
+    // Grab an mbuf from the pool, and append the incoming buffer to it.
+    struct os_mbuf *sdu_tx = os_mbuf_get_pkthdr(&chan->sdu_mbuf_pool, 0);
+    if (sdu_tx == NULL) {
+        return MP_ENOMEM;
+    }
+    int err = os_mbuf_append(sdu_tx, buf, len);
+    if (err) {
+        os_mbuf_free_chain(sdu_tx);
+        return MP_ENOMEM;
+    }
+
+    err = ble_l2cap_send(chan->chan, sdu_tx);
+    if (err == BLE_HS_ESTALLED) {
+        // Stalled means that this one will still send but any future ones
+        // will fail until we receive an unstalled event.
+        *stalled = true;
+        err = 0;
+    } else {
+        *stalled = false;
+    }
+
+    // Other error codes such as BLE_HS_EBUSY (we're stalled) or BLE_HS_EBADDATA (bigger than MTU).
+    return ble_hs_err_to_errno(err);
+}
+
+int mp_bluetooth_l2cap_recvinto(uint16_t conn_handle, uint16_t cid, uint8_t *buf, size_t *len) {
+    mp_bluetooth_nimble_l2cap_channel_t *chan = get_l2cap_channel_for_conn_cid(conn_handle, cid);
+    if (!chan) {
+        return MP_EINVAL;
+    }
+
+    MICROPY_PY_BLUETOOTH_ENTER
+    if (chan->rx_pending) {
+        size_t avail = OS_MBUF_PKTLEN(chan->rx_pending);
+
+        if (buf == NULL) {
+            // Can use this to implement a poll - just find out how much is available.
+            *len = avail;
+        } else {
+            // Have dest buffer and data available.
+            // Figure out how much we should copy.
+            *len = min(*len, avail);
+
+            // Extract the required number of bytes.
+            os_mbuf_copydata(chan->rx_pending, 0, *len, buf);
+
+            if (*len == avail) {
+                // That's all that's available -- free this mbuf and re-enable receiving.
+                os_mbuf_free_chain(chan->rx_pending);
+                chan->rx_pending = NULL;
+
+                // We've already given the channel a new mbuf in l2cap_channel_event above, so
+                // re-use that mbuf in the call to ble_l2cap_recv_ready. This will just
+                // give the channel more credits.
+                struct os_mbuf *sdu_rx = chan->chan->coc_rx.sdu;
+                assert(sdu_rx);
+                if (sdu_rx) {
+                    ble_l2cap_recv_ready(chan->chan, sdu_rx);
+                }
+            } else {
+                // Trim the used bytes from the start of the mbuf.
+                // Positive argument means "trim this many from head".
+                os_mbuf_adj(chan->rx_pending, *len);
+                // Clean up any empty mbufs at the head.
+                chan->rx_pending = os_mbuf_trim_front(chan->rx_pending);
+            }
+        }
+    } else {
+        // No pending data.
+        *len = 0;
+    }
+
+    MICROPY_PY_BLUETOOTH_EXIT
+    return 0;
+}
+
+#endif // MICROPY_PY_BLUETOOTH_ENABLE_L2CAP_CHANNELS
+
 #endif // MICROPY_PY_BLUETOOTH && MICROPY_BLUETOOTH_NIMBLE
diff --git a/extmod/nimble/modbluetooth_nimble.h b/extmod/nimble/modbluetooth_nimble.h
index 7e401781e7f9c..9ed64368b2d5f 100644
--- a/extmod/nimble/modbluetooth_nimble.h
+++ b/extmod/nimble/modbluetooth_nimble.h
@@ -38,6 +38,12 @@ typedef struct _mp_bluetooth_nimble_root_pointers_t {
     // Pending service definitions.
     size_t n_services;
     struct ble_gatt_svc_def *services[MP_BLUETOOTH_NIMBLE_MAX_SERVICES];
+
+    #if MICROPY_PY_BLUETOOTH_ENABLE_L2CAP_CHANNELS
+    // L2CAP channels.
+    struct _mp_bluetooth_nimble_l2cap_channel_t *l2cap_chan;
+    bool l2cap_listening;
+    #endif
 } mp_bluetooth_nimble_root_pointers_t;
 
 enum {
diff --git a/extmod/nimble/nimble/nimble_npl_os.h b/extmod/nimble/nimble/nimble_npl_os.h
index bfabe56e895c0..d0803f7e2e81d 100644
--- a/extmod/nimble/nimble/nimble_npl_os.h
+++ b/extmod/nimble/nimble/nimble_npl_os.h
@@ -30,12 +30,25 @@
 // This is included by nimble/nimble_npl.h -- include that rather than this file directly.
 
 #include <stdint.h>
+#include <limits.h>
 
 // --- Configuration of NimBLE data structures --------------------------------
 
+// This is used at runtime to align allocations correctly.
 #define BLE_NPL_OS_ALIGNMENT (sizeof(uintptr_t))
 #define BLE_NPL_TIME_FOREVER (0xffffffff)
 
+// This is used at compile time to force struct member alignment. See
+// os_mempool.h for where this is used (none of these three macros are defined
+// by default).
+#define OS_CFG_ALIGN_4 (4)
+#define OS_CFG_ALIGN_8 (8)
+#if (ULONG_MAX == 0xffffffffffffffff)
+#define OS_CFG_ALIGNMENT (OS_CFG_ALIGN_8)
+#else
+#define OS_CFG_ALIGNMENT (OS_CFG_ALIGN_4)
+#endif
+
 typedef uint32_t ble_npl_time_t;
 typedef int32_t ble_npl_stime_t;
 
diff --git a/extmod/nimble/syscfg/syscfg.h b/extmod/nimble/syscfg/syscfg.h
index 8a6f2338be2ab..bef6b3b9210d4 100644
--- a/extmod/nimble/syscfg/syscfg.h
+++ b/extmod/nimble/syscfg/syscfg.h
@@ -99,9 +99,11 @@ int nimble_sprintf(char *str, const char *fmt, ...);
 #define MYNEWT_VAL_BLE_HS_PHONY_HCI_ACKS (0)
 #define MYNEWT_VAL_BLE_HS_REQUIRE_OS (1)
 #define MYNEWT_VAL_BLE_HS_STOP_ON_SHUTDOWN_TIMEOUT (2000)
-#define MYNEWT_VAL_BLE_L2CAP_COC_MAX_NUM (0)
+#define MYNEWT_VAL_BLE_L2CAP_COC_MAX_NUM (1)
+#define MYNEWT_VAL_BLE_L2CAP_COC_MPS (MYNEWT_VAL_MSYS_1_BLOCK_SIZE - 8)
+#define MYNEWT_VAL_BLE_L2CAP_ENHANCED_COC (0)
 #define MYNEWT_VAL_BLE_L2CAP_JOIN_RX_FRAGS (1)
-#define MYNEWT_VAL_BLE_L2CAP_MAX_CHANS (3*MYNEWT_VAL_BLE_MAX_CONNECTIONS)
+#define MYNEWT_VAL_BLE_L2CAP_MAX_CHANS (3 * MYNEWT_VAL_BLE_MAX_CONNECTIONS)
 #define MYNEWT_VAL_BLE_L2CAP_RX_FRAG_TIMEOUT (30000)
 #define MYNEWT_VAL_BLE_L2CAP_SIG_MAX_PROCS (1)
 #define MYNEWT_VAL_BLE_MONITOR_CONSOLE_BUFFER_SIZE (128)
diff --git a/ports/stm32/Makefile b/ports/stm32/Makefile
index 75090a077e2bf..ced851ca38e27 100644
--- a/ports/stm32/Makefile
+++ b/ports/stm32/Makefile
@@ -499,6 +499,7 @@ endif
 endif
 
 ifeq ($(MICROPY_BLUETOOTH_NIMBLE),1)
+CFLAGS_MOD += -DMICROPY_PY_BLUETOOTH_ENABLE_L2CAP_CHANNELS=1
 include $(TOP)/extmod/nimble/nimble.mk
 SRC_C += mpnimbleport.c
 endif
diff --git a/ports/unix/Makefile b/ports/unix/Makefile
index f72c05f1add78..6a936a242545c 100644
--- a/ports/unix/Makefile
+++ b/ports/unix/Makefile
@@ -182,6 +182,7 @@ else
 
 # NimBLE is enabled.
 GIT_SUBMODULES += lib/mynewt-nimble
+CFLAGS_MOD += -DMICROPY_PY_BLUETOOTH_ENABLE_L2CAP_CHANNELS=1
 include $(TOP)/extmod/nimble/nimble.mk
 
 endif
diff --git a/py/misc.h b/py/misc.h
index aac90724460cf..fe2b3b8afaa75 100644
--- a/py/misc.h
+++ b/py/misc.h
@@ -53,6 +53,9 @@ typedef unsigned int uint;
 // Static assertion macro
 #define MP_STATIC_ASSERT(cond) ((void)sizeof(char[1 - 2 * !(cond)]))
 
+// Round-up integer division
+#define MP_CEIL_DIVIDE(a, b) (((a) + (b) - 1) / (b))
+
 /** memory allocation ******************************************/
 
 // TODO make a lazy m_renew that can increase by a smaller amount than requested (but by at least 1 more element)

From 3795c71271aa51902854911a20b020db6b2d274b Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Tue, 17 Nov 2020 23:30:06 +1100
Subject: [PATCH 0421/3533] docs/library/ubluetooth.rst: Add docs for L2CAP
 channels.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 docs/library/ubluetooth.rst | 116 ++++++++++++++++++++++++++++++++++--
 1 file changed, 111 insertions(+), 5 deletions(-)

diff --git a/docs/library/ubluetooth.rst b/docs/library/ubluetooth.rst
index f94ad3a612c07..35ac13ad56fa9 100644
--- a/docs/library/ubluetooth.rst
+++ b/docs/library/ubluetooth.rst
@@ -6,8 +6,9 @@
 
 This module provides an interface to a Bluetooth controller on a board.
 Currently this supports Bluetooth Low Energy (BLE) in Central, Peripheral,
-Broadcaster, and Observer roles, as well as GATT Server and Client. A device
-may operate in multiple roles concurrently.
+Broadcaster, and Observer roles, as well as GATT Server and Client and L2CAP
+connection-oriented-channels. A device may operate in multiple roles
+concurrently.
 
 This API is intended to match the low-level Bluetooth protocol and provide
 building-blocks for higher-level abstractions such as specific device types.
@@ -72,9 +73,9 @@ Configuration
       Increasing this allows better handling of bursty incoming data (for
       example scan results) and the ability to receive larger characteristic values.
 
-    - ``'mtu'``: Get/set the MTU that will be used during an MTU exchange. The
+    - ``'mtu'``: Get/set the MTU that will be used during a ATT MTU exchange. The
       resulting MTU will be the minimum of this and the remote device's MTU.
-      MTU exchange will not happen automatically (unless the remote device initiates
+      ATT MTU exchange will not happen automatically (unless the remote device initiates
       it), and must be manually initiated with
       :meth:`gattc_exchange_mtu<BLE.gattc_exchange_mtu>`.
       Use the ``_IRQ_MTU_EXCHANGED`` event to discover the MTU for a given connection.
@@ -179,8 +180,25 @@ Event Handling
                 # Note: Status will be zero on successful acknowledgment, implementation-specific value otherwise.
                 conn_handle, value_handle, status = data
             elif event == _IRQ_MTU_EXCHANGED:
-                # MTU exchange complete (either initiated by us or the remote device).
+                # ATT MTU exchange complete (either initiated by us or the remote device).
                 conn_handle, mtu = data
+            elif event == _IRQ_L2CAP_ACCEPT:
+                # A new channel has been accepted.
+                # Return a non-zero integer to reject the connection, or zero (or None) to accept.
+                conn_handle, cid, psm, our_mtu, peer_mtu = data
+            elif event == _IRQ_L2CAP_CONNECT:
+                # A new channel is now connected (either as a result of connecting or accepting).
+                conn_handle, cid, psm, our_mtu, peer_mtu = data
+            elif event == _IRQ_L2CAP_DISCONNECT:
+                # Existing channel has disconnected (status is zero), or a connection attempt failed (non-zero status).
+                conn_handle, cid, psm, status = data
+            elif event == _IRQ_L2CAP_RECV:
+                # New data is available on the channel. Use l2cap_recvinto to read.
+                conn_handle, cid = data
+            elif event == _IRQ_L2CAP_SEND_READY:
+                # A previous l2cap_send that returned False has now completed and the channel is ready to send again.
+                # If status is non-zero, then the transmit buffer overflowed and the application should re-send the data.
+                conn_handle, cid, status = data
 
 The event codes are::
 
@@ -206,6 +224,11 @@ The event codes are::
     _IRQ_GATTC_INDICATE = const(19)
     _IRQ_GATTS_INDICATE_DONE = const(20)
     _IRQ_MTU_EXCHANGED = const(21)
+    _IRQ_L2CAP_ACCEPT = const(22)
+    _IRQ_L2CAP_CONNECT = const(23)
+    _IRQ_L2CAP_DISCONNECT = const(24)
+    _IRQ_L2CAP_RECV = const(25)
+    _IRQ_L2CAP_SEND_READY = const(26)
 
 In order to save space in the firmware, these constants are not included on the
 :mod:`ubluetooth` module. Add the ones that you need from the list above to your
@@ -493,6 +516,89 @@ device name from the device information service).
     peripheral initiating the MTU exchange. NimBLE works for both roles.
 
 
+L2CAP connection-oriented-channels
+----------------------------------
+
+    This feature allows for socket-like data exchange between two BLE devices.
+    Once the devices are connected via GAP, either device can listen for the
+    other to connect on a numeric PSM (Protocol/Service Multiplexer).
+
+    **Note:** This is currently only supported when using the NimBLE stack on
+    STM32 and Unix (not ESP32). Only one L2CAP channel may be active at a given
+    time (i.e. you cannot connect while listening).
+
+    Active L2CAP channels are identified by the connection handle that they were
+    established on and a CID (channel ID).
+
+    Connection-oriented channels have built-in credit-based flow control. Unlike
+    ATT, where devices negotiate a shared MTU, both the listening and connecting
+    devices each set an independent MTU which limits the maximum amount of
+    outstanding data that the remote device can send before it is fully consumed
+    in :meth:`l2cap_recvinto <BLE.l2cap_recvinto>`.
+
+.. method:: BLE.l2cap_listen(psm, mtu, /)
+
+    Start listening for incoming L2CAP channel requests on the specified *psm*
+    with the local MTU set to *mtu*.
+
+    When a remote device initiates a connection, the ``_IRQ_L2CAP_ACCEPT``
+    event will be raised, which gives the listening server a chance to reject
+    the incoming connection (by returning a non-zero integer).
+
+    Once the connection is accepted, the ``_IRQ_L2CAP_CONNECT`` event will be
+    raised, allowing the server to obtain the channel id (CID) and the local and
+    remote MTU.
+
+    **Note:** It is not currently possible to stop listening.
+
+.. method:: BLE.l2cap_connect(conn_handle, psm, mtu, /)
+
+    Connect to a listening peer on the specified *psm* with local MTU set to *mtu*.
+
+    On successful connection, the the ``_IRQ_L2CAP_CONNECT`` event will be
+    raised, allowing the client to obtain the CID and the local and remote (peer) MTU.
+
+    An unsuccessful connection will raise the ``_IRQ_L2CAP_DISCONNECT`` event
+    with a non-zero status.
+
+.. method:: BLE.l2cap_disconnect(conn_handle, cid, /)
+
+    Disconnect an active L2CAP channel with the specified *conn_handle* and
+    *cid*.
+
+.. method:: BLE.l2cap_send(conn_handle, cid, buf, /)
+
+    Send the specified *buf* (which must support the buffer protocol) on the
+    L2CAP channel identified by *conn_handle* and *cid*.
+
+    The specified buffer cannot be larger than the remote (peer) MTU, and no
+    more than twice the size of the local MTU.
+
+    This will return ``False`` if the channel is now "stalled", which means that
+    :meth:`l2cap_send <BLE.l2cap_send>` must not be called again until the
+    ``_IRQ_L2CAP_SEND_READY`` event is received (which will happen when the
+    remote device grants more credits, typically after it has received and
+    processed the data).
+
+.. method:: BLE.l2cap_recvinto(conn_handle, cid, buf, /)
+
+    Receive data from the specified *conn_handle* and *cid* into the provided
+    *buf* (which must support the buffer protocol, e.g. bytearray or
+    memoryview).
+
+    Returns the number of bytes read from the channel.
+
+    If *buf* is None, then returns the number of bytes available.
+
+    **Note:** After receiving the ``_IRQ_L2CAP_RECV`` event, the application should
+    continue calling :meth:`l2cap_recvinto <BLE.l2cap_recvinto>` until no more
+    bytes are available in the receive buffer (typically up to the size of the
+    remote (peer) MTU).
+
+    Until the receive buffer is empty, the remote device will not be granted
+    more channel credits and will be unable to send any more data.
+
+
 class UUID
 ----------
 

From 23fad2526db2bbc8b6b07bfd67cc6feba1770249 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Tue, 17 Nov 2020 23:30:23 +1100
Subject: [PATCH 0422/3533] tests/multi_bluetooth: Add L2CAP channels
 multi-test.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 tests/multi_bluetooth/ble_l2cap.py     | 175 +++++++++++++++++++++++++
 tests/multi_bluetooth/ble_l2cap.py.exp |  23 ++++
 2 files changed, 198 insertions(+)
 create mode 100644 tests/multi_bluetooth/ble_l2cap.py
 create mode 100644 tests/multi_bluetooth/ble_l2cap.py.exp

diff --git a/tests/multi_bluetooth/ble_l2cap.py b/tests/multi_bluetooth/ble_l2cap.py
new file mode 100644
index 0000000000000..a26f59b3ef0f9
--- /dev/null
+++ b/tests/multi_bluetooth/ble_l2cap.py
@@ -0,0 +1,175 @@
+# Test L2CAP COC send/recv.
+
+# Sends a sequence of varying-sized payloads from central->peripheral, and
+# verifies that the other device sees the same data, then does the same thing
+# peripheral->central.
+
+from micropython import const
+import time, machine, bluetooth, random
+
+TIMEOUT_MS = 1000
+
+_IRQ_CENTRAL_CONNECT = const(1)
+_IRQ_CENTRAL_DISCONNECT = const(2)
+_IRQ_PERIPHERAL_CONNECT = const(7)
+_IRQ_PERIPHERAL_DISCONNECT = const(8)
+_IRQ_L2CAP_ACCEPT = const(22)
+_IRQ_L2CAP_CONNECT = const(23)
+_IRQ_L2CAP_DISCONNECT = const(24)
+_IRQ_L2CAP_RECV = const(25)
+_IRQ_L2CAP_SEND_READY = const(26)
+
+_L2CAP_MTU = const(450)
+_L2CAP_PSM = const(22)
+
+_PAYLOAD_LEN = const(_L2CAP_MTU - 50)
+_PAYLOAD_LEN_STEP = -23
+_NUM_PAYLOADS = const(16)
+
+_RANDOM_SEED = 22
+
+
+waiting_events = {}
+
+
+def irq(event, data):
+    if event == _IRQ_CENTRAL_CONNECT:
+        conn_handle, addr_type, addr = data
+        print("_IRQ_CENTRAL_CONNECT")
+        waiting_events[event] = conn_handle
+    elif event == _IRQ_CENTRAL_DISCONNECT:
+        print("_IRQ_CENTRAL_DISCONNECT")
+    elif event == _IRQ_PERIPHERAL_CONNECT:
+        conn_handle, addr_type, addr = data
+        print("_IRQ_PERIPHERAL_CONNECT")
+        waiting_events[event] = conn_handle
+    elif event == _IRQ_PERIPHERAL_DISCONNECT:
+        print("_IRQ_PERIPHERAL_DISCONNECT")
+    elif event == _IRQ_L2CAP_ACCEPT:
+        conn_handle, cid, psm, our_mtu, peer_mtu = data
+        print("_IRQ_L2CAP_ACCEPT", psm, our_mtu, peer_mtu)
+        waiting_events[event] = (conn_handle, cid, psm)
+    elif event == _IRQ_L2CAP_CONNECT:
+        conn_handle, cid, psm, our_mtu, peer_mtu = data
+        print("_IRQ_L2CAP_CONNECT", psm, our_mtu, peer_mtu)
+        waiting_events[event] = (conn_handle, cid, psm, our_mtu, peer_mtu)
+    elif event == _IRQ_L2CAP_DISCONNECT:
+        conn_handle, cid, psm, status = data
+        print("_IRQ_L2CAP_DISCONNECT", psm, status)
+    elif event == _IRQ_L2CAP_RECV:
+        conn_handle, cid = data
+    elif event == _IRQ_L2CAP_SEND_READY:
+        conn_handle, cid, status = data
+
+    if event not in waiting_events:
+        waiting_events[event] = None
+
+
+def wait_for_event(event, timeout_ms):
+    t0 = time.ticks_ms()
+    while time.ticks_diff(time.ticks_ms(), t0) < timeout_ms:
+        if event in waiting_events:
+            return waiting_events.pop(event)
+        machine.idle()
+    raise ValueError("Timeout waiting for {}".format(event))
+
+
+def send_data(ble, conn_handle, cid):
+    buf = bytearray(_PAYLOAD_LEN)
+    mv = memoryview(buf)
+    print("l2cap_send", _NUM_PAYLOADS, _PAYLOAD_LEN)
+    for i in range(_NUM_PAYLOADS):
+        n = _PAYLOAD_LEN + i * _PAYLOAD_LEN_STEP
+        for j in range(n):
+            buf[j] = random.randint(0, 255)
+        if not ble.l2cap_send(conn_handle, cid, mv[:n]):
+            wait_for_event(_IRQ_L2CAP_SEND_READY, TIMEOUT_MS)
+
+
+def recv_data(ble, conn_handle, cid):
+    buf = bytearray(_PAYLOAD_LEN)
+    recv_bytes = 0
+    recv_correct = 0
+    expected_bytes = (
+        _PAYLOAD_LEN * _NUM_PAYLOADS + _PAYLOAD_LEN_STEP * _NUM_PAYLOADS * (_NUM_PAYLOADS - 1) // 2
+    )
+    print("l2cap_recvinto", expected_bytes)
+    while recv_bytes < expected_bytes:
+        wait_for_event(_IRQ_L2CAP_RECV, TIMEOUT_MS)
+        while True:
+            n = ble.l2cap_recvinto(conn_handle, cid, buf)
+            if n == 0:
+                break
+            recv_bytes += n
+            for i in range(n):
+                if buf[i] == random.randint(0, 255):
+                    recv_correct += 1
+    return recv_bytes, recv_correct
+
+
+# Acting in peripheral role.
+def instance0():
+    multitest.globals(BDADDR=ble.config("mac"))
+    print("gap_advertise")
+    ble.gap_advertise(20_000, b"\x02\x01\x06\x04\xffMPY")
+    multitest.next()
+    try:
+        # Wait for central to connect to us.
+        conn_handle = wait_for_event(_IRQ_CENTRAL_CONNECT, TIMEOUT_MS)
+
+        print("l2cap_listen")
+        ble.l2cap_listen(_L2CAP_PSM, _L2CAP_MTU)
+
+        conn_handle, cid, psm = wait_for_event(_IRQ_L2CAP_ACCEPT, TIMEOUT_MS)
+        conn_handle, cid, psm, our_mtu, peer_mtu = wait_for_event(_IRQ_L2CAP_CONNECT, TIMEOUT_MS)
+
+        random.seed(_RANDOM_SEED)
+
+        recv_bytes, recv_correct = recv_data(ble, conn_handle, cid)
+        send_data(ble, conn_handle, cid)
+
+        wait_for_event(_IRQ_L2CAP_DISCONNECT, TIMEOUT_MS)
+
+        print("received", recv_bytes, recv_correct)
+
+        # Wait for the central to disconnect.
+        wait_for_event(_IRQ_CENTRAL_DISCONNECT, TIMEOUT_MS)
+    finally:
+        ble.active(0)
+
+
+# Acting in central role.
+def instance1():
+    multitest.next()
+    try:
+        # Connect to peripheral and then disconnect.
+        print("gap_connect")
+        ble.gap_connect(*BDADDR)
+        conn_handle = wait_for_event(_IRQ_PERIPHERAL_CONNECT, TIMEOUT_MS)
+
+        print("l2cap_connect")
+        ble.l2cap_connect(conn_handle, _L2CAP_PSM, _L2CAP_MTU)
+        conn_handle, cid, psm, our_mtu, peer_mtu = wait_for_event(_IRQ_L2CAP_CONNECT, TIMEOUT_MS)
+
+        random.seed(_RANDOM_SEED)
+
+        send_data(ble, conn_handle, cid)
+        recv_bytes, recv_correct = recv_data(ble, conn_handle, cid)
+
+        # Disconnect channel.
+        print("l2cap_disconnect")
+        ble.l2cap_disconnect(conn_handle, cid)
+        wait_for_event(_IRQ_L2CAP_DISCONNECT, TIMEOUT_MS)
+
+        print("received", recv_bytes, recv_correct)
+
+        # Disconnect from peripheral.
+        print("gap_disconnect:", ble.gap_disconnect(conn_handle))
+        wait_for_event(_IRQ_PERIPHERAL_DISCONNECT, TIMEOUT_MS)
+    finally:
+        ble.active(0)
+
+
+ble = bluetooth.BLE()
+ble.active(1)
+ble.irq(irq)
diff --git a/tests/multi_bluetooth/ble_l2cap.py.exp b/tests/multi_bluetooth/ble_l2cap.py.exp
new file mode 100644
index 0000000000000..0c572d99fefb1
--- /dev/null
+++ b/tests/multi_bluetooth/ble_l2cap.py.exp
@@ -0,0 +1,23 @@
+--- instance0 ---
+gap_advertise
+_IRQ_CENTRAL_CONNECT
+l2cap_listen
+_IRQ_L2CAP_ACCEPT 22 450 450
+_IRQ_L2CAP_CONNECT 22 450 450
+l2cap_recvinto 3640
+l2cap_send 16 400
+_IRQ_L2CAP_DISCONNECT 22 0
+received 3640 3640
+_IRQ_CENTRAL_DISCONNECT
+--- instance1 ---
+gap_connect
+_IRQ_PERIPHERAL_CONNECT
+l2cap_connect
+_IRQ_L2CAP_CONNECT 22 450 450
+l2cap_send 16 400
+l2cap_recvinto 3640
+l2cap_disconnect
+_IRQ_L2CAP_DISCONNECT 22 0
+received 3640 3640
+gap_disconnect: True
+_IRQ_PERIPHERAL_DISCONNECT

From 5a7027915c3b9ec2dffc3af9530dad90b56b8cc0 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Tue, 24 Nov 2020 07:56:34 +1100
Subject: [PATCH 0423/3533] extmod/nimble/modbluetooth_nimble: Fix build when
 l2cap unavailable.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 extmod/nimble/modbluetooth_nimble.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/extmod/nimble/modbluetooth_nimble.c b/extmod/nimble/modbluetooth_nimble.c
index fa416ebc3f529..bbff26b5354e9 100644
--- a/extmod/nimble/modbluetooth_nimble.c
+++ b/extmod/nimble/modbluetooth_nimble.c
@@ -42,9 +42,11 @@
 #include "services/gap/ble_svc_gap.h"
 #include "services/gatt/ble_svc_gatt.h"
 
+#if MICROPY_PY_BLUETOOTH_ENABLE_L2CAP_CHANNELS
 // We need the definition of "struct ble_l2cap_chan".
 // See l2cap_channel_event() for details.
 #include "nimble/host/src/ble_l2cap_priv.h"
+#endif
 
 #ifndef MICROPY_PY_BLUETOOTH_DEFAULT_GAP_NAME
 #define MICROPY_PY_BLUETOOTH_DEFAULT_GAP_NAME "MPY NIMBLE"

From 6a3d70db9642e29b017f111abaf7fb6238a9b5a6 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sat, 28 Nov 2020 12:21:40 +1100
Subject: [PATCH 0424/3533] tests/extmod: Add vfs_posix.py test for
 uos.VfsPosix class.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/extmod/vfs_posix.py     | 23 +++++++++++++++++++++++
 tests/extmod/vfs_posix.py.exp |  4 ++++
 2 files changed, 27 insertions(+)
 create mode 100644 tests/extmod/vfs_posix.py
 create mode 100644 tests/extmod/vfs_posix.py.exp

diff --git a/tests/extmod/vfs_posix.py b/tests/extmod/vfs_posix.py
new file mode 100644
index 0000000000000..3bea99365d970
--- /dev/null
+++ b/tests/extmod/vfs_posix.py
@@ -0,0 +1,23 @@
+# Test for VfsPosix
+
+try:
+    import uos
+
+    uos.VfsPosix
+except (ImportError, AttributeError):
+    print("SKIP")
+    raise SystemExit
+
+
+# getcwd and chdir
+curdir = uos.getcwd()
+uos.chdir("/")
+print(uos.getcwd())
+uos.chdir(curdir)
+print(uos.getcwd() == curdir)
+
+# stat
+print(type(uos.stat("/")))
+
+# listdir and ilistdir
+print(type(uos.listdir("/")))
diff --git a/tests/extmod/vfs_posix.py.exp b/tests/extmod/vfs_posix.py.exp
new file mode 100644
index 0000000000000..1b1f59b43e5da
--- /dev/null
+++ b/tests/extmod/vfs_posix.py.exp
@@ -0,0 +1,4 @@
+/
+True
+<class 'tuple'>
+<class 'list'>

From be24e6a53faf31926a65c51426591b21f3f09c54 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sat, 28 Nov 2020 17:31:13 +1100
Subject: [PATCH 0425/3533] py/mpprint: Prevent case fall-through when assert
 is disabled.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/mpprint.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/py/mpprint.c b/py/mpprint.c
index c550c1d952f0a..31cf73bb58af9 100644
--- a/py/mpprint.c
+++ b/py/mpprint.c
@@ -557,11 +557,9 @@ int mp_vprintf(const mp_print_t *print, const char *fmt, va_list args) {
             case 'l': {
                 unsigned long long int arg_value = va_arg(args, unsigned long long int);
                 ++fmt;
-                if (*fmt == 'u' || *fmt == 'd') {
-                    chrs += mp_print_int(print, arg_value, *fmt == 'd', 10, 'a', flags, fill, width);
-                    break;
-                }
-                assert(!"unsupported fmt char");
+                assert(*fmt == 'u' || *fmt == 'd' || !"unsupported fmt char");
+                chrs += mp_print_int(print, arg_value, *fmt == 'd', 10, 'a', flags, fill, width);
+                break;
             }
             #endif
             default:

From 547e8a9fe70dee4de92a35b7a98a10bf26a20321 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sun, 29 Nov 2020 18:04:35 +1100
Subject: [PATCH 0426/3533] tools/ci.sh: Add helper script to run CI tasks.

The aim is for this script to be used on any CI platform, as well as run
locally.

Signed-off-by: Damien George <damien@micropython.org>
---
 tools/ci.sh | 461 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 461 insertions(+)
 create mode 100755 tools/ci.sh

diff --git a/tools/ci.sh b/tools/ci.sh
new file mode 100755
index 0000000000000..3b906b449c112
--- /dev/null
+++ b/tools/ci.sh
@@ -0,0 +1,461 @@
+#!/bin/bash
+
+if which nproc > /dev/null; then
+    MAKEOPTS="-j$(nproc)"
+else
+    MAKEOPTS="-j$(sysctl -n hw.ncpu)"
+fi
+
+########################################################################################
+# general helper functions
+
+function ci_gcc_arm_setup {
+    sudo apt-get install gcc-arm-none-eabi libnewlib-arm-none-eabi
+    arm-none-eabi-gcc --version
+}
+
+########################################################################################
+# code formatting
+
+function ci_code_formatting_setup {
+    sudo apt-add-repository --yes --update ppa:pybricks/ppa
+    sudo apt-get install uncrustify
+    pip3 install black
+    uncrustify --version
+    black --version
+}
+
+function ci_code_formatting_run {
+    tools/codeformat.py -v
+}
+
+########################################################################################
+# code size
+
+function ci_code_size_setup {
+    sudo apt-get install gcc-multilib
+    gcc --version
+    ci_gcc_arm_setup
+}
+
+function ci_code_size_build {
+    # starts off at either the ref/pull/N/merge FETCH_HEAD, or the current branch HEAD
+    git checkout -b pull_request # save the current location
+    git remote add upstream https://github.com/micropython/micropython.git
+    git fetch --depth=100 upstream
+    # build reference, save to size0
+    # ignore any errors with this build, in case master is failing
+    git checkout `git merge-base --fork-point upstream/master pull_request`
+    git show -s
+    tools/metrics.py clean bm
+    tools/metrics.py build bm | tee ~/size0 || true
+    # build PR/branch, save to size1
+    git checkout pull_request
+    git log upstream/master..HEAD
+    tools/metrics.py clean bm
+    tools/metrics.py build bm | tee ~/size1
+}
+
+########################################################################################
+# ports/cc3200
+
+function ci_cc3200_setup {
+    ci_gcc_arm_setup
+}
+
+function ci_cc3200_build {
+    make ${MAKEOPTS} -C ports/cc3200 BTARGET=application BTYPE=release
+    make ${MAKEOPTS} -C ports/cc3200 BTARGET=bootloader  BTYPE=release
+}
+
+########################################################################################
+# ports/esp32
+
+function ci_esp32_idf3_setup {
+    sudo pip3 install pyserial 'pyparsing<2.4'
+    curl -L https://dl.espressif.com/dl/xtensa-esp32-elf-linux64-1.22.0-80-g6c4433a-5.2.0.tar.gz | tar zxf -
+    git clone https://github.com/espressif/esp-idf.git
+    echo $(pwd)/xtensa-esp32-elf/bin
+}
+
+function ci_esp32_idf3_build {
+    make ${MAKEOPTS} -C mpy-cross
+    git -C esp-idf checkout $(grep "ESPIDF_SUPHASH_V3 :=" ports/esp32/Makefile | cut -d " " -f 3)
+    git -C esp-idf submodule update --init components/json/cJSON components/esp32/lib components/esptool_py/esptool components/expat/expat components/lwip/lwip components/mbedtls/mbedtls components/micro-ecc/micro-ecc components/nghttp/nghttp2 components/nimble components/bt
+    make ${MAKEOPTS} -C ports/esp32 submodules
+    make ${MAKEOPTS} -C ports/esp32
+}
+
+function ci_esp32_idf4_setup {
+    sudo pip3 install pyserial 'pyparsing<2.4'
+    curl -L https://dl.espressif.com/dl/xtensa-esp32-elf-gcc8_2_0-esp-2019r2-linux-amd64.tar.gz | tar zxf -
+    git clone https://github.com/espressif/esp-idf.git
+    echo $(pwd)/xtensa-esp32-elf/bin
+}
+
+function ci_esp32_idf4_build {
+    make ${MAKEOPTS} -C mpy-cross
+    git -C esp-idf checkout $(grep "ESPIDF_SUPHASH_V4 :=" ports/esp32/Makefile | cut -d " " -f 3)
+    git -C esp-idf submodule update --init components/bt/controller/lib components/bt/host/nimble/nimble components/esp_wifi/lib_esp32 components/esptool_py/esptool components/lwip/lwip components/mbedtls/mbedtls
+    make ${MAKEOPTS} -C ports/esp32 submodules
+    make ${MAKEOPTS} -C ports/esp32
+}
+
+########################################################################################
+# ports/esp8266
+
+function ci_esp8266_setup {
+    sudo pip install pyserial
+    wget https://github.com/jepler/esp-open-sdk/releases/download/2018-06-10/xtensa-lx106-elf-standalone.tar.gz
+    zcat xtensa-lx106-elf-standalone.tar.gz | tar x
+    echo $(pwd)/xtensa-lx106-elf/bin
+}
+
+function ci_esp8266_build {
+    make ${MAKEOPTS} -C mpy-cross
+    make ${MAKEOPTS} -C ports/esp8266 submodules
+    make ${MAKEOPTS} -C ports/esp8266
+    make ${MAKEOPTS} -C ports/esp8266 BOARD=GENERIC_512K
+    make ${MAKEOPTS} -C ports/esp8266 BOARD=GENERIC_1M
+}
+
+########################################################################################
+# ports/nrf
+
+function ci_nrf_setup {
+    ci_gcc_arm_setup
+}
+
+function ci_nrf_build {
+    ports/nrf/drivers/bluetooth/download_ble_stack.sh s140_nrf52_6_1_1
+    make ${MAKEOPTS} -C ports/nrf submodules
+    make ${MAKEOPTS} -C ports/nrf BOARD=pca10040
+    make ${MAKEOPTS} -C ports/nrf BOARD=microbit
+    make ${MAKEOPTS} -C ports/nrf BOARD=pca10056 SD=s140
+    make ${MAKEOPTS} -C ports/nrf BOARD=pca10090
+}
+
+########################################################################################
+# ports/powerpc
+
+function ci_powerpc_setup {
+    sudo apt-get install gcc-powerpc64le-linux-gnu libc6-dev-ppc64el-cross
+}
+
+function ci_powerpc_build {
+    make ${MAKEOPTS} -C ports/powerpc UART=potato
+    make ${MAKEOPTS} -C ports/powerpc UART=lpc_serial
+}
+
+########################################################################################
+# ports/qemu-arm
+
+function ci_qemu_arm_setup {
+    ci_gcc_arm_setup
+    sudo apt-get update
+    sudo apt-get install qemu-system
+    qemu-system-arm --version
+}
+
+function ci_qemu_arm_build {
+    make ${MAKEOPTS} -C mpy-cross
+    make ${MAKEOPTS} -C ports/qemu-arm CFLAGS_EXTRA=-DMP_ENDIANNESS_BIG=1
+    make ${MAKEOPTS} -C ports/qemu-arm clean
+    make ${MAKEOPTS} -C ports/qemu-arm -f Makefile.test test
+}
+
+########################################################################################
+# ports/samd
+
+function ci_samd_setup {
+    ci_gcc_arm_setup
+}
+
+function ci_samd_build {
+    make ${MAKEOPTS} -C ports/samd submodules
+    make ${MAKEOPTS} -C ports/samd
+}
+
+########################################################################################
+# ports/stm32
+
+function ci_stm32_setup {
+    ci_gcc_arm_setup
+}
+
+function ci_stm32_pyb_build {
+    make ${MAKEOPTS} -C mpy-cross
+    make ${MAKEOPTS} -C ports/stm32 submodules
+    git submodule update --init lib/btstack
+    make ${MAKEOPTS} -C ports/stm32 BOARD=PYBV11 MICROPY_PY_WIZNET5K=5200 MICROPY_PY_CC3K=1 USER_C_MODULES=../../examples/usercmodule CFLAGS_EXTRA="-DMODULE_CEXAMPLE_ENABLED=1 -DMODULE_CPPEXAMPLE_ENABLED=1"
+    make ${MAKEOPTS} -C ports/stm32 BOARD=PYBD_SF2
+    make ${MAKEOPTS} -C ports/stm32 BOARD=PYBD_SF6 NANBOX=1 MICROPY_BLUETOOTH_NIMBLE=0 MICROPY_BLUETOOTH_BTSTACK=1
+    make ${MAKEOPTS} -C ports/stm32/mboot BOARD=PYBV10 CFLAGS_EXTRA='-DMBOOT_FSLOAD=1 -DMBOOT_VFS_LFS2=1'
+    make ${MAKEOPTS} -C ports/stm32/mboot BOARD=PYBD_SF6
+}
+
+function ci_stm32_nucleo_build {
+    make ${MAKEOPTS} -C mpy-cross
+    make ${MAKEOPTS} -C ports/stm32 submodules
+    make ${MAKEOPTS} -C ports/stm32 BOARD=NUCLEO_F091RC
+    make ${MAKEOPTS} -C ports/stm32 BOARD=NUCLEO_H743ZI CFLAGS_EXTRA='-DMICROPY_PY_THREAD=1'
+    make ${MAKEOPTS} -C ports/stm32 BOARD=NUCLEO_L073RZ
+    make ${MAKEOPTS} -C ports/stm32 BOARD=NUCLEO_L476RG
+    make ${MAKEOPTS} -C ports/stm32 BOARD=NUCLEO_WB55
+    make ${MAKEOPTS} -C ports/stm32/mboot BOARD=NUCLEO_WB55
+}
+
+########################################################################################
+# ports/teensy
+
+function ci_teensy_setup {
+    ci_gcc_arm_setup
+}
+
+function ci_teensy_build {
+    make ${MAKEOPTS} -C ports/teensy
+}
+
+########################################################################################
+# ports/unix
+
+CI_UNIX_OPTS_SYS_SETTRACE=(
+    MICROPY_PY_BTREE=0
+    MICROPY_PY_FFI=0
+    MICROPY_PY_USSL=0
+    CFLAGS_EXTRA="-DMICROPY_PY_SYS_SETTRACE=1"
+)
+
+CI_UNIX_OPTS_SYS_SETTRACE_STACKLESS=(
+    MICROPY_PY_BTREE=0
+    MICROPY_PY_FFI=0
+    MICROPY_PY_USSL=0
+    CFLAGS_EXTRA="-DMICROPY_STACKLESS=1 -DMICROPY_STACKLESS_STRICT=1 -DMICROPY_PY_SYS_SETTRACE=1"
+)
+
+function ci_unix_build_helper {
+    make ${MAKEOPTS} -C mpy-cross
+    make ${MAKEOPTS} -C ports/unix "$@" submodules
+    make ${MAKEOPTS} -C ports/unix "$@" deplibs
+    make ${MAKEOPTS} -C ports/unix "$@"
+}
+
+function ci_unix_run_tests_helper {
+    make -C ports/unix "$@" test
+}
+
+function ci_unix_run_tests_full_helper {
+    variant=$1
+    shift
+    if [ $variant = standard ]; then
+        micropython=micropython
+    else
+        micropython=micropython-$variant
+    fi
+    make -C ports/unix VARIANT=$variant "$@" test_full
+    (cd tests && MICROPY_CPYTHON3=python3 MICROPY_MICROPYTHON=../ports/unix/$micropython ./run-multitests.py multi_net/*.py)
+}
+
+function ci_native_mpy_modules_build {
+    if [ "$1" = "" ]; then
+        arch=x64
+    else
+        arch=$1
+    fi
+    make -C examples/natmod/features1 ARCH=$arch
+    make -C examples/natmod/features2 ARCH=$arch
+    make -C examples/natmod/btree ARCH=$arch
+    make -C examples/natmod/framebuf ARCH=$arch
+    make -C examples/natmod/uheapq ARCH=$arch
+    make -C examples/natmod/urandom ARCH=$arch
+    make -C examples/natmod/ure ARCH=$arch
+    make -C examples/natmod/uzlib ARCH=$arch
+}
+
+function ci_native_mpy_modules_32bit_build {
+    ci_native_mpy_modules_build x86
+}
+
+function ci_unix_minimal_build {
+    make ${MAKEOPTS} -C ports/unix VARIANT=minimal
+}
+
+function ci_unix_minimal_run_tests {
+    (cd tests && MICROPY_CPYTHON3=python3 MICROPY_MICROPYTHON=../ports/unix/micropython-minimal ./run-tests -e exception_chain -e self_type_check -e subclass_native_init -d basics)
+}
+
+function ci_unix_standard_build {
+    ci_unix_build_helper VARIANT=standard
+}
+
+function ci_unix_standard_run_tests {
+    ci_unix_run_tests_full_helper standard
+}
+
+function ci_unix_standard_run_perfbench {
+    (cd tests && MICROPY_CPYTHON3=python3 MICROPY_MICROPYTHON=../ports/unix/micropython ./run-perfbench.py 1000 1000)
+}
+
+function ci_unix_coverage_setup {
+    sudo apt-get install lcov
+    sudo pip3 install setuptools
+    sudo pip3 install pyelftools
+    gcc --version
+    python3 --version
+}
+
+function ci_unix_coverage_build {
+    ci_unix_build_helper VARIANT=coverage
+}
+
+function ci_unix_coverage_run_tests {
+    ci_unix_run_tests_full_helper coverage
+}
+
+function ci_unix_coverage_run_native_mpy_tests {
+    MICROPYPATH=examples/natmod/features2 ./ports/unix/micropython-coverage -m features2
+    (cd tests && ./run-natmodtests.py "$@" extmod/{btree*,framebuf*,uheapq*,ure*,uzlib*}.py)
+}
+
+function ci_unix_32bit_setup {
+    sudo dpkg --add-architecture i386
+    sudo apt-get update
+    sudo apt-get install gcc-multilib g++-multilib libffi-dev:i386
+    sudo pip3 install setuptools
+    sudo pip3 install pyelftools
+    gcc --version
+    python2 --version
+    python3 --version
+}
+
+function ci_unix_coverage_32bit_build {
+    ci_unix_build_helper VARIANT=coverage MICROPY_FORCE_32BIT=1
+}
+
+function ci_unix_coverage_32bit_run_tests {
+    ci_unix_run_tests_full_helper coverage MICROPY_FORCE_32BIT=1
+}
+
+function ci_unix_coverage_32bit_run_native_mpy_tests {
+    ci_unix_coverage_run_native_mpy_tests --arch x86
+}
+
+function ci_unix_nanbox_build {
+    # Use Python 2 to check that it can run the build scripts
+    ci_unix_build_helper PYTHON=python2 VARIANT=nanbox
+}
+
+function ci_unix_nanbox_run_tests {
+    ci_unix_run_tests_full_helper nanbox PYTHON=python2
+}
+
+function ci_unix_float_build {
+    ci_unix_build_helper VARIANT=standard CFLAGS_EXTRA="-DMICROPY_FLOAT_IMPL=MICROPY_FLOAT_IMPL_FLOAT"
+}
+
+function ci_unix_float_run_tests {
+    # TODO get this working: ci_unix_run_tests_full_helper standard CFLAGS_EXTRA="-DMICROPY_FLOAT_IMPL=MICROPY_FLOAT_IMPL_FLOAT"
+    ci_unix_run_tests_helper CFLAGS_EXTRA="-DMICROPY_FLOAT_IMPL=MICROPY_FLOAT_IMPL_FLOAT"
+}
+
+function ci_unix_clang_setup {
+    sudo apt-get install clang
+    clang --version
+}
+
+function ci_unix_stackless_clang_build {
+    make ${MAKEOPTS} -C mpy-cross CC=clang
+    make ${MAKEOPTS} -C ports/unix submodules
+    make ${MAKEOPTS} -C ports/unix CC=clang CFLAGS_EXTRA="-DMICROPY_STACKLESS=1 -DMICROPY_STACKLESS_STRICT=1"
+}
+
+function ci_unix_stackless_clang_run_tests {
+    ci_unix_run_tests_helper CC=clang
+}
+
+function ci_unix_float_clang_build {
+    make ${MAKEOPTS} -C mpy-cross CC=clang
+    make ${MAKEOPTS} -C ports/unix submodules
+    make ${MAKEOPTS} -C ports/unix CC=clang CFLAGS_EXTRA="-DMICROPY_FLOAT_IMPL=MICROPY_FLOAT_IMPL_FLOAT"
+}
+
+function ci_unix_float_clang_run_tests {
+    ci_unix_run_tests_helper CC=clang
+}
+
+function ci_unix_settrace_build {
+    make ${MAKEOPTS} -C mpy-cross
+    make ${MAKEOPTS} -C ports/unix "${CI_UNIX_OPTS_SYS_SETTRACE[@]}"
+}
+
+function ci_unix_settrace_run_tests {
+    ci_unix_run_tests_helper "${CI_UNIX_OPTS_SYS_SETTRACE[@]}"
+}
+
+function ci_unix_settrace_stackless_build {
+    make ${MAKEOPTS} -C mpy-cross
+    make ${MAKEOPTS} -C ports/unix "${CI_UNIX_OPTS_SYS_SETTRACE_STACKLESS[@]}"
+}
+
+function ci_unix_settrace_stackless_run_tests {
+    ci_unix_run_tests_helper "${CI_UNIX_OPTS_SYS_SETTRACE_STACKLESS[@]}"
+}
+
+function ci_unix_macos_build {
+    make ${MAKEOPTS} -C mpy-cross
+    make ${MAKEOPTS} -C ports/unix submodules
+    #make ${MAKEOPTS} -C ports/unix deplibs
+    make ${MAKEOPTS} -C ports/unix
+    # check for additional compiler errors/warnings
+    make ${MAKEOPTS} -C ports/unix VARIANT=coverage submodules
+    make ${MAKEOPTS} -C ports/unix VARIANT=coverage
+}
+
+function ci_unix_macos_run_tests {
+    # Issues with macOS tests:
+    # - OSX has poor time resolution and these uasyncio tests do not have correct output
+    # - import_pkg7 has a problem with relative imports
+    # - urandom_basic has a problem with getrandbits(0)
+    (cd tests && ./run-tests --exclude 'uasyncio_(basic|heaplock|lock|wait_task)' --exclude 'import_pkg7.py' --exclude 'urandom_basic.py')
+}
+
+########################################################################################
+# ports/windows
+
+function ci_windows_setup {
+    sudo apt-get install gcc-mingw-w64
+}
+
+function ci_windows_build {
+    make ${MAKEOPTS} -C mpy-cross
+    make ${MAKEOPTS} -C ports/windows CROSS_COMPILE=i686-w64-mingw32-
+}
+
+########################################################################################
+# ports/zephyr
+
+function ci_zephyr_setup {
+    docker pull zephyrprojectrtos/ci:v0.11.8
+    docker run --name zephyr-ci -d -it \
+      -v "$(pwd)":/micropython \
+      -e ZEPHYR_SDK_INSTALL_DIR=/opt/sdk/zephyr-sdk-0.11.3 \
+      -e ZEPHYR_TOOLCHAIN_VARIANT=zephyr \
+      -w /micropython/ports/zephyr \
+      zephyrprojectrtos/ci:v0.11.8
+    docker ps -a
+}
+
+function ci_zephyr_install {
+    docker exec zephyr-ci west init --mr v2.4.0 /zephyrproject
+    docker exec -w /zephyrproject zephyr-ci west update
+    docker exec -w /zephyrproject zephyr-ci west zephyr-export
+}
+
+function ci_zephyr_build {
+    docker exec zephyr-ci bash -c "make clean; ./make-minimal ${MAKEOPTS}"
+    docker exec zephyr-ci bash -c "make clean; ./make-minimal ${MAKEOPTS} BOARD=frdm_k64f"
+    docker exec zephyr-ci bash -c "make clean; make ${MAKEOPTS}"
+    docker exec zephyr-ci bash -c "make clean; make ${MAKEOPTS} BOARD=frdm_k64f"
+    docker exec zephyr-ci bash -c "make clean; make ${MAKEOPTS} BOARD=mimxrt1050_evk"
+    docker exec zephyr-ci bash -c "make clean; make ${MAKEOPTS} BOARD=reel_board"
+}

From a598ae5b4dc4054f90156480454689c79f7c41a8 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sun, 29 Nov 2020 18:05:45 +1100
Subject: [PATCH 0427/3533] github/workflows: Add workflows for all CI tasks,
 builds and tests.

Signed-off-by: Damien George <damien@micropython.org>
---
 .github/workflows/code_formatting.yml |  16 +++
 .github/workflows/code_size.yml       |  25 ++++
 .github/workflows/ports_cc3200.yml    |  23 ++++
 .github/workflows/ports_esp32.yml     |  36 ++++++
 .github/workflows/ports_esp8266.yml   |  23 ++++
 .github/workflows/ports_nrf.yml       |  23 ++++
 .github/workflows/ports_powerpc.yml   |  23 ++++
 .github/workflows/ports_qemu-arm.yml  |  26 ++++
 .github/workflows/ports_samd.yml      |  23 ++++
 .github/workflows/ports_stm32.yml     |  32 +++++
 .github/workflows/ports_teensy.yml    |  23 ++++
 .github/workflows/ports_unix.yml      | 176 ++++++++++++++++++++++++++
 .github/workflows/ports_windows.yml   |  23 ++++
 .github/workflows/ports_zephyr.yml    |  24 ++++
 14 files changed, 496 insertions(+)
 create mode 100644 .github/workflows/code_formatting.yml
 create mode 100644 .github/workflows/code_size.yml
 create mode 100644 .github/workflows/ports_cc3200.yml
 create mode 100644 .github/workflows/ports_esp32.yml
 create mode 100644 .github/workflows/ports_esp8266.yml
 create mode 100644 .github/workflows/ports_nrf.yml
 create mode 100644 .github/workflows/ports_powerpc.yml
 create mode 100644 .github/workflows/ports_qemu-arm.yml
 create mode 100644 .github/workflows/ports_samd.yml
 create mode 100644 .github/workflows/ports_stm32.yml
 create mode 100644 .github/workflows/ports_teensy.yml
 create mode 100644 .github/workflows/ports_unix.yml
 create mode 100644 .github/workflows/ports_windows.yml
 create mode 100644 .github/workflows/ports_zephyr.yml

diff --git a/.github/workflows/code_formatting.yml b/.github/workflows/code_formatting.yml
new file mode 100644
index 0000000000000..aab347d78e97d
--- /dev/null
+++ b/.github/workflows/code_formatting.yml
@@ -0,0 +1,16 @@
+name: Check code formatting
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: actions/setup-python@v1
+    - name: Install packages
+      run: source tools/ci.sh && ci_code_formatting_setup
+    - name: Run code formatting
+      run: source tools/ci.sh && ci_code_formatting_run
+    - name: Check code formatting
+      run: git diff --exit-code
diff --git a/.github/workflows/code_size.yml b/.github/workflows/code_size.yml
new file mode 100644
index 0000000000000..dd759a4f3ff56
--- /dev/null
+++ b/.github/workflows/code_size.yml
@@ -0,0 +1,25 @@
+name: Check code size
+
+on:
+  push:
+  pull_request:
+    paths:
+      - '.github/workflows/*.yml'
+      - 'tools/**'
+      - 'py/**'
+      - 'extmod/**'
+      - 'lib/**'
+      - 'ports/bare-arm/**'
+      - 'ports/minimal/**'
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Install packages
+      run: source tools/ci.sh && ci_code_size_setup
+    - name: Build
+      run: source tools/ci.sh && ci_code_size_build
+    - name: Compute code size difference
+      run: tools/metrics.py diff --error-threshold 0 ~/size0 ~/size1
diff --git a/.github/workflows/ports_cc3200.yml b/.github/workflows/ports_cc3200.yml
new file mode 100644
index 0000000000000..0eaa36da3796e
--- /dev/null
+++ b/.github/workflows/ports_cc3200.yml
@@ -0,0 +1,23 @@
+name: cc3200 port
+
+on:
+  push:
+  pull_request:
+    paths:
+      - '.github/workflows/*.yml'
+      - 'tools/**'
+      - 'py/**'
+      - 'extmod/**'
+      - 'lib/**'
+      - 'drivers/**'
+      - 'ports/cc3200/**'
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Install packages
+      run: source tools/ci.sh && ci_cc3200_setup
+    - name: Build
+      run: source tools/ci.sh && ci_cc3200_build
diff --git a/.github/workflows/ports_esp32.yml b/.github/workflows/ports_esp32.yml
new file mode 100644
index 0000000000000..b89e462e049fc
--- /dev/null
+++ b/.github/workflows/ports_esp32.yml
@@ -0,0 +1,36 @@
+name: esp32 port
+
+on:
+  push:
+  pull_request:
+    paths:
+      - '.github/workflows/*.yml'
+      - 'tools/**'
+      - 'py/**'
+      - 'extmod/**'
+      - 'lib/**'
+      - 'drivers/**'
+      - 'ports/esp32/**'
+
+jobs:
+  idf3_build:
+    runs-on: ubuntu-20.04
+    steps:
+    - uses: actions/checkout@v2
+    - name: Install packages
+      run: source tools/ci.sh && ci_esp32_idf3_setup >> $GITHUB_PATH
+    - name: Build
+      env:
+        IDF_PATH: ${{ github.workspace }}/esp-idf
+      run: source tools/ci.sh && ci_esp32_idf3_build
+
+  idf4_build:
+    runs-on: ubuntu-20.04
+    steps:
+    - uses: actions/checkout@v2
+    - name: Install packages
+      run: source tools/ci.sh && ci_esp32_idf4_setup >> $GITHUB_PATH
+    - name: Build
+      env:
+        IDF_PATH: ${{ github.workspace }}/esp-idf
+      run: source tools/ci.sh && ci_esp32_idf4_build
diff --git a/.github/workflows/ports_esp8266.yml b/.github/workflows/ports_esp8266.yml
new file mode 100644
index 0000000000000..f6f2fcaf4a80e
--- /dev/null
+++ b/.github/workflows/ports_esp8266.yml
@@ -0,0 +1,23 @@
+name: esp8266 port
+
+on:
+  push:
+  pull_request:
+    paths:
+      - '.github/workflows/*.yml'
+      - 'tools/**'
+      - 'py/**'
+      - 'extmod/**'
+      - 'lib/**'
+      - 'drivers/**'
+      - 'ports/esp8266/**'
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Install packages
+      run: source tools/ci.sh && ci_esp8266_setup >> $GITHUB_PATH
+    - name: Build
+      run: source tools/ci.sh && ci_esp8266_build
diff --git a/.github/workflows/ports_nrf.yml b/.github/workflows/ports_nrf.yml
new file mode 100644
index 0000000000000..1ba3b0ce61e96
--- /dev/null
+++ b/.github/workflows/ports_nrf.yml
@@ -0,0 +1,23 @@
+name: nrf port
+
+on:
+  push:
+  pull_request:
+    paths:
+      - '.github/workflows/*.yml'
+      - 'tools/**'
+      - 'py/**'
+      - 'extmod/**'
+      - 'lib/**'
+      - 'drivers/**'
+      - 'ports/nrf/**'
+
+jobs:
+  build:
+    runs-on: ubuntu-20.04
+    steps:
+    - uses: actions/checkout@v2
+    - name: Install packages
+      run: source tools/ci.sh && ci_nrf_setup
+    - name: Build
+      run: source tools/ci.sh && ci_nrf_build
diff --git a/.github/workflows/ports_powerpc.yml b/.github/workflows/ports_powerpc.yml
new file mode 100644
index 0000000000000..88fa59767b756
--- /dev/null
+++ b/.github/workflows/ports_powerpc.yml
@@ -0,0 +1,23 @@
+name: powerpc port
+
+on:
+  push:
+  pull_request:
+    paths:
+      - '.github/workflows/*.yml'
+      - 'tools/**'
+      - 'py/**'
+      - 'extmod/**'
+      - 'lib/**'
+      - 'drivers/**'
+      - 'ports/powerpc/**'
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Install packages
+      run: source tools/ci.sh && ci_powerpc_setup
+    - name: Build
+      run: source tools/ci.sh && ci_powerpc_build
diff --git a/.github/workflows/ports_qemu-arm.yml b/.github/workflows/ports_qemu-arm.yml
new file mode 100644
index 0000000000000..f456dfd74aff6
--- /dev/null
+++ b/.github/workflows/ports_qemu-arm.yml
@@ -0,0 +1,26 @@
+name: qemu-arm port
+
+on:
+  push:
+  pull_request:
+    paths:
+      - '.github/workflows/*.yml'
+      - 'tools/**'
+      - 'py/**'
+      - 'extmod/**'
+      - 'lib/**'
+      - 'drivers/**'
+      - 'ports/qemu-arm/**'
+
+jobs:
+  build_and_test:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Install packages
+      run: source tools/ci.sh && ci_qemu_arm_setup
+    - name: Build
+      run: source tools/ci.sh && ci_qemu_arm_build
+    - name: Print failures
+      if: failure()
+      run: grep --text "FAIL" ports/qemu-arm/build/console.out
diff --git a/.github/workflows/ports_samd.yml b/.github/workflows/ports_samd.yml
new file mode 100644
index 0000000000000..bde4ed965faa0
--- /dev/null
+++ b/.github/workflows/ports_samd.yml
@@ -0,0 +1,23 @@
+name: samd port
+
+on:
+  push:
+  pull_request:
+    paths:
+      - '.github/workflows/*.yml'
+      - 'tools/**'
+      - 'py/**'
+      - 'extmod/**'
+      - 'lib/**'
+      - 'drivers/**'
+      - 'ports/samd/**'
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Install packages
+      run: source tools/ci.sh && ci_samd_setup
+    - name: Build
+      run: source tools/ci.sh && ci_samd_build
diff --git a/.github/workflows/ports_stm32.yml b/.github/workflows/ports_stm32.yml
new file mode 100644
index 0000000000000..4634339c96a6a
--- /dev/null
+++ b/.github/workflows/ports_stm32.yml
@@ -0,0 +1,32 @@
+name: stm32 port
+
+on:
+  push:
+  pull_request:
+    paths:
+      - '.github/workflows/*.yml'
+      - 'tools/**'
+      - 'py/**'
+      - 'extmod/**'
+      - 'lib/**'
+      - 'drivers/**'
+      - 'ports/stm32/**'
+
+jobs:
+  build_pyb:
+    runs-on: ubuntu-20.04
+    steps:
+    - uses: actions/checkout@v2
+    - name: Install packages
+      run: source tools/ci.sh && ci_stm32_setup
+    - name: Build
+      run: source tools/ci.sh && ci_stm32_pyb_build
+
+  build_nucleo:
+    runs-on: ubuntu-20.04
+    steps:
+    - uses: actions/checkout@v2
+    - name: Install packages
+      run: source tools/ci.sh && ci_stm32_setup
+    - name: Build
+      run: source tools/ci.sh && ci_stm32_nucleo_build
diff --git a/.github/workflows/ports_teensy.yml b/.github/workflows/ports_teensy.yml
new file mode 100644
index 0000000000000..7ae77c80af604
--- /dev/null
+++ b/.github/workflows/ports_teensy.yml
@@ -0,0 +1,23 @@
+name: teensy port
+
+on:
+  push:
+  pull_request:
+    paths:
+      - '.github/workflows/*.yml'
+      - 'tools/**'
+      - 'py/**'
+      - 'extmod/**'
+      - 'lib/**'
+      - 'drivers/**'
+      - 'ports/teensy/**'
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Install packages
+      run: source tools/ci.sh && ci_teensy_setup
+    - name: Build
+      run: source tools/ci.sh && ci_teensy_build
diff --git a/.github/workflows/ports_unix.yml b/.github/workflows/ports_unix.yml
new file mode 100644
index 0000000000000..385b2c008a7c8
--- /dev/null
+++ b/.github/workflows/ports_unix.yml
@@ -0,0 +1,176 @@
+name: unix port
+
+on:
+  push:
+  pull_request:
+    paths:
+      - '.github/workflows/*.yml'
+      - 'tools/**'
+      - 'py/**'
+      - 'extmod/**'
+      - 'lib/**'
+      - 'examples/**'
+      - 'ports/unix/**'
+
+jobs:
+  minimal:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Build
+      run: source tools/ci.sh && ci_unix_minimal_build
+    - name: Run main test suite
+      run: source tools/ci.sh && ci_unix_minimal_run_tests
+    - name: Print failures
+      if: failure()
+      run: tests/run-tests --print-failures
+
+  standard:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Build
+      run: source tools/ci.sh && ci_unix_standard_build
+    - name: Run main test suite
+      run: source tools/ci.sh && ci_unix_standard_run_tests
+    - name: Run performance benchmarks
+      run: source tools/ci.sh && ci_unix_standard_run_perfbench
+    - name: Print failures
+      if: failure()
+      run: tests/run-tests --print-failures
+
+  coverage:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Install packages
+      run: source tools/ci.sh && ci_unix_coverage_setup
+    - name: Build
+      run: source tools/ci.sh && ci_unix_coverage_build
+    - name: Run main test suite
+      run: source tools/ci.sh && ci_unix_coverage_run_tests
+    - name: Build native mpy modules
+      run: source tools/ci.sh && ci_native_mpy_modules_build
+    - name: Test importing .mpy generated by mpy_ld.py
+      run: source tools/ci.sh && ci_unix_coverage_run_native_mpy_tests
+    - name: Run lcov coverage analysis
+      run: |
+        mkdir -p coverage
+        lcov --rc lcov_branch_coverage=1 --directory ports/unix/build-coverage --capture --output-file coverage/lcov.info.all
+        lcov --remove coverage/lcov.info.all '*/lib/*' '*/ports/unix/*' '*/utils/*' --output-file coverage/lcov.info
+    - name: Send to coveralls
+      uses: coverallsapp/github-action@master
+      with:
+        github-token: ${{ secrets.GITHUB_TOKEN }}
+    - name: Print failures
+      if: failure()
+      run: tests/run-tests --print-failures
+
+  coverage_32bit:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Install packages
+      run: source tools/ci.sh && ci_unix_32bit_setup
+    - name: Build
+      run: source tools/ci.sh && ci_unix_coverage_32bit_build
+    - name: Run main test suite
+      run: source tools/ci.sh && ci_unix_coverage_32bit_run_tests
+    - name: Build native mpy modules
+      run: source tools/ci.sh && ci_native_mpy_modules_32bit_build
+    - name: Test importing .mpy generated by mpy_ld.py
+      run: source tools/ci.sh && ci_unix_coverage_32bit_run_native_mpy_tests
+    - name: Print failures
+      if: failure()
+      run: tests/run-tests --print-failures
+
+  nanbox:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Install packages
+      run: source tools/ci.sh && ci_unix_32bit_setup
+    - name: Build
+      run: source tools/ci.sh && ci_unix_nanbox_build
+    - name: Run main test suite
+      run: source tools/ci.sh && ci_unix_nanbox_run_tests
+    - name: Print failures
+      if: failure()
+      run: tests/run-tests --print-failures
+
+  float:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Build
+      run: source tools/ci.sh && ci_unix_float_build
+    - name: Run main test suite
+      run: source tools/ci.sh && ci_unix_float_run_tests
+    - name: Print failures
+      if: failure()
+      run: tests/run-tests --print-failures
+
+  stackless_clang:
+    runs-on: ubuntu-20.04
+    steps:
+    - uses: actions/checkout@v2
+    - name: Install packages
+      run: source tools/ci.sh && ci_unix_clang_setup
+    - name: Build
+      run: source tools/ci.sh && ci_unix_stackless_clang_build
+    - name: Run main test suite
+      run: source tools/ci.sh && ci_unix_stackless_clang_run_tests
+    - name: Print failures
+      if: failure()
+      run: tests/run-tests --print-failures
+
+  float_clang:
+    runs-on: ubuntu-20.04
+    steps:
+    - uses: actions/checkout@v2
+    - name: Install packages
+      run: source tools/ci.sh && ci_unix_clang_setup
+    - name: Build
+      run: source tools/ci.sh && ci_unix_float_clang_build
+    - name: Run main test suite
+      run: source tools/ci.sh && ci_unix_float_clang_run_tests
+    - name: Print failures
+      if: failure()
+      run: tests/run-tests --print-failures
+
+  settrace:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Build
+      run: source tools/ci.sh && ci_unix_settrace_build
+    - name: Run main test suite
+      run: source tools/ci.sh && ci_unix_settrace_run_tests
+    - name: Print failures
+      if: failure()
+      run: tests/run-tests --print-failures
+
+  settrace_stackless:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Build
+      run: source tools/ci.sh && ci_unix_settrace_stackless_build
+    - name: Run main test suite
+      run: source tools/ci.sh && ci_unix_settrace_stackless_run_tests
+    - name: Print failures
+      if: failure()
+      run: tests/run-tests --print-failures
+
+  macos:
+    runs-on: macos-11.0
+    steps:
+    - uses: actions/checkout@v2
+    - uses: actions/setup-python@v1
+    - name: Build
+      run: source tools/ci.sh && ci_unix_macos_build
+    - name: Run tests
+      run: source tools/ci.sh && ci_unix_macos_run_tests
+    - name: Print failures
+      if: failure()
+      run: tests/run-tests --print-failures
diff --git a/.github/workflows/ports_windows.yml b/.github/workflows/ports_windows.yml
new file mode 100644
index 0000000000000..1bfe40c7fded2
--- /dev/null
+++ b/.github/workflows/ports_windows.yml
@@ -0,0 +1,23 @@
+name: windows port
+
+on:
+  push:
+  pull_request:
+    paths:
+      - '.github/workflows/*.yml'
+      - 'tools/**'
+      - 'py/**'
+      - 'extmod/**'
+      - 'lib/**'
+      - 'ports/unix/**'
+      - 'ports/windows/**'
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Install packages
+      run: source tools/ci.sh && ci_windows_setup
+    - name: Build
+      run: source tools/ci.sh && ci_windows_build
diff --git a/.github/workflows/ports_zephyr.yml b/.github/workflows/ports_zephyr.yml
new file mode 100644
index 0000000000000..d9ae2b8c55a2a
--- /dev/null
+++ b/.github/workflows/ports_zephyr.yml
@@ -0,0 +1,24 @@
+name: zephyr port
+
+on:
+  push:
+  pull_request:
+    paths:
+      - '.github/workflows/ports_zephyr.yml'
+      - 'tools/**'
+      - 'py/**'
+      - 'extmod/**'
+      - 'lib/**'
+      - 'ports/zephyr/**'
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Install packages
+      run: source tools/ci.sh && ci_zephyr_setup
+    - name: Install Zephyr
+      run: source tools/ci.sh && ci_zephyr_install
+    - name: Build
+      run: source tools/ci.sh && ci_zephyr_build

From ee3706f4bdcb06c60eef16eff38dd388509021d8 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sun, 29 Nov 2020 18:06:57 +1100
Subject: [PATCH 0428/3533] travis: Stop using Travis for CI.

Travis now limits the amount of free minutes for open-source projects, and
it does not provide enough for this project.  So stop using it and instead
use on GitHub Actions.

Signed-off-by: Damien George <damien@micropython.org>
---
 .travis.yml | 396 ----------------------------------------------------
 1 file changed, 396 deletions(-)
 delete mode 100644 .travis.yml

diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 14595ddeb1d39..0000000000000
--- a/.travis.yml
+++ /dev/null
@@ -1,396 +0,0 @@
-# global options
-dist: xenial
-language:
-  - c
-compiler:
-  - gcc
-cache:
-  directories:
-    - "${HOME}/persist"
-env:
-  global:
-    - MAKEOPTS="-j4"
-git:
-  submodules: false
-
-# define the successive stages
-stages:
-  - name: test
-
-# define the jobs for the stages
-# approx order of the jobs has longest running first to optimise total time
-jobs:
-  include:
-    # check code formatting
-    - stage: test
-      os: linux
-      dist: bionic
-      name: "code formatting"
-      before_install:
-        - sudo apt-add-repository --yes --update ppa:pybricks/ppa
-      install:
-        - sudo apt-get install uncrustify python3-pip
-        - uncrustify --version
-        - pip3 install --user setuptools
-        - pip3 install --user black
-        - black --version
-      script:
-        - tools/codeformat.py
-        - git diff --exit-code
-
-    # zephyr port
-    - stage: test
-      name: "zephyr port build"
-      services:
-        - docker
-      before_install:
-        - docker pull zephyrprojectrtos/ci:v0.11.8
-        - >
-          docker run --name zephyr-ci -d -it
-          -v "$(pwd)":/micropython
-          -e ZEPHYR_SDK_INSTALL_DIR=/opt/sdk/zephyr-sdk-0.11.3
-          -e ZEPHYR_TOOLCHAIN_VARIANT=zephyr
-          -w /micropython/ports/zephyr
-          zephyrprojectrtos/ci:v0.11.8
-        - docker ps -a
-      install:
-        - docker exec zephyr-ci west init --mr v2.4.0 /zephyrproject
-        - docker exec -w /zephyrproject zephyr-ci west update
-        - docker exec -w /zephyrproject zephyr-ci west zephyr-export
-      script:
-        - docker exec zephyr-ci bash -c "make clean; ./make-minimal ${MAKEOPTS}"
-        - docker exec zephyr-ci bash -c "make clean; ./make-minimal ${MAKEOPTS} BOARD=frdm_k64f"
-        - docker exec zephyr-ci bash -c "make clean; make ${MAKEOPTS}"
-        - docker exec zephyr-ci bash -c "make clean; make ${MAKEOPTS} BOARD=frdm_k64f"
-        - docker exec zephyr-ci bash -c "make clean; make ${MAKEOPTS} BOARD=mimxrt1050_evk"
-        - docker exec zephyr-ci bash -c "make clean; make ${MAKEOPTS} BOARD=reel_board"
-
-    # unix port on OSX (first in list because the build VM takes a long time to start)
-    - stage: test
-      os: osx
-      osx_image: xcode11.3
-      name: "unix port build with clang on OSX"
-      env:
-        - PKG_CONFIG_PATH=/usr/local/opt/libffi/lib/pkgconfig
-      script:
-        - make ${MAKEOPTS} -C mpy-cross
-        - make ${MAKEOPTS} -C ports/unix submodules
-        - make ${MAKEOPTS} -C ports/unix deplibs
-        - make ${MAKEOPTS} -C ports/unix
-        # OSX has poor time resolution and the following tests do not have the correct output
-        - (cd tests && ./run-tests --exclude 'uasyncio_(basic|heaplock|lock|wait_task)')
-        # check for additional compiler errors/warnings
-        - make ${MAKEOPTS} -C ports/unix VARIANT=coverage submodules
-        - make ${MAKEOPTS} -C ports/unix VARIANT=coverage
-      after_failure:
-        - tests/run-tests --print-failures
-
-    # stm32 port
-    - stage: test
-      name: "stm32 port build"
-      install:
-        # need newer gcc version for Cortex-M7 support
-        - sudo add-apt-repository -y ppa:team-gcc-arm-embedded/ppa
-        - sudo apt-get update -qq || true
-        - sudo apt-get install gcc-arm-embedded libnewlib-arm-none-eabi
-        - arm-none-eabi-gcc --version
-      script:
-        - make ${MAKEOPTS} -C mpy-cross
-        - make ${MAKEOPTS} -C ports/stm32 submodules
-        - git submodule update --init lib/btstack
-        - make ${MAKEOPTS} -C ports/stm32 BOARD=NUCLEO_F091RC
-        - make ${MAKEOPTS} -C ports/stm32 BOARD=PYBV11 MICROPY_PY_WIZNET5K=5200 MICROPY_PY_CC3K=1 USER_C_MODULES=../../examples/usercmodule CFLAGS_EXTRA="-DMODULE_CEXAMPLE_ENABLED=1 -DMODULE_CPPEXAMPLE_ENABLED=1"
-        - make ${MAKEOPTS} -C ports/stm32 BOARD=PYBD_SF2
-        - make ${MAKEOPTS} -C ports/stm32 BOARD=PYBD_SF6 NANBOX=1 MICROPY_BLUETOOTH_NIMBLE=0 MICROPY_BLUETOOTH_BTSTACK=1
-        - make ${MAKEOPTS} -C ports/stm32 BOARD=NUCLEO_H743ZI CFLAGS_EXTRA='-DMICROPY_PY_THREAD=1'
-        - make ${MAKEOPTS} -C ports/stm32 BOARD=NUCLEO_L073RZ
-        - make ${MAKEOPTS} -C ports/stm32 BOARD=STM32L476DISC
-        - make ${MAKEOPTS} -C ports/stm32 BOARD=NUCLEO_WB55
-        - make ${MAKEOPTS} -C ports/stm32/mboot BOARD=PYBV10 CFLAGS_EXTRA='-DMBOOT_FSLOAD=1 -DMBOOT_VFS_LFS2=1'
-        - make ${MAKEOPTS} -C ports/stm32/mboot BOARD=PYBD_SF6
-        - make ${MAKEOPTS} -C ports/stm32/mboot BOARD=NUCLEO_WB55
-
-    # qemu-arm port
-    - stage: test
-      dist: bionic # needed for more recent version of qemu-system-arm with mps2-an385 target
-      name: "qemu-arm port build and tests"
-      install:
-        - sudo apt-get install gcc-arm-none-eabi libnewlib-arm-none-eabi qemu-system
-        - arm-none-eabi-gcc --version
-        - qemu-system-arm --version
-      script:
-        - make ${MAKEOPTS} -C mpy-cross
-        - make ${MAKEOPTS} -C ports/qemu-arm CFLAGS_EXTRA=-DMP_ENDIANNESS_BIG=1
-        - make ${MAKEOPTS} -C ports/qemu-arm clean
-        - make ${MAKEOPTS} -C ports/qemu-arm -f Makefile.test test
-      after_failure:
-        - grep --text "FAIL" ports/qemu-arm/build/console.out
-
-    # unix coverage
-    - stage: test
-      name: "unix coverage build and tests"
-      install:
-        - sudo apt-get install python3-pip
-        - sudo pip install cpp-coveralls
-        - sudo pip3 install setuptools
-        - sudo pip3 install pyelftools
-        - gcc --version
-        - python3 --version
-      script:
-        - make ${MAKEOPTS} -C mpy-cross
-        - make ${MAKEOPTS} -C ports/unix VARIANT=coverage submodules
-        - make ${MAKEOPTS} -C ports/unix VARIANT=coverage deplibs
-        - make ${MAKEOPTS} -C ports/unix VARIANT=coverage
-        # run the main test suite
-        - make -C ports/unix VARIANT=coverage test_full
-        - (cd tests && MICROPY_CPYTHON3=python3 MICROPY_MICROPYTHON=../ports/unix/micropython-coverage ./run-multitests.py multi_net/*.py) || travis_terminate 1
-        # test building native mpy modules
-        - make -C examples/natmod/features1 ARCH=x64
-        - make -C examples/natmod/features2 ARCH=x64
-        - make -C examples/natmod/btree ARCH=x64
-        - make -C examples/natmod/framebuf ARCH=x64
-        - make -C examples/natmod/uheapq ARCH=x64
-        - make -C examples/natmod/urandom ARCH=x64
-        - make -C examples/natmod/ure ARCH=x64
-        - make -C examples/natmod/uzlib ARCH=x64
-        # test importing .mpy generated by mpy_ld.py
-        - MICROPYPATH=examples/natmod/features2 ./ports/unix/micropython-coverage -m features2
-        - (cd tests && ./run-natmodtests.py extmod/{btree*,framebuf*,uheapq*,ure*,uzlib*}.py)
-        # run coveralls coverage analysis (try to, even if some builds/tests failed)
-        - (cd ports/unix && coveralls --root ../.. --build-root . --gcov $(which gcov) --gcov-options '\-o build-coverage/' --include py --include extmod)
-      after_failure:
-        - tests/run-tests --print-failures
-
-    # unix coverage 32-bit
-    - stage: test
-      name: "unix coverage 32-bit build and tests"
-      install:
-        - sudo apt-get install gcc-multilib g++-multilib libffi-dev:i386
-        - sudo apt-get install python3-pip
-        - sudo pip3 install setuptools
-        - sudo pip3 install pyelftools
-        - gcc --version
-        - python3 --version
-      script:
-        - make ${MAKEOPTS} -C mpy-cross
-        - make ${MAKEOPTS} -C ports/unix MICROPY_FORCE_32BIT=1 VARIANT=coverage submodules
-        - make ${MAKEOPTS} -C ports/unix MICROPY_FORCE_32BIT=1 VARIANT=coverage deplibs
-        - make ${MAKEOPTS} -C ports/unix MICROPY_FORCE_32BIT=1 VARIANT=coverage
-        # run the main test suite
-        - make -C ports/unix MICROPY_FORCE_32BIT=1 VARIANT=coverage test_full || travis_terminate 1
-        # test building native mpy modules
-        - make -C examples/natmod/features1 ARCH=x86
-        - make -C examples/natmod/features2 ARCH=x86
-        - make -C examples/natmod/btree ARCH=x86
-        - make -C examples/natmod/framebuf ARCH=x86
-        - make -C examples/natmod/uheapq ARCH=x86
-        - make -C examples/natmod/urandom ARCH=x86
-        - make -C examples/natmod/ure ARCH=x86
-        - make -C examples/natmod/uzlib ARCH=x86
-        # test importing .mpy generated by mpy_ld.py
-        - MICROPYPATH=examples/natmod/features2 ./ports/unix/micropython-coverage -m features2
-        - (cd tests && ./run-natmodtests.py --arch x86 extmod/{btree*,framebuf*,uheapq*,ure*,uzlib*}.py)
-      after_failure:
-        - tests/run-tests --print-failures
-
-    # standard unix port
-    - stage: test
-      name: "unix port build and tests"
-      script:
-        - make ${MAKEOPTS} -C mpy-cross
-        - make ${MAKEOPTS} -C ports/unix submodules
-        - make ${MAKEOPTS} -C ports/unix deplibs
-        - make ${MAKEOPTS} -C ports/unix
-        - make ${MAKEOPTS} -C ports/unix test
-        - (cd tests && MICROPY_CPYTHON3=python3 MICROPY_MICROPYTHON=../ports/unix/micropython ./run-perfbench.py 1000 1000)
-      after_failure:
-        - tests/run-tests --print-failures
-
-    # unix nanbox/float (and using Python 2 to check it can run the build scripts)
-    - stage: test
-      name: "unix nanbox/float port build and tests"
-      install:
-        - sudo apt-get install gcc-multilib libffi-dev:i386
-      script:
-        - make ${MAKEOPTS} -C mpy-cross PYTHON=python2
-        - make ${MAKEOPTS} -C ports/unix VARIANT=nanbox submodules
-        - make ${MAKEOPTS} -C ports/unix PYTHON=python2 VARIANT=nanbox deplibs
-        - make ${MAKEOPTS} -C ports/unix PYTHON=python2 VARIANT=nanbox
-        - make ${MAKEOPTS} -C ports/unix PYTHON=python2 VARIANT=nanbox test_full || travis_terminate 1
-        - make ${MAKEOPTS} -C ports/unix clean
-        - make ${MAKEOPTS} -C ports/unix CFLAGS_EXTRA="-DMICROPY_FLOAT_IMPL=MICROPY_FLOAT_IMPL_FLOAT"
-        - make ${MAKEOPTS} -C ports/unix test
-      after_failure:
-        - tests/run-tests --print-failures
-
-    # unix stackless/float with clang
-    - stage: test
-      name: "unix stackless/float port build and tests with clang"
-      install:
-        - sudo apt-get install clang
-      script:
-        - make ${MAKEOPTS} -C mpy-cross CC=clang
-        - make ${MAKEOPTS} -C ports/unix submodules
-        - make ${MAKEOPTS} -C ports/unix CC=clang CFLAGS_EXTRA="-DMICROPY_STACKLESS=1 -DMICROPY_STACKLESS_STRICT=1"
-        - make ${MAKEOPTS} -C ports/unix CC=clang test || travis_terminate 1
-        - make ${MAKEOPTS} -C ports/unix clean
-        - make ${MAKEOPTS} -C ports/unix CC=clang CFLAGS_EXTRA="-DMICROPY_FLOAT_IMPL=MICROPY_FLOAT_IMPL_FLOAT"
-        - make ${MAKEOPTS} -C ports/unix CC=clang test
-      after_failure:
-        - tests/run-tests --print-failures
-
-    # unix with sys.settrace
-    - stage: test
-      name: "unix port with sys.settrace build and tests"
-      script:
-        - make ${MAKEOPTS} -C mpy-cross
-        - make ${MAKEOPTS} -C ports/unix MICROPY_PY_BTREE=0 MICROPY_PY_FFI=0 MICROPY_PY_USSL=0 CFLAGS_EXTRA="-DMICROPY_PY_SYS_SETTRACE=1" test || travis_terminate 1
-        - make ${MAKEOPTS} -C ports/unix clean
-        - make ${MAKEOPTS} -C ports/unix MICROPY_PY_BTREE=0 MICROPY_PY_FFI=0 MICROPY_PY_USSL=0 CFLAGS_EXTRA="-DMICROPY_STACKLESS=1 -DMICROPY_STACKLESS_STRICT=1 -DMICROPY_PY_SYS_SETTRACE=1" test
-      after_failure:
-        - tests/run-tests --print-failures
-
-    # minimal unix port with tests
-    - stage: test
-      name: "minimal unix port build and tests"
-      script:
-        - make ${MAKEOPTS} -C ports/unix VARIANT=minimal
-        - (cd tests && MICROPY_CPYTHON3=python3 MICROPY_MICROPYTHON=../ports/unix/micropython-minimal ./run-tests -e exception_chain -e self_type_check -e subclass_native_init -d basics)
-      after_failure:
-        - tests/run-tests --print-failures
-
-    # windows port via mingw
-    - stage: test
-      name: "windows port build via mingw"
-      install:
-        - sudo apt-get install gcc-mingw-w64
-      script:
-        - make ${MAKEOPTS} -C mpy-cross
-        - make ${MAKEOPTS} -C ports/windows CROSS_COMPILE=i686-w64-mingw32-
-
-    # esp32 w/ESP-IDFv3 port
-    - stage: test
-      name: "esp32 ESP-IDFv3 port build"
-      install:
-        - sudo apt-get install python3-pip
-        - sudo pip3 install 'pyparsing<2.4'
-        - curl -L https://dl.espressif.com/dl/xtensa-esp32-elf-linux64-1.22.0-80-g6c4433a-5.2.0.tar.gz | tar zxf -
-        - export PATH=$(pwd)/xtensa-esp32-elf/bin:$PATH
-        - git clone https://github.com/espressif/esp-idf.git
-        - export IDF_PATH=$(pwd)/esp-idf
-      script:
-        - make ${MAKEOPTS} -C mpy-cross
-        - git -C esp-idf checkout $(grep "ESPIDF_SUPHASH_V3 :=" ports/esp32/Makefile | cut -d " " -f 3)
-        - git -C esp-idf submodule update --init components/json/cJSON components/esp32/lib components/esptool_py/esptool components/expat/expat components/lwip/lwip components/mbedtls/mbedtls components/micro-ecc/micro-ecc components/nghttp/nghttp2 components/nimble components/bt
-        - make ${MAKEOPTS} -C ports/esp32 submodules
-        - make ${MAKEOPTS} -C ports/esp32
-
-    # esp32 w/ESP-IDFv4 port
-    - stage: test
-      name: "esp32 ESP-IDFv4 port build"
-      install:
-        - sudo apt-get install python3-pip
-        - sudo pip3 install 'pyparsing<2.4'
-        - curl -L https://dl.espressif.com/dl/xtensa-esp32-elf-gcc8_2_0-esp-2019r2-linux-amd64.tar.gz | tar zxf -
-        - export PATH=$(pwd)/xtensa-esp32-elf/bin:$PATH
-        - git clone https://github.com/espressif/esp-idf.git
-        - export IDF_PATH=$(pwd)/esp-idf
-      script:
-        - make ${MAKEOPTS} -C mpy-cross
-        - git -C esp-idf checkout $(grep "ESPIDF_SUPHASH_V4 :=" ports/esp32/Makefile | cut -d " " -f 3)
-        - git -C esp-idf submodule update --init components/bt/controller/lib components/bt/host/nimble/nimble components/esp_wifi/lib_esp32 components/esptool_py/esptool components/lwip/lwip components/mbedtls/mbedtls
-        - make ${MAKEOPTS} -C ports/esp32 submodules
-        - make ${MAKEOPTS} -C ports/esp32
-
-    # esp8266 port
-    - stage: test
-      name: "esp8266 port build"
-      install:
-        - wget https://github.com/jepler/esp-open-sdk/releases/download/2018-06-10/xtensa-lx106-elf-standalone.tar.gz
-        - zcat xtensa-lx106-elf-standalone.tar.gz | tar x
-        - export PATH=$(pwd)/xtensa-lx106-elf/bin:$PATH
-      script:
-        - make ${MAKEOPTS} -C mpy-cross
-        - make ${MAKEOPTS} -C ports/esp8266 submodules
-        - make ${MAKEOPTS} -C ports/esp8266
-        - make ${MAKEOPTS} -C ports/esp8266 BOARD=GENERIC_512K
-        - make ${MAKEOPTS} -C ports/esp8266 BOARD=GENERIC_1M
-
-    # nrf port
-    - stage: test
-      name: "nrf port build"
-      install:
-        # need newer gcc version for Cortex-M33 support
-        - sudo add-apt-repository -y ppa:team-gcc-arm-embedded/ppa
-        - sudo apt-get update -qq || true
-        - sudo apt-get install gcc-arm-embedded
-        - sudo apt-get install libnewlib-arm-none-eabi
-        - arm-none-eabi-gcc --version
-      script:
-        - ports/nrf/drivers/bluetooth/download_ble_stack.sh s140_nrf52_6_1_1
-        - make ${MAKEOPTS} -C ports/nrf submodules
-        - make ${MAKEOPTS} -C ports/nrf BOARD=pca10040
-        - make ${MAKEOPTS} -C ports/nrf BOARD=microbit
-        - make ${MAKEOPTS} -C ports/nrf BOARD=pca10056 SD=s140
-        - make ${MAKEOPTS} -C ports/nrf BOARD=pca10090
-
-    # bare-arm and minimal ports, with size-diff check
-    - stage: test
-      name: "bare-arm and minimal ports build and size-diff check"
-      install:
-        - sudo apt-get install gcc-multilib libffi-dev:i386 gcc-arm-none-eabi libnewlib-arm-none-eabi
-        - gcc --version
-        - arm-none-eabi-gcc --version
-      script:
-        # starts off at either the ref/pull/N/merge FETCH_HEAD, or the current branch HEAD
-        - git checkout -b pull_request # save the current location
-        - git remote add upstream https://github.com/micropython/micropython.git
-        - git fetch --depth=100 upstream
-        # build reference, save to size0
-        # ignore any errors with this build, in case master is failing
-        - git checkout `git merge-base --fork-point upstream/master pull_request`
-        - git show -s
-        - tools/metrics.py clean bm
-        - tools/metrics.py build bm | tee ~/size0 || true
-        # build PR/branch, save to size1
-        - git checkout pull_request
-        - git log upstream/master..HEAD
-        - tools/metrics.py clean bm
-        - tools/metrics.py build bm | tee ~/size1 || travis_terminate 1
-        # compute diff of the code sizes
-        - tools/metrics.py diff --error-threshold 0 ~/size0 ~/size1
-
-    # cc3200 port
-    - stage: test
-      name: "cc3200 port build"
-      install:
-        - sudo apt-get install gcc-arm-none-eabi libnewlib-arm-none-eabi
-      script:
-        - make ${MAKEOPTS} -C ports/cc3200 BTARGET=application BTYPE=release
-        - make ${MAKEOPTS} -C ports/cc3200 BTARGET=bootloader  BTYPE=release
-
-    # samd port
-    - stage: test
-      name: "samd port build"
-      install:
-        - sudo apt-get install gcc-arm-none-eabi libnewlib-arm-none-eabi
-      script:
-        - make ${MAKEOPTS} -C ports/samd submodules
-        - make ${MAKEOPTS} -C ports/samd
-
-    # teensy port
-    - stage: test
-      name: "teensy port build"
-      install:
-        - sudo apt-get install gcc-arm-none-eabi libnewlib-arm-none-eabi
-      script:
-        - make ${MAKEOPTS} -C ports/teensy
-
-    # powerpc port
-    - stage: test
-      name: "powerpc port build"
-      install:
-        - sudo apt-get install gcc-powerpc64le-linux-gnu libc6-dev-ppc64el-cross
-      script:
-        - make ${MAKEOPTS} -C ports/powerpc UART=potato
-        - make ${MAKEOPTS} -C ports/powerpc UART=lpc_serial

From 02b44a0154aee3cfd2675b4ff180061b2b5bc40d Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 30 Nov 2020 10:28:48 +1100
Subject: [PATCH 0429/3533] tests/run-tests: Update skipped tests on CI for
 GitHub Actions.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/run-tests | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/tests/run-tests b/tests/run-tests
index eebc8c4252700..23c30d3c3cb55 100755
--- a/tests/run-tests
+++ b/tests/run-tests
@@ -342,13 +342,9 @@ def run_tests(pyb, tests, args, result_dir):
         'struct_endian',
     )
 
-    # Some tests shouldn't be run under Travis CI
-    if os.getenv('TRAVIS') == 'true':
-        skip_tests.add('basics/memoryerror.py')
-        skip_tests.add('thread/thread_gc1.py') # has reliability issues
-        skip_tests.add('thread/thread_lock4.py') # has reliability issues
-        skip_tests.add('thread/stress_heap.py') # has reliability issues
-        skip_tests.add('thread/stress_recurse.py') # has reliability issues
+    # Some tests shouldn't be run on GitHub Actions
+    if os.getenv('GITHUB_ACTIONS') == 'true':
+        skip_tests.add('thread/stress_schedule.py') # has reliability issues
 
     if upy_float_precision == 0:
         skip_tests.add('extmod/uctypes_le_float.py')

From 2f723d83c0b30a272d0ef41e8b7eda729de1e0e0 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 30 Nov 2020 10:29:20 +1100
Subject: [PATCH 0430/3533] README: Update badges for new GitHub Actions
 workflows.

Signed-off-by: Damien George <damien@micropython.org>
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 57daebf87263b..f75590a5ba7d0 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-[![Build Status](https://travis-ci.com/micropython/micropython.png?branch=master)](https://travis-ci.com/micropython/micropython) [![Coverage Status](https://coveralls.io/repos/micropython/micropython/badge.png?branch=master)](https://coveralls.io/r/micropython/micropython?branch=master)
+[![CI badge](https://github.com/micropython/micropython/workflows/unix%20port/badge.svg)](https://github.com/micropython/micropython/actions?query=branch%3Amaster+event%3Apush) [![Coverage badge](https://coveralls.io/repos/micropython/micropython/badge.png?branch=master)](https://coveralls.io/r/micropython/micropython?branch=master)
 
 The MicroPython project
 =======================

From f7225d1c9527c9839d80b8f73641ddb4ebbe6105 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 30 Nov 2020 10:33:46 +1100
Subject: [PATCH 0431/3533] github/workflows: Run unix and qemu-arm workflows
 when tests change.

Signed-off-by: Damien George <damien@micropython.org>
---
 .github/workflows/ports_qemu-arm.yml | 3 ++-
 .github/workflows/ports_unix.yml     | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ports_qemu-arm.yml b/.github/workflows/ports_qemu-arm.yml
index f456dfd74aff6..8d144ca3cb7aa 100644
--- a/.github/workflows/ports_qemu-arm.yml
+++ b/.github/workflows/ports_qemu-arm.yml
@@ -11,6 +11,7 @@ on:
       - 'lib/**'
       - 'drivers/**'
       - 'ports/qemu-arm/**'
+      - 'tests/**'
 
 jobs:
   build_and_test:
@@ -19,7 +20,7 @@ jobs:
     - uses: actions/checkout@v2
     - name: Install packages
       run: source tools/ci.sh && ci_qemu_arm_setup
-    - name: Build
+    - name: Build and run test suite
       run: source tools/ci.sh && ci_qemu_arm_build
     - name: Print failures
       if: failure()
diff --git a/.github/workflows/ports_unix.yml b/.github/workflows/ports_unix.yml
index 385b2c008a7c8..552fd72d8440e 100644
--- a/.github/workflows/ports_unix.yml
+++ b/.github/workflows/ports_unix.yml
@@ -11,6 +11,7 @@ on:
       - 'lib/**'
       - 'examples/**'
       - 'ports/unix/**'
+      - 'tests/**'
 
 jobs:
   minimal:

From bb24c69b909e82cc1b6e82a28f14fa732f596b9f Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 6 Oct 2020 12:11:10 +1100
Subject: [PATCH 0432/3533] lib/utils/pyexec: Add stdin-reader on raw REPL with
 flow control.

Background: the friendly/normal REPL is intended for human use whereas the
raw REPL is for computer use/automation.  Raw REPL is used for things like
pyboard.py script_to_run.py.  The normal REPL has built-in flow control
because it echos back the characters.  That's not so with raw REPL and flow
control is just implemented by rate limiting the amount of data that goes
in.  Currently it's fixed at 256 byte chunks every 10ms.  This is sometimes
too fast for slow MCUs or systems with small stdin buffers.  It's also too
slow for a lot of higher-end MCUs, ie it could be a lot faster.

This commit adds a new raw REPL mode which includes flow control: the
device will echo back a character after a certain number of bytes are sent
to the host, and the host can use this to regulate the data going out to
the device.  The amount of characters is controlled by the device and sent
to the host before communication starts.  This flow control allows getting
the maximum speed out of a serial link, regardless of the link or the
device at the other end.

Also, this new raw REPL mode parses and compiles the incoming data as it
comes in.  It does this by creating a "stdin reader" object which is then
passed to the lexer.  The lexer requests bytes from this "stdin reader"
which retrieves bytes from the host, and does flow control.  What this
means is that no memory is used to store the script (in the existing raw
REPL mode the device needs a big buffer to read in the script before it can
pass it on to the lexer/parser/compiler).  The only memory needed on the
device is enough to parse and compile.

Finally, it would be possible to extend this new raw REPL to allow bytecode
(.mpy files) to be sent as well as text mode scripts (but that's not done
in this commit).

Some results follow. The test was to send a large 33k script that contains
mostly comments and then prints out the heap, run via pyboard.py large.py.

On PYBD-SF6, prior to this PR:

$ ./pyboard.py large.py
stack: 524 out of 23552
GC: total: 392192, used: 34464, free: 357728
 No. of 1-blocks: 12, 2-blocks: 2, max blk sz: 2075, max free sz: 22345
GC memory layout; from 2001a3f0:
00000: h=hhhh=======================================hhBShShh==h=======h
00400: =====hh=B........h==h===========================================
00800: ================================================================
00c00: ================================================================
01000: ================================================================
01400: ================================================================
01800: ================================================================
01c00: ================================================================
02000: ================================================================
02400: ================================================================
02800: ================================================================
02c00: ================================================================
03000: ================================================================
03400: ================================================================
03800: ================================================================
03c00: ================================================================
04000: ================================================================
04400: ================================================================
04800: ================================================================
04c00: ================================================================
05000: ================================================================
05400: ================================================================
05800: ================================================================
05c00: ================================================================
06000: ================================================================
06400: ================================================================
06800: ================================================================
06c00: ================================================================
07000: ================================================================
07400: ================================================================
07800: ================================================================
07c00: ================================================================
08000: ================================================================
08400: ===============================================.....h==.........
       (349 lines all free)

(the big blob of used memory is the large script).

Same but with this PR:

$ ./pyboard.py large.py
stack: 524 out of 23552
GC: total: 392192, used: 1296, free: 390896
 No. of 1-blocks: 12, 2-blocks: 3, max blk sz: 40, max free sz: 24420
GC memory layout; from 2001a3f0:
00000: h=hhhh=======================================hhBShShh==h=======h
00400: =====hh=h=B......h==.....h==....................................
       (381 lines all free)

The only thing in RAM is the compiled script (and some other unrelated
items).

Time to download before this PR: 1438ms, data rate: 230,799 bits/sec.

Time to download with this PR: 119ms, data rate: 2,788,991 bits/sec.

So it's more than 10 times faster, and uses significantly less RAM.

Results are similar on other boards. On an stm32 board that connects via
UART only at 115200 baud, the data rate goes from 80kbit/sec to
113kbit/sec, so gets close to saturating the UART link without loss of
data.

The new raw REPL mode also supports a single ctrl-C to break out of this
flow-control mode, so that a ctrl-C can always get back to a known state.
It's also backwards compatible with the original raw REPL mode, which is
still supported with the same sequence of commands.  The new raw REPL
mode is activated by ctrl-E, which gives an error on devices that do not
support the new mode.

Signed-off-by: Damien George <damien@micropython.org>
---
 lib/utils/pyexec.c | 118 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 118 insertions(+)

diff --git a/lib/utils/pyexec.c b/lib/utils/pyexec.c
index 2b86af3bbaadd..86321ac12909f 100644
--- a/lib/utils/pyexec.c
+++ b/lib/utils/pyexec.c
@@ -56,6 +56,7 @@ STATIC bool repl_display_debugging_info = 0;
 #define EXEC_FLAG_SOURCE_IS_RAW_CODE (8)
 #define EXEC_FLAG_SOURCE_IS_VSTR (16)
 #define EXEC_FLAG_SOURCE_IS_FILENAME (32)
+#define EXEC_FLAG_SOURCE_IS_READER (64)
 
 // parses, compiles and executes the code in the lexer
 // frees the lexer before returning
@@ -91,6 +92,8 @@ STATIC int parse_compile_execute(const void *source, mp_parse_input_kind_t input
             if (exec_flags & EXEC_FLAG_SOURCE_IS_VSTR) {
                 const vstr_t *vstr = source;
                 lex = mp_lexer_new_from_str_len(MP_QSTR__lt_stdin_gt_, vstr->buf, vstr->len, 0);
+            } else if (exec_flags & EXEC_FLAG_SOURCE_IS_READER) {
+                lex = mp_lexer_new(MP_QSTR__lt_stdin_gt_, *(mp_reader_t *)source);
             } else if (exec_flags & EXEC_FLAG_SOURCE_IS_FILENAME) {
                 lex = mp_lexer_new_from_file(source);
             } else {
@@ -122,6 +125,12 @@ STATIC int parse_compile_execute(const void *source, mp_parse_input_kind_t input
         // uncaught exception
         mp_hal_set_interrupt_char(-1); // disable interrupt
         mp_handle_pending(false); // clear any pending exceptions (and run any callbacks)
+
+        if (exec_flags & EXEC_FLAG_SOURCE_IS_READER) {
+            const mp_reader_t *reader = source;
+            reader->close(reader->data);
+        }
+
         // print EOF after normal output
         if (exec_flags & EXEC_FLAG_PRINT_EOF) {
             mp_hal_stdout_tx_strn("\x04", 1);
@@ -170,6 +179,99 @@ STATIC int parse_compile_execute(const void *source, mp_parse_input_kind_t input
 }
 
 #if MICROPY_ENABLE_COMPILER
+
+// This can be configured by a port (and even configured to a function to be
+// computed dynamically) to indicate the maximum number of bytes that can be
+// held in the stdin buffer.
+#ifndef MICROPY_REPL_STDIN_BUFFER_MAX
+#define MICROPY_REPL_STDIN_BUFFER_MAX (256)
+#endif
+
+typedef struct _mp_reader_stdin_t {
+    bool eof;
+    uint16_t window_max;
+    uint16_t window_remain;
+} mp_reader_stdin_t;
+
+STATIC mp_uint_t mp_reader_stdin_readbyte(void *data) {
+    mp_reader_stdin_t *reader = (mp_reader_stdin_t *)data;
+
+    if (reader->eof) {
+        return MP_READER_EOF;
+    }
+
+    int c = mp_hal_stdin_rx_chr();
+
+    if (c == CHAR_CTRL_C || c == CHAR_CTRL_D) {
+        reader->eof = true;
+        mp_hal_stdout_tx_strn("\x04", 1); // indicate end to host
+        if (c == CHAR_CTRL_C) {
+            #if MICROPY_KBD_EXCEPTION
+            MP_STATE_VM(mp_kbd_exception).traceback_data = NULL;
+            nlr_raise(MP_OBJ_FROM_PTR(&MP_STATE_VM(mp_kbd_exception)));
+            #else
+            mp_raise_type(&mp_type_KeyboardInterrupt);
+            #endif
+        } else {
+            return MP_READER_EOF;
+        }
+    }
+
+    if (--reader->window_remain == 0) {
+        mp_hal_stdout_tx_strn("\x01", 1); // indicate window available to host
+        reader->window_remain = reader->window_max;
+    }
+
+    return c;
+}
+
+STATIC void mp_reader_stdin_close(void *data) {
+    mp_reader_stdin_t *reader = (mp_reader_stdin_t *)data;
+    if (!reader->eof) {
+        reader->eof = true;
+        mp_hal_stdout_tx_strn("\x04", 1); // indicate end to host
+        for (;;) {
+            int c = mp_hal_stdin_rx_chr();
+            if (c == CHAR_CTRL_C || c == CHAR_CTRL_D) {
+                break;
+            }
+        }
+    }
+}
+
+STATIC void mp_reader_new_stdin(mp_reader_t *reader, mp_reader_stdin_t *reader_stdin, uint16_t buf_max) {
+    // Make flow-control window half the buffer size, and indicate to the host that 2x windows are
+    // free (sending the window size implicitly indicates that a window is free, and then the 0x01
+    // indicates that another window is free).
+    size_t window = buf_max / 2;
+    char reply[3] = { window & 0xff, window >> 8, 0x01 };
+    mp_hal_stdout_tx_strn(reply, sizeof(reply));
+
+    reader_stdin->eof = false;
+    reader_stdin->window_max = window;
+    reader_stdin->window_remain = window;
+    reader->data = reader_stdin;
+    reader->readbyte = mp_reader_stdin_readbyte;
+    reader->close = mp_reader_stdin_close;
+}
+
+STATIC int do_reader_stdin(int c) {
+    if (c != 'A') {
+        // Unsupported command.
+        mp_hal_stdout_tx_strn("R\x00", 2);
+        return 0;
+    }
+
+    // Indicate reception of command.
+    mp_hal_stdout_tx_strn("R\x01", 2);
+
+    mp_reader_t reader;
+    mp_reader_stdin_t reader_stdin;
+    mp_reader_new_stdin(&reader, &reader_stdin, MICROPY_REPL_STDIN_BUFFER_MAX);
+    int exec_flags = EXEC_FLAG_PRINT_EOF | EXEC_FLAG_SOURCE_IS_READER;
+    return parse_compile_execute(&reader, MP_PARSE_FILE_INPUT, exec_flags);
+}
+
 #if MICROPY_REPL_EVENT_DRIVEN
 
 typedef struct _repl_t {
@@ -203,6 +305,13 @@ void pyexec_event_repl_init(void) {
 STATIC int pyexec_raw_repl_process_char(int c) {
     if (c == CHAR_CTRL_A) {
         // reset raw REPL
+        if (vstr_len(MP_STATE_VM(repl_line)) == 2 && vstr_str(MP_STATE_VM(repl_line))[0] == CHAR_CTRL_E) {
+            int ret = do_reader_stdin(vstr_str(MP_STATE_VM(repl_line))[1]);
+            if (ret & PYEXEC_FORCED_EXIT) {
+                return ret;
+            }
+            goto reset;
+        }
         mp_hal_stdout_tx_str("raw REPL; CTRL-B to exit\r\n");
         goto reset;
     } else if (c == CHAR_CTRL_B) {
@@ -388,6 +497,15 @@ int pyexec_raw_repl(void) {
             int c = mp_hal_stdin_rx_chr();
             if (c == CHAR_CTRL_A) {
                 // reset raw REPL
+                if (vstr_len(&line) == 2 && vstr_str(&line)[0] == CHAR_CTRL_E) {
+                    int ret = do_reader_stdin(vstr_str(&line)[1]);
+                    if (ret & PYEXEC_FORCED_EXIT) {
+                        return ret;
+                    }
+                    vstr_reset(&line);
+                    mp_hal_stdout_tx_str(">");
+                    continue;
+                }
                 goto raw_repl_reset;
             } else if (c == CHAR_CTRL_B) {
                 // change to friendly REPL

From a59282b9bfb6928cd68b696258c0dd2280244eb3 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 8 Oct 2020 23:58:02 +1100
Subject: [PATCH 0433/3533] tools/pyboard.py: Add fast raw-paste mode.

This commit adds support to pyboard.py for the new raw REPL paste mode.

Note that this new pyboard.py is fully backwards compatible with old
devices (it detects if the device supports the new raw REPL paste mode).

Signed-off-by: Damien George <damien@micropython.org>
---
 tools/pyboard.py | 57 +++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 56 insertions(+), 1 deletion(-)

diff --git a/tools/pyboard.py b/tools/pyboard.py
index c97ddbe487be3..3ecdf03f156f7 100755
--- a/tools/pyboard.py
+++ b/tools/pyboard.py
@@ -253,6 +253,7 @@ def inWaiting(self):
 
 class Pyboard:
     def __init__(self, device, baudrate=115200, user="micro", password="python", wait=0):
+        self.use_raw_paste = True
         if device.startswith("exec:"):
             self.serial = ProcessToSerial(device[len("exec:") :])
         elif device.startswith("execpty:"):
@@ -359,6 +360,41 @@ def follow(self, timeout, data_consumer=None):
         # return normal and error output
         return data, data_err
 
+    def raw_paste_write(self, command_bytes):
+        # Read initial header, with window size.
+        data = self.serial.read(2)
+        window_size = data[0] | data[1] << 8
+        window_remain = window_size
+
+        # Write out the command_bytes data.
+        i = 0
+        while i < len(command_bytes):
+            while window_remain == 0 or self.serial.inWaiting():
+                data = self.serial.read(1)
+                if data == b"\x01":
+                    # Device indicated that a new window of data can be sent.
+                    window_remain += window_size
+                elif data == b"\x04":
+                    # Device indicated abrupt end.  Acknowledge it and finish.
+                    self.serial.write(b"\x04")
+                    return
+                else:
+                    # Unexpected data from device.
+                    raise PyboardError("unexpected read during raw paste: {}".format(data))
+            # Send out as much data as possible that fits within the allowed window.
+            b = command_bytes[i : min(i + window_remain, len(command_bytes))]
+            self.serial.write(b)
+            window_remain -= len(b)
+            i += len(b)
+
+        # Indicate end of data.
+        self.serial.write(b"\x04")
+
+        # Wait for device to acknowledge end of data.
+        data = self.read_until(1, b"\x04")
+        if not data.endswith(b"\x04"):
+            raise PyboardError("could not complete raw paste: {}".format(data))
+
     def exec_raw_no_follow(self, command):
         if isinstance(command, bytes):
             command_bytes = command
@@ -370,7 +406,26 @@ def exec_raw_no_follow(self, command):
         if not data.endswith(b">"):
             raise PyboardError("could not enter raw repl")
 
-        # write command
+        if self.use_raw_paste:
+            # Try to enter raw-paste mode.
+            self.serial.write(b"\x05A\x01")
+            data = self.serial.read(2)
+            if data == b"R\x00":
+                # Device understood raw-paste command but doesn't support it.
+                pass
+            elif data == b"R\x01":
+                # Device supports raw-paste mode, write out the command using this mode.
+                return self.raw_paste_write(command_bytes)
+            else:
+                # Device doesn't support raw-paste, fall back to normal raw REPL.
+                data = self.read_until(1, b"w REPL; CTRL-B to exit\r\n>")
+                if not data.endswith(b"w REPL; CTRL-B to exit\r\n>"):
+                    print(data)
+                    raise PyboardError("could not enter raw repl")
+            # Don't try to use raw-paste mode again for this connection.
+            self.use_raw_paste = False
+
+        # Write command using standard raw REPL, 256 bytes every 10ms.
         for i in range(0, len(command_bytes), 256):
             self.serial.write(command_bytes[i : min(i + 256, len(command_bytes))])
             time.sleep(0.01)

From a14ca31e8579a07f263bca0dd4b0dd03f43befa2 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 30 Nov 2020 11:34:23 +1100
Subject: [PATCH 0434/3533] docs/reference/repl.rst: Add information about new
 raw-paste mode.

Signed-off-by: Damien George <damien@micropython.org>
---
 docs/reference/repl.rst | 100 +++++++++++++++++++++++++++++++++++++---
 1 file changed, 94 insertions(+), 6 deletions(-)

diff --git a/docs/reference/repl.rst b/docs/reference/repl.rst
index 06ba918117f33..55f76ee1a03b9 100644
--- a/docs/reference/repl.rst
+++ b/docs/reference/repl.rst
@@ -196,17 +196,105 @@ So you can use the underscore to save the result in a variable. For example:
     15
     >>>
 
-Raw mode
---------
+Raw mode and raw-paste mode
+---------------------------
 
-Raw mode is not something that a person would normally use. It is intended for
-programmatic use. It essentially behaves like paste mode with echo turned off.
+Raw mode (also called raw REPL) is not something that a person would normally use.
+It is intended for programmatic use and essentially behaves like paste mode with
+echo turned off, and with optional flow control.
 
 Raw mode is entered using Ctrl-A. You then send your python code, followed by
 a Ctrl-D. The Ctrl-D will be acknowledged by 'OK' and then the python code will
 be compiled and executed. Any output (or errors) will be sent back. Entering
 Ctrl-B will leave raw mode and return the the regular (aka friendly) REPL.
 
-The ``tools/pyboard.py`` program uses the raw REPL to execute python files on the
-MicroPython board.
+Raw-paste mode is an additional mode within the raw REPL that includes flow control,
+and which compiles code as it receives it. This makes it more robust for high-speed
+transfer of code into the device, and it also uses less RAM when receiving because
+it does not need to store a verbatim copy of the code before compiling (unlike
+standard raw mode).
 
+Raw-paste mode uses the following protocol:
+
+#. Enter raw REPL as usual via ctrl-A.
+
+#. Write 3 bytes: ``b"\x05A\x01"`` (ie ctrl-E then "A" then ctrl-A).
+
+#. Read 2 bytes to determine if the device entered raw-paste mode:
+
+   * If the result is ``b"R\x00"`` then the device understands the command but
+     doesn't support raw paste.
+
+   * If the result is ``b"R\x01"`` then the device does support raw paste and
+     has entered this mode.
+
+   * Otherwise the result should be ``b"ra"`` and the device doesn't support raw
+     paste and the string ``b"w REPL; CTRL-B to exit\r\n>"`` should be read and
+     discarded.
+
+#. If the device is in raw-paste mode then continue, otherwise fallback to
+   standard raw mode.
+
+#. Read 2 bytes, this is the flow control window-size-increment (in bytes)
+   stored as a 16-bit unsigned little endian integer.  The initial value for the
+   remaining-window-size variable should be set to this number.
+
+#. Write out the code to the device:
+
+   * While there are bytes to send, write up to the remaining-window-size worth
+     of bytes, and decrease the remaining-window-size by the number of bytes
+     written.
+
+   * If the remaining-window-size is 0, or there is a byte waiting to read, read
+     1 byte.  If this byte is ``b"\x01"`` then increase the remaining-window-size
+     by the window-size-increment from step 5.  If this byte is ``b"\x04"`` then
+     the device wants to end the data reception, and ``b"\x04"`` should be
+     written to the device and no more code sent after that.  (Note: if there is
+     a byte waiting to be read from the device then it does not need to be read
+     and acted upon immediately, the device will continue to consume incoming
+     bytes as long as reamining-window-size is greater than 0.)
+
+#. When all code has been written to the device, write ``b"\x04"`` to indicate
+   end-of-data.
+
+#. Read from the device until ``b"\x04"`` is received.  At this point the device
+   has received and compiled all of the code that was sent and is executing it.
+
+#. The device outputs any characters produced by the executing code.  When (if)
+   the code finishes ``b"\x04"`` will be output, followed by any exception that
+   was uncaught, followed again by ``b"\x04"``.  It then goes back to the
+   standard raw REPL and outputs ``b">"``.
+
+For example, starting at a new line at the normal (friendly) REPL, if you write::
+
+    b"\x01\x05A\x01print(123)\x04"
+
+Then the device will respond with something like::
+
+    b"\r\nraw REPL; CTRL-B to exit\r\n>R\x01\x80\x00\x01\x04123\r\n\x04\x04>"
+
+Broken down over time this looks like::
+
+    # Step 1: enter raw REPL
+    write: b"\x01"
+    read: b"\r\nraw REPL; CTRL-B to exit\r\n>"
+
+    # Step 2-5: enter raw-paste mode
+    write: b"\x05A\x01"
+    read: b"R\x01\x80\x00\x01"
+
+    # Step 6-8: write out code
+    write: b"print(123)\x04"
+    read: b"\x04"
+
+    # Step 9: code executes and result is read
+    read: b"123\r\n\x04\x04>"
+
+In this case the flow control window-size-increment is 128 and there are two
+windows worth of data immediately available at the start, one from the initial
+window-size-increment value and one from the explicit ``b"\x01"`` value that
+is sent.  So this means up to 256 bytes can be written to begin with before
+waiting or checking for more incoming flow-control characters.
+
+The ``tools/pyboard.py`` program uses the raw REPL, including raw-paste mode, to
+execute Python code on a MicroPython-enabled board.

From ca40eb0fdadd5a963b9a065999b092f029a598d5 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 30 Nov 2020 17:38:19 +1100
Subject: [PATCH 0435/3533] extmod/uasyncio: Delay calling
 Loop.call_exception_handler by 1 loop.

When a tasks raises an exception which is uncaught, and no other task
await's on that task, then an error message is printed (or a user function
called) via a call to Loop.call_exception_handler.  In CPython this call is
made when the Task object is freed (eg via reference counting) because it's
at that point that it is known that the exception that was raised will
never be handled.

MicroPython does not have reference counting and the current behaviour is
to deal with uncaught exceptions as early as possible, ie as soon as they
terminate the task.  But this can be undesirable because in certain cases
a task can start and raise an exception immediately (before any await is
executed in that task's coro) and before any other task gets a chance to
await on it to catch the exception.

This commit changes the behaviour so that tasks which end due to an
uncaught exception are scheduled one more time for execution, and if they
are not await'ed on by the next scheduling loop, then the exception handler
is called (eg the exception is printed out).

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/moduasyncio.c                          | 39 +++++++++++++++++--
 extmod/uasyncio/core.py                       | 16 ++++----
 extmod/uasyncio/funcs.py                      |  4 +-
 extmod/uasyncio/task.py                       | 19 +++++++--
 .../extmod/uasyncio_set_exception_handler.py  | 12 +++++-
 .../uasyncio_set_exception_handler.py.exp     |  1 +
 6 files changed, 73 insertions(+), 18 deletions(-)

diff --git a/extmod/moduasyncio.c b/extmod/moduasyncio.c
index 0b15c9e0790a5..e8822c069741b 100644
--- a/extmod/moduasyncio.c
+++ b/extmod/moduasyncio.c
@@ -146,6 +146,9 @@ STATIC const mp_obj_type_t task_queue_type = {
 /******************************************************************************/
 // Task class
 
+// For efficiency, the task object is stored to the coro entry when the task is done.
+#define TASK_IS_DONE(task) ((task)->coro == MP_OBJ_FROM_PTR(task))
+
 // This is the core uasyncio context with cur_task, _task_queue and CancelledError.
 STATIC mp_obj_t uasyncio_context = MP_OBJ_NULL;
 
@@ -167,7 +170,7 @@ STATIC mp_obj_t task_make_new(const mp_obj_type_t *type, size_t n_args, size_t n
 STATIC mp_obj_t task_cancel(mp_obj_t self_in) {
     mp_obj_task_t *self = MP_OBJ_TO_PTR(self_in);
     // Check if task is already finished.
-    if (self->coro == mp_const_none) {
+    if (TASK_IS_DONE(self)) {
         return mp_const_false;
     }
     // Can't cancel self (not supported yet).
@@ -209,6 +212,24 @@ STATIC mp_obj_t task_cancel(mp_obj_t self_in) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(task_cancel_obj, task_cancel);
 
+STATIC mp_obj_t task_throw(mp_obj_t self_in, mp_obj_t value_in) {
+    // This task raised an exception which was uncaught; handle that now.
+    mp_obj_task_t *self = MP_OBJ_TO_PTR(self_in);
+    // Set the data because it was cleared by the main scheduling loop.
+    self->data = value_in;
+    if (self->waiting == mp_const_none) {
+        // Nothing await'ed on the task so call the exception handler.
+        mp_obj_t _exc_context = mp_obj_dict_get(uasyncio_context, MP_OBJ_NEW_QSTR(MP_QSTR__exc_context));
+        mp_obj_dict_store(_exc_context, MP_OBJ_NEW_QSTR(MP_QSTR_exception), value_in);
+        mp_obj_dict_store(_exc_context, MP_OBJ_NEW_QSTR(MP_QSTR_future), self_in);
+        mp_obj_t Loop = mp_obj_dict_get(uasyncio_context, MP_OBJ_NEW_QSTR(MP_QSTR_Loop));
+        mp_obj_t call_exception_handler = mp_load_attr(Loop, MP_QSTR_call_exception_handler);
+        mp_call_function_1(call_exception_handler, _exc_context);
+    }
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(task_throw_obj, task_throw);
+
 STATIC void task_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
     mp_obj_task_t *self = MP_OBJ_TO_PTR(self_in);
     if (dest[0] == MP_OBJ_NULL) {
@@ -218,12 +239,15 @@ STATIC void task_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
         } else if (attr == MP_QSTR_data) {
             dest[0] = self->data;
         } else if (attr == MP_QSTR_waiting) {
-            if (self->waiting != mp_const_none) {
+            if (self->waiting != mp_const_none && self->waiting != mp_const_false) {
                 dest[0] = self->waiting;
             }
         } else if (attr == MP_QSTR_cancel) {
             dest[0] = MP_OBJ_FROM_PTR(&task_cancel_obj);
             dest[1] = self_in;
+        } else if (attr == MP_QSTR_throw) {
+            dest[0] = MP_OBJ_FROM_PTR(&task_throw_obj);
+            dest[1] = self_in;
         } else if (attr == MP_QSTR_ph_key) {
             dest[0] = self->ph_key;
         }
@@ -246,14 +270,21 @@ STATIC mp_obj_t task_getiter(mp_obj_t self_in, mp_obj_iter_buf_t *iter_buf) {
     (void)iter_buf;
     mp_obj_task_t *self = MP_OBJ_TO_PTR(self_in);
     if (self->waiting == mp_const_none) {
-        self->waiting = task_queue_make_new(&task_queue_type, 0, 0, NULL);
+        // The is the first access of the "waiting" entry.
+        if (TASK_IS_DONE(self)) {
+            // Signal that the completed-task has been await'ed on.
+            self->waiting = mp_const_false;
+        } else {
+            // Lazily allocate the waiting queue.
+            self->waiting = task_queue_make_new(&task_queue_type, 0, 0, NULL);
+        }
     }
     return self_in;
 }
 
 STATIC mp_obj_t task_iternext(mp_obj_t self_in) {
     mp_obj_task_t *self = MP_OBJ_TO_PTR(self_in);
-    if (self->coro == mp_const_none) {
+    if (TASK_IS_DONE(self)) {
         // Task finished, raise return value to caller so it can continue.
         nlr_raise(self->data);
     } else {
diff --git a/extmod/uasyncio/core.py b/extmod/uasyncio/core.py
index 045b4cd139182..6a84b0982c41f 100644
--- a/extmod/uasyncio/core.py
+++ b/extmod/uasyncio/core.py
@@ -185,8 +185,6 @@ def run_until_complete(main_task=None):
                 if isinstance(er, StopIteration):
                     return er.value
                 raise er
-            # Save return value of coro to pass up to caller
-            t.data = er
             # Schedule any other tasks waiting on the completion of this task
             waiting = False
             if hasattr(t, "waiting"):
@@ -194,13 +192,15 @@ def run_until_complete(main_task=None):
                     _task_queue.push_head(t.waiting.pop_head())
                     waiting = True
                 t.waiting = None  # Free waiting queue head
-            # Print out exception for detached tasks
             if not waiting and not isinstance(er, excs_stop):
-                _exc_context["exception"] = er
-                _exc_context["future"] = t
-                Loop.call_exception_handler(_exc_context)
-            # Indicate task is done
-            t.coro = None
+                # An exception ended this detached task, so queue it for later
+                # execution to handle the uncaught exception if no other task retrieves
+                # the exception in the meantime (this is handled by Task.throw).
+                _task_queue.push_head(t)
+            # Indicate task is done by setting coro to the task object itself
+            t.coro = t
+            # Save return value of coro to pass up to caller
+            t.data = er
 
 
 # Create a new task from a coroutine and run it until it finishes
diff --git a/extmod/uasyncio/funcs.py b/extmod/uasyncio/funcs.py
index 6e1305c94f418..d306752312c6e 100644
--- a/extmod/uasyncio/funcs.py
+++ b/extmod/uasyncio/funcs.py
@@ -21,9 +21,9 @@ def cancel(aw, timeout, sleep):
         pass
     finally:
         # Cancel the "cancel" task if it's still active (optimisation instead of cancel_task.cancel())
-        if cancel_task.coro is not None:
+        if cancel_task.coro is not cancel_task:
             core._task_queue.remove(cancel_task)
-    if cancel_task.coro is None:
+    if cancel_task.coro is cancel_task:
         # Cancel task ran to completion, ie there was a timeout
         raise core.TimeoutError
     return ret
diff --git a/extmod/uasyncio/task.py b/extmod/uasyncio/task.py
index 1788cf0ed0486..2420ab7193159 100644
--- a/extmod/uasyncio/task.py
+++ b/extmod/uasyncio/task.py
@@ -130,13 +130,16 @@ def __init__(self, coro, globals=None):
         self.ph_rightmost_parent = None  # Paring heap
 
     def __iter__(self):
-        if not hasattr(self, "waiting"):
+        if self.coro is self:
+            # Signal that the completed-task has been await'ed on.
+            self.waiting = None
+        elif not hasattr(self, "waiting"):
             # Lazily allocated head of linked list of Tasks waiting on completion of this task.
             self.waiting = TaskQueue()
         return self
 
     def __next__(self):
-        if not self.coro:
+        if self.coro is self:
             # Task finished, raise return value to caller so it can continue.
             raise self.data
         else:
@@ -147,7 +150,7 @@ def __next__(self):
 
     def cancel(self):
         # Check if task is already finished.
-        if self.coro is None:
+        if self.coro is self:
             return False
         # Can't cancel self (not supported yet).
         if self is core.cur_task:
@@ -166,3 +169,13 @@ def cancel(self):
             core._task_queue.push_head(self)
         self.data = core.CancelledError
         return True
+
+    def throw(self, value):
+        # This task raised an exception which was uncaught; handle that now.
+        # Set the data because it was cleared by the main scheduling loop.
+        self.data = value
+        if not hasattr(self, "waiting"):
+            # Nothing await'ed on the task so call the exception handler.
+            core._exc_context["exception"] = value
+            core._exc_context["future"] = self
+            core.Loop.call_exception_handler(core._exc_context)
diff --git a/tests/extmod/uasyncio_set_exception_handler.py b/tests/extmod/uasyncio_set_exception_handler.py
index ad62a79b7b7a8..fe7b83eb4d81a 100644
--- a/tests/extmod/uasyncio_set_exception_handler.py
+++ b/tests/extmod/uasyncio_set_exception_handler.py
@@ -32,13 +32,23 @@ async def main():
     # Create a task that raises and uses the custom exception handler
     asyncio.create_task(task(0))
     print("sleep")
-    await asyncio.sleep(0)
+    for _ in range(2):
+        await asyncio.sleep(0)
 
     # Create 2 tasks to test order of printing exception
     asyncio.create_task(task(1))
     asyncio.create_task(task(2))
     print("sleep")
+    for _ in range(2):
+        await asyncio.sleep(0)
+
+    # Create a task, let it run, then await it (no exception should be printed)
+    t = asyncio.create_task(task(3))
     await asyncio.sleep(0)
+    try:
+        await t
+    except ValueError as er:
+        print(repr(er))
 
     print("done")
 
diff --git a/tests/extmod/uasyncio_set_exception_handler.py.exp b/tests/extmod/uasyncio_set_exception_handler.py.exp
index 4744641e54c3c..fb4711469dc5b 100644
--- a/tests/extmod/uasyncio_set_exception_handler.py.exp
+++ b/tests/extmod/uasyncio_set_exception_handler.py.exp
@@ -5,4 +5,5 @@ custom_handler ValueError(0, 1)
 sleep
 custom_handler ValueError(1, 2)
 custom_handler ValueError(2, 3)
+ValueError(3, 4)
 done

From 309dfe39e07d3c3c8ba873ed09116cea9f6f52c0 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 30 Nov 2020 17:38:30 +1100
Subject: [PATCH 0436/3533] extmod/uasyncio: Add Task.done() method.

This is added because task.coro==None is no longer the way to detect if a
task is finished.  Providing a (CPython compatible) function for this
allows the implementation to be abstracted away.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/moduasyncio.c                   |  9 ++++
 extmod/uasyncio/task.py                |  3 ++
 tests/extmod/uasyncio_task_done.py     | 66 ++++++++++++++++++++++++++
 tests/extmod/uasyncio_task_done.py.exp | 24 ++++++++++
 4 files changed, 102 insertions(+)
 create mode 100644 tests/extmod/uasyncio_task_done.py
 create mode 100644 tests/extmod/uasyncio_task_done.py.exp

diff --git a/extmod/moduasyncio.c b/extmod/moduasyncio.c
index e8822c069741b..fe0f748cac986 100644
--- a/extmod/moduasyncio.c
+++ b/extmod/moduasyncio.c
@@ -167,6 +167,12 @@ STATIC mp_obj_t task_make_new(const mp_obj_type_t *type, size_t n_args, size_t n
     return MP_OBJ_FROM_PTR(self);
 }
 
+STATIC mp_obj_t task_done(mp_obj_t self_in) {
+    mp_obj_task_t *self = MP_OBJ_TO_PTR(self_in);
+    return mp_obj_new_bool(TASK_IS_DONE(self));
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(task_done_obj, task_done);
+
 STATIC mp_obj_t task_cancel(mp_obj_t self_in) {
     mp_obj_task_t *self = MP_OBJ_TO_PTR(self_in);
     // Check if task is already finished.
@@ -242,6 +248,9 @@ STATIC void task_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
             if (self->waiting != mp_const_none && self->waiting != mp_const_false) {
                 dest[0] = self->waiting;
             }
+        } else if (attr == MP_QSTR_done) {
+            dest[0] = MP_OBJ_FROM_PTR(&task_done_obj);
+            dest[1] = self_in;
         } else if (attr == MP_QSTR_cancel) {
             dest[0] = MP_OBJ_FROM_PTR(&task_cancel_obj);
             dest[1] = self_in;
diff --git a/extmod/uasyncio/task.py b/extmod/uasyncio/task.py
index 2420ab7193159..68ddf496f08a2 100644
--- a/extmod/uasyncio/task.py
+++ b/extmod/uasyncio/task.py
@@ -148,6 +148,9 @@ def __next__(self):
             # Set calling task's data to this task that it waits on, to double-link it.
             core.cur_task.data = self
 
+    def done(self):
+        return self.coro is self
+
     def cancel(self):
         # Check if task is already finished.
         if self.coro is self:
diff --git a/tests/extmod/uasyncio_task_done.py b/tests/extmod/uasyncio_task_done.py
new file mode 100644
index 0000000000000..2700da8c34168
--- /dev/null
+++ b/tests/extmod/uasyncio_task_done.py
@@ -0,0 +1,66 @@
+# Test the Task.done() method
+
+try:
+    import uasyncio as asyncio
+except ImportError:
+    try:
+        import asyncio
+    except ImportError:
+        print("SKIP")
+        raise SystemExit
+
+
+async def task(t, exc=None):
+    print("task start")
+    if t >= 0:
+        await asyncio.sleep(t)
+    if exc:
+        raise exc
+    print("task done")
+
+
+async def main():
+    # Task that finishes immediately.
+    print("=" * 10)
+    t = asyncio.create_task(task(-1))
+    print(t.done())
+    await asyncio.sleep(0)
+    print(t.done())
+    await t
+    print(t.done())
+
+    # Task that starts, runs and finishes.
+    print("=" * 10)
+    t = asyncio.create_task(task(0.01))
+    print(t.done())
+    await asyncio.sleep(0)
+    print(t.done())
+    await t
+    print(t.done())
+
+    # Task that raises immediately.
+    print("=" * 10)
+    t = asyncio.create_task(task(-1, ValueError))
+    print(t.done())
+    await asyncio.sleep(0)
+    print(t.done())
+    try:
+        await t
+    except ValueError as er:
+        print(repr(er))
+    print(t.done())
+
+    # Task that raises after a delay.
+    print("=" * 10)
+    t = asyncio.create_task(task(0.01, ValueError))
+    print(t.done())
+    await asyncio.sleep(0)
+    print(t.done())
+    try:
+        await t
+    except ValueError as er:
+        print(repr(er))
+    print(t.done())
+
+
+asyncio.run(main())
diff --git a/tests/extmod/uasyncio_task_done.py.exp b/tests/extmod/uasyncio_task_done.py.exp
new file mode 100644
index 0000000000000..ddda04c5ec43b
--- /dev/null
+++ b/tests/extmod/uasyncio_task_done.py.exp
@@ -0,0 +1,24 @@
+==========
+False
+task start
+task done
+True
+True
+==========
+False
+task start
+False
+task done
+True
+==========
+False
+task start
+True
+ValueError()
+True
+==========
+False
+task start
+False
+ValueError()
+True

From b505971069333a373d9f0c12138b64dab83fed72 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 1 Dec 2020 14:22:16 +1100
Subject: [PATCH 0437/3533] extmod/uasyncio: Fix cancellation handling of
 wait_for.

This commit switches the roles of the helper task from a cancellation task
to a runner task, to get the correct semantics for cancellation of
wait_for.

Some uasyncio tests are now disabled for the native emitter due to issues
with native code generation of generators and yield-from.

Fixes #5797.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/uasyncio/funcs.py                  | 52 ++++++++++++++------
 tests/extmod/uasyncio_wait_for.py         | 55 +++++++++++++++++++++
 tests/extmod/uasyncio_wait_for.py.exp     | 20 ++++++++
 tests/extmod/uasyncio_wait_for_fwd.py     | 60 +++++++++++++++++++++++
 tests/extmod/uasyncio_wait_for_fwd.py.exp | 26 ++++++++++
 tests/run-tests                           |  3 ++
 6 files changed, 200 insertions(+), 16 deletions(-)
 create mode 100644 tests/extmod/uasyncio_wait_for_fwd.py
 create mode 100644 tests/extmod/uasyncio_wait_for_fwd.py.exp

diff --git a/extmod/uasyncio/funcs.py b/extmod/uasyncio/funcs.py
index d306752312c6e..93f4fd256cafe 100644
--- a/extmod/uasyncio/funcs.py
+++ b/extmod/uasyncio/funcs.py
@@ -9,24 +9,44 @@ async def wait_for(aw, timeout, sleep=core.sleep):
     if timeout is None:
         return await aw
 
-    def cancel(aw, timeout, sleep):
-        await sleep(timeout)
-        aw.cancel()
+    def runner(waiter, aw):
+        nonlocal status, result
+        try:
+            result = await aw
+            s = True
+        except BaseException as er:
+            s = er
+        if status is None:
+            # The waiter is still waiting, set status for it and cancel it.
+            status = s
+            waiter.cancel()
+
+    # Run aw in a separate runner task that manages its exceptions.
+    status = None
+    result = None
+    runner_task = core.create_task(runner(core.cur_task, aw))
 
-    cancel_task = core.create_task(cancel(aw, timeout, sleep))
     try:
-        ret = await aw
-    except core.CancelledError:
-        # Ignore CancelledError from aw, it's probably due to timeout
-        pass
-    finally:
-        # Cancel the "cancel" task if it's still active (optimisation instead of cancel_task.cancel())
-        if cancel_task.coro is not cancel_task:
-            core._task_queue.remove(cancel_task)
-    if cancel_task.coro is cancel_task:
-        # Cancel task ran to completion, ie there was a timeout
-        raise core.TimeoutError
-    return ret
+        # Wait for the timeout to elapse.
+        await sleep(timeout)
+    except core.CancelledError as er:
+        if status is True:
+            # aw completed successfully and cancelled the sleep, so return aw's result.
+            return result
+        elif status is None:
+            # This wait_for was cancelled externally, so cancel aw and re-raise.
+            status = True
+            runner_task.cancel()
+            raise er
+        else:
+            # aw raised an exception, propagate it out to the caller.
+            raise status
+
+    # The sleep finished before aw, so cancel aw and raise TimeoutError.
+    status = True
+    runner_task.cancel()
+    await runner_task
+    raise core.TimeoutError
 
 
 def wait_for_ms(aw, timeout):
diff --git a/tests/extmod/uasyncio_wait_for.py b/tests/extmod/uasyncio_wait_for.py
index 92fd174b846db..9612d16204043 100644
--- a/tests/extmod/uasyncio_wait_for.py
+++ b/tests/extmod/uasyncio_wait_for.py
@@ -31,30 +31,85 @@ async def task_raise():
     raise ValueError
 
 
+async def task_cancel_other(t, other):
+    print("task_cancel_other start")
+    await asyncio.sleep(t)
+    print("task_cancel_other cancel")
+    other.cancel()
+
+
+async def task_wait_for_cancel(id, t, t_wait):
+    print("task_wait_for_cancel start")
+    try:
+        await asyncio.wait_for(task(id, t), t_wait)
+    except asyncio.CancelledError as er:
+        print("task_wait_for_cancel cancelled")
+        raise er
+
+
+async def task_wait_for_cancel_ignore(t_wait):
+    print("task_wait_for_cancel_ignore start")
+    try:
+        await asyncio.wait_for(task_catch(), t_wait)
+    except asyncio.CancelledError as er:
+        print("task_wait_for_cancel_ignore cancelled")
+        raise er
+
+
 async def main():
+    sep = "-" * 10
+
     # When task finished before the timeout
     print(await asyncio.wait_for(task(1, 0.01), 10))
+    print(sep)
 
     # When timeout passes and task is cancelled
     try:
         print(await asyncio.wait_for(task(2, 10), 0.01))
     except asyncio.TimeoutError:
         print("timeout")
+    print(sep)
 
     # When timeout passes and task is cancelled, but task ignores the cancellation request
     try:
         print(await asyncio.wait_for(task_catch(), 0.1))
     except asyncio.TimeoutError:
         print("TimeoutError")
+    print(sep)
 
     # When task raises an exception
     try:
         print(await asyncio.wait_for(task_raise(), 1))
     except ValueError:
         print("ValueError")
+    print(sep)
 
     # Timeout of None means wait forever
     print(await asyncio.wait_for(task(3, 0.1), None))
+    print(sep)
+
+    # When task is cancelled by another task
+    t = asyncio.create_task(task(4, 10))
+    asyncio.create_task(task_cancel_other(0.01, t))
+    try:
+        print(await asyncio.wait_for(t, 1))
+    except asyncio.CancelledError as er:
+        print(repr(er))
+    print(sep)
+
+    # When wait_for gets cancelled
+    t = asyncio.create_task(task_wait_for_cancel(4, 1, 2))
+    await asyncio.sleep(0.01)
+    t.cancel()
+    await asyncio.sleep(0.01)
+    print(sep)
+
+    # When wait_for gets cancelled and awaited task ignores the cancellation request
+    t = asyncio.create_task(task_wait_for_cancel_ignore(2))
+    await asyncio.sleep(0.01)
+    t.cancel()
+    await asyncio.sleep(0.01)
+    print(sep)
 
     print("finish")
 
diff --git a/tests/extmod/uasyncio_wait_for.py.exp b/tests/extmod/uasyncio_wait_for.py.exp
index 41a5f2481e908..a4201d31ffdb8 100644
--- a/tests/extmod/uasyncio_wait_for.py.exp
+++ b/tests/extmod/uasyncio_wait_for.py.exp
@@ -1,15 +1,35 @@
 task start 1
 task end 1
 2
+----------
 task start 2
 timeout
+----------
 task_catch start
 ignore cancel
 task_catch done
 TimeoutError
+----------
 task start
 ValueError
+----------
 task start 3
 task end 3
 6
+----------
+task start 4
+task_cancel_other start
+task_cancel_other cancel
+CancelledError()
+----------
+task_wait_for_cancel start
+task start 4
+task_wait_for_cancel cancelled
+----------
+task_wait_for_cancel_ignore start
+task_catch start
+task_wait_for_cancel_ignore cancelled
+ignore cancel
+task_catch done
+----------
 finish
diff --git a/tests/extmod/uasyncio_wait_for_fwd.py b/tests/extmod/uasyncio_wait_for_fwd.py
new file mode 100644
index 0000000000000..33738085ce4a5
--- /dev/null
+++ b/tests/extmod/uasyncio_wait_for_fwd.py
@@ -0,0 +1,60 @@
+# Test asyncio.wait_for, with forwarding cancellation
+
+try:
+    import uasyncio as asyncio
+except ImportError:
+    try:
+        import asyncio
+    except ImportError:
+        print("SKIP")
+        raise SystemExit
+
+
+async def awaiting(t, return_if_fail):
+    try:
+        print("awaiting started")
+        await asyncio.sleep(t)
+    except asyncio.CancelledError as er:
+        # CPython wait_for raises CancelledError inside task but TimeoutError in wait_for
+        print("awaiting canceled")
+        if return_if_fail:
+            return False  # return has no effect if Cancelled
+        else:
+            raise er
+    except Exception as er:
+        print("caught exception", er)
+        raise er
+
+
+async def test_cancellation_forwarded(catch, catch_inside):
+    print("----------")
+
+    async def wait():
+        try:
+            await asyncio.wait_for(awaiting(2, catch_inside), 1)
+        except asyncio.TimeoutError as er:
+            print("Got timeout error")
+            raise er
+        except asyncio.CancelledError as er:
+            print("Got canceled")
+            if not catch:
+                raise er
+
+    async def cancel(t):
+        print("cancel started")
+        await asyncio.sleep(0.01)
+        print("cancel wait()")
+        t.cancel()
+
+    t = asyncio.create_task(wait())
+    k = asyncio.create_task(cancel(t))
+    try:
+        await t
+    except asyncio.CancelledError:
+        print("waiting got cancelled")
+
+
+asyncio.run(test_cancellation_forwarded(False, False))
+asyncio.run(test_cancellation_forwarded(False, True))
+asyncio.run(test_cancellation_forwarded(True, True))
+asyncio.run(test_cancellation_forwarded(True, False))
diff --git a/tests/extmod/uasyncio_wait_for_fwd.py.exp b/tests/extmod/uasyncio_wait_for_fwd.py.exp
new file mode 100644
index 0000000000000..9f22f1a7d1e88
--- /dev/null
+++ b/tests/extmod/uasyncio_wait_for_fwd.py.exp
@@ -0,0 +1,26 @@
+----------
+cancel started
+awaiting started
+cancel wait()
+Got canceled
+awaiting canceled
+waiting got cancelled
+----------
+cancel started
+awaiting started
+cancel wait()
+Got canceled
+awaiting canceled
+waiting got cancelled
+----------
+cancel started
+awaiting started
+cancel wait()
+Got canceled
+awaiting canceled
+----------
+cancel started
+awaiting started
+cancel wait()
+Got canceled
+awaiting canceled
diff --git a/tests/run-tests b/tests/run-tests
index 23c30d3c3cb55..cb5b5cd0a5676 100755
--- a/tests/run-tests
+++ b/tests/run-tests
@@ -434,7 +434,10 @@ def run_tests(pyb, tests, args, result_dir):
         skip_tests.add('basics/scope_implicit.py') # requires checking for unbound local
         skip_tests.add('basics/try_finally_return2.py') # requires raise_varargs
         skip_tests.add('basics/unboundlocal.py') # requires checking for unbound local
+        skip_tests.add('extmod/uasyncio_event.py') # unknown issue
         skip_tests.add('extmod/uasyncio_lock.py') # requires async with
+        skip_tests.add('extmod/uasyncio_micropython.py') # unknown issue
+        skip_tests.add('extmod/uasyncio_wait_for.py') # unknown issue
         skip_tests.add('misc/features.py') # requires raise_varargs
         skip_tests.add('misc/print_exception.py') # because native doesn't have proper traceback info
         skip_tests.add('misc/sys_exc_info.py') # sys.exc_info() is not supported for native

From f2a9a0ac413cc337ccd78bbb26cd67cee7b1e210 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Wed, 25 Nov 2020 09:28:41 +1100
Subject: [PATCH 0438/3533] extmod/nimble: Fail read if the characteristic is
 too big.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 extmod/nimble/modbluetooth_nimble.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/extmod/nimble/modbluetooth_nimble.c b/extmod/nimble/modbluetooth_nimble.c
index bbff26b5354e9..e4a048e3d3df4 100644
--- a/extmod/nimble/modbluetooth_nimble.c
+++ b/extmod/nimble/modbluetooth_nimble.c
@@ -608,7 +608,9 @@ static int characteristic_access_cb(uint16_t conn_handle, uint16_t value_handle,
                 return BLE_ATT_ERR_ATTR_NOT_FOUND;
             }
 
-            os_mbuf_append(ctxt->om, entry->data, entry->data_len);
+            if (os_mbuf_append(ctxt->om, entry->data, entry->data_len)) {
+                return BLE_ATT_ERR_INSUFFICIENT_RES;
+            }
 
             return 0;
         case BLE_GATT_ACCESS_OP_WRITE_CHR:
@@ -625,6 +627,8 @@ static int characteristic_access_cb(uint16_t conn_handle, uint16_t value_handle,
             entry->data_len = MIN(entry->data_alloc, OS_MBUF_PKTLEN(ctxt->om) + offset);
             os_mbuf_copydata(ctxt->om, 0, entry->data_len - offset, entry->data + offset);
 
+            // TODO: Consider failing with BLE_ATT_ERR_INSUFFICIENT_RES if the buffer is full.
+
             mp_bluetooth_gatts_on_write(conn_handle, value_handle);
 
             return 0;

From c70665fb0bc1b4d755abda422d221cc0a72e91da Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Sat, 14 Nov 2020 19:40:25 +1100
Subject: [PATCH 0439/3533] extmod/modbluetooth: Add _IRQ_CONNECTION_UPDATE
 event.

This allows the application to be notified of changes to the connection
interval, connection latency and supervision timeout.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 extmod/btstack/modbluetooth_btstack.c | 40 ++++++++++++++++++---------
 extmod/modbluetooth.c                 | 21 ++++++++++++++
 extmod/modbluetooth.h                 |  5 ++++
 extmod/nimble/modbluetooth_nimble.c   | 25 +++++++++++++----
 4 files changed, 72 insertions(+), 19 deletions(-)

diff --git a/extmod/btstack/modbluetooth_btstack.c b/extmod/btstack/modbluetooth_btstack.c
index 97dd2cbb53f5c..9faae26e46929 100644
--- a/extmod/btstack/modbluetooth_btstack.c
+++ b/extmod/btstack/modbluetooth_btstack.c
@@ -295,20 +295,34 @@ STATIC void btstack_packet_handler(uint8_t packet_type, uint8_t *packet, uint8_t
 
     if (event_type == HCI_EVENT_LE_META) {
         DEBUG_printf("  --> hci le meta\n");
-        if (hci_event_le_meta_get_subevent_code(packet) == HCI_SUBEVENT_LE_CONNECTION_COMPLETE) {
-            uint16_t conn_handle = hci_subevent_le_connection_complete_get_connection_handle(packet);
-            uint8_t addr_type = hci_subevent_le_connection_complete_get_peer_address_type(packet);
-            bd_addr_t addr;
-            hci_subevent_le_connection_complete_get_peer_address(packet, addr);
-            uint16_t irq_event;
-            if (hci_subevent_le_connection_complete_get_role(packet) == 0) {
-                // Master role.
-                irq_event = MP_BLUETOOTH_IRQ_PERIPHERAL_CONNECT;
-            } else {
-                // Slave role.
-                irq_event = MP_BLUETOOTH_IRQ_CENTRAL_CONNECT;
+        switch (hci_event_le_meta_get_subevent_code(packet)) {
+            case HCI_SUBEVENT_LE_CONNECTION_COMPLETE: {
+                uint16_t conn_handle = hci_subevent_le_connection_complete_get_connection_handle(packet);
+                uint8_t addr_type = hci_subevent_le_connection_complete_get_peer_address_type(packet);
+                bd_addr_t addr;
+                hci_subevent_le_connection_complete_get_peer_address(packet, addr);
+                uint16_t irq_event;
+                if (hci_subevent_le_connection_complete_get_role(packet) == 0) {
+                    // Master role.
+                    irq_event = MP_BLUETOOTH_IRQ_PERIPHERAL_CONNECT;
+                } else {
+                    // Slave role.
+                    irq_event = MP_BLUETOOTH_IRQ_CENTRAL_CONNECT;
+                }
+                mp_bluetooth_gap_on_connected_disconnected(irq_event, conn_handle, addr_type, addr);
+                break;
+            }
+            case HCI_SUBEVENT_LE_CONNECTION_UPDATE_COMPLETE: {
+                uint8_t status = hci_subevent_le_connection_update_complete_get_status(packet);
+                uint16_t conn_handle = hci_subevent_le_connection_update_complete_get_connection_handle(packet);
+                uint16_t conn_interval = hci_subevent_le_connection_update_complete_get_conn_interval(packet);
+                uint16_t conn_latency = hci_subevent_le_connection_update_complete_get_conn_latency(packet);
+                uint16_t supervision_timeout = hci_subevent_le_connection_update_complete_get_supervision_timeout(packet);
+                DEBUG_printf("- LE Connection %04x: connection update - connection interval %u.%02u ms, latency %u, timeout %u\n",
+                    conn_handle, conn_interval * 125 / 100, 25 * (conn_interval & 3), conn_latency, supervision_timeout);
+                mp_bluetooth_gap_on_connection_update(conn_handle, conn_interval, conn_latency, supervision_timeout, status);
+                break;
             }
-            mp_bluetooth_gap_on_connected_disconnected(irq_event, conn_handle, addr_type, addr);
         }
     } else if (event_type == BTSTACK_EVENT_STATE) {
         uint8_t state = btstack_event_state_get_state(packet);
diff --git a/extmod/modbluetooth.c b/extmod/modbluetooth.c
index 2cff386f125d5..dc1084acc13dc 100644
--- a/extmod/modbluetooth.c
+++ b/extmod/modbluetooth.c
@@ -979,6 +979,9 @@ STATIC mp_obj_t bluetooth_ble_invoke_irq(mp_obj_t none_in) {
         if (event == MP_BLUETOOTH_IRQ_CENTRAL_CONNECT || event == MP_BLUETOOTH_IRQ_PERIPHERAL_CONNECT || event == MP_BLUETOOTH_IRQ_CENTRAL_DISCONNECT || event == MP_BLUETOOTH_IRQ_PERIPHERAL_DISCONNECT) {
             // conn_handle, addr_type, addr
             ringbuf_extract(&o->ringbuf, data_tuple, 1, 1, &o->irq_data_addr, 0, NULL, NULL);
+        } else if (event == MP_BLUETOOTH_IRQ_CONNECTION_UPDATE) {
+            // conn_handle, conn_interval, conn_latency, supervision_timeout, status
+            ringbuf_extract(&o->ringbuf, data_tuple, 5, 0, NULL, 0, NULL, NULL);
         } else if (event == MP_BLUETOOTH_IRQ_GATTS_WRITE) {
             // conn_handle, value_handle
             ringbuf_extract(&o->ringbuf, data_tuple, 2, 0, NULL, 0, NULL, NULL);
@@ -1093,6 +1096,11 @@ void mp_bluetooth_gap_on_connected_disconnected(uint8_t event, uint16_t conn_han
     invoke_irq_handler(event, &conn_handle, 1, &addr_type, 1, addr, NULL_I8, 0, NULL_UUID, NULL_DATA, 0);
 }
 
+void mp_bluetooth_gap_on_connection_update(uint16_t conn_handle, uint16_t conn_interval, uint16_t conn_latency, uint16_t supervision_timeout, uint16_t status) {
+    uint16_t args[] = {conn_handle, conn_interval, conn_latency, supervision_timeout, status};
+    invoke_irq_handler(MP_BLUETOOTH_IRQ_CONNECTION_UPDATE, args, 5, NULL_U8, 0, NULL_ADDR, NULL_I8, 0, NULL_UUID, NULL_DATA, 0);
+}
+
 void mp_bluetooth_gatts_on_write(uint16_t conn_handle, uint16_t value_handle) {
     uint16_t args[] = {conn_handle, value_handle};
     invoke_irq_handler(MP_BLUETOOTH_IRQ_GATTS_WRITE, args, 2, NULL_U8, 0, NULL_ADDR, NULL_I8, 0, NULL_UUID, NULL_DATA, 0);
@@ -1276,6 +1284,19 @@ void mp_bluetooth_gap_on_connected_disconnected(uint8_t event, uint16_t conn_han
     schedule_ringbuf(atomic_state);
 }
 
+void mp_bluetooth_gap_on_connection_update(uint16_t conn_handle, uint16_t conn_interval, uint16_t conn_latency, uint16_t supervision_timeout, uint16_t status) {
+    MICROPY_PY_BLUETOOTH_ENTER
+    mp_obj_bluetooth_ble_t *o = MP_OBJ_TO_PTR(MP_STATE_VM(bluetooth));
+    if (enqueue_irq(o, 2 + 2 + 2 + 2 + 2, MP_BLUETOOTH_IRQ_CONNECTION_UPDATE)) {
+        ringbuf_put16(&o->ringbuf, conn_handle);
+        ringbuf_put16(&o->ringbuf, conn_interval);
+        ringbuf_put16(&o->ringbuf, conn_latency);
+        ringbuf_put16(&o->ringbuf, supervision_timeout);
+        ringbuf_put16(&o->ringbuf, status);
+    }
+    schedule_ringbuf(atomic_state);
+}
+
 void mp_bluetooth_gatts_on_write(uint16_t conn_handle, uint16_t value_handle) {
     MICROPY_PY_BLUETOOTH_ENTER
     mp_obj_bluetooth_ble_t *o = MP_OBJ_TO_PTR(MP_STATE_VM(bluetooth));
diff --git a/extmod/modbluetooth.h b/extmod/modbluetooth.h
index 9caddb0f3f89e..2619e71894d7c 100644
--- a/extmod/modbluetooth.h
+++ b/extmod/modbluetooth.h
@@ -114,6 +114,7 @@
 #define MP_BLUETOOTH_IRQ_L2CAP_DISCONNECT               (24)
 #define MP_BLUETOOTH_IRQ_L2CAP_RECV                     (25)
 #define MP_BLUETOOTH_IRQ_L2CAP_SEND_READY               (26)
+#define MP_BLUETOOTH_IRQ_CONNECTION_UPDATE              (27)
 
 #define MP_BLUETOOTH_ADDRESS_MODE_PUBLIC (0)
 #define MP_BLUETOOTH_ADDRESS_MODE_RANDOM (1)
@@ -151,6 +152,7 @@ _IRQ_L2CAP_CONNECT = const(23)
 _IRQ_L2CAP_DISCONNECT = const(24)
 _IRQ_L2CAP_RECV = const(25)
 _IRQ_L2CAP_SEND_READY = const(26)
+_IRQ_GATTS_CONN_UPDATE = const(27)
 */
 
 // bluetooth.UUID type.
@@ -281,6 +283,9 @@ int mp_bluetooth_l2cap_recvinto(uint16_t conn_handle, uint16_t cid, uint8_t *buf
 // Notify modbluetooth that a connection/disconnection event has occurred.
 void mp_bluetooth_gap_on_connected_disconnected(uint8_t event, uint16_t conn_handle, uint8_t addr_type, const uint8_t *addr);
 
+// Call this when any connection parameters have been changed.
+void mp_bluetooth_gap_on_connection_update(uint16_t conn_handle, uint16_t conn_interval, uint16_t conn_latency, uint16_t supervision_timeout, uint16_t status);
+
 // Call this when a characteristic is written to.
 void mp_bluetooth_gatts_on_write(uint16_t conn_handle, uint16_t value_handle);
 
diff --git a/extmod/nimble/modbluetooth_nimble.c b/extmod/nimble/modbluetooth_nimble.c
index e4a048e3d3df4..3983d1869082b 100644
--- a/extmod/nimble/modbluetooth_nimble.c
+++ b/extmod/nimble/modbluetooth_nimble.c
@@ -303,6 +303,19 @@ STATIC int gap_event_cb(struct ble_gap_event *event, void *arg) {
             }
             break;
         }
+
+        case BLE_GAP_EVENT_PHY_UPDATE_COMPLETE:
+            DEBUG_printf("gap_event_cb: phy update: %d\n", event->phy_updated.tx_phy);
+            break;
+
+        case BLE_GAP_EVENT_CONN_UPDATE: {
+            DEBUG_printf("gap_event_cb: connection update: status=%d\n", event->conn_update.status);
+            struct ble_gap_conn_desc desc;
+            if (ble_gap_conn_find(event->conn_update.conn_handle, &desc) == 0) {
+                mp_bluetooth_gap_on_connection_update(event->conn_update.conn_handle, desc.conn_itvl, desc.conn_latency, desc.supervision_timeout, event->conn_update.status == 0 ? 0 : 1);
+            }
+            break;
+        }
     }
     return 0;
 }
@@ -938,13 +951,13 @@ STATIC int peripheral_gap_event_cb(struct ble_gap_event *event, void *arg) {
             break;
         }
 
-        case BLE_GAP_EVENT_CONN_UPDATE:
-            // TODO
-            break;
-
-        case BLE_GAP_EVENT_CONN_UPDATE_REQ:
-            // TODO
+        case BLE_GAP_EVENT_CONN_UPDATE: {
+            DEBUG_printf("peripheral_gap_event_cb: connection update: status=%d\n", event->conn_update.status);
+            if (ble_gap_conn_find(event->conn_update.conn_handle, &desc) == 0) {
+                mp_bluetooth_gap_on_connection_update(event->conn_update.conn_handle, desc.conn_itvl, desc.conn_latency, desc.supervision_timeout, event->conn_update.status == 0 ? 0 : 1);
+            }
             break;
+        }
 
         case BLE_GAP_EVENT_MTU: {
             if (event->mtu.channel_id == BLE_L2CAP_CID_ATT) {

From 7a9aa49595e1c523a5765397db135ff8f00515b1 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Tue, 24 Nov 2020 23:23:51 +1100
Subject: [PATCH 0440/3533] docs/library/ubluetooth.rst: Add
 _IRQ_CONNECTION_UDPATE docs.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 docs/library/ubluetooth.rst | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docs/library/ubluetooth.rst b/docs/library/ubluetooth.rst
index 35ac13ad56fa9..73547c356aa25 100644
--- a/docs/library/ubluetooth.rst
+++ b/docs/library/ubluetooth.rst
@@ -199,6 +199,9 @@ Event Handling
                 # A previous l2cap_send that returned False has now completed and the channel is ready to send again.
                 # If status is non-zero, then the transmit buffer overflowed and the application should re-send the data.
                 conn_handle, cid, status = data
+            elif event == _IRQ_CONNECTION_UPDATE:
+                # The remote device has updated connection parameters.
+                conn_handle, conn_interval, conn_latency, supervision_timeout, status = data
 
 The event codes are::
 
@@ -229,6 +232,7 @@ The event codes are::
     _IRQ_L2CAP_DISCONNECT = const(24)
     _IRQ_L2CAP_RECV = const(25)
     _IRQ_L2CAP_SEND_READY = const(26)
+    _IRQ_CONNECTION_UPDATE = const(27)
 
 In order to save space in the firmware, these constants are not included on the
 :mod:`ubluetooth` module. Add the ones that you need from the list above to your

From 1697ff335db523ff0809051d42871beb9c86012d Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Thu, 27 Aug 2020 09:13:25 +1000
Subject: [PATCH 0441/3533] extmod/modbluetooth: Allow setting char/desc
 enc/auth options.

This widens the characteristic/descriptor flags to 16-bit, to allow setting
encryption/authentication requirements.

Sets the required flags for NimBLE and btstack implementations.

The BLE.FLAG_* constants will eventually be deprecated in favour of copy
and paste Python constants (like the IRQs).

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 examples/bluetooth/ble_simple_peripheral.py |  9 ++++-
 examples/bluetooth/ble_temperature.py       |  6 ++-
 examples/bluetooth/ble_uart_peripheral.py   |  7 +++-
 extmod/btstack/modbluetooth_btstack.c       | 36 +++++++++++++----
 extmod/modbluetooth.c                       |  8 ++--
 extmod/modbluetooth.h                       | 44 ++++++++++++++++++---
 extmod/nimble/modbluetooth_nimble.c         |  6 ++-
 7 files changed, 93 insertions(+), 23 deletions(-)

diff --git a/examples/bluetooth/ble_simple_peripheral.py b/examples/bluetooth/ble_simple_peripheral.py
index d2b134e7149e9..0ebe431764c93 100644
--- a/examples/bluetooth/ble_simple_peripheral.py
+++ b/examples/bluetooth/ble_simple_peripheral.py
@@ -12,14 +12,19 @@
 _IRQ_CENTRAL_DISCONNECT = const(2)
 _IRQ_GATTS_WRITE = const(3)
 
+_FLAG_READ = const(0x0002)
+_FLAG_WRITE_NO_RESPONSE = const(0x0004)
+_FLAG_WRITE = const(0x0008)
+_FLAG_NOTIFY = const(0x0010)
+
 _UART_UUID = bluetooth.UUID("6E400001-B5A3-F393-E0A9-E50E24DCCA9E")
 _UART_TX = (
     bluetooth.UUID("6E400003-B5A3-F393-E0A9-E50E24DCCA9E"),
-    bluetooth.FLAG_READ | bluetooth.FLAG_NOTIFY,
+    _FLAG_READ | _FLAG_NOTIFY,
 )
 _UART_RX = (
     bluetooth.UUID("6E400002-B5A3-F393-E0A9-E50E24DCCA9E"),
-    bluetooth.FLAG_WRITE | bluetooth.FLAG_WRITE_NO_RESPONSE,
+    _FLAG_WRITE | _FLAG_WRITE_NO_RESPONSE,
 )
 _UART_SERVICE = (
     _UART_UUID,
diff --git a/examples/bluetooth/ble_temperature.py b/examples/bluetooth/ble_temperature.py
index d375a62ffb8ac..e6378ebee7964 100644
--- a/examples/bluetooth/ble_temperature.py
+++ b/examples/bluetooth/ble_temperature.py
@@ -15,12 +15,16 @@
 _IRQ_CENTRAL_DISCONNECT = const(2)
 _IRQ_GATTS_INDICATE_DONE = const(20)
 
+_FLAG_READ = const(0x0002)
+_FLAG_NOTIFY = const(0x0010)
+_FLAG_INDICATE = const(0x0020)
+
 # org.bluetooth.service.environmental_sensing
 _ENV_SENSE_UUID = bluetooth.UUID(0x181A)
 # org.bluetooth.characteristic.temperature
 _TEMP_CHAR = (
     bluetooth.UUID(0x2A6E),
-    bluetooth.FLAG_READ | bluetooth.FLAG_NOTIFY | bluetooth.FLAG_INDICATE,
+    _FLAG_READ | _FLAG_NOTIFY | _FLAG_INDICATE,
 )
 _ENV_SENSE_SERVICE = (
     _ENV_SENSE_UUID,
diff --git a/examples/bluetooth/ble_uart_peripheral.py b/examples/bluetooth/ble_uart_peripheral.py
index 6d167a871a75e..b4e352be9f6dd 100644
--- a/examples/bluetooth/ble_uart_peripheral.py
+++ b/examples/bluetooth/ble_uart_peripheral.py
@@ -9,14 +9,17 @@
 _IRQ_CENTRAL_DISCONNECT = const(2)
 _IRQ_GATTS_WRITE = const(3)
 
+_FLAG_WRITE = const(0x0008)
+_FLAG_NOTIFY = const(0x0010)
+
 _UART_UUID = bluetooth.UUID("6E400001-B5A3-F393-E0A9-E50E24DCCA9E")
 _UART_TX = (
     bluetooth.UUID("6E400003-B5A3-F393-E0A9-E50E24DCCA9E"),
-    bluetooth.FLAG_NOTIFY,
+    _FLAG_NOTIFY,
 )
 _UART_RX = (
     bluetooth.UUID("6E400002-B5A3-F393-E0A9-E50E24DCCA9E"),
-    bluetooth.FLAG_WRITE,
+    _FLAG_WRITE,
 )
 _UART_SERVICE = (
     _UART_UUID,
diff --git a/extmod/btstack/modbluetooth_btstack.c b/extmod/btstack/modbluetooth_btstack.c
index 9faae26e46929..da9a6f732bf4c 100644
--- a/extmod/btstack/modbluetooth_btstack.c
+++ b/extmod/btstack/modbluetooth_btstack.c
@@ -893,7 +893,30 @@ STATIC inline uint16_t get_uuid16(const mp_obj_bluetooth_uuid_t *uuid) {
     return (uuid->data[1] << 8) | uuid->data[0];
 }
 
-int mp_bluetooth_gatts_register_service(mp_obj_bluetooth_uuid_t *service_uuid, mp_obj_bluetooth_uuid_t **characteristic_uuids, uint8_t *characteristic_flags, mp_obj_bluetooth_uuid_t **descriptor_uuids, uint8_t *descriptor_flags, uint8_t *num_descriptors, uint16_t *handles, size_t num_characteristics) {
+// Map MP_BLUETOOTH_CHARACTERISTIC_FLAG_ values to btstack read/write permission values.
+STATIC void get_characteristic_permissions(uint16_t flags, uint16_t *read_permission, uint16_t *write_permission) {
+    if (flags & MP_BLUETOOTH_CHARACTERISTIC_FLAG_READ_ENCRYPTED) {
+        *read_permission = ATT_SECURITY_ENCRYPTED;
+    } else if (flags & MP_BLUETOOTH_CHARACTERISTIC_FLAG_READ_AUTHENTICATED) {
+        *read_permission = ATT_SECURITY_AUTHENTICATED;
+    } else if (flags & MP_BLUETOOTH_CHARACTERISTIC_FLAG_READ_AUTHORIZED) {
+        *read_permission = ATT_SECURITY_AUTHORIZED;
+    } else {
+        *read_permission = ATT_SECURITY_NONE;
+    }
+
+    if (flags & MP_BLUETOOTH_CHARACTERISTIC_FLAG_WRITE_ENCRYPTED) {
+        *write_permission = ATT_SECURITY_ENCRYPTED;
+    } else if (flags & MP_BLUETOOTH_CHARACTERISTIC_FLAG_WRITE_AUTHENTICATED) {
+        *write_permission = ATT_SECURITY_AUTHENTICATED;
+    } else if (flags & MP_BLUETOOTH_CHARACTERISTIC_FLAG_WRITE_AUTHORIZED) {
+        *write_permission = ATT_SECURITY_AUTHORIZED;
+    } else {
+        *write_permission = ATT_SECURITY_NONE;
+    }
+}
+
+int mp_bluetooth_gatts_register_service(mp_obj_bluetooth_uuid_t *service_uuid, mp_obj_bluetooth_uuid_t **characteristic_uuids, uint16_t *characteristic_flags, mp_obj_bluetooth_uuid_t **descriptor_uuids, uint16_t *descriptor_flags, uint8_t *num_descriptors, uint16_t *handles, size_t num_characteristics) {
     DEBUG_printf("mp_bluetooth_gatts_register_service\n");
     // Note: btstack expects BE UUIDs (which it immediately convertes to LE).
     // So we have to convert all our modbluetooth LE UUIDs to BE just for the att_db_util_add_* methods (using get_uuid16 above, and reverse_128 from btstackutil.h).
@@ -916,9 +939,9 @@ int mp_bluetooth_gatts_register_service(mp_obj_bluetooth_uuid_t *service_uuid, m
     static uint8_t cccb_buf[2] = {0};
 
     for (size_t i = 0; i < num_characteristics; ++i) {
-        uint16_t props = characteristic_flags[i] | ATT_PROPERTY_DYNAMIC;
-        uint16_t read_permission = ATT_SECURITY_NONE;
-        uint16_t write_permission = ATT_SECURITY_NONE;
+        uint16_t props = (characteristic_flags[i] & 0x7f) | ATT_PROPERTY_DYNAMIC;
+        uint16_t read_permission, write_permission;
+        get_characteristic_permissions(characteristic_flags[i], &read_permission, &write_permission);
         if (characteristic_uuids[i]->type == MP_BLUETOOTH_UUID_TYPE_16) {
             handles[handle_index] = att_db_util_add_characteristic_uuid16(get_uuid16(characteristic_uuids[i]), props, read_permission, write_permission, NULL, 0);
         } else if (characteristic_uuids[i]->type == MP_BLUETOOTH_UUID_TYPE_128) {
@@ -942,9 +965,8 @@ int mp_bluetooth_gatts_register_service(mp_obj_bluetooth_uuid_t *service_uuid, m
         ++handle_index;
 
         for (size_t j = 0; j < num_descriptors[i]; ++j) {
-            props = descriptor_flags[descriptor_index] | ATT_PROPERTY_DYNAMIC;
-            read_permission = ATT_SECURITY_NONE;
-            write_permission = ATT_SECURITY_NONE;
+            props = (descriptor_flags[descriptor_index] & 0x7f) | ATT_PROPERTY_DYNAMIC;
+            get_characteristic_permissions(descriptor_flags[descriptor_index], &read_permission, &write_permission);
 
             if (descriptor_uuids[descriptor_index]->type == MP_BLUETOOTH_UUID_TYPE_16) {
                 handles[handle_index] = att_db_util_add_descriptor_uuid16(get_uuid16(descriptor_uuids[descriptor_index]), props, read_permission, write_permission, NULL, 0);
diff --git a/extmod/modbluetooth.c b/extmod/modbluetooth.c
index dc1084acc13dc..1e67c8ce32749 100644
--- a/extmod/modbluetooth.c
+++ b/extmod/modbluetooth.c
@@ -461,11 +461,11 @@ STATIC int bluetooth_gatts_register_service(mp_obj_t uuid_in, mp_obj_t character
 
     // Lists of characteristic uuids and flags.
     mp_obj_bluetooth_uuid_t **characteristic_uuids = m_new(mp_obj_bluetooth_uuid_t *, len);
-    uint8_t *characteristic_flags = m_new(uint8_t, len);
+    uint16_t *characteristic_flags = m_new(uint16_t, len);
 
     // Flattened list of descriptor uuids and flags. Grows (realloc) as more descriptors are encountered.
     mp_obj_bluetooth_uuid_t **descriptor_uuids = NULL;
-    uint8_t *descriptor_flags = NULL;
+    uint16_t *descriptor_flags = NULL;
     // How many descriptors in the flattened list per characteristic.
     uint8_t *num_descriptors = m_new(uint8_t, len);
 
@@ -506,7 +506,7 @@ STATIC int bluetooth_gatts_register_service(mp_obj_t uuid_in, mp_obj_t character
 
             // Grow the flattened uuids and flags arrays with this many more descriptors.
             descriptor_uuids = m_renew(mp_obj_bluetooth_uuid_t *, descriptor_uuids, descriptor_index, descriptor_index + num_descriptors[characteristic_index]);
-            descriptor_flags = m_renew(uint8_t, descriptor_flags, descriptor_index, descriptor_index + num_descriptors[characteristic_index]);
+            descriptor_flags = m_renew(uint16_t, descriptor_flags, descriptor_index, descriptor_index + num_descriptors[characteristic_index]);
 
             // Also grow the handles array.
             *handles = m_renew(uint16_t, *handles, *num_handles, *num_handles + num_descriptors[characteristic_index]);
@@ -894,6 +894,8 @@ STATIC const mp_rom_map_elem_t mp_module_bluetooth_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_ubluetooth) },
     { MP_ROM_QSTR(MP_QSTR_BLE), MP_ROM_PTR(&mp_type_bluetooth_ble) },
     { MP_ROM_QSTR(MP_QSTR_UUID), MP_ROM_PTR(&mp_type_bluetooth_uuid) },
+
+    // TODO: Deprecate these flags (recommend copying the constants from modbluetooth.h instead).
     { MP_ROM_QSTR(MP_QSTR_FLAG_READ), MP_ROM_INT(MP_BLUETOOTH_CHARACTERISTIC_FLAG_READ) },
     { MP_ROM_QSTR(MP_QSTR_FLAG_WRITE), MP_ROM_INT(MP_BLUETOOTH_CHARACTERISTIC_FLAG_WRITE) },
     { MP_ROM_QSTR(MP_QSTR_FLAG_NOTIFY), MP_ROM_INT(MP_BLUETOOTH_CHARACTERISTIC_FLAG_NOTIFY) },
diff --git a/extmod/modbluetooth.h b/extmod/modbluetooth.h
index 2619e71894d7c..0d4296626b589 100644
--- a/extmod/modbluetooth.h
+++ b/extmod/modbluetooth.h
@@ -71,12 +71,28 @@
 // Advertisement packet lengths
 #define MP_BLUETOOTH_GAP_ADV_MAX_LEN (32)
 
+// Basic characteristic/descriptor flags.
 // These match the spec values for these flags so can be passed directly to the stack.
-#define MP_BLUETOOTH_CHARACTERISTIC_FLAG_READ     (1 << 1)
-#define MP_BLUETOOTH_CHARACTERISTIC_FLAG_WRITE_NO_RESPONSE (1 << 2)
-#define MP_BLUETOOTH_CHARACTERISTIC_FLAG_WRITE    (1 << 3)
-#define MP_BLUETOOTH_CHARACTERISTIC_FLAG_NOTIFY   (1 << 4)
-#define MP_BLUETOOTH_CHARACTERISTIC_FLAG_INDICATE (1 << 5)
+#define MP_BLUETOOTH_CHARACTERISTIC_FLAG_BROADCAST                  (0x0001)
+#define MP_BLUETOOTH_CHARACTERISTIC_FLAG_READ                       (0x0002)
+#define MP_BLUETOOTH_CHARACTERISTIC_FLAG_WRITE_NO_RESPONSE          (0x0004)
+#define MP_BLUETOOTH_CHARACTERISTIC_FLAG_WRITE                      (0x0008)
+#define MP_BLUETOOTH_CHARACTERISTIC_FLAG_NOTIFY                     (0x0010)
+#define MP_BLUETOOTH_CHARACTERISTIC_FLAG_INDICATE                   (0x0020)
+#define MP_BLUETOOTH_CHARACTERISTIC_FLAG_AUTHENTICATED_SIGNED_WRITE (0x0040)
+
+// TODO: NimBLE and BlueKitchen disagree on this one.
+// #define MP_BLUETOOTH_CHARACTERISTIC_FLAG_RELIABLE_WRITE             (0x0080)
+
+// Extended flags for security and privacy.
+// These match NimBLE but might require mapping in the bindings for other stacks.
+#define MP_BLUETOOTH_CHARACTERISTIC_FLAG_AUX_WRITE                  (0x0100)
+#define MP_BLUETOOTH_CHARACTERISTIC_FLAG_READ_ENCRYPTED             (0x0200)
+#define MP_BLUETOOTH_CHARACTERISTIC_FLAG_READ_AUTHENTICATED         (0x0400)
+#define MP_BLUETOOTH_CHARACTERISTIC_FLAG_READ_AUTHORIZED            (0x0800)
+#define MP_BLUETOOTH_CHARACTERISTIC_FLAG_WRITE_ENCRYPTED            (0x1000)
+#define MP_BLUETOOTH_CHARACTERISTIC_FLAG_WRITE_AUTHENTICATED        (0x2000)
+#define MP_BLUETOOTH_CHARACTERISTIC_FLAG_WRITE_AUTHORIZED           (0x4000)
 
 // For mp_bluetooth_gattc_write, the mode parameter
 #define MP_BLUETOOTH_WRITE_MODE_NO_RESPONSE     (0)
@@ -153,6 +169,22 @@ _IRQ_L2CAP_DISCONNECT = const(24)
 _IRQ_L2CAP_RECV = const(25)
 _IRQ_L2CAP_SEND_READY = const(26)
 _IRQ_GATTS_CONN_UPDATE = const(27)
+
+_FLAG_BROADCAST = const(0x0001)
+_FLAG_READ = const(0x0002)
+_FLAG_WRITE_NO_RESPONSE = const(0x0004)
+_FLAG_WRITE = const(0x0008)
+_FLAG_NOTIFY = const(0x0010)
+_FLAG_INDICATE = const(0x0020)
+_FLAG_AUTHENTICATED_SIGNED_WRITE = const(0x0040)
+
+_FLAG_AUX_WRITE = const(0x0100)
+_FLAG_READ_ENCRYPTED = const(0x0200)
+_FLAG_READ_AUTHENTICATED = const(0x0400)
+_FLAG_READ_AUTHORIZED = const(0x0800)
+_FLAG_WRITE_ENCRYPTED = const(0x1000)
+_FLAG_WRITE_AUTHENTICATED = const(0x2000)
+_FLAG_WRITE_AUTHORIZED = const(0x4000)
 */
 
 // bluetooth.UUID type.
@@ -214,7 +246,7 @@ void mp_bluetooth_gap_advertise_stop(void);
 int mp_bluetooth_gatts_register_service_begin(bool append);
 // Add a service with the given list of characteristics to the queue to be registered.
 // The value_handles won't be valid until after mp_bluetooth_register_service_end is called.
-int mp_bluetooth_gatts_register_service(mp_obj_bluetooth_uuid_t *service_uuid, mp_obj_bluetooth_uuid_t **characteristic_uuids, uint8_t *characteristic_flags, mp_obj_bluetooth_uuid_t **descriptor_uuids, uint8_t *descriptor_flags, uint8_t *num_descriptors, uint16_t *handles, size_t num_characteristics);
+int mp_bluetooth_gatts_register_service(mp_obj_bluetooth_uuid_t *service_uuid, mp_obj_bluetooth_uuid_t **characteristic_uuids, uint16_t *characteristic_flags, mp_obj_bluetooth_uuid_t **descriptor_uuids, uint16_t *descriptor_flags, uint8_t *num_descriptors, uint16_t *handles, size_t num_characteristics);
 // Register any queued services.
 int mp_bluetooth_gatts_register_service_end(void);
 
diff --git a/extmod/nimble/modbluetooth_nimble.c b/extmod/nimble/modbluetooth_nimble.c
index 3983d1869082b..4484df937fc9e 100644
--- a/extmod/nimble/modbluetooth_nimble.c
+++ b/extmod/nimble/modbluetooth_nimble.c
@@ -685,7 +685,7 @@ int mp_bluetooth_gatts_register_service_end(void) {
     return 0;
 }
 
-int mp_bluetooth_gatts_register_service(mp_obj_bluetooth_uuid_t *service_uuid, mp_obj_bluetooth_uuid_t **characteristic_uuids, uint8_t *characteristic_flags, mp_obj_bluetooth_uuid_t **descriptor_uuids, uint8_t *descriptor_flags, uint8_t *num_descriptors, uint16_t *handles, size_t num_characteristics) {
+int mp_bluetooth_gatts_register_service(mp_obj_bluetooth_uuid_t *service_uuid, mp_obj_bluetooth_uuid_t **characteristic_uuids, uint16_t *characteristic_flags, mp_obj_bluetooth_uuid_t **descriptor_uuids, uint16_t *descriptor_flags, uint8_t *num_descriptors, uint16_t *handles, size_t num_characteristics) {
     if (MP_STATE_PORT(bluetooth_nimble_root_pointers)->n_services == MP_BLUETOOTH_NIMBLE_MAX_SERVICES) {
         return MP_E2BIG;
     }
@@ -697,6 +697,7 @@ int mp_bluetooth_gatts_register_service(mp_obj_bluetooth_uuid_t *service_uuid, m
         characteristics[i].uuid = create_nimble_uuid(characteristic_uuids[i], NULL);
         characteristics[i].access_cb = characteristic_access_cb;
         characteristics[i].arg = NULL;
+        // NimBLE flags match the MP_BLUETOOTH_CHARACTERISTIC_FLAG_ ones exactly (including the security/privacy options).
         characteristics[i].flags = characteristic_flags[i];
         characteristics[i].min_key_size = 0;
         characteristics[i].val_handle = &handles[handle_index];
@@ -710,7 +711,8 @@ int mp_bluetooth_gatts_register_service(mp_obj_bluetooth_uuid_t *service_uuid, m
             for (size_t j = 0; j < num_descriptors[i]; ++j) {
                 descriptors[j].uuid = create_nimble_uuid(descriptor_uuids[descriptor_index], NULL);
                 descriptors[j].access_cb = characteristic_access_cb;
-                descriptors[j].att_flags = descriptor_flags[descriptor_index];
+                // NimBLE doesn't support security/privacy options on descriptors.
+                descriptors[j].att_flags = (uint8_t)descriptor_flags[descriptor_index];
                 descriptors[j].min_key_size = 0;
                 // Unlike characteristic, Nimble doesn't provide an automatic way to remember the handle, so use the arg.
                 descriptors[j].arg = &handles[handle_index];

From 89553997b8496aca96b46274c81fa6413d58f6bd Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Tue, 24 Nov 2020 22:40:14 +1100
Subject: [PATCH 0442/3533] docs/library/ubluetooth.rst: Update char/desc
 flags.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 docs/library/ubluetooth.rst | 33 ++++++++++++++++++++++-----------
 1 file changed, 22 insertions(+), 11 deletions(-)

diff --git a/docs/library/ubluetooth.rst b/docs/library/ubluetooth.rst
index 73547c356aa25..434759b43250a 100644
--- a/docs/library/ubluetooth.rst
+++ b/docs/library/ubluetooth.rst
@@ -375,9 +375,9 @@ writes from a client to a given characteristic, use
     Each **descriptor** is a two-element tuple containing a UUID and a **flags**
     value.
 
-    The **flags** are a bitwise-OR combination of the
-    :data:`ubluetooth.FLAG_READ`, :data:`ubluetooth.FLAG_WRITE` and
-    :data:`ubluetooth.FLAG_NOTIFY` values defined below.
+    The **flags** are a bitwise-OR combination of the flags defined below. These
+    set both the behaviour of the characteristic (or descriptor) as well as the
+    security and privacy requirements.
 
     The return value is a list (one element per service) of tuples (each element
     is a value handle). Characteristics and descriptor handles are flattened
@@ -401,6 +401,25 @@ writes from a client to a given characteristic, use
 
     **Note:** Advertising must be stopped before registering services.
 
+    Available flags for characteristics and descriptors are::
+
+        from micropython import const
+        _FLAG_BROADCAST = const(0x0001)
+        _FLAG_READ = const(0x0002)
+        _FLAG_WRITE_NO_RESPONSE = const(0x0004)
+        _FLAG_WRITE = const(0x0008)
+        _FLAG_NOTIFY = const(0x0010)
+        _FLAG_INDICATE = const(0x0020)
+        _FLAG_AUTHENTICATED_SIGNED_WRITE = const(0x0040)
+
+        _FLAG_AUX_WRITE = const(0x0100)
+        _FLAG_READ_ENCRYPTED = const(0x0200)
+        _FLAG_READ_AUTHENTICATED = const(0x0400)
+        _FLAG_READ_AUTHORIZED = const(0x0800)
+        _FLAG_WRITE_ENCRYPTED = const(0x1000)
+        _FLAG_WRITE_AUTHENTICATED = const(0x2000)
+        _FLAG_WRITE_AUTHORIZED = const(0x4000)
+
 .. method:: BLE.gatts_read(value_handle, /)
 
     Reads the local value for this handle (which has either been written by
@@ -618,11 +637,3 @@ Constructor
 
     - A 16-bit integer. e.g. ``0x2908``.
     - A 128-bit UUID string. e.g. ``'6E400001-B5A3-F393-E0A9-E50E24DCCA9E'``.
-
-
-Constants
----------
-
-.. data:: ubluetooth.FLAG_READ
-          ubluetooth.FLAG_WRITE
-          ubluetooth.FLAG_NOTIFY

From 60830bcba46dd649e396b605708274a2208c398d Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Tue, 24 Nov 2020 23:04:58 +1100
Subject: [PATCH 0443/3533] extmod/modbluetooth: Allow user-specified reason in
 read request IRQ.

Instead of returning None/bool from the IRQ, return None/int (where a zero
value means success).  This mirrors how the L2CAP_ACCEPT return value
works.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 extmod/modbluetooth.c               | 11 +++++++----
 extmod/modbluetooth.h               | 20 ++++++++++++++++++--
 extmod/nimble/modbluetooth_nimble.c |  8 +++++---
 3 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/extmod/modbluetooth.c b/extmod/modbluetooth.c
index 1e67c8ce32749..ed983b7946107 100644
--- a/extmod/modbluetooth.c
+++ b/extmod/modbluetooth.c
@@ -1113,10 +1113,13 @@ void mp_bluetooth_gatts_on_indicate_complete(uint16_t conn_handle, uint16_t valu
     invoke_irq_handler(MP_BLUETOOTH_IRQ_GATTS_INDICATE_DONE, args, 2, &status, 1, NULL_ADDR, NULL_I8, 0, NULL_UUID, NULL_DATA, 0);
 }
 
-bool mp_bluetooth_gatts_on_read_request(uint16_t conn_handle, uint16_t value_handle) {
+mp_int_t mp_bluetooth_gatts_on_read_request(uint16_t conn_handle, uint16_t value_handle) {
     uint16_t args[] = {conn_handle, value_handle};
     mp_obj_t result = invoke_irq_handler(MP_BLUETOOTH_IRQ_GATTS_READ_REQUEST, args, 2, NULL, 0, NULL_ADDR, NULL_I8, 0, NULL_UUID, NULL_DATA, 0);
-    return result == mp_const_none || mp_obj_is_true(result);
+    // Return non-zero from IRQ handler to fail the read.
+    mp_int_t ret = 0;
+    mp_obj_get_int_maybe(result, &ret);
+    return ret;
 }
 
 void mp_bluetooth_gatts_on_mtu_exchanged(uint16_t conn_handle, uint16_t value) {
@@ -1320,11 +1323,11 @@ void mp_bluetooth_gatts_on_indicate_complete(uint16_t conn_handle, uint16_t valu
     schedule_ringbuf(atomic_state);
 }
 
-bool mp_bluetooth_gatts_on_read_request(uint16_t conn_handle, uint16_t value_handle) {
+mp_int_t mp_bluetooth_gatts_on_read_request(uint16_t conn_handle, uint16_t value_handle) {
     (void)conn_handle;
     (void)value_handle;
     // This must be handled synchronously and therefore cannot implemented with the ringbuffer.
-    return true;
+    return MP_BLUETOOTH_GATTS_NO_ERROR;
 }
 
 void mp_bluetooth_gatts_on_mtu_exchanged(uint16_t conn_handle, uint16_t value) {
diff --git a/extmod/modbluetooth.h b/extmod/modbluetooth.h
index 0d4296626b589..9856d4a689407 100644
--- a/extmod/modbluetooth.h
+++ b/extmod/modbluetooth.h
@@ -94,6 +94,14 @@
 #define MP_BLUETOOTH_CHARACTERISTIC_FLAG_WRITE_AUTHENTICATED        (0x2000)
 #define MP_BLUETOOTH_CHARACTERISTIC_FLAG_WRITE_AUTHORIZED           (0x4000)
 
+// Return values from _IRQ_GATTS_READ_REQUEST.
+#define MP_BLUETOOTH_GATTS_NO_ERROR                           (0x00)
+#define MP_BLUETOOTH_GATTS_ERROR_READ_NOT_PERMITTED           (0x02)
+#define MP_BLUETOOTH_GATTS_ERROR_WRITE_NOT_PERMITTED          (0x03)
+#define MP_BLUETOOTH_GATTS_ERROR_INSUFFICIENT_AUTHENTICATION  (0x05)
+#define MP_BLUETOOTH_GATTS_ERROR_INSUFFICIENT_AUTHORIZATION   (0x08)
+#define MP_BLUETOOTH_GATTS_ERROR_INSUFFICIENT_ENCRYPTION      (0x0f)
+
 // For mp_bluetooth_gattc_write, the mode parameter
 #define MP_BLUETOOTH_WRITE_MODE_NO_RESPONSE     (0)
 #define MP_BLUETOOTH_WRITE_MODE_WITH_RESPONSE   (1)
@@ -185,6 +193,13 @@ _FLAG_READ_AUTHORIZED = const(0x0800)
 _FLAG_WRITE_ENCRYPTED = const(0x1000)
 _FLAG_WRITE_AUTHENTICATED = const(0x2000)
 _FLAG_WRITE_AUTHORIZED = const(0x4000)
+
+_GATTS_NO_ERROR = const(0x00)
+_GATTS_ERROR_READ_NOT_PERMITTED = const(0x02)
+_GATTS_ERROR_WRITE_NOT_PERMITTED = const(0x03)
+_GATTS_ERROR_INSUFFICIENT_AUTHENTICATION = const(0x05)
+_GATTS_ERROR_INSUFFICIENT_AUTHORIZATION = const(0x08)
+_GATTS_ERROR_INSUFFICIENT_ENCRYPTION = const(0x0f)
 */
 
 // bluetooth.UUID type.
@@ -324,8 +339,9 @@ void mp_bluetooth_gatts_on_write(uint16_t conn_handle, uint16_t value_handle);
 // Call this when an acknowledgment is received for an indication.
 void mp_bluetooth_gatts_on_indicate_complete(uint16_t conn_handle, uint16_t value_handle, uint8_t status);
 
-// Call this when a characteristic is read from. Return false to deny the read.
-bool mp_bluetooth_gatts_on_read_request(uint16_t conn_handle, uint16_t value_handle);
+// Call this when a characteristic is read from (giving the handler a chance to update the stored value).
+// Return 0 to allow the read, otherwise a non-zero rejection reason (see MP_BLUETOOTH_GATTS_ERROR_*).
+mp_int_t mp_bluetooth_gatts_on_read_request(uint16_t conn_handle, uint16_t value_handle);
 
 // Call this when an MTU exchange completes.
 void mp_bluetooth_gatts_on_mtu_exchanged(uint16_t conn_handle, uint16_t value);
diff --git a/extmod/nimble/modbluetooth_nimble.c b/extmod/nimble/modbluetooth_nimble.c
index 4484df937fc9e..e79dc2d4cb09c 100644
--- a/extmod/nimble/modbluetooth_nimble.c
+++ b/extmod/nimble/modbluetooth_nimble.c
@@ -608,12 +608,13 @@ static int characteristic_access_cb(uint16_t conn_handle, uint16_t value_handle,
     mp_bluetooth_gatts_db_entry_t *entry;
     switch (ctxt->op) {
         case BLE_GATT_ACCESS_OP_READ_CHR:
-        case BLE_GATT_ACCESS_OP_READ_DSC:
+        case BLE_GATT_ACCESS_OP_READ_DSC: {
             // Allow Python code to override (by using gatts_write), or deny (by returning false) the read.
             // Note this will be a no-op if the ringbuffer implementation is being used (i.e. the stack isn't
             // run in the scheduler). The ringbuffer is not used on STM32 and Unix-H4 only.
-            if (!mp_bluetooth_gatts_on_read_request(conn_handle, value_handle)) {
-                return BLE_ATT_ERR_READ_NOT_PERMITTED;
+            int req = mp_bluetooth_gatts_on_read_request(conn_handle, value_handle);
+            if (req) {
+                return req;
             }
 
             entry = mp_bluetooth_gatts_db_lookup(MP_STATE_PORT(bluetooth_nimble_root_pointers)->gatts_db, value_handle);
@@ -626,6 +627,7 @@ static int characteristic_access_cb(uint16_t conn_handle, uint16_t value_handle,
             }
 
             return 0;
+        }
         case BLE_GATT_ACCESS_OP_WRITE_CHR:
         case BLE_GATT_ACCESS_OP_WRITE_DSC:
             entry = mp_bluetooth_gatts_db_lookup(MP_STATE_PORT(bluetooth_nimble_root_pointers)->gatts_db, value_handle);

From 5e20f689ada17dcd750d516c957115fbb36c9435 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Tue, 24 Nov 2020 23:09:10 +1100
Subject: [PATCH 0444/3533] docs/library/ubluetooth.rst: Update read request
 IRQ docs.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 docs/library/ubluetooth.rst | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/docs/library/ubluetooth.rst b/docs/library/ubluetooth.rst
index 434759b43250a..f65020d2aed6a 100644
--- a/docs/library/ubluetooth.rst
+++ b/docs/library/ubluetooth.rst
@@ -119,9 +119,9 @@ Event Handling
                 # A client has written to this characteristic or descriptor.
                 conn_handle, attr_handle = data
             elif event == _IRQ_GATTS_READ_REQUEST:
-                # A client has issued a read. Note: this is a hard IRQ.
-                # Return None to deny the read.
-                # Note: This event is not supported on ESP32.
+                # A client has issued a read. Note: this is only supported on STM32.
+                # Return a non-zero integer to deny the read (see below), or zero (or None)
+                # to accept the read.
                 conn_handle, attr_handle = data
             elif event == _IRQ_SCAN_RESULT:
                 # A single scan result.
@@ -234,6 +234,15 @@ The event codes are::
     _IRQ_L2CAP_SEND_READY = const(26)
     _IRQ_CONNECTION_UPDATE = const(27)
 
+For the ``_IRQ_GATTS_READ_REQUEST`` event, the available return codes are::
+
+    _GATTS_NO_ERROR = const(0x00)
+    _GATTS_ERROR_READ_NOT_PERMITTED = const(0x02)
+    _GATTS_ERROR_WRITE_NOT_PERMITTED = const(0x03)
+    _GATTS_ERROR_INSUFFICIENT_AUTHENTICATION = const(0x05)
+    _GATTS_ERROR_INSUFFICIENT_AUTHORIZATION = const(0x08)
+    _GATTS_ERROR_INSUFFICIENT_ENCRYPTION = const(0x0f)
+
 In order to save space in the firmware, these constants are not included on the
 :mod:`ubluetooth` module. Add the ones that you need from the list above to your
 program.
@@ -420,6 +429,8 @@ writes from a client to a given characteristic, use
         _FLAG_WRITE_AUTHENTICATED = const(0x2000)
         _FLAG_WRITE_AUTHORIZED = const(0x4000)
 
+    As for the IRQs above, any required constants should be added to your Python code.
+
 .. method:: BLE.gatts_read(value_handle, /)
 
     Reads the local value for this handle (which has either been written by

From ac89267fef8b2396cf46c6ba19ccbe3d10acff9a Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Wed, 25 Nov 2020 19:26:56 +1100
Subject: [PATCH 0445/3533] extmod/modbluetooth: Add compile-config flag to
 enable pairing/bonding.

Enable it on STM32/Unix NimBLE only (pairing/bonding requires synchronous
events and full bindings).

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 extmod/modbluetooth.c   | 4 ++++
 extmod/modbluetooth.h   | 6 ++++++
 extmod/nimble/nimble.mk | 5 +++++
 3 files changed, 15 insertions(+)

diff --git a/extmod/modbluetooth.c b/extmod/modbluetooth.c
index ed983b7946107..b9b7c712481f8 100644
--- a/extmod/modbluetooth.c
+++ b/extmod/modbluetooth.c
@@ -47,6 +47,10 @@
 #error l2cap channels require synchronous modbluetooth events
 #endif
 
+#if MICROPY_PY_BLUETOOTH_ENABLE_PAIRING_BONDING && !MICROPY_PY_BLUETOOTH_USE_SYNC_EVENTS
+#error pairing and bonding require synchronous modbluetooth events
+#endif
+
 #define MP_BLUETOOTH_CONNECT_DEFAULT_SCAN_DURATION_MS 2000
 
 #define MICROPY_PY_BLUETOOTH_MAX_EVENT_DATA_TUPLE_LEN 5
diff --git a/extmod/modbluetooth.h b/extmod/modbluetooth.h
index 9856d4a689407..2cb2c709c5345 100644
--- a/extmod/modbluetooth.h
+++ b/extmod/modbluetooth.h
@@ -54,6 +54,12 @@
 #define MICROPY_PY_BLUETOOTH_ENABLE_L2CAP_CHANNELS (0)
 #endif
 
+// A port can optionally enable support for pairing and bonding.
+// Requires MICROPY_PY_BLUETOOTH_USE_SYNC_EVENTS.
+#ifndef MICROPY_PY_BLUETOOTH_ENABLE_PAIRING_BONDING
+#define MICROPY_PY_BLUETOOTH_ENABLE_PAIRING_BONDING (0)
+#endif
+
 // This is used to protect the ringbuffer.
 // A port may no-op this if MICROPY_PY_BLUETOOTH_USE_SYNC_EVENTS is enabled.
 #ifndef MICROPY_PY_BLUETOOTH_ENTER
diff --git a/extmod/nimble/nimble.mk b/extmod/nimble/nimble.mk
index 00a244d6eac77..ba094f16f871a 100644
--- a/extmod/nimble/nimble.mk
+++ b/extmod/nimble/nimble.mk
@@ -24,6 +24,11 @@ ifeq ($(MICROPY_BLUETOOTH_NIMBLE_BINDINGS_ONLY),0)
 # UART is also polled by the RX IRQ.
 CFLAGS_MOD += -DMICROPY_PY_BLUETOOTH_USE_SYNC_EVENTS=1
 
+# Without the ringbuffer, and with the full implementation, we can also
+# enable pairing and bonding. This requires both synchronous events and
+# some customisation of the key store.
+CFLAGS_MOD += -DMICROPY_PY_BLUETOOTH_ENABLE_PAIRING_BONDING=1
+
 NIMBLE_LIB_DIR = lib/mynewt-nimble
 
 LIB_SRC_C += $(addprefix $(NIMBLE_LIB_DIR)/, \

From 05fef8c6a4113bc05dd09ddd8d0bf7d136d59f39 Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Wed, 4 Nov 2020 18:21:59 +1100
Subject: [PATCH 0446/3533] extmod/modbluetooth: Add _IRQ_ENCRYPTION_UPDATE
 event.

This allows the application to be notified if any of encrypted,
authenticated and bonded state change, as well as the encryption key size.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 docs/library/ubluetooth.rst           |  4 ++++
 extmod/btstack/modbluetooth_btstack.c | 29 +++++++++++++++++++++++++++
 extmod/modbluetooth.c                 |  7 +++++++
 extmod/modbluetooth.h                 |  9 ++++++++-
 extmod/nimble/modbluetooth_nimble.c   | 24 ++++++++++++++++++++++
 5 files changed, 72 insertions(+), 1 deletion(-)

diff --git a/docs/library/ubluetooth.rst b/docs/library/ubluetooth.rst
index f65020d2aed6a..d402c6a9ebb25 100644
--- a/docs/library/ubluetooth.rst
+++ b/docs/library/ubluetooth.rst
@@ -202,6 +202,9 @@ Event Handling
             elif event == _IRQ_CONNECTION_UPDATE:
                 # The remote device has updated connection parameters.
                 conn_handle, conn_interval, conn_latency, supervision_timeout, status = data
+            elif event == _IRQ_ENCRYPTION_UPDATE:
+                # The encryption state has changed (likely as a result of pairing or bonding).
+                conn_handle, encrypted, authenticated, bonded, key_size = data
 
 The event codes are::
 
@@ -233,6 +236,7 @@ The event codes are::
     _IRQ_L2CAP_RECV = const(25)
     _IRQ_L2CAP_SEND_READY = const(26)
     _IRQ_CONNECTION_UPDATE = const(27)
+    _IRQ_ENCRYPTION_UPDATE = const(28)
 
 For the ``_IRQ_GATTS_READ_REQUEST`` event, the available return codes are::
 
diff --git a/extmod/btstack/modbluetooth_btstack.c b/extmod/btstack/modbluetooth_btstack.c
index da9a6f732bf4c..825a9ab7b178e 100644
--- a/extmod/btstack/modbluetooth_btstack.c
+++ b/extmod/btstack/modbluetooth_btstack.c
@@ -359,6 +359,35 @@ STATIC void btstack_packet_handler(uint8_t packet_type, uint8_t *packet, uint8_t
         DEBUG_printf("  --> btstack # conns changed\n");
     } else if (event_type == HCI_EVENT_VENDOR_SPECIFIC) {
         DEBUG_printf("  --> hci vendor specific\n");
+    } else if (event_type == SM_EVENT_AUTHORIZATION_RESULT ||
+               event_type == SM_EVENT_PAIRING_COMPLETE ||
+               // event_type == GAP_EVENT_DEDICATED_BONDING_COMPLETED || // No conn_handle
+               event_type == HCI_EVENT_ENCRYPTION_CHANGE) {
+        DEBUG_printf("  --> enc/auth/pair/bond change\n", );
+        #if MICROPY_PY_BLUETOOTH_ENABLE_PAIRING_BONDING
+        uint16_t conn_handle;
+        switch (event_type) {
+            case SM_EVENT_AUTHORIZATION_RESULT:
+                conn_handle = sm_event_authorization_result_get_handle(packet);
+                break;
+            case SM_EVENT_PAIRING_COMPLETE:
+                conn_handle = sm_event_pairing_complete_get_handle(packet);
+                break;
+            case HCI_EVENT_ENCRYPTION_CHANGE:
+                conn_handle = hci_event_encryption_change_get_connection_handle(packet);
+                break;
+            default:
+                return;
+        }
+
+        hci_connection_t *hci_con = hci_connection_for_handle(conn_handle);
+        sm_connection_t *desc = &hci_con->sm_connection;
+        mp_bluetooth_gatts_on_encryption_update(conn_handle,
+            desc->sm_connection_encrypted,
+            desc->sm_connection_authenticated,
+            desc->sm_le_db_index != -1,
+            desc->sm_actual_encryption_key_size);
+        #endif // MICROPY_PY_BLUETOOTH_ENABLE_PAIRING_BONDING
     } else if (event_type == HCI_EVENT_DISCONNECTION_COMPLETE) {
         DEBUG_printf("  --> hci disconnect complete\n");
         uint16_t conn_handle = hci_event_disconnection_complete_get_connection_handle(packet);
diff --git a/extmod/modbluetooth.c b/extmod/modbluetooth.c
index b9b7c712481f8..5d7de7b97fe06 100644
--- a/extmod/modbluetooth.c
+++ b/extmod/modbluetooth.c
@@ -1107,6 +1107,13 @@ void mp_bluetooth_gap_on_connection_update(uint16_t conn_handle, uint16_t conn_i
     invoke_irq_handler(MP_BLUETOOTH_IRQ_CONNECTION_UPDATE, args, 5, NULL_U8, 0, NULL_ADDR, NULL_I8, 0, NULL_UUID, NULL_DATA, 0);
 }
 
+#if MICROPY_PY_BLUETOOTH_ENABLE_PAIRING_BONDING
+void mp_bluetooth_gatts_on_encryption_update(uint16_t conn_handle, bool encrypted, bool authenticated, bool bonded, uint8_t key_size) {
+    uint8_t args[] = {encrypted, authenticated, bonded, key_size};
+    invoke_irq_handler(MP_BLUETOOTH_IRQ_ENCRYPTION_UPDATE, &conn_handle, 1, args, 4, NULL_ADDR, NULL_I8, 0, NULL_UUID, NULL_DATA, 0);
+}
+#endif // MICROPY_PY_BLUETOOTH_ENABLE_PAIRING_BONDING
+
 void mp_bluetooth_gatts_on_write(uint16_t conn_handle, uint16_t value_handle) {
     uint16_t args[] = {conn_handle, value_handle};
     invoke_irq_handler(MP_BLUETOOTH_IRQ_GATTS_WRITE, args, 2, NULL_U8, 0, NULL_ADDR, NULL_I8, 0, NULL_UUID, NULL_DATA, 0);
diff --git a/extmod/modbluetooth.h b/extmod/modbluetooth.h
index 2cb2c709c5345..62ff6f2f9e325 100644
--- a/extmod/modbluetooth.h
+++ b/extmod/modbluetooth.h
@@ -145,6 +145,7 @@
 #define MP_BLUETOOTH_IRQ_L2CAP_RECV                     (25)
 #define MP_BLUETOOTH_IRQ_L2CAP_SEND_READY               (26)
 #define MP_BLUETOOTH_IRQ_CONNECTION_UPDATE              (27)
+#define MP_BLUETOOTH_IRQ_ENCRYPTION_UPDATE              (28)
 
 #define MP_BLUETOOTH_ADDRESS_MODE_PUBLIC (0)
 #define MP_BLUETOOTH_ADDRESS_MODE_RANDOM (1)
@@ -182,7 +183,8 @@ _IRQ_L2CAP_CONNECT = const(23)
 _IRQ_L2CAP_DISCONNECT = const(24)
 _IRQ_L2CAP_RECV = const(25)
 _IRQ_L2CAP_SEND_READY = const(26)
-_IRQ_GATTS_CONN_UPDATE = const(27)
+_IRQ_CONNECTION_UPDATE = const(27)
+_IRQ_ENCRYPTION_UPDATE = const(28)
 
 _FLAG_BROADCAST = const(0x0001)
 _FLAG_READ = const(0x0002)
@@ -339,6 +341,11 @@ void mp_bluetooth_gap_on_connected_disconnected(uint8_t event, uint16_t conn_han
 // Call this when any connection parameters have been changed.
 void mp_bluetooth_gap_on_connection_update(uint16_t conn_handle, uint16_t conn_interval, uint16_t conn_latency, uint16_t supervision_timeout, uint16_t status);
 
+#if MICROPY_PY_BLUETOOTH_ENABLE_PAIRING_BONDING
+// Call this when any connection encryption has been changed (e.g. during pairing).
+void mp_bluetooth_gatts_on_encryption_update(uint16_t conn_handle, bool encrypted, bool authenticated, bool bonded, uint8_t key_size);
+#endif
+
 // Call this when a characteristic is written to.
 void mp_bluetooth_gatts_on_write(uint16_t conn_handle, uint16_t value_handle);
 
diff --git a/extmod/nimble/modbluetooth_nimble.c b/extmod/nimble/modbluetooth_nimble.c
index e79dc2d4cb09c..312a564263fa2 100644
--- a/extmod/nimble/modbluetooth_nimble.c
+++ b/extmod/nimble/modbluetooth_nimble.c
@@ -316,6 +316,19 @@ STATIC int gap_event_cb(struct ble_gap_event *event, void *arg) {
             }
             break;
         }
+
+        case BLE_GAP_EVENT_ENC_CHANGE: {
+            DEBUG_printf("gap_event_cb: enc change: status=%d\n", event->enc_change.status);
+            #if MICROPY_PY_BLUETOOTH_ENABLE_PAIRING_BONDING
+            struct ble_gap_conn_desc desc;
+            if (ble_gap_conn_find(event->enc_change.conn_handle, &desc) == 0) {
+                mp_bluetooth_gatts_on_encryption_update(event->conn_update.conn_handle,
+                    desc.sec_state.encrypted, desc.sec_state.authenticated,
+                    desc.sec_state.bonded, desc.sec_state.key_size);
+            }
+            #endif
+            break;
+        }
     }
     return 0;
 }
@@ -971,6 +984,17 @@ STATIC int peripheral_gap_event_cb(struct ble_gap_event *event, void *arg) {
             break;
         }
 
+        case BLE_GAP_EVENT_ENC_CHANGE: {
+            DEBUG_printf("peripheral_gap_event_cb: enc change: status=%d\n", event->enc_change.status);
+            #if MICROPY_PY_BLUETOOTH_ENABLE_PAIRING_BONDING
+            if (ble_gap_conn_find(event->enc_change.conn_handle, &desc) == 0) {
+                mp_bluetooth_gatts_on_encryption_update(event->conn_update.conn_handle,
+                    desc.sec_state.encrypted, desc.sec_state.authenticated,
+                    desc.sec_state.bonded, desc.sec_state.key_size);
+            }
+            #endif
+            break;
+        }
         default:
             break;
     }

From a1fcf301217b34ae74fbb937a9488be5bc6e61a5 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Tue, 24 Nov 2020 23:54:46 +1100
Subject: [PATCH 0447/3533] extmod/modbluetooth: Allow configuration of
 pairing/bonding parameters.

This allows setting the security and MITM-protection requirements.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 extmod/btstack/modbluetooth_btstack.c | 38 +++++++++++++++++++++++++++
 extmod/modbluetooth.c                 | 22 ++++++++++++++++
 extmod/modbluetooth.h                 | 24 +++++++++++++++++
 extmod/nimble/modbluetooth_nimble.c   | 18 +++++++++++++
 extmod/nimble/syscfg/syscfg.h         | 13 ++++-----
 5 files changed, 109 insertions(+), 6 deletions(-)

diff --git a/extmod/btstack/modbluetooth_btstack.c b/extmod/btstack/modbluetooth_btstack.c
index 825a9ab7b178e..ae4bac00940fa 100644
--- a/extmod/btstack/modbluetooth_btstack.c
+++ b/extmod/btstack/modbluetooth_btstack.c
@@ -53,6 +53,11 @@ STATIC const uint16_t BTSTACK_GAP_DEVICE_NAME_HANDLE = 3;
 
 volatile int mp_bluetooth_btstack_state = MP_BLUETOOTH_BTSTACK_STATE_OFF;
 
+// sm_set_authentication_requirements is set-only, so cache current value.
+#if MICROPY_PY_BLUETOOTH_ENABLE_PAIRING_BONDING
+STATIC uint8_t mp_bluetooth_btstack_sm_auth_req = 0;
+#endif
+
 #define ERRNO_BLUETOOTH_NOT_ACTIVE MP_ENODEV
 
 STATIC int btstack_error_to_errno(int err) {
@@ -795,6 +800,39 @@ void mp_bluetooth_set_address_mode(uint8_t addr_mode) {
     }
 }
 
+#if MICROPY_PY_BLUETOOTH_ENABLE_PAIRING_BONDING
+void mp_bluetooth_set_bonding(bool enabled) {
+    if (enabled) {
+        mp_bluetooth_btstack_sm_auth_req |= SM_AUTHREQ_BONDING;
+    } else {
+        mp_bluetooth_btstack_sm_auth_req &= ~SM_AUTHREQ_BONDING;
+    }
+    sm_set_authentication_requirements(mp_bluetooth_btstack_sm_auth_req);
+}
+
+void mp_bluetooth_set_mitm_protection(bool enabled) {
+    if (enabled) {
+        mp_bluetooth_btstack_sm_auth_req |= SM_AUTHREQ_MITM_PROTECTION;
+    } else {
+        mp_bluetooth_btstack_sm_auth_req &= ~SM_AUTHREQ_MITM_PROTECTION;
+    }
+    sm_set_authentication_requirements(mp_bluetooth_btstack_sm_auth_req);
+}
+
+void mp_bluetooth_set_le_secure(bool enabled) {
+    if (enabled) {
+        mp_bluetooth_btstack_sm_auth_req |= SM_AUTHREQ_SECURE_CONNECTION;
+    } else {
+        mp_bluetooth_btstack_sm_auth_req &= ~SM_AUTHREQ_SECURE_CONNECTION;
+    }
+    sm_set_authentication_requirements(mp_bluetooth_btstack_sm_auth_req);
+}
+
+void mp_bluetooth_set_io_capability(uint8_t capability) {
+    sm_set_io_capabilities(capability);
+}
+#endif // MICROPY_PY_BLUETOOTH_ENABLE_PAIRING_BONDING
+
 size_t mp_bluetooth_gap_get_device_name(const uint8_t **buf) {
     uint8_t *value = NULL;
     size_t value_len = 0;
diff --git a/extmod/modbluetooth.c b/extmod/modbluetooth.c
index 5d7de7b97fe06..06e340c42d20a 100644
--- a/extmod/modbluetooth.c
+++ b/extmod/modbluetooth.c
@@ -387,6 +387,28 @@ STATIC mp_obj_t bluetooth_ble_config(size_t n_args, const mp_obj_t *args, mp_map
                         mp_bluetooth_set_address_mode(addr_mode);
                         break;
                     }
+                    #if MICROPY_PY_BLUETOOTH_ENABLE_PAIRING_BONDING
+                    case MP_QSTR_bond: {
+                        bool bonding_enabled = mp_obj_is_true(e->value);
+                        mp_bluetooth_set_bonding(bonding_enabled);
+                        break;
+                    }
+                    case MP_QSTR_mitm: {
+                        bool mitm_protection = mp_obj_is_true(e->value);
+                        mp_bluetooth_set_mitm_protection(mitm_protection);
+                        break;
+                    }
+                    case MP_QSTR_io: {
+                        mp_int_t io_capability = mp_obj_get_int(e->value);
+                        mp_bluetooth_set_io_capability(io_capability);
+                        break;
+                    }
+                    case MP_QSTR_le_secure: {
+                        bool le_secure_required = mp_obj_is_true(e->value);
+                        mp_bluetooth_set_le_secure(le_secure_required);
+                        break;
+                    }
+                    #endif // MICROPY_PY_BLUETOOTH_ENABLE_PAIRING_BONDING
                     default:
                         mp_raise_ValueError(MP_ERROR_TEXT("unknown config param"));
                 }
diff --git a/extmod/modbluetooth.h b/extmod/modbluetooth.h
index 62ff6f2f9e325..977453becd486 100644
--- a/extmod/modbluetooth.h
+++ b/extmod/modbluetooth.h
@@ -152,6 +152,13 @@
 #define MP_BLUETOOTH_ADDRESS_MODE_RPA (2)
 #define MP_BLUETOOTH_ADDRESS_MODE_NRPA (3)
 
+// These match the spec values, can be used directly by the stack.
+#define MP_BLUETOOTH_IO_CAPABILITY_DISPLAY_ONLY        (0)
+#define MP_BLUETOOTH_IO_CAPABILITY_DISPLAY_YESNO       (1)
+#define MP_BLUETOOTH_IO_CAPABILITY_KEYBOARD_ONLY       (2)
+#define MP_BLUETOOTH_IO_CAPABILITY_NO_INPUT_OUTPUT     (3)
+#define MP_BLUETOOTH_IO_CAPABILITY_KEYBOARD_DISPLAY    (4)
+
 /*
 These aren't included in the module for space reasons, but can be used
 in your Python code if necessary.
@@ -208,6 +215,12 @@ _GATTS_ERROR_WRITE_NOT_PERMITTED = const(0x03)
 _GATTS_ERROR_INSUFFICIENT_AUTHENTICATION = const(0x05)
 _GATTS_ERROR_INSUFFICIENT_AUTHORIZATION = const(0x08)
 _GATTS_ERROR_INSUFFICIENT_ENCRYPTION = const(0x0f)
+
+_IO_CAPABILITY_DISPLAY_ONLY = const(0)
+_IO_CAPABILITY_DISPLAY_YESNO = const(1)
+_IO_CAPABILITY_KEYBOARD_ONLY = const(2)
+_IO_CAPABILITY_NO_INPUT_OUTPUT = const(3)
+_IO_CAPABILITY_KEYBOARD_DISPLAY = const(4)
 */
 
 // bluetooth.UUID type.
@@ -254,6 +267,17 @@ void mp_bluetooth_get_current_address(uint8_t *addr_type, uint8_t *addr);
 // Sets the addressing mode to use.
 void mp_bluetooth_set_address_mode(uint8_t addr_mode);
 
+#if MICROPY_PY_BLUETOOTH_ENABLE_PAIRING_BONDING
+// Set bonding flag in pairing requests (i.e. persist security keys).
+void mp_bluetooth_set_bonding(bool enabled);
+// Require MITM protection.
+void mp_bluetooth_set_mitm_protection(bool enabled);
+// Require LE Secure pairing (rather than Legacy Pairing)
+void mp_bluetooth_set_le_secure(bool enabled);
+// I/O capabilities for authentication (see MP_BLUETOOTH_IO_CAPABILITY_*).
+void mp_bluetooth_set_io_capability(uint8_t capability);
+#endif // MICROPY_PY_BLUETOOTH_ENABLE_PAIRING_BONDING
+
 // Get or set the GAP device name that will be used by service 0x1800, characteristic 0x2a00.
 size_t mp_bluetooth_gap_get_device_name(const uint8_t **buf);
 int mp_bluetooth_gap_set_device_name(const uint8_t *buf, size_t len);
diff --git a/extmod/nimble/modbluetooth_nimble.c b/extmod/nimble/modbluetooth_nimble.c
index 312a564263fa2..852b9eac021c2 100644
--- a/extmod/nimble/modbluetooth_nimble.c
+++ b/extmod/nimble/modbluetooth_nimble.c
@@ -552,6 +552,24 @@ void mp_bluetooth_set_address_mode(uint8_t addr_mode) {
     }
 }
 
+#if MICROPY_PY_BLUETOOTH_ENABLE_PAIRING_BONDING
+void mp_bluetooth_set_bonding(bool enabled) {
+    ble_hs_cfg.sm_bonding = enabled;
+}
+
+void mp_bluetooth_set_mitm_protection(bool enabled) {
+    ble_hs_cfg.sm_mitm = enabled;
+}
+
+void mp_bluetooth_set_le_secure(bool enabled) {
+    ble_hs_cfg.sm_sc = enabled;
+}
+
+void mp_bluetooth_set_io_capability(uint8_t capability) {
+    ble_hs_cfg.sm_io_cap = capability;
+}
+#endif // MICROPY_PY_BLUETOOTH_ENABLE_PAIRING_BONDING
+
 size_t mp_bluetooth_gap_get_device_name(const uint8_t **buf) {
     const char *name = ble_svc_gap_device_name();
     *buf = (const uint8_t *)name;
diff --git a/extmod/nimble/syscfg/syscfg.h b/extmod/nimble/syscfg/syscfg.h
index bef6b3b9210d4..a051a8fefd069 100644
--- a/extmod/nimble/syscfg/syscfg.h
+++ b/extmod/nimble/syscfg/syscfg.h
@@ -116,18 +116,19 @@ int nimble_sprintf(char *str, const char *fmt, ...);
 #define MYNEWT_VAL_BLE_MONITOR_UART_BUFFER_SIZE (64)
 #define MYNEWT_VAL_BLE_MONITOR_UART_DEV ("uart0")
 #define MYNEWT_VAL_BLE_RPA_TIMEOUT (300)
-#define MYNEWT_VAL_BLE_SM_BONDING (0)
-#define MYNEWT_VAL_BLE_SM_IO_CAP (BLE_HS_IO_NO_INPUT_OUTPUT)
 #define MYNEWT_VAL_BLE_SM_KEYPRESS (0)
 #define MYNEWT_VAL_BLE_SM_LEGACY (1)
 #define MYNEWT_VAL_BLE_SM_MAX_PROCS (1)
-#define MYNEWT_VAL_BLE_SM_MITM (0)
 #define MYNEWT_VAL_BLE_SM_OOB_DATA_FLAG (0)
-#define MYNEWT_VAL_BLE_SM_OUR_KEY_DIST (0)
-#define MYNEWT_VAL_BLE_SM_SC (1)
-#define MYNEWT_VAL_BLE_SM_THEIR_KEY_DIST (0)
+#define MYNEWT_VAL_BLE_SM_OUR_KEY_DIST (7)
+#define MYNEWT_VAL_BLE_SM_THEIR_KEY_DIST (7)
 #define MYNEWT_VAL_BLE_STORE_MAX_BONDS (3)
 #define MYNEWT_VAL_BLE_STORE_MAX_CCCDS (8)
+// These can be overridden at runtime with ble.config(le_secure, mitm, bond, io).
+#define MYNEWT_VAL_BLE_SM_SC (1)
+#define MYNEWT_VAL_BLE_SM_MITM (0)
+#define MYNEWT_VAL_BLE_SM_BONDING (0)
+#define MYNEWT_VAL_BLE_SM_IO_CAP (BLE_HS_IO_NO_INPUT_OUTPUT)
 
 /*** nimble/host/services/gap */
 #define MYNEWT_VAL_BLE_SVC_GAP_APPEARANCE (0)

From f822557cbb79decb6947e1e35b8cddce18f4c06f Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Tue, 24 Nov 2020 23:59:06 +1100
Subject: [PATCH 0448/3533] docs/library/ubluetooth.rst: Add pairing/bonding
 config docs.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 docs/library/ubluetooth.rst | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/docs/library/ubluetooth.rst b/docs/library/ubluetooth.rst
index d402c6a9ebb25..29d3044ebf4d7 100644
--- a/docs/library/ubluetooth.rst
+++ b/docs/library/ubluetooth.rst
@@ -80,6 +80,24 @@ Configuration
       :meth:`gattc_exchange_mtu<BLE.gattc_exchange_mtu>`.
       Use the ``_IRQ_MTU_EXCHANGED`` event to discover the MTU for a given connection.
 
+    - ``'bond'``: Sets whether bonding will be enabled during pairing. When
+      enabled, pairing requests will set the "bond" flag and the keys will be stored
+      by both devices.
+
+    - ``'mitm'``: Sets whether MITM-protection is required for pairing.
+
+    - ``'io'``: Sets the I/O capabilities of this device.
+
+      Available options are::
+
+        _IO_CAPABILITY_DISPLAY_ONLY = const(0)
+        _IO_CAPABILITY_DISPLAY_YESNO = const(1)
+        _IO_CAPABILITY_KEYBOARD_ONLY = const(2)
+        _IO_CAPABILITY_NO_INPUT_OUTPUT = const(3)
+        _IO_CAPABILITY_KEYBOARD_DISPLAY = const(4)
+
+    - ``'le_secure'``: Sets whether "LE Secure" pairing is required. Default is "Legacy Pairing".
+
 Event Handling
 --------------
 

From 801e8ffacff0d2ed15e82136db2a8a45afbfab7b Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Wed, 25 Nov 2020 00:06:16 +1100
Subject: [PATCH 0449/3533] extmod/modbluetooth: Add gap_pair(conn_handle) func
 to intiate pairing.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 extmod/btstack/modbluetooth_btstack.c |  8 ++++++++
 extmod/modbluetooth.c                 | 12 ++++++++++++
 extmod/modbluetooth.h                 |  5 +++++
 extmod/nimble/modbluetooth_nimble.c   |  7 +++++++
 4 files changed, 32 insertions(+)

diff --git a/extmod/btstack/modbluetooth_btstack.c b/extmod/btstack/modbluetooth_btstack.c
index ae4bac00940fa..f6af664a4e9b5 100644
--- a/extmod/btstack/modbluetooth_btstack.c
+++ b/extmod/btstack/modbluetooth_btstack.c
@@ -1167,6 +1167,14 @@ int mp_bluetooth_gap_disconnect(uint16_t conn_handle) {
     return 0;
 }
 
+#if MICROPY_PY_BLUETOOTH_ENABLE_PAIRING_BONDING
+int mp_bluetooth_gap_pair(uint16_t conn_handle) {
+    DEBUG_printf("mp_bluetooth_gap_pair: conn_handle=%d\n", conn_handle);
+    sm_request_pairing(conn_handle);
+    return 0;
+}
+#endif // MICROPY_PY_BLUETOOTH_ENABLE_PAIRING_BONDING
+
 #if MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE
 STATIC btstack_timer_source_t scan_duration_timeout;
 
diff --git a/extmod/modbluetooth.c b/extmod/modbluetooth.c
index 06e340c42d20a..0d33130db7430 100644
--- a/extmod/modbluetooth.c
+++ b/extmod/modbluetooth.c
@@ -682,6 +682,15 @@ STATIC mp_obj_t bluetooth_ble_gap_disconnect(mp_obj_t self_in, mp_obj_t conn_han
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_2(bluetooth_ble_gap_disconnect_obj, bluetooth_ble_gap_disconnect);
 
+#if MICROPY_PY_BLUETOOTH_ENABLE_PAIRING_BONDING
+STATIC mp_obj_t bluetooth_ble_gap_pair(mp_obj_t self_in, mp_obj_t conn_handle_in) {
+    (void)self_in;
+    uint16_t conn_handle = mp_obj_get_int(conn_handle_in);
+    return bluetooth_handle_errno(mp_bluetooth_gap_pair(conn_handle));
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(bluetooth_ble_gap_pair_obj, bluetooth_ble_gap_pair);
+#endif // MICROPY_PY_BLUETOOTH_ENABLE_PAIRING_BONDING
+
 // ----------------------------------------------------------------------------
 // Bluetooth object: GATTS (Peripheral/Advertiser role)
 // ----------------------------------------------------------------------------
@@ -883,6 +892,9 @@ STATIC const mp_rom_map_elem_t bluetooth_ble_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_gap_scan), MP_ROM_PTR(&bluetooth_ble_gap_scan_obj) },
     #endif
     { MP_ROM_QSTR(MP_QSTR_gap_disconnect), MP_ROM_PTR(&bluetooth_ble_gap_disconnect_obj) },
+    #if MICROPY_PY_BLUETOOTH_ENABLE_PAIRING_BONDING
+    { MP_ROM_QSTR(MP_QSTR_gap_pair), MP_ROM_PTR(&bluetooth_ble_gap_pair_obj) },
+    #endif
     // GATT Server (i.e. peripheral/advertiser role)
     { MP_ROM_QSTR(MP_QSTR_gatts_register_services), MP_ROM_PTR(&bluetooth_ble_gatts_register_services_obj) },
     { MP_ROM_QSTR(MP_QSTR_gatts_read), MP_ROM_PTR(&bluetooth_ble_gatts_read_obj) },
diff --git a/extmod/modbluetooth.h b/extmod/modbluetooth.h
index 977453becd486..48e75d432efa4 100644
--- a/extmod/modbluetooth.h
+++ b/extmod/modbluetooth.h
@@ -319,6 +319,11 @@ int mp_bluetooth_gap_disconnect(uint16_t conn_handle);
 int mp_bluetooth_get_preferred_mtu(void);
 int mp_bluetooth_set_preferred_mtu(uint16_t mtu);
 
+#if MICROPY_PY_BLUETOOTH_ENABLE_PAIRING_BONDING
+// Initiate pairing on the specified connection.
+int mp_bluetooth_gap_pair(uint16_t conn_handle);
+#endif // MICROPY_PY_BLUETOOTH_ENABLE_PAIRING_BONDING
+
 #if MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE
 // Start a discovery (scan). Set duration to zero to run continuously.
 int mp_bluetooth_gap_scan_start(int32_t duration_ms, int32_t interval_us, int32_t window_us, bool active_scan);
diff --git a/extmod/nimble/modbluetooth_nimble.c b/extmod/nimble/modbluetooth_nimble.c
index 852b9eac021c2..b1f13ee98b2b0 100644
--- a/extmod/nimble/modbluetooth_nimble.c
+++ b/extmod/nimble/modbluetooth_nimble.c
@@ -860,6 +860,13 @@ int mp_bluetooth_set_preferred_mtu(uint16_t mtu) {
     return 0;
 }
 
+#if MICROPY_PY_BLUETOOTH_ENABLE_PAIRING_BONDING
+int mp_bluetooth_gap_pair(uint16_t conn_handle) {
+    DEBUG_printf("mp_bluetooth_gap_pair: conn_handle=%d\n", conn_handle);
+    return ble_hs_err_to_errno(ble_gap_security_initiate(conn_handle));
+}
+#endif // MICROPY_PY_BLUETOOTH_ENABLE_PAIRING_BONDING
+
 #if MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE
 
 STATIC void gattc_on_data_available(uint8_t event, uint16_t conn_handle, uint16_t value_handle, const struct os_mbuf *om) {

From fff634e03134b8f1724759f477da61b698c9cdf4 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Wed, 25 Nov 2020 00:10:17 +1100
Subject: [PATCH 0450/3533] docs/library/ubluetooth.rst: Add gap_pair() docs.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 docs/library/ubluetooth.rst | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/docs/library/ubluetooth.rst b/docs/library/ubluetooth.rst
index 29d3044ebf4d7..594d73c87824b 100644
--- a/docs/library/ubluetooth.rst
+++ b/docs/library/ubluetooth.rst
@@ -368,6 +368,15 @@ Central & Peripheral Roles
     Returns ``False`` if the connection handle wasn't connected, and ``True``
     otherwise.
 
+.. method:: BLE.gap_pair(conn_handle, /)
+
+    Initiate pairing with the remote device.
+
+    Before calling this, ensure that the ``io``, ``mitm``, ``le_secure``, and
+    ``bond`` configuration options are set (via :meth:`config<BLE.config>`).
+
+    On successful pairing, the ``_IRQ_ENCRYPTION_UPDATED`` event will be raised.
+
 
 GATT Server
 -----------

From c4d08aa4e3641a1d05d35051454d4bce8ef14fcf Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Wed, 25 Nov 2020 17:28:04 +1100
Subject: [PATCH 0451/3533] extmod/modbluetooth: Add support for bonding (key
 persistence).

This adds `_IRQ_GET_SECRET` and `_IRQ_SET_SECRET` events to allow the BT
stack to request the Python code retrive/store/delete secret key data.  The
actual keys and values are opaque to Python and stack-specific.

Only NimBLE is implemented (pending moving btstack to sync events).  The
secret store is designed to be compatible with BlueKitchen's TLV store API.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 extmod/modbluetooth.c               |  78 ++++++++-----
 extmod/modbluetooth.h               |  18 ++-
 extmod/nimble/modbluetooth_nimble.c | 172 +++++++++++++++++++++++++++-
 extmod/nimble/nimble.mk             |   2 +-
 4 files changed, 240 insertions(+), 30 deletions(-)

diff --git a/extmod/modbluetooth.c b/extmod/modbluetooth.c
index 0d33130db7430..a69e8418a761d 100644
--- a/extmod/modbluetooth.c
+++ b/extmod/modbluetooth.c
@@ -1081,14 +1081,15 @@ STATIC mp_obj_t invoke_irq_handler(uint16_t event,
     const uint8_t *addr,
     const int8_t *i8, size_t n_i8,
     const mp_obj_bluetooth_uuid_t *uuid,
-    const uint8_t *data, size_t data_len) {
+    const uint8_t **data, size_t *data_len, size_t n_data) {
     mp_obj_bluetooth_ble_t *o = MP_OBJ_TO_PTR(MP_STATE_VM(bluetooth));
     if (o->irq_handler == mp_const_none) {
         return mp_const_none;
     }
 
     mp_obj_array_t mv_addr;
-    mp_obj_array_t mv_data;
+    mp_obj_array_t mv_data[2];
+    assert(n_data <= 2);
 
     mp_obj_tuple_t *data_tuple = mp_local_alloc(sizeof(mp_obj_tuple_t) + sizeof(mp_obj_t) * MICROPY_PY_BLUETOOTH_MAX_EVENT_DATA_TUPLE_LEN);
     data_tuple->base.type = &mp_type_tuple;
@@ -1112,9 +1113,13 @@ STATIC mp_obj_t invoke_irq_handler(uint16_t event,
         data_tuple->items[data_tuple->len++] = MP_OBJ_FROM_PTR(uuid);
     }
     #endif
-    if (data) {
-        mp_obj_memoryview_init(&mv_data, 'B', 0, data_len, (void *)data);
-        data_tuple->items[data_tuple->len++] = MP_OBJ_FROM_PTR(&mv_data);
+    for (size_t i = 0; i < n_data; ++i) {
+        if (data[i]) {
+            mp_obj_memoryview_init(&mv_data[i], 'B', 0, data_len[i], (void *)data[i]);
+            data_tuple->items[data_tuple->len++] = MP_OBJ_FROM_PTR(&mv_data[i]);
+        } else {
+            data_tuple->items[data_tuple->len++] = mp_const_none;
+        }
     }
     assert(data_tuple->len <= MICROPY_PY_BLUETOOTH_MAX_EVENT_DATA_TUPLE_LEN);
 
@@ -1131,36 +1136,57 @@ STATIC mp_obj_t invoke_irq_handler(uint16_t event,
 #define NULL_I8 NULL
 #define NULL_UUID NULL
 #define NULL_DATA NULL
+#define NULL_DATA_LEN NULL
 
 void mp_bluetooth_gap_on_connected_disconnected(uint8_t event, uint16_t conn_handle, uint8_t addr_type, const uint8_t *addr) {
-    invoke_irq_handler(event, &conn_handle, 1, &addr_type, 1, addr, NULL_I8, 0, NULL_UUID, NULL_DATA, 0);
+    invoke_irq_handler(event, &conn_handle, 1, &addr_type, 1, addr, NULL_I8, 0, NULL_UUID, NULL_DATA, NULL_DATA_LEN, 0);
 }
 
 void mp_bluetooth_gap_on_connection_update(uint16_t conn_handle, uint16_t conn_interval, uint16_t conn_latency, uint16_t supervision_timeout, uint16_t status) {
     uint16_t args[] = {conn_handle, conn_interval, conn_latency, supervision_timeout, status};
-    invoke_irq_handler(MP_BLUETOOTH_IRQ_CONNECTION_UPDATE, args, 5, NULL_U8, 0, NULL_ADDR, NULL_I8, 0, NULL_UUID, NULL_DATA, 0);
+    invoke_irq_handler(MP_BLUETOOTH_IRQ_CONNECTION_UPDATE, args, 5, NULL_U8, 0, NULL_ADDR, NULL_I8, 0, NULL_UUID, NULL_DATA, NULL_DATA_LEN, 0);
 }
 
 #if MICROPY_PY_BLUETOOTH_ENABLE_PAIRING_BONDING
 void mp_bluetooth_gatts_on_encryption_update(uint16_t conn_handle, bool encrypted, bool authenticated, bool bonded, uint8_t key_size) {
     uint8_t args[] = {encrypted, authenticated, bonded, key_size};
-    invoke_irq_handler(MP_BLUETOOTH_IRQ_ENCRYPTION_UPDATE, &conn_handle, 1, args, 4, NULL_ADDR, NULL_I8, 0, NULL_UUID, NULL_DATA, 0);
+    invoke_irq_handler(MP_BLUETOOTH_IRQ_ENCRYPTION_UPDATE, &conn_handle, 1, args, 4, NULL_ADDR, NULL_I8, 0, NULL_UUID, NULL_DATA, NULL_DATA_LEN, 0);
+}
+
+bool mp_bluetooth_gap_on_get_secret(uint8_t type, uint8_t index, const uint8_t *key, size_t key_len, const uint8_t **value, size_t *value_len) {
+    uint8_t args[] = {type, index};
+    mp_obj_t result = invoke_irq_handler(MP_BLUETOOTH_IRQ_GET_SECRET, NULL_U16, 0, args, 2, NULL_ADDR, NULL_I8, 0, NULL_UUID, &key, &key_len, 1);
+    if (result == mp_const_none) {
+        return false;
+    }
+    mp_buffer_info_t bufinfo;
+    mp_get_buffer_raise(result, &bufinfo, MP_BUFFER_READ);
+    *value = bufinfo.buf;
+    *value_len = bufinfo.len;
+    return true;
+}
+
+bool mp_bluetooth_gap_on_set_secret(uint8_t type, const uint8_t *key, size_t key_len, const uint8_t *value, size_t value_len) {
+    const uint8_t *data[] = {key, value};
+    size_t data_len[] = {key_len, value_len};
+    mp_obj_t result = invoke_irq_handler(MP_BLUETOOTH_IRQ_SET_SECRET, NULL_U16, 0, &type, 1, NULL_ADDR, NULL_I8, 0, NULL_UUID, data, data_len, 2);
+    return mp_obj_is_true(result);
 }
 #endif // MICROPY_PY_BLUETOOTH_ENABLE_PAIRING_BONDING
 
 void mp_bluetooth_gatts_on_write(uint16_t conn_handle, uint16_t value_handle) {
     uint16_t args[] = {conn_handle, value_handle};
-    invoke_irq_handler(MP_BLUETOOTH_IRQ_GATTS_WRITE, args, 2, NULL_U8, 0, NULL_ADDR, NULL_I8, 0, NULL_UUID, NULL_DATA, 0);
+    invoke_irq_handler(MP_BLUETOOTH_IRQ_GATTS_WRITE, args, 2, NULL_U8, 0, NULL_ADDR, NULL_I8, 0, NULL_UUID, NULL_DATA, NULL_DATA_LEN, 0);
 }
 
 void mp_bluetooth_gatts_on_indicate_complete(uint16_t conn_handle, uint16_t value_handle, uint8_t status) {
     uint16_t args[] = {conn_handle, value_handle};
-    invoke_irq_handler(MP_BLUETOOTH_IRQ_GATTS_INDICATE_DONE, args, 2, &status, 1, NULL_ADDR, NULL_I8, 0, NULL_UUID, NULL_DATA, 0);
+    invoke_irq_handler(MP_BLUETOOTH_IRQ_GATTS_INDICATE_DONE, args, 2, &status, 1, NULL_ADDR, NULL_I8, 0, NULL_UUID, NULL_DATA, NULL_DATA_LEN, 0);
 }
 
 mp_int_t mp_bluetooth_gatts_on_read_request(uint16_t conn_handle, uint16_t value_handle) {
     uint16_t args[] = {conn_handle, value_handle};
-    mp_obj_t result = invoke_irq_handler(MP_BLUETOOTH_IRQ_GATTS_READ_REQUEST, args, 2, NULL, 0, NULL_ADDR, NULL_I8, 0, NULL_UUID, NULL_DATA, 0);
+    mp_obj_t result = invoke_irq_handler(MP_BLUETOOTH_IRQ_GATTS_READ_REQUEST, args, 2, NULL, 0, NULL_ADDR, NULL_I8, 0, NULL_UUID, NULL_DATA, NULL_DATA_LEN, 0);
     // Return non-zero from IRQ handler to fail the read.
     mp_int_t ret = 0;
     mp_obj_get_int_maybe(result, &ret);
@@ -1169,13 +1195,13 @@ mp_int_t mp_bluetooth_gatts_on_read_request(uint16_t conn_handle, uint16_t value
 
 void mp_bluetooth_gatts_on_mtu_exchanged(uint16_t conn_handle, uint16_t value) {
     uint16_t args[] = {conn_handle, value};
-    invoke_irq_handler(MP_BLUETOOTH_IRQ_MTU_EXCHANGED, args, 2, NULL_U8, 0, NULL_ADDR, NULL_I8, 0, NULL_UUID, NULL_DATA, 0);
+    invoke_irq_handler(MP_BLUETOOTH_IRQ_MTU_EXCHANGED, args, 2, NULL_U8, 0, NULL_ADDR, NULL_I8, 0, NULL_UUID, NULL_DATA, NULL_DATA_LEN, 0);
 }
 
 #if MICROPY_PY_BLUETOOTH_ENABLE_L2CAP_CHANNELS
 mp_int_t mp_bluetooth_gattc_on_l2cap_accept(uint16_t conn_handle, uint16_t cid, uint16_t psm, uint16_t our_mtu, uint16_t peer_mtu) {
     uint16_t args[] = {conn_handle, cid, psm, our_mtu, peer_mtu};
-    mp_obj_t result = invoke_irq_handler(MP_BLUETOOTH_IRQ_L2CAP_ACCEPT, args, 5, NULL_U8, 0, NULL_ADDR, NULL_I8, 0, NULL_UUID, NULL_DATA, 0);
+    mp_obj_t result = invoke_irq_handler(MP_BLUETOOTH_IRQ_L2CAP_ACCEPT, args, 5, NULL_U8, 0, NULL_ADDR, NULL_I8, 0, NULL_UUID, NULL_DATA, NULL_DATA_LEN, 0);
     // Return non-zero from IRQ handler to fail the accept.
     mp_int_t ret = 0;
     mp_obj_get_int_maybe(result, &ret);
@@ -1184,58 +1210,58 @@ mp_int_t mp_bluetooth_gattc_on_l2cap_accept(uint16_t conn_handle, uint16_t cid,
 
 void mp_bluetooth_gattc_on_l2cap_connect(uint16_t conn_handle, uint16_t cid, uint16_t psm, uint16_t our_mtu, uint16_t peer_mtu) {
     uint16_t args[] = {conn_handle, cid, psm, our_mtu, peer_mtu};
-    invoke_irq_handler(MP_BLUETOOTH_IRQ_L2CAP_CONNECT, args, 5, NULL_U8, 0, NULL_ADDR, NULL_I8, 0, NULL_UUID, NULL_DATA, 0);
+    invoke_irq_handler(MP_BLUETOOTH_IRQ_L2CAP_CONNECT, args, 5, NULL_U8, 0, NULL_ADDR, NULL_I8, 0, NULL_UUID, NULL_DATA, NULL_DATA_LEN, 0);
 }
 
 void mp_bluetooth_gattc_on_l2cap_disconnect(uint16_t conn_handle, uint16_t cid, uint16_t psm, uint16_t status) {
     uint16_t args[] = {conn_handle, cid, psm, status};
-    invoke_irq_handler(MP_BLUETOOTH_IRQ_L2CAP_DISCONNECT, args, 4, NULL_U8, 0, NULL_ADDR, NULL_I8, 0, NULL_UUID, NULL_DATA, 0);
+    invoke_irq_handler(MP_BLUETOOTH_IRQ_L2CAP_DISCONNECT, args, 4, NULL_U8, 0, NULL_ADDR, NULL_I8, 0, NULL_UUID, NULL_DATA, NULL_DATA_LEN, 0);
 }
 
 void mp_bluetooth_gattc_on_l2cap_send_ready(uint16_t conn_handle, uint16_t cid, uint8_t status) {
     uint16_t args[] = {conn_handle, cid};
-    invoke_irq_handler(MP_BLUETOOTH_IRQ_L2CAP_SEND_READY, args, 2, &status, 1, NULL_ADDR, NULL_I8, 0, NULL_UUID, NULL_DATA, 0);
+    invoke_irq_handler(MP_BLUETOOTH_IRQ_L2CAP_SEND_READY, args, 2, &status, 1, NULL_ADDR, NULL_I8, 0, NULL_UUID, NULL_DATA, NULL_DATA_LEN, 0);
 }
 
 void mp_bluetooth_gattc_on_l2cap_recv(uint16_t conn_handle, uint16_t cid) {
     uint16_t args[] = {conn_handle, cid};
-    invoke_irq_handler(MP_BLUETOOTH_IRQ_L2CAP_RECV, args, 2, NULL_U8, 0, NULL_ADDR, NULL_I8, 0, NULL_UUID, NULL_DATA, 0);
+    invoke_irq_handler(MP_BLUETOOTH_IRQ_L2CAP_RECV, args, 2, NULL_U8, 0, NULL_ADDR, NULL_I8, 0, NULL_UUID, NULL_DATA, NULL_DATA_LEN, 0);
 }
 #endif // MICROPY_PY_BLUETOOTH_ENABLE_L2CAP_CHANNELS
 
 #if MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE
 void mp_bluetooth_gap_on_scan_complete(void) {
-    invoke_irq_handler(MP_BLUETOOTH_IRQ_SCAN_DONE, NULL_U16, 0, NULL_U8, 0, NULL_ADDR, NULL_I8, 0, NULL_UUID, NULL_DATA, 0);
+    invoke_irq_handler(MP_BLUETOOTH_IRQ_SCAN_DONE, NULL_U16, 0, NULL_U8, 0, NULL_ADDR, NULL_I8, 0, NULL_UUID, NULL_DATA, NULL_DATA_LEN, 0);
 }
 
 void mp_bluetooth_gap_on_scan_result(uint8_t addr_type, const uint8_t *addr, uint8_t adv_type, const int8_t rssi, const uint8_t *data, size_t data_len) {
     int8_t args[] = {adv_type, rssi};
-    invoke_irq_handler(MP_BLUETOOTH_IRQ_SCAN_RESULT, NULL_U16, 0, &addr_type, 1, addr, args, 2, NULL_UUID, data, data_len);
+    invoke_irq_handler(MP_BLUETOOTH_IRQ_SCAN_RESULT, NULL_U16, 0, &addr_type, 1, addr, args, 2, NULL_UUID, &data, &data_len, 1);
 }
 
 void mp_bluetooth_gattc_on_primary_service_result(uint16_t conn_handle, uint16_t start_handle, uint16_t end_handle, mp_obj_bluetooth_uuid_t *service_uuid) {
     uint16_t args[] = {conn_handle, start_handle, end_handle};
-    invoke_irq_handler(MP_BLUETOOTH_IRQ_GATTC_SERVICE_RESULT, args, 3, NULL_U8, 0, NULL_ADDR, NULL_I8, 0, service_uuid, NULL_DATA, 0);
+    invoke_irq_handler(MP_BLUETOOTH_IRQ_GATTC_SERVICE_RESULT, args, 3, NULL_U8, 0, NULL_ADDR, NULL_I8, 0, service_uuid, NULL_DATA, NULL_DATA_LEN, 0);
 }
 
 void mp_bluetooth_gattc_on_characteristic_result(uint16_t conn_handle, uint16_t def_handle, uint16_t value_handle, uint8_t properties, mp_obj_bluetooth_uuid_t *characteristic_uuid) {
     uint16_t args[] = {conn_handle, def_handle, value_handle};
-    invoke_irq_handler(MP_BLUETOOTH_IRQ_GATTC_CHARACTERISTIC_RESULT, args, 3, &properties, 1, NULL_ADDR, NULL_I8, 0, characteristic_uuid, NULL_DATA, 0);
+    invoke_irq_handler(MP_BLUETOOTH_IRQ_GATTC_CHARACTERISTIC_RESULT, args, 3, &properties, 1, NULL_ADDR, NULL_I8, 0, characteristic_uuid, NULL_DATA, NULL_DATA_LEN, 0);
 }
 
 void mp_bluetooth_gattc_on_descriptor_result(uint16_t conn_handle, uint16_t handle, mp_obj_bluetooth_uuid_t *descriptor_uuid) {
     uint16_t args[] = {conn_handle, handle};
-    invoke_irq_handler(MP_BLUETOOTH_IRQ_GATTC_DESCRIPTOR_RESULT, args, 2, NULL_U8, 0, NULL_ADDR, NULL_I8, 0, descriptor_uuid, NULL_DATA, 0);
+    invoke_irq_handler(MP_BLUETOOTH_IRQ_GATTC_DESCRIPTOR_RESULT, args, 2, NULL_U8, 0, NULL_ADDR, NULL_I8, 0, descriptor_uuid, NULL_DATA, NULL_DATA_LEN, 0);
 }
 
 void mp_bluetooth_gattc_on_discover_complete(uint8_t event, uint16_t conn_handle, uint16_t status) {
     uint16_t args[] = {conn_handle, status};
-    invoke_irq_handler(event, args, 2, NULL_U8, 0, NULL_ADDR, NULL_I8, 0, NULL_UUID, NULL_DATA, 0);
+    invoke_irq_handler(event, args, 2, NULL_U8, 0, NULL_ADDR, NULL_I8, 0, NULL_UUID, NULL_DATA, NULL_DATA_LEN, 0);
 }
 
 void mp_bluetooth_gattc_on_data_available(uint8_t event, uint16_t conn_handle, uint16_t value_handle, const uint8_t **data, uint16_t *data_len, size_t num) {
     const uint8_t *combined_data;
-    uint16_t total_len;
+    size_t total_len;
 
     if (num > 1) {
         // Fragmented buffer, need to combine into a new heap-allocated buffer
@@ -1258,7 +1284,7 @@ void mp_bluetooth_gattc_on_data_available(uint8_t event, uint16_t conn_handle, u
     }
 
     uint16_t args[] = {conn_handle, value_handle};
-    invoke_irq_handler(event, args, 2, NULL_U8, 0, NULL_ADDR, NULL_I8, 0, NULL_UUID, combined_data, total_len);
+    invoke_irq_handler(event, args, 2, NULL_U8, 0, NULL_ADDR, NULL_I8, 0, NULL_UUID, &combined_data, &total_len, 1);
 
     if (num > 1) {
         m_del(uint8_t, (uint8_t *)combined_data, total_len);
@@ -1267,7 +1293,7 @@ void mp_bluetooth_gattc_on_data_available(uint8_t event, uint16_t conn_handle, u
 
 void mp_bluetooth_gattc_on_read_write_status(uint8_t event, uint16_t conn_handle, uint16_t value_handle, uint16_t status) {
     uint16_t args[] = {conn_handle, value_handle, status};
-    invoke_irq_handler(event, args, 3, NULL_U8, 0, NULL_ADDR, NULL_I8, 0, NULL_UUID, NULL_DATA, 0);
+    invoke_irq_handler(event, args, 3, NULL_U8, 0, NULL_ADDR, NULL_I8, 0, NULL_UUID, NULL_DATA, NULL_DATA_LEN, 0);
 }
 
 #endif // MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE
diff --git a/extmod/modbluetooth.h b/extmod/modbluetooth.h
index 48e75d432efa4..d79b7f56b9828 100644
--- a/extmod/modbluetooth.h
+++ b/extmod/modbluetooth.h
@@ -146,6 +146,8 @@
 #define MP_BLUETOOTH_IRQ_L2CAP_SEND_READY               (26)
 #define MP_BLUETOOTH_IRQ_CONNECTION_UPDATE              (27)
 #define MP_BLUETOOTH_IRQ_ENCRYPTION_UPDATE              (28)
+#define MP_BLUETOOTH_IRQ_GET_SECRET                     (29)
+#define MP_BLUETOOTH_IRQ_SET_SECRET                     (30)
 
 #define MP_BLUETOOTH_ADDRESS_MODE_PUBLIC (0)
 #define MP_BLUETOOTH_ADDRESS_MODE_RANDOM (1)
@@ -159,6 +161,12 @@
 #define MP_BLUETOOTH_IO_CAPABILITY_NO_INPUT_OUTPUT     (3)
 #define MP_BLUETOOTH_IO_CAPABILITY_KEYBOARD_DISPLAY    (4)
 
+// These match NimBLE BLE_SM_IOACT_.
+#define MP_BLUETOOTH_PASSKEY_ACTION_NONE                (0)
+#define MP_BLUETOOTH_PASSKEY_ACTION_INPUT               (2)
+#define MP_BLUETOOTH_PASSKEY_ACTION_DISPLAY             (3)
+#define MP_BLUETOOTH_PASSKEY_ACTION_NUMERIC_COMPARISON  (4)
+
 /*
 These aren't included in the module for space reasons, but can be used
 in your Python code if necessary.
@@ -192,6 +200,8 @@ _IRQ_L2CAP_RECV = const(25)
 _IRQ_L2CAP_SEND_READY = const(26)
 _IRQ_CONNECTION_UPDATE = const(27)
 _IRQ_ENCRYPTION_UPDATE = const(28)
+_IRQ_GET_SECRET = const(29)
+_IRQ_SET_SECRET = const(30)
 
 _FLAG_BROADCAST = const(0x0001)
 _FLAG_READ = const(0x0002)
@@ -373,7 +383,13 @@ void mp_bluetooth_gap_on_connection_update(uint16_t conn_handle, uint16_t conn_i
 #if MICROPY_PY_BLUETOOTH_ENABLE_PAIRING_BONDING
 // Call this when any connection encryption has been changed (e.g. during pairing).
 void mp_bluetooth_gatts_on_encryption_update(uint16_t conn_handle, bool encrypted, bool authenticated, bool bonded, uint8_t key_size);
-#endif
+
+// Call this when you need the application to manage persistent key data.
+// For get, if key is NULL, then the implementation must return the index'th matching key. Otherwise it should return a specific key.
+// For set, if value is NULL, then delete.
+bool mp_bluetooth_gap_on_get_secret(uint8_t type, uint8_t index, const uint8_t *key, size_t key_len, const uint8_t **value, size_t *value_len);
+bool mp_bluetooth_gap_on_set_secret(uint8_t type, const uint8_t *key, size_t key_len, const uint8_t *value, size_t value_len);
+#endif // MICROPY_PY_BLUETOOTH_ENABLE_PAIRING_BONDING
 
 // Call this when a characteristic is written to.
 void mp_bluetooth_gatts_on_write(uint16_t conn_handle, uint16_t value_handle);
diff --git a/extmod/nimble/modbluetooth_nimble.c b/extmod/nimble/modbluetooth_nimble.c
index b1f13ee98b2b0..2b273c6bc7962 100644
--- a/extmod/nimble/modbluetooth_nimble.c
+++ b/extmod/nimble/modbluetooth_nimble.c
@@ -269,6 +269,7 @@ STATIC int gap_event_cb(struct ble_gap_event *event, void *arg) {
 
     switch (event->type) {
         case BLE_GAP_EVENT_CONNECT:
+            DEBUG_printf("gap_event_cb: connect: status=%d\n", event->connect.status);
             if (event->connect.status == 0) {
                 // Connection established.
                 ble_gap_conn_find(event->connect.conn_handle, &desc);
@@ -282,6 +283,7 @@ STATIC int gap_event_cb(struct ble_gap_event *event, void *arg) {
 
         case BLE_GAP_EVENT_DISCONNECT:
             // Disconnect.
+            DEBUG_printf("gap_event_cb: disconnect: reason=%d\n", event->disconnect.reason);
             reverse_addr_byte_order(addr, event->disconnect.conn.peer_id_addr.val);
             mp_bluetooth_gap_on_connected_disconnected(MP_BLUETOOTH_IRQ_CENTRAL_DISCONNECT, event->disconnect.conn.conn_handle, event->disconnect.conn.peer_id_addr.type, addr);
             break;
@@ -310,7 +312,6 @@ STATIC int gap_event_cb(struct ble_gap_event *event, void *arg) {
 
         case BLE_GAP_EVENT_CONN_UPDATE: {
             DEBUG_printf("gap_event_cb: connection update: status=%d\n", event->conn_update.status);
-            struct ble_gap_conn_desc desc;
             if (ble_gap_conn_find(event->conn_update.conn_handle, &desc) == 0) {
                 mp_bluetooth_gap_on_connection_update(event->conn_update.conn_handle, desc.conn_itvl, desc.conn_latency, desc.supervision_timeout, event->conn_update.status == 0 ? 0 : 1);
             }
@@ -320,7 +321,6 @@ STATIC int gap_event_cb(struct ble_gap_event *event, void *arg) {
         case BLE_GAP_EVENT_ENC_CHANGE: {
             DEBUG_printf("gap_event_cb: enc change: status=%d\n", event->enc_change.status);
             #if MICROPY_PY_BLUETOOTH_ENABLE_PAIRING_BONDING
-            struct ble_gap_conn_desc desc;
             if (ble_gap_conn_find(event->enc_change.conn_handle, &desc) == 0) {
                 mp_bluetooth_gatts_on_encryption_update(event->conn_update.conn_handle,
                     desc.sec_state.encrypted, desc.sec_state.authenticated,
@@ -329,6 +329,27 @@ STATIC int gap_event_cb(struct ble_gap_event *event, void *arg) {
             #endif
             break;
         }
+
+        case BLE_GAP_EVENT_REPEAT_PAIRING: {
+            // We recognized this peer but the peer doesn't recognize us.
+            DEBUG_printf("gap_event_cb: repeat pairing: conn_handle=%d\n", event->repeat_pairing.conn_handle);
+
+            // TODO: Consider returning BLE_GAP_REPEAT_PAIRING_IGNORE (and
+            // possibly an API to configure this).
+
+            // Delete the old bond.
+            int rc = ble_gap_conn_find(event->repeat_pairing.conn_handle, &desc);
+            if (rc == 0) {
+                ble_store_util_delete_peer(&desc.peer_id_addr);
+            }
+
+            // Allow re-pairing.
+            return BLE_GAP_REPEAT_PAIRING_RETRY;
+        }
+
+        default:
+            DEBUG_printf("gap_event_cb: unknown type %d\n", event->type);
+            break;
     }
     return 0;
 }
@@ -969,6 +990,7 @@ STATIC int peripheral_gap_event_cb(struct ble_gap_event *event, void *arg) {
 
     switch (event->type) {
         case BLE_GAP_EVENT_CONNECT:
+            DEBUG_printf("peripheral_gap_event_cb: status=%d\n", event->connect.status);
             if (event->connect.status == 0) {
                 // Connection established.
                 ble_gap_conn_find(event->connect.conn_handle, &desc);
@@ -982,6 +1004,7 @@ STATIC int peripheral_gap_event_cb(struct ble_gap_event *event, void *arg) {
 
         case BLE_GAP_EVENT_DISCONNECT:
             // Disconnect.
+            DEBUG_printf("peripheral_gap_event_cb: reason=%d\n", event->disconnect.reason);
             reverse_addr_byte_order(addr, event->disconnect.conn.peer_id_addr.val);
             mp_bluetooth_gap_on_connected_disconnected(MP_BLUETOOTH_IRQ_PERIPHERAL_DISCONNECT, event->disconnect.conn.conn_handle, event->disconnect.conn.peer_id_addr.type, addr);
 
@@ -1020,9 +1043,12 @@ STATIC int peripheral_gap_event_cb(struct ble_gap_event *event, void *arg) {
             #endif
             break;
         }
+
         default:
+            DEBUG_printf("peripheral_gap_event_cb: unknown type %d\n", event->type);
             break;
     }
+
     return 0;
 }
 
@@ -1514,4 +1540,146 @@ int mp_bluetooth_l2cap_recvinto(uint16_t conn_handle, uint16_t cid, uint8_t *buf
 
 #endif // MICROPY_PY_BLUETOOTH_ENABLE_L2CAP_CHANNELS
 
+#if MICROPY_PY_BLUETOOTH_ENABLE_PAIRING_BONDING
+
+STATIC int ble_store_ram_read(int obj_type, const union ble_store_key *key, union ble_store_value *value) {
+    DEBUG_printf("ble_store_ram_read: %d\n", obj_type);
+    const uint8_t *key_data;
+    size_t key_data_len;
+
+    switch (obj_type) {
+        case BLE_STORE_OBJ_TYPE_PEER_SEC: {
+            if (ble_addr_cmp(&key->sec.peer_addr, BLE_ADDR_ANY)) {
+                // <type=peer,addr,*> (single)
+                // Find the entry for this specific peer.
+                assert(key->sec.idx == 0);
+                assert(!key->sec.ediv_rand_present);
+                key_data = (const uint8_t *)&key->sec.peer_addr;
+                key_data_len = sizeof(ble_addr_t);
+            } else {
+                // <type=peer,*> (with index)
+                // Iterate all known peers.
+                assert(!key->sec.ediv_rand_present);
+                key_data = NULL;
+                key_data_len = 0;
+            }
+            break;
+        }
+        case BLE_STORE_OBJ_TYPE_OUR_SEC: {
+            // <type=our,addr,ediv_rand>
+            // Find our secret for this remote device, matching this ediv/rand key.
+            assert(ble_addr_cmp(&key->sec.peer_addr, BLE_ADDR_ANY)); // Must have address.
+            assert(key->sec.idx == 0);
+            assert(key->sec.ediv_rand_present);
+            key_data = (const uint8_t *)&key->sec.peer_addr;
+            key_data_len = sizeof(ble_addr_t);
+            break;
+        }
+        case BLE_STORE_OBJ_TYPE_CCCD: {
+            // TODO: Implement CCCD persistence.
+            DEBUG_printf("ble_store_ram_read: CCCD not supported.\n");
+            return -1;
+        }
+        default:
+            return BLE_HS_ENOTSUP;
+    }
+
+    const uint8_t *value_data;
+    size_t value_data_len;
+    if (!mp_bluetooth_gap_on_get_secret(obj_type, key->sec.idx, key_data, key_data_len, &value_data, &value_data_len)) {
+        DEBUG_printf("ble_store_ram_read: Key not found: type=%d, index=%u, key=0x%p, len=" UINT_FMT "\n", obj_type, key->sec.idx, key_data, key_data_len);
+        return BLE_HS_ENOENT;
+    }
+
+    if (value_data_len != sizeof(struct ble_store_value_sec)) {
+        DEBUG_printf("ble_store_ram_read: Invalid key data: actual=" UINT_FMT " expected=" UINT_FMT "\n", value_data_len, sizeof(struct ble_store_value_sec));
+        return BLE_HS_ENOENT;
+    }
+
+    memcpy((uint8_t *)&value->sec, value_data, sizeof(struct ble_store_value_sec));
+
+    DEBUG_printf("ble_store_ram_read: found secret\n");
+
+    if (obj_type == BLE_STORE_OBJ_TYPE_OUR_SEC) {
+        // TODO: Verify ediv_rand matches.
+    }
+
+    return 0;
+}
+
+STATIC int ble_store_ram_write(int obj_type, const union ble_store_value *val) {
+    DEBUG_printf("ble_store_ram_write: %d\n", obj_type);
+    switch (obj_type) {
+        case BLE_STORE_OBJ_TYPE_PEER_SEC:
+        case BLE_STORE_OBJ_TYPE_OUR_SEC: {
+            // <type=peer,addr,edivrand>
+
+            struct ble_store_key_sec key_sec;
+            const struct ble_store_value_sec *value_sec = &val->sec;
+            ble_store_key_from_value_sec(&key_sec, value_sec);
+
+            assert(ble_addr_cmp(&key_sec.peer_addr, BLE_ADDR_ANY)); // Must have address.
+            assert(key_sec.ediv_rand_present);
+
+            if (!mp_bluetooth_gap_on_set_secret(obj_type, (const uint8_t *)&key_sec.peer_addr, sizeof(ble_addr_t), (const uint8_t *)value_sec, sizeof(struct ble_store_value_sec))) {
+                DEBUG_printf("Failed to write key: type=%d\n", obj_type);
+                return BLE_HS_ESTORE_CAP;
+            }
+
+            DEBUG_printf("ble_store_ram_write: wrote secret\n");
+
+            return 0;
+        }
+        case BLE_STORE_OBJ_TYPE_CCCD: {
+            // TODO: Implement CCCD persistence.
+            DEBUG_printf("ble_store_ram_write: CCCD not supported.\n");
+            // Just pretend we wrote it.
+            return 0;
+        }
+        default:
+            return BLE_HS_ENOTSUP;
+    }
+}
+
+STATIC int ble_store_ram_delete(int obj_type, const union ble_store_key *key) {
+    DEBUG_printf("ble_store_ram_delete: %d\n", obj_type);
+    switch (obj_type) {
+        case BLE_STORE_OBJ_TYPE_PEER_SEC:
+        case BLE_STORE_OBJ_TYPE_OUR_SEC: {
+            // <type=peer,addr,*>
+
+            assert(ble_addr_cmp(&key->sec.peer_addr, BLE_ADDR_ANY)); // Must have address.
+            // ediv_rand is optional (will not be present for delete).
+
+            if (!mp_bluetooth_gap_on_set_secret(obj_type, (const uint8_t *)&key->sec.peer_addr, sizeof(ble_addr_t), NULL, 0)) {
+                DEBUG_printf("Failed to delete key: type=%d\n", obj_type);
+                return BLE_HS_ENOENT;
+            }
+
+            DEBUG_printf("ble_store_ram_delete: deleted secret\n");
+
+            return 0;
+        }
+        case BLE_STORE_OBJ_TYPE_CCCD: {
+            // TODO: Implement CCCD persistence.
+            DEBUG_printf("ble_store_ram_delete: CCCD not supported.\n");
+            // Just pretend it wasn't there.
+            return BLE_HS_ENOENT;
+        }
+        default:
+            return BLE_HS_ENOTSUP;
+    }
+}
+
+// nimble_port_init always calls ble_store_ram_init. We provide this alternative
+// implementation rather than the one in nimble/store/ram/src/ble_store_ram.c.
+// TODO: Consider re-implementing nimble_port_init instead.
+void ble_store_ram_init(void) {
+    ble_hs_cfg.store_read_cb = ble_store_ram_read;
+    ble_hs_cfg.store_write_cb = ble_store_ram_write;
+    ble_hs_cfg.store_delete_cb = ble_store_ram_delete;
+}
+
+#endif // MICROPY_PY_BLUETOOTH_ENABLE_PAIRING_BONDING
+
 #endif // MICROPY_PY_BLUETOOTH && MICROPY_BLUETOOTH_NIMBLE
diff --git a/extmod/nimble/nimble.mk b/extmod/nimble/nimble.mk
index ba094f16f871a..806630074eb87 100644
--- a/extmod/nimble/nimble.mk
+++ b/extmod/nimble/nimble.mk
@@ -83,7 +83,6 @@ LIB_SRC_C += $(addprefix $(NIMBLE_LIB_DIR)/, \
 		ble_store_util.c \
 		ble_uuid.c \
 		) \
-	nimble/host/store/ram/src/ble_store_ram.c \
 	nimble/host/util/src/addr.c \
 	nimble/transport/uart/src/ble_hci_uart.c \
 	$(addprefix porting/nimble/src/, \
@@ -95,6 +94,7 @@ LIB_SRC_C += $(addprefix $(NIMBLE_LIB_DIR)/, \
 		os_msys_init.c \
 		) \
 	)
+	# nimble/host/store/ram/src/ble_store_ram.c \
 
 EXTMOD_SRC_C += $(addprefix $(NIMBLE_EXTMOD_DIR)/, \
 	nimble/nimble_npl_os.c \

From b799fe142117f5c503c9c73fbe5f1cb4479d6f7b Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Fri, 27 Nov 2020 00:17:56 +1100
Subject: [PATCH 0452/3533] docs/library/ubluetooth.rst: Add bonding docs.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 docs/library/ubluetooth.rst | 51 +++++++++++++++++++++++++++++--------
 1 file changed, 40 insertions(+), 11 deletions(-)

diff --git a/docs/library/ubluetooth.rst b/docs/library/ubluetooth.rst
index 594d73c87824b..9ce400e7eb047 100644
--- a/docs/library/ubluetooth.rst
+++ b/docs/library/ubluetooth.rst
@@ -8,7 +8,7 @@ This module provides an interface to a Bluetooth controller on a board.
 Currently this supports Bluetooth Low Energy (BLE) in Central, Peripheral,
 Broadcaster, and Observer roles, as well as GATT Server and Client and L2CAP
 connection-oriented-channels. A device may operate in multiple roles
-concurrently.
+concurrently. Pairing (and bonding) is supported on some ports.
 
 This API is intended to match the low-level Bluetooth protocol and provide
 building-blocks for higher-level abstractions such as specific device types.
@@ -96,7 +96,8 @@ Configuration
         _IO_CAPABILITY_NO_INPUT_OUTPUT = const(3)
         _IO_CAPABILITY_KEYBOARD_DISPLAY = const(4)
 
-    - ``'le_secure'``: Sets whether "LE Secure" pairing is required. Default is "Legacy Pairing".
+    - ``'le_secure'``: Sets whether "LE Secure" pairing is required. Default is
+      false (i.e. allow "Legacy Pairing").
 
 Event Handling
 --------------
@@ -223,6 +224,16 @@ Event Handling
             elif event == _IRQ_ENCRYPTION_UPDATE:
                 # The encryption state has changed (likely as a result of pairing or bonding).
                 conn_handle, encrypted, authenticated, bonded, key_size = data
+            elif event == _IRQ_GET_SECRET:
+                # Return a stored secret.
+                # If key is None, return the index'th value of this sec_type.
+                # Otherwise return the corresponding value for this sec_type and key.
+                sec_type, index, key = data
+                return value
+            elif event == _IRQ_SET_SECRET:
+                # Save a secret to the store for this sec_type and key.
+                sec_type, key, value = data
+                return True
 
 The event codes are::
 
@@ -255,6 +266,8 @@ The event codes are::
     _IRQ_L2CAP_SEND_READY = const(26)
     _IRQ_CONNECTION_UPDATE = const(27)
     _IRQ_ENCRYPTION_UPDATE = const(28)
+    _IRQ_GET_SECRET = const(29)
+    _IRQ_SET_SECRET = const(30)
 
 For the ``_IRQ_GATTS_READ_REQUEST`` event, the available return codes are::
 
@@ -368,15 +381,6 @@ Central & Peripheral Roles
     Returns ``False`` if the connection handle wasn't connected, and ``True``
     otherwise.
 
-.. method:: BLE.gap_pair(conn_handle, /)
-
-    Initiate pairing with the remote device.
-
-    Before calling this, ensure that the ``io``, ``mitm``, ``le_secure``, and
-    ``bond`` configuration options are set (via :meth:`config<BLE.config>`).
-
-    On successful pairing, the ``_IRQ_ENCRYPTION_UPDATED`` event will be raised.
-
 
 GATT Server
 -----------
@@ -664,6 +668,31 @@ L2CAP connection-oriented-channels
     more channel credits and will be unable to send any more data.
 
 
+Pairing and bonding
+-------------------
+
+    Pairing allows a connection to be encrypted and authenticated via exchange
+    of secrets (with optional MITM protection via passkey authentication).
+
+    Bonding is the process of storing those secrets into non-volatile storage.
+    When bonded, a device is able to resolve a resolvable private address (RPA)
+    from another device based on the stored identity resolving key (IRK).
+    To support bonding, an application must implement the ``_IRQ_GET_SECRET``
+    and ``_IRQ_SET_SECRET`` events.
+
+    **Note:** This is currently only supported when using the NimBLE stack on
+    STM32 and Unix (not ESP32).
+
+.. method:: BLE.gap_pair(conn_handle, /)
+
+    Initiate pairing with the remote device.
+
+    Before calling this, ensure that the ``io``, ``mitm``, ``le_secure``, and
+    ``bond`` configuration options are set (via :meth:`config<BLE.config>`).
+
+    On successful pairing, the ``_IRQ_ENCRYPTION_UPDATE`` event will be raised.
+
+
 class UUID
 ----------
 

From 4bcbbfdb6cde6293085f4123090890c889cad50d Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Thu, 26 Nov 2020 23:48:34 +1100
Subject: [PATCH 0453/3533] extmod/modbluetooth: Simplify synchronous
 invoke_irq_handler signature.

Rather than dealing with the different int types, just pass them all as a
single array of mp_int_t with n_unsigned (before addr) and n_signed (after
addr).

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 extmod/modbluetooth.c | 103 ++++++++++++++++++++----------------------
 1 file changed, 49 insertions(+), 54 deletions(-)

diff --git a/extmod/modbluetooth.c b/extmod/modbluetooth.c
index a69e8418a761d..ba5333e70e90d 100644
--- a/extmod/modbluetooth.c
+++ b/extmod/modbluetooth.c
@@ -1076,10 +1076,8 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(bluetooth_ble_invoke_irq_obj, bluetooth_ble_inv
 #if MICROPY_PY_BLUETOOTH_USE_SYNC_EVENTS
 
 STATIC mp_obj_t invoke_irq_handler(uint16_t event,
-    const uint16_t *u16, size_t n_u16,
-    const uint8_t *u8, size_t n_u8,
+    const mp_int_t *numeric, size_t n_unsigned, size_t n_signed,
     const uint8_t *addr,
-    const int8_t *i8, size_t n_i8,
     const mp_obj_bluetooth_uuid_t *uuid,
     const uint8_t **data, size_t *data_len, size_t n_data) {
     mp_obj_bluetooth_ble_t *o = MP_OBJ_TO_PTR(MP_STATE_VM(bluetooth));
@@ -1095,18 +1093,15 @@ STATIC mp_obj_t invoke_irq_handler(uint16_t event,
     data_tuple->base.type = &mp_type_tuple;
     data_tuple->len = 0;
 
-    for (size_t i = 0; i < n_u16; ++i) {
-        data_tuple->items[data_tuple->len++] = MP_OBJ_NEW_SMALL_INT(u16[i]);
-    }
-    for (size_t i = 0; i < n_u8; ++i) {
-        data_tuple->items[data_tuple->len++] = MP_OBJ_NEW_SMALL_INT(u8[i]);
+    for (size_t i = 0; i < n_unsigned; ++i) {
+        data_tuple->items[data_tuple->len++] = MP_OBJ_NEW_SMALL_INT(numeric[i]);
     }
     if (addr) {
         mp_obj_memoryview_init(&mv_addr, 'B', 0, 6, (void *)addr);
         data_tuple->items[data_tuple->len++] = MP_OBJ_FROM_PTR(&mv_addr);
     }
-    for (size_t i = 0; i < n_i8; ++i) {
-        data_tuple->items[data_tuple->len++] = MP_OBJ_NEW_SMALL_INT(i8[i]);
+    for (size_t i = 0; i < n_signed; ++i) {
+        data_tuple->items[data_tuple->len++] = MP_OBJ_NEW_SMALL_INT(numeric[i + n_unsigned]);
     }
     #if MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE
     if (uuid) {
@@ -1130,32 +1125,31 @@ STATIC mp_obj_t invoke_irq_handler(uint16_t event,
     return result;
 }
 
-#define NULL_U16 NULL
-#define NULL_U8 NULL
+#define NULL_NUMERIC NULL
 #define NULL_ADDR NULL
-#define NULL_I8 NULL
 #define NULL_UUID NULL
 #define NULL_DATA NULL
 #define NULL_DATA_LEN NULL
 
 void mp_bluetooth_gap_on_connected_disconnected(uint8_t event, uint16_t conn_handle, uint8_t addr_type, const uint8_t *addr) {
-    invoke_irq_handler(event, &conn_handle, 1, &addr_type, 1, addr, NULL_I8, 0, NULL_UUID, NULL_DATA, NULL_DATA_LEN, 0);
+    mp_int_t args[] = {conn_handle, addr_type};
+    invoke_irq_handler(event, args, 2, 0, addr, NULL_UUID, NULL_DATA, NULL_DATA_LEN, 0);
 }
 
 void mp_bluetooth_gap_on_connection_update(uint16_t conn_handle, uint16_t conn_interval, uint16_t conn_latency, uint16_t supervision_timeout, uint16_t status) {
-    uint16_t args[] = {conn_handle, conn_interval, conn_latency, supervision_timeout, status};
-    invoke_irq_handler(MP_BLUETOOTH_IRQ_CONNECTION_UPDATE, args, 5, NULL_U8, 0, NULL_ADDR, NULL_I8, 0, NULL_UUID, NULL_DATA, NULL_DATA_LEN, 0);
+    mp_int_t args[] = {conn_handle, conn_interval, conn_latency, supervision_timeout, status};
+    invoke_irq_handler(MP_BLUETOOTH_IRQ_CONNECTION_UPDATE, args, 5, 0, NULL_ADDR, NULL_UUID, NULL_DATA, NULL_DATA_LEN, 0);
 }
 
 #if MICROPY_PY_BLUETOOTH_ENABLE_PAIRING_BONDING
 void mp_bluetooth_gatts_on_encryption_update(uint16_t conn_handle, bool encrypted, bool authenticated, bool bonded, uint8_t key_size) {
-    uint8_t args[] = {encrypted, authenticated, bonded, key_size};
-    invoke_irq_handler(MP_BLUETOOTH_IRQ_ENCRYPTION_UPDATE, &conn_handle, 1, args, 4, NULL_ADDR, NULL_I8, 0, NULL_UUID, NULL_DATA, NULL_DATA_LEN, 0);
+    mp_int_t args[] = {conn_handle, encrypted, authenticated, bonded, key_size};
+    invoke_irq_handler(MP_BLUETOOTH_IRQ_ENCRYPTION_UPDATE, args, 5, 0, NULL_ADDR, NULL_UUID, NULL_DATA, NULL_DATA_LEN, 0);
 }
 
 bool mp_bluetooth_gap_on_get_secret(uint8_t type, uint8_t index, const uint8_t *key, size_t key_len, const uint8_t **value, size_t *value_len) {
-    uint8_t args[] = {type, index};
-    mp_obj_t result = invoke_irq_handler(MP_BLUETOOTH_IRQ_GET_SECRET, NULL_U16, 0, args, 2, NULL_ADDR, NULL_I8, 0, NULL_UUID, &key, &key_len, 1);
+    mp_int_t args[] = {type, index};
+    mp_obj_t result = invoke_irq_handler(MP_BLUETOOTH_IRQ_GET_SECRET, args, 2, 0, NULL_ADDR, NULL_UUID, &key, &key_len, 1);
     if (result == mp_const_none) {
         return false;
     }
@@ -1167,26 +1161,27 @@ bool mp_bluetooth_gap_on_get_secret(uint8_t type, uint8_t index, const uint8_t *
 }
 
 bool mp_bluetooth_gap_on_set_secret(uint8_t type, const uint8_t *key, size_t key_len, const uint8_t *value, size_t value_len) {
+    mp_int_t args[] = { type };
     const uint8_t *data[] = {key, value};
     size_t data_len[] = {key_len, value_len};
-    mp_obj_t result = invoke_irq_handler(MP_BLUETOOTH_IRQ_SET_SECRET, NULL_U16, 0, &type, 1, NULL_ADDR, NULL_I8, 0, NULL_UUID, data, data_len, 2);
+    mp_obj_t result = invoke_irq_handler(MP_BLUETOOTH_IRQ_SET_SECRET, args, 1, 0, NULL_ADDR, NULL_UUID, data, data_len, 2);
     return mp_obj_is_true(result);
 }
 #endif // MICROPY_PY_BLUETOOTH_ENABLE_PAIRING_BONDING
 
 void mp_bluetooth_gatts_on_write(uint16_t conn_handle, uint16_t value_handle) {
-    uint16_t args[] = {conn_handle, value_handle};
-    invoke_irq_handler(MP_BLUETOOTH_IRQ_GATTS_WRITE, args, 2, NULL_U8, 0, NULL_ADDR, NULL_I8, 0, NULL_UUID, NULL_DATA, NULL_DATA_LEN, 0);
+    mp_int_t args[] = {conn_handle, value_handle};
+    invoke_irq_handler(MP_BLUETOOTH_IRQ_GATTS_WRITE, args, 2, 0, NULL_ADDR, NULL_UUID, NULL_DATA, NULL_DATA_LEN, 0);
 }
 
 void mp_bluetooth_gatts_on_indicate_complete(uint16_t conn_handle, uint16_t value_handle, uint8_t status) {
-    uint16_t args[] = {conn_handle, value_handle};
-    invoke_irq_handler(MP_BLUETOOTH_IRQ_GATTS_INDICATE_DONE, args, 2, &status, 1, NULL_ADDR, NULL_I8, 0, NULL_UUID, NULL_DATA, NULL_DATA_LEN, 0);
+    mp_int_t args[] = {conn_handle, value_handle, status};
+    invoke_irq_handler(MP_BLUETOOTH_IRQ_GATTS_INDICATE_DONE, args, 3, 0, NULL_ADDR, NULL_UUID, NULL_DATA, NULL_DATA_LEN, 0);
 }
 
 mp_int_t mp_bluetooth_gatts_on_read_request(uint16_t conn_handle, uint16_t value_handle) {
-    uint16_t args[] = {conn_handle, value_handle};
-    mp_obj_t result = invoke_irq_handler(MP_BLUETOOTH_IRQ_GATTS_READ_REQUEST, args, 2, NULL, 0, NULL_ADDR, NULL_I8, 0, NULL_UUID, NULL_DATA, NULL_DATA_LEN, 0);
+    mp_int_t args[] = {conn_handle, value_handle};
+    mp_obj_t result = invoke_irq_handler(MP_BLUETOOTH_IRQ_GATTS_READ_REQUEST, args, 2, 0, NULL_ADDR, NULL_UUID, NULL_DATA, NULL_DATA_LEN, 0);
     // Return non-zero from IRQ handler to fail the read.
     mp_int_t ret = 0;
     mp_obj_get_int_maybe(result, &ret);
@@ -1194,14 +1189,14 @@ mp_int_t mp_bluetooth_gatts_on_read_request(uint16_t conn_handle, uint16_t value
 }
 
 void mp_bluetooth_gatts_on_mtu_exchanged(uint16_t conn_handle, uint16_t value) {
-    uint16_t args[] = {conn_handle, value};
-    invoke_irq_handler(MP_BLUETOOTH_IRQ_MTU_EXCHANGED, args, 2, NULL_U8, 0, NULL_ADDR, NULL_I8, 0, NULL_UUID, NULL_DATA, NULL_DATA_LEN, 0);
+    mp_int_t args[] = {conn_handle, value};
+    invoke_irq_handler(MP_BLUETOOTH_IRQ_MTU_EXCHANGED, args, 2, 0, NULL_ADDR, NULL_UUID, NULL_DATA, NULL_DATA_LEN, 0);
 }
 
 #if MICROPY_PY_BLUETOOTH_ENABLE_L2CAP_CHANNELS
 mp_int_t mp_bluetooth_gattc_on_l2cap_accept(uint16_t conn_handle, uint16_t cid, uint16_t psm, uint16_t our_mtu, uint16_t peer_mtu) {
-    uint16_t args[] = {conn_handle, cid, psm, our_mtu, peer_mtu};
-    mp_obj_t result = invoke_irq_handler(MP_BLUETOOTH_IRQ_L2CAP_ACCEPT, args, 5, NULL_U8, 0, NULL_ADDR, NULL_I8, 0, NULL_UUID, NULL_DATA, NULL_DATA_LEN, 0);
+    mp_int_t args[] = {conn_handle, cid, psm, our_mtu, peer_mtu};
+    mp_obj_t result = invoke_irq_handler(MP_BLUETOOTH_IRQ_L2CAP_ACCEPT, args, 5, 0, NULL_ADDR, NULL_UUID, NULL_DATA, NULL_DATA_LEN, 0);
     // Return non-zero from IRQ handler to fail the accept.
     mp_int_t ret = 0;
     mp_obj_get_int_maybe(result, &ret);
@@ -1209,54 +1204,54 @@ mp_int_t mp_bluetooth_gattc_on_l2cap_accept(uint16_t conn_handle, uint16_t cid,
 }
 
 void mp_bluetooth_gattc_on_l2cap_connect(uint16_t conn_handle, uint16_t cid, uint16_t psm, uint16_t our_mtu, uint16_t peer_mtu) {
-    uint16_t args[] = {conn_handle, cid, psm, our_mtu, peer_mtu};
-    invoke_irq_handler(MP_BLUETOOTH_IRQ_L2CAP_CONNECT, args, 5, NULL_U8, 0, NULL_ADDR, NULL_I8, 0, NULL_UUID, NULL_DATA, NULL_DATA_LEN, 0);
+    mp_int_t args[] = {conn_handle, cid, psm, our_mtu, peer_mtu};
+    invoke_irq_handler(MP_BLUETOOTH_IRQ_L2CAP_CONNECT, args, 5, 0, NULL_ADDR, NULL_UUID, NULL_DATA, NULL_DATA_LEN, 0);
 }
 
 void mp_bluetooth_gattc_on_l2cap_disconnect(uint16_t conn_handle, uint16_t cid, uint16_t psm, uint16_t status) {
-    uint16_t args[] = {conn_handle, cid, psm, status};
-    invoke_irq_handler(MP_BLUETOOTH_IRQ_L2CAP_DISCONNECT, args, 4, NULL_U8, 0, NULL_ADDR, NULL_I8, 0, NULL_UUID, NULL_DATA, NULL_DATA_LEN, 0);
+    mp_int_t args[] = {conn_handle, cid, psm, status};
+    invoke_irq_handler(MP_BLUETOOTH_IRQ_L2CAP_DISCONNECT, args, 4, 0, NULL_ADDR, NULL_UUID, NULL_DATA, NULL_DATA_LEN, 0);
 }
 
 void mp_bluetooth_gattc_on_l2cap_send_ready(uint16_t conn_handle, uint16_t cid, uint8_t status) {
-    uint16_t args[] = {conn_handle, cid};
-    invoke_irq_handler(MP_BLUETOOTH_IRQ_L2CAP_SEND_READY, args, 2, &status, 1, NULL_ADDR, NULL_I8, 0, NULL_UUID, NULL_DATA, NULL_DATA_LEN, 0);
+    mp_int_t args[] = {conn_handle, cid, status};
+    invoke_irq_handler(MP_BLUETOOTH_IRQ_L2CAP_SEND_READY, args, 3, 0, NULL_ADDR, NULL_UUID, NULL_DATA, NULL_DATA_LEN, 0);
 }
 
 void mp_bluetooth_gattc_on_l2cap_recv(uint16_t conn_handle, uint16_t cid) {
-    uint16_t args[] = {conn_handle, cid};
-    invoke_irq_handler(MP_BLUETOOTH_IRQ_L2CAP_RECV, args, 2, NULL_U8, 0, NULL_ADDR, NULL_I8, 0, NULL_UUID, NULL_DATA, NULL_DATA_LEN, 0);
+    mp_int_t args[] = {conn_handle, cid};
+    invoke_irq_handler(MP_BLUETOOTH_IRQ_L2CAP_RECV, args, 2, 0, NULL_ADDR, NULL_UUID, NULL_DATA, NULL_DATA_LEN, 0);
 }
 #endif // MICROPY_PY_BLUETOOTH_ENABLE_L2CAP_CHANNELS
 
 #if MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE
 void mp_bluetooth_gap_on_scan_complete(void) {
-    invoke_irq_handler(MP_BLUETOOTH_IRQ_SCAN_DONE, NULL_U16, 0, NULL_U8, 0, NULL_ADDR, NULL_I8, 0, NULL_UUID, NULL_DATA, NULL_DATA_LEN, 0);
+    invoke_irq_handler(MP_BLUETOOTH_IRQ_SCAN_DONE, NULL_NUMERIC, 0, 0, NULL_ADDR, NULL_UUID, NULL_DATA, NULL_DATA_LEN, 0);
 }
 
 void mp_bluetooth_gap_on_scan_result(uint8_t addr_type, const uint8_t *addr, uint8_t adv_type, const int8_t rssi, const uint8_t *data, size_t data_len) {
-    int8_t args[] = {adv_type, rssi};
-    invoke_irq_handler(MP_BLUETOOTH_IRQ_SCAN_RESULT, NULL_U16, 0, &addr_type, 1, addr, args, 2, NULL_UUID, &data, &data_len, 1);
+    mp_int_t args[] = {addr_type, adv_type, rssi};
+    invoke_irq_handler(MP_BLUETOOTH_IRQ_SCAN_RESULT, args, 1, 2, addr, NULL_UUID, &data, &data_len, 1);
 }
 
 void mp_bluetooth_gattc_on_primary_service_result(uint16_t conn_handle, uint16_t start_handle, uint16_t end_handle, mp_obj_bluetooth_uuid_t *service_uuid) {
-    uint16_t args[] = {conn_handle, start_handle, end_handle};
-    invoke_irq_handler(MP_BLUETOOTH_IRQ_GATTC_SERVICE_RESULT, args, 3, NULL_U8, 0, NULL_ADDR, NULL_I8, 0, service_uuid, NULL_DATA, NULL_DATA_LEN, 0);
+    mp_int_t args[] = {conn_handle, start_handle, end_handle};
+    invoke_irq_handler(MP_BLUETOOTH_IRQ_GATTC_SERVICE_RESULT, args, 3, 0, NULL_ADDR, service_uuid, NULL_DATA, NULL_DATA_LEN, 0);
 }
 
 void mp_bluetooth_gattc_on_characteristic_result(uint16_t conn_handle, uint16_t def_handle, uint16_t value_handle, uint8_t properties, mp_obj_bluetooth_uuid_t *characteristic_uuid) {
-    uint16_t args[] = {conn_handle, def_handle, value_handle};
-    invoke_irq_handler(MP_BLUETOOTH_IRQ_GATTC_CHARACTERISTIC_RESULT, args, 3, &properties, 1, NULL_ADDR, NULL_I8, 0, characteristic_uuid, NULL_DATA, NULL_DATA_LEN, 0);
+    mp_int_t args[] = {conn_handle, def_handle, value_handle, properties};
+    invoke_irq_handler(MP_BLUETOOTH_IRQ_GATTC_CHARACTERISTIC_RESULT, args, 4, 0, NULL_ADDR, characteristic_uuid, NULL_DATA, NULL_DATA_LEN, 0);
 }
 
 void mp_bluetooth_gattc_on_descriptor_result(uint16_t conn_handle, uint16_t handle, mp_obj_bluetooth_uuid_t *descriptor_uuid) {
-    uint16_t args[] = {conn_handle, handle};
-    invoke_irq_handler(MP_BLUETOOTH_IRQ_GATTC_DESCRIPTOR_RESULT, args, 2, NULL_U8, 0, NULL_ADDR, NULL_I8, 0, descriptor_uuid, NULL_DATA, NULL_DATA_LEN, 0);
+    mp_int_t args[] = {conn_handle, handle};
+    invoke_irq_handler(MP_BLUETOOTH_IRQ_GATTC_DESCRIPTOR_RESULT, args, 2, 0, NULL_ADDR, descriptor_uuid, NULL_DATA, NULL_DATA_LEN, 0);
 }
 
 void mp_bluetooth_gattc_on_discover_complete(uint8_t event, uint16_t conn_handle, uint16_t status) {
-    uint16_t args[] = {conn_handle, status};
-    invoke_irq_handler(event, args, 2, NULL_U8, 0, NULL_ADDR, NULL_I8, 0, NULL_UUID, NULL_DATA, NULL_DATA_LEN, 0);
+    mp_int_t args[] = {conn_handle, status};
+    invoke_irq_handler(event, args, 2, 0, NULL_ADDR, NULL_UUID, NULL_DATA, NULL_DATA_LEN, 0);
 }
 
 void mp_bluetooth_gattc_on_data_available(uint8_t event, uint16_t conn_handle, uint16_t value_handle, const uint8_t **data, uint16_t *data_len, size_t num) {
@@ -1283,8 +1278,8 @@ void mp_bluetooth_gattc_on_data_available(uint8_t event, uint16_t conn_handle, u
         total_len = *data_len;
     }
 
-    uint16_t args[] = {conn_handle, value_handle};
-    invoke_irq_handler(event, args, 2, NULL_U8, 0, NULL_ADDR, NULL_I8, 0, NULL_UUID, &combined_data, &total_len, 1);
+    mp_int_t args[] = {conn_handle, value_handle};
+    invoke_irq_handler(event, args, 2, 0, NULL_ADDR, NULL_UUID, &combined_data, &total_len, 1);
 
     if (num > 1) {
         m_del(uint8_t, (uint8_t *)combined_data, total_len);
@@ -1292,8 +1287,8 @@ void mp_bluetooth_gattc_on_data_available(uint8_t event, uint16_t conn_handle, u
 }
 
 void mp_bluetooth_gattc_on_read_write_status(uint8_t event, uint16_t conn_handle, uint16_t value_handle, uint16_t status) {
-    uint16_t args[] = {conn_handle, value_handle, status};
-    invoke_irq_handler(event, args, 3, NULL_U8, 0, NULL_ADDR, NULL_I8, 0, NULL_UUID, NULL_DATA, NULL_DATA_LEN, 0);
+    mp_int_t args[] = {conn_handle, value_handle, status};
+    invoke_irq_handler(event, args, 3, 0, NULL_ADDR, NULL_UUID, NULL_DATA, NULL_DATA_LEN, 0);
 }
 
 #endif // MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE

From e4f27cbee767d24f8e05678a484a584ec6fbe974 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Thu, 26 Nov 2020 23:49:45 +1100
Subject: [PATCH 0454/3533] extmod/modbluetooth: Add support for passkey
 authentication.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 extmod/modbluetooth.c               | 14 +++++++++++
 extmod/modbluetooth.h               | 20 ++++++++++++++++
 extmod/nimble/modbluetooth_nimble.c | 37 +++++++++++++++++++++++++++++
 3 files changed, 71 insertions(+)

diff --git a/extmod/modbluetooth.c b/extmod/modbluetooth.c
index ba5333e70e90d..caaf872e7ddf4 100644
--- a/extmod/modbluetooth.c
+++ b/extmod/modbluetooth.c
@@ -689,6 +689,14 @@ STATIC mp_obj_t bluetooth_ble_gap_pair(mp_obj_t self_in, mp_obj_t conn_handle_in
     return bluetooth_handle_errno(mp_bluetooth_gap_pair(conn_handle));
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_2(bluetooth_ble_gap_pair_obj, bluetooth_ble_gap_pair);
+
+STATIC mp_obj_t bluetooth_ble_gap_passkey(size_t n_args, const mp_obj_t *args) {
+    uint16_t conn_handle = mp_obj_get_int(args[1]);
+    uint8_t action = mp_obj_get_int(args[2]);
+    mp_int_t passkey = mp_obj_get_int(args[3]);
+    return bluetooth_handle_errno(mp_bluetooth_gap_passkey(conn_handle, action, passkey));
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(bluetooth_ble_gap_passkey_obj, 4, 4, bluetooth_ble_gap_passkey);
 #endif // MICROPY_PY_BLUETOOTH_ENABLE_PAIRING_BONDING
 
 // ----------------------------------------------------------------------------
@@ -894,6 +902,7 @@ STATIC const mp_rom_map_elem_t bluetooth_ble_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_gap_disconnect), MP_ROM_PTR(&bluetooth_ble_gap_disconnect_obj) },
     #if MICROPY_PY_BLUETOOTH_ENABLE_PAIRING_BONDING
     { MP_ROM_QSTR(MP_QSTR_gap_pair), MP_ROM_PTR(&bluetooth_ble_gap_pair_obj) },
+    { MP_ROM_QSTR(MP_QSTR_gap_passkey), MP_ROM_PTR(&bluetooth_ble_gap_passkey_obj) },
     #endif
     // GATT Server (i.e. peripheral/advertiser role)
     { MP_ROM_QSTR(MP_QSTR_gatts_register_services), MP_ROM_PTR(&bluetooth_ble_gatts_register_services_obj) },
@@ -1167,6 +1176,11 @@ bool mp_bluetooth_gap_on_set_secret(uint8_t type, const uint8_t *key, size_t key
     mp_obj_t result = invoke_irq_handler(MP_BLUETOOTH_IRQ_SET_SECRET, args, 1, 0, NULL_ADDR, NULL_UUID, data, data_len, 2);
     return mp_obj_is_true(result);
 }
+
+void mp_bluetooth_gap_on_passkey_action(uint16_t conn_handle, uint8_t action, mp_int_t passkey) {
+    mp_int_t args[] = { conn_handle, action, passkey };
+    invoke_irq_handler(MP_BLUETOOTH_IRQ_PASSKEY_ACTION, args, 2, 1, NULL_ADDR, NULL_UUID, NULL_DATA, NULL_DATA_LEN, 0);
+}
 #endif // MICROPY_PY_BLUETOOTH_ENABLE_PAIRING_BONDING
 
 void mp_bluetooth_gatts_on_write(uint16_t conn_handle, uint16_t value_handle) {
diff --git a/extmod/modbluetooth.h b/extmod/modbluetooth.h
index d79b7f56b9828..f14033de302e2 100644
--- a/extmod/modbluetooth.h
+++ b/extmod/modbluetooth.h
@@ -148,6 +148,7 @@
 #define MP_BLUETOOTH_IRQ_ENCRYPTION_UPDATE              (28)
 #define MP_BLUETOOTH_IRQ_GET_SECRET                     (29)
 #define MP_BLUETOOTH_IRQ_SET_SECRET                     (30)
+#define MP_BLUETOOTH_IRQ_PASSKEY_ACTION                 (31)
 
 #define MP_BLUETOOTH_ADDRESS_MODE_PUBLIC (0)
 #define MP_BLUETOOTH_ADDRESS_MODE_RANDOM (1)
@@ -167,6 +168,12 @@
 #define MP_BLUETOOTH_PASSKEY_ACTION_DISPLAY             (3)
 #define MP_BLUETOOTH_PASSKEY_ACTION_NUMERIC_COMPARISON  (4)
 
+// These match NimBLE BLE_SM_IOACT_.
+#define MP_BLUETOOTH_PASSKEY_ACTION_NONE                (0)
+#define MP_BLUETOOTH_PASSKEY_ACTION_INPUT               (2)
+#define MP_BLUETOOTH_PASSKEY_ACTION_DISPLAY             (3)
+#define MP_BLUETOOTH_PASSKEY_ACTION_NUMERIC_COMPARISON  (4)
+
 /*
 These aren't included in the module for space reasons, but can be used
 in your Python code if necessary.
@@ -202,6 +209,7 @@ _IRQ_CONNECTION_UPDATE = const(27)
 _IRQ_ENCRYPTION_UPDATE = const(28)
 _IRQ_GET_SECRET = const(29)
 _IRQ_SET_SECRET = const(30)
+_IRQ_PASSKEY_ACTION = const(31)
 
 _FLAG_BROADCAST = const(0x0001)
 _FLAG_READ = const(0x0002)
@@ -231,6 +239,11 @@ _IO_CAPABILITY_DISPLAY_YESNO = const(1)
 _IO_CAPABILITY_KEYBOARD_ONLY = const(2)
 _IO_CAPABILITY_NO_INPUT_OUTPUT = const(3)
 _IO_CAPABILITY_KEYBOARD_DISPLAY = const(4)
+
+_PASSKEY_ACTION_NONE = const(0)
+_PASSKEY_ACTION_INPUT = const(2)
+_PASSKEY_ACTION_DISPLAY = const(3)
+_PASSKEY_ACTION_NUMERIC_COMPARISON = const(4)
 */
 
 // bluetooth.UUID type.
@@ -332,6 +345,9 @@ int mp_bluetooth_set_preferred_mtu(uint16_t mtu);
 #if MICROPY_PY_BLUETOOTH_ENABLE_PAIRING_BONDING
 // Initiate pairing on the specified connection.
 int mp_bluetooth_gap_pair(uint16_t conn_handle);
+
+// Respond to a pairing request.
+int mp_bluetooth_gap_passkey(uint16_t conn_handle, uint8_t action, mp_int_t passkey);
 #endif // MICROPY_PY_BLUETOOTH_ENABLE_PAIRING_BONDING
 
 #if MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE
@@ -387,8 +403,12 @@ void mp_bluetooth_gatts_on_encryption_update(uint16_t conn_handle, bool encrypte
 // Call this when you need the application to manage persistent key data.
 // For get, if key is NULL, then the implementation must return the index'th matching key. Otherwise it should return a specific key.
 // For set, if value is NULL, then delete.
+// The "type" is stack-specific, but could also be used to implement versioning.
 bool mp_bluetooth_gap_on_get_secret(uint8_t type, uint8_t index, const uint8_t *key, size_t key_len, const uint8_t **value, size_t *value_len);
 bool mp_bluetooth_gap_on_set_secret(uint8_t type, const uint8_t *key, size_t key_len, const uint8_t *value, size_t value_len);
+
+// Call this when a passkey verification needs to be processed.
+void mp_bluetooth_gap_on_passkey_action(uint16_t conn_handle, uint8_t action, mp_int_t passkey);
 #endif // MICROPY_PY_BLUETOOTH_ENABLE_PAIRING_BONDING
 
 // Call this when a characteristic is written to.
diff --git a/extmod/nimble/modbluetooth_nimble.c b/extmod/nimble/modbluetooth_nimble.c
index 2b273c6bc7962..ae727086eaeda 100644
--- a/extmod/nimble/modbluetooth_nimble.c
+++ b/extmod/nimble/modbluetooth_nimble.c
@@ -347,6 +347,16 @@ STATIC int gap_event_cb(struct ble_gap_event *event, void *arg) {
             return BLE_GAP_REPEAT_PAIRING_RETRY;
         }
 
+        case BLE_GAP_EVENT_PASSKEY_ACTION: {
+            DEBUG_printf("gap_event_cb: passkey action: conn_handle=%d action=%d num=" UINT_FMT "\n", event->passkey.conn_handle, event->passkey.params.action, (mp_uint_t)event->passkey.params.numcmp);
+
+            #if MICROPY_PY_BLUETOOTH_ENABLE_PAIRING_BONDING
+            mp_bluetooth_gap_on_passkey_action(event->passkey.conn_handle, event->passkey.params.action, event->passkey.params.numcmp);
+            #endif
+
+            return 0;
+        }
+
         default:
             DEBUG_printf("gap_event_cb: unknown type %d\n", event->type);
             break;
@@ -886,6 +896,33 @@ int mp_bluetooth_gap_pair(uint16_t conn_handle) {
     DEBUG_printf("mp_bluetooth_gap_pair: conn_handle=%d\n", conn_handle);
     return ble_hs_err_to_errno(ble_gap_security_initiate(conn_handle));
 }
+
+int mp_bluetooth_gap_passkey(uint16_t conn_handle, uint8_t action, mp_int_t passkey) {
+    struct ble_sm_io io = {0};
+
+    switch (action) {
+        case MP_BLUETOOTH_PASSKEY_ACTION_INPUT: {
+            io.passkey = passkey;
+            break;
+        }
+        case MP_BLUETOOTH_PASSKEY_ACTION_DISPLAY: {
+            io.passkey = passkey;
+            break;
+        }
+        case MP_BLUETOOTH_PASSKEY_ACTION_NUMERIC_COMPARISON: {
+            io.numcmp_accept = passkey != 0;
+            break;
+        }
+        default: {
+            return MP_EINVAL;
+        }
+    }
+
+    io.action = action;
+
+    DEBUG_printf("mp_bluetooth_gap_passkey: injecting IO: conn_handle=%d, action=%d, passkey=" UINT_FMT ", numcmp_accept=%d\n", conn_handle, io.action, (mp_uint_t)io.passkey, io.numcmp_accept);
+    return ble_hs_err_to_errno(ble_sm_inject_io(conn_handle, &io));
+}
 #endif // MICROPY_PY_BLUETOOTH_ENABLE_PAIRING_BONDING
 
 #if MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE

From f6fd46c4024c28c827ccffd13dbe02b9ea74cfb8 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Thu, 26 Nov 2020 23:54:56 +1100
Subject: [PATCH 0455/3533] examples/bluetooth: Add bonding/passkey demo.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 examples/bluetooth/ble_bonding_peripheral.py | 194 +++++++++++++++++++
 1 file changed, 194 insertions(+)
 create mode 100644 examples/bluetooth/ble_bonding_peripheral.py

diff --git a/examples/bluetooth/ble_bonding_peripheral.py b/examples/bluetooth/ble_bonding_peripheral.py
new file mode 100644
index 0000000000000..bd7596dbcb347
--- /dev/null
+++ b/examples/bluetooth/ble_bonding_peripheral.py
@@ -0,0 +1,194 @@
+# This example demonstrates a simple temperature sensor peripheral.
+#
+# The sensor's local value updates every second, and it will notify
+# any connected central every 10 seconds.
+#
+# Work-in-progress demo of implementing bonding and passkey auth.
+
+import bluetooth
+import random
+import struct
+import time
+import json
+import binascii
+from ble_advertising import advertising_payload
+
+from micropython import const
+
+_IRQ_CENTRAL_CONNECT = const(1)
+_IRQ_CENTRAL_DISCONNECT = const(2)
+_IRQ_GATTS_INDICATE_DONE = const(20)
+
+_IRQ_ENCRYPTION_UPDATE = const(28)
+_IRQ_PASSKEY_ACTION = const(31)
+
+_IRQ_GET_SECRET = const(29)
+_IRQ_SET_SECRET = const(30)
+
+_FLAG_READ = const(0x0002)
+_FLAG_NOTIFY = const(0x0010)
+_FLAG_INDICATE = const(0x0020)
+
+_FLAG_READ_ENCRYPTED = const(0x0200)
+
+# org.bluetooth.service.environmental_sensing
+_ENV_SENSE_UUID = bluetooth.UUID(0x181A)
+# org.bluetooth.characteristic.temperature
+_TEMP_CHAR = (
+    bluetooth.UUID(0x2A6E),
+    _FLAG_READ | _FLAG_NOTIFY | _FLAG_INDICATE | _FLAG_READ_ENCRYPTED,
+)
+_ENV_SENSE_SERVICE = (
+    _ENV_SENSE_UUID,
+    (_TEMP_CHAR,),
+)
+
+# org.bluetooth.characteristic.gap.appearance.xml
+_ADV_APPEARANCE_GENERIC_THERMOMETER = const(768)
+
+_IO_CAPABILITY_DISPLAY_ONLY = const(0)
+_IO_CAPABILITY_DISPLAY_YESNO = const(1)
+_IO_CAPABILITY_KEYBOARD_ONLY = const(2)
+_IO_CAPABILITY_NO_INPUT_OUTPUT = const(3)
+_IO_CAPABILITY_KEYBOARD_DISPLAY = const(4)
+
+_PASSKEY_ACTION_INPUT = const(2)
+_PASSKEY_ACTION_DISP = const(3)
+_PASSKEY_ACTION_NUMCMP = const(4)
+
+
+class BLETemperature:
+    def __init__(self, ble, name="mpy-temp"):
+        self._ble = ble
+        self._load_secrets()
+        self._ble.irq(self._irq)
+        self._ble.config(bond=True)
+        self._ble.config(le_secure=True)
+        self._ble.config(mitm=True)
+        self._ble.config(io=_IO_CAPABILITY_DISPLAY_YESNO)
+        self._ble.active(True)
+        self._ble.config(addr_mode=2)
+        ((self._handle,),) = self._ble.gatts_register_services((_ENV_SENSE_SERVICE,))
+        self._connections = set()
+        self._payload = advertising_payload(
+            name=name, services=[_ENV_SENSE_UUID], appearance=_ADV_APPEARANCE_GENERIC_THERMOMETER
+        )
+        self._advertise()
+
+    def _irq(self, event, data):
+        # Track connections so we can send notifications.
+        if event == _IRQ_CENTRAL_CONNECT:
+            conn_handle, _, _ = data
+            self._connections.add(conn_handle)
+        elif event == _IRQ_CENTRAL_DISCONNECT:
+            conn_handle, _, _ = data
+            self._connections.remove(conn_handle)
+            self._save_secrets()
+            # Start advertising again to allow a new connection.
+            self._advertise()
+        elif event == _IRQ_ENCRYPTION_UPDATE:
+            conn_handle, encrypted, authenticated, bonded, key_size = data
+            print("encryption update", conn_handle, encrypted, authenticated, bonded, key_size)
+        elif event == _IRQ_PASSKEY_ACTION:
+            conn_handle, action, passkey = data
+            print("passkey action", conn_handle, action, passkey)
+            if action == _PASSKEY_ACTION_NUMCMP:
+                accept = int(input("accept? "))
+                self._ble.gap_passkey(conn_handle, action, accept)
+            elif action == _PASSKEY_ACTION_DISP:
+                print("displaying 123456")
+                self._ble.gap_passkey(conn_handle, action, 123456)
+            elif action == _PASSKEY_ACTION_INPUT:
+                print("prompting for passkey")
+                passkey = int(input("passkey? "))
+                self._ble.gap_passkey(conn_handle, action, passkey)
+            else:
+                print("unknown action")
+        elif event == _IRQ_GATTS_INDICATE_DONE:
+            conn_handle, value_handle, status = data
+        elif event == _IRQ_SET_SECRET:
+            sec_type, key, value = data
+            key = sec_type, bytes(key)
+            value = bytes(value) if value else None
+            print("set secret:", key, value)
+            if value is None:
+                if key in self._secrets:
+                    del self._secrets[key]
+                    return True
+                else:
+                    return False
+            else:
+                self._secrets[key] = value
+            return True
+        elif event == _IRQ_GET_SECRET:
+            sec_type, index, key = data
+            print("get secret:", sec_type, index, bytes(key) if key else None)
+            if key is None:
+                i = 0
+                for (t, _key), value in self._secrets.items():
+                    if t == sec_type:
+                        if i == index:
+                            return value
+                        i += 1
+                return None
+            else:
+                key = sec_type, bytes(key)
+                return self._secrets.get(key, None)
+
+    def set_temperature(self, temp_deg_c, notify=False, indicate=False):
+        # Data is sint16 in degrees Celsius with a resolution of 0.01 degrees Celsius.
+        # Write the local value, ready for a central to read.
+        self._ble.gatts_write(self._handle, struct.pack("<h", int(temp_deg_c * 100)))
+        if notify or indicate:
+            for conn_handle in self._connections:
+                if notify:
+                    # Notify connected centrals.
+                    self._ble.gatts_notify(conn_handle, self._handle)
+                if indicate:
+                    # Indicate connected centrals.
+                    self._ble.gatts_indicate(conn_handle, self._handle)
+
+    def _advertise(self, interval_us=500000):
+        self._ble.config(addr_mode=2)
+        self._ble.gap_advertise(interval_us, adv_data=self._payload)
+
+    def _load_secrets(self):
+        self._secrets = {}
+        try:
+            with open("secrets.json", "r") as f:
+                entries = json.load(f)
+                for sec_type, key, value in entries:
+                    self._secrets[sec_type, binascii.a2b_base64(key)] = binascii.a2b_base64(value)
+        except:
+            print("no secrets available")
+
+    def _save_secrets(self):
+        try:
+            with open("secrets.json", "w") as f:
+                json_secrets = [
+                    (sec_type, binascii.b2a_base64(key), binascii.b2a_base64(value))
+                    for (sec_type, key), value in self._secrets.items()
+                ]
+                json.dump(json_secrets, f)
+        except:
+            print("failed to save secrets")
+
+
+def demo():
+    ble = bluetooth.BLE()
+    temp = BLETemperature(ble)
+
+    t = 25
+    i = 0
+
+    while True:
+        # Write every second, notify every 10 seconds.
+        i = (i + 1) % 10
+        temp.set_temperature(t, notify=i == 0, indicate=False)
+        # Random walk the temperature.
+        t += random.uniform(-0.5, 0.5)
+        time.sleep_ms(1000)
+
+
+if __name__ == "__main__":
+    demo()

From 68136eb4babeafa26de1e06565fcf69e8f10d136 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Fri, 27 Nov 2020 00:32:26 +1100
Subject: [PATCH 0456/3533] docs/library/ubluetooth.rst: Add passkey docs.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 docs/library/ubluetooth.rst | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/docs/library/ubluetooth.rst b/docs/library/ubluetooth.rst
index 9ce400e7eb047..3d435a7beda5a 100644
--- a/docs/library/ubluetooth.rst
+++ b/docs/library/ubluetooth.rst
@@ -234,6 +234,13 @@ Event Handling
                 # Save a secret to the store for this sec_type and key.
                 sec_type, key, value = data
                 return True
+            elif event == _IRQ_PASSKEY_ACTION:
+                # Respond to a passkey request during pairing.
+                # See gap_passkey() for details.
+                # action will be an action that is compatible with the configured "io" config.
+                # passkey will be non-zero if action is "numeric comparison".
+                conn_handle, action, passkey = data
+
 
 The event codes are::
 
@@ -278,6 +285,13 @@ For the ``_IRQ_GATTS_READ_REQUEST`` event, the available return codes are::
     _GATTS_ERROR_INSUFFICIENT_AUTHORIZATION = const(0x08)
     _GATTS_ERROR_INSUFFICIENT_ENCRYPTION = const(0x0f)
 
+For the ``_IRQ_PASSKEY_ACTION`` event, the available actions are::
+
+    _PASSKEY_ACTION_NONE = const(0)
+    _PASSKEY_ACTION_INPUT = const(2)
+    _PASSKEY_ACTION_DISPLAY = const(3)
+    _PASSKEY_ACTION_NUMERIC_COMPARISON = const(4)
+
 In order to save space in the firmware, these constants are not included on the
 :mod:`ubluetooth` module. Add the ones that you need from the list above to your
 program.
@@ -692,6 +706,22 @@ Pairing and bonding
 
     On successful pairing, the ``_IRQ_ENCRYPTION_UPDATE`` event will be raised.
 
+.. method:: BLE.gap_passkey(conn_handle, action, passkey, /)
+
+    Respond to a ``_IRQ_PASSKEY_ACTION`` event for the specified *conn_handle*
+    and *action*.
+
+    The *passkey* is a numeric value and will depend on on the
+    *action* (which will depend on what I/O capability has been set):
+
+        * When the *action* is ``_PASSKEY_ACTION_INPUT``, then the application should
+          prompt the user to enter the passkey that is shown on the remote device.
+        * When the *action* is ``_PASSKEY_ACTION_DISPLAY``, then the application should
+          generate a random 6-digit passkey and show it to the user.
+        * When the *action* is ``_PASSKEY_ACTION_NUMERIC_COMPARISON``, then the application
+          should show the passkey that was provided in the ``_IRQ_PASSKEY_ACTION`` event
+          and then respond with either ``0`` (cancel pairing), or ``1`` (accept pairing).
+
 
 class UUID
 ----------

From d79b9c6c7cb42c69c15d1b7869a04e889d812b82 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Fri, 27 Nov 2020 17:08:22 +1100
Subject: [PATCH 0457/3533] extmod/nimble: Generate and persist a unique IRK.

This provides a workaround for
https://github.com/apache/mynewt-nimble/issues/887.

Without this, all devices would share a fixed default IRK.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 extmod/nimble/modbluetooth_nimble.c | 58 +++++++++++++++++++++++++++++
 1 file changed, 58 insertions(+)

diff --git a/extmod/nimble/modbluetooth_nimble.c b/extmod/nimble/modbluetooth_nimble.c
index ae727086eaeda..613e325a953f5 100644
--- a/extmod/nimble/modbluetooth_nimble.c
+++ b/extmod/nimble/modbluetooth_nimble.c
@@ -189,6 +189,59 @@ STATIC void set_random_address(bool nrpa) {
     assert(rc == 0);
 }
 
+#if MICROPY_PY_BLUETOOTH_ENABLE_PAIRING_BONDING
+// For ble_hs_pvcy_set_our_irk
+#include "nimble/host/src/ble_hs_pvcy_priv.h"
+// For ble_hs_hci_util_rand
+#include "nimble/host/src/ble_hs_hci_priv.h"
+// For ble_hs_misc_restore_irks
+#include "nimble/host/src/ble_hs_priv.h"
+
+// Must be distinct to BLE_STORE_OBJ_TYPE_ in ble_store.h.
+#define SECRET_TYPE_OUR_IRK 10
+
+STATIC int load_irk(void) {
+    // NimBLE unconditionally loads a fixed IRK on startup.
+    // See https://github.com/apache/mynewt-nimble/issues/887
+
+    // Dummy key to use for the store.
+    // Technically the secret type is enough as there will only be
+    // one IRK so the key doesn't matter, but a NULL (None) key means "search".
+    const uint8_t key[3] = {'i', 'r', 'k'};
+
+    int rc;
+    const uint8_t *irk;
+    size_t irk_len;
+    if (mp_bluetooth_gap_on_get_secret(SECRET_TYPE_OUR_IRK, 0, key, sizeof(key), &irk, &irk_len) && irk_len == 16) {
+        DEBUG_printf("load_irk: Applying IRK from store.\n");
+        rc = ble_hs_pvcy_set_our_irk(irk);
+        if (rc) {
+            return rc;
+        }
+    } else {
+        DEBUG_printf("load_irk: Generating new IRK.\n");
+        uint8_t rand_irk[16];
+        rc = ble_hs_hci_util_rand(rand_irk, 16);
+        if (rc) {
+            return rc;
+        }
+        DEBUG_printf("load_irk: Saving new IRK.\n");
+        if (!mp_bluetooth_gap_on_set_secret(SECRET_TYPE_OUR_IRK, key, sizeof(key), rand_irk, 16)) {
+            return BLE_HS_EINVAL;
+        }
+        DEBUG_printf("load_irk: Applying new IRK.\n");
+        rc = ble_hs_pvcy_set_our_irk(rand_irk);
+        if (rc) {
+            return rc;
+        }
+    }
+
+    // Loading an IRK will clear all peer IRKs, so reload them from the store.
+    rc = ble_hs_misc_restore_irks();
+    return rc;
+}
+#endif
+
 STATIC void sync_cb(void) {
     int rc;
     (void)rc;
@@ -199,6 +252,11 @@ STATIC void sync_cb(void) {
         return;
     }
 
+    #if MICROPY_PY_BLUETOOTH_ENABLE_PAIRING_BONDING
+    rc = load_irk();
+    assert(rc == 0);
+    #endif
+
     if (has_public_address()) {
         nimble_address_mode = BLE_OWN_ADDR_PUBLIC;
     } else {

From c8b055717805500494a14870a4200bbc933fe337 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 1 Dec 2020 22:00:02 +1100
Subject: [PATCH 0458/3533] tests/multi_bluetooth: Add multitests for BLE
 pairing and bonding.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/multi_bluetooth/ble_gap_pair.py         | 129 +++++++++++++++++
 tests/multi_bluetooth/ble_gap_pair.py.exp     |  17 +++
 tests/multi_bluetooth/ble_gap_pair_bond.py    | 134 ++++++++++++++++++
 .../multi_bluetooth/ble_gap_pair_bond.py.exp  |  17 +++
 4 files changed, 297 insertions(+)
 create mode 100644 tests/multi_bluetooth/ble_gap_pair.py
 create mode 100644 tests/multi_bluetooth/ble_gap_pair.py.exp
 create mode 100644 tests/multi_bluetooth/ble_gap_pair_bond.py
 create mode 100644 tests/multi_bluetooth/ble_gap_pair_bond.py.exp

diff --git a/tests/multi_bluetooth/ble_gap_pair.py b/tests/multi_bluetooth/ble_gap_pair.py
new file mode 100644
index 0000000000000..728513405ee79
--- /dev/null
+++ b/tests/multi_bluetooth/ble_gap_pair.py
@@ -0,0 +1,129 @@
+# Test BLE GAP connect/disconnect with pairing, and read an encrypted characteristic
+# TODO: add gap_passkey testing
+
+from micropython import const
+import time, machine, bluetooth
+
+TIMEOUT_MS = 4000
+
+_IRQ_CENTRAL_CONNECT = const(1)
+_IRQ_CENTRAL_DISCONNECT = const(2)
+_IRQ_GATTS_READ_REQUEST = const(4)
+_IRQ_PERIPHERAL_CONNECT = const(7)
+_IRQ_PERIPHERAL_DISCONNECT = const(8)
+_IRQ_GATTC_CHARACTERISTIC_RESULT = const(11)
+_IRQ_GATTC_CHARACTERISTIC_DONE = const(12)
+_IRQ_GATTC_READ_RESULT = const(15)
+_IRQ_ENCRYPTION_UPDATE = const(28)
+
+_FLAG_READ = const(0x0002)
+_FLAG_READ_ENCRYPTED = const(0x0200)
+
+SERVICE_UUID = bluetooth.UUID("A5A5A5A5-FFFF-9999-1111-5A5A5A5A5A5A")
+CHAR_UUID = bluetooth.UUID("00000000-1111-2222-3333-444444444444")
+CHAR = (CHAR_UUID, _FLAG_READ | _FLAG_READ_ENCRYPTED)
+SERVICE = (SERVICE_UUID, (CHAR,))
+
+waiting_events = {}
+
+
+def irq(event, data):
+    if event == _IRQ_CENTRAL_CONNECT:
+        print("_IRQ_CENTRAL_CONNECT")
+        waiting_events[event] = data[0]
+    elif event == _IRQ_CENTRAL_DISCONNECT:
+        print("_IRQ_CENTRAL_DISCONNECT")
+    elif event == _IRQ_GATTS_READ_REQUEST:
+        print("_IRQ_GATTS_READ_REQUEST")
+    elif event == _IRQ_PERIPHERAL_CONNECT:
+        print("_IRQ_PERIPHERAL_CONNECT")
+        waiting_events[event] = data[0]
+    elif event == _IRQ_PERIPHERAL_DISCONNECT:
+        print("_IRQ_PERIPHERAL_DISCONNECT")
+    elif event == _IRQ_GATTC_CHARACTERISTIC_RESULT:
+        if data[-1] == CHAR_UUID:
+            print("_IRQ_GATTC_CHARACTERISTIC_RESULT", data[-1])
+            waiting_events[event] = data[2]
+        else:
+            return
+    elif event == _IRQ_GATTC_CHARACTERISTIC_DONE:
+        print("_IRQ_GATTC_CHARACTERISTIC_DONE")
+    elif event == _IRQ_GATTC_READ_RESULT:
+        print("_IRQ_GATTC_READ_RESULT", bytes(data[-1]))
+    elif event == _IRQ_ENCRYPTION_UPDATE:
+        print("_IRQ_ENCRYPTION_UPDATE", data[1], data[2], data[3])
+
+    if event not in waiting_events:
+        waiting_events[event] = None
+
+
+def wait_for_event(event, timeout_ms):
+    t0 = time.ticks_ms()
+    while time.ticks_diff(time.ticks_ms(), t0) < timeout_ms:
+        if event in waiting_events:
+            return waiting_events.pop(event)
+        machine.idle()
+    raise ValueError("Timeout waiting for {}".format(event))
+
+
+# Acting in peripheral role.
+def instance0():
+    multitest.globals(BDADDR=ble.config("mac"))
+    ((char_handle,),) = ble.gatts_register_services((SERVICE,))
+    ble.gatts_write(char_handle, "encrypted")
+    print("gap_advertise")
+    ble.gap_advertise(20_000, b"\x02\x01\x06\x04\xffMPY")
+    multitest.next()
+    try:
+        # Wait for central to connect.
+        wait_for_event(_IRQ_CENTRAL_CONNECT, TIMEOUT_MS)
+
+        # Wait for pairing event.
+        wait_for_event(_IRQ_ENCRYPTION_UPDATE, TIMEOUT_MS)
+
+        # Wait for GATTS read request.
+        wait_for_event(_IRQ_GATTS_READ_REQUEST, TIMEOUT_MS)
+
+        # Wait for central to disconnect.
+        wait_for_event(_IRQ_CENTRAL_DISCONNECT, TIMEOUT_MS)
+    finally:
+        ble.active(0)
+
+
+# Acting in central role.
+def instance1():
+    multitest.next()
+    try:
+        # Connect to peripheral.
+        print("gap_connect")
+        ble.gap_connect(*BDADDR)
+        conn_handle = wait_for_event(_IRQ_PERIPHERAL_CONNECT, TIMEOUT_MS)
+
+        # Discover characteristics (before pairing, doesn't need to be encrypted).
+        ble.gattc_discover_characteristics(conn_handle, 1, 65535)
+        value_handle = wait_for_event(_IRQ_GATTC_CHARACTERISTIC_RESULT, TIMEOUT_MS)
+        wait_for_event(_IRQ_GATTC_CHARACTERISTIC_DONE, TIMEOUT_MS)
+
+        # Pair with the peripheral.
+        print("gap_pair")
+        ble.gap_pair(conn_handle)
+
+        # Wait for the pairing event.
+        wait_for_event(_IRQ_ENCRYPTION_UPDATE, TIMEOUT_MS)
+
+        # Read the peripheral's characteristic, should be encrypted.
+        print("gattc_read")
+        ble.gattc_read(conn_handle, value_handle)
+        wait_for_event(_IRQ_GATTC_READ_RESULT, TIMEOUT_MS)
+
+        # Disconnect from the peripheral.
+        print("gap_disconnect:", ble.gap_disconnect(conn_handle))
+        wait_for_event(_IRQ_PERIPHERAL_DISCONNECT, TIMEOUT_MS)
+    finally:
+        ble.active(0)
+
+
+ble = bluetooth.BLE()
+ble.config(mitm=True, le_secure=True, bond=False)
+ble.active(1)
+ble.irq(irq)
diff --git a/tests/multi_bluetooth/ble_gap_pair.py.exp b/tests/multi_bluetooth/ble_gap_pair.py.exp
new file mode 100644
index 0000000000000..9efe0fb22b2b4
--- /dev/null
+++ b/tests/multi_bluetooth/ble_gap_pair.py.exp
@@ -0,0 +1,17 @@
+--- instance0 ---
+gap_advertise
+_IRQ_CENTRAL_CONNECT
+_IRQ_ENCRYPTION_UPDATE 1 0 0
+_IRQ_GATTS_READ_REQUEST
+_IRQ_CENTRAL_DISCONNECT
+--- instance1 ---
+gap_connect
+_IRQ_PERIPHERAL_CONNECT
+_IRQ_GATTC_CHARACTERISTIC_RESULT UUID('00000000-1111-2222-3333-444444444444')
+_IRQ_GATTC_CHARACTERISTIC_DONE
+gap_pair
+_IRQ_ENCRYPTION_UPDATE 1 0 0
+gattc_read
+_IRQ_GATTC_READ_RESULT b'encrypted'
+gap_disconnect: True
+_IRQ_PERIPHERAL_DISCONNECT
diff --git a/tests/multi_bluetooth/ble_gap_pair_bond.py b/tests/multi_bluetooth/ble_gap_pair_bond.py
new file mode 100644
index 0000000000000..a29c217887b45
--- /dev/null
+++ b/tests/multi_bluetooth/ble_gap_pair_bond.py
@@ -0,0 +1,134 @@
+# Test BLE GAP connect/disconnect with pairing and bonding, and read an encrypted
+# characteristic
+# TODO: reconnect after bonding to test that the secrets persist
+
+from micropython import const
+import time, machine, bluetooth
+
+TIMEOUT_MS = 4000
+
+_IRQ_CENTRAL_CONNECT = const(1)
+_IRQ_CENTRAL_DISCONNECT = const(2)
+_IRQ_GATTS_READ_REQUEST = const(4)
+_IRQ_PERIPHERAL_CONNECT = const(7)
+_IRQ_PERIPHERAL_DISCONNECT = const(8)
+_IRQ_GATTC_CHARACTERISTIC_RESULT = const(11)
+_IRQ_GATTC_CHARACTERISTIC_DONE = const(12)
+_IRQ_GATTC_READ_RESULT = const(15)
+_IRQ_ENCRYPTION_UPDATE = const(28)
+_IRQ_SET_SECRET = const(30)
+
+_FLAG_READ = const(0x0002)
+_FLAG_READ_ENCRYPTED = const(0x0200)
+
+SERVICE_UUID = bluetooth.UUID("A5A5A5A5-FFFF-9999-1111-5A5A5A5A5A5A")
+CHAR_UUID = bluetooth.UUID("00000000-1111-2222-3333-444444444444")
+CHAR = (CHAR_UUID, _FLAG_READ | _FLAG_READ_ENCRYPTED)
+SERVICE = (SERVICE_UUID, (CHAR,))
+
+waiting_events = {}
+secrets = {}
+
+
+def irq(event, data):
+    if event == _IRQ_CENTRAL_CONNECT:
+        print("_IRQ_CENTRAL_CONNECT")
+        waiting_events[event] = data[0]
+    elif event == _IRQ_CENTRAL_DISCONNECT:
+        print("_IRQ_CENTRAL_DISCONNECT")
+    elif event == _IRQ_GATTS_READ_REQUEST:
+        print("_IRQ_GATTS_READ_REQUEST")
+    elif event == _IRQ_PERIPHERAL_CONNECT:
+        print("_IRQ_PERIPHERAL_CONNECT")
+        waiting_events[event] = data[0]
+    elif event == _IRQ_PERIPHERAL_DISCONNECT:
+        print("_IRQ_PERIPHERAL_DISCONNECT")
+    elif event == _IRQ_GATTC_CHARACTERISTIC_RESULT:
+        if data[-1] == CHAR_UUID:
+            print("_IRQ_GATTC_CHARACTERISTIC_RESULT", data[-1])
+            waiting_events[event] = data[2]
+        else:
+            return
+    elif event == _IRQ_GATTC_CHARACTERISTIC_DONE:
+        print("_IRQ_GATTC_CHARACTERISTIC_DONE")
+    elif event == _IRQ_GATTC_READ_RESULT:
+        print("_IRQ_GATTC_READ_RESULT", bytes(data[-1]))
+    elif event == _IRQ_ENCRYPTION_UPDATE:
+        print("_IRQ_ENCRYPTION_UPDATE", data[1], data[2], data[3])
+    elif event == _IRQ_SET_SECRET:
+        return True
+
+    if event not in waiting_events:
+        waiting_events[event] = None
+
+
+def wait_for_event(event, timeout_ms):
+    t0 = time.ticks_ms()
+    while time.ticks_diff(time.ticks_ms(), t0) < timeout_ms:
+        if event in waiting_events:
+            return waiting_events.pop(event)
+        machine.idle()
+    raise ValueError("Timeout waiting for {}".format(event))
+
+
+# Acting in peripheral role.
+def instance0():
+    multitest.globals(BDADDR=ble.config("mac"))
+    ((char_handle,),) = ble.gatts_register_services((SERVICE,))
+    ble.gatts_write(char_handle, "encrypted")
+    print("gap_advertise")
+    ble.gap_advertise(20_000, b"\x02\x01\x06\x04\xffMPY")
+    multitest.next()
+    try:
+        # Wait for central to connect.
+        wait_for_event(_IRQ_CENTRAL_CONNECT, TIMEOUT_MS)
+
+        # Wait for pairing event.
+        wait_for_event(_IRQ_ENCRYPTION_UPDATE, TIMEOUT_MS)
+
+        # Wait for GATTS read request.
+        wait_for_event(_IRQ_GATTS_READ_REQUEST, TIMEOUT_MS)
+
+        # Wait for central to disconnect.
+        wait_for_event(_IRQ_CENTRAL_DISCONNECT, TIMEOUT_MS)
+    finally:
+        ble.active(0)
+
+
+# Acting in central role.
+def instance1():
+    multitest.next()
+    try:
+        # Connect to peripheral.
+        print("gap_connect")
+        ble.gap_connect(*BDADDR)
+        conn_handle = wait_for_event(_IRQ_PERIPHERAL_CONNECT, TIMEOUT_MS)
+
+        # Discover characteristics (before pairing, doesn't need to be encrypted).
+        ble.gattc_discover_characteristics(conn_handle, 1, 65535)
+        value_handle = wait_for_event(_IRQ_GATTC_CHARACTERISTIC_RESULT, TIMEOUT_MS)
+        wait_for_event(_IRQ_GATTC_CHARACTERISTIC_DONE, TIMEOUT_MS)
+
+        # Pair with the peripheral.
+        print("gap_pair")
+        ble.gap_pair(conn_handle)
+
+        # Wait for the pairing event.
+        wait_for_event(_IRQ_ENCRYPTION_UPDATE, TIMEOUT_MS)
+
+        # Read the peripheral's characteristic, should be encrypted.
+        print("gattc_read")
+        ble.gattc_read(conn_handle, value_handle)
+        wait_for_event(_IRQ_GATTC_READ_RESULT, TIMEOUT_MS)
+
+        # Disconnect from the peripheral.
+        print("gap_disconnect:", ble.gap_disconnect(conn_handle))
+        wait_for_event(_IRQ_PERIPHERAL_DISCONNECT, TIMEOUT_MS)
+    finally:
+        ble.active(0)
+
+
+ble = bluetooth.BLE()
+ble.config(mitm=True, le_secure=True, bond=True)
+ble.active(1)
+ble.irq(irq)
diff --git a/tests/multi_bluetooth/ble_gap_pair_bond.py.exp b/tests/multi_bluetooth/ble_gap_pair_bond.py.exp
new file mode 100644
index 0000000000000..271403a71a8c7
--- /dev/null
+++ b/tests/multi_bluetooth/ble_gap_pair_bond.py.exp
@@ -0,0 +1,17 @@
+--- instance0 ---
+gap_advertise
+_IRQ_CENTRAL_CONNECT
+_IRQ_ENCRYPTION_UPDATE 1 0 1
+_IRQ_GATTS_READ_REQUEST
+_IRQ_CENTRAL_DISCONNECT
+--- instance1 ---
+gap_connect
+_IRQ_PERIPHERAL_CONNECT
+_IRQ_GATTC_CHARACTERISTIC_RESULT UUID('00000000-1111-2222-3333-444444444444')
+_IRQ_GATTC_CHARACTERISTIC_DONE
+gap_pair
+_IRQ_ENCRYPTION_UPDATE 1 0 1
+gattc_read
+_IRQ_GATTC_READ_RESULT b'encrypted'
+gap_disconnect: True
+_IRQ_PERIPHERAL_DISCONNECT

From 849748873cd838be0d91555b47f1447f4476175a Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Wed, 25 Nov 2020 15:15:49 +0200
Subject: [PATCH 0459/3533] stm32/modmachine: Add device and revision ids to
 machine.info().

---
 ports/stm32/modmachine.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ports/stm32/modmachine.c b/ports/stm32/modmachine.c
index 9fa00a915186f..c5f49b6ef4395 100644
--- a/ports/stm32/modmachine.c
+++ b/ports/stm32/modmachine.c
@@ -155,6 +155,8 @@ STATIC mp_obj_t machine_info(size_t n_args, const mp_obj_t *args) {
         printf("ID=%02x%02x%02x%02x:%02x%02x%02x%02x:%02x%02x%02x%02x\n", id[0], id[1], id[2], id[3], id[4], id[5], id[6], id[7], id[8], id[9], id[10], id[11]);
     }
 
+    printf("DEVID=0x%04x\nREVID=0x%04x\n", (unsigned int)HAL_GetDEVID(), (unsigned int)HAL_GetREVID());
+
     // get and print clock speeds
     // SYSCLK=168MHz, HCLK=168MHz, PCLK1=42MHz, PCLK2=84MHz
     {

From ce9197eb209bacd1453ae2ef83523aa0fa1f9b45 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Fri, 27 Nov 2020 02:38:00 +0200
Subject: [PATCH 0460/3533] stm32/Makefile: Disable text compression in debug
 builds.

Otherwise the flash overflows.

Fixes issue #6653.
---
 ports/stm32/Makefile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ports/stm32/Makefile b/ports/stm32/Makefile
index ced851ca38e27..c3b7bbba98c61 100644
--- a/ports/stm32/Makefile
+++ b/ports/stm32/Makefile
@@ -134,6 +134,8 @@ LDFLAGS += --gc-sections
 ifeq ($(DEBUG), 1)
 CFLAGS += -g -DPENDSV_DEBUG
 COPT = -O0
+# Disable text compression in debug builds
+MICROPY_ROM_TEXT_COMPRESSION = 0
 else
 COPT += -Os -DNDEBUG
 endif

From e9e619fa24cca3aa6788931d6fee561436576f83 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Wed, 2 Dec 2020 23:16:10 +0200
Subject: [PATCH 0461/3533] stm32/powerctrl: Define RCC_SR_SFTRSTF flag for
 H747.

---
 ports/stm32/powerctrl.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ports/stm32/powerctrl.c b/ports/stm32/powerctrl.c
index 946185fba09d3..01ad1834184b4 100644
--- a/ports/stm32/powerctrl.c
+++ b/ports/stm32/powerctrl.c
@@ -32,7 +32,11 @@
 
 #if defined(STM32H7)
 #define RCC_SR          RSR
+#if defined(STM32H743xx)
 #define RCC_SR_SFTRSTF  RCC_RSR_SFTRSTF
+#elif defined(STM32H747xx)
+#define RCC_SR_SFTRSTF  RCC_RSR_SFT2RSTF
+#endif
 #define RCC_SR_RMVF     RCC_RSR_RMVF
 #else
 #define RCC_SR          CSR

From 3e5dd2dbcc87710f9f3f3bf4cd732ecdcc922b1f Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Wed, 2 Dec 2020 23:31:56 +0200
Subject: [PATCH 0462/3533] stm32/powerctrl: Fix STOP mode voltage scaling on
 H7 REV V devices.

---
 ports/stm32/powerctrl.c | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/ports/stm32/powerctrl.c b/ports/stm32/powerctrl.c
index 01ad1834184b4..7d368169790d1 100644
--- a/ports/stm32/powerctrl.c
+++ b/ports/stm32/powerctrl.c
@@ -38,6 +38,12 @@
 #define RCC_SR_SFTRSTF  RCC_RSR_SFT2RSTF
 #endif
 #define RCC_SR_RMVF     RCC_RSR_RMVF
+// This macro returns the actual voltage scaling level factoring in the power overdrive bit.
+// If the current voltage scale is VOLTAGE_SCALE1 and PWER_ODEN bit is set return VOLTAGE_SCALE0
+// otherwise the current voltage scaling (level VOS1 to VOS3) set in PWER_CSR is returned instead.
+#define POWERCTRL_GET_VOLTAGE_SCALING()     \
+    (((PWR->CSR1 & PWR_CSR1_ACTVOS) && (SYSCFG->PWRCR & SYSCFG_PWRCR_ODEN)) ? \
+    PWR_REGULATOR_VOLTAGE_SCALE0 : (PWR->CSR1 & PWR_CSR1_ACTVOS))
 #else
 #define RCC_SR          CSR
 #define RCC_SR_SFTRSTF  RCC_CSR_SFTRSTF
@@ -510,6 +516,19 @@ void powerctrl_enter_stop_mode(void) {
     HAL_PWREx_EnableFlashPowerDown();
     #endif
 
+    #if defined(STM32H7)
+    // Save the current voltage scaling level to restore after exiting low power mode.
+    uint32_t vscaling = POWERCTRL_GET_VOLTAGE_SCALING();
+
+    // If the current voltage scaling level is 0, switch to level 1 before entering low power mode.
+    if (vscaling == PWR_REGULATOR_VOLTAGE_SCALE0) {
+        __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1);
+        // Wait for PWR_FLAG_VOSRDY
+        while (!__HAL_PWR_GET_FLAG(PWR_FLAG_VOSRDY)) {
+        }
+    }
+    #endif
+
     #if defined(STM32F7)
     HAL_PWR_EnterSTOPMode((PWR_CR1_LPDS | PWR_CR1_LPUDS | PWR_CR1_FPDS | PWR_CR1_UDEN), PWR_STOPENTRY_WFI);
     #else
@@ -532,6 +551,17 @@ void powerctrl_enter_stop_mode(void) {
 
     #else
 
+    #if defined(STM32H7)
+    // When exiting from Stop or Standby modes, the Run mode voltage scaling is reset to
+    // the default VOS3 value. Restore the voltage scaling to the previous voltage scale.
+    if (vscaling != POWERCTRL_GET_VOLTAGE_SCALING()) {
+        __HAL_PWR_VOLTAGESCALING_CONFIG(vscaling);
+        // Wait for PWR_FLAG_VOSRDY
+        while (!__HAL_PWR_GET_FLAG(PWR_FLAG_VOSRDY)) {
+        }
+    }
+    #endif
+
     #if !defined(STM32L4)
     // enable clock
     __HAL_RCC_HSE_CONFIG(MICROPY_HW_RCC_HSE_STATE);

From 463a275bc4e99a1d37d523a120fe45976ea021fe Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Wed, 2 Dec 2020 23:33:56 +0200
Subject: [PATCH 0463/3533] stm32/powerctrl: On H7, re-enable disabled
 OSCs/PLLs on exit from STOP.

This commit saves OSCs/PLLs state before STOP mode and restores them on
exit.  Some boards use HSI48 for USB for example, others have PLL2/3
enabled, etc.
---
 ports/stm32/powerctrl.c | 39 ++++++++++++++++++++++++++++++++++++---
 1 file changed, 36 insertions(+), 3 deletions(-)

diff --git a/ports/stm32/powerctrl.c b/ports/stm32/powerctrl.c
index 7d368169790d1..c36351e311987 100644
--- a/ports/stm32/powerctrl.c
+++ b/ports/stm32/powerctrl.c
@@ -517,6 +517,9 @@ void powerctrl_enter_stop_mode(void) {
     #endif
 
     #if defined(STM32H7)
+    // Save RCC CR to re-enable OSCs and PLLs after wake up from low power mode.
+    uint32_t rcc_cr = RCC->CR;
+
     // Save the current voltage scaling level to restore after exiting low power mode.
     uint32_t vscaling = POWERCTRL_GET_VOLTAGE_SCALING();
 
@@ -607,9 +610,39 @@ void powerctrl_enter_stop_mode(void) {
     #endif
 
     #if defined(STM32H7)
-    // Enable PLL3 for USB
-    RCC->CR |= RCC_CR_PLL3ON;
-    while (!(RCC->CR & RCC_CR_PLL3RDY)) {
+    // Enable HSI
+    if (rcc_cr & RCC_CR_HSION) {
+        RCC->CR |= RCC_CR_HSION;
+        while (!(RCC->CR & RCC_CR_HSIRDY)) {
+        }
+    }
+
+    // Enable CSI
+    if (rcc_cr & RCC_CR_CSION) {
+        RCC->CR |= RCC_CR_CSION;
+        while (!(RCC->CR & RCC_CR_CSIRDY)) {
+        }
+    }
+
+    // Enable HSI48
+    if (rcc_cr & RCC_CR_HSI48ON) {
+        RCC->CR |= RCC_CR_HSI48ON;
+        while (!(RCC->CR & RCC_CR_HSI48RDY)) {
+        }
+    }
+
+    // Enable PLL2
+    if (rcc_cr & RCC_CR_PLL2ON) {
+        RCC->CR |= RCC_CR_PLL2ON;
+        while (!(RCC->CR & RCC_CR_PLL2RDY)) {
+        }
+    }
+
+    // Enable PLL3
+    if (rcc_cr & RCC_CR_PLL3ON) {
+        RCC->CR |= RCC_CR_PLL3ON;
+        while (!(RCC->CR & RCC_CR_PLL3RDY)) {
+        }
     }
     #endif
 

From 8add94e94e906ecf6c46d49127a8a0590be308b8 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Wed, 2 Dec 2020 23:35:58 +0200
Subject: [PATCH 0464/3533] stm32/powerctrl: Disable RTC write protection
 before changing flags.

---
 ports/stm32/powerctrl.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/ports/stm32/powerctrl.c b/ports/stm32/powerctrl.c
index c36351e311987..ce2f6e1905c5d 100644
--- a/ports/stm32/powerctrl.c
+++ b/ports/stm32/powerctrl.c
@@ -689,6 +689,10 @@ void powerctrl_enter_standby_mode(void) {
     // save RTC interrupts
     uint32_t save_irq_bits = RTC->CR & CR_BITS;
 
+    // disable register write protection
+    RTC->WPR = 0xca;
+    RTC->WPR = 0x53;
+
     // disable RTC interrupts
     RTC->CR &= ~CR_BITS;
 
@@ -714,6 +718,9 @@ void powerctrl_enter_standby_mode(void) {
     // enable previously-enabled RTC interrupts
     RTC->CR |= save_irq_bits;
 
+    // enable register write protection
+    RTC->WPR = 0xff;
+
     #if defined(STM32F7)
     // Enable the internal (eg RTC) wakeup sources
     // See Errata 2.2.2 "Wakeup from Standby mode when the back-up SRAM regulator is enabled"

From 7b9b6d080a2d7de6db73fe4caaca29f54a1d716d Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Wed, 2 Dec 2020 23:36:47 +0200
Subject: [PATCH 0465/3533] stm32/powerctrl: Set H7 RTC wakeup flags.

---
 ports/stm32/powerctrl.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ports/stm32/powerctrl.c b/ports/stm32/powerctrl.c
index ce2f6e1905c5d..076215ba9f287 100644
--- a/ports/stm32/powerctrl.c
+++ b/ports/stm32/powerctrl.c
@@ -705,7 +705,8 @@ void powerctrl_enter_standby_mode(void) {
     // clear global wake-up flag
     PWR->CR2 |= PWR_CR2_CWUPF6 | PWR_CR2_CWUPF5 | PWR_CR2_CWUPF4 | PWR_CR2_CWUPF3 | PWR_CR2_CWUPF2 | PWR_CR2_CWUPF1;
     #elif defined(STM32H7)
-    // TODO
+    EXTI_D1->PR1 = 0x3fffff;
+    PWR->WKUPCR |= PWR_WAKEUP_FLAG1 | PWR_WAKEUP_FLAG2 | PWR_WAKEUP_FLAG3 | PWR_WAKEUP_FLAG4 | PWR_WAKEUP_FLAG5 | PWR_WAKEUP_FLAG6;
     #elif defined(STM32L4) || defined(STM32WB)
     // clear all wake-up flags
     PWR->SCR |= PWR_SCR_CWUF5 | PWR_SCR_CWUF4 | PWR_SCR_CWUF3 | PWR_SCR_CWUF2 | PWR_SCR_CWUF1;

From 7dc2f4ed384f45eb943e0b7dc39a539af7058b80 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Thu, 3 Dec 2020 19:46:07 +0200
Subject: [PATCH 0466/3533] stm32/powerctrl: Ensure SysTick is disabled on STOP
 mode entry for H7.

Even though IRQs are disabled this seems to be required on H7 Rev Y,
otherwise Systick interrupt triggers and the MCU leaves the stop mode
immediately.
---
 ports/stm32/powerctrl.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/ports/stm32/powerctrl.c b/ports/stm32/powerctrl.c
index 076215ba9f287..bf8be647f4d76 100644
--- a/ports/stm32/powerctrl.c
+++ b/ports/stm32/powerctrl.c
@@ -502,6 +502,13 @@ void powerctrl_enter_stop_mode(void) {
     // executed until after the clocks are reconfigured
     uint32_t irq_state = disable_irq();
 
+    #if defined(STM32H7)
+    // Disable SysTick Interrupt
+    // Note: This seems to be required at least on the H7 REV Y,
+    // otherwise the MCU will leave stop mode immediately on entry.
+    SysTick->CTRL &= ~SysTick_CTRL_TICKINT_Msk;
+    #endif
+
     #if defined(MICROPY_BOARD_ENTER_STOP)
     MICROPY_BOARD_ENTER_STOP
     #endif
@@ -659,6 +666,11 @@ void powerctrl_enter_stop_mode(void) {
     MICROPY_BOARD_LEAVE_STOP
     #endif
 
+    #if defined(STM32H7)
+    // Enable SysTick Interrupt
+    SysTick->CTRL |= SysTick_CTRL_TICKINT_Msk;
+    #endif
+
     // Enable IRQs now that all clocks are reconfigured
     enable_irq(irq_state);
 }

From 4ce6427bd71129b1ab3b9eeaf2c1182d623cd7b9 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 3 Dec 2020 12:58:48 +1100
Subject: [PATCH 0467/3533] stm32/i2c: Factor I2C finding code to
 i2c_find_peripheral function.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/i2c.c         | 50 +++++++++++++++++++++++++++++++++++++++
 ports/stm32/i2c.h         |  2 ++
 ports/stm32/machine_i2c.c | 33 +-------------------------
 ports/stm32/pyb_i2c.c     | 33 +-------------------------
 4 files changed, 54 insertions(+), 64 deletions(-)

diff --git a/ports/stm32/i2c.c b/ports/stm32/i2c.c
index 5981df11c5bd8..d67201b714418 100644
--- a/ports/stm32/i2c.c
+++ b/ports/stm32/i2c.c
@@ -26,6 +26,7 @@
 
 #include "py/mperrno.h"
 #include "py/mphal.h"
+#include "py/runtime.h"
 #include "i2c.h"
 
 #if MICROPY_HW_ENABLE_HW_I2C
@@ -487,4 +488,53 @@ int i2c_writeto(i2c_t *i2c, uint16_t addr, const uint8_t *src, size_t len, bool
 
 #endif
 
+STATIC const uint8_t i2c_available =
+    0
+    #if defined(MICROPY_HW_I2C1_SCL)
+    | 1 << 1
+    #endif
+    #if defined(MICROPY_HW_I2C2_SCL)
+    | 1 << 2
+    #endif
+    #if defined(MICROPY_HW_I2C3_SCL)
+    | 1 << 3
+    #endif
+    #if defined(MICROPY_HW_I2C4_SCL)
+    | 1 << 4
+    #endif
+;
+
+int i2c_find_peripheral(mp_obj_t id) {
+    int i2c_id = 0;
+    if (mp_obj_is_str(id)) {
+        const char *port = mp_obj_str_get_str(id);
+        if (0) {
+        #ifdef MICROPY_HW_I2C1_NAME
+        } else if (strcmp(port, MICROPY_HW_I2C1_NAME) == 0) {
+            i2c_id = 1;
+        #endif
+        #ifdef MICROPY_HW_I2C2_NAME
+        } else if (strcmp(port, MICROPY_HW_I2C2_NAME) == 0) {
+            i2c_id = 2;
+        #endif
+        #ifdef MICROPY_HW_I2C3_NAME
+        } else if (strcmp(port, MICROPY_HW_I2C3_NAME) == 0) {
+            i2c_id = 3;
+        #endif
+        #ifdef MICROPY_HW_I2C4_NAME
+        } else if (strcmp(port, MICROPY_HW_I2C4_NAME) == 0) {
+            i2c_id = 4;
+        #endif
+        } else {
+            mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("I2C(%s) doesn't exist"), port);
+        }
+    } else {
+        i2c_id = mp_obj_get_int(id);
+        if (i2c_id < 1 || i2c_id >= 8 * sizeof(i2c_available) || !(i2c_available & (1 << i2c_id))) {
+            mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("I2C(%d) doesn't exist"), i2c_id);
+        }
+    }
+    return i2c_id;
+}
+
 #endif // MICROPY_HW_ENABLE_HW_I2C
diff --git a/ports/stm32/i2c.h b/ports/stm32/i2c.h
index 4846f1cf3ab52..d494ad66d57f5 100644
--- a/ports/stm32/i2c.h
+++ b/ports/stm32/i2c.h
@@ -62,4 +62,6 @@ int i2c_write(i2c_t *i2c, const uint8_t *src, size_t len, size_t next_len);
 int i2c_readfrom(i2c_t *i2c, uint16_t addr, uint8_t *dest, size_t len, bool stop);
 int i2c_writeto(i2c_t *i2c, uint16_t addr, const uint8_t *src, size_t len, bool stop);
 
+int i2c_find_peripheral(mp_obj_t id);
+
 #endif // MICROPY_INCLUDED_STM32_I2C_H
diff --git a/ports/stm32/machine_i2c.c b/ports/stm32/machine_i2c.c
index cfa00b86d830b..41e65cf05cb37 100644
--- a/ports/stm32/machine_i2c.c
+++ b/ports/stm32/machine_i2c.c
@@ -210,39 +210,8 @@ mp_obj_t machine_hard_i2c_make_new(const mp_obj_type_t *type, size_t n_args, siz
     mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
     mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
 
-    // work out i2c bus
-    int i2c_id = 0;
-    if (mp_obj_is_str(args[ARG_id].u_obj)) {
-        const char *port = mp_obj_str_get_str(args[ARG_id].u_obj);
-        if (0) {
-        #ifdef MICROPY_HW_I2C1_NAME
-        } else if (strcmp(port, MICROPY_HW_I2C1_NAME) == 0) {
-            i2c_id = 1;
-        #endif
-        #ifdef MICROPY_HW_I2C2_NAME
-        } else if (strcmp(port, MICROPY_HW_I2C2_NAME) == 0) {
-            i2c_id = 2;
-        #endif
-        #ifdef MICROPY_HW_I2C3_NAME
-        } else if (strcmp(port, MICROPY_HW_I2C3_NAME) == 0) {
-            i2c_id = 3;
-        #endif
-        #ifdef MICROPY_HW_I2C4_NAME
-        } else if (strcmp(port, MICROPY_HW_I2C4_NAME) == 0) {
-            i2c_id = 4;
-        #endif
-        } else {
-            mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("I2C(%s) doesn't exist"), port);
-        }
-    } else {
-        i2c_id = mp_obj_get_int(args[ARG_id].u_obj);
-        if (i2c_id < 1 || i2c_id > MP_ARRAY_SIZE(machine_hard_i2c_obj)
-            || machine_hard_i2c_obj[i2c_id - 1].base.type == NULL) {
-            mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("I2C(%d) doesn't exist"), i2c_id);
-        }
-    }
-
     // get static peripheral object
+    int i2c_id = i2c_find_peripheral(args[ARG_id].u_obj);
     machine_hard_i2c_obj_t *self = (machine_hard_i2c_obj_t *)&machine_hard_i2c_obj[i2c_id - 1];
 
     // here we would check the scl/sda pins and configure them, but it's not implemented
diff --git a/ports/stm32/pyb_i2c.c b/ports/stm32/pyb_i2c.c
index 4f8f7a0e3741c..ee8b498a1359c 100644
--- a/ports/stm32/pyb_i2c.c
+++ b/ports/stm32/pyb_i2c.c
@@ -668,39 +668,8 @@ STATIC mp_obj_t pyb_i2c_make_new(const mp_obj_type_t *type, size_t n_args, size_
     // check arguments
     mp_arg_check_num(n_args, n_kw, 1, MP_OBJ_FUN_ARGS_MAX, true);
 
-    // work out i2c bus
-    int i2c_id = 0;
-    if (mp_obj_is_str(args[0])) {
-        const char *port = mp_obj_str_get_str(args[0]);
-        if (0) {
-        #ifdef MICROPY_HW_I2C1_NAME
-        } else if (strcmp(port, MICROPY_HW_I2C1_NAME) == 0) {
-            i2c_id = 1;
-        #endif
-        #ifdef MICROPY_HW_I2C2_NAME
-        } else if (strcmp(port, MICROPY_HW_I2C2_NAME) == 0) {
-            i2c_id = 2;
-        #endif
-        #ifdef MICROPY_HW_I2C3_NAME
-        } else if (strcmp(port, MICROPY_HW_I2C3_NAME) == 0) {
-            i2c_id = 3;
-        #endif
-        #ifdef MICROPY_HW_I2C4_NAME
-        } else if (strcmp(port, MICROPY_HW_I2C4_NAME) == 0) {
-            i2c_id = 4;
-        #endif
-        } else {
-            mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("I2C(%s) doesn't exist"), port);
-        }
-    } else {
-        i2c_id = mp_obj_get_int(args[0]);
-        if (i2c_id < 1 || i2c_id > MP_ARRAY_SIZE(pyb_i2c_obj)
-            || pyb_i2c_obj[i2c_id - 1].i2c == NULL) {
-            mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("I2C(%d) doesn't exist"), i2c_id);
-        }
-    }
-
     // get I2C object
+    int i2c_id = i2c_find_peripheral(args[0]);
     const pyb_i2c_obj_t *i2c_obj = &pyb_i2c_obj[i2c_id - 1];
 
     if (n_args > 1 || n_kw > 0) {

From 1e4e2644ecfd2cab5154a2ad95f3eb5aca545ba7 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 3 Dec 2020 13:07:37 +1100
Subject: [PATCH 0468/3533] stm32: Add support for a board to reserve certain
 peripherals.

Allows reserving CAN, I2C, SPI, Timer and UART peripherals.  If reserved
the peripheral cannot be accessed from Python.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/i2c.c                  |  6 ++++++
 ports/stm32/machine_uart.c         |  5 +++++
 ports/stm32/mpconfigboard_common.h | 25 ++++++++++++++++++++++++
 ports/stm32/pyb_can.c              |  5 +++++
 ports/stm32/spi.c                  | 31 ++++++++++++++++++------------
 ports/stm32/timer.c                |  5 +++++
 6 files changed, 65 insertions(+), 12 deletions(-)

diff --git a/ports/stm32/i2c.c b/ports/stm32/i2c.c
index d67201b714418..0b7105344cd28 100644
--- a/ports/stm32/i2c.c
+++ b/ports/stm32/i2c.c
@@ -534,6 +534,12 @@ int i2c_find_peripheral(mp_obj_t id) {
             mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("I2C(%d) doesn't exist"), i2c_id);
         }
     }
+
+    // check if the I2C is reserved for system use or not
+    if (MICROPY_HW_I2C_IS_RESERVED(i2c_id)) {
+        mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("I2C(%d) is reserved"), i2c_id);
+    }
+
     return i2c_id;
 }
 
diff --git a/ports/stm32/machine_uart.c b/ports/stm32/machine_uart.c
index 2862f4c0e7b15..31e6a1789e4a3 100644
--- a/ports/stm32/machine_uart.c
+++ b/ports/stm32/machine_uart.c
@@ -345,6 +345,11 @@ STATIC mp_obj_t pyb_uart_make_new(const mp_obj_type_t *type, size_t n_args, size
         }
     }
 
+    // check if the UART is reserved for system use or not
+    if (MICROPY_HW_UART_IS_RESERVED(uart_id)) {
+        mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("UART(%d) is reserved"), uart_id);
+    }
+
     pyb_uart_obj_t *self;
     if (MP_STATE_PORT(pyb_uart_obj_all)[uart_id - 1] == NULL) {
         // create new UART object
diff --git a/ports/stm32/mpconfigboard_common.h b/ports/stm32/mpconfigboard_common.h
index a73a26b1627b4..8890abc59bbe1 100644
--- a/ports/stm32/mpconfigboard_common.h
+++ b/ports/stm32/mpconfigboard_common.h
@@ -127,6 +127,31 @@
 #define MICROPY_HW_FLASH_FS_LABEL "pybflash"
 #endif
 
+// Function to determine if the given can_id is reserved for system use or not.
+#ifndef MICROPY_HW_CAN_IS_RESERVED
+#define MICROPY_HW_CAN_IS_RESERVED(can_id) (false)
+#endif
+
+// Function to determine if the given i2c_id is reserved for system use or not.
+#ifndef MICROPY_HW_I2C_IS_RESERVED
+#define MICROPY_HW_I2C_IS_RESERVED(i2c_id) (false)
+#endif
+
+// Function to determine if the given spi_id is reserved for system use or not.
+#ifndef MICROPY_HW_SPI_IS_RESERVED
+#define MICROPY_HW_SPI_IS_RESERVED(spi_id) (false)
+#endif
+
+// Function to determine if the given tim_id is reserved for system use or not.
+#ifndef MICROPY_HW_TIM_IS_RESERVED
+#define MICROPY_HW_TIM_IS_RESERVED(tim_id) (false)
+#endif
+
+// Function to determine if the given uart_id is reserved for system use or not.
+#ifndef MICROPY_HW_UART_IS_RESERVED
+#define MICROPY_HW_UART_IS_RESERVED(uart_id) (false)
+#endif
+
 /*****************************************************************************/
 // General configuration
 
diff --git a/ports/stm32/pyb_can.c b/ports/stm32/pyb_can.c
index 224b8f28b0eab..def66481cbdc8 100644
--- a/ports/stm32/pyb_can.c
+++ b/ports/stm32/pyb_can.c
@@ -203,6 +203,11 @@ STATIC mp_obj_t pyb_can_make_new(const mp_obj_type_t *type, size_t n_args, size_
         mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("CAN(%d) doesn't exist"), can_idx);
     }
 
+    // check if the CAN is reserved for system use or not
+    if (MICROPY_HW_CAN_IS_RESERVED(can_idx)) {
+        mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("CAN(%d) is reserved"), can_idx);
+    }
+
     pyb_can_obj_t *self;
     if (MP_STATE_PORT(pyb_can_obj_all)[can_idx - 1] == NULL) {
         self = m_new_obj(pyb_can_obj_t);
diff --git a/ports/stm32/spi.c b/ports/stm32/spi.c
index 5f9b1c1a28d7f..07374d7a38eef 100644
--- a/ports/stm32/spi.c
+++ b/ports/stm32/spi.c
@@ -167,45 +167,52 @@ void spi_init0(void) {
 }
 
 int spi_find_index(mp_obj_t id) {
+    int spi_id;
     if (mp_obj_is_str(id)) {
         // given a string id
         const char *port = mp_obj_str_get_str(id);
         if (0) {
         #ifdef MICROPY_HW_SPI1_NAME
         } else if (strcmp(port, MICROPY_HW_SPI1_NAME) == 0) {
-            return 1;
+            spi_id = 1;
         #endif
         #ifdef MICROPY_HW_SPI2_NAME
         } else if (strcmp(port, MICROPY_HW_SPI2_NAME) == 0) {
-            return 2;
+            spi_id = 2;
         #endif
         #ifdef MICROPY_HW_SPI3_NAME
         } else if (strcmp(port, MICROPY_HW_SPI3_NAME) == 0) {
-            return 3;
+            spi_id = 3;
         #endif
         #ifdef MICROPY_HW_SPI4_NAME
         } else if (strcmp(port, MICROPY_HW_SPI4_NAME) == 0) {
-            return 4;
+            spi_id = 4;
         #endif
         #ifdef MICROPY_HW_SPI5_NAME
         } else if (strcmp(port, MICROPY_HW_SPI5_NAME) == 0) {
-            return 5;
+            spi_id = 5;
         #endif
         #ifdef MICROPY_HW_SPI6_NAME
         } else if (strcmp(port, MICROPY_HW_SPI6_NAME) == 0) {
-            return 6;
+            spi_id = 6;
         #endif
+        } else {
+            mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("SPI(%s) doesn't exist"), port);
         }
-        mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("SPI(%s) doesn't exist"), port);
     } else {
         // given an integer id
-        int spi_id = mp_obj_get_int(id);
-        if (spi_id >= 1 && spi_id <= MP_ARRAY_SIZE(spi_obj)
-            && spi_obj[spi_id - 1].spi != NULL) {
-            return spi_id;
+        spi_id = mp_obj_get_int(id);
+        if (spi_id < 1 || spi_id > MP_ARRAY_SIZE(spi_obj) || spi_obj[spi_id - 1].spi == NULL) {
+            mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("SPI(%d) doesn't exist"), spi_id);
         }
-        mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("SPI(%d) doesn't exist"), spi_id);
     }
+
+    // check if the SPI is reserved for system use or not
+    if (MICROPY_HW_SPI_IS_RESERVED(spi_id)) {
+        mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("SPI(%d) is reserved"), spi_id);
+    }
+
+    return spi_id;
 }
 
 STATIC uint32_t spi_get_source_freq(SPI_HandleTypeDef *spi) {
diff --git a/ports/stm32/timer.c b/ports/stm32/timer.c
index 9b8c14c0da552..a34d2984da979 100644
--- a/ports/stm32/timer.c
+++ b/ports/stm32/timer.c
@@ -896,6 +896,11 @@ STATIC mp_obj_t pyb_timer_make_new(const mp_obj_type_t *type, size_t n_args, siz
         mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("Timer(%d) doesn't exist"), tim_id);
     }
 
+    // check if the timer is reserved for system use or not
+    if (MICROPY_HW_TIM_IS_RESERVED(tim_id)) {
+        mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("Timer(%d) is reserved"), tim_id);
+    }
+
     pyb_timer_obj_t *tim;
     if (MP_STATE_PORT(pyb_timer_obj_all)[tim_id - 1] == NULL) {
         // create new Timer object

From cb1bb7592e18a50f33d22f84614c5ee9f45ce21e Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 7 Dec 2020 17:11:49 +1100
Subject: [PATCH 0469/3533] stm32/Makefile: Change -O0 to -Og for DEBUG=1
 builds.

The -Og optimisation level produces a more realistic build, gives a better
debugging experience, and generates smaller code than -O0, allowing debug
builds to fit in flash.

This commit also assigns variables in can.c to prevent warnings when -Og is
used, and builds a board in CI with DEBUG=1 enabled.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/Makefile | 2 +-
 ports/stm32/can.c    | 4 ++--
 tools/ci.sh          | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ports/stm32/Makefile b/ports/stm32/Makefile
index c3b7bbba98c61..a9dac03d2c021 100644
--- a/ports/stm32/Makefile
+++ b/ports/stm32/Makefile
@@ -133,7 +133,7 @@ LDFLAGS += --gc-sections
 # Debugging/Optimization
 ifeq ($(DEBUG), 1)
 CFLAGS += -g -DPENDSV_DEBUG
-COPT = -O0
+COPT = -Og
 # Disable text compression in debug builds
 MICROPY_ROM_TEXT_COMPRESSION = 0
 else
diff --git a/ports/stm32/can.c b/ports/stm32/can.c
index e5fc55e409bbc..bcc6983594967 100644
--- a/ports/stm32/can.c
+++ b/ports/stm32/can.c
@@ -226,8 +226,8 @@ int can_receive(CAN_HandleTypeDef *can, int fifo, CanRxMsgTypeDef *msg, uint8_t
 HAL_StatusTypeDef CAN_Transmit(CAN_HandleTypeDef *hcan, uint32_t Timeout) {
     uint32_t transmitmailbox;
     uint32_t tickstart;
-    uint32_t rqcpflag;
-    uint32_t txokflag;
+    uint32_t rqcpflag = 0;
+    uint32_t txokflag = 0;
 
     // Check the parameters
     assert_param(IS_CAN_IDTYPE(hcan->pTxMsg->IDE));
diff --git a/tools/ci.sh b/tools/ci.sh
index 3b906b449c112..ded9fab922d50 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -200,7 +200,7 @@ function ci_stm32_nucleo_build {
     make ${MAKEOPTS} -C ports/stm32 BOARD=NUCLEO_F091RC
     make ${MAKEOPTS} -C ports/stm32 BOARD=NUCLEO_H743ZI CFLAGS_EXTRA='-DMICROPY_PY_THREAD=1'
     make ${MAKEOPTS} -C ports/stm32 BOARD=NUCLEO_L073RZ
-    make ${MAKEOPTS} -C ports/stm32 BOARD=NUCLEO_L476RG
+    make ${MAKEOPTS} -C ports/stm32 BOARD=NUCLEO_L476RG DEBUG=1
     make ${MAKEOPTS} -C ports/stm32 BOARD=NUCLEO_WB55
     make ${MAKEOPTS} -C ports/stm32/mboot BOARD=NUCLEO_WB55
 }

From 92a5ee6ac1c50084f8c29d4accda67cca91b6846 Mon Sep 17 00:00:00 2001
From: Maureen Helm <maureen.helm@nxp.com>
Date: Mon, 30 Nov 2020 10:45:05 -0600
Subject: [PATCH 0470/3533] zephyr: Replace broken shell_net_iface() with more
 general shell_exec().

The zephyr function net_shell_cmd_iface() was removed in zephyr v1.14.0,
therefore the MicroPython zephyr port did not build with newer zephyr
versions when CONFIG_NET_SHELL=y. Replace with a more general
shell_exec() function that can execute any zephyr shell command. For
example:

>>> zephyr.shell_exec("net")

Subcommands:
  allocs     :Print network memory allocations.
  arp        :Print information about IPv4 ARP cache.
  conn       :Print information about network connections.
  dns        :Show how DNS is configured.
  events     :Monitor network management events.
  gptp       :Print information about gPTP support.
  iface      :Print information about network interfaces.
  ipv6       :Print information about IPv6 specific information and
              configuration.
  mem        :Print information about network memory usage.
  nbr        :Print neighbor information.
  ping       :Ping a network host.
  pkt        :net_pkt information.
  ppp        :PPP information.
  resume     :Resume a network interface
  route      :Show network route.
  stacks     :Show network stacks information.
  stats      :Show network statistics.
  suspend    :Suspend a network interface
  tcp        :Connect/send/close TCP connection.
  vlan       :Show VLAN information.
  websocket  :Print information about WebSocket connections.

>>> zephyr.shell_exec("kernel")

kernel - Kernel commands
Subcommands:
  cycles   :Kernel cycles.
  reboot   :Reboot.
  stacks   :List threads stack usage.
  threads  :List kernel threads.
  uptime   :Kernel uptime.
  version  :Kernel version.

Signed-off-by: Maureen Helm <maureen.helm@nxp.com>
---
 ports/zephyr/modzephyr.c | 22 ++++++++++------------
 ports/zephyr/prj.conf    |  6 +++++-
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/ports/zephyr/modzephyr.c b/ports/zephyr/modzephyr.c
index 71b44d7df1611..52449ea381c42 100644
--- a/ports/zephyr/modzephyr.c
+++ b/ports/zephyr/modzephyr.c
@@ -31,6 +31,8 @@
 #include <stdio.h>
 #include <zephyr.h>
 #include <debug/thread_analyzer.h>
+#include <shell/shell.h>
+#include <shell/shell_uart.h>
 
 #include "modzephyr.h"
 #include "py/runtime.h"
@@ -53,17 +55,14 @@ STATIC mp_obj_t mod_thread_analyze(void) {
 STATIC MP_DEFINE_CONST_FUN_OBJ_0(mod_thread_analyze_obj, mod_thread_analyze);
 #endif
 
-#ifdef CONFIG_NET_SHELL
-
-// int net_shell_cmd_iface(int argc, char *argv[]);
-
-STATIC mp_obj_t mod_shell_net_iface(void) {
-    net_shell_cmd_iface(0, NULL);
+#ifdef CONFIG_SHELL_BACKEND_SERIAL
+STATIC mp_obj_t mod_shell_exec(mp_obj_t cmd_in) {
+    const char *cmd = mp_obj_str_get_str(cmd_in);
+    shell_execute_cmd(shell_backend_uart_get_ptr(), cmd);
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(mod_shell_net_iface_obj, mod_shell_net_iface);
-
-#endif // CONFIG_NET_SHELL
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_shell_exec_obj, mod_shell_exec);
+#endif // CONFIG_SHELL_BACKEND_SERIAL
 
 STATIC const mp_rom_map_elem_t mp_module_time_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_zephyr) },
@@ -72,9 +71,8 @@ STATIC const mp_rom_map_elem_t mp_module_time_globals_table[] = {
     #ifdef CONFIG_THREAD_ANALYZER
     { MP_ROM_QSTR(MP_QSTR_thread_analyze), MP_ROM_PTR(&mod_thread_analyze_obj) },
     #endif
-
-    #ifdef CONFIG_NET_SHELL
-    { MP_ROM_QSTR(MP_QSTR_shell_net_iface), MP_ROM_PTR(&mod_shell_net_iface_obj) },
+    #ifdef CONFIG_SHELL_BACKEND_SERIAL
+    { MP_ROM_QSTR(MP_QSTR_shell_exec), MP_ROM_PTR(&mod_shell_exec_obj) },
     #endif
     #ifdef CONFIG_DISK_ACCESS
     { MP_ROM_QSTR(MP_QSTR_DiskAccess), MP_ROM_PTR(&zephyr_disk_access_type) },
diff --git a/ports/zephyr/prj.conf b/ports/zephyr/prj.conf
index 50cfa005025dc..9824f48e3362f 100644
--- a/ports/zephyr/prj.conf
+++ b/ports/zephyr/prj.conf
@@ -57,7 +57,11 @@ CONFIG_THREAD_NAME=y
 # Required for usocket.pkt_get_info()
 CONFIG_NET_BUF_POOL_USAGE=y
 
-# Required for usocket.shell_*()
+# Required for zephyr.shell_exec()
+#CONFIG_SHELL=y
+#CONFIG_SHELL_BACKEND_SERIAL_INTERRUPT_DRIVEN=n
+
+# Required for zephyr.shell_exec("net iface")
 #CONFIG_NET_SHELL=y
 
 # Uncomment to enable "INFO" level net_buf logging

From dde0735ac1629aca4f7d41334f25b75dd8d35010 Mon Sep 17 00:00:00 2001
From: Jonathan Bruchim <yonbruchim@gmail.com>
Date: Sun, 8 Nov 2020 20:31:35 +0200
Subject: [PATCH 0471/3533] zephyr: Guard I2C code with appropriate ifdef
 config.

To reduce binary code size when not using I2C.

Signed-off-by: Jonathan Bruchim <yonbruchim@gmail.com>
---
 ports/zephyr/machine_i2c.c | 4 ++++
 ports/zephyr/modmachine.c  | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/ports/zephyr/machine_i2c.c b/ports/zephyr/machine_i2c.c
index efd4bdcb21b58..aa8823392dff0 100644
--- a/ports/zephyr/machine_i2c.c
+++ b/ports/zephyr/machine_i2c.c
@@ -39,6 +39,8 @@
 #include "extmod/machine_i2c.h"
 #include "modmachine.h"
 
+#if MICROPY_PY_MACHINE_I2C
+
 typedef struct _machine_hard_i2c_obj_t {
     mp_obj_base_t base;
     const struct device *dev;
@@ -136,3 +138,5 @@ const mp_obj_type_t machine_hard_i2c_type = {
     .protocol = &machine_hard_i2c_p,
     .locals_dict = (mp_obj_dict_t *)&mp_machine_i2c_locals_dict,
 };
+
+#endif // MICROPY_PY_MACHINE_I2C
diff --git a/ports/zephyr/modmachine.c b/ports/zephyr/modmachine.c
index 29e6c889c4cef..968f758b93ed3 100644
--- a/ports/zephyr/modmachine.c
+++ b/ports/zephyr/modmachine.c
@@ -60,7 +60,9 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     #endif
     { MP_ROM_QSTR(MP_QSTR_reset_cause), MP_ROM_PTR(&machine_reset_cause_obj) },
 
+    #if MICROPY_PY_MACHINE_I2C
     { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&machine_hard_i2c_type) },
+    #endif
     { MP_ROM_QSTR(MP_QSTR_Pin), MP_ROM_PTR(&machine_pin_type) },
     { MP_ROM_QSTR(MP_QSTR_Signal), MP_ROM_PTR(&machine_signal_type) },
 

From 5020b14d5419065f1a5ef5aed1be7badee28c9bf Mon Sep 17 00:00:00 2001
From: Joris Peeraer <jorispeeraer@gmail.com>
Date: Thu, 22 Oct 2020 10:38:03 +0200
Subject: [PATCH 0472/3533] py/mpprint: Fix length calculation for strings with
 precision-modifier.

Two issues are tackled:

1. The calculation of the correct length to print is fixed to treat the
   precision as a maximum length instead as the exact length.
   This is done for both qstr (%q) and for regular str (%s).

2. Fix the incorrect use of mp_printf("%.*s") to mp_print_strn().

   Because of the fix of above issue, some testcases that would print
   an embedded null-byte (^@ in test-output) would now fail.
   The bug here is that "%s" was used to print null-bytes. Instead,
   mp_print_strn is used to make sure all bytes are outputted and the
   exact length is respected.

Test-cases are added for both %s and %q with a combination of precision
and padding specifiers.
---
 ports/unix/coverage.c            |  2 +-
 py/mpprint.c                     | 13 +++++++------
 py/objstr.c                      |  4 ++--
 py/objstrunicode.c               |  2 +-
 tests/unix/extra_coverage.py.exp |  2 +-
 5 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/ports/unix/coverage.c b/ports/unix/coverage.c
index 7169c7793bd93..ef66c4fb59440 100644
--- a/ports/unix/coverage.c
+++ b/ports/unix/coverage.c
@@ -186,7 +186,7 @@ STATIC mp_obj_t extra_coverage(void) {
         mp_printf(&mp_plat_print, "%ld\n", 123); // long
         mp_printf(&mp_plat_print, "%lx\n", 0x123); // long hex
         mp_printf(&mp_plat_print, "%X\n", 0x1abcdef); // capital hex
-        mp_printf(&mp_plat_print, "%.2s %.3s\n", "abc", "abc"); // fixed string precision
+        mp_printf(&mp_plat_print, "%.2s %.3s '%4.4s' '%5.5q' '%.3q'\n", "abc", "abc", "abc", MP_QSTR_True, MP_QSTR_True); // fixed string precision
         mp_printf(&mp_plat_print, "%.*s\n", -1, "abc"); // negative string precision
         mp_printf(&mp_plat_print, "%b %b\n", 0, 1); // bools
         #ifndef NDEBUG
diff --git a/py/mpprint.c b/py/mpprint.c
index 31cf73bb58af9..3218bd2f4dcf8 100644
--- a/py/mpprint.c
+++ b/py/mpprint.c
@@ -484,10 +484,10 @@ int mp_vprintf(const mp_print_t *print, const char *fmt, va_list args) {
                 qstr qst = va_arg(args, qstr);
                 size_t len;
                 const char *str = (const char *)qstr_data(qst, &len);
-                if (prec < 0) {
-                    prec = len;
+                if (prec >= 0 && (size_t)prec < len) {
+                    len = prec;
                 }
-                chrs += mp_print_strn(print, str, prec, flags, fill, width);
+                chrs += mp_print_strn(print, str, len, flags, fill, width);
                 break;
             }
             case 's': {
@@ -499,10 +499,11 @@ int mp_vprintf(const mp_print_t *print, const char *fmt, va_list args) {
                     break;
                 }
                 #endif
-                if (prec < 0) {
-                    prec = strlen(str);
+                size_t len = strlen(str);
+                if (prec >= 0 && (size_t)prec < len) {
+                    len = prec;
                 }
-                chrs += mp_print_strn(print, str, prec, flags, fill, width);
+                chrs += mp_print_strn(print, str, len, flags, fill, width);
                 break;
             }
             case 'd': {
diff --git a/py/objstr.c b/py/objstr.c
index 84728e6f2d919..9f8da873d66c0 100644
--- a/py/objstr.c
+++ b/py/objstr.c
@@ -123,10 +123,10 @@ STATIC void str_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t
     bool is_bytes = true;
     #endif
     if (kind == PRINT_RAW || (!MICROPY_PY_BUILTINS_STR_UNICODE && kind == PRINT_STR && !is_bytes)) {
-        mp_printf(print, "%.*s", str_len, str_data);
+        print->print_strn(print->data, (const char *)str_data, str_len);
     } else {
         if (is_bytes) {
-            mp_print_str(print, "b");
+            print->print_strn(print->data, "b", 1);
         }
         mp_str_print_quoted(print, str_data, str_len, is_bytes);
     }
diff --git a/py/objstrunicode.c b/py/objstrunicode.c
index b21df22a3bc0a..ed79ad68a93c6 100644
--- a/py/objstrunicode.c
+++ b/py/objstrunicode.c
@@ -92,7 +92,7 @@ STATIC void uni_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t
     }
     #endif
     if (kind == PRINT_STR) {
-        mp_printf(print, "%.*s", str_len, str_data);
+        print->print_strn(print->data, (const char *)str_data, str_len);
     } else {
         uni_print_quoted(print, str_data, str_len);
     }
diff --git a/tests/unix/extra_coverage.py.exp b/tests/unix/extra_coverage.py.exp
index 257224108a4c5..d97de2c0ef8b3 100644
--- a/tests/unix/extra_coverage.py.exp
+++ b/tests/unix/extra_coverage.py.exp
@@ -4,7 +4,7 @@
 123
 123
 1ABCDEF
-ab abc
+ab abc ' abc' ' True' 'Tru'
 
 false true
 (null)

From 248968863595fb285b1209927e27c37b06faf857 Mon Sep 17 00:00:00 2001
From: Glenn Ruben Bakke <glennbakke@gmail.com>
Date: Thu, 16 Jul 2020 22:19:19 +0200
Subject: [PATCH 0473/3533] nrf/boards: Update memory.ld to include bootloader
 offsets.

Adding variables that can be set from other linker scripts:

- _bootloader_head_size:
    Bootloader flash offset in front of the application.

- _bootloader_tail_size:
    Bootloader offset from the tail of the flash.
    In case the bootloader is located at the end.

- _bootloader_head_ram_size:
    Bootloader RAM usage in front of the application.

Updated calculations of application flash and RAM.
---
 ports/nrf/boards/memory.ld | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/ports/nrf/boards/memory.ld b/ports/nrf/boards/memory.ld
index f1f9a2a4c48b8..9c4c9c8bd1267 100644
--- a/ports/nrf/boards/memory.ld
+++ b/ports/nrf/boards/memory.ld
@@ -1,18 +1,20 @@
 
-/* Flash layout: softdevice     | application     | filesystem */
-/* RAM layout:   softdevice RAM | application RAM */
-
-_ram_start     = DEFINED(_ram_start) ? _ram_start : 0x20000000;
-_flash_start   = DEFINED(_flash_start) ? _flash_start : 0;
-_sd_size       = DEFINED(_sd_size) ? _sd_size : _flash_start;
+/* Flash layout: bootloader_head | softdevice     | application     | filesystem    | bootloader_tail */
+/* RAM layout:   bootloader RAM  | softdevice RAM  | application RAM */
+_bootloader_head_size = DEFINED(_bootloader_head_size) ? _bootloader_head_size : 0;
+_bootloader_tail_size = DEFINED(_bootloader_tail_size) ? _bootloader_tail_size : 0;
+_bootloader_head_ram_size = DEFINED(_bootloader_head_ram_size) ? _bootloader_head_ram_size : 0;
+_head_size     = DEFINED(_sd_size) ? _sd_size : _bootloader_head_size;
+_head_ram      = DEFINED(_sd_ram)  ? _sd_ram : _bootloader_head_ram_size;
+_sd_size       = DEFINED(_sd_size) ? _sd_size : 0;
 _sd_ram        = DEFINED(_sd_ram)  ? _sd_ram : 0;
 _fs_size       = DEFINED(_fs_size) ? _fs_size : 64K; /* TODO: set to 0 if not using the filesystem */
-_app_size      = _flash_size - _sd_size - _fs_size;
-_app_start     = _sd_size;
-_fs_start      = _sd_size + _app_size;
+_app_size      = _flash_size - _head_size - _fs_size  - _bootloader_tail_size;
+_app_start     = _head_size;
+_fs_start      = _head_size + _app_size;
 _fs_end        = _fs_start + _fs_size;
-_app_ram_start = _ram_start + _sd_ram;
-_app_ram_size  = _ram_size - _sd_ram;
+_app_ram_start = 0x20000000 + _head_ram;
+_app_ram_size  = _ram_size - _head_ram;
 _heap_start    = _ebss;
 _heap_end      = _ram_end - _stack_size;
 _heap_size     = _heap_end - _heap_start;

From 718397a37d7ec2071b5f5d3668c31e6b8f69f3b9 Mon Sep 17 00:00:00 2001
From: Glenn Ruben Bakke <glennbakke@gmail.com>
Date: Thu, 16 Jul 2020 23:04:02 +0200
Subject: [PATCH 0474/3533] nrf/Makefile: Add bootloader specific section.

Add the option for "mpconfigboard.mk" to define whether the
board hosts a bootloader or not. The BOOTLOADER make variable
must be set to the name of the bootloader.

When the BOOTLOADER name is set it is also required to supply
the BOOTLOADER_VERSION_MAJOR and the BOOTLOADER_VERSION_MINOR
from the "mpconfigboards.mk". These will be used to resolve which
bootloader linker script that should be passed to the linker.

The BOOTLOADER section also supplies the C-compiler with
BOOTLOADER_<bootloader name>=<version major><version minor>
as a compiler define. This is for future use in case a bootloader
needs to do modification to the startup files or similar (like
setting the VTOR specific to a version of a bootloader).
---
 ports/nrf/Makefile | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/ports/nrf/Makefile b/ports/nrf/Makefile
index e5a1b471a35d7..4ee9384ec28ff 100644
--- a/ports/nrf/Makefile
+++ b/ports/nrf/Makefile
@@ -26,6 +26,13 @@ else
 	include drivers/bluetooth/bluetooth_common.mk
 endif
 
+ifneq ($(BOOTLOADER),)
+	BOOTLOADER_UPPER = $(shell echo $(BOOTLOADER) | tr '[:lower:]' '[:upper:]')
+	# Use additional bootloader linker script
+	LD_FILES += boards/$(MCU_SUB_VARIANT)_$(BOOTLOADER)_$(BOOTLOADER_VERSION_MAJOR).$(BOOTLOADER_VERSION_MINOR).x.ld
+	CFLAGS += -DBOOTLOADER_$(BOOTLOADER_UPPER)_VERSION=$(BOOTLOADER_MAJOR)$(BOOTLOADER_MINOR)
+endif
+
 LD_FILES += boards/memory.ld boards/common.ld
 
 ifneq ($(LD_FILE),)

From 634f6df32485457dd1c236633cffd49177aaf826 Mon Sep 17 00:00:00 2001
From: Glenn Ruben Bakke <glennbakke@gmail.com>
Date: Thu, 16 Jul 2020 23:17:28 +0200
Subject: [PATCH 0475/3533] nrf/Makefile: Add support for flashing with
 nrfutil.

An additional Makefile parameter NRFUTIL_PORT can be set in order
to define the serial port to used for the DFU (Default: /dev/ttyACM0).

The "nrfutil" that is used as flasher towards OpenBootloader is
available for installation through Python "pip".

In case of SD=s140, SoftDevice ID 0xB6 is passed to nrfutil's package
generation which corresponds to SoftDevice s140 v6.1.1.
---
 ports/nrf/Makefile | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/ports/nrf/Makefile b/ports/nrf/Makefile
index 4ee9384ec28ff..86809508042c1 100644
--- a/ports/nrf/Makefile
+++ b/ports/nrf/Makefile
@@ -446,6 +446,31 @@ deploy: $(BUILD)/$(OUTPUT_FILENAME).hex
 sd: $(BUILD)/$(OUTPUT_FILENAME).hex
 	$(Q)$(OPENOCD) -f interface/cmsis-dap.cfg -f $(OPENOCD_TARGET) -c "init" -c "program $(SOFTDEV_HEX) verify reset" -c "exit"
 
+else ifeq ($(FLASHER), nrfutil)
+
+NRFUTIL_PORT ?= /dev/ttyACM0
+NRFUTIL_SD_REQ ?= 0x00
+
+ifeq ($(SD), s140)
+NRFUTIL_SD_REQ = 0xB6
+endif
+
+.PHONY: nrfutil_dfu_sd nrfutil_dfu_deploy
+.NOTPARALLEL: nrfutil_dfu_sd nrfutil_dfu_deploy
+
+# DFU both SD and app in case of target "sd"
+sd: nrfutil_dfu_sd nrfutil_dfu_deploy
+
+nrfutil_dfu_sd: $(BUILD)/$(OUTPUT_FILENAME).hex
+	$(Q)hexmerge.py -o $(BUILD)/stripped_sd.hex --range=0x1000: $(SOFTDEV_HEX)
+	$(Q)nrfutil pkg generate --hw-version 52 --sd-req 0x00 --sd-id 0x00 --softdevice $(BUILD)/stripped_sd.hex $(BUILD)/stripped_sd.zip
+	$(Q)nrfutil dfu usb-serial -pkg $(BUILD)/stripped_sd.zip -p $(NRFUTIL_PORT) -t 0
+
+nrfutil_dfu_deploy: $(BUILD)/$(OUTPUT_FILENAME).hex
+	$(Q)nrfutil pkg generate --hw-version 52 --sd-req $(NRFUTIL_SD_REQ) --application-version 1 --application $(BUILD)/$(OUTPUT_FILENAME).hex $(BUILD)/$(OUTPUT_FILENAME)_dfu.zip
+	$(Q)nrfutil dfu usb-serial -pkg $(BUILD)/$(OUTPUT_FILENAME)_dfu.zip -p $(NRFUTIL_PORT) -t 0
+
+deploy: nrfutil_dfu_deploy
 endif
 
 flash: deploy

From 7f405236a3355467a37cb16762939d6362352089 Mon Sep 17 00:00:00 2001
From: Glenn Ruben Bakke <glennbakke@gmail.com>
Date: Thu, 16 Jul 2020 23:23:41 +0200
Subject: [PATCH 0476/3533] nrf/boards: Add linker script for nrf52840 Open
 Bootloader 1.2.0.

---
 ports/nrf/boards/nrf52840_open_bootloader_1.2.x.ld | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 ports/nrf/boards/nrf52840_open_bootloader_1.2.x.ld

diff --git a/ports/nrf/boards/nrf52840_open_bootloader_1.2.x.ld b/ports/nrf/boards/nrf52840_open_bootloader_1.2.x.ld
new file mode 100644
index 0000000000000..c23a2dbda411f
--- /dev/null
+++ b/ports/nrf/boards/nrf52840_open_bootloader_1.2.x.ld
@@ -0,0 +1,5 @@
+/* GNU linker script for nrf52840 Open Bootloader version 1.2.x */
+
+_bootloader_head_size = 0x1000;  /* MBR */
+_bootloader_tail_size = 0x20000; /* Bootloader start address 0x000E0000 */
+_bootloader_head_ram_size = 0x8;

From d0b8554df477ca1b9daf634d01604e3f760909ca Mon Sep 17 00:00:00 2001
From: Glenn Ruben Bakke <glennbakke@gmail.com>
Date: Thu, 3 Dec 2020 21:22:27 +0100
Subject: [PATCH 0477/3533] nrf: Change selected boards to utilize pre-flashed
 bootloader.

The nrf52840-mdk-usb-dongle and pca10050 comes with a pre-flashed
bootloader (OpenBootloader).

This commit updates the boards "mpconfigboard.mk" to use DFU as
default flashing method and set the corresponding BOOTLOADER
settings such that nrf52840_open_bootloader_1.2.x.ld linker
script is used.

The default DFU flashing method can be disabled by issuing "DFU=0"
when invoking make. This will lead to "segger" being used as default
flashing tool. When using "DFU=0", the linker scripts will not
compensate for any MBR and Bootloader region being present, and might
overwrite them if they were present.

The commit also removes the custom linker script specific to
nrf52840-mdk-usb-dongle as it now points to a generic.

Updated nrf52840-mdk-usb-dongle's README.md to be more clear on
how to deploy the built firmware.

The port README.md has also been updated. In the list of target
boards a new column has been added to indicate which bootloader
is present on the target board. And for consistency, changed all
examples in the README.md to use "deploy" instead of "flash".
---
 ports/nrf/README.md                           | 70 +++++++++++++------
 .../boards/nrf52840-mdk-usb-dongle/README.md  |  9 ++-
 .../nrf52840-mdk-usb-dongle/mpconfigboard.mk  | 14 +++-
 .../nrf52840_open_bootloader.ld               |  2 -
 ports/nrf/boards/pca10059/mpconfigboard.mk    | 12 ++++
 5 files changed, 77 insertions(+), 30 deletions(-)
 delete mode 100644 ports/nrf/boards/nrf52840-mdk-usb-dongle/nrf52840_open_bootloader.ld

diff --git a/ports/nrf/README.md b/ports/nrf/README.md
index 5fceb6705f6d2..22bb4af514a39 100644
--- a/ports/nrf/README.md
+++ b/ports/nrf/README.md
@@ -58,12 +58,12 @@ By default, the PCA10040 (nrf52832) is used as compile target. To build and flas
 
     make submodules
     make
-    make flash
+    make deploy
 
 Alternatively the target board could be defined:
 
      make BOARD=pca10040
-     make BOARD=pca10040 flash
+     make BOARD=pca10040 deploy
 
 ## Compile without LTO enabled
 
@@ -118,26 +118,27 @@ For example:
 
 ## Target Boards and Make Flags
 
-Target Board (BOARD) | Bluetooth Stack (SD)    | Bluetooth Support      | Flash Util
----------------------|-------------------------|------------------------|-------------------------------
-microbit             | s110                    | Peripheral             | [PyOCD](#pyocdopenocd-targets)
-pca10000             | s110                    | Peripheral             | [Segger](#segger-targets)
-pca10001             | s110                    | Peripheral             | [Segger](#segger-targets)
-pca10028             | s110                    | Peripheral             | [Segger](#segger-targets)
-pca10031             | s110                    | Peripheral             | [Segger](#segger-targets)
-wt51822_s4at         | s110                    | Peripheral             | Manual, see [datasheet](https://4tronix.co.uk/picobot2/WT51822-S4AT.pdf) for pinout
-pca10040             | s132                    | Peripheral and Central | [Segger](#segger-targets)
-feather52            | s132                    | Peripheral and Central | Manual, SWDIO and SWCLK solder points on the bottom side of the board
-arduino_primo        | s132                    | Peripheral and Central | [PyOCD](#pyocdopenocd-targets)
-ibk_blyst_nano       | s132                    | Peripheral and Central | [IDAP](#idap-midap-link-targets)
-idk_blyst_nano       | s132                    | Peripheral and Central | [IDAP](#idap-midap-link-targets)
-blueio_tag_evim      | s132                    | Peripheral and Central | [IDAP](#idap-midap-link-targets)
-evk_nina_b1          | s132                    | Peripheral and Central | [Segger](#segger-targets)
-pca10056             | s140                    | Peripheral and Central | [Segger](#segger-targets)
-pca10059             | s140                    | Peripheral and Central | Manual, SWDIO and SWCLK solder points on the sides.
-particle_xenon       | s140                    | Peripheral and Central | [Black Magic Probe](#black-magic-probe-targets)
-pca10090             | None (bsdlib.a)         | None (LTE/GNSS)        | [Segger](#segger-targets)
-actinius_icarus      | None (bsdlib.a)         | None (LTE/GNSS)        | [Segger](#segger-targets)
+Target Board (BOARD) | Bluetooth Stack (SD)    | Bluetooth Support      | Bootloader     | Default Flash Util
+---------------------|-------------------------|------------------------|----------------|-------------------
+microbit             | s110                    | Peripheral             |                | [PyOCD](#pyocdopenocd-targets)
+pca10000             | s110                    | Peripheral             |                | [Segger](#segger-targets)
+pca10001             | s110                    | Peripheral             |                | [Segger](#segger-targets)
+pca10028             | s110                    | Peripheral             |                | [Segger](#segger-targets)
+pca10031             | s110                    | Peripheral             |                | [Segger](#segger-targets)
+wt51822_s4at         | s110                    | Peripheral             |                | Manual, see [datasheet](https://4tronix.co.uk/picobot2/WT51822-S4AT.pdf) for pinout
+pca10040             | s132                    | Peripheral and Central |                | [Segger](#segger-targets)
+feather52            | s132                    | Peripheral and Central |                | Manual, SWDIO and SWCLK solder points on the bottom side of the board
+arduino_primo        | s132                    | Peripheral and Central |                | [PyOCD](#pyocdopenocd-targets)
+ibk_blyst_nano       | s132                    | Peripheral and Central |                | [IDAP](#idap-midap-link-targets)
+idk_blyst_nano       | s132                    | Peripheral and Central |                | [IDAP](#idap-midap-link-targets)
+blueio_tag_evim      | s132                    | Peripheral and Central |                | [IDAP](#idap-midap-link-targets)
+evk_nina_b1          | s132                    | Peripheral and Central |                | [Segger](#segger-targets)
+pca10056             | s140                    | Peripheral and Central |                | [Segger](#segger-targets)
+pca10059             | s140                    | Peripheral and Central | OpenBootloader | [nrfutil](#nrfutil-targets)
+particle_xenon       | s140                    | Peripheral and Central |                | [Black Magic Probe](#black-magic-probe-targets)
+nrf52840-mdk-usb-dongle | s140                 | Peripheral and Central | OpenBootloader | [nrfutil](#nrfutil-targets)
+pca10090             | None (bsdlib.a)         | None (LTE/GNSS)        |                | [Segger](#segger-targets)
+actinius_icarus      | None (bsdlib.a)         | None (LTE/GNSS)        |                | [Segger](#segger-targets)
 
 ## IDAP-M/IDAP-Link Targets
 
@@ -173,6 +174,31 @@ This requires no further dependencies other than `arm-none-eabi-gdb`.
 [this guide](https://github.com/blacksphere/blackmagic/wiki/Useful-GDB-commands)
 for more tips about using the BMP with GDB.
 
+## nRFUtil Targets
+
+Install the necessary Python packages that will be used for flashing using the bootloader:
+
+    sudo pip install nrfutil
+    sudo pip install intelhex
+
+The `intelhex` provides the `hexmerge.py` utility which is used by the Makefile
+to trim of the MBR in case SoftDevice flashing is requested.
+
+`nrfutil` as flashing backend also requires a serial port paramter to be defined
+in addition to the `deploy` target of make. For example:
+
+    make BOARD=nrf52840-mdk-usb-dongle NRFUTIL_PORT=/dev/ttyACM0 deploy
+
+If the target device is connected to `/dev/ttyACM0` serial port, the
+`NRFUTIL_PORT` parameter to make can be elided as it is the default serial
+port set by the Makefile.
+
+When enabling Bluetooth LE, as with the other flash utils, the SoftDevice
+needs to be flashed in the first firmware update. This can be done by issuing
+the `sd` target instead of `deploy`. For example:
+
+    make BOARD=nrf52840-mdk-usb-dongle SD=s140 NRFUTIL_PORT=/dev/ttyACM0 sd
+
 ## Bluetooth LE REPL
 
 The port also implements a BLE REPL driver. This feature is disabled by default, as it will deactivate the UART REPL when activated. As some of the nRF devices only have one UART, using the BLE REPL free's the UART instance such that it can be used as a general UART peripheral not bound to REPL.
diff --git a/ports/nrf/boards/nrf52840-mdk-usb-dongle/README.md b/ports/nrf/boards/nrf52840-mdk-usb-dongle/README.md
index c39a800d776cf..f993c7dc53623 100644
--- a/ports/nrf/boards/nrf52840-mdk-usb-dongle/README.md
+++ b/ports/nrf/boards/nrf52840-mdk-usb-dongle/README.md
@@ -39,11 +39,10 @@ Follow the standard [nRF Port build instructions](../../README.md); but use
     make BOARD=nrf52840-mdk-usb-dongle
 
 The build artifacts will be created in `build-nrf52840-mdk-usb-dongle`. Once
-built, the easiest way to deploy to the device is to open `firmware.hex` using
+built, the target can be deployed to the device as described in
+[nRFUtil targets](../../README.md#nrfutil-targets).
+
+An alternative way to deploy to the device, is to open `firmware.hex` using
 *nRF Connect* and select *Write*. Detailed instructions can be found on the
 [developer
 wiki](https://wiki.makerdiary.com/nrf52840-mdk-usb-dongle/programming/). 
-
-**Note** that the regular method of deployment for the MicroPython nRF port
-(using `make deploy`) will *not* operate correctly and will overwrite the
-bootloader.
diff --git a/ports/nrf/boards/nrf52840-mdk-usb-dongle/mpconfigboard.mk b/ports/nrf/boards/nrf52840-mdk-usb-dongle/mpconfigboard.mk
index f98d5c88a9076..ca437418d5254 100644
--- a/ports/nrf/boards/nrf52840-mdk-usb-dongle/mpconfigboard.mk
+++ b/ports/nrf/boards/nrf52840-mdk-usb-dongle/mpconfigboard.mk
@@ -2,6 +2,18 @@ MCU_SERIES = m4
 MCU_VARIANT = nrf52
 MCU_SUB_VARIANT = nrf52840
 SOFTDEV_VERSION = 6.1.1
-LD_FILES += boards/nrf52840-mdk-usb-dongle/nrf52840_open_bootloader.ld boards/nrf52840_1M_256k.ld
+
+DFU ?= 1
+
+ifeq ($(DFU),1)
+BOOTLOADER=open_bootloader
+BOOTLOADER_VERSION_MAJOR=1
+BOOTLOADER_VERSION_MINOR=2
+FLASHER=nrfutil
+else
+FLASHER=segger
+endif
+
+LD_FILES += boards/nrf52840_1M_256k.ld
 
 NRF_DEFINES += -DNRF52840_XXAA
diff --git a/ports/nrf/boards/nrf52840-mdk-usb-dongle/nrf52840_open_bootloader.ld b/ports/nrf/boards/nrf52840-mdk-usb-dongle/nrf52840_open_bootloader.ld
deleted file mode 100644
index d6c6e743a4daf..0000000000000
--- a/ports/nrf/boards/nrf52840-mdk-usb-dongle/nrf52840_open_bootloader.ld
+++ /dev/null
@@ -1,2 +0,0 @@
-_ram_start   = 0x20000008;
-_flash_start = 0x1000;
diff --git a/ports/nrf/boards/pca10059/mpconfigboard.mk b/ports/nrf/boards/pca10059/mpconfigboard.mk
index ca555d3932aa4..ca437418d5254 100644
--- a/ports/nrf/boards/pca10059/mpconfigboard.mk
+++ b/ports/nrf/boards/pca10059/mpconfigboard.mk
@@ -2,6 +2,18 @@ MCU_SERIES = m4
 MCU_VARIANT = nrf52
 MCU_SUB_VARIANT = nrf52840
 SOFTDEV_VERSION = 6.1.1
+
+DFU ?= 1
+
+ifeq ($(DFU),1)
+BOOTLOADER=open_bootloader
+BOOTLOADER_VERSION_MAJOR=1
+BOOTLOADER_VERSION_MINOR=2
+FLASHER=nrfutil
+else
+FLASHER=segger
+endif
+
 LD_FILES += boards/nrf52840_1M_256k.ld
 
 NRF_DEFINES += -DNRF52840_XXAA

From cd61fc8e44202feb20a4c52b56f75740aa72d075 Mon Sep 17 00:00:00 2001
From: Reinhard Feger <feg@LT-Feger.icie.jku.at>
Date: Fri, 24 Jul 2020 22:53:43 +0200
Subject: [PATCH 0478/3533] stm32/boards/stm32h743.ld: Enable D2 RAM and add
 eth-buffer section.

---
 ports/stm32/boards/stm32h743.ld | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/ports/stm32/boards/stm32h743.ld b/ports/stm32/boards/stm32h743.ld
index 69738ab8b913a..8cf8a4e591a5f 100644
--- a/ports/stm32/boards/stm32h743.ld
+++ b/ports/stm32/boards/stm32h743.ld
@@ -10,7 +10,8 @@ MEMORY
     FLASH_FS (r)    : ORIGIN = 0x08020000, LENGTH = 128K    /* sector 1, 128K */
     FLASH_TEXT (rx) : ORIGIN = 0x08040000, LENGTH = 1792K   /* sectors 6*128 + 8*128 */
     DTCM (xrw)      : ORIGIN = 0x20000000, LENGTH = 128K    /* Used for storage cache */
-    RAM (xrw)       : ORIGIN = 0x24000000, LENGTH = 512K    /* AXI SRAM */
+    RAM (xrw)       : ORIGIN = 0x24000000, LENGTH = 512K    /* AXI SRAM */    
+    RAM_D2 (xrw)    : ORIGIN = 0x30000000, LENGTH = 288K
 }
 
 /* produce a link error if there is not this amount of RAM for these sections */
@@ -27,3 +28,12 @@ _ram_start = ORIGIN(RAM);
 _ram_end = ORIGIN(RAM) + LENGTH(RAM);
 _heap_start = _ebss; /* heap starts just after statically allocated memory */
 _heap_end = _sstack;
+
+/* Define output sections */
+SECTIONS
+{
+    .eth_buffers (NOLOAD) : {
+        . = ABSOLUTE(0x30040000);
+        *eth.o*(.bss.eth_dma)
+    } >RAM_D2
+}

From d986b2012289cecba1f249c4e29446a0bfe680a2 Mon Sep 17 00:00:00 2001
From: Reinhard Feger <feg@LT-Feger.icie.jku.at>
Date: Fri, 24 Jul 2020 23:08:41 +0200
Subject: [PATCH 0479/3533] stm32/eth: Add support for H7 processors.

---
 ports/stm32/eth.c | 231 +++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 226 insertions(+), 5 deletions(-)

diff --git a/ports/stm32/eth.c b/ports/stm32/eth.c
index 33d20707e21c0..7a08e8c28c34d 100644
--- a/ports/stm32/eth.c
+++ b/ports/stm32/eth.c
@@ -61,7 +61,19 @@
 #define PHY_SCSR_SPEED_100FULL  (6 << PHY_SCSR_SPEED_Pos)
 
 // ETH DMA RX and TX descriptor definitions
-
+#if defined(STM32H7)
+#define RX_DESCR_3_OWN_Pos      (31)
+#define RX_DESCR_3_IOC_Pos      (30)
+#define RX_DESCR_3_BUF1V_Pos    (24)
+#define RX_DESCR_3_PL_Msk       (0x7fff)
+
+#define TX_DESCR_3_OWN_Pos      (31)
+#define TX_DESCR_3_LD_Pos       (29)
+#define TX_DESCR_3_FD_Pos       (28)
+#define TX_DESCR_3_CIC_Pos      (16)
+#define TX_DESCR_2_B1L_Pos      (0)
+#define TX_DESCR_2_B1L_Msk      (0x3fff << TX_DESCR_2_B1L_Pos)
+#else
 #define RX_DESCR_0_OWN_Pos      (31)
 #define RX_DESCR_0_FL_Pos       (16)
 #define RX_DESCR_0_FL_Msk       (0x3fff << RX_DESCR_0_FL_Pos)
@@ -78,6 +90,7 @@
 #define TX_DESCR_0_TER_Pos      (21)
 #define TX_DESCR_0_TCH_Pos      (20)
 #define TX_DESCR_1_TBS1_Pos     (0)
+#endif
 
 // Configuration values
 
@@ -121,6 +134,20 @@ STATIC void eth_mac_deinit(eth_t *self);
 STATIC void eth_process_frame(eth_t *self, size_t len, const uint8_t *buf);
 
 STATIC void eth_phy_write(uint32_t reg, uint32_t val) {
+    #if defined(STM32H7)
+    while (ETH->MACMDIOAR & ETH_MACMDIOAR_MB) {
+    }
+    uint32_t ar = ETH->MACMDIOAR;
+    ar &= ~ETH_MACMDIOAR_RDA_Msk;
+    ar |= reg << ETH_MACMDIOAR_RDA_Pos;
+    ar &= ~ETH_MACMDIOAR_MOC_Msk;
+    ar |= ETH_MACMDIOAR_MOC_WR;
+    ar |= ETH_MACMDIOAR_MB;
+    ETH->MACMDIODR = val;
+    ETH->MACMDIOAR = ar;
+    while (ETH->MACMDIOAR & ETH_MACMDIOAR_MB) {
+    }
+    #else
     while (ETH->MACMIIAR & ETH_MACMIIAR_MB) {
     }
     ETH->MACMIIDR = val;
@@ -129,9 +156,24 @@ STATIC void eth_phy_write(uint32_t reg, uint32_t val) {
     ETH->MACMIIAR = ar;
     while (ETH->MACMIIAR & ETH_MACMIIAR_MB) {
     }
+    #endif
 }
 
 STATIC uint32_t eth_phy_read(uint32_t reg) {
+    #if defined(STM32H7)
+    while (ETH->MACMDIOAR & ETH_MACMDIOAR_MB) {
+    }
+    uint32_t ar = ETH->MACMDIOAR;
+    ar &= ~ETH_MACMDIOAR_RDA_Msk;
+    ar |= reg << ETH_MACMDIOAR_RDA_Pos;
+    ar &= ~ETH_MACMDIOAR_MOC_Msk;
+    ar |= ETH_MACMDIOAR_MOC_RD;
+    ar |= ETH_MACMDIOAR_MB;
+    ETH->MACMDIOAR = ar;
+    while (ETH->MACMDIOAR & ETH_MACMDIOAR_MB) {
+    }
+    return ETH->MACMDIODR;
+    #else
     while (ETH->MACMIIAR & ETH_MACMIIAR_MB) {
     }
     uint32_t ar = ETH->MACMIIAR;
@@ -140,6 +182,7 @@ STATIC uint32_t eth_phy_read(uint32_t reg) {
     while (ETH->MACMIIAR & ETH_MACMIIAR_MB) {
     }
     return ETH->MACMIIDR;
+    #endif
 }
 
 void eth_init(eth_t *self, int mac_idx) {
@@ -160,7 +203,7 @@ STATIC int eth_mac_init(eth_t *self) {
     // Configure GPIO
     mp_hal_pin_config_alt_static(MICROPY_HW_ETH_MDC, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE, STATIC_AF_ETH_MDC);
     mp_hal_pin_config_alt_static(MICROPY_HW_ETH_MDIO, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE, STATIC_AF_ETH_MDIO);
-    mp_hal_pin_config_alt_static(MICROPY_HW_ETH_RMII_REF_CLK, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE, STATIC_AF_ETH_RMII_REF_CLK);
+    mp_hal_pin_config_alt_static_speed(MICROPY_HW_ETH_RMII_REF_CLK, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE, MP_HAL_PIN_SPEED_MEDIUM, STATIC_AF_ETH_RMII_REF_CLK);
     mp_hal_pin_config_alt_static(MICROPY_HW_ETH_RMII_CRS_DV, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE, STATIC_AF_ETH_RMII_CRS_DV);
     mp_hal_pin_config_alt_static(MICROPY_HW_ETH_RMII_RXD0, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE, STATIC_AF_ETH_RMII_RXD0);
     mp_hal_pin_config_alt_static(MICROPY_HW_ETH_RMII_RXD1, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE, STATIC_AF_ETH_RMII_RXD1);
@@ -168,26 +211,53 @@ STATIC int eth_mac_init(eth_t *self) {
     mp_hal_pin_config_alt_static(MICROPY_HW_ETH_RMII_TXD0, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE, STATIC_AF_ETH_RMII_TXD0);
     mp_hal_pin_config_alt_static(MICROPY_HW_ETH_RMII_TXD1, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE, STATIC_AF_ETH_RMII_TXD1);
 
+    #if defined(STM32H7)
+    __HAL_RCC_ETH1MAC_CLK_ENABLE();
+    __HAL_RCC_ETH1TX_CLK_ENABLE();
+    __HAL_RCC_ETH1RX_CLK_ENABLE();
+    __HAL_RCC_ETH1MAC_FORCE_RESET();
+    #else
     __HAL_RCC_ETH_CLK_ENABLE();
     __HAL_RCC_ETHMAC_FORCE_RESET();
+    #endif
 
     // Select RMII interface
+    #if defined(STM32H7)
+    SYSCFG->PMCR = (SYSCFG->PMCR & ~SYSCFG_PMCR_EPIS_SEL_Msk) | SYSCFG_PMCR_EPIS_SEL_2;
+    #else
     __HAL_RCC_SYSCFG_CLK_ENABLE();
     SYSCFG->PMC |= SYSCFG_PMC_MII_RMII_SEL;
+    #endif
+
+    #if defined(STM32H7)
+    __HAL_RCC_ETH1MAC_RELEASE_RESET();
 
+    __HAL_RCC_ETH1MAC_CLK_SLEEP_ENABLE();
+    __HAL_RCC_ETH1TX_CLK_SLEEP_ENABLE();
+    __HAL_RCC_ETH1RX_CLK_SLEEP_ENABLE();
+    #else
     __HAL_RCC_ETHMAC_RELEASE_RESET();
 
     __HAL_RCC_ETHMAC_CLK_SLEEP_ENABLE();
     __HAL_RCC_ETHMACTX_CLK_SLEEP_ENABLE();
     __HAL_RCC_ETHMACRX_CLK_SLEEP_ENABLE();
+    #endif
 
     // Do a soft reset of the MAC core
-    ETH->DMABMR = ETH_DMABMR_SR;
+    #if defined(STM32H7)
+    #define ETH_SOFT_RESET(eth) do { eth->DMAMR = ETH_DMAMR_SWR; } while (0)
+    #define ETH_IS_RESET(eth) (eth->DMAMR & ETH_DMAMR_SWR)
+    #else
+    #define ETH_SOFT_RESET(eth) do { eth->DMABMR = ETH_DMABMR_SR; } while (0)
+    #define ETH_IS_RESET(eth) (eth->DMABMR & ETH_DMABMR_SR)
+    #endif
+
+    ETH_SOFT_RESET(ETH);
     mp_hal_delay_ms(2);
 
     // Wait for soft reset to finish
     uint32_t t0 = mp_hal_ticks_ms();
-    while (ETH->DMABMR & ETH_DMABMR_SR) {
+    while (ETH_IS_RESET(ETH)) {
         if (mp_hal_ticks_ms() - t0 > 1000) {
             return -MP_ETIMEDOUT;
         }
@@ -196,6 +266,21 @@ STATIC int eth_mac_init(eth_t *self) {
     // Set MII clock range
     uint32_t hclk = HAL_RCC_GetHCLKFreq();
     uint32_t cr_div;
+    #if defined(STM32H7)
+    cr_div = ETH->MACMDIOAR & ~ETH_MACMDIOAR_CR;
+    if (hclk < 35000000) {
+        cr_div |= ETH_MACMDIOAR_CR_DIV16;
+    } else if (hclk < 60000000) {
+        cr_div |= ETH_MACMDIOAR_CR_DIV26;
+    } else if (hclk < 100000000) {
+        cr_div |= ETH_MACMDIOAR_CR_DIV42;
+    } else if (hclk < 150000000) {
+        cr_div |= ETH_MACMDIOAR_CR_DIV62;
+    } else {
+        cr_div |= ETH_MACMDIOAR_CR_DIV102;
+    }
+    ETH->MACMDIOAR = cr_div;
+    #else
     if (hclk < 35000000) {
         cr_div = ETH_MACMIIAR_CR_Div16;
     } else if (hclk < 60000000) {
@@ -208,6 +293,12 @@ STATIC int eth_mac_init(eth_t *self) {
         cr_div = ETH_MACMIIAR_CR_Div102;
     }
     ETH->MACMIIAR = cr_div;
+    #endif
+
+    #if defined(STM32H7)
+    // don't skip 32bit words since our desriptors are continuous in memory
+    ETH->DMACCR &= ~(ETH_DMACCR_DSL_Msk);
+    #endif
 
     // Reset the PHY
     eth_phy_write(PHY_BCR, PHY_BCR_SOFT_RESET);
@@ -249,17 +340,36 @@ STATIC int eth_mac_init(eth_t *self) {
     uint16_t phy_scsr = eth_phy_read(PHY_SCSR);
 
     // Burst mode configuration
+    #if defined(STM32H7)
+    ETH->DMASBMR = ETH->DMASBMR & ~ETH_DMASBMR_AAL & ~ETH_DMASBMR_FB;
+    #else
     ETH->DMABMR = 0;
+    #endif
     mp_hal_delay_ms(2);
 
     // Select DMA interrupts
+    #if defined(STM32H7)
+    ETH->DMACIER = ETH->DMACIER
+        | ETH_DMACIER_NIE // enable normal interrupts
+        | ETH_DMACIER_RIE // enable RX interrupt
+    ;
+    #else
     ETH->DMAIER =
         ETH_DMAIER_NISE // enable normal interrupts
         | ETH_DMAIER_RIE // enable RX interrupt
     ;
+    #endif
 
     // Configure RX descriptor lists
     for (size_t i = 0; i < RX_BUF_NUM; ++i) {
+        #if defined(STM32H7)
+        eth_dma.rx_descr[i].rdes3 =
+            1 << RX_DESCR_3_OWN_Pos
+                | (1 << RX_DESCR_3_BUF1V_Pos) // buf1 address valid
+                | (1 << RX_DESCR_3_IOC_Pos) // Interrupt Enabled on Completion
+        ;
+        eth_dma.rx_descr[i].rdes0 = (uint32_t)&eth_dma.rx_buf[i * RX_BUF_SIZE]; // buf 1 address
+        #else
         eth_dma.rx_descr[i].rdes0 = 1 << RX_DESCR_0_OWN_Pos;
         eth_dma.rx_descr[i].rdes1 =
             1 << RX_DESCR_1_RCH_Pos // chained
@@ -267,31 +377,64 @@ STATIC int eth_mac_init(eth_t *self) {
         ;
         eth_dma.rx_descr[i].rdes2 = (uint32_t)&eth_dma.rx_buf[i * RX_BUF_SIZE];
         eth_dma.rx_descr[i].rdes3 = (uint32_t)&eth_dma.rx_descr[(i + 1) % RX_BUF_NUM];
+        #endif
     }
+
+    #if defined(STM32H7)
+    ETH->DMACRDLAR = (uint32_t)&eth_dma.rx_descr[0];
+    #else
     ETH->DMARDLAR = (uint32_t)&eth_dma.rx_descr[0];
+    #endif
     eth_dma.rx_descr_idx = 0;
 
     // Configure TX descriptor lists
     for (size_t i = 0; i < TX_BUF_NUM; ++i) {
+        #if defined(STM32H7)
+        eth_dma.tx_descr[i].tdes0 = 0;
+        eth_dma.tx_descr[i].tdes1 = 0;
+        eth_dma.tx_descr[i].tdes2 = TX_BUF_SIZE & TX_DESCR_2_B1L_Msk;
+        eth_dma.tx_descr[i].tdes3 = 0;
+        #else
         eth_dma.tx_descr[i].tdes0 = 1 << TX_DESCR_0_TCH_Pos;
         eth_dma.tx_descr[i].tdes1 = 0;
         eth_dma.tx_descr[i].tdes2 = 0;
         eth_dma.tx_descr[i].tdes3 = (uint32_t)&eth_dma.tx_descr[(i + 1) % TX_BUF_NUM];
+        #endif
     }
+
+    #if defined(STM32H7)
+    // set number of descriptors and buffers
+    ETH->DMACTDRLR = TX_BUF_NUM - 1;
+    ETH->DMACRDRLR = RX_BUF_NUM - 1;
+
+    ETH->DMACTDLAR = (uint32_t)&eth_dma.tx_descr[0];
+    #else
     ETH->DMATDLAR = (uint32_t)&eth_dma.tx_descr[0];
+    #endif
     eth_dma.tx_descr_idx = 0;
 
     // Configure DMA
+    #if defined(STM32H7)
+    // read from RX FIFO only after a full frame is written
+    ETH->MTLRQOMR = ETH_MTLRQOMR_RSF;
+    // transmission starts when a full packet resides in the Tx queue
+    ETH->MTLTQOMR = ETH_MTLTQOMR_TSF;
+    #else
     ETH->DMAOMR =
         ETH_DMAOMR_RSF // read from RX FIFO after a full frame is written
         | ETH_DMAOMR_TSF // transmit when a full frame is in TX FIFO (needed by errata)
     ;
+    #endif
     mp_hal_delay_ms(2);
 
     // Select MAC filtering options
+    #if defined(STM32H7)
+    ETH->MACPFR = ETH_MACPFR_RA; // pass all frames up
+    #else
     ETH->MACFFR =
         ETH_MACFFR_RA // pass all frames up
     ;
+    #endif
     mp_hal_delay_ms(2);
 
     // Set MAC address
@@ -318,10 +461,15 @@ STATIC int eth_mac_init(eth_t *self) {
     mp_hal_delay_ms(2);
 
     // Start DMA layer
+    #if defined(STM32H7)
+    ETH->DMACRCR |= ETH_DMACRCR_SR; // start RX
+    ETH->DMACTCR |= ETH_DMACTCR_ST; // start TX
+    #else
     ETH->DMAOMR |=
         ETH_DMAOMR_ST // start TX
         | ETH_DMAOMR_SR // start RX
     ;
+    #endif
     mp_hal_delay_ms(2);
 
     // Enable interrupts
@@ -334,9 +482,15 @@ STATIC int eth_mac_init(eth_t *self) {
 STATIC void eth_mac_deinit(eth_t *self) {
     (void)self;
     HAL_NVIC_DisableIRQ(ETH_IRQn);
+    #if defined(STM32H7)
+    __HAL_RCC_ETH1MAC_FORCE_RESET();
+    __HAL_RCC_ETH1MAC_RELEASE_RESET();
+    __HAL_RCC_ETH1MAC_CLK_DISABLE();
+    #else
     __HAL_RCC_ETHMAC_FORCE_RESET();
     __HAL_RCC_ETHMAC_RELEASE_RESET();
     __HAL_RCC_ETH_CLK_DISABLE();
+    #endif
 }
 
 STATIC int eth_tx_buf_get(size_t len, uint8_t **buf) {
@@ -348,19 +502,32 @@ STATIC int eth_tx_buf_get(size_t len, uint8_t **buf) {
     eth_dma_tx_descr_t *tx_descr = &eth_dma.tx_descr[eth_dma.tx_descr_idx];
     uint32_t t0 = mp_hal_ticks_ms();
     for (;;) {
+        #if defined(STM32H7)
+        if (!(tx_descr->tdes3 & (1 << TX_DESCR_3_OWN_Pos))) {
+            break;
+        }
+        #else
         if (!(tx_descr->tdes0 & (1 << TX_DESCR_0_OWN_Pos))) {
             break;
         }
+        #endif
         if (mp_hal_ticks_ms() - t0 > 1000) {
             return -MP_ETIMEDOUT;
         }
     }
 
+    #if defined(STM32H7)
+    // Update TX descriptor with length and buffer pointer
+    *buf = &eth_dma.tx_buf[eth_dma.tx_descr_idx * TX_BUF_SIZE];
+    tx_descr->tdes2 = len & TX_DESCR_2_B1L_Msk;
+    tx_descr->tdes0 = (uint32_t)*buf;
+    #else
     // Update TX descriptor with length, buffer pointer and linked list pointer
     *buf = &eth_dma.tx_buf[eth_dma.tx_descr_idx * TX_BUF_SIZE];
     tx_descr->tdes1 = len << TX_DESCR_1_TBS1_Pos;
     tx_descr->tdes2 = (uint32_t)*buf;
     tx_descr->tdes3 = (uint32_t)&eth_dma.tx_descr[(eth_dma.tx_descr_idx + 1) % TX_BUF_NUM];
+    #endif
 
     return 0;
 }
@@ -371,6 +538,14 @@ STATIC int eth_tx_buf_send(void) {
     eth_dma.tx_descr_idx = (eth_dma.tx_descr_idx + 1) % TX_BUF_NUM;
 
     // Schedule to send next outgoing frame
+    #if defined(STM32H7)
+    tx_descr->tdes3 =
+        1 << TX_DESCR_3_OWN_Pos     // owned by DMA
+            | 1 << TX_DESCR_3_LD_Pos // last segment
+            | 1 << TX_DESCR_3_FD_Pos // first segment
+            | 3 << TX_DESCR_3_CIC_Pos // enable all checksums inserted by hardware
+    ;
+    #else
     tx_descr->tdes0 =
         1 << TX_DESCR_0_OWN_Pos     // owned by DMA
             | 1 << TX_DESCR_0_LS_Pos // last segment
@@ -378,13 +553,21 @@ STATIC int eth_tx_buf_send(void) {
             | 3 << TX_DESCR_0_CIC_Pos // enable all checksums inserted by hardware
             | 1 << TX_DESCR_0_TCH_Pos // TX descriptor is chained
     ;
+    #endif
 
     // Notify ETH DMA that there is a new TX descriptor for sending
     __DMB();
+    #if defined(STM32H7)
+    if (ETH->DMACSR & ETH_DMACSR_TBU) {
+        ETH->DMACSR = ETH_DMACSR_TBU;
+    }
+    ETH->DMACTDTPR = (uint32_t)&eth_dma.tx_descr[eth_dma.tx_descr_idx];
+    #else
     if (ETH->DMASR & ETH_DMASR_TBUS) {
         ETH->DMASR = ETH_DMASR_TBUS;
         ETH->DMATPDR = 0;
     }
+    #endif
 
     return 0;
 }
@@ -396,6 +579,12 @@ STATIC void eth_dma_rx_free(void) {
     eth_dma.rx_descr_idx = (eth_dma.rx_descr_idx + 1) % RX_BUF_NUM;
 
     // Schedule to get next incoming frame
+    #if defined(STM32H7)
+    rx_descr->rdes0 = (uint32_t)buf;
+    rx_descr->rdes3 = 1 << RX_DESCR_3_OWN_Pos;  // owned by DMA
+    rx_descr->rdes3 |= 1 << RX_DESCR_3_BUF1V_Pos; // buf 1 address valid
+    rx_descr->rdes3 |= 1 << RX_DESCR_3_IOC_Pos; // Interrupt Enabled on Completion
+    #else
     rx_descr->rdes1 =
         1 << RX_DESCR_1_RCH_Pos                 // RX descriptor is chained
             | RX_BUF_SIZE << RX_DESCR_1_RBS1_Pos // maximum buffer length
@@ -403,28 +592,60 @@ STATIC void eth_dma_rx_free(void) {
     rx_descr->rdes2 = (uint32_t)buf;
     rx_descr->rdes3 = (uint32_t)&eth_dma.rx_descr[eth_dma.rx_descr_idx];
     rx_descr->rdes0 = 1 << RX_DESCR_0_OWN_Pos;  // owned by DMA
+    #endif
 
     // Notify ETH DMA that there is a new RX descriptor available
     __DMB();
+    #if defined(STM32H7)
+    ETH->DMACRDTPR = (uint32_t)&rx_descr[eth_dma.rx_descr_idx];
+    #else
     ETH->DMARPDR = 0;
+    #endif
 }
 
 void ETH_IRQHandler(void) {
+    #if defined(STM32H7)
+    uint32_t sr = ETH->DMACSR;
+    ETH->DMACSR = ETH_DMACSR_NIS;
+    uint32_t rx_interrupt = sr & ETH_DMACSR_RI;
+    #else
     uint32_t sr = ETH->DMASR;
     ETH->DMASR = ETH_DMASR_NIS;
-    if (sr & ETH_DMASR_RS) {
+    uint32_t rx_interrupt = sr & ETH_DMASR_RS;
+    #endif
+    if (rx_interrupt) {
+        #if defined(STM32H7)
+        ETH->DMACSR = ETH_DMACSR_RI;
+        #else
         ETH->DMASR = ETH_DMASR_RS;
+        #endif
         for (;;) {
+            #if defined(STM32H7)
+            eth_dma_rx_descr_t *rx_descr_l = &eth_dma.rx_descr[eth_dma.rx_descr_idx];
+            if (rx_descr_l->rdes3 & (1 << RX_DESCR_3_OWN_Pos)) {
+                // No more RX descriptors ready to read
+                break;
+            }
+            #else
             eth_dma_rx_descr_t *rx_descr = &eth_dma.rx_descr[eth_dma.rx_descr_idx];
             if (rx_descr->rdes0 & (1 << RX_DESCR_0_OWN_Pos)) {
                 // No more RX descriptors ready to read
                 break;
             }
+            #endif
 
             // Get RX buffer containing new frame
+            #if defined(STM32H7)
+            size_t len = (rx_descr_l->rdes3 & RX_DESCR_3_PL_Msk);
+            #else
             size_t len = (rx_descr->rdes0 & RX_DESCR_0_FL_Msk) >> RX_DESCR_0_FL_Pos;
+            #endif
             len -= 4; // discard CRC at end
+            #if defined(STM32H7)
+            uint8_t *buf = &eth_dma.rx_buf[eth_dma.rx_descr_idx * RX_BUF_SIZE];
+            #else
             uint8_t *buf = (uint8_t *)rx_descr->rdes2;
+            #endif
 
             // Process frame
             eth_process_frame(&eth_instance, len, buf);

From 032e0956200d602dcd1dbee8b1894f2e3227e779 Mon Sep 17 00:00:00 2001
From: Reinhard Feger <feg@LT-Feger.icie.jku.at>
Date: Fri, 24 Jul 2020 23:13:17 +0200
Subject: [PATCH 0480/3533] stm32/boards/NUCLEO_H743ZI: Enable ethernet
 peripheral.

---
 ports/stm32/boards/NUCLEO_H743ZI/mpconfigboard.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/stm32/boards/NUCLEO_H743ZI/mpconfigboard.h b/ports/stm32/boards/NUCLEO_H743ZI/mpconfigboard.h
index 4e6b162269a8a..324f2b03ce0d0 100644
--- a/ports/stm32/boards/NUCLEO_H743ZI/mpconfigboard.h
+++ b/ports/stm32/boards/NUCLEO_H743ZI/mpconfigboard.h
@@ -91,8 +91,8 @@ void NUCLEO_H743ZI_board_early_init(void);
 #define MICROPY_HW_SDCARD_DETECT_PULL       (GPIO_PULLUP)
 #define MICROPY_HW_SDCARD_DETECT_PRESENT    (GPIO_PIN_RESET)
 
-// Ethernet via RMII (MDC define disabled for now until eth.c supports H7)
-//#define MICROPY_HW_ETH_MDC          (pin_C1)
+// Ethernet via RMII
+#define MICROPY_HW_ETH_MDC          (pin_C1)
 #define MICROPY_HW_ETH_MDIO         (pin_A2)
 #define MICROPY_HW_ETH_RMII_REF_CLK (pin_A1)
 #define MICROPY_HW_ETH_RMII_CRS_DV  (pin_A7)

From d9d761b0572b9b99e97f1b5dd39226173f2e239e Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 9 Dec 2020 11:01:24 +1100
Subject: [PATCH 0481/3533] lib/littlefs: Update littlefs2 to v2.3.0.

At commit 1a59954ec64ca168828a15242cc6de94ac75f9d1

Signed-off-by: Damien George <damien@micropython.org>
---
 lib/littlefs/README.md |    4 +-
 lib/littlefs/lfs2.c    | 1169 ++++++++++++++++++++++++++++------------
 lib/littlefs/lfs2.h    |   40 +-
 3 files changed, 862 insertions(+), 351 deletions(-)

diff --git a/lib/littlefs/README.md b/lib/littlefs/README.md
index 1f0aacbf9840f..ca21a05f42891 100644
--- a/lib/littlefs/README.md
+++ b/lib/littlefs/README.md
@@ -2,7 +2,7 @@ littlefs library
 ================
 
 The upstream source for the files in this directory is
-https://github.com/ARMmbed/littlefs
+https://github.com/littlefs-project/littlefs
 
 To generate the separate files with lfs1 and lfs2 prefixes run the following
 commands in the top-level directory of the littlefs repository (replace the
@@ -13,7 +13,7 @@ version tags with the latest/desired ones, and set `$MPY_DIR`):
     cp lfs1*.[ch] $MPY_DIR/lib/littlefs
     git reset --hard HEAD
 
-    git checkout v2.1.3
+    git checkout v2.3.0
     python2 ./scripts/prefix.py lfs2
     cp lfs2*.[ch] $MPY_DIR/lib/littlefs
     git reset --hard HEAD
diff --git a/lib/littlefs/lfs2.c b/lib/littlefs/lfs2.c
index 6bae806ceb41c..31f3c603e7b87 100644
--- a/lib/littlefs/lfs2.c
+++ b/lib/littlefs/lfs2.c
@@ -118,24 +118,29 @@ static int lfs2_bd_cmp(lfs2_t *lfs2,
         lfs2_block_t block, lfs2_off_t off,
         const void *buffer, lfs2_size_t size) {
     const uint8_t *data = buffer;
+    lfs2_size_t diff = 0;
 
-    for (lfs2_off_t i = 0; i < size; i++) {
-        uint8_t dat;
-        int err = lfs2_bd_read(lfs2,
+    for (lfs2_off_t i = 0; i < size; i += diff) {
+        uint8_t dat[8];
+
+        diff = lfs2_min(size-i, sizeof(dat));
+        int res = lfs2_bd_read(lfs2,
                 pcache, rcache, hint-i,
-                block, off+i, &dat, 1);
-        if (err) {
-            return err;
+                block, off+i, &dat, diff);
+        if (res) {
+            return res;
         }
 
-        if (dat != data[i]) {
-            return (dat < data[i]) ? LFS2_CMP_LT : LFS2_CMP_GT;
+        res = memcmp(dat, data + i, diff);
+        if (res) {
+            return res < 0 ? LFS2_CMP_LT : LFS2_CMP_GT;
         }
     }
 
     return LFS2_CMP_EQ;
 }
 
+#ifndef LFS2_READONLY
 static int lfs2_bd_flush(lfs2_t *lfs2,
         lfs2_cache_t *pcache, lfs2_cache_t *rcache, bool validate) {
     if (pcache->block != LFS2_BLOCK_NULL && pcache->block != LFS2_BLOCK_INLINE) {
@@ -168,7 +173,9 @@ static int lfs2_bd_flush(lfs2_t *lfs2,
 
     return 0;
 }
+#endif
 
+#ifndef LFS2_READONLY
 static int lfs2_bd_sync(lfs2_t *lfs2,
         lfs2_cache_t *pcache, lfs2_cache_t *rcache, bool validate) {
     lfs2_cache_drop(lfs2, rcache);
@@ -182,7 +189,9 @@ static int lfs2_bd_sync(lfs2_t *lfs2,
     LFS2_ASSERT(err <= 0);
     return err;
 }
+#endif
 
+#ifndef LFS2_READONLY
 static int lfs2_bd_prog(lfs2_t *lfs2,
         lfs2_cache_t *pcache, lfs2_cache_t *rcache, bool validate,
         lfs2_block_t block, lfs2_off_t off,
@@ -228,13 +237,16 @@ static int lfs2_bd_prog(lfs2_t *lfs2,
 
     return 0;
 }
+#endif
 
+#ifndef LFS2_READONLY
 static int lfs2_bd_erase(lfs2_t *lfs2, lfs2_block_t block) {
     LFS2_ASSERT(block < lfs2->cfg->block_count);
     int err = lfs2->cfg->erase(lfs2->cfg, block);
     LFS2_ASSERT(err <= 0);
     return err;
 }
+#endif
 
 
 /// Small type-level utilities ///
@@ -388,10 +400,12 @@ static void lfs2_ctz_fromle32(struct lfs2_ctz *ctz) {
     ctz->size = lfs2_fromle32(ctz->size);
 }
 
+#ifndef LFS2_READONLY
 static void lfs2_ctz_tole32(struct lfs2_ctz *ctz) {
     ctz->head = lfs2_tole32(ctz->head);
     ctz->size = lfs2_tole32(ctz->size);
 }
+#endif
 
 static inline void lfs2_superblock_fromle32(lfs2_superblock_t *superblock) {
     superblock->version     = lfs2_fromle32(superblock->version);
@@ -411,15 +425,46 @@ static inline void lfs2_superblock_tole32(lfs2_superblock_t *superblock) {
     superblock->attr_max    = lfs2_tole32(superblock->attr_max);
 }
 
+static inline bool lfs2_mlist_isopen(struct lfs2_mlist *head,
+        struct lfs2_mlist *node) {
+    for (struct lfs2_mlist **p = &head; *p; p = &(*p)->next) {
+        if (*p == (struct lfs2_mlist*)node) {
+            return true;
+        }
+    }
+
+    return false;
+}
+
+static inline void lfs2_mlist_remove(lfs2_t *lfs2, struct lfs2_mlist *mlist) {
+    for (struct lfs2_mlist **p = &lfs2->mlist; *p; p = &(*p)->next) {
+        if (*p == mlist) {
+            *p = (*p)->next;
+            break;
+        }
+    }
+}
+
+static inline void lfs2_mlist_append(lfs2_t *lfs2, struct lfs2_mlist *mlist) {
+    mlist->next = lfs2->mlist;
+    lfs2->mlist = mlist;
+}
+
 
 /// Internal operations predeclared here ///
+#ifndef LFS2_READONLY
 static int lfs2_dir_commit(lfs2_t *lfs2, lfs2_mdir_t *dir,
         const struct lfs2_mattr *attrs, int attrcount);
 static int lfs2_dir_compact(lfs2_t *lfs2,
         lfs2_mdir_t *dir, const struct lfs2_mattr *attrs, int attrcount,
         lfs2_mdir_t *source, uint16_t begin, uint16_t end);
+
+static lfs2_ssize_t lfs2_file_rawwrite(lfs2_t *lfs2, lfs2_file_t *file,
+        const void *buffer, lfs2_size_t size);
+static int lfs2_file_rawsync(lfs2_t *lfs2, lfs2_file_t *file);
 static int lfs2_file_outline(lfs2_t *lfs2, lfs2_file_t *file);
 static int lfs2_file_flush(lfs2_t *lfs2, lfs2_file_t *file);
+
 static void lfs2_fs_preporphans(lfs2_t *lfs2, int8_t orphans);
 static void lfs2_fs_prepmove(lfs2_t *lfs2,
         uint16_t id, const lfs2_block_t pair[2]);
@@ -429,17 +474,32 @@ static lfs2_stag_t lfs2_fs_parent(lfs2_t *lfs2, const lfs2_block_t dir[2],
         lfs2_mdir_t *parent);
 static int lfs2_fs_relocate(lfs2_t *lfs2,
         const lfs2_block_t oldpair[2], lfs2_block_t newpair[2]);
-int lfs2_fs_traverseraw(lfs2_t *lfs2,
-        int (*cb)(void *data, lfs2_block_t block), void *data,
-        bool includeorphans);
 static int lfs2_fs_forceconsistency(lfs2_t *lfs2);
-static int lfs2_deinit(lfs2_t *lfs2);
+#endif
+
 #ifdef LFS2_MIGRATE
 static int lfs21_traverse(lfs2_t *lfs2,
         int (*cb)(void*, lfs2_block_t), void *data);
 #endif
 
+static int lfs2_dir_rawrewind(lfs2_t *lfs2, lfs2_dir_t *dir);
+
+static lfs2_ssize_t lfs2_file_rawread(lfs2_t *lfs2, lfs2_file_t *file,
+        void *buffer, lfs2_size_t size);
+static int lfs2_file_rawclose(lfs2_t *lfs2, lfs2_file_t *file);
+static lfs2_soff_t lfs2_file_rawsize(lfs2_t *lfs2, lfs2_file_t *file);
+
+static lfs2_ssize_t lfs2_fs_rawsize(lfs2_t *lfs2);
+static int lfs2_fs_rawtraverse(lfs2_t *lfs2,
+        int (*cb)(void *data, lfs2_block_t block), void *data,
+        bool includeorphans);
+
+static int lfs2_deinit(lfs2_t *lfs2);
+static int lfs2_rawunmount(lfs2_t *lfs2);
+
+
 /// Block allocator ///
+#ifndef LFS2_READONLY
 static int lfs2_alloc_lookahead(void *p, lfs2_block_t block) {
     lfs2_t *lfs2 = (lfs2_t*)p;
     lfs2_block_t off = ((block - lfs2->free.off)
@@ -451,20 +511,24 @@ static int lfs2_alloc_lookahead(void *p, lfs2_block_t block) {
 
     return 0;
 }
+#endif
 
+// indicate allocated blocks have been committed into the filesystem, this
+// is to prevent blocks from being garbage collected in the middle of a
+// commit operation
 static void lfs2_alloc_ack(lfs2_t *lfs2) {
     lfs2->free.ack = lfs2->cfg->block_count;
 }
 
-// Invalidate the lookahead buffer. This is done during mounting and
-// failed traversals
-static void lfs2_alloc_reset(lfs2_t *lfs2) {
-    lfs2->free.off = lfs2->seed % lfs2->cfg->block_size;
+// drop the lookahead buffer, this is done during mounting and failed
+// traversals in order to avoid invalid lookahead state
+static void lfs2_alloc_drop(lfs2_t *lfs2) {
     lfs2->free.size = 0;
     lfs2->free.i = 0;
     lfs2_alloc_ack(lfs2);
 }
 
+#ifndef LFS2_READONLY
 static int lfs2_alloc(lfs2_t *lfs2, lfs2_block_t *block) {
     while (true) {
         while (lfs2->free.i != lfs2->free.size) {
@@ -503,13 +567,14 @@ static int lfs2_alloc(lfs2_t *lfs2, lfs2_block_t *block) {
 
         // find mask of free blocks from tree
         memset(lfs2->free.buffer, 0, lfs2->cfg->lookahead_size);
-        int err = lfs2_fs_traverseraw(lfs2, lfs2_alloc_lookahead, lfs2, true);
+        int err = lfs2_fs_rawtraverse(lfs2, lfs2_alloc_lookahead, lfs2, true);
         if (err) {
-            lfs2_alloc_reset(lfs2);
+            lfs2_alloc_drop(lfs2);
             return err;
         }
     }
 }
+#endif
 
 /// Metadata pair and directory operations ///
 static lfs2_stag_t lfs2_dir_getslice(lfs2_t *lfs2, const lfs2_mdir_t *dir,
@@ -642,6 +707,7 @@ static int lfs2_dir_getread(lfs2_t *lfs2, const lfs2_mdir_t *dir,
     return 0;
 }
 
+#ifndef LFS2_READONLY
 static int lfs2_dir_traverse_filter(void *p,
         lfs2_tag_t tag, const void *buffer) {
     lfs2_tag_t *filtertag = p;
@@ -669,7 +735,9 @@ static int lfs2_dir_traverse_filter(void *p,
 
     return false;
 }
+#endif
 
+#ifndef LFS2_READONLY
 static int lfs2_dir_traverse(lfs2_t *lfs2,
         const lfs2_mdir_t *dir, lfs2_off_t off, lfs2_tag_t ptag,
         const struct lfs2_mattr *attrs, int attrcount,
@@ -763,6 +831,7 @@ static int lfs2_dir_traverse(lfs2_t *lfs2,
         }
     }
 }
+#endif
 
 static lfs2_stag_t lfs2_dir_fetchmatch(lfs2_t *lfs2,
         lfs2_mdir_t *dir, const lfs2_block_t pair[2],
@@ -870,8 +939,10 @@ static lfs2_stag_t lfs2_dir_fetchmatch(lfs2_t *lfs2,
                 ptag ^= (lfs2_tag_t)(lfs2_tag_chunk(tag) & 1U) << 31;
 
                 // toss our crc into the filesystem seed for
-                // pseudorandom numbers
-                lfs2->seed ^= crc;
+                // pseudorandom numbers, note we use another crc here
+                // as a collection function because it is sufficiently
+                // random and convenient
+                lfs2->seed = lfs2_crc(lfs2->seed, &crc, sizeof(crc));
 
                 // update with what's found so far
                 besttag = tempbesttag;
@@ -1200,6 +1271,7 @@ struct lfs2_commit {
     lfs2_off_t end;
 };
 
+#ifndef LFS2_READONLY
 static int lfs2_dir_commitprog(lfs2_t *lfs2, struct lfs2_commit *commit,
         const void *buffer, lfs2_size_t size) {
     int err = lfs2_bd_prog(lfs2,
@@ -1214,7 +1286,9 @@ static int lfs2_dir_commitprog(lfs2_t *lfs2, struct lfs2_commit *commit,
     commit->off += size;
     return 0;
 }
+#endif
 
+#ifndef LFS2_READONLY
 static int lfs2_dir_commitattr(lfs2_t *lfs2, struct lfs2_commit *commit,
         lfs2_tag_t tag, const void *buffer) {
     // check if we fit
@@ -1259,14 +1333,17 @@ static int lfs2_dir_commitattr(lfs2_t *lfs2, struct lfs2_commit *commit,
     commit->ptag = tag & 0x7fffffff;
     return 0;
 }
+#endif
 
+#ifndef LFS2_READONLY
 static int lfs2_dir_commitcrc(lfs2_t *lfs2, struct lfs2_commit *commit) {
-    const lfs2_off_t off1 = commit->off;
-    const uint32_t crc1 = commit->crc;
     // align to program units
-    const lfs2_off_t end = lfs2_alignup(off1 + 2*sizeof(uint32_t),
+    const lfs2_off_t end = lfs2_alignup(commit->off + 2*sizeof(uint32_t),
             lfs2->cfg->prog_size);
 
+    lfs2_off_t off1 = 0;
+    uint32_t crc1 = 0;
+
     // create crc tags to fill up remainder of commit, note that
     // padding is not crced, which lets fetches skip padding but
     // makes committing a bit more complicated
@@ -1302,6 +1379,12 @@ static int lfs2_dir_commitcrc(lfs2_t *lfs2, struct lfs2_commit *commit) {
             return err;
         }
 
+        // keep track of non-padding checksum to verify
+        if (off1 == 0) {
+            off1 = commit->off + sizeof(uint32_t);
+            crc1 = commit->crc;
+        }
+
         commit->off += sizeof(tag)+lfs2_tag_size(tag);
         commit->ptag = tag ^ ((lfs2_tag_t)reset << 31);
         commit->crc = 0xffffffff; // reset crc for next "commit"
@@ -1315,7 +1398,7 @@ static int lfs2_dir_commitcrc(lfs2_t *lfs2, struct lfs2_commit *commit) {
 
     // successful commit, check checksums to make sure
     lfs2_off_t off = commit->begin;
-    lfs2_off_t noff = off1 + sizeof(uint32_t);
+    lfs2_off_t noff = off1;
     while (off < end) {
         uint32_t crc = 0xffffffff;
         for (lfs2_off_t i = off; i < noff+sizeof(uint32_t); i++) {
@@ -1352,7 +1435,9 @@ static int lfs2_dir_commitcrc(lfs2_t *lfs2, struct lfs2_commit *commit) {
 
     return 0;
 }
+#endif
 
+#ifndef LFS2_READONLY
 static int lfs2_dir_alloc(lfs2_t *lfs2, lfs2_mdir_t *dir) {
     // allocate pair of dir blocks (backwards, so we write block 1 first)
     for (int i = 0; i < 2; i++) {
@@ -1375,8 +1460,12 @@ static int lfs2_dir_alloc(lfs2_t *lfs2, lfs2_mdir_t *dir) {
         return err;
     }
 
-    // make sure we don't immediately evict
-    dir->rev += dir->rev & 1;
+    // to make sure we don't immediately evict, align the new revision count
+    // to our block_cycles modulus, see lfs2_dir_compact for why our modulus
+    // is tweaked this way
+    if (lfs2->cfg->block_cycles > 0) {
+        dir->rev = lfs2_alignup(dir->rev, ((lfs2->cfg->block_cycles+1)|1));
+    }
 
     // set defaults
     dir->off = sizeof(dir->rev);
@@ -1390,7 +1479,9 @@ static int lfs2_dir_alloc(lfs2_t *lfs2, lfs2_mdir_t *dir) {
     // don't write out yet, let caller take care of that
     return 0;
 }
+#endif
 
+#ifndef LFS2_READONLY
 static int lfs2_dir_drop(lfs2_t *lfs2, lfs2_mdir_t *dir, lfs2_mdir_t *tail) {
     // steal state
     int err = lfs2_dir_getgstate(lfs2, tail, &lfs2->gdelta);
@@ -1409,7 +1500,9 @@ static int lfs2_dir_drop(lfs2_t *lfs2, lfs2_mdir_t *dir, lfs2_mdir_t *tail) {
 
     return 0;
 }
+#endif
 
+#ifndef LFS2_READONLY
 static int lfs2_dir_split(lfs2_t *lfs2,
         lfs2_mdir_t *dir, const struct lfs2_mattr *attrs, int attrcount,
         lfs2_mdir_t *source, uint16_t split, uint16_t end) {
@@ -1442,7 +1535,9 @@ static int lfs2_dir_split(lfs2_t *lfs2,
 
     return 0;
 }
+#endif
 
+#ifndef LFS2_READONLY
 static int lfs2_dir_commit_size(void *p, lfs2_tag_t tag, const void *buffer) {
     lfs2_size_t *size = p;
     (void)buffer;
@@ -1450,17 +1545,23 @@ static int lfs2_dir_commit_size(void *p, lfs2_tag_t tag, const void *buffer) {
     *size += lfs2_tag_dsize(tag);
     return 0;
 }
+#endif
 
+#ifndef LFS2_READONLY
 struct lfs2_dir_commit_commit {
     lfs2_t *lfs2;
     struct lfs2_commit *commit;
 };
+#endif
 
+#ifndef LFS2_READONLY
 static int lfs2_dir_commit_commit(void *p, lfs2_tag_t tag, const void *buffer) {
     struct lfs2_dir_commit_commit *commit = p;
     return lfs2_dir_commitattr(commit->lfs2, commit->commit, tag, buffer);
 }
+#endif
 
+#ifndef LFS2_READONLY
 static int lfs2_dir_compact(lfs2_t *lfs2,
         lfs2_mdir_t *dir, const struct lfs2_mattr *attrs, int attrcount,
         lfs2_mdir_t *source, uint16_t begin, uint16_t end) {
@@ -1525,7 +1626,7 @@ static int lfs2_dir_compact(lfs2_t *lfs2,
         if (lfs2_pair_cmp(dir->pair, (const lfs2_block_t[2]){0, 1}) == 0) {
             // oh no! we're writing too much to the superblock,
             // should we expand?
-            lfs2_ssize_t res = lfs2_fs_size(lfs2);
+            lfs2_ssize_t res = lfs2_fs_rawsize(lfs2);
             if (res < 0) {
                 return res;
             }
@@ -1715,7 +1816,9 @@ static int lfs2_dir_compact(lfs2_t *lfs2,
 
     return 0;
 }
+#endif
 
+#ifndef LFS2_READONLY
 static int lfs2_dir_commit(lfs2_t *lfs2, lfs2_mdir_t *dir,
         const struct lfs2_mattr *attrs, int attrcount) {
     // check for any inline files that aren't RAM backed and
@@ -1903,15 +2006,15 @@ static int lfs2_dir_commit(lfs2_t *lfs2, lfs2_mdir_t *dir,
 
     return 0;
 }
+#endif
 
 
 /// Top level directory operations ///
-int lfs2_mkdir(lfs2_t *lfs2, const char *path) {
-    LFS2_TRACE("lfs2_mkdir(%p, \"%s\")", (void*)lfs2, path);
+#ifndef LFS2_READONLY
+static int lfs2_rawmkdir(lfs2_t *lfs2, const char *path) {
     // deorphan if we haven't yet, needed at most once after poweron
     int err = lfs2_fs_forceconsistency(lfs2);
     if (err) {
-        LFS2_TRACE("lfs2_mkdir -> %d", err);
         return err;
     }
 
@@ -1920,14 +2023,12 @@ int lfs2_mkdir(lfs2_t *lfs2, const char *path) {
     uint16_t id;
     err = lfs2_dir_find(lfs2, &cwd.m, &path, &id);
     if (!(err == LFS2_ERR_NOENT && id != 0x3ff)) {
-        LFS2_TRACE("lfs2_mkdir -> %d", (err < 0) ? err : LFS2_ERR_EXIST);
         return (err < 0) ? err : LFS2_ERR_EXIST;
     }
 
     // check that name fits
     lfs2_size_t nlen = strlen(path);
     if (nlen > lfs2->name_max) {
-        LFS2_TRACE("lfs2_mkdir -> %d", LFS2_ERR_NAMETOOLONG);
         return LFS2_ERR_NAMETOOLONG;
     }
 
@@ -1936,7 +2037,6 @@ int lfs2_mkdir(lfs2_t *lfs2, const char *path) {
     lfs2_mdir_t dir;
     err = lfs2_dir_alloc(lfs2, &dir);
     if (err) {
-        LFS2_TRACE("lfs2_mkdir -> %d", err);
         return err;
     }
 
@@ -1945,7 +2045,6 @@ int lfs2_mkdir(lfs2_t *lfs2, const char *path) {
     while (pred.split) {
         err = lfs2_dir_fetch(lfs2, &pred, pred.tail);
         if (err) {
-            LFS2_TRACE("lfs2_mkdir -> %d", err);
             return err;
         }
     }
@@ -1956,7 +2055,6 @@ int lfs2_mkdir(lfs2_t *lfs2, const char *path) {
             {LFS2_MKTAG(LFS2_TYPE_SOFTTAIL, 0x3ff, 8), pred.tail}));
     lfs2_pair_fromle32(pred.tail);
     if (err) {
-        LFS2_TRACE("lfs2_mkdir -> %d", err);
         return err;
     }
 
@@ -1979,7 +2077,6 @@ int lfs2_mkdir(lfs2_t *lfs2, const char *path) {
         lfs2_pair_fromle32(dir.pair);
         if (err) {
             lfs2->mlist = cwd.next;
-            LFS2_TRACE("lfs2_mkdir -> %d", err);
             return err;
         }
 
@@ -1997,24 +2094,20 @@ int lfs2_mkdir(lfs2_t *lfs2, const char *path) {
                 LFS2_TYPE_SOFTTAIL, 0x3ff, 8), dir.pair}));
     lfs2_pair_fromle32(dir.pair);
     if (err) {
-        LFS2_TRACE("lfs2_mkdir -> %d", err);
         return err;
     }
 
-    LFS2_TRACE("lfs2_mkdir -> %d", 0);
     return 0;
 }
+#endif
 
-int lfs2_dir_open(lfs2_t *lfs2, lfs2_dir_t *dir, const char *path) {
-    LFS2_TRACE("lfs2_dir_open(%p, %p, \"%s\")", (void*)lfs2, (void*)dir, path);
+static int lfs2_dir_rawopen(lfs2_t *lfs2, lfs2_dir_t *dir, const char *path) {
     lfs2_stag_t tag = lfs2_dir_find(lfs2, &dir->m, &path, NULL);
     if (tag < 0) {
-        LFS2_TRACE("lfs2_dir_open -> %"PRId32, tag);
         return tag;
     }
 
     if (lfs2_tag_type3(tag) != LFS2_TYPE_DIR) {
-        LFS2_TRACE("lfs2_dir_open -> %d", LFS2_ERR_NOTDIR);
         return LFS2_ERR_NOTDIR;
     }
 
@@ -2028,7 +2121,6 @@ int lfs2_dir_open(lfs2_t *lfs2, lfs2_dir_t *dir, const char *path) {
         lfs2_stag_t res = lfs2_dir_get(lfs2, &dir->m, LFS2_MKTAG(0x700, 0x3ff, 0),
                 LFS2_MKTAG(LFS2_TYPE_STRUCT, lfs2_tag_id(tag), 8), pair);
         if (res < 0) {
-            LFS2_TRACE("lfs2_dir_open -> %"PRId32, res);
             return res;
         }
         lfs2_pair_fromle32(pair);
@@ -2037,7 +2129,6 @@ int lfs2_dir_open(lfs2_t *lfs2, lfs2_dir_t *dir, const char *path) {
     // fetch first pair
     int err = lfs2_dir_fetch(lfs2, &dir->m, pair);
     if (err) {
-        LFS2_TRACE("lfs2_dir_open -> %d", err);
         return err;
     }
 
@@ -2049,30 +2140,19 @@ int lfs2_dir_open(lfs2_t *lfs2, lfs2_dir_t *dir, const char *path) {
 
     // add to list of mdirs
     dir->type = LFS2_TYPE_DIR;
-    dir->next = (lfs2_dir_t*)lfs2->mlist;
-    lfs2->mlist = (struct lfs2_mlist*)dir;
+    lfs2_mlist_append(lfs2, (struct lfs2_mlist *)dir);
 
-    LFS2_TRACE("lfs2_dir_open -> %d", 0);
     return 0;
 }
 
-int lfs2_dir_close(lfs2_t *lfs2, lfs2_dir_t *dir) {
-    LFS2_TRACE("lfs2_dir_close(%p, %p)", (void*)lfs2, (void*)dir);
+static int lfs2_dir_rawclose(lfs2_t *lfs2, lfs2_dir_t *dir) {
     // remove from list of mdirs
-    for (struct lfs2_mlist **p = &lfs2->mlist; *p; p = &(*p)->next) {
-        if (*p == (struct lfs2_mlist*)dir) {
-            *p = (*p)->next;
-            break;
-        }
-    }
+    lfs2_mlist_remove(lfs2, (struct lfs2_mlist *)dir);
 
-    LFS2_TRACE("lfs2_dir_close -> %d", 0);
     return 0;
 }
 
-int lfs2_dir_read(lfs2_t *lfs2, lfs2_dir_t *dir, struct lfs2_info *info) {
-    LFS2_TRACE("lfs2_dir_read(%p, %p, %p)",
-            (void*)lfs2, (void*)dir, (void*)info);
+static int lfs2_dir_rawread(lfs2_t *lfs2, lfs2_dir_t *dir, struct lfs2_info *info) {
     memset(info, 0, sizeof(*info));
 
     // special offset for '.' and '..'
@@ -2080,26 +2160,22 @@ int lfs2_dir_read(lfs2_t *lfs2, lfs2_dir_t *dir, struct lfs2_info *info) {
         info->type = LFS2_TYPE_DIR;
         strcpy(info->name, ".");
         dir->pos += 1;
-        LFS2_TRACE("lfs2_dir_read -> %d", true);
         return true;
     } else if (dir->pos == 1) {
         info->type = LFS2_TYPE_DIR;
         strcpy(info->name, "..");
         dir->pos += 1;
-        LFS2_TRACE("lfs2_dir_read -> %d", true);
         return true;
     }
 
     while (true) {
         if (dir->id == dir->m.count) {
             if (!dir->m.split) {
-                LFS2_TRACE("lfs2_dir_read -> %d", false);
                 return false;
             }
 
             int err = lfs2_dir_fetch(lfs2, &dir->m, dir->m.tail);
             if (err) {
-                LFS2_TRACE("lfs2_dir_read -> %d", err);
                 return err;
             }
 
@@ -2108,7 +2184,6 @@ int lfs2_dir_read(lfs2_t *lfs2, lfs2_dir_t *dir, struct lfs2_info *info) {
 
         int err = lfs2_dir_getinfo(lfs2, &dir->m, dir->id, info);
         if (err && err != LFS2_ERR_NOENT) {
-            LFS2_TRACE("lfs2_dir_read -> %d", err);
             return err;
         }
 
@@ -2119,17 +2194,13 @@ int lfs2_dir_read(lfs2_t *lfs2, lfs2_dir_t *dir, struct lfs2_info *info) {
     }
 
     dir->pos += 1;
-    LFS2_TRACE("lfs2_dir_read -> %d", true);
     return true;
 }
 
-int lfs2_dir_seek(lfs2_t *lfs2, lfs2_dir_t *dir, lfs2_off_t off) {
-    LFS2_TRACE("lfs2_dir_seek(%p, %p, %"PRIu32")",
-            (void*)lfs2, (void*)dir, off);
+static int lfs2_dir_rawseek(lfs2_t *lfs2, lfs2_dir_t *dir, lfs2_off_t off) {
     // simply walk from head dir
-    int err = lfs2_dir_rewind(lfs2, dir);
+    int err = lfs2_dir_rawrewind(lfs2, dir);
     if (err) {
-        LFS2_TRACE("lfs2_dir_seek -> %d", err);
         return err;
     }
 
@@ -2148,13 +2219,11 @@ int lfs2_dir_seek(lfs2_t *lfs2, lfs2_dir_t *dir, lfs2_off_t off) {
 
         if (dir->id == dir->m.count) {
             if (!dir->m.split) {
-                LFS2_TRACE("lfs2_dir_seek -> %d", LFS2_ERR_INVAL);
                 return LFS2_ERR_INVAL;
             }
 
             err = lfs2_dir_fetch(lfs2, &dir->m, dir->m.tail);
             if (err) {
-                LFS2_TRACE("lfs2_dir_seek -> %d", err);
                 return err;
             }
 
@@ -2162,29 +2231,23 @@ int lfs2_dir_seek(lfs2_t *lfs2, lfs2_dir_t *dir, lfs2_off_t off) {
         }
     }
 
-    LFS2_TRACE("lfs2_dir_seek -> %d", 0);
     return 0;
 }
 
-lfs2_soff_t lfs2_dir_tell(lfs2_t *lfs2, lfs2_dir_t *dir) {
-    LFS2_TRACE("lfs2_dir_tell(%p, %p)", (void*)lfs2, (void*)dir);
+static lfs2_soff_t lfs2_dir_rawtell(lfs2_t *lfs2, lfs2_dir_t *dir) {
     (void)lfs2;
-    LFS2_TRACE("lfs2_dir_tell -> %"PRId32, dir->pos);
     return dir->pos;
 }
 
-int lfs2_dir_rewind(lfs2_t *lfs2, lfs2_dir_t *dir) {
-    LFS2_TRACE("lfs2_dir_rewind(%p, %p)", (void*)lfs2, (void*)dir);
+static int lfs2_dir_rawrewind(lfs2_t *lfs2, lfs2_dir_t *dir) {
     // reload the head dir
     int err = lfs2_dir_fetch(lfs2, &dir->m, dir->head);
     if (err) {
-        LFS2_TRACE("lfs2_dir_rewind -> %d", err);
         return err;
     }
 
     dir->id = 0;
     dir->pos = 0;
-    LFS2_TRACE("lfs2_dir_rewind -> %d", 0);
     return 0;
 }
 
@@ -2237,6 +2300,7 @@ static int lfs2_ctz_find(lfs2_t *lfs2,
     return 0;
 }
 
+#ifndef LFS2_READONLY
 static int lfs2_ctz_extend(lfs2_t *lfs2,
         lfs2_cache_t *pcache, lfs2_cache_t *rcache,
         lfs2_block_t head, lfs2_size_t size,
@@ -2334,6 +2398,7 @@ static int lfs2_ctz_extend(lfs2_t *lfs2,
         lfs2_cache_drop(lfs2, pcache);
     }
 }
+#endif
 
 static int lfs2_ctz_traverse(lfs2_t *lfs2,
         const lfs2_cache_t *pcache, lfs2_cache_t *rcache,
@@ -2380,27 +2445,25 @@ static int lfs2_ctz_traverse(lfs2_t *lfs2,
 
 
 /// Top level file operations ///
-int lfs2_file_opencfg(lfs2_t *lfs2, lfs2_file_t *file,
+static int lfs2_file_rawopencfg(lfs2_t *lfs2, lfs2_file_t *file,
         const char *path, int flags,
         const struct lfs2_file_config *cfg) {
-    LFS2_TRACE("lfs2_file_opencfg(%p, %p, \"%s\", %x, %p {"
-                 ".buffer=%p, .attrs=%p, .attr_count=%"PRIu32"})",
-            (void*)lfs2, (void*)file, path, flags,
-            (void*)cfg, cfg->buffer, (void*)cfg->attrs, cfg->attr_count);
-
+#ifndef LFS2_READONLY
     // deorphan if we haven't yet, needed at most once after poweron
-    if ((flags & 3) != LFS2_O_RDONLY) {
+    if ((flags & LFS2_O_WRONLY) == LFS2_O_WRONLY) {
         int err = lfs2_fs_forceconsistency(lfs2);
         if (err) {
-            LFS2_TRACE("lfs2_file_opencfg -> %d", err);
             return err;
         }
     }
+#else
+    LFS2_ASSERT((flags & LFS2_O_RDONLY) == LFS2_O_RDONLY);
+#endif
 
     // setup simple file details
     int err;
     file->cfg = cfg;
-    file->flags = flags | LFS2_F_OPENED;
+    file->flags = flags;
     file->pos = 0;
     file->off = 0;
     file->cache.buffer = NULL;
@@ -2414,9 +2477,13 @@ int lfs2_file_opencfg(lfs2_t *lfs2, lfs2_file_t *file,
 
     // get id, add to list of mdirs to catch update changes
     file->type = LFS2_TYPE_REG;
-    file->next = (lfs2_file_t*)lfs2->mlist;
-    lfs2->mlist = (struct lfs2_mlist*)file;
+    lfs2_mlist_append(lfs2, (struct lfs2_mlist *)file);
 
+#ifdef LFS2_READONLY
+    if (tag == LFS2_ERR_NOENT) {
+        err = LFS2_ERR_NOENT;
+        goto cleanup;
+#else
     if (tag == LFS2_ERR_NOENT) {
         if (!(flags & LFS2_O_CREAT)) {
             err = LFS2_ERR_NOENT;
@@ -2432,9 +2499,9 @@ int lfs2_file_opencfg(lfs2_t *lfs2, lfs2_file_t *file,
 
         // get next slot and create entry to remember name
         err = lfs2_dir_commit(lfs2, &file->m, LFS2_MKATTRS(
-                {LFS2_MKTAG(LFS2_TYPE_CREATE, file->id, 0)},
+                {LFS2_MKTAG(LFS2_TYPE_CREATE, file->id, 0), NULL},
                 {LFS2_MKTAG(LFS2_TYPE_REG, file->id, nlen), path},
-                {LFS2_MKTAG(LFS2_TYPE_INLINESTRUCT, file->id, 0)}));
+                {LFS2_MKTAG(LFS2_TYPE_INLINESTRUCT, file->id, 0), NULL}));
         if (err) {
             err = LFS2_ERR_NAMETOOLONG;
             goto cleanup;
@@ -2444,13 +2511,16 @@ int lfs2_file_opencfg(lfs2_t *lfs2, lfs2_file_t *file,
     } else if (flags & LFS2_O_EXCL) {
         err = LFS2_ERR_EXIST;
         goto cleanup;
+#endif
     } else if (lfs2_tag_type3(tag) != LFS2_TYPE_REG) {
         err = LFS2_ERR_ISDIR;
         goto cleanup;
+#ifndef LFS2_READONLY
     } else if (flags & LFS2_O_TRUNC) {
         // truncate if requested
         tag = LFS2_MKTAG(LFS2_TYPE_INLINESTRUCT, file->id, 0);
         file->flags |= LFS2_F_DIRTY;
+#endif
     } else {
         // try to load what's on disk, if it's inlined we'll fix it later
         tag = lfs2_dir_get(lfs2, &file->m, LFS2_MKTAG(0x700, 0x3ff, 0),
@@ -2464,7 +2534,8 @@ int lfs2_file_opencfg(lfs2_t *lfs2, lfs2_file_t *file,
 
     // fetch attrs
     for (unsigned i = 0; i < file->cfg->attr_count; i++) {
-        if ((file->flags & 3) != LFS2_O_WRONLY) {
+        // if opened for read / read-write operations
+        if ((file->flags & LFS2_O_RDONLY) == LFS2_O_RDONLY) {
             lfs2_stag_t res = lfs2_dir_get(lfs2, &file->m,
                     LFS2_MKTAG(0x7ff, 0x3ff, 0),
                     LFS2_MKTAG(LFS2_TYPE_USERATTR + file->cfg->attrs[i].type,
@@ -2476,7 +2547,9 @@ int lfs2_file_opencfg(lfs2_t *lfs2, lfs2_file_t *file,
             }
         }
 
-        if ((file->flags & 3) != LFS2_O_RDONLY) {
+#ifndef LFS2_READONLY
+        // if opened for write / read-write operations
+        if ((file->flags & LFS2_O_WRONLY) == LFS2_O_WRONLY) {
             if (file->cfg->attrs[i].size > lfs2->attr_max) {
                 err = LFS2_ERR_NOSPC;
                 goto cleanup;
@@ -2484,6 +2557,7 @@ int lfs2_file_opencfg(lfs2_t *lfs2, lfs2_file_t *file,
 
             file->flags |= LFS2_F_DIRTY;
         }
+#endif
     }
 
     // allocate buffer if needed
@@ -2523,54 +2597,45 @@ int lfs2_file_opencfg(lfs2_t *lfs2, lfs2_file_t *file,
         }
     }
 
-    LFS2_TRACE("lfs2_file_opencfg -> %d", 0);
     return 0;
 
 cleanup:
     // clean up lingering resources
+#ifndef LFS2_READONLY
     file->flags |= LFS2_F_ERRED;
-    lfs2_file_close(lfs2, file);
-    LFS2_TRACE("lfs2_file_opencfg -> %d", err);
+#endif
+    lfs2_file_rawclose(lfs2, file);
     return err;
 }
 
-int lfs2_file_open(lfs2_t *lfs2, lfs2_file_t *file,
+static int lfs2_file_rawopen(lfs2_t *lfs2, lfs2_file_t *file,
         const char *path, int flags) {
-    LFS2_TRACE("lfs2_file_open(%p, %p, \"%s\", %x)",
-            (void*)lfs2, (void*)file, path, flags);
     static const struct lfs2_file_config defaults = {0};
-    int err = lfs2_file_opencfg(lfs2, file, path, flags, &defaults);
-    LFS2_TRACE("lfs2_file_open -> %d", err);
+    int err = lfs2_file_rawopencfg(lfs2, file, path, flags, &defaults);
     return err;
 }
 
-int lfs2_file_close(lfs2_t *lfs2, lfs2_file_t *file) {
-    LFS2_TRACE("lfs2_file_close(%p, %p)", (void*)lfs2, (void*)file);
-    LFS2_ASSERT(file->flags & LFS2_F_OPENED);
-
-    int err = lfs2_file_sync(lfs2, file);
+static int lfs2_file_rawclose(lfs2_t *lfs2, lfs2_file_t *file) {
+#ifndef LFS2_READONLY
+    int err = lfs2_file_rawsync(lfs2, file);
+#else
+    int err = 0;
+#endif
 
     // remove from list of mdirs
-    for (struct lfs2_mlist **p = &lfs2->mlist; *p; p = &(*p)->next) {
-        if (*p == (struct lfs2_mlist*)file) {
-            *p = (*p)->next;
-            break;
-        }
-    }
+    lfs2_mlist_remove(lfs2, (struct lfs2_mlist*)file);
 
     // clean up memory
     if (!file->cfg->buffer) {
         lfs2_free(file->cache.buffer);
     }
 
-    file->flags &= ~LFS2_F_OPENED;
-    LFS2_TRACE("lfs2_file_close -> %d", err);
     return err;
 }
 
-static int lfs2_file_relocate(lfs2_t *lfs2, lfs2_file_t *file) {
-    LFS2_ASSERT(file->flags & LFS2_F_OPENED);
 
+#ifndef LFS2_READONLY
+static int lfs2_file_relocate(lfs2_t *lfs2, lfs2_file_t *file) {
     while (true) {
         // just relocate what exists into new block
         lfs2_block_t nblock;
@@ -2638,7 +2703,9 @@ static int lfs2_file_relocate(lfs2_t *lfs2, lfs2_file_t *file) {
         lfs2_cache_drop(lfs2, &lfs2->pcache);
     }
 }
+#endif
 
+#ifndef LFS2_READONLY
 static int lfs2_file_outline(lfs2_t *lfs2, lfs2_file_t *file) {
     file->off = file->pos;
     lfs2_alloc_ack(lfs2);
@@ -2650,10 +2717,10 @@ static int lfs2_file_outline(lfs2_t *lfs2, lfs2_file_t *file) {
     file->flags &= ~LFS2_F_INLINE;
     return 0;
 }
+#endif
 
+#ifndef LFS2_READONLY
 static int lfs2_file_flush(lfs2_t *lfs2, lfs2_file_t *file) {
-    LFS2_ASSERT(file->flags & LFS2_F_OPENED);
-
     if (file->flags & LFS2_F_READING) {
         if (!(file->flags & LFS2_F_INLINE)) {
             lfs2_cache_drop(lfs2, &file->cache);
@@ -2669,7 +2736,7 @@ static int lfs2_file_flush(lfs2_t *lfs2, lfs2_file_t *file) {
             lfs2_file_t orig = {
                 .ctz.head = file->ctz.head,
                 .ctz.size = file->ctz.size,
-                .flags = LFS2_O_RDONLY | LFS2_F_OPENED,
+                .flags = LFS2_O_RDONLY,
                 .pos = file->pos,
                 .cache = lfs2->rcache,
             };
@@ -2679,12 +2746,12 @@ static int lfs2_file_flush(lfs2_t *lfs2, lfs2_file_t *file) {
                 // copy over a byte at a time, leave it up to caching
                 // to make this efficient
                 uint8_t data;
-                lfs2_ssize_t res = lfs2_file_read(lfs2, &orig, &data, 1);
+                lfs2_ssize_t res = lfs2_file_rawread(lfs2, &orig, &data, 1);
                 if (res < 0) {
                     return res;
                 }
 
-                res = lfs2_file_write(lfs2, file, &data, 1);
+                res = lfs2_file_rawwrite(lfs2, file, &data, 1);
                 if (res < 0) {
                     return res;
                 }
@@ -2730,24 +2797,22 @@ static int lfs2_file_flush(lfs2_t *lfs2, lfs2_file_t *file) {
 
     return 0;
 }
+#endif
 
-int lfs2_file_sync(lfs2_t *lfs2, lfs2_file_t *file) {
-    LFS2_TRACE("lfs2_file_sync(%p, %p)", (void*)lfs2, (void*)file);
-    LFS2_ASSERT(file->flags & LFS2_F_OPENED);
-
+#ifndef LFS2_READONLY
+static int lfs2_file_rawsync(lfs2_t *lfs2, lfs2_file_t *file) {
     if (file->flags & LFS2_F_ERRED) {
         // it's not safe to do anything if our file errored
-        LFS2_TRACE("lfs2_file_sync -> %d", 0);
         return 0;
     }
 
     int err = lfs2_file_flush(lfs2, file);
     if (err) {
         file->flags |= LFS2_F_ERRED;
-        LFS2_TRACE("lfs2_file_sync -> %d", err);
         return err;
     }
 
+
     if ((file->flags & LFS2_F_DIRTY) &&
             !lfs2_pair_isnull(file->m.pair)) {
         // update dir entry
@@ -2777,39 +2842,35 @@ int lfs2_file_sync(lfs2_t *lfs2, lfs2_file_t *file) {
                     file->cfg->attr_count), file->cfg->attrs}));
         if (err) {
             file->flags |= LFS2_F_ERRED;
-            LFS2_TRACE("lfs2_file_sync -> %d", err);
             return err;
         }
 
         file->flags &= ~LFS2_F_DIRTY;
     }
 
-    LFS2_TRACE("lfs2_file_sync -> %d", 0);
     return 0;
 }
+#endif
 
-lfs2_ssize_t lfs2_file_read(lfs2_t *lfs2, lfs2_file_t *file,
+static lfs2_ssize_t lfs2_file_rawread(lfs2_t *lfs2, lfs2_file_t *file,
         void *buffer, lfs2_size_t size) {
-    LFS2_TRACE("lfs2_file_read(%p, %p, %p, %"PRIu32")",
-            (void*)lfs2, (void*)file, buffer, size);
-    LFS2_ASSERT(file->flags & LFS2_F_OPENED);
-    LFS2_ASSERT((file->flags & 3) != LFS2_O_WRONLY);
+    LFS2_ASSERT((file->flags & LFS2_O_RDONLY) == LFS2_O_RDONLY);
 
     uint8_t *data = buffer;
     lfs2_size_t nsize = size;
 
+#ifndef LFS2_READONLY
     if (file->flags & LFS2_F_WRITING) {
         // flush out any writes
         int err = lfs2_file_flush(lfs2, file);
         if (err) {
-            LFS2_TRACE("lfs2_file_read -> %d", err);
             return err;
         }
     }
+#endif
 
     if (file->pos >= file->ctz.size) {
         // eof if past end
-        LFS2_TRACE("lfs2_file_read -> %d", 0);
         return 0;
     }
 
@@ -2825,7 +2886,6 @@ lfs2_ssize_t lfs2_file_read(lfs2_t *lfs2, lfs2_file_t *file,
                         file->ctz.head, file->ctz.size,
                         file->pos, &file->block, &file->off);
                 if (err) {
-                    LFS2_TRACE("lfs2_file_read -> %d", err);
                     return err;
                 }
             } else {
@@ -2845,7 +2905,6 @@ lfs2_ssize_t lfs2_file_read(lfs2_t *lfs2, lfs2_file_t *file,
                     LFS2_MKTAG(LFS2_TYPE_INLINESTRUCT, file->id, 0),
                     file->off, data, diff);
             if (err) {
-                LFS2_TRACE("lfs2_file_read -> %d", err);
                 return err;
             }
         } else {
@@ -2853,7 +2912,6 @@ lfs2_ssize_t lfs2_file_read(lfs2_t *lfs2, lfs2_file_t *file,
                     NULL, &file->cache, lfs2->cfg->block_size,
                     file->block, file->off, data, diff);
             if (err) {
-                LFS2_TRACE("lfs2_file_read -> %d", err);
                 return err;
             }
         }
@@ -2864,16 +2922,13 @@ lfs2_ssize_t lfs2_file_read(lfs2_t *lfs2, lfs2_file_t *file,
         nsize -= diff;
     }
 
-    LFS2_TRACE("lfs2_file_read -> %"PRId32, size);
     return size;
 }
 
-lfs2_ssize_t lfs2_file_write(lfs2_t *lfs2, lfs2_file_t *file,
+#ifndef LFS2_READONLY
+static lfs2_ssize_t lfs2_file_rawwrite(lfs2_t *lfs2, lfs2_file_t *file,
         const void *buffer, lfs2_size_t size) {
-    LFS2_TRACE("lfs2_file_write(%p, %p, %p, %"PRIu32")",
-            (void*)lfs2, (void*)file, buffer, size);
-    LFS2_ASSERT(file->flags & LFS2_F_OPENED);
-    LFS2_ASSERT((file->flags & 3) != LFS2_O_RDONLY);
+    LFS2_ASSERT((file->flags & LFS2_O_WRONLY) == LFS2_O_WRONLY);
 
     const uint8_t *data = buffer;
     lfs2_size_t nsize = size;
@@ -2882,7 +2937,6 @@ lfs2_ssize_t lfs2_file_write(lfs2_t *lfs2, lfs2_file_t *file,
         // drop any reads
         int err = lfs2_file_flush(lfs2, file);
         if (err) {
-            LFS2_TRACE("lfs2_file_write -> %d", err);
             return err;
         }
     }
@@ -2893,7 +2947,6 @@ lfs2_ssize_t lfs2_file_write(lfs2_t *lfs2, lfs2_file_t *file,
 
     if (file->pos + size > lfs2->file_max) {
         // Larger than file limit?
-        LFS2_TRACE("lfs2_file_write -> %d", LFS2_ERR_FBIG);
         return LFS2_ERR_FBIG;
     }
 
@@ -2903,9 +2956,8 @@ lfs2_ssize_t lfs2_file_write(lfs2_t *lfs2, lfs2_file_t *file,
         file->pos = file->ctz.size;
 
         while (file->pos < pos) {
-            lfs2_ssize_t res = lfs2_file_write(lfs2, file, &(uint8_t){0}, 1);
+            lfs2_ssize_t res = lfs2_file_rawwrite(lfs2, file, &(uint8_t){0}, 1);
             if (res < 0) {
-                LFS2_TRACE("lfs2_file_write -> %"PRId32, res);
                 return res;
             }
         }
@@ -2919,7 +2971,6 @@ lfs2_ssize_t lfs2_file_write(lfs2_t *lfs2, lfs2_file_t *file,
         int err = lfs2_file_outline(lfs2, file);
         if (err) {
             file->flags |= LFS2_F_ERRED;
-            LFS2_TRACE("lfs2_file_write -> %d", err);
             return err;
         }
     }
@@ -2936,7 +2987,6 @@ lfs2_ssize_t lfs2_file_write(lfs2_t *lfs2, lfs2_file_t *file,
                             file->pos-1, &file->block, &file->off);
                     if (err) {
                         file->flags |= LFS2_F_ERRED;
-                        LFS2_TRACE("lfs2_file_write -> %d", err);
                         return err;
                     }
 
@@ -2951,7 +3001,6 @@ lfs2_ssize_t lfs2_file_write(lfs2_t *lfs2, lfs2_file_t *file,
                         &file->block, &file->off);
                 if (err) {
                     file->flags |= LFS2_F_ERRED;
-                    LFS2_TRACE("lfs2_file_write -> %d", err);
                     return err;
                 }
             } else {
@@ -2972,7 +3021,6 @@ lfs2_ssize_t lfs2_file_write(lfs2_t *lfs2, lfs2_file_t *file,
                     goto relocate;
                 }
                 file->flags |= LFS2_F_ERRED;
-                LFS2_TRACE("lfs2_file_write -> %d", err);
                 return err;
             }
 
@@ -2981,7 +3029,6 @@ lfs2_ssize_t lfs2_file_write(lfs2_t *lfs2, lfs2_file_t *file,
             err = lfs2_file_relocate(lfs2, file);
             if (err) {
                 file->flags |= LFS2_F_ERRED;
-                LFS2_TRACE("lfs2_file_write -> %d", err);
                 return err;
             }
         }
@@ -2995,22 +3042,19 @@ lfs2_ssize_t lfs2_file_write(lfs2_t *lfs2, lfs2_file_t *file,
     }
 
     file->flags &= ~LFS2_F_ERRED;
-    LFS2_TRACE("lfs2_file_write -> %"PRId32, size);
     return size;
 }
+#endif
 
-lfs2_soff_t lfs2_file_seek(lfs2_t *lfs2, lfs2_file_t *file,
+static lfs2_soff_t lfs2_file_rawseek(lfs2_t *lfs2, lfs2_file_t *file,
         lfs2_soff_t off, int whence) {
-    LFS2_TRACE("lfs2_file_seek(%p, %p, %"PRId32", %d)",
-            (void*)lfs2, (void*)file, off, whence);
-    LFS2_ASSERT(file->flags & LFS2_F_OPENED);
-
+#ifndef LFS2_READONLY
     // write out everything beforehand, may be noop if rdonly
     int err = lfs2_file_flush(lfs2, file);
     if (err) {
-        LFS2_TRACE("lfs2_file_seek -> %d", err);
         return err;
     }
+#endif
 
     // find new pos
     lfs2_off_t npos = file->pos;
@@ -3024,34 +3068,28 @@ lfs2_soff_t lfs2_file_seek(lfs2_t *lfs2, lfs2_file_t *file,
 
     if (npos > lfs2->file_max) {
         // file position out of range
-        LFS2_TRACE("lfs2_file_seek -> %d", LFS2_ERR_INVAL);
         return LFS2_ERR_INVAL;
     }
 
     // update pos
     file->pos = npos;
-    LFS2_TRACE("lfs2_file_seek -> %"PRId32, npos);
     return npos;
 }
 
-int lfs2_file_truncate(lfs2_t *lfs2, lfs2_file_t *file, lfs2_off_t size) {
-    LFS2_TRACE("lfs2_file_truncate(%p, %p, %"PRIu32")",
-            (void*)lfs2, (void*)file, size);
-    LFS2_ASSERT(file->flags & LFS2_F_OPENED);
-    LFS2_ASSERT((file->flags & 3) != LFS2_O_RDONLY);
+#ifndef LFS2_READONLY
+static int lfs2_file_rawtruncate(lfs2_t *lfs2, lfs2_file_t *file, lfs2_off_t size) {
+    LFS2_ASSERT((file->flags & LFS2_O_WRONLY) == LFS2_O_WRONLY);
 
     if (size > LFS2_FILE_MAX) {
-        LFS2_TRACE("lfs2_file_truncate -> %d", LFS2_ERR_INVAL);
         return LFS2_ERR_INVAL;
     }
 
     lfs2_off_t pos = file->pos;
-    lfs2_off_t oldsize = lfs2_file_size(lfs2, file);
+    lfs2_off_t oldsize = lfs2_file_rawsize(lfs2, file);
     if (size < oldsize) {
         // need to flush since directly changing metadata
         int err = lfs2_file_flush(lfs2, file);
         if (err) {
-            LFS2_TRACE("lfs2_file_truncate -> %d", err);
             return err;
         }
 
@@ -3060,7 +3098,6 @@ int lfs2_file_truncate(lfs2_t *lfs2, lfs2_file_t *file, lfs2_off_t size) {
                 file->ctz.head, file->ctz.size,
                 size, &file->block, &file->off);
         if (err) {
-            LFS2_TRACE("lfs2_file_truncate -> %d", err);
             return err;
         }
 
@@ -3070,97 +3107,80 @@ int lfs2_file_truncate(lfs2_t *lfs2, lfs2_file_t *file, lfs2_off_t size) {
     } else if (size > oldsize) {
         // flush+seek if not already at end
         if (file->pos != oldsize) {
-            lfs2_soff_t res = lfs2_file_seek(lfs2, file, 0, LFS2_SEEK_END);
+            lfs2_soff_t res = lfs2_file_rawseek(lfs2, file, 0, LFS2_SEEK_END);
             if (res < 0) {
-                LFS2_TRACE("lfs2_file_truncate -> %"PRId32, res);
                 return (int)res;
             }
         }
 
         // fill with zeros
         while (file->pos < size) {
-            lfs2_ssize_t res = lfs2_file_write(lfs2, file, &(uint8_t){0}, 1);
+            lfs2_ssize_t res = lfs2_file_rawwrite(lfs2, file, &(uint8_t){0}, 1);
             if (res < 0) {
-                LFS2_TRACE("lfs2_file_truncate -> %"PRId32, res);
                 return (int)res;
             }
         }
     }
 
     // restore pos
-    lfs2_soff_t res = lfs2_file_seek(lfs2, file, pos, LFS2_SEEK_SET);
+    lfs2_soff_t res = lfs2_file_rawseek(lfs2, file, pos, LFS2_SEEK_SET);
     if (res < 0) {
-      LFS2_TRACE("lfs2_file_truncate -> %"PRId32, res);
       return (int)res;
     }
 
-    LFS2_TRACE("lfs2_file_truncate -> %d", 0);
     return 0;
 }
+#endif
 
-lfs2_soff_t lfs2_file_tell(lfs2_t *lfs2, lfs2_file_t *file) {
-    LFS2_TRACE("lfs2_file_tell(%p, %p)", (void*)lfs2, (void*)file);
-    LFS2_ASSERT(file->flags & LFS2_F_OPENED);
+static lfs2_soff_t lfs2_file_rawtell(lfs2_t *lfs2, lfs2_file_t *file) {
     (void)lfs2;
-    LFS2_TRACE("lfs2_file_tell -> %"PRId32, file->pos);
     return file->pos;
 }
 
-int lfs2_file_rewind(lfs2_t *lfs2, lfs2_file_t *file) {
-    LFS2_TRACE("lfs2_file_rewind(%p, %p)", (void*)lfs2, (void*)file);
-    lfs2_soff_t res = lfs2_file_seek(lfs2, file, 0, LFS2_SEEK_SET);
+static int lfs2_file_rawrewind(lfs2_t *lfs2, lfs2_file_t *file) {
+    lfs2_soff_t res = lfs2_file_rawseek(lfs2, file, 0, LFS2_SEEK_SET);
     if (res < 0) {
-        LFS2_TRACE("lfs2_file_rewind -> %"PRId32, res);
         return (int)res;
     }
 
-    LFS2_TRACE("lfs2_file_rewind -> %d", 0);
     return 0;
 }
 
-lfs2_soff_t lfs2_file_size(lfs2_t *lfs2, lfs2_file_t *file) {
-    LFS2_TRACE("lfs2_file_size(%p, %p)", (void*)lfs2, (void*)file);
-    LFS2_ASSERT(file->flags & LFS2_F_OPENED);
+static lfs2_soff_t lfs2_file_rawsize(lfs2_t *lfs2, lfs2_file_t *file) {
     (void)lfs2;
+
+#ifndef LFS2_READONLY
     if (file->flags & LFS2_F_WRITING) {
-        LFS2_TRACE("lfs2_file_size -> %"PRId32,
-                lfs2_max(file->pos, file->ctz.size));
         return lfs2_max(file->pos, file->ctz.size);
-    } else {
-        LFS2_TRACE("lfs2_file_size -> %"PRId32, file->ctz.size);
-        return file->ctz.size;
     }
+#endif
+
+    return file->ctz.size;
 }
 
 
 /// General fs operations ///
-int lfs2_stat(lfs2_t *lfs2, const char *path, struct lfs2_info *info) {
-    LFS2_TRACE("lfs2_stat(%p, \"%s\", %p)", (void*)lfs2, path, (void*)info);
+static int lfs2_rawstat(lfs2_t *lfs2, const char *path, struct lfs2_info *info) {
     lfs2_mdir_t cwd;
     lfs2_stag_t tag = lfs2_dir_find(lfs2, &cwd, &path, NULL);
     if (tag < 0) {
-        LFS2_TRACE("lfs2_stat -> %"PRId32, tag);
         return (int)tag;
     }
 
-    int err = lfs2_dir_getinfo(lfs2, &cwd, lfs2_tag_id(tag), info);
-    LFS2_TRACE("lfs2_stat -> %d", err);
-    return err;
+    return lfs2_dir_getinfo(lfs2, &cwd, lfs2_tag_id(tag), info);
 }
 
-int lfs2_remove(lfs2_t *lfs2, const char *path) {
-    LFS2_TRACE("lfs2_remove(%p, \"%s\")", (void*)lfs2, path);
+#ifndef LFS2_READONLY
+static int lfs2_rawremove(lfs2_t *lfs2, const char *path) {
     // deorphan if we haven't yet, needed at most once after poweron
     int err = lfs2_fs_forceconsistency(lfs2);
     if (err) {
-        LFS2_TRACE("lfs2_remove -> %d", err);
         return err;
     }
 
     lfs2_mdir_t cwd;
     lfs2_stag_t tag = lfs2_dir_find(lfs2, &cwd, &path, NULL);
     if (tag < 0 || lfs2_tag_id(tag) == 0x3ff) {
-        LFS2_TRACE("lfs2_remove -> %"PRId32, (tag < 0) ? tag : LFS2_ERR_INVAL);
         return (tag < 0) ? (int)tag : LFS2_ERR_INVAL;
     }
 
@@ -3172,19 +3192,16 @@ int lfs2_remove(lfs2_t *lfs2, const char *path) {
         lfs2_stag_t res = lfs2_dir_get(lfs2, &cwd, LFS2_MKTAG(0x700, 0x3ff, 0),
                 LFS2_MKTAG(LFS2_TYPE_STRUCT, lfs2_tag_id(tag), 8), pair);
         if (res < 0) {
-            LFS2_TRACE("lfs2_remove -> %"PRId32, res);
             return (int)res;
         }
         lfs2_pair_fromle32(pair);
 
         err = lfs2_dir_fetch(lfs2, &dir.m, pair);
         if (err) {
-            LFS2_TRACE("lfs2_remove -> %d", err);
             return err;
         }
 
         if (dir.m.count > 0 || dir.m.split) {
-            LFS2_TRACE("lfs2_remove -> %d", LFS2_ERR_NOTEMPTY);
             return LFS2_ERR_NOTEMPTY;
         }
 
@@ -3200,10 +3217,9 @@ int lfs2_remove(lfs2_t *lfs2, const char *path) {
 
     // delete the entry
     err = lfs2_dir_commit(lfs2, &cwd, LFS2_MKATTRS(
-            {LFS2_MKTAG(LFS2_TYPE_DELETE, lfs2_tag_id(tag), 0)}));
+            {LFS2_MKTAG(LFS2_TYPE_DELETE, lfs2_tag_id(tag), 0), NULL}));
     if (err) {
         lfs2->mlist = dir.next;
-        LFS2_TRACE("lfs2_remove -> %d", err);
         return err;
     }
 
@@ -3214,28 +3230,24 @@ int lfs2_remove(lfs2_t *lfs2, const char *path) {
 
         err = lfs2_fs_pred(lfs2, dir.m.pair, &cwd);
         if (err) {
-            LFS2_TRACE("lfs2_remove -> %d", err);
             return err;
         }
 
         err = lfs2_dir_drop(lfs2, &cwd, &dir.m);
         if (err) {
-            LFS2_TRACE("lfs2_remove -> %d", err);
             return err;
         }
     }
 
-    LFS2_TRACE("lfs2_remove -> %d", 0);
     return 0;
 }
+#endif
 
-int lfs2_rename(lfs2_t *lfs2, const char *oldpath, const char *newpath) {
-    LFS2_TRACE("lfs2_rename(%p, \"%s\", \"%s\")", (void*)lfs2, oldpath, newpath);
-
+#ifndef LFS2_READONLY
+static int lfs2_rawrename(lfs2_t *lfs2, const char *oldpath, const char *newpath) {
     // deorphan if we haven't yet, needed at most once after poweron
     int err = lfs2_fs_forceconsistency(lfs2);
     if (err) {
-        LFS2_TRACE("lfs2_rename -> %d", err);
         return err;
     }
 
@@ -3243,8 +3255,6 @@ int lfs2_rename(lfs2_t *lfs2, const char *oldpath, const char *newpath) {
     lfs2_mdir_t oldcwd;
     lfs2_stag_t oldtag = lfs2_dir_find(lfs2, &oldcwd, &oldpath, NULL);
     if (oldtag < 0 || lfs2_tag_id(oldtag) == 0x3ff) {
-        LFS2_TRACE("lfs2_rename -> %"PRId32,
-                (oldtag < 0) ? oldtag : LFS2_ERR_INVAL);
         return (oldtag < 0) ? (int)oldtag : LFS2_ERR_INVAL;
     }
 
@@ -3254,8 +3264,6 @@ int lfs2_rename(lfs2_t *lfs2, const char *oldpath, const char *newpath) {
     lfs2_stag_t prevtag = lfs2_dir_find(lfs2, &newcwd, &newpath, &newid);
     if ((prevtag < 0 || lfs2_tag_id(prevtag) == 0x3ff) &&
             !(prevtag == LFS2_ERR_NOENT && newid != 0x3ff)) {
-        LFS2_TRACE("lfs2_rename -> %"PRId32,
-            (prevtag < 0) ? prevtag : LFS2_ERR_INVAL);
         return (prevtag < 0) ? (int)prevtag : LFS2_ERR_INVAL;
     }
 
@@ -3269,7 +3277,6 @@ int lfs2_rename(lfs2_t *lfs2, const char *oldpath, const char *newpath) {
         // check that name fits
         lfs2_size_t nlen = strlen(newpath);
         if (nlen > lfs2->name_max) {
-            LFS2_TRACE("lfs2_rename -> %d", LFS2_ERR_NAMETOOLONG);
             return LFS2_ERR_NAMETOOLONG;
         }
 
@@ -3280,11 +3287,9 @@ int lfs2_rename(lfs2_t *lfs2, const char *oldpath, const char *newpath) {
             newoldid += 1;
         }
     } else if (lfs2_tag_type3(prevtag) != lfs2_tag_type3(oldtag)) {
-        LFS2_TRACE("lfs2_rename -> %d", LFS2_ERR_ISDIR);
         return LFS2_ERR_ISDIR;
     } else if (samepair && newid == newoldid) {
         // we're renaming to ourselves??
-        LFS2_TRACE("lfs2_rename -> %d", 0);
         return 0;
     } else if (lfs2_tag_type3(prevtag) == LFS2_TYPE_DIR) {
         // must be empty before removal
@@ -3292,7 +3297,6 @@ int lfs2_rename(lfs2_t *lfs2, const char *oldpath, const char *newpath) {
         lfs2_stag_t res = lfs2_dir_get(lfs2, &newcwd, LFS2_MKTAG(0x700, 0x3ff, 0),
                 LFS2_MKTAG(LFS2_TYPE_STRUCT, newid, 8), prevpair);
         if (res < 0) {
-            LFS2_TRACE("lfs2_rename -> %"PRId32, res);
             return (int)res;
         }
         lfs2_pair_fromle32(prevpair);
@@ -3300,12 +3304,10 @@ int lfs2_rename(lfs2_t *lfs2, const char *oldpath, const char *newpath) {
         // must be empty before removal
         err = lfs2_dir_fetch(lfs2, &prevdir.m, prevpair);
         if (err) {
-            LFS2_TRACE("lfs2_rename -> %d", err);
             return err;
         }
 
         if (prevdir.m.count > 0 || prevdir.m.split) {
-            LFS2_TRACE("lfs2_rename -> %d", LFS2_ERR_NOTEMPTY);
             return LFS2_ERR_NOTEMPTY;
         }
 
@@ -3326,15 +3328,14 @@ int lfs2_rename(lfs2_t *lfs2, const char *oldpath, const char *newpath) {
     // move over all attributes
     err = lfs2_dir_commit(lfs2, &newcwd, LFS2_MKATTRS(
             {LFS2_MKTAG_IF(prevtag != LFS2_ERR_NOENT,
-                LFS2_TYPE_DELETE, newid, 0)},
-            {LFS2_MKTAG(LFS2_TYPE_CREATE, newid, 0)},
+                LFS2_TYPE_DELETE, newid, 0), NULL},
+            {LFS2_MKTAG(LFS2_TYPE_CREATE, newid, 0), NULL},
             {LFS2_MKTAG(lfs2_tag_type3(oldtag), newid, strlen(newpath)), newpath},
             {LFS2_MKTAG(LFS2_FROM_MOVE, newid, lfs2_tag_id(oldtag)), &oldcwd},
             {LFS2_MKTAG_IF(samepair,
-                LFS2_TYPE_DELETE, newoldid, 0)}));
+                LFS2_TYPE_DELETE, newoldid, 0), NULL}));
     if (err) {
         lfs2->mlist = prevdir.next;
-        LFS2_TRACE("lfs2_rename -> %d", err);
         return err;
     }
 
@@ -3344,10 +3345,9 @@ int lfs2_rename(lfs2_t *lfs2, const char *oldpath, const char *newpath) {
         // prep gstate and delete move id
         lfs2_fs_prepmove(lfs2, 0x3ff, NULL);
         err = lfs2_dir_commit(lfs2, &oldcwd, LFS2_MKATTRS(
-                {LFS2_MKTAG(LFS2_TYPE_DELETE, lfs2_tag_id(oldtag), 0)}));
+                {LFS2_MKTAG(LFS2_TYPE_DELETE, lfs2_tag_id(oldtag), 0), NULL}));
         if (err) {
             lfs2->mlist = prevdir.next;
-            LFS2_TRACE("lfs2_rename -> %d", err);
             return err;
         }
     }
@@ -3359,29 +3359,24 @@ int lfs2_rename(lfs2_t *lfs2, const char *oldpath, const char *newpath) {
 
         err = lfs2_fs_pred(lfs2, prevdir.m.pair, &newcwd);
         if (err) {
-            LFS2_TRACE("lfs2_rename -> %d", err);
             return err;
         }
 
         err = lfs2_dir_drop(lfs2, &newcwd, &prevdir.m);
         if (err) {
-            LFS2_TRACE("lfs2_rename -> %d", err);
             return err;
         }
     }
 
-    LFS2_TRACE("lfs2_rename -> %d", 0);
     return 0;
 }
+#endif
 
-lfs2_ssize_t lfs2_getattr(lfs2_t *lfs2, const char *path,
+static lfs2_ssize_t lfs2_rawgetattr(lfs2_t *lfs2, const char *path,
         uint8_t type, void *buffer, lfs2_size_t size) {
-    LFS2_TRACE("lfs2_getattr(%p, \"%s\", %"PRIu8", %p, %"PRIu32")",
-            (void*)lfs2, path, type, buffer, size);
     lfs2_mdir_t cwd;
     lfs2_stag_t tag = lfs2_dir_find(lfs2, &cwd, &path, NULL);
     if (tag < 0) {
-        LFS2_TRACE("lfs2_getattr -> %"PRId32, tag);
         return tag;
     }
 
@@ -3391,7 +3386,6 @@ lfs2_ssize_t lfs2_getattr(lfs2_t *lfs2, const char *path,
         id = 0;
         int err = lfs2_dir_fetch(lfs2, &cwd, lfs2->root);
         if (err) {
-            LFS2_TRACE("lfs2_getattr -> %d", err);
             return err;
         }
     }
@@ -3402,19 +3396,16 @@ lfs2_ssize_t lfs2_getattr(lfs2_t *lfs2, const char *path,
             buffer);
     if (tag < 0) {
         if (tag == LFS2_ERR_NOENT) {
-            LFS2_TRACE("lfs2_getattr -> %d", LFS2_ERR_NOATTR);
             return LFS2_ERR_NOATTR;
         }
 
-        LFS2_TRACE("lfs2_getattr -> %"PRId32, tag);
         return tag;
     }
 
-    size = lfs2_tag_size(tag);
-    LFS2_TRACE("lfs2_getattr -> %"PRId32, size);
-    return size;
+    return lfs2_tag_size(tag);
 }
 
+#ifndef LFS2_READONLY
 static int lfs2_commitattr(lfs2_t *lfs2, const char *path,
         uint8_t type, const void *buffer, lfs2_size_t size) {
     lfs2_mdir_t cwd;
@@ -3436,27 +3427,24 @@ static int lfs2_commitattr(lfs2_t *lfs2, const char *path,
     return lfs2_dir_commit(lfs2, &cwd, LFS2_MKATTRS(
             {LFS2_MKTAG(LFS2_TYPE_USERATTR + type, id, size), buffer}));
 }
+#endif
 
-int lfs2_setattr(lfs2_t *lfs2, const char *path,
+#ifndef LFS2_READONLY
+static int lfs2_rawsetattr(lfs2_t *lfs2, const char *path,
         uint8_t type, const void *buffer, lfs2_size_t size) {
-    LFS2_TRACE("lfs2_setattr(%p, \"%s\", %"PRIu8", %p, %"PRIu32")",
-            (void*)lfs2, path, type, buffer, size);
     if (size > lfs2->attr_max) {
-        LFS2_TRACE("lfs2_setattr -> %d", LFS2_ERR_NOSPC);
         return LFS2_ERR_NOSPC;
     }
 
-    int err = lfs2_commitattr(lfs2, path, type, buffer, size);
-    LFS2_TRACE("lfs2_setattr -> %d", err);
-    return err;
+    return lfs2_commitattr(lfs2, path, type, buffer, size);
 }
+#endif
 
-int lfs2_removeattr(lfs2_t *lfs2, const char *path, uint8_t type) {
-    LFS2_TRACE("lfs2_removeattr(%p, \"%s\", %"PRIu8")", (void*)lfs2, path, type);
-    int err = lfs2_commitattr(lfs2, path, type, NULL, 0x3ff);
-    LFS2_TRACE("lfs2_removeattr -> %d", err);
-    return err;
+#ifndef LFS2_READONLY
+static int lfs2_rawremoveattr(lfs2_t *lfs2, const char *path, uint8_t type) {
+    return lfs2_commitattr(lfs2, path, type, NULL, 0x3ff);
 }
+#endif
 
 
 /// Filesystem operations ///
@@ -3584,28 +3572,12 @@ static int lfs2_deinit(lfs2_t *lfs2) {
     return 0;
 }
 
-int lfs2_format(lfs2_t *lfs2, const struct lfs2_config *cfg) {
-    LFS2_TRACE("lfs2_format(%p, %p {.context=%p, "
-                ".read=%p, .prog=%p, .erase=%p, .sync=%p, "
-                ".read_size=%"PRIu32", .prog_size=%"PRIu32", "
-                ".block_size=%"PRIu32", .block_count=%"PRIu32", "
-                ".block_cycles=%"PRIu32", .cache_size=%"PRIu32", "
-                ".lookahead_size=%"PRIu32", .read_buffer=%p, "
-                ".prog_buffer=%p, .lookahead_buffer=%p, "
-                ".name_max=%"PRIu32", .file_max=%"PRIu32", "
-                ".attr_max=%"PRIu32"})",
-            (void*)lfs2, (void*)cfg, cfg->context,
-            (void*)(uintptr_t)cfg->read, (void*)(uintptr_t)cfg->prog,
-            (void*)(uintptr_t)cfg->erase, (void*)(uintptr_t)cfg->sync,
-            cfg->read_size, cfg->prog_size, cfg->block_size, cfg->block_count,
-            cfg->block_cycles, cfg->cache_size, cfg->lookahead_size,
-            cfg->read_buffer, cfg->prog_buffer, cfg->lookahead_buffer,
-            cfg->name_max, cfg->file_max, cfg->attr_max);
+#ifndef LFS2_READONLY
+static int lfs2_rawformat(lfs2_t *lfs2, const struct lfs2_config *cfg) {
     int err = 0;
     {
         err = lfs2_init(lfs2, cfg);
         if (err) {
-            LFS2_TRACE("lfs2_format -> %d", err);
             return err;
         }
 
@@ -3636,7 +3608,7 @@ int lfs2_format(lfs2_t *lfs2, const struct lfs2_config *cfg) {
 
         lfs2_superblock_tole32(&superblock);
         err = lfs2_dir_commit(lfs2, &root, LFS2_MKATTRS(
-                {LFS2_MKTAG(LFS2_TYPE_CREATE, 0, 0)},
+                {LFS2_MKTAG(LFS2_TYPE_CREATE, 0, 0), NULL},
                 {LFS2_MKTAG(LFS2_TYPE_SUPERBLOCK, 0, 8), "littlefs"},
                 {LFS2_MKTAG(LFS2_TYPE_INLINESTRUCT, 0, sizeof(superblock)),
                     &superblock}));
@@ -3661,30 +3633,14 @@ int lfs2_format(lfs2_t *lfs2, const struct lfs2_config *cfg) {
 
 cleanup:
     lfs2_deinit(lfs2);
-    LFS2_TRACE("lfs2_format -> %d", err);
     return err;
+
 }
+#endif
 
-int lfs2_mount(lfs2_t *lfs2, const struct lfs2_config *cfg) {
-    LFS2_TRACE("lfs2_mount(%p, %p {.context=%p, "
-                ".read=%p, .prog=%p, .erase=%p, .sync=%p, "
-                ".read_size=%"PRIu32", .prog_size=%"PRIu32", "
-                ".block_size=%"PRIu32", .block_count=%"PRIu32", "
-                ".block_cycles=%"PRIu32", .cache_size=%"PRIu32", "
-                ".lookahead_size=%"PRIu32", .read_buffer=%p, "
-                ".prog_buffer=%p, .lookahead_buffer=%p, "
-                ".name_max=%"PRIu32", .file_max=%"PRIu32", "
-                ".attr_max=%"PRIu32"})",
-            (void*)lfs2, (void*)cfg, cfg->context,
-            (void*)(uintptr_t)cfg->read, (void*)(uintptr_t)cfg->prog,
-            (void*)(uintptr_t)cfg->erase, (void*)(uintptr_t)cfg->sync,
-            cfg->read_size, cfg->prog_size, cfg->block_size, cfg->block_count,
-            cfg->block_cycles, cfg->cache_size, cfg->lookahead_size,
-            cfg->read_buffer, cfg->prog_buffer, cfg->lookahead_buffer,
-            cfg->name_max, cfg->file_max, cfg->attr_max);
+static int lfs2_rawmount(lfs2_t *lfs2, const struct lfs2_config *cfg) {
     int err = lfs2_init(lfs2, cfg);
     if (err) {
-        LFS2_TRACE("lfs2_mount -> %d", err);
         return err;
     }
 
@@ -3797,28 +3753,25 @@ int lfs2_mount(lfs2_t *lfs2, const struct lfs2_config *cfg) {
     lfs2->gstate.tag += !lfs2_tag_isvalid(lfs2->gstate.tag);
     lfs2->gdisk = lfs2->gstate;
 
-    // setup free lookahead
-    lfs2_alloc_reset(lfs2);
+    // setup free lookahead, to distribute allocations uniformly across
+    // boots, we start the allocator at a random location
+    lfs2->free.off = lfs2->seed % lfs2->cfg->block_count;
+    lfs2_alloc_drop(lfs2);
 
-    LFS2_TRACE("lfs2_mount -> %d", 0);
     return 0;
 
 cleanup:
-    lfs2_unmount(lfs2);
-    LFS2_TRACE("lfs2_mount -> %d", err);
+    lfs2_rawunmount(lfs2);
     return err;
 }
 
-int lfs2_unmount(lfs2_t *lfs2) {
-    LFS2_TRACE("lfs2_unmount(%p)", (void*)lfs2);
-    int err = lfs2_deinit(lfs2);
-    LFS2_TRACE("lfs2_unmount -> %d", err);
-    return err;
+static int lfs2_rawunmount(lfs2_t *lfs2) {
+    return lfs2_deinit(lfs2);
 }
 
 
 /// Filesystem filesystem operations ///
-int lfs2_fs_traverseraw(lfs2_t *lfs2,
+int lfs2_fs_rawtraverse(lfs2_t *lfs2,
         int (*cb)(void *data, lfs2_block_t block), void *data,
         bool includeorphans) {
     // iterate over metadata pairs
@@ -3888,6 +3841,7 @@ int lfs2_fs_traverseraw(lfs2_t *lfs2,
         }
     }
 
+#ifndef LFS2_READONLY
     // iterate over any open files
     for (lfs2_file_t *f = (lfs2_file_t*)lfs2->mlist; f; f = f->next) {
         if (f->type != LFS2_TYPE_REG) {
@@ -3910,19 +3864,12 @@ int lfs2_fs_traverseraw(lfs2_t *lfs2,
             }
         }
     }
+#endif
 
     return 0;
 }
 
-int lfs2_fs_traverse(lfs2_t *lfs2,
-        int (*cb)(void *data, lfs2_block_t block), void *data) {
-    LFS2_TRACE("lfs2_fs_traverse(%p, %p, %p)",
-            (void*)lfs2, (void*)(uintptr_t)cb, data);
-    int err = lfs2_fs_traverseraw(lfs2, cb, data, true);
-    LFS2_TRACE("lfs2_fs_traverse -> %d", 0);
-    return err;
-}
-
+#ifndef LFS2_READONLY
 static int lfs2_fs_pred(lfs2_t *lfs2,
         const lfs2_block_t pair[2], lfs2_mdir_t *pdir) {
     // iterate over all directory directory entries
@@ -3948,12 +3895,16 @@ static int lfs2_fs_pred(lfs2_t *lfs2,
 
     return LFS2_ERR_NOENT;
 }
+#endif
 
+#ifndef LFS2_READONLY
 struct lfs2_fs_parent_match {
     lfs2_t *lfs2;
     const lfs2_block_t pair[2];
 };
+#endif
 
+#ifndef LFS2_READONLY
 static int lfs2_fs_parent_match(void *data,
         lfs2_tag_t tag, const void *buffer) {
     struct lfs2_fs_parent_match *find = data;
@@ -3972,7 +3923,9 @@ static int lfs2_fs_parent_match(void *data,
     lfs2_pair_fromle32(child);
     return (lfs2_pair_cmp(child, find->pair) == 0) ? LFS2_CMP_EQ : LFS2_CMP_LT;
 }
+#endif
 
+#ifndef LFS2_READONLY
 static lfs2_stag_t lfs2_fs_parent(lfs2_t *lfs2, const lfs2_block_t pair[2],
         lfs2_mdir_t *parent) {
     // use fetchmatch with callback to find pairs
@@ -3999,7 +3952,9 @@ static lfs2_stag_t lfs2_fs_parent(lfs2_t *lfs2, const lfs2_block_t pair[2],
 
     return LFS2_ERR_NOENT;
 }
+#endif
 
+#ifndef LFS2_READONLY
 static int lfs2_fs_relocate(lfs2_t *lfs2,
         const lfs2_block_t oldpair[2], lfs2_block_t newpair[2]) {
     // update internal root
@@ -4050,7 +4005,7 @@ static int lfs2_fs_relocate(lfs2_t *lfs2,
         lfs2_pair_tole32(newpair);
         int err = lfs2_dir_commit(lfs2, &parent, LFS2_MKATTRS(
                 {LFS2_MKTAG_IF(moveid != 0x3ff,
-                    LFS2_TYPE_DELETE, moveid, 0)},
+                    LFS2_TYPE_DELETE, moveid, 0), NULL},
                 {tag, newpair}));
         lfs2_pair_fromle32(newpair);
         if (err) {
@@ -4084,7 +4039,7 @@ static int lfs2_fs_relocate(lfs2_t *lfs2,
         lfs2_pair_tole32(newpair);
         err = lfs2_dir_commit(lfs2, &parent, LFS2_MKATTRS(
                 {LFS2_MKTAG_IF(moveid != 0x3ff,
-                    LFS2_TYPE_DELETE, moveid, 0)},
+                    LFS2_TYPE_DELETE, moveid, 0), NULL},
                 {LFS2_MKTAG(LFS2_TYPE_TAIL + parent.split, 0x3ff, 8), newpair}));
         lfs2_pair_fromle32(newpair);
         if (err) {
@@ -4094,14 +4049,18 @@ static int lfs2_fs_relocate(lfs2_t *lfs2,
 
     return 0;
 }
+#endif
 
+#ifndef LFS2_READONLY
 static void lfs2_fs_preporphans(lfs2_t *lfs2, int8_t orphans) {
     LFS2_ASSERT(lfs2_tag_size(lfs2->gstate.tag) > 0 || orphans >= 0);
     lfs2->gstate.tag += orphans;
     lfs2->gstate.tag = ((lfs2->gstate.tag & ~LFS2_MKTAG(0x800, 0, 0)) |
             ((uint32_t)lfs2_gstate_hasorphans(&lfs2->gstate) << 31));
 }
+#endif
 
+#ifndef LFS2_READONLY
 static void lfs2_fs_prepmove(lfs2_t *lfs2,
         uint16_t id, const lfs2_block_t pair[2]) {
     lfs2->gstate.tag = ((lfs2->gstate.tag & ~LFS2_MKTAG(0x7ff, 0x3ff, 0)) |
@@ -4109,7 +4068,9 @@ static void lfs2_fs_prepmove(lfs2_t *lfs2,
     lfs2->gstate.pair[0] = (id != 0x3ff) ? pair[0] : 0;
     lfs2->gstate.pair[1] = (id != 0x3ff) ? pair[1] : 0;
 }
+#endif
 
+#ifndef LFS2_READONLY
 static int lfs2_fs_demove(lfs2_t *lfs2) {
     if (!lfs2_gstate_hasmove(&lfs2->gdisk)) {
         return 0;
@@ -4132,14 +4093,16 @@ static int lfs2_fs_demove(lfs2_t *lfs2) {
     uint16_t moveid = lfs2_tag_id(lfs2->gdisk.tag);
     lfs2_fs_prepmove(lfs2, 0x3ff, NULL);
     err = lfs2_dir_commit(lfs2, &movedir, LFS2_MKATTRS(
-            {LFS2_MKTAG(LFS2_TYPE_DELETE, moveid, 0)}));
+            {LFS2_MKTAG(LFS2_TYPE_DELETE, moveid, 0), NULL}));
     if (err) {
         return err;
     }
 
     return 0;
 }
+#endif
 
+#ifndef LFS2_READONLY
 static int lfs2_fs_deorphan(lfs2_t *lfs2) {
     if (!lfs2_gstate_hasorphans(&lfs2->gstate)) {
         return 0;
@@ -4213,7 +4176,9 @@ static int lfs2_fs_deorphan(lfs2_t *lfs2) {
     lfs2_fs_preporphans(lfs2, -lfs2_gstate_getorphans(&lfs2->gstate));
     return 0;
 }
+#endif
 
+#ifndef LFS2_READONLY
 static int lfs2_fs_forceconsistency(lfs2_t *lfs2) {
     int err = lfs2_fs_demove(lfs2);
     if (err) {
@@ -4227,6 +4192,7 @@ static int lfs2_fs_forceconsistency(lfs2_t *lfs2) {
 
     return 0;
 }
+#endif
 
 static int lfs2_fs_size_count(void *p, lfs2_block_t block) {
     (void)block;
@@ -4235,16 +4201,13 @@ static int lfs2_fs_size_count(void *p, lfs2_block_t block) {
     return 0;
 }
 
-lfs2_ssize_t lfs2_fs_size(lfs2_t *lfs2) {
-    LFS2_TRACE("lfs2_fs_size(%p)", (void*)lfs2);
+static lfs2_ssize_t lfs2_fs_rawsize(lfs2_t *lfs2) {
     lfs2_size_t size = 0;
-    int err = lfs2_fs_traverseraw(lfs2, lfs2_fs_size_count, &size, false);
+    int err = lfs2_fs_rawtraverse(lfs2, lfs2_fs_size_count, &size, false);
     if (err) {
-        LFS2_TRACE("lfs2_fs_size -> %d", err);
         return err;
     }
 
-    LFS2_TRACE("lfs2_fs_size -> %d", err);
     return size;
 }
 
@@ -4669,27 +4632,10 @@ static int lfs21_unmount(lfs2_t *lfs2) {
 }
 
 /// v1 migration ///
-int lfs2_migrate(lfs2_t *lfs2, const struct lfs2_config *cfg) {
-    LFS2_TRACE("lfs2_migrate(%p, %p {.context=%p, "
-                ".read=%p, .prog=%p, .erase=%p, .sync=%p, "
-                ".read_size=%"PRIu32", .prog_size=%"PRIu32", "
-                ".block_size=%"PRIu32", .block_count=%"PRIu32", "
-                ".block_cycles=%"PRIu32", .cache_size=%"PRIu32", "
-                ".lookahead_size=%"PRIu32", .read_buffer=%p, "
-                ".prog_buffer=%p, .lookahead_buffer=%p, "
-                ".name_max=%"PRIu32", .file_max=%"PRIu32", "
-                ".attr_max=%"PRIu32"})",
-            (void*)lfs2, (void*)cfg, cfg->context,
-            (void*)(uintptr_t)cfg->read, (void*)(uintptr_t)cfg->prog,
-            (void*)(uintptr_t)cfg->erase, (void*)(uintptr_t)cfg->sync,
-            cfg->read_size, cfg->prog_size, cfg->block_size, cfg->block_count,
-            cfg->block_cycles, cfg->cache_size, cfg->lookahead_size,
-            cfg->read_buffer, cfg->prog_buffer, cfg->lookahead_buffer,
-            cfg->name_max, cfg->file_max, cfg->attr_max);
+static int lfs2_rawmigrate(lfs2_t *lfs2, const struct lfs2_config *cfg) {
     struct lfs21 lfs21;
     int err = lfs21_mount(lfs2, &lfs21, cfg);
     if (err) {
-        LFS2_TRACE("lfs2_migrate -> %d", err);
         return err;
     }
 
@@ -4906,8 +4852,539 @@ int lfs2_migrate(lfs2_t *lfs2, const struct lfs2_config *cfg) {
 
 cleanup:
     lfs21_unmount(lfs2);
-    LFS2_TRACE("lfs2_migrate -> %d", err);
     return err;
 }
 
 #endif
+
+
+/// Public API wrappers ///
+
+// Here we can add tracing/thread safety easily
+
+// Thread-safe wrappers if enabled
+#ifdef LFS2_THREADSAFE
+#define LFS2_LOCK(cfg)   cfg->lock(cfg)
+#define LFS2_UNLOCK(cfg) cfg->unlock(cfg)
+#else
+#define LFS2_LOCK(cfg)   ((void)cfg, 0)
+#define LFS2_UNLOCK(cfg) ((void)cfg)
+#endif
+
+// Public API
+#ifndef LFS2_READONLY
+int lfs2_format(lfs2_t *lfs2, const struct lfs2_config *cfg) {
+    int err = LFS2_LOCK(cfg);
+    if (err) {
+        return err;
+    }
+    LFS2_TRACE("lfs2_format(%p, %p {.context=%p, "
+                ".read=%p, .prog=%p, .erase=%p, .sync=%p, "
+                ".read_size=%"PRIu32", .prog_size=%"PRIu32", "
+                ".block_size=%"PRIu32", .block_count=%"PRIu32", "
+                ".block_cycles=%"PRIu32", .cache_size=%"PRIu32", "
+                ".lookahead_size=%"PRIu32", .read_buffer=%p, "
+                ".prog_buffer=%p, .lookahead_buffer=%p, "
+                ".name_max=%"PRIu32", .file_max=%"PRIu32", "
+                ".attr_max=%"PRIu32"})",
+            (void*)lfs2, (void*)cfg, cfg->context,
+            (void*)(uintptr_t)cfg->read, (void*)(uintptr_t)cfg->prog,
+            (void*)(uintptr_t)cfg->erase, (void*)(uintptr_t)cfg->sync,
+            cfg->read_size, cfg->prog_size, cfg->block_size, cfg->block_count,
+            cfg->block_cycles, cfg->cache_size, cfg->lookahead_size,
+            cfg->read_buffer, cfg->prog_buffer, cfg->lookahead_buffer,
+            cfg->name_max, cfg->file_max, cfg->attr_max);
+
+    err = lfs2_rawformat(lfs2, cfg);
+
+    LFS2_TRACE("lfs2_format -> %d", err);
+    LFS2_UNLOCK(cfg);
+    return err;
+}
+#endif
+
+int lfs2_mount(lfs2_t *lfs2, const struct lfs2_config *cfg) {
+    int err = LFS2_LOCK(cfg);
+    if (err) {
+        return err;
+    }
+    LFS2_TRACE("lfs2_mount(%p, %p {.context=%p, "
+                ".read=%p, .prog=%p, .erase=%p, .sync=%p, "
+                ".read_size=%"PRIu32", .prog_size=%"PRIu32", "
+                ".block_size=%"PRIu32", .block_count=%"PRIu32", "
+                ".block_cycles=%"PRIu32", .cache_size=%"PRIu32", "
+                ".lookahead_size=%"PRIu32", .read_buffer=%p, "
+                ".prog_buffer=%p, .lookahead_buffer=%p, "
+                ".name_max=%"PRIu32", .file_max=%"PRIu32", "
+                ".attr_max=%"PRIu32"})",
+            (void*)lfs2, (void*)cfg, cfg->context,
+            (void*)(uintptr_t)cfg->read, (void*)(uintptr_t)cfg->prog,
+            (void*)(uintptr_t)cfg->erase, (void*)(uintptr_t)cfg->sync,
+            cfg->read_size, cfg->prog_size, cfg->block_size, cfg->block_count,
+            cfg->block_cycles, cfg->cache_size, cfg->lookahead_size,
+            cfg->read_buffer, cfg->prog_buffer, cfg->lookahead_buffer,
+            cfg->name_max, cfg->file_max, cfg->attr_max);
+
+    err = lfs2_rawmount(lfs2, cfg);
+
+    LFS2_TRACE("lfs2_mount -> %d", err);
+    LFS2_UNLOCK(cfg);
+    return err;
+}
+
+int lfs2_unmount(lfs2_t *lfs2) {
+    int err = LFS2_LOCK(lfs2->cfg);
+    if (err) {
+        return err;
+    }
+    LFS2_TRACE("lfs2_unmount(%p)", (void*)lfs2);
+
+    err = lfs2_rawunmount(lfs2);
+
+    LFS2_TRACE("lfs2_unmount -> %d", err);
+    LFS2_UNLOCK(lfs2->cfg);
+    return err;
+}
+
+#ifndef LFS2_READONLY
+int lfs2_remove(lfs2_t *lfs2, const char *path) {
+    int err = LFS2_LOCK(lfs2->cfg);
+    if (err) {
+        return err;
+    }
+    LFS2_TRACE("lfs2_remove(%p, \"%s\")", (void*)lfs2, path);
+
+    err = lfs2_rawremove(lfs2, path);
+
+    LFS2_TRACE("lfs2_remove -> %d", err);
+    LFS2_UNLOCK(lfs2->cfg);
+    return err;
+}
+#endif
+
+#ifndef LFS2_READONLY
+int lfs2_rename(lfs2_t *lfs2, const char *oldpath, const char *newpath) {
+    int err = LFS2_LOCK(lfs2->cfg);
+    if (err) {
+        return err;
+    }
+    LFS2_TRACE("lfs2_rename(%p, \"%s\", \"%s\")", (void*)lfs2, oldpath, newpath);
+
+    err = lfs2_rawrename(lfs2, oldpath, newpath);
+
+    LFS2_TRACE("lfs2_rename -> %d", err);
+    LFS2_UNLOCK(lfs2->cfg);
+    return err;
+}
+#endif
+
+int lfs2_stat(lfs2_t *lfs2, const char *path, struct lfs2_info *info) {
+    int err = LFS2_LOCK(lfs2->cfg);
+    if (err) {
+        return err;
+    }
+    LFS2_TRACE("lfs2_stat(%p, \"%s\", %p)", (void*)lfs2, path, (void*)info);
+
+    err = lfs2_rawstat(lfs2, path, info);
+
+    LFS2_TRACE("lfs2_stat -> %d", err);
+    LFS2_UNLOCK(lfs2->cfg);
+    return err;
+}
+
+lfs2_ssize_t lfs2_getattr(lfs2_t *lfs2, const char *path,
+        uint8_t type, void *buffer, lfs2_size_t size) {
+    int err = LFS2_LOCK(lfs2->cfg);
+    if (err) {
+        return err;
+    }
+    LFS2_TRACE("lfs2_getattr(%p, \"%s\", %"PRIu8", %p, %"PRIu32")",
+            (void*)lfs2, path, type, buffer, size);
+
+    lfs2_ssize_t res = lfs2_rawgetattr(lfs2, path, type, buffer, size);
+
+    LFS2_TRACE("lfs2_getattr -> %"PRId32, res);
+    LFS2_UNLOCK(lfs2->cfg);
+    return res;
+}
+
+#ifndef LFS2_READONLY
+int lfs2_setattr(lfs2_t *lfs2, const char *path,
+        uint8_t type, const void *buffer, lfs2_size_t size) {
+    int err = LFS2_LOCK(lfs2->cfg);
+    if (err) {
+        return err;
+    }
+    LFS2_TRACE("lfs2_setattr(%p, \"%s\", %"PRIu8", %p, %"PRIu32")",
+            (void*)lfs2, path, type, buffer, size);
+
+    err = lfs2_rawsetattr(lfs2, path, type, buffer, size);
+
+    LFS2_TRACE("lfs2_setattr -> %d", err);
+    LFS2_UNLOCK(lfs2->cfg);
+    return err;
+}
+#endif
+
+#ifndef LFS2_READONLY
+int lfs2_removeattr(lfs2_t *lfs2, const char *path, uint8_t type) {
+    int err = LFS2_LOCK(lfs2->cfg);
+    if (err) {
+        return err;
+    }
+    LFS2_TRACE("lfs2_removeattr(%p, \"%s\", %"PRIu8")", (void*)lfs2, path, type);
+
+    err = lfs2_rawremoveattr(lfs2, path, type);
+
+    LFS2_TRACE("lfs2_removeattr -> %d", err);
+    LFS2_UNLOCK(lfs2->cfg);
+    return err;
+}
+#endif
+
+int lfs2_file_open(lfs2_t *lfs2, lfs2_file_t *file, const char *path, int flags) {
+    int err = LFS2_LOCK(lfs2->cfg);
+    if (err) {
+        return err;
+    }
+    LFS2_TRACE("lfs2_file_open(%p, %p, \"%s\", %x)",
+            (void*)lfs2, (void*)file, path, flags);
+    LFS2_ASSERT(!lfs2_mlist_isopen(lfs2->mlist, (struct lfs2_mlist*)file));
+
+    err = lfs2_file_rawopen(lfs2, file, path, flags);
+
+    LFS2_TRACE("lfs2_file_open -> %d", err);
+    LFS2_UNLOCK(lfs2->cfg);
+    return err;
+}
+
+int lfs2_file_opencfg(lfs2_t *lfs2, lfs2_file_t *file,
+        const char *path, int flags,
+        const struct lfs2_file_config *cfg) {
+    int err = LFS2_LOCK(lfs2->cfg);
+    if (err) {
+        return err;
+    }
+    LFS2_TRACE("lfs2_file_opencfg(%p, %p, \"%s\", %x, %p {"
+                 ".buffer=%p, .attrs=%p, .attr_count=%"PRIu32"})",
+            (void*)lfs2, (void*)file, path, flags,
+            (void*)cfg, cfg->buffer, (void*)cfg->attrs, cfg->attr_count);
+    LFS2_ASSERT(!lfs2_mlist_isopen(lfs2->mlist, (struct lfs2_mlist*)file));
+
+    err = lfs2_file_rawopencfg(lfs2, file, path, flags, cfg);
+
+    LFS2_TRACE("lfs2_file_opencfg -> %d", err);
+    LFS2_UNLOCK(lfs2->cfg);
+    return err;
+}
+
+int lfs2_file_close(lfs2_t *lfs2, lfs2_file_t *file) {
+    int err = LFS2_LOCK(lfs2->cfg);
+    if (err) {
+        return err;
+    }
+    LFS2_TRACE("lfs2_file_close(%p, %p)", (void*)lfs2, (void*)file);
+    LFS2_ASSERT(lfs2_mlist_isopen(lfs2->mlist, (struct lfs2_mlist*)file));
+
+    err = lfs2_file_rawclose(lfs2, file);
+
+    LFS2_TRACE("lfs2_file_close -> %d", err);
+    LFS2_UNLOCK(lfs2->cfg);
+    return err;
+}
+
+#ifndef LFS2_READONLY
+int lfs2_file_sync(lfs2_t *lfs2, lfs2_file_t *file) {
+    int err = LFS2_LOCK(lfs2->cfg);
+    if (err) {
+        return err;
+    }
+    LFS2_TRACE("lfs2_file_sync(%p, %p)", (void*)lfs2, (void*)file);
+    LFS2_ASSERT(lfs2_mlist_isopen(lfs2->mlist, (struct lfs2_mlist*)file));
+
+    err = lfs2_file_rawsync(lfs2, file);
+
+    LFS2_TRACE("lfs2_file_sync -> %d", err);
+    LFS2_UNLOCK(lfs2->cfg);
+    return err;
+}
+#endif
+
+lfs2_ssize_t lfs2_file_read(lfs2_t *lfs2, lfs2_file_t *file,
+        void *buffer, lfs2_size_t size) {
+    int err = LFS2_LOCK(lfs2->cfg);
+    if (err) {
+        return err;
+    }
+    LFS2_TRACE("lfs2_file_read(%p, %p, %p, %"PRIu32")",
+            (void*)lfs2, (void*)file, buffer, size);
+    LFS2_ASSERT(lfs2_mlist_isopen(lfs2->mlist, (struct lfs2_mlist*)file));
+
+    lfs2_ssize_t res = lfs2_file_rawread(lfs2, file, buffer, size);
+
+    LFS2_TRACE("lfs2_file_read -> %"PRId32, res);
+    LFS2_UNLOCK(lfs2->cfg);
+    return res;
+}
+
+#ifndef LFS2_READONLY
+lfs2_ssize_t lfs2_file_write(lfs2_t *lfs2, lfs2_file_t *file,
+        const void *buffer, lfs2_size_t size) {
+    int err = LFS2_LOCK(lfs2->cfg);
+    if (err) {
+        return err;
+    }
+    LFS2_TRACE("lfs2_file_write(%p, %p, %p, %"PRIu32")",
+            (void*)lfs2, (void*)file, buffer, size);
+    LFS2_ASSERT(lfs2_mlist_isopen(lfs2->mlist, (struct lfs2_mlist*)file));
+
+    lfs2_ssize_t res = lfs2_file_rawwrite(lfs2, file, buffer, size);
+
+    LFS2_TRACE("lfs2_file_write -> %"PRId32, res);
+    LFS2_UNLOCK(lfs2->cfg);
+    return res;
+}
+#endif
+
+lfs2_soff_t lfs2_file_seek(lfs2_t *lfs2, lfs2_file_t *file,
+        lfs2_soff_t off, int whence) {
+    int err = LFS2_LOCK(lfs2->cfg);
+    if (err) {
+        return err;
+    }
+    LFS2_TRACE("lfs2_file_seek(%p, %p, %"PRId32", %d)",
+            (void*)lfs2, (void*)file, off, whence);
+    LFS2_ASSERT(lfs2_mlist_isopen(lfs2->mlist, (struct lfs2_mlist*)file));
+
+    lfs2_soff_t res = lfs2_file_rawseek(lfs2, file, off, whence);
+
+    LFS2_TRACE("lfs2_file_seek -> %"PRId32, res);
+    LFS2_UNLOCK(lfs2->cfg);
+    return res;
+}
+
+#ifndef LFS2_READONLY
+int lfs2_file_truncate(lfs2_t *lfs2, lfs2_file_t *file, lfs2_off_t size) {
+    int err = LFS2_LOCK(lfs2->cfg);
+    if (err) {
+        return err;
+    }
+    LFS2_TRACE("lfs2_file_truncate(%p, %p, %"PRIu32")",
+            (void*)lfs2, (void*)file, size);
+    LFS2_ASSERT(lfs2_mlist_isopen(lfs2->mlist, (struct lfs2_mlist*)file));
+
+    err = lfs2_file_rawtruncate(lfs2, file, size);
+
+    LFS2_TRACE("lfs2_file_truncate -> %d", err);
+    LFS2_UNLOCK(lfs2->cfg);
+    return err;
+}
+#endif
+
+lfs2_soff_t lfs2_file_tell(lfs2_t *lfs2, lfs2_file_t *file) {
+    int err = LFS2_LOCK(lfs2->cfg);
+    if (err) {
+        return err;
+    }
+    LFS2_TRACE("lfs2_file_tell(%p, %p)", (void*)lfs2, (void*)file);
+    LFS2_ASSERT(lfs2_mlist_isopen(lfs2->mlist, (struct lfs2_mlist*)file));
+
+    lfs2_soff_t res = lfs2_file_rawtell(lfs2, file);
+
+    LFS2_TRACE("lfs2_file_tell -> %"PRId32, res);
+    LFS2_UNLOCK(lfs2->cfg);
+    return res;
+}
+
+int lfs2_file_rewind(lfs2_t *lfs2, lfs2_file_t *file) {
+    int err = LFS2_LOCK(lfs2->cfg);
+    if (err) {
+        return err;
+    }
+    LFS2_TRACE("lfs2_file_rewind(%p, %p)", (void*)lfs2, (void*)file);
+
+    err = lfs2_file_rawrewind(lfs2, file);
+
+    LFS2_TRACE("lfs2_file_rewind -> %d", err);
+    LFS2_UNLOCK(lfs2->cfg);
+    return err;
+}
+
+lfs2_soff_t lfs2_file_size(lfs2_t *lfs2, lfs2_file_t *file) {
+    int err = LFS2_LOCK(lfs2->cfg);
+    if (err) {
+        return err;
+    }
+    LFS2_TRACE("lfs2_file_size(%p, %p)", (void*)lfs2, (void*)file);
+    LFS2_ASSERT(lfs2_mlist_isopen(lfs2->mlist, (struct lfs2_mlist*)file));
+
+    lfs2_soff_t res = lfs2_file_rawsize(lfs2, file);
+
+    LFS2_TRACE("lfs2_file_size -> %"PRId32, res);
+    LFS2_UNLOCK(lfs2->cfg);
+    return res;
+}
+
+#ifndef LFS2_READONLY
+int lfs2_mkdir(lfs2_t *lfs2, const char *path) {
+    int err = LFS2_LOCK(lfs2->cfg);
+    if (err) {
+        return err;
+    }
+    LFS2_TRACE("lfs2_mkdir(%p, \"%s\")", (void*)lfs2, path);
+
+    err = lfs2_rawmkdir(lfs2, path);
+
+    LFS2_TRACE("lfs2_mkdir -> %d", err);
+    LFS2_UNLOCK(lfs2->cfg);
+    return err;
+}
+#endif
+
+int lfs2_dir_open(lfs2_t *lfs2, lfs2_dir_t *dir, const char *path) {
+    int err = LFS2_LOCK(lfs2->cfg);
+    if (err) {
+        return err;
+    }
+    LFS2_TRACE("lfs2_dir_open(%p, %p, \"%s\")", (void*)lfs2, (void*)dir, path);
+    LFS2_ASSERT(!lfs2_mlist_isopen(lfs2->mlist, (struct lfs2_mlist*)dir));
+
+    err = lfs2_dir_rawopen(lfs2, dir, path);
+
+    LFS2_TRACE("lfs2_dir_open -> %d", err);
+    LFS2_UNLOCK(lfs2->cfg);
+    return err;
+}
+
+int lfs2_dir_close(lfs2_t *lfs2, lfs2_dir_t *dir) {
+    int err = LFS2_LOCK(lfs2->cfg);
+    if (err) {
+        return err;
+    }
+    LFS2_TRACE("lfs2_dir_close(%p, %p)", (void*)lfs2, (void*)dir);
+
+    err = lfs2_dir_rawclose(lfs2, dir);
+
+    LFS2_TRACE("lfs2_dir_close -> %d", err);
+    LFS2_UNLOCK(lfs2->cfg);
+    return err;
+}
+
+int lfs2_dir_read(lfs2_t *lfs2, lfs2_dir_t *dir, struct lfs2_info *info) {
+    int err = LFS2_LOCK(lfs2->cfg);
+    if (err) {
+        return err;
+    }
+    LFS2_TRACE("lfs2_dir_read(%p, %p, %p)",
+            (void*)lfs2, (void*)dir, (void*)info);
+
+    err = lfs2_dir_rawread(lfs2, dir, info);
+
+    LFS2_TRACE("lfs2_dir_read -> %d", err);
+    LFS2_UNLOCK(lfs2->cfg);
+    return err;
+}
+
+int lfs2_dir_seek(lfs2_t *lfs2, lfs2_dir_t *dir, lfs2_off_t off) {
+    int err = LFS2_LOCK(lfs2->cfg);
+    if (err) {
+        return err;
+    }
+    LFS2_TRACE("lfs2_dir_seek(%p, %p, %"PRIu32")",
+            (void*)lfs2, (void*)dir, off);
+
+    err = lfs2_dir_rawseek(lfs2, dir, off);
+
+    LFS2_TRACE("lfs2_dir_seek -> %d", err);
+    LFS2_UNLOCK(lfs2->cfg);
+    return err;
+}
+
+lfs2_soff_t lfs2_dir_tell(lfs2_t *lfs2, lfs2_dir_t *dir) {
+    int err = LFS2_LOCK(lfs2->cfg);
+    if (err) {
+        return err;
+    }
+    LFS2_TRACE("lfs2_dir_tell(%p, %p)", (void*)lfs2, (void*)dir);
+
+    lfs2_soff_t res = lfs2_dir_rawtell(lfs2, dir);
+
+    LFS2_TRACE("lfs2_dir_tell -> %"PRId32, res);
+    LFS2_UNLOCK(lfs2->cfg);
+    return res;
+}
+
+int lfs2_dir_rewind(lfs2_t *lfs2, lfs2_dir_t *dir) {
+    int err = LFS2_LOCK(lfs2->cfg);
+    if (err) {
+        return err;
+    }
+    LFS2_TRACE("lfs2_dir_rewind(%p, %p)", (void*)lfs2, (void*)dir);
+
+    err = lfs2_dir_rawrewind(lfs2, dir);
+
+    LFS2_TRACE("lfs2_dir_rewind -> %d", err);
+    LFS2_UNLOCK(lfs2->cfg);
+    return err;
+}
+
+lfs2_ssize_t lfs2_fs_size(lfs2_t *lfs2) {
+    int err = LFS2_LOCK(lfs2->cfg);
+    if (err) {
+        return err;
+    }
+    LFS2_TRACE("lfs2_fs_size(%p)", (void*)lfs2);
+
+    lfs2_ssize_t res = lfs2_fs_rawsize(lfs2);
+
+    LFS2_TRACE("lfs2_fs_size -> %"PRId32, res);
+    LFS2_UNLOCK(lfs2->cfg);
+    return res;
+}
+
+int lfs2_fs_traverse(lfs2_t *lfs2, int (*cb)(void *, lfs2_block_t), void *data) {
+    int err = LFS2_LOCK(lfs2->cfg);
+    if (err) {
+        return err;
+    }
+    LFS2_TRACE("lfs2_fs_traverse(%p, %p, %p)",
+            (void*)lfs2, (void*)(uintptr_t)cb, data);
+
+    err = lfs2_fs_rawtraverse(lfs2, cb, data, true);
+
+    LFS2_TRACE("lfs2_fs_traverse -> %d", err);
+    LFS2_UNLOCK(lfs2->cfg);
+    return err;
+}
+
+#ifdef LFS2_MIGRATE
+int lfs2_migrate(lfs2_t *lfs2, const struct lfs2_config *cfg) {
+    int err = LFS2_LOCK(cfg);
+    if (err) {
+        return err;
+    }
+    LFS2_TRACE("lfs2_migrate(%p, %p {.context=%p, "
+                ".read=%p, .prog=%p, .erase=%p, .sync=%p, "
+                ".read_size=%"PRIu32", .prog_size=%"PRIu32", "
+                ".block_size=%"PRIu32", .block_count=%"PRIu32", "
+                ".block_cycles=%"PRIu32", .cache_size=%"PRIu32", "
+                ".lookahead_size=%"PRIu32", .read_buffer=%p, "
+                ".prog_buffer=%p, .lookahead_buffer=%p, "
+                ".name_max=%"PRIu32", .file_max=%"PRIu32", "
+                ".attr_max=%"PRIu32"})",
+            (void*)lfs2, (void*)cfg, cfg->context,
+            (void*)(uintptr_t)cfg->read, (void*)(uintptr_t)cfg->prog,
+            (void*)(uintptr_t)cfg->erase, (void*)(uintptr_t)cfg->sync,
+            cfg->read_size, cfg->prog_size, cfg->block_size, cfg->block_count,
+            cfg->block_cycles, cfg->cache_size, cfg->lookahead_size,
+            cfg->read_buffer, cfg->prog_buffer, cfg->lookahead_buffer,
+            cfg->name_max, cfg->file_max, cfg->attr_max);
+
+    err = lfs2_rawmigrate(lfs2, cfg);
+
+    LFS2_TRACE("lfs2_migrate -> %d", err);
+    LFS2_UNLOCK(cfg);
+    return err;
+}
+#endif
+
diff --git a/lib/littlefs/lfs2.h b/lib/littlefs/lfs2.h
index c89af79cabddd..e2afc7792ce4f 100644
--- a/lib/littlefs/lfs2.h
+++ b/lib/littlefs/lfs2.h
@@ -9,6 +9,7 @@
 
 #include <stdint.h>
 #include <stdbool.h>
+#include "lfs2_util.h"
 
 #ifdef __cplusplus
 extern "C"
@@ -21,7 +22,7 @@ extern "C"
 // Software library version
 // Major (top-nibble), incremented on backwards incompatible changes
 // Minor (bottom-nibble), incremented on feature additions
-#define LFS2_VERSION 0x00020002
+#define LFS2_VERSION 0x00020003
 #define LFS2_VERSION_MAJOR (0xffff & (LFS2_VERSION >> 16))
 #define LFS2_VERSION_MINOR (0xffff & (LFS2_VERSION >>  0))
 
@@ -123,20 +124,25 @@ enum lfs2_type {
 enum lfs2_open_flags {
     // open flags
     LFS2_O_RDONLY = 1,         // Open a file as read only
+#ifndef LFS2_READONLY
     LFS2_O_WRONLY = 2,         // Open a file as write only
     LFS2_O_RDWR   = 3,         // Open a file as read and write
     LFS2_O_CREAT  = 0x0100,    // Create a file if it does not exist
     LFS2_O_EXCL   = 0x0200,    // Fail if a file already exists
     LFS2_O_TRUNC  = 0x0400,    // Truncate the existing file to zero size
     LFS2_O_APPEND = 0x0800,    // Move to end of file on every write
+#endif
 
     // internally used flags
+#ifndef LFS2_READONLY
     LFS2_F_DIRTY   = 0x010000, // File does not match storage
     LFS2_F_WRITING = 0x020000, // File has been written since last flush
+#endif
     LFS2_F_READING = 0x040000, // File has been read since last flush
-    LFS2_F_ERRED   = 0x080000, // An error occured during write
+#ifndef LFS2_READONLY
+    LFS2_F_ERRED   = 0x080000, // An error occurred during write
+#endif
     LFS2_F_INLINE  = 0x100000, // Currently inlined in directory entry
-    LFS2_F_OPENED  = 0x200000, // File has been opened
 };
 
 // File seek flags
@@ -174,6 +180,16 @@ struct lfs2_config {
     // are propogated to the user.
     int (*sync)(const struct lfs2_config *c);
 
+#ifdef LFS2_THREADSAFE
+    // Lock the underlying block device. Negative error codes
+    // are propogated to the user.
+    int (*lock)(const struct lfs2_config *c);
+
+    // Unlock the underlying block device. Negative error codes
+    // are propogated to the user.
+    int (*unlock)(const struct lfs2_config *c);
+#endif
+
     // Minimum size of a block read. All read operations will be a
     // multiple of this value.
     lfs2_size_t read_size;
@@ -399,6 +415,7 @@ typedef struct lfs2 {
 
 /// Filesystem functions ///
 
+#ifndef LFS2_READONLY
 // Format a block device with the littlefs
 //
 // Requires a littlefs object and config struct. This clobbers the littlefs
@@ -407,6 +424,7 @@ typedef struct lfs2 {
 //
 // Returns a negative error code on failure.
 int lfs2_format(lfs2_t *lfs2, const struct lfs2_config *config);
+#endif
 
 // Mounts a littlefs
 //
@@ -426,12 +444,15 @@ int lfs2_unmount(lfs2_t *lfs2);
 
 /// General operations ///
 
+#ifndef LFS2_READONLY
 // Removes a file or directory
 //
 // If removing a directory, the directory must be empty.
 // Returns a negative error code on failure.
 int lfs2_remove(lfs2_t *lfs2, const char *path);
+#endif
 
+#ifndef LFS2_READONLY
 // Rename or move a file or directory
 //
 // If the destination exists, it must match the source in type.
@@ -439,6 +460,7 @@ int lfs2_remove(lfs2_t *lfs2, const char *path);
 //
 // Returns a negative error code on failure.
 int lfs2_rename(lfs2_t *lfs2, const char *oldpath, const char *newpath);
+#endif
 
 // Find info about a file or directory
 //
@@ -461,6 +483,7 @@ int lfs2_stat(lfs2_t *lfs2, const char *path, struct lfs2_info *info);
 lfs2_ssize_t lfs2_getattr(lfs2_t *lfs2, const char *path,
         uint8_t type, void *buffer, lfs2_size_t size);
 
+#ifndef LFS2_READONLY
 // Set custom attributes
 //
 // Custom attributes are uniquely identified by an 8-bit type and limited
@@ -470,13 +493,16 @@ lfs2_ssize_t lfs2_getattr(lfs2_t *lfs2, const char *path,
 // Returns a negative error code on failure.
 int lfs2_setattr(lfs2_t *lfs2, const char *path,
         uint8_t type, const void *buffer, lfs2_size_t size);
+#endif
 
+#ifndef LFS2_READONLY
 // Removes a custom attribute
 //
 // If an attribute is not found, nothing happens.
 //
 // Returns a negative error code on failure.
 int lfs2_removeattr(lfs2_t *lfs2, const char *path, uint8_t type);
+#endif
 
 
 /// File operations ///
@@ -525,6 +551,7 @@ int lfs2_file_sync(lfs2_t *lfs2, lfs2_file_t *file);
 lfs2_ssize_t lfs2_file_read(lfs2_t *lfs2, lfs2_file_t *file,
         void *buffer, lfs2_size_t size);
 
+#ifndef LFS2_READONLY
 // Write data to file
 //
 // Takes a buffer and size indicating the data to write. The file will not
@@ -533,6 +560,7 @@ lfs2_ssize_t lfs2_file_read(lfs2_t *lfs2, lfs2_file_t *file,
 // Returns the number of bytes written, or a negative error code on failure.
 lfs2_ssize_t lfs2_file_write(lfs2_t *lfs2, lfs2_file_t *file,
         const void *buffer, lfs2_size_t size);
+#endif
 
 // Change the position of the file
 //
@@ -541,10 +569,12 @@ lfs2_ssize_t lfs2_file_write(lfs2_t *lfs2, lfs2_file_t *file,
 lfs2_soff_t lfs2_file_seek(lfs2_t *lfs2, lfs2_file_t *file,
         lfs2_soff_t off, int whence);
 
+#ifndef LFS2_READONLY
 // Truncates the size of the file to the specified size
 //
 // Returns a negative error code on failure.
 int lfs2_file_truncate(lfs2_t *lfs2, lfs2_file_t *file, lfs2_off_t size);
+#endif
 
 // Return the position of the file
 //
@@ -567,10 +597,12 @@ lfs2_soff_t lfs2_file_size(lfs2_t *lfs2, lfs2_file_t *file);
 
 /// Directory operations ///
 
+#ifndef LFS2_READONLY
 // Create a directory
 //
 // Returns a negative error code on failure.
 int lfs2_mkdir(lfs2_t *lfs2, const char *path);
+#endif
 
 // Open a directory
 //
@@ -632,6 +664,7 @@ lfs2_ssize_t lfs2_fs_size(lfs2_t *lfs2);
 // Returns a negative error code on failure.
 int lfs2_fs_traverse(lfs2_t *lfs2, int (*cb)(void*, lfs2_block_t), void *data);
 
+#ifndef LFS2_READONLY
 #ifdef LFS2_MIGRATE
 // Attempts to migrate a previous version of littlefs
 //
@@ -646,6 +679,7 @@ int lfs2_fs_traverse(lfs2_t *lfs2, int (*cb)(void*, lfs2_block_t), void *data);
 // Returns a negative error code on failure.
 int lfs2_migrate(lfs2_t *lfs2, const struct lfs2_config *cfg);
 #endif
+#endif
 
 
 #ifdef __cplusplus

From 8a29319a157a69c1755d515e466b3e1c7ed8b76e Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 9 Dec 2020 13:18:22 +1100
Subject: [PATCH 0482/3533] lib/littlefs: Guard lfs2_mlist_isopen with
 LFS2_NO_ASSERT.

To prevent warnings about this function being unused when assertions are
disabled.

Signed-off-by: Damien George <damien@micropython.org>
---
 lib/littlefs/lfs2.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/littlefs/lfs2.c b/lib/littlefs/lfs2.c
index 31f3c603e7b87..1f8c9d2d93d63 100644
--- a/lib/littlefs/lfs2.c
+++ b/lib/littlefs/lfs2.c
@@ -425,6 +425,7 @@ static inline void lfs2_superblock_tole32(lfs2_superblock_t *superblock) {
     superblock->attr_max    = lfs2_tole32(superblock->attr_max);
 }
 
+#ifndef LFS2_NO_ASSERT
 static inline bool lfs2_mlist_isopen(struct lfs2_mlist *head,
         struct lfs2_mlist *node) {
     for (struct lfs2_mlist **p = &head; *p; p = &(*p)->next) {
@@ -435,6 +436,7 @@ static inline bool lfs2_mlist_isopen(struct lfs2_mlist *head,
 
     return false;
 }
+#endif
 
 static inline void lfs2_mlist_remove(lfs2_t *lfs2, struct lfs2_mlist *mlist) {
     for (struct lfs2_mlist **p = &lfs2->mlist; *p; p = &(*p)->next) {

From 460a181b77c875608c27dcb955560cff3a51f839 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 9 Dec 2020 11:02:47 +1100
Subject: [PATCH 0483/3533] stm32/mboot: Enable LFS2_READONLY for mboot builds
 with littlefs.

To reduce code size, since mboot does not modify the filesystem.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/mboot/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/stm32/mboot/Makefile b/ports/stm32/mboot/Makefile
index 3d041e1c141ea..44372b0e8a4ae 100755
--- a/ports/stm32/mboot/Makefile
+++ b/ports/stm32/mboot/Makefile
@@ -71,7 +71,7 @@ CFLAGS += -DBOARD_$(BOARD)
 CFLAGS += -DAPPLICATION_ADDR=$(TEXT0_ADDR)
 CFLAGS += -DFFCONF_H=\"ports/stm32/mboot/ffconf.h\"
 CFLAGS += -DLFS1_NO_MALLOC -DLFS1_NO_DEBUG -DLFS1_NO_WARN -DLFS1_NO_ERROR -DLFS1_NO_ASSERT
-CFLAGS += -DLFS2_NO_MALLOC -DLFS2_NO_DEBUG -DLFS2_NO_WARN -DLFS2_NO_ERROR -DLFS2_NO_ASSERT
+CFLAGS += -DLFS2_NO_MALLOC -DLFS2_NO_DEBUG -DLFS2_NO_WARN -DLFS2_NO_ERROR -DLFS2_NO_ASSERT -DLFS2_READONLY
 CFLAGS += -DBUILDING_MBOOT=1
 CFLAGS += -DMICROPY_HW_STM32WB_FLASH_SYNCRONISATION=0
 CFLAGS += -DBOOTLOADER_DFU_USB_VID=$(BOOTLOADER_DFU_USB_VID) -DBOOTLOADER_DFU_USB_PID=$(BOOTLOADER_DFU_USB_PID)

From f694a6fa20652e327151ac537b79180930c54ca0 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 7 Dec 2020 16:18:33 +1100
Subject: [PATCH 0484/3533] lib/stm32lib: Update library for WB v1.10.0.

Changes in this new library version are:
- Update WB HAL to v1.10.0.

Signed-off-by: Damien George <damien@micropython.org>
---
 lib/stm32lib | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/stm32lib b/lib/stm32lib
index 58fee7c92bd57..302c52794d2f5 160000
--- a/lib/stm32lib
+++ b/lib/stm32lib
@@ -1 +1 @@
-Subproject commit 58fee7c92bd576814d3f2afd92fbc62990270ecc
+Subproject commit 302c52794d2f579903f4e49cbad1f5d3a7f401ad

From f305c62a5fccb376db773fde6273e64e1fa9948f Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 7 Dec 2020 16:19:12 +1100
Subject: [PATCH 0485/3533] stm32/usb: Allocate 128 bytes to CDC data out EPs
 on non-multi-OTG MCUs.

This much buffer space is required for CDC data out endpoints to avoid any
buffer overflows when the USB CDC is saturated with data.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/usb.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/stm32/usb.c b/ports/stm32/usb.c
index 968b2999ced37..5003bb27cc235 100644
--- a/ports/stm32/usb.c
+++ b/ports/stm32/usb.c
@@ -102,8 +102,8 @@ STATIC const uint8_t usbd_fifo_size_cdc1[USBD_PMA_NUM_FIFO] = {
 #if MICROPY_HW_USB_CDC_NUM >= 2
 STATIC const uint8_t usbd_fifo_size_cdc2[USBD_PMA_NUM_FIFO] = {
     8, 8, 16, 16,           // EP0(out), EP0(in), MSC/HID(out), MSC/HID(in)
-    0, 8, 12, 12,           // unused, CDC_CMD(in), CDC_DATA(out), CDC_DATA(in)
-    0, 8, 12, 12,           // unused, CDC2_CMD(in), CDC2_DATA(out), CDC2_DATA(in)
+    0, 8, 16, 8,            // unused, CDC_CMD(in), CDC_DATA(out), CDC_DATA(in)
+    0, 8, 16, 8,            // unused, CDC2_CMD(in), CDC2_DATA(out), CDC2_DATA(in)
     0, 0, 0, 0,             // 4x unused
 };
 

From e0bb7a53c3244ffa720fcdb64be5784379c5f596 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 14 Dec 2020 10:29:57 +1100
Subject: [PATCH 0486/3533] tests/misc/sys_settrace_features.py: Ignore CPython
 zipimport traces.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/misc/sys_settrace_features.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/misc/sys_settrace_features.py b/tests/misc/sys_settrace_features.py
index a12304489231f..d315ea69730c0 100644
--- a/tests/misc/sys_settrace_features.py
+++ b/tests/misc/sys_settrace_features.py
@@ -60,7 +60,8 @@ def trace_tick_handler_bob(frame, event, arg):
 
 def trace_tick_handler(frame, event, arg):
     # Ignore CPython specific helpers.
-    if frame.f_globals["__name__"].find("importlib") != -1:
+    frame_name = frame.f_globals["__name__"]
+    if frame_name.find("importlib") != -1 or frame_name.find("zipimport") != -1:
         return
 
     print("### trace_handler::main event:", event)

From 69262a11dcaae6db7ecbd1f4b6179a2ed6195a10 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 14 Dec 2020 13:05:43 +1100
Subject: [PATCH 0487/3533] tools/ci.sh: Put echo of CI path in a separate
 function.

Because the setup functions may print other information which should not be
added to the path.

Signed-off-by: Damien George <damien@micropython.org>
---
 .github/workflows/ports_esp32.yml   | 4 ++--
 .github/workflows/ports_esp8266.yml | 2 +-
 tools/ci.sh                         | 9 +++++++++
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ports_esp32.yml b/.github/workflows/ports_esp32.yml
index b89e462e049fc..041074557e616 100644
--- a/.github/workflows/ports_esp32.yml
+++ b/.github/workflows/ports_esp32.yml
@@ -18,7 +18,7 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - name: Install packages
-      run: source tools/ci.sh && ci_esp32_idf3_setup >> $GITHUB_PATH
+      run: source tools/ci.sh && ci_esp32_idf3_setup && ci_esp32_idf3_path >> $GITHUB_PATH
     - name: Build
       env:
         IDF_PATH: ${{ github.workspace }}/esp-idf
@@ -29,7 +29,7 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - name: Install packages
-      run: source tools/ci.sh && ci_esp32_idf4_setup >> $GITHUB_PATH
+      run: source tools/ci.sh && ci_esp32_idf4_setup && ci_esp32_idf4_path >> $GITHUB_PATH
     - name: Build
       env:
         IDF_PATH: ${{ github.workspace }}/esp-idf
diff --git a/.github/workflows/ports_esp8266.yml b/.github/workflows/ports_esp8266.yml
index f6f2fcaf4a80e..f4ce1f8212d87 100644
--- a/.github/workflows/ports_esp8266.yml
+++ b/.github/workflows/ports_esp8266.yml
@@ -18,6 +18,6 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - name: Install packages
-      run: source tools/ci.sh && ci_esp8266_setup >> $GITHUB_PATH
+      run: source tools/ci.sh && ci_esp8266_setup && ci_esp8266_path >> $GITHUB_PATH
     - name: Build
       run: source tools/ci.sh && ci_esp8266_build
diff --git a/tools/ci.sh b/tools/ci.sh
index ded9fab922d50..32fccf071d5cb 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -75,6 +75,9 @@ function ci_esp32_idf3_setup {
     sudo pip3 install pyserial 'pyparsing<2.4'
     curl -L https://dl.espressif.com/dl/xtensa-esp32-elf-linux64-1.22.0-80-g6c4433a-5.2.0.tar.gz | tar zxf -
     git clone https://github.com/espressif/esp-idf.git
+}
+
+function ci_esp32_idf3_path {
     echo $(pwd)/xtensa-esp32-elf/bin
 }
 
@@ -90,6 +93,9 @@ function ci_esp32_idf4_setup {
     sudo pip3 install pyserial 'pyparsing<2.4'
     curl -L https://dl.espressif.com/dl/xtensa-esp32-elf-gcc8_2_0-esp-2019r2-linux-amd64.tar.gz | tar zxf -
     git clone https://github.com/espressif/esp-idf.git
+}
+
+function ci_esp32_idf4_path {
     echo $(pwd)/xtensa-esp32-elf/bin
 }
 
@@ -108,6 +114,9 @@ function ci_esp8266_setup {
     sudo pip install pyserial
     wget https://github.com/jepler/esp-open-sdk/releases/download/2018-06-10/xtensa-lx106-elf-standalone.tar.gz
     zcat xtensa-lx106-elf-standalone.tar.gz | tar x
+}
+
+function ci_esp8266_path {
     echo $(pwd)/xtensa-lx106-elf/bin
 }
 

From ee52f89224ac7fde3794bcac7efa1ee4ee2bff81 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 14 Dec 2020 13:07:00 +1100
Subject: [PATCH 0488/3533] tools/ci.sh: Use pip-install to get latest version
 of esptool.py.

Because the version included in xtensa-lx106-elf-standalone.tar.gz needs
Python 2 (and pyserial for Python 2).

Signed-off-by: Damien George <damien@micropython.org>
---
 tools/ci.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tools/ci.sh b/tools/ci.sh
index 32fccf071d5cb..1a413ec991920 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -111,9 +111,11 @@ function ci_esp32_idf4_build {
 # ports/esp8266
 
 function ci_esp8266_setup {
-    sudo pip install pyserial
+    sudo pip install pyserial esptool
     wget https://github.com/jepler/esp-open-sdk/releases/download/2018-06-10/xtensa-lx106-elf-standalone.tar.gz
     zcat xtensa-lx106-elf-standalone.tar.gz | tar x
+    # Remove this esptool.py so pip version is used instead
+    rm xtensa-lx106-elf/bin/esptool.py
 }
 
 function ci_esp8266_path {

From 0091041f5a1bbf0a2d9ab7ad3de7169f8cc07cf1 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sun, 13 Dec 2020 16:00:39 +1100
Subject: [PATCH 0489/3533] py/modmath: Simplify handling of positional args to
 reduce code size.

As a general pattern, required positional arguments that are not named do
not need to be parsed using mp_arg_parse_all().

Signed-off-by: Damien George <damien@micropython.org>
---
 py/modmath.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/py/modmath.c b/py/modmath.c
index 3ab3ff334c41b..ac9e0bbc449c6 100644
--- a/py/modmath.c
+++ b/py/modmath.c
@@ -204,17 +204,15 @@ MATH_FUN_1(lgamma, lgamma)
 
 #if MICROPY_PY_MATH_ISCLOSE
 STATIC mp_obj_t mp_math_isclose(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
-    enum { ARG_a, ARG_b, ARG_rel_tol, ARG_abs_tol };
+    enum { ARG_rel_tol, ARG_abs_tol };
     static const mp_arg_t allowed_args[] = {
-        {MP_QSTR_, MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL}},
-        {MP_QSTR_, MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL}},
         {MP_QSTR_rel_tol, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL}},
         {MP_QSTR_abs_tol, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = MP_OBJ_NEW_SMALL_INT(0)}},
     };
     mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
-    mp_arg_parse_all(n_args, pos_args, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
-    const mp_float_t a = mp_obj_get_float(args[ARG_a].u_obj);
-    const mp_float_t b = mp_obj_get_float(args[ARG_b].u_obj);
+    mp_arg_parse_all(n_args - 2, pos_args + 2, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
+    const mp_float_t a = mp_obj_get_float(pos_args[0]);
+    const mp_float_t b = mp_obj_get_float(pos_args[1]);
     const mp_float_t rel_tol = args[ARG_rel_tol].u_obj == MP_OBJ_NULL
         ? (mp_float_t)1e-9 : mp_obj_get_float(args[ARG_rel_tol].u_obj);
     const mp_float_t abs_tol = mp_obj_get_float(args[ARG_abs_tol].u_obj);

From 246b2e016ab4a226cc0ac015f5cc340418f81ca1 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sun, 13 Dec 2020 16:15:04 +1100
Subject: [PATCH 0490/3533] py/mkrules.mk: Remove stray vpath and unused -Itmp,
 add $(Q) for $(AR).

Signed-off-by: Damien George <damien@micropython.org>
---
 py/mkrules.mk | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/py/mkrules.mk b/py/mkrules.mk
index 3bfe64d7536a1..eb8477cbb1d8b 100644
--- a/py/mkrules.mk
+++ b/py/mkrules.mk
@@ -15,7 +15,7 @@ CFLAGS += -DMICROPY_ROM_TEXT_COMPRESSION=1
 endif
 
 # QSTR generation uses the same CFLAGS, with these modifications.
-QSTR_GEN_FLAGS = -DNO_QSTR -I$(BUILD)/tmp
+QSTR_GEN_FLAGS = -DNO_QSTR
 # Note: := to force evalulation immediately.
 QSTR_GEN_CFLAGS := $(CFLAGS)
 QSTR_GEN_CFLAGS += $(QSTR_GEN_FLAGS)
@@ -76,8 +76,6 @@ vpath %.c . $(TOP) $(USER_C_MODULES)
 $(BUILD)/%.o: %.c
 	$(call compile_c)
 
-vpath %.c . $(TOP) $(USER_C_MODULES)
-
 vpath %.cpp . $(TOP) $(USER_C_MODULES)
 $(BUILD)/%.o: %.cpp
 	$(call compile_cxx)
@@ -215,7 +213,7 @@ LIBMICROPYTHON = libmicropython.a
 # tracking. Then LIBMICROPYTHON_EXTRA_CMD can e.g. touch some
 # other file to cause needed effect, e.g. relinking with new lib.
 lib $(LIBMICROPYTHON): $(OBJ)
-	$(AR) rcs $(LIBMICROPYTHON) $^
+	$(Q)$(AR) rcs $(LIBMICROPYTHON) $^
 	$(LIBMICROPYTHON_EXTRA_CMD)
 
 clean:

From 1719459c28138be009c8dd41f0e6cb3b942eb2dd Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sun, 13 Dec 2020 16:41:12 +1100
Subject: [PATCH 0491/3533] extmod/modubinascii: Update code, docs for hexlify
 now CPython has sep.

Since CPython 3.8 the optional "sep" argument to hexlify is officially
supported, so update comments in the code and the docs to reflect this.

Signed-off-by: Damien George <damien@micropython.org>
---
 docs/library/ubinascii.rst | 10 ++++------
 extmod/modubinascii.c      |  4 ++--
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/docs/library/ubinascii.rst b/docs/library/ubinascii.rst
index 192d34514b3d9..721b80508e31a 100644
--- a/docs/library/ubinascii.rst
+++ b/docs/library/ubinascii.rst
@@ -14,13 +14,11 @@ Functions
 
 .. function:: hexlify(data, [sep])
 
-   Convert binary data to hexadecimal representation. Returns bytes string.
-
-   .. admonition:: Difference to CPython
-      :class: attention
+   Convert the bytes in the *data* object to a hexadecimal representation.
+   Returns a bytes object.
 
-      If additional argument, *sep* is supplied, it is used as a separator
-      between hexadecimal values.
+   If the additional argument *sep* is supplied it is used as a separator
+   between hexadecimal values.
 
 .. function:: unhexlify(data)
 
diff --git a/extmod/modubinascii.c b/extmod/modubinascii.c
index 1d4c72b24b45a..9e4f86fbd2356 100644
--- a/extmod/modubinascii.c
+++ b/extmod/modubinascii.c
@@ -34,8 +34,8 @@
 #if MICROPY_PY_UBINASCII
 
 STATIC mp_obj_t mod_binascii_hexlify(size_t n_args, const mp_obj_t *args) {
-    // Second argument is for an extension to allow a separator to be used
-    // between values.
+    // First argument is the data to convert.
+    // Second argument is an optional separator to be used between values.
     const char *sep = NULL;
     mp_buffer_info_t bufinfo;
     mp_get_buffer_raise(args[0], &bufinfo, MP_BUFFER_READ);

From dc1fd4df7360d101952426dd0d1574d3971e50f5 Mon Sep 17 00:00:00 2001
From: Oliver Joos <oliver.joos@feller.ch>
Date: Fri, 27 Nov 2020 11:05:39 +0100
Subject: [PATCH 0492/3533] tests/extmod: Add test to try and mount a block
 device directly.

Mounting a bdev directly tries to auto-detect the filesystem and if none is
found an OSError(19,) should be raised.

The fourth parameter of readblocks() and writeblocks() must be optional to
support ports with MICROPY_VFS_FAT=1.  Otherwise mounting a bdev may fail
because looking for a FATFS will call readblocks() with only 3 parameters.
---
 tests/extmod/vfs_lfs_mount.py     | 26 +++++++++++++++++++-------
 tests/extmod/vfs_lfs_mount.py.exp |  2 ++
 2 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/tests/extmod/vfs_lfs_mount.py b/tests/extmod/vfs_lfs_mount.py
index 3d8cec6075c86..bea8a2723ac5b 100644
--- a/tests/extmod/vfs_lfs_mount.py
+++ b/tests/extmod/vfs_lfs_mount.py
@@ -16,12 +16,12 @@ class RAMBlockDevice:
     def __init__(self, blocks):
         self.data = bytearray(blocks * self.ERASE_BLOCK_SIZE)
 
-    def readblocks(self, block, buf, off):
+    def readblocks(self, block, buf, off=0):
         addr = block * self.ERASE_BLOCK_SIZE + off
         for i in range(len(buf)):
             buf[i] = self.data[addr + i]
 
-    def writeblocks(self, block, buf, off):
+    def writeblocks(self, block, buf, off=0):
         addr = block * self.ERASE_BLOCK_SIZE + off
         for i in range(len(buf)):
             self.data[addr + i] = buf[i]
@@ -35,9 +35,17 @@ def ioctl(self, op, arg):
             return 0
 
 
-def test(bdev, vfs_class):
+def test(vfs_class):
     print("test", vfs_class)
 
+    bdev = RAMBlockDevice(30)
+
+    # mount bdev unformatted
+    try:
+        uos.mount(bdev, "/lfs")
+    except Exception as er:
+        print(repr(er))
+
     # mkfs
     vfs_class.mkfs(bdev)
 
@@ -84,12 +92,16 @@ def test(bdev, vfs_class):
     # umount
     uos.umount("/lfs")
 
+    # mount bdev again
+    uos.mount(bdev, "/lfs")
+
+    # umount
+    uos.umount("/lfs")
+
     # clear imported modules
     usys.modules.clear()
 
 
-bdev = RAMBlockDevice(30)
-
 # initialise path
 import usys
 
@@ -98,5 +110,5 @@ def test(bdev, vfs_class):
 usys.path.append("")
 
 # run tests
-test(bdev, uos.VfsLfs1)
-test(bdev, uos.VfsLfs2)
+test(uos.VfsLfs1)
+test(uos.VfsLfs2)
diff --git a/tests/extmod/vfs_lfs_mount.py.exp b/tests/extmod/vfs_lfs_mount.py.exp
index aa654ebe05f12..68561b4807350 100644
--- a/tests/extmod/vfs_lfs_mount.py.exp
+++ b/tests/extmod/vfs_lfs_mount.py.exp
@@ -1,4 +1,5 @@
 test <class 'VfsLfs1'>
+OSError(19,)
 hello from lfs
 package
 hello from lfs
@@ -6,6 +7,7 @@ lfsmod2.py: print("hello from lfs")
 
 OSError(30,)
 test <class 'VfsLfs2'>
+OSError(19,)
 hello from lfs
 package
 hello from lfs

From a13d1b50c93802b9ce6be8dac0fec53545656ef7 Mon Sep 17 00:00:00 2001
From: Oliver Joos <oliver.joos@feller.ch>
Date: Fri, 27 Nov 2020 11:09:16 +0100
Subject: [PATCH 0493/3533] extmod/vfs: Raise OSError(ENODEV) if mounting bdev
 without a filesystem.

This commit prevents uos.mount() from raising an AttributeError.
vfs_autodetect() is supposed to return an object that has a "mount" method,
so if no filesystem is found it should raise an OSError(ENODEV) and not
return the bdev itself which has no "mount" method.
---
 extmod/vfs.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/extmod/vfs.c b/extmod/vfs.c
index 3cb7af1b434f9..7dca59d351b03 100644
--- a/extmod/vfs.c
+++ b/extmod/vfs.c
@@ -191,7 +191,8 @@ STATIC mp_obj_t mp_vfs_autodetect(mp_obj_t bdev_obj) {
     return mp_fat_vfs_type.make_new(&mp_fat_vfs_type, 1, 0, &bdev_obj);
     #endif
 
-    return bdev_obj;
+    // no filesystem found
+    mp_raise_OSError(MP_ENODEV);
 }
 
 mp_obj_t mp_vfs_mount(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {

From 20f8ce19825d1a976f8d61e79e661e67509681bd Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Sun, 6 Dec 2020 20:28:21 +0200
Subject: [PATCH 0494/3533] stm32/pyb_can: Add ability to calculate CAN bit
 timing from baudrate.

Calculate the bit timing from baudrate if provided, allowing sample point
override.  This makes it a lot easier to make CAN work between different
MCUs with different clocks, prescalers etc.

Tested on F4, F7 and H7 Y/V variants.
---
 docs/library/pyb.CAN.rst |  7 ++++-
 ports/stm32/pyb_can.c    | 62 +++++++++++++++++++++++++++++++++++++++-
 2 files changed, 67 insertions(+), 2 deletions(-)

diff --git a/docs/library/pyb.CAN.rst b/docs/library/pyb.CAN.rst
index 8078e29e0cc8d..649bcda108fcc 100644
--- a/docs/library/pyb.CAN.rst
+++ b/docs/library/pyb.CAN.rst
@@ -49,7 +49,7 @@ Class Methods
 Methods
 -------
 
-.. method:: CAN.init(mode, extframe=False, prescaler=100, *, sjw=1, bs1=6, bs2=8, auto_restart=False)
+.. method:: CAN.init(mode, extframe=False, prescaler=100, *, sjw=1, bs1=6, bs2=8, auto_restart=False, baudrate=0, sample_point=75)
 
    Initialise the CAN bus with the given parameters:
 
@@ -67,6 +67,11 @@ Methods
      - *auto_restart* sets whether the controller will automatically try and restart
        communications after entering the bus-off state; if this is disabled then
        :meth:`~CAN.restart()` can be used to leave the bus-off state
+     - *baudrate* if a baudrate other than 0 is provided, this function will try to automatically
+       calculate a CAN bit-timing (overriding *prescaler*, *bs1* and *bs2*) that satisfies both
+       the baudrate and the desired *sample_point*.
+     - *sample_point* given in a percentage of the bit time, the *sample_point* specifies the position
+       of the last bit sample with respect to the whole bit time. The default *sample_point* is 75%.
 
    The time quanta tq is the basic unit of time for the CAN bus.  tq is the CAN
    prescaler value divided by PCLK1 (the frequency of internal peripheral bus 1);
diff --git a/ports/stm32/pyb_can.c b/ports/stm32/pyb_can.c
index def66481cbdc8..3e55069ab9ac3 100644
--- a/ports/stm32/pyb_can.c
+++ b/ports/stm32/pyb_can.c
@@ -140,9 +140,41 @@ STATIC void pyb_can_print(const mp_print_t *print, mp_obj_t self_in, mp_print_ki
     }
 }
 
+STATIC uint32_t pyb_can_get_source_freq() {
+    uint32_t can_kern_clk = 0;
+
+    // Find CAN kernel clock
+    #if defined(STM32H7)
+    switch (__HAL_RCC_GET_FDCAN_SOURCE()) {
+        case RCC_FDCANCLKSOURCE_HSE:
+            can_kern_clk = HSE_VALUE;
+            break;
+        case RCC_FDCANCLKSOURCE_PLL: {
+            PLL1_ClocksTypeDef pll1_clocks;
+            HAL_RCCEx_GetPLL1ClockFreq(&pll1_clocks);
+            can_kern_clk = pll1_clocks.PLL1_Q_Frequency;
+            break;
+        }
+        case RCC_FDCANCLKSOURCE_PLL2: {
+            PLL2_ClocksTypeDef pll2_clocks;
+            HAL_RCCEx_GetPLL2ClockFreq(&pll2_clocks);
+            can_kern_clk = pll2_clocks.PLL2_Q_Frequency;
+            break;
+        }
+    }
+    #else // F4 and F7 and assume other MCUs too.
+    // CAN1/CAN2/CAN3 on APB1 use GetPCLK1Freq, alternatively use the following:
+    // can_kern_clk = ((HSE_VALUE / osc_config.PLL.PLLM ) * osc_config.PLL.PLLN) /
+    //  (osc_config.PLL.PLLQ * clk_init.AHBCLKDivider * clk_init.APB1CLKDivider);
+    can_kern_clk = HAL_RCC_GetPCLK1Freq();
+    #endif
+
+    return can_kern_clk;
+}
+
 // init(mode, extframe=False, prescaler=100, *, sjw=1, bs1=6, bs2=8)
 STATIC mp_obj_t pyb_can_init_helper(pyb_can_obj_t *self, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
-    enum { ARG_mode, ARG_extframe, ARG_prescaler, ARG_sjw, ARG_bs1, ARG_bs2, ARG_auto_restart };
+    enum { ARG_mode, ARG_extframe, ARG_prescaler, ARG_sjw, ARG_bs1, ARG_bs2, ARG_auto_restart, ARG_baudrate, ARG_sample_point };
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_mode,         MP_ARG_REQUIRED | MP_ARG_INT,   {.u_int = CAN_MODE_NORMAL} },
         { MP_QSTR_extframe,     MP_ARG_BOOL,                    {.u_bool = false} },
@@ -151,6 +183,8 @@ STATIC mp_obj_t pyb_can_init_helper(pyb_can_obj_t *self, size_t n_args, const mp
         { MP_QSTR_bs1,          MP_ARG_KW_ONLY | MP_ARG_INT,    {.u_int = CAN_DEFAULT_BS1} },
         { MP_QSTR_bs2,          MP_ARG_KW_ONLY | MP_ARG_INT,    {.u_int = CAN_DEFAULT_BS2} },
         { MP_QSTR_auto_restart, MP_ARG_KW_ONLY | MP_ARG_BOOL,   {.u_bool = false} },
+        { MP_QSTR_baudrate,     MP_ARG_KW_ONLY | MP_ARG_INT,    {.u_int = 0} },
+        { MP_QSTR_sample_point, MP_ARG_KW_ONLY | MP_ARG_INT,    {.u_int = 75} }, // 75% sampling point
     };
 
     // parse args
@@ -162,6 +196,32 @@ STATIC mp_obj_t pyb_can_init_helper(pyb_can_obj_t *self, size_t n_args, const mp
     // set the CAN configuration values
     memset(&self->can, 0, sizeof(self->can));
 
+    // Calculate CAN bit timing from baudrate if provided
+    if (args[ARG_baudrate].u_int != 0) {
+        uint32_t baudrate = args[ARG_baudrate].u_int;
+        uint32_t sampoint = args[ARG_sample_point].u_int;
+        uint32_t can_kern_clk = pyb_can_get_source_freq();
+        bool timing_found = false;
+
+        // The following max values work on all MCUs for classical CAN.
+        for (int brp = 1; brp < 512 && !timing_found; brp++) {
+            for (int bs1 = 1; bs1 < 16 && !timing_found; bs1++) {
+                for (int bs2 = 1; bs2 < 8 && !timing_found; bs2++) {
+                    if ((baudrate == (can_kern_clk / (brp * (1 + bs1 + bs2)))) &&
+                        ((sampoint * 10) == (((1 + bs1) * 1000) / (1 + bs1 + bs2)))) {
+                        args[ARG_bs1].u_int = bs1;
+                        args[ARG_bs2].u_int = bs2;
+                        args[ARG_prescaler].u_int = brp;
+                        timing_found = true;
+                    }
+                }
+            }
+        }
+        if (!timing_found) {
+            mp_raise_msg(&mp_type_ValueError, MP_ERROR_TEXT("couldn't match baudrate and sample point"));
+        }
+    }
+
     // init CAN (if it fails, it's because the port doesn't exist)
     if (!can_init(self, args[ARG_mode].u_int, args[ARG_prescaler].u_int, args[ARG_sjw].u_int,
         args[ARG_bs1].u_int, args[ARG_bs2].u_int, args[ARG_auto_restart].u_bool)) {

From 32d76e5de66237eba456975095f998434413467a Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Tue, 8 Dec 2020 00:22:17 +0200
Subject: [PATCH 0495/3533] stm32/system_stm32: Enable DBGMCU in low-power
 modes for debug builds.

---
 ports/stm32/system_stm32.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/ports/stm32/system_stm32.c b/ports/stm32/system_stm32.c
index 00b7213869eae..2160e0ac994c6 100644
--- a/ports/stm32/system_stm32.c
+++ b/ports/stm32/system_stm32.c
@@ -425,6 +425,11 @@ void SystemClock_Config(void) {
     HAL_SYSTICK_CLKSourceConfig(SYSTICK_CLKSOURCE_HCLK);
     NVIC_SetPriority(SysTick_IRQn, NVIC_EncodePriority(NVIC_PRIORITYGROUP_4, TICK_INT_PRIORITY, 0));
     #endif
+
+    #if defined(STM32H7) && !defined(NDEBUG)
+    // Enable the Debug Module in low-power modes.
+    DBGMCU->CR |= (DBGMCU_CR_DBG_SLEEPD1 | DBGMCU_CR_DBG_STOPD1 | DBGMCU_CR_DBG_STANDBYD1);
+    #endif
 }
 
 #endif

From b603066bc2d272d05033705922e515d50318e735 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Tue, 8 Dec 2020 01:55:50 +0200
Subject: [PATCH 0496/3533] stm32/sdram: Add SDRAM enter/leave self-refresh
 mode functions.

These functions enable SDRAM data retention in stop mode.  Example usage,
in mpconfigboard.h:

    #define MICROPY_BOARD_ENTER_STOP sdram_enter_low_power();
    #define MICROPY_BOARD_LEAVE_STOP sdram_leave_low_power();
---
 ports/stm32/sdram.c | 22 ++++++++++++++++++++--
 ports/stm32/sdram.h |  2 ++
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/ports/stm32/sdram.c b/ports/stm32/sdram.c
index 0aae74e116b16..e8892b57463a4 100644
--- a/ports/stm32/sdram.c
+++ b/ports/stm32/sdram.c
@@ -49,8 +49,7 @@
 
 #ifdef FMC_SDRAM_BANK
 
-static void sdram_init_seq(SDRAM_HandleTypeDef
-    *hsdram, FMC_SDRAM_CommandTypeDef *command);
+static void sdram_init_seq(SDRAM_HandleTypeDef *hsdram, FMC_SDRAM_CommandTypeDef *command);
 extern void __fatal_error(const char *msg);
 
 bool sdram_init(void) {
@@ -254,6 +253,25 @@ static void sdram_init_seq(SDRAM_HandleTypeDef
     #endif
 }
 
+void sdram_enter_low_power(void) {
+    // Enter self-refresh mode.
+    // In self-refresh mode the SDRAM retains data with external clocking.
+    FMC_SDRAM_DEVICE->SDCMR |= (FMC_SDRAM_CMD_SELFREFRESH_MODE |     // Command Mode
+        FMC_SDRAM_CMD_TARGET_BANK |                                  // Command Target
+        (0 << 5U) |                                                  // Auto Refresh Number -1
+        (0 << 9U));                                                  // Mode Register Definition
+}
+
+void sdram_leave_low_power(void) {
+    // Exit self-refresh mode.
+    // Self-refresh mode is exited when the device is accessed or the mode bits are
+    // set to Normal mode, so technically it's not necessary to call this functions.
+    FMC_SDRAM_DEVICE->SDCMR |= (FMC_SDRAM_CMD_NORMAL_MODE |          // Command Mode
+        FMC_SDRAM_CMD_TARGET_BANK |                                  // Command Target
+        (0 << 5U) |                                                  // Auto Refresh Number - 1
+        (0 << 9U));                                                  // Mode Register Definition
+}
+
 bool sdram_test(bool fast) {
     uint8_t const pattern = 0xaa;
     uint8_t const antipattern = 0x55;
diff --git a/ports/stm32/sdram.h b/ports/stm32/sdram.h
index 9b4b4fb83e202..773a30802f87f 100644
--- a/ports/stm32/sdram.h
+++ b/ports/stm32/sdram.h
@@ -11,5 +11,7 @@
 bool sdram_init(void);
 void *sdram_start(void);
 void *sdram_end(void);
+void sdram_enter_low_power(void);
+void sdram_leave_low_power(void);
 bool sdram_test(bool fast);
 #endif // __SDRAM_H__

From 80883a82c0dd40178933eb8a46b2877cb72725b2 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 17 Dec 2020 12:23:09 +1100
Subject: [PATCH 0497/3533] stm32/adc: Deselect VBAT after reading to prevent
 battery drain.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/adc.c                            |  8 ++---
 ports/stm32/adc.h                            | 31 ++++++++++++++++++++
 ports/stm32/boards/stm32f4xx_hal_conf_base.h |  1 +
 ports/stm32/boards/stm32f7xx_hal_conf_base.h |  1 +
 ports/stm32/machine_adc.c                    |  8 ++++-
 5 files changed, 43 insertions(+), 6 deletions(-)

diff --git a/ports/stm32/adc.c b/ports/stm32/adc.c
index 3793ef5ff28a2..5fa22d7c78d3a 100644
--- a/ports/stm32/adc.c
+++ b/ports/stm32/adc.c
@@ -380,16 +380,14 @@ STATIC uint32_t adc_config_and_read_channel(ADC_HandleTypeDef *adcHandle, uint32
     adc_config_channel(adcHandle, channel);
     uint32_t raw_value = adc_read_channel(adcHandle);
 
-    #if defined(STM32F4) || defined(STM32F7)
     // ST docs say that (at least on STM32F42x and STM32F43x), VBATE must
     // be disabled when TSVREFE is enabled for TEMPSENSOR and VREFINT
     // conversions to work.  VBATE is enabled by the above call to read
     // the channel, and here we disable VBATE so a subsequent call for
     // TEMPSENSOR or VREFINT works correctly.
-    if (channel == ADC_CHANNEL_VBAT) {
-        ADC->CCR &= ~ADC_CCR_VBATE;
-    }
-    #endif
+    // It's also good to disable the VBAT switch to prevent battery drain,
+    // so disable it for all MCUs.
+    adc_deselect_vbat(adcHandle->Instance, channel);
 
     return raw_value;
 }
diff --git a/ports/stm32/adc.h b/ports/stm32/adc.h
index 4ae6022bc3362..6f2e61e099449 100644
--- a/ports/stm32/adc.h
+++ b/ports/stm32/adc.h
@@ -29,4 +29,35 @@
 extern const mp_obj_type_t pyb_adc_type;
 extern const mp_obj_type_t pyb_adc_all_type;
 
+#if defined(ADC_CHANNEL_VBAT)
+
+static inline void adc_deselect_vbat(ADC_TypeDef *adc, uint32_t channel) {
+    (void)adc;
+
+    if (channel == ADC_CHANNEL_VBAT) {
+        ADC_Common_TypeDef *adc_common;
+
+        #if defined(STM32F0) || defined(STM32WB)
+        adc_common = ADC1_COMMON;
+        #elif defined(STM32F4) || defined(STM32L4)
+        adc_common = ADC_COMMON_REGISTER(0);
+        #elif defined(STM32F7)
+        adc_common = ADC123_COMMON;
+        #elif defined(STM32H7)
+        adc_common = adc == ADC3 ? ADC3_COMMON : ADC12_COMMON;
+        #endif
+
+        adc_common->CCR &= ~LL_ADC_PATH_INTERNAL_VBAT;
+    }
+}
+
+#else
+
+static inline void adc_deselect_vbat(ADC_TypeDef *adc, uint32_t channel) {
+    (void)adc;
+    (void)channel;
+}
+
+#endif
+
 #endif // MICROPY_INCLUDED_STM32_ADC_H
diff --git a/ports/stm32/boards/stm32f4xx_hal_conf_base.h b/ports/stm32/boards/stm32f4xx_hal_conf_base.h
index 8d8bb8f4eeccc..91f064835e03d 100644
--- a/ports/stm32/boards/stm32f4xx_hal_conf_base.h
+++ b/ports/stm32/boards/stm32f4xx_hal_conf_base.h
@@ -53,6 +53,7 @@
 #include "stm32f4xx_hal_uart.h"
 #include "stm32f4xx_hal_usart.h"
 #include "stm32f4xx_hal_wwdg.h"
+#include "stm32f4xx_ll_adc.h"
 #include "stm32f4xx_ll_rtc.h"
 
 // Enable various HAL modules
diff --git a/ports/stm32/boards/stm32f7xx_hal_conf_base.h b/ports/stm32/boards/stm32f7xx_hal_conf_base.h
index 83a144f8fe7f0..1a3fca3ac86a8 100644
--- a/ports/stm32/boards/stm32f7xx_hal_conf_base.h
+++ b/ports/stm32/boards/stm32f7xx_hal_conf_base.h
@@ -53,6 +53,7 @@
 #include "stm32f7xx_hal_uart.h"
 #include "stm32f7xx_hal_usart.h"
 #include "stm32f7xx_hal_wwdg.h"
+#include "stm32f7xx_ll_adc.h"
 #include "stm32f7xx_ll_rtc.h"
 
 // Enable various HAL modules
diff --git a/ports/stm32/machine_adc.c b/ports/stm32/machine_adc.c
index 9c20f0f954989..d9e5a64da5533 100644
--- a/ports/stm32/machine_adc.c
+++ b/ports/stm32/machine_adc.c
@@ -26,6 +26,7 @@
 
 #include "py/runtime.h"
 #include "py/mphal.h"
+#include "adc.h"
 
 #if defined(STM32F0) || defined(STM32H7) || defined(STM32L0) || defined(STM32L4) || defined(STM32WB)
 #define ADC_V2 (1)
@@ -335,10 +336,15 @@ STATIC uint32_t adc_config_and_read_u16(ADC_TypeDef *adc, uint32_t channel, uint
         return 0xffff;
     }
 
+    // Select, configure and read the channel.
     adc_config_channel(adc, channel, sample_time);
     uint32_t raw = adc_read_channel(adc);
+
+    // If VBAT was sampled then deselect it to prevent battery drain.
+    adc_deselect_vbat(adc, channel);
+
+    // Scale raw reading to 16 bit value using a Taylor expansion (for bits <= 16).
     uint32_t bits = adc_get_bits(adc);
-    // Scale raw reading to 16 bit value using a Taylor expansion (for 8 <= bits <= 16)
     #if defined(STM32H7)
     if (bits < 8) {
         // For 6 and 7 bits

From 061cb1a73a4ecbf69a4e036053664b4f84754b34 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 17 Dec 2020 15:09:53 +1100
Subject: [PATCH 0498/3533] stm32/main: Do extended readblocks call when
 auto-detecting littlefs.

When littlefs is enabled extended reading must be supported, and using this
function to read the first block for auto-detection is more efficient (a
smaller read) and does not require a cached SPI-flash read.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/main.c    | 13 +++++++------
 ports/stm32/storage.c |  7 +++++++
 ports/stm32/storage.h |  1 +
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/ports/stm32/main.c b/ports/stm32/main.c
index d00c2ec713f61..fb10b96501e1d 100644
--- a/ports/stm32/main.c
+++ b/ports/stm32/main.c
@@ -164,17 +164,18 @@ MP_NOINLINE STATIC bool init_flash_fs(uint reset_mode) {
     // Default block device to entire flash storage
     mp_obj_t bdev = MP_OBJ_FROM_PTR(&pyb_flash_obj);
 
+    int ret;
+
     #if MICROPY_VFS_LFS1 || MICROPY_VFS_LFS2
 
     // Try to detect the block device used for the main filesystem, based on the first block
 
-    uint8_t buf[FLASH_BLOCK_SIZE];
-    storage_read_blocks(buf, FLASH_PART1_START_BLOCK, 1);
-
+    uint8_t buf[64];
+    ret = storage_readblocks_ext(buf, 0, 0, sizeof(buf));
     mp_int_t len = -1;
 
     #if MICROPY_VFS_LFS1
-    if (memcmp(&buf[40], "littlefs", 8) == 0) {
+    if (ret == 0 && memcmp(&buf[40], "littlefs", 8) == 0) {
         // LFS1
         lfs1_superblock_t *superblock = (void *)&buf[12];
         uint32_t block_size = lfs1_fromle32(superblock->d.block_size);
@@ -184,7 +185,7 @@ MP_NOINLINE STATIC bool init_flash_fs(uint reset_mode) {
     #endif
 
     #if MICROPY_VFS_LFS2
-    if (memcmp(&buf[8], "littlefs", 8) == 0) {
+    if (ret == 0 && memcmp(&buf[8], "littlefs", 8) == 0) {
         // LFS2
         lfs2_superblock_t *superblock = (void *)&buf[20];
         uint32_t block_size = lfs2_fromle32(superblock->block_size);
@@ -203,7 +204,7 @@ MP_NOINLINE STATIC bool init_flash_fs(uint reset_mode) {
 
     // Try to mount the flash on "/flash" and chdir to it for the boot-up directory.
     mp_obj_t mount_point = MP_OBJ_NEW_QSTR(MP_QSTR__slash_flash);
-    int ret = mp_vfs_mount_and_chdir_protected(bdev, mount_point);
+    ret = mp_vfs_mount_and_chdir_protected(bdev, mount_point);
 
     if (ret == -MP_ENODEV && bdev == MP_OBJ_FROM_PTR(&pyb_flash_obj) && reset_mode != 3) {
         // No filesystem, bdev is still the default (so didn't detect a possibly corrupt littlefs),
diff --git a/ports/stm32/storage.c b/ports/stm32/storage.c
index c8805d682986b..6581860ff3ffb 100644
--- a/ports/stm32/storage.c
+++ b/ports/stm32/storage.c
@@ -250,6 +250,13 @@ int storage_write_blocks(const uint8_t *src, uint32_t block_num, uint32_t num_bl
 #define PYB_FLASH_NATIVE_BLOCK_SIZE (FLASH_BLOCK_SIZE)
 #endif
 
+#if defined(MICROPY_HW_BDEV_READBLOCKS_EXT)
+// Size of blocks is PYB_FLASH_NATIVE_BLOCK_SIZE
+int storage_readblocks_ext(uint8_t *dest, uint32_t block, uint32_t offset, uint32_t len) {
+    return MICROPY_HW_BDEV_READBLOCKS_EXT(dest, block, offset, len);
+}
+#endif
+
 typedef struct _pyb_flash_obj_t {
     mp_obj_base_t base;
     uint32_t start; // in bytes
diff --git a/ports/stm32/storage.h b/ports/stm32/storage.h
index 490fc4a09b8ac..73058aad6b393 100644
--- a/ports/stm32/storage.h
+++ b/ports/stm32/storage.h
@@ -50,6 +50,7 @@ bool storage_write_block(const uint8_t *src, uint32_t block);
 // these return 0 on success, negative errno on error
 int storage_read_blocks(uint8_t *dest, uint32_t block_num, uint32_t num_blocks);
 int storage_write_blocks(const uint8_t *src, uint32_t block_num, uint32_t num_blocks);
+int storage_readblocks_ext(uint8_t *dest, uint32_t block, uint32_t offset, uint32_t len);
 
 int32_t flash_bdev_ioctl(uint32_t op, uint32_t arg);
 bool flash_bdev_readblock(uint8_t *dest, uint32_t block);

From e43a74a4db484ac1bfef191a8aa19b58b519efc6 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 17 Dec 2020 16:59:54 +1100
Subject: [PATCH 0499/3533] drivers/memory/spiflash: Add
 MICROPY_HW_SPIFLASH_ENABLE_CACHE option.

This only needs to be enabled if a board uses FAT FS on external SPI flash.
When disabled (and using external SPI flash) 4k of RAM can be saved.

Signed-off-by: Damien George <damien@micropython.org>
---
 drivers/memory/spiflash.c                        | 4 ++++
 drivers/memory/spiflash.h                        | 6 ++++++
 ports/stm32/boards/PYBD_SF2/mpconfigboard.h      | 1 +
 ports/stm32/boards/STM32F769DISC/mpconfigboard.h | 1 +
 ports/stm32/boards/STM32L476DISC/mpconfigboard.h | 1 +
 ports/stm32/mpconfigboard_common.h               | 8 ++++++++
 ports/stm32/spibdev.c                            | 6 ++++++
 7 files changed, 27 insertions(+)

diff --git a/drivers/memory/spiflash.c b/drivers/memory/spiflash.c
index e870d39f5f9cb..bb15bd6252519 100644
--- a/drivers/memory/spiflash.c
+++ b/drivers/memory/spiflash.c
@@ -287,6 +287,8 @@ int mp_spiflash_write(mp_spiflash_t *self, uint32_t addr, size_t len, const uint
 /******************************************************************************/
 // Interface functions that use the cache
 
+#if MICROPY_HW_SPIFLASH_ENABLE_CACHE
+
 void mp_spiflash_cached_read(mp_spiflash_t *self, uint32_t addr, size_t len, uint8_t *dest) {
     if (len == 0) {
         return;
@@ -509,3 +511,5 @@ int mp_spiflash_cached_write(mp_spiflash_t *self, uint32_t addr, size_t len, con
     mp_spiflash_release_bus(self);
     return 0;
 }
+
+#endif // MICROPY_HW_SPIFLASH_ENABLE_CACHE
diff --git a/drivers/memory/spiflash.h b/drivers/memory/spiflash.h
index 96dfdeeab66bf..c4162ff21cdc6 100644
--- a/drivers/memory/spiflash.h
+++ b/drivers/memory/spiflash.h
@@ -38,6 +38,7 @@ enum {
 
 struct _mp_spiflash_t;
 
+#if MICROPY_HW_SPIFLASH_ENABLE_CACHE
 // A cache must be provided by the user in the config struct.  The same cache
 // struct can be shared by multiple SPI flash instances.
 typedef struct _mp_spiflash_cache_t {
@@ -45,6 +46,7 @@ typedef struct _mp_spiflash_cache_t {
     struct _mp_spiflash_t *user; // current user of buf, for shared use
     uint32_t block; // current block stored in buf; 0xffffffff if invalid
 } mp_spiflash_cache_t;
+#endif
 
 typedef struct _mp_spiflash_config_t {
     uint32_t bus_kind;
@@ -59,7 +61,9 @@ typedef struct _mp_spiflash_config_t {
             const mp_qspi_proto_t *proto;
         } u_qspi;
     } bus;
+    #if MICROPY_HW_SPIFLASH_ENABLE_CACHE
     mp_spiflash_cache_t *cache; // can be NULL if cache functions not used
+    #endif
 } mp_spiflash_config_t;
 
 typedef struct _mp_spiflash_t {
@@ -75,9 +79,11 @@ int mp_spiflash_erase_block(mp_spiflash_t *self, uint32_t addr);
 void mp_spiflash_read(mp_spiflash_t *self, uint32_t addr, size_t len, uint8_t *dest);
 int mp_spiflash_write(mp_spiflash_t *self, uint32_t addr, size_t len, const uint8_t *src);
 
+#if MICROPY_HW_SPIFLASH_ENABLE_CACHE
 // These functions use the cache (which must already be configured)
 void mp_spiflash_cache_flush(mp_spiflash_t *self);
 void mp_spiflash_cached_read(mp_spiflash_t *self, uint32_t addr, size_t len, uint8_t *dest);
 int mp_spiflash_cached_write(mp_spiflash_t *self, uint32_t addr, size_t len, const uint8_t *src);
+#endif
 
 #endif // MICROPY_INCLUDED_DRIVERS_MEMORY_SPIFLASH_H
diff --git a/ports/stm32/boards/PYBD_SF2/mpconfigboard.h b/ports/stm32/boards/PYBD_SF2/mpconfigboard.h
index f6e130eb57eaf..29164ac11c909 100644
--- a/ports/stm32/boards/PYBD_SF2/mpconfigboard.h
+++ b/ports/stm32/boards/PYBD_SF2/mpconfigboard.h
@@ -77,6 +77,7 @@ void board_sleep(int value);
 // SPI flash #1, block device config
 extern const struct _mp_spiflash_config_t spiflash_config;
 extern struct _spi_bdev_t spi_bdev;
+#define MICROPY_HW_SPIFLASH_ENABLE_CACHE (1)
 #define MICROPY_HW_BDEV_IOCTL(op, arg) ( \
     (op) == BDEV_IOCTL_NUM_BLOCKS ? (MICROPY_HW_SPIFLASH_SIZE_BITS / 8 / FLASH_BLOCK_SIZE) : \
     (op) == BDEV_IOCTL_INIT ? spi_bdev_ioctl(&spi_bdev, (op), (uint32_t)&spiflash_config) : \
diff --git a/ports/stm32/boards/STM32F769DISC/mpconfigboard.h b/ports/stm32/boards/STM32F769DISC/mpconfigboard.h
index e1fe93bb0ed44..843b987cee714 100644
--- a/ports/stm32/boards/STM32F769DISC/mpconfigboard.h
+++ b/ports/stm32/boards/STM32F769DISC/mpconfigboard.h
@@ -40,6 +40,7 @@ extern const struct _mp_spiflash_config_t spiflash_config;
 extern struct _spi_bdev_t spi_bdev;
 #if !USE_QSPI_XIP
 #define MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE (0)
+#define MICROPY_HW_SPIFLASH_ENABLE_CACHE (1)
 #define MICROPY_HW_BDEV_IOCTL(op, arg) ( \
     (op) == BDEV_IOCTL_NUM_BLOCKS ? ((1 << MICROPY_HW_QSPIFLASH_SIZE_BITS_LOG2) / 8 / FLASH_BLOCK_SIZE) : \
     (op) == BDEV_IOCTL_INIT ? spi_bdev_ioctl(&spi_bdev, (op), (uint32_t)&spiflash_config) : \
diff --git a/ports/stm32/boards/STM32L476DISC/mpconfigboard.h b/ports/stm32/boards/STM32L476DISC/mpconfigboard.h
index 2831187531178..ad62f761e55f3 100644
--- a/ports/stm32/boards/STM32L476DISC/mpconfigboard.h
+++ b/ports/stm32/boards/STM32L476DISC/mpconfigboard.h
@@ -22,6 +22,7 @@ void STM32L476DISC_board_early_init(void);
 // block device config for SPI flash
 extern const struct _mp_spiflash_config_t spiflash_config;
 extern struct _spi_bdev_t spi_bdev;
+#define MICROPY_HW_SPIFLASH_ENABLE_CACHE (1)
 #define MICROPY_HW_BDEV_IOCTL(op, arg) ( \
     (op) == BDEV_IOCTL_NUM_BLOCKS ? (MICROPY_HW_SPIFLASH_SIZE_BITS / 8 / FLASH_BLOCK_SIZE) : \
     (op) == BDEV_IOCTL_INIT ? spi_bdev_ioctl(&spi_bdev, (op), (uint32_t)&spiflash_config) : \
diff --git a/ports/stm32/mpconfigboard_common.h b/ports/stm32/mpconfigboard_common.h
index 8890abc59bbe1..60fbc35fcbae0 100644
--- a/ports/stm32/mpconfigboard_common.h
+++ b/ports/stm32/mpconfigboard_common.h
@@ -286,6 +286,14 @@
 #define MICROPY_HW_BDEV_WRITEBLOCK flash_bdev_writeblock
 #endif
 
+// Whether to enable caching for external SPI flash, to allow block writes that are
+// smaller than the native page-erase size of the SPI flash, eg when FAT FS is used.
+// Enabling this enables spi_bdev_readblocks() and spi_bdev_writeblocks() functions,
+// and requires a valid mp_spiflash_config_t.cache pointer.
+#ifndef MICROPY_HW_SPIFLASH_ENABLE_CACHE
+#define MICROPY_HW_SPIFLASH_ENABLE_CACHE (0)
+#endif
+
 // Enable the storage sub-system if a block device is defined
 #if defined(MICROPY_HW_BDEV_IOCTL)
 #define MICROPY_HW_ENABLE_STORAGE (1)
diff --git a/ports/stm32/spibdev.c b/ports/stm32/spibdev.c
index 05c8819a7737f..5090b43b1cb92 100644
--- a/ports/stm32/spibdev.c
+++ b/ports/stm32/spibdev.c
@@ -41,19 +41,23 @@ int32_t spi_bdev_ioctl(spi_bdev_t *bdev, uint32_t op, uint32_t arg) {
             return 0;
 
         case BDEV_IOCTL_IRQ_HANDLER:
+            #if MICROPY_HW_SPIFLASH_ENABLE_CACHE
             if ((bdev->spiflash.flags & 1) && HAL_GetTick() - bdev->flash_tick_counter_last_write >= 1000) {
                 mp_spiflash_cache_flush(&bdev->spiflash);
                 led_state(PYB_LED_RED, 0); // indicate a clean cache with LED off
             }
+            #endif
             return 0;
 
         case BDEV_IOCTL_SYNC:
+            #if MICROPY_HW_SPIFLASH_ENABLE_CACHE
             if (bdev->spiflash.flags & 1) {
                 uint32_t basepri = raise_irq_pri(IRQ_PRI_FLASH); // prevent cache flushing and USB access
                 mp_spiflash_cache_flush(&bdev->spiflash);
                 led_state(PYB_LED_RED, 0); // indicate a clean cache with LED off
                 restore_irq_pri(basepri);
             }
+            #endif
             return 0;
 
         case BDEV_IOCTL_BLOCK_ERASE: {
@@ -66,6 +70,7 @@ int32_t spi_bdev_ioctl(spi_bdev_t *bdev, uint32_t op, uint32_t arg) {
     return -MP_EINVAL;
 }
 
+#if MICROPY_HW_SPIFLASH_ENABLE_CACHE
 int spi_bdev_readblocks(spi_bdev_t *bdev, uint8_t *dest, uint32_t block_num, uint32_t num_blocks) {
     uint32_t basepri = raise_irq_pri(IRQ_PRI_FLASH); // prevent cache flushing and USB access
     mp_spiflash_cached_read(&bdev->spiflash, block_num * FLASH_BLOCK_SIZE, num_blocks * FLASH_BLOCK_SIZE, dest);
@@ -85,6 +90,7 @@ int spi_bdev_writeblocks(spi_bdev_t *bdev, const uint8_t *src, uint32_t block_nu
 
     return ret;
 }
+#endif // MICROPY_HW_SPIFLASH_ENABLE_CACHE
 
 int spi_bdev_readblocks_raw(spi_bdev_t *bdev, uint8_t *dest, uint32_t block_num, uint32_t block_offset, uint32_t num_bytes) {
     uint32_t basepri = raise_irq_pri(IRQ_PRI_FLASH); // prevent cache flushing and USB access

From e715a8fb9bf9c572b805aca4682048183c6eb97c Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 17 Dec 2020 21:59:58 +1100
Subject: [PATCH 0500/3533] stm32/boards/PYBD_SF2: Disable
 SPIFLASH_ENABLE_CACHE for mboot builds.

Mboot builds do not use the external SPI flash in caching mode, and
explicitly disabling it saves RAM and a small bit of flash.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/boards/PYBD_SF2/bdev.c          | 6 ++++++
 ports/stm32/boards/PYBD_SF2/mpconfigboard.h | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/ports/stm32/boards/PYBD_SF2/bdev.c b/ports/stm32/boards/PYBD_SF2/bdev.c
index 6c5ff721ec707..d9bec93c27e40 100644
--- a/ports/stm32/boards/PYBD_SF2/bdev.c
+++ b/ports/stm32/boards/PYBD_SF2/bdev.c
@@ -27,8 +27,10 @@
 #include "storage.h"
 #include "qspi.h"
 
+#if MICROPY_HW_SPIFLASH_ENABLE_CACHE
 // Shared cache for first and second SPI block devices
 STATIC mp_spiflash_cache_t spi_bdev_cache;
+#endif
 
 // First external SPI flash uses software QSPI interface
 
@@ -45,7 +47,9 @@ const mp_spiflash_config_t spiflash_config = {
     .bus_kind = MP_SPIFLASH_BUS_QSPI,
     .bus.u_qspi.data = (void*)&soft_qspi_bus,
     .bus.u_qspi.proto = &mp_soft_qspi_proto,
+    #if MICROPY_HW_SPIFLASH_ENABLE_CACHE
     .cache = &spi_bdev_cache,
+    #endif
 };
 
 spi_bdev_t spi_bdev;
@@ -56,7 +60,9 @@ const mp_spiflash_config_t spiflash2_config = {
     .bus_kind = MP_SPIFLASH_BUS_QSPI,
     .bus.u_qspi.data = NULL,
     .bus.u_qspi.proto = &qspi_proto,
+    #if MICROPY_HW_SPIFLASH_ENABLE_CACHE
     .cache = &spi_bdev_cache,
+    #endif
 };
 
 spi_bdev_t spi_bdev2;
diff --git a/ports/stm32/boards/PYBD_SF2/mpconfigboard.h b/ports/stm32/boards/PYBD_SF2/mpconfigboard.h
index 29164ac11c909..45d968f353609 100644
--- a/ports/stm32/boards/PYBD_SF2/mpconfigboard.h
+++ b/ports/stm32/boards/PYBD_SF2/mpconfigboard.h
@@ -77,7 +77,9 @@ void board_sleep(int value);
 // SPI flash #1, block device config
 extern const struct _mp_spiflash_config_t spiflash_config;
 extern struct _spi_bdev_t spi_bdev;
+#if !BUILDING_MBOOT
 #define MICROPY_HW_SPIFLASH_ENABLE_CACHE (1)
+#endif
 #define MICROPY_HW_BDEV_IOCTL(op, arg) ( \
     (op) == BDEV_IOCTL_NUM_BLOCKS ? (MICROPY_HW_SPIFLASH_SIZE_BITS / 8 / FLASH_BLOCK_SIZE) : \
     (op) == BDEV_IOCTL_INIT ? spi_bdev_ioctl(&spi_bdev, (op), (uint32_t)&spiflash_config) : \

From 505a1853b9490246fbb95850ad8dae6d1b49d002 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 18 Dec 2020 13:48:26 +1100
Subject: [PATCH 0501/3533] teensy: Fix build errors and warnings and enable
 -Werror.

Changes are:
- Remove include of stm32's adc.h because it was recently changed and is
  no longer compatible with teensy (and not used anyway).
- Remove define of __disable_irq in mpconfigport.h because it was clashing
  with an equivalent definition in core/mk20dx128.h.
- Add -Werror to CFLAGS, and change -std=gnu99 to -std=c99.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/teensy/Makefile       | 2 +-
 ports/teensy/modpyb.c       | 1 -
 ports/teensy/mpconfigport.h | 6 +-----
 3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/ports/teensy/Makefile b/ports/teensy/Makefile
index f2623eabd3dc3..d3978718e0095 100644
--- a/ports/teensy/Makefile
+++ b/ports/teensy/Makefile
@@ -38,7 +38,7 @@ INC += -I$(TOP)/ports/stm32
 INC += -I$(BUILD)
 INC += -Icore
 
-CFLAGS = $(INC) -Wall -Wpointer-arith -std=gnu99 -nostdlib $(CFLAGS_CORTEX_M4)
+CFLAGS = $(INC) -Wall -Wpointer-arith -Werror -std=c99 -nostdlib $(CFLAGS_CORTEX_M4)
 LDFLAGS = -nostdlib -T mk20dx256.ld -msoft-float -mfloat-abi=soft
 
 ifeq ($(USE_ARDUINO_TOOLCHAIN),1)
diff --git a/ports/teensy/modpyb.c b/ports/teensy/modpyb.c
index f4384a885426e..6671b3abdce0e 100644
--- a/ports/teensy/modpyb.c
+++ b/ports/teensy/modpyb.c
@@ -44,7 +44,6 @@
 #include "usrsw.h"
 #include "rng.h"
 #include "uart.h"
-#include "adc.h"
 #include "storage.h"
 #include "sdcard.h"
 #include "accel.h"
diff --git a/ports/teensy/mpconfigport.h b/ports/teensy/mpconfigport.h
index 24269c3b981e6..c00da5ed9e498 100644
--- a/ports/teensy/mpconfigport.h
+++ b/ports/teensy/mpconfigport.h
@@ -72,10 +72,6 @@ typedef long mp_off_t;
 // value from disable_irq back to enable_irq.  If you really need
 // to know the machine-specific values, see irq.h.
 
-#ifndef __disable_irq
-#define __disable_irq() __asm__ volatile ("CPSID i");
-#endif
-
 __attribute__((always_inline)) static inline uint32_t __get_PRIMASK(void) {
     uint32_t result;
     __asm volatile ("MRS %0, primask" : "=r" (result));
@@ -92,7 +88,7 @@ __attribute__((always_inline)) static inline void enable_irq(mp_uint_t state) {
 
 __attribute__((always_inline)) static inline mp_uint_t disable_irq(void) {
     mp_uint_t state = __get_PRIMASK();
-    __disable_irq();
+    __asm__ volatile ("CPSID i");
     return state;
 }
 

From 108183fcc01f722d17e373f91f392a2a60ac787a Mon Sep 17 00:00:00 2001
From: stijn <stijn@ignitron.net>
Date: Tue, 15 Dec 2020 11:54:34 +0100
Subject: [PATCH 0502/3533] tests/misc/sys_settrace: Make test output
 independent of invoked path.

The original logic of reducing a full path to a relative one assumes
"tests/misc" is in the filename which is limited in usage: it never works
for CPython on Windows since that will use a backslash as path separator,
and also won't work when the filename is a path not relative to the tests
directory which happens for example in the common case of running
"./run-tests -d misc".

Fix all cases by printing only the bare filename, which requires them all
to start with sys_settrace_ hence the renaming.
---
 tests/misc/sys_settrace_features.py           |   8 +-
 tests/misc/sys_settrace_generator.py          |   4 +-
 tests/misc/sys_settrace_generator.py.exp      | 276 +++++++++---------
 tests/misc/sys_settrace_loop.py               |   4 +-
 tests/misc/sys_settrace_loop.py.exp           |  92 +++---
 ...ace_generic.py => sys_settrace_generic.py} |   6 +-
 ...e_importme.py => sys_settrace_importme.py} |   0
 7 files changed, 195 insertions(+), 195 deletions(-)
 rename tests/misc/sys_settrace_subdir/{trace_generic.py => sys_settrace_generic.py} (91%)
 rename tests/misc/sys_settrace_subdir/{trace_importme.py => sys_settrace_importme.py} (100%)

diff --git a/tests/misc/sys_settrace_features.py b/tests/misc/sys_settrace_features.py
index d315ea69730c0..e1b1a059dad6f 100644
--- a/tests/misc/sys_settrace_features.py
+++ b/tests/misc/sys_settrace_features.py
@@ -20,8 +20,8 @@ def print_stacktrace(frame, level=0):
             "  ",
             frame.f_globals["__name__"],
             frame.f_code.co_name,
-            # reduce full path to some pseudo-relative
-            "misc" + "".join(frame.f_code.co_filename.split("tests/misc")[-1:]),
+            # Keep just the filename.
+            "sys_settrace_" + frame.f_code.co_filename.split("sys_settrace_")[-1],
             frame.f_lineno,
         )
     )
@@ -95,9 +95,9 @@ def do_tests():
     print("Who loves the sun?")
     print("Not every-", factorial(3))
 
-    from sys_settrace_subdir import trace_generic
+    from sys_settrace_subdir import sys_settrace_generic
 
-    trace_generic.run_tests()
+    sys_settrace_generic.run_tests()
     return
 
 
diff --git a/tests/misc/sys_settrace_generator.py b/tests/misc/sys_settrace_generator.py
index 4ace0f50e81b5..43065df4ae9be 100644
--- a/tests/misc/sys_settrace_generator.py
+++ b/tests/misc/sys_settrace_generator.py
@@ -17,8 +17,8 @@ def print_stacktrace(frame, level=0):
             "  ",
             frame.f_globals["__name__"],
             frame.f_code.co_name,
-            # reduce full path to some pseudo-relative
-            "misc" + "".join(frame.f_code.co_filename.split("tests/misc")[-1:]),
+            # Keep just the filename.
+            "sys_settrace_" + frame.f_code.co_filename.split("sys_settrace_")[-1],
             frame.f_lineno,
         )
     )
diff --git a/tests/misc/sys_settrace_generator.py.exp b/tests/misc/sys_settrace_generator.py.exp
index de9d0bf1c36a6..a83450afe380c 100644
--- a/tests/misc/sys_settrace_generator.py.exp
+++ b/tests/misc/sys_settrace_generator.py.exp
@@ -1,195 +1,195 @@
 ### trace_handler::main event: call
- 0:   @__main__:test_generator => miscmisc/sys_settrace_generator.py:41
- 1:   @__main__:<module> => miscmisc/sys_settrace_generator.py:69
+ 0:   @__main__:test_generator => sys_settrace_generator.py:41
+ 1:   @__main__:<module> => sys_settrace_generator.py:69
 ### trace_handler::main event: line
- 0:   @__main__:test_generator => miscmisc/sys_settrace_generator.py:42
- 1:   @__main__:<module> => miscmisc/sys_settrace_generator.py:69
+ 0:   @__main__:test_generator => sys_settrace_generator.py:42
+ 1:   @__main__:<module> => sys_settrace_generator.py:69
 ### trace_handler::main event: line
- 0:   @__main__:test_generator => miscmisc/sys_settrace_generator.py:48
- 1:   @__main__:<module> => miscmisc/sys_settrace_generator.py:69
+ 0:   @__main__:test_generator => sys_settrace_generator.py:48
+ 1:   @__main__:<module> => sys_settrace_generator.py:69
 ### trace_handler::main event: line
- 0:   @__main__:test_generator => miscmisc/sys_settrace_generator.py:49
- 1:   @__main__:<module> => miscmisc/sys_settrace_generator.py:69
+ 0:   @__main__:test_generator => sys_settrace_generator.py:49
+ 1:   @__main__:<module> => sys_settrace_generator.py:69
 ### trace_handler::main event: line
- 0:   @__main__:test_generator => miscmisc/sys_settrace_generator.py:50
- 1:   @__main__:<module> => miscmisc/sys_settrace_generator.py:69
+ 0:   @__main__:test_generator => sys_settrace_generator.py:50
+ 1:   @__main__:<module> => sys_settrace_generator.py:69
 ### trace_handler::main event: line
- 0:   @__main__:test_generator => miscmisc/sys_settrace_generator.py:52
- 1:   @__main__:<module> => miscmisc/sys_settrace_generator.py:69
+ 0:   @__main__:test_generator => sys_settrace_generator.py:52
+ 1:   @__main__:<module> => sys_settrace_generator.py:69
 ### trace_handler::main event: call
- 0:   @__main__:make_gen => miscmisc/sys_settrace_generator.py:42
- 1:   @__main__:test_generator => miscmisc/sys_settrace_generator.py:52
- 2:   @__main__:<module> => miscmisc/sys_settrace_generator.py:69
+ 0:   @__main__:make_gen => sys_settrace_generator.py:42
+ 1:   @__main__:test_generator => sys_settrace_generator.py:52
+ 2:   @__main__:<module> => sys_settrace_generator.py:69
 ### trace_handler::main event: line
- 0:   @__main__:make_gen => miscmisc/sys_settrace_generator.py:43
- 1:   @__main__:test_generator => miscmisc/sys_settrace_generator.py:52
- 2:   @__main__:<module> => miscmisc/sys_settrace_generator.py:69
+ 0:   @__main__:make_gen => sys_settrace_generator.py:43
+ 1:   @__main__:test_generator => sys_settrace_generator.py:52
+ 2:   @__main__:<module> => sys_settrace_generator.py:69
 ### trace_handler::main event: return
- 0:   @__main__:make_gen => miscmisc/sys_settrace_generator.py:43
- 1:   @__main__:test_generator => miscmisc/sys_settrace_generator.py:52
- 2:   @__main__:<module> => miscmisc/sys_settrace_generator.py:69
+ 0:   @__main__:make_gen => sys_settrace_generator.py:43
+ 1:   @__main__:test_generator => sys_settrace_generator.py:52
+ 2:   @__main__:<module> => sys_settrace_generator.py:69
 ### trace_handler::main event: line
- 0:   @__main__:test_generator => miscmisc/sys_settrace_generator.py:56
- 1:   @__main__:<module> => miscmisc/sys_settrace_generator.py:69
+ 0:   @__main__:test_generator => sys_settrace_generator.py:56
+ 1:   @__main__:<module> => sys_settrace_generator.py:69
 ### trace_handler::main event: call
- 0:   @__main__:make_gen => miscmisc/sys_settrace_generator.py:43
- 1:   @__main__:test_generator => miscmisc/sys_settrace_generator.py:56
- 2:   @__main__:<module> => miscmisc/sys_settrace_generator.py:69
+ 0:   @__main__:make_gen => sys_settrace_generator.py:43
+ 1:   @__main__:test_generator => sys_settrace_generator.py:56
+ 2:   @__main__:<module> => sys_settrace_generator.py:69
 ### trace_handler::main event: line
- 0:   @__main__:make_gen => miscmisc/sys_settrace_generator.py:43
- 1:   @__main__:test_generator => miscmisc/sys_settrace_generator.py:56
- 2:   @__main__:<module> => miscmisc/sys_settrace_generator.py:69
+ 0:   @__main__:make_gen => sys_settrace_generator.py:43
+ 1:   @__main__:test_generator => sys_settrace_generator.py:56
+ 2:   @__main__:<module> => sys_settrace_generator.py:69
 ### trace_handler::main event: line
- 0:   @__main__:make_gen => miscmisc/sys_settrace_generator.py:44
- 1:   @__main__:test_generator => miscmisc/sys_settrace_generator.py:56
- 2:   @__main__:<module> => miscmisc/sys_settrace_generator.py:69
+ 0:   @__main__:make_gen => sys_settrace_generator.py:44
+ 1:   @__main__:test_generator => sys_settrace_generator.py:56
+ 2:   @__main__:<module> => sys_settrace_generator.py:69
 ### trace_handler::main event: return
- 0:   @__main__:make_gen => miscmisc/sys_settrace_generator.py:44
- 1:   @__main__:test_generator => miscmisc/sys_settrace_generator.py:56
- 2:   @__main__:<module> => miscmisc/sys_settrace_generator.py:69
+ 0:   @__main__:make_gen => sys_settrace_generator.py:44
+ 1:   @__main__:test_generator => sys_settrace_generator.py:56
+ 2:   @__main__:<module> => sys_settrace_generator.py:69
 ### trace_handler::main event: call
- 0:   @__main__:make_gen => miscmisc/sys_settrace_generator.py:44
- 1:   @__main__:test_generator => miscmisc/sys_settrace_generator.py:56
- 2:   @__main__:<module> => miscmisc/sys_settrace_generator.py:69
+ 0:   @__main__:make_gen => sys_settrace_generator.py:44
+ 1:   @__main__:test_generator => sys_settrace_generator.py:56
+ 2:   @__main__:<module> => sys_settrace_generator.py:69
 ### trace_handler::main event: line
- 0:   @__main__:make_gen => miscmisc/sys_settrace_generator.py:44
- 1:   @__main__:test_generator => miscmisc/sys_settrace_generator.py:56
- 2:   @__main__:<module> => miscmisc/sys_settrace_generator.py:69
+ 0:   @__main__:make_gen => sys_settrace_generator.py:44
+ 1:   @__main__:test_generator => sys_settrace_generator.py:56
+ 2:   @__main__:<module> => sys_settrace_generator.py:69
 ### trace_handler::main event: line
- 0:   @__main__:make_gen => miscmisc/sys_settrace_generator.py:45
- 1:   @__main__:test_generator => miscmisc/sys_settrace_generator.py:56
- 2:   @__main__:<module> => miscmisc/sys_settrace_generator.py:69
+ 0:   @__main__:make_gen => sys_settrace_generator.py:45
+ 1:   @__main__:test_generator => sys_settrace_generator.py:56
+ 2:   @__main__:<module> => sys_settrace_generator.py:69
 ### trace_handler::main event: return
- 0:   @__main__:make_gen => miscmisc/sys_settrace_generator.py:45
- 1:   @__main__:test_generator => miscmisc/sys_settrace_generator.py:56
- 2:   @__main__:<module> => miscmisc/sys_settrace_generator.py:69
+ 0:   @__main__:make_gen => sys_settrace_generator.py:45
+ 1:   @__main__:test_generator => sys_settrace_generator.py:56
+ 2:   @__main__:<module> => sys_settrace_generator.py:69
 ### trace_handler::main event: call
- 0:   @__main__:make_gen => miscmisc/sys_settrace_generator.py:45
- 1:   @__main__:test_generator => miscmisc/sys_settrace_generator.py:56
- 2:   @__main__:<module> => miscmisc/sys_settrace_generator.py:69
+ 0:   @__main__:make_gen => sys_settrace_generator.py:45
+ 1:   @__main__:test_generator => sys_settrace_generator.py:56
+ 2:   @__main__:<module> => sys_settrace_generator.py:69
 ### trace_handler::main event: line
- 0:   @__main__:make_gen => miscmisc/sys_settrace_generator.py:45
- 1:   @__main__:test_generator => miscmisc/sys_settrace_generator.py:56
- 2:   @__main__:<module> => miscmisc/sys_settrace_generator.py:69
+ 0:   @__main__:make_gen => sys_settrace_generator.py:45
+ 1:   @__main__:test_generator => sys_settrace_generator.py:56
+ 2:   @__main__:<module> => sys_settrace_generator.py:69
 ### trace_handler::main event: line
- 0:   @__main__:make_gen => miscmisc/sys_settrace_generator.py:46
- 1:   @__main__:test_generator => miscmisc/sys_settrace_generator.py:56
- 2:   @__main__:<module> => miscmisc/sys_settrace_generator.py:69
+ 0:   @__main__:make_gen => sys_settrace_generator.py:46
+ 1:   @__main__:test_generator => sys_settrace_generator.py:56
+ 2:   @__main__:<module> => sys_settrace_generator.py:69
 ### trace_handler::main event: return
- 0:   @__main__:make_gen => miscmisc/sys_settrace_generator.py:46
- 1:   @__main__:test_generator => miscmisc/sys_settrace_generator.py:56
- 2:   @__main__:<module> => miscmisc/sys_settrace_generator.py:69
+ 0:   @__main__:make_gen => sys_settrace_generator.py:46
+ 1:   @__main__:test_generator => sys_settrace_generator.py:56
+ 2:   @__main__:<module> => sys_settrace_generator.py:69
 ### trace_handler::main event: exception
- 0:   @__main__:test_generator => miscmisc/sys_settrace_generator.py:56
- 1:   @__main__:<module> => miscmisc/sys_settrace_generator.py:69
+ 0:   @__main__:test_generator => sys_settrace_generator.py:56
+ 1:   @__main__:<module> => sys_settrace_generator.py:69
 ### trace_handler::main event: line
- 0:   @__main__:test_generator => miscmisc/sys_settrace_generator.py:58
- 1:   @__main__:<module> => miscmisc/sys_settrace_generator.py:69
+ 0:   @__main__:test_generator => sys_settrace_generator.py:58
+ 1:   @__main__:<module> => sys_settrace_generator.py:69
 ### trace_handler::main event: line
- 0:   @__main__:test_generator => miscmisc/sys_settrace_generator.py:59
- 1:   @__main__:<module> => miscmisc/sys_settrace_generator.py:69
+ 0:   @__main__:test_generator => sys_settrace_generator.py:59
+ 1:   @__main__:<module> => sys_settrace_generator.py:69
 test_generator 7 8
 ### trace_handler::main event: line
- 0:   @__main__:test_generator => miscmisc/sys_settrace_generator.py:61
- 1:   @__main__:<module> => miscmisc/sys_settrace_generator.py:69
+ 0:   @__main__:test_generator => sys_settrace_generator.py:61
+ 1:   @__main__:<module> => sys_settrace_generator.py:69
 ### trace_handler::main event: line
- 0:   @__main__:test_generator => miscmisc/sys_settrace_generator.py:62
- 1:   @__main__:<module> => miscmisc/sys_settrace_generator.py:69
+ 0:   @__main__:test_generator => sys_settrace_generator.py:62
+ 1:   @__main__:<module> => sys_settrace_generator.py:69
 ### trace_handler::main event: line
- 0:   @__main__:test_generator => miscmisc/sys_settrace_generator.py:63
- 1:   @__main__:<module> => miscmisc/sys_settrace_generator.py:69
+ 0:   @__main__:test_generator => sys_settrace_generator.py:63
+ 1:   @__main__:<module> => sys_settrace_generator.py:69
 ### trace_handler::main event: call
- 0:   @__main__:make_gen => miscmisc/sys_settrace_generator.py:42
- 1:   @__main__:test_generator => miscmisc/sys_settrace_generator.py:63
- 2:   @__main__:<module> => miscmisc/sys_settrace_generator.py:69
+ 0:   @__main__:make_gen => sys_settrace_generator.py:42
+ 1:   @__main__:test_generator => sys_settrace_generator.py:63
+ 2:   @__main__:<module> => sys_settrace_generator.py:69
 ### trace_handler::main event: line
- 0:   @__main__:make_gen => miscmisc/sys_settrace_generator.py:43
- 1:   @__main__:test_generator => miscmisc/sys_settrace_generator.py:63
- 2:   @__main__:<module> => miscmisc/sys_settrace_generator.py:69
+ 0:   @__main__:make_gen => sys_settrace_generator.py:43
+ 1:   @__main__:test_generator => sys_settrace_generator.py:63
+ 2:   @__main__:<module> => sys_settrace_generator.py:69
 ### trace_handler::main event: return
- 0:   @__main__:make_gen => miscmisc/sys_settrace_generator.py:43
- 1:   @__main__:test_generator => miscmisc/sys_settrace_generator.py:63
- 2:   @__main__:<module> => miscmisc/sys_settrace_generator.py:69
+ 0:   @__main__:make_gen => sys_settrace_generator.py:43
+ 1:   @__main__:test_generator => sys_settrace_generator.py:63
+ 2:   @__main__:<module> => sys_settrace_generator.py:69
 ### trace_handler::main event: line
- 0:   @__main__:test_generator => miscmisc/sys_settrace_generator.py:63
- 1:   @__main__:<module> => miscmisc/sys_settrace_generator.py:69
+ 0:   @__main__:test_generator => sys_settrace_generator.py:63
+ 1:   @__main__:<module> => sys_settrace_generator.py:69
 ### trace_handler::main event: line
- 0:   @__main__:test_generator => miscmisc/sys_settrace_generator.py:64
- 1:   @__main__:<module> => miscmisc/sys_settrace_generator.py:69
+ 0:   @__main__:test_generator => sys_settrace_generator.py:64
+ 1:   @__main__:<module> => sys_settrace_generator.py:69
 ### trace_handler::main event: line
- 0:   @__main__:test_generator => miscmisc/sys_settrace_generator.py:63
- 1:   @__main__:<module> => miscmisc/sys_settrace_generator.py:69
+ 0:   @__main__:test_generator => sys_settrace_generator.py:63
+ 1:   @__main__:<module> => sys_settrace_generator.py:69
 ### trace_handler::main event: call
- 0:   @__main__:make_gen => miscmisc/sys_settrace_generator.py:43
- 1:   @__main__:test_generator => miscmisc/sys_settrace_generator.py:63
- 2:   @__main__:<module> => miscmisc/sys_settrace_generator.py:69
+ 0:   @__main__:make_gen => sys_settrace_generator.py:43
+ 1:   @__main__:test_generator => sys_settrace_generator.py:63
+ 2:   @__main__:<module> => sys_settrace_generator.py:69
 ### trace_handler::main event: line
- 0:   @__main__:make_gen => miscmisc/sys_settrace_generator.py:43
- 1:   @__main__:test_generator => miscmisc/sys_settrace_generator.py:63
- 2:   @__main__:<module> => miscmisc/sys_settrace_generator.py:69
+ 0:   @__main__:make_gen => sys_settrace_generator.py:43
+ 1:   @__main__:test_generator => sys_settrace_generator.py:63
+ 2:   @__main__:<module> => sys_settrace_generator.py:69
 ### trace_handler::main event: line
- 0:   @__main__:make_gen => miscmisc/sys_settrace_generator.py:44
- 1:   @__main__:test_generator => miscmisc/sys_settrace_generator.py:63
- 2:   @__main__:<module> => miscmisc/sys_settrace_generator.py:69
+ 0:   @__main__:make_gen => sys_settrace_generator.py:44
+ 1:   @__main__:test_generator => sys_settrace_generator.py:63
+ 2:   @__main__:<module> => sys_settrace_generator.py:69
 ### trace_handler::main event: return
- 0:   @__main__:make_gen => miscmisc/sys_settrace_generator.py:44
- 1:   @__main__:test_generator => miscmisc/sys_settrace_generator.py:63
- 2:   @__main__:<module> => miscmisc/sys_settrace_generator.py:69
+ 0:   @__main__:make_gen => sys_settrace_generator.py:44
+ 1:   @__main__:test_generator => sys_settrace_generator.py:63
+ 2:   @__main__:<module> => sys_settrace_generator.py:69
 ### trace_handler::main event: line
- 0:   @__main__:test_generator => miscmisc/sys_settrace_generator.py:63
- 1:   @__main__:<module> => miscmisc/sys_settrace_generator.py:69
+ 0:   @__main__:test_generator => sys_settrace_generator.py:63
+ 1:   @__main__:<module> => sys_settrace_generator.py:69
 ### trace_handler::main event: line
- 0:   @__main__:test_generator => miscmisc/sys_settrace_generator.py:64
- 1:   @__main__:<module> => miscmisc/sys_settrace_generator.py:69
+ 0:   @__main__:test_generator => sys_settrace_generator.py:64
+ 1:   @__main__:<module> => sys_settrace_generator.py:69
 ### trace_handler::main event: line
- 0:   @__main__:test_generator => miscmisc/sys_settrace_generator.py:63
- 1:   @__main__:<module> => miscmisc/sys_settrace_generator.py:69
+ 0:   @__main__:test_generator => sys_settrace_generator.py:63
+ 1:   @__main__:<module> => sys_settrace_generator.py:69
 ### trace_handler::main event: call
- 0:   @__main__:make_gen => miscmisc/sys_settrace_generator.py:44
- 1:   @__main__:test_generator => miscmisc/sys_settrace_generator.py:63
- 2:   @__main__:<module> => miscmisc/sys_settrace_generator.py:69
+ 0:   @__main__:make_gen => sys_settrace_generator.py:44
+ 1:   @__main__:test_generator => sys_settrace_generator.py:63
+ 2:   @__main__:<module> => sys_settrace_generator.py:69
 ### trace_handler::main event: line
- 0:   @__main__:make_gen => miscmisc/sys_settrace_generator.py:44
- 1:   @__main__:test_generator => miscmisc/sys_settrace_generator.py:63
- 2:   @__main__:<module> => miscmisc/sys_settrace_generator.py:69
+ 0:   @__main__:make_gen => sys_settrace_generator.py:44
+ 1:   @__main__:test_generator => sys_settrace_generator.py:63
+ 2:   @__main__:<module> => sys_settrace_generator.py:69
 ### trace_handler::main event: line
- 0:   @__main__:make_gen => miscmisc/sys_settrace_generator.py:45
- 1:   @__main__:test_generator => miscmisc/sys_settrace_generator.py:63
- 2:   @__main__:<module> => miscmisc/sys_settrace_generator.py:69
+ 0:   @__main__:make_gen => sys_settrace_generator.py:45
+ 1:   @__main__:test_generator => sys_settrace_generator.py:63
+ 2:   @__main__:<module> => sys_settrace_generator.py:69
 ### trace_handler::main event: return
- 0:   @__main__:make_gen => miscmisc/sys_settrace_generator.py:45
- 1:   @__main__:test_generator => miscmisc/sys_settrace_generator.py:63
- 2:   @__main__:<module> => miscmisc/sys_settrace_generator.py:69
+ 0:   @__main__:make_gen => sys_settrace_generator.py:45
+ 1:   @__main__:test_generator => sys_settrace_generator.py:63
+ 2:   @__main__:<module> => sys_settrace_generator.py:69
 ### trace_handler::main event: line
- 0:   @__main__:test_generator => miscmisc/sys_settrace_generator.py:63
- 1:   @__main__:<module> => miscmisc/sys_settrace_generator.py:69
+ 0:   @__main__:test_generator => sys_settrace_generator.py:63
+ 1:   @__main__:<module> => sys_settrace_generator.py:69
 ### trace_handler::main event: line
- 0:   @__main__:test_generator => miscmisc/sys_settrace_generator.py:64
- 1:   @__main__:<module> => miscmisc/sys_settrace_generator.py:69
+ 0:   @__main__:test_generator => sys_settrace_generator.py:64
+ 1:   @__main__:<module> => sys_settrace_generator.py:69
 ### trace_handler::main event: line
- 0:   @__main__:test_generator => miscmisc/sys_settrace_generator.py:63
- 1:   @__main__:<module> => miscmisc/sys_settrace_generator.py:69
+ 0:   @__main__:test_generator => sys_settrace_generator.py:63
+ 1:   @__main__:<module> => sys_settrace_generator.py:69
 ### trace_handler::main event: call
- 0:   @__main__:make_gen => miscmisc/sys_settrace_generator.py:45
- 1:   @__main__:test_generator => miscmisc/sys_settrace_generator.py:63
- 2:   @__main__:<module> => miscmisc/sys_settrace_generator.py:69
+ 0:   @__main__:make_gen => sys_settrace_generator.py:45
+ 1:   @__main__:test_generator => sys_settrace_generator.py:63
+ 2:   @__main__:<module> => sys_settrace_generator.py:69
 ### trace_handler::main event: line
- 0:   @__main__:make_gen => miscmisc/sys_settrace_generator.py:45
- 1:   @__main__:test_generator => miscmisc/sys_settrace_generator.py:63
- 2:   @__main__:<module> => miscmisc/sys_settrace_generator.py:69
+ 0:   @__main__:make_gen => sys_settrace_generator.py:45
+ 1:   @__main__:test_generator => sys_settrace_generator.py:63
+ 2:   @__main__:<module> => sys_settrace_generator.py:69
 ### trace_handler::main event: line
- 0:   @__main__:make_gen => miscmisc/sys_settrace_generator.py:46
- 1:   @__main__:test_generator => miscmisc/sys_settrace_generator.py:63
- 2:   @__main__:<module> => miscmisc/sys_settrace_generator.py:69
+ 0:   @__main__:make_gen => sys_settrace_generator.py:46
+ 1:   @__main__:test_generator => sys_settrace_generator.py:63
+ 2:   @__main__:<module> => sys_settrace_generator.py:69
 ### trace_handler::main event: return
- 0:   @__main__:make_gen => miscmisc/sys_settrace_generator.py:46
- 1:   @__main__:test_generator => miscmisc/sys_settrace_generator.py:63
- 2:   @__main__:<module> => miscmisc/sys_settrace_generator.py:69
+ 0:   @__main__:make_gen => sys_settrace_generator.py:46
+ 1:   @__main__:test_generator => sys_settrace_generator.py:63
+ 2:   @__main__:<module> => sys_settrace_generator.py:69
 ### trace_handler::main event: line
- 0:   @__main__:test_generator => miscmisc/sys_settrace_generator.py:65
- 1:   @__main__:<module> => miscmisc/sys_settrace_generator.py:69
+ 0:   @__main__:test_generator => sys_settrace_generator.py:65
+ 1:   @__main__:<module> => sys_settrace_generator.py:69
 7
 ### trace_handler::main event: return
- 0:   @__main__:test_generator => miscmisc/sys_settrace_generator.py:65
- 1:   @__main__:<module> => miscmisc/sys_settrace_generator.py:69
+ 0:   @__main__:test_generator => sys_settrace_generator.py:65
+ 1:   @__main__:<module> => sys_settrace_generator.py:69
 Total traces executed:  54
diff --git a/tests/misc/sys_settrace_loop.py b/tests/misc/sys_settrace_loop.py
index 06d0dc17bf77b..1186bd91a0726 100644
--- a/tests/misc/sys_settrace_loop.py
+++ b/tests/misc/sys_settrace_loop.py
@@ -17,8 +17,8 @@ def print_stacktrace(frame, level=0):
             "  ",
             frame.f_globals["__name__"],
             frame.f_code.co_name,
-            # reduce full path to some pseudo-relative
-            "misc" + "".join(frame.f_code.co_filename.split("tests/misc")[-1:]),
+            # Keep just the filename.
+            "sys_settrace_" + frame.f_code.co_filename.split("sys_settrace_")[-1],
             frame.f_lineno,
         )
     )
diff --git a/tests/misc/sys_settrace_loop.py.exp b/tests/misc/sys_settrace_loop.py.exp
index f56f98fae01f3..ff9ef577c550c 100644
--- a/tests/misc/sys_settrace_loop.py.exp
+++ b/tests/misc/sys_settrace_loop.py.exp
@@ -1,72 +1,72 @@
 ### trace_handler::main event: call
- 0:   @__main__:test_loop => miscmisc/sys_settrace_loop.py:41
- 1:   @__main__:<module> => miscmisc/sys_settrace_loop.py:58
+ 0:   @__main__:test_loop => sys_settrace_loop.py:41
+ 1:   @__main__:<module> => sys_settrace_loop.py:58
 ### trace_handler::main event: line
- 0:   @__main__:test_loop => miscmisc/sys_settrace_loop.py:43
- 1:   @__main__:<module> => miscmisc/sys_settrace_loop.py:58
+ 0:   @__main__:test_loop => sys_settrace_loop.py:43
+ 1:   @__main__:<module> => sys_settrace_loop.py:58
 ### trace_handler::main event: line
- 0:   @__main__:test_loop => miscmisc/sys_settrace_loop.py:44
- 1:   @__main__:<module> => miscmisc/sys_settrace_loop.py:58
+ 0:   @__main__:test_loop => sys_settrace_loop.py:44
+ 1:   @__main__:<module> => sys_settrace_loop.py:58
 ### trace_handler::main event: line
- 0:   @__main__:test_loop => miscmisc/sys_settrace_loop.py:45
- 1:   @__main__:<module> => miscmisc/sys_settrace_loop.py:58
+ 0:   @__main__:test_loop => sys_settrace_loop.py:45
+ 1:   @__main__:<module> => sys_settrace_loop.py:58
 ### trace_handler::main event: line
- 0:   @__main__:test_loop => miscmisc/sys_settrace_loop.py:44
- 1:   @__main__:<module> => miscmisc/sys_settrace_loop.py:58
+ 0:   @__main__:test_loop => sys_settrace_loop.py:44
+ 1:   @__main__:<module> => sys_settrace_loop.py:58
 ### trace_handler::main event: line
- 0:   @__main__:test_loop => miscmisc/sys_settrace_loop.py:45
- 1:   @__main__:<module> => miscmisc/sys_settrace_loop.py:58
+ 0:   @__main__:test_loop => sys_settrace_loop.py:45
+ 1:   @__main__:<module> => sys_settrace_loop.py:58
 ### trace_handler::main event: line
- 0:   @__main__:test_loop => miscmisc/sys_settrace_loop.py:44
- 1:   @__main__:<module> => miscmisc/sys_settrace_loop.py:58
+ 0:   @__main__:test_loop => sys_settrace_loop.py:44
+ 1:   @__main__:<module> => sys_settrace_loop.py:58
 ### trace_handler::main event: line
- 0:   @__main__:test_loop => miscmisc/sys_settrace_loop.py:45
- 1:   @__main__:<module> => miscmisc/sys_settrace_loop.py:58
+ 0:   @__main__:test_loop => sys_settrace_loop.py:45
+ 1:   @__main__:<module> => sys_settrace_loop.py:58
 ### trace_handler::main event: line
- 0:   @__main__:test_loop => miscmisc/sys_settrace_loop.py:44
- 1:   @__main__:<module> => miscmisc/sys_settrace_loop.py:58
+ 0:   @__main__:test_loop => sys_settrace_loop.py:44
+ 1:   @__main__:<module> => sys_settrace_loop.py:58
 ### trace_handler::main event: line
- 0:   @__main__:test_loop => miscmisc/sys_settrace_loop.py:45
- 1:   @__main__:<module> => miscmisc/sys_settrace_loop.py:58
+ 0:   @__main__:test_loop => sys_settrace_loop.py:45
+ 1:   @__main__:<module> => sys_settrace_loop.py:58
 ### trace_handler::main event: line
- 0:   @__main__:test_loop => miscmisc/sys_settrace_loop.py:46
- 1:   @__main__:<module> => miscmisc/sys_settrace_loop.py:58
+ 0:   @__main__:test_loop => sys_settrace_loop.py:46
+ 1:   @__main__:<module> => sys_settrace_loop.py:58
 test_for_loop 3
 ### trace_handler::main event: line
- 0:   @__main__:test_loop => miscmisc/sys_settrace_loop.py:49
- 1:   @__main__:<module> => miscmisc/sys_settrace_loop.py:58
+ 0:   @__main__:test_loop => sys_settrace_loop.py:49
+ 1:   @__main__:<module> => sys_settrace_loop.py:58
 ### trace_handler::main event: line
- 0:   @__main__:test_loop => miscmisc/sys_settrace_loop.py:50
- 1:   @__main__:<module> => miscmisc/sys_settrace_loop.py:58
+ 0:   @__main__:test_loop => sys_settrace_loop.py:50
+ 1:   @__main__:<module> => sys_settrace_loop.py:58
 ### trace_handler::main event: line
- 0:   @__main__:test_loop => miscmisc/sys_settrace_loop.py:51
- 1:   @__main__:<module> => miscmisc/sys_settrace_loop.py:58
+ 0:   @__main__:test_loop => sys_settrace_loop.py:51
+ 1:   @__main__:<module> => sys_settrace_loop.py:58
 ### trace_handler::main event: line
- 0:   @__main__:test_loop => miscmisc/sys_settrace_loop.py:53
- 1:   @__main__:<module> => miscmisc/sys_settrace_loop.py:58
+ 0:   @__main__:test_loop => sys_settrace_loop.py:53
+ 1:   @__main__:<module> => sys_settrace_loop.py:58
 ### trace_handler::main event: line
- 0:   @__main__:test_loop => miscmisc/sys_settrace_loop.py:52
- 1:   @__main__:<module> => miscmisc/sys_settrace_loop.py:58
+ 0:   @__main__:test_loop => sys_settrace_loop.py:52
+ 1:   @__main__:<module> => sys_settrace_loop.py:58
 ### trace_handler::main event: line
- 0:   @__main__:test_loop => miscmisc/sys_settrace_loop.py:53
- 1:   @__main__:<module> => miscmisc/sys_settrace_loop.py:58
+ 0:   @__main__:test_loop => sys_settrace_loop.py:53
+ 1:   @__main__:<module> => sys_settrace_loop.py:58
 ### trace_handler::main event: line
- 0:   @__main__:test_loop => miscmisc/sys_settrace_loop.py:52
- 1:   @__main__:<module> => miscmisc/sys_settrace_loop.py:58
+ 0:   @__main__:test_loop => sys_settrace_loop.py:52
+ 1:   @__main__:<module> => sys_settrace_loop.py:58
 ### trace_handler::main event: line
- 0:   @__main__:test_loop => miscmisc/sys_settrace_loop.py:53
- 1:   @__main__:<module> => miscmisc/sys_settrace_loop.py:58
+ 0:   @__main__:test_loop => sys_settrace_loop.py:53
+ 1:   @__main__:<module> => sys_settrace_loop.py:58
 ### trace_handler::main event: line
- 0:   @__main__:test_loop => miscmisc/sys_settrace_loop.py:52
- 1:   @__main__:<module> => miscmisc/sys_settrace_loop.py:58
+ 0:   @__main__:test_loop => sys_settrace_loop.py:52
+ 1:   @__main__:<module> => sys_settrace_loop.py:58
 ### trace_handler::main event: line
- 0:   @__main__:test_loop => miscmisc/sys_settrace_loop.py:53
- 1:   @__main__:<module> => miscmisc/sys_settrace_loop.py:58
+ 0:   @__main__:test_loop => sys_settrace_loop.py:53
+ 1:   @__main__:<module> => sys_settrace_loop.py:58
 ### trace_handler::main event: line
- 0:   @__main__:test_loop => miscmisc/sys_settrace_loop.py:54
- 1:   @__main__:<module> => miscmisc/sys_settrace_loop.py:58
+ 0:   @__main__:test_loop => sys_settrace_loop.py:54
+ 1:   @__main__:<module> => sys_settrace_loop.py:58
 test_while_loop 3
 ### trace_handler::main event: return
- 0:   @__main__:test_loop => miscmisc/sys_settrace_loop.py:54
- 1:   @__main__:<module> => miscmisc/sys_settrace_loop.py:58
+ 0:   @__main__:test_loop => sys_settrace_loop.py:54
+ 1:   @__main__:<module> => sys_settrace_loop.py:58
 Total traces executed:  23
diff --git a/tests/misc/sys_settrace_subdir/trace_generic.py b/tests/misc/sys_settrace_subdir/sys_settrace_generic.py
similarity index 91%
rename from tests/misc/sys_settrace_subdir/trace_generic.py
rename to tests/misc/sys_settrace_subdir/sys_settrace_generic.py
index 111a9d19ff30d..a60ca955d7c7c 100644
--- a/tests/misc/sys_settrace_subdir/trace_generic.py
+++ b/tests/misc/sys_settrace_subdir/sys_settrace_generic.py
@@ -41,10 +41,10 @@ def test_lambda():
 
 # import
 def test_import():
-    from sys_settrace_subdir import trace_importme
+    from sys_settrace_subdir import sys_settrace_importme
 
-    trace_importme.dummy()
-    trace_importme.saysomething()
+    sys_settrace_importme.dummy()
+    sys_settrace_importme.saysomething()
 
 
 # class
diff --git a/tests/misc/sys_settrace_subdir/trace_importme.py b/tests/misc/sys_settrace_subdir/sys_settrace_importme.py
similarity index 100%
rename from tests/misc/sys_settrace_subdir/trace_importme.py
rename to tests/misc/sys_settrace_subdir/sys_settrace_importme.py

From 069557edef84a4f37ad52ae93838129da8e5fe77 Mon Sep 17 00:00:00 2001
From: stijn <stijn@ignitron.net>
Date: Tue, 15 Dec 2020 12:03:42 +0100
Subject: [PATCH 0503/3533] tests/misc/sys_settrace_features.py: Fix running
 with non-dflt encoding.

Notably git-cmd which comes with git installations on Windows alters the
encoding resulting in CPython tracing encodings/cp1252.py calls.
---
 tests/misc/sys_settrace_features.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/misc/sys_settrace_features.py b/tests/misc/sys_settrace_features.py
index e1b1a059dad6f..8a38b7534f7df 100644
--- a/tests/misc/sys_settrace_features.py
+++ b/tests/misc/sys_settrace_features.py
@@ -60,8 +60,9 @@ def trace_tick_handler_bob(frame, event, arg):
 
 def trace_tick_handler(frame, event, arg):
     # Ignore CPython specific helpers.
+    to_ignore = ["importlib", "zipimport", "encodings"]
     frame_name = frame.f_globals["__name__"]
-    if frame_name.find("importlib") != -1 or frame_name.find("zipimport") != -1:
+    if any(name in frame_name for name in to_ignore):
         return
 
     print("### trace_handler::main event:", event)

From f42a190247661e1e5aa18e0ce93c627fd7676d8e Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Mon, 21 Dec 2020 17:31:12 +1100
Subject: [PATCH 0504/3533] extmod/nimble: Reset NimBLE BSS in
 mp_bluetooth_init.

Without this fix, each time service registration happened it would do an
increasingly large malloc() for service state.

See https://github.com/apache/mynewt-nimble/issues/896.
---
 extmod/nimble/modbluetooth_nimble.c | 35 ++++++++++++++++++++++++-----
 1 file changed, 29 insertions(+), 6 deletions(-)

diff --git a/extmod/nimble/modbluetooth_nimble.c b/extmod/nimble/modbluetooth_nimble.c
index 613e325a953f5..843886d009d12 100644
--- a/extmod/nimble/modbluetooth_nimble.c
+++ b/extmod/nimble/modbluetooth_nimble.c
@@ -476,11 +476,27 @@ void mp_bluetooth_nimble_port_shutdown(void) {
 
 #endif // !MICROPY_BLUETOOTH_NIMBLE_BINDINGS_ONLY
 
+void nimble_reset_gatts_bss(void) {
+    // NimBLE assumes that service registration only ever happens once, so
+    // we need to reset service registration state from a previous stack startup.
+    // These variables are defined in ble_hs.c and are only ever incremented
+    // (during service registration) and never reset.
+    // See https://github.com/apache/mynewt-nimble/issues/896
+    extern uint16_t ble_hs_max_attrs;
+    extern uint16_t ble_hs_max_services;
+    extern uint16_t ble_hs_max_client_configs;
+    ble_hs_max_attrs = 0;
+    ble_hs_max_services = 0;
+    ble_hs_max_client_configs = 0;
+}
+
 int mp_bluetooth_init(void) {
     DEBUG_printf("mp_bluetooth_init\n");
     // Clean up if necessary.
     mp_bluetooth_deinit();
 
+    nimble_reset_gatts_bss();
+
     mp_bluetooth_nimble_ble_state = MP_BLUETOOTH_NIMBLE_BLE_STATE_STARTING;
 
     ble_hs_cfg.reset_cb = reset_cb;
@@ -775,6 +791,15 @@ int mp_bluetooth_gatts_register_service_begin(bool append) {
     if (!mp_bluetooth_is_active()) {
         return ERRNO_BLUETOOTH_NOT_ACTIVE;
     }
+
+    if (append) {
+        // Don't support append yet (modbluetooth.c doesn't support it yet anyway).
+        // TODO: This should be possible with NimBLE.
+        return MP_EOPNOTSUPP;
+    }
+
+    nimble_reset_gatts_bss();
+
     int ret = ble_gatts_reset();
     if (ret != 0) {
         return ble_hs_err_to_errno(ret);
@@ -787,13 +812,11 @@ int mp_bluetooth_gatts_register_service_begin(bool append) {
     ble_svc_gap_init();
     ble_svc_gatt_init();
 
-    if (!append) {
-        // Unref any previous service definitions.
-        for (size_t i = 0; i < MP_STATE_PORT(bluetooth_nimble_root_pointers)->n_services; ++i) {
-            MP_STATE_PORT(bluetooth_nimble_root_pointers)->services[i] = NULL;
-        }
-        MP_STATE_PORT(bluetooth_nimble_root_pointers)->n_services = 0;
+    // Unref any previous service definitions.
+    for (size_t i = 0; i < MP_STATE_PORT(bluetooth_nimble_root_pointers)->n_services; ++i) {
+        MP_STATE_PORT(bluetooth_nimble_root_pointers)->services[i] = NULL;
     }
+    MP_STATE_PORT(bluetooth_nimble_root_pointers)->n_services = 0;
 
     return 0;
 }

From f7aafc0628f2008d015b32b0c0253a13f748d436 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Tue, 22 Dec 2020 13:06:16 +1100
Subject: [PATCH 0505/3533] extmod/nimble: Don't assert on save-IRK failure.

---
 extmod/nimble/modbluetooth_nimble.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/extmod/nimble/modbluetooth_nimble.c b/extmod/nimble/modbluetooth_nimble.c
index 843886d009d12..9ceeab7d7b6c6 100644
--- a/extmod/nimble/modbluetooth_nimble.c
+++ b/extmod/nimble/modbluetooth_nimble.c
@@ -227,7 +227,9 @@ STATIC int load_irk(void) {
         }
         DEBUG_printf("load_irk: Saving new IRK.\n");
         if (!mp_bluetooth_gap_on_set_secret(SECRET_TYPE_OUR_IRK, key, sizeof(key), rand_irk, 16)) {
-            return BLE_HS_EINVAL;
+            // Code that doesn't implement pairing/bonding won't support set/get secret.
+            // So they'll just get the default fixed IRK.
+            return 0;
         }
         DEBUG_printf("load_irk: Applying new IRK.\n");
         rc = ble_hs_pvcy_set_our_irk(rand_irk);

From 0ce69486534eca545e5a86f9696047956b5c874e Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 15 Jan 2021 14:56:57 +1100
Subject: [PATCH 0506/3533] lib/libhydrogen: Add new libhydrogen submodule.

This library is a small and easy-to-use cryptographic library which is well
suited to embedded systems.

Signed-off-by: Damien George <damien@micropython.org>
---
 .gitmodules     | 3 +++
 lib/libhydrogen | 1 +
 2 files changed, 4 insertions(+)
 create mode 160000 lib/libhydrogen

diff --git a/.gitmodules b/.gitmodules
index c152e9e7747fa..f4785955af41b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -36,3 +36,6 @@
 [submodule "lib/nxp_driver"]
 	path = lib/nxp_driver
 	url = https://github.com/hathach/nxp_driver.git
+[submodule "lib/libhydrogen"]
+	path = lib/libhydrogen
+	url = https://github.com/jedisct1/libhydrogen.git
diff --git a/lib/libhydrogen b/lib/libhydrogen
new file mode 160000
index 0000000000000..5c5d513093075
--- /dev/null
+++ b/lib/libhydrogen
@@ -0,0 +1 @@
+Subproject commit 5c5d513093075f7245ea522101b17c50aa579af2

From 09e67de32739c032bf357e253ae5a783bd41dd7b Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 15 Jan 2021 02:55:40 +1100
Subject: [PATCH 0507/3533] stm32/mboot/gzstream: Fix lost data decompressing
 final part of file.

Prior to this fix, the final piece of data in a compressed file may have
been lost when decompressing.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/mboot/gzstream.c | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/ports/stm32/mboot/gzstream.c b/ports/stm32/mboot/gzstream.c
index 20ba33045f8d8..4f8a4a40cc2dc 100644
--- a/ports/stm32/mboot/gzstream.c
+++ b/ports/stm32/mboot/gzstream.c
@@ -38,7 +38,7 @@
 typedef struct _gz_stream_t {
     void *stream_data;
     stream_read_t stream_read;
-    TINF_DATA tinf;
+    struct uzlib_uncomp tinf;
     uint8_t buf[512];
     uint8_t dict[DICT_SIZE];
 } gz_stream_t;
@@ -66,7 +66,7 @@ int gz_stream_init(void *stream_data, stream_read_t stream_read) {
     gz_stream.stream_read = stream_read;
 
     memset(&gz_stream.tinf, 0, sizeof(gz_stream.tinf));
-    gz_stream.tinf.readSource = gz_stream_read_src;
+    gz_stream.tinf.source_read_cb = gz_stream_read_src;
 
     int st = uzlib_gzip_parse_header(&gz_stream.tinf);
     if (st != TINF_OK) {
@@ -79,15 +79,21 @@ int gz_stream_init(void *stream_data, stream_read_t stream_read) {
 }
 
 int gz_stream_read(size_t len, uint8_t *buf) {
+    if (gz_stream.tinf.source == NULL && gz_stream.tinf.source_read_cb == NULL) {
+        // End of stream.
+        return 0;
+    }
     gz_stream.tinf.dest = buf;
     gz_stream.tinf.dest_limit = buf + len;
     int st = uzlib_uncompress_chksum(&gz_stream.tinf);
-    if (st == TINF_DONE) {
-        return 0;
-    }
     if (st < 0) {
         return st;
     }
+    if (st == TINF_DONE) {
+        // Indicate end-of-stream for subsequent calls.
+        gz_stream.tinf.source = NULL;
+        gz_stream.tinf.source_read_cb = NULL;
+    }
     return gz_stream.tinf.dest - buf;
 }
 

From c6f334272a34e007462347f067013944e57bfe33 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 15 Jan 2021 03:00:40 +1100
Subject: [PATCH 0508/3533] stm32/mboot: Add support for signed and encrypted
 firmware updates.

This commit adds support to stm32's mboot for signe, encrypted and
compressed DFU updates.  It is based on inital work done by Andrew Leech.

The feature is enabled by setting MBOOT_ENABLE_PACKING to 1 in the board's
mpconfigboard.mk file, and by providing a header file in the board folder
(usually called mboot_keys.h) with a set of signing and encryption keys
(which can be generated by mboot_pack_dfu.py).  The signing and encryption
is provided by libhydrogen.  Compression is provided by uzlib.  Enabling
packing costs about 3k of flash.

The included mboot_pack_dfu.py script converts a .dfu file to a .pack.dfu
file which can be subsequently deployed to a board with mboot in packing
mode.  This .pack.dfu file is created as follows:
- the firmware from the original .dfu is split into chunks (so the
  decryption can fit in RAM)
- each chunk is compressed, encrypted, a header added, then signed
- a special final chunk is added with a signature of the entire firmware
- all chunks are concatenated to make the final .pack.dfu file

The .pack.dfu file can be deployed over USB or from the internal filesystem
on the device (if MBOOT_FSLOAD is enabled).

See #5267 and #5309 for additional discussion.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/Makefile                |  24 ++-
 ports/stm32/mboot/Makefile          |  16 ++
 ports/stm32/mboot/Particle.h        |  10 +
 ports/stm32/mboot/README.md         |  28 +++
 ports/stm32/mboot/dfu.h             |  10 +-
 ports/stm32/mboot/fsload.c          |  45 ++++-
 ports/stm32/mboot/fwupdate.py       |   7 +-
 ports/stm32/mboot/gzstream.c        |  16 +-
 ports/stm32/mboot/gzstream.h        |   3 +-
 ports/stm32/mboot/main.c            |  68 ++++++-
 ports/stm32/mboot/mboot.h           |   7 +
 ports/stm32/mboot/mboot_pack_dfu.py | 260 +++++++++++++++++++++++++
 ports/stm32/mboot/pack.c            | 282 ++++++++++++++++++++++++++++
 ports/stm32/mboot/pack.h            |  82 ++++++++
 ports/stm32/mboot/stm32_generic.ld  |   4 +-
 ports/stm32/mboot/vfs_fat.c         |   2 +-
 ports/stm32/mboot/vfs_lfs.c         |   4 +-
 ports/stm32/mpconfigport.mk         |   7 +-
 18 files changed, 844 insertions(+), 31 deletions(-)
 create mode 100644 ports/stm32/mboot/Particle.h
 create mode 100644 ports/stm32/mboot/mboot_pack_dfu.py
 create mode 100644 ports/stm32/mboot/pack.c
 create mode 100644 ports/stm32/mboot/pack.h

diff --git a/ports/stm32/Makefile b/ports/stm32/Makefile
index a9dac03d2c021..d8c9772b26eda 100644
--- a/ports/stm32/Makefile
+++ b/ports/stm32/Makefile
@@ -30,7 +30,7 @@ FROZEN_MANIFEST ?= boards/manifest.py
 # include py core make definitions
 include $(TOP)/py/py.mk
 
-GIT_SUBMODULES = lib/lwip lib/mbedtls lib/mynewt-nimble lib/stm32lib
+GIT_SUBMODULES = lib/libhydrogen lib/lwip lib/mbedtls lib/mynewt-nimble lib/stm32lib
 
 MCU_SERIES_UPPER = $(shell echo $(MCU_SERIES) | tr '[:lower:]' '[:upper:]')
 CMSIS_MCU_LOWER = $(shell echo $(CMSIS_MCU) | tr '[:upper:]' '[:lower:]')
@@ -41,6 +41,7 @@ HAL_DIR=lib/stm32lib/STM32$(MCU_SERIES_UPPER)xx_HAL_Driver
 USBDEV_DIR=usbdev
 #USBHOST_DIR=usbhost
 DFU=$(TOP)/tools/dfu.py
+MBOOT_PACK_DFU = mboot/mboot_pack_dfu.py
 # may need to prefix dfu-util with sudo
 USE_PYDFU ?= 1
 PYDFU ?= $(TOP)/tools/pydfu.py
@@ -546,7 +547,13 @@ $(PY_BUILD)/formatfloat.o: COPT += -Os
 $(PY_BUILD)/parsenum.o: COPT += -Os
 $(PY_BUILD)/mpprint.o: COPT += -Os
 
-all: $(TOP)/lib/stm32lib/README.md $(BUILD)/firmware.dfu $(BUILD)/firmware.hex
+all: $(TOP)/lib/stm32lib/README.md all_main $(BUILD)/firmware.hex
+
+ifeq ($(MBOOT_ENABLE_PACKING),1)
+all_main: $(BUILD)/firmware.pack.dfu
+else
+all_main: $(BUILD)/firmware.dfu
+endif
 
 # For convenience, automatically fetch required submodules if they don't exist
 $(TOP)/lib/stm32lib/README.md:
@@ -607,6 +614,11 @@ define GENERATE_DFU
 	$(1)
 endef
 
+define GENERATE_PACK_DFU
+	$(ECHO) "GEN $(1)"
+	$(Q)$(PYTHON) $(MBOOT_PACK_DFU) --keys $(MBOOT_PACK_KEYS_FILE) pack-dfu --gzip $(MBOOT_PACK_CHUNKSIZE) $(2) $(1)
+endef
+
 define GENERATE_HEX
 	$(ECHO) "GEN $(1)"
 	$(Q)$(OBJCOPY) -O ihex $(2) $(1)
@@ -614,8 +626,13 @@ endef
 
 .PHONY: deploy deploy-stlink deploy-openocd
 
+ifeq ($(MBOOT_ENABLE_PACKING),1)
+deploy: $(BUILD)/firmware.pack.dfu
+	$(call RUN_DFU,$^)
+else
 deploy: $(BUILD)/firmware.dfu
 	$(call RUN_DFU,$^)
+endif
 
 # A board should specify TEXT0_ADDR if to use a different location than the
 # default for the firmware memory location.  A board can also optionally define
@@ -662,6 +679,9 @@ $(BUILD)/firmware.dfu: $(BUILD)/firmware0.bin $(BUILD)/firmware1.bin
 	$(call GENERATE_DFU,$@,$(word 1,$^),$(TEXT0_ADDR),$(word 2,$^),$(TEXT1_ADDR))
 endif
 
+$(BUILD)/firmware.pack.dfu: $(BUILD)/firmware.dfu $(BOARD_DIR)/mboot_keys.h
+	$(call GENERATE_PACK_DFU,$@,$<)
+
 $(BUILD)/firmware.hex: $(BUILD)/firmware.elf
 	$(call GENERATE_HEX,$@,$^)
 
diff --git a/ports/stm32/mboot/Makefile b/ports/stm32/mboot/Makefile
index 44372b0e8a4ae..ad2fda3eee508 100755
--- a/ports/stm32/mboot/Makefile
+++ b/ports/stm32/mboot/Makefile
@@ -12,6 +12,12 @@ BOARD_DIR ?= $(abspath ../boards/$(BOARD))
 # that can be built with or without mboot.
 USE_MBOOT ?= 1
 
+# Set MBOOT_ENABLE_PACKING to 1 to enable DFU packing with encryption and signing.
+# Ensure the MBOOT_PACK_xxx values match stm32/Makefile, to build matching application firmware.
+MBOOT_ENABLE_PACKING ?= 0
+MBOOT_PACK_CHUNKSIZE ?= 16384
+MBOOT_PACK_KEYS_FILE ?= $(BOARD_DIR)/mboot_keys.h
+
 # Sanity check that the board configuration directory exists
 ifeq ($(wildcard $(BOARD_DIR)/.),)
 $(error Invalid BOARD specified: $(BOARD_DIR))
@@ -110,6 +116,7 @@ SRC_C = \
 	elem.c \
 	fsload.c \
 	gzstream.c \
+	pack.c \
 	vfs_fat.c \
 	vfs_lfs.c \
 	drivers/bus/softspi.c \
@@ -129,6 +136,15 @@ SRC_O = \
 	$(SYSTEM_FILE) \
 	ports/stm32/resethandler.o \
 
+ifeq ($(MBOOT_ENABLE_PACKING), 1)
+
+SRC_C += lib/libhydrogen/hydrogen.c
+
+CFLAGS += -DMBOOT_ENABLE_PACKING=1 -DPARTICLE -DPLATFORM_ID=3
+CFLAGS += -DMBOOT_PACK_CHUNKSIZE=$(MBOOT_PACK_CHUNKSIZE)
+CFLAGS += -DMBOOT_PACK_KEYS_FILE=\"$(MBOOT_PACK_KEYS_FILE)\"
+endif
+
 $(BUILD)/$(HAL_DIR)/Src/stm32$(MCU_SERIES)xx_ll_usb.o: CFLAGS += -Wno-attributes
 SRC_HAL = $(addprefix $(HAL_DIR)/Src/stm32$(MCU_SERIES)xx_,\
 	hal_cortex.c \
diff --git a/ports/stm32/mboot/Particle.h b/ports/stm32/mboot/Particle.h
new file mode 100644
index 0000000000000..5e0953739a7af
--- /dev/null
+++ b/ports/stm32/mboot/Particle.h
@@ -0,0 +1,10 @@
+// Header for libhydrogen use only.  Act like a Particle board for the random
+// implementation.  This code is not actually called when just decrypting and
+// verifying a signature, but a correct implementation is provided anyway.
+
+#include "py/mphal.h"
+#include "rng.h"
+
+static inline uint32_t HAL_RNG_GetRandomNumber(void) {
+    return rng_get();
+}
diff --git a/ports/stm32/mboot/README.md b/ports/stm32/mboot/README.md
index d8aa6d456f19e..59213eb615141 100644
--- a/ports/stm32/mboot/README.md
+++ b/ports/stm32/mboot/README.md
@@ -155,6 +155,34 @@ firmware.dfu.gz stored on the default FAT filesystem:
 The 0x80000000 value is the address understood by Mboot as the location of
 the external SPI flash, configured via `MBOOT_SPIFLASH_ADDR`.
 
+Signed and encrypted DFU support
+--------------------------------
+
+Mboot optionally supports signing and encrypting the binary firmware in the DFU file.
+In general this is refered to as a packed DFU file.  This requires additional settings
+in the board config and requires the `pyhy` Python module to be installed for `python3`
+to be used when building packed firmware, eg:
+
+    $ pip3 install pyhy
+
+In addition to the changes made to mpconfigboard.mk earlier, for encrypted
+support you also need to add:
+
+    MBOOT_ENABLE_PACKING = 1
+
+You will also need to generate signing and encryption keys which will be built into
+mboot and used for all subsequent installations of firmware.  This can be done via:
+
+    $ python3 ports/stm32/mboot/mboot_pack_dfu.py generate-keys
+
+This command generates a `mboot_keys.h` file which should be stored in the board
+definition folder (next to mpconfigboard.mk).
+
+Once you build the firmware, the `firmware.pack.dfu` file will contain the encrypted
+and signed firmware, and can be deployed via USB DFU, or by copying it to the device's
+internal filesystem (if `MBOOT_FSLOAD` is enabled). `firmware.dfu` is still unencrypted
+and can be directly flashed with jtag etc.
+
 Example: Mboot on PYBv1.x
 -------------------------
 
diff --git a/ports/stm32/mboot/dfu.h b/ports/stm32/mboot/dfu.h
index a1d4d10d0ef90..73db3545d8d55 100644
--- a/ports/stm32/mboot/dfu.h
+++ b/ports/stm32/mboot/dfu.h
@@ -39,6 +39,14 @@
 #define MBOOT_ERROR_STR_INVALID_ADDRESS_IDX 0x11
 #define MBOOT_ERROR_STR_INVALID_ADDRESS "Address out of range"
 
+#if MBOOT_ENABLE_PACKING
+#define MBOOT_ERROR_STR_INVALID_SIG_IDX 0x12
+#define MBOOT_ERROR_STR_INVALID_SIG "Invalid signature in file"
+
+#define MBOOT_ERROR_STR_INVALID_READ_IDX 0x13
+#define MBOOT_ERROR_STR_INVALID_READ "Read support disabled on encrypted bootloader"
+#endif
+
 // DFU class requests
 enum {
     DFU_DETACH = 0,
@@ -104,6 +112,6 @@ typedef struct _dfu_state_t {
     uint8_t buf[DFU_XFER_SIZE] __attribute__((aligned(4)));
 } dfu_context_t;
 
-static dfu_context_t dfu_context SECTION_NOZERO_BSS;
+extern dfu_context_t dfu_context;
 
 #endif // MICROPY_INCLUDED_STM32_MBOOT_DFU_H
diff --git a/ports/stm32/mboot/fsload.c b/ports/stm32/mboot/fsload.c
index 1e1ad7a04d015..591b670aa00c2 100644
--- a/ports/stm32/mboot/fsload.c
+++ b/ports/stm32/mboot/fsload.c
@@ -28,6 +28,7 @@
 
 #include "py/mphal.h"
 #include "mboot.h"
+#include "pack.h"
 #include "vfs.h"
 
 #if MBOOT_FSLOAD
@@ -36,13 +37,43 @@
 #error Must enable at least one VFS component
 #endif
 
+#if MBOOT_ENABLE_PACKING
+// Packed DFU files are gzip'd internally, not on the outside, so reads of the file
+// just read the file directly.
+
+static void *input_stream_data;
+static stream_read_t input_stream_read_meth;
+
+static inline int input_stream_init(void *stream_data, stream_read_t stream_read) {
+    input_stream_data = stream_data;
+    input_stream_read_meth = stream_read;
+    return 0;
+}
+
+static inline int input_stream_read(size_t len, uint8_t *buf) {
+    return input_stream_read_meth(input_stream_data, buf, len);
+}
+
+#else
+// Standard (non-packed) DFU files must be gzip'd externally / on the outside, so
+// reads of the file go through gz_stream.
+
+static inline int input_stream_init(void *stream_data, stream_read_t stream_read) {
+    return gz_stream_init_from_stream(stream_data, stream_read);
+}
+
+static inline int input_stream_read(size_t len, uint8_t *buf) {
+    return gz_stream_read(len, buf);
+}
+#endif
+
 static int fsload_program_file(bool write_to_flash) {
     // Parse DFU
     uint8_t buf[512];
     size_t file_offset;
 
     // Read file header, <5sBIB
-    int res = gz_stream_read(11, buf);
+    int res = input_stream_read(11, buf);
     if (res != 11) {
         return -1;
     }
@@ -62,7 +93,7 @@ static int fsload_program_file(bool write_to_flash) {
     uint32_t total_size = get_le32(buf + 6);
 
     // Read target header, <6sBi255sII
-    res = gz_stream_read(274, buf);
+    res = input_stream_read(274, buf);
     if (res != 274) {
         return -1;
     }
@@ -82,7 +113,7 @@ static int fsload_program_file(bool write_to_flash) {
     // Parse each element
     for (size_t elem = 0; elem < num_elems; ++elem) {
         // Read element header, <II
-        res = gz_stream_read(8, buf);
+        res = input_stream_read(8, buf);
         if (res != 8) {
             return -1;
         }
@@ -92,6 +123,7 @@ static int fsload_program_file(bool write_to_flash) {
         uint32_t elem_addr = get_le32(buf);
         uint32_t elem_size = get_le32(buf + 4);
 
+        #if !MBOOT_ENABLE_PACKING
         // Erase flash before writing
         if (write_to_flash) {
             uint32_t addr = elem_addr;
@@ -102,6 +134,7 @@ static int fsload_program_file(bool write_to_flash) {
                 }
             }
         }
+        #endif
 
         // Read element data and possibly write to flash
         for (uint32_t s = elem_size; s;) {
@@ -109,7 +142,7 @@ static int fsload_program_file(bool write_to_flash) {
             if (l > sizeof(buf)) {
                 l = sizeof(buf);
             }
-            res = gz_stream_read(l, buf);
+            res = input_stream_read(l, buf);
             if (res != l) {
                 return -1;
             }
@@ -135,7 +168,7 @@ static int fsload_program_file(bool write_to_flash) {
     }
 
     // Read trailing info
-    res = gz_stream_read(16, buf);
+    res = input_stream_read(16, buf);
     if (res != 16) {
         return -1;
     }
@@ -151,7 +184,7 @@ static int fsload_validate_and_program_file(void *stream, const stream_methods_t
         led_state_all(pass == 0 ? 2 : 4);
         int res = meth->open(stream, fname);
         if (res == 0) {
-            res = gz_stream_init(stream, meth->read);
+            res = input_stream_init(stream, meth->read);
             if (res == 0) {
                 res = fsload_program_file(pass == 0 ? false : true);
             }
diff --git a/ports/stm32/mboot/fwupdate.py b/ports/stm32/mboot/fwupdate.py
index dab5fa6632e99..65284a6ac0461 100644
--- a/ports/stm32/mboot/fwupdate.py
+++ b/ports/stm32/mboot/fwupdate.py
@@ -157,14 +157,15 @@ def update_mboot(filename):
 
 
 def update_mpy(filename, fs_base, fs_len, fs_type=VFS_FAT):
-    # Check firmware is of .dfu.gz type
+    # Check firmware is of .dfu or .dfu.gz type
     try:
         with open(filename, "rb") as f:
             hdr = uzlib.DecompIO(f, 16 + 15).read(6)
     except Exception:
-        hdr = None
+        with open(filename, "rb") as f:
+            hdr = f.read(6)
     if hdr != b"DfuSe\x01":
-        print("Firmware must be a .dfu.gz file.")
+        print("Firmware must be a .dfu(.gz) file.")
         return
 
     ELEM_TYPE_END = 1
diff --git a/ports/stm32/mboot/gzstream.c b/ports/stm32/mboot/gzstream.c
index 4f8a4a40cc2dc..6530539f40b1a 100644
--- a/ports/stm32/mboot/gzstream.c
+++ b/ports/stm32/mboot/gzstream.c
@@ -31,7 +31,7 @@
 #include "gzstream.h"
 #include "mboot.h"
 
-#if MBOOT_FSLOAD
+#if MBOOT_FSLOAD || MBOOT_ENABLE_PACKING
 
 #define DICT_SIZE (1 << 15)
 
@@ -61,7 +61,17 @@ static int gz_stream_read_src(TINF_DATA *tinf) {
     return gz_stream.buf[0];
 }
 
-int gz_stream_init(void *stream_data, stream_read_t stream_read) {
+int gz_stream_init_from_raw_data(const uint8_t *data, size_t len) {
+    memset(&gz_stream.tinf, 0, sizeof(gz_stream.tinf));
+    gz_stream.tinf.source = data;
+    gz_stream.tinf.source_limit = data + len;
+
+    uzlib_uncompress_init(&gz_stream.tinf, gz_stream.dict, DICT_SIZE);
+
+    return 0;
+}
+
+int gz_stream_init_from_stream(void *stream_data, stream_read_t stream_read) {
     gz_stream.stream_data = stream_data;
     gz_stream.stream_read = stream_read;
 
@@ -97,4 +107,4 @@ int gz_stream_read(size_t len, uint8_t *buf) {
     return gz_stream.tinf.dest - buf;
 }
 
-#endif // MBOOT_FSLOAD
+#endif // MBOOT_FSLOAD || MBOOT_ENABLE_PACKING
diff --git a/ports/stm32/mboot/gzstream.h b/ports/stm32/mboot/gzstream.h
index ec11ba79bbb02..d3d93aa657312 100644
--- a/ports/stm32/mboot/gzstream.h
+++ b/ports/stm32/mboot/gzstream.h
@@ -39,7 +39,8 @@ typedef struct _stream_methods_t {
     stream_read_t read;
 } stream_methods_t;
 
-int gz_stream_init(void *stream_data, stream_read_t stream_read);
+int gz_stream_init_from_raw_data(const uint8_t *data, size_t len);
+int gz_stream_init_from_stream(void *stream_data, stream_read_t stream_read);
 int gz_stream_read(size_t len, uint8_t *buf);
 
 #endif // MICROPY_INCLUDED_STM32_MBOOT_GZSTREAM_H
diff --git a/ports/stm32/mboot/main.c b/ports/stm32/mboot/main.c
index 99187e3ef8406..0846d97cf365a 100644
--- a/ports/stm32/mboot/main.c
+++ b/ports/stm32/mboot/main.c
@@ -37,6 +37,7 @@
 #include "mboot.h"
 #include "powerctrl.h"
 #include "dfu.h"
+#include "pack.h"
 
 // This option selects whether to use explicit polling or IRQs for USB events.
 // In some test cases polling mode can run slightly faster, but it uses more power.
@@ -56,11 +57,17 @@
 // Configure PLL to give the desired CPU freq
 #undef MICROPY_HW_FLASH_LATENCY
 #if defined(STM32F4) || defined(STM32F7)
-#define CORE_PLL_FREQ (48000000)
-#define MICROPY_HW_FLASH_LATENCY FLASH_LATENCY_1
+  #if MBOOT_ENABLE_PACKING
+    // With encryption/signing/compression, a faster CPU makes processing much faster.
+    #define CORE_PLL_FREQ (96000000)
+    #define MICROPY_HW_FLASH_LATENCY FLASH_LATENCY_3
+  #else
+    #define CORE_PLL_FREQ (48000000)
+    #define MICROPY_HW_FLASH_LATENCY FLASH_LATENCY_1
+  #endif
 #elif defined(STM32H7)
-#define CORE_PLL_FREQ (96000000)
-#define MICROPY_HW_FLASH_LATENCY FLASH_LATENCY_2
+  #define CORE_PLL_FREQ (96000000)
+  #define MICROPY_HW_FLASH_LATENCY FLASH_LATENCY_2
 #endif
 #undef MICROPY_HW_CLK_PLLM
 #undef MICROPY_HW_CLK_PLLN
@@ -87,7 +94,8 @@
 // These bits are used to detect valid application firmware at APPLICATION_ADDR
 #define APP_VALIDITY_BITS (0x00000003)
 
-#define MP_ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0]))
+// Global dfu state
+dfu_context_t dfu_context SECTION_NOZERO_BSS;
 
 static void do_reset(void);
 
@@ -140,7 +148,7 @@ void HAL_Delay(uint32_t ms) {
     mp_hal_delay_ms(ms);
 }
 
-static void __fatal_error(const char *msg) {
+NORETURN static void __fatal_error(const char *msg) {
     NVIC_SystemReset();
     for (;;) {
     }
@@ -547,7 +555,7 @@ static int spiflash_page_erase(mp_spiflash_t *spif, uint32_t addr, uint32_t n_bl
 }
 #endif
 
-int do_page_erase(uint32_t addr, uint32_t *next_addr) {
+int hw_page_erase(uint32_t addr, uint32_t *next_addr) {
     int ret = -1;
     led0_state(LED0_STATE_ON);
 
@@ -573,7 +581,7 @@ int do_page_erase(uint32_t addr, uint32_t *next_addr) {
     return ret;
 }
 
-void do_read(uint32_t addr, int len, uint8_t *buf) {
+void hw_read(uint32_t addr, int len, uint8_t *buf) {
     led0_state(LED0_STATE_FAST_FLASH);
     #if defined(MBOOT_SPIFLASH_ADDR)
     if (MBOOT_SPIFLASH_ADDR <= addr && addr < MBOOT_SPIFLASH_ADDR + MBOOT_SPIFLASH_BYTE_SIZE) {
@@ -592,7 +600,7 @@ void do_read(uint32_t addr, int len, uint8_t *buf) {
     led0_state(LED0_STATE_SLOW_FLASH);
 }
 
-int do_write(uint32_t addr, const uint8_t *src8, size_t len) {
+int hw_write(uint32_t addr, const uint8_t *src8, size_t len) {
     int ret = -1;
     led0_state(LED0_STATE_FAST_FLASH);
     #if defined(MBOOT_SPIFLASH_ADDR)
@@ -616,6 +624,34 @@ int do_write(uint32_t addr, const uint8_t *src8, size_t len) {
     return ret;
 }
 
+int do_page_erase(uint32_t addr, uint32_t *next_addr) {
+    #if MBOOT_ENABLE_PACKING
+    // Erase handled automatically for packed mode.
+    return 0;
+    #else
+    return hw_page_erase(addr, next_addr);
+    #endif
+}
+
+void do_read(uint32_t addr, int len, uint8_t *buf) {
+    #if MBOOT_ENABLE_PACKING
+    // Read disabled on packed (encrypted) mode.
+    dfu_context.status = DFU_STATUS_ERROR_FILE;
+    dfu_context.error = MBOOT_ERROR_STR_INVALID_READ_IDX;
+    led0_state(LED0_STATE_SLOW_INVERTED_FLASH);
+    #else
+    hw_read(addr, len, buf);
+    #endif
+}
+
+int do_write(uint32_t addr, const uint8_t *src8, size_t len) {
+    #if MBOOT_ENABLE_PACKING
+    return mboot_pack_write(addr, src8, len);
+    #else
+    return hw_write(addr, src8, len);
+    #endif
+}
+
 /******************************************************************************/
 // I2C slave interface
 
@@ -1068,6 +1104,16 @@ static uint8_t *pyb_usbdd_StrDescriptor(USBD_HandleTypeDef *pdev, uint8_t idx, u
             USBD_GetString((uint8_t*)MBOOT_ERROR_STR_INVALID_ADDRESS, str_desc, length);
             return str_desc;
 
+        #if MBOOT_ENABLE_PACKING
+        case MBOOT_ERROR_STR_INVALID_SIG_IDX:
+            USBD_GetString((uint8_t*)MBOOT_ERROR_STR_INVALID_SIG, str_desc, length);
+            return str_desc;
+
+        case MBOOT_ERROR_STR_INVALID_READ_IDX:
+            USBD_GetString((uint8_t*)MBOOT_ERROR_STR_INVALID_READ, str_desc, length);
+            return str_desc;
+        #endif
+
         default:
             return NULL;
     }
@@ -1388,6 +1434,10 @@ void stm32_main(int initial_r0) {
     mp_spiflash_init(MBOOT_SPIFLASH2_SPIFLASH);
     #endif
 
+    #if MBOOT_ENABLE_PACKING
+    mboot_pack_init();
+    #endif
+
     #if MBOOT_FSLOAD
     if ((initial_r0 & 0xffffff80) == 0x70ad0080) {
         // Application passed through elements, validate then process them
diff --git a/ports/stm32/mboot/mboot.h b/ports/stm32/mboot/mboot.h
index 37929665ebe95..e4ed3cecc7f50 100644
--- a/ports/stm32/mboot/mboot.h
+++ b/ports/stm32/mboot/mboot.h
@@ -36,6 +36,9 @@
 #define ELEM_DATA_START (&_estack[0])
 #define ELEM_DATA_MAX (&_estack[ELEM_DATA_SIZE])
 
+#define NORETURN __attribute__((noreturn))
+#define MP_ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0]))
+
 enum {
     ELEM_TYPE_END = 1,
     ELEM_TYPE_MOUNT,
@@ -53,6 +56,10 @@ extern uint8_t _estack[ELEM_DATA_SIZE];
 uint32_t get_le32(const uint8_t *b);
 void led_state_all(unsigned int mask);
 
+int hw_page_erase(uint32_t addr, uint32_t *next_addr);
+void hw_read(uint32_t addr, int len, uint8_t *buf);
+int hw_write(uint32_t addr, const uint8_t *src8, size_t len);
+
 int do_page_erase(uint32_t addr, uint32_t *next_addr);
 void do_read(uint32_t addr, int len, uint8_t *buf);
 int do_write(uint32_t addr, const uint8_t *src8, size_t len);
diff --git a/ports/stm32/mboot/mboot_pack_dfu.py b/ports/stm32/mboot/mboot_pack_dfu.py
new file mode 100644
index 0000000000000..47382f5910187
--- /dev/null
+++ b/ports/stm32/mboot/mboot_pack_dfu.py
@@ -0,0 +1,260 @@
+# This file is part of the MicroPython project, http://micropython.org/
+#
+# The MIT License (MIT)
+#
+# Copyright (c) 2020-2021 Damien P. George
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+"""
+Utility to create compressed, encrypted and signed DFU files.
+"""
+
+import argparse
+import os
+import re
+import struct
+import sys
+import zlib
+
+sys.path.append(os.path.dirname(__file__) + "/../../../tools")
+import dfu
+
+try:
+    import pyhy
+except ImportError:
+    raise SystemExit(
+        "ERROR: pyhy not found. Please install python pyhy for encrypted mboot support: pip3 install pyhy"
+    )
+
+
+# Currenty supported version of a packed DFU file.
+MBOOT_PACK_HEADER_VERSION = 1
+
+# Must match MBOOT_PACK_HYDRO_CONTEXT in mboot/pack.h
+MBOOT_PACK_HYDRO_CONTEXT = "mbootenc"
+
+# Must match enum in mboot/pack.h.
+MBOOT_PACK_CHUNK_META = 0
+MBOOT_PACK_CHUNK_FULL_SIG = 1
+MBOOT_PACK_CHUNK_FW_RAW = 2
+MBOOT_PACK_CHUNK_FW_GZIP = 3
+
+
+class Keys:
+    def __init__(self, filename):
+        self.filename = filename
+
+    def generate(self):
+        kp = pyhy.hydro_sign_keygen()
+        self.sign_sk = kp.sk
+        self.sign_pk = kp.pk
+        self.secretbox = pyhy.hydro_secretbox_keygen()
+
+    def _save_data(self, name, data, file_, hide=False):
+        prefix = "//" if hide else ""
+        data = ",".join("0x{:02x}".format(b) for b in data)
+        file_.write("{}const uint8_t {}[] = {{{}}};\n".format(prefix, name, data))
+
+    def _load_data(self, name, line):
+        line = line.split(name + "[] = ")
+        if len(line) != 2:
+            raise Exception("malformed input keys: {}".format(line))
+        data = line[1].strip()
+        return bytes(int(value, 16) for value in data[1:-2].split(","))
+
+    def save(self):
+        with open(self.filename, "w") as f:
+            self._save_data("mboot_pack_sign_secret_key", self.sign_sk, f, hide=True)
+            self._save_data("mboot_pack_sign_public_key", self.sign_pk, f)
+            self._save_data("mboot_pack_secretbox_key", self.secretbox, f)
+
+    def load(self):
+        with open(self.filename) as f:
+            self.sign_sk = self._load_data("mboot_pack_sign_secret_key", f.readline())
+            self.sign_pk = self._load_data("mboot_pack_sign_public_key", f.readline())
+            self.secretbox = self._load_data("mboot_pack_secretbox_key", f.readline())
+
+
+def dfu_read(filename):
+    elems = []
+
+    with open(filename, "rb") as f:
+        hdr = f.read(11)
+        sig, ver, size, num_targ = struct.unpack("<5sBIB", hdr)
+        file_offset = 11
+
+        for i in range(num_targ):
+            hdr = f.read(274)
+            sig, alt, has_name, name, t_size, num_elem = struct.unpack("<6sBi255sII", hdr)
+
+            file_offset += 274
+            file_offset_t = file_offset
+            for j in range(num_elem):
+                hdr = f.read(8)
+                addr, e_size = struct.unpack("<II", hdr)
+                data = f.read(e_size)
+                elems.append((addr, data))
+                file_offset += 8 + e_size
+
+            if t_size != file_offset - file_offset_t:
+                raise Exception("corrupt DFU {} {}".format(t_size, file_offset - file_offset_t))
+
+        if size != file_offset:
+            raise Exception("corrupt DFU {} {}".format(size, file_offset))
+
+        hdr = f.read(16)
+        hdr = struct.unpack("<HHHH3sBI", hdr)
+        vid_pid = "0x{:04x}:0x{:04x}".format(hdr[2], hdr[1])
+
+    return vid_pid, elems
+
+
+def compress(data):
+    c = zlib.compressobj(level=9, memLevel=9, wbits=-15)  # wsize=15, no header
+    return c.compress(data) + c.flush()
+
+
+def encrypt(keys, data):
+    return pyhy.hydro_secretbox_encrypt(data, 0, MBOOT_PACK_HYDRO_CONTEXT, keys.secretbox)
+
+
+def sign(keys, data):
+    return pyhy.hydro_sign_create(data, MBOOT_PACK_HYDRO_CONTEXT, keys.sign_sk)
+
+
+def pack_chunk(keys, format_, chunk_addr, chunk_payload):
+    header = struct.pack(
+        "<BBBBII", MBOOT_PACK_HEADER_VERSION, format_, 0, 0, chunk_addr, len(chunk_payload)
+    )
+    chunk = header + chunk_payload
+    sig = sign(keys, chunk)
+    chunk = chunk + sig
+    return chunk
+
+
+def data_chunks(data, n):
+    for i in range(0, len(data), n):
+        yield data[i : i + n]
+
+
+def generate_keys(keys, args):
+    keys.generate()
+    keys.save()
+
+
+def pack_dfu(keys, args):
+    chunk_size = int(args.chunk_size[0])
+
+    # Load previously generated keys.
+    keys.load()
+
+    # Read the input DFU file.
+    vid_pid, elems = dfu_read(args.infile[0])
+
+    # Ensure firmware sections are processed in order of destination memory address.
+    elems = sorted(elems, key=lambda e: e[0])
+
+    # Build list of packed chunks.
+    target = []
+    full_fw = b""
+    full_signature_payload = b""
+    for address, fw in elems:
+        # Update full firmware and full signature chunk.
+        full_fw += fw
+        full_signature_payload += struct.pack("<II", address, len(fw))
+
+        # Split the firmware into chunks, encrypt and sign the chunks
+        # then register them as individual DFU targets.
+        for i, chunk in enumerate(data_chunks(fw, chunk_size)):
+            chunk_addr = address + i * chunk_size
+            if args.gzip:
+                chunk = compress(chunk)
+            chunk = encrypt(keys, chunk)
+            chunk = pack_chunk(
+                keys,
+                MBOOT_PACK_CHUNK_FW_GZIP if args.gzip else MBOOT_PACK_CHUNK_FW_RAW,
+                chunk_addr,
+                chunk,
+            )
+            target.append({"address": chunk_addr, "data": chunk})
+
+    # Add full signature to targets, at location following the last chunk.
+    chunk_addr += chunk_size
+    sig = sign(keys, full_fw)
+    full_signature_payload += sig
+    full_signature_chunk = pack_chunk(
+        keys, MBOOT_PACK_CHUNK_FULL_SIG, chunk_addr, full_signature_payload
+    )
+    target.append({"address": chunk_addr, "data": full_signature_chunk})
+
+    # Build the packed DFU file of all the encrypted and signed chunks.
+    dfu.build(args.outfile[0], [target], vid_pid)
+
+    # Verify the packed DFU file.
+    verify_pack_dfu(keys, args.outfile[0])
+
+
+def verify_pack_dfu(keys, filename):
+    full_sig = pyhy.hydro_sign(MBOOT_PACK_HYDRO_CONTEXT)
+    _, elems = dfu_read(filename)
+    for addr, data in elems:
+        header = struct.unpack("<BBBBII", data[:12])
+        chunk = data[12 : 12 + header[5]]
+        sig = data[12 + header[5] :]
+        sig_pass = pyhy.hydro_sign_verify(
+            sig, data[:12] + chunk, MBOOT_PACK_HYDRO_CONTEXT, keys.sign_pk
+        )
+        assert sig_pass
+        if header[1] == MBOOT_PACK_CHUNK_FULL_SIG:
+            actual_sig = chunk[-64:]
+        else:
+            chunk = pyhy.hydro_secretbox_decrypt(
+                chunk, 0, MBOOT_PACK_HYDRO_CONTEXT, keys.secretbox
+            )
+            assert chunk is not None
+            if header[1] == MBOOT_PACK_CHUNK_FW_GZIP:
+                chunk = zlib.decompress(chunk, wbits=-15)
+            full_sig.update(chunk)
+    full_sig_pass = full_sig.final_verify(actual_sig, keys.sign_pk)
+    assert full_sig_pass
+
+
+def main():
+    cmd_parser = argparse.ArgumentParser(description="Build signed/encrypted DFU files")
+    cmd_parser.add_argument("-k", "--keys", default="mboot_keys.h", help="filename for keys")
+    subparsers = cmd_parser.add_subparsers()
+
+    parser_gk = subparsers.add_parser("generate-keys", help="generate keys")
+    parser_gk.set_defaults(func=generate_keys)
+
+    parser_ed = subparsers.add_parser("pack-dfu", help="encrypt and sign a DFU file")
+    parser_ed.add_argument("-z", "--gzip", action="store_true", help="compress chunks")
+    parser_ed.add_argument("chunk_size", nargs=1, help="maximum size in bytes of each chunk")
+    parser_ed.add_argument("infile", nargs=1, help="input DFU file")
+    parser_ed.add_argument("outfile", nargs=1, help="output DFU file")
+    parser_ed.set_defaults(func=pack_dfu)
+
+    args = cmd_parser.parse_args()
+
+    keys = Keys(args.keys)
+    args.func(keys, args)
+
+
+if __name__ == "__main__":
+    main()
diff --git a/ports/stm32/mboot/pack.c b/ports/stm32/mboot/pack.c
new file mode 100644
index 0000000000000..63f98fed186a7
--- /dev/null
+++ b/ports/stm32/mboot/pack.c
@@ -0,0 +1,282 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020-2021 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include <string.h>
+
+#include "dfu.h"
+#include "gzstream.h"
+#include "mboot.h"
+#include "pack.h"
+
+#if MBOOT_ENABLE_PACKING
+
+// Keys provided externally by the board, will be built into mboot flash.
+#include MBOOT_PACK_KEYS_FILE
+
+// Encrypted dfu files using gzip require a decompress buffer. Larger can be faster.
+// This setting is independent to the incoming encrypted/signed/compressed DFU file.
+#ifndef MBOOT_PACK_GZIP_BUFFER_SIZE
+#define MBOOT_PACK_GZIP_BUFFER_SIZE (2048)
+#endif
+
+// State to manage automatic flash erasure.
+static uint32_t erased_base_addr;
+static uint32_t erased_top_addr;
+
+// DFU chunk buffer, used to cache incoming blocks of data from USB.
+static uint32_t firmware_chunk_base_addr;
+static mboot_pack_chunk_buf_t firmware_chunk_buf;
+
+// Temporary buffer for decrypted data.
+static uint8_t decrypted_buf[MBOOT_PACK_DFU_CHUNK_BUF_SIZE] __attribute__((aligned(8)));
+
+// Temporary buffer for uncompressing.
+static uint8_t uncompressed_buf[MBOOT_PACK_GZIP_BUFFER_SIZE] __attribute__((aligned(8)));
+
+// Buffer to hold the start of the firmware, which is only written once the
+// entire firmware is validated.  This is 8 bytes due to STM32WB MCUs requiring
+// that a double-word write to flash can only be done once (due to ECC).
+static uint8_t firmware_head[8];
+
+void mboot_pack_init(void) {
+    erased_base_addr = 0;
+    erased_top_addr = 0;
+    firmware_chunk_base_addr = 0;
+}
+
+// In encrypted mode the erase is automatically managed.
+// Note: this scheme requires blocks be written in sequence, which is the case.
+static int mboot_pack_erase(uint32_t addr, size_t len) {
+    while (!(erased_base_addr <= addr && addr + len <= erased_top_addr)) {
+        uint32_t erase;
+        if (erased_base_addr <= addr && addr < erased_top_addr) {
+            erase = erased_top_addr;
+        } else {
+            erase = addr;
+            erased_base_addr = addr;
+        }
+        uint32_t next_addr;
+        int ret = hw_page_erase(erase, &next_addr);
+        if (ret != 0) {
+            return ret;
+        }
+        erased_top_addr = next_addr;
+    }
+    return 0;
+}
+
+// Commit an unencrypted and uncompressed chunk of firmware to the flash.
+static int mboot_pack_commit_chunk(uint32_t addr, uint8_t *data, size_t len) {
+    // Erase any required sectors before writing.
+    int ret = mboot_pack_erase(addr, len);
+    if (ret != 0) {
+        return ret;
+    }
+
+    if (addr == APPLICATION_ADDR) {
+        // Don't write the very start of the firmware, just copy it into a temporary buffer.
+        // It will be written only if the full firmware passes the checksum/signature.
+        memcpy(firmware_head, data, sizeof(firmware_head));
+        addr += sizeof(firmware_head);
+        data += sizeof(firmware_head);
+        len -= sizeof(firmware_head);
+    }
+
+    // Commit this piece of the firmware.
+    return hw_write(addr, data, len);
+}
+
+// Handle a chunk with the full firmware signature.
+static int mboot_pack_handle_full_sig(void) {
+    if (firmware_chunk_buf.header.length < hydro_sign_BYTES) {
+        return -1;
+    }
+
+    uint8_t *full_sig = &firmware_chunk_buf.data[firmware_chunk_buf.header.length - hydro_sign_BYTES];
+    uint32_t *region_data = (uint32_t *)&firmware_chunk_buf.data[0];
+    size_t num_regions = (full_sig - (uint8_t *)region_data) / sizeof(uint32_t) / 2;
+
+    uint8_t *buf = decrypted_buf;
+    const size_t buf_alloc = sizeof(decrypted_buf);
+
+    // Compute the signature of the full firmware.
+    hydro_sign_state sign_state;
+    hydro_sign_init(&sign_state, MBOOT_PACK_HYDRO_CONTEXT);
+    for (size_t region = 0; region < num_regions; ++region) {
+        uint32_t addr = region_data[2 * region];
+        uint32_t len = region_data[2 * region + 1];
+        while (len) {
+            uint32_t l = len <= buf_alloc ? len : buf_alloc;
+            hw_read(addr, l, buf);
+            if (addr == APPLICATION_ADDR) {
+                // The start of the firmware was not yet written to flash so copy
+                // it out of the temporary buffer to compute the full signature.
+                memcpy(buf, firmware_head, sizeof(firmware_head));
+            }
+            int ret = hydro_sign_update(&sign_state, buf, l);
+            if (ret != 0) {
+                return -1;
+            }
+            addr += l;
+            len -= l;
+        }
+    }
+
+    // Verify the signature of the full firmware.
+    int ret = hydro_sign_final_verify(&sign_state, full_sig, mboot_pack_sign_public_key);
+    if (ret != 0) {
+        dfu_context.status = DFU_STATUS_ERROR_VERIFY;
+        dfu_context.error = MBOOT_ERROR_STR_INVALID_SIG_IDX;
+        return -1;
+    }
+
+    // Full firmware passed the signature check.
+    // Write the start of the firmware so it boots.
+    return hw_write(APPLICATION_ADDR, firmware_head, sizeof(firmware_head));
+}
+
+// Handle a chunk with firmware data.
+static int mboot_pack_handle_firmware(void) {
+    const uint8_t *fw_data = &firmware_chunk_buf.data[0];
+    const size_t fw_len = firmware_chunk_buf.header.length;
+
+    // Decrypt the chunk.
+    if (hydro_secretbox_decrypt(decrypted_buf, fw_data, fw_len, 0, MBOOT_PACK_HYDRO_CONTEXT, mboot_pack_secretbox_key) != 0) {
+        dfu_context.status = DFU_STATUS_ERROR_VERIFY;
+        dfu_context.error = MBOOT_ERROR_STR_INVALID_SIG_IDX;
+        return -1;
+    }
+
+    // Use the decrypted message contents going formward.
+    size_t len = fw_len - hydro_secretbox_HEADERBYTES;
+    uint32_t addr = firmware_chunk_buf.header.address;
+
+    if (firmware_chunk_buf.header.format == MBOOT_PACK_CHUNK_FW_GZIP) {
+        // Decompress chunk data.
+        gz_stream_init_from_raw_data(decrypted_buf, len);
+        for (;;) {
+            int read = gz_stream_read(sizeof(uncompressed_buf), uncompressed_buf);
+            if (read == 0) {
+                return 0; // finished decompressing
+            } else if (read < 0) {
+                return -1; // error reading
+            }
+            int ret = mboot_pack_commit_chunk(addr, uncompressed_buf, read);
+            if (ret != 0) {
+                return ret;
+            }
+            addr += read;
+        }
+    } else {
+        // Commit chunk data directly.
+        return mboot_pack_commit_chunk(addr, decrypted_buf, len);
+    }
+}
+
+int mboot_pack_write(uint32_t addr, const uint8_t *src8, size_t len) {
+    if (addr == APPLICATION_ADDR) {
+        // Base address of main firmware, reset any previous state
+        firmware_chunk_base_addr = 0;
+    }
+
+    if (firmware_chunk_base_addr == 0) {
+        // First piece of data starting a new chunk, so set the base address.
+        firmware_chunk_base_addr = addr;
+    }
+
+    if (addr < firmware_chunk_base_addr) {
+        // Address out of range.
+        firmware_chunk_base_addr = 0;
+        return -1;
+    }
+
+    size_t offset = addr - firmware_chunk_base_addr;
+    if (offset + len > sizeof(firmware_chunk_buf)) {
+        // Address/length out of range.
+        firmware_chunk_base_addr = 0;
+        return -1;
+    }
+
+    // Copy in the new data piece into the chunk buffer.
+    memcpy((uint8_t *)&firmware_chunk_buf + offset, src8, len);
+
+    if (offset + len < sizeof(firmware_chunk_buf.header)) {
+        // Don't have the header yet.
+        return 0;
+    }
+
+    if (firmware_chunk_buf.header.header_vers != MBOOT_PACK_HEADER_VERSION) {
+        // Chunk header has the wrong version.
+        dfu_context.status = DFU_STATUS_ERROR_FILE;
+        dfu_context.error = MBOOT_ERROR_STR_INVALID_SIG_IDX;
+        return -1;
+    }
+
+    if (firmware_chunk_buf.header.address != firmware_chunk_base_addr) {
+        // Chunk address doesn't agree with dfu address, abort.
+        dfu_context.status = DFU_STATUS_ERROR_ADDRESS;
+        dfu_context.error = MBOOT_ERROR_STR_INVALID_SIG_IDX;
+        return -1;
+    }
+
+    if (offset + len < sizeof(firmware_chunk_buf.header) + firmware_chunk_buf.header.length + sizeof(firmware_chunk_buf.signature)) {
+        // Don't have the full chunk yet.
+        return 0;
+    }
+
+    // Have the full chunk in firmware_chunk_buf, process it now.
+
+    // Reset the chunk base address for the next chunk that comes in.
+    firmware_chunk_base_addr = 0;
+
+    // Verify the signature of the chunk.
+    const size_t fw_len = firmware_chunk_buf.header.length;
+    const uint8_t *sig = &firmware_chunk_buf.data[0] + fw_len;
+    if (hydro_sign_verify(sig, &firmware_chunk_buf, sizeof(firmware_chunk_buf.header) + fw_len,
+        MBOOT_PACK_HYDRO_CONTEXT, mboot_pack_sign_public_key) != 0) {
+        // Signature failed
+        dfu_context.status = DFU_STATUS_ERROR_VERIFY;
+        dfu_context.error = MBOOT_ERROR_STR_INVALID_SIG_IDX;
+        return -1;
+    }
+
+    // Signature passed, we have valid chunk.
+
+    if (firmware_chunk_buf.header.format == MBOOT_PACK_CHUNK_META) {
+        // Ignore META chunks.
+        return 0;
+    } else if (firmware_chunk_buf.header.format == MBOOT_PACK_CHUNK_FULL_SIG) {
+        return mboot_pack_handle_full_sig();
+    } else if (firmware_chunk_buf.header.format == MBOOT_PACK_CHUNK_FW_RAW
+        || firmware_chunk_buf.header.format == MBOOT_PACK_CHUNK_FW_GZIP) {
+        return mboot_pack_handle_firmware();
+    } else {
+        // Unsupported contents.
+        return -1;
+    }
+}
+
+#endif // MBOOT_ENABLE_PACKING
diff --git a/ports/stm32/mboot/pack.h b/ports/stm32/mboot/pack.h
new file mode 100644
index 0000000000000..195f297ca177d
--- /dev/null
+++ b/ports/stm32/mboot/pack.h
@@ -0,0 +1,82 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2017-2019 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+#ifndef MICROPY_INCLUDED_STM32_MBOOT_PACK_H
+#define MICROPY_INCLUDED_STM32_MBOOT_PACK_H
+
+#include <stdint.h>
+#include "py/mphal.h"
+
+#if MBOOT_ENABLE_PACKING
+
+#include "lib/libhydrogen/hydrogen.h"
+
+// Encrypted & signed bootloader support
+
+/******************************************************************************/
+// Interface
+
+#define MBOOT_PACK_HEADER_VERSION (1)
+
+// Used by libhydrogen for signing and secretbox context.
+#define MBOOT_PACK_HYDRO_CONTEXT "mbootenc"
+
+// Maximum size of the firmware payload.
+#define MBOOT_PACK_DFU_CHUNK_BUF_SIZE (MBOOT_PACK_CHUNKSIZE + hydro_secretbox_HEADERBYTES)
+
+enum mboot_pack_chunk_format {
+    MBOOT_PACK_CHUNK_META = 0,
+    MBOOT_PACK_CHUNK_FULL_SIG = 1,
+    MBOOT_PACK_CHUNK_FW_RAW = 2,
+    MBOOT_PACK_CHUNK_FW_GZIP = 3,
+};
+
+// Each DFU chunk transfered has this header to validate it.
+
+typedef struct _mboot_pack_chunk_buf_t {
+    struct {
+        uint8_t header_vers;
+        uint8_t format;  // enum mboot_pack_chunk_format
+        uint8_t _pad[2];
+        uint32_t address;
+        uint32_t length; // number of bytes in following "data" payload, excluding "signature"
+    } header;
+    uint8_t data[MBOOT_PACK_DFU_CHUNK_BUF_SIZE];
+    uint8_t signature[hydro_sign_BYTES];
+} mboot_pack_chunk_buf_t;
+
+// Signing and encryption keys, stored in mboot flash, provided externally.
+extern const uint8_t mboot_pack_sign_public_key[hydro_sign_PUBLICKEYBYTES];
+extern const uint8_t mboot_pack_secretbox_key[hydro_secretbox_KEYBYTES];
+
+/******************************************************************************/
+// Implementation
+
+void mboot_pack_init(void);
+int mboot_pack_write(uint32_t addr, const uint8_t *src8, size_t len);
+
+#endif // MBOOT_ENABLE_PACKING
+
+#endif // MICROPY_INCLUDED_STM32_MBOOT_PACK_H
diff --git a/ports/stm32/mboot/stm32_generic.ld b/ports/stm32/mboot/stm32_generic.ld
index 0504d6d6aef91..ade43496745eb 100644
--- a/ports/stm32/mboot/stm32_generic.ld
+++ b/ports/stm32/mboot/stm32_generic.ld
@@ -6,11 +6,11 @@
 MEMORY
 {
     FLASH_BL (rx)   : ORIGIN = 0x08000000, LENGTH = 32K /* sector 0 (can be 32K) */
-    RAM (xrw)       : ORIGIN = 0x20000000, LENGTH = 96K
+    RAM (xrw)       : ORIGIN = 0x20000000, LENGTH = 120K
 }
 
 /* produce a link error if there is not this amount of RAM for these sections */
-_minimum_stack_size = 2K;
+_minimum_stack_size = 8K;
 
 /* Define tho top end of the stack.  The stack is full descending so begins just
    above last byte of RAM.  Note that EABI requires the stack to be 8-byte
diff --git a/ports/stm32/mboot/vfs_fat.c b/ports/stm32/mboot/vfs_fat.c
index 20de074f0dcf0..5120bdb1044e6 100644
--- a/ports/stm32/mboot/vfs_fat.c
+++ b/ports/stm32/mboot/vfs_fat.c
@@ -42,7 +42,7 @@ DRESULT disk_read(void *pdrv, BYTE *buf, DWORD sector, UINT count) {
     vfs_fat_context_t *ctx = pdrv;
 
     if (0 <= sector && sector < ctx->bdev_byte_len / 512) {
-        do_read(ctx->bdev_base_addr + sector * SECSIZE, count * SECSIZE, buf);
+        hw_read(ctx->bdev_base_addr + sector * SECSIZE, count * SECSIZE, buf);
         return RES_OK;
     }
 
diff --git a/ports/stm32/mboot/vfs_lfs.c b/ports/stm32/mboot/vfs_lfs.c
index dec7c015fc087..e4dc511db56f6 100644
--- a/ports/stm32/mboot/vfs_lfs.c
+++ b/ports/stm32/mboot/vfs_lfs.c
@@ -72,7 +72,7 @@ static uint8_t lfs_lookahead_buffer[LFS_LOOKAHEAD_SIZE];
 static int dev_read(const struct LFSx_API (config) * c, LFSx_API(block_t) block, LFSx_API(off_t) off, void *buffer, LFSx_API(size_t) size) {
     VFS_LFSx_CONTEXT_T *ctx = c->context;
     if (0 <= block && block < ctx->config.block_count) {
-        do_read(ctx->bdev_base_addr + block * ctx->config.block_size + off, size, buffer);
+        hw_read(ctx->bdev_base_addr + block * ctx->config.block_size + off, size, buffer);
         return LFSx_MACRO(_ERR_OK);
     }
     return LFSx_MACRO(_ERR_IO);
@@ -93,7 +93,7 @@ static int dev_sync(const struct LFSx_API (config) * c) {
 int VFS_LFSx_MOUNT(VFS_LFSx_CONTEXT_T *ctx, uint32_t base_addr, uint32_t byte_len) {
     // Read start of superblock.
     uint8_t buf[48];
-    do_read(base_addr, sizeof(buf), buf);
+    hw_read(base_addr, sizeof(buf), buf);
 
     // Verify littlefs and detect block size.
     if (memcmp(&buf[SUPERBLOCK_MAGIC_OFFSET], "littlefs", 8) != 0) {
diff --git a/ports/stm32/mpconfigport.mk b/ports/stm32/mpconfigport.mk
index c6b3ddc74f4e0..98ae93d20b997 100644
--- a/ports/stm32/mpconfigport.mk
+++ b/ports/stm32/mpconfigport.mk
@@ -1,4 +1,4 @@
-# Enable/disable extra modules
+# Enable/disable extra modules and features
 
 # wiznet5k module for ethernet support; valid values are:
 #   0    : no Wiznet support
@@ -11,3 +11,8 @@ MICROPY_PY_CC3K ?= 0
 
 # VFS FAT FS support
 MICROPY_VFS_FAT ?= 1
+
+# Encrypted/signed bootloader support (ensure the MBOOT_PACK_xxx values match stm32/mboot/Makefile)
+MBOOT_ENABLE_PACKING ?= 0
+MBOOT_PACK_CHUNKSIZE ?= 16384
+MBOOT_PACK_KEYS_FILE ?= $(BOARD_DIR)/mboot_keys.h

From f6e6ef69e07d8779df6431e491012f49fb9afb44 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 15 Jan 2021 03:01:36 +1100
Subject: [PATCH 0509/3533] stm32/boards/NUCLEO_WB55: Enable MBOOT with packing
 mode.

To have at least one board configured with MBOOT_ENABLE_PACKING, for CI
testing purposes and demonstration of the feature.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/boards/NUCLEO_WB55/mboot_keys.h     | 5 +++++
 ports/stm32/boards/NUCLEO_WB55/mpconfigboard.mk | 7 +++++++
 2 files changed, 12 insertions(+)
 create mode 100644 ports/stm32/boards/NUCLEO_WB55/mboot_keys.h

diff --git a/ports/stm32/boards/NUCLEO_WB55/mboot_keys.h b/ports/stm32/boards/NUCLEO_WB55/mboot_keys.h
new file mode 100644
index 0000000000000..773813079a0ec
--- /dev/null
+++ b/ports/stm32/boards/NUCLEO_WB55/mboot_keys.h
@@ -0,0 +1,5 @@
+//const uint8_t mboot_pack_sign_secret_key[] = {0xf1,0xd8,0x66,0x08,0xbc,0x78,0x39,0x65,0x6a,0xf4,0x88,0xf4,0x43,0x4d,0x10,0xfe,0x4f,0x79,0xb9,0xc3,0x77,0x36,0x23,0xc8,0xcf,0x62,0xa1,0x90,0xf1,0xdc,0xd9,0xbc,0xb2,0x2e,0x59,0x1e,0x53,0x04,0x54,0xd5,0xd1,0x3a,0x6d,0x2e,0x79,0x3e,0xb5,0x70,0xb4,0x9f,0x33,0xff,0x90,0x1d,0xc3,0x54,0x90,0x12,0x96,0x79,0xf4,0xed,0x56,0x75};
+const uint8_t mboot_pack_sign_public_key[] = {0xb2,0x2e,0x59,0x1e,0x53,0x04,0x54,0xd5,0xd1,0x3a,0x6d,0x2e,0x79,0x3e,0xb5,0x70,0xb4,0x9f,0x33,0xff,0x90,0x1d,0xc3,0x54,0x90,0x12,0x96,0x79,0xf4,0xed,0x56,0x75};
+const uint8_t mboot_pack_secretbox_key[] = {0x4a,0xbe,0x9b,0xed,0x55,0x9f,0x74,0xeb,0x1e,0x70,0xde,0xf5,0x19,0x0a,0xeb,0xa5,0x68,0xea,0xb0,0x88,0xe6,0xfe,0x4d,0x10,0x69,0x23,0x06,0x7f,0xdd,0x83,0xf0,0xbf};
+
+// The above keys are for demonstration purposes only, do not use them in production!
diff --git a/ports/stm32/boards/NUCLEO_WB55/mpconfigboard.mk b/ports/stm32/boards/NUCLEO_WB55/mpconfigboard.mk
index dcec788ed443f..4cb047c95e074 100644
--- a/ports/stm32/boards/NUCLEO_WB55/mpconfigboard.mk
+++ b/ports/stm32/boards/NUCLEO_WB55/mpconfigboard.mk
@@ -1,3 +1,7 @@
+# By default this board is configured to use mboot with packing (signing and encryption)
+# enabled.  Mboot must be deployed first.
+USE_MBOOT ?= 1
+
 MCU_SERIES = wb
 CMSIS_MCU = STM32WB55xx
 AF_FILE = boards/stm32wb55_af.csv
@@ -17,3 +21,6 @@ endif
 MICROPY_PY_BLUETOOTH = 1
 MICROPY_BLUETOOTH_NIMBLE = 1
 MICROPY_VFS_LFS2 = 1
+
+# Mboot settings
+MBOOT_ENABLE_PACKING = 1

From de2374cdc6889401effba91287b0978a2a59089e Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 15 Jan 2021 15:17:12 +1100
Subject: [PATCH 0510/3533] tools/ci.sh: Pip install pyhy for stm32 builds.

Signed-off-by: Damien George <damien@micropython.org>
---
 tools/ci.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/ci.sh b/tools/ci.sh
index 1a413ec991920..a68e6c113db6d 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -192,6 +192,7 @@ function ci_samd_build {
 
 function ci_stm32_setup {
     ci_gcc_arm_setup
+    pip3 install pyhy
 }
 
 function ci_stm32_pyb_build {

From 49dd9ba1a5e50c400a3cfd604dd884bf9fea628c Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 18 Jan 2021 13:52:47 +1100
Subject: [PATCH 0511/3533] stm32/Makefile: Use MBOOT_PACK_KEYS_FILE as
 depedency of .pack.dfu.

To match the definition of GENERATE_PACK_DFU, so a board can customise the
location/name of this file if needed.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/stm32/Makefile b/ports/stm32/Makefile
index d8c9772b26eda..6e5fc15363509 100644
--- a/ports/stm32/Makefile
+++ b/ports/stm32/Makefile
@@ -679,7 +679,7 @@ $(BUILD)/firmware.dfu: $(BUILD)/firmware0.bin $(BUILD)/firmware1.bin
 	$(call GENERATE_DFU,$@,$(word 1,$^),$(TEXT0_ADDR),$(word 2,$^),$(TEXT1_ADDR))
 endif
 
-$(BUILD)/firmware.pack.dfu: $(BUILD)/firmware.dfu $(BOARD_DIR)/mboot_keys.h
+$(BUILD)/firmware.pack.dfu: $(BUILD)/firmware.dfu $(MBOOT_PACK_KEYS_FILE)
 	$(call GENERATE_PACK_DFU,$@,$<)
 
 $(BUILD)/firmware.hex: $(BUILD)/firmware.elf

From aa136b4d78c7f81e63bde20ae17ab69bbbf456db Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Fri, 22 Jan 2021 17:30:25 +1100
Subject: [PATCH 0512/3533] extmod/modbluetooth: Add ble.hci_cmd(ogf, ocf, req,
 resp) function.

This allows sending arbitrary HCI commands and getting the response.  The
return value of the function is the status of the command.

This is intended for debugging and not to be a part of the public API, and
must be enabled via mpconfigboard.h.  It's currently only implemented for
NimBLE bindings.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 extmod/modbluetooth.c               | 20 ++++++++++++++++++++
 extmod/modbluetooth.h               | 10 ++++++++++
 extmod/nimble/modbluetooth_nimble.c | 23 ++++++++++++++++++++++-
 3 files changed, 52 insertions(+), 1 deletion(-)

diff --git a/extmod/modbluetooth.c b/extmod/modbluetooth.c
index caaf872e7ddf4..8870a21c4d520 100644
--- a/extmod/modbluetooth.c
+++ b/extmod/modbluetooth.c
@@ -884,6 +884,23 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(bluetooth_ble_l2cap_recvinto_obj, 4,
 
 #endif // MICROPY_PY_BLUETOOTH_ENABLE_L2CAP_CHANNELS
 
+#if MICROPY_PY_BLUETOOTH_ENABLE_HCI_CMD
+
+STATIC mp_obj_t bluetooth_ble_hci_cmd(size_t n_args, const mp_obj_t *args) {
+    mp_int_t ogf = mp_obj_get_int(args[1]);
+    mp_int_t ocf = mp_obj_get_int(args[2]);
+    mp_buffer_info_t bufinfo_request = {0};
+    mp_buffer_info_t bufinfo_response = {0};
+    mp_get_buffer_raise(args[3], &bufinfo_request, MP_BUFFER_READ);
+    mp_get_buffer_raise(args[4], &bufinfo_response, MP_BUFFER_WRITE);
+    uint8_t status = 0;
+    bluetooth_handle_errno(mp_bluetooth_hci_cmd(ogf, ocf, bufinfo_request.buf, bufinfo_request.len, bufinfo_response.buf, bufinfo_response.len, &status));
+    return MP_OBJ_NEW_SMALL_INT(status);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(bluetooth_ble_hci_cmd_obj, 5, 5, bluetooth_ble_hci_cmd);
+
+#endif // MICROPY_PY_BLUETOOTH_ENABLE_HCI_CMD
+
 // ----------------------------------------------------------------------------
 // Bluetooth object: Definition
 // ----------------------------------------------------------------------------
@@ -927,6 +944,9 @@ STATIC const mp_rom_map_elem_t bluetooth_ble_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_l2cap_send), MP_ROM_PTR(&bluetooth_ble_l2cap_send_obj) },
     { MP_ROM_QSTR(MP_QSTR_l2cap_recvinto), MP_ROM_PTR(&bluetooth_ble_l2cap_recvinto_obj) },
     #endif
+    #if MICROPY_PY_BLUETOOTH_ENABLE_HCI_CMD
+    { MP_ROM_QSTR(MP_QSTR_hci_cmd), MP_ROM_PTR(&bluetooth_ble_hci_cmd_obj) },
+    #endif
 };
 STATIC MP_DEFINE_CONST_DICT(bluetooth_ble_locals_dict, bluetooth_ble_locals_dict_table);
 
diff --git a/extmod/modbluetooth.h b/extmod/modbluetooth.h
index f14033de302e2..c96427fcb4a1e 100644
--- a/extmod/modbluetooth.h
+++ b/extmod/modbluetooth.h
@@ -60,6 +60,12 @@
 #define MICROPY_PY_BLUETOOTH_ENABLE_PAIRING_BONDING (0)
 #endif
 
+// Optionally enable support for the `hci_cmd` function allowing
+// Python to directly low-level HCI commands.
+#ifndef MICROPY_PY_BLUETOOTH_ENABLE_HCI_CMD
+#define MICROPY_PY_BLUETOOTH_ENABLE_HCI_CMD (0)
+#endif
+
 // This is used to protect the ringbuffer.
 // A port may no-op this if MICROPY_PY_BLUETOOTH_USE_SYNC_EVENTS is enabled.
 #ifndef MICROPY_PY_BLUETOOTH_ENTER
@@ -387,6 +393,10 @@ int mp_bluetooth_l2cap_send(uint16_t conn_handle, uint16_t cid, const uint8_t *b
 int mp_bluetooth_l2cap_recvinto(uint16_t conn_handle, uint16_t cid, uint8_t *buf, size_t *len);
 #endif // MICROPY_PY_BLUETOOTH_ENABLE_L2CAP_CHANNELS
 
+#if MICROPY_PY_BLUETOOTH_ENABLE_HCI_CMD
+int mp_bluetooth_hci_cmd(uint16_t ogf, uint16_t ocf, const uint8_t *req, size_t req_len, uint8_t *resp, size_t resp_len, uint8_t *status);
+#endif // MICROPY_PY_BLUETOOTH_ENABLE_HCI_CMD
+
 /////////////////////////////////////////////////////////////////////////////
 // API implemented by modbluetooth (called by port-specific implementations):
 
diff --git a/extmod/nimble/modbluetooth_nimble.c b/extmod/nimble/modbluetooth_nimble.c
index 9ceeab7d7b6c6..8bead890d8373 100644
--- a/extmod/nimble/modbluetooth_nimble.c
+++ b/extmod/nimble/modbluetooth_nimble.c
@@ -81,9 +81,11 @@ STATIC int ble_hs_err_to_errno(int err) {
         return 0;
     }
     if (err >= 0 && (unsigned)err < MP_ARRAY_SIZE(ble_hs_err_to_errno_table) && ble_hs_err_to_errno_table[err]) {
+        // Return an MP_Exxx error code.
         return ble_hs_err_to_errno_table[err];
     } else {
-        return MP_EIO;
+        // Pass through the BLE error code.
+        return -err;
     }
 }
 
@@ -1660,6 +1662,25 @@ int mp_bluetooth_l2cap_recvinto(uint16_t conn_handle, uint16_t cid, uint8_t *buf
 
 #endif // MICROPY_PY_BLUETOOTH_ENABLE_L2CAP_CHANNELS
 
+#if MICROPY_PY_BLUETOOTH_ENABLE_HCI_CMD
+
+// For ble_hs_hci_cmd_tx
+#include "nimble/host/src/ble_hs_hci_priv.h"
+
+int mp_bluetooth_hci_cmd(uint16_t ogf, uint16_t ocf, const uint8_t *req, size_t req_len, uint8_t *resp, size_t resp_len, uint8_t *status) {
+    int rc = ble_hs_hci_cmd_tx(BLE_HCI_OP(ogf, ocf), req, req_len, resp, resp_len);
+    if (rc < BLE_HS_ERR_HCI_BASE || rc >= BLE_HS_ERR_HCI_BASE + 0x100) {
+        // The controller didn't handle the command (e.g. HCI timeout).
+        return ble_hs_err_to_errno(rc);
+    } else {
+        // The command executed, but had an error (i.e. invalid parameter).
+        *status = rc - BLE_HS_ERR_HCI_BASE;
+        return 0;
+    }
+}
+
+#endif // MICROPY_PY_BLUETOOTH_ENABLE_HCI_CMD
+
 #if MICROPY_PY_BLUETOOTH_ENABLE_PAIRING_BONDING
 
 STATIC int ble_store_ram_read(int obj_type, const union ble_store_key *key, union ble_store_value *value) {

From 063d7cc0e2f076bd4299ab487563d398c3d212b6 Mon Sep 17 00:00:00 2001
From: Yonatan Schachter <yonatan.schachter@gmail.com>
Date: Tue, 24 Nov 2020 16:59:04 +0200
Subject: [PATCH 0513/3533] zephyr: Add basic UART functionality to machine
 module.

Currently supports only polling read and write.

Signed-off-by: Yonatan Schachter <yonatan.schachter@gmail.com>
---
 ports/zephyr/Makefile       |   1 +
 ports/zephyr/machine_uart.c | 168 ++++++++++++++++++++++++++++++++++++
 ports/zephyr/modmachine.c   |   1 +
 ports/zephyr/modmachine.h   |   1 +
 4 files changed, 171 insertions(+)
 create mode 100644 ports/zephyr/machine_uart.c

diff --git a/ports/zephyr/Makefile b/ports/zephyr/Makefile
index 169aebc26772e..c200062a3ff85 100644
--- a/ports/zephyr/Makefile
+++ b/ports/zephyr/Makefile
@@ -49,6 +49,7 @@ SRC_C = main.c \
 	modmachine.c \
 	machine_i2c.c \
 	machine_pin.c \
+	machine_uart.c \
 	uart_core.c \
 	zephyr_storage.c \
 	lib/timeutils/timeutils.c \
diff --git a/ports/zephyr/machine_uart.c b/ports/zephyr/machine_uart.c
new file mode 100644
index 0000000000000..6ae8707d7f130
--- /dev/null
+++ b/ports/zephyr/machine_uart.c
@@ -0,0 +1,168 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2016 Damien P. George
+ * Copyright (c) 2020 Yonatan Schachter
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include <stdio.h>
+#include <stdint.h>
+#include <string.h>
+
+#include <zephyr.h>
+#include <drivers/uart.h>
+
+#include "py/runtime.h"
+#include "py/stream.h"
+#include "py/mperrno.h"
+#include "py/objstr.h"
+#include "modmachine.h"
+
+typedef struct _machine_uart_obj_t {
+    mp_obj_base_t base;
+    const struct device *dev;
+    uint16_t timeout;       // timeout waiting for first char (in ms)
+    uint16_t timeout_char;  // timeout waiting between chars (in ms)
+} machine_uart_obj_t;
+
+STATIC const char *_parity_name[] = {"None", "Odd", "Even", "Mark", "Space"};
+STATIC const char *_stop_bits_name[] = {"0.5", "1", "1.5", "2"};
+STATIC const char *_data_bits_name[] = {"5", "6", "7", "8", "9"};
+STATIC const char *_flow_control_name[] = {"None", "RTS/CTS", "DTR/DSR"};
+
+STATIC void machine_uart_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+    machine_uart_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    struct uart_config config;
+    uart_config_get(self->dev, &config);
+    mp_printf(print, "UART(\"%s\", baudrate=%u, data_bits=%s, parity_bits=%s, stop_bits=%s, flow_control=%s, timeout=%u, timeout_char=%u)",
+        self->dev->name, config.baudrate, _data_bits_name[config.data_bits],
+        _parity_name[config.parity], _stop_bits_name[config.stop_bits], _flow_control_name[config.flow_ctrl],
+        self->timeout, self->timeout_char);
+}
+
+STATIC void machine_uart_init_helper(machine_uart_obj_t *self, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    enum { ARG_timeout, ARG_timeout_char };
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_timeout, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 0} },
+        { MP_QSTR_timeout_char, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 0} },
+    };
+    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
+    mp_arg_parse_all(n_args, pos_args, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
+
+    self->timeout = args[ARG_timeout].u_int;
+    self->timeout_char = args[ARG_timeout_char].u_int;
+}
+
+STATIC mp_obj_t machine_uart_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
+    mp_arg_check_num(n_args, n_kw, 1, MP_OBJ_FUN_ARGS_MAX, true);
+    GET_STR_DATA_LEN(args[0], name, name_len);
+
+    machine_uart_obj_t *self = m_new_obj(machine_uart_obj_t);
+    self->base.type = &machine_uart_type;
+    self->dev = device_get_binding(name);
+    if (!self->dev) {
+        mp_raise_ValueError(MP_ERROR_TEXT("Bad device name"));
+    }
+
+    mp_map_t kw_args;
+    mp_map_init_fixed_table(&kw_args, n_kw, args + n_args);
+    machine_uart_init_helper(self, n_args - 1, args + 1, &kw_args);
+
+    return MP_OBJ_FROM_PTR(self);
+}
+
+STATIC const mp_rom_map_elem_t machine_uart_locals_dict_table[] = {
+    { MP_ROM_QSTR(MP_QSTR_read), MP_ROM_PTR(&mp_stream_read_obj) },
+    { MP_ROM_QSTR(MP_QSTR_readline), MP_ROM_PTR(&mp_stream_unbuffered_readline_obj) },
+    { MP_ROM_QSTR(MP_QSTR_readinto), MP_ROM_PTR(&mp_stream_readinto_obj) },
+    { MP_ROM_QSTR(MP_QSTR_write), MP_ROM_PTR(&mp_stream_write_obj) },
+};
+STATIC MP_DEFINE_CONST_DICT(machine_uart_locals_dict, machine_uart_locals_dict_table);
+
+STATIC mp_uint_t machine_uart_read(mp_obj_t self_in, void *buf_in, mp_uint_t size, int *errcode) {
+    machine_uart_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    uint8_t *buffer = (uint8_t *)buf_in;
+    uint8_t data;
+    mp_uint_t bytes_read = 0;
+    size_t elapsed_ms = 0;
+    size_t time_to_wait = self->timeout;
+
+    while ((elapsed_ms < time_to_wait) && (bytes_read < size)) {
+        if (!uart_poll_in(self->dev, &data)) {
+            buffer[bytes_read++] = data;
+            elapsed_ms = 0;
+            time_to_wait = self->timeout_char;
+        } else {
+            k_msleep(1);
+            elapsed_ms++;
+        }
+    }
+    return bytes_read;
+}
+
+STATIC mp_uint_t machine_uart_write(mp_obj_t self_in, const void *buf_in, mp_uint_t size, int *errcode) {
+    machine_uart_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    uint8_t *buffer = (uint8_t *)buf_in;
+
+    for (mp_uint_t i = 0; i < size; i++) {
+        uart_poll_out(self->dev, buffer[i]);
+    }
+
+    return size;
+}
+
+STATIC mp_uint_t machine_uart_ioctl(mp_obj_t self_in, mp_uint_t request, mp_uint_t arg, int *errcode) {
+    mp_uint_t ret;
+
+    if (request == MP_STREAM_POLL) {
+        ret = 0;
+        // read is always blocking
+
+        if (arg & MP_STREAM_POLL_WR) {
+            ret |= MP_STREAM_POLL_WR;
+        }
+        return ret;
+    } else {
+        *errcode = MP_EINVAL;
+        ret = MP_STREAM_ERROR;
+    }
+    return ret;
+}
+
+STATIC const mp_stream_p_t uart_stream_p = {
+    .read = machine_uart_read,
+    .write = machine_uart_write,
+    .ioctl = machine_uart_ioctl,
+    .is_text = false,
+};
+
+const mp_obj_type_t machine_uart_type = {
+    { &mp_type_type },
+    .name = MP_QSTR_UART,
+    .print = machine_uart_print,
+    .make_new = machine_uart_make_new,
+    .getiter = mp_identity_getiter,
+    .iternext = mp_stream_unbuffered_iter,
+    .protocol = &uart_stream_p,
+    .locals_dict = (mp_obj_dict_t *)&machine_uart_locals_dict,
+};
diff --git a/ports/zephyr/modmachine.c b/ports/zephyr/modmachine.c
index 968f758b93ed3..107895bea0e42 100644
--- a/ports/zephyr/modmachine.c
+++ b/ports/zephyr/modmachine.c
@@ -63,6 +63,7 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     #if MICROPY_PY_MACHINE_I2C
     { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&machine_hard_i2c_type) },
     #endif
+    { MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&machine_uart_type) },
     { MP_ROM_QSTR(MP_QSTR_Pin), MP_ROM_PTR(&machine_pin_type) },
     { MP_ROM_QSTR(MP_QSTR_Signal), MP_ROM_PTR(&machine_signal_type) },
 
diff --git a/ports/zephyr/modmachine.h b/ports/zephyr/modmachine.h
index b67da55338cd7..957f2dd4f9709 100644
--- a/ports/zephyr/modmachine.h
+++ b/ports/zephyr/modmachine.h
@@ -5,6 +5,7 @@
 
 extern const mp_obj_type_t machine_pin_type;
 extern const mp_obj_type_t machine_hard_i2c_type;
+extern const mp_obj_type_t machine_uart_type;
 
 MP_DECLARE_CONST_FUN_OBJ_0(machine_info_obj);
 

From 769e822f190b2ae3c67a6612b7141a54920a19bf Mon Sep 17 00:00:00 2001
From: IhorNehrutsa <Ihor.Nehrutsa@gmail.com>
Date: Fri, 11 Dec 2020 16:59:40 -0800
Subject: [PATCH 0514/3533] esp32/modnetwork: Synchronize WiFi AUTH_xxx
 constants with IDF values.

---
 ports/esp32/modnetwork.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/ports/esp32/modnetwork.c b/ports/esp32/modnetwork.c
index 44263350409fc..64f1c91dc7922 100644
--- a/ports/esp32/modnetwork.c
+++ b/ports/esp32/modnetwork.c
@@ -772,6 +772,11 @@ STATIC const mp_rom_map_elem_t mp_module_network_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_AUTH_WPA_PSK), MP_ROM_INT(WIFI_AUTH_WPA_PSK) },
     { MP_ROM_QSTR(MP_QSTR_AUTH_WPA2_PSK), MP_ROM_INT(WIFI_AUTH_WPA2_PSK) },
     { MP_ROM_QSTR(MP_QSTR_AUTH_WPA_WPA2_PSK), MP_ROM_INT(WIFI_AUTH_WPA_WPA2_PSK) },
+    { MP_ROM_QSTR(MP_QSTR_AUTH_WPA2_ENTERPRISE), MP_ROM_INT(WIFI_AUTH_WPA2_ENTERPRISE) },
+    #if 0 // TODO: Remove this #if/#endif when lastest ISP IDF will be used
+    { MP_ROM_QSTR(MP_QSTR_AUTH_WPA3_PSK), MP_ROM_INT(WIFI_AUTH_WPA3_PSK) },
+    { MP_ROM_QSTR(MP_QSTR_AUTH_WPA2_WPA3_PSK), MP_ROM_INT(WIFI_AUTH_WPA2_WPA3_PSK) },
+    #endif
     { MP_ROM_QSTR(MP_QSTR_AUTH_MAX), MP_ROM_INT(WIFI_AUTH_MAX) },
 
     { MP_ROM_QSTR(MP_QSTR_PHY_LAN8720), MP_ROM_INT(PHY_LAN8720) },

From 419134bea47953888344d325220c376117f6b2b4 Mon Sep 17 00:00:00 2001
From: Oliver Joos <oliver.joos@feller.ch>
Date: Wed, 16 Dec 2020 21:25:18 +0100
Subject: [PATCH 0515/3533] tests/extmod: Add test for the precision of utime
 functions.

According to documentation time() has a precision of at least 1 second.
This test runs for 2.5 seconds and calls all utime functions every 100ms.
Then it checks if they returned enough different results.  All functions
with sub-second precision will return ~25 results.  This test passes with
15 results or more.  Functions that do not exist are skipped silently.
---
 tests/extmod/utime_res.py     | 65 +++++++++++++++++++++++++++++++++++
 tests/extmod/utime_res.py.exp |  9 +++++
 2 files changed, 74 insertions(+)
 create mode 100644 tests/extmod/utime_res.py
 create mode 100644 tests/extmod/utime_res.py.exp

diff --git a/tests/extmod/utime_res.py b/tests/extmod/utime_res.py
new file mode 100644
index 0000000000000..4b624334836f1
--- /dev/null
+++ b/tests/extmod/utime_res.py
@@ -0,0 +1,65 @@
+# test utime resolutions
+
+try:
+    import utime
+except ImportError:
+    print("SKIP")
+    raise SystemExit
+
+
+def gmtime_time():
+    return utime.gmtime(utime.time())
+
+
+def localtime_time():
+    return utime.localtime(utime.time())
+
+
+def test():
+    TEST_TIME = 2500
+    EXPECTED_MAP = (
+        # (function name, min. number of results in 2.5 sec)
+        ("time", 3),
+        ("gmtime", 3),
+        ("localtime", 3),
+        ("gmtime_time", 3),
+        ("localtime_time", 3),
+        ("ticks_ms", 15),
+        ("ticks_us", 15),
+        ("ticks_ns", 15),
+        ("ticks_cpu", 15),
+    )
+
+    # call time functions
+    results_map = {}
+    end_time = utime.ticks_ms() + TEST_TIME
+    while utime.ticks_diff(end_time, utime.ticks_ms()) > 0:
+        utime.sleep_ms(100)
+        for func_name, _ in EXPECTED_MAP:
+            try:
+                time_func = getattr(utime, func_name, None) or globals()[func_name]
+                now = time_func()  # may raise AttributeError
+            except (KeyError, AttributeError):
+                continue
+            try:
+                results_map[func_name].add(now)
+            except KeyError:
+                results_map[func_name] = {now}
+
+    # check results
+    for func_name, min_len in EXPECTED_MAP:
+        print("Testing %s" % func_name)
+        results = results_map.get(func_name)
+        if results is None:
+            pass
+        elif func_name == "ticks_cpu" and results == {0}:
+            # ticks_cpu() returns 0 on some ports (e.g. unix)
+            pass
+        elif len(results) < min_len:
+            print(
+                "%s() returns %s result%s in %s ms, expecting >= %s"
+                % (func_name, len(results), "s"[: len(results) != 1], TEST_TIME, min_len)
+            )
+
+
+test()
diff --git a/tests/extmod/utime_res.py.exp b/tests/extmod/utime_res.py.exp
new file mode 100644
index 0000000000000..08c2d82950603
--- /dev/null
+++ b/tests/extmod/utime_res.py.exp
@@ -0,0 +1,9 @@
+Testing time
+Testing gmtime
+Testing localtime
+Testing gmtime_time
+Testing localtime_time
+Testing ticks_ms
+Testing ticks_us
+Testing ticks_ns
+Testing ticks_cpu

From 290dc1d5eeba005bdc604a9eb2d781a922081c29 Mon Sep 17 00:00:00 2001
From: Oliver Joos <oliver.joos@feller.ch>
Date: Wed, 16 Dec 2020 22:35:52 +0100
Subject: [PATCH 0516/3533] unix/modtime: Fix time() precision on unix ports
 with non-double floats.

With MICROPY_FLOAT_IMPL_FLOAT the results of utime.time(), gmtime() and
localtime() change only every 129 seconds.  As one consequence
tests/extmod/vfs_lfs_mtime.py will fail on a unix port with LFS support.

With this patch these functions only return floats if
MICROPY_FLOAT_IMPL_DOUBLE is used.  Otherwise they return integers.
---
 ports/unix/modtime.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/unix/modtime.c b/ports/unix/modtime.c
index e08409e20e3e9..91c0a19413092 100644
--- a/ports/unix/modtime.c
+++ b/ports/unix/modtime.c
@@ -67,7 +67,7 @@ static inline int msec_sleep_tv(struct timeval *tv) {
 #endif
 
 STATIC mp_obj_t mod_time_time(void) {
-    #if MICROPY_PY_BUILTINS_FLOAT
+    #if MICROPY_PY_BUILTINS_FLOAT && MICROPY_FLOAT_IMPL == MICROPY_FLOAT_IMPL_DOUBLE
     struct timeval tv;
     gettimeofday(&tv, NULL);
     mp_float_t val = tv.tv_sec + (mp_float_t)tv.tv_usec / 1000000;
@@ -137,7 +137,7 @@ STATIC mp_obj_t mod_time_gm_local_time(size_t n_args, const mp_obj_t *args, stru
     if (n_args == 0) {
         t = time(NULL);
     } else {
-        #if MICROPY_PY_BUILTINS_FLOAT
+        #if MICROPY_PY_BUILTINS_FLOAT && MICROPY_FLOAT_IMPL == MICROPY_FLOAT_IMPL_DOUBLE
         mp_float_t val = mp_obj_get_float(args[0]);
         t = (time_t)MICROPY_FLOAT_C_FUN(trunc)(val);
         #else

From 342dc617842c7ebdc2b93dcbbfe9f0f9bb4789d3 Mon Sep 17 00:00:00 2001
From: Vincent Duvert <vincent@duvert.net>
Date: Mon, 21 Dec 2020 18:48:53 +0100
Subject: [PATCH 0517/3533] cc3200/ftp: Add quotes to PWD response and allow
 FEAT prior to login.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This commit improves some FTP implementation details for better
compatibility with FTP clients:

* The PWD command now puts quotes around the directory name before
  returning it.  This fixes BBEdit’s FTP client, which performs a PWD after
  each CWD and gets confused if the returned directory path is not
  surrounded by quotes.

* The FEAT command is now allowed before logging in. This fixes the lftp
  client, which send FEAT first and gets confused (tries to use TLS) if the
  server responds with 332.
---
 ports/cc3200/ftp/ftp.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/ports/cc3200/ftp/ftp.c b/ports/cc3200/ftp/ftp.c
index ee80e51f5269e..37680bc939dde 100644
--- a/ports/cc3200/ftp/ftp.c
+++ b/ports/cc3200/ftp/ftp.c
@@ -684,7 +684,7 @@ static void ftp_process_cmd (void) {
     if (E_FTP_RESULT_OK == (result = ftp_recv_non_blocking(ftp_data.c_sd, ftp_cmd_buffer, FTP_MAX_PARAM_SIZE + FTP_CMD_SIZE_MAX, &len))) {
         // bufptr is moved as commands are being popped
         ftp_cmd_index_t cmd = ftp_pop_command(&bufptr);
-        if (!ftp_data.loggin.passvalid && (cmd != E_FTP_CMD_USER && cmd != E_FTP_CMD_PASS && cmd != E_FTP_CMD_QUIT)) {
+        if (!ftp_data.loggin.passvalid && (cmd != E_FTP_CMD_USER && cmd != E_FTP_CMD_PASS && cmd != E_FTP_CMD_QUIT && cmd != E_FTP_CMD_FEAT)) {
             ftp_send_reply(332, NULL);
             return;
         }
@@ -718,7 +718,8 @@ static void ftp_process_cmd (void) {
             break;
         case E_FTP_CMD_PWD:
         case E_FTP_CMD_XPWD:
-            ftp_send_reply(257, ftp_path);
+            snprintf((char *)ftp_data.dBuffer, FTP_BUFFER_SIZE, "\"%s\"", ftp_path);
+            ftp_send_reply(257, (char *)ftp_data.dBuffer);
             break;
         case E_FTP_CMD_SIZE:
             {

From 45f0b6ab6300e75a17f6427ec45d812e072a9522 Mon Sep 17 00:00:00 2001
From: Vincent Duvert <vincent@duvert.net>
Date: Wed, 23 Dec 2020 13:41:56 +0100
Subject: [PATCH 0518/3533] cc3200: Fix debug build.

* Fix a typo in the Makefile that prevented the debug build to be actually
  enabled when BTYPE=debug is used.

* Add a missing header in modmachine.c that is used when a debug build is
  created.
---
 ports/cc3200/application.mk    | 2 +-
 ports/cc3200/mods/modmachine.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/ports/cc3200/application.mk b/ports/cc3200/application.mk
index b216ca16dd873..2125274ae138f 100644
--- a/ports/cc3200/application.mk
+++ b/ports/cc3200/application.mk
@@ -182,7 +182,7 @@ ifeq ($(BTYPE), release)
 CFLAGS += -DNDEBUG
 else
 ifeq ($(BTYPE), debug)
-CFLAGS += -DNDEBUG
+CFLAGS += -DDEBUG
 else
 $(error Invalid BTYPE specified)
 endif
diff --git a/ports/cc3200/mods/modmachine.c b/ports/cc3200/mods/modmachine.c
index ddecd47f2b013..89800810c7d1b 100644
--- a/ports/cc3200/mods/modmachine.c
+++ b/ports/cc3200/mods/modmachine.c
@@ -26,6 +26,7 @@
  */
 
 #include <stdint.h>
+#include <stdio.h>
 
 #include "py/runtime.h"
 #include "py/mphal.h"

From 0a079155e46d588095e4419b1095fd4ae691ab50 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sat, 23 Jan 2021 17:15:18 +1100
Subject: [PATCH 0519/3533] github/workflows: Fix code-size CI workflow.

Changes are:
- Use ubuntu-20.04 so that gcc-multilib installs without error.
- Use "fetch-depth: 100" to get history prior to pull request.

Signed-off-by: Damien George <damien@micropython.org>
---
 .github/workflows/code_size.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/code_size.yml b/.github/workflows/code_size.yml
index dd759a4f3ff56..7570261e7d23b 100644
--- a/.github/workflows/code_size.yml
+++ b/.github/workflows/code_size.yml
@@ -14,9 +14,11 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     steps:
     - uses: actions/checkout@v2
+      with:
+        fetch-depth: 100
     - name: Install packages
       run: source tools/ci.sh && ci_code_size_setup
     - name: Build

From 203e1d2a65273db3f6ff063ba1124a89c3482c0f Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sun, 24 Jan 2021 15:02:20 +1100
Subject: [PATCH 0520/3533] tools/ci.sh: For code size build, fetch history of
 master branch only.

It's not necessary to fetch all branches.

Signed-off-by: Damien George <damien@micropython.org>
---
 tools/ci.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/ci.sh b/tools/ci.sh
index a68e6c113db6d..86c17bb691e3a 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -42,7 +42,7 @@ function ci_code_size_build {
     # starts off at either the ref/pull/N/merge FETCH_HEAD, or the current branch HEAD
     git checkout -b pull_request # save the current location
     git remote add upstream https://github.com/micropython/micropython.git
-    git fetch --depth=100 upstream
+    git fetch --depth=100 upstream master
     # build reference, save to size0
     # ignore any errors with this build, in case master is failing
     git checkout `git merge-base --fork-point upstream/master pull_request`

From 4eaebc1988699db6ebfd35fbe56a3e8d4cd0b373 Mon Sep 17 00:00:00 2001
From: nanjekyejoannah <joannah.nanjekye@ibm.com>
Date: Mon, 12 Oct 2020 17:25:05 -0300
Subject: [PATCH 0521/3533] docs/develop: Add MicroPython Internals chapter.

This commit adds many new sections to the existing "Developing and building
MicroPython" chapter to make it all about the internals of MicroPython.

This work was done as part of Google's Season of Docs 2020.
---
 docs/develop/compiler.rst             | 317 +++++++++++++++++++++++++
 docs/develop/extendingmicropython.rst |  19 ++
 docs/develop/gettingstarted.rst       | 324 ++++++++++++++++++++++++++
 docs/develop/img/bitmap.png           | Bin 0 -> 6388 bytes
 docs/develop/img/collision.png        | Bin 0 -> 3464 bytes
 docs/develop/img/linprob.png          | Bin 0 -> 3655 bytes
 docs/develop/index.rst                |  31 ++-
 docs/develop/library.rst              |  86 +++++++
 docs/develop/maps.rst                 |  63 +++++
 docs/develop/memorymgt.rst            | 141 +++++++++++
 docs/develop/optimizations.rst        |  72 ++++++
 docs/develop/porting.rst              | 310 ++++++++++++++++++++++++
 docs/develop/publiccapi.rst           |  25 ++
 docs/develop/qstr.rst                 |   7 +-
 docs/develop/writingtests.rst         |  70 ++++++
 15 files changed, 1454 insertions(+), 11 deletions(-)
 create mode 100644 docs/develop/compiler.rst
 create mode 100644 docs/develop/extendingmicropython.rst
 create mode 100644 docs/develop/gettingstarted.rst
 create mode 100644 docs/develop/img/bitmap.png
 create mode 100644 docs/develop/img/collision.png
 create mode 100644 docs/develop/img/linprob.png
 create mode 100644 docs/develop/library.rst
 create mode 100644 docs/develop/maps.rst
 create mode 100644 docs/develop/memorymgt.rst
 create mode 100644 docs/develop/optimizations.rst
 create mode 100644 docs/develop/porting.rst
 create mode 100644 docs/develop/publiccapi.rst
 create mode 100644 docs/develop/writingtests.rst

diff --git a/docs/develop/compiler.rst b/docs/develop/compiler.rst
new file mode 100644
index 0000000000000..2007657490f55
--- /dev/null
+++ b/docs/develop/compiler.rst
@@ -0,0 +1,317 @@
+.. _compiler:
+
+The Compiler
+============
+
+The compilation process in MicroPython involves the following steps:
+
+* The lexer converts the stream of text that makes up a MicroPython program into tokens.
+* The parser then converts the tokens into an abstract syntax (parse tree).
+* Then bytecode or native code is emitted based on the parse tree.
+
+For purposes of this discussion we are going to add a simple language feature ``add1``
+that can be use in Python as:
+
+.. code-block:: bash
+
+    >>> add1 3
+    4
+    >>>
+
+The ``add1`` statement takes an integer as argument and adds ``1`` to it.
+
+Adding a grammar rule
+----------------------
+
+MicroPython's grammar is based on the `CPython grammar <https://docs.python.org/3.5/reference/grammar.html>`_
+and is defined in `py/grammar.h <https://github.com/micropython/micropython/blob/master/py/grammar.h>`_.
+This grammar is what is used to parse MicroPython source files.
+
+There are two macros you need to know to define a grammar rule: ``DEF_RULE`` and ``DEF_RULE_NC``.
+``DEF_RULE`` allows you to define a rule with an associated compile function,
+while ``DEF_RULE_NC`` has no compile (NC) function for it.
+
+A simple grammar definition with a compile function for our new ``add1`` statement
+looks like the following:
+
+.. code-block:: c
+
+   DEF_RULE(add1_stmt, c(add1_stmt), and(2), tok(KW_ADD1), rule(testlist))
+
+The second argument ``c(add1_stmt)`` is the corresponding compile function that should be implemented
+in ``py/compile.c`` to turn this rule into executable code.
+
+The third required argument can be ``or`` or ``and``. This specifies the number of nodes associated
+with a statement. For example, in this case, our ``add1`` statement is similar to ADD1 in assembly
+language. It takes one numeric argument. Therefore, the ``add1_stmt`` has two nodes associated with it.
+One node is for the statement itself, i.e the literal ``add1`` corresponding to ``KW_ADD1``,
+and the other for its argument, a ``testlist`` rule which is the top-level expression rule.
+
+.. note::
+   The ``add1`` rule here is just an example and not part of the standard
+   MicroPython grammar.
+
+The fourth argument in this example is the token associated with the rule, ``KW_ADD1``. This token should be
+defined in the lexer by editing ``py/lexer.h``.
+
+Defining the same rule without a compile function is achieved by using the ``DEF_RULE_NC`` macro
+and omitting the compile function argument:
+
+.. code-block:: c
+
+   DEF_RULE_NC(add1_stmt, and(2), tok(KW_ADD1), rule(testlist))
+
+The remaining arguments take on the same meaning. A rule without a compile function must
+be handled explicitly by all rules that may have this rule as a node. Such NC-rules are usually
+used to express sub-parts of a complicated grammar structure that cannot be expressed in a
+single rule.
+
+.. note::
+   The macros ``DEF_RULE`` and ``DEF_RULE_NC`` take other arguments. For an in-depth understanding of
+   supported parameters, see `py/grammar.h <https://github.com/micropython/micropython/blob/master/py/grammar.h>`_.
+
+Adding a lexical token
+----------------------
+
+Every rule defined in the grammar should have a token associated with it that is defined in ``py/lexer.h``.
+Add this token by editing the ``_mp_token_kind_t`` enum:
+
+.. code-block:: c
+   :emphasize-lines: 12
+
+   typedef enum _mp_token_kind_t {
+       ...
+       MP_TOKEN_KW_OR,
+       MP_TOKEN_KW_PASS,
+       MP_TOKEN_KW_RAISE,
+       MP_TOKEN_KW_RETURN,
+       MP_TOKEN_KW_TRY,
+       MP_TOKEN_KW_WHILE,
+       MP_TOKEN_KW_WITH,
+       MP_TOKEN_KW_YIELD,
+       MP_TOKEN_KW_ADD1,
+       ...
+   } mp_token_kind_t;
+
+Then also edit ``py/lexer.c`` to add the new keyword literal text:
+
+.. code-block:: c
+   :emphasize-lines: 12
+
+   STATIC const char *const tok_kw[] = {
+       ...
+       "or",
+       "pass",
+       "raise",
+       "return",
+       "try",
+       "while",
+       "with",
+       "yield",
+       "add1",
+       ...
+   };
+
+Notice the keyword is named depending on what you want it to be. For consistency, maintain the
+naming standard accordingly.
+
+.. note::
+   The order of these keywords in ``py/lexer.c`` must match the order of tokens in the enum
+   defined in ``py/lexer.h``.
+
+Parsing
+-------
+
+In the parsing stage the parser takes the tokens produced by the lexer and converts them to an abstract syntax tree (AST) or
+*parse tree*. The implementation for the parser is defined in `py/parse.c <https://github.com/micropython/micropython/blob/master/py/parse.c>`_.
+
+The parser also maintains a table of constants for use in different aspects of parsing, similar to what a
+`symbol table <https://steemit.com/programming/@drifter1/writing-a-simple-compiler-on-my-own-symbol-table-basic-structure>`_
+does.
+
+Several optimizations like `constant folding <http://compileroptimizations.com/category/constant_folding.htm>`_
+on integers for most operations e.g. logical, binary, unary, etc, and optimizing enhancements on parenthesis
+around expressions are performed during this phase, along with some optimizations on strings.
+
+It's worth noting that *docstrings* are discarded and not accessible to the compiler.
+Even optimizations like `string interning <https://en.wikipedia.org/wiki/String_interning>`_ are
+not applied to *docstrings*.
+
+Compiler passes
+---------------
+
+Like many compilers, MicroPython compiles all code to MicroPython bytecode or native code. The functionality
+that achieves this is implemented in `py/compile.c <https://github.com/micropython/micropython/blob/master/py/compile.c>`_.
+The most relevant method you should know about is this:
+
+.. code-block:: c
+
+   mp_obj_t mp_compile(mp_parse_tree_t *parse_tree, qstr source_file, bool is_repl) {
+       // Compile the input parse_tree to a raw-code structure.
+       mp_raw_code_t *rc = mp_compile_to_raw_code(parse_tree, source_file, is_repl);
+       // Create and return a function object that executes the outer module.
+       return mp_make_function_from_raw_code(rc, MP_OBJ_NULL, MP_OBJ_NULL);
+   }
+
+The compiler compiles the code in four passes: scope, stack size, code size and emit.
+Each pass runs the same C code over the same AST data structure, with different things
+being computed each time based on the results of the previous pass.
+
+First pass
+~~~~~~~~~~
+
+In the first pass, the compiler learns about the known identifiers (variables) and
+their scope, being global, local, closed over, etc. In the same pass the emitter
+(bytecode or native code) also computes the number of labels needed for the emitted
+code.
+
+.. code-block:: c
+
+   // Compile pass 1.
+   comp->emit = emit_bc;
+   comp->emit_method_table = &emit_bc_method_table;
+
+   uint max_num_labels = 0;
+   for (scope_t *s = comp->scope_head; s != NULL && comp->compile_error == MP_OBJ_NULL; s = s->next) {
+       if (s->emit_options == MP_EMIT_OPT_ASM) {
+           compile_scope_inline_asm(comp, s, MP_PASS_SCOPE);
+       } else {
+           compile_scope(comp, s, MP_PASS_SCOPE);
+
+           // Check if any implicitly declared variables should be closed over.
+           for (size_t i = 0; i < s->id_info_len; ++i) {
+               id_info_t *id = &s->id_info[i];
+               if (id->kind == ID_INFO_KIND_GLOBAL_IMPLICIT) {
+                   scope_check_to_close_over(s, id);
+               }
+           }
+       }
+       ...
+   }
+
+Second and third passes
+~~~~~~~~~~~~~~~~~~~~~~~
+
+The second and third passes involve computing the Python stack size and code size
+for the bytecode or native code. After the third pass the code size cannot change,
+otherwise jump labels will be incorrect.
+
+.. code-block:: c
+
+   for (scope_t *s = comp->scope_head; s != NULL && comp->compile_error == MP_OBJ_NULL; s = s->next) {
+       ...
+
+       // Pass 2: Compute the Python stack size.
+       compile_scope(comp, s, MP_PASS_STACK_SIZE);
+
+       // Pass 3: Compute the code size.
+       if (comp->compile_error == MP_OBJ_NULL) {
+           compile_scope(comp, s, MP_PASS_CODE_SIZE);
+       }
+
+       ...
+   }
+
+Just before pass two there is a selection for the type of code to be emitted, which can
+either be native or bytecode.
+
+.. code-block:: c
+
+   // Choose the emitter type.
+   switch (s->emit_options) {
+       case MP_EMIT_OPT_NATIVE_PYTHON:
+       case MP_EMIT_OPT_VIPER:
+           if (emit_native == NULL) {
+               emit_native = NATIVE_EMITTER(new)(&comp->compile_error, &comp->next_label, max_num_labels);
+           }
+           comp->emit_method_table = NATIVE_EMITTER_TABLE;
+           comp->emit = emit_native;
+           break;
+
+       default:
+           comp->emit = emit_bc;
+           comp->emit_method_table = &emit_bc_method_table;
+           break;
+   }
+
+The bytecode option is the default but something unique to note for the native
+code option is that there is another option via ``VIPER``. See the
+:ref:`Emitting native code <emitting_native_code>` section for more details on
+viper annotations.
+
+There is also support for *inline assembly code*, where assembly instructions are
+written as Python function calls but are emitted directly as the corresponding
+machine code. This assembler has only three passes (scope, code size, emit)
+and uses a different implementation, not the ``compile_scope`` function.
+See the `inline assembler tutorial <https://docs.micropython.org/en/latest/pyboard/tutorial/assembler.html#pyboard-tutorial-assembler>`_
+for more details.
+
+Fourth pass
+~~~~~~~~~~~
+
+The fourth pass emits the final code that can be executed, either bytecode in
+the virtual machine, or native code directly by the CPU.
+
+.. code-block:: c
+
+   for (scope_t *s = comp->scope_head; s != NULL && comp->compile_error == MP_OBJ_NULL; s = s->next) {
+       ...
+
+       // Pass 4: Emit the compiled bytecode or native code.
+       if (comp->compile_error == MP_OBJ_NULL) {
+           compile_scope(comp, s, MP_PASS_EMIT);
+       }
+   }
+
+Emitting bytecode
+-----------------
+
+Statements in Python code usually correspond to emitted bytecode, for example ``a + b``
+generates "push a" then "push b" then "binary op add". Some statements do not emit
+anything but instead affect other things like the scope of variables, for example
+``global a``.
+
+The implementation of a function that emits bytecode looks similar to this:
+
+.. code-block:: c
+
+   void mp_emit_bc_unary_op(emit_t *emit, mp_unary_op_t op) {
+       emit_write_bytecode_byte(emit, 0, MP_BC_UNARY_OP_MULTI + op);
+   }
+
+We use the unary operator expressions for an example here but the implementation
+details are similar for other statements/expressions. The method ``emit_write_bytecode_byte()``
+is a wrapper around the main function ``emit_get_cur_to_write_bytecode()`` that all
+functions must call to emit bytecode.
+
+.. _emitting_native_code:
+
+Emitting native code
+---------------------
+
+Similar to how bytecode is generated, there should be a corresponding function in ``py/emitnative.c`` for each
+code statement:
+
+.. code-block:: c
+
+   STATIC void emit_native_unary_op(emit_t *emit, mp_unary_op_t op) {
+        vtype_kind_t vtype;
+        emit_pre_pop_reg(emit, &vtype, REG_ARG_2);
+        if (vtype == VTYPE_PYOBJ) {
+            emit_call_with_imm_arg(emit, MP_F_UNARY_OP, op, REG_ARG_1);
+            emit_post_push_reg(emit, VTYPE_PYOBJ, REG_RET);
+        } else {
+            adjust_stack(emit, 1);
+            EMIT_NATIVE_VIPER_TYPE_ERROR(emit,
+                MP_ERROR_TEXT("unary op %q not implemented"), mp_unary_op_method_name[op]);
+        }
+   }
+
+The difference here is that we have to handle *viper typing*. Viper annotations allow
+us to handle more than one type of variable. By default all variables are Python objects,
+but with viper a variable can also be declared as a machine-typed variable like a native
+integer or pointer. Viper can be thought of as a superset of Python, where normal Python
+objects are handled as usual, while native machine variables are handled in an optimised
+way by using direct machine instructions for the operations. Viper typing may break
+Python equivalence because, for example, integers become native integers and can overflow
+(unlike Python integers which extend automatically to arbitrary precision).
diff --git a/docs/develop/extendingmicropython.rst b/docs/develop/extendingmicropython.rst
new file mode 100644
index 0000000000000..7fb1ae47a0e4e
--- /dev/null
+++ b/docs/develop/extendingmicropython.rst
@@ -0,0 +1,19 @@
+.. _extendingmicropython:
+
+Extending MicroPython in C
+==========================
+
+This chapter describes options for implementing additional functionality in C, but from code
+written outside of the main MicroPython repository. The first approach is useful for building
+your own custom firmware with some project-specific additional modules or functions that can
+be accessed from Python. The second approach is for building modules that can be loaded at runtime.
+
+Please see the :ref:`library section <internals_library>` for more information on building core modules that
+live in the main MicroPython repository.
+
+.. toctree::
+   :maxdepth: 3
+
+   cmodules.rst
+   natmod.rst
+   
\ No newline at end of file
diff --git a/docs/develop/gettingstarted.rst b/docs/develop/gettingstarted.rst
new file mode 100644
index 0000000000000..3dd00a579a2b7
--- /dev/null
+++ b/docs/develop/gettingstarted.rst
@@ -0,0 +1,324 @@
+.. _gettingstarted:
+
+Getting Started
+===============
+
+This guide covers a step-by-step process on setting up version control, obtaining and building
+a copy of the source code for a port, building the documentation, running tests, and a description of the 
+directory structure of the MicroPython code base.
+
+Source control with git
+-----------------------
+
+MicroPython is hosted on `GitHub <https://github.com/micropython/micropython>`_ and uses
+`Git <https://git-scm.com>`_ for source control. The workflow is such that
+code is pulled and pushed to and from the main repository. Install the respective version
+of Git for your operating system to follow through the rest of the steps.
+
+.. note::
+   For a reference on the installation instructions, please refer to 
+   the `Git installation instructions <https://git-scm.com/book/en/v2/Getting-Started-Installing-Git>`_.
+   Learn about the basic git commands in this `Git Handbook <https://guides.github.com/introduction/git-handbook/>`_
+   or any other sources on the internet.
+
+Get the code
+------------
+
+It is recommended that you maintain a fork of the MicroPython repository for your development purposes.
+The process of obtaining the source code includes the following:
+
+#. Fork the repository https://github.com/micropython/micropython
+#. You will now have a fork at <https://github.com/<your-user-name>/micropython>.
+#. Clone the forked repository using the following command:
+
+.. code-block:: bash
+
+   $ git clone https://github.com/<your-user-name>/micropython
+
+Then, `configure the remote repositories <https://git-scm.com/book/en/v2/Git-Basics-Working-with-Remotes>`_ to be able to
+collaborate on the MicroPython project.
+
+Configure remote upstream:
+
+.. code-block:: bash
+
+   $ cd micropython
+   $ git remote add upstream https://github.com/micropython/micropython
+
+It is common to configure ``upstream`` and ``origin`` on a forked repository
+to assist with sharing code changes. You can maintain your own mapping but
+it is recommended that ``origin`` maps to your fork and ``upstream`` to the main
+MicroPython repository.
+
+After the above configuration, your setup should be similar to this:
+
+.. code-block:: bash
+   
+   $ git remote -v
+   origin	https://github.com/<your-user-name>/micropython (fetch)
+   origin	https://github.com/<your-user-name>/micropython (push)
+   upstream	https://github.com/micropython/micropython (fetch)
+   upstream	https://github.com/micropython/micropython (push)
+
+You should now have a copy of the source code. By default, you are pointing
+to the master branch. To prepare for further development, it is recommended
+to work on a development branch.
+
+.. code-block:: bash
+
+    $ git checkout -b dev-branch
+
+You can give it any name. You will have to compile MicroPython whenever you change 
+to a different branch.
+
+Compile and build the code
+--------------------------
+
+When compiling MicroPython, you compile a specific :term:`port`, usually
+targeting a specific :ref:`board <glossary>`. Start by installing the required dependencies.
+Then build the MicroPython cross-compiler before you can successfully compile and build.
+This applies specifically when using Linux to compile.
+The Windows instructions are provided in a later section.
+
+.. _required_dependencies:
+
+Required dependencies
+~~~~~~~~~~~~~~~~~~~~~
+
+Install the required dependencies for Linux:
+
+.. code-block:: bash
+
+   $ sudo apt-get install build-essential libffi-dev git pkg-config
+
+For the stm32 port, the ARM cross-compiler is required:
+
+.. code-block:: bash
+
+   $ sudo apt-get install arm-none-eabi-gcc arm-none-eabi-binutils arm-none-eabi-newlib
+
+See the `ARM GCC
+toolchain <https://developer.arm.com/tools-and-software/open-source-software/developer-tools/gnu-toolchain/gnu-rm>`_
+for the latest details.
+
+Python is also required. Python 2 is supported for now, but we recommend using Python 3.
+Check that you have Python available on your system:
+
+.. code-block:: bash
+
+   $ python3
+   Python 3.5.0 (default, Jul 17 2020, 14:04:10) 
+   [GCC 5.4.0 20160609] on linux
+   Type "help", "copyright", "credits" or "license" for more information.
+   >>> 
+
+All supported ports have different dependency requirements, see their respective
+`readme files <https://github.com/micropython/micropython/tree/master/ports>`_.
+
+Building the MicroPython cross-compiler
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Almost all ports require building ``mpy-cross`` first to perform pre-compilation
+of Python code that will be included in the port firmware:
+
+.. code-block:: bash
+
+   $ cd mpy-cross
+   $ make
+
+.. note::
+   Note that, ``mpy-cross`` must be built for the host architecture
+   and not the target architecture.
+
+If it built successfully, you should see a message similar to this:
+
+.. code-block:: bash
+
+   LINK mpy-cross
+      text	   data	    bss	    dec	    hex	filename
+    279328	    776	    880	 280984	  44998	mpy-cross
+
+.. note::
+
+   Use ``make -C mpy-cross`` to build the cross-compiler in one statement
+   without moving to the ``mpy-cross`` directory otherwise, you will need
+   to do ``cd ..`` for the next steps.
+
+Building the Unix port of MicroPython
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The Unix port is a version of MicroPython that runs on Linux, macOS, and other Unix-like operating systems.
+It's extremely useful for developing MicroPython as it avoids having to deploy your code to a device to test it.
+In many ways, it works a lot like CPython's python binary.
+
+To build for the Unix port, make sure all Linux related dependencies are installed as detailed in the
+required dependencies section. See the :ref:`required_dependencies`
+to make sure that all dependencies are installed for this port. Also, make sure you have a working
+environment for ``gcc`` and ``GNU make``. Ubuntu 20.04 has been used for the example
+below but other unixes ought to work with little modification:
+
+.. code-block:: bash
+
+   $ gcc --version
+   gcc (Ubuntu 9.3.0-10ubuntu2) 9.3.0
+   Copyright (C) 2019 Free Software Foundation, Inc.
+   This is free software; see the source for copying conditions.  There is NO
+   warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.then build:
+
+.. code-block:: bash
+
+   $ cd ports/unix
+   $ make submodules
+   $ make
+
+If MicroPython built correctly, you should see the following:
+
+.. code-block:: bash
+
+   LINK micropython
+      text	   data	    bss	    dec	    hex	filename
+    412033	   5680	   2496	 420209	  66971	micropython
+
+Now run it:
+
+.. code-block:: bash
+
+   $ ./micropython
+   MicroPython v1.13-38-gc67012d-dirty on 2020-09-13; linux version
+   Use Ctrl-D to exit, Ctrl-E for paste mode
+   >>> print("hello world")
+   hello world
+   >>>
+
+Building the Windows port
+~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The Windows port includes a Visual Studio project file micropython.vcxproj that you can use to build micropython.exe.
+It can be opened in Visual Studio or built from the command line using msbuild. Alternatively, it can be built using mingw,
+either in Windows with Cygwin, or on Linux.
+See `windows port documentation <https://github.com/micropython/micropython/tree/master/ports/windows>`_ for more information.
+
+Building the STM32 port
+~~~~~~~~~~~~~~~~~~~~~~~
+
+Like the Unix port, you need to install some required dependencies
+as detailed in the :ref:`required_dependencies` section, then build:
+
+.. code-block:: bash
+
+   $ cd ports/stm32
+   $ make submodules
+   $ make
+
+Please refer to the `stm32 documentation <https://github.com/micropython/micropython/tree/master/ports/stm32>`_ 
+for more details on flashing the firmware.
+
+.. note::
+   See the :ref:`required_dependencies` to make sure that all dependencies are installed for this port.
+   The cross-compiler is needed. ``arm-none-eabi-gcc`` should also be in the $PATH or specified manually
+   via CROSS_COMPILE, either by setting the environment variable or in the ``make`` command line arguments.
+
+You can also specify which board to use:
+
+.. code-block:: bash
+
+   $ cd ports/stm32
+   $ make submodules
+   $ make BOARD=<board>
+
+See `ports/stm32/boards <https://github.com/micropython/micropython/tree/master/ports/stm32/boards>`_
+for the available boards. e.g. "PYBV11" or "NUCLEO_WB55".
+
+Building the documentation
+--------------------------
+
+MicroPython documentation is created using ``Sphinx``. If you have already
+installed Python, then install ``Sphinx`` using ``pip``. It is recommended
+that you use a virtual environment:
+
+.. code-block:: bash
+
+   $ python3 -m venv env
+   $ source env/bin/activate
+   $ pip install sphinx
+
+Navigate to the ``docs`` directory:
+
+.. code-block:: bash
+
+   $ cd docs
+
+Build the docs:
+
+.. code-block:: bash
+
+   $ make html
+
+Open ``docs/build/html/index.html`` in your browser to view the docs locally. Refer to the 
+documentation on `importing your documentation
+<https://docs.readthedocs.io/en/stable/intro/import-guide.html>`_ to use Read the Docs.
+
+Running the tests
+-----------------
+
+To run all tests in the test suite on the Unix port use:
+
+.. code-block:: bash
+
+   $ cd ports/unix
+   $ make test
+
+To run a selection of tests on a board/device connected over USB use:
+
+.. code-block:: bash
+
+   $ cd tests
+   $ ./run-tests --target minimal --device /dev/ttyACM0
+
+See also :ref:`writingtests`.
+
+Folder structure
+----------------
+
+There are a couple of directories to take note of in terms of where certain implementation details
+are. The following is a break down of the top-level folders in the source code.
+
+py
+
+  Contains the compiler, runtime, and core library implementation.
+
+mpy-cross
+
+  Has the MicroPython cross-compiler which pre-compiles the Python scripts to bytecode.
+
+ports
+
+  Code for all the versions of MicroPython for the supported ports.
+
+lib
+
+  Low-level C libraries used by any port which are mostly 3rd-party libraries.
+
+drivers
+
+  Has drivers for specific hardware and intended to work across multiple ports.
+
+extmod
+
+  Contains a C implementation of more non-core modules.
+
+docs
+
+  Has the standard documentation found at https://docs.micropython.org/.
+
+tests
+
+  An implementation of the test suite.
+
+tools
+
+  Contains helper tools including the ``upip`` and the ``pyboard.py`` module.
+
+examples
+
+  Example code for building MicroPython as a library as well as native modules.
diff --git a/docs/develop/img/bitmap.png b/docs/develop/img/bitmap.png
new file mode 100644
index 0000000000000000000000000000000000000000..87de81d769431782a9cb77c0bc7e11f6e3c07044
GIT binary patch
literal 6388
zcmcIpbx>Ptn}>2+thoD4inK^+OK~XDP^?ICDNu?#0fL4UD8=rD6bZ$-Sc6mCf>T_I
z6n6~??hOPscXwy!+kbXv_WSnCoH^%tW}bKEJ@5Pe<T=s0+Nx9(>=Z;qL{#c(AUz@?
zVrIfEN_K~kp)m^xCOk;ImDLT%$jIhbbyf%=n~#c#kG_Y!kDs-d9g%~(hnt;<w~d#b
zox8WAhtB~?+Y2Hh)<|`bl7WB5-eS;O28Y((BOcY^`@!JBnB+;0)xM&f8lieY6WT-W
z^HU;3?z>v%T9wimKSp9E5wfYkoH{}5`)Lk~ym{uy+`k-^j40(xDEHRbQTHAtIZE*n
zFJvevwkOwhlBnNnJ81K<e|GX`1vH~y(SGPOP@Y)P7#~?lO7y#{8d(TA{hfDV;Y2B?
zd%Kk9uQ)N$;P%mB^=$WDK)VOlM;Y`yAjhg6P6AuoIG3}bA<iPx-XKc(9YDnY54HcI
z5cpSk@iSn-%U9}LE%|Yl4;GXi@-v#%L6bfJBklz7h5EGDiEdwt77GmQt8cg;M=M#u
z7Fp74-F^6+R#zF+t)>1@NK`kO1?s)4g<a=J&~a??!yEQakMyC}cl#g*&N-3{M#^QE
zIXA@RO~u8%^yA4NDg(`a6h2jYaZ~+;`$k(61Tt)twSOG|NlJ&Vp-w3;=0#yTNA5p9
zAm2JG#0CM@M%hl}?wwv!D^>u0gx74Es@^`mW~vC?`}*j%2HHFPXg;P@Ci#PuZf4cd
zx>s(o==-VU)++o&ZUs$g&CUC>^8{7OTYtOWVw#6Qx5h|Fv!RJBwMW~lkY)bTaGwB<
zS29<zp63a_JX$uHn4i}yTAY<=jJ&-H_FT~g=7uudS#Y;_*nq_2);0kzI^sCv{ok&I
ziW)c2(v5Yc_ezT32Tt&l3irha+~ojbHisu&Vx%%iAsyc*+#?=)lFi6NP=0f2i*-O>
z)eEcrL#I@~HlsmPvwBW_5J{QJ94R{&a?I4U4qCOEwVHmbi%3W1L@y*$JwJlWy$ZNr
zo|>AvDk<pLDML}a8Zm%u>147(jmvyDb1f@rSw8OnnuCFnc-VEBntRbqicI)i40t$4
zMK!Q6^V~c<?&vL{Q8<Fgg;)V6!+kDBIGatxZT;s{XB01tGj4OF$|vc^h7(P1zwvC_
z4K~O6iYj>TV&I@!7737w?b`>yD%i-_(I-ENaE!0(oL_anNf1#>_&4nh9|3yXIC4;M
zR5kcCEul`@|KZqha_Y<FS=8lL%%+W>B<;m+!zS26hJI}0La$s!<UVdaxXL#uSU-kx
z@wUzm+<T~1{dmZvg!Ri2E|0o|W`x2_|A(Sk=DBT%PnqLTMB8=1T=l(WO<Kn4ku1-H
zSgCO20$Y3kUcjpW-TYKj<TAaEbWT<uaS9plZ|%R46F*T>CVKsumWbhB6v_lkPPmAj
z_!XZ7y?=O^k_xg7H-D<^0NIRaUlo0fJ_on!a5hv;%)AT{2xE}`r;nw&aqA`3k39ks
zJUgc~8&W@55E1%Jn-bGciT_jnH<?EHifYl0XwLsOz2A~_&sL`wEZH}<o(>J$q<m>R
zxaJb@V4xFca`TFof}Ri#u7gfEG+<101n+`*t0M}xwmc4zQb{eBji74D2%!f8-LKEX
zG$mVGeI6Vn`ibZW&w_EV`tqBtobVJ6%elbg@z_Lj{)GUAS74;MF-=RtH+tvqR1_(P
z33W}l%5a})xN8Ph+I0Vy^E<_iHI0*}`8ep>wJyB><}pC?#l!I$t84cu!BIBZ5e3Ke
zabxDBD*GizA)wG~{+o~cZ`&qpLxPE|861_Hu&Gv1A&#?S@4c@Go){gJ*nWHeZs+KE
zgu+at@Vd;Kv-s`{4NKU;b^pS|ff?6q!_`{eC+xua5I%)jpatvpvo2!$)c}btCmr2l
zqi#N!jjsznyi!kwmCu!J>pnoR0yFoOcp{z5zffT`Ptl5REc`8Z=r~stLAF<z@Obi=
zw#7`lp#5~EL>n%D;F18p1EZ<#8B^|8*;ygI+pT(-1A2v8GEX|aNwCXTY0F>p<(^68
z(9qDIO~L*^!pQ_L9c)`%I&^&Eu(FcDOSok+WdHPKKVKou?3=6F)Eb>P1Ir8tFMhnD
zN;b+(W-<31R!upmu0v*BFC9ypm*=@HNV7`{tX}P0O%G;c9qWj9Vsnswf&v0aq@?w`
zPK`pU?I$lBQRoAQK{KQYexx|()x@!rsySY<*YqZ?x{BEe=Ggz*?*f;31p;LZ&IiF;
zi_~ZHFJ~brOd?p**PAkqcaTeFm(t`@c=(}Qc2bh<Zm17O4u5`gdUkMK;AdA|EaSYf
zWirCn4uOqA#{sv^RS&*oZ@!A-`c)xXHHe9Fj;TYnUV5_8#sAbLCH*34voyYE0Yg_(
z-n*!hC@Y~}tnRroB{>+@x1FzZ!{g30)zqFyN*-_l$b|rlJD)7MKQ72cG{#cSfO{n$
zS=%?$h*5j+^WK*cyZW%fotVc+!VG<~7}|GUI|JcXd79OF)5=kTEKikeT3m~FQHHRk
zpD(*-=1QkSZUV=GvfTe3?p|Yn)R6Il*vg1Jm;G?s_Y;&ha>BW`3?MEc!5;M1!eMH5
zV%cyTc$6edBIRl4Fg{}uv0T1dVeQGu!p@Fa^s9=#{_5+{w)=Z&9xbb~j#cHi+FG|I
z+Fr2SXm4-t!EAMJL-UZb2}`Zg;j?GYYRp7>!S?p{U@-XU)2BV$bV9tp-K%vR%kAmu
zxxBozq}354BoL{o(%?0a4LnyC0C-YpwS%OzYLd9CM)vws^xJssuBN97^?%X-|CPeW
zcSK>++}9V{b4v^_L$ldkc8OW1^nDJ(%gpP2ucTH4a`W<H<$wFwBq6rUxStTTGN27y
z7-nn_`6nSVu^f8D@t44VKp&do@98EcidlDtQ#+&%wJ^w#3V6NK1pokYqXK+<Y(c*-
z-XjlHa+|L!vucBplap_4ZM8h$B~*#KObKUgLu4|IO5CW5Dl5lk)-f_r=CIyN94;+2
zmCfE<CNnOIo}PYSV1U;{-X<m1SC*LTlQSbF6nYJX_P}`*V9=Fxq48rw5Qv5{5&4SS
zNPfr6AT>Tz{Zrc$edG8{PBwlX1$A!L)C|bWX_0m2WE4s+n5O#g1!n%o1r8ckRwSp3
zcRVf5xSl}jWRJ{=FFsRvB%(S|Rw8<9+qIuYj*ZKB0pT6n%yu%b&XRiVugAv5W>!`w
zo`u8VQc_ss)ogdckj%faQ5~u(`=Yd{$VH*@7b`t0J2N|bqtcrt=>4Kc3$>TAMWLag
z9;JN`VWm=r+O8%bvnwa&@`))BsjL~jsmxWwx$$CQfMZB-K$EapO<`qar8u_@4U&WG
zIl$ukm+gVbfF^2J$-SP+jm2W}bU2T+{{~5;{fF^*irlo_vi{}RCC`=1BZc9E>`YYs
z<yfbJ<zh2TbXe_AuUc30kKK^4$nYq1Z;W@gm8&O@d?`G~7hM#enp*VJIY?D*I2<CK
zv-)16{qiE3TjKdC8*`1Evk6bGDrrnw!XKMeA;TY|qj=Z(r49xJ%PID(41|wjs<xw~
zM!#QW?6Bch+3E0~6LG84`z{KfHDRr>C9*HK9g2l5$t=>*PQOlO@7aEXpY8p^;kGu<
zRv4K1wKHbCg(NAg`FPn|<Xld8<D#BRjs&yvG&YV3xCEPRIqkcErkF)M0!KRa@{3Ab
zRxljGBEn{0<tLt1KNfWpiq2p;-Ike)I0<|3%iE<KRtf2fX~FxA{t{j1iaHH!S(S87
za=)wfmw=b8w5x0T!+q@Frkj4L2*>_(EwpOvrxQD2I1n>4a2TIV^SY^+0ud3VwjsCO
z<<^n*XIacVyi8vo_84iR0_r~Vqs~|<#Wk@`GY~jM9AIH+tsUR9l(YA`wC&2Vx2iOQ
zLk6f9oazmkahwj#sBW$n6vbvM&=*lEylp!6lqT%1kZxG_5F#`UZ_ZTg%W@x7d|k8A
zA}z=juMLs8E$)NO5WPHLA&VnOEB43yT8HYuH$3ru%4>2?n*)mEZ&U_{IwsbDhFBYW
z?tsEP;w*3DyR!^q`Diq@-=%AV9dp20<5ec~)567c0frk`sbCi1xwu}bO{SL4{th14
zD2rF>KeGjZZ@SVDSzK8d;u@Q&S%&@kWf+G}qgV(UjfN}S%pA^(i(yaAbInU-Se$@u
zMVZfijggkXNrJv%2qk!x{{*Y(Z{>YT6^22F%d$?*m8wc0kd17;6#X52YYOAQyu3Ww
zEBcJS|6P#1)0LK%?%`IJe5w3S*T0H{h(T_aID|ZFm#8J9GHbW}1Z6ETx97<i*1OVA
zo%x9X&<5B<E&}JSt*r%i4A;j0M<P&3Zum3dm4M5l&0@hw28u@Sl9jU}`KOGIqTMqj
zXh7Sz4oj<#8%2{BBYU&E#lO3%w@_4N<U7X(zdP*{WdEdk?ATLn=S}I8mu~VLBp~9~
zPR9NIu}|hkE1>_5^LI1~?TwS_9sjIH!0QpC4LPf0N5A}{qqr?CPn{>rn{}F)H{%Pp
z6CdBMElkYwYjHVjitYcB=D5IXPIGldSZe<bQx6~RpMJbPp*gM|9j=i>?c~{{xm(~D
zb(YofSLm5_nqxQ*o423cfWv^hh5V@oK{+r9oSktLloUaQ0T!md1NlWtqdHW0d`9e5
ztILas$qcnWVA2mA(Ip<?`^}~9ZI><jV#rtBR_^sNFCN%eyrmNxPw4Z?hd1L}Vqzli
z&9Kl)g!1PL4Zir*cDu8G<=X7T^dUfY&wXXeW*NWPS7gl7Ex;xGpm=Br)i5c)eps1)
zwOrY+5pa-Buwa*qK`u9H9&RSv?z43f4ptdk7toWgsiZHW%YI&dJ2r(}cRJ{&;6@zU
zu1Pen0nU!P7nSh0)oOE*=&{h;s{ECC7OTt`;Zc3=sJ89%(UB#}Y9U;6%P0k#YIp2x
z-Ew9Y;HMvm=73xK=5!Z5(>9Qe^%TS8x>d)WS=A4Z_UOt^0Y1uqtCY90S|-pzmxpmf
zIE0a2%QVpff_rUv^NaLqIXC#t$?=?am-A1vrSV*Xb~~$It-&<itNq&1qc<rR`ys;R
zMQ7o$Z&_bO9otM>7cxjt$1S6w#U3`0<}~X2d_E))7aGeY6Ljth-#5_K)`piaABH1z
zIbc!CuA*<=jQN%6cS{(VK`aK5To$orz4J3suEHwL5Ka5JAdP~EsHhLCW%^EHlR^6D
z_+1%GyPKXLUAd6?X&sJEws)dg%Ku2OuL{YX4uT<tg>x{1t4qmjZr0rCf5}8ZqpSgZ
z&(dJM!nQP~plU&X`C2W%73DQn48KtU@g}R;X|M9Uc2m>1F_^sxQyMN(nJ;-D`8a!g
zxjpEFakkFQybXpY(C^UjaFD7RVHd5=;Es%JP-Re5<Osg-{Ui<^HW!@2Mt?KbxgA%L
zb`I6mU3oMQsnoXv`6e1cug5n{0s0XUNCRy%Zm}viu<2!$pARVukBcmQ(I47b4Z#6#
zqUwLLdXzj}GJ=g=Ip1&a)`>K&wm*`qnAoW?b8}IPjg9T$Hl9x1Im2nUteo;}d_Cl-
zZCPr(ygah9<$yKAU@&<+7%d<bM@dB$oVOLE?{5WJ&9*R61)#wJ0Ri&C-#e$K>H^F;
zdynLJczD_zM!DDb#VM^VChv6&_VxX6uI20{c<b+ktGk;u2vkadk;z<@KiD}q*4NjA
z{tH*Ox}zCl<zx24!`uIY6=Xk#?#wa%4tT=E@1;^saAi#Y8uusi<DlVVGz0poc*0NY
zZpgVOko5n<*M6oYd$~$adh+Dc)J)f<H1BWxynZ>|rHF!=j+5FMn}IFU$0zWuo?j;*
z5T-LYhCVTxoIKQN6}c<iQlPh}XVI3Fi7C@gmv$Hw2LfRYe{7R+0D%x+42Hx`jqEQQ
zl*zN15%+JIKH(0B7_tw7hJw*%IvW_q)i}Bs4V7+MaC_E3CzEzU{W$ew@<T81=le%y
zhfb#b<<jeNnVh`T>k=Eq>Bc6h%|{Sp(#pohf^Mg^XWwhLqIZbjSIh)+bhTJya`I6x
zd5^d4y-y-&YQw~)jl?`YUt%w~FM~)J&4w_f@-uR|csR|a_k!<in_?5IN~ux4J%T(9
zAda3ZF#S|e(A()O=^^Kt9yJ-mw^{^QRUO1)4ewU^#zcMEL4YQ|6c+K~S=)9&V5fjt
z%P(PfPbQKq*!k)2OytVb0l0o=rlCzYk7<!8>U!}SF@KGrw7gHvG0YG@wAlYuoj+S-
zJ^C`f{F&Y(4~BTH!~JJ=TY4<!KuRaiC;<c_NkY6W;Ub%B^Su&C;zsOa!51%Yq2_1r
z2(<C(LQ}ZG;4QSM;Zy@W#c#U*x<Wd;<ip<Gy7%fQJh<a66zKifwL@;JnKKYLZYi6_
zx`p9IsPWS8m{UOXu|j;~0BAF!knm9gNi2btUo`d###bNTRQtK7YLWVKqQ`^MqoQgW
zD*=>VkplLJA_GAL2ENM0GoDtM)rZnFS5$sCmllPoJ+pxQ+Di!2_;MKF^+*R~;9J|U
zs6v9!`-S#E6l)~RQ0)&e6Iv6jZe<u>yUo3UftadJ9UB{kH%)z;<L8v8;sSaIOMRE@
z4f?b)(73UwZXxfupiVdcR=ieb@$p!+^?s|!r=K7*J6t3M0=ckUC$!Gwtjt%EIrNd{
z1|$89EaANS4iZ4$Pa6%|VnVh4aJNo=-?&@J_o}a}#n2p8a3eba3xY^=M5p5sgsSh_
ztC75e=g5fp?N|Oo{Wl80gowyPS)^1HX@fgzGrLt@8JF&Yjnd^|G_9KJ$IhD|fV<Nb
zQ$#+cGV+RPTZSg6o>YjIvOEQ$nWQ9OV1BsdQcmyfUD?&ZH!H&8h8duKeBTohGyI(%
z8BIA}QI{cFBI-(h;Y(|tmQLe&nD)g|PZg9e&-^%9L~Z`5Lq=p`7cJ@Zx0<aTqRhWo
zzOJ#dd2G{HwkQ@983#8`epjxm(XE)C&JHlPmjoOQl?4XdxOMP<Xr_DP@H{XWpIW$z
zau{MWY-znQGMZFd^42f1teF15Y~MBS-@`bGISbSRuQ^&W>$@)C?{v_4Dep%Y41aJE
zHj&Aod0|p9%}G_A_*nkdF$Y%~)#3Zbick=Yzo@N^6-lJbEs&UiPhry;5)KS&U$@<~
zI?T%uXT7$v;knCpKfdnTB+Wldz<FG+K(EM%`&43nypC41LYLvF_@ro1LP$f<8GDsr
zWKooPj1DV|1>w+oUuTSz5rT#c{o&UYckc0{N0qsDunGPJ_*=R&Q*SpkCVARku$vN|
zTx?KmUc9R|>rp|v(tlbWes3_t-_FSt3;&}AQU4Q^-)f+1F90WtKLUXe1;+DujdC;7
zb9B9`LA~K~6JQ5`OeW8dulp)ei$zG{yS=evk-9~d(88dYMh-vh+vL}#{1tN%aYN>>
z!iG>$07B#EbwX<a>Cz~ny}3A|Eo%Zy|Gk%vLZ-lv4}`kiD)l+2vden!U3psj5jvSu
z^NwQ;pX{D$nT>hGthrgFMLF)L5@7MiS)hDNLX;~>r(Mhn%lECSs4y1&3F8LVAQr`U
z;kbG7#q|@<Bjuy9<IEeWfRE)EJ5>PD%a?>UWY#`GG22T~{7)Kq<Cd6iU7q{q`xfDs
Q1QC(CiZ-ZR`CZt*0UyryJ^%m!

literal 0
HcmV?d00001

diff --git a/docs/develop/img/collision.png b/docs/develop/img/collision.png
new file mode 100644
index 0000000000000000000000000000000000000000..a67ddd6137c0f0b091c29eaa48460ff3d35a74b1
GIT binary patch
literal 3464
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

literal 0
HcmV?d00001

diff --git a/docs/develop/img/linprob.png b/docs/develop/img/linprob.png
new file mode 100644
index 0000000000000000000000000000000000000000..c28818908464d973d2a9c9cbffdfe31980cb4ff7
GIT binary patch
literal 3655
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

literal 0
HcmV?d00001

diff --git a/docs/develop/index.rst b/docs/develop/index.rst
index f1fd0692ec9e1..7a6a6be67c5b9 100644
--- a/docs/develop/index.rst
+++ b/docs/develop/index.rst
@@ -1,14 +1,27 @@
-Developing and building MicroPython
-===================================
+MicroPython Internals
+=====================
 
-This chapter describes some options for extending MicroPython in C. Note
-that it doesn't aim to be a complete guide for developing with MicroPython.
-See the `getting started guide
-<https://github.com/micropython/micropython/wiki/Getting-Started>`_ for further information.
+This chapter covers a tour of MicroPython from the perspective of a developer, contributing
+to MicroPython. It acts as a comprehensive resource on the implementation details of MicroPython
+for both novice and expert contributors.
+
+Development around MicroPython usually involves modifying the core runtime, porting or 
+maintaining a new library. This guide describes at great depth, the implementation
+details of MicroPython including a getting started guide, compiler internals, porting
+MicroPython to a new platform and implementing a core MicroPython library.
 
 .. toctree::
-   :maxdepth: 1
+   :maxdepth: 3
 
-   cmodules.rst
+   gettingstarted.rst
+   writingtests.rst
+   compiler.rst
+   memorymgt.rst
+   library.rst
+   optimizations.rst
    qstr.rst
-   natmod.rst
+   maps.rst
+   publiccapi.rst
+   extendingmicropython.rst
+   porting.rst
+   
\ No newline at end of file
diff --git a/docs/develop/library.rst b/docs/develop/library.rst
new file mode 100644
index 0000000000000..bebddcc8a3605
--- /dev/null
+++ b/docs/develop/library.rst
@@ -0,0 +1,86 @@
+.. _internals_library:
+
+Implementing a Module
+=====================
+
+This chapter details how to implement a core module in MicroPython.
+MicroPython modules can be one of the following:
+
+- Built-in module: A general module that is be part of the MicroPython repository.
+- User module: A module that is useful for your specific project that you maintain
+  in your own repository or private codebase.
+- Dynamic module: A module that can be deployed and imported at runtime to your device.
+
+A module in MicroPython can be implemented in one of the following locations:
+
+- py/: A core library that mirrors core CPython functionality.
+- extmod/: A CPython or MicroPython-specific module that is shared across multiple ports.
+- ports/<port>/: A port-specific module.
+
+.. note::
+   This chapter describes modules implemented in ``py/`` or core modules.
+   See :ref:`extendingmicropython` for details on implementing an external module.
+   For details on port-specific modules, see :ref:`porting_to_a_board`.
+
+Implementing a core module
+--------------------------
+
+Like CPython, MicroPython has core builtin modules that can be accessed through import statements.
+An example is the ``gc`` module discussed in :ref:`memorymanagement`.
+
+.. code-block:: bash
+
+   >>> import gc
+   >>> gc.enable()
+   >>>
+
+MicroPython has several other builtin standard/core modules like ``io``, ``uarray`` etc.
+Adding a new core module involves several modifications.
+
+First, create the ``C`` file in the ``py/`` directory. In this example we are adding a
+hypothetical new module ``subsystem`` in the file ``modsubsystem.c``:
+
+.. code-block:: c
+
+   #include "py/builtin.h"
+   #include "py/runtime.h"
+
+   #if MICROPY_PY_SUBSYSTEM
+
+   // info()
+   STATIC mp_obj_t py_subsystem_info(void) {
+       return MP_OBJ_NEW_SMALL_INT(42);
+   }
+   MP_DEFINE_CONST_FUN_OBJ_0(subsystem_info_obj, py_subsystem_info);
+
+   STATIC const mp_rom_map_elem_t mp_module_subsystem_globals_table[] = {
+       { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_subsystem) },
+       { MP_ROM_QSTR(MP_QSTR_info), MP_ROM_PTR(&subsystem_info_obj) },
+   };
+   STATIC MP_DEFINE_CONST_DICT(mp_module_subsystem_globals, mp_module_subsystem_globals_table);
+
+   const mp_obj_module_t mp_module_subsystem = {
+       .base = { &mp_type_module },
+       .globals = (mp_obj_dict_t *)&mp_module_subsystem_globals,
+   };
+
+   MP_REGISTER_MODULE(MP_QSTR_subsystem, mp_module_subsystem, MICROPY_PY_SUBSYSTEM);
+
+   #endif
+
+The implementation includes a definition of all functions related to the module and adds the
+functions to the module's global table in ``mp_module_subsystem_globals_table``. It also
+creates the module object with ``mp_module_subsystem``.  The module is then registered with
+the wider system via the ``MP_REGISTER_MODULE`` macro.
+
+After building and running the modified MicroPython, the module should now be importable:
+
+.. code-block:: bash
+
+   >>> import subsystem
+   >>> subsystem.info()
+   42
+   >>>
+
+Our ``info()`` function currently returns just a single number but can be extended
+to do anything.  Similarly, more functions can be added to this new module.
diff --git a/docs/develop/maps.rst b/docs/develop/maps.rst
new file mode 100644
index 0000000000000..8f899fa1d3462
--- /dev/null
+++ b/docs/develop/maps.rst
@@ -0,0 +1,63 @@
+.. _maps:
+
+Maps and Dictionaries
+=====================
+
+MicroPython dictionaries and maps use techniques called open addressing and linear probing.
+This chapter details both of these methods.
+
+Open addressing
+---------------
+
+`Open addressing <https://en.wikipedia.org/wiki/Open_addressing>`_ is used to resolve collisions.
+Collisions are very common occurrences and happen when two items happen to hash to the same
+slot or location. For example, given a hash setup as this:
+
+.. image:: img/collision.png
+
+If there is a request to fill slot ``0`` with ``70``, since the slot ``0`` is not empty, open addressing
+finds the next available slot in the dictionary to service this request. This sequential search for an alternate
+location is called *probing*. There are several sequence probing algorithms but MicroPython uses
+linear probing that is described in the next section.
+
+Linear probing
+--------------
+
+Linear probing is one of the methods for finding an available address or slot in a dictionary. In MicroPython,
+it is used with open addressing. To service the request described above, unlike other probing algorithms,
+linear probing assumes a fixed interval of ``1`` between probes. The request will therefore be serviced by
+placing the item in the next free slot which is slot ``4`` in our example:
+
+.. image:: img/linprob.png
+
+The same methods i.e open addressing and linear probing are used to search for an item in a dictionary.
+Assume we want to search for the data item ``33``. The computed hash value will be 2. Looking at slot 2
+reveals ``33``, at this point, we return ``True``. Searching for ``70`` is quite different as there was a
+collision at the time of insertion. Therefore computing the hash value is ``0`` which is currently
+holding ``44``. Instead of simply returning ``False``, we perform a sequential search starting at point
+``1`` until the item ``70`` is found or we encounter a free slot. This is the general way of performing
+look-ups in hashes:
+
+.. code-block:: c
+
+   // not yet found, keep searching in this table
+   pos = (pos + 1) % set->alloc;
+
+   if (pos == start_pos) {
+       // search got back to starting position, so index is not in table
+       if (lookup_kind & MP_MAP_LOOKUP_ADD_IF_NOT_FOUND) {
+           if (avail_slot != NULL) {
+               // there was an available slot, so use that
+               set->used++;
+               *avail_slot = index;
+               return index;
+           } else {
+               // not enough room in table, rehash it
+               mp_set_rehash(set);
+               // restart the search for the new element
+               start_pos = pos = hash % set->alloc;
+           }
+       }
+   } else {
+        return MP_OBJ_NULL;
+   }
diff --git a/docs/develop/memorymgt.rst b/docs/develop/memorymgt.rst
new file mode 100644
index 0000000000000..5b1690cc827b3
--- /dev/null
+++ b/docs/develop/memorymgt.rst
@@ -0,0 +1,141 @@
+.. _memorymanagement:
+
+Memory Management
+=================
+
+Unlike programming languages such as C/C++, MicroPython hides memory management
+details from the developer by supporting automatic memory management.
+Automatic memory management is a technique used by operating systems or applications to automatically manage
+the allocation and deallocation of memory. This eliminates challenges such as forgetting to
+free the memory allocated to an object. Automatic memory management also avoids the critical issue of using memory
+that is already released. Automatic memory management takes many forms, one of them being
+garbage collection (GC).
+
+The garbage collector usually has two responsibilities;
+
+#. Allocate new objects in available memory.
+#. Free unused memory.
+
+There are many GC algorithms but MicroPython uses the
+`Mark and Sweep <https://en.wikipedia.org/wiki/Tracing_garbage_collection#Basic_algorithm>`_
+policy for managing memory. This algorithm has a mark phase that traverses the heap marking all
+live objects while the sweep phase goes through the heap reclaiming all unmarked objects.
+
+Garbage collection functionality in MicroPython is available through the ``gc`` built-in
+module:
+
+.. code-block:: bash
+
+   >>> x = 5
+   >>> x
+   5
+   >>> import gc
+   >>> gc.enable()
+   >>> gc.mem_alloc()
+   1312
+   >>> gc.mem_free()
+   2071392
+   >>> gc.collect()
+   19
+   >>> gc.disable()
+   >>>
+
+Even when ``gc.disable()`` is invoked, collection can be triggered with ``gc.collect()``.
+
+The object model
+----------------
+
+All MicroPython objects are referred to by the ``mp_obj_t`` data type.
+This is usually word-sized (i.e. the same size as a pointer on the target architecture),
+and can be typically 32-bit (STM32, nRF, ESP32, Unix x86) or 64-bit (Unix x64).
+It can also be greater than a word-size for certain object representations, for
+example ``OBJ_REPR_D`` has a 64-bit sized ``mp_obj_t`` on a 32-bit architecture.
+
+An ``mp_obj_t`` represents a MicroPython object, for example an integer, float, type, dict or
+class instance. Some objects, like booleans and small integers, have their value stored directly
+in the ``mp_obj_t`` value and do not require additional memory. Other objects have their value
+store elsewhere in memory (for example on the garbage-collected heap) and their ``mp_obj_t`` contains
+a pointer to that memory. A portion of ``mp_obj_t`` is the tag which tells what type of object it is.
+
+See ``py/mpconfig.h`` for the specific details of the available representations.
+
+**Pointer tagging**
+
+Because pointers are word-aligned, when they are stored in an ``mp_obj_t`` the
+lower bits of this object handle will be zero.  For example on a 32-bit architecture
+the lower 2 bits will be zero:
+
+``********|********|********|******00``
+
+These bits are reserved for purposes of storing a tag. The tag stores extra information as
+opposed to introducing a new field to store that information in the object, which may be
+inefficient.  In MicroPython the tag tells if we are dealing with a small integer, interned
+(small) string or a concrete object, and different semantics apply to each of these.
+
+For small integers the mapping is this:
+
+``********|********|********|*******1``
+
+Where the asterisks hold the actual integer value.  For an interned string or an immediate
+object (e.g. ``True``) the layout of the ``mp_obj_t`` value is, respectively:
+
+``********|********|********|*****010``
+
+``********|********|********|*****110``
+
+While a concrete object that is none of the above takes the form:
+
+``********|********|********|******00``
+
+The stars here correspond to the address of the concrete object in memory.
+
+Allocation of objects
+----------------------
+
+The value of a small integer is stored directly in the ``mp_obj_t`` and will be
+allocated in-place, not on the heap or elsewhere.  As such, creation of small
+integers does not affect the heap.  Similarly for interned strings that already have
+their textual data stored elsewhere, and immediate values like ``None``, ``False``
+and ``True``.
+
+Everything else which is a concrete object is allocated on the heap and its object structure is such that
+a field is reserved in the object header to store the type of the object.
+
+.. code-block:: bash
+
+    +++++++++++
+    +         +
+    + type    + object header
+    +         +
+    +++++++++++
+    +         + object items
+    +         +
+    +         +
+    +++++++++++
+
+The heap's smallest unit of allocation is a block, which is four machine words in
+size (16 bytes on a 32-bit machine, 32 bytes on a 64-bit machine).
+Another structure also allocated on the heap tracks the allocation of
+objects in each block. This structure is called a *bitmap*.
+
+.. image:: img/bitmap.png
+
+The bitmap tracks whether a block is "free" or "in use" and use two bits to track this state
+for each block.
+
+The mark-sweep garbage collector manages the objects allocated on the heap, and also
+utilises the bitmap to mark objects that are still in use.
+See `py/gc.c <https://github.com/micropython/micropython/blob/master/py/gc.c>`_
+for the full implementation of these details.
+
+**Allocation: heap layout**
+
+The heap is arranged such that it consists of blocks in pools. A block
+can have different properties:
+
+- *ATB(allocation table byte):* If set, then the block is a normal block
+- *FREE:* Free block
+- *HEAD:* Head of a chain of blocks
+- *TAIL:* In the tail of a chain of blocks
+- *MARK :* Marked head block
+- *FTB(finaliser table byte):* If set, then the block has a finaliser
diff --git a/docs/develop/optimizations.rst b/docs/develop/optimizations.rst
new file mode 100644
index 0000000000000..d972cde66616a
--- /dev/null
+++ b/docs/develop/optimizations.rst
@@ -0,0 +1,72 @@
+.. _optimizations:
+
+Optimizations
+=============
+
+MicroPython uses several optimizations to save RAM but also ensure the efficient
+execution of programs. This chapter discusses some of these optimizations.
+
+.. note::
+   :ref:`qstr` and :ref:`maps` details other optimizations on strings and
+   dictionaries.
+
+Frozen bytecode
+---------------
+
+When MicroPython loads Python code from the filesystem, it first has to parse the file into
+a temporary in-memory representation, and then generate bytecode for execution, both of which
+are stored in the heap (in RAM). This can lead to significant amounts of memory being used.
+The MicroPython cross compiler can be used to generate
+a ``.mpy`` file, containing the pre-compiled bytecode for a Python module. This will still
+be loaded into RAM, but it avoids the additional overhead of the parsing stage.
+
+As a further optimisation, the pre-compiled bytecode from a ``.mpy`` file can be "frozen"
+into the firmware image as part of the main firmware compilation process, which means that
+the bytecode will be executed from ROM. This can lead to a significant memory saving, and
+reduce heap fragmentation.
+
+Variables
+---------
+
+MicroPython processes local and global variables differently. Global variables
+are stored and looked up from a global dictionary that is allocated on the heap
+(note that each module has its own separate dict, so separate namespace).
+Local variables on the other hand are are stored on the Python value stack, which may
+live on the C stack or on the heap.  They are accessed directly by their offset
+within the Python stack, which is more efficient than a global lookup in a dict.
+
+The length of global variable names also affects how much RAM is used as identifiers
+are stored in RAM. The shorter the identifier, the less memory is used.
+
+The other aspect is that ``const`` variables that start with an underscore are treated as
+proper constants and are not allocated or added in a dictionary, hence saving some memory.
+These variables use ``const()`` from the MicroPython library. Therefore:
+
+.. code-block:: python
+
+    from micropython import const
+
+    X = const(1)
+    _Y = const(2)
+    foo(X, _Y)
+
+Compiles to:
+
+.. code-block:: python
+
+    X = 1
+    foo(1, 2)
+
+Allocation of memory
+--------------------
+
+Most of the common MicroPython constructs are not allocated on the heap.
+However the following are:
+
+- Dynamic data structures like lists, mappings, etc;
+- Functions, classes and object instances;
+- imports; and
+- First-time assignment of global variables (to create the slot in the global dict).
+
+For a detailed discussion on a more user-centric perspective on optimization,
+see `Maximising MicroPython speed <https://docs.micropython.org/en/latest/reference/speed_python.html>`_
diff --git a/docs/develop/porting.rst b/docs/develop/porting.rst
new file mode 100644
index 0000000000000..59dd570008bcd
--- /dev/null
+++ b/docs/develop/porting.rst
@@ -0,0 +1,310 @@
+.. _porting_to_a_board:
+
+Porting MicroPython
+===================
+
+The MicroPython project contains several ports to different microcontroller families and
+architectures. The project repository has a `ports <https://github.com/micropython/micropython/tree/master/ports>`_
+directory containing a subdirectory for each supported port.
+
+A port will typically contain definitions for multiple "boards", each of which is a specific piece of
+hardware that that port can run on, e.g. a development kit or device.
+
+The `minimal port <https://github.com/micropython/micropython/tree/master/ports/minimal>`_ is
+available as a simplified reference implementation of a MicroPython port.  It can run on both the
+host system and an STM32F4xx MCU.
+
+In general, starting a port requires:
+
+- Setting up the toolchain (configuring Makefiles, etc).
+- Implementing boot configuration and CPU initialization.
+- Initialising basic drivers required for development and debugging (e.g. GPIO, UART).
+- Performing the board-specific configurations.
+- Implementing the port-specific modules.
+
+Minimal MicroPython firmware
+----------------------------
+
+The best way to start porting MicroPython to a new board is by integrating a minimal
+MicroPython interpreter.  For this walkthrough, create a subdirectory for the new
+port in the ``ports`` directory:
+
+.. code-block:: bash
+
+   $ cd ports
+   $ mkdir example_port
+
+The basic MicroPython firmware is implemented in the main port file, e.g ``main.c``:
+
+.. code-block:: c
+
+   #include "py/compile.h"
+   #include "py/gc.h"
+   #include "py/mperrno.h"
+   #include "py/stackctrl.h"
+   #include "lib/utils/gchelper.h"
+   #include "lib/utils/pyexec.h"
+
+   // Allocate memory for the MicroPython GC heap.
+   static char heap[4096];
+
+   int main(int argc, char **argv) {
+       // Initialise the MicroPython runtime.
+       mp_stack_ctrl_init();
+       gc_init(heap, heap + sizeof(heap));
+       mp_init();
+       mp_obj_list_init(MP_OBJ_TO_PTR(mp_sys_path), 0);
+       mp_obj_list_init(MP_OBJ_TO_PTR(mp_sys_argv), 0);
+
+       // Start a normal REPL; will exit when ctrl-D is entered on a blank line.
+       pyexec_friendly_repl();
+
+       // Deinitialise the runtime.
+       gc_sweep_all();
+       mp_deinit();
+       return 0;
+   }
+
+   // Handle uncaught exceptions (should never be reached in a correct C implementation).
+   void nlr_jump_fail(void *val) {
+       for (;;) {
+       }
+   }
+
+   // Do a garbage collection cycle.
+   void gc_collect(void) {
+       gc_collect_start();
+       gc_helper_collect_regs_and_stack();
+       gc_collect_end();
+   }
+
+   // There is no filesystem so stat'ing returns nothing.
+   mp_import_stat_t mp_import_stat(const char *path) {
+       return MP_IMPORT_STAT_NO_EXIST;
+   }
+
+   // There is no filesystem so opening a file raises an exception.
+   mp_lexer_t *mp_lexer_new_from_file(const char *filename) {
+       mp_raise_OSError(MP_ENOENT);
+   }
+
+We also need a Makefile at this point for the port:
+
+.. code-block:: Makefile
+
+   # Include the core environment definitions; this will set $(TOP).
+   include ../../py/mkenv.mk
+
+   # Include py core make definitions.
+   include $(TOP)/py/py.mk
+
+   # Set CFLAGS and libraries.
+   CFLAGS = -I. -I$(BUILD) -I$(TOP)
+   LIBS = -lm
+
+   # Define the required source files.
+   SRC_C = \
+       main.c \
+       mphalport.c \
+       lib/mp-readline/readline.c \
+       lib/utils/gchelper_generic.c \
+       lib/utils/pyexec.c \
+       lib/utils/stdout_helpers.c \
+
+   # Define the required object files.
+   OBJ = $(PY_CORE_O) $(addprefix $(BUILD)/, $(SRC_C:.c=.o))
+
+   # Define the top-level target, the main firmware.
+   all: $(BUILD)/firmware.elf
+
+   # Define how to build the firmware.
+   $(BUILD)/firmware.elf: $(OBJ)
+       $(ECHO) "LINK $@"
+       $(Q)$(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
+       $(Q)$(SIZE) $@
+
+   # Include remaining core make rules.
+   include $(TOP)/py/mkrules.mk
+
+Remember to use proper tabs to indent the Makefile.
+
+MicroPython Configurations
+--------------------------
+
+After integrating the minimal code above, the next step is to create the MicroPython
+configuration files for the port. The compile-time configurations are specified in
+``mpconfigport.h`` and additional hardware-abstraction functions, such as time keeping,
+in ``mphalport.h``.
+
+The following is an example of an ``mpconfigport.h`` file:
+
+.. code-block:: c
+
+   #include <stdint.h>
+
+   // Python internal features.
+   #define MICROPY_ENABLE_GC                       (1)
+   #define MICROPY_HELPER_REPL                     (1)
+   #define MICROPY_ERROR_REPORTING                 (MICROPY_ERROR_REPORTING_TERSE)
+   #define MICROPY_FLOAT_IMPL                      (MICROPY_FLOAT_IMPL_FLOAT)
+
+   // Fine control over Python builtins, classes, modules, etc.
+   #define MICROPY_PY_ASYNC_AWAIT                  (0)
+   #define MICROPY_PY_BUILTINS_SET                 (0)
+   #define MICROPY_PY_ATTRTUPLE                    (0)
+   #define MICROPY_PY_COLLECTIONS                  (0)
+   #define MICROPY_PY_MATH                         (0)
+   #define MICROPY_PY_IO                           (0)
+   #define MICROPY_PY_STRUCT                       (0)
+
+   // Type definitions for the specific machine.
+
+   typedef intptr_t mp_int_t; // must be pointer size
+   typedef uintptr_t mp_uint_t; // must be pointer size
+   typedef long mp_off_t;
+
+   // We need to provide a declaration/definition of alloca().
+   #include <alloca.h>
+
+   // Define the port's name and hardware.
+   #define MICROPY_HW_BOARD_NAME "example-board"
+   #define MICROPY_HW_MCU_NAME   "unknown-cpu"
+
+   #define MP_STATE_PORT MP_STATE_VM
+
+   #define MICROPY_PORT_ROOT_POINTERS \
+       const char *readline_hist[8];
+
+This configuration file contains machine-specific configurations including aspects like if different
+MicroPython features should be enabled e.g. ``#define MICROPY_ENABLE_GC (1)``. Making this Setting
+``(0)`` disables the feature.
+
+Other configurations include type definitions, root pointers, board name, microcontroller name
+etc.
+
+Similarly, an minimal example ``mphalport.h`` file looks like this:
+
+.. code-block:: c
+
+   static inline void mp_hal_set_interrupt_char(char c) {}
+
+Support for standard input/output
+---------------------------------
+
+MicroPython requires at least a way to output characters, and to have a REPL it also
+requires a way to input characters. Functions for this can be implemented in the file
+``mphalport.c``, for example:
+
+.. code-block:: c
+
+   #include <unistd.h>
+   #include "py/mpconfig.h"
+
+   // Receive single character, blocking until one is available.
+   int mp_hal_stdin_rx_chr(void) {
+       unsigned char c = 0;
+       int r = read(STDIN_FILENO, &c, 1);
+       (void)r;
+       return c;
+   }
+
+   // Send the string of given length.
+   void mp_hal_stdout_tx_strn(const char *str, mp_uint_t len) {
+       int r = write(STDOUT_FILENO, str, len);
+       (void)r;
+   }
+
+These input and output functions have to be modified depending on the
+specific board API. This example uses the standard input/output stream.
+
+Building and running
+--------------------
+
+At this stage the directory of the new port should contain::
+
+    ports/example_port/
+    ├── main.c
+    ├── Makefile
+    ├── mpconfigport.h
+    ├── mphalport.c
+    └── mphalport.h
+
+The port can now be built by running ``make`` (or otherwise, depending on your system).
+
+If you are using the default compiler settings in the Makefile given above then this
+will create an executable called ``build/firmware.elf`` which can be executed directly.
+To get a functional REPL you may need to first configure the terminal to raw mode:
+
+.. code-block:: bash
+
+   $ stty raw opost -echo
+   $ ./build/firmware.elf
+
+That should give a MicroPython REPL.  You can then run commands like:
+
+.. code-block:: bash
+
+   MicroPython v1.13 on 2021-01-01; example-board with unknown-cpu
+   >>> import usys
+   >>> usys.implementation
+   ('micropython', (1, 13, 0))
+   >>>
+
+Use Ctrl-D to exit, and then run ``reset`` to reset the terminal.
+
+Adding a module to the port
+---------------------------
+
+To add a custom module like ``myport``, first add the module definition in a file
+``modmyport.c``:
+
+.. code-block:: c
+
+   #include "py/runtime.h"
+
+   STATIC mp_obj_t myport_info(void) {
+       mp_printf(&mp_plat_print, "info about my port\n");
+       return mp_const_none;
+   }
+   STATIC MP_DEFINE_CONST_FUN_OBJ_0(myport_info_obj, myport_info);
+
+   STATIC const mp_rom_map_elem_t myport_module_globals_table[] = {
+       { MP_OBJ_NEW_QSTR(MP_QSTR___name__), MP_OBJ_NEW_QSTR(MP_QSTR_myport) },
+       { MP_ROM_QSTR(MP_QSTR_info), MP_ROM_PTR(&myport_info_obj) },
+   };
+   STATIC MP_DEFINE_CONST_DICT(myport_module_globals, myport_module_globals_table);
+
+   const mp_obj_module_t myport_module = {
+       .base = { &mp_type_module },
+       .globals = (mp_obj_dict_t *)&myport_module_globals,
+   };
+
+   MP_REGISTER_MODULE(MP_QSTR_myport, myport_module, 1);
+
+Note: the "1" as the third argument in ``MP_REGISTER_MODULE`` enables this new module
+unconditionally. To allow it to be conditionally enabled, replace the "1" by
+``MICROPY_PY_MYPORT`` and then add ``#define MICROPY_PY_MYPORT (1)`` in ``mpconfigport.h``
+accordingly.
+
+You will also need to edit the Makefile to add ``modmyport.c`` to the ``SRC_C`` list, and
+a new line adding the same file to ``SRC_QSTR`` (so qstrs are searched for in this new file),
+like this:
+
+.. code-block:: Makefile
+
+   SRC_C = \
+       main.c \
+       modmyport.c \
+       mphalport.c \
+       ...
+
+   SRC_QSTR += modport.c
+
+If all went correctly then, after rebuilding, you should be able to import the new module:
+
+.. code-block:: bash
+
+    >>> import myport
+    >>> myport.info()
+    info about my port
+    >>>
diff --git a/docs/develop/publiccapi.rst b/docs/develop/publiccapi.rst
new file mode 100644
index 0000000000000..132c7b136bc14
--- /dev/null
+++ b/docs/develop/publiccapi.rst
@@ -0,0 +1,25 @@
+.. _publiccapi:
+
+The public C API
+================
+
+The public C-API comprises functions defined in all C header files in the ``py/``
+directory. Most of the important core runtime C APIs are exposed in ``runtime.h`` and
+``obj.h``.
+
+The following is an example of public API functions from ``obj.h``:
+
+.. code-block:: c
+
+   mp_obj_t mp_obj_new_list(size_t n, mp_obj_t *items);
+   mp_obj_t mp_obj_list_append(mp_obj_t self_in, mp_obj_t arg);
+   mp_obj_t mp_obj_list_remove(mp_obj_t self_in, mp_obj_t value);
+   void mp_obj_list_get(mp_obj_t self_in, size_t *len, mp_obj_t **items);
+
+At its core, any functions and macros in header files make up the public
+API and can be used to access very low-level details of MicroPython. Static
+inline functions in header files are fine too, such functions will be
+inlined in the code when used.
+
+Header files in the ``ports`` directory are only exposed to the functionality
+specific to a given port.
diff --git a/docs/develop/qstr.rst b/docs/develop/qstr.rst
index 3550a8bd425f2..cd1fc47862cf0 100644
--- a/docs/develop/qstr.rst
+++ b/docs/develop/qstr.rst
@@ -1,3 +1,5 @@
+.. _qstr:
+
 MicroPython string interning
 ============================
 
@@ -57,6 +59,7 @@ Processing happens in the following stages:
    information.  Note that this step only uses files that have changed, which
    means that ``qstr.i.last`` will only contain data from files that have
    changed since the last compile.
+   
 2. ``qstr.split`` is an empty file created after running ``makeqstrdefs.py split``
    on qstr.i.last. It's just used as a dependency to indicate that the step ran.
    This script outputs one file per input C file,  ``genhdr/qstr/...file.c.qstr``,
@@ -71,8 +74,8 @@ Processing happens in the following stages:
    data is written to another file (``qstrdefs.collected.h.hash``) which allows
    it to track changes across builds.
 
-4. ``qstrdefs.preprocessed.h`` adds in the QSTRs from qstrdefs*.  It
-   concatenates ``qstrdefs.collected.h`` with ``qstrdefs*.h``, then it transforms
+4. Generate an enumeration, each entry of which maps a ``MP_QSTR_Foo`` to it's corresponding index.
+   It concatenates ``qstrdefs.collected.h`` with ``qstrdefs*.h``, then it transforms
    each line from ``Q(Foo)`` to ``"Q(Foo)"`` so they pass through the preprocessor
    unchanged.  Then the preprocessor is used to deal with any conditional
    compilation in ``qstrdefs*.h``.  Then the transformation is undone back to
diff --git a/docs/develop/writingtests.rst b/docs/develop/writingtests.rst
new file mode 100644
index 0000000000000..4bdf4dd7a620e
--- /dev/null
+++ b/docs/develop/writingtests.rst
@@ -0,0 +1,70 @@
+.. _writingtests:
+
+Writing tests
+=============
+
+Tests in MicroPython are located at the path ``tests/``. The following is a listing of
+key directories and the run-tests runner script:
+
+.. code-block:: bash
+
+   .
+    ├── basics
+    ├── extmod
+    ├── float
+    ├── micropython
+    ├── run-tests
+    ...
+
+There are subfolders maintained to categorize the tests. Add a test by creating a new file in one of the
+existing folders or in a new folder. It's also possible to make custom tests outside this tests folder,
+which would be recommended for a custom port.
+
+For example, add the following code in a file ``print.py`` in the ``tests/unix/`` subdirectory:
+
+.. code-block:: python
+
+   def print_one():
+       print(1)
+
+   print_one()
+
+If you run your tests, this test should appear in the test output:
+
+.. code-block:: bash
+
+   $ cd ports/unix
+   $ make tests
+   skip  unix/extra_coverage.py
+   pass  unix/ffi_callback.py
+   pass  unix/ffi_float.py
+   pass  unix/ffi_float2.py
+   pass  unix/print.py
+   pass  unix/time.py
+   pass  unix/time2.py
+
+Tests are run by comparing the output from the test target against the output from CPython.
+So any test should use print statements to indicate test results.
+
+For tests that can't be compared to CPython (i.e. micropython-specific functionality),
+you can provide a ``.py.exp`` file which will be used as the truth for comparison.
+
+The other way to run tests, which is useful when running on targets other than the Unix port, is:
+
+.. code-block:: bash
+
+   $ cd tests
+   $ ./run-tests
+
+Then to run on a board:
+
+.. code-block:: bash
+
+   $ ./run-tests --target minimal --device /dev/ttyACM0
+
+And to run only a certain set of tests (eg a directory):
+
+.. code-block:: bash
+
+   $ ./run-tests -d basics
+   $ ./run-tests float/builtin*.py

From 71ea438561b737de7d4bb6bc60412a7e409cf298 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 28 Jan 2021 13:09:44 +1100
Subject: [PATCH 0522/3533] extmod/vfs: Check block 0 and 1 when auto-detecting
 littlefs.

The superblock for littlefs is in block 0 and 1, but block 0 may be erased
or partially written, so block 1 must be checked if block 0 does not have a
valid littlefs superblock in it.

Prior to this commit, the mount of a block device which auto-detected the
filysystem type would fail for littlefs if block 0 did not contain a valid
superblock.  That is now fixed.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/vfs.c                           | 37 ++++++++++----------
 tests/extmod/vfs_lfs_superblock.py     | 47 ++++++++++++++++++++++++++
 tests/extmod/vfs_lfs_superblock.py.exp |  2 ++
 3 files changed, 69 insertions(+), 17 deletions(-)
 create mode 100644 tests/extmod/vfs_lfs_superblock.py
 create mode 100644 tests/extmod/vfs_lfs_superblock.py.exp

diff --git a/extmod/vfs.c b/extmod/vfs.c
index 7dca59d351b03..6dcdcfa22d3e6 100644
--- a/extmod/vfs.c
+++ b/extmod/vfs.c
@@ -160,27 +160,30 @@ STATIC mp_obj_t mp_vfs_autodetect(mp_obj_t bdev_obj) {
     #if MICROPY_VFS_LFS1 || MICROPY_VFS_LFS2
     nlr_buf_t nlr;
     if (nlr_push(&nlr) == 0) {
-        mp_obj_t vfs = MP_OBJ_NULL;
+        // The superblock for littlefs is in both block 0 and 1, but block 0 may be erased
+        // or partially written, so search both blocks 0 and 1 for the littlefs signature.
         mp_vfs_blockdev_t blockdev;
         mp_vfs_blockdev_init(&blockdev, bdev_obj);
         uint8_t buf[44];
-        mp_vfs_blockdev_read_ext(&blockdev, 0, 8, sizeof(buf), buf);
-        #if MICROPY_VFS_LFS1
-        if (memcmp(&buf[32], "littlefs", 8) == 0) {
-            // LFS1
-            vfs = mp_type_vfs_lfs1.make_new(&mp_type_vfs_lfs1, 1, 0, &bdev_obj);
-            nlr_pop();
-            return vfs;
-        }
-        #endif
-        #if MICROPY_VFS_LFS2
-        if (memcmp(&buf[0], "littlefs", 8) == 0) {
-            // LFS2
-            vfs = mp_type_vfs_lfs2.make_new(&mp_type_vfs_lfs2, 1, 0, &bdev_obj);
-            nlr_pop();
-            return vfs;
+        for (size_t block_num = 0; block_num <= 1; ++block_num) {
+            mp_vfs_blockdev_read_ext(&blockdev, block_num, 8, sizeof(buf), buf);
+            #if MICROPY_VFS_LFS1
+            if (memcmp(&buf[32], "littlefs", 8) == 0) {
+                // LFS1
+                mp_obj_t vfs = mp_type_vfs_lfs1.make_new(&mp_type_vfs_lfs1, 1, 0, &bdev_obj);
+                nlr_pop();
+                return vfs;
+            }
+            #endif
+            #if MICROPY_VFS_LFS2
+            if (memcmp(&buf[0], "littlefs", 8) == 0) {
+                // LFS2
+                mp_obj_t vfs = mp_type_vfs_lfs2.make_new(&mp_type_vfs_lfs2, 1, 0, &bdev_obj);
+                nlr_pop();
+                return vfs;
+            }
+            #endif
         }
-        #endif
         nlr_pop();
     } else {
         // Ignore exception (eg block device doesn't support extended readblocks)
diff --git a/tests/extmod/vfs_lfs_superblock.py b/tests/extmod/vfs_lfs_superblock.py
new file mode 100644
index 0000000000000..1ac5675554b46
--- /dev/null
+++ b/tests/extmod/vfs_lfs_superblock.py
@@ -0,0 +1,47 @@
+# Test for VfsLfs using a RAM device, when the first superblock does not exist
+
+try:
+    import uos
+
+    uos.VfsLfs2
+except (ImportError, AttributeError):
+    print("SKIP")
+    raise SystemExit
+
+
+class RAMBlockDevice:
+    def __init__(self, block_size, data):
+        self.block_size = block_size
+        self.data = data
+
+    def readblocks(self, block, buf, off):
+        addr = block * self.block_size + off
+        for i in range(len(buf)):
+            buf[i] = self.data[addr + i]
+
+    def ioctl(self, op, arg):
+        if op == 4:  # block count
+            return len(self.data) // self.block_size
+        if op == 5:  # block size
+            return self.block_size
+        if op == 6:  # erase block
+            return 0
+
+
+# This is a valid littlefs2 filesystem with a block size of 64 bytes.
+# The first block (where the first superblock is stored) is fully erased.
+lfs2_data = b"\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\x02\x00\x00\x00\xf0\x0f\xff\xf7littlefs/\xe0\x00\x10\x00\x00\x02\x00@\x00\x00\x00\x04\x00\x00\x00\xff\x00\x00\x00\xff\xff\xff\x7f\xfe\x03\x00\x00p\x1f\xfc\x08\x1b\xb4\x14\xa7\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\x01\x00\x00\x00\xff\xef\xff\xf7test.txt \x00\x00\x08p\x1f\xfc\x08\x83\xf1u\xba\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+
+# Create the block device from the static data (it will be read-only).
+bdev = RAMBlockDevice(64, lfs2_data)
+
+# Create the VFS explicitly, no auto-detection is needed for this.
+vfs = uos.VfsLfs2(bdev)
+print(list(vfs.ilistdir()))
+
+# Mount the block device directly; this relies on auto-detection.
+uos.mount(bdev, "/userfs")
+print(uos.listdir("/userfs"))
+
+# Clean up.
+uos.umount("/userfs")
diff --git a/tests/extmod/vfs_lfs_superblock.py.exp b/tests/extmod/vfs_lfs_superblock.py.exp
new file mode 100644
index 0000000000000..c71bf50e82fd4
--- /dev/null
+++ b/tests/extmod/vfs_lfs_superblock.py.exp
@@ -0,0 +1,2 @@
+[]
+[]

From d1945cc2b56bb2159224fa7027d0aadb2362430c Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 28 Jan 2021 13:13:09 +1100
Subject: [PATCH 0523/3533] stm32/main: Check block 0 and 1 when auto-detecting
 littlefs.

The superblock for littlefs is in block 0 and 1, but block 0 may be erased
or partially written, so block 1 must be checked if block 0 does not have a
valid littlefs superblock in it.

Prior to this commit, if block 0 did not contain a valid littlefs
superblock (but block 1 did) then the auto-detection would fail, mounting a
FAT filesystem would also fail, and the system would reformat the flash,
even though it may have contained a valid littlefs filesystem.  This is now
fixed.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/main.c | 48 +++++++++++++++++++++++++---------------------
 1 file changed, 26 insertions(+), 22 deletions(-)

diff --git a/ports/stm32/main.c b/ports/stm32/main.c
index fb10b96501e1d..f0a10fa93359e 100644
--- a/ports/stm32/main.c
+++ b/ports/stm32/main.c
@@ -168,31 +168,35 @@ MP_NOINLINE STATIC bool init_flash_fs(uint reset_mode) {
 
     #if MICROPY_VFS_LFS1 || MICROPY_VFS_LFS2
 
-    // Try to detect the block device used for the main filesystem, based on the first block
-
-    uint8_t buf[64];
-    ret = storage_readblocks_ext(buf, 0, 0, sizeof(buf));
+    // Try to detect the block device used for the main filesystem based on the
+    // contents of the superblock, which can be the first or second block.
     mp_int_t len = -1;
+    uint8_t buf[64];
+    for (size_t block_num = 0; block_num <= 1; ++block_num) {
+        ret = storage_readblocks_ext(buf, block_num, 0, sizeof(buf));
+
+        #if MICROPY_VFS_LFS1
+        if (ret == 0 && memcmp(&buf[40], "littlefs", 8) == 0) {
+            // LFS1
+            lfs1_superblock_t *superblock = (void *)&buf[12];
+            uint32_t block_size = lfs1_fromle32(superblock->d.block_size);
+            uint32_t block_count = lfs1_fromle32(superblock->d.block_count);
+            len = block_count * block_size;
+            break;
+        }
+        #endif
 
-    #if MICROPY_VFS_LFS1
-    if (ret == 0 && memcmp(&buf[40], "littlefs", 8) == 0) {
-        // LFS1
-        lfs1_superblock_t *superblock = (void *)&buf[12];
-        uint32_t block_size = lfs1_fromle32(superblock->d.block_size);
-        uint32_t block_count = lfs1_fromle32(superblock->d.block_count);
-        len = block_count * block_size;
-    }
-    #endif
-
-    #if MICROPY_VFS_LFS2
-    if (ret == 0 && memcmp(&buf[8], "littlefs", 8) == 0) {
-        // LFS2
-        lfs2_superblock_t *superblock = (void *)&buf[20];
-        uint32_t block_size = lfs2_fromle32(superblock->block_size);
-        uint32_t block_count = lfs2_fromle32(superblock->block_count);
-        len = block_count * block_size;
+        #if MICROPY_VFS_LFS2
+        if (ret == 0 && memcmp(&buf[8], "littlefs", 8) == 0) {
+            // LFS2
+            lfs2_superblock_t *superblock = (void *)&buf[20];
+            uint32_t block_size = lfs2_fromle32(superblock->block_size);
+            uint32_t block_count = lfs2_fromle32(superblock->block_count);
+            len = block_count * block_size;
+            break;
+        }
+        #endif
     }
-    #endif
 
     if (len != -1) {
         // Detected a littlefs filesystem so create correct block device for it

From c1eb2929279fdcf7f89adeb013290e7c45e24fb7 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 28 Jan 2021 15:37:00 +1100
Subject: [PATCH 0524/3533] stm32/mboot: Don't auto-detect littlefs block size.

Instead it is now passed in as an optional parameter to the ELEM_MOUNT
element, with a compile-time configurable default.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/mboot/fsload.c  | 25 +++++++++++++++++++++----
 ports/stm32/mboot/vfs.h     |  4 ++--
 ports/stm32/mboot/vfs_lfs.c | 26 +-------------------------
 3 files changed, 24 insertions(+), 31 deletions(-)

diff --git a/ports/stm32/mboot/fsload.c b/ports/stm32/mboot/fsload.c
index 591b670aa00c2..fe98426bed9cf 100644
--- a/ports/stm32/mboot/fsload.c
+++ b/ports/stm32/mboot/fsload.c
@@ -31,6 +31,11 @@
 #include "pack.h"
 #include "vfs.h"
 
+// Default block size used for mount operations if none given.
+#ifndef MBOOT_FSLOAD_DEFAULT_BLOCK_SIZE
+#define MBOOT_FSLOAD_DEFAULT_BLOCK_SIZE (4096)
+#endif
+
 #if MBOOT_FSLOAD
 
 #if !(MBOOT_VFS_FAT || MBOOT_VFS_LFS1 || MBOOT_VFS_LFS2)
@@ -213,8 +218,19 @@ int fsload_process(void) {
     elem = ELEM_DATA_START;
     for (;;) {
         elem = elem_search(elem, ELEM_TYPE_MOUNT);
-        if (elem == NULL || elem[-1] != 10) {
-            // End of elements, or invalid MOUNT element
+        if (elem == NULL) {
+            // End of elements.
+            return -1;
+        }
+        uint32_t block_size;
+        if (elem[-1] == 10) {
+            // No block size given, use default.
+            block_size = MBOOT_FSLOAD_DEFAULT_BLOCK_SIZE;
+        } else if (elem[-1] == 14) {
+            // Block size given, extract it.
+            block_size = get_le32(&elem[10]);
+        } else {
+            // Invalid MOUNT element.
             return -1;
         }
         if (elem[0] == mount_point) {
@@ -235,19 +251,20 @@ int fsload_process(void) {
             const stream_methods_t *methods;
             #if MBOOT_VFS_FAT
             if (elem[1] == ELEM_MOUNT_FAT) {
+                (void)block_size;
                 ret = vfs_fat_mount(&ctx.fat, base_addr, byte_len);
                 methods = &vfs_fat_stream_methods;
             } else
             #endif
             #if MBOOT_VFS_LFS1
             if (elem[1] == ELEM_MOUNT_LFS1) {
-                ret = vfs_lfs1_mount(&ctx.lfs1, base_addr, byte_len);
+                ret = vfs_lfs1_mount(&ctx.lfs1, base_addr, byte_len, block_size);
                 methods = &vfs_lfs1_stream_methods;
             } else
             #endif
             #if MBOOT_VFS_LFS2
             if (elem[1] == ELEM_MOUNT_LFS2) {
-                ret = vfs_lfs2_mount(&ctx.lfs2, base_addr, byte_len);
+                ret = vfs_lfs2_mount(&ctx.lfs2, base_addr, byte_len, block_size);
                 methods = &vfs_lfs2_stream_methods;
             } else
             #endif
diff --git a/ports/stm32/mboot/vfs.h b/ports/stm32/mboot/vfs.h
index 6cf883a13975a..22bb98936790e 100644
--- a/ports/stm32/mboot/vfs.h
+++ b/ports/stm32/mboot/vfs.h
@@ -65,7 +65,7 @@ typedef struct _vfs_lfs1_context_t {
 
 extern const stream_methods_t vfs_lfs1_stream_methods;
 
-int vfs_lfs1_mount(vfs_lfs1_context_t *ctx, uint32_t base_addr, uint32_t byte_len);
+int vfs_lfs1_mount(vfs_lfs1_context_t *ctx, uint32_t base_addr, uint32_t byte_len, uint32_t block_size);
 
 #endif
 
@@ -89,7 +89,7 @@ typedef struct _vfs_lfs2_context_t {
 
 extern const stream_methods_t vfs_lfs2_stream_methods;
 
-int vfs_lfs2_mount(vfs_lfs2_context_t *ctx, uint32_t base_addr, uint32_t byte_len);
+int vfs_lfs2_mount(vfs_lfs2_context_t *ctx, uint32_t base_addr, uint32_t byte_len, uint32_t block_size);
 
 #endif
 
diff --git a/ports/stm32/mboot/vfs_lfs.c b/ports/stm32/mboot/vfs_lfs.c
index e4dc511db56f6..3e4c9caf16d87 100644
--- a/ports/stm32/mboot/vfs_lfs.c
+++ b/ports/stm32/mboot/vfs_lfs.c
@@ -43,10 +43,6 @@
 #define VFS_LFSx_MOUNT vfs_lfs1_mount
 #define VFS_LFSx_STREAM_METHODS vfs_lfs1_stream_methods
 
-#define SUPERBLOCK_MAGIC_OFFSET (40)
-#define SUPERBLOCK_BLOCK_SIZE_OFFSET (28)
-#define SUPERBLOCK_BLOCK_COUNT_OFFSET (32)
-
 static uint8_t lfs_read_buffer[LFS_READ_SIZE];
 static uint8_t lfs_prog_buffer[LFS_PROG_SIZE];
 static uint8_t lfs_lookahead_buffer[LFS_LOOKAHEAD_SIZE / 8];
@@ -59,10 +55,6 @@ static uint8_t lfs_lookahead_buffer[LFS_LOOKAHEAD_SIZE / 8];
 #define VFS_LFSx_MOUNT vfs_lfs2_mount
 #define VFS_LFSx_STREAM_METHODS vfs_lfs2_stream_methods
 
-#define SUPERBLOCK_MAGIC_OFFSET (8)
-#define SUPERBLOCK_BLOCK_SIZE_OFFSET (24)
-#define SUPERBLOCK_BLOCK_COUNT_OFFSET (28)
-
 static uint8_t lfs_read_buffer[LFS_CACHE_SIZE];
 static uint8_t lfs_prog_buffer[LFS_CACHE_SIZE];
 static uint8_t lfs_lookahead_buffer[LFS_LOOKAHEAD_SIZE];
@@ -90,23 +82,7 @@ static int dev_sync(const struct LFSx_API (config) * c) {
     return LFSx_MACRO(_ERR_OK);
 }
 
-int VFS_LFSx_MOUNT(VFS_LFSx_CONTEXT_T *ctx, uint32_t base_addr, uint32_t byte_len) {
-    // Read start of superblock.
-    uint8_t buf[48];
-    hw_read(base_addr, sizeof(buf), buf);
-
-    // Verify littlefs and detect block size.
-    if (memcmp(&buf[SUPERBLOCK_MAGIC_OFFSET], "littlefs", 8) != 0) {
-        return -1;
-    }
-    uint32_t block_size = get_le32(&buf[SUPERBLOCK_BLOCK_SIZE_OFFSET]);
-    uint32_t block_count = get_le32(&buf[SUPERBLOCK_BLOCK_COUNT_OFFSET]);
-
-    // Verify size of volume.
-    if (block_size * block_count != byte_len) {
-        return -1;
-    }
-
+int VFS_LFSx_MOUNT(VFS_LFSx_CONTEXT_T *ctx, uint32_t base_addr, uint32_t byte_len, uint32_t block_size) {
     ctx->bdev_base_addr = base_addr;
 
     struct LFSx_API (config) *config = &ctx->config;

From 0efa0b54374e3ea0cbaf455c41945800479b5bc8 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 28 Jan 2021 15:46:02 +1100
Subject: [PATCH 0525/3533] stm32/mboot: Add ELEM_TYPE_STATUS element so
 application can get status.

This new element takes the form: (ELEM_TYPE_STATUS, 4, <address>).  If this
element is present in the mboot command then mboot will store to the given
address the result of the filesystem firmware update process.  The address
can for example be an RTC backup register.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/boards/stm32f4xx_hal_conf_base.h | 1 +
 ports/stm32/boards/stm32f7xx_hal_conf_base.h | 1 +
 ports/stm32/boards/stm32h7xx_hal_conf_base.h | 1 +
 ports/stm32/mboot/main.c                     | 9 ++++++++-
 ports/stm32/mboot/mboot.h                    | 1 +
 5 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/ports/stm32/boards/stm32f4xx_hal_conf_base.h b/ports/stm32/boards/stm32f4xx_hal_conf_base.h
index 91f064835e03d..057a9e81e4cac 100644
--- a/ports/stm32/boards/stm32f4xx_hal_conf_base.h
+++ b/ports/stm32/boards/stm32f4xx_hal_conf_base.h
@@ -54,6 +54,7 @@
 #include "stm32f4xx_hal_usart.h"
 #include "stm32f4xx_hal_wwdg.h"
 #include "stm32f4xx_ll_adc.h"
+#include "stm32f4xx_ll_pwr.h"
 #include "stm32f4xx_ll_rtc.h"
 
 // Enable various HAL modules
diff --git a/ports/stm32/boards/stm32f7xx_hal_conf_base.h b/ports/stm32/boards/stm32f7xx_hal_conf_base.h
index 1a3fca3ac86a8..6e7dff3042ff3 100644
--- a/ports/stm32/boards/stm32f7xx_hal_conf_base.h
+++ b/ports/stm32/boards/stm32f7xx_hal_conf_base.h
@@ -54,6 +54,7 @@
 #include "stm32f7xx_hal_usart.h"
 #include "stm32f7xx_hal_wwdg.h"
 #include "stm32f7xx_ll_adc.h"
+#include "stm32f7xx_ll_pwr.h"
 #include "stm32f7xx_ll_rtc.h"
 
 // Enable various HAL modules
diff --git a/ports/stm32/boards/stm32h7xx_hal_conf_base.h b/ports/stm32/boards/stm32h7xx_hal_conf_base.h
index 231f1ac7f4d28..a451cfde76162 100644
--- a/ports/stm32/boards/stm32h7xx_hal_conf_base.h
+++ b/ports/stm32/boards/stm32h7xx_hal_conf_base.h
@@ -54,6 +54,7 @@
 #include "stm32h7xx_hal_usart.h"
 #include "stm32h7xx_hal_wwdg.h"
 #include "stm32h7xx_ll_adc.h"
+#include "stm32h7xx_ll_pwr.h"
 #include "stm32h7xx_ll_rtc.h"
 
 // Enable various HAL modules
diff --git a/ports/stm32/mboot/main.c b/ports/stm32/mboot/main.c
index 0846d97cf365a..1395949f2e012 100644
--- a/ports/stm32/mboot/main.c
+++ b/ports/stm32/mboot/main.c
@@ -1443,7 +1443,14 @@ void stm32_main(int initial_r0) {
         // Application passed through elements, validate then process them
         const uint8_t *elem_end = elem_search(ELEM_DATA_START, ELEM_TYPE_END);
         if (elem_end != NULL && elem_end[-1] == 0) {
-            fsload_process();
+            int ret = fsload_process();
+            // If there is a valid ELEM_TYPE_STATUS element then store the status in the given location.
+            const uint8_t *elem_status = elem_search(ELEM_DATA_START, ELEM_TYPE_STATUS);
+            if (elem_status != NULL && elem_status[-1] == 4) {
+                uint32_t *status_ptr = (uint32_t *)get_le32(&elem_status[0]);
+                LL_PWR_EnableBkUpAccess(); // In case status_ptr points to backup registers
+                *status_ptr = ret;
+            }
         }
         // Always reset because the application is expecting to resume
         led_state_all(0);
diff --git a/ports/stm32/mboot/mboot.h b/ports/stm32/mboot/mboot.h
index e4ed3cecc7f50..853a86968ea61 100644
--- a/ports/stm32/mboot/mboot.h
+++ b/ports/stm32/mboot/mboot.h
@@ -43,6 +43,7 @@ enum {
     ELEM_TYPE_END = 1,
     ELEM_TYPE_MOUNT,
     ELEM_TYPE_FSLOAD,
+    ELEM_TYPE_STATUS,
 };
 
 enum {

From bd7110a3d50d2bcfaa5527fdb5d7305badba1b82 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 29 Jan 2021 00:40:49 +1100
Subject: [PATCH 0526/3533] stm32/mboot: Introduce MBOOT_ERRNO_xxx constants
 and use them.

So that a failed update via fsload can be more easily diagnosed.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/mboot/fsload.c   | 30 +++++++++++++++---------------
 ports/stm32/mboot/gzstream.c |  2 +-
 ports/stm32/mboot/main.c     |  6 +++---
 ports/stm32/mboot/mboot.h    | 31 +++++++++++++++++++++++++++++++
 ports/stm32/mboot/pack.c     | 22 +++++++++++-----------
 ports/stm32/mboot/vfs_fat.c  |  4 ++--
 ports/stm32/mboot/vfs_lfs.c  | 13 +++++++++++--
 7 files changed, 74 insertions(+), 34 deletions(-)

diff --git a/ports/stm32/mboot/fsload.c b/ports/stm32/mboot/fsload.c
index fe98426bed9cf..9ecc25b0be925 100644
--- a/ports/stm32/mboot/fsload.c
+++ b/ports/stm32/mboot/fsload.c
@@ -80,18 +80,18 @@ static int fsload_program_file(bool write_to_flash) {
     // Read file header, <5sBIB
     int res = input_stream_read(11, buf);
     if (res != 11) {
-        return -1;
+        return -MBOOT_ERRNO_DFU_READ_ERROR;
     }
     file_offset = 11;
 
     // Validate header, version 1
     if (memcmp(buf, "DfuSe\x01", 6) != 0) {
-        return -1;
+        return -MBOOT_ERRNO_DFU_INVALID_HEADER;
     }
 
     // Must have only 1 target
     if (buf[10] != 1) {
-        return -2;
+        return -MBOOT_ERRNO_DFU_TOO_MANY_TARGETS;
     }
 
     // Get total size
@@ -100,13 +100,13 @@ static int fsload_program_file(bool write_to_flash) {
     // Read target header, <6sBi255sII
     res = input_stream_read(274, buf);
     if (res != 274) {
-        return -1;
+        return -MBOOT_ERRNO_DFU_READ_ERROR;
     }
     file_offset += 274;
 
     // Validate target header, with alt being 0
     if (memcmp(buf, "Target\x00", 7) != 0) {
-        return -1;
+        return -MBOOT_ERRNO_DFU_INVALID_TARGET;
     }
 
     // Get target size and number of elements
@@ -120,7 +120,7 @@ static int fsload_program_file(bool write_to_flash) {
         // Read element header, <II
         res = input_stream_read(8, buf);
         if (res != 8) {
-            return -1;
+            return -MBOOT_ERRNO_DFU_READ_ERROR;
         }
         file_offset += 8;
 
@@ -149,12 +149,12 @@ static int fsload_program_file(bool write_to_flash) {
             }
             res = input_stream_read(l, buf);
             if (res != l) {
-                return -1;
+                return -MBOOT_ERRNO_DFU_READ_ERROR;
             }
             if (write_to_flash) {
                 res = do_write(elem_addr, buf, l);
                 if (res != 0) {
-                    return -1;
+                    return res;
                 }
                 elem_addr += l;
             }
@@ -165,17 +165,17 @@ static int fsload_program_file(bool write_to_flash) {
     }
 
     if (target_size != file_offset - file_offset_target) {
-        return -1;
+        return -MBOOT_ERRNO_DFU_INVALID_SIZE;
     }
 
     if (total_size != file_offset) {
-        return -1;
+        return -MBOOT_ERRNO_DFU_INVALID_SIZE;
     }
 
     // Read trailing info
     res = input_stream_read(16, buf);
     if (res != 16) {
-        return -1;
+        return -MBOOT_ERRNO_DFU_READ_ERROR;
     }
 
     // TODO validate CRC32
@@ -205,7 +205,7 @@ static int fsload_validate_and_program_file(void *stream, const stream_methods_t
 int fsload_process(void) {
     const uint8_t *elem = elem_search(ELEM_DATA_START, ELEM_TYPE_FSLOAD);
     if (elem == NULL || elem[-1] < 2) {
-        return -1;
+        return -MBOOT_ERRNO_FSLOAD_NO_FSLOAD;
     }
 
     // Get mount point id and create null-terminated filename
@@ -220,7 +220,7 @@ int fsload_process(void) {
         elem = elem_search(elem, ELEM_TYPE_MOUNT);
         if (elem == NULL) {
             // End of elements.
-            return -1;
+            return -MBOOT_ERRNO_FSLOAD_NO_MOUNT;
         }
         uint32_t block_size;
         if (elem[-1] == 10) {
@@ -231,7 +231,7 @@ int fsload_process(void) {
             block_size = get_le32(&elem[10]);
         } else {
             // Invalid MOUNT element.
-            return -1;
+            return -MBOOT_ERRNO_FSLOAD_INVALID_MOUNT;
         }
         if (elem[0] == mount_point) {
             uint32_t base_addr = get_le32(&elem[2]);
@@ -270,7 +270,7 @@ int fsload_process(void) {
             #endif
             {
                 // Unknown filesystem type
-                return -1;
+                return -MBOOT_ERRNO_FSLOAD_INVALID_MOUNT;
             }
 
             if (ret == 0) {
diff --git a/ports/stm32/mboot/gzstream.c b/ports/stm32/mboot/gzstream.c
index 6530539f40b1a..652302e42bf04 100644
--- a/ports/stm32/mboot/gzstream.c
+++ b/ports/stm32/mboot/gzstream.c
@@ -80,7 +80,7 @@ int gz_stream_init_from_stream(void *stream_data, stream_read_t stream_read) {
 
     int st = uzlib_gzip_parse_header(&gz_stream.tinf);
     if (st != TINF_OK) {
-        return -1;
+        return -MBOOT_ERRNO_GUNZIP_FAILED;
     }
 
     uzlib_uncompress_init(&gz_stream.tinf, gz_stream.dict, DICT_SIZE);
diff --git a/ports/stm32/mboot/main.c b/ports/stm32/mboot/main.c
index 1395949f2e012..4407ca9da9bdf 100644
--- a/ports/stm32/mboot/main.c
+++ b/ports/stm32/mboot/main.c
@@ -489,7 +489,7 @@ static int mboot_flash_page_erase(uint32_t addr, uint32_t *next_addr) {
         dfu_context.status = DFU_STATUS_ERROR_ADDRESS;
         dfu_context.error = (sector == 0) ? MBOOT_ERROR_STR_OVERWRITE_BOOTLOADER_IDX
                                           : MBOOT_ERROR_STR_INVALID_ADDRESS_IDX;
-        return -1;
+        return -MBOOT_ERRNO_FLASH_ERASE_DISALLOWED;
     }
 
     *next_addr = sector_start + sector_size;
@@ -503,7 +503,7 @@ static int mboot_flash_page_erase(uint32_t addr, uint32_t *next_addr) {
     // Check the erase set bits to 1, at least for the first 256 bytes
     for (int i = 0; i < 64; ++i) {
         if (((volatile uint32_t*)sector_start)[i] != 0xffffffff) {
-            return -2;
+            return -MBOOT_ERRNO_FLASH_ERASE_FAILED;
         }
     }
 
@@ -517,7 +517,7 @@ static int mboot_flash_write(uint32_t addr, const uint8_t *src8, size_t len) {
         dfu_context.status = DFU_STATUS_ERROR_ADDRESS;
         dfu_context.error = (sector == 0) ? MBOOT_ERROR_STR_OVERWRITE_BOOTLOADER_IDX
                                           : MBOOT_ERROR_STR_INVALID_ADDRESS_IDX;
-        return -1;
+        return -MBOOT_ERRNO_FLASH_WRITE_DISALLOWED;
     }
 
     const uint32_t *src = (const uint32_t*)src8;
diff --git a/ports/stm32/mboot/mboot.h b/ports/stm32/mboot/mboot.h
index 853a86968ea61..8f8a8afdd7c0b 100644
--- a/ports/stm32/mboot/mboot.h
+++ b/ports/stm32/mboot/mboot.h
@@ -39,6 +39,37 @@
 #define NORETURN __attribute__((noreturn))
 #define MP_ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0]))
 
+enum {
+    MBOOT_ERRNO_FLASH_ERASE_DISALLOWED = 200,
+    MBOOT_ERRNO_FLASH_ERASE_FAILED,
+    MBOOT_ERRNO_FLASH_WRITE_DISALLOWED,
+
+    MBOOT_ERRNO_DFU_INVALID_HEADER = 210,
+    MBOOT_ERRNO_DFU_INVALID_TARGET,
+    MBOOT_ERRNO_DFU_INVALID_SIZE,
+    MBOOT_ERRNO_DFU_TOO_MANY_TARGETS,
+    MBOOT_ERRNO_DFU_READ_ERROR,
+
+    MBOOT_ERRNO_FSLOAD_NO_FSLOAD = 220,
+    MBOOT_ERRNO_FSLOAD_NO_MOUNT,
+    MBOOT_ERRNO_FSLOAD_INVALID_MOUNT,
+
+    MBOOT_ERRNO_PACK_INVALID_ADDR = 230,
+    MBOOT_ERRNO_PACK_INVALID_CHUNK,
+    MBOOT_ERRNO_PACK_INVALID_VERSION,
+    MBOOT_ERRNO_PACK_DECRYPT_FAILED,
+    MBOOT_ERRNO_PACK_SIGN_FAILED,
+
+    MBOOT_ERRNO_VFS_FAT_MOUNT_FAILED = 240,
+    MBOOT_ERRNO_VFS_FAT_OPEN_FAILED,
+    MBOOT_ERRNO_VFS_LFS1_MOUNT_FAILED,
+    MBOOT_ERRNO_VFS_LFS1_OPEN_FAILED,
+    MBOOT_ERRNO_VFS_LFS2_MOUNT_FAILED,
+    MBOOT_ERRNO_VFS_LFS2_OPEN_FAILED,
+
+    MBOOT_ERRNO_GUNZIP_FAILED = 250,
+};
+
 enum {
     ELEM_TYPE_END = 1,
     ELEM_TYPE_MOUNT,
diff --git a/ports/stm32/mboot/pack.c b/ports/stm32/mboot/pack.c
index 63f98fed186a7..63ab93ea30fdb 100644
--- a/ports/stm32/mboot/pack.c
+++ b/ports/stm32/mboot/pack.c
@@ -112,7 +112,7 @@ static int mboot_pack_commit_chunk(uint32_t addr, uint8_t *data, size_t len) {
 // Handle a chunk with the full firmware signature.
 static int mboot_pack_handle_full_sig(void) {
     if (firmware_chunk_buf.header.length < hydro_sign_BYTES) {
-        return -1;
+        return -MBOOT_ERRNO_PACK_INVALID_CHUNK;
     }
 
     uint8_t *full_sig = &firmware_chunk_buf.data[firmware_chunk_buf.header.length - hydro_sign_BYTES];
@@ -138,7 +138,7 @@ static int mboot_pack_handle_full_sig(void) {
             }
             int ret = hydro_sign_update(&sign_state, buf, l);
             if (ret != 0) {
-                return -1;
+                return -MBOOT_ERRNO_PACK_SIGN_FAILED;
             }
             addr += l;
             len -= l;
@@ -150,7 +150,7 @@ static int mboot_pack_handle_full_sig(void) {
     if (ret != 0) {
         dfu_context.status = DFU_STATUS_ERROR_VERIFY;
         dfu_context.error = MBOOT_ERROR_STR_INVALID_SIG_IDX;
-        return -1;
+        return -MBOOT_ERRNO_PACK_SIGN_FAILED;
     }
 
     // Full firmware passed the signature check.
@@ -167,7 +167,7 @@ static int mboot_pack_handle_firmware(void) {
     if (hydro_secretbox_decrypt(decrypted_buf, fw_data, fw_len, 0, MBOOT_PACK_HYDRO_CONTEXT, mboot_pack_secretbox_key) != 0) {
         dfu_context.status = DFU_STATUS_ERROR_VERIFY;
         dfu_context.error = MBOOT_ERROR_STR_INVALID_SIG_IDX;
-        return -1;
+        return -MBOOT_ERRNO_PACK_DECRYPT_FAILED;
     }
 
     // Use the decrypted message contents going formward.
@@ -182,7 +182,7 @@ static int mboot_pack_handle_firmware(void) {
             if (read == 0) {
                 return 0; // finished decompressing
             } else if (read < 0) {
-                return -1; // error reading
+                return -MBOOT_ERRNO_GUNZIP_FAILED; // error reading
             }
             int ret = mboot_pack_commit_chunk(addr, uncompressed_buf, read);
             if (ret != 0) {
@@ -210,14 +210,14 @@ int mboot_pack_write(uint32_t addr, const uint8_t *src8, size_t len) {
     if (addr < firmware_chunk_base_addr) {
         // Address out of range.
         firmware_chunk_base_addr = 0;
-        return -1;
+        return -MBOOT_ERRNO_PACK_INVALID_ADDR;
     }
 
     size_t offset = addr - firmware_chunk_base_addr;
     if (offset + len > sizeof(firmware_chunk_buf)) {
         // Address/length out of range.
         firmware_chunk_base_addr = 0;
-        return -1;
+        return -MBOOT_ERRNO_PACK_INVALID_ADDR;
     }
 
     // Copy in the new data piece into the chunk buffer.
@@ -232,14 +232,14 @@ int mboot_pack_write(uint32_t addr, const uint8_t *src8, size_t len) {
         // Chunk header has the wrong version.
         dfu_context.status = DFU_STATUS_ERROR_FILE;
         dfu_context.error = MBOOT_ERROR_STR_INVALID_SIG_IDX;
-        return -1;
+        return -MBOOT_ERRNO_PACK_INVALID_VERSION;
     }
 
     if (firmware_chunk_buf.header.address != firmware_chunk_base_addr) {
         // Chunk address doesn't agree with dfu address, abort.
         dfu_context.status = DFU_STATUS_ERROR_ADDRESS;
         dfu_context.error = MBOOT_ERROR_STR_INVALID_SIG_IDX;
-        return -1;
+        return -MBOOT_ERRNO_PACK_INVALID_ADDR;
     }
 
     if (offset + len < sizeof(firmware_chunk_buf.header) + firmware_chunk_buf.header.length + sizeof(firmware_chunk_buf.signature)) {
@@ -260,7 +260,7 @@ int mboot_pack_write(uint32_t addr, const uint8_t *src8, size_t len) {
         // Signature failed
         dfu_context.status = DFU_STATUS_ERROR_VERIFY;
         dfu_context.error = MBOOT_ERROR_STR_INVALID_SIG_IDX;
-        return -1;
+        return -MBOOT_ERRNO_PACK_SIGN_FAILED;
     }
 
     // Signature passed, we have valid chunk.
@@ -275,7 +275,7 @@ int mboot_pack_write(uint32_t addr, const uint8_t *src8, size_t len) {
         return mboot_pack_handle_firmware();
     } else {
         // Unsupported contents.
-        return -1;
+        return -MBOOT_ERRNO_PACK_INVALID_CHUNK;
     }
 }
 
diff --git a/ports/stm32/mboot/vfs_fat.c b/ports/stm32/mboot/vfs_fat.c
index 5120bdb1044e6..cfa30fb12cc27 100644
--- a/ports/stm32/mboot/vfs_fat.c
+++ b/ports/stm32/mboot/vfs_fat.c
@@ -84,7 +84,7 @@ int vfs_fat_mount(vfs_fat_context_t *ctx, uint32_t base_addr, uint32_t byte_len)
     ctx->fatfs.drv = ctx;
     FRESULT res = f_mount(&ctx->fatfs);
     if (res != FR_OK) {
-        return -1;
+        return -MBOOT_ERRNO_VFS_FAT_MOUNT_FAILED;
     }
     return 0;
 }
@@ -93,7 +93,7 @@ static int vfs_fat_stream_open(void *stream_in, const char *fname) {
     vfs_fat_context_t *stream = stream_in;
     FRESULT res = f_open(&stream->fatfs, &stream->fp, fname, FA_READ);
     if (res != FR_OK) {
-        return -1;
+        return -MBOOT_ERRNO_VFS_FAT_OPEN_FAILED;
     }
     return 0;
 }
diff --git a/ports/stm32/mboot/vfs_lfs.c b/ports/stm32/mboot/vfs_lfs.c
index 3e4c9caf16d87..e7fd8ce63c07e 100644
--- a/ports/stm32/mboot/vfs_lfs.c
+++ b/ports/stm32/mboot/vfs_lfs.c
@@ -37,6 +37,9 @@
 #error Unsupported
 #endif
 
+#define MBOOT_ERRNO_VFS_LFS_MOUNT_FAILED MBOOT_ERRNO_VFS_LFS1_MOUNT_FAILED
+#define MBOOT_ERRNO_VFS_LFS_OPEN_FAILED MBOOT_ERRNO_VFS_LFS1_OPEN_FAILED
+
 #define LFSx_MACRO(s) LFS1##s
 #define LFSx_API(x) lfs1_ ## x
 #define VFS_LFSx_CONTEXT_T vfs_lfs1_context_t
@@ -49,6 +52,9 @@ static uint8_t lfs_lookahead_buffer[LFS_LOOKAHEAD_SIZE / 8];
 
 #else
 
+#define MBOOT_ERRNO_VFS_LFS_MOUNT_FAILED MBOOT_ERRNO_VFS_LFS2_MOUNT_FAILED
+#define MBOOT_ERRNO_VFS_LFS_OPEN_FAILED MBOOT_ERRNO_VFS_LFS2_OPEN_FAILED
+
 #define LFSx_MACRO(s) LFS2##s
 #define LFSx_API(x) lfs2_ ## x
 #define VFS_LFSx_CONTEXT_T vfs_lfs2_context_t
@@ -116,7 +122,7 @@ int VFS_LFSx_MOUNT(VFS_LFSx_CONTEXT_T *ctx, uint32_t base_addr, uint32_t byte_le
 
     int ret = LFSx_API(mount)(&ctx->lfs, &ctx->config);
     if (ret < 0) {
-        return -1;
+        return -MBOOT_ERRNO_VFS_LFS_MOUNT_FAILED;
     }
     return 0;
 }
@@ -126,7 +132,10 @@ static int vfs_lfs_stream_open(void *stream_in, const char *fname) {
     memset(&ctx->file, 0, sizeof(ctx->file));
     memset(&ctx->filecfg, 0, sizeof(ctx->filecfg));
     ctx->filecfg.buffer = &ctx->filebuf[0];
-    LFSx_API(file_opencfg)(&ctx->lfs, &ctx->file, fname, LFSx_MACRO(_O_RDONLY), &ctx->filecfg);
+    int ret = LFSx_API(file_opencfg)(&ctx->lfs, &ctx->file, fname, LFSx_MACRO(_O_RDONLY), &ctx->filecfg);
+    if (ret < 0) {
+        return -MBOOT_ERRNO_VFS_LFS_OPEN_FAILED;
+    }
     return 0;
 }
 

From 8f211df360f324c6f8e0fee3fe00bc0b4a9ac390 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 29 Jan 2021 11:16:00 +1100
Subject: [PATCH 0527/3533] stm32/mboot/fwupdate.py: Refactor update_mpy with
 support for STATUS.

Changes are:
- refactor to use new _create_element function
- support extended version of MOUNT element with block size
- support STATUS element

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/mboot/fwupdate.py | 36 ++++++++++++++++++++++++++---------
 1 file changed, 27 insertions(+), 9 deletions(-)

diff --git a/ports/stm32/mboot/fwupdate.py b/ports/stm32/mboot/fwupdate.py
index 65284a6ac0461..d7c8f46db4c53 100644
--- a/ports/stm32/mboot/fwupdate.py
+++ b/ports/stm32/mboot/fwupdate.py
@@ -1,6 +1,7 @@
 # Update Mboot or MicroPython from a .dfu.gz file on the board's filesystem
 # MIT license; Copyright (c) 2019-2020 Damien P. George
 
+from micropython import const
 import struct, time
 import uzlib, machine, stm
 
@@ -9,6 +10,12 @@
 VFS_LFS1 = 2
 VFS_LFS2 = 3
 
+# Constants for creating mboot elements.
+_ELEM_TYPE_END = const(1)
+_ELEM_TYPE_MOUNT = const(2)
+_ELEM_TYPE_FSLOAD = const(3)
+_ELEM_TYPE_STATUS = const(4)
+
 FLASH_KEY1 = 0x45670123
 FLASH_KEY2 = 0xCDEF89AB
 
@@ -156,7 +163,11 @@ def update_mboot(filename):
     print("Programming finished, can now reset or turn off.")
 
 
-def update_mpy(filename, fs_base, fs_len, fs_type=VFS_FAT):
+def _create_element(kind, body):
+    return bytes([kind, len(body)]) + body
+
+
+def update_mpy(filename, fs_base, fs_len, fs_type=VFS_FAT, fs_blocksize=0, status_addr=None):
     # Check firmware is of .dfu or .dfu.gz type
     try:
         with open(filename, "rb") as f:
@@ -168,13 +179,20 @@ def update_mpy(filename, fs_base, fs_len, fs_type=VFS_FAT):
         print("Firmware must be a .dfu(.gz) file.")
         return
 
-    ELEM_TYPE_END = 1
-    ELEM_TYPE_MOUNT = 2
-    ELEM_TYPE_FSLOAD = 3
+    if fs_type in (VFS_LFS1, VFS_LFS2) and not fs_blocksize:
+        raise Exception("littlefs requires fs_blocksize parameter")
+
     mount_point = 1
-    mount = struct.pack("<BBBBLL", ELEM_TYPE_MOUNT, 10, mount_point, fs_type, fs_base, fs_len)
-    fsup = struct.pack("<BBB", ELEM_TYPE_FSLOAD, 1 + len(filename), mount_point) + bytes(
-        filename, "ascii"
+    elems = _create_element(
+        _ELEM_TYPE_MOUNT,
+        struct.pack("<BBLLL", mount_point, fs_type, fs_base, fs_len, fs_blocksize),
+    )
+    elems += _create_element(
+        _ELEM_TYPE_FSLOAD, struct.pack("<B", mount_point) + bytes(filename, "ascii")
     )
-    end = struct.pack("<BB", ELEM_TYPE_END, 0)
-    machine.bootloader(mount + fsup + end)
+    if status_addr is not None:
+        # mboot will write 0 to status_addr on succes, or a negative number on failure
+        machine.mem32[status_addr] = 1
+        elems += _create_element(_ELEM_TYPE_STATUS, struct.pack("<L", status_addr))
+    elems += _create_element(_ELEM_TYPE_END, b"")
+    machine.bootloader(elems)

From d1f120b1425d6622e8596815be7876aa8c434dbf Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 29 Jan 2021 11:59:15 +1100
Subject: [PATCH 0528/3533] stm32/main: Introduce
 MICROPY_HW_FLASH_MOUNT_AT_BOOT config option.

It's enabled by default to retain the existing behaviour.  A board can
disable this option if it manages mounting the filesystem itself, for
example in frozen code.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/main.c                 | 4 ++--
 ports/stm32/mpconfigboard_common.h | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ports/stm32/main.c b/ports/stm32/main.c
index f0a10fa93359e..38710e2651fb3 100644
--- a/ports/stm32/main.c
+++ b/ports/stm32/main.c
@@ -153,7 +153,7 @@ STATIC mp_obj_t pyb_main(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_a
 }
 MP_DEFINE_CONST_FUN_OBJ_KW(pyb_main_obj, 1, pyb_main);
 
-#if MICROPY_HW_ENABLE_STORAGE
+#if MICROPY_HW_FLASH_MOUNT_AT_BOOT
 // avoid inlining to avoid stack usage within main()
 MP_NOINLINE STATIC bool init_flash_fs(uint reset_mode) {
     if (reset_mode == 3) {
@@ -530,7 +530,7 @@ void stm32_main(uint32_t reset_mode) {
     // Initialise the local flash filesystem.
     // Create it if needed, mount in on /flash, and set it as current dir.
     bool mounted_flash = false;
-    #if MICROPY_HW_ENABLE_STORAGE
+    #if MICROPY_HW_FLASH_MOUNT_AT_BOOT
     mounted_flash = init_flash_fs(reset_mode);
     #endif
 
diff --git a/ports/stm32/mpconfigboard_common.h b/ports/stm32/mpconfigboard_common.h
index 60fbc35fcbae0..f493bb5d4a644 100644
--- a/ports/stm32/mpconfigboard_common.h
+++ b/ports/stm32/mpconfigboard_common.h
@@ -122,6 +122,11 @@
 #define MICROPY_HW_HAS_LCD (0)
 #endif
 
+// Whether to automatically mount (and boot from) the flash filesystem
+#ifndef MICROPY_HW_FLASH_MOUNT_AT_BOOT
+#define MICROPY_HW_FLASH_MOUNT_AT_BOOT (MICROPY_HW_ENABLE_STORAGE)
+#endif
+
 // The volume label used when creating the flash filesystem
 #ifndef MICROPY_HW_FLASH_FS_LABEL
 #define MICROPY_HW_FLASH_FS_LABEL "pybflash"

From 5d68b5e22ca361676903c68a5c004bdff40dd88b Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 29 Jan 2021 23:30:02 +1100
Subject: [PATCH 0529/3533] tools/ci.sh: For ci_code_size_setup, update apt to
 install gcc-multilib.

Signed-off-by: Damien George <damien@micropython.org>
---
 tools/ci.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/ci.sh b/tools/ci.sh
index 86c17bb691e3a..986ec6756eac7 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -33,6 +33,7 @@ function ci_code_formatting_run {
 # code size
 
 function ci_code_size_setup {
+    sudo apt-get update
     sudo apt-get install gcc-multilib
     gcc --version
     ci_gcc_arm_setup

From 925bd67cfb1607264fae79a4fdf5e79ab1ae46aa Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sat, 26 Sep 2020 01:17:11 +1000
Subject: [PATCH 0530/3533] py/objfun: Support fun.__globals__ attribute.

This returns a reference to the globals dict associated with the function,
ie the global scope that the function was defined in.  This attribute is
read-only but the dict itself is modifiable, per CPython behaviour.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/objfun.c                 |  4 ++++
 tests/basics/fun_globals.py | 21 +++++++++++++++++++++
 2 files changed, 25 insertions(+)
 create mode 100644 tests/basics/fun_globals.py

diff --git a/py/objfun.c b/py/objfun.c
index 052f4b1cedfd2..178f834431cf1 100644
--- a/py/objfun.c
+++ b/py/objfun.c
@@ -355,6 +355,10 @@ void mp_obj_fun_bc_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
     if (attr == MP_QSTR___name__) {
         dest[0] = MP_OBJ_NEW_QSTR(mp_obj_fun_get_name(self_in));
     }
+    if (attr == MP_QSTR___globals__) {
+        mp_obj_fun_bc_t *self = MP_OBJ_TO_PTR(self_in);
+        dest[0] = MP_OBJ_FROM_PTR(self->globals);
+    }
 }
 #endif
 
diff --git a/tests/basics/fun_globals.py b/tests/basics/fun_globals.py
new file mode 100644
index 0000000000000..3f32e8bdb05b5
--- /dev/null
+++ b/tests/basics/fun_globals.py
@@ -0,0 +1,21 @@
+# test the __globals__ attribute of a function
+
+
+def foo():
+    pass
+
+
+if not hasattr(foo, "__globals__"):
+    print("SKIP")
+    raise SystemExit
+
+print(type(foo.__globals__))
+print(foo.__globals__ is globals())
+
+foo.__globals__["bar"] = 123
+print(bar)
+
+try:
+    foo.__globals__ = None
+except AttributeError:
+    print("AttributeError")

From fe16e785fe76ca2c84b82512c427c7fa57176abe Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sat, 16 Jan 2021 02:01:26 +1100
Subject: [PATCH 0531/3533] tools/mpy-tool.py: List frozen modules in
 MICROPY_FROZEN_LIST_ITEM.

Signed-off-by: Damien George <damien@micropython.org>
---
 tools/mpy-tool.py | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/tools/mpy-tool.py b/tools/mpy-tool.py
index de7cfe5d631c7..ea756d3ee2a5c 100755
--- a/tools/mpy-tool.py
+++ b/tools/mpy-tool.py
@@ -916,6 +916,17 @@ def freeze_mpy(base_qstrs, raw_codes):
         print("    &raw_code_%s," % rc.escaped_name)
     print("};")
 
+    # If a port defines MICROPY_FROZEN_LIST_ITEM then list all modules wrapped in that macro.
+    print("#ifdef MICROPY_FROZEN_LIST_ITEM")
+    for rc in raw_codes:
+        module_name = rc.source_file.str
+        if module_name.endswith("/__init__.py"):
+            short_name = module_name[: -len("/__init__.py")]
+        else:
+            short_name = module_name[: -len(".py")]
+        print('MICROPY_FROZEN_LIST_ITEM("%s", "%s")' % (short_name, module_name))
+    print("#endif")
+
 
 def merge_mpy(raw_codes, output_file):
     assert len(raw_codes) <= 31  # so var-uints all fit in 1 byte

From 40d2010882409e71080f519312488f5bb951238b Mon Sep 17 00:00:00 2001
From: graham sanderson <graham.sanderson@raspberrypi.org>
Date: Sat, 12 Dec 2020 13:04:10 -0600
Subject: [PATCH 0532/3533] py/asmthumb: Add support for ARMv6M in native
 emitter.

Adds a new compile-time option MICROPY_EMIT_THUMB_ARMV7M which is enabled
by default (to get existing behaviour) and which should be disabled (set to
0) when building native emitter support (@micropython.native) on ARMv6M
targets.
---
 py/asmthumb.c        | 177 +++++++++++++++++++++++++++++++++++++++++--
 py/asmthumb.h        |  45 +++++++++++
 py/emitinlinethumb.c |   6 +-
 py/mpconfig.h        |   5 ++
 4 files changed, 225 insertions(+), 8 deletions(-)

diff --git a/py/asmthumb.c b/py/asmthumb.c
index bb10935fdaad3..e3558b2cf2568 100644
--- a/py/asmthumb.c
+++ b/py/asmthumb.c
@@ -47,6 +47,7 @@
 #define SIGNED_FIT12(x) (((x) & 0xfffff800) == 0) || (((x) & 0xfffff800) == 0xfffff800)
 #define SIGNED_FIT23(x) (((x) & 0xffc00000) == 0) || (((x) & 0xffc00000) == 0xffc00000)
 
+#if MICROPY_EMIT_THUMB_ARMV7M
 // Note: these actually take an imm12 but the high-bit is not encoded here
 #define OP_ADD_W_RRI_HI(reg_src) (0xf200 | (reg_src))
 #define OP_ADD_W_RRI_LO(reg_dest, imm11) ((imm11 << 4 & 0x7000) | reg_dest << 8 | (imm11 & 0xff))
@@ -55,6 +56,7 @@
 
 #define OP_LDR_W_HI(reg_base) (0xf8d0 | (reg_base))
 #define OP_LDR_W_LO(reg_dest, imm12) ((reg_dest) << 12 | (imm12))
+#endif
 
 static inline byte *asm_thumb_get_cur_to_write_bytes(asm_thumb_t *as, int n) {
     return mp_asm_base_get_cur_to_write_bytes(&as->base, n);
@@ -122,7 +124,7 @@ void asm_thumb_entry(asm_thumb_t *as, int num_locals) {
 
     // If this Thumb machine code is run from ARM state then add a prelude
     // to switch to Thumb state for the duration of the function.
-    #if MICROPY_DYNAMIC_COMPILER || MICROPY_EMIT_ARM || (defined(__arm__) && !defined(__thumb2__))
+    #if MICROPY_DYNAMIC_COMPILER || MICROPY_EMIT_ARM || (defined(__arm__) && !defined(__thumb2__) && !defined(__thumb__))
     #if MICROPY_DYNAMIC_COMPILER
     if (mp_dynamic_compiler.native_arch == MP_NATIVE_ARCH_ARMV6)
     #endif
@@ -171,11 +173,21 @@ void asm_thumb_entry(asm_thumb_t *as, int num_locals) {
     }
     asm_thumb_op16(as, OP_PUSH_RLIST_LR(reglist));
     if (stack_adjust > 0) {
+        #if MICROPY_EMIT_THUMB_ARMV7M
         if (UNSIGNED_FIT7(stack_adjust)) {
             asm_thumb_op16(as, OP_SUB_SP(stack_adjust));
         } else {
             asm_thumb_op32(as, OP_SUB_W_RRI_HI(ASM_THUMB_REG_SP), OP_SUB_W_RRI_LO(ASM_THUMB_REG_SP, stack_adjust * 4));
         }
+        #else
+        int adj = stack_adjust;
+        // we don't expect the stack_adjust to be massive
+        while (!UNSIGNED_FIT7(adj)) {
+            asm_thumb_op16(as, OP_SUB_SP(127));
+            adj -= 127;
+        }
+        asm_thumb_op16(as, OP_SUB_SP(adj));
+        #endif
     }
     as->push_reglist = reglist;
     as->stack_adjust = stack_adjust;
@@ -183,11 +195,21 @@ void asm_thumb_entry(asm_thumb_t *as, int num_locals) {
 
 void asm_thumb_exit(asm_thumb_t *as) {
     if (as->stack_adjust > 0) {
+        #if MICROPY_EMIT_THUMB_ARMV7M
         if (UNSIGNED_FIT7(as->stack_adjust)) {
             asm_thumb_op16(as, OP_ADD_SP(as->stack_adjust));
         } else {
             asm_thumb_op32(as, OP_ADD_W_RRI_HI(ASM_THUMB_REG_SP), OP_ADD_W_RRI_LO(ASM_THUMB_REG_SP, as->stack_adjust * 4));
         }
+        #else
+        int adj = as->stack_adjust;
+        // we don't expect the stack_adjust to be massive
+        while (!UNSIGNED_FIT7(adj)) {
+            asm_thumb_op16(as, OP_ADD_SP(127));
+            adj -= 127;
+        }
+        asm_thumb_op16(as, OP_ADD_SP(adj));
+        #endif
     }
     asm_thumb_op16(as, OP_POP_RLIST_PC(as->push_reglist));
 }
@@ -241,6 +263,8 @@ void asm_thumb_mov_reg_reg(asm_thumb_t *as, uint reg_dest, uint reg_src) {
     asm_thumb_op16(as, 0x4600 | op_lo);
 }
 
+#if MICROPY_EMIT_THUMB_ARMV7M
+
 // if loading lo half with movw, the i16 value will be zero extended into the r32 register!
 size_t asm_thumb_mov_reg_i16(asm_thumb_t *as, uint mov_op, uint reg_dest, int i16_src) {
     assert(reg_dest < ASM_THUMB_REG_R15);
@@ -250,6 +274,16 @@ size_t asm_thumb_mov_reg_i16(asm_thumb_t *as, uint mov_op, uint reg_dest, int i1
     return loc;
 }
 
+#else
+
+void asm_thumb_mov_rlo_i16(asm_thumb_t *as, uint rlo_dest, int i16_src) {
+    asm_thumb_mov_rlo_i8(as, rlo_dest, (i16_src >> 8) & 0xff);
+    asm_thumb_lsl_rlo_rlo_i5(as, rlo_dest, rlo_dest, 8);
+    asm_thumb_add_rlo_i8(as, rlo_dest, i16_src & 0xff);
+}
+
+#endif
+
 #define OP_B_N(byte_offset) (0xe000 | (((byte_offset) >> 1) & 0x07ff))
 
 bool asm_thumb_b_n_label(asm_thumb_t *as, uint label) {
@@ -274,8 +308,13 @@ bool asm_thumb_bcc_nw_label(asm_thumb_t *as, int cond, uint label, bool wide) {
         asm_thumb_op16(as, OP_BCC_N(cond, rel));
         return as->base.pass != MP_ASM_PASS_EMIT || SIGNED_FIT9(rel);
     } else {
+        #if MICROPY_EMIT_THUMB_ARMV7M
         asm_thumb_op32(as, OP_BCC_W_HI(cond, rel), OP_BCC_W_LO(rel));
         return true;
+        #else
+        // this method should not be called for ARMV6M
+        return false;
+        #endif
     }
 }
 
@@ -296,8 +335,30 @@ size_t asm_thumb_mov_reg_i32(asm_thumb_t *as, uint reg_dest, mp_uint_t i32) {
 
     size_t loc = mp_asm_base_get_code_pos(&as->base);
 
+    #if MICROPY_EMIT_THUMB_ARMV7M
     asm_thumb_mov_reg_i16(as, ASM_THUMB_OP_MOVW, reg_dest, i32);
     asm_thumb_mov_reg_i16(as, ASM_THUMB_OP_MOVT, reg_dest, i32 >> 16);
+    #else
+    // should only be called with lo reg for ARMV6M
+    assert(reg_dest < ASM_THUMB_REG_R8);
+
+    // sanity check that generated code is aligned
+    assert(!as->base.code_base || !(3u & (uintptr_t)as->base.code_base));
+
+    // basically:
+    //        (nop)
+    //        ldr reg_dest, _data
+    //        b 1f
+    // _data: .word i32
+    //  1:
+    if (as->base.code_offset & 2u) {
+        asm_thumb_op16(as, ASM_THUMB_OP_NOP);
+    }
+    asm_thumb_ldr_rlo_pcrel_i8(as, reg_dest, 0);
+    asm_thumb_op16(as, OP_B_N(2));
+    asm_thumb_op16(as, i32 & 0xffff);
+    asm_thumb_op16(as, i32 >> 16);
+    #endif
 
     return loc;
 }
@@ -305,27 +366,68 @@ size_t asm_thumb_mov_reg_i32(asm_thumb_t *as, uint reg_dest, mp_uint_t i32) {
 void asm_thumb_mov_reg_i32_optimised(asm_thumb_t *as, uint reg_dest, int i32) {
     if (reg_dest < 8 && UNSIGNED_FIT8(i32)) {
         asm_thumb_mov_rlo_i8(as, reg_dest, i32);
-    } else if (UNSIGNED_FIT16(i32)) {
-        asm_thumb_mov_reg_i16(as, ASM_THUMB_OP_MOVW, reg_dest, i32);
     } else {
-        asm_thumb_mov_reg_i32(as, reg_dest, i32);
+        #if MICROPY_EMIT_THUMB_ARMV7M
+        if (UNSIGNED_FIT16(i32)) {
+            asm_thumb_mov_reg_i16(as, ASM_THUMB_OP_MOVW, reg_dest, i32);
+        } else {
+            asm_thumb_mov_reg_i32(as, reg_dest, i32);
+        }
+        #else
+        uint rlo_dest = reg_dest;
+        assert(rlo_dest < ASM_THUMB_REG_R8); // should never be called for ARMV6M
+
+        bool negate = i32 < 0 && ((i32 + i32) & 0xffffffffu); // don't negate 0x80000000
+        if (negate) {
+            i32 = -i32;
+        }
+
+        uint clz = __builtin_clz(i32);
+        uint ctz = i32 ? __builtin_ctz(i32) : 0;
+        assert(clz + ctz <= 32);
+        if (clz + ctz >= 24) {
+            asm_thumb_mov_rlo_i8(as, rlo_dest, (i32 >> ctz) & 0xff);
+            asm_thumb_lsl_rlo_rlo_i5(as, rlo_dest, rlo_dest, ctz);
+        } else if (UNSIGNED_FIT16(i32)) {
+            asm_thumb_mov_rlo_i16(as, rlo_dest, i32);
+        } else {
+            if (negate) {
+                // no point in negating if we're storing in 32 bit anyway
+                negate = false;
+                i32 = -i32;
+            }
+            asm_thumb_mov_reg_i32(as, rlo_dest, i32);
+        }
+        if (negate) {
+            asm_thumb_neg_rlo_rlo(as, rlo_dest, rlo_dest);
+        }
+        #endif
     }
 }
 
 #define OP_STR_TO_SP_OFFSET(rlo_dest, word_offset) (0x9000 | ((rlo_dest) << 8) | ((word_offset) & 0x00ff))
 #define OP_LDR_FROM_SP_OFFSET(rlo_dest, word_offset) (0x9800 | ((rlo_dest) << 8) | ((word_offset) & 0x00ff))
 
+static void asm_thumb_mov_local_check(asm_thumb_t *as, int word_offset) {
+    if (as->base.pass >= MP_ASM_PASS_EMIT) {
+        assert(word_offset >= 0);
+        if (!UNSIGNED_FIT8(word_offset)) {
+            mp_raise_NotImplementedError(MP_ERROR_TEXT("too many locals for native method"));
+        }
+    }
+}
+
 void asm_thumb_mov_local_reg(asm_thumb_t *as, int local_num, uint rlo_src) {
     assert(rlo_src < ASM_THUMB_REG_R8);
     int word_offset = local_num;
-    assert(as->base.pass < MP_ASM_PASS_EMIT || word_offset >= 0);
+    asm_thumb_mov_local_check(as, word_offset);
     asm_thumb_op16(as, OP_STR_TO_SP_OFFSET(rlo_src, word_offset));
 }
 
 void asm_thumb_mov_reg_local(asm_thumb_t *as, uint rlo_dest, int local_num) {
     assert(rlo_dest < ASM_THUMB_REG_R8);
     int word_offset = local_num;
-    assert(as->base.pass < MP_ASM_PASS_EMIT || word_offset >= 0);
+    asm_thumb_mov_local_check(as, word_offset);
     asm_thumb_op16(as, OP_LDR_FROM_SP_OFFSET(rlo_dest, word_offset));
 }
 
@@ -341,21 +443,63 @@ void asm_thumb_mov_reg_local_addr(asm_thumb_t *as, uint rlo_dest, int local_num)
 void asm_thumb_mov_reg_pcrel(asm_thumb_t *as, uint rlo_dest, uint label) {
     mp_uint_t dest = get_label_dest(as, label);
     mp_int_t rel = dest - as->base.code_offset;
-    rel -= 4 + 4; // adjust for mov_reg_i16 and then PC+4 prefetch of add_reg_reg
     rel |= 1; // to stay in Thumb state when jumping to this address
+    #if MICROPY_EMIT_THUMB_ARMV7M
+    rel -= 4 + 4; // adjust for mov_reg_i16 and then PC+4 prefetch of add_reg_reg
     asm_thumb_mov_reg_i16(as, ASM_THUMB_OP_MOVW, rlo_dest, rel); // 4 bytes
+    #else
+    rel -= 8 + 4; // adjust for four instructions and then PC+4 prefetch of add_reg_reg
+    // 6 bytes
+    asm_thumb_mov_rlo_i16(as, rlo_dest, rel);
+    // 2 bytes - not always needed, but we want to keep the size the same
+    asm_thumb_sxth_rlo_rlo(as, rlo_dest, rlo_dest);
+    #endif
     asm_thumb_add_reg_reg(as, rlo_dest, ASM_THUMB_REG_R15); // 2 bytes
 }
 
+#if MICROPY_EMIT_THUMB_ARMV7M
 static inline void asm_thumb_ldr_reg_reg_i12(asm_thumb_t *as, uint reg_dest, uint reg_base, uint word_offset) {
     asm_thumb_op32(as, OP_LDR_W_HI(reg_base), OP_LDR_W_LO(reg_dest, word_offset * 4));
 }
+#endif
 
 void asm_thumb_ldr_reg_reg_i12_optimised(asm_thumb_t *as, uint reg_dest, uint reg_base, uint word_offset) {
     if (reg_dest < ASM_THUMB_REG_R8 && reg_base < ASM_THUMB_REG_R8 && UNSIGNED_FIT5(word_offset)) {
         asm_thumb_ldr_rlo_rlo_i5(as, reg_dest, reg_base, word_offset);
     } else {
+        #if MICROPY_EMIT_THUMB_ARMV7M
         asm_thumb_ldr_reg_reg_i12(as, reg_dest, reg_base, word_offset);
+        #else
+        word_offset -= 31;
+        if (reg_dest < ASM_THUMB_REG_R8 && reg_base < ASM_THUMB_REG_R8) {
+            if (UNSIGNED_FIT8(word_offset) && (word_offset < 64 || reg_dest != reg_base)) {
+                if (word_offset < 64) {
+                    if (reg_dest != reg_base) {
+                        asm_thumb_mov_reg_reg(as, reg_dest, reg_base);
+                    }
+                    asm_thumb_add_rlo_i8(as, reg_dest, word_offset * 4);
+                } else {
+                    asm_thumb_mov_rlo_i8(as, reg_dest, word_offset);
+                    asm_thumb_lsl_rlo_rlo_i5(as, reg_dest, reg_dest, 2);
+                    asm_thumb_add_rlo_rlo_rlo(as, reg_dest, reg_dest, reg_base);
+                }
+            } else {
+                if (reg_dest != reg_base) {
+                    asm_thumb_mov_rlo_i16(as, reg_dest, word_offset * 4);
+                    asm_thumb_add_rlo_rlo_rlo(as, reg_dest, reg_dest, reg_dest);
+                } else {
+                    uint reg_other = reg_dest ^ 7;
+                    asm_thumb_op16(as, OP_PUSH_RLIST((1 << reg_other)));
+                    asm_thumb_mov_rlo_i16(as, reg_other, word_offset * 4);
+                    asm_thumb_add_rlo_rlo_rlo(as, reg_dest, reg_dest, reg_other);
+                    asm_thumb_op16(as, OP_POP_RLIST((1 << reg_other)));
+                }
+            }
+        } else {
+            assert(0); // should never be called for ARMV6M
+        }
+        asm_thumb_ldr_rlo_rlo_i5(as, reg_dest, reg_dest, 31);
+        #endif
     }
 }
 
@@ -378,7 +522,20 @@ void asm_thumb_b_label(asm_thumb_t *as, uint label) {
     } else {
         // is a forwards jump, so need to assume it's large
     large_jump:
+        #if MICROPY_EMIT_THUMB_ARMV7M
         asm_thumb_op32(as, OP_BW_HI(rel), OP_BW_LO(rel));
+        #else
+        if (SIGNED_FIT12(rel)) {
+            // this code path has to be the same number of instructions irrespective of rel
+            asm_thumb_op16(as, OP_B_N(rel));
+        } else {
+            asm_thumb_op16(as, ASM_THUMB_OP_NOP);
+            if (dest != (mp_uint_t)-1) {
+                // we have an actual branch > 12 bits; this is not handled yet
+                mp_raise_NotImplementedError(MP_ERROR_TEXT("native method too big"));
+            }
+        }
+        #endif
     }
 }
 
@@ -397,7 +554,13 @@ void asm_thumb_bcc_label(asm_thumb_t *as, int cond, uint label) {
     } else {
         // is a forwards jump, so need to assume it's large
     large_jump:
+        #if MICROPY_EMIT_THUMB_ARMV7M
         asm_thumb_op32(as, OP_BCC_W_HI(cond, rel), OP_BCC_W_LO(rel));
+        #else
+        // reverse the sense of the branch to jump over a longer branch
+        asm_thumb_op16(as, OP_BCC_N(cond ^ 1, 0));
+        asm_thumb_b_label(as, label);
+        #endif
     }
 }
 
diff --git a/py/asmthumb.h b/py/asmthumb.h
index 17b694a74dfdd..3c45336186655 100644
--- a/py/asmthumb.h
+++ b/py/asmthumb.h
@@ -157,6 +157,7 @@ static inline void asm_thumb_sub_rlo_rlo_i3(asm_thumb_t *as, uint rlo_dest, uint
 #define ASM_THUMB_FORMAT_3_CMP (0x2800)
 #define ASM_THUMB_FORMAT_3_ADD (0x3000)
 #define ASM_THUMB_FORMAT_3_SUB (0x3800)
+#define ASM_THUMB_FORMAT_3_LDR (0x4800)
 
 #define ASM_THUMB_FORMAT_3_ENCODE(op, rlo, i8) ((op) | ((rlo) << 8) | (i8))
 
@@ -177,6 +178,9 @@ static inline void asm_thumb_add_rlo_i8(asm_thumb_t *as, uint rlo, int i8) {
 static inline void asm_thumb_sub_rlo_i8(asm_thumb_t *as, uint rlo, int i8) {
     asm_thumb_format_3(as, ASM_THUMB_FORMAT_3_SUB, rlo, i8);
 }
+static inline void asm_thumb_ldr_rlo_pcrel_i8(asm_thumb_t *as, uint rlo, uint i8) {
+    asm_thumb_format_3(as, ASM_THUMB_FORMAT_3_LDR, rlo, i8);
+}
 
 // FORMAT 4: ALU operations
 
@@ -202,6 +206,12 @@ void asm_thumb_format_4(asm_thumb_t *as, uint op, uint rlo_dest, uint rlo_src);
 static inline void asm_thumb_cmp_rlo_rlo(asm_thumb_t *as, uint rlo_dest, uint rlo_src) {
     asm_thumb_format_4(as, ASM_THUMB_FORMAT_4_CMP, rlo_dest, rlo_src);
 }
+static inline void asm_thumb_mvn_rlo_rlo(asm_thumb_t *as, uint rlo_dest, uint rlo_src) {
+    asm_thumb_format_4(as, ASM_THUMB_FORMAT_4_MVN, rlo_dest, rlo_src);
+}
+static inline void asm_thumb_neg_rlo_rlo(asm_thumb_t *as, uint rlo_dest, uint rlo_src) {
+    asm_thumb_format_4(as, ASM_THUMB_FORMAT_4_NEG, rlo_dest, rlo_src);
+}
 
 // FORMAT 5: hi register operations (add, cmp, mov, bx)
 // For add/cmp/mov, at least one of the args must be a high register
@@ -263,6 +273,32 @@ static inline void asm_thumb_ldrb_rlo_rlo_i5(asm_thumb_t *as, uint rlo_dest, uin
 static inline void asm_thumb_ldrh_rlo_rlo_i5(asm_thumb_t *as, uint rlo_dest, uint rlo_base, uint byte_offset) {
     asm_thumb_format_9_10(as, ASM_THUMB_FORMAT_10_LDRH, rlo_dest, rlo_base, byte_offset);
 }
+static inline void asm_thumb_lsl_rlo_rlo_i5(asm_thumb_t *as, uint rlo_dest, uint rlo_src, uint shift) {
+    asm_thumb_format_1(as, ASM_THUMB_FORMAT_1_LSL, rlo_dest, rlo_src, shift);
+}
+static inline void asm_thumb_asr_rlo_rlo_i5(asm_thumb_t *as, uint rlo_dest, uint rlo_src, uint shift) {
+    asm_thumb_format_1(as, ASM_THUMB_FORMAT_1_ASR, rlo_dest, rlo_src, shift);
+}
+
+// FORMAT 11: sign/zero extend
+
+#define ASM_THUMB_FORMAT_11_ENCODE(op, rlo_dest, rlo_src) \
+    ((op) | ((rlo_src) << 3) | (rlo_dest))
+
+#define ASM_THUMB_FORMAT_11_SXTH (0xb200)
+#define ASM_THUMB_FORMAT_11_SXTB (0xb240)
+#define ASM_THUMB_FORMAT_11_UXTH (0xb280)
+#define ASM_THUMB_FORMAT_11_UXTB (0xb2c0)
+
+static inline void asm_thumb_format_11(asm_thumb_t *as, uint op, uint rlo_dest, uint rlo_src) {
+    assert(rlo_dest < ASM_THUMB_REG_R8);
+    assert(rlo_src < ASM_THUMB_REG_R8);
+    asm_thumb_op16(as, ASM_THUMB_FORMAT_11_ENCODE(op, rlo_dest, rlo_src));
+}
+
+static inline void asm_thumb_sxth_rlo_rlo(asm_thumb_t *as, uint rlo_dest, uint rlo_src) {
+    asm_thumb_format_11(as, ASM_THUMB_FORMAT_11_SXTH, rlo_dest, rlo_src);
+}
 
 // TODO convert these to above format style
 
@@ -270,7 +306,12 @@ static inline void asm_thumb_ldrh_rlo_rlo_i5(asm_thumb_t *as, uint rlo_dest, uin
 #define ASM_THUMB_OP_MOVT (0xf2c0)
 
 void asm_thumb_mov_reg_reg(asm_thumb_t *as, uint reg_dest, uint reg_src);
+
+#if MICROPY_EMIT_THUMB_ARMV7M
 size_t asm_thumb_mov_reg_i16(asm_thumb_t *as, uint mov_op, uint reg_dest, int i16_src);
+#else
+void asm_thumb_mov_rlo_i16(asm_thumb_t *as, uint rlo_dest, int i16_src);
+#endif
 
 // these return true if the destination is in range, false otherwise
 bool asm_thumb_b_n_label(asm_thumb_t *as, uint label);
@@ -344,7 +385,11 @@ void asm_thumb_bl_ind(asm_thumb_t *as, uint fun_id, uint reg_temp); // convenien
 
 #define ASM_MOV_LOCAL_REG(as, local_num, reg) asm_thumb_mov_local_reg((as), (local_num), (reg))
 #define ASM_MOV_REG_IMM(as, reg_dest, imm) asm_thumb_mov_reg_i32_optimised((as), (reg_dest), (imm))
+#if MICROPY_EMIT_THUMB_ARMV7M
 #define ASM_MOV_REG_IMM_FIX_U16(as, reg_dest, imm) asm_thumb_mov_reg_i16((as), ASM_THUMB_OP_MOVW, (reg_dest), (imm))
+#else
+#define ASM_MOV_REG_IMM_FIX_U16(as, reg_dest, imm) asm_thumb_mov_rlo_i16((as), (reg_dest), (imm))
+#endif
 #define ASM_MOV_REG_IMM_FIX_WORD(as, reg_dest, imm) asm_thumb_mov_reg_i32((as), (reg_dest), (imm))
 #define ASM_MOV_REG_LOCAL(as, reg_dest, local_num) asm_thumb_mov_reg_local((as), (reg_dest), (local_num))
 #define ASM_MOV_REG_REG(as, reg_dest, reg_src) asm_thumb_mov_reg_reg((as), (reg_dest), (reg_src))
diff --git a/py/emitinlinethumb.c b/py/emitinlinethumb.c
index cffaa4bb89950..073b88da71f6e 100644
--- a/py/emitinlinethumb.c
+++ b/py/emitinlinethumb.c
@@ -573,7 +573,11 @@ STATIC void emit_inline_thumb_op(emit_inline_asm_t *emit, qstr op, mp_uint_t n_a
                 goto unknown_op;
             }
             int label_num = get_arg_label(emit, op_str, pn_args[0]);
-            if (!asm_thumb_bcc_nw_label(&emit->as, cc, label_num, op_len == 5 && op_str[4] == 'w')) {
+            bool wide = op_len == 5 && op_str[4] == 'w';
+            if (wide && !ARMV7M) {
+                goto unknown_op;
+            }
+            if (!asm_thumb_bcc_nw_label(&emit->as, cc, label_num, wide)) {
                 goto branch_not_in_range;
             }
         } else if (ARMV7M && op_str[0] == 'i' && op_str[1] == 't') {
diff --git a/py/mpconfig.h b/py/mpconfig.h
index 854188b66b585..1df2e8fe918ef 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -304,6 +304,11 @@
 #define MICROPY_EMIT_THUMB (0)
 #endif
 
+// Whether to emit ARMv7-M instruction support in thumb native code
+#ifndef MICROPY_EMIT_THUMB_ARMV7M
+#define MICROPY_EMIT_THUMB_ARMV7M (1)
+#endif
+
 // Whether to enable the thumb inline assembler
 #ifndef MICROPY_EMIT_INLINE_THUMB
 #define MICROPY_EMIT_INLINE_THUMB (0)

From c9f4c5acd6278a7a8f3376867d2927efd00aefa6 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 18 Jan 2021 00:08:59 +1100
Subject: [PATCH 0533/3533] py/emitnative: Ensure encoding to load
 prelude_offset doesn't change sz.

Based on change made by Graham Sanderson.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/emitnative.c | 30 +++++++++++++++++++++++++++---
 1 file changed, 27 insertions(+), 3 deletions(-)

diff --git a/py/emitnative.c b/py/emitnative.c
index 2a657b6964daa..8cb5de1b4af9f 100644
--- a/py/emitnative.c
+++ b/py/emitnative.c
@@ -211,6 +211,7 @@ struct _emit_t {
     int pass;
 
     bool do_viper_types;
+    bool prelude_offset_uses_u16_encoding;
 
     mp_uint_t local_vtype_alloc;
     vtype_kind_t *local_vtype;
@@ -339,6 +340,18 @@ STATIC void emit_native_mov_reg_qstr_obj(emit_t *emit, int reg_dest, qstr qst) {
         emit_native_mov_state_reg((emit), (local_num), (reg_temp)); \
     } while (false)
 
+#define emit_native_mov_state_imm_fix_u16_via(emit, local_num, imm, reg_temp) \
+    do { \
+        ASM_MOV_REG_IMM_FIX_U16((emit)->as, (reg_temp), (imm)); \
+        emit_native_mov_state_reg((emit), (local_num), (reg_temp)); \
+    } while (false)
+
+#define emit_native_mov_state_imm_fix_word_via(emit, local_num, imm, reg_temp) \
+    do { \
+        ASM_MOV_REG_IMM_FIX_WORD((emit)->as, (reg_temp), (imm)); \
+        emit_native_mov_state_reg((emit), (local_num), (reg_temp)); \
+    } while (false)
+
 STATIC void emit_native_start_pass(emit_t *emit, pass_kind_t pass, scope_t *scope) {
     DEBUG_printf("start_pass(pass=%u, scope=%p)\n", pass, scope);
 
@@ -549,16 +562,27 @@ STATIC void emit_native_start_pass(emit_t *emit, pass_kind_t pass, scope_t *scop
             ASM_MOV_LOCAL_REG(emit->as, LOCAL_IDX_FUN_OBJ(emit), REG_PARENT_ARG_1);
 
             // Set code_state.ip (offset from start of this function to prelude info)
+            int code_state_ip_local = emit->code_state_start + OFFSETOF_CODE_STATE_IP;
             #if N_PRELUDE_AS_BYTES_OBJ
             // Prelude is a bytes object in const_table; store ip = prelude->data - fun_bc->bytecode
             ASM_LOAD_REG_REG_OFFSET(emit->as, REG_LOCAL_3, REG_LOCAL_3, emit->scope->num_pos_args + emit->scope->num_kwonly_args + 1);
             ASM_LOAD_REG_REG_OFFSET(emit->as, REG_LOCAL_3, REG_LOCAL_3, offsetof(mp_obj_str_t, data) / sizeof(uintptr_t));
             ASM_LOAD_REG_REG_OFFSET(emit->as, REG_PARENT_ARG_1, REG_PARENT_ARG_1, OFFSETOF_OBJ_FUN_BC_BYTECODE);
             ASM_SUB_REG_REG(emit->as, REG_LOCAL_3, REG_PARENT_ARG_1);
-            emit_native_mov_state_reg(emit, emit->code_state_start + OFFSETOF_CODE_STATE_IP, REG_LOCAL_3);
+            emit_native_mov_state_reg(emit, code_state_ip_local, REG_LOCAL_3);
             #else
-            // TODO this encoding may change size in the final pass, need to make it fixed
-            emit_native_mov_state_imm_via(emit, emit->code_state_start + OFFSETOF_CODE_STATE_IP, emit->prelude_offset, REG_PARENT_ARG_1);
+            if (emit->pass == MP_PASS_CODE_SIZE) {
+                // Commit to the encoding size based on the value of prelude_offset in this pass.
+                // By using 32768 as the cut-off it is highly unlikely that prelude_offset will
+                // grow beyond 65535 by the end of thiss pass, and so require the larger encoding.
+                emit->prelude_offset_uses_u16_encoding = emit->prelude_offset < 32768;
+            }
+            if (emit->prelude_offset_uses_u16_encoding) {
+                assert(emit->prelude_offset <= 65535);
+                emit_native_mov_state_imm_fix_u16_via(emit, code_state_ip_local, emit->prelude_offset, REG_PARENT_ARG_1);
+            } else {
+                emit_native_mov_state_imm_fix_word_via(emit, code_state_ip_local, emit->prelude_offset, REG_PARENT_ARG_1);
+            }
             #endif
 
             // Set code_state.n_state (only works on little endian targets due to n_state being uint16_t)

From 7a97e4351b4d78f64c3d1fbecd497481e649a83f Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 18 Jan 2021 00:29:18 +1100
Subject: [PATCH 0534/3533] tests: Move native for test from pybnative to
 micropython.

And make it generic so it can be run on any target.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/{pybnative/for.py => micropython/native_for.py}         | 2 +-
 tests/{pybnative/for.py.exp => micropython/native_for.py.exp} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename tests/{pybnative/for.py => micropython/native_for.py} (85%)
 rename tests/{pybnative/for.py.exp => micropython/native_for.py.exp} (100%)

diff --git a/tests/pybnative/for.py b/tests/micropython/native_for.py
similarity index 85%
rename from tests/pybnative/for.py
rename to tests/micropython/native_for.py
index 50177a9ba4854..c640a8d08b576 100644
--- a/tests/pybnative/for.py
+++ b/tests/micropython/native_for.py
@@ -1,4 +1,4 @@
-import pyb
+# test for native for loops
 
 
 @micropython.native
diff --git a/tests/pybnative/for.py.exp b/tests/micropython/native_for.py.exp
similarity index 100%
rename from tests/pybnative/for.py.exp
rename to tests/micropython/native_for.py.exp

From 75fea330bffe9c916def8bf1521d7d9143eceac2 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 18 Jan 2021 00:59:47 +1100
Subject: [PATCH 0535/3533] py/emitinlinethumb: Exclude code using #if when
 ARMV7M disabled.

So there are no references to undeclared asm_thumb_mov_reg_i16().

Signed-off-by: Damien George <damien@micropython.org>
---
 py/emitinlinethumb.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/py/emitinlinethumb.c b/py/emitinlinethumb.c
index 073b88da71f6e..1a35e25ad35b4 100644
--- a/py/emitinlinethumb.c
+++ b/py/emitinlinethumb.c
@@ -705,23 +705,24 @@ STATIC void emit_inline_thumb_op(emit_inline_asm_t *emit, qstr op, mp_uint_t n_a
             } else if (op == MP_QSTR_sub) {
                 op_code = ASM_THUMB_FORMAT_3_SUB;
                 goto op_format_3;
-            } else if (ARMV7M && op == MP_QSTR_movw) {
+            #if ARMV7M
+            } else if (op == MP_QSTR_movw) {
                 op_code = ASM_THUMB_OP_MOVW;
                 mp_uint_t reg_dest;
             op_movw_movt:
                 reg_dest = get_arg_reg(emit, op_str, pn_args[0], 15);
                 int i_src = get_arg_i(emit, op_str, pn_args[1], 0xffff);
                 asm_thumb_mov_reg_i16(&emit->as, op_code, reg_dest, i_src);
-            } else if (ARMV7M && op == MP_QSTR_movt) {
+            } else if (op == MP_QSTR_movt) {
                 op_code = ASM_THUMB_OP_MOVT;
                 goto op_movw_movt;
-            } else if (ARMV7M && op == MP_QSTR_movwt) {
+            } else if (op == MP_QSTR_movwt) {
                 // this is a convenience instruction
                 mp_uint_t reg_dest = get_arg_reg(emit, op_str, pn_args[0], 15);
                 uint32_t i_src = get_arg_i(emit, op_str, pn_args[1], 0xffffffff);
                 asm_thumb_mov_reg_i16(&emit->as, ASM_THUMB_OP_MOVW, reg_dest, i_src & 0xffff);
                 asm_thumb_mov_reg_i16(&emit->as, ASM_THUMB_OP_MOVT, reg_dest, (i_src >> 16) & 0xffff);
-            } else if (ARMV7M && op == MP_QSTR_ldrex) {
+            } else if (op == MP_QSTR_ldrex) {
                 mp_uint_t r_dest = get_arg_reg(emit, op_str, pn_args[0], 15);
                 mp_parse_node_t pn_base, pn_offset;
                 if (get_arg_addr(emit, op_str, pn_args[1], &pn_base, &pn_offset)) {
@@ -729,6 +730,7 @@ STATIC void emit_inline_thumb_op(emit_inline_asm_t *emit, qstr op, mp_uint_t n_a
                     mp_uint_t i8 = get_arg_i(emit, op_str, pn_offset, 0xff) >> 2;
                     asm_thumb_op32(&emit->as, 0xe850 | r_base, 0x0f00 | (r_dest << 12) | i8);
                 }
+            #endif
             } else {
                 // search table for ldr/str instructions
                 for (mp_uint_t i = 0; i < MP_ARRAY_SIZE(format_9_10_op_table); i++) {

From 33f10381d6cf47a6c6e1ce44ce3debb44ebbaa9d Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 18 Jan 2021 02:54:18 +1100
Subject: [PATCH 0536/3533] lib/timeutils: Provide simple impl of extra funcs
 when Epoch is 1970.

Dates/times must be post 2000/1/1 to work correctly with these simple
implementations.

Signed-off-by: Damien George <damien@micropython.org>
---
 lib/timeutils/timeutils.c |  2 +-
 lib/timeutils/timeutils.h | 12 +++++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/lib/timeutils/timeutils.c b/lib/timeutils/timeutils.c
index fc8b5e7fc824f..af210d9943bee 100644
--- a/lib/timeutils/timeutils.c
+++ b/lib/timeutils/timeutils.c
@@ -158,7 +158,7 @@ mp_uint_t timeutils_seconds_since_2000(mp_uint_t year, mp_uint_t month,
         + (year - 2000) * 31536000;
 }
 
-mp_uint_t timeutils_mktime(mp_uint_t year, mp_int_t month, mp_int_t mday,
+mp_uint_t timeutils_mktime_2000(mp_uint_t year, mp_int_t month, mp_int_t mday,
     mp_int_t hours, mp_int_t minutes, mp_int_t seconds) {
 
     // Normalize the tuple. This allows things like:
diff --git a/lib/timeutils/timeutils.h b/lib/timeutils/timeutils.h
index 14da831dc8b58..2d40f773cc53e 100644
--- a/lib/timeutils/timeutils.h
+++ b/lib/timeutils/timeutils.h
@@ -52,12 +52,21 @@ void timeutils_seconds_since_2000_to_struct_time(mp_uint_t t,
 mp_uint_t timeutils_seconds_since_2000(mp_uint_t year, mp_uint_t month,
     mp_uint_t date, mp_uint_t hour, mp_uint_t minute, mp_uint_t second);
 
-mp_uint_t timeutils_mktime(mp_uint_t year, mp_int_t month, mp_int_t mday,
+mp_uint_t timeutils_mktime_2000(mp_uint_t year, mp_int_t month, mp_int_t mday,
     mp_int_t hours, mp_int_t minutes, mp_int_t seconds);
 
 // Select the Epoch used by the port.
 #if MICROPY_EPOCH_IS_1970
 
+static inline void timeutils_seconds_since_epoch_to_struct_time(uint64_t t, timeutils_struct_time_t *tm) {
+    // TODO this will give incorrect results for dates before 2000/1/1
+    return timeutils_seconds_since_2000_to_struct_time(t - TIMEUTILS_SECONDS_1970_TO_2000, tm);
+}
+
+static inline uint64_t timeutils_mktime(mp_uint_t year, mp_int_t month, mp_int_t mday, mp_int_t hours, mp_int_t minutes, mp_int_t seconds) {
+    return timeutils_mktime_2000(year, month, mday, hours, minutes, seconds) + TIMEUTILS_SECONDS_1970_TO_2000;
+}
+
 static inline uint64_t timeutils_seconds_since_epoch(mp_uint_t year, mp_uint_t month,
     mp_uint_t date, mp_uint_t hour, mp_uint_t minute, mp_uint_t second) {
     return timeutils_seconds_since_2000(year, month, date, hour, minute, second) + TIMEUTILS_SECONDS_1970_TO_2000;
@@ -75,6 +84,7 @@ static inline uint64_t timeutils_nanoseconds_since_epoch_to_nanoseconds_since_19
 
 #define timeutils_seconds_since_epoch_to_struct_time timeutils_seconds_since_2000_to_struct_time
 #define timeutils_seconds_since_epoch timeutils_seconds_since_2000
+#define timeutils_mktime timeutils_mktime_2000
 
 static inline uint64_t timeutils_seconds_since_epoch_to_nanoseconds_since_1970(mp_uint_t s) {
     return ((uint64_t)s + TIMEUTILS_SECONDS_1970_TO_2000) * 1000000000ULL;

From 15ac5a3df9b90eade2b4743e08e23ce219cb4f7f Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 18 Jan 2021 11:38:27 +1100
Subject: [PATCH 0537/3533] extmod/modframebuf: Change int to unsigned int in
 format methods args.

These args are already bounds checked and clipped, and using unsigned ints
can be more efficient.  It also eliminates possible issues and compiler
warnings with shifting of signed integers.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/modframebuf.c | 70 ++++++++++++++++++++++----------------------
 1 file changed, 35 insertions(+), 35 deletions(-)

diff --git a/extmod/modframebuf.c b/extmod/modframebuf.c
index 2753acc2712b6..18b170078de14 100644
--- a/extmod/modframebuf.c
+++ b/extmod/modframebuf.c
@@ -45,9 +45,9 @@ typedef struct _mp_obj_framebuf_t {
 STATIC const mp_obj_type_t mp_type_framebuf;
 #endif
 
-typedef void (*setpixel_t)(const mp_obj_framebuf_t *, int, int, uint32_t);
-typedef uint32_t (*getpixel_t)(const mp_obj_framebuf_t *, int, int);
-typedef void (*fill_rect_t)(const mp_obj_framebuf_t *, int, int, int, int, uint32_t);
+typedef void (*setpixel_t)(const mp_obj_framebuf_t *, unsigned int, unsigned int, uint32_t);
+typedef uint32_t (*getpixel_t)(const mp_obj_framebuf_t *, unsigned int, unsigned int);
+typedef void (*fill_rect_t)(const mp_obj_framebuf_t *, unsigned int, unsigned int, unsigned int, unsigned int, uint32_t);
 
 typedef struct _mp_framebuf_p_t {
     setpixel_t setpixel;
@@ -66,25 +66,25 @@ typedef struct _mp_framebuf_p_t {
 
 // Functions for MHLSB and MHMSB
 
-STATIC void mono_horiz_setpixel(const mp_obj_framebuf_t *fb, int x, int y, uint32_t col) {
+STATIC void mono_horiz_setpixel(const mp_obj_framebuf_t *fb, unsigned int x, unsigned int y, uint32_t col) {
     size_t index = (x + y * fb->stride) >> 3;
-    int offset = fb->format == FRAMEBUF_MHMSB ? x & 0x07 : 7 - (x & 0x07);
+    unsigned int offset = fb->format == FRAMEBUF_MHMSB ? x & 0x07 : 7 - (x & 0x07);
     ((uint8_t *)fb->buf)[index] = (((uint8_t *)fb->buf)[index] & ~(0x01 << offset)) | ((col != 0) << offset);
 }
 
-STATIC uint32_t mono_horiz_getpixel(const mp_obj_framebuf_t *fb, int x, int y) {
+STATIC uint32_t mono_horiz_getpixel(const mp_obj_framebuf_t *fb, unsigned int x, unsigned int y) {
     size_t index = (x + y * fb->stride) >> 3;
-    int offset = fb->format == FRAMEBUF_MHMSB ? x & 0x07 : 7 - (x & 0x07);
+    unsigned int offset = fb->format == FRAMEBUF_MHMSB ? x & 0x07 : 7 - (x & 0x07);
     return (((uint8_t *)fb->buf)[index] >> (offset)) & 0x01;
 }
 
-STATIC void mono_horiz_fill_rect(const mp_obj_framebuf_t *fb, int x, int y, int w, int h, uint32_t col) {
-    int reverse = fb->format == FRAMEBUF_MHMSB;
-    int advance = fb->stride >> 3;
+STATIC void mono_horiz_fill_rect(const mp_obj_framebuf_t *fb, unsigned int x, unsigned int y, unsigned int w, unsigned int h, uint32_t col) {
+    unsigned int reverse = fb->format == FRAMEBUF_MHMSB;
+    unsigned int advance = fb->stride >> 3;
     while (w--) {
         uint8_t *b = &((uint8_t *)fb->buf)[(x >> 3) + y * advance];
-        int offset = reverse ?  x & 7 : 7 - (x & 7);
-        for (int hh = h; hh; --hh) {
+        unsigned int offset = reverse ?  x & 7 : 7 - (x & 7);
+        for (unsigned int hh = h; hh; --hh) {
             *b = (*b & ~(0x01 << offset)) | ((col != 0) << offset);
             b += advance;
         }
@@ -94,21 +94,21 @@ STATIC void mono_horiz_fill_rect(const mp_obj_framebuf_t *fb, int x, int y, int
 
 // Functions for MVLSB format
 
-STATIC void mvlsb_setpixel(const mp_obj_framebuf_t *fb, int x, int y, uint32_t col) {
+STATIC void mvlsb_setpixel(const mp_obj_framebuf_t *fb, unsigned int x, unsigned int y, uint32_t col) {
     size_t index = (y >> 3) * fb->stride + x;
     uint8_t offset = y & 0x07;
     ((uint8_t *)fb->buf)[index] = (((uint8_t *)fb->buf)[index] & ~(0x01 << offset)) | ((col != 0) << offset);
 }
 
-STATIC uint32_t mvlsb_getpixel(const mp_obj_framebuf_t *fb, int x, int y) {
+STATIC uint32_t mvlsb_getpixel(const mp_obj_framebuf_t *fb, unsigned int x, unsigned int y) {
     return (((uint8_t *)fb->buf)[(y >> 3) * fb->stride + x] >> (y & 0x07)) & 0x01;
 }
 
-STATIC void mvlsb_fill_rect(const mp_obj_framebuf_t *fb, int x, int y, int w, int h, uint32_t col) {
+STATIC void mvlsb_fill_rect(const mp_obj_framebuf_t *fb, unsigned int x, unsigned int y, unsigned int w, unsigned int h, uint32_t col) {
     while (h--) {
         uint8_t *b = &((uint8_t *)fb->buf)[(y >> 3) * fb->stride + x];
         uint8_t offset = y & 0x07;
-        for (int ww = w; ww; --ww) {
+        for (unsigned int ww = w; ww; --ww) {
             *b = (*b & ~(0x01 << offset)) | ((col != 0) << offset);
             ++b;
         }
@@ -118,18 +118,18 @@ STATIC void mvlsb_fill_rect(const mp_obj_framebuf_t *fb, int x, int y, int w, in
 
 // Functions for RGB565 format
 
-STATIC void rgb565_setpixel(const mp_obj_framebuf_t *fb, int x, int y, uint32_t col) {
+STATIC void rgb565_setpixel(const mp_obj_framebuf_t *fb, unsigned int x, unsigned int y, uint32_t col) {
     ((uint16_t *)fb->buf)[x + y * fb->stride] = col;
 }
 
-STATIC uint32_t rgb565_getpixel(const mp_obj_framebuf_t *fb, int x, int y) {
+STATIC uint32_t rgb565_getpixel(const mp_obj_framebuf_t *fb, unsigned int x, unsigned int y) {
     return ((uint16_t *)fb->buf)[x + y * fb->stride];
 }
 
-STATIC void rgb565_fill_rect(const mp_obj_framebuf_t *fb, int x, int y, int w, int h, uint32_t col) {
+STATIC void rgb565_fill_rect(const mp_obj_framebuf_t *fb, unsigned int x, unsigned int y, unsigned int w, unsigned int h, uint32_t col) {
     uint16_t *b = &((uint16_t *)fb->buf)[x + y * fb->stride];
     while (h--) {
-        for (int ww = w; ww; --ww) {
+        for (unsigned int ww = w; ww; --ww) {
             *b++ = col;
         }
         b += fb->stride - w;
@@ -138,7 +138,7 @@ STATIC void rgb565_fill_rect(const mp_obj_framebuf_t *fb, int x, int y, int w, i
 
 // Functions for GS2_HMSB format
 
-STATIC void gs2_hmsb_setpixel(const mp_obj_framebuf_t *fb, int x, int y, uint32_t col) {
+STATIC void gs2_hmsb_setpixel(const mp_obj_framebuf_t *fb, unsigned int x, unsigned int y, uint32_t col) {
     uint8_t *pixel = &((uint8_t *)fb->buf)[(x + y * fb->stride) >> 2];
     uint8_t shift = (x & 0x3) << 1;
     uint8_t mask = 0x3 << shift;
@@ -146,15 +146,15 @@ STATIC void gs2_hmsb_setpixel(const mp_obj_framebuf_t *fb, int x, int y, uint32_
     *pixel = color | (*pixel & (~mask));
 }
 
-STATIC uint32_t gs2_hmsb_getpixel(const mp_obj_framebuf_t *fb, int x, int y) {
+STATIC uint32_t gs2_hmsb_getpixel(const mp_obj_framebuf_t *fb, unsigned int x, unsigned int y) {
     uint8_t pixel = ((uint8_t *)fb->buf)[(x + y * fb->stride) >> 2];
     uint8_t shift = (x & 0x3) << 1;
     return (pixel >> shift) & 0x3;
 }
 
-STATIC void gs2_hmsb_fill_rect(const mp_obj_framebuf_t *fb, int x, int y, int w, int h, uint32_t col) {
-    for (int xx = x; xx < x + w; xx++) {
-        for (int yy = y; yy < y + h; yy++) {
+STATIC void gs2_hmsb_fill_rect(const mp_obj_framebuf_t *fb, unsigned int x, unsigned int y, unsigned int w, unsigned int h, uint32_t col) {
+    for (unsigned int xx = x; xx < x + w; xx++) {
+        for (unsigned int yy = y; yy < y + h; yy++) {
             gs2_hmsb_setpixel(fb, xx, yy, col);
         }
     }
@@ -162,7 +162,7 @@ STATIC void gs2_hmsb_fill_rect(const mp_obj_framebuf_t *fb, int x, int y, int w,
 
 // Functions for GS4_HMSB format
 
-STATIC void gs4_hmsb_setpixel(const mp_obj_framebuf_t *fb, int x, int y, uint32_t col) {
+STATIC void gs4_hmsb_setpixel(const mp_obj_framebuf_t *fb, unsigned int x, unsigned int y, uint32_t col) {
     uint8_t *pixel = &((uint8_t *)fb->buf)[(x + y * fb->stride) >> 1];
 
     if (x % 2) {
@@ -172,7 +172,7 @@ STATIC void gs4_hmsb_setpixel(const mp_obj_framebuf_t *fb, int x, int y, uint32_
     }
 }
 
-STATIC uint32_t gs4_hmsb_getpixel(const mp_obj_framebuf_t *fb, int x, int y) {
+STATIC uint32_t gs4_hmsb_getpixel(const mp_obj_framebuf_t *fb, unsigned int x, unsigned int y) {
     if (x % 2) {
         return ((uint8_t *)fb->buf)[(x + y * fb->stride) >> 1] & 0x0f;
     }
@@ -180,16 +180,16 @@ STATIC uint32_t gs4_hmsb_getpixel(const mp_obj_framebuf_t *fb, int x, int y) {
     return ((uint8_t *)fb->buf)[(x + y * fb->stride) >> 1] >> 4;
 }
 
-STATIC void gs4_hmsb_fill_rect(const mp_obj_framebuf_t *fb, int x, int y, int w, int h, uint32_t col) {
+STATIC void gs4_hmsb_fill_rect(const mp_obj_framebuf_t *fb, unsigned int x, unsigned int y, unsigned int w, unsigned int h, uint32_t col) {
     col &= 0x0f;
     uint8_t *pixel_pair = &((uint8_t *)fb->buf)[(x + y * fb->stride) >> 1];
     uint8_t col_shifted_left = col << 4;
     uint8_t col_pixel_pair = col_shifted_left | col;
-    int pixel_count_till_next_line = (fb->stride - w) >> 1;
+    unsigned int pixel_count_till_next_line = (fb->stride - w) >> 1;
     bool odd_x = (x % 2 == 1);
 
     while (h--) {
-        int ww = w;
+        unsigned int ww = w;
 
         if (odd_x && ww > 0) {
             *pixel_pair = (*pixel_pair & 0xf0) | col;
@@ -213,16 +213,16 @@ STATIC void gs4_hmsb_fill_rect(const mp_obj_framebuf_t *fb, int x, int y, int w,
 
 // Functions for GS8 format
 
-STATIC void gs8_setpixel(const mp_obj_framebuf_t *fb, int x, int y, uint32_t col) {
+STATIC void gs8_setpixel(const mp_obj_framebuf_t *fb, unsigned int x, unsigned int y, uint32_t col) {
     uint8_t *pixel = &((uint8_t *)fb->buf)[(x + y * fb->stride)];
     *pixel = col & 0xff;
 }
 
-STATIC uint32_t gs8_getpixel(const mp_obj_framebuf_t *fb, int x, int y) {
+STATIC uint32_t gs8_getpixel(const mp_obj_framebuf_t *fb, unsigned int x, unsigned int y) {
     return ((uint8_t *)fb->buf)[(x + y * fb->stride)];
 }
 
-STATIC void gs8_fill_rect(const mp_obj_framebuf_t *fb, int x, int y, int w, int h, uint32_t col) {
+STATIC void gs8_fill_rect(const mp_obj_framebuf_t *fb, unsigned int x, unsigned int y, unsigned int w, unsigned int h, uint32_t col) {
     uint8_t *pixel = &((uint8_t *)fb->buf)[(x + y * fb->stride)];
     while (h--) {
         memset(pixel, col, w);
@@ -240,11 +240,11 @@ STATIC mp_framebuf_p_t formats[] = {
     [FRAMEBUF_MHMSB] = {mono_horiz_setpixel, mono_horiz_getpixel, mono_horiz_fill_rect},
 };
 
-static inline void setpixel(const mp_obj_framebuf_t *fb, int x, int y, uint32_t col) {
+static inline void setpixel(const mp_obj_framebuf_t *fb, unsigned int x, unsigned int y, uint32_t col) {
     formats[fb->format].setpixel(fb, x, y, col);
 }
 
-static inline uint32_t getpixel(const mp_obj_framebuf_t *fb, int x, int y) {
+static inline uint32_t getpixel(const mp_obj_framebuf_t *fb, unsigned int x, unsigned int y) {
     return formats[fb->format].getpixel(fb, x, y);
 }
 

From 794df0f1d502bf715449ed6d36f16cf52b095d0b Mon Sep 17 00:00:00 2001
From: graham sanderson <graham.sanderson@raspberrypi.org>
Date: Sun, 17 Jan 2021 21:56:34 -0600
Subject: [PATCH 0538/3533] py/emitnative: Support binary ops on ARMv6M without
 use of ite instr.

---
 py/asmthumb.c   | 12 ++++++++++++
 py/asmthumb.h   |  2 ++
 py/emitnative.c | 23 +++++++++++++++++++++++
 3 files changed, 37 insertions(+)

diff --git a/py/asmthumb.c b/py/asmthumb.c
index e3558b2cf2568..f7ac87fa0f934 100644
--- a/py/asmthumb.c
+++ b/py/asmthumb.c
@@ -564,6 +564,18 @@ void asm_thumb_bcc_label(asm_thumb_t *as, int cond, uint label) {
     }
 }
 
+void asm_thumb_bcc_rel9(asm_thumb_t *as, int cond, int rel) {
+    rel -= 4; // account for instruction prefetch, PC is 4 bytes ahead of this instruction
+    assert(SIGNED_FIT9(rel));
+    asm_thumb_op16(as, OP_BCC_N(cond, rel));
+}
+
+void asm_thumb_b_rel12(asm_thumb_t *as, int rel) {
+    rel -= 4; // account for instruction prefetch, PC is 4 bytes ahead of this instruction
+    assert(SIGNED_FIT12(rel));
+    asm_thumb_op16(as, OP_B_N(rel));
+}
+
 #define OP_BLX(reg) (0x4780 | ((reg) << 3))
 #define OP_SVC(arg) (0xdf00 | (arg))
 
diff --git a/py/asmthumb.h b/py/asmthumb.h
index 3c45336186655..17a0cca98c583 100644
--- a/py/asmthumb.h
+++ b/py/asmthumb.h
@@ -330,6 +330,8 @@ void asm_thumb_ldr_reg_reg_i12_optimised(asm_thumb_t *as, uint reg_dest, uint re
 void asm_thumb_b_label(asm_thumb_t *as, uint label); // convenience: picks narrow or wide branch
 void asm_thumb_bcc_label(asm_thumb_t *as, int cc, uint label); // convenience: picks narrow or wide branch
 void asm_thumb_bl_ind(asm_thumb_t *as, uint fun_id, uint reg_temp); // convenience
+void asm_thumb_bcc_rel9(asm_thumb_t *as, int cc, int rel);
+void asm_thumb_b_rel12(asm_thumb_t *as, int rel);
 
 // Holds a pointer to mp_fun_table
 #define ASM_THUMB_REG_FUN_TABLE ASM_THUMB_REG_R7
diff --git a/py/emitnative.c b/py/emitnative.c
index 8cb5de1b4af9f..052a505911d2a 100644
--- a/py/emitnative.c
+++ b/py/emitnative.c
@@ -2454,6 +2454,7 @@ STATIC void emit_native_binary_op(emit_t *emit, mp_binary_op_t op) {
             asm_x86_setcc_r8(emit->as, ops[op_idx], REG_RET);
             #elif N_THUMB
             asm_thumb_cmp_rlo_rlo(emit->as, REG_ARG_2, reg_rhs);
+            #if MICROPY_EMIT_THUMB_ARMV7M
             static uint16_t ops[6 + 6] = {
                 // unsigned
                 ASM_THUMB_OP_ITE_CC,
@@ -2473,6 +2474,28 @@ STATIC void emit_native_binary_op(emit_t *emit, mp_binary_op_t op) {
             asm_thumb_op16(emit->as, ops[op_idx]);
             asm_thumb_mov_rlo_i8(emit->as, REG_RET, 1);
             asm_thumb_mov_rlo_i8(emit->as, REG_RET, 0);
+            #else
+            static uint16_t ops[6 + 6] = {
+                // unsigned
+                ASM_THUMB_CC_CC,
+                ASM_THUMB_CC_HI,
+                ASM_THUMB_CC_EQ,
+                ASM_THUMB_CC_LS,
+                ASM_THUMB_CC_CS,
+                ASM_THUMB_CC_NE,
+                // signed
+                ASM_THUMB_CC_LT,
+                ASM_THUMB_CC_GT,
+                ASM_THUMB_CC_EQ,
+                ASM_THUMB_CC_LE,
+                ASM_THUMB_CC_GE,
+                ASM_THUMB_CC_NE,
+            };
+            asm_thumb_bcc_rel9(emit->as, ops[op_idx], 6);
+            asm_thumb_mov_rlo_i8(emit->as, REG_RET, 0);
+            asm_thumb_b_rel12(emit->as, 4);
+            asm_thumb_mov_rlo_i8(emit->as, REG_RET, 1);
+            #endif
             #elif N_ARM
             asm_arm_cmp_reg_reg(emit->as, REG_ARG_2, reg_rhs);
             static uint ccs[6 + 6] = {

From ec0503bd0ce3f851f15d79c69b660a6cf411ea78 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 21 Jan 2021 01:19:46 +1100
Subject: [PATCH 0539/3533] extmod/modonewire: Use pin_od_high/pin_od_low
 instead of pin_write.

The pin is configured in open-drain mode so these od_high/od_low methods
should be used.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/modonewire.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/extmod/modonewire.c b/extmod/modonewire.c
index 210bee366ee9d..6abe3dfad9bff 100644
--- a/extmod/modonewire.c
+++ b/extmod/modonewire.c
@@ -44,10 +44,10 @@
 #define TIMING_WRITE3 (10)
 
 STATIC int onewire_bus_reset(mp_hal_pin_obj_t pin) {
-    mp_hal_pin_write(pin, 0);
+    mp_hal_pin_od_low(pin);
     mp_hal_delay_us(TIMING_RESET1);
     uint32_t i = mp_hal_quiet_timing_enter();
-    mp_hal_pin_write(pin, 1);
+    mp_hal_pin_od_high(pin);
     mp_hal_delay_us_fast(TIMING_RESET2);
     int status = !mp_hal_pin_read(pin);
     mp_hal_quiet_timing_exit(i);
@@ -56,11 +56,11 @@ STATIC int onewire_bus_reset(mp_hal_pin_obj_t pin) {
 }
 
 STATIC int onewire_bus_readbit(mp_hal_pin_obj_t pin) {
-    mp_hal_pin_write(pin, 1);
+    mp_hal_pin_od_high(pin);
     uint32_t i = mp_hal_quiet_timing_enter();
-    mp_hal_pin_write(pin, 0);
+    mp_hal_pin_od_low(pin);
     mp_hal_delay_us_fast(TIMING_READ1);
-    mp_hal_pin_write(pin, 1);
+    mp_hal_pin_od_high(pin);
     mp_hal_delay_us_fast(TIMING_READ2);
     int value = mp_hal_pin_read(pin);
     mp_hal_quiet_timing_exit(i);
@@ -70,13 +70,13 @@ STATIC int onewire_bus_readbit(mp_hal_pin_obj_t pin) {
 
 STATIC void onewire_bus_writebit(mp_hal_pin_obj_t pin, int value) {
     uint32_t i = mp_hal_quiet_timing_enter();
-    mp_hal_pin_write(pin, 0);
+    mp_hal_pin_od_low(pin);
     mp_hal_delay_us_fast(TIMING_WRITE1);
     if (value) {
-        mp_hal_pin_write(pin, 1);
+        mp_hal_pin_od_high(pin);
     }
     mp_hal_delay_us_fast(TIMING_WRITE2);
-    mp_hal_pin_write(pin, 1);
+    mp_hal_pin_od_high(pin);
     mp_hal_delay_us_fast(TIMING_WRITE3);
     mp_hal_quiet_timing_exit(i);
 }

From ef3ee7aa1005cd1f15c2144d4b46feb792ab3185 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 21 Jan 2021 18:04:39 +1100
Subject: [PATCH 0540/3533] lib/pico-sdk: Add new pico-sdk submodule, for the
 rp2 port.

Signed-off-by: Damien George <damien@micropython.org>
---
 .gitmodules  | 3 +++
 lib/pico-sdk | 1 +
 2 files changed, 4 insertions(+)
 create mode 160000 lib/pico-sdk

diff --git a/.gitmodules b/.gitmodules
index f4785955af41b..ceaa5342b412c 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -39,3 +39,6 @@
 [submodule "lib/libhydrogen"]
 	path = lib/libhydrogen
 	url = https://github.com/jedisct1/libhydrogen.git
+[submodule "lib/pico-sdk"]
+	path = lib/pico-sdk
+	url = https://github.com/raspberrypi/pico-sdk.git
diff --git a/lib/pico-sdk b/lib/pico-sdk
new file mode 160000
index 0000000000000..493ed000ddfc2
--- /dev/null
+++ b/lib/pico-sdk
@@ -0,0 +1 @@
+Subproject commit 493ed000ddfc21aa1db933f5477dba52ac841aac

From 469345e7285128739e2934e7934e107ffda79fc1 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 21 Jan 2021 00:34:08 +1100
Subject: [PATCH 0541/3533] rp2: Add new port to Raspberry Pi RP2
 microcontroller.

This commit adds a new port "rp2" which targets the new Raspberry Pi RP2040
microcontroller.

The build system uses pure cmake (with a small Makefile wrapper for
convenience).  The USB driver is TinyUSB, and there is a machine module
with most of the standard classes implemented.  Some examples are provided
in the examples/rp2/ directory.

Work done in collaboration with Graham Sanderson.

Signed-off-by: Damien George <damien@micropython.org>
---
 examples/rp2/pio_1hz.py        |  35 ++
 examples/rp2/pio_exec.py       |  27 ++
 examples/rp2/pio_pinchange.py  |  46 ++
 examples/rp2/pio_pwm.py        |  45 ++
 examples/rp2/pio_uart_tx.py    |  44 ++
 examples/rp2/pio_ws2812.py     |  59 +++
 examples/rp2/pwm_fade.py       |  25 ++
 ports/rp2/CMakeLists.txt       | 162 +++++++
 ports/rp2/Makefile             |  14 +
 ports/rp2/README.md            | 100 +++++
 ports/rp2/machine_adc.c        | 120 +++++
 ports/rp2/machine_i2c.c        | 161 +++++++
 ports/rp2/machine_pin.c        | 449 +++++++++++++++++++
 ports/rp2/machine_pwm.c        | 197 +++++++++
 ports/rp2/machine_spi.c        | 278 ++++++++++++
 ports/rp2/machine_timer.c      | 165 +++++++
 ports/rp2/machine_uart.c       | 246 +++++++++++
 ports/rp2/machine_wdt.c        |  78 ++++
 ports/rp2/main.c               | 208 +++++++++
 ports/rp2/manifest.py          |   3 +
 ports/rp2/memmap_mp.ld         | 252 +++++++++++
 ports/rp2/micropy_extmod.cmake |  40 ++
 ports/rp2/micropy_py.cmake     | 134 ++++++
 ports/rp2/micropy_rules.cmake  |  91 ++++
 ports/rp2/modmachine.c         | 101 +++++
 ports/rp2/modmachine.h         |  18 +
 ports/rp2/modrp2.c             |  41 ++
 ports/rp2/modrp2.h             |  38 ++
 ports/rp2/modules/_boot.py     |  15 +
 ports/rp2/modules/rp2.py       | 294 +++++++++++++
 ports/rp2/moduos.c             | 103 +++++
 ports/rp2/modutime.c           | 127 ++++++
 ports/rp2/mpconfigport.h       | 196 +++++++++
 ports/rp2/mphalport.c          | 142 ++++++
 ports/rp2/mphalport.h          | 113 +++++
 ports/rp2/mpthreadport.c       | 105 +++++
 ports/rp2/mpthreadport.h       |  64 +++
 ports/rp2/qstrdefsport.h       |   3 +
 ports/rp2/rp2_flash.c          | 146 ++++++
 ports/rp2/rp2_pio.c            | 780 +++++++++++++++++++++++++++++++++
 ports/rp2/tusb_config.h        |  34 ++
 ports/rp2/tusb_port.c          | 115 +++++
 ports/rp2/uart.c               |  63 +++
 ports/rp2/uart.h               |  32 ++
 44 files changed, 5509 insertions(+)
 create mode 100644 examples/rp2/pio_1hz.py
 create mode 100644 examples/rp2/pio_exec.py
 create mode 100644 examples/rp2/pio_pinchange.py
 create mode 100644 examples/rp2/pio_pwm.py
 create mode 100644 examples/rp2/pio_uart_tx.py
 create mode 100644 examples/rp2/pio_ws2812.py
 create mode 100644 examples/rp2/pwm_fade.py
 create mode 100644 ports/rp2/CMakeLists.txt
 create mode 100644 ports/rp2/Makefile
 create mode 100644 ports/rp2/README.md
 create mode 100644 ports/rp2/machine_adc.c
 create mode 100644 ports/rp2/machine_i2c.c
 create mode 100644 ports/rp2/machine_pin.c
 create mode 100644 ports/rp2/machine_pwm.c
 create mode 100644 ports/rp2/machine_spi.c
 create mode 100644 ports/rp2/machine_timer.c
 create mode 100644 ports/rp2/machine_uart.c
 create mode 100644 ports/rp2/machine_wdt.c
 create mode 100644 ports/rp2/main.c
 create mode 100644 ports/rp2/manifest.py
 create mode 100644 ports/rp2/memmap_mp.ld
 create mode 100644 ports/rp2/micropy_extmod.cmake
 create mode 100644 ports/rp2/micropy_py.cmake
 create mode 100644 ports/rp2/micropy_rules.cmake
 create mode 100644 ports/rp2/modmachine.c
 create mode 100644 ports/rp2/modmachine.h
 create mode 100644 ports/rp2/modrp2.c
 create mode 100644 ports/rp2/modrp2.h
 create mode 100644 ports/rp2/modules/_boot.py
 create mode 100644 ports/rp2/modules/rp2.py
 create mode 100644 ports/rp2/moduos.c
 create mode 100644 ports/rp2/modutime.c
 create mode 100644 ports/rp2/mpconfigport.h
 create mode 100644 ports/rp2/mphalport.c
 create mode 100644 ports/rp2/mphalport.h
 create mode 100644 ports/rp2/mpthreadport.c
 create mode 100644 ports/rp2/mpthreadport.h
 create mode 100644 ports/rp2/qstrdefsport.h
 create mode 100644 ports/rp2/rp2_flash.c
 create mode 100644 ports/rp2/rp2_pio.c
 create mode 100644 ports/rp2/tusb_config.h
 create mode 100644 ports/rp2/tusb_port.c
 create mode 100644 ports/rp2/uart.c
 create mode 100644 ports/rp2/uart.h

diff --git a/examples/rp2/pio_1hz.py b/examples/rp2/pio_1hz.py
new file mode 100644
index 0000000000000..c18aa22fc0ece
--- /dev/null
+++ b/examples/rp2/pio_1hz.py
@@ -0,0 +1,35 @@
+# Example using PIO to blink an LED and raise an IRQ at 1Hz.
+
+import time
+from machine import Pin
+import rp2
+
+
+@rp2.asm_pio(set_init=rp2.PIO.OUT_LOW)
+def blink_1hz():
+    # fmt: off
+    # Cycles: 1 + 1 + 6 + 32 * (30 + 1) = 1000
+    irq(rel(0))
+    set(pins, 1)
+    set(x, 31)                  [5]
+    label("delay_high")
+    nop()                       [29]
+    jmp(x_dec, "delay_high")
+
+    # Cycles: 1 + 7 + 32 * (30 + 1) = 1000
+    set(pins, 0)
+    set(x, 31)                  [6]
+    label("delay_low")
+    nop()                       [29]
+    jmp(x_dec, "delay_low")
+    # fmt: on
+
+
+# Create the StateMachine with the blink_1hz program, outputting on Pin(25).
+sm = rp2.StateMachine(0, blink_1hz, freq=2000, set_base=Pin(25))
+
+# Set the IRQ handler to print the millisecond timestamp.
+sm.irq(lambda p: print(time.ticks_ms()))
+
+# Start the StateMachine.
+sm.active(1)
diff --git a/examples/rp2/pio_exec.py b/examples/rp2/pio_exec.py
new file mode 100644
index 0000000000000..d8cbc33ef015a
--- /dev/null
+++ b/examples/rp2/pio_exec.py
@@ -0,0 +1,27 @@
+# Example using PIO to turn on an LED via an explicit exec.
+#
+# Demonstrates:
+#   - using set_init and set_base
+#   - using StateMachine.exec
+
+import time
+from machine import Pin
+import rp2
+
+# Define an empty program that uses a single set pin.
+@rp2.asm_pio(set_init=rp2.PIO.OUT_LOW)
+def prog():
+    pass
+
+
+# Construct the StateMachine, binding Pin(25) to the set pin.
+sm = rp2.StateMachine(0, prog, set_base=Pin(25))
+
+# Turn on the set pin via an exec instruction.
+sm.exec("set(pins, 1)")
+
+# Sleep for 500ms.
+time.sleep(0.5)
+
+# Turn off the set pin via an exec instruction.
+sm.exec("set(pins, 0)")
diff --git a/examples/rp2/pio_pinchange.py b/examples/rp2/pio_pinchange.py
new file mode 100644
index 0000000000000..767c8e78c2eef
--- /dev/null
+++ b/examples/rp2/pio_pinchange.py
@@ -0,0 +1,46 @@
+# Example using PIO to wait for a pin change and raise an IRQ.
+#
+# Demonstrates:
+#   - PIO wrapping
+#   - PIO wait instruction, waiting on an input pin
+#   - PIO irq instruction, in blocking mode with relative IRQ number
+#   - setting the in_base pin for a StateMachine
+#   - setting an irq handler for a StateMachine
+#   - instantiating 2x StateMachine's with the same program and different pins
+
+import time
+from machine import Pin
+import rp2
+
+
+@rp2.asm_pio()
+def wait_pin_low():
+    wrap_target()
+
+    wait(0, pin, 0)
+    irq(block, rel(0))
+    wait(1, pin, 0)
+
+    wrap()
+
+
+def handler(sm):
+    # Print a (wrapping) timestamp, and the state machine object.
+    print(time.ticks_ms(), sm)
+
+
+# Instantiate StateMachine(0) with wait_pin_low program on Pin(16).
+pin16 = Pin(16, Pin.IN, Pin.PULL_UP)
+sm0 = rp2.StateMachine(0, wait_pin_low, in_base=pin16)
+sm0.irq(handler)
+
+# Instantiate StateMachine(1) with wait_pin_low program on Pin(17).
+pin17 = Pin(17, Pin.IN, Pin.PULL_UP)
+sm1 = rp2.StateMachine(1, wait_pin_low, in_base=pin17)
+sm1.irq(handler)
+
+# Start the StateMachine's running.
+sm0.active(1)
+sm1.active(1)
+
+# Now, when Pin(16) or Pin(17) is pulled low a message will be printed to the REPL.
diff --git a/examples/rp2/pio_pwm.py b/examples/rp2/pio_pwm.py
new file mode 100644
index 0000000000000..8e87448ca8029
--- /dev/null
+++ b/examples/rp2/pio_pwm.py
@@ -0,0 +1,45 @@
+# Example of using PIO for PWM, and fading the brightness of an LED
+
+from machine import Pin
+from rp2 import PIO, StateMachine, asm_pio
+from time import sleep
+
+
+@asm_pio(sideset_init=PIO.OUT_LOW)
+def pwm_prog():
+    # fmt: off
+    pull(noblock) .side(0)
+    mov(x, osr)  # Keep most recent pull data stashed in X, for recycling by noblock
+    mov(y, isr)  # ISR must be preloaded with PWM count max
+    label("pwmloop")
+    jmp(x_not_y, "skip")
+    nop()         .side(1)
+    label("skip")
+    jmp(y_dec, "pwmloop")
+    # fmt: on
+
+
+class PIOPWM:
+    def __init__(self, sm_id, pin, max_count, count_freq):
+        self._sm = StateMachine(sm_id, pwm_prog, freq=2 * count_freq, sideset_base=Pin(pin))
+        # Use exec() to load max count into ISR
+        self._sm.put(max_count)
+        self._sm.exec("pull()")
+        self._sm.exec("mov(isr, osr)")
+        self._sm.active(1)
+        self._max_count = max_count
+
+    def set(self, value):
+        # Minimum value is -1 (completely turn off), 0 actually still produces narrow pulse
+        value = max(value, -1)
+        value = min(value, self._max_count)
+        self._sm.put(value)
+
+
+# Pin 25 is LED on Pico boards
+pwm = PIOPWM(0, 25, max_count=(1 << 16) - 1, count_freq=10_000_000)
+
+while True:
+    for i in range(256):
+        pwm.set(i ** 2)
+        sleep(0.01)
diff --git a/examples/rp2/pio_uart_tx.py b/examples/rp2/pio_uart_tx.py
new file mode 100644
index 0000000000000..0f8c1260bd7da
--- /dev/null
+++ b/examples/rp2/pio_uart_tx.py
@@ -0,0 +1,44 @@
+# Example using PIO to create a UART TX interface
+
+from machine import Pin
+from rp2 import PIO, StateMachine, asm_pio
+
+UART_BAUD = 115200
+PIN_BASE = 10
+NUM_UARTS = 8
+
+
+@asm_pio(sideset_init=PIO.OUT_HIGH, out_init=PIO.OUT_HIGH, out_shiftdir=PIO.SHIFT_RIGHT)
+def uart_tx():
+    # fmt: off
+    # Block with TX deasserted until data available
+    pull()
+    # Initialise bit counter, assert start bit for 8 cycles
+    set(x, 7)  .side(0)       [7]
+    # Shift out 8 data bits, 8 execution cycles per bit
+    label("bitloop")
+    out(pins, 1)              [6]
+    jmp(x_dec, "bitloop")
+    # Assert stop bit for 8 cycles total (incl 1 for pull())
+    nop()      .side(1)       [6]
+    # fmt: on
+
+
+# Now we add 8 UART TXs, on pins 10 to 17. Use the same baud rate for all of them.
+uarts = []
+for i in range(NUM_UARTS):
+    sm = StateMachine(
+        i, uart_tx, freq=8 * UART_BAUD, sideset_base=Pin(PIN_BASE + i), out_base=Pin(PIN_BASE + i)
+    )
+    sm.active(1)
+    uarts.append(sm)
+
+# We can print characters from each UART by pushing them to the TX FIFO
+def pio_uart_print(sm, s):
+    for c in s:
+        sm.put(ord(c))
+
+
+# Print a different message from each UART
+for i, u in enumerate(uarts):
+    pio_uart_print(u, "Hello from UART {}!\n".format(i))
diff --git a/examples/rp2/pio_ws2812.py b/examples/rp2/pio_ws2812.py
new file mode 100644
index 0000000000000..dd021a9d5642d
--- /dev/null
+++ b/examples/rp2/pio_ws2812.py
@@ -0,0 +1,59 @@
+# Example using PIO to drive a set of WS2812 LEDs.
+
+import array, time
+from machine import Pin
+import rp2
+
+# Configure the number of WS2812 LEDs.
+NUM_LEDS = 8
+
+
+@rp2.asm_pio(
+    sideset_init=rp2.PIO.OUT_LOW,
+    out_shiftdir=rp2.PIO.SHIFT_LEFT,
+    autopull=True,
+    pull_thresh=24,
+)
+def ws2812():
+    # fmt: off
+    T1 = 2
+    T2 = 5
+    T3 = 3
+    wrap_target()
+    label("bitloop")
+    out(x, 1)               .side(0)    [T3 - 1]
+    jmp(not_x, "do_zero")   .side(1)    [T1 - 1]
+    jmp("bitloop")          .side(1)    [T2 - 1]
+    label("do_zero")
+    nop()                   .side(0)    [T2 - 1]
+    wrap()
+    # fmt: on
+
+
+# Create the StateMachine with the ws2812 program, outputting on Pin(22).
+sm = rp2.StateMachine(0, ws2812, freq=8_000_000, sideset_base=Pin(22))
+
+# Start the StateMachine, it will wait for data on its FIFO.
+sm.active(1)
+
+# Display a pattern on the LEDs via an array of LED RGB values.
+ar = array.array("I", [0 for _ in range(NUM_LEDS)])
+
+# Cycle colours.
+for i in range(4 * NUM_LEDS):
+    for j in range(NUM_LEDS):
+        r = j * 100 // (NUM_LEDS - 1)
+        b = 100 - j * 100 // (NUM_LEDS - 1)
+        if j != i % NUM_LEDS:
+            r >>= 3
+            b >>= 3
+        ar[j] = r << 16 | b
+    sm.put(ar, 8)
+    time.sleep_ms(50)
+
+# Fade out.
+for i in range(24):
+    for j in range(NUM_LEDS):
+        ar[j] = ar[j] >> 1 & 0x7F7F7F
+    sm.put(ar, 8)
+    time.sleep_ms(50)
diff --git a/examples/rp2/pwm_fade.py b/examples/rp2/pwm_fade.py
new file mode 100644
index 0000000000000..7264edaa293a1
--- /dev/null
+++ b/examples/rp2/pwm_fade.py
@@ -0,0 +1,25 @@
+# Example using PWM to fade an LED.
+
+import time
+from machine import Pin, PWM
+
+
+# Construct PWM object, with LED on Pin(25).
+pwm = PWM(Pin(25))
+
+# Set the PWM frequency.
+pwm.freq(1000)
+
+# Fade the LED in and out a few times.
+duty = 0
+direction = 1
+for _ in range(8 * 256):
+    duty += direction
+    if duty > 255:
+        duty = 255
+        direction = -1
+    elif duty < 0:
+        duty = 0
+        direction = 1
+    pwm.duty_u16(duty * duty)
+    time.sleep(0.001)
diff --git a/ports/rp2/CMakeLists.txt b/ports/rp2/CMakeLists.txt
new file mode 100644
index 0000000000000..400cb8480e849
--- /dev/null
+++ b/ports/rp2/CMakeLists.txt
@@ -0,0 +1,162 @@
+cmake_minimum_required(VERSION 3.12)
+
+# Set build type to reduce firmware size
+if(NOT CMAKE_BUILD_TYPE)
+    set(CMAKE_BUILD_TYPE MinSizeRel)
+endif()
+
+# Set main target and component locations
+set(MICROPYTHON_TARGET firmware)
+get_filename_component(MPY_DIR "../.." ABSOLUTE)
+if (PICO_SDK_PATH_OVERRIDE)
+    set(PICO_SDK_PATH ${PICO_SDK_PATH_OVERRIDE})
+else()
+    set(PICO_SDK_PATH ../../lib/pico-sdk)
+endif()
+
+# Include component cmake fragments
+include(micropy_py.cmake)
+include(micropy_extmod.cmake)
+include(${PICO_SDK_PATH}/pico_sdk_init.cmake)
+
+# Define the top-level project
+project(${MICROPYTHON_TARGET})
+
+pico_sdk_init()
+
+add_executable(${MICROPYTHON_TARGET})
+
+set(SOURCE_LIB
+    ${MPY_DIR}/lib/littlefs/lfs1.c
+    ${MPY_DIR}/lib/littlefs/lfs1_util.c
+    ${MPY_DIR}/lib/littlefs/lfs2.c
+    ${MPY_DIR}/lib/littlefs/lfs2_util.c
+    ${MPY_DIR}/lib/mp-readline/readline.c
+    ${MPY_DIR}/lib/oofatfs/ff.c
+    ${MPY_DIR}/lib/oofatfs/ffunicode.c
+    ${MPY_DIR}/lib/timeutils/timeutils.c
+    ${MPY_DIR}/lib/utils/gchelper_m0.s
+    ${MPY_DIR}/lib/utils/gchelper_native.c
+    ${MPY_DIR}/lib/utils/mpirq.c
+    ${MPY_DIR}/lib/utils/stdout_helpers.c
+    ${MPY_DIR}/lib/utils/sys_stdio_mphal.c
+    ${MPY_DIR}/lib/utils/pyexec.c
+)
+
+set(SOURCE_DRIVERS
+    ${MPY_DIR}/drivers/bus/softspi.c
+)
+
+set(SOURCE_PORT
+    machine_adc.c
+    machine_i2c.c
+    machine_pin.c
+    machine_pwm.c
+    machine_spi.c
+    machine_timer.c
+    machine_uart.c
+    machine_wdt.c
+    main.c
+    modmachine.c
+    modrp2.c
+    moduos.c
+    modutime.c
+    mphalport.c
+    mpthreadport.c
+    rp2_flash.c
+    rp2_pio.c
+    tusb_port.c
+    uart.c
+)
+
+set(SOURCE_QSTR
+    ${SOURCE_PY}
+    ${SOURCE_EXTMOD}
+    ${MPY_DIR}/lib/utils/mpirq.c
+    ${MPY_DIR}/lib/utils/sys_stdio_mphal.c
+    ${PROJECT_SOURCE_DIR}/machine_adc.c
+    ${PROJECT_SOURCE_DIR}/machine_i2c.c
+    ${PROJECT_SOURCE_DIR}/machine_pin.c
+    ${PROJECT_SOURCE_DIR}/machine_pwm.c
+    ${PROJECT_SOURCE_DIR}/machine_spi.c
+    ${PROJECT_SOURCE_DIR}/machine_timer.c
+    ${PROJECT_SOURCE_DIR}/machine_uart.c
+    ${PROJECT_SOURCE_DIR}/machine_wdt.c
+    ${PROJECT_SOURCE_DIR}/modmachine.c
+    ${PROJECT_SOURCE_DIR}/modrp2.c
+    ${PROJECT_SOURCE_DIR}/moduos.c
+    ${PROJECT_SOURCE_DIR}/modutime.c
+    ${PROJECT_SOURCE_DIR}/rp2_flash.c
+    ${PROJECT_SOURCE_DIR}/rp2_pio.c
+)
+
+set(MPY_QSTR_DEFS ${PROJECT_SOURCE_DIR}/qstrdefsport.h)
+
+# Define mpy-cross flags and frozen manifest
+set(MPY_CROSS_FLAGS -march=armv7m)
+set(FROZEN_MANIFEST ${PROJECT_SOURCE_DIR}/manifest.py)
+
+include(micropy_rules.cmake)
+
+target_sources(${MICROPYTHON_TARGET} PRIVATE
+    ${SOURCE_PY}
+    ${SOURCE_EXTMOD}
+    ${SOURCE_LIB}
+    ${SOURCE_DRIVERS}
+    ${SOURCE_PORT}
+)
+
+target_include_directories(${MICROPYTHON_TARGET} PRIVATE
+                           "${PROJECT_SOURCE_DIR}"
+                           "${MPY_DIR}"
+                           "${CMAKE_BINARY_DIR}"
+                           )
+
+target_compile_options(${MICROPYTHON_TARGET} PRIVATE
+    -Wall
+    #-Werror
+    -DFFCONF_H=\"${MPY_DIR}/lib/oofatfs/ffconf.h\"
+    -DLFS1_NO_MALLOC -DLFS1_NO_DEBUG -DLFS1_NO_WARN -DLFS1_NO_ERROR -DLFS1_NO_ASSERT
+    -DLFS2_NO_MALLOC -DLFS2_NO_DEBUG -DLFS2_NO_WARN -DLFS2_NO_ERROR -DLFS2_NO_ASSERT
+)
+
+target_compile_definitions(${MICROPYTHON_TARGET} PRIVATE
+    PICO_FLOAT_PROPAGATE_NANS=1
+    PICO_STACK_SIZE=0x2000
+    PICO_CORE1_STACK_SIZE=0
+    PICO_PROGRAM_NAME="MicroPython"
+    PICO_NO_PROGRAM_VERSION_STRING=1 # do it ourselves in main.c
+    MICROPY_BUILD_TYPE="${CMAKE_C_COMPILER_ID} ${CMAKE_C_COMPILER_VERSION} ${CMAKE_BUILD_TYPE}"
+    PICO_NO_BI_STDIO_UART=1 # we call it UART REPL
+)
+
+target_link_libraries(${MICROPYTHON_TARGET}
+    hardware_adc
+    hardware_dma
+    hardware_flash
+    hardware_i2c
+    hardware_pio
+    hardware_pwm
+    hardware_rtc
+    hardware_spi
+    hardware_sync
+    pico_multicore
+    pico_stdlib_headers
+    pico_stdlib
+    tinyusb_device
+)
+
+# todo this is a bit brittle, but we want to move a few source files into RAM (which requires
+#  a linker script modification) until we explicitly add  macro calls around the function
+#  defs to move them into RAM.
+if (PICO_ON_DEVICE AND NOT PICO_NO_FLASH AND NOT PICO_COPY_TO_RAM)
+    pico_set_linker_script(${MICROPYTHON_TARGET} ${CMAKE_CURRENT_LIST_DIR}/memmap_mp.ld)
+endif()
+
+pico_add_extra_outputs(${MICROPYTHON_TARGET})
+
+add_custom_command(TARGET ${MICROPYTHON_TARGET}
+    POST_BUILD
+    COMMAND arm-none-eabi-size --format=berkeley ${PROJECT_BINARY_DIR}/${MICROPYTHON_TARGET}.elf
+    VERBATIM
+)
diff --git a/ports/rp2/Makefile b/ports/rp2/Makefile
new file mode 100644
index 0000000000000..08cd53dcca68c
--- /dev/null
+++ b/ports/rp2/Makefile
@@ -0,0 +1,14 @@
+# Makefile for micropython on Raspberry Pi RP2
+#
+# This is a simple wrapper around cmake
+
+BUILD = build
+
+$(VERBOSE)MAKESILENT = -s
+
+all:
+	[ -d $(BUILD) ] || cmake -S . -B $(BUILD) -DPICO_BUILD_DOCS=0
+	$(MAKE) $(MAKESILENT) -C $(BUILD)
+
+clean:
+	$(RM) -rf $(BUILD)
diff --git a/ports/rp2/README.md b/ports/rp2/README.md
new file mode 100644
index 0000000000000..d49550c5c4bd2
--- /dev/null
+++ b/ports/rp2/README.md
@@ -0,0 +1,100 @@
+# The RP2 port
+
+This is a port of MicroPython to the Raspberry Pi RP2 series of microcontrollers.
+Currently supported features are:
+
+- REPL over USB VCP, and optionally over UART (on GP0/GP1).
+- Filesystem on the internal flash, using littlefs2.
+- Support for native code generation and inline assembler.
+- `utime` module with sleep, time and ticks functions.
+- `uos` module with VFS support.
+- `machine` module with the following classes: `Pin`, `ADC`, `PWM`, `I2C`, `SPI`,
+  `SoftI2C`, `SoftSPI`, `Timer`, `UART`, `WDT`.
+- `rp2` module with programmable IO (PIO) support.
+
+See the `examples/rp2/` directory for some example code.
+
+## Building
+
+The MicroPython cross-compiler must be built first, which will be used to
+pre-compile (freeze) built-in Python code.  This cross-compiler is built and
+run on the host machine using:
+
+    $ make -C mpy-cross
+
+This command should be executed from the root directory of this repository.
+All other commands below should be executed from the ports/rp2/ directory.
+
+Building of the RP2 firmware is done entirely using CMake, although a simple
+Makefile is also provided as a convenience.  To build the firmware run (from
+this directory):
+
+    $ make clean
+    $ make
+
+You can also build the standard CMake way.  The final firmware is found in
+the top-level of the CMake build directory (`build` by default) and is
+called `firmware.uf2`.
+
+## Deploying firmware to the device
+
+Firmware can be deployed to the device by putting it into bootloader mode
+(hold down BOOTSEL while powering on or resetting) and then copying
+`firmware.uf2` to the USB mass storage device that appears.
+
+If MicroPython is already installed then the bootloader can be entered by
+executing `import machine; machine.bootloader()` at the REPL.
+
+## Sample code
+
+The following samples can be easily run on the board by entering paste mode
+with Ctrl-E at the REPL, then cut-and-pasting the sample code to the REPL, then
+executing the code with Ctrl-D.
+
+### Blinky
+
+This blinks the on-board LED on the Pico board at 1.25Hz, using a Timer object
+with a callback.
+
+```python
+from machine import Pin, Timer
+led = Pin(25, Pin.OUT)
+tim = Timer()
+def tick(timer):
+    global led
+    led.toggle()
+
+tim.init(freq=2.5, mode=Timer.PERIODIC, callback=tick)
+```
+
+### PIO blinky
+
+This blinks the on-board LED on the Pico board at 1Hz, using a PIO peripheral and
+PIO assembler to directly toggle the LED at the required rate.
+
+```python
+from machine import Pin
+import rp2
+
+@rp2.asm_pio(set_init=rp2.PIO.OUT_LOW)
+def blink_1hz():
+    # Turn on the LED and delay, taking 1000 cycles.
+    set(pins, 1)
+    set(x, 31)                  [6]
+    label("delay_high")
+    nop()                       [29]
+    jmp(x_dec, "delay_high")
+
+    # Turn off the LED and delay, taking 1000 cycles.
+    set(pins, 0)
+    set(x, 31)                  [6]
+    label("delay_low")
+    nop()                       [29]
+    jmp(x_dec, "delay_low")
+
+# Create StateMachine(0) with the blink_1hz program, outputting on Pin(25).
+sm = rp2.StateMachine(0, blink_1hz, freq=2000, set_base=Pin(25))
+sm.active(1)
+```
+
+See the `examples/rp2/` directory for further example code.
diff --git a/ports/rp2/machine_adc.c b/ports/rp2/machine_adc.c
new file mode 100644
index 0000000000000..f0f367151cab5
--- /dev/null
+++ b/ports/rp2/machine_adc.c
@@ -0,0 +1,120 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020-2021 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "py/runtime.h"
+#include "py/mphal.h"
+#include "hardware/adc.h"
+
+#define ADC_IS_VALID_GPIO(gpio) ((gpio) >= 26 && (gpio) <= 29)
+#define ADC_CHANNEL_FROM_GPIO(gpio) ((gpio) - 26)
+#define ADC_CHANNEL_TEMPSENSOR (4)
+
+STATIC uint16_t adc_config_and_read_u16(uint32_t channel) {
+    adc_select_input(channel);
+    uint32_t raw = adc_read();
+    const uint32_t bits = 12;
+    // Scale raw reading to 16 bit value using a Taylor expansion (for 8 <= bits <= 16)
+    return raw << (16 - bits) | raw >> (2 * bits - 16);
+}
+
+/******************************************************************************/
+// MicroPython bindings for machine.ADC
+
+const mp_obj_type_t machine_adc_type;
+
+typedef struct _machine_adc_obj_t {
+    mp_obj_base_t base;
+    uint32_t channel;
+} machine_adc_obj_t;
+
+STATIC void machine_adc_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+    machine_adc_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    mp_printf(print, "<ADC channel=%u>", self->channel);
+}
+
+// ADC(id)
+STATIC mp_obj_t machine_adc_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
+    // Check number of arguments
+    mp_arg_check_num(n_args, n_kw, 1, 1, false);
+
+    mp_obj_t source = all_args[0];
+
+    uint32_t channel;
+    if (mp_obj_is_int(source)) {
+        // Get and validate channel number.
+        channel = mp_obj_get_int(source);
+        if (!((channel >= 0 && channel <= ADC_CHANNEL_TEMPSENSOR) || ADC_IS_VALID_GPIO(channel))) {
+            mp_raise_ValueError(MP_ERROR_TEXT("invalid channel"));
+        }
+
+    } else {
+        // Get GPIO and check it has ADC capabilities.
+        channel = mp_hal_get_pin_obj(source);
+        if (!ADC_IS_VALID_GPIO(channel)) {
+            mp_raise_ValueError(MP_ERROR_TEXT("Pin doesn't have ADC capabilities"));
+        }
+    }
+
+    adc_init();
+
+    if (ADC_IS_VALID_GPIO(channel)) {
+        // Configure the GPIO pin in ADC mode.
+        adc_gpio_init(channel);
+        channel = ADC_CHANNEL_FROM_GPIO(channel);
+    } else if (channel == ADC_CHANNEL_TEMPSENSOR) {
+        // Enable temperature sensor.
+        adc_set_temp_sensor_enabled(1);
+    }
+
+    // Create ADC object.
+    machine_adc_obj_t *o = m_new_obj(machine_adc_obj_t);
+    o->base.type = &machine_adc_type;
+    o->channel = channel;
+
+    return MP_OBJ_FROM_PTR(o);
+}
+
+// read_u16()
+STATIC mp_obj_t machine_adc_read_u16(mp_obj_t self_in) {
+    machine_adc_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    return MP_OBJ_NEW_SMALL_INT(adc_config_and_read_u16(self->channel));
+}
+MP_DEFINE_CONST_FUN_OBJ_1(machine_adc_read_u16_obj, machine_adc_read_u16);
+
+STATIC const mp_rom_map_elem_t machine_adc_locals_dict_table[] = {
+    { MP_ROM_QSTR(MP_QSTR_read_u16), MP_ROM_PTR(&machine_adc_read_u16_obj) },
+
+    { MP_ROM_QSTR(MP_QSTR_CORE_TEMP), MP_ROM_INT(ADC_CHANNEL_TEMPSENSOR) },
+};
+STATIC MP_DEFINE_CONST_DICT(machine_adc_locals_dict, machine_adc_locals_dict_table);
+
+const mp_obj_type_t machine_adc_type = {
+    { &mp_type_type },
+    .name = MP_QSTR_ADC,
+    .print = machine_adc_print,
+    .make_new = machine_adc_make_new,
+    .locals_dict = (mp_obj_dict_t *)&machine_adc_locals_dict,
+};
diff --git a/ports/rp2/machine_i2c.c b/ports/rp2/machine_i2c.c
new file mode 100644
index 0000000000000..0852cc19938e1
--- /dev/null
+++ b/ports/rp2/machine_i2c.c
@@ -0,0 +1,161 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020-2021 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "py/runtime.h"
+#include "py/mphal.h"
+#include "py/mperrno.h"
+#include "extmod/machine_i2c.h"
+#include "modmachine.h"
+
+#include "hardware/i2c.h"
+
+#define DEFAULT_I2C_FREQ (400000)
+#define DEFAULT_I2C0_SCL (9)
+#define DEFAULT_I2C0_SDA (8)
+#define DEFAULT_I2C1_SCL (7)
+#define DEFAULT_I2C1_SDA (6)
+
+// SDA/SCL on even/odd pins, I2C0/I2C1 on even/odd pairs of pins.
+#define IS_VALID_SCL(i2c, pin) (((pin) & 1) == 1 && (((pin) & 2) >> 1) == (i2c))
+#define IS_VALID_SDA(i2c, pin) (((pin) & 1) == 0 && (((pin) & 2) >> 1) == (i2c))
+
+typedef struct _machine_i2c_obj_t {
+    mp_obj_base_t base;
+    i2c_inst_t *const i2c_inst;
+    uint8_t i2c_id;
+    uint8_t scl;
+    uint8_t sda;
+    uint32_t freq;
+} machine_i2c_obj_t;
+
+STATIC machine_i2c_obj_t machine_i2c_obj[] = {
+    {{&machine_hw_i2c_type}, i2c0, 0, DEFAULT_I2C0_SCL, DEFAULT_I2C0_SDA, 0},
+    {{&machine_hw_i2c_type}, i2c1, 1, DEFAULT_I2C1_SCL, DEFAULT_I2C1_SDA, 0},
+};
+
+STATIC void machine_i2c_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+    machine_i2c_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    mp_printf(print, "I2C(%u, freq=%u, scl=%u, sda=%u)",
+        self->i2c_id, self->freq, self->scl, self->sda);
+}
+
+mp_obj_t machine_i2c_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
+    enum { ARG_id, ARG_freq, ARG_scl, ARG_sda };
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_id, MP_ARG_REQUIRED | MP_ARG_OBJ },
+        { MP_QSTR_freq, MP_ARG_INT, {.u_int = DEFAULT_I2C_FREQ} },
+        { MP_QSTR_scl, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
+        { MP_QSTR_sda, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
+    };
+
+    // Parse args.
+    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
+    mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
+
+    // Get I2C bus.
+    int i2c_id = mp_obj_get_int(args[ARG_id].u_obj);
+    if (i2c_id < 0 || i2c_id >= MP_ARRAY_SIZE(machine_i2c_obj)) {
+        mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("I2C(%d) doesn't exist"), i2c_id);
+    }
+
+    // Get static peripheral object.
+    machine_i2c_obj_t *self = (machine_i2c_obj_t *)&machine_i2c_obj[i2c_id];
+
+    // Set SCL/SDA pins if configured.
+    if (args[ARG_scl].u_obj != mp_const_none) {
+        int scl = mp_hal_get_pin_obj(args[ARG_scl].u_obj);
+        if (!IS_VALID_SCL(self->i2c_id, scl)) {
+            mp_raise_ValueError(MP_ERROR_TEXT("bad SCL pin"));
+        }
+        self->scl = scl;
+    }
+    if (args[ARG_sda].u_obj != mp_const_none) {
+        int sda = mp_hal_get_pin_obj(args[ARG_sda].u_obj);
+        if (!IS_VALID_SDA(self->i2c_id, sda)) {
+            mp_raise_ValueError(MP_ERROR_TEXT("bad SDA pin"));
+        }
+        self->sda = sda;
+    }
+
+    // Initialise the I2C peripheral if any arguments given, or it was not initialised previously.
+    if (n_args > 1 || n_kw > 0 || self->freq == 0) {
+        self->freq = args[ARG_freq].u_int;
+        i2c_init(self->i2c_inst, self->freq);
+        self->freq = i2c_set_baudrate(self->i2c_inst, self->freq);
+        gpio_set_function(self->scl, GPIO_FUNC_I2C);
+        gpio_set_function(self->sda, GPIO_FUNC_I2C);
+        gpio_set_pulls(self->scl, true, 0);
+        gpio_set_pulls(self->sda, true, 0);
+    }
+
+    return MP_OBJ_FROM_PTR(self);
+}
+
+STATIC int machine_i2c_transfer_single(mp_obj_base_t *self_in, uint16_t addr, size_t len, uint8_t *buf, unsigned int flags) {
+    machine_i2c_obj_t *self = (machine_i2c_obj_t *)self_in;
+    int ret;
+    bool nostop = !(flags & MP_MACHINE_I2C_FLAG_STOP);
+    if (flags & MP_MACHINE_I2C_FLAG_READ) {
+        ret = i2c_read_blocking(self->i2c_inst, addr, buf, len, nostop);
+    } else {
+        if (len <= 2) {
+            // Workaround issue with hardware I2C not accepting short writes.
+            mp_machine_soft_i2c_obj_t soft_i2c = {
+                .base = { &mp_machine_soft_i2c_type },
+                .us_delay = 500000 / self->freq + 1,
+                .us_timeout = 255,
+                .scl = self->scl,
+                .sda = self->sda,
+            };
+            mp_machine_i2c_buf_t bufs = {
+                .len = len,
+                .buf = buf,
+            };
+            mp_hal_pin_open_drain(self->scl);
+            mp_hal_pin_open_drain(self->sda);
+            ret = mp_machine_soft_i2c_transfer(&soft_i2c.base, addr, 1, &bufs, flags);
+            gpio_set_function(self->scl, GPIO_FUNC_I2C);
+            gpio_set_function(self->sda, GPIO_FUNC_I2C);
+        } else {
+            ret = i2c_write_blocking(self->i2c_inst, addr, buf, len, nostop);
+        }
+    }
+    return (ret < 0) ? -MP_EIO : ret;
+}
+
+STATIC const mp_machine_i2c_p_t machine_i2c_p = {
+    .transfer = mp_machine_i2c_transfer_adaptor,
+    .transfer_single = machine_i2c_transfer_single,
+};
+
+const mp_obj_type_t machine_hw_i2c_type = {
+    { &mp_type_type },
+    .name = MP_QSTR_I2C,
+    .print = machine_i2c_print,
+    .make_new = machine_i2c_make_new,
+    .protocol = &machine_i2c_p,
+    .locals_dict = (mp_obj_dict_t *)&mp_machine_i2c_locals_dict,
+};
diff --git a/ports/rp2/machine_pin.c b/ports/rp2/machine_pin.c
new file mode 100644
index 0000000000000..f798c10fdf7ac
--- /dev/null
+++ b/ports/rp2/machine_pin.c
@@ -0,0 +1,449 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2016-2021 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include <stdio.h>
+#include <string.h>
+
+#include "py/runtime.h"
+#include "py/mphal.h"
+#include "lib/utils/mpirq.h"
+#include "modmachine.h"
+#include "extmod/virtpin.h"
+
+#include "hardware/irq.h"
+#include "hardware/regs/intctrl.h"
+#include "hardware/structs/iobank0.h"
+#include "hardware/structs/padsbank0.h"
+
+#define GPIO_MODE_IN (0)
+#define GPIO_MODE_OUT (1)
+#define GPIO_MODE_OPEN_DRAIN (2)
+#define GPIO_MODE_ALT (3)
+
+// These can be or'd together.
+#define GPIO_PULL_UP (1)
+#define GPIO_PULL_DOWN (2)
+
+#define GPIO_IRQ_ALL (0xf)
+
+// Macros to access the state of the hardware.
+#define GPIO_GET_FUNCSEL(id) ((iobank0_hw->io[(id)].ctrl & IO_BANK0_GPIO0_CTRL_FUNCSEL_BITS) >> IO_BANK0_GPIO0_CTRL_FUNCSEL_LSB)
+#define GPIO_IS_OUT(id) (sio_hw->gpio_oe & (1 << (id)))
+#define GPIO_IS_PULL_UP(id) (padsbank0_hw->io[(id)] & PADS_BANK0_GPIO0_PUE_BITS)
+#define GPIO_IS_PULL_DOWN(id) (padsbank0_hw->io[(id)] & PADS_BANK0_GPIO0_PDE_BITS)
+
+// Open drain behaviour is simulated.
+#define GPIO_IS_OPEN_DRAIN(id) (machine_pin_open_drain_mask & (1 << (id)))
+
+typedef struct _machine_pin_obj_t {
+    mp_obj_base_t base;
+    uint32_t id;
+} machine_pin_obj_t;
+
+typedef struct _machine_pin_irq_obj_t {
+    mp_irq_obj_t base;
+    uint32_t flags;
+    uint32_t trigger;
+} machine_pin_irq_obj_t;
+
+STATIC const mp_irq_methods_t machine_pin_irq_methods;
+
+STATIC const machine_pin_obj_t machine_pin_obj[N_GPIOS] = {
+    {{&machine_pin_type}, 0},
+    {{&machine_pin_type}, 1},
+    {{&machine_pin_type}, 2},
+    {{&machine_pin_type}, 3},
+    {{&machine_pin_type}, 4},
+    {{&machine_pin_type}, 5},
+    {{&machine_pin_type}, 6},
+    {{&machine_pin_type}, 7},
+    {{&machine_pin_type}, 8},
+    {{&machine_pin_type}, 9},
+    {{&machine_pin_type}, 10},
+    {{&machine_pin_type}, 11},
+    {{&machine_pin_type}, 12},
+    {{&machine_pin_type}, 13},
+    {{&machine_pin_type}, 14},
+    {{&machine_pin_type}, 15},
+    {{&machine_pin_type}, 16},
+    {{&machine_pin_type}, 17},
+    {{&machine_pin_type}, 18},
+    {{&machine_pin_type}, 19},
+    {{&machine_pin_type}, 20},
+    {{&machine_pin_type}, 21},
+    {{&machine_pin_type}, 22},
+    {{&machine_pin_type}, 23},
+    {{&machine_pin_type}, 24},
+    {{&machine_pin_type}, 25},
+    {{&machine_pin_type}, 26},
+    {{&machine_pin_type}, 27},
+    {{&machine_pin_type}, 28},
+    {{&machine_pin_type}, 29},
+};
+
+// Mask with "1" indicating that the corresponding pin is in simulated open-drain mode.
+uint32_t machine_pin_open_drain_mask;
+
+STATIC void gpio_irq(void) {
+    for (int i = 0; i < 4; ++i) {
+        uint32_t intr = iobank0_hw->intr[i];
+        if (intr) {
+            for (int j = 0; j < 8; ++j) {
+                if (intr & 0xf) {
+                    uint32_t gpio = 8 * i + j;
+                    gpio_acknowledge_irq(gpio, intr & 0xf);
+                    machine_pin_irq_obj_t *irq = MP_STATE_PORT(machine_pin_irq_obj[gpio]);
+                    if (irq != NULL && (intr & irq->trigger)) {
+                        irq->flags = intr & irq->trigger;
+                        mp_irq_handler(&irq->base);
+                    }
+                }
+                intr >>= 4;
+            }
+        }
+    }
+}
+
+void machine_pin_init(void) {
+    memset(MP_STATE_PORT(machine_pin_irq_obj), 0, sizeof(MP_STATE_PORT(machine_pin_irq_obj)));
+    irq_set_exclusive_handler(IO_IRQ_BANK0, gpio_irq);
+    irq_set_enabled(IO_IRQ_BANK0, true);
+}
+
+void machine_pin_deinit(void) {
+    for (int i = 0; i < N_GPIOS; ++i) {
+        gpio_set_irq_enabled(i, GPIO_IRQ_ALL, false);
+    }
+    irq_set_enabled(IO_IRQ_BANK0, false);
+    irq_remove_handler(IO_IRQ_BANK0, gpio_irq);
+}
+
+STATIC void machine_pin_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+    machine_pin_obj_t *self = self_in;
+    uint funcsel = GPIO_GET_FUNCSEL(self->id);
+    qstr mode_qst;
+    if (funcsel == GPIO_FUNC_SIO) {
+        if (GPIO_IS_OPEN_DRAIN(self->id)) {
+            mode_qst = MP_QSTR_OPEN_DRAIN;
+        } else if (GPIO_IS_OUT(self->id)) {
+            mode_qst = MP_QSTR_OUT;
+        } else {
+            mode_qst = MP_QSTR_IN;
+        }
+    } else {
+        mode_qst = MP_QSTR_ALT;
+    }
+    mp_printf(print, "Pin(%u, mode=%q", self->id, mode_qst);
+    bool pull_up = false;
+    if (GPIO_IS_PULL_UP(self->id)) {
+        mp_printf(print, ", pull=%q", MP_QSTR_PULL_UP);
+        pull_up = true;
+    }
+    if (GPIO_IS_PULL_DOWN(self->id)) {
+        if (pull_up) {
+            mp_printf(print, "|%q", MP_QSTR_PULL_DOWN);
+        } else {
+            mp_printf(print, ", pull=%q", MP_QSTR_PULL_DOWN);
+        }
+    }
+    if (funcsel != GPIO_FUNC_SIO) {
+        mp_printf(print, ", alt=%u", funcsel);
+    }
+    mp_printf(print, ")");
+}
+
+// pin.init(mode, pull=None, *, value=None, alt=FUNC_SIO)
+STATIC mp_obj_t machine_pin_obj_init_helper(const machine_pin_obj_t *self, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    enum { ARG_mode, ARG_pull, ARG_value, ARG_alt };
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_mode, MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE}},
+        { MP_QSTR_pull, MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE}},
+        { MP_QSTR_value, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE}},
+        { MP_QSTR_alt, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = GPIO_FUNC_SIO}},
+    };
+
+    // parse args
+    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
+    mp_arg_parse_all(n_args, pos_args, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
+
+    // set initial value (do this before configuring mode/pull)
+    if (args[ARG_value].u_obj != mp_const_none) {
+        gpio_put(self->id, mp_obj_is_true(args[ARG_value].u_obj));
+    }
+
+    // configure mode
+    if (args[ARG_mode].u_obj != mp_const_none) {
+        mp_int_t mode = mp_obj_get_int(args[ARG_mode].u_obj);
+        if (mode == GPIO_MODE_IN) {
+            mp_hal_pin_input(self->id);
+        } else if (mode == GPIO_MODE_OUT) {
+            mp_hal_pin_output(self->id);
+        } else if (mode == GPIO_MODE_OPEN_DRAIN) {
+            mp_hal_pin_open_drain(self->id);
+        } else {
+            // Alternate function.
+            gpio_set_function(self->id, args[ARG_alt].u_int);
+            machine_pin_open_drain_mask &= ~(1 << self->id);
+        }
+    }
+
+    // configure pull (unconditionally because None means no-pull)
+    uint32_t pull = 0;
+    if (args[ARG_pull].u_obj != mp_const_none) {
+        pull = mp_obj_get_int(args[ARG_pull].u_obj);
+    }
+    gpio_set_pulls(self->id, pull & GPIO_PULL_UP, pull & GPIO_PULL_DOWN);
+
+    return mp_const_none;
+}
+
+// constructor(id, ...)
+mp_obj_t mp_pin_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
+    mp_arg_check_num(n_args, n_kw, 1, MP_OBJ_FUN_ARGS_MAX, true);
+
+    // get the wanted pin object
+    int wanted_pin = mp_obj_get_int(args[0]);
+    if (!(0 <= wanted_pin && wanted_pin < MP_ARRAY_SIZE(machine_pin_obj))) {
+        mp_raise_ValueError("invalid pin");
+    }
+    const machine_pin_obj_t *self = &machine_pin_obj[wanted_pin];
+
+    if (n_args > 1 || n_kw > 0) {
+        // pin mode given, so configure this GPIO
+        mp_map_t kw_args;
+        mp_map_init_fixed_table(&kw_args, n_kw, args + n_args);
+        machine_pin_obj_init_helper(self, n_args - 1, args + 1, &kw_args);
+    }
+
+    return MP_OBJ_FROM_PTR(self);
+}
+
+// fast method for getting/setting pin value
+STATIC mp_obj_t machine_pin_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
+    mp_arg_check_num(n_args, n_kw, 0, 1, false);
+    machine_pin_obj_t *self = self_in;
+    if (n_args == 0) {
+        // get pin
+        return MP_OBJ_NEW_SMALL_INT(gpio_get(self->id));
+    } else {
+        // set pin
+        bool value = mp_obj_is_true(args[0]);
+        if (GPIO_IS_OPEN_DRAIN(self->id)) {
+            MP_STATIC_ASSERT(GPIO_IN == 0 && GPIO_OUT == 1);
+            gpio_set_dir(self->id, 1 - value);
+        } else {
+            gpio_put(self->id, value);
+        }
+        return mp_const_none;
+    }
+}
+
+// pin.init(mode, pull)
+STATIC mp_obj_t machine_pin_obj_init(size_t n_args, const mp_obj_t *args, mp_map_t *kw_args) {
+    return machine_pin_obj_init_helper(args[0], n_args - 1, args + 1, kw_args);
+}
+MP_DEFINE_CONST_FUN_OBJ_KW(machine_pin_init_obj, 1, machine_pin_obj_init);
+
+// pin.value([value])
+STATIC mp_obj_t machine_pin_value(size_t n_args, const mp_obj_t *args) {
+    return machine_pin_call(args[0], n_args - 1, 0, args + 1);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_pin_value_obj, 1, 2, machine_pin_value);
+
+// pin.low()
+STATIC mp_obj_t machine_pin_low(mp_obj_t self_in) {
+    machine_pin_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    if (GPIO_IS_OPEN_DRAIN(self->id)) {
+        gpio_set_dir(self->id, GPIO_OUT);
+    } else {
+        gpio_clr_mask(1u << self->id);
+    }
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_pin_low_obj, machine_pin_low);
+
+// pin.high()
+STATIC mp_obj_t machine_pin_high(mp_obj_t self_in) {
+    machine_pin_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    if (GPIO_IS_OPEN_DRAIN(self->id)) {
+        gpio_set_dir(self->id, GPIO_IN);
+    } else {
+        gpio_set_mask(1u << self->id);
+    }
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_pin_high_obj, machine_pin_high);
+
+// pin.toggle()
+STATIC mp_obj_t machine_pin_toggle(mp_obj_t self_in) {
+    machine_pin_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    if (GPIO_IS_OPEN_DRAIN(self->id)) {
+        if (GPIO_IS_OUT(self->id)) {
+            gpio_set_dir(self->id, GPIO_IN);
+        } else {
+            gpio_set_dir(self->id, GPIO_OUT);
+        }
+    } else {
+        gpio_xor_mask(1u << self->id);
+    }
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_pin_toggle_obj, machine_pin_toggle);
+
+// pin.irq(handler=None, trigger=IRQ_FALLING|IRQ_RISING, hard=False)
+STATIC mp_obj_t machine_pin_irq(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    enum { ARG_handler, ARG_trigger, ARG_hard };
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_handler, MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
+        { MP_QSTR_trigger, MP_ARG_INT, {.u_int = GPIO_IRQ_EDGE_FALL | GPIO_IRQ_EDGE_RISE} },
+        { MP_QSTR_hard, MP_ARG_BOOL, {.u_bool = false} },
+    };
+    machine_pin_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]);
+    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
+    mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
+
+    // Get the IRQ object.
+    machine_pin_irq_obj_t *irq = MP_STATE_PORT(machine_pin_irq_obj[self->id]);
+
+    // Allocate the IRQ object if it doesn't already exist.
+    if (irq == NULL) {
+        irq = m_new_obj(machine_pin_irq_obj_t);
+        irq->base.base.type = &mp_irq_type;
+        irq->base.methods = (mp_irq_methods_t *)&machine_pin_irq_methods;
+        irq->base.parent = MP_OBJ_FROM_PTR(self);
+        irq->base.handler = mp_const_none;
+        irq->base.ishard = false;
+        MP_STATE_PORT(machine_pin_irq_obj[self->id]) = irq;
+    }
+
+    if (n_args > 1 || kw_args->used != 0) {
+        // Configure IRQ.
+
+        // Disable all IRQs while data is updated.
+        gpio_set_irq_enabled(self->id, GPIO_IRQ_ALL, false);
+
+        // Update IRQ data.
+        irq->base.handler = args[ARG_handler].u_obj;
+        irq->base.ishard = args[ARG_hard].u_bool;
+        irq->flags = 0;
+        irq->trigger = args[ARG_trigger].u_int;
+
+        // Enable IRQ if a handler is given.
+        if (args[ARG_handler].u_obj != mp_const_none) {
+            gpio_set_irq_enabled(self->id, args[ARG_trigger].u_int, true);
+        }
+    }
+
+    return MP_OBJ_FROM_PTR(irq);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_KW(machine_pin_irq_obj, 1, machine_pin_irq);
+
+STATIC const mp_rom_map_elem_t machine_pin_locals_dict_table[] = {
+    // instance methods
+    { MP_ROM_QSTR(MP_QSTR_init), MP_ROM_PTR(&machine_pin_init_obj) },
+    { MP_ROM_QSTR(MP_QSTR_value), MP_ROM_PTR(&machine_pin_value_obj) },
+    { MP_ROM_QSTR(MP_QSTR_low), MP_ROM_PTR(&machine_pin_low_obj) },
+    { MP_ROM_QSTR(MP_QSTR_high), MP_ROM_PTR(&machine_pin_high_obj) },
+    { MP_ROM_QSTR(MP_QSTR_off), MP_ROM_PTR(&machine_pin_low_obj) },
+    { MP_ROM_QSTR(MP_QSTR_on), MP_ROM_PTR(&machine_pin_high_obj) },
+    { MP_ROM_QSTR(MP_QSTR_toggle), MP_ROM_PTR(&machine_pin_toggle_obj) },
+    { MP_ROM_QSTR(MP_QSTR_irq), MP_ROM_PTR(&machine_pin_irq_obj) },
+
+    // class constants
+    { MP_ROM_QSTR(MP_QSTR_IN), MP_ROM_INT(GPIO_MODE_IN) },
+    { MP_ROM_QSTR(MP_QSTR_OUT), MP_ROM_INT(GPIO_MODE_OUT) },
+    { MP_ROM_QSTR(MP_QSTR_OPEN_DRAIN), MP_ROM_INT(GPIO_MODE_OPEN_DRAIN) },
+    { MP_ROM_QSTR(MP_QSTR_ALT), MP_ROM_INT(GPIO_MODE_ALT) },
+    { MP_ROM_QSTR(MP_QSTR_PULL_UP), MP_ROM_INT(GPIO_PULL_UP) },
+    { MP_ROM_QSTR(MP_QSTR_PULL_DOWN), MP_ROM_INT(GPIO_PULL_DOWN) },
+    { MP_ROM_QSTR(MP_QSTR_IRQ_RISING), MP_ROM_INT(GPIO_IRQ_EDGE_RISE) },
+    { MP_ROM_QSTR(MP_QSTR_IRQ_FALLING), MP_ROM_INT(GPIO_IRQ_EDGE_FALL) },
+};
+STATIC MP_DEFINE_CONST_DICT(machine_pin_locals_dict, machine_pin_locals_dict_table);
+
+STATIC mp_uint_t pin_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_t arg, int *errcode) {
+    (void)errcode;
+    machine_pin_obj_t *self = self_in;
+
+    switch (request) {
+        case MP_PIN_READ: {
+            return gpio_get(self->id);
+        }
+        case MP_PIN_WRITE: {
+            gpio_put(self->id, arg);
+            return 0;
+        }
+    }
+    return -1;
+}
+
+STATIC const mp_pin_p_t pin_pin_p = {
+    .ioctl = pin_ioctl,
+};
+
+const mp_obj_type_t machine_pin_type = {
+    { &mp_type_type },
+    .name = MP_QSTR_Pin,
+    .print = machine_pin_print,
+    .make_new = mp_pin_make_new,
+    .call = machine_pin_call,
+    .protocol = &pin_pin_p,
+    .locals_dict = (mp_obj_t)&machine_pin_locals_dict,
+};
+
+STATIC mp_uint_t machine_pin_irq_trigger(mp_obj_t self_in, mp_uint_t new_trigger) {
+    machine_pin_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    machine_pin_irq_obj_t *irq = MP_STATE_PORT(machine_pin_irq_obj[self->id]);
+    gpio_set_irq_enabled(self->id, GPIO_IRQ_ALL, false);
+    irq->flags = 0;
+    irq->trigger = new_trigger;
+    gpio_set_irq_enabled(self->id, new_trigger, true);
+    return 0;
+}
+
+STATIC mp_uint_t machine_pin_irq_info(mp_obj_t self_in, mp_uint_t info_type) {
+    machine_pin_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    machine_pin_irq_obj_t *irq = MP_STATE_PORT(machine_pin_irq_obj[self->id]);
+    if (info_type == MP_IRQ_INFO_FLAGS) {
+        return irq->flags;
+    } else if (info_type == MP_IRQ_INFO_TRIGGERS) {
+        return irq->trigger;
+    }
+    return 0;
+}
+
+STATIC const mp_irq_methods_t machine_pin_irq_methods = {
+    .trigger = machine_pin_irq_trigger,
+    .info = machine_pin_irq_info,
+};
+
+mp_hal_pin_obj_t mp_hal_get_pin_obj(mp_obj_t obj) {
+    if (!mp_obj_is_type(obj, &machine_pin_type)) {
+        mp_raise_ValueError(MP_ERROR_TEXT("expecting a Pin"));
+    }
+    machine_pin_obj_t *pin = MP_OBJ_TO_PTR(obj);
+    return pin->id;
+}
diff --git a/ports/rp2/machine_pwm.c b/ports/rp2/machine_pwm.c
new file mode 100644
index 0000000000000..ff40c5503f42b
--- /dev/null
+++ b/ports/rp2/machine_pwm.c
@@ -0,0 +1,197 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020-2021 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "py/runtime.h"
+#include "py/mphal.h"
+#include "modmachine.h"
+
+#include "hardware/clocks.h"
+#include "hardware/pwm.h"
+
+/******************************************************************************/
+// MicroPython bindings for machine.PWM
+
+const mp_obj_type_t machine_pwm_type;
+
+typedef struct _machine_pwm_obj_t {
+    mp_obj_base_t base;
+    uint8_t slice;
+    uint8_t channel;
+} machine_pwm_obj_t;
+
+STATIC machine_pwm_obj_t machine_pwm_obj[] = {
+    {{&machine_pwm_type}, 0, PWM_CHAN_A},
+    {{&machine_pwm_type}, 0, PWM_CHAN_B},
+    {{&machine_pwm_type}, 1, PWM_CHAN_A},
+    {{&machine_pwm_type}, 1, PWM_CHAN_B},
+    {{&machine_pwm_type}, 2, PWM_CHAN_A},
+    {{&machine_pwm_type}, 2, PWM_CHAN_B},
+    {{&machine_pwm_type}, 3, PWM_CHAN_A},
+    {{&machine_pwm_type}, 3, PWM_CHAN_B},
+    {{&machine_pwm_type}, 4, PWM_CHAN_A},
+    {{&machine_pwm_type}, 4, PWM_CHAN_B},
+    {{&machine_pwm_type}, 5, PWM_CHAN_A},
+    {{&machine_pwm_type}, 5, PWM_CHAN_B},
+    {{&machine_pwm_type}, 6, PWM_CHAN_A},
+    {{&machine_pwm_type}, 6, PWM_CHAN_B},
+    {{&machine_pwm_type}, 7, PWM_CHAN_A},
+    {{&machine_pwm_type}, 7, PWM_CHAN_B},
+};
+
+STATIC void machine_pwm_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+    machine_pwm_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    mp_printf(print, "<PWM slice=%u channel=%u>", self->slice, self->channel);
+}
+
+// PWM(pin)
+STATIC mp_obj_t machine_pwm_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
+    // Check number of arguments
+    mp_arg_check_num(n_args, n_kw, 1, 1, false);
+
+    // Get GPIO to connect to PWM.
+    uint32_t gpio = mp_hal_get_pin_obj(all_args[0]);
+
+    // Get static peripheral object.
+    uint slice = pwm_gpio_to_slice_num(gpio);
+    uint8_t channel = pwm_gpio_to_channel(gpio);
+    const machine_pwm_obj_t *self = &machine_pwm_obj[slice * 2 + channel];
+
+    // Select PWM function for given GPIO.
+    gpio_set_function(gpio, GPIO_FUNC_PWM);
+
+    return MP_OBJ_FROM_PTR(self);
+}
+
+STATIC mp_obj_t machine_pwm_deinit(mp_obj_t self_in) {
+    machine_pwm_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    pwm_set_enabled(self->slice, false);
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_pwm_deinit_obj, machine_pwm_deinit);
+
+// PWM.freq([value])
+STATIC mp_obj_t machine_pwm_freq(size_t n_args, const mp_obj_t *args) {
+    machine_pwm_obj_t *self = MP_OBJ_TO_PTR(args[0]);
+    uint32_t source_hz = clock_get_hz(clk_sys);
+    if (n_args == 1) {
+        // Get frequency.
+        uint32_t div16 = pwm_hw->slice[self->slice].div;
+        uint32_t top = pwm_hw->slice[self->slice].top;
+        uint32_t pwm_freq = 16 * source_hz / div16 / top;
+        return MP_OBJ_NEW_SMALL_INT(pwm_freq);
+    } else {
+        // Set the frequency, making "top" as large as possible for maximum resolution.
+        // Maximum "top" is set at 65534 to be able to achieve 100% duty with 65535.
+        #define TOP_MAX 65534
+        mp_int_t freq = mp_obj_get_int(args[1]);
+        uint32_t div16_top = 16 * source_hz / freq;
+        uint32_t top = 1;
+        for (;;) {
+            // Try a few small prime factors to get close to the desired frequency.
+            if (div16_top >= 16 * 5 && div16_top % 5 == 0 && top * 5 <= TOP_MAX) {
+                div16_top /= 5;
+                top *= 5;
+            } else if (div16_top >= 16 * 3 && div16_top % 3 == 0 && top * 3 <= TOP_MAX) {
+                div16_top /= 3;
+                top *= 3;
+            } else if (div16_top >= 16 * 2 && top * 2 <= TOP_MAX) {
+                div16_top /= 2;
+                top *= 2;
+            } else {
+                break;
+            }
+        }
+        if (div16_top < 16) {
+            mp_raise_ValueError(MP_ERROR_TEXT("freq too large"));
+        } else if (div16_top >= 256 * 16) {
+            mp_raise_ValueError(MP_ERROR_TEXT("freq too small"));
+        }
+        pwm_hw->slice[self->slice].div = div16_top;
+        pwm_hw->slice[self->slice].top = top;
+        return mp_const_none;
+    }
+}
+MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_pwm_freq_obj, 1, 2, machine_pwm_freq);
+
+// PWM.duty_u16([value])
+STATIC mp_obj_t machine_pwm_duty_u16(size_t n_args, const mp_obj_t *args) {
+    machine_pwm_obj_t *self = MP_OBJ_TO_PTR(args[0]);
+    uint32_t top = pwm_hw->slice[self->slice].top;
+    if (n_args == 1) {
+        // Get duty cycle.
+        uint32_t cc = pwm_hw->slice[self->slice].cc;
+        cc = (cc >> (self->channel ? PWM_CH0_CC_B_LSB : PWM_CH0_CC_A_LSB)) & 0xffff;
+        return MP_OBJ_NEW_SMALL_INT(cc * 65535 / (top + 1));
+    } else {
+        // Set duty cycle.
+        mp_int_t duty_u16 = mp_obj_get_int(args[1]);
+        uint32_t cc = duty_u16 * (top + 1) / 65535;
+        pwm_set_chan_level(self->slice, self->channel, cc);
+        pwm_set_enabled(self->slice, true);
+        return mp_const_none;
+    }
+}
+MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_pwm_duty_u16_obj, 1, 2, machine_pwm_duty_u16);
+
+// PWM.duty_ns([value])
+STATIC mp_obj_t machine_pwm_duty_ns(size_t n_args, const mp_obj_t *args) {
+    machine_pwm_obj_t *self = MP_OBJ_TO_PTR(args[0]);
+    uint32_t source_hz = clock_get_hz(clk_sys);
+    uint32_t slice_hz = 16 * source_hz / pwm_hw->slice[self->slice].div;
+    if (n_args == 1) {
+        // Get duty cycle.
+        uint32_t cc = pwm_hw->slice[self->slice].cc;
+        cc = (cc >> (self->channel ? PWM_CH0_CC_B_LSB : PWM_CH0_CC_A_LSB)) & 0xffff;
+        return MP_OBJ_NEW_SMALL_INT((uint64_t)cc * 1000000000ULL / slice_hz);
+    } else {
+        // Set duty cycle.
+        mp_int_t duty_ns = mp_obj_get_int(args[1]);
+        uint32_t cc = (uint64_t)duty_ns * slice_hz / 1000000000ULL;
+        if (cc > 65535) {
+            mp_raise_ValueError(MP_ERROR_TEXT("duty larger than period"));
+        }
+        pwm_set_chan_level(self->slice, self->channel, cc);
+        pwm_set_enabled(self->slice, true);
+        return mp_const_none;
+    }
+}
+MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_pwm_duty_ns_obj, 1, 2, machine_pwm_duty_ns);
+
+STATIC const mp_rom_map_elem_t machine_pwm_locals_dict_table[] = {
+    { MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&machine_pwm_deinit_obj) },
+    { MP_ROM_QSTR(MP_QSTR_freq), MP_ROM_PTR(&machine_pwm_freq_obj) },
+    { MP_ROM_QSTR(MP_QSTR_duty_u16), MP_ROM_PTR(&machine_pwm_duty_u16_obj) },
+    { MP_ROM_QSTR(MP_QSTR_duty_ns), MP_ROM_PTR(&machine_pwm_duty_ns_obj) },
+};
+STATIC MP_DEFINE_CONST_DICT(machine_pwm_locals_dict, machine_pwm_locals_dict_table);
+
+const mp_obj_type_t machine_pwm_type = {
+    { &mp_type_type },
+    .name = MP_QSTR_PWM,
+    .print = machine_pwm_print,
+    .make_new = machine_pwm_make_new,
+    .locals_dict = (mp_obj_dict_t *)&machine_pwm_locals_dict,
+};
diff --git a/ports/rp2/machine_spi.c b/ports/rp2/machine_spi.c
new file mode 100644
index 0000000000000..478c0614557c2
--- /dev/null
+++ b/ports/rp2/machine_spi.c
@@ -0,0 +1,278 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020-2021 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "py/runtime.h"
+#include "py/mphal.h"
+#include "py/mperrno.h"
+#include "extmod/machine_spi.h"
+#include "modmachine.h"
+
+#include "hardware/spi.h"
+#include "hardware/dma.h"
+
+#define DEFAULT_SPI_BAUDRATE    (1000000)
+#define DEFAULT_SPI_POLARITY    (0)
+#define DEFAULT_SPI_PHASE       (0)
+#define DEFAULT_SPI_BITS        (8)
+#define DEFAULT_SPI_FIRSTBIT    (SPI_MSB_FIRST)
+#define DEFAULT_SPI0_SCK        (6)
+#define DEFAULT_SPI0_MOSI       (7)
+#define DEFAULT_SPI0_MISO       (4)
+#define DEFAULT_SPI1_SCK        (10)
+#define DEFAULT_SPI1_MOSI       (11)
+#define DEFAULT_SPI1_MISO       (8)
+
+#define IS_VALID_PERIPH(spi, pin)   ((((pin) & 8) >> 3) == (spi))
+#define IS_VALID_SCK(spi, pin)      (((pin) & 3) == 2 && IS_VALID_PERIPH(spi, pin))
+#define IS_VALID_MOSI(spi, pin)     (((pin) & 3) == 3 && IS_VALID_PERIPH(spi, pin))
+#define IS_VALID_MISO(spi, pin)     (((pin) & 3) == 0 && IS_VALID_PERIPH(spi, pin))
+
+typedef struct _machine_spi_obj_t {
+    mp_obj_base_t base;
+    spi_inst_t *const spi_inst;
+    uint8_t spi_id;
+    uint8_t polarity;
+    uint8_t phase;
+    uint8_t bits;
+    uint8_t firstbit;
+    uint8_t sck;
+    uint8_t mosi;
+    uint8_t miso;
+    uint32_t baudrate;
+} machine_spi_obj_t;
+
+STATIC machine_spi_obj_t machine_spi_obj[] = {
+    {
+        {&machine_spi_type}, spi0, 0,
+        DEFAULT_SPI_POLARITY, DEFAULT_SPI_PHASE, DEFAULT_SPI_BITS, DEFAULT_SPI_FIRSTBIT,
+        DEFAULT_SPI0_SCK, DEFAULT_SPI0_MOSI, DEFAULT_SPI0_MISO,
+        0,
+    },
+    {
+        {&machine_spi_type}, spi1, 1,
+        DEFAULT_SPI_POLARITY, DEFAULT_SPI_PHASE, DEFAULT_SPI_BITS, DEFAULT_SPI_FIRSTBIT,
+        DEFAULT_SPI1_SCK, DEFAULT_SPI1_MOSI, DEFAULT_SPI1_MISO,
+        0,
+    },
+};
+
+STATIC void machine_spi_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+    machine_spi_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    mp_printf(print, "SPI(%u, baudrate=%u, polarity=%u, phase=%u, bits=%u, sck=%u, mosi=%u, miso=%u)",
+        self->spi_id, self->baudrate, self->polarity, self->phase, self->bits,
+        self->sck, self->mosi, self->miso);
+}
+
+mp_obj_t machine_spi_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
+    enum { ARG_id, ARG_baudrate, ARG_polarity, ARG_phase, ARG_bits, ARG_firstbit, ARG_sck, ARG_mosi, ARG_miso };
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_id,       MP_ARG_REQUIRED | MP_ARG_OBJ },
+        { MP_QSTR_baudrate, MP_ARG_INT, {.u_int = DEFAULT_SPI_BAUDRATE} },
+        { MP_QSTR_polarity, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = DEFAULT_SPI_POLARITY} },
+        { MP_QSTR_phase,    MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = DEFAULT_SPI_PHASE} },
+        { MP_QSTR_bits,     MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = DEFAULT_SPI_BITS} },
+        { MP_QSTR_firstbit, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = DEFAULT_SPI_FIRSTBIT} },
+        { MP_QSTR_sck,      MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
+        { MP_QSTR_mosi,     MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
+        { MP_QSTR_miso,     MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
+    };
+
+    // Parse the arguments.
+    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
+    mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
+
+    // Get the SPI bus id.
+    int spi_id = mp_obj_get_int(args[ARG_id].u_obj);
+    if (spi_id < 0 || spi_id >= MP_ARRAY_SIZE(machine_spi_obj)) {
+        mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("SPI(%d) doesn't exist"), spi_id);
+    }
+
+    // Get static peripheral object.
+    machine_spi_obj_t *self = (machine_spi_obj_t *)&machine_spi_obj[spi_id];
+
+    // Set SCK/MOSI/MISO pins if configured.
+    if (args[ARG_sck].u_obj != mp_const_none) {
+        int sck = mp_hal_get_pin_obj(args[ARG_sck].u_obj);
+        if (!IS_VALID_SCK(self->spi_id, sck)) {
+            mp_raise_ValueError(MP_ERROR_TEXT("bad SCK pin"));
+        }
+        self->sck = sck;
+    }
+    if (args[ARG_mosi].u_obj != mp_const_none) {
+        int mosi = mp_hal_get_pin_obj(args[ARG_mosi].u_obj);
+        if (!IS_VALID_MOSI(self->spi_id, mosi)) {
+            mp_raise_ValueError(MP_ERROR_TEXT("bad MOSI pin"));
+        }
+        self->mosi = mosi;
+    }
+    if (args[ARG_miso].u_obj != mp_const_none) {
+        int miso = mp_hal_get_pin_obj(args[ARG_miso].u_obj);
+        if (!IS_VALID_MISO(self->spi_id, miso)) {
+            mp_raise_ValueError(MP_ERROR_TEXT("bad MISO pin"));
+        }
+        self->miso = miso;
+    }
+
+    // Initialise the SPI peripheral if any arguments given, or it was not initialised previously.
+    if (n_args > 1 || n_kw > 0 || self->baudrate == 0) {
+        self->baudrate = args[ARG_baudrate].u_int;
+        self->polarity = args[ARG_polarity].u_int;
+        self->phase = args[ARG_phase].u_int;
+        self->bits = args[ARG_bits].u_int;
+        self->firstbit = args[ARG_firstbit].u_int;
+        if (self->firstbit == SPI_LSB_FIRST) {
+            mp_raise_NotImplementedError(MP_ERROR_TEXT("LSB"));
+        }
+
+        spi_init(self->spi_inst, self->baudrate);
+        self->baudrate = spi_set_baudrate(self->spi_inst, self->baudrate);
+        spi_set_format(self->spi_inst, self->bits, self->polarity, self->phase, self->firstbit);
+        gpio_set_function(self->sck, GPIO_FUNC_SPI);
+        gpio_set_function(self->miso, GPIO_FUNC_SPI);
+        gpio_set_function(self->mosi, GPIO_FUNC_SPI);
+    }
+
+    return MP_OBJ_FROM_PTR(self);
+}
+
+STATIC void machine_spi_init(mp_obj_base_t *self_in, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    enum { ARG_baudrate, ARG_polarity, ARG_phase, ARG_bits, ARG_firstbit };
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_baudrate, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} },
+        { MP_QSTR_polarity, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} },
+        { MP_QSTR_phase,    MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} },
+        { MP_QSTR_bits,     MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} },
+        { MP_QSTR_firstbit, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} },
+    };
+
+    // Parse the arguments.
+    machine_spi_obj_t *self = (machine_spi_obj_t *)self_in;
+    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
+    mp_arg_parse_all(n_args, pos_args, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
+
+    // Reconfigure the baudrate if requested.
+    if (args[ARG_baudrate].u_int != -1) {
+        self->baudrate = spi_set_baudrate(self->spi_inst, args[ARG_baudrate].u_int);
+    }
+
+    // Reconfigure the format if requested.
+    bool set_format = false;
+    if (args[ARG_polarity].u_int != -1) {
+        self->polarity = args[ARG_polarity].u_int;
+        set_format = true;
+    }
+    if (args[ARG_phase].u_int != -1) {
+        self->phase = args[ARG_phase].u_int;
+        set_format = true;
+    }
+    if (args[ARG_bits].u_int != -1) {
+        self->bits = args[ARG_bits].u_int;
+        set_format = true;
+    }
+    if (args[ARG_firstbit].u_int != -1) {
+        self->firstbit = args[ARG_firstbit].u_int;
+        if (self->firstbit == SPI_LSB_FIRST) {
+            mp_raise_NotImplementedError(MP_ERROR_TEXT("LSB"));
+        }
+    }
+    if (set_format) {
+        spi_set_format(self->spi_inst, self->bits, self->polarity, self->phase, self->firstbit);
+    }
+}
+
+STATIC void machine_spi_transfer(mp_obj_base_t *self_in, size_t len, const uint8_t *src, uint8_t *dest) {
+    machine_spi_obj_t *self = (machine_spi_obj_t *)self_in;
+    // Use DMA for large transfers if channels are available
+    const size_t dma_min_size_threshold = 32;
+    int chan_tx = -1;
+    int chan_rx = -1;
+    if (len >= dma_min_size_threshold) {
+        // Use two DMA channels to service the two FIFOs
+        chan_tx = dma_claim_unused_channel(false);
+        chan_rx = dma_claim_unused_channel(false);
+    }
+    bool use_dma = chan_rx >= 0 && chan_tx >= 0;
+    // note src is guaranteed to be non-NULL
+    bool write_only = dest == NULL;
+
+    if (use_dma) {
+        uint8_t dev_null;
+        dma_channel_config c = dma_channel_get_default_config(chan_tx);
+        channel_config_set_transfer_data_size(&c, DMA_SIZE_8);
+        channel_config_set_dreq(&c, spi_get_index(self->spi_inst) ? DREQ_SPI1_TX : DREQ_SPI0_TX);
+        dma_channel_configure(chan_tx, &c,
+            &spi_get_hw(self->spi_inst)->dr,
+            src,
+            len,
+            false);
+
+        c = dma_channel_get_default_config(chan_rx);
+        channel_config_set_transfer_data_size(&c, DMA_SIZE_8);
+        channel_config_set_dreq(&c, spi_get_index(self->spi_inst) ? DREQ_SPI1_RX : DREQ_SPI0_RX);
+        channel_config_set_read_increment(&c, false);
+        channel_config_set_write_increment(&c, !write_only);
+        dma_channel_configure(chan_rx, &c,
+            write_only ? &dev_null : dest,
+            &spi_get_hw(self->spi_inst)->dr,
+            len,
+            false);
+
+        dma_start_channel_mask((1u << chan_rx) | (1u << chan_tx));
+        dma_channel_wait_for_finish_blocking(chan_rx);
+        dma_channel_wait_for_finish_blocking(chan_tx);
+    }
+
+    // If we have claimed only one channel successfully, we should release immediately
+    if (chan_rx >= 0) {
+        dma_channel_unclaim(chan_rx);
+    }
+    if (chan_tx >= 0) {
+        dma_channel_unclaim(chan_tx);
+    }
+
+    if (!use_dma) {
+        // Use software for small transfers, or if couldn't claim two DMA channels
+        if (write_only) {
+            spi_write_blocking(self->spi_inst, src, len);
+        } else {
+            spi_write_read_blocking(self->spi_inst, src, dest, len);
+        }
+    }
+}
+
+STATIC const mp_machine_spi_p_t machine_spi_p = {
+    .init = machine_spi_init,
+    .transfer = machine_spi_transfer,
+};
+
+const mp_obj_type_t machine_spi_type = {
+    { &mp_type_type },
+    .name = MP_QSTR_SPI,
+    .print = machine_spi_print,
+    .make_new = machine_spi_make_new,
+    .protocol = &machine_spi_p,
+    .locals_dict = (mp_obj_dict_t *)&mp_machine_spi_locals_dict,
+};
diff --git a/ports/rp2/machine_timer.c b/ports/rp2/machine_timer.c
new file mode 100644
index 0000000000000..e7e8f02d5517c
--- /dev/null
+++ b/ports/rp2/machine_timer.c
@@ -0,0 +1,165 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020-2021 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "py/runtime.h"
+#include "py/mperrno.h"
+#include "py/mphal.h"
+#include "pico/time.h"
+
+#define ALARM_ID_INVALID (-1)
+#define TIMER_MODE_ONE_SHOT (0)
+#define TIMER_MODE_PERIODIC (1)
+
+typedef struct _machine_timer_obj_t {
+    mp_obj_base_t base;
+    struct alarm_pool *pool;
+    alarm_id_t alarm_id;
+    uint32_t mode;
+    uint64_t delta_us; // for periodic mode
+    mp_obj_t callback;
+} machine_timer_obj_t;
+
+const mp_obj_type_t machine_timer_type;
+
+STATIC int64_t alarm_callback(alarm_id_t id, void *user_data) {
+    machine_timer_obj_t *self = user_data;
+    mp_sched_schedule(self->callback, MP_OBJ_FROM_PTR(self));
+    if (self->mode == TIMER_MODE_ONE_SHOT) {
+        return 0;
+    } else {
+        return -self->delta_us;
+    }
+}
+
+STATIC void machine_timer_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+    machine_timer_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    qstr mode = self->mode == TIMER_MODE_ONE_SHOT ? MP_QSTR_ONE_SHOT : MP_QSTR_PERIODIC;
+    mp_printf(print, "Timer(mode=%q, period=%u, tick_hz=1000000)", mode, self->delta_us);
+}
+
+STATIC mp_obj_t machine_timer_init_helper(machine_timer_obj_t *self, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    enum { ARG_mode, ARG_callback, ARG_period, ARG_tick_hz, ARG_freq, };
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_mode,         MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = TIMER_MODE_PERIODIC} },
+        { MP_QSTR_callback,     MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
+        { MP_QSTR_period,       MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 0xffffffff} },
+        { MP_QSTR_tick_hz,      MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 1000} },
+        { MP_QSTR_freq,         MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
+    };
+
+    // Parse args
+    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
+    mp_arg_parse_all(n_args, pos_args, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
+
+    self->mode = args[ARG_mode].u_int;
+    if (args[ARG_freq].u_obj != mp_const_none) {
+        // Frequency specified in Hz
+        #if MICROPY_PY_BUILTINS_FLOAT
+        self->delta_us = (uint64_t)(MICROPY_FLOAT_CONST(1000000.0) / mp_obj_get_float(args[ARG_freq].u_obj));
+        #else
+        self->delta_us = 1000000 / mp_obj_get_int(args[ARG_freq].u_obj);
+        #endif
+    } else {
+        // Period specified
+        self->delta_us = (uint64_t)args[ARG_period].u_int * 1000000 / args[ARG_tick_hz].u_int;
+    }
+    if (self->delta_us < 1) {
+        self->delta_us = 1;
+    }
+
+    self->callback = args[ARG_callback].u_obj;
+    self->alarm_id = alarm_pool_add_alarm_in_us(self->pool, self->delta_us, alarm_callback, self, true);
+    if (self->alarm_id == -1) {
+        mp_raise_OSError(MP_ENOMEM);
+    }
+
+    return mp_const_none;
+}
+
+STATIC mp_obj_t machine_timer_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
+    machine_timer_obj_t *self = m_new_obj_with_finaliser(machine_timer_obj_t);
+    self->base.type = &machine_timer_type;
+    self->pool = alarm_pool_get_default();
+    self->alarm_id = ALARM_ID_INVALID;
+
+    // Get timer id (only soft timer (-1) supported at the moment)
+    mp_int_t id = -1;
+    if (n_args > 0) {
+        id = mp_obj_get_int(args[0]);
+        --n_args;
+        ++args;
+    }
+    if (id != -1) {
+        mp_raise_ValueError(MP_ERROR_TEXT("Timer doesn't exist"));
+    }
+
+    if (n_args > 0 || n_kw > 0) {
+        // Start the timer
+        mp_map_t kw_args;
+        mp_map_init_fixed_table(&kw_args, n_kw, args + n_args);
+        machine_timer_init_helper(self, n_args, args, &kw_args);
+    }
+
+    return MP_OBJ_FROM_PTR(self);
+}
+
+STATIC mp_obj_t machine_timer_init(size_t n_args, const mp_obj_t *args, mp_map_t *kw_args) {
+    machine_timer_obj_t *self = MP_OBJ_TO_PTR(args[0]);
+    if (self->alarm_id != ALARM_ID_INVALID) {
+        alarm_pool_cancel_alarm(self->pool, self->alarm_id);
+        self->alarm_id = ALARM_ID_INVALID;
+    }
+    return machine_timer_init_helper(self, n_args - 1, args + 1, kw_args);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_KW(machine_timer_init_obj, 1, machine_timer_init);
+
+STATIC mp_obj_t machine_timer_deinit(mp_obj_t self_in) {
+    machine_timer_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    if (self->alarm_id != ALARM_ID_INVALID) {
+        alarm_pool_cancel_alarm(self->pool, self->alarm_id);
+        self->alarm_id = ALARM_ID_INVALID;
+    }
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_timer_deinit_obj, machine_timer_deinit);
+
+STATIC const mp_rom_map_elem_t machine_timer_locals_dict_table[] = {
+    { MP_ROM_QSTR(MP_QSTR___del__), MP_ROM_PTR(&machine_timer_deinit_obj) },
+    { MP_ROM_QSTR(MP_QSTR_init), MP_ROM_PTR(&machine_timer_init_obj) },
+    { MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&machine_timer_deinit_obj) },
+
+    { MP_ROM_QSTR(MP_QSTR_ONE_SHOT), MP_ROM_INT(TIMER_MODE_ONE_SHOT) },
+    { MP_ROM_QSTR(MP_QSTR_PERIODIC), MP_ROM_INT(TIMER_MODE_PERIODIC) },
+};
+STATIC MP_DEFINE_CONST_DICT(machine_timer_locals_dict, machine_timer_locals_dict_table);
+
+const mp_obj_type_t machine_timer_type = {
+    { &mp_type_type },
+    .name = MP_QSTR_Timer,
+    .print = machine_timer_print,
+    .make_new = machine_timer_make_new,
+    .locals_dict = (mp_obj_dict_t *)&machine_timer_locals_dict,
+};
diff --git a/ports/rp2/machine_uart.c b/ports/rp2/machine_uart.c
new file mode 100644
index 0000000000000..30446e688de34
--- /dev/null
+++ b/ports/rp2/machine_uart.c
@@ -0,0 +1,246 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020-2021 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "py/runtime.h"
+#include "py/stream.h"
+#include "py/mphal.h"
+#include "py/mperrno.h"
+#include "modmachine.h"
+
+#include "hardware/uart.h"
+
+#define DEFAULT_UART_BAUDRATE (115200)
+#define DEFAULT_UART_BITS (8)
+#define DEFAULT_UART_STOP (1)
+#define DEFAULT_UART0_TX (0)
+#define DEFAULT_UART0_RX (1)
+#define DEFAULT_UART1_TX (4)
+#define DEFAULT_UART1_RX (5)
+
+#define IS_VALID_PERIPH(uart, pin)  (((((pin) + 4) & 8) >> 3) == (uart))
+#define IS_VALID_TX(uart, pin)      (((pin) & 3) == 0 && IS_VALID_PERIPH(uart, pin))
+#define IS_VALID_RX(uart, pin)      (((pin) & 3) == 1 && IS_VALID_PERIPH(uart, pin))
+
+typedef struct _machine_uart_obj_t {
+    mp_obj_base_t base;
+    uart_inst_t *const uart;
+    uint8_t uart_id;
+    uint32_t baudrate;
+    uint8_t bits;
+    uart_parity_t parity;
+    uint8_t stop;
+    uint8_t tx;
+    uint8_t rx;
+} machine_uart_obj_t;
+
+STATIC machine_uart_obj_t machine_uart_obj[] = {
+    {{&machine_uart_type}, uart0, 0, 0, DEFAULT_UART_BITS, UART_PARITY_NONE, DEFAULT_UART_STOP, DEFAULT_UART0_TX, DEFAULT_UART0_RX},
+    {{&machine_uart_type}, uart1, 1, 0, DEFAULT_UART_BITS, UART_PARITY_NONE, DEFAULT_UART_STOP, DEFAULT_UART1_TX, DEFAULT_UART1_RX},
+};
+
+STATIC const char *_parity_name[] = {"None", "0", "1"};
+
+/******************************************************************************/
+// MicroPython bindings for UART
+
+STATIC void machine_uart_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+    machine_uart_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    mp_printf(print, "UART(%u, baudrate=%u, bits=%u, parity=%s, stop=%u, tx=%d, rx=%d)",
+        self->uart_id, self->baudrate, self->bits, _parity_name[self->parity],
+        self->stop, self->tx, self->rx);
+}
+
+STATIC mp_obj_t machine_uart_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
+    enum { ARG_id, ARG_baudrate, ARG_bits, ARG_parity, ARG_stop, ARG_tx, ARG_rx };
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_id, MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
+        { MP_QSTR_baudrate, MP_ARG_INT, {.u_int = -1} },
+        { MP_QSTR_bits, MP_ARG_INT, {.u_int = -1} },
+        { MP_QSTR_parity, MP_ARG_OBJ, {.u_rom_obj = MP_ROM_INT(-1)} },
+        { MP_QSTR_stop, MP_ARG_INT, {.u_int = -1} },
+        { MP_QSTR_tx, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
+        { MP_QSTR_rx, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
+    };
+
+    // Parse args.
+    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
+    mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
+
+    // Get UART bus.
+    int uart_id = mp_obj_get_int(args[ARG_id].u_obj);
+    if (uart_id < 0 || uart_id >= MP_ARRAY_SIZE(machine_uart_obj)) {
+        mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("UART(%d) doesn't exist"), uart_id);
+    }
+
+    // Get static peripheral object.
+    machine_uart_obj_t *self = (machine_uart_obj_t *)&machine_uart_obj[uart_id];
+
+    // Set baudrate if configured.
+    if (args[ARG_baudrate].u_int > 0) {
+        self->baudrate = args[ARG_baudrate].u_int;
+    }
+
+    // Set bits if configured.
+    if (args[ARG_bits].u_int > 0) {
+        self->bits = args[ARG_bits].u_int;
+    }
+
+    // Set parity if configured.
+    if (args[ARG_parity].u_obj != MP_OBJ_NEW_SMALL_INT(-1)) {
+        if (args[ARG_parity].u_obj == mp_const_none) {
+            self->parity = UART_PARITY_NONE;
+        } else if (mp_obj_get_int(args[ARG_parity].u_obj) & 1) {
+            self->parity = UART_PARITY_ODD;
+        } else {
+            self->parity = UART_PARITY_EVEN;
+        }
+    }
+
+    // Set stop bits if configured.
+    if (args[ARG_stop].u_int > 0) {
+        self->stop = args[ARG_stop].u_int;
+    }
+
+    // Set TX/RX pins if configured.
+    if (args[ARG_tx].u_obj != mp_const_none) {
+        int tx = mp_hal_get_pin_obj(args[ARG_tx].u_obj);
+        if (!IS_VALID_TX(self->uart_id, tx)) {
+            mp_raise_ValueError(MP_ERROR_TEXT("bad TX pin"));
+        }
+        self->tx = tx;
+    }
+    if (args[ARG_rx].u_obj != mp_const_none) {
+        int rx = mp_hal_get_pin_obj(args[ARG_rx].u_obj);
+        if (!IS_VALID_RX(self->uart_id, rx)) {
+            mp_raise_ValueError(MP_ERROR_TEXT("bad RX pin"));
+        }
+        self->rx = rx;
+    }
+
+    // Initialise the UART peripheral if any arguments given, or it was not initialised previously.
+    if (n_args > 1 || n_kw > 0 || self->baudrate == 0) {
+        if (self->baudrate == 0) {
+            self->baudrate = DEFAULT_UART_BAUDRATE;
+        }
+        uart_init(self->uart, self->baudrate);
+        uart_set_format(self->uart, self->bits, self->stop, self->parity);
+        uart_set_fifo_enabled(self->uart, true);
+        gpio_set_function(self->tx, GPIO_FUNC_UART);
+        gpio_set_function(self->rx, GPIO_FUNC_UART);
+    }
+
+    return MP_OBJ_FROM_PTR(self);
+}
+
+STATIC mp_obj_t machine_uart_any(mp_obj_t self_in) {
+    machine_uart_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    return MP_OBJ_NEW_SMALL_INT(uart_is_readable(self->uart));
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_uart_any_obj, machine_uart_any);
+
+STATIC mp_obj_t machine_uart_sendbreak(mp_obj_t self_in) {
+    machine_uart_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    uart_set_break(self->uart, true);
+    mp_hal_delay_us(13000000 / self->baudrate + 1);
+    uart_set_break(self->uart, false);
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_uart_sendbreak_obj, machine_uart_sendbreak);
+
+STATIC const mp_rom_map_elem_t machine_uart_locals_dict_table[] = {
+    { MP_ROM_QSTR(MP_QSTR_any), MP_ROM_PTR(&machine_uart_any_obj) },
+
+    { MP_ROM_QSTR(MP_QSTR_read), MP_ROM_PTR(&mp_stream_read_obj) },
+    { MP_ROM_QSTR(MP_QSTR_readline), MP_ROM_PTR(&mp_stream_unbuffered_readline_obj) },
+    { MP_ROM_QSTR(MP_QSTR_readinto), MP_ROM_PTR(&mp_stream_readinto_obj) },
+    { MP_ROM_QSTR(MP_QSTR_write), MP_ROM_PTR(&mp_stream_write_obj) },
+
+    { MP_ROM_QSTR(MP_QSTR_sendbreak), MP_ROM_PTR(&machine_uart_sendbreak_obj) },
+};
+STATIC MP_DEFINE_CONST_DICT(machine_uart_locals_dict, machine_uart_locals_dict_table);
+
+STATIC mp_uint_t machine_uart_read(mp_obj_t self_in, void *buf_in, mp_uint_t size, int *errcode) {
+    machine_uart_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    // TODO support timeout
+    uint8_t *dest = buf_in;
+    for (size_t i = 0; i < size; ++i) {
+        while (!uart_is_readable(self->uart)) {
+            MICROPY_EVENT_POLL_HOOK
+        }
+        *dest++ = uart_get_hw(self->uart)->dr;
+    }
+    return size;
+}
+
+STATIC mp_uint_t machine_uart_write(mp_obj_t self_in, const void *buf_in, mp_uint_t size, int *errcode) {
+    machine_uart_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    // TODO support timeout
+    const uint8_t *src = buf_in;
+    for (size_t i = 0; i < size; ++i) {
+        while (!uart_is_writable(self->uart)) {
+            MICROPY_EVENT_POLL_HOOK
+        }
+        uart_get_hw(self->uart)->dr = *src++;
+    }
+    return size;
+}
+
+STATIC mp_uint_t machine_uart_ioctl(mp_obj_t self_in, mp_uint_t request, mp_uint_t arg, int *errcode) {
+    machine_uart_obj_t *self = self_in;
+    mp_uint_t ret;
+    if (request == MP_STREAM_POLL) {
+        uintptr_t flags = arg;
+        ret = 0;
+        if ((flags & MP_STREAM_POLL_RD) && uart_is_readable(self->uart)) {
+            ret |= MP_STREAM_POLL_RD;
+        }
+        if ((flags & MP_STREAM_POLL_WR) && uart_is_writable(self->uart)) {
+            ret |= MP_STREAM_POLL_WR;
+        }
+    } else {
+        *errcode = MP_EINVAL;
+        ret = MP_STREAM_ERROR;
+    }
+    return ret;
+}
+
+STATIC const mp_stream_p_t uart_stream_p = {
+    .read = machine_uart_read,
+    .write = machine_uart_write,
+    .ioctl = machine_uart_ioctl,
+    .is_text = false,
+};
+
+const mp_obj_type_t machine_uart_type = {
+    { &mp_type_type },
+    .name = MP_QSTR_UART,
+    .print = machine_uart_print,
+    .make_new = machine_uart_make_new,
+    .getiter = mp_identity_getiter,
+    .iternext = mp_stream_unbuffered_iter,
+    .protocol = &uart_stream_p,
+    .locals_dict = (mp_obj_dict_t *)&machine_uart_locals_dict,
+};
diff --git a/ports/rp2/machine_wdt.c b/ports/rp2/machine_wdt.c
new file mode 100644
index 0000000000000..38e0597018d64
--- /dev/null
+++ b/ports/rp2/machine_wdt.c
@@ -0,0 +1,78 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020-2021 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "py/runtime.h"
+#include "modmachine.h"
+
+#include "hardware/watchdog.h"
+
+typedef struct _machine_wdt_obj_t {
+    mp_obj_base_t base;
+} machine_wdt_obj_t;
+
+STATIC const machine_wdt_obj_t machine_wdt = {{&machine_wdt_type}};
+
+STATIC mp_obj_t machine_wdt_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
+    enum { ARG_id, ARG_timeout };
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_id, MP_ARG_INT, {.u_int = 0} },
+        { MP_QSTR_timeout, MP_ARG_INT, {.u_int = 5000} },
+    };
+
+    // Parse the arguments.
+    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
+    mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
+
+    // Verify the WDT id.
+    mp_int_t id = args[ARG_id].u_int;
+    if (id != 0) {
+        mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("WDT(%d) doesn't exist"), id);
+    }
+
+    // Start the watchdog (timeout is in milliseconds).
+    watchdog_enable(args[ARG_timeout].u_int, false);
+
+    return MP_OBJ_FROM_PTR(&machine_wdt);
+}
+
+STATIC mp_obj_t machine_wdt_feed(mp_obj_t self_in) {
+    (void)self_in;
+    watchdog_update();
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_wdt_feed_obj, machine_wdt_feed);
+
+STATIC const mp_rom_map_elem_t machine_wdt_locals_dict_table[] = {
+    { MP_ROM_QSTR(MP_QSTR_feed), MP_ROM_PTR(&machine_wdt_feed_obj) },
+};
+STATIC MP_DEFINE_CONST_DICT(machine_wdt_locals_dict, machine_wdt_locals_dict_table);
+
+const mp_obj_type_t machine_wdt_type = {
+    { &mp_type_type },
+    .name = MP_QSTR_WDT,
+    .make_new = machine_wdt_make_new,
+    .locals_dict = (mp_obj_dict_t *)&machine_wdt_locals_dict,
+};
diff --git a/ports/rp2/main.c b/ports/rp2/main.c
new file mode 100644
index 0000000000000..3e956ae78c4ad
--- /dev/null
+++ b/ports/rp2/main.c
@@ -0,0 +1,208 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020-2021 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include <stdio.h>
+
+#include "py/compile.h"
+#include "py/runtime.h"
+#include "py/gc.h"
+#include "py/mperrno.h"
+#include "py/stackctrl.h"
+#include "lib/mp-readline/readline.h"
+#include "lib/utils/gchelper.h"
+#include "lib/utils/pyexec.h"
+#include "tusb.h"
+#include "uart.h"
+#include "modmachine.h"
+#include "modrp2.h"
+#include "genhdr/mpversion.h"
+
+#include "pico/stdlib.h"
+#include "pico/binary_info.h"
+#include "hardware/rtc.h"
+#include "hardware/structs/rosc.h"
+
+extern uint8_t __StackTop, __StackBottom;
+static char gc_heap[192 * 1024];
+
+// Embed version info in the binary in machine readable form
+bi_decl(bi_program_version_string(MICROPY_GIT_TAG));
+
+// Add a section to the picotool output similar to program features, but for frozen modules
+// (it will aggregate BINARY_INFO_ID_MP_FROZEN binary info)
+bi_decl(bi_program_feature_group_with_flags(BINARY_INFO_TAG_MICROPYTHON,
+    BINARY_INFO_ID_MP_FROZEN, "frozen modules",
+    BI_NAMED_GROUP_SEPARATE_COMMAS | BI_NAMED_GROUP_SORT_ALPHA));
+
+int main(int argc, char **argv) {
+    #if MICROPY_HW_ENABLE_UART_REPL
+    bi_decl(bi_program_feature("UART REPL"))
+    setup_default_uart();
+    mp_uart_init();
+    #endif
+
+    #if MICROPY_HW_ENABLE_USBDEV
+    bi_decl(bi_program_feature("USB REPL"))
+    tusb_init();
+    #endif
+
+    #if MICROPY_PY_THREAD
+    bi_decl(bi_program_feature("thread support"))
+    mp_thread_init();
+    #endif
+
+    // Start and initialise the RTC
+    datetime_t t = {
+        .year = 2021,
+        .month = 1,
+        .day = 1,
+        .dotw = 5, // 0 is Sunday, so 5 is Friday
+        .hour = 0,
+        .min = 0,
+        .sec = 0,
+    };
+    rtc_init();
+    rtc_set_datetime(&t);
+
+    // Initialise stack extents and GC heap.
+    mp_stack_set_top(&__StackTop);
+    mp_stack_set_limit(&__StackTop - &__StackBottom - 256);
+    gc_init(&gc_heap[0], &gc_heap[MP_ARRAY_SIZE(gc_heap)]);
+
+    for (;;) {
+
+        // Initialise MicroPython runtime.
+        mp_init();
+        mp_obj_list_init(MP_OBJ_TO_PTR(mp_sys_path), 0);
+        mp_obj_list_append(mp_sys_path, MP_OBJ_NEW_QSTR(MP_QSTR_));
+        mp_obj_list_append(mp_sys_path, MP_OBJ_NEW_QSTR(MP_QSTR__slash_lib));
+        mp_obj_list_init(MP_OBJ_TO_PTR(mp_sys_argv), 0);
+
+        // Initialise sub-systems.
+        readline_init0();
+        machine_pin_init();
+        rp2_pio_init();
+
+        // Execute _boot.py to set up the filesystem.
+        pyexec_frozen_module("_boot.py");
+
+        // Execute user scripts.
+        pyexec_file_if_exists("boot.py");
+        if (pyexec_mode_kind == PYEXEC_MODE_FRIENDLY_REPL) {
+            pyexec_file_if_exists("main.py");
+        }
+
+        for (;;) {
+            if (pyexec_mode_kind == PYEXEC_MODE_RAW_REPL) {
+                if (pyexec_raw_repl() != 0) {
+                    break;
+                }
+            } else {
+                if (pyexec_friendly_repl() != 0) {
+                    break;
+                }
+            }
+        }
+
+        mp_printf(MP_PYTHON_PRINTER, "MPY: soft reboot\n");
+        rp2_pio_deinit();
+        machine_pin_deinit();
+        gc_sweep_all();
+        mp_deinit();
+    }
+
+    return 0;
+}
+
+void gc_collect(void) {
+    gc_collect_start();
+    gc_helper_collect_regs_and_stack();
+    #if MICROPY_PY_THREAD
+    mp_thread_gc_others();
+    #endif
+    gc_collect_end();
+}
+
+void nlr_jump_fail(void *val) {
+    printf("FATAL: uncaught exception %p\n", val);
+    mp_obj_print_exception(&mp_plat_print, MP_OBJ_FROM_PTR(val));
+    for (;;) {
+        __breakpoint();
+    }
+}
+
+#ifndef NDEBUG
+void MP_WEAK __assert_func(const char *file, int line, const char *func, const char *expr) {
+    printf("Assertion '%s' failed, at file %s:%d\n", expr, file, line);
+    panic("Assertion failed");
+}
+#endif
+
+uint32_t rosc_random_u32(void) {
+    uint32_t value = 0;
+    for (size_t i = 0; i < 32; ++i) {
+        value = value << 1 | rosc_hw->randombit;
+    }
+    return value;
+}
+
+const char rp2_help_text[] =
+    "Welcome to MicroPython!\n"
+    "\n"
+    "For online help please visit https://micropython.org/help/.\n"
+    "\n"
+    "For access to the hardware use the 'machine' module.  RP2 specific commands\n"
+    "are in the 'rp2' module.\n"
+    "\n"
+    "Quick overview of some objects:\n"
+    "  machine.Pin(pin) -- get a pin, eg machine.Pin(0)\n"
+    "  machine.Pin(pin, m, [p]) -- get a pin and configure it for IO mode m, pull mode p\n"
+    "    methods: init(..), value([v]), high(), low(), irq(handler)\n"
+    "  machine.ADC(pin) -- make an analog object from a pin\n"
+    "    methods: read_u16()\n"
+    "  machine.PWM(pin) -- make a PWM object from a pin\n"
+    "    methods: deinit(), freq([f]), duty_u16([d]), duty_ns([d])\n"
+    "  machine.I2C(id) -- create an I2C object (id=0,1)\n"
+    "    methods: readfrom(addr, buf, stop=True), writeto(addr, buf, stop=True)\n"
+    "             readfrom_mem(addr, memaddr, arg), writeto_mem(addr, memaddr, arg)\n"
+    "  machine.SPI(id, baudrate=1000000) -- create an SPI object (id=0,1)\n"
+    "    methods: read(nbytes, write=0x00), write(buf), write_readinto(wr_buf, rd_buf)\n"
+    "  machine.Timer(freq, callback) -- create a software timer object\n"
+    "    eg: machine.Timer(freq=1, callback=lambda t:print(t))\n"
+    "\n"
+    "Pins are numbered 0-29, and 26-29 have ADC capabilities\n"
+    "Pin IO modes are: Pin.IN, Pin.OUT, Pin.ALT\n"
+    "Pin pull modes are: Pin.PULL_UP, Pin.PULL_DOWN\n"
+    "\n"
+    "Useful control commands:\n"
+    "  CTRL-C -- interrupt a running program\n"
+    "  CTRL-D -- on a blank line, do a soft reset of the board\n"
+    "  CTRL-E -- on a blank line, enter paste mode\n"
+    "\n"
+    "For further help on a specific object, type help(obj)\n"
+    "For a list of available modules, type help('modules')\n"
+;
+
diff --git a/ports/rp2/manifest.py b/ports/rp2/manifest.py
new file mode 100644
index 0000000000000..a56d4b1b0923b
--- /dev/null
+++ b/ports/rp2/manifest.py
@@ -0,0 +1,3 @@
+freeze("modules")
+freeze("$(MPY_DIR)/drivers/onewire")
+include("$(MPY_DIR)/extmod/uasyncio/manifest.py")
diff --git a/ports/rp2/memmap_mp.ld b/ports/rp2/memmap_mp.ld
new file mode 100644
index 0000000000000..5cebd33466a49
--- /dev/null
+++ b/ports/rp2/memmap_mp.ld
@@ -0,0 +1,252 @@
+/* Based on GCC ARM embedded samples.
+   Defines the following symbols for use by code:
+    __exidx_start
+    __exidx_end
+    __etext
+    __data_start__
+    __preinit_array_start
+    __preinit_array_end
+    __init_array_start
+    __init_array_end
+    __fini_array_start
+    __fini_array_end
+    __data_end__
+    __bss_start__
+    __bss_end__
+    __end__
+    end
+    __HeapLimit
+    __StackLimit
+    __StackTop
+    __stack (== StackTop)
+*/
+
+MEMORY
+{
+    FLASH(rx) : ORIGIN = 0x10000000, LENGTH = 2048k
+    RAM(rwx) : ORIGIN =  0x20000000, LENGTH = 256k
+    SCRATCH_X(rwx) : ORIGIN = 0x20040000, LENGTH = 4k
+    SCRATCH_Y(rwx) : ORIGIN = 0x20041000, LENGTH = 4k
+}
+
+ENTRY(_entry_point)
+
+SECTIONS
+{
+    /* Second stage bootloader is prepended to the image. It must be 256 bytes big
+       and checksummed. It is usually built by the boot_stage2 target
+       in the Pico SDK
+    */
+
+    .flash_begin : {
+        __flash_binary_start = .;
+    } > FLASH
+
+    .boot2 : {
+        __boot2_start__ = .;
+        KEEP (*(.boot2))
+        __boot2_end__ = .;
+    } > FLASH
+
+    ASSERT(__boot2_end__ - __boot2_start__ == 256,
+        "ERROR: Pico second stage bootloader must be 256 bytes in size")
+
+    /* The second stage will always enter the image at the start of .text.
+       The debugger will use the ELF entry point, which is the _entry_point
+       symbol if present, otherwise defaults to start of .text.
+       This can be used to transfer control back to the bootrom on debugger
+       launches only, to perform proper flash setup.
+    */
+
+    .text : {
+        __reset_start = .;
+        KEEP (*(.reset))
+        . = ALIGN(256);
+        __reset_end = .;
+        ASSERT(__reset_end - __reset_start == 256, "ERROR: reset section should only be 256 bytes");
+        KEEP (*(.vectors))
+        /* TODO revisit this now memset/memcpy/float in ROM */
+        /* bit of a hack right now to exclude all floating point and time critical (e.g. memset, memcpy) code from
+         * FLASH ... we will include any thing excluded here in .data below by default */
+        *(.init)
+        /* Change for MicroPython... excluse gc.c, parse.c, vm.c from flash */
+        *(EXCLUDE_FILE(*libgcc.a: *libc.a: *lib_a-mem*.o *libm.a: *gc.c.obj *vm.c.obj *parse.c.obj) .text*)
+        *(.fini)
+        /* Pull all c'tors into .text */
+        *crtbegin.o(.ctors)
+        *crtbegin?.o(.ctors)
+        *(EXCLUDE_FILE(*crtend?.o *crtend.o) .ctors)
+        *(SORT(.ctors.*))
+        *(.ctors)
+        /* Followed by destructors */
+        *crtbegin.o(.dtors)
+        *crtbegin?.o(.dtors)
+        *(EXCLUDE_FILE(*crtend?.o *crtend.o) .dtors)
+        *(SORT(.dtors.*))
+        *(.dtors)
+
+        *(.eh_frame*)
+        . = ALIGN(4);
+    } > FLASH
+
+    .rodata : {
+        *(EXCLUDE_FILE(*libgcc.a: *libc.a:*lib_a-mem*.o *libm.a:) .rodata*)
+        . = ALIGN(4);
+        *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.flashdata*)))
+        . = ALIGN(4);
+    } > FLASH
+
+    .ARM.extab :
+    {
+        *(.ARM.extab* .gnu.linkonce.armextab.*)
+    } > FLASH
+
+    __exidx_start = .;
+    .ARM.exidx :
+    {
+        *(.ARM.exidx* .gnu.linkonce.armexidx.*)
+    } > FLASH
+    __exidx_end = .;
+
+    /* Machine inspectable binary information */
+    . = ALIGN(4);
+    __binary_info_start = .;
+    .binary_info :
+    {
+        KEEP(*(.binary_info.keep.*))
+        *(.binary_info.*)
+    } > FLASH
+    __binary_info_end = .;
+    . = ALIGN(4);
+
+    /* End of .text-like segments */
+    __etext = .;
+
+   .ram_vector_table (COPY): {
+        *(.ram_vector_table)
+    } > RAM
+
+    .data : {
+        __data_start__ = .;
+        *(vtable)
+
+        *(.time_critical*)
+
+        /* remaining .text and .rodata; i.e. stuff we exclude above because we want it in RAM */
+        *(.text*)
+        . = ALIGN(4);
+        *(.rodata*)
+        . = ALIGN(4);
+
+        *(.data*)
+
+        . = ALIGN(4);
+        *(.after_data.*)
+        . = ALIGN(4);
+        /* preinit data */
+        PROVIDE_HIDDEN (__mutex_array_start = .);
+        KEEP(*(SORT(.mutex_array.*)))
+        KEEP(*(.mutex_array))
+        PROVIDE_HIDDEN (__mutex_array_end = .);
+
+        . = ALIGN(4);
+        /* preinit data */
+        PROVIDE_HIDDEN (__preinit_array_start = .);
+        KEEP(*(SORT(.preinit_array.*)))
+        KEEP(*(.preinit_array))
+        PROVIDE_HIDDEN (__preinit_array_end = .);
+
+        . = ALIGN(4);
+        /* init data */
+        PROVIDE_HIDDEN (__init_array_start = .);
+        KEEP(*(SORT(.init_array.*)))
+        KEEP(*(.init_array))
+        PROVIDE_HIDDEN (__init_array_end = .);
+
+        . = ALIGN(4);
+        /* finit data */
+        PROVIDE_HIDDEN (__fini_array_start = .);
+        *(SORT(.fini_array.*))
+        *(.fini_array)
+        PROVIDE_HIDDEN (__fini_array_end = .);
+
+        *(.jcr)
+        . = ALIGN(4);
+        /* All data end */
+        __data_end__ = .;
+    } > RAM AT> FLASH
+
+    .uninitialized_data (COPY): {
+        . = ALIGN(4);
+        *(.uninitialized_data*)
+    } > RAM
+
+    /* Start and end symbols must be word-aligned */
+    .scratch_x : {
+        __scratch_x_start__ = .;
+        *(.scratch_x.*)
+        . = ALIGN(4);
+        __scratch_x_end__ = .;
+    } > SCRATCH_X AT > FLASH
+    __scratch_x_source__ = LOADADDR(.scratch_x);
+
+    .scratch_y : {
+        __scratch_y_start__ = .;
+        *(.scratch_y.*)
+        . = ALIGN(4);
+        __scratch_y_end__ = .;
+    } > SCRATCH_Y AT > FLASH
+    __scratch_y_source__ = LOADADDR(.scratch_y);
+
+    .bss  : {
+        . = ALIGN(4);
+        __bss_start__ = .;
+        *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.bss*)))
+        *(COMMON)
+        . = ALIGN(4);
+        __bss_end__ = .;
+    } > RAM
+
+    .heap (COPY):
+    {
+        __end__ = .;
+        end = __end__;
+        *(.heap*)
+        __HeapLimit = .;
+    } > RAM
+
+    /* .stack*_dummy section doesn't contains any symbols. It is only
+     * used for linker to calculate size of stack sections, and assign
+     * values to stack symbols later
+     *
+     * stack1 section may be empty/missing if platform_launch_core1 is not used */
+
+    /* by default we put core 0 stack at the end of scratch Y, so that if core 1
+     * stack is not used then all of SCRATCH_X is free.
+     */
+    .stack1_dummy (COPY):
+    {
+        *(.stack1*)
+    } > SCRATCH_X
+    .stack_dummy (COPY):
+    {
+        *(.stack*)
+    } > SCRATCH_Y
+
+    .flash_end : {
+        __flash_binary_end = .;
+    } > FLASH
+
+    /* stack limit is poorly named, but historically is maximum heap ptr */
+    __StackLimit = ORIGIN(RAM) + LENGTH(RAM);
+    __StackOneTop = ORIGIN(SCRATCH_X) + LENGTH(SCRATCH_X);
+    __StackTop = ORIGIN(SCRATCH_Y) + LENGTH(SCRATCH_Y);
+    __StackOneBottom = __StackOneTop - SIZEOF(.stack1_dummy);
+    __StackBottom = __StackTop - SIZEOF(.stack_dummy);
+    PROVIDE(__stack = __StackTop);
+
+    /* Check if data + heap + stack exceeds RAM limit */
+    ASSERT(__StackLimit >= __HeapLimit, "region RAM overflowed")
+    /* todo assert on extra code */
+}
+
diff --git a/ports/rp2/micropy_extmod.cmake b/ports/rp2/micropy_extmod.cmake
new file mode 100644
index 0000000000000..1e968bef637fd
--- /dev/null
+++ b/ports/rp2/micropy_extmod.cmake
@@ -0,0 +1,40 @@
+# CMake fragment for MicroPython extmod component
+
+set(SOURCE_EXTMOD
+    ${MPY_DIR}/extmod/machine_i2c.c
+    ${MPY_DIR}/extmod/machine_mem.c
+    ${MPY_DIR}/extmod/machine_pulse.c
+    ${MPY_DIR}/extmod/machine_signal.c
+    ${MPY_DIR}/extmod/machine_spi.c
+    ${MPY_DIR}/extmod/modbtree.c
+    ${MPY_DIR}/extmod/modframebuf.c
+    ${MPY_DIR}/extmod/modonewire.c
+    ${MPY_DIR}/extmod/moduasyncio.c
+    ${MPY_DIR}/extmod/modubinascii.c
+    ${MPY_DIR}/extmod/moducryptolib.c
+    ${MPY_DIR}/extmod/moductypes.c
+    ${MPY_DIR}/extmod/moduhashlib.c
+    ${MPY_DIR}/extmod/moduheapq.c
+    ${MPY_DIR}/extmod/modujson.c
+    ${MPY_DIR}/extmod/modurandom.c
+    ${MPY_DIR}/extmod/modure.c
+    ${MPY_DIR}/extmod/moduselect.c
+    ${MPY_DIR}/extmod/modussl_axtls.c
+    ${MPY_DIR}/extmod/modussl_mbedtls.c
+    ${MPY_DIR}/extmod/modutimeq.c
+    ${MPY_DIR}/extmod/moduwebsocket.c
+    ${MPY_DIR}/extmod/moduzlib.c
+    ${MPY_DIR}/extmod/modwebrepl.c
+    ${MPY_DIR}/extmod/uos_dupterm.c
+    ${MPY_DIR}/extmod/utime_mphal.c
+    ${MPY_DIR}/extmod/vfs.c
+    ${MPY_DIR}/extmod/vfs_blockdev.c
+    ${MPY_DIR}/extmod/vfs_fat.c
+    ${MPY_DIR}/extmod/vfs_fat_diskio.c
+    ${MPY_DIR}/extmod/vfs_fat_file.c
+    ${MPY_DIR}/extmod/vfs_lfs.c
+    ${MPY_DIR}/extmod/vfs_posix.c
+    ${MPY_DIR}/extmod/vfs_posix_file.c
+    ${MPY_DIR}/extmod/vfs_reader.c
+    ${MPY_DIR}/extmod/virtpin.c
+)
diff --git a/ports/rp2/micropy_py.cmake b/ports/rp2/micropy_py.cmake
new file mode 100644
index 0000000000000..aeb7e2b9b5aa7
--- /dev/null
+++ b/ports/rp2/micropy_py.cmake
@@ -0,0 +1,134 @@
+# CMake fragment for MicroPython core py component
+
+set(MPY_PY_DIR "${MPY_DIR}/py")
+set(MPY_PY_QSTRDEFS "${MPY_PY_DIR}/qstrdefs.h")
+set(MPY_GENHDR_DIR "${CMAKE_BINARY_DIR}/genhdr")
+set(MPY_MPVERSION "${MPY_GENHDR_DIR}/mpversion.h")
+set(MPY_MODULEDEFS "${MPY_GENHDR_DIR}/moduledefs.h")
+set(MPY_QSTR_DEFS_LAST "${MPY_GENHDR_DIR}/qstr.i.last")
+set(MPY_QSTR_DEFS_SPLIT "${MPY_GENHDR_DIR}/qstr.split")
+set(MPY_QSTR_DEFS_COLLECTED "${MPY_GENHDR_DIR}/qstrdefs.collected.h")
+set(MPY_QSTR_DEFS_PREPROCESSED "${MPY_GENHDR_DIR}/qstrdefs.preprocessed.h")
+set(MPY_QSTR_DEFS_GENERATED "${MPY_GENHDR_DIR}/qstrdefs.generated.h")
+set(MPY_FROZEN_CONTENT "${CMAKE_BINARY_DIR}/frozen_content.c")
+
+# All py/ source files
+set(SOURCE_PY
+    ${MPY_PY_DIR}/argcheck.c
+    ${MPY_PY_DIR}/asmarm.c
+    ${MPY_PY_DIR}/asmbase.c
+    ${MPY_PY_DIR}/asmthumb.c
+    ${MPY_PY_DIR}/asmx64.c
+    ${MPY_PY_DIR}/asmx86.c
+    ${MPY_PY_DIR}/asmxtensa.c
+    ${MPY_PY_DIR}/bc.c
+    ${MPY_PY_DIR}/binary.c
+    ${MPY_PY_DIR}/builtinevex.c
+    ${MPY_PY_DIR}/builtinhelp.c
+    ${MPY_PY_DIR}/builtinimport.c
+    ${MPY_PY_DIR}/compile.c
+    ${MPY_PY_DIR}/emitbc.c
+    ${MPY_PY_DIR}/emitcommon.c
+    ${MPY_PY_DIR}/emitglue.c
+    ${MPY_PY_DIR}/emitinlinethumb.c
+    ${MPY_PY_DIR}/emitinlinextensa.c
+    ${MPY_PY_DIR}/emitnarm.c
+    ${MPY_PY_DIR}/emitnthumb.c
+    ${MPY_PY_DIR}/emitnx64.c
+    ${MPY_PY_DIR}/emitnx86.c
+    ${MPY_PY_DIR}/emitnxtensa.c
+    ${MPY_PY_DIR}/emitnxtensawin.c
+    ${MPY_PY_DIR}/formatfloat.c
+    ${MPY_PY_DIR}/frozenmod.c
+    ${MPY_PY_DIR}/gc.c
+    ${MPY_PY_DIR}/lexer.c
+    ${MPY_PY_DIR}/malloc.c
+    ${MPY_PY_DIR}/map.c
+    ${MPY_PY_DIR}/modarray.c
+    ${MPY_PY_DIR}/modbuiltins.c
+    ${MPY_PY_DIR}/modcmath.c
+    ${MPY_PY_DIR}/modcollections.c
+    ${MPY_PY_DIR}/modgc.c
+    ${MPY_PY_DIR}/modio.c
+    ${MPY_PY_DIR}/modmath.c
+    ${MPY_PY_DIR}/modmicropython.c
+    ${MPY_PY_DIR}/modstruct.c
+    ${MPY_PY_DIR}/modsys.c
+    ${MPY_PY_DIR}/modthread.c
+    ${MPY_PY_DIR}/moduerrno.c
+    ${MPY_PY_DIR}/mpprint.c
+    ${MPY_PY_DIR}/mpstate.c
+    ${MPY_PY_DIR}/mpz.c
+    ${MPY_PY_DIR}/nativeglue.c
+    ${MPY_PY_DIR}/nlr.c
+    ${MPY_PY_DIR}/nlrpowerpc.c
+    ${MPY_PY_DIR}/nlrsetjmp.c
+    ${MPY_PY_DIR}/nlrthumb.c
+    ${MPY_PY_DIR}/nlrx64.c
+    ${MPY_PY_DIR}/nlrx86.c
+    ${MPY_PY_DIR}/nlrxtensa.c
+    ${MPY_PY_DIR}/obj.c
+    ${MPY_PY_DIR}/objarray.c
+    ${MPY_PY_DIR}/objattrtuple.c
+    ${MPY_PY_DIR}/objbool.c
+    ${MPY_PY_DIR}/objboundmeth.c
+    ${MPY_PY_DIR}/objcell.c
+    ${MPY_PY_DIR}/objclosure.c
+    ${MPY_PY_DIR}/objcomplex.c
+    ${MPY_PY_DIR}/objdeque.c
+    ${MPY_PY_DIR}/objdict.c
+    ${MPY_PY_DIR}/objenumerate.c
+    ${MPY_PY_DIR}/objexcept.c
+    ${MPY_PY_DIR}/objfilter.c
+    ${MPY_PY_DIR}/objfloat.c
+    ${MPY_PY_DIR}/objfun.c
+    ${MPY_PY_DIR}/objgenerator.c
+    ${MPY_PY_DIR}/objgetitemiter.c
+    ${MPY_PY_DIR}/objint.c
+    ${MPY_PY_DIR}/objint_longlong.c
+    ${MPY_PY_DIR}/objint_mpz.c
+    ${MPY_PY_DIR}/objlist.c
+    ${MPY_PY_DIR}/objmap.c
+    ${MPY_PY_DIR}/objmodule.c
+    ${MPY_PY_DIR}/objnamedtuple.c
+    ${MPY_PY_DIR}/objnone.c
+    ${MPY_PY_DIR}/objobject.c
+    ${MPY_PY_DIR}/objpolyiter.c
+    ${MPY_PY_DIR}/objproperty.c
+    ${MPY_PY_DIR}/objrange.c
+    ${MPY_PY_DIR}/objreversed.c
+    ${MPY_PY_DIR}/objset.c
+    ${MPY_PY_DIR}/objsingleton.c
+    ${MPY_PY_DIR}/objslice.c
+    ${MPY_PY_DIR}/objstr.c
+    ${MPY_PY_DIR}/objstringio.c
+    ${MPY_PY_DIR}/objstrunicode.c
+    ${MPY_PY_DIR}/objtuple.c
+    ${MPY_PY_DIR}/objtype.c
+    ${MPY_PY_DIR}/objzip.c
+    ${MPY_PY_DIR}/opmethods.c
+    ${MPY_PY_DIR}/pairheap.c
+    ${MPY_PY_DIR}/parse.c
+    ${MPY_PY_DIR}/parsenum.c
+    ${MPY_PY_DIR}/parsenumbase.c
+    ${MPY_PY_DIR}/persistentcode.c
+    ${MPY_PY_DIR}/profile.c
+    ${MPY_PY_DIR}/pystack.c
+    ${MPY_PY_DIR}/qstr.c
+    ${MPY_PY_DIR}/reader.c
+    ${MPY_PY_DIR}/repl.c
+    ${MPY_PY_DIR}/ringbuf.c
+    ${MPY_PY_DIR}/runtime.c
+    ${MPY_PY_DIR}/runtime_utils.c
+    ${MPY_PY_DIR}/scheduler.c
+    ${MPY_PY_DIR}/scope.c
+    ${MPY_PY_DIR}/sequence.c
+    ${MPY_PY_DIR}/showbc.c
+    ${MPY_PY_DIR}/smallint.c
+    ${MPY_PY_DIR}/stackctrl.c
+    ${MPY_PY_DIR}/stream.c
+    ${MPY_PY_DIR}/unicode.c
+    ${MPY_PY_DIR}/vm.c
+    ${MPY_PY_DIR}/vstr.c
+    ${MPY_PY_DIR}/warning.c
+)
diff --git a/ports/rp2/micropy_rules.cmake b/ports/rp2/micropy_rules.cmake
new file mode 100644
index 0000000000000..ade9b8c92d5cc
--- /dev/null
+++ b/ports/rp2/micropy_rules.cmake
@@ -0,0 +1,91 @@
+# CMake fragment for MicroPython rules
+
+target_sources(${MICROPYTHON_TARGET} PRIVATE
+    ${MPY_MPVERSION}
+    ${MPY_QSTR_DEFS_GENERATED}
+    ${MPY_FROZEN_CONTENT}
+)
+
+# Command to force the build of another command
+
+add_custom_command(
+    OUTPUT FORCE_BUILD
+    COMMENT ""
+    COMMAND echo -n
+)
+
+# Generate mpversion.h
+
+add_custom_command(
+    OUTPUT ${MPY_MPVERSION}
+    COMMAND ${CMAKE_COMMAND} -E make_directory ${MPY_GENHDR_DIR}
+    COMMAND python3 ${MPY_DIR}/py/makeversionhdr.py ${MPY_MPVERSION}
+    DEPENDS FORCE_BUILD
+)
+
+# Generate moduledefs.h
+# This is currently hard-coded to support modarray.c only, because makemoduledefs.py doesn't support absolute paths
+
+add_custom_command(
+    OUTPUT ${MPY_MODULEDEFS}
+    COMMAND python3 ${MPY_PY_DIR}/makemoduledefs.py --vpath="." ../../../py/modarray.c > ${MPY_MODULEDEFS}
+    DEPENDS ${MPY_MPVERSION}
+        ${SOURCE_QSTR}
+)
+
+# Generate qstrs
+
+# If any of the dependencies in this rule change then the C-preprocessor step must be run.
+# It only needs to be passed the list of SOURCE_QSTR files that have changed since it was
+# last run, but it looks like it's not possible to specify that with cmake.
+add_custom_command(
+    OUTPUT ${MPY_QSTR_DEFS_LAST}
+    COMMAND ${CMAKE_C_COMPILER} -E \$\(C_INCLUDES\) \$\(C_FLAGS\) -DNO_QSTR ${SOURCE_QSTR} > ${MPY_GENHDR_DIR}/qstr.i.last
+    DEPENDS ${MPY_MODULEDEFS}
+        ${SOURCE_QSTR}
+    VERBATIM
+)
+
+add_custom_command(
+    OUTPUT ${MPY_QSTR_DEFS_SPLIT}
+    COMMAND python3 ${MPY_DIR}/py/makeqstrdefs.py split qstr ${MPY_GENHDR_DIR}/qstr.i.last ${MPY_GENHDR_DIR}/qstr _
+    COMMAND touch ${MPY_QSTR_DEFS_SPLIT}
+    DEPENDS ${MPY_QSTR_DEFS_LAST}
+    VERBATIM
+)
+
+add_custom_command(
+    OUTPUT ${MPY_QSTR_DEFS_COLLECTED}
+    COMMAND python3 ${MPY_DIR}/py/makeqstrdefs.py cat qstr _ ${MPY_GENHDR_DIR}/qstr ${MPY_QSTR_DEFS_COLLECTED}
+    DEPENDS ${MPY_QSTR_DEFS_SPLIT}
+    VERBATIM
+)
+
+add_custom_command(
+    OUTPUT ${MPY_QSTR_DEFS_PREPROCESSED}
+    COMMAND cat ${MPY_PY_QSTRDEFS} ${MPY_QSTR_DEFS} ${MPY_QSTR_DEFS_COLLECTED} | sed "s/^Q(.*)/\"&\"/" | ${CMAKE_C_COMPILER} -E \$\(C_INCLUDES\) \$\(C_FLAGS\) - | sed "s/^\\\"\\(Q(.*)\\)\\\"/\\1/" > ${MPY_QSTR_DEFS_PREPROCESSED}
+    DEPENDS ${MPY_PY_QSTRDEFS} ${MPY_QSTR_DEFS} ${MPY_QSTR_DEFS_COLLECTED}
+    VERBATIM
+)
+
+add_custom_command(
+    OUTPUT ${MPY_QSTR_DEFS_GENERATED}
+    COMMAND python3 ${MPY_PY_DIR}/makeqstrdata.py ${MPY_QSTR_DEFS_PREPROCESSED} > ${MPY_QSTR_DEFS_GENERATED}
+    DEPENDS ${MPY_QSTR_DEFS_PREPROCESSED}
+    VERBATIM
+)
+
+# Build frozen code
+
+target_compile_options(${MICROPYTHON_TARGET} PUBLIC
+    -DMICROPY_QSTR_EXTRA_POOL=mp_qstr_frozen_const_pool
+    -DMICROPY_MODULE_FROZEN_MPY=\(1\)
+)
+
+add_custom_command(
+    OUTPUT ${MPY_FROZEN_CONTENT}
+    COMMAND python3 ${MPY_DIR}/tools/makemanifest.py -o ${MPY_FROZEN_CONTENT} -v "MPY_DIR=${MPY_DIR}" -v "PORT_DIR=${PROJECT_SOURCE_DIR}" -b "${CMAKE_BINARY_DIR}" -f${MPY_CROSS_FLAGS} ${FROZEN_MANIFEST}
+    DEPENDS FORCE_BUILD
+        ${MPY_QSTR_DEFS_GENERATED}
+    VERBATIM
+)
diff --git a/ports/rp2/modmachine.c b/ports/rp2/modmachine.c
new file mode 100644
index 0000000000000..228e9543c1936
--- /dev/null
+++ b/ports/rp2/modmachine.c
@@ -0,0 +1,101 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020-2021 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "py/runtime.h"
+#include "py/mphal.h"
+#include "extmod/machine_i2c.h"
+#include "extmod/machine_mem.h"
+#include "extmod/machine_spi.h"
+
+#include "modmachine.h"
+#include "hardware/clocks.h"
+#include "hardware/watchdog.h"
+#include "pico/bootrom.h"
+
+#define RP2_RESET_PWRON (1)
+#define RP2_RESET_WDT (3)
+
+STATIC mp_obj_t machine_reset(void) {
+    watchdog_reboot(0, SRAM_END, 0);
+    for (;;) {
+        __wfi();
+    }
+    return mp_const_none;
+}
+MP_DEFINE_CONST_FUN_OBJ_0(machine_reset_obj, machine_reset);
+
+STATIC mp_obj_t machine_reset_cause(void) {
+    int reset_cause;
+    if (watchdog_caused_reboot()) {
+        reset_cause = RP2_RESET_WDT;
+    } else {
+        reset_cause = RP2_RESET_PWRON;
+    }
+    return MP_OBJ_NEW_SMALL_INT(reset_cause);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(machine_reset_cause_obj, machine_reset_cause);
+
+STATIC mp_obj_t machine_bootloader(void) {
+    reset_usb_boot(0, 0);
+    return mp_const_none;
+}
+MP_DEFINE_CONST_FUN_OBJ_0(machine_bootloader_obj, machine_bootloader);
+
+STATIC mp_obj_t machine_freq(void) {
+    return MP_OBJ_NEW_SMALL_INT(clock_get_hz(clk_sys));
+}
+MP_DEFINE_CONST_FUN_OBJ_0(machine_freq_obj, machine_freq);
+
+STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
+    { MP_ROM_QSTR(MP_QSTR___name__),            MP_ROM_QSTR(MP_QSTR_umachine) },
+    { MP_ROM_QSTR(MP_QSTR_reset),               MP_ROM_PTR(&machine_reset_obj) },
+    { MP_ROM_QSTR(MP_QSTR_reset_cause),         MP_ROM_PTR(&machine_reset_cause_obj) },
+    { MP_ROM_QSTR(MP_QSTR_bootloader),          MP_ROM_PTR(&machine_bootloader_obj) },
+    { MP_ROM_QSTR(MP_QSTR_freq),                MP_ROM_PTR(&machine_freq_obj) },
+    { MP_ROM_QSTR(MP_QSTR_mem8),                MP_ROM_PTR(&machine_mem8_obj) },
+    { MP_ROM_QSTR(MP_QSTR_mem16),               MP_ROM_PTR(&machine_mem16_obj) },
+    { MP_ROM_QSTR(MP_QSTR_mem32),               MP_ROM_PTR(&machine_mem32_obj) },
+
+    { MP_ROM_QSTR(MP_QSTR_ADC),                 MP_ROM_PTR(&machine_adc_type) },
+    { MP_ROM_QSTR(MP_QSTR_I2C),                 MP_ROM_PTR(&machine_hw_i2c_type) },
+    { MP_ROM_QSTR(MP_QSTR_SoftI2C),             MP_ROM_PTR(&mp_machine_soft_i2c_type) },
+    { MP_ROM_QSTR(MP_QSTR_Pin),                 MP_ROM_PTR(&machine_pin_type) },
+    { MP_ROM_QSTR(MP_QSTR_PWM),                 MP_ROM_PTR(&machine_pwm_type) },
+    { MP_ROM_QSTR(MP_QSTR_SPI),                 MP_ROM_PTR(&machine_spi_type) },
+    { MP_ROM_QSTR(MP_QSTR_SoftSPI),             MP_ROM_PTR(&mp_machine_soft_spi_type) },
+    { MP_ROM_QSTR(MP_QSTR_Timer),               MP_ROM_PTR(&machine_timer_type) },
+    { MP_ROM_QSTR(MP_QSTR_UART),                MP_ROM_PTR(&machine_uart_type) },
+    { MP_ROM_QSTR(MP_QSTR_WDT),                 MP_ROM_PTR(&machine_wdt_type) },
+
+    { MP_ROM_QSTR(MP_QSTR_PWRON_RESET),         MP_ROM_INT(RP2_RESET_PWRON) },
+    { MP_ROM_QSTR(MP_QSTR_WDT_RESET),           MP_ROM_INT(RP2_RESET_WDT) },
+};
+STATIC MP_DEFINE_CONST_DICT(machine_module_globals, machine_module_globals_table);
+
+const mp_obj_module_t mp_module_machine = {
+    .base = { &mp_type_module },
+    .globals = (mp_obj_dict_t *)&machine_module_globals,
+};
diff --git a/ports/rp2/modmachine.h b/ports/rp2/modmachine.h
new file mode 100644
index 0000000000000..d09c83aee2c9e
--- /dev/null
+++ b/ports/rp2/modmachine.h
@@ -0,0 +1,18 @@
+#ifndef MICROPY_INCLUDED_RP2_MODMACHINE_H
+#define MICROPY_INCLUDED_RP2_MODMACHINE_H
+
+#include "py/obj.h"
+
+extern const mp_obj_type_t machine_adc_type;
+extern const mp_obj_type_t machine_hw_i2c_type;
+extern const mp_obj_type_t machine_pin_type;
+extern const mp_obj_type_t machine_pwm_type;
+extern const mp_obj_type_t machine_spi_type;
+extern const mp_obj_type_t machine_timer_type;
+extern const mp_obj_type_t machine_uart_type;
+extern const mp_obj_type_t machine_wdt_type;
+
+void machine_pin_init(void);
+void machine_pin_deinit(void);
+
+#endif // MICROPY_INCLUDED_RP2_MODMACHINE_H
diff --git a/ports/rp2/modrp2.c b/ports/rp2/modrp2.c
new file mode 100644
index 0000000000000..8009fa33f8749
--- /dev/null
+++ b/ports/rp2/modrp2.c
@@ -0,0 +1,41 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020-2021 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "py/runtime.h"
+#include "modrp2.h"
+
+STATIC const mp_rom_map_elem_t rp2_module_globals_table[] = {
+    { MP_ROM_QSTR(MP_QSTR___name__),            MP_ROM_QSTR(MP_QSTR_rp2) },
+    { MP_ROM_QSTR(MP_QSTR_Flash),               MP_ROM_PTR(&rp2_flash_type) },
+    { MP_ROM_QSTR(MP_QSTR_PIO),                 MP_ROM_PTR(&rp2_pio_type) },
+    { MP_ROM_QSTR(MP_QSTR_StateMachine),        MP_ROM_PTR(&rp2_state_machine_type) },
+};
+STATIC MP_DEFINE_CONST_DICT(rp2_module_globals, rp2_module_globals_table);
+
+const mp_obj_module_t mp_module_rp2 = {
+    .base = { &mp_type_module },
+    .globals = (mp_obj_dict_t *)&rp2_module_globals,
+};
diff --git a/ports/rp2/modrp2.h b/ports/rp2/modrp2.h
new file mode 100644
index 0000000000000..805c785f2d8cd
--- /dev/null
+++ b/ports/rp2/modrp2.h
@@ -0,0 +1,38 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020-2021 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+#ifndef MICROPY_INCLUDED_RP2_MODRP2_H
+#define MICROPY_INCLUDED_RP2_MODRP2_H
+
+#include "py/obj.h"
+
+extern const mp_obj_type_t rp2_flash_type;
+extern const mp_obj_type_t rp2_pio_type;
+extern const mp_obj_type_t rp2_state_machine_type;
+
+void rp2_pio_init(void);
+void rp2_pio_deinit(void);
+
+#endif // MICROPY_INCLUDED_RP2_MODRP2_H
diff --git a/ports/rp2/modules/_boot.py b/ports/rp2/modules/_boot.py
new file mode 100644
index 0000000000000..099e5aba05907
--- /dev/null
+++ b/ports/rp2/modules/_boot.py
@@ -0,0 +1,15 @@
+import os
+import machine, rp2
+
+
+# Try to mount the filesystem, and format the flash if it doesn't exist.
+# Note: the flash requires the programming size to be aligned to 256 bytes.
+bdev = rp2.Flash()
+try:
+    vfs = os.VfsLfs2(bdev, progsize=256)
+except:
+    os.VfsLfs2.mkfs(bdev, progsize=256)
+    vfs = os.VfsLfs2(bdev, progsize=256)
+os.mount(vfs, "/")
+
+del os, bdev, vfs
diff --git a/ports/rp2/modules/rp2.py b/ports/rp2/modules/rp2.py
new file mode 100644
index 0000000000000..a3adcdc51274d
--- /dev/null
+++ b/ports/rp2/modules/rp2.py
@@ -0,0 +1,294 @@
+# rp2 module: uses C code from _rp2, plus asm_pio decorator implemented in Python.
+# MIT license; Copyright (c) 2020-2021 Damien P. George
+
+from _rp2 import *
+from micropython import const
+
+_PROG_DATA = const(0)
+_PROG_OFFSET_PIO0 = const(1)
+_PROG_OFFSET_PIO1 = const(2)
+_PROG_EXECCTRL = const(3)
+_PROG_SHIFTCTRL = const(4)
+_PROG_OUT_PINS = const(5)
+_PROG_SET_PINS = const(6)
+_PROG_SIDESET_PINS = const(7)
+_PROG_MAX_FIELDS = const(8)
+
+
+class PIOASMError(Exception):
+    pass
+
+
+class PIOASMEmit:
+    def __init__(
+        self,
+        *,
+        out_init=None,
+        set_init=None,
+        sideset_init=None,
+        in_shiftdir=0,
+        out_shiftdir=0,
+        autopush=False,
+        autopull=False,
+        push_thresh=32,
+        pull_thresh=32
+    ):
+        from array import array
+
+        self.labels = {}
+        execctrl = 0
+        shiftctrl = (
+            (pull_thresh & 0x1F) << 25
+            | (push_thresh & 0x1F) << 20
+            | out_shiftdir << 19
+            | in_shiftdir << 18
+            | autopull << 17
+            | autopush << 16
+        )
+        self.prog = [array("H"), -1, -1, execctrl, shiftctrl, out_init, set_init, sideset_init]
+
+        self.wrap_used = False
+
+        if sideset_init is None:
+            self.sideset_count = 0
+        elif isinstance(sideset_init, int):
+            self.sideset_count = 1
+        else:
+            self.sideset_count = len(sideset_init)
+
+    def start_pass(self, pass_):
+        if pass_ == 1:
+            if not self.wrap_used and self.num_instr:
+                self.wrap()
+            self.delay_max = 31
+            if self.sideset_count:
+                self.sideset_opt = self.num_sideset != self.num_instr
+                if self.sideset_opt:
+                    self.prog[_PROG_EXECCTRL] |= 1 << 30
+                    self.sideset_count += 1
+                self.delay_max >>= self.sideset_count
+        self.pass_ = pass_
+        self.num_instr = 0
+        self.num_sideset = 0
+
+    def __getitem__(self, key):
+        return self.delay(key)
+
+    def delay(self, delay):
+        if self.pass_ > 0:
+            if delay > self.delay_max:
+                raise PIOASMError("delay too large")
+            self.prog[_PROG_DATA][-1] |= delay << 8
+        return self
+
+    def side(self, value):
+        self.num_sideset += 1
+        if self.pass_ > 0:
+            set_bit = 13 - self.sideset_count
+            self.prog[_PROG_DATA][-1] |= self.sideset_opt << 12 | value << set_bit
+        return self
+
+    def wrap_target(self):
+        self.prog[_PROG_EXECCTRL] |= self.num_instr << 7
+
+    def wrap(self):
+        assert self.num_instr
+        self.prog[_PROG_EXECCTRL] |= (self.num_instr - 1) << 12
+        self.wrap_used = True
+
+    def label(self, label):
+        if self.pass_ == 0:
+            if label in self.labels:
+                raise PIOASMError("duplicate label {}".format(label))
+            self.labels[label] = self.num_instr
+
+    def word(self, instr, label=None):
+        self.num_instr += 1
+        if self.pass_ > 0:
+            if label is None:
+                label = 0
+            else:
+                if not label in self.labels:
+                    raise PIOASMError("unknown label {}".format(label))
+                label = self.labels[label]
+            self.prog[_PROG_DATA].append(instr | label)
+        return self
+
+    def nop(self):
+        return self.word(0xA042)
+
+    def jmp(self, cond, label=None):
+        if label is None:
+            label = cond
+            cond = 0  # always
+        return self.word(0x0000 | cond << 5, label)
+
+    def wait(self, polarity, src, index):
+        if src == 6:
+            src = 1  # "pin"
+        elif src != 0:
+            src = 2  # "irq"
+        return self.word(0x2000 | polarity << 7 | src << 5 | index)
+
+    def in_(self, src, data):
+        if not 0 < data <= 32:
+            raise PIOASMError("invalid bit count {}".format(data))
+        return self.word(0x4000 | src << 5 | data & 0x1F)
+
+    def out(self, dest, data):
+        if dest == 8:
+            dest = 7  # exec
+        if not 0 < data <= 32:
+            raise PIOASMError("invalid bit count {}".format(data))
+        return self.word(0x6000 | dest << 5 | data & 0x1F)
+
+    def push(self, value=0, value2=0):
+        value |= value2
+        if not value & 1:
+            value |= 0x20  # block by default
+        return self.word(0x8000 | (value & 0x60))
+
+    def pull(self, value=0, value2=0):
+        value |= value2
+        if not value & 1:
+            value |= 0x20  # block by default
+        return self.word(0x8080 | (value & 0x60))
+
+    def mov(self, dest, src):
+        if dest == 8:
+            dest = 4  # exec
+        return self.word(0xA000 | dest << 5 | src)
+
+    def irq(self, mod, index=None):
+        if index is None:
+            index = mod
+            mod = 0  # no modifiers
+        return self.word(0xC000 | (mod & 0x60) | index)
+
+    def set(self, dest, data):
+        return self.word(0xE000 | dest << 5 | data)
+
+
+_pio_funcs = {
+    # source constants for wait
+    "gpio": 0,
+    # "pin": see below, translated to 1
+    # "irq": see below function, translated to 2
+    # source/dest constants for in_, out, mov, set
+    "pins": 0,
+    "x": 1,
+    "y": 2,
+    "null": 3,
+    "pindirs": 4,
+    "pc": 5,
+    "status": 5,
+    "isr": 6,
+    "osr": 7,
+    "exec": 8,  # translated to 4 for mov, 7 for out
+    # operation functions for mov's src
+    "invert": lambda x: x | 0x08,
+    "reverse": lambda x: x | 0x10,
+    # jmp condition constants
+    "not_x": 1,
+    "x_dec": 2,
+    "not_y": 3,
+    "y_dec": 4,
+    "x_not_y": 5,
+    "pin": 6,
+    "not_osre": 7,
+    # constants for push, pull
+    "noblock": 0x01,
+    "block": 0x21,
+    "iffull": 0x40,
+    "ifempty": 0x40,
+    # constants and modifiers for irq
+    # "noblock": see above
+    # "block": see above
+    "clear": 0x40,
+    "rel": lambda x: x | 0x10,
+    # functions
+    "wrap_target": None,
+    "wrap": None,
+    "label": None,
+    "word": None,
+    "nop": None,
+    "jmp": None,
+    "wait": None,
+    "in_": None,
+    "out": None,
+    "push": None,
+    "pull": None,
+    "mov": None,
+    "irq": None,
+    "set": None,
+}
+
+
+def asm_pio(**kw):
+    emit = PIOASMEmit(**kw)
+
+    def dec(f):
+        nonlocal emit
+
+        gl = _pio_funcs
+        gl["wrap_target"] = emit.wrap_target
+        gl["wrap"] = emit.wrap
+        gl["label"] = emit.label
+        gl["word"] = emit.word
+        gl["nop"] = emit.nop
+        gl["jmp"] = emit.jmp
+        gl["wait"] = emit.wait
+        gl["in_"] = emit.in_
+        gl["out"] = emit.out
+        gl["push"] = emit.push
+        gl["pull"] = emit.pull
+        gl["mov"] = emit.mov
+        gl["irq"] = emit.irq
+        gl["set"] = emit.set
+
+        old_gl = f.__globals__.copy()
+        f.__globals__.clear()
+        f.__globals__.update(gl)
+
+        emit.start_pass(0)
+        f()
+
+        emit.start_pass(1)
+        f()
+
+        f.__globals__.clear()
+        f.__globals__.update(old_gl)
+
+        return emit.prog
+
+    return dec
+
+
+# sideset_count is inclusive of enable bit
+def asm_pio_encode(instr, sideset_count):
+    emit = PIOASMEmit()
+    emit.delay_max = 31
+    emit.sideset_count = sideset_count
+    if emit.sideset_count:
+        emit.delay_max >>= emit.sideset_count
+    emit.pass_ = 1
+    emit.num_instr = 0
+    emit.num_sideset = 0
+
+    gl = _pio_funcs
+    gl["nop"] = emit.nop
+    # gl["jmp"] = emit.jmp currently not supported
+    gl["wait"] = emit.wait
+    gl["in_"] = emit.in_
+    gl["out"] = emit.out
+    gl["push"] = emit.push
+    gl["pull"] = emit.pull
+    gl["mov"] = emit.mov
+    gl["irq"] = emit.irq
+    gl["set"] = emit.set
+
+    exec(instr, gl)
+
+    if len(emit.prog[_PROG_DATA]) != 1:
+        raise PIOASMError("expecting exactly 1 instruction")
+    return emit.prog[_PROG_DATA][0]
diff --git a/ports/rp2/moduos.c b/ports/rp2/moduos.c
new file mode 100644
index 0000000000000..7ee662b5a4518
--- /dev/null
+++ b/ports/rp2/moduos.c
@@ -0,0 +1,103 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2016 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "py/objstr.h"
+#include "py/runtime.h"
+#include "extmod/vfs.h"
+#include "extmod/vfs_fat.h"
+#include "extmod/vfs_lfs.h"
+#include "genhdr/mpversion.h"
+
+STATIC const qstr os_uname_info_fields[] = {
+    MP_QSTR_sysname, MP_QSTR_nodename,
+    MP_QSTR_release, MP_QSTR_version, MP_QSTR_machine
+};
+STATIC const MP_DEFINE_STR_OBJ(os_uname_info_sysname_obj, MICROPY_PY_SYS_PLATFORM);
+STATIC const MP_DEFINE_STR_OBJ(os_uname_info_nodename_obj, MICROPY_PY_SYS_PLATFORM);
+STATIC const MP_DEFINE_STR_OBJ(os_uname_info_release_obj, MICROPY_VERSION_STRING);
+STATIC const MP_DEFINE_STR_OBJ(os_uname_info_version_obj, MICROPY_GIT_TAG " on " MICROPY_BUILD_DATE " (" MICROPY_BUILD_TYPE ")");
+STATIC const MP_DEFINE_STR_OBJ(os_uname_info_machine_obj, MICROPY_HW_BOARD_NAME " with " MICROPY_HW_MCU_NAME);
+
+STATIC MP_DEFINE_ATTRTUPLE(
+    os_uname_info_obj,
+    os_uname_info_fields,
+    5,
+    (mp_obj_t)&os_uname_info_sysname_obj,
+    (mp_obj_t)&os_uname_info_nodename_obj,
+    (mp_obj_t)&os_uname_info_release_obj,
+    (mp_obj_t)&os_uname_info_version_obj,
+    (mp_obj_t)&os_uname_info_machine_obj
+    );
+
+STATIC mp_obj_t os_uname(void) {
+    return (mp_obj_t)&os_uname_info_obj;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(os_uname_obj, os_uname);
+
+STATIC const mp_rom_map_elem_t os_module_globals_table[] = {
+    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_uos) },
+
+    { MP_ROM_QSTR(MP_QSTR_uname), MP_ROM_PTR(&os_uname_obj) },
+
+    #if MICROPY_VFS
+    { MP_ROM_QSTR(MP_QSTR_chdir), MP_ROM_PTR(&mp_vfs_chdir_obj) },
+    { MP_ROM_QSTR(MP_QSTR_getcwd), MP_ROM_PTR(&mp_vfs_getcwd_obj) },
+    { MP_ROM_QSTR(MP_QSTR_listdir), MP_ROM_PTR(&mp_vfs_listdir_obj) },
+    { MP_ROM_QSTR(MP_QSTR_mkdir), MP_ROM_PTR(&mp_vfs_mkdir_obj) },
+    { MP_ROM_QSTR(MP_QSTR_remove), MP_ROM_PTR(&mp_vfs_remove_obj) },
+    { MP_ROM_QSTR(MP_QSTR_rename), MP_ROM_PTR(&mp_vfs_rename_obj) },
+    { MP_ROM_QSTR(MP_QSTR_rmdir), MP_ROM_PTR(&mp_vfs_rmdir_obj) },
+    { MP_ROM_QSTR(MP_QSTR_stat), MP_ROM_PTR(&mp_vfs_stat_obj) },
+    { MP_ROM_QSTR(MP_QSTR_statvfs), MP_ROM_PTR(&mp_vfs_statvfs_obj) },
+    #endif
+
+    // The following are MicroPython extensions.
+
+    #if MICROPY_PY_OS_DUPTERM
+    { MP_ROM_QSTR(MP_QSTR_dupterm), MP_ROM_PTR(&mp_uos_dupterm_obj) },
+    #endif
+
+    #if MICROPY_VFS
+    { MP_ROM_QSTR(MP_QSTR_ilistdir), MP_ROM_PTR(&mp_vfs_ilistdir_obj) },
+    { MP_ROM_QSTR(MP_QSTR_mount), MP_ROM_PTR(&mp_vfs_mount_obj) },
+    { MP_ROM_QSTR(MP_QSTR_umount), MP_ROM_PTR(&mp_vfs_umount_obj) },
+    #if MICROPY_VFS_FAT
+    { MP_ROM_QSTR(MP_QSTR_VfsFat), MP_ROM_PTR(&mp_fat_vfs_type) },
+    #endif
+    #if MICROPY_VFS_LFS1
+    { MP_ROM_QSTR(MP_QSTR_VfsLfs1), MP_ROM_PTR(&mp_type_vfs_lfs1) },
+    #endif
+    #if MICROPY_VFS_LFS2
+    { MP_ROM_QSTR(MP_QSTR_VfsLfs2), MP_ROM_PTR(&mp_type_vfs_lfs2) },
+    #endif
+    #endif
+};
+STATIC MP_DEFINE_CONST_DICT(os_module_globals, os_module_globals_table);
+
+const mp_obj_module_t mp_module_uos = {
+    .base = { &mp_type_module },
+    .globals = (mp_obj_dict_t *)&os_module_globals,
+};
diff --git a/ports/rp2/modutime.c b/ports/rp2/modutime.c
new file mode 100644
index 0000000000000..4835a0ee11e63
--- /dev/null
+++ b/ports/rp2/modutime.c
@@ -0,0 +1,127 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013-2021 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "py/runtime.h"
+#include "lib/timeutils/timeutils.h"
+#include "extmod/utime_mphal.h"
+#include "hardware/rtc.h"
+
+// localtime([secs])
+// Convert a time expressed in seconds since the Epoch into an 8-tuple which
+// contains: (year, month, mday, hour, minute, second, weekday, yearday)
+// If secs is not provided or None, then the current time from is used.
+STATIC mp_obj_t time_localtime(size_t n_args, const mp_obj_t *args) {
+    if (n_args == 0 || args[0] == mp_const_none) {
+        // Get current date and time.
+        datetime_t t;
+        rtc_get_datetime(&t);
+        mp_obj_t tuple[8] = {
+            mp_obj_new_int(t.year),
+            mp_obj_new_int(t.month),
+            mp_obj_new_int(t.day),
+            mp_obj_new_int(t.hour),
+            mp_obj_new_int(t.min),
+            mp_obj_new_int(t.sec),
+            mp_obj_new_int((t.dotw + 6) % 7), // convert 0=Sunday to 6=Sunday
+            mp_obj_new_int(timeutils_year_day(t.year, t.month, t.day)),
+        };
+        return mp_obj_new_tuple(8, tuple);
+    } else {
+        // Convert given seconds to tuple.
+        mp_int_t seconds = mp_obj_get_int(args[0]);
+        timeutils_struct_time_t tm;
+        timeutils_seconds_since_epoch_to_struct_time(seconds, &tm);
+        mp_obj_t tuple[8] = {
+            tuple[0] = mp_obj_new_int(tm.tm_year),
+            tuple[1] = mp_obj_new_int(tm.tm_mon),
+            tuple[2] = mp_obj_new_int(tm.tm_mday),
+            tuple[3] = mp_obj_new_int(tm.tm_hour),
+            tuple[4] = mp_obj_new_int(tm.tm_min),
+            tuple[5] = mp_obj_new_int(tm.tm_sec),
+            tuple[6] = mp_obj_new_int(tm.tm_wday),
+            tuple[7] = mp_obj_new_int(tm.tm_yday),
+        };
+        return mp_obj_new_tuple(8, tuple);
+    }
+}
+MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(time_localtime_obj, 0, 1, time_localtime);
+
+// mktime()
+// This is inverse function of localtime. It's argument is a full 8-tuple
+// which expresses a time as per localtime. It returns an integer which is
+// the number of seconds since the Epoch.
+STATIC mp_obj_t time_mktime(mp_obj_t tuple) {
+    size_t len;
+    mp_obj_t *elem;
+    mp_obj_get_array(tuple, &len, &elem);
+
+    // localtime generates a tuple of len 8. CPython uses 9, so we accept both.
+    if (len < 8 || len > 9) {
+        mp_raise_TypeError(MP_ERROR_TEXT("mktime needs a tuple of length 8 or 9"));
+    }
+
+    return mp_obj_new_int_from_uint(timeutils_mktime(mp_obj_get_int(elem[0]),
+        mp_obj_get_int(elem[1]), mp_obj_get_int(elem[2]), mp_obj_get_int(elem[3]),
+        mp_obj_get_int(elem[4]), mp_obj_get_int(elem[5])));
+}
+MP_DEFINE_CONST_FUN_OBJ_1(time_mktime_obj, time_mktime);
+
+// time()
+// Return the number of seconds since the Epoch.
+STATIC mp_obj_t time_time(void) {
+    datetime_t t;
+    rtc_get_datetime(&t);
+    return mp_obj_new_int_from_ull(timeutils_seconds_since_epoch(t.year, t.month, t.day, t.hour, t.min, t.sec));
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(time_time_obj, time_time);
+
+STATIC const mp_rom_map_elem_t mp_module_time_globals_table[] = {
+    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_utime) },
+
+    { MP_ROM_QSTR(MP_QSTR_gmtime), MP_ROM_PTR(&time_localtime_obj) },
+    { MP_ROM_QSTR(MP_QSTR_localtime), MP_ROM_PTR(&time_localtime_obj) },
+    { MP_ROM_QSTR(MP_QSTR_mktime), MP_ROM_PTR(&time_mktime_obj) },
+
+    { MP_ROM_QSTR(MP_QSTR_time), MP_ROM_PTR(&time_time_obj) },
+    { MP_ROM_QSTR(MP_QSTR_time_ns), MP_ROM_PTR(&mp_utime_time_ns_obj) },
+
+    { MP_ROM_QSTR(MP_QSTR_sleep), MP_ROM_PTR(&mp_utime_sleep_obj) },
+    { MP_ROM_QSTR(MP_QSTR_sleep_ms), MP_ROM_PTR(&mp_utime_sleep_ms_obj) },
+    { MP_ROM_QSTR(MP_QSTR_sleep_us), MP_ROM_PTR(&mp_utime_sleep_us_obj) },
+
+    { MP_ROM_QSTR(MP_QSTR_ticks_ms), MP_ROM_PTR(&mp_utime_ticks_ms_obj) },
+    { MP_ROM_QSTR(MP_QSTR_ticks_us), MP_ROM_PTR(&mp_utime_ticks_us_obj) },
+    { MP_ROM_QSTR(MP_QSTR_ticks_cpu), MP_ROM_PTR(&mp_utime_ticks_cpu_obj) },
+    { MP_ROM_QSTR(MP_QSTR_ticks_add), MP_ROM_PTR(&mp_utime_ticks_add_obj) },
+    { MP_ROM_QSTR(MP_QSTR_ticks_diff), MP_ROM_PTR(&mp_utime_ticks_diff_obj) },
+};
+
+STATIC MP_DEFINE_CONST_DICT(mp_module_time_globals, mp_module_time_globals_table);
+
+const mp_obj_module_t mp_module_utime = {
+    .base = { &mp_type_module },
+    .globals = (mp_obj_dict_t *)&mp_module_time_globals,
+};
diff --git a/ports/rp2/mpconfigport.h b/ports/rp2/mpconfigport.h
new file mode 100644
index 0000000000000..d409ccfd4d926
--- /dev/null
+++ b/ports/rp2/mpconfigport.h
@@ -0,0 +1,196 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020-2021 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+// Options controlling how MicroPython is built, overriding defaults in py/mpconfig.h
+
+#include <stdint.h>
+#include "hardware/spi.h"
+#include "hardware/sync.h"
+#include "pico/binary_info.h"
+
+// Board and hardware specific configuration
+#define MICROPY_HW_BOARD_NAME                   "Raspberry Pi Pico"
+#define MICROPY_HW_MCU_NAME                     "RP2040"
+#define MICROPY_HW_ENABLE_UART_REPL             (0) // useful if there is no USB
+#define MICROPY_HW_ENABLE_USBDEV                (1)
+
+// Memory allocation policies
+#define MICROPY_GC_STACK_ENTRY_TYPE             uint16_t
+#define MICROPY_ALLOC_PATH_MAX                  (128)
+#define MICROPY_QSTR_BYTES_IN_HASH              (1)
+
+// MicroPython emitters
+#define MICROPY_PERSISTENT_CODE_LOAD            (1)
+#define MICROPY_EMIT_THUMB                      (1)
+#define MICROPY_EMIT_THUMB_ARMV7M               (0)
+#define MICROPY_EMIT_INLINE_THUMB               (1)
+#define MICROPY_EMIT_INLINE_THUMB_FLOAT         (0)
+#define MICROPY_EMIT_INLINE_THUMB_ARMV7M        (0)
+
+// Python internal features
+#define MICROPY_READER_VFS                      (1)
+#define MICROPY_ENABLE_GC                       (1)
+#define MICROPY_ENABLE_FINALISER                (1)
+#define MICROPY_STACK_CHECK                     (1)
+#define MICROPY_ENABLE_EMERGENCY_EXCEPTION_BUF  (1)
+#define MICROPY_KBD_EXCEPTION                   (1)
+#define MICROPY_HELPER_REPL                     (1)
+#define MICROPY_REPL_AUTO_INDENT                (1)
+#define MICROPY_LONGINT_IMPL                    (MICROPY_LONGINT_IMPL_MPZ)
+#define MICROPY_ENABLE_SOURCE_LINE              (1)
+#define MICROPY_FLOAT_IMPL                      (MICROPY_FLOAT_IMPL_FLOAT)
+#define MICROPY_MODULE_BUILTIN_INIT             (1)
+#define MICROPY_MODULE_WEAK_LINKS               (1)
+#define MICROPY_CAN_OVERRIDE_BUILTINS           (1)
+#define MICROPY_ENABLE_SCHEDULER                (1)
+#define MICROPY_SCHEDULER_DEPTH                 (8)
+
+// Fine control over Python builtins, classes, modules, etc
+#define MICROPY_PY_FUNCTION_ATTRS               (1)
+#define MICROPY_PY_BUILTINS_STR_UNICODE         (1)
+#define MICROPY_PY_BUILTINS_MEMORYVIEW          (1)
+#define MICROPY_PY_BUILTINS_ROUND_INT           (1)
+#define MICROPY_PY_ALL_SPECIAL_METHODS          (1)
+#define MICROPY_PY_BUILTINS_INPUT               (1)
+#define MICROPY_PY_BUILTINS_HELP                (1)
+#define MICROPY_PY_BUILTINS_HELP_TEXT           rp2_help_text
+#define MICROPY_PY_BUILTINS_HELP_MODULES        (1)
+#define MICROPY_PY_ARRAY_SLICE_ASSIGN           (1)
+#define MICROPY_PY___FILE__                     (0)
+#define MICROPY_PY_MICROPYTHON_MEM_INFO         (1)
+#define MICROPY_PY_IO_IOBASE                    (1)
+#define MICROPY_PY_IO_FILEIO                    (1)
+#define MICROPY_PY_SYS_MAXSIZE                  (1)
+#define MICROPY_PY_SYS_STDFILES                 (1)
+#define MICROPY_PY_SYS_STDIO_BUFFER             (1)
+#define MICROPY_PY_SYS_PLATFORM                 "rp2"
+#define MICROPY_PY_THREAD                       (1)
+#define MICROPY_PY_THREAD_GIL                   (0)
+
+// Extended modules
+#define MICROPY_EPOCH_IS_1970                   (1)
+#define MICROPY_PY_UASYNCIO                     (1)
+#define MICROPY_PY_UCTYPES                      (1)
+#define MICROPY_PY_UZLIB                        (1)
+#define MICROPY_PY_UJSON                        (1)
+#define MICROPY_PY_URE                          (1)
+#define MICROPY_PY_URE_MATCH_GROUPS             (1)
+#define MICROPY_PY_URE_MATCH_SPAN_START_END     (1)
+#define MICROPY_PY_URE_SUB                      (1)
+#define MICROPY_PY_UHASHLIB                     (1)
+#define MICROPY_PY_UBINASCII                    (1)
+#define MICROPY_PY_UTIME_MP_HAL                 (1)
+#define MICROPY_PY_URANDOM                      (1)
+#define MICROPY_PY_URANDOM_EXTRA_FUNCS          (1)
+#define MICROPY_PY_URANDOM_SEED_INIT_FUNC       (rosc_random_u32())
+#define MICROPY_PY_USELECT                      (1)
+#define MICROPY_PY_MACHINE                      (1)
+#define MICROPY_PY_MACHINE_PIN_MAKE_NEW         mp_pin_make_new
+#define MICROPY_PY_MACHINE_I2C                  (1)
+#define MICROPY_PY_MACHINE_SPI                  (1)
+#define MICROPY_PY_MACHINE_SPI_MSB              (SPI_MSB_FIRST)
+#define MICROPY_PY_MACHINE_SPI_LSB              (SPI_LSB_FIRST)
+#define MICROPY_PY_FRAMEBUF                     (1)
+#define MICROPY_VFS                             (1)
+#define MICROPY_VFS_LFS2                        (1)
+
+// Use VfsLfs2's types for fileio/textio
+#define mp_type_fileio mp_type_vfs_lfs2_fileio
+#define mp_type_textio mp_type_vfs_lfs2_textio
+
+// Use VFS's functions for import stat and builtin open
+#define mp_import_stat mp_vfs_import_stat
+#define mp_builtin_open_obj mp_vfs_open_obj
+
+// Hooks to add builtins
+
+#define MICROPY_PORT_BUILTINS \
+    { MP_ROM_QSTR(MP_QSTR_open), MP_ROM_PTR(&mp_builtin_open_obj) },
+
+extern const struct _mp_obj_module_t mp_module_machine;
+extern const struct _mp_obj_module_t mp_module_onewire;
+extern const struct _mp_obj_module_t mp_module_rp2;
+extern const struct _mp_obj_module_t mp_module_uos;
+extern const struct _mp_obj_module_t mp_module_utime;
+
+#define MICROPY_PORT_BUILTIN_MODULES \
+    { MP_OBJ_NEW_QSTR(MP_QSTR_machine), (mp_obj_t)&mp_module_machine }, \
+    { MP_OBJ_NEW_QSTR(MP_QSTR__onewire), (mp_obj_t)&mp_module_onewire }, \
+    { MP_OBJ_NEW_QSTR(MP_QSTR__rp2), (mp_obj_t)&mp_module_rp2 }, \
+    { MP_ROM_QSTR(MP_QSTR_uos), MP_ROM_PTR(&mp_module_uos) }, \
+    { MP_ROM_QSTR(MP_QSTR_utime), MP_ROM_PTR(&mp_module_utime) }, \
+
+#define MICROPY_PORT_ROOT_POINTERS \
+    const char *readline_hist[8]; \
+    void *machine_pin_irq_obj[30]; \
+    void *rp2_pio_irq_obj[2]; \
+    void *rp2_state_machine_irq_obj[8]; \
+
+#define MP_STATE_PORT MP_STATE_VM
+
+// Miscellaneous settings
+
+// TODO need to look and see if these could/should be spinlock/mutex
+#define MICROPY_BEGIN_ATOMIC_SECTION()     save_and_disable_interrupts()
+#define MICROPY_END_ATOMIC_SECTION(state)  restore_interrupts(state)
+
+#if MICROPY_HW_ENABLE_USBDEV
+#define MICROPY_HW_USBDEV_TASK_HOOK extern void tud_task(void); tud_task();
+#define MICROPY_VM_HOOK_COUNT (10)
+#define MICROPY_VM_HOOK_INIT static uint vm_hook_divisor = MICROPY_VM_HOOK_COUNT;
+#define MICROPY_VM_HOOK_POLL if (--vm_hook_divisor == 0) { \
+        vm_hook_divisor = MICROPY_VM_HOOK_COUNT; \
+        MICROPY_HW_USBDEV_TASK_HOOK \
+}
+#define MICROPY_VM_HOOK_LOOP MICROPY_VM_HOOK_POLL
+#define MICROPY_VM_HOOK_RETURN MICROPY_VM_HOOK_POLL
+#else
+#define MICROPY_HW_USBDEV_TASK_HOOK
+#endif
+
+#define MICROPY_EVENT_POLL_HOOK \
+    do { \
+        extern void mp_handle_pending(bool); \
+        mp_handle_pending(true); \
+        best_effort_wfe_or_timeout(make_timeout_time_ms(1)); \
+        MICROPY_HW_USBDEV_TASK_HOOK \
+    } while (0);
+
+#define MICROPY_MAKE_POINTER_CALLABLE(p) ((void *)((mp_uint_t)(p) | 1))
+
+#define MP_SSIZE_MAX (0x7fffffff)
+typedef intptr_t mp_int_t; // must be pointer size
+typedef uintptr_t mp_uint_t; // must be pointer size
+typedef intptr_t mp_off_t;
+
+// We need to provide a declaration/definition of alloca()
+#include <alloca.h>
+
+#define BINARY_INFO_TAG_MICROPYTHON BINARY_INFO_MAKE_TAG('M', 'P')
+#define BINARY_INFO_ID_MP_FROZEN 0x4a99d719
+#define MICROPY_FROZEN_LIST_ITEM(name, file) bi_decl(bi_string(BINARY_INFO_TAG_MICROPYTHON, BINARY_INFO_ID_MP_FROZEN, name))
+
+extern uint32_t rosc_random_u32(void);
diff --git a/ports/rp2/mphalport.c b/ports/rp2/mphalport.c
new file mode 100644
index 0000000000000..1122afcef730e
--- /dev/null
+++ b/ports/rp2/mphalport.c
@@ -0,0 +1,142 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020-2021 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "py/runtime.h"
+#include "py/stream.h"
+#include "py/mphal.h"
+#include "lib/timeutils/timeutils.h"
+#include "tusb.h"
+#include "uart.h"
+#include "hardware/rtc.h"
+
+#if MICROPY_HW_ENABLE_UART_REPL
+
+#ifndef UART_BUFFER_LEN
+// reasonably big so we can paste
+#define UART_BUFFER_LEN 256
+#endif
+
+STATIC uint8_t stdin_ringbuf_array[UART_BUFFER_LEN];
+ringbuf_t stdin_ringbuf = { stdin_ringbuf_array, sizeof(stdin_ringbuf_array) };
+
+#endif
+
+#if MICROPY_KBD_EXCEPTION
+
+int mp_interrupt_char = -1;
+
+void tud_cdc_rx_wanted_cb(uint8_t itf, char wanted_char) {
+    (void)itf;
+    (void)wanted_char;
+    tud_cdc_read_char(); // discard interrupt char
+    mp_keyboard_interrupt();
+}
+
+void mp_hal_set_interrupt_char(int c) {
+    mp_interrupt_char = c;
+    tud_cdc_set_wanted_char(c);
+}
+
+#endif
+
+uintptr_t mp_hal_stdio_poll(uintptr_t poll_flags) {
+    uintptr_t ret = 0;
+    #if MICROPY_HW_ENABLE_UART_REPL
+    if ((poll_flags & MP_STREAM_POLL_RD) && ringbuf_peek(&stdin_ringbuf) != -1) {
+        ret |= MP_STREAM_POLL_RD;
+    }
+    #endif
+    #if MICROPY_HW_ENABLE_USBDEV
+    if (tud_cdc_connected() && tud_cdc_available()) {
+        ret |= MP_STREAM_POLL_RD;
+    }
+    #endif
+    return ret;
+}
+
+// Receive single character
+int mp_hal_stdin_rx_chr(void) {
+    for (;;) {
+        #if MICROPY_HW_ENABLE_UART_REPL
+        int c = ringbuf_get(&stdin_ringbuf);
+        if (c != -1) {
+            return c;
+        }
+        #endif
+        #if MICROPY_HW_ENABLE_USBDEV
+        if (tud_cdc_connected() && tud_cdc_available()) {
+            uint8_t buf[1];
+            uint32_t count = tud_cdc_read(buf, sizeof(buf));
+            if (count) {
+                return buf[0];
+            }
+        }
+        #endif
+        MICROPY_EVENT_POLL_HOOK
+    }
+}
+
+// Send string of given length
+void mp_hal_stdout_tx_strn(const char *str, mp_uint_t len) {
+    #if MICROPY_HW_ENABLE_UART_REPL
+    mp_uart_write_strn(str, len);
+    #endif
+
+    #if MICROPY_HW_ENABLE_USBDEV
+    if (tud_cdc_connected()) {
+        for (size_t i = 0; i < len;) {
+            uint32_t n = len - i;
+            if (n > CFG_TUD_CDC_EP_BUFSIZE) {
+                n = CFG_TUD_CDC_EP_BUFSIZE;
+            }
+            while (n > tud_cdc_write_available()) {
+                tud_task();
+                tud_cdc_write_flush();
+            }
+            uint32_t n2 = tud_cdc_write(str + i, n);
+            tud_task();
+            tud_cdc_write_flush();
+            i += n2;
+        }
+    }
+    #endif
+}
+
+void mp_hal_delay_ms(mp_uint_t ms) {
+    absolute_time_t t = make_timeout_time_ms(ms);
+    while (!time_reached(t)) {
+        mp_handle_pending(true);
+        best_effort_wfe_or_timeout(t);
+        MICROPY_HW_USBDEV_TASK_HOOK
+    }
+}
+
+uint64_t mp_hal_time_ns(void) {
+    datetime_t t;
+    rtc_get_datetime(&t);
+    uint64_t s = timeutils_seconds_since_epoch(t.year, t.month, t.day, t.hour, t.min, t.sec);
+    return s * 1000000000ULL;
+}
diff --git a/ports/rp2/mphalport.h b/ports/rp2/mphalport.h
new file mode 100644
index 0000000000000..40633dcf2c12f
--- /dev/null
+++ b/ports/rp2/mphalport.h
@@ -0,0 +1,113 @@
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020-2021 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ */
+#ifndef MICROPY_INCLUDED_RP2_MPHALPORT_H
+#define MICROPY_INCLUDED_RP2_MPHALPORT_H
+
+#include "py/mpconfig.h"
+#include "py/ringbuf.h"
+#include "pico/time.h"
+
+extern int mp_interrupt_char;
+extern ringbuf_t stdin_ringbuf;
+
+void mp_hal_set_interrupt_char(int c);
+
+static inline void mp_hal_delay_us(mp_uint_t us) {
+    sleep_us(us);
+}
+
+static inline void mp_hal_delay_us_fast(mp_uint_t us) {
+    busy_wait_us(us);
+}
+
+#define mp_hal_quiet_timing_enter() MICROPY_BEGIN_ATOMIC_SECTION()
+#define mp_hal_quiet_timing_exit(irq_state) MICROPY_END_ATOMIC_SECTION(irq_state)
+
+static inline mp_uint_t mp_hal_ticks_us(void) {
+    return time_us_32();
+}
+
+static inline mp_uint_t mp_hal_ticks_ms(void) {
+    return to_ms_since_boot(get_absolute_time());
+}
+
+static inline mp_uint_t mp_hal_ticks_cpu(void) {
+    // ticks_cpu() is defined as using the highest-resolution timing source
+    // in the system. This is usually a CPU clock, but doesn't have to be.
+    return time_us_32();
+}
+
+// C-level pin HAL
+
+#include "py/obj.h"
+#include "hardware/gpio.h"
+
+#define MP_HAL_PIN_FMT "%u"
+#define mp_hal_pin_obj_t uint
+
+extern uint32_t machine_pin_open_drain_mask;
+
+mp_hal_pin_obj_t mp_hal_get_pin_obj(mp_obj_t pin_in);
+
+static inline unsigned int mp_hal_pin_name(mp_hal_pin_obj_t pin) {
+    return pin;
+}
+
+static inline void mp_hal_pin_input(mp_hal_pin_obj_t pin) {
+    gpio_set_function(pin, GPIO_FUNC_SIO);
+    gpio_set_dir(pin, GPIO_IN);
+    machine_pin_open_drain_mask &= ~(1 << pin);
+}
+
+static inline void mp_hal_pin_output(mp_hal_pin_obj_t pin) {
+    gpio_set_function(pin, GPIO_FUNC_SIO);
+    gpio_set_dir(pin, GPIO_OUT);
+    machine_pin_open_drain_mask &= ~(1 << pin);
+}
+
+static inline void mp_hal_pin_open_drain(mp_hal_pin_obj_t pin) {
+    gpio_set_function(pin, GPIO_FUNC_SIO);
+    gpio_set_dir(pin, GPIO_IN);
+    gpio_put(pin, 0);
+    machine_pin_open_drain_mask |= 1 << pin;
+}
+
+static inline int mp_hal_pin_read(mp_hal_pin_obj_t pin) {
+    return gpio_get(pin);
+}
+
+static inline void mp_hal_pin_write(mp_hal_pin_obj_t pin, int v) {
+    gpio_put(pin, v);
+}
+
+static inline void mp_hal_pin_od_low(mp_hal_pin_obj_t pin) {
+    gpio_set_dir(pin, GPIO_OUT);
+}
+
+static inline void mp_hal_pin_od_high(mp_hal_pin_obj_t pin) {
+    gpio_set_dir(pin, GPIO_IN);
+}
+
+#endif // MICROPY_INCLUDED_RP2_MPHALPORT_H
diff --git a/ports/rp2/mpthreadport.c b/ports/rp2/mpthreadport.c
new file mode 100644
index 0000000000000..fb4428772afc1
--- /dev/null
+++ b/ports/rp2/mpthreadport.c
@@ -0,0 +1,105 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020-2021 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "py/runtime.h"
+#include "py/gc.h"
+#include "py/mpthread.h"
+#include "pico/stdlib.h"
+#include "pico/multicore.h"
+
+#if MICROPY_PY_THREAD
+
+extern uint8_t __StackTop, __StackBottom;
+
+void *core_state[2];
+
+STATIC void *(*core1_entry)(void *) = NULL;
+STATIC void *core1_arg = NULL;
+STATIC uint32_t *core1_stack = NULL;
+STATIC size_t core1_stack_num_words = 0;
+
+void mp_thread_init(void) {
+    mp_thread_set_state(&mp_state_ctx.thread);
+    core1_entry = NULL;
+}
+
+void mp_thread_gc_others(void) {
+    if (get_core_num() == 0) {
+        // GC running on core0, trace core1's stack, if it's running.
+        if (core1_entry != NULL) {
+            gc_collect_root((void **)core1_stack, core1_stack_num_words);
+        }
+    } else {
+        // GC running on core1, trace core0's stack.
+        gc_collect_root((void **)&__StackBottom, (&__StackTop - &__StackBottom) / sizeof(uintptr_t));
+    }
+}
+
+STATIC void core1_entry_wrapper(void) {
+    if (core1_entry) {
+        core1_entry(core1_arg);
+    }
+    core1_entry = NULL;
+    // returning from here will loop the core forever (WFI)
+}
+
+void mp_thread_create(void *(*entry)(void *), void *arg, size_t *stack_size) {
+    // Check if core1 is already in use.
+    if (core1_entry != NULL) {
+        mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("core1 in use"));
+    }
+
+    core1_entry = entry;
+    core1_arg = arg;
+
+    if (*stack_size == 0) {
+        *stack_size = 4096; // default stack size
+    } else if (*stack_size < 2048) {
+        *stack_size = 2048; // minimum stack size
+    }
+
+    // Round stack size to a multiple of the word size.
+    core1_stack_num_words = *stack_size / sizeof(uint32_t);
+    *stack_size = core1_stack_num_words * sizeof(uint32_t);
+
+    // Allocate stack.
+    core1_stack = m_new(uint32_t, core1_stack_num_words);
+
+    // Create thread on core1.
+    multicore_reset_core1();
+    multicore_launch_core1_with_stack(core1_entry_wrapper, core1_stack, *stack_size);
+
+    // Adjust stack_size to provide room to recover from hitting the limit.
+    *stack_size -= 512;
+}
+
+void mp_thread_start(void) {
+}
+
+void mp_thread_finish(void) {
+}
+
+#endif // MICROPY_PY_THREAD
diff --git a/ports/rp2/mpthreadport.h b/ports/rp2/mpthreadport.h
new file mode 100644
index 0000000000000..4583f6f5391f8
--- /dev/null
+++ b/ports/rp2/mpthreadport.h
@@ -0,0 +1,64 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020-2021 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+#ifndef MICROPY_INCLUDED_RP2_MPTHREADPORT_H
+#define MICROPY_INCLUDED_RP2_MPTHREADPORT_H
+
+#include "py/mpthread.h"
+#include "pico/mutex.h"
+
+typedef struct mutex mp_thread_mutex_t;
+
+extern void *core_state[2];
+
+void mp_thread_init(void);
+void mp_thread_gc_others(void);
+
+static inline void mp_thread_set_state(struct _mp_state_thread_t *state) {
+    core_state[get_core_num()] = state;
+}
+
+static inline struct _mp_state_thread_t *mp_thread_get_state(void) {
+    return core_state[get_core_num()];
+}
+
+static inline void mp_thread_mutex_init(mp_thread_mutex_t *m) {
+    mutex_init(m);
+}
+
+static inline int mp_thread_mutex_lock(mp_thread_mutex_t *m, int wait) {
+    if (wait) {
+        mutex_enter_blocking(m);
+        return 1;
+    } else {
+        return mutex_try_enter(m, NULL);
+    }
+}
+
+static inline void mp_thread_mutex_unlock(mp_thread_mutex_t *m) {
+    mutex_exit(m);
+}
+
+#endif // MICROPY_INCLUDED_RP2_MPTHREADPORT_H
diff --git a/ports/rp2/qstrdefsport.h b/ports/rp2/qstrdefsport.h
new file mode 100644
index 0000000000000..472d05f4375f6
--- /dev/null
+++ b/ports/rp2/qstrdefsport.h
@@ -0,0 +1,3 @@
+// qstrs specific to this port
+// *FORMAT-OFF*
+Q(/lib)
diff --git a/ports/rp2/rp2_flash.c b/ports/rp2/rp2_flash.c
new file mode 100644
index 0000000000000..cd1bc65489dfc
--- /dev/null
+++ b/ports/rp2/rp2_flash.c
@@ -0,0 +1,146 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020-2021 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include <string.h>
+
+#include "py/runtime.h"
+#include "extmod/vfs.h"
+#include "modrp2.h"
+#include "hardware/flash.h"
+#include "pico/binary_info.h"
+
+#define BLOCK_SIZE_BYTES (FLASH_SECTOR_SIZE)
+
+#ifndef MICROPY_HW_FLASH_STORAGE_BYTES
+#define MICROPY_HW_FLASH_STORAGE_BYTES (1408 * 1024)
+#endif
+
+#ifndef MICROPY_HW_FLASH_STORAGE_BASE
+#define MICROPY_HW_FLASH_STORAGE_BASE (PICO_FLASH_SIZE_BYTES - MICROPY_HW_FLASH_STORAGE_BYTES)
+#endif
+
+static_assert(MICROPY_HW_FLASH_STORAGE_BASE + MICROPY_HW_FLASH_STORAGE_BYTES <= PICO_FLASH_SIZE_BYTES, "MICROPY_HW_FLASH_STORAGE_BYTES too big");
+
+typedef struct _rp2_flash_obj_t {
+    mp_obj_base_t base;
+    uint32_t flash_base;
+    uint32_t flash_size;
+} rp2_flash_obj_t;
+
+STATIC rp2_flash_obj_t rp2_flash_obj = {
+    .base = { &rp2_flash_type },
+    .flash_base = MICROPY_HW_FLASH_STORAGE_BASE,
+    .flash_size = MICROPY_HW_FLASH_STORAGE_BYTES,
+};
+
+// Tag the flash drive in the binary as readable/writable (but not reformatable)
+bi_decl(bi_block_device(
+    BINARY_INFO_TAG_MICROPYTHON,
+    "MicroPython",
+    XIP_BASE + MICROPY_HW_FLASH_STORAGE_BASE,
+    MICROPY_HW_FLASH_STORAGE_BYTES,
+    NULL,
+    BINARY_INFO_BLOCK_DEV_FLAG_READ |
+    BINARY_INFO_BLOCK_DEV_FLAG_WRITE |
+    BINARY_INFO_BLOCK_DEV_FLAG_PT_UNKNOWN));
+
+STATIC mp_obj_t rp2_flash_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
+    // Check args.
+    mp_arg_check_num(n_args, n_kw, 0, 0, false);
+
+    // Return singleton object.
+    return MP_OBJ_FROM_PTR(&rp2_flash_obj);
+}
+
+STATIC mp_obj_t rp2_flash_readblocks(size_t n_args, const mp_obj_t *args) {
+    rp2_flash_obj_t *self = MP_OBJ_TO_PTR(args[0]);
+    uint32_t offset = mp_obj_get_int(args[1]) * BLOCK_SIZE_BYTES;
+    mp_buffer_info_t bufinfo;
+    mp_get_buffer_raise(args[2], &bufinfo, MP_BUFFER_WRITE);
+    if (n_args == 4) {
+        offset += mp_obj_get_int(args[3]);
+    }
+    memcpy(bufinfo.buf, (void *)(XIP_BASE + self->flash_base + offset), bufinfo.len);
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(rp2_flash_readblocks_obj, 3, 4, rp2_flash_readblocks);
+
+STATIC mp_obj_t rp2_flash_writeblocks(size_t n_args, const mp_obj_t *args) {
+    rp2_flash_obj_t *self = MP_OBJ_TO_PTR(args[0]);
+    uint32_t offset = mp_obj_get_int(args[1]) * BLOCK_SIZE_BYTES;
+    mp_buffer_info_t bufinfo;
+    mp_get_buffer_raise(args[2], &bufinfo, MP_BUFFER_READ);
+    if (n_args == 3) {
+        flash_range_erase(self->flash_base + offset, bufinfo.len);
+        // TODO check return value
+    } else {
+        offset += mp_obj_get_int(args[3]);
+    }
+    flash_range_program(self->flash_base + offset, bufinfo.buf, bufinfo.len);
+    // TODO check return value
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(rp2_flash_writeblocks_obj, 3, 4, rp2_flash_writeblocks);
+
+STATIC mp_obj_t rp2_flash_ioctl(mp_obj_t self_in, mp_obj_t cmd_in, mp_obj_t arg_in) {
+    rp2_flash_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    mp_int_t cmd = mp_obj_get_int(cmd_in);
+    switch (cmd) {
+        case MP_BLOCKDEV_IOCTL_INIT:
+            return MP_OBJ_NEW_SMALL_INT(0);
+        case MP_BLOCKDEV_IOCTL_DEINIT:
+            return MP_OBJ_NEW_SMALL_INT(0);
+        case MP_BLOCKDEV_IOCTL_SYNC:
+            return MP_OBJ_NEW_SMALL_INT(0);
+        case MP_BLOCKDEV_IOCTL_BLOCK_COUNT:
+            return MP_OBJ_NEW_SMALL_INT(self->flash_size / BLOCK_SIZE_BYTES);
+        case MP_BLOCKDEV_IOCTL_BLOCK_SIZE:
+            return MP_OBJ_NEW_SMALL_INT(BLOCK_SIZE_BYTES);
+        case MP_BLOCKDEV_IOCTL_BLOCK_ERASE: {
+            uint32_t offset = mp_obj_get_int(arg_in) * BLOCK_SIZE_BYTES;
+            flash_range_erase(self->flash_base + offset, BLOCK_SIZE_BYTES);
+            // TODO check return value
+            return MP_OBJ_NEW_SMALL_INT(0);
+        }
+        default:
+            return mp_const_none;
+    }
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_3(rp2_flash_ioctl_obj, rp2_flash_ioctl);
+
+STATIC const mp_rom_map_elem_t rp2_flash_locals_dict_table[] = {
+    { MP_ROM_QSTR(MP_QSTR_readblocks), MP_ROM_PTR(&rp2_flash_readblocks_obj) },
+    { MP_ROM_QSTR(MP_QSTR_writeblocks), MP_ROM_PTR(&rp2_flash_writeblocks_obj) },
+    { MP_ROM_QSTR(MP_QSTR_ioctl), MP_ROM_PTR(&rp2_flash_ioctl_obj) },
+};
+STATIC MP_DEFINE_CONST_DICT(rp2_flash_locals_dict, rp2_flash_locals_dict_table);
+
+const mp_obj_type_t rp2_flash_type = {
+    { &mp_type_type },
+    .name = MP_QSTR_Flash,
+    .make_new = rp2_flash_make_new,
+    .locals_dict = (mp_obj_dict_t *)&rp2_flash_locals_dict,
+};
diff --git a/ports/rp2/rp2_pio.c b/ports/rp2/rp2_pio.c
new file mode 100644
index 0000000000000..c8542127c03ba
--- /dev/null
+++ b/ports/rp2/rp2_pio.c
@@ -0,0 +1,780 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020-2021 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include <string.h>
+
+#include "py/binary.h"
+#include "py/runtime.h"
+#include "py/mperrno.h"
+#include "py/mphal.h"
+#include "lib/utils/mpirq.h"
+#include "modrp2.h"
+
+#include "hardware/clocks.h"
+#include "hardware/irq.h"
+#include "hardware/pio.h"
+
+#define PIO_NUM(pio) ((pio) == pio0 ? 0 : 1)
+
+typedef struct _rp2_pio_obj_t {
+    mp_obj_base_t base;
+    PIO pio;
+    uint8_t irq;
+} rp2_pio_obj_t;
+
+typedef struct _rp2_pio_irq_obj_t {
+    mp_irq_obj_t base;
+    uint32_t flags;
+    uint32_t trigger;
+} rp2_pio_irq_obj_t;
+
+typedef struct _rp2_state_machine_obj_t {
+    mp_obj_base_t base;
+    PIO pio;
+    uint8_t irq;
+    uint8_t sm; // 0-3
+    uint8_t id; // 0-7
+} rp2_state_machine_obj_t;
+
+typedef struct _rp2_state_machine_irq_obj_t {
+    mp_irq_obj_t base;
+    uint8_t flags;
+    uint8_t trigger;
+} rp2_state_machine_irq_obj_t;
+
+STATIC const rp2_state_machine_obj_t rp2_state_machine_obj[8];
+
+STATIC mp_obj_t rp2_state_machine_init_helper(const rp2_state_machine_obj_t *self, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args);
+
+STATIC void pio_irq0(PIO pio) {
+    uint32_t ints = pio->ints0;
+
+    // Acknowledge SM0-3 IRQs if they are enabled on this IRQ0.
+    pio->irq = ints >> 8;
+
+    // Call handler if it is registered, for PIO irqs.
+    rp2_pio_irq_obj_t *irq = MP_STATE_PORT(rp2_pio_irq_obj[PIO_NUM(pio)]);
+    if (irq != NULL && (ints & irq->trigger)) {
+        irq->flags = ints & irq->trigger;
+        mp_irq_handler(&irq->base);
+    }
+
+    // Call handler if it is registered, for StateMachine irqs.
+    for (size_t i = 0; i < 4; ++i) {
+        rp2_state_machine_irq_obj_t *irq = MP_STATE_PORT(rp2_state_machine_irq_obj[PIO_NUM(pio) * 4 + i]);
+        if (irq != NULL && ((ints >> (8 + i)) & irq->trigger)) {
+            irq->flags = 1;
+            mp_irq_handler(&irq->base);
+        }
+    }
+}
+
+STATIC void pio0_irq0(void) {
+    pio_irq0(pio0);
+}
+
+STATIC void pio1_irq0(void) {
+    pio_irq0(pio1);
+}
+
+void rp2_pio_init(void) {
+    // Reset all PIO instruction memory.
+    pio_clear_instruction_memory(pio0);
+    pio_clear_instruction_memory(pio1);
+
+    // Set up interrupts.
+    memset(MP_STATE_PORT(rp2_pio_irq_obj), 0, sizeof(MP_STATE_PORT(rp2_pio_irq_obj)));
+    memset(MP_STATE_PORT(rp2_state_machine_irq_obj), 0, sizeof(MP_STATE_PORT(rp2_state_machine_irq_obj)));
+    irq_set_exclusive_handler(PIO0_IRQ_0, pio0_irq0);
+    irq_set_exclusive_handler(PIO1_IRQ_0, pio1_irq0);
+}
+
+void rp2_pio_deinit(void) {
+    // Disable and clear interrupts.
+    irq_set_mask_enabled((1u << PIO0_IRQ_0) | (1u << PIO0_IRQ_1), false);
+    irq_remove_handler(PIO0_IRQ_0, pio0_irq0);
+    irq_remove_handler(PIO1_IRQ_0, pio1_irq0);
+}
+
+/******************************************************************************/
+// Helper functions to manage asm_pio data structure.
+
+#define ASM_PIO_CONFIG_DEFAULT { -1, 0, 0, 0 };
+
+enum {
+    PROG_DATA,
+    PROG_OFFSET_PIO0,
+    PROG_OFFSET_PIO1,
+    PROG_EXECCTRL,
+    PROG_SHIFTCTRL,
+    PROG_OUT_PINS,
+    PROG_SET_PINS,
+    PROG_SIDESET_PINS,
+    PROG_MAX_FIELDS,
+};
+
+typedef struct _asm_pio_config_t {
+    int8_t base;
+    uint8_t count;
+    uint8_t pindirs;
+    uint8_t pinvals;
+} asm_pio_config_t;
+
+STATIC void asm_pio_override_shiftctrl(mp_obj_t arg, uint32_t bits, uint32_t lsb, pio_sm_config *config) {
+    if (arg != mp_const_none) {
+        config->shiftctrl = (config->shiftctrl & ~bits) | (mp_obj_get_int(arg) << lsb);
+    }
+}
+
+STATIC void asm_pio_get_pins(const char *type, mp_obj_t prog_pins, mp_obj_t arg_base, asm_pio_config_t *config) {
+    if (prog_pins != mp_const_none) {
+        // The PIO program specified pins for initialisation on out/set/sideset.
+        if (mp_obj_is_integer(prog_pins)) {
+            // A single pin specified, set its dir and value.
+            config->count = 1;
+            mp_int_t value = mp_obj_get_int(prog_pins);
+            config->pindirs = value >> 1;
+            config->pinvals = value & 1;
+        } else {
+            // An array of pins specified, set their dirs and values.
+            size_t count;
+            mp_obj_t *items;
+            mp_obj_get_array(prog_pins, &count, &items);
+            config->count = count;
+            for (size_t i = 0; i < config->count; ++i) {
+                mp_int_t value = mp_obj_get_int(items[i]);
+                config->pindirs |= (value >> 1) << i;
+                config->pinvals |= (value & 1) << i;
+            }
+        }
+    }
+
+    if (arg_base != mp_const_none) {
+        // The instantiation of the PIO program specified a base pin.
+        config->base = mp_hal_get_pin_obj(arg_base);
+    }
+}
+
+STATIC void asm_pio_init_gpio(PIO pio, uint32_t sm, asm_pio_config_t *config) {
+    uint32_t pinmask = ((1 << config->count) - 1) << config->base;
+    pio_sm_set_pins_with_mask(pio, sm, config->pinvals << config->base, pinmask);
+    pio_sm_set_pindirs_with_mask(pio, sm, config->pindirs << config->base, pinmask);
+    for (size_t i = 0; i < config->count; ++i) {
+        gpio_set_function(config->base + i, pio == pio0 ? GPIO_FUNC_PIO0 : GPIO_FUNC_PIO1);
+    }
+}
+
+/******************************************************************************/
+// PIO object
+
+STATIC const mp_irq_methods_t rp2_pio_irq_methods;
+
+STATIC rp2_pio_obj_t rp2_pio_obj[] = {
+    { { &rp2_pio_type }, pio0, PIO0_IRQ_0 },
+    { { &rp2_pio_type }, pio1, PIO1_IRQ_0 },
+};
+
+STATIC void rp2_pio_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+    rp2_pio_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    mp_printf(print, "PIO(%u)", self->pio == pio0 ? 0 : 1);
+}
+
+// constructor(id)
+STATIC mp_obj_t rp2_pio_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
+    mp_arg_check_num(n_args, n_kw, 1, 1, false);
+
+    // Get the PIO object.
+    int pio_id = mp_obj_get_int(args[0]);
+    if (!(0 <= pio_id && pio_id < MP_ARRAY_SIZE(rp2_pio_obj))) {
+        mp_raise_ValueError("invalid PIO");
+    }
+    const rp2_pio_obj_t *self = &rp2_pio_obj[pio_id];
+
+    // Return the PIO object.
+    return MP_OBJ_FROM_PTR(self);
+}
+
+// PIO.add_program(prog)
+STATIC mp_obj_t rp2_pio_add_program(mp_obj_t self_in, mp_obj_t prog_in) {
+    rp2_pio_obj_t *self = MP_OBJ_TO_PTR(self_in);
+
+    // Get the program data.
+    mp_obj_t *prog;
+    mp_obj_get_array_fixed_n(prog_in, PROG_MAX_FIELDS, &prog);
+    mp_buffer_info_t bufinfo;
+    mp_get_buffer_raise(prog[PROG_DATA], &bufinfo, MP_BUFFER_READ);
+
+    // Add the program data to the PIO instruction memory.
+    struct pio_program pio_program = { bufinfo.buf, bufinfo.len / 2, -1 };
+    if (!pio_can_add_program(self->pio, &pio_program)) {
+        mp_raise_OSError(MP_ENOMEM);
+    }
+    uint offset = pio_add_program(self->pio, &pio_program);
+
+    // Store the program offset in the program object.
+    prog[PROG_OFFSET_PIO0 + PIO_NUM(self->pio)] = MP_OBJ_NEW_SMALL_INT(offset);
+
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(rp2_pio_add_program_obj, rp2_pio_add_program);
+
+// PIO.remove_program([prog])
+STATIC mp_obj_t rp2_pio_remove_program(size_t n_args, const mp_obj_t *args) {
+    rp2_pio_obj_t *self = MP_OBJ_TO_PTR(args[0]);
+
+    // Default to remove all programs.
+    uint8_t length = 32;
+    uint offset = 0;
+
+    if (n_args > 1) {
+        // Get specific program to remove.
+        mp_obj_t *prog;
+        mp_obj_get_array_fixed_n(args[1], PROG_MAX_FIELDS, &prog);
+        mp_buffer_info_t bufinfo;
+        mp_get_buffer_raise(prog[PROG_DATA], &bufinfo, MP_BUFFER_READ);
+        length = bufinfo.len / 2;
+        offset = mp_obj_get_int(prog[PROG_OFFSET_PIO0 + PIO_NUM(self->pio)]);
+        if (offset < 0) {
+            mp_raise_ValueError("prog not in instruction memory");
+        }
+        // Invalidate the program offset in the program object.
+        prog[PROG_OFFSET_PIO0 + PIO_NUM(self->pio)] = MP_OBJ_NEW_SMALL_INT(-1);
+    }
+
+    // Remove the program from the instruction memory.
+    struct pio_program pio_program = { NULL, length, -1 };
+    pio_remove_program(self->pio, &pio_program, offset);
+
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(rp2_pio_remove_program_obj, 1, 2, rp2_pio_remove_program);
+
+// PIO.state_machine(id, prog, freq=-1, *, set=None)
+STATIC mp_obj_t rp2_pio_state_machine(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    rp2_pio_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]);
+
+    // Get and verify the state machine id.
+    mp_int_t sm_id = mp_obj_get_int(pos_args[1]);
+    if (!(0 <= sm_id && sm_id < 4)) {
+        mp_raise_ValueError("invalide state machine");
+    }
+
+    // Return the correct StateMachine object.
+    const rp2_state_machine_obj_t *sm = &rp2_state_machine_obj[(self->pio == pio0 ? 0 : 4) + sm_id];
+
+    if (n_args > 2 || kw_args->used > 0) {
+        // Configuration arguments given so init this StateMachine.
+        rp2_state_machine_init_helper(sm, n_args - 2, pos_args + 2, kw_args);
+    }
+
+    return MP_OBJ_FROM_PTR(sm);
+}
+MP_DEFINE_CONST_FUN_OBJ_KW(rp2_pio_state_machine_obj, 2, rp2_pio_state_machine);
+
+// PIO.irq(handler=None, trigger=IRQ_SM0|IRQ_SM1|IRQ_SM2|IRQ_SM3, hard=False)
+STATIC mp_obj_t rp2_pio_irq(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    enum { ARG_handler, ARG_trigger, ARG_hard };
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_handler, MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
+        { MP_QSTR_trigger, MP_ARG_INT, {.u_int = 0xf00} },
+        { MP_QSTR_hard, MP_ARG_BOOL, {.u_bool = false} },
+    };
+
+    // Parse the arguments.
+    rp2_pio_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]);
+    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
+    mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
+
+    // Get the IRQ object.
+    rp2_pio_irq_obj_t *irq = MP_STATE_PORT(rp2_pio_irq_obj[PIO_NUM(self->pio)]);
+
+    // Allocate the IRQ object if it doesn't already exist.
+    if (irq == NULL) {
+        irq = m_new_obj(rp2_pio_irq_obj_t);
+        irq->base.base.type = &mp_irq_type;
+        irq->base.methods = (mp_irq_methods_t *)&rp2_pio_irq_methods;
+        irq->base.parent = MP_OBJ_FROM_PTR(self);
+        irq->base.handler = mp_const_none;
+        irq->base.ishard = false;
+        MP_STATE_PORT(rp2_pio_irq_obj[PIO_NUM(self->pio)]) = irq;
+    }
+
+    if (n_args > 1 || kw_args->used != 0) {
+        // Configure IRQ.
+
+        // Disable all IRQs while data is updated.
+        irq_set_enabled(self->irq, false);
+
+        // Update IRQ data.
+        irq->base.handler = args[ARG_handler].u_obj;
+        irq->base.ishard = args[ARG_hard].u_bool;
+        irq->flags = 0;
+        irq->trigger = args[ARG_trigger].u_int;
+
+        // Enable IRQ if a handler is given.
+        if (args[ARG_handler].u_obj != mp_const_none) {
+            self->pio->inte0 = irq->trigger;
+            irq_set_enabled(self->irq, true);
+        }
+    }
+
+    return MP_OBJ_FROM_PTR(irq);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_KW(rp2_pio_irq_obj, 1, rp2_pio_irq);
+
+STATIC const mp_rom_map_elem_t rp2_pio_locals_dict_table[] = {
+    { MP_ROM_QSTR(MP_QSTR_add_program), MP_ROM_PTR(&rp2_pio_add_program_obj) },
+    { MP_ROM_QSTR(MP_QSTR_remove_program), MP_ROM_PTR(&rp2_pio_remove_program_obj) },
+    { MP_ROM_QSTR(MP_QSTR_state_machine), MP_ROM_PTR(&rp2_pio_state_machine_obj) },
+    { MP_ROM_QSTR(MP_QSTR_irq), MP_ROM_PTR(&rp2_pio_irq_obj) },
+
+    { MP_ROM_QSTR(MP_QSTR_IN_LOW), MP_ROM_INT(0) },
+    { MP_ROM_QSTR(MP_QSTR_IN_HIGH), MP_ROM_INT(1) },
+    { MP_ROM_QSTR(MP_QSTR_OUT_LOW), MP_ROM_INT(2) },
+    { MP_ROM_QSTR(MP_QSTR_OUT_HIGH), MP_ROM_INT(3) },
+
+    { MP_ROM_QSTR(MP_QSTR_SHIFT_LEFT), MP_ROM_INT(0) },
+    { MP_ROM_QSTR(MP_QSTR_SHIFT_RIGHT), MP_ROM_INT(1) },
+
+    { MP_ROM_QSTR(MP_QSTR_IRQ_SM0), MP_ROM_INT(0x100) },
+    { MP_ROM_QSTR(MP_QSTR_IRQ_SM1), MP_ROM_INT(0x200) },
+    { MP_ROM_QSTR(MP_QSTR_IRQ_SM2), MP_ROM_INT(0x400) },
+    { MP_ROM_QSTR(MP_QSTR_IRQ_SM3), MP_ROM_INT(0x800) },
+};
+STATIC MP_DEFINE_CONST_DICT(rp2_pio_locals_dict, rp2_pio_locals_dict_table);
+
+const mp_obj_type_t rp2_pio_type = {
+    { &mp_type_type },
+    .name = MP_QSTR_PIO,
+    .print = rp2_pio_print,
+    .make_new = rp2_pio_make_new,
+    .locals_dict = (mp_obj_dict_t *)&rp2_pio_locals_dict,
+};
+
+STATIC mp_uint_t rp2_pio_irq_trigger(mp_obj_t self_in, mp_uint_t new_trigger) {
+    rp2_pio_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    rp2_pio_irq_obj_t *irq = MP_STATE_PORT(rp2_pio_irq_obj[PIO_NUM(self->pio)]);
+    irq_set_enabled(self->irq, false);
+    irq->flags = 0;
+    irq->trigger = new_trigger;
+    irq_set_enabled(self->irq, true);
+    return 0;
+}
+
+STATIC mp_uint_t rp2_pio_irq_info(mp_obj_t self_in, mp_uint_t info_type) {
+    rp2_pio_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    rp2_pio_irq_obj_t *irq = MP_STATE_PORT(rp2_pio_irq_obj[PIO_NUM(self->pio)]);
+    if (info_type == MP_IRQ_INFO_FLAGS) {
+        return irq->flags;
+    } else if (info_type == MP_IRQ_INFO_TRIGGERS) {
+        return irq->trigger;
+    }
+    return 0;
+}
+
+STATIC const mp_irq_methods_t rp2_pio_irq_methods = {
+    .trigger = rp2_pio_irq_trigger,
+    .info = rp2_pio_irq_info,
+};
+
+/******************************************************************************/
+// StateMachine object
+
+STATIC const mp_irq_methods_t rp2_state_machine_irq_methods;
+
+STATIC const rp2_state_machine_obj_t rp2_state_machine_obj[] = {
+    { { &rp2_state_machine_type }, pio0, PIO0_IRQ_0, 0, 0 },
+    { { &rp2_state_machine_type }, pio0, PIO0_IRQ_0, 1, 1 },
+    { { &rp2_state_machine_type }, pio0, PIO0_IRQ_0, 2, 2 },
+    { { &rp2_state_machine_type }, pio0, PIO0_IRQ_0, 3, 3 },
+    { { &rp2_state_machine_type }, pio1, PIO1_IRQ_0, 0, 4 },
+    { { &rp2_state_machine_type }, pio1, PIO1_IRQ_0, 1, 5 },
+    { { &rp2_state_machine_type }, pio1, PIO1_IRQ_0, 2, 6 },
+    { { &rp2_state_machine_type }, pio1, PIO1_IRQ_0, 3, 7 },
+};
+
+STATIC void rp2_state_machine_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+    rp2_state_machine_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    mp_printf(print, "StateMachine(%u)", self->id);
+}
+
+// StateMachine.init(prog, freq=-1, *,
+//     in_base=None, out_base=None, set_base=None, sideset_base=None,
+//     in_shiftdir=None, out_shiftdir=None, push_thresh=None, pull_thresh=None,
+// )
+STATIC mp_obj_t rp2_state_machine_init_helper(const rp2_state_machine_obj_t *self, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    enum {
+        ARG_prog, ARG_freq,
+        ARG_in_base, ARG_out_base, ARG_set_base, ARG_sideset_base,
+        ARG_in_shiftdir, ARG_out_shiftdir, ARG_push_thresh, ARG_pull_thresh
+    };
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_prog, MP_ARG_REQUIRED | MP_ARG_OBJ },
+        { MP_QSTR_freq, MP_ARG_INT, {.u_int = -1} },
+        { MP_QSTR_in_base, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
+        { MP_QSTR_out_base, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
+        { MP_QSTR_set_base, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
+        { MP_QSTR_sideset_base, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
+        { MP_QSTR_in_shiftdir, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
+        { MP_QSTR_out_shiftdir, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
+        { MP_QSTR_push_thresh, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
+        { MP_QSTR_pull_thresh, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
+    };
+
+    // Parse the arguments.
+    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
+    mp_arg_parse_all(n_args, pos_args, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
+
+    // Get the program.
+    mp_obj_t *prog;
+    mp_obj_get_array_fixed_n(args[ARG_prog].u_obj, PROG_MAX_FIELDS, &prog);
+
+    // Get and the program offset, and load it into memory if it's not already there.
+    mp_int_t offset = mp_obj_get_int(prog[PROG_OFFSET_PIO0 + PIO_NUM(self->pio)]);
+    if (offset < 0) {
+        rp2_pio_add_program(&rp2_pio_obj[PIO_NUM(self->pio)], args[ARG_prog].u_obj);
+        offset = mp_obj_get_int(prog[PROG_OFFSET_PIO0 + PIO_NUM(self->pio)]);
+    }
+
+    // Compute the clock divider.
+    float div;
+    if (args[ARG_freq].u_int < 0) {
+        div = 1;
+    } else if (args[ARG_freq].u_int == 0) {
+        div = 0;
+    } else {
+        div = (float)clock_get_hz(clk_sys) / (float)args[ARG_freq].u_int;
+    }
+
+    // Disable and reset the state machine.
+    pio_sm_init(self->pio, self->sm, offset, NULL);
+
+    // Build the state machine config.
+    pio_sm_config config = pio_get_default_sm_config();
+    sm_config_set_clkdiv(&config, div);
+    config.execctrl = mp_obj_get_int_truncated(prog[PROG_EXECCTRL]);
+    config.shiftctrl = mp_obj_get_int_truncated(prog[PROG_SHIFTCTRL]);
+
+    // Adjust wrap top/bottom to account for location of program in instruction memory.
+    config.execctrl += (offset << PIO_SM0_EXECCTRL_WRAP_TOP_LSB)
+        + (offset << PIO_SM0_EXECCTRL_WRAP_BOTTOM_LSB);
+
+    // Configure in pin base, if needed.
+    if (args[ARG_in_base].u_obj != mp_const_none) {
+        sm_config_set_in_pins(&config, mp_hal_get_pin_obj(args[ARG_in_base].u_obj));
+    }
+
+    // Configure out pins, if needed.
+    asm_pio_config_t out_config = ASM_PIO_CONFIG_DEFAULT;
+    asm_pio_get_pins("out", prog[PROG_OUT_PINS], args[ARG_out_base].u_obj, &out_config);
+    if (out_config.base >= 0) {
+        sm_config_set_out_pins(&config, out_config.base, out_config.count);
+    }
+
+    // Configure set pin, if needed.
+    asm_pio_config_t set_config = ASM_PIO_CONFIG_DEFAULT;
+    asm_pio_get_pins("set", prog[PROG_SET_PINS], args[ARG_set_base].u_obj, &set_config);
+    if (set_config.base >= 0) {
+        sm_config_set_set_pins(&config, set_config.base, set_config.count);
+    }
+
+    // Configure sideset pin, if needed.
+    asm_pio_config_t sideset_config = ASM_PIO_CONFIG_DEFAULT;
+    asm_pio_get_pins("sideset", prog[PROG_SIDESET_PINS], args[ARG_sideset_base].u_obj, &sideset_config);
+    if (sideset_config.base >= 0) {
+        uint32_t count = sideset_config.count;
+        if (config.execctrl & (1 << PIO_SM0_EXECCTRL_SIDE_EN_LSB)) {
+            // When sideset is optional, count includes the option bit.
+            ++count;
+        }
+        config.pinctrl |= count << PIO_SM0_PINCTRL_SIDESET_COUNT_LSB;
+        sm_config_set_sideset_pins(&config, sideset_config.base);
+    }
+
+    // Override shift state if needed.
+    asm_pio_override_shiftctrl(args[ARG_in_shiftdir].u_obj, PIO_SM0_SHIFTCTRL_IN_SHIFTDIR_BITS, PIO_SM0_SHIFTCTRL_IN_SHIFTDIR_LSB, &config);
+    asm_pio_override_shiftctrl(args[ARG_out_shiftdir].u_obj, PIO_SM0_SHIFTCTRL_OUT_SHIFTDIR_BITS, PIO_SM0_SHIFTCTRL_OUT_SHIFTDIR_LSB, &config);
+    asm_pio_override_shiftctrl(args[ARG_push_thresh].u_obj, PIO_SM0_SHIFTCTRL_PUSH_THRESH_BITS, PIO_SM0_SHIFTCTRL_PUSH_THRESH_LSB, &config);
+    asm_pio_override_shiftctrl(args[ARG_pull_thresh].u_obj, PIO_SM0_SHIFTCTRL_PULL_THRESH_BITS, PIO_SM0_SHIFTCTRL_PULL_THRESH_LSB, &config);
+
+    // Configure the state machine.
+    pio_sm_set_config(self->pio, self->sm, &config);
+
+    // Configure the GPIO.
+    if (out_config.base >= 0) {
+        asm_pio_init_gpio(self->pio, self->sm, &out_config);
+    }
+    if (set_config.base >= 0) {
+        asm_pio_init_gpio(self->pio, self->sm, &set_config);
+    }
+    if (sideset_config.base >= 0) {
+        asm_pio_init_gpio(self->pio, self->sm, &sideset_config);
+    }
+
+    return mp_const_none;
+}
+
+// StateMachine(id, ...)
+STATIC mp_obj_t rp2_state_machine_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
+    mp_arg_check_num(n_args, n_kw, 1, MP_OBJ_FUN_ARGS_MAX, true);
+
+    // Get the StateMachine object.
+    mp_int_t sm_id = mp_obj_get_int(args[0]);
+    if (!(0 <= sm_id && sm_id < MP_ARRAY_SIZE(rp2_state_machine_obj))) {
+        mp_raise_ValueError("invalid StateMachine");
+    }
+    const rp2_state_machine_obj_t *self = &rp2_state_machine_obj[sm_id];
+
+    if (n_args > 1 || n_kw > 0) {
+        // Configuration arguments given so init this StateMachine.
+        mp_map_t kw_args;
+        mp_map_init_fixed_table(&kw_args, n_kw, args + n_args);
+        rp2_state_machine_init_helper(self, n_args - 1, args + 1, &kw_args);
+    }
+
+    // Return the StateMachine object.
+    return MP_OBJ_FROM_PTR(self);
+}
+
+STATIC mp_obj_t rp2_state_machine_init(size_t n_args, const mp_obj_t *args, mp_map_t *kw_args) {
+    return rp2_state_machine_init_helper(MP_OBJ_TO_PTR(args[0]), n_args - 1, args + 1, kw_args);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_KW(rp2_state_machine_init_obj, 1, rp2_state_machine_init);
+
+// StateMachine.active([value])
+STATIC mp_obj_t rp2_state_machine_active(size_t n_args, const mp_obj_t *args) {
+    rp2_state_machine_obj_t *self = MP_OBJ_TO_PTR(args[0]);
+    if (n_args > 1) {
+        pio_sm_set_enabled(self->pio, self->sm, mp_obj_is_true(args[1]));
+    }
+    return mp_obj_new_bool((self->pio->ctrl >> self->sm) & 1);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(rp2_state_machine_active_obj, 1, 2, rp2_state_machine_active);
+
+// StateMachine.exec(instr)
+STATIC mp_obj_t rp2_state_machine_exec(mp_obj_t self_in, mp_obj_t instr_in) {
+    rp2_state_machine_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    mp_obj_t rp2_module = mp_import_name(MP_QSTR_rp2, mp_const_none, MP_OBJ_NEW_SMALL_INT(0));
+    mp_obj_t asm_pio_encode = mp_load_attr(rp2_module, MP_QSTR_asm_pio_encode);
+    uint32_t sideset_count = self->pio->sm[self->sm].pinctrl >> PIO_SM0_PINCTRL_SIDESET_COUNT_LSB;
+    mp_obj_t encoded_obj = mp_call_function_2(asm_pio_encode, instr_in, MP_OBJ_NEW_SMALL_INT(sideset_count));
+    mp_int_t encoded = mp_obj_get_int(encoded_obj);
+    pio_sm_exec(self->pio, self->sm, encoded);
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(rp2_state_machine_exec_obj, rp2_state_machine_exec);
+
+// StateMachine.get(buf=None, shift=0)
+STATIC mp_obj_t rp2_state_machine_get(size_t n_args, const mp_obj_t *args) {
+    rp2_state_machine_obj_t *self = MP_OBJ_TO_PTR(args[0]);
+    mp_buffer_info_t bufinfo;
+    bufinfo.buf = NULL;
+    uint32_t shift = 0;
+    if (n_args > 1) {
+        if (args[1] != mp_const_none) {
+            mp_get_buffer_raise(args[1], &bufinfo, MP_BUFFER_WRITE);
+            if (bufinfo.typecode == BYTEARRAY_TYPECODE) {
+                bufinfo.typecode = 'b';
+            } else {
+                bufinfo.typecode |= 0x20; // make lowercase to support upper and lower
+            }
+        }
+        if (n_args > 2) {
+            shift = mp_obj_get_int(args[2]);
+        }
+    }
+    uint8_t *dest = bufinfo.buf;
+    const uint8_t *dest_top = dest + bufinfo.len;
+    for (;;) {
+        while (pio_sm_is_rx_fifo_empty(self->pio, self->sm)) {
+            // This delay must be fast.
+            mp_handle_pending(true);
+            MICROPY_HW_USBDEV_TASK_HOOK
+        }
+        uint32_t value = pio_sm_get(self->pio, self->sm) >> shift;
+        if (dest == NULL) {
+            return mp_obj_new_int_from_uint(value);
+        }
+        if (dest >= dest_top) {
+            return args[1];
+        }
+        if (bufinfo.typecode == 'b') {
+            *(uint8_t *)dest = value;
+            dest += sizeof(uint8_t);
+        } else if (bufinfo.typecode == 'h') {
+            *(uint16_t *)dest = value;
+            dest += sizeof(uint16_t);
+        } else if (bufinfo.typecode == 'i') {
+            *(uint32_t *)dest = value;
+            dest += sizeof(uint32_t);
+        } else {
+            mp_raise_ValueError("unsupported buffer type");
+        }
+    }
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(rp2_state_machine_get_obj, 1, 3, rp2_state_machine_get);
+
+// StateMachine.put(value, shift=0)
+STATIC mp_obj_t rp2_state_machine_put(size_t n_args, const mp_obj_t *args) {
+    rp2_state_machine_obj_t *self = MP_OBJ_TO_PTR(args[0]);
+    uint32_t shift = 0;
+    if (n_args > 2) {
+        shift = mp_obj_get_int(args[2]);
+    }
+    uint32_t data;
+    mp_buffer_info_t bufinfo;
+    if (!mp_get_buffer(args[1], &bufinfo, MP_BUFFER_READ)) {
+        data = mp_obj_get_int_truncated(args[1]);
+        bufinfo.buf = &data;
+        bufinfo.len = sizeof(uint32_t);
+        bufinfo.typecode = 'I';
+    }
+    const uint8_t *src = bufinfo.buf;
+    const uint8_t *src_top = src + bufinfo.len;
+    while (src < src_top) {
+        uint32_t value;
+        if (bufinfo.typecode == 'B' || bufinfo.typecode == BYTEARRAY_TYPECODE) {
+            value = *(uint8_t *)src;
+            src += sizeof(uint8_t);
+        } else if (bufinfo.typecode == 'H') {
+            value = *(uint16_t *)src;
+            src += sizeof(uint16_t);
+        } else if (bufinfo.typecode == 'I') {
+            value = *(uint32_t *)src;
+            src += sizeof(uint32_t);
+        } else {
+            mp_raise_ValueError("unsupported buffer type");
+        }
+        while (pio_sm_is_tx_fifo_full(self->pio, self->sm)) {
+            // This delay must be fast.
+            mp_handle_pending(true);
+            MICROPY_HW_USBDEV_TASK_HOOK
+        }
+        pio_sm_put(self->pio, self->sm, value << shift);
+    }
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(rp2_state_machine_put_obj, 2, 3, rp2_state_machine_put);
+
+// StateMachine.irq(handler=None, trigger=0|1, hard=False)
+STATIC mp_obj_t rp2_state_machine_irq(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    enum { ARG_handler, ARG_trigger, ARG_hard };
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_handler, MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
+        { MP_QSTR_trigger, MP_ARG_INT, {.u_int = 1} },
+        { MP_QSTR_hard, MP_ARG_BOOL, {.u_bool = false} },
+    };
+
+    // Parse the arguments.
+    rp2_state_machine_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]);
+    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
+    mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
+
+    // Get the IRQ object.
+    rp2_state_machine_irq_obj_t *irq = MP_STATE_PORT(rp2_state_machine_irq_obj[self->id]);
+
+    // Allocate the IRQ object if it doesn't already exist.
+    if (irq == NULL) {
+        irq = m_new_obj(rp2_state_machine_irq_obj_t);
+        irq->base.base.type = &mp_irq_type;
+        irq->base.methods = (mp_irq_methods_t *)&rp2_state_machine_irq_methods;
+        irq->base.parent = MP_OBJ_FROM_PTR(self);
+        irq->base.handler = mp_const_none;
+        irq->base.ishard = false;
+        MP_STATE_PORT(rp2_state_machine_irq_obj[self->id]) = irq;
+    }
+
+    if (n_args > 1 || kw_args->used != 0) {
+        // Configure IRQ.
+
+        // Disable all IRQs while data is updated.
+        irq_set_enabled(self->irq, false);
+
+        // Update IRQ data.
+        irq->base.handler = args[ARG_handler].u_obj;
+        irq->base.ishard = args[ARG_hard].u_bool;
+        irq->flags = 0;
+        irq->trigger = args[ARG_trigger].u_int;
+
+        // Enable IRQ if a handler is given.
+        if (args[ARG_handler].u_obj == mp_const_none) {
+            self->pio->inte0 &= ~(1 << (8 + self->sm));
+        } else {
+            self->pio->inte0 |= 1 << (8 + self->sm);
+        }
+
+        if (self->pio->inte0) {
+            irq_set_enabled(self->irq, true);
+        }
+    }
+
+    return MP_OBJ_FROM_PTR(irq);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_KW(rp2_state_machine_irq_obj, 1, rp2_state_machine_irq);
+
+STATIC const mp_rom_map_elem_t rp2_state_machine_locals_dict_table[] = {
+    { MP_ROM_QSTR(MP_QSTR_init), MP_ROM_PTR(&rp2_state_machine_init_obj) },
+    { MP_ROM_QSTR(MP_QSTR_active), MP_ROM_PTR(&rp2_state_machine_active_obj) },
+    { MP_ROM_QSTR(MP_QSTR_exec), MP_ROM_PTR(&rp2_state_machine_exec_obj) },
+    { MP_ROM_QSTR(MP_QSTR_get), MP_ROM_PTR(&rp2_state_machine_get_obj) },
+    { MP_ROM_QSTR(MP_QSTR_put), MP_ROM_PTR(&rp2_state_machine_put_obj) },
+    { MP_ROM_QSTR(MP_QSTR_irq), MP_ROM_PTR(&rp2_state_machine_irq_obj) },
+};
+STATIC MP_DEFINE_CONST_DICT(rp2_state_machine_locals_dict, rp2_state_machine_locals_dict_table);
+
+const mp_obj_type_t rp2_state_machine_type = {
+    { &mp_type_type },
+    .name = MP_QSTR_StateMachine,
+    .print = rp2_state_machine_print,
+    .make_new = rp2_state_machine_make_new,
+    .locals_dict = (mp_obj_dict_t *)&rp2_state_machine_locals_dict,
+};
+
+STATIC mp_uint_t rp2_state_machine_irq_trigger(mp_obj_t self_in, mp_uint_t new_trigger) {
+    rp2_state_machine_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    rp2_state_machine_irq_obj_t *irq = MP_STATE_PORT(rp2_state_machine_irq_obj[PIO_NUM(self->pio)]);
+    irq_set_enabled(self->irq, false);
+    irq->flags = 0;
+    irq->trigger = new_trigger;
+    irq_set_enabled(self->irq, true);
+    return 0;
+}
+
+STATIC mp_uint_t rp2_state_machine_irq_info(mp_obj_t self_in, mp_uint_t info_type) {
+    rp2_state_machine_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    rp2_state_machine_irq_obj_t *irq = MP_STATE_PORT(rp2_state_machine_irq_obj[PIO_NUM(self->pio)]);
+    if (info_type == MP_IRQ_INFO_FLAGS) {
+        return irq->flags;
+    } else if (info_type == MP_IRQ_INFO_TRIGGERS) {
+        return irq->trigger;
+    }
+    return 0;
+}
+
+STATIC const mp_irq_methods_t rp2_state_machine_irq_methods = {
+    .trigger = rp2_state_machine_irq_trigger,
+    .info = rp2_state_machine_irq_info,
+};
diff --git a/ports/rp2/tusb_config.h b/ports/rp2/tusb_config.h
new file mode 100644
index 0000000000000..1402edf3795b5
--- /dev/null
+++ b/ports/rp2/tusb_config.h
@@ -0,0 +1,34 @@
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020-2021 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ */
+#ifndef MICROPY_INCLUDED_RP2_TUSB_CONFIG_H
+#define MICROPY_INCLUDED_RP2_TUSB_CONFIG_H
+
+#define CFG_TUSB_RHPORT0_MODE   (OPT_MODE_DEVICE)
+
+#define CFG_TUD_CDC             (1)
+#define CFG_TUD_CDC_RX_BUFSIZE  (256)
+#define CFG_TUD_CDC_TX_BUFSIZE  (256)
+
+#endif // MICROPY_INCLUDED_RP2_TUSB_CONFIG_H
diff --git a/ports/rp2/tusb_port.c b/ports/rp2/tusb_port.c
new file mode 100644
index 0000000000000..afb566bdb4a2f
--- /dev/null
+++ b/ports/rp2/tusb_port.c
@@ -0,0 +1,115 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2019 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "tusb.h"
+
+#define USBD_VID (0x2E8A) // Raspberry Pi
+#define USBD_PID (0x0005) // RP2 MicroPython
+
+#define USBD_DESC_LEN (TUD_CONFIG_DESC_LEN + TUD_CDC_DESC_LEN)
+#define USBD_MAX_POWER_MA (250)
+
+#define USBD_ITF_CDC (0) // needs 2 interfaces
+#define USBD_ITF_MAX (2)
+
+#define USBD_CDC_EP_CMD (0x81)
+#define USBD_CDC_EP_OUT (0x02)
+#define USBD_CDC_EP_IN (0x82)
+#define USBD_CDC_CMD_MAX_SIZE (8)
+#define USBD_CDC_IN_OUT_MAX_SIZE (64)
+
+#define USBD_STR_0 (0x00)
+#define USBD_STR_MANUF (0x01)
+#define USBD_STR_PRODUCT (0x02)
+#define USBD_STR_SERIAL (0x03)
+#define USBD_STR_CDC (0x04)
+
+// Note: descriptors returned from callbacks must exist long enough for transfer to complete
+
+static const tusb_desc_device_t usbd_desc_device = {
+    .bLength = sizeof(tusb_desc_device_t),
+    .bDescriptorType = TUSB_DESC_DEVICE,
+    .bcdUSB = 0x0200,
+    .bDeviceClass = TUSB_CLASS_MISC,
+    .bDeviceSubClass = MISC_SUBCLASS_COMMON,
+    .bDeviceProtocol = MISC_PROTOCOL_IAD,
+    .bMaxPacketSize0 = CFG_TUD_ENDPOINT0_SIZE,
+    .idVendor = USBD_VID,
+    .idProduct = USBD_PID,
+    .bcdDevice = 0x0100,
+    .iManufacturer = USBD_STR_MANUF,
+    .iProduct = USBD_STR_PRODUCT,
+    .iSerialNumber = USBD_STR_SERIAL,
+    .bNumConfigurations = 1,
+};
+
+static const uint8_t usbd_desc_cfg[USBD_DESC_LEN] = {
+    TUD_CONFIG_DESCRIPTOR(1, USBD_ITF_MAX, USBD_STR_0, USBD_DESC_LEN,
+        TUSB_DESC_CONFIG_ATT_REMOTE_WAKEUP, USBD_MAX_POWER_MA),
+
+    TUD_CDC_DESCRIPTOR(USBD_ITF_CDC, USBD_STR_CDC, USBD_CDC_EP_CMD,
+        USBD_CDC_CMD_MAX_SIZE, USBD_CDC_EP_OUT, USBD_CDC_EP_IN, USBD_CDC_IN_OUT_MAX_SIZE),
+};
+
+static const char *const usbd_desc_str[] = {
+    [USBD_STR_MANUF] = "MicroPython",
+    [USBD_STR_PRODUCT] = "Board in FS mode",
+    [USBD_STR_SERIAL] = "000000000000", // TODO
+    [USBD_STR_CDC] = "Board CDC",
+};
+
+const uint8_t *tud_descriptor_device_cb(void) {
+    return (const uint8_t *)&usbd_desc_device;
+}
+
+const uint8_t *tud_descriptor_configuration_cb(uint8_t index) {
+    (void)index;
+    return usbd_desc_cfg;
+}
+
+const uint16_t *tud_descriptor_string_cb(uint8_t index, uint16_t langid) {
+    #define DESC_STR_MAX (20)
+    static uint16_t desc_str[DESC_STR_MAX];
+
+    uint8_t len;
+    if (index == 0) {
+        desc_str[1] = 0x0409; // supported language is English
+        len = 1;
+    } else {
+        if (index >= sizeof(usbd_desc_str) / sizeof(usbd_desc_str[0])) {
+            return NULL;
+        }
+        const char *str = usbd_desc_str[index];
+        for (len = 0; len < DESC_STR_MAX - 1 && str[len]; ++len) {
+            desc_str[1 + len] = str[len];
+        }
+    }
+
+    // first byte is length (including header), second byte is string type
+    desc_str[0] = (TUSB_DESC_STRING << 8) | (2 * len + 2);
+
+    return desc_str;
+}
diff --git a/ports/rp2/uart.c b/ports/rp2/uart.c
new file mode 100644
index 0000000000000..b7991563af034
--- /dev/null
+++ b/ports/rp2/uart.c
@@ -0,0 +1,63 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020-2021 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "py/runtime.h"
+#include "py/ringbuf.h"
+#include "py/mphal.h"
+#include "uart.h"
+
+#include "hardware/uart.h"
+#include "hardware/irq.h"
+#include "hardware/regs/uart.h"
+
+#if MICROPY_HW_ENABLE_UART_REPL
+
+void uart_irq(void) {
+    uart_get_hw(uart_default)->icr = UART_UARTICR_BITS; // clear interrupt flags
+    if (uart_is_readable(uart_default)) {
+        int c = uart_getc(uart_default);
+        #if MICROPY_KBD_EXCEPTION
+        if (c == mp_interrupt_char) {
+            mp_keyboard_interrupt();
+            return;
+        }
+        #endif
+        ringbuf_put(&stdin_ringbuf, c);
+    }
+}
+
+void mp_uart_init(void) {
+    uart_get_hw(uart_default)->imsc = UART_UARTIMSC_BITS; // enable mask
+    uint irq_num = uart_get_index(uart_default) ? UART1_IRQ : UART0_IRQ;
+    irq_set_exclusive_handler(irq_num, uart_irq);
+    irq_set_enabled(irq_num, true); // enable irq
+}
+
+void mp_uart_write_strn(const char *str, size_t len) {
+    uart_write_blocking(uart_default, (const uint8_t *)str, len);
+}
+
+#endif
diff --git a/ports/rp2/uart.h b/ports/rp2/uart.h
new file mode 100644
index 0000000000000..a49172f8f5781
--- /dev/null
+++ b/ports/rp2/uart.h
@@ -0,0 +1,32 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020-2021 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+#ifndef MICROPY_INCLUDED_RP2_UART_H
+#define MICROPY_INCLUDED_RP2_UART_H
+
+void mp_uart_init(void);
+void mp_uart_write_strn(const char *str, size_t len);
+
+#endif // MICROPY_INCLUDED_RP2_UART_H

From b8f4c623f9002099b0910ac873ef9e3acbcf428c Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 21 Jan 2021 19:24:12 +1100
Subject: [PATCH 0542/3533] github/workflows: Add CI workflow for rp2 port.

Signed-off-by: Damien George <damien@micropython.org>
---
 .github/workflows/ports_rp2.yml | 23 +++++++++++++++++++++++
 tools/ci.sh                     | 14 ++++++++++++++
 2 files changed, 37 insertions(+)
 create mode 100644 .github/workflows/ports_rp2.yml

diff --git a/.github/workflows/ports_rp2.yml b/.github/workflows/ports_rp2.yml
new file mode 100644
index 0000000000000..668b79cae256c
--- /dev/null
+++ b/.github/workflows/ports_rp2.yml
@@ -0,0 +1,23 @@
+name: rp2 port
+
+on:
+  push:
+  pull_request:
+    paths:
+      - '.github/workflows/*.yml'
+      - 'tools/**'
+      - 'py/**'
+      - 'extmod/**'
+      - 'lib/**'
+      - 'drivers/**'
+      - 'ports/rp2/**'
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Install packages
+      run: source tools/ci.sh && ci_rp2_setup
+    - name: Build
+      run: source tools/ci.sh && ci_rp2_build
diff --git a/tools/ci.sh b/tools/ci.sh
index 986ec6756eac7..4e4aad5600e77 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -176,6 +176,20 @@ function ci_qemu_arm_build {
     make ${MAKEOPTS} -C ports/qemu-arm -f Makefile.test test
 }
 
+########################################################################################
+# ports/rp2
+
+function ci_rp2_setup {
+    ci_gcc_arm_setup
+}
+
+function ci_rp2_build {
+    make ${MAKEOPTS} -C mpy-cross
+    git submodule update --init lib/pico-sdk
+    git -C lib/pico-sdk submodule update --init lib/tinyusb
+    make ${MAKEOPTS} -C ports/rp2
+}
+
 ########################################################################################
 # ports/samd
 

From 0f9a9129da0d0ef60956dcfa36b02b62d731b1b1 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Fri, 29 Jan 2021 17:45:33 +1100
Subject: [PATCH 0543/3533] stm32/rfcore: Fix flow control for IPCC RX IRQ.

Don't clear the IPCC channel flag until we've actually handled the incoming
data, or else the wireless firmware may clobber the IPCC buffer if more
data arrives.  This requires masking the IRQ until the data is handled.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/stm32/rfcore.c | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/ports/stm32/rfcore.c b/ports/stm32/rfcore.c
index 7d0a8520a6fc4..b11c4f2022733 100644
--- a/ports/stm32/rfcore.c
+++ b/ports/stm32/rfcore.c
@@ -434,10 +434,16 @@ STATIC void tl_process_msg(volatile tl_list_node_t *head, unsigned int ch, parse
 // Only call this when IRQs are disabled on this channel.
 STATIC void tl_check_msg(volatile tl_list_node_t *head, unsigned int ch, parse_hci_info_t *parse) {
     if (LL_C2_IPCC_IsActiveFlag_CHx(IPCC, ch)) {
+        // Process new data.
         tl_process_msg(head, ch, parse);
 
-        // Clear receive channel.
+        // Clear receive channel (allows RF core to send more data to us).
         LL_C1_IPCC_ClearFlag_CHx(IPCC, ch);
+
+        if (ch == IPCC_CH_BLE) {
+            // Renable IRQs for BLE now that we've cleared the flag.
+            LL_C1_IPCC_EnableReceiveChannel(IPCC, IPCC_CH_BLE);
+        }
     }
 }
 
@@ -495,17 +501,17 @@ STATIC int tl_ble_wait_resp(void) {
         }
     }
 
-    // C2 set IPCC flag.
+    // C2 set IPCC flag -- process the data, clear the flag, and re-enable IRQs.
     tl_check_msg(&ipcc_mem_ble_evt_queue, IPCC_CH_BLE, NULL);
     return 0;
 }
 
 // Synchronously send a BLE command.
 STATIC void tl_ble_hci_cmd_resp(uint16_t opcode, const uint8_t *buf, size_t len) {
+    // Poll for completion rather than wait for IRQ->scheduler.
     LL_C1_IPCC_DisableReceiveChannel(IPCC, IPCC_CH_BLE);
     tl_hci_cmd(ipcc_membuf_ble_cmd_buf, IPCC_CH_BLE, HCI_KIND_BT_CMD, opcode, buf, len);
     tl_ble_wait_resp();
-    LL_C1_IPCC_EnableReceiveChannel(IPCC, IPCC_CH_BLE);
 }
 
 /******************************************************************************/
@@ -632,7 +638,7 @@ void rfcore_ble_hci_cmd(size_t len, const uint8_t *src) {
 
 void rfcore_ble_check_msg(int (*cb)(void *, const uint8_t *, size_t), void *env) {
     parse_hci_info_t parse = { cb, env, false };
-    tl_process_msg(&ipcc_mem_ble_evt_queue, IPCC_CH_BLE, &parse);
+    tl_check_msg(&ipcc_mem_ble_evt_queue, IPCC_CH_BLE, &parse);
 
     // Intercept HCI_Reset events and reconfigure the controller following the reset
     if (parse.was_hci_reset_evt) {
@@ -679,7 +685,8 @@ void IPCC_C1_RX_IRQHandler(void) {
     DEBUG_printf("IPCC_C1_RX_IRQHandler\n");
 
     if (LL_C2_IPCC_IsActiveFlag_CHx(IPCC, IPCC_CH_BLE)) {
-        LL_C1_IPCC_ClearFlag_CHx(IPCC, IPCC_CH_BLE);
+        // Disable this IRQ until the incoming data is processed (in tl_check_msg).
+        LL_C1_IPCC_DisableReceiveChannel(IPCC, IPCC_CH_BLE);
 
         #if MICROPY_PY_BLUETOOTH
         // Queue up the scheduler to process UART data and run events.

From 47d02b3104369430db9fd7a6f80f9fa47badaf65 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Fri, 29 Jan 2021 17:46:33 +1100
Subject: [PATCH 0544/3533] extmod/nimble: Improve the flow control for l2cap
 recv path.

If the _IRQ_L2CAP_RECV handler does the actual consumption of the incoming
data (i.e. via l2cap_recvinto), rather than setting a flag for
non-scheduler-context to handle it later, then two things can happen:

- It can starve the VM (i.e. the scheduled task never terminates).  This is
  because calling l2cap_recvinto will empty the rx buffer, which will grant
  more credits to the channel (an HCI command), meaning more data can
  arrive.  This means that the loop in hal_uart.c that keeps reading HCI
  data from the uart and executing NimBLE events as they are created will
  not terminate, preventing other VM code from running.

- There's no flow control (i.e. data will arrive too quickly).  The channel
  shouldn't be given credits until after we return from scheduler context.

It's preferable that no work is done in scheduler/IRQ context.  But to
prevent this being a problem this commit changes l2cap_recvinto so that if
it is called in IRQ context, and the Python handler empties the rx buffer,
then don't grant credits until the Python handler is complete.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 extmod/nimble/modbluetooth_nimble.c | 36 +++++++++++++++++++++++------
 1 file changed, 29 insertions(+), 7 deletions(-)

diff --git a/extmod/nimble/modbluetooth_nimble.c b/extmod/nimble/modbluetooth_nimble.c
index 8bead890d8373..a2eb8a588c67e 100644
--- a/extmod/nimble/modbluetooth_nimble.c
+++ b/extmod/nimble/modbluetooth_nimble.c
@@ -1355,6 +1355,7 @@ typedef struct _mp_bluetooth_nimble_l2cap_channel_t {
     struct os_mbuf_pool sdu_mbuf_pool;
     struct os_mempool sdu_mempool;
     struct os_mbuf *rx_pending;
+    bool irq_in_progress;
     uint16_t mtu;
     os_membuf_t sdu_mem[];
 } mp_bluetooth_nimble_l2cap_channel_t;
@@ -1441,7 +1442,23 @@ STATIC int l2cap_channel_event(struct ble_l2cap_event *event, void *arg) {
             chan->chan->coc_rx.sdu = sdu_rx;
 
             ble_l2cap_get_chan_info(event->receive.chan, &info);
+
+            // Don't allow granting more credits until after the IRQ is handled.
+            chan->irq_in_progress = true;
+
             mp_bluetooth_gattc_on_l2cap_recv(event->receive.conn_handle, info.scid);
+            chan->irq_in_progress = false;
+
+            // If all data has been consumed by the IRQ handler, then now allow
+            // more credits. If the IRQ handler doesn't consume all available data
+            // then rx_pending will be still set.
+            if (!chan->rx_pending) {
+                struct os_mbuf *sdu_rx = chan->chan->coc_rx.sdu;
+                assert(sdu_rx);
+                if (sdu_rx) {
+                    ble_l2cap_recv_ready(chan->chan, sdu_rx);
+                }
+            }
             break;
         }
         case BLE_L2CAP_EVENT_COC_TX_UNSTALLED: {
@@ -1508,6 +1525,7 @@ STATIC int create_l2cap_channel(uint16_t mtu, mp_bluetooth_nimble_l2cap_channel_
 
     chan->mtu = mtu;
     chan->rx_pending = NULL;
+    chan->irq_in_progress = false;
 
     int err = os_mempool_init(&chan->sdu_mempool, buf_blocks, L2CAP_BUF_BLOCK_SIZE, chan->sdu_mem, "l2cap_sdu_pool");
     if (err != 0) {
@@ -1635,13 +1653,17 @@ int mp_bluetooth_l2cap_recvinto(uint16_t conn_handle, uint16_t cid, uint8_t *buf
                 os_mbuf_free_chain(chan->rx_pending);
                 chan->rx_pending = NULL;
 
-                // We've already given the channel a new mbuf in l2cap_channel_event above, so
-                // re-use that mbuf in the call to ble_l2cap_recv_ready. This will just
-                // give the channel more credits.
-                struct os_mbuf *sdu_rx = chan->chan->coc_rx.sdu;
-                assert(sdu_rx);
-                if (sdu_rx) {
-                    ble_l2cap_recv_ready(chan->chan, sdu_rx);
+                // If we're in the call stack of the l2cap_channel_event handler, then don't
+                // re-enable receiving yet (as we need to complete the rest of IRQ handler first).
+                if (!chan->irq_in_progress) {
+                    // We've already given the channel a new mbuf in l2cap_channel_event above, so
+                    // re-use that mbuf in the call to ble_l2cap_recv_ready. This will just
+                    // give the channel more credits.
+                    struct os_mbuf *sdu_rx = chan->chan->coc_rx.sdu;
+                    assert(sdu_rx);
+                    if (sdu_rx) {
+                        ble_l2cap_recv_ready(chan->chan, sdu_rx);
+                    }
                 }
             } else {
                 // Trim the used bytes from the start of the mbuf.

From b9a35bebf75be53a817bf6341af14b882093e345 Mon Sep 17 00:00:00 2001
From: stijn <stijn@ignitron.net>
Date: Sat, 16 Jan 2021 09:18:31 +0100
Subject: [PATCH 0545/3533] py/qstr.h: Remove QSTR_FROM_STR_STATIC macro.

It practically does the same as qstr_from_str and was only used in one
place, which should actually use the compile-time MP_QSTR_XXX form for
consistency; qstr_from_str is for runtime strings only.
---
 ports/unix/main.c | 10 +++++-----
 py/qstr.h         |  3 +--
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/ports/unix/main.c b/ports/unix/main.c
index 6f85cbf8d021d..af4328a4db759 100644
--- a/ports/unix/main.c
+++ b/ports/unix/main.c
@@ -532,8 +532,8 @@ MP_NOINLINE int main_(int argc, char **argv) {
     {
         MP_DECLARE_CONST_FUN_OBJ_0(extra_coverage_obj);
         MP_DECLARE_CONST_FUN_OBJ_0(extra_cpp_coverage_obj);
-        mp_store_global(QSTR_FROM_STR_STATIC("extra_coverage"), MP_OBJ_FROM_PTR(&extra_coverage_obj));
-        mp_store_global(QSTR_FROM_STR_STATIC("extra_cpp_coverage"), MP_OBJ_FROM_PTR(&extra_cpp_coverage_obj));
+        mp_store_global(MP_QSTR_extra_coverage, MP_OBJ_FROM_PTR(&extra_coverage_obj));
+        mp_store_global(MP_QSTR_extra_cpp_coverage, MP_OBJ_FROM_PTR(&extra_cpp_coverage_obj));
     }
     #endif
 
@@ -546,9 +546,9 @@ MP_NOINLINE int main_(int argc, char **argv) {
     // test_obj.attr = 42
     //
     // mp_obj_t test_class_type, test_class_instance;
-    // test_class_type = mp_obj_new_type(QSTR_FROM_STR_STATIC("TestClass"), mp_const_empty_tuple, mp_obj_new_dict(0));
-    // mp_store_name(QSTR_FROM_STR_STATIC("test_obj"), test_class_instance = mp_call_function_0(test_class_type));
-    // mp_store_attr(test_class_instance, QSTR_FROM_STR_STATIC("attr"), mp_obj_new_int(42));
+    // test_class_type = mp_obj_new_type(qstr_from_str("TestClass"), mp_const_empty_tuple, mp_obj_new_dict(0));
+    // mp_store_name(qstr_from_str("test_obj"), test_class_instance = mp_call_function_0(test_class_type));
+    // mp_store_attr(test_class_instance, qstr_from_str("attr"), mp_obj_new_int(42));
 
     /*
     printf("bytes:\n");
diff --git a/py/qstr.h b/py/qstr.h
index df87217ff323e..0b6fb12b084a0 100644
--- a/py/qstr.h
+++ b/py/qstr.h
@@ -32,7 +32,7 @@
 // See qstrdefs.h for a list of qstr's that are available as constants.
 // Reference them as MP_QSTR_xxxx.
 //
-// Note: it would be possible to define MP_QSTR_xxx as qstr_from_str_static("xxx")
+// Note: it would be possible to define MP_QSTR_xxx as qstr_from_str("xxx")
 // for qstrs that are referenced this way, but you don't want to have them in ROM.
 
 // first entry in enum will be MP_QSTRnull=0, which indicates invalid/no qstr
@@ -55,7 +55,6 @@ typedef struct _qstr_pool_t {
     const byte *qstrs[];
 } qstr_pool_t;
 
-#define QSTR_FROM_STR_STATIC(s) (qstr_from_strn((s), strlen(s)))
 #define QSTR_TOTAL() (MP_STATE_VM(last_pool)->total_prev_len + MP_STATE_VM(last_pool)->len)
 
 void qstr_init(void);

From fca2730ea01bc8457804884f4a0472ae0d938a19 Mon Sep 17 00:00:00 2001
From: stijn <stijn@ignitron.net>
Date: Sat, 16 Jan 2021 09:24:22 +0100
Subject: [PATCH 0546/3533] lib/utils/pyexec: Remove obsolete LCD
 initialization.

This was added a long time ago in 75abee206d1a575aa98a486d043c94d64df432c1
when USB host support was added to the stm (now stm32) port, and when this
pyexec code was actually part of the stm port.  It's unlikely to work as
intended anymore.  If it is needed in the future then generic hook macros
can be added in pyexec.
---
 lib/utils/pyexec.c | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/lib/utils/pyexec.c b/lib/utils/pyexec.c
index 86321ac12909f..d1e955d65b9a2 100644
--- a/lib/utils/pyexec.c
+++ b/lib/utils/pyexec.c
@@ -546,12 +546,6 @@ int pyexec_friendly_repl(void) {
     vstr_t line;
     vstr_init(&line, 32);
 
-    #if defined(USE_HOST_MODE) && MICROPY_HW_HAS_LCD
-    // in host mode, we enable the LCD for the repl
-    mp_obj_t lcd_o = mp_call_function_0(mp_load_name(qstr_from_str("LCD")));
-    mp_call_function_1(mp_load_attr(lcd_o, qstr_from_str("light")), mp_const_true);
-    #endif
-
 friendly_repl_reset:
     mp_hal_stdout_tx_str("MicroPython " MICROPY_GIT_TAG " on " MICROPY_BUILD_DATE "; " MICROPY_HW_BOARD_NAME " with " MICROPY_HW_MCU_NAME "\r\n");
     #if MICROPY_PY_BUILTINS_HELP

From d48860c7ddfb37bdc48d0f3afc3a26dcd54cca0f Mon Sep 17 00:00:00 2001
From: stijn <stijn@ignitron.net>
Date: Tue, 19 Jan 2021 13:07:51 +0100
Subject: [PATCH 0547/3533] tools/verifygitlog.py: Add script for verifying
 commit message format.

The main rules enforced are:
- At most 72 characters in the subject line, with a ": " in it.
- At most 75 characters per line in the body.
- No "noreply" email addresses.
---
 tools/verifygitlog.py | 122 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 122 insertions(+)
 create mode 100755 tools/verifygitlog.py

diff --git a/tools/verifygitlog.py b/tools/verifygitlog.py
new file mode 100755
index 0000000000000..0080b96bfaea9
--- /dev/null
+++ b/tools/verifygitlog.py
@@ -0,0 +1,122 @@
+#!/usr/bin/env python3
+
+import re
+import subprocess
+import sys
+
+verbosity = 0  # Show what's going on, 0 1 or 2.
+suggestions = 1  # Set to 0 to not include lengthy suggestions in error messages.
+
+
+def verbose(*args):
+    if verbosity:
+        print(*args)
+
+
+def very_verbose(*args):
+    if verbosity > 1:
+        print(*args)
+
+
+def git_log(pretty_format, *args):
+    # Delete pretty argument from user args so it doesn't interfere with what we do.
+    args = ["git", "log"] + [arg for arg in args if "--pretty" not in args]
+    args.append("--pretty=format:" + pretty_format)
+    very_verbose("git_log", *args)
+    # Generator yielding each output line.
+    for line in subprocess.Popen(args, stdout=subprocess.PIPE).stdout:
+        yield line.decode().rstrip("\r\n")
+
+
+def verify(sha):
+    verbose("verify", sha)
+    errors = []
+    warnings = []
+
+    def error_text(err):
+        return "commit " + sha + ": " + err
+
+    def error(err):
+        errors.append(error_text(err))
+
+    def warning(err):
+        warnings.append(error_text(err))
+
+    # Author and committer email.
+    for line in git_log("%ae%n%ce", sha, "-n1"):
+        very_verbose("email", line)
+        if "noreply" in line:
+            error("Unwanted email address: " + line)
+
+    # Message body.
+    raw_body = list(git_log("%B", sha, "-n1"))
+    if not raw_body:
+        error("Message is empty")
+        return errors, warnings
+
+    # Subject line.
+    subject_line = raw_body[0]
+    very_verbose("subject_line", subject_line)
+    if not re.match(r"^[^!]+: [A-Z]+.+ .+\.$", subject_line):
+        error("Subject line should contain ': ' and end in '.': " + subject_line)
+    if len(subject_line) >= 73:
+        error("Subject line should be 72 or less characters: " + subject_line)
+
+    # Second one divides subject and body.
+    if len(raw_body) > 1 and raw_body[1]:
+        error("Second message line should be empty: " + raw_body[1])
+
+    # Message body lines.
+    for line in raw_body[2:]:
+        if len(line) >= 76:
+            error("Message lines should be 75 or less characters: " + line)
+
+    if not raw_body[-1].startswith("Signed-off-by: ") or "@" not in raw_body[-1]:
+        warning("Message should be signed-off")
+
+    return errors, warnings
+
+
+def run(args):
+    verbose("run", *args)
+    has_errors = False
+    has_warnings = False
+    for sha in git_log("%h", *args):
+        errors, warnings = verify(sha)
+        has_errors |= any(errors)
+        has_warnings |= any(warnings)
+        for err in errors:
+            print("error:", err)
+        for err in warnings:
+            print("warning:", err)
+    if has_errors or has_warnings:
+        if suggestions:
+            print("See https://github.com/micropython/micropython/blob/master/CODECONVENTIONS.md")
+    else:
+        print("ok")
+    if has_errors:
+        sys.exit(1)
+
+
+def show_help():
+    print("usage: verifygitlog.py [-v -n -h] ...")
+    print("-v  : increase verbosity, can be speficied multiple times")
+    print("-n  : do not print multi-line suggestions")
+    print("-h  : print this help message and exit")
+    print("... : arguments passed to git log to retrieve commits to verify")
+    print("      see https://www.git-scm.com/docs/git-log")
+    print("      passing no arguments at all will verify all commits")
+    print("examples:")
+    print("verifygitlog.py -n10  # Check last 10 commits")
+    print("verifygitlog.py -v master..HEAD  # Check commits since master")
+
+
+if __name__ == "__main__":
+    args = sys.argv[1:]
+    verbosity = args.count("-v")
+    suggestions = args.count("-n") == 0
+    if "-h" in args:
+        show_help()
+    else:
+        args = [arg for arg in args if arg not in ["-v", "-n", "-h"]]
+        run(args)

From 37c2f507a01af06627ff93eafa4fc80b2734620e Mon Sep 17 00:00:00 2001
From: stijn <stijn@ignitron.net>
Date: Tue, 19 Jan 2021 15:06:50 +0100
Subject: [PATCH 0548/3533] github/workflows: Add workflow to verify commit
 message format.

Using the new tools/verifygitlog.py script.
---
 .github/workflows/commit_formatting.yml | 14 ++++++++++++++
 tools/ci.sh                             | 10 ++++++++++
 2 files changed, 24 insertions(+)
 create mode 100644 .github/workflows/commit_formatting.yml

diff --git a/.github/workflows/commit_formatting.yml b/.github/workflows/commit_formatting.yml
new file mode 100644
index 0000000000000..5f96fbb934426
--- /dev/null
+++ b/.github/workflows/commit_formatting.yml
@@ -0,0 +1,14 @@
+name: Check commit message formatting
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        fetch-depth: '100'
+    - uses: actions/setup-python@v1
+    - name: Check commit message formatting
+      run: source tools/ci.sh && ci_commit_formatting_run
diff --git a/tools/ci.sh b/tools/ci.sh
index 4e4aad5600e77..c6b641dae96dc 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -29,6 +29,16 @@ function ci_code_formatting_run {
     tools/codeformat.py -v
 }
 
+########################################################################################
+# commit formatting
+
+function ci_commit_formatting_run {
+    git remote add upstream https://github.com/micropython/micropython.git
+    git fetch --depth=100 upstream  master
+    # For a PR, upstream/master..HEAD ends with a merge commit into master, exlude that one.
+    tools/verifygitlog.py -v upstream/master..HEAD --no-merges
+}
+
 ########################################################################################
 # code size
 

From 499e199addacd3777244c61cc4c3b4efdfa9b300 Mon Sep 17 00:00:00 2001
From: Andrew Scheller <github@loowis.durge.org>
Date: Tue, 19 Jan 2021 09:22:04 +0000
Subject: [PATCH 0549/3533] docs,stm32: Fix minor typos in RTC docs, and->an.

---
 docs/library/machine.RTC.rst | 2 +-
 docs/library/pyb.RTC.rst     | 2 +-
 ports/stm32/rtc.c            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/library/machine.RTC.rst b/docs/library/machine.RTC.rst
index d5a4f390b512b..ae5446ef74fee 100644
--- a/docs/library/machine.RTC.rst
+++ b/docs/library/machine.RTC.rst
@@ -4,7 +4,7 @@
 class RTC -- real time clock
 ============================
 
-The RTC is and independent clock that keeps track of the date
+The RTC is an independent clock that keeps track of the date
 and time.
 
 Example usage::
diff --git a/docs/library/pyb.RTC.rst b/docs/library/pyb.RTC.rst
index 4c736597cf8db..c477e7f035c87 100644
--- a/docs/library/pyb.RTC.rst
+++ b/docs/library/pyb.RTC.rst
@@ -4,7 +4,7 @@
 class RTC -- real time clock
 ============================
 
-The RTC is and independent clock that keeps track of the date
+The RTC is an independent clock that keeps track of the date
 and time.
 
 Example usage::
diff --git a/ports/stm32/rtc.c b/ports/stm32/rtc.c
index bd898d4558570..02b0f2dbd1364 100644
--- a/ports/stm32/rtc.c
+++ b/ports/stm32/rtc.c
@@ -43,7 +43,7 @@
 /// \moduleref pyb
 /// \class RTC - real time clock
 ///
-/// The RTC is and independent clock that keeps track of the date
+/// The RTC is an independent clock that keeps track of the date
 /// and time.
 ///
 /// Example usage:

From 2aecf378be3190920fd0e50aff6ccdc83ecfd7e9 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Thu, 21 Jan 2021 10:09:02 +1100
Subject: [PATCH 0550/3533] tools/makemanifest.py: Add check that freeze path
 is a directory.

Avoids accidentally writing

    freeze("path/to/file.py")

and getting unexpected results.
---
 tools/makemanifest.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tools/makemanifest.py b/tools/makemanifest.py
index 9ef03682607dc..c07a3a6c77ab2 100644
--- a/tools/makemanifest.py
+++ b/tools/makemanifest.py
@@ -172,6 +172,8 @@ def mkdir(filename):
 
 def freeze_internal(kind, path, script, opt):
     path = convert_path(path)
+    if not os.path.isdir(path):
+        raise FreezeError("freeze path must be a directory")
     if script is None and kind == KIND_AS_STR:
         if any(f[0] == KIND_AS_STR for f in manifest_list):
             raise FreezeError("can only freeze one str directory")

From 993ab6aa2c2e8eadcfdf64371bfddaa8304f26cb Mon Sep 17 00:00:00 2001
From: Chris Hemingway <chris.hemingway@gmail.com>
Date: Sun, 24 Jan 2021 14:40:44 +0000
Subject: [PATCH 0551/3533] nrf/README: Add use of "make submodules" in
 alternative build paragraph.

Add "make submodules" to commands when building for the first time.
Otherwise, on a first time build, the submodules have not been checked out
and a lot of `fatal error: nrfx.h: No such file or directory` errors are
printed.
---
 ports/nrf/README.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/ports/nrf/README.md b/ports/nrf/README.md
index 22bb4af514a39..0341cd81cde05 100644
--- a/ports/nrf/README.md
+++ b/ports/nrf/README.md
@@ -62,8 +62,9 @@ By default, the PCA10040 (nrf52832) is used as compile target. To build and flas
 
 Alternatively the target board could be defined:
 
-     make BOARD=pca10040
-     make BOARD=pca10040 deploy
+    make submodules
+    make BOARD=pca10040
+    make BOARD=pca10040 deploy
 
 ## Compile without LTO enabled
 

From 5c37e76e4f27cf3553adb67947c0a8e0a5500591 Mon Sep 17 00:00:00 2001
From: Christopher Tse <chris@chris-tse.com>
Date: Tue, 26 Jan 2021 03:28:20 -0600
Subject: [PATCH 0552/3533] esp8266/modules/neopixel.py: Add timing param to
 NeoPixel constructor.

This matches the esp32 port.
---
 ports/esp8266/modules/neopixel.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/ports/esp8266/modules/neopixel.py b/ports/esp8266/modules/neopixel.py
index be56ed1b07266..501a2689e79f4 100644
--- a/ports/esp8266/modules/neopixel.py
+++ b/ports/esp8266/modules/neopixel.py
@@ -7,12 +7,13 @@
 class NeoPixel:
     ORDER = (1, 0, 2, 3)
 
-    def __init__(self, pin, n, bpp=3):
+    def __init__(self, pin, n, bpp=3, timing=1):
         self.pin = pin
         self.n = n
         self.bpp = bpp
         self.buf = bytearray(n * bpp)
         self.pin.init(pin.OUT)
+        self.timing = timing
 
     def __setitem__(self, index, val):
         offset = index * self.bpp
@@ -28,4 +29,4 @@ def fill(self, color):
             self[i] = color
 
     def write(self):
-        neopixel_write(self.pin, self.buf, True)
+        neopixel_write(self.pin, self.buf, self.timing)

From ddb53c9458381f71d896ebba60234716f1b156d9 Mon Sep 17 00:00:00 2001
From: Christopher Tse <chris@chris-tse.com>
Date: Tue, 26 Jan 2021 22:52:55 -0600
Subject: [PATCH 0553/3533] docs/esp8266/quickref: Add warning block about
 NeoPixel timing.

---
 docs/esp8266/quickref.rst | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/docs/esp8266/quickref.rst b/docs/esp8266/quickref.rst
index 1a22bd50a5ac2..a478b66581d93 100644
--- a/docs/esp8266/quickref.rst
+++ b/docs/esp8266/quickref.rst
@@ -364,6 +364,13 @@ For low-level driving of a NeoPixel::
     import esp
     esp.neopixel_write(pin, grb_buf, is800khz)
 
+.. Warning::
+   By default ``NeoPixel`` is configured to control the more popular *800kHz*
+   units. It is possible to use alternative timing to control other (typically
+   400kHz) devices by passing ``timing=0`` when constructing the
+   ``NeoPixel`` object.
+
+
 APA102 driver
 -------------
 

From c2b5bfcc0c6648f549af215f3d2f47302e962c96 Mon Sep 17 00:00:00 2001
From: stijn <stijn@ignitron.net>
Date: Wed, 27 Jan 2021 10:14:50 +0100
Subject: [PATCH 0554/3533] tools: Remove obsolete upip bootstrap script.

The upip module is frozen into ports supporting it, and it is included in
the source tree, so there is no need to get it from PyPi.  Moreover the
PyPi package referred to is an out-of-date version of upip which is
basically unrelated to our upip.py because the source is taken from a fork
of micropython-lib instead of this repository.
---
 tools/bootstrap_upip.sh | 30 ------------------------------
 1 file changed, 30 deletions(-)
 delete mode 100755 tools/bootstrap_upip.sh

diff --git a/tools/bootstrap_upip.sh b/tools/bootstrap_upip.sh
deleted file mode 100755
index 2891775d7deac..0000000000000
--- a/tools/bootstrap_upip.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-# This script performs bootstrap installation of upip package manager from PyPI
-# All the other packages can be installed using it.
-
-saved="$PWD"
-
-if [ "$1" = "" ]; then
-    dest=~/.micropython/lib/
-else
-    dest="$1"
-fi
-
-if [ -z "$TMPDIR" ]; then
-    cd /tmp
-else
-    cd $TMPDIR
-fi
-
-# Remove any stale old version
-rm -rf micropython-upip-*
-wget -nd -rH -l1 -D files.pythonhosted.org https://pypi.org/project/micropython-upip/ --reject=html
-
-tar xfz micropython-upip-*.tar.gz
-tmpd="$PWD"
-
-cd "$saved"
-mkdir -p "$dest"
-cp "$tmpd"/micropython-upip-*/upip*.py "$dest"
-
-echo "upip is installed. To use:"
-echo "micropython -m upip --help"

From cb8e2f02ab34b49e5bd42012f3bc9adf61607b25 Mon Sep 17 00:00:00 2001
From: stijn <stijn@ignitron.net>
Date: Wed, 27 Jan 2021 15:44:53 +0100
Subject: [PATCH 0555/3533] py/gc: Fix debug printing of pointer.

When DEBUG_printf is the standard printf, compilers require the value for
%p to be an actual pointer instead of an integer.
---
 py/gc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/py/gc.c b/py/gc.c
index 767f1b81c4dfa..41bbaa1b57f3c 100644
--- a/py/gc.c
+++ b/py/gc.c
@@ -294,7 +294,7 @@ STATIC void gc_sweep(void) {
                 }
                 #endif
                 free_tail = 1;
-                DEBUG_printf("gc_sweep(%p)\n", PTR_FROM_BLOCK(block));
+                DEBUG_printf("gc_sweep(%p)\n", (void *)PTR_FROM_BLOCK(block));
                 #if MICROPY_PY_GC_COLLECT_RETVAL
                 MP_STATE_MEM(gc_collected)++;
                 #endif

From cb30928ac8da931f905d1c14468498d21108933a Mon Sep 17 00:00:00 2001
From: David CARLIER <devnexen@gmail.com>
Date: Sat, 16 Jan 2021 20:48:19 +0000
Subject: [PATCH 0556/3533] py/persistentcode: Introduce
 MICROPY_PERSISTENT_CODE_SAVE_FILE option.

This should be enabled when the mp_raw_code_save_file function is needed.

It is enabled for mpy-cross, and a check for defined(__APPLE__) is added to
cover Mac M1 systems.
---
 mpy-cross/mpconfigport.h | 8 ++++++++
 py/mpconfig.h            | 5 +++++
 py/persistentcode.c      | 9 ++-------
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/mpy-cross/mpconfigport.h b/mpy-cross/mpconfigport.h
index 21d3e12ed43d7..7ff3d1b6b4b09 100644
--- a/mpy-cross/mpconfigport.h
+++ b/mpy-cross/mpconfigport.h
@@ -30,6 +30,14 @@
 #define MICROPY_PERSISTENT_CODE_LOAD (0)
 #define MICROPY_PERSISTENT_CODE_SAVE (1)
 
+#ifndef MICROPY_PERSISTENT_CODE_SAVE_FILE
+#if defined(__i386__) || defined(__x86_64__) || defined(_WIN32) || defined(__unix__) || defined(__APPLE__)
+#define MICROPY_PERSISTENT_CODE_SAVE_FILE (1)
+#else
+#define MICROPY_PERSISTENT_CODE_SAVE_FILE (0)
+#endif
+#endif
+
 #define MICROPY_EMIT_X64            (1)
 #define MICROPY_EMIT_X86            (1)
 #define MICROPY_EMIT_THUMB          (1)
diff --git a/py/mpconfig.h b/py/mpconfig.h
index 1df2e8fe918ef..518bddd6c8972 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -283,6 +283,11 @@
 #define MICROPY_PERSISTENT_CODE_SAVE (0)
 #endif
 
+// Whether to support saving persistent code to a file via mp_raw_code_save_file
+#ifndef MICROPY_PERSISTENT_CODE_SAVE_FILE
+#define MICROPY_PERSISTENT_CODE_SAVE_FILE (0)
+#endif
+
 // Whether generated code can persist independently of the VM/runtime instance
 // This is enabled automatically when needed by other features
 #ifndef MICROPY_PERSISTENT_CODE
diff --git a/py/persistentcode.c b/py/persistentcode.c
index da3234a5fe9cd..084632a60fdc1 100644
--- a/py/persistentcode.c
+++ b/py/persistentcode.c
@@ -825,10 +825,7 @@ void mp_raw_code_save(mp_raw_code_t *rc, mp_print_t *print) {
     save_raw_code(print, rc, &qw);
 }
 
-// here we define mp_raw_code_save_file depending on the port
-// TODO abstract this away properly
-
-#if defined(__i386__) || defined(__x86_64__) || defined(_WIN32) || defined(__unix__)
+#if MICROPY_PERSISTENT_CODE_SAVE_FILE
 
 #include <unistd.h>
 #include <sys/stat.h>
@@ -853,8 +850,6 @@ void mp_raw_code_save_file(mp_raw_code_t *rc, const char *filename) {
     MP_THREAD_GIL_ENTER();
 }
 
-#else
-#error mp_raw_code_save_file not implemented for this platform
-#endif
+#endif // MICROPY_PERSISTENT_CODE_SAVE_FILE
 
 #endif // MICROPY_PERSISTENT_CODE_SAVE

From 407df82f813d7a8d522b5b43e39f91816dea26a6 Mon Sep 17 00:00:00 2001
From: Samuelson <59143578+TheNameIsSamSamuelson@users.noreply.github.com>
Date: Sat, 9 Jan 2021 11:33:07 -0300
Subject: [PATCH 0557/3533] docs/develop/natmod: Fix a small typo, con->can.

---
 docs/develop/natmod.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/develop/natmod.rst b/docs/develop/natmod.rst
index a4c188719a4d9..8ffe49591cc69 100644
--- a/docs/develop/natmod.rst
+++ b/docs/develop/natmod.rst
@@ -202,7 +202,7 @@ Module usage in MicroPython
 
 Once the module is built there should be a file called ``factorial.mpy``.  Copy
 this so it is accessible on the filesystem of your MicroPython system and can be
-found in the import path.  The module con now be accessed in Python just like any
+found in the import path.  The module can now be accessed in Python just like any
 other module, for example::
 
     import factorial

From ef9fde7339b12e17596966afb2b3d641ca5fcff2 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sun, 31 Jan 2021 23:17:42 +1100
Subject: [PATCH 0558/3533] LICENSE,docs: Update copyright year range to
 include 2021.

Signed-off-by: Damien George <damien@micropython.org>
---
 LICENSE      | 2 +-
 docs/conf.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/LICENSE b/LICENSE
index 8c5e4fe4c359a..3193eb8cec189 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2013-2020 Damien P. George
+Copyright (c) 2013-2021 Damien P. George
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/docs/conf.py b/docs/conf.py
index 460886b4da2e8..4ca4d18f502e9 100755
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -66,7 +66,7 @@
 
 # General information about the project.
 project = 'MicroPython'
-copyright = '2014-2020, Damien P. George, Paul Sokolovsky, and contributors'
+copyright = '2014-2021, Damien P. George, Paul Sokolovsky, and contributors'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the

From 4fb5f012c32a2ed394091039a7213472001a98c9 Mon Sep 17 00:00:00 2001
From: iTitou <moiandme@gmail.com>
Date: Wed, 20 Jan 2021 10:33:40 +0100
Subject: [PATCH 0559/3533] py/makeversionhdr: Honor SOURCE_DATE_EPOCH if
 present.

This environment variable, if defined during the build process,
indicates a fixed time that should be used in place of "now" when
such a time is explicitely referenced.

This allows for reproducible builds of micropython.
See https://reproducible-builds.org/specs/source-date-epoch/

Signed-off-by: iTitou <moiandme@gmail.com>
---
 py/makeversionhdr.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/py/makeversionhdr.py b/py/makeversionhdr.py
index 970a86e6ca3ab..2f4bc9182664e 100644
--- a/py/makeversionhdr.py
+++ b/py/makeversionhdr.py
@@ -80,6 +80,12 @@ def make_version_header(filename):
 
     git_tag, git_hash = info
 
+    build_date = datetime.date.today()
+    if "SOURCE_DATE_EPOCH" in os.environ:
+        build_date = datetime.datetime.utcfromtimestamp(
+            int(os.environ["SOURCE_DATE_EPOCH"])
+        ).date()
+
     # Generate the file with the git and version info
     file_data = """\
 // This file was generated by py/makeversionhdr.py
@@ -89,7 +95,7 @@ def make_version_header(filename):
 """ % (
         git_tag,
         git_hash,
-        datetime.date.today().strftime("%Y-%m-%d"),
+        build_date.strftime("%Y-%m-%d"),
     )
 
     # Check if the file contents changed from last time

From b8f5f5cd85e83fd136fac5e90ed5d486c2924a42 Mon Sep 17 00:00:00 2001
From: iTitou <moiandme@gmail.com>
Date: Wed, 20 Jan 2021 12:13:04 +0100
Subject: [PATCH 0560/3533] github/workflows/ports_unix.yml: Add job for a
 reproducible build.

With a check for reproducible build date.  Invocation of the test suite is
not needed because it's already run in another job.

Signed-off-by: iTitou <moiandme@gmail.com>
---
 .github/workflows/ports_unix.yml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/.github/workflows/ports_unix.yml b/.github/workflows/ports_unix.yml
index 552fd72d8440e..eb1416045c03a 100644
--- a/.github/workflows/ports_unix.yml
+++ b/.github/workflows/ports_unix.yml
@@ -26,6 +26,17 @@ jobs:
       if: failure()
       run: tests/run-tests --print-failures
 
+  reproducible:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Build with reproducible date
+      run: source tools/ci.sh && ci_unix_minimal_build
+      env:
+        SOURCE_DATE_EPOCH: 1234567890
+    - name: Check reproducible build date
+      run: echo | ports/unix/micropython-minimal -i | grep 'on 2009-02-13;'
+
   standard:
     runs-on: ubuntu-latest
     steps:

From 35a6f6231e482936b7ef7e8fe3dfc790a7beb4ed Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 1 Feb 2021 18:44:28 +1100
Subject: [PATCH 0561/3533] tests/extmod/utime_time_ns.py: Relax bounds on
 time_ns measurement.

Some devices have lower precision than 1ms for time_ns() (eg PYBv1.x has
3.9ms resolution of the RTC) so make the test more lenient for them.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/extmod/utime_time_ns.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/extmod/utime_time_ns.py b/tests/extmod/utime_time_ns.py
index 8f3890f1cb85e..0d13f839d4f2d 100644
--- a/tests/extmod/utime_time_ns.py
+++ b/tests/extmod/utime_time_ns.py
@@ -11,14 +11,14 @@
 
 
 t0 = utime.time_ns()
-utime.sleep_us(1000)
+utime.sleep_us(5000)
 t1 = utime.time_ns()
 
 # Check that time_ns increases.
 print(t0 < t1)
 
-# Check that time_ns counts correctly, but be very lenient with the upper bound (50ms).
-if 950000 < t1 - t0 < 50000000:
+# Check that time_ns counts correctly, but be very lenient with the bounds (2ms to 50ms).
+if 2000000 < t1 - t0 < 50000000:
     print(True)
 else:
     print(t0, t1, t1 - t0)

From ffded488109230dc488b295e19eff7a0055ed0fa Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 1 Feb 2021 22:30:50 +1100
Subject: [PATCH 0562/3533] zephyr/machine_uart: Fix arg of machine_uart_ioctl
 to make it uintptr_t.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/zephyr/machine_uart.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/zephyr/machine_uart.c b/ports/zephyr/machine_uart.c
index 6ae8707d7f130..23d7d59443729 100644
--- a/ports/zephyr/machine_uart.c
+++ b/ports/zephyr/machine_uart.c
@@ -131,7 +131,7 @@ STATIC mp_uint_t machine_uart_write(mp_obj_t self_in, const void *buf_in, mp_uin
     return size;
 }
 
-STATIC mp_uint_t machine_uart_ioctl(mp_obj_t self_in, mp_uint_t request, mp_uint_t arg, int *errcode) {
+STATIC mp_uint_t machine_uart_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_t arg, int *errcode) {
     mp_uint_t ret;
 
     if (request == MP_STREAM_POLL) {

From c9210a65dfce0771186916a1d43cbf63133773ba Mon Sep 17 00:00:00 2001
From: Andrew Scheller <github@loowis.durge.org>
Date: Mon, 1 Feb 2021 18:21:12 +0000
Subject: [PATCH 0563/3533] rp2/machine_pin: Change N_GPIOS to NUM_BANK0_GPIOS
 for pico-sdk compat.

This fixes machine_pin.c to build against the new pico-sdk coming down the
pipeline, whilst still working with the existing version.
---
 ports/rp2/machine_pin.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/rp2/machine_pin.c b/ports/rp2/machine_pin.c
index f798c10fdf7ac..0525e0f9f68bd 100644
--- a/ports/rp2/machine_pin.c
+++ b/ports/rp2/machine_pin.c
@@ -71,7 +71,7 @@ typedef struct _machine_pin_irq_obj_t {
 
 STATIC const mp_irq_methods_t machine_pin_irq_methods;
 
-STATIC const machine_pin_obj_t machine_pin_obj[N_GPIOS] = {
+STATIC const machine_pin_obj_t machine_pin_obj[NUM_BANK0_GPIOS] = {
     {{&machine_pin_type}, 0},
     {{&machine_pin_type}, 1},
     {{&machine_pin_type}, 2},
@@ -134,7 +134,7 @@ void machine_pin_init(void) {
 }
 
 void machine_pin_deinit(void) {
-    for (int i = 0; i < N_GPIOS; ++i) {
+    for (int i = 0; i < NUM_BANK0_GPIOS; ++i) {
         gpio_set_irq_enabled(i, GPIO_IRQ_ALL, false);
     }
     irq_set_enabled(IO_IRQ_BANK0, false);

From 52d3ae707d7ddb8cf2c06962923226221d281206 Mon Sep 17 00:00:00 2001
From: graham sanderson <graham.sanderson@raspberrypi.com>
Date: Mon, 1 Feb 2021 15:48:03 -0600
Subject: [PATCH 0564/3533] rp2/memmap_mp.ld: Update for latest SDK.

---
 ports/rp2/memmap_mp.ld | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/ports/rp2/memmap_mp.ld b/ports/rp2/memmap_mp.ld
index 5cebd33466a49..0dc96743ea5cb 100644
--- a/ports/rp2/memmap_mp.ld
+++ b/ports/rp2/memmap_mp.ld
@@ -35,7 +35,7 @@ SECTIONS
 {
     /* Second stage bootloader is prepended to the image. It must be 256 bytes big
        and checksummed. It is usually built by the boot_stage2 target
-       in the Pico SDK
+       in the Raspberry Pi Pico SDK
     */
 
     .flash_begin : {
@@ -59,12 +59,11 @@ SECTIONS
     */
 
     .text : {
-        __reset_start = .;
-        KEEP (*(.reset))
-        . = ALIGN(256);
-        __reset_end = .;
-        ASSERT(__reset_end - __reset_start == 256, "ERROR: reset section should only be 256 bytes");
+        __logical_binary_start = .;
         KEEP (*(.vectors))
+        KEEP (*(.binary_info_header))
+        __binary_info_header_end = .;
+        KEEP (*(.reset))
         /* TODO revisit this now memset/memcpy/float in ROM */
         /* bit of a hack right now to exclude all floating point and time critical (e.g. memset, memcpy) code from
          * FLASH ... we will include any thing excluded here in .data below by default */
@@ -247,6 +246,8 @@ SECTIONS
 
     /* Check if data + heap + stack exceeds RAM limit */
     ASSERT(__StackLimit >= __HeapLimit, "region RAM overflowed")
+
+    ASSERT( __binary_info_header_end - __logical_binary_start <= 256, "Binary info must be in first 256 bytes of the binary")
     /* todo assert on extra code */
 }
 

From 9b277d981528173f59daab196873a8c11aa17e26 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 2 Feb 2021 10:56:45 +1100
Subject: [PATCH 0565/3533] lib/pico-sdk: Update to latest version v1.0.1.

In particular it fixes GPIO19 so that it can be used as an output.

Signed-off-by: Damien George <damien@micropython.org>
---
 lib/pico-sdk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/pico-sdk b/lib/pico-sdk
index 493ed000ddfc2..2d5789eca8965 160000
--- a/lib/pico-sdk
+++ b/lib/pico-sdk
@@ -1 +1 @@
-Subproject commit 493ed000ddfc21aa1db933f5477dba52ac841aac
+Subproject commit 2d5789eca89658a7f0a01e2d6010c0f254605d72

From 7a9027fd5d64868322b9a82b0ac47ac0eba0167d Mon Sep 17 00:00:00 2001
From: Tim Radvan <tim@tjvr.org>
Date: Sat, 30 Jan 2021 21:48:53 +0000
Subject: [PATCH 0566/3533] rp2/rp2_pio: Add JMP PIN support for PIO.

PIO state machines can make a conditional jump on the state of a pin: the
`JMP PIN` command.  This requires the pin to be configured with
`sm_config_set_jmp_pin`, but until now we didn't have a way of doing that
in MicroPython.

This commit adds a new `jmp_pin=None` argument to `StateMachine`.  If it is
not `None` then we try to interpret it as a Pin, and pass its value to
`sm_config_set_jmp_pin`.

Signed-off-by: Tim Radvan <tim@tjvr.org>
---
 ports/rp2/rp2_pio.c | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/ports/rp2/rp2_pio.c b/ports/rp2/rp2_pio.c
index c8542127c03ba..7d8921d0c3a51 100644
--- a/ports/rp2/rp2_pio.c
+++ b/ports/rp2/rp2_pio.c
@@ -422,13 +422,14 @@ STATIC void rp2_state_machine_print(const mp_print_t *print, mp_obj_t self_in, m
 }
 
 // StateMachine.init(prog, freq=-1, *,
-//     in_base=None, out_base=None, set_base=None, sideset_base=None,
-//     in_shiftdir=None, out_shiftdir=None, push_thresh=None, pull_thresh=None,
+//     in_base=None, out_base=None, set_base=None, jmp_pin=None,
+//     sideset_base=None, in_shiftdir=None, out_shiftdir=None,
+//     push_thresh=None, pull_thresh=None,
 // )
 STATIC mp_obj_t rp2_state_machine_init_helper(const rp2_state_machine_obj_t *self, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum {
         ARG_prog, ARG_freq,
-        ARG_in_base, ARG_out_base, ARG_set_base, ARG_sideset_base,
+        ARG_in_base, ARG_out_base, ARG_set_base, ARG_jmp_pin, ARG_sideset_base,
         ARG_in_shiftdir, ARG_out_shiftdir, ARG_push_thresh, ARG_pull_thresh
     };
     static const mp_arg_t allowed_args[] = {
@@ -437,6 +438,7 @@ STATIC mp_obj_t rp2_state_machine_init_helper(const rp2_state_machine_obj_t *sel
         { MP_QSTR_in_base, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
         { MP_QSTR_out_base, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
         { MP_QSTR_set_base, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
+        { MP_QSTR_jmp_pin, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
         { MP_QSTR_sideset_base, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
         { MP_QSTR_in_shiftdir, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
         { MP_QSTR_out_shiftdir, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
@@ -501,6 +503,11 @@ STATIC mp_obj_t rp2_state_machine_init_helper(const rp2_state_machine_obj_t *sel
         sm_config_set_set_pins(&config, set_config.base, set_config.count);
     }
 
+    // Configure jmp pin, if needed.
+    if (args[ARG_jmp_pin].u_obj != mp_const_none) {
+        sm_config_set_jmp_pin(&config, mp_hal_get_pin_obj(args[ARG_jmp_pin].u_obj));
+    }
+
     // Configure sideset pin, if needed.
     asm_pio_config_t sideset_config = ASM_PIO_CONFIG_DEFAULT;
     asm_pio_get_pins("sideset", prog[PROG_SIDESET_PINS], args[ARG_sideset_base].u_obj, &sideset_config);

From 3ea05e499d52beaecf4c9c54a67510ac031fe27b Mon Sep 17 00:00:00 2001
From: Tim Radvan <tim@tjvr.org>
Date: Mon, 1 Feb 2021 20:07:19 +0000
Subject: [PATCH 0567/3533] examples/rp2: Add pio_uart_rx.py example.

This was adapted from the `pio/uart_rx` example from the `pico-examples`
repository:
https://github.com/raspberrypi/pico-examples/blob/master/pio/uart_rx/uart_rx.pio

It demonstrates the `jmp_pin` feature in action.

Signed-off-by: Tim Radvan <tim@tjvr.org>
---
 examples/rp2/pio_uart_rx.py | 104 ++++++++++++++++++++++++++++++++++++
 1 file changed, 104 insertions(+)
 create mode 100644 examples/rp2/pio_uart_rx.py

diff --git a/examples/rp2/pio_uart_rx.py b/examples/rp2/pio_uart_rx.py
new file mode 100644
index 0000000000000..41dfde3dad433
--- /dev/null
+++ b/examples/rp2/pio_uart_rx.py
@@ -0,0 +1,104 @@
+# Example using PIO to create a UART RX interface.
+#
+# To make it work you'll need a wire connecting GPIO4 and GPIO3.
+#
+# Demonstrates:
+#   - PIO shifting in data on a pin
+#   - PIO jmp(pin) instruction
+#   - PIO irq handler
+#   - using the second core via _thread
+
+import _thread
+from machine import Pin, UART
+from rp2 import PIO, StateMachine, asm_pio
+
+UART_BAUD = 9600
+
+HARD_UART_TX_PIN = Pin(4, Pin.OUT)
+PIO_RX_PIN = Pin(3, Pin.IN, Pin.PULL_UP)
+
+
+@asm_pio(
+    autopush=True,
+    push_thresh=8,
+    in_shiftdir=rp2.PIO.SHIFT_RIGHT,
+)
+def uart_rx_mini():
+    # fmt: off
+    # Wait for start bit
+    wait(0, pin, 0)
+    # Preload bit counter, delay until eye of first data bit
+    set(x, 7)                 [10]
+    # Loop 8 times
+    label("bitloop")
+    # Sample data
+    in_(pins, 1)
+    # Each iteration is 8 cycles
+    jmp(x_dec, "bitloop")     [6]
+    # fmt: on
+
+
+@asm_pio(
+    in_shiftdir=rp2.PIO.SHIFT_RIGHT,
+)
+def uart_rx():
+    # fmt: off
+    label("start")
+    # Stall until start bit is asserted
+    wait(0, pin, 0)
+    # Preload bit counter, then delay until halfway through
+    # the first data bit (12 cycles incl wait, set).
+    set(x, 7)                 [10]
+    label("bitloop")
+    # Shift data bit into ISR
+    in_(pins, 1)
+    # Loop 8 times, each loop iteration is 8 cycles
+    jmp(x_dec, "bitloop")     [6]
+    # Check stop bit (should be high)
+    jmp(pin, "good_stop")
+    # Either a framing error or a break. Set a sticky flag
+    # and wait for line to return to idle state.
+    irq(block, 4)
+    wait(1, pin, 0)
+    # Don't push data if we didn't see good framing.
+    jmp("start")
+    # No delay before returning to start; a little slack is
+    # important in case the TX clock is slightly too fast.
+    label("good_stop")
+    push(block)
+    # fmt: on
+
+
+# The handler for a UART break detected by the PIO.
+def handler(sm):
+    print("break", time.ticks_ms(), end=" ")
+
+
+# Function for core1 to execute to write to the given UART.
+def core1_task(uart, text):
+    uart.write(text)
+
+
+# Set up the hard UART we're going to use to print characters.
+uart = UART(1, UART_BAUD, tx=HARD_UART_TX_PIN)
+
+for pio_prog in ("uart_rx_mini", "uart_rx"):
+    # Set up the state machine we're going to use to receive the characters.
+    sm = StateMachine(
+        0,
+        globals()[pio_prog],
+        freq=8 * UART_BAUD,
+        in_base=PIO_RX_PIN,  # For WAIT, IN
+        jmp_pin=PIO_RX_PIN,  # For JMP
+    )
+    sm.irq(handler)
+    sm.active(1)
+
+    # Tell core 1 to print some text to UART 1
+    text = "Hello, world from PIO, using {}!".format(pio_prog)
+    _thread.start_new_thread(core1_task, (uart, text))
+
+    # Echo characters received from PIO to the console.
+    for i in range(len(text)):
+        print(chr(sm.get() >> 24), end="")
+    print()

From 7be1f7790278d2c40e7a828e340c43f257c7d748 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 2 Feb 2021 12:09:33 +1100
Subject: [PATCH 0568/3533] stm32/usbd_cdc_interface: Don't wait in
 usbd_cdc_tx_always if suspended.

MCUs with device-only USB peripherals (eg L0, WB) do not implement (at
least not in the ST HAL) the HAL_PCD_DisconnectCallback event.  So if a USB
cable is disconnected the USB driver does not deinitialise itself
(usbd_cdc_deinit is not called) and the CDC driver can stay in the
USBD_CDC_CONNECT_STATE_CONNECTED state.  Then if the USB was attached to
the REPL, output can become very slow waiting in usbd_cdc_tx_always for
500ms for each character.

The disconnect event is not implemented on these MCUs but the suspend event
is.  And in the situation where the USB cable is disconnected the suspend
event is raised because SOF packets are no longer received.

The issue of very slow output on these MCUs is fixed in this commit (really
worked around) by adding a check in usbd_cdc_tx_always to see if the USB
device state is suspended, and, if so, breaking out of the 500ms wait loop.
This should also help all MCUs for a real USB suspend.

A proper fix for MCUs with device-only USB would be to implement or somehow
synthesise the HAL_PCD_DisconnectCallback event.

See issue #6672.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/usbd_cdc_interface.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ports/stm32/usbd_cdc_interface.c b/ports/stm32/usbd_cdc_interface.c
index a8261a958aa09..a465f608a655e 100644
--- a/ports/stm32/usbd_cdc_interface.c
+++ b/ports/stm32/usbd_cdc_interface.c
@@ -382,6 +382,10 @@ void usbd_cdc_tx_always(usbd_cdc_itf_t *cdc, const uint8_t *buf, uint32_t len) {
             uint32_t start = HAL_GetTick();
             while (usbd_cdc_tx_buffer_full(cdc) && HAL_GetTick() - start <= 500) {
                 usbd_cdc_try_tx(cdc);
+                if (cdc->base.usbd->pdev->dev_state == USBD_STATE_SUSPENDED) {
+                    // The USB is suspended so buffer will never be drained; exit loop
+                    break;
+                }
                 if (query_irq() == IRQ_STATE_DISABLED) {
                     // IRQs disabled so buffer will never be drained; exit loop
                     break;

From 5ef71cd16793ab254a1f0e7dd46bb9f0c5809f44 Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Tue, 2 Feb 2021 15:09:15 +1100
Subject: [PATCH 0569/3533] stm32/mboot: Change debug compiler optimisation
 from -O0 to -Og.

With mboot encrpytion and fsload enabled, the DEBUG build -O0 compiler
settings result in mboot no longer fitting in the 32k sector.  This commit
changes this to -Og which also brings it into line with the regular stm32
build.
---
 ports/stm32/mboot/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/stm32/mboot/Makefile b/ports/stm32/mboot/Makefile
index ad2fda3eee508..0c92442597723 100755
--- a/ports/stm32/mboot/Makefile
+++ b/ports/stm32/mboot/Makefile
@@ -92,7 +92,7 @@ LDFLAGS += --gc-sections
 # Debugging/Optimization
 ifeq ($(DEBUG), 1)
 CFLAGS += -g -DPENDSV_DEBUG
-COPT = -O0
+COPT = -Og
 else
 COPT += -Os -DNDEBUG
 endif

From 03974485016654de09e42737ea875bc601d5ec56 Mon Sep 17 00:00:00 2001
From: stijn <stijn@ignitron.net>
Date: Thu, 14 Jan 2021 13:23:15 +0100
Subject: [PATCH 0570/3533] tests/run-tests: Change default Python command used
 on Windows.

Default to just calling python since that is most commonly available: the
official installer or zipfiles from python.org, anaconda, nupkg all result
in python being available but not python3.  In other words: the default
used so far is wrong.  Note that os.name is 'posix' when running the python
version which comes with Cygwin or MSys2 so they are not affected by this.
However of all possible ways to get Python on Windows, only Cygwin provides
no python command so update the default way for running tests in the
README.
---
 ports/windows/README.md | 4 ++++
 tests/run-tests         | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/ports/windows/README.md b/ports/windows/README.md
index 8d907d1b7243a..1b904f8f5e60e 100644
--- a/ports/windows/README.md
+++ b/ports/windows/README.md
@@ -90,6 +90,10 @@ Running the tests
 This is similar for all ports:
 
     cd ../../tests
+    python ./run-tests
+
+Though when running on Cygwin and using Cygwin's Python installation you'll need:
+
     python3 ./run-tests
 
 Depending on the combination of platform and Python version used it might be
diff --git a/tests/run-tests b/tests/run-tests
index cb5b5cd0a5676..b733d8a9fc582 100755
--- a/tests/run-tests
+++ b/tests/run-tests
@@ -20,7 +20,7 @@ def base_path(*p):
 # is of lower version, you can point MICROPY_CPYTHON3 environment var
 # to the correct executable.
 if os.name == 'nt':
-    CPYTHON3 = os.getenv('MICROPY_CPYTHON3', 'python3.exe')
+    CPYTHON3 = os.getenv('MICROPY_CPYTHON3', 'python')
     MICROPYTHON = os.getenv('MICROPY_MICROPYTHON', base_path('../ports/windows/micropython.exe'))
 else:
     CPYTHON3 = os.getenv('MICROPY_CPYTHON3', 'python3')

From 81a4d96aed7221ea497bb90f135b3fd14ab22c0c Mon Sep 17 00:00:00 2001
From: stijn <stijn@ignitron.net>
Date: Sat, 16 Jan 2021 09:01:17 +0100
Subject: [PATCH 0571/3533] windows/msvc: Use same default python command as
 core.

---
 ports/windows/msvc/genhdr.targets | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/windows/msvc/genhdr.targets b/ports/windows/msvc/genhdr.targets
index 3af0ea263699b..9ea6ed28cb4b8 100644
--- a/ports/windows/msvc/genhdr.targets
+++ b/ports/windows/msvc/genhdr.targets
@@ -14,6 +14,7 @@
     <PyQstrDefs>$(PySrcDir)qstrdefs.h</PyQstrDefs>
     <QstrDefsCollected>$(DestDir)qstrdefscollected.h</QstrDefsCollected>
     <QstrGen>$(DestDir)qstrdefs.generated.h</QstrGen>
+    <PyPython Condition="'$(PyPython)' == ''">$(MICROPY_CPYTHON3)</PyPython>
     <PyPython Condition="'$(PyPython)' == ''">python</PyPython>
     <CLToolExe Condition="'$(CLToolExe)' == ''">cl.exe</CLToolExe>
     <PyClTool>$([System.IO.Path]::Combine(`$(CLToolPath)`, `$(CLToolExe)`))</PyClTool>

From 195e7dfa0681bcfbc67cfaa68f863c51dcac95da Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 2 Feb 2021 12:55:11 +1100
Subject: [PATCH 0572/3533] rp2/modmachine: Implement additional functions incl
 unique_id and idle.

Added functions in the machine module are:
- unique_id (returns 8 bytes)
- soft_reset
- idle
- lightsleep, deepsleep (not power saving at the moment)
- disable_irq, enable_irq
- time_pulse_us

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/rp2/CMakeLists.txt |  1 +
 ports/rp2/main.c         | 11 +++++--
 ports/rp2/modmachine.c   | 65 ++++++++++++++++++++++++++++++++++++++++
 ports/rp2/mpconfigport.h |  1 +
 4 files changed, 76 insertions(+), 2 deletions(-)

diff --git a/ports/rp2/CMakeLists.txt b/ports/rp2/CMakeLists.txt
index 400cb8480e849..160456c6b1e24 100644
--- a/ports/rp2/CMakeLists.txt
+++ b/ports/rp2/CMakeLists.txt
@@ -143,6 +143,7 @@ target_link_libraries(${MICROPYTHON_TARGET}
     pico_multicore
     pico_stdlib_headers
     pico_stdlib
+    pico_unique_id
     tinyusb_device
 )
 
diff --git a/ports/rp2/main.c b/ports/rp2/main.c
index 3e956ae78c4ad..64218f97c5aeb 100644
--- a/ports/rp2/main.c
+++ b/ports/rp2/main.c
@@ -110,9 +110,15 @@ int main(int argc, char **argv) {
         pyexec_frozen_module("_boot.py");
 
         // Execute user scripts.
-        pyexec_file_if_exists("boot.py");
+        int ret = pyexec_file_if_exists("boot.py");
+        if (ret & PYEXEC_FORCED_EXIT) {
+            goto soft_reset_exit;
+        }
         if (pyexec_mode_kind == PYEXEC_MODE_FRIENDLY_REPL) {
-            pyexec_file_if_exists("main.py");
+            ret = pyexec_file_if_exists("main.py");
+            if (ret & PYEXEC_FORCED_EXIT) {
+                goto soft_reset_exit;
+            }
         }
 
         for (;;) {
@@ -127,6 +133,7 @@ int main(int argc, char **argv) {
             }
         }
 
+    soft_reset_exit:
         mp_printf(MP_PYTHON_PRINTER, "MPY: soft reboot\n");
         rp2_pio_deinit();
         machine_pin_deinit();
diff --git a/ports/rp2/modmachine.c b/ports/rp2/modmachine.c
index 228e9543c1936..dbaafabe86ede 100644
--- a/ports/rp2/modmachine.c
+++ b/ports/rp2/modmachine.c
@@ -26,18 +26,34 @@
 
 #include "py/runtime.h"
 #include "py/mphal.h"
+#include "lib/utils/pyexec.h"
 #include "extmod/machine_i2c.h"
 #include "extmod/machine_mem.h"
+#include "extmod/machine_pulse.h"
 #include "extmod/machine_spi.h"
 
 #include "modmachine.h"
 #include "hardware/clocks.h"
 #include "hardware/watchdog.h"
 #include "pico/bootrom.h"
+#include "pico/unique_id.h"
 
 #define RP2_RESET_PWRON (1)
 #define RP2_RESET_WDT (3)
 
+STATIC mp_obj_t machine_unique_id(void) {
+    pico_unique_board_id_t id;
+    pico_get_unique_board_id(&id);
+    return mp_obj_new_bytes(id.id, sizeof(id.id));
+}
+MP_DEFINE_CONST_FUN_OBJ_0(machine_unique_id_obj, machine_unique_id);
+
+STATIC mp_obj_t machine_soft_reset(void) {
+    pyexec_system_exit = PYEXEC_FORCED_EXIT;
+    mp_raise_type(&mp_type_SystemExit);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(machine_soft_reset_obj, machine_soft_reset);
+
 STATIC mp_obj_t machine_reset(void) {
     watchdog_reboot(0, SRAM_END, 0);
     for (;;) {
@@ -69,12 +85,61 @@ STATIC mp_obj_t machine_freq(void) {
 }
 MP_DEFINE_CONST_FUN_OBJ_0(machine_freq_obj, machine_freq);
 
+STATIC mp_obj_t machine_idle(void) {
+    best_effort_wfe_or_timeout(make_timeout_time_ms(1));
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(machine_idle_obj, machine_idle);
+
+STATIC mp_obj_t machine_lightsleep(size_t n_args, const mp_obj_t *args) {
+    if (n_args == 0) {
+        for (;;) {
+            MICROPY_EVENT_POLL_HOOK
+        }
+    } else {
+        mp_hal_delay_ms(mp_obj_get_int(args[0]));
+    }
+    return mp_const_none;
+}
+MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_lightsleep_obj, 0, 1, machine_lightsleep);
+
+STATIC mp_obj_t machine_deepsleep(size_t n_args, const mp_obj_t *args) {
+    machine_lightsleep(n_args, args);
+    return machine_reset();
+}
+MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_deepsleep_obj, 0, 1, machine_deepsleep);
+
+STATIC mp_obj_t machine_disable_irq(void) {
+    uint32_t state = MICROPY_BEGIN_ATOMIC_SECTION();
+    return mp_obj_new_int(state);
+}
+MP_DEFINE_CONST_FUN_OBJ_0(machine_disable_irq_obj, machine_disable_irq);
+
+STATIC mp_obj_t machine_enable_irq(mp_obj_t state_in) {
+    uint32_t state = mp_obj_get_int(state_in);
+    MICROPY_END_ATOMIC_SECTION(state);
+    return mp_const_none;
+}
+MP_DEFINE_CONST_FUN_OBJ_1(machine_enable_irq_obj, machine_enable_irq);
+
 STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__),            MP_ROM_QSTR(MP_QSTR_umachine) },
+    { MP_ROM_QSTR(MP_QSTR_unique_id),           MP_ROM_PTR(&machine_unique_id_obj) },
+    { MP_ROM_QSTR(MP_QSTR_soft_reset),          MP_ROM_PTR(&machine_soft_reset_obj) },
     { MP_ROM_QSTR(MP_QSTR_reset),               MP_ROM_PTR(&machine_reset_obj) },
     { MP_ROM_QSTR(MP_QSTR_reset_cause),         MP_ROM_PTR(&machine_reset_cause_obj) },
     { MP_ROM_QSTR(MP_QSTR_bootloader),          MP_ROM_PTR(&machine_bootloader_obj) },
     { MP_ROM_QSTR(MP_QSTR_freq),                MP_ROM_PTR(&machine_freq_obj) },
+
+    { MP_ROM_QSTR(MP_QSTR_idle),                MP_ROM_PTR(&machine_idle_obj) },
+    { MP_ROM_QSTR(MP_QSTR_lightsleep),          MP_ROM_PTR(&machine_lightsleep_obj) },
+    { MP_ROM_QSTR(MP_QSTR_deepsleep),           MP_ROM_PTR(&machine_deepsleep_obj) },
+
+    { MP_ROM_QSTR(MP_QSTR_disable_irq),         MP_ROM_PTR(&machine_disable_irq_obj) },
+    { MP_ROM_QSTR(MP_QSTR_enable_irq),          MP_ROM_PTR(&machine_enable_irq_obj) },
+
+    { MP_ROM_QSTR(MP_QSTR_time_pulse_us),       MP_ROM_PTR(&machine_time_pulse_us_obj) },
+
     { MP_ROM_QSTR(MP_QSTR_mem8),                MP_ROM_PTR(&machine_mem8_obj) },
     { MP_ROM_QSTR(MP_QSTR_mem16),               MP_ROM_PTR(&machine_mem16_obj) },
     { MP_ROM_QSTR(MP_QSTR_mem32),               MP_ROM_PTR(&machine_mem32_obj) },
diff --git a/ports/rp2/mpconfigport.h b/ports/rp2/mpconfigport.h
index d409ccfd4d926..9ba381030b150 100644
--- a/ports/rp2/mpconfigport.h
+++ b/ports/rp2/mpconfigport.h
@@ -109,6 +109,7 @@
 #define MICROPY_PY_USELECT                      (1)
 #define MICROPY_PY_MACHINE                      (1)
 #define MICROPY_PY_MACHINE_PIN_MAKE_NEW         mp_pin_make_new
+#define MICROPY_PY_MACHINE_PULSE                (1)
 #define MICROPY_PY_MACHINE_I2C                  (1)
 #define MICROPY_PY_MACHINE_SPI                  (1)
 #define MICROPY_PY_MACHINE_SPI_MSB              (SPI_MSB_FIRST)

From 0e4458707673bdf04a812ab9cd2ae06712bcdd1a Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 1 Feb 2021 13:40:28 +1100
Subject: [PATCH 0573/3533] docs/library/machine.Pin.rst: Make it clear which
 methods are not core.

Signed-off-by: Damien George <damien@micropython.org>
---
 docs/library/machine.Pin.rst | 58 +++++++++++++++++++++++-------------
 1 file changed, 37 insertions(+), 21 deletions(-)

diff --git a/docs/library/machine.Pin.rst b/docs/library/machine.Pin.rst
index 095240fe1499a..f8e9e1054d65b 100644
--- a/docs/library/machine.Pin.rst
+++ b/docs/library/machine.Pin.rst
@@ -33,8 +33,8 @@ Usage Model::
     # read and print the pin value
     print(p2.value())
 
-    # reconfigure pin #0 in input mode
-    p0.mode(p0.IN)
+    # reconfigure pin #0 in input mode with a pull down resistor
+    p0.init(p0.IN, p0.PULL_DOWN)
 
     # configure an irq callback
     p0.irq(lambda p:print(p))
@@ -160,25 +160,6 @@ Methods
 
    Set pin to "0" output level.
 
-.. method:: Pin.mode([mode])
-
-   Get or set the pin mode.
-   See the constructor documentation for details of the ``mode`` argument.
-
-.. method:: Pin.pull([pull])
-
-   Get or set the pin pull state.
-   See the constructor documentation for details of the ``pull`` argument.
-
-.. method:: Pin.drive([drive])
-
-   Get or set the pin drive strength.
-   See the constructor documentation for details of the ``drive`` argument.
-
-   Not all ports implement this method.
-
-   Availability: WiPy.
-
 .. method:: Pin.irq(handler=None, trigger=(Pin.IRQ_FALLING | Pin.IRQ_RISING), *, priority=1, wake=None, hard=False)
 
    Configure an interrupt handler to be called when the trigger source of the
@@ -220,6 +201,41 @@ Methods
 
    This method returns a callback object.
 
+The following methods are not part of the core Pin API and only implemented on certain ports.
+
+.. method:: Pin.low()
+
+   Set pin to "0" output level.
+
+   Availability: nrf, rp2, stm32 ports.
+
+.. method:: Pin.high()
+
+   Set pin to "1" output level.
+
+   Availability: nrf, rp2, stm32 ports.
+
+.. method:: Pin.mode([mode])
+
+   Get or set the pin mode.
+   See the constructor documentation for details of the ``mode`` argument.
+
+   Availability: cc3200, stm32 ports.
+
+.. method:: Pin.pull([pull])
+
+   Get or set the pin pull state.
+   See the constructor documentation for details of the ``pull`` argument.
+
+   Availability: cc3200, stm32 ports.
+
+.. method:: Pin.drive([drive])
+
+   Get or set the pin drive strength.
+   See the constructor documentation for details of the ``drive`` argument.
+
+   Availability: cc3200 port.
+
 Constants
 ---------
 

From 78b23c3a1f064dc19bbee68930ef3aba110c781c Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 3 Feb 2021 00:59:07 +1100
Subject: [PATCH 0574/3533] all: Bump version to 1.14.

Signed-off-by: Damien George <damien@micropython.org>
---
 docs/conf.py  | 2 +-
 py/mpconfig.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/conf.py b/docs/conf.py
index 4ca4d18f502e9..dd6cc31fb8736 100755
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -74,7 +74,7 @@
 #
 # We don't follow "The short X.Y version" vs "The full version, including alpha/beta/rc tags"
 # breakdown, so use the same version identifier for both to avoid confusion.
-version = release = '1.13'
+version = release = '1.14'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/py/mpconfig.h b/py/mpconfig.h
index 518bddd6c8972..d9a30cd3005f1 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -28,7 +28,7 @@
 
 // Current version of MicroPython
 #define MICROPY_VERSION_MAJOR 1
-#define MICROPY_VERSION_MINOR 13
+#define MICROPY_VERSION_MINOR 14
 #define MICROPY_VERSION_MICRO 0
 
 // Combined version as a 32-bit number for convenience

From 7f7b4f2bc68a06c9f47d6b99e953cac0b21c26c9 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 3 Feb 2021 16:29:54 +1100
Subject: [PATCH 0575/3533] rp2/machine_adc: Only initialise the ADC periph if
 not already enabled.

Otherwise it resets the ADC peripheral each time a new ADC object is
constructed, which can reset other state that has already been set up.

See issue #6833.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/rp2/machine_adc.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ports/rp2/machine_adc.c b/ports/rp2/machine_adc.c
index f0f367151cab5..f8925e5aa33a6 100644
--- a/ports/rp2/machine_adc.c
+++ b/ports/rp2/machine_adc.c
@@ -78,7 +78,10 @@ STATIC mp_obj_t machine_adc_make_new(const mp_obj_type_t *type, size_t n_args, s
         }
     }
 
-    adc_init();
+    // Initialise the ADC peripheral if it's not already running.
+    if (!(adc_hw->cs & ADC_CS_EN_BITS)) {
+        adc_init();
+    }
 
     if (ADC_IS_VALID_GPIO(channel)) {
         // Configure the GPIO pin in ADC mode.

From 5fdf351178df9a18df624ae0f5947d8a5a6bce40 Mon Sep 17 00:00:00 2001
From: Xiang Xiao <xiaoxiang@xiaomi.com>
Date: Mon, 11 Jan 2021 14:10:25 +0800
Subject: [PATCH 0576/3533] py/gc: Don't include mpconfig.h and misc.h in gc.h.

Because gc.h doesn't reference any symbol from these header files.

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
---
 ports/esp8266/gccollect.c | 1 +
 py/gc.h                   | 4 +---
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/ports/esp8266/gccollect.c b/ports/esp8266/gccollect.c
index 3618a56644e6f..bca0e030cb0b9 100644
--- a/ports/esp8266/gccollect.c
+++ b/ports/esp8266/gccollect.c
@@ -26,6 +26,7 @@
 
 #include <stdio.h>
 
+#include "py/mpconfig.h"
 #include "py/gc.h"
 #include "gccollect.h"
 
diff --git a/py/gc.h b/py/gc.h
index 4690d393708f2..f67fb0daad6dc 100644
--- a/py/gc.h
+++ b/py/gc.h
@@ -26,11 +26,9 @@
 #ifndef MICROPY_INCLUDED_PY_GC_H
 #define MICROPY_INCLUDED_PY_GC_H
 
+#include <stdbool.h>
 #include <stdint.h>
 
-#include "py/mpconfig.h"
-#include "py/misc.h"
-
 void gc_init(void *start, void *end);
 
 // These lock/unlock functions can be nested.

From 7c4435459261f1ea93577938b1ab281239d159e7 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 4 Feb 2021 14:43:24 +1100
Subject: [PATCH 0577/3533] ports: Remove def of MP_PLAT_PRINT_STRN if it's the
 same as the default.

To simplify config, there's no need to specify MP_PLAT_PRINT_STRN if it's
the same as the default definition in py/mpconfig.h.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/cc3200/mpconfigport.h     | 2 --
 ports/esp32/mpconfigport.h      | 1 -
 ports/esp8266/mpconfigport.h    | 1 -
 ports/javascript/mpconfigport.h | 2 --
 ports/mimxrt/mpconfigport.h     | 1 -
 ports/nrf/mpconfigport.h        | 2 --
 ports/pic16bit/mpconfigport.h   | 2 --
 ports/powerpc/mpconfigport.h    | 2 --
 ports/samd/mpconfigport.h       | 1 -
 ports/stm32/mpconfigport.h      | 2 --
 ports/teensy/mpconfigport.h     | 2 --
 11 files changed, 18 deletions(-)

diff --git a/ports/cc3200/mpconfigport.h b/ports/cc3200/mpconfigport.h
index 6fdb278d864b1..87689c505efc5 100644
--- a/ports/cc3200/mpconfigport.h
+++ b/ports/cc3200/mpconfigport.h
@@ -197,8 +197,6 @@ typedef int32_t mp_int_t;                           // must be pointer size
 typedef unsigned int mp_uint_t;                     // must be pointer size
 typedef long mp_off_t;
 
-#define MP_PLAT_PRINT_STRN(str, len) mp_hal_stdout_tx_strn_cooked(str, len)
-
 #define MICROPY_BEGIN_ATOMIC_SECTION()              disable_irq()
 #define MICROPY_END_ATOMIC_SECTION(state)           enable_irq(state)
 #define MICROPY_EVENT_POLL_HOOK                     __WFI();
diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h
index f170d70708b79..5ad5fa18a3045 100644
--- a/ports/esp32/mpconfigport.h
+++ b/ports/esp32/mpconfigport.h
@@ -223,7 +223,6 @@ struct mp_bluetooth_nimble_root_pointers_t;
 
 #define BYTES_PER_WORD (4)
 #define MICROPY_MAKE_POINTER_CALLABLE(p) ((void *)((mp_uint_t)(p)))
-#define MP_PLAT_PRINT_STRN(str, len) mp_hal_stdout_tx_strn_cooked(str, len)
 void *esp_native_code_commit(void *, size_t, void *);
 #define MP_PLAT_COMMIT_EXEC(buf, len, reloc) esp_native_code_commit(buf, len, reloc)
 #define MP_SSIZE_MAX (0x7fffffff)
diff --git a/ports/esp8266/mpconfigport.h b/ports/esp8266/mpconfigport.h
index 99cf2ade4dec3..2c56b4188fd07 100644
--- a/ports/esp8266/mpconfigport.h
+++ b/ports/esp8266/mpconfigport.h
@@ -135,7 +135,6 @@ typedef uint32_t sys_prot_t; // for modlwip
 // ssize_t, off_t as required by POSIX-signatured functions in stream.h
 #include <sys/types.h>
 
-#define MP_PLAT_PRINT_STRN(str, len) mp_hal_stdout_tx_strn_cooked(str, len)
 void *esp_native_code_commit(void *, size_t, void *);
 #define MP_PLAT_COMMIT_EXEC(buf, len, reloc) esp_native_code_commit(buf, len, reloc)
 
diff --git a/ports/javascript/mpconfigport.h b/ports/javascript/mpconfigport.h
index 0101e10c8d613..d1bfbbd6011e5 100644
--- a/ports/javascript/mpconfigport.h
+++ b/ports/javascript/mpconfigport.h
@@ -180,8 +180,6 @@ typedef int mp_int_t; // must be pointer size
 typedef unsigned mp_uint_t; // must be pointer size
 typedef long mp_off_t;
 
-#define MP_PLAT_PRINT_STRN(str, len) mp_hal_stdout_tx_strn_cooked(str, len)
-
 // extra built in names to add to the global namespace
 #define MICROPY_PORT_BUILTINS \
     { MP_ROM_QSTR(MP_QSTR_open), MP_ROM_PTR(&mp_builtin_open_obj) },
diff --git a/ports/mimxrt/mpconfigport.h b/ports/mimxrt/mpconfigport.h
index 344867fb819dd..15a292486ff4e 100644
--- a/ports/mimxrt/mpconfigport.h
+++ b/ports/mimxrt/mpconfigport.h
@@ -98,7 +98,6 @@ extern const struct _mp_obj_module_t mp_module_utime;
     } while (0);
 
 #define MICROPY_MAKE_POINTER_CALLABLE(p) ((void *)((mp_uint_t)(p) | 1))
-#define MP_PLAT_PRINT_STRN(str, len) mp_hal_stdout_tx_strn_cooked(str, len)
 
 #define MP_SSIZE_MAX (0x7fffffff)
 typedef int mp_int_t; // must be pointer size
diff --git a/ports/nrf/mpconfigport.h b/ports/nrf/mpconfigport.h
index a025feb2ec65a..581e83ef2f8c7 100644
--- a/ports/nrf/mpconfigport.h
+++ b/ports/nrf/mpconfigport.h
@@ -332,8 +332,6 @@ extern const struct _mp_obj_module_t ble_module;
         __WFI(); \
     } while (0);
 
-#define MP_PLAT_PRINT_STRN(str, len) mp_hal_stdout_tx_strn_cooked(str, len)
-
 // We need to provide a declaration/definition of alloca()
 #include <alloca.h>
 
diff --git a/ports/pic16bit/mpconfigport.h b/ports/pic16bit/mpconfigport.h
index f121081e6fe8b..43300d1760283 100644
--- a/ports/pic16bit/mpconfigport.h
+++ b/ports/pic16bit/mpconfigport.h
@@ -84,8 +84,6 @@ typedef unsigned int mp_uint_t; // must be pointer size
 
 typedef int mp_off_t;
 
-#define MP_PLAT_PRINT_STRN(str, len) mp_hal_stdout_tx_strn_cooked(str, len)
-
 // extra builtin names to add to the global namespace
 #define MICROPY_PORT_BUILTINS \
     { MP_ROM_QSTR(MP_QSTR_open), MP_ROM_PTR(&mp_builtin_open_obj) },
diff --git a/ports/powerpc/mpconfigport.h b/ports/powerpc/mpconfigport.h
index 7a927773626d7..0b868e3dafabf 100644
--- a/ports/powerpc/mpconfigport.h
+++ b/ports/powerpc/mpconfigport.h
@@ -103,8 +103,6 @@ typedef unsigned long mp_uint_t; // must be pointer size
 
 typedef long mp_off_t;
 
-#define MP_PLAT_PRINT_STRN(str, len) mp_hal_stdout_tx_strn_cooked(str, len)
-
 // extra built in names to add to the global namespace
 #define MICROPY_PORT_BUILTINS \
     { MP_ROM_QSTR(MP_QSTR_open), MP_ROM_PTR(&mp_builtin_open_obj) },
diff --git a/ports/samd/mpconfigport.h b/ports/samd/mpconfigport.h
index ffb30bf5e2188..852d9e9ee52de 100644
--- a/ports/samd/mpconfigport.h
+++ b/ports/samd/mpconfigport.h
@@ -98,7 +98,6 @@ extern const struct _mp_obj_module_t mp_module_utime;
     } while (0);
 
 #define MICROPY_MAKE_POINTER_CALLABLE(p) ((void *)((mp_uint_t)(p) | 1))
-#define MP_PLAT_PRINT_STRN(str, len) mp_hal_stdout_tx_strn_cooked(str, len)
 
 #define MP_SSIZE_MAX (0x7fffffff)
 typedef int mp_int_t; // must be pointer size
diff --git a/ports/stm32/mpconfigport.h b/ports/stm32/mpconfigport.h
index b6906ef998c2e..a47529d8b3c01 100644
--- a/ports/stm32/mpconfigport.h
+++ b/ports/stm32/mpconfigport.h
@@ -360,8 +360,6 @@ typedef unsigned int mp_uint_t; // must be pointer size
 
 typedef long mp_off_t;
 
-#define MP_PLAT_PRINT_STRN(str, len) mp_hal_stdout_tx_strn_cooked(str, len)
-
 // We have inlined IRQ functions for efficiency (they are generally
 // 1 machine instruction).
 //
diff --git a/ports/teensy/mpconfigport.h b/ports/teensy/mpconfigport.h
index c00da5ed9e498..3acedcf0248c9 100644
--- a/ports/teensy/mpconfigport.h
+++ b/ports/teensy/mpconfigport.h
@@ -62,8 +62,6 @@ typedef int32_t mp_int_t; // must be pointer size
 typedef unsigned int mp_uint_t; // must be pointer size
 typedef long mp_off_t;
 
-#define MP_PLAT_PRINT_STRN(str, len) mp_hal_stdout_tx_strn_cooked(str, len)
-
 // We have inlined IRQ functions for efficiency (they are generally
 // 1 machine instruction).
 //

From 8a41ee19c22d7bb85fcbd90c9d06b9937a1b8c87 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 4 Feb 2021 15:27:53 +1100
Subject: [PATCH 0578/3533] py: Remove BITS_PER_WORD definition.

It's only used in one location, to test if << or >> will overflow when
shifting mp_uint_t.  For such a test it's clearer to use sizeof(lhs_val),
which will be valid even if the type of lhs_val changes.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/mpconfig.h | 1 -
 py/runtime.c  | 8 +++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/py/mpconfig.h b/py/mpconfig.h
index d9a30cd3005f1..3c1ed28d806f7 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -1538,7 +1538,6 @@ typedef double mp_float_t;
 #ifndef BITS_PER_BYTE
 #define BITS_PER_BYTE (8)
 #endif
-#define BITS_PER_WORD (BITS_PER_BYTE * BYTES_PER_WORD)
 // mp_int_t value with most significant bit set
 #define WORD_MSBIT_HIGH (((mp_uint_t)1) << (BYTES_PER_WORD * 8 - 1))
 
diff --git a/py/runtime.c b/py/runtime.c
index c12271f4e2cf5..2e2fa1d173351 100644
--- a/py/runtime.c
+++ b/py/runtime.c
@@ -387,7 +387,9 @@ mp_obj_t mp_binary_op(mp_binary_op_t op, mp_obj_t lhs, mp_obj_t rhs) {
                     if (rhs_val < 0) {
                         // negative shift not allowed
                         mp_raise_ValueError(MP_ERROR_TEXT("negative shift count"));
-                    } else if (rhs_val >= (mp_int_t)BITS_PER_WORD || lhs_val > (MP_SMALL_INT_MAX >> rhs_val) || lhs_val < (MP_SMALL_INT_MIN >> rhs_val)) {
+                    } else if (rhs_val >= (mp_int_t)(sizeof(lhs_val) * BITS_PER_BYTE)
+                               || lhs_val > (MP_SMALL_INT_MAX >> rhs_val)
+                               || lhs_val < (MP_SMALL_INT_MIN >> rhs_val)) {
                         // left-shift will overflow, so use higher precision integer
                         lhs = mp_obj_new_int_from_ll(lhs_val);
                         goto generic_binary_op;
@@ -404,10 +406,10 @@ mp_obj_t mp_binary_op(mp_binary_op_t op, mp_obj_t lhs, mp_obj_t rhs) {
                         mp_raise_ValueError(MP_ERROR_TEXT("negative shift count"));
                     } else {
                         // standard precision is enough for right-shift
-                        if (rhs_val >= (mp_int_t)BITS_PER_WORD) {
+                        if (rhs_val >= (mp_int_t)(sizeof(lhs_val) * BITS_PER_BYTE)) {
                             // Shifting to big amounts is underfined behavior
                             // in C and is CPU-dependent; propagate sign bit.
-                            rhs_val = BITS_PER_WORD - 1;
+                            rhs_val = sizeof(lhs_val) * BITS_PER_BYTE - 1;
                         }
                         lhs_val >>= rhs_val;
                     }

From 7e956fae28e4e3fdea30f834d448eacfc4429de7 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 4 Feb 2021 15:32:59 +1100
Subject: [PATCH 0579/3533] py: Rename BITS_PER_BYTE to MP_BITS_PER_BYTE.

To give this macro a standard MP_ prefix.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/gc.c       | 4 ++--
 py/mpconfig.h | 5 +++--
 py/objfloat.c | 2 +-
 py/objint.c   | 2 +-
 py/runtime.c  | 6 +++---
 5 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/py/gc.c b/py/gc.c
index 41bbaa1b57f3c..be35dc2ccc458 100644
--- a/py/gc.c
+++ b/py/gc.c
@@ -118,9 +118,9 @@ void gc_init(void *start, void *end) {
     // => T = A * (1 + BLOCKS_PER_ATB / BLOCKS_PER_FTB + BLOCKS_PER_ATB * BYTES_PER_BLOCK)
     size_t total_byte_len = (byte *)end - (byte *)start;
     #if MICROPY_ENABLE_FINALISER
-    MP_STATE_MEM(gc_alloc_table_byte_len) = total_byte_len * BITS_PER_BYTE / (BITS_PER_BYTE + BITS_PER_BYTE * BLOCKS_PER_ATB / BLOCKS_PER_FTB + BITS_PER_BYTE * BLOCKS_PER_ATB * BYTES_PER_BLOCK);
+    MP_STATE_MEM(gc_alloc_table_byte_len) = total_byte_len * MP_BITS_PER_BYTE / (MP_BITS_PER_BYTE + MP_BITS_PER_BYTE * BLOCKS_PER_ATB / BLOCKS_PER_FTB + MP_BITS_PER_BYTE * BLOCKS_PER_ATB * BYTES_PER_BLOCK);
     #else
-    MP_STATE_MEM(gc_alloc_table_byte_len) = total_byte_len / (1 + BITS_PER_BYTE / 2 * BYTES_PER_BLOCK);
+    MP_STATE_MEM(gc_alloc_table_byte_len) = total_byte_len / (1 + MP_BITS_PER_BYTE / 2 * BYTES_PER_BLOCK);
     #endif
 
     MP_STATE_MEM(gc_alloc_table_start) = (byte *)start;
diff --git a/py/mpconfig.h b/py/mpconfig.h
index 3c1ed28d806f7..3a0c5fb6e770a 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -1535,8 +1535,9 @@ typedef double mp_float_t;
 #define BYTES_PER_WORD (sizeof(mp_uint_t))
 #endif
 
-#ifndef BITS_PER_BYTE
-#define BITS_PER_BYTE (8)
+// Number of bits in a byte
+#ifndef MP_BITS_PER_BYTE
+#define MP_BITS_PER_BYTE (8)
 #endif
 // mp_int_t value with most significant bit set
 #define WORD_MSBIT_HIGH (((mp_uint_t)1) << (BYTES_PER_WORD * 8 - 1))
diff --git a/py/objfloat.c b/py/objfloat.c
index 451609492e5c1..5194dba51ee6d 100644
--- a/py/objfloat.c
+++ b/py/objfloat.c
@@ -77,7 +77,7 @@ mp_int_t mp_float_hash(mp_float_t src) {
             // number may have a fraction; xor the integer part with the fractional part
             val = (frc >> (MP_FLOAT_FRAC_BITS - adj_exp))
                 ^ (frc & (((mp_float_uint_t)1 << (MP_FLOAT_FRAC_BITS - adj_exp)) - 1));
-        } else if ((unsigned int)adj_exp < BITS_PER_BYTE * sizeof(mp_int_t) - 1) {
+        } else if ((unsigned int)adj_exp < MP_BITS_PER_BYTE * sizeof(mp_int_t) - 1) {
             // the number is a (big) whole integer and will fit in val's signed-width
             val = (mp_int_t)frc << (adj_exp - MP_FLOAT_FRAC_BITS);
         } else {
diff --git a/py/objint.c b/py/objint.c
index 4619fb5751fed..00375d388ee9b 100644
--- a/py/objint.c
+++ b/py/objint.c
@@ -121,7 +121,7 @@ STATIC mp_fp_as_int_class_t mp_classify_fp_as_int(mp_float_t val) {
         return MP_FP_CLASS_FIT_SMALLINT;
     }
     #if MICROPY_LONGINT_IMPL == MICROPY_LONGINT_IMPL_LONGLONG
-    if (e <= (((sizeof(long long) * BITS_PER_BYTE) + MP_FLOAT_EXP_BIAS - 2) << MP_FLOAT_EXP_SHIFT_I32)) {
+    if (e <= (((sizeof(long long) * MP_BITS_PER_BYTE) + MP_FLOAT_EXP_BIAS - 2) << MP_FLOAT_EXP_SHIFT_I32)) {
         return MP_FP_CLASS_FIT_LONGINT;
     }
     #endif
diff --git a/py/runtime.c b/py/runtime.c
index 2e2fa1d173351..5d476a2764df3 100644
--- a/py/runtime.c
+++ b/py/runtime.c
@@ -387,7 +387,7 @@ mp_obj_t mp_binary_op(mp_binary_op_t op, mp_obj_t lhs, mp_obj_t rhs) {
                     if (rhs_val < 0) {
                         // negative shift not allowed
                         mp_raise_ValueError(MP_ERROR_TEXT("negative shift count"));
-                    } else if (rhs_val >= (mp_int_t)(sizeof(lhs_val) * BITS_PER_BYTE)
+                    } else if (rhs_val >= (mp_int_t)(sizeof(lhs_val) * MP_BITS_PER_BYTE)
                                || lhs_val > (MP_SMALL_INT_MAX >> rhs_val)
                                || lhs_val < (MP_SMALL_INT_MIN >> rhs_val)) {
                         // left-shift will overflow, so use higher precision integer
@@ -406,10 +406,10 @@ mp_obj_t mp_binary_op(mp_binary_op_t op, mp_obj_t lhs, mp_obj_t rhs) {
                         mp_raise_ValueError(MP_ERROR_TEXT("negative shift count"));
                     } else {
                         // standard precision is enough for right-shift
-                        if (rhs_val >= (mp_int_t)(sizeof(lhs_val) * BITS_PER_BYTE)) {
+                        if (rhs_val >= (mp_int_t)(sizeof(lhs_val) * MP_BITS_PER_BYTE)) {
                             // Shifting to big amounts is underfined behavior
                             // in C and is CPU-dependent; propagate sign bit.
-                            rhs_val = sizeof(lhs_val) * BITS_PER_BYTE - 1;
+                            rhs_val = sizeof(lhs_val) * MP_BITS_PER_BYTE - 1;
                         }
                         lhs_val >>= rhs_val;
                     }

From ad4656b861f94277bed9647ca176e662ce5119e3 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 4 Feb 2021 16:39:09 +1100
Subject: [PATCH 0580/3533] all: Rename BYTES_PER_WORD to
 MP_BYTES_PER_OBJ_WORD.

The "word" referred to by BYTES_PER_WORD is actually the size of mp_obj_t
which is not always the same as the size of a pointer on the target
architecture.  So rename this config value to better reflect what it
measures, and also prefix it with MP_.

For uses of BYTES_PER_WORD in setting the stack limit this has been
changed to sizeof(void *), because the stack usually grows with
machine-word sized values (eg an nlr_buf_t has many machine words in it).

Signed-off-by: Damien George <damien@micropython.org>
---
 examples/embedding/hello-embed.c |  2 +-
 mpy-cross/main.c                 |  4 ++--
 ports/esp32/mpconfigport.h       |  1 -
 ports/nrf/mpconfigport.h         |  2 --
 ports/unix/main.c                |  4 ++--
 ports/unix/mpthreadport.c        |  2 +-
 py/binary.c                      |  4 ++--
 py/emitbc.c                      |  2 +-
 py/gc.c                          |  2 +-
 py/mpconfig.h                    | 10 +++++-----
 py/persistentcode.c              |  2 +-
 11 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/examples/embedding/hello-embed.c b/examples/embedding/hello-embed.c
index 2000b703c11c6..9a90288cf6d77 100644
--- a/examples/embedding/hello-embed.c
+++ b/examples/embedding/hello-embed.c
@@ -53,7 +53,7 @@ mp_obj_t execute_from_str(const char *str) {
 
 int main() {
     // Initialized stack limit
-    mp_stack_set_limit(40000 * (BYTES_PER_WORD / 4));
+    mp_stack_set_limit(40000 * (sizeof(void *) / 4));
     // Initialize heap
     gc_init(heap, heap + sizeof(heap));
     // Initialize interpreter
diff --git a/mpy-cross/main.c b/mpy-cross/main.c
index a403c0504dd76..635e53a719cc9 100644
--- a/mpy-cross/main.c
+++ b/mpy-cross/main.c
@@ -170,7 +170,7 @@ STATIC void pre_process_options(int argc, char **argv) {
                         heap_size *= 1024 * 1024;
                     }
                     if (word_adjust) {
-                        heap_size = heap_size * BYTES_PER_WORD / 4;
+                        heap_size = heap_size * MP_BYTES_PER_OBJ_WORD / 4;
                     }
                 } else {
                     exit(usage(argv));
@@ -182,7 +182,7 @@ STATIC void pre_process_options(int argc, char **argv) {
 }
 
 MP_NOINLINE int main_(int argc, char **argv) {
-    mp_stack_set_limit(40000 * (BYTES_PER_WORD / 4));
+    mp_stack_set_limit(40000 * (sizeof(void *) / 4));
 
     pre_process_options(argc, argv);
 
diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h
index 5ad5fa18a3045..81f8297c50019 100644
--- a/ports/esp32/mpconfigport.h
+++ b/ports/esp32/mpconfigport.h
@@ -221,7 +221,6 @@ struct mp_bluetooth_nimble_root_pointers_t;
 
 // type definitions for the specific machine
 
-#define BYTES_PER_WORD (4)
 #define MICROPY_MAKE_POINTER_CALLABLE(p) ((void *)((mp_uint_t)(p)))
 void *esp_native_code_commit(void *, size_t, void *);
 #define MP_PLAT_COMMIT_EXEC(buf, len, reloc) esp_native_code_commit(buf, len, reloc)
diff --git a/ports/nrf/mpconfigport.h b/ports/nrf/mpconfigport.h
index 581e83ef2f8c7..c246c53dd5aff 100644
--- a/ports/nrf/mpconfigport.h
+++ b/ports/nrf/mpconfigport.h
@@ -201,8 +201,6 @@
 
 // type definitions for the specific machine
 
-#define BYTES_PER_WORD (4)
-
 #define MICROPY_MAKE_POINTER_CALLABLE(p) ((void *)((mp_uint_t)(p) | 1))
 
 #define MP_SSIZE_MAX (0x7fffffff)
diff --git a/ports/unix/main.c b/ports/unix/main.c
index af4328a4db759..07db8d22c614f 100644
--- a/ports/unix/main.c
+++ b/ports/unix/main.c
@@ -387,7 +387,7 @@ STATIC void pre_process_options(int argc, char **argv) {
                         goto invalid_arg;
                     }
                     if (word_adjust) {
-                        heap_size = heap_size * BYTES_PER_WORD / 4;
+                        heap_size = heap_size * MP_BYTES_PER_OBJ_WORD / 4;
                     }
                     // If requested size too small, we'll crash anyway
                     if (heap_size < 700) {
@@ -446,7 +446,7 @@ MP_NOINLINE int main_(int argc, char **argv) {
     signal(SIGPIPE, SIG_IGN);
     #endif
 
-    mp_stack_set_limit(40000 * (BYTES_PER_WORD / 4));
+    mp_stack_set_limit(40000 * (sizeof(void *) / 4));
 
     pre_process_options(argc, argv);
 
diff --git a/ports/unix/mpthreadport.c b/ports/unix/mpthreadport.c
index de0f5923bafe9..cbc4901f69f4e 100644
--- a/ports/unix/mpthreadport.c
+++ b/ports/unix/mpthreadport.c
@@ -206,7 +206,7 @@ void mp_thread_start(void) {
 void mp_thread_create(void *(*entry)(void *), void *arg, size_t *stack_size) {
     // default stack size is 8k machine-words
     if (*stack_size == 0) {
-        *stack_size = 8192 * BYTES_PER_WORD;
+        *stack_size = 8192 * sizeof(void *);
     }
 
     // minimum stack size is set by pthreads
diff --git a/py/binary.c b/py/binary.c
index 1847894b71068..5c098b223d6c2 100644
--- a/py/binary.c
+++ b/py/binary.c
@@ -321,7 +321,7 @@ void mp_binary_set_val(char struct_type, char val_type, mp_obj_t val_in, byte *p
                     double f;
             } fp_dp;
             fp_dp.f = mp_obj_get_float_to_d(val_in);
-            if (BYTES_PER_WORD == 8) {
+            if (MP_BYTES_PER_OBJ_WORD == 8) {
                 val = fp_dp.i64;
             } else {
                 int be = struct_type == '>';
@@ -342,7 +342,7 @@ void mp_binary_set_val(char struct_type, char val_type, mp_obj_t val_in, byte *p
 
             val = mp_obj_get_int(val_in);
             // zero/sign extend if needed
-            if (BYTES_PER_WORD < 8 && size > sizeof(val)) {
+            if (MP_BYTES_PER_OBJ_WORD < 8 && size > sizeof(val)) {
                 int c = (mp_int_t)val < 0 ? 0xff : 0x00;
                 memset(p, c, size);
                 if (struct_type == '>') {
diff --git a/py/emitbc.c b/py/emitbc.c
index c74b7fbc4d978..d7e8e05f0fa63 100644
--- a/py/emitbc.c
+++ b/py/emitbc.c
@@ -36,7 +36,7 @@
 
 #if MICROPY_ENABLE_COMPILER
 
-#define BYTES_FOR_INT ((BYTES_PER_WORD * 8 + 6) / 7)
+#define BYTES_FOR_INT ((MP_BYTES_PER_OBJ_WORD * 8 + 6) / 7)
 #define DUMMY_DATA_SIZE (BYTES_FOR_INT)
 
 struct _emit_t {
diff --git a/py/gc.c b/py/gc.c
index be35dc2ccc458..53a0d9da4a73c 100644
--- a/py/gc.c
+++ b/py/gc.c
@@ -49,7 +49,7 @@
 // detect untraced object still in use
 #define CLEAR_ON_SWEEP (0)
 
-#define WORDS_PER_BLOCK ((MICROPY_BYTES_PER_GC_BLOCK) / BYTES_PER_WORD)
+#define WORDS_PER_BLOCK ((MICROPY_BYTES_PER_GC_BLOCK) / MP_BYTES_PER_OBJ_WORD)
 #define BYTES_PER_BLOCK (MICROPY_BYTES_PER_GC_BLOCK)
 
 // ATB = allocation table byte
diff --git a/py/mpconfig.h b/py/mpconfig.h
index 3a0c5fb6e770a..e87c52f2be6ff 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -126,7 +126,7 @@
 // Number of bytes in memory allocation/GC block. Any size allocated will be
 // rounded up to be multiples of this.
 #ifndef MICROPY_BYTES_PER_GC_BLOCK
-#define MICROPY_BYTES_PER_GC_BLOCK (4 * BYTES_PER_WORD)
+#define MICROPY_BYTES_PER_GC_BLOCK (4 * MP_BYTES_PER_OBJ_WORD)
 #endif
 
 // Number of words allocated (in BSS) to the GC stack (minimum is 1)
@@ -1530,9 +1530,9 @@ typedef double mp_float_t;
 #define STATIC static
 #endif
 
-// Number of bytes in a word
-#ifndef BYTES_PER_WORD
-#define BYTES_PER_WORD (sizeof(mp_uint_t))
+// Number of bytes in an object word: mp_obj_t, mp_uint_t, mp_uint_t
+#ifndef MP_BYTES_PER_OBJ_WORD
+#define MP_BYTES_PER_OBJ_WORD (sizeof(mp_uint_t))
 #endif
 
 // Number of bits in a byte
@@ -1540,7 +1540,7 @@ typedef double mp_float_t;
 #define MP_BITS_PER_BYTE (8)
 #endif
 // mp_int_t value with most significant bit set
-#define WORD_MSBIT_HIGH (((mp_uint_t)1) << (BYTES_PER_WORD * 8 - 1))
+#define WORD_MSBIT_HIGH (((mp_uint_t)1) << (MP_BYTES_PER_OBJ_WORD * MP_BITS_PER_BYTE - 1))
 
 // Make sure both MP_ENDIANNESS_LITTLE and MP_ENDIANNESS_BIG are
 // defined and that they are the opposite of each other.
diff --git a/py/persistentcode.c b/py/persistentcode.c
index 084632a60fdc1..ac523990c1bcd 100644
--- a/py/persistentcode.c
+++ b/py/persistentcode.c
@@ -595,7 +595,7 @@ STATIC void mp_print_bytes(mp_print_t *print, const byte *data, size_t len) {
     print->print_strn(print->data, (const char *)data, len);
 }
 
-#define BYTES_FOR_INT ((BYTES_PER_WORD * 8 + 6) / 7)
+#define BYTES_FOR_INT ((MP_BYTES_PER_OBJ_WORD * 8 + 6) / 7)
 STATIC void mp_print_uint(mp_print_t *print, size_t n) {
     byte buf[BYTES_FOR_INT];
     byte *p = buf + sizeof(buf);

From c891190c693ec04289f5773b2b27d125f8c6059f Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 4 Feb 2021 16:39:46 +1100
Subject: [PATCH 0581/3533] py: Rename WORD_MSBIT_HIGH to
 MP_OBJ_WORD_MSBIT_HIGH.

To make it clear it is for mp_obj_t/mp_uint_t "word" types, and to prefix
this macro with MP_.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/mpconfig.h |  2 +-
 py/mpz.c      |  4 ++--
 py/smallint.h | 10 +++++-----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/py/mpconfig.h b/py/mpconfig.h
index e87c52f2be6ff..454fc12b7cacd 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -1540,7 +1540,7 @@ typedef double mp_float_t;
 #define MP_BITS_PER_BYTE (8)
 #endif
 // mp_int_t value with most significant bit set
-#define WORD_MSBIT_HIGH (((mp_uint_t)1) << (MP_BYTES_PER_OBJ_WORD * MP_BITS_PER_BYTE - 1))
+#define MP_OBJ_WORD_MSBIT_HIGH (((mp_uint_t)1) << (MP_BYTES_PER_OBJ_WORD * MP_BITS_PER_BYTE - 1))
 
 // Make sure both MP_ENDIANNESS_LITTLE and MP_ENDIANNESS_BIG are
 // defined and that they are the opposite of each other.
diff --git a/py/mpz.c b/py/mpz.c
index 75159305382a1..51d0c968907d8 100644
--- a/py/mpz.c
+++ b/py/mpz.c
@@ -1573,7 +1573,7 @@ bool mpz_as_int_checked(const mpz_t *i, mp_int_t *value) {
     mpz_dig_t *d = i->dig + i->len;
 
     while (d-- > i->dig) {
-        if (val > (~(WORD_MSBIT_HIGH) >> DIG_SIZE)) {
+        if (val > (~(MP_OBJ_WORD_MSBIT_HIGH) >> DIG_SIZE)) {
             // will overflow
             return false;
         }
@@ -1598,7 +1598,7 @@ bool mpz_as_uint_checked(const mpz_t *i, mp_uint_t *value) {
     mpz_dig_t *d = i->dig + i->len;
 
     while (d-- > i->dig) {
-        if (val > (~(WORD_MSBIT_HIGH) >> (DIG_SIZE - 1))) {
+        if (val > (~(MP_OBJ_WORD_MSBIT_HIGH) >> (DIG_SIZE - 1))) {
             // will overflow
             return false;
         }
diff --git a/py/smallint.h b/py/smallint.h
index 6a3c75236c3ff..58d843e8a1e35 100644
--- a/py/smallint.h
+++ b/py/smallint.h
@@ -36,17 +36,17 @@
 // In SMALL_INT, next-to-highest bits is used as sign, so both must match for value in range
 #if MICROPY_OBJ_REPR == MICROPY_OBJ_REPR_A || MICROPY_OBJ_REPR == MICROPY_OBJ_REPR_C
 
-#define MP_SMALL_INT_MIN ((mp_int_t)(((mp_int_t)WORD_MSBIT_HIGH) >> 1))
-#define MP_SMALL_INT_FITS(n) ((((n) ^ ((n) << 1)) & WORD_MSBIT_HIGH) == 0)
+#define MP_SMALL_INT_MIN ((mp_int_t)(((mp_int_t)MP_OBJ_WORD_MSBIT_HIGH) >> 1))
+#define MP_SMALL_INT_FITS(n) ((((n) ^ ((n) << 1)) & MP_OBJ_WORD_MSBIT_HIGH) == 0)
 // Mask to truncate mp_int_t to positive value
-#define MP_SMALL_INT_POSITIVE_MASK ~(WORD_MSBIT_HIGH | (WORD_MSBIT_HIGH >> 1))
+#define MP_SMALL_INT_POSITIVE_MASK ~(MP_OBJ_WORD_MSBIT_HIGH | (MP_OBJ_WORD_MSBIT_HIGH >> 1))
 
 #elif MICROPY_OBJ_REPR == MICROPY_OBJ_REPR_B
 
-#define MP_SMALL_INT_MIN ((mp_int_t)(((mp_int_t)WORD_MSBIT_HIGH) >> 2))
+#define MP_SMALL_INT_MIN ((mp_int_t)(((mp_int_t)MP_OBJ_WORD_MSBIT_HIGH) >> 2))
 #define MP_SMALL_INT_FITS(n) ((((n) & MP_SMALL_INT_MIN) == 0) || (((n) & MP_SMALL_INT_MIN) == MP_SMALL_INT_MIN))
 // Mask to truncate mp_int_t to positive value
-#define MP_SMALL_INT_POSITIVE_MASK ~(WORD_MSBIT_HIGH | (WORD_MSBIT_HIGH >> 1) | (WORD_MSBIT_HIGH >> 2))
+#define MP_SMALL_INT_POSITIVE_MASK ~(MP_OBJ_WORD_MSBIT_HIGH | (MP_OBJ_WORD_MSBIT_HIGH >> 1) | (MP_OBJ_WORD_MSBIT_HIGH >> 2))
 
 #elif MICROPY_OBJ_REPR == MICROPY_OBJ_REPR_D
 

From 1f800cac3c4f56418486f24c3824418a890f759f Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 5 Feb 2021 01:10:30 +1100
Subject: [PATCH 0582/3533] rp2/micropy_rules.cmake: Fix makemoduledefs vpath
 to work with abs path.

In particular the firmware can now be built in a build directory that lives
outside the source tree, and the py/modarray.c file will still be found.

See issue #6837.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/rp2/micropy_rules.cmake | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/ports/rp2/micropy_rules.cmake b/ports/rp2/micropy_rules.cmake
index ade9b8c92d5cc..9eee4ac14d1b2 100644
--- a/ports/rp2/micropy_rules.cmake
+++ b/ports/rp2/micropy_rules.cmake
@@ -24,11 +24,10 @@ add_custom_command(
 )
 
 # Generate moduledefs.h
-# This is currently hard-coded to support modarray.c only, because makemoduledefs.py doesn't support absolute paths
 
 add_custom_command(
     OUTPUT ${MPY_MODULEDEFS}
-    COMMAND python3 ${MPY_PY_DIR}/makemoduledefs.py --vpath="." ../../../py/modarray.c > ${MPY_MODULEDEFS}
+    COMMAND python3 ${MPY_PY_DIR}/makemoduledefs.py --vpath="/" ${SOURCE_QSTR} > ${MPY_MODULEDEFS}
     DEPENDS ${MPY_MPVERSION}
         ${SOURCE_QSTR}
 )

From 9dedcf122d19c6b7452adb48ff5567509adfb073 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 5 Feb 2021 15:45:38 +1100
Subject: [PATCH 0583/3533] py/gc: Change include of stdint.h to stddef.h.

No std-int types are used in gc.h, but size_t is which needs stddef.h.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp8266/gccollect.h | 2 ++
 py/gc.h                   | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/ports/esp8266/gccollect.h b/ports/esp8266/gccollect.h
index 4323e95075a9f..b86d3d6e1cc7a 100644
--- a/ports/esp8266/gccollect.h
+++ b/ports/esp8266/gccollect.h
@@ -26,6 +26,8 @@
 #ifndef MICROPY_INCLUDED_ESP8266_GCCOLLECT_H
 #define MICROPY_INCLUDED_ESP8266_GCCOLLECT_H
 
+#include <stdint.h>
+
 extern uint32_t _text_start;
 extern uint32_t _text_end;
 extern uint32_t _irom0_text_start;
diff --git a/py/gc.h b/py/gc.h
index f67fb0daad6dc..5aef27c006b93 100644
--- a/py/gc.h
+++ b/py/gc.h
@@ -27,7 +27,7 @@
 #define MICROPY_INCLUDED_PY_GC_H
 
 #include <stdbool.h>
-#include <stdint.h>
+#include <stddef.h>
 
 void gc_init(void *start, void *end);
 

From 0a59938574502b19b3d685133084399c090d3c11 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 5 Feb 2021 00:26:08 +1100
Subject: [PATCH 0584/3533] py/mpz: Fix overflow of borrow in mpn_div.

For certain operands to mpn_div, the existing code path for
`DIG_SIZE == MPZ_DBL_DIG_SIZE / 2` had a bug in it where borrow could still
overflow in the `(x >= *n || *n - x <= borrow)` branch, ie
`borrow + x - (mpz_dbl_dig_t)*n` overflows the borrow variable.  In such
cases the subsequent right-shift of borrow would not bring in the overflow
bit, leading to an error in the result.  An example division that had
overflow when MPZ_DIG_SIZE = 16 is `(2 ** 48 - 1) ** 2 // (2 ** 48 - 1)`.

This is fixed in this commit by simplifying the code and handling the low
digits of borrow first, and then the upper bits (to shift down) separately.
There is no longer a distinction between `DIG_SIZE < MPZ_DBL_DIG_SIZE / 2`
and `DIG_SIZE == MPZ_DBL_DIG_SIZE / 2`.

This commit also simplifies the second part of the calculation so that
borrow does not need to be negated (instead the code just works knowing
that borrow is negative and using + instead of - in calculations involving
borrow).

Fixes #6777.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/mpz.c                    | 55 +++++++++++--------------------------
 tests/basics/int_big_div.py |  4 +++
 2 files changed, 20 insertions(+), 39 deletions(-)

diff --git a/py/mpz.c b/py/mpz.c
index 51d0c968907d8..e0d249c214ff5 100644
--- a/py/mpz.c
+++ b/py/mpz.c
@@ -531,60 +531,37 @@ STATIC void mpn_div(mpz_dig_t *num_dig, size_t *num_len, const mpz_dig_t *den_di
         quo /= lead_den_digit;
 
         // Multiply quo by den and subtract from num to get remainder.
-        // We have different code here to handle different compile-time
-        // configurations of mpz:
-        //
-        //   1. DIG_SIZE is stricly less than half the number of bits
-        //      available in mpz_dbl_dig_t.  In this case we can use a
-        //      slightly more optimal (in time and space) routine that
-        //      uses the extra bits in mpz_dbl_dig_signed_t to store a
-        //      sign bit.
-        //
-        //   2. DIG_SIZE is exactly half the number of bits available in
-        //      mpz_dbl_dig_t.  In this (common) case we need to be careful
-        //      not to overflow the borrow variable.  And the shifting of
-        //      borrow needs some special logic (it's a shift right with
-        //      round up).
-        //
+        // Must be careful with overflow of the borrow variable.  Both
+        // borrow and low_digs are signed values and need signed right-shift,
+        // but x is unsigned and may take a full-range value.
         const mpz_dig_t *d = den_dig;
         mpz_dbl_dig_t d_norm = 0;
-        mpz_dbl_dig_t borrow = 0;
+        mpz_dbl_dig_signed_t borrow = 0;
         for (mpz_dig_t *n = num_dig - den_len; n < num_dig; ++n, ++d) {
+            // Get the next digit in (den).
             d_norm = ((mpz_dbl_dig_t)*d << norm_shift) | (d_norm >> DIG_SIZE);
+            // Multiply the next digit in (quo * den).
             mpz_dbl_dig_t x = (mpz_dbl_dig_t)quo * (d_norm & DIG_MASK);
-            #if DIG_SIZE < MPZ_DBL_DIG_SIZE / 2
-            borrow += (mpz_dbl_dig_t)*n - x; // will overflow if DIG_SIZE >= MPZ_DBL_DIG_SIZE/2
-            *n = borrow & DIG_MASK;
-            borrow = (mpz_dbl_dig_signed_t)borrow >> DIG_SIZE;
-            #else // DIG_SIZE == MPZ_DBL_DIG_SIZE / 2
-            if (x >= *n || *n - x <= borrow) {
-                borrow += x - (mpz_dbl_dig_t)*n;
-                *n = (-borrow) & DIG_MASK;
-                borrow = (borrow >> DIG_SIZE) + ((borrow & DIG_MASK) == 0 ? 0 : 1); // shift-right with round-up
-            } else {
-                *n = ((mpz_dbl_dig_t)*n - x - borrow) & DIG_MASK;
-                borrow = 0;
-            }
-            #endif
+            // Compute the low DIG_MASK bits of the next digit in (num - quo * den)
+            mpz_dbl_dig_signed_t low_digs = (borrow & DIG_MASK) + *n - (x & DIG_MASK);
+            // Store the digit result for (num).
+            *n = low_digs & DIG_MASK;
+            // Compute the borrow, shifted right before summing to avoid overflow.
+            borrow = (borrow >> DIG_SIZE) - (x >> DIG_SIZE) + (low_digs >> DIG_SIZE);
         }
 
-        #if DIG_SIZE < MPZ_DBL_DIG_SIZE / 2
-        // Borrow was negative in the above for-loop, make it positive for next if-block.
-        borrow = -borrow;
-        #endif
-
         // At this point we have either:
         //
         //   1. quo was the correct value and the most-sig-digit of num is exactly
-        //      cancelled by borrow (borrow == *num_dig).  In this case there is
+        //      cancelled by borrow (borrow + *num_dig == 0).  In this case there is
         //      nothing more to do.
         //
         //   2. quo was too large, we subtracted too many den from num, and the
-        //      most-sig-digit of num is 1 less than borrow (borrow == *num_dig + 1).
+        //      most-sig-digit of num is less than needed (borrow + *num_dig < 0).
         //      In this case we must reduce quo and add back den to num until the
         //      carry from this operation cancels out the borrow.
         //
-        borrow -= *num_dig;
+        borrow += *num_dig;
         for (; borrow != 0; --quo) {
             d = den_dig;
             d_norm = 0;
@@ -595,7 +572,7 @@ STATIC void mpn_div(mpz_dig_t *num_dig, size_t *num_len, const mpz_dig_t *den_di
                 *n = carry & DIG_MASK;
                 carry >>= DIG_SIZE;
             }
-            borrow -= carry;
+            borrow += carry;
         }
 
         // store this digit of the quotient
diff --git a/tests/basics/int_big_div.py b/tests/basics/int_big_div.py
index 642f051d41284..29fd405970f58 100644
--- a/tests/basics/int_big_div.py
+++ b/tests/basics/int_big_div.py
@@ -8,3 +8,7 @@
 print((x + 1) // x)
 x = 0x86c60128feff5330
 print((x + 1) // x)
+
+# these check edge cases where borrow overflows
+print((2 ** 48 - 1) ** 2 // (2 ** 48 - 1))
+print((2 ** 256 - 2 ** 32) ** 2 // (2 ** 256 - 2 ** 32))

From c7aaee2b2ba0cb19d3b3deb6092e0bfe55d79052 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 9 Feb 2021 10:42:19 +1100
Subject: [PATCH 0585/3533] esp8266/modules: Fix fs_corrupted() to use
 start_sec not START_SEC.

START_SEC was changed in e0905e85a7ad2961aa9192f6130565860e531ad3.

Also, update the error message to mention how to format the partition at
the REPL, and make the total message shorter to save a bit of flash.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp8266/modules/inisetup.py | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/ports/esp8266/modules/inisetup.py b/ports/esp8266/modules/inisetup.py
index e711a57d4b609..9500b8048c9d8 100644
--- a/ports/esp8266/modules/inisetup.py
+++ b/ports/esp8266/modules/inisetup.py
@@ -30,13 +30,12 @@ def fs_corrupted():
     while 1:
         print(
             """\
-The filesystem starting at sector %d with size %d sectors appears to
-be corrupted. If you had important data there, you may want to make a flash
-snapshot to try to recover it. Otherwise, perform factory reprogramming
-of MicroPython firmware (completely erase flash, followed by firmware
-programming).
+The filesystem starting at sector %d with size %d sectors looks corrupt.
+You may want to make a flash snapshot and try to recover it. Otherwise,
+format it with uos.VfsLfs2.mkfs(bdev), or completely erase the flash and
+reprogram MicroPython.
 """
-            % (bdev.START_SEC, bdev.blocks)
+            % (bdev.start_sec, bdev.blocks)
         )
         time.sleep(3)
 

From 26b4ef4c46520f595f39d53bbea7f247c9467370 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 11 Feb 2021 22:53:36 +1100
Subject: [PATCH 0586/3533] extmod/vfs_posix_file: Allow closing an already
 closed file.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/vfs_posix_file.c       |  6 +++++-
 tests/extmod/vfs_posix.py     | 25 +++++++++++++++++++++++++
 tests/extmod/vfs_posix.py.exp |  1 +
 tests/io/file1.py             |  3 +++
 4 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/extmod/vfs_posix_file.c b/extmod/vfs_posix_file.c
index 264764b4ee29d..f3eac98ce3f9f 100644
--- a/extmod/vfs_posix_file.c
+++ b/extmod/vfs_posix_file.c
@@ -163,7 +163,11 @@ STATIC mp_uint_t vfs_posix_file_write(mp_obj_t o_in, const void *buf, mp_uint_t
 
 STATIC mp_uint_t vfs_posix_file_ioctl(mp_obj_t o_in, mp_uint_t request, uintptr_t arg, int *errcode) {
     mp_obj_vfs_posix_file_t *o = MP_OBJ_TO_PTR(o_in);
-    check_fd_is_open(o);
+
+    if (request != MP_STREAM_CLOSE) {
+        check_fd_is_open(o);
+    }
+
     switch (request) {
         case MP_STREAM_FLUSH: {
             int ret;
diff --git a/tests/extmod/vfs_posix.py b/tests/extmod/vfs_posix.py
index 3bea99365d970..aea447e182e07 100644
--- a/tests/extmod/vfs_posix.py
+++ b/tests/extmod/vfs_posix.py
@@ -8,6 +8,15 @@
     print("SKIP")
     raise SystemExit
 
+# We need a file for testing that doesn't already exist.
+# Skip the test if it does exist.
+temp_file = "micropy_test_file.txt"
+try:
+    uos.stat(temp_file)
+    print("SKIP")
+    raise SystemExit
+except OSError:
+    pass
 
 # getcwd and chdir
 curdir = uos.getcwd()
@@ -21,3 +30,19 @@
 
 # listdir and ilistdir
 print(type(uos.listdir("/")))
+
+# file create
+f = open(temp_file, "w")
+f.write("hello")
+f.close()
+
+# close on a closed file should succeed
+f.close()
+
+# file read
+f = open(temp_file, "r")
+print(f.read())
+f.close()
+
+# remove
+uos.remove(temp_file)
diff --git a/tests/extmod/vfs_posix.py.exp b/tests/extmod/vfs_posix.py.exp
index 1b1f59b43e5da..c0a4ed000bf8b 100644
--- a/tests/extmod/vfs_posix.py.exp
+++ b/tests/extmod/vfs_posix.py.exp
@@ -2,3 +2,4 @@
 True
 <class 'tuple'>
 <class 'list'>
+hello
diff --git a/tests/io/file1.py b/tests/io/file1.py
index 2a46c9c63e360..de30045d316bb 100644
--- a/tests/io/file1.py
+++ b/tests/io/file1.py
@@ -44,3 +44,6 @@
 except OSError:
     print("OSError")
 f.close()
+
+# close() on a closed file
+f.close()

From df85e4881396d0ebb5942a111fba974ea5c80b77 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 11 Feb 2021 23:24:39 +1100
Subject: [PATCH 0587/3533] tests/extmod/vfs_posix.py: Add more tests for
 VfsPosix class.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/extmod/vfs_posix.py     | 52 +++++++++++++++++++++++++++++++----
 tests/extmod/vfs_posix.py.exp | 11 ++++++++
 2 files changed, 57 insertions(+), 6 deletions(-)

diff --git a/tests/extmod/vfs_posix.py b/tests/extmod/vfs_posix.py
index aea447e182e07..f8c4aae40633f 100644
--- a/tests/extmod/vfs_posix.py
+++ b/tests/extmod/vfs_posix.py
@@ -8,11 +8,11 @@
     print("SKIP")
     raise SystemExit
 
-# We need a file for testing that doesn't already exist.
+# We need a directory for testing that doesn't already exist.
 # Skip the test if it does exist.
-temp_file = "micropy_test_file.txt"
+temp_dir = "micropy_test_dir"
 try:
-    uos.stat(temp_file)
+    uos.stat(temp_dir)
     print("SKIP")
     raise SystemExit
 except OSError:
@@ -31,18 +31,58 @@
 # listdir and ilistdir
 print(type(uos.listdir("/")))
 
+# mkdir
+uos.mkdir(temp_dir)
+
 # file create
-f = open(temp_file, "w")
+f = open(temp_dir + "/test", "w")
 f.write("hello")
 f.close()
 
 # close on a closed file should succeed
 f.close()
 
+# construct a file object using the type constructor, with a raw fileno
+f = type(f)(2)
+print(f)
+
 # file read
-f = open(temp_file, "r")
+f = open(temp_dir + "/test", "r")
 print(f.read())
 f.close()
 
+# rename
+uos.rename(temp_dir + "/test", temp_dir + "/test2")
+print(uos.listdir(temp_dir))
+
+# construct new VfsPosix with path argument
+vfs = uos.VfsPosix(temp_dir)
+print(list(i[0] for i in vfs.ilistdir(".")))
+
+# stat, statvfs
+print(type(vfs.stat(".")))
+print(type(vfs.statvfs(".")))
+
+# check types of ilistdir with str/bytes arguments
+print(type(list(vfs.ilistdir("."))[0][0]))
+print(type(list(vfs.ilistdir(b"."))[0][0]))
+
 # remove
-uos.remove(temp_file)
+uos.remove(temp_dir + "/test2")
+print(uos.listdir(temp_dir))
+
+# remove with error
+try:
+    uos.remove(temp_dir + "/test2")
+except OSError:
+    print("remove OSError")
+
+# rmdir
+uos.rmdir(temp_dir)
+print(temp_dir in uos.listdir())
+
+# rmdir with error
+try:
+    uos.rmdir(temp_dir)
+except OSError:
+    print("rmdir OSError")
diff --git a/tests/extmod/vfs_posix.py.exp b/tests/extmod/vfs_posix.py.exp
index c0a4ed000bf8b..e7d68f38ec7ca 100644
--- a/tests/extmod/vfs_posix.py.exp
+++ b/tests/extmod/vfs_posix.py.exp
@@ -2,4 +2,15 @@
 True
 <class 'tuple'>
 <class 'list'>
+<io.TextIOWrapper 2>
 hello
+['test2']
+['test2']
+<class 'tuple'>
+<class 'tuple'>
+<class 'str'>
+<class 'bytes'>
+[]
+remove OSError
+False
+rmdir OSError

From 7815dd2cc5306b72c84dbbc27638d9d3f6b32ac9 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 10 Feb 2021 21:37:10 +1100
Subject: [PATCH 0588/3533] unix/mpbtstackport_common: Implement
 mp_bluetooth_hci_active.

So that BTSTACK can be enabled with SYNC_EVENTS.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/unix/mpbtstackport_common.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/ports/unix/mpbtstackport_common.c b/ports/unix/mpbtstackport_common.c
index 621e661f9eba3..ec40db65bc3a4 100644
--- a/ports/unix/mpbtstackport_common.c
+++ b/ports/unix/mpbtstackport_common.c
@@ -57,6 +57,11 @@ bool mp_bluetooth_hci_poll(void) {
     return false;
 }
 
+bool mp_bluetooth_hci_active(void) {
+    return mp_bluetooth_btstack_state != MP_BLUETOOTH_BTSTACK_STATE_OFF
+           && mp_bluetooth_btstack_state != MP_BLUETOOTH_BTSTACK_STATE_TIMEOUT;
+}
+
 // The IRQ functionality in btstack_run_loop_embedded.c is not used, so the
 // following three functions are empty.
 

From 7535f67dfbbcd0f2f47ffbf893d6f66f96becae6 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 10 Feb 2021 16:00:27 +1100
Subject: [PATCH 0589/3533] extmod/btstack: Add HCI trace debugging option in
 btstack_hci_uart.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/btstack/btstack_hci_uart.c | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/extmod/btstack/btstack_hci_uart.c b/extmod/btstack/btstack_hci_uart.c
index ae18628a9cf0e..0a137bbae442d 100644
--- a/extmod/btstack/btstack_hci_uart.c
+++ b/extmod/btstack/btstack_hci_uart.c
@@ -38,6 +38,11 @@
 
 #include "mpbtstackport.h"
 
+#define HCI_TRACE (0)
+#define COL_OFF "\033[0m"
+#define COL_GREEN "\033[0;32m"
+#define COL_BLUE "\033[0;34m"
+
 // Implements a btstack btstack_uart_block_t on top of the mphciuart.h
 // interface to an HCI UART provided by the port.
 
@@ -114,6 +119,14 @@ STATIC void btstack_uart_receive_block(uint8_t *buf, uint16_t len) {
 }
 
 STATIC void btstack_uart_send_block(const uint8_t *buf, uint16_t len) {
+    #if HCI_TRACE
+    printf(COL_GREEN "< [% 8d] %02x", (int)mp_hal_ticks_ms(), buf[0]);
+    for (size_t i = 1; i < len; ++i) {
+        printf(":%02x", buf[i]);
+    }
+    printf(COL_OFF "\n");
+    #endif
+
     mp_bluetooth_hci_uart_write(buf, len);
     send_done = true;
 }
@@ -165,6 +178,13 @@ void mp_bluetooth_btstack_hci_uart_process(void) {
     while (recv_idx < recv_len && (chr = mp_bluetooth_hci_uart_readchar()) >= 0) {
         recv_buf[recv_idx++] = chr;
         if (recv_idx == recv_len) {
+            #if HCI_TRACE
+            printf(COL_BLUE "> [% 8d] %02x", (int)mp_hal_ticks_ms(), recv_buf[0]);
+            for (size_t i = 1; i < recv_len; ++i) {
+                printf(":%02x", recv_buf[i]);
+            }
+            printf(COL_OFF "\n");
+            #endif
             recv_idx = 0;
             recv_len = 0;
             if (recv_handler) {

From 24a8a408a9f5cc6cb26f2295a87303e75a48a312 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 10 Feb 2021 21:39:32 +1100
Subject: [PATCH 0590/3533] extmod/btstack: Add stub functions for passkey,
 l2cap bindings.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/btstack/modbluetooth_btstack.c | 36 +++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/extmod/btstack/modbluetooth_btstack.c b/extmod/btstack/modbluetooth_btstack.c
index f6af664a4e9b5..540b0fb7a9d24 100644
--- a/extmod/btstack/modbluetooth_btstack.c
+++ b/extmod/btstack/modbluetooth_btstack.c
@@ -1168,11 +1168,18 @@ int mp_bluetooth_gap_disconnect(uint16_t conn_handle) {
 }
 
 #if MICROPY_PY_BLUETOOTH_ENABLE_PAIRING_BONDING
+
 int mp_bluetooth_gap_pair(uint16_t conn_handle) {
     DEBUG_printf("mp_bluetooth_gap_pair: conn_handle=%d\n", conn_handle);
     sm_request_pairing(conn_handle);
     return 0;
 }
+
+int mp_bluetooth_gap_passkey(uint16_t conn_handle, uint8_t action, mp_int_t passkey) {
+    DEBUG_printf("mp_bluetooth_gap_passkey: conn_handle=%d action=%d passkey=%d\n", conn_handle, action, (int)passkey);
+    return MP_EOPNOTSUPP;
+}
+
 #endif // MICROPY_PY_BLUETOOTH_ENABLE_PAIRING_BONDING
 
 #if MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE
@@ -1341,4 +1348,33 @@ int mp_bluetooth_gattc_exchange_mtu(uint16_t conn_handle) {
 }
 #endif // MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE
 
+#if MICROPY_PY_BLUETOOTH_ENABLE_L2CAP_CHANNELS
+
+int mp_bluetooth_l2cap_listen(uint16_t psm, uint16_t mtu) {
+    DEBUG_printf("mp_bluetooth_l2cap_listen: psm=%d, mtu=%d\n", psm, mtu);
+    return MP_EOPNOTSUPP;
+}
+
+int mp_bluetooth_l2cap_connect(uint16_t conn_handle, uint16_t psm, uint16_t mtu) {
+    DEBUG_printf("mp_bluetooth_l2cap_connect: conn_handle=%d, psm=%d, mtu=%d\n", conn_handle, psm, mtu);
+    return MP_EOPNOTSUPP;
+}
+
+int mp_bluetooth_l2cap_disconnect(uint16_t conn_handle, uint16_t cid) {
+    DEBUG_printf("mp_bluetooth_l2cap_disconnect: conn_handle=%d, cid=%d\n", conn_handle, cid);
+    return MP_EOPNOTSUPP;
+}
+
+int mp_bluetooth_l2cap_send(uint16_t conn_handle, uint16_t cid, const uint8_t *buf, size_t len, bool *stalled) {
+    DEBUG_printf("mp_bluetooth_l2cap_send: conn_handle=%d, cid=%d, len=%d\n", conn_handle, cid, (int)len);
+    return MP_EOPNOTSUPP;
+}
+
+int mp_bluetooth_l2cap_recvinto(uint16_t conn_handle, uint16_t cid, uint8_t *buf, size_t *len) {
+    DEBUG_printf("mp_bluetooth_l2cap_recvinto: conn_handle=%d, cid=%d, len=%d\n", conn_handle, cid, (int)*len);
+    return MP_EOPNOTSUPP;
+}
+
+#endif // MICROPY_PY_BLUETOOTH_ENABLE_L2CAP_CHANNELS
+
 #endif // MICROPY_PY_BLUETOOTH && MICROPY_BLUETOOTH_BTSTACK

From 50615fef89787f8b55a8ba6e718298421d7e3cb0 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 10 Feb 2021 21:40:11 +1100
Subject: [PATCH 0591/3533] extmod/btstack: Enable SYNC_EVENTS, PAIRING_BONDING
 by default.

Synchronous events work on stm32 and unix ports.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/btstack/btstack.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/extmod/btstack/btstack.mk b/extmod/btstack/btstack.mk
index e3309b61db7a4..17bbb16f88f72 100644
--- a/extmod/btstack/btstack.mk
+++ b/extmod/btstack/btstack.mk
@@ -11,6 +11,8 @@ EXTMOD_SRC_C += extmod/btstack/modbluetooth_btstack.c
 INC += -I$(TOP)/$(BTSTACK_EXTMOD_DIR)
 
 CFLAGS_MOD += -DMICROPY_BLUETOOTH_BTSTACK=1
+CFLAGS_MOD += -DMICROPY_PY_BLUETOOTH_USE_SYNC_EVENTS=1
+CFLAGS_MOD += -DMICROPY_PY_BLUETOOTH_ENABLE_PAIRING_BONDING=1
 
 BTSTACK_DIR = $(TOP)/lib/btstack
 

From 9b7d8b87ee317ed69c8c9963d4eb27174ac33230 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 3 Feb 2021 16:33:06 +1100
Subject: [PATCH 0592/3533] lib/tinyusb: Update to version 0.8.0.

Includes support for RP2040.

Signed-off-by: Damien George <damien@micropython.org>
---
 lib/tinyusb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/tinyusb b/lib/tinyusb
index a6b916ba85bef..7b62c71dd5ec4 160000
--- a/lib/tinyusb
+++ b/lib/tinyusb
@@ -1 +1 @@
-Subproject commit a6b916ba85bef6aad50f1652532b02984dfe2484
+Subproject commit 7b62c71dd5ec42e61499d2d83902df9484842670

From 035d16126ac2e4ea9b9c1c33a15104cd952897a1 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 8 Feb 2021 23:47:49 +1100
Subject: [PATCH 0593/3533] ports: Update to build with new tinyusb.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/mimxrt/board_init.c               |  4 ++--
 ports/mimxrt/tusb_config.h              |  1 -
 ports/mimxrt/tusb_port.c                |  4 ++--
 ports/nrf/drivers/usb/usb_descriptors.c |  4 ++--
 ports/samd/tusb_port.c                  | 14 +++++++-------
 5 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/ports/mimxrt/board_init.c b/ports/mimxrt/board_init.c
index 6f5235d3b635b..102764cac13d2 100644
--- a/ports/mimxrt/board_init.c
+++ b/ports/mimxrt/board_init.c
@@ -90,11 +90,11 @@ void SysTick_Handler(void) {
 }
 
 void USB_OTG1_IRQHandler(void) {
-    tud_isr(0);
+    tud_int_handler(0);
     tud_task();
 }
 
 void USB_OTG2_IRQHandler(void) {
-    tud_isr(1);
+    tud_int_handler(1);
     tud_task();
 }
diff --git a/ports/mimxrt/tusb_config.h b/ports/mimxrt/tusb_config.h
index c7ec05e632323..862fb6c52d2e5 100644
--- a/ports/mimxrt/tusb_config.h
+++ b/ports/mimxrt/tusb_config.h
@@ -32,6 +32,5 @@
 #define CFG_TUD_CDC             (1)
 #define CFG_TUD_CDC_RX_BUFSIZE  (512)
 #define CFG_TUD_CDC_TX_BUFSIZE  (512)
-#define CFG_TUD_CDC_EPSIZE      (512)
 
 #endif // MICROPY_INCLUDED_MIMXRT_TUSB_CONFIG_H
diff --git a/ports/mimxrt/tusb_port.c b/ports/mimxrt/tusb_port.c
index f6b09a362d18a..0d73b09235b64 100644
--- a/ports/mimxrt/tusb_port.c
+++ b/ports/mimxrt/tusb_port.c
@@ -67,7 +67,7 @@ static const tusb_desc_device_t usbd_desc_device = {
 };
 
 static const uint8_t usbd_desc_cfg[USBD_DESC_LEN] = {
-    TUD_CONFIG_DESCRIPTOR(USBD_ITF_MAX, USBD_STR_0, USBD_DESC_LEN,
+    TUD_CONFIG_DESCRIPTOR(1, USBD_ITF_MAX, USBD_STR_0, USBD_DESC_LEN,
         TUSB_DESC_CONFIG_ATT_REMOTE_WAKEUP, USBD_MAX_POWER_MA),
 
     TUD_CDC_DESCRIPTOR(USBD_ITF_CDC, USBD_STR_CDC, USBD_CDC_EP_CMD,
@@ -90,7 +90,7 @@ const uint8_t *tud_descriptor_configuration_cb(uint8_t index) {
     return usbd_desc_cfg;
 }
 
-const uint16_t *tud_descriptor_string_cb(uint8_t index) {
+const uint16_t *tud_descriptor_string_cb(uint8_t index, uint16_t langid) {
     #define DESC_STR_MAX (20)
     static uint16_t desc_str[DESC_STR_MAX];
 
diff --git a/ports/nrf/drivers/usb/usb_descriptors.c b/ports/nrf/drivers/usb/usb_descriptors.c
index f6724c1bc078c..e9436ded54fe8 100644
--- a/ports/nrf/drivers/usb/usb_descriptors.c
+++ b/ports/nrf/drivers/usb/usb_descriptors.c
@@ -67,7 +67,7 @@ static const tusb_desc_device_t usbd_desc_device = {
 };
 
 static const uint8_t usbd_desc_cfg[USBD_DESC_LEN] = {
-    TUD_CONFIG_DESCRIPTOR(USBD_ITF_MAX, USBD_STR_0, USBD_DESC_LEN,
+    TUD_CONFIG_DESCRIPTOR(1, USBD_ITF_MAX, USBD_STR_0, USBD_DESC_LEN,
         TUSB_DESC_CONFIG_ATT_REMOTE_WAKEUP, USBD_MAX_POWER_MA),
 
     TUD_CDC_DESCRIPTOR(USBD_ITF_CDC, USBD_STR_CDC, USBD_CDC_EP_CMD,
@@ -90,7 +90,7 @@ const uint8_t *tud_descriptor_configuration_cb(uint8_t index) {
     return usbd_desc_cfg;
 }
 
-const uint16_t *tud_descriptor_string_cb(uint8_t index) {
+const uint16_t *tud_descriptor_string_cb(uint8_t index, uint16_t langid) {
     #define DESC_STR_MAX (20)
     static uint16_t desc_str[DESC_STR_MAX];
 
diff --git a/ports/samd/tusb_port.c b/ports/samd/tusb_port.c
index f3d417f1a182e..e96f332464b5a 100644
--- a/ports/samd/tusb_port.c
+++ b/ports/samd/tusb_port.c
@@ -68,7 +68,7 @@ static const tusb_desc_device_t usbd_desc_device = {
 };
 
 static const uint8_t usbd_desc_cfg[USBD_DESC_LEN] = {
-    TUD_CONFIG_DESCRIPTOR(USBD_ITF_MAX, USBD_STR_0, USBD_DESC_LEN,
+    TUD_CONFIG_DESCRIPTOR(1, USBD_ITF_MAX, USBD_STR_0, USBD_DESC_LEN,
         TUSB_DESC_CONFIG_ATT_REMOTE_WAKEUP, USBD_MAX_POWER_MA),
 
     TUD_CDC_DESCRIPTOR(USBD_ITF_CDC, USBD_STR_CDC, USBD_CDC_EP_CMD,
@@ -91,7 +91,7 @@ const uint8_t *tud_descriptor_configuration_cb(uint8_t index) {
     return usbd_desc_cfg;
 }
 
-const uint16_t *tud_descriptor_string_cb(uint8_t index) {
+const uint16_t *tud_descriptor_string_cb(uint8_t index, uint16_t langid) {
     #define DESC_STR_MAX (20)
     static uint16_t desc_str[DESC_STR_MAX];
 
@@ -118,29 +118,29 @@ const uint16_t *tud_descriptor_string_cb(uint8_t index) {
 #if defined(MCU_SAMD21)
 
 void USB_Handler_wrapper(void) {
-    USB_Handler();
+    tud_int_handler(0);
     tud_task();
 }
 
 #elif defined(MCU_SAMD51)
 
 void USB_0_Handler_wrapper(void) {
-    USB_0_Handler();
+    tud_int_handler(0);
     tud_task();
 }
 
 void USB_1_Handler_wrapper(void) {
-    USB_1_Handler();
+    tud_int_handler(0);
     tud_task();
 }
 
 void USB_2_Handler_wrapper(void) {
-    USB_2_Handler();
+    tud_int_handler(0);
     tud_task();
 }
 
 void USB_3_Handler_wrapper(void) {
-    USB_3_Handler();
+    tud_int_handler(0);
     tud_task();
 }
 

From c9260dda23bfdaea042d3bb94e1a830af0dbfa18 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 3 Feb 2021 16:33:55 +1100
Subject: [PATCH 0594/3533] rp2: Use local tinyusb instead of the one in
 pico-sdk.

So that all MicroPython ports that use tinyusb use the same version.  Also
requires fewer submodule checkouts when building rp2 along with other ports
that use tinyusb.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/rp2/CMakeLists.txt | 3 +++
 tools/ci.sh              | 3 +--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/ports/rp2/CMakeLists.txt b/ports/rp2/CMakeLists.txt
index 160456c6b1e24..bd58d8f707952 100644
--- a/ports/rp2/CMakeLists.txt
+++ b/ports/rp2/CMakeLists.txt
@@ -14,6 +14,9 @@ else()
     set(PICO_SDK_PATH ../../lib/pico-sdk)
 endif()
 
+# Use the local tinyusb instead of the one in pico-sdk
+set(PICO_TINYUSB_PATH ${MPY_DIR}/lib/tinyusb)
+
 # Include component cmake fragments
 include(micropy_py.cmake)
 include(micropy_extmod.cmake)
diff --git a/tools/ci.sh b/tools/ci.sh
index c6b641dae96dc..8661f532efe97 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -195,8 +195,7 @@ function ci_rp2_setup {
 
 function ci_rp2_build {
     make ${MAKEOPTS} -C mpy-cross
-    git submodule update --init lib/pico-sdk
-    git -C lib/pico-sdk submodule update --init lib/tinyusb
+    git submodule update --init lib/pico-sdk lib/tinyusb
     make ${MAKEOPTS} -C ports/rp2
 }
 

From f31c6b484060eb3554aa13bb758cc9a5974cafbb Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 12 Feb 2021 13:32:27 +1100
Subject: [PATCH 0595/3533] mimxrt: Fix USB CDC handling so it works reliably.

On i.MX the SysTick IRQ cannot wake the CPU from a WFI so the CPU was
blocked on WFI waiting for USB data in mp_hal_stdin_rx_chr() even though it
had already arrived (because it may arrive just after calling the check
tud_cdc_available()).  This commit fixes this problem by using SEV/WFE to
indicate that there has been a USB event.

The mp_hal_stdout_tx_strn() function is also fixed so that it doesn't
overflow the USB buffers.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/mimxrt/board_init.c   |  2 ++
 ports/mimxrt/mpconfigport.h |  2 +-
 ports/mimxrt/mphalport.c    | 17 ++++++++---------
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/ports/mimxrt/board_init.c b/ports/mimxrt/board_init.c
index 102764cac13d2..cd7dc9a7dd08e 100644
--- a/ports/mimxrt/board_init.c
+++ b/ports/mimxrt/board_init.c
@@ -92,9 +92,11 @@ void SysTick_Handler(void) {
 void USB_OTG1_IRQHandler(void) {
     tud_int_handler(0);
     tud_task();
+    __SEV();
 }
 
 void USB_OTG2_IRQHandler(void) {
     tud_int_handler(1);
     tud_task();
+    __SEV();
 }
diff --git a/ports/mimxrt/mpconfigport.h b/ports/mimxrt/mpconfigport.h
index 15a292486ff4e..68c7a894221d8 100644
--- a/ports/mimxrt/mpconfigport.h
+++ b/ports/mimxrt/mpconfigport.h
@@ -94,7 +94,7 @@ extern const struct _mp_obj_module_t mp_module_utime;
     do { \
         extern void mp_handle_pending(bool); \
         mp_handle_pending(true); \
-        __WFI(); \
+        __WFE(); \
     } while (0);
 
 #define MICROPY_MAKE_POINTER_CALLABLE(p) ((void *)((mp_uint_t)(p) | 1))
diff --git a/ports/mimxrt/mphalport.c b/ports/mimxrt/mphalport.c
index d7642d6b6d4a4..3032464d398f4 100644
--- a/ports/mimxrt/mphalport.c
+++ b/ports/mimxrt/mphalport.c
@@ -75,7 +75,7 @@ int mp_hal_stdin_rx_chr(void) {
                 return buf[0];
             }
         }
-        __WFI();
+        MICROPY_EVENT_POLL_HOOK
     }
 }
 
@@ -83,17 +83,16 @@ void mp_hal_stdout_tx_strn(const char *str, mp_uint_t len) {
     if (tud_cdc_connected()) {
         for (size_t i = 0; i < len;) {
             uint32_t n = len - i;
-            uint32_t n2 = tud_cdc_write(str + i, n);
-            if (n2 < n) {
-                while (!tud_cdc_write_flush()) {
-                    __WFI();
-                }
+            if (n > CFG_TUD_CDC_EP_BUFSIZE) {
+                n = CFG_TUD_CDC_EP_BUFSIZE;
             }
+            while (n > tud_cdc_write_available()) {
+                __WFE();
+            }
+            uint32_t n2 = tud_cdc_write(str + i, n);
+            tud_cdc_write_flush();
             i += n2;
         }
-        while (!tud_cdc_write_flush()) {
-            __WFI();
-        }
     }
     // TODO
     // while (len--) {

From ede6b86a08ea3a749e1785c5263723c875b08359 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 12 Feb 2021 14:09:01 +1100
Subject: [PATCH 0596/3533] samd/mphalport: Fix USB CDC tx handling to work
 reliably.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/samd/mphalport.c | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/ports/samd/mphalport.c b/ports/samd/mphalport.c
index 67fc2cb0d6f17..357ec93a68143 100644
--- a/ports/samd/mphalport.c
+++ b/ports/samd/mphalport.c
@@ -80,17 +80,16 @@ void mp_hal_stdout_tx_strn(const char *str, mp_uint_t len) {
     if (tud_cdc_connected()) {
         for (size_t i = 0; i < len;) {
             uint32_t n = len - i;
-            uint32_t n2 = tud_cdc_write(str + i, n);
-            if (n2 < n) {
-                while (!tud_cdc_write_flush()) {
-                    __WFI();
-                }
+            if (n > CFG_TUD_CDC_EP_BUFSIZE) {
+                n = CFG_TUD_CDC_EP_BUFSIZE;
+            }
+            while (n > tud_cdc_write_available()) {
+                __WFI();
             }
+            uint32_t n2 = tud_cdc_write(str + i, n);
+            tud_cdc_write_flush();
             i += n2;
         }
-        while (!tud_cdc_write_flush()) {
-            __WFI();
-        }
     }
     while (len--) {
         while (!(USARTx->USART.INTFLAG.bit.DRE)) {

From 701fdcacafe017c88c8cf18f64d8c26f25987e97 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sat, 13 Feb 2021 13:52:53 +1100
Subject: [PATCH 0597/3533] nrf/drivers/usb: Add USBD_IRQHandler which calls
 tud_int_handler.

This is needed for TinyUSB to process USB device IRQs.

Related to #6325.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/nrf/drivers/usb/usb_cdc.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ports/nrf/drivers/usb/usb_cdc.c b/ports/nrf/drivers/usb/usb_cdc.c
index c90bced6bb563..9d7c832e20d32 100644
--- a/ports/nrf/drivers/usb/usb_cdc.c
+++ b/ports/nrf/drivers/usb/usb_cdc.c
@@ -223,4 +223,8 @@ void mp_hal_stdout_tx_strn_cooked(const char *str, mp_uint_t len) {
     }
 }
 
+void USBD_IRQHandler(void) {
+    tud_int_handler(0);
+}
+
 #endif // MICROPY_HW_USB_CDC

From d128999938d6b44f52f4d0c6e1f5169ab3c1e7a5 Mon Sep 17 00:00:00 2001
From: Brianna Laugher <brianna.laugher@planetinnovation.com.au>
Date: Fri, 12 Feb 2021 22:15:43 +1100
Subject: [PATCH 0598/3533] tools: Add filesystem action examples to pyboard.py
 help.

Signed-off-by: Brianna Laugher <brianna.laugher@gmail.com>
---
 docs/reference/pyboard.py.rst | 4 +++-
 tools/pyboard.py              | 6 +++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/docs/reference/pyboard.py.rst b/docs/reference/pyboard.py.rst
index 30230eebc3bf4..4fedbb7aab9a3 100644
--- a/docs/reference/pyboard.py.rst
+++ b/docs/reference/pyboard.py.rst
@@ -48,7 +48,9 @@ Running ``pyboard.py --help`` gives the following output:
                             available
       --follow              follow the output after running the scripts
                             [default if no scripts given]
-      -f, --filesystem      perform a filesystem action
+      -f, --filesystem      perform a filesystem action: cp local :device | cp
+                            :device local | cat path | ls [path] | rm path | mkdir
+                            path | rmdir path
 
 Running a command on the device
 -------------------------------
diff --git a/tools/pyboard.py b/tools/pyboard.py
index 3ecdf03f156f7..069f7490d0dd1 100755
--- a/tools/pyboard.py
+++ b/tools/pyboard.py
@@ -651,7 +651,11 @@ def main():
         help="Do not follow the output after running the scripts.",
     )
     cmd_parser.add_argument(
-        "-f", "--filesystem", action="store_true", help="perform a filesystem action"
+        "-f",
+        "--filesystem",
+        action="store_true",
+        help="perform a filesystem action: "
+        "cp local :device | cp :device local | cat path | ls [path] | rm path | mkdir path | rmdir path",
     )
     cmd_parser.add_argument("files", nargs="*", help="input files")
     args = cmd_parser.parse_args()

From 7ed99544e4cc1c09bd5abf9f54869c3122fa033b Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Fri, 12 Feb 2021 14:11:18 +1100
Subject: [PATCH 0599/3533] extmod/uasyncio: Add asyncio.current_task().

Matches CPython behavior.

Fixes #6686
---
 docs/library/uasyncio.rst                 |  4 ++++
 extmod/uasyncio/core.py                   |  4 ++++
 tests/extmod/uasyncio_current_task.py     | 25 +++++++++++++++++++++++
 tests/extmod/uasyncio_current_task.py.exp |  1 +
 4 files changed, 34 insertions(+)
 create mode 100644 tests/extmod/uasyncio_current_task.py
 create mode 100644 tests/extmod/uasyncio_current_task.py.exp

diff --git a/docs/library/uasyncio.rst b/docs/library/uasyncio.rst
index a81e532d7fd25..3316f908d6364 100644
--- a/docs/library/uasyncio.rst
+++ b/docs/library/uasyncio.rst
@@ -40,6 +40,10 @@ Core functions
 
     Returns the corresponding `Task` object.
 
+.. function:: current_task()
+
+    Return the `Task` object associated with the currently running task.
+
 .. function:: run(coro)
 
     Create a new task from the given coroutine and run it until it completes.
diff --git a/extmod/uasyncio/core.py b/extmod/uasyncio/core.py
index 6a84b0982c41f..d74763f6a696e 100644
--- a/extmod/uasyncio/core.py
+++ b/extmod/uasyncio/core.py
@@ -264,6 +264,10 @@ def get_event_loop(runq_len=0, waitq_len=0):
     return Loop
 
 
+def current_task():
+    return cur_task
+
+
 def new_event_loop():
     global _task_queue, _io_queue
     # TaskQueue of Task instances
diff --git a/tests/extmod/uasyncio_current_task.py b/tests/extmod/uasyncio_current_task.py
new file mode 100644
index 0000000000000..3165a2cf16a7e
--- /dev/null
+++ b/tests/extmod/uasyncio_current_task.py
@@ -0,0 +1,25 @@
+# Test current_task() function
+
+try:
+    import uasyncio as asyncio
+except ImportError:
+    try:
+        import asyncio
+    except ImportError:
+        print("SKIP")
+        raise SystemExit
+
+
+async def task(result):
+    result[0] = asyncio.current_task()
+
+
+async def main():
+    result = [None]
+    t = asyncio.create_task(task(result))
+    await asyncio.sleep(0)
+    await asyncio.sleep(0)
+    print(t is result[0])
+
+
+asyncio.run(main())
diff --git a/tests/extmod/uasyncio_current_task.py.exp b/tests/extmod/uasyncio_current_task.py.exp
new file mode 100644
index 0000000000000..0ca95142bb715
--- /dev/null
+++ b/tests/extmod/uasyncio_current_task.py.exp
@@ -0,0 +1 @@
+True

From d2a34c62e73f63a7822c823b5523e5924c28831d Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 3 Feb 2021 16:18:35 +1100
Subject: [PATCH 0600/3533] stm32/uart: Add uart_set_baudrate function.

This allows changing the baudrate of the UART without reinitialising it
(reinitialising can lead to spurious characters sent on the TX line).

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/boards/stm32f0xx_hal_conf_base.h |  1 +
 ports/stm32/boards/stm32f4xx_hal_conf_base.h |  1 +
 ports/stm32/boards/stm32f7xx_hal_conf_base.h |  1 +
 ports/stm32/boards/stm32h7xx_hal_conf_base.h |  1 +
 ports/stm32/boards/stm32l0xx_hal_conf_base.h |  1 +
 ports/stm32/boards/stm32l4xx_hal_conf_base.h |  1 +
 ports/stm32/boards/stm32wbxx_hal_conf_base.h |  1 +
 ports/stm32/uart.c                           | 16 +++++++++++++---
 ports/stm32/uart.h                           |  2 ++
 9 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/ports/stm32/boards/stm32f0xx_hal_conf_base.h b/ports/stm32/boards/stm32f0xx_hal_conf_base.h
index 5c6f31d1dd81b..70e6ccf758d38 100644
--- a/ports/stm32/boards/stm32f0xx_hal_conf_base.h
+++ b/ports/stm32/boards/stm32f0xx_hal_conf_base.h
@@ -49,6 +49,7 @@
 #include "stm32f0xx_hal_wwdg.h"
 #include "stm32f0xx_ll_adc.h"
 #include "stm32f0xx_ll_rtc.h"
+#include "stm32f0xx_ll_usart.h"
 
 // Enable various HAL modules
 #define HAL_MODULE_ENABLED
diff --git a/ports/stm32/boards/stm32f4xx_hal_conf_base.h b/ports/stm32/boards/stm32f4xx_hal_conf_base.h
index 057a9e81e4cac..134a30018ce36 100644
--- a/ports/stm32/boards/stm32f4xx_hal_conf_base.h
+++ b/ports/stm32/boards/stm32f4xx_hal_conf_base.h
@@ -56,6 +56,7 @@
 #include "stm32f4xx_ll_adc.h"
 #include "stm32f4xx_ll_pwr.h"
 #include "stm32f4xx_ll_rtc.h"
+#include "stm32f4xx_ll_usart.h"
 
 // Enable various HAL modules
 #define HAL_ADC_MODULE_ENABLED
diff --git a/ports/stm32/boards/stm32f7xx_hal_conf_base.h b/ports/stm32/boards/stm32f7xx_hal_conf_base.h
index 6e7dff3042ff3..efb15d471dcc7 100644
--- a/ports/stm32/boards/stm32f7xx_hal_conf_base.h
+++ b/ports/stm32/boards/stm32f7xx_hal_conf_base.h
@@ -56,6 +56,7 @@
 #include "stm32f7xx_ll_adc.h"
 #include "stm32f7xx_ll_pwr.h"
 #include "stm32f7xx_ll_rtc.h"
+#include "stm32f7xx_ll_usart.h"
 
 // Enable various HAL modules
 #define HAL_ADC_MODULE_ENABLED
diff --git a/ports/stm32/boards/stm32h7xx_hal_conf_base.h b/ports/stm32/boards/stm32h7xx_hal_conf_base.h
index a451cfde76162..c07ae93e37e04 100644
--- a/ports/stm32/boards/stm32h7xx_hal_conf_base.h
+++ b/ports/stm32/boards/stm32h7xx_hal_conf_base.h
@@ -56,6 +56,7 @@
 #include "stm32h7xx_ll_adc.h"
 #include "stm32h7xx_ll_pwr.h"
 #include "stm32h7xx_ll_rtc.h"
+#include "stm32h7xx_ll_usart.h"
 
 // Enable various HAL modules
 #define HAL_ADC_MODULE_ENABLED
diff --git a/ports/stm32/boards/stm32l0xx_hal_conf_base.h b/ports/stm32/boards/stm32l0xx_hal_conf_base.h
index 6b5ece766a83c..cc033666af8c3 100644
--- a/ports/stm32/boards/stm32l0xx_hal_conf_base.h
+++ b/ports/stm32/boards/stm32l0xx_hal_conf_base.h
@@ -48,6 +48,7 @@
 #include "stm32l0xx_hal_wwdg.h"
 #include "stm32l0xx_ll_adc.h"
 #include "stm32l0xx_ll_rtc.h"
+#include "stm32l0xx_ll_usart.h"
 
 // Enable various HAL modules
 #define HAL_MODULE_ENABLED
diff --git a/ports/stm32/boards/stm32l4xx_hal_conf_base.h b/ports/stm32/boards/stm32l4xx_hal_conf_base.h
index 215e798b92f2e..8d77a80a7096e 100644
--- a/ports/stm32/boards/stm32l4xx_hal_conf_base.h
+++ b/ports/stm32/boards/stm32l4xx_hal_conf_base.h
@@ -52,6 +52,7 @@
 #include "stm32l4xx_hal_wwdg.h"
 #include "stm32l4xx_ll_adc.h"
 #include "stm32l4xx_ll_rtc.h"
+#include "stm32l4xx_ll_usart.h"
 
 // Enable various HAL modules
 #define HAL_MODULE_ENABLED
diff --git a/ports/stm32/boards/stm32wbxx_hal_conf_base.h b/ports/stm32/boards/stm32wbxx_hal_conf_base.h
index 91309e286fa1e..72af0262a28b2 100644
--- a/ports/stm32/boards/stm32wbxx_hal_conf_base.h
+++ b/ports/stm32/boards/stm32wbxx_hal_conf_base.h
@@ -43,6 +43,7 @@
 #include "stm32wbxx_hal_usart.h"
 #include "stm32wbxx_ll_adc.h"
 #include "stm32wbxx_ll_rtc.h"
+#include "stm32wbxx_ll_usart.h"
 
 // Enable various HAL modules
 #define HAL_MODULE_ENABLED
diff --git a/ports/stm32/uart.c b/ports/stm32/uart.c
index b14a18c6ddfa6..8091ba05f99af 100644
--- a/ports/stm32/uart.c
+++ b/ports/stm32/uart.c
@@ -603,7 +603,7 @@ void uart_attach_to_repl(pyb_uart_obj_t *self, bool attached) {
     self->attached_to_repl = attached;
 }
 
-uint32_t uart_get_baudrate(pyb_uart_obj_t *self) {
+uint32_t uart_get_source_freq(pyb_uart_obj_t *self) {
     uint32_t uart_clk = 0;
 
     #if defined(STM32F0)
@@ -672,10 +672,20 @@ uint32_t uart_get_baudrate(pyb_uart_obj_t *self) {
     }
     #endif
 
+    return uart_clk;
+}
+
+uint32_t uart_get_baudrate(pyb_uart_obj_t *self) {
     // This formula assumes UART_OVERSAMPLING_16
-    uint32_t baudrate = uart_clk / self->uartx->BRR;
+    return uart_get_source_freq(self) / self->uartx->BRR;
+}
 
-    return baudrate;
+void uart_set_baudrate(pyb_uart_obj_t *self, uint32_t baudrate) {
+    LL_USART_SetBaudRate(self->uartx, uart_get_source_freq(self),
+        #if defined(STM32H7) || defined(STM32WB)
+        LL_USART_PRESCALER_DIV1,
+        #endif
+        LL_USART_OVERSAMPLING_16, baudrate);
 }
 
 mp_uint_t uart_rx_any(pyb_uart_obj_t *self) {
diff --git a/ports/stm32/uart.h b/ports/stm32/uart.h
index 9a38db593d4fc..570a79c932585 100644
--- a/ports/stm32/uart.h
+++ b/ports/stm32/uart.h
@@ -86,6 +86,8 @@ void uart_irq_handler(mp_uint_t uart_id);
 
 void uart_attach_to_repl(pyb_uart_obj_t *self, bool attached);
 uint32_t uart_get_baudrate(pyb_uart_obj_t *self);
+void uart_set_baudrate(pyb_uart_obj_t *self, uint32_t baudrate);
+
 mp_uint_t uart_rx_any(pyb_uart_obj_t *uart_obj);
 bool uart_rx_wait(pyb_uart_obj_t *self, uint32_t timeout);
 int uart_rx_char(pyb_uart_obj_t *uart_obj);

From bffb71f523e4bcc21b913af291deeb67091bed88 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 3 Feb 2021 16:19:47 +1100
Subject: [PATCH 0601/3533] stm32/mpbthciport: Only init the uart once, then
 use uart_set_baudrate.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/mpbthciport.c | 33 +++++++++++++--------------------
 1 file changed, 13 insertions(+), 20 deletions(-)

diff --git a/ports/stm32/mpbthciport.c b/ports/stm32/mpbthciport.c
index ee9f4e31eb2ba..5e51892e6f494 100644
--- a/ports/stm32/mpbthciport.c
+++ b/ports/stm32/mpbthciport.c
@@ -32,8 +32,6 @@
 #include "pendsv.h"
 #include "lib/utils/mpirq.h"
 
-#include "py/obj.h"
-
 #if MICROPY_PY_BLUETOOTH
 
 #define DEBUG_printf(...) // printf("mpbthciport.c: " __VA_ARGS__)
@@ -197,8 +195,18 @@ int mp_bluetooth_hci_uart_init(uint32_t port, uint32_t baudrate) {
     mp_bluetooth_hci_uart_obj.timeout_char = 200;
     MP_STATE_PORT(pyb_uart_obj_all)[mp_bluetooth_hci_uart_obj.uart_id - 1] = &mp_bluetooth_hci_uart_obj;
 
-    // This also initialises the UART and adds the RXIDLE IRQ handler.
-    mp_bluetooth_hci_uart_set_baudrate(baudrate);
+    // Initialise the UART.
+    uart_init(&mp_bluetooth_hci_uart_obj, 115200, UART_WORDLENGTH_8B, UART_PARITY_NONE, UART_STOPBITS_1, UART_HWCONTROL_RTS | UART_HWCONTROL_CTS);
+    uart_set_rxbuf(&mp_bluetooth_hci_uart_obj, sizeof(hci_uart_rxbuf), hci_uart_rxbuf);
+
+    // Add IRQ handler for IDLE (i.e. packet finished).
+    uart_irq_config(&mp_bluetooth_hci_uart_obj, false);
+    mp_irq_init(&mp_bluetooth_hci_uart_irq_obj, &uart_irq_methods, MP_OBJ_FROM_PTR(&mp_bluetooth_hci_uart_obj));
+    mp_bluetooth_hci_uart_obj.mp_irq_obj = &mp_bluetooth_hci_uart_irq_obj;
+    mp_bluetooth_hci_uart_obj.mp_irq_trigger = UART_FLAG_IDLE;
+    mp_bluetooth_hci_uart_irq_obj.handler = MP_OBJ_FROM_PTR(&mp_uart_interrupt_obj);
+    mp_bluetooth_hci_uart_irq_obj.ishard = true;
+    uart_irq_config(&mp_bluetooth_hci_uart_obj, true);
 
     return 0;
 }
@@ -213,22 +221,7 @@ int mp_bluetooth_hci_uart_deinit(void) {
 
 int mp_bluetooth_hci_uart_set_baudrate(uint32_t baudrate) {
     DEBUG_printf("mp_bluetooth_hci_uart_set_baudrate(%lu) (stm32)\n", baudrate);
-    if (!baudrate) {
-        return -1;
-    }
-
-    uart_init(&mp_bluetooth_hci_uart_obj, baudrate, UART_WORDLENGTH_8B, UART_PARITY_NONE, UART_STOPBITS_1, UART_HWCONTROL_RTS | UART_HWCONTROL_CTS);
-    uart_set_rxbuf(&mp_bluetooth_hci_uart_obj, sizeof(hci_uart_rxbuf), hci_uart_rxbuf);
-
-    // Add IRQ handler for IDLE (i.e. packet finished).
-    uart_irq_config(&mp_bluetooth_hci_uart_obj, false);
-    mp_irq_init(&mp_bluetooth_hci_uart_irq_obj, &uart_irq_methods, MP_OBJ_FROM_PTR(&mp_bluetooth_hci_uart_obj));
-    mp_bluetooth_hci_uart_obj.mp_irq_obj = &mp_bluetooth_hci_uart_irq_obj;
-    mp_bluetooth_hci_uart_obj.mp_irq_trigger = UART_FLAG_IDLE;
-    mp_bluetooth_hci_uart_irq_obj.handler = MP_OBJ_FROM_PTR(&mp_uart_interrupt_obj);
-    mp_bluetooth_hci_uart_irq_obj.ishard = true;
-    uart_irq_config(&mp_bluetooth_hci_uart_obj, true);
-
+    uart_set_baudrate(&mp_bluetooth_hci_uart_obj, baudrate);
     return 0;
 }
 

From 66098c09850ccc31b49b341e7eb7a5f8526e359d Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 23 Sep 2020 15:53:46 +1000
Subject: [PATCH 0602/3533] py,extmod: Add core cmake rule files.

These allow a port to use cmake natively instead of make.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/extmod.cmake |  44 +++++++++++++++
 py/mkrules.cmake    | 128 ++++++++++++++++++++++++++++++++++++++++++++
 py/py.cmake         | 124 ++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 296 insertions(+)
 create mode 100644 extmod/extmod.cmake
 create mode 100644 py/mkrules.cmake
 create mode 100644 py/py.cmake

diff --git a/extmod/extmod.cmake b/extmod/extmod.cmake
new file mode 100644
index 0000000000000..6668a2d8aa3cc
--- /dev/null
+++ b/extmod/extmod.cmake
@@ -0,0 +1,44 @@
+# CMake fragment for MicroPython extmod component
+
+set(MICROPY_EXTMOD_DIR "${MICROPY_DIR}/extmod")
+set(MICROPY_OOFATFS_DIR "${MICROPY_DIR}/lib/oofatfs")
+
+set(MICROPY_SOURCE_EXTMOD
+    ${MICROPY_EXTMOD_DIR}/machine_i2c.c
+    ${MICROPY_EXTMOD_DIR}/machine_mem.c
+    ${MICROPY_EXTMOD_DIR}/machine_pulse.c
+    ${MICROPY_EXTMOD_DIR}/machine_signal.c
+    ${MICROPY_EXTMOD_DIR}/machine_spi.c
+    ${MICROPY_EXTMOD_DIR}/modbluetooth.c
+    ${MICROPY_EXTMOD_DIR}/modbtree.c
+    ${MICROPY_EXTMOD_DIR}/modframebuf.c
+    ${MICROPY_EXTMOD_DIR}/moduasyncio.c
+    ${MICROPY_EXTMOD_DIR}/modubinascii.c
+    ${MICROPY_EXTMOD_DIR}/moducryptolib.c
+    ${MICROPY_EXTMOD_DIR}/moductypes.c
+    ${MICROPY_EXTMOD_DIR}/moduhashlib.c
+    ${MICROPY_EXTMOD_DIR}/moduheapq.c
+    ${MICROPY_EXTMOD_DIR}/modujson.c
+    ${MICROPY_EXTMOD_DIR}/modurandom.c
+    ${MICROPY_EXTMOD_DIR}/modure.c
+    ${MICROPY_EXTMOD_DIR}/moduselect.c
+    ${MICROPY_EXTMOD_DIR}/modussl_axtls.c
+    ${MICROPY_EXTMOD_DIR}/modussl_mbedtls.c
+    ${MICROPY_EXTMOD_DIR}/modutimeq.c
+    ${MICROPY_EXTMOD_DIR}/moduwebsocket.c
+    ${MICROPY_EXTMOD_DIR}/moduzlib.c
+    ${MICROPY_EXTMOD_DIR}/modwebrepl.c
+    ${MICROPY_EXTMOD_DIR}/uos_dupterm.c
+    ${MICROPY_EXTMOD_DIR}/utime_mphal.c
+    ${MICROPY_EXTMOD_DIR}/vfs.c
+    ${MICROPY_EXTMOD_DIR}/vfs_blockdev.c
+    ${MICROPY_EXTMOD_DIR}/vfs_fat.c
+    ${MICROPY_EXTMOD_DIR}/vfs_fat_diskio.c
+    ${MICROPY_EXTMOD_DIR}/vfs_fat_file.c
+    ${MICROPY_EXTMOD_DIR}/vfs_lfs.c
+    ${MICROPY_EXTMOD_DIR}/vfs_posix.c
+    ${MICROPY_EXTMOD_DIR}/vfs_posix_file.c
+    ${MICROPY_EXTMOD_DIR}/vfs_reader.c
+    ${MICROPY_EXTMOD_DIR}/virtpin.c
+    ${MICROPY_EXTMOD_DIR}/nimble/modbluetooth_nimble.c
+)
diff --git a/py/mkrules.cmake b/py/mkrules.cmake
new file mode 100644
index 0000000000000..bdff385815a44
--- /dev/null
+++ b/py/mkrules.cmake
@@ -0,0 +1,128 @@
+# CMake fragment for MicroPython rules
+
+set(MICROPY_PY_QSTRDEFS "${MICROPY_PY_DIR}/qstrdefs.h")
+set(MICROPY_GENHDR_DIR "${CMAKE_BINARY_DIR}/genhdr")
+set(MICROPY_MPVERSION "${MICROPY_GENHDR_DIR}/mpversion.h")
+set(MICROPY_MODULEDEFS "${MICROPY_GENHDR_DIR}/moduledefs.h")
+set(MICROPY_QSTR_DEFS_LAST "${MICROPY_GENHDR_DIR}/qstr.i.last")
+set(MICROPY_QSTR_DEFS_SPLIT "${MICROPY_GENHDR_DIR}/qstr.split")
+set(MICROPY_QSTR_DEFS_COLLECTED "${MICROPY_GENHDR_DIR}/qstrdefs.collected.h")
+set(MICROPY_QSTR_DEFS_PREPROCESSED "${MICROPY_GENHDR_DIR}/qstrdefs.preprocessed.h")
+set(MICROPY_QSTR_DEFS_GENERATED "${MICROPY_GENHDR_DIR}/qstrdefs.generated.h")
+
+# Provide defaults for preprocessor flags if not already defined
+if(NOT MICROPY_CPP_FLAGS)
+    get_target_property(MICROPY_CPP_INC ${MICROPY_TARGET} INCLUDE_DIRECTORIES)
+    get_target_property(MICROPY_CPP_DEF ${MICROPY_TARGET} COMPILE_DEFINITIONS)
+endif()
+
+# Compute MICROPY_CPP_FLAGS for preprocessor
+list(APPEND MICROPY_CPP_INC ${MICROPY_CPP_INC_EXTRA})
+list(APPEND MICROPY_CPP_DEF ${MICROPY_CPP_DEF_EXTRA})
+set(_prefix "-I")
+foreach(_arg ${MICROPY_CPP_INC})
+    list(APPEND MICROPY_CPP_FLAGS ${_prefix}${_arg})
+endforeach()
+set(_prefix "-D")
+foreach(_arg ${MICROPY_CPP_DEF})
+    list(APPEND MICROPY_CPP_FLAGS ${_prefix}${_arg})
+endforeach()
+list(APPEND MICROPY_CPP_FLAGS ${MICROPY_CPP_FLAGS_EXTRA})
+
+find_package(Python3 REQUIRED COMPONENTS Interpreter)
+
+target_sources(${MICROPY_TARGET} PRIVATE
+    ${MICROPY_MPVERSION}
+    ${MICROPY_QSTR_DEFS_GENERATED}
+)
+
+# Command to force the build of another command
+
+add_custom_command(
+    OUTPUT MICROPY_FORCE_BUILD
+    COMMENT ""
+    COMMAND echo -n
+)
+
+# Generate mpversion.h
+
+add_custom_command(
+    OUTPUT ${MICROPY_MPVERSION}
+    COMMAND ${CMAKE_COMMAND} -E make_directory ${MICROPY_GENHDR_DIR}
+    COMMAND ${Python3_EXECUTABLE} ${MICROPY_DIR}/py/makeversionhdr.py ${MICROPY_MPVERSION}
+    DEPENDS MICROPY_FORCE_BUILD
+)
+
+# Generate moduledefs.h
+
+add_custom_command(
+    OUTPUT ${MICROPY_MODULEDEFS}
+    COMMAND ${Python3_EXECUTABLE} ${MICROPY_PY_DIR}/makemoduledefs.py --vpath="/" ${MICROPY_SOURCE_QSTR} > ${MICROPY_MODULEDEFS}
+    DEPENDS ${MICROPY_MPVERSION}
+        ${MICROPY_SOURCE_QSTR}
+)
+
+# Generate qstrs
+
+# If any of the dependencies in this rule change then the C-preprocessor step must be run.
+# It only needs to be passed the list of MICROPY_SOURCE_QSTR files that have changed since
+# it was last run, but it looks like it's not possible to specify that with cmake.
+add_custom_command(
+    OUTPUT ${MICROPY_QSTR_DEFS_LAST}
+    COMMAND ${Python3_EXECUTABLE} ${MICROPY_PY_DIR}/makeqstrdefs.py pp ${CMAKE_C_COMPILER} -E output ${MICROPY_GENHDR_DIR}/qstr.i.last cflags ${MICROPY_CPP_FLAGS} -DNO_QSTR sources ${MICROPY_SOURCE_QSTR}
+    DEPENDS ${MICROPY_MODULEDEFS}
+        ${MICROPY_SOURCE_QSTR}
+    VERBATIM
+)
+
+add_custom_command(
+    OUTPUT ${MICROPY_QSTR_DEFS_SPLIT}
+    COMMAND ${Python3_EXECUTABLE} ${MICROPY_PY_DIR}/makeqstrdefs.py split qstr ${MICROPY_GENHDR_DIR}/qstr.i.last ${MICROPY_GENHDR_DIR}/qstr _
+    COMMAND touch ${MICROPY_QSTR_DEFS_SPLIT}
+    DEPENDS ${MICROPY_QSTR_DEFS_LAST}
+    VERBATIM
+)
+
+add_custom_command(
+    OUTPUT ${MICROPY_QSTR_DEFS_COLLECTED}
+    COMMAND ${Python3_EXECUTABLE} ${MICROPY_PY_DIR}/makeqstrdefs.py cat qstr _ ${MICROPY_GENHDR_DIR}/qstr ${MICROPY_QSTR_DEFS_COLLECTED}
+    DEPENDS ${MICROPY_QSTR_DEFS_SPLIT}
+    VERBATIM
+)
+
+add_custom_command(
+    OUTPUT ${MICROPY_QSTR_DEFS_PREPROCESSED}
+    COMMAND cat ${MICROPY_PY_QSTRDEFS} ${MICROPY_QSTR_DEFS_COLLECTED} | sed "s/^Q(.*)/\"&\"/" | ${CMAKE_C_COMPILER} -E ${MICROPY_CPP_FLAGS} - | sed "s/^\\\"\\(Q(.*)\\)\\\"/\\1/" > ${MICROPY_QSTR_DEFS_PREPROCESSED}
+    DEPENDS ${MICROPY_QSTR_DEFS_COLLECTED}
+    VERBATIM
+)
+
+add_custom_command(
+    OUTPUT ${MICROPY_QSTR_DEFS_GENERATED}
+    COMMAND ${Python3_EXECUTABLE} ${MICROPY_PY_DIR}/makeqstrdata.py ${MICROPY_QSTR_DEFS_PREPROCESSED} > ${MICROPY_QSTR_DEFS_GENERATED}
+    DEPENDS ${MICROPY_QSTR_DEFS_PREPROCESSED}
+    VERBATIM
+)
+
+# Build frozen code if enabled
+
+if(MICROPY_FROZEN_MANIFEST)
+    set(MICROPY_FROZEN_CONTENT "${CMAKE_BINARY_DIR}/frozen_content.c")
+
+    target_sources(${MICROPY_TARGET} PRIVATE
+        ${MICROPY_FROZEN_CONTENT}
+    )
+
+    target_compile_definitions(${MICROPY_TARGET} PUBLIC
+        MICROPY_QSTR_EXTRA_POOL=mp_qstr_frozen_const_pool
+        MICROPY_MODULE_FROZEN_MPY=\(1\)
+    )
+
+    add_custom_command(
+        OUTPUT ${MICROPY_FROZEN_CONTENT}
+        COMMAND ${Python3_EXECUTABLE} ${MICROPY_DIR}/tools/makemanifest.py -o ${MICROPY_FROZEN_CONTENT} -v "MPY_DIR=${MICROPY_DIR}" -v "PORT_DIR=${MICROPY_PORT_DIR}" -b "${CMAKE_BINARY_DIR}" -f${MICROPY_CROSS_FLAGS} ${MICROPY_FROZEN_MANIFEST}
+        DEPENDS MICROPY_FORCE_BUILD
+            ${MICROPY_QSTR_DEFS_GENERATED}
+        VERBATIM
+    )
+endif()
diff --git a/py/py.cmake b/py/py.cmake
new file mode 100644
index 0000000000000..52baaa8efc7fd
--- /dev/null
+++ b/py/py.cmake
@@ -0,0 +1,124 @@
+# CMake fragment for MicroPython core py component
+
+set(MICROPY_PY_DIR "${MICROPY_DIR}/py")
+
+# All py/ source files
+set(MICROPY_SOURCE_PY
+    ${MICROPY_PY_DIR}/argcheck.c
+    ${MICROPY_PY_DIR}/asmarm.c
+    ${MICROPY_PY_DIR}/asmbase.c
+    ${MICROPY_PY_DIR}/asmthumb.c
+    ${MICROPY_PY_DIR}/asmx64.c
+    ${MICROPY_PY_DIR}/asmx86.c
+    ${MICROPY_PY_DIR}/asmxtensa.c
+    ${MICROPY_PY_DIR}/bc.c
+    ${MICROPY_PY_DIR}/binary.c
+    ${MICROPY_PY_DIR}/builtinevex.c
+    ${MICROPY_PY_DIR}/builtinhelp.c
+    ${MICROPY_PY_DIR}/builtinimport.c
+    ${MICROPY_PY_DIR}/compile.c
+    ${MICROPY_PY_DIR}/emitbc.c
+    ${MICROPY_PY_DIR}/emitcommon.c
+    ${MICROPY_PY_DIR}/emitglue.c
+    ${MICROPY_PY_DIR}/emitinlinethumb.c
+    ${MICROPY_PY_DIR}/emitinlinextensa.c
+    ${MICROPY_PY_DIR}/emitnarm.c
+    ${MICROPY_PY_DIR}/emitnthumb.c
+    ${MICROPY_PY_DIR}/emitnx64.c
+    ${MICROPY_PY_DIR}/emitnx86.c
+    ${MICROPY_PY_DIR}/emitnxtensa.c
+    ${MICROPY_PY_DIR}/emitnxtensawin.c
+    ${MICROPY_PY_DIR}/formatfloat.c
+    ${MICROPY_PY_DIR}/frozenmod.c
+    ${MICROPY_PY_DIR}/gc.c
+    ${MICROPY_PY_DIR}/lexer.c
+    ${MICROPY_PY_DIR}/malloc.c
+    ${MICROPY_PY_DIR}/map.c
+    ${MICROPY_PY_DIR}/modarray.c
+    ${MICROPY_PY_DIR}/modbuiltins.c
+    ${MICROPY_PY_DIR}/modcmath.c
+    ${MICROPY_PY_DIR}/modcollections.c
+    ${MICROPY_PY_DIR}/modgc.c
+    ${MICROPY_PY_DIR}/modio.c
+    ${MICROPY_PY_DIR}/modmath.c
+    ${MICROPY_PY_DIR}/modmicropython.c
+    ${MICROPY_PY_DIR}/modstruct.c
+    ${MICROPY_PY_DIR}/modsys.c
+    ${MICROPY_PY_DIR}/modthread.c
+    ${MICROPY_PY_DIR}/moduerrno.c
+    ${MICROPY_PY_DIR}/mpprint.c
+    ${MICROPY_PY_DIR}/mpstate.c
+    ${MICROPY_PY_DIR}/mpz.c
+    ${MICROPY_PY_DIR}/nativeglue.c
+    ${MICROPY_PY_DIR}/nlr.c
+    ${MICROPY_PY_DIR}/nlrpowerpc.c
+    ${MICROPY_PY_DIR}/nlrsetjmp.c
+    ${MICROPY_PY_DIR}/nlrthumb.c
+    ${MICROPY_PY_DIR}/nlrx64.c
+    ${MICROPY_PY_DIR}/nlrx86.c
+    ${MICROPY_PY_DIR}/nlrxtensa.c
+    ${MICROPY_PY_DIR}/obj.c
+    ${MICROPY_PY_DIR}/objarray.c
+    ${MICROPY_PY_DIR}/objattrtuple.c
+    ${MICROPY_PY_DIR}/objbool.c
+    ${MICROPY_PY_DIR}/objboundmeth.c
+    ${MICROPY_PY_DIR}/objcell.c
+    ${MICROPY_PY_DIR}/objclosure.c
+    ${MICROPY_PY_DIR}/objcomplex.c
+    ${MICROPY_PY_DIR}/objdeque.c
+    ${MICROPY_PY_DIR}/objdict.c
+    ${MICROPY_PY_DIR}/objenumerate.c
+    ${MICROPY_PY_DIR}/objexcept.c
+    ${MICROPY_PY_DIR}/objfilter.c
+    ${MICROPY_PY_DIR}/objfloat.c
+    ${MICROPY_PY_DIR}/objfun.c
+    ${MICROPY_PY_DIR}/objgenerator.c
+    ${MICROPY_PY_DIR}/objgetitemiter.c
+    ${MICROPY_PY_DIR}/objint.c
+    ${MICROPY_PY_DIR}/objint_longlong.c
+    ${MICROPY_PY_DIR}/objint_mpz.c
+    ${MICROPY_PY_DIR}/objlist.c
+    ${MICROPY_PY_DIR}/objmap.c
+    ${MICROPY_PY_DIR}/objmodule.c
+    ${MICROPY_PY_DIR}/objnamedtuple.c
+    ${MICROPY_PY_DIR}/objnone.c
+    ${MICROPY_PY_DIR}/objobject.c
+    ${MICROPY_PY_DIR}/objpolyiter.c
+    ${MICROPY_PY_DIR}/objproperty.c
+    ${MICROPY_PY_DIR}/objrange.c
+    ${MICROPY_PY_DIR}/objreversed.c
+    ${MICROPY_PY_DIR}/objset.c
+    ${MICROPY_PY_DIR}/objsingleton.c
+    ${MICROPY_PY_DIR}/objslice.c
+    ${MICROPY_PY_DIR}/objstr.c
+    ${MICROPY_PY_DIR}/objstringio.c
+    ${MICROPY_PY_DIR}/objstrunicode.c
+    ${MICROPY_PY_DIR}/objtuple.c
+    ${MICROPY_PY_DIR}/objtype.c
+    ${MICROPY_PY_DIR}/objzip.c
+    ${MICROPY_PY_DIR}/opmethods.c
+    ${MICROPY_PY_DIR}/pairheap.c
+    ${MICROPY_PY_DIR}/parse.c
+    ${MICROPY_PY_DIR}/parsenum.c
+    ${MICROPY_PY_DIR}/parsenumbase.c
+    ${MICROPY_PY_DIR}/persistentcode.c
+    ${MICROPY_PY_DIR}/profile.c
+    ${MICROPY_PY_DIR}/pystack.c
+    ${MICROPY_PY_DIR}/qstr.c
+    ${MICROPY_PY_DIR}/reader.c
+    ${MICROPY_PY_DIR}/repl.c
+    ${MICROPY_PY_DIR}/ringbuf.c
+    ${MICROPY_PY_DIR}/runtime.c
+    ${MICROPY_PY_DIR}/runtime_utils.c
+    ${MICROPY_PY_DIR}/scheduler.c
+    ${MICROPY_PY_DIR}/scope.c
+    ${MICROPY_PY_DIR}/sequence.c
+    ${MICROPY_PY_DIR}/showbc.c
+    ${MICROPY_PY_DIR}/smallint.c
+    ${MICROPY_PY_DIR}/stackctrl.c
+    ${MICROPY_PY_DIR}/stream.c
+    ${MICROPY_PY_DIR}/unicode.c
+    ${MICROPY_PY_DIR}/vm.c
+    ${MICROPY_PY_DIR}/vstr.c
+    ${MICROPY_PY_DIR}/warning.c
+)

From 9b9088214687221d06f75a2932e9e0bd1c1b4103 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 23 Sep 2020 15:55:55 +1000
Subject: [PATCH 0603/3533] esp32: Add support to build using IDF with cmake.

This commit adds support for building the esp32 port with cmake, and in
particular it builds MicroPython as a component within the ESP-IDF.  Using
cmake and the ESP-IDF build infrastructure makes it much easier to maintain
the port, especially with the various new ESP32 MCUs and their required
toolchains.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/CMakeLists.txt                    |  38 ++++
 .../esp32/boards/GENERIC/mpconfigboard.cmake  |   2 +
 .../boards/GENERIC_D2WD/mpconfigboard.cmake   |   6 +
 .../esp32/boards/GENERIC_D2WD/sdkconfig.board |   5 +
 .../boards/GENERIC_OTA/mpconfigboard.cmake    |   6 +
 .../esp32/boards/GENERIC_OTA/sdkconfig.board  |   2 +
 .../boards/GENERIC_SPIRAM/mpconfigboard.cmake |   6 +
 .../esp32/boards/TINYPICO/mpconfigboard.cmake |   8 +
 ports/esp32/boards/sdkconfig.base             |   5 +
 ports/esp32/main/CMakeLists.txt               | 168 ++++++++++++++++++
 10 files changed, 246 insertions(+)
 create mode 100644 ports/esp32/CMakeLists.txt
 create mode 100644 ports/esp32/boards/GENERIC/mpconfigboard.cmake
 create mode 100644 ports/esp32/boards/GENERIC_D2WD/mpconfigboard.cmake
 create mode 100644 ports/esp32/boards/GENERIC_D2WD/sdkconfig.board
 create mode 100644 ports/esp32/boards/GENERIC_OTA/mpconfigboard.cmake
 create mode 100644 ports/esp32/boards/GENERIC_SPIRAM/mpconfigboard.cmake
 create mode 100644 ports/esp32/boards/TINYPICO/mpconfigboard.cmake
 create mode 100644 ports/esp32/main/CMakeLists.txt

diff --git a/ports/esp32/CMakeLists.txt b/ports/esp32/CMakeLists.txt
new file mode 100644
index 0000000000000..fa419202f90d0
--- /dev/null
+++ b/ports/esp32/CMakeLists.txt
@@ -0,0 +1,38 @@
+# Top-level cmake file for building MicroPython on ESP32.
+
+cmake_minimum_required(VERSION 3.5)
+
+# Set the location of this port's directory.
+set(MICROPY_PORT_DIR ${CMAKE_SOURCE_DIR})
+
+# Set the board if it's not already set.
+if(NOT MICROPY_BOARD)
+    set(MICROPY_BOARD GENERIC)
+endif()
+
+# Set the board directory and check that it exists.
+if(NOT MICROPY_BOARD_DIR)
+    set(MICROPY_BOARD_DIR ${MICROPY_PORT_DIR}/boards/${MICROPY_BOARD})
+endif()
+if(NOT EXISTS ${MICROPY_BOARD_DIR}/mpconfigboard.cmake)
+    message(FATAL_ERROR "Invalid MICROPY_BOARD specified: ${MICROPY_BOARD}")
+endif()
+
+# Define the output sdkconfig so it goes in the build directory.
+set(SDKCONFIG ${CMAKE_BINARY_DIR}/sdkconfig)
+
+# Include board config; this is expected to set SDKCONFIG_DEFAULTS (among other options).
+include(${MICROPY_BOARD_DIR}/mpconfigboard.cmake)
+
+# Concatenate all sdkconfig files into a combined one for the IDF to use.
+file(WRITE ${CMAKE_BINARY_DIR}/sdkconfig.combined.in "")
+foreach(SDKCONFIG_DEFAULT ${SDKCONFIG_DEFAULTS})
+    file(READ ${SDKCONFIG_DEFAULT} CONTENTS)
+    file(APPEND ${CMAKE_BINARY_DIR}/sdkconfig.combined.in "${CONTENTS}")
+endforeach()
+configure_file(${CMAKE_BINARY_DIR}/sdkconfig.combined.in ${CMAKE_BINARY_DIR}/sdkconfig.combined COPYONLY)
+set(SDKCONFIG_DEFAULTS ${CMAKE_BINARY_DIR}/sdkconfig.combined)
+
+# Include main IDF cmake file and define the project.
+include($ENV{IDF_PATH}/tools/cmake/project.cmake)
+project(micropython)
diff --git a/ports/esp32/boards/GENERIC/mpconfigboard.cmake b/ports/esp32/boards/GENERIC/mpconfigboard.cmake
new file mode 100644
index 0000000000000..8fea524555060
--- /dev/null
+++ b/ports/esp32/boards/GENERIC/mpconfigboard.cmake
@@ -0,0 +1,2 @@
+set(SDKCONFIG_DEFAULTS boards/sdkconfig.base)
+set(MICROPY_FROZEN_MANIFEST ${MICROPY_PORT_DIR}/boards/manifest.py)
diff --git a/ports/esp32/boards/GENERIC_D2WD/mpconfigboard.cmake b/ports/esp32/boards/GENERIC_D2WD/mpconfigboard.cmake
new file mode 100644
index 0000000000000..4e23666f15714
--- /dev/null
+++ b/ports/esp32/boards/GENERIC_D2WD/mpconfigboard.cmake
@@ -0,0 +1,6 @@
+set(SDKCONFIG_DEFAULTS
+    boards/sdkconfig.base
+    boards/GENERIC_D2WD/sdkconfig.board
+)
+
+set(MICROPY_FROZEN_MANIFEST ${MICROPY_PORT_DIR}/boards/manifest.py)
diff --git a/ports/esp32/boards/GENERIC_D2WD/sdkconfig.board b/ports/esp32/boards/GENERIC_D2WD/sdkconfig.board
new file mode 100644
index 0000000000000..367283ded3713
--- /dev/null
+++ b/ports/esp32/boards/GENERIC_D2WD/sdkconfig.board
@@ -0,0 +1,5 @@
+CONFIG_ESPTOOLPY_FLASHMODE_DIO=y
+CONFIG_ESPTOOLPY_FLASHFREQ_40M=y
+CONFIG_ESPTOOLPY_FLASHSIZE_2MB=y
+CONFIG_PARTITION_TABLE_CUSTOM=y
+CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions-2MiB.csv"
diff --git a/ports/esp32/boards/GENERIC_OTA/mpconfigboard.cmake b/ports/esp32/boards/GENERIC_OTA/mpconfigboard.cmake
new file mode 100644
index 0000000000000..7b1e1460054d7
--- /dev/null
+++ b/ports/esp32/boards/GENERIC_OTA/mpconfigboard.cmake
@@ -0,0 +1,6 @@
+set(SDKCONFIG_DEFAULTS
+    boards/sdkconfig.base
+    boards/GENERIC_OTA/sdkconfig.board
+)
+
+set(MICROPY_FROZEN_MANIFEST ${MICROPY_PORT_DIR}/boards/manifest.py)
diff --git a/ports/esp32/boards/GENERIC_OTA/sdkconfig.board b/ports/esp32/boards/GENERIC_OTA/sdkconfig.board
index b0ed171d811a5..ca1f4276f4560 100644
--- a/ports/esp32/boards/GENERIC_OTA/sdkconfig.board
+++ b/ports/esp32/boards/GENERIC_OTA/sdkconfig.board
@@ -1,4 +1,6 @@
 CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE=y
+CONFIG_PARTITION_TABLE_CUSTOM=y
+CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions-ota.csv"
 
 # ESP-IDF v3:
 CONFIG_APP_ROLLBACK_ENABLE=y
diff --git a/ports/esp32/boards/GENERIC_SPIRAM/mpconfigboard.cmake b/ports/esp32/boards/GENERIC_SPIRAM/mpconfigboard.cmake
new file mode 100644
index 0000000000000..bb441d9ebf543
--- /dev/null
+++ b/ports/esp32/boards/GENERIC_SPIRAM/mpconfigboard.cmake
@@ -0,0 +1,6 @@
+set(SDKCONFIG_DEFAULTS
+    boards/sdkconfig.base
+    boards/sdkconfig.spiram
+)
+
+set(MICROPY_FROZEN_MANIFEST ${MICROPY_PORT_DIR}/boards/manifest.py)
diff --git a/ports/esp32/boards/TINYPICO/mpconfigboard.cmake b/ports/esp32/boards/TINYPICO/mpconfigboard.cmake
new file mode 100644
index 0000000000000..990e3e035b9c0
--- /dev/null
+++ b/ports/esp32/boards/TINYPICO/mpconfigboard.cmake
@@ -0,0 +1,8 @@
+set(SDKCONFIG_DEFAULTS
+    boards/sdkconfig.base
+    boards/sdkconfig.240mhz
+    boards/sdkconfig.spiram
+    boards/TINYPICO/sdkconfig.board
+)
+
+set(MICROPY_FROZEN_MANIFEST ${MICROPY_BOARD_DIR}/manifest.py)
diff --git a/ports/esp32/boards/sdkconfig.base b/ports/esp32/boards/sdkconfig.base
index 67e2424a1246d..de6e42c8f3139 100644
--- a/ports/esp32/boards/sdkconfig.base
+++ b/ports/esp32/boards/sdkconfig.base
@@ -51,3 +51,8 @@ CONFIG_PPP_SUPPORT=y
 CONFIG_PPP_PAP_SUPPORT=y
 CONFIG_PPP_CHAP_SUPPORT=y
 CONFIG_ULP_COPROC_ENABLED=y
+
+# For cmake build
+CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
+CONFIG_PARTITION_TABLE_CUSTOM=y
+CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv"
diff --git a/ports/esp32/main/CMakeLists.txt b/ports/esp32/main/CMakeLists.txt
new file mode 100644
index 0000000000000..a46e0112c9b88
--- /dev/null
+++ b/ports/esp32/main/CMakeLists.txt
@@ -0,0 +1,168 @@
+# Set location of base MicroPython directory.
+get_filename_component(MICROPY_DIR ${PROJECT_DIR}/../.. ABSOLUTE)
+
+# Include core source components.
+include(${MICROPY_DIR}/py/py.cmake)
+include(${MICROPY_DIR}/extmod/extmod.cmake)
+
+set(MICROPY_SOURCE_EXTMOD_EXTRA
+    ${MICROPY_DIR}/extmod/modonewire.c
+)
+
+set(MICROPY_SOURCE_LIB
+    ${MICROPY_DIR}/lib/littlefs/lfs1.c
+    ${MICROPY_DIR}/lib/littlefs/lfs1_util.c
+    ${MICROPY_DIR}/lib/littlefs/lfs2.c
+    ${MICROPY_DIR}/lib/littlefs/lfs2_util.c
+    ${MICROPY_DIR}/lib/mbedtls_errors/mp_mbedtls_errors.c
+    ${MICROPY_DIR}/lib/mp-readline/readline.c
+    ${MICROPY_DIR}/lib/netutils/netutils.c
+    ${MICROPY_DIR}/lib/oofatfs/ff.c
+    ${MICROPY_DIR}/lib/oofatfs/ffunicode.c
+    ${MICROPY_DIR}/lib/timeutils/timeutils.c
+    ${MICROPY_DIR}/lib/utils/interrupt_char.c
+    ${MICROPY_DIR}/lib/utils/stdout_helpers.c
+    ${MICROPY_DIR}/lib/utils/sys_stdio_mphal.c
+    ${MICROPY_DIR}/lib/utils/pyexec.c
+)
+
+set(MICROPY_SOURCE_DRIVERS
+    ${MICROPY_DIR}/drivers/bus/softspi.c
+    ${MICROPY_DIR}/drivers/dht/dht.c
+)
+
+set(MICROPY_SOURCE_PORT
+    ${PROJECT_DIR}/main.c
+    ${PROJECT_DIR}/uart.c
+    ${PROJECT_DIR}/gccollect.c
+    ${PROJECT_DIR}/mphalport.c
+    ${PROJECT_DIR}/fatfs_port.c
+    ${PROJECT_DIR}/help.c
+    ${PROJECT_DIR}/modutime.c
+    ${PROJECT_DIR}/moduos.c
+    ${PROJECT_DIR}/machine_timer.c
+    ${PROJECT_DIR}/machine_pin.c
+    ${PROJECT_DIR}/machine_touchpad.c
+    ${PROJECT_DIR}/machine_adc.c
+    ${PROJECT_DIR}/machine_dac.c
+    ${PROJECT_DIR}/machine_i2c.c
+    ${PROJECT_DIR}/machine_pwm.c
+    ${PROJECT_DIR}/machine_uart.c
+    ${PROJECT_DIR}/modmachine.c
+    ${PROJECT_DIR}/modnetwork.c
+    ${PROJECT_DIR}/network_lan.c
+    ${PROJECT_DIR}/network_ppp.c
+    ${PROJECT_DIR}/mpnimbleport.c
+    ${PROJECT_DIR}/modsocket.c
+    ${PROJECT_DIR}/modesp.c
+    ${PROJECT_DIR}/esp32_partition.c
+    ${PROJECT_DIR}/esp32_rmt.c
+    ${PROJECT_DIR}/esp32_ulp.c
+    ${PROJECT_DIR}/modesp32.c
+    ${PROJECT_DIR}/espneopixel.c
+    ${PROJECT_DIR}/machine_hw_spi.c
+    ${PROJECT_DIR}/machine_wdt.c
+    ${PROJECT_DIR}/mpthreadport.c
+    ${PROJECT_DIR}/machine_rtc.c
+    ${PROJECT_DIR}/machine_sdcard.c
+)
+
+set(MICROPY_SOURCE_QSTR
+    ${MICROPY_SOURCE_PY}
+    ${MICROPY_SOURCE_EXTMOD}
+    ${MICROPY_SOURCE_EXTMOD_EXTRA}
+    ${MICROPY_SOURCE_LIB}
+    ${MICROPY_SOURCE_PORT}
+)
+
+set(IDF_COMPONENTS
+    app_update
+    bootloader_support
+    driver
+    esp32
+    esp_common
+    esp_eth
+    esp_event
+    esp_ringbuf
+    esp_rom
+    esp_wifi
+    freertos
+    heap
+    log
+    lwip
+    mbedtls
+    mdns
+    newlib
+    nvs_flash
+    sdmmc
+    soc
+    spi_flash
+    tcpip_adapter
+    ulp
+    vfs
+    xtensa
+)
+
+# Register the main IDF component.
+idf_component_register(
+    SRCS
+        ${MICROPY_SOURCE_PY}
+        ${MICROPY_SOURCE_EXTMOD}
+        ${MICROPY_SOURCE_EXTMOD_EXTRA}
+        ${MICROPY_SOURCE_LIB}
+        ${MICROPY_SOURCE_DRIVERS}
+        ${MICROPY_SOURCE_PORT}
+    INCLUDE_DIRS
+        ${MICROPY_DIR}
+        ${MICROPY_PORT_DIR}
+        ${MICROPY_BOARD_DIR}
+        ${CMAKE_BINARY_DIR}
+    REQUIRES
+        ${IDF_COMPONENTS}
+)
+
+# Set the MicroPython target as the current (main) IDF component target.
+set(MICROPY_TARGET ${COMPONENT_TARGET})
+
+# Define mpy-cross flags, for use with frozen code.
+set(MICROPY_CROSS_FLAGS -march=xtensawin)
+
+# Set compile options for this port.
+target_compile_definitions(${MICROPY_TARGET} PUBLIC
+    MICROPY_ESP_IDF_4=1
+    MICROPY_VFS_FAT=1
+    MICROPY_VFS_LFS2=1
+    FFCONF_H=\"${MICROPY_OOFATFS_DIR}/ffconf.h\"
+    LFS1_NO_MALLOC LFS1_NO_DEBUG LFS1_NO_WARN LFS1_NO_ERROR LFS1_NO_ASSERT
+    LFS2_NO_MALLOC LFS2_NO_DEBUG LFS2_NO_WARN LFS2_NO_ERROR LFS2_NO_ASSERT
+)
+
+# Disable some warnings to keep the build output clean.
+target_compile_options(${MICROPY_TARGET} PUBLIC
+    -Wno-clobbered
+    -Wno-deprecated-declarations
+    -Wno-missing-field-initializers
+)
+
+# Collect all of the include directories and compile definitions for the IDF components.
+foreach(comp ${IDF_COMPONENTS})
+    get_target_property(type __idf_${comp} TYPE)
+    set(_inc OFF)
+    set(_def OFF)
+    if(${type} STREQUAL STATIC_LIBRARY)
+        get_target_property(_inc __idf_${comp} INCLUDE_DIRECTORIES)
+        get_target_property(_def __idf_${comp} COMPILE_DEFINITIONS)
+    elseif(${type} STREQUAL INTERFACE_LIBRARY)
+        get_target_property(_inc __idf_${comp} INTERFACE_INCLUDE_DIRECTORIES)
+        get_target_property(_def __idf_${comp} INTERFACE_COMPILE_DEFINITIONS)
+    endif()
+    if(_inc)
+        list(APPEND MICROPY_CPP_INC_EXTRA ${_inc})
+    endif()
+    if(_def)
+        list(APPEND MICROPY_CPP_DEF_EXTRA ${_def})
+    endif()
+endforeach()
+
+# Include the main MicroPython cmake rules.
+include(${MICROPY_DIR}/py/mkrules.cmake)

From 9c2231f47ad1d30d3436561dfbeefd44c7a3e2f9 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 6 Oct 2020 18:06:09 +1100
Subject: [PATCH 0604/3533] esp32/esp32_rmt: Don't do unnecessary check for
 unsigned less than zero.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/esp32_rmt.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/esp32/esp32_rmt.c b/ports/esp32/esp32_rmt.c
index 7971ca5d1c5af..b547af5539f34 100644
--- a/ports/esp32/esp32_rmt.c
+++ b/ports/esp32/esp32_rmt.c
@@ -209,7 +209,7 @@ STATIC mp_obj_t esp32_rmt_write_pulses(size_t n_args, const mp_obj_t *pos_args,
     mp_obj_t pulses = args[1].u_obj;
     mp_uint_t start = args[2].u_int;
 
-    if (start < 0 || start > 1) {
+    if (start > 1) {
         mp_raise_ValueError(MP_ERROR_TEXT("start must be 0 or 1"));
     }
 

From 97072b72246abd69ee0d5892f8571bb4d13609a9 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 28 Oct 2020 14:28:17 +1100
Subject: [PATCH 0605/3533] esp32: Add explicit initialisers to silence
 compiler warnings.

This makes no functional change.  See similar commit
9aa58cf8bac353297ff5e7b4f3331e5618046095

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/machine_i2c.c | 2 +-
 ports/esp32/modnetwork.c  | 2 +-
 ports/esp32/mphalport.c   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ports/esp32/machine_i2c.c b/ports/esp32/machine_i2c.c
index 87b08fc9bc6e6..3993c7b52b9bb 100644
--- a/ports/esp32/machine_i2c.c
+++ b/ports/esp32/machine_i2c.c
@@ -120,7 +120,7 @@ mp_obj_t machine_hw_i2c_make_new(const mp_obj_type_t *type, size_t n_args, size_
     // Parse args
     enum { ARG_id, ARG_scl, ARG_sda, ARG_freq, ARG_timeout };
     static const mp_arg_t allowed_args[] = {
-        { MP_QSTR_id, MP_ARG_REQUIRED | MP_ARG_OBJ },
+        { MP_QSTR_id, MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
         { MP_QSTR_scl, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
         { MP_QSTR_sda, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
         { MP_QSTR_freq, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 400000} },
diff --git a/ports/esp32/modnetwork.c b/ports/esp32/modnetwork.c
index 64f1c91dc7922..d981b60805007 100644
--- a/ports/esp32/modnetwork.c
+++ b/ports/esp32/modnetwork.c
@@ -331,7 +331,7 @@ STATIC mp_obj_t esp_connect(size_t n_args, const mp_obj_t *pos_args, mp_map_t *k
     mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
     mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
 
-    wifi_config_t wifi_sta_config = {{{0}}};
+    wifi_config_t wifi_sta_config = {0};
 
     // configure any parameters that are given
     if (n_args > 1) {
diff --git a/ports/esp32/mphalport.c b/ports/esp32/mphalport.c
index ad571bf961886..54033826847ba 100644
--- a/ports/esp32/mphalport.c
+++ b/ports/esp32/mphalport.c
@@ -52,7 +52,7 @@
 TaskHandle_t mp_main_task_handle;
 
 STATIC uint8_t stdin_ringbuf_array[256];
-ringbuf_t stdin_ringbuf = {stdin_ringbuf_array, sizeof(stdin_ringbuf_array)};
+ringbuf_t stdin_ringbuf = {stdin_ringbuf_array, sizeof(stdin_ringbuf_array), 0, 0};
 
 // Check the ESP-IDF error code and raise an OSError if it's not ESP_OK.
 void check_esp_err(esp_err_t code) {

From 9f035d6bb71e35ff9acd05b65dbc751887f03af2 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sun, 14 Feb 2021 00:52:35 +1100
Subject: [PATCH 0606/3533] esp32: Remove traditional "make" capability.

It's now replaced by cmake/idf.py.  But a convenience Makefile is still
provided with traditional targets like "all" and "deploy".

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/Makefile                          | 979 +-----------------
 ports/esp32/boards/GENERIC/mpconfigboard.mk   |   1 -
 .../boards/GENERIC_D2WD/mpconfigboard.mk      |   5 -
 .../esp32/boards/GENERIC_OTA/mpconfigboard.mk |   4 -
 .../boards/GENERIC_SPIRAM/mpconfigboard.mk    |   2 -
 ports/esp32/boards/TINYPICO/mpconfigboard.mk  |   8 -
 6 files changed, 25 insertions(+), 974 deletions(-)
 delete mode 100644 ports/esp32/boards/GENERIC/mpconfigboard.mk
 delete mode 100644 ports/esp32/boards/GENERIC_D2WD/mpconfigboard.mk
 delete mode 100644 ports/esp32/boards/GENERIC_OTA/mpconfigboard.mk
 delete mode 100644 ports/esp32/boards/GENERIC_SPIRAM/mpconfigboard.mk
 delete mode 100644 ports/esp32/boards/TINYPICO/mpconfigboard.mk

diff --git a/ports/esp32/Makefile b/ports/esp32/Makefile
index 756bc8f8940c5..1249795993614 100644
--- a/ports/esp32/Makefile
+++ b/ports/esp32/Makefile
@@ -1,972 +1,43 @@
-# Select the board to build for: if not given on the command line,
-# then default to GENERIC.
+# Makefile for MicroPython on ESP32.
+#
+# This is a simple, convenience wrapper around idf.py (which uses cmake).
+
+# Select the board to build for, defaulting to GENERIC.
 BOARD ?= GENERIC
 
 # If the build directory is not given, make it reflect the board name.
 BUILD ?= build-$(BOARD)
 
-BOARD_DIR ?= boards/$(BOARD)
-ifeq ($(wildcard $(BOARD_DIR)/.),)
-$(error Invalid BOARD specified: $(BOARD_DIR))
-endif
-
-include ../../py/mkenv.mk
-
-# Optional (not currently used for ESP32)
--include mpconfigport.mk
-
-ifneq ($(SDKCONFIG),)
-$(error Use the BOARD variable instead of SDKCONFIG)
-endif
-
-# Expected to set SDKCONFIG
-include $(BOARD_DIR)/mpconfigboard.mk
-
-# qstr definitions (must come before including py.mk)
-QSTR_DEFS = qstrdefsport.h
-QSTR_GLOBAL_DEPENDENCIES = $(BOARD_DIR)/mpconfigboard.h
-QSTR_GLOBAL_REQUIREMENTS = $(SDKCONFIG_H)
-
-# MicroPython feature configurations
-MICROPY_ROM_TEXT_COMPRESSION ?= 1
-MICROPY_PY_USSL = 0
-MICROPY_SSL_AXTLS = 0
-MICROPY_PY_BTREE = 1
-MICROPY_VFS_FAT = 1
-MICROPY_VFS_LFS2 = 1
-
-FROZEN_MANIFEST ?= boards/manifest.py
-
-# include py core make definitions
-include $(TOP)/py/py.mk
-
-GIT_SUBMODULES = lib/berkeley-db-1.xx
-
+# Device serial settings.
 PORT ?= /dev/ttyUSB0
 BAUD ?= 460800
-FLASH_MODE ?= dio
-FLASH_FREQ ?= 40m
-FLASH_SIZE ?= 4MB
-CROSS_COMPILE ?= xtensa-esp32-elf-
-OBJDUMP = $(CROSS_COMPILE)objdump
-
-SDKCONFIG_COMBINED = $(BUILD)/sdkconfig.combined
-SDKCONFIG_H = $(BUILD)/sdkconfig.h
-
-# The git hash of the currently supported ESP IDF version.
-# These correspond to v3.3.2 and v4.0.1.
-ESPIDF_SUPHASH_V3 := 9e70825d1e1cbf7988cf36981774300066580ea7
-ESPIDF_SUPHASH_V4 := 4c81978a3e2220674a432a588292a4c860eef27b
-
-define print_supported_git_hash
-$(info Supported git hash (v3.3): $(ESPIDF_SUPHASH_V3))
-$(info Supported git hash (v4.0) (experimental): $(ESPIDF_SUPHASH_V4))
-endef
-
-# paths to ESP IDF and its components
-ifeq ($(ESPIDF),)
-ifneq ($(IDF_PATH),)
-ESPIDF = $(IDF_PATH)
-else
-$(info The ESPIDF variable has not been set, please set it to the root of the esp-idf repository.)
-$(info See README.md for installation instructions.)
-dummy := $(call print_supported_git_hash)
-$(error ESPIDF not set)
-endif
-endif
-
-ESPCOMP = $(ESPIDF)/components
-ESPTOOL ?= $(ESPCOMP)/esptool_py/esptool/esptool.py
-ESPCOMP_KCONFIGS = $(shell find $(ESPCOMP) -name Kconfig)
-ESPCOMP_KCONFIGS_PROJBUILD = $(shell find $(ESPCOMP) -name Kconfig.projbuild)
-
-# verify the ESP IDF version
-ESPIDF_CURHASH := $(shell git -C $(ESPIDF) show -s --pretty=format:'%H')
-
-ifeq ($(ESPIDF_CURHASH),$(ESPIDF_SUPHASH_V3))
-$(info Building with ESP IDF v3)
-else ifeq ($(ESPIDF_CURHASH),$(ESPIDF_SUPHASH_V4))
-$(info Building with ESP IDF v4)
-
-PYPARSING_VERSION = $(shell python3 -c 'import pyparsing; print(pyparsing.__version__)')
-ifneq ($(PYPARSING_VERSION),2.3.1)
-$(info ** ERROR **)
-$(info EDP IDF requires pyparsing version less than 2.4)
-$(info You will need to set up a Python virtual environment with pyparsing 2.3.1)
-$(info Please see README.md for more information)
-$(error Incorrect pyparsing version)
-endif
-else
-$(info ** WARNING **)
-$(info The git hash of ESP IDF does not match the supported version)
-$(info The build may complete and the firmware may work but it is not guaranteed)
-$(info ESP IDF path:       $(ESPIDF))
-$(info Current git hash:   $(ESPIDF_CURHASH))
-dummy := $(call print_supported_git_hash)
-endif
-
-# pretty format of ESP IDF version, used internally by the IDF
-IDF_VER := $(shell git -C $(ESPIDF) describe)
-
-ifeq ($(shell which $(CC) 2> /dev/null),)
-$(info ** ERROR **)
-$(info Cannot find C compiler $(CC))
-$(info Add the xtensa toolchain to your PATH. See README.md)
-$(error C compiler missing)
-endif
-
-# Support BLE by default.
-# Can be explicitly disabled on the command line or board config.
-MICROPY_PY_BLUETOOTH ?= 1
-ifeq ($(MICROPY_PY_BLUETOOTH),1)
-SDKCONFIG += boards/sdkconfig.ble
-
-# Use NimBLE on ESP32.
-MICROPY_BLUETOOTH_NIMBLE ?= 1
-# Use Nimble bindings, but ESP32 IDF provides the Nimble library.
-MICROPY_BLUETOOTH_NIMBLE_BINDINGS_ONLY = 1
-include $(TOP)/extmod/nimble/nimble.mk
-endif
-
-# include sdkconfig to get needed configuration values
-include $(SDKCONFIG)
-
-################################################################################
-# Compiler and linker flags
-
-INC += -I.
-INC += -I$(TOP)
-INC += -I$(BUILD)
-
-INC_ESPCOMP += -I$(ESPCOMP)/bootloader_support/include
-INC_ESPCOMP += -I$(ESPCOMP)/bootloader_support/include_bootloader
-INC_ESPCOMP += -I$(ESPCOMP)/console
-INC_ESPCOMP += -I$(ESPCOMP)/driver/include
-INC_ESPCOMP += -I$(ESPCOMP)/driver/include/driver
-INC_ESPCOMP += -I$(ESPCOMP)/efuse/include
-INC_ESPCOMP += -I$(ESPCOMP)/efuse/esp32/include
-INC_ESPCOMP += -I$(ESPCOMP)/esp32/include
-INC_ESPCOMP += -I$(ESPCOMP)/espcoredump/include
-INC_ESPCOMP += -I$(ESPCOMP)/soc/include
-INC_ESPCOMP += -I$(ESPCOMP)/soc/esp32/include
-INC_ESPCOMP += -I$(ESPCOMP)/heap/include
-INC_ESPCOMP += -I$(ESPCOMP)/log/include
-INC_ESPCOMP += -I$(ESPCOMP)/nvs_flash/include
-INC_ESPCOMP += -I$(ESPCOMP)/freertos/include
-INC_ESPCOMP += -I$(ESPCOMP)/esp_ringbuf/include
-INC_ESPCOMP += -I$(ESPCOMP)/esp_event/include
-INC_ESPCOMP += -I$(ESPCOMP)/tcpip_adapter/include
-INC_ESPCOMP += -I$(ESPCOMP)/lwip/lwip/src/include
-INC_ESPCOMP += -I$(ESPCOMP)/lwip/port/esp32/include
-INC_ESPCOMP += -I$(ESPCOMP)/lwip/include/apps
-INC_ESPCOMP += -I$(ESPCOMP)/lwip/include/apps/sntp
-INC_ESPCOMP += -I$(ESPCOMP)/mbedtls/mbedtls/include
-INC_ESPCOMP += -I$(ESPCOMP)/mbedtls/port/include
-INC_ESPCOMP += -I$(ESPCOMP)/mdns/include
-INC_ESPCOMP += -I$(ESPCOMP)/mdns/private_include
-INC_ESPCOMP += -I$(ESPCOMP)/spi_flash/include
-INC_ESPCOMP += -I$(ESPCOMP)/ulp/include
-INC_ESPCOMP += -I$(ESPCOMP)/vfs/include
-INC_ESPCOMP += -I$(ESPCOMP)/xtensa-debug-module/include
-INC_ESPCOMP += -I$(ESPCOMP)/wpa_supplicant/include
-INC_ESPCOMP += -I$(ESPCOMP)/wpa_supplicant/port/include
-INC_ESPCOMP += -I$(ESPCOMP)/app_trace/include
-INC_ESPCOMP += -I$(ESPCOMP)/app_update/include
-INC_ESPCOMP += -I$(ESPCOMP)/pthread/include
-INC_ESPCOMP += -I$(ESPCOMP)/smartconfig_ack/include
-INC_ESPCOMP += -I$(ESPCOMP)/sdmmc/include
-
-ifeq ($(ESPIDF_CURHASH),$(ESPIDF_SUPHASH_V4))
-INC_ESPCOMP += -I$(ESPCOMP)/esp_common/include
-INC_ESPCOMP += -I$(ESPCOMP)/esp_eth/include
-INC_ESPCOMP += -I$(ESPCOMP)/esp_event/private_include
-INC_ESPCOMP += -I$(ESPCOMP)/esp_rom/include
-INC_ESPCOMP += -I$(ESPCOMP)/esp_wifi/include
-INC_ESPCOMP += -I$(ESPCOMP)/esp_wifi/esp32/include
-INC_ESPCOMP += -I$(ESPCOMP)/lwip/include/apps/sntp
-INC_ESPCOMP += -I$(ESPCOMP)/spi_flash/private_include
-INC_ESPCOMP += -I$(ESPCOMP)/wpa_supplicant/include/esp_supplicant
-INC_ESPCOMP += -I$(ESPCOMP)/xtensa/include
-INC_ESPCOMP += -I$(ESPCOMP)/xtensa/esp32/include
-ifeq ($(CONFIG_BT_NIMBLE_ENABLED),y)
-INC_ESPCOMP += -I$(ESPCOMP)/bt/include
-INC_ESPCOMP += -I$(ESPCOMP)/bt/common/osi/include
-INC_ESPCOMP += -I$(ESPCOMP)/bt/common/btc/include
-INC_ESPCOMP += -I$(ESPCOMP)/bt/common/include
-INC_ESPCOMP += -I$(ESPCOMP)/bt/host/nimble/nimble/porting/nimble/include
-INC_ESPCOMP += -I$(ESPCOMP)/bt/host/nimble/port/include
-INC_ESPCOMP += -I$(ESPCOMP)/bt/host/nimble/nimble/nimble/include
-INC_ESPCOMP += -I$(ESPCOMP)/bt/host/nimble/nimble/nimble/host/include
-INC_ESPCOMP += -I$(ESPCOMP)/bt/host/nimble/nimble/nimble/host/services/ans/include
-INC_ESPCOMP += -I$(ESPCOMP)/bt/host/nimble/nimble/nimble/host/services/bas/include
-INC_ESPCOMP += -I$(ESPCOMP)/bt/host/nimble/nimble/nimble/host/services/gap/include
-INC_ESPCOMP += -I$(ESPCOMP)/bt/host/nimble/nimble/nimble/host/services/gatt/include
-INC_ESPCOMP += -I$(ESPCOMP)/bt/host/nimble/nimble/nimble/host/services/ias/include
-INC_ESPCOMP += -I$(ESPCOMP)/bt/host/nimble/nimble/nimble/host/services/lls/include
-INC_ESPCOMP += -I$(ESPCOMP)/bt/host/nimble/nimble/nimble/host/services/tps/include
-INC_ESPCOMP += -I$(ESPCOMP)/bt/host/nimble/nimble/nimble/host/util/include
-INC_ESPCOMP += -I$(ESPCOMP)/bt/host/nimble/nimble/nimble/host/store/ram/include
-INC_ESPCOMP += -I$(ESPCOMP)/bt/host/nimble/nimble/nimble/host/store/config/include
-INC_ESPCOMP += -I$(ESPCOMP)/bt/host/nimble/nimble/porting/npl/freertos/include
-INC_ESPCOMP += -I$(ESPCOMP)/bt/host/nimble/nimble/ext/tinycrypt/include
-INC_ESPCOMP += -I$(ESPCOMP)/bt/host/nimble/esp-hci/include
-endif
-else
-INC_ESPCOMP += -I$(ESPCOMP)/ethernet/include
-INC_ESPCOMP += -I$(ESPCOMP)/expat/expat/expat/lib
-INC_ESPCOMP += -I$(ESPCOMP)/expat/port/include
-INC_ESPCOMP += -I$(ESPCOMP)/json/include
-INC_ESPCOMP += -I$(ESPCOMP)/json/port/include
-INC_ESPCOMP += -I$(ESPCOMP)/micro-ecc/micro-ecc
-INC_ESPCOMP += -I$(ESPCOMP)/nghttp/port/include
-INC_ESPCOMP += -I$(ESPCOMP)/nghttp/nghttp2/lib/includes
-ifeq ($(CONFIG_NIMBLE_ENABLED),y)
-INC_ESPCOMP += -I$(ESPCOMP)/bt/include
-INC_ESPCOMP += -I$(ESPCOMP)/nimble/nimble/porting/nimble/include
-INC_ESPCOMP += -I$(ESPCOMP)/nimble/port/include
-INC_ESPCOMP += -I$(ESPCOMP)/nimble/nimble/nimble/include
-INC_ESPCOMP += -I$(ESPCOMP)/nimble/nimble/nimble/host/include
-INC_ESPCOMP += -I$(ESPCOMP)/nimble/nimble/nimble/host/services/ans/include
-INC_ESPCOMP += -I$(ESPCOMP)/nimble/nimble/nimble/host/services/bas/include
-INC_ESPCOMP += -I$(ESPCOMP)/nimble/nimble/nimble/host/services/gap/include
-INC_ESPCOMP += -I$(ESPCOMP)/nimble/nimble/nimble/host/services/gatt/include
-INC_ESPCOMP += -I$(ESPCOMP)/nimble/nimble/nimble/host/services/ias/include
-INC_ESPCOMP += -I$(ESPCOMP)/nimble/nimble/nimble/host/services/lls/include
-INC_ESPCOMP += -I$(ESPCOMP)/nimble/nimble/nimble/host/services/tps/include
-INC_ESPCOMP += -I$(ESPCOMP)/nimble/nimble/nimble/host/util/include
-INC_ESPCOMP += -I$(ESPCOMP)/nimble/nimble/nimble/host/store/ram/include
-INC_ESPCOMP += -I$(ESPCOMP)/nimble/nimble/nimble/host/store/config/include
-INC_ESPCOMP += -I$(ESPCOMP)/nimble/nimble/porting/npl/freertos/include
-INC_ESPCOMP += -I$(ESPCOMP)/nimble/nimble/ext/tinycrypt/include
-INC_ESPCOMP += -I$(ESPCOMP)/nimble/esp-hci/include
-endif
-endif
-
-INC_NEWLIB += -I$(ESPCOMP)/newlib/platform_include
-INC_NEWLIB += -I$(ESPCOMP)/newlib/include
-
-ifeq ($(MICROPY_PY_BLUETOOTH),1)
-CFLAGS_MOD += -DMICROPY_PY_BLUETOOTH=1
-CFLAGS_MOD += -DMICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE=1
-endif
-
-# these flags are common to C and C++ compilation
-CFLAGS_COMMON = -Os -ffunction-sections -fdata-sections -fstrict-volatile-bitfields \
-	-mlongcalls -nostdlib \
-	-Wall -Werror -Wno-error=unused-function -Wno-error=unused-but-set-variable \
-	-Wno-error=unused-variable -Wno-error=deprecated-declarations \
-	-DESP_PLATFORM
-
-CFLAGS_BASE = -std=gnu99 $(CFLAGS_COMMON) -DMBEDTLS_CONFIG_FILE='"mbedtls/esp_config.h"' -DHAVE_CONFIG_H
-CFLAGS = $(CFLAGS_BASE) $(INC) $(INC_ESPCOMP) $(INC_NEWLIB)
-CFLAGS += -DIDF_VER=\"$(IDF_VER)\"
-CFLAGS += $(CFLAGS_MOD) $(CFLAGS_EXTRA)
-CFLAGS += -I$(BOARD_DIR)
-
-ifeq ($(ESPIDF_CURHASH),$(ESPIDF_SUPHASH_V4))
-CFLAGS += -DMICROPY_ESP_IDF_4=1
-endif
-
-# this is what ESPIDF uses for c++ compilation
-CXXFLAGS = -std=gnu++11 $(CFLAGS_COMMON) $(INC) $(INC_ESPCOMP) $(CXXFLAGS_MOD)
-
-LDFLAGS = -nostdlib -Map=$(@:.elf=.map) --cref
-LDFLAGS += --gc-sections -static -EL
-LDFLAGS += -u call_user_start_cpu0 -u uxTopUsedPriority -u ld_include_panic_highint_hdl
-LDFLAGS += -u __cxa_guard_dummy # so that implementation of static guards is taken from cxx_guards.o instead of libstdc++.a
-LDFLAGS += -L$(ESPCOMP)/esp32/ld
-LDFLAGS += -L$(ESPCOMP)/esp_rom/esp32/ld
-LDFLAGS += -T $(BUILD)/esp32_out.ld
-LDFLAGS += -T $(BUILD)/esp32.project.ld
-LDFLAGS += -T esp32.rom.ld
-LDFLAGS += -T esp32.rom.libgcc.ld
-LDFLAGS += -T esp32.peripherals.ld
-
-LIBGCC_FILE_NAME = $(shell $(CC) $(CFLAGS) -print-libgcc-file-name)
-LIBSTDCXX_FILE_NAME = $(shell $(CXX) $(CXXFLAGS) -print-file-name=libstdc++.a)
-
-# Debugging/Optimization
-ifeq ($(DEBUG), 1)
-CFLAGS += -g
-COPT = -O0
-else
-#CFLAGS += -fdata-sections -ffunction-sections
-COPT += -Os -DNDEBUG
-#LDFLAGS += --gc-sections
-endif
-
-# Options for mpy-cross
-MPY_CROSS_FLAGS += -march=xtensawin
-
-# Enable SPIRAM support if CONFIG_ESP32_SPIRAM_SUPPORT=y in sdkconfig
-ifeq ($(CONFIG_ESP32_SPIRAM_SUPPORT),y)
-CFLAGS_COMMON += -mfix-esp32-psram-cache-issue
-LIBC_LIBM = $(ESPCOMP)/newlib/lib/libc-psram-workaround.a $(ESPCOMP)/newlib/lib/libm-psram-workaround.a
-else
-# Additional newlib symbols that can only be used with spiram disabled.
-ifeq ($(ESPIDF_CURHASH),$(ESPIDF_SUPHASH_V4))
-LDFLAGS += -T esp32.rom.newlib-funcs.ld
-LDFLAGS += -T esp32.rom.newlib-locale.ld
-LDFLAGS += -T esp32.rom.newlib-data.ld
-else
-LDFLAGS += -T esp32.rom.spiram_incompatible_fns.ld
-endif
-LIBC_LIBM = $(ESPCOMP)/newlib/lib/libc.a $(ESPCOMP)/newlib/lib/libm.a
-endif
-
-################################################################################
-# List of MicroPython source and object files
-
-SRC_C = \
-	main.c \
-	uart.c \
-	gccollect.c \
-	mphalport.c \
-	fatfs_port.c \
-	help.c \
-	modutime.c \
-	moduos.c \
-	machine_timer.c \
-	machine_pin.c \
-	machine_touchpad.c \
-	machine_adc.c \
-	machine_dac.c \
-	machine_i2c.c \
-	machine_pwm.c \
-	machine_uart.c \
-	modmachine.c \
-	modnetwork.c \
-	network_lan.c \
-	network_ppp.c \
-	mpnimbleport.c \
-	modsocket.c \
-	modesp.c \
-	esp32_partition.c \
-	esp32_rmt.c \
-	esp32_ulp.c \
-	modesp32.c \
-	espneopixel.c \
-	machine_hw_spi.c \
-	machine_wdt.c \
-	mpthreadport.c \
-	machine_rtc.c \
-	machine_sdcard.c \
-	$(wildcard $(BOARD_DIR)/*.c) \
-	$(SRC_MOD)
-
-SRC_CXX += \
-	$(SRC_MOD_CXX)
-
-EXTMOD_SRC_C += $(addprefix extmod/,\
-	modonewire.c \
-	)
-
-LIB_SRC_C = $(addprefix lib/,\
-	mbedtls_errors/mp_mbedtls_errors.c \
-	mp-readline/readline.c \
-	netutils/netutils.c \
-	timeutils/timeutils.c \
-	utils/pyexec.c \
-	utils/interrupt_char.c \
-	utils/sys_stdio_mphal.c \
-	)
-
-DRIVERS_SRC_C = $(addprefix drivers/,\
-	bus/softspi.c \
-	dht/dht.c \
-	)
-
-OBJ_MP =
-OBJ_MP += $(PY_O)
-OBJ_MP += $(addprefix $(BUILD)/, $(SRC_C:.c=.o))
-OBJ_MP += $(addprefix $(BUILD)/, $(SRC_CXX:.cpp=.o))
-OBJ_MP += $(addprefix $(BUILD)/, $(EXTMOD_SRC_C:.c=.o))
-OBJ_MP += $(addprefix $(BUILD)/, $(LIB_SRC_C:.c=.o))
-OBJ_MP += $(addprefix $(BUILD)/, $(DRIVERS_SRC_C:.c=.o))
-
-# Only enable this for the MicroPython source: ignore warnings from esp-idf.
-$(OBJ_MP): CFLAGS += -Wdouble-promotion -Wfloat-conversion
-
-# List of sources for qstr extraction
-SRC_QSTR += $(SRC_C) $(SRC_CXX) $(EXTMOD_SRC_C) $(LIB_SRC_C) $(DRIVERS_SRC_C)
-# Append any auto-generated sources that are needed by sources listed in SRC_QSTR
-SRC_QSTR_AUTO_DEPS +=
-
-################################################################################
-# Generate sdkconfig.h from sdkconfig
-
-$(SDKCONFIG_COMBINED): $(SDKCONFIG)
-	$(Q)$(MKDIR) -p $(dir $@)
-	$(Q)$(CAT) $^ > $@
-
-$(SDKCONFIG_H): $(SDKCONFIG_COMBINED)
-	$(ECHO) "GEN $@"
-	$(Q)$(MKDIR) -p $(dir $@)
-	$(Q)$(PYTHON) $(ESPIDF)/tools/kconfig_new/confgen.py \
-		--output header $@ \
-		--config $< \
-		--kconfig $(ESPIDF)/Kconfig \
-		--env "IDF_TARGET=esp32" \
-		--env "IDF_CMAKE=n" \
-		--env "COMPONENT_KCONFIGS=$(ESPCOMP_KCONFIGS)" \
-		--env "COMPONENT_KCONFIGS_PROJBUILD=$(ESPCOMP_KCONFIGS_PROJBUILD)" \
-		--env "IDF_PATH=$(ESPIDF)"
-	$(Q)touch $@
-
-$(HEADER_BUILD)/qstrdefs.generated.h: $(SDKCONFIG_H) $(BOARD_DIR)/mpconfigboard.h
-
-################################################################################
-# List of object files from the ESP32 IDF components
-
-ESPIDF_BOOTLOADER_SUPPORT_O = $(patsubst %.c,%.o,\
-	$(filter-out $(ESPCOMP)/bootloader_support/src/bootloader_init.c,\
-		$(wildcard $(ESPCOMP)/bootloader_support/src/*.c) \
-		$(wildcard $(ESPCOMP)/bootloader_support/src/idf/*.c) \
-		))
-
-ESPIDF_DRIVER_O = $(patsubst %.c,%.o,$(wildcard $(ESPCOMP)/driver/*.c))
-
-ESPIDF_EFUSE_O = $(patsubst %.c,%.o,\
-	$(wildcard $(ESPCOMP)/efuse/esp32/*.c)\
-	$(wildcard $(ESPCOMP)/efuse/src/*.c)\
-	)
-
-$(BUILD)/$(ESPCOMP)/esp32/dport_access.o: CFLAGS += -Wno-array-bounds
-ESPIDF_ESP32_O = \
-	$(patsubst %.c,%.o,$(wildcard $(ESPCOMP)/esp32/*.c)) \
-	$(patsubst %.c,%.o,$(wildcard $(ESPCOMP)/esp32/hwcrypto/*.c)) \
-	$(patsubst %.S,%.o,$(wildcard $(ESPCOMP)/esp32/*.S)) \
-
-ESPIDF_ESP_RINGBUF_O = $(patsubst %.c,%.o,$(wildcard $(ESPCOMP)/esp_ringbuf/*.c))
-
-ESPIDF_HEAP_O = $(patsubst %.c,%.o,$(wildcard $(ESPCOMP)/heap/*.c))
-
-ESPIDF_SOC_O = $(patsubst %.c,%.o,\
-	$(wildcard $(ESPCOMP)/soc/esp32/*.c) \
-	$(wildcard $(ESPCOMP)/soc/src/*.c) \
-	$(wildcard $(ESPCOMP)/soc/src/hal/*.c) \
-	)
-
-$(BUILD)/$(ESPCOMP)/cxx/cxx_guards.o: CXXFLAGS += -Wno-error=sign-compare
-ESPIDF_CXX_O = $(patsubst %.cpp,%.o,$(wildcard $(ESPCOMP)/cxx/*.cpp))
-
-ESPIDF_PTHREAD_O = $(patsubst %.c,%.o,$(wildcard $(ESPCOMP)/pthread/*.c))
-
-# Assembler .S files need only basic flags, and in particular should not have
-# -Os because that generates subtly different code.
-# We also need custom CFLAGS for .c files because FreeRTOS has headers with
-# generic names (eg queue.h) which can clash with other files in the port.
-ifeq ($(ESPIDF_CURHASH),$(ESPIDF_SUPHASH_V4))
-CFLAGS_ASM = -I$(BUILD) -I$(ESPCOMP)/esp32/include -I$(ESPCOMP)/soc/esp32/include -I$(ESPCOMP)/freertos/include/freertos -I. -I$(ESPCOMP)/xtensa/include -I$(ESPCOMP)/xtensa/esp32/include -I$(ESPCOMP)/esp_common/include
-else
-CFLAGS_ASM = -I$(BUILD) -I$(ESPCOMP)/esp32/include -I$(ESPCOMP)/soc/esp32/include -I$(ESPCOMP)/freertos/include/freertos -I.
-endif
-$(BUILD)/$(ESPCOMP)/freertos/portasm.o: CFLAGS = $(CFLAGS_ASM)
-$(BUILD)/$(ESPCOMP)/freertos/xtensa_context.o: CFLAGS = $(CFLAGS_ASM)
-$(BUILD)/$(ESPCOMP)/freertos/xtensa_intr_asm.o: CFLAGS = $(CFLAGS_ASM)
-$(BUILD)/$(ESPCOMP)/freertos/xtensa_vectors.o: CFLAGS = $(CFLAGS_ASM)
-$(BUILD)/$(ESPCOMP)/freertos/xtensa_vector_defaults.o: CFLAGS = $(CFLAGS_ASM)
-$(BUILD)/$(ESPCOMP)/freertos/%.o: CFLAGS = $(CFLAGS_BASE) -I. -I$(BUILD) $(INC_ESPCOMP) $(INC_NEWLIB) -I$(ESPCOMP)/freertos/include/freertos -D_ESP_FREERTOS_INTERNAL
-ESPIDF_FREERTOS_O = \
-	$(patsubst %.c,%.o,$(wildcard $(ESPCOMP)/freertos/*.c)) \
-	$(patsubst %.S,%.o,$(wildcard $(ESPCOMP)/freertos/*.S)) \
-
-ESPIDF_VFS_O = $(patsubst %.c,%.o,$(wildcard $(ESPCOMP)/vfs/*.c))
-
-ESPIDF_LOG_O = $(patsubst %.c,%.o,$(wildcard $(ESPCOMP)/log/*.c))
-
-ESPIDF_XTENSA_DEBUG_MODULE_O = $(patsubst %.c,%.o,$(wildcard $(ESPCOMP)/xtensa-debug-module/*.c))
-
-ESPIDF_TCPIP_ADAPTER_O = $(patsubst %.c,%.o,$(wildcard $(ESPCOMP)/tcpip_adapter/*.c))
-
-ESPIDF_APP_TRACE_O = $(patsubst %.c,%.o,$(wildcard $(ESPCOMP)/app_trace/*.c))
 
-ESPIDF_APP_UPDATE_O = $(patsubst %.c,%.o,$(wildcard $(ESPCOMP)/app_update/*.c))
+PYTHON ?= python3
 
-ESPIDF_NEWLIB_O = $(patsubst %.c,%.o,$(wildcard $(ESPCOMP)/newlib/*.c))
-
-$(BUILD)/$(ESPCOMP)/nvs_flash/src/nvs_api.o: CXXFLAGS += -Wno-error=sign-compare
-ESPIDF_NVS_FLASH_O = $(patsubst %.cpp,%.o,$(wildcard $(ESPCOMP)/nvs_flash/src/*.cpp))
-
-ESPIDF_SMARTCONFIG_ACK_O = $(patsubst %.c,%.o,$(wildcard $(ESPCOMP)/smartconfig_ack/*.c))
-
-ESPIDF_SPI_FLASH_O = $(patsubst %.c,%.o,$(wildcard $(ESPCOMP)/spi_flash/*.c))
-
-ESPIDF_ULP_O = $(patsubst %.c,%.o,$(wildcard $(ESPCOMP)/ulp/*.c))
-
-$(BUILD)/$(ESPCOMP)/lwip/%.o: CFLAGS += -Wno-address -Wno-unused-variable -Wno-unused-but-set-variable
-ESPIDF_LWIP_O = $(patsubst %.c,%.o,\
-	$(wildcard $(ESPCOMP)/lwip/apps/dhcpserver/*.c) \
-	$(wildcard $(ESPCOMP)/lwip/lwip/src/api/*.c) \
-	$(wildcard $(ESPCOMP)/lwip/lwip/src/apps/sntp/*.c) \
-	$(wildcard $(ESPCOMP)/lwip/lwip/src/core/*.c) \
-	$(wildcard $(ESPCOMP)/lwip/lwip/src/core/*/*.c) \
-	$(wildcard $(ESPCOMP)/lwip/lwip/src/netif/*.c) \
-	$(wildcard $(ESPCOMP)/lwip/lwip/src/netif/*/*.c) \
-	$(wildcard $(ESPCOMP)/lwip/lwip/src/netif/*/*/*.c) \
-	$(wildcard $(ESPCOMP)/lwip/port/esp32/*.c) \
-	$(wildcard $(ESPCOMP)/lwip/port/esp32/*/*.c) \
-	)
-
-# Mbedtls source files, exclude error.c in favor of lib/mbedtls_errors/mp_mbedtls_errors.c
-ESPIDF_MBEDTLS_O = $(patsubst %.c,%.o, $(filter-out %/error.c,\
-	$(wildcard $(ESPCOMP)/mbedtls/mbedtls/library/*.c) \
-	$(wildcard $(ESPCOMP)/mbedtls/port/*.c) \
-	$(wildcard $(ESPCOMP)/mbedtls/port/esp32/*.c) \
-	))
-
-ESPIDF_MDNS_O = $(patsubst %.c,%.o,$(wildcard $(ESPCOMP)/mdns/*.c))
-
-ifeq ($(ESPIDF_CURHASH),$(ESPIDF_SUPHASH_V4))
-$(BUILD)/$(ESPCOMP)/wpa_supplicant/%.o: CFLAGS += -DCONFIG_WPA3_SAE -DCONFIG_IEEE80211W -DESP_SUPPLICANT -DIEEE8021X_EAPOL -DEAP_PEER_METHOD -DEAP_TLS -DEAP_TTLS -DEAP_PEAP -DEAP_MSCHAPv2 -DUSE_WPA2_TASK -DCONFIG_WPS2 -DCONFIG_WPS_PIN -DUSE_WPS_TASK -DESPRESSIF_USE -DESP32_WORKAROUND -DCONFIG_ECC -D__ets__ -Wno-strict-aliasing -I$(ESPCOMP)/wpa_supplicant/src -Wno-implicit-function-declaration
-else
-$(BUILD)/$(ESPCOMP)/wpa_supplicant/%.o: CFLAGS += -DEMBEDDED_SUPP -DIEEE8021X_EAPOL -DEAP_PEER_METHOD -DEAP_MSCHAPv2 -DEAP_TTLS -DEAP_TLS -DEAP_PEAP -DUSE_WPA2_TASK -DCONFIG_WPS2 -DCONFIG_WPS_PIN -DUSE_WPS_TASK -DESPRESSIF_USE -DESP32_WORKAROUND -DALLOW_EVEN_MOD -D__ets__ -Wno-strict-aliasing
-endif
-ESPIDF_WPA_SUPPLICANT_O = $(patsubst %.c,%.o,\
-	$(wildcard $(ESPCOMP)/wpa_supplicant/port/*.c) \
-	$(wildcard $(ESPCOMP)/wpa_supplicant/src/*/*.c) \
-	)
-
-ESPIDF_SDMMC_O = $(patsubst %.c,%.o,$(wildcard $(ESPCOMP)/sdmmc/*.c))
-
-ifeq ($(ESPIDF_CURHASH),$(ESPIDF_SUPHASH_V4))
-ESPIDF_ESP_COMMON_O = $(patsubst %.c,%.o,$(wildcard $(ESPCOMP)/esp_common/src/*.c))
-
-ESPIDF_ESP_EVENT_O = $(patsubst %.c,%.o,$(wildcard $(ESPCOMP)/esp_event/*.c))
-
-ESPIDF_ESP_WIFI_O = $(patsubst %.c,%.o,$(wildcard $(ESPCOMP)/esp_wifi/src/*.c))
-
-ifeq ($(CONFIG_BT_NIMBLE_ENABLED),y)
-ESPIDF_BT_NIMBLE_O = $(patsubst %.c,%.o,\
-	$(wildcard $(ESPCOMP)/bt/controller/*.c) \
-	$(wildcard $(ESPCOMP)/bt/common/btc/core/*.c) \
-	$(wildcard $(ESPCOMP)/bt/common/osi/*.c) \
-	$(wildcard $(ESPCOMP)/bt/host/nimble/esp-hci/src/*.c) \
-	$(wildcard $(ESPCOMP)/bt/host/nimble/nimble/ext/tinycrypt/src/*.c) \
-	$(wildcard $(ESPCOMP)/bt/host/nimble/nimble/nimble/host/services/ans/src/*.c) \
-	$(wildcard $(ESPCOMP)/bt/host/nimble/nimble/nimble/host/services/bas/src/*.c) \
-	$(wildcard $(ESPCOMP)/bt/host/nimble/nimble/nimble/host/services/gap/src/*.c) \
-	$(wildcard $(ESPCOMP)/bt/host/nimble/nimble/nimble/host/services/gatt/src/*.c) \
-	$(wildcard $(ESPCOMP)/bt/host/nimble/nimble/nimble/host/services/ias/src/*.c) \
-	$(wildcard $(ESPCOMP)/bt/host/nimble/nimble/nimble/host/services/lls/src/*.c) \
-	$(wildcard $(ESPCOMP)/bt/host/nimble/nimble/nimble/host/services/tps/src/*.c) \
-	$(wildcard $(ESPCOMP)/bt/host/nimble/nimble/nimble/host/src/*.c) \
-	$(wildcard $(ESPCOMP)/bt/host/nimble/nimble/nimble/host/store/config/src/ble_store_config.c) \
-	$(wildcard $(ESPCOMP)/bt/host/nimble/nimble/nimble/host/store/config/src/ble_store_nvs.c) \
-	$(wildcard $(ESPCOMP)/bt/host/nimble/nimble/nimble/host/store/ram/src/*.c) \
-	$(wildcard $(ESPCOMP)/bt/host/nimble/nimble/nimble/host/util/src/*.c) \
-	$(wildcard $(ESPCOMP)/bt/host/nimble/nimble/nimble/src/*.c) \
-	$(wildcard $(ESPCOMP)/bt/host/nimble/nimble/porting/nimble/src/*.c) \
-	$(wildcard $(ESPCOMP)/bt/host/nimble/nimble/porting/npl/freertos/src/*.c) \
-	$(wildcard $(ESPCOMP)/bt/host/nimble/port/src/*.c) \
-	)
-endif
-
-$(BUILD)/$(ESPCOMP)/esp_eth/src/esp_eth_mac_dm9051.o: CFLAGS += -fno-strict-aliasing
-ESPIDF_ESP_ETH_O = $(patsubst %.c,%.o,$(wildcard $(ESPCOMP)/esp_eth/src/*.c))
-
-ESPIDF_XTENSA_O = $(patsubst %.c,%.o,\
-    $(wildcard $(ESPCOMP)/xtensa/*.c) \
-    $(wildcard $(ESPCOMP)/xtensa/esp32/*.c) \
-    )
-else
-ESPIDF_JSON_O = $(patsubst %.c,%.o,$(wildcard $(ESPCOMP)/json/cJSON/cJSON*.c))
-
-ESPIDF_ETHERNET_O = $(patsubst %.c,%.o,\
-    $(wildcard $(ESPCOMP)/ethernet/*.c) \
-    $(wildcard $(ESPCOMP)/ethernet/eth_phy/*.c) \
-    )
-
-ifeq ($(CONFIG_NIMBLE_ENABLED),y)
-ESPIDF_BT_NIMBLE_O = $(patsubst %.c,%.o,\
-	$(wildcard $(ESPCOMP)/bt/*.c) \
-	$(wildcard $(ESPCOMP)/nimble/esp-hci/src/*.c) \
-	$(wildcard $(ESPCOMP)/nimble/nimble/ext/tinycrypt/src/*.c) \
-	$(wildcard $(ESPCOMP)/nimble/nimble/nimble/host/services/ans/src/*.c) \
-	$(wildcard $(ESPCOMP)/nimble/nimble/nimble/host/services/bas/src/*.c) \
-	$(wildcard $(ESPCOMP)/nimble/nimble/nimble/host/services/gap/src/*.c) \
-	$(wildcard $(ESPCOMP)/nimble/nimble/nimble/host/services/gatt/src/*.c) \
-	$(wildcard $(ESPCOMP)/nimble/nimble/nimble/host/services/ias/src/*.c) \
-	$(wildcard $(ESPCOMP)/nimble/nimble/nimble/host/services/lls/src/*.c) \
-	$(wildcard $(ESPCOMP)/nimble/nimble/nimble/host/services/tps/src/*.c) \
-	$(wildcard $(ESPCOMP)/nimble/nimble/nimble/host/src/*.c) \
-	$(wildcard $(ESPCOMP)/nimble/nimble/nimble/host/store/config/src/ble_store_config.c) \
-	$(wildcard $(ESPCOMP)/nimble/nimble/nimble/host/store/config/src/ble_store_nvs.c) \
-	$(wildcard $(ESPCOMP)/nimble/nimble/nimble/host/store/ram/src/*.c) \
-	$(wildcard $(ESPCOMP)/nimble/nimble/nimble/host/util/src/*.c) \
-	$(wildcard $(ESPCOMP)/nimble/nimble/nimble/src/*.c) \
-	$(wildcard $(ESPCOMP)/nimble/nimble/porting/nimble/src/*.c) \
-	$(wildcard $(ESPCOMP)/nimble/nimble/porting/npl/freertos/src/*.c) \
-	$(wildcard $(ESPCOMP)/nimble/port/src/*.c) \
-	)
-endif
-endif
-
-OBJ_ESPIDF =
-LIB_ESPIDF =
-BUILD_ESPIDF_LIB = $(BUILD)/esp-idf
-
-define gen_espidf_lib_rule
-OBJ_ESPIDF += $(addprefix $$(BUILD)/,$(2))
-LIB_ESPIDF += $(1)
-$(BUILD_ESPIDF_LIB)/$(1)/lib$(1).a: $(addprefix $$(BUILD)/,$(2))
-	$(ECHO) "AR $$@"
-	$(Q)$(AR) cru $$@ $$^
-endef
-
-$(eval $(call gen_espidf_lib_rule,bootloader_support,$(ESPIDF_BOOTLOADER_SUPPORT_O)))
-$(eval $(call gen_espidf_lib_rule,driver,$(ESPIDF_DRIVER_O)))
-$(eval $(call gen_espidf_lib_rule,efuse,$(ESPIDF_EFUSE_O)))
-$(eval $(call gen_espidf_lib_rule,esp32,$(ESPIDF_ESP32_O)))
-$(eval $(call gen_espidf_lib_rule,esp_ringbuf,$(ESPIDF_ESP_RINGBUF_O)))
-$(eval $(call gen_espidf_lib_rule,heap,$(ESPIDF_HEAP_O)))
-$(eval $(call gen_espidf_lib_rule,soc,$(ESPIDF_SOC_O)))
-$(eval $(call gen_espidf_lib_rule,cxx,$(ESPIDF_CXX_O)))
-$(eval $(call gen_espidf_lib_rule,pthread,$(ESPIDF_PTHREAD_O)))
-$(eval $(call gen_espidf_lib_rule,freertos,$(ESPIDF_FREERTOS_O)))
-$(eval $(call gen_espidf_lib_rule,vfs,$(ESPIDF_VFS_O)))
-$(eval $(call gen_espidf_lib_rule,json,$(ESPIDF_JSON_O)))
-$(eval $(call gen_espidf_lib_rule,log,$(ESPIDF_LOG_O)))
-$(eval $(call gen_espidf_lib_rule,xtensa-debug-module,$(ESPIDF_XTENSA_DEBUG_MODULE_O)))
-$(eval $(call gen_espidf_lib_rule,tcpip_adapter,$(ESPIDF_TCPIP_ADAPTER_O)))
-$(eval $(call gen_espidf_lib_rule,app_trace,$(ESPIDF_APP_TRACE_O)))
-$(eval $(call gen_espidf_lib_rule,app_update,$(ESPIDF_APP_UPDATE_O)))
-$(eval $(call gen_espidf_lib_rule,newlib,$(ESPIDF_NEWLIB_O)))
-$(eval $(call gen_espidf_lib_rule,nvs_flash,$(ESPIDF_NVS_FLASH_O)))
-$(eval $(call gen_espidf_lib_rule,smartconfig_ack,$(ESPIDF_SMARTCONFIG_ACK_O)))
-$(eval $(call gen_espidf_lib_rule,spi_flash,$(ESPIDF_SPI_FLASH_O)))
-$(eval $(call gen_espidf_lib_rule,ulp,$(ESPIDF_ULP_O)))
-$(eval $(call gen_espidf_lib_rule,lwip,$(ESPIDF_LWIP_O)))
-$(eval $(call gen_espidf_lib_rule,mbedtls,$(ESPIDF_MBEDTLS_O)))
-$(eval $(call gen_espidf_lib_rule,mdns,$(ESPIDF_MDNS_O)))
-$(eval $(call gen_espidf_lib_rule,wpa_supplicant,$(ESPIDF_WPA_SUPPLICANT_O)))
-$(eval $(call gen_espidf_lib_rule,sdmmc,$(ESPIDF_SDMMC_O)))
-$(eval $(call gen_espidf_lib_rule,bt_nimble,$(ESPIDF_BT_NIMBLE_O)))
-
-ifeq ($(ESPIDF_CURHASH),$(ESPIDF_SUPHASH_V4))
-$(eval $(call gen_espidf_lib_rule,esp_common,$(ESPIDF_ESP_COMMON_O)))
-$(eval $(call gen_espidf_lib_rule,esp_event,$(ESPIDF_ESP_EVENT_O)))
-$(eval $(call gen_espidf_lib_rule,esp_wifi,$(ESPIDF_ESP_WIFI_O)))
-$(eval $(call gen_espidf_lib_rule,esp_eth,$(ESPIDF_ESP_ETH_O)))
-$(eval $(call gen_espidf_lib_rule,xtensa,$(ESPIDF_XTENSA_O)))
-else
-$(eval $(call gen_espidf_lib_rule,ethernet,$(ESPIDF_ETHERNET_O)))
-endif
-
-# Create all destination build dirs before compiling IDF source
-OBJ_ESPIDF_DIRS = $(sort $(dir $(OBJ_ESPIDF))) $(BUILD_ESPIDF_LIB) $(addprefix $(BUILD_ESPIDF_LIB)/,$(LIB_ESPIDF))
-$(OBJ_ESPIDF): | $(OBJ_ESPIDF_DIRS)
-$(OBJ_ESPIDF_DIRS):
-	$(MKDIR) -p $@
-
-# Make all IDF object files depend on sdkconfig
-$(OBJ_ESPIDF): $(SDKCONFIG_H)
-
-# Add all IDF components to the set of libraries
-LIB = $(foreach lib,$(LIB_ESPIDF),$(BUILD_ESPIDF_LIB)/$(lib)/lib$(lib).a)
-
-################################################################################
-# ESP IDF ldgen
-
-LDGEN_FRAGMENTS = $(shell find $(ESPCOMP) -name "*.lf")
-
-ifeq ($(ESPIDF_CURHASH),$(ESPIDF_SUPHASH_V4))
-
-LDGEN_LIBRARIES=$(foreach lib,$(LIB_ESPIDF),$(BUILD_ESPIDF_LIB)/$(lib)/lib$(lib).a)
-
-$(BUILD_ESPIDF_LIB)/ldgen_libraries: $(LDGEN_LIBRARIES) $(ESPIDF)/make/ldgen.mk
-	printf "$(foreach library,$(LDGEN_LIBRARIES),$(library)\n)" > $(BUILD_ESPIDF_LIB)/ldgen_libraries
-
-$(BUILD)/esp32.project.ld: $(ESPCOMP)/esp32/ld/esp32.project.ld.in $(LDGEN_FRAGMENTS) $(SDKCONFIG_COMBINED) $(BUILD_ESPIDF_LIB)/ldgen_libraries
-	$(ECHO) "GEN $@"
-	$(Q)$(PYTHON) $(ESPIDF)/tools/ldgen/ldgen.py \
-		--input $< \
-		--output $@ \
-		--config $(SDKCONFIG_COMBINED) \
-		--kconfig $(ESPIDF)/Kconfig \
-		--fragments $(LDGEN_FRAGMENTS) \
-		--libraries-file $(BUILD_ESPIDF_LIB)/ldgen_libraries \
-		--env "IDF_TARGET=esp32" \
-		--env "IDF_CMAKE=n" \
-		--env "COMPONENT_KCONFIGS=$(ESPCOMP_KCONFIGS)" \
-		--env "COMPONENT_KCONFIGS_PROJBUILD=$(ESPCOMP_KCONFIGS_PROJBUILD)" \
-		--env "IDF_PATH=$(ESPIDF)" \
-		--objdump $(OBJDUMP)
-
-else
-
-LDGEN_SECTIONS_INFO = $(foreach lib,$(LIB_ESPIDF),$(BUILD_ESPIDF_LIB)/$(lib)/lib$(lib).a.sections_info)
-LDGEN_SECTION_INFOS = $(BUILD_ESPIDF_LIB)/ldgen.section_infos
-
-define gen_sections_info_rule
-$(1).sections_info: $(1)
-	$(ECHO) "GEN $(1).sections_info"
-	$(Q)$(OBJDUMP) -h $(1) > $(1).sections_info
-endef
-
-$(eval $(foreach lib,$(LIB_ESPIDF),$(eval $(call gen_sections_info_rule,$(BUILD_ESPIDF_LIB)/$(lib)/lib$(lib).a))))
-
-$(LDGEN_SECTION_INFOS): $(LDGEN_SECTIONS_INFO) $(ESPIDF)/make/ldgen.mk
-	$(Q)printf "$(foreach info,$(LDGEN_SECTIONS_INFO),$(info)\n)" > $@
-
-$(BUILD)/esp32.project.ld: $(ESPCOMP)/esp32/ld/esp32.project.ld.in $(LDGEN_FRAGMENTS) $(SDKCONFIG_COMBINED) $(LDGEN_SECTION_INFOS)
-	$(ECHO) "GEN $@"
-	$(Q)$(PYTHON) $(ESPIDF)/tools/ldgen/ldgen.py \
-		--input $< \
-		--output $@ \
-		--config $(SDKCONFIG_COMBINED) \
-		--kconfig $(ESPIDF)/Kconfig \
-		--fragments $(LDGEN_FRAGMENTS) \
-		--sections $(LDGEN_SECTION_INFOS) \
-		--env "IDF_TARGET=esp32" \
-		--env "IDF_CMAKE=n" \
-		--env "COMPONENT_KCONFIGS=$(ESPCOMP_KCONFIGS)" \
-		--env "COMPONENT_KCONFIGS_PROJBUILD=$(ESPCOMP_KCONFIGS_PROJBUILD)" \
-		--env "IDF_PATH=$(ESPIDF)"
-
-endif
+GIT_SUBMODULES = lib/berkeley-db-1.xx
 
-################################################################################
-# Main targets
+.PHONY: all clean deploy erase submodules FORCE
 
-all: $(BUILD)/firmware.bin
+IDFPY_FLAGS += -D MICROPY_BOARD=$(BOARD) -B $(BUILD)
 
-.PHONY: idf-version deploy erase
+all:
+	idf.py $(IDFPY_FLAGS) build
+	@$(PYTHON) makeimg.py \
+		$(BUILD)/bootloader/bootloader.bin \
+		$(BUILD)/partition_table/partition-table.bin \
+    		$(BUILD)/micropython.bin \
+    		$(BUILD)/firmware.bin
 
-idf-version:
-	$(ECHO) "ESP IDF supported hash: $(ESPIDF_SUPHASH)"
+$(BUILD)/bootloader/bootloader.bin $(BUILD)/partition_table/partition  -table.bin $(BUILD)/micropython.bin: FORCE
 
-$(BUILD)/firmware.bin: $(BUILD)/bootloader.bin $(BUILD)/partitions.bin $(BUILD)/application.bin
-	$(ECHO) "Create $@"
-	$(Q)$(PYTHON) makeimg.py $^ $@
+clean:
+	idf.py $(IDFPY_FLAGS) fullclean
 
-deploy: $(BUILD)/firmware.bin
-	$(ECHO) "Writing $^ to the board"
-	$(Q)$(ESPTOOL) --chip esp32 --port $(PORT) --baud $(BAUD) write_flash -z --flash_mode $(FLASH_MODE) --flash_freq $(FLASH_FREQ) 0x1000 $^
+deploy:
+	idf.py $(IDFPY_FLAGS) -p $(PORT) -b $(BAUD) flash
 
 erase:
-	$(ECHO) "Erasing flash"
-	$(Q)$(ESPTOOL) --chip esp32 --port $(PORT) --baud $(BAUD) erase_flash
-
-################################################################################
-# Declarations to build the application
-
-OBJ = $(OBJ_MP)
-
-APP_LD_ARGS =
-APP_LD_ARGS += $(LDFLAGS_MOD)
-APP_LD_ARGS += $(addprefix -T,$(LD_FILES))
-APP_LD_ARGS += --start-group
-APP_LD_ARGS += -L$(dir $(LIBGCC_FILE_NAME)) -lgcc
-APP_LD_ARGS += -L$(dir $(LIBSTDCXX_FILE_NAME)) -lstdc++
-APP_LD_ARGS += $(LIBC_LIBM)
-ifeq ($(ESPIDF_CURHASH),$(ESPIDF_SUPHASH_V4))
-APP_LD_ARGS += -L$(ESPCOMP)/xtensa/esp32 -lhal
-APP_LD_ARGS += -L$(ESPCOMP)/bt/controller/lib -lbtdm_app
-APP_LD_ARGS += -L$(ESPCOMP)/esp_wifi/lib_esp32 -lcore -lmesh -lnet80211 -lphy -lrtc -lpp -lsmartconfig -lcoexist
-else
-APP_LD_ARGS += $(ESPCOMP)/esp32/libhal.a
-APP_LD_ARGS += -L$(ESPCOMP)/bt/lib -lbtdm_app
-APP_LD_ARGS += -L$(ESPCOMP)/esp32/lib -lcore -lmesh -lnet80211 -lphy -lrtc -lpp -lwpa -lsmartconfig -lcoexist -lwps -lwpa2
-endif
-APP_LD_ARGS += $(OBJ)
-APP_LD_ARGS += $(LIB)
-APP_LD_ARGS += --end-group
-
-$(BUILD)/esp32_out.ld: $(SDKCONFIG_H)
-	$(Q)$(CC) -I$(BUILD) -C -P -x c -E $(ESPCOMP)/esp32/ld/esp32.ld -o $@
-
-$(BUILD)/application.bin: $(BUILD)/application.elf
-	$(ECHO) "Create $@"
-	$(Q)$(ESPTOOL) --chip esp32 elf2image --flash_mode $(FLASH_MODE) --flash_freq $(FLASH_FREQ) --flash_size $(FLASH_SIZE) $<
-
-$(BUILD)/application.elf: $(OBJ) $(LIB) $(BUILD)/esp32_out.ld $(BUILD)/esp32.project.ld
-	$(ECHO) "LINK $@"
-	$(Q)$(LD) $(LDFLAGS) -o $@ $(APP_LD_ARGS)
-	$(Q)$(SIZE) $@
-
-################################################################################
-# Declarations to build the bootloader
-
-BOOTLOADER_LIB_DIR = $(BUILD)/bootloader
-BOOTLOADER_LIB_ALL =
-
-ifeq ($(ESPIDF_CURHASH),$(ESPIDF_SUPHASH_V4))
-$(BUILD)/bootloader/$(ESPCOMP)/%.o: CFLAGS += -DBOOTLOADER_BUILD=1 -I$(ESPCOMP)/bootloader_support/include_priv -I$(ESPCOMP)/bootloader_support/include -I$(ESPCOMP)/efuse/include -I$(ESPCOMP)/esp_rom/include -Wno-error=format \
-	-I$(ESPCOMP)/esp_common/include \
-	-I$(ESPCOMP)/xtensa/include \
-	-I$(ESPCOMP)/xtensa/esp32/include
-else
-$(BUILD)/bootloader/$(ESPCOMP)/%.o: CFLAGS += -DBOOTLOADER_BUILD=1 -I$(ESPCOMP)/bootloader_support/include_priv -I$(ESPCOMP)/bootloader_support/include -I$(ESPCOMP)/micro-ecc/micro-ecc -I$(ESPCOMP)/efuse/include -I$(ESPCOMP)/esp32 -Wno-error=format
-endif
-
-# libbootloader_support.a
-BOOTLOADER_LIB_ALL += bootloader_support
-BOOTLOADER_LIB_BOOTLOADER_SUPPORT_OBJ = $(addprefix $(BUILD)/bootloader/$(ESPCOMP)/,\
-	bootloader_support/src/bootloader_clock.o \
-	bootloader_support/src/bootloader_common.o \
-	bootloader_support/src/bootloader_flash.o \
-	bootloader_support/src/bootloader_flash_config.o \
-	bootloader_support/src/bootloader_init.o \
-	bootloader_support/src/bootloader_random.o \
-	bootloader_support/src/bootloader_utility.o \
-	bootloader_support/src/flash_qio_mode.o \
-	bootloader_support/src/esp_image_format.o \
-	bootloader_support/src/flash_encrypt.o \
-	bootloader_support/src/flash_partitions.o \
-	)
-
-ifeq ($(ESPIDF_CURHASH),$(ESPIDF_SUPHASH_V4))
-BOOTLOADER_LIB_BOOTLOADER_SUPPORT_OBJ += $(addprefix $(BUILD)/bootloader/$(ESPCOMP)/,\
-	bootloader_support/src/esp32/bootloader_sha.o \
-	bootloader_support/src/bootloader_flash_config.o \
-	bootloader_support/src/esp32/secure_boot.o \
-	)
-else
-BOOTLOADER_LIB_BOOTLOADER_SUPPORT_OBJ += $(addprefix $(BUILD)/bootloader/$(ESPCOMP)/,\
-	bootloader_support/src/bootloader_sha.o \
-	bootloader_support/src/secure_boot_signatures.o \
-	bootloader_support/src/secure_boot.o \
-	)
-endif
-
-$(BOOTLOADER_LIB_DIR)/libbootloader_support.a: $(BOOTLOADER_LIB_BOOTLOADER_SUPPORT_OBJ)
-	$(ECHO) "AR $@"
-	$(Q)$(AR) cr $@ $^
-
-# liblog.a
-BOOTLOADER_LIB_ALL += log
-BOOTLOADER_LIB_LOG_OBJ = $(addprefix $(BUILD)/bootloader/$(ESPCOMP)/,\
-	log/log.o \
-	)
-$(BOOTLOADER_LIB_DIR)/liblog.a: $(BOOTLOADER_LIB_LOG_OBJ)
-	$(ECHO) "AR $@"
-	$(Q)$(AR) cr $@ $^
-
-# libspi_flash.a
-BOOTLOADER_LIB_ALL += spi_flash
-BOOTLOADER_LIB_SPI_FLASH_OBJ = $(addprefix $(BUILD)/bootloader/$(ESPCOMP)/,\
-	spi_flash/spi_flash_rom_patch.o \
-	)
-$(BOOTLOADER_LIB_DIR)/libspi_flash.a: $(BOOTLOADER_LIB_SPI_FLASH_OBJ)
-	$(ECHO) "AR $@"
-	$(Q)$(AR) cr $@ $^
-
-ifeq ($(ESPIDF_CURHASH),$(ESPIDF_SUPHASH_V3))
-# libmicro-ecc.a
-BOOTLOADER_LIB_ALL += micro-ecc
-BOOTLOADER_LIB_MICRO_ECC_OBJ = $(addprefix $(BUILD)/bootloader/$(ESPCOMP)/,\
-	micro-ecc/micro-ecc/uECC.o \
-	)
-$(BOOTLOADER_LIB_DIR)/libmicro-ecc.a: $(BOOTLOADER_LIB_MICRO_ECC_OBJ)
-	$(ECHO) "AR $@"
-	$(Q)$(AR) cr $@ $^
-endif
-
-# libsoc.a
-$(BUILD)/bootloader/$(ESPCOMP)/soc/esp32/rtc_clk.o: CFLAGS += -fno-jump-tables -fno-tree-switch-conversion
-BOOTLOADER_LIB_ALL += soc
-BOOTLOADER_LIB_SOC_OBJ = $(addprefix $(BUILD)/bootloader/$(ESPCOMP)/soc/,\
-	esp32/cpu_util.o \
-	esp32/gpio_periph.o \
-	esp32/rtc_clk.o \
-	esp32/rtc_clk_init.o \
-	esp32/rtc_init.o \
-	esp32/rtc_periph.o \
-	esp32/rtc_pm.o \
-	esp32/rtc_sleep.o \
-	esp32/rtc_time.o \
-	esp32/rtc_wdt.o \
-	esp32/sdio_slave_periph.o \
-	esp32/sdmmc_periph.o \
-	esp32/soc_memory_layout.o \
-	esp32/spi_periph.o \
-	src/memory_layout_utils.o \
-	)
-$(BOOTLOADER_LIB_DIR)/libsoc.a: $(BOOTLOADER_LIB_SOC_OBJ)
-	$(ECHO) "AR $@"
-	$(Q)$(AR) cr $@ $^
-
-# libmain.a
-BOOTLOADER_LIB_ALL += main
-BOOTLOADER_LIB_MAIN_OBJ = $(addprefix $(BUILD)/bootloader/$(ESPCOMP)/,\
-	bootloader/subproject/main/bootloader_start.o \
-	)
-$(BOOTLOADER_LIB_DIR)/libmain.a: $(BOOTLOADER_LIB_MAIN_OBJ)
-	$(ECHO) "AR $@"
-	$(Q)$(AR) cr $@ $^
-
-# all objects files
-BOOTLOADER_OBJ_ALL = \
-	$(BOOTLOADER_LIB_BOOTLOADER_SUPPORT_OBJ) \
-	$(BOOTLOADER_LIB_LOG_OBJ) \
-	$(BOOTLOADER_LIB_SPI_FLASH_OBJ) \
-	$(BOOTLOADER_LIB_MICRO_ECC_OBJ) \
-	$(BOOTLOADER_LIB_SOC_OBJ) \
-	$(BOOTLOADER_LIB_MAIN_OBJ)
-
-$(BOOTLOADER_OBJ_ALL): $(SDKCONFIG_H)
-
-BOOTLOADER_LIBS =
-BOOTLOADER_LIBS += -Wl,--start-group
-BOOTLOADER_LIBS += $(BOOTLOADER_OBJ)
-BOOTLOADER_LIBS += -L$(BUILD)/bootloader $(addprefix -l,$(BOOTLOADER_LIB_ALL))
-ifeq ($(ESPIDF_CURHASH),$(ESPIDF_SUPHASH_V4))
-BOOTLOADER_LIBS += -L$(ESPCOMP)/esp_wifi/lib_esp32 -lrtc
-else
-BOOTLOADER_LIBS += -L$(ESPCOMP)/esp32/lib -lrtc
-endif
-BOOTLOADER_LIBS += -L$(dir $(LIBGCC_FILE_NAME)) -lgcc
-BOOTLOADER_LIBS += -Wl,--end-group
-
-BOOTLOADER_LDFLAGS =
-BOOTLOADER_LDFLAGS += -nostdlib
-BOOTLOADER_LDFLAGS += -L$(ESPIDF)/lib
-BOOTLOADER_LDFLAGS += -L$(ESPIDF)/ld
-BOOTLOADER_LDFLAGS += -u call_user_start_cpu0
-BOOTLOADER_LDFLAGS += -Wl,--gc-sections
-BOOTLOADER_LDFLAGS += -static
-BOOTLOADER_LDFLAGS += -Wl,-EL
-BOOTLOADER_LDFLAGS += -Wl,-Map=$(@:.elf=.map) -Wl,--cref
-BOOTLOADER_LDFLAGS += -T $(ESPCOMP)/bootloader/subproject/main/esp32.bootloader.ld
-BOOTLOADER_LDFLAGS += -T $(ESPCOMP)/bootloader/subproject/main/esp32.bootloader.rom.ld
-ifeq ($(ESPIDF_CURHASH),$(ESPIDF_SUPHASH_V4))
-BOOTLOADER_LDFLAGS += -T $(ESPCOMP)/esp_rom/esp32/ld/esp32.rom.ld
-BOOTLOADER_LDFLAGS += -T $(ESPCOMP)/esp_rom/esp32/ld/esp32.rom.newlib-funcs.ld
-else
-BOOTLOADER_LDFLAGS += -T $(ESPCOMP)/esp32/ld/esp32.rom.ld
-BOOTLOADER_LDFLAGS += -T $(ESPCOMP)/esp32/ld/esp32.rom.spiram_incompatible_fns.ld
-endif
-BOOTLOADER_LDFLAGS += -T $(ESPCOMP)/esp32/ld/esp32.peripherals.ld
-
-BOOTLOADER_OBJ_DIRS = $(sort $(dir $(BOOTLOADER_OBJ_ALL)))
-$(BOOTLOADER_OBJ_ALL): | $(BOOTLOADER_OBJ_DIRS)
-$(BOOTLOADER_OBJ_DIRS):
-	$(MKDIR) -p $@
-
-$(BUILD)/bootloader/%.o: %.c
-	$(call compile_c)
-
-$(BUILD)/bootloader.bin: $(BUILD)/bootloader.elf
-	$(ECHO) "Create $@"
-	$(Q)$(ESPTOOL) --chip esp32 elf2image --flash_mode $(FLASH_MODE) --flash_freq $(FLASH_FREQ) --flash_size $(FLASH_SIZE) $<
-
-$(BUILD)/bootloader.elf: $(BOOTLOADER_OBJ) $(addprefix $(BOOTLOADER_LIB_DIR)/lib,$(addsuffix .a,$(BOOTLOADER_LIB_ALL)))
-	$(ECHO) "LINK $@"
-	$(Q)$(CC) $(BOOTLOADER_LDFLAGS) -o $@ $(BOOTLOADER_LIBS)
-
-################################################################################
-# Declarations to build the partitions
-
-PYTHON2 ?= python2
-
-# Can be overriden by mkconfigboard.mk.
-PART_SRC ?= partitions.csv
-
-$(BUILD)/partitions.bin: $(PART_SRC)
-	$(ECHO) "Create $@"
-	$(Q)$(PYTHON2) $(ESPCOMP)/partition_table/gen_esp32part.py -q $< $@
-
-################################################################################
+	idf.py $(IDFPY_FLAGS) erase_flash
 
-include $(TOP)/py/mkrules.mk
+submodules:
+	git submodule update --init $(addprefix ../../,$(GIT_SUBMODULES))
diff --git a/ports/esp32/boards/GENERIC/mpconfigboard.mk b/ports/esp32/boards/GENERIC/mpconfigboard.mk
deleted file mode 100644
index fc49d2a8c256c..0000000000000
--- a/ports/esp32/boards/GENERIC/mpconfigboard.mk
+++ /dev/null
@@ -1 +0,0 @@
-SDKCONFIG += boards/sdkconfig.base
diff --git a/ports/esp32/boards/GENERIC_D2WD/mpconfigboard.mk b/ports/esp32/boards/GENERIC_D2WD/mpconfigboard.mk
deleted file mode 100644
index 65de5dcd08e55..0000000000000
--- a/ports/esp32/boards/GENERIC_D2WD/mpconfigboard.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-SDKCONFIG += boards/sdkconfig.base
-PART_SRC = partitions-2MiB.csv
-FLASH_SIZE = 2MB
-FLASH_MODE = dio
-FLASH_FREQ = 40m
diff --git a/ports/esp32/boards/GENERIC_OTA/mpconfigboard.mk b/ports/esp32/boards/GENERIC_OTA/mpconfigboard.mk
deleted file mode 100644
index db6492cac2b84..0000000000000
--- a/ports/esp32/boards/GENERIC_OTA/mpconfigboard.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-SDKCONFIG += boards/sdkconfig.base
-SDKCONFIG += boards/GENERIC_OTA/sdkconfig.board
-
-PART_SRC = partitions-ota.csv
diff --git a/ports/esp32/boards/GENERIC_SPIRAM/mpconfigboard.mk b/ports/esp32/boards/GENERIC_SPIRAM/mpconfigboard.mk
deleted file mode 100644
index 59aa75f8571b9..0000000000000
--- a/ports/esp32/boards/GENERIC_SPIRAM/mpconfigboard.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-SDKCONFIG += boards/sdkconfig.base
-SDKCONFIG += boards/sdkconfig.spiram
diff --git a/ports/esp32/boards/TINYPICO/mpconfigboard.mk b/ports/esp32/boards/TINYPICO/mpconfigboard.mk
deleted file mode 100644
index 5c96ec45a79e6..0000000000000
--- a/ports/esp32/boards/TINYPICO/mpconfigboard.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-FLASH_FREQ = 80m
-
-SDKCONFIG += boards/sdkconfig.base
-SDKCONFIG += boards/sdkconfig.240mhz
-SDKCONFIG += boards/sdkconfig.spiram
-SDKCONFIG += boards/TINYPICO/sdkconfig.board
-
-FROZEN_MANIFEST ?= $(BOARD_DIR)/manifest.py

From 26b17fd28a359567788b4bd2fe4a7bbac4c9a69d Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sun, 14 Feb 2021 00:56:58 +1100
Subject: [PATCH 0607/3533] esp32/boards: Remove old IDF v3 sdkconfig values.

IDF v3 is no longer supported with the move to cmake.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/boards/GENERIC_OTA/sdkconfig.board |  3 ---
 ports/esp32/boards/sdkconfig.base              | 11 -----------
 ports/esp32/boards/sdkconfig.ble               | 10 ----------
 ports/esp32/boards/sdkconfig.spiram            |  3 ---
 4 files changed, 27 deletions(-)

diff --git a/ports/esp32/boards/GENERIC_OTA/sdkconfig.board b/ports/esp32/boards/GENERIC_OTA/sdkconfig.board
index ca1f4276f4560..d314860cc9378 100644
--- a/ports/esp32/boards/GENERIC_OTA/sdkconfig.board
+++ b/ports/esp32/boards/GENERIC_OTA/sdkconfig.board
@@ -1,6 +1,3 @@
 CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE=y
 CONFIG_PARTITION_TABLE_CUSTOM=y
 CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions-ota.csv"
-
-# ESP-IDF v3:
-CONFIG_APP_ROLLBACK_ENABLE=y
diff --git a/ports/esp32/boards/sdkconfig.base b/ports/esp32/boards/sdkconfig.base
index de6e42c8f3139..e326831a158be 100644
--- a/ports/esp32/boards/sdkconfig.base
+++ b/ports/esp32/boards/sdkconfig.base
@@ -41,17 +41,6 @@ CONFIG_MBEDTLS_ASYMMETRIC_CONTENT_LEN=y
 # ULP coprocessor support
 CONFIG_ESP32_ULP_COPROC_ENABLED=y
 
-# v3.3-only (renamed in 4.0)
-CONFIG_LOG_BOOTLOADER_LEVEL_WARN=y
-CONFIG_TASK_WDT_CHECK_IDLE_TASK_CPU0=n
-CONFIG_TASK_WDT_CHECK_IDLE_TASK_CPU1=n
-CONFIG_SUPPORT_STATIC_ALLOCATION=y
-CONFIG_ENABLE_STATIC_TASK_CLEAN_UP_HOOK=y
-CONFIG_PPP_SUPPORT=y
-CONFIG_PPP_PAP_SUPPORT=y
-CONFIG_PPP_CHAP_SUPPORT=y
-CONFIG_ULP_COPROC_ENABLED=y
-
 # For cmake build
 CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
 CONFIG_PARTITION_TABLE_CUSTOM=y
diff --git a/ports/esp32/boards/sdkconfig.ble b/ports/esp32/boards/sdkconfig.ble
index f714ce4629b32..5565fd81a8432 100644
--- a/ports/esp32/boards/sdkconfig.ble
+++ b/ports/esp32/boards/sdkconfig.ble
@@ -15,13 +15,3 @@ CONFIG_BT_NIMBLE_MAX_CONNECTIONS=4
 CONFIG_BT_NIMBLE_PINNED_TO_CORE_0=y
 CONFIG_BT_NIMBLE_PINNED_TO_CORE_1=n
 CONFIG_BT_NIMBLE_PINNED_TO_CORE=0
-
-# v3.3-only (renamed in 4.0)
-CONFIG_BTDM_CONTROLLER_MODE_BLE_ONLY=y
-CONFIG_BTDM_CONTROLLER_MODE_BR_EDR_ONLY=
-CONFIG_BTDM_CONTROLLER_MODE_BTDM=
-CONFIG_BLUEDROID_ENABLED=n
-CONFIG_NIMBLE_ENABLED=y
-CONFIG_NIMBLE_MAX_CONNECTIONS=4
-CONFIG_NIMBLE_PINNED_TO_CORE_0=n
-CONFIG_NIMBLE_PINNED_TO_CORE_1=y
diff --git a/ports/esp32/boards/sdkconfig.spiram b/ports/esp32/boards/sdkconfig.spiram
index db1a83af8c432..5b4ce118b890e 100644
--- a/ports/esp32/boards/sdkconfig.spiram
+++ b/ports/esp32/boards/sdkconfig.spiram
@@ -4,6 +4,3 @@ CONFIG_ESP32_SPIRAM_SUPPORT=y
 CONFIG_SPIRAM_CACHE_WORKAROUND=y
 CONFIG_SPIRAM_IGNORE_NOTFOUND=y
 CONFIG_SPIRAM_USE_MEMMAP=y
-
-# v3.3-only (renamed in 4.0)
-CONFIG_SPIRAM_SUPPORT=y

From da2b5fa1c1a569faa0d139d97369cce9c0b55a00 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sun, 14 Feb 2021 01:36:30 +1100
Subject: [PATCH 0608/3533] esp32/boards: Enable BLE on all boards.

BLE was enabled by default on all boards in the existing make build.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/boards/GENERIC/mpconfigboard.cmake        | 6 +++++-
 ports/esp32/boards/GENERIC_D2WD/mpconfigboard.cmake   | 1 +
 ports/esp32/boards/GENERIC_OTA/mpconfigboard.cmake    | 1 +
 ports/esp32/boards/GENERIC_SPIRAM/mpconfigboard.cmake | 1 +
 ports/esp32/boards/TINYPICO/mpconfigboard.cmake       | 1 +
 ports/esp32/boards/sdkconfig.base                     | 4 ++++
 ports/esp32/main/CMakeLists.txt                       | 1 +
 ports/esp32/mpconfigport.h                            | 6 ++++++
 8 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/ports/esp32/boards/GENERIC/mpconfigboard.cmake b/ports/esp32/boards/GENERIC/mpconfigboard.cmake
index 8fea524555060..f69b05f47b042 100644
--- a/ports/esp32/boards/GENERIC/mpconfigboard.cmake
+++ b/ports/esp32/boards/GENERIC/mpconfigboard.cmake
@@ -1,2 +1,6 @@
-set(SDKCONFIG_DEFAULTS boards/sdkconfig.base)
+set(SDKCONFIG_DEFAULTS
+    boards/sdkconfig.base
+    boards/sdkconfig.ble
+)
+
 set(MICROPY_FROZEN_MANIFEST ${MICROPY_PORT_DIR}/boards/manifest.py)
diff --git a/ports/esp32/boards/GENERIC_D2WD/mpconfigboard.cmake b/ports/esp32/boards/GENERIC_D2WD/mpconfigboard.cmake
index 4e23666f15714..686c78df97f23 100644
--- a/ports/esp32/boards/GENERIC_D2WD/mpconfigboard.cmake
+++ b/ports/esp32/boards/GENERIC_D2WD/mpconfigboard.cmake
@@ -1,5 +1,6 @@
 set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.base
+    boards/sdkconfig.ble
     boards/GENERIC_D2WD/sdkconfig.board
 )
 
diff --git a/ports/esp32/boards/GENERIC_OTA/mpconfigboard.cmake b/ports/esp32/boards/GENERIC_OTA/mpconfigboard.cmake
index 7b1e1460054d7..ca552d470c0a6 100644
--- a/ports/esp32/boards/GENERIC_OTA/mpconfigboard.cmake
+++ b/ports/esp32/boards/GENERIC_OTA/mpconfigboard.cmake
@@ -1,5 +1,6 @@
 set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.base
+    boards/sdkconfig.ble
     boards/GENERIC_OTA/sdkconfig.board
 )
 
diff --git a/ports/esp32/boards/GENERIC_SPIRAM/mpconfigboard.cmake b/ports/esp32/boards/GENERIC_SPIRAM/mpconfigboard.cmake
index bb441d9ebf543..2128edb592f2a 100644
--- a/ports/esp32/boards/GENERIC_SPIRAM/mpconfigboard.cmake
+++ b/ports/esp32/boards/GENERIC_SPIRAM/mpconfigboard.cmake
@@ -1,5 +1,6 @@
 set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.base
+    boards/sdkconfig.ble
     boards/sdkconfig.spiram
 )
 
diff --git a/ports/esp32/boards/TINYPICO/mpconfigboard.cmake b/ports/esp32/boards/TINYPICO/mpconfigboard.cmake
index 990e3e035b9c0..5c31f5c60065e 100644
--- a/ports/esp32/boards/TINYPICO/mpconfigboard.cmake
+++ b/ports/esp32/boards/TINYPICO/mpconfigboard.cmake
@@ -1,5 +1,6 @@
 set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.base
+    boards/sdkconfig.ble
     boards/sdkconfig.240mhz
     boards/sdkconfig.spiram
     boards/TINYPICO/sdkconfig.board
diff --git a/ports/esp32/boards/sdkconfig.base b/ports/esp32/boards/sdkconfig.base
index e326831a158be..c84dd606b2c29 100644
--- a/ports/esp32/boards/sdkconfig.base
+++ b/ports/esp32/boards/sdkconfig.base
@@ -45,3 +45,7 @@ CONFIG_ESP32_ULP_COPROC_ENABLED=y
 CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
 CONFIG_PARTITION_TABLE_CUSTOM=y
 CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv"
+
+# To reduce iRAM usage
+CONFIG_ESP32_WIFI_IRAM_OPT=n
+CONFIG_ESP32_WIFI_RX_IRAM_OPT=n
diff --git a/ports/esp32/main/CMakeLists.txt b/ports/esp32/main/CMakeLists.txt
index a46e0112c9b88..eedf3ae9a511f 100644
--- a/ports/esp32/main/CMakeLists.txt
+++ b/ports/esp32/main/CMakeLists.txt
@@ -78,6 +78,7 @@ set(MICROPY_SOURCE_QSTR
 set(IDF_COMPONENTS
     app_update
     bootloader_support
+    bt
     driver
     esp32
     esp_common
diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h
index 81f8297c50019..34be9405e4eb5 100644
--- a/ports/esp32/mpconfigport.h
+++ b/ports/esp32/mpconfigport.h
@@ -126,6 +126,12 @@
 #define MICROPY_PY_THREAD_GIL_VM_DIVISOR    (32)
 
 // extended modules
+#ifndef MICROPY_PY_BLUETOOTH
+#define MICROPY_PY_BLUETOOTH                (1)
+#define MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE (1)
+#define MICROPY_BLUETOOTH_NIMBLE            (1)
+#define MICROPY_BLUETOOTH_NIMBLE_BINDINGS_ONLY (1)
+#endif
 #define MICROPY_PY_UASYNCIO                 (1)
 #define MICROPY_PY_UCTYPES                  (1)
 #define MICROPY_PY_UZLIB                    (1)

From aa3d6b6aa5ec9fdf15b5c2d30a1c9f9c9064cd3c Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sun, 14 Feb 2021 10:28:05 +1100
Subject: [PATCH 0609/3533] tools/ci.sh: Change esp32 CI to work with idf.py
 and IDF v4.0.2.

Signed-off-by: Damien George <damien@micropython.org>
---
 .github/workflows/ports_esp32.yml | 19 +++----------
 tools/ci.sh                       | 44 ++++++++++---------------------
 2 files changed, 17 insertions(+), 46 deletions(-)

diff --git a/.github/workflows/ports_esp32.yml b/.github/workflows/ports_esp32.yml
index 041074557e616..0ad3f87a25fcb 100644
--- a/.github/workflows/ports_esp32.yml
+++ b/.github/workflows/ports_esp32.yml
@@ -13,24 +13,11 @@ on:
       - 'ports/esp32/**'
 
 jobs:
-  idf3_build:
+  build:
     runs-on: ubuntu-20.04
     steps:
     - uses: actions/checkout@v2
     - name: Install packages
-      run: source tools/ci.sh && ci_esp32_idf3_setup && ci_esp32_idf3_path >> $GITHUB_PATH
+      run: source tools/ci.sh && ci_esp32_setup
     - name: Build
-      env:
-        IDF_PATH: ${{ github.workspace }}/esp-idf
-      run: source tools/ci.sh && ci_esp32_idf3_build
-
-  idf4_build:
-    runs-on: ubuntu-20.04
-    steps:
-    - uses: actions/checkout@v2
-    - name: Install packages
-      run: source tools/ci.sh && ci_esp32_idf4_setup && ci_esp32_idf4_path >> $GITHUB_PATH
-    - name: Build
-      env:
-        IDF_PATH: ${{ github.workspace }}/esp-idf
-      run: source tools/ci.sh && ci_esp32_idf4_build
+      run: source tools/ci.sh && ci_esp32_build
diff --git a/tools/ci.sh b/tools/ci.sh
index 8661f532efe97..4f99551468c59 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -82,38 +82,22 @@ function ci_cc3200_build {
 ########################################################################################
 # ports/esp32
 
-function ci_esp32_idf3_setup {
-    sudo pip3 install pyserial 'pyparsing<2.4'
-    curl -L https://dl.espressif.com/dl/xtensa-esp32-elf-linux64-1.22.0-80-g6c4433a-5.2.0.tar.gz | tar zxf -
+function ci_esp32_setup {
     git clone https://github.com/espressif/esp-idf.git
-}
-
-function ci_esp32_idf3_path {
-    echo $(pwd)/xtensa-esp32-elf/bin
-}
-
-function ci_esp32_idf3_build {
-    make ${MAKEOPTS} -C mpy-cross
-    git -C esp-idf checkout $(grep "ESPIDF_SUPHASH_V3 :=" ports/esp32/Makefile | cut -d " " -f 3)
-    git -C esp-idf submodule update --init components/json/cJSON components/esp32/lib components/esptool_py/esptool components/expat/expat components/lwip/lwip components/mbedtls/mbedtls components/micro-ecc/micro-ecc components/nghttp/nghttp2 components/nimble components/bt
-    make ${MAKEOPTS} -C ports/esp32 submodules
-    make ${MAKEOPTS} -C ports/esp32
-}
-
-function ci_esp32_idf4_setup {
-    sudo pip3 install pyserial 'pyparsing<2.4'
-    curl -L https://dl.espressif.com/dl/xtensa-esp32-elf-gcc8_2_0-esp-2019r2-linux-amd64.tar.gz | tar zxf -
-    git clone https://github.com/espressif/esp-idf.git
-}
-
-function ci_esp32_idf4_path {
-    echo $(pwd)/xtensa-esp32-elf/bin
-}
-
-function ci_esp32_idf4_build {
+    git -C esp-idf checkout v4.0.2
+    git -C esp-idf submodule update --init \
+        components/bt/controller/lib \
+        components/bt/host/nimble/nimble \
+        components/esp_wifi/lib_esp32 \
+        components/esptool_py/esptool \
+        components/lwip/lwip \
+        components/mbedtls/mbedtls
+    ./esp-idf/install.sh
+}
+
+function ci_esp32_build {
+    source esp-idf/export.sh
     make ${MAKEOPTS} -C mpy-cross
-    git -C esp-idf checkout $(grep "ESPIDF_SUPHASH_V4 :=" ports/esp32/Makefile | cut -d " " -f 3)
-    git -C esp-idf submodule update --init components/bt/controller/lib components/bt/host/nimble/nimble components/esp_wifi/lib_esp32 components/esptool_py/esptool components/lwip/lwip components/mbedtls/mbedtls
     make ${MAKEOPTS} -C ports/esp32 submodules
     make ${MAKEOPTS} -C ports/esp32
 }

From e017f276f7f95c7412b18939ba91784fdc69b734 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sun, 14 Feb 2021 17:51:31 +1100
Subject: [PATCH 0610/3533] esp32/README: Update based on new IDF v4 cmake
 build process.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/README.md | 245 +++++++++++++-----------------------------
 1 file changed, 76 insertions(+), 169 deletions(-)

diff --git a/ports/esp32/README.md b/ports/esp32/README.md
index 54fb41cf6f390..4f63750593dc0 100644
--- a/ports/esp32/README.md
+++ b/ports/esp32/README.md
@@ -1,13 +1,13 @@
 MicroPython port to the ESP32
 =============================
 
-This is an experimental port of MicroPython to the Espressif ESP32
-microcontroller.  It uses the ESP-IDF framework and MicroPython runs as
+This is a port of MicroPython to the Espressif ESP32 series of
+microcontrollers.  It uses the ESP-IDF framework and MicroPython runs as
 a task under FreeRTOS.
 
 Supported features include:
 - REPL (Python prompt) over UART0.
-- 16k stack for the MicroPython task and 96k Python heap.
+- 16k stack for the MicroPython task and approximately 100k Python heap.
 - Many of MicroPython's features are enabled: unicode, arbitrary-precision
   integers, single-precision floats, complex numbers, frozen bytecode, as
   well as many of the internal modules.
@@ -15,16 +15,24 @@ Supported features include:
 - The machine module with GPIO, UART, SPI, software I2C, ADC, DAC, PWM,
   TouchPad, WDT and Timer.
 - The network module with WLAN (WiFi) support.
+- Bluetooth low-energy (BLE) support via the bluetooth module.
 
-Development of this ESP32 port was sponsored in part by Microbric Pty Ltd.
+Initial development of this ESP32 port was sponsored in part by Microbric Pty Ltd.
 
-Setting up the toolchain and ESP-IDF
-------------------------------------
+Setting up ESP-IDF and the build environment
+--------------------------------------------
 
-There are two main components that are needed to build the firmware:
-- the Xtensa cross-compiler that targets the CPU in the ESP32 (this is
-  different to the compiler used by the ESP8266)
-- the Espressif IDF (IoT development framework, aka SDK)
+MicroPython on ESP32 requires the Espressif IDF version 4 (IoT development
+framework, aka SDK).  The ESP-IDF includes the libraries and RTOS needed to
+manage the ESP32 microcontroller, as well as a way to manage the required
+build environment and toolchains needed to build the firmware.
+
+The ESP-IDF changes quickly and MicroPython only supports certain versions.
+Currently MicroPython supports v4.0.2, although other IDF v4 versions may also
+work.
+
+To install the ESP-IDF the full instructions can be found at the
+[Espressif Getting Started guide](https://docs.espressif.com/projects/esp-idf/en/v4.0.2/get-started/index.html#installation-step-by-step).
 
 If you are on a Windows machine then the [Windows Subsystem for
 Linux](https://msdn.microsoft.com/en-au/commandline/wsl/install_guide) is the
@@ -32,164 +40,31 @@ most efficient way to install the ESP32 toolchain and build the project. If
 you use WSL then follow the Linux instructions rather than the Windows
 instructions.
 
-The ESP-IDF changes quickly and MicroPython only supports certain versions.
-The git hash of these versions (one for 3.x, one for 4.x) can be found by
-running `make` without a configured `ESPIDF`. Then you can fetch the
-required IDF using the following command:
-
-```bash
-$ cd ports/esp32
-$ make ESPIDF=  # This will print the supported hashes, copy the one you want.
-$ export ESPIDF=$HOME/src/github.com/espressif/esp-idf  # Or any path you like.
-$ mkdir -p $ESPIDF
-$ cd $ESPIDF
-$ git clone https://github.com/espressif/esp-idf.git $ESPIDF
-$ git checkout <Current supported ESP-IDF commit hash>
-$ git submodule update --init --recursive
-```
-
-Note: The ESP IDF v4.x support is currently experimental. It does not
-currently support PPP or wired Ethernet.
-
-Python dependencies
-===================
-
-You will also need other dependencies from the IDF, see
-`$ESPIDF/requirements.txt`, but at a minimum you need `pyserial>=3.0` and
-`pyparsing>=2.0.3,<2.4.0`.
-
-You can use Python 2 or Python 3. If you need to override the system default
-add (for example) `PYTHON=python3` to any of the `make` commands below.
-
-It is recommended to use a Python virtual environment. Even if your system
-package manager already provides these libraries, the IDF v4.x is currently
-incompatible with pyparsing 2.4 and higher.
-
-For example, to set up a Python virtual environment from scratch:
-
-```bash
-$ cd ports/esp32
-$ python3 -m venv build-venv
-$ source build-venv/bin/activate
-$ pip install --upgrade pip
-$ pip install -r path/to/esp-idf/requirements.txt
-```
+The Espressif instructions will guide you through using the `install.sh`
+(or `install.bat`) script to download the toolchain and set up your environment.
+The steps to take are summarised below.
 
-To re-enter this virtual environment in future sessions, you only need to
-source the `activate` script, i.e.:
+To check out a copy of the IDF use git clone:
 
 ```bash
-$ cd ports/esp32
-$ source build-venv/bin/activate
+$ git clone -b v4.0.2 --recursive https://github.com/espressif/esp-idf.git
 ```
 
-Then, to install the toolchain (which includes the GCC compiler, linker, binutils,
-etc), there are two options:
-
-1. Using the IDF scripts to install the toolchain (IDF 4.x only)
-================================================================
-
-Follow the steps at the [Espressif Getting Started guide](https://docs.espressif.com/projects/esp-idf/en/v4.0/get-started/index.html#step-3-set-up-the-tools).
-
-This will guide you through using the `install.sh` (or `install.bat`) script
-to download the toolchain and add it to your `PATH`. The steps are summarised
-below:
-
-After you've cloned and checked out the IDF to the correct version (see
-above), run the `install.sh` script:
-
-```bash
-$ cd $ESPIDF
-$ ./install.sh    # (or install.bat on Windows)
-```
+(You don't need a full recursive clone; see the `ci_esp32_setup` function in
+`tools/ci.sh` in this repository for more detailed set-up commands.)
 
-Then in the `ports/esp32` directory, source the `export.sh` script to set the
-`PATH`.
+After you've cloned and checked out the IDF to the correct version, run the
+`install.sh` script:
 
 ```bash
-$ cd micropython/ports/esp32
-$ source $ESPIDF/export.sh   # (or path\to\esp-idf\export.bat on Windows)
-$ # Run make etc, see below.
+$ cd esp-idf
+$ ./install.sh       # (or install.bat on Windows)
+$ source export.sh   # (or export.bat on Windows)
 ```
 
 The `install.sh` step only needs to be done once. You will need to source
 `export.sh` for every new session.
 
-Note: If you get an error about `--no-site-packages`, then modify
-`$ESPIDF/tools/idf_tools.py` and make the same change as [this
-commit](https://github.com/espressif/esp-idf/commit/7a18f02acd7005f7c56e62175a8d1968a1a9019d).
-
-2. or, Downloading pre-built toolchain manually (IDF 3.x and 4.x)
-=============================================================
-
-Note: while this works with 4.x, if you're using the 4.x IDF, it's much
-simpler to use the guide above, which will also get a more recent version of
-the toolchain.
-
-You can follow the 3.x guide at:
-
-  * [Linux installation](https://docs.espressif.com/projects/esp-idf/en/v3.3.2/get-started/linux-setup.html)
-  * [MacOS installation](https://docs.espressif.com/projects/esp-idf/en/v3.3.2/get-started/macos-setup.html)
-  * [Windows installation](https://docs.espressif.com/projects/esp-idf/en/v3.3.2/get-started/windows-setup.html)
-
-You will need to update your `PATH` environment variable to include the ESP32
-toolchain. For example, you can issue the following commands on (at least)
-Linux:
-
-    $ export PATH=$PATH:$HOME/esp/crosstool-NG/builds/xtensa-esp32-elf/bin
-
-You can put this command in your `.profile` or `.bash_login`, or do it manually.
-
-Configuring the MicroPython build
----------------------------------
-
-You then need to set the `ESPIDF` environment/makefile variable to point to
-the root of the ESP-IDF repository. The recommended way to do this is to have
-a custom `makefile` in `ports/esp32` which sets any additional variables, then
-includes the main `Makefile`. Note that GNU Make will preferentially run
-`GNUmakefile`, then `makefile`, then `Makefile`, which is what allows this to
-work. On case-insensitive filesystems, you'll need to use `GNUmakefile` rather
-than `makefile`.
-
-Create a new file in the esp32 directory called `makefile` (or `GNUmakefile`)
-and add the following lines to that file:
-
-```
-ESPIDF ?= <path to root of esp-idf repository>
-BOARD ?= GENERIC
-#PORT ?= /dev/ttyUSB0
-#FLASH_MODE ?= qio
-#FLASH_SIZE ?= 4MB
-#CROSS_COMPILE ?= xtensa-esp32-elf-
-
-include Makefile
-```
-
-Be sure to enter the correct path to your local copy of the IDF repository
-(and use `$(HOME)`, not tilde (`~`), to reference your home directory).
-
-If the Xtensa cross-compiler is not in your path you can use the
-`CROSS_COMPILE` variable to set its location.  Other options of interest are
-`PORT` for the serial port of your ESP32 module, and `FLASH_MODE` (which may
-need to be `dio` for some modules) and `FLASH_SIZE`.  See the Makefile for
-further information.
-
-The default ESP IDF configuration settings are provided by the `GENERIC`
-board definition in the directory `boards/GENERIC`. For a custom configuration
-you can define your own board directory.
-
-Any of these variables can also be set on the make command line, e.g. to set
-the `BOARD` variable, use:
-
-```bash
-$ make BOARD=TINYPICO
-```
-
-Note the use of `?=` in the `makefile` which allows them to be overridden on
-the command line. There is also a `GENERIC_SPIRAM` board for for ESP32
-modules that have external SPIRAM, but prefer to use a specific board target
-(or define your own as necessary).
-
 Building the firmware
 ---------------------
 
@@ -198,8 +73,7 @@ built-in scripts to bytecode.  This can be done by (from the root of
 this repository):
 
 ```bash
-$ cd mpy-cross
-$ make mpy-cross
+$ make -C mpy-cross
 ```
 
 Then to build MicroPython for the ESP32 run:
@@ -210,16 +84,14 @@ $ make submodules
 $ make
 ```
 
-This will produce binary firmware images in the `build/` subdirectory
-(three of them: bootloader.bin, partitions.bin and application.bin).
+This will produce a combined `firmware.bin` image in the `build-GENERIC/`
+subdirectory (this firmware image is made up of: bootloader.bin, partitions.bin
+and micropython.bin).
 
 To flash the firmware you must have your ESP32 module in the bootloader
 mode and connected to a serial port on your PC.  Refer to the documentation
-for your particular ESP32 module for how to do this.  The serial port and
-flash settings are set in the `Makefile`, and can be overridden in your
-local `makefile`; see above for more details.
-
-You will also need to have user permissions to access the /dev/ttyUSB0 device.
+for your particular ESP32 module for how to do this.
+You will also need to have user permissions to access the `/dev/ttyUSB0` device.
 On Linux, you can enable this by adding your user to the `dialout` group, and
 rebooting or logging out and in again. (Note: on some distributions this may
 be the `uucp` group, run `ls -la /dev/ttyUSB0` to check.)
@@ -242,8 +114,23 @@ To flash the MicroPython firmware to your ESP32 use:
 $ make deploy
 ```
 
-This will use the `esptool.py` script (provided by ESP-IDF) to flash the
-binary images to the device.
+The default ESP32 board build by the above commands is the `GENERIC` one, which
+should work on most ESP32 modules.  You can specify a different board by passing
+`BOARD=<board>` to the make commands, for example:
+
+```bash
+$ make BOARD=GENERIC_SPIRAM
+```
+
+Note: the above "make" commands are thin wrappers for the underlying `idf.py`
+build tool that is part of the ESP-IDF.  You can instead use `idf.py` directly,
+for example:
+
+```bash
+$ idf.py build
+$ idf.py -D MICROPY_BOARD=GENERIC_SPIRAM build
+$ idf.py flash
+```
 
 Getting a Python prompt on the device
 -------------------------------------
@@ -262,6 +149,8 @@ or
 $ miniterm.py /dev/ttyUSB0 115200
 ```
 
+You can also use `idf.py monitor`.
+
 Configuring the WiFi and using the board
 ----------------------------------------
 
@@ -301,9 +190,27 @@ import machine
 antenna = machine.Pin(16, machine.Pin.OUT, value=0)
 ```
 
+Defining a custom ESP32 board
+-----------------------------
+
+The default ESP-IDF configuration settings are provided by the `GENERIC`
+board definition in the directory `boards/GENERIC`. For a custom configuration
+you can define your own board directory.  Start a new board configuration by
+copying an existing one (like `GENERIC`) and modifying it to suit your board.
+
+MicroPython specific configuration values are defined in the board-specific
+`mpconfigboard.h` file, which is included by `mpconfigport.h`.  Additional
+settings are put in `mpconfigboard.cmake`, including a list of `sdkconfig`
+files that configure ESP-IDF settings.  Some standard `sdkconfig` files are
+provided in the `boards/` directory, like `boards/sdkconfig.ble`.  You can
+also define custom ones in your board directory.
+
+See existing board definitions for further examples of configuration.
+
+Configuration
 Troubleshooting
 ---------------
 
-* Continuous reboots after programming: Ensure FLASH_MODE is correct for your
-  board (e.g. ESP-WROOM-32 should be DIO). Then perform a `make clean`, rebuild,
-  redeploy.
+* Continuous reboots after programming: Ensure `CONFIG_ESPTOOLPY_FLASHMODE` is
+  correct for your board (e.g. ESP-WROOM-32 should be DIO). Then perform a
+  `make clean`, rebuild, redeploy.

From d191d88cabec9bf328f6f46b11ce6642af70cfc7 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 15 Feb 2021 21:00:01 +1100
Subject: [PATCH 0611/3533] esp32: Add support to build with ESP-IDF v4.1.1.

ESP-IDF v4.0.2 is still supported.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/README.md           |  5 +++--
 ports/esp32/machine_uart.c      | 38 ++++++++++++++++++++++-----------
 ports/esp32/main/CMakeLists.txt |  4 ++++
 ports/esp32/modnetwork.c        | 13 +++++++----
 ports/esp32/modsocket.c         |  6 +++++-
 ports/esp32/uart.c              |  1 +
 6 files changed, 48 insertions(+), 19 deletions(-)

diff --git a/ports/esp32/README.md b/ports/esp32/README.md
index 4f63750593dc0..d8818ccadb6c3 100644
--- a/ports/esp32/README.md
+++ b/ports/esp32/README.md
@@ -28,8 +28,8 @@ manage the ESP32 microcontroller, as well as a way to manage the required
 build environment and toolchains needed to build the firmware.
 
 The ESP-IDF changes quickly and MicroPython only supports certain versions.
-Currently MicroPython supports v4.0.2, although other IDF v4 versions may also
-work.
+Currently MicroPython supports v4.0.2 and v4.1.1,
+although other IDF v4 versions may also work.
 
 To install the ESP-IDF the full instructions can be found at the
 [Espressif Getting Started guide](https://docs.espressif.com/projects/esp-idf/en/v4.0.2/get-started/index.html#installation-step-by-step).
@@ -50,6 +50,7 @@ To check out a copy of the IDF use git clone:
 $ git clone -b v4.0.2 --recursive https://github.com/espressif/esp-idf.git
 ```
 
+You can replace `v4.0.2` with `v4.1.1` or any other supported version.
 (You don't need a full recursive clone; see the `ci_esp32_setup` function in
 `tools/ci.sh` in this repository for more detailed set-up commands.)
 
diff --git a/ports/esp32/machine_uart.c b/ports/esp32/machine_uart.c
index c334e694b21b0..7fce83f2c4c2b 100644
--- a/ports/esp32/machine_uart.c
+++ b/ports/esp32/machine_uart.c
@@ -36,6 +36,20 @@
 #include "py/mperrno.h"
 #include "modmachine.h"
 
+#if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(4, 1, 0)
+#define UART_INV_TX UART_INVERSE_TXD
+#define UART_INV_RX UART_INVERSE_RXD
+#define UART_INV_RTS UART_INVERSE_RTS
+#define UART_INV_CTS UART_INVERSE_CTS
+#else
+#define UART_INV_TX UART_SIGNAL_TXD_INV
+#define UART_INV_RX UART_SIGNAL_RXD_INV
+#define UART_INV_RTS UART_SIGNAL_RTS_INV
+#define UART_INV_CTS UART_SIGNAL_CTS_INV
+#endif
+
+#define UART_INV_MASK (UART_INV_TX | UART_INV_RX | UART_INV_RTS | UART_INV_CTS)
+
 typedef struct _machine_uart_obj_t {
     mp_obj_base_t base;
     uart_port_t uart_num;
@@ -68,28 +82,28 @@ STATIC void machine_uart_print(const mp_print_t *print, mp_obj_t self_in, mp_pri
     if (self->invert) {
         mp_printf(print, ", invert=");
         uint32_t invert_mask = self->invert;
-        if (invert_mask & UART_INVERSE_TXD) {
+        if (invert_mask & UART_INV_TX) {
             mp_printf(print, "INV_TX");
-            invert_mask &= ~UART_INVERSE_TXD;
+            invert_mask &= ~UART_INV_TX;
             if (invert_mask) {
                 mp_printf(print, "|");
             }
         }
-        if (invert_mask & UART_INVERSE_RXD) {
+        if (invert_mask & UART_INV_RX) {
             mp_printf(print, "INV_RX");
-            invert_mask &= ~UART_INVERSE_RXD;
+            invert_mask &= ~UART_INV_RX;
             if (invert_mask) {
                 mp_printf(print, "|");
             }
         }
-        if (invert_mask & UART_INVERSE_RTS) {
+        if (invert_mask & UART_INV_RTS) {
             mp_printf(print, "INV_RTS");
-            invert_mask &= ~UART_INVERSE_RTS;
+            invert_mask &= ~UART_INV_RTS;
             if (invert_mask) {
                 mp_printf(print, "|");
             }
         }
-        if (invert_mask & UART_INVERSE_CTS) {
+        if (invert_mask & UART_INV_CTS) {
             mp_printf(print, "INV_CTS");
         }
     }
@@ -238,7 +252,7 @@ STATIC void machine_uart_init_helper(machine_uart_obj_t *self, size_t n_args, co
     }
 
     // set line inversion
-    if (args[ARG_invert].u_int & ~UART_LINE_INV_MASK) {
+    if (args[ARG_invert].u_int & ~UART_INV_MASK) {
         mp_raise_ValueError(MP_ERROR_TEXT("invalid inversion mask"));
     }
     self->invert = args[ARG_invert].u_int;
@@ -380,10 +394,10 @@ STATIC const mp_rom_map_elem_t machine_uart_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_write), MP_ROM_PTR(&mp_stream_write_obj) },
     { MP_ROM_QSTR(MP_QSTR_sendbreak), MP_ROM_PTR(&machine_uart_sendbreak_obj) },
 
-    { MP_ROM_QSTR(MP_QSTR_INV_TX), MP_ROM_INT(UART_INVERSE_TXD) },
-    { MP_ROM_QSTR(MP_QSTR_INV_RX), MP_ROM_INT(UART_INVERSE_RXD) },
-    { MP_ROM_QSTR(MP_QSTR_INV_RTS), MP_ROM_INT(UART_INVERSE_RTS) },
-    { MP_ROM_QSTR(MP_QSTR_INV_CTS), MP_ROM_INT(UART_INVERSE_CTS) },
+    { MP_ROM_QSTR(MP_QSTR_INV_TX), MP_ROM_INT(UART_INV_TX) },
+    { MP_ROM_QSTR(MP_QSTR_INV_RX), MP_ROM_INT(UART_INV_RX) },
+    { MP_ROM_QSTR(MP_QSTR_INV_RTS), MP_ROM_INT(UART_INV_RTS) },
+    { MP_ROM_QSTR(MP_QSTR_INV_CTS), MP_ROM_INT(UART_INV_CTS) },
 };
 
 STATIC MP_DEFINE_CONST_DICT(machine_uart_locals_dict, machine_uart_locals_dict_table);
diff --git a/ports/esp32/main/CMakeLists.txt b/ports/esp32/main/CMakeLists.txt
index eedf3ae9a511f..2455a4cdd2e94 100644
--- a/ports/esp32/main/CMakeLists.txt
+++ b/ports/esp32/main/CMakeLists.txt
@@ -104,6 +104,10 @@ set(IDF_COMPONENTS
     xtensa
 )
 
+if(IDF_VERSION_MINOR GREATER_EQUAL 1)
+    list(APPEND IDF_COMPONENTS esp_netif)
+endif()
+
 # Register the main IDF component.
 idf_component_register(
     SRCS
diff --git a/ports/esp32/modnetwork.c b/ports/esp32/modnetwork.c
index d981b60805007..f772fa2cf6420 100644
--- a/ports/esp32/modnetwork.c
+++ b/ports/esp32/modnetwork.c
@@ -45,7 +45,6 @@
 #include "esp_wifi.h"
 #include "esp_log.h"
 #include "lwip/dns.h"
-#include "tcpip_adapter.h"
 #include "mdns.h"
 
 #if !MICROPY_ESP_IDF_4
@@ -55,6 +54,12 @@
 
 #include "modnetwork.h"
 
+#if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(4, 1, 0)
+#define DNS_MAIN TCPIP_ADAPTER_DNS_MAIN
+#else
+#define DNS_MAIN ESP_NETIF_DNS_MAIN
+#endif
+
 #define MODNETWORK_INCLUDE_CONSTANTS (1)
 
 NORETURN void _esp_exceptions(esp_err_t e) {
@@ -491,7 +496,7 @@ STATIC mp_obj_t esp_ifconfig(size_t n_args, const mp_obj_t *args) {
     tcpip_adapter_ip_info_t info;
     tcpip_adapter_dns_info_t dns_info;
     tcpip_adapter_get_ip_info(self->if_id, &info);
-    tcpip_adapter_get_dns_info(self->if_id, TCPIP_ADAPTER_DNS_MAIN, &dns_info);
+    tcpip_adapter_get_dns_info(self->if_id, DNS_MAIN, &dns_info);
     if (n_args == 1) {
         // get
         mp_obj_t tuple[4] = {
@@ -526,14 +531,14 @@ STATIC mp_obj_t esp_ifconfig(size_t n_args, const mp_obj_t *args) {
                     _esp_exceptions(e);
                 }
                 ESP_EXCEPTIONS(tcpip_adapter_set_ip_info(self->if_id, &info));
-                ESP_EXCEPTIONS(tcpip_adapter_set_dns_info(self->if_id, TCPIP_ADAPTER_DNS_MAIN, &dns_info));
+                ESP_EXCEPTIONS(tcpip_adapter_set_dns_info(self->if_id, DNS_MAIN, &dns_info));
             } else if (self->if_id == WIFI_IF_AP) {
                 esp_err_t e = tcpip_adapter_dhcps_stop(WIFI_IF_AP);
                 if (e != ESP_OK && e != ESP_ERR_TCPIP_ADAPTER_DHCP_ALREADY_STOPPED) {
                     _esp_exceptions(e);
                 }
                 ESP_EXCEPTIONS(tcpip_adapter_set_ip_info(WIFI_IF_AP, &info));
-                ESP_EXCEPTIONS(tcpip_adapter_set_dns_info(WIFI_IF_AP, TCPIP_ADAPTER_DNS_MAIN, &dns_info));
+                ESP_EXCEPTIONS(tcpip_adapter_set_dns_info(WIFI_IF_AP, DNS_MAIN, &dns_info));
                 ESP_EXCEPTIONS(tcpip_adapter_dhcps_start(WIFI_IF_AP));
             }
         } else {
diff --git a/ports/esp32/modsocket.c b/ports/esp32/modsocket.c
index 85433e575fc51..8a4cf3e1659af 100644
--- a/ports/esp32/modsocket.c
+++ b/ports/esp32/modsocket.c
@@ -46,7 +46,6 @@
 #include "py/stream.h"
 #include "py/mperrno.h"
 #include "lib/netutils/netutils.h"
-#include "tcpip_adapter.h"
 #include "mdns.h"
 #include "modnetwork.h"
 
@@ -181,7 +180,12 @@ static int _socket_getaddrinfo3(const char *nodename, const char *servname,
         memcpy(nodename_no_local, nodename, nodename_len - local_len);
         nodename_no_local[nodename_len - local_len] = '\0';
 
+        #if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(4, 1, 0)
         struct ip4_addr addr = {0};
+        #else
+        esp_ip4_addr_t addr = {0};
+        #endif
+
         esp_err_t err = mdns_query_a(nodename_no_local, MDNS_QUERY_TIMEOUT_MS, &addr);
         if (err != ESP_OK) {
             if (err == ESP_ERR_NOT_FOUND) {
diff --git a/ports/esp32/uart.c b/ports/esp32/uart.c
index 381be7f4f016c..c837c8dcfe6a4 100644
--- a/ports/esp32/uart.c
+++ b/ports/esp32/uart.c
@@ -29,6 +29,7 @@
 #include <stdio.h>
 
 #include "driver/uart.h"
+#include "soc/uart_periph.h"
 
 #include "py/runtime.h"
 #include "py/mphal.h"

From a91500217757d9f7dc9791f014cfb465955f7d42 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 15 Feb 2021 21:00:09 +1100
Subject: [PATCH 0612/3533] esp32: Add support to build with ESP-IDF v4.2.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/README.md           |  2 +-
 ports/esp32/main/CMakeLists.txt | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/ports/esp32/README.md b/ports/esp32/README.md
index d8818ccadb6c3..c349f44b27ef3 100644
--- a/ports/esp32/README.md
+++ b/ports/esp32/README.md
@@ -28,7 +28,7 @@ manage the ESP32 microcontroller, as well as a way to manage the required
 build environment and toolchains needed to build the firmware.
 
 The ESP-IDF changes quickly and MicroPython only supports certain versions.
-Currently MicroPython supports v4.0.2 and v4.1.1,
+Currently MicroPython supports v4.0.2, v4.1.1 and v4.2,
 although other IDF v4 versions may also work.
 
 To install the ESP-IDF the full instructions can be found at the
diff --git a/ports/esp32/main/CMakeLists.txt b/ports/esp32/main/CMakeLists.txt
index 2455a4cdd2e94..52985383f92dd 100644
--- a/ports/esp32/main/CMakeLists.txt
+++ b/ports/esp32/main/CMakeLists.txt
@@ -108,6 +108,11 @@ if(IDF_VERSION_MINOR GREATER_EQUAL 1)
     list(APPEND IDF_COMPONENTS esp_netif)
 endif()
 
+if(IDF_VERSION_MINOR GREATER_EQUAL 2)
+    list(APPEND IDF_COMPONENTS esp_system)
+    list(APPEND IDF_COMPONENTS esp_timer)
+endif()
+
 # Register the main IDF component.
 idf_component_register(
     SRCS
@@ -169,5 +174,12 @@ foreach(comp ${IDF_COMPONENTS})
     endif()
 endforeach()
 
+if(IDF_VERSION_MINOR GREATER_EQUAL 2)
+    # These paths cannot currently be found by the IDF_COMPONENTS search loop above,
+    # so add them explicitly.
+    list(APPEND MICROPY_CPP_INC_EXTRA ${IDF_PATH}/components/soc/soc/${IDF_TARGET}/include)
+    list(APPEND MICROPY_CPP_INC_EXTRA ${IDF_PATH}/components/soc/soc/include)
+endif()
+
 # Include the main MicroPython cmake rules.
 include(${MICROPY_DIR}/py/mkrules.cmake)

From f12462ddc4cd847896a38412539a49ccb0579c94 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 15 Feb 2021 23:22:05 +1100
Subject: [PATCH 0613/3533] esp32: Remove obsolete IDF v3 code wrapped in
 MICROPY_ESP_IDF_4.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/esp32_ulp.c    |  4 ----
 ports/esp32/main.c         |  4 ----
 ports/esp32/modesp.c       |  3 ---
 ports/esp32/modmachine.c   |  6 ------
 ports/esp32/modsocket.c    | 12 ------------
 ports/esp32/mpconfigport.h |  4 ----
 ports/esp32/mphalport.c    |  5 -----
 ports/esp32/mpthreadport.c |  3 ---
 8 files changed, 41 deletions(-)

diff --git a/ports/esp32/esp32_ulp.c b/ports/esp32/esp32_ulp.c
index 4e9d768146301..50244cdf25060 100644
--- a/ports/esp32/esp32_ulp.c
+++ b/ports/esp32/esp32_ulp.c
@@ -85,11 +85,7 @@ STATIC const mp_rom_map_elem_t esp32_ulp_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_set_wakeup_period), MP_ROM_PTR(&esp32_ulp_set_wakeup_period_obj) },
     { MP_ROM_QSTR(MP_QSTR_load_binary), MP_ROM_PTR(&esp32_ulp_load_binary_obj) },
     { MP_ROM_QSTR(MP_QSTR_run), MP_ROM_PTR(&esp32_ulp_run_obj) },
-    #if !MICROPY_ESP_IDF_4
-    { MP_ROM_QSTR(MP_QSTR_RESERVE_MEM), MP_ROM_INT(CONFIG_ULP_COPROC_RESERVE_MEM) },
-    #else
     { MP_ROM_QSTR(MP_QSTR_RESERVE_MEM), MP_ROM_INT(CONFIG_ESP32_ULP_COPROC_RESERVE_MEM) },
-    #endif
 };
 STATIC MP_DEFINE_CONST_DICT(esp32_ulp_locals_dict, esp32_ulp_locals_dict_table);
 
diff --git a/ports/esp32/main.c b/ports/esp32/main.c
index 6f9ab82d0512a..001f2beaeb5e9 100644
--- a/ports/esp32/main.c
+++ b/ports/esp32/main.c
@@ -37,11 +37,7 @@
 #include "esp_task.h"
 #include "soc/cpu.h"
 #include "esp_log.h"
-#if MICROPY_ESP_IDF_4
 #include "esp32/spiram.h"
-#else
-#include "esp_spiram.h"
-#endif
 
 #include "py/stackctrl.h"
 #include "py/nlr.h"
diff --git a/ports/esp32/modesp.c b/ports/esp32/modesp.c
index 369649c119ffd..59a261e8c27ff 100644
--- a/ports/esp32/modesp.c
+++ b/ports/esp32/modesp.c
@@ -29,9 +29,6 @@
 
 #include <stdio.h>
 
-#if !MICROPY_ESP_IDF_4
-#include "rom/gpio.h"
-#endif
 #include "esp_log.h"
 #include "esp_spi_flash.h"
 
diff --git a/ports/esp32/modmachine.c b/ports/esp32/modmachine.c
index 303d25ee8b2d1..bb346ea1cd3fb 100644
--- a/ports/esp32/modmachine.c
+++ b/ports/esp32/modmachine.c
@@ -32,15 +32,9 @@
 
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"
-#if MICROPY_ESP_IDF_4
 #include "esp32/rom/rtc.h"
 #include "esp32/clk.h"
 #include "esp_sleep.h"
-#else
-#include "rom/ets_sys.h"
-#include "rom/rtc.h"
-#include "esp_clk.h"
-#endif
 #include "esp_pm.h"
 #include "driver/touch_pad.h"
 
diff --git a/ports/esp32/modsocket.c b/ports/esp32/modsocket.c
index 8a4cf3e1659af..ce7a714eb233c 100644
--- a/ports/esp32/modsocket.c
+++ b/ports/esp32/modsocket.c
@@ -55,18 +55,6 @@
 #include "lwip/igmp.h"
 #include "esp_log.h"
 
-#if !MICROPY_ESP_IDF_4
-#define lwip_bind lwip_bind_r
-#define lwip_listen lwip_listen_r
-#define lwip_accept lwip_accept_r
-#define lwip_setsockopt lwip_setsockopt_r
-#define lwip_fnctl lwip_fnctl_r
-#define lwip_recvfrom lwip_recvfrom_r
-#define lwip_write lwip_write_r
-#define lwip_sendto lwip_sendto_r
-#define lwip_close lwip_close_r
-#endif
-
 #define SOCKET_POLL_US (100000)
 #define MDNS_QUERY_TIMEOUT_MS (5000)
 #define MDNS_LOCAL_SUFFIX ".local"
diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h
index 34be9405e4eb5..7b0a00250b90f 100644
--- a/ports/esp32/mpconfigport.h
+++ b/ports/esp32/mpconfigport.h
@@ -8,10 +8,6 @@
 #include <alloca.h>
 #include "esp_system.h"
 
-#if !MICROPY_ESP_IDF_4
-#include "rom/ets_sys.h"
-#endif
-
 // object representation and NLR handling
 #define MICROPY_OBJ_REPR                    (MICROPY_OBJ_REPR_A)
 #define MICROPY_NLR_SETJMP                  (1)
diff --git a/ports/esp32/mphalport.c b/ports/esp32/mphalport.c
index 54033826847ba..65fa88e4d0780 100644
--- a/ports/esp32/mphalport.c
+++ b/ports/esp32/mphalport.c
@@ -32,12 +32,7 @@
 
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"
-
-#if MICROPY_ESP_IDF_4
 #include "esp32/rom/uart.h"
-#else
-#include "rom/uart.h"
-#endif
 
 #include "py/obj.h"
 #include "py/objstr.h"
diff --git a/ports/esp32/mpthreadport.c b/ports/esp32/mpthreadport.c
index d294c92727bf9..140a76464fe40 100644
--- a/ports/esp32/mpthreadport.c
+++ b/ports/esp32/mpthreadport.c
@@ -34,9 +34,6 @@
 #include "mpthreadport.h"
 
 #include "esp_task.h"
-#if !MICROPY_ESP_IDF_4
-#include "freertos/semphr.h"
-#endif
 
 #if MICROPY_PY_THREAD
 

From 771376a0cb26c7a74554ff421feff9c92eadceeb Mon Sep 17 00:00:00 2001
From: Thorsten von Eicken <tve@voneicken.com>
Date: Sat, 24 Oct 2020 12:34:23 -0700
Subject: [PATCH 0614/3533] esp32/modsocket: Remove unix socket error code
 translation.

The ESP-IDF has its own errno codes which should propagate out to the user.
---
 ports/esp32/modsocket.c | 28 +++++++++-------------------
 1 file changed, 9 insertions(+), 19 deletions(-)

diff --git a/ports/esp32/modsocket.c b/ports/esp32/modsocket.c
index ce7a714eb233c..61761d819445f 100644
--- a/ports/esp32/modsocket.c
+++ b/ports/esp32/modsocket.c
@@ -140,16 +140,6 @@ void usocket_events_handler(void) {
 
 #endif // MICROPY_PY_USOCKET_EVENTS
 
-NORETURN static void exception_from_errno(int _errno) {
-    // Here we need to convert from lwip errno values to MicroPython's standard ones
-    if (_errno == EADDRINUSE) {
-        _errno = MP_EADDRINUSE;
-    } else if (_errno == EINPROGRESS) {
-        _errno = MP_EINPROGRESS;
-    }
-    mp_raise_OSError(_errno);
-}
-
 static inline void check_for_exceptions(void) {
     mp_handle_pending(true);
 }
@@ -277,7 +267,7 @@ STATIC mp_obj_t socket_make_new(const mp_obj_type_t *type_in, size_t n_args, siz
 
     sock->fd = lwip_socket(sock->domain, sock->type, sock->proto);
     if (sock->fd < 0) {
-        exception_from_errno(errno);
+        mp_raise_OSError(errno);
     }
     _socket_settimeout(sock, UINT64_MAX);
 
@@ -291,7 +281,7 @@ STATIC mp_obj_t socket_bind(const mp_obj_t arg0, const mp_obj_t arg1) {
     int r = lwip_bind(self->fd, res->ai_addr, res->ai_addrlen);
     lwip_freeaddrinfo(res);
     if (r < 0) {
-        exception_from_errno(errno);
+        mp_raise_OSError(errno);
     }
     return mp_const_none;
 }
@@ -302,7 +292,7 @@ STATIC mp_obj_t socket_listen(const mp_obj_t arg0, const mp_obj_t arg1) {
     int backlog = mp_obj_get_int(arg1);
     int r = lwip_listen(self->fd, backlog);
     if (r < 0) {
-        exception_from_errno(errno);
+        mp_raise_OSError(errno);
     }
     return mp_const_none;
 }
@@ -323,7 +313,7 @@ STATIC mp_obj_t socket_accept(const mp_obj_t arg0) {
             break;
         }
         if (errno != EAGAIN) {
-            exception_from_errno(errno);
+            mp_raise_OSError(errno);
         }
         check_for_exceptions();
     }
@@ -365,7 +355,7 @@ STATIC mp_obj_t socket_connect(const mp_obj_t arg0, const mp_obj_t arg1) {
     MP_THREAD_GIL_ENTER();
     lwip_freeaddrinfo(res);
     if (r != 0) {
-        exception_from_errno(errno);
+        mp_raise_OSError(errno);
     }
 
     return mp_const_none;
@@ -384,7 +374,7 @@ STATIC mp_obj_t socket_setsockopt(size_t n_args, const mp_obj_t *args) {
             int val = mp_obj_get_int(args[3]);
             int ret = lwip_setsockopt(self->fd, SOL_SOCKET, opt, &val, sizeof(int));
             if (ret != 0) {
-                exception_from_errno(errno);
+                mp_raise_OSError(errno);
             }
             break;
         }
@@ -535,7 +525,7 @@ mp_obj_t _socket_recvfrom(mp_obj_t self_in, mp_obj_t len_in,
     int errcode;
     mp_uint_t ret = _socket_read_data(self_in, vstr.buf, len, from, from_len, &errcode);
     if (ret == MP_STREAM_ERROR) {
-        exception_from_errno(errcode);
+        mp_raise_OSError(errcode);
     }
 
     vstr.len = ret;
@@ -569,7 +559,7 @@ int _socket_send(socket_obj_t *sock, const char *data, size_t datalen) {
         int r = lwip_write(sock->fd, data + sentlen, datalen - sentlen);
         MP_THREAD_GIL_ENTER();
         if (r < 0 && errno != EWOULDBLOCK) {
-            exception_from_errno(errno);
+            mp_raise_OSError(errno);
         }
         if (r > 0) {
             sentlen += r;
@@ -627,7 +617,7 @@ STATIC mp_obj_t socket_sendto(mp_obj_t self_in, mp_obj_t data_in, mp_obj_t addr_
             return mp_obj_new_int_from_uint(ret);
         }
         if (ret == -1 && errno != EWOULDBLOCK) {
-            exception_from_errno(errno);
+            mp_raise_OSError(errno);
         }
         check_for_exceptions();
     }

From 902da05a180d40e62373656f8be94a01ca39eb94 Mon Sep 17 00:00:00 2001
From: Thorsten von Eicken <tve@voneicken.com>
Date: Wed, 11 Nov 2020 17:46:18 -0800
Subject: [PATCH 0615/3533] esp32: Set MICROPY_USE_INTERNAL_ERRNO=0 to use
 toolchain's errno.h.

The underlying OS (the ESP-IDF) uses it's own internal errno codes and so
it's simpler and cleaner to use those rather than trying to convert
everything to the values defined in py/mperrno.h.
---
 ports/esp32/mpconfigport.h           | 2 +-
 tests/net_hosted/connect_nonblock.py | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h
index 7b0a00250b90f..392f8c749c240 100644
--- a/ports/esp32/mpconfigport.h
+++ b/ports/esp32/mpconfigport.h
@@ -51,7 +51,7 @@
 #define MICROPY_MODULE_FROZEN_MPY           (1)
 #define MICROPY_QSTR_EXTRA_POOL             mp_qstr_frozen_const_pool
 #define MICROPY_CAN_OVERRIDE_BUILTINS       (1)
-#define MICROPY_USE_INTERNAL_ERRNO          (1)
+#define MICROPY_USE_INTERNAL_ERRNO          (0) // errno.h from xtensa-esp32-elf/sys-include/sys
 #define MICROPY_USE_INTERNAL_PRINTF         (0) // ESP32 SDK requires its own printf
 #define MICROPY_ENABLE_SCHEDULER            (1)
 #define MICROPY_SCHEDULER_DEPTH             (8)
diff --git a/tests/net_hosted/connect_nonblock.py b/tests/net_hosted/connect_nonblock.py
index 3a3eaa2ba01e4..c024b65a0a9a3 100644
--- a/tests/net_hosted/connect_nonblock.py
+++ b/tests/net_hosted/connect_nonblock.py
@@ -2,8 +2,9 @@
 
 try:
     import usocket as socket
+    import uerrno as errno
 except:
-    import socket
+    import socket, errno
 
 
 def test(peer_addr):
@@ -12,7 +13,7 @@ def test(peer_addr):
     try:
         s.connect(peer_addr)
     except OSError as er:
-        print(er.args[0] == 115)  # 115 is EINPROGRESS
+        print(er.args[0] == errno.EINPROGRESS)
     s.close()
 
 

From a1a28157993756255eca067acb23145b08151546 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Fri, 12 Feb 2021 13:25:11 +1100
Subject: [PATCH 0616/3533] extmod/nimble: Ensure handle is set on read error.

On error, the handle is only available on err->att_handle rather than
in attr->handle used in the non-error case.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 extmod/nimble/modbluetooth_nimble.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/extmod/nimble/modbluetooth_nimble.c b/extmod/nimble/modbluetooth_nimble.c
index a2eb8a588c67e..3910c599cb72b 100644
--- a/extmod/nimble/modbluetooth_nimble.c
+++ b/extmod/nimble/modbluetooth_nimble.c
@@ -1281,14 +1281,15 @@ int mp_bluetooth_gattc_discover_descriptors(uint16_t conn_handle, uint16_t start
 }
 
 STATIC int ble_gatt_attr_read_cb(uint16_t conn_handle, const struct ble_gatt_error *error, struct ble_gatt_attr *attr, void *arg) {
-    DEBUG_printf("ble_gatt_attr_read_cb: conn_handle=%d status=%d handle=%d\n", conn_handle, error->status, attr ? attr->handle : -1);
+    uint16_t handle = attr ? attr->handle : (error ? error->att_handle : 0xffff);
+    DEBUG_printf("ble_gatt_attr_read_cb: conn_handle=%d status=%d handle=%d\n", conn_handle, error->status, handle);
     if (!mp_bluetooth_is_active()) {
         return 0;
     }
     if (error->status == 0) {
         gattc_on_data_available(MP_BLUETOOTH_IRQ_GATTC_READ_RESULT, conn_handle, attr->handle, attr->om);
     }
-    mp_bluetooth_gattc_on_read_write_status(MP_BLUETOOTH_IRQ_GATTC_READ_DONE, conn_handle, attr ? attr->handle : -1, error->status);
+    mp_bluetooth_gattc_on_read_write_status(MP_BLUETOOTH_IRQ_GATTC_READ_DONE, conn_handle, handle, error->status);
     return 0;
 }
 
@@ -1302,11 +1303,12 @@ int mp_bluetooth_gattc_read(uint16_t conn_handle, uint16_t value_handle) {
 }
 
 STATIC int ble_gatt_attr_write_cb(uint16_t conn_handle, const struct ble_gatt_error *error, struct ble_gatt_attr *attr, void *arg) {
-    DEBUG_printf("ble_gatt_attr_write_cb: conn_handle=%d status=%d handle=%d\n", conn_handle, error->status, attr ? attr->handle : -1);
+    uint16_t handle = attr ? attr->handle : (error ? error->att_handle : 0xffff);
+    DEBUG_printf("ble_gatt_attr_write_cb: conn_handle=%d status=%d handle=%d\n", conn_handle, error->status, handle);
     if (!mp_bluetooth_is_active()) {
         return 0;
     }
-    mp_bluetooth_gattc_on_read_write_status(MP_BLUETOOTH_IRQ_GATTC_WRITE_DONE, conn_handle, attr->handle, error->status);
+    mp_bluetooth_gattc_on_read_write_status(MP_BLUETOOTH_IRQ_GATTC_WRITE_DONE, conn_handle, handle, error->status);
     return 0;
 }
 

From fce0bd1a2af5aebd81d30d79b50210c80f768bc4 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Mon, 1 Feb 2021 13:12:23 +1100
Subject: [PATCH 0617/3533] extmod/moduselect: Fix unsigned/signed comparison
 for timeout!=-1.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 extmod/moduselect.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/extmod/moduselect.c b/extmod/moduselect.c
index 80beb8e09b8aa..6d8249f42758f 100644
--- a/extmod/moduselect.c
+++ b/extmod/moduselect.c
@@ -148,7 +148,7 @@ STATIC mp_obj_t select_select(size_t n_args, const mp_obj_t *args) {
         // poll the objects
         mp_uint_t n_ready = poll_map_poll(&poll_map, rwx_len);
 
-        if (n_ready > 0 || (timeout != -1 && mp_hal_ticks_ms() - start_tick >= timeout)) {
+        if (n_ready > 0 || (timeout != (mp_uint_t)-1 && mp_hal_ticks_ms() - start_tick >= timeout)) {
             // one or more objects are ready, or we had a timeout
             mp_obj_t list_array[3];
             list_array[0] = mp_obj_new_list(rwx_len[0], NULL);
@@ -250,7 +250,7 @@ STATIC mp_uint_t poll_poll_internal(uint n_args, const mp_obj_t *args) {
     for (;;) {
         // poll the objects
         n_ready = poll_map_poll(&self->poll_map, NULL);
-        if (n_ready > 0 || (timeout != -1 && mp_hal_ticks_ms() - start_tick >= timeout)) {
+        if (n_ready > 0 || (timeout != (mp_uint_t)-1 && mp_hal_ticks_ms() - start_tick >= timeout)) {
             break;
         }
         MICROPY_EVENT_POLL_HOOK

From 4c54012373e6546704f534d0de3e900704ae9d11 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Mon, 15 Feb 2021 15:49:20 +1100
Subject: [PATCH 0618/3533] unix/moduselect: Don't allow both posix and
 non-posix configurations.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/unix/moduselect.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ports/unix/moduselect.c b/ports/unix/moduselect.c
index 6a0ee79aa6f0d..a9390a146bd05 100644
--- a/ports/unix/moduselect.c
+++ b/ports/unix/moduselect.c
@@ -29,6 +29,10 @@
 
 #if MICROPY_PY_USELECT_POSIX
 
+#if MICROPY_PY_USELECT
+#error "Can't have both MICROPY_PY_USELECT and MICROPY_PY_USELECT_POSIX."
+#endif
+
 #include <stdio.h>
 #include <errno.h>
 #include <poll.h>

From 5e96e89999cd3b922dbc1a6ed473b44c81db92f4 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Fri, 12 Feb 2021 14:14:07 +1100
Subject: [PATCH 0619/3533] extmod/uasyncio: Add ThreadSafeFlag.

This is a MicroPython-extension that allows for code running in IRQ
(hard or soft) or scheduler context to sequence asyncio code.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 extmod/uasyncio/__init__.py |  1 +
 extmod/uasyncio/event.py    | 31 +++++++++++++++++++++++++++++++
 2 files changed, 32 insertions(+)

diff --git a/extmod/uasyncio/__init__.py b/extmod/uasyncio/__init__.py
index 08f924cf29b9b..fa64438f6b2a0 100644
--- a/extmod/uasyncio/__init__.py
+++ b/extmod/uasyncio/__init__.py
@@ -10,6 +10,7 @@
     "wait_for_ms": "funcs",
     "gather": "funcs",
     "Event": "event",
+    "ThreadSafeFlag": "event",
     "Lock": "lock",
     "open_connection": "stream",
     "start_server": "stream",
diff --git a/extmod/uasyncio/event.py b/extmod/uasyncio/event.py
index 31cb00e055deb..c28ad1fb31687 100644
--- a/extmod/uasyncio/event.py
+++ b/extmod/uasyncio/event.py
@@ -14,6 +14,8 @@ def is_set(self):
 
     def set(self):
         # Event becomes set, schedule any tasks waiting on it
+        # Note: This must not be called from anything except the thread running
+        # the asyncio loop (i.e. neither hard or soft IRQ, or a different thread).
         while self.waiting.peek():
             core._task_queue.push_head(self.waiting.pop_head())
         self.state = True
@@ -29,3 +31,32 @@ async def wait(self):
             core.cur_task.data = self.waiting
             yield
         return True
+
+
+# MicroPython-extension: This can be set from outside the asyncio event loop,
+# such as other threads, IRQs or scheduler context. Implementation is a stream
+# that asyncio will poll until a flag is set.
+# Note: Unlike Event, this is self-clearing.
+try:
+    import uio
+
+    class ThreadSafeFlag(uio.IOBase):
+        def __init__(self):
+            self._flag = 0
+
+        def ioctl(self, req, flags):
+            if req == 3:  # MP_STREAM_POLL
+                return self._flag * flags
+            return None
+
+        def set(self):
+            self._flag = 1
+
+        async def wait(self):
+            if not self._flag:
+                yield core._io_queue.queue_read(self)
+            self._flag = 0
+
+
+except ImportError:
+    pass

From cdf9c8648f81dd4f2795a71b075aab75f01a9f1f Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Mon, 15 Feb 2021 17:28:15 +1100
Subject: [PATCH 0620/3533] docs/library/uasyncio.rst: Add docs for
 ThreadSafeFlag.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 docs/library/uasyncio.rst | 28 +++++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/docs/library/uasyncio.rst b/docs/library/uasyncio.rst
index 3316f908d6364..1efee56e9688b 100644
--- a/docs/library/uasyncio.rst
+++ b/docs/library/uasyncio.rst
@@ -125,6 +125,9 @@ class Event
 
     Set the event.  Any tasks waiting on the event will be scheduled to run.
 
+    Note: This must be called from within a task. It is not safe to call this
+    from an IRQ, scheduler callback, or other thread. See `ThreadSafeFlag`.
+
 .. method:: Event.clear()
 
     Clear the event.
@@ -136,6 +139,29 @@ class Event
 
     This is a coroutine.
 
+class ThreadSafeFlag
+--------------------
+
+.. class:: ThreadSafeFlag()
+
+    Create a new flag which can be used to synchronise a task with code running
+    outside the asyncio loop, such as other threads, IRQs, or scheduler
+    callbacks.  Flags start in the cleared state.
+
+.. method:: ThreadSafeFlag.set()
+
+    Set the flag.  If there is a task waiting on the event, it will be scheduled
+    to run.
+
+.. method:: ThreadSafeFlag.wait()
+
+    Wait for the flag to be set.  If the flag is already set then it returns
+    immediately.
+
+    A flag may only be waited on by a single task at a time.
+
+    This is a coroutine.
+
 class Lock
 ----------
 
@@ -188,7 +214,7 @@ TCP stream connections
     This is a coroutine.
 
 .. class:: Stream()
-    
+
     This represents a TCP stream connection.  To minimise code this class implements
     both a reader and a writer, and both ``StreamReader`` and ``StreamWriter`` alias to
     this class.

From 83d23059ef80d0d28d1e0769a721c83665b0095f Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Mon, 15 Feb 2021 17:28:39 +1100
Subject: [PATCH 0621/3533] tests/extmod: Add test for ThreadSafeFlag.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 tests/extmod/uasyncio_threadsafeflag.py     | 79 +++++++++++++++++++++
 tests/extmod/uasyncio_threadsafeflag.py.exp | 21 ++++++
 2 files changed, 100 insertions(+)
 create mode 100644 tests/extmod/uasyncio_threadsafeflag.py
 create mode 100644 tests/extmod/uasyncio_threadsafeflag.py.exp

diff --git a/tests/extmod/uasyncio_threadsafeflag.py b/tests/extmod/uasyncio_threadsafeflag.py
new file mode 100644
index 0000000000000..4e002a3d2a0b1
--- /dev/null
+++ b/tests/extmod/uasyncio_threadsafeflag.py
@@ -0,0 +1,79 @@
+# Test Event class
+
+try:
+    import uasyncio as asyncio
+except ImportError:
+    print("SKIP")
+    raise SystemExit
+
+
+import micropython
+
+try:
+    micropython.schedule
+except AttributeError:
+    print("SKIP")
+    raise SystemExit
+
+
+try:
+    # Unix port can't select/poll on user-defined types.
+    import uselect as select
+
+    poller = select.poll()
+    poller.register(asyncio.ThreadSafeFlag())
+except TypeError:
+    print("SKIP")
+    raise SystemExit
+
+
+async def task(id, flag):
+    print("task", id)
+    await flag.wait()
+    print("task", id, "done")
+
+
+def set_from_schedule(flag):
+    print("schedule")
+    flag.set()
+    print("schedule done")
+
+
+async def main():
+    flag = asyncio.ThreadSafeFlag()
+
+    # Set the flag from within the loop.
+    t = asyncio.create_task(task(1, flag))
+    print("yield")
+    await asyncio.sleep(0)
+    print("set event")
+    flag.set()
+    print("yield")
+    await asyncio.sleep(0)
+    print("wait task")
+    await t
+
+    # Set the flag from scheduler context.
+    print("----")
+    t = asyncio.create_task(task(2, flag))
+    print("yield")
+    await asyncio.sleep(0)
+    print("set event")
+    micropython.schedule(set_from_schedule, flag)
+    print("yield")
+    await asyncio.sleep(0)
+    print("wait task")
+    await t
+
+    # Flag already set.
+    print("----")
+    print("set event")
+    flag.set()
+    t = asyncio.create_task(task(3, flag))
+    print("yield")
+    await asyncio.sleep(0)
+    print("wait task")
+    await t
+
+
+asyncio.run(main())
diff --git a/tests/extmod/uasyncio_threadsafeflag.py.exp b/tests/extmod/uasyncio_threadsafeflag.py.exp
new file mode 100644
index 0000000000000..aef4e479ba447
--- /dev/null
+++ b/tests/extmod/uasyncio_threadsafeflag.py.exp
@@ -0,0 +1,21 @@
+yield
+task 1
+set event
+yield
+wait task
+task 1 done
+----
+yield
+task 2
+set event
+yield
+schedule
+schedule done
+wait task
+task 2 done
+----
+set event
+yield
+task 3
+task 3 done
+wait task

From 566020034fc64448d33718c575809fcfe8f271db Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Fri, 12 Feb 2021 16:11:38 +1100
Subject: [PATCH 0622/3533] tools/makemanifest.py: Allow passing option args to
 include().

This allows customising which features can be enabled in a frozen library.

e.g. `include("path.py", extra_features=True)`

in path.py:

    options.defaults(standard_features=True)

    if options.standard_features:
        # freeze standard modules.
    if options.extra_features:
        # freeze extra modules.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 tools/makemanifest.py | 30 ++++++++++++++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)

diff --git a/tools/makemanifest.py b/tools/makemanifest.py
index c07a3a6c77ab2..117d1536e87d1 100644
--- a/tools/makemanifest.py
+++ b/tools/makemanifest.py
@@ -34,13 +34,27 @@
 # Public functions to be used in the manifest
 
 
-def include(manifest):
+def include(manifest, **kwargs):
     """Include another manifest.
 
     The manifest argument can be a string (filename) or an iterable of
     strings.
 
     Relative paths are resolved with respect to the current manifest file.
+
+    Optional kwargs can be provided which will be available to the
+    included script via the `options` variable.
+
+    e.g. include("path.py", extra_features=True)
+
+    in path.py:
+        options.defaults(standard_features=True)
+
+        # freeze minimal modules.
+        if options.standard_features:
+            # freeze standard modules.
+        if options.extra_features:
+            # freeze extra modules.
     """
 
     if not isinstance(manifest, str):
@@ -53,7 +67,7 @@ def include(manifest):
             # Applies to includes and input files.
             prev_cwd = os.getcwd()
             os.chdir(os.path.dirname(manifest))
-            exec(f.read())
+            exec(f.read(), globals(), {"options": IncludeOptions(**kwargs)})
             os.chdir(prev_cwd)
 
 
@@ -125,6 +139,18 @@ def freeze_mpy(path, script=None, opt=0):
 manifest_list = []
 
 
+class IncludeOptions:
+    def __init__(self, **kwargs):
+        self._kwargs = kwargs
+        self._defaults = {}
+
+    def defaults(self, **kwargs):
+        self._defaults = kwargs
+
+    def __getattr__(self, name):
+        return self._kwargs.get(name, self._defaults.get(name, None))
+
+
 class FreezeError(Exception):
     pass
 

From 2aa57931a6e23e39adddc717c25fa8a499966cb9 Mon Sep 17 00:00:00 2001
From: Maureen Helm <maureen.helm@nxp.com>
Date: Mon, 15 Feb 2021 08:51:48 -0600
Subject: [PATCH 0623/3533] zephyr: Update to zephyr v2.5.0.

Updates the zephyr port build instructions and CI to use the latest
zephyr release tag.

Signed-off-by: Maureen Helm <maureen.helm@nxp.com>
---
 ports/zephyr/README.md | 6 +++---
 tools/ci.sh            | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ports/zephyr/README.md b/ports/zephyr/README.md
index d69030dc2c712..d1cc841977fe4 100644
--- a/ports/zephyr/README.md
+++ b/ports/zephyr/README.md
@@ -4,7 +4,7 @@ MicroPython port to Zephyr RTOS
 This is a work-in-progress port of MicroPython to Zephyr RTOS
 (http://zephyrproject.org).
 
-This port requires Zephyr version 2.4.0, and may also work on higher
+This port requires Zephyr version v2.5.0, and may also work on higher
 versions.  All boards supported
 by Zephyr (with standard level of features support, like UART console)
 should work with MicroPython (but not all were tested).
@@ -38,13 +38,13 @@ setup is correct.
 If you already have Zephyr installed but are having issues building the
 MicroPython port then try installing the correct version of Zephyr via:
 
-    $ west init zephyrproject -m https://github.com/zephyrproject-rtos/zephyr --mr v2.4.0
+    $ west init zephyrproject -m https://github.com/zephyrproject-rtos/zephyr --mr v2.5.0
 
 Alternatively, you don't have to redo the Zephyr installation to just
 switch from master to a tagged release, you can instead do:
 
     $ cd zephyrproject/zephyr
-    $ git checkout v2.4.0
+    $ git checkout v2.5.0
     $ west update
 
 With Zephyr installed you may then need to configure your environment,
diff --git a/tools/ci.sh b/tools/ci.sh
index 4f99551468c59..d945375562551 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -466,7 +466,7 @@ function ci_zephyr_setup {
 }
 
 function ci_zephyr_install {
-    docker exec zephyr-ci west init --mr v2.4.0 /zephyrproject
+    docker exec zephyr-ci west init --mr v2.5.0 /zephyrproject
     docker exec -w /zephyrproject zephyr-ci west update
     docker exec -w /zephyrproject zephyr-ci west zephyr-export
 }

From dff6fc64d23c548dce2b43096c3f1522db303de8 Mon Sep 17 00:00:00 2001
From: Maureen Helm <maureen.helm@nxp.com>
Date: Tue, 10 Nov 2020 19:05:30 -0600
Subject: [PATCH 0624/3533] py: Expand lists in core cmake custom commands.

The core cmake rules use custom commands to invoke qstr processing
scripts. For the zephyr port, it's possible that list arguments to these
commands may contain generator expressions, therefore we need to expand
them properly.

Signed-off-by: Maureen Helm <maureen.helm@nxp.com>
---
 py/mkrules.cmake | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/py/mkrules.cmake b/py/mkrules.cmake
index bdff385815a44..e05dcb836a211 100644
--- a/py/mkrules.cmake
+++ b/py/mkrules.cmake
@@ -73,6 +73,7 @@ add_custom_command(
     DEPENDS ${MICROPY_MODULEDEFS}
         ${MICROPY_SOURCE_QSTR}
     VERBATIM
+    COMMAND_EXPAND_LISTS
 )
 
 add_custom_command(
@@ -81,6 +82,7 @@ add_custom_command(
     COMMAND touch ${MICROPY_QSTR_DEFS_SPLIT}
     DEPENDS ${MICROPY_QSTR_DEFS_LAST}
     VERBATIM
+    COMMAND_EXPAND_LISTS
 )
 
 add_custom_command(
@@ -88,6 +90,7 @@ add_custom_command(
     COMMAND ${Python3_EXECUTABLE} ${MICROPY_PY_DIR}/makeqstrdefs.py cat qstr _ ${MICROPY_GENHDR_DIR}/qstr ${MICROPY_QSTR_DEFS_COLLECTED}
     DEPENDS ${MICROPY_QSTR_DEFS_SPLIT}
     VERBATIM
+    COMMAND_EXPAND_LISTS
 )
 
 add_custom_command(
@@ -95,6 +98,7 @@ add_custom_command(
     COMMAND cat ${MICROPY_PY_QSTRDEFS} ${MICROPY_QSTR_DEFS_COLLECTED} | sed "s/^Q(.*)/\"&\"/" | ${CMAKE_C_COMPILER} -E ${MICROPY_CPP_FLAGS} - | sed "s/^\\\"\\(Q(.*)\\)\\\"/\\1/" > ${MICROPY_QSTR_DEFS_PREPROCESSED}
     DEPENDS ${MICROPY_QSTR_DEFS_COLLECTED}
     VERBATIM
+    COMMAND_EXPAND_LISTS
 )
 
 add_custom_command(
@@ -102,6 +106,7 @@ add_custom_command(
     COMMAND ${Python3_EXECUTABLE} ${MICROPY_PY_DIR}/makeqstrdata.py ${MICROPY_QSTR_DEFS_PREPROCESSED} > ${MICROPY_QSTR_DEFS_GENERATED}
     DEPENDS ${MICROPY_QSTR_DEFS_PREPROCESSED}
     VERBATIM
+    COMMAND_EXPAND_LISTS
 )
 
 # Build frozen code if enabled

From f49a73641ac677ea49a031ae7efc5822441f0cb5 Mon Sep 17 00:00:00 2001
From: Maureen Helm <maureen.helm@nxp.com>
Date: Sun, 18 Oct 2020 14:54:38 -0500
Subject: [PATCH 0625/3533] zephyr: Disable frozen source modules.

Disables frozen source modules in the zephyr port. They are deprecated
in the makefile rules and not implemented in the new cmake rules.

Signed-off-by: Maureen Helm <maureen.helm@nxp.com>
---
 ports/zephyr/mpconfigport.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/zephyr/mpconfigport.h b/ports/zephyr/mpconfigport.h
index 6bfd9ff884f1b..966f7f7e94a1d 100644
--- a/ports/zephyr/mpconfigport.h
+++ b/ports/zephyr/mpconfigport.h
@@ -110,7 +110,7 @@
 #define MICROPY_HW_MCU_NAME "unknown-cpu"
 #endif
 
-#define MICROPY_MODULE_FROZEN_STR   (1)
+#define MICROPY_MODULE_FROZEN_STR   (0)
 
 typedef int mp_int_t; // must be pointer size
 typedef unsigned mp_uint_t; // must be pointer size

From 51fa1339f12bace6be49647336f8c9bf57302d4d Mon Sep 17 00:00:00 2001
From: Maureen Helm <maureen.helm@nxp.com>
Date: Fri, 28 Aug 2020 14:26:31 -0500
Subject: [PATCH 0626/3533] zephyr: Remove unused build files.

Removes zephyr port build files that aren't being used anymore.

Signed-off-by: Maureen Helm <maureen.helm@nxp.com>
---
 ports/zephyr/Kbuild          |  3 ---
 ports/zephyr/Makefile.zephyr | 30 ------------------------------
 ports/zephyr/src/Makefile    | 17 -----------------
 ports/zephyr/z_config.mk     | 17 -----------------
 4 files changed, 67 deletions(-)
 delete mode 100644 ports/zephyr/Kbuild
 delete mode 100644 ports/zephyr/Makefile.zephyr
 delete mode 100644 ports/zephyr/src/Makefile
 delete mode 100644 ports/zephyr/z_config.mk

diff --git a/ports/zephyr/Kbuild b/ports/zephyr/Kbuild
deleted file mode 100644
index 9e656d5f48a9b..0000000000000
--- a/ports/zephyr/Kbuild
+++ /dev/null
@@ -1,3 +0,0 @@
-#subdir-ccflags-y += -I$(SOURCE_DIR)/../mylib/include
-
-obj-y += src/
diff --git a/ports/zephyr/Makefile.zephyr b/ports/zephyr/Makefile.zephyr
deleted file mode 100644
index 16f0a9452f02b..0000000000000
--- a/ports/zephyr/Makefile.zephyr
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-# Copyright (c) 2016 Intel Corporation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-KERNEL_TYPE = micro
-# BOARD must be passed on command line from main Makefile
-#BOARD =
-CONF_FILE = prj.conf
-QEMU_NET = 1
-
-#export SOURCE_DIR = $(ZEPHYR_BASE)/samples/static_lib/hello_world
-export LDFLAGS_zephyr += -L$(CURDIR)
-export ALL_LIBS += micropython
-
-include ${ZEPHYR_BASE}/Makefile.inc
-ifeq ($(QEMU_NET), 1)
-include ${ZEPHYR_BASE}/samples/net/common/Makefile.ipstack
-endif
diff --git a/ports/zephyr/src/Makefile b/ports/zephyr/src/Makefile
deleted file mode 100644
index 36dd8c64efe6a..0000000000000
--- a/ports/zephyr/src/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# Copyright (c) 2016 Intel Corporation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-obj-y += zephyr_start.o zephyr_getchar.o
diff --git a/ports/zephyr/z_config.mk b/ports/zephyr/z_config.mk
deleted file mode 100644
index 28addd8f29fc7..0000000000000
--- a/ports/zephyr/z_config.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-srctree = $(ZEPHYR_BASE)
-
-include $(Z_DOTCONFIG)
-override ARCH = $(subst $(DQUOTE),,$(CONFIG_ARCH))
-SOC_NAME = $(subst $(DQUOTE),,$(CONFIG_SOC))
-SOC_SERIES = $(subst $(DQUOTE),,$(CONFIG_SOC_SERIES))
-SOC_FAMILY = $(subst $(DQUOTE),,$(CONFIG_SOC_FAMILY))
-ifeq ($(SOC_SERIES),)
-SOC_PATH = $(SOC_NAME)
-else
-SOC_PATH = $(SOC_FAMILY)/$(SOC_SERIES)
-endif
-
-KBUILD_CFLAGS := -c
-include $(ZEPHYR_BASE)/scripts/Kbuild.include
-
-include $(ZEPHYR_BASE)/arch/$(ARCH)/Makefile

From f573e73baeddfb8fde59413e8053b538cf908f9b Mon Sep 17 00:00:00 2001
From: Maureen Helm <maureen.helm@nxp.com>
Date: Sun, 11 Oct 2020 13:11:31 -0500
Subject: [PATCH 0627/3533] zephyr: Build MicroPython as a cmake target.

Refactors the zephyr build infrastructure to build MicroPython as a
cmake target, using the recently introduced core cmake rules.

This change makes it possible to build the zephyr port like most other
zephyr applications using west or cmake directly. It simplifies building
with extra cmake arguments, such as specifying an alternate conf file or
adding an Arduino shield. It also enables building the zephyr port
anywhere in the host file system, which will allow regressing across
multiple boards with the zephyr twister script.

Signed-off-by: Maureen Helm <maureen.helm@nxp.com>
---
 ports/zephyr/.gitignore     |   1 -
 ports/zephyr/CMakeLists.txt | 134 ++++++++++++++++++++++++++++++------
 ports/zephyr/Kconfig        |  46 +++++++++++++
 ports/zephyr/Makefile       | 116 -------------------------------
 ports/zephyr/README.md      |  56 +++++++--------
 ports/zephyr/make-minimal   |  18 -----
 ports/zephyr/prj.conf       |   5 ++
 tools/ci.sh                 |  13 ++--
 8 files changed, 201 insertions(+), 188 deletions(-)
 delete mode 100644 ports/zephyr/.gitignore
 create mode 100644 ports/zephyr/Kconfig
 delete mode 100644 ports/zephyr/Makefile
 delete mode 100755 ports/zephyr/make-minimal

diff --git a/ports/zephyr/.gitignore b/ports/zephyr/.gitignore
deleted file mode 100644
index 00ca089d1598e..0000000000000
--- a/ports/zephyr/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-outdir/
diff --git a/ports/zephyr/CMakeLists.txt b/ports/zephyr/CMakeLists.txt
index 50cd031d4dd08..08868d716dc9e 100644
--- a/ports/zephyr/CMakeLists.txt
+++ b/ports/zephyr/CMakeLists.txt
@@ -1,24 +1,118 @@
+# This file is part of the MicroPython project, http://micropython.org/
+#
+# The MIT License (MIT)
+#
+# Copyright 2020 NXP
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
 cmake_minimum_required(VERSION 3.13.1)
 
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
-project(NONE)
-
-target_sources(app PRIVATE src/zephyr_start.c src/zephyr_getchar.c)
-
-add_library(libmicropython STATIC IMPORTED)
-set_target_properties(libmicropython PROPERTIES IMPORTED_LOCATION ${CMAKE_CURRENT_SOURCE_DIR}/libmicropython.a)
-target_link_libraries(app PUBLIC libmicropython)
-
-zephyr_get_include_directories_for_lang_as_string(C includes)
-zephyr_get_system_include_directories_for_lang_as_string(C system_includes)
-zephyr_get_compile_definitions_for_lang_as_string(C definitions)
-zephyr_get_compile_options_for_lang_as_string(C options)
-
-add_custom_target(
-  outputexports
-  COMMAND echo CC="${CMAKE_C_COMPILER}"
-  COMMAND echo AR="${CMAKE_AR}"
-  COMMAND echo Z_CFLAGS=${system_includes} ${includes} ${definitions} ${options}
-  VERBATIM
-  USES_TERMINAL
+project(micropython)
+
+set(MICROPY_PORT_DIR    ${CMAKE_CURRENT_SOURCE_DIR})
+set(MICROPY_DIR         ${MICROPY_PORT_DIR}/../..)
+set(MICROPY_TARGET      micropython)
+
+include(${MICROPY_DIR}/py/py.cmake)
+include(${MICROPY_DIR}/extmod/extmod.cmake)
+
+set(MICROPY_SOURCE_PORT
+    main.c
+    help.c
+    machine_i2c.c
+    machine_pin.c
+    machine_uart.c
+    modmachine.c
+    moduos.c
+    modusocket.c
+    modutime.c
+    modzephyr.c
+    modzsensor.c
+    uart_core.c
+    zephyr_storage.c
+)
+list(TRANSFORM MICROPY_SOURCE_PORT PREPEND ${MICROPY_PORT_DIR}/)
+
+set(MICROPY_SOURCE_LIB
+    timeutils/timeutils.c
+    utils/mpirq.c
+    utils/stdout_helpers.c
+    utils/printf.c
+    utils/pyexec.c
+    utils/interrupt_char.c
+    mp-readline/readline.c
+    oofatfs/ff.c
+    oofatfs/ffunicode.c
+    littlefs/lfs1.c
+    littlefs/lfs1_util.c
+    littlefs/lfs2.c
+    littlefs/lfs2_util.c
 )
+list(TRANSFORM MICROPY_SOURCE_LIB PREPEND ${MICROPY_DIR}/lib/)
+
+set(MICROPY_SOURCE_QSTR
+    ${MICROPY_SOURCE_PY}
+    ${MICROPY_SOURCE_EXTMOD}
+    ${MICROPY_SOURCE_LIB}
+    ${MICROPY_SOURCE_PORT}
+)
+
+zephyr_get_include_directories_for_lang(C includes)
+zephyr_get_system_include_directories_for_lang(C system_includes)
+zephyr_get_compile_definitions_for_lang(C definitions)
+zephyr_get_compile_options_for_lang(C options)
+
+set(MICROPY_CPP_FLAGS_EXTRA ${includes} ${system_includes} ${definitions} ${options})
+
+zephyr_library_named(${MICROPY_TARGET})
+
+zephyr_library_include_directories(
+    ${MICROPY_DIR}
+    ${MICROPY_PORT_DIR}
+    ${CMAKE_CURRENT_BINARY_DIR}
+)
+
+zephyr_library_compile_options(
+    -std=gnu99 -fomit-frame-pointer
+)
+
+zephyr_library_compile_definitions(
+    NDEBUG
+    MP_CONFIGFILE=<${CONFIG_MICROPY_CONFIGFILE}>
+    MICROPY_HEAP_SIZE=${CONFIG_MICROPY_HEAP_SIZE}
+    FFCONF_H=\"${MICROPY_OOFATFS_DIR}/ffconf.h\"
+    MICROPY_VFS_FAT=$<BOOL:${CONFIG_MICROPY_VFS_FAT}>
+    MICROPY_VFS_LFS1=$<BOOL:${CONFIG_MICROPY_VFS_LFS1}>
+    MICROPY_VFS_LFS2=$<BOOL:${CONFIG_MICROPY_VFS_LFS2}>
+)
+
+zephyr_library_sources(${MICROPY_SOURCE_QSTR})
+
+add_dependencies(${MICROPY_TARGET} zephyr_generated_headers)
+
+include(${MICROPY_DIR}/py/mkrules.cmake)
+
+target_sources(app PRIVATE
+    src/zephyr_start.c
+    src/zephyr_getchar.c
+)
+
+target_link_libraries(app PRIVATE ${MICROPY_TARGET})
diff --git a/ports/zephyr/Kconfig b/ports/zephyr/Kconfig
new file mode 100644
index 0000000000000..5545cf3b15b07
--- /dev/null
+++ b/ports/zephyr/Kconfig
@@ -0,0 +1,46 @@
+# This file is part of the MicroPython project, http://micropython.org/
+#
+# The MIT License (MIT)
+#
+# Copyright 2020 NXP
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+menu "MicroPython Options"
+
+config MICROPY_CONFIGFILE
+	string "Configuration file"
+	default "mpconfigport_minimal.h"
+
+config MICROPY_HEAP_SIZE
+	int "Heap size"
+	default 16384
+
+config MICROPY_VFS_FAT
+	bool "FatFS file system"
+
+config MICROPY_VFS_LFS1
+	bool "LittleFs version 1 file system"
+
+config MICROPY_VFS_LFS2
+	bool "LittleFs version 2 file system"
+
+endmenu # MicroPython Options
+
+source "Kconfig.zephyr"
diff --git a/ports/zephyr/Makefile b/ports/zephyr/Makefile
deleted file mode 100644
index c200062a3ff85..0000000000000
--- a/ports/zephyr/Makefile
+++ /dev/null
@@ -1,116 +0,0 @@
-#
-# This is the main Makefile, which uses MicroPython build system,
-# but Zephyr arch-specific toolchain and target-specific flags.
-# This Makefile builds MicroPython as a library, and then calls
-# recursively Makefile.zephyr to build complete application binary
-# using Zephyr build system.
-#
-# To build a "minimal" configuration, use "make-minimal" wrapper.
-
-BOARD ?= qemu_x86
-OUTDIR_PREFIX = $(BOARD)
-
-# Default heap size is 16KB, which is on conservative side, to let
-# it build for smaller boards, but it won't be enough for larger
-# applications, and will need to be increased.
-MICROPY_HEAP_SIZE = 16384
-FROZEN_DIR = scripts
-
-MICROPY_VFS_FAT ?= 1
-MICROPY_VFS_LFS1 ?= 0
-MICROPY_VFS_LFS2 ?= 1
-
-# Default target
-all:
-
-include ../../py/mkenv.mk
-include $(TOP)/py/py.mk
-
-# Zephyr (generated) config files - must be defined before include below
-Z_EXPORTS = outdir/$(OUTDIR_PREFIX)/Makefile.export
-ifneq ($(MAKECMDGOALS), clean)
-include $(Z_EXPORTS)
-endif
-
-INC += -I.
-INC += -I$(TOP)
-INC += -I$(BUILD)
-INC += -I$(ZEPHYR_BASE)/net/ip
-INC += -I$(ZEPHYR_BASE)/net/ip/contiki
-INC += -I$(ZEPHYR_BASE)/net/ip/contiki/os
-
-SRC_C = main.c \
-	help.c \
-	moduos.c \
-	modusocket.c \
-	modutime.c \
-	modzephyr.c \
-	modzsensor.c \
-	modmachine.c \
-	machine_i2c.c \
-	machine_pin.c \
-	machine_uart.c \
-	uart_core.c \
-	zephyr_storage.c \
-	lib/timeutils/timeutils.c \
-	lib/utils/mpirq.c \
-	lib/utils/stdout_helpers.c \
-	lib/utils/printf.c \
-	lib/utils/pyexec.c \
-	lib/utils/interrupt_char.c \
-	lib/mp-readline/readline.c \
-	$(SRC_MOD)
-
-# List of sources for qstr extraction
-SRC_QSTR += $(SRC_C)
-
-OBJ = $(PY_O) $(addprefix $(BUILD)/, $(SRC_C:.c=.o))
-
-CFLAGS = $(Z_CFLAGS) \
-	 -std=gnu99 -fomit-frame-pointer -DNDEBUG -DMICROPY_HEAP_SIZE=$(MICROPY_HEAP_SIZE) $(CFLAGS_MOD) $(CFLAGS_EXTRA) $(INC)
-
-include $(TOP)/py/mkrules.mk
-
-GENERIC_TARGETS = all zephyr run qemu qemugdb flash debug debugserver \
-	ram_report rom_report
-KCONFIG_TARGETS = \
-	initconfig config nconfig menuconfig xconfig gconfig \
-	oldconfig silentoldconfig defconfig savedefconfig \
-	allnoconfig allyesconfig alldefconfig randconfig \
-	listnewconfig olddefconfig
-CLEAN_TARGETS = pristine mrproper
-
-$(GENERIC_TARGETS): $(LIBMICROPYTHON)
-$(CLEAN_TARGETS):  clean
-
-$(GENERIC_TARGETS) $(KCONFIG_TARGETS) $(CLEAN_TARGETS):
-	$(MAKE) -C outdir/$(BOARD) $@
-
-$(LIBMICROPYTHON): | $(Z_EXPORTS)
-build/genhdr/qstr.i.last: | $(Z_EXPORTS)
-
-# If we recreate libmicropython, also cause zephyr.bin relink
-LIBMICROPYTHON_EXTRA_CMD = -$(RM) -f outdir/$(OUTDIR_PREFIX)/zephyr.lnk
-
-# MicroPython's global clean cleans everything, fast
-CLEAN_EXTRA = outdir libmicropython.a
-
-# Clean Zephyr things in Zephyr way
-z_clean:
-	$(MAKE) -f Makefile.zephyr BOARD=$(BOARD) clean
-
-test:
-	cd $(TOP)/tests && ./run-tests --target minimal --device "execpty:make -C ../ports/zephyr run BOARD=$(BOARD) QEMU_PTY=1"
-
-cmake: outdir/$(BOARD)/Makefile
-
-ifneq ($(CONF_FILE),)
-CMAKE_MOD += -DCONF_FILE=$(CONF_FILE)
-endif
-
-outdir/$(BOARD)/Makefile:
-	mkdir -p outdir/$(BOARD) && cmake -DBOARD=$(BOARD) $(CMAKE_MOD) -Boutdir/$(BOARD) -H.
-
-$(Z_EXPORTS): outdir/$(BOARD)/Makefile
-	make --no-print-directory -C outdir/$(BOARD) outputexports CMAKE_COMMAND=: >$@
-	make -C outdir/$(BOARD) syscall_list_h_target kobj_types_h_target
diff --git a/ports/zephyr/README.md b/ports/zephyr/README.md
index d1cc841977fe4..cdc3c70f0e616 100644
--- a/ports/zephyr/README.md
+++ b/ports/zephyr/README.md
@@ -50,47 +50,48 @@ switch from master to a tagged release, you can instead do:
 With Zephyr installed you may then need to configure your environment,
 for example by sourcing `zephyrproject/zephyr/zephyr-env.sh`.
 
-Once Zephyr is ready to use you can build the MicroPython port.
-In the port subdirectory `ports/zephyr/` run:
+Once Zephyr is ready to use you can build the MicroPython port just like any
+other Zephyr application. You can do this anywhere in your file system, it does
+not have to be in the `ports/zephyr` directory. Assuming you have cloned the
+MicroPython repository into your home directory, you can build the Zephyr port
+for a frdm_k64f board like this:
 
-    $ make BOARD=<board>
+    $ west build -b frdm_k64f ~/micropython/ports/zephyr
 
-If you don't specify BOARD, the default is `qemu_x86` (x86 target running
-in QEMU emulator).  Consult the Zephyr documentation above for the list of
+To build for QEMU instead:
+
+    $ west build -b qemu_x86 ~/micropython/ports/zephyr
+
+Consult the Zephyr documentation above for the list of
 supported boards.  Board configuration files appearing in `ports/zephyr/boards/`
 correspond to boards that have been tested with MicroPython and may have
 additional options enabled, like filesystem support.
 
-
 Running
 -------
 
-To run the resulting firmware in QEMU (for BOARDs like qemu_x86,
-qemu_cortex_m3):
+To flash the resulting firmware to your board:
 
-    make run
+    $ west flash
 
-With the default configuration, networking is now enabled, so you need to
-follow instructions in https://wiki.zephyrproject.org/view/Networking-with-Qemu
-to setup host side of TAP/SLIP networking. If you get error like:
+Or, to flash it to your board and start a gdb debug session:
 
-    could not connect serial device to character backend 'unix:/tmp/slip.sock'
+    $ west debug
 
-it's a sign that you didn't followed instructions above. If you would like
-to just run it quickly without extra setup, see "minimal" build below.
+To run the resulting firmware in QEMU (for BOARDs like qemu_x86,
+qemu_cortex_m3):
 
-For deploying/flashing a firmware on a real board, follow Zephyr
-documentation for a given board, including known issues for that board
-(if any). (Mind again that networking is enabled for the default build,
-so you should know if there're any special requirements in that regard,
-cf. for example QEMU networking requirements above; real hardware boards
-generally should not have any special requirements, unless there're known
-issues).
+    $ west build -t run
 
-For example, to deploy firmware on the FRDM-K64F board run:
+Networking is enabled with the default configuration, so you need to follow
+instructions in
+https://docs.zephyrproject.org/latest/guides/networking/qemu_setup.html#networking-with-qemu
+to setup the host side of TAP/SLIP networking. If you get an error like:
 
-    $ make BOARD=frdm_k64f flash
+    could not connect serial device to character backend 'unix:/tmp/slip.sock'
 
+it's a sign that you didn't follow the instructions above. If you would like
+to just run it quickly without extra setup, see "minimal" build below.
 
 Quick example
 -------------
@@ -151,9 +152,10 @@ enabled over time.
 
 To make a minimal build:
 
-    ./make-minimal BOARD=<board>
+    $ west build -b qemu_x86 ~/micropython/ports/zephyr -- -DCONF_FILE=prj_minimal.conf
 
 To run a minimal build in QEMU without requiring TAP networking setup
-run the following after you built image with the previous command:
+run the following after you built an image with the previous command:
+
+    $ west build -t run
 
-    ./make-minimal BOARD=<qemu_x86_nommu|qemu_x86|qemu_cortex_m3> run
diff --git a/ports/zephyr/make-minimal b/ports/zephyr/make-minimal
deleted file mode 100755
index d7dddc33427df..0000000000000
--- a/ports/zephyr/make-minimal
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-#
-# This is a wrapper for make to build a "minimal" Zephyr port.
-# It should be run just like make (i.e. extra vars can be passed on the
-# command line, etc.), e.g.:
-#
-# ./make-minimal BOARD=qemu_cortex_m3
-# ./make-minimal BOARD=qemu_cortex_m3 run
-#
-
-make \
-    CONF_FILE=prj_minimal.conf \
-    CFLAGS_EXTRA='-DMP_CONFIGFILE="<mpconfigport_minimal.h>"' \
-    MICROPY_VFS_FAT=0 \
-    MICROPY_VFS_LFS2=0 \
-    FROZEN_DIR= \
-    QEMU_NET=0 \
-    "$@"
diff --git a/ports/zephyr/prj.conf b/ports/zephyr/prj.conf
index 9824f48e3362f..c9c2e96da9beb 100644
--- a/ports/zephyr/prj.conf
+++ b/ports/zephyr/prj.conf
@@ -69,3 +69,8 @@ CONFIG_NET_BUF_POOL_USAGE=y
 #CONFIG_NET_DEBUG_NET_BUF=y
 # Change to 4 for "DEBUG" level
 #CONFIG_SYS_LOG_NET_LEVEL=3
+
+# MicroPython options
+CONFIG_MICROPY_CONFIGFILE="mpconfigport.h"
+CONFIG_MICROPY_VFS_FAT=y
+CONFIG_MICROPY_VFS_LFS2=y
diff --git a/tools/ci.sh b/tools/ci.sh
index d945375562551..616e78f1976ac 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -460,6 +460,7 @@ function ci_zephyr_setup {
       -v "$(pwd)":/micropython \
       -e ZEPHYR_SDK_INSTALL_DIR=/opt/sdk/zephyr-sdk-0.11.3 \
       -e ZEPHYR_TOOLCHAIN_VARIANT=zephyr \
+      -e ZEPHYR_BASE=/zephyrproject/zephyr \
       -w /micropython/ports/zephyr \
       zephyrprojectrtos/ci:v0.11.8
     docker ps -a
@@ -472,10 +473,10 @@ function ci_zephyr_install {
 }
 
 function ci_zephyr_build {
-    docker exec zephyr-ci bash -c "make clean; ./make-minimal ${MAKEOPTS}"
-    docker exec zephyr-ci bash -c "make clean; ./make-minimal ${MAKEOPTS} BOARD=frdm_k64f"
-    docker exec zephyr-ci bash -c "make clean; make ${MAKEOPTS}"
-    docker exec zephyr-ci bash -c "make clean; make ${MAKEOPTS} BOARD=frdm_k64f"
-    docker exec zephyr-ci bash -c "make clean; make ${MAKEOPTS} BOARD=mimxrt1050_evk"
-    docker exec zephyr-ci bash -c "make clean; make ${MAKEOPTS} BOARD=reel_board"
+    docker exec zephyr-ci west build -p auto -b qemu_x86 -- -DCONF_FILE=prj_minimal.conf
+    docker exec zephyr-ci west build -p auto -b frdm_k64f -- -DCONF_FILE=prj_minimal.conf
+    docker exec zephyr-ci west build -p auto -b qemu_x86
+    docker exec zephyr-ci west build -p auto -b frdm_k64f
+    docker exec zephyr-ci west build -p auto -b mimxrt1050_evk
+    docker exec zephyr-ci west build -p auto -b reel_board
 }

From 56a36899bdb472d5c2003164079bedeba42fa24d Mon Sep 17 00:00:00 2001
From: Maureen Helm <maureen.helm@nxp.com>
Date: Tue, 16 Feb 2021 08:59:53 -0600
Subject: [PATCH 0628/3533] tools/ci.sh: Update zephyr docker image to
 v0.11.13.

Updates the zephyr docker image to the latest, v0.11.13. This updates CI
to use zephyr SDK v0.12.2 and GCC v10.2.0 for the zephyr port.

Signed-off-by: Maureen Helm <maureen.helm@nxp.com>
---
 tools/ci.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/ci.sh b/tools/ci.sh
index 616e78f1976ac..5e0686f301bc0 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -455,14 +455,14 @@ function ci_windows_build {
 # ports/zephyr
 
 function ci_zephyr_setup {
-    docker pull zephyrprojectrtos/ci:v0.11.8
+    docker pull zephyrprojectrtos/ci:v0.11.13
     docker run --name zephyr-ci -d -it \
       -v "$(pwd)":/micropython \
-      -e ZEPHYR_SDK_INSTALL_DIR=/opt/sdk/zephyr-sdk-0.11.3 \
+      -e ZEPHYR_SDK_INSTALL_DIR=/opt/sdk/zephyr-sdk-0.12.2 \
       -e ZEPHYR_TOOLCHAIN_VARIANT=zephyr \
       -e ZEPHYR_BASE=/zephyrproject/zephyr \
       -w /micropython/ports/zephyr \
-      zephyrprojectrtos/ci:v0.11.8
+      zephyrprojectrtos/ci:v0.11.13
     docker ps -a
 }
 

From 6c4a5d185d7e70c22c0f72fb1cd8add251600548 Mon Sep 17 00:00:00 2001
From: PTH <thomas@pth.systems>
Date: Thu, 11 Feb 2021 15:23:00 +0100
Subject: [PATCH 0629/3533] zephyr/boards: Add support for the nucleo_h743zi
 board.

---
 ports/zephyr/boards/nucleo_h743zi.conf    |  7 +++++++
 ports/zephyr/boards/nucleo_h743zi.overlay | 23 +++++++++++++++++++++++
 2 files changed, 30 insertions(+)
 create mode 100644 ports/zephyr/boards/nucleo_h743zi.conf
 create mode 100644 ports/zephyr/boards/nucleo_h743zi.overlay

diff --git a/ports/zephyr/boards/nucleo_h743zi.conf b/ports/zephyr/boards/nucleo_h743zi.conf
new file mode 100644
index 0000000000000..942415b7967d8
--- /dev/null
+++ b/ports/zephyr/boards/nucleo_h743zi.conf
@@ -0,0 +1,7 @@
+# disable console subsys to get REPL working
+CONFIG_CONSOLE_SUBSYS=n
+
+# flash config
+CONFIG_FLASH=y
+CONFIG_FLASH_MAP=y
+CONFIG_FLASH_PAGE_LAYOUT=y
diff --git a/ports/zephyr/boards/nucleo_h743zi.overlay b/ports/zephyr/boards/nucleo_h743zi.overlay
new file mode 100644
index 0000000000000..f5e6d4f92157f
--- /dev/null
+++ b/ports/zephyr/boards/nucleo_h743zi.overlay
@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) 2021 Thomas Popp
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/* delete the already defined storage partition and create a new and bigger one */
+/delete-node/ &storage_partition;
+
+&flash0 {
+	partitions {
+		compatible = "fixed-partitions";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+
+		/* storage slot: 1024 KB in Flash Memory Bank 2 */
+		storage_partition: partition@100000 {
+			label = "storage";
+			reg = <0x00100000 0x100000>;
+		};
+	};
+};

From 5cb91afb9b3b34bbf0ee022a3f69af90c01d1d54 Mon Sep 17 00:00:00 2001
From: PTH <thomas@pth.systems>
Date: Fri, 12 Feb 2021 15:08:02 +0100
Subject: [PATCH 0630/3533] zephyr/modusocket: Fix parameter in calls to
 net_context_get_XXX().

The following simple usocket example throws an error EINVAL on connect

    import usocket
    s = usocket.socket()
    s.connect(usocket.getaddrinfo('www.micropython.org', 80)[0][-1])

    Traceback (most recent call last):
      File "<stdin>", line 1, in <module>
    OSError: [Errno 22] EINVAL

Fixing the context parameter in calls of net_context_get_family() and
net_context_get_type(), the connect works fine.

Tested on a nucleo_h743zi board.
---
 ports/zephyr/modusocket.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/ports/zephyr/modusocket.c b/ports/zephyr/modusocket.c
index 6c900753c8b51..f9fc96a2b1d5b 100644
--- a/ports/zephyr/modusocket.c
+++ b/ports/zephyr/modusocket.c
@@ -79,7 +79,8 @@ STATIC void parse_inet_addr(socket_obj_t *socket, mp_obj_t addr_in, struct socka
 
     mp_obj_t *addr_items;
     mp_obj_get_array_fixed_n(addr_in, 2, &addr_items);
-    sockaddr_in->sin_family = net_context_get_family((void *)socket->ctx);
+    void *context = zsock_get_context_object(socket->ctx);
+    sockaddr_in->sin_family = net_context_get_family(context);
     RAISE_ERRNO(net_addr_pton(sockaddr_in->sin_family, mp_obj_str_get_str(addr_items[0]), &sockaddr_in->sin_addr));
     sockaddr_in->sin_port = htons(mp_obj_get_int(addr_items[1]));
 }
@@ -119,8 +120,8 @@ STATIC void socket_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kin
     if (self->ctx == -1) {
         mp_printf(print, "<socket NULL>");
     } else {
-        struct net_context *ctx = (void *)self->ctx;
-        mp_printf(print, "<socket %p type=%d>", ctx, net_context_get_type(ctx));
+        void *context = zsock_get_context_object(self->ctx);
+        mp_printf(print, "<socket %p type=%d>", self->ctx, net_context_get_type(context));
     }
 }
 

From 236274f08fb51d36eba9cd0458483bd398bfed0a Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Fri, 12 Feb 2021 14:31:29 +1100
Subject: [PATCH 0631/3533] extmod/nimble/hal/hal_uart: Fix HCI_TRACE format
 specifiers.

Makes this work consistently on unix and stm32 ports.
---
 extmod/nimble/hal/hal_uart.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/extmod/nimble/hal/hal_uart.c b/extmod/nimble/hal/hal_uart.c
index 230970b089c55..cd5e49e30b4c0 100644
--- a/extmod/nimble/hal/hal_uart.c
+++ b/extmod/nimble/hal/hal_uart.c
@@ -66,7 +66,7 @@ void hal_uart_start_tx(uint32_t port) {
     }
 
     #if HCI_TRACE
-    printf("< [% 8d] %02x", mp_hal_ticks_ms(), mp_bluetooth_hci_cmd_buf[0]);
+    printf("< [% 8d] %02x", (int)mp_hal_ticks_ms(), mp_bluetooth_hci_cmd_buf[0]);
     for (size_t i = 1; i < len; ++i) {
         printf(":%02x", mp_bluetooth_hci_cmd_buf[i]);
     }
@@ -86,7 +86,7 @@ void mp_bluetooth_nimble_hci_uart_process(bool run_events) {
     int chr;
     while ((chr = mp_bluetooth_hci_uart_readchar()) >= 0) {
         #if HCI_TRACE
-        printf("> %02x (%d)\n", chr);
+        printf("> %02x\n", chr);
         #endif
         hal_uart_rx_cb(hal_uart_rx_arg, chr);
 

From 4005138882757ae536482c1d105b28c9869ab8ce Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Fri, 12 Feb 2021 14:33:03 +1100
Subject: [PATCH 0632/3533] extmod/modbluetooth: Allow NimBLE to use Zephyr
 static address.

Zephyr controllers can be queried for a static address (computed from the
device ID).  BlueKitchen already supports this, but make them both use the
same macro to enable the feature.
---
 extmod/btstack/modbluetooth_btstack.c | 12 ++++++------
 extmod/nimble/modbluetooth_nimble.c   | 16 +++++++++++++---
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/extmod/btstack/modbluetooth_btstack.c b/extmod/btstack/modbluetooth_btstack.c
index 540b0fb7a9d24..c861c76d22b0b 100644
--- a/extmod/btstack/modbluetooth_btstack.c
+++ b/extmod/btstack/modbluetooth_btstack.c
@@ -282,7 +282,7 @@ STATIC void btstack_packet_handler_att_server(uint8_t packet_type, uint16_t chan
     }
 }
 
-#if MICROPY_BLUETOOTH_BTSTACK_ZEPHYR_STATIC_ADDRESS
+#if MICROPY_BLUETOOTH_USE_ZEPHYR_STATIC_ADDRESS
 // During startup, the controller (e.g. Zephyr) might give us a static address that we can use.
 STATIC uint8_t controller_static_addr[6] = {0};
 STATIC bool controller_static_addr_available = false;
@@ -349,13 +349,13 @@ STATIC void btstack_packet_handler(uint8_t packet_type, uint8_t *packet, uint8_t
         DEBUG_printf("  --> hci transport packet sent\n");
     } else if (event_type == HCI_EVENT_COMMAND_COMPLETE) {
         DEBUG_printf("  --> hci command complete\n");
-        #if MICROPY_BLUETOOTH_BTSTACK_ZEPHYR_STATIC_ADDRESS
+        #if MICROPY_BLUETOOTH_USE_ZEPHYR_STATIC_ADDRESS
         if (memcmp(packet, read_static_address_command_complete_prefix, sizeof(read_static_address_command_complete_prefix)) == 0) {
             DEBUG_printf("  --> static address available\n");
             reverse_48(&packet[7], controller_static_addr);
             controller_static_addr_available = true;
         }
-        #endif // MICROPY_BLUETOOTH_BTSTACK_ZEPHYR_STATIC_ADDRESS
+        #endif // MICROPY_BLUETOOTH_USE_ZEPHYR_STATIC_ADDRESS
     } else if (event_type == HCI_EVENT_COMMAND_STATUS) {
         DEBUG_printf("  --> hci command status\n");
     } else if (event_type == HCI_EVENT_NUMBER_OF_COMPLETED_PACKETS) {
@@ -575,12 +575,12 @@ STATIC bool set_public_address(void) {
 }
 
 STATIC void set_random_address(void) {
-    #if MICROPY_BLUETOOTH_BTSTACK_ZEPHYR_STATIC_ADDRESS
+    #if MICROPY_BLUETOOTH_USE_ZEPHYR_STATIC_ADDRESS
     if (controller_static_addr_available) {
         DEBUG_printf("set_random_address: Using static address supplied by controller.\n");
         gap_random_address_set(controller_static_addr);
     } else
-    #endif // MICROPY_BLUETOOTH_BTSTACK_ZEPHYR_STATIC_ADDRESS
+    #endif // MICROPY_BLUETOOTH_USE_ZEPHYR_STATIC_ADDRESS
     {
         bd_addr_t static_addr;
 
@@ -635,7 +635,7 @@ int mp_bluetooth_init(void) {
 
     btstack_memory_init();
 
-    #if MICROPY_BLUETOOTH_BTSTACK_ZEPHYR_STATIC_ADDRESS
+    #if MICROPY_BLUETOOTH_USE_ZEPHYR_STATIC_ADDRESS
     controller_static_addr_available = false;
     #endif
 
diff --git a/extmod/nimble/modbluetooth_nimble.c b/extmod/nimble/modbluetooth_nimble.c
index 3910c599cb72b..a0a3998c6614d 100644
--- a/extmod/nimble/modbluetooth_nimble.c
+++ b/extmod/nimble/modbluetooth_nimble.c
@@ -48,6 +48,11 @@
 #include "nimble/host/src/ble_l2cap_priv.h"
 #endif
 
+#if MICROPY_PY_BLUETOOTH_ENABLE_HCI_CMD || MICROPY_BLUETOOTH_USE_ZEPHYR_STATIC_ADDRESS
+// For ble_hs_hci_cmd_tx
+#include "nimble/host/src/ble_hs_hci_priv.h"
+#endif
+
 #ifndef MICROPY_PY_BLUETOOTH_DEFAULT_GAP_NAME
 #define MICROPY_PY_BLUETOOTH_DEFAULT_GAP_NAME "MPY NIMBLE"
 #endif
@@ -179,6 +184,14 @@ STATIC void set_random_address(bool nrpa) {
         // Mark it as STATIC (not RPA or NRPA).
         addr.val[5] |= 0xc0;
     } else
+    #elif MICROPY_BLUETOOTH_USE_ZEPHYR_STATIC_ADDRESS
+    if (!nrpa) {
+        DEBUG_printf("set_random_address: Generating static address from Zephyr controller\n");
+        uint8_t buf[23];
+        rc = ble_hs_hci_cmd_tx(BLE_HCI_OP(BLE_HCI_OGF_VENDOR, 0x09), NULL, 0, buf, sizeof(buf));
+        assert(rc == 0);
+        memcpy(addr.val, buf + 1, 6);
+    } else
     #endif
     {
         DEBUG_printf("set_random_address: Generating random static address\n");
@@ -1688,9 +1701,6 @@ int mp_bluetooth_l2cap_recvinto(uint16_t conn_handle, uint16_t cid, uint8_t *buf
 
 #if MICROPY_PY_BLUETOOTH_ENABLE_HCI_CMD
 
-// For ble_hs_hci_cmd_tx
-#include "nimble/host/src/ble_hs_hci_priv.h"
-
 int mp_bluetooth_hci_cmd(uint16_t ogf, uint16_t ocf, const uint8_t *req, size_t req_len, uint8_t *resp, size_t resp_len, uint8_t *status) {
     int rc = ble_hs_hci_cmd_tx(BLE_HCI_OP(ogf, ocf), req, req_len, resp, resp_len);
     if (rc < BLE_HS_ERR_HCI_BASE || rc >= BLE_HS_ERR_HCI_BASE + 0x100) {

From 2eed9780ba7074de9e464a2bc771ad14f0332a6c Mon Sep 17 00:00:00 2001
From: David Michieli <dmm@planetinnovation.com.au>
Date: Tue, 16 Feb 2021 12:34:34 +1100
Subject: [PATCH 0633/3533] stm32/mboot: Add unpack-dfu command to
 mboot_pack_dfu.py tool.

This command unpacks a previously packed DFU file, writing out a DFU which
should be the same as the original (before packing).
---
 ports/stm32/mboot/mboot_pack_dfu.py | 26 ++++++++++++++++++++++++++
 tools/ci.sh                         |  5 +++++
 2 files changed, 31 insertions(+)

diff --git a/ports/stm32/mboot/mboot_pack_dfu.py b/ports/stm32/mboot/mboot_pack_dfu.py
index 47382f5910187..540057e06ee8c 100644
--- a/ports/stm32/mboot/mboot_pack_dfu.py
+++ b/ports/stm32/mboot/mboot_pack_dfu.py
@@ -211,9 +211,16 @@ def pack_dfu(keys, args):
 
 
 def verify_pack_dfu(keys, filename):
+    """Verify packed dfu file against keys. Gathers decrypted binary data."""
     full_sig = pyhy.hydro_sign(MBOOT_PACK_HYDRO_CONTEXT)
     _, elems = dfu_read(filename)
+    base_addr = None
+    binary_data = b""
+
     for addr, data in elems:
+        if base_addr is None:
+            base_addr = addr
+
         header = struct.unpack("<BBBBII", data[:12])
         chunk = data[12 : 12 + header[5]]
         sig = data[12 + header[5] :]
@@ -221,6 +228,7 @@ def verify_pack_dfu(keys, filename):
             sig, data[:12] + chunk, MBOOT_PACK_HYDRO_CONTEXT, keys.sign_pk
         )
         assert sig_pass
+
         if header[1] == MBOOT_PACK_CHUNK_FULL_SIG:
             actual_sig = chunk[-64:]
         else:
@@ -231,8 +239,21 @@ def verify_pack_dfu(keys, filename):
             if header[1] == MBOOT_PACK_CHUNK_FW_GZIP:
                 chunk = zlib.decompress(chunk, wbits=-15)
             full_sig.update(chunk)
+            assert addr == base_addr + len(binary_data)
+            binary_data += chunk
+
     full_sig_pass = full_sig.final_verify(actual_sig, keys.sign_pk)
     assert full_sig_pass
+    return [{"address": base_addr, "data": binary_data}]
+
+
+def unpack_dfu(keys, args):
+    # Load previously generated keys.
+    keys.load()
+
+    # Build a DFU file from the decrypted binary data.
+    data = verify_pack_dfu(keys, args.infile[0])
+    dfu.build(args.outfile[0], [data])
 
 
 def main():
@@ -250,6 +271,11 @@ def main():
     parser_ed.add_argument("outfile", nargs=1, help="output DFU file")
     parser_ed.set_defaults(func=pack_dfu)
 
+    parser_dd = subparsers.add_parser("unpack-dfu", help="decrypt a signed/encrypted DFU file")
+    parser_dd.add_argument("infile", nargs=1, help="input packed DFU file")
+    parser_dd.add_argument("outfile", nargs=1, help="output DFU file")
+    parser_dd.set_defaults(func=unpack_dfu)
+
     args = cmd_parser.parse_args()
 
     keys = Keys(args.keys)
diff --git a/tools/ci.sh b/tools/ci.sh
index 5e0686f301bc0..a815e9483e58c 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -223,6 +223,11 @@ function ci_stm32_nucleo_build {
     make ${MAKEOPTS} -C ports/stm32 BOARD=NUCLEO_L476RG DEBUG=1
     make ${MAKEOPTS} -C ports/stm32 BOARD=NUCLEO_WB55
     make ${MAKEOPTS} -C ports/stm32/mboot BOARD=NUCLEO_WB55
+    # Test mboot_pack_dfu.py created a valid file, and that its unpack-dfu command works.
+    BOARD_WB55=ports/stm32/boards/NUCLEO_WB55
+    BUILD_WB55=ports/stm32/build-NUCLEO_WB55
+    python3 ports/stm32/mboot/mboot_pack_dfu.py -k $BOARD_WB55/mboot_keys.h unpack-dfu $BUILD_WB55/firmware.pack.dfu $BUILD_WB55/firmware.unpack.dfu
+    diff $BUILD_WB55/firmware.unpack.dfu $BUILD_WB55/firmware.dfu
 }
 
 ########################################################################################

From 2c1299b0071c2c528cc01e3cde9eb22743820176 Mon Sep 17 00:00:00 2001
From: Thorsten von Eicken <tve@voneicken.com>
Date: Thu, 2 Apr 2020 10:01:16 -0700
Subject: [PATCH 0634/3533] extmod/modussl: Fix ussl read/recv/send/write
 errors when non-blocking.

Also fix related problems with socket on esp32, improve docs for
wrap_socket, and add more tests.
---
 docs/library/ussl.rst                     |  22 +++-
 extmod/modussl_axtls.c                    |  31 ++++-
 extmod/modussl_mbedtls.c                  |   3 +-
 ports/esp32/modsocket.c                   |   8 +-
 tests/net_hosted/accept_timeout.py        |   6 +-
 tests/net_hosted/connect_nonblock_xfer.py | 147 ++++++++++++++++++++++
 tests/net_inet/ssl_errors.py              |  51 ++++++++
 tests/net_inet/test_tls_nonblock.py       | 116 +++++++++++++++++
 tests/net_inet/test_tls_sites.py          |   6 +-
 tests/net_inet/test_tls_sites.py.exp      |   3 +-
 10 files changed, 373 insertions(+), 20 deletions(-)
 create mode 100644 tests/net_hosted/connect_nonblock_xfer.py
 create mode 100644 tests/net_inet/ssl_errors.py
 create mode 100644 tests/net_inet/test_tls_nonblock.py

diff --git a/docs/library/ussl.rst b/docs/library/ussl.rst
index ffe146331ca08..14e3f3ad142ce 100644
--- a/docs/library/ussl.rst
+++ b/docs/library/ussl.rst
@@ -13,16 +13,23 @@ facilities for network sockets, both client-side and server-side.
 Functions
 ---------
 
-.. function:: ussl.wrap_socket(sock, server_side=False, keyfile=None, certfile=None, cert_reqs=CERT_NONE, ca_certs=None)
-
+.. function:: ussl.wrap_socket(sock, server_side=False, keyfile=None, certfile=None, cert_reqs=CERT_NONE, ca_certs=None, do_handshake=True) 
    Takes a `stream` *sock* (usually usocket.socket instance of ``SOCK_STREAM`` type),
    and returns an instance of ssl.SSLSocket, which wraps the underlying stream in
    an SSL context. Returned object has the usual `stream` interface methods like
-   ``read()``, ``write()``, etc. In MicroPython, the returned object does not expose
-   socket interface and methods like ``recv()``, ``send()``. In particular, a
-   server-side SSL socket should be created from a normal socket returned from
+   ``read()``, ``write()``, etc.
+   A server-side SSL socket should be created from a normal socket returned from
    :meth:`~usocket.socket.accept()` on a non-SSL listening server socket.
 
+   - *do_handshake* determines whether the handshake is done as part of the ``wrap_socket``
+     or whether it is deferred to be done as part of the initial reads or writes
+     (there is no ``do_handshake`` method as in CPython).
+     For blocking sockets doing the handshake immediately is standard. For non-blocking
+     sockets (i.e. when the *sock* passed into ``wrap_socket`` is in non-blocking mode)
+     the handshake should generally be deferred because otherwise ``wrap_socket`` blocks
+     until it completes. Note that in AXTLS the handshake can be deferred until the first
+     read or write but it then blocks until completion.
+
    Depending on the underlying module implementation in a particular
    :term:`MicroPython port`, some or all keyword arguments above may be not supported.
 
@@ -31,6 +38,11 @@ Functions
    Some implementations of ``ussl`` module do NOT validate server certificates,
    which makes an SSL connection established prone to man-in-the-middle attacks.
 
+   CPython's ``wrap_socket`` returns an ``SSLSocket`` object which has methods typical
+   for sockets, such as ``send``, ``recv``, etc. MicroPython's ``wrap_socket``
+   returns an object more similar to CPython's ``SSLObject`` which does not have
+   these socket methods.
+
 Exceptions
 ----------
 
diff --git a/extmod/modussl_axtls.c b/extmod/modussl_axtls.c
index da5941a55b33e..9d5934206749a 100644
--- a/extmod/modussl_axtls.c
+++ b/extmod/modussl_axtls.c
@@ -167,10 +167,15 @@ STATIC mp_obj_ssl_socket_t *ussl_socket_new(mp_obj_t sock, struct ssl_args *args
         o->ssl_sock = ssl_client_new(o->ssl_ctx, (long)sock, NULL, 0, ext);
 
         if (args->do_handshake.u_bool) {
-            int res = ssl_handshake_status(o->ssl_sock);
-
-            if (res != SSL_OK) {
-                ussl_raise_error(res);
+            int r = ssl_handshake_status(o->ssl_sock);
+
+            if (r != SSL_OK) {
+                if (r == SSL_CLOSE_NOTIFY) { // EOF
+                    r = MP_ENOTCONN;
+                } else if (r == SSL_EAGAIN) {
+                    r = MP_EAGAIN;
+                }
+                ussl_raise_error(r);
             }
         }
 
@@ -242,8 +247,24 @@ STATIC mp_uint_t ussl_socket_write(mp_obj_t o_in, const void *buf, mp_uint_t siz
         return MP_STREAM_ERROR;
     }
 
-    mp_int_t r = ssl_write(o->ssl_sock, buf, size);
+    mp_int_t r;
+eagain:
+    r = ssl_write(o->ssl_sock, buf, size);
+    if (r == 0) {
+        // see comment in ussl_socket_read above
+        if (o->blocking) {
+            goto eagain;
+        } else {
+            r = SSL_EAGAIN;
+        }
+    }
     if (r < 0) {
+        if (r == SSL_CLOSE_NOTIFY || r == SSL_ERROR_CONN_LOST) {
+            return 0; // EOF
+        }
+        if (r == SSL_EAGAIN) {
+            r = MP_EAGAIN;
+        }
         *errcode = r;
         return MP_STREAM_ERROR;
     }
diff --git a/extmod/modussl_mbedtls.c b/extmod/modussl_mbedtls.c
index 1677dc6e1ca70..277af37c7cfd6 100644
--- a/extmod/modussl_mbedtls.c
+++ b/extmod/modussl_mbedtls.c
@@ -133,6 +133,7 @@ STATIC int _mbedtls_ssl_send(void *ctx, const byte *buf, size_t len) {
     }
 }
 
+// _mbedtls_ssl_recv is called by mbedtls to receive bytes from the underlying socket
 STATIC int _mbedtls_ssl_recv(void *ctx, byte *buf, size_t len) {
     mp_obj_t sock = *(mp_obj_t *)ctx;
 
@@ -171,7 +172,7 @@ STATIC mp_obj_ssl_socket_t *socket_new(mp_obj_t sock, struct ssl_args *args) {
     mbedtls_pk_init(&o->pkey);
     mbedtls_ctr_drbg_init(&o->ctr_drbg);
     #ifdef MBEDTLS_DEBUG_C
-    // Debug level (0-4)
+    // Debug level (0-4) 1=warning, 2=info, 3=debug, 4=verbose
     mbedtls_debug_set_threshold(0);
     #endif
 
diff --git a/ports/esp32/modsocket.c b/ports/esp32/modsocket.c
index 61761d819445f..5135e31631e04 100644
--- a/ports/esp32/modsocket.c
+++ b/ports/esp32/modsocket.c
@@ -558,7 +558,8 @@ int _socket_send(socket_obj_t *sock, const char *data, size_t datalen) {
         MP_THREAD_GIL_EXIT();
         int r = lwip_write(sock->fd, data + sentlen, datalen - sentlen);
         MP_THREAD_GIL_ENTER();
-        if (r < 0 && errno != EWOULDBLOCK) {
+        // lwip returns EINPROGRESS when trying to send right after a non-blocking connect
+        if (r < 0 && errno != EWOULDBLOCK && errno != EINPROGRESS) {
             mp_raise_OSError(errno);
         }
         if (r > 0) {
@@ -567,7 +568,7 @@ int _socket_send(socket_obj_t *sock, const char *data, size_t datalen) {
         check_for_exceptions();
     }
     if (sentlen == 0) {
-        mp_raise_OSError(MP_ETIMEDOUT);
+        mp_raise_OSError(sock->retries == 0 ? MP_EWOULDBLOCK : MP_ETIMEDOUT);
     }
     return sentlen;
 }
@@ -650,7 +651,8 @@ STATIC mp_uint_t socket_stream_write(mp_obj_t self_in, const void *buf, mp_uint_
         if (r > 0) {
             return r;
         }
-        if (r < 0 && errno != EWOULDBLOCK) {
+        // lwip returns MP_EINPROGRESS when trying to write right after a non-blocking connect
+        if (r < 0 && errno != EWOULDBLOCK && errno != EINPROGRESS) {
             *errcode = errno;
             return MP_STREAM_ERROR;
         }
diff --git a/tests/net_hosted/accept_timeout.py b/tests/net_hosted/accept_timeout.py
index ff989110ae1b6..5f528d557d8d3 100644
--- a/tests/net_hosted/accept_timeout.py
+++ b/tests/net_hosted/accept_timeout.py
@@ -1,9 +1,9 @@
 # test that socket.accept() on a socket with timeout raises ETIMEDOUT
 
 try:
-    import usocket as socket
+    import uerrno as errno, usocket as socket
 except:
-    import socket
+    import errno, socket
 
 try:
     socket.socket.settimeout
@@ -18,5 +18,5 @@
 try:
     s.accept()
 except OSError as er:
-    print(er.args[0] in (110, "timed out"))  # 110 is ETIMEDOUT; CPython uses a string
+    print(er.args[0] in (errno.ETIMEDOUT, "timed out"))  # CPython uses a string instead of errno
 s.close()
diff --git a/tests/net_hosted/connect_nonblock_xfer.py b/tests/net_hosted/connect_nonblock_xfer.py
new file mode 100644
index 0000000000000..feb648ea0aeff
--- /dev/null
+++ b/tests/net_hosted/connect_nonblock_xfer.py
@@ -0,0 +1,147 @@
+# test that socket.connect() on a non-blocking socket raises EINPROGRESS
+# and that an immediate write/send/read/recv does the right thing
+
+try:
+    import sys, time
+    import uerrno as errno, usocket as socket, ussl as ssl
+except:
+    import socket, errno, ssl
+isMP = sys.implementation.name == "micropython"
+
+
+def dp(e):
+    # uncomment next line for development and testing, to print the actual exceptions
+    # print(repr(e))
+    pass
+
+
+# do_connect establishes the socket and wraps it if tls is True.
+# If handshake is true, the initial connect (and TLS handshake) is
+# allowed to be performed before returning.
+def do_connect(peer_addr, tls, handshake):
+    s = socket.socket()
+    s.setblocking(False)
+    try:
+        # print("Connecting to", peer_addr)
+        s.connect(peer_addr)
+    except OSError as er:
+        print("connect:", er.args[0] == errno.EINPROGRESS)
+        if er.args[0] != errno.EINPROGRESS:
+            print("  got", er.args[0])
+    # wrap with ssl/tls if desired
+    if tls:
+        try:
+            if sys.implementation.name == "micropython":
+                s = ssl.wrap_socket(s, do_handshake=handshake)
+            else:
+                s = ssl.wrap_socket(s, do_handshake_on_connect=handshake)
+            print("wrap: True")
+        except Exception as e:
+            dp(e)
+            print("wrap:", e)
+    elif handshake:
+        # just sleep a little bit, this allows any connect() errors to happen
+        time.sleep(0.2)
+    return s
+
+
+# test runs the test against a specific peer address.
+def test(peer_addr, tls=False, handshake=False):
+    # MicroPython plain sockets have read/write, but CPython's don't
+    # MicroPython TLS sockets and CPython's have read/write
+    # hasRW captures this wonderful state of affairs
+    hasRW = isMP or tls
+
+    # MicroPython plain sockets and CPython's have send/recv
+    # MicroPython TLS sockets don't have send/recv, but CPython's do
+    # hasSR captures this wonderful state of affairs
+    hasSR = not (isMP and tls)
+
+    # connect + send
+    if hasSR:
+        s = do_connect(peer_addr, tls, handshake)
+        # send -> 4 or EAGAIN
+        try:
+            ret = s.send(b"1234")
+            print("send:", handshake and ret == 4)
+        except OSError as er:
+            #
+            dp(er)
+            print("send:", er.args[0] in (errno.EAGAIN, errno.EINPROGRESS))
+        s.close()
+    else:  # fake it...
+        print("connect:", True)
+        if tls:
+            print("wrap:", True)
+        print("send:", True)
+
+    # connect + write
+    if hasRW:
+        s = do_connect(peer_addr, tls, handshake)
+        # write -> None
+        try:
+            ret = s.write(b"1234")
+            print("write:", ret in (4, None))  # SSL may accept 4 into buffer
+        except OSError as er:
+            dp(er)
+            print("write:", False)  # should not raise
+        except ValueError as er:  # CPython
+            dp(er)
+            print("write:", er.args[0] == "Write on closed or unwrapped SSL socket.")
+        s.close()
+    else:  # fake it...
+        print("connect:", True)
+        if tls:
+            print("wrap:", True)
+        print("write:", True)
+
+    if hasSR:
+        # connect + recv
+        s = do_connect(peer_addr, tls, handshake)
+        # recv -> EAGAIN
+        try:
+            print("recv:", s.recv(10))
+        except OSError as er:
+            dp(er)
+            print("recv:", er.args[0] == errno.EAGAIN)
+        s.close()
+    else:  # fake it...
+        print("connect:", True)
+        if tls:
+            print("wrap:", True)
+        print("recv:", True)
+
+    # connect + read
+    if hasRW:
+        s = do_connect(peer_addr, tls, handshake)
+        # read -> None
+        try:
+            ret = s.read(10)
+            print("read:", ret is None)
+        except OSError as er:
+            dp(er)
+            print("read:", False)  # should not raise
+        except ValueError as er:  # CPython
+            dp(er)
+            print("read:", er.args[0] == "Read on closed or unwrapped SSL socket.")
+        s.close()
+    else:  # fake it...
+        print("connect:", True)
+        if tls:
+            print("wrap:", True)
+        print("read:", True)
+
+
+if __name__ == "__main__":
+    # these tests use a non-existent test IP address, this way the connect takes forever and
+    # we can see EAGAIN/None (https://tools.ietf.org/html/rfc5737)
+    print("--- Plain sockets to nowhere ---")
+    test(socket.getaddrinfo("192.0.2.1", 80)[0][-1], False, False)
+    print("--- SSL sockets to nowhere ---")
+    # this test fails with AXTLS because do_handshake=False blocks on first read/write and
+    # there it times out until the connect is aborted
+    test(socket.getaddrinfo("192.0.2.1", 443)[0][-1], True, False)
+    print("--- Plain sockets ---")
+    test(socket.getaddrinfo("micropython.org", 80)[0][-1], False, True)
+    print("--- SSL sockets ---")
+    test(socket.getaddrinfo("micropython.org", 443)[0][-1], True, True)
diff --git a/tests/net_inet/ssl_errors.py b/tests/net_inet/ssl_errors.py
new file mode 100644
index 0000000000000..fd281b1c499c3
--- /dev/null
+++ b/tests/net_inet/ssl_errors.py
@@ -0,0 +1,51 @@
+# test that socket.connect() on a non-blocking socket raises EINPROGRESS
+# and that an immediate write/send/read/recv does the right thing
+
+import sys
+
+try:
+    import uerrno as errno, usocket as socket, ussl as ssl
+except:
+    import errno, socket, ssl
+
+
+def test(addr, hostname, block=True):
+    print("---", hostname or addr)
+    s = socket.socket()
+    s.setblocking(block)
+    try:
+        s.connect(addr)
+        print("connected")
+    except OSError as e:
+        if e.args[0] != errno.EINPROGRESS:
+            raise
+        print("EINPROGRESS")
+
+    try:
+        if sys.implementation.name == "micropython":
+            s = ssl.wrap_socket(s, do_handshake=block)
+        else:
+            s = ssl.wrap_socket(s, do_handshake_on_connect=block)
+        print("wrap: True")
+    except OSError:
+        print("wrap: error")
+
+    if not block:
+        try:
+            while s.write(b"0") is None:
+                pass
+        except (ValueError, OSError):  # CPython raises ValueError, MicroPython raises OSError
+            print("write: error")
+    s.close()
+
+
+if __name__ == "__main__":
+    # connect to plain HTTP port, oops!
+    addr = socket.getaddrinfo("micropython.org", 80)[0][-1]
+    test(addr, None)
+    # connect to plain HTTP port, oops!
+    addr = socket.getaddrinfo("micropython.org", 80)[0][-1]
+    test(addr, None, False)
+    # connect to server with self-signed cert, oops!
+    addr = socket.getaddrinfo("test.mosquitto.org", 8883)[0][-1]
+    test(addr, "test.mosquitto.org")
diff --git a/tests/net_inet/test_tls_nonblock.py b/tests/net_inet/test_tls_nonblock.py
new file mode 100644
index 0000000000000..c27ead3d50fb7
--- /dev/null
+++ b/tests/net_inet/test_tls_nonblock.py
@@ -0,0 +1,116 @@
+try:
+    import usocket as socket, ussl as ssl, uerrno as errno, sys
+except:
+    import socket, ssl, errno, sys, time, select
+
+
+def test_one(site, opts):
+    ai = socket.getaddrinfo(site, 443)
+    addr = ai[0][-1]
+    print(addr)
+
+    # Connect the raw socket
+    s = socket.socket()
+    s.setblocking(False)
+    try:
+        s.connect(addr)
+        raise OSError(-1, "connect blocks")
+    except OSError as e:
+        if e.args[0] != errno.EINPROGRESS:
+            raise
+
+    if sys.implementation.name != "micropython":
+        # in CPython we have to wait, otherwise wrap_socket is not happy
+        select.select([], [s], [])
+
+    try:
+        # Wrap with SSL
+        try:
+            if sys.implementation.name == "micropython":
+                s = ssl.wrap_socket(s, do_handshake=False)
+            else:
+                s = ssl.wrap_socket(s, do_handshake_on_connect=False)
+        except OSError as e:
+            if e.args[0] != errno.EINPROGRESS:
+                raise
+        print("wrapped")
+
+        # CPython needs to be told to do the handshake
+        if sys.implementation.name != "micropython":
+            while True:
+                try:
+                    s.do_handshake()
+                    break
+                except ssl.SSLError as err:
+                    if err.args[0] == ssl.SSL_ERROR_WANT_READ:
+                        select.select([s], [], [])
+                    elif err.args[0] == ssl.SSL_ERROR_WANT_WRITE:
+                        select.select([], [s], [])
+                    else:
+                        raise
+                time.sleep(0.1)
+            # print("shook hands")
+
+        # Write HTTP request
+        out = b"GET / HTTP/1.0\r\nHost: %s\r\n\r\n" % bytes(site, "latin")
+        while len(out) > 0:
+            n = s.write(out)
+            if n is None:
+                continue
+            if n > 0:
+                out = out[n:]
+            elif n == 0:
+                raise OSError(-1, "unexpected EOF in write")
+        print("wrote")
+
+        # Read response
+        resp = b""
+        while True:
+            try:
+                b = s.read(128)
+            except OSError as err:
+                if err.args[0] == 2:  # 2=ssl.SSL_ERROR_WANT_READ:
+                    continue
+                raise
+            if b is None:
+                continue
+            if len(b) > 0:
+                if len(resp) < 1024:
+                    resp += b
+            elif len(b) == 0:
+                break
+        print("read")
+
+        if resp[:7] != b"HTTP/1.":
+            raise ValueError("response doesn't start with HTTP/1.")
+        # print(resp)
+
+    finally:
+        s.close()
+
+
+SITES = [
+    "google.com",
+    {"host": "www.google.com"},
+    "micropython.org",
+    "pypi.org",
+    "api.telegram.org",
+    {"host": "api.pushbullet.com", "sni": True},
+]
+
+
+def main():
+    for site in SITES:
+        opts = {}
+        if isinstance(site, dict):
+            opts = site
+            site = opts["host"]
+        try:
+            test_one(site, opts)
+            print(site, "ok")
+        except Exception as e:
+            print(site, "error")
+    print("DONE")
+
+
+main()
diff --git a/tests/net_inet/test_tls_sites.py b/tests/net_inet/test_tls_sites.py
index d2cb928c8d5b9..3f945efb83150 100644
--- a/tests/net_inet/test_tls_sites.py
+++ b/tests/net_inet/test_tls_sites.py
@@ -27,6 +27,8 @@ def test_one(site, opts):
 
         s.write(b"GET / HTTP/1.0\r\nHost: %s\r\n\r\n" % bytes(site, "latin"))
         resp = s.read(4096)
+        if resp[:7] != b"HTTP/1.":
+            raise ValueError("response doesn't start with HTTP/1.")
         # print(resp)
 
     finally:
@@ -36,10 +38,10 @@ def test_one(site, opts):
 SITES = [
     "google.com",
     "www.google.com",
+    "micropython.org",
+    "pypi.org",
     "api.telegram.org",
     {"host": "api.pushbullet.com", "sni": True},
-    # "w9rybpfril.execute-api.ap-southeast-2.amazonaws.com",
-    {"host": "w9rybpfril.execute-api.ap-southeast-2.amazonaws.com", "sni": True},
 ]
 
 
diff --git a/tests/net_inet/test_tls_sites.py.exp b/tests/net_inet/test_tls_sites.py.exp
index 2f3c113d2f9ac..bc4a8dbd115db 100644
--- a/tests/net_inet/test_tls_sites.py.exp
+++ b/tests/net_inet/test_tls_sites.py.exp
@@ -1,5 +1,6 @@
 google.com ok
 www.google.com ok
+micropython.org ok
+pypi.org ok
 api.telegram.org ok
 api.pushbullet.com ok
-w9rybpfril.execute-api.ap-southeast-2.amazonaws.com ok

From caeec80a9c34f950da41ffe4d5e6f3b4adc680fd Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 17 Feb 2021 12:04:38 +1100
Subject: [PATCH 0635/3533] stm32/usb: Allow a board to configure USBD_VID and
 all PIDs.

If a board defines USBD_VID then that will be used instead of the default.
And then the board must also define all USBD_PID_xxx values that it needs.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/usb.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ports/stm32/usb.h b/ports/stm32/usb.h
index f69af86e5b366..295038ebd4289 100644
--- a/ports/stm32/usb.h
+++ b/ports/stm32/usb.h
@@ -30,6 +30,7 @@
 
 #define PYB_USB_FLAG_USB_MODE_CALLED    (0x0002)
 
+#ifndef USBD_VID
 // Windows needs a different PID to distinguish different device configurations
 #define USBD_VID         (0xf055)
 #define USBD_PID_CDC_MSC (0x9800)
@@ -43,6 +44,7 @@
 #define USBD_PID_CDC_MSC_HID (0x9808)
 #define USBD_PID_CDC2_MSC_HID (0x9809)
 #define USBD_PID_CDC3_MSC_HID (0x980a)
+#endif
 
 typedef enum {
     PYB_USB_STORAGE_MEDIUM_NONE = 0,

From 9b78f3e6c6b3eee84dcce2ff75764d8e7d4c713c Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 17 Feb 2021 13:03:52 +1100
Subject: [PATCH 0636/3533] stm32: Make pyb, uos, utime, machine and onewire
 modules configurable.

The default for these is to enable them, but they can now be disabled
individually by a board configuration.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/modmachine.c           |  4 ++
 ports/stm32/mpconfigboard_common.h |  5 +++
 ports/stm32/mpconfigport.h         | 67 ++++++++++++++++++++++++------
 3 files changed, 64 insertions(+), 12 deletions(-)

diff --git a/ports/stm32/modmachine.c b/ports/stm32/modmachine.c
index c5f49b6ef4395..f9fd1d9a64d77 100644
--- a/ports/stm32/modmachine.c
+++ b/ports/stm32/modmachine.c
@@ -406,7 +406,9 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_disable_irq),         MP_ROM_PTR(&machine_disable_irq_obj) },
     { MP_ROM_QSTR(MP_QSTR_enable_irq),          MP_ROM_PTR(&machine_enable_irq_obj) },
 
+    #if MICROPY_PY_MACHINE_PULSE
     { MP_ROM_QSTR(MP_QSTR_time_pulse_us),       MP_ROM_PTR(&machine_time_pulse_us_obj) },
+    #endif
 
     { MP_ROM_QSTR(MP_QSTR_mem8),                MP_ROM_PTR(&machine_mem8_obj) },
     { MP_ROM_QSTR(MP_QSTR_mem16),               MP_ROM_PTR(&machine_mem16_obj) },
@@ -425,8 +427,10 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     #endif
     { MP_ROM_QSTR(MP_QSTR_SoftI2C),             MP_ROM_PTR(&mp_machine_soft_i2c_type) },
     #endif
+    #if MICROPY_PY_MACHINE_SPI
     { MP_ROM_QSTR(MP_QSTR_SPI),                 MP_ROM_PTR(&machine_hard_spi_type) },
     { MP_ROM_QSTR(MP_QSTR_SoftSPI),             MP_ROM_PTR(&mp_machine_soft_spi_type) },
+    #endif
     { MP_ROM_QSTR(MP_QSTR_UART),                MP_ROM_PTR(&pyb_uart_type) },
     { MP_ROM_QSTR(MP_QSTR_WDT),                 MP_ROM_PTR(&pyb_wdt_type) },
     { MP_ROM_QSTR(MP_QSTR_Timer),               MP_ROM_PTR(&machine_timer_type) },
diff --git a/ports/stm32/mpconfigboard_common.h b/ports/stm32/mpconfigboard_common.h
index f493bb5d4a644..615310e51b771 100644
--- a/ports/stm32/mpconfigboard_common.h
+++ b/ports/stm32/mpconfigboard_common.h
@@ -37,6 +37,11 @@
 #define MICROPY_PY_STM (1)
 #endif
 
+// Whether to include the pyb module
+#ifndef MICROPY_PY_PYB
+#define MICROPY_PY_PYB (1)
+#endif
+
 // Whether to include legacy functions and classes in the pyb module
 #ifndef MICROPY_PY_PYB_LEGACY
 #define MICROPY_PY_PYB_LEGACY (1)
diff --git a/ports/stm32/mpconfigport.h b/ports/stm32/mpconfigport.h
index a47529d8b3c01..407a3e6c6a403 100644
--- a/ports/stm32/mpconfigport.h
+++ b/ports/stm32/mpconfigport.h
@@ -166,6 +166,11 @@
 #ifndef MICROPY_PY_UBINASCII
 #define MICROPY_PY_UBINASCII        (1)
 #endif
+#ifndef MICROPY_PY_UOS
+#define MICROPY_PY_UOS              (1)
+#endif
+#define MICROPY_PY_OS_DUPTERM       (3)
+#define MICROPY_PY_UOS_DUPTERM_BUILTIN_STREAM (1)
 #ifndef MICROPY_PY_URANDOM
 #define MICROPY_PY_URANDOM          (1)
 #define MICROPY_PY_URANDOM_SEED_INIT_FUNC (rng_get())
@@ -174,13 +179,15 @@
 #define MICROPY_PY_URANDOM_EXTRA_FUNCS (1)
 #endif
 #define MICROPY_PY_USELECT          (1)
+#ifndef MICROPY_PY_UTIME
+#define MICROPY_PY_UTIME            (1)
+#endif
+#define MICROPY_PY_UTIME_MP_HAL     (MICROPY_PY_UTIME)
 #ifndef MICROPY_PY_UTIMEQ
 #define MICROPY_PY_UTIMEQ           (1)
 #endif
-#define MICROPY_PY_UTIME_MP_HAL     (1)
-#define MICROPY_PY_OS_DUPTERM       (3)
-#define MICROPY_PY_UOS_DUPTERM_BUILTIN_STREAM (1)
 #define MICROPY_PY_LWIP_SOCK_RAW    (MICROPY_PY_LWIP)
+#ifndef MICROPY_PY_MACHINE
 #define MICROPY_PY_MACHINE          (1)
 #define MICROPY_PY_MACHINE_PULSE    (1)
 #define MICROPY_PY_MACHINE_PIN_MAKE_NEW mp_pin_make_new
@@ -188,6 +195,7 @@
 #define MICROPY_PY_MACHINE_SPI      (1)
 #define MICROPY_PY_MACHINE_SPI_MSB  (SPI_FIRSTBIT_MSB)
 #define MICROPY_PY_MACHINE_SPI_LSB  (SPI_FIRSTBIT_LSB)
+#endif
 #define MICROPY_HW_SOFTSPI_MIN_DELAY (0)
 #define MICROPY_HW_SOFTSPI_MAX_BAUDRATE (HAL_RCC_GetSysClockFreq() / 48)
 #define MICROPY_PY_UWEBSOCKET       (MICROPY_PY_LWIP)
@@ -201,6 +209,9 @@
 #ifndef MICROPY_PY_NETWORK
 #define MICROPY_PY_NETWORK          (1)
 #endif
+#ifndef MICROPY_PY_ONEWIRE
+#define MICROPY_PY_ONEWIRE          (1)
+#endif
 
 // fatfs configuration used in ffconf.h
 #define MICROPY_FATFS_ENABLE_LFN       (1)
@@ -246,12 +257,38 @@ extern const struct _mp_obj_module_t mp_module_usocket;
 extern const struct _mp_obj_module_t mp_module_network;
 extern const struct _mp_obj_module_t mp_module_onewire;
 
+#if MICROPY_PY_PYB
+#define PYB_BUILTIN_MODULE                  { MP_ROM_QSTR(MP_QSTR_pyb), MP_ROM_PTR(&pyb_module) },
+#else
+#define PYB_BUILTIN_MODULE
+#endif
+
 #if MICROPY_PY_STM
-#define STM_BUILTIN_MODULE               { MP_ROM_QSTR(MP_QSTR_stm), MP_ROM_PTR(&stm_module) },
+#define STM_BUILTIN_MODULE                  { MP_ROM_QSTR(MP_QSTR_stm), MP_ROM_PTR(&stm_module) },
 #else
 #define STM_BUILTIN_MODULE
 #endif
 
+#if MICROPY_PY_MACHINE
+#define MACHINE_BUILTIN_MODULE              { MP_ROM_QSTR(MP_QSTR_umachine), MP_ROM_PTR(&machine_module) },
+#define MACHINE_BUILTIN_MODULE_CONSTANTS    { MP_ROM_QSTR(MP_QSTR_machine), MP_ROM_PTR(&machine_module) },
+#else
+#define MACHINE_BUILTIN_MODULE
+#define MACHINE_BUILTIN_MODULE_CONSTANTS
+#endif
+
+#if MICROPY_PY_UOS
+#define UOS_BUILTIN_MODULE                  { MP_ROM_QSTR(MP_QSTR_uos), MP_ROM_PTR(&mp_module_uos) },
+#else
+#define UOS_BUILTIN_MODULE
+#endif
+
+#if MICROPY_PY_UTIME
+#define UTIME_BUILTIN_MODULE                { MP_ROM_QSTR(MP_QSTR_utime), MP_ROM_PTR(&mp_module_utime) },
+#else
+#define UTIME_BUILTIN_MODULE
+#endif
+
 #if MICROPY_PY_USOCKET && MICROPY_PY_LWIP
 // usocket implementation provided by lwIP
 #define SOCKET_BUILTIN_MODULE               { MP_ROM_QSTR(MP_QSTR_usocket), MP_ROM_PTR(&mp_module_lwip) },
@@ -269,21 +306,27 @@ extern const struct _mp_obj_module_t mp_module_onewire;
 #define NETWORK_BUILTIN_MODULE
 #endif
 
+#if MICROPY_PY_ONEWIRE
+#define ONEWIRE_BUILTIN_MODULE              { MP_ROM_QSTR(MP_QSTR__onewire), MP_ROM_PTR(&mp_module_onewire) },
+#else
+#define ONEWIRE_BUILTIN_MODULE
+#endif
+
 #define MICROPY_PORT_BUILTIN_MODULES \
-    { MP_ROM_QSTR(MP_QSTR_umachine), MP_ROM_PTR(&machine_module) }, \
-    { MP_ROM_QSTR(MP_QSTR_pyb), MP_ROM_PTR(&pyb_module) }, \
+    MACHINE_BUILTIN_MODULE \
+    PYB_BUILTIN_MODULE \
     STM_BUILTIN_MODULE \
-    { MP_ROM_QSTR(MP_QSTR_uos), MP_ROM_PTR(&mp_module_uos) }, \
-    { MP_ROM_QSTR(MP_QSTR_utime), MP_ROM_PTR(&mp_module_utime) }, \
+    UOS_BUILTIN_MODULE \
+    UTIME_BUILTIN_MODULE \
     SOCKET_BUILTIN_MODULE \
     NETWORK_BUILTIN_MODULE \
-    { MP_ROM_QSTR(MP_QSTR__onewire), MP_ROM_PTR(&mp_module_onewire) }, \
+    ONEWIRE_BUILTIN_MODULE \
 
 // extra constants
 #define MICROPY_PORT_CONSTANTS \
-    { MP_ROM_QSTR(MP_QSTR_umachine), MP_ROM_PTR(&machine_module) }, \
-    { MP_ROM_QSTR(MP_QSTR_machine), MP_ROM_PTR(&machine_module) }, \
-    { MP_ROM_QSTR(MP_QSTR_pyb), MP_ROM_PTR(&pyb_module) }, \
+    MACHINE_BUILTIN_MODULE \
+    MACHINE_BUILTIN_MODULE_CONSTANTS \
+    PYB_BUILTIN_MODULE \
     STM_BUILTIN_MODULE \
 
 #define MP_STATE_PORT MP_STATE_VM

From 5c92ff53fed97ca1f5f5b8cd427b49ee79037298 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 17 Feb 2021 13:05:28 +1100
Subject: [PATCH 0637/3533] stm32/boards: Disable onewire module on boards with
 small flash.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/boards/B_L072Z_LRWAN1/mpconfigboard.h | 1 +
 ports/stm32/boards/NUCLEO_L073RZ/mpconfigboard.h  | 1 +
 ports/stm32/boards/NUCLEO_L432KC/mpconfigboard.h  | 1 +
 3 files changed, 3 insertions(+)

diff --git a/ports/stm32/boards/B_L072Z_LRWAN1/mpconfigboard.h b/ports/stm32/boards/B_L072Z_LRWAN1/mpconfigboard.h
index 531794de66f1b..b330e8fdc1f27 100644
--- a/ports/stm32/boards/B_L072Z_LRWAN1/mpconfigboard.h
+++ b/ports/stm32/boards/B_L072Z_LRWAN1/mpconfigboard.h
@@ -13,6 +13,7 @@
 #define MICROPY_PY_FRAMEBUF         (0)
 #define MICROPY_PY_USOCKET          (0)
 #define MICROPY_PY_NETWORK          (0)
+#define MICROPY_PY_ONEWIRE          (0)
 #define MICROPY_PY_STM              (0)
 #define MICROPY_PY_PYB_LEGACY       (0)
 #define MICROPY_PY_UHEAPQ           (0)
diff --git a/ports/stm32/boards/NUCLEO_L073RZ/mpconfigboard.h b/ports/stm32/boards/NUCLEO_L073RZ/mpconfigboard.h
index 2b01bd33a3f1d..a5c5dc9a0ee7b 100644
--- a/ports/stm32/boards/NUCLEO_L073RZ/mpconfigboard.h
+++ b/ports/stm32/boards/NUCLEO_L073RZ/mpconfigboard.h
@@ -13,6 +13,7 @@
 #define MICROPY_PY_FRAMEBUF         (0)
 #define MICROPY_PY_USOCKET          (0)
 #define MICROPY_PY_NETWORK          (0)
+#define MICROPY_PY_ONEWIRE          (0)
 #define MICROPY_PY_STM              (0)
 #define MICROPY_PY_PYB_LEGACY       (0)
 #define MICROPY_PY_UHEAPQ           (0)
diff --git a/ports/stm32/boards/NUCLEO_L432KC/mpconfigboard.h b/ports/stm32/boards/NUCLEO_L432KC/mpconfigboard.h
index 6a3a364dc57a9..14b3bab8a7158 100644
--- a/ports/stm32/boards/NUCLEO_L432KC/mpconfigboard.h
+++ b/ports/stm32/boards/NUCLEO_L432KC/mpconfigboard.h
@@ -7,6 +7,7 @@
 #define MICROPY_PY_GENERATOR_PEND_THROW (0)
 #define MICROPY_PY_USOCKET          (0)
 #define MICROPY_PY_NETWORK          (0)
+#define MICROPY_PY_ONEWIRE          (0)
 #define MICROPY_PY_STM              (0)
 #define MICROPY_PY_PYB_LEGACY       (0)
 #define MICROPY_PY_UHEAPQ           (0)

From 629fdc366adacf345bbacd83145be2f78823ee57 Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew@alelec.net>
Date: Wed, 17 Feb 2021 13:45:14 +1100
Subject: [PATCH 0638/3533] stm32/mpbthciport: Fix initial baudrate to use
 provided value.

Fixes bug introduced in the recent bffb71f523e4bcc21b913af291deeb67091bed88
---
 ports/stm32/mpbthciport.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/stm32/mpbthciport.c b/ports/stm32/mpbthciport.c
index 5e51892e6f494..2d34e5e2b79ac 100644
--- a/ports/stm32/mpbthciport.c
+++ b/ports/stm32/mpbthciport.c
@@ -196,7 +196,7 @@ int mp_bluetooth_hci_uart_init(uint32_t port, uint32_t baudrate) {
     MP_STATE_PORT(pyb_uart_obj_all)[mp_bluetooth_hci_uart_obj.uart_id - 1] = &mp_bluetooth_hci_uart_obj;
 
     // Initialise the UART.
-    uart_init(&mp_bluetooth_hci_uart_obj, 115200, UART_WORDLENGTH_8B, UART_PARITY_NONE, UART_STOPBITS_1, UART_HWCONTROL_RTS | UART_HWCONTROL_CTS);
+    uart_init(&mp_bluetooth_hci_uart_obj, baudrate, UART_WORDLENGTH_8B, UART_PARITY_NONE, UART_STOPBITS_1, UART_HWCONTROL_RTS | UART_HWCONTROL_CTS);
     uart_set_rxbuf(&mp_bluetooth_hci_uart_obj, sizeof(hci_uart_rxbuf), hci_uart_rxbuf);
 
     // Add IRQ handler for IDLE (i.e. packet finished).

From 89cb2c6b80ccf302fd7519bd7b3e00680fc717f3 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 17 Feb 2021 15:45:06 +1100
Subject: [PATCH 0639/3533] stm32/mpbthciport: Use mp_printf instead of printf
 for error message.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/mpbthciport.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/stm32/mpbthciport.c b/ports/stm32/mpbthciport.c
index 2d34e5e2b79ac..c3cd864e2b7ad 100644
--- a/ports/stm32/mpbthciport.c
+++ b/ports/stm32/mpbthciport.c
@@ -232,7 +232,7 @@ int mp_bluetooth_hci_uart_write(const uint8_t *buf, size_t len) {
     int errcode;
     uart_tx_data(&mp_bluetooth_hci_uart_obj, (void *)buf, len, &errcode);
     if (errcode != 0) {
-        printf("\nmp_bluetooth_hci_uart_write: failed to write to UART %d\n", errcode);
+        mp_printf(&mp_plat_print, "\nmp_bluetooth_hci_uart_write: failed to write to UART %d\n", errcode);
     }
     return 0;
 }

From 301fe805caaa4ff6a566fb4ef494ef18553dfbfe Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 17 Feb 2021 15:45:54 +1100
Subject: [PATCH 0640/3533] stm32/mpbtstackport: Allow chipset and secondary
 baudrate to be set.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/boards/PYBD_SF2/mpconfigboard.h | 1 +
 ports/stm32/mpbtstackport.c                 | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/ports/stm32/boards/PYBD_SF2/mpconfigboard.h b/ports/stm32/boards/PYBD_SF2/mpconfigboard.h
index 45d968f353609..dc42751fffe87 100644
--- a/ports/stm32/boards/PYBD_SF2/mpconfigboard.h
+++ b/ports/stm32/boards/PYBD_SF2/mpconfigboard.h
@@ -185,6 +185,7 @@ extern struct _spi_bdev_t spi_bdev2;
 // Bluetooth config
 #define MICROPY_HW_BLE_UART_ID       (PYB_UART_6)
 #define MICROPY_HW_BLE_UART_BAUDRATE (115200)
+#define MICROPY_HW_BLE_UART_BAUDRATE_SECONDARY (3000000)
 
 /******************************************************************************/
 // Bootloader configuration
diff --git a/ports/stm32/mpbtstackport.c b/ports/stm32/mpbtstackport.c
index a031a6a151aff..3dfd8cb3c4a85 100644
--- a/ports/stm32/mpbtstackport.c
+++ b/ports/stm32/mpbtstackport.c
@@ -58,7 +58,7 @@ uint32_t hal_time_ms(void) {
 STATIC const hci_transport_config_uart_t hci_transport_config_uart = {
     HCI_TRANSPORT_CONFIG_UART,
     MICROPY_HW_BLE_UART_BAUDRATE,
-    3000000,
+    MICROPY_HW_BLE_UART_BAUDRATE_SECONDARY,
     0,
     NULL,
 };
@@ -90,9 +90,9 @@ void mp_bluetooth_btstack_port_init(void) {
     const hci_transport_t *transport = hci_transport_h4_instance(&mp_bluetooth_btstack_hci_uart_block);
     hci_init(transport, &hci_transport_config_uart);
 
-    // TODO: Probably not necessary for BCM (we have our own firmware loader in the cyw43 driver),
-    // but might be worth investigating for other controllers in the future.
-    // hci_set_chipset(btstack_chipset_bcm_instance());
+    #ifdef MICROPY_HW_BLE_BTSTACK_CHIPSET_INSTANCE
+    hci_set_chipset(MICROPY_HW_BLE_BTSTACK_CHIPSET_INSTANCE);
+    #endif
 }
 
 void mp_bluetooth_btstack_port_deinit(void) {

From cf6a0158806b11c521b9c9f8a1104f577a78fe1e Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 17 Feb 2021 16:06:56 +1100
Subject: [PATCH 0641/3533] extmod/btstack: Use MICROPY_HW_BLE_UART_BAUDRATE
 for first UART init.

Otherwise the UART may be left in a state at baudrate=0.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/btstack/btstack_hci_uart.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/extmod/btstack/btstack_hci_uart.c b/extmod/btstack/btstack_hci_uart.c
index 0a137bbae442d..7205dba069365 100644
--- a/extmod/btstack/btstack_hci_uart.c
+++ b/extmod/btstack/btstack_hci_uart.c
@@ -67,8 +67,7 @@ STATIC int btstack_uart_init(const btstack_uart_config_t *uart_config) {
     send_handler = NULL;
 
     // Set up the UART peripheral, attach IRQ and power up the HCI controller.
-    // We haven't been told the baud rate yet, so defer that until btstack_uart_set_baudrate.
-    if (mp_bluetooth_hci_uart_init(MICROPY_HW_BLE_UART_ID, 0)) {
+    if (mp_bluetooth_hci_uart_init(MICROPY_HW_BLE_UART_ID, MICROPY_HW_BLE_UART_BAUDRATE)) {
         init_success = false;
         return -1;
     }

From d4b45898f58aae66c706ca5f832f11727daef46b Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 18 Feb 2021 13:59:03 +1100
Subject: [PATCH 0642/3533] stm32/mboot: After sig verify, only write
 firmware-head if latter valid.

So that mboot can be used to program encrypted/signed firmware to regions
of flash that are not the main application, eg that are the filesystem.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/mboot/pack.c | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/ports/stm32/mboot/pack.c b/ports/stm32/mboot/pack.c
index 63ab93ea30fdb..88529ec50a5e9 100644
--- a/ports/stm32/mboot/pack.c
+++ b/ports/stm32/mboot/pack.c
@@ -61,10 +61,14 @@ static uint8_t uncompressed_buf[MBOOT_PACK_GZIP_BUFFER_SIZE] __attribute__((alig
 // that a double-word write to flash can only be done once (due to ECC).
 static uint8_t firmware_head[8];
 
+// Flag to indicate that firmware_head contains valid data.
+static bool firmware_head_valid;
+
 void mboot_pack_init(void) {
     erased_base_addr = 0;
     erased_top_addr = 0;
     firmware_chunk_base_addr = 0;
+    firmware_head_valid = false;
 }
 
 // In encrypted mode the erase is automatically managed.
@@ -103,6 +107,7 @@ static int mboot_pack_commit_chunk(uint32_t addr, uint8_t *data, size_t len) {
         addr += sizeof(firmware_head);
         data += sizeof(firmware_head);
         len -= sizeof(firmware_head);
+        firmware_head_valid = true;
     }
 
     // Commit this piece of the firmware.
@@ -131,7 +136,7 @@ static int mboot_pack_handle_full_sig(void) {
         while (len) {
             uint32_t l = len <= buf_alloc ? len : buf_alloc;
             hw_read(addr, l, buf);
-            if (addr == APPLICATION_ADDR) {
+            if (addr == APPLICATION_ADDR && firmware_head_valid) {
                 // The start of the firmware was not yet written to flash so copy
                 // it out of the temporary buffer to compute the full signature.
                 memcpy(buf, firmware_head, sizeof(firmware_head));
@@ -154,8 +159,13 @@ static int mboot_pack_handle_full_sig(void) {
     }
 
     // Full firmware passed the signature check.
-    // Write the start of the firmware so it boots.
-    return hw_write(APPLICATION_ADDR, firmware_head, sizeof(firmware_head));
+
+    if (firmware_head_valid) {
+        // Write the start of the firmware so it boots.
+        ret = hw_write(APPLICATION_ADDR, firmware_head, sizeof(firmware_head));
+    }
+
+    return ret;
 }
 
 // Handle a chunk with firmware data.

From 466ad35a725742928ef7b12522cc75929083af35 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 18 Feb 2021 11:51:01 +1100
Subject: [PATCH 0643/3533] esp32/boards: Enable size optimisation for builds.

This enables -Os for compilation, but still keeps full assertion messages.
With IDF v4.2, -Os changes the GENERIC firmware size from 1512176 down to
1384640, and the GENERIC_SPIRAM firmware is now 1452320 which fits in the
allocated partition.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/boards/sdkconfig.base | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/ports/esp32/boards/sdkconfig.base b/ports/esp32/boards/sdkconfig.base
index c84dd606b2c29..91e68c7bf6a9c 100644
--- a/ports/esp32/boards/sdkconfig.base
+++ b/ports/esp32/boards/sdkconfig.base
@@ -4,6 +4,12 @@
 CONFIG_IDF_TARGET="esp32"
 CONFIG_IDF_FIRMWARE_CHIP_ID=0x0000
 
+# Compiler options: use -Os to reduce size, but keep full assertions
+# (CONFIG_COMPILER_OPTIMIZATION_LEVEL_RELEASE is for IDF 4.0.2)
+CONFIG_COMPILER_OPTIMIZATION_LEVEL_RELEASE=y
+CONFIG_COMPILER_OPTIMIZATION_SIZE=y
+CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_ENABLE=y
+
 # Application manager
 CONFIG_APP_EXCLUDE_PROJECT_VER_VAR=y
 CONFIG_APP_EXCLUDE_PROJECT_NAME_VAR=y

From 143372ab5e41a609b5b7d8bb60af1a5fd478e7ea Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 19 Feb 2021 10:38:01 +1100
Subject: [PATCH 0644/3533] esp32: Add support to build with ESP-IDF v4.3
 pre-release.

The esp32 port now builds against IDF v4.3-beta1, as well as v4.4-dev.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/main/CMakeLists.txt | 6 ++++++
 ports/esp32/modesp32.c          | 8 +++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/ports/esp32/main/CMakeLists.txt b/ports/esp32/main/CMakeLists.txt
index 52985383f92dd..b6cf214bba64c 100644
--- a/ports/esp32/main/CMakeLists.txt
+++ b/ports/esp32/main/CMakeLists.txt
@@ -113,6 +113,12 @@ if(IDF_VERSION_MINOR GREATER_EQUAL 2)
     list(APPEND IDF_COMPONENTS esp_timer)
 endif()
 
+if(IDF_VERSION_MINOR GREATER_EQUAL 3)
+    list(APPEND IDF_COMPONENTS esp_hw_support)
+    list(APPEND IDF_COMPONENTS esp_pm)
+    list(APPEND IDF_COMPONENTS hal)
+endif()
+
 # Register the main IDF component.
 idf_component_register(
     SRCS
diff --git a/ports/esp32/modesp32.c b/ports/esp32/modesp32.c
index 28d1762d240de..d7c6bf0fa344d 100644
--- a/ports/esp32/modesp32.c
+++ b/ports/esp32/modesp32.c
@@ -35,7 +35,6 @@
 #include "driver/adc.h"
 #include "esp_heap_caps.h"
 #include "multi_heap.h"
-#include "../heap_private.h"
 
 #include "py/nlr.h"
 #include "py/obj.h"
@@ -46,6 +45,13 @@
 #include "machine_rtc.h"
 #include "modesp32.h"
 
+// These private includes are needed for idf_heap_info.
+#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(4, 3, 0)
+#define MULTI_HEAP_FREERTOS
+#include "../multi_heap_platform.h"
+#endif
+#include "../heap_private.h"
+
 STATIC mp_obj_t esp32_wake_on_touch(const mp_obj_t wake) {
 
     if (machine_rtc_config.ext0_pin != -1) {

From c10d431819f9f7095c3573c98f01c98526a2cb0b Mon Sep 17 00:00:00 2001
From: Thorsten von Eicken <tve@voneicken.com>
Date: Mon, 18 Jan 2021 01:06:12 -0800
Subject: [PATCH 0645/3533] esp32: Add basic support for Non-Volatile-Storage
 in esp32 module.

This commit implements basic NVS support for the esp32.  It follows the
pattern of the esp32.Partition class and exposes an NVS object per NVS
namespace.  The initial support provided is only for signed 32-bit integers
and binary blobs.  It's easy (albeit a bit tedious) to add support for
more types.

See discussions in: #4436, #4707, #6780
---
 docs/library/esp32.rst          |  48 ++++++++++
 ports/esp32/esp32_nvs.c         | 151 ++++++++++++++++++++++++++++++++
 ports/esp32/main/CMakeLists.txt |   1 +
 ports/esp32/modesp32.c          |   1 +
 ports/esp32/modesp32.h          |   1 +
 tests/esp32/esp32_nvs.py        |  67 ++++++++++++++
 tests/esp32/esp32_nvs.py.exp    |  14 +++
 7 files changed, 283 insertions(+)
 create mode 100644 ports/esp32/esp32_nvs.c
 create mode 100644 tests/esp32/esp32_nvs.py
 create mode 100644 tests/esp32/esp32_nvs.py.exp

diff --git a/docs/library/esp32.rst b/docs/library/esp32.rst
index c6777b8a7da33..f179a31ef65e3 100644
--- a/docs/library/esp32.rst
+++ b/docs/library/esp32.rst
@@ -269,3 +269,51 @@ Constants
           esp32.WAKEUP_ANY_HIGH
 
    Selects the wake level for pins.
+
+Non-Volatile Storage
+--------------------
+
+This class gives access to the Non-Volatile storage managed by ESP-IDF. The NVS is partitioned
+into namespaces and each namespace contains typed key-value pairs. The keys are strings and the
+values may be various integer types, strings, and binary blobs. The driver currently only
+supports 32-bit signed integers and blobs.
+
+.. warning::
+
+    Changes to NVS need to be committed to flash by calling the commit method. Failure
+    to call commit results in changes being lost at the next reset.
+
+.. class:: NVS(namespace)
+
+    Create an object providing access to a namespace (which is automatically created if not
+    present).
+
+.. method:: NVS.set_i32(key, value)
+
+    Sets a 32-bit signed integer value for the specified key. Remember to call *commit*!
+
+.. method:: NVS.get_i32(key)
+
+    Returns the signed integer value for the specified key. Raises an OSError if the key does not
+    exist or has a different type.
+
+.. method:: NVS.set_blob(key, value)
+
+    Sets a binary blob value for the specified key. The value passed in must support the buffer
+    protocol, e.g. bytes, bytearray, str. (Note that esp-idf distinguishes blobs and strings, this
+    method always writes a blob even if a string is passed in as value.)
+    Remember to call *commit*!
+
+.. method:: NVS.get_blob(key, buffer)
+
+    Reads the value of the blob for the specified key into the buffer, which must be a bytearray.
+    Returns the actual length read. Raises an OSError if the key does not exist, has a different
+    type, or if the buffer is too small.
+
+.. method:: NVS.erase_key(key)
+
+    Erases a key-value pair.
+
+.. method:: NVS.commit()
+
+    Commits changes made by *set_xxx* methods to flash.
diff --git a/ports/esp32/esp32_nvs.c b/ports/esp32/esp32_nvs.c
new file mode 100644
index 0000000000000..d13151d3ce774
--- /dev/null
+++ b/ports/esp32/esp32_nvs.c
@@ -0,0 +1,151 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 by Thorsten von Eicken
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include <string.h>
+
+#include "py/runtime.h"
+#include "py/mperrno.h"
+#include "mphalport.h"
+#include "modesp32.h"
+#include "nvs_flash.h"
+#include "nvs.h"
+
+// This file implements the NVS (Non-Volatile Storage) class in the esp32 module.
+// It provides simple access to the NVS feature provided by ESP-IDF.
+
+// NVS python object that represents an NVS namespace.
+typedef struct _esp32_nvs_obj_t {
+    mp_obj_base_t base;
+    nvs_handle_t namespace;
+} esp32_nvs_obj_t;
+
+// *esp32_nvs_new allocates a python NVS object given a handle to an esp-idf namespace C obj.
+STATIC esp32_nvs_obj_t *esp32_nvs_new(nvs_handle_t namespace) {
+    esp32_nvs_obj_t *self = m_new_obj(esp32_nvs_obj_t);
+    self->base.type = &esp32_nvs_type;
+    self->namespace = namespace;
+    return self;
+}
+
+// esp32_nvs_print prints an NVS object, unfortunately it doesn't seem possible to extract the
+// namespace string or anything else from the opaque handle provided by esp-idf.
+STATIC void esp32_nvs_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+    // esp32_nvs_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    mp_printf(print, "<NVS namespace>");
+}
+
+// esp32_nvs_make_new constructs a handle to an NVS namespace.
+STATIC mp_obj_t esp32_nvs_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
+    // Check args
+    mp_arg_check_num(n_args, n_kw, 1, 1, false);
+
+    // Get requested nvs namespace
+    const char *ns_name = mp_obj_str_get_str(all_args[0]);
+    nvs_handle_t namespace;
+    check_esp_err(nvs_open(ns_name, NVS_READWRITE, &namespace));
+    return MP_OBJ_FROM_PTR(esp32_nvs_new(namespace));
+}
+
+// esp32_nvs_set_i32 sets a 32-bit integer value
+STATIC mp_obj_t esp32_nvs_set_i32(mp_obj_t self_in, mp_obj_t key_in, mp_obj_t value_in) {
+    esp32_nvs_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    const char *key = mp_obj_str_get_str(key_in);
+    int32_t value = mp_obj_get_int(value_in);
+    check_esp_err(nvs_set_i32(self->namespace, key, value));
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_3(esp32_nvs_set_i32_obj, esp32_nvs_set_i32);
+
+// esp32_nvs_get_i32 reads a 32-bit integer value
+STATIC mp_obj_t esp32_nvs_get_i32(mp_obj_t self_in, mp_obj_t key_in) {
+    esp32_nvs_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    const char *key = mp_obj_str_get_str(key_in);
+    int32_t value;
+    check_esp_err(nvs_get_i32(self->namespace, key, &value));
+    return mp_obj_new_int(value);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(esp32_nvs_get_i32_obj, esp32_nvs_get_i32);
+
+// esp32_nvs_set_blob writes a buffer object into a binary blob value.
+STATIC mp_obj_t esp32_nvs_set_blob(mp_obj_t self_in, mp_obj_t key_in, mp_obj_t value_in) {
+    esp32_nvs_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    const char *key = mp_obj_str_get_str(key_in);
+    mp_buffer_info_t value;
+    mp_get_buffer_raise(value_in, &value, MP_BUFFER_READ);
+    check_esp_err(nvs_set_blob(self->namespace, key, value.buf, value.len));
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_3(esp32_nvs_set_blob_obj, esp32_nvs_set_blob);
+
+// esp32_nvs_get_blob reads a binary blob value into a bytearray. Returns actual length.
+STATIC mp_obj_t esp32_nvs_get_blob(mp_obj_t self_in, mp_obj_t key_in, mp_obj_t value_in) {
+    esp32_nvs_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    const char *key = mp_obj_str_get_str(key_in);
+    // get buffer to be filled
+    mp_buffer_info_t value;
+    mp_get_buffer_raise(value_in, &value, MP_BUFFER_WRITE);
+    size_t length = value.len;
+    // fill the buffer with the value, will raise an esp-idf error if the length of
+    // the provided buffer (bytearray) is too small
+    check_esp_err(nvs_get_blob(self->namespace, key, value.buf, &length));
+    return MP_OBJ_NEW_SMALL_INT(length);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_3(esp32_nvs_get_blob_obj, esp32_nvs_get_blob);
+
+// esp32_nvs_erase_key erases one key.
+STATIC mp_obj_t esp32_nvs_erase_key(mp_obj_t self_in, mp_obj_t key_in) {
+    esp32_nvs_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    const char *key = mp_obj_str_get_str(key_in);
+    check_esp_err(nvs_erase_key(self->namespace, key));
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(esp32_nvs_erase_key_obj, esp32_nvs_erase_key);
+
+// esp32_nvs_commit commits any changes to flash.
+STATIC mp_obj_t esp32_nvs_commit(mp_obj_t self_in) {
+    esp32_nvs_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    check_esp_err(nvs_commit(self->namespace));
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(esp32_nvs_commit_obj, esp32_nvs_commit);
+
+STATIC const mp_rom_map_elem_t esp32_nvs_locals_dict_table[] = {
+    { MP_ROM_QSTR(MP_QSTR_get_i32), MP_ROM_PTR(&esp32_nvs_get_i32_obj) },
+    { MP_ROM_QSTR(MP_QSTR_set_i32), MP_ROM_PTR(&esp32_nvs_set_i32_obj) },
+    { MP_ROM_QSTR(MP_QSTR_get_blob), MP_ROM_PTR(&esp32_nvs_get_blob_obj) },
+    { MP_ROM_QSTR(MP_QSTR_set_blob), MP_ROM_PTR(&esp32_nvs_set_blob_obj) },
+    { MP_ROM_QSTR(MP_QSTR_erase_key), MP_ROM_PTR(&esp32_nvs_erase_key_obj) },
+    { MP_ROM_QSTR(MP_QSTR_commit), MP_ROM_PTR(&esp32_nvs_commit_obj) },
+};
+STATIC MP_DEFINE_CONST_DICT(esp32_nvs_locals_dict, esp32_nvs_locals_dict_table);
+
+const mp_obj_type_t esp32_nvs_type = {
+    { &mp_type_type },
+    .name = MP_QSTR_NVS,
+    .print = esp32_nvs_print,
+    .make_new = esp32_nvs_make_new,
+    .locals_dict = (mp_obj_dict_t *)&esp32_nvs_locals_dict,
+};
diff --git a/ports/esp32/main/CMakeLists.txt b/ports/esp32/main/CMakeLists.txt
index b6cf214bba64c..9fb48a90412ef 100644
--- a/ports/esp32/main/CMakeLists.txt
+++ b/ports/esp32/main/CMakeLists.txt
@@ -55,6 +55,7 @@ set(MICROPY_SOURCE_PORT
     ${PROJECT_DIR}/mpnimbleport.c
     ${PROJECT_DIR}/modsocket.c
     ${PROJECT_DIR}/modesp.c
+    ${PROJECT_DIR}/esp32_nvs.c
     ${PROJECT_DIR}/esp32_partition.c
     ${PROJECT_DIR}/esp32_rmt.c
     ${PROJECT_DIR}/esp32_ulp.c
diff --git a/ports/esp32/modesp32.c b/ports/esp32/modesp32.c
index d7c6bf0fa344d..53ca7fdc60fcc 100644
--- a/ports/esp32/modesp32.c
+++ b/ports/esp32/modesp32.c
@@ -186,6 +186,7 @@ STATIC const mp_rom_map_elem_t esp32_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_hall_sensor), MP_ROM_PTR(&esp32_hall_sensor_obj) },
     { MP_ROM_QSTR(MP_QSTR_idf_heap_info), MP_ROM_PTR(&esp32_idf_heap_info_obj) },
 
+    { MP_ROM_QSTR(MP_QSTR_NVS), MP_ROM_PTR(&esp32_nvs_type) },
     { MP_ROM_QSTR(MP_QSTR_Partition), MP_ROM_PTR(&esp32_partition_type) },
     { MP_ROM_QSTR(MP_QSTR_RMT), MP_ROM_PTR(&esp32_rmt_type) },
     { MP_ROM_QSTR(MP_QSTR_ULP), MP_ROM_PTR(&esp32_ulp_type) },
diff --git a/ports/esp32/modesp32.h b/ports/esp32/modesp32.h
index f4c0491f7c27f..18bd62ee41640 100644
--- a/ports/esp32/modesp32.h
+++ b/ports/esp32/modesp32.h
@@ -26,6 +26,7 @@
 #define RTC_LAST_EXT_PIN 39
 #define RTC_IS_VALID_EXT_PIN(pin_id) ((1ll << (pin_id)) & RTC_VALID_EXT_PINS)
 
+extern const mp_obj_type_t esp32_nvs_type;
 extern const mp_obj_type_t esp32_partition_type;
 extern const mp_obj_type_t esp32_rmt_type;
 extern const mp_obj_type_t esp32_ulp_type;
diff --git a/tests/esp32/esp32_nvs.py b/tests/esp32/esp32_nvs.py
new file mode 100644
index 0000000000000..fd8b152ca71d8
--- /dev/null
+++ b/tests/esp32/esp32_nvs.py
@@ -0,0 +1,67 @@
+# Test the esp32 NVS class - access to esp-idf's Non-Volatile-Storage
+
+from esp32 import NVS
+
+nvs = NVS("mp-test")
+
+# test setting and gettin an integer kv
+nvs.set_i32("key1", 1234)
+print(nvs.get_i32("key1"))
+nvs.set_i32("key2", -503)
+print(nvs.get_i32("key2"))
+print(nvs.get_i32("key1"))
+
+# test setting and getting a blob kv using a bytearray
+blob1 = "testing a string as a blob"
+nvs.set_blob("blob1", blob1)
+buf1 = bytearray(len(blob1))
+len1 = nvs.get_blob("blob1", buf1)
+print(buf1)
+print(len(blob1), len1)
+
+# test setting and getting a blob kv using a string
+blob2 = b"testing a bytearray"
+nvs.set_blob("blob2", blob2)
+buf2 = bytearray(len(blob2))
+len2 = nvs.get_blob("blob2", buf2)
+print(buf2)
+print(len(blob2), len2)
+
+# test raising of error exceptions
+nvs.erase_key("key1")
+try:
+    nvs.erase_key("key1")  # not found
+except OSError as e:
+    print(e)
+try:
+    nvs.get_i32("key1")  # not found
+except OSError as e:
+    print(e)
+try:
+    nvs.get_i32("blob1")  # not found (blob1 exists but diff type)
+except OSError as e:
+    print(e)
+try:
+    buf3 = bytearray(10)
+    nvs.get_blob("blob1", buf3)  # invalid length (too short)
+except OSError as e:
+    print(e)
+
+nvs.commit()  # we're not verifying that this does anything, just doesn't error
+
+# test using a second namespace and that it doesn't interfere with first
+nvs2 = NVS("mp-test2")
+try:
+    print(nvs2.get_i32("key2"))
+except OSError as e:
+    print(e)
+nvs2.set_i32("key2", 7654)
+print(nvs.get_i32("key2"))
+print(nvs2.get_i32("key2"))
+
+# clean-up (the namespaces will remain)
+nvs.erase_key("key2")
+nvs.erase_key("blob1")
+nvs.erase_key("blob2")
+nvs2.erase_key("key2")
+nvs.commit()
diff --git a/tests/esp32/esp32_nvs.py.exp b/tests/esp32/esp32_nvs.py.exp
new file mode 100644
index 0000000000000..33cdfd6df9c09
--- /dev/null
+++ b/tests/esp32/esp32_nvs.py.exp
@@ -0,0 +1,14 @@
+1234
+-503
+1234
+bytearray(b'testing a string as a blob')
+26 26
+bytearray(b'testing a bytearray')
+19 19
+(-4354, 'ESP_ERR_NVS_NOT_FOUND')
+(-4354, 'ESP_ERR_NVS_NOT_FOUND')
+(-4354, 'ESP_ERR_NVS_NOT_FOUND')
+(-4364, 'ESP_ERR_NVS_INVALID_LENGTH')
+(-4354, 'ESP_ERR_NVS_NOT_FOUND')
+-503
+7654

From d28dbcd6c783bc45bc4661abbb53d2b6c5397102 Mon Sep 17 00:00:00 2001
From: Thorsten von Eicken <tve@voneicken.com>
Date: Wed, 3 Jun 2020 22:42:37 -0700
Subject: [PATCH 0646/3533] esp32: Make machine.soft_reset() work in main.py
 and reset_cause().

This commit fixes two issues on the esp32:
- it enables machine.soft_reset() to be called in main.py;
- it enables machine.reset_cause() to correctly identify a soft reset.

The former is useful in that it enables soft resets in applications that
are started at boot time.  The support is patterned after the stm32 port.
---
 ports/esp32/main.c       |  9 ++++++++-
 ports/esp32/modmachine.c | 14 ++++++++++++++
 ports/esp32/modmachine.h |  2 ++
 3 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/ports/esp32/main.c b/ports/esp32/main.c
index 001f2beaeb5e9..7413798d0c302 100644
--- a/ports/esp32/main.c
+++ b/ports/esp32/main.c
@@ -73,6 +73,7 @@ void mp_task(void *pvParameter) {
     mp_thread_init(pxTaskGetStackStart(NULL), MP_TASK_STACK_SIZE / sizeof(uintptr_t));
     #endif
     uart_init();
+    machine_init();
 
     // TODO: CONFIG_SPIRAM_SUPPORT is for 3.3 compatibility, remove after move to 4.0.
     #if CONFIG_ESP32_SPIRAM_SUPPORT || CONFIG_SPIRAM_SUPPORT
@@ -118,7 +119,10 @@ void mp_task(void *pvParameter) {
     pyexec_frozen_module("_boot.py");
     pyexec_file_if_exists("boot.py");
     if (pyexec_mode_kind == PYEXEC_MODE_FRIENDLY_REPL) {
-        pyexec_file_if_exists("main.py");
+        int ret = pyexec_file_if_exists("main.py");
+        if (ret & PYEXEC_FORCED_EXIT) {
+            goto soft_reset_exit;
+        }
     }
 
     for (;;) {
@@ -135,6 +139,8 @@ void mp_task(void *pvParameter) {
         }
     }
 
+soft_reset_exit:
+
     #if MICROPY_BLUETOOTH_NIMBLE
     mp_bluetooth_deinit();
     #endif
@@ -151,6 +157,7 @@ void mp_task(void *pvParameter) {
 
     // deinitialise peripherals
     machine_pins_deinit();
+    machine_deinit();
     usocket_events_deinit();
 
     mp_deinit();
diff --git a/ports/esp32/modmachine.c b/ports/esp32/modmachine.c
index bb346ea1cd3fb..3925bcb64e194 100644
--- a/ports/esp32/modmachine.c
+++ b/ports/esp32/modmachine.c
@@ -59,6 +59,8 @@ typedef enum {
     MP_SOFT_RESET
 } reset_reason_t;
 
+STATIC bool is_soft_reset = 0;
+
 STATIC mp_obj_t machine_freq(size_t n_args, const mp_obj_t *args) {
     if (n_args == 0) {
         // get
@@ -140,6 +142,9 @@ STATIC mp_obj_t machine_deepsleep(size_t n_args, const mp_obj_t *pos_args, mp_ma
 STATIC MP_DEFINE_CONST_FUN_OBJ_KW(machine_deepsleep_obj, 0,  machine_deepsleep);
 
 STATIC mp_obj_t machine_reset_cause(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    if (is_soft_reset) {
+        return MP_OBJ_NEW_SMALL_INT(MP_SOFT_RESET);
+    }
     switch (esp_reset_reason()) {
         case ESP_RST_POWERON:
         case ESP_RST_BROWNOUT:
@@ -171,6 +176,15 @@ STATIC mp_obj_t machine_reset_cause(size_t n_args, const mp_obj_t *pos_args, mp_
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_KW(machine_reset_cause_obj, 0,  machine_reset_cause);
 
+void machine_init(void) {
+    is_soft_reset = 0;
+}
+
+void machine_deinit(void) {
+    // we are doing a soft-reset so change the reset_cause
+    is_soft_reset = 1;
+}
+
 STATIC mp_obj_t machine_wake_reason(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     return MP_OBJ_NEW_SMALL_INT(esp_sleep_get_wakeup_cause());
 }
diff --git a/ports/esp32/modmachine.h b/ports/esp32/modmachine.h
index 98b36e32b0231..3e99e11205afc 100644
--- a/ports/esp32/modmachine.h
+++ b/ports/esp32/modmachine.h
@@ -22,6 +22,8 @@ extern const mp_obj_type_t machine_uart_type;
 extern const mp_obj_type_t machine_rtc_type;
 extern const mp_obj_type_t machine_sdcard_type;
 
+void machine_init(void);
+void machine_deinit(void);
 void machine_pins_init(void);
 void machine_pins_deinit(void);
 void machine_timer_deinit_all(void);

From a76604afba109d990e466cdcd5a69a82077a7f56 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Fri, 19 Feb 2021 14:47:51 +1100
Subject: [PATCH 0647/3533] extmod/modbluetooth: Separate enabling of "client"
 from "central".

Previously, the MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE macro
controlled enabling both the central mode and the GATT client
functionality (because usually the two go together).

This commits adds a new MICROPY_PY_BLUETOOTH_ENABLE_GATT_CLIENT
macro that separately enables the GATT client functionality.
This defaults to MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE.

This also fixes a bug in the NimBLE bindings where a notification
or indication would not be received by a peripheral (acting as client)
as gap_event_cb wasn't handling it. Now both central_gap_event_cb
and peripheral_gap_event_cb share the same common handler for these
events.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 extmod/btstack/modbluetooth_btstack.c |  30 ++-
 extmod/modbluetooth.c                 |  32 ++-
 extmod/modbluetooth.h                 |  24 +-
 extmod/nimble/modbluetooth_nimble.c   | 336 +++++++++++++++-----------
 4 files changed, 246 insertions(+), 176 deletions(-)

diff --git a/extmod/btstack/modbluetooth_btstack.c b/extmod/btstack/modbluetooth_btstack.c
index c861c76d22b0b..5f047e32541f4 100644
--- a/extmod/btstack/modbluetooth_btstack.c
+++ b/extmod/btstack/modbluetooth_btstack.c
@@ -91,7 +91,7 @@ STATIC mp_obj_bluetooth_uuid_t create_mp_uuid(uint16_t uuid16, const uint8_t *uu
     }
     return result;
 }
-#endif
+#endif // MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE
 
 // Notes on supporting background ops (e.g. an attempt to gatts_notify while
 // an existing notification is in progress):
@@ -218,7 +218,7 @@ STATIC mp_btstack_pending_op_t *btstack_enqueue_pending_operation(uint16_t op_ty
     return pending_op;
 }
 
-#if MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE
+#if MICROPY_PY_BLUETOOTH_ENABLE_GATT_CLIENT
 
 // Cleans up a pending op of the specified type for this conn_handle (and if specified, value_handle).
 // Used by MP_BLUETOOTH_BTSTACK_PENDING_WRITE and MP_BLUETOOTH_BTSTACK_PENDING_WRITE_NO_RESPONSE.
@@ -418,6 +418,8 @@ STATIC void btstack_packet_handler(uint8_t packet_type, uint8_t *packet, uint8_t
         uint8_t length = gap_event_advertising_report_get_data_length(packet);
         const uint8_t *data = gap_event_advertising_report_get_data(packet);
         mp_bluetooth_gap_on_scan_result(address_type, address, adv_event_type, rssi, data, length);
+    #endif // MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE
+    #if MICROPY_PY_BLUETOOTH_ENABLE_GATT_CLIENT
     } else if (event_type == GATT_EVENT_QUERY_COMPLETE) {
         uint16_t conn_handle = gatt_event_query_complete_get_handle(packet);
         uint16_t status = gatt_event_query_complete_get_att_status(packet);
@@ -487,7 +489,7 @@ STATIC void btstack_packet_handler(uint8_t packet_type, uint8_t *packet, uint8_t
             // Note: Can't "del" the pending_op from IRQ context. Leave it for the GC.
         }
 
-    #endif // MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE
+    #endif // MICROPY_PY_BLUETOOTH_ENABLE_GATT_CLIENT
     } else {
         DEBUG_printf("  --> hci event type: unknown (0x%02x)\n", event_type);
     }
@@ -506,7 +508,7 @@ STATIC btstack_packet_callback_registration_t hci_event_callback_registration =
     .callback = &btstack_packet_handler_generic
 };
 
-#if MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE
+#if MICROPY_PY_BLUETOOTH_ENABLE_GATT_CLIENT
 // For when the handler is being used for service discovery.
 STATIC void btstack_packet_handler_discover_services(uint8_t packet_type, uint16_t channel, uint8_t *packet, uint16_t size) {
     (void)channel;
@@ -541,7 +543,7 @@ STATIC void btstack_packet_handler_write_with_response(uint8_t packet_type, uint
     (void)size;
     btstack_packet_handler(packet_type, packet, MP_BLUETOOTH_IRQ_GATTC_WRITE_DONE);
 }
-#endif // MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE
+#endif // MICROPY_PY_BLUETOOTH_ENABLE_GATT_CLIENT
 
 STATIC btstack_timer_source_t btstack_init_deinit_timeout;
 
@@ -662,12 +664,12 @@ int mp_bluetooth_init(void) {
     sm_set_er(dummy_key);
     sm_set_ir(dummy_key);
 
-    #if MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE
+    #if MICROPY_PY_BLUETOOTH_ENABLE_GATT_CLIENT
     gatt_client_init();
 
     // We always require explicitly exchanging MTU with ble.gattc_exchange_mtu().
     gatt_client_mtu_enable_auto_negotiation(false);
-    #endif
+    #endif // MICROPY_PY_BLUETOOTH_ENABLE_GATT_CLIENT
 
     // Register for HCI events.
     hci_add_event_handler(&hci_event_callback_registration);
@@ -719,10 +721,10 @@ int mp_bluetooth_init(void) {
         set_random_address();
     }
 
-    #if MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE
+    #if MICROPY_PY_BLUETOOTH_ENABLE_GATT_CLIENT
     // Enable GATT_EVENT_NOTIFICATION/GATT_EVENT_INDICATION for all connections and handles.
     gatt_client_listen_for_characteristic_value_updates(&MP_STATE_PORT(bluetooth_btstack_root_pointers)->notification, &btstack_packet_handler_generic, GATT_CLIENT_ANY_CONNECTION, NULL);
-    #endif
+    #endif // MICROPY_PY_BLUETOOTH_ENABLE_GATT_CLIENT
 
     return 0;
 }
@@ -737,10 +739,10 @@ void mp_bluetooth_deinit(void) {
 
     mp_bluetooth_gap_advertise_stop();
 
-    #if MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE
+    #if MICROPY_PY_BLUETOOTH_ENABLE_GATT_CLIENT
     // Remove our registration for notify/indicate.
     gatt_client_stop_listening_for_characteristic_value_updates(&MP_STATE_PORT(bluetooth_btstack_root_pointers)->notification);
-    #endif
+    #endif // MICROPY_PY_BLUETOOTH_ENABLE_GATT_CLIENT
 
     // Set a timer that will forcibly set the state to TIMEOUT, which will stop the loop below.
     btstack_run_loop_set_timer(&btstack_init_deinit_timeout, BTSTACK_INIT_DEINIT_TIMEOUT_MS);
@@ -1232,6 +1234,10 @@ int mp_bluetooth_gap_peripheral_connect(uint8_t addr_type, const uint8_t *addr,
     return btstack_error_to_errno(gap_connect(btstack_addr, addr_type));
 }
 
+#endif // MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE
+
+#if MICROPY_PY_BLUETOOTH_ENABLE_GATT_CLIENT
+
 int mp_bluetooth_gattc_discover_primary_services(uint16_t conn_handle, const mp_obj_bluetooth_uuid_t *uuid) {
     DEBUG_printf("mp_bluetooth_gattc_discover_primary_services\n");
     uint8_t err;
@@ -1346,7 +1352,7 @@ int mp_bluetooth_gattc_exchange_mtu(uint16_t conn_handle) {
 
     return 0;
 }
-#endif // MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE
+#endif // MICROPY_PY_BLUETOOTH_ENABLE_GATT_CLIENT
 
 #if MICROPY_PY_BLUETOOTH_ENABLE_L2CAP_CHANNELS
 
diff --git a/extmod/modbluetooth.c b/extmod/modbluetooth.c
index 8870a21c4d520..269493f0a94a3 100644
--- a/extmod/modbluetooth.c
+++ b/extmod/modbluetooth.c
@@ -761,7 +761,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(bluetooth_ble_gatts_set_buffer_obj, 3
 // Bluetooth object: GATTC (Central/Scanner role)
 // ----------------------------------------------------------------------------
 
-#if MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE
+#if MICROPY_PY_BLUETOOTH_ENABLE_GATT_CLIENT
 
 STATIC mp_obj_t bluetooth_ble_gattc_discover_services(size_t n_args, const mp_obj_t *args) {
     mp_int_t conn_handle = mp_obj_get_int(args[1]);
@@ -830,7 +830,7 @@ STATIC mp_obj_t bluetooth_ble_gattc_exchange_mtu(mp_obj_t self_in, mp_obj_t conn
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_2(bluetooth_ble_gattc_exchange_mtu_obj, bluetooth_ble_gattc_exchange_mtu);
 
-#endif // MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE
+#endif // MICROPY_PY_BLUETOOTH_ENABLE_GATT_CLIENT
 
 #if MICROPY_PY_BLUETOOTH_ENABLE_L2CAP_CHANNELS
 
@@ -921,15 +921,15 @@ STATIC const mp_rom_map_elem_t bluetooth_ble_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_gap_pair), MP_ROM_PTR(&bluetooth_ble_gap_pair_obj) },
     { MP_ROM_QSTR(MP_QSTR_gap_passkey), MP_ROM_PTR(&bluetooth_ble_gap_passkey_obj) },
     #endif
-    // GATT Server (i.e. peripheral/advertiser role)
+    // GATT Server
     { MP_ROM_QSTR(MP_QSTR_gatts_register_services), MP_ROM_PTR(&bluetooth_ble_gatts_register_services_obj) },
     { MP_ROM_QSTR(MP_QSTR_gatts_read), MP_ROM_PTR(&bluetooth_ble_gatts_read_obj) },
     { MP_ROM_QSTR(MP_QSTR_gatts_write), MP_ROM_PTR(&bluetooth_ble_gatts_write_obj) },
     { MP_ROM_QSTR(MP_QSTR_gatts_notify), MP_ROM_PTR(&bluetooth_ble_gatts_notify_obj) },
     { MP_ROM_QSTR(MP_QSTR_gatts_indicate), MP_ROM_PTR(&bluetooth_ble_gatts_indicate_obj) },
     { MP_ROM_QSTR(MP_QSTR_gatts_set_buffer), MP_ROM_PTR(&bluetooth_ble_gatts_set_buffer_obj) },
-    #if MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE
-    // GATT Client (i.e. central/scanner role)
+    #if MICROPY_PY_BLUETOOTH_ENABLE_GATT_CLIENT
+    // GATT Client
     { MP_ROM_QSTR(MP_QSTR_gattc_discover_services), MP_ROM_PTR(&bluetooth_ble_gattc_discover_services_obj) },
     { MP_ROM_QSTR(MP_QSTR_gattc_discover_characteristics), MP_ROM_PTR(&bluetooth_ble_gattc_discover_characteristics_obj) },
     { MP_ROM_QSTR(MP_QSTR_gattc_discover_descriptors), MP_ROM_PTR(&bluetooth_ble_gattc_discover_descriptors_obj) },
@@ -1067,6 +1067,8 @@ STATIC mp_obj_t bluetooth_ble_invoke_irq(mp_obj_t none_in) {
         } else if (event == MP_BLUETOOTH_IRQ_SCAN_DONE) {
             // No params required.
             data_tuple->len = 0;
+        #endif
+        #if MICROPY_PY_BLUETOOTH_ENABLE_GATT_CLIENT
         } else if (event == MP_BLUETOOTH_IRQ_GATTC_SERVICE_RESULT) {
             // conn_handle, start_handle, end_handle, uuid
             ringbuf_extract(&o->ringbuf, data_tuple, 3, 0, NULL, 0, &o->irq_data_uuid, NULL);
@@ -1085,7 +1087,7 @@ STATIC mp_obj_t bluetooth_ble_invoke_irq(mp_obj_t none_in) {
         } else if (event == MP_BLUETOOTH_IRQ_GATTC_READ_DONE || event == MP_BLUETOOTH_IRQ_GATTC_WRITE_DONE) {
             // conn_handle, value_handle, status
             ringbuf_extract(&o->ringbuf, data_tuple, 3, 0, NULL, 0, NULL, NULL);
-        #endif // MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE
+        #endif // MICROPY_PY_BLUETOOTH_ENABLE_GATT_CLIENT
         }
 
         MICROPY_PY_BLUETOOTH_EXIT
@@ -1228,7 +1230,7 @@ void mp_bluetooth_gatts_on_mtu_exchanged(uint16_t conn_handle, uint16_t value) {
 }
 
 #if MICROPY_PY_BLUETOOTH_ENABLE_L2CAP_CHANNELS
-mp_int_t mp_bluetooth_gattc_on_l2cap_accept(uint16_t conn_handle, uint16_t cid, uint16_t psm, uint16_t our_mtu, uint16_t peer_mtu) {
+mp_int_t mp_bluetooth_on_l2cap_accept(uint16_t conn_handle, uint16_t cid, uint16_t psm, uint16_t our_mtu, uint16_t peer_mtu) {
     mp_int_t args[] = {conn_handle, cid, psm, our_mtu, peer_mtu};
     mp_obj_t result = invoke_irq_handler(MP_BLUETOOTH_IRQ_L2CAP_ACCEPT, args, 5, 0, NULL_ADDR, NULL_UUID, NULL_DATA, NULL_DATA_LEN, 0);
     // Return non-zero from IRQ handler to fail the accept.
@@ -1237,22 +1239,22 @@ mp_int_t mp_bluetooth_gattc_on_l2cap_accept(uint16_t conn_handle, uint16_t cid,
     return ret;
 }
 
-void mp_bluetooth_gattc_on_l2cap_connect(uint16_t conn_handle, uint16_t cid, uint16_t psm, uint16_t our_mtu, uint16_t peer_mtu) {
+void mp_bluetooth_on_l2cap_connect(uint16_t conn_handle, uint16_t cid, uint16_t psm, uint16_t our_mtu, uint16_t peer_mtu) {
     mp_int_t args[] = {conn_handle, cid, psm, our_mtu, peer_mtu};
     invoke_irq_handler(MP_BLUETOOTH_IRQ_L2CAP_CONNECT, args, 5, 0, NULL_ADDR, NULL_UUID, NULL_DATA, NULL_DATA_LEN, 0);
 }
 
-void mp_bluetooth_gattc_on_l2cap_disconnect(uint16_t conn_handle, uint16_t cid, uint16_t psm, uint16_t status) {
+void mp_bluetooth_on_l2cap_disconnect(uint16_t conn_handle, uint16_t cid, uint16_t psm, uint16_t status) {
     mp_int_t args[] = {conn_handle, cid, psm, status};
     invoke_irq_handler(MP_BLUETOOTH_IRQ_L2CAP_DISCONNECT, args, 4, 0, NULL_ADDR, NULL_UUID, NULL_DATA, NULL_DATA_LEN, 0);
 }
 
-void mp_bluetooth_gattc_on_l2cap_send_ready(uint16_t conn_handle, uint16_t cid, uint8_t status) {
+void mp_bluetooth_on_l2cap_send_ready(uint16_t conn_handle, uint16_t cid, uint8_t status) {
     mp_int_t args[] = {conn_handle, cid, status};
     invoke_irq_handler(MP_BLUETOOTH_IRQ_L2CAP_SEND_READY, args, 3, 0, NULL_ADDR, NULL_UUID, NULL_DATA, NULL_DATA_LEN, 0);
 }
 
-void mp_bluetooth_gattc_on_l2cap_recv(uint16_t conn_handle, uint16_t cid) {
+void mp_bluetooth_on_l2cap_recv(uint16_t conn_handle, uint16_t cid) {
     mp_int_t args[] = {conn_handle, cid};
     invoke_irq_handler(MP_BLUETOOTH_IRQ_L2CAP_RECV, args, 2, 0, NULL_ADDR, NULL_UUID, NULL_DATA, NULL_DATA_LEN, 0);
 }
@@ -1267,7 +1269,9 @@ void mp_bluetooth_gap_on_scan_result(uint8_t addr_type, const uint8_t *addr, uin
     mp_int_t args[] = {addr_type, adv_type, rssi};
     invoke_irq_handler(MP_BLUETOOTH_IRQ_SCAN_RESULT, args, 1, 2, addr, NULL_UUID, &data, &data_len, 1);
 }
+#endif // MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE
 
+#if MICROPY_PY_BLUETOOTH_ENABLE_GATT_CLIENT
 void mp_bluetooth_gattc_on_primary_service_result(uint16_t conn_handle, uint16_t start_handle, uint16_t end_handle, mp_obj_bluetooth_uuid_t *service_uuid) {
     mp_int_t args[] = {conn_handle, start_handle, end_handle};
     invoke_irq_handler(MP_BLUETOOTH_IRQ_GATTC_SERVICE_RESULT, args, 3, 0, NULL_ADDR, service_uuid, NULL_DATA, NULL_DATA_LEN, 0);
@@ -1325,7 +1329,7 @@ void mp_bluetooth_gattc_on_read_write_status(uint8_t event, uint16_t conn_handle
     invoke_irq_handler(event, args, 3, 0, NULL_ADDR, NULL_UUID, NULL_DATA, NULL_DATA_LEN, 0);
 }
 
-#endif // MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE
+#endif // MICROPY_PY_BLUETOOTH_ENABLE_GATT_CLIENT
 
 #else // !MICROPY_PY_BLUETOOTH_USE_SYNC_EVENTS
 // Callbacks are called in interrupt context (i.e. can't allocate), so we need to push the data
@@ -1471,7 +1475,9 @@ void mp_bluetooth_gap_on_scan_result(uint8_t addr_type, const uint8_t *addr, uin
     }
     schedule_ringbuf(atomic_state);
 }
+#endif // MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE
 
+#if MICROPY_PY_BLUETOOTH_ENABLE_GATT_CLIENT
 void mp_bluetooth_gattc_on_primary_service_result(uint16_t conn_handle, uint16_t start_handle, uint16_t end_handle, mp_obj_bluetooth_uuid_t *service_uuid) {
     MICROPY_PY_BLUETOOTH_ENTER
     mp_obj_bluetooth_ble_t *o = MP_OBJ_TO_PTR(MP_STATE_VM(bluetooth));
@@ -1559,7 +1565,7 @@ void mp_bluetooth_gattc_on_read_write_status(uint8_t event, uint16_t conn_handle
     }
     schedule_ringbuf(atomic_state);
 }
-#endif // MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE
+#endif // MICROPY_PY_BLUETOOTH_ENABLE_GATT_CLIENT
 
 #endif // MICROPY_PY_BLUETOOTH_USE_SYNC_EVENTS
 
diff --git a/extmod/modbluetooth.h b/extmod/modbluetooth.h
index c96427fcb4a1e..d126ad6c11344 100644
--- a/extmod/modbluetooth.h
+++ b/extmod/modbluetooth.h
@@ -43,6 +43,12 @@
 #define MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE (0)
 #endif
 
+#ifndef MICROPY_PY_BLUETOOTH_ENABLE_GATT_CLIENT
+// Enable the client by default if we're enabling central mode. It's possible
+// to enable client without central though.
+#define MICROPY_PY_BLUETOOTH_ENABLE_GATT_CLIENT (MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE)
+#endif
+
 #ifndef MICROPY_PY_BLUETOOTH_USE_SYNC_EVENTS
 // This can be enabled if the BLE stack runs entirely in scheduler context
 // and therefore is able to call directly into the VM to run Python callbacks.
@@ -365,7 +371,9 @@ int mp_bluetooth_gap_scan_stop(void);
 
 // Connect to a found peripheral.
 int mp_bluetooth_gap_peripheral_connect(uint8_t addr_type, const uint8_t *addr, int32_t duration_ms);
+#endif
 
+#if MICROPY_PY_BLUETOOTH_ENABLE_GATT_CLIENT
 // Find all primary services on the connected peripheral.
 int mp_bluetooth_gattc_discover_primary_services(uint16_t conn_handle, const mp_obj_bluetooth_uuid_t *uuid);
 
@@ -383,7 +391,7 @@ int mp_bluetooth_gattc_write(uint16_t conn_handle, uint16_t value_handle, const
 
 // Initiate MTU exchange for a specific connection using the preferred MTU.
 int mp_bluetooth_gattc_exchange_mtu(uint16_t conn_handle);
-#endif // MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE
+#endif // MICROPY_PY_BLUETOOTH_ENABLE_GATT_CLIENT
 
 #if MICROPY_PY_BLUETOOTH_ENABLE_L2CAP_CHANNELS
 int mp_bluetooth_l2cap_listen(uint16_t psm, uint16_t mtu);
@@ -440,7 +448,9 @@ void mp_bluetooth_gap_on_scan_complete(void);
 
 // Notify modbluetooth of a scan result.
 void mp_bluetooth_gap_on_scan_result(uint8_t addr_type, const uint8_t *addr, uint8_t adv_type, const int8_t rssi, const uint8_t *data, size_t data_len);
+#endif // MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE
 
+#if MICROPY_PY_BLUETOOTH_ENABLE_GATT_CLIENT
 // Notify modbluetooth that a service was found (either by discover-all, or discover-by-uuid).
 void mp_bluetooth_gattc_on_primary_service_result(uint16_t conn_handle, uint16_t start_handle, uint16_t end_handle, mp_obj_bluetooth_uuid_t *service_uuid);
 
@@ -458,14 +468,14 @@ void mp_bluetooth_gattc_on_data_available(uint8_t event, uint16_t conn_handle, u
 
 // Notify modbluetooth that a read or write operation has completed.
 void mp_bluetooth_gattc_on_read_write_status(uint8_t event, uint16_t conn_handle, uint16_t value_handle, uint16_t status);
-#endif // MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE
+#endif // MICROPY_PY_BLUETOOTH_ENABLE_GATT_CLIENT
 
 #if MICROPY_PY_BLUETOOTH_ENABLE_L2CAP_CHANNELS
-mp_int_t mp_bluetooth_gattc_on_l2cap_accept(uint16_t conn_handle, uint16_t cid, uint16_t psm, uint16_t our_mtu, uint16_t peer_mtu);
-void mp_bluetooth_gattc_on_l2cap_connect(uint16_t conn_handle, uint16_t cid, uint16_t psm, uint16_t our_mtu, uint16_t peer_mtu);
-void mp_bluetooth_gattc_on_l2cap_disconnect(uint16_t conn_handle, uint16_t cid, uint16_t psm, uint16_t status);
-void mp_bluetooth_gattc_on_l2cap_send_ready(uint16_t conn_handle, uint16_t cid, uint8_t status);
-void mp_bluetooth_gattc_on_l2cap_recv(uint16_t conn_handle, uint16_t cid);
+mp_int_t mp_bluetooth_on_l2cap_accept(uint16_t conn_handle, uint16_t cid, uint16_t psm, uint16_t our_mtu, uint16_t peer_mtu);
+void mp_bluetooth_on_l2cap_connect(uint16_t conn_handle, uint16_t cid, uint16_t psm, uint16_t our_mtu, uint16_t peer_mtu);
+void mp_bluetooth_on_l2cap_disconnect(uint16_t conn_handle, uint16_t cid, uint16_t psm, uint16_t status);
+void mp_bluetooth_on_l2cap_send_ready(uint16_t conn_handle, uint16_t cid, uint8_t status);
+void mp_bluetooth_on_l2cap_recv(uint16_t conn_handle, uint16_t cid);
 #endif // MICROPY_PY_BLUETOOTH_ENABLE_L2CAP_CHANNELS
 
 // For stacks that don't manage attribute value data (currently all of them), helpers
diff --git a/extmod/nimble/modbluetooth_nimble.c b/extmod/nimble/modbluetooth_nimble.c
index a0a3998c6614d..e3a2f872e5ecb 100644
--- a/extmod/nimble/modbluetooth_nimble.c
+++ b/extmod/nimble/modbluetooth_nimble.c
@@ -80,6 +80,69 @@ STATIC int8_t ble_hs_err_to_errno_table[] = {
     [BLE_HS_EBADDATA] = MP_EINVAL,
 };
 
+STATIC int ble_hs_err_to_errno(int err);
+
+STATIC ble_uuid_t *create_nimble_uuid(const mp_obj_bluetooth_uuid_t *uuid, ble_uuid_any_t *storage);
+STATIC void reverse_addr_byte_order(uint8_t *addr_out, const uint8_t *addr_in);
+
+#if MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE
+STATIC mp_obj_bluetooth_uuid_t create_mp_uuid(const ble_uuid_any_t *uuid);
+STATIC ble_addr_t create_nimble_addr(uint8_t addr_type, const uint8_t *addr);
+#endif
+
+STATIC void reset_cb(int reason);
+
+STATIC bool has_public_address(void);
+STATIC void set_random_address(bool nrpa);
+
+#if MICROPY_PY_BLUETOOTH_ENABLE_PAIRING_BONDING
+STATIC int load_irk(void);
+#endif
+
+STATIC void sync_cb(void);
+
+#if !MICROPY_BLUETOOTH_NIMBLE_BINDINGS_ONLY
+STATIC void ble_hs_shutdown_stop_cb(int status, void *arg);
+#endif
+
+// Successfully registered service/char/desc handles.
+STATIC void gatts_register_cb(struct ble_gatt_register_ctxt *ctxt, void *arg);
+
+// Events about a connected central (we're in peripheral role).
+STATIC int central_gap_event_cb(struct ble_gap_event *event, void *arg);
+#if MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE
+// Events about a connected peripheral (we're in central role).
+STATIC int peripheral_gap_event_cb(struct ble_gap_event *event, void *arg);
+#endif
+// Used by both of the above.
+STATIC int commmon_gap_event_cb(struct ble_gap_event *event, void *arg);
+
+#if MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE
+// Scan results.
+STATIC int gap_scan_cb(struct ble_gap_event *event, void *arg);
+#endif
+
+#if MICROPY_PY_BLUETOOTH_ENABLE_GATT_CLIENT
+// Data available (either due to notify/indicate or successful read).
+STATIC void gattc_on_data_available(uint8_t event, uint16_t conn_handle, uint16_t value_handle, const struct os_mbuf *om);
+
+// Client discovery callbacks.
+STATIC int ble_gattc_service_cb(uint16_t conn_handle, const struct ble_gatt_error *error, const struct ble_gatt_svc *service, void *arg);
+STATIC int ble_gattc_characteristic_cb(uint16_t conn_handle, const struct ble_gatt_error *error, const struct ble_gatt_chr *characteristic, void *arg);
+STATIC int ble_gattc_descriptor_cb(uint16_t conn_handle, const struct ble_gatt_error *error, uint16_t characteristic_val_handle, const struct ble_gatt_dsc *descriptor, void *arg);
+
+// Client read/write handlers.
+STATIC int ble_gattc_attr_read_cb(uint16_t conn_handle, const struct ble_gatt_error *error, struct ble_gatt_attr *attr, void *arg);
+STATIC int ble_gattc_attr_write_cb(uint16_t conn_handle, const struct ble_gatt_error *error, struct ble_gatt_attr *attr, void *arg);
+#endif
+
+#if MICROPY_PY_BLUETOOTH_ENABLE_PAIRING_BONDING
+// Bonding store.
+STATIC int ble_store_ram_read(int obj_type, const union ble_store_key *key, union ble_store_value *value);
+STATIC int ble_store_ram_write(int obj_type, const union ble_store_value *val);
+STATIC int ble_store_ram_delete(int obj_type, const union ble_store_key *key);
+#endif
+
 STATIC int ble_hs_err_to_errno(int err) {
     DEBUG_printf("ble_hs_err_to_errno: %d\n", err);
     if (!err) {
@@ -334,8 +397,54 @@ STATIC void gatts_register_cb(struct ble_gatt_register_ctxt *ctxt, void *arg) {
     }
 }
 
-STATIC int gap_event_cb(struct ble_gap_event *event, void *arg) {
-    DEBUG_printf("gap_event_cb: type=%d\n", event->type);
+STATIC int commmon_gap_event_cb(struct ble_gap_event *event, void *arg) {
+    struct ble_gap_conn_desc desc;
+
+    switch (event->type) {
+        #if MICROPY_PY_BLUETOOTH_ENABLE_GATT_CLIENT
+        case BLE_GAP_EVENT_NOTIFY_RX: {
+            uint16_t ev = event->notify_rx.indication == 0 ? MP_BLUETOOTH_IRQ_GATTC_NOTIFY : MP_BLUETOOTH_IRQ_GATTC_INDICATE;
+            gattc_on_data_available(ev, event->notify_rx.conn_handle, event->notify_rx.attr_handle, event->notify_rx.om);
+            return 0;
+        }
+        #endif // MICROPY_PY_BLUETOOTH_ENABLE_GATT_CLIENT
+
+        case BLE_GAP_EVENT_CONN_UPDATE: {
+            DEBUG_printf("commmon_gap_event_cb: connection update: status=%d\n", event->conn_update.status);
+            if (ble_gap_conn_find(event->conn_update.conn_handle, &desc) == 0) {
+                mp_bluetooth_gap_on_connection_update(event->conn_update.conn_handle, desc.conn_itvl, desc.conn_latency, desc.supervision_timeout, event->conn_update.status == 0 ? 0 : 1);
+            }
+            return 0;
+        }
+
+        case BLE_GAP_EVENT_MTU: {
+            if (event->mtu.channel_id == BLE_L2CAP_CID_ATT) {
+                DEBUG_printf("commmon_gap_event_cb: mtu update: conn_handle=%d cid=%d mtu=%d\n", event->mtu.conn_handle, event->mtu.channel_id, event->mtu.value);
+                mp_bluetooth_gatts_on_mtu_exchanged(event->mtu.conn_handle, event->mtu.value);
+            }
+            return 0;
+        }
+
+        case BLE_GAP_EVENT_ENC_CHANGE: {
+            DEBUG_printf("commmon_gap_event_cb: enc change: status=%d\n", event->enc_change.status);
+            #if MICROPY_PY_BLUETOOTH_ENABLE_PAIRING_BONDING
+            if (ble_gap_conn_find(event->enc_change.conn_handle, &desc) == 0) {
+                mp_bluetooth_gatts_on_encryption_update(event->conn_update.conn_handle,
+                    desc.sec_state.encrypted, desc.sec_state.authenticated,
+                    desc.sec_state.bonded, desc.sec_state.key_size);
+            }
+            #endif
+            return 0;
+        }
+
+        default:
+            DEBUG_printf("commmon_gap_event_cb: unknown type %d\n", event->type);
+            return 0;
+    }
+}
+
+STATIC int central_gap_event_cb(struct ble_gap_event *event, void *arg) {
+    DEBUG_printf("central_gap_event_cb: type=%d\n", event->type);
     if (!mp_bluetooth_is_active()) {
         return 0;
     }
@@ -344,7 +453,7 @@ STATIC int gap_event_cb(struct ble_gap_event *event, void *arg) {
 
     switch (event->type) {
         case BLE_GAP_EVENT_CONNECT:
-            DEBUG_printf("gap_event_cb: connect: status=%d\n", event->connect.status);
+            DEBUG_printf("central_gap_event_cb: connect: status=%d\n", event->connect.status);
             if (event->connect.status == 0) {
                 // Connection established.
                 ble_gap_conn_find(event->connect.conn_handle, &desc);
@@ -354,60 +463,32 @@ STATIC int gap_event_cb(struct ble_gap_event *event, void *arg) {
                 // Connection failed.
                 mp_bluetooth_gap_on_connected_disconnected(MP_BLUETOOTH_IRQ_CENTRAL_DISCONNECT, event->connect.conn_handle, 0xff, addr);
             }
-            break;
+            return 0;
 
         case BLE_GAP_EVENT_DISCONNECT:
             // Disconnect.
-            DEBUG_printf("gap_event_cb: disconnect: reason=%d\n", event->disconnect.reason);
+            DEBUG_printf("central_gap_event_cb: disconnect: reason=%d\n", event->disconnect.reason);
             reverse_addr_byte_order(addr, event->disconnect.conn.peer_id_addr.val);
             mp_bluetooth_gap_on_connected_disconnected(MP_BLUETOOTH_IRQ_CENTRAL_DISCONNECT, event->disconnect.conn.conn_handle, event->disconnect.conn.peer_id_addr.type, addr);
-            break;
+            return 0;
 
         case BLE_GAP_EVENT_NOTIFY_TX: {
-            DEBUG_printf("gap_event_cb: notify_tx: %d %d\n", event->notify_tx.indication, event->notify_tx.status);
+            DEBUG_printf("central_gap_event_cb: notify_tx: %d %d\n", event->notify_tx.indication, event->notify_tx.status);
             // This event corresponds to either a sent notify/indicate (status == 0), or an indication confirmation (status != 0).
             if (event->notify_tx.indication && event->notify_tx.status != 0) {
                 // Map "done/ack" to 0, otherwise pass the status directly.
                 mp_bluetooth_gatts_on_indicate_complete(event->notify_tx.conn_handle, event->notify_tx.attr_handle, event->notify_tx.status == BLE_HS_EDONE ? 0 : event->notify_tx.status);
             }
-            break;
-        }
-
-        case BLE_GAP_EVENT_MTU: {
-            if (event->mtu.channel_id == BLE_L2CAP_CID_ATT) {
-                DEBUG_printf("gap_event_cb: mtu update: conn_handle=%d cid=%d mtu=%d\n", event->mtu.conn_handle, event->mtu.channel_id, event->mtu.value);
-                mp_bluetooth_gatts_on_mtu_exchanged(event->mtu.conn_handle, event->mtu.value);
-            }
-            break;
+            return 0;
         }
 
         case BLE_GAP_EVENT_PHY_UPDATE_COMPLETE:
-            DEBUG_printf("gap_event_cb: phy update: %d\n", event->phy_updated.tx_phy);
-            break;
-
-        case BLE_GAP_EVENT_CONN_UPDATE: {
-            DEBUG_printf("gap_event_cb: connection update: status=%d\n", event->conn_update.status);
-            if (ble_gap_conn_find(event->conn_update.conn_handle, &desc) == 0) {
-                mp_bluetooth_gap_on_connection_update(event->conn_update.conn_handle, desc.conn_itvl, desc.conn_latency, desc.supervision_timeout, event->conn_update.status == 0 ? 0 : 1);
-            }
-            break;
-        }
-
-        case BLE_GAP_EVENT_ENC_CHANGE: {
-            DEBUG_printf("gap_event_cb: enc change: status=%d\n", event->enc_change.status);
-            #if MICROPY_PY_BLUETOOTH_ENABLE_PAIRING_BONDING
-            if (ble_gap_conn_find(event->enc_change.conn_handle, &desc) == 0) {
-                mp_bluetooth_gatts_on_encryption_update(event->conn_update.conn_handle,
-                    desc.sec_state.encrypted, desc.sec_state.authenticated,
-                    desc.sec_state.bonded, desc.sec_state.key_size);
-            }
-            #endif
-            break;
-        }
+            DEBUG_printf("central_gap_event_cb: phy update: %d\n", event->phy_updated.tx_phy);
+            return 0;
 
         case BLE_GAP_EVENT_REPEAT_PAIRING: {
             // We recognized this peer but the peer doesn't recognize us.
-            DEBUG_printf("gap_event_cb: repeat pairing: conn_handle=%d\n", event->repeat_pairing.conn_handle);
+            DEBUG_printf("central_gap_event_cb: repeat pairing: conn_handle=%d\n", event->repeat_pairing.conn_handle);
 
             // TODO: Consider returning BLE_GAP_REPEAT_PAIRING_IGNORE (and
             // possibly an API to configure this).
@@ -423,7 +504,7 @@ STATIC int gap_event_cb(struct ble_gap_event *event, void *arg) {
         }
 
         case BLE_GAP_EVENT_PASSKEY_ACTION: {
-            DEBUG_printf("gap_event_cb: passkey action: conn_handle=%d action=%d num=" UINT_FMT "\n", event->passkey.conn_handle, event->passkey.params.action, (mp_uint_t)event->passkey.params.numcmp);
+            DEBUG_printf("central_gap_event_cb: passkey action: conn_handle=%d action=%d num=" UINT_FMT "\n", event->passkey.conn_handle, event->passkey.params.action, (mp_uint_t)event->passkey.params.numcmp);
 
             #if MICROPY_PY_BLUETOOTH_ENABLE_PAIRING_BONDING
             mp_bluetooth_gap_on_passkey_action(event->passkey.conn_handle, event->passkey.params.action, event->passkey.params.numcmp);
@@ -431,12 +512,9 @@ STATIC int gap_event_cb(struct ble_gap_event *event, void *arg) {
 
             return 0;
         }
-
-        default:
-            DEBUG_printf("gap_event_cb: unknown type %d\n", event->type);
-            break;
     }
-    return 0;
+
+    return commmon_gap_event_cb(event, arg);
 }
 
 #if !MICROPY_BLUETOOTH_NIMBLE_BINDINGS_ONLY
@@ -738,7 +816,7 @@ int mp_bluetooth_gap_advertise_start(bool connectable, int32_t interval_us, cons
         .channel_map = 7, // all 3 channels.
     };
 
-    ret = ble_gap_adv_start(nimble_address_mode, NULL, BLE_HS_FOREVER, &adv_params, gap_event_cb, NULL);
+    ret = ble_gap_adv_start(nimble_address_mode, NULL, BLE_HS_FOREVER, &adv_params, central_gap_event_cb, NULL);
     if (ret == 0) {
         return 0;
     }
@@ -1025,38 +1103,6 @@ int mp_bluetooth_gap_passkey(uint16_t conn_handle, uint8_t action, mp_int_t pass
 
 #if MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE
 
-STATIC void gattc_on_data_available(uint8_t event, uint16_t conn_handle, uint16_t value_handle, const struct os_mbuf *om) {
-    // When the HCI data for an ATT payload arrives, the L2CAP channel will
-    // buffer it into its receive buffer. We set BLE_L2CAP_JOIN_RX_FRAGS=1 in
-    // syscfg.h so it should be rare that the mbuf is fragmented, but we do need
-    // to be able to handle it. We pass all the fragments up to modbluetooth.c
-    // which will create a temporary buffer on the MicroPython heap if necessary
-    // to re-assemble them.
-
-    // Count how many links are in the mbuf chain.
-    size_t n = 0;
-    const struct os_mbuf *elem = om;
-    while (elem) {
-        n += 1;
-        elem = SLIST_NEXT(elem, om_next);
-    }
-
-    // Grab data pointers and lengths for each of the links.
-    const uint8_t **data = mp_local_alloc(sizeof(uint8_t *) * n);
-    uint16_t *data_len = mp_local_alloc(sizeof(uint16_t) * n);
-    for (size_t i = 0; i < n; ++i) {
-        data[i] = OS_MBUF_DATA(om, const uint8_t *);
-        data_len[i] = om->om_len;
-        om = SLIST_NEXT(om, om_next);
-    }
-
-    // Pass all the fragments together.
-    mp_bluetooth_gattc_on_data_available(event, conn_handle, value_handle, data, data_len, n);
-
-    mp_local_free(data_len);
-    mp_local_free(data);
-}
-
 STATIC int gap_scan_cb(struct ble_gap_event *event, void *arg) {
     DEBUG_printf("gap_scan_cb: event=%d type=%d\n", event->type, event->type == BLE_GAP_EVENT_DISC ? event->disc.event_type : -1);
     if (!mp_bluetooth_is_active()) {
@@ -1135,56 +1181,17 @@ STATIC int peripheral_gap_event_cb(struct ble_gap_event *event, void *arg) {
                 // Connection failed.
                 mp_bluetooth_gap_on_connected_disconnected(MP_BLUETOOTH_IRQ_PERIPHERAL_DISCONNECT, event->connect.conn_handle, 0xff, addr);
             }
-            break;
+            return 0;
 
         case BLE_GAP_EVENT_DISCONNECT:
             // Disconnect.
             DEBUG_printf("peripheral_gap_event_cb: reason=%d\n", event->disconnect.reason);
             reverse_addr_byte_order(addr, event->disconnect.conn.peer_id_addr.val);
             mp_bluetooth_gap_on_connected_disconnected(MP_BLUETOOTH_IRQ_PERIPHERAL_DISCONNECT, event->disconnect.conn.conn_handle, event->disconnect.conn.peer_id_addr.type, addr);
-
-            break;
-
-        case BLE_GAP_EVENT_NOTIFY_RX: {
-            uint16_t ev = event->notify_rx.indication == 0 ? MP_BLUETOOTH_IRQ_GATTC_NOTIFY : MP_BLUETOOTH_IRQ_GATTC_INDICATE;
-            gattc_on_data_available(ev, event->notify_rx.conn_handle, event->notify_rx.attr_handle, event->notify_rx.om);
-            break;
-        }
-
-        case BLE_GAP_EVENT_CONN_UPDATE: {
-            DEBUG_printf("peripheral_gap_event_cb: connection update: status=%d\n", event->conn_update.status);
-            if (ble_gap_conn_find(event->conn_update.conn_handle, &desc) == 0) {
-                mp_bluetooth_gap_on_connection_update(event->conn_update.conn_handle, desc.conn_itvl, desc.conn_latency, desc.supervision_timeout, event->conn_update.status == 0 ? 0 : 1);
-            }
-            break;
-        }
-
-        case BLE_GAP_EVENT_MTU: {
-            if (event->mtu.channel_id == BLE_L2CAP_CID_ATT) {
-                DEBUG_printf("peripheral_gap_event_cb: mtu update: conn_handle=%d cid=%d mtu=%d\n", event->mtu.conn_handle, event->mtu.channel_id, event->mtu.value);
-                mp_bluetooth_gatts_on_mtu_exchanged(event->mtu.conn_handle, event->mtu.value);
-            }
-            break;
-        }
-
-        case BLE_GAP_EVENT_ENC_CHANGE: {
-            DEBUG_printf("peripheral_gap_event_cb: enc change: status=%d\n", event->enc_change.status);
-            #if MICROPY_PY_BLUETOOTH_ENABLE_PAIRING_BONDING
-            if (ble_gap_conn_find(event->enc_change.conn_handle, &desc) == 0) {
-                mp_bluetooth_gatts_on_encryption_update(event->conn_update.conn_handle,
-                    desc.sec_state.encrypted, desc.sec_state.authenticated,
-                    desc.sec_state.bonded, desc.sec_state.key_size);
-            }
-            #endif
-            break;
-        }
-
-        default:
-            DEBUG_printf("peripheral_gap_event_cb: unknown type %d\n", event->type);
-            break;
+            return 0;
     }
 
-    return 0;
+    return commmon_gap_event_cb(event, arg);
 }
 
 int mp_bluetooth_gap_peripheral_connect(uint8_t addr_type, const uint8_t *addr, int32_t duration_ms) {
@@ -1213,8 +1220,8 @@ int mp_bluetooth_gap_peripheral_connect(uint8_t addr_type, const uint8_t *addr,
     return ble_hs_err_to_errno(err);
 }
 
-STATIC int peripheral_discover_service_cb(uint16_t conn_handle, const struct ble_gatt_error *error, const struct ble_gatt_svc *service, void *arg) {
-    DEBUG_printf("peripheral_discover_service_cb: conn_handle=%d status=%d start_handle=%d\n", conn_handle, error->status, service ? service->start_handle : -1);
+STATIC int ble_gattc_service_cb(uint16_t conn_handle, const struct ble_gatt_error *error, const struct ble_gatt_svc *service, void *arg) {
+    DEBUG_printf("ble_gattc_service_cb: conn_handle=%d status=%d start_handle=%d\n", conn_handle, error->status, service ? service->start_handle : -1);
     if (!mp_bluetooth_is_active()) {
         return 0;
     }
@@ -1227,6 +1234,42 @@ STATIC int peripheral_discover_service_cb(uint16_t conn_handle, const struct ble
     return 0;
 }
 
+#endif // MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE
+
+#if MICROPY_PY_BLUETOOTH_ENABLE_GATT_CLIENT
+
+STATIC void gattc_on_data_available(uint8_t event, uint16_t conn_handle, uint16_t value_handle, const struct os_mbuf *om) {
+    // When the HCI data for an ATT payload arrives, the L2CAP channel will
+    // buffer it into its receive buffer. We set BLE_L2CAP_JOIN_RX_FRAGS=1 in
+    // syscfg.h so it should be rare that the mbuf is fragmented, but we do need
+    // to be able to handle it. We pass all the fragments up to modbluetooth.c
+    // which will create a temporary buffer on the MicroPython heap if necessary
+    // to re-assemble them.
+
+    // Count how many links are in the mbuf chain.
+    size_t n = 0;
+    const struct os_mbuf *elem = om;
+    while (elem) {
+        n += 1;
+        elem = SLIST_NEXT(elem, om_next);
+    }
+
+    // Grab data pointers and lengths for each of the links.
+    const uint8_t **data = mp_local_alloc(sizeof(uint8_t *) * n);
+    uint16_t *data_len = mp_local_alloc(sizeof(uint16_t) * n);
+    for (size_t i = 0; i < n; ++i) {
+        data[i] = OS_MBUF_DATA(om, const uint8_t *);
+        data_len[i] = om->om_len;
+        om = SLIST_NEXT(om, om_next);
+    }
+
+    // Pass all the fragments together.
+    mp_bluetooth_gattc_on_data_available(event, conn_handle, value_handle, data, data_len, n);
+
+    mp_local_free(data_len);
+    mp_local_free(data);
+}
+
 int mp_bluetooth_gattc_discover_primary_services(uint16_t conn_handle, const mp_obj_bluetooth_uuid_t *uuid) {
     if (!mp_bluetooth_is_active()) {
         return ERRNO_BLUETOOTH_NOT_ACTIVE;
@@ -1235,15 +1278,15 @@ int mp_bluetooth_gattc_discover_primary_services(uint16_t conn_handle, const mp_
     if (uuid) {
         ble_uuid_any_t nimble_uuid;
         create_nimble_uuid(uuid, &nimble_uuid);
-        err = ble_gattc_disc_svc_by_uuid(conn_handle, &nimble_uuid.u, &peripheral_discover_service_cb, NULL);
+        err = ble_gattc_disc_svc_by_uuid(conn_handle, &nimble_uuid.u, &ble_gattc_service_cb, NULL);
     } else {
-        err = ble_gattc_disc_all_svcs(conn_handle, &peripheral_discover_service_cb, NULL);
+        err = ble_gattc_disc_all_svcs(conn_handle, &ble_gattc_service_cb, NULL);
     }
     return ble_hs_err_to_errno(err);
 }
 
-STATIC int ble_gatt_characteristic_cb(uint16_t conn_handle, const struct ble_gatt_error *error, const struct ble_gatt_chr *characteristic, void *arg) {
-    DEBUG_printf("ble_gatt_characteristic_cb: conn_handle=%d status=%d def_handle=%d val_handle=%d\n", conn_handle, error->status, characteristic ? characteristic->def_handle : -1, characteristic ? characteristic->val_handle : -1);
+STATIC int ble_gattc_characteristic_cb(uint16_t conn_handle, const struct ble_gatt_error *error, const struct ble_gatt_chr *characteristic, void *arg) {
+    DEBUG_printf("ble_gattc_characteristic_cb: conn_handle=%d status=%d def_handle=%d val_handle=%d\n", conn_handle, error->status, characteristic ? characteristic->def_handle : -1, characteristic ? characteristic->val_handle : -1);
     if (!mp_bluetooth_is_active()) {
         return 0;
     }
@@ -1264,15 +1307,15 @@ int mp_bluetooth_gattc_discover_characteristics(uint16_t conn_handle, uint16_t s
     if (uuid) {
         ble_uuid_any_t nimble_uuid;
         create_nimble_uuid(uuid, &nimble_uuid);
-        err = ble_gattc_disc_chrs_by_uuid(conn_handle, start_handle, end_handle, &nimble_uuid.u, &ble_gatt_characteristic_cb, NULL);
+        err = ble_gattc_disc_chrs_by_uuid(conn_handle, start_handle, end_handle, &nimble_uuid.u, &ble_gattc_characteristic_cb, NULL);
     } else {
-        err = ble_gattc_disc_all_chrs(conn_handle, start_handle, end_handle, &ble_gatt_characteristic_cb, NULL);
+        err = ble_gattc_disc_all_chrs(conn_handle, start_handle, end_handle, &ble_gattc_characteristic_cb, NULL);
     }
     return ble_hs_err_to_errno(err);
 }
 
-STATIC int ble_gatt_descriptor_cb(uint16_t conn_handle, const struct ble_gatt_error *error, uint16_t characteristic_val_handle, const struct ble_gatt_dsc *descriptor, void *arg) {
-    DEBUG_printf("ble_gatt_descriptor_cb: conn_handle=%d status=%d chr_handle=%d dsc_handle=%d\n", conn_handle, error->status, characteristic_val_handle, descriptor ? descriptor->handle : -1);
+STATIC int ble_gattc_descriptor_cb(uint16_t conn_handle, const struct ble_gatt_error *error, uint16_t characteristic_val_handle, const struct ble_gatt_dsc *descriptor, void *arg) {
+    DEBUG_printf("ble_gattc_descriptor_cb: conn_handle=%d status=%d chr_handle=%d dsc_handle=%d\n", conn_handle, error->status, characteristic_val_handle, descriptor ? descriptor->handle : -1);
     if (!mp_bluetooth_is_active()) {
         return 0;
     }
@@ -1289,13 +1332,13 @@ int mp_bluetooth_gattc_discover_descriptors(uint16_t conn_handle, uint16_t start
     if (!mp_bluetooth_is_active()) {
         return ERRNO_BLUETOOTH_NOT_ACTIVE;
     }
-    int err = ble_gattc_disc_all_dscs(conn_handle, start_handle, end_handle, &ble_gatt_descriptor_cb, NULL);
+    int err = ble_gattc_disc_all_dscs(conn_handle, start_handle, end_handle, &ble_gattc_descriptor_cb, NULL);
     return ble_hs_err_to_errno(err);
 }
 
-STATIC int ble_gatt_attr_read_cb(uint16_t conn_handle, const struct ble_gatt_error *error, struct ble_gatt_attr *attr, void *arg) {
+STATIC int ble_gattc_attr_read_cb(uint16_t conn_handle, const struct ble_gatt_error *error, struct ble_gatt_attr *attr, void *arg) {
     uint16_t handle = attr ? attr->handle : (error ? error->att_handle : 0xffff);
-    DEBUG_printf("ble_gatt_attr_read_cb: conn_handle=%d status=%d handle=%d\n", conn_handle, error->status, handle);
+    DEBUG_printf("ble_gattc_attr_read_cb: conn_handle=%d status=%d handle=%d\n", conn_handle, error->status, handle);
     if (!mp_bluetooth_is_active()) {
         return 0;
     }
@@ -1311,13 +1354,13 @@ int mp_bluetooth_gattc_read(uint16_t conn_handle, uint16_t value_handle) {
     if (!mp_bluetooth_is_active()) {
         return ERRNO_BLUETOOTH_NOT_ACTIVE;
     }
-    int err = ble_gattc_read(conn_handle, value_handle, &ble_gatt_attr_read_cb, NULL);
+    int err = ble_gattc_read(conn_handle, value_handle, &ble_gattc_attr_read_cb, NULL);
     return ble_hs_err_to_errno(err);
 }
 
-STATIC int ble_gatt_attr_write_cb(uint16_t conn_handle, const struct ble_gatt_error *error, struct ble_gatt_attr *attr, void *arg) {
+STATIC int ble_gattc_attr_write_cb(uint16_t conn_handle, const struct ble_gatt_error *error, struct ble_gatt_attr *attr, void *arg) {
     uint16_t handle = attr ? attr->handle : (error ? error->att_handle : 0xffff);
-    DEBUG_printf("ble_gatt_attr_write_cb: conn_handle=%d status=%d handle=%d\n", conn_handle, error->status, handle);
+    DEBUG_printf("ble_gattc_attr_write_cb: conn_handle=%d status=%d handle=%d\n", conn_handle, error->status, handle);
     if (!mp_bluetooth_is_active()) {
         return 0;
     }
@@ -1334,7 +1377,7 @@ int mp_bluetooth_gattc_write(uint16_t conn_handle, uint16_t value_handle, const
     if (mode == MP_BLUETOOTH_WRITE_MODE_NO_RESPONSE) {
         err = ble_gattc_write_no_rsp_flat(conn_handle, value_handle, value, *value_len);
     } else if (mode == MP_BLUETOOTH_WRITE_MODE_WITH_RESPONSE) {
-        err = ble_gattc_write_flat(conn_handle, value_handle, value, *value_len, &ble_gatt_attr_write_cb, NULL);
+        err = ble_gattc_write_flat(conn_handle, value_handle, value, *value_len, &ble_gattc_attr_write_cb, NULL);
     } else {
         err = BLE_HS_EINVAL;
     }
@@ -1348,7 +1391,7 @@ int mp_bluetooth_gattc_exchange_mtu(uint16_t conn_handle) {
     return ble_hs_err_to_errno(ble_gattc_exchange_mtu(conn_handle, NULL, NULL));
 }
 
-#endif // MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE
+#endif // MICROPY_PY_BLUETOOTH_ENABLE_GATT_CLIENT
 
 #if MICROPY_PY_BLUETOOTH_ENABLE_L2CAP_CHANNELS
 
@@ -1375,6 +1418,11 @@ typedef struct _mp_bluetooth_nimble_l2cap_channel_t {
     os_membuf_t sdu_mem[];
 } mp_bluetooth_nimble_l2cap_channel_t;
 
+STATIC void destroy_l2cap_channel();
+STATIC int l2cap_channel_event(struct ble_l2cap_event *event, void *arg);
+STATIC mp_bluetooth_nimble_l2cap_channel_t *get_l2cap_channel_for_conn_cid(uint16_t conn_handle, uint16_t cid);
+STATIC int create_l2cap_channel(uint16_t mtu, mp_bluetooth_nimble_l2cap_channel_t **out);
+
 STATIC void destroy_l2cap_channel() {
     // Only free the l2cap channel if we're the one that initiated the connection.
     // Listeners continue listening on the same channel.
@@ -1395,9 +1443,9 @@ STATIC int l2cap_channel_event(struct ble_l2cap_event *event, void *arg) {
 
             ble_l2cap_get_chan_info(event->connect.chan, &info);
             if (event->connect.status == 0) {
-                mp_bluetooth_gattc_on_l2cap_connect(event->connect.conn_handle, info.scid, info.psm, info.our_coc_mtu, info.peer_coc_mtu);
+                mp_bluetooth_on_l2cap_connect(event->connect.conn_handle, info.scid, info.psm, info.our_coc_mtu, info.peer_coc_mtu);
             } else {
-                mp_bluetooth_gattc_on_l2cap_disconnect(event->connect.conn_handle, info.scid, info.psm, event->connect.status);
+                mp_bluetooth_on_l2cap_disconnect(event->connect.conn_handle, info.scid, info.psm, event->connect.status);
                 destroy_l2cap_channel();
             }
             break;
@@ -1405,7 +1453,7 @@ STATIC int l2cap_channel_event(struct ble_l2cap_event *event, void *arg) {
         case BLE_L2CAP_EVENT_COC_DISCONNECTED: {
             DEBUG_printf("l2cap_channel_event: disconnect: conn_handle=%d\n", event->disconnect.conn_handle);
             ble_l2cap_get_chan_info(event->disconnect.chan, &info);
-            mp_bluetooth_gattc_on_l2cap_disconnect(event->disconnect.conn_handle, info.scid, info.psm, 0);
+            mp_bluetooth_on_l2cap_disconnect(event->disconnect.conn_handle, info.scid, info.psm, 0);
             destroy_l2cap_channel();
             break;
         }
@@ -1413,7 +1461,7 @@ STATIC int l2cap_channel_event(struct ble_l2cap_event *event, void *arg) {
             DEBUG_printf("l2cap_channel_event: accept: conn_handle=%d peer_sdu_size=%d\n", event->accept.conn_handle, event->accept.peer_sdu_size);
             chan->chan = event->accept.chan;
             ble_l2cap_get_chan_info(event->accept.chan, &info);
-            int ret = mp_bluetooth_gattc_on_l2cap_accept(event->accept.conn_handle, info.scid, info.psm, info.our_coc_mtu, info.peer_coc_mtu);
+            int ret = mp_bluetooth_on_l2cap_accept(event->accept.conn_handle, info.scid, info.psm, info.our_coc_mtu, info.peer_coc_mtu);
             if (ret != 0) {
                 return ret;
             }
@@ -1461,7 +1509,7 @@ STATIC int l2cap_channel_event(struct ble_l2cap_event *event, void *arg) {
             // Don't allow granting more credits until after the IRQ is handled.
             chan->irq_in_progress = true;
 
-            mp_bluetooth_gattc_on_l2cap_recv(event->receive.conn_handle, info.scid);
+            mp_bluetooth_on_l2cap_recv(event->receive.conn_handle, info.scid);
             chan->irq_in_progress = false;
 
             // If all data has been consumed by the IRQ handler, then now allow
@@ -1480,7 +1528,7 @@ STATIC int l2cap_channel_event(struct ble_l2cap_event *event, void *arg) {
             DEBUG_printf("l2cap_channel_event: tx_unstalled: conn_handle=%d status=%d\n", event->tx_unstalled.conn_handle, event->tx_unstalled.status);
             ble_l2cap_get_chan_info(event->receive.chan, &info);
             // Map status to {0,1} (i.e. "sent everything", or "partial send").
-            mp_bluetooth_gattc_on_l2cap_send_ready(event->tx_unstalled.conn_handle, info.scid, event->tx_unstalled.status == 0 ? 0 : 1);
+            mp_bluetooth_on_l2cap_send_ready(event->tx_unstalled.conn_handle, info.scid, event->tx_unstalled.status == 0 ? 0 : 1);
             break;
         }
         case BLE_L2CAP_EVENT_COC_RECONFIG_COMPLETED: {

From 1342debb9b419f78566e173b55b67b15f0a89ee4 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Fri, 19 Feb 2021 16:21:05 +1100
Subject: [PATCH 0648/3533] tests/multi_bluetooth: Add basic performance tests.

1. Exchange GATT notifications.
2. Transmit a stream of data over L2CAP.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 tests/multi_bluetooth/perf_gatt_notify.py     | 133 ++++++++++++++++
 tests/multi_bluetooth/perf_gatt_notify.py.exp |   0
 tests/multi_bluetooth/perf_l2cap.py           | 148 ++++++++++++++++++
 tests/multi_bluetooth/perf_l2cap.py.exp       |   0
 4 files changed, 281 insertions(+)
 create mode 100644 tests/multi_bluetooth/perf_gatt_notify.py
 create mode 100644 tests/multi_bluetooth/perf_gatt_notify.py.exp
 create mode 100644 tests/multi_bluetooth/perf_l2cap.py
 create mode 100644 tests/multi_bluetooth/perf_l2cap.py.exp

diff --git a/tests/multi_bluetooth/perf_gatt_notify.py b/tests/multi_bluetooth/perf_gatt_notify.py
new file mode 100644
index 0000000000000..88986dda3d9b2
--- /dev/null
+++ b/tests/multi_bluetooth/perf_gatt_notify.py
@@ -0,0 +1,133 @@
+# Ping-pong GATT notifications between two devices.
+
+from micropython import const
+import time, machine, bluetooth
+
+TIMEOUT_MS = 2000
+
+_IRQ_CENTRAL_CONNECT = const(1)
+_IRQ_CENTRAL_DISCONNECT = const(2)
+_IRQ_PERIPHERAL_CONNECT = const(7)
+_IRQ_PERIPHERAL_DISCONNECT = const(8)
+_IRQ_GATTC_CHARACTERISTIC_RESULT = const(11)
+_IRQ_GATTC_CHARACTERISTIC_DONE = const(12)
+_IRQ_GATTC_NOTIFY = const(18)
+
+# How long to run the test for.
+_NUM_NOTIFICATIONS = const(50)
+
+SERVICE_UUID = bluetooth.UUID("A5A5A5A5-FFFF-9999-1111-5A5A5A5A5A5A")
+CHAR_UUID = bluetooth.UUID("00000000-1111-2222-3333-444444444444")
+CHAR = (
+    CHAR_UUID,
+    bluetooth.FLAG_NOTIFY,
+)
+SERVICE = (
+    SERVICE_UUID,
+    (CHAR,),
+)
+SERVICES = (SERVICE,)
+
+is_central = False
+
+waiting_events = {}
+
+
+def irq(event, data):
+    if event == _IRQ_CENTRAL_CONNECT:
+        waiting_events[event] = data[0]
+    elif event == _IRQ_PERIPHERAL_CONNECT:
+        waiting_events[event] = data[0]
+    elif event == _IRQ_GATTC_CHARACTERISTIC_RESULT:
+        # conn_handle, def_handle, value_handle, properties, uuid = data
+        if data[-1] == CHAR_UUID:
+            waiting_events[event] = data[2]
+        else:
+            return
+    elif event == _IRQ_GATTC_NOTIFY:
+        if is_central:
+            conn_handle, value_handle, notify_data = data
+            ble.gatts_notify(conn_handle, value_handle, b"central" + notify_data)
+
+    if event not in waiting_events:
+        waiting_events[event] = None
+
+
+def wait_for_event(event, timeout_ms):
+    t0 = time.ticks_ms()
+    while time.ticks_diff(time.ticks_ms(), t0) < timeout_ms:
+        if event in waiting_events:
+            return waiting_events.pop(event)
+        machine.idle()
+    raise ValueError("Timeout waiting for {}".format(event))
+
+
+# Acting in peripheral role.
+def instance0():
+    multitest.globals(BDADDR=ble.config("mac"))
+    ((char_handle,),) = ble.gatts_register_services(SERVICES)
+    print("gap_advertise")
+    ble.gap_advertise(20_000, b"\x02\x01\x06\x04\xffMPY")
+    multitest.next()
+    try:
+        # Wait for central to connect to us.
+        conn_handle = wait_for_event(_IRQ_CENTRAL_CONNECT, TIMEOUT_MS)
+
+        # Discover characteristics.
+        ble.gattc_discover_characteristics(conn_handle, 1, 65535)
+        value_handle = wait_for_event(_IRQ_GATTC_CHARACTERISTIC_RESULT, TIMEOUT_MS)
+        wait_for_event(_IRQ_GATTC_CHARACTERISTIC_DONE, TIMEOUT_MS)
+
+        # Give the central enough time to discover chars.
+        time.sleep_ms(500)
+
+        ticks_start = time.ticks_ms()
+
+        for i in range(_NUM_NOTIFICATIONS):
+            # Send a notification and wait for a response.
+            ble.gatts_notify(conn_handle, value_handle, "peripheral" + str(i))
+            wait_for_event(_IRQ_GATTC_NOTIFY, TIMEOUT_MS)
+
+        ticks_end = time.ticks_ms()
+        ticks_total = time.ticks_diff(ticks_end, ticks_start)
+        print(
+            "Acknowledged {} notifications in {} ms. {} ms/notification.".format(
+                _NUM_NOTIFICATIONS, ticks_total, ticks_total // _NUM_NOTIFICATIONS
+            )
+        )
+
+        # Disconnect the central.
+        print("gap_disconnect:", ble.gap_disconnect(conn_handle))
+        wait_for_event(_IRQ_CENTRAL_DISCONNECT, TIMEOUT_MS)
+    finally:
+        ble.active(0)
+
+
+# Acting in central role.
+def instance1():
+    global is_central
+    is_central = True
+    ((char_handle,),) = ble.gatts_register_services(SERVICES)
+    multitest.next()
+    try:
+        # Connect to peripheral and then disconnect.
+        print("gap_connect")
+        ble.gap_connect(*BDADDR)
+        conn_handle = wait_for_event(_IRQ_PERIPHERAL_CONNECT, TIMEOUT_MS)
+
+        # Discover characteristics.
+        ble.gattc_discover_characteristics(conn_handle, 1, 65535)
+        value_handle = wait_for_event(_IRQ_GATTC_CHARACTERISTIC_RESULT, TIMEOUT_MS)
+        wait_for_event(_IRQ_GATTC_CHARACTERISTIC_DONE, TIMEOUT_MS)
+
+        # The IRQ handler will respond to each notification.
+
+        # Wait for the peripheral to disconnect us.
+        wait_for_event(_IRQ_PERIPHERAL_DISCONNECT, 20000)
+    finally:
+        ble.active(0)
+
+
+ble = bluetooth.BLE()
+ble.active(1)
+ble.irq(irq)
diff --git a/tests/multi_bluetooth/perf_gatt_notify.py.exp b/tests/multi_bluetooth/perf_gatt_notify.py.exp
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/tests/multi_bluetooth/perf_l2cap.py b/tests/multi_bluetooth/perf_l2cap.py
new file mode 100644
index 0000000000000..9b07bb1dcef2f
--- /dev/null
+++ b/tests/multi_bluetooth/perf_l2cap.py
@@ -0,0 +1,148 @@
+# Send L2CAP data as fast as possible and time it.
+
+from micropython import const
+import time, machine, bluetooth, random
+
+TIMEOUT_MS = 1000
+
+_IRQ_CENTRAL_CONNECT = const(1)
+_IRQ_CENTRAL_DISCONNECT = const(2)
+_IRQ_PERIPHERAL_CONNECT = const(7)
+_IRQ_PERIPHERAL_DISCONNECT = const(8)
+_IRQ_L2CAP_ACCEPT = const(22)
+_IRQ_L2CAP_CONNECT = const(23)
+_IRQ_L2CAP_DISCONNECT = const(24)
+_IRQ_L2CAP_RECV = const(25)
+_IRQ_L2CAP_SEND_READY = const(26)
+
+_L2CAP_PSM = const(22)
+_L2CAP_MTU = const(512)
+
+_PAYLOAD_LEN = const(_L2CAP_MTU)
+_NUM_PAYLOADS = const(20)
+
+_RANDOM_SEED = 22
+
+
+waiting_events = {}
+
+
+def irq(event, data):
+    if event == _IRQ_CENTRAL_CONNECT:
+        conn_handle, addr_type, addr = data
+        waiting_events[event] = conn_handle
+    elif event == _IRQ_PERIPHERAL_CONNECT:
+        conn_handle, addr_type, addr = data
+        waiting_events[event] = conn_handle
+    elif event == _IRQ_L2CAP_ACCEPT:
+        conn_handle, cid, psm, our_mtu, peer_mtu = data
+        waiting_events[event] = (conn_handle, cid, psm)
+    elif event == _IRQ_L2CAP_CONNECT:
+        conn_handle, cid, psm, our_mtu, peer_mtu = data
+        waiting_events[event] = (conn_handle, cid, psm, our_mtu, peer_mtu)
+
+    if event not in waiting_events:
+        waiting_events[event] = None
+
+
+def wait_for_event(event, timeout_ms):
+    t0 = time.ticks_ms()
+    while time.ticks_diff(time.ticks_ms(), t0) < timeout_ms:
+        if event in waiting_events:
+            return waiting_events.pop(event)
+        machine.idle()
+    raise ValueError("Timeout waiting for {}".format(event))
+
+
+def send_data(ble, conn_handle, cid):
+    buf = bytearray(_PAYLOAD_LEN)
+    for i in range(_NUM_PAYLOADS):
+        for j in range(_PAYLOAD_LEN):
+            buf[j] = random.randint(0, 255)
+        if not ble.l2cap_send(conn_handle, cid, buf):
+            wait_for_event(_IRQ_L2CAP_SEND_READY, TIMEOUT_MS)
+
+
+def recv_data(ble, conn_handle, cid):
+    buf = bytearray(_PAYLOAD_LEN)
+    recv_bytes = 0
+    recv_correct = 0
+    expected_bytes = _PAYLOAD_LEN * _NUM_PAYLOADS
+    ticks_first_byte = 0
+    while recv_bytes < expected_bytes:
+        wait_for_event(_IRQ_L2CAP_RECV, TIMEOUT_MS)
+        if not ticks_first_byte:
+            ticks_first_byte = time.ticks_ms()
+        while True:
+            n = ble.l2cap_recvinto(conn_handle, cid, buf)
+            if n == 0:
+                break
+            recv_bytes += n
+            for i in range(n):
+                if buf[i] == random.randint(0, 255):
+                    recv_correct += 1
+    ticks_end = time.ticks_ms()
+    return recv_bytes, recv_correct, time.ticks_diff(ticks_end, ticks_first_byte)
+
+
+# Acting in peripheral role.
+def instance0():
+    multitest.globals(BDADDR=ble.config("mac"))
+    ble.gap_advertise(20_000, b"\x02\x01\x06\x04\xffMPY")
+    multitest.next()
+    try:
+        # Wait for central to connect to us.
+        conn_handle = wait_for_event(_IRQ_CENTRAL_CONNECT, TIMEOUT_MS)
+
+        ble.l2cap_listen(_L2CAP_PSM, _L2CAP_MTU)
+
+        conn_handle, cid, psm = wait_for_event(_IRQ_L2CAP_ACCEPT, TIMEOUT_MS)
+        conn_handle, cid, psm, our_mtu, peer_mtu = wait_for_event(_IRQ_L2CAP_CONNECT, TIMEOUT_MS)
+
+        random.seed(_RANDOM_SEED)
+
+        send_data(ble, conn_handle, cid)
+
+        wait_for_event(_IRQ_L2CAP_DISCONNECT, TIMEOUT_MS)
+
+        # Wait for the central to disconnect.
+        wait_for_event(_IRQ_CENTRAL_DISCONNECT, TIMEOUT_MS)
+    finally:
+        ble.active(0)
+
+
+# Acting in central role.
+def instance1():
+    multitest.next()
+    try:
+        # Connect to peripheral and then disconnect.
+        ble.gap_connect(*BDADDR)
+        conn_handle = wait_for_event(_IRQ_PERIPHERAL_CONNECT, TIMEOUT_MS)
+
+        ble.l2cap_connect(conn_handle, _L2CAP_PSM, _L2CAP_MTU)
+        conn_handle, cid, psm, our_mtu, peer_mtu = wait_for_event(_IRQ_L2CAP_CONNECT, TIMEOUT_MS)
+
+        random.seed(_RANDOM_SEED)
+
+        recv_bytes, recv_correct, total_ticks = recv_data(ble, conn_handle, cid)
+
+        # Disconnect channel.
+        ble.l2cap_disconnect(conn_handle, cid)
+        wait_for_event(_IRQ_L2CAP_DISCONNECT, TIMEOUT_MS)
+
+        print(
+            "Received {}/{} bytes in {} ms. {} B/s".format(
+                recv_bytes, recv_correct, total_ticks, recv_bytes * 1000 // total_ticks
+            )
+        )
+
+        # Disconnect from peripheral.
+        ble.gap_disconnect(conn_handle)
+        wait_for_event(_IRQ_PERIPHERAL_DISCONNECT, TIMEOUT_MS)
+    finally:
+        ble.active(0)
+
+
+ble = bluetooth.BLE()
+ble.active(1)
+ble.irq(irq)
diff --git a/tests/multi_bluetooth/perf_l2cap.py.exp b/tests/multi_bluetooth/perf_l2cap.py.exp
new file mode 100644
index 0000000000000..e69de29bb2d1d

From 9d674cf7ab8570637dfab23811800e3b98babad9 Mon Sep 17 00:00:00 2001
From: Chris Mason <c.mason@inchipdesign.com.au>
Date: Wed, 17 Feb 2021 11:07:34 +1100
Subject: [PATCH 0649/3533] stm32/uart: Add support for LPUART1 on L0, L4, H7
 and WB MCUs.

Add LPUART1 as a standard UART.  No low power features are supported, yet.
LPUART1 is enabled as the next available UART after the standard U(S)ARTs:

    STM32WB:      LPUART1 = UART(2)
    STM32L0:      LPUART1 = UART(6)
    STM32L4:      LPUART1 = UART(6)
    STM32H7:      LPUART1 = UART(9)

On all ports: LPUART1 = machine.UART('LP1')

LPUART1 is enabled by defining MICROPY_HW_LPUART1_TX and
MICROPY_HW_LPUART1_RX in mpconfigboard.h.

Signed-off-by: Chris Mason <c.mason@inchipdesign.com.au>
---
 ports/stm32/boards/make-pins.py    |  2 ++
 ports/stm32/machine_uart.c         | 29 ++++++++++++++++--
 ports/stm32/mpconfigboard_common.h |  9 +++++-
 ports/stm32/mpconfigport.h         |  2 +-
 ports/stm32/pin_defs_stm32.h       |  5 ++++
 ports/stm32/stm32_it.c             | 18 ++++++++++++
 ports/stm32/uart.c                 | 47 ++++++++++++++++++++++++++++--
 ports/stm32/uart.h                 |  3 ++
 8 files changed, 108 insertions(+), 7 deletions(-)

diff --git a/ports/stm32/boards/make-pins.py b/ports/stm32/boards/make-pins.py
index a91ed8a2c9150..a195323318112 100755
--- a/ports/stm32/boards/make-pins.py
+++ b/ports/stm32/boards/make-pins.py
@@ -14,6 +14,7 @@
     "I2S": ["CK", "MCK", "SD", "WS", "EXTSD"],
     "USART": ["RX", "TX", "CTS", "RTS", "CK"],
     "UART": ["RX", "TX", "CTS", "RTS"],
+    "LPUART": ["RX", "TX", "CTS", "RTS"],
     "SPI": ["NSS", "SCK", "MISO", "MOSI"],
     "SDMMC": ["CK", "CMD", "D0", "D1", "D2", "D3"],
     "CAN": ["TX", "RX"],
@@ -24,6 +25,7 @@
     "I2S": "MICROPY_HW_ENABLE_I2S{num}",
     "SPI": "MICROPY_HW_SPI{num}_SCK",
     "UART": "MICROPY_HW_UART{num}_TX",
+    "LPUART": "MICROPY_HW_LPUART{num}_TX",
     "USART": "MICROPY_HW_UART{num}_TX",
     "SDMMC": "MICROPY_HW_SDMMC{num}_CK",
     "CAN": "MICROPY_HW_CAN{num}_TX",
diff --git a/ports/stm32/machine_uart.c b/ports/stm32/machine_uart.c
index 31e6a1789e4a3..eceb5b6e7a8b2 100644
--- a/ports/stm32/machine_uart.c
+++ b/ports/stm32/machine_uart.c
@@ -76,7 +76,14 @@
 STATIC void pyb_uart_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     pyb_uart_obj_t *self = MP_OBJ_TO_PTR(self_in);
     if (!self->is_enabled) {
-        mp_printf(print, "UART(%u)", self->uart_id);
+        #ifdef LPUART1
+        if (self->uart_id == PYB_LPUART_1) {
+            mp_printf(print, "UART('LP1')");
+        } else
+        #endif
+        {
+            mp_printf(print, "UART(%u)", self->uart_id);
+        }
     } else {
         mp_int_t bits;
         uint32_t cr1 = self->uartx->CR1;
@@ -98,8 +105,16 @@ STATIC void pyb_uart_print(const mp_print_t *print, mp_obj_t self_in, mp_print_k
         if (cr1 & USART_CR1_PCE) {
             bits -= 1;
         }
-        mp_printf(print, "UART(%u, baudrate=%u, bits=%u, parity=",
-            self->uart_id, uart_get_baudrate(self), bits);
+        #ifdef LPUART1
+        if (self->uart_id == PYB_LPUART_1) {
+            mp_printf(print, "UART('LP1', baudrate=%u, bits=%u, parity=",
+                uart_get_baudrate(self), bits);
+        } else
+        #endif
+        {
+            mp_printf(print, "UART(%u, baudrate=%u, bits=%u, parity=",
+                self->uart_id, uart_get_baudrate(self), bits);
+        }
         if (!(cr1 & USART_CR1_PCE)) {
             mp_print_str(print, "None");
         } else if (!(cr1 & USART_CR1_PS)) {
@@ -335,6 +350,14 @@ STATIC mp_obj_t pyb_uart_make_new(const mp_obj_type_t *type, size_t n_args, size
         } else if (strcmp(port, MICROPY_HW_UART10_NAME) == 0) {
             uart_id = PYB_UART_10;
         #endif
+        #ifdef MICROPY_HW_LPUART1_NAME
+        } else if (strcmp(port, MICROPY_HW_LPUART1_NAME) == 0) {
+            uart_id = PYB_LPUART_1;
+        #endif
+        #ifdef LPUART1
+        } else if (strcmp(port, "LP1") == 0 && uart_exists(PYB_LPUART_1)) {
+            uart_id = PYB_LPUART_1;
+        #endif
         } else {
             mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("UART(%s) doesn't exist"), port);
         }
diff --git a/ports/stm32/mpconfigboard_common.h b/ports/stm32/mpconfigboard_common.h
index 615310e51b771..ed30d17bdcd3b 100644
--- a/ports/stm32/mpconfigboard_common.h
+++ b/ports/stm32/mpconfigboard_common.h
@@ -181,6 +181,7 @@
 #define MICROPY_HW_MAX_I2C (2)
 #define MICROPY_HW_MAX_TIMER (17)
 #define MICROPY_HW_MAX_UART (8)
+#define MICROPY_HW_MAX_LPUART (0)
 
 // Configuration for STM32F4 series
 #elif defined(STM32F4)
@@ -200,6 +201,7 @@
 #else
 #define MICROPY_HW_MAX_UART (6)
 #endif
+#define MICROPY_HW_MAX_LPUART (0)
 
 // Configuration for STM32F7 series
 #elif defined(STM32F7)
@@ -214,6 +216,7 @@
 #define MICROPY_HW_MAX_I2C (4)
 #define MICROPY_HW_MAX_TIMER (17)
 #define MICROPY_HW_MAX_UART (8)
+#define MICROPY_HW_MAX_LPUART (0)
 
 // Configuration for STM32H7 series
 #elif defined(STM32H7)
@@ -223,6 +226,7 @@
 #define MICROPY_HW_MAX_I2C (4)
 #define MICROPY_HW_MAX_TIMER (17)
 #define MICROPY_HW_MAX_UART (8)
+#define MICROPY_HW_MAX_LPUART (1)
 
 // Configuration for STM32L0 series
 #elif defined(STM32L0)
@@ -232,6 +236,7 @@
 #define MICROPY_HW_MAX_I2C (3)
 #define MICROPY_HW_MAX_TIMER (22)
 #define MICROPY_HW_MAX_UART (5)
+#define MICROPY_HW_MAX_LPUART (1)
 
 // Configuration for STM32L4 series
 #elif defined(STM32L4)
@@ -240,7 +245,8 @@
 #define PYB_EXTI_NUM_VECTORS (23)
 #define MICROPY_HW_MAX_I2C (4)
 #define MICROPY_HW_MAX_TIMER (17)
-#define MICROPY_HW_MAX_UART (6)
+#define MICROPY_HW_MAX_UART (5)
+#define MICROPY_HW_MAX_LPUART (1)
 
 // Configuration for STM32WB series
 #elif defined(STM32WB)
@@ -250,6 +256,7 @@
 #define MICROPY_HW_MAX_I2C (3)
 #define MICROPY_HW_MAX_TIMER (17)
 #define MICROPY_HW_MAX_UART (1)
+#define MICROPY_HW_MAX_LPUART (1)
 
 #ifndef MICROPY_HW_STM32WB_FLASH_SYNCRONISATION
 #define MICROPY_HW_STM32WB_FLASH_SYNCRONISATION (1)
diff --git a/ports/stm32/mpconfigport.h b/ports/stm32/mpconfigport.h
index 407a3e6c6a403..5998cd9085367 100644
--- a/ports/stm32/mpconfigport.h
+++ b/ports/stm32/mpconfigport.h
@@ -375,7 +375,7 @@ struct _mp_bluetooth_btstack_root_pointers_t;
     struct _pyb_uart_obj_t *pyb_stdio_uart; \
     \
     /* pointers to all UART objects (if they have been created) */ \
-    struct _pyb_uart_obj_t *pyb_uart_obj_all[MICROPY_HW_MAX_UART]; \
+    struct _pyb_uart_obj_t *pyb_uart_obj_all[MICROPY_HW_MAX_UART + MICROPY_HW_MAX_LPUART]; \
     \
     /* pointers to all CAN objects (if they have been created) */ \
     struct _pyb_can_obj_t *pyb_can_obj_all[MICROPY_HW_MAX_CAN]; \
diff --git a/ports/stm32/pin_defs_stm32.h b/ports/stm32/pin_defs_stm32.h
index 33a1790807660..9285c190a63e0 100644
--- a/ports/stm32/pin_defs_stm32.h
+++ b/ports/stm32/pin_defs_stm32.h
@@ -47,6 +47,7 @@ enum {
     AF_FN_I2C,
     AF_FN_USART,
     AF_FN_UART = AF_FN_USART,
+    AF_FN_LPUART,
     AF_FN_SPI,
     AF_FN_I2S,
     AF_FN_SDMMC,
@@ -77,6 +78,10 @@ enum {
     AF_PIN_TYPE_UART_RX  = AF_PIN_TYPE_USART_RX,
     AF_PIN_TYPE_UART_CTS = AF_PIN_TYPE_USART_CTS,
     AF_PIN_TYPE_UART_RTS = AF_PIN_TYPE_USART_RTS,
+    AF_PIN_TYPE_LPUART_TX  = AF_PIN_TYPE_USART_TX,
+    AF_PIN_TYPE_LPUART_RX  = AF_PIN_TYPE_USART_RX,
+    AF_PIN_TYPE_LPUART_CTS = AF_PIN_TYPE_USART_CTS,
+    AF_PIN_TYPE_LPUART_RTS = AF_PIN_TYPE_USART_RTS,
 
     AF_PIN_TYPE_SPI_MOSI = 0,
     AF_PIN_TYPE_SPI_MISO,
diff --git a/ports/stm32/stm32_it.c b/ports/stm32/stm32_it.c
index 8e96da177b583..dc96e2dd6cf04 100644
--- a/ports/stm32/stm32_it.c
+++ b/ports/stm32/stm32_it.c
@@ -742,11 +742,13 @@ void USART1_IRQHandler(void) {
     IRQ_EXIT(USART1_IRQn);
 }
 
+#if defined(USART2)
 void USART2_IRQHandler(void) {
     IRQ_ENTER(USART2_IRQn);
     uart_irq_handler(2);
     IRQ_EXIT(USART2_IRQn);
 }
+#endif
 
 #if defined(STM32F0)
 
@@ -772,29 +774,37 @@ void USART4_5_IRQHandler(void) {
 
 #else
 
+#if defined(USART3)
 void USART3_IRQHandler(void) {
     IRQ_ENTER(USART3_IRQn);
     uart_irq_handler(3);
     IRQ_EXIT(USART3_IRQn);
 }
+#endif
 
+#if defined(UART4)
 void UART4_IRQHandler(void) {
     IRQ_ENTER(UART4_IRQn);
     uart_irq_handler(4);
     IRQ_EXIT(UART4_IRQn);
 }
+#endif
 
+#if defined(UART5)
 void UART5_IRQHandler(void) {
     IRQ_ENTER(UART5_IRQn);
     uart_irq_handler(5);
     IRQ_EXIT(UART5_IRQn);
 }
+#endif
 
+#if defined(USART6)
 void USART6_IRQHandler(void) {
     IRQ_ENTER(USART6_IRQn);
     uart_irq_handler(6);
     IRQ_EXIT(USART6_IRQn);
 }
+#endif
 
 #if defined(UART7)
 void UART7_IRQHandler(void) {
@@ -830,6 +840,14 @@ void UART10_IRQHandler(void) {
 
 #endif
 
+#if defined(LPUART1)
+void LPUART1_IRQHandler(void) {
+    IRQ_ENTER(LPUART1_IRQn);
+    uart_irq_handler(PYB_LPUART_1);
+    IRQ_EXIT(LPUART1_IRQn);
+}
+#endif
+
 #if MICROPY_PY_PYB_LEGACY
 
 #if defined(MICROPY_HW_I2C1_SCL)
diff --git a/ports/stm32/uart.c b/ports/stm32/uart.c
index 8091ba05f99af..d40a883c52b84 100644
--- a/ports/stm32/uart.c
+++ b/ports/stm32/uart.c
@@ -201,6 +201,11 @@ bool uart_exists(int uart_id) {
             return true;
         #endif
 
+        #if defined(MICROPY_HW_LPUART1_TX) && defined(MICROPY_HW_LPUART1_RX)
+        case PYB_LPUART_1:
+            return true;
+        #endif
+
         default:
             return false;
     }
@@ -211,6 +216,7 @@ bool uart_init(pyb_uart_obj_t *uart_obj,
     uint32_t baudrate, uint32_t bits, uint32_t parity, uint32_t stop, uint32_t flow) {
     USART_TypeDef *UARTx;
     IRQn_Type irqn;
+    uint8_t uart_fn = AF_FN_UART;
     int uart_unit;
 
     const pin_obj_t *pins[4] = {0};
@@ -406,6 +412,28 @@ bool uart_init(pyb_uart_obj_t *uart_obj,
             break;
         #endif
 
+        #if defined(MICROPY_HW_LPUART1_TX) && defined(MICROPY_HW_LPUART1_RX)
+        case PYB_LPUART_1:
+            uart_fn = AF_FN_LPUART;
+            uart_unit = 1;
+            UARTx = LPUART1;
+            irqn = LPUART1_IRQn;
+            pins[0] = MICROPY_HW_LPUART1_TX;
+            pins[1] = MICROPY_HW_LPUART1_RX;
+            #if defined(MICROPY_HW_LPUART1_RTS)
+            if (flow & UART_HWCONTROL_RTS) {
+                pins[2] = MICROPY_HW_LPUART1_RTS;
+            }
+            #endif
+            #if defined(MICROPY_HW_LPUART1_CTS)
+            if (flow & UART_HWCONTROL_CTS) {
+                pins[3] = MICROPY_HW_LPUART1_CTS;
+            }
+            #endif
+            __HAL_RCC_LPUART1_CLK_ENABLE();
+            break;
+        #endif
+
         default:
             // UART does not exist or is not configured for this board
             return false;
@@ -416,7 +444,7 @@ bool uart_init(pyb_uart_obj_t *uart_obj,
 
     for (uint i = 0; i < 4; i++) {
         if (pins[i] != NULL) {
-            bool ret = mp_hal_pin_config_alt(pins[i], mode, pull, AF_FN_UART, uart_unit);
+            bool ret = mp_hal_pin_config_alt(pins[i], mode, pull, uart_fn, uart_unit);
             if (!ret) {
                 return false;
             }
@@ -596,6 +624,13 @@ void uart_deinit(pyb_uart_obj_t *self) {
         __HAL_RCC_UART10_RELEASE_RESET();
         __HAL_RCC_UART10_CLK_DISABLE();
     #endif
+    #if defined(LPUART1)
+    } else if (self->uart_id == PYB_LPUART_1) {
+        HAL_NVIC_DisableIRQ(LPUART1_IRQn);
+        __HAL_RCC_LPUART1_FORCE_RESET();
+        __HAL_RCC_LPUART1_RELEASE_RESET();
+        __HAL_RCC_LPUART1_CLK_DISABLE();
+    #endif
     }
 }
 
@@ -677,7 +712,15 @@ uint32_t uart_get_source_freq(pyb_uart_obj_t *self) {
 
 uint32_t uart_get_baudrate(pyb_uart_obj_t *self) {
     // This formula assumes UART_OVERSAMPLING_16
-    return uart_get_source_freq(self) / self->uartx->BRR;
+    uint32_t source_freq = uart_get_source_freq(self);
+    #if defined(LPUART1)
+    if (self->uart_id == PYB_LPUART_1) {
+        return source_freq / (self->uartx->BRR >> 8);
+    } else
+    #endif
+    {
+        return source_freq / self->uartx->BRR;
+    }
 }
 
 void uart_set_baudrate(pyb_uart_obj_t *self, uint32_t baudrate) {
diff --git a/ports/stm32/uart.h b/ports/stm32/uart.h
index 570a79c932585..0490a617f67c6 100644
--- a/ports/stm32/uart.h
+++ b/ports/stm32/uart.h
@@ -40,6 +40,9 @@ typedef enum {
     PYB_UART_8 = 8,
     PYB_UART_9 = 9,
     PYB_UART_10 = 10,
+    #ifdef LPUART1
+    PYB_LPUART_1 = MICROPY_HW_MAX_UART + 1,
+    #endif
 } pyb_uart_t;
 
 #define CHAR_WIDTH_8BIT (0)

From 03a64f20771cd0582af61de31811294456fa695e Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sun, 21 Feb 2021 15:24:38 +1100
Subject: [PATCH 0650/3533] stm32/boards/NUCLEO_WB55: Enable LPUART1 on
 PA2/PA3.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/boards/NUCLEO_WB55/mpconfigboard.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ports/stm32/boards/NUCLEO_WB55/mpconfigboard.h b/ports/stm32/boards/NUCLEO_WB55/mpconfigboard.h
index 2061349417c64..179369d943cbd 100644
--- a/ports/stm32/boards/NUCLEO_WB55/mpconfigboard.h
+++ b/ports/stm32/boards/NUCLEO_WB55/mpconfigboard.h
@@ -22,6 +22,8 @@
 // UART buses
 #define MICROPY_HW_UART1_TX         (pin_B6)
 #define MICROPY_HW_UART1_RX         (pin_B7)
+#define MICROPY_HW_LPUART1_TX       (pin_A2)
+#define MICROPY_HW_LPUART1_RX       (pin_A3)
 // USART 1 is connected to the virtual com port on the ST-LINK
 #define MICROPY_HW_UART_REPL        PYB_UART_1
 #define MICROPY_HW_UART_REPL_BAUD   115200

From d334d781e1ec66dfdd1d165dfb481916639dccaf Mon Sep 17 00:00:00 2001
From: iTitou <moiandme@gmail.com>
Date: Sun, 31 Jan 2021 17:56:52 +0100
Subject: [PATCH 0651/3533] tools/verifygitlog.py: Show required format regexp
 in error message.

Signed-off-by: iTitou <moiandme@gmail.com>
---
 tools/verifygitlog.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tools/verifygitlog.py b/tools/verifygitlog.py
index 0080b96bfaea9..cc4b80f4a97a8 100755
--- a/tools/verifygitlog.py
+++ b/tools/verifygitlog.py
@@ -57,8 +57,9 @@ def warning(err):
     # Subject line.
     subject_line = raw_body[0]
     very_verbose("subject_line", subject_line)
-    if not re.match(r"^[^!]+: [A-Z]+.+ .+\.$", subject_line):
-        error("Subject line should contain ': ' and end in '.': " + subject_line)
+    subject_line_format = r"^[^!]+: [A-Z]+.+ .+\.$"
+    if not re.match(subject_line_format, subject_line):
+        error("Subject line should match " + repr(subject_line_format) + ": " + subject_line)
     if len(subject_line) >= 73:
         error("Subject line should be 72 or less characters: " + subject_line)
 

From d867d20d9a7d15b6506b89f5e1e638367f843894 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sun, 21 Feb 2021 11:30:12 +1100
Subject: [PATCH 0652/3533] py/mkrules.cmake: Rename QSTR_DEFS variables to
 QSTRDEFS.

And also MICROPY_PY_QSTRDEFS to MICROPY_QSTRDEFS_PY.  These variables are
all related.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/mkrules.cmake | 42 +++++++++++++++++++++---------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/py/mkrules.cmake b/py/mkrules.cmake
index e05dcb836a211..304f2be55880d 100644
--- a/py/mkrules.cmake
+++ b/py/mkrules.cmake
@@ -1,14 +1,14 @@
 # CMake fragment for MicroPython rules
 
-set(MICROPY_PY_QSTRDEFS "${MICROPY_PY_DIR}/qstrdefs.h")
 set(MICROPY_GENHDR_DIR "${CMAKE_BINARY_DIR}/genhdr")
 set(MICROPY_MPVERSION "${MICROPY_GENHDR_DIR}/mpversion.h")
 set(MICROPY_MODULEDEFS "${MICROPY_GENHDR_DIR}/moduledefs.h")
-set(MICROPY_QSTR_DEFS_LAST "${MICROPY_GENHDR_DIR}/qstr.i.last")
-set(MICROPY_QSTR_DEFS_SPLIT "${MICROPY_GENHDR_DIR}/qstr.split")
-set(MICROPY_QSTR_DEFS_COLLECTED "${MICROPY_GENHDR_DIR}/qstrdefs.collected.h")
-set(MICROPY_QSTR_DEFS_PREPROCESSED "${MICROPY_GENHDR_DIR}/qstrdefs.preprocessed.h")
-set(MICROPY_QSTR_DEFS_GENERATED "${MICROPY_GENHDR_DIR}/qstrdefs.generated.h")
+set(MICROPY_QSTRDEFS_PY "${MICROPY_PY_DIR}/qstrdefs.h")
+set(MICROPY_QSTRDEFS_LAST "${MICROPY_GENHDR_DIR}/qstr.i.last")
+set(MICROPY_QSTRDEFS_SPLIT "${MICROPY_GENHDR_DIR}/qstr.split")
+set(MICROPY_QSTRDEFS_COLLECTED "${MICROPY_GENHDR_DIR}/qstrdefs.collected.h")
+set(MICROPY_QSTRDEFS_PREPROCESSED "${MICROPY_GENHDR_DIR}/qstrdefs.preprocessed.h")
+set(MICROPY_QSTRDEFS_GENERATED "${MICROPY_GENHDR_DIR}/qstrdefs.generated.h")
 
 # Provide defaults for preprocessor flags if not already defined
 if(NOT MICROPY_CPP_FLAGS)
@@ -33,7 +33,7 @@ find_package(Python3 REQUIRED COMPONENTS Interpreter)
 
 target_sources(${MICROPY_TARGET} PRIVATE
     ${MICROPY_MPVERSION}
-    ${MICROPY_QSTR_DEFS_GENERATED}
+    ${MICROPY_QSTRDEFS_GENERATED}
 )
 
 # Command to force the build of another command
@@ -68,7 +68,7 @@ add_custom_command(
 # It only needs to be passed the list of MICROPY_SOURCE_QSTR files that have changed since
 # it was last run, but it looks like it's not possible to specify that with cmake.
 add_custom_command(
-    OUTPUT ${MICROPY_QSTR_DEFS_LAST}
+    OUTPUT ${MICROPY_QSTRDEFS_LAST}
     COMMAND ${Python3_EXECUTABLE} ${MICROPY_PY_DIR}/makeqstrdefs.py pp ${CMAKE_C_COMPILER} -E output ${MICROPY_GENHDR_DIR}/qstr.i.last cflags ${MICROPY_CPP_FLAGS} -DNO_QSTR sources ${MICROPY_SOURCE_QSTR}
     DEPENDS ${MICROPY_MODULEDEFS}
         ${MICROPY_SOURCE_QSTR}
@@ -77,34 +77,34 @@ add_custom_command(
 )
 
 add_custom_command(
-    OUTPUT ${MICROPY_QSTR_DEFS_SPLIT}
+    OUTPUT ${MICROPY_QSTRDEFS_SPLIT}
     COMMAND ${Python3_EXECUTABLE} ${MICROPY_PY_DIR}/makeqstrdefs.py split qstr ${MICROPY_GENHDR_DIR}/qstr.i.last ${MICROPY_GENHDR_DIR}/qstr _
-    COMMAND touch ${MICROPY_QSTR_DEFS_SPLIT}
-    DEPENDS ${MICROPY_QSTR_DEFS_LAST}
+    COMMAND touch ${MICROPY_QSTRDEFS_SPLIT}
+    DEPENDS ${MICROPY_QSTRDEFS_LAST}
     VERBATIM
     COMMAND_EXPAND_LISTS
 )
 
 add_custom_command(
-    OUTPUT ${MICROPY_QSTR_DEFS_COLLECTED}
-    COMMAND ${Python3_EXECUTABLE} ${MICROPY_PY_DIR}/makeqstrdefs.py cat qstr _ ${MICROPY_GENHDR_DIR}/qstr ${MICROPY_QSTR_DEFS_COLLECTED}
-    DEPENDS ${MICROPY_QSTR_DEFS_SPLIT}
+    OUTPUT ${MICROPY_QSTRDEFS_COLLECTED}
+    COMMAND ${Python3_EXECUTABLE} ${MICROPY_PY_DIR}/makeqstrdefs.py cat qstr _ ${MICROPY_GENHDR_DIR}/qstr ${MICROPY_QSTRDEFS_COLLECTED}
+    DEPENDS ${MICROPY_QSTRDEFS_SPLIT}
     VERBATIM
     COMMAND_EXPAND_LISTS
 )
 
 add_custom_command(
-    OUTPUT ${MICROPY_QSTR_DEFS_PREPROCESSED}
-    COMMAND cat ${MICROPY_PY_QSTRDEFS} ${MICROPY_QSTR_DEFS_COLLECTED} | sed "s/^Q(.*)/\"&\"/" | ${CMAKE_C_COMPILER} -E ${MICROPY_CPP_FLAGS} - | sed "s/^\\\"\\(Q(.*)\\)\\\"/\\1/" > ${MICROPY_QSTR_DEFS_PREPROCESSED}
-    DEPENDS ${MICROPY_QSTR_DEFS_COLLECTED}
+    OUTPUT ${MICROPY_QSTRDEFS_PREPROCESSED}
+    COMMAND cat ${MICROPY_QSTRDEFS_PY} ${MICROPY_QSTRDEFS_COLLECTED} | sed "s/^Q(.*)/\"&\"/" | ${CMAKE_C_COMPILER} -E ${MICROPY_CPP_FLAGS} - | sed "s/^\\\"\\(Q(.*)\\)\\\"/\\1/" > ${MICROPY_QSTRDEFS_PREPROCESSED}
+    DEPENDS ${MICROPY_QSTRDEFS_COLLECTED}
     VERBATIM
     COMMAND_EXPAND_LISTS
 )
 
 add_custom_command(
-    OUTPUT ${MICROPY_QSTR_DEFS_GENERATED}
-    COMMAND ${Python3_EXECUTABLE} ${MICROPY_PY_DIR}/makeqstrdata.py ${MICROPY_QSTR_DEFS_PREPROCESSED} > ${MICROPY_QSTR_DEFS_GENERATED}
-    DEPENDS ${MICROPY_QSTR_DEFS_PREPROCESSED}
+    OUTPUT ${MICROPY_QSTRDEFS_GENERATED}
+    COMMAND ${Python3_EXECUTABLE} ${MICROPY_PY_DIR}/makeqstrdata.py ${MICROPY_QSTRDEFS_PREPROCESSED} > ${MICROPY_QSTRDEFS_GENERATED}
+    DEPENDS ${MICROPY_QSTRDEFS_PREPROCESSED}
     VERBATIM
     COMMAND_EXPAND_LISTS
 )
@@ -127,7 +127,7 @@ if(MICROPY_FROZEN_MANIFEST)
         OUTPUT ${MICROPY_FROZEN_CONTENT}
         COMMAND ${Python3_EXECUTABLE} ${MICROPY_DIR}/tools/makemanifest.py -o ${MICROPY_FROZEN_CONTENT} -v "MPY_DIR=${MICROPY_DIR}" -v "PORT_DIR=${MICROPY_PORT_DIR}" -b "${CMAKE_BINARY_DIR}" -f${MICROPY_CROSS_FLAGS} ${MICROPY_FROZEN_MANIFEST}
         DEPENDS MICROPY_FORCE_BUILD
-            ${MICROPY_QSTR_DEFS_GENERATED}
+            ${MICROPY_QSTRDEFS_GENERATED}
         VERBATIM
     )
 endif()

From 2adf20c5f28e4d36f7832412f4502be664ccdb23 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sun, 21 Feb 2021 11:32:00 +1100
Subject: [PATCH 0653/3533] py/mkrules.cmake: Add MICROPY_QSTRDEFS_PORT to qstr
 build process.

This allows a port to specify a custom qstrdefsport.h file, the same as the
QSTR_DEFS variable in a Makefile.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/mkrules.cmake | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/py/mkrules.cmake b/py/mkrules.cmake
index 304f2be55880d..9c4c4afabe03e 100644
--- a/py/mkrules.cmake
+++ b/py/mkrules.cmake
@@ -95,8 +95,10 @@ add_custom_command(
 
 add_custom_command(
     OUTPUT ${MICROPY_QSTRDEFS_PREPROCESSED}
-    COMMAND cat ${MICROPY_QSTRDEFS_PY} ${MICROPY_QSTRDEFS_COLLECTED} | sed "s/^Q(.*)/\"&\"/" | ${CMAKE_C_COMPILER} -E ${MICROPY_CPP_FLAGS} - | sed "s/^\\\"\\(Q(.*)\\)\\\"/\\1/" > ${MICROPY_QSTRDEFS_PREPROCESSED}
-    DEPENDS ${MICROPY_QSTRDEFS_COLLECTED}
+    COMMAND cat ${MICROPY_QSTRDEFS_PY} ${MICROPY_QSTRDEFS_PORT} ${MICROPY_QSTRDEFS_COLLECTED} | sed "s/^Q(.*)/\"&\"/" | ${CMAKE_C_COMPILER} -E ${MICROPY_CPP_FLAGS} - | sed "s/^\\\"\\(Q(.*)\\)\\\"/\\1/" > ${MICROPY_QSTRDEFS_PREPROCESSED}
+    DEPENDS ${MICROPY_QSTRDEFS_PY}
+        ${MICROPY_QSTRDEFS_PORT}
+        ${MICROPY_QSTRDEFS_COLLECTED}
     VERBATIM
     COMMAND_EXPAND_LISTS
 )

From 75db0b907942f4b2e7306d2ce90d2f014cd5a414 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sun, 21 Feb 2021 11:33:15 +1100
Subject: [PATCH 0654/3533] esp32: Define MICROPY_QSTRDEFS_PORT to include
 special qstrs.

Fixes issue #6942.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/main/CMakeLists.txt | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ports/esp32/main/CMakeLists.txt b/ports/esp32/main/CMakeLists.txt
index 9fb48a90412ef..bd25d76ee45b0 100644
--- a/ports/esp32/main/CMakeLists.txt
+++ b/ports/esp32/main/CMakeLists.txt
@@ -5,6 +5,10 @@ get_filename_component(MICROPY_DIR ${PROJECT_DIR}/../.. ABSOLUTE)
 include(${MICROPY_DIR}/py/py.cmake)
 include(${MICROPY_DIR}/extmod/extmod.cmake)
 
+set(MICROPY_QSTRDEFS_PORT
+    ${PROJECT_DIR}/qstrdefsport.h
+)
+
 set(MICROPY_SOURCE_EXTMOD_EXTRA
     ${MICROPY_DIR}/extmod/modonewire.c
 )

From 53f5bb05a9cdf59cc2deaf216c25c0c275e6dce7 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 23 Feb 2021 09:49:12 +1100
Subject: [PATCH 0655/3533] rp2,stm32: Enable MICROPY_PY_UBINASCII_CRC32 to get
 ubinascii.crc32().

These ports already have uzlib enabled so this additional ubinascii.crc32
function only costs about 90 bytes of flash.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/rp2/mpconfigport.h   | 1 +
 ports/stm32/mpconfigport.h | 1 +
 2 files changed, 2 insertions(+)

diff --git a/ports/rp2/mpconfigport.h b/ports/rp2/mpconfigport.h
index 9ba381030b150..b3214acfc2b5d 100644
--- a/ports/rp2/mpconfigport.h
+++ b/ports/rp2/mpconfigport.h
@@ -102,6 +102,7 @@
 #define MICROPY_PY_URE_SUB                      (1)
 #define MICROPY_PY_UHASHLIB                     (1)
 #define MICROPY_PY_UBINASCII                    (1)
+#define MICROPY_PY_UBINASCII_CRC32              (1)
 #define MICROPY_PY_UTIME_MP_HAL                 (1)
 #define MICROPY_PY_URANDOM                      (1)
 #define MICROPY_PY_URANDOM_EXTRA_FUNCS          (1)
diff --git a/ports/stm32/mpconfigport.h b/ports/stm32/mpconfigport.h
index 5998cd9085367..174ef22f241c7 100644
--- a/ports/stm32/mpconfigport.h
+++ b/ports/stm32/mpconfigport.h
@@ -165,6 +165,7 @@
 #define MICROPY_PY_UCRYPTOLIB       (MICROPY_PY_USSL)
 #ifndef MICROPY_PY_UBINASCII
 #define MICROPY_PY_UBINASCII        (1)
+#define MICROPY_PY_UBINASCII_CRC32  (1)
 #endif
 #ifndef MICROPY_PY_UOS
 #define MICROPY_PY_UOS              (1)

From cdaec0dcaffbfcb58e190738cf6e9d34541464f0 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 23 Feb 2021 14:33:31 +1100
Subject: [PATCH 0656/3533] tools/pydfu.py: Support DFU files with elements of
 zero size.

Instead of raising a ZeroDivisionError, this tool now just skips any
elements in the DFU file that have zero size.

Signed-off-by: Damien George <damien@micropython.org>
---
 tools/pydfu.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/pydfu.py b/tools/pydfu.py
index 030f56bf852e3..42b4fa2da6feb 100755
--- a/tools/pydfu.py
+++ b/tools/pydfu.py
@@ -521,7 +521,7 @@ def write_elements(elements, mass_erase_used, progress=None):
         data = elem["data"]
         elem_size = size
         elem_addr = addr
-        if progress:
+        if progress and elem_size:
             progress(elem_addr, 0, elem_size)
         while size > 0:
             write_size = size

From 680ce45323248df288ee8ebd055a4caacb3e46f3 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 2 Mar 2021 12:14:54 +1100
Subject: [PATCH 0657/3533] stm32/rfcore: Allow BLE settings to be changed by a
 board.

Two of the defaults have also changed in this commit:

- MICROPY_HW_RFCORE_BLE_LSE_SOURCE changed from 1 to 0, which configures
  the LsSource to be LSE (needed due to errata 2.2.1).

- MICROPY_HW_RFCORE_BLE_VITERBI_MODE changed from 0 to 1, which enables
  Viterbi mode, following all the ST examples.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/mpconfigboard_common.h | 20 ++++++++++++++++
 ports/stm32/rfcore.c               | 38 +++++++++++++++---------------
 2 files changed, 39 insertions(+), 19 deletions(-)

diff --git a/ports/stm32/mpconfigboard_common.h b/ports/stm32/mpconfigboard_common.h
index ed30d17bdcd3b..948897b215717 100644
--- a/ports/stm32/mpconfigboard_common.h
+++ b/ports/stm32/mpconfigboard_common.h
@@ -262,6 +262,26 @@
 #define MICROPY_HW_STM32WB_FLASH_SYNCRONISATION (1)
 #endif
 
+// RF core BLE configuration (a board should define
+// MICROPY_HW_RFCORE_BLE_NUM_GATT_ATTRIBUTES to override all values)
+#ifndef MICROPY_HW_RFCORE_BLE_NUM_GATT_ATTRIBUTES
+#define MICROPY_HW_RFCORE_BLE_NUM_GATT_ATTRIBUTES       (0)
+#define MICROPY_HW_RFCORE_BLE_NUM_GATT_SERVICES         (0)
+#define MICROPY_HW_RFCORE_BLE_ATT_VALUE_ARRAY_SIZE      (0)
+#define MICROPY_HW_RFCORE_BLE_NUM_LINK                  (1)
+#define MICROPY_HW_RFCORE_BLE_DATA_LENGTH_EXTENSION     (1)
+#define MICROPY_HW_RFCORE_BLE_PREPARE_WRITE_LIST_SIZE   (0)
+#define MICROPY_HW_RFCORE_BLE_MBLOCK_COUNT              (0x79)
+#define MICROPY_HW_RFCORE_BLE_MAX_ATT_MTU               (0)
+#define MICROPY_HW_RFCORE_BLE_SLAVE_SCA                 (0)
+#define MICROPY_HW_RFCORE_BLE_MASTER_SCA                (0)
+#define MICROPY_HW_RFCORE_BLE_LSE_SOURCE                (0) // use LSE to clock the rfcore (see errata 2.2.1)
+#define MICROPY_HW_RFCORE_BLE_MAX_CONN_EVENT_LENGTH     (0xffffffff)
+#define MICROPY_HW_RFCORE_BLE_HSE_STARTUP_TIME          (0x148)
+#define MICROPY_HW_RFCORE_BLE_VITERBI_MODE              (1)
+#define MICROPY_HW_RFCORE_BLE_LL_ONLY                   (1) // use LL only, we provide the rest of the BLE stack
+#endif
+
 #else
 #error Unsupported MCU series
 #endif
diff --git a/ports/stm32/rfcore.c b/ports/stm32/rfcore.c
index b11c4f2022733..55fc229dd0c30 100644
--- a/ports/stm32/rfcore.c
+++ b/ports/stm32/rfcore.c
@@ -548,30 +548,30 @@ static const struct {
     uint16_t AttMtu;
     uint16_t SlaveSca;
     uint8_t MasterSca;
-    uint8_t LsSource;               // 0=LSE 1=internal RO
+    uint8_t LsSource;
     uint32_t MaxConnEventLength;
     uint16_t HsStartupTime;
     uint8_t ViterbiEnable;
-    uint8_t LlOnly;                 // 0=LL+Host, 1=LL only
+    uint8_t LlOnly;
     uint8_t HwVersion;
 } ble_init_params = {
-    0,
-    0,
-    0, // NumAttrRecord
-    0, // NumAttrServ
-    0, // AttrValueArrSize
-    1, // NumOfLinks
-    1, // ExtendedPacketLengthEnable
-    0, // PrWriteListSize
-    0x79, // MblockCount
-    0, // AttMtu
-    0, // SlaveSca
-    0, // MasterSca
-    1, // LsSource
-    0xffffffff, // MaxConnEventLength
-    0x148, // HsStartupTime
-    0, // ViterbiEnable
-    1, // LlOnly
+    0, // pBleBufferAddress
+    0, // BleBufferSize
+    MICROPY_HW_RFCORE_BLE_NUM_GATT_ATTRIBUTES,
+    MICROPY_HW_RFCORE_BLE_NUM_GATT_SERVICES,
+    MICROPY_HW_RFCORE_BLE_ATT_VALUE_ARRAY_SIZE,
+    MICROPY_HW_RFCORE_BLE_NUM_LINK,
+    MICROPY_HW_RFCORE_BLE_DATA_LENGTH_EXTENSION,
+    MICROPY_HW_RFCORE_BLE_PREPARE_WRITE_LIST_SIZE,
+    MICROPY_HW_RFCORE_BLE_MBLOCK_COUNT,
+    MICROPY_HW_RFCORE_BLE_MAX_ATT_MTU,
+    MICROPY_HW_RFCORE_BLE_SLAVE_SCA,
+    MICROPY_HW_RFCORE_BLE_MASTER_SCA,
+    MICROPY_HW_RFCORE_BLE_LSE_SOURCE,
+    MICROPY_HW_RFCORE_BLE_MAX_CONN_EVENT_LENGTH,
+    MICROPY_HW_RFCORE_BLE_HSE_STARTUP_TIME,
+    MICROPY_HW_RFCORE_BLE_VITERBI_MODE,
+    MICROPY_HW_RFCORE_BLE_LL_ONLY,
     0, // HwVersion
 };
 

From 59a129f22f096d992496111c498b3ea97e637115 Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Fri, 5 Mar 2021 09:46:14 +1100
Subject: [PATCH 0658/3533] stm32/storage: Prevent attempts to read/write
 invalid block addresses.

A corrupt filesystem may lead to a request for a block which is out of
range of the block device limits.  Return an error instead of passing the
request down to the lower layer.
---
 ports/stm32/storage.c | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/ports/stm32/storage.c b/ports/stm32/storage.c
index 6581860ff3ffb..a71c4a3ea7791 100644
--- a/ports/stm32/storage.c
+++ b/ports/stm32/storage.c
@@ -340,8 +340,12 @@ STATIC mp_obj_t pyb_flash_readblocks(size_t n_args, const mp_obj_t *args) {
     else if (self != &pyb_flash_obj) {
         // Extended block read on a sub-section of the flash storage
         uint32_t offset = mp_obj_get_int(args[3]);
-        block_num += self->start / PYB_FLASH_NATIVE_BLOCK_SIZE;
-        ret = MICROPY_HW_BDEV_READBLOCKS_EXT(bufinfo.buf, block_num, offset, bufinfo.len);
+        if ((block_num * PYB_FLASH_NATIVE_BLOCK_SIZE) >= self->len) {
+            ret = -MP_EFAULT; // Bad address
+        } else {
+            block_num += self->start / PYB_FLASH_NATIVE_BLOCK_SIZE;
+            ret = MICROPY_HW_BDEV_READBLOCKS_EXT(bufinfo.buf, block_num, offset, bufinfo.len);
+        }
     }
     #endif
     return MP_OBJ_NEW_SMALL_INT(ret);
@@ -363,8 +367,12 @@ STATIC mp_obj_t pyb_flash_writeblocks(size_t n_args, const mp_obj_t *args) {
     else if (self != &pyb_flash_obj) {
         // Extended block write on a sub-section of the flash storage
         uint32_t offset = mp_obj_get_int(args[3]);
-        block_num += self->start / PYB_FLASH_NATIVE_BLOCK_SIZE;
-        ret = MICROPY_HW_BDEV_WRITEBLOCKS_EXT(bufinfo.buf, block_num, offset, bufinfo.len);
+        if ((block_num * PYB_FLASH_NATIVE_BLOCK_SIZE) >= self->len) {
+            ret = -MP_EFAULT; // Bad address
+        } else {
+            block_num += self->start / PYB_FLASH_NATIVE_BLOCK_SIZE;
+            ret = MICROPY_HW_BDEV_WRITEBLOCKS_EXT(bufinfo.buf, block_num, offset, bufinfo.len);
+        }
     }
     #endif
     return MP_OBJ_NEW_SMALL_INT(ret);

From 35c602d3b8e1ee2d06715c75fa0b4ca7a353372e Mon Sep 17 00:00:00 2001
From: Herwin Grobben <h.grobben@aemics.nl>
Date: Fri, 5 Mar 2021 10:05:19 +0100
Subject: [PATCH 0659/3533] stm32/make-stmconst.py: Allow "[]" chars when
 parsing source comments.

For STM32WB MCUs, EXTI offset addresses were not parsed due to the
appearance of "[31:0]" in a comment in the .h file.
---
 ports/stm32/make-stmconst.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/stm32/make-stmconst.py b/ports/stm32/make-stmconst.py
index ac5c56f5c79f5..602bdc6c192d7 100644
--- a/ports/stm32/make-stmconst.py
+++ b/ports/stm32/make-stmconst.py
@@ -46,7 +46,7 @@ def __init__(self, line):
 
 class Lexer:
     re_io_reg = r"__IO uint(?P<bits>8|16|32)_t +(?P<reg>[A-Z0-9]+)"
-    re_comment = r"(?P<comment>[A-Za-z0-9 \-/_()&:]+)"
+    re_comment = r"(?P<comment>[A-Za-z0-9 \-/_()&:\[\]]+)"
     re_addr_offset = r"Address offset: (?P<offset>0x[0-9A-Z]{2,3})"
     regexs = (
         (

From 85ea4ac0e56faca680aa03c41eb4009464401f07 Mon Sep 17 00:00:00 2001
From: Braiden Kindt <braiden@kindt.dev>
Date: Sun, 14 Feb 2021 23:42:57 -0500
Subject: [PATCH 0660/3533] stm32/main: Fix passing state.reset_mode to
 init_flash_fs.

state.reset_mode is updated by `MICROPY_BOARD_BEFORE_SOFT_RESET_LOOP` but
not passed to `init_flash_fs`, and so factory reset is not executed on
boards that do not have a bootloader.  This bug was introduced by
4c3976bbcaf58266fdcaab264fee5b7a94a682e5

Fixes #6903.
---
 ports/stm32/main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/stm32/main.c b/ports/stm32/main.c
index 38710e2651fb3..bdf7328f68e43 100644
--- a/ports/stm32/main.c
+++ b/ports/stm32/main.c
@@ -531,7 +531,7 @@ void stm32_main(uint32_t reset_mode) {
     // Create it if needed, mount in on /flash, and set it as current dir.
     bool mounted_flash = false;
     #if MICROPY_HW_FLASH_MOUNT_AT_BOOT
-    mounted_flash = init_flash_fs(reset_mode);
+    mounted_flash = init_flash_fs(state.reset_mode);
     #endif
 
     bool mounted_sdcard = false;

From 0facd891e7b4e226e7a905309f917dc271c1860b Mon Sep 17 00:00:00 2001
From: Peter Hinch <peterhinch@users.noreply.github.com>
Date: Sun, 27 Sep 2020 08:42:52 +0100
Subject: [PATCH 0661/3533] stm32/powerctrl: Save and restore EWUP state when
 configuring standby.

This allows the user to enable wake-up sources using the EWUP bits, on F7
MCUs.

Disabling the wake-up sources while clearing the wake-up flags follows the
reference manual and ST examples.
---
 ports/stm32/powerctrl.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ports/stm32/powerctrl.c b/ports/stm32/powerctrl.c
index bf8be647f4d76..a579713b6f9bf 100644
--- a/ports/stm32/powerctrl.c
+++ b/ports/stm32/powerctrl.c
@@ -712,10 +712,14 @@ void powerctrl_enter_standby_mode(void) {
     RTC->ISR &= ~ISR_BITS;
 
     #if defined(STM32F7)
+    // Save EWUP state
+    uint32_t csr2_ewup = PWR->CSR2 & (PWR_CSR2_EWUP6 | PWR_CSR2_EWUP5 | PWR_CSR2_EWUP4 | PWR_CSR2_EWUP3 | PWR_CSR2_EWUP2 | PWR_CSR2_EWUP1);
     // disable wake-up flags
     PWR->CSR2 &= ~(PWR_CSR2_EWUP6 | PWR_CSR2_EWUP5 | PWR_CSR2_EWUP4 | PWR_CSR2_EWUP3 | PWR_CSR2_EWUP2 | PWR_CSR2_EWUP1);
     // clear global wake-up flag
     PWR->CR2 |= PWR_CR2_CWUPF6 | PWR_CR2_CWUPF5 | PWR_CR2_CWUPF4 | PWR_CR2_CWUPF3 | PWR_CR2_CWUPF2 | PWR_CR2_CWUPF1;
+    // Restore EWUP state
+    PWR->CSR2 |= csr2_ewup;
     #elif defined(STM32H7)
     EXTI_D1->PR1 = 0x3fffff;
     PWR->WKUPCR |= PWR_WAKEUP_FLAG1 | PWR_WAKEUP_FLAG2 | PWR_WAKEUP_FLAG3 | PWR_WAKEUP_FLAG4 | PWR_WAKEUP_FLAG5 | PWR_WAKEUP_FLAG6;

From 79c186f5c962b514cde21415d7a262cfdbddbd97 Mon Sep 17 00:00:00 2001
From: Reinhard Feger <47209718+rf-eng@users.noreply.github.com>
Date: Sat, 22 Aug 2020 18:48:21 +0200
Subject: [PATCH 0662/3533] stm32/spi: Fix baudrate calculation for H7 series.

Fixes issue #6342.
---
 ports/stm32/spi.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ports/stm32/spi.c b/ports/stm32/spi.c
index 07374d7a38eef..f8ab791898d3f 100644
--- a/ports/stm32/spi.c
+++ b/ports/stm32/spi.c
@@ -633,7 +633,11 @@ void spi_print(const mp_print_t *print, const spi_t *spi_obj, bool legacy) {
     if (spi->State != HAL_SPI_STATE_RESET) {
         if (spi->Init.Mode == SPI_MODE_MASTER) {
             // compute baudrate
+            #if defined(STM32H7)
+            uint log_prescaler = (spi->Init.BaudRatePrescaler >> 28) + 1;
+            #else
             uint log_prescaler = (spi->Init.BaudRatePrescaler >> 3) + 1;
+            #endif
             uint baudrate = spi_get_source_freq(spi) >> log_prescaler;
             if (legacy) {
                 mp_printf(print, ", SPI.MASTER");

From c33c749f64fc664e46529885d84e499ea2c3d461 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 11 Mar 2021 09:04:36 +1100
Subject: [PATCH 0663/3533] stm32/boardctrl: Add MICROPY_BOARD_STARTUP hook.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/boardctrl.h | 4 ++++
 ports/stm32/main.c      | 5 +++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ports/stm32/boardctrl.h b/ports/stm32/boardctrl.h
index 6f79dfb890707..f1cbc3b955b3c 100644
--- a/ports/stm32/boardctrl.h
+++ b/ports/stm32/boardctrl.h
@@ -28,6 +28,10 @@
 
 #include "py/mpconfig.h"
 
+#ifndef MICROPY_BOARD_STARTUP
+#define MICROPY_BOARD_STARTUP powerctrl_check_enter_bootloader
+#endif
+
 #ifndef MICROPY_BOARD_EARLY_INIT
 #define MICROPY_BOARD_EARLY_INIT()
 #endif
diff --git a/ports/stm32/main.c b/ports/stm32/main.c
index bdf7328f68e43..888b20513c6f9 100644
--- a/ports/stm32/main.c
+++ b/ports/stm32/main.c
@@ -313,8 +313,9 @@ void stm32_main(uint32_t reset_mode) {
     // Enable 8-byte stack alignment for IRQ handlers, in accord with EABI
     SCB->CCR |= SCB_CCR_STKALIGN_Msk;
 
-    // Check if bootloader should be entered instead of main application
-    powerctrl_check_enter_bootloader();
+    // Hook for a board to run code at start up, for example check if a
+    // bootloader should be entered instead of the main application.
+    MICROPY_BOARD_STARTUP();
 
     // Enable caches and prefetch buffers
 

From 7d73b9ff9975261bd2ff3544b09e9ec494775435 Mon Sep 17 00:00:00 2001
From: Mirko Vogt <mirko.vogt@sensorberg.com>
Date: Tue, 9 Feb 2021 18:28:36 +0000
Subject: [PATCH 0664/3533] lib/mbedtls: Switch to currently latest commit of
 LTS branch v2.16.

From a version numbering point of view this is a downgrade (2.17.0 ->
2.16.x).  However the latest commit for version 2.17.0 is from March 2019
and no further minor release happened after 2.17.0.  This version is EOL.
2.16.x though is still actively maintained as a long term release, hence
security and stability fixes are still being backported, including
compatibility with upcoming compiler releases.
---
 lib/mbedtls | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/mbedtls b/lib/mbedtls
index 3f8d78411a26e..1b6a24f759cef 160000
--- a/lib/mbedtls
+++ b/lib/mbedtls
@@ -1 +1 @@
-Subproject commit 3f8d78411a26e833db18d9fbde0e2f0baeda87f0
+Subproject commit 1b6a24f759cefbb4a69ae9476885d7f42a847e3d

From 2d5cece5ac3fc467055dd3e27378ad497adcee00 Mon Sep 17 00:00:00 2001
From: Yonatan Goldschmidt <yon.goldschmidt@gmail.com>
Date: Thu, 18 Feb 2021 01:28:42 +0200
Subject: [PATCH 0665/3533] py/nlr: Implement NLR for AArch64.

---
 py/nlr.h        |  4 +++
 py/nlraarch64.c | 74 +++++++++++++++++++++++++++++++++++++++++++++++++
 py/py.mk        |  1 +
 3 files changed, 79 insertions(+)
 create mode 100644 py/nlraarch64.c

diff --git a/py/nlr.h b/py/nlr.h
index f9fbf56e54e60..9f12ede9cd3ac 100644
--- a/py/nlr.h
+++ b/py/nlr.h
@@ -39,6 +39,7 @@
 #define MICROPY_NLR_NUM_REGS_X64_WIN        (10)
 #define MICROPY_NLR_NUM_REGS_ARM_THUMB      (10)
 #define MICROPY_NLR_NUM_REGS_ARM_THUMB_FP   (10 + 6)
+#define MICROPY_NLR_NUM_REGS_AARCH64        (13)
 #define MICROPY_NLR_NUM_REGS_XTENSA         (10)
 #define MICROPY_NLR_NUM_REGS_XTENSAWIN      (17)
 
@@ -72,6 +73,9 @@
         // so only save/restore those as an optimisation.
         #define MICROPY_NLR_NUM_REGS (MICROPY_NLR_NUM_REGS_ARM_THUMB_FP)
     #endif
+#elif defined(__aarch64__)
+    #define MICROPY_NLR_AARCH64 (1)
+    #define MICROPY_NLR_NUM_REGS (MICROPY_NLR_NUM_REGS_AARCH64)
 #elif defined(__xtensa__)
     #define MICROPY_NLR_XTENSA (1)
     #define MICROPY_NLR_NUM_REGS (MICROPY_NLR_NUM_REGS_XTENSA)
diff --git a/py/nlraarch64.c b/py/nlraarch64.c
new file mode 100644
index 0000000000000..2df0dc9c85021
--- /dev/null
+++ b/py/nlraarch64.c
@@ -0,0 +1,74 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Yonatan Goldschmidt
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "py/mpstate.h" // needed for NLR defs
+
+#if MICROPY_NLR_AARCH64
+
+// AArch64 callee-saved registers are x19-x29.
+// https://en.wikipedia.org/wiki/Calling_convention#ARM_(A64)
+
+// Implemented purely as inline assembly; inside a function, we have to deal with undoing the prologue, restoring
+// SP and LR. This way, we don't.
+__asm(
+    "nlr_push:               \n"
+    ".global nlr_push        \n"
+    "mov x9, sp              \n"
+    "stp lr,  x9,  [x0,  #16]\n" // 16 == offsetof(nlr_buf_t, regs)
+    "stp x19, x20, [x0,  #32]\n"
+    "stp x21, x22, [x0,  #48]\n"
+    "stp x23, x24, [x0,  #64]\n"
+    "stp x25, x26, [x0,  #80]\n"
+    "stp x27, x28, [x0,  #96]\n"
+    "str x29,      [x0, #112]\n"
+    "b nlr_push_tail         \n" // do the rest in C
+    );
+
+NORETURN void nlr_jump(void *val) {
+    MP_NLR_JUMP_HEAD(val, top)
+
+    MP_STATIC_ASSERT(offsetof(nlr_buf_t, regs) == 16); // asm assumes it
+
+    __asm volatile (
+        "ldr x29,      [%0, #112]\n"
+        "ldp x27, x28, [%0,  #96]\n"
+        "ldp x25, x26, [%0,  #80]\n"
+        "ldp x23, x24, [%0,  #64]\n"
+        "ldp x21, x22, [%0,  #48]\n"
+        "ldp x19, x20, [%0,  #32]\n"
+        "ldp lr,  x9,  [%0,  #16]\n" // 16 == offsetof(nlr_buf_t, regs)
+        "mov sp, x9              \n"
+        "mov x0, #1              \n"  // non-local return
+        "ret                     \n"
+        :
+        : "r" (top)
+        :
+        );
+
+    MP_UNREACHABLE
+}
+
+#endif // MICROPY_NLR_AARCH64
diff --git a/py/py.mk b/py/py.mk
index bac38f07412f9..59abc8f50373b 100644
--- a/py/py.mk
+++ b/py/py.mk
@@ -57,6 +57,7 @@ PY_CORE_O_BASENAME = $(addprefix py/,\
 	nlrx86.o \
 	nlrx64.o \
 	nlrthumb.o \
+	nlraarch64.o \
 	nlrpowerpc.o \
 	nlrxtensa.o \
 	nlrsetjmp.o \

From e196cb762e5a946bee0404b043acd673178c162d Mon Sep 17 00:00:00 2001
From: Yonatan Goldschmidt <yon.goldschmidt@gmail.com>
Date: Thu, 18 Feb 2021 01:28:09 +0200
Subject: [PATCH 0666/3533] py/nlrx64: Fix typo in comment.

---
 py/nlrx64.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/py/nlrx64.c b/py/nlrx64.c
index eb39dadce72c1..f5d02afbdb979 100644
--- a/py/nlrx64.c
+++ b/py/nlrx64.c
@@ -89,7 +89,7 @@ NORETURN void nlr_jump(void *val) {
         "movq   %0, %%rcx           \n" // %rcx points to nlr_buf
         #if MICROPY_NLR_OS_WINDOWS
         "movq   88(%%rcx), %%rsi    \n" // load saved %rsi
-        "movq   80(%%rcx), %%rdi    \n" // load saved %rdr
+        "movq   80(%%rcx), %%rdi    \n" // load saved %rdi
         #endif
         "movq   72(%%rcx), %%r15    \n" // load saved %r15
         "movq   64(%%rcx), %%r14    \n" // load saved %r14

From 098ac11bb0cb912909af801015ac07bd2bf01ce7 Mon Sep 17 00:00:00 2001
From: Yonatan Goldschmidt <yon.goldschmidt@gmail.com>
Date: Sun, 21 Feb 2021 02:05:40 +0200
Subject: [PATCH 0667/3533] lib/utils/gchelper_generic: Implement AArch64
 support.

---
 lib/utils/gchelper.h         |  2 ++
 lib/utils/gchelper_generic.c | 27 +++++++++++++++++++++++++++
 2 files changed, 29 insertions(+)

diff --git a/lib/utils/gchelper.h b/lib/utils/gchelper.h
index 4b6ead6ba650f..645ee837f5146 100644
--- a/lib/utils/gchelper.h
+++ b/lib/utils/gchelper.h
@@ -39,6 +39,8 @@ typedef uintptr_t gc_helper_regs_t[6];
 typedef uintptr_t gc_helper_regs_t[4];
 #elif defined(__thumb2__) || defined(__thumb__) || defined(__arm__)
 typedef uintptr_t gc_helper_regs_t[10];
+#elif defined(__aarch64__)
+typedef uintptr_t gc_helper_regs_t[11]; // x19-x29
 #endif
 
 #endif
diff --git a/lib/utils/gchelper_generic.c b/lib/utils/gchelper_generic.c
index 9750e8b0c837a..3e7e33ab18ae0 100644
--- a/lib/utils/gchelper_generic.c
+++ b/lib/utils/gchelper_generic.c
@@ -123,6 +123,33 @@ STATIC void gc_helper_get_regs(gc_helper_regs_t arr) {
     arr[9] = r13;
 }
 
+#elif defined(__aarch64__)
+
+STATIC void gc_helper_get_regs(gc_helper_regs_t arr) {
+    const register long x19 asm ("x19");
+    const register long x20 asm ("x20");
+    const register long x21 asm ("x21");
+    const register long x22 asm ("x22");
+    const register long x23 asm ("x23");
+    const register long x24 asm ("x24");
+    const register long x25 asm ("x25");
+    const register long x26 asm ("x26");
+    const register long x27 asm ("x27");
+    const register long x28 asm ("x28");
+    const register long x29 asm ("x29");
+    arr[0] = x19;
+    arr[1] = x20;
+    arr[2] = x21;
+    arr[3] = x22;
+    arr[4] = x23;
+    arr[5] = x24;
+    arr[6] = x25;
+    arr[7] = x26;
+    arr[8] = x27;
+    arr[9] = x28;
+    arr[10] = x29;
+}
+
 #else
 
 #error "Architecture not supported for gc_helper_get_regs. Set MICROPY_GCREGS_SETJMP to use the fallback implementation."

From 8785acac22a25d376d11c7dda5d0556432818ac2 Mon Sep 17 00:00:00 2001
From: Mike Causer <mcauser@gmail.com>
Date: Fri, 26 Feb 2021 09:36:48 +1100
Subject: [PATCH 0668/3533] esp32/Makefile: Specify port and baud on
 erase_flash command.

---
 ports/esp32/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/esp32/Makefile b/ports/esp32/Makefile
index 1249795993614..9a3a15d6ee6c8 100644
--- a/ports/esp32/Makefile
+++ b/ports/esp32/Makefile
@@ -37,7 +37,7 @@ deploy:
 	idf.py $(IDFPY_FLAGS) -p $(PORT) -b $(BAUD) flash
 
 erase:
-	idf.py $(IDFPY_FLAGS) erase_flash
+	idf.py $(IDFPY_FLAGS) -p $(PORT) -b $(BAUD) erase_flash
 
 submodules:
 	git submodule update --init $(addprefix ../../,$(GIT_SUBMODULES))

From 23ce25a7c3175e2251af9af34a6c5eafa871bfcd Mon Sep 17 00:00:00 2001
From: svetelna <zu.miklankova@gmail.com>
Date: Mon, 7 Dec 2020 13:00:09 +0100
Subject: [PATCH 0669/3533] mimxrt/boards: Add MIMXRT1050_EVK board, based on
 MIMXRT1060_EVK.

---
 .../evkmimxrt1050_flexspi_nor_config.h        | 267 ++++++++++++++++++
 .../boards/MIMXRT1050_EVK/flash_config.c      |  56 ++++
 .../boards/MIMXRT1050_EVK/mpconfigboard.h     |   9 +
 .../boards/MIMXRT1050_EVK/mpconfigboard.mk    |   7 +
 ports/mimxrt/boards/MIMXRT1050_EVK/pins.c     |  33 +++
 ports/mimxrt/boards/MIMXRT1050_EVK/pins.h     |  30 ++
 ports/mimxrt/boards/MIMXRT1052.ld             |   7 +
 7 files changed, 409 insertions(+)
 create mode 100644 ports/mimxrt/boards/MIMXRT1050_EVK/evkmimxrt1050_flexspi_nor_config.h
 create mode 100644 ports/mimxrt/boards/MIMXRT1050_EVK/flash_config.c
 create mode 100644 ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.h
 create mode 100644 ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.mk
 create mode 100644 ports/mimxrt/boards/MIMXRT1050_EVK/pins.c
 create mode 100644 ports/mimxrt/boards/MIMXRT1050_EVK/pins.h
 create mode 100644 ports/mimxrt/boards/MIMXRT1052.ld

diff --git a/ports/mimxrt/boards/MIMXRT1050_EVK/evkmimxrt1050_flexspi_nor_config.h b/ports/mimxrt/boards/MIMXRT1050_EVK/evkmimxrt1050_flexspi_nor_config.h
new file mode 100644
index 0000000000000..d8e842452e0cc
--- /dev/null
+++ b/ports/mimxrt/boards/MIMXRT1050_EVK/evkmimxrt1050_flexspi_nor_config.h
@@ -0,0 +1,267 @@
+/*
+ * Copyright 2018 NXP
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#ifndef __EVKMIMXRT1050_FLEXSPI_NOR_CONFIG__
+#define __EVKMIMXRT1050_FLEXSPI_NOR_CONFIG__
+
+#include <stdint.h>
+#include <stdbool.h>
+#include "fsl_common.h"
+
+/*! @name Driver version */
+/*@{*/
+/*! @brief XIP_BOARD driver version 2.0.0. */
+#define FSL_XIP_BOARD_DRIVER_VERSION (MAKE_VERSION(2, 0, 0))
+/*@}*/
+
+/* FLEXSPI memory config block related defintions */
+#define FLEXSPI_CFG_BLK_TAG     (0x42464346UL) // ascii "FCFB" Big Endian
+#define FLEXSPI_CFG_BLK_VERSION (0x56010400UL) // V1.4.0
+#define FLEXSPI_CFG_BLK_SIZE    (512)
+
+/* FLEXSPI Feature related definitions */
+#define FLEXSPI_FEATURE_HAS_PARALLEL_MODE 1
+
+/* Lookup table related defintions */
+#define CMD_INDEX_READ        0
+#define CMD_INDEX_READSTATUS  1
+#define CMD_INDEX_WRITEENABLE 2
+#define CMD_INDEX_WRITE       4
+
+#define CMD_LUT_SEQ_IDX_READ        0
+#define CMD_LUT_SEQ_IDX_READSTATUS  1
+#define CMD_LUT_SEQ_IDX_WRITEENABLE 3
+#define CMD_LUT_SEQ_IDX_WRITE       9
+
+#define CMD_SDR        0x01
+#define CMD_DDR        0x21
+#define RADDR_SDR      0x02
+#define RADDR_DDR      0x22
+#define CADDR_SDR      0x03
+#define CADDR_DDR      0x23
+#define MODE1_SDR      0x04
+#define MODE1_DDR      0x24
+#define MODE2_SDR      0x05
+#define MODE2_DDR      0x25
+#define MODE4_SDR      0x06
+#define MODE4_DDR      0x26
+#define MODE8_SDR      0x07
+#define MODE8_DDR      0x27
+#define WRITE_SDR      0x08
+#define WRITE_DDR      0x28
+#define READ_SDR       0x09
+#define READ_DDR       0x29
+#define LEARN_SDR      0x0A
+#define LEARN_DDR      0x2A
+#define DATSZ_SDR      0x0B
+#define DATSZ_DDR      0x2B
+#define DUMMY_SDR      0x0C
+#define DUMMY_DDR      0x2C
+#define DUMMY_RWDS_SDR 0x0D
+#define DUMMY_RWDS_DDR 0x2D
+#define JMP_ON_CS      0x1F
+#define STOP           0
+
+#define FLEXSPI_1PAD 0
+#define FLEXSPI_2PAD 1
+#define FLEXSPI_4PAD 2
+#define FLEXSPI_8PAD 3
+
+#define FLEXSPI_LUT_SEQ(cmd0, pad0, op0, cmd1, pad1, op1)                                                              \
+    (FLEXSPI_LUT_OPERAND0(op0) | FLEXSPI_LUT_NUM_PADS0(pad0) | FLEXSPI_LUT_OPCODE0(cmd0) | FLEXSPI_LUT_OPERAND1(op1) | \
+     FLEXSPI_LUT_NUM_PADS1(pad1) | FLEXSPI_LUT_OPCODE1(cmd1))
+
+//!@brief Definitions for FlexSPI Serial Clock Frequency
+typedef enum _FlexSpiSerialClockFreq
+{
+    kFlexSpiSerialClk_30MHz  = 1,
+    kFlexSpiSerialClk_50MHz  = 2,
+    kFlexSpiSerialClk_60MHz  = 3,
+    kFlexSpiSerialClk_75MHz  = 4,
+    kFlexSpiSerialClk_80MHz  = 5,
+    kFlexSpiSerialClk_100MHz = 6,
+    kFlexSpiSerialClk_133MHz = 7,
+    kFlexSpiSerialClk_166MHz = 8,
+} flexspi_serial_clk_freq_t;
+
+//!@brief FlexSPI clock configuration type
+enum
+{
+    kFlexSpiClk_SDR, //!< Clock configure for SDR mode
+    kFlexSpiClk_DDR, //!< Clock configurat for DDR mode
+};
+
+//!@brief FlexSPI Read Sample Clock Source definition
+typedef enum _FlashReadSampleClkSource
+{
+    kFlexSPIReadSampleClk_LoopbackInternally      = 0,
+    kFlexSPIReadSampleClk_LoopbackFromDqsPad      = 1,
+    kFlexSPIReadSampleClk_LoopbackFromSckPad      = 2,
+    kFlexSPIReadSampleClk_ExternalInputFromDqsPad = 3,
+} flexspi_read_sample_clk_t;
+
+//!@brief Misc feature bit definitions
+enum
+{
+    kFlexSpiMiscOffset_DiffClkEnable            = 0, //!< Bit for Differential clock enable
+    kFlexSpiMiscOffset_Ck2Enable                = 1, //!< Bit for CK2 enable
+    kFlexSpiMiscOffset_ParallelEnable           = 2, //!< Bit for Parallel mode enable
+    kFlexSpiMiscOffset_WordAddressableEnable    = 3, //!< Bit for Word Addressable enable
+    kFlexSpiMiscOffset_SafeConfigFreqEnable     = 4, //!< Bit for Safe Configuration Frequency enable
+    kFlexSpiMiscOffset_PadSettingOverrideEnable = 5, //!< Bit for Pad setting override enable
+    kFlexSpiMiscOffset_DdrModeEnable            = 6, //!< Bit for DDR clock confiuration indication.
+};
+
+//!@brief Flash Type Definition
+enum
+{
+    kFlexSpiDeviceType_SerialNOR    = 1,    //!< Flash devices are Serial NOR
+    kFlexSpiDeviceType_SerialNAND   = 2,    //!< Flash devices are Serial NAND
+    kFlexSpiDeviceType_SerialRAM    = 3,    //!< Flash devices are Serial RAM/HyperFLASH
+    kFlexSpiDeviceType_MCP_NOR_NAND = 0x12, //!< Flash device is MCP device, A1 is Serial NOR, A2 is Serial NAND
+    kFlexSpiDeviceType_MCP_NOR_RAM  = 0x13, //!< Flash deivce is MCP device, A1 is Serial NOR, A2 is Serial RAMs
+};
+
+//!@brief Flash Pad Definitions
+enum
+{
+    kSerialFlash_1Pad  = 1,
+    kSerialFlash_2Pads = 2,
+    kSerialFlash_4Pads = 4,
+    kSerialFlash_8Pads = 8,
+};
+
+//!@brief FlexSPI LUT Sequence structure
+typedef struct _lut_sequence
+{
+    uint8_t seqNum; //!< Sequence Number, valid number: 1-16
+    uint8_t seqId;  //!< Sequence Index, valid number: 0-15
+    uint16_t reserved;
+} flexspi_lut_seq_t;
+
+//!@brief Flash Configuration Command Type
+enum
+{
+    kDeviceConfigCmdType_Generic,    //!< Generic command, for example: configure dummy cycles, drive strength, etc
+    kDeviceConfigCmdType_QuadEnable, //!< Quad Enable command
+    kDeviceConfigCmdType_Spi2Xpi,    //!< Switch from SPI to DPI/QPI/OPI mode
+    kDeviceConfigCmdType_Xpi2Spi,    //!< Switch from DPI/QPI/OPI to SPI mode
+    kDeviceConfigCmdType_Spi2NoCmd,  //!< Switch to 0-4-4/0-8-8 mode
+    kDeviceConfigCmdType_Reset,      //!< Reset device command
+};
+
+//!@brief FlexSPI Memory Configuration Block
+typedef struct _FlexSPIConfig
+{
+    uint32_t tag;               //!< [0x000-0x003] Tag, fixed value 0x42464346UL
+    uint32_t version;           //!< [0x004-0x007] Version,[31:24] -'V', [23:16] - Major, [15:8] - Minor, [7:0] - bugfix
+    uint32_t reserved0;         //!< [0x008-0x00b] Reserved for future use
+    uint8_t readSampleClkSrc;   //!< [0x00c-0x00c] Read Sample Clock Source, valid value: 0/1/3
+    uint8_t csHoldTime;         //!< [0x00d-0x00d] CS hold time, default value: 3
+    uint8_t csSetupTime;        //!< [0x00e-0x00e] CS setup time, default value: 3
+    uint8_t columnAddressWidth; //!< [0x00f-0x00f] Column Address with, for HyperBus protocol, it is fixed to 3, For
+    //! Serial NAND, need to refer to datasheet
+    uint8_t deviceModeCfgEnable; //!< [0x010-0x010] Device Mode Configure enable flag, 1 - Enable, 0 - Disable
+    uint8_t deviceModeType; //!< [0x011-0x011] Specify the configuration command type:Quad Enable, DPI/QPI/OPI switch,
+    //! Generic configuration, etc.
+    uint16_t waitTimeCfgCommands; //!< [0x012-0x013] Wait time for all configuration commands, unit: 100us, Used for
+    //! DPI/QPI/OPI switch or reset command
+    flexspi_lut_seq_t deviceModeSeq; //!< [0x014-0x017] Device mode sequence info, [7:0] - LUT sequence id, [15:8] - LUt
+    //! sequence number, [31:16] Reserved
+    uint32_t deviceModeArg;    //!< [0x018-0x01b] Argument/Parameter for device configuration
+    uint8_t configCmdEnable;   //!< [0x01c-0x01c] Configure command Enable Flag, 1 - Enable, 0 - Disable
+    uint8_t configModeType[3]; //!< [0x01d-0x01f] Configure Mode Type, similar as deviceModeTpe
+    flexspi_lut_seq_t
+        configCmdSeqs[3]; //!< [0x020-0x02b] Sequence info for Device Configuration command, similar as deviceModeSeq
+    uint32_t reserved1;   //!< [0x02c-0x02f] Reserved for future use
+    uint32_t configCmdArgs[3];     //!< [0x030-0x03b] Arguments/Parameters for device Configuration commands
+    uint32_t reserved2;            //!< [0x03c-0x03f] Reserved for future use
+    uint32_t controllerMiscOption; //!< [0x040-0x043] Controller Misc Options, see Misc feature bit definitions for more
+    //! details
+    uint8_t deviceType;    //!< [0x044-0x044] Device Type:  See Flash Type Definition for more details
+    uint8_t sflashPadType; //!< [0x045-0x045] Serial Flash Pad Type: 1 - Single, 2 - Dual, 4 - Quad, 8 - Octal
+    uint8_t serialClkFreq; //!< [0x046-0x046] Serial Flash Frequencey, device specific definitions, See System Boot
+    //! Chapter for more details
+    uint8_t lutCustomSeqEnable; //!< [0x047-0x047] LUT customization Enable, it is required if the program/erase cannot
+    //! be done using 1 LUT sequence, currently, only applicable to HyperFLASH
+    uint32_t reserved3[2];           //!< [0x048-0x04f] Reserved for future use
+    uint32_t sflashA1Size;           //!< [0x050-0x053] Size of Flash connected to A1
+    uint32_t sflashA2Size;           //!< [0x054-0x057] Size of Flash connected to A2
+    uint32_t sflashB1Size;           //!< [0x058-0x05b] Size of Flash connected to B1
+    uint32_t sflashB2Size;           //!< [0x05c-0x05f] Size of Flash connected to B2
+    uint32_t csPadSettingOverride;   //!< [0x060-0x063] CS pad setting override value
+    uint32_t sclkPadSettingOverride; //!< [0x064-0x067] SCK pad setting override value
+    uint32_t dataPadSettingOverride; //!< [0x068-0x06b] data pad setting override value
+    uint32_t dqsPadSettingOverride;  //!< [0x06c-0x06f] DQS pad setting override value
+    uint32_t timeoutInMs;            //!< [0x070-0x073] Timeout threshold for read status command
+    uint32_t commandInterval;        //!< [0x074-0x077] CS deselect interval between two commands
+    uint16_t dataValidTime[2]; //!< [0x078-0x07b] CLK edge to data valid time for PORT A and PORT B, in terms of 0.1ns
+    uint16_t busyOffset;       //!< [0x07c-0x07d] Busy offset, valid value: 0-31
+    uint16_t busyBitPolarity;  //!< [0x07e-0x07f] Busy flag polarity, 0 - busy flag is 1 when flash device is busy, 1 -
+    //! busy flag is 0 when flash device is busy
+    uint32_t lookupTable[64];           //!< [0x080-0x17f] Lookup table holds Flash command sequences
+    flexspi_lut_seq_t lutCustomSeq[12]; //!< [0x180-0x1af] Customizable LUT Sequences
+    uint32_t reserved4[4];              //!< [0x1b0-0x1bf] Reserved for future use
+} flexspi_mem_config_t;
+
+/*  */
+#define NOR_CMD_INDEX_READ        CMD_INDEX_READ        //!< 0
+#define NOR_CMD_INDEX_READSTATUS  CMD_INDEX_READSTATUS  //!< 1
+#define NOR_CMD_INDEX_WRITEENABLE CMD_INDEX_WRITEENABLE //!< 2
+#define NOR_CMD_INDEX_ERASESECTOR 3                     //!< 3
+#define NOR_CMD_INDEX_PAGEPROGRAM CMD_INDEX_WRITE       //!< 4
+#define NOR_CMD_INDEX_CHIPERASE   5                     //!< 5
+#define NOR_CMD_INDEX_DUMMY       6                     //!< 6
+#define NOR_CMD_INDEX_ERASEBLOCK  7                     //!< 7
+
+#define NOR_CMD_LUT_SEQ_IDX_READ CMD_LUT_SEQ_IDX_READ //!< 0  READ LUT sequence id in lookupTable stored in config block
+#define NOR_CMD_LUT_SEQ_IDX_READSTATUS \
+    CMD_LUT_SEQ_IDX_READSTATUS //!< 1  Read Status LUT sequence id in lookupTable stored in config block
+#define NOR_CMD_LUT_SEQ_IDX_READSTATUS_XPI \
+    2 //!< 2  Read status DPI/QPI/OPI sequence id in lookupTable stored in config block
+#define NOR_CMD_LUT_SEQ_IDX_WRITEENABLE \
+    CMD_LUT_SEQ_IDX_WRITEENABLE //!< 3  Write Enable sequence id in lookupTable stored in config block
+#define NOR_CMD_LUT_SEQ_IDX_WRITEENABLE_XPI \
+    4 //!< 4  Write Enable DPI/QPI/OPI sequence id in lookupTable stored in config block
+#define NOR_CMD_LUT_SEQ_IDX_ERASESECTOR 5 //!< 5  Erase Sector sequence id in lookupTable stored in config block
+#define NOR_CMD_LUT_SEQ_IDX_ERASEBLOCK  8 //!< 8 Erase Block sequence id in lookupTable stored in config block
+#define NOR_CMD_LUT_SEQ_IDX_PAGEPROGRAM \
+    CMD_LUT_SEQ_IDX_WRITE                //!< 9  Program sequence id in lookupTable stored in config block
+#define NOR_CMD_LUT_SEQ_IDX_CHIPERASE 11 //!< 11 Chip Erase sequence in lookupTable id stored in config block
+#define NOR_CMD_LUT_SEQ_IDX_READ_SFDP 13 //!< 13 Read SFDP sequence in lookupTable id stored in config block
+#define NOR_CMD_LUT_SEQ_IDX_RESTORE_NOCMD \
+    14 //!< 14 Restore 0-4-4/0-8-8 mode sequence id in lookupTable stored in config block
+#define NOR_CMD_LUT_SEQ_IDX_EXIT_NOCMD \
+    15 //!< 15 Exit 0-4-4/0-8-8 mode sequence id in lookupTable stored in config blobk
+
+/*
+ *  Serial NOR configuration block
+ */
+typedef struct _flexspi_nor_config
+{
+    flexspi_mem_config_t memConfig; //!< Common memory configuration info via FlexSPI
+    uint32_t pageSize;              //!< Page size of Serial NOR
+    uint32_t sectorSize;            //!< Sector size of Serial NOR
+    uint8_t ipcmdSerialClkFreq;     //!< Clock frequency for IP command
+    uint8_t isUniformBlockSize;     //!< Sector/Block size is the same
+    uint8_t reserved0[2];           //!< Reserved for future use
+    uint8_t serialNorType;          //!< Serial NOR Flash type: 0/1/2/3
+    uint8_t needExitNoCmdMode;      //!< Need to exit NoCmd mode before other IP command
+    uint8_t halfClkForNonReadCmd;   //!< Half the Serial Clock for non-read command: true/false
+    uint8_t needRestoreNoCmdMode;   //!< Need to Restore NoCmd mode after IP commmand execution
+    uint32_t blockSize;             //!< Block size
+    uint32_t reserve2[11];          //!< Reserved for future use
+} flexspi_nor_config_t;
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* __EVKMIMXRT1050_FLEXSPI_NOR_CONFIG__ */
diff --git a/ports/mimxrt/boards/MIMXRT1050_EVK/flash_config.c b/ports/mimxrt/boards/MIMXRT1050_EVK/flash_config.c
new file mode 100644
index 0000000000000..8203f4811ace1
--- /dev/null
+++ b/ports/mimxrt/boards/MIMXRT1050_EVK/flash_config.c
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2018 NXP
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#include "evkmimxrt1050_flexspi_nor_config.h"
+
+/* Component ID definition, used by tools. */
+#ifndef FSL_COMPONENT_ID
+#define FSL_COMPONENT_ID "platform.drivers.xip_board"
+#endif
+
+/*******************************************************************************
+ * Code
+ ******************************************************************************/
+#if defined(XIP_BOOT_HEADER_ENABLE) && (XIP_BOOT_HEADER_ENABLE == 1)
+#if defined(__CC_ARM) || defined(__ARMCC_VERSION) || defined(__GNUC__)
+__attribute__((section(".boot_hdr.conf")))
+#elif defined(__ICCARM__)
+#pragma location = ".boot_hdr.conf"
+#endif
+
+const flexspi_nor_config_t qspiflash_config = {
+    .memConfig =
+        {
+            .tag                = FLEXSPI_CFG_BLK_TAG,
+            .version            = FLEXSPI_CFG_BLK_VERSION,
+            .readSampleClkSrc   = kFlexSPIReadSampleClk_ExternalInputFromDqsPad,
+            .csHoldTime         = 3u,
+            .csSetupTime        = 3u,
+            .columnAddressWidth = 3u,
+            // Enable DDR mode, Wordaddassable, Safe configuration, Differential clock
+            .controllerMiscOption =
+                (1u << kFlexSpiMiscOffset_DdrModeEnable) | (1u << kFlexSpiMiscOffset_WordAddressableEnable) |
+                (1u << kFlexSpiMiscOffset_SafeConfigFreqEnable) | (1u << kFlexSpiMiscOffset_DiffClkEnable),
+            .sflashPadType = kSerialFlash_8Pads,
+            .serialClkFreq = kFlexSpiSerialClk_133MHz,
+            .sflashA1Size  = 64u * 1024u * 1024u,
+            .dataValidTime = {16u, 16u},
+            .lookupTable =
+                {
+                    // Read LUTs
+                    FLEXSPI_LUT_SEQ(CMD_DDR, FLEXSPI_8PAD, 0xA0, RADDR_DDR, FLEXSPI_8PAD, 0x18),
+                    FLEXSPI_LUT_SEQ(CADDR_DDR, FLEXSPI_8PAD, 0x10, DUMMY_DDR, FLEXSPI_8PAD, 0x06),
+                    FLEXSPI_LUT_SEQ(READ_DDR, FLEXSPI_8PAD, 0x04, STOP, FLEXSPI_1PAD, 0x0),
+                },
+        },
+    .pageSize           = 512u,
+    .sectorSize         = 256u * 1024u,
+    .blockSize          = 256u * 1024u,
+    .isUniformBlockSize = true,
+};
+
+#endif /* XIP_BOOT_HEADER_ENABLE */
diff --git a/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.h b/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.h
new file mode 100644
index 0000000000000..5a733bbd97bb2
--- /dev/null
+++ b/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.h
@@ -0,0 +1,9 @@
+#define MICROPY_HW_BOARD_NAME "i.MX RT1050 EVK"
+#define MICROPY_HW_MCU_NAME   "MIMXRT1052DVL6B"
+
+#define BOARD_FLASH_SIZE (64 * 1024 * 1024)
+
+// MIMXRT1050_EVK has 1 user LED
+#define MICROPY_HW_LED1_PIN (GPIO_AD_B0_09)
+#define MICROPY_HW_LED_ON(pin) (mp_hal_pin_low(pin))
+#define MICROPY_HW_LED_OFF(pin) (mp_hal_pin_high(pin))
diff --git a/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.mk b/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.mk
new file mode 100644
index 0000000000000..61cca4d63f204
--- /dev/null
+++ b/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.mk
@@ -0,0 +1,7 @@
+MCU_SERIES = MIMXRT1052
+MCU_VARIANT = MIMXRT1052DVL6B
+
+JLINK_PATH ?= /media/RT1050-EVK/
+
+deploy: $(BUILD)/firmware.bin
+	cp $< $(JLINK_PATH)
diff --git a/ports/mimxrt/boards/MIMXRT1050_EVK/pins.c b/ports/mimxrt/boards/MIMXRT1050_EVK/pins.c
new file mode 100644
index 0000000000000..d5da9c6f99275
--- /dev/null
+++ b/ports/mimxrt/boards/MIMXRT1050_EVK/pins.c
@@ -0,0 +1,33 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 NXP
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "pin.h"
+
+static pin_af_obj_t GPIO_AD_B0_09_af[] = {
+    PIN_AF(GPIO1_IO09, PIN_AF_MODE_ALT5, GPIO1, 0x10B0U),
+};
+
+pin_obj_t GPIO_AD_B0_09 = PIN(GPIO_AD_B0_09, GPIO1, 9, GPIO_AD_B0_09_af);
diff --git a/ports/mimxrt/boards/MIMXRT1050_EVK/pins.h b/ports/mimxrt/boards/MIMXRT1050_EVK/pins.h
new file mode 100644
index 0000000000000..baef51c6c8612
--- /dev/null
+++ b/ports/mimxrt/boards/MIMXRT1050_EVK/pins.h
@@ -0,0 +1,30 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 NXP
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+// NOTE: pins.h shall only be included in in pin.h
+// hence no include guards are needed since they will be provided by pin.h
+
+extern pin_obj_t GPIO_AD_B0_09;
diff --git a/ports/mimxrt/boards/MIMXRT1052.ld b/ports/mimxrt/boards/MIMXRT1052.ld
new file mode 100644
index 0000000000000..836a119e5e471
--- /dev/null
+++ b/ports/mimxrt/boards/MIMXRT1052.ld
@@ -0,0 +1,7 @@
+__stack_size__ = 0x6000;
+_estack = __StackTop;
+_sstack = __StackLimit;
+
+/* Use second OCRAM bank for GC heap. */
+_gc_heap_start = ORIGIN(m_data2);
+_gc_heap_end = ORIGIN(m_data2) + LENGTH(m_data2);

From 8610bababed3703f52c57f7e7b575c9d50be38a4 Mon Sep 17 00:00:00 2001
From: StereoRocker <technpizza@gmail.com>
Date: Wed, 3 Feb 2021 22:59:36 +0000
Subject: [PATCH 0670/3533] rp2: Enable VfsFat class for FAT filesystem
 support.

Allows interfacing with SD cards, for example.
---
 ports/rp2/CMakeLists.txt |  1 +
 ports/rp2/fatfs_port.c   | 34 ++++++++++++++++++++++++++++++++++
 ports/rp2/mpconfigport.h |  6 ++++++
 3 files changed, 41 insertions(+)
 create mode 100644 ports/rp2/fatfs_port.c

diff --git a/ports/rp2/CMakeLists.txt b/ports/rp2/CMakeLists.txt
index bd58d8f707952..cf20245a3c8ed 100644
--- a/ports/rp2/CMakeLists.txt
+++ b/ports/rp2/CMakeLists.txt
@@ -51,6 +51,7 @@ set(SOURCE_DRIVERS
 )
 
 set(SOURCE_PORT
+    fatfs_port.c
     machine_adc.c
     machine_i2c.c
     machine_pin.c
diff --git a/ports/rp2/fatfs_port.c b/ports/rp2/fatfs_port.c
new file mode 100644
index 0000000000000..3821d6586c13f
--- /dev/null
+++ b/ports/rp2/fatfs_port.c
@@ -0,0 +1,34 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013, 2014 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "lib/oofatfs/ff.h"
+#include "hardware/rtc.h"
+
+MP_WEAK DWORD get_fattime(void) {
+    datetime_t t;
+    rtc_get_datetime(&t);
+    return ((2000 + t.year - 1980) << 25) | ((t.month) << 21) | ((t.day) << 16) | ((t.hour) << 11) | ((t.min) << 5) | (t.sec / 2);
+}
diff --git a/ports/rp2/mpconfigport.h b/ports/rp2/mpconfigport.h
index b3214acfc2b5d..69db4449d1a40 100644
--- a/ports/rp2/mpconfigport.h
+++ b/ports/rp2/mpconfigport.h
@@ -118,6 +118,12 @@
 #define MICROPY_PY_FRAMEBUF                     (1)
 #define MICROPY_VFS                             (1)
 #define MICROPY_VFS_LFS2                        (1)
+#define MICROPY_VFS_FAT                         (1)
+
+// fatfs configuration
+#define MICROPY_FATFS_ENABLE_LFN                (1)
+#define MICROPY_FATFS_LFN_CODE_PAGE             437 /* 1=SFN/ANSI 437=LFN/U.S.(OEM) */
+#define MICROPY_FATFS_RPATH                     (2)
 
 // Use VfsLfs2's types for fileio/textio
 #define mp_type_fileio mp_type_vfs_lfs2_fileio

From 8ade163fffe9cca620ebe945dec8d25c54dc877d Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Tue, 9 Feb 2021 15:50:21 +0100
Subject: [PATCH 0671/3533] rp2/machine_uart: Add timeout/timeout_char to read
 and write.

---
 ports/rp2/machine_uart.c | 59 +++++++++++++++++++++++++++++++++++-----
 ports/rp2/mpconfigport.h |  1 +
 2 files changed, 53 insertions(+), 7 deletions(-)

diff --git a/ports/rp2/machine_uart.c b/ports/rp2/machine_uart.c
index 30446e688de34..6693cf73bf70d 100644
--- a/ports/rp2/machine_uart.c
+++ b/ports/rp2/machine_uart.c
@@ -54,6 +54,8 @@ typedef struct _machine_uart_obj_t {
     uint8_t stop;
     uint8_t tx;
     uint8_t rx;
+    uint16_t timeout;       // timeout waiting for first char (in ms)
+    uint16_t timeout_char;  // timeout waiting between chars (in ms)
 } machine_uart_obj_t;
 
 STATIC machine_uart_obj_t machine_uart_obj[] = {
@@ -68,13 +70,13 @@ STATIC const char *_parity_name[] = {"None", "0", "1"};
 
 STATIC void machine_uart_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     machine_uart_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    mp_printf(print, "UART(%u, baudrate=%u, bits=%u, parity=%s, stop=%u, tx=%d, rx=%d)",
+    mp_printf(print, "UART(%u, baudrate=%u, bits=%u, parity=%s, stop=%u, tx=%d, rx=%d, timeout=%u, timeout_char=%u)",
         self->uart_id, self->baudrate, self->bits, _parity_name[self->parity],
-        self->stop, self->tx, self->rx);
+        self->stop, self->tx, self->rx, self->timeout, self->timeout_char);
 }
 
 STATIC mp_obj_t machine_uart_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
-    enum { ARG_id, ARG_baudrate, ARG_bits, ARG_parity, ARG_stop, ARG_tx, ARG_rx };
+    enum { ARG_id, ARG_baudrate, ARG_bits, ARG_parity, ARG_stop, ARG_tx, ARG_rx, ARG_timeout, ARG_timeout_char };
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_id, MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
         { MP_QSTR_baudrate, MP_ARG_INT, {.u_int = -1} },
@@ -83,6 +85,8 @@ STATIC mp_obj_t machine_uart_make_new(const mp_obj_type_t *type, size_t n_args,
         { MP_QSTR_stop, MP_ARG_INT, {.u_int = -1} },
         { MP_QSTR_tx, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
         { MP_QSTR_rx, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
+        { MP_QSTR_timeout, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} },
+        { MP_QSTR_timeout_char, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} },
     };
 
     // Parse args.
@@ -140,11 +144,28 @@ STATIC mp_obj_t machine_uart_make_new(const mp_obj_type_t *type, size_t n_args,
         self->rx = rx;
     }
 
+    // Set timeout if configured.
+    if (args[ARG_timeout].u_int >= 0) {
+        self->timeout = args[ARG_timeout].u_int;
+    }
+
+    // Set timeout_char if configured.
+    if (args[ARG_timeout_char].u_int >= 0) {
+        self->timeout_char = args[ARG_timeout_char].u_int;
+    }
+
     // Initialise the UART peripheral if any arguments given, or it was not initialised previously.
     if (n_args > 1 || n_kw > 0 || self->baudrate == 0) {
         if (self->baudrate == 0) {
             self->baudrate = DEFAULT_UART_BAUDRATE;
         }
+
+        // Make sure timeout_char is at least as long as a whole character (13 bits to be safe).
+        uint32_t min_timeout_char = 13000 / self->baudrate + 1;
+        if (self->timeout_char < min_timeout_char) {
+            self->timeout_char = min_timeout_char;
+        }
+
         uart_init(self->uart, self->baudrate);
         uart_set_format(self->uart, self->bits, self->stop, self->parity);
         uart_set_fifo_enabled(self->uart, true);
@@ -184,26 +205,50 @@ STATIC MP_DEFINE_CONST_DICT(machine_uart_locals_dict, machine_uart_locals_dict_t
 
 STATIC mp_uint_t machine_uart_read(mp_obj_t self_in, void *buf_in, mp_uint_t size, int *errcode) {
     machine_uart_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    // TODO support timeout
+    uint64_t t = time_us_64() + (uint64_t)self->timeout * 1000;
+    uint64_t timeout_char_us = (uint64_t)self->timeout_char * 1000;
     uint8_t *dest = buf_in;
-    for (size_t i = 0; i < size; ++i) {
+
+    for (size_t i = 0; i < size; i++) {
+        // Wait for the first/next character
         while (!uart_is_readable(self->uart)) {
+            if (time_us_64() > t) {  // timed out
+                if (i <= 0) {
+                    *errcode = MP_EAGAIN;
+                    return MP_STREAM_ERROR;
+                } else {
+                    return i;
+                }
+            }
             MICROPY_EVENT_POLL_HOOK
         }
         *dest++ = uart_get_hw(self->uart)->dr;
+        t = time_us_64() + timeout_char_us;
     }
     return size;
 }
 
 STATIC mp_uint_t machine_uart_write(mp_obj_t self_in, const void *buf_in, mp_uint_t size, int *errcode) {
     machine_uart_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    // TODO support timeout
+    uint64_t t = time_us_64() + (uint64_t)self->timeout * 1000;
+    uint64_t timeout_char_us = (uint64_t)self->timeout_char * 1000;
     const uint8_t *src = buf_in;
-    for (size_t i = 0; i < size; ++i) {
+
+    for (size_t i = 0; i < size; i++) {
+        // wait for the first/next character
         while (!uart_is_writable(self->uart)) {
+            if (time_us_64() > t) {  // timed out
+                if (i <= 0) {
+                    *errcode = MP_EAGAIN;
+                    return MP_STREAM_ERROR;
+                } else {
+                    return i;
+                }
+            }
             MICROPY_EVENT_POLL_HOOK
         }
         uart_get_hw(self->uart)->dr = *src++;
+        t = time_us_64() + timeout_char_us;
     }
     return size;
 }
diff --git a/ports/rp2/mpconfigport.h b/ports/rp2/mpconfigport.h
index 69db4449d1a40..91d0c29b3ae0f 100644
--- a/ports/rp2/mpconfigport.h
+++ b/ports/rp2/mpconfigport.h
@@ -62,6 +62,7 @@
 #define MICROPY_LONGINT_IMPL                    (MICROPY_LONGINT_IMPL_MPZ)
 #define MICROPY_ENABLE_SOURCE_LINE              (1)
 #define MICROPY_FLOAT_IMPL                      (MICROPY_FLOAT_IMPL_FLOAT)
+#define MICROPY_STREAMS_NON_BLOCK               (1)
 #define MICROPY_MODULE_BUILTIN_INIT             (1)
 #define MICROPY_MODULE_WEAK_LINKS               (1)
 #define MICROPY_CAN_OVERRIDE_BUILTINS           (1)

From da85cb014afcf843bd0dfe99a1e232c271d3d5e8 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Wed, 10 Feb 2021 14:07:18 +0100
Subject: [PATCH 0672/3533] rp2/machine_uart: Add support for inverted TX and
 RX lines.

Usage as in the other ports:

    keyword "invert"
    constants: INV_TX and INV_RX

Sample: uart = UART(1, invert=UART.INV_TX | UART.INV_RX)
---
 ports/rp2/machine_uart.c | 35 ++++++++++++++++++++++++++++++-----
 1 file changed, 30 insertions(+), 5 deletions(-)

diff --git a/ports/rp2/machine_uart.c b/ports/rp2/machine_uart.c
index 6693cf73bf70d..936b9a93e9869 100644
--- a/ports/rp2/machine_uart.c
+++ b/ports/rp2/machine_uart.c
@@ -44,6 +44,10 @@
 #define IS_VALID_TX(uart, pin)      (((pin) & 3) == 0 && IS_VALID_PERIPH(uart, pin))
 #define IS_VALID_RX(uart, pin)      (((pin) & 3) == 1 && IS_VALID_PERIPH(uart, pin))
 
+#define UART_INVERT_TX (1)
+#define UART_INVERT_RX (2)
+#define UART_INVERT_MASK (UART_INVERT_TX | UART_INVERT_RX)
+
 typedef struct _machine_uart_obj_t {
     mp_obj_base_t base;
     uart_inst_t *const uart;
@@ -56,27 +60,29 @@ typedef struct _machine_uart_obj_t {
     uint8_t rx;
     uint16_t timeout;       // timeout waiting for first char (in ms)
     uint16_t timeout_char;  // timeout waiting between chars (in ms)
+    uint8_t invert;
 } machine_uart_obj_t;
 
 STATIC machine_uart_obj_t machine_uart_obj[] = {
-    {{&machine_uart_type}, uart0, 0, 0, DEFAULT_UART_BITS, UART_PARITY_NONE, DEFAULT_UART_STOP, DEFAULT_UART0_TX, DEFAULT_UART0_RX},
-    {{&machine_uart_type}, uart1, 1, 0, DEFAULT_UART_BITS, UART_PARITY_NONE, DEFAULT_UART_STOP, DEFAULT_UART1_TX, DEFAULT_UART1_RX},
+    {{&machine_uart_type}, uart0, 0, 0, DEFAULT_UART_BITS, UART_PARITY_NONE, DEFAULT_UART_STOP, DEFAULT_UART0_TX, DEFAULT_UART0_RX, 0, 0, 0},
+    {{&machine_uart_type}, uart1, 1, 0, DEFAULT_UART_BITS, UART_PARITY_NONE, DEFAULT_UART_STOP, DEFAULT_UART1_TX, DEFAULT_UART1_RX, 0, 0, 0},
 };
 
 STATIC const char *_parity_name[] = {"None", "0", "1"};
+STATIC const char *_invert_name[] = {"None", "INV_TX", "INV_RX", "INV_TX|INV_RX"};
 
 /******************************************************************************/
 // MicroPython bindings for UART
 
 STATIC void machine_uart_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     machine_uart_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    mp_printf(print, "UART(%u, baudrate=%u, bits=%u, parity=%s, stop=%u, tx=%d, rx=%d, timeout=%u, timeout_char=%u)",
+    mp_printf(print, "UART(%u, baudrate=%u, bits=%u, parity=%s, stop=%u, tx=%d, rx=%d, timeout=%u, timeout_char=%u, invert=%s)",
         self->uart_id, self->baudrate, self->bits, _parity_name[self->parity],
-        self->stop, self->tx, self->rx, self->timeout, self->timeout_char);
+        self->stop, self->tx, self->rx, self->timeout, self->timeout_char, _invert_name[self->invert]);
 }
 
 STATIC mp_obj_t machine_uart_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
-    enum { ARG_id, ARG_baudrate, ARG_bits, ARG_parity, ARG_stop, ARG_tx, ARG_rx, ARG_timeout, ARG_timeout_char };
+    enum { ARG_id, ARG_baudrate, ARG_bits, ARG_parity, ARG_stop, ARG_tx, ARG_rx, ARG_timeout, ARG_timeout_char, ARG_invert };
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_id, MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
         { MP_QSTR_baudrate, MP_ARG_INT, {.u_int = -1} },
@@ -87,6 +93,7 @@ STATIC mp_obj_t machine_uart_make_new(const mp_obj_type_t *type, size_t n_args,
         { MP_QSTR_rx, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
         { MP_QSTR_timeout, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} },
         { MP_QSTR_timeout_char, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} },
+        { MP_QSTR_invert, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} },
     };
 
     // Parse args.
@@ -154,6 +161,14 @@ STATIC mp_obj_t machine_uart_make_new(const mp_obj_type_t *type, size_t n_args,
         self->timeout_char = args[ARG_timeout_char].u_int;
     }
 
+    // Set line inversion if configured.
+    if (args[ARG_invert].u_int >= 0) {
+        if (args[ARG_invert].u_int & ~UART_INVERT_MASK) {
+            mp_raise_ValueError(MP_ERROR_TEXT("bad inversion mask"));
+        }
+        self->invert = args[ARG_invert].u_int;
+    }
+
     // Initialise the UART peripheral if any arguments given, or it was not initialised previously.
     if (n_args > 1 || n_kw > 0 || self->baudrate == 0) {
         if (self->baudrate == 0) {
@@ -171,6 +186,12 @@ STATIC mp_obj_t machine_uart_make_new(const mp_obj_type_t *type, size_t n_args,
         uart_set_fifo_enabled(self->uart, true);
         gpio_set_function(self->tx, GPIO_FUNC_UART);
         gpio_set_function(self->rx, GPIO_FUNC_UART);
+        if (self->invert & UART_INVERT_RX) {
+            gpio_set_inover(self->rx, GPIO_OVERRIDE_INVERT);
+        }
+        if (self->invert & UART_INVERT_TX) {
+            gpio_set_outover(self->tx, GPIO_OVERRIDE_INVERT);
+        }
     }
 
     return MP_OBJ_FROM_PTR(self);
@@ -200,6 +221,10 @@ STATIC const mp_rom_map_elem_t machine_uart_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_write), MP_ROM_PTR(&mp_stream_write_obj) },
 
     { MP_ROM_QSTR(MP_QSTR_sendbreak), MP_ROM_PTR(&machine_uart_sendbreak_obj) },
+
+    { MP_ROM_QSTR(MP_QSTR_INV_TX), MP_ROM_INT(UART_INVERT_TX) },
+    { MP_ROM_QSTR(MP_QSTR_INV_RX), MP_ROM_INT(UART_INVERT_RX) },
+
 };
 STATIC MP_DEFINE_CONST_DICT(machine_uart_locals_dict, machine_uart_locals_dict_table);
 

From a075e0b7d87a66a4b2ee9f75bcf70887157c7ae2 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Fri, 19 Feb 2021 17:11:04 +0100
Subject: [PATCH 0673/3533] rp2/rp2_pio: Allow more than 8 consecutive pins for
 PIO out/set/sideset.

The bitmasks supplied for initialization of out/set/sideset were only 8 bit
instead of 32.  This resulted in an error, that not more than 8 consecutive
pins would get initialized.

Fixes issue #6933.
---
 ports/rp2/rp2_pio.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/rp2/rp2_pio.c b/ports/rp2/rp2_pio.c
index 7d8921d0c3a51..6101164a1572e 100644
--- a/ports/rp2/rp2_pio.c
+++ b/ports/rp2/rp2_pio.c
@@ -139,8 +139,8 @@ enum {
 typedef struct _asm_pio_config_t {
     int8_t base;
     uint8_t count;
-    uint8_t pindirs;
-    uint8_t pinvals;
+    uint32_t pindirs;
+    uint32_t pinvals;
 } asm_pio_config_t;
 
 STATIC void asm_pio_override_shiftctrl(mp_obj_t arg, uint32_t bits, uint32_t lsb, pio_sm_config *config) {

From 046164098337cc79dd0f6c710f49bdf6765aa711 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Wed, 3 Mar 2021 08:44:38 +0100
Subject: [PATCH 0674/3533] rp2/rp2_pio: Fix sm.get(buf) to not wait after
 getting last item.

sm.get(buf) was waiting for one item more than the length of the supplied
buffer.  Even if this item was not stored, sm_get would block trying to get
an item from the RX fifo.

As part of the fix, the edge case for a zero length buffer was moved up to
the section where the function arguments are handled.  In case of a zero
length buffer, sm.get() now returns immediately that buffer.
---
 ports/rp2/rp2_pio.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/ports/rp2/rp2_pio.c b/ports/rp2/rp2_pio.c
index 6101164a1572e..9786e569d66c8 100644
--- a/ports/rp2/rp2_pio.c
+++ b/ports/rp2/rp2_pio.c
@@ -608,6 +608,9 @@ STATIC mp_obj_t rp2_state_machine_get(size_t n_args, const mp_obj_t *args) {
             } else {
                 bufinfo.typecode |= 0x20; // make lowercase to support upper and lower
             }
+            if (bufinfo.len == 0) { // edge case: buffer of zero length supplied
+                return args[1];
+            }
         }
         if (n_args > 2) {
             shift = mp_obj_get_int(args[2]);
@@ -625,9 +628,6 @@ STATIC mp_obj_t rp2_state_machine_get(size_t n_args, const mp_obj_t *args) {
         if (dest == NULL) {
             return mp_obj_new_int_from_uint(value);
         }
-        if (dest >= dest_top) {
-            return args[1];
-        }
         if (bufinfo.typecode == 'b') {
             *(uint8_t *)dest = value;
             dest += sizeof(uint8_t);
@@ -640,6 +640,9 @@ STATIC mp_obj_t rp2_state_machine_get(size_t n_args, const mp_obj_t *args) {
         } else {
             mp_raise_ValueError("unsupported buffer type");
         }
+        if (dest >= dest_top) {
+            return args[1];
+        }
     }
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(rp2_state_machine_get_obj, 1, 3, rp2_state_machine_get);

From 11cf742524202fa5fc062f3e6e3040a82f49b190 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sat, 20 Feb 2021 11:11:24 +0100
Subject: [PATCH 0675/3533] rp2/modmachine: Allow changing CPU clock frequency.

Using the standard machine.freq().

The safe ranges tested were 10 and 12-270MHz, at which USB REPL still
worked.  Requested settings can be checked with the script:
pico-sdk/src/rp2_common/hardware_clocks/scripts/vcocalc.py.  At frequencies
like 300MHz the script still signaled OK, but USB did not work any more.
---
 ports/rp2/modmachine.c | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/ports/rp2/modmachine.c b/ports/rp2/modmachine.c
index dbaafabe86ede..1393092818789 100644
--- a/ports/rp2/modmachine.c
+++ b/ports/rp2/modmachine.c
@@ -36,6 +36,7 @@
 #include "hardware/clocks.h"
 #include "hardware/watchdog.h"
 #include "pico/bootrom.h"
+#include "pico/stdlib.h"
 #include "pico/unique_id.h"
 
 #define RP2_RESET_PWRON (1)
@@ -80,10 +81,18 @@ STATIC mp_obj_t machine_bootloader(void) {
 }
 MP_DEFINE_CONST_FUN_OBJ_0(machine_bootloader_obj, machine_bootloader);
 
-STATIC mp_obj_t machine_freq(void) {
-    return MP_OBJ_NEW_SMALL_INT(clock_get_hz(clk_sys));
+STATIC mp_obj_t machine_freq(size_t n_args, const mp_obj_t *args) {
+    if (n_args == 0) {
+        return MP_OBJ_NEW_SMALL_INT(clock_get_hz(clk_sys));
+    } else {
+        mp_int_t freq = mp_obj_get_int(args[0]);
+        if (!set_sys_clock_khz(freq / 1000, false)) {
+            mp_raise_ValueError(MP_ERROR_TEXT("cannot change frequency"));
+        }
+        return mp_const_none;
+    }
 }
-MP_DEFINE_CONST_FUN_OBJ_0(machine_freq_obj, machine_freq);
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_freq_obj, 0, 1, machine_freq);
 
 STATIC mp_obj_t machine_idle(void) {
     best_effort_wfe_or_timeout(make_timeout_time_ms(1));

From c675452566ffcae1a49121b84a0233ed164b2152 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Thu, 4 Mar 2021 20:57:16 +0100
Subject: [PATCH 0676/3533] rp2/modmachine: Re-init UART for REPL on frequency
 change.

When UART is used for REPL and the MCU frequency is changed, the UART
has to be re-initialised.  Besides that the UART may have to be recreated
after a frequency change, but with USB REPL this is not a problem.

Thanks to @HermannSW for spotting and providing the change.
---
 ports/rp2/modmachine.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/ports/rp2/modmachine.c b/ports/rp2/modmachine.c
index 1393092818789..bf5033adbab7a 100644
--- a/ports/rp2/modmachine.c
+++ b/ports/rp2/modmachine.c
@@ -33,6 +33,7 @@
 #include "extmod/machine_spi.h"
 
 #include "modmachine.h"
+#include "uart.h"
 #include "hardware/clocks.h"
 #include "hardware/watchdog.h"
 #include "pico/bootrom.h"
@@ -89,6 +90,10 @@ STATIC mp_obj_t machine_freq(size_t n_args, const mp_obj_t *args) {
         if (!set_sys_clock_khz(freq / 1000, false)) {
             mp_raise_ValueError(MP_ERROR_TEXT("cannot change frequency"));
         }
+        #if MICROPY_HW_ENABLE_UART_REPL
+        setup_default_uart();
+        mp_uart_init();
+        #endif
         return mp_const_none;
     }
 }

From b6489425c631bf4d6551c352dc17836923c9157b Mon Sep 17 00:00:00 2001
From: Andrew Scheller <github@loowis.durge.org>
Date: Thu, 11 Mar 2021 10:31:03 +0000
Subject: [PATCH 0677/3533] rp2/rp2_flash: Prevent
 MICROPY_HW_FLASH_STORAGE_BASE being set negative.

---
 ports/rp2/rp2_flash.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/rp2/rp2_flash.c b/ports/rp2/rp2_flash.c
index cd1bc65489dfc..b89cb6fd8919a 100644
--- a/ports/rp2/rp2_flash.c
+++ b/ports/rp2/rp2_flash.c
@@ -42,6 +42,7 @@
 #define MICROPY_HW_FLASH_STORAGE_BASE (PICO_FLASH_SIZE_BYTES - MICROPY_HW_FLASH_STORAGE_BYTES)
 #endif
 
+static_assert(MICROPY_HW_FLASH_STORAGE_BYTES <= PICO_FLASH_SIZE_BYTES, "MICROPY_HW_FLASH_STORAGE_BYTES too big");
 static_assert(MICROPY_HW_FLASH_STORAGE_BASE + MICROPY_HW_FLASH_STORAGE_BYTES <= PICO_FLASH_SIZE_BYTES, "MICROPY_HW_FLASH_STORAGE_BYTES too big");
 
 typedef struct _rp2_flash_obj_t {

From a62e791978a66948637538d1a0a363fe35fa88e4 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 11 Mar 2021 18:34:33 +1100
Subject: [PATCH 0678/3533] lib/pico-sdk: Update to latest version 1.1.0.

Signed-off-by: Damien George <damien@micropython.org>
---
 lib/pico-sdk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/pico-sdk b/lib/pico-sdk
index 2d5789eca8965..fc10a97c386f6 160000
--- a/lib/pico-sdk
+++ b/lib/pico-sdk
@@ -1 +1 @@
-Subproject commit 2d5789eca89658a7f0a01e2d6010c0f254605d72
+Subproject commit fc10a97c386f65c1a44c68684fe52a56aaf50df0

From b24fcd7aec4b34064e9d9016d417d4ca3cc925cc Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 11 Mar 2021 13:32:00 +1100
Subject: [PATCH 0679/3533] esp32/machine_hw_spi: Use default pins when making
 SPI if none given.

The default pins can be optionally configured by a board.

Fixes issue #6974.

Signed-off-by: Damien George <damien@micropython.org>
---
 docs/esp32/quickref.rst      |  1 +
 ports/esp32/machine_hw_spi.c | 35 ++++++++++++++++++++++++++++++++---
 2 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/docs/esp32/quickref.rst b/docs/esp32/quickref.rst
index 79e61a10b6dfd..30c9b3b95a9f9 100644
--- a/docs/esp32/quickref.rst
+++ b/docs/esp32/quickref.rst
@@ -302,6 +302,7 @@ has the same methods as software SPI above::
 
     from machine import Pin, SPI
 
+    hspi = SPI(1, 10000000)
     hspi = SPI(1, 10000000, sck=Pin(14), mosi=Pin(13), miso=Pin(12))
     vspi = SPI(2, baudrate=80000000, polarity=0, phase=0, bits=8, firstbit=0, sck=Pin(18), mosi=Pin(23), miso=Pin(19))
 
diff --git a/ports/esp32/machine_hw_spi.c b/ports/esp32/machine_hw_spi.c
index 3790b4e0cf142..d59f2c750e666 100644
--- a/ports/esp32/machine_hw_spi.c
+++ b/ports/esp32/machine_hw_spi.c
@@ -36,9 +36,29 @@
 
 #include "driver/spi_master.h"
 
+// Default pins for SPI(1), can be overridden by a board
+#ifndef MICROPY_HW_SPI1_SCK
+#define MICROPY_HW_SPI1_SCK (14)
+#define MICROPY_HW_SPI1_MOSI (13)
+#define MICROPY_HW_SPI1_MISO (12)
+#endif
+
+// Default pins for SPI(2), can be overridden by a board
+#ifndef MICROPY_HW_SPI2_SCK
+#define MICROPY_HW_SPI2_SCK (18)
+#define MICROPY_HW_SPI2_MOSI (23)
+#define MICROPY_HW_SPI2_MISO (19)
+#endif
+
 #define MP_HW_SPI_MAX_XFER_BYTES (4092)
 #define MP_HW_SPI_MAX_XFER_BITS (MP_HW_SPI_MAX_XFER_BYTES * 8) // Has to be an even multiple of 8
 
+typedef struct _machine_hw_spi_default_pins_t {
+    int8_t sck;
+    int8_t mosi;
+    int8_t miso;
+} machine_hw_spi_default_pins_t;
+
 typedef struct _machine_hw_spi_obj_t {
     mp_obj_base_t base;
     spi_host_device_t host;
@@ -58,6 +78,12 @@ typedef struct _machine_hw_spi_obj_t {
     } state;
 } machine_hw_spi_obj_t;
 
+// Default pin mappings for the hardware SPI instances
+STATIC const machine_hw_spi_default_pins_t machine_hw_spi_default_pins[2] = {
+    { .sck = MICROPY_HW_SPI1_SCK, .mosi = MICROPY_HW_SPI1_MOSI, .miso = MICROPY_HW_SPI1_MISO },
+    { .sck = MICROPY_HW_SPI2_SCK, .mosi = MICROPY_HW_SPI2_MOSI, .miso = MICROPY_HW_SPI2_MISO },
+};
+
 // Static objects mapping to HSPI and VSPI hardware peripherals
 STATIC machine_hw_spi_obj_t machine_hw_spi_obj[2];
 
@@ -369,10 +395,13 @@ mp_obj_t machine_hw_spi_make_new(const mp_obj_type_t *type, size_t n_args, size_
     mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
 
     machine_hw_spi_obj_t *self;
+    const machine_hw_spi_default_pins_t *default_pins;
     if (args[ARG_id].u_int == HSPI_HOST) {
         self = &machine_hw_spi_obj[0];
+        default_pins = &machine_hw_spi_default_pins[0];
     } else {
         self = &machine_hw_spi_obj[1];
+        default_pins = &machine_hw_spi_default_pins[1];
     }
     self->base.type = &machine_hw_spi_type;
 
@@ -384,9 +413,9 @@ mp_obj_t machine_hw_spi_make_new(const mp_obj_type_t *type, size_t n_args, size_
         args[ARG_phase].u_int,
         args[ARG_bits].u_int,
         args[ARG_firstbit].u_int,
-        args[ARG_sck].u_obj == MP_OBJ_NULL ? -1 : machine_pin_get_id(args[ARG_sck].u_obj),
-        args[ARG_mosi].u_obj == MP_OBJ_NULL ? -1 : machine_pin_get_id(args[ARG_mosi].u_obj),
-        args[ARG_miso].u_obj == MP_OBJ_NULL ? -1 : machine_pin_get_id(args[ARG_miso].u_obj));
+        args[ARG_sck].u_obj == MP_OBJ_NULL ? default_pins->sck : machine_pin_get_id(args[ARG_sck].u_obj),
+        args[ARG_mosi].u_obj == MP_OBJ_NULL ? default_pins->mosi : machine_pin_get_id(args[ARG_mosi].u_obj),
+        args[ARG_miso].u_obj == MP_OBJ_NULL ? default_pins->miso : machine_pin_get_id(args[ARG_miso].u_obj));
 
     return MP_OBJ_FROM_PTR(self);
 }

From 6129b8e401c36cc68e0f7ba8180da27a40d17621 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 11 Mar 2021 16:09:27 +1100
Subject: [PATCH 0680/3533] tests: Rename run-tests to run-tests.py for
 consistency.

Signed-off-by: Damien George <damien@micropython.org>
---
 .github/workflows/ports_unix.yml  | 22 +++++++++++-----------
 docs/develop/gettingstarted.rst   |  2 +-
 docs/develop/writingtests.rst     | 12 ++++++------
 ports/cc3200/tools/smoke.py       |  2 +-
 ports/javascript/Makefile         |  4 ++--
 ports/qemu-arm/Makefile.test      |  2 +-
 ports/unix/Makefile               | 16 ++++++++--------
 ports/windows/.appveyor.yml       | 14 +++++++-------
 ports/windows/README.md           |  4 ++--
 ports/zephyr/make-bin-testsuite   |  4 ++--
 tests/README                      |  6 +++---
 tests/esp32/partition_ota.py      |  2 +-
 tests/feature_check/README        |  2 +-
 tests/jni/README                  |  2 +-
 tests/net_hosted/README           |  2 +-
 tests/net_inet/README             |  2 +-
 tests/run-internalbench.py        |  2 +-
 tests/run-tests-exp.py            |  4 ++--
 tests/run-tests-exp.sh            |  4 ++--
 tests/{run-tests => run-tests.py} | 12 ++++++------
 tools/ci.sh                       |  4 ++--
 21 files changed, 62 insertions(+), 62 deletions(-)
 rename tests/{run-tests => run-tests.py} (98%)

diff --git a/.github/workflows/ports_unix.yml b/.github/workflows/ports_unix.yml
index eb1416045c03a..aa4b8abdc9893 100644
--- a/.github/workflows/ports_unix.yml
+++ b/.github/workflows/ports_unix.yml
@@ -24,7 +24,7 @@ jobs:
       run: source tools/ci.sh && ci_unix_minimal_run_tests
     - name: Print failures
       if: failure()
-      run: tests/run-tests --print-failures
+      run: tests/run-tests.py --print-failures
 
   reproducible:
     runs-on: ubuntu-latest
@@ -49,7 +49,7 @@ jobs:
       run: source tools/ci.sh && ci_unix_standard_run_perfbench
     - name: Print failures
       if: failure()
-      run: tests/run-tests --print-failures
+      run: tests/run-tests.py --print-failures
 
   coverage:
     runs-on: ubuntu-latest
@@ -76,7 +76,7 @@ jobs:
         github-token: ${{ secrets.GITHUB_TOKEN }}
     - name: Print failures
       if: failure()
-      run: tests/run-tests --print-failures
+      run: tests/run-tests.py --print-failures
 
   coverage_32bit:
     runs-on: ubuntu-latest
@@ -94,7 +94,7 @@ jobs:
       run: source tools/ci.sh && ci_unix_coverage_32bit_run_native_mpy_tests
     - name: Print failures
       if: failure()
-      run: tests/run-tests --print-failures
+      run: tests/run-tests.py --print-failures
 
   nanbox:
     runs-on: ubuntu-latest
@@ -108,7 +108,7 @@ jobs:
       run: source tools/ci.sh && ci_unix_nanbox_run_tests
     - name: Print failures
       if: failure()
-      run: tests/run-tests --print-failures
+      run: tests/run-tests.py --print-failures
 
   float:
     runs-on: ubuntu-latest
@@ -120,7 +120,7 @@ jobs:
       run: source tools/ci.sh && ci_unix_float_run_tests
     - name: Print failures
       if: failure()
-      run: tests/run-tests --print-failures
+      run: tests/run-tests.py --print-failures
 
   stackless_clang:
     runs-on: ubuntu-20.04
@@ -134,7 +134,7 @@ jobs:
       run: source tools/ci.sh && ci_unix_stackless_clang_run_tests
     - name: Print failures
       if: failure()
-      run: tests/run-tests --print-failures
+      run: tests/run-tests.py --print-failures
 
   float_clang:
     runs-on: ubuntu-20.04
@@ -148,7 +148,7 @@ jobs:
       run: source tools/ci.sh && ci_unix_float_clang_run_tests
     - name: Print failures
       if: failure()
-      run: tests/run-tests --print-failures
+      run: tests/run-tests.py --print-failures
 
   settrace:
     runs-on: ubuntu-latest
@@ -160,7 +160,7 @@ jobs:
       run: source tools/ci.sh && ci_unix_settrace_run_tests
     - name: Print failures
       if: failure()
-      run: tests/run-tests --print-failures
+      run: tests/run-tests.py --print-failures
 
   settrace_stackless:
     runs-on: ubuntu-latest
@@ -172,7 +172,7 @@ jobs:
       run: source tools/ci.sh && ci_unix_settrace_stackless_run_tests
     - name: Print failures
       if: failure()
-      run: tests/run-tests --print-failures
+      run: tests/run-tests.py --print-failures
 
   macos:
     runs-on: macos-11.0
@@ -185,4 +185,4 @@ jobs:
       run: source tools/ci.sh && ci_unix_macos_run_tests
     - name: Print failures
       if: failure()
-      run: tests/run-tests --print-failures
+      run: tests/run-tests.py --print-failures
diff --git a/docs/develop/gettingstarted.rst b/docs/develop/gettingstarted.rst
index 3dd00a579a2b7..32435ebe1c9d6 100644
--- a/docs/develop/gettingstarted.rst
+++ b/docs/develop/gettingstarted.rst
@@ -273,7 +273,7 @@ To run a selection of tests on a board/device connected over USB use:
 .. code-block:: bash
 
    $ cd tests
-   $ ./run-tests --target minimal --device /dev/ttyACM0
+   $ ./run-tests.py --target minimal --device /dev/ttyACM0
 
 See also :ref:`writingtests`.
 
diff --git a/docs/develop/writingtests.rst b/docs/develop/writingtests.rst
index 4bdf4dd7a620e..9bb5178f55f22 100644
--- a/docs/develop/writingtests.rst
+++ b/docs/develop/writingtests.rst
@@ -4,7 +4,7 @@ Writing tests
 =============
 
 Tests in MicroPython are located at the path ``tests/``. The following is a listing of
-key directories and the run-tests runner script:
+key directories and the run-tests.py runner script:
 
 .. code-block:: bash
 
@@ -13,7 +13,7 @@ key directories and the run-tests runner script:
     ├── extmod
     ├── float
     ├── micropython
-    ├── run-tests
+    ├── run-tests.py
     ...
 
 There are subfolders maintained to categorize the tests. Add a test by creating a new file in one of the
@@ -54,17 +54,17 @@ The other way to run tests, which is useful when running on targets other than t
 .. code-block:: bash
 
    $ cd tests
-   $ ./run-tests
+   $ ./run-tests.py
 
 Then to run on a board:
 
 .. code-block:: bash
 
-   $ ./run-tests --target minimal --device /dev/ttyACM0
+   $ ./run-tests.py --target minimal --device /dev/ttyACM0
 
 And to run only a certain set of tests (eg a directory):
 
 .. code-block:: bash
 
-   $ ./run-tests -d basics
-   $ ./run-tests float/builtin*.py
+   $ ./run-tests.py -d basics
+   $ ./run-tests.py float/builtin*.py
diff --git a/ports/cc3200/tools/smoke.py b/ports/cc3200/tools/smoke.py
index 4ccc700c6cd76..463a485c4d4c8 100644
--- a/ports/cc3200/tools/smoke.py
+++ b/ports/cc3200/tools/smoke.py
@@ -6,7 +6,7 @@
 """
 Execute it like this:
 
-python3 run-tests --target wipy --device 192.168.1.1 ../cc3200/tools/smoke.py
+python3 run-tests.py --target wipy --device 192.168.1.1 ../cc3200/tools/smoke.py
 """
 
 pin_map = [23, 24, 11, 12, 13, 14, 15, 16, 17, 22, 28, 10, 9, 8, 7, 6, 30, 31, 3, 0, 4, 5]
diff --git a/ports/javascript/Makefile b/ports/javascript/Makefile
index 4f9dd444befa0..3962e93f5f334 100644
--- a/ports/javascript/Makefile
+++ b/ports/javascript/Makefile
@@ -63,8 +63,8 @@ $(BUILD)/micropython.js: $(OBJ) library.js wrapper.js
 min: $(BUILD)/micropython.js
 	uglifyjs $< -c -o $(BUILD)/micropython.min.js
 
-test: $(BUILD)/micropython.js $(TOP)/tests/run-tests
+test: $(BUILD)/micropython.js $(TOP)/tests/run-tests.py
 	$(eval DIRNAME=ports/$(notdir $(CURDIR)))
-	cd $(TOP)/tests && MICROPY_MICROPYTHON=../ports/javascript/node_run.sh ./run-tests
+	cd $(TOP)/tests && MICROPY_MICROPYTHON=../ports/javascript/node_run.sh ./run-tests.py
 
 include $(TOP)/py/mkrules.mk
diff --git a/ports/qemu-arm/Makefile.test b/ports/qemu-arm/Makefile.test
index 340e1c3b90d5e..6b7f1dc7ab46c 100644
--- a/ports/qemu-arm/Makefile.test
+++ b/ports/qemu-arm/Makefile.test
@@ -10,7 +10,7 @@ CFLAGS += -DTEST
 
 $(BUILD)/test_main.o: $(BUILD)/genhdr/tests.h
 $(BUILD)/genhdr/tests.h:
-	(cd $(TOP)/tests; ./run-tests --target=qemu-arm --write-exp)
+	(cd $(TOP)/tests; ./run-tests.py --target=qemu-arm --write-exp)
 	$(Q)echo "Generating $@";(cd $(TOP)/tests; ../tools/tinytest-codegen.py) > $@
 
 $(BUILD)/lib/tinytest/tinytest.o: CFLAGS += -DNO_FORKING
diff --git a/ports/unix/Makefile b/ports/unix/Makefile
index 6a936a242545c..fe86018aa0ecc 100644
--- a/ports/unix/Makefile
+++ b/ports/unix/Makefile
@@ -292,17 +292,17 @@ include $(TOP)/py/mkrules.mk
 
 .PHONY: test test_full
 
-test: $(PROG) $(TOP)/tests/run-tests
+test: $(PROG) $(TOP)/tests/run-tests.py
 	$(eval DIRNAME=ports/$(notdir $(CURDIR)))
-	cd $(TOP)/tests && MICROPY_MICROPYTHON=../$(DIRNAME)/$(PROG) ./run-tests
+	cd $(TOP)/tests && MICROPY_MICROPYTHON=../$(DIRNAME)/$(PROG) ./run-tests.py
 
-test_full: $(PROG) $(TOP)/tests/run-tests
+test_full: $(PROG) $(TOP)/tests/run-tests.py
 	$(eval DIRNAME=ports/$(notdir $(CURDIR)))
-	cd $(TOP)/tests && MICROPY_MICROPYTHON=../$(DIRNAME)/$(PROG) ./run-tests
-	cd $(TOP)/tests && MICROPY_MICROPYTHON=../$(DIRNAME)/$(PROG) ./run-tests -d thread
-	cd $(TOP)/tests && MICROPY_MICROPYTHON=../$(DIRNAME)/$(PROG) ./run-tests --emit native
-	cd $(TOP)/tests && MICROPY_MICROPYTHON=../$(DIRNAME)/$(PROG) ./run-tests --via-mpy $(RUN_TESTS_MPY_CROSS_FLAGS) -d basics float micropython
-	cd $(TOP)/tests && MICROPY_MICROPYTHON=../$(DIRNAME)/$(PROG) ./run-tests --via-mpy $(RUN_TESTS_MPY_CROSS_FLAGS) --emit native -d basics float micropython
+	cd $(TOP)/tests && MICROPY_MICROPYTHON=../$(DIRNAME)/$(PROG) ./run-tests.py
+	cd $(TOP)/tests && MICROPY_MICROPYTHON=../$(DIRNAME)/$(PROG) ./run-tests.py -d thread
+	cd $(TOP)/tests && MICROPY_MICROPYTHON=../$(DIRNAME)/$(PROG) ./run-tests.py --emit native
+	cd $(TOP)/tests && MICROPY_MICROPYTHON=../$(DIRNAME)/$(PROG) ./run-tests.py --via-mpy $(RUN_TESTS_MPY_CROSS_FLAGS) -d basics float micropython
+	cd $(TOP)/tests && MICROPY_MICROPYTHON=../$(DIRNAME)/$(PROG) ./run-tests.py --via-mpy $(RUN_TESTS_MPY_CROSS_FLAGS) --emit native -d basics float micropython
 	cat $(TOP)/tests/basics/0prelim.py | ./$(PROG) | grep -q 'abc'
 
 test_gcov: test_full
diff --git a/ports/windows/.appveyor.yml b/ports/windows/.appveyor.yml
index 4d2d6bd11dc87..1ec72bbb38937 100644
--- a/ports/windows/.appveyor.yml
+++ b/ports/windows/.appveyor.yml
@@ -37,14 +37,14 @@ build:
 test_script:
 - ps: |
     cd (Join-Path $env:APPVEYOR_BUILD_FOLDER 'tests')
-    & $env:MICROPY_CPYTHON3 run-tests
+    & $env:MICROPY_CPYTHON3 run-tests.py
     if ($LASTEXITCODE -ne 0) {
-      & $env:MICROPY_CPYTHON3 run-tests --print-failures
+      & $env:MICROPY_CPYTHON3 run-tests.py --print-failures
       throw "Test failure"
     }
-    & $env:MICROPY_CPYTHON3 run-tests --via-mpy -d basics float micropython
+    & $env:MICROPY_CPYTHON3 run-tests.py --via-mpy -d basics float micropython
     if ($LASTEXITCODE -ne 0) {
-      & $env:MICROPY_CPYTHON3 run-tests --print-failures
+      & $env:MICROPY_CPYTHON3 run-tests.py --print-failures
       throw "Test failure"
     }
 
@@ -71,17 +71,17 @@ after_test:
       throw "$env:MSYSTEM mpy_cross build exited with code $LASTEXITCODE"
     }
     cd (Join-Path $env:APPVEYOR_BUILD_FOLDER 'tests')
-    $testArgs = @('run-tests')
+    $testArgs = @('run-tests.py')
     foreach ($skipTest in @('math_fun', 'float2int_double', 'float_parse', 'math_domain_special')) {
       $testArgs = $testArgs + '-e' + $skipTest
     }
     & $env:MICROPY_CPYTHON3 $testArgs
     if ($LASTEXITCODE -ne 0) {
-      & $env:MICROPY_CPYTHON3 run-tests --print-failures
+      & $env:MICROPY_CPYTHON3 run-tests.py --print-failures
       throw "Test failure"
     }
     & $env:MICROPY_CPYTHON3 ($testArgs + @('--via-mpy', '-d', 'basics', 'float', 'micropython'))
     if ($LASTEXITCODE -ne 0) {
-      & $env:MICROPY_CPYTHON3 run-tests --print-failures
+      & $env:MICROPY_CPYTHON3 run-tests.py --print-failures
       throw "Test failure"
     }
diff --git a/ports/windows/README.md b/ports/windows/README.md
index 1b904f8f5e60e..553e87513e737 100644
--- a/ports/windows/README.md
+++ b/ports/windows/README.md
@@ -90,11 +90,11 @@ Running the tests
 This is similar for all ports:
 
     cd ../../tests
-    python ./run-tests
+    python ./run-tests.py
 
 Though when running on Cygwin and using Cygwin's Python installation you'll need:
 
-    python3 ./run-tests
+    python3 ./run-tests.py
 
 Depending on the combination of platform and Python version used it might be
 needed to first set the MICROPY_MICROPYTHON environment variable to
diff --git a/ports/zephyr/make-bin-testsuite b/ports/zephyr/make-bin-testsuite
index f6aeb83f8a28a..9a8c329772143 100755
--- a/ports/zephyr/make-bin-testsuite
+++ b/ports/zephyr/make-bin-testsuite
@@ -8,8 +8,8 @@
 # ./make-bin-testsuite BOARD=qemu_cortex_m3 run
 #
 
-(cd ../../tests; ./run-tests --write-exp)
-(cd ../../tests; ./run-tests --list-tests --target=minimal \
+(cd ../../tests; ./run-tests.py --write-exp)
+(cd ../../tests; ./run-tests.py --list-tests --target=minimal \
     -e async -e intbig -e int_big -e builtin_help -e memstats -e bytes_compare3 -e class_reverse_op \
     -e /set -e frozenset -e complex -e const -e native -e viper \
     -e 'float_divmod\.' -e float_parse_doubleprec -e float/true_value -e float/types \
diff --git a/tests/README b/tests/README
index f2cd89bb932a3..8794202e15fde 100644
--- a/tests/README
+++ b/tests/README
@@ -1,15 +1,15 @@
 This directory contains tests for various functionality areas of MicroPython.
-To run all stable tests, run "run-tests" script in this directory.
+To run all stable tests, run "run-tests.py" script in this directory.
 
 Tests of capabilities not supported on all platforms should be written
 to check for the capability being present. If it is not, the test
 should merely output 'SKIP' followed by the line terminator, and call
 sys.exit() to raise SystemExit, instead of attempting to test the
-missing capability. The testing framework (run-tests in this
+missing capability. The testing framework (run-tests.py in this
 directory, test_main.c in qemu_arm) recognizes this as a skipped test.
 
 There are a few features for which this mechanism cannot be used to
-condition a test. The run-tests script uses small scripts in the
+condition a test. The run-tests.py script uses small scripts in the
 feature_check directory to check whether each such feature is present,
 and skips the relevant tests if not.
 
diff --git a/tests/esp32/partition_ota.py b/tests/esp32/partition_ota.py
index 765630c8ce393..212fcf03385e7 100644
--- a/tests/esp32/partition_ota.py
+++ b/tests/esp32/partition_ota.py
@@ -95,7 +95,7 @@ def copy_partition(src, dest):
         if sz - addr < 4096:
             blk = blk[: sz - addr]
         if addr & 0xFFFF == 0:
-            # need to show progress to run-tests else it times out
+            # need to show progress to run-tests.py else it times out
             print("   ... 0x{:06x}".format(addr))
         src.readblocks(addr >> 12, blk)
         dest.writeblocks(addr >> 12, blk)
diff --git a/tests/feature_check/README b/tests/feature_check/README
index d062020f7bb32..3b7b6cba41749 100644
--- a/tests/feature_check/README
+++ b/tests/feature_check/README
@@ -1,4 +1,4 @@
 This directory doesn't contain real tests, but code snippets to detect
 various interpreter features, which can't be/inconvenient to detecte by
-other means. Scripts here are executed by run-tests at the beginning of
+other means. Scripts here are executed by run-tests.py at the beginning of
 testsuite to decide what other test groups to run/exclude.
diff --git a/tests/jni/README b/tests/jni/README
index 8418bb84f442f..f1e1b0eca0beb 100644
--- a/tests/jni/README
+++ b/tests/jni/README
@@ -8,5 +8,5 @@ of JVM.
 
 For example, for OpenJDK 7 on x86_64, following may work:
 
-LD_LIBRARY_PATH=/usr/lib/jvm/java-7-openjdk-amd64/jre/lib/amd64/server ./run-tests jni/*.py
+LD_LIBRARY_PATH=/usr/lib/jvm/java-7-openjdk-amd64/jre/lib/amd64/server ./run-tests.py jni/*.py
 
diff --git a/tests/net_hosted/README b/tests/net_hosted/README
index 724dd61584a5e..709ed50ce329e 100644
--- a/tests/net_hosted/README
+++ b/tests/net_hosted/README
@@ -8,4 +8,4 @@ not yet fully correspond to the functional specification above.
 So far, these tests are not run as part of the main testsuite and need
 to be run seperately (from the main test/ directory):
 
-    ./run-tests net_hosted/*.py
+    ./run-tests.py net_hosted/*.py
diff --git a/tests/net_inet/README b/tests/net_inet/README
index 9a5614efa6429..1d6e15b174076 100644
--- a/tests/net_inet/README
+++ b/tests/net_inet/README
@@ -2,4 +2,4 @@ This directory contains network tests which require Internet connection.
 Note that these tests are not run as part of the main testsuite and need
 to be run seperately (from the main test/ directory):
 
-    ./run-tests net_inet/*.py
+    ./run-tests.py net_inet/*.py
diff --git a/tests/run-internalbench.py b/tests/run-internalbench.py
index 63392814a893f..606fc3b77201e 100755
--- a/tests/run-internalbench.py
+++ b/tests/run-internalbench.py
@@ -67,7 +67,7 @@ def main():
     cmd_parser.add_argument("files", nargs="*", help="input test files")
     args = cmd_parser.parse_args()
 
-    # Note pyboard support is copied over from run-tests, not testes, and likely needs revamping
+    # Note pyboard support is copied over from run-tests.py, not tests, and likely needs revamping
     if args.pyboard:
         import pyboard
 
diff --git a/tests/run-tests-exp.py b/tests/run-tests-exp.py
index ac32fe9869c36..21b6645336f1f 100644
--- a/tests/run-tests-exp.py
+++ b/tests/run-tests-exp.py
@@ -1,6 +1,6 @@
 #
-# This is minimal MicroPython variant of run-tests script, which uses
-# .exp files as generated by run-tests --write-exp. It is useful to run
+# This is minimal MicroPython variant of run-tests.py script, which uses
+# .exp files as generated by run-tests.py --write-exp. It is useful to run
 # testsuite on systems which have neither CPython3 nor unix shell.
 # This script is intended to be run by the same interpreter executable
 # which is to be tested, so should use minimal language functionality.
diff --git a/tests/run-tests-exp.sh b/tests/run-tests-exp.sh
index 8f81b96d2fe89..177090cd8db93 100755
--- a/tests/run-tests-exp.sh
+++ b/tests/run-tests-exp.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
-# This is plain shell variant of run-tests script, which uses .exp files
-# as generated by run-tests --write-exp. It is useful to run testsuite
+# This is plain shell variant of run-tests.py script, which uses .exp files
+# as generated by run-tests.py --write-exp. It is useful to run testsuite
 # on embedded systems which don't have CPython3.
 #
 
diff --git a/tests/run-tests b/tests/run-tests.py
similarity index 98%
rename from tests/run-tests
rename to tests/run-tests.py
index b733d8a9fc582..5863b23b41399 100755
--- a/tests/run-tests
+++ b/tests/run-tests.py
@@ -258,7 +258,7 @@ def run_tests(pyb, tests, args, result_dir):
     if not (args.list_tests or args.write_exp):
         # Even if we run completely different tests in a different directory,
         # we need to access feature_checks from the same directory as the
-        # run-tests script itself so use base_path.
+        # run-tests.py script itself so use base_path.
 
         # Check if micropython.native is supported, and skip such tests if it's not
         output = run_feature_check(pyb, args, base_path, 'native_check.py')
@@ -582,19 +582,19 @@ def main():
 specified test files. If test files nor directories are specified, the script
 expects to be ran in the tests directory (where this file is located) and the
 builtin tests suitable for the target platform are ran.
-When running tests, run-tests compares the MicroPython output of the test with the output
+When running tests, run-tests.py compares the MicroPython output of the test with the output
 produced by running the test through CPython unless a <test>.exp file is found, in which
 case it is used as comparison.
-If a test fails, run-tests produces a pair of <test>.out and <test>.exp files in the result
+If a test fails, run-tests.py produces a pair of <test>.out and <test>.exp files in the result
 directory with the MicroPython output and the expectations, respectively.
 ''',
         epilog='''\
 Options -i and -e can be multiple and processed in the order given. Regex
 "search" (vs "match") operation is used. An action (include/exclude) of
 the last matching regex is used:
-  run-tests -i async - exclude all, then include tests containing "async" anywhere
-  run-tests -e '/big.+int' - include all, then exclude by regex
-  run-tests -e async -i async_foo - include all, exclude async, yet still include async_foo
+  run-tests.py -i async - exclude all, then include tests containing "async" anywhere
+  run-tests.py -e '/big.+int' - include all, then exclude by regex
+  run-tests.py -e async -i async_foo - include all, exclude async, yet still include async_foo
 ''')
     cmd_parser.add_argument('--target', default='unix', help='the target platform')
     cmd_parser.add_argument('--device', default='/dev/ttyACM0', help='the serial device or the IP address of the pyboard')
diff --git a/tools/ci.sh b/tools/ci.sh
index a815e9483e58c..53cf7f878b24c 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -306,7 +306,7 @@ function ci_unix_minimal_build {
 }
 
 function ci_unix_minimal_run_tests {
-    (cd tests && MICROPY_CPYTHON3=python3 MICROPY_MICROPYTHON=../ports/unix/micropython-minimal ./run-tests -e exception_chain -e self_type_check -e subclass_native_init -d basics)
+    (cd tests && MICROPY_CPYTHON3=python3 MICROPY_MICROPYTHON=../ports/unix/micropython-minimal ./run-tests.py -e exception_chain -e self_type_check -e subclass_native_init -d basics)
 }
 
 function ci_unix_standard_build {
@@ -441,7 +441,7 @@ function ci_unix_macos_run_tests {
     # - OSX has poor time resolution and these uasyncio tests do not have correct output
     # - import_pkg7 has a problem with relative imports
     # - urandom_basic has a problem with getrandbits(0)
-    (cd tests && ./run-tests --exclude 'uasyncio_(basic|heaplock|lock|wait_task)' --exclude 'import_pkg7.py' --exclude 'urandom_basic.py')
+    (cd tests && ./run-tests.py --exclude 'uasyncio_(basic|heaplock|lock|wait_task)' --exclude 'import_pkg7.py' --exclude 'urandom_basic.py')
 }
 
 ########################################################################################

From 2a38d7103672580882fb621a5b76e8d26805d593 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 11 Mar 2021 16:11:27 +1100
Subject: [PATCH 0681/3533] tests/run-tests.py: Reformat with Black.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/run-tests.py | 582 +++++++++++++++++++++++++++------------------
 1 file changed, 352 insertions(+), 230 deletions(-)

diff --git a/tests/run-tests.py b/tests/run-tests.py
index 5863b23b41399..3ab6194b628fe 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -13,31 +13,34 @@
 # are guaranteed to always work, this one should though.
 BASEPATH = os.path.dirname(os.path.abspath(inspect.getsourcefile(lambda: None)))
 
+
 def base_path(*p):
-    return os.path.abspath(os.path.join(BASEPATH, *p)).replace('\\', '/')
+    return os.path.abspath(os.path.join(BASEPATH, *p)).replace("\\", "/")
+
 
 # Tests require at least CPython 3.3. If your default python3 executable
 # is of lower version, you can point MICROPY_CPYTHON3 environment var
 # to the correct executable.
-if os.name == 'nt':
-    CPYTHON3 = os.getenv('MICROPY_CPYTHON3', 'python')
-    MICROPYTHON = os.getenv('MICROPY_MICROPYTHON', base_path('../ports/windows/micropython.exe'))
+if os.name == "nt":
+    CPYTHON3 = os.getenv("MICROPY_CPYTHON3", "python")
+    MICROPYTHON = os.getenv("MICROPY_MICROPYTHON", base_path("../ports/windows/micropython.exe"))
 else:
-    CPYTHON3 = os.getenv('MICROPY_CPYTHON3', 'python3')
-    MICROPYTHON = os.getenv('MICROPY_MICROPYTHON', base_path('../ports/unix/micropython'))
+    CPYTHON3 = os.getenv("MICROPY_CPYTHON3", "python3")
+    MICROPYTHON = os.getenv("MICROPY_MICROPYTHON", base_path("../ports/unix/micropython"))
 
 # Use CPython options to not save .pyc files, to only access the core standard library
 # (not site packages which may clash with u-module names), and improve start up time.
 CPYTHON3_CMD = [CPYTHON3, "-BS"]
 
 # mpy-cross is only needed if --via-mpy command-line arg is passed
-MPYCROSS = os.getenv('MICROPY_MPYCROSS', base_path('../mpy-cross/mpy-cross'))
+MPYCROSS = os.getenv("MICROPY_MPYCROSS", base_path("../mpy-cross/mpy-cross"))
 
 # For diff'ing test output
-DIFF = os.getenv('MICROPY_DIFF', 'diff -u')
+DIFF = os.getenv("MICROPY_DIFF", "diff -u")
 
 # Set PYTHONIOENCODING so that CPython will use utf-8 on systems which set another encoding in the locale
-os.environ['PYTHONIOENCODING'] = 'utf-8'
+os.environ["PYTHONIOENCODING"] = "utf-8"
+
 
 def rm_f(fname):
     if os.path.exists(fname):
@@ -48,57 +51,62 @@ def rm_f(fname):
 def convert_regex_escapes(line):
     cs = []
     escape = False
-    for c in str(line, 'utf8'):
+    for c in str(line, "utf8"):
         if escape:
             escape = False
             cs.append(c)
-        elif c == '\\':
+        elif c == "\\":
             escape = True
-        elif c in ('(', ')', '[', ']', '{', '}', '.', '*', '+', '^', '$'):
-            cs.append('\\' + c)
+        elif c in ("(", ")", "[", "]", "{", "}", ".", "*", "+", "^", "$"):
+            cs.append("\\" + c)
         else:
             cs.append(c)
     # accept carriage-return(s) before final newline
-    if cs[-1] == '\n':
-        cs[-1] = '\r*\n'
-    return bytes(''.join(cs), 'utf8')
+    if cs[-1] == "\n":
+        cs[-1] = "\r*\n"
+    return bytes("".join(cs), "utf8")
 
 
 def run_micropython(pyb, args, test_file, is_special=False):
     special_tests = (
-        'micropython/meminfo.py', 'basics/bytes_compare3.py',
-        'basics/builtin_help.py', 'thread/thread_exc2.py',
-        'esp32/partition_ota.py',
+        "micropython/meminfo.py",
+        "basics/bytes_compare3.py",
+        "basics/builtin_help.py",
+        "thread/thread_exc2.py",
+        "esp32/partition_ota.py",
     )
     had_crash = False
     if pyb is None:
         # run on PC
-        if test_file.startswith(('cmdline/', base_path('feature_check/'))) or test_file in special_tests:
+        if (
+            test_file.startswith(("cmdline/", base_path("feature_check/")))
+            or test_file in special_tests
+        ):
             # special handling for tests of the unix cmdline program
             is_special = True
 
         if is_special:
             # check for any cmdline options needed for this test
             args = [MICROPYTHON]
-            with open(test_file, 'rb') as f:
+            with open(test_file, "rb") as f:
                 line = f.readline()
-                if line.startswith(b'# cmdline:'):
+                if line.startswith(b"# cmdline:"):
                     # subprocess.check_output on Windows only accepts strings, not bytes
-                    args += [str(c, 'utf-8') for c in line[10:].strip().split()]
+                    args += [str(c, "utf-8") for c in line[10:].strip().split()]
 
             # run the test, possibly with redirected input
             try:
-                if 'repl_' in test_file:
+                if "repl_" in test_file:
                     # Need to use a PTY to test command line editing
                     try:
                         import pty
                     except ImportError:
                         # in case pty module is not available, like on Windows
-                        return b'SKIP\n'
+                        return b"SKIP\n"
                     import select
 
                     def get(required=False):
-                        rv = b''
+                        rv = b""
                         while True:
                             ready = select.select([master], [], [], 0.02)
                             if ready[0] == [master]:
@@ -111,14 +119,15 @@ def send_get(what):
                         os.write(master, what)
                         return get()
 
-                    with open(test_file, 'rb') as f:
+                    with open(test_file, "rb") as f:
                         # instead of: output_mupy = subprocess.check_output(args, stdin=f)
                         master, slave = pty.openpty()
-                        p = subprocess.Popen(args, stdin=slave, stdout=slave,
-                                             stderr=subprocess.STDOUT, bufsize=0)
+                        p = subprocess.Popen(
+                            args, stdin=slave, stdout=slave, stderr=subprocess.STDOUT, bufsize=0
+                        )
                         banner = get(True)
-                        output_mupy = banner + b''.join(send_get(line) for line in f)
-                        send_get(b'\x04') # exit the REPL, so coverage info is saved
+                        output_mupy = banner + b"".join(send_get(line) for line in f)
+                        send_get(b"\x04")  # exit the REPL, so coverage info is saved
                         # At this point the process might have exited already, but trying to
                         # kill it 'again' normally doesn't result in exceptions as Python and/or
                         # the OS seem to try to handle this nicely. When running Linux on WSL
@@ -132,22 +141,28 @@ def send_get(what):
                         os.close(master)
                         os.close(slave)
                 else:
-                    output_mupy = subprocess.check_output(args + [test_file], stderr=subprocess.STDOUT)
+                    output_mupy = subprocess.check_output(
+                        args + [test_file], stderr=subprocess.STDOUT
+                    )
             except subprocess.CalledProcessError:
-                return b'CRASH'
+                return b"CRASH"
 
         else:
             # a standard test run on PC
 
             # create system command
-            cmdlist = [MICROPYTHON, '-X', 'emit=' + args.emit]
+            cmdlist = [MICROPYTHON, "-X", "emit=" + args.emit]
             if args.heapsize is not None:
-                cmdlist.extend(['-X', 'heapsize=' + args.heapsize])
+                cmdlist.extend(["-X", "heapsize=" + args.heapsize])
 
             # if running via .mpy, first compile the .py file
             if args.via_mpy:
-                subprocess.check_output([MPYCROSS] + args.mpy_cross_flags.split() + ['-o', 'mpytest.mpy', '-X', 'emit=' + args.emit, test_file])
-                cmdlist.extend(['-m', 'mpytest'])
+                subprocess.check_output(
+                    [MPYCROSS]
+                    + args.mpy_cross_flags.split()
+                    + ["-o", "mpytest.mpy", "-X", "emit=" + args.emit, test_file]
+                )
+                cmdlist.extend(["-m", "mpytest"])
             else:
                 cmdlist.append(test_file)
 
@@ -156,11 +171,11 @@ def send_get(what):
                 output_mupy = subprocess.check_output(cmdlist, stderr=subprocess.STDOUT)
             except subprocess.CalledProcessError as er:
                 had_crash = True
-                output_mupy = er.output + b'CRASH'
+                output_mupy = er.output + b"CRASH"
 
             # clean up if we had an intermediate .mpy file
             if args.via_mpy:
-                rm_f('mpytest.mpy')
+                rm_f("mpytest.mpy")
 
     else:
         # run on pyboard
@@ -169,56 +184,58 @@ def send_get(what):
             output_mupy = pyb.execfile(test_file)
         except pyboard.PyboardError as e:
             had_crash = True
-            if not is_special and e.args[0] == 'exception':
-                output_mupy = e.args[1] + e.args[2] + b'CRASH'
+            if not is_special and e.args[0] == "exception":
+                output_mupy = e.args[1] + e.args[2] + b"CRASH"
             else:
-                output_mupy = b'CRASH'
+                output_mupy = b"CRASH"
 
     # canonical form for all ports/platforms is to use \n for end-of-line
-    output_mupy = output_mupy.replace(b'\r\n', b'\n')
+    output_mupy = output_mupy.replace(b"\r\n", b"\n")
 
     # don't try to convert the output if we should skip this test
-    if had_crash or output_mupy in (b'SKIP\n', b'CRASH'):
+    if had_crash or output_mupy in (b"SKIP\n", b"CRASH"):
         return output_mupy
 
     if is_special or test_file in special_tests:
         # convert parts of the output that are not stable across runs
-        with open(test_file + '.exp', 'rb') as f:
+        with open(test_file + ".exp", "rb") as f:
             lines_exp = []
             for line in f.readlines():
-                if line == b'########\n':
+                if line == b"########\n":
                     line = (line,)
                 else:
                     line = (line, re.compile(convert_regex_escapes(line)))
                 lines_exp.append(line)
-        lines_mupy = [line + b'\n' for line in output_mupy.split(b'\n')]
-        if output_mupy.endswith(b'\n'):
-            lines_mupy = lines_mupy[:-1] # remove erroneous last empty line
+        lines_mupy = [line + b"\n" for line in output_mupy.split(b"\n")]
+        if output_mupy.endswith(b"\n"):
+            lines_mupy = lines_mupy[:-1]  # remove erroneous last empty line
         i_mupy = 0
         for i in range(len(lines_exp)):
-            if lines_exp[i][0] == b'########\n':
+            if lines_exp[i][0] == b"########\n":
                 # 8x #'s means match 0 or more whole lines
                 line_exp = lines_exp[i + 1]
                 skip = 0
-                while i_mupy + skip < len(lines_mupy) and not line_exp[1].match(lines_mupy[i_mupy + skip]):
+                while i_mupy + skip < len(lines_mupy) and not line_exp[1].match(
+                    lines_mupy[i_mupy + skip]
+                ):
                     skip += 1
                 if i_mupy + skip >= len(lines_mupy):
-                    lines_mupy[i_mupy] = b'######## FAIL\n'
+                    lines_mupy[i_mupy] = b"######## FAIL\n"
                     break
-                del lines_mupy[i_mupy:i_mupy + skip]
-                lines_mupy.insert(i_mupy, b'########\n')
+                del lines_mupy[i_mupy : i_mupy + skip]
+                lines_mupy.insert(i_mupy, b"########\n")
                 i_mupy += 1
             else:
                 # a regex
                 if lines_exp[i][1].match(lines_mupy[i_mupy]):
                     lines_mupy[i_mupy] = lines_exp[i][0]
                 else:
-                    #print("don't match: %r %s" % (lines_exp[i][1], lines_mupy[i_mupy])) # DEBUG
+                    # print("don't match: %r %s" % (lines_exp[i][1], lines_mupy[i_mupy])) # DEBUG
                     pass
                 i_mupy += 1
             if i_mupy >= len(lines_mupy):
                 break
-        output_mupy = b''.join(lines_mupy)
+        output_mupy = b"".join(lines_mupy)
 
     return output_mupy
 
@@ -261,193 +278,220 @@ def run_tests(pyb, tests, args, result_dir):
         # run-tests.py script itself so use base_path.
 
         # Check if micropython.native is supported, and skip such tests if it's not
-        output = run_feature_check(pyb, args, base_path, 'native_check.py')
-        if output == b'CRASH':
+        output = run_feature_check(pyb, args, base_path, "native_check.py")
+        if output == b"CRASH":
             skip_native = True
 
         # Check if arbitrary-precision integers are supported, and skip such tests if it's not
-        output = run_feature_check(pyb, args, base_path, 'int_big.py')
-        if output != b'1000000000000000000000000000000000000000000000\n':
+        output = run_feature_check(pyb, args, base_path, "int_big.py")
+        if output != b"1000000000000000000000000000000000000000000000\n":
             skip_int_big = True
 
         # Check if bytearray is supported, and skip such tests if it's not
-        output = run_feature_check(pyb, args, base_path, 'bytearray.py')
-        if output != b'bytearray\n':
+        output = run_feature_check(pyb, args, base_path, "bytearray.py")
+        if output != b"bytearray\n":
             skip_bytearray = True
 
         # Check if set type (and set literals) is supported, and skip such tests if it's not
-        output = run_feature_check(pyb, args, base_path, 'set_check.py')
-        if output == b'CRASH':
+        output = run_feature_check(pyb, args, base_path, "set_check.py")
+        if output == b"CRASH":
             skip_set_type = True
 
         # Check if slice is supported, and skip such tests if it's not
-        output = run_feature_check(pyb, args, base_path, 'slice.py')
-        if output != b'slice\n':
+        output = run_feature_check(pyb, args, base_path, "slice.py")
+        if output != b"slice\n":
             skip_slice = True
 
         # Check if async/await keywords are supported, and skip such tests if it's not
-        output = run_feature_check(pyb, args, base_path, 'async_check.py')
-        if output == b'CRASH':
+        output = run_feature_check(pyb, args, base_path, "async_check.py")
+        if output == b"CRASH":
             skip_async = True
 
         # Check if const keyword (MicroPython extension) is supported, and skip such tests if it's not
-        output = run_feature_check(pyb, args, base_path, 'const.py')
-        if output == b'CRASH':
+        output = run_feature_check(pyb, args, base_path, "const.py")
+        if output == b"CRASH":
             skip_const = True
 
         # Check if __rOP__ special methods are supported, and skip such tests if it's not
-        output = run_feature_check(pyb, args, base_path, 'reverse_ops.py')
-        if output == b'TypeError\n':
+        output = run_feature_check(pyb, args, base_path, "reverse_ops.py")
+        if output == b"TypeError\n":
             skip_revops = True
 
         # Check if uio module exists, and skip such tests if it doesn't
-        output = run_feature_check(pyb, args, base_path, 'uio_module.py')
-        if output != b'uio\n':
+        output = run_feature_check(pyb, args, base_path, "uio_module.py")
+        if output != b"uio\n":
             skip_io_module = True
 
         # Check if emacs repl is supported, and skip such tests if it's not
-        t = run_feature_check(pyb, args, base_path, 'repl_emacs_check.py')
-        if 'True' not in str(t, 'ascii'):
-            skip_tests.add('cmdline/repl_emacs_keys.py')
+        t = run_feature_check(pyb, args, base_path, "repl_emacs_check.py")
+        if "True" not in str(t, "ascii"):
+            skip_tests.add("cmdline/repl_emacs_keys.py")
 
         # Check if words movement in repl is supported, and skip such tests if it's not
-        t = run_feature_check(pyb, args, base_path, 'repl_words_move_check.py')
-        if 'True' not in str(t, 'ascii'):
-            skip_tests.add('cmdline/repl_words_move.py')
+        t = run_feature_check(pyb, args, base_path, "repl_words_move_check.py")
+        if "True" not in str(t, "ascii"):
+            skip_tests.add("cmdline/repl_words_move.py")
 
-        upy_byteorder = run_feature_check(pyb, args, base_path, 'byteorder.py')
-        upy_float_precision = run_feature_check(pyb, args, base_path, 'float.py')
-        if upy_float_precision == b'CRASH':
+        upy_byteorder = run_feature_check(pyb, args, base_path, "byteorder.py")
+        upy_float_precision = run_feature_check(pyb, args, base_path, "float.py")
+        if upy_float_precision == b"CRASH":
             upy_float_precision = 0
         else:
             upy_float_precision = int(upy_float_precision)
-        has_complex = run_feature_check(pyb, args, base_path, 'complex.py') == b'complex\n'
-        has_coverage = run_feature_check(pyb, args, base_path, 'coverage.py') == b'coverage\n'
-        cpy_byteorder = subprocess.check_output(CPYTHON3_CMD + [base_path('feature_check/byteorder.py')])
-        skip_endian = (upy_byteorder != cpy_byteorder)
+        has_complex = run_feature_check(pyb, args, base_path, "complex.py") == b"complex\n"
+        has_coverage = run_feature_check(pyb, args, base_path, "coverage.py") == b"coverage\n"
+        cpy_byteorder = subprocess.check_output(
+            CPYTHON3_CMD + [base_path("feature_check/byteorder.py")]
+        )
+        skip_endian = upy_byteorder != cpy_byteorder
 
     # These tests don't test slice explicitly but rather use it to perform the test
     misc_slice_tests = (
-        'builtin_range',
-        'class_super',
-        'containment',
-        'errno1',
-        'fun_str',
-        'generator1',
-        'globals_del',
-        'memoryview1',
-        'memoryview_gc',
-        'object1',
-        'python34',
-        'struct_endian',
+        "builtin_range",
+        "class_super",
+        "containment",
+        "errno1",
+        "fun_str",
+        "generator1",
+        "globals_del",
+        "memoryview1",
+        "memoryview_gc",
+        "object1",
+        "python34",
+        "struct_endian",
     )
 
     # Some tests shouldn't be run on GitHub Actions
-    if os.getenv('GITHUB_ACTIONS') == 'true':
-        skip_tests.add('thread/stress_schedule.py') # has reliability issues
+    if os.getenv("GITHUB_ACTIONS") == "true":
+        skip_tests.add("thread/stress_schedule.py")  # has reliability issues
 
     if upy_float_precision == 0:
-        skip_tests.add('extmod/uctypes_le_float.py')
-        skip_tests.add('extmod/uctypes_native_float.py')
-        skip_tests.add('extmod/uctypes_sizeof_float.py')
-        skip_tests.add('extmod/ujson_dumps_float.py')
-        skip_tests.add('extmod/ujson_loads_float.py')
-        skip_tests.add('extmod/urandom_extra_float.py')
-        skip_tests.add('misc/rge_sm.py')
+        skip_tests.add("extmod/uctypes_le_float.py")
+        skip_tests.add("extmod/uctypes_native_float.py")
+        skip_tests.add("extmod/uctypes_sizeof_float.py")
+        skip_tests.add("extmod/ujson_dumps_float.py")
+        skip_tests.add("extmod/ujson_loads_float.py")
+        skip_tests.add("extmod/urandom_extra_float.py")
+        skip_tests.add("misc/rge_sm.py")
     if upy_float_precision < 32:
-        skip_tests.add('float/float2int_intbig.py') # requires fp32, there's float2int_fp30_intbig.py instead
-        skip_tests.add('float/string_format.py') # requires fp32, there's string_format_fp30.py instead
-        skip_tests.add('float/bytes_construct.py') # requires fp32
-        skip_tests.add('float/bytearray_construct.py') # requires fp32
+        skip_tests.add(
+            "float/float2int_intbig.py"
+        )  # requires fp32, there's float2int_fp30_intbig.py instead
+        skip_tests.add(
+            "float/string_format.py"
+        )  # requires fp32, there's string_format_fp30.py instead
+        skip_tests.add("float/bytes_construct.py")  # requires fp32
+        skip_tests.add("float/bytearray_construct.py")  # requires fp32
     if upy_float_precision < 64:
-        skip_tests.add('float/float_divmod.py') # tested by float/float_divmod_relaxed.py instead
-        skip_tests.add('float/float2int_doubleprec_intbig.py')
-        skip_tests.add('float/float_parse_doubleprec.py')
+        skip_tests.add("float/float_divmod.py")  # tested by float/float_divmod_relaxed.py instead
+        skip_tests.add("float/float2int_doubleprec_intbig.py")
+        skip_tests.add("float/float_parse_doubleprec.py")
 
     if not has_complex:
-        skip_tests.add('float/complex1.py')
-        skip_tests.add('float/complex1_intbig.py')
-        skip_tests.add('float/complex_special_methods.py')
-        skip_tests.add('float/int_big_float.py')
-        skip_tests.add('float/true_value.py')
-        skip_tests.add('float/types.py')
+        skip_tests.add("float/complex1.py")
+        skip_tests.add("float/complex1_intbig.py")
+        skip_tests.add("float/complex_special_methods.py")
+        skip_tests.add("float/int_big_float.py")
+        skip_tests.add("float/true_value.py")
+        skip_tests.add("float/types.py")
 
     if not has_coverage:
-        skip_tests.add('cmdline/cmd_parsetree.py')
+        skip_tests.add("cmdline/cmd_parsetree.py")
 
     # Some tests shouldn't be run on a PC
-    if args.target == 'unix':
+    if args.target == "unix":
         # unix build does not have the GIL so can't run thread mutation tests
         for t in tests:
-            if t.startswith('thread/mutate_'):
+            if t.startswith("thread/mutate_"):
                 skip_tests.add(t)
 
     # Some tests shouldn't be run on pyboard
-    if args.target != 'unix':
-        skip_tests.add('basics/exception_chain.py') # warning is not printed
-        skip_tests.add('micropython/meminfo.py') # output is very different to PC output
-        skip_tests.add('extmod/machine_mem.py') # raw memory access not supported
-
-        if args.target == 'wipy':
-            skip_tests.add('misc/print_exception.py')       # requires error reporting full
-            skip_tests.update({'extmod/uctypes_%s.py' % t for t in 'bytearray le native_le ptr_le ptr_native_le sizeof sizeof_native array_assign_le array_assign_native_le'.split()}) # requires uctypes
-            skip_tests.add('extmod/zlibd_decompress.py')    # requires zlib
-            skip_tests.add('extmod/uheapq1.py')             # uheapq not supported by WiPy
-            skip_tests.add('extmod/urandom_basic.py')       # requires urandom
-            skip_tests.add('extmod/urandom_extra.py')       # requires urandom
-        elif args.target == 'esp8266':
-            skip_tests.add('misc/rge_sm.py')                # too large
-        elif args.target == 'minimal':
-            skip_tests.add('basics/class_inplace_op.py')    # all special methods not supported
-            skip_tests.add('basics/subclass_native_init.py')# native subclassing corner cases not support
-            skip_tests.add('misc/rge_sm.py')                # too large
-            skip_tests.add('micropython/opt_level.py')      # don't assume line numbers are stored
-        elif args.target == 'nrf':
-            skip_tests.add('basics/memoryview1.py')         # no item assignment for memoryview
-            skip_tests.add('extmod/urandom_basic.py')       # unimplemented: urandom.seed
-            skip_tests.add('micropython/opt_level.py')      # no support for line numbers
-            skip_tests.add('misc/non_compliant.py')         # no item assignment for bytearray
+    if args.target != "unix":
+        skip_tests.add("basics/exception_chain.py")  # warning is not printed
+        skip_tests.add("micropython/meminfo.py")  # output is very different to PC output
+        skip_tests.add("extmod/machine_mem.py")  # raw memory access not supported
+
+        if args.target == "wipy":
+            skip_tests.add("misc/print_exception.py")  # requires error reporting full
+            skip_tests.update(
+                {
+                    "extmod/uctypes_%s.py" % t
+                    for t in "bytearray le native_le ptr_le ptr_native_le sizeof sizeof_native array_assign_le array_assign_native_le".split()
+                }
+            )  # requires uctypes
+            skip_tests.add("extmod/zlibd_decompress.py")  # requires zlib
+            skip_tests.add("extmod/uheapq1.py")  # uheapq not supported by WiPy
+            skip_tests.add("extmod/urandom_basic.py")  # requires urandom
+            skip_tests.add("extmod/urandom_extra.py")  # requires urandom
+        elif args.target == "esp8266":
+            skip_tests.add("misc/rge_sm.py")  # too large
+        elif args.target == "minimal":
+            skip_tests.add("basics/class_inplace_op.py")  # all special methods not supported
+            skip_tests.add(
+                "basics/subclass_native_init.py"
+            )  # native subclassing corner cases not support
+            skip_tests.add("misc/rge_sm.py")  # too large
+            skip_tests.add("micropython/opt_level.py")  # don't assume line numbers are stored
+        elif args.target == "nrf":
+            skip_tests.add("basics/memoryview1.py")  # no item assignment for memoryview
+            skip_tests.add("extmod/urandom_basic.py")  # unimplemented: urandom.seed
+            skip_tests.add("micropython/opt_level.py")  # no support for line numbers
+            skip_tests.add("misc/non_compliant.py")  # no item assignment for bytearray
             for t in tests:
-                if t.startswith('basics/io_'):
+                if t.startswith("basics/io_"):
                     skip_tests.add(t)
-        elif args.target == 'qemu-arm':
-            skip_tests.add('misc/print_exception.py')       # requires sys stdfiles
+        elif args.target == "qemu-arm":
+            skip_tests.add("misc/print_exception.py")  # requires sys stdfiles
 
     # Some tests are known to fail on 64-bit machines
-    if pyb is None and platform.architecture()[0] == '64bit':
+    if pyb is None and platform.architecture()[0] == "64bit":
         pass
 
     # Some tests use unsupported features on Windows
-    if os.name == 'nt':
-        skip_tests.add('import/import_file.py') # works but CPython prints forward slashes
+    if os.name == "nt":
+        skip_tests.add("import/import_file.py")  # works but CPython prints forward slashes
 
     # Some tests are known to fail with native emitter
     # Remove them from the below when they work
-    if args.emit == 'native':
-        skip_tests.update({'basics/%s.py' % t for t in 'gen_yield_from_close generator_name'.split()}) # require raise_varargs, generator name
-        skip_tests.update({'basics/async_%s.py' % t for t in 'with with2 with_break with_return'.split()}) # require async_with
-        skip_tests.update({'basics/%s.py' % t for t in 'try_reraise try_reraise2'.split()}) # require raise_varargs
-        skip_tests.add('basics/annotate_var.py') # requires checking for unbound local
-        skip_tests.add('basics/del_deref.py') # requires checking for unbound local
-        skip_tests.add('basics/del_local.py') # requires checking for unbound local
-        skip_tests.add('basics/exception_chain.py') # raise from is not supported
-        skip_tests.add('basics/scope_implicit.py') # requires checking for unbound local
-        skip_tests.add('basics/try_finally_return2.py') # requires raise_varargs
-        skip_tests.add('basics/unboundlocal.py') # requires checking for unbound local
-        skip_tests.add('extmod/uasyncio_event.py') # unknown issue
-        skip_tests.add('extmod/uasyncio_lock.py') # requires async with
-        skip_tests.add('extmod/uasyncio_micropython.py') # unknown issue
-        skip_tests.add('extmod/uasyncio_wait_for.py') # unknown issue
-        skip_tests.add('misc/features.py') # requires raise_varargs
-        skip_tests.add('misc/print_exception.py') # because native doesn't have proper traceback info
-        skip_tests.add('misc/sys_exc_info.py') # sys.exc_info() is not supported for native
-        skip_tests.add('micropython/emg_exc.py') # because native doesn't have proper traceback info
-        skip_tests.add('micropython/heapalloc_traceback.py') # because native doesn't have proper traceback info
-        skip_tests.add('micropython/opt_level_lineno.py') # native doesn't have proper traceback info
-        skip_tests.add('micropython/schedule.py') # native code doesn't check pending events
+    if args.emit == "native":
+        skip_tests.update(
+            {"basics/%s.py" % t for t in "gen_yield_from_close generator_name".split()}
+        )  # require raise_varargs, generator name
+        skip_tests.update(
+            {"basics/async_%s.py" % t for t in "with with2 with_break with_return".split()}
+        )  # require async_with
+        skip_tests.update(
+            {"basics/%s.py" % t for t in "try_reraise try_reraise2".split()}
+        )  # require raise_varargs
+        skip_tests.add("basics/annotate_var.py")  # requires checking for unbound local
+        skip_tests.add("basics/del_deref.py")  # requires checking for unbound local
+        skip_tests.add("basics/del_local.py")  # requires checking for unbound local
+        skip_tests.add("basics/exception_chain.py")  # raise from is not supported
+        skip_tests.add("basics/scope_implicit.py")  # requires checking for unbound local
+        skip_tests.add("basics/try_finally_return2.py")  # requires raise_varargs
+        skip_tests.add("basics/unboundlocal.py")  # requires checking for unbound local
+        skip_tests.add("extmod/uasyncio_event.py")  # unknown issue
+        skip_tests.add("extmod/uasyncio_lock.py")  # requires async with
+        skip_tests.add("extmod/uasyncio_micropython.py")  # unknown issue
+        skip_tests.add("extmod/uasyncio_wait_for.py")  # unknown issue
+        skip_tests.add("misc/features.py")  # requires raise_varargs
+        skip_tests.add(
+            "misc/print_exception.py"
+        )  # because native doesn't have proper traceback info
+        skip_tests.add("misc/sys_exc_info.py")  # sys.exc_info() is not supported for native
+        skip_tests.add(
+            "micropython/emg_exc.py"
+        )  # because native doesn't have proper traceback info
+        skip_tests.add(
+            "micropython/heapalloc_traceback.py"
+        )  # because native doesn't have proper traceback info
+        skip_tests.add(
+            "micropython/opt_level_lineno.py"
+        )  # native doesn't have proper traceback info
+        skip_tests.add("micropython/schedule.py")  # native code doesn't check pending events
 
     for test_file in tests:
-        test_file = test_file.replace('\\', '/')
+        test_file = test_file.replace("\\", "/")
 
         if args.filters:
             # Default verdict is the opposit of the first action
@@ -458,9 +502,13 @@ def run_tests(pyb, tests, args, result_dir):
             if verdict == "exclude":
                 continue
 
-        test_basename = test_file.replace('..', '_').replace('./', '').replace('/', '_')
+        test_basename = test_file.replace("..", "_").replace("./", "").replace("/", "_")
         test_name = os.path.splitext(os.path.basename(test_file))[0]
-        is_native = test_name.startswith("native_") or test_name.startswith("viper_") or args.emit == "native"
+        is_native = (
+            test_name.startswith("native_")
+            or test_name.startswith("viper_")
+            or args.emit == "native"
+        )
         is_endian = test_name.endswith("_endian")
         is_int_big = test_name.startswith("int_big") or test_name.endswith("_intbig")
         is_bytearray = test_name.startswith("bytearray") or test_name.endswith("_bytearray")
@@ -493,23 +541,23 @@ def run_tests(pyb, tests, args, result_dir):
             continue
 
         # get expected output
-        test_file_expected = test_file + '.exp'
+        test_file_expected = test_file + ".exp"
         if os.path.isfile(test_file_expected):
             # expected output given by a file, so read that in
-            with open(test_file_expected, 'rb') as f:
+            with open(test_file_expected, "rb") as f:
                 output_expected = f.read()
         else:
             # run CPython to work out expected output
             try:
                 output_expected = subprocess.check_output(CPYTHON3_CMD + [test_file])
                 if args.write_exp:
-                    with open(test_file_expected, 'wb') as f:
+                    with open(test_file_expected, "wb") as f:
                         f.write(output_expected)
             except subprocess.CalledProcessError:
-                output_expected = b'CPYTHON3 CRASH'
+                output_expected = b"CPYTHON3 CRASH"
 
         # canonical form for all host platforms is to use \n for end-of-line
-        output_expected = output_expected.replace(b'\r\n', b'\n')
+        output_expected = output_expected.replace(b"\r\n", b"\n")
 
         if args.write_exp:
             continue
@@ -517,7 +565,7 @@ def run_tests(pyb, tests, args, result_dir):
         # run MicroPython
         output_mupy = run_micropython(pyb, args, test_file)
 
-        if output_mupy == b'SKIP\n':
+        if output_mupy == b"SKIP\n":
             print("skip ", test_file)
             skipped_tests.append(test_name)
             continue
@@ -549,9 +597,9 @@ def run_tests(pyb, tests, args, result_dir):
     print("{} tests passed".format(passed_count))
 
     if len(skipped_tests) > 0:
-        print("{} tests skipped: {}".format(len(skipped_tests), ' '.join(skipped_tests)))
+        print("{} tests skipped: {}".format(len(skipped_tests), " ".join(skipped_tests)))
     if len(failed_tests) > 0:
-        print("{} tests failed: {}".format(len(failed_tests), ' '.join(failed_tests)))
+        print("{} tests failed: {}".format(len(failed_tests), " ".join(failed_tests)))
         return False
 
     # all tests succeeded
@@ -559,7 +607,6 @@ def run_tests(pyb, tests, args, result_dir):
 
 
 class append_filter(argparse.Action):
-
     def __init__(self, option_strings, dest, **kwargs):
         super().__init__(option_strings, dest, default=[], **kwargs)
 
@@ -576,7 +623,7 @@ def __call__(self, parser, args, value, option):
 def main():
     cmd_parser = argparse.ArgumentParser(
         formatter_class=argparse.RawDescriptionHelpFormatter,
-        description='''Run and manage tests for MicroPython.
+        description="""Run and manage tests for MicroPython.
 
 Tests are discovered by scanning test directories for .py files or using the
 specified test files. If test files nor directories are specified, the script
@@ -587,34 +634,81 @@ def main():
 case it is used as comparison.
 If a test fails, run-tests.py produces a pair of <test>.out and <test>.exp files in the result
 directory with the MicroPython output and the expectations, respectively.
-''',
-        epilog='''\
+""",
+        epilog="""\
 Options -i and -e can be multiple and processed in the order given. Regex
 "search" (vs "match") operation is used. An action (include/exclude) of
 the last matching regex is used:
   run-tests.py -i async - exclude all, then include tests containing "async" anywhere
   run-tests.py -e '/big.+int' - include all, then exclude by regex
   run-tests.py -e async -i async_foo - include all, exclude async, yet still include async_foo
-''')
-    cmd_parser.add_argument('--target', default='unix', help='the target platform')
-    cmd_parser.add_argument('--device', default='/dev/ttyACM0', help='the serial device or the IP address of the pyboard')
-    cmd_parser.add_argument('-b', '--baudrate', default=115200, help='the baud rate of the serial device')
-    cmd_parser.add_argument('-u', '--user', default='micro', help='the telnet login username')
-    cmd_parser.add_argument('-p', '--password', default='python', help='the telnet login password')
-    cmd_parser.add_argument('-d', '--test-dirs', nargs='*', help='input test directories (if no files given)')
-    cmd_parser.add_argument('-r', '--result-dir', default=base_path('results'), help='directory for test results')
-    cmd_parser.add_argument('-e', '--exclude', action=append_filter, metavar='REGEX', dest='filters', help='exclude test by regex on path/name.py')
-    cmd_parser.add_argument('-i', '--include', action=append_filter, metavar='REGEX', dest='filters', help='include test by regex on path/name.py')
-    cmd_parser.add_argument('--write-exp', action='store_true', help='use CPython to generate .exp files to run tests w/o CPython')
-    cmd_parser.add_argument('--list-tests', action='store_true', help='list tests instead of running them')
-    cmd_parser.add_argument('--emit', default='bytecode', help='MicroPython emitter to use (bytecode or native)')
-    cmd_parser.add_argument('--heapsize', help='heapsize to use (use default if not specified)')
-    cmd_parser.add_argument('--via-mpy', action='store_true', help='compile .py files to .mpy first')
-    cmd_parser.add_argument('--mpy-cross-flags', default='-mcache-lookup-bc', help='flags to pass to mpy-cross')
-    cmd_parser.add_argument('--keep-path', action='store_true', help='do not clear MICROPYPATH when running tests')
-    cmd_parser.add_argument('files', nargs='*', help='input test files')
-    cmd_parser.add_argument('--print-failures', action='store_true', help='print the diff of expected vs. actual output for failed tests and exit')
-    cmd_parser.add_argument('--clean-failures', action='store_true', help='delete the .exp and .out files from failed tests and exit')
+""",
+    )
+    cmd_parser.add_argument("--target", default="unix", help="the target platform")
+    cmd_parser.add_argument(
+        "--device",
+        default="/dev/ttyACM0",
+        help="the serial device or the IP address of the pyboard",
+    )
+    cmd_parser.add_argument(
+        "-b", "--baudrate", default=115200, help="the baud rate of the serial device"
+    )
+    cmd_parser.add_argument("-u", "--user", default="micro", help="the telnet login username")
+    cmd_parser.add_argument("-p", "--password", default="python", help="the telnet login password")
+    cmd_parser.add_argument(
+        "-d", "--test-dirs", nargs="*", help="input test directories (if no files given)"
+    )
+    cmd_parser.add_argument(
+        "-r", "--result-dir", default=base_path("results"), help="directory for test results"
+    )
+    cmd_parser.add_argument(
+        "-e",
+        "--exclude",
+        action=append_filter,
+        metavar="REGEX",
+        dest="filters",
+        help="exclude test by regex on path/name.py",
+    )
+    cmd_parser.add_argument(
+        "-i",
+        "--include",
+        action=append_filter,
+        metavar="REGEX",
+        dest="filters",
+        help="include test by regex on path/name.py",
+    )
+    cmd_parser.add_argument(
+        "--write-exp",
+        action="store_true",
+        help="use CPython to generate .exp files to run tests w/o CPython",
+    )
+    cmd_parser.add_argument(
+        "--list-tests", action="store_true", help="list tests instead of running them"
+    )
+    cmd_parser.add_argument(
+        "--emit", default="bytecode", help="MicroPython emitter to use (bytecode or native)"
+    )
+    cmd_parser.add_argument("--heapsize", help="heapsize to use (use default if not specified)")
+    cmd_parser.add_argument(
+        "--via-mpy", action="store_true", help="compile .py files to .mpy first"
+    )
+    cmd_parser.add_argument(
+        "--mpy-cross-flags", default="-mcache-lookup-bc", help="flags to pass to mpy-cross"
+    )
+    cmd_parser.add_argument(
+        "--keep-path", action="store_true", help="do not clear MICROPYPATH when running tests"
+    )
+    cmd_parser.add_argument("files", nargs="*", help="input test files")
+    cmd_parser.add_argument(
+        "--print-failures",
+        action="store_true",
+        help="print the diff of expected vs. actual output for failed tests and exit",
+    )
+    cmd_parser.add_argument(
+        "--clean-failures",
+        action="store_true",
+        help="delete the .exp and .out files from failed tests and exit",
+    )
     args = cmd_parser.parse_args()
 
     if args.print_failures:
@@ -627,55 +721,82 @@ def main():
         sys.exit(0)
 
     if args.clean_failures:
-        for f in glob(os.path.join(args.result_dir, "*.exp")) + glob(os.path.join(args.result_dir, "*.out")):
+        for f in glob(os.path.join(args.result_dir, "*.exp")) + glob(
+            os.path.join(args.result_dir, "*.out")
+        ):
             os.remove(f)
 
         sys.exit(0)
 
-    LOCAL_TARGETS = ('unix', 'qemu-arm',)
-    EXTERNAL_TARGETS = ('pyboard', 'wipy', 'esp8266', 'esp32', 'minimal', 'nrf')
+    LOCAL_TARGETS = (
+        "unix",
+        "qemu-arm",
+    )
+    EXTERNAL_TARGETS = ("pyboard", "wipy", "esp8266", "esp32", "minimal", "nrf")
     if args.target in LOCAL_TARGETS or args.list_tests:
         pyb = None
     elif args.target in EXTERNAL_TARGETS:
         global pyboard
-        sys.path.append(base_path('../tools'))
+        sys.path.append(base_path("../tools"))
         import pyboard
+
         pyb = pyboard.Pyboard(args.device, args.baudrate, args.user, args.password)
         pyb.enter_raw_repl()
     else:
-        raise ValueError('target must be one of %s' % ", ".join(LOCAL_TARGETS + EXTERNAL_TARGETS))
+        raise ValueError("target must be one of %s" % ", ".join(LOCAL_TARGETS + EXTERNAL_TARGETS))
 
     if len(args.files) == 0:
         if args.test_dirs is None:
-            test_dirs = ('basics', 'micropython', 'misc', 'extmod',)
-            if args.target == 'pyboard':
+            test_dirs = (
+                "basics",
+                "micropython",
+                "misc",
+                "extmod",
+            )
+            if args.target == "pyboard":
                 # run pyboard tests
-                test_dirs += ('float', 'stress', 'pyb', 'pybnative', 'inlineasm')
-            elif args.target in ('esp8266', 'esp32', 'minimal', 'nrf'):
-                test_dirs += ('float',)
-            elif args.target == 'wipy':
+                test_dirs += ("float", "stress", "pyb", "pybnative", "inlineasm")
+            elif args.target in ("esp8266", "esp32", "minimal", "nrf"):
+                test_dirs += ("float",)
+            elif args.target == "wipy":
                 # run WiPy tests
-                test_dirs += ('wipy',)
-            elif args.target == 'unix':
+                test_dirs += ("wipy",)
+            elif args.target == "unix":
                 # run PC tests
-                test_dirs += ('float', 'import', 'io', 'stress', 'unicode', 'unix', 'cmdline',)
-            elif args.target == 'qemu-arm':
+                test_dirs += (
+                    "float",
+                    "import",
+                    "io",
+                    "stress",
+                    "unicode",
+                    "unix",
+                    "cmdline",
+                )
+            elif args.target == "qemu-arm":
                 if not args.write_exp:
-                    raise ValueError('--target=qemu-arm must be used with --write-exp')
+                    raise ValueError("--target=qemu-arm must be used with --write-exp")
                 # Generate expected output files for qemu run.
                 # This list should match the test_dirs tuple in tinytest-codegen.py.
-                test_dirs += ('float', 'inlineasm', 'qemu-arm',)
+                test_dirs += (
+                    "float",
+                    "inlineasm",
+                    "qemu-arm",
+                )
         else:
             # run tests from these directories
             test_dirs = args.test_dirs
-        tests = sorted(test_file for test_files in (glob('{}/*.py'.format(dir)) for dir in test_dirs) for test_file in test_files)
+        tests = sorted(
+            test_file
+            for test_files in (glob("{}/*.py".format(dir)) for dir in test_dirs)
+            for test_file in test_files
+        )
     else:
         # tests explicitly given
         tests = args.files
 
     if not args.keep_path:
         # clear search path to make sure tests use only builtin modules and those in extmod
-        os.environ['MICROPYPATH'] = os.pathsep + base_path('../extmod')
+        os.environ["MICROPYPATH"] = os.pathsep + base_path("../extmod")
 
     try:
         os.makedirs(args.result_dir, exist_ok=True)
@@ -687,5 +808,6 @@ def main():
     if not res:
         sys.exit(1)
 
+
 if __name__ == "__main__":
     main()

From e98ff3f08e966595fd84d83296f84962ee3d8d94 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 12 Mar 2021 19:50:13 +1100
Subject: [PATCH 0682/3533] tests/multi_bluetooth: Skip tests when BLE features
 are unsupported.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/multi_bluetooth/ble_gap_pair.py      | 4 ++++
 tests/multi_bluetooth/ble_gap_pair_bond.py | 4 ++++
 tests/multi_bluetooth/ble_l2cap.py         | 4 ++++
 tests/multi_bluetooth/perf_l2cap.py        | 4 ++++
 4 files changed, 16 insertions(+)

diff --git a/tests/multi_bluetooth/ble_gap_pair.py b/tests/multi_bluetooth/ble_gap_pair.py
index 728513405ee79..f10fa37074010 100644
--- a/tests/multi_bluetooth/ble_gap_pair.py
+++ b/tests/multi_bluetooth/ble_gap_pair.py
@@ -4,6 +4,10 @@
 from micropython import const
 import time, machine, bluetooth
 
+if not hasattr(bluetooth.BLE, "gap_pair"):
+    print("SKIP")
+    raise SystemExit
+
 TIMEOUT_MS = 4000
 
 _IRQ_CENTRAL_CONNECT = const(1)
diff --git a/tests/multi_bluetooth/ble_gap_pair_bond.py b/tests/multi_bluetooth/ble_gap_pair_bond.py
index a29c217887b45..d7224cc127b1f 100644
--- a/tests/multi_bluetooth/ble_gap_pair_bond.py
+++ b/tests/multi_bluetooth/ble_gap_pair_bond.py
@@ -5,6 +5,10 @@
 from micropython import const
 import time, machine, bluetooth
 
+if not hasattr(bluetooth.BLE, "gap_pair"):
+    print("SKIP")
+    raise SystemExit
+
 TIMEOUT_MS = 4000
 
 _IRQ_CENTRAL_CONNECT = const(1)
diff --git a/tests/multi_bluetooth/ble_l2cap.py b/tests/multi_bluetooth/ble_l2cap.py
index a26f59b3ef0f9..b14eeffcc50db 100644
--- a/tests/multi_bluetooth/ble_l2cap.py
+++ b/tests/multi_bluetooth/ble_l2cap.py
@@ -7,6 +7,10 @@
 from micropython import const
 import time, machine, bluetooth, random
 
+if not hasattr(bluetooth.BLE, "l2cap_connect"):
+    print("SKIP")
+    raise SystemExit
+
 TIMEOUT_MS = 1000
 
 _IRQ_CENTRAL_CONNECT = const(1)
diff --git a/tests/multi_bluetooth/perf_l2cap.py b/tests/multi_bluetooth/perf_l2cap.py
index 9b07bb1dcef2f..0603a02a81dc2 100644
--- a/tests/multi_bluetooth/perf_l2cap.py
+++ b/tests/multi_bluetooth/perf_l2cap.py
@@ -3,6 +3,10 @@
 from micropython import const
 import time, machine, bluetooth, random
 
+if not hasattr(bluetooth.BLE, "l2cap_connect"):
+    print("SKIP")
+    raise SystemExit
+
 TIMEOUT_MS = 1000
 
 _IRQ_CENTRAL_CONNECT = const(1)

From af45d511f190454159fe39ba50c477d7bbd6bb5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kevin=20K=C3=B6ck?= <kevin.koeck@gmx.net>
Date: Sat, 13 Mar 2021 09:17:02 +0100
Subject: [PATCH 0683/3533] rp2: Enable uerrno module.

Fixes #6991.
---
 ports/rp2/mpconfigport.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/rp2/mpconfigport.h b/ports/rp2/mpconfigport.h
index 91d0c29b3ae0f..35d1645522588 100644
--- a/ports/rp2/mpconfigport.h
+++ b/ports/rp2/mpconfigport.h
@@ -88,6 +88,7 @@
 #define MICROPY_PY_SYS_STDFILES                 (1)
 #define MICROPY_PY_SYS_STDIO_BUFFER             (1)
 #define MICROPY_PY_SYS_PLATFORM                 "rp2"
+#define MICROPY_PY_UERRNO                       (1)
 #define MICROPY_PY_THREAD                       (1)
 #define MICROPY_PY_THREAD_GIL                   (0)
 

From 8010b15968dece822aa5318888cb6d969f36ef3b Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sun, 14 Mar 2021 00:17:22 +1100
Subject: [PATCH 0684/3533] rp2: Enabled more core Python features.

This brings the port's configuration closer to the stm32 and esp32 ports.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/rp2/mpconfigport.h | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/ports/rp2/mpconfigport.h b/ports/rp2/mpconfigport.h
index 35d1645522588..13db589ec0e3e 100644
--- a/ports/rp2/mpconfigport.h
+++ b/ports/rp2/mpconfigport.h
@@ -71,17 +71,33 @@
 
 // Fine control over Python builtins, classes, modules, etc
 #define MICROPY_PY_FUNCTION_ATTRS               (1)
+#define MICROPY_PY_DESCRIPTORS                  (1)
+#define MICROPY_PY_DELATTR_SETATTR              (1)
 #define MICROPY_PY_BUILTINS_STR_UNICODE         (1)
+#define MICROPY_PY_BUILTINS_STR_CENTER          (1)
+#define MICROPY_PY_BUILTINS_STR_PARTITION       (1)
+#define MICROPY_PY_BUILTINS_STR_SPLITLINES      (1)
 #define MICROPY_PY_BUILTINS_MEMORYVIEW          (1)
+#define MICROPY_PY_BUILTINS_SLICE_ATTRS         (1)
+#define MICROPY_PY_BUILTINS_SLICE_INDICES       (1)
+#define MICROPY_PY_BUILTINS_FROZENSET           (1)
 #define MICROPY_PY_BUILTINS_ROUND_INT           (1)
 #define MICROPY_PY_ALL_SPECIAL_METHODS          (1)
+#define MICROPY_PY_REVERSE_SPECIAL_METHODS      (1)
+#define MICROPY_PY_BUILTINS_COMPILE             (1)
 #define MICROPY_PY_BUILTINS_INPUT               (1)
+#define MICROPY_PY_BUILTINS_POW3                (1)
 #define MICROPY_PY_BUILTINS_HELP                (1)
 #define MICROPY_PY_BUILTINS_HELP_TEXT           rp2_help_text
 #define MICROPY_PY_BUILTINS_HELP_MODULES        (1)
-#define MICROPY_PY_ARRAY_SLICE_ASSIGN           (1)
-#define MICROPY_PY___FILE__                     (0)
 #define MICROPY_PY_MICROPYTHON_MEM_INFO         (1)
+#define MICROPY_PY_ARRAY_SLICE_ASSIGN           (1)
+#define MICROPY_PY_COLLECTIONS_DEQUE            (1)
+#define MICROPY_PY_COLLECTIONS_ORDEREDDICT      (1)
+#define MICROPY_PY_MATH_SPECIAL_FUNCTIONS       (1)
+#define MICROPY_PY_MATH_FACTORIAL               (1)
+#define MICROPY_PY_MATH_ISCLOSE                 (1)
+#define MICROPY_PY_CMATH                        (1)
 #define MICROPY_PY_IO_IOBASE                    (1)
 #define MICROPY_PY_IO_FILEIO                    (1)
 #define MICROPY_PY_SYS_MAXSIZE                  (1)

From dcaf702578045299d5bc007d81669fe1ba640654 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sun, 14 Mar 2021 00:18:18 +1100
Subject: [PATCH 0685/3533] rp2/modmachine: Enable machine.Signal class.

Fixes issue #6863.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/rp2/modmachine.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ports/rp2/modmachine.c b/ports/rp2/modmachine.c
index bf5033adbab7a..cd7dcaade59bd 100644
--- a/ports/rp2/modmachine.c
+++ b/ports/rp2/modmachine.c
@@ -30,6 +30,7 @@
 #include "extmod/machine_i2c.h"
 #include "extmod/machine_mem.h"
 #include "extmod/machine_pulse.h"
+#include "extmod/machine_signal.h"
 #include "extmod/machine_spi.h"
 
 #include "modmachine.h"
@@ -163,6 +164,7 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_SoftI2C),             MP_ROM_PTR(&mp_machine_soft_i2c_type) },
     { MP_ROM_QSTR(MP_QSTR_Pin),                 MP_ROM_PTR(&machine_pin_type) },
     { MP_ROM_QSTR(MP_QSTR_PWM),                 MP_ROM_PTR(&machine_pwm_type) },
+    { MP_ROM_QSTR(MP_QSTR_Signal),              MP_ROM_PTR(&machine_signal_type) },
     { MP_ROM_QSTR(MP_QSTR_SPI),                 MP_ROM_PTR(&machine_spi_type) },
     { MP_ROM_QSTR(MP_QSTR_SoftSPI),             MP_ROM_PTR(&mp_machine_soft_spi_type) },
     { MP_ROM_QSTR(MP_QSTR_Timer),               MP_ROM_PTR(&machine_timer_type) },

From eccd73a403aef5b41368752b1d11d95e005bdc4b Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sun, 14 Mar 2021 15:51:28 +1100
Subject: [PATCH 0686/3533] extmod/extmod.cmake: Add modonewire.c to
 MICROPY_SOURCE_EXTMOD list.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/extmod.cmake             | 1 +
 ports/esp32/main/CMakeLists.txt | 6 ------
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/extmod/extmod.cmake b/extmod/extmod.cmake
index 6668a2d8aa3cc..691c3ce9b3fea 100644
--- a/extmod/extmod.cmake
+++ b/extmod/extmod.cmake
@@ -12,6 +12,7 @@ set(MICROPY_SOURCE_EXTMOD
     ${MICROPY_EXTMOD_DIR}/modbluetooth.c
     ${MICROPY_EXTMOD_DIR}/modbtree.c
     ${MICROPY_EXTMOD_DIR}/modframebuf.c
+    ${MICROPY_EXTMOD_DIR}/modonewire.c
     ${MICROPY_EXTMOD_DIR}/moduasyncio.c
     ${MICROPY_EXTMOD_DIR}/modubinascii.c
     ${MICROPY_EXTMOD_DIR}/moducryptolib.c
diff --git a/ports/esp32/main/CMakeLists.txt b/ports/esp32/main/CMakeLists.txt
index bd25d76ee45b0..b6bccdde3ca9b 100644
--- a/ports/esp32/main/CMakeLists.txt
+++ b/ports/esp32/main/CMakeLists.txt
@@ -9,10 +9,6 @@ set(MICROPY_QSTRDEFS_PORT
     ${PROJECT_DIR}/qstrdefsport.h
 )
 
-set(MICROPY_SOURCE_EXTMOD_EXTRA
-    ${MICROPY_DIR}/extmod/modonewire.c
-)
-
 set(MICROPY_SOURCE_LIB
     ${MICROPY_DIR}/lib/littlefs/lfs1.c
     ${MICROPY_DIR}/lib/littlefs/lfs1_util.c
@@ -75,7 +71,6 @@ set(MICROPY_SOURCE_PORT
 set(MICROPY_SOURCE_QSTR
     ${MICROPY_SOURCE_PY}
     ${MICROPY_SOURCE_EXTMOD}
-    ${MICROPY_SOURCE_EXTMOD_EXTRA}
     ${MICROPY_SOURCE_LIB}
     ${MICROPY_SOURCE_PORT}
 )
@@ -129,7 +124,6 @@ idf_component_register(
     SRCS
         ${MICROPY_SOURCE_PY}
         ${MICROPY_SOURCE_EXTMOD}
-        ${MICROPY_SOURCE_EXTMOD_EXTRA}
         ${MICROPY_SOURCE_LIB}
         ${MICROPY_SOURCE_DRIVERS}
         ${MICROPY_SOURCE_PORT}

From a9140ab09b7f2b878972a86dabc12d00ddaa463e Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sun, 14 Mar 2021 15:52:33 +1100
Subject: [PATCH 0687/3533] rp2: Use core-provided cmake fragments instead of
 custom ones.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/rp2/CMakeLists.txt       | 194 ++++++++++++++++++++-------------
 ports/rp2/micropy_extmod.cmake |  40 -------
 ports/rp2/micropy_py.cmake     | 134 -----------------------
 ports/rp2/micropy_rules.cmake  |  90 ---------------
 4 files changed, 121 insertions(+), 337 deletions(-)
 delete mode 100644 ports/rp2/micropy_extmod.cmake
 delete mode 100644 ports/rp2/micropy_py.cmake
 delete mode 100644 ports/rp2/micropy_rules.cmake

diff --git a/ports/rp2/CMakeLists.txt b/ports/rp2/CMakeLists.txt
index cf20245a3c8ed..3968194dcbbfe 100644
--- a/ports/rp2/CMakeLists.txt
+++ b/ports/rp2/CMakeLists.txt
@@ -6,8 +6,8 @@ if(NOT CMAKE_BUILD_TYPE)
 endif()
 
 # Set main target and component locations
-set(MICROPYTHON_TARGET firmware)
-get_filename_component(MPY_DIR "../.." ABSOLUTE)
+set(MICROPY_TARGET firmware)
+get_filename_component(MICROPY_DIR "../.." ABSOLUTE)
 if (PICO_SDK_PATH_OVERRIDE)
     set(PICO_SDK_PATH ${PICO_SDK_PATH_OVERRIDE})
 else()
@@ -15,42 +15,46 @@ else()
 endif()
 
 # Use the local tinyusb instead of the one in pico-sdk
-set(PICO_TINYUSB_PATH ${MPY_DIR}/lib/tinyusb)
+set(PICO_TINYUSB_PATH ${MICROPY_DIR}/lib/tinyusb)
 
 # Include component cmake fragments
-include(micropy_py.cmake)
-include(micropy_extmod.cmake)
+include(${MICROPY_DIR}/py/py.cmake)
+include(${MICROPY_DIR}/extmod/extmod.cmake)
 include(${PICO_SDK_PATH}/pico_sdk_init.cmake)
 
 # Define the top-level project
-project(${MICROPYTHON_TARGET})
+project(${MICROPY_TARGET})
 
 pico_sdk_init()
 
-add_executable(${MICROPYTHON_TARGET})
-
-set(SOURCE_LIB
-    ${MPY_DIR}/lib/littlefs/lfs1.c
-    ${MPY_DIR}/lib/littlefs/lfs1_util.c
-    ${MPY_DIR}/lib/littlefs/lfs2.c
-    ${MPY_DIR}/lib/littlefs/lfs2_util.c
-    ${MPY_DIR}/lib/mp-readline/readline.c
-    ${MPY_DIR}/lib/oofatfs/ff.c
-    ${MPY_DIR}/lib/oofatfs/ffunicode.c
-    ${MPY_DIR}/lib/timeutils/timeutils.c
-    ${MPY_DIR}/lib/utils/gchelper_m0.s
-    ${MPY_DIR}/lib/utils/gchelper_native.c
-    ${MPY_DIR}/lib/utils/mpirq.c
-    ${MPY_DIR}/lib/utils/stdout_helpers.c
-    ${MPY_DIR}/lib/utils/sys_stdio_mphal.c
-    ${MPY_DIR}/lib/utils/pyexec.c
+add_executable(${MICROPY_TARGET})
+
+set(MICROPY_QSTRDEFS_PORT
+    ${PROJECT_SOURCE_DIR}/qstrdefsport.h
+)
+
+set(MICROPY_SOURCE_LIB
+    ${MICROPY_DIR}/lib/littlefs/lfs1.c
+    ${MICROPY_DIR}/lib/littlefs/lfs1_util.c
+    ${MICROPY_DIR}/lib/littlefs/lfs2.c
+    ${MICROPY_DIR}/lib/littlefs/lfs2_util.c
+    ${MICROPY_DIR}/lib/mp-readline/readline.c
+    ${MICROPY_DIR}/lib/oofatfs/ff.c
+    ${MICROPY_DIR}/lib/oofatfs/ffunicode.c
+    ${MICROPY_DIR}/lib/timeutils/timeutils.c
+    ${MICROPY_DIR}/lib/utils/gchelper_m0.s
+    ${MICROPY_DIR}/lib/utils/gchelper_native.c
+    ${MICROPY_DIR}/lib/utils/mpirq.c
+    ${MICROPY_DIR}/lib/utils/pyexec.c
+    ${MICROPY_DIR}/lib/utils/stdout_helpers.c
+    ${MICROPY_DIR}/lib/utils/sys_stdio_mphal.c
 )
 
-set(SOURCE_DRIVERS
-    ${MPY_DIR}/drivers/bus/softspi.c
+set(MICROPY_SOURCE_DRIVERS
+    ${MICROPY_DIR}/drivers/bus/softspi.c
 )
 
-set(SOURCE_PORT
+set(MICROPY_SOURCE_PORT
     fatfs_port.c
     machine_adc.c
     machine_i2c.c
@@ -73,11 +77,11 @@ set(SOURCE_PORT
     uart.c
 )
 
-set(SOURCE_QSTR
-    ${SOURCE_PY}
-    ${SOURCE_EXTMOD}
-    ${MPY_DIR}/lib/utils/mpirq.c
-    ${MPY_DIR}/lib/utils/sys_stdio_mphal.c
+set(MICROPY_SOURCE_QSTR
+    ${MICROPY_SOURCE_PY}
+    ${MICROPY_SOURCE_EXTMOD}
+    ${MICROPY_DIR}/lib/utils/mpirq.c
+    ${MICROPY_DIR}/lib/utils/sys_stdio_mphal.c
     ${PROJECT_SOURCE_DIR}/machine_adc.c
     ${PROJECT_SOURCE_DIR}/machine_i2c.c
     ${PROJECT_SOURCE_DIR}/machine_pin.c
@@ -94,37 +98,65 @@ set(SOURCE_QSTR
     ${PROJECT_SOURCE_DIR}/rp2_pio.c
 )
 
-set(MPY_QSTR_DEFS ${PROJECT_SOURCE_DIR}/qstrdefsport.h)
+set(PICO_SDK_COMPONENTS
+    hardware_adc
+    hardware_base
+    hardware_clocks
+    hardware_dma
+    hardware_flash
+    hardware_gpio
+    hardware_i2c
+    hardware_irq
+    hardware_pio
+    hardware_pwm
+    hardware_regs
+    hardware_rtc
+    hardware_spi
+    hardware_structs
+    hardware_sync
+    hardware_timer
+    hardware_uart
+    hardware_watchdog
+    pico_base_headers
+    pico_binary_info
+    pico_bootrom
+    pico_multicore
+    pico_platform
+    pico_stdio
+    pico_stdlib
+    pico_sync
+    pico_time
+    pico_unique_id
+    tinyusb_device
+)
 
 # Define mpy-cross flags and frozen manifest
-set(MPY_CROSS_FLAGS -march=armv7m)
-set(FROZEN_MANIFEST ${PROJECT_SOURCE_DIR}/manifest.py)
-
-include(micropy_rules.cmake)
-
-target_sources(${MICROPYTHON_TARGET} PRIVATE
-    ${SOURCE_PY}
-    ${SOURCE_EXTMOD}
-    ${SOURCE_LIB}
-    ${SOURCE_DRIVERS}
-    ${SOURCE_PORT}
+set(MICROPY_CROSS_FLAGS -march=armv7m)
+set(MICROPY_FROZEN_MANIFEST ${PROJECT_SOURCE_DIR}/manifest.py)
+
+target_sources(${MICROPY_TARGET} PRIVATE
+    ${MICROPY_SOURCE_PY}
+    ${MICROPY_SOURCE_EXTMOD}
+    ${MICROPY_SOURCE_LIB}
+    ${MICROPY_SOURCE_DRIVERS}
+    ${MICROPY_SOURCE_PORT}
 )
 
-target_include_directories(${MICROPYTHON_TARGET} PRIVATE
-                           "${PROJECT_SOURCE_DIR}"
-                           "${MPY_DIR}"
-                           "${CMAKE_BINARY_DIR}"
-                           )
+target_include_directories(${MICROPY_TARGET} PRIVATE
+    "${PROJECT_SOURCE_DIR}"
+    "${MICROPY_DIR}"
+    "${CMAKE_BINARY_DIR}"
+)
 
-target_compile_options(${MICROPYTHON_TARGET} PRIVATE
+target_compile_options(${MICROPY_TARGET} PRIVATE
     -Wall
-    #-Werror
-    -DFFCONF_H=\"${MPY_DIR}/lib/oofatfs/ffconf.h\"
-    -DLFS1_NO_MALLOC -DLFS1_NO_DEBUG -DLFS1_NO_WARN -DLFS1_NO_ERROR -DLFS1_NO_ASSERT
-    -DLFS2_NO_MALLOC -DLFS2_NO_DEBUG -DLFS2_NO_WARN -DLFS2_NO_ERROR -DLFS2_NO_ASSERT
+    -Werror
 )
 
-target_compile_definitions(${MICROPYTHON_TARGET} PRIVATE
+target_compile_definitions(${MICROPY_TARGET} PRIVATE
+    FFCONF_H=\"${MICROPY_OOFATFS_DIR}/ffconf.h\"
+    LFS1_NO_MALLOC LFS1_NO_DEBUG LFS1_NO_WARN LFS1_NO_ERROR LFS1_NO_ASSERT
+    LFS2_NO_MALLOC LFS2_NO_DEBUG LFS2_NO_WARN LFS2_NO_ERROR LFS2_NO_ASSERT
     PICO_FLOAT_PROPAGATE_NANS=1
     PICO_STACK_SIZE=0x2000
     PICO_CORE1_STACK_SIZE=0
@@ -134,34 +166,50 @@ target_compile_definitions(${MICROPYTHON_TARGET} PRIVATE
     PICO_NO_BI_STDIO_UART=1 # we call it UART REPL
 )
 
-target_link_libraries(${MICROPYTHON_TARGET}
-    hardware_adc
-    hardware_dma
-    hardware_flash
-    hardware_i2c
-    hardware_pio
-    hardware_pwm
-    hardware_rtc
-    hardware_spi
-    hardware_sync
-    pico_multicore
-    pico_stdlib_headers
-    pico_stdlib
-    pico_unique_id
-    tinyusb_device
+target_link_libraries(${MICROPY_TARGET}
+    ${PICO_SDK_COMPONENTS}
 )
 
 # todo this is a bit brittle, but we want to move a few source files into RAM (which requires
 #  a linker script modification) until we explicitly add  macro calls around the function
 #  defs to move them into RAM.
 if (PICO_ON_DEVICE AND NOT PICO_NO_FLASH AND NOT PICO_COPY_TO_RAM)
-    pico_set_linker_script(${MICROPYTHON_TARGET} ${CMAKE_CURRENT_LIST_DIR}/memmap_mp.ld)
+    pico_set_linker_script(${MICROPY_TARGET} ${CMAKE_CURRENT_LIST_DIR}/memmap_mp.ld)
 endif()
 
-pico_add_extra_outputs(${MICROPYTHON_TARGET})
+pico_add_extra_outputs(${MICROPY_TARGET})
 
-add_custom_command(TARGET ${MICROPYTHON_TARGET}
+add_custom_command(TARGET ${MICROPY_TARGET}
     POST_BUILD
-    COMMAND arm-none-eabi-size --format=berkeley ${PROJECT_BINARY_DIR}/${MICROPYTHON_TARGET}.elf
+    COMMAND arm-none-eabi-size --format=berkeley ${PROJECT_BINARY_DIR}/${MICROPY_TARGET}.elf
     VERBATIM
 )
+
+# Collect all the include directories and compile definitions for the pico-sdk components.
+macro(_process_target targ)
+    if(TARGET ${targ})
+        get_target_property(type ${targ} TYPE)
+        set(_inc OFF)
+        set(_def OFF)
+        if(${type} STREQUAL STATIC_LIBRARY)
+            get_target_property(_inc ${targ} INCLUDE_DIRECTORIES)
+            get_target_property(_def ${targ} COMPILE_DEFINITIONS)
+        elseif(${type} STREQUAL INTERFACE_LIBRARY)
+            get_target_property(_inc ${targ} INTERFACE_INCLUDE_DIRECTORIES)
+            get_target_property(_def ${targ} INTERFACE_COMPILE_DEFINITIONS)
+        endif()
+        if(_inc)
+            list(APPEND MICROPY_CPP_INC_EXTRA ${_inc})
+        endif()
+        if(_def)
+            list(APPEND MICROPY_CPP_DEF_EXTRA ${_def})
+        endif()
+    endif()
+endmacro()
+foreach(comp ${PICO_SDK_COMPONENTS})
+    _process_target(${comp})
+    _process_target(${comp}_headers)
+endforeach()
+
+# Include the main MicroPython cmake rules.
+include(${MICROPY_DIR}/py/mkrules.cmake)
diff --git a/ports/rp2/micropy_extmod.cmake b/ports/rp2/micropy_extmod.cmake
deleted file mode 100644
index 1e968bef637fd..0000000000000
--- a/ports/rp2/micropy_extmod.cmake
+++ /dev/null
@@ -1,40 +0,0 @@
-# CMake fragment for MicroPython extmod component
-
-set(SOURCE_EXTMOD
-    ${MPY_DIR}/extmod/machine_i2c.c
-    ${MPY_DIR}/extmod/machine_mem.c
-    ${MPY_DIR}/extmod/machine_pulse.c
-    ${MPY_DIR}/extmod/machine_signal.c
-    ${MPY_DIR}/extmod/machine_spi.c
-    ${MPY_DIR}/extmod/modbtree.c
-    ${MPY_DIR}/extmod/modframebuf.c
-    ${MPY_DIR}/extmod/modonewire.c
-    ${MPY_DIR}/extmod/moduasyncio.c
-    ${MPY_DIR}/extmod/modubinascii.c
-    ${MPY_DIR}/extmod/moducryptolib.c
-    ${MPY_DIR}/extmod/moductypes.c
-    ${MPY_DIR}/extmod/moduhashlib.c
-    ${MPY_DIR}/extmod/moduheapq.c
-    ${MPY_DIR}/extmod/modujson.c
-    ${MPY_DIR}/extmod/modurandom.c
-    ${MPY_DIR}/extmod/modure.c
-    ${MPY_DIR}/extmod/moduselect.c
-    ${MPY_DIR}/extmod/modussl_axtls.c
-    ${MPY_DIR}/extmod/modussl_mbedtls.c
-    ${MPY_DIR}/extmod/modutimeq.c
-    ${MPY_DIR}/extmod/moduwebsocket.c
-    ${MPY_DIR}/extmod/moduzlib.c
-    ${MPY_DIR}/extmod/modwebrepl.c
-    ${MPY_DIR}/extmod/uos_dupterm.c
-    ${MPY_DIR}/extmod/utime_mphal.c
-    ${MPY_DIR}/extmod/vfs.c
-    ${MPY_DIR}/extmod/vfs_blockdev.c
-    ${MPY_DIR}/extmod/vfs_fat.c
-    ${MPY_DIR}/extmod/vfs_fat_diskio.c
-    ${MPY_DIR}/extmod/vfs_fat_file.c
-    ${MPY_DIR}/extmod/vfs_lfs.c
-    ${MPY_DIR}/extmod/vfs_posix.c
-    ${MPY_DIR}/extmod/vfs_posix_file.c
-    ${MPY_DIR}/extmod/vfs_reader.c
-    ${MPY_DIR}/extmod/virtpin.c
-)
diff --git a/ports/rp2/micropy_py.cmake b/ports/rp2/micropy_py.cmake
deleted file mode 100644
index aeb7e2b9b5aa7..0000000000000
--- a/ports/rp2/micropy_py.cmake
+++ /dev/null
@@ -1,134 +0,0 @@
-# CMake fragment for MicroPython core py component
-
-set(MPY_PY_DIR "${MPY_DIR}/py")
-set(MPY_PY_QSTRDEFS "${MPY_PY_DIR}/qstrdefs.h")
-set(MPY_GENHDR_DIR "${CMAKE_BINARY_DIR}/genhdr")
-set(MPY_MPVERSION "${MPY_GENHDR_DIR}/mpversion.h")
-set(MPY_MODULEDEFS "${MPY_GENHDR_DIR}/moduledefs.h")
-set(MPY_QSTR_DEFS_LAST "${MPY_GENHDR_DIR}/qstr.i.last")
-set(MPY_QSTR_DEFS_SPLIT "${MPY_GENHDR_DIR}/qstr.split")
-set(MPY_QSTR_DEFS_COLLECTED "${MPY_GENHDR_DIR}/qstrdefs.collected.h")
-set(MPY_QSTR_DEFS_PREPROCESSED "${MPY_GENHDR_DIR}/qstrdefs.preprocessed.h")
-set(MPY_QSTR_DEFS_GENERATED "${MPY_GENHDR_DIR}/qstrdefs.generated.h")
-set(MPY_FROZEN_CONTENT "${CMAKE_BINARY_DIR}/frozen_content.c")
-
-# All py/ source files
-set(SOURCE_PY
-    ${MPY_PY_DIR}/argcheck.c
-    ${MPY_PY_DIR}/asmarm.c
-    ${MPY_PY_DIR}/asmbase.c
-    ${MPY_PY_DIR}/asmthumb.c
-    ${MPY_PY_DIR}/asmx64.c
-    ${MPY_PY_DIR}/asmx86.c
-    ${MPY_PY_DIR}/asmxtensa.c
-    ${MPY_PY_DIR}/bc.c
-    ${MPY_PY_DIR}/binary.c
-    ${MPY_PY_DIR}/builtinevex.c
-    ${MPY_PY_DIR}/builtinhelp.c
-    ${MPY_PY_DIR}/builtinimport.c
-    ${MPY_PY_DIR}/compile.c
-    ${MPY_PY_DIR}/emitbc.c
-    ${MPY_PY_DIR}/emitcommon.c
-    ${MPY_PY_DIR}/emitglue.c
-    ${MPY_PY_DIR}/emitinlinethumb.c
-    ${MPY_PY_DIR}/emitinlinextensa.c
-    ${MPY_PY_DIR}/emitnarm.c
-    ${MPY_PY_DIR}/emitnthumb.c
-    ${MPY_PY_DIR}/emitnx64.c
-    ${MPY_PY_DIR}/emitnx86.c
-    ${MPY_PY_DIR}/emitnxtensa.c
-    ${MPY_PY_DIR}/emitnxtensawin.c
-    ${MPY_PY_DIR}/formatfloat.c
-    ${MPY_PY_DIR}/frozenmod.c
-    ${MPY_PY_DIR}/gc.c
-    ${MPY_PY_DIR}/lexer.c
-    ${MPY_PY_DIR}/malloc.c
-    ${MPY_PY_DIR}/map.c
-    ${MPY_PY_DIR}/modarray.c
-    ${MPY_PY_DIR}/modbuiltins.c
-    ${MPY_PY_DIR}/modcmath.c
-    ${MPY_PY_DIR}/modcollections.c
-    ${MPY_PY_DIR}/modgc.c
-    ${MPY_PY_DIR}/modio.c
-    ${MPY_PY_DIR}/modmath.c
-    ${MPY_PY_DIR}/modmicropython.c
-    ${MPY_PY_DIR}/modstruct.c
-    ${MPY_PY_DIR}/modsys.c
-    ${MPY_PY_DIR}/modthread.c
-    ${MPY_PY_DIR}/moduerrno.c
-    ${MPY_PY_DIR}/mpprint.c
-    ${MPY_PY_DIR}/mpstate.c
-    ${MPY_PY_DIR}/mpz.c
-    ${MPY_PY_DIR}/nativeglue.c
-    ${MPY_PY_DIR}/nlr.c
-    ${MPY_PY_DIR}/nlrpowerpc.c
-    ${MPY_PY_DIR}/nlrsetjmp.c
-    ${MPY_PY_DIR}/nlrthumb.c
-    ${MPY_PY_DIR}/nlrx64.c
-    ${MPY_PY_DIR}/nlrx86.c
-    ${MPY_PY_DIR}/nlrxtensa.c
-    ${MPY_PY_DIR}/obj.c
-    ${MPY_PY_DIR}/objarray.c
-    ${MPY_PY_DIR}/objattrtuple.c
-    ${MPY_PY_DIR}/objbool.c
-    ${MPY_PY_DIR}/objboundmeth.c
-    ${MPY_PY_DIR}/objcell.c
-    ${MPY_PY_DIR}/objclosure.c
-    ${MPY_PY_DIR}/objcomplex.c
-    ${MPY_PY_DIR}/objdeque.c
-    ${MPY_PY_DIR}/objdict.c
-    ${MPY_PY_DIR}/objenumerate.c
-    ${MPY_PY_DIR}/objexcept.c
-    ${MPY_PY_DIR}/objfilter.c
-    ${MPY_PY_DIR}/objfloat.c
-    ${MPY_PY_DIR}/objfun.c
-    ${MPY_PY_DIR}/objgenerator.c
-    ${MPY_PY_DIR}/objgetitemiter.c
-    ${MPY_PY_DIR}/objint.c
-    ${MPY_PY_DIR}/objint_longlong.c
-    ${MPY_PY_DIR}/objint_mpz.c
-    ${MPY_PY_DIR}/objlist.c
-    ${MPY_PY_DIR}/objmap.c
-    ${MPY_PY_DIR}/objmodule.c
-    ${MPY_PY_DIR}/objnamedtuple.c
-    ${MPY_PY_DIR}/objnone.c
-    ${MPY_PY_DIR}/objobject.c
-    ${MPY_PY_DIR}/objpolyiter.c
-    ${MPY_PY_DIR}/objproperty.c
-    ${MPY_PY_DIR}/objrange.c
-    ${MPY_PY_DIR}/objreversed.c
-    ${MPY_PY_DIR}/objset.c
-    ${MPY_PY_DIR}/objsingleton.c
-    ${MPY_PY_DIR}/objslice.c
-    ${MPY_PY_DIR}/objstr.c
-    ${MPY_PY_DIR}/objstringio.c
-    ${MPY_PY_DIR}/objstrunicode.c
-    ${MPY_PY_DIR}/objtuple.c
-    ${MPY_PY_DIR}/objtype.c
-    ${MPY_PY_DIR}/objzip.c
-    ${MPY_PY_DIR}/opmethods.c
-    ${MPY_PY_DIR}/pairheap.c
-    ${MPY_PY_DIR}/parse.c
-    ${MPY_PY_DIR}/parsenum.c
-    ${MPY_PY_DIR}/parsenumbase.c
-    ${MPY_PY_DIR}/persistentcode.c
-    ${MPY_PY_DIR}/profile.c
-    ${MPY_PY_DIR}/pystack.c
-    ${MPY_PY_DIR}/qstr.c
-    ${MPY_PY_DIR}/reader.c
-    ${MPY_PY_DIR}/repl.c
-    ${MPY_PY_DIR}/ringbuf.c
-    ${MPY_PY_DIR}/runtime.c
-    ${MPY_PY_DIR}/runtime_utils.c
-    ${MPY_PY_DIR}/scheduler.c
-    ${MPY_PY_DIR}/scope.c
-    ${MPY_PY_DIR}/sequence.c
-    ${MPY_PY_DIR}/showbc.c
-    ${MPY_PY_DIR}/smallint.c
-    ${MPY_PY_DIR}/stackctrl.c
-    ${MPY_PY_DIR}/stream.c
-    ${MPY_PY_DIR}/unicode.c
-    ${MPY_PY_DIR}/vm.c
-    ${MPY_PY_DIR}/vstr.c
-    ${MPY_PY_DIR}/warning.c
-)
diff --git a/ports/rp2/micropy_rules.cmake b/ports/rp2/micropy_rules.cmake
deleted file mode 100644
index 9eee4ac14d1b2..0000000000000
--- a/ports/rp2/micropy_rules.cmake
+++ /dev/null
@@ -1,90 +0,0 @@
-# CMake fragment for MicroPython rules
-
-target_sources(${MICROPYTHON_TARGET} PRIVATE
-    ${MPY_MPVERSION}
-    ${MPY_QSTR_DEFS_GENERATED}
-    ${MPY_FROZEN_CONTENT}
-)
-
-# Command to force the build of another command
-
-add_custom_command(
-    OUTPUT FORCE_BUILD
-    COMMENT ""
-    COMMAND echo -n
-)
-
-# Generate mpversion.h
-
-add_custom_command(
-    OUTPUT ${MPY_MPVERSION}
-    COMMAND ${CMAKE_COMMAND} -E make_directory ${MPY_GENHDR_DIR}
-    COMMAND python3 ${MPY_DIR}/py/makeversionhdr.py ${MPY_MPVERSION}
-    DEPENDS FORCE_BUILD
-)
-
-# Generate moduledefs.h
-
-add_custom_command(
-    OUTPUT ${MPY_MODULEDEFS}
-    COMMAND python3 ${MPY_PY_DIR}/makemoduledefs.py --vpath="/" ${SOURCE_QSTR} > ${MPY_MODULEDEFS}
-    DEPENDS ${MPY_MPVERSION}
-        ${SOURCE_QSTR}
-)
-
-# Generate qstrs
-
-# If any of the dependencies in this rule change then the C-preprocessor step must be run.
-# It only needs to be passed the list of SOURCE_QSTR files that have changed since it was
-# last run, but it looks like it's not possible to specify that with cmake.
-add_custom_command(
-    OUTPUT ${MPY_QSTR_DEFS_LAST}
-    COMMAND ${CMAKE_C_COMPILER} -E \$\(C_INCLUDES\) \$\(C_FLAGS\) -DNO_QSTR ${SOURCE_QSTR} > ${MPY_GENHDR_DIR}/qstr.i.last
-    DEPENDS ${MPY_MODULEDEFS}
-        ${SOURCE_QSTR}
-    VERBATIM
-)
-
-add_custom_command(
-    OUTPUT ${MPY_QSTR_DEFS_SPLIT}
-    COMMAND python3 ${MPY_DIR}/py/makeqstrdefs.py split qstr ${MPY_GENHDR_DIR}/qstr.i.last ${MPY_GENHDR_DIR}/qstr _
-    COMMAND touch ${MPY_QSTR_DEFS_SPLIT}
-    DEPENDS ${MPY_QSTR_DEFS_LAST}
-    VERBATIM
-)
-
-add_custom_command(
-    OUTPUT ${MPY_QSTR_DEFS_COLLECTED}
-    COMMAND python3 ${MPY_DIR}/py/makeqstrdefs.py cat qstr _ ${MPY_GENHDR_DIR}/qstr ${MPY_QSTR_DEFS_COLLECTED}
-    DEPENDS ${MPY_QSTR_DEFS_SPLIT}
-    VERBATIM
-)
-
-add_custom_command(
-    OUTPUT ${MPY_QSTR_DEFS_PREPROCESSED}
-    COMMAND cat ${MPY_PY_QSTRDEFS} ${MPY_QSTR_DEFS} ${MPY_QSTR_DEFS_COLLECTED} | sed "s/^Q(.*)/\"&\"/" | ${CMAKE_C_COMPILER} -E \$\(C_INCLUDES\) \$\(C_FLAGS\) - | sed "s/^\\\"\\(Q(.*)\\)\\\"/\\1/" > ${MPY_QSTR_DEFS_PREPROCESSED}
-    DEPENDS ${MPY_PY_QSTRDEFS} ${MPY_QSTR_DEFS} ${MPY_QSTR_DEFS_COLLECTED}
-    VERBATIM
-)
-
-add_custom_command(
-    OUTPUT ${MPY_QSTR_DEFS_GENERATED}
-    COMMAND python3 ${MPY_PY_DIR}/makeqstrdata.py ${MPY_QSTR_DEFS_PREPROCESSED} > ${MPY_QSTR_DEFS_GENERATED}
-    DEPENDS ${MPY_QSTR_DEFS_PREPROCESSED}
-    VERBATIM
-)
-
-# Build frozen code
-
-target_compile_options(${MICROPYTHON_TARGET} PUBLIC
-    -DMICROPY_QSTR_EXTRA_POOL=mp_qstr_frozen_const_pool
-    -DMICROPY_MODULE_FROZEN_MPY=\(1\)
-)
-
-add_custom_command(
-    OUTPUT ${MPY_FROZEN_CONTENT}
-    COMMAND python3 ${MPY_DIR}/tools/makemanifest.py -o ${MPY_FROZEN_CONTENT} -v "MPY_DIR=${MPY_DIR}" -v "PORT_DIR=${PROJECT_SOURCE_DIR}" -b "${CMAKE_BINARY_DIR}" -f${MPY_CROSS_FLAGS} ${FROZEN_MANIFEST}
-    DEPENDS FORCE_BUILD
-        ${MPY_QSTR_DEFS_GENERATED}
-    VERBATIM
-)

From 914380cb89d7cf5e9c186055753ff12bbcf6296a Mon Sep 17 00:00:00 2001
From: stijn <stijn@ignitron.net>
Date: Mon, 15 Mar 2021 10:29:17 +0100
Subject: [PATCH 0688/3533] all: Add .git-blame-ignore-revs for fixing up git
 blame output.

Add most formatting-only commits to this file so that when used with
git blame, these commits are excluded and the output shows only the
interesting bits.
---
 .git-blame-ignore-revs          | 32 ++++++++++++++++++++++++++++++++
 docs/develop/gettingstarted.rst |  5 +++++
 2 files changed, 37 insertions(+)
 create mode 100644 .git-blame-ignore-revs

diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
new file mode 100644
index 0000000000000..83726922a5280
--- /dev/null
+++ b/.git-blame-ignore-revs
@@ -0,0 +1,32 @@
+# tests/run-tests.py: Reformat with Black.
+2a38d7103672580882fb621a5b76e8d26805d593
+
+# all: Update Python code to conform to latest black formatting.
+06659077a81b85882254cf0953c33b27614e018e
+
+# tools/uncrustify: Enable more opts to remove space between func and '('.
+77ed6f69ac35c1663a5633a8ee1d8a2446542204
+
+# tools/codeformat.py: Include extmod/{btstack,nimble} in code formatting.
+026fda605e03113d6e753290d65fed774418bc53
+
+# all: Format code to add space after C++-style comment start.
+84fa3312cfa7d2237d4b56952f2cd6e3591210c4
+
+# tests: Format all Python code with black, except tests in basics subdir.
+3dc324d3f1312e40d3a8ed87e7244966bb756f26
+
+# all: Remove spaces inside and around parenthesis.
+1a3e386c67e03a79eb768cb6e9f6777e002d6660
+
+# all: Remove spaces between nested paren and inside function arg paren.
+feb25775851ba0c04b8d1013716f442258879d9c
+
+# all: Reformat C and Python source code with tools/codeformat.py.
+69661f3343bedf86e514337cff63d96cc42f8859
+
+# stm32/usbdev: Convert files to unix line endings.
+abde0fa2267f9062b28c3c015d7662a550125cc6
+
+# all: Remove trailing spaces, per coding conventions.
+761e4c7ff62896c7d8f8c3dfc3cc98a4cc4f2f6f
diff --git a/docs/develop/gettingstarted.rst b/docs/develop/gettingstarted.rst
index 32435ebe1c9d6..30b26071ea012 100644
--- a/docs/develop/gettingstarted.rst
+++ b/docs/develop/gettingstarted.rst
@@ -21,6 +21,11 @@ of Git for your operating system to follow through the rest of the steps.
    Learn about the basic git commands in this `Git Handbook <https://guides.github.com/introduction/git-handbook/>`_
    or any other sources on the internet.
 
+.. note::
+   A .git-blame-ignore-revs file is included which avoids the output of git blame getting cluttered
+   by commits which are only for formatting code but have no functional changes. See `git blame documentation
+   <https://git-scm.com/docs/git-blame#Documentation/git-blame.txt---ignore-revltrevgt>`_ on how to use this.
+
 Get the code
 ------------
 

From d53a6d58b04e524e4ec5ee937a15cc3932f8ee2f Mon Sep 17 00:00:00 2001
From: stijn <stijn@ignitron.net>
Date: Mon, 15 Mar 2021 09:30:46 +0100
Subject: [PATCH 0689/3533] stm32/Makefile: Fix C++ linker flags when toolchain
 has spaces in path.

The GNU Make dir command uses spaces as item separator so it does not
work for e.g building the STM32 port on Cygwin with a default Arm
installation in "c:/program files (x86)/GNU Arm Embedded Toolchain".
Fix by using POSIX dirname on a quoted path instead.
---
 ports/stm32/Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ports/stm32/Makefile b/ports/stm32/Makefile
index 6e5fc15363509..9a66d3c10b8cd 100644
--- a/ports/stm32/Makefile
+++ b/ports/stm32/Makefile
@@ -145,7 +145,8 @@ endif
 CXXFLAGS += $(filter-out -Wmissing-prototypes -Wold-style-definition -std=gnu99,$(CFLAGS))
 CXXFLAGS += $(CXXFLAGS_MOD)
 ifneq ($(SRC_CXX)$(SRC_MOD_CXX),)
-LDFLAGS += -L$(dir $(shell $(CXX) $(CXXFLAGS) -print-file-name=libstdc++.a))
+LIBSTDCPP_FILE_NAME = "$(shell $(CXX) $(CXXFLAGS) -print-file-name=libstdc++.a)"
+LDFLAGS += -L"$(shell dirname $(LIBSTDCPP_FILE_NAME))"
 endif
 
 # Options for mpy-cross

From 2b888aa2f346b52b16fbefbea6a2d9d8085d8ff1 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 16 Mar 2021 12:40:16 +1100
Subject: [PATCH 0690/3533] extmod/modbluetooth: Free temp arrays in gatts
 register services.

This helps to reduce memory fragmentation, by freeing the heap data as soon
as it is not needed.  It also helps the compiler keeps a reference to the
beginning of both arrays, which need to be traceable by the GC (otherwise
some compilers may optimise this reference to something else).

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/modbluetooth.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/extmod/modbluetooth.c b/extmod/modbluetooth.c
index 269493f0a94a3..e379a8c6a304c 100644
--- a/extmod/modbluetooth.c
+++ b/extmod/modbluetooth.c
@@ -619,6 +619,11 @@ STATIC mp_obj_t bluetooth_ble_gatts_register_services(mp_obj_t self_in, mp_obj_t
         }
         result->items[i] = MP_OBJ_FROM_PTR(service_handles);
     }
+
+    // Free temporary arrays.
+    m_del(uint16_t *, handles, len);
+    m_del(size_t, num_handles, len);
+
     return MP_OBJ_FROM_PTR(result);
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_2(bluetooth_ble_gatts_register_services_obj, bluetooth_ble_gatts_register_services);

From a79d97cb76cf6ec3794c357b706dd24970317c4a Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 16 Mar 2021 12:45:39 +1100
Subject: [PATCH 0691/3533] tests/extmod/vfs_fat_fileio2.py: Close test file at
 end of test.

Otherwise it can lead to inconsistent results running subsequent tests.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/extmod/vfs_fat_fileio2.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/extmod/vfs_fat_fileio2.py b/tests/extmod/vfs_fat_fileio2.py
index a9cea2bed8346..531dd91f9490a 100644
--- a/tests/extmod/vfs_fat_fileio2.py
+++ b/tests/extmod/vfs_fat_fileio2.py
@@ -112,3 +112,4 @@ def ioctl(self, op, arg):
     f.write(bytearray(bsize * free))
 except OSError as e:
     print("ENOSPC:", e.args[0] == 28)  # uerrno.ENOSPC
+f.close()

From cb68a5741aba5d4935428674234a9d643f97405f Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 16 Mar 2021 12:46:49 +1100
Subject: [PATCH 0692/3533] tests/run-tests.py: Provide more info if script run
 via pyboard crashes.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/run-tests.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/run-tests.py b/tests/run-tests.py
index 3ab6194b628fe..ae63f9a29a6e2 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -187,7 +187,7 @@ def send_get(what):
             if not is_special and e.args[0] == "exception":
                 output_mupy = e.args[1] + e.args[2] + b"CRASH"
             else:
-                output_mupy = b"CRASH"
+                output_mupy = bytes(e.args[0], "ascii") + b"\nCRASH"
 
     # canonical form for all ports/platforms is to use \n for end-of-line
     output_mupy = output_mupy.replace(b"\r\n", b"\n")

From 6e5aea08a9916c5acc6893e4829bba25fbab32ba Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 17 Mar 2021 10:25:16 +1100
Subject: [PATCH 0693/3533] stm32/Makefile: Allow
 QSTR_DEFS,QSTR_GLOBAL_DEPENDENCIES to be extended.

So a board can provide custom qstr definitions if needed.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/stm32/Makefile b/ports/stm32/Makefile
index 9a66d3c10b8cd..6c71f2757333f 100644
--- a/ports/stm32/Makefile
+++ b/ports/stm32/Makefile
@@ -18,8 +18,8 @@ include $(BOARD_DIR)/mpconfigboard.mk
 QSTR_GENERATED_HEADERS = $(BUILD)/pins_qstr.h $(BUILD)/modstm_qstr.h
 
 # qstr definitions (must come before including py.mk)
-QSTR_DEFS = qstrdefsport.h $(QSTR_GENERATED_HEADERS)
-QSTR_GLOBAL_DEPENDENCIES = mpconfigboard_common.h $(BOARD_DIR)/mpconfigboard.h $(QSTR_GENERATED_HEADERS)
+QSTR_DEFS += qstrdefsport.h $(QSTR_GENERATED_HEADERS)
+QSTR_GLOBAL_DEPENDENCIES += mpconfigboard_common.h $(BOARD_DIR)/mpconfigboard.h $(QSTR_GENERATED_HEADERS)
 
 # MicroPython feature configurations
 MICROPY_ROM_TEXT_COMPRESSION ?= 1

From 42cf77f48bcb24b0515b4ce604736f10267d87bd Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 17 Mar 2021 10:22:03 +1100
Subject: [PATCH 0694/3533] py/vm: For tracing use mp_printf, and print state
 when thread enabled.

mp_printf should be used to print the prefix because it's also used in
mp_bytecode_print2 (otherwise, depending on the system, different output
streams may be used).

Also print the current thread state when threading is enabled to easily see
which thread executes what opcode.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/vm.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/py/vm.c b/py/vm.c
index 393a2bbbd6513..c97070b78b6ba 100644
--- a/py/vm.c
+++ b/py/vm.c
@@ -39,7 +39,12 @@
 // *FORMAT-OFF*
 
 #if 0
-#define TRACE(ip) printf("sp=%d ", (int)(sp - &code_state->state[0] + 1)); mp_bytecode_print2(&mp_plat_print, ip, 1, code_state->fun_bc->const_table);
+#if MICROPY_PY_THREAD
+#define TRACE_PREFIX mp_printf(&mp_plat_print, "ts=%p sp=%d ", mp_thread_get_state(), (int)(sp - &code_state->state[0] + 1))
+#else
+#define TRACE_PREFIX mp_printf(&mp_plat_print, "sp=%d ", (int)(sp - &code_state->state[0] + 1))
+#endif
+#define TRACE(ip) TRACE_PREFIX; mp_bytecode_print2(&mp_plat_print, ip, 1, code_state->fun_bc->const_table);
 #else
 #define TRACE(ip)
 #endif

From 4fc2866f45692b05829d71b636724e690b786307 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 12 Mar 2021 21:03:03 +1100
Subject: [PATCH 0695/3533] bare-arm: Clean up the code, make it run on an
 F405, and add a README.

This commit simplifies and cleans up the bare-arm port, and adds just
enough system and library code to make it execute on an STM32F405 MCU.

The mpconfigport.h configuration is simplified to just specify those
configuration values that are different from the defaults.  And the
addition of -fdata-sections and -ffunction-sections means the final
firmware is smaller than it previously was, by about 4200 bytes.

A README is also added.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/bare-arm/Makefile       |  67 ++++++++-------
 ports/bare-arm/README.md      |  21 +++++
 ports/bare-arm/lib.c          | 128 +++++++++++++++++++++++++++
 ports/bare-arm/main.c         | 157 +++++++++++-----------------------
 ports/bare-arm/mpconfigport.h | 118 ++++++++++++-------------
 ports/bare-arm/qstrdefsport.h |   2 -
 ports/bare-arm/stm32f405.ld   |  93 ++++----------------
 ports/bare-arm/system.c       | 142 ++++++++++++++++++++++++++++++
 8 files changed, 453 insertions(+), 275 deletions(-)
 create mode 100644 ports/bare-arm/README.md
 create mode 100644 ports/bare-arm/lib.c
 delete mode 100644 ports/bare-arm/qstrdefsport.h
 create mode 100644 ports/bare-arm/system.c

diff --git a/ports/bare-arm/Makefile b/ports/bare-arm/Makefile
index 72d5f1a277269..455a9dc5ac137 100644
--- a/ports/bare-arm/Makefile
+++ b/ports/bare-arm/Makefile
@@ -1,52 +1,59 @@
+# Include the core environment definitions; this will set $(TOP).
 include ../../py/mkenv.mk
 
-# qstr definitions (must come before including py.mk)
-QSTR_DEFS = qstrdefsport.h
+# Include py core make definitions.
+include $(TOP)/py/py.mk
 
-# MicroPython feature configurations
+# Set makefile-level MicroPython feature configurations.
 MICROPY_ROM_TEXT_COMPRESSION ?= 1
 
-# include py core make definitions
-include $(TOP)/py/py.mk
-
+# Define toolchain and other tools.
 CROSS_COMPILE ?= arm-none-eabi-
+DFU ?= $(TOP)/tools/dfu.py
+PYDFU ?= $(TOP)/tools/pydfu.py
 
-INC += -I.
-INC += -I$(TOP)
-INC += -I$(BUILD)
-
-CFLAGS_CORTEX_M4 = -mthumb -mtune=cortex-m4 -mabi=aapcs-linux -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -fsingle-precision-constant -Wdouble-promotion
-CFLAGS = $(INC) -Wall -Werror -std=c99 -nostdlib $(CFLAGS_CORTEX_M4) $(COPT)
-CSUPEROPT = -Os # save some code space
+# Set CFLAGS.
+CFLAGS += -I. -I$(TOP) -I$(BUILD)
+CFLAGS += -Wall -Werror -std=c99 -nostdlib
+CFLAGS += -mthumb -mtune=cortex-m4 -mcpu=cortex-m4 -msoft-float
+CSUPEROPT = -Os # save some code space for performance-critical code
 
-#Debugging/Optimization
+# Select debugging or optimisation build.
 ifeq ($(DEBUG), 1)
-CFLAGS += -O0 -ggdb
+CFLAGS += -Og
 else
 CFLAGS += -Os -DNDEBUG
+CFLAGS += -fdata-sections -ffunction-sections
 endif
 
-LDFLAGS = -nostdlib -T stm32f405.ld -Map=$@.map --cref
-LIBS =
+# Set linker flags.
+LDFLAGS += -nostdlib -T stm32f405.ld --gc-sections
 
-SRC_C = \
-	main.c \
-#	printf.c \
-	string0.c \
-	malloc0.c \
-	gccollect.c \
+# Define the required source files.
+SRC_C += lib.c main.c system.c
 
-SRC_S = \
-#	startup_stm32f40xx.s \
-	gchelper.s \
+# Define the required object files.
+OBJ += $(PY_CORE_O)
+OBJ += $(addprefix $(BUILD)/, $(SRC_C:.c=.o))
 
-OBJ = $(PY_CORE_O) $(addprefix $(BUILD)/, $(SRC_C:.c=.o) $(SRC_S:.s=.o))
-
-all: $(BUILD)/firmware.elf
+# Define the top-level target, the main firmware.
+all: $(BUILD)/firmware.dfu
 
 $(BUILD)/firmware.elf: $(OBJ)
 	$(ECHO) "LINK $@"
-	$(Q)$(LD) $(LDFLAGS) -o $@ $^ $(LIBS)
+	$(Q)$(LD) $(LDFLAGS) -o $@ $^
 	$(Q)$(SIZE) $@
 
+$(BUILD)/firmware.bin: $(BUILD)/firmware.elf
+	$(ECHO) "Create $@"
+	$(Q)$(OBJCOPY) -O binary -j .isr_vector -j .text -j .data $^ $@
+
+$(BUILD)/firmware.dfu: $(BUILD)/firmware.bin
+	$(ECHO) "Create $@"
+	$(Q)$(PYTHON) $(DFU) -b 0x08000000:$^ $@
+
+deploy: $(BUILD)/firmware.dfu
+	$(Q)$(PYTHON) $(PYDFU) -u $^
+
+# Include remaining core make rules.
 include $(TOP)/py/mkrules.mk
diff --git a/ports/bare-arm/README.md b/ports/bare-arm/README.md
new file mode 100644
index 0000000000000..496ee9c7555de
--- /dev/null
+++ b/ports/bare-arm/README.md
@@ -0,0 +1,21 @@
+The bare-arm port
+=================
+
+This port is intended to be the bare-minimum amount of code and configuration
+required to get MicroPython compiling and running on a bare-metal ARM-based
+target.  No external dependencies or libraries are needed for this build and
+it shows exactly what hardware and system functionality MicroPython needs to
+run.
+
+To build, simply run `make` in this directory.  The output will be
+`build/firmware.elf` (and also corresponding `.bin` and `.dfu` files).  This
+firmware can run on an STM32F405-based board (eg a PYBv1.x) and `make deploy`
+will program it to such an MCU when put in USB DFU mode.  The output is a UART
+at 115200 baud, with TX on PA0.
+
+There are some simple demonstration code strings (see `main.c`) which are
+compiled and executed when the firmware starts.  They produce output on the
+system's stdout.
+
+The size of the firmware (the machine code that is programmed to the
+microcontroller's flash/ROM) is currently around 61200 bytes.
diff --git a/ports/bare-arm/lib.c b/ports/bare-arm/lib.c
new file mode 100644
index 0000000000000..ee7c1d765e9d4
--- /dev/null
+++ b/ports/bare-arm/lib.c
@@ -0,0 +1,128 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include <string.h>
+
+// These memory functions are needed when the garbage collector is disabled.
+// A full implementation should be provided, or the garbage collector enabled.
+// The functions here are very simple.
+
+extern char _heap_start;
+
+void *malloc(size_t n) {
+    static char *cur_heap = NULL;
+    if (cur_heap == NULL) {
+        cur_heap = &_heap_start;
+    }
+    void *ptr = cur_heap;
+    cur_heap += (n + 7) & ~7;
+    return ptr;
+}
+
+void *realloc(void *ptr, size_t size) {
+    void *ptr2 = malloc(size);
+    if (ptr && size) {
+        memcpy(ptr2, ptr, size); // size may be greater than ptr's region, do copy anyway
+    }
+    return ptr2;
+}
+
+void free(void *p) {
+}
+
+// These standard string functions are needed by the runtime, and can be
+// provided either by the system or lib/libc/string0.c.  The implementations
+// here are very simple.
+
+int memcmp(const void *s1, const void *s2, size_t n) {
+    const unsigned char *ss1 = s1, *ss2 = s2;
+    while (n--) {
+        int c = *ss1++ - *ss2++;
+        if (c) {
+            return c;
+        }
+    }
+    return 0;
+}
+
+void *memcpy(void *dest, const void *src, size_t n) {
+    return memmove(dest, src, n);
+}
+
+void *memmove(void *dest, const void *src, size_t n) {
+    unsigned char *d = dest;
+    const unsigned char *s = src;
+    if (s < d && d < s + n) {
+        // Need to copy backwards.
+        d += n - 1;
+        s += n - 1;
+        while (n--) {
+            *d-- = *s--;
+        }
+    } else {
+        // Can copy forwards.
+        while (n--) {
+            *d++ = *s++;
+        }
+    }
+    return dest;
+}
+
+void *memset(void *s, int c, size_t n) {
+    unsigned char *ss = s;
+    while (n--) {
+        *ss++ = c;
+    }
+    return s;
+}
+
+char *strchr(const char *s, int c) {
+    while (*s) {
+        if (*s == c) {
+            return (char *)s;
+        }
+        ++s;
+    }
+    return NULL;
+}
+
+int strcmp(const char *s1, const char *s2) {
+    while (*s1 && *s2) {
+        int c = *s1++ - *s2++;
+        if (c) {
+            return c;
+        }
+    }
+    return *s1 - *s2;
+}
+
+size_t strlen(const char *s) {
+    const char *ss = s;
+    while (*ss) {
+        ++ss;
+    }
+    return ss - s;
+}
diff --git a/ports/bare-arm/main.c b/ports/bare-arm/main.c
index df66c04effd7d..82c27bd097f9c 100644
--- a/ports/bare-arm/main.c
+++ b/ports/bare-arm/main.c
@@ -1,15 +1,48 @@
-#include <stdint.h>
-#include <stdio.h>
-#include <string.h>
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2014-2021 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
 
+#include <string.h>
 #include "py/compile.h"
 #include "py/runtime.h"
-#include "py/repl.h"
-#include "py/mperrno.h"
 
-void do_str(const char *src, mp_parse_input_kind_t input_kind) {
+static const char *demo_single_input =
+    "print('hello world!', list(x + 1 for x in range(10)), end='eol\\n')";
+
+static const char *demo_file_input =
+    "import micropython\n"
+    "\n"
+    "print(dir(micropython))\n"
+    "\n"
+    "for i in range(10):\n"
+    "    print('iter {:08}'.format(i))";
+
+static void do_str(const char *src, mp_parse_input_kind_t input_kind) {
     nlr_buf_t nlr;
     if (nlr_push(&nlr) == 0) {
+        // Compile, parse and execute the given string.
         mp_lexer_t *lex = mp_lexer_new_from_str_len(MP_QSTR__lt_stdin_gt_, src, strlen(src), 0);
         qstr source_name = lex->source_name;
         mp_parse_tree_t parse_tree = mp_parse(lex, input_kind);
@@ -17,121 +50,29 @@ void do_str(const char *src, mp_parse_input_kind_t input_kind) {
         mp_call_function_0(module_fun);
         nlr_pop();
     } else {
-        // uncaught exception
+        // Uncaught exception: print it out.
         mp_obj_print_exception(&mp_plat_print, (mp_obj_t)nlr.ret_val);
     }
 }
 
-int main(int argc, char **argv) {
+// Main entry point: initialise the runtime and execute demo strings.
+void bare_main(void) {
     mp_init();
-    do_str("print('hello world!', list(x+1 for x in range(10)), end='eol\\n')", MP_PARSE_SINGLE_INPUT);
-    do_str("for i in range(10):\n  print(i)", MP_PARSE_FILE_INPUT);
+    do_str(demo_single_input, MP_PARSE_SINGLE_INPUT);
+    do_str(demo_file_input, MP_PARSE_FILE_INPUT);
     mp_deinit();
-    return 0;
-}
-
-mp_lexer_t *mp_lexer_new_from_file(const char *filename) {
-    mp_raise_OSError(MP_ENOENT);
-}
-
-mp_import_stat_t mp_import_stat(const char *path) {
-    return MP_IMPORT_STAT_NO_EXIST;
-}
-
-mp_obj_t mp_builtin_open(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs) {
-    return mp_const_none;
 }
-MP_DEFINE_CONST_FUN_OBJ_KW(mp_builtin_open_obj, 1, mp_builtin_open);
 
+// Called if an exception is raised outside all C exception-catching handlers.
 void nlr_jump_fail(void *val) {
-    while (1) {
-        ;
-    }
-}
-
-void NORETURN __fatal_error(const char *msg) {
-    while (1) {
-        ;
+    for (;;) {
     }
 }
 
 #ifndef NDEBUG
+// Used when debugging is enabled.
 void MP_WEAK __assert_func(const char *file, int line, const char *func, const char *expr) {
-    printf("Assertion '%s' failed, at file %s:%d\n", expr, file, line);
-    __fatal_error("Assertion failed");
+    for (;;) {
+    }
 }
 #endif
-
-/*
-int _lseek() {return 0;}
-int _read() {return 0;}
-int _write() {return 0;}
-int _close() {return 0;}
-void _exit(int x) {for(;;){}}
-int _sbrk() {return 0;}
-int _kill() {return 0;}
-int _getpid() {return 0;}
-int _fstat() {return 0;}
-int _isatty() {return 0;}
-*/
-
-void *malloc(size_t n) {
-    return NULL;
-}
-void *calloc(size_t nmemb, size_t size) {
-    return NULL;
-}
-void *realloc(void *ptr, size_t size) {
-    return NULL;
-}
-void free(void *p) {
-}
-int printf(const char *m, ...) {
-    return 0;
-}
-void *memcpy(void *dest, const void *src, size_t n) {
-    return NULL;
-}
-int memcmp(const void *s1, const void *s2, size_t n) {
-    return 0;
-}
-void *memmove(void *dest, const void *src, size_t n) {
-    return NULL;
-}
-void *memset(void *s, int c, size_t n) {
-    return NULL;
-}
-int strcmp(const char *s1, const char *s2) {
-    return 0;
-}
-int strncmp(const char *s1, const char *s2, size_t n) {
-    return 0;
-}
-size_t strlen(const char *s) {
-    return 0;
-}
-char *strcat(char *dest, const char *src) {
-    return NULL;
-}
-char *strchr(const char *dest, int c) {
-    return NULL;
-}
-#include <stdarg.h>
-int vprintf(const char *format, va_list ap) {
-    return 0;
-}
-int vsnprintf(char *str,  size_t size,  const char *format, va_list ap) {
-    return 0;
-}
-
-#undef putchar
-int putchar(int c) {
-    return 0;
-}
-int puts(const char *s) {
-    return 0;
-}
-
-void _start(void) {
-    main(0, NULL);
-}
diff --git a/ports/bare-arm/mpconfigport.h b/ports/bare-arm/mpconfigport.h
index 7fd236bfba9e4..41b6ee71a3f84 100644
--- a/ports/bare-arm/mpconfigport.h
+++ b/ports/bare-arm/mpconfigport.h
@@ -1,71 +1,71 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2014-2021 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
 #include <stdint.h>
 
-// options to control how MicroPython is built
+// Options to control how MicroPython is built
+
+// Memory allocation policy
+#define MICROPY_QSTR_BYTES_IN_HASH              (1)
 
-#define MICROPY_QSTR_BYTES_IN_HASH  (1)
-#define MICROPY_ALLOC_PATH_MAX      (512)
-#define MICROPY_EMIT_X64            (0)
-#define MICROPY_EMIT_THUMB          (0)
-#define MICROPY_EMIT_INLINE_THUMB   (0)
-#define MICROPY_COMP_MODULE_CONST   (0)
-#define MICROPY_COMP_CONST          (0)
-#define MICROPY_COMP_DOUBLE_TUPLE_ASSIGN (0)
-#define MICROPY_COMP_TRIPLE_TUPLE_ASSIGN (0)
-#define MICROPY_MEM_STATS           (0)
-#define MICROPY_DEBUG_PRINTERS      (0)
-#define MICROPY_ENABLE_GC           (0)
-#define MICROPY_HELPER_REPL         (0)
-#define MICROPY_HELPER_LEXER_UNIX   (0)
-#define MICROPY_ENABLE_SOURCE_LINE  (0)
-#define MICROPY_ENABLE_DOC_STRING   (0)
-#define MICROPY_ERROR_REPORTING     (MICROPY_ERROR_REPORTING_TERSE)
-#define MICROPY_BUILTIN_METHOD_CHECK_SELF_ARG (0)
-#define MICROPY_PY_ASYNC_AWAIT (0)
-#define MICROPY_PY_ASSIGN_EXPR      (0)
-#define MICROPY_PY_BUILTINS_BYTEARRAY (0)
-#define MICROPY_PY_BUILTINS_DICT_FROMKEYS (0)
-#define MICROPY_PY_BUILTINS_MEMORYVIEW (0)
-#define MICROPY_PY_BUILTINS_ENUMERATE (0)
-#define MICROPY_PY_BUILTINS_FROZENSET (0)
-#define MICROPY_PY_BUILTINS_REVERSED (0)
-#define MICROPY_PY_BUILTINS_SET     (0)
-#define MICROPY_PY_BUILTINS_SLICE   (0)
-#define MICROPY_PY_BUILTINS_PROPERTY (0)
-#define MICROPY_PY_BUILTINS_STR_COUNT (0)
-#define MICROPY_PY_BUILTINS_STR_OP_MODULO (0)
-#define MICROPY_PY___FILE__         (0)
-#define MICROPY_PY_GC               (0)
-#define MICROPY_PY_ARRAY            (0)
-#define MICROPY_PY_ATTRTUPLE        (0)
-#define MICROPY_PY_COLLECTIONS      (0)
-#define MICROPY_PY_MATH             (0)
-#define MICROPY_PY_CMATH            (0)
-#define MICROPY_PY_IO               (0)
-#define MICROPY_PY_STRUCT           (0)
-#define MICROPY_PY_SYS              (0)
-#define MICROPY_CPYTHON_COMPAT      (0)
-#define MICROPY_MODULE_GETATTR      (0)
-#define MICROPY_LONGINT_IMPL        (MICROPY_LONGINT_IMPL_NONE)
-#define MICROPY_FLOAT_IMPL          (MICROPY_FLOAT_IMPL_NONE)
-#define MICROPY_USE_INTERNAL_PRINTF (0)
+// Compiler configuration
+#define MICROPY_COMP_CONST                      (0)
+#define MICROPY_COMP_DOUBLE_TUPLE_ASSIGN        (0)
 
-// type definitions for the specific machine
+// Python internal features
+#define MICROPY_ENABLE_EXTERNAL_IMPORT          (0)
+#define MICROPY_ERROR_REPORTING                 (MICROPY_ERROR_REPORTING_TERSE)
+#define MICROPY_CPYTHON_COMPAT                  (0)
+#define MICROPY_MODULE_GETATTR                  (0)
+#define MICROPY_BUILTIN_METHOD_CHECK_SELF_ARG   (0)
 
-#define MICROPY_MAKE_POINTER_CALLABLE(p) ((void *)((mp_uint_t)(p) | 1))
+// Fine control over Python builtins, classes, modules, etc
+#define MICROPY_PY_ASYNC_AWAIT                  (0)
+#define MICROPY_PY_ASSIGN_EXPR                  (0)
+#define MICROPY_PY_BUILTINS_STR_COUNT           (0)
+#define MICROPY_PY_BUILTINS_STR_OP_MODULO       (0)
+#define MICROPY_PY_BUILTINS_BYTEARRAY           (0)
+#define MICROPY_PY_BUILTINS_DICT_FROMKEYS       (0)
+#define MICROPY_PY_BUILTINS_SET                 (0)
+#define MICROPY_PY_BUILTINS_SLICE               (0)
+#define MICROPY_PY_BUILTINS_PROPERTY            (0)
+#define MICROPY_PY_BUILTINS_ENUMERATE           (0)
+#define MICROPY_PY_BUILTINS_REVERSED            (0)
+#define MICROPY_PY___FILE__                     (0)
+#define MICROPY_PY_ARRAY                        (0)
+#define MICROPY_PY_COLLECTIONS                  (0)
+#define MICROPY_PY_IO                           (0)
+#define MICROPY_PY_STRUCT                       (0)
+#define MICROPY_PY_SYS                          (0)
 
-#define UINT_FMT "%lu"
-#define INT_FMT "%ld"
+// Type definitions for the specific machine
 
 typedef int32_t mp_int_t; // must be pointer size
 typedef uint32_t mp_uint_t; // must be pointer size
 typedef long mp_off_t;
 
-// dummy print
-#define MP_PLAT_PRINT_STRN(str, len) (void)0
-
-// extra built in names to add to the global namespace
-#define MICROPY_PORT_BUILTINS \
-    { MP_ROM_QSTR(MP_QSTR_open), MP_ROM_PTR(&mp_builtin_open_obj) },
-
-// We need to provide a declaration/definition of alloca()
+// Need to provide a declaration/definition of alloca()
 #include <alloca.h>
diff --git a/ports/bare-arm/qstrdefsport.h b/ports/bare-arm/qstrdefsport.h
deleted file mode 100644
index 00d3e2ae3c555..0000000000000
--- a/ports/bare-arm/qstrdefsport.h
+++ /dev/null
@@ -1,2 +0,0 @@
-// qstrs specific to this port
-// *FORMAT-OFF*
diff --git a/ports/bare-arm/stm32f405.ld b/ports/bare-arm/stm32f405.ld
index dd688a02468da..33a5502d60a3e 100644
--- a/ports/bare-arm/stm32f405.ld
+++ b/ports/bare-arm/stm32f405.ld
@@ -1,117 +1,58 @@
-/*
-    GNU linker script for STM32F405
-*/
+/* GNU linker script for STM32F405 */
 
-/* Specify the memory areas */
 MEMORY
 {
     FLASH (rx)      : ORIGIN = 0x08000000, LENGTH = 0x100000 /* entire flash, 1 MiB */
-    FLASH_ISR (rx)  : ORIGIN = 0x08000000, LENGTH = 0x004000 /* sector 0, 16 KiB */
-    FLASH_TEXT (rx) : ORIGIN = 0x08020000, LENGTH = 0x080000 /* sectors 5,6,7,8, 4*128KiB = 512 KiB (could increase it more) */
-    CCMRAM (xrw)    : ORIGIN = 0x10000000, LENGTH = 0x010000 /* 64 KiB */
     RAM (xrw)       : ORIGIN = 0x20000000, LENGTH = 0x020000 /* 128 KiB */
 }
 
-/* top end of the stack */
 _estack = ORIGIN(RAM) + LENGTH(RAM);
 
-/* RAM extents for the garbage collector */
-_ram_end = ORIGIN(RAM) + LENGTH(RAM);
-_heap_end = 0x2001c000; /* tunable */
-
-/* define output sections */
 SECTIONS
 {
-    /* The startup code goes first into FLASH */
     .isr_vector :
     {
         . = ALIGN(4);
-        KEEP(*(.isr_vector)) /* Startup code */
-
+        KEEP(*(.isr_vector))
         . = ALIGN(4);
-    } >FLASH_ISR
+    } >FLASH
 
-    /* The program code and other data goes into FLASH */
     .text :
     {
         . = ALIGN(4);
-        *(.text)           /* .text sections (code) */
-        *(.text*)          /* .text* sections (code) */
-        *(.rodata)         /* .rodata sections (constants, strings, etc.) */
-        *(.rodata*)        /* .rodata* sections (constants, strings, etc.) */
-    /*  *(.glue_7)   */    /* glue arm to thumb code */
-    /*  *(.glue_7t)  */    /* glue thumb to arm code */
-
+        *(.text)
+        *(.text*)
+        *(.rodata)
+        *(.rodata*)
         . = ALIGN(4);
-        _etext = .;        /* define a global symbol at end of code */
-        _sidata = _etext;  /* This is used by the startup in order to initialize the .data secion */
-    } >FLASH_TEXT
-
-    /*
-    .ARM.extab :
-    {
-        *(.ARM.extab* .gnu.linkonce.armextab.*)
+        _etext = .;
+        _sidata = _etext;
     } >FLASH
 
-    .ARM :
-    {
-        __exidx_start = .;
-        *(.ARM.exidx*)
-        __exidx_end = .;
-    } >FLASH
-    */
-
-    /* This is the initialized data section
-    The program executes knowing that the data is in the RAM
-    but the loader puts the initial values in the FLASH (inidata).
-    It is one task of the startup to copy the initial values from FLASH to RAM. */
     .data : AT ( _sidata )
     {
         . = ALIGN(4);
-        _sdata = .;        /* create a global symbol at data start; used by startup code in order to initialise the .data section in RAM */
-        _ram_start = .;    /* create a global symbol at ram start for garbage collector */
-        *(.data)           /* .data sections */
-        *(.data*)          /* .data* sections */
-
+        _sdata = .;
+        *(.data)
+        *(.data*)
         . = ALIGN(4);
-        _edata = .;        /* define a global symbol at data end; used by startup code in order to initialise the .data section in RAM */
+        _edata = .;
     } >RAM
 
-    /* Uninitialized data section */
     .bss :
     {
         . = ALIGN(4);
-        _sbss = .;         /* define a global symbol at bss start; used by startup code */
+        _sbss = .;
         *(.bss)
         *(.bss*)
         *(COMMON)
-
         . = ALIGN(4);
-        _ebss = .;         /* define a global symbol at bss end; used by startup code */
+        _ebss = .;
     } >RAM
 
-    /* this is to define the start of the heap, and make sure we have a minimum size */
     .heap :
     {
-        . = ALIGN(4);
-        _heap_start = .;    /* define a global symbol at heap start */
+        . = ALIGN(8);
+        _heap_start = .;
     } >RAM
-
-    /* this just checks there is enough RAM for the stack */
-    .stack :
-    {
-        . = ALIGN(4);
-    } >RAM
-
-    /* Remove information from the standard libraries */
-    /*
-    /DISCARD/ :
-    {
-        libc.a ( * )
-        libm.a ( * )
-        libgcc.a ( * )
-    }
-    */
-
-    .ARM.attributes 0 : { *(.ARM.attributes) }
 }
diff --git a/ports/bare-arm/system.c b/ports/bare-arm/system.c
new file mode 100644
index 0000000000000..f66dd2d80a608
--- /dev/null
+++ b/ports/bare-arm/system.c
@@ -0,0 +1,142 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include <stdint.h>
+#include <string.h>
+
+#define RCC     ((periph_rcc_t *)0x40023800)
+#define GPIOA   ((periph_gpio_t *)0x40020000)
+#define UART4   ((periph_uart_t *)0x40004C00)
+
+typedef struct {
+    volatile uint32_t CR;
+    volatile uint32_t PLLCFGR;
+    volatile uint32_t CFGR;
+    volatile uint32_t CIR;
+    uint32_t _1[8];
+    volatile uint32_t AHB1ENR;
+    volatile uint32_t AHB2ENR;
+    volatile uint32_t AHB3ENR;
+    uint32_t _2;
+    volatile uint32_t APB1ENR;
+    volatile uint32_t APB2ENR;
+} periph_rcc_t;
+
+typedef struct {
+    volatile uint32_t MODER;
+    volatile uint32_t OTYPER;
+    volatile uint32_t OSPEEDR;
+    volatile uint32_t PUPDR;
+    volatile uint32_t IDR;
+    volatile uint32_t ODR;
+    volatile uint16_t BSRRL;
+    volatile uint16_t BSRRH;
+    volatile uint32_t LCKR;
+    volatile uint32_t AFR[2];
+} periph_gpio_t;
+
+typedef struct {
+    volatile uint32_t SR;
+    volatile uint32_t DR;
+    volatile uint32_t BRR;
+    volatile uint32_t CR1;
+} periph_uart_t;
+
+extern uint32_t _estack, _sidata, _sdata, _edata, _sbss, _ebss;
+
+void Reset_Handler(void) __attribute__((naked));
+void bare_main(void);
+
+static void stm32_init(void);
+static void gpio_init_alt(periph_gpio_t *gpio, int pin, int alt);
+
+// Very simple ARM vector table.
+const uint32_t isr_vector[] __attribute__((section(".isr_vector"))) = {
+    (uint32_t)&_estack,
+    (uint32_t)&Reset_Handler,
+};
+
+// The CPU runs this function after a reset.
+void Reset_Handler(void) {
+    // Set stack pointer.
+    __asm volatile ("ldr sp, =_estack");
+
+    // Copy .data section from flash to RAM.
+    memcpy(&_sdata, &_sidata, (char *)&_edata - (char *)&_sdata);
+
+    // Zero out .bss section.
+    memset(&_sbss, 0, (char *)&_ebss - (char *)&_sbss);
+
+    // SCB->CCR: enable 8-byte stack alignment for IRQ handlers, in accord with EABI.
+    *((volatile uint32_t *)0xe000ed14) |= 1 << 9;
+
+    // Initialise the cpu and peripherals.
+    stm32_init();
+
+    // Now that there is a basic system up and running, call the main application code.
+    bare_main();
+
+    // This function must not return.
+    for (;;) {
+    }
+}
+
+// Set up the STM32 MCU.
+static void stm32_init(void) {
+    // Note: default clock is internal 16MHz.
+    RCC->AHB1ENR |= 1 << 0; // GPIOAEN
+    RCC->APB1ENR |= 1 << 19; // UART4EN
+    gpio_init_alt(GPIOA, 0, 8);
+    UART4->BRR = (8 << 4) | 11; // 16MHz/(16*8.6875) = 115107 baud
+    UART4->CR1 = 0x00002008; // USART enable, tx enable, rx enable
+}
+
+// Configure a GPIO pin in alternate-function mode.
+static void gpio_init_alt(periph_gpio_t *gpio, int pin, int alt) {
+    gpio->MODER = (gpio->MODER & ~(3 << (2 * pin))) | (2 << (2 * pin));
+    // OTYPER is left as default push-pull
+    // OSPEEDR is left as default low speed
+    // PUPDR is left as default no-pull
+    gpio->AFR[pin >> 3] = (gpio->AFR[pin >> 3] & ~(15 << (4 * (pin & 7)))) | (alt << (4 * (pin & 7)));
+}
+
+// Write a character out to the UART.
+static inline void uart_write_char(int c) {
+    // Wait for TXE, then write the character.
+    while ((UART4->SR & (1 << 7)) == 0) {
+    }
+    UART4->DR = c;
+}
+
+// Send string of given length to stdout, converting \n to \r\n.
+void mp_hal_stdout_tx_strn_cooked(const char *str, size_t len) {
+    while (len--) {
+        if (*str == '\n') {
+            uart_write_char('\r');
+        }
+        uart_write_char(*str++);
+    }
+}

From 9fef1c0bde2f9642d383bd56aa112447384a84ba Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 26 Mar 2021 13:48:34 +1100
Subject: [PATCH 0696/3533] py: Rename remaining object types to be of the form
 mp_type_xxx.

For consistency with all other object types in the core.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/modio.c          |  4 ++--
 py/objarray.c       |  4 ++--
 py/objclosure.c     |  4 ++--
 py/objdict.c        | 20 ++++++++++----------
 py/objgetitemiter.c |  4 ++--
 py/objrange.c       |  4 ++--
 6 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/py/modio.c b/py/modio.c
index 8a18357e24f12..7f0d13cdfaa0b 100644
--- a/py/modio.c
+++ b/py/modio.c
@@ -195,7 +195,7 @@ STATIC const mp_stream_p_t bufwriter_stream_p = {
     .write = bufwriter_write,
 };
 
-STATIC const mp_obj_type_t bufwriter_type = {
+STATIC const mp_obj_type_t mp_type_bufwriter = {
     { &mp_type_type },
     .name = MP_QSTR_BufferedWriter,
     .make_new = bufwriter_make_new,
@@ -270,7 +270,7 @@ STATIC const mp_rom_map_elem_t mp_module_io_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_BytesIO), MP_ROM_PTR(&mp_type_bytesio) },
     #endif
     #if MICROPY_PY_IO_BUFFEREDWRITER
-    { MP_ROM_QSTR(MP_QSTR_BufferedWriter), MP_ROM_PTR(&bufwriter_type) },
+    { MP_ROM_QSTR(MP_QSTR_BufferedWriter), MP_ROM_PTR(&mp_type_bufwriter) },
     #endif
 };
 
diff --git a/py/objarray.c b/py/objarray.c
index 4947f75905e7f..c27366d7208ef 100644
--- a/py/objarray.c
+++ b/py/objarray.c
@@ -634,7 +634,7 @@ STATIC mp_obj_t array_it_iternext(mp_obj_t self_in) {
     }
 }
 
-STATIC const mp_obj_type_t array_it_type = {
+STATIC const mp_obj_type_t mp_type_array_it = {
     { &mp_type_type },
     .name = MP_QSTR_iterator,
     .getiter = mp_identity_getiter,
@@ -645,7 +645,7 @@ STATIC mp_obj_t array_iterator_new(mp_obj_t array_in, mp_obj_iter_buf_t *iter_bu
     assert(sizeof(mp_obj_array_t) <= sizeof(mp_obj_iter_buf_t));
     mp_obj_array_t *array = MP_OBJ_TO_PTR(array_in);
     mp_obj_array_it_t *o = (mp_obj_array_it_t *)iter_buf;
-    o->base.type = &array_it_type;
+    o->base.type = &mp_type_array_it;
     o->array = array;
     o->offset = 0;
     o->cur = 0;
diff --git a/py/objclosure.c b/py/objclosure.c
index 9a8c7631c2bea..054b657896573 100644
--- a/py/objclosure.c
+++ b/py/objclosure.c
@@ -78,7 +78,7 @@ STATIC void closure_print(const mp_print_t *print, mp_obj_t o_in, mp_print_kind_
 }
 #endif
 
-const mp_obj_type_t closure_type = {
+const mp_obj_type_t mp_type_closure = {
     { &mp_type_type },
     .flags = MP_TYPE_FLAG_BINDS_SELF,
     .name = MP_QSTR_closure,
@@ -90,7 +90,7 @@ const mp_obj_type_t closure_type = {
 
 mp_obj_t mp_obj_new_closure(mp_obj_t fun, size_t n_closed_over, const mp_obj_t *closed) {
     mp_obj_closure_t *o = m_new_obj_var(mp_obj_closure_t, mp_obj_t, n_closed_over);
-    o->base.type = &closure_type;
+    o->base.type = &mp_type_closure;
     o->fun = fun;
     o->n_closed = n_closed_over;
     memcpy(o->closed, closed, n_closed_over * sizeof(mp_obj_t));
diff --git a/py/objdict.c b/py/objdict.c
index 4e51f259e7ff4..aea5952d3ddad 100644
--- a/py/objdict.c
+++ b/py/objdict.c
@@ -408,8 +408,8 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_KW(dict_update_obj, 1, dict_update);
 /******************************************************************************/
 /* dict views                                                                 */
 
-STATIC const mp_obj_type_t dict_view_type;
-STATIC const mp_obj_type_t dict_view_it_type;
+STATIC const mp_obj_type_t mp_type_dict_view;
+STATIC const mp_obj_type_t mp_type_dict_view_it;
 
 typedef enum _mp_dict_view_kind_t {
     MP_DICT_VIEW_ITEMS,
@@ -433,7 +433,7 @@ typedef struct _mp_obj_dict_view_t {
 } mp_obj_dict_view_t;
 
 STATIC mp_obj_t dict_view_it_iternext(mp_obj_t self_in) {
-    mp_check_self(mp_obj_is_type(self_in, &dict_view_it_type));
+    mp_check_self(mp_obj_is_type(self_in, &mp_type_dict_view_it));
     mp_obj_dict_view_it_t *self = MP_OBJ_TO_PTR(self_in);
     mp_map_elem_t *next = dict_iter_next(MP_OBJ_TO_PTR(self->dict), &self->cur);
 
@@ -454,7 +454,7 @@ STATIC mp_obj_t dict_view_it_iternext(mp_obj_t self_in) {
     }
 }
 
-STATIC const mp_obj_type_t dict_view_it_type = {
+STATIC const mp_obj_type_t mp_type_dict_view_it = {
     { &mp_type_type },
     .name = MP_QSTR_iterator,
     .getiter = mp_identity_getiter,
@@ -463,10 +463,10 @@ STATIC const mp_obj_type_t dict_view_it_type = {
 
 STATIC mp_obj_t dict_view_getiter(mp_obj_t view_in, mp_obj_iter_buf_t *iter_buf) {
     assert(sizeof(mp_obj_dict_view_it_t) <= sizeof(mp_obj_iter_buf_t));
-    mp_check_self(mp_obj_is_type(view_in, &dict_view_type));
+    mp_check_self(mp_obj_is_type(view_in, &mp_type_dict_view));
     mp_obj_dict_view_t *view = MP_OBJ_TO_PTR(view_in);
     mp_obj_dict_view_it_t *o = (mp_obj_dict_view_it_t *)iter_buf;
-    o->base.type = &dict_view_it_type;
+    o->base.type = &mp_type_dict_view_it;
     o->kind = view->kind;
     o->dict = view->dict;
     o->cur = 0;
@@ -475,7 +475,7 @@ STATIC mp_obj_t dict_view_getiter(mp_obj_t view_in, mp_obj_iter_buf_t *iter_buf)
 
 STATIC void dict_view_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     (void)kind;
-    mp_check_self(mp_obj_is_type(self_in, &dict_view_type));
+    mp_check_self(mp_obj_is_type(self_in, &mp_type_dict_view));
     mp_obj_dict_view_t *self = MP_OBJ_TO_PTR(self_in);
     bool first = true;
     mp_print_str(print, mp_dict_view_names[self->kind]);
@@ -505,7 +505,7 @@ STATIC mp_obj_t dict_view_binary_op(mp_binary_op_t op, mp_obj_t lhs_in, mp_obj_t
     return dict_binary_op(op, o->dict, rhs_in);
 }
 
-STATIC const mp_obj_type_t dict_view_type = {
+STATIC const mp_obj_type_t mp_type_dict_view = {
     { &mp_type_type },
     .name = MP_QSTR_dict_view,
     .print = dict_view_print,
@@ -515,7 +515,7 @@ STATIC const mp_obj_type_t dict_view_type = {
 
 STATIC mp_obj_t mp_obj_new_dict_view(mp_obj_t dict, mp_dict_view_kind_t kind) {
     mp_obj_dict_view_t *o = m_new_obj(mp_obj_dict_view_t);
-    o->base.type = &dict_view_type;
+    o->base.type = &mp_type_dict_view;
     o->dict = dict;
     o->kind = kind;
     return MP_OBJ_FROM_PTR(o);
@@ -548,7 +548,7 @@ STATIC mp_obj_t dict_getiter(mp_obj_t self_in, mp_obj_iter_buf_t *iter_buf) {
     assert(sizeof(mp_obj_dict_view_it_t) <= sizeof(mp_obj_iter_buf_t));
     mp_check_self(mp_obj_is_dict_or_ordereddict(self_in));
     mp_obj_dict_view_it_t *o = (mp_obj_dict_view_it_t *)iter_buf;
-    o->base.type = &dict_view_it_type;
+    o->base.type = &mp_type_dict_view_it;
     o->kind = MP_DICT_VIEW_KEYS;
     o->dict = self_in;
     o->cur = 0;
diff --git a/py/objgetitemiter.c b/py/objgetitemiter.c
index 54e27b8f11d0b..2670314ab2f32 100644
--- a/py/objgetitemiter.c
+++ b/py/objgetitemiter.c
@@ -57,7 +57,7 @@ STATIC mp_obj_t it_iternext(mp_obj_t self_in) {
     }
 }
 
-STATIC const mp_obj_type_t it_type = {
+STATIC const mp_obj_type_t mp_type_it = {
     { &mp_type_type },
     .name = MP_QSTR_iterator,
     .getiter = mp_identity_getiter,
@@ -68,7 +68,7 @@ STATIC const mp_obj_type_t it_type = {
 mp_obj_t mp_obj_new_getitem_iter(mp_obj_t *args, mp_obj_iter_buf_t *iter_buf) {
     assert(sizeof(mp_obj_getitem_iter_t) <= sizeof(mp_obj_iter_buf_t));
     mp_obj_getitem_iter_t *o = (mp_obj_getitem_iter_t *)iter_buf;
-    o->base.type = &it_type;
+    o->base.type = &mp_type_it;
     o->args[0] = args[0];
     o->args[1] = args[1];
     o->args[2] = MP_OBJ_NEW_SMALL_INT(0);
diff --git a/py/objrange.c b/py/objrange.c
index 4eed4b9410550..1f028eb867a91 100644
--- a/py/objrange.c
+++ b/py/objrange.c
@@ -50,7 +50,7 @@ STATIC mp_obj_t range_it_iternext(mp_obj_t o_in) {
     }
 }
 
-STATIC const mp_obj_type_t range_it_type = {
+STATIC const mp_obj_type_t mp_type_range_it = {
     { &mp_type_type },
     .name = MP_QSTR_iterator,
     .getiter = mp_identity_getiter,
@@ -60,7 +60,7 @@ STATIC const mp_obj_type_t range_it_type = {
 STATIC mp_obj_t mp_obj_new_range_iterator(mp_int_t cur, mp_int_t stop, mp_int_t step, mp_obj_iter_buf_t *iter_buf) {
     assert(sizeof(mp_obj_range_it_t) <= sizeof(mp_obj_iter_buf_t));
     mp_obj_range_it_t *o = (mp_obj_range_it_t *)iter_buf;
-    o->base.type = &range_it_type;
+    o->base.type = &mp_type_range_it;
     o->cur = cur;
     o->stop = stop;
     o->step = step;

From ccc388f157eacfea6b5c44e1b6049a2bbeb44734 Mon Sep 17 00:00:00 2001
From: Phil Howard <phil@gadgetoid.com>
Date: Tue, 23 Feb 2021 22:56:44 +0000
Subject: [PATCH 0697/3533] rp2/mpthreadport.h: Cast core_state to
 _mp_state_thread_t.

Required for user C++ code to build successfully against ports/rp2.

Signed-off-by: Phil Howard <phil@pimoroni.com>
---
 ports/rp2/mpthreadport.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/rp2/mpthreadport.h b/ports/rp2/mpthreadport.h
index 4583f6f5391f8..5eb0bff396b98 100644
--- a/ports/rp2/mpthreadport.h
+++ b/ports/rp2/mpthreadport.h
@@ -41,7 +41,7 @@ static inline void mp_thread_set_state(struct _mp_state_thread_t *state) {
 }
 
 static inline struct _mp_state_thread_t *mp_thread_get_state(void) {
-    return core_state[get_core_num()];
+    return (struct _mp_state_thread_t *)core_state[get_core_num()];
 }
 
 static inline void mp_thread_mutex_init(mp_thread_mutex_t *m) {

From 0cf12dd59c9ddddbd602d4267410033cb5a9d265 Mon Sep 17 00:00:00 2001
From: Phil Howard <phil@gadgetoid.com>
Date: Tue, 23 Feb 2021 22:57:14 +0000
Subject: [PATCH 0698/3533] rp2: Add support for USER_C_MODULES to CMake build
 system.

The parts that are generic are added to py/ so they can be used by other
ports that use CMake.

py/usermod.cmake:

* Creates a usermod target to hang user C/CXX modules from.
* Gathers sources from user C/CXX modules and libs for QSTR scan.

ports/rp2/CMakeLists.txt:

* Includes py/usermod.cmake.
* Links the resulting usermod library to the MicroPython target.

py/mkrules.cmake:

Add cxxflags to qstr.i.last custom command for CXX modules:

* MICROPY_CPP_FLAGS so CXX modules will find includes.
* -DNO_QSTR to fix fatal error missing "genhdr/qstrdefs.generated.h".

Usage:

The rp2 port can be linked against user C modules by running:

make USER_C_MODULES=/path/to/module/micropython.cmake

CMake will print a list of included modules.

Co-authored-by: Graham Sanderson <graham.sanderson@raspberrypi.org>
Co-authored-by: Michael O'Cleirigh <michael.ocleirigh@rivulet.ca>
Signed-off-by: Phil Howard <phil@pimoroni.com>
---
 ports/rp2/CMakeLists.txt |  6 +++++
 ports/rp2/Makefile       |  8 ++++++-
 py/mkrules.cmake         |  2 +-
 py/usermod.cmake         | 52 ++++++++++++++++++++++++++++++++++++++++
 4 files changed, 66 insertions(+), 2 deletions(-)
 create mode 100644 py/usermod.cmake

diff --git a/ports/rp2/CMakeLists.txt b/ports/rp2/CMakeLists.txt
index 3968194dcbbfe..3db0e6b62a0ee 100644
--- a/ports/rp2/CMakeLists.txt
+++ b/ports/rp2/CMakeLists.txt
@@ -27,6 +27,8 @@ project(${MICROPY_TARGET})
 
 pico_sdk_init()
 
+include(${MICROPY_DIR}/py/usermod.cmake)
+
 add_executable(${MICROPY_TARGET})
 
 set(MICROPY_QSTRDEFS_PORT
@@ -80,6 +82,7 @@ set(MICROPY_SOURCE_PORT
 set(MICROPY_SOURCE_QSTR
     ${MICROPY_SOURCE_PY}
     ${MICROPY_SOURCE_EXTMOD}
+    ${MICROPY_SOURCE_USERMOD}
     ${MICROPY_DIR}/lib/utils/mpirq.c
     ${MICROPY_DIR}/lib/utils/sys_stdio_mphal.c
     ${PROJECT_SOURCE_DIR}/machine_adc.c
@@ -142,7 +145,10 @@ target_sources(${MICROPY_TARGET} PRIVATE
     ${MICROPY_SOURCE_PORT}
 )
 
+target_link_libraries(${MICROPY_TARGET} usermod)
+
 target_include_directories(${MICROPY_TARGET} PRIVATE
+    ${MICROPY_INC_USERMOD}
     "${PROJECT_SOURCE_DIR}"
     "${MICROPY_DIR}"
     "${CMAKE_BINARY_DIR}"
diff --git a/ports/rp2/Makefile b/ports/rp2/Makefile
index 08cd53dcca68c..3358c4ccae66e 100644
--- a/ports/rp2/Makefile
+++ b/ports/rp2/Makefile
@@ -6,8 +6,14 @@ BUILD = build
 
 $(VERBOSE)MAKESILENT = -s
 
+CMAKE_ARGS =
+
+ifdef USER_C_MODULES
+CMAKE_ARGS += -DUSER_C_MODULES=${USER_C_MODULES}
+endif
+
 all:
-	[ -d $(BUILD) ] || cmake -S . -B $(BUILD) -DPICO_BUILD_DOCS=0
+	[ -d $(BUILD) ] || cmake -S . -B $(BUILD) -DPICO_BUILD_DOCS=0 ${CMAKE_ARGS}
 	$(MAKE) $(MAKESILENT) -C $(BUILD)
 
 clean:
diff --git a/py/mkrules.cmake b/py/mkrules.cmake
index 9c4c4afabe03e..f20240c62b299 100644
--- a/py/mkrules.cmake
+++ b/py/mkrules.cmake
@@ -69,7 +69,7 @@ add_custom_command(
 # it was last run, but it looks like it's not possible to specify that with cmake.
 add_custom_command(
     OUTPUT ${MICROPY_QSTRDEFS_LAST}
-    COMMAND ${Python3_EXECUTABLE} ${MICROPY_PY_DIR}/makeqstrdefs.py pp ${CMAKE_C_COMPILER} -E output ${MICROPY_GENHDR_DIR}/qstr.i.last cflags ${MICROPY_CPP_FLAGS} -DNO_QSTR sources ${MICROPY_SOURCE_QSTR}
+    COMMAND ${Python3_EXECUTABLE} ${MICROPY_PY_DIR}/makeqstrdefs.py pp ${CMAKE_C_COMPILER} -E output ${MICROPY_GENHDR_DIR}/qstr.i.last cflags ${MICROPY_CPP_FLAGS} -DNO_QSTR cxxflags ${MICROPY_CPP_FLAGS} -DNO_QSTR sources ${MICROPY_SOURCE_QSTR}
     DEPENDS ${MICROPY_MODULEDEFS}
         ${MICROPY_SOURCE_QSTR}
     VERBATIM
diff --git a/py/usermod.cmake b/py/usermod.cmake
new file mode 100644
index 0000000000000..853276283746d
--- /dev/null
+++ b/py/usermod.cmake
@@ -0,0 +1,52 @@
+# Create a target for all user modules to link against.
+add_library(usermod INTERFACE)
+
+function(usermod_gather_sources SOURCES_VARNAME INCLUDE_DIRECTORIES_VARNAME INCLUDED_VARNAME LIB)
+    if (NOT ${LIB} IN_LIST ${INCLUDED_VARNAME})
+        list(APPEND ${INCLUDED_VARNAME} ${LIB})
+
+        # Gather library sources
+        get_target_property(lib_sources ${LIB} INTERFACE_SOURCES)
+        if (lib_sources)
+            list(APPEND ${SOURCES_VARNAME} ${lib_sources})
+        endif()
+
+        # Gather library includes
+        get_target_property(lib_include_directories ${LIB} INTERFACE_INCLUDE_DIRECTORIES)
+        if (lib_include_directories)
+            list(APPEND ${INCLUDE_DIRECTORIES_VARNAME} ${lib_include_directories})
+        endif()
+
+        # Recurse linked libraries
+        get_target_property(trans_depend ${LIB} INTERFACE_LINK_LIBRARIES)
+        if (trans_depend)
+            foreach(SUB_LIB ${trans_depend})
+                usermod_gather_sources(
+                    ${SOURCES_VARNAME}
+                    ${INCLUDE_DIRECTORIES_VARNAME}
+                    ${INCLUDED_VARNAME}
+                    ${SUB_LIB})
+            endforeach()
+        endif()
+
+        set(${SOURCES_VARNAME} ${${SOURCES_VARNAME}} PARENT_SCOPE)
+        set(${INCLUDE_DIRECTORIES_VARNAME} ${${INCLUDE_DIRECTORIES_VARNAME}} PARENT_SCOPE)
+        set(${INCLUDED_VARNAME} ${${INCLUDED_VARNAME}} PARENT_SCOPE)
+    endif()
+endfunction()
+
+# Include CMake files for user modules.
+if (USER_C_MODULES)
+    foreach(USER_C_MODULE_PATH ${USER_C_MODULES})
+        message("Including User C Module(s) from ${USER_C_MODULE_PATH}")
+        include(${USER_C_MODULE_PATH})
+    endforeach()
+endif()
+
+# Recursively gather sources for QSTR scanning - doesn't support generator expressions.
+usermod_gather_sources(MICROPY_SOURCE_USERMOD MICROPY_INC_USERMOD found_modules usermod)
+
+# Report found modules.
+list(REMOVE_ITEM found_modules "usermod")
+list(JOIN found_modules ", " found_modules)
+message("Found User C Module(s): ${found_modules}")

From cc497d4c6a7bbf491fbc57b9447632bddff8d566 Mon Sep 17 00:00:00 2001
From: Phil Howard <phil@gadgetoid.com>
Date: Tue, 23 Feb 2021 23:06:04 +0000
Subject: [PATCH 0699/3533] examples/usercmodule: Add micropython.cmake to the
 C and CPP examples.

examples/usercmodule/micropython.cmake:

Root micropython.cmake file is responsible for including modules.

examples/usercmodule/cexample/micropython.cmake:
examples/usercmodule/cppexample/micropython.cmake:

Module micropython.cmake files define the target and link it to usermod.

Signed-off-by: Phil Howard <phil@pimoroni.com>
---
 .../usercmodule/cexample/micropython.cmake    | 21 ++++++++++++++++++
 .../usercmodule/cppexample/micropython.cmake  | 22 +++++++++++++++++++
 examples/usercmodule/micropython.cmake        | 11 ++++++++++
 3 files changed, 54 insertions(+)
 create mode 100644 examples/usercmodule/cexample/micropython.cmake
 create mode 100644 examples/usercmodule/cppexample/micropython.cmake
 create mode 100644 examples/usercmodule/micropython.cmake

diff --git a/examples/usercmodule/cexample/micropython.cmake b/examples/usercmodule/cexample/micropython.cmake
new file mode 100644
index 0000000000000..371a3eefa4726
--- /dev/null
+++ b/examples/usercmodule/cexample/micropython.cmake
@@ -0,0 +1,21 @@
+# Create an INTERFACE library for our C module.
+add_library(usermod_cexample INTERFACE)
+
+# Add our source files to the lib
+target_sources(usermod_cexample INTERFACE
+    ${CMAKE_CURRENT_LIST_DIR}/examplemodule.c
+)
+
+# Add the current directory as an include directory.
+target_include_directories(usermod_cexample INTERFACE
+    ${CMAKE_CURRENT_LIST_DIR}
+)
+
+# Enable the module automatically by adding the relevant compile definitions.
+target_compile_definitions(usermod_cexample INTERFACE
+    MODULE_CEXAMPLE_ENABLED=1
+)
+
+# Link our INTERFACE library to the usermod target.
+target_link_libraries(usermod INTERFACE usermod_cexample)
+
diff --git a/examples/usercmodule/cppexample/micropython.cmake b/examples/usercmodule/cppexample/micropython.cmake
new file mode 100644
index 0000000000000..43e8d887f546e
--- /dev/null
+++ b/examples/usercmodule/cppexample/micropython.cmake
@@ -0,0 +1,22 @@
+# Create an INTERFACE library for our CPP module.
+add_library(usermod_cppexample INTERFACE)
+
+# Add our source files to the library.
+target_sources(usermod_cppexample INTERFACE
+    ${CMAKE_CURRENT_LIST_DIR}/example.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/examplemodule.c
+)
+
+# Add the current directory as an include directory.
+target_include_directories(usermod_cppexample INTERFACE
+    ${CMAKE_CURRENT_LIST_DIR}
+)
+
+# Enable the module automatically by adding the relevant compile definitions.
+target_compile_definitions(usermod_cppexample INTERFACE
+    MODULE_CPPEXAMPLE_ENABLED=1
+)
+
+# Link our INTERFACE library to the usermod target.
+target_link_libraries(usermod INTERFACE usermod_cppexample)
+
diff --git a/examples/usercmodule/micropython.cmake b/examples/usercmodule/micropython.cmake
new file mode 100644
index 0000000000000..ad88d77806c4e
--- /dev/null
+++ b/examples/usercmodule/micropython.cmake
@@ -0,0 +1,11 @@
+# This top-level micropython.cmake is responsible for listing
+# the individual modules we want to include.
+# Paths are absolute, and ${CMAKE_CURRENT_LIST_DIR} can be
+# used to prefix subdirectories.
+
+# Add the C example.
+include(${CMAKE_CURRENT_LIST_DIR}/cexample/micropython.cmake)
+
+# Add the CPP example.
+include(${CMAKE_CURRENT_LIST_DIR}/cppexample/micropython.cmake)
+

From 8e5756e2b6d03805bf9f40cd1128c0cd6214e07c Mon Sep 17 00:00:00 2001
From: Phil Howard <phil@gadgetoid.com>
Date: Wed, 24 Feb 2021 12:57:53 +0000
Subject: [PATCH 0700/3533] docs/develop/cmodules.rst: Document C-modules and
 micropython.cmake.

Documents the micropython.cmake file required to make user C modules
compatible with the CMake build system.

Signed-off-by: Phil Howard <phil@pimoroni.com>
---
 docs/develop/cmodules.rst | 76 ++++++++++++++++++++++++++++++++++-----
 1 file changed, 68 insertions(+), 8 deletions(-)

diff --git a/docs/develop/cmodules.rst b/docs/develop/cmodules.rst
index 2db1f65f2e488..dd02f1439c053 100644
--- a/docs/develop/cmodules.rst
+++ b/docs/develop/cmodules.rst
@@ -53,6 +53,30 @@ A MicroPython user C module is a directory with the following files:
   for header files), these should be added to ``CFLAGS_USERMOD`` for C code
   and to ``CXXFLAGS_USERMOD`` for C++ code.
 
+* ``micropython.cmake`` contains the CMake configuration for this module.
+
+  In ``micropython.cmake``, you may use ``${CMAKE_CURRENT_LIST_DIR}`` as the path to
+  the current module.
+
+  Your ``micropython.cmake`` should define an ``INTERFACE`` library and associate
+  your source files, compile definitions and include directories with it.
+  The library should then be linked to the ``usermod`` target.
+
+  .. code-block:: cmake
+
+      add_library(usermod_cexample INTERFACE)
+
+      target_sources(usermod_cexample INTERFACE
+          ${CMAKE_CURRENT_LIST_DIR}/examplemodule.c
+      )
+
+      target_include_directories(usermod_cexample INTERFACE
+          ${CMAKE_CURRENT_LIST_DIR}
+      )
+
+      target_link_libraries(usermod INTERFACE usermod_cexample)
+
+
   See below for full usage example.
 
 
@@ -70,9 +94,11 @@ and has a source file and a Makefile fragment with content as descibed above::
        └──usercmodule/
           └──cexample/
              ├── examplemodule.c
-             └── micropython.mk
+             ├── micropython.mk
+             └── micropython.cmake
 
-Refer to the comments in these 2 files for additional explanation.
+
+Refer to the comments in these files for additional explanation.
 Next to the ``cexample`` module there's also ``cppexample`` which
 works in the same way but shows one way of mixing C and C++ code
 in MicroPython.
@@ -97,10 +123,13 @@ applying 2 modifications:
       ├── modules/
       │   └──example1/
       │       ├──example1.c
-      │       └──micropython.mk
+      │       ├──micropython.mk
+      │       └──micropython.cmake
       │   └──example2/
       │       ├──example2.c
-      │       └──micropython.mk
+      │       ├──micropython.mk
+      │       └──micropython.cmake
+      │   └──micropython.cmake
       └── micropython/
           ├──ports/
          ... ├──stm32/
@@ -109,10 +138,21 @@ applying 2 modifications:
 
   with ``USER_C_MODULES`` set to the ``my_project/modules`` directory.
 
-- all modules found in this directory will be compiled, but only those
-  which are explicitly enabled will be availabe for importing. Enabling a
-  module is done by setting the preprocessor define from its module
-  registration to 1. For example if the source code defines the module with
+  A top level ``micropython.cmake`` - found directly in the ``my_project/modules``
+  directory - should ``include`` all of your modules.
+
+  .. code-block:: cmake
+
+      include(${CMAKE_CURRENT_LIST_DIR}/example1/micropython.cmake)
+      include(${CMAKE_CURRENT_LIST_DIR}/example2/micropython.cmake)
+
+
+- all modules found in this directory (or added via ``include`` in the top-level
+  ``micropython.cmake`` when using CMake) will be compiled, but only those which are
+  explicitly enabled will be available for importing. Enabling a module is done
+  by setting the preprocessor define from its module registration to 1.
+
+  For example if the source code defines the module with
 
   .. code-block:: c
 
@@ -149,6 +189,26 @@ The build output will show the modules found::
     ...
 
 
+For a CMake-based port such as rp2, this will look a little different:
+
+.. code-block:: bash
+
+    cd micropython/ports/rp2
+    make USER_C_MODULES=../../examples/usercmodule all
+
+
+The CMake build output lists the modules by name::
+
+    ...
+    Including User C Module(s) from ../../examples/usercmodule/micropython.cmake
+    Found User C Module(s): usermod_cexample, usermod_cppexample
+    ...
+
+
+Note that the ``micropython.cmake`` files define ``DMODULE_<name>_ENABLED=1`` automatically.
+The top-level ``micropython.cmake`` can be used to control which modules are enabled.
+
+
 Or for your own project with a directory structure as shown above,
 including both modules and building the stm32 port for example:
 

From 5976ea02a50ea76d72ada40db4cda186147fb412 Mon Sep 17 00:00:00 2001
From: Phil Howard <phil@gadgetoid.com>
Date: Tue, 23 Mar 2021 12:25:27 +0000
Subject: [PATCH 0701/3533] tools/ci.sh: Add CI for CMake USER_C_MODULE
 support.

Builds the rp2 port against the example C and CXX modules.

Signed-off-by: Phil Howard <phil@pimoroni.com>
---
 tools/ci.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tools/ci.sh b/tools/ci.sh
index 53cf7f878b24c..0450611a10b43 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -181,6 +181,8 @@ function ci_rp2_build {
     make ${MAKEOPTS} -C mpy-cross
     git submodule update --init lib/pico-sdk lib/tinyusb
     make ${MAKEOPTS} -C ports/rp2
+    make ${MAKEOPTS} -C ports/rp2 clean
+    make ${MAKEOPTS} -C ports/rp2 USER_C_MODULES=../../examples/usercmodule/micropython.cmake
 }
 
 ########################################################################################

From ca3d51f12206a88463f2b2a2d27756a1b519cb6a Mon Sep 17 00:00:00 2001
From: Liam Fraser <liam@raspberrypi.com>
Date: Tue, 30 Mar 2021 11:18:11 +0100
Subject: [PATCH 0702/3533] rp2: Don't advertise remote wakeup for USB serial.

This USB feature is currently not supported.  With this flag enabled (and
the feature not implemented) the USB serial will stop working if there is a
delay of more than about 2 seconds between messages, which can occur with
USB autosuspend enabled.

Fixes issue #6866.
---
 ports/rp2/tusb_port.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/rp2/tusb_port.c b/ports/rp2/tusb_port.c
index afb566bdb4a2f..94856ab452702 100644
--- a/ports/rp2/tusb_port.c
+++ b/ports/rp2/tusb_port.c
@@ -68,7 +68,7 @@ static const tusb_desc_device_t usbd_desc_device = {
 
 static const uint8_t usbd_desc_cfg[USBD_DESC_LEN] = {
     TUD_CONFIG_DESCRIPTOR(1, USBD_ITF_MAX, USBD_STR_0, USBD_DESC_LEN,
-        TUSB_DESC_CONFIG_ATT_REMOTE_WAKEUP, USBD_MAX_POWER_MA),
+        0, USBD_MAX_POWER_MA),
 
     TUD_CDC_DESCRIPTOR(USBD_ITF_CDC, USBD_STR_CDC, USBD_CDC_EP_CMD,
         USBD_CDC_CMD_MAX_SIZE, USBD_CDC_EP_OUT, USBD_CDC_EP_IN, USBD_CDC_IN_OUT_MAX_SIZE),

From 0ccd9e08aad95f955ded0006cff67e2a50778c84 Mon Sep 17 00:00:00 2001
From: Michael O'Cleirigh <michael.ocleirigh@rivulet.ca>
Date: Sat, 27 Mar 2021 17:10:39 -0400
Subject: [PATCH 0703/3533] esp32: Restore USER_C_MODULE support with new CMake
 build system.

Support for User C and C++ modules was lost due to upgrading the esp32 to
the latest CMake based IDF from the GNUMakefile build process.

Restore the support for the esp32 port by integrating with the approach
recently added for the rp2 port.

Signed-off-by: Michael O'Cleirigh <michael.ocleirigh@rivulet.ca>
---
 ports/esp32/Makefile            |  8 +++++++-
 ports/esp32/main/CMakeLists.txt | 10 ++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/ports/esp32/Makefile b/ports/esp32/Makefile
index 9a3a15d6ee6c8..39b740ffae074 100644
--- a/ports/esp32/Makefile
+++ b/ports/esp32/Makefile
@@ -18,7 +18,13 @@ GIT_SUBMODULES = lib/berkeley-db-1.xx
 
 .PHONY: all clean deploy erase submodules FORCE
 
-IDFPY_FLAGS += -D MICROPY_BOARD=$(BOARD) -B $(BUILD)
+CMAKE_ARGS =
+
+ifdef USER_C_MODULES
+	CMAKE_ARGS += -DUSER_C_MODULES=${USER_C_MODULES}
+endif
+
+IDFPY_FLAGS += -D MICROPY_BOARD=$(BOARD) -B $(BUILD) $(CMAKE_ARGS)
 
 all:
 	idf.py $(IDFPY_FLAGS) build
diff --git a/ports/esp32/main/CMakeLists.txt b/ports/esp32/main/CMakeLists.txt
index b6bccdde3ca9b..082410f4c0f5c 100644
--- a/ports/esp32/main/CMakeLists.txt
+++ b/ports/esp32/main/CMakeLists.txt
@@ -5,6 +5,10 @@ get_filename_component(MICROPY_DIR ${PROJECT_DIR}/../.. ABSOLUTE)
 include(${MICROPY_DIR}/py/py.cmake)
 include(${MICROPY_DIR}/extmod/extmod.cmake)
 
+if(NOT CMAKE_BUILD_EARLY_EXPANSION)
+    include(${MICROPY_DIR}/py/usermod.cmake)
+endif()
+
 set(MICROPY_QSTRDEFS_PORT
     ${PROJECT_DIR}/qstrdefsport.h
 )
@@ -71,6 +75,7 @@ set(MICROPY_SOURCE_PORT
 set(MICROPY_SOURCE_QSTR
     ${MICROPY_SOURCE_PY}
     ${MICROPY_SOURCE_EXTMOD}
+    ${MICROPY_SOURCE_USERMOD}
     ${MICROPY_SOURCE_LIB}
     ${MICROPY_SOURCE_PORT}
 )
@@ -129,6 +134,7 @@ idf_component_register(
         ${MICROPY_SOURCE_PORT}
     INCLUDE_DIRS
         ${MICROPY_DIR}
+        ${MICROPY_INC_USERMOD}
         ${MICROPY_PORT_DIR}
         ${MICROPY_BOARD_DIR}
         ${CMAKE_BINARY_DIR}
@@ -159,6 +165,10 @@ target_compile_options(${MICROPY_TARGET} PUBLIC
     -Wno-missing-field-initializers
 )
 
+# add usermod
+target_link_libraries(${MICROPY_TARGET} usermod)
+
+
 # Collect all of the include directories and compile definitions for the IDF components.
 foreach(comp ${IDF_COMPONENTS})
     get_target_property(type __idf_${comp} TYPE)

From 17b1f8212199ea6344e289e7fdea9585e30765d6 Mon Sep 17 00:00:00 2001
From: Michael O'Cleirigh <michael.ocleirigh@rivulet.ca>
Date: Sat, 27 Mar 2021 17:13:00 -0400
Subject: [PATCH 0704/3533] tools/ci.sh: Build user C modules for esp32.

Builds the esp32 port against the example C and CXX modules.

Signed-off-by: Michael O'Cleirigh <michael.ocleirigh@rivulet.ca>
---
 tools/ci.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tools/ci.sh b/tools/ci.sh
index 0450611a10b43..1a410632cdd2d 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -100,6 +100,8 @@ function ci_esp32_build {
     make ${MAKEOPTS} -C mpy-cross
     make ${MAKEOPTS} -C ports/esp32 submodules
     make ${MAKEOPTS} -C ports/esp32
+    make ${MAKEOPTS} -C ports/esp32 clean
+    make ${MAKEOPTS} -C ports/esp32 USER_C_MODULES=../../../examples/usercmodule/micropython.cmake
 }
 
 ########################################################################################

From ec79e445027857d219d139cd31af578124a8e913 Mon Sep 17 00:00:00 2001
From: Michael O'Cleirigh <michael.ocleirigh@rivulet.ca>
Date: Tue, 30 Mar 2021 23:03:31 -0400
Subject: [PATCH 0705/3533] esp32: Fix multiple definition errors with
 mp_hal_stdout_tx functions.

It was noticed that the esp32 port didn't build ulab correctly.  The
problem was a multiple defintion of the 'mp_hal_stdout_tx_str' and
'mp_hal_stdout_tx_strn_cooked' functions.

They were defined in stdout_helpers.c but also in the
ports/esp32/mphalport.c.

Fixed by removing stdout_helpers.c from the build.

Signed-off-by: Michael O'Cleirigh <michael.ocleirigh@rivulet.ca>
---
 ports/esp32/main/CMakeLists.txt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ports/esp32/main/CMakeLists.txt b/ports/esp32/main/CMakeLists.txt
index 082410f4c0f5c..d7d08ea663df4 100644
--- a/ports/esp32/main/CMakeLists.txt
+++ b/ports/esp32/main/CMakeLists.txt
@@ -25,7 +25,6 @@ set(MICROPY_SOURCE_LIB
     ${MICROPY_DIR}/lib/oofatfs/ffunicode.c
     ${MICROPY_DIR}/lib/timeutils/timeutils.c
     ${MICROPY_DIR}/lib/utils/interrupt_char.c
-    ${MICROPY_DIR}/lib/utils/stdout_helpers.c
     ${MICROPY_DIR}/lib/utils/sys_stdio_mphal.c
     ${MICROPY_DIR}/lib/utils/pyexec.c
 )

From d87f42b0e53829052f17955ba1e17f938ae486fb Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 31 Mar 2021 00:45:43 +1100
Subject: [PATCH 0706/3533] examples/usercmodules: Simplify user C module
 enabling.

It's a bit of a pitfall with user C modules that including them in the
build does not automatically enable them.  This commit changes the docs and
examples for user C modules to encourage writers of user C modules to
enable them unconditionally.  This makes things simpler and covers most use
cases.

See discussion in issue #6960, and also #7086.

Signed-off-by: Damien George <damien@micropython.org>
---
 docs/develop/cmodules.rst                     | 20 +++++++++++--------
 examples/usercmodule/cexample/examplemodule.c |  5 ++++-
 .../usercmodule/cexample/micropython.cmake    |  6 ------
 .../usercmodule/cppexample/examplemodule.c    |  5 ++++-
 .../usercmodule/cppexample/micropython.cmake  |  6 ------
 .../unix/variants/coverage/mpconfigvariant.mk |  3 +--
 tools/ci.sh                                   |  2 +-
 7 files changed, 22 insertions(+), 25 deletions(-)

diff --git a/docs/develop/cmodules.rst b/docs/develop/cmodules.rst
index dd02f1439c053..be49485f2cd26 100644
--- a/docs/develop/cmodules.rst
+++ b/docs/develop/cmodules.rst
@@ -149,17 +149,23 @@ applying 2 modifications:
 
 - all modules found in this directory (or added via ``include`` in the top-level
   ``micropython.cmake`` when using CMake) will be compiled, but only those which are
-  explicitly enabled will be available for importing. Enabling a module is done
-  by setting the preprocessor define from its module registration to 1.
+  enabled will be available for importing.  If a module is to always be enabled,
+  which is usually the case for custom modules and custom builds, then it is
+  enough to supply "1" as the third parameter to the registration macro, like:
 
-  For example if the source code defines the module with
+  .. code-block:: c
+
+      MP_REGISTER_MODULE(MP_QSTR_cexample, example_user_cmodule, 1);
+
+  Alternatively, to make the module disabled by default but selectable through
+  a preprocessor configuration option, use:
 
   .. code-block:: c
 
       MP_REGISTER_MODULE(MP_QSTR_cexample, example_user_cmodule, MODULE_CEXAMPLE_ENABLED);
 
 
-  then ``MODULE_CEXAMPLE_ENABLED`` has to be set to 1 to make the module available.
+  Then ``MODULE_CEXAMPLE_ENABLED`` has to be set to 1 to make the module available.
   This can be done by adding ``CFLAGS_EXTRA=-DMODULE_CEXAMPLE_ENABLED=1`` to
   the ``make`` command, or editing ``mpconfigport.h`` or ``mpconfigboard.h``
   to add
@@ -179,7 +185,7 @@ directory can be built for the unix port:
 .. code-block:: bash
 
     cd micropython/ports/unix
-    make USER_C_MODULES=../../examples/usercmodule CFLAGS_EXTRA=-DMODULE_CEXAMPLE_ENABLED=1 all
+    make USER_C_MODULES=../../examples/usercmodule all
 
 The build output will show the modules found::
 
@@ -205,7 +211,6 @@ The CMake build output lists the modules by name::
     ...
 
 
-Note that the ``micropython.cmake`` files define ``DMODULE_<name>_ENABLED=1`` automatically.
 The top-level ``micropython.cmake`` can be used to control which modules are enabled.
 
 
@@ -215,8 +220,7 @@ including both modules and building the stm32 port for example:
 .. code-block:: bash
 
     cd my_project/micropython/ports/stm32
-    make USER_C_MODULES=../../../modules \
-      CFLAGS_EXTRA="-DMODULE_EXAMPLE1_ENABLED=1 -DMODULE_EXAMPLE2_ENABLED=1" all
+    make USER_C_MODULES=../../../modules all
 
 
 Module usage in MicroPython
diff --git a/examples/usercmodule/cexample/examplemodule.c b/examples/usercmodule/cexample/examplemodule.c
index f608823c9e51c..49ebc7aaaf9d2 100644
--- a/examples/usercmodule/cexample/examplemodule.c
+++ b/examples/usercmodule/cexample/examplemodule.c
@@ -31,4 +31,7 @@ const mp_obj_module_t example_user_cmodule = {
 };
 
 // Register the module to make it available in Python.
-MP_REGISTER_MODULE(MP_QSTR_cexample, example_user_cmodule, MODULE_CEXAMPLE_ENABLED);
+// Note: the "1" in the third argument means this module is always enabled.
+// This "1" can be optionally replaced with a macro like MODULE_CEXAMPLE_ENABLED
+// which can then be used to conditionally enable this module.
+MP_REGISTER_MODULE(MP_QSTR_cexample, example_user_cmodule, 1);
diff --git a/examples/usercmodule/cexample/micropython.cmake b/examples/usercmodule/cexample/micropython.cmake
index 371a3eefa4726..ba076a16b246b 100644
--- a/examples/usercmodule/cexample/micropython.cmake
+++ b/examples/usercmodule/cexample/micropython.cmake
@@ -11,11 +11,5 @@ target_include_directories(usermod_cexample INTERFACE
     ${CMAKE_CURRENT_LIST_DIR}
 )
 
-# Enable the module automatically by adding the relevant compile definitions.
-target_compile_definitions(usermod_cexample INTERFACE
-    MODULE_CEXAMPLE_ENABLED=1
-)
-
 # Link our INTERFACE library to the usermod target.
 target_link_libraries(usermod INTERFACE usermod_cexample)
-
diff --git a/examples/usercmodule/cppexample/examplemodule.c b/examples/usercmodule/cppexample/examplemodule.c
index ceb588bef6b30..dfb7856837613 100644
--- a/examples/usercmodule/cppexample/examplemodule.c
+++ b/examples/usercmodule/cppexample/examplemodule.c
@@ -22,4 +22,7 @@ const mp_obj_module_t cppexample_user_cmodule = {
 };
 
 // Register the module to make it available in Python.
-MP_REGISTER_MODULE(MP_QSTR_cppexample, cppexample_user_cmodule, MODULE_CPPEXAMPLE_ENABLED);
+// Note: the "1" in the third argument means this module is always enabled.
+// This "1" can be optionally replaced with a macro like MODULE_CPPEXAMPLE_ENABLED
+// which can then be used to conditionally enable this module.
+MP_REGISTER_MODULE(MP_QSTR_cppexample, cppexample_user_cmodule, 1);
diff --git a/examples/usercmodule/cppexample/micropython.cmake b/examples/usercmodule/cppexample/micropython.cmake
index 43e8d887f546e..6da972c94e3b5 100644
--- a/examples/usercmodule/cppexample/micropython.cmake
+++ b/examples/usercmodule/cppexample/micropython.cmake
@@ -12,11 +12,5 @@ target_include_directories(usermod_cppexample INTERFACE
     ${CMAKE_CURRENT_LIST_DIR}
 )
 
-# Enable the module automatically by adding the relevant compile definitions.
-target_compile_definitions(usermod_cppexample INTERFACE
-    MODULE_CPPEXAMPLE_ENABLED=1
-)
-
 # Link our INTERFACE library to the usermod target.
 target_link_libraries(usermod INTERFACE usermod_cppexample)
-
diff --git a/ports/unix/variants/coverage/mpconfigvariant.mk b/ports/unix/variants/coverage/mpconfigvariant.mk
index ef81975d9da8c..fac8c0d2752e0 100644
--- a/ports/unix/variants/coverage/mpconfigvariant.mk
+++ b/ports/unix/variants/coverage/mpconfigvariant.mk
@@ -7,8 +7,7 @@ CFLAGS += \
 	-fprofile-arcs -ftest-coverage \
 	-Wformat -Wmissing-declarations -Wmissing-prototypes \
 	-Wold-style-definition -Wpointer-arith -Wshadow -Wuninitialized -Wunused-parameter \
-	-DMICROPY_UNIX_COVERAGE \
-	-DMODULE_CEXAMPLE_ENABLED=1 -DMODULE_CPPEXAMPLE_ENABLED=1
+	-DMICROPY_UNIX_COVERAGE
 
 LDFLAGS += -fprofile-arcs -ftest-coverage
 
diff --git a/tools/ci.sh b/tools/ci.sh
index 1a410632cdd2d..3ce96a96a9084 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -211,7 +211,7 @@ function ci_stm32_pyb_build {
     make ${MAKEOPTS} -C mpy-cross
     make ${MAKEOPTS} -C ports/stm32 submodules
     git submodule update --init lib/btstack
-    make ${MAKEOPTS} -C ports/stm32 BOARD=PYBV11 MICROPY_PY_WIZNET5K=5200 MICROPY_PY_CC3K=1 USER_C_MODULES=../../examples/usercmodule CFLAGS_EXTRA="-DMODULE_CEXAMPLE_ENABLED=1 -DMODULE_CPPEXAMPLE_ENABLED=1"
+    make ${MAKEOPTS} -C ports/stm32 BOARD=PYBV11 MICROPY_PY_WIZNET5K=5200 MICROPY_PY_CC3K=1 USER_C_MODULES=../../examples/usercmodule
     make ${MAKEOPTS} -C ports/stm32 BOARD=PYBD_SF2
     make ${MAKEOPTS} -C ports/stm32 BOARD=PYBD_SF6 NANBOX=1 MICROPY_BLUETOOTH_NIMBLE=0 MICROPY_BLUETOOTH_BTSTACK=1
     make ${MAKEOPTS} -C ports/stm32/mboot BOARD=PYBV10 CFLAGS_EXTRA='-DMBOOT_FSLOAD=1 -DMBOOT_VFS_LFS2=1'

From f541b3673d272fbe9081a96776072a83ac5add9d Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 2 Apr 2021 17:07:20 +1100
Subject: [PATCH 0707/3533] docs/develop: Improve user C modules to properly
 describe how to build.

Make and CMake builds are slightly different and these changes help make it
clear what to do in each case.

Signed-off-by: Damien George <damien@micropython.org>
---
 docs/develop/cmodules.rst | 176 ++++++++++++++++++++++----------------
 1 file changed, 102 insertions(+), 74 deletions(-)

diff --git a/docs/develop/cmodules.rst b/docs/develop/cmodules.rst
index be49485f2cd26..346b3e03140de 100644
--- a/docs/develop/cmodules.rst
+++ b/docs/develop/cmodules.rst
@@ -18,7 +18,11 @@ If however you're targeting obscure or proprietary systems it may make
 more sense to keep this external to the main MicroPython repository.
 
 This chapter describes how to compile such external modules into the
-MicroPython executable or firmware image.
+MicroPython executable or firmware image.  Both Make and CMake build
+tools are supported, and when writing an external module it's a good idea to
+add the build files for both of these tools so the module can be used on all
+ports.  But when compiling a particular port you will only need to use one
+method of building, either Make or CMake.
 
 An alternative approach is to use :ref:`natmod` which allows writing custom C
 code that is placed in a .mpy file, which can be imported dynamically in to
@@ -111,116 +115,140 @@ To build such a module, compile MicroPython (see `getting started
 <https://github.com/micropython/micropython/wiki/Getting-Started>`_),
 applying 2 modifications:
 
-- an extra ``make`` flag named ``USER_C_MODULES`` set to the directory
-  containing all modules you want included (not to the module itself).
-  For building the example modules which come with MicroPython,
-  set ``USER_C_MODULES`` to the ``examples/usercmodule`` directory.
-  For your own projects it's more convenient to keep custom code out of
-  the main source tree so a typical project directory structure will look
-  like this::
+1. Set the build-time flag ``USER_C_MODULES`` to point to the modules
+   you want to include.  For ports that use Make this variable should be a
+   directory which is searched automatically for modules.  For ports that
+   use CMake this variable should be a file which includes the modules to
+   build.  See below for details.
 
-      my_project/
-      ├── modules/
-      │   └──example1/
-      │       ├──example1.c
-      │       ├──micropython.mk
-      │       └──micropython.cmake
-      │   └──example2/
-      │       ├──example2.c
-      │       ├──micropython.mk
-      │       └──micropython.cmake
-      │   └──micropython.cmake
-      └── micropython/
-          ├──ports/
-         ... ├──stm32/
-            ...
+2. Enable the modules by setting the corresponding C preprocessor macro to
+   1.  This is only needed if the modules you are building are not
+   automatically enabled.
 
+For building the example modules which come with MicroPython,
+set ``USER_C_MODULES`` to the ``examples/usercmodule`` directory for Make,
+or to ``examples/usercmodule/micropython.cmake`` for CMake.
 
-  with ``USER_C_MODULES`` set to the ``my_project/modules`` directory.
+For example, here's how the to build the unix port with the example modules:
 
-  A top level ``micropython.cmake`` - found directly in the ``my_project/modules``
-  directory - should ``include`` all of your modules.
+.. code-block:: bash
 
-  .. code-block:: cmake
+    cd micropython/ports/unix
+    make USER_C_MODULES=../../examples/usercmodule
 
-      include(${CMAKE_CURRENT_LIST_DIR}/example1/micropython.cmake)
-      include(${CMAKE_CURRENT_LIST_DIR}/example2/micropython.cmake)
+You may need to run ``make clean`` once at the start when including new
+user modules in the build.  The build output will show the modules found::
 
+    ...
+    Including User C Module from ../../examples/usercmodule/cexample
+    Including User C Module from ../../examples/usercmodule/cppexample
+    ...
 
-- all modules found in this directory (or added via ``include`` in the top-level
-  ``micropython.cmake`` when using CMake) will be compiled, but only those which are
-  enabled will be available for importing.  If a module is to always be enabled,
-  which is usually the case for custom modules and custom builds, then it is
-  enough to supply "1" as the third parameter to the registration macro, like:
+For a CMake-based port such as rp2, this will look a little different (note
+that CMake is actually invoked by ``make``):
 
-  .. code-block:: c
+.. code-block:: bash
 
-      MP_REGISTER_MODULE(MP_QSTR_cexample, example_user_cmodule, 1);
+    cd micropython/ports/rp2
+    make USER_C_MODULES=../../examples/usercmodule/micropython.cmake
 
-  Alternatively, to make the module disabled by default but selectable through
-  a preprocessor configuration option, use:
+Again, you may need to run ``make clean`` first for CMake to pick up the
+user modules.  The CMake build output lists the modules by name::
 
-  .. code-block:: c
+    ...
+    Including User C Module(s) from ../../examples/usercmodule/micropython.cmake
+    Found User C Module(s): usermod_cexample, usermod_cppexample
+    ...
 
-      MP_REGISTER_MODULE(MP_QSTR_cexample, example_user_cmodule, MODULE_CEXAMPLE_ENABLED);
+The contents of the top-level ``micropython.cmake`` can be used to control which
+modules are enabled.
 
+For your own projects it's more convenient to keep custom code out of the main
+MicroPython source tree, so a typical project directory structure will look
+like this::
 
-  Then ``MODULE_CEXAMPLE_ENABLED`` has to be set to 1 to make the module available.
-  This can be done by adding ``CFLAGS_EXTRA=-DMODULE_CEXAMPLE_ENABLED=1`` to
-  the ``make`` command, or editing ``mpconfigport.h`` or ``mpconfigboard.h``
-  to add
+      my_project/
+      ├── modules/
+      │   ├── example1/
+      │   │   ├── example1.c
+      │   │   ├── micropython.mk
+      │   │   └── micropython.cmake
+      │   ├── example2/
+      │   │   ├── example2.c
+      │   │   ├── micropython.mk
+      │   │   └── micropython.cmake
+      │   └── micropython.cmake
+      └── micropython/
+          ├──ports/
+         ... ├──stm32/
+            ...
 
-  .. code-block:: c
+When building with Make set ``USER_C_MODULES`` to the ``my_project/modules``
+directory.  For example, building the stm32 port:
 
-      #define MODULE_CEXAMPLE_ENABLED (1)
+.. code-block:: bash
 
+    cd my_project/micropython/ports/stm32
+    make USER_C_MODULES=../../../modules
 
-  Note that the exact method depends on the port as they have different
-  structures. If not done correctly it will compile but importing will
-  fail to find the module.
+When building with CMake the top level ``micropython.cmake`` -- found directly
+in the ``my_project/modules`` directory -- should ``include`` all of the modules
+you want to have available:
 
-To sum up, here's how the ``cexample`` module from the ``examples/usercmodule``
-directory can be built for the unix port:
+  .. code-block:: cmake
 
-.. code-block:: bash
+      include(${CMAKE_CURRENT_LIST_DIR}/example1/micropython.cmake)
+      include(${CMAKE_CURRENT_LIST_DIR}/example2/micropython.cmake)
 
-    cd micropython/ports/unix
-    make USER_C_MODULES=../../examples/usercmodule all
+Then build with:
 
-The build output will show the modules found::
+.. code-block:: bash
 
-    ...
-    Including User C Module from ../../examples/usercmodule/cexample
-    Including User C Module from ../../examples/usercmodule/cppexample
-    ...
+    cd my_project/micropython/ports/esp32
+    make USER_C_MODULES=../../../../modules/micropython.cmake
 
+Note that the esp32 port needs the extra ``..`` for relative paths due to the
+location of its main ``CMakeLists.txt`` file.   You can also specify absolute
+paths to ``USER_C_MODULES``.
 
-For a CMake-based port such as rp2, this will look a little different:
+All modules specified by the ``USER_C_MODULES`` variable (either found in this
+directory when using Make, or added via ``include`` when using CMake) will be
+compiled, but only those which are enabled will be available for importing.
+User modules are usually enabled by default (this is decided by the developer
+of the module), in which case there is nothing more to do than set ``USER_C_MODULES``
+as described above.
 
-.. code-block:: bash
+If a module is not enabled by default then the corresponding C preprocessor macro
+must be enabled.  This macro name can be found by searching for the ``MP_REGISTER_MODULE``
+line in the module's source code (it usually appears at the end of the main source file).
+The third argument to ``MP_REGISTER_MODULE`` is the macro name, and this must be set
+to 1 using ``CFLAGS_EXTRA`` to make the module available.  If the third argument is just
+the number 1 then the module is enabled by default.
 
-    cd micropython/ports/rp2
-    make USER_C_MODULES=../../examples/usercmodule all
+For example, the ``examples/usercmodule/cexample`` module is enabled by default so
+has the following line in its source code:
 
+  .. code-block:: c
 
-The CMake build output lists the modules by name::
+      MP_REGISTER_MODULE(MP_QSTR_cexample, example_user_cmodule, 1);
 
-    ...
-    Including User C Module(s) from ../../examples/usercmodule/micropython.cmake
-    Found User C Module(s): usermod_cexample, usermod_cppexample
-    ...
+Alternatively, to make this module disabled by default but selectable through
+a preprocessor configuration option, it would be:
 
+  .. code-block:: c
 
-The top-level ``micropython.cmake`` can be used to control which modules are enabled.
+      MP_REGISTER_MODULE(MP_QSTR_cexample, example_user_cmodule, MODULE_CEXAMPLE_ENABLED);
 
+In this case the module is enabled by adding ``CFLAGS_EXTRA=-DMODULE_CEXAMPLE_ENABLED=1``
+to the ``make`` command, or editing ``mpconfigport.h`` or ``mpconfigboard.h`` to add
 
-Or for your own project with a directory structure as shown above,
-including both modules and building the stm32 port for example:
+  .. code-block:: c
 
-.. code-block:: bash
+      #define MODULE_CEXAMPLE_ENABLED (1)
 
-    cd my_project/micropython/ports/stm32
-    make USER_C_MODULES=../../../modules all
+Note that the exact method depends on the port as they have different
+structures.  If not done correctly it will compile but importing will
+fail to find the module.
 
 
 Module usage in MicroPython

From 2d8aecd2ad43afeeb14fb8a21fcff29a1000c5c4 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 1 Apr 2021 13:36:26 +1100
Subject: [PATCH 0708/3533] rp2/CMakeLists.txt: Enable USB enumeration fix.

This is a workaround for errata RP2040-E5, and is needed to make USB more
reliable on certain USB ports.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/rp2/CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/rp2/CMakeLists.txt b/ports/rp2/CMakeLists.txt
index 3db0e6b62a0ee..37b041279f503 100644
--- a/ports/rp2/CMakeLists.txt
+++ b/ports/rp2/CMakeLists.txt
@@ -170,6 +170,7 @@ target_compile_definitions(${MICROPY_TARGET} PRIVATE
     PICO_NO_PROGRAM_VERSION_STRING=1 # do it ourselves in main.c
     MICROPY_BUILD_TYPE="${CMAKE_C_COMPILER_ID} ${CMAKE_C_COMPILER_VERSION} ${CMAKE_BUILD_TYPE}"
     PICO_NO_BI_STDIO_UART=1 # we call it UART REPL
+    PICO_RP2040_USB_DEVICE_ENUMERATION_FIX=1
 )
 
 target_link_libraries(${MICROPY_TARGET}

From 25ae169e6ec5ada4d80f6632b72b711c0b5e4c98 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 6 Apr 2021 12:11:15 +1000
Subject: [PATCH 0709/3533] stm32: Include .ARM section in firmware for C++
 exception handling.

Support for C++ was added in 97960dc7deb7a0e691fca5944402cd03386b744b but
that commit didn't include the C++ exception handling table in the binary
firmware image.  This commit fixes that.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/Makefile                              | 4 ++--
 ports/stm32/boards/PYBD_SF2/mpconfigboard.mk      | 2 +-
 ports/stm32/boards/PYBD_SF3/mpconfigboard.mk      | 2 +-
 ports/stm32/boards/STM32F769DISC/mpconfigboard.mk | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ports/stm32/Makefile b/ports/stm32/Makefile
index 6c71f2757333f..9c22928a0c7ba 100644
--- a/ports/stm32/Makefile
+++ b/ports/stm32/Makefile
@@ -643,7 +643,7 @@ TEXT0_ADDR ?= 0x08000000
 ifeq ($(TEXT1_ADDR),)
 # No TEXT1_ADDR given so put all firmware at TEXT0_ADDR location
 
-TEXT0_SECTIONS ?= .isr_vector .text .data
+TEXT0_SECTIONS ?= .isr_vector .text .data .ARM
 
 deploy-stlink: $(BUILD)/firmware.bin
 	$(call RUN_STLINK,$^,$(TEXT0_ADDR))
@@ -661,7 +661,7 @@ else
 # TEXT0_ADDR and TEXT1_ADDR are specified so split firmware between these locations
 
 TEXT0_SECTIONS ?= .isr_vector
-TEXT1_SECTIONS ?= .text .data
+TEXT1_SECTIONS ?= .text .data .ARM
 
 deploy-stlink: $(BUILD)/firmware0.bin $(BUILD)/firmware1.bin
 	$(call RUN_STLINK,$(word 1,$^),$(TEXT0_ADDR))
diff --git a/ports/stm32/boards/PYBD_SF2/mpconfigboard.mk b/ports/stm32/boards/PYBD_SF2/mpconfigboard.mk
index ead8bb8c07cf3..9917aa2c5730a 100644
--- a/ports/stm32/boards/PYBD_SF2/mpconfigboard.mk
+++ b/ports/stm32/boards/PYBD_SF2/mpconfigboard.mk
@@ -6,7 +6,7 @@ AF_FILE = boards/stm32f722_af.csv
 LD_FILES = boards/PYBD_SF2/f722_qspi.ld
 TEXT0_ADDR = 0x08008000
 TEXT1_ADDR = 0x90000000
-TEXT0_SECTIONS = .isr_vector .text .data
+TEXT0_SECTIONS = .isr_vector .text .data .ARM
 TEXT1_SECTIONS = .text_ext
 
 # MicroPython settings
diff --git a/ports/stm32/boards/PYBD_SF3/mpconfigboard.mk b/ports/stm32/boards/PYBD_SF3/mpconfigboard.mk
index abe3dcd862373..6bcc68f4b192e 100644
--- a/ports/stm32/boards/PYBD_SF3/mpconfigboard.mk
+++ b/ports/stm32/boards/PYBD_SF3/mpconfigboard.mk
@@ -6,7 +6,7 @@ AF_FILE = boards/stm32f722_af.csv
 LD_FILES = boards/PYBD_SF2/f722_qspi.ld
 TEXT0_ADDR = 0x08008000
 TEXT1_ADDR = 0x90000000
-TEXT0_SECTIONS = .isr_vector .text .data
+TEXT0_SECTIONS = .isr_vector .text .data .ARM
 TEXT1_SECTIONS = .text_ext
 
 # MicroPython settings
diff --git a/ports/stm32/boards/STM32F769DISC/mpconfigboard.mk b/ports/stm32/boards/STM32F769DISC/mpconfigboard.mk
index 81add8c88e772..5d3d11a7958fe 100644
--- a/ports/stm32/boards/STM32F769DISC/mpconfigboard.mk
+++ b/ports/stm32/boards/STM32F769DISC/mpconfigboard.mk
@@ -22,7 +22,7 @@ ifeq ($(USE_QSPI_XIP),1)
 LD_FILES = boards/STM32F769DISC/f769_qspi.ld
 TEXT0_ADDR = 0x08020000
 TEXT1_ADDR = 0x90000000
-TEXT0_SECTIONS = .isr_vector .text .data
+TEXT0_SECTIONS = .isr_vector .text .data .ARM
 TEXT1_SECTIONS = .text_qspi
 
 else

From d35f12f5caf2f6eef08670b61dbe2a3a1b387042 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 6 Apr 2021 12:50:19 +1000
Subject: [PATCH 0710/3533] tools/metrics.py: Fix esp32 output filename due to
 move to CMake.

Signed-off-by: Damien George <damien@micropython.org>
---
 tools/metrics.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/metrics.py b/tools/metrics.py
index 25acb30f51f01..98291e25a9f06 100755
--- a/tools/metrics.py
+++ b/tools/metrics.py
@@ -65,7 +65,7 @@ def __init__(self, name, dir, output, make_flags=None):
     "s": PortData("stm32", "stm32", "build-PYBV10/firmware.elf", "BOARD=PYBV10"),
     "c": PortData("cc3200", "cc3200", "build/WIPY/release/application.axf", "BTARGET=application"),
     "8": PortData("esp8266", "esp8266", "build-GENERIC/firmware.elf"),
-    "3": PortData("esp32", "esp32", "build-GENERIC/application.elf"),
+    "3": PortData("esp32", "esp32", "build-GENERIC/micropython.elf"),
     "r": PortData("nrf", "nrf", "build-pca10040/firmware.elf"),
     "d": PortData("samd", "samd", "build-ADAFRUIT_ITSYBITSY_M4_EXPRESS/firmware.elf"),
 }

From 172fb5230a3943eeb6fbbb4de1dc56b16e2a7637 Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Sat, 27 Mar 2021 19:19:51 -0500
Subject: [PATCH 0711/3533] extmod/re1.5: Check and report byte overflow errors
 in _compilecode.

The generated regex code is limited in the range of jumps and counts, and
this commit checks all cases which can overflow given the right kind of
input regex, and returns an error in such a case.

This change assumes that the results that overflow an int8_t do not
overflow a platform int.

Closes: #7078

Signed-off-by: Jeff Epler <jepler@gmail.com>
---
 extmod/re1.5/compilecode.c    | 31 ++++++++++++++++++++-----------
 tests/extmod/ure_limit.py     | 34 ++++++++++++++++++++++++++++++++++
 tests/extmod/ure_limit.py.exp |  7 +++++++
 3 files changed, 61 insertions(+), 11 deletions(-)
 create mode 100644 tests/extmod/ure_limit.py
 create mode 100644 tests/extmod/ure_limit.py.exp

diff --git a/extmod/re1.5/compilecode.c b/extmod/re1.5/compilecode.c
index c4d12af87a32e..add4f6ac20859 100644
--- a/extmod/re1.5/compilecode.c
+++ b/extmod/re1.5/compilecode.c
@@ -8,11 +8,20 @@
     ((code ? memmove(code + at + num, code + at, pc - at) : 0), pc += num)
 #define REL(at, to) (to - at - 2)
 #define EMIT(at, byte) (code ? (code[at] = byte) : (at))
+#define EMIT_CHECKED(at, byte) (_emit_checked(at, code, byte, &err))
 #define PC (prog->bytelen)
 
+static void _emit_checked(int at, char *code, int val, bool *err) {
+    *err |= val != (int8_t)val;
+    if (code) {
+        code[at] = val;
+    }
+}
+
 static const char *_compilecode(const char *re, ByteProg *prog, int sizecode)
 {
     char *code = sizecode ? NULL : prog->insts;
+    bool err = false;
     int start = PC;
     int term = PC;
     int alt_label = 0;
@@ -64,7 +73,7 @@ static const char *_compilecode(const char *re, ByteProg *prog, int sizecode)
                 }
                 EMIT(PC++, *re);
             }
-            EMIT(term + 1, cnt);
+            EMIT_CHECKED(term + 1, cnt);
             break;
         }
         case '(': {
@@ -75,7 +84,7 @@ static const char *_compilecode(const char *re, ByteProg *prog, int sizecode)
             if (capture) {
                 sub = ++prog->sub;
                 EMIT(PC++, Save);
-                EMIT(PC++, 2 * sub);
+                EMIT_CHECKED(PC++, 2 * sub);
                 prog->len++;
             } else {
                     re += 2;
@@ -86,7 +95,7 @@ static const char *_compilecode(const char *re, ByteProg *prog, int sizecode)
 
             if (capture) {
                 EMIT(PC++, Save);
-                EMIT(PC++, 2 * sub + 1);
+                EMIT_CHECKED(PC++, 2 * sub + 1);
                 prog->len++;
             }
 
@@ -101,7 +110,7 @@ static const char *_compilecode(const char *re, ByteProg *prog, int sizecode)
             } else {
                 EMIT(term, Split);
             }
-            EMIT(term + 1, REL(term, PC));
+            EMIT_CHECKED(term + 1, REL(term, PC));
             prog->len++;
             term = PC;
             break;
@@ -109,7 +118,7 @@ static const char *_compilecode(const char *re, ByteProg *prog, int sizecode)
             if (PC == term) return NULL; // nothing to repeat
             INSERT_CODE(term, 2, PC);
             EMIT(PC, Jmp);
-            EMIT(PC + 1, REL(PC, term));
+            EMIT_CHECKED(PC + 1, REL(PC, term));
             PC += 2;
             if (re[1] == '?') {
                 EMIT(term, RSplit);
@@ -117,7 +126,7 @@ static const char *_compilecode(const char *re, ByteProg *prog, int sizecode)
             } else {
                 EMIT(term, Split);
             }
-            EMIT(term + 1, REL(term, PC));
+            EMIT_CHECKED(term + 1, REL(term, PC));
             prog->len += 2;
             term = PC;
             break;
@@ -129,20 +138,20 @@ static const char *_compilecode(const char *re, ByteProg *prog, int sizecode)
             } else {
                 EMIT(PC, RSplit);
             }
-            EMIT(PC + 1, REL(PC, term));
+            EMIT_CHECKED(PC + 1, REL(PC, term));
             PC += 2;
             prog->len++;
             term = PC;
             break;
         case '|':
             if (alt_label) {
-                EMIT(alt_label, REL(alt_label, PC) + 1);
+                EMIT_CHECKED(alt_label, REL(alt_label, PC) + 1);
             }
             INSERT_CODE(start, 2, PC);
             EMIT(PC++, Jmp);
             alt_label = PC++;
             EMIT(start, Split);
-            EMIT(start + 1, REL(start, PC));
+            EMIT_CHECKED(start + 1, REL(start, PC));
             prog->len += 2;
             term = PC;
             break;
@@ -160,9 +169,9 @@ static const char *_compilecode(const char *re, ByteProg *prog, int sizecode)
     }
 
     if (alt_label) {
-        EMIT(alt_label, REL(alt_label, PC) + 1);
+        EMIT_CHECKED(alt_label, REL(alt_label, PC) + 1);
     }
-    return re;
+    return err ? NULL : re;
 }
 
 int re1_5_sizecode(const char *re)
diff --git a/tests/extmod/ure_limit.py b/tests/extmod/ure_limit.py
new file mode 100644
index 0000000000000..99c6a818e8577
--- /dev/null
+++ b/tests/extmod/ure_limit.py
@@ -0,0 +1,34 @@
+# Test overflow in ure.compile output code.
+
+try:
+    import ure as re
+except ImportError:
+    print("SKIP")
+    raise SystemExit
+
+
+def test_re(r):
+    try:
+        re.compile(r)
+    except:
+        print("Error")
+
+
+# too many chars in []
+test_re("[" + "a" * 256 + "]")
+
+# too many groups
+test_re("(a)" * 256)
+
+# jump too big for ?
+test_re("(" + "a" * 62 + ")?")
+
+# jump too big for *
+test_re("(" + "a" * 60 + ".)*")
+test_re("(" + "a" * 60 + "..)*")
+
+# jump too big for +
+test_re("(" + "a" * 62 + ")+")
+
+# jump too big for |
+test_re("b" * 63 + "|a")
diff --git a/tests/extmod/ure_limit.py.exp b/tests/extmod/ure_limit.py.exp
new file mode 100644
index 0000000000000..8353be536c300
--- /dev/null
+++ b/tests/extmod/ure_limit.py.exp
@@ -0,0 +1,7 @@
+Error
+Error
+Error
+Error
+Error
+Error
+Error

From 4f53f462ca9dbec45771e06d2d1a84b61e01e61a Mon Sep 17 00:00:00 2001
From: Tim Radvan <tim@tjvr.org>
Date: Sat, 3 Apr 2021 12:20:48 +0100
Subject: [PATCH 0712/3533] rp2: Import uarray instead of array in rp2 module.

Some forum users noticed that `sm.exec()` took longer the more was present
on the flash filesystem connected to the RP2040.  They traced this back to
the `array` import inside `asm_pio()`, which is causing MicroPython to scan
the filesystem.

uarray is a built-in module, so importing it shouldn't require scanning the
filesystem.

We avoid moving the import to the top-level in order to keep the namespace
clean; we don't want to accidentally expose `rp2.array`.
---
 ports/rp2/modules/rp2.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ports/rp2/modules/rp2.py b/ports/rp2/modules/rp2.py
index a3adcdc51274d..17e35c73b7ce5 100644
--- a/ports/rp2/modules/rp2.py
+++ b/ports/rp2/modules/rp2.py
@@ -33,7 +33,9 @@ def __init__(
         push_thresh=32,
         pull_thresh=32
     ):
-        from array import array
+        # uarray is a built-in module so importing it here won't require
+        # scanning the filesystem.
+        from uarray import array
 
         self.labels = {}
         execctrl = 0

From a66286f3a0f24985cae2648102e51de64b8a1871 Mon Sep 17 00:00:00 2001
From: stijn <stijn@ignitron.net>
Date: Tue, 6 Apr 2021 20:40:31 +0200
Subject: [PATCH 0713/3533] unix: Improve command line argument processing.

Per CPython everything which comes after the command, module or file
argument is not an option for the interpreter itself.  Hence the processing
of options should stop when encountering those, and the remainder be passed
as sys.argv.  Note the latter was already the case for a module or file but
not for a command.

This fixes issues like 'micropython myfile.py -h' showing the help and
exiting instead of passing '-h' as sys.argv[1], likewise for
'-X <something>' being treated as a special option no matter where it
occurs on the command line.
---
 ports/unix/main.c                 | 12 ++++++++----
 tests/cmdline/repl_inspect.py     |  2 +-
 tests/cmdline/repl_inspect.py.exp |  2 +-
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/ports/unix/main.c b/ports/unix/main.c
index 07db8d22c614f..129c6d3bb43a1 100644
--- a/ports/unix/main.c
+++ b/ports/unix/main.c
@@ -341,6 +341,9 @@ STATIC int invalid_args(void) {
 STATIC void pre_process_options(int argc, char **argv) {
     for (int a = 1; a < argc; a++) {
         if (argv[a][0] == '-') {
+            if (strcmp(argv[a], "-c") == 0 || strcmp(argv[a], "-m") == 0) {
+                break; // Everything after this is a command/module and arguments for it
+            }
             if (strcmp(argv[a], "-h") == 0) {
                 print_help(argv);
                 exit(0);
@@ -400,6 +403,8 @@ STATIC void pre_process_options(int argc, char **argv) {
                 }
                 a++;
             }
+        } else {
+            break; // Not an option but a file
         }
     }
 }
@@ -568,11 +573,10 @@ MP_NOINLINE int main_(int argc, char **argv) {
                 if (a + 1 >= argc) {
                     return invalid_args();
                 }
+                set_sys_argv(argv, a + 1, a); // The -c becomes first item of sys.argv, as in CPython
+                set_sys_argv(argv, argc, a + 2); // Then what comes after the command
                 ret = do_str(argv[a + 1]);
-                if (ret & FORCED_EXIT) {
-                    break;
-                }
-                a += 1;
+                break;
             } else if (strcmp(argv[a], "-m") == 0) {
                 if (a + 1 >= argc) {
                     return invalid_args();
diff --git a/tests/cmdline/repl_inspect.py b/tests/cmdline/repl_inspect.py
index 5a7564a3c2bbb..8c86f287d1e70 100644
--- a/tests/cmdline/repl_inspect.py
+++ b/tests/cmdline/repl_inspect.py
@@ -1,2 +1,2 @@
-# cmdline: -c print("test") -i
+# cmdline: -i -c print("test")
 # -c option combined with -i option results in REPL
diff --git a/tests/cmdline/repl_inspect.py.exp b/tests/cmdline/repl_inspect.py.exp
index 59f734b2f6945..051acfd153a61 100644
--- a/tests/cmdline/repl_inspect.py.exp
+++ b/tests/cmdline/repl_inspect.py.exp
@@ -1,6 +1,6 @@
 test
 MicroPython \.\+ version
 Use \.\+
->>> # cmdline: -c print("test") -i
+>>> # cmdline: -i -c print("test")
 >>> # -c option combined with -i option results in REPL
 >>> 

From 00963a4e69207eca9f9ce106f533544774eddd1f Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 7 Apr 2021 11:55:07 +1000
Subject: [PATCH 0714/3533] stm32/powerctrl: Allow a board to configure AHB and
 APB clock dividers.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/mpconfigboard_common.h | 19 +++++++++++++++++
 ports/stm32/powerctrl.c            |  4 ++--
 ports/stm32/system_stm32.c         | 34 +++++++++++++++---------------
 3 files changed, 38 insertions(+), 19 deletions(-)

diff --git a/ports/stm32/mpconfigboard_common.h b/ports/stm32/mpconfigboard_common.h
index 948897b215717..6fb9289e00dca 100644
--- a/ports/stm32/mpconfigboard_common.h
+++ b/ports/stm32/mpconfigboard_common.h
@@ -310,6 +310,25 @@
 #endif
 #endif
 
+// Configure the default bus clock divider values
+#ifndef MICROPY_HW_CLK_AHB_DIV
+#if defined(STM32H7)
+#define MICROPY_HW_CLK_AHB_DIV (RCC_HCLK_DIV2)
+#define MICROPY_HW_CLK_APB1_DIV (RCC_APB1_DIV2)
+#define MICROPY_HW_CLK_APB2_DIV (RCC_APB2_DIV2)
+#define MICROPY_HW_CLK_APB3_DIV (RCC_APB3_DIV2)
+#define MICROPY_HW_CLK_APB4_DIV (RCC_APB4_DIV2)
+#elif defined(STM32L4)
+#define MICROPY_HW_CLK_AHB_DIV (RCC_SYSCLK_DIV1)
+#define MICROPY_HW_CLK_APB1_DIV (RCC_HCLK_DIV1)
+#define MICROPY_HW_CLK_APB2_DIV (RCC_HCLK_DIV1)
+#else
+#define MICROPY_HW_CLK_AHB_DIV (RCC_SYSCLK_DIV1)
+#define MICROPY_HW_CLK_APB1_DIV (RCC_HCLK_DIV4)
+#define MICROPY_HW_CLK_APB2_DIV (RCC_HCLK_DIV2)
+#endif
+#endif
+
 // If disabled then try normal (non-bypass) LSE first, with fallback to LSI.
 // If enabled first try LSE in bypass mode.  If that fails to start, try non-bypass mode, with fallback to LSI.
 #ifndef MICROPY_HW_RTC_USE_BYPASS
diff --git a/ports/stm32/powerctrl.c b/ports/stm32/powerctrl.c
index a579713b6f9bf..a34927798a341 100644
--- a/ports/stm32/powerctrl.c
+++ b/ports/stm32/powerctrl.c
@@ -377,8 +377,8 @@ int powerctrl_set_sysclk(uint32_t sysclk, uint32_t ahb, uint32_t apb1, uint32_t
     RCC_ClkInitStruct.APB2CLKDivider = calc_apb2_div(ahb / apb2);
     #if defined(STM32H7)
     RCC_ClkInitStruct.SYSCLKDivider = RCC_SYSCLK_DIV1;
-    RCC_ClkInitStruct.APB3CLKDivider = RCC_APB3_DIV2;
-    RCC_ClkInitStruct.APB4CLKDivider = RCC_APB4_DIV2;
+    RCC_ClkInitStruct.APB3CLKDivider = MICROPY_HW_CLK_APB3_DIV;
+    RCC_ClkInitStruct.APB4CLKDivider = MICROPY_HW_CLK_APB4_DIV;
     #endif
 
     #if MICROPY_HW_CLK_LAST_FREQ
diff --git a/ports/stm32/system_stm32.c b/ports/stm32/system_stm32.c
index 2160e0ac994c6..72918bbc53578 100644
--- a/ports/stm32/system_stm32.c
+++ b/ports/stm32/system_stm32.c
@@ -272,9 +272,9 @@ void SystemClock_Config(void) {
         n = MICROPY_HW_CLK_PLLN;
         p = MICROPY_HW_CLK_PLLP;
         q = MICROPY_HW_CLK_PLLQ;
-        h = RCC_SYSCLK_DIV1;
-        b1 = RCC_HCLK_DIV4;
-        b2 = RCC_HCLK_DIV2;
+        h = MICROPY_HW_CLK_AHB_DIV;
+        b1 = MICROPY_HW_CLK_APB1_DIV;
+        b2 = MICROPY_HW_CLK_APB2_DIV;
     } else {
         h <<= 4;
         b1 <<= 10;
@@ -285,9 +285,9 @@ void SystemClock_Config(void) {
     RCC_OscInitStruct.PLL.PLLP = p; // MICROPY_HW_CLK_PLLP;
     RCC_OscInitStruct.PLL.PLLQ = q; // MICROPY_HW_CLK_PLLQ;
 
-    RCC_ClkInitStruct.AHBCLKDivider = h; // RCC_SYSCLK_DIV1;
-    RCC_ClkInitStruct.APB1CLKDivider = b1; // RCC_HCLK_DIV4;
-    RCC_ClkInitStruct.APB2CLKDivider = b2; // RCC_HCLK_DIV2;
+    RCC_ClkInitStruct.AHBCLKDivider = h;
+    RCC_ClkInitStruct.APB1CLKDivider = b1;
+    RCC_ClkInitStruct.APB2CLKDivider = b2;
     #else // defined(MICROPY_HW_CLK_LAST_FREQ) && MICROPY_HW_CLK_LAST_FREQ
     RCC_OscInitStruct.PLL.PLLM = MICROPY_HW_CLK_PLLM;
     RCC_OscInitStruct.PLL.PLLN = MICROPY_HW_CLK_PLLN;
@@ -304,20 +304,20 @@ void SystemClock_Config(void) {
     #endif
 
     #if defined(STM32F4) || defined(STM32F7)
-    RCC_ClkInitStruct.AHBCLKDivider = RCC_SYSCLK_DIV1;
-    RCC_ClkInitStruct.APB1CLKDivider = RCC_HCLK_DIV4;
-    RCC_ClkInitStruct.APB2CLKDivider = RCC_HCLK_DIV2;
+    RCC_ClkInitStruct.AHBCLKDivider = MICROPY_HW_CLK_AHB_DIV;
+    RCC_ClkInitStruct.APB1CLKDivider = MICROPY_HW_CLK_APB1_DIV;
+    RCC_ClkInitStruct.APB2CLKDivider = MICROPY_HW_CLK_APB2_DIV;
     #elif defined(STM32L4)
-    RCC_ClkInitStruct.AHBCLKDivider = RCC_SYSCLK_DIV1;
-    RCC_ClkInitStruct.APB1CLKDivider = RCC_HCLK_DIV1;
-    RCC_ClkInitStruct.APB2CLKDivider = RCC_HCLK_DIV1;
+    RCC_ClkInitStruct.AHBCLKDivider = MICROPY_HW_CLK_AHB_DIV;
+    RCC_ClkInitStruct.APB1CLKDivider = MICROPY_HW_CLK_APB1_DIV;
+    RCC_ClkInitStruct.APB2CLKDivider = MICROPY_HW_CLK_APB2_DIV;
     #elif defined(STM32H7)
     RCC_ClkInitStruct.SYSCLKDivider = RCC_SYSCLK_DIV1;
-    RCC_ClkInitStruct.AHBCLKDivider = RCC_HCLK_DIV2;
-    RCC_ClkInitStruct.APB3CLKDivider = RCC_APB3_DIV2;
-    RCC_ClkInitStruct.APB1CLKDivider = RCC_APB1_DIV2;
-    RCC_ClkInitStruct.APB2CLKDivider = RCC_APB2_DIV2;
-    RCC_ClkInitStruct.APB4CLKDivider = RCC_APB4_DIV2;
+    RCC_ClkInitStruct.AHBCLKDivider = MICROPY_HW_CLK_AHB_DIV;
+    RCC_ClkInitStruct.APB3CLKDivider = MICROPY_HW_CLK_APB3_DIV;
+    RCC_ClkInitStruct.APB1CLKDivider = MICROPY_HW_CLK_APB1_DIV;
+    RCC_ClkInitStruct.APB2CLKDivider = MICROPY_HW_CLK_APB2_DIV;
+    RCC_ClkInitStruct.APB4CLKDivider = MICROPY_HW_CLK_APB4_DIV;
     #endif
     #endif
 

From f4340b7e62e717d31d412f42364fa85a7d4728bc Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 7 Apr 2021 11:58:36 +1000
Subject: [PATCH 0715/3533] stm32/powerctrl: Support using PLLI2C on STM32F413
 as USB clock source.

So SYSCLK can run at more varied frequencies, eg 100MHz.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/powerctrl.c    | 64 ++++++++++++++++++++++++++++----------
 ports/stm32/system_stm32.c |  4 +--
 2 files changed, 50 insertions(+), 18 deletions(-)

diff --git a/ports/stm32/powerctrl.c b/ports/stm32/powerctrl.c
index a34927798a341..573844063b664 100644
--- a/ports/stm32/powerctrl.c
+++ b/ports/stm32/powerctrl.c
@@ -50,6 +50,22 @@
 #define RCC_SR_RMVF     RCC_CSR_RMVF
 #endif
 
+// Whether this MCU has an independent PLL which can generate 48MHz for USB.
+#if defined(STM32F413xx)
+// STM32F413 uses PLLI2S as secondary PLL.
+#define HAVE_PLL48 1
+#define RCC_CR_PLL48_ON RCC_CR_PLLI2SON
+#define RCC_CR_PLL48_RDY RCC_CR_PLLI2SRDY
+#elif defined(STM32F7)
+// STM32F7 uses PLLSAI as secondary PLL.
+#define HAVE_PLL48 1
+#define RCC_CR_PLL48_ON RCC_CR_PLLSAION
+#define RCC_CR_PLL48_RDY RCC_CR_PLLSAIRDY
+#else
+// MCU does not have a secondary PLL.
+#define HAVE_PLL48 0
+#endif
+
 // Location in RAM of bootloader state (just after the top of the stack)
 extern uint32_t _estack[];
 #define BL_STATE ((uint32_t *)&_estack)
@@ -141,13 +157,24 @@ STATIC int powerctrl_config_vos(uint32_t sysclk_mhz) {
 }
 
 // Assumes that PLL is used as the SYSCLK source
-int powerctrl_rcc_clock_config_pll(RCC_ClkInitTypeDef *rcc_init, uint32_t sysclk_mhz, bool need_pllsai) {
+int powerctrl_rcc_clock_config_pll(RCC_ClkInitTypeDef *rcc_init, uint32_t sysclk_mhz, bool need_pll48) {
     uint32_t flash_latency;
 
-    #if defined(STM32F7)
-    if (need_pllsai) {
-        // Configure PLLSAI at 48MHz for those peripherals that need this freq
-        // (calculation assumes it can get an integral value of PLLSAIN)
+    #if HAVE_PLL48
+    if (need_pll48) {
+        // Configure secondary PLL at 48MHz for those peripherals that need this freq
+        // (the calculation assumes it can get an integral value of PLL-N).
+
+        #if defined(STM32F413xx)
+        const uint32_t plli2sm = HSE_VALUE / 1000000;
+        const uint32_t plli2sq = 2;
+        const uint32_t plli2sr = 2;
+        const uint32_t plli2sn = 48 * plli2sq;
+        RCC->PLLI2SCFGR = plli2sr << RCC_PLLI2SCFGR_PLLI2SR_Pos
+            | plli2sq << RCC_PLLI2SCFGR_PLLI2SQ_Pos
+            | plli2sn << RCC_PLLI2SCFGR_PLLI2SN_Pos
+            | plli2sm << RCC_PLLI2SCFGR_PLLI2SM_Pos;
+        #else
         const uint32_t pllm = (RCC->PLLCFGR >> RCC_PLLCFGR_PLLM_Pos) & 0x3f;
         const uint32_t pllsaip = 4;
         const uint32_t pllsaiq = 2;
@@ -155,13 +182,18 @@ int powerctrl_rcc_clock_config_pll(RCC_ClkInitTypeDef *rcc_init, uint32_t sysclk
         RCC->PLLSAICFGR = pllsaiq << RCC_PLLSAICFGR_PLLSAIQ_Pos
             | (pllsaip / 2 - 1) << RCC_PLLSAICFGR_PLLSAIP_Pos
             | pllsain << RCC_PLLSAICFGR_PLLSAIN_Pos;
-        RCC->CR |= RCC_CR_PLLSAION;
+        #endif
+
+        // Turn on the PLL and wait for it to be ready.
+        RCC->CR |= RCC_CR_PLL48_ON;
         uint32_t ticks = mp_hal_ticks_ms();
-        while (!(RCC->CR & RCC_CR_PLLSAIRDY)) {
+        while (!(RCC->CR & RCC_CR_PLL48_RDY)) {
             if (mp_hal_ticks_ms() - ticks > 200) {
                 return -MP_ETIMEDOUT;
             }
         }
+
+        // Select the alternate 48MHz source.
         RCC->DCKCFGR2 |= RCC_DCKCFGR2_CK48MSEL;
     }
     #endif
@@ -317,7 +349,7 @@ int powerctrl_set_sysclk(uint32_t sysclk, uint32_t ahb, uint32_t apb1, uint32_t
     // Default PLL parameters that give 48MHz on PLL48CK
     uint32_t m = MICROPY_HW_CLK_VALUE / 1000000, n = 336, p = 2, q = 7;
     uint32_t sysclk_source;
-    bool need_pllsai = false;
+    bool need_pll48 = false;
 
     // Search for a valid PLL configuration that keeps USB at 48MHz
     uint32_t sysclk_mhz = sysclk / 1000000;
@@ -338,8 +370,8 @@ int powerctrl_set_sysclk(uint32_t sysclk, uint32_t ahb, uint32_t apb1, uint32_t
                 uint32_t vco_out = sys * p;
                 n = vco_out * m / (MICROPY_HW_CLK_VALUE / 1000000);
                 q = vco_out / 48;
-                #if defined(STM32F7)
-                need_pllsai = vco_out % 48 != 0;
+                #if HAVE_PLL48
+                need_pll48 = vco_out % 48 != 0;
                 #endif
             }
             goto set_clk;
@@ -393,11 +425,11 @@ int powerctrl_set_sysclk(uint32_t sysclk, uint32_t ahb, uint32_t apb1, uint32_t
         return -MP_EIO;
     }
 
-    #if defined(STM32F7)
+    #if HAVE_PLL48
     // Deselect PLLSAI as 48MHz source if we were using it
     RCC->DCKCFGR2 &= ~RCC_DCKCFGR2_CK48MSEL;
     // Turn PLLSAI off because we are changing PLLM (which drives PLLSAI)
-    RCC->CR &= ~RCC_CR_PLLSAION;
+    RCC->CR &= ~RCC_CR_PLL48_ON;
     #endif
 
     // Re-configure PLL
@@ -440,7 +472,7 @@ int powerctrl_set_sysclk(uint32_t sysclk, uint32_t ahb, uint32_t apb1, uint32_t
     // Set PLL as system clock source if wanted
     if (sysclk_source == RCC_SYSCLKSOURCE_PLLCLK) {
         RCC_ClkInitStruct.ClockType = RCC_CLOCKTYPE_SYSCLK;
-        int ret = powerctrl_rcc_clock_config_pll(&RCC_ClkInitStruct, sysclk_mhz, need_pllsai);
+        int ret = powerctrl_rcc_clock_config_pll(&RCC_ClkInitStruct, sysclk_mhz, need_pll48);
         if (ret != 0) {
             return ret;
         }
@@ -607,11 +639,11 @@ void powerctrl_enter_stop_mode(void) {
 
     powerctrl_disable_hsi_if_unused();
 
-    #if defined(STM32F7)
+    #if HAVE_PLL48
     if (RCC->DCKCFGR2 & RCC_DCKCFGR2_CK48MSEL) {
         // Enable PLLSAI if it is selected as 48MHz source
-        RCC->CR |= RCC_CR_PLLSAION;
-        while (!(RCC->CR & RCC_CR_PLLSAIRDY)) {
+        RCC->CR |= RCC_CR_PLL48_ON;
+        while (!(RCC->CR & RCC_CR_PLL48_RDY)) {
         }
     }
     #endif
diff --git a/ports/stm32/system_stm32.c b/ports/stm32/system_stm32.c
index 72918bbc53578..4e89204bf6c21 100644
--- a/ports/stm32/system_stm32.c
+++ b/ports/stm32/system_stm32.c
@@ -351,8 +351,8 @@ void SystemClock_Config(void) {
 
     uint32_t vco_out = RCC_OscInitStruct.PLL.PLLN * (MICROPY_HW_CLK_VALUE / 1000000) / RCC_OscInitStruct.PLL.PLLM;
     uint32_t sysclk_mhz = vco_out / RCC_OscInitStruct.PLL.PLLP;
-    bool need_pllsai = vco_out % 48 != 0;
-    if (powerctrl_rcc_clock_config_pll(&RCC_ClkInitStruct, sysclk_mhz, need_pllsai) != 0) {
+    bool need_pll48 = vco_out % 48 != 0;
+    if (powerctrl_rcc_clock_config_pll(&RCC_ClkInitStruct, sysclk_mhz, need_pll48) != 0) {
         __fatal_error("HAL_RCC_ClockConfig");
     }
 

From cb396827f56f79741efeaa127b9c71c72bba3584 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 7 Apr 2021 12:05:00 +1000
Subject: [PATCH 0716/3533] stm32/boards/pllvalues.py: Relax PLLQ constraints
 on STM32F413 MCUs.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/Makefile            | 2 +-
 ports/stm32/boards/pllvalues.py | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ports/stm32/Makefile b/ports/stm32/Makefile
index 9c22928a0c7ba..e7a8f0aee62d3 100644
--- a/ports/stm32/Makefile
+++ b/ports/stm32/Makefile
@@ -750,7 +750,7 @@ CMSIS_MCU_HDR = $(CMSIS_DIR)/$(CMSIS_MCU_LOWER).h
 modmachine.c: $(GEN_PLLFREQTABLE_HDR)
 $(GEN_PLLFREQTABLE_HDR): $(PLLVALUES) | $(HEADER_BUILD)
 	$(ECHO) "GEN $@"
-	$(Q)$(PYTHON) $(PLLVALUES) -c -m $(MCU_SERIES) file:$(BOARD_DIR)/stm32$(MCU_SERIES)xx_hal_conf.h > $@
+	$(Q)$(PYTHON) $(PLLVALUES) -c -m $(CMSIS_MCU_LOWER) file:$(BOARD_DIR)/stm32$(MCU_SERIES)xx_hal_conf.h > $@
 
 $(BUILD)/modstm.o: $(GEN_STMCONST_HDR)
 # Use a pattern rule here so that make will only call make-stmconst.py once to
diff --git a/ports/stm32/boards/pllvalues.py b/ports/stm32/boards/pllvalues.py
index 59d660364afca..619146cd47fac 100644
--- a/ports/stm32/boards/pllvalues.py
+++ b/ports/stm32/boards/pllvalues.py
@@ -240,7 +240,7 @@ def main():
     argv = sys.argv[1:]
 
     c_table = False
-    mcu_series = "f4"
+    mcu_series = "stm32f4"
     hse = None
     hsi = None
 
@@ -271,13 +271,13 @@ def main():
         hse = int(argv[0])
 
     # Select MCU parameters
-    if mcu_series == "h7":
+    if mcu_series.startswith("stm32h7"):
         mcu = mcu_h7
     else:
         mcu = mcu_default
 
-    # Relax constraight on PLLQ being 48MHz on F7 and H7 MCUs, which have separate PLLs for 48MHz
-    relax_pll48 = mcu_series in ("f7", "h7")
+    # Relax constraint on PLLQ being 48MHz on MCUs which have separate PLLs for 48MHz
+    relax_pll48 = mcu_series.startswith(("stm32f413", "stm32f7", "stm32h7"))
 
     hse_valid_plls = compute_pll_table(hse, relax_pll48)
     if hsi is not None:

From 4d9e657f0ee881f4a41093ab89ec91d03613744d Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 8 Apr 2021 17:00:26 +1000
Subject: [PATCH 0717/3533] stm32/mpconfigport.h: Add support for a board to
 specify root pointers.

A board can now define MICROPY_BOARD_ROOT_POINTERS to specify any custom
root pointers.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/mpconfigport.h | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/ports/stm32/mpconfigport.h b/ports/stm32/mpconfigport.h
index 174ef22f241c7..2888cac88c43b 100644
--- a/ports/stm32/mpconfigport.h
+++ b/ports/stm32/mpconfigport.h
@@ -353,6 +353,10 @@ struct _mp_bluetooth_btstack_root_pointers_t;
 #define MICROPY_PORT_ROOT_POINTER_BLUETOOTH_BTSTACK
 #endif
 
+#ifndef MICROPY_BOARD_ROOT_POINTERS
+#define MICROPY_BOARD_ROOT_POINTERS
+#endif
+
 #define MICROPY_PORT_ROOT_POINTERS \
     const char *readline_hist[8]; \
     \
@@ -384,9 +388,13 @@ struct _mp_bluetooth_btstack_root_pointers_t;
     /* list of registered NICs */ \
     mp_obj_list_t mod_network_nic_list; \
     \
+    /* root pointers for sub-systems */ \
     MICROPY_PORT_ROOT_POINTER_MBEDTLS \
     MICROPY_PORT_ROOT_POINTER_BLUETOOTH_NIMBLE \
-        MICROPY_PORT_ROOT_POINTER_BLUETOOTH_BTSTACK \
+    MICROPY_PORT_ROOT_POINTER_BLUETOOTH_BTSTACK \
+    \
+    /* root pointers defined by a board */ \
+        MICROPY_BOARD_ROOT_POINTERS \
 
 // type definitions for the specific machine
 

From 7b41d7f187d0bbfdda66db06b523c8829f198998 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 8 Apr 2021 21:11:24 +1000
Subject: [PATCH 0718/3533] stm32/boardctrl: Give boards control over execution
 of boot.py,main.py.

This commit simplifies the customisation of the main MicroPython execution
loop (4 macros are reduced to 2), and allows a board to have full control
over the execution (or not) of boot.py and main.py.

For boards that use the default start-up code, there is no functional
change in this commit.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/boardctrl.c | 50 +++++++++++++++++++++++++++++++----------
 ports/stm32/boardctrl.h | 30 +++++++++----------------
 ports/stm32/main.c      | 38 ++++++-------------------------
 3 files changed, 56 insertions(+), 62 deletions(-)

diff --git a/ports/stm32/boardctrl.c b/ports/stm32/boardctrl.c
index 188068d705a2a..c82fefa97cf3b 100644
--- a/ports/stm32/boardctrl.c
+++ b/ports/stm32/boardctrl.c
@@ -24,6 +24,7 @@
  * THE SOFTWARE.
  */
 
+#include "py/runtime.h"
 #include "py/mphal.h"
 #include "lib/utils/pyexec.h"
 #include "boardctrl.h"
@@ -140,13 +141,21 @@ void boardctrl_top_soft_reset_loop(boardctrl_state_t *state) {
     led_state(4, 0);
 }
 
-void boardctrl_before_boot_py(boardctrl_state_t *state) {
-    state->run_boot_py = state->reset_mode == 1 || state->reset_mode == 3;
-}
+int boardctrl_run_boot_py(boardctrl_state_t *state) {
+    bool run_boot_py = state->reset_mode == 1 || state->reset_mode == 3;
+
+    if (run_boot_py) {
+        // Run boot.py, if it exists.
+        const char *boot_py = "boot.py";
+        int ret = pyexec_file_if_exists(boot_py);
 
-void boardctrl_after_boot_py(boardctrl_state_t *state) {
-    if (state->run_boot_py && !state->last_ret) {
-        flash_error(4);
+        // Take action based on the execution result.
+        if (ret & PYEXEC_FORCED_EXIT) {
+            return BOARDCTRL_GOTO_SOFT_RESET_EXIT;
+        }
+        if (!ret) {
+            flash_error(4);
+        }
     }
 
     // Turn boot-up LEDs off
@@ -160,17 +169,34 @@ void boardctrl_after_boot_py(boardctrl_state_t *state) {
     led_state(2, 0);
     led_state(3, 0);
     led_state(4, 0);
+
+    return BOARDCTRL_CONTINUE;
 }
 
-void boardctrl_before_main_py(boardctrl_state_t *state) {
-    state->run_main_py = (state->reset_mode == 1 || state->reset_mode == 3)
+int boardctrl_run_main_py(boardctrl_state_t *state) {
+    bool run_main_py = (state->reset_mode == 1 || state->reset_mode == 3)
         && pyexec_mode_kind == PYEXEC_MODE_FRIENDLY_REPL;
-}
 
-void boardctrl_after_main_py(boardctrl_state_t *state) {
-    if (state->run_main_py && !state->last_ret) {
-        flash_error(3);
+    if (run_main_py) {
+        // Run main.py (or what it was configured to be), if it exists.
+        const char *main_py;
+        if (MP_STATE_PORT(pyb_config_main) == MP_OBJ_NULL) {
+            main_py = "main.py";
+        } else {
+            main_py = mp_obj_str_get_str(MP_STATE_PORT(pyb_config_main));
+        }
+        int ret = pyexec_file_if_exists(main_py);
+
+        // Take action based on the execution result.
+        if (ret & PYEXEC_FORCED_EXIT) {
+            return BOARDCTRL_GOTO_SOFT_RESET_EXIT;
+        }
+        if (!ret) {
+            flash_error(3);
+        }
     }
+
+    return BOARDCTRL_CONTINUE;
 }
 
 void boardctrl_start_soft_reset(boardctrl_state_t *state) {
diff --git a/ports/stm32/boardctrl.h b/ports/stm32/boardctrl.h
index f1cbc3b955b3c..33e71b65c9975 100644
--- a/ports/stm32/boardctrl.h
+++ b/ports/stm32/boardctrl.h
@@ -44,20 +44,12 @@
 #define MICROPY_BOARD_TOP_SOFT_RESET_LOOP boardctrl_top_soft_reset_loop
 #endif
 
-#ifndef MICROPY_BOARD_BEFORE_BOOT_PY
-#define MICROPY_BOARD_BEFORE_BOOT_PY boardctrl_before_boot_py
+#ifndef MICROPY_BOARD_RUN_BOOT_PY
+#define MICROPY_BOARD_RUN_BOOT_PY boardctrl_run_boot_py
 #endif
 
-#ifndef MICROPY_BOARD_AFTER_BOOT_PY
-#define MICROPY_BOARD_AFTER_BOOT_PY boardctrl_after_boot_py
-#endif
-
-#ifndef MICROPY_BOARD_BEFORE_MAIN_PY
-#define MICROPY_BOARD_BEFORE_MAIN_PY boardctrl_before_main_py
-#endif
-
-#ifndef MICROPY_BOARD_AFTER_MAIN_PY
-#define MICROPY_BOARD_AFTER_MAIN_PY boardctrl_after_main_py
+#ifndef MICROPY_BOARD_RUN_MAIN_PY
+#define MICROPY_BOARD_RUN_MAIN_PY boardctrl_run_main_py
 #endif
 
 #ifndef MICROPY_BOARD_START_SOFT_RESET
@@ -68,20 +60,20 @@
 #define MICROPY_BOARD_END_SOFT_RESET boardctrl_end_soft_reset
 #endif
 
+enum {
+    BOARDCTRL_CONTINUE,
+    BOARDCTRL_GOTO_SOFT_RESET_EXIT,
+};
+
 typedef struct _boardctrl_state_t {
     uint8_t reset_mode;
-    bool run_boot_py;
-    bool run_main_py;
     bool log_soft_reset;
-    int last_ret;
 } boardctrl_state_t;
 
 void boardctrl_before_soft_reset_loop(boardctrl_state_t *state);
 void boardctrl_top_soft_reset_loop(boardctrl_state_t *state);
-void boardctrl_before_boot_py(boardctrl_state_t *state);
-void boardctrl_after_boot_py(boardctrl_state_t *state);
-void boardctrl_before_main_py(boardctrl_state_t *state);
-void boardctrl_after_main_py(boardctrl_state_t *state);
+int boardctrl_run_boot_py(boardctrl_state_t *state);
+int boardctrl_run_main_py(boardctrl_state_t *state);
 void boardctrl_start_soft_reset(boardctrl_state_t *state);
 void boardctrl_end_soft_reset(boardctrl_state_t *state);
 
diff --git a/ports/stm32/main.c b/ports/stm32/main.c
index 888b20513c6f9..bc8e6f0691eef 100644
--- a/ports/stm32/main.c
+++ b/ports/stm32/main.c
@@ -469,9 +469,7 @@ void stm32_main(uint32_t reset_mode) {
 
     boardctrl_state_t state;
     state.reset_mode = reset_mode;
-    state.run_boot_py = false;
-    state.run_main_py = false;
-    state.last_ret = 0;
+    state.log_soft_reset = false;
 
     MICROPY_BOARD_BEFORE_SOFT_RESET_LOOP(&state);
 
@@ -566,20 +564,11 @@ void stm32_main(uint32_t reset_mode) {
     // reset config variables; they should be set by boot.py
     MP_STATE_PORT(pyb_config_main) = MP_OBJ_NULL;
 
-    MICROPY_BOARD_BEFORE_BOOT_PY(&state);
-
-    // run boot.py, if it exists
-    // TODO perhaps have pyb.reboot([bootpy]) function to soft-reboot and execute custom boot.py
-    if (state.run_boot_py) {
-        const char *boot_py = "boot.py";
-        state.last_ret = pyexec_file_if_exists(boot_py);
-        if (state.last_ret & PYEXEC_FORCED_EXIT) {
-            goto soft_reset_exit;
-        }
+    // Run boot.py (or whatever else a board configures at this stage).
+    if (MICROPY_BOARD_RUN_BOOT_PY(&state) == BOARDCTRL_GOTO_SOFT_RESET_EXIT) {
+        goto soft_reset_exit;
     }
 
-    MICROPY_BOARD_AFTER_BOOT_PY(&state);
-
     // Now we initialise sub-systems that need configuration from boot.py,
     // or whose initialisation can be safely deferred until after running
     // boot.py.
@@ -613,24 +602,11 @@ void stm32_main(uint32_t reset_mode) {
 
     // At this point everything is fully configured and initialised.
 
-    MICROPY_BOARD_BEFORE_MAIN_PY(&state);
-
-    // Run the main script from the current directory.
-    if (state.run_main_py) {
-        const char *main_py;
-        if (MP_STATE_PORT(pyb_config_main) == MP_OBJ_NULL) {
-            main_py = "main.py";
-        } else {
-            main_py = mp_obj_str_get_str(MP_STATE_PORT(pyb_config_main));
-        }
-        state.last_ret = pyexec_file_if_exists(main_py);
-        if (state.last_ret & PYEXEC_FORCED_EXIT) {
-            goto soft_reset_exit;
-        }
+    // Run main.py (or whatever else a board configures at this stage).
+    if (MICROPY_BOARD_RUN_MAIN_PY(&state) == BOARDCTRL_GOTO_SOFT_RESET_EXIT) {
+        goto soft_reset_exit;
     }
 
-    MICROPY_BOARD_AFTER_MAIN_PY(&state);
-
     #if MICROPY_ENABLE_COMPILER
     // Main script is finished, so now go into REPL mode.
     // The REPL mode can change, or it can request a soft reset.

From 0fabda31de33b38c6858925d9195731deba6f54a Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 8 Apr 2021 23:42:22 +1000
Subject: [PATCH 0719/3533] py/py.cmake: Move qstr helper code to
 micropy_gather_target_properties.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/main/CMakeLists.txt | 17 +----------------
 ports/rp2/CMakeLists.txt        | 24 ++----------------------
 py/py.cmake                     | 22 ++++++++++++++++++++++
 3 files changed, 25 insertions(+), 38 deletions(-)

diff --git a/ports/esp32/main/CMakeLists.txt b/ports/esp32/main/CMakeLists.txt
index d7d08ea663df4..1f4bb3175bc16 100644
--- a/ports/esp32/main/CMakeLists.txt
+++ b/ports/esp32/main/CMakeLists.txt
@@ -170,22 +170,7 @@ target_link_libraries(${MICROPY_TARGET} usermod)
 
 # Collect all of the include directories and compile definitions for the IDF components.
 foreach(comp ${IDF_COMPONENTS})
-    get_target_property(type __idf_${comp} TYPE)
-    set(_inc OFF)
-    set(_def OFF)
-    if(${type} STREQUAL STATIC_LIBRARY)
-        get_target_property(_inc __idf_${comp} INCLUDE_DIRECTORIES)
-        get_target_property(_def __idf_${comp} COMPILE_DEFINITIONS)
-    elseif(${type} STREQUAL INTERFACE_LIBRARY)
-        get_target_property(_inc __idf_${comp} INTERFACE_INCLUDE_DIRECTORIES)
-        get_target_property(_def __idf_${comp} INTERFACE_COMPILE_DEFINITIONS)
-    endif()
-    if(_inc)
-        list(APPEND MICROPY_CPP_INC_EXTRA ${_inc})
-    endif()
-    if(_def)
-        list(APPEND MICROPY_CPP_DEF_EXTRA ${_def})
-    endif()
+    micropy_gather_target_properties(__idf_${comp})
 endforeach()
 
 if(IDF_VERSION_MINOR GREATER_EQUAL 2)
diff --git a/ports/rp2/CMakeLists.txt b/ports/rp2/CMakeLists.txt
index 37b041279f503..5f3cdebd87060 100644
--- a/ports/rp2/CMakeLists.txt
+++ b/ports/rp2/CMakeLists.txt
@@ -193,29 +193,9 @@ add_custom_command(TARGET ${MICROPY_TARGET}
 )
 
 # Collect all the include directories and compile definitions for the pico-sdk components.
-macro(_process_target targ)
-    if(TARGET ${targ})
-        get_target_property(type ${targ} TYPE)
-        set(_inc OFF)
-        set(_def OFF)
-        if(${type} STREQUAL STATIC_LIBRARY)
-            get_target_property(_inc ${targ} INCLUDE_DIRECTORIES)
-            get_target_property(_def ${targ} COMPILE_DEFINITIONS)
-        elseif(${type} STREQUAL INTERFACE_LIBRARY)
-            get_target_property(_inc ${targ} INTERFACE_INCLUDE_DIRECTORIES)
-            get_target_property(_def ${targ} INTERFACE_COMPILE_DEFINITIONS)
-        endif()
-        if(_inc)
-            list(APPEND MICROPY_CPP_INC_EXTRA ${_inc})
-        endif()
-        if(_def)
-            list(APPEND MICROPY_CPP_DEF_EXTRA ${_def})
-        endif()
-    endif()
-endmacro()
 foreach(comp ${PICO_SDK_COMPONENTS})
-    _process_target(${comp})
-    _process_target(${comp}_headers)
+    micropy_gather_target_properties(${comp})
+    micropy_gather_target_properties(${comp}_headers)
 endforeach()
 
 # Include the main MicroPython cmake rules.
diff --git a/py/py.cmake b/py/py.cmake
index 52baaa8efc7fd..be5deca2510da 100644
--- a/py/py.cmake
+++ b/py/py.cmake
@@ -122,3 +122,25 @@ set(MICROPY_SOURCE_PY
     ${MICROPY_PY_DIR}/vstr.c
     ${MICROPY_PY_DIR}/warning.c
 )
+
+# Helper macro to collect include directories and compile definitions for qstr processing.
+macro(micropy_gather_target_properties targ)
+    if(TARGET ${targ})
+        get_target_property(type ${targ} TYPE)
+        set(_inc OFF)
+        set(_def OFF)
+        if(${type} STREQUAL STATIC_LIBRARY)
+            get_target_property(_inc ${targ} INCLUDE_DIRECTORIES)
+            get_target_property(_def ${targ} COMPILE_DEFINITIONS)
+        elseif(${type} STREQUAL INTERFACE_LIBRARY)
+            get_target_property(_inc ${targ} INTERFACE_INCLUDE_DIRECTORIES)
+            get_target_property(_def ${targ} INTERFACE_COMPILE_DEFINITIONS)
+        endif()
+        if(_inc)
+            list(APPEND MICROPY_CPP_INC_EXTRA ${_inc})
+        endif()
+        if(_def)
+            list(APPEND MICROPY_CPP_DEF_EXTRA ${_def})
+        endif()
+    endif()
+endmacro()

From 5dcc9b3b16cf6a27acf01bdf8a7d23ae2aff56e3 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 9 Apr 2021 00:59:16 +1000
Subject: [PATCH 0720/3533] py/py.cmake: Introduce MICROPY_INC_CORE as a list
 with core includes.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/main/CMakeLists.txt | 2 +-
 ports/rp2/CMakeLists.txt        | 2 +-
 ports/zephyr/CMakeLists.txt     | 2 +-
 py/py.cmake                     | 2 ++
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/ports/esp32/main/CMakeLists.txt b/ports/esp32/main/CMakeLists.txt
index 1f4bb3175bc16..2bfc09558e397 100644
--- a/ports/esp32/main/CMakeLists.txt
+++ b/ports/esp32/main/CMakeLists.txt
@@ -132,7 +132,7 @@ idf_component_register(
         ${MICROPY_SOURCE_DRIVERS}
         ${MICROPY_SOURCE_PORT}
     INCLUDE_DIRS
-        ${MICROPY_DIR}
+        ${MICROPY_INC_CORE}
         ${MICROPY_INC_USERMOD}
         ${MICROPY_PORT_DIR}
         ${MICROPY_BOARD_DIR}
diff --git a/ports/rp2/CMakeLists.txt b/ports/rp2/CMakeLists.txt
index 5f3cdebd87060..100a83409002e 100644
--- a/ports/rp2/CMakeLists.txt
+++ b/ports/rp2/CMakeLists.txt
@@ -148,9 +148,9 @@ target_sources(${MICROPY_TARGET} PRIVATE
 target_link_libraries(${MICROPY_TARGET} usermod)
 
 target_include_directories(${MICROPY_TARGET} PRIVATE
+    ${MICROPY_INC_CORE}
     ${MICROPY_INC_USERMOD}
     "${PROJECT_SOURCE_DIR}"
-    "${MICROPY_DIR}"
     "${CMAKE_BINARY_DIR}"
 )
 
diff --git a/ports/zephyr/CMakeLists.txt b/ports/zephyr/CMakeLists.txt
index 08868d716dc9e..716642979a601 100644
--- a/ports/zephyr/CMakeLists.txt
+++ b/ports/zephyr/CMakeLists.txt
@@ -85,7 +85,7 @@ set(MICROPY_CPP_FLAGS_EXTRA ${includes} ${system_includes} ${definitions} ${opti
 zephyr_library_named(${MICROPY_TARGET})
 
 zephyr_library_include_directories(
-    ${MICROPY_DIR}
+    ${MICROPY_INC_CORE}
     ${MICROPY_PORT_DIR}
     ${CMAKE_CURRENT_BINARY_DIR}
 )
diff --git a/py/py.cmake b/py/py.cmake
index be5deca2510da..2b5d437b5762b 100644
--- a/py/py.cmake
+++ b/py/py.cmake
@@ -2,6 +2,8 @@
 
 set(MICROPY_PY_DIR "${MICROPY_DIR}/py")
 
+list(APPEND MICROPY_INC_CORE "${MICROPY_DIR}")
+
 # All py/ source files
 set(MICROPY_SOURCE_PY
     ${MICROPY_PY_DIR}/argcheck.c

From 212fe7f33e7427899ee245cda5ab1776b38a79e2 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 8 Apr 2021 23:45:28 +1000
Subject: [PATCH 0721/3533] extmod/extmod.cmake: Add support to build btree
 module with CMake.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/extmod.cmake             | 48 +++++++++++++++++++++++++++++++++
 ports/esp32/main/CMakeLists.txt |  2 +-
 2 files changed, 49 insertions(+), 1 deletion(-)

diff --git a/extmod/extmod.cmake b/extmod/extmod.cmake
index 691c3ce9b3fea..a54047519d76e 100644
--- a/extmod/extmod.cmake
+++ b/extmod/extmod.cmake
@@ -4,6 +4,8 @@ set(MICROPY_EXTMOD_DIR "${MICROPY_DIR}/extmod")
 set(MICROPY_OOFATFS_DIR "${MICROPY_DIR}/lib/oofatfs")
 
 set(MICROPY_SOURCE_EXTMOD
+    ${MICROPY_DIR}/lib/embed/abort_.c
+    ${MICROPY_DIR}/lib/utils/printf.c
     ${MICROPY_EXTMOD_DIR}/machine_i2c.c
     ${MICROPY_EXTMOD_DIR}/machine_mem.c
     ${MICROPY_EXTMOD_DIR}/machine_pulse.c
@@ -43,3 +45,49 @@ set(MICROPY_SOURCE_EXTMOD
     ${MICROPY_EXTMOD_DIR}/virtpin.c
     ${MICROPY_EXTMOD_DIR}/nimble/modbluetooth_nimble.c
 )
+
+# Library for btree module and associated code
+
+set(MICROPY_LIB_BERKELEY_DIR "${MICROPY_DIR}/lib/berkeley-db-1.xx")
+
+if(EXISTS "${MICROPY_LIB_BERKELEY_DIR}/btree/bt_close.c")
+    add_library(micropy_extmod_btree OBJECT
+        ${MICROPY_LIB_BERKELEY_DIR}/btree/bt_close.c
+        ${MICROPY_LIB_BERKELEY_DIR}/btree/bt_conv.c
+        ${MICROPY_LIB_BERKELEY_DIR}/btree/bt_debug.c
+        ${MICROPY_LIB_BERKELEY_DIR}/btree/bt_delete.c
+        ${MICROPY_LIB_BERKELEY_DIR}/btree/bt_get.c
+        ${MICROPY_LIB_BERKELEY_DIR}/btree/bt_open.c
+        ${MICROPY_LIB_BERKELEY_DIR}/btree/bt_overflow.c
+        ${MICROPY_LIB_BERKELEY_DIR}/btree/bt_page.c
+        ${MICROPY_LIB_BERKELEY_DIR}/btree/bt_put.c
+        ${MICROPY_LIB_BERKELEY_DIR}/btree/bt_search.c
+        ${MICROPY_LIB_BERKELEY_DIR}/btree/bt_seq.c
+        ${MICROPY_LIB_BERKELEY_DIR}/btree/bt_split.c
+        ${MICROPY_LIB_BERKELEY_DIR}/btree/bt_utils.c
+        ${MICROPY_LIB_BERKELEY_DIR}/mpool/mpool.c
+    )
+
+    target_include_directories(micropy_extmod_btree PRIVATE
+        ${MICROPY_LIB_BERKELEY_DIR}/PORT/include
+    )
+
+    target_compile_definitions(micropy_extmod_btree PRIVATE
+        __DBINTERFACE_PRIVATE=1
+        mpool_error=printf
+        abort=abort_
+        "virt_fd_t=void*"
+    )
+
+    # The include directories and compile definitions below are needed to build
+    # modbtree.c and should be added to the main MicroPython target.
+
+    list(APPEND MICROPY_INC_CORE
+        "${MICROPY_LIB_BERKELEY_DIR}/PORT/include"
+    )
+
+    list(APPEND MICROPY_DEF_CORE
+        __DBINTERFACE_PRIVATE=1
+        "virt_fd_t=void*"
+    )
+endif()
diff --git a/ports/esp32/main/CMakeLists.txt b/ports/esp32/main/CMakeLists.txt
index 2bfc09558e397..2223ecd031d44 100644
--- a/ports/esp32/main/CMakeLists.txt
+++ b/ports/esp32/main/CMakeLists.txt
@@ -3,10 +3,10 @@ get_filename_component(MICROPY_DIR ${PROJECT_DIR}/../.. ABSOLUTE)
 
 # Include core source components.
 include(${MICROPY_DIR}/py/py.cmake)
-include(${MICROPY_DIR}/extmod/extmod.cmake)
 
 if(NOT CMAKE_BUILD_EARLY_EXPANSION)
     include(${MICROPY_DIR}/py/usermod.cmake)
+    include(${MICROPY_DIR}/extmod/extmod.cmake)
 endif()
 
 set(MICROPY_QSTRDEFS_PORT

From ab9d47e0230768f82a735343fa5b58e2029d8eda Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 8 Apr 2021 23:56:28 +1000
Subject: [PATCH 0722/3533] esp32: Enable btree module.

This was disabled with the move to CMake, and this commit reinstates it.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/main/CMakeLists.txt | 4 +++-
 ports/esp32/mpconfigport.h      | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/ports/esp32/main/CMakeLists.txt b/ports/esp32/main/CMakeLists.txt
index 2223ecd031d44..aacdd40d3113d 100644
--- a/ports/esp32/main/CMakeLists.txt
+++ b/ports/esp32/main/CMakeLists.txt
@@ -149,6 +149,7 @@ set(MICROPY_CROSS_FLAGS -march=xtensawin)
 
 # Set compile options for this port.
 target_compile_definitions(${MICROPY_TARGET} PUBLIC
+    ${MICROPY_DEF_CORE}
     MICROPY_ESP_IDF_4=1
     MICROPY_VFS_FAT=1
     MICROPY_VFS_LFS2=1
@@ -164,7 +165,8 @@ target_compile_options(${MICROPY_TARGET} PUBLIC
     -Wno-missing-field-initializers
 )
 
-# add usermod
+# Add additional extmod and usermod components.
+target_link_libraries(${MICROPY_TARGET} micropy_extmod_btree)
 target_link_libraries(${MICROPY_TARGET} usermod)
 
 
diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h
index 392f8c749c240..c9c4b6268be2f 100644
--- a/ports/esp32/mpconfigport.h
+++ b/ports/esp32/mpconfigport.h
@@ -162,6 +162,7 @@
 #define MICROPY_PY_UWEBSOCKET               (1)
 #define MICROPY_PY_WEBREPL                  (1)
 #define MICROPY_PY_FRAMEBUF                 (1)
+#define MICROPY_PY_BTREE                    (1)
 #define MICROPY_PY_USOCKET_EVENTS           (MICROPY_PY_WEBREPL)
 #define MICROPY_PY_BLUETOOTH_RANDOM_ADDR    (1)
 #define MICROPY_PY_BLUETOOTH_DEFAULT_GAP_NAME ("ESP32")

From 7546d3cf73608b7888583d5bdbcec059954ccfe8 Mon Sep 17 00:00:00 2001
From: aziubin <aziubin@googlemail.com>
Date: Sun, 21 Mar 2021 18:34:05 +0200
Subject: [PATCH 0723/3533] stm32/boards/NUCLEO_L476RG: Add 5 remaining UARTs.

STM32L476RG MCU of NUCLEO_L476RG board has 6 UART/USART units in total
(USART1, USART2, USART3, UART4, UART5 and LPUART1), but only UART2,
connected to REPL, was defined and available in Python code.
Defined are all 5 remaining UART/USART units including LPUART1.

Signed-off-by: Alexander Ziubin aziubin@googlemail.com
---
 .../boards/NUCLEO_L476RG/mpconfigboard.h      | 75 ++++++++++++-------
 1 file changed, 47 insertions(+), 28 deletions(-)

diff --git a/ports/stm32/boards/NUCLEO_L476RG/mpconfigboard.h b/ports/stm32/boards/NUCLEO_L476RG/mpconfigboard.h
index 00b033006ba9a..2899a97aceeda 100644
--- a/ports/stm32/boards/NUCLEO_L476RG/mpconfigboard.h
+++ b/ports/stm32/boards/NUCLEO_L476RG/mpconfigboard.h
@@ -9,45 +9,64 @@
 #define MICROPY_HW_ENABLE_DAC       (1)
 
 // MSI is used and is 4MHz
-#define MICROPY_HW_CLK_PLLM (1)
-#define MICROPY_HW_CLK_PLLN (40)
-#define MICROPY_HW_CLK_PLLP (RCC_PLLP_DIV7)
-#define MICROPY_HW_CLK_PLLQ (RCC_PLLQ_DIV2)
-#define MICROPY_HW_CLK_PLLR (RCC_PLLR_DIV2)
+#define MICROPY_HW_CLK_PLLM         (1)
+#define MICROPY_HW_CLK_PLLN         (40)
+#define MICROPY_HW_CLK_PLLP         (RCC_PLLP_DIV7)
+#define MICROPY_HW_CLK_PLLQ         (RCC_PLLQ_DIV2)
+#define MICROPY_HW_CLK_PLLR         (RCC_PLLR_DIV2)
+
+#define MICROPY_HW_FLASH_LATENCY    FLASH_LATENCY_4
 
 // The board has an external 32kHz crystal
 #define MICROPY_HW_RTC_USE_LSE      (1)
 
-// UART config
-#define MICROPY_HW_UART2_TX     (pin_A2)
-#define MICROPY_HW_UART2_RX     (pin_A3)
-
+// USART1 config
+#define MICROPY_HW_UART1_TX         (pin_A9)
+#define MICROPY_HW_UART1_RX         (pin_A10)
+// USART2 config. Connected to ST-Link
+#define MICROPY_HW_UART2_TX         (pin_A2)
+#define MICROPY_HW_UART2_RX         (pin_A3)
+#define MICROPY_HW_UART2_RTS        (pin_A1)
+#define MICROPY_HW_UART2_CTS        (pin_A0)
+// USART3 config
+#define MICROPY_HW_UART3_TX         (pin_C4)
+#define MICROPY_HW_UART3_RX         (pin_C5)
+#define MICROPY_HW_UART3_RTS        (pin_B14)
+#define MICROPY_HW_UART3_CTS        (pin_B13)
+// UART4 config
+#define MICROPY_HW_UART4_TX         (pin_A0)
+#define MICROPY_HW_UART4_RX         (pin_A1)
+// UART5 config
+#define MICROPY_HW_UART5_TX         (pin_C12)
+#define MICROPY_HW_UART5_RX         (pin_D2)
+// LPUART config
+#define MICROPY_HW_LPUART1_TX       (pin_C1)
+#define MICROPY_HW_LPUART1_RX       (pin_C0)
+// USART2 is connected to the virtual com port on the ST-Link
 #define MICROPY_HW_UART_REPL        PYB_UART_2
 #define MICROPY_HW_UART_REPL_BAUD   115200
 
-#define MICROPY_HW_FLASH_LATENCY    FLASH_LATENCY_4
-
 // I2C busses
-#define MICROPY_HW_I2C1_SCL (pin_B8)
-#define MICROPY_HW_I2C1_SDA (pin_B9)
-#define MICROPY_HW_I2C2_SCL (pin_B10)
-#define MICROPY_HW_I2C2_SDA (pin_B11)
-#define MICROPY_HW_I2C3_SCL (pin_C0)
-#define MICROPY_HW_I2C3_SDA (pin_C1)
+#define MICROPY_HW_I2C1_SCL         (pin_B8)
+#define MICROPY_HW_I2C1_SDA         (pin_B9)
+#define MICROPY_HW_I2C2_SCL         (pin_B10)
+#define MICROPY_HW_I2C2_SDA         (pin_B11)
+#define MICROPY_HW_I2C3_SCL         (pin_C0)
+#define MICROPY_HW_I2C3_SDA         (pin_C1)
 
 // SPI busses
-#define MICROPY_HW_SPI1_NSS     (pin_A4)
-#define MICROPY_HW_SPI1_SCK     (pin_B3)
-#define MICROPY_HW_SPI1_MISO    (pin_B4)
-#define MICROPY_HW_SPI1_MOSI    (pin_B5)
-#define MICROPY_HW_SPI2_NSS     (pin_B12)
-#define MICROPY_HW_SPI2_SCK     (pin_B13)
-#define MICROPY_HW_SPI2_MISO    (pin_B14)
-#define MICROPY_HW_SPI2_MOSI    (pin_B15)
+#define MICROPY_HW_SPI1_NSS         (pin_A4)
+#define MICROPY_HW_SPI1_SCK         (pin_B3)
+#define MICROPY_HW_SPI1_MISO        (pin_B4)
+#define MICROPY_HW_SPI1_MOSI        (pin_B5)
+#define MICROPY_HW_SPI2_NSS         (pin_B12)
+#define MICROPY_HW_SPI2_SCK         (pin_B13)
+#define MICROPY_HW_SPI2_MISO        (pin_B14)
+#define MICROPY_HW_SPI2_MOSI        (pin_B15)
 
 // CAN bus
-#define MICROPY_HW_CAN1_TX (pin_A12)
-#define MICROPY_HW_CAN1_RX (pin_A11)
+#define MICROPY_HW_CAN1_TX          (pin_A12)
+#define MICROPY_HW_CAN1_RX          (pin_A11)
 
 // USRSW is pulled low. Pressing the button makes the input go high.
 #define MICROPY_HW_USRSW_PIN        (pin_C13)
@@ -61,4 +80,4 @@
 #define MICROPY_HW_LED_OFF(pin)     (mp_hal_pin_low(pin))
 
 // USB config
-#define MICROPY_HW_USB_FS (1)
+#define MICROPY_HW_USB_FS           (1)

From 42035e5eded531d41319ffde999fa5a97478c872 Mon Sep 17 00:00:00 2001
From: Santeri Paavolainen <santtu@iki.fi>
Date: Wed, 24 Feb 2021 10:33:26 +0200
Subject: [PATCH 0724/3533] examples/embedding: Fix example so it compiles
 again.

There were a few changes that had broken this example, specifically
2cdf1d25f59409b6130c0e8b6cf50300aed2d7e6 removed file.c from ports/unix.
And (at least for MacOS) mp_state_ctx must be placed in the BSS with
-fno-common so it is visible to the linker.

Signed-off-by: Santeri Paavolainen <santtu@iki.fi>
---
 examples/embedding/Makefile.upylib | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/examples/embedding/Makefile.upylib b/examples/embedding/Makefile.upylib
index 0e388332e68fa..00def493d650f 100644
--- a/examples/embedding/Makefile.upylib
+++ b/examples/embedding/Makefile.upylib
@@ -21,6 +21,9 @@ CWARN = -Wall -Werror
 CWARN += -Wpointer-arith -Wuninitialized
 CFLAGS = $(INC) $(CWARN) -std=gnu99 -DUNIX $(CFLAGS_MOD) $(COPT) $(CFLAGS_EXTRA)
 
+# Some systems (eg MacOS) need -fno-common so that mp_state_ctx is placed in the BSS.
+CFLAGS += -fno-common
+
 # Debugging/Optimization
 ifdef DEBUG
 CFLAGS += -g
@@ -133,7 +136,6 @@ SRC_C = $(addprefix ports/unix/,\
 	gccollect.c \
 	unix_mphal.c \
 	input.c \
-	file.c \
 	modmachine.c \
 	modos.c \
 	moduselect.c \
@@ -146,6 +148,7 @@ SRC_C = $(addprefix ports/unix/,\
 LIB_SRC_C = $(addprefix lib/,\
 	$(LIB_SRC_C_EXTRA) \
 	utils/printf.c \
+	utils/gchelper_generic.c \
 	timeutils/timeutils.c \
 	)
 

From 2c9af1c1d7398bb340f7c78601be6ed2d79ee0b8 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 15 Mar 2021 16:42:58 +1100
Subject: [PATCH 0725/3533] rp2/rp2_pio: Validate state machine frequency in
 constructor.

Fixes issue #7025.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/rp2/rp2_pio.c | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/ports/rp2/rp2_pio.c b/ports/rp2/rp2_pio.c
index 9786e569d66c8..bd3e10a06c7aa 100644
--- a/ports/rp2/rp2_pio.c
+++ b/ports/rp2/rp2_pio.c
@@ -462,13 +462,24 @@ STATIC mp_obj_t rp2_state_machine_init_helper(const rp2_state_machine_obj_t *sel
     }
 
     // Compute the clock divider.
-    float div;
+    uint16_t clkdiv_int;
+    uint8_t clkdiv_frac;
     if (args[ARG_freq].u_int < 0) {
-        div = 1;
+        // Default: run at CPU frequency.
+        clkdiv_int = 1;
+        clkdiv_frac = 0;
     } else if (args[ARG_freq].u_int == 0) {
-        div = 0;
+        // Special case of 0: set clkdiv to 0.
+        clkdiv_int = 0;
+        clkdiv_frac = 0;
     } else {
-        div = (float)clock_get_hz(clk_sys) / (float)args[ARG_freq].u_int;
+        // Frequency given in Hz, compute clkdiv from it.
+        uint64_t div = (uint64_t)clock_get_hz(clk_sys) * 256ULL / (uint64_t)args[ARG_freq].u_int;
+        if (!(div >= 1 * 256 && div <= 65536 * 256)) {
+            mp_raise_ValueError(MP_ERROR_TEXT("freq out of range"));
+        }
+        clkdiv_int = div / 256;
+        clkdiv_frac = div & 0xff;
     }
 
     // Disable and reset the state machine.
@@ -476,7 +487,7 @@ STATIC mp_obj_t rp2_state_machine_init_helper(const rp2_state_machine_obj_t *sel
 
     // Build the state machine config.
     pio_sm_config config = pio_get_default_sm_config();
-    sm_config_set_clkdiv(&config, div);
+    sm_config_set_clkdiv_int_frac(&config, clkdiv_int, clkdiv_frac);
     config.execctrl = mp_obj_get_int_truncated(prog[PROG_EXECCTRL]);
     config.shiftctrl = mp_obj_get_int_truncated(prog[PROG_SHIFTCTRL]);
 

From 6f06dcaee57cc6f36a4121b4797942200b2d7281 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Wed, 17 Mar 2021 07:57:27 +0100
Subject: [PATCH 0726/3533] rp2/moduos: Implement uos.urandom().

The implementation samples rosc.randombits at a frequency lower than the
oscillator frequency.  This gives better random values.  In addition, for
an 8-bit value 8 samples are taken and fed through a 8-bit CRC,
distributing the sampling over the byte.  The resulting sampling rate is
about 120k/sec.

The RNG does not include testing of error conditions, like the ROSC being
in sync with the sampling or completely failing.  Making the interim value
static causes it to perform a little bit better in short sync or drop-out
situations.

The output of uos.urandom() performs well with the NIST800-22 test suite.
In my trial it passed all tests of the sts 2.1.2 test suite.  I also ran a
test of the random data with the Common Criteria test suite AIS 31, and it
passed all tests too.
---
 ports/rp2/main.c   | 16 ++++++++++++++--
 ports/rp2/moduos.c | 14 ++++++++++++++
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/ports/rp2/main.c b/ports/rp2/main.c
index 64218f97c5aeb..8fddeaa560510 100644
--- a/ports/rp2/main.c
+++ b/ports/rp2/main.c
@@ -30,6 +30,7 @@
 #include "py/runtime.h"
 #include "py/gc.h"
 #include "py/mperrno.h"
+#include "py/mphal.h"
 #include "py/stackctrl.h"
 #include "lib/mp-readline/readline.h"
 #include "lib/utils/gchelper.h"
@@ -168,10 +169,21 @@ void MP_WEAK __assert_func(const char *file, int line, const char *func, const c
 }
 #endif
 
+#define POLY (0xD5)
+
+uint8_t rosc_random_u8(size_t cycles) {
+    static uint8_t r;
+    for (size_t i = 0; i < cycles; ++i) {
+        r = ((r << 1) | rosc_hw->randombit) ^ (r & 0x80 ? POLY : 0);
+        mp_hal_delay_us_fast(1);
+    }
+    return r;
+}
+
 uint32_t rosc_random_u32(void) {
     uint32_t value = 0;
-    for (size_t i = 0; i < 32; ++i) {
-        value = value << 1 | rosc_hw->randombit;
+    for (size_t i = 0; i < 4; ++i) {
+        value = value << 8 | rosc_random_u8(32);
     }
     return value;
 }
diff --git a/ports/rp2/moduos.c b/ports/rp2/moduos.c
index 7ee662b5a4518..02f34eb960d0f 100644
--- a/ports/rp2/moduos.c
+++ b/ports/rp2/moduos.c
@@ -31,6 +31,8 @@
 #include "extmod/vfs_lfs.h"
 #include "genhdr/mpversion.h"
 
+uint8_t rosc_random_u8(size_t cycles);
+
 STATIC const qstr os_uname_info_fields[] = {
     MP_QSTR_sysname, MP_QSTR_nodename,
     MP_QSTR_release, MP_QSTR_version, MP_QSTR_machine
@@ -57,10 +59,22 @@ STATIC mp_obj_t os_uname(void) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_0(os_uname_obj, os_uname);
 
+STATIC mp_obj_t os_urandom(mp_obj_t num) {
+    mp_int_t n = mp_obj_get_int(num);
+    vstr_t vstr;
+    vstr_init_len(&vstr, n);
+    for (int i = 0; i < n; i++) {
+        vstr.buf[i] = rosc_random_u8(8);
+    }
+    return mp_obj_new_str_from_vstr(&mp_type_bytes, &vstr);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(os_urandom_obj, os_urandom);
+
 STATIC const mp_rom_map_elem_t os_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_uos) },
 
     { MP_ROM_QSTR(MP_QSTR_uname), MP_ROM_PTR(&os_uname_obj) },
+    { MP_ROM_QSTR(MP_QSTR_urandom), MP_ROM_PTR(&os_urandom_obj) },
 
     #if MICROPY_VFS
     { MP_ROM_QSTR(MP_QSTR_chdir), MP_ROM_PTR(&mp_vfs_chdir_obj) },

From 22554cf8e21ab97c60137539536eab05d6a6cdcb Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Mon, 1 Mar 2021 14:23:45 +0100
Subject: [PATCH 0727/3533] rp2/rp2_pio: Add StateMachine
 restart,rx_fifo,tx_fifo helper functions.

StateMachine.restart: Restarts the state machine
StateMachine.rx_fifo: Return the number of RX FIFO items, 0 if empty
StateMachine.tx_fifo: Return the number of TX FIFO items, 0 if empty

restart() seems to be the most useful one, as it resets the state machine
to the initial state without the need to re-initialise/re-create.  It also
makes PIO code easier, because then stalling as an error state can be
unlocked.

rx_fifo() is also useful, for MP code to check for data and timeout if no
data arrived.  Complex logic is easier handled in Python code than in PIO
code.

tx_fifo() can be useful to check states where data is not processed, and is
mostly for symmetry.
---
 ports/rp2/rp2_pio.c | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/ports/rp2/rp2_pio.c b/ports/rp2/rp2_pio.c
index bd3e10a06c7aa..5f93f10c26794 100644
--- a/ports/rp2/rp2_pio.c
+++ b/ports/rp2/rp2_pio.c
@@ -66,6 +66,7 @@ typedef struct _rp2_state_machine_irq_obj_t {
 } rp2_state_machine_irq_obj_t;
 
 STATIC const rp2_state_machine_obj_t rp2_state_machine_obj[8];
+STATIC uint8_t rp2_state_machine_initial_pc[8];
 
 STATIC mp_obj_t rp2_state_machine_init_helper(const rp2_state_machine_obj_t *self, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args);
 
@@ -459,6 +460,7 @@ STATIC mp_obj_t rp2_state_machine_init_helper(const rp2_state_machine_obj_t *sel
     if (offset < 0) {
         rp2_pio_add_program(&rp2_pio_obj[PIO_NUM(self->pio)], args[ARG_prog].u_obj);
         offset = mp_obj_get_int(prog[PROG_OFFSET_PIO0 + PIO_NUM(self->pio)]);
+        rp2_state_machine_initial_pc[self->id] = offset;
     }
 
     // Compute the clock divider.
@@ -592,6 +594,15 @@ STATIC mp_obj_t rp2_state_machine_active(size_t n_args, const mp_obj_t *args) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(rp2_state_machine_active_obj, 1, 2, rp2_state_machine_active);
 
+// StateMachine.restart()
+STATIC mp_obj_t rp2_state_machine_restart(mp_obj_t self_in) {
+    rp2_state_machine_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    pio_sm_restart(self->pio, self->sm);
+    pio_sm_exec(self->pio, self->sm, pio_encode_jmp(rp2_state_machine_initial_pc[self->id]));
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(rp2_state_machine_restart_obj, rp2_state_machine_restart);
+
 // StateMachine.exec(instr)
 STATIC mp_obj_t rp2_state_machine_exec(mp_obj_t self_in, mp_obj_t instr_in) {
     rp2_state_machine_obj_t *self = MP_OBJ_TO_PTR(self_in);
@@ -700,6 +711,20 @@ STATIC mp_obj_t rp2_state_machine_put(size_t n_args, const mp_obj_t *args) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(rp2_state_machine_put_obj, 2, 3, rp2_state_machine_put);
 
+// StateMachine.rx_fifo()
+STATIC mp_obj_t rp2_state_machine_rx_fifo(mp_obj_t self_in) {
+    rp2_state_machine_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    return MP_OBJ_NEW_SMALL_INT(pio_sm_get_rx_fifo_level(self->pio, self->sm));
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(rp2_state_machine_rx_fifo_obj, rp2_state_machine_rx_fifo);
+
+// StateMachine.tx_fifo()
+STATIC mp_obj_t rp2_state_machine_tx_fifo(mp_obj_t self_in) {
+    rp2_state_machine_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    return MP_OBJ_NEW_SMALL_INT(pio_sm_get_tx_fifo_level(self->pio, self->sm));
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(rp2_state_machine_tx_fifo_obj, rp2_state_machine_tx_fifo);
+
 // StateMachine.irq(handler=None, trigger=0|1, hard=False)
 STATIC mp_obj_t rp2_state_machine_irq(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_handler, ARG_trigger, ARG_hard };
@@ -759,9 +784,12 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_KW(rp2_state_machine_irq_obj, 1, rp2_state_machin
 STATIC const mp_rom_map_elem_t rp2_state_machine_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_init), MP_ROM_PTR(&rp2_state_machine_init_obj) },
     { MP_ROM_QSTR(MP_QSTR_active), MP_ROM_PTR(&rp2_state_machine_active_obj) },
+    { MP_ROM_QSTR(MP_QSTR_restart), MP_ROM_PTR(&rp2_state_machine_restart_obj) },
     { MP_ROM_QSTR(MP_QSTR_exec), MP_ROM_PTR(&rp2_state_machine_exec_obj) },
     { MP_ROM_QSTR(MP_QSTR_get), MP_ROM_PTR(&rp2_state_machine_get_obj) },
     { MP_ROM_QSTR(MP_QSTR_put), MP_ROM_PTR(&rp2_state_machine_put_obj) },
+    { MP_ROM_QSTR(MP_QSTR_rx_fifo), MP_ROM_PTR(&rp2_state_machine_rx_fifo_obj) },
+    { MP_ROM_QSTR(MP_QSTR_tx_fifo), MP_ROM_PTR(&rp2_state_machine_tx_fifo_obj) },
     { MP_ROM_QSTR(MP_QSTR_irq), MP_ROM_PTR(&rp2_state_machine_irq_obj) },
 };
 STATIC MP_DEFINE_CONST_DICT(rp2_state_machine_locals_dict, rp2_state_machine_locals_dict_table);

From 1be74b94b6f3263b8e360a0a012ae87301539f91 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Thu, 11 Mar 2021 08:36:16 +0100
Subject: [PATCH 0728/3533] rp2/machine_uart: Add buffered transfer of data
 with rxbuf/txbuf kwargs.

Instantiation and init now support the rxbuf and txbuf keywords for setting
the buffer size.  The default size is 256 bytes.  The minimum and maximum
sizes are 32 and 32766 respectively.

uart.write() still includes checks for timeout, even if it is very unlikely
to happen due to a) lack of flow control support and b) the minimal timeout
values being longer than the time it needs to send a byte.
---
 ports/rp2/machine_uart.c | 159 +++++++++++++++++++++++++++++++++++----
 ports/rp2/mpconfigport.h |   2 +
 2 files changed, 147 insertions(+), 14 deletions(-)

diff --git a/ports/rp2/machine_uart.c b/ports/rp2/machine_uart.c
index 936b9a93e9869..2da3ab41f86fa 100644
--- a/ports/rp2/machine_uart.c
+++ b/ports/rp2/machine_uart.c
@@ -28,9 +28,12 @@
 #include "py/stream.h"
 #include "py/mphal.h"
 #include "py/mperrno.h"
+#include "py/ringbuf.h"
 #include "modmachine.h"
 
+#include "hardware/irq.h"
 #include "hardware/uart.h"
+#include "hardware/regs/uart.h"
 
 #define DEFAULT_UART_BAUDRATE (115200)
 #define DEFAULT_UART_BITS (8)
@@ -39,6 +42,9 @@
 #define DEFAULT_UART0_RX (1)
 #define DEFAULT_UART1_TX (4)
 #define DEFAULT_UART1_RX (5)
+#define DEFAULT_BUFFER_SIZE (256)
+#define MIN_BUFFER_SIZE  (32)
+#define MAX_BUFFER_SIZE  (32766)
 
 #define IS_VALID_PERIPH(uart, pin)  (((((pin) + 4) & 8) >> 3) == (uart))
 #define IS_VALID_TX(uart, pin)      (((pin) & 3) == 0 && IS_VALID_PERIPH(uart, pin))
@@ -61,28 +67,81 @@ typedef struct _machine_uart_obj_t {
     uint16_t timeout;       // timeout waiting for first char (in ms)
     uint16_t timeout_char;  // timeout waiting between chars (in ms)
     uint8_t invert;
+    ringbuf_t read_buffer;
+    bool read_lock;
+    ringbuf_t write_buffer;
+    bool write_lock;
 } machine_uart_obj_t;
 
 STATIC machine_uart_obj_t machine_uart_obj[] = {
-    {{&machine_uart_type}, uart0, 0, 0, DEFAULT_UART_BITS, UART_PARITY_NONE, DEFAULT_UART_STOP, DEFAULT_UART0_TX, DEFAULT_UART0_RX, 0, 0, 0},
-    {{&machine_uart_type}, uart1, 1, 0, DEFAULT_UART_BITS, UART_PARITY_NONE, DEFAULT_UART_STOP, DEFAULT_UART1_TX, DEFAULT_UART1_RX, 0, 0, 0},
+    {{&machine_uart_type}, uart0, 0, 0, DEFAULT_UART_BITS, UART_PARITY_NONE, DEFAULT_UART_STOP,
+     DEFAULT_UART0_TX, DEFAULT_UART0_RX, 0, 0, 0, {NULL, 1, 0, 0}, 0, {NULL, 1, 0, 0}, 0},
+    {{&machine_uart_type}, uart1, 1, 0, DEFAULT_UART_BITS, UART_PARITY_NONE, DEFAULT_UART_STOP,
+     DEFAULT_UART1_TX, DEFAULT_UART1_RX, 0, 0, 0, {NULL, 1, 0, 0}, 0, {NULL, 1, 0, 0}, 0,},
 };
 
 STATIC const char *_parity_name[] = {"None", "0", "1"};
 STATIC const char *_invert_name[] = {"None", "INV_TX", "INV_RX", "INV_TX|INV_RX"};
 
+/******************************************************************************/
+// IRQ and buffer handling
+
+// take all bytes from the fifo and store them, if possible, in the buffer
+STATIC void uart_drain_rx_fifo(machine_uart_obj_t *self) {
+    while (uart_is_readable(self->uart)) {
+        // try to write the data, ignore the fail
+        ringbuf_put(&(self->read_buffer), uart_get_hw(self->uart)->dr);
+    }
+}
+
+// take bytes from the buffer and put them into the UART FIFO
+STATIC void uart_fill_tx_fifo(machine_uart_obj_t *self) {
+    while (uart_is_writable(self->uart) && ringbuf_avail(&self->write_buffer) > 0) {
+        // get a byte from the buffer and put it into the uart
+        uart_get_hw(self->uart)->dr = ringbuf_get(&(self->write_buffer));
+    }
+}
+
+STATIC inline void uart_service_interrupt(machine_uart_obj_t *self) {
+    if (uart_get_hw(self->uart)->mis & UART_UARTMIS_RXMIS_BITS) { // rx interrupt?
+        // clear all interrupt bits but tx
+        uart_get_hw(self->uart)->icr = UART_UARTICR_BITS & (~UART_UARTICR_TXIC_BITS);
+        if (!self->read_lock) {
+            uart_drain_rx_fifo(self);
+        }
+    }
+    if (uart_get_hw(self->uart)->mis & UART_UARTMIS_TXMIS_BITS) { // tx interrupt?
+        // clear all interrupt bits but rx
+        uart_get_hw(self->uart)->icr = UART_UARTICR_BITS & (~UART_UARTICR_RXIC_BITS);
+        if (!self->write_lock) {
+            uart_fill_tx_fifo(self);
+        }
+    }
+}
+
+STATIC void uart0_irq_handler(void) {
+    uart_service_interrupt(&machine_uart_obj[0]);
+}
+
+STATIC void uart1_irq_handler(void) {
+    uart_service_interrupt(&machine_uart_obj[1]);
+}
+
 /******************************************************************************/
 // MicroPython bindings for UART
 
 STATIC void machine_uart_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     machine_uart_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    mp_printf(print, "UART(%u, baudrate=%u, bits=%u, parity=%s, stop=%u, tx=%d, rx=%d, timeout=%u, timeout_char=%u, invert=%s)",
+    mp_printf(print, "UART(%u, baudrate=%u, bits=%u, parity=%s, stop=%u, tx=%d, rx=%d, "
+        "txbuf=%d, rxbuf=%d, timeout=%u, timeout_char=%u, invert=%s)",
         self->uart_id, self->baudrate, self->bits, _parity_name[self->parity],
-        self->stop, self->tx, self->rx, self->timeout, self->timeout_char, _invert_name[self->invert]);
+        self->stop, self->tx, self->rx, self->write_buffer.size - 1, self->read_buffer.size - 1,
+        self->timeout, self->timeout_char, _invert_name[self->invert]);
 }
 
 STATIC mp_obj_t machine_uart_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
-    enum { ARG_id, ARG_baudrate, ARG_bits, ARG_parity, ARG_stop, ARG_tx, ARG_rx, ARG_timeout, ARG_timeout_char, ARG_invert };
+    enum { ARG_id, ARG_baudrate, ARG_bits, ARG_parity, ARG_stop, ARG_tx, ARG_rx,
+           ARG_timeout, ARG_timeout_char, ARG_invert, ARG_txbuf, ARG_rxbuf};
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_id, MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
         { MP_QSTR_baudrate, MP_ARG_INT, {.u_int = -1} },
@@ -94,6 +153,8 @@ STATIC mp_obj_t machine_uart_make_new(const mp_obj_type_t *type, size_t n_args,
         { MP_QSTR_timeout, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} },
         { MP_QSTR_timeout_char, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} },
         { MP_QSTR_invert, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} },
+        { MP_QSTR_txbuf, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} },
+        { MP_QSTR_rxbuf, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} },
     };
 
     // Parse args.
@@ -169,6 +230,30 @@ STATIC mp_obj_t machine_uart_make_new(const mp_obj_type_t *type, size_t n_args,
         self->invert = args[ARG_invert].u_int;
     }
 
+    self->read_lock = false;
+
+    // Set the RX buffer size if configured.
+    size_t rxbuf_len = DEFAULT_BUFFER_SIZE;
+    if (args[ARG_rxbuf].u_int > 0) {
+        rxbuf_len = args[ARG_rxbuf].u_int;
+        if (rxbuf_len < MIN_BUFFER_SIZE) {
+            rxbuf_len = MIN_BUFFER_SIZE;
+        } else if (rxbuf_len > MAX_BUFFER_SIZE) {
+            mp_raise_ValueError(MP_ERROR_TEXT("rxbuf too large"));
+        }
+    }
+
+    // Set the TX buffer size if configured.
+    size_t txbuf_len = DEFAULT_BUFFER_SIZE;
+    if (args[ARG_txbuf].u_int > 0) {
+        txbuf_len = args[ARG_txbuf].u_int;
+        if (txbuf_len < MIN_BUFFER_SIZE) {
+            txbuf_len = MIN_BUFFER_SIZE;
+        } else if (txbuf_len > MAX_BUFFER_SIZE) {
+            mp_raise_ValueError(MP_ERROR_TEXT("txbuf too large"));
+        }
+    }
+
     // Initialise the UART peripheral if any arguments given, or it was not initialised previously.
     if (n_args > 1 || n_kw > 0 || self->baudrate == 0) {
         if (self->baudrate == 0) {
@@ -192,6 +277,25 @@ STATIC mp_obj_t machine_uart_make_new(const mp_obj_type_t *type, size_t n_args,
         if (self->invert & UART_INVERT_TX) {
             gpio_set_outover(self->tx, GPIO_OVERRIDE_INVERT);
         }
+
+        // Allocate the RX/TX buffers.
+        ringbuf_alloc(&(self->read_buffer), rxbuf_len + 1);
+        MP_STATE_PORT(rp2_uart_rx_buffer[uart_id]) = self->read_buffer.buf;
+
+        ringbuf_alloc(&(self->write_buffer), txbuf_len + 1);
+        MP_STATE_PORT(rp2_uart_tx_buffer[uart_id]) = self->write_buffer.buf;
+
+        // Set the irq handler.
+        if (self->uart_id == 0) {
+            irq_set_exclusive_handler(UART0_IRQ, uart0_irq_handler);
+            irq_set_enabled(UART0_IRQ, true);
+        } else {
+            irq_set_exclusive_handler(UART1_IRQ, uart1_irq_handler);
+            irq_set_enabled(UART1_IRQ, true);
+        }
+
+        // Enable the uart irq; this macro sets the rx irq level to 4.
+        uart_set_irq_enables(self->uart, true, true);
     }
 
     return MP_OBJ_FROM_PTR(self);
@@ -199,7 +303,11 @@ STATIC mp_obj_t machine_uart_make_new(const mp_obj_type_t *type, size_t n_args,
 
 STATIC mp_obj_t machine_uart_any(mp_obj_t self_in) {
     machine_uart_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    return MP_OBJ_NEW_SMALL_INT(uart_is_readable(self->uart));
+    // get all bytes from the fifo first
+    self->read_lock = true;
+    uart_drain_rx_fifo(self);
+    self->read_lock = false;
+    return MP_OBJ_NEW_SMALL_INT(ringbuf_avail(&self->read_buffer));
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_uart_any_obj, machine_uart_any);
 
@@ -236,7 +344,7 @@ STATIC mp_uint_t machine_uart_read(mp_obj_t self_in, void *buf_in, mp_uint_t siz
 
     for (size_t i = 0; i < size; i++) {
         // Wait for the first/next character
-        while (!uart_is_readable(self->uart)) {
+        while (ringbuf_avail(&self->read_buffer) == 0) {
             if (time_us_64() > t) {  // timed out
                 if (i <= 0) {
                     *errcode = MP_EAGAIN;
@@ -246,8 +354,12 @@ STATIC mp_uint_t machine_uart_read(mp_obj_t self_in, void *buf_in, mp_uint_t siz
                 }
             }
             MICROPY_EVENT_POLL_HOOK
+            // Force a few incoming bytes to the buffer
+            self->read_lock = true;
+            uart_drain_rx_fifo(self);
+            self->read_lock = false;
         }
-        *dest++ = uart_get_hw(self->uart)->dr;
+        *dest++ = ringbuf_get(&(self->read_buffer));
         t = time_us_64() + timeout_char_us;
     }
     return size;
@@ -258,10 +370,23 @@ STATIC mp_uint_t machine_uart_write(mp_obj_t self_in, const void *buf_in, mp_uin
     uint64_t t = time_us_64() + (uint64_t)self->timeout * 1000;
     uint64_t timeout_char_us = (uint64_t)self->timeout_char * 1000;
     const uint8_t *src = buf_in;
+    size_t i = 0;
 
-    for (size_t i = 0; i < size; i++) {
-        // wait for the first/next character
-        while (!uart_is_writable(self->uart)) {
+    // Put as many bytes as possible into the transmit buffer.
+    while (i < size && ringbuf_free(&(self->write_buffer)) > 0) {
+        ringbuf_put(&(self->write_buffer), *src++);
+        ++i;
+    }
+
+    // Kickstart the UART transmit.
+    self->write_lock = true;
+    uart_fill_tx_fifo(self);
+    self->write_lock = false;
+
+    // Send the next characters while busy waiting.
+    while (i < size) {
+        // Wait for the first/next character to be sent.
+        while (ringbuf_free(&(self->write_buffer)) == 0) {
             if (time_us_64() > t) {  // timed out
                 if (i <= 0) {
                     *errcode = MP_EAGAIN;
@@ -272,9 +397,15 @@ STATIC mp_uint_t machine_uart_write(mp_obj_t self_in, const void *buf_in, mp_uin
             }
             MICROPY_EVENT_POLL_HOOK
         }
-        uart_get_hw(self->uart)->dr = *src++;
+        ringbuf_put(&(self->write_buffer), *src++);
+        ++i;
         t = time_us_64() + timeout_char_us;
+        self->write_lock = true;
+        uart_fill_tx_fifo(self);
+        self->write_lock = false;
     }
+
+    // Just in case the fifo was drained during refill of the ringbuf.
     return size;
 }
 
@@ -284,10 +415,10 @@ STATIC mp_uint_t machine_uart_ioctl(mp_obj_t self_in, mp_uint_t request, mp_uint
     if (request == MP_STREAM_POLL) {
         uintptr_t flags = arg;
         ret = 0;
-        if ((flags & MP_STREAM_POLL_RD) && uart_is_readable(self->uart)) {
+        if ((flags & MP_STREAM_POLL_RD) && ringbuf_avail(&self->read_buffer) > 0) {
             ret |= MP_STREAM_POLL_RD;
         }
-        if ((flags & MP_STREAM_POLL_WR) && uart_is_writable(self->uart)) {
+        if ((flags & MP_STREAM_POLL_WR) && ringbuf_free(&self->write_buffer) > 0) {
             ret |= MP_STREAM_POLL_WR;
         }
     } else {
diff --git a/ports/rp2/mpconfigport.h b/ports/rp2/mpconfigport.h
index 13db589ec0e3e..6c82d18620ea7 100644
--- a/ports/rp2/mpconfigport.h
+++ b/ports/rp2/mpconfigport.h
@@ -174,6 +174,8 @@ extern const struct _mp_obj_module_t mp_module_utime;
     void *machine_pin_irq_obj[30]; \
     void *rp2_pio_irq_obj[2]; \
     void *rp2_state_machine_irq_obj[8]; \
+    void *rp2_uart_rx_buffer[2]; \
+    void *rp2_uart_tx_buffer[2]; \
 
 #define MP_STATE_PORT MP_STATE_VM
 

From 7ca686684ea5bffb45764bc3782f54133855a3c9 Mon Sep 17 00:00:00 2001
From: jahr <jahr@atlas.cz>
Date: Mon, 5 Apr 2021 22:57:18 +0200
Subject: [PATCH 0729/3533] rp2: Add support for building different board
 configurations.

This change allows to build firmware for different rp2-based boards,
following how it is done in other ports like stm32 and esp32.  So far only
the original Pico and Adafruit Feather RP2040 are added.  Board names
should match (sans case) those in pico-sdk/src/boards/include/boards/.

Usage: Pico firmware can be build either using make as previously (it is
the default board) or by `make BOARD=PICO`.  Feather is built by `make
BOARD=ADAFRUIT_FEATHER_RP2040`.  Only the board name and flash drive size
is set, pin definition is taken from the appropriate pico-sdk board
definition.  Firmware is saved in the directory build-BOARD_NAME.
---
 ports/rp2/CMakeLists.txt                      | 25 +++++++++++++++++++
 ports/rp2/Makefile                            |  6 +++--
 .../mpconfigboard.cmake                       |  1 +
 .../ADAFRUIT_FEATHER_RP2040/mpconfigboard.h   |  3 +++
 ports/rp2/boards/PICO/mpconfigboard.cmake     |  1 +
 ports/rp2/boards/PICO/mpconfigboard.h         |  3 +++
 ports/rp2/mpconfigport.h                      |  3 ++-
 7 files changed, 39 insertions(+), 3 deletions(-)
 create mode 100644 ports/rp2/boards/ADAFRUIT_FEATHER_RP2040/mpconfigboard.cmake
 create mode 100644 ports/rp2/boards/ADAFRUIT_FEATHER_RP2040/mpconfigboard.h
 create mode 100644 ports/rp2/boards/PICO/mpconfigboard.cmake
 create mode 100644 ports/rp2/boards/PICO/mpconfigboard.h

diff --git a/ports/rp2/CMakeLists.txt b/ports/rp2/CMakeLists.txt
index 100a83409002e..bd3eb74384b0d 100644
--- a/ports/rp2/CMakeLists.txt
+++ b/ports/rp2/CMakeLists.txt
@@ -17,6 +17,30 @@ endif()
 # Use the local tinyusb instead of the one in pico-sdk
 set(PICO_TINYUSB_PATH ${MICROPY_DIR}/lib/tinyusb)
 
+# Set the location of this port's directory.
+set(MICROPY_PORT_DIR ${CMAKE_SOURCE_DIR})
+
+# Set the board if it's not already set.
+if(NOT MICROPY_BOARD)
+    set(MICROPY_BOARD PICO)
+endif()
+
+# Set the PICO_BOARD if it's not already set.
+if(NOT PICO_BOARD)
+    string(TOLOWER ${MICROPY_BOARD} PICO_BOARD)
+endif()
+
+# Set the board directory and check that it exists.
+if(NOT MICROPY_BOARD_DIR)
+    set(MICROPY_BOARD_DIR ${MICROPY_PORT_DIR}/boards/${MICROPY_BOARD})
+endif()
+if(NOT EXISTS ${MICROPY_BOARD_DIR}/mpconfigboard.cmake)
+    message(FATAL_ERROR "Invalid MICROPY_BOARD specified: ${MICROPY_BOARD}")
+endif()
+
+# Include board config
+include(${MICROPY_BOARD_DIR}/mpconfigboard.cmake) 
+
 # Include component cmake fragments
 include(${MICROPY_DIR}/py/py.cmake)
 include(${MICROPY_DIR}/extmod/extmod.cmake)
@@ -150,6 +174,7 @@ target_link_libraries(${MICROPY_TARGET} usermod)
 target_include_directories(${MICROPY_TARGET} PRIVATE
     ${MICROPY_INC_CORE}
     ${MICROPY_INC_USERMOD}
+    ${MICROPY_BOARD_DIR}
     "${PROJECT_SOURCE_DIR}"
     "${CMAKE_BINARY_DIR}"
 )
diff --git a/ports/rp2/Makefile b/ports/rp2/Makefile
index 3358c4ccae66e..246f29dd0913e 100644
--- a/ports/rp2/Makefile
+++ b/ports/rp2/Makefile
@@ -2,11 +2,13 @@
 #
 # This is a simple wrapper around cmake
 
-BUILD = build
+BOARD ?= PICO
+ 
+BUILD ?= build-$(BOARD)
 
 $(VERBOSE)MAKESILENT = -s
 
-CMAKE_ARGS =
+CMAKE_ARGS = -DMICROPY_BOARD=$(BOARD)
 
 ifdef USER_C_MODULES
 CMAKE_ARGS += -DUSER_C_MODULES=${USER_C_MODULES}
diff --git a/ports/rp2/boards/ADAFRUIT_FEATHER_RP2040/mpconfigboard.cmake b/ports/rp2/boards/ADAFRUIT_FEATHER_RP2040/mpconfigboard.cmake
new file mode 100644
index 0000000000000..877efa6aba88c
--- /dev/null
+++ b/ports/rp2/boards/ADAFRUIT_FEATHER_RP2040/mpconfigboard.cmake
@@ -0,0 +1 @@
+# cmake file for Adafruit Feather RP2040
diff --git a/ports/rp2/boards/ADAFRUIT_FEATHER_RP2040/mpconfigboard.h b/ports/rp2/boards/ADAFRUIT_FEATHER_RP2040/mpconfigboard.h
new file mode 100644
index 0000000000000..5068d35541a51
--- /dev/null
+++ b/ports/rp2/boards/ADAFRUIT_FEATHER_RP2040/mpconfigboard.h
@@ -0,0 +1,3 @@
+// Board and hardware specific configuration
+#define MICROPY_HW_BOARD_NAME                   "Adafruit Feather RP2040"
+#define MICROPY_HW_FLASH_STORAGE_BYTES          (3072 * 1024)
diff --git a/ports/rp2/boards/PICO/mpconfigboard.cmake b/ports/rp2/boards/PICO/mpconfigboard.cmake
new file mode 100644
index 0000000000000..3a40ca2871c6b
--- /dev/null
+++ b/ports/rp2/boards/PICO/mpconfigboard.cmake
@@ -0,0 +1 @@
+# cmake file for Raspberry Pi Pico
diff --git a/ports/rp2/boards/PICO/mpconfigboard.h b/ports/rp2/boards/PICO/mpconfigboard.h
new file mode 100644
index 0000000000000..e6623374d0b44
--- /dev/null
+++ b/ports/rp2/boards/PICO/mpconfigboard.h
@@ -0,0 +1,3 @@
+// Board and hardware specific configuration
+#define MICROPY_HW_BOARD_NAME                   "Raspberry Pi Pico"
+#define MICROPY_HW_FLASH_STORAGE_BYTES          (1408 * 1024) 
diff --git a/ports/rp2/mpconfigport.h b/ports/rp2/mpconfigport.h
index 6c82d18620ea7..218cd72752628 100644
--- a/ports/rp2/mpconfigport.h
+++ b/ports/rp2/mpconfigport.h
@@ -31,8 +31,9 @@
 #include "hardware/sync.h"
 #include "pico/binary_info.h"
 
+#include "mpconfigboard.h"
+
 // Board and hardware specific configuration
-#define MICROPY_HW_BOARD_NAME                   "Raspberry Pi Pico"
 #define MICROPY_HW_MCU_NAME                     "RP2040"
 #define MICROPY_HW_ENABLE_UART_REPL             (0) // useful if there is no USB
 #define MICROPY_HW_ENABLE_USBDEV                (1)

From dd62c52a36e224cd0518d0361cc66a2f7e957f93 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 12 Apr 2021 16:21:54 +1000
Subject: [PATCH 0730/3533] stm32/rfcore: Fix race condition with C2 accessing
 free buffer list.

Prior to this commit, if C2 was busy (eg lots of BLE activity) then it may
not have had time to respond to the notification on the IPCC_CH_MM channel
by the time additional memory was available to put on that buffer.  In such
a case C1 would modify the free buffer list while C2 was potentially
accessing it, and this would eventually lead to lost memory buffers (or a
corrupt linked list).  If all buffers become lost then ACL packets
(asynchronous events) can no longer be delivered from C2 to C1.

This commit fixes this issue by waiting for C2 to indicate that it has
finished using the free buffer list.

Work done in collaboration with Jim Mussared aka @jimmo.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/rfcore.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/ports/stm32/rfcore.c b/ports/stm32/rfcore.c
index 55fc229dd0c30..878d5e1f8558c 100644
--- a/ports/stm32/rfcore.c
+++ b/ports/stm32/rfcore.c
@@ -417,6 +417,12 @@ STATIC void tl_process_msg(volatile tl_list_node_t *head, unsigned int ch, parse
 
         // If this node is allocated from the memmgr event pool, then place it into the free buffer.
         if ((uint8_t *)cur >= ipcc_membuf_memmgr_evt_pool && (uint8_t *)cur < ipcc_membuf_memmgr_evt_pool + sizeof(ipcc_membuf_memmgr_evt_pool)) {
+            // Wait for C2 to indicate that it has finished using the free buffer,
+            // so that we can link the newly-freed memory in to this buffer.
+            // If waiting is needed then it is typically between 5 and 20 microseconds.
+            while (LL_C1_IPCC_IsActiveFlag_CHx(IPCC, IPCC_CH_MM)) {
+            }
+
             // Place memory back in free pool.
             tl_list_append(&ipcc_mem_memmgr_free_buf_queue, cur);
             added_to_free_queue = true;

From 2668337f36deef7fdd97f35e2efc68a5d2102192 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 12 Apr 2021 16:30:53 +1000
Subject: [PATCH 0731/3533] stm32/rfcore: Intercept addr-resolution HCI cmd to
 work around BLE bug.

The STM32WB has a problem when address resolution is enabled: under certain
conditions the MCU can get into a state where it draws an additional 10mA
or so and eventually ends up with a broken BLE RX path in the silicon.  A
simple way to reproduce this is to enable address resolution (which is the
default for NimBLE) and start the device advertising.  If there is enough
BLE activity in the vicinity then the device will at some point enter the
bad state and, if left long enough, will have permanent BLE RX damage.

STMicroelectronics are aware of this issue.  The only known workaround at
this stage is to not enable address resolution, which is implemented by
this commit.

Work done in collaboration with Jim Mussared aka @jimmo.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/rfcore.c | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/ports/stm32/rfcore.c b/ports/stm32/rfcore.c
index 878d5e1f8558c..049f6bdc10c34 100644
--- a/ports/stm32/rfcore.c
+++ b/ports/stm32/rfcore.c
@@ -610,6 +610,24 @@ void rfcore_ble_hci_cmd(size_t len, const uint8_t *src) {
     tl_list_node_t *n;
     uint32_t ch;
     if (src[0] == HCI_KIND_BT_CMD) {
+        // The STM32WB has a problem when address resolution is enabled: under certain
+        // conditions the MCU can get into a state where it draws an additional 10mA
+        // or so and eventually ends up with a broken BLE RX path in the silicon.  A
+        // simple way to reproduce this is to enable address resolution (which is the
+        // default for NimBLE) and start the device advertising.  If there is enough
+        // BLE activity in the vicinity then the device will at some point enter the
+        // bad state and, if left long enough, will have permanent BLE RX damage.
+        //
+        // STMicroelectronics are aware of this issue.  The only known workaround at
+        // this stage is to not enable address resolution.  We do that here by
+        // intercepting any command that enables address resolution and convert it
+        // into a command that disables address resolution.
+        //
+        // OGF=0x08 OCF=0x002d HCI_LE_Set_Address_Resolution_Enable
+        if (len == 5 && memcmp(src + 1, "\x2d\x20\x01\x01", 4) == 0) {
+            src = (const uint8_t *)"\x01\x2d\x20\x01\x00";
+        }
+
         n = (tl_list_node_t *)&ipcc_membuf_ble_cmd_buf[0];
         ch = IPCC_CH_BLE;
     } else if (src[0] == HCI_KIND_BT_ACL) {

From b26def0644b7f4c01cf616a24b6fe18f0737ebb6 Mon Sep 17 00:00:00 2001
From: matejcik <ja@matejcik.cz>
Date: Fri, 9 Apr 2021 15:28:14 +0200
Subject: [PATCH 0732/3533] py/profile: Resolve name collision with STATIC
 unset.

When building with STATIC undefined (e.g., -DSTATIC=), there are two
instances of mp_type_code that collide at link time: in profile.c and in
builtinevex.c.  This patch resolves the collision by renaming one of them.
---
 py/profile.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/py/profile.c b/py/profile.c
index 863b0068a03e5..9cf8c4b7ba69f 100644
--- a/py/profile.c
+++ b/py/profile.c
@@ -172,7 +172,7 @@ STATIC void code_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
     }
 }
 
-const mp_obj_type_t mp_type_code = {
+const mp_obj_type_t mp_type_settrace_codeobj = {
     { &mp_type_type },
     .name = MP_QSTR_code,
     .print = code_print,
@@ -185,7 +185,7 @@ mp_obj_t mp_obj_new_code(const mp_raw_code_t *rc) {
     if (o == NULL) {
         return MP_OBJ_NULL;
     }
-    o->base.type = &mp_type_code;
+    o->base.type = &mp_type_settrace_codeobj;
     o->rc = rc;
     o->dict_locals = mp_locals_get(); // this is a wrong! how to do this properly?
     o->lnotab = MP_OBJ_NULL;

From 1a2ffda175bb5842617841362b2df40d7cfa97dd Mon Sep 17 00:00:00 2001
From: matejcik <ja@matejcik.cz>
Date: Mon, 22 Mar 2021 11:20:22 +0100
Subject: [PATCH 0733/3533] py/runtime: Make sys.modules preallocate to a
 configurable size.

This allows configuring the pre-allocated size of sys.modules dict, in
order to prevent unwanted reallocations at run-time (3 sys-modules is
really not quite enough for a larger project).
---
 py/mpconfig.h | 5 +++++
 py/runtime.c  | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/py/mpconfig.h b/py/mpconfig.h
index 454fc12b7cacd..b26fa2137a0b4 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -229,6 +229,11 @@
 #define MICROPY_MODULE_DICT_SIZE (1)
 #endif
 
+// Initial size of sys.modules dict
+#ifndef MICROPY_LOADED_MODULES_DICT_SIZE
+#define MICROPY_LOADED_MODULES_DICT_SIZE (3)
+#endif
+
 // Whether realloc/free should be passed allocated memory region size
 // You must enable this if MICROPY_MEM_STATS is enabled
 #ifndef MICROPY_MALLOC_USES_ALLOCATED_SIZE
diff --git a/py/runtime.c b/py/runtime.c
index 5d476a2764df3..0ce6854732822 100644
--- a/py/runtime.c
+++ b/py/runtime.c
@@ -91,7 +91,7 @@ void mp_init(void) {
     #endif
 
     // init global module dict
-    mp_obj_dict_init(&MP_STATE_VM(mp_loaded_modules_dict), 3);
+    mp_obj_dict_init(&MP_STATE_VM(mp_loaded_modules_dict), MICROPY_LOADED_MODULES_DICT_SIZE);
 
     // initialise the __main__ module
     mp_obj_dict_init(&MP_STATE_VM(dict_main), 1);

From 25c029ce9fb0c2c313bfbf933e17648c98a33afc Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 13 Apr 2021 23:22:08 +1000
Subject: [PATCH 0734/3533] stm32/boards: Split UARTx_RTS_DE into
 UARTx_RTS/UARTx_DE in pin defs.

So these alternate functions can be parsed by the build scripts and used in
application code.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/boards/stm32l072_af.csv | 24 ++++++++++++------------
 ports/stm32/boards/stm32l452_af.csv |  2 +-
 ports/stm32/boards/stm32l476_af.csv |  2 +-
 ports/stm32/boards/stm32wb55_af.csv |  6 +++---
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/ports/stm32/boards/stm32l072_af.csv b/ports/stm32/boards/stm32l072_af.csv
index 0b1115b164a90..c9155bd444976 100644
--- a/ports/stm32/boards/stm32l072_af.csv
+++ b/ports/stm32/boards/stm32l072_af.csv
@@ -1,7 +1,7 @@
 Port,Pin,AF0,AF1,AF2,AF3,AF4,AF5,AF6,AF7,,
 ,,SPI1/SPI2/I2S2/USART1/2/LPUART1/USB/LPTIM1/TSC/TIM2/21/22/EVENTOUT/SYS_AF,SPI1/SPI2/I2S2/I2C1/TIM2/21,SPI1/SPI2/I2S2/LPUART1/USART5/USB/LPTIM1/TIM2/3/EVENTOUT/SYS_AF,I2C1/TSC/EVENTOUT,I2C1/USART1/2/LPUART1/TIM3/22/EVENTOUT,SPI2/I2S2/I2C2/USART1/TIM2/21/22,I2C1/2/LPUART1/USART4/UASRT5/TIM21/EVENTOUT,I2C3/LPUART1/COMP1/2/TIM3,,ADC
 PortA,PA0,,,TIM2_CH1,TSC_G1_IO1,USART2_CTS,TIM2_ETR,USART4_TX,COMP1_OUT,,ADC_IN0
-PortA,PA1,EVENTOUT,,TIM2_CH2,TSC_G1_IO2,USART2_RTS_DE,TIM21_ETR,USART4_RX,,,ADC_IN1
+PortA,PA1,EVENTOUT,,TIM2_CH2,TSC_G1_IO2,USART2_RTS/USART2_DE,TIM21_ETR,USART4_RX,,,ADC_IN1
 PortA,PA2,TIM21_CH1,,TIM2_CH3,TSC_G1_IO3,USART2_TX,,LPUART1_TX,COMP2_OUT,,ADC_IN2
 PortA,PA3,TIM21_CH2,,TIM2_CH4,TSC_G1_IO4,USART2_RX,,LPUART1_RX,,,ADC_IN3
 PortA,PA4,SPI1_NSS,,,TSC_G2_IO1,USART2_CK,TIM22_ETR,,,,ADC_IN4
@@ -12,25 +12,25 @@ PortA,PA8,MCO,,USB_CRS_SYNC,EVENTOUT,USART1_CK,,,I2C3_SCL,,
 PortA,PA9,MCO,,,TSC_G4_IO1,USART1_TX,,I2C1_SCL,I2C3_SMBA,,
 PortA,PA10,,,,TSC_G4_IO2,USART1_RX,,I2C1_SDA,,,
 PortA,PA11,SPI1_MISO,,EVENTOUT,TSC_G4_IO3,USART1_CTS,,,COMP1_OUT,,
-PortA,PA12,SPI1_MOSI,,EVENTOUT,TSC_G4_IO4,USART1_RTS_DE,,,COMP2_OUT,,
+PortA,PA12,SPI1_MOSI,,EVENTOUT,TSC_G4_IO4,USART1_RTS/USART1_DE,,,COMP2_OUT,,
 PortA,PA13,SWDIO,,USB_NOE,,,,LPUART1_RX,,,
 PortA,PA14,SWCLK,,,,USART2_TX,,LPUART1_TX,,,
-PortA,PA15,SPI1_NSS,,TIM2_ETR,EVENTOUT,USART2_RX,TIM2_CH1,USART4_RTS_DE,,,
+PortA,PA15,SPI1_NSS,,TIM2_ETR,EVENTOUT,USART2_RX,TIM2_CH1,USART4_RTS/USART4_DE,,,
 PortB,PB0,EVENTOUT,,TIM3_CH3,TSC_G3_IO2,,,,,,ADC_IN8
-PortB,PB1,,,TIM3_CH4,TSC_G3_IO3,LPUART1_RTS_DE,,,,,ADC_IN9
+PortB,PB1,,,TIM3_CH4,TSC_G3_IO3,LPUART1_RTS/LPUART1_DE,,,,,ADC_IN9
 PortB,PB2,,,LPTIM1_OUT,TSC_G3_IO4,,,,I2C3_SMBA,,
-PortB,PB3,SPI1_SCK,,TIM2_CH2,TSC_G5_IO1,EVENTOUT,USART1_RTS_DE,USART5_TX,,,
+PortB,PB3,SPI1_SCK,,TIM2_CH2,TSC_G5_IO1,EVENTOUT,USART1_RTS/USART1_DE,USART5_TX,,,
 PortB,PB4,SPI1_MISO,,TIM3_CH1,TSC_G5_IO2,TIM22_CH1,USART1_CTS,USART5_RX,I2C3_SDA,,
-PortB,PB5,SPI1_MOSI,,LPTIM1_IN1,I2C1_SMBA,TIM3_CH2/TIM22_CH2,USART1_CK,USART5_CK/USART5_RTS_DE,,,
+PortB,PB5,SPI1_MOSI,,LPTIM1_IN1,I2C1_SMBA,TIM3_CH2/TIM22_CH2,USART1_CK,USART5_CK/USART5_RTS/USART5_DE,,,
 PortB,PB6,USART1_TX,I2C1_SCL,LPTIM1_ETR,TSC_G5_IO3,,,,,,
 PortB,PB7,USART1_RX,I2C1_SDA,LPTIM1_IN2,TSC_G5_IO4,,,USART4_CTS,,,
 PortB,PB8,,,,TSC_SYNC,I2C1_SCL,,,,,
 PortB,PB9,,,EVENTOUT,,I2C1_SDA,SPI2_NSS/I2S2_WS,,,,
 PortB,PB10,,,TIM2_CH3,TSC_SYNC,LPUART1_TX,SPI2_SCK,I2C2_SCL,LPUART1_RX,,
 PortB,PB11,EVENTOUT,,TIM2_CH4,TSC_G6_IO1,LPUART1_RX,,I2C2_SDA,LPUART1_TX,,
-PortB,PB12,SPI2_NSS/I2S2_WS,,LPUART1_RTS_DE,TSC_G6_IO2,I2C2_SMBA,,EVENTOUT,,,
+PortB,PB12,SPI2_NSS/I2S2_WS,,LPUART1_RTS/LPUART1_DE,TSC_G6_IO2,I2C2_SMBA,,EVENTOUT,,,
 PortB,PB13,SPI2_SCK/I2S2_CK,,MCO,TSC_G6_IO3,LPUART1_CTS,I2C2_SCL,TIM21_CH1,,,
-PortB,PB14,SPI2_MISO/I2S2_MCK,,RTC_OUT,TSC_G6_IO4,LPUART1_RTS_DE,I2C2_SDA,TIM21_CH2,,,
+PortB,PB14,SPI2_MISO/I2S2_MCK,,RTC_OUT,TSC_G6_IO4,LPUART1_RTS/LPUART1_DE,I2C2_SDA,TIM21_CH2,,,
 PortB,PB15,SPI2_MOSI/I2S2_SD,,RTC_REFIN,,,,,,,
 PortC,PC0,LPTIM1_IN1,,EVENTOUT,TSC_G7_IO1,,,LPUART1_RX,I2C3_SCL,,ADC_IN10
 PortC,PC1,LPTIM1_OUT,,EVENTOUT,TSC_G7_IO2,,,LPUART1_TX,I2C3_SDA,,ADC_IN11
@@ -50,9 +50,9 @@ PortC,PC14,,,,,,,,,,
 PortC,PC15,,,,,,,,,,
 PortD,PD0,TIM21_CH1,SPI2_NSS/I2S2_WS,,,,,,,,
 PortD,PD1,,SPI2_SCK/I2S2_CK,,,,,,,,
-PortD,PD2,LPUART1_RTS_DE,,TIM3_ETR,,,,USART5_RX,,,
+PortD,PD2,LPUART1_RTS/LPUART1_DE,,TIM3_ETR,,,,USART5_RX,,,
 PortD,PD3,USART2_CTS,,SPI2_MISO/I2S2_MCK,,,,,,,
-PortD,PD4,USART2_RTS_DE,SPI2_MOSI/I2S2_SD,,,,,,,,
+PortD,PD4,USART2_RTS/USART2_DE,SPI2_MOSI/I2S2_SD,,,,,,,,
 PortD,PD5,USART2_TX,,,,,,,,,
 PortD,PD6,USART2_RX,,,,,,,,,
 PortD,PD7,USART2_CK,TIM21_CH2,,,,,,,,
@@ -60,7 +60,7 @@ PortD,PD8,LPUART1_TX,,,,,,,,,
 PortD,PD9,LPUART1_RX,,,,,,,,,
 PortD,PD10,,,,,,,,,,
 PortD,PD11,LPUART1_CTS,,,,,,,,,
-PortD,PD12,LPUART1_RTS_DE,,,,,,,,,
+PortD,PD12,LPUART1_RTS/LPUART1_DE,,,,,,,,,
 PortD,PD13,,,,,,,,,,
 PortD,PD14,,,,,,,,,,
 PortD,PD15,USB_CRS_SYNC,,,,,,,,,
@@ -71,7 +71,7 @@ PortE,PE3,TIM22_CH1,,TIM3_CH1,,,,,,,
 PortE,PE4,TIM22_CH2,,TIM3_CH2,,,,,,,
 PortE,PE5,TIM21_CH1,,TIM3_CH3,,,,,,,
 PortE,PE6,TIM21_CH2,,TIM3_CH4,,,,,,,
-PortE,PE7,,,,,,,USART5_CK/USART5_RTS_DE,,,
+PortE,PE7,,,,,,,USART5_CK/USART5_RTS/USART5_DE,,,
 PortE,PE8,,,,,,,USART4_TX,,,
 PortE,PE9,TIM2_CH1,,TIM2_ETR,,,,USART4_RX,,,
 PortE,PE10,TIM2_CH2,,,,,,USART5_TX,,,
diff --git a/ports/stm32/boards/stm32l452_af.csv b/ports/stm32/boards/stm32l452_af.csv
index f7170d1c65db5..1de5c211d2128 100644
--- a/ports/stm32/boards/stm32l452_af.csv
+++ b/ports/stm32/boards/stm32l452_af.csv
@@ -30,7 +30,7 @@ PortB,PB10,,TIM2_CH3,,I2C4_SCL,I2C2_SCL,SPI2_SCK,,USART3_TX,LPUART1_RX,TSC_SYNC,
 PortB,PB11,,TIM2_CH4,,I2C4_SDA,I2C2_SDA,,,USART3_RX,LPUART1_TX,,QUADSPI_NCS,,COMP2_OUT,,,EVENTOUT,,,
 PortB,PB12,,TIM1_BKIN,,TIM1_BKIN_COMP2,I2C2_SMBA,SPI2_NSS,DFSDM_DATIN1,USART3_CK,LPUART1_RTS/LPUART1_DE,TSC_G1_IO1,CAN1_RX,,,SAI1_FS_A,TIM15_BKIN,EVENTOUT,,,
 PortB,PB13,,TIM1_CH1N,,,I2C2_SCL,SPI2_SCK,DFSDM_CKIN1,USART3_CTS,LPUART1_CTS,TSC_G1_IO2,CAN1_TX,,,SAI1_SCK_A,TIM15_CH1N,EVENTOUT,,,
-PortB,PB14,,TIM1_CH2N,,,I2C2_SDA,SPI2_MISO,DFSDM_DATIN2,USART3_RTS_DE,,TSC_G1_IO3,,,,SAI1_MCLK_A,TIM15_CH1,EVENTOUT,,,
+PortB,PB14,,TIM1_CH2N,,,I2C2_SDA,SPI2_MISO,DFSDM_DATIN2,USART3_RTS/USART3_DE,,TSC_G1_IO3,,,,SAI1_MCLK_A,TIM15_CH1,EVENTOUT,,,
 PortB,PB15,RTC_REFIN,TIM1_CH3N,,,,SPI2_MOSI,DFSDM_CKIN2,,,TSC_G1_IO4,,,,SAI1_SD_A,TIM15_CH2,EVENTOUT,,,
 PortC,PC0,,LPTIM1_IN1,I2C4_SCL,,I2C3_SCL,,,,LPUART1_RX,,,,,,LPTIM2_IN1,EVENTOUT,ADC123_IN1,,
 PortC,PC1,TRACED0,LPTIM1_OUT,I2C4_SDA,,I2C3_SDA,,,,LPUART1_TX,,,,,,,EVENTOUT,ADC123_IN2,,
diff --git a/ports/stm32/boards/stm32l476_af.csv b/ports/stm32/boards/stm32l476_af.csv
index 01db895725def..df824ed7080fc 100644
--- a/ports/stm32/boards/stm32l476_af.csv
+++ b/ports/stm32/boards/stm32l476_af.csv
@@ -30,7 +30,7 @@ PortB,PB10,,TIM2_CH3,,,I2C2_SCL,SPI2_SCK,DFSDM_DATIN7,USART3_TX,LPUART1_RX,,QUAD
 PortB,PB11,,TIM2_CH4,,,I2C2_SDA,,DFSDM_CKIN7,USART3_RX,LPUART1_TX,,QUADSPI_NCS,LCD_SEG11,COMP2_OUT,,,EVENTOUT,,
 PortB,PB12,,TIM1_BKIN,,TIM1_BKIN_COMP2,I2C2_SMBA,SPI2_NSS,DFSDM_DATIN1,USART3_CK,LPUART1_RTS/LPUART1_DE,TSC_G1_IO1,,LCD_SEG12,SWPMI1_IO,SAI2_FS_A,TIM15_BKIN,EVENTOUT,,
 PortB,PB13,,TIM1_CH1N,,,I2C2_SCL,SPI2_SCK,DFSDM_CKIN1,USART3_CTS,LPUART1_CTS,TSC_G1_IO2,,LCD_SEG13,SWPMI1_TX,SAI2_SCK_A,TIM15_CH1N,EVENTOUT,,
-PortB,PB14,,TIM1_CH2N,,TIM8_CH2N,I2C2_SDA,SPI2_MISO,DFSDM_DATIN2,USART3_RTS_DE,,TSC_G1_IO3,,LCD_SEG14,SWPMI1_RX,SAI2_MCLK_A,TIM15_CH1,EVENTOUT,,
+PortB,PB14,,TIM1_CH2N,,TIM8_CH2N,I2C2_SDA,SPI2_MISO,DFSDM_DATIN2,USART3_RTS/USART3_DE,,TSC_G1_IO3,,LCD_SEG14,SWPMI1_RX,SAI2_MCLK_A,TIM15_CH1,EVENTOUT,,
 PortB,PB15,RTC_REFIN,TIM1_CH3N,,TIM8_CH3N,,SPI2_MOSI,DFSDM_CKIN2,,,TSC_G1_IO4,,LCD_SEG15,SWPMI1_SUSPEND,SAI2_SD_A,TIM15_CH2,EVENTOUT,,
 PortC,PC0,,LPTIM1_IN1,,,I2C3_SCL,,DFSDM_DATIN4,,LPUART1_RX,,,LCD_SEG18,,,LPTIM2_IN1,EVENTOUT,ADC123_IN1,
 PortC,PC1,,LPTIM1_OUT,,,I2C3_SDA,,DFSDM_CKIN4,,LPUART1_TX,,,LCD_SEG19,,,,EVENTOUT,ADC123_IN2,
diff --git a/ports/stm32/boards/stm32wb55_af.csv b/ports/stm32/boards/stm32wb55_af.csv
index 074c33089261d..d6e1c3f77334c 100644
--- a/ports/stm32/boards/stm32wb55_af.csv
+++ b/ports/stm32/boards/stm32wb55_af.csv
@@ -12,14 +12,14 @@ PortA,PA8,MCO,TIM1_CH1,,SAI1_PDM_CK2,,,,USART1_CK,,,,LCD_COM0,,SAI1_SCK_A,LPTIM2
 PortA,PA9,,TIM1_CH2,,SAI1_PDM_DI2,I2C1_SCL,SPI2_SCK,,USART1_TX,,,,LCD_COM1,,SAI1_FS_A,,EVENTOUT,ADC1_IN16
 PortA,PA10,,TIM1_CH3,,SAI1_PDM_DI1,I2C1_SDA,,,USART1_RX,,,USB_CRS_SYNC,LCD_COM2,,SAI1_SD_A,TIM17_BKIN,EVENTOUT,
 PortA,PA11,,TIM1_CH4,TIM1_BKIN2,,,SPI1_MISO,,USART1_CTS,,,USB_DM,,TIM1_BKIN2,,,EVENTOUT,
-PortA,PA12,,TIM1_ETR,,,,SPI1_MOSI,,USART1_RTS_DE,LPUART1_RX,,USB_DP,,,,,EVENTOUT,
+PortA,PA12,,TIM1_ETR,,,,SPI1_MOSI,,USART1_RTS/USART1_DE,LPUART1_RX,,USB_DP,,,,,EVENTOUT,
 PortA,PA13,JTMS/SWDIO,,,,,,,,IR_OUT,,USB_NOE,,,SAI1_SD_B,,EVENTOUT,
 PortA,PA14,JTCK/SWCLK,LPTIM1_OUT,,,I2C1_SMBA,,,,,,,LCD_SEG5,,SAI1_FS_B,,EVENTOUT,
 PortA,PA15,JTDI,TIM2_CH1,TIM2_ETR,,,SPI1_NSS,,,,TSC_G3_IO1,,LCD_SEG17,,,,EVENTOUT,
 PortB,PB0,,,,,,,EXT_PA_TX,,,,,,COMP1_OUT,,,EVENTOUT,
-PortB,PB1,,,,,,,,,LPUART1_RTS_DE,,,,,,LPTIM2_IN1,EVENTOUT,
+PortB,PB1,,,,,,,,,LPUART1_RTS/LPUART1_DE,,,,,,LPTIM2_IN1,EVENTOUT,
 PortB,PB2,RTC_OUT,LPTIM1_OUT,,,I2C3_SMBA,SPI1_NSS,,,,,,LCD_VLCD,,SAI1_EXTCLK,,EVENTOUT,
-PortB,PB3,JTDO/TRACESWO,TIM2_CH2,,,,SPI1_SCK,,USART1_RTS_DE,,,,LCD_SEG7,,SAI1_SCK_B,,EVENTOUT,
+PortB,PB3,JTDO/TRACESWO,TIM2_CH2,,,,SPI1_SCK,,USART1_RTS/USART1_DE,,,,LCD_SEG7,,SAI1_SCK_B,,EVENTOUT,
 PortB,PB4,NJTRST,,,,I2C3_SDA,SPI1_MISO,,USART1_CTS,,TSC_G2_IO1,,LCD_SEG8,,SAI1_MCLK_B,TIM17_BKIN,EVENTOUT,
 PortB,PB5,,LPTIM1_IN1,,,I2C1_SMBA,SPI1_MOSI,,USART1_CK,LPUART1_TX,TSC_G2_IO2,,LCD_SEG9,COMP2_OUT,SAI1_SD_B,TIM16_BKIN,EVENTOUT,
 PortB,PB6,MCO,LPTIM1_ETR,,,I2C1_SCL,,,USART1_TX,,TSC_G2_IO3,,LCD_SEG6,,SAI1_FS_B,TIM16_CH1N,EVENTOUT,

From 2ac09c2694f89b11544f4abf10413c64eeec2b15 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 13 Apr 2021 23:56:37 +1000
Subject: [PATCH 0735/3533] stm32/uart: Use LL_USART_GetBaudRate to compute
 baudrate.

This function includes the UART prescaler in the calculation (if it has
one, eg on H7 and WB MCUs).

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/uart.c | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/ports/stm32/uart.c b/ports/stm32/uart.c
index d40a883c52b84..36c59cee4ae02 100644
--- a/ports/stm32/uart.c
+++ b/ports/stm32/uart.c
@@ -711,16 +711,11 @@ uint32_t uart_get_source_freq(pyb_uart_obj_t *self) {
 }
 
 uint32_t uart_get_baudrate(pyb_uart_obj_t *self) {
-    // This formula assumes UART_OVERSAMPLING_16
-    uint32_t source_freq = uart_get_source_freq(self);
-    #if defined(LPUART1)
-    if (self->uart_id == PYB_LPUART_1) {
-        return source_freq / (self->uartx->BRR >> 8);
-    } else
-    #endif
-    {
-        return source_freq / self->uartx->BRR;
-    }
+    return LL_USART_GetBaudRate(self->uartx, uart_get_source_freq(self),
+        #if defined(STM32H7) || defined(STM32WB)
+        self->uartx->PRESC,
+        #endif
+        LL_USART_OVERSAMPLING_16);
 }
 
 void uart_set_baudrate(pyb_uart_obj_t *self, uint32_t baudrate) {

From 9c9bfe1968d4260924316353bd1c941fe7e8741d Mon Sep 17 00:00:00 2001
From: Marian Buschsieweke <marian.buschsieweke@ovgu.de>
Date: Tue, 30 Mar 2021 20:08:11 +0200
Subject: [PATCH 0736/3533] unix/main: Make static variable that's potentially
 clobbered by longjmp.

This fixes `error: variable 'subpkg_tried' might be clobbered by 'longjmp'
or 'vfork' [-Werror=clobbered]` when compiling on ppc64le and aarch64 (and
possibly other architectures/toolchains).
---
 ports/unix/main.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/ports/unix/main.c b/ports/unix/main.c
index 129c6d3bb43a1..e33c1742d8301 100644
--- a/ports/unix/main.c
+++ b/ports/unix/main.c
@@ -596,7 +596,12 @@ MP_NOINLINE int main_(int argc, char **argv) {
 
                 mp_obj_t mod;
                 nlr_buf_t nlr;
-                bool subpkg_tried = false;
+
+                // Allocating subpkg_tried on the stack can lead to compiler warnings about this
+                // variable being clobbered when nlr is implemented using setjmp/longjmp.  Its
+                // value must be preserved across calls to setjmp/longjmp.
+                static bool subpkg_tried;
+                subpkg_tried = false;
 
             reimport:
                 if (nlr_push(&nlr) == 0) {

From fc6ea28d00ca733f3ed806cc660f94c606ded4fb Mon Sep 17 00:00:00 2001
From: 8bitgeek <mike@8bitgeek.net>
Date: Mon, 5 Apr 2021 06:55:39 -0400
Subject: [PATCH 0737/3533] stm32/sdram: Make
 MICROPY_HW_FMC_BA1,MICROPY_HW_FMC_A11 optional pins.

This supports SDRAM having only 2 internal banks (using BA0 only), and only
11 (A0-A10) bits of address, such as IS42S16100H (512K x 16bit x 2bank).
---
 ports/stm32/sdram.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ports/stm32/sdram.c b/ports/stm32/sdram.c
index e8892b57463a4..2791df277afa2 100644
--- a/ports/stm32/sdram.c
+++ b/ports/stm32/sdram.c
@@ -73,7 +73,9 @@ bool sdram_init(void) {
     mp_hal_pin_config_alt_static_speed(MICROPY_HW_FMC_SDNRAS, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE, MP_HAL_PIN_SPEED_VERY_HIGH, STATIC_AF_FMC_SDNRAS);
     mp_hal_pin_config_alt_static_speed(MICROPY_HW_FMC_SDNWE, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE, MP_HAL_PIN_SPEED_VERY_HIGH, STATIC_AF_FMC_SDNWE);
     mp_hal_pin_config_alt_static_speed(MICROPY_HW_FMC_BA0, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE, MP_HAL_PIN_SPEED_VERY_HIGH, STATIC_AF_FMC_BA0);
+    #ifdef MICROPY_HW_FMC_BA1
     mp_hal_pin_config_alt_static_speed(MICROPY_HW_FMC_BA1, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE, MP_HAL_PIN_SPEED_VERY_HIGH, STATIC_AF_FMC_BA1);
+    #endif
     mp_hal_pin_config_alt_static_speed(MICROPY_HW_FMC_NBL0, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE, MP_HAL_PIN_SPEED_VERY_HIGH, STATIC_AF_FMC_NBL0);
     mp_hal_pin_config_alt_static_speed(MICROPY_HW_FMC_NBL1, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE, MP_HAL_PIN_SPEED_VERY_HIGH, STATIC_AF_FMC_NBL1);
     #ifdef MICROPY_HW_FMC_NBL2
@@ -91,7 +93,9 @@ bool sdram_init(void) {
     mp_hal_pin_config_alt_static_speed(MICROPY_HW_FMC_A8, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE, MP_HAL_PIN_SPEED_VERY_HIGH, STATIC_AF_FMC_A8);
     mp_hal_pin_config_alt_static_speed(MICROPY_HW_FMC_A9, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE, MP_HAL_PIN_SPEED_VERY_HIGH, STATIC_AF_FMC_A9);
     mp_hal_pin_config_alt_static_speed(MICROPY_HW_FMC_A10, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE, MP_HAL_PIN_SPEED_VERY_HIGH, STATIC_AF_FMC_A10);
+    #ifdef MICROPY_HW_FMC_A11
     mp_hal_pin_config_alt_static_speed(MICROPY_HW_FMC_A11, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE, MP_HAL_PIN_SPEED_VERY_HIGH, STATIC_AF_FMC_A11);
+    #endif
     #ifdef MICROPY_HW_FMC_A12
     mp_hal_pin_config_alt_static_speed(MICROPY_HW_FMC_A12, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE, MP_HAL_PIN_SPEED_VERY_HIGH, STATIC_AF_FMC_A12);
     #endif

From d0e014aa41e32a80a7b591d4de6f2b1ed1298e4d Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 14 Apr 2021 12:55:53 +1000
Subject: [PATCH 0738/3533] mimxrt: Enable CPYTHON_COMPAT, PY_ASYNC_AWAIT,
 PY_ATTRTUPLE options.

This change allows running the tests in tests/basics/ without any failures
(but some tests are still skipped).

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/mimxrt/mpconfigport.h | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/ports/mimxrt/mpconfigport.h b/ports/mimxrt/mpconfigport.h
index 68c7a894221d8..65b91675a5de6 100644
--- a/ports/mimxrt/mpconfigport.h
+++ b/ports/mimxrt/mpconfigport.h
@@ -46,11 +46,9 @@
 #define MICROPY_LONGINT_IMPL                (MICROPY_LONGINT_IMPL_MPZ)
 #define MICROPY_ENABLE_SOURCE_LINE          (1)
 #define MICROPY_ERROR_REPORTING             (MICROPY_ERROR_REPORTING_TERSE)
-#define MICROPY_CPYTHON_COMPAT              (0)
 #define MICROPY_CAN_OVERRIDE_BUILTINS       (1)
 
 // Control over Python builtins
-#define MICROPY_PY_ASYNC_AWAIT              (0)
 #define MICROPY_PY_BUILTINS_STR_COUNT       (0)
 #define MICROPY_PY_BUILTINS_MEMORYVIEW      (1)
 #define MICROPY_PY_BUILTINS_SET             (1)
@@ -63,7 +61,6 @@
 #define MICROPY_PY___FILE__                 (0)
 #define MICROPY_PY_MICROPYTHON_MEM_INFO     (1)
 #define MICROPY_PY_ARRAY_SLICE_ASSIGN       (1)
-#define MICROPY_PY_ATTRTUPLE                (0)
 #define MICROPY_PY_COLLECTIONS              (0)
 #define MICROPY_PY_SYS_MAXSIZE              (1)
 

From 7f366a2190825555c16f57f5dfd4d0d57efd7c1f Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 14 Apr 2021 14:55:55 +1000
Subject: [PATCH 0739/3533] esp32/modsocket: Correctly handle poll/read of
 unconnected TCP socket.

For an unconnected TCP socket, poll should return WR|HUP and read should
raise ENOTCONN.  This is implemented by this commit and now the following
tests pass on esp32: extmod/usocket_tcp_basic.py,
net_hosted/connect_poll.py.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/modsocket.c | 32 +++++++++++++++++++++++++++-----
 1 file changed, 27 insertions(+), 5 deletions(-)

diff --git a/ports/esp32/modsocket.c b/ports/esp32/modsocket.c
index 5135e31631e04..67b1d7d6f0591 100644
--- a/ports/esp32/modsocket.c
+++ b/ports/esp32/modsocket.c
@@ -59,13 +59,19 @@
 #define MDNS_QUERY_TIMEOUT_MS (5000)
 #define MDNS_LOCAL_SUFFIX ".local"
 
+enum {
+    SOCKET_STATE_NEW,
+    SOCKET_STATE_CONNECTED,
+    SOCKET_STATE_PEER_CLOSED,
+};
+
 typedef struct _socket_obj_t {
     mp_obj_base_t base;
     int fd;
     uint8_t domain;
     uint8_t type;
     uint8_t proto;
-    bool peer_closed;
+    uint8_t state;
     unsigned int retries;
     #if MICROPY_PY_USOCKET_EVENTS
     mp_obj_t events_callback;
@@ -254,7 +260,6 @@ STATIC mp_obj_t socket_make_new(const mp_obj_type_t *type_in, size_t n_args, siz
     sock->domain = AF_INET;
     sock->type = SOCK_STREAM;
     sock->proto = 0;
-    sock->peer_closed = false;
     if (n_args > 0) {
         sock->domain = mp_obj_get_int(args[0]);
         if (n_args > 1) {
@@ -265,6 +270,8 @@ STATIC mp_obj_t socket_make_new(const mp_obj_type_t *type_in, size_t n_args, siz
         }
     }
 
+    sock->state = sock->type == SOCK_STREAM ? SOCKET_STATE_NEW : SOCKET_STATE_CONNECTED;
+
     sock->fd = lwip_socket(sock->domain, sock->type, sock->proto);
     if (sock->fd < 0) {
         mp_raise_OSError(errno);
@@ -278,6 +285,7 @@ STATIC mp_obj_t socket_bind(const mp_obj_t arg0, const mp_obj_t arg1) {
     socket_obj_t *self = MP_OBJ_TO_PTR(arg0);
     struct addrinfo *res;
     _socket_getaddrinfo(arg1, &res);
+    self->state = SOCKET_STATE_CONNECTED;
     int r = lwip_bind(self->fd, res->ai_addr, res->ai_addrlen);
     lwip_freeaddrinfo(res);
     if (r < 0) {
@@ -290,6 +298,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(socket_bind_obj, socket_bind);
 STATIC mp_obj_t socket_listen(const mp_obj_t arg0, const mp_obj_t arg1) {
     socket_obj_t *self = MP_OBJ_TO_PTR(arg0);
     int backlog = mp_obj_get_int(arg1);
+    self->state = SOCKET_STATE_CONNECTED;
     int r = lwip_listen(self->fd, backlog);
     if (r < 0) {
         mp_raise_OSError(errno);
@@ -332,7 +341,7 @@ STATIC mp_obj_t socket_accept(const mp_obj_t arg0) {
     sock->domain = self->domain;
     sock->type = self->type;
     sock->proto = self->proto;
-    sock->peer_closed = false;
+    sock->state = SOCKET_STATE_CONNECTED;
     _socket_settimeout(sock, UINT64_MAX);
 
     // make the return value
@@ -351,6 +360,7 @@ STATIC mp_obj_t socket_connect(const mp_obj_t arg0, const mp_obj_t arg1) {
     struct addrinfo *res;
     _socket_getaddrinfo(arg1, &res);
     MP_THREAD_GIL_EXIT();
+    self->state = SOCKET_STATE_CONNECTED;
     int r = lwip_connect(self->fd, res->ai_addr, res->ai_addrlen);
     MP_THREAD_GIL_ENTER();
     lwip_freeaddrinfo(res);
@@ -471,11 +481,17 @@ STATIC mp_uint_t _socket_read_data(mp_obj_t self_in, void *buf, size_t size,
     struct sockaddr *from, socklen_t *from_len, int *errcode) {
     socket_obj_t *sock = MP_OBJ_TO_PTR(self_in);
 
+    // A new socket cannot be read from.
+    if (sock->state == SOCKET_STATE_NEW) {
+        *errcode = MP_ENOTCONN;
+        return MP_STREAM_ERROR;
+    }
+
     // If the peer closed the connection then the lwIP socket API will only return "0" once
     // from lwip_recvfrom and then block on subsequent calls.  To emulate POSIX behaviour,
     // which continues to return "0" for each call on a closed socket, we set a flag when
     // the peer closed the socket.
-    if (sock->peer_closed) {
+    if (sock->state == SOCKET_STATE_PEER_CLOSED) {
         return 0;
     }
 
@@ -500,7 +516,7 @@ STATIC mp_uint_t _socket_read_data(mp_obj_t self_in, void *buf, size_t size,
             MP_THREAD_GIL_ENTER();
         }
         if (r == 0) {
-            sock->peer_closed = true;
+            sock->state = SOCKET_STATE_PEER_CLOSED;
         }
         if (r >= 0) {
             return r;
@@ -702,6 +718,12 @@ STATIC mp_uint_t socket_stream_ioctl(mp_obj_t self_in, mp_uint_t request, uintpt
         if (FD_ISSET(socket->fd, &efds)) {
             ret |= MP_STREAM_POLL_HUP;
         }
+
+        // New (unconnected) sockets are writable and have HUP set.
+        if (socket->state == SOCKET_STATE_NEW) {
+            ret |= (arg & MP_STREAM_POLL_WR) | MP_STREAM_POLL_HUP;
+        }
+
         return ret;
     } else if (request == MP_STREAM_CLOSE) {
         if (socket->fd >= 0) {

From 8459f538eb45fd8e1e4d614298449cf18de84d75 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 15 Apr 2021 00:47:24 +1000
Subject: [PATCH 0740/3533] tests/feature_check: Check for lack of pass result
 rather than failure.

Commit cb68a5741aba5d4935428674234a9d643f97405f broke automatic Python
feature detection when running tests, because some detection relied on a
crash of a feature script returning exactly b"CRASH".

This commit fixes this and improves the situation by testing for the lack
of a known pass result, rather than an exact failure result.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/feature_check/async_check.py  |  3 +++
 tests/feature_check/const.py        |  1 +
 tests/feature_check/native_check.py |  4 ++++
 tests/feature_check/set_check.py    |  2 +-
 tests/run-tests.py                  | 14 +++++++-------
 5 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/tests/feature_check/async_check.py b/tests/feature_check/async_check.py
index 0f6361cd12016..727b7136a5ba6 100644
--- a/tests/feature_check/async_check.py
+++ b/tests/feature_check/async_check.py
@@ -1,3 +1,6 @@
 # check if async/await keywords are supported
 async def foo():
     await 1
+
+
+print("async")
diff --git a/tests/feature_check/const.py b/tests/feature_check/const.py
index db32e8c69bd7c..e5928f6d768de 100644
--- a/tests/feature_check/const.py
+++ b/tests/feature_check/const.py
@@ -1 +1,2 @@
 x = const(1)
+print(x)
diff --git a/tests/feature_check/native_check.py b/tests/feature_check/native_check.py
index 3971d1355fbaf..4dc9754d0c12b 100644
--- a/tests/feature_check/native_check.py
+++ b/tests/feature_check/native_check.py
@@ -2,3 +2,7 @@
 @micropython.native
 def f():
     pass
+
+
+f()
+print("native")
diff --git a/tests/feature_check/set_check.py b/tests/feature_check/set_check.py
index ec186cc5b9221..0c7612843a0c9 100644
--- a/tests/feature_check/set_check.py
+++ b/tests/feature_check/set_check.py
@@ -1,2 +1,2 @@
 # check if set literal syntax is supported
-{1}
+print({1})
diff --git a/tests/run-tests.py b/tests/run-tests.py
index ae63f9a29a6e2..a5a9b60637cc3 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -279,7 +279,7 @@ def run_tests(pyb, tests, args, result_dir):
 
         # Check if micropython.native is supported, and skip such tests if it's not
         output = run_feature_check(pyb, args, base_path, "native_check.py")
-        if output == b"CRASH":
+        if output != b"native\n":
             skip_native = True
 
         # Check if arbitrary-precision integers are supported, and skip such tests if it's not
@@ -294,7 +294,7 @@ def run_tests(pyb, tests, args, result_dir):
 
         # Check if set type (and set literals) is supported, and skip such tests if it's not
         output = run_feature_check(pyb, args, base_path, "set_check.py")
-        if output == b"CRASH":
+        if output != b"{1}\n":
             skip_set_type = True
 
         # Check if slice is supported, and skip such tests if it's not
@@ -304,12 +304,12 @@ def run_tests(pyb, tests, args, result_dir):
 
         # Check if async/await keywords are supported, and skip such tests if it's not
         output = run_feature_check(pyb, args, base_path, "async_check.py")
-        if output == b"CRASH":
+        if output != b"async\n":
             skip_async = True
 
         # Check if const keyword (MicroPython extension) is supported, and skip such tests if it's not
         output = run_feature_check(pyb, args, base_path, "const.py")
-        if output == b"CRASH":
+        if output != b"1\n":
             skip_const = True
 
         # Check if __rOP__ special methods are supported, and skip such tests if it's not
@@ -334,10 +334,10 @@ def run_tests(pyb, tests, args, result_dir):
 
         upy_byteorder = run_feature_check(pyb, args, base_path, "byteorder.py")
         upy_float_precision = run_feature_check(pyb, args, base_path, "float.py")
-        if upy_float_precision == b"CRASH":
-            upy_float_precision = 0
-        else:
+        try:
             upy_float_precision = int(upy_float_precision)
+        except ValueError:
+            upy_float_precision = 0
         has_complex = run_feature_check(pyb, args, base_path, "complex.py") == b"complex\n"
         has_coverage = run_feature_check(pyb, args, base_path, "coverage.py") == b"coverage\n"
         cpy_byteorder = subprocess.check_output(

From 66a86a061530eeee51191c3c667e9bc3cfcfda40 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 18 Feb 2021 21:24:34 +1100
Subject: [PATCH 0741/3533] esp32: Add initial support for ESP32S2 SoCs.

Builds against IDF v4.3-beta2.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/boards/sdkconfig.base |  1 -
 ports/esp32/esp32_ulp.c           |  4 ++++
 ports/esp32/machine_adc.c         | 16 +++++++++++++++-
 ports/esp32/machine_dac.c         |  5 +++++
 ports/esp32/machine_hw_spi.c      | 10 ++++++++--
 ports/esp32/machine_i2c.c         |  5 +++++
 ports/esp32/machine_pin.c         | 14 ++++++++++++++
 ports/esp32/machine_pwm.c         |  4 ++++
 ports/esp32/machine_sdcard.c      |  6 ++----
 ports/esp32/machine_timer.c       | 21 ++++++++++++++++++++-
 ports/esp32/machine_touchpad.c    | 13 ++++++-------
 ports/esp32/machine_uart.c        |  2 ++
 ports/esp32/main.c                |  5 +++++
 ports/esp32/main/CMakeLists.txt   |  7 ++++++-
 ports/esp32/modesp32.c            |  8 ++++++++
 ports/esp32/modmachine.c          | 16 ++++++++++++++--
 ports/esp32/mpconfigport.h        |  2 ++
 ports/esp32/uart.c                |  4 ++++
 18 files changed, 124 insertions(+), 19 deletions(-)

diff --git a/ports/esp32/boards/sdkconfig.base b/ports/esp32/boards/sdkconfig.base
index 91e68c7bf6a9c..4d9e38077d908 100644
--- a/ports/esp32/boards/sdkconfig.base
+++ b/ports/esp32/boards/sdkconfig.base
@@ -1,7 +1,6 @@
 # MicroPython on ESP32, ESP IDF configuration
 # The following options override the defaults
 
-CONFIG_IDF_TARGET="esp32"
 CONFIG_IDF_FIRMWARE_CHIP_ID=0x0000
 
 # Compiler options: use -Os to reduce size, but keep full assertions
diff --git a/ports/esp32/esp32_ulp.c b/ports/esp32/esp32_ulp.c
index 50244cdf25060..8e4ce9c5a41b9 100644
--- a/ports/esp32/esp32_ulp.c
+++ b/ports/esp32/esp32_ulp.c
@@ -26,6 +26,8 @@
 
 #include "py/runtime.h"
 
+#if CONFIG_IDF_TARGET_ESP32
+
 #include "esp32/ulp.h"
 #include "esp_err.h"
 
@@ -95,3 +97,5 @@ const mp_obj_type_t esp32_ulp_type = {
     .make_new = esp32_ulp_make_new,
     .locals_dict = (mp_obj_t)&esp32_ulp_locals_dict,
 };
+
+#endif // CONFIG_IDF_TARGET_ESP32
diff --git a/ports/esp32/machine_adc.c b/ports/esp32/machine_adc.c
index 811a208e6d54f..4c19d5992bd8a 100644
--- a/ports/esp32/machine_adc.c
+++ b/ports/esp32/machine_adc.c
@@ -60,7 +60,11 @@ STATIC mp_obj_t madc_make_new(const mp_obj_type_t *type, size_t n_args, size_t n
 
     static int initialized = 0;
     if (!initialized) {
-        adc1_config_width(ADC_WIDTH_12Bit);
+        #if CONFIG_IDF_TARGET_ESP32S2
+        adc1_config_width(ADC_WIDTH_BIT_13);
+        #else
+        adc1_config_width(ADC_WIDTH_BIT_12);
+        #endif
         adc_bit_width = 12;
         initialized = 1;
     }
@@ -128,6 +132,7 @@ STATIC mp_obj_t madc_width(mp_obj_t cls_in, mp_obj_t width_in) {
         mp_raise_ValueError(MP_ERROR_TEXT("parameter error"));
     }
     switch (width) {
+        #if CONFIG_IDF_TARGET_ESP32
         case ADC_WIDTH_9Bit:
             adc_bit_width = 9;
             break;
@@ -140,6 +145,11 @@ STATIC mp_obj_t madc_width(mp_obj_t cls_in, mp_obj_t width_in) {
         case ADC_WIDTH_12Bit:
             adc_bit_width = 12;
             break;
+        #elif CONFIG_IDF_TARGET_ESP32S2
+        case ADC_WIDTH_BIT_13:
+            adc_bit_width = 13;
+            break;
+            #endif
         default:
             break;
     }
@@ -160,10 +170,14 @@ STATIC const mp_rom_map_elem_t madc_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_ATTN_6DB), MP_ROM_INT(ADC_ATTEN_6db) },
     { MP_ROM_QSTR(MP_QSTR_ATTN_11DB), MP_ROM_INT(ADC_ATTEN_11db) },
 
+    #if CONFIG_IDF_TARGET_ESP32
     { MP_ROM_QSTR(MP_QSTR_WIDTH_9BIT), MP_ROM_INT(ADC_WIDTH_9Bit) },
     { MP_ROM_QSTR(MP_QSTR_WIDTH_10BIT), MP_ROM_INT(ADC_WIDTH_10Bit) },
     { MP_ROM_QSTR(MP_QSTR_WIDTH_11BIT), MP_ROM_INT(ADC_WIDTH_11Bit) },
     { MP_ROM_QSTR(MP_QSTR_WIDTH_12BIT), MP_ROM_INT(ADC_WIDTH_12Bit) },
+    #elif CONFIG_IDF_TARGET_ESP32S2
+    { MP_ROM_QSTR(MP_QSTR_WIDTH_13BIT), MP_ROM_INT(ADC_WIDTH_BIT_13) },
+    #endif
 };
 
 STATIC MP_DEFINE_CONST_DICT(madc_locals_dict, madc_locals_dict_table);
diff --git a/ports/esp32/machine_dac.c b/ports/esp32/machine_dac.c
index 02855fcf8048e..146ef60aa81d8 100644
--- a/ports/esp32/machine_dac.c
+++ b/ports/esp32/machine_dac.c
@@ -43,8 +43,13 @@ typedef struct _mdac_obj_t {
 } mdac_obj_t;
 
 STATIC const mdac_obj_t mdac_obj[] = {
+    #if CONFIG_IDF_TARGET_ESP32
     {{&machine_dac_type}, GPIO_NUM_25, DAC_CHANNEL_1},
     {{&machine_dac_type}, GPIO_NUM_26, DAC_CHANNEL_2},
+    #else
+    {{&machine_dac_type}, GPIO_NUM_17, DAC_CHANNEL_1},
+    {{&machine_dac_type}, GPIO_NUM_18, DAC_CHANNEL_2},
+    #endif
 };
 
 STATIC mp_obj_t mdac_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw,
diff --git a/ports/esp32/machine_hw_spi.c b/ports/esp32/machine_hw_spi.c
index d59f2c750e666..a49a58035ae3e 100644
--- a/ports/esp32/machine_hw_spi.c
+++ b/ports/esp32/machine_hw_spi.c
@@ -184,8 +184,12 @@ STATIC void machine_hw_spi_init_internal(
         changed = true;
     }
 
-    if (self->host != HSPI_HOST && self->host != VSPI_HOST) {
-        mp_raise_ValueError(MP_ERROR_TEXT("SPI ID must be either HSPI(1) or VSPI(2)"));
+    if (self->host != HSPI_HOST
+        #ifdef VSPI_HOST
+        && self->host != VSPI_HOST
+        #endif
+        ) {
+        mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("SPI(%d) doesn't exist"), self->host);
     }
 
     if (changed) {
@@ -220,8 +224,10 @@ STATIC void machine_hw_spi_init_internal(
     int dma_chan = 0;
     if (self->host == HSPI_HOST) {
         dma_chan = 1;
+    #ifdef VSPI_HOST
     } else if (self->host == VSPI_HOST) {
         dma_chan = 2;
+    #endif
     }
 
     ret = spi_bus_initialize(self->host, &buscfg, dma_chan);
diff --git a/ports/esp32/machine_i2c.c b/ports/esp32/machine_i2c.c
index 3993c7b52b9bb..fd5180b8d0709 100644
--- a/ports/esp32/machine_i2c.c
+++ b/ports/esp32/machine_i2c.c
@@ -34,8 +34,13 @@
 
 #define I2C_0_DEFAULT_SCL (GPIO_NUM_18)
 #define I2C_0_DEFAULT_SDA (GPIO_NUM_19)
+#if CONFIG_IDF_TARGET_ESP32
 #define I2C_1_DEFAULT_SCL (GPIO_NUM_25)
 #define I2C_1_DEFAULT_SDA (GPIO_NUM_26)
+#else
+#define I2C_1_DEFAULT_SCL (GPIO_NUM_9)
+#define I2C_1_DEFAULT_SDA (GPIO_NUM_8)
+#endif
 
 #define I2C_DEFAULT_TIMEOUT_US (10000) // 10ms
 
diff --git a/ports/esp32/machine_pin.c b/ports/esp32/machine_pin.c
index dcdd53be92378..8290c77a48263 100644
--- a/ports/esp32/machine_pin.c
+++ b/ports/esp32/machine_pin.c
@@ -77,10 +77,17 @@ STATIC const machine_pin_obj_t machine_pin_obj[] = {
     {{&machine_pin_type}, GPIO_NUM_19},
     {{NULL}, -1},
     {{&machine_pin_type}, GPIO_NUM_21},
+    #if CONFIG_IDF_TARGET_ESP32
     {{&machine_pin_type}, GPIO_NUM_22},
     {{&machine_pin_type}, GPIO_NUM_23},
     {{NULL}, -1},
     {{&machine_pin_type}, GPIO_NUM_25},
+    #else
+    {{NULL}, -1},
+    {{NULL}, -1},
+    {{NULL}, -1},
+    {{NULL}, -1},
+    #endif
     {{&machine_pin_type}, GPIO_NUM_26},
     {{&machine_pin_type}, GPIO_NUM_27},
     {{NULL}, -1},
@@ -411,10 +418,17 @@ STATIC const machine_pin_irq_obj_t machine_pin_irq_object[] = {
     {{&machine_pin_irq_type}, GPIO_NUM_19},
     {{NULL}, -1},
     {{&machine_pin_irq_type}, GPIO_NUM_21},
+    #if CONFIG_IDF_TARGET_ESP32
     {{&machine_pin_irq_type}, GPIO_NUM_22},
     {{&machine_pin_irq_type}, GPIO_NUM_23},
     {{NULL}, -1},
     {{&machine_pin_irq_type}, GPIO_NUM_25},
+    #else
+    {{NULL}, -1},
+    {{NULL}, -1},
+    {{NULL}, -1},
+    {{NULL}, -1},
+    #endif
     {{&machine_pin_irq_type}, GPIO_NUM_26},
     {{&machine_pin_irq_type}, GPIO_NUM_27},
     {{NULL}, -1},
diff --git a/ports/esp32/machine_pwm.c b/ports/esp32/machine_pwm.c
index 7592f243b76f3..a7d7d29df8541 100644
--- a/ports/esp32/machine_pwm.c
+++ b/ports/esp32/machine_pwm.c
@@ -50,7 +50,11 @@ STATIC int chan_gpio[LEDC_CHANNEL_MAX];
 // 5khz
 #define PWFREQ (5000)
 // High speed mode
+#if CONFIG_IDF_TARGET_ESP32
 #define PWMODE (LEDC_HIGH_SPEED_MODE)
+#else
+#define PWMODE (LEDC_LOW_SPEED_MODE)
+#endif
 // 10-bit resolution (compatible with esp8266 PWM)
 #define PWRES (LEDC_TIMER_10_BIT)
 // Timer 1
diff --git a/ports/esp32/machine_sdcard.c b/ports/esp32/machine_sdcard.c
index 40686508a1e20..c9a9face7c242 100644
--- a/ports/esp32/machine_sdcard.c
+++ b/ports/esp32/machine_sdcard.c
@@ -31,6 +31,8 @@
 #include "py/mperrno.h"
 #include "extmod/vfs_fat.h"
 
+#if MICROPY_HW_ENABLE_SDCARD
+
 #include "driver/sdmmc_host.h"
 #include "driver/sdspi_host.h"
 #include "sdmmc_cmd.h"
@@ -50,10 +52,6 @@
 // Hosts are de-inited in __del__. Slots do not need de-initing.
 //
 
-// Currently the ESP32 Library doesn't support MMC cards, so
-// we don't enable on MICROPY_HW_ENABLE_MMCARD.
-#if MICROPY_HW_ENABLE_SDCARD
-
 // Forward declaration
 const mp_obj_type_t machine_sdcard_type;
 
diff --git a/ports/esp32/machine_timer.c b/ports/esp32/machine_timer.c
index 6e5824094ea25..696127af771da 100644
--- a/ports/esp32/machine_timer.c
+++ b/ports/esp32/machine_timer.c
@@ -30,12 +30,17 @@
 #include <stdint.h>
 #include <stdio.h>
 
-#include "driver/timer.h"
 #include "py/obj.h"
 #include "py/runtime.h"
 #include "modmachine.h"
 #include "mphalport.h"
 
+#include "driver/timer.h"
+#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(4, 1, 1)
+#include "hal/timer_ll.h"
+#define HAVE_TIMER_LL (1)
+#endif
+
 #define TIMER_INTR_SEL TIMER_INTR_LEVEL
 #define TIMER_DIVIDER  8
 
@@ -127,6 +132,18 @@ STATIC void machine_timer_isr(void *self_in) {
     machine_timer_obj_t *self = self_in;
     timg_dev_t *device = self->group ? &(TIMERG1) : &(TIMERG0);
 
+    #if HAVE_TIMER_LL
+
+    #if CONFIG_IDF_TARGET_ESP32
+    device->hw_timer[self->index].update = 1;
+    #else
+    device->hw_timer[self->index].update.update = 1;
+    #endif
+    timer_ll_clear_intr_status(device, self->index);
+    timer_ll_set_alarm_enable(device, self->index, self->repeat);
+
+    #else
+
     device->hw_timer[self->index].update = 1;
     if (self->index) {
         device->int_clr_timers.t1 = 1;
@@ -135,6 +152,8 @@ STATIC void machine_timer_isr(void *self_in) {
     }
     device->hw_timer[self->index].config.alarm_en = self->repeat;
 
+    #endif
+
     mp_sched_schedule(self->callback, self);
     mp_hal_wake_main_task_from_isr();
 }
diff --git a/ports/esp32/machine_touchpad.c b/ports/esp32/machine_touchpad.c
index 44efac37562c3..335157b154902 100644
--- a/ports/esp32/machine_touchpad.c
+++ b/ports/esp32/machine_touchpad.c
@@ -24,18 +24,15 @@
  * THE SOFTWARE.
  */
 
+#include "py/runtime.h"
+#include "py/mphal.h"
+#include "modmachine.h"
 
-#include <stdio.h>
-
-#include "esp_log.h"
+#if CONFIG_IDF_TARGET_ESP32
 
 #include "driver/gpio.h"
 #include "driver/touch_pad.h"
 
-#include "py/runtime.h"
-#include "py/mphal.h"
-#include "modmachine.h"
-
 typedef struct _mtp_obj_t {
     mp_obj_base_t base;
     gpio_num_t gpio_id;
@@ -120,3 +117,5 @@ const mp_obj_type_t machine_touchpad_type = {
     .make_new = mtp_make_new,
     .locals_dict = (mp_obj_t)&mtp_locals_dict,
 };
+
+#endif // CONFIG_IDF_TARGET_ESP32
diff --git a/ports/esp32/machine_uart.c b/ports/esp32/machine_uart.c
index 7fce83f2c4c2b..e256b9be439c0 100644
--- a/ports/esp32/machine_uart.c
+++ b/ports/esp32/machine_uart.c
@@ -307,10 +307,12 @@ STATIC mp_obj_t machine_uart_make_new(const mp_obj_type_t *type, size_t n_args,
             self->rx = 9;
             self->tx = 10;
             break;
+        #if SOC_UART_NUM > 2
         case UART_NUM_2:
             self->rx = 16;
             self->tx = 17;
             break;
+        #endif
     }
 
     // Remove any existing configuration
diff --git a/ports/esp32/main.c b/ports/esp32/main.c
index 7413798d0c302..0c2f56699f4c9 100644
--- a/ports/esp32/main.c
+++ b/ports/esp32/main.c
@@ -37,7 +37,12 @@
 #include "esp_task.h"
 #include "soc/cpu.h"
 #include "esp_log.h"
+
+#if CONFIG_IDF_TARGET_ESP32
 #include "esp32/spiram.h"
+#elif CONFIG_IDF_TARGET_ESP32S2
+#include "esp32s2/spiram.h"
+#endif
 
 #include "py/stackctrl.h"
 #include "py/nlr.h"
diff --git a/ports/esp32/main/CMakeLists.txt b/ports/esp32/main/CMakeLists.txt
index aacdd40d3113d..63a221e4d6197 100644
--- a/ports/esp32/main/CMakeLists.txt
+++ b/ports/esp32/main/CMakeLists.txt
@@ -84,7 +84,6 @@ set(IDF_COMPONENTS
     bootloader_support
     bt
     driver
-    esp32
     esp_common
     esp_eth
     esp_event
@@ -123,6 +122,12 @@ if(IDF_VERSION_MINOR GREATER_EQUAL 3)
     list(APPEND IDF_COMPONENTS hal)
 endif()
 
+if(IDF_TARGET STREQUAL "esp32")
+    list(APPEND IDF_COMPONENTS esp32)
+elseif(IDF_TARGET STREQUAL "esp32s2")
+    list(APPEND IDF_COMPONENTS esp32s2)
+endif()
+
 # Register the main IDF component.
 idf_component_register(
     SRCS
diff --git a/ports/esp32/modesp32.c b/ports/esp32/modesp32.c
index 53ca7fdc60fcc..3ed5343380015 100644
--- a/ports/esp32/modesp32.c
+++ b/ports/esp32/modesp32.c
@@ -132,6 +132,8 @@ STATIC mp_obj_t esp32_wake_on_ext1(size_t n_args, const mp_obj_t *pos_args, mp_m
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_KW(esp32_wake_on_ext1_obj, 0, esp32_wake_on_ext1);
 
+#if CONFIG_IDF_TARGET_ESP32
+
 STATIC mp_obj_t esp32_raw_temperature(void) {
     SET_PERI_REG_BITS(SENS_SAR_MEAS_WAIT2_REG, SENS_FORCE_XPD_SAR, 3, SENS_FORCE_XPD_SAR_S);
     SET_PERI_REG_BITS(SENS_SAR_TSENS_CTRL_REG, SENS_TSENS_CLK_DIV, 10, SENS_TSENS_CLK_DIV_S);
@@ -154,6 +156,8 @@ STATIC mp_obj_t esp32_hall_sensor(void) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_0(esp32_hall_sensor_obj, esp32_hall_sensor);
 
+#endif
+
 STATIC mp_obj_t esp32_idf_heap_info(const mp_obj_t cap_in) {
     mp_int_t cap = mp_obj_get_int(cap_in);
     multi_heap_info_t info;
@@ -182,14 +186,18 @@ STATIC const mp_rom_map_elem_t esp32_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_wake_on_touch), MP_ROM_PTR(&esp32_wake_on_touch_obj) },
     { MP_ROM_QSTR(MP_QSTR_wake_on_ext0), MP_ROM_PTR(&esp32_wake_on_ext0_obj) },
     { MP_ROM_QSTR(MP_QSTR_wake_on_ext1), MP_ROM_PTR(&esp32_wake_on_ext1_obj) },
+    #if CONFIG_IDF_TARGET_ESP32
     { MP_ROM_QSTR(MP_QSTR_raw_temperature), MP_ROM_PTR(&esp32_raw_temperature_obj) },
     { MP_ROM_QSTR(MP_QSTR_hall_sensor), MP_ROM_PTR(&esp32_hall_sensor_obj) },
+    #endif
     { MP_ROM_QSTR(MP_QSTR_idf_heap_info), MP_ROM_PTR(&esp32_idf_heap_info_obj) },
 
     { MP_ROM_QSTR(MP_QSTR_NVS), MP_ROM_PTR(&esp32_nvs_type) },
     { MP_ROM_QSTR(MP_QSTR_Partition), MP_ROM_PTR(&esp32_partition_type) },
     { MP_ROM_QSTR(MP_QSTR_RMT), MP_ROM_PTR(&esp32_rmt_type) },
+    #if CONFIG_IDF_TARGET_ESP32
     { MP_ROM_QSTR(MP_QSTR_ULP), MP_ROM_PTR(&esp32_ulp_type) },
+    #endif
 
     { MP_ROM_QSTR(MP_QSTR_WAKEUP_ALL_LOW), MP_ROM_FALSE },
     { MP_ROM_QSTR(MP_QSTR_WAKEUP_ANY_HIGH), MP_ROM_TRUE },
diff --git a/ports/esp32/modmachine.c b/ports/esp32/modmachine.c
index 3925bcb64e194..2eb5cd2feed51 100644
--- a/ports/esp32/modmachine.c
+++ b/ports/esp32/modmachine.c
@@ -32,12 +32,18 @@
 
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"
-#include "esp32/rom/rtc.h"
-#include "esp32/clk.h"
 #include "esp_sleep.h"
 #include "esp_pm.h"
 #include "driver/touch_pad.h"
 
+#if CONFIG_IDF_TARGET_ESP32
+#include "esp32/rom/rtc.h"
+#include "esp32/clk.h"
+#elif CONFIG_IDF_TARGET_ESP32S2
+#include "esp32s2/rom/rtc.h"
+#include "esp32s2/clk.h"
+#endif
+
 #include "py/obj.h"
 #include "py/runtime.h"
 #include "lib/utils/pyexec.h"
@@ -71,7 +77,11 @@ STATIC mp_obj_t machine_freq(size_t n_args, const mp_obj_t *args) {
         if (freq != 20 && freq != 40 && freq != 80 && freq != 160 && freq != 240) {
             mp_raise_ValueError(MP_ERROR_TEXT("frequency must be 20MHz, 40MHz, 80Mhz, 160MHz or 240MHz"));
         }
+        #if CONFIG_IDF_TARGET_ESP32
         esp_pm_config_esp32_t pm;
+        #elif CONFIG_IDF_TARGET_ESP32S2
+        esp_pm_config_esp32s2_t pm;
+        #endif
         pm.max_freq_mhz = freq;
         pm.min_freq_mhz = freq;
         pm.light_sleep_enable = false;
@@ -260,7 +270,9 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_DEEPSLEEP), MP_ROM_INT(MACHINE_WAKE_DEEPSLEEP) },
     { MP_ROM_QSTR(MP_QSTR_Pin), MP_ROM_PTR(&machine_pin_type) },
     { MP_ROM_QSTR(MP_QSTR_Signal), MP_ROM_PTR(&machine_signal_type) },
+    #if CONFIG_IDF_TARGET_ESP32
     { MP_ROM_QSTR(MP_QSTR_TouchPad), MP_ROM_PTR(&machine_touchpad_type) },
+    #endif
     { MP_ROM_QSTR(MP_QSTR_ADC), MP_ROM_PTR(&machine_adc_type) },
     { MP_ROM_QSTR(MP_QSTR_DAC), MP_ROM_PTR(&machine_dac_type) },
     { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&machine_hw_i2c_type) },
diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h
index c9c4b6268be2f..8788963cb3209 100644
--- a/ports/esp32/mpconfigport.h
+++ b/ports/esp32/mpconfigport.h
@@ -153,7 +153,9 @@
 #define MICROPY_PY_MACHINE_SPI              (1)
 #define MICROPY_PY_MACHINE_SPI_MSB          (0)
 #define MICROPY_PY_MACHINE_SPI_LSB          (1)
+#ifndef MICROPY_HW_ENABLE_SDCARD
 #define MICROPY_HW_ENABLE_SDCARD            (1)
+#endif
 #define MICROPY_HW_SOFTSPI_MIN_DELAY        (0)
 #define MICROPY_HW_SOFTSPI_MAX_BAUDRATE     (ets_get_cpu_frequency() * 1000000 / 200) // roughly
 #define MICROPY_PY_USSL                     (1)
diff --git a/ports/esp32/uart.c b/ports/esp32/uart.c
index c837c8dcfe6a4..bd3eea9f6bed3 100644
--- a/ports/esp32/uart.c
+++ b/ports/esp32/uart.c
@@ -49,7 +49,11 @@ STATIC void IRAM_ATTR uart_irq_handler(void *arg) {
     uart->int_clr.frm_err = 1;
     uart->int_clr.rxfifo_tout = 1;
     while (uart->status.rxfifo_cnt) {
+        #if CONFIG_IDF_TARGET_ESP32
         uint8_t c = uart->fifo.rw_byte;
+        #elif CONFIG_IDF_TARGET_ESP32S2
+        uint8_t c = READ_PERI_REG(UART_FIFO_AHB_REG(0)); // UART0
+        #endif
         if (c == mp_interrupt_char) {
             mp_keyboard_interrupt();
         } else {

From c81d048bb3ad35d62c3c7afe9b770a32f8b49c8b Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 19 Feb 2021 12:08:11 +1100
Subject: [PATCH 0742/3533] esp32: Add support for USB with CDC ACM.

The REPL will be available on the USB serial port.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/boards/sdkconfig.usb |  4 ++
 ports/esp32/main.c               |  5 ++
 ports/esp32/main/CMakeLists.txt  |  6 +++
 ports/esp32/mphalport.c          |  7 ++-
 ports/esp32/usb.c                | 92 ++++++++++++++++++++++++++++++++
 ports/esp32/usb.h                | 32 +++++++++++
 6 files changed, 145 insertions(+), 1 deletion(-)
 create mode 100644 ports/esp32/boards/sdkconfig.usb
 create mode 100644 ports/esp32/usb.c
 create mode 100644 ports/esp32/usb.h

diff --git a/ports/esp32/boards/sdkconfig.usb b/ports/esp32/boards/sdkconfig.usb
new file mode 100644
index 0000000000000..657edbc58059b
--- /dev/null
+++ b/ports/esp32/boards/sdkconfig.usb
@@ -0,0 +1,4 @@
+CONFIG_USB_ENABLED=y
+CONFIG_USB_CDC_ENABLED=y
+CONFIG_USB_CDC_RX_BUFSIZE=256
+CONFIG_USB_CDC_TX_BUFSIZE=256
diff --git a/ports/esp32/main.c b/ports/esp32/main.c
index 0c2f56699f4c9..7ca3d84140cf1 100644
--- a/ports/esp32/main.c
+++ b/ports/esp32/main.c
@@ -55,6 +55,7 @@
 #include "lib/mp-readline/readline.h"
 #include "lib/utils/pyexec.h"
 #include "uart.h"
+#include "usb.h"
 #include "modmachine.h"
 #include "modnetwork.h"
 #include "mpthreadport.h"
@@ -77,7 +78,11 @@ void mp_task(void *pvParameter) {
     #if MICROPY_PY_THREAD
     mp_thread_init(pxTaskGetStackStart(NULL), MP_TASK_STACK_SIZE / sizeof(uintptr_t));
     #endif
+    #if CONFIG_USB_ENABLED
+    usb_init();
+    #else
     uart_init();
+    #endif
     machine_init();
 
     // TODO: CONFIG_SPIRAM_SUPPORT is for 3.3 compatibility, remove after move to 4.0.
diff --git a/ports/esp32/main/CMakeLists.txt b/ports/esp32/main/CMakeLists.txt
index 63a221e4d6197..656045da90a21 100644
--- a/ports/esp32/main/CMakeLists.txt
+++ b/ports/esp32/main/CMakeLists.txt
@@ -37,6 +37,7 @@ set(MICROPY_SOURCE_DRIVERS
 set(MICROPY_SOURCE_PORT
     ${PROJECT_DIR}/main.c
     ${PROJECT_DIR}/uart.c
+    ${PROJECT_DIR}/usb.c
     ${PROJECT_DIR}/gccollect.c
     ${PROJECT_DIR}/mphalport.c
     ${PROJECT_DIR}/fatfs_port.c
@@ -126,6 +127,7 @@ if(IDF_TARGET STREQUAL "esp32")
     list(APPEND IDF_COMPONENTS esp32)
 elseif(IDF_TARGET STREQUAL "esp32s2")
     list(APPEND IDF_COMPONENTS esp32s2)
+    list(APPEND IDF_COMPONENTS tinyusb)
 endif()
 
 # Register the main IDF component.
@@ -185,6 +187,10 @@ if(IDF_VERSION_MINOR GREATER_EQUAL 2)
     # so add them explicitly.
     list(APPEND MICROPY_CPP_INC_EXTRA ${IDF_PATH}/components/soc/soc/${IDF_TARGET}/include)
     list(APPEND MICROPY_CPP_INC_EXTRA ${IDF_PATH}/components/soc/soc/include)
+    if(IDF_VERSION_MINOR GREATER_EQUAL 3)
+        list(APPEND MICROPY_CPP_INC_EXTRA ${IDF_PATH}/components/tinyusb/additions/include)
+        list(APPEND MICROPY_CPP_INC_EXTRA ${IDF_PATH}/components/tinyusb/tinyusb/src)
+    endif()
 endif()
 
 # Include the main MicroPython cmake rules.
diff --git a/ports/esp32/mphalport.c b/ports/esp32/mphalport.c
index 65fa88e4d0780..cf668216df9e3 100644
--- a/ports/esp32/mphalport.c
+++ b/ports/esp32/mphalport.c
@@ -43,10 +43,11 @@
 #include "lib/timeutils/timeutils.h"
 #include "lib/utils/pyexec.h"
 #include "mphalport.h"
+#include "usb.h"
 
 TaskHandle_t mp_main_task_handle;
 
-STATIC uint8_t stdin_ringbuf_array[256];
+STATIC uint8_t stdin_ringbuf_array[260];
 ringbuf_t stdin_ringbuf = {stdin_ringbuf_array, sizeof(stdin_ringbuf_array), 0, 0};
 
 // Check the ESP-IDF error code and raise an OSError if it's not ESP_OK.
@@ -110,9 +111,13 @@ void mp_hal_stdout_tx_strn(const char *str, uint32_t len) {
     if (release_gil) {
         MP_THREAD_GIL_EXIT();
     }
+    #if CONFIG_USB_ENABLED
+    usb_tx_strn(str, len);
+    #else
     for (uint32_t i = 0; i < len; ++i) {
         uart_tx_one_char(str[i]);
     }
+    #endif
     if (release_gil) {
         MP_THREAD_GIL_ENTER();
     }
diff --git a/ports/esp32/usb.c b/ports/esp32/usb.c
new file mode 100644
index 0000000000000..aa76321a7e918
--- /dev/null
+++ b/ports/esp32/usb.c
@@ -0,0 +1,92 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "py/runtime.h"
+#include "py/mphal.h"
+#include "usb.h"
+
+#if CONFIG_USB_ENABLED
+
+#include "tinyusb.h"
+#include "tusb_cdc_acm.h"
+
+#define CDC_ITF TINYUSB_CDC_ACM_0
+
+static uint8_t usb_rx_buf[CONFIG_USB_CDC_RX_BUFSIZE];
+
+static void usb_callback_rx(int itf, cdcacm_event_t *event) {
+    // TODO: what happens if more chars come in during this function, are they lost?
+    for (;;) {
+        size_t len = 0;
+        esp_err_t ret = tinyusb_cdcacm_read(itf, usb_rx_buf, sizeof(usb_rx_buf), &len);
+        if (ret != ESP_OK) {
+            break;
+        }
+        if (len == 0) {
+            break;
+        }
+        for (size_t i = 0; i < len; ++i) {
+            if (usb_rx_buf[i] == mp_interrupt_char) {
+                mp_keyboard_interrupt();
+            } else {
+                ringbuf_put(&stdin_ringbuf, usb_rx_buf[i]);
+            }
+        }
+    }
+}
+
+void usb_init(void) {
+    // Initialise the USB with defaults.
+    tinyusb_config_t tusb_cfg = {0};
+    ESP_ERROR_CHECK(tinyusb_driver_install(&tusb_cfg));
+
+    // Initialise the USB serial interface.
+    tinyusb_config_cdcacm_t amc_cfg = {
+        .usb_dev = TINYUSB_USBDEV_0,
+        .cdc_port = CDC_ITF,
+        .rx_unread_buf_sz = 256,
+        .callback_rx = &usb_callback_rx,
+        .callback_rx_wanted_char = NULL,
+        .callback_line_state_changed = NULL,
+        .callback_line_coding_changed = NULL
+    };
+    ESP_ERROR_CHECK(tusb_cdc_acm_init(&amc_cfg));
+}
+
+void usb_tx_strn(const char *str, size_t len) {
+    while (len) {
+        size_t l = len;
+        if (l > CONFIG_USB_CDC_TX_BUFSIZE) {
+            l = CONFIG_USB_CDC_TX_BUFSIZE;
+        }
+        tinyusb_cdcacm_write_queue(CDC_ITF, (uint8_t *)str, l);
+        tinyusb_cdcacm_write_flush(CDC_ITF, pdMS_TO_TICKS(1000));
+        str += l;
+        len -= l;
+    }
+}
+
+#endif // CONFIG_USB_ENABLED
diff --git a/ports/esp32/usb.h b/ports/esp32/usb.h
new file mode 100644
index 0000000000000..a1037803337f8
--- /dev/null
+++ b/ports/esp32/usb.h
@@ -0,0 +1,32 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+#ifndef MICROPY_INCLUDED_ESP32_USB_H
+#define MICROPY_INCLUDED_ESP32_USB_H
+
+void usb_init(void);
+void usb_tx_strn(const char *str, size_t len);
+
+#endif // MICROPY_INCLUDED_ESP32_USB_H

From d97b8daf1a8d3bcb7f205bbffd4f2e122f973f9d Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 13 Apr 2021 11:13:08 +1000
Subject: [PATCH 0743/3533] esp32/boards: Add GENERIC_S2 board definition.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/boards/GENERIC_S2/mpconfigboard.cmake | 8 ++++++++
 ports/esp32/boards/GENERIC_S2/mpconfigboard.h     | 5 +++++
 2 files changed, 13 insertions(+)
 create mode 100644 ports/esp32/boards/GENERIC_S2/mpconfigboard.cmake
 create mode 100644 ports/esp32/boards/GENERIC_S2/mpconfigboard.h

diff --git a/ports/esp32/boards/GENERIC_S2/mpconfigboard.cmake b/ports/esp32/boards/GENERIC_S2/mpconfigboard.cmake
new file mode 100644
index 0000000000000..23d52e8b941a0
--- /dev/null
+++ b/ports/esp32/boards/GENERIC_S2/mpconfigboard.cmake
@@ -0,0 +1,8 @@
+set(IDF_TARGET esp32s2)
+
+set(SDKCONFIG_DEFAULTS
+    boards/sdkconfig.base
+    boards/sdkconfig.usb
+)
+
+set(MICROPY_FROZEN_MANIFEST ${MICROPY_PORT_DIR}/boards/manifest.py)
diff --git a/ports/esp32/boards/GENERIC_S2/mpconfigboard.h b/ports/esp32/boards/GENERIC_S2/mpconfigboard.h
new file mode 100644
index 0000000000000..01ac2ce58ec2d
--- /dev/null
+++ b/ports/esp32/boards/GENERIC_S2/mpconfigboard.h
@@ -0,0 +1,5 @@
+#define MICROPY_HW_BOARD_NAME               "ESP32S2 module"
+#define MICROPY_HW_MCU_NAME                 "ESP32S2"
+
+#define MICROPY_PY_BLUETOOTH                (0)
+#define MICROPY_HW_ENABLE_SDCARD            (0)

From a9bbf7083ef6b79cf80bdbf34984d847a6c4aae9 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 13 Apr 2021 12:33:17 +1000
Subject: [PATCH 0744/3533] tools/ci.sh: Build esp32 using IDF v4.0.2 and v4.3.

To test different IDF's, and also test building the GENERIC_S2 board.

Signed-off-by: Damien George <damien@micropython.org>
---
 .github/workflows/ports_esp32.yml | 13 +++++++++++--
 tools/ci.sh                       | 17 ++++++++++++++---
 2 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/ports_esp32.yml b/.github/workflows/ports_esp32.yml
index 0ad3f87a25fcb..09817ee126546 100644
--- a/.github/workflows/ports_esp32.yml
+++ b/.github/workflows/ports_esp32.yml
@@ -13,11 +13,20 @@ on:
       - 'ports/esp32/**'
 
 jobs:
-  build:
+  build_idf402:
     runs-on: ubuntu-20.04
     steps:
     - uses: actions/checkout@v2
     - name: Install packages
-      run: source tools/ci.sh && ci_esp32_setup
+      run: source tools/ci.sh && ci_esp32_idf402_setup
+    - name: Build
+      run: source tools/ci.sh && ci_esp32_build
+
+  build_idf43:
+    runs-on: ubuntu-20.04
+    steps:
+    - uses: actions/checkout@v2
+    - name: Install packages
+      run: source tools/ci.sh && ci_esp32_idf43_setup
     - name: Build
       run: source tools/ci.sh && ci_esp32_build
diff --git a/tools/ci.sh b/tools/ci.sh
index 3ce96a96a9084..c018b55002281 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -82,19 +82,27 @@ function ci_cc3200_build {
 ########################################################################################
 # ports/esp32
 
-function ci_esp32_setup {
+function ci_esp32_setup_helper {
     git clone https://github.com/espressif/esp-idf.git
-    git -C esp-idf checkout v4.0.2
+    git -C esp-idf checkout $1
     git -C esp-idf submodule update --init \
         components/bt/controller/lib \
         components/bt/host/nimble/nimble \
-        components/esp_wifi/lib_esp32 \
+        components/esp_wifi \
         components/esptool_py/esptool \
         components/lwip/lwip \
         components/mbedtls/mbedtls
     ./esp-idf/install.sh
 }
 
+function ci_esp32_idf402_setup {
+    ci_esp32_setup_helper v4.0.2
+}
+
+function ci_esp32_idf43_setup {
+    ci_esp32_setup_helper v4.3-beta2
+}
+
 function ci_esp32_build {
     source esp-idf/export.sh
     make ${MAKEOPTS} -C mpy-cross
@@ -102,6 +110,9 @@ function ci_esp32_build {
     make ${MAKEOPTS} -C ports/esp32
     make ${MAKEOPTS} -C ports/esp32 clean
     make ${MAKEOPTS} -C ports/esp32 USER_C_MODULES=../../../examples/usercmodule/micropython.cmake
+    if [ -d $IDF_PATH/components/esp32s2 ]; then
+        make ${MAKEOPTS} -C ports/esp32 BOARD=GENERIC_S2
+    fi
 }
 
 ########################################################################################

From e5d2ddde25351f1ede7d0d1b00be632301962fb0 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 15 Apr 2021 13:02:34 +1000
Subject: [PATCH 0745/3533] esp32/machine_pin: Use rtc_gpio_deinit instead of
 gpio_reset_pin.

Commit 8a917ad2529ea3df5f47e2be5b4edf362d2d03f6 added the gpio_reset_pin()
call to make sure that pins that were used as ADC inputs could subsequently
be used as digital IO.  But calling gpio_reset_pin() will enable the
pull-up on the pin and so pull it high for a brief period.  Instead use
rtc_gpio_deinit() which will just reconfigure the pin as a digital IO and
do nothing else.

Fixes issue #7079 (see also #5771).

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/machine_pin.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/ports/esp32/machine_pin.c b/ports/esp32/machine_pin.c
index 8290c77a48263..8dbdd198490b2 100644
--- a/ports/esp32/machine_pin.c
+++ b/ports/esp32/machine_pin.c
@@ -30,6 +30,7 @@
 #include <string.h>
 
 #include "driver/gpio.h"
+#include "driver/rtc_io.h"
 
 #include "py/runtime.h"
 #include "py/mphal.h"
@@ -157,9 +158,11 @@ STATIC mp_obj_t machine_pin_obj_init_helper(const machine_pin_obj_t *self, size_
     mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
     mp_arg_parse_all(n_args, pos_args, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
 
-    // reset the pin first if this is a mode-setting init (grab it back from ADC)
+    // reset the pin to digital if this is a mode-setting init (grab it back from ADC)
     if (args[ARG_mode].u_obj != mp_const_none) {
-        gpio_reset_pin(self->id);
+        if (rtc_gpio_is_valid_gpio(self->id)) {
+            rtc_gpio_deinit(self->id);
+        }
     }
 
     // configure the pin for gpio

From f842a40df4d26bd74b92a3903096fc6b1709222d Mon Sep 17 00:00:00 2001
From: Tim Radvan <tim@tjvr.org>
Date: Fri, 2 Apr 2021 19:35:18 +0100
Subject: [PATCH 0746/3533] rp2/rp2_pio: Add fifo_join support for PIO.

The PIO state machines on the RP2040 have 4 word deep TX and RX FIFOs.  If
you only need one direction, you can "merge" them into either a single 8
word deep TX or RX FIFO.

We simply add constants to the PIO object, and set the appropriate bits in
`shiftctrl`.

Resolves #6854.

Signed-off-by: Tim Radvan <tim@tjvr.org>
---
 examples/rp2/pio_uart_rx.py | 1 +
 ports/rp2/modules/rp2.py    | 6 ++++--
 ports/rp2/rp2_pio.c         | 4 ++++
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/examples/rp2/pio_uart_rx.py b/examples/rp2/pio_uart_rx.py
index 41dfde3dad433..080b6bd6392bc 100644
--- a/examples/rp2/pio_uart_rx.py
+++ b/examples/rp2/pio_uart_rx.py
@@ -22,6 +22,7 @@
     autopush=True,
     push_thresh=8,
     in_shiftdir=rp2.PIO.SHIFT_RIGHT,
+    fifo_join=PIO.JOIN_RX,
 )
 def uart_rx_mini():
     # fmt: off
diff --git a/ports/rp2/modules/rp2.py b/ports/rp2/modules/rp2.py
index 17e35c73b7ce5..c7e4d1fdd943d 100644
--- a/ports/rp2/modules/rp2.py
+++ b/ports/rp2/modules/rp2.py
@@ -31,7 +31,8 @@ def __init__(
         autopush=False,
         autopull=False,
         push_thresh=32,
-        pull_thresh=32
+        pull_thresh=32,
+        fifo_join=0
     ):
         # uarray is a built-in module so importing it here won't require
         # scanning the filesystem.
@@ -40,7 +41,8 @@ def __init__(
         self.labels = {}
         execctrl = 0
         shiftctrl = (
-            (pull_thresh & 0x1F) << 25
+            fifo_join << 30
+            | (pull_thresh & 0x1F) << 25
             | (push_thresh & 0x1F) << 20
             | out_shiftdir << 19
             | in_shiftdir << 18
diff --git a/ports/rp2/rp2_pio.c b/ports/rp2/rp2_pio.c
index 5f93f10c26794..44928c0a885a9 100644
--- a/ports/rp2/rp2_pio.c
+++ b/ports/rp2/rp2_pio.c
@@ -360,6 +360,10 @@ STATIC const mp_rom_map_elem_t rp2_pio_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_SHIFT_LEFT), MP_ROM_INT(0) },
     { MP_ROM_QSTR(MP_QSTR_SHIFT_RIGHT), MP_ROM_INT(1) },
 
+    { MP_ROM_QSTR(MP_QSTR_JOIN_NONE), MP_ROM_INT(0) },
+    { MP_ROM_QSTR(MP_QSTR_JOIN_TX), MP_ROM_INT(1) },
+    { MP_ROM_QSTR(MP_QSTR_JOIN_RX), MP_ROM_INT(2) },
+
     { MP_ROM_QSTR(MP_QSTR_IRQ_SM0), MP_ROM_INT(0x100) },
     { MP_ROM_QSTR(MP_QSTR_IRQ_SM1), MP_ROM_INT(0x200) },
     { MP_ROM_QSTR(MP_QSTR_IRQ_SM2), MP_ROM_INT(0x400) },

From 7d911d20698b3b11269f34ecec97d3b4bfabac94 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sun, 18 Apr 2021 23:20:26 +1000
Subject: [PATCH 0747/3533] tests/net_inet: Add 'Strict-Transport-Security' to
 exp file.

Because micropython.org now adds this to the headers.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/net_inet/uasyncio_tcp_read_headers.py.exp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/net_inet/uasyncio_tcp_read_headers.py.exp b/tests/net_inet/uasyncio_tcp_read_headers.py.exp
index c200238dc6b83..932d2674cbd1e 100644
--- a/tests/net_inet/uasyncio_tcp_read_headers.py.exp
+++ b/tests/net_inet/uasyncio_tcp_read_headers.py.exp
@@ -5,6 +5,7 @@ b'Content-Length: 54'
 b'Connection: close'
 b'Vary: Accept-Encoding'
 b'ETag: "54306c85-36"'
+b'Strict-Transport-Security: max-age=15768000'
 b'Accept-Ranges: bytes'
 close
 done

From 321d1897c34f16243edf2c94913d7cf877a013d1 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 19 Apr 2021 00:11:51 +1000
Subject: [PATCH 0748/3533] all: Bump version to 1.15.

Signed-off-by: Damien George <damien@micropython.org>
---
 docs/conf.py  | 2 +-
 py/mpconfig.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/conf.py b/docs/conf.py
index dd6cc31fb8736..53cbf9baeddc0 100755
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -74,7 +74,7 @@
 #
 # We don't follow "The short X.Y version" vs "The full version, including alpha/beta/rc tags"
 # breakdown, so use the same version identifier for both to avoid confusion.
-version = release = '1.14'
+version = release = '1.15'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/py/mpconfig.h b/py/mpconfig.h
index b26fa2137a0b4..3dd83a34abe72 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -28,7 +28,7 @@
 
 // Current version of MicroPython
 #define MICROPY_VERSION_MAJOR 1
-#define MICROPY_VERSION_MINOR 14
+#define MICROPY_VERSION_MINOR 15
 #define MICROPY_VERSION_MICRO 0
 
 // Combined version as a 32-bit number for convenience

From b74dc546fc2d7d04853db3acc4dc6ed92cc77f67 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 20 Apr 2021 21:39:53 +1000
Subject: [PATCH 0749/3533] tools/metrics.py: Add rp2 port to table of ports
 that can be built.

Signed-off-by: Damien George <damien@micropython.org>
---
 tools/metrics.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/metrics.py b/tools/metrics.py
index 98291e25a9f06..c857d0733eef8 100755
--- a/tools/metrics.py
+++ b/tools/metrics.py
@@ -67,6 +67,7 @@ def __init__(self, name, dir, output, make_flags=None):
     "8": PortData("esp8266", "esp8266", "build-GENERIC/firmware.elf"),
     "3": PortData("esp32", "esp32", "build-GENERIC/micropython.elf"),
     "r": PortData("nrf", "nrf", "build-pca10040/firmware.elf"),
+    "p": PortData("rp2", "rp2", "build-PICO/firmware.elf"),
     "d": PortData("samd", "samd", "build-ADAFRUIT_ITSYBITSY_M4_EXPRESS/firmware.elf"),
 }
 

From 6e0f9b9262a2948391704d53eafec8d2bd2e5ad2 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 8 Apr 2021 16:12:32 +1000
Subject: [PATCH 0750/3533] stm32/boards/pllvalues.py: Support wider range of
 PLL values for F413.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/boards/pllvalues.py | 38 ++++++++++++++++++++++-----------
 1 file changed, 25 insertions(+), 13 deletions(-)

diff --git a/ports/stm32/boards/pllvalues.py b/ports/stm32/boards/pllvalues.py
index 619146cd47fac..e0fff40dd3fea 100644
--- a/ports/stm32/boards/pllvalues.py
+++ b/ports/stm32/boards/pllvalues.py
@@ -31,15 +31,26 @@ def __init__(
     range_vco_out=range(192, 432 + 1),
 )
 
-mcu_h7 = MCU(
-    range_sysclk=range(2, 400 + 1, 2),  # above 400MHz currently unsupported
-    range_m=range(1, 63 + 1),
-    range_n=range(4, 512 + 1),
-    range_p=range(2, 128 + 1, 2),
-    range_q=range(1, 128 + 1),
-    range_vco_in=range(1, 16 + 1),
-    range_vco_out=range(150, 960 + 1),  # 150-420=medium, 192-960=wide
-)
+mcu_table = {
+    "stm32f413": MCU(
+        range_sysclk=range(2, 100 + 1, 2),
+        range_m=range(2, 63 + 1),
+        range_n=range(50, 432 + 1),
+        range_p=range(2, 8 + 1, 2),
+        range_q=range(2, 15 + 1),
+        range_vco_in=range(1, 2 + 1),
+        range_vco_out=range(100, 432 + 1),
+    ),
+    "stm32h7": MCU(
+        range_sysclk=range(2, 400 + 1, 2),  # above 400MHz currently unsupported
+        range_m=range(1, 63 + 1),
+        range_n=range(4, 512 + 1),
+        range_p=range(2, 128 + 1, 2),
+        range_q=range(1, 128 + 1),
+        range_vco_in=range(1, 16 + 1),
+        range_vco_out=range(150, 960 + 1),  # 150-420=medium, 192-960=wide
+    ),
+}
 
 
 def close_int(x):
@@ -271,10 +282,11 @@ def main():
         hse = int(argv[0])
 
     # Select MCU parameters
-    if mcu_series.startswith("stm32h7"):
-        mcu = mcu_h7
-    else:
-        mcu = mcu_default
+    mcu = mcu_default
+    for m in mcu_table:
+        if mcu_series.startswith(m):
+            mcu = mcu_table[m]
+            break
 
     # Relax constraint on PLLQ being 48MHz on MCUs which have separate PLLs for 48MHz
     relax_pll48 = mcu_series.startswith(("stm32f413", "stm32f7", "stm32h7"))

From 00d6a79b3d5dc80d840dc1d51166e7d95856b3d6 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 21 Apr 2021 14:06:14 +1000
Subject: [PATCH 0751/3533] stm32/machine_timer: Improve usability of Timer
 constructor and init.

Improvements are:
- Default period is 1000ms with callback disabled.
- if period is not specified then it's not updated (previously, if period
  was not specified then it was set to -1 and running the timer callback as
  fast as possible, making the REPL unresponsive).
- Use uint64_t to compute delta_ms, and raise a ValueError if the period is
  too large.
- If callback is not specified then it's not updated.
- Specifying None for the callback will disable the timer.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/machine_timer.c | 31 ++++++++++++++++++++++---------
 1 file changed, 22 insertions(+), 9 deletions(-)

diff --git a/ports/stm32/machine_timer.c b/ports/stm32/machine_timer.c
index e9b16ab72f4b9..c37ac87672ac2 100644
--- a/ports/stm32/machine_timer.c
+++ b/ports/stm32/machine_timer.c
@@ -42,7 +42,7 @@ STATIC mp_obj_t machine_timer_init_helper(machine_timer_obj_t *self, size_t n_ar
     enum { ARG_mode, ARG_callback, ARG_period, ARG_tick_hz, ARG_freq, };
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_mode,         MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = SOFT_TIMER_MODE_PERIODIC} },
-        { MP_QSTR_callback,     MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
+        { MP_QSTR_callback,     MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
         { MP_QSTR_period,       MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 0xffffffff} },
         { MP_QSTR_tick_hz,      MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 1000} },
         { MP_QSTR_freq,         MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
@@ -53,24 +53,35 @@ STATIC mp_obj_t machine_timer_init_helper(machine_timer_obj_t *self, size_t n_ar
     mp_arg_parse_all(n_args, pos_args, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
 
     self->mode = args[ARG_mode].u_int;
+
+    uint64_t delta_ms = self->delta_ms;
     if (args[ARG_freq].u_obj != mp_const_none) {
         // Frequency specified in Hz
         #if MICROPY_PY_BUILTINS_FLOAT
-        self->delta_ms = (uint32_t)(MICROPY_FLOAT_CONST(1000.0) / mp_obj_get_float(args[ARG_freq].u_obj));
+        delta_ms = (uint32_t)(MICROPY_FLOAT_CONST(1000.0) / mp_obj_get_float(args[ARG_freq].u_obj));
         #else
-        self->delta_ms = 1000 / mp_obj_get_int(args[ARG_freq].u_obj);
+        delta_ms = 1000 / mp_obj_get_int(args[ARG_freq].u_obj);
         #endif
-    } else {
+    } else if (args[ARG_period].u_int != 0xffffffff) {
         // Period specified
-        self->delta_ms = args[ARG_period].u_int * 1000 / args[ARG_tick_hz].u_int;
+        delta_ms = (uint64_t)args[ARG_period].u_int * 1000 / args[ARG_tick_hz].u_int;
     }
-    if (self->delta_ms < 1) {
-        self->delta_ms = 1;
+
+    if (delta_ms < 1) {
+        delta_ms = 1;
+    } else if (delta_ms >= 0x40000000) {
+        mp_raise_ValueError(MP_ERROR_TEXT("period too large"));
     }
+    self->delta_ms = (uint32_t)delta_ms;
     self->expiry_ms = mp_hal_ticks_ms() + self->delta_ms;
 
-    self->callback = args[ARG_callback].u_obj;
-    soft_timer_insert(self);
+    if (args[ARG_callback].u_obj != MP_OBJ_NULL) {
+        self->callback = args[ARG_callback].u_obj;
+    }
+
+    if (self->callback != mp_const_none) {
+        soft_timer_insert(self);
+    }
 
     return mp_const_none;
 }
@@ -78,6 +89,8 @@ STATIC mp_obj_t machine_timer_init_helper(machine_timer_obj_t *self, size_t n_ar
 STATIC mp_obj_t machine_timer_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
     machine_timer_obj_t *self = m_new_obj(machine_timer_obj_t);
     self->pairheap.base.type = &machine_timer_type;
+    self->delta_ms = 1000;
+    self->callback = mp_const_none;
 
     // Get timer id (only soft timer (-1) supported at the moment)
     mp_int_t id = -1;

From 5669a6095444e079af5e38b2b04ca5ff2e7c11f9 Mon Sep 17 00:00:00 2001
From: David Michieli <dmm@planetinnovation.com.au>
Date: Thu, 22 Apr 2021 13:43:50 +1000
Subject: [PATCH 0752/3533] stm32/mboot: Allow unpacking dfu without secret
 key.

- unpack-dfu command no longer requies a secret key to be present
- pack-dfu command raises an exception if no secret key is found
---
 ports/stm32/mboot/mboot_pack_dfu.py | 13 ++++++++++---
 tools/ci.sh                         |  4 ++++
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/ports/stm32/mboot/mboot_pack_dfu.py b/ports/stm32/mboot/mboot_pack_dfu.py
index 540057e06ee8c..683cdd0a71753 100644
--- a/ports/stm32/mboot/mboot_pack_dfu.py
+++ b/ports/stm32/mboot/mboot_pack_dfu.py
@@ -86,9 +86,14 @@ def save(self):
 
     def load(self):
         with open(self.filename) as f:
-            self.sign_sk = self._load_data("mboot_pack_sign_secret_key", f.readline())
-            self.sign_pk = self._load_data("mboot_pack_sign_public_key", f.readline())
-            self.secretbox = self._load_data("mboot_pack_secretbox_key", f.readline())
+            for line in f:
+                for key, attr in (
+                    ("mboot_pack_sign_secret_key", "sign_sk"),
+                    ("mboot_pack_sign_public_key", "sign_pk"),
+                    ("mboot_pack_secretbox_key", "secretbox"),
+                ):
+                    if key in line:
+                        setattr(self, attr, self._load_data(key, line))
 
 
 def dfu_read(filename):
@@ -135,6 +140,8 @@ def encrypt(keys, data):
 
 
 def sign(keys, data):
+    if not hasattr(keys, "sign_sk"):
+        raise Exception("packing a dfu requires a secret key")
     return pyhy.hydro_sign_create(data, MBOOT_PACK_HYDRO_CONTEXT, keys.sign_sk)
 
 
diff --git a/tools/ci.sh b/tools/ci.sh
index c018b55002281..33cf364ddd22d 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -243,6 +243,10 @@ function ci_stm32_nucleo_build {
     BUILD_WB55=ports/stm32/build-NUCLEO_WB55
     python3 ports/stm32/mboot/mboot_pack_dfu.py -k $BOARD_WB55/mboot_keys.h unpack-dfu $BUILD_WB55/firmware.pack.dfu $BUILD_WB55/firmware.unpack.dfu
     diff $BUILD_WB55/firmware.unpack.dfu $BUILD_WB55/firmware.dfu
+    # Test unpack-dfu command works without a secret key
+    tail -n +2 $BOARD_WB55/mboot_keys.h > $BOARD_WB55/mboot_keys_no_sk.h
+    python3 ports/stm32/mboot/mboot_pack_dfu.py -k $BOARD_WB55/mboot_keys_no_sk.h unpack-dfu $BUILD_WB55/firmware.pack.dfu $BUILD_WB55/firmware.unpack_no_sk.dfu
+    diff $BUILD_WB55/firmware.unpack.dfu $BUILD_WB55/firmware.unpack_no_sk.dfu
 }
 
 ########################################################################################

From 3c4bfd1dec28ffbefc6379dedeaa24feaa2ef373 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 20 Apr 2021 17:11:13 +1000
Subject: [PATCH 0753/3533] py/objexcept: Support errno attribute on OSError
 exceptions.

This commit adds the errno attribute to exceptions, so code can retrieve
errno codes from an OSError using exc.errno.

The implementation here simply lets `errno` (and the existing `value`)
attributes work on any exception instance (they both alias args[0]).  This
is for efficiency and to keep code size down.  The pros and cons of this
are:

Pros:
- more compatible with CPython, less difference to document and learn
- OSError().errno will correctly return None, whereas the current way of
  doing it via OSError().args[0] will raise an IndexError
- it reduces code size on most bare-metal ports (because they already have
  the errno qstr)
- for Python code that uses exc.errno the generated bytecode is 2 bytes
  smaller and more efficient to execute (compared with exc.args[0]); so
  bytecode loaded to RAM saves 2 bytes RAM for each use of this attribute,
  and bytecode that is frozen saves 2 bytes flash/ROM for each use
- it's easier/shorter to type, and saves 2 bytes of space in .py files that
  use it (for each use)

Cons:
- increases code size by 4-8 bytes on minimal ports that don't already have
  the `errno` qstr
- all exceptions now have .errno and .value attributes (a cpydiff test is
  added to address this)

See also #2407.

Signed-off-by: Damien George <damien@micropython.org>
---
 docs/library/builtins.rst              |  4 ----
 docs/library/uerrno.rst                |  4 ++--
 py/objexcept.c                         |  4 +++-
 tests/basics/exception1.py             |  5 +++++
 tests/basics/subclass_native3.py       | 20 ++++++++++++++++++++
 tests/cpydiff/types_exception_attrs.py |  9 +++++++++
 6 files changed, 39 insertions(+), 7 deletions(-)
 create mode 100644 tests/cpydiff/types_exception_attrs.py

diff --git a/docs/library/builtins.rst b/docs/library/builtins.rst
index 365248dc764db..3029cd9e3bd34 100644
--- a/docs/library/builtins.rst
+++ b/docs/library/builtins.rst
@@ -176,10 +176,6 @@ Exceptions
 
 .. exception:: OSError
 
-    |see_cpython| `python:OSError`. MicroPython doesn't implement ``errno``
-    attribute, instead use the standard way to access exception arguments:
-    ``exc.args[0]``.
-
 .. exception:: RuntimeError
 
 .. exception:: StopIteration
diff --git a/docs/library/uerrno.rst b/docs/library/uerrno.rst
index def01362f1387..1d60c80e11c27 100644
--- a/docs/library/uerrno.rst
+++ b/docs/library/uerrno.rst
@@ -16,13 +16,13 @@ Constants
 
     Error codes, based on ANSI C/POSIX standard. All error codes start with
     "E". As mentioned above, inventory of the codes depends on
-    :term:`MicroPython port`. Errors are usually accessible as ``exc.args[0]``
+    :term:`MicroPython port`. Errors are usually accessible as ``exc.errno``
     where ``exc`` is an instance of `OSError`. Usage example::
 
         try:
             uos.mkdir("my_dir")
         except OSError as exc:
-            if exc.args[0] == uerrno.EEXIST:
+            if exc.errno == uerrno.EEXIST:
                 print("Directory already exists")
 
 .. data:: errorcode
diff --git a/py/objexcept.c b/py/objexcept.c
index 885032c3e3eed..f6bffec38353d 100644
--- a/py/objexcept.c
+++ b/py/objexcept.c
@@ -261,7 +261,9 @@ void mp_obj_exception_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
     if (attr == MP_QSTR_args) {
         decompress_error_text_maybe(self);
         dest[0] = MP_OBJ_FROM_PTR(self->args);
-    } else if (self->base.type == &mp_type_StopIteration && attr == MP_QSTR_value) {
+    } else if (attr == MP_QSTR_value || attr == MP_QSTR_errno) {
+        // These are aliases for args[0]: .value for StopIteration and .errno for OSError.
+        // For efficiency let these attributes apply to all exception instances.
         dest[0] = mp_obj_exception_get_value(self_in);
     }
 }
diff --git a/tests/basics/exception1.py b/tests/basics/exception1.py
index d83764cb939cc..a0ca8a74e225e 100644
--- a/tests/basics/exception1.py
+++ b/tests/basics/exception1.py
@@ -1,3 +1,5 @@
+# test basic properties of exceptions
+
 print(repr(IndexError()))
 print(str(IndexError()))
 
@@ -12,3 +14,6 @@
 print(s.value)
 s = StopIteration(1, 2, 3)
 print(s.value)
+
+print(OSError().errno)
+print(OSError(1, "msg").errno)
diff --git a/tests/basics/subclass_native3.py b/tests/basics/subclass_native3.py
index 6745b77bb2836..ac5aabfed7b25 100644
--- a/tests/basics/subclass_native3.py
+++ b/tests/basics/subclass_native3.py
@@ -1,6 +1,10 @@
+# test subclassing a native exception
+
+
 class MyExc(Exception):
     pass
 
+
 e = MyExc(100, "Some error")
 print(e)
 print(repr(e))
@@ -20,3 +24,19 @@ class MyExc(Exception):
     raise MyExc("Some error2")
 except:
     print("Caught user exception")
+
+
+class MyStopIteration(StopIteration):
+    pass
+
+
+print(MyStopIteration().value)
+print(MyStopIteration(1).value)
+
+
+class MyOSError(OSError):
+    pass
+
+
+print(MyOSError().errno)
+print(MyOSError(1, "msg").errno)
diff --git a/tests/cpydiff/types_exception_attrs.py b/tests/cpydiff/types_exception_attrs.py
new file mode 100644
index 0000000000000..ad72b62a61a5d
--- /dev/null
+++ b/tests/cpydiff/types_exception_attrs.py
@@ -0,0 +1,9 @@
+"""
+categories: Types,Exception
+description: All exceptions have readable ``value`` and ``errno`` attributes, not just ``StopIteration`` and ``OSError``.
+cause: MicroPython is optimised to reduce code size.
+workaround: Only use ``value`` on ``StopIteration`` exceptions, and ``errno`` on ``OSError`` exceptions.  Do not use or rely on these attributes on other exceptions.
+"""
+e = Exception(1)
+print(e.value)
+print(e.errno)

From ac1d01d43ee02d294f5fe762ae608fbb3f72babb Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 20 Apr 2021 17:11:59 +1000
Subject: [PATCH 0754/3533] tools/upip.py: Use .errno instead of .args[0] for
 OSError exceptions.

Signed-off-by: Damien George <damien@micropython.org>
---
 tools/upip.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/upip.py b/tools/upip.py
index aa8aecedfc23f..728b843c94017 100644
--- a/tools/upip.py
+++ b/tools/upip.py
@@ -60,7 +60,7 @@ def _makedirs(name, mode=0o777):
             os.mkdir(s)
             ret = True
         except OSError as e:
-            if e.args[0] != errno.EEXIST and e.args[0] != errno.EISDIR:
+            if e.errno != errno.EEXIST and e.errno != errno.EISDIR:
                 raise e
             ret = False
     return ret

From 342d55529d6f3312fc158d7af005f56d5e30adef Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 20 Apr 2021 17:12:08 +1000
Subject: [PATCH 0755/3533] extmod/uasyncio: Use .errno instead of .args[0] for
 OSError exceptions.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/uasyncio/stream.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extmod/uasyncio/stream.py b/extmod/uasyncio/stream.py
index b6d787e4f0336..395ff1f6afdf9 100644
--- a/extmod/uasyncio/stream.py
+++ b/extmod/uasyncio/stream.py
@@ -82,7 +82,7 @@ async def open_connection(host, port):
     try:
         s.connect(ai[-1])
     except OSError as er:
-        if er.args[0] != EINPROGRESS:
+        if er.errno != EINPROGRESS:
             raise er
     yield core._io_queue.queue_write(s)
     return ss, ss

From 3123f6918ba18b0a3f7a89500b450f4cb15e1aee Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 22 Apr 2021 19:32:21 +1000
Subject: [PATCH 0756/3533] tests: Use .errno instead of .args[0] for OSError
 exceptions.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/extmod/btree1.py                     |  2 +-
 tests/extmod/btree_error.py                |  2 +-
 tests/extmod/uselect_poll_basic.py         |  2 +-
 tests/extmod/usocket_tcp_basic.py          |  2 +-
 tests/extmod/usocket_udp_nonblock.py       |  2 +-
 tests/extmod/vfs_fat_fileio1.py            | 10 +++++-----
 tests/extmod/vfs_fat_fileio2.py            | 12 ++++++------
 tests/extmod/vfs_fat_more.py               |  2 +-
 tests/extmod/vfs_fat_ramdisk.py            |  6 +++---
 tests/extmod/websocket_basic.py            |  2 +-
 tests/multi_net/tcp_accept_recv.py         |  2 +-
 tests/multi_net/tcp_client_rst.py          |  2 +-
 tests/multi_net/uasyncio_tcp_client_rst.py |  2 +-
 tests/net_hosted/accept_nonblock.py        |  2 +-
 tests/net_hosted/accept_timeout.py         |  2 +-
 tests/net_hosted/connect_nonblock.py       |  2 +-
 tests/net_hosted/connect_nonblock_xfer.py  | 10 +++++-----
 tests/net_inet/ssl_errors.py               |  2 +-
 tests/net_inet/test_tls_nonblock.py        |  6 +++---
 19 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/tests/extmod/btree1.py b/tests/extmod/btree1.py
index 4890d92b4202c..1f4853eaa365e 100644
--- a/tests/extmod/btree1.py
+++ b/tests/extmod/btree1.py
@@ -65,7 +65,7 @@
 try:
     db.seq(b"foo1")
 except OSError as e:
-    print(e.args[0] == uerrno.EINVAL)
+    print(e.errno == uerrno.EINVAL)
 
 print(list(db.keys()))
 print(list(db.values()))
diff --git a/tests/extmod/btree_error.py b/tests/extmod/btree_error.py
index 00e07ec8c7ae6..b64769e8840bf 100644
--- a/tests/extmod/btree_error.py
+++ b/tests/extmod/btree_error.py
@@ -27,7 +27,7 @@ def ioctl(self, cmd, arg):
 try:
     db = btree.open(Device(), pagesize=511)
 except OSError as er:
-    print("OSError", er.args[0] == uerrno.EINVAL)
+    print("OSError", er.errno == uerrno.EINVAL)
 
 # Valid pagesize, device returns error on read; errno comes from Device.readinto
 try:
diff --git a/tests/extmod/uselect_poll_basic.py b/tests/extmod/uselect_poll_basic.py
index 07328365b31da..97fbd6fd158b8 100644
--- a/tests/extmod/uselect_poll_basic.py
+++ b/tests/extmod/uselect_poll_basic.py
@@ -33,7 +33,7 @@
 try:
     poller.modify(s, select.POLLIN)
 except OSError as e:
-    assert e.args[0] == errno.ENOENT
+    assert e.errno == errno.ENOENT
 
 # poll after closing the socket, should return POLLNVAL
 poller.register(s)
diff --git a/tests/extmod/usocket_tcp_basic.py b/tests/extmod/usocket_tcp_basic.py
index 368dfe3c98f4a..c2fe8cd14cccd 100644
--- a/tests/extmod/usocket_tcp_basic.py
+++ b/tests/extmod/usocket_tcp_basic.py
@@ -14,4 +14,4 @@
 try:
     s.recv(1)
 except OSError as er:
-    print("ENOTCONN:", er.args[0] == errno.ENOTCONN)
+    print("ENOTCONN:", er.errno == errno.ENOTCONN)
diff --git a/tests/extmod/usocket_udp_nonblock.py b/tests/extmod/usocket_udp_nonblock.py
index 7dc0e562a3178..bc560de142e0c 100644
--- a/tests/extmod/usocket_udp_nonblock.py
+++ b/tests/extmod/usocket_udp_nonblock.py
@@ -17,4 +17,4 @@
 try:
     s.recv(1)
 except OSError as er:
-    print("EAGAIN:", er.args[0] == errno.EAGAIN)
+    print("EAGAIN:", er.errno == errno.EAGAIN)
diff --git a/tests/extmod/vfs_fat_fileio1.py b/tests/extmod/vfs_fat_fileio1.py
index e42911093f402..7da08b80cf332 100644
--- a/tests/extmod/vfs_fat_fileio1.py
+++ b/tests/extmod/vfs_fat_fileio1.py
@@ -58,22 +58,22 @@ def ioctl(self, op, arg):
 try:
     f.write("world!")
 except OSError as e:
-    print(e.args[0] == uerrno.EINVAL)
+    print(e.errno == uerrno.EINVAL)
 
 try:
     f.read()
 except OSError as e:
-    print(e.args[0] == uerrno.EINVAL)
+    print(e.errno == uerrno.EINVAL)
 
 try:
     f.flush()
 except OSError as e:
-    print(e.args[0] == uerrno.EINVAL)
+    print(e.errno == uerrno.EINVAL)
 
 try:
     open("foo_file.txt", "x")
 except OSError as e:
-    print(e.args[0] == uerrno.EEXIST)
+    print(e.errno == uerrno.EEXIST)
 
 with open("foo_file.txt", "a") as f:
     f.write("world!")
@@ -105,7 +105,7 @@ def ioctl(self, op, arg):
 try:
     vfs.rmdir("foo_file.txt")
 except OSError as e:
-    print(e.args[0] == 20)  # uerrno.ENOTDIR
+    print(e.errno == 20)  # uerrno.ENOTDIR
 
 vfs.remove("foo_file.txt")
 print(list(vfs.ilistdir()))
diff --git a/tests/extmod/vfs_fat_fileio2.py b/tests/extmod/vfs_fat_fileio2.py
index 531dd91f9490a..13978a0af693c 100644
--- a/tests/extmod/vfs_fat_fileio2.py
+++ b/tests/extmod/vfs_fat_fileio2.py
@@ -51,22 +51,22 @@ def ioctl(self, op, arg):
 try:
     vfs.mkdir("foo_dir")
 except OSError as e:
-    print(e.args[0] == uerrno.EEXIST)
+    print(e.errno == uerrno.EEXIST)
 
 try:
     vfs.remove("foo_dir")
 except OSError as e:
-    print(e.args[0] == uerrno.EISDIR)
+    print(e.errno == uerrno.EISDIR)
 
 try:
     vfs.remove("no_file.txt")
 except OSError as e:
-    print(e.args[0] == uerrno.ENOENT)
+    print(e.errno == uerrno.ENOENT)
 
 try:
     vfs.rename("foo_dir", "/null/file")
 except OSError as e:
-    print(e.args[0] == uerrno.ENOENT)
+    print(e.errno == uerrno.ENOENT)
 
 # file in dir
 with open("foo_dir/file-in-dir.txt", "w+t") as f:
@@ -82,7 +82,7 @@ def ioctl(self, op, arg):
 try:
     vfs.rmdir("foo_dir")
 except OSError as e:
-    print(e.args[0] == uerrno.EACCES)
+    print(e.errno == uerrno.EACCES)
 
 # trim full path
 vfs.rename("foo_dir/file-in-dir.txt", "foo_dir/file.txt")
@@ -111,5 +111,5 @@ def ioctl(self, op, arg):
     f = open("large_file.txt", "wb")
     f.write(bytearray(bsize * free))
 except OSError as e:
-    print("ENOSPC:", e.args[0] == 28)  # uerrno.ENOSPC
+    print("ENOSPC:", e.errno == 28)  # uerrno.ENOSPC
 f.close()
diff --git a/tests/extmod/vfs_fat_more.py b/tests/extmod/vfs_fat_more.py
index 076802f6ad5eb..f9b54fda00ff8 100644
--- a/tests/extmod/vfs_fat_more.py
+++ b/tests/extmod/vfs_fat_more.py
@@ -90,7 +90,7 @@ def ioctl(self, op, arg):
     try:
         uos.mkdir(exist)
     except OSError as er:
-        print("mkdir OSError", er.args[0] == 17)  # EEXIST
+        print("mkdir OSError", er.errno == 17)  # EEXIST
 
 uos.chdir("/")
 print(uos.stat("test5.txt")[:-3])
diff --git a/tests/extmod/vfs_fat_ramdisk.py b/tests/extmod/vfs_fat_ramdisk.py
index 9a68d94fedefa..4decb5557dd77 100644
--- a/tests/extmod/vfs_fat_ramdisk.py
+++ b/tests/extmod/vfs_fat_ramdisk.py
@@ -57,7 +57,7 @@ def ioctl(self, op, arg):
 try:
     vfs.stat("no_file.txt")
 except OSError as e:
-    print(e.args[0] == uerrno.ENOENT)
+    print(e.errno == uerrno.ENOENT)
 
 with vfs.open("foo_file.txt", "w") as f:
     f.write("hello!")
@@ -80,7 +80,7 @@ def ioctl(self, op, arg):
 try:
     vfs.chdir("sub_file.txt")
 except OSError as e:
-    print(e.args[0] == uerrno.ENOENT)
+    print(e.errno == uerrno.ENOENT)
 
 vfs.chdir("..")
 print("getcwd:", vfs.getcwd())
@@ -94,4 +94,4 @@ def ioctl(self, op, arg):
 try:
     vfs.ilistdir(b"no_exist")
 except OSError as e:
-    print("ENOENT:", e.args[0] == uerrno.ENOENT)
+    print("ENOENT:", e.errno == uerrno.ENOENT)
diff --git a/tests/extmod/websocket_basic.py b/tests/extmod/websocket_basic.py
index 10396e914d652..a07542f965662 100644
--- a/tests/extmod/websocket_basic.py
+++ b/tests/extmod/websocket_basic.py
@@ -59,4 +59,4 @@ def ws_write(msg, sz):
 try:
     ws.ioctl(-1)
 except OSError as e:
-    print("ioctl: EINVAL:", e.args[0] == uerrno.EINVAL)
+    print("ioctl: EINVAL:", e.errno == uerrno.EINVAL)
diff --git a/tests/multi_net/tcp_accept_recv.py b/tests/multi_net/tcp_accept_recv.py
index d61108ed1c8bd..f93ede3bf40ad 100644
--- a/tests/multi_net/tcp_accept_recv.py
+++ b/tests/multi_net/tcp_accept_recv.py
@@ -17,7 +17,7 @@ def instance0():
     try:
         print("recv", s.recv(10))  # should raise Errno 107 ENOTCONN
     except OSError as er:
-        print(er.args[0])
+        print(er.errno)
     s.close()
 
 
diff --git a/tests/multi_net/tcp_client_rst.py b/tests/multi_net/tcp_client_rst.py
index 08f262db50810..14da8b1470f22 100644
--- a/tests/multi_net/tcp_client_rst.py
+++ b/tests/multi_net/tcp_client_rst.py
@@ -33,7 +33,7 @@ def instance0():
         print(s2.recv(10))
         print(convert_poll_list(poll.poll(1000)))
     except OSError as er:
-        print(er.args[0])
+        print(er.errno)
     print(convert_poll_list(poll.poll(1000)))
     # TODO lwip raises here but apparently it shouldn't
     print(s2.recv(10))
diff --git a/tests/multi_net/uasyncio_tcp_client_rst.py b/tests/multi_net/uasyncio_tcp_client_rst.py
index a3a05490c776b..d81f22748e444 100644
--- a/tests/multi_net/uasyncio_tcp_client_rst.py
+++ b/tests/multi_net/uasyncio_tcp_client_rst.py
@@ -24,7 +24,7 @@ async def handle_connection(reader, writer):
         writer.close()
         await writer.wait_closed()
     except OSError as er:
-        print("OSError", er.args[0])
+        print("OSError", er.errno)
     ev.set()
 
 
diff --git a/tests/net_hosted/accept_nonblock.py b/tests/net_hosted/accept_nonblock.py
index 941965e178cfb..d17e287498cd4 100644
--- a/tests/net_hosted/accept_nonblock.py
+++ b/tests/net_hosted/accept_nonblock.py
@@ -12,5 +12,5 @@
 try:
     s.accept()
 except OSError as er:
-    print(er.args[0] == 11)  # 11 is EAGAIN
+    print(er.errno == 11)  # 11 is EAGAIN
 s.close()
diff --git a/tests/net_hosted/accept_timeout.py b/tests/net_hosted/accept_timeout.py
index 5f528d557d8d3..734fe217cad34 100644
--- a/tests/net_hosted/accept_timeout.py
+++ b/tests/net_hosted/accept_timeout.py
@@ -18,5 +18,5 @@
 try:
     s.accept()
 except OSError as er:
-    print(er.args[0] in (errno.ETIMEDOUT, "timed out"))  # CPython uses a string instead of errno
+    print(er.errno in (errno.ETIMEDOUT, "timed out"))  # CPython uses a string instead of errno
 s.close()
diff --git a/tests/net_hosted/connect_nonblock.py b/tests/net_hosted/connect_nonblock.py
index c024b65a0a9a3..4b8055c1615a9 100644
--- a/tests/net_hosted/connect_nonblock.py
+++ b/tests/net_hosted/connect_nonblock.py
@@ -13,7 +13,7 @@ def test(peer_addr):
     try:
         s.connect(peer_addr)
     except OSError as er:
-        print(er.args[0] == errno.EINPROGRESS)
+        print(er.errno == errno.EINPROGRESS)
     s.close()
 
 
diff --git a/tests/net_hosted/connect_nonblock_xfer.py b/tests/net_hosted/connect_nonblock_xfer.py
index feb648ea0aeff..1a0b2422765c4 100644
--- a/tests/net_hosted/connect_nonblock_xfer.py
+++ b/tests/net_hosted/connect_nonblock_xfer.py
@@ -25,9 +25,9 @@ def do_connect(peer_addr, tls, handshake):
         # print("Connecting to", peer_addr)
         s.connect(peer_addr)
     except OSError as er:
-        print("connect:", er.args[0] == errno.EINPROGRESS)
-        if er.args[0] != errno.EINPROGRESS:
-            print("  got", er.args[0])
+        print("connect:", er.errno == errno.EINPROGRESS)
+        if er.errno != errno.EINPROGRESS:
+            print("  got", er.errno)
     # wrap with ssl/tls if desired
     if tls:
         try:
@@ -67,7 +67,7 @@ def test(peer_addr, tls=False, handshake=False):
         except OSError as er:
             #
             dp(er)
-            print("send:", er.args[0] in (errno.EAGAIN, errno.EINPROGRESS))
+            print("send:", er.errno in (errno.EAGAIN, errno.EINPROGRESS))
         s.close()
     else:  # fake it...
         print("connect:", True)
@@ -103,7 +103,7 @@ def test(peer_addr, tls=False, handshake=False):
             print("recv:", s.recv(10))
         except OSError as er:
             dp(er)
-            print("recv:", er.args[0] == errno.EAGAIN)
+            print("recv:", er.errno == errno.EAGAIN)
         s.close()
     else:  # fake it...
         print("connect:", True)
diff --git a/tests/net_inet/ssl_errors.py b/tests/net_inet/ssl_errors.py
index fd281b1c499c3..ece1f6e253b42 100644
--- a/tests/net_inet/ssl_errors.py
+++ b/tests/net_inet/ssl_errors.py
@@ -17,7 +17,7 @@ def test(addr, hostname, block=True):
         s.connect(addr)
         print("connected")
     except OSError as e:
-        if e.args[0] != errno.EINPROGRESS:
+        if e.errno != errno.EINPROGRESS:
             raise
         print("EINPROGRESS")
 
diff --git a/tests/net_inet/test_tls_nonblock.py b/tests/net_inet/test_tls_nonblock.py
index c27ead3d50fb7..54abc6966fc05 100644
--- a/tests/net_inet/test_tls_nonblock.py
+++ b/tests/net_inet/test_tls_nonblock.py
@@ -16,7 +16,7 @@ def test_one(site, opts):
         s.connect(addr)
         raise OSError(-1, "connect blocks")
     except OSError as e:
-        if e.args[0] != errno.EINPROGRESS:
+        if e.errno != errno.EINPROGRESS:
             raise
 
     if sys.implementation.name != "micropython":
@@ -31,7 +31,7 @@ def test_one(site, opts):
             else:
                 s = ssl.wrap_socket(s, do_handshake_on_connect=False)
         except OSError as e:
-            if e.args[0] != errno.EINPROGRESS:
+            if e.errno != errno.EINPROGRESS:
                 raise
         print("wrapped")
 
@@ -69,7 +69,7 @@ def test_one(site, opts):
             try:
                 b = s.read(128)
             except OSError as err:
-                if err.args[0] == 2:  # 2=ssl.SSL_ERROR_WANT_READ:
+                if err.errno == 2:  # 2=ssl.SSL_ERROR_WANT_READ:
                     continue
                 raise
             if b is None:

From 178198a01df51b5f4c5ef9f38ab2fb8f6269d5f4 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 21 Apr 2021 11:00:43 +1000
Subject: [PATCH 0757/3533] tools/pyboard.py: Support opening serial port in
 exclusive mode.

This is now the default, but can be overridden with CLI `--no-exclusive`,
or constructing `Pyboard(..., exclusive=False)`.

Signed-off-by: Damien George <damien@micropython.org>
---
 tools/pyboard.py | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/tools/pyboard.py b/tools/pyboard.py
index 069f7490d0dd1..29a15f7eae25d 100755
--- a/tools/pyboard.py
+++ b/tools/pyboard.py
@@ -4,7 +4,7 @@
 #
 # The MIT License (MIT)
 #
-# Copyright (c) 2014-2019 Damien P. George
+# Copyright (c) 2014-2021 Damien P. George
 # Copyright (c) 2017 Paul Sokolovsky
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -252,7 +252,9 @@ def inWaiting(self):
 
 
 class Pyboard:
-    def __init__(self, device, baudrate=115200, user="micro", password="python", wait=0):
+    def __init__(
+        self, device, baudrate=115200, user="micro", password="python", wait=0, exclusive=True
+    ):
         self.use_raw_paste = True
         if device.startswith("exec:"):
             self.serial = ProcessToSerial(device[len("exec:") :])
@@ -264,10 +266,15 @@ def __init__(self, device, baudrate=115200, user="micro", password="python", wai
         else:
             import serial
 
+            # Set options, and exclusive if pyserial supports it
+            serial_kwargs = {"baudrate": baudrate, "interCharTimeout": 1}
+            if serial.__version__ >= "3.3":
+                serial_kwargs["exclusive"] = exclusive
+
             delayed = False
             for attempt in range(wait + 1):
                 try:
-                    self.serial = serial.Serial(device, baudrate=baudrate, interCharTimeout=1)
+                    self.serial = serial.Serial(device, **serial_kwargs)
                     break
                 except (OSError, IOError):  # Py2 and Py3 have different errors
                     if wait == 0:
@@ -650,6 +657,11 @@ def main():
         action="store_true",
         help="Do not follow the output after running the scripts.",
     )
+    group.add_argument(
+        "--no-exclusive",
+        action="store_true",
+        help="Do not try to open the serial device for exclusive access.",
+    )
     cmd_parser.add_argument(
         "-f",
         "--filesystem",
@@ -662,7 +674,9 @@ def main():
 
     # open the connection to the pyboard
     try:
-        pyb = Pyboard(args.device, args.baudrate, args.user, args.password, args.wait)
+        pyb = Pyboard(
+            args.device, args.baudrate, args.user, args.password, args.wait, not args.no_exclusive
+        )
     except PyboardError as er:
         print(er)
         sys.exit(1)

From df4e9bdf5c69e36775de313b098651bbd97132a7 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 22 Apr 2021 10:26:52 +1000
Subject: [PATCH 0758/3533] esp32/CMakeLists.txt: Require CMake version 3.12.

Because "find_package(Python3 ...)" requires at least this version of
CMake.  And other features like GREATER_EQUAL and COMMAND_EXPAND_LISTS need
at least CMake 3.7 and 3.8 respectively.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/esp32/CMakeLists.txt b/ports/esp32/CMakeLists.txt
index fa419202f90d0..29409adc7414f 100644
--- a/ports/esp32/CMakeLists.txt
+++ b/ports/esp32/CMakeLists.txt
@@ -1,6 +1,6 @@
 # Top-level cmake file for building MicroPython on ESP32.
 
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.12)
 
 # Set the location of this port's directory.
 set(MICROPY_PORT_DIR ${CMAKE_SOURCE_DIR})

From bb2007b05ccf0e41684cc61f1677c11b7df93f7a Mon Sep 17 00:00:00 2001
From: stijn <stijn@ignitron.net>
Date: Thu, 22 Apr 2021 18:01:46 +0200
Subject: [PATCH 0759/3533] windows/mpconfigport.h: Enable features also
 present in unix port.

---
 ports/windows/mpconfigport.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ports/windows/mpconfigport.h b/ports/windows/mpconfigport.h
index faf10752ee203..6421c93bdbc62 100644
--- a/ports/windows/mpconfigport.h
+++ b/ports/windows/mpconfigport.h
@@ -65,6 +65,7 @@
 #define MICROPY_VFS_POSIX_FILE      (1)
 #define MICROPY_PY_FUNCTION_ATTRS   (1)
 #define MICROPY_PY_DESCRIPTORS      (1)
+#define MICROPY_PY_DELATTR_SETATTR  (1)
 #define MICROPY_PY_BUILTINS_STR_UNICODE (1)
 #define MICROPY_PY_BUILTINS_STR_CENTER (1)
 #define MICROPY_PY_BUILTINS_STR_PARTITION (1)
@@ -75,12 +76,14 @@
 #define MICROPY_PY_BUILTINS_NOTIMPLEMENTED (1)
 #define MICROPY_PY_BUILTINS_INPUT   (1)
 #define MICROPY_PY_BUILTINS_POW3    (1)
+#define MICROPY_PY_BUILTINS_ROUND_INT (1)
 #define MICROPY_PY_MICROPYTHON_MEM_INFO (1)
 #define MICROPY_PY_ALL_SPECIAL_METHODS (1)
 #define MICROPY_PY_REVERSE_SPECIAL_METHODS (1)
 #define MICROPY_PY_ARRAY_SLICE_ASSIGN (1)
 #define MICROPY_PY_BUILTINS_SLICE_ATTRS (1)
 #define MICROPY_PY_SYS_EXIT         (1)
+#define MICROPY_PY_SYS_ATEXIT       (1)
 #define MICROPY_PY_SYS_PLATFORM     "win32"
 #ifndef MICROPY_PY_SYS_PATH_DEFAULT
 #define MICROPY_PY_SYS_PATH_DEFAULT "~/.micropython/lib"
@@ -93,6 +96,7 @@
 #define MICROPY_PY_MATH_SPECIAL_FUNCTIONS (1)
 #define MICROPY_PY_MATH_ISCLOSE     (1)
 #define MICROPY_PY_CMATH            (1)
+#define MICROPY_PY_IO_IOBASE        (1)
 #define MICROPY_PY_IO_FILEIO        (1)
 #define MICROPY_PY_GC_COLLECT_RETVAL (1)
 #define MICROPY_MODULE_FROZEN_STR   (0)

From a1bc32d8a8fbb09bc04c2ca07b10475f7ddde8c3 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 23 Apr 2021 23:44:37 +1000
Subject: [PATCH 0760/3533] drivers/sdcard: Add sleep_ms(1) delay in
 SDCard.readinto sync loop.

So this driver works on faster MCUs (that run this loop fast) with older,
slower SD cards.

Fixes issue #7129.

Signed-off-by: Damien George <damien@micropython.org>
---
 drivers/sdcard/sdcard.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/sdcard/sdcard.py b/drivers/sdcard/sdcard.py
index c991fe560892a..0ba3076a3d369 100644
--- a/drivers/sdcard/sdcard.py
+++ b/drivers/sdcard/sdcard.py
@@ -176,6 +176,7 @@ def readinto(self, buf):
             self.spi.readinto(self.tokenbuf, 0xFF)
             if self.tokenbuf[0] == _TOKEN_DATA:
                 break
+            time.sleep_ms(1)
         else:
             self.cs(1)
             raise OSError("timeout waiting for response")

From 530c76f6caee9445f468380f58b98f4e3ceda759 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sat, 24 Apr 2021 00:10:59 +1000
Subject: [PATCH 0761/3533] lib/utils: Remove unused PYEXEC_SWITCH_MODE from
 pyexec.h.

It was made obsolete by commit c98c128fe885e539ecd73843756340f8950115c8.

Signed-off-by: Damien George <damien@micropython.org>
---
 lib/utils/pyexec.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/utils/pyexec.h b/lib/utils/pyexec.h
index f69c5ce9a884e..981e7dca9fc6b 100644
--- a/lib/utils/pyexec.h
+++ b/lib/utils/pyexec.h
@@ -41,7 +41,6 @@ extern pyexec_mode_kind_t pyexec_mode_kind;
 extern int pyexec_system_exit;
 
 #define PYEXEC_FORCED_EXIT (0x100)
-#define PYEXEC_SWITCH_MODE (0x200)
 
 int pyexec_raw_repl(void);
 int pyexec_friendly_repl(void);

From 65b90cd0f9cb3ee8b5954820cd6d68b782121cd1 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 22 Apr 2021 11:04:58 +1000
Subject: [PATCH 0762/3533] teensy: Provide own implementation of gc_collect,
 to not use stm32.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/teensy/Makefile | 1 -
 ports/teensy/main.c   | 7 +++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/ports/teensy/Makefile b/ports/teensy/Makefile
index d3978718e0095..cf9529442a96e 100644
--- a/ports/teensy/Makefile
+++ b/ports/teensy/Makefile
@@ -95,7 +95,6 @@ SRC_C = \
 	usb.c \
 
 STM_SRC_C = $(addprefix ports/stm32/,\
-	gccollect.c \
 	irq.c \
 	pin.c \
 	pin_named_pins.c \
diff --git a/ports/teensy/main.c b/ports/teensy/main.c
index df3fd1ffcf5ac..d4c5f0396faf1 100644
--- a/ports/teensy/main.c
+++ b/ports/teensy/main.c
@@ -9,6 +9,7 @@
 #include "py/gc.h"
 #include "py/mphal.h"
 #include "gccollect.h"
+#include "lib/utils/gchelper.h"
 #include "lib/utils/pyexec.h"
 #include "lib/mp-readline/readline.h"
 #include "lexermemzip.h"
@@ -349,6 +350,12 @@ int main(void) {
     goto soft_reset;
 }
 
+void gc_collect(void) {
+    gc_collect_start();
+    gc_helper_collect_regs_and_stack();
+    gc_collect_end();
+}
+
 // stub out __libc_init_array. It's called by mk20dx128.c and is used to call
 // global C++ constructors. Since this is a C-only projects, we don't need to
 // call constructors.

From 0f78c36c5aa458a954eed39a46942209107a553e Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Tue, 27 Apr 2021 01:15:43 +0200
Subject: [PATCH 0763/3533] tools/gen-cpydiff.py: Fix formatting of doc strings
 for new Black.

Since version 21.4b0, Black now processes one-line docstrings by stripping
leading and trailing spaces, and adding a padding space when needed to
break up """"; see https://github.com/psf/black/pull/1740

This commit makes the Python code in this repository conform to this rule.
---
 tools/gen-cpydiff.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/tools/gen-cpydiff.py b/tools/gen-cpydiff.py
index c45bad1058c44..c9f58ec505d3a 100644
--- a/tools/gen-cpydiff.py
+++ b/tools/gen-cpydiff.py
@@ -74,7 +74,7 @@
 
 
 def readfiles():
-    """ Reads test files """
+    """Reads test files"""
     tests = list(filter(lambda x: x.endswith(".py"), os.listdir(TESTPATH)))
     tests.sort()
     files = []
@@ -95,7 +95,7 @@ def readfiles():
 
 
 def uimports(code):
-    """ converts CPython module names into MicroPython equivalents """
+    """converts CPython module names into MicroPython equivalents"""
     for uimport in UIMPORTLIST:
         uimport = bytes(uimport, "utf8")
         code = code.replace(uimport, b"u" + uimport)
@@ -103,7 +103,7 @@ def uimports(code):
 
 
 def run_tests(tests):
-    """ executes all tests """
+    """executes all tests"""
     results = []
     for test in tests:
         with open(TESTPATH + test.name, "rb") as f:
@@ -152,7 +152,7 @@ def run_tests(tests):
 
 
 def indent(block, spaces):
-    """ indents paragraphs of text for rst formatting """
+    """indents paragraphs of text for rst formatting"""
     new_block = ""
     for line in block.split("\n"):
         new_block += spaces + line + "\n"
@@ -160,7 +160,7 @@ def indent(block, spaces):
 
 
 def gen_table(contents):
-    """ creates a table given any set of columns """
+    """creates a table given any set of columns"""
     xlengths = []
     ylengths = []
     for column in contents:
@@ -194,7 +194,7 @@ def gen_table(contents):
 
 
 def gen_rst(results):
-    """ creates restructured text documents to display tests """
+    """creates restructured text documents to display tests"""
 
     # make sure the destination directory exists
     try:
@@ -254,7 +254,7 @@ def gen_rst(results):
 
 
 def main():
-    """ Main function """
+    """Main function"""
 
     # set search path so that test scripts find the test modules (and no other ones)
     os.environ["PYTHONPATH"] = TESTPATH

From 30d9f77cc535306eeb9eed6f17e71355fd58995a Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 27 Apr 2021 23:46:46 +1000
Subject: [PATCH 0764/3533] top: Update .git-blame-ignore-revs for latest
 formatting commit.

Signed-off-by: Damien George <damien@micropython.org>
---
 .git-blame-ignore-revs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index 83726922a5280..c5039f58b54dc 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -1,3 +1,6 @@
+# tools/gen-cpydiff.py: Fix formatting of doc strings for new Black.
+0f78c36c5aa458a954eed39a46942209107a553e
+
 # tests/run-tests.py: Reformat with Black.
 2a38d7103672580882fb621a5b76e8d26805d593
 

From d4b706c4d01377d42855ff1544ced77536f69caf Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 22 Apr 2021 12:13:58 +1000
Subject: [PATCH 0765/3533] py: Add option to compile without any error
 messages at all.

This introduces a new option, MICROPY_ERROR_REPORTING_NONE, which
completely disables all error messages.  To be used in cases where
MicroPython needs to fit in very limited systems.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/argcheck.c      | 14 ++++++------
 py/bc.c            |  4 ++--
 py/builtinimport.c |  4 ++--
 py/compile.c       |  4 ++--
 py/misc.h          |  4 ++++
 py/modbuiltins.c   |  2 +-
 py/mpconfig.h      |  2 ++
 py/obj.c           | 20 ++++++++---------
 py/obj.h           |  5 +++++
 py/objexcept.c     |  4 ++++
 py/objnamedtuple.c |  6 +++---
 py/objstr.c        | 38 ++++++++++++++++----------------
 py/objtype.c       |  8 +++----
 py/parsenum.c      |  2 +-
 py/runtime.c       | 54 ++++++++++++++++++++++++++++++++--------------
 py/runtime.h       | 13 +++++++++++
 16 files changed, 117 insertions(+), 67 deletions(-)

diff --git a/py/argcheck.c b/py/argcheck.c
index c333ead05b64a..ffcca4cb65dc2 100644
--- a/py/argcheck.c
+++ b/py/argcheck.c
@@ -38,7 +38,7 @@ void mp_arg_check_num_sig(size_t n_args, size_t n_kw, uint32_t sig) {
     size_t n_args_max = (sig >> 1) & 0xffff;
 
     if (n_kw && !takes_kw) {
-        #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
+        #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
         mp_arg_error_terse_mismatch();
         #else
         mp_raise_TypeError(MP_ERROR_TEXT("function doesn't take keyword arguments"));
@@ -47,7 +47,7 @@ void mp_arg_check_num_sig(size_t n_args, size_t n_kw, uint32_t sig) {
 
     if (n_args_min == n_args_max) {
         if (n_args != n_args_min) {
-            #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
+            #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
             mp_arg_error_terse_mismatch();
             #else
             mp_raise_msg_varg(&mp_type_TypeError,
@@ -57,7 +57,7 @@ void mp_arg_check_num_sig(size_t n_args, size_t n_kw, uint32_t sig) {
         }
     } else {
         if (n_args < n_args_min) {
-            #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
+            #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
             mp_arg_error_terse_mismatch();
             #else
             mp_raise_msg_varg(&mp_type_TypeError,
@@ -65,7 +65,7 @@ void mp_arg_check_num_sig(size_t n_args, size_t n_kw, uint32_t sig) {
                 n_args_min - n_args);
             #endif
         } else if (n_args > n_args_max) {
-            #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
+            #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
             mp_arg_error_terse_mismatch();
             #else
             mp_raise_msg_varg(&mp_type_TypeError,
@@ -90,7 +90,7 @@ void mp_arg_parse_all(size_t n_pos, const mp_obj_t *pos, mp_map_t *kws, size_t n
             mp_map_elem_t *kw = mp_map_lookup(kws, MP_OBJ_NEW_QSTR(allowed[i].qst), MP_MAP_LOOKUP);
             if (kw == NULL) {
                 if (allowed[i].flags & MP_ARG_REQUIRED) {
-                    #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
+                    #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
                     mp_arg_error_terse_mismatch();
                     #else
                     mp_raise_msg_varg(&mp_type_TypeError, MP_ERROR_TEXT("'%q' argument required"), allowed[i].qst);
@@ -114,7 +114,7 @@ void mp_arg_parse_all(size_t n_pos, const mp_obj_t *pos, mp_map_t *kws, size_t n
     }
     if (pos_found < n_pos) {
     extra_positional:
-        #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
+        #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
         mp_arg_error_terse_mismatch();
         #else
         // TODO better error message
@@ -122,7 +122,7 @@ void mp_arg_parse_all(size_t n_pos, const mp_obj_t *pos, mp_map_t *kws, size_t n
         #endif
     }
     if (kws_found < kws->used) {
-        #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
+        #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
         mp_arg_error_terse_mismatch();
         #else
         // TODO better error message
diff --git a/py/bc.c b/py/bc.c
index 34bc78fd3a588..58694b97dc24a 100644
--- a/py/bc.c
+++ b/py/bc.c
@@ -75,7 +75,7 @@ const byte *mp_decode_uint_skip(const byte *ptr) {
 #endif
 
 STATIC NORETURN void fun_pos_args_mismatch(mp_obj_fun_bc_t *f, size_t expected, size_t given) {
-    #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
+    #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
     // generic message, used also for other argument issues
     (void)f;
     (void)expected;
@@ -212,7 +212,7 @@ void mp_setup_code_state(mp_code_state_t *code_state, size_t n_args, size_t n_kw
             }
             // Didn't find name match with positional args
             if ((scope_flags & MP_SCOPE_FLAG_VARKEYWORDS) == 0) {
-                #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
+                #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
                 mp_raise_TypeError(MP_ERROR_TEXT("unexpected keyword argument"));
                 #else
                 mp_raise_msg_varg(&mp_type_TypeError,
diff --git a/py/builtinimport.c b/py/builtinimport.c
index bdc82e77c8f74..874d2dd7f0f5c 100644
--- a/py/builtinimport.c
+++ b/py/builtinimport.c
@@ -396,7 +396,7 @@ mp_obj_t mp_builtin___import__(size_t n_args, const mp_obj_t *args) {
                 #endif
                 if (module_obj == MP_OBJ_NULL) {
                     // couldn't find the file, so fail
-                    #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
+                    #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
                     mp_raise_msg(&mp_type_ImportError, MP_ERROR_TEXT("module not found"));
                     #else
                     mp_raise_msg_varg(&mp_type_ImportError, MP_ERROR_TEXT("no module named '%q'"), mod_name);
@@ -499,7 +499,7 @@ mp_obj_t mp_builtin___import__(size_t n_args, const mp_obj_t *args) {
     #endif
 
     // Couldn't find the module, so fail
-    #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
+    #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
     mp_raise_msg(&mp_type_ImportError, MP_ERROR_TEXT("module not found"));
     #else
     mp_raise_msg_varg(&mp_type_ImportError, MP_ERROR_TEXT("no module named '%q'"), module_name_qstr);
diff --git a/py/compile.c b/py/compile.c
index d1a4d65c8bb51..1182b8b1eb7a5 100644
--- a/py/compile.c
+++ b/py/compile.c
@@ -2597,7 +2597,7 @@ STATIC void compile_atom_brace_helper(compiler_t *comp, mp_parse_node_struct_t *
                     compile_node(comp, pn_i);
                     if (is_dict) {
                         if (!is_key_value) {
-                            #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
+                            #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
                             compile_syntax_error(comp, (mp_parse_node_t)pns, MP_ERROR_TEXT("invalid syntax"));
                             #else
                             compile_syntax_error(comp, (mp_parse_node_t)pns, MP_ERROR_TEXT("expecting key:value for dict"));
@@ -2607,7 +2607,7 @@ STATIC void compile_atom_brace_helper(compiler_t *comp, mp_parse_node_struct_t *
                         EMIT(store_map);
                     } else {
                         if (is_key_value) {
-                            #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
+                            #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
                             compile_syntax_error(comp, (mp_parse_node_t)pns, MP_ERROR_TEXT("invalid syntax"));
                             #else
                             compile_syntax_error(comp, (mp_parse_node_t)pns, MP_ERROR_TEXT("expecting just a value for set"));
diff --git a/py/misc.h b/py/misc.h
index fe2b3b8afaa75..953809838356d 100644
--- a/py/misc.h
+++ b/py/misc.h
@@ -264,6 +264,10 @@ typedef union _mp_float_union_t {
 
 #if MICROPY_ROM_TEXT_COMPRESSION
 
+#if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_NONE
+#error "MICROPY_ERROR_REPORTING_NONE requires MICROPY_ROM_TEXT_COMPRESSION disabled"
+#endif
+
 #ifdef NO_QSTR
 
 // Compression enabled but doing QSTR extraction.
diff --git a/py/modbuiltins.c b/py/modbuiltins.c
index cfbfc5a25683e..ac41942b9ca90 100644
--- a/py/modbuiltins.c
+++ b/py/modbuiltins.c
@@ -372,7 +372,7 @@ STATIC mp_obj_t mp_builtin_ord(mp_obj_t o_in) {
         }
     }
 
-    #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
+    #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
     mp_raise_TypeError(MP_ERROR_TEXT("ord expects a character"));
     #else
     mp_raise_msg_varg(&mp_type_TypeError,
diff --git a/py/mpconfig.h b/py/mpconfig.h
index 3dd83a34abe72..5c7212fd1f6bc 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -667,6 +667,8 @@ typedef long long mp_longint_impl_t;
 #define MICROPY_ENABLE_DOC_STRING (0)
 #endif
 
+// Exception messages are removed (requires disabling MICROPY_ROM_TEXT_COMPRESSION)
+#define MICROPY_ERROR_REPORTING_NONE     (0)
 // Exception messages are short static strings
 #define MICROPY_ERROR_REPORTING_TERSE    (1)
 // Exception messages provide basic error details
diff --git a/py/obj.c b/py/obj.c
index ed047acc39f76..f66a9d183c704 100644
--- a/py/obj.c
+++ b/py/obj.c
@@ -359,7 +359,7 @@ mp_float_t mp_obj_get_float(mp_obj_t arg) {
     mp_float_t val;
 
     if (!mp_obj_get_float_maybe(arg, &val)) {
-        #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
+        #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
         mp_raise_TypeError(MP_ERROR_TEXT("can't convert to float"));
         #else
         mp_raise_msg_varg(&mp_type_TypeError,
@@ -399,7 +399,7 @@ bool mp_obj_get_complex_maybe(mp_obj_t arg, mp_float_t *real, mp_float_t *imag)
 
 void mp_obj_get_complex(mp_obj_t arg, mp_float_t *real, mp_float_t *imag) {
     if (!mp_obj_get_complex_maybe(arg, real, imag)) {
-        #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
+        #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
         mp_raise_TypeError(MP_ERROR_TEXT("can't convert to complex"));
         #else
         mp_raise_msg_varg(&mp_type_TypeError,
@@ -417,7 +417,7 @@ void mp_obj_get_array(mp_obj_t o, size_t *len, mp_obj_t **items) {
     } else if (mp_obj_is_type(o, &mp_type_list)) {
         mp_obj_list_get(o, len, items);
     } else {
-        #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
+        #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
         mp_raise_TypeError(MP_ERROR_TEXT("expected tuple/list"));
         #else
         mp_raise_msg_varg(&mp_type_TypeError,
@@ -431,7 +431,7 @@ void mp_obj_get_array_fixed_n(mp_obj_t o, size_t len, mp_obj_t **items) {
     size_t seq_len;
     mp_obj_get_array(o, &seq_len, items);
     if (seq_len != len) {
-        #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
+        #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
         mp_raise_ValueError(MP_ERROR_TEXT("tuple/list has wrong length"));
         #else
         mp_raise_msg_varg(&mp_type_ValueError,
@@ -446,7 +446,7 @@ size_t mp_get_index(const mp_obj_type_t *type, size_t len, mp_obj_t index, bool
     if (mp_obj_is_small_int(index)) {
         i = MP_OBJ_SMALL_INT_VALUE(index);
     } else if (!mp_obj_get_int_maybe(index, &i)) {
-        #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
+        #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
         mp_raise_TypeError(MP_ERROR_TEXT("indices must be integers"));
         #else
         mp_raise_msg_varg(&mp_type_TypeError,
@@ -466,7 +466,7 @@ size_t mp_get_index(const mp_obj_type_t *type, size_t len, mp_obj_t index, bool
         }
     } else {
         if (i < 0 || (mp_uint_t)i >= len) {
-            #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
+            #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
             mp_raise_msg(&mp_type_IndexError, MP_ERROR_TEXT("index out of range"));
             #else
             mp_raise_msg_varg(&mp_type_IndexError, MP_ERROR_TEXT("%q index out of range"), type->name);
@@ -500,7 +500,7 @@ mp_obj_t mp_obj_id(mp_obj_t o_in) {
 mp_obj_t mp_obj_len(mp_obj_t o_in) {
     mp_obj_t len = mp_obj_len_maybe(o_in);
     if (len == MP_OBJ_NULL) {
-        #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
+        #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
         mp_raise_TypeError(MP_ERROR_TEXT("object has no len"));
         #else
         mp_raise_msg_varg(&mp_type_TypeError,
@@ -541,21 +541,21 @@ mp_obj_t mp_obj_subscr(mp_obj_t base, mp_obj_t index, mp_obj_t value) {
         // TODO: call base classes here?
     }
     if (value == MP_OBJ_NULL) {
-        #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
+        #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
         mp_raise_TypeError(MP_ERROR_TEXT("object doesn't support item deletion"));
         #else
         mp_raise_msg_varg(&mp_type_TypeError,
             MP_ERROR_TEXT("'%s' object doesn't support item deletion"), mp_obj_get_type_str(base));
         #endif
     } else if (value == MP_OBJ_SENTINEL) {
-        #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
+        #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
         mp_raise_TypeError(MP_ERROR_TEXT("object isn't subscriptable"));
         #else
         mp_raise_msg_varg(&mp_type_TypeError,
             MP_ERROR_TEXT("'%s' object isn't subscriptable"), mp_obj_get_type_str(base));
         #endif
     } else {
-        #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
+        #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
         mp_raise_TypeError(MP_ERROR_TEXT("object doesn't support item assignment"));
         #else
         mp_raise_msg_varg(&mp_type_TypeError,
diff --git a/py/obj.h b/py/obj.h
index 6a040b77739c2..86e5d83125cb5 100644
--- a/py/obj.h
+++ b/py/obj.h
@@ -741,8 +741,13 @@ mp_obj_t mp_obj_new_complex(mp_float_t real, mp_float_t imag);
 mp_obj_t mp_obj_new_exception(const mp_obj_type_t *exc_type);
 mp_obj_t mp_obj_new_exception_arg1(const mp_obj_type_t *exc_type, mp_obj_t arg);
 mp_obj_t mp_obj_new_exception_args(const mp_obj_type_t *exc_type, size_t n_args, const mp_obj_t *args);
+#if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_NONE
+#define mp_obj_new_exception_msg(exc_type, msg) mp_obj_new_exception(exc_type)
+#define mp_obj_new_exception_msg_varg(exc_type, ...) mp_obj_new_exception(exc_type)
+#else
 mp_obj_t mp_obj_new_exception_msg(const mp_obj_type_t *exc_type, mp_rom_error_text_t msg);
 mp_obj_t mp_obj_new_exception_msg_varg(const mp_obj_type_t *exc_type, mp_rom_error_text_t fmt, ...); // counts args by number of % symbols in fmt, excluding %%; can only handle void* sizes (ie no float/double!)
+#endif
 #ifdef va_start
 mp_obj_t mp_obj_new_exception_msg_vlist(const mp_obj_type_t *exc_type, mp_rom_error_text_t fmt, va_list arg); // same fmt restrictions as above
 #endif
diff --git a/py/objexcept.c b/py/objexcept.c
index f6bffec38353d..f03bb1b416cfc 100644
--- a/py/objexcept.c
+++ b/py/objexcept.c
@@ -373,6 +373,8 @@ mp_obj_t mp_obj_new_exception_args(const mp_obj_type_t *exc_type, size_t n_args,
     return mp_obj_exception_make_new(exc_type, n_args, 0, args);
 }
 
+#if MICROPY_ERROR_REPORTING != MICROPY_ERROR_REPORTING_NONE
+
 mp_obj_t mp_obj_new_exception_msg(const mp_obj_type_t *exc_type, mp_rom_error_text_t msg) {
     // Check that the given type is an exception type
     assert(exc_type->make_new == mp_obj_exception_make_new);
@@ -518,6 +520,8 @@ mp_obj_t mp_obj_new_exception_msg_vlist(const mp_obj_type_t *exc_type, mp_rom_er
     return mp_obj_exception_make_new(exc_type, 1, 0, &arg);
 }
 
+#endif
+
 // return true if the given object is an exception type
 bool mp_obj_is_exception_type(mp_obj_t self_in) {
     if (mp_obj_is_type(self_in, &mp_type_type)) {
diff --git a/py/objnamedtuple.c b/py/objnamedtuple.c
index e4543f5b9b180..214cad2572d7d 100644
--- a/py/objnamedtuple.c
+++ b/py/objnamedtuple.c
@@ -95,7 +95,7 @@ STATIC mp_obj_t namedtuple_make_new(const mp_obj_type_t *type_in, size_t n_args,
     const mp_obj_namedtuple_type_t *type = (const mp_obj_namedtuple_type_t *)type_in;
     size_t num_fields = type->n_fields;
     if (n_args + n_kw != num_fields) {
-        #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
+        #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
         mp_arg_error_terse_mismatch();
         #elif MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_NORMAL
         mp_raise_msg_varg(&mp_type_TypeError,
@@ -121,14 +121,14 @@ STATIC mp_obj_t namedtuple_make_new(const mp_obj_type_t *type_in, size_t n_args,
         qstr kw = mp_obj_str_get_qstr(args[i]);
         size_t id = mp_obj_namedtuple_find_field(type, kw);
         if (id == (size_t)-1) {
-            #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
+            #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
             mp_arg_error_terse_mismatch();
             #else
             mp_raise_msg_varg(&mp_type_TypeError, MP_ERROR_TEXT("unexpected keyword argument '%q'"), kw);
             #endif
         }
         if (tuple->items[id] != MP_OBJ_NULL) {
-            #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
+            #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
             mp_arg_error_terse_mismatch();
             #else
             mp_raise_msg_varg(&mp_type_TypeError,
diff --git a/py/objstr.c b/py/objstr.c
index 9f8da873d66c0..98657bd217b93 100644
--- a/py/objstr.c
+++ b/py/objstr.c
@@ -942,7 +942,7 @@ STATIC mp_obj_t arg_as_int(mp_obj_t arg) {
 }
 #endif
 
-#if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
+#if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
 STATIC NORETURN void terse_str_format_value_error(void) {
     mp_raise_ValueError(MP_ERROR_TEXT("bad format string"));
 }
@@ -963,7 +963,7 @@ STATIC vstr_t mp_obj_str_format_helper(const char *str, const char *top, int *ar
                 vstr_add_byte(&vstr, '}');
                 continue;
             }
-            #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
+            #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
             terse_str_format_value_error();
             #else
             mp_raise_ValueError(MP_ERROR_TEXT("single '}' encountered in format string"));
@@ -1002,7 +1002,7 @@ STATIC vstr_t mp_obj_str_format_helper(const char *str, const char *top, int *ar
             if (str < top && (*str == 'r' || *str == 's')) {
                 conversion = *str++;
             } else {
-                #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
+                #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
                 terse_str_format_value_error();
                 #elif MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_NORMAL
                 mp_raise_ValueError(MP_ERROR_TEXT("bad conversion specifier"));
@@ -1040,14 +1040,14 @@ STATIC vstr_t mp_obj_str_format_helper(const char *str, const char *top, int *ar
             }
         }
         if (str >= top) {
-            #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
+            #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
             terse_str_format_value_error();
             #else
             mp_raise_ValueError(MP_ERROR_TEXT("unmatched '{' in format"));
             #endif
         }
         if (*str != '}') {
-            #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
+            #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
             terse_str_format_value_error();
             #else
             mp_raise_ValueError(MP_ERROR_TEXT("expected ':' after format specifier"));
@@ -1060,7 +1060,7 @@ STATIC vstr_t mp_obj_str_format_helper(const char *str, const char *top, int *ar
             int index = 0;
             if (MP_LIKELY(unichar_isdigit(*field_name))) {
                 if (*arg_i > 0) {
-                    #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
+                    #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
                     terse_str_format_value_error();
                     #else
                     mp_raise_ValueError(
@@ -1090,7 +1090,7 @@ STATIC vstr_t mp_obj_str_format_helper(const char *str, const char *top, int *ar
             }
         } else {
             if (*arg_i < 0) {
-                #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
+                #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
                 terse_str_format_value_error();
                 #else
                 mp_raise_ValueError(
@@ -1183,7 +1183,7 @@ STATIC vstr_t mp_obj_str_format_helper(const char *str, const char *top, int *ar
                 type = *s++;
             }
             if (*s) {
-                #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
+                #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
                 terse_str_format_value_error();
                 #else
                 mp_raise_ValueError(MP_ERROR_TEXT("invalid format specifier"));
@@ -1204,14 +1204,14 @@ STATIC vstr_t mp_obj_str_format_helper(const char *str, const char *top, int *ar
 
         if (flags & (PF_FLAG_SHOW_SIGN | PF_FLAG_SPACE_SIGN)) {
             if (type == 's') {
-                #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
+                #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
                 terse_str_format_value_error();
                 #else
                 mp_raise_ValueError(MP_ERROR_TEXT("sign not allowed in string format specifier"));
                 #endif
             }
             if (type == 'c') {
-                #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
+                #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
                 terse_str_format_value_error();
                 #else
                 mp_raise_ValueError(
@@ -1275,7 +1275,7 @@ STATIC vstr_t mp_obj_str_format_helper(const char *str, const char *top, int *ar
                     break;
 
                 default:
-                    #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
+                    #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
                     terse_str_format_value_error();
                     #else
                     mp_raise_msg_varg(&mp_type_ValueError,
@@ -1347,7 +1347,7 @@ STATIC vstr_t mp_obj_str_format_helper(const char *str, const char *top, int *ar
                 #endif
 
                 default:
-                    #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
+                    #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
                     terse_str_format_value_error();
                     #else
                     mp_raise_msg_varg(&mp_type_ValueError,
@@ -1359,7 +1359,7 @@ STATIC vstr_t mp_obj_str_format_helper(const char *str, const char *top, int *ar
             // arg doesn't look like a number
 
             if (align == '=') {
-                #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
+                #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
                 terse_str_format_value_error();
                 #else
                 mp_raise_ValueError(
@@ -1383,7 +1383,7 @@ STATIC vstr_t mp_obj_str_format_helper(const char *str, const char *top, int *ar
                 }
 
                 default:
-                    #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
+                    #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
                     terse_str_format_value_error();
                     #else
                     mp_raise_msg_varg(&mp_type_ValueError,
@@ -1412,7 +1412,7 @@ STATIC mp_obj_t str_modulo_format(mp_obj_t pattern, size_t n_args, const mp_obj_
     mp_check_self(mp_obj_is_str_or_bytes(pattern));
 
     GET_STR_DATA_LEN(pattern, str, len);
-    #if MICROPY_ERROR_REPORTING != MICROPY_ERROR_REPORTING_TERSE
+    #if MICROPY_ERROR_REPORTING > MICROPY_ERROR_REPORTING_TERSE
     const byte *start_str = str;
     #endif
     bool is_bytes = mp_obj_is_type(pattern, &mp_type_bytes);
@@ -1444,7 +1444,7 @@ STATIC mp_obj_t str_modulo_format(mp_obj_t pattern, size_t n_args, const mp_obj_
             const byte *key = ++str;
             while (*str != ')') {
                 if (str >= top) {
-                    #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
+                    #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
                     terse_str_format_value_error();
                     #else
                     mp_raise_ValueError(MP_ERROR_TEXT("incomplete format key"));
@@ -1508,7 +1508,7 @@ STATIC mp_obj_t str_modulo_format(mp_obj_t pattern, size_t n_args, const mp_obj_
 
         if (str >= top) {
         incomplete_format:
-            #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
+            #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
             terse_str_format_value_error();
             #else
             mp_raise_ValueError(MP_ERROR_TEXT("incomplete format"));
@@ -1594,7 +1594,7 @@ STATIC mp_obj_t str_modulo_format(mp_obj_t pattern, size_t n_args, const mp_obj_
                 break;
 
             default:
-                #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
+                #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
                 terse_str_format_value_error();
                 #else
                 mp_raise_msg_varg(&mp_type_ValueError,
@@ -2131,7 +2131,7 @@ bool mp_obj_str_equal(mp_obj_t s1, mp_obj_t s2) {
 }
 
 STATIC NORETURN void bad_implicit_conversion(mp_obj_t self_in) {
-    #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
+    #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
     mp_raise_TypeError(MP_ERROR_TEXT("can't convert to str implicitly"));
     #else
     const qstr src_name = mp_obj_get_type(self_in)->name;
diff --git a/py/objtype.c b/py/objtype.c
index 7f75232941046..508bab99d394a 100644
--- a/py/objtype.c
+++ b/py/objtype.c
@@ -348,7 +348,7 @@ mp_obj_t mp_obj_instance_make_new(const mp_obj_type_t *self, size_t n_args, size
             m_del(mp_obj_t, args2, 2 + n_args + 2 * n_kw);
         }
         if (init_ret != mp_const_none) {
-            #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
+            #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
             mp_raise_TypeError(MP_ERROR_TEXT("__init__() should return None"));
             #else
             mp_raise_msg_varg(&mp_type_TypeError,
@@ -860,7 +860,7 @@ mp_obj_t mp_obj_instance_call(mp_obj_t self_in, size_t n_args, size_t n_kw, cons
     mp_obj_t member[2] = {MP_OBJ_NULL, MP_OBJ_NULL};
     mp_obj_t call = mp_obj_instance_get_call(self_in, member);
     if (call == MP_OBJ_NULL) {
-        #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
+        #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
         mp_raise_TypeError(MP_ERROR_TEXT("object not callable"));
         #else
         mp_raise_msg_varg(&mp_type_TypeError,
@@ -985,7 +985,7 @@ STATIC mp_obj_t type_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const mp
     mp_obj_type_t *self = MP_OBJ_TO_PTR(self_in);
 
     if (self->make_new == NULL) {
-        #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
+        #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
         mp_raise_TypeError(MP_ERROR_TEXT("can't create instance"));
         #else
         mp_raise_msg_varg(&mp_type_TypeError, MP_ERROR_TEXT("can't create '%q' instances"), self->name);
@@ -1125,7 +1125,7 @@ mp_obj_t mp_obj_new_type(qstr name, mp_obj_t bases_tuple, mp_obj_t locals_dict)
         mp_obj_type_t *t = MP_OBJ_TO_PTR(bases_items[i]);
         // TODO: Verify with CPy, tested on function type
         if (t->make_new == NULL) {
-            #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
+            #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
             mp_raise_TypeError(MP_ERROR_TEXT("type isn't an acceptable base type"));
             #else
             mp_raise_msg_varg(&mp_type_TypeError,
diff --git a/py/parsenum.c b/py/parsenum.c
index e665da7d8cdad..1cfe842577011 100644
--- a/py/parsenum.c
+++ b/py/parsenum.c
@@ -145,7 +145,7 @@ mp_obj_t mp_parse_num_integer(const char *restrict str_, size_t len, int base, m
 
 value_error:
     {
-        #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
+        #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
         mp_obj_t exc = mp_obj_new_exception_msg(&mp_type_ValueError,
             MP_ERROR_TEXT("invalid syntax for integer"));
         raise_exc(exc, lex);
diff --git a/py/runtime.c b/py/runtime.c
index 0ce6854732822..18a7c8565da9b 100644
--- a/py/runtime.c
+++ b/py/runtime.c
@@ -189,7 +189,7 @@ mp_obj_t mp_load_global(qstr qst) {
         #endif
         elem = mp_map_lookup((mp_map_t *)&mp_module_builtins_globals.map, MP_OBJ_NEW_QSTR(qst), MP_MAP_LOOKUP);
         if (elem == NULL) {
-            #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
+            #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
             mp_raise_msg(&mp_type_NameError, MP_ERROR_TEXT("name not defined"));
             #else
             mp_raise_msg_varg(&mp_type_NameError, MP_ERROR_TEXT("name '%q' isn't defined"), qst);
@@ -289,7 +289,7 @@ mp_obj_t mp_unary_op(mp_unary_op_t op, mp_obj_t arg) {
         }
         // With MP_UNARY_OP_INT, mp_unary_op() becomes a fallback for mp_obj_get_int().
         // In this case provide a more focused error message to not confuse, e.g. chr(1.0)
-        #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
+        #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
         if (op == MP_UNARY_OP_INT) {
             mp_raise_TypeError(MP_ERROR_TEXT("can't convert to int"));
         } else {
@@ -610,7 +610,7 @@ mp_obj_t mp_binary_op(mp_binary_op_t op, mp_obj_t lhs, mp_obj_t rhs) {
     }
 
 unsupported_op:
-    #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
+    #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
     mp_raise_TypeError(MP_ERROR_TEXT("unsupported type for operator"));
     #else
     mp_raise_msg_varg(&mp_type_TypeError,
@@ -652,7 +652,7 @@ mp_obj_t mp_call_function_n_kw(mp_obj_t fun_in, size_t n_args, size_t n_kw, cons
         return type->call(fun_in, n_args, n_kw, args);
     }
 
-    #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
+    #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
     mp_raise_TypeError(MP_ERROR_TEXT("object not callable"));
     #else
     mp_raise_msg_varg(&mp_type_TypeError,
@@ -881,13 +881,13 @@ void mp_unpack_sequence(mp_obj_t seq_in, size_t num, mp_obj_t *items) {
     return;
 
 too_short:
-    #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
+    #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
     mp_raise_ValueError(MP_ERROR_TEXT("wrong number of values to unpack"));
     #else
     mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("need more than %d values to unpack"), (int)seq_len);
     #endif
 too_long:
-    #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
+    #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
     mp_raise_ValueError(MP_ERROR_TEXT("wrong number of values to unpack"));
     #else
     mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("too many values to unpack (expected %d)"), (int)num);
@@ -948,7 +948,7 @@ void mp_unpack_ex(mp_obj_t seq_in, size_t num_in, mp_obj_t *items) {
     return;
 
 too_short:
-    #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
+    #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
     mp_raise_ValueError(MP_ERROR_TEXT("wrong number of values to unpack"));
     #else
     mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("need more than %d values to unpack"), (int)seq_len);
@@ -1117,7 +1117,7 @@ void mp_load_method(mp_obj_t base, qstr attr, mp_obj_t *dest) {
 
     if (dest[0] == MP_OBJ_NULL) {
         // no attribute/method called attr
-        #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
+        #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
         mp_raise_msg(&mp_type_AttributeError, MP_ERROR_TEXT("no such attribute"));
         #else
         // following CPython, we give a more detailed error message for type objects
@@ -1161,7 +1161,7 @@ void mp_store_attr(mp_obj_t base, qstr attr, mp_obj_t value) {
             return;
         }
     }
-    #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
+    #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
     mp_raise_msg(&mp_type_AttributeError, MP_ERROR_TEXT("no such attribute"));
     #else
     mp_raise_msg_varg(&mp_type_AttributeError,
@@ -1206,7 +1206,7 @@ mp_obj_t mp_getiter(mp_obj_t o_in, mp_obj_iter_buf_t *iter_buf) {
     }
 
     // object not iterable
-    #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
+    #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
     mp_raise_TypeError(MP_ERROR_TEXT("object not iterable"));
     #else
     mp_raise_msg_varg(&mp_type_TypeError,
@@ -1229,7 +1229,7 @@ mp_obj_t mp_iternext_allow_raise(mp_obj_t o_in) {
             // __next__ exists, call it and return its result
             return mp_call_method_n_kw(0, 0, dest);
         } else {
-            #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
+            #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
             mp_raise_TypeError(MP_ERROR_TEXT("object not an iterator"));
             #else
             mp_raise_msg_varg(&mp_type_TypeError,
@@ -1265,7 +1265,7 @@ mp_obj_t mp_iternext(mp_obj_t o_in) {
                 }
             }
         } else {
-            #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE
+            #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
             mp_raise_TypeError(MP_ERROR_TEXT("object not an iterator"));
             #else
             mp_raise_msg_varg(&mp_type_TypeError,
@@ -1512,6 +1512,26 @@ NORETURN void m_malloc_fail(size_t num_bytes) {
         MP_ERROR_TEXT("memory allocation failed, allocating %u bytes"), (uint)num_bytes);
 }
 
+#if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_NONE
+
+NORETURN void mp_raise_type(const mp_obj_type_t *exc_type) {
+    nlr_raise(mp_obj_new_exception(exc_type));
+}
+
+NORETURN void mp_raise_ValueError_no_msg(void) {
+    mp_raise_type(&mp_type_ValueError);
+}
+
+NORETURN void mp_raise_TypeError_no_msg(void) {
+    mp_raise_type(&mp_type_TypeError);
+}
+
+NORETURN void mp_raise_NotImplementedError_no_msg(void) {
+    mp_raise_type(&mp_type_NotImplementedError);
+}
+
+#else
+
 NORETURN void mp_raise_msg(const mp_obj_type_t *exc_type, mp_rom_error_text_t msg) {
     if (msg == NULL) {
         nlr_raise(mp_obj_new_exception(exc_type));
@@ -1536,14 +1556,16 @@ NORETURN void mp_raise_TypeError(mp_rom_error_text_t msg) {
     mp_raise_msg(&mp_type_TypeError, msg);
 }
 
-NORETURN void mp_raise_OSError(int errno_) {
-    nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(errno_)));
-}
-
 NORETURN void mp_raise_NotImplementedError(mp_rom_error_text_t msg) {
     mp_raise_msg(&mp_type_NotImplementedError, msg);
 }
 
+#endif
+
+NORETURN void mp_raise_OSError(int errno_) {
+    nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(errno_)));
+}
+
 #if MICROPY_STACK_CHECK || MICROPY_ENABLE_PYSTACK
 NORETURN void mp_raise_recursion_depth(void) {
     nlr_raise(mp_obj_new_exception_arg1(&mp_type_RuntimeError,
diff --git a/py/runtime.h b/py/runtime.h
index 0bf988b905656..0cbbb287ac0f0 100644
--- a/py/runtime.h
+++ b/py/runtime.h
@@ -159,12 +159,25 @@ mp_obj_t mp_import_name(qstr name, mp_obj_t fromlist, mp_obj_t level);
 mp_obj_t mp_import_from(mp_obj_t module, qstr name);
 void mp_import_all(mp_obj_t module);
 
+#if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_NONE
+NORETURN void mp_raise_type(const mp_obj_type_t *exc_type);
+NORETURN void mp_raise_ValueError_no_msg(void);
+NORETURN void mp_raise_TypeError_no_msg(void);
+NORETURN void mp_raise_NotImplementedError_no_msg(void);
+#define mp_raise_msg(exc_type, msg) mp_raise_type(exc_type)
+#define mp_raise_msg_varg(exc_type, ...) mp_raise_type(exc_type)
+#define mp_raise_ValueError(msg) mp_raise_ValueError_no_msg()
+#define mp_raise_TypeError(msg) mp_raise_TypeError_no_msg()
+#define mp_raise_NotImplementedError(msg) mp_raise_NotImplementedError_no_msg()
+#else
 #define mp_raise_type(exc_type) mp_raise_msg(exc_type, NULL)
 NORETURN void mp_raise_msg(const mp_obj_type_t *exc_type, mp_rom_error_text_t msg);
 NORETURN void mp_raise_msg_varg(const mp_obj_type_t *exc_type, mp_rom_error_text_t fmt, ...);
 NORETURN void mp_raise_ValueError(mp_rom_error_text_t msg);
 NORETURN void mp_raise_TypeError(mp_rom_error_text_t msg);
 NORETURN void mp_raise_NotImplementedError(mp_rom_error_text_t msg);
+#endif
+
 NORETURN void mp_raise_OSError(int errno_);
 NORETURN void mp_raise_recursion_depth(void);
 

From 43a8c8178e0b5e2460edde0fdf436509a7f28764 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 27 Apr 2021 23:52:40 +1000
Subject: [PATCH 0766/3533] bare-arm: Switch to use
 MICROPY_ERROR_REPORTING_NONE to reduce size.

Reduces size of this port by about 3300 bytes, and demonstrates how to use
this feature.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/bare-arm/Makefile       | 2 +-
 ports/bare-arm/README.md      | 2 +-
 ports/bare-arm/mpconfigport.h | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ports/bare-arm/Makefile b/ports/bare-arm/Makefile
index 455a9dc5ac137..1a21eb56a867b 100644
--- a/ports/bare-arm/Makefile
+++ b/ports/bare-arm/Makefile
@@ -5,7 +5,7 @@ include ../../py/mkenv.mk
 include $(TOP)/py/py.mk
 
 # Set makefile-level MicroPython feature configurations.
-MICROPY_ROM_TEXT_COMPRESSION ?= 1
+MICROPY_ROM_TEXT_COMPRESSION ?= 0
 
 # Define toolchain and other tools.
 CROSS_COMPILE ?= arm-none-eabi-
diff --git a/ports/bare-arm/README.md b/ports/bare-arm/README.md
index 496ee9c7555de..dfa5534d598f9 100644
--- a/ports/bare-arm/README.md
+++ b/ports/bare-arm/README.md
@@ -18,4 +18,4 @@ compiled and executed when the firmware starts.  They produce output on the
 system's stdout.
 
 The size of the firmware (the machine code that is programmed to the
-microcontroller's flash/ROM) is currently around 61200 bytes.
+microcontroller's flash/ROM) is currently around 57900 bytes.
diff --git a/ports/bare-arm/mpconfigport.h b/ports/bare-arm/mpconfigport.h
index 41b6ee71a3f84..3bebc31594c27 100644
--- a/ports/bare-arm/mpconfigport.h
+++ b/ports/bare-arm/mpconfigport.h
@@ -37,7 +37,7 @@
 
 // Python internal features
 #define MICROPY_ENABLE_EXTERNAL_IMPORT          (0)
-#define MICROPY_ERROR_REPORTING                 (MICROPY_ERROR_REPORTING_TERSE)
+#define MICROPY_ERROR_REPORTING                 (MICROPY_ERROR_REPORTING_NONE)
 #define MICROPY_CPYTHON_COMPAT                  (0)
 #define MICROPY_MODULE_GETATTR                  (0)
 #define MICROPY_BUILTIN_METHOD_CHECK_SELF_ARG   (0)

From c5cbfd545ab436ef526e7fce7fafab89ac1b69f8 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sat, 24 Apr 2021 09:18:09 +1000
Subject: [PATCH 0767/3533] py/dynruntime.h: Add mp_obj_get_array() function.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/dynruntime.h | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/py/dynruntime.h b/py/dynruntime.h
index eb8301284e1fc..a8256c19487c4 100644
--- a/py/dynruntime.h
+++ b/py/dynruntime.h
@@ -81,6 +81,7 @@ static inline void *m_realloc_dyn(void *ptr, size_t new_num_bytes) {
 
 #define mp_type_type                        (*mp_fun_table.type_type)
 #define mp_type_str                         (*mp_fun_table.type_str)
+#define mp_type_tuple                       (*((mp_obj_base_t *)mp_const_empty_tuple)->type)
 #define mp_type_list                        (*mp_fun_table.type_list)
 #define mp_type_EOFError                    (*(mp_obj_type_t *)(mp_load_global(MP_QSTR_EOFError)))
 #define mp_type_IndexError                  (*(mp_obj_type_t *)(mp_load_global(MP_QSTR_IndexError)))
@@ -121,6 +122,7 @@ static inline void *m_realloc_dyn(void *ptr, size_t new_num_bytes) {
 
 #define mp_obj_len(o)                       (mp_obj_len_dyn(o))
 #define mp_obj_subscr(base, index, val)     (mp_fun_table.obj_subscr((base), (index), (val)))
+#define mp_obj_get_array(o, len, items)     (mp_obj_get_array_dyn((o), (len), (items)))
 #define mp_obj_list_append(list, item)      (mp_fun_table.list_append((list), (item)))
 
 static inline mp_obj_t mp_obj_new_str_of_type_dyn(const mp_obj_type_t *type, const byte *data, size_t len) {
@@ -251,4 +253,23 @@ static inline void mp_raise_OSError_dyn(int er) {
 #define mp_obj_get_float(o)         (mp_obj_get_float_to_d((o)))
 #endif
 
+/******************************************************************************/
+// Inline function definitions.
+
+// *items may point inside a GC block
+static inline void mp_obj_get_array_dyn(mp_obj_t o, size_t *len, mp_obj_t **items) {
+    const mp_obj_type_t *type = mp_obj_get_type(o);
+    if (type == &mp_type_tuple) {
+        mp_obj_tuple_t *t = MP_OBJ_TO_PTR(o);
+        *len = t->len;
+        *items = &t->items[0];
+    } else if (type == &mp_type_list) {
+        mp_obj_list_t *l = MP_OBJ_TO_PTR(o);
+        *len = l->len;
+        *items = l->items;
+    } else {
+        mp_raise_TypeError("expected tuple/list");
+    }
+}
+
 #endif // MICROPY_INCLUDED_PY_DYNRUNTIME_H

From f452b9c26569a4e05e026a668dd336f80203f06d Mon Sep 17 00:00:00 2001
From: Daniel Maslowski <info@orangecms.org>
Date: Sat, 24 Apr 2021 17:41:55 +0200
Subject: [PATCH 0768/3533] pic16bit/Makefile: Make the XC compiler version
 user-configurable.

---
 ports/pic16bit/Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ports/pic16bit/Makefile b/ports/pic16bit/Makefile
index fa6de38e39274..3c2bd54ea231f 100644
--- a/ports/pic16bit/Makefile
+++ b/ports/pic16bit/Makefile
@@ -6,7 +6,8 @@ QSTR_DEFS = qstrdefsport.h
 # include py core make definitions
 include $(TOP)/py/py.mk
 
-XC16 = /opt/microchip/xc16/v1.35
+XCVERSION ?= 1.35
+XC16 ?= /opt/microchip/xc16/v$(XCVERSION)
 CROSS_COMPILE ?= $(XC16)/bin/xc16-
 
 PARTFAMILY = dsPIC33F

From 4dc802400fb81cf674067b9fcb177139ea5ae27e Mon Sep 17 00:00:00 2001
From: plan-do-break-fix <jeffdswan@outlook.com>
Date: Sun, 25 Apr 2021 01:38:45 -0500
Subject: [PATCH 0769/3533] stm32,teensy: Correct typos in project README
 files.

---
 ports/stm32/mboot/README.md | 2 +-
 ports/teensy/README.md      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/stm32/mboot/README.md b/ports/stm32/mboot/README.md
index 59213eb615141..b85bc3e2eedbd 100644
--- a/ports/stm32/mboot/README.md
+++ b/ports/stm32/mboot/README.md
@@ -159,7 +159,7 @@ Signed and encrypted DFU support
 --------------------------------
 
 Mboot optionally supports signing and encrypting the binary firmware in the DFU file.
-In general this is refered to as a packed DFU file.  This requires additional settings
+In general this is referred to as a packed DFU file.  This requires additional settings
 in the board config and requires the `pyhy` Python module to be installed for `python3`
 to be used when building packed firmware, eg:
 
diff --git a/ports/teensy/README.md b/ports/teensy/README.md
index c586853b52693..dacc463ccdcd5 100644
--- a/ports/teensy/README.md
+++ b/ports/teensy/README.md
@@ -5,7 +5,7 @@ Currently the Teensy 3.1 port of MicroPython builds under Linux and not under Wi
 The tool chain required for the build can be found at <https://launchpad.net/gcc-arm-embedded>.
 
 Download the current Linux *.tar.bz2 file. Instructions regarding unpacking the file and moving it to the correct location
-as well as adding the extracted folders to the enviroment variable can be found at
+as well as adding the extracted folders to the environment variable can be found at
 <http://eliaselectronics.com/stm32f4-tutorials/setting-up-the-stm32f4-arm-development-toolchain/>
 
 In order to download the firmware image to the teensy, you'll need to use the

From a708848b0cb0f304f43178140d84d5535e186a38 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Tue, 27 Apr 2021 00:54:21 +0200
Subject: [PATCH 0770/3533] stm32/uart: Fix H7 UART clock source configuration.

Previously to this commit, Usart16ClockSelection was overwritten and
Usart234578ClockSelection was not set.
---
 ports/stm32/uart.c | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/ports/stm32/uart.c b/ports/stm32/uart.c
index 36c59cee4ae02..babdf63d96b35 100644
--- a/ports/stm32/uart.c
+++ b/ports/stm32/uart.c
@@ -118,16 +118,10 @@ STATIC const pyb_uart_irq_map_t mp_uart_irq_map[] = {
 void uart_init0(void) {
     #if defined(STM32H7)
     RCC_PeriphCLKInitTypeDef RCC_PeriphClkInit = {0};
-    // Configure USART1/6 clock source
-    RCC_PeriphClkInit.PeriphClockSelection = RCC_PERIPHCLK_USART16;
+    // Configure USART1/6 and USART2/3/4/5/7/8 clock sources
+    RCC_PeriphClkInit.PeriphClockSelection = RCC_PERIPHCLK_USART16 | RCC_PERIPHCLK_USART234578;
     RCC_PeriphClkInit.Usart16ClockSelection = RCC_USART16CLKSOURCE_D2PCLK2;
-    if (HAL_RCCEx_PeriphCLKConfig(&RCC_PeriphClkInit) != HAL_OK) {
-        __fatal_error("HAL_RCCEx_PeriphCLKConfig");
-    }
-
-    // Configure USART2/3/4/5/7/8 clock source
-    RCC_PeriphClkInit.PeriphClockSelection = RCC_PERIPHCLK_USART234578;
-    RCC_PeriphClkInit.Usart16ClockSelection = RCC_USART234578CLKSOURCE_D2PCLK1;
+    RCC_PeriphClkInit.Usart234578ClockSelection = RCC_USART234578CLKSOURCE_D2PCLK1;
     if (HAL_RCCEx_PeriphCLKConfig(&RCC_PeriphClkInit) != HAL_OK) {
         __fatal_error("HAL_RCCEx_PeriphCLKConfig");
     }

From 21fee92be6c534d0d44518c0c76f0c7cf5f64b18 Mon Sep 17 00:00:00 2001
From: Steve App <hklang10@gmail.com>
Date: Sun, 25 Apr 2021 11:05:47 +0100
Subject: [PATCH 0771/3533] esp32: Restore FROZEN_MANIFEST support with new
 CMake build system.

This commit re-enables the command-line make option "FROZEN_MANIFEST".  The
boards/*/mpconfigboard.cmake will now use the command-line FROZEN_MANIFEST
value if supplied.

Usage: make FROZEN_MANIFEST=~/foo/my-manifest.py
---
 ports/esp32/Makefile                                  | 4 ++++
 ports/esp32/boards/GENERIC/mpconfigboard.cmake        | 5 +++--
 ports/esp32/boards/GENERIC_D2WD/mpconfigboard.cmake   | 4 +++-
 ports/esp32/boards/GENERIC_OTA/mpconfigboard.cmake    | 4 +++-
 ports/esp32/boards/GENERIC_S2/mpconfigboard.cmake     | 4 +++-
 ports/esp32/boards/GENERIC_SPIRAM/mpconfigboard.cmake | 4 +++-
 ports/esp32/boards/TINYPICO/mpconfigboard.cmake       | 4 +++-
 7 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/ports/esp32/Makefile b/ports/esp32/Makefile
index 39b740ffae074..5a40cd956940e 100644
--- a/ports/esp32/Makefile
+++ b/ports/esp32/Makefile
@@ -26,6 +26,10 @@ endif
 
 IDFPY_FLAGS += -D MICROPY_BOARD=$(BOARD) -B $(BUILD) $(CMAKE_ARGS)
 
+ifdef FROZEN_MANIFEST
+       IDFPY_FLAGS += -D MICROPY_FROZEN_MANIFEST=$(FROZEN_MANIFEST)
+endif
+
 all:
 	idf.py $(IDFPY_FLAGS) build
 	@$(PYTHON) makeimg.py \
diff --git a/ports/esp32/boards/GENERIC/mpconfigboard.cmake b/ports/esp32/boards/GENERIC/mpconfigboard.cmake
index f69b05f47b042..4aaa0420d97b0 100644
--- a/ports/esp32/boards/GENERIC/mpconfigboard.cmake
+++ b/ports/esp32/boards/GENERIC/mpconfigboard.cmake
@@ -2,5 +2,6 @@ set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.base
     boards/sdkconfig.ble
 )
-
-set(MICROPY_FROZEN_MANIFEST ${MICROPY_PORT_DIR}/boards/manifest.py)
+if(NOT MICROPY_FROZEN_MANIFEST)
+    set(MICROPY_FROZEN_MANIFEST ${MICROPY_PORT_DIR}/boards/manifest.py)
+endif()
diff --git a/ports/esp32/boards/GENERIC_D2WD/mpconfigboard.cmake b/ports/esp32/boards/GENERIC_D2WD/mpconfigboard.cmake
index 686c78df97f23..729377a5b4234 100644
--- a/ports/esp32/boards/GENERIC_D2WD/mpconfigboard.cmake
+++ b/ports/esp32/boards/GENERIC_D2WD/mpconfigboard.cmake
@@ -4,4 +4,6 @@ set(SDKCONFIG_DEFAULTS
     boards/GENERIC_D2WD/sdkconfig.board
 )
 
-set(MICROPY_FROZEN_MANIFEST ${MICROPY_PORT_DIR}/boards/manifest.py)
+if(NOT MICROPY_FROZEN_MANIFEST)
+    set(MICROPY_FROZEN_MANIFEST ${MICROPY_PORT_DIR}/boards/manifest.py)
+endif()
diff --git a/ports/esp32/boards/GENERIC_OTA/mpconfigboard.cmake b/ports/esp32/boards/GENERIC_OTA/mpconfigboard.cmake
index ca552d470c0a6..88c0efa218ae7 100644
--- a/ports/esp32/boards/GENERIC_OTA/mpconfigboard.cmake
+++ b/ports/esp32/boards/GENERIC_OTA/mpconfigboard.cmake
@@ -4,4 +4,6 @@ set(SDKCONFIG_DEFAULTS
     boards/GENERIC_OTA/sdkconfig.board
 )
 
-set(MICROPY_FROZEN_MANIFEST ${MICROPY_PORT_DIR}/boards/manifest.py)
+if(NOT MICROPY_FROZEN_MANIFEST)
+    set(MICROPY_FROZEN_MANIFEST ${MICROPY_PORT_DIR}/boards/manifest.py)
+endif()
diff --git a/ports/esp32/boards/GENERIC_S2/mpconfigboard.cmake b/ports/esp32/boards/GENERIC_S2/mpconfigboard.cmake
index 23d52e8b941a0..73f2b24e66423 100644
--- a/ports/esp32/boards/GENERIC_S2/mpconfigboard.cmake
+++ b/ports/esp32/boards/GENERIC_S2/mpconfigboard.cmake
@@ -5,4 +5,6 @@ set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.usb
 )
 
-set(MICROPY_FROZEN_MANIFEST ${MICROPY_PORT_DIR}/boards/manifest.py)
+if(NOT MICROPY_FROZEN_MANIFEST)
+    set(MICROPY_FROZEN_MANIFEST ${MICROPY_PORT_DIR}/boards/manifest.py)
+endif()
diff --git a/ports/esp32/boards/GENERIC_SPIRAM/mpconfigboard.cmake b/ports/esp32/boards/GENERIC_SPIRAM/mpconfigboard.cmake
index 2128edb592f2a..bb38f7df2b324 100644
--- a/ports/esp32/boards/GENERIC_SPIRAM/mpconfigboard.cmake
+++ b/ports/esp32/boards/GENERIC_SPIRAM/mpconfigboard.cmake
@@ -4,4 +4,6 @@ set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.spiram
 )
 
-set(MICROPY_FROZEN_MANIFEST ${MICROPY_PORT_DIR}/boards/manifest.py)
+if(NOT MICROPY_FROZEN_MANIFEST)
+    set(MICROPY_FROZEN_MANIFEST ${MICROPY_PORT_DIR}/boards/manifest.py)
+endif()
diff --git a/ports/esp32/boards/TINYPICO/mpconfigboard.cmake b/ports/esp32/boards/TINYPICO/mpconfigboard.cmake
index 5c31f5c60065e..0c65103a85347 100644
--- a/ports/esp32/boards/TINYPICO/mpconfigboard.cmake
+++ b/ports/esp32/boards/TINYPICO/mpconfigboard.cmake
@@ -6,4 +6,6 @@ set(SDKCONFIG_DEFAULTS
     boards/TINYPICO/sdkconfig.board
 )
 
-set(MICROPY_FROZEN_MANIFEST ${MICROPY_BOARD_DIR}/manifest.py)
+if(NOT MICROPY_FROZEN_MANIFEST)
+    set(MICROPY_FROZEN_MANIFEST ${MICROPY_BOARD_DIR}/manifest.py)
+endif()

From 326dd7f0dbbadc4a536636d486600ce93dade8c5 Mon Sep 17 00:00:00 2001
From: Steve App <hklang10@gmail.com>
Date: Sun, 25 Apr 2021 12:45:06 +0000
Subject: [PATCH 0772/3533] tools/makemanifest.py: Show directory name if there
 is a FreezeError.

---
 tools/makemanifest.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/makemanifest.py b/tools/makemanifest.py
index 117d1536e87d1..51de01dd8a3d5 100644
--- a/tools/makemanifest.py
+++ b/tools/makemanifest.py
@@ -199,7 +199,7 @@ def mkdir(filename):
 def freeze_internal(kind, path, script, opt):
     path = convert_path(path)
     if not os.path.isdir(path):
-        raise FreezeError("freeze path must be a directory")
+        raise FreezeError("freeze path must be a directory: {}".format(path))
     if script is None and kind == KIND_AS_STR:
         if any(f[0] == KIND_AS_STR for f in manifest_list):
             raise FreezeError("can only freeze one str directory")

From 89b64478c73d2228419e77a4450c004157ec725a Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 27 Apr 2021 16:30:58 +1000
Subject: [PATCH 0773/3533] stm32/softtimer: Add support for having a C-based
 callback.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/machine_timer.c |  7 ++++---
 ports/stm32/softtimer.c     |  6 +++++-
 ports/stm32/softtimer.h     | 10 ++++++++--
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/ports/stm32/machine_timer.c b/ports/stm32/machine_timer.c
index c37ac87672ac2..3f83d5ba61ed9 100644
--- a/ports/stm32/machine_timer.c
+++ b/ports/stm32/machine_timer.c
@@ -76,10 +76,10 @@ STATIC mp_obj_t machine_timer_init_helper(machine_timer_obj_t *self, size_t n_ar
     self->expiry_ms = mp_hal_ticks_ms() + self->delta_ms;
 
     if (args[ARG_callback].u_obj != MP_OBJ_NULL) {
-        self->callback = args[ARG_callback].u_obj;
+        self->py_callback = args[ARG_callback].u_obj;
     }
 
-    if (self->callback != mp_const_none) {
+    if (self->py_callback != mp_const_none) {
         soft_timer_insert(self);
     }
 
@@ -89,8 +89,9 @@ STATIC mp_obj_t machine_timer_init_helper(machine_timer_obj_t *self, size_t n_ar
 STATIC mp_obj_t machine_timer_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
     machine_timer_obj_t *self = m_new_obj(machine_timer_obj_t);
     self->pairheap.base.type = &machine_timer_type;
+    self->flags = SOFT_TIMER_FLAG_PY_CALLBACK;
     self->delta_ms = 1000;
-    self->callback = mp_const_none;
+    self->py_callback = mp_const_none;
 
     // Get timer id (only soft timer (-1) supported at the moment)
     mp_int_t id = -1;
diff --git a/ports/stm32/softtimer.c b/ports/stm32/softtimer.c
index d0a186c7d0489..7e439d4e75c66 100644
--- a/ports/stm32/softtimer.c
+++ b/ports/stm32/softtimer.c
@@ -64,7 +64,11 @@ void soft_timer_handler(void) {
     while (heap != NULL && TICKS_DIFF(heap->expiry_ms, ticks_ms) <= 0) {
         soft_timer_entry_t *entry = heap;
         heap = (soft_timer_entry_t *)mp_pairheap_pop(soft_timer_lt, &heap->pairheap);
-        mp_sched_schedule(entry->callback, MP_OBJ_FROM_PTR(entry));
+        if (entry->flags & SOFT_TIMER_FLAG_PY_CALLBACK) {
+            mp_sched_schedule(entry->py_callback, MP_OBJ_FROM_PTR(entry));
+        } else {
+            entry->c_callback(entry);
+        }
         if (entry->mode == SOFT_TIMER_MODE_PERIODIC) {
             entry->expiry_ms += entry->delta_ms;
             heap = (soft_timer_entry_t *)mp_pairheap_push(soft_timer_lt, &heap->pairheap, &entry->pairheap);
diff --git a/ports/stm32/softtimer.h b/ports/stm32/softtimer.h
index a80d9087b57e3..6e06bbcc65dc1 100644
--- a/ports/stm32/softtimer.h
+++ b/ports/stm32/softtimer.h
@@ -28,15 +28,21 @@
 
 #include "py/pairheap.h"
 
+#define SOFT_TIMER_FLAG_PY_CALLBACK (1)
+
 #define SOFT_TIMER_MODE_ONE_SHOT (1)
 #define SOFT_TIMER_MODE_PERIODIC (2)
 
 typedef struct _soft_timer_entry_t {
     mp_pairheap_t pairheap;
-    uint32_t mode;
+    uint16_t flags;
+    uint16_t mode;
     uint32_t expiry_ms;
     uint32_t delta_ms; // for periodic mode
-    mp_obj_t callback;
+    union {
+        void (*c_callback)(struct _soft_timer_entry_t *);
+        mp_obj_t py_callback;
+    };
 } soft_timer_entry_t;
 
 extern volatile uint32_t soft_timer_next;

From 647fa63f9c457b616b1b20fdd98403b681302680 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 29 Apr 2021 15:21:22 +1000
Subject: [PATCH 0774/3533] stm32/softtimer: Support static soft timer
 instances.

This adds support for making static (ie not on the Python GC heap) soft
timers.  This can be useful for a board to define a custom background
handler, or eventually for BLE/network processing to use instead of systick
slots; it will be more efficient using soft timer for this.

The main issue with using the existing code for static soft timers is that
it would combine heap allocated and statically allocated soft_timer_entry_t
instances in the same pairing-heap data structure.  This would prevent the
GC from tracing some of the heap allocated entries (because the GC won't
follow pointers outside the heap).

This commit makes it so that soft timer entries are explicitly marked,
instead of relying on implicit marking by having the root of the pairing
heap in the root pointer section.  Also, on soft reset only the heap-
allocated soft timers are deleted from the pairing heap, leaving the
statically allocated ones.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/gccollect.c     |  4 +++
 ports/stm32/machine_timer.c |  5 ++-
 ports/stm32/mpconfigport.h  |  2 --
 ports/stm32/softtimer.c     | 63 +++++++++++++++++++++++++++++++------
 ports/stm32/softtimer.h     |  6 +++-
 5 files changed, 65 insertions(+), 15 deletions(-)

diff --git a/ports/stm32/gccollect.c b/ports/stm32/gccollect.c
index ad5645738ea16..8b47b121ec2c3 100644
--- a/ports/stm32/gccollect.c
+++ b/ports/stm32/gccollect.c
@@ -32,6 +32,7 @@
 #include "py/mpthread.h"
 #include "lib/utils/gchelper.h"
 #include "gccollect.h"
+#include "softtimer.h"
 #include "systick.h"
 
 void gc_collect(void) {
@@ -51,6 +52,9 @@ void gc_collect(void) {
     mp_thread_gc_others();
     #endif
 
+    // trace soft timer nodes
+    soft_timer_gc_mark_all();
+
     // end the GC
     gc_collect_end();
 
diff --git a/ports/stm32/machine_timer.c b/ports/stm32/machine_timer.c
index 3f83d5ba61ed9..c94532218773f 100644
--- a/ports/stm32/machine_timer.c
+++ b/ports/stm32/machine_timer.c
@@ -73,14 +73,13 @@ STATIC mp_obj_t machine_timer_init_helper(machine_timer_obj_t *self, size_t n_ar
         mp_raise_ValueError(MP_ERROR_TEXT("period too large"));
     }
     self->delta_ms = (uint32_t)delta_ms;
-    self->expiry_ms = mp_hal_ticks_ms() + self->delta_ms;
 
     if (args[ARG_callback].u_obj != MP_OBJ_NULL) {
         self->py_callback = args[ARG_callback].u_obj;
     }
 
     if (self->py_callback != mp_const_none) {
-        soft_timer_insert(self);
+        soft_timer_insert(self, self->delta_ms);
     }
 
     return mp_const_none;
@@ -89,7 +88,7 @@ STATIC mp_obj_t machine_timer_init_helper(machine_timer_obj_t *self, size_t n_ar
 STATIC mp_obj_t machine_timer_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
     machine_timer_obj_t *self = m_new_obj(machine_timer_obj_t);
     self->pairheap.base.type = &machine_timer_type;
-    self->flags = SOFT_TIMER_FLAG_PY_CALLBACK;
+    self->flags = SOFT_TIMER_FLAG_PY_CALLBACK | SOFT_TIMER_FLAG_GC_ALLOCATED;
     self->delta_ms = 1000;
     self->py_callback = mp_const_none;
 
diff --git a/ports/stm32/mpconfigport.h b/ports/stm32/mpconfigport.h
index 2888cac88c43b..28a2d6a76df79 100644
--- a/ports/stm32/mpconfigport.h
+++ b/ports/stm32/mpconfigport.h
@@ -371,8 +371,6 @@ struct _mp_bluetooth_btstack_root_pointers_t;
     \
     mp_obj_t pyb_extint_callback[PYB_EXTI_NUM_VECTORS]; \
     \
-    struct _soft_timer_entry_t *soft_timer_heap; \
-    \
     /* pointers to all Timer objects (if they have been created) */ \
     struct _pyb_timer_obj_t *pyb_timer_obj_all[MICROPY_HW_MAX_TIMER]; \
     \
diff --git a/ports/stm32/softtimer.c b/ports/stm32/softtimer.c
index 7e439d4e75c66..7f19eccd2d36d 100644
--- a/ports/stm32/softtimer.c
+++ b/ports/stm32/softtimer.c
@@ -25,6 +25,8 @@
  */
 
 #include <stdint.h>
+#include "py/gc.h"
+#include "py/mphal.h"
 #include "py/runtime.h"
 #include "irq.h"
 #include "softtimer.h"
@@ -36,9 +38,10 @@ extern __IO uint32_t uwTick;
 
 volatile uint32_t soft_timer_next;
 
-void soft_timer_deinit(void) {
-    MP_STATE_PORT(soft_timer_heap) = NULL;
-}
+// Pointer to the pairheap of soft timer objects.
+// This may contain bss/data pointers as well as GC-heap pointers,
+// and is explicitly GC traced by soft_timer_gc_mark_all().
+STATIC soft_timer_entry_t *soft_timer_heap;
 
 STATIC int soft_timer_lt(mp_pairheap_t *n1, mp_pairheap_t *n2) {
     soft_timer_entry_t *e1 = (soft_timer_entry_t *)n1;
@@ -57,10 +60,26 @@ STATIC void soft_timer_schedule_systick(uint32_t ticks_ms) {
     enable_irq(irq_state);
 }
 
+void soft_timer_deinit(void) {
+    // Pop off all the nodes which are allocated on the GC-heap.
+    uint32_t irq_state = raise_irq_pri(IRQ_PRI_PENDSV);
+    soft_timer_entry_t *heap_from = soft_timer_heap;
+    soft_timer_entry_t *heap_to = (soft_timer_entry_t *)mp_pairheap_new(soft_timer_lt);
+    while (heap_from != NULL) {
+        soft_timer_entry_t *entry = (soft_timer_entry_t *)mp_pairheap_peek(soft_timer_lt, &heap_from->pairheap);
+        heap_from = (soft_timer_entry_t *)mp_pairheap_pop(soft_timer_lt, &heap_from->pairheap);
+        if (!(entry->flags & SOFT_TIMER_FLAG_GC_ALLOCATED)) {
+            heap_to = (soft_timer_entry_t *)mp_pairheap_push(soft_timer_lt, &heap_to->pairheap, &entry->pairheap);
+        }
+    }
+    soft_timer_heap = heap_to;
+    restore_irq_pri(irq_state);
+}
+
 // Must be executed at IRQ_PRI_PENDSV
 void soft_timer_handler(void) {
     uint32_t ticks_ms = uwTick;
-    soft_timer_entry_t *heap = MP_STATE_PORT(soft_timer_heap);
+    soft_timer_entry_t *heap = soft_timer_heap;
     while (heap != NULL && TICKS_DIFF(heap->expiry_ms, ticks_ms) <= 0) {
         soft_timer_entry_t *entry = heap;
         heap = (soft_timer_entry_t *)mp_pairheap_pop(soft_timer_lt, &heap->pairheap);
@@ -74,7 +93,7 @@ void soft_timer_handler(void) {
             heap = (soft_timer_entry_t *)mp_pairheap_push(soft_timer_lt, &heap->pairheap, &entry->pairheap);
         }
     }
-    MP_STATE_PORT(soft_timer_heap) = heap;
+    soft_timer_heap = heap;
     if (heap == NULL) {
         // No more timers left, set largest delay possible
         soft_timer_next = uwTick;
@@ -84,11 +103,37 @@ void soft_timer_handler(void) {
     }
 }
 
-void soft_timer_insert(soft_timer_entry_t *entry) {
+void soft_timer_gc_mark_all(void) {
+    // Mark all soft timer nodes that are allocated on the GC-heap.
+    // To avoid deep C recursion, pop and recreate the pairheap as nodes are marked.
+    uint32_t irq_state = raise_irq_pri(IRQ_PRI_PENDSV);
+    soft_timer_entry_t *heap_from = soft_timer_heap;
+    soft_timer_entry_t *heap_to = (soft_timer_entry_t *)mp_pairheap_new(soft_timer_lt);
+    while (heap_from != NULL) {
+        soft_timer_entry_t *entry = (soft_timer_entry_t *)mp_pairheap_peek(soft_timer_lt, &heap_from->pairheap);
+        heap_from = (soft_timer_entry_t *)mp_pairheap_pop(soft_timer_lt, &heap_from->pairheap);
+        if (entry->flags & SOFT_TIMER_FLAG_GC_ALLOCATED) {
+            gc_collect_root((void **)&entry, 1);
+        }
+        heap_to = (soft_timer_entry_t *)mp_pairheap_push(soft_timer_lt, &heap_to->pairheap, &entry->pairheap);
+    }
+    soft_timer_heap = heap_to;
+    restore_irq_pri(irq_state);
+}
+
+void soft_timer_static_init(soft_timer_entry_t *entry, uint16_t mode, uint32_t delta_ms, void (*cb)(soft_timer_entry_t *)) {
+    entry->flags = 0;
+    entry->mode = mode;
+    entry->delta_ms = delta_ms;
+    entry->c_callback = cb;
+}
+
+void soft_timer_insert(soft_timer_entry_t *entry, uint32_t initial_delta_ms) {
     mp_pairheap_init_node(soft_timer_lt, &entry->pairheap);
+    entry->expiry_ms = mp_hal_ticks_ms() + initial_delta_ms;
     uint32_t irq_state = raise_irq_pri(IRQ_PRI_PENDSV);
-    MP_STATE_PORT(soft_timer_heap) = (soft_timer_entry_t *)mp_pairheap_push(soft_timer_lt, &MP_STATE_PORT(soft_timer_heap)->pairheap, &entry->pairheap);
-    if (entry == MP_STATE_PORT(soft_timer_heap)) {
+    soft_timer_heap = (soft_timer_entry_t *)mp_pairheap_push(soft_timer_lt, &soft_timer_heap->pairheap, &entry->pairheap);
+    if (entry == soft_timer_heap) {
         // This new timer became the earliest one so set soft_timer_next
         soft_timer_schedule_systick(entry->expiry_ms);
     }
@@ -97,6 +142,6 @@ void soft_timer_insert(soft_timer_entry_t *entry) {
 
 void soft_timer_remove(soft_timer_entry_t *entry) {
     uint32_t irq_state = raise_irq_pri(IRQ_PRI_PENDSV);
-    MP_STATE_PORT(soft_timer_heap) = (soft_timer_entry_t *)mp_pairheap_delete(soft_timer_lt, &MP_STATE_PORT(soft_timer_heap)->pairheap, &entry->pairheap);
+    soft_timer_heap = (soft_timer_entry_t *)mp_pairheap_delete(soft_timer_lt, &soft_timer_heap->pairheap, &entry->pairheap);
     restore_irq_pri(irq_state);
 }
diff --git a/ports/stm32/softtimer.h b/ports/stm32/softtimer.h
index 6e06bbcc65dc1..25d828a9fd453 100644
--- a/ports/stm32/softtimer.h
+++ b/ports/stm32/softtimer.h
@@ -29,6 +29,7 @@
 #include "py/pairheap.h"
 
 #define SOFT_TIMER_FLAG_PY_CALLBACK (1)
+#define SOFT_TIMER_FLAG_GC_ALLOCATED (2)
 
 #define SOFT_TIMER_MODE_ONE_SHOT (1)
 #define SOFT_TIMER_MODE_PERIODIC (2)
@@ -49,7 +50,10 @@ extern volatile uint32_t soft_timer_next;
 
 void soft_timer_deinit(void);
 void soft_timer_handler(void);
-void soft_timer_insert(soft_timer_entry_t *entry);
+void soft_timer_gc_mark_all(void);
+
+void soft_timer_static_init(soft_timer_entry_t *entry, uint16_t mode, uint32_t delta_ms, void (*cb)(soft_timer_entry_t *));
+void soft_timer_insert(soft_timer_entry_t *entry, uint32_t initial_delta_ms);
 void soft_timer_remove(soft_timer_entry_t *entry);
 
 #endif // MICROPY_INCLUDED_STM32_SOFTTIMER_H

From a72b8443cae183ecd5396d3ae963984f4d2e1cdc Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 28 Apr 2021 10:30:17 +1000
Subject: [PATCH 0775/3533] stm32/boardctrl: Add constants for reset mode
 values.

And use the same boardctrl.h header for both the application and mboot so
these constants are consistent.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/boardctrl.c  | 18 ++++++++++--------
 ports/stm32/boardctrl.h  |  9 +++++++++
 ports/stm32/main.c       |  5 +++--
 ports/stm32/mboot/main.c |  7 ++++---
 4 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/ports/stm32/boardctrl.c b/ports/stm32/boardctrl.c
index c82fefa97cf3b..ce04914ea907c 100644
--- a/ports/stm32/boardctrl.c
+++ b/ports/stm32/boardctrl.c
@@ -57,8 +57,8 @@ STATIC uint update_reset_mode(uint reset_mode) {
             }
             mp_hal_delay_ms(20);
             if (i % 30 == 29) {
-                if (++reset_mode > 3) {
-                    reset_mode = 1;
+                if (++reset_mode > BOARDCTRL_RESET_MODE_FACTORY_FILESYSTEM) {
+                    reset_mode = BOARDCTRL_RESET_MODE_NORMAL;
                 }
                 led_state(2, reset_mode & 1);
                 led_state(3, reset_mode & 2);
@@ -97,8 +97,8 @@ STATIC uint update_reset_mode(uint reset_mode) {
             if (!switch_get()) {
                 break;
             }
-            if (++reset_mode > 3) {
-                reset_mode = 1;
+            if (++reset_mode > BOARDCTRL_RESET_MODE_FACTORY_FILESYSTEM) {
+                reset_mode = BOARDCTRL_RESET_MODE_NORMAL;
             }
         }
         // Flash the selected reset mode
@@ -124,7 +124,7 @@ void boardctrl_before_soft_reset_loop(boardctrl_state_t *state) {
     #if !MICROPY_HW_USES_BOOTLOADER
     // Update the reset_mode via the default
     // method which uses the board switch/button and LEDs.
-    state->reset_mode = update_reset_mode(1);
+    state->reset_mode = update_reset_mode(BOARDCTRL_RESET_MODE_NORMAL);
     #endif
 }
 
@@ -142,7 +142,8 @@ void boardctrl_top_soft_reset_loop(boardctrl_state_t *state) {
 }
 
 int boardctrl_run_boot_py(boardctrl_state_t *state) {
-    bool run_boot_py = state->reset_mode == 1 || state->reset_mode == 3;
+    bool run_boot_py = state->reset_mode == BOARDCTRL_RESET_MODE_NORMAL
+        || state->reset_mode == BOARDCTRL_RESET_MODE_FACTORY_FILESYSTEM;
 
     if (run_boot_py) {
         // Run boot.py, if it exists.
@@ -174,7 +175,8 @@ int boardctrl_run_boot_py(boardctrl_state_t *state) {
 }
 
 int boardctrl_run_main_py(boardctrl_state_t *state) {
-    bool run_main_py = (state->reset_mode == 1 || state->reset_mode == 3)
+    bool run_main_py = (state->reset_mode == BOARDCTRL_RESET_MODE_NORMAL
+        || state->reset_mode == BOARDCTRL_RESET_MODE_FACTORY_FILESYSTEM)
         && pyexec_mode_kind == PYEXEC_MODE_FRIENDLY_REPL;
 
     if (run_main_py) {
@@ -205,5 +207,5 @@ void boardctrl_start_soft_reset(boardctrl_state_t *state) {
 
 void boardctrl_end_soft_reset(boardctrl_state_t *state) {
     // Set reset_mode to normal boot.
-    state->reset_mode = 1;
+    state->reset_mode = BOARDCTRL_RESET_MODE_NORMAL;
 }
diff --git a/ports/stm32/boardctrl.h b/ports/stm32/boardctrl.h
index 33e71b65c9975..551be3453ee22 100644
--- a/ports/stm32/boardctrl.h
+++ b/ports/stm32/boardctrl.h
@@ -60,11 +60,20 @@
 #define MICROPY_BOARD_END_SOFT_RESET boardctrl_end_soft_reset
 #endif
 
+// Constants to return from boardctrl_run_boot_py, boardctrl_run_main_py.
 enum {
     BOARDCTRL_CONTINUE,
     BOARDCTRL_GOTO_SOFT_RESET_EXIT,
 };
 
+// Constants for boardctrl_state_t.reset_mode.
+enum {
+    BOARDCTRL_RESET_MODE_NORMAL = 1,
+    BOARDCTRL_RESET_MODE_SAFE_MODE = 2,
+    BOARDCTRL_RESET_MODE_FACTORY_FILESYSTEM = 3,
+    BOARDCTRL_RESET_MODE_BOOTLOADER = 4,
+};
+
 typedef struct _boardctrl_state_t {
     uint8_t reset_mode;
     bool log_soft_reset;
diff --git a/ports/stm32/main.c b/ports/stm32/main.c
index bc8e6f0691eef..ca80daaceb5a8 100644
--- a/ports/stm32/main.c
+++ b/ports/stm32/main.c
@@ -156,7 +156,7 @@ MP_DEFINE_CONST_FUN_OBJ_KW(pyb_main_obj, 1, pyb_main);
 #if MICROPY_HW_FLASH_MOUNT_AT_BOOT
 // avoid inlining to avoid stack usage within main()
 MP_NOINLINE STATIC bool init_flash_fs(uint reset_mode) {
-    if (reset_mode == 3) {
+    if (reset_mode == BOARDCTRL_RESET_MODE_FACTORY_FILESYSTEM) {
         // Asked by user to reset filesystem
         factory_reset_create_filesystem();
     }
@@ -210,7 +210,8 @@ MP_NOINLINE STATIC bool init_flash_fs(uint reset_mode) {
     mp_obj_t mount_point = MP_OBJ_NEW_QSTR(MP_QSTR__slash_flash);
     ret = mp_vfs_mount_and_chdir_protected(bdev, mount_point);
 
-    if (ret == -MP_ENODEV && bdev == MP_OBJ_FROM_PTR(&pyb_flash_obj) && reset_mode != 3) {
+    if (ret == -MP_ENODEV && bdev == MP_OBJ_FROM_PTR(&pyb_flash_obj)
+        && reset_mode != BOARDCTRL_RESET_MODE_FACTORY_FILESYSTEM) {
         // No filesystem, bdev is still the default (so didn't detect a possibly corrupt littlefs),
         // and didn't already create a filesystem, so try to create a fresh one now.
         ret = factory_reset_create_filesystem();
diff --git a/ports/stm32/mboot/main.c b/ports/stm32/mboot/main.c
index 4407ca9da9bdf..a77060ab2b47e 100644
--- a/ports/stm32/mboot/main.c
+++ b/ports/stm32/mboot/main.c
@@ -29,6 +29,7 @@
 
 #include "py/mphal.h"
 #include "extmod/crypto-algorithms/sha256.c"
+#include "boardctrl.h"
 #include "usbd_core.h"
 #include "storage.h"
 #include "flash.h"
@@ -1289,7 +1290,7 @@ static int pyb_usbdd_shutdown(void) {
 
 static int get_reset_mode(void) {
     usrbtn_init();
-    int reset_mode = 1;
+    int reset_mode = BOARDCTRL_RESET_MODE_NORMAL;
     if (usrbtn_state()) {
         // Cycle through reset modes while USR is held
         // Timeout is roughly 20s, where reset_mode=1
@@ -1299,7 +1300,7 @@ static int get_reset_mode(void) {
         for (int i = 0; i < (RESET_MODE_NUM_STATES * RESET_MODE_TIMEOUT_CYCLES + 1) * 32; i++) {
             if (i % 32 == 0) {
                 if (++reset_mode > RESET_MODE_NUM_STATES) {
-                    reset_mode = 1;
+                    reset_mode = BOARDCTRL_RESET_MODE_NORMAL;
                 }
                 uint8_t l = RESET_MODE_LED_STATES >> ((reset_mode - 1) * 4);
                 led_state_all(l);
@@ -1396,7 +1397,7 @@ void stm32_main(int initial_r0) {
 
     int reset_mode = get_reset_mode();
     uint32_t msp = *(volatile uint32_t*)APPLICATION_ADDR;
-    if (reset_mode != 4 && (msp & APP_VALIDITY_BITS) == 0) {
+    if (reset_mode != BOARDCTRL_RESET_MODE_BOOTLOADER && (msp & APP_VALIDITY_BITS) == 0) {
         // not DFU mode so jump to application, passing through reset_mode
         // undo our DFU settings
         // TODO probably should disable all IRQ sources first

From 885b246ca91592ba48637a8519dd4fbd576ad38a Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 29 Apr 2021 23:48:58 +1000
Subject: [PATCH 0776/3533] stm32/boardctrl: Show first reset-mode state on
 LEDs when selecting.

Commit 1e297c88989592258965b69cb740039e26c7636c introduced a bug where the
very first reset-mode state on the LEDs was not shown, because prior to
that commit the first reset-mode state was the same as the initial LED
state (green on, others off) and update_reset_mode() was called after
setting this initial LED state.

This is fixed in this commit by changing the update_reset_mode() loop so
that it displays the current reset mode before doing the delay.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/boardctrl.c | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/ports/stm32/boardctrl.c b/ports/stm32/boardctrl.c
index ce04914ea907c..8cc519d8e9d7d 100644
--- a/ports/stm32/boardctrl.c
+++ b/ports/stm32/boardctrl.c
@@ -51,20 +51,21 @@ STATIC uint update_reset_mode(uint reset_mode) {
         // The original method used on the pyboard is appropriate if you have 2
         // or more LEDs.
         #if defined(MICROPY_HW_LED2)
-        for (uint i = 0; i < 3000; i++) {
-            if (!switch_get()) {
-                break;
-            }
-            mp_hal_delay_ms(20);
-            if (i % 30 == 29) {
-                if (++reset_mode > BOARDCTRL_RESET_MODE_FACTORY_FILESYSTEM) {
-                    reset_mode = BOARDCTRL_RESET_MODE_NORMAL;
+        for (uint i = 0; i < 100; i++) {
+            led_state(2, reset_mode & 1);
+            led_state(3, reset_mode & 2);
+            led_state(4, reset_mode & 4);
+            for (uint j = 0; j < 30; ++j) {
+                mp_hal_delay_ms(20);
+                if (!switch_get()) {
+                    goto select_mode;
                 }
-                led_state(2, reset_mode & 1);
-                led_state(3, reset_mode & 2);
-                led_state(4, reset_mode & 4);
+            }
+            if (++reset_mode > BOARDCTRL_RESET_MODE_FACTORY_FILESYSTEM) {
+                reset_mode = BOARDCTRL_RESET_MODE_NORMAL;
             }
         }
+    select_mode:
         // flash the selected reset mode
         for (uint i = 0; i < 6; i++) {
             led_state(2, 0);

From ef2896bdeacdfa3f6dc9faaa3f9c0f3d9bef291b Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 28 Apr 2021 16:10:42 +1000
Subject: [PATCH 0777/3533] stm32/mboot: Allow a board to add source files to
 the build.

A board can now use BUILDING_MBOOT at the Makefile-level to do things
conditional on building mboot, for example add source files to SRC_C.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/mboot/Makefile | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/ports/stm32/mboot/Makefile b/ports/stm32/mboot/Makefile
index 0c92442597723..534622c030334 100755
--- a/ports/stm32/mboot/Makefile
+++ b/ports/stm32/mboot/Makefile
@@ -23,6 +23,9 @@ ifeq ($(wildcard $(BOARD_DIR)/.),)
 $(error Invalid BOARD specified: $(BOARD_DIR))
 endif
 
+# Enable BUILDING_MBOOT so boards can configure their .mk file accordingly.
+BUILDING_MBOOT = 1
+
 include ../../../py/mkenv.mk
 include $(BOARD_DIR)/mpconfigboard.mk
 
@@ -78,7 +81,7 @@ CFLAGS += -DAPPLICATION_ADDR=$(TEXT0_ADDR)
 CFLAGS += -DFFCONF_H=\"ports/stm32/mboot/ffconf.h\"
 CFLAGS += -DLFS1_NO_MALLOC -DLFS1_NO_DEBUG -DLFS1_NO_WARN -DLFS1_NO_ERROR -DLFS1_NO_ASSERT
 CFLAGS += -DLFS2_NO_MALLOC -DLFS2_NO_DEBUG -DLFS2_NO_WARN -DLFS2_NO_ERROR -DLFS2_NO_ASSERT -DLFS2_READONLY
-CFLAGS += -DBUILDING_MBOOT=1
+CFLAGS += -DBUILDING_MBOOT=$(BUILDING_MBOOT)
 CFLAGS += -DMICROPY_HW_STM32WB_FLASH_SYNCRONISATION=0
 CFLAGS += -DBOOTLOADER_DFU_USB_VID=$(BOOTLOADER_DFU_USB_VID) -DBOOTLOADER_DFU_USB_PID=$(BOOTLOADER_DFU_USB_PID)
 
@@ -98,7 +101,7 @@ COPT += -Os -DNDEBUG
 endif
 
 $(BUILD)/lib/libc/string0.o: CFLAGS += $(CFLAGS_BUILTIN)
-LIB_SRC_C = \
+LIB_SRC_C += \
 	lib/libc/string0.c \
 	lib/littlefs/lfs1.c \
 	lib/littlefs/lfs1_util.c \
@@ -111,7 +114,7 @@ LIB_SRC_C = \
 	extmod/uzlib/tinflate.c \
 	extmod/uzlib/tinfgzip.c
 
-SRC_C = \
+SRC_C += \
 	main.c \
 	elem.c \
 	fsload.c \
@@ -131,7 +134,7 @@ SRC_C = \
 	ports/stm32/usbd_conf.c \
 	$(wildcard $(BOARD_DIR)/*.c)
 
-SRC_O = \
+SRC_O += \
 	$(STARTUP_FILE) \
 	$(SYSTEM_FILE) \
 	ports/stm32/resethandler.o \
@@ -146,7 +149,7 @@ CFLAGS += -DMBOOT_PACK_KEYS_FILE=\"$(MBOOT_PACK_KEYS_FILE)\"
 endif
 
 $(BUILD)/$(HAL_DIR)/Src/stm32$(MCU_SERIES)xx_ll_usb.o: CFLAGS += -Wno-attributes
-SRC_HAL = $(addprefix $(HAL_DIR)/Src/stm32$(MCU_SERIES)xx_,\
+SRC_HAL += $(addprefix $(HAL_DIR)/Src/stm32$(MCU_SERIES)xx_,\
 	hal_cortex.c \
 	hal_flash.c \
 	hal_flash_ex.c \
@@ -155,13 +158,12 @@ SRC_HAL = $(addprefix $(HAL_DIR)/Src/stm32$(MCU_SERIES)xx_,\
 	ll_usb.c \
 	)
 
-SRC_USBDEV = $(addprefix ports/stm32/$(USBDEV_DIR)/,\
+SRC_USBDEV += $(addprefix ports/stm32/$(USBDEV_DIR)/,\
 	core/src/usbd_core.c \
 	core/src/usbd_ctlreq.c \
 	core/src/usbd_ioreq.c \
 	)
 
-OBJ =
 OBJ += $(addprefix $(BUILD)/, $(LIB_SRC_C:.c=.o))
 OBJ += $(addprefix $(BUILD)/, $(SRC_C:.c=.o))
 OBJ += $(addprefix $(BUILD)/, $(SRC_O))

From fd01b6c779d39eae1aaa0f038b4ec15d86db44fe Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 28 Apr 2021 16:12:07 +1000
Subject: [PATCH 0778/3533] stm32/adc: Allow mboot to use basic ADC functions.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/adc.h             | 5 +++++
 ports/stm32/machine_adc.c     | 8 ++++++--
 ports/stm32/mboot/Makefile    | 1 +
 ports/stm32/mboot/mphalport.h | 5 +++++
 4 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/ports/stm32/adc.h b/ports/stm32/adc.h
index 6f2e61e099449..64864b19675e4 100644
--- a/ports/stm32/adc.h
+++ b/ports/stm32/adc.h
@@ -26,8 +26,13 @@
 #ifndef MICROPY_INCLUDED_STM32_ADC_H
 #define MICROPY_INCLUDED_STM32_ADC_H
 
+#if !BUILDING_MBOOT
 extern const mp_obj_type_t pyb_adc_type;
 extern const mp_obj_type_t pyb_adc_all_type;
+#endif
+
+void adc_config(ADC_TypeDef *adc, uint32_t bits);
+uint32_t adc_config_and_read_u16(ADC_TypeDef *adc, uint32_t channel, uint32_t sample_time);
 
 #if defined(ADC_CHANNEL_VBAT)
 
diff --git a/ports/stm32/machine_adc.c b/ports/stm32/machine_adc.c
index d9e5a64da5533..f28bd5b398670 100644
--- a/ports/stm32/machine_adc.c
+++ b/ports/stm32/machine_adc.c
@@ -96,7 +96,7 @@ STATIC const uint8_t adc_cr_to_bits_table[] = {16, 14, 12, 10, 8, 8, 8, 8};
 STATIC const uint8_t adc_cr_to_bits_table[] = {12, 10, 8, 6};
 #endif
 
-STATIC void adc_config(ADC_TypeDef *adc, uint32_t bits) {
+void adc_config(ADC_TypeDef *adc, uint32_t bits) {
     // Configure ADC clock source and enable ADC clock
     #if defined(STM32L4) || defined(STM32WB)
     __HAL_RCC_ADC_CONFIG(RCC_ADCCLKSOURCE_SYSCLK);
@@ -331,7 +331,7 @@ STATIC uint32_t adc_read_channel(ADC_TypeDef *adc) {
     return value;
 }
 
-STATIC uint32_t adc_config_and_read_u16(ADC_TypeDef *adc, uint32_t channel, uint32_t sample_time) {
+uint32_t adc_config_and_read_u16(ADC_TypeDef *adc, uint32_t channel, uint32_t sample_time) {
     if (channel == ADC_CHANNEL_VREF) {
         return 0xffff;
     }
@@ -357,6 +357,8 @@ STATIC uint32_t adc_config_and_read_u16(ADC_TypeDef *adc, uint32_t channel, uint
 /******************************************************************************/
 // MicroPython bindings for machine.ADC
 
+#if !BUILDING_MBOOT
+
 const mp_obj_type_t machine_adc_type;
 
 typedef struct _machine_adc_obj_t {
@@ -462,3 +464,5 @@ const mp_obj_type_t machine_adc_type = {
     .make_new = machine_adc_make_new,
     .locals_dict = (mp_obj_dict_t *)&machine_adc_locals_dict,
 };
+
+#endif
diff --git a/ports/stm32/mboot/Makefile b/ports/stm32/mboot/Makefile
index 534622c030334..d57b9368ee846 100755
--- a/ports/stm32/mboot/Makefile
+++ b/ports/stm32/mboot/Makefile
@@ -128,6 +128,7 @@ SRC_C += \
 	ports/stm32/flash.c \
 	ports/stm32/flashbdev.c \
 	ports/stm32/i2cslave.c \
+	ports/stm32/machine_adc.c \
 	ports/stm32/powerctrlboot.c \
 	ports/stm32/qspi.c \
 	ports/stm32/spibdev.c \
diff --git a/ports/stm32/mboot/mphalport.h b/ports/stm32/mboot/mphalport.h
index 56d18a9b05d1d..ab0bc1587cda9 100644
--- a/ports/stm32/mboot/mphalport.h
+++ b/ports/stm32/mboot/mphalport.h
@@ -39,6 +39,11 @@ static inline int mp_hal_status_to_neg_errno(HAL_StatusTypeDef status) {
 #define MP_HAL_PIN_MODE_OUTPUT          (1)
 #define MP_HAL_PIN_MODE_ALT             (2)
 #define MP_HAL_PIN_MODE_ANALOG          (3)
+#if defined(GPIO_ASCR_ASC0)
+#define MP_HAL_PIN_MODE_ADC             (11)
+#else
+#define MP_HAL_PIN_MODE_ADC             (3)
+#endif
 #define MP_HAL_PIN_MODE_OPEN_DRAIN      (5)
 #define MP_HAL_PIN_MODE_ALT_OPEN_DRAIN  (6)
 #define MP_HAL_PIN_PULL_NONE            (GPIO_NOPULL)

From 97f09fda3e00b4da11bed3d7fb3d83d89deeeafb Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 28 Apr 2021 16:21:38 +1000
Subject: [PATCH 0779/3533] stm32/mboot: Fix mp_hal_delay_us() and add
 mp_hal_ticks_ms().

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/mboot/main.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/ports/stm32/mboot/main.c b/ports/stm32/mboot/main.c
index a77060ab2b47e..c82e460faf642 100644
--- a/ports/stm32/mboot/main.c
+++ b/ports/stm32/mboot/main.c
@@ -95,6 +95,9 @@
 // These bits are used to detect valid application firmware at APPLICATION_ADDR
 #define APP_VALIDITY_BITS (0x00000003)
 
+// For 1ms system ticker.
+static volatile uint32_t systick_ms;
+
 // Global dfu state
 dfu_context_t dfu_context SECTION_NOZERO_BSS;
 
@@ -104,6 +107,10 @@ uint32_t get_le32(const uint8_t *b) {
     return b[0] | b[1] << 8 | b[2] << 16 | b[3] << 24;
 }
 
+mp_uint_t mp_hal_ticks_ms(void) {
+    return systick_ms;
+}
+
 void mp_hal_delay_us(mp_uint_t usec) {
     // use a busy loop for the delay
     // sys freq is always a multiple of 2MHz, so division here won't lose precision
@@ -113,11 +120,10 @@ void mp_hal_delay_us(mp_uint_t usec) {
     const uint32_t ucount = SystemCoreClock / 2000000 * usec / 2;
     #endif
     for (uint32_t count = 0; ++count <= ucount;) {
+        __NOP();
     }
 }
 
-static volatile uint32_t systick_ms;
-
 void mp_hal_delay_ms(mp_uint_t ms) {
     if (__get_PRIMASK() == 0) {
         // IRQs enabled, use systick

From 58be5a5aa328e687a3560d4a85fb069400b0b8ca Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 28 Apr 2021 16:26:20 +1000
Subject: [PATCH 0780/3533] stm32/mboot: Allow a board to customise the linker
 scripts.

A board can now define MBOOT_LD_FILES (at the Makefile-level) to specify
custom linker scripts.  And stm32_generic.ld has been split into 2 pieces
so one or the other can be reused (usually stm32_sections.ld wolud be
reused by a board, and stm32_memory.ld redefined).

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/mboot/Makefile                             |  3 ++-
 ports/stm32/mboot/stm32_memory.ld                      | 10 ++++++++++
 .../mboot/{stm32_generic.ld => stm32_sections.ld}      | 10 ++--------
 3 files changed, 14 insertions(+), 9 deletions(-)
 create mode 100644 ports/stm32/mboot/stm32_memory.ld
 rename ports/stm32/mboot/{stm32_generic.ld => stm32_sections.ld} (87%)

diff --git a/ports/stm32/mboot/Makefile b/ports/stm32/mboot/Makefile
index d57b9368ee846..de090da1c6a03 100755
--- a/ports/stm32/mboot/Makefile
+++ b/ports/stm32/mboot/Makefile
@@ -85,7 +85,8 @@ CFLAGS += -DBUILDING_MBOOT=$(BUILDING_MBOOT)
 CFLAGS += -DMICROPY_HW_STM32WB_FLASH_SYNCRONISATION=0
 CFLAGS += -DBOOTLOADER_DFU_USB_VID=$(BOOTLOADER_DFU_USB_VID) -DBOOTLOADER_DFU_USB_PID=$(BOOTLOADER_DFU_USB_PID)
 
-LDFLAGS = -nostdlib -L . -T stm32_generic.ld -Map=$(@:.elf=.map) --cref
+MBOOT_LD_FILES ?= stm32_memory.ld stm32_sections.ld
+LDFLAGS = -nostdlib -L . $(addprefix -T,$(MBOOT_LD_FILES)) -Map=$(@:.elf=.map) --cref
 LIBS = $(shell $(CC) $(CFLAGS) -print-libgcc-file-name)
 
 # Remove uncalled code from the final image.
diff --git a/ports/stm32/mboot/stm32_memory.ld b/ports/stm32/mboot/stm32_memory.ld
new file mode 100644
index 0000000000000..cfcac4096b6d1
--- /dev/null
+++ b/ports/stm32/mboot/stm32_memory.ld
@@ -0,0 +1,10 @@
+/*
+    Linker script fragment for mboot on an STM32xxx MCU.
+    This defines the memory sections for the bootloader to use.
+*/
+
+MEMORY
+{
+    FLASH_BL (rx)   : ORIGIN = 0x08000000, LENGTH = 32K
+    RAM (xrw)       : ORIGIN = 0x20000000, LENGTH = 120K
+}
diff --git a/ports/stm32/mboot/stm32_generic.ld b/ports/stm32/mboot/stm32_sections.ld
similarity index 87%
rename from ports/stm32/mboot/stm32_generic.ld
rename to ports/stm32/mboot/stm32_sections.ld
index ade43496745eb..3302c5f97291d 100644
--- a/ports/stm32/mboot/stm32_generic.ld
+++ b/ports/stm32/mboot/stm32_sections.ld
@@ -1,14 +1,8 @@
 /*
-    GNU linker script for generic STM32xxx MCU
+    Linker script fragment for mboot on an STM32xxx MCU.
+    This needs the following MEMORY sections to be defined: FLASH_BL, RAM.
 */
 
-/* Specify the memory areas */
-MEMORY
-{
-    FLASH_BL (rx)   : ORIGIN = 0x08000000, LENGTH = 32K /* sector 0 (can be 32K) */
-    RAM (xrw)       : ORIGIN = 0x20000000, LENGTH = 120K
-}
-
 /* produce a link error if there is not this amount of RAM for these sections */
 _minimum_stack_size = 8K;
 

From 37494b8c8a3e61612081aa737997201e7b24b536 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 28 Apr 2021 16:45:51 +1000
Subject: [PATCH 0781/3533] stm32/mboot: Allow mboot to be placed at any
 location in flash.

A board can now define MBOOT_TEXT0_ADDR to place mboot at a location other
than 0x08000000.  This can be useful if, for example, there is already a
different bootloader on the device.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/Makefile       |  5 +++++
 ports/stm32/mboot/Makefile | 10 ++++++----
 ports/stm32/mboot/main.c   |  2 +-
 ports/stm32/modmachine.c   |  6 +++---
 4 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/ports/stm32/Makefile b/ports/stm32/Makefile
index e7a8f0aee62d3..e94e7d72f363f 100644
--- a/ports/stm32/Makefile
+++ b/ports/stm32/Makefile
@@ -27,6 +27,10 @@ MICROPY_ROM_TEXT_COMPRESSION ?= 1
 # File containing description of content to be frozen into firmware.
 FROZEN_MANIFEST ?= boards/manifest.py
 
+# Location of mboot (or other bootloader) if the device has one.
+# Used by machine.bootloader().
+MBOOT_TEXT0_ADDR ?= 0x08000000
+
 # include py core make definitions
 include $(TOP)/py/py.mk
 
@@ -101,6 +105,7 @@ CFLAGS += $(CFLAGS_MCU_$(MCU_SERIES))
 CFLAGS += $(COPT)
 CFLAGS += -I$(BOARD_DIR)
 CFLAGS += -DSTM32_HAL_H='<stm32$(MCU_SERIES)xx_hal.h>'
+CFLAGS += -DMBOOT_VTOR=$(MBOOT_TEXT0_ADDR)
 CFLAGS += -DMICROPY_HW_VTOR=$(TEXT0_ADDR)
 
 # Configure for nan-boxing object model if requested
diff --git a/ports/stm32/mboot/Makefile b/ports/stm32/mboot/Makefile
index de090da1c6a03..17de685a61cea 100755
--- a/ports/stm32/mboot/Makefile
+++ b/ports/stm32/mboot/Makefile
@@ -29,6 +29,9 @@ BUILDING_MBOOT = 1
 include ../../../py/mkenv.mk
 include $(BOARD_DIR)/mpconfigboard.mk
 
+# A board can set MBOOT_TEXT0_ADDR to a custom location where mboot should reside.
+MBOOT_TEXT0_ADDR ?= 0x08000000
+
 MCU_SERIES_UPPER = $(shell echo $(MCU_SERIES) | tr '[:lower:]' '[:upper:]')
 CMSIS_MCU_LOWER = $(shell echo $(CMSIS_MCU) | tr '[:upper:]' '[:lower:]')
 
@@ -77,6 +80,7 @@ CFLAGS += $(COPT)
 CFLAGS += -I$(BOARD_DIR)
 CFLAGS += -DSTM32_HAL_H='<stm32$(MCU_SERIES)xx_hal.h>'
 CFLAGS += -DBOARD_$(BOARD)
+CFLAGS += -DMBOOT_VTOR=$(MBOOT_TEXT0_ADDR)
 CFLAGS += -DAPPLICATION_ADDR=$(TEXT0_ADDR)
 CFLAGS += -DFFCONF_H=\"ports/stm32/mboot/ffconf.h\"
 CFLAGS += -DLFS1_NO_MALLOC -DLFS1_NO_DEBUG -DLFS1_NO_WARN -DLFS1_NO_ERROR -DLFS1_NO_ASSERT
@@ -181,20 +185,18 @@ $(TOP)/lib/stm32lib/README.md:
 
 .PHONY: deploy deploy-stlink
 
-FLASH_ADDR = 0x08000000
-
 deploy: $(BUILD)/firmware.dfu
 	$(ECHO) "Writing $< to the board"
 	$(Q)$(PYTHON) $(PYDFU) -u $<
 
 deploy-stlink: $(BUILD)/firmware.dfu
 	$(ECHO) "Writing $< to the board via ST-LINK"
-	$(Q)$(STFLASH) write $(BUILD)/firmware.bin $(FLASH_ADDR)
+	$(Q)$(STFLASH) write $(BUILD)/firmware.bin $(MBOOT_TEXT0_ADDR)
 
 $(BUILD)/firmware.dfu: $(BUILD)/firmware.elf
 	$(ECHO) "Create $@"
 	$(Q)$(OBJCOPY) -O binary -j .isr_vector -j .text -j .data $^ $(BUILD)/firmware.bin
-	$(Q)$(PYTHON) $(DFU) -b $(FLASH_ADDR):$(BUILD)/firmware.bin $@
+	$(Q)$(PYTHON) $(DFU) -b $(MBOOT_TEXT0_ADDR):$(BUILD)/firmware.bin $@
 
 $(BUILD)/firmware.hex: $(BUILD)/firmware.elf
 	$(ECHO) "Create $@"
diff --git a/ports/stm32/mboot/main.c b/ports/stm32/mboot/main.c
index c82e460faf642..36b6890361572 100644
--- a/ports/stm32/mboot/main.c
+++ b/ports/stm32/mboot/main.c
@@ -1358,7 +1358,7 @@ void stm32_main(int initial_r0) {
     #endif
 
     // Make sure IRQ vector table points to flash where this bootloader lives.
-    SCB->VTOR = FLASH_BASE;
+    SCB->VTOR = MBOOT_VTOR;
 
     // Enable 8-byte stack alignment for IRQ handlers, in accord with EABI
     SCB->CCR |= SCB_CCR_STKALIGN_Msk;
diff --git a/ports/stm32/modmachine.c b/ports/stm32/modmachine.c
index f9fd1d9a64d77..aee563ee881d1 100644
--- a/ports/stm32/modmachine.c
+++ b/ports/stm32/modmachine.c
@@ -270,16 +270,16 @@ STATIC NORETURN mp_obj_t machine_bootloader(size_t n_args, const mp_obj_t *args)
     #if MICROPY_HW_USES_BOOTLOADER
     if (n_args == 0 || !mp_obj_is_true(args[0])) {
         // By default, with no args given, we enter the custom bootloader (mboot)
-        powerctrl_enter_bootloader(0x70ad0000, 0x08000000);
+        powerctrl_enter_bootloader(0x70ad0000, MBOOT_VTOR);
     }
 
     if (n_args == 1 && mp_obj_is_str_or_bytes(args[0])) {
         // With a string/bytes given, pass its data to the custom bootloader
         size_t len;
         const char *data = mp_obj_str_get_data(args[0], &len);
-        void *mboot_region = (void *)*((volatile uint32_t *)0x08000000);
+        void *mboot_region = (void *)*((volatile uint32_t *)MBOOT_VTOR);
         memmove(mboot_region, data, len);
-        powerctrl_enter_bootloader(0x70ad0080, 0x08000000);
+        powerctrl_enter_bootloader(0x70ad0080, MBOOT_VTOR);
     }
     #endif
 

From cf7e71fa4377e30c8612fa19032ae3004670c7e3 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 29 Apr 2021 12:08:20 +1000
Subject: [PATCH 0782/3533] stm32/sdcard: Allow configuring the SDMMC periph
 used for SD/MMC card.

This can now be selected by setting MICROPY_HW_SDCARD_SDMMC, which defaults
to 1, ie SDMMC1.  This commit also renames the SD pin configuration macros
from MICROPY_HW_SDMMC2_xxx to MICROPY_HW_SDCARD_xxx, as well as renaming
MICROPY_HW_SDMMC_BUS_WIDTH to MICROPY_HW_SDCARD_BUS_WIDTH.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/boards/PYBD_SF2/mpconfigboard.h   | 13 +--
 .../boards/STM32F769DISC/mpconfigboard.h      | 15 +--
 ports/stm32/mpconfigboard_common.h            | 20 +++-
 ports/stm32/sdcard.c                          | 97 ++++++++-----------
 4 files changed, 75 insertions(+), 70 deletions(-)

diff --git a/ports/stm32/boards/PYBD_SF2/mpconfigboard.h b/ports/stm32/boards/PYBD_SF2/mpconfigboard.h
index dc42751fffe87..7d89e17cf46d2 100644
--- a/ports/stm32/boards/PYBD_SF2/mpconfigboard.h
+++ b/ports/stm32/boards/PYBD_SF2/mpconfigboard.h
@@ -165,12 +165,13 @@ extern struct _spi_bdev_t spi_bdev2;
 #define MICROPY_HW_LED_OFF(pin)     (mp_hal_pin_high(pin))
 
 // SD card
-#define MICROPY_HW_SDMMC2_CK                (pyb_pin_SD_CK)
-#define MICROPY_HW_SDMMC2_CMD               (pyb_pin_SD_CMD)
-#define MICROPY_HW_SDMMC2_D0                (pyb_pin_SD_D0)
-#define MICROPY_HW_SDMMC2_D1                (pyb_pin_SD_D1)
-#define MICROPY_HW_SDMMC2_D2                (pyb_pin_SD_D2)
-#define MICROPY_HW_SDMMC2_D3                (pyb_pin_SD_D3)
+#define MICROPY_HW_SDCARD_SDMMC             (2)
+#define MICROPY_HW_SDCARD_CK                (pyb_pin_SD_CK)
+#define MICROPY_HW_SDCARD_CMD               (pyb_pin_SD_CMD)
+#define MICROPY_HW_SDCARD_D0                (pyb_pin_SD_D0)
+#define MICROPY_HW_SDCARD_D1                (pyb_pin_SD_D1)
+#define MICROPY_HW_SDCARD_D2                (pyb_pin_SD_D2)
+#define MICROPY_HW_SDCARD_D3                (pyb_pin_SD_D3)
 #define MICROPY_HW_SDCARD_DETECT_PIN        (pyb_pin_SD_SW)
 #define MICROPY_HW_SDCARD_DETECT_PULL       (GPIO_PULLUP)
 #define MICROPY_HW_SDCARD_DETECT_PRESENT    (GPIO_PIN_RESET)
diff --git a/ports/stm32/boards/STM32F769DISC/mpconfigboard.h b/ports/stm32/boards/STM32F769DISC/mpconfigboard.h
index 843b987cee714..5004a8ecac9d0 100644
--- a/ports/stm32/boards/STM32F769DISC/mpconfigboard.h
+++ b/ports/stm32/boards/STM32F769DISC/mpconfigboard.h
@@ -90,13 +90,14 @@ extern struct _spi_bdev_t spi_bdev;
 #define MICROPY_HW_LED_ON(pin)      (mp_hal_pin_high(pin))
 #define MICROPY_HW_LED_OFF(pin)     (mp_hal_pin_low(pin))
 
-// SD card detect switch
-#define MICROPY_HW_SDMMC2_CK                (pin_D6)
-#define MICROPY_HW_SDMMC2_CMD               (pin_D7)
-#define MICROPY_HW_SDMMC2_D0                (pin_G9)
-#define MICROPY_HW_SDMMC2_D1                (pin_G10)
-#define MICROPY_HW_SDMMC2_D2                (pin_B3)
-#define MICROPY_HW_SDMMC2_D3                (pin_B4)
+// SD card
+#define MICROPY_HW_SDCARD_SDMMC             (2)
+#define MICROPY_HW_SDCARD_CK                (pin_D6)
+#define MICROPY_HW_SDCARD_CMD               (pin_D7)
+#define MICROPY_HW_SDCARD_D0                (pin_G9)
+#define MICROPY_HW_SDCARD_D1                (pin_G10)
+#define MICROPY_HW_SDCARD_D2                (pin_B3)
+#define MICROPY_HW_SDCARD_D3                (pin_B4)
 #define MICROPY_HW_SDCARD_DETECT_PIN        (pin_I15)
 #define MICROPY_HW_SDCARD_DETECT_PULL       (GPIO_PULLUP)
 #define MICROPY_HW_SDCARD_DETECT_PRESENT    (GPIO_PIN_RESET)
diff --git a/ports/stm32/mpconfigboard_common.h b/ports/stm32/mpconfigboard_common.h
index 6fb9289e00dca..37ce8bbf197ef 100644
--- a/ports/stm32/mpconfigboard_common.h
+++ b/ports/stm32/mpconfigboard_common.h
@@ -107,9 +107,14 @@
 #define MICROPY_HW_ENABLE_MMCARD (0)
 #endif
 
-// SD/MMC interface bus width (defaults to 4 bits)
-#ifndef MICROPY_HW_SDMMC_BUS_WIDTH
-#define MICROPY_HW_SDMMC_BUS_WIDTH (4)
+// Which SDMMC peripheral to use for the SD/MMC card driver (1 or 2)
+#ifndef MICROPY_HW_SDCARD_SDMMC
+#define MICROPY_HW_SDCARD_SDMMC (1)
+#endif
+
+// SD/MMC card driver interface bus width (defaults to 4 bits)
+#ifndef MICROPY_HW_SDCARD_BUS_WIDTH
+#define MICROPY_HW_SDCARD_BUS_WIDTH (4)
 #endif
 
 // Whether to automatically mount (and boot from) the SD card if it's present
@@ -383,6 +388,15 @@
 #define MICROPY_HW_MAX_CAN (1)
 #endif
 
+// Define MICROPY_HW_SDMMCx_CK values if that peripheral is used, so that make-pins.py
+// generates the relevant AF constants.
+#if MICROPY_HW_SDCARD_SDMMC == 1
+#define MICROPY_HW_SDMMC1_CK (1)
+#endif
+#if MICROPY_HW_SDCARD_SDMMC == 2
+#define MICROPY_HW_SDMMC2_CK (1)
+#endif
+
 // Whether the USB peripheral is device-only, or multiple OTG
 #if defined(STM32L0) || defined(STM32L432xx) || defined(STM32WB)
 #define MICROPY_HW_USB_IS_MULTI_OTG (0)
diff --git a/ports/stm32/sdcard.c b/ports/stm32/sdcard.c
index b255ee82ca9be..ea69e7285b38a 100644
--- a/ports/stm32/sdcard.c
+++ b/ports/stm32/sdcard.c
@@ -42,30 +42,39 @@
 
 #if defined(STM32F7) || defined(STM32H7) || defined(STM32L4)
 
-// The F7 has 2 SDMMC units but at the moment we only support using one of them in
-// a given build.  If a boards config file defines MICROPY_HW_SDMMC2_CK then SDMMC2
-// is used, otherwise SDMMC1 is used.
+// The H7/F7/L4 have 2 SDMMC peripherals, but at the moment this driver only supports
+// using one of them in a given build, selected by MICROPY_HW_SDCARD_SDMMC.
 
-#if defined(MICROPY_HW_SDMMC2_CK)
+#if MICROPY_HW_SDCARD_SDMMC == 2
 #define SDIO SDMMC2
 #define SDMMC_IRQHandler SDMMC2_IRQHandler
 #define SDMMC_CLK_ENABLE() __HAL_RCC_SDMMC2_CLK_ENABLE()
 #define SDMMC_CLK_DISABLE() __HAL_RCC_SDMMC2_CLK_DISABLE()
+#define SDMMC_FORCE_RESET() __HAL_RCC_SDMMC2_FORCE_RESET()
+#define SDMMC_RELEASE_RESET() __HAL_RCC_SDMMC2_RELEASE_RESET()
 #define SDMMC_IRQn SDMMC2_IRQn
 #define SDMMC_DMA dma_SDMMC_2
+#define STATIC_AF_SDCARD_CK STATIC_AF_SDMMC2_CK
+#define STATIC_AF_SDCARD_CMD STATIC_AF_SDMMC2_CMD
+#define STATIC_AF_SDCARD_D0 STATIC_AF_SDMMC2_D0
+#define STATIC_AF_SDCARD_D1 STATIC_AF_SDMMC2_D1
+#define STATIC_AF_SDCARD_D2 STATIC_AF_SDMMC2_D2
+#define STATIC_AF_SDCARD_D3 STATIC_AF_SDMMC2_D3
 #else
 #define SDIO SDMMC1
 #define SDMMC_IRQHandler SDMMC1_IRQHandler
 #define SDMMC_CLK_ENABLE() __HAL_RCC_SDMMC1_CLK_ENABLE()
 #define SDMMC_CLK_DISABLE() __HAL_RCC_SDMMC1_CLK_DISABLE()
+#define SDMMC_FORCE_RESET() __HAL_RCC_SDMMC1_FORCE_RESET()
+#define SDMMC_RELEASE_RESET() __HAL_RCC_SDMMC1_RELEASE_RESET()
 #define SDMMC_IRQn SDMMC1_IRQn
 #define SDMMC_DMA dma_SDIO_0
-#define STATIC_AF_SDMMC_CK STATIC_AF_SDMMC1_CK
-#define STATIC_AF_SDMMC_CMD STATIC_AF_SDMMC1_CMD
-#define STATIC_AF_SDMMC_D0 STATIC_AF_SDMMC1_D0
-#define STATIC_AF_SDMMC_D1 STATIC_AF_SDMMC1_D1
-#define STATIC_AF_SDMMC_D2 STATIC_AF_SDMMC1_D2
-#define STATIC_AF_SDMMC_D3 STATIC_AF_SDMMC1_D3
+#define STATIC_AF_SDCARD_CK STATIC_AF_SDMMC1_CK
+#define STATIC_AF_SDCARD_CMD STATIC_AF_SDMMC1_CMD
+#define STATIC_AF_SDCARD_D0 STATIC_AF_SDMMC1_D0
+#define STATIC_AF_SDCARD_D1 STATIC_AF_SDMMC1_D1
+#define STATIC_AF_SDCARD_D2 STATIC_AF_SDMMC1_D2
+#define STATIC_AF_SDCARD_D3 STATIC_AF_SDMMC1_D3
 #endif
 
 // The F7 & L4 series calls the peripheral SDMMC rather than SDIO, so provide some
@@ -105,25 +114,23 @@
 #define SDMMC_IRQHandler SDIO_IRQHandler
 #define SDMMC_DMA dma_SDIO_0
 #define SDIO_USE_GPDMA 1
-#define STATIC_AF_SDMMC_CK STATIC_AF_SDIO_CK
-#define STATIC_AF_SDMMC_CMD STATIC_AF_SDIO_CMD
-#define STATIC_AF_SDMMC_D0 STATIC_AF_SDIO_D0
-#define STATIC_AF_SDMMC_D1 STATIC_AF_SDIO_D1
-#define STATIC_AF_SDMMC_D2 STATIC_AF_SDIO_D2
-#define STATIC_AF_SDMMC_D3 STATIC_AF_SDIO_D3
+#define STATIC_AF_SDCARD_CK STATIC_AF_SDIO_CK
+#define STATIC_AF_SDCARD_CMD STATIC_AF_SDIO_CMD
+#define STATIC_AF_SDCARD_D0 STATIC_AF_SDIO_D0
+#define STATIC_AF_SDCARD_D1 STATIC_AF_SDIO_D1
+#define STATIC_AF_SDCARD_D2 STATIC_AF_SDIO_D2
+#define STATIC_AF_SDCARD_D3 STATIC_AF_SDIO_D3
 
 #endif
 
 // If no custom SDIO pins defined, use the default ones
-#ifndef MICROPY_HW_SDMMC_CK
-
-#define MICROPY_HW_SDMMC_D0 (pin_C8)
-#define MICROPY_HW_SDMMC_D1 (pin_C9)
-#define MICROPY_HW_SDMMC_D2 (pin_C10)
-#define MICROPY_HW_SDMMC_D3 (pin_C11)
-#define MICROPY_HW_SDMMC_CK (pin_C12)
-#define MICROPY_HW_SDMMC_CMD (pin_D2)
-
+#ifndef MICROPY_HW_SDCARD_CK
+#define MICROPY_HW_SDCARD_D0 (pin_C8)
+#define MICROPY_HW_SDCARD_D1 (pin_C9)
+#define MICROPY_HW_SDCARD_D2 (pin_C10)
+#define MICROPY_HW_SDCARD_D3 (pin_C11)
+#define MICROPY_HW_SDCARD_CK (pin_C12)
+#define MICROPY_HW_SDCARD_CMD (pin_D2)
 #endif
 
 #define PYB_SDMMC_FLAG_SD       (0x01)
@@ -152,26 +159,13 @@ void sdcard_init(void) {
     // Note: the mp_hal_pin_config function will configure the GPIO in
     // fast mode which can do up to 50MHz.  This should be plenty for SDIO
     // which clocks up to 25MHz maximum.
-    #if defined(MICROPY_HW_SDMMC2_CK)
-    // Use SDMMC2 peripheral with pins provided by the board's config
-    mp_hal_pin_config_alt_static(MICROPY_HW_SDMMC2_CK, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_UP, STATIC_AF_SDMMC2_CK);
-    mp_hal_pin_config_alt_static(MICROPY_HW_SDMMC2_CMD, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_UP, STATIC_AF_SDMMC2_CMD);
-    mp_hal_pin_config_alt_static(MICROPY_HW_SDMMC2_D0, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_UP, STATIC_AF_SDMMC2_D0);
-    #if MICROPY_HW_SDMMC_BUS_WIDTH == 4
-    mp_hal_pin_config_alt_static(MICROPY_HW_SDMMC2_D1, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_UP, STATIC_AF_SDMMC2_D1);
-    mp_hal_pin_config_alt_static(MICROPY_HW_SDMMC2_D2, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_UP, STATIC_AF_SDMMC2_D2);
-    mp_hal_pin_config_alt_static(MICROPY_HW_SDMMC2_D3, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_UP, STATIC_AF_SDMMC2_D3);
-    #endif
-    #else
-    // Default SDIO/SDMMC1 config
-    mp_hal_pin_config_alt_static(MICROPY_HW_SDMMC_CK, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_UP, STATIC_AF_SDMMC_CK);
-    mp_hal_pin_config_alt_static(MICROPY_HW_SDMMC_CMD, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_UP, STATIC_AF_SDMMC_CMD);
-    mp_hal_pin_config_alt_static(MICROPY_HW_SDMMC_D0, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_UP, STATIC_AF_SDMMC_D0);
-    #if MICROPY_HW_SDMMC_BUS_WIDTH == 4
-    mp_hal_pin_config_alt_static(MICROPY_HW_SDMMC_D1, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_UP, STATIC_AF_SDMMC_D1);
-    mp_hal_pin_config_alt_static(MICROPY_HW_SDMMC_D2, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_UP, STATIC_AF_SDMMC_D2);
-    mp_hal_pin_config_alt_static(MICROPY_HW_SDMMC_D3, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_UP, STATIC_AF_SDMMC_D3);
-    #endif
+    mp_hal_pin_config_alt_static(MICROPY_HW_SDCARD_CK, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_UP, STATIC_AF_SDCARD_CK);
+    mp_hal_pin_config_alt_static(MICROPY_HW_SDCARD_CMD, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_UP, STATIC_AF_SDCARD_CMD);
+    mp_hal_pin_config_alt_static(MICROPY_HW_SDCARD_D0, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_UP, STATIC_AF_SDCARD_D0);
+    #if MICROPY_HW_SDCARD_BUS_WIDTH == 4
+    mp_hal_pin_config_alt_static(MICROPY_HW_SDCARD_D1, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_UP, STATIC_AF_SDCARD_D1);
+    mp_hal_pin_config_alt_static(MICROPY_HW_SDCARD_D2, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_UP, STATIC_AF_SDCARD_D2);
+    mp_hal_pin_config_alt_static(MICROPY_HW_SDCARD_D3, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_UP, STATIC_AF_SDCARD_D3);
     #endif
 
     // configure the SD card detect pin
@@ -187,13 +181,8 @@ STATIC void sdmmc_msp_init(void) {
 
     #if defined(STM32H7)
     // Reset SDMMC
-    #if defined(MICROPY_HW_SDMMC2_CK)
-    __HAL_RCC_SDMMC2_FORCE_RESET();
-    __HAL_RCC_SDMMC2_RELEASE_RESET();
-    #else
-    __HAL_RCC_SDMMC1_FORCE_RESET();
-    __HAL_RCC_SDMMC1_RELEASE_RESET();
-    #endif
+    SDMMC_FORCE_RESET();
+    SDMMC_RELEASE_RESET();
     #endif
 
     // NVIC configuration for SDIO interrupts
@@ -263,7 +252,7 @@ STATIC HAL_StatusTypeDef sdmmc_init_sd(void) {
         mp_hal_delay_ms(50);
     }
 
-    #if MICROPY_HW_SDMMC_BUS_WIDTH == 4
+    #if MICROPY_HW_SDCARD_BUS_WIDTH == 4
     // configure the SD bus width for 4-bit wide operation
     status = HAL_SD_ConfigWideBusOperation(&sdmmc_handle.sd, SDIO_BUS_WIDE_4B);
     if (status != HAL_OK) {
@@ -298,7 +287,7 @@ STATIC HAL_StatusTypeDef sdmmc_init_mmc(void) {
     // As this is an eMMC card, overwrite LogBlockNbr with actual value
     sdmmc_handle.mmc.MmcCard.LogBlockNbr = 7469056 + 2048;
 
-    #if MICROPY_HW_SDMMC_BUS_WIDTH == 4
+    #if MICROPY_HW_SDCARD_BUS_WIDTH == 4
     // Configure the SDIO bus width for 4-bit wide operation
     #ifdef STM32F7
     sdmmc_handle.mmc.Init.ClockBypass = SDIO_CLOCK_BYPASS_ENABLE;

From 4d967868238e3c359187921edab8e6fc164f357d Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Wed, 28 Apr 2021 20:49:29 +0200
Subject: [PATCH 0783/3533] stm32/uart: Enable HW flow control for UART
 1/5/7/8.

---
 ports/stm32/uart.c | 40 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/ports/stm32/uart.c b/ports/stm32/uart.c
index babdf63d96b35..a2b69967b6e41 100644
--- a/ports/stm32/uart.c
+++ b/ports/stm32/uart.c
@@ -223,6 +223,16 @@ bool uart_init(pyb_uart_obj_t *uart_obj,
             irqn = USART1_IRQn;
             pins[0] = MICROPY_HW_UART1_TX;
             pins[1] = MICROPY_HW_UART1_RX;
+            #if defined(MICROPY_HW_UART1_RTS)
+            if (flow & UART_HWCONTROL_RTS) {
+                pins[2] = MICROPY_HW_UART1_RTS;
+            }
+            #endif
+            #if defined(MICROPY_HW_UART1_CTS)
+            if (flow & UART_HWCONTROL_CTS) {
+                pins[3] = MICROPY_HW_UART1_CTS;
+            }
+            #endif
             __HAL_RCC_USART1_CLK_ENABLE();
             break;
         #endif
@@ -322,6 +332,16 @@ bool uart_init(pyb_uart_obj_t *uart_obj,
             #endif
             pins[0] = MICROPY_HW_UART5_TX;
             pins[1] = MICROPY_HW_UART5_RX;
+            #if defined(MICROPY_HW_UART5_RTS)
+            if (flow & UART_HWCONTROL_RTS) {
+                pins[2] = MICROPY_HW_UART5_RTS;
+            }
+            #endif
+            #if defined(MICROPY_HW_UART5_CTS)
+            if (flow & UART_HWCONTROL_CTS) {
+                pins[3] = MICROPY_HW_UART5_CTS;
+            }
+            #endif
             break;
         #endif
 
@@ -364,6 +384,16 @@ bool uart_init(pyb_uart_obj_t *uart_obj,
             #endif
             pins[0] = MICROPY_HW_UART7_TX;
             pins[1] = MICROPY_HW_UART7_RX;
+            #if defined(MICROPY_HW_UART7_RTS)
+            if (flow & UART_HWCONTROL_RTS) {
+                pins[2] = MICROPY_HW_UART7_RTS;
+            }
+            #endif
+            #if defined(MICROPY_HW_UART7_CTS)
+            if (flow & UART_HWCONTROL_CTS) {
+                pins[3] = MICROPY_HW_UART7_CTS;
+            }
+            #endif
             break;
         #endif
 
@@ -381,6 +411,16 @@ bool uart_init(pyb_uart_obj_t *uart_obj,
             #endif
             pins[0] = MICROPY_HW_UART8_TX;
             pins[1] = MICROPY_HW_UART8_RX;
+            #if defined(MICROPY_HW_UART8_RTS)
+            if (flow & UART_HWCONTROL_RTS) {
+                pins[2] = MICROPY_HW_UART8_RTS;
+            }
+            #endif
+            #if defined(MICROPY_HW_UART8_CTS)
+            if (flow & UART_HWCONTROL_CTS) {
+                pins[3] = MICROPY_HW_UART8_CTS;
+            }
+            #endif
             break;
         #endif
 

From 80788154b31c6097fd152e6e2e971319e8e3da1e Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Wed, 28 Apr 2021 21:32:57 +0200
Subject: [PATCH 0784/3533] stm32/sdio: Add functions to re/enable SDIO/SDIOIT.

---
 ports/stm32/sdio.c | 15 +++++++++++++++
 ports/stm32/sdio.h |  2 ++
 2 files changed, 17 insertions(+)

diff --git a/ports/stm32/sdio.c b/ports/stm32/sdio.c
index 87f550e3a6f5d..3ebd4947f448d 100644
--- a/ports/stm32/sdio.c
+++ b/ports/stm32/sdio.c
@@ -93,6 +93,21 @@ void sdio_deinit(void) {
     #endif
 }
 
+void sdio_reenable(void) {
+    if (__HAL_RCC_SDMMC1_IS_CLK_DISABLED()) {
+        __HAL_RCC_SDMMC1_CLK_ENABLE(); // enable SDIO peripheral
+        sdio_enable_high_speed_4bit();
+    }
+}
+
+void sdio_enable_irq(bool enable) {
+    if (enable) {
+        SDMMC1->MASK |= SDMMC_MASK_SDIOITIE;
+    } else {
+        SDMMC1->MASK &= ~SDMMC_MASK_SDIOITIE;
+    }
+}
+
 void sdio_enable_high_speed_4bit(void) {
     SDMMC_TypeDef *SDIO = SDMMC1;
     SDIO->POWER = 0; // power off
diff --git a/ports/stm32/sdio.h b/ports/stm32/sdio.h
index e7115e6f80c65..7cbf024ca8836 100644
--- a/ports/stm32/sdio.h
+++ b/ports/stm32/sdio.h
@@ -31,6 +31,8 @@
 
 void sdio_init(uint32_t irq_pri);
 void sdio_deinit(void);
+void sdio_reenable(void);
+void sdio_enable_irq(bool enable);
 void sdio_enable_high_speed_4bit(void);
 int sdio_transfer(uint32_t cmd, uint32_t arg, uint32_t *resp);
 int sdio_transfer_cmd53(bool write, uint32_t block_size, uint32_t arg, size_t len, uint8_t *buf);

From d3eb6d68a377c42bd37e609ce667bea815fecd4f Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Wed, 28 Apr 2021 21:35:10 +0200
Subject: [PATCH 0785/3533] drivers/cyw43/cyw43_ctrl: Use new sdio enable API
 functions.

This removes any references to a specific SDMMC instance, making the driver
more generic/portable.
---
 drivers/cyw43/cyw43_ctrl.c | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/drivers/cyw43/cyw43_ctrl.c b/drivers/cyw43/cyw43_ctrl.c
index cc1fbecde8a4e..aaa266b0d8527 100644
--- a/drivers/cyw43/cyw43_ctrl.c
+++ b/drivers/cyw43/cyw43_ctrl.c
@@ -112,7 +112,7 @@ void cyw43_deinit(cyw43_t *self) {
     self->itf_state = 0;
 
     // Disable async polling
-    SDMMC1->MASK &= ~SDMMC_MASK_SDIOITIE;
+    sdio_enable_irq(false);
     cyw43_poll = NULL;
 
     #ifdef pyb_pin_WL_RFSW_VDD
@@ -164,7 +164,7 @@ STATIC int cyw43_ensure_up(cyw43_t *self) {
     cyw43_sleep = CYW43_SLEEP_MAX;
     cyw43_poll = cyw43_poll_func;
     #if USE_SDIOIT
-    SDMMC1->MASK |= SDMMC_MASK_SDIOITIE;
+    sdio_enable_irq(true);
     #else
     extern void extint_set(const pin_obj_t *pin, uint32_t mode);
     extint_set(pyb_pin_WL_HOST_WAKE, GPIO_MODE_IT_FALLING);
@@ -209,7 +209,7 @@ STATIC void cyw43_poll_func(void) {
     }
 
     #if USE_SDIOIT
-    SDMMC1->MASK |= SDMMC_MASK_SDIOITIE;
+    sdio_enable_irq(true);
     #endif
 }
 
@@ -227,10 +227,7 @@ int cyw43_cb_read_host_interrupt_pin(void *cb_data) {
 void cyw43_cb_ensure_awake(void *cb_data) {
     cyw43_sleep = CYW43_SLEEP_MAX;
     #if !USE_SDIOIT
-    if (__HAL_RCC_SDMMC1_IS_CLK_DISABLED()) {
-        __HAL_RCC_SDMMC1_CLK_ENABLE(); // enable SDIO peripheral
-        sdio_enable_high_speed_4bit();
-    }
+    sdio_reenable();
     #endif
 }
 

From d74e2aca3e30ff1d424e97ac0d37d07694d69b7d Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Wed, 28 Apr 2021 20:09:34 +0200
Subject: [PATCH 0786/3533] drivers/cyw43/cywbt: Add compile option for RF
 switch.

---
 drivers/cyw43/cywbt.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/drivers/cyw43/cywbt.c b/drivers/cyw43/cywbt.c
index defe670683ffd..c4fecca81b9ab 100644
--- a/drivers/cyw43/cywbt.c
+++ b/drivers/cyw43/cywbt.c
@@ -149,10 +149,14 @@ STATIC int cywbt_download_firmware(const uint8_t *firmware) {
     }
 
     // RF switch must select high path during BT patch boot
+    #if MICROPY_HW_ENABLE_RF_SWITCH
     mp_hal_pin_config(pyb_pin_WL_GPIO_1, MP_HAL_PIN_MODE_INPUT, MP_HAL_PIN_PULL_UP, 0);
+    #endif
     mp_hal_delay_ms(10); // give some time for CTS to go high
     cywbt_wait_cts_low();
+    #if MICROPY_HW_ENABLE_RF_SWITCH
     mp_hal_pin_config(pyb_pin_WL_GPIO_1, MP_HAL_PIN_MODE_INPUT, MP_HAL_PIN_PULL_DOWN, 0); // Select chip antenna (could also select external)
+    #endif
 
     mp_bluetooth_hci_uart_set_baudrate(115200);
     cywbt_set_baudrate(3000000);
@@ -170,9 +174,11 @@ int mp_bluetooth_hci_controller_init(void) {
     mp_hal_pin_output(pyb_pin_BT_DEV_WAKE);
     mp_hal_pin_low(pyb_pin_BT_DEV_WAKE);
 
+    #if MICROPY_HW_ENABLE_RF_SWITCH
     // TODO don't select antenna if wifi is enabled
     mp_hal_pin_config(pyb_pin_WL_GPIO_4, MP_HAL_PIN_MODE_OUTPUT, MP_HAL_PIN_PULL_NONE, 0); // RF-switch power
     mp_hal_pin_high(pyb_pin_WL_GPIO_4); // Turn the RF-switch on
+    #endif
 
     uint8_t buf[256];
 

From baa712b7f093fdeec3ddd4122be9e2f171d35a33 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Wed, 28 Apr 2021 20:10:30 +0200
Subject: [PATCH 0787/3533] stm32/boards/PYBD_SF2: Enable RF switch compile
 option.

---
 ports/stm32/boards/PYBD_SF2/mpconfigboard.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/stm32/boards/PYBD_SF2/mpconfigboard.h b/ports/stm32/boards/PYBD_SF2/mpconfigboard.h
index 7d89e17cf46d2..57cc75efc6f92 100644
--- a/ports/stm32/boards/PYBD_SF2/mpconfigboard.h
+++ b/ports/stm32/boards/PYBD_SF2/mpconfigboard.h
@@ -39,6 +39,7 @@
 #define MICROPY_HW_ENABLE_USB       (1)
 #define MICROPY_HW_ENABLE_SDCARD    (1)
 #define MICROPY_HW_ENABLE_MMCARD    (1)
+#define MICROPY_HW_ENABLE_RF_SWITCH (1)
 
 #define MICROPY_BOARD_EARLY_INIT    board_early_init
 #define MICROPY_BOARD_ENTER_STOP    board_sleep(1);

From 0d4eb15392dfeee8c2113e46eb21f27800872524 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Wed, 28 Apr 2021 20:11:48 +0200
Subject: [PATCH 0788/3533] drivers/cyw43/cywbt: Remove hard-coded UART6
 alternate function setting.

---
 drivers/cyw43/cywbt.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/cyw43/cywbt.c b/drivers/cyw43/cywbt.c
index c4fecca81b9ab..64aeb871c38bb 100644
--- a/drivers/cyw43/cywbt.c
+++ b/drivers/cyw43/cywbt.c
@@ -55,7 +55,7 @@ STATIC void cywbt_wait_cts_low(void) {
         }
         mp_hal_delay_ms(1);
     }
-    mp_hal_pin_config_alt_static(pyb_pin_BT_CTS, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_UP, STATIC_AF_USART6_CTS);
+    mp_hal_pin_config_alt(pyb_pin_BT_CTS, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_UP, AF_FN_UART, mp_bluetooth_hci_uart_obj.uart_id);
 }
 
 STATIC int cywbt_hci_cmd_raw(size_t len, uint8_t *buf) {

From a1111b83ed00542b4f5651d3aae9d38ecbbb6dd6 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Thu, 29 Apr 2021 23:18:54 +0200
Subject: [PATCH 0789/3533] stm32/sdio: Allow configuring the SDMMC periph used
 for SDIO.

This can now be selected by setting MICROPY_HW_SDIO_SDMMC, which defaults
to 1, ie SDMMC1.  The pins can also be selected and default to the standard
C8/C9/C10/C11/C12/D2.
---
 ports/stm32/mpconfigboard_common.h |   9 +-
 ports/stm32/sdio.c                 | 195 ++++++++++++++++++-----------
 2 files changed, 127 insertions(+), 77 deletions(-)

diff --git a/ports/stm32/mpconfigboard_common.h b/ports/stm32/mpconfigboard_common.h
index 37ce8bbf197ef..0df35918bef94 100644
--- a/ports/stm32/mpconfigboard_common.h
+++ b/ports/stm32/mpconfigboard_common.h
@@ -122,6 +122,11 @@
 #define MICROPY_HW_SDCARD_MOUNT_AT_BOOT (MICROPY_HW_ENABLE_SDCARD)
 #endif
 
+// Which SDMMC peripheral to use for the SDIO driver (1 or 2)
+#ifndef MICROPY_HW_SDIO_SDMMC
+#define MICROPY_HW_SDIO_SDMMC (1)
+#endif
+
 // Whether to enable the MMA7660 driver, exposed as pyb.Accel
 #ifndef MICROPY_HW_HAS_MMA7660
 #define MICROPY_HW_HAS_MMA7660 (0)
@@ -390,10 +395,10 @@
 
 // Define MICROPY_HW_SDMMCx_CK values if that peripheral is used, so that make-pins.py
 // generates the relevant AF constants.
-#if MICROPY_HW_SDCARD_SDMMC == 1
+#if MICROPY_HW_SDCARD_SDMMC == 1 || MICROPY_HW_SDIO_SDMMC == 1
 #define MICROPY_HW_SDMMC1_CK (1)
 #endif
-#if MICROPY_HW_SDCARD_SDMMC == 2
+#if MICROPY_HW_SDCARD_SDMMC == 2 || MICROPY_HW_SDIO_SDMMC == 2
 #define MICROPY_HW_SDMMC2_CK (1)
 #endif
 
diff --git a/ports/stm32/sdio.c b/ports/stm32/sdio.c
index 3ebd4947f448d..dfd409257759a 100644
--- a/ports/stm32/sdio.c
+++ b/ports/stm32/sdio.c
@@ -28,7 +28,8 @@
 
 #include "py/mperrno.h"
 #include "py/mphal.h"
-#include "genhdr/pins.h"
+#include "pin.h"
+#include "pin_static_af.h"
 #include "pendsv.h"
 #include "sdio.h"
 
@@ -50,18 +51,62 @@ static volatile uint32_t sdmmc_error;
 static volatile uint8_t *sdmmc_buf_cur;
 static volatile uint8_t *sdmmc_buf_top;
 
+// The H7/F7/L4 have 2 SDMMC peripherals, but at the moment this driver only supports
+// using one of them in a given build, selected by MICROPY_HW_SDIO_SDMMC.
+
+#if MICROPY_HW_SDIO_SDMMC == 1
+#define SDMMC                   SDMMC1
+#define SDMMC_IRQn              SDMMC1_IRQn
+#define SDMMC_IRQHandler        SDMMC1_IRQHandler
+#define SDMMC_CLK_ENABLE()      __HAL_RCC_SDMMC1_CLK_ENABLE()
+#define SDMMC_CLK_DISABLE()     __HAL_RCC_SDMMC1_CLK_DISABLE()
+#define SDMMC_IS_CLK_DISABLED() __HAL_RCC_SDMMC1_IS_CLK_DISABLED()
+#define STATIC_AF_SDMMC_CK      STATIC_AF_SDMMC1_CK
+#define STATIC_AF_SDMMC_CMD     STATIC_AF_SDMMC1_CMD
+#define STATIC_AF_SDMMC_D0      STATIC_AF_SDMMC1_D0
+#define STATIC_AF_SDMMC_D1      STATIC_AF_SDMMC1_D1
+#define STATIC_AF_SDMMC_D2      STATIC_AF_SDMMC1_D2
+#define STATIC_AF_SDMMC_D3      STATIC_AF_SDMMC1_D3
+#else
+#if defined(STM32F7)
+#error Due to DMA configuration, only SDMMC1 is currently supported on F7
+#endif
+#define SDMMC                   SDMMC2
+#define SDMMC_IRQn              SDMMC2_IRQn
+#define SDMMC_IRQHandler        SDMMC2_IRQHandler
+#define SDMMC_CLK_ENABLE()      __HAL_RCC_SDMMC2_CLK_ENABLE()
+#define SDMMC_CLK_DISABLE()     __HAL_RCC_SDMMC2_CLK_DISABLE()
+#define SDMMC_IS_CLK_DISABLED() __HAL_RCC_SDMMC2_IS_CLK_DISABLED()
+#define STATIC_AF_SDMMC_CK      STATIC_AF_SDMMC2_CK
+#define STATIC_AF_SDMMC_CMD     STATIC_AF_SDMMC2_CMD
+#define STATIC_AF_SDMMC_D0      STATIC_AF_SDMMC2_D0
+#define STATIC_AF_SDMMC_D1      STATIC_AF_SDMMC2_D1
+#define STATIC_AF_SDMMC_D2      STATIC_AF_SDMMC2_D2
+#define STATIC_AF_SDMMC_D3      STATIC_AF_SDMMC2_D3
+#endif
+
+// If no custom SDIO pins defined, use the default ones
+#ifndef MICROPY_HW_SDIO_CK
+#define MICROPY_HW_SDIO_D0      (pin_C8)
+#define MICROPY_HW_SDIO_D1      (pin_C9)
+#define MICROPY_HW_SDIO_D2      (pin_C10)
+#define MICROPY_HW_SDIO_D3      (pin_C11)
+#define MICROPY_HW_SDIO_CK      (pin_C12)
+#define MICROPY_HW_SDIO_CMD     (pin_D2)
+#endif
+
 void sdio_init(uint32_t irq_pri) {
     // configure IO pins
-    mp_hal_pin_config(pin_C8, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_UP, 12);
-    mp_hal_pin_config(pin_C9, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_UP, 12);
-    mp_hal_pin_config(pin_C10, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_UP, 12);
-    mp_hal_pin_config(pin_C11, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_UP, 12);
-    mp_hal_pin_config(pin_C12, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE, 12); // CLK doesn't need pull-up
-    mp_hal_pin_config(pin_D2, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_UP, 12);
+    mp_hal_pin_config_alt_static(MICROPY_HW_SDIO_D0, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_UP, STATIC_AF_SDMMC_D0);
+    mp_hal_pin_config_alt_static(MICROPY_HW_SDIO_D1, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_UP, STATIC_AF_SDMMC_D1);
+    mp_hal_pin_config_alt_static(MICROPY_HW_SDIO_D2, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_UP, STATIC_AF_SDMMC_D2);
+    mp_hal_pin_config_alt_static(MICROPY_HW_SDIO_D3, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_UP, STATIC_AF_SDMMC_D3);
+    mp_hal_pin_config_alt_static(MICROPY_HW_SDIO_CK, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE, STATIC_AF_SDMMC_CK);
+    mp_hal_pin_config_alt_static(MICROPY_HW_SDIO_CMD, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_UP, STATIC_AF_SDMMC_CMD);
 
-    __HAL_RCC_SDMMC1_CLK_ENABLE(); // enable SDIO peripheral
+    SDMMC_CLK_ENABLE(); // enable SDIO peripheral
 
-    SDMMC_TypeDef *SDIO = SDMMC1;
+    SDMMC_TypeDef *SDIO = SDMMC;
     #if defined(STM32F7)
     SDIO->CLKCR = SDMMC_CLKCR_HWFC_EN | SDMMC_CLKCR_PWRSAV | (120 - 2); // 1-bit, 400kHz
     #else
@@ -80,36 +125,36 @@ void sdio_init(uint32_t irq_pri) {
     __HAL_RCC_DMA2_CLK_ENABLE(); // enable DMA2 peripheral
     #endif
 
-    NVIC_SetPriority(SDMMC1_IRQn, irq_pri);
+    NVIC_SetPriority(SDMMC_IRQn, irq_pri);
 
     SDIO->MASK = 0;
-    HAL_NVIC_EnableIRQ(SDMMC1_IRQn);
+    HAL_NVIC_EnableIRQ(SDMMC_IRQn);
 }
 
 void sdio_deinit(void) {
-    __HAL_RCC_SDMMC1_CLK_DISABLE();
+    SDMMC_CLK_DISABLE();
     #if defined(STM32F7)
     __HAL_RCC_DMA2_CLK_DISABLE();
     #endif
 }
 
 void sdio_reenable(void) {
-    if (__HAL_RCC_SDMMC1_IS_CLK_DISABLED()) {
-        __HAL_RCC_SDMMC1_CLK_ENABLE(); // enable SDIO peripheral
+    if (SDMMC_IS_CLK_DISABLED()) {
+        SDMMC_CLK_ENABLE(); // enable SDIO peripheral
         sdio_enable_high_speed_4bit();
     }
 }
 
 void sdio_enable_irq(bool enable) {
     if (enable) {
-        SDMMC1->MASK |= SDMMC_MASK_SDIOITIE;
+        SDMMC->MASK |= SDMMC_MASK_SDIOITIE;
     } else {
-        SDMMC1->MASK &= ~SDMMC_MASK_SDIOITIE;
+        SDMMC->MASK &= ~SDMMC_MASK_SDIOITIE;
     }
 }
 
 void sdio_enable_high_speed_4bit(void) {
-    SDMMC_TypeDef *SDIO = SDMMC1;
+    SDMMC_TypeDef *SDIO = SDMMC;
     SDIO->POWER = 0; // power off
     mp_hal_delay_us(10);
     #if defined(STM32F7)
@@ -128,33 +173,33 @@ void sdio_enable_high_speed_4bit(void) {
     mp_hal_delay_us(10);
 }
 
-void SDMMC1_IRQHandler(void) {
-    if (SDMMC1->STA & SDMMC_STA_CMDREND) {
-        SDMMC1->ICR = SDMMC_ICR_CMDRENDC;
-        uint32_t r1 = SDMMC1->RESP1;
-        if (SDMMC1->RESPCMD == 53 && r1 & 0x800) {
-            printf("bad RESP1: %lu %lx\n", SDMMC1->RESPCMD, r1);
+void SDMMC_IRQHandler(void) {
+    if (SDMMC->STA & SDMMC_STA_CMDREND) {
+        SDMMC->ICR = SDMMC_ICR_CMDRENDC;
+        uint32_t r1 = SDMMC->RESP1;
+        if (SDMMC->RESPCMD == 53 && r1 & 0x800) {
+            printf("bad RESP1: %lu %lx\n", SDMMC->RESPCMD, r1);
             sdmmc_error = 0xffffffff;
-            SDMMC1->MASK &= SDMMC_MASK_SDIOITIE;
+            SDMMC->MASK &= SDMMC_MASK_SDIOITIE;
             sdmmc_irq_state = SDMMC_IRQ_STATE_DONE;
             return;
         }
         #if defined(STM32H7)
         if (!sdmmc_dma) {
-            while (sdmmc_buf_cur < sdmmc_buf_top && (SDMMC1->STA & SDMMC_STA_DPSMACT) && !(SDMMC1->STA & SDMMC_STA_RXFIFOE)) {
-                *(uint32_t *)sdmmc_buf_cur = SDMMC1->FIFO;
+            while (sdmmc_buf_cur < sdmmc_buf_top && (SDMMC->STA & SDMMC_STA_DPSMACT) && !(SDMMC->STA & SDMMC_STA_RXFIFOE)) {
+                *(uint32_t *)sdmmc_buf_cur = SDMMC->FIFO;
                 sdmmc_buf_cur += 4;
             }
         }
         #endif
         if (sdmmc_buf_cur >= sdmmc_buf_top) {
             // data transfer finished, so we are done
-            SDMMC1->MASK &= SDMMC_MASK_SDIOITIE;
+            SDMMC->MASK &= SDMMC_MASK_SDIOITIE;
             sdmmc_irq_state = SDMMC_IRQ_STATE_DONE;
             return;
         }
         if (sdmmc_write) {
-            SDMMC1->DCTRL =
+            SDMMC->DCTRL =
                 SDMMC_DCTRL_SDIOEN
                 | SDMMC_DCTRL_RWMOD
                 | sdmmc_block_size_log2 << SDMMC_DCTRL_DBLOCKSIZE_Pos
@@ -165,51 +210,51 @@ void SDMMC1_IRQHandler(void) {
                     | SDMMC_DCTRL_DTEN
             ;
             if (!sdmmc_dma) {
-                SDMMC1->MASK |= SDMMC_MASK_TXFIFOHEIE;
+                SDMMC->MASK |= SDMMC_MASK_TXFIFOHEIE;
             }
         }
         sdmmc_irq_state = SDMMC_IRQ_STATE_CMD_DONE;
-    } else if (SDMMC1->STA & SDMMC_STA_DATAEND) {
+    } else if (SDMMC->STA & SDMMC_STA_DATAEND) {
         // data transfer complete
         // note: it's possible to get DATAEND before CMDREND
-        SDMMC1->ICR = SDMMC_ICR_DATAENDC;
+        SDMMC->ICR = SDMMC_ICR_DATAENDC;
         #if defined(STM32F7)
         // check if there is some remaining data in RXFIFO
         if (!sdmmc_dma) {
-            while (SDMMC1->STA & SDMMC_STA_RXDAVL) {
-                *(uint32_t *)sdmmc_buf_cur = SDMMC1->FIFO;
+            while (SDMMC->STA & SDMMC_STA_RXDAVL) {
+                *(uint32_t *)sdmmc_buf_cur = SDMMC->FIFO;
                 sdmmc_buf_cur += 4;
             }
         }
         #endif
         if (sdmmc_irq_state == SDMMC_IRQ_STATE_CMD_DONE) {
             // command and data finished, so we are done
-            SDMMC1->MASK &= SDMMC_MASK_SDIOITIE;
+            SDMMC->MASK &= SDMMC_MASK_SDIOITIE;
             sdmmc_irq_state = SDMMC_IRQ_STATE_DONE;
         }
-    } else if (SDMMC1->STA & SDMMC_STA_TXFIFOHE) {
+    } else if (SDMMC->STA & SDMMC_STA_TXFIFOHE) {
         if (!sdmmc_dma && sdmmc_write) {
             // write up to 8 words to fifo
             for (size_t i = 8; i && sdmmc_buf_cur < sdmmc_buf_top; --i) {
-                SDMMC1->FIFO = *(uint32_t *)sdmmc_buf_cur;
+                SDMMC->FIFO = *(uint32_t *)sdmmc_buf_cur;
                 sdmmc_buf_cur += 4;
             }
             if (sdmmc_buf_cur >= sdmmc_buf_top) {
                 // finished, disable IRQ
-                SDMMC1->MASK &= ~SDMMC_MASK_TXFIFOHEIE;
+                SDMMC->MASK &= ~SDMMC_MASK_TXFIFOHEIE;
             }
         }
-    } else if (SDMMC1->STA & SDMMC_STA_RXFIFOHF) {
+    } else if (SDMMC->STA & SDMMC_STA_RXFIFOHF) {
         if (!sdmmc_dma && !sdmmc_write) {
             // read up to 8 words from fifo
             for (size_t i = 8; i && sdmmc_buf_cur < sdmmc_buf_top; --i) {
-                *(uint32_t *)sdmmc_buf_cur = SDMMC1->FIFO;
+                *(uint32_t *)sdmmc_buf_cur = SDMMC->FIFO;
                 sdmmc_buf_cur += 4;
             }
         }
-    } else if (SDMMC1->STA & SDMMC_STA_SDIOIT) {
-        SDMMC1->MASK &= ~SDMMC_MASK_SDIOITIE;
-        SDMMC1->ICR = SDMMC_ICR_SDIOITC;
+    } else if (SDMMC->STA & SDMMC_STA_SDIOIT) {
+        SDMMC->MASK &= ~SDMMC_MASK_SDIOITIE;
+        SDMMC->ICR = SDMMC_ICR_SDIOITC;
 
         #if MICROPY_PY_NETWORK_CYW43
         extern void (*cyw43_poll)(void);
@@ -217,11 +262,11 @@ void SDMMC1_IRQHandler(void) {
             pendsv_schedule_dispatch(PENDSV_DISPATCH_CYW43, cyw43_poll);
         }
         #endif
-    } else if (SDMMC1->STA & 0x3f) {
+    } else if (SDMMC->STA & 0x3f) {
         // an error
-        sdmmc_error = SDMMC1->STA;
-        SDMMC1->ICR = SDMMC_STATIC_FLAGS;
-        SDMMC1->MASK &= SDMMC_MASK_SDIOITIE;
+        sdmmc_error = SDMMC->STA;
+        SDMMC->ICR = SDMMC_STATIC_FLAGS;
+        SDMMC->MASK &= SDMMC_MASK_SDIOITIE;
         sdmmc_irq_state = SDMMC_IRQ_STATE_DONE;
     }
 }
@@ -229,22 +274,22 @@ void SDMMC1_IRQHandler(void) {
 int sdio_transfer(uint32_t cmd, uint32_t arg, uint32_t *resp) {
     #if defined(STM32F7)
     // Wait for any outstanding TX to complete
-    while (SDMMC1->STA & SDMMC_STA_TXACT) {
+    while (SDMMC->STA & SDMMC_STA_TXACT) {
     }
     #endif
 
     #if defined(STM32F7)
     DMA2_Stream3->CR = 0; // ensure DMA is reset
     #endif
-    SDMMC1->ICR = SDMMC_STATIC_FLAGS; // clear interrupts
-    SDMMC1->ARG = arg;
-    SDMMC1->CMD = cmd | SDMMC_CMD_WAITRESP_0 | SDMMC_CMD_CPSMEN;
+    SDMMC->ICR = SDMMC_STATIC_FLAGS; // clear interrupts
+    SDMMC->ARG = arg;
+    SDMMC->CMD = cmd | SDMMC_CMD_WAITRESP_0 | SDMMC_CMD_CPSMEN;
 
     sdmmc_irq_state = SDMMC_IRQ_STATE_CMD_DATA_PENDING;
     sdmmc_error = 0;
     sdmmc_buf_cur = NULL;
     sdmmc_buf_top = NULL;
-    SDMMC1->MASK = (SDMMC1->MASK & SDMMC_MASK_SDIOITIE) | SDMMC_MASK_CMDRENDIE | 0x3f;
+    SDMMC->MASK = (SDMMC->MASK & SDMMC_MASK_SDIOITIE) | SDMMC_MASK_CMDRENDIE | 0x3f;
 
     uint32_t start = mp_hal_ticks_ms();
     for (;;) {
@@ -253,13 +298,13 @@ int sdio_transfer(uint32_t cmd, uint32_t arg, uint32_t *resp) {
             break;
         }
         if (mp_hal_ticks_ms() - start > 1000) {
-            SDMMC1->MASK = DEFAULT_MASK;
-            printf("sdio_transfer timeout STA=0x%08x\n", (uint)SDMMC1->STA);
+            SDMMC->MASK = DEFAULT_MASK;
+            printf("sdio_transfer timeout STA=0x%08x\n", (uint)SDMMC->STA);
             return -MP_ETIMEDOUT;
         }
     }
 
-    SDMMC1->MASK &= SDMMC_MASK_SDIOITIE;
+    SDMMC->MASK &= SDMMC_MASK_SDIOITIE;
 
     if (sdmmc_error == SDMMC_STA_CCRCFAIL && cmd == 5) {
         // Errata: CMD CRC error is incorrectly generated for CMD 5
@@ -268,13 +313,13 @@ int sdio_transfer(uint32_t cmd, uint32_t arg, uint32_t *resp) {
         return -(0x1000000 | sdmmc_error);
     }
 
-    uint32_t rcmd = SDMMC1->RESPCMD;
+    uint32_t rcmd = SDMMC->RESPCMD;
     if (rcmd != cmd) {
         printf("sdio_transfer: cmd=%lu rcmd=%lu\n", cmd, rcmd);
         return -MP_EIO;
     }
     if (resp != NULL) {
-        *resp = SDMMC1->RESP1;
+        *resp = SDMMC->RESP1;
     }
     return 0;
 }
@@ -282,7 +327,7 @@ int sdio_transfer(uint32_t cmd, uint32_t arg, uint32_t *resp) {
 int sdio_transfer_cmd53(bool write, uint32_t block_size, uint32_t arg, size_t len, uint8_t *buf) {
     #if defined(STM32F7)
     // Wait for any outstanding TX to complete
-    while (SDMMC1->STA & SDMMC_STA_TXACT) {
+    while (SDMMC->STA & SDMMC_STA_TXACT) {
     }
     #endif
 
@@ -309,11 +354,11 @@ int sdio_transfer_cmd53(bool write, uint32_t block_size, uint32_t arg, size_t le
 
     bool dma = (len > 16);
 
-    SDMMC1->ICR = SDMMC_STATIC_FLAGS; // clear interrupts
-    SDMMC1->MASK &= SDMMC_MASK_SDIOITIE;
+    SDMMC->ICR = SDMMC_STATIC_FLAGS; // clear interrupts
+    SDMMC->MASK &= SDMMC_MASK_SDIOITIE;
 
-    SDMMC1->DTIMER = 0x2000000; // about 700ms running at 48MHz
-    SDMMC1->DLEN = (len + block_size - 1) & ~(block_size - 1);
+    SDMMC->DTIMER = 0x2000000; // about 700ms running at 48MHz
+    SDMMC->DLEN = (len + block_size - 1) & ~(block_size - 1);
 
     #if defined(STM32F7)
     DMA2_Stream3->CR = 0;
@@ -339,7 +384,7 @@ int sdio_transfer_cmd53(bool write, uint32_t block_size, uint32_t arg, size_t le
         #if defined(STM32F7)
         DMA2->LIFCR = 0x3f << 22;
         DMA2_Stream3->FCR = 0x07; // ?
-        DMA2_Stream3->PAR = (uint32_t)&SDMMC1->FIFO;
+        DMA2_Stream3->PAR = (uint32_t)&SDMMC->FIFO;
         if ((uint32_t)buf & 3) {
             printf("sdio_transfer_cmd53: buf=%p is not aligned for DMA\n", buf);
             return -MP_EINVAL;
@@ -359,12 +404,12 @@ int sdio_transfer_cmd53(bool write, uint32_t block_size, uint32_t arg, size_t le
             | 1 << 0 // EN
         ;
         #else
-        SDMMC1->IDMABASE0 = (uint32_t)buf;
-        SDMMC1->IDMACTRL = SDMMC_IDMA_IDMAEN;
+        SDMMC->IDMABASE0 = (uint32_t)buf;
+        SDMMC->IDMACTRL = SDMMC_IDMA_IDMAEN;
         #endif
     } else {
         #if defined(STM32H7)
-        SDMMC1->IDMACTRL = 0;
+        SDMMC->IDMACTRL = 0;
         #endif
     }
 
@@ -373,7 +418,7 @@ int sdio_transfer_cmd53(bool write, uint32_t block_size, uint32_t arg, size_t le
     // (and in case we get a long-running unrelated IRQ here on the host just
     // after writing to CMD to initiate the command)
     if (!write) {
-        SDMMC1->DCTRL =
+        SDMMC->DCTRL =
             SDMMC_DCTRL_SDIOEN
             | SDMMC_DCTRL_RWMOD
             | block_size_log2 << SDMMC_DCTRL_DBLOCKSIZE_Pos
@@ -385,8 +430,8 @@ int sdio_transfer_cmd53(bool write, uint32_t block_size, uint32_t arg, size_t le
         ;
     }
 
-    SDMMC1->ARG = arg;
-    SDMMC1->CMD = 53 | SDMMC_CMD_WAITRESP_0 | SDMMC_CMD_CPSMEN;
+    SDMMC->ARG = arg;
+    SDMMC->CMD = 53 | SDMMC_CMD_WAITRESP_0 | SDMMC_CMD_CPSMEN;
 
     sdmmc_irq_state = SDMMC_IRQ_STATE_CMD_DATA_PENDING;
     sdmmc_block_size_log2 = block_size_log2;
@@ -395,7 +440,7 @@ int sdio_transfer_cmd53(bool write, uint32_t block_size, uint32_t arg, size_t le
     sdmmc_error = 0;
     sdmmc_buf_cur = (uint8_t *)buf;
     sdmmc_buf_top = (uint8_t *)buf + len;
-    SDMMC1->MASK = (SDMMC1->MASK & SDMMC_MASK_SDIOITIE) | SDMMC_MASK_CMDRENDIE | SDMMC_MASK_DATAENDIE | SDMMC_MASK_RXFIFOHFIE | 0x3f;
+    SDMMC->MASK = (SDMMC->MASK & SDMMC_MASK_SDIOITIE) | SDMMC_MASK_CMDRENDIE | SDMMC_MASK_DATAENDIE | SDMMC_MASK_RXFIFOHFIE | 0x3f;
 
     // wait to complete transfer
     uint32_t start = mp_hal_ticks_ms();
@@ -405,23 +450,23 @@ int sdio_transfer_cmd53(bool write, uint32_t block_size, uint32_t arg, size_t le
             break;
         }
         if (mp_hal_ticks_ms() - start > 200) {
-            SDMMC1->MASK &= SDMMC_MASK_SDIOITIE;
+            SDMMC->MASK &= SDMMC_MASK_SDIOITIE;
             #if defined(STM32F7)
-            printf("sdio_transfer_cmd53: timeout wr=%d len=%u dma=%u buf_idx=%u STA=%08x SDMMC=%08x:%08x DMA=%08x:%08x:%08x RCC=%08x\n", write, (uint)len, (uint)dma, sdmmc_buf_cur - buf, (uint)SDMMC1->STA, (uint)SDMMC1->DCOUNT, (uint)SDMMC1->FIFOCNT, (uint)DMA2->LISR, (uint)DMA2->HISR, (uint)DMA2_Stream3->NDTR, (uint)RCC->AHB1ENR);
+            printf("sdio_transfer_cmd53: timeout wr=%d len=%u dma=%u buf_idx=%u STA=%08x SDMMC=%08x:%08x DMA=%08x:%08x:%08x RCC=%08x\n", write, (uint)len, (uint)dma, sdmmc_buf_cur - buf, (uint)SDMMC->STA, (uint)SDMMC->DCOUNT, (uint)SDMMC->FIFOCNT, (uint)DMA2->LISR, (uint)DMA2->HISR, (uint)DMA2_Stream3->NDTR, (uint)RCC->AHB1ENR);
             #else
-            printf("sdio_transfer_cmd53: timeout wr=%d len=%u dma=%u buf_idx=%u STA=%08x SDMMC=%08x:%08x IDMA=%08x\n", write, (uint)len, (uint)dma, sdmmc_buf_cur - buf, (uint)SDMMC1->STA, (uint)SDMMC1->DCOUNT, (uint)SDMMC1->DCTRL, (uint)SDMMC1->IDMACTRL);
+            printf("sdio_transfer_cmd53: timeout wr=%d len=%u dma=%u buf_idx=%u STA=%08x SDMMC=%08x:%08x IDMA=%08x\n", write, (uint)len, (uint)dma, sdmmc_buf_cur - buf, (uint)SDMMC->STA, (uint)SDMMC->DCOUNT, (uint)SDMMC->DCTRL, (uint)SDMMC->IDMACTRL);
             #endif
             return -MP_ETIMEDOUT;
         }
     }
 
-    SDMMC1->MASK &= SDMMC_MASK_SDIOITIE;
+    SDMMC->MASK &= SDMMC_MASK_SDIOITIE;
 
     if (sdmmc_error) {
         #if defined(STM32F7)
-        printf("sdio_transfer_cmd53: error=%08lx wr=%d len=%u dma=%u buf_idx=%u STA=%08x SDMMC=%08x:%08x DMA=%08x:%08x:%08x RCC=%08x\n", sdmmc_error, write, (uint)len, (uint)dma, sdmmc_buf_cur - buf, (uint)SDMMC1->STA, (uint)SDMMC1->DCOUNT, (uint)SDMMC1->FIFOCNT, (uint)DMA2->LISR, (uint)DMA2->HISR, (uint)DMA2_Stream3->NDTR, (uint)RCC->AHB1ENR);
+        printf("sdio_transfer_cmd53: error=%08lx wr=%d len=%u dma=%u buf_idx=%u STA=%08x SDMMC=%08x:%08x DMA=%08x:%08x:%08x RCC=%08x\n", sdmmc_error, write, (uint)len, (uint)dma, sdmmc_buf_cur - buf, (uint)SDMMC->STA, (uint)SDMMC->DCOUNT, (uint)SDMMC->FIFOCNT, (uint)DMA2->LISR, (uint)DMA2->HISR, (uint)DMA2_Stream3->NDTR, (uint)RCC->AHB1ENR);
         #else
-        printf("sdio_transfer_cmd53: error=%08lx wr=%d len=%u dma=%u buf_idx=%u STA=%08x SDMMC=%08x:%08x IDMA=%08x\n", sdmmc_error, write, (uint)len, (uint)dma, sdmmc_buf_cur - buf, (uint)SDMMC1->STA, (uint)SDMMC1->DCOUNT, (uint)SDMMC1->DCTRL, (uint)SDMMC1->IDMACTRL);
+        printf("sdio_transfer_cmd53: error=%08lx wr=%d len=%u dma=%u buf_idx=%u STA=%08x SDMMC=%08x:%08x IDMA=%08x\n", sdmmc_error, write, (uint)len, (uint)dma, sdmmc_buf_cur - buf, (uint)SDMMC->STA, (uint)SDMMC->DCOUNT, (uint)SDMMC->DCTRL, (uint)SDMMC->IDMACTRL);
         #endif
         return -(0x1000000 | sdmmc_error);
     }

From a41cd150be01adc59828ead26a01a9d9324773e1 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 28 Apr 2021 10:48:04 +1000
Subject: [PATCH 0790/3533] esp8266/modnetwork: Use mp_handle_pending() to
 raise pending exception.

If MICROPY_ENABLE_SCHEDULER is enabled then MP_STATE_VM(sched_state) must
be updated after handling the pending exception, which is done by the
mp_handle_pending() function.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp8266/modnetwork.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/ports/esp8266/modnetwork.c b/ports/esp8266/modnetwork.c
index cad53d912cafc..3b8ef4b21fba7 100644
--- a/ports/esp8266/modnetwork.c
+++ b/ports/esp8266/modnetwork.c
@@ -239,9 +239,7 @@ STATIC mp_obj_t esp_scan(mp_obj_t self_in) {
         // esp_scan_list variable to NULL without disabling interrupts
         if (MP_STATE_VM(mp_pending_exception) != NULL) {
             esp_scan_list = NULL;
-            mp_obj_t obj = MP_STATE_VM(mp_pending_exception);
-            MP_STATE_VM(mp_pending_exception) = MP_OBJ_NULL;
-            nlr_raise(obj);
+            mp_handle_pending(true);
         }
         ets_loop_iter();
     }

From 7e549b6718e80136b03074765f1d4add209a21a5 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 28 Apr 2021 10:50:09 +1000
Subject: [PATCH 0791/3533] py/profile: Use mp_handle_pending() to raise
 pending exception.

If MICROPY_ENABLE_SCHEDULER is enabled then MP_STATE_VM(sched_state) must
be updated after handling the pending exception, which is done by the
mp_handle_pending() function.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/profile.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/py/profile.c b/py/profile.c
index 9cf8c4b7ba69f..e5fb35f0ede49 100644
--- a/py/profile.c
+++ b/py/profile.c
@@ -298,9 +298,7 @@ STATIC mp_obj_t mp_prof_callback_invoke(mp_obj_t callback, prof_callback_args_t
     mp_prof_is_executing = false;
 
     if (MP_STATE_VM(mp_pending_exception) != MP_OBJ_NULL) {
-        mp_obj_t obj = MP_STATE_VM(mp_pending_exception);
-        MP_STATE_VM(mp_pending_exception) = MP_OBJ_NULL;
-        nlr_raise(obj);
+        mp_handle_pending(true);
     }
     return top;
 }

From 7cbf826a9575e18ce1b7fe11b0f0997509153260 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 28 Apr 2021 10:52:19 +1000
Subject: [PATCH 0792/3533] py/scheduler: Add mp_sched_exception() to schedule
 a pending exception.

This helper is added to properly set a pending exception, to mirror
mp_sched_schedule(), which schedules a function.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/mpconfigport.h   |  1 +
 ports/esp8266/mpconfigport.h |  1 +
 py/mpconfig.h                |  4 ++++
 py/runtime.h                 |  1 +
 py/scheduler.c               | 14 +++++++++-----
 5 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h
index 8788963cb3209..0c7d42210e084 100644
--- a/ports/esp32/mpconfigport.h
+++ b/ports/esp32/mpconfigport.h
@@ -264,6 +264,7 @@ void *esp_native_code_commit(void *, size_t, void *);
 #endif
 
 // Functions that should go in IRAM
+#define MICROPY_WRAP_MP_SCHED_EXCEPTION(f) IRAM_ATTR f
 #define MICROPY_WRAP_MP_KEYBOARD_INTERRUPT(f) IRAM_ATTR f
 
 #define UINT_FMT "%u"
diff --git a/ports/esp8266/mpconfigport.h b/ports/esp8266/mpconfigport.h
index 2c56b4188fd07..52028e833a8f2 100644
--- a/ports/esp8266/mpconfigport.h
+++ b/ports/esp8266/mpconfigport.h
@@ -195,6 +195,7 @@ extern const struct _mp_obj_module_t mp_module_onewire;
 #define MICROPY_PY_SYS_PLATFORM "esp8266"
 
 #define MP_FASTCODE(n) __attribute__((section(".iram0.text." #n))) n
+#define MICROPY_WRAP_MP_SCHED_EXCEPTION(f) MP_FASTCODE(f)
 #define MICROPY_WRAP_MP_KEYBOARD_INTERRUPT(f) MP_FASTCODE(f)
 #define MICROPY_WRAP_MP_SCHED_SCHEDULE(f) MP_FASTCODE(f)
 
diff --git a/py/mpconfig.h b/py/mpconfig.h
index 5c7212fd1f6bc..2934f8ec89ee3 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -1504,6 +1504,10 @@ typedef double mp_float_t;
 /*****************************************************************************/
 /* Hooks for a port to wrap functions with attributes                        */
 
+#ifndef MICROPY_WRAP_MP_SCHED_EXCEPTION
+#define MICROPY_WRAP_MP_SCHED_EXCEPTION(f) f
+#endif
+
 #ifndef MICROPY_WRAP_MP_KEYBOARD_INTERRUPT
 #define MICROPY_WRAP_MP_KEYBOARD_INTERRUPT(f) f
 #endif
diff --git a/py/runtime.h b/py/runtime.h
index 0cbbb287ac0f0..9ad4bc0242b0b 100644
--- a/py/runtime.h
+++ b/py/runtime.h
@@ -64,6 +64,7 @@ extern const byte mp_binary_op_method_name[];
 void mp_init(void);
 void mp_deinit(void);
 
+void mp_sched_exception(mp_obj_t exc);
 void mp_keyboard_interrupt(void);
 void mp_handle_pending(bool raise_exc);
 void mp_handle_pending_tail(mp_uint_t atomic_state);
diff --git a/py/scheduler.c b/py/scheduler.c
index 6b138a631b371..f37f8c3f861e6 100644
--- a/py/scheduler.c
+++ b/py/scheduler.c
@@ -28,17 +28,21 @@
 
 #include "py/runtime.h"
 
-#if MICROPY_KBD_EXCEPTION
-// This function may be called asynchronously at any time so only do the bare minimum.
-void MICROPY_WRAP_MP_KEYBOARD_INTERRUPT(mp_keyboard_interrupt)(void) {
-    MP_STATE_VM(mp_kbd_exception).traceback_data = NULL;
-    MP_STATE_VM(mp_pending_exception) = MP_OBJ_FROM_PTR(&MP_STATE_VM(mp_kbd_exception));
+void mp_sched_exception(mp_obj_t exc) {
+    MP_STATE_VM(mp_pending_exception) = exc;
     #if MICROPY_ENABLE_SCHEDULER
     if (MP_STATE_VM(sched_state) == MP_SCHED_IDLE) {
         MP_STATE_VM(sched_state) = MP_SCHED_PENDING;
     }
     #endif
 }
+
+#if MICROPY_KBD_EXCEPTION
+// This function may be called asynchronously at any time so only do the bare minimum.
+void MICROPY_WRAP_MP_KEYBOARD_INTERRUPT(mp_keyboard_interrupt)(void) {
+    MP_STATE_VM(mp_kbd_exception).traceback_data = NULL;
+    mp_sched_exception(MP_OBJ_FROM_PTR(&MP_STATE_VM(mp_kbd_exception)));
+}
 #endif
 
 #if MICROPY_ENABLE_SCHEDULER

From bd54eb566f85293279d02d0a663c7e4d9f59e660 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 28 Apr 2021 10:53:54 +1000
Subject: [PATCH 0793/3533] nrf/boards/microbit: Use mp_sched_exception() where
 appropriate.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/nrf/boards/microbit/modules/microbitdisplay.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/nrf/boards/microbit/modules/microbitdisplay.c b/ports/nrf/boards/microbit/modules/microbitdisplay.c
index 979a4ddd08b63..c2eaf4179bcdf 100644
--- a/ports/nrf/boards/microbit/modules/microbitdisplay.c
+++ b/ports/nrf/boards/microbit/modules/microbitdisplay.c
@@ -305,7 +305,7 @@ static void draw_object(mp_obj_t obj) {
             async_stop();
         }
     } else {
-        MP_STATE_VM(mp_pending_exception) = mp_obj_new_exception_msg(&mp_type_TypeError, MP_ERROR_TEXT("not an image."));
+        mp_sched_exception(mp_obj_new_exception_msg(&mp_type_TypeError, MP_ERROR_TEXT("not an image.")));
         async_stop();
     }
 }
@@ -341,7 +341,7 @@ static void microbit_display_update(void) {
                     if (mp_obj_get_type(nlr.ret_val) == &mp_type_MemoryError) {
                         mp_printf(&mp_plat_print, "Allocation in interrupt handler");
                     }
-                    MP_STATE_VM(mp_pending_exception) = MP_OBJ_FROM_PTR(nlr.ret_val);
+                    mp_sched_exception(MP_OBJ_FROM_PTR(nlr.ret_val));
                 }
                 obj = MP_OBJ_STOP_ITERATION;
             }

From e9e9c76ddf131f8e50b0ae2d44501d3cd88537ef Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 28 Apr 2021 10:57:34 +1000
Subject: [PATCH 0794/3533] all: Rename mp_keyboard_interrupt to
 mp_sched_keyboard_interrupt.

To match mp_sched_exception() and mp_sched_schedule().

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/uos_dupterm.c                   | 2 +-
 ports/cc3200/mods/pybuart.c            | 2 +-
 ports/cc3200/telnet/telnet.c           | 2 +-
 ports/esp32/mpconfigport.h             | 2 +-
 ports/esp32/uart.c                     | 2 +-
 ports/esp32/usb.c                      | 2 +-
 ports/esp8266/esp_mphal.h              | 2 +-
 ports/esp8266/mpconfigport.h           | 2 +-
 ports/esp8266/uart.c                   | 6 +++---
 ports/javascript/Makefile              | 2 +-
 ports/javascript/library.js            | 2 +-
 ports/mimxrt/mphalport.c               | 2 +-
 ports/nrf/drivers/bluetooth/ble_uart.c | 2 +-
 ports/nrf/modules/machine/uart.c       | 2 +-
 ports/rp2/mphalport.c                  | 2 +-
 ports/rp2/uart.c                       | 2 +-
 ports/samd/mphalport.c                 | 2 +-
 ports/stm32/pendsv.c                   | 2 +-
 ports/unix/coverage.c                  | 8 ++++----
 ports/unix/unix_mphal.c                | 2 +-
 ports/windows/windows_mphal.c          | 2 +-
 ports/zephyr/src/zephyr_getchar.c      | 4 ++--
 py/mpconfig.h                          | 4 ++--
 py/runtime.h                           | 2 +-
 py/scheduler.c                         | 2 +-
 25 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/extmod/uos_dupterm.c b/extmod/uos_dupterm.c
index ad706d5246f35..b661803875f7f 100644
--- a/extmod/uos_dupterm.c
+++ b/extmod/uos_dupterm.c
@@ -133,7 +133,7 @@ int mp_uos_dupterm_rx_chr(void) {
                 nlr_pop();
                 if (buf[0] == mp_interrupt_char) {
                     // Signal keyboard interrupt to be raised as soon as the VM resumes
-                    mp_keyboard_interrupt();
+                    mp_sched_keyboard_interrupt();
                     return -2;
                 }
                 return buf[0];
diff --git a/ports/cc3200/mods/pybuart.c b/ports/cc3200/mods/pybuart.c
index 98adf1c39816f..ac2af7032ee91 100644
--- a/ports/cc3200/mods/pybuart.c
+++ b/ports/cc3200/mods/pybuart.c
@@ -250,7 +250,7 @@ STATIC void UARTGenericIntHandler(uint32_t uart_id) {
             int data = MAP_UARTCharGetNonBlocking(self->reg);
             if (MP_STATE_PORT(os_term_dup_obj) && MP_STATE_PORT(os_term_dup_obj)->stream_o == self && data == mp_interrupt_char) {
                 // raise an exception when interrupts are finished
-                mp_keyboard_interrupt();
+                mp_sched_keyboard_interrupt();
             } else { // there's always a read buffer available
                 uint16_t next_head = (self->read_buf_head + 1) % PYBUART_RX_BUFFER_LEN;
                 if (next_head != self->read_buf_tail) {
diff --git a/ports/cc3200/telnet/telnet.c b/ports/cc3200/telnet/telnet.c
index 401e8a8cc9323..9f51d4cd85959 100644
--- a/ports/cc3200/telnet/telnet.c
+++ b/ports/cc3200/telnet/telnet.c
@@ -446,7 +446,7 @@ static void telnet_parse_input (uint8_t *str, int16_t *len) {
         if (*_str <= 127) {
             if (telnet_data.state == E_TELNET_STE_LOGGED_IN && *_str == mp_interrupt_char) {
                 // raise a keyboard exception
-                mp_keyboard_interrupt();
+                mp_sched_keyboard_interrupt();
                 (*len)--;
                 _str++;
             }
diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h
index 0c7d42210e084..a06c910470192 100644
--- a/ports/esp32/mpconfigport.h
+++ b/ports/esp32/mpconfigport.h
@@ -265,7 +265,7 @@ void *esp_native_code_commit(void *, size_t, void *);
 
 // Functions that should go in IRAM
 #define MICROPY_WRAP_MP_SCHED_EXCEPTION(f) IRAM_ATTR f
-#define MICROPY_WRAP_MP_KEYBOARD_INTERRUPT(f) IRAM_ATTR f
+#define MICROPY_WRAP_MP_SCHED_KEYBOARD_INTERRUPT(f) IRAM_ATTR f
 
 #define UINT_FMT "%u"
 #define INT_FMT "%d"
diff --git a/ports/esp32/uart.c b/ports/esp32/uart.c
index bd3eea9f6bed3..c4fe41eaff39c 100644
--- a/ports/esp32/uart.c
+++ b/ports/esp32/uart.c
@@ -55,7 +55,7 @@ STATIC void IRAM_ATTR uart_irq_handler(void *arg) {
         uint8_t c = READ_PERI_REG(UART_FIFO_AHB_REG(0)); // UART0
         #endif
         if (c == mp_interrupt_char) {
-            mp_keyboard_interrupt();
+            mp_sched_keyboard_interrupt();
         } else {
             // this is an inline function so will be in IRAM
             ringbuf_put(&stdin_ringbuf, c);
diff --git a/ports/esp32/usb.c b/ports/esp32/usb.c
index aa76321a7e918..85a7a11c9ead1 100644
--- a/ports/esp32/usb.c
+++ b/ports/esp32/usb.c
@@ -50,7 +50,7 @@ static void usb_callback_rx(int itf, cdcacm_event_t *event) {
         }
         for (size_t i = 0; i < len; ++i) {
             if (usb_rx_buf[i] == mp_interrupt_char) {
-                mp_keyboard_interrupt();
+                mp_sched_keyboard_interrupt();
             } else {
                 ringbuf_put(&stdin_ringbuf, usb_rx_buf[i]);
             }
diff --git a/ports/esp8266/esp_mphal.h b/ports/esp8266/esp_mphal.h
index 89f4e0ff08544..e9cf7e548d3fa 100644
--- a/ports/esp8266/esp_mphal.h
+++ b/ports/esp8266/esp_mphal.h
@@ -29,7 +29,7 @@
 #include "lib/utils/interrupt_char.h"
 #include "xtirq.h"
 
-void mp_keyboard_interrupt(void);
+void mp_sched_keyboard_interrupt(void);
 
 struct _mp_print_t;
 // Structure for UART-only output via mp_printf()
diff --git a/ports/esp8266/mpconfigport.h b/ports/esp8266/mpconfigport.h
index 52028e833a8f2..ac47f0aa29059 100644
--- a/ports/esp8266/mpconfigport.h
+++ b/ports/esp8266/mpconfigport.h
@@ -196,7 +196,7 @@ extern const struct _mp_obj_module_t mp_module_onewire;
 
 #define MP_FASTCODE(n) __attribute__((section(".iram0.text." #n))) n
 #define MICROPY_WRAP_MP_SCHED_EXCEPTION(f) MP_FASTCODE(f)
-#define MICROPY_WRAP_MP_KEYBOARD_INTERRUPT(f) MP_FASTCODE(f)
+#define MICROPY_WRAP_MP_SCHED_KEYBOARD_INTERRUPT(f) MP_FASTCODE(f)
 #define MICROPY_WRAP_MP_SCHED_SCHEDULE(f) MP_FASTCODE(f)
 
 #define WDEV_HWRNG ((volatile uint32_t *)0x3ff20e44)
diff --git a/ports/esp8266/uart.c b/ports/esp8266/uart.c
index 7d88555c05ef5..5ac71da07df1a 100644
--- a/ports/esp8266/uart.c
+++ b/ports/esp8266/uart.c
@@ -42,7 +42,7 @@ static ringbuf_t uart_ringbuf = {uart_ringbuf_array, sizeof(uart_ringbuf_array),
 static void uart0_rx_intr_handler(void *para);
 
 void soft_reset(void);
-void mp_keyboard_interrupt(void);
+void mp_sched_keyboard_interrupt(void);
 
 /******************************************************************************
  * FunctionName : uart_config
@@ -179,7 +179,7 @@ static void uart0_rx_intr_handler(void *para) {
             // directly on stdin_ringbuf, rather than going via uart_ringbuf
             if (uart_attached_to_dupterm) {
                 if (RcvChar == mp_interrupt_char) {
-                    mp_keyboard_interrupt();
+                    mp_sched_keyboard_interrupt();
                 } else {
                     ringbuf_put(&stdin_ringbuf, RcvChar);
                 }
@@ -303,7 +303,7 @@ void ICACHE_FLASH_ATTR uart_task_handler(os_event_t *evt) {
     int c, ret = 0;
     while ((c = ringbuf_get(&stdin_ringbuf)) >= 0) {
         if (c == mp_interrupt_char) {
-            mp_keyboard_interrupt();
+            mp_sched_keyboard_interrupt();
         }
         ret = pyexec_event_repl_process_char(c);
         if (ret & PYEXEC_FORCED_EXIT) {
diff --git a/ports/javascript/Makefile b/ports/javascript/Makefile
index 3962e93f5f334..97236755464cb 100644
--- a/ports/javascript/Makefile
+++ b/ports/javascript/Makefile
@@ -51,7 +51,7 @@ OBJ = $(PY_O)
 OBJ += $(addprefix $(BUILD)/, $(SRC_LIB:.c=.o))
 OBJ += $(addprefix $(BUILD)/, $(SRC_C:.c=.o))
 
-JSFLAGS = -O0 -s EXPORTED_FUNCTIONS="['_mp_js_init', '_mp_js_init_repl', '_mp_js_do_str', '_mp_js_process_char', '_mp_hal_get_interrupt_char', '_mp_keyboard_interrupt']" -s EXTRA_EXPORTED_RUNTIME_METHODS="['ccall', 'cwrap']" -s "BINARYEN_TRAP_MODE='clamp'" --memory-init-file 0 --js-library library.js
+JSFLAGS = -O0 -s EXPORTED_FUNCTIONS="['_mp_js_init', '_mp_js_init_repl', '_mp_js_do_str', '_mp_js_process_char', '_mp_hal_get_interrupt_char', '_mp_sched_keyboard_interrupt']" -s EXTRA_EXPORTED_RUNTIME_METHODS="['ccall', 'cwrap']" -s "BINARYEN_TRAP_MODE='clamp'" --memory-init-file 0 --js-library library.js
 
 all: $(BUILD)/micropython.js
 
diff --git a/ports/javascript/library.js b/ports/javascript/library.js
index 9aab3e4320aa1..a8e54aaacae1d 100644
--- a/ports/javascript/library.js
+++ b/ports/javascript/library.js
@@ -55,7 +55,7 @@ mergeInto(LibraryManager.library, {
                 var n = fs.readSync(process.stdin.fd, buf, 0, 1);
                 if (n > 0) {
                     if (buf[0] == mp_interrupt_char) {
-                        Module.ccall('mp_keyboard_interrupt', 'null', ['null'], ['null']);
+                        Module.ccall('mp_sched_keyboard_interrupt', 'null', ['null'], ['null']);
                     } else {
                         process.stdout.write(String.fromCharCode(buf[0]));
                     }
diff --git a/ports/mimxrt/mphalport.c b/ports/mimxrt/mphalport.c
index 3032464d398f4..9fee3e85d0082 100644
--- a/ports/mimxrt/mphalport.c
+++ b/ports/mimxrt/mphalport.c
@@ -37,7 +37,7 @@ void tud_cdc_rx_wanted_cb(uint8_t itf, char wanted_char) {
     (void)itf;
     (void)wanted_char;
     tud_cdc_read_char(); // discard interrupt char
-    mp_keyboard_interrupt();
+    mp_sched_keyboard_interrupt();
 }
 
 void mp_hal_set_interrupt_char(int c) {
diff --git a/ports/nrf/drivers/bluetooth/ble_uart.c b/ports/nrf/drivers/bluetooth/ble_uart.c
index 64e3a05f93192..96c2025d0ff71 100644
--- a/ports/nrf/drivers/bluetooth/ble_uart.c
+++ b/ports/nrf/drivers/bluetooth/ble_uart.c
@@ -193,7 +193,7 @@ STATIC void gatts_event_handler(mp_obj_t self_in, uint16_t event_id, uint16_t at
             for (uint16_t i = 0; i < length; i++) {
                 #if MICROPY_KBD_EXCEPTION
                 if (data[i] == mp_interrupt_char) {
-                    mp_keyboard_interrupt();
+                    mp_sched_keyboard_interrupt();
                     m_rx_ring_buffer.start = 0;
                     m_rx_ring_buffer.end = 0;
                 } else
diff --git a/ports/nrf/modules/machine/uart.c b/ports/nrf/modules/machine/uart.c
index 4f69bfc620b94..af95ae4b8d985 100644
--- a/ports/nrf/modules/machine/uart.c
+++ b/ports/nrf/modules/machine/uart.c
@@ -128,7 +128,7 @@ STATIC void uart_event_handler(nrfx_uart_event_t const *p_event, void *p_context
         nrfx_uart_rx(self->p_uart, &self->buf->rx_buf[0], 1);
         #if !MICROPY_PY_BLE_NUS && MICROPY_KBD_EXCEPTION
         if (chr == mp_interrupt_char) {
-            mp_keyboard_interrupt();
+            mp_sched_keyboard_interrupt();
         } else
         #endif
         {
diff --git a/ports/rp2/mphalport.c b/ports/rp2/mphalport.c
index 1122afcef730e..1d77bc8f5d676 100644
--- a/ports/rp2/mphalport.c
+++ b/ports/rp2/mphalport.c
@@ -52,7 +52,7 @@ void tud_cdc_rx_wanted_cb(uint8_t itf, char wanted_char) {
     (void)itf;
     (void)wanted_char;
     tud_cdc_read_char(); // discard interrupt char
-    mp_keyboard_interrupt();
+    mp_sched_keyboard_interrupt();
 }
 
 void mp_hal_set_interrupt_char(int c) {
diff --git a/ports/rp2/uart.c b/ports/rp2/uart.c
index b7991563af034..bcc41bfaf5198 100644
--- a/ports/rp2/uart.c
+++ b/ports/rp2/uart.c
@@ -41,7 +41,7 @@ void uart_irq(void) {
         int c = uart_getc(uart_default);
         #if MICROPY_KBD_EXCEPTION
         if (c == mp_interrupt_char) {
-            mp_keyboard_interrupt();
+            mp_sched_keyboard_interrupt();
             return;
         }
         #endif
diff --git a/ports/samd/mphalport.c b/ports/samd/mphalport.c
index 357ec93a68143..a87b7d2125a56 100644
--- a/ports/samd/mphalport.c
+++ b/ports/samd/mphalport.c
@@ -35,7 +35,7 @@ void tud_cdc_rx_wanted_cb(uint8_t itf, char wanted_char) {
     (void)itf;
     (void)wanted_char;
     tud_cdc_read_char(); // discard interrupt char
-    mp_keyboard_interrupt();
+    mp_sched_keyboard_interrupt();
 }
 
 void mp_hal_set_interrupt_char(int c) {
diff --git a/ports/stm32/pendsv.c b/ports/stm32/pendsv.c
index 60b8709be34fd..3181ba616a5a4 100644
--- a/ports/stm32/pendsv.c
+++ b/ports/stm32/pendsv.c
@@ -61,7 +61,7 @@ void pendsv_init(void) {
 // thread.
 void pendsv_kbd_intr(void) {
     if (MP_STATE_VM(mp_pending_exception) == MP_OBJ_NULL) {
-        mp_keyboard_interrupt();
+        mp_sched_keyboard_interrupt();
     } else {
         MP_STATE_VM(mp_pending_exception) = MP_OBJ_NULL;
         pendsv_object = &MP_STATE_VM(mp_kbd_exception);
diff --git a/ports/unix/coverage.c b/ports/unix/coverage.c
index ef66c4fb59440..220666e381d6b 100644
--- a/ports/unix/coverage.c
+++ b/ports/unix/coverage.c
@@ -483,7 +483,7 @@ STATIC mp_obj_t extra_coverage(void) {
         }
 
         // setting the keyboard interrupt and raising it during mp_handle_pending
-        mp_keyboard_interrupt();
+        mp_sched_keyboard_interrupt();
         nlr_buf_t nlr;
         if (nlr_push(&nlr) == 0) {
             mp_handle_pending(true);
@@ -493,13 +493,13 @@ STATIC mp_obj_t extra_coverage(void) {
         }
 
         // setting the keyboard interrupt (twice) and cancelling it during mp_handle_pending
-        mp_keyboard_interrupt();
-        mp_keyboard_interrupt();
+        mp_sched_keyboard_interrupt();
+        mp_sched_keyboard_interrupt();
         mp_handle_pending(false);
 
         // setting keyboard interrupt and a pending event (intr should be handled first)
         mp_sched_schedule(MP_OBJ_FROM_PTR(&mp_builtin_print_obj), MP_OBJ_NEW_SMALL_INT(10));
-        mp_keyboard_interrupt();
+        mp_sched_keyboard_interrupt();
         if (nlr_push(&nlr) == 0) {
             mp_handle_pending(true);
             nlr_pop();
diff --git a/ports/unix/unix_mphal.c b/ports/unix/unix_mphal.c
index 28a4ca2c4a8e9..d62991d34d04a 100644
--- a/ports/unix/unix_mphal.c
+++ b/ports/unix/unix_mphal.c
@@ -58,7 +58,7 @@ STATIC void sighandler(int signum) {
             // this is the second time we are called, so die straight away
             exit(1);
         }
-        mp_keyboard_interrupt();
+        mp_sched_keyboard_interrupt();
         #endif
     }
 }
diff --git a/ports/windows/windows_mphal.c b/ports/windows/windows_mphal.c
index 49daa0542868f..dd196f67af36b 100644
--- a/ports/windows/windows_mphal.c
+++ b/ports/windows/windows_mphal.c
@@ -84,7 +84,7 @@ BOOL WINAPI console_sighandler(DWORD evt) {
             // this is the second time we are called, so die straight away
             exit(1);
         }
-        mp_keyboard_interrupt();
+        mp_sched_keyboard_interrupt();
         return TRUE;
     }
     return FALSE;
diff --git a/ports/zephyr/src/zephyr_getchar.c b/ports/zephyr/src/zephyr_getchar.c
index 40dc1c3201243..d75a8a76e3d69 100644
--- a/ports/zephyr/src/zephyr_getchar.c
+++ b/ports/zephyr/src/zephyr_getchar.c
@@ -21,7 +21,7 @@
 #include "zephyr_getchar.h"
 
 extern int mp_interrupt_char;
-void mp_keyboard_interrupt(void);
+void mp_sched_keyboard_interrupt(void);
 
 static struct k_sem uart_sem;
 #define UART_BUFSIZE 256
@@ -36,7 +36,7 @@ static int console_irq_input_hook(uint8_t ch)
         return 1;
     }
     if (ch == mp_interrupt_char) {
-        mp_keyboard_interrupt();
+        mp_sched_keyboard_interrupt();
         return 1;
     } else {
         uart_ringbuf[i_put] = ch;
diff --git a/py/mpconfig.h b/py/mpconfig.h
index 2934f8ec89ee3..4445e9aee236b 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -1508,8 +1508,8 @@ typedef double mp_float_t;
 #define MICROPY_WRAP_MP_SCHED_EXCEPTION(f) f
 #endif
 
-#ifndef MICROPY_WRAP_MP_KEYBOARD_INTERRUPT
-#define MICROPY_WRAP_MP_KEYBOARD_INTERRUPT(f) f
+#ifndef MICROPY_WRAP_MP_SCHED_KEYBOARD_INTERRUPT
+#define MICROPY_WRAP_MP_SCHED_KEYBOARD_INTERRUPT(f) f
 #endif
 
 #ifndef MICROPY_WRAP_MP_SCHED_SCHEDULE
diff --git a/py/runtime.h b/py/runtime.h
index 9ad4bc0242b0b..7d2cb94e84312 100644
--- a/py/runtime.h
+++ b/py/runtime.h
@@ -65,7 +65,7 @@ void mp_init(void);
 void mp_deinit(void);
 
 void mp_sched_exception(mp_obj_t exc);
-void mp_keyboard_interrupt(void);
+void mp_sched_keyboard_interrupt(void);
 void mp_handle_pending(bool raise_exc);
 void mp_handle_pending_tail(mp_uint_t atomic_state);
 
diff --git a/py/scheduler.c b/py/scheduler.c
index f37f8c3f861e6..9ff930007e595 100644
--- a/py/scheduler.c
+++ b/py/scheduler.c
@@ -39,7 +39,7 @@ void mp_sched_exception(mp_obj_t exc) {
 
 #if MICROPY_KBD_EXCEPTION
 // This function may be called asynchronously at any time so only do the bare minimum.
-void MICROPY_WRAP_MP_KEYBOARD_INTERRUPT(mp_keyboard_interrupt)(void) {
+void MICROPY_WRAP_MP_SCHED_KEYBOARD_INTERRUPT(mp_sched_keyboard_interrupt)(void) {
     MP_STATE_VM(mp_kbd_exception).traceback_data = NULL;
     mp_sched_exception(MP_OBJ_FROM_PTR(&MP_STATE_VM(mp_kbd_exception)));
 }

From 916c3fd23fc4b636a8007525c3bd6308d01509d0 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sun, 25 Apr 2021 22:24:49 +1000
Subject: [PATCH 0795/3533] py/scheduler: Add optional port hook for when
 something is scheduled.

So that a port can "wake up" when there is work to do.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/mpconfig.h  | 6 ++++++
 py/scheduler.c | 1 +
 2 files changed, 7 insertions(+)

diff --git a/py/mpconfig.h b/py/mpconfig.h
index 4445e9aee236b..7337994a5e85d 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -550,6 +550,12 @@
 #define MICROPY_VM_HOOK_RETURN
 #endif
 
+// Hook for mp_sched_schedule when a function gets scheduled on sched_queue
+// (this macro executes within an atomic section)
+#ifndef MICROPY_SCHED_HOOK_SCHEDULED
+#define MICROPY_SCHED_HOOK_SCHEDULED
+#endif
+
 // Whether to include the garbage collector
 #ifndef MICROPY_ENABLE_GC
 #define MICROPY_ENABLE_GC (0)
diff --git a/py/scheduler.c b/py/scheduler.c
index 9ff930007e595..947510c68b1c7 100644
--- a/py/scheduler.c
+++ b/py/scheduler.c
@@ -134,6 +134,7 @@ bool MICROPY_WRAP_MP_SCHED_SCHEDULE(mp_sched_schedule)(mp_obj_t function, mp_obj
         uint8_t iput = IDX_MASK(MP_STATE_VM(sched_idx) + MP_STATE_VM(sched_len)++);
         MP_STATE_VM(sched_queue)[iput].func = function;
         MP_STATE_VM(sched_queue)[iput].arg = arg;
+        MICROPY_SCHED_HOOK_SCHEDULED;
         ret = true;
     } else {
         // schedule queue is full

From d120859857e9e34bded146977f18a2be8c53ce7b Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sun, 25 Apr 2021 22:28:55 +1000
Subject: [PATCH 0796/3533] zephyr: Run scheduled callbacks at REPL and during
 mp_hal_delay_ms.

And ctrl-C can now interrupt a time.sleep call.  This uses Zephyr's k_poll
API to wait efficiently for an event signal, and an optional semaphore.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/zephyr/CMakeLists.txt       |  1 +
 ports/zephyr/main.c               |  2 +
 ports/zephyr/mpconfigport.h       |  3 ++
 ports/zephyr/mphalport.c          | 74 +++++++++++++++++++++++++++++++
 ports/zephyr/mphalport.h          |  5 ++-
 ports/zephyr/prj.conf             |  1 +
 ports/zephyr/prj_minimal.conf     |  1 +
 ports/zephyr/src/zephyr_getchar.c |  4 ++
 8 files changed, 90 insertions(+), 1 deletion(-)
 create mode 100644 ports/zephyr/mphalport.c

diff --git a/ports/zephyr/CMakeLists.txt b/ports/zephyr/CMakeLists.txt
index 716642979a601..e30759e064464 100644
--- a/ports/zephyr/CMakeLists.txt
+++ b/ports/zephyr/CMakeLists.txt
@@ -46,6 +46,7 @@ set(MICROPY_SOURCE_PORT
     modutime.c
     modzephyr.c
     modzsensor.c
+    mphalport.c
     uart_core.c
     zephyr_storage.c
 )
diff --git a/ports/zephyr/main.c b/ports/zephyr/main.c
index 74785cc830420..f8ec0a0d27e68 100644
--- a/ports/zephyr/main.c
+++ b/ports/zephyr/main.c
@@ -45,6 +45,7 @@
 #include "py/runtime.h"
 #include "py/repl.h"
 #include "py/gc.h"
+#include "py/mphal.h"
 #include "py/stackctrl.h"
 #include "lib/utils/pyexec.h"
 #include "lib/mp-readline/readline.h"
@@ -123,6 +124,7 @@ int real_main(void) {
     mp_stack_set_limit(CONFIG_MAIN_STACK_SIZE - 512);
 
     init_zephyr();
+    mp_hal_init();
 
     #ifdef TEST
     static const char *argv[] = {"test"};
diff --git a/ports/zephyr/mpconfigport.h b/ports/zephyr/mpconfigport.h
index 966f7f7e94a1d..162ac8a5766a2 100644
--- a/ports/zephyr/mpconfigport.h
+++ b/ports/zephyr/mpconfigport.h
@@ -96,6 +96,9 @@
 #define MICROPY_COMP_CONST (0)
 #define MICROPY_COMP_DOUBLE_TUPLE_ASSIGN (0)
 
+void mp_hal_signal_event(void);
+#define MICROPY_SCHED_HOOK_SCHEDULED mp_hal_signal_event()
+
 #define MICROPY_PY_SYS_PLATFORM "zephyr"
 
 #ifdef CONFIG_BOARD
diff --git a/ports/zephyr/mphalport.c b/ports/zephyr/mphalport.c
new file mode 100644
index 0000000000000..4f00cbd26ca67
--- /dev/null
+++ b/ports/zephyr/mphalport.c
@@ -0,0 +1,74 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "py/runtime.h"
+#include "py/mphal.h"
+
+static struct k_poll_signal wait_signal;
+static struct k_poll_event wait_events[2] = {
+    K_POLL_EVENT_INITIALIZER(K_POLL_TYPE_SIGNAL,
+        K_POLL_MODE_NOTIFY_ONLY,
+        &wait_signal),
+    K_POLL_EVENT_STATIC_INITIALIZER(K_POLL_TYPE_SEM_AVAILABLE,
+        K_POLL_MODE_NOTIFY_ONLY,
+        NULL, 0),
+};
+
+void mp_hal_init(void) {
+    k_poll_signal_init(&wait_signal);
+}
+
+void mp_hal_signal_event(void) {
+    k_poll_signal_raise(&wait_signal, 0);
+}
+
+void mp_hal_wait_sem(struct k_sem *sem, uint32_t timeout_ms) {
+    mp_uint_t t0 = mp_hal_ticks_ms();
+    if (sem) {
+        k_poll_event_init(&wait_events[1], K_POLL_TYPE_SEM_AVAILABLE, K_POLL_MODE_NOTIFY_ONLY, sem);
+    }
+    for (;;) {
+        k_timeout_t wait;
+        if (timeout_ms == (uint32_t)-1) {
+            wait = K_FOREVER;
+        } else {
+            uint32_t dt = mp_hal_ticks_ms() - t0;
+            if (dt >= timeout_ms) {
+                return;
+            }
+            wait = K_MSEC(timeout_ms - dt);
+        }
+        k_poll(wait_events, sem ? 2 : 1, wait);
+        if (wait_events[0].state == K_POLL_STATE_SIGNALED) {
+            wait_events[0].signal->signaled = 0;
+            wait_events[0].state = K_POLL_STATE_NOT_READY;
+            mp_handle_pending(true);
+        } else if (sem && wait_events[1].state == K_POLL_STATE_SEM_AVAILABLE) {
+            wait_events[1].state = K_POLL_STATE_NOT_READY;
+            return;
+        }
+    }
+}
diff --git a/ports/zephyr/mphalport.h b/ports/zephyr/mphalport.h
index b3154b649bbda..63a18e138866a 100644
--- a/ports/zephyr/mphalport.h
+++ b/ports/zephyr/mphalport.h
@@ -1,6 +1,9 @@
 #include <zephyr.h>
 #include "lib/utils/interrupt_char.h"
 
+void mp_hal_init(void);
+void mp_hal_wait_sem(struct k_sem *sem, uint32_t timeout_ms);
+
 static inline mp_uint_t mp_hal_ticks_us(void) {
     return k_cyc_to_ns_floor64(k_cycle_get_32()) / 1000;
 }
@@ -21,7 +24,7 @@ static inline void mp_hal_delay_us(mp_uint_t delay) {
 }
 
 static inline void mp_hal_delay_ms(mp_uint_t delay) {
-    k_msleep(delay);
+    mp_hal_wait_sem(NULL, delay);
 }
 
 static inline uint64_t mp_hal_time_ns(void) {
diff --git a/ports/zephyr/prj.conf b/ports/zephyr/prj.conf
index c9c2e96da9beb..9e855036d2b84 100644
--- a/ports/zephyr/prj.conf
+++ b/ports/zephyr/prj.conf
@@ -13,6 +13,7 @@ CONFIG_CONSOLE_PUTCHAR_BUFSIZE=128
 CONFIG_NEWLIB_LIBC=y
 CONFIG_FPU=y
 CONFIG_MAIN_STACK_SIZE=4736
+CONFIG_POLL=y
 
 # Enable sensor subsystem (doesn't add code if not used).
 # Specific sensors should be enabled per-board.
diff --git a/ports/zephyr/prj_minimal.conf b/ports/zephyr/prj_minimal.conf
index 8b2104925ab67..806e26af77841 100644
--- a/ports/zephyr/prj_minimal.conf
+++ b/ports/zephyr/prj_minimal.conf
@@ -1,6 +1,7 @@
 CONFIG_NEWLIB_LIBC=y
 CONFIG_FPU=y
 CONFIG_MAIN_STACK_SIZE=4096
+CONFIG_POLL=y
 
 CONFIG_UART_INTERRUPT_DRIVEN=y
 CONFIG_CONSOLE_SUBSYS=y
diff --git a/ports/zephyr/src/zephyr_getchar.c b/ports/zephyr/src/zephyr_getchar.c
index d75a8a76e3d69..95d0b49959326 100644
--- a/ports/zephyr/src/zephyr_getchar.c
+++ b/ports/zephyr/src/zephyr_getchar.c
@@ -22,6 +22,8 @@
 
 extern int mp_interrupt_char;
 void mp_sched_keyboard_interrupt(void);
+void mp_hal_signal_event(void);
+void mp_hal_wait_sem(struct k_sem *sem, uint32_t timeout_ms);
 
 static struct k_sem uart_sem;
 #define UART_BUFSIZE 256
@@ -36,6 +38,7 @@ static int console_irq_input_hook(uint8_t ch)
         return 1;
     }
     if (ch == mp_interrupt_char) {
+        mp_hal_signal_event();
         mp_sched_keyboard_interrupt();
         return 1;
     } else {
@@ -49,6 +52,7 @@ static int console_irq_input_hook(uint8_t ch)
 }
 
 uint8_t zephyr_getchar(void) {
+    mp_hal_wait_sem(&uart_sem, -1);
     k_sem_take(&uart_sem, K_FOREVER);
     unsigned int key = irq_lock();
     uint8_t c = uart_ringbuf[i_get++];

From b46a033e25eef64b8ef52a8408f99b666d32daae Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 26 Apr 2021 00:36:27 +1000
Subject: [PATCH 0797/3533] zephyr/modmachine: Add machine.idle().

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/zephyr/modmachine.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/ports/zephyr/modmachine.c b/ports/zephyr/modmachine.c
index 107895bea0e42..4353083eebd8f 100644
--- a/ports/zephyr/modmachine.c
+++ b/ports/zephyr/modmachine.c
@@ -53,12 +53,19 @@ STATIC mp_obj_t machine_reset_cause(void) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_0(machine_reset_cause_obj, machine_reset_cause);
 
+STATIC mp_obj_t machine_idle(void) {
+    k_yield();
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(machine_idle_obj, machine_idle);
+
 STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_umachine) },
     #ifdef CONFIG_REBOOT
     { MP_ROM_QSTR(MP_QSTR_reset), MP_ROM_PTR(&machine_reset_obj) },
     #endif
     { MP_ROM_QSTR(MP_QSTR_reset_cause), MP_ROM_PTR(&machine_reset_cause_obj) },
+    { MP_ROM_QSTR(MP_QSTR_idle), MP_ROM_PTR(&machine_idle_obj) },
 
     #if MICROPY_PY_MACHINE_I2C
     { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&machine_hard_i2c_type) },

From 888664130c6605f333a6901e821589dee43f6ebb Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 28 Apr 2021 11:12:14 +1000
Subject: [PATCH 0798/3533] zephyr/boards: Add config for nucleo_wb55rg board.

This board does not work with CONFIG_NETWORKING enabled.  And
CONFIG_CONSOLE_SUBSYS is enabled so that ctrl-C works.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/zephyr/boards/nucleo_wb55rg.conf | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 ports/zephyr/boards/nucleo_wb55rg.conf

diff --git a/ports/zephyr/boards/nucleo_wb55rg.conf b/ports/zephyr/boards/nucleo_wb55rg.conf
new file mode 100644
index 0000000000000..369dabddebf20
--- /dev/null
+++ b/ports/zephyr/boards/nucleo_wb55rg.conf
@@ -0,0 +1,2 @@
+CONFIG_CONSOLE_SUBSYS=n
+CONFIG_NETWORKING=n

From 76dab3bf31617e707a874a6c0dfc49af97640980 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 30 Apr 2021 10:12:04 +1000
Subject: [PATCH 0799/3533] tests/run-multitests.py: Provide some convenient
 serial device shorcuts.

It's now possible to specify a device serial port using shorcuts like:

    $ ./run-multitests.py -i pyb:a0 -i pyb:u1 multi_bluetooth/*.py

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/run-multitests.py | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/tests/run-multitests.py b/tests/run-multitests.py
index cdb2730edabbd..3163a48e63d2b 100755
--- a/tests/run-multitests.py
+++ b/tests/run-multitests.py
@@ -160,7 +160,17 @@ def wait_finished(self):
 
 
 class PyInstancePyboard(PyInstance):
+    @staticmethod
+    def map_device_shortcut(device):
+        if device[0] == "a" and device[1:].isdigit():
+            return "/dev/ttyACM" + device[1:]
+        elif device[0] == "u" and device[1:].isdigit():
+            return "/dev/ttyUSB" + device[1:]
+        else:
+            return device
+
     def __init__(self, device):
+        device = self.map_device_shortcut(device)
         self.device = device
         self.pyb = pyboard.Pyboard(device)
         self.pyb.enter_raw_repl()

From 1d9528210b8a29be7e799be37224706633f7a4d5 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 10 Mar 2021 23:32:59 +1100
Subject: [PATCH 0800/3533] tests/multi_bluetooth: Add performance test for
 gatt char writes.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/multi_bluetooth/perf_gatt_char_write.py | 151 ++++++++++++++++++
 .../perf_gatt_char_write.py.exp               |  24 +++
 2 files changed, 175 insertions(+)
 create mode 100644 tests/multi_bluetooth/perf_gatt_char_write.py
 create mode 100644 tests/multi_bluetooth/perf_gatt_char_write.py.exp

diff --git a/tests/multi_bluetooth/perf_gatt_char_write.py b/tests/multi_bluetooth/perf_gatt_char_write.py
new file mode 100644
index 0000000000000..00607f0090121
--- /dev/null
+++ b/tests/multi_bluetooth/perf_gatt_char_write.py
@@ -0,0 +1,151 @@
+# Write characteristic from central to peripheral and time data rate.
+
+from micropython import const
+import time, machine, bluetooth
+
+TIMEOUT_MS = 2000
+
+_IRQ_CENTRAL_CONNECT = const(1)
+_IRQ_CENTRAL_DISCONNECT = const(2)
+_IRQ_GATTS_WRITE = const(3)
+_IRQ_PERIPHERAL_CONNECT = const(7)
+_IRQ_PERIPHERAL_DISCONNECT = const(8)
+_IRQ_GATTC_CHARACTERISTIC_RESULT = const(11)
+_IRQ_GATTC_CHARACTERISTIC_DONE = const(12)
+_IRQ_GATTC_WRITE_DONE = const(17)
+_IRQ_MTU_EXCHANGED = const(21)
+
+# How long to run the test for.
+_NUM_NOTIFICATIONS = const(40)
+_MTU_SIZE = const(131)
+_CHAR_SIZE = const(_MTU_SIZE - 3)
+
+SERVICE_UUID = bluetooth.UUID("A5A5A5A5-FFFF-9999-1111-5A5A5A5A5A5A")
+CHAR_UUID = bluetooth.UUID("00000000-1111-2222-3333-444444444444")
+CHAR = (CHAR_UUID, bluetooth.FLAG_WRITE | bluetooth.FLAG_WRITE_NO_RESPONSE)
+SERVICE = (SERVICE_UUID, (CHAR,))
+SERVICES = (SERVICE,)
+
+packet_sequence = 0
+waiting_events = {}
+
+
+def irq(event, data):
+    if event == _IRQ_CENTRAL_CONNECT:
+        waiting_events[event] = data[0]
+    elif event == _IRQ_PERIPHERAL_CONNECT:
+        waiting_events[event] = data[0]
+    elif event == _IRQ_GATTS_WRITE:
+        global packet_sequence
+        conn_handle, attr_handle = data
+        data = ble.gatts_read(attr_handle)
+        if not (data[0] == packet_sequence and data[-1] == (256 - packet_sequence) & 0xFF):
+            print("_IRQ_GATTS_WRITE data invalid:", packet_sequence, data)
+        elif packet_sequence % 10 == 0:
+            print("_IRQ_GATTS_WRITE", packet_sequence)
+        packet_sequence += 1
+    elif event == _IRQ_GATTC_CHARACTERISTIC_RESULT:
+        # conn_handle, def_handle, value_handle, properties, uuid = data
+        if data[-1] == CHAR_UUID:
+            waiting_events[event] = data[2]
+        else:
+            return
+    elif event == _IRQ_MTU_EXCHANGED:
+        # ATT MTU exchange complete (either initiated by us or the remote device).
+        conn_handle, mtu = data
+        print("_IRQ_MTU_EXCHANGED:", mtu)
+
+    if event not in waiting_events:
+        waiting_events[event] = None
+
+
+def wait_for_event(event, timeout_ms):
+    t0 = time.ticks_ms()
+    while time.ticks_diff(time.ticks_ms(), t0) < timeout_ms:
+        if event in waiting_events:
+            return waiting_events.pop(event)
+        machine.idle()
+    raise ValueError("Timeout waiting for {}".format(event))
+
+
+# Acting in peripheral role.
+def instance0():
+    multitest.globals(BDADDR=ble.config("mac"))
+    ((char_handle,),) = ble.gatts_register_services(SERVICES)
+    ble.gatts_set_buffer(char_handle, _CHAR_SIZE)
+    print("gap_advertise")
+    ble.gap_advertise(20_000, b"\x02\x01\x06\x04\xffMPY")
+    multitest.next()
+    try:
+        # Wait for central to connect to us.
+        conn_handle = wait_for_event(_IRQ_CENTRAL_CONNECT, TIMEOUT_MS)
+        # Wait for central to disconnect us.
+        wait_for_event(_IRQ_CENTRAL_DISCONNECT, 30000)
+        print("final packet_sequence:", packet_sequence)
+    finally:
+        ble.active(0)
+
+
+# Acting in central role.
+def instance1():
+    global packet_sequence
+    ((char_handle,),) = ble.gatts_register_services(SERVICES)
+    multitest.next()
+    try:
+        # Connect to peripheral and then disconnect.
+        print("gap_connect")
+        ble.config(mtu=_MTU_SIZE)
+        ble.gap_connect(*BDADDR)
+        conn_handle = wait_for_event(_IRQ_PERIPHERAL_CONNECT, TIMEOUT_MS)
+        ble.gattc_exchange_mtu(conn_handle)
+
+        # Discover characteristics.
+        ble.gattc_discover_characteristics(conn_handle, 1, 65535)
+        value_handle = wait_for_event(_IRQ_GATTC_CHARACTERISTIC_RESULT, TIMEOUT_MS)
+        wait_for_event(_IRQ_GATTC_CHARACTERISTIC_DONE, TIMEOUT_MS)
+
+        # Send data!
+        data = bytearray(ord("A") + (i % 64) for i in range(_CHAR_SIZE))
+        for mode in (0, 1):
+            ticks_start = time.ticks_ms()
+            for i in range(_NUM_NOTIFICATIONS):
+                data[0] = packet_sequence
+                data[-1] = 256 - packet_sequence
+                if packet_sequence % 10 == 0:
+                    print("gattc_write", packet_sequence)
+                if mode == 0:
+                    while True:
+                        try:
+                            ble.gattc_write(conn_handle, value_handle, data, mode)
+                            break
+                        except OSError:
+                            pass
+                else:
+                    ble.gattc_write(conn_handle, value_handle, data, mode)
+                    wait_for_event(_IRQ_GATTC_WRITE_DONE, TIMEOUT_MS)
+                packet_sequence += 1
+
+            ticks_end = time.ticks_ms()
+            ticks_total = time.ticks_diff(ticks_end, ticks_start)
+
+            print(
+                "Did {} writes in {} ms. {} ms/write, {} bytes/sec".format(
+                    _NUM_NOTIFICATIONS,
+                    ticks_total,
+                    ticks_total / _NUM_NOTIFICATIONS,
+                    _NUM_NOTIFICATIONS * len(data) * 1000 // ticks_total,
+                )
+            )
+
+            time.sleep_ms(100)
+
+        # DIsconnect the peripheral.
+        print("gap_disconnect:", ble.gap_disconnect(conn_handle))
+        wait_for_event(_IRQ_PERIPHERAL_DISCONNECT, 20000)
+    finally:
+        ble.active(0)
+
+
+ble = bluetooth.BLE()
+ble.active(1)
+ble.irq(irq)
diff --git a/tests/multi_bluetooth/perf_gatt_char_write.py.exp b/tests/multi_bluetooth/perf_gatt_char_write.py.exp
new file mode 100644
index 0000000000000..4dda5e04f0920
--- /dev/null
+++ b/tests/multi_bluetooth/perf_gatt_char_write.py.exp
@@ -0,0 +1,24 @@
+--- instance0 ---
+gap_advertise
+_IRQ_MTU_EXCHANGED: 131
+_IRQ_GATTS_WRITE 0
+_IRQ_GATTS_WRITE 10
+_IRQ_GATTS_WRITE 20
+_IRQ_GATTS_WRITE 30
+_IRQ_GATTS_WRITE 40
+_IRQ_GATTS_WRITE 50
+_IRQ_GATTS_WRITE 60
+_IRQ_GATTS_WRITE 70
+final packet_sequence: 80
+--- instance1 ---
+gap_connect
+_IRQ_MTU_EXCHANGED: 131
+gattc_write 0
+gattc_write 10
+gattc_write 20
+gattc_write 30
+gattc_write 40
+gattc_write 50
+gattc_write 60
+gattc_write 70
+gap_disconnect: True

From 6b7c8d3e7283a6c94687ba7dcb8beb94c2dc9eef Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 30 Apr 2021 16:26:42 +1000
Subject: [PATCH 0801/3533] py/runtime: Remove commented-out code from
 mp_deinit().

These commented-out lines of code have been unused for a long time, so
remove them to avoid confusion as to why they are there.

mp_obj_dict_free() never existed, this line was converted from
mp_map_deinit() and commented out as soon as it was added.  The call to
mp_map_deinit(mp_loaded_modules_map) was commented in
1a1d11fa32ba043d22995d28cbc039cfa5f3cc46.

Fixes issue #3507.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/runtime.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/py/runtime.c b/py/runtime.c
index 18a7c8565da9b..1ca0702e19fb9 100644
--- a/py/runtime.c
+++ b/py/runtime.c
@@ -155,9 +155,6 @@ void mp_deinit(void) {
     #ifdef MICROPY_PORT_DEINIT_FUNC
     MICROPY_PORT_DEINIT_FUNC;
     #endif
-
-    // mp_obj_dict_free(&dict_main);
-    // mp_map_deinit(&MP_STATE_VM(mp_loaded_modules_map));
 }
 
 mp_obj_t mp_load_name(qstr qst) {

From 9e1b25a99e9107619c6ed607c730ea2869582799 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 30 Apr 2021 16:42:51 +1000
Subject: [PATCH 0802/3533] docs/library/machine: Specify initial machine.PWM
 class.

This adds an initial specification of the machine.PWM class, to provide a
way to generate PWM output that is portable across the different ports.
Such functionality may already be available in one way or another (eg
through a Timer object), but because configuring PWM via a Timer is very
port-specific, and because it's a common thing to do, it's beneficial to
have a top-level construct for it.

The specification in this commit aims to provide core functionality in a
minimal way.  It also somewhat matches most existing ad-hoc implementations
of machine.PWM.

See discussion in #2283 and #4237.

Signed-off-by: Damien George <damien@micropython.org>
---
 docs/library/machine.PWM.rst | 79 ++++++++++++++++++++++++++++++++++++
 docs/library/machine.rst     |  1 +
 2 files changed, 80 insertions(+)
 create mode 100644 docs/library/machine.PWM.rst

diff --git a/docs/library/machine.PWM.rst b/docs/library/machine.PWM.rst
new file mode 100644
index 0000000000000..f2273d8b453da
--- /dev/null
+++ b/docs/library/machine.PWM.rst
@@ -0,0 +1,79 @@
+.. currentmodule:: machine
+.. _machine.PWM:
+
+class PWM -- pulse width modulation
+===================================
+
+This class provides pulse width modulation output.
+
+Example usage::
+
+    from machine import PWM
+
+    pwm = PWM(pin)          # create a PWM object on a pin
+    pwm.duty_u16(32768)     # set duty to 50%
+
+    # reinitialise with a period of 200us, duty of 5us
+    pwm.init(freq=5000, duty_ns=5000)
+
+    pwm.duty_ns(3000)       # set pulse width to 3us
+
+    pwm.deinit()
+
+Constructors
+------------
+
+.. class:: PWM(dest, \*, freq, duty_u16, duty_ns)
+
+   Construct and return a new PWM object using the following parameters:
+
+      - *dest* is the entity on which the PWM is output, which is usually a
+        :ref:`machine.Pin <machine.Pin>` object, but a port may allow other values,
+        like integers.
+      - *freq* should be an integer which sets the frequency in Hz for the
+        PWM cycle.
+      - *duty_u16* sets the duty cycle as a ratio ``duty_u16 / 65535``.
+      - *duty_ns* sets the pulse width in nanoseconds.
+
+   Setting *freq* may affect other PWM objects if the objects share the same
+   underlying PWM generator (this is hardware specific).
+   Only one of *duty_u16* and *duty_ns* should be specified at a time.
+
+Methods
+-------
+
+.. method:: PWM.init(\*, freq, duty_u16, duty_ns)
+
+   Modify settings for the PWM object.  See the above constructor for details
+   about the parameters.
+
+.. method:: PWM.deinit()
+
+   Disable the PWM output.
+
+.. method:: PWM.freq([value])
+
+   Get or set the current frequency of the PWM output.
+
+   With no arguments the frequency in Hz is returned.
+
+   With a single *value* argument the frequency is set to that value in Hz.  The
+   method may raise a ``ValueError`` if the frequency is outside the valid range.
+
+.. method:: PWM.duty_u16([value])
+
+   Get or set the current duty cycle of the PWM output, as an unsigned 16-bit
+   value in the range 0 to 65535 inclusive.
+
+   With no arguments the duty cycle is returned.
+
+   With a single *value* argument the duty cycle is set to that value, measured
+   as the ratio ``value / 65535``.
+
+.. method:: PWM.duty_ns([value])
+
+   Get or set the current pulse width of the PWM output, as a value in nanoseconds.
+
+   With no arguments the pulse width in nanoseconds is returned.
+
+   With a single *value* argument the pulse width is set to that value.
diff --git a/docs/library/machine.rst b/docs/library/machine.rst
index 18dc6f2afaa59..5076dc30e059f 100644
--- a/docs/library/machine.rst
+++ b/docs/library/machine.rst
@@ -167,6 +167,7 @@ Classes
    machine.Pin.rst
    machine.Signal.rst
    machine.ADC.rst
+   machine.PWM.rst
    machine.UART.rst
    machine.SPI.rst
    machine.I2C.rst

From dd5c831a0b0c960b638109f1886edc10178f51a1 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 30 Apr 2021 16:55:55 +1000
Subject: [PATCH 0803/3533] docs/library/machine: Add machine.bootloader docs.

This is provide by a few ports now, and is very useful.

Signed-off-by: Damien George <damien@micropython.org>
---
 docs/library/machine.rst | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/docs/library/machine.rst b/docs/library/machine.rst
index 5076dc30e059f..f831049f88e92 100644
--- a/docs/library/machine.rst
+++ b/docs/library/machine.rst
@@ -37,6 +37,14 @@ Reset related functions
 
    Get the reset cause. See :ref:`constants <machine_constants>` for the possible return values.
 
+.. function:: bootloader([value])
+
+   Reset the device and enter its bootloader.  This is typically used to put the
+   device into a state where it can be programmed with new firmware.
+
+   Some ports support passing in an optional *value* argument which can control
+   which bootloader to enter, what to pass to it, or other things.
+
 Interrupt related functions
 ---------------------------
 

From aa061ae391f2a8fbb16ace31ae0e4ae35b6ad5e9 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 30 Apr 2021 16:48:29 +1000
Subject: [PATCH 0804/3533] py/scheduler: Add missing
 MICROPY_WRAP_MP_SCHED_EXCEPTION usage.

This was missed in commit 7cbf826a9575e18ce1b7fe11b0f0997509153260.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/scheduler.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/py/scheduler.c b/py/scheduler.c
index 947510c68b1c7..0671a34a8cad9 100644
--- a/py/scheduler.c
+++ b/py/scheduler.c
@@ -28,7 +28,7 @@
 
 #include "py/runtime.h"
 
-void mp_sched_exception(mp_obj_t exc) {
+void MICROPY_WRAP_MP_SCHED_EXCEPTION(mp_sched_exception)(mp_obj_t exc) {
     MP_STATE_VM(mp_pending_exception) = exc;
     #if MICROPY_ENABLE_SCHEDULER
     if (MP_STATE_VM(sched_state) == MP_SCHED_IDLE) {

From 1f1a54d0b1371efcfec6ca1b03d21b07a908c70d Mon Sep 17 00:00:00 2001
From: Kathryn Lingel <kathryn@lingel.net>
Date: Mon, 6 May 2019 12:16:29 -0700
Subject: [PATCH 0805/3533] py/repl: Filter private methods from tab
 completion.

Anything beginning with "_" will now only be tab-completed if there is
already a partial match for such an entry.  In other words, entering
foo.<tab> will no longer complete/list anything beginning with "_".

Originally at adafruit#1850

Signed-off-by: Kathryn Lingel <kathryn@lingel.net>
---
 py/repl.c                        |  5 +++++
 tests/unix/extra_coverage.py.exp | 10 +++++-----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/py/repl.c b/py/repl.c
index c758fc067b2e7..3b1837031b594 100644
--- a/py/repl.c
+++ b/py/repl.c
@@ -197,6 +197,11 @@ size_t mp_repl_autocomplete(const char *str, size_t len, const mp_print_t *print
             for (qstr q = MP_QSTR_ + 1; q < nqstr; ++q) {
                 size_t d_len;
                 const char *d_str = (const char *)qstr_data(q, &d_len);
+                // special case; filter out words that begin with underscore
+                // unless there's already a partial match
+                if (s_len == 0 && d_str[0] == '_') {
+                    continue;
+                }
                 if (s_len <= d_len && strncmp(s_start, d_str, s_len) == 0) {
                     mp_load_method_protected(obj, q, dest, true);
                     if (dest[0] != MP_OBJ_NULL) {
diff --git a/tests/unix/extra_coverage.py.exp b/tests/unix/extra_coverage.py.exp
index d97de2c0ef8b3..ab4d977741122 100644
--- a/tests/unix/extra_coverage.py.exp
+++ b/tests/unix/extra_coverage.py.exp
@@ -28,11 +28,11 @@ RuntimeError:
 # repl
 ame__
 
-__class__       __name__        argv            atexit
-byteorder       exc_info        exit            getsizeof
-implementation  maxsize         modules         path
-platform        print_exception                 stderr
-stdin           stdout          version         version_info
+argv            atexit          byteorder       exc_info
+exit            getsizeof       implementation  maxsize
+modules         path            platform        print_exception
+stderr          stdin           stdout          version
+version_info
 ementation
 # attrtuple
 (start=1, stop=2, step=3)

From befbff31b73d5373b5933a3762a3a3c6e871e8da Mon Sep 17 00:00:00 2001
From: scottbelden <scottabelden@gmail.com>
Date: Tue, 7 May 2019 13:55:20 -0400
Subject: [PATCH 0806/3533] py/repl: Enter four spaces when there are no
 matches.

Originally at adafruit#1859

Signed-off-by: scottbelden <scottabelden@gmail.com>
---
 py/repl.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/py/repl.c b/py/repl.c
index 3b1837031b594..a8ae1d0695f81 100644
--- a/py/repl.c
+++ b/py/repl.c
@@ -228,6 +228,10 @@ size_t mp_repl_autocomplete(const char *str, size_t len, const mp_print_t *print
 
             // nothing found
             if (q_first == 0) {
+                if (s_len == 0) {
+                    *compl_str = "    ";
+                    return 4;
+                }
                 // If there're no better alternatives, and if it's first word
                 // in the line, try to complete "import".
                 if (s_start == org_str) {

From f85ea8d4fe12251100989287f1cfe14af8650217 Mon Sep 17 00:00:00 2001
From: Artyom Skrobov <tyomitch@gmail.com>
Date: Wed, 7 Apr 2021 13:09:39 -0400
Subject: [PATCH 0807/3533] py/repl: Refactor autocomplete to reduce nesting.

Originally at adafruit#4548

Signed-off-by: Artyom Skrobov <tyomitch@gmail.com>
---
 py/repl.c | 203 +++++++++++++++++++++++++++---------------------------
 1 file changed, 103 insertions(+), 100 deletions(-)

diff --git a/py/repl.c b/py/repl.c
index a8ae1d0695f81..b5ff145197d18 100644
--- a/py/repl.c
+++ b/py/repl.c
@@ -161,131 +161,134 @@ size_t mp_repl_autocomplete(const char *str, size_t len, const mp_print_t *print
     mp_obj_t obj = MP_OBJ_FROM_PTR(&mp_module___main__);
     mp_obj_t dest[2];
 
+    const char *s_start;
+    size_t s_len;
+
     for (;;) {
         // get next word in string to complete
-        const char *s_start = str;
+        s_start = str;
         while (str < top && *str != '.') {
             ++str;
         }
-        size_t s_len = str - s_start;
+        s_len = str - s_start;
 
-        if (str < top) {
-            // a complete word, lookup in current object
-            qstr q = qstr_find_strn(s_start, s_len);
-            if (q == MP_QSTRnull) {
-                // lookup will fail
-                return 0;
-            }
-            mp_load_method_protected(obj, q, dest, true);
-            obj = dest[0]; // attribute, method, or MP_OBJ_NULL if nothing found
+        if (str == top) {
+            // end of string, do completion on this partial name
+            break;
+        }
 
-            if (obj == MP_OBJ_NULL) {
-                // lookup failed
-                return 0;
-            }
+        // a complete word, lookup in current object
+        qstr q = qstr_find_strn(s_start, s_len);
+        if (q == MP_QSTRnull) {
+            // lookup will fail
+            return 0;
+        }
+        mp_load_method_protected(obj, q, dest, true);
+        obj = dest[0]; // attribute, method, or MP_OBJ_NULL if nothing found
 
-            // skip '.' to move to next word
-            ++str;
+        if (obj == MP_OBJ_NULL) {
+            // lookup failed
+            return 0;
+        }
 
-        } else {
-            // end of string, do completion on this partial name
+        // skip '.' to move to next word
+        ++str;
+    }
 
-            // look for matches
-            const char *match_str = NULL;
-            size_t match_len = 0;
-            qstr q_first = 0, q_last = 0;
-            for (qstr q = MP_QSTR_ + 1; q < nqstr; ++q) {
-                size_t d_len;
-                const char *d_str = (const char *)qstr_data(q, &d_len);
-                // special case; filter out words that begin with underscore
-                // unless there's already a partial match
-                if (s_len == 0 && d_str[0] == '_') {
-                    continue;
-                }
-                if (s_len <= d_len && strncmp(s_start, d_str, s_len) == 0) {
-                    mp_load_method_protected(obj, q, dest, true);
-                    if (dest[0] != MP_OBJ_NULL) {
-                        if (match_str == NULL) {
-                            match_str = d_str;
-                            match_len = d_len;
-                        } else {
-                            // search for longest common prefix of match_str and d_str
-                            // (assumes these strings are null-terminated)
-                            for (size_t j = s_len; j <= match_len && j <= d_len; ++j) {
-                                if (match_str[j] != d_str[j]) {
-                                    match_len = j;
-                                    break;
-                                }
-                            }
-                        }
-                        if (q_first == 0) {
-                            q_first = q;
+    // look for matches
+    const char *match_str = NULL;
+    size_t match_len = 0;
+    qstr q_first = 0, q_last = 0;
+    for (qstr q = MP_QSTR_ + 1; q < nqstr; ++q) {
+        size_t d_len;
+        const char *d_str = (const char *)qstr_data(q, &d_len);
+        // special case; filter out words that begin with underscore
+        // unless there's already a partial match
+        if (s_len == 0 && d_str[0] == '_') {
+            continue;
+        }
+        if (s_len <= d_len && strncmp(s_start, d_str, s_len) == 0) {
+            mp_load_method_protected(obj, q, dest, true);
+            if (dest[0] != MP_OBJ_NULL) {
+                if (match_str == NULL) {
+                    match_str = d_str;
+                    match_len = d_len;
+                } else {
+                    // search for longest common prefix of match_str and d_str
+                    // (assumes these strings are null-terminated)
+                    for (size_t j = s_len; j <= match_len && j <= d_len; ++j) {
+                        if (match_str[j] != d_str[j]) {
+                            match_len = j;
+                            break;
                         }
-                        q_last = q;
                     }
                 }
-            }
-
-            // nothing found
-            if (q_first == 0) {
-                if (s_len == 0) {
-                    *compl_str = "    ";
-                    return 4;
+                if (q_first == 0) {
+                    q_first = q;
                 }
-                // If there're no better alternatives, and if it's first word
-                // in the line, try to complete "import".
-                if (s_start == org_str) {
-                    static const char import_str[] = "import ";
-                    if (memcmp(s_start, import_str, s_len) == 0) {
-                        *compl_str = import_str + s_len;
-                        return sizeof(import_str) - 1 - s_len;
-                    }
-                }
-
-                return 0;
+                q_last = q;
             }
+        }
+    }
 
-            // 1 match found, or multiple matches with a common prefix
-            if (q_first == q_last || match_len > s_len) {
-                *compl_str = match_str + s_len;
-                return match_len - s_len;
+    // nothing found
+    if (q_first == 0) {
+        if (s_len == 0) {
+            *compl_str = "    ";
+            return 4;
+        }
+        // If there're no better alternatives, and if it's first word
+        // in the line, try to complete "import".
+        if (s_start == org_str) {
+            static const char import_str[] = "import ";
+            if (memcmp(s_start, import_str, s_len) == 0) {
+                *compl_str = import_str + s_len;
+                return sizeof(import_str) - 1 - s_len;
             }
+        }
 
-            // multiple matches found, print them out
+        return 0;
+    }
 
-            #define WORD_SLOT_LEN (16)
-            #define MAX_LINE_LEN  (4 * WORD_SLOT_LEN)
+    // 1 match found, or multiple matches with a common prefix
+    if (q_first == q_last || match_len > s_len) {
+        *compl_str = match_str + s_len;
+        return match_len - s_len;
+    }
 
-            int line_len = MAX_LINE_LEN; // force a newline for first word
-            for (qstr q = q_first; q <= q_last; ++q) {
-                size_t d_len;
-                const char *d_str = (const char *)qstr_data(q, &d_len);
-                if (s_len <= d_len && strncmp(s_start, d_str, s_len) == 0) {
-                    mp_load_method_protected(obj, q, dest, true);
-                    if (dest[0] != MP_OBJ_NULL) {
-                        int gap = (line_len + WORD_SLOT_LEN - 1) / WORD_SLOT_LEN * WORD_SLOT_LEN - line_len;
-                        if (gap < 2) {
-                            gap += WORD_SLOT_LEN;
-                        }
-                        if (line_len + gap + d_len <= MAX_LINE_LEN) {
-                            // TODO optimise printing of gap?
-                            for (int j = 0; j < gap; ++j) {
-                                mp_print_str(print, " ");
-                            }
-                            mp_print_str(print, d_str);
-                            line_len += gap + d_len;
-                        } else {
-                            mp_printf(print, "\n%s", d_str);
-                            line_len = d_len;
-                        }
+    // multiple matches found, print them out
+
+    #define WORD_SLOT_LEN (16)
+    #define MAX_LINE_LEN  (4 * WORD_SLOT_LEN)
+
+    int line_len = MAX_LINE_LEN; // force a newline for first word
+    for (qstr q = q_first; q <= q_last; ++q) {
+        size_t d_len;
+        const char *d_str = (const char *)qstr_data(q, &d_len);
+        if (s_len <= d_len && strncmp(s_start, d_str, s_len) == 0) {
+            mp_load_method_protected(obj, q, dest, true);
+            if (dest[0] != MP_OBJ_NULL) {
+                int gap = (line_len + WORD_SLOT_LEN - 1) / WORD_SLOT_LEN * WORD_SLOT_LEN - line_len;
+                if (gap < 2) {
+                    gap += WORD_SLOT_LEN;
+                }
+                if (line_len + gap + d_len <= MAX_LINE_LEN) {
+                    // TODO optimise printing of gap?
+                    for (int j = 0; j < gap; ++j) {
+                        mp_print_str(print, " ");
                     }
+                    mp_print_str(print, d_str);
+                    line_len += gap + d_len;
+                } else {
+                    mp_printf(print, "\n%s", d_str);
+                    line_len = d_len;
                 }
             }
-            mp_print_str(print, "\n");
-
-            return (size_t)(-1); // indicate many matches
         }
     }
+    mp_print_str(print, "\n");
+
+    return (size_t)(-1); // indicate many matches
 }
 
 #endif // MICROPY_HELPER_REPL

From 7556e01f14bb9f0ae32eff1d191985d302f1183e Mon Sep 17 00:00:00 2001
From: Artyom Skrobov <tyomitch@gmail.com>
Date: Sat, 3 Apr 2021 16:18:41 -0400
Subject: [PATCH 0808/3533] py/repl: Refactor autocomplete, extracting reusable
 parts.

Originally at adafruit#4548

Signed-off-by: Artyom Skrobov <tyomitch@gmail.com>
---
 py/repl.c | 152 ++++++++++++++++++++++++++++++------------------------
 1 file changed, 86 insertions(+), 66 deletions(-)

diff --git a/py/repl.c b/py/repl.c
index b5ff145197d18..c8bb715e90dfe 100644
--- a/py/repl.c
+++ b/py/repl.c
@@ -143,6 +143,87 @@ bool mp_repl_continue_with_input(const char *input) {
     return false;
 }
 
+STATIC bool test_qstr(mp_obj_t obj, qstr name) {
+    // try object member
+    mp_obj_t dest[2];
+    mp_load_method_protected(obj, name, dest, true);
+    return dest[0] != MP_OBJ_NULL;
+}
+
+STATIC const char *find_completions(const char *s_start, size_t s_len,
+    mp_obj_t obj, size_t *match_len, qstr *q_first, qstr *q_last) {
+
+    const char *match_str = NULL;
+    *match_len = 0;
+    *q_first = *q_last = 0;
+    size_t nqstr = QSTR_TOTAL();
+    for (qstr q = MP_QSTR_ + 1; q < nqstr; ++q) {
+        size_t d_len;
+        const char *d_str = (const char *)qstr_data(q, &d_len);
+        // special case; filter out words that begin with underscore
+        // unless there's already a partial match
+        if (s_len == 0 && d_str[0] == '_') {
+            continue;
+        }
+        if (s_len <= d_len && strncmp(s_start, d_str, s_len) == 0) {
+            if (test_qstr(obj, q)) {
+                if (match_str == NULL) {
+                    match_str = d_str;
+                    *match_len = d_len;
+                } else {
+                    // search for longest common prefix of match_str and d_str
+                    // (assumes these strings are null-terminated)
+                    for (size_t j = s_len; j <= *match_len && j <= d_len; ++j) {
+                        if (match_str[j] != d_str[j]) {
+                            *match_len = j;
+                            break;
+                        }
+                    }
+                }
+                if (*q_first == 0) {
+                    *q_first = q;
+                }
+                *q_last = q;
+            }
+        }
+    }
+    return match_str;
+}
+
+STATIC void print_completions(const mp_print_t *print,
+    const char *s_start, size_t s_len,
+    mp_obj_t obj, qstr q_first, qstr q_last) {
+
+    #define WORD_SLOT_LEN (16)
+    #define MAX_LINE_LEN  (4 * WORD_SLOT_LEN)
+
+    int line_len = MAX_LINE_LEN; // force a newline for first word
+    for (qstr q = q_first; q <= q_last; ++q) {
+        size_t d_len;
+        const char *d_str = (const char *)qstr_data(q, &d_len);
+        if (s_len <= d_len && strncmp(s_start, d_str, s_len) == 0) {
+            if (test_qstr(obj, q)) {
+                int gap = (line_len + WORD_SLOT_LEN - 1) / WORD_SLOT_LEN * WORD_SLOT_LEN - line_len;
+                if (gap < 2) {
+                    gap += WORD_SLOT_LEN;
+                }
+                if (line_len + gap + d_len <= MAX_LINE_LEN) {
+                    // TODO optimise printing of gap?
+                    for (int j = 0; j < gap; ++j) {
+                        mp_print_str(print, " ");
+                    }
+                    mp_print_str(print, d_str);
+                    line_len += gap + d_len;
+                } else {
+                    mp_printf(print, "\n%s", d_str);
+                    line_len = d_len;
+                }
+            }
+        }
+    }
+    mp_print_str(print, "\n");
+}
+
 size_t mp_repl_autocomplete(const char *str, size_t len, const mp_print_t *print, const char **compl_str) {
     // scan backwards to find start of "a.b.c" chain
     const char *org_str = str;
@@ -155,8 +236,6 @@ size_t mp_repl_autocomplete(const char *str, size_t len, const mp_print_t *print
         }
     }
 
-    size_t nqstr = QSTR_TOTAL();
-
     // begin search in outer global dict which is accessed from __main__
     mp_obj_t obj = MP_OBJ_FROM_PTR(&mp_module___main__);
     mp_obj_t dest[2];
@@ -196,40 +275,10 @@ size_t mp_repl_autocomplete(const char *str, size_t len, const mp_print_t *print
     }
 
     // look for matches
-    const char *match_str = NULL;
-    size_t match_len = 0;
-    qstr q_first = 0, q_last = 0;
-    for (qstr q = MP_QSTR_ + 1; q < nqstr; ++q) {
-        size_t d_len;
-        const char *d_str = (const char *)qstr_data(q, &d_len);
-        // special case; filter out words that begin with underscore
-        // unless there's already a partial match
-        if (s_len == 0 && d_str[0] == '_') {
-            continue;
-        }
-        if (s_len <= d_len && strncmp(s_start, d_str, s_len) == 0) {
-            mp_load_method_protected(obj, q, dest, true);
-            if (dest[0] != MP_OBJ_NULL) {
-                if (match_str == NULL) {
-                    match_str = d_str;
-                    match_len = d_len;
-                } else {
-                    // search for longest common prefix of match_str and d_str
-                    // (assumes these strings are null-terminated)
-                    for (size_t j = s_len; j <= match_len && j <= d_len; ++j) {
-                        if (match_str[j] != d_str[j]) {
-                            match_len = j;
-                            break;
-                        }
-                    }
-                }
-                if (q_first == 0) {
-                    q_first = q;
-                }
-                q_last = q;
-            }
-        }
-    }
+    size_t match_len;
+    qstr q_first, q_last;
+    const char *match_str =
+        find_completions(s_start, s_len, obj, &match_len, &q_first, &q_last);
 
     // nothing found
     if (q_first == 0) {
@@ -257,36 +306,7 @@ size_t mp_repl_autocomplete(const char *str, size_t len, const mp_print_t *print
     }
 
     // multiple matches found, print them out
-
-    #define WORD_SLOT_LEN (16)
-    #define MAX_LINE_LEN  (4 * WORD_SLOT_LEN)
-
-    int line_len = MAX_LINE_LEN; // force a newline for first word
-    for (qstr q = q_first; q <= q_last; ++q) {
-        size_t d_len;
-        const char *d_str = (const char *)qstr_data(q, &d_len);
-        if (s_len <= d_len && strncmp(s_start, d_str, s_len) == 0) {
-            mp_load_method_protected(obj, q, dest, true);
-            if (dest[0] != MP_OBJ_NULL) {
-                int gap = (line_len + WORD_SLOT_LEN - 1) / WORD_SLOT_LEN * WORD_SLOT_LEN - line_len;
-                if (gap < 2) {
-                    gap += WORD_SLOT_LEN;
-                }
-                if (line_len + gap + d_len <= MAX_LINE_LEN) {
-                    // TODO optimise printing of gap?
-                    for (int j = 0; j < gap; ++j) {
-                        mp_print_str(print, " ");
-                    }
-                    mp_print_str(print, d_str);
-                    line_len += gap + d_len;
-                } else {
-                    mp_printf(print, "\n%s", d_str);
-                    line_len = d_len;
-                }
-            }
-        }
-    }
-    mp_print_str(print, "\n");
+    print_completions(print, s_start, s_len, obj, q_first, q_last);
 
     return (size_t)(-1); // indicate many matches
 }

From ca35c0059c8895839809f3e11873f96fc8cb4ab5 Mon Sep 17 00:00:00 2001
From: Artyom Skrobov <tyomitch@gmail.com>
Date: Sat, 3 Apr 2021 16:56:02 -0400
Subject: [PATCH 0809/3533] py/repl: Autocomplete builtin modules.

Doing "import <tab>" will now complete/list built-in modules.

Originally at adafruit#4548 and adafruit#4608

Signed-off-by: Artyom Skrobov <tyomitch@gmail.com>
---
 ports/unix/coverage.c            |  7 +++++++
 py/repl.c                        | 34 +++++++++++++++++++++-----------
 tests/unix/extra_coverage.py.exp | 14 +++++++++++++
 3 files changed, 43 insertions(+), 12 deletions(-)

diff --git a/ports/unix/coverage.c b/ports/unix/coverage.c
index 220666e381d6b..d5b5d8dd767fe 100644
--- a/ports/unix/coverage.c
+++ b/ports/unix/coverage.c
@@ -268,6 +268,13 @@ STATIC mp_obj_t extra_coverage(void) {
         size_t len = mp_repl_autocomplete("__n", 3, &mp_plat_print, &str);
         mp_printf(&mp_plat_print, "%.*s\n", (int)len, str);
 
+        len = mp_repl_autocomplete("i", 1,  &mp_plat_print, &str);
+        mp_printf(&mp_plat_print, "%.*s\n", (int)len, str);
+        mp_repl_autocomplete("import ", 7,  &mp_plat_print, &str);
+        len = mp_repl_autocomplete("import ut", 9,  &mp_plat_print, &str);
+        mp_printf(&mp_plat_print, "%.*s\n", (int)len, str);
+        mp_repl_autocomplete("import utime", 12,  &mp_plat_print, &str);
+
         mp_store_global(MP_QSTR_sys, mp_import_name(MP_QSTR_sys, mp_const_none, MP_OBJ_NEW_SMALL_INT(0)));
         mp_repl_autocomplete("sys.", 4, &mp_plat_print, &str);
         len = mp_repl_autocomplete("sys.impl", 8, &mp_plat_print, &str);
diff --git a/py/repl.c b/py/repl.c
index c8bb715e90dfe..57bc21eff09f6 100644
--- a/py/repl.c
+++ b/py/repl.c
@@ -26,6 +26,7 @@
 
 #include <string.h>
 #include "py/obj.h"
+#include "py/objmodule.h"
 #include "py/runtime.h"
 #include "py/builtin.h"
 #include "py/repl.h"
@@ -144,10 +145,16 @@ bool mp_repl_continue_with_input(const char *input) {
 }
 
 STATIC bool test_qstr(mp_obj_t obj, qstr name) {
-    // try object member
-    mp_obj_t dest[2];
-    mp_load_method_protected(obj, name, dest, true);
-    return dest[0] != MP_OBJ_NULL;
+    if (obj) {
+        // try object member
+        mp_obj_t dest[2];
+        mp_load_method_protected(obj, name, dest, true);
+        return dest[0] != MP_OBJ_NULL;
+    } else {
+        // try builtin module
+        return mp_map_lookup((mp_map_t *)&mp_builtin_module_map,
+            MP_OBJ_NEW_QSTR(name), MP_MAP_LOOKUP);
+    }
 }
 
 STATIC const char *find_completions(const char *s_start, size_t s_len,
@@ -274,6 +281,12 @@ size_t mp_repl_autocomplete(const char *str, size_t len, const mp_print_t *print
         ++str;
     }
 
+    // after "import", suggest built-in modules
+    static const char import_str[] = "import ";
+    if (len >= 7 && !memcmp(org_str, import_str, 7)) {
+        obj = MP_OBJ_NULL;
+    }
+
     // look for matches
     size_t match_len;
     qstr q_first, q_last;
@@ -282,21 +295,18 @@ size_t mp_repl_autocomplete(const char *str, size_t len, const mp_print_t *print
 
     // nothing found
     if (q_first == 0) {
-        if (s_len == 0) {
-            *compl_str = "    ";
-            return 4;
-        }
         // If there're no better alternatives, and if it's first word
         // in the line, try to complete "import".
-        if (s_start == org_str) {
-            static const char import_str[] = "import ";
+        if (s_start == org_str && s_len > 0) {
             if (memcmp(s_start, import_str, s_len) == 0) {
                 *compl_str = import_str + s_len;
                 return sizeof(import_str) - 1 - s_len;
             }
         }
-
-        return 0;
+        if (q_first == 0) {
+            *compl_str = "    ";
+            return s_len ? 0 : 4;
+        }
     }
 
     // 1 match found, or multiple matches with a common prefix
diff --git a/tests/unix/extra_coverage.py.exp b/tests/unix/extra_coverage.py.exp
index ab4d977741122..ea91813fc683f 100644
--- a/tests/unix/extra_coverage.py.exp
+++ b/tests/unix/extra_coverage.py.exp
@@ -27,6 +27,20 @@ RuntimeError:
 RuntimeError: 
 # repl
 ame__
+mport 
+
+builtins        micropython     _thread         _uasyncio
+btree           cexample        cmath           cppexample
+ffi             framebuf        gc              math
+termios         uarray          ubinascii       ucollections
+ucryptolib      uctypes         uerrno          uhashlib
+uheapq          uio             ujson           umachine
+uos             urandom         ure             uselect
+usocket         ussl            ustruct         usys
+utime           utimeq          uwebsocket      uzlib
+ime
+
+utime           utimeq
 
 argv            atexit          byteorder       exc_info
 exit            getsizeof       implementation  maxsize

From 3c918d0f5817a32acf28831017b0873771810f06 Mon Sep 17 00:00:00 2001
From: Jan Jurgen Griesfeller <jang@met.no>
Date: Thu, 29 Apr 2021 09:26:38 +0200
Subject: [PATCH 0810/3533] rp2/boards: Add board definition for SparkFun Thing
 Plus RP2040.

---
 ports/rp2/boards/SPARKFUN_THINGPLUS/mpconfigboard.cmake | 1 +
 ports/rp2/boards/SPARKFUN_THINGPLUS/mpconfigboard.h     | 3 +++
 2 files changed, 4 insertions(+)
 create mode 100644 ports/rp2/boards/SPARKFUN_THINGPLUS/mpconfigboard.cmake
 create mode 100644 ports/rp2/boards/SPARKFUN_THINGPLUS/mpconfigboard.h

diff --git a/ports/rp2/boards/SPARKFUN_THINGPLUS/mpconfigboard.cmake b/ports/rp2/boards/SPARKFUN_THINGPLUS/mpconfigboard.cmake
new file mode 100644
index 0000000000000..b9090bbcec433
--- /dev/null
+++ b/ports/rp2/boards/SPARKFUN_THINGPLUS/mpconfigboard.cmake
@@ -0,0 +1 @@
+# cmake file for SparkFun Thing Plus RP2040
diff --git a/ports/rp2/boards/SPARKFUN_THINGPLUS/mpconfigboard.h b/ports/rp2/boards/SPARKFUN_THINGPLUS/mpconfigboard.h
new file mode 100644
index 0000000000000..9749acd25adf8
--- /dev/null
+++ b/ports/rp2/boards/SPARKFUN_THINGPLUS/mpconfigboard.h
@@ -0,0 +1,3 @@
+// Board and hardware specific configuration
+#define MICROPY_HW_BOARD_NAME                   "SparkFun Thing Plus RP2040"
+#define MICROPY_HW_FLASH_STORAGE_BYTES          (15 * 1024 * 1024)

From d80a037e6bdcc78fbda76ce04e9ded41f335c635 Mon Sep 17 00:00:00 2001
From: Jan Jurgen Griesfeller <jang@met.no>
Date: Thu, 29 Apr 2021 11:26:38 +0200
Subject: [PATCH 0811/3533] rp2/boards: Add board definition for SparkFun Pro
 Micro board.

---
 ports/rp2/boards/SPARKFUN_PROMICRO/mpconfigboard.cmake | 1 +
 ports/rp2/boards/SPARKFUN_PROMICRO/mpconfigboard.h     | 3 +++
 2 files changed, 4 insertions(+)
 create mode 100644 ports/rp2/boards/SPARKFUN_PROMICRO/mpconfigboard.cmake
 create mode 100644 ports/rp2/boards/SPARKFUN_PROMICRO/mpconfigboard.h

diff --git a/ports/rp2/boards/SPARKFUN_PROMICRO/mpconfigboard.cmake b/ports/rp2/boards/SPARKFUN_PROMICRO/mpconfigboard.cmake
new file mode 100644
index 0000000000000..6ac8d7a44640f
--- /dev/null
+++ b/ports/rp2/boards/SPARKFUN_PROMICRO/mpconfigboard.cmake
@@ -0,0 +1 @@
+# cmake file for SparkFun Pro Micro RP2040
diff --git a/ports/rp2/boards/SPARKFUN_PROMICRO/mpconfigboard.h b/ports/rp2/boards/SPARKFUN_PROMICRO/mpconfigboard.h
new file mode 100644
index 0000000000000..d6c8007ba01e7
--- /dev/null
+++ b/ports/rp2/boards/SPARKFUN_PROMICRO/mpconfigboard.h
@@ -0,0 +1,3 @@
+// Board and hardware specific configuration
+#define MICROPY_HW_BOARD_NAME                   "SparkFun Pro Micro RP2040"
+#define MICROPY_HW_FLASH_STORAGE_BYTES          (15 * 1024 * 1024)

From 1e2f0d2809c5431c9baf1d6f447162013f58baac Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Thu, 29 Apr 2021 16:56:28 +0200
Subject: [PATCH 0812/3533] rp2/tusb_port: Add the device unique-id to the USB
 id.

The number shown in the USB id is now the same as that returned by
machine.unique_id().  All 8 bytes are inserted as hex into the USB id.  A
usb id at /dev/serial/by-id then looks like:

    usb-MicroPython_Board_in_FS_mode_e469b03567342f37-if00
---
 ports/rp2/tusb_port.c | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/ports/rp2/tusb_port.c b/ports/rp2/tusb_port.c
index 94856ab452702..874d837b9b5e5 100644
--- a/ports/rp2/tusb_port.c
+++ b/ports/rp2/tusb_port.c
@@ -25,6 +25,7 @@
  */
 
 #include "tusb.h"
+#include "pico/unique_id.h"
 
 #define USBD_VID (0x2E8A) // Raspberry Pi
 #define USBD_PID (0x0005) // RP2 MicroPython
@@ -77,7 +78,7 @@ static const uint8_t usbd_desc_cfg[USBD_DESC_LEN] = {
 static const char *const usbd_desc_str[] = {
     [USBD_STR_MANUF] = "MicroPython",
     [USBD_STR_PRODUCT] = "Board in FS mode",
-    [USBD_STR_SERIAL] = "000000000000", // TODO
+    [USBD_STR_SERIAL] = NULL, // generated dynamically
     [USBD_STR_CDC] = "Board CDC",
 };
 
@@ -102,9 +103,21 @@ const uint16_t *tud_descriptor_string_cb(uint8_t index, uint16_t langid) {
         if (index >= sizeof(usbd_desc_str) / sizeof(usbd_desc_str[0])) {
             return NULL;
         }
-        const char *str = usbd_desc_str[index];
-        for (len = 0; len < DESC_STR_MAX - 1 && str[len]; ++len) {
-            desc_str[1 + len] = str[len];
+        // check, if serial is requested
+        if (index == USBD_STR_SERIAL) {
+            pico_unique_board_id_t id;
+            pico_get_unique_board_id(&id);
+            // byte by byte conversion
+            for (len = 0; len < 16; len += 2) {
+                const char *hexdig = "0123456789abcdef";
+                desc_str[1 + len] = hexdig[id.id[len >> 1] >> 4];
+                desc_str[1 + len + 1] = hexdig[id.id[len >> 1] & 0x0f];
+            }
+        } else {
+            const char *str = usbd_desc_str[index];
+            for (len = 0; len < DESC_STR_MAX - 1 && str[len]; ++len) {
+                desc_str[1 + len] = str[len];
+            }
         }
     }
 

From 4154ffbcba48822338ece6bbdb42f4a0498f237e Mon Sep 17 00:00:00 2001
From: Chris Liechti <cliechti@gmx.net>
Date: Tue, 8 Nov 2016 21:53:03 +0100
Subject: [PATCH 0813/3533] docs/esp8266: Add note about simultaneous use of
 STA_IF and AP_IF.

See also https://github.com/esp8266/Arduino/issues/1624
---
 docs/esp8266/general.rst | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/docs/esp8266/general.rst b/docs/esp8266/general.rst
index fbe8fe1c3cabd..ce51f531b9541 100644
--- a/docs/esp8266/general.rst
+++ b/docs/esp8266/general.rst
@@ -125,6 +125,16 @@ will overflow every 7:45h.  If a long-term working RTC time is required then
 ``time()`` or ``localtime()`` must be called at least once within 7 hours.
 MicroPython will then handle the overflow.
 
+Simultaneous operation of STA_IF and AP_IF
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Simultaneous operation of STA_IF and AP_IF interfaces is supported.
+
+However, due to restrictions of the hardware, there may be performance
+issues in the AP_IF, if the STA_IF is not connected and searching.
+An application should manage these interfaces and for example
+deactivate the STA_IF in environments where only the AP_IF is used.
+
 Sockets and WiFi buffers overflow
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 

From 2bf1beef5ce2edde80ba7a24dde781fe1b1692a4 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 4 May 2021 14:24:17 +1000
Subject: [PATCH 0814/3533] docs/esp8266: Add instructions on entering
 programming mode manually.

This adds to the ESP8266 tutorial instructions explaining which pins to
pull low to enter programming mode.

Commit made originally by @ARF1 in #2910.

Signed-off-by: Damien George <damien@micropython.org>
---
 docs/esp8266/tutorial/intro.rst | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/docs/esp8266/tutorial/intro.rst b/docs/esp8266/tutorial/intro.rst
index 711db3fcebb72..bbf0457fff5ab 100644
--- a/docs/esp8266/tutorial/intro.rst
+++ b/docs/esp8266/tutorial/intro.rst
@@ -75,6 +75,10 @@ the DTR and RTS pins wired in a special way then deploying the firmware should
 be easy as all steps can be done automatically.  Boards that have such features
 include the Adafruit Feather HUZZAH and NodeMCU boards.
 
+If you do not have such a board, you need keep GPIO0 pulled to ground and reset
+the device by pulling the reset pin to ground and releasing it again to enter
+programming mode.
+
 For best results it is recommended to first erase the entire flash of your
 device before putting on new MicroPython firmware.
 
@@ -113,6 +117,10 @@ the firmware (note the ``-fm dio`` option)::
 If the above commands run without error then MicroPython should be installed on
 your board!
 
+If you pulled GPIO0 manually to ground to enter programming mode, release it
+now and reset the device by again pulling the reset pin to ground for a short
+duration.
+
 Serial prompt
 -------------
 

From d70ab87b2b108aa9d5321c272911f759ad3ee8a9 Mon Sep 17 00:00:00 2001
From: Mordy Ovits <mordyovits@users.noreply.github.com>
Date: Thu, 2 Nov 2017 14:31:17 -0400
Subject: [PATCH 0815/3533] docs/esp8266: Clarify limitations of SSL in esp8266
 and fix typos.

---
 docs/esp8266/general.rst | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/docs/esp8266/general.rst b/docs/esp8266/general.rst
index ce51f531b9541..4999bc2e9bb1a 100644
--- a/docs/esp8266/general.rst
+++ b/docs/esp8266/general.rst
@@ -163,25 +163,26 @@ SSL/TLS limitations
 ~~~~~~~~~~~~~~~~~~~
 
 ESP8266 uses `axTLS <http://axtls.sourceforge.net/>`_ library, which is one
-of the smallest TLS libraries with the compatible licensing. However, it
+of the smallest TLS libraries with compatible licensing. However, it
 also has some known issues/limitations:
 
 1. No support for Diffie-Hellman (DH) key exchange and Elliptic-curve
-   cryptography (ECC). This means it can't work with sites which force
-   the use of these features (it works ok with classic RSA certificates).
+   cryptography (ECC). This means it can't work with sites which require
+   the use of these features (it works ok with the typical sites that use
+   RSA certificates).
 2. Half-duplex communication nature. axTLS uses a single buffer for both
    sending and receiving, which leads to considerable memory saving and
    works well with protocols like HTTP. But there may be problems with
    protocols which don't follow classic request-response model.
 
-Besides axTLS own limitations, the configuration used for MicroPython is
+Besides axTLS's own limitations, the configuration used for MicroPython is
 highly optimized for code size, which leads to additional limitations
 (these may be lifted in the future):
 
 3. Optimized RSA algorithms are not enabled, which may lead to slow
    SSL handshakes.
-4. Stored sessions are not supported (may allow faster repeated connections
-   to the same site in some circumstances).
+4. Session Reuse is not enabled, which means every connection must undergo
+   the full, expensive SSL handshake.
 
 Besides axTLS specific limitations described above, there's another generic
 limitation with usage of TLS on the low-memory devices:
@@ -195,13 +196,16 @@ limitation with usage of TLS on the low-memory devices:
    accessing various REST APIs, which usually require much smaller messages.
    The buffers size is on the order of 5KB, and is adjusted from time to
    time, taking as a reference being able to access https://google.com .
-   The smaller buffer hower means that some sites can't be accessed using
-   it, and it's not possible to stream large amounts of data.
+   The smaller buffer however means that some sites can't be accessed using
+   it, and it's not possible to stream large amounts of data. axTLS does
+   have support for TLS's Max Fragment Size extension, but no HTTPS website
+   does, so use of the extension is really only effective for local
+   communication with other devices.
 
 There are also some not implemented features specifically in MicroPython's
 ``ussl`` module based on axTLS:
 
-6. Certificates are not validated (this may make connections susceptible
+6. Certificates are not validated (this makes connections susceptible
    to man-in-the-middle attacks).
 7. There is no support for client certificates (scheduled to be fixed in
    1.9.4 release).

From ca0c75f5042cdf602585b08184f132d7ab4713f3 Mon Sep 17 00:00:00 2001
From: David Lechner <david@pybricks.com>
Date: Fri, 30 Apr 2021 14:41:20 -0500
Subject: [PATCH 0816/3533] stm32/boards: Change default LSI_VALUE to 32000 for
 F4 MCUs.

In the STM32 HAL libraries, the default value for LSI_VALUE for F4 MCUs is
32 kHz.

Signed-off-by: David Lechner <david@pybricks.com>
---
 ports/stm32/boards/stm32f4xx_hal_conf_base.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/stm32/boards/stm32f4xx_hal_conf_base.h b/ports/stm32/boards/stm32f4xx_hal_conf_base.h
index 134a30018ce36..f09990fd95e59 100644
--- a/ports/stm32/boards/stm32f4xx_hal_conf_base.h
+++ b/ports/stm32/boards/stm32f4xx_hal_conf_base.h
@@ -88,7 +88,7 @@
 
 // Oscillator values in Hz
 #define HSI_VALUE (16000000)
-#define LSI_VALUE (40000)
+#define LSI_VALUE (32000)
 
 // SysTick has the highest priority
 #define TICK_INT_PRIORITY (0x00)

From 6e776a671061130d86a300fcd72173d9b93f521a Mon Sep 17 00:00:00 2001
From: Nicko van Someren <nicko@nicko.org>
Date: Sun, 2 May 2021 18:12:58 -0600
Subject: [PATCH 0817/3533] gitignore: Ignore macOS desktop metadata files.

---
 .gitignore | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.gitignore b/.gitignore
index c52f59eec74e6..7342489927888 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,3 +42,7 @@ user.props
 # Generated rst files
 ######################
 genrst/
+
+# MacOS desktop metadata files
+######################
+.DS_Store

From 31ac410a4fbf18b38b6f4557045959140026680e Mon Sep 17 00:00:00 2001
From: Mike Causer <mcauser@gmail.com>
Date: Fri, 30 Apr 2021 16:53:36 +1000
Subject: [PATCH 0818/3533] docs: Fix some spelling mistakes.

---
 docs/develop/cmodules.rst          | 2 +-
 docs/esp32/quickref.rst            | 2 +-
 docs/esp8266/quickref.rst          | 2 +-
 docs/library/esp32.rst             | 2 +-
 docs/library/machine.Timer.rst     | 2 +-
 docs/library/machine.TimerWiPy.rst | 4 ++--
 docs/library/network.rst           | 2 +-
 docs/library/uctypes.rst           | 2 +-
 docs/library/uio.rst               | 8 ++++----
 docs/library/uselect.rst           | 4 ++--
 docs/library/usocket.rst           | 2 +-
 docs/library/utime.rst             | 2 +-
 12 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/docs/develop/cmodules.rst b/docs/develop/cmodules.rst
index 346b3e03140de..38225e8686a7b 100644
--- a/docs/develop/cmodules.rst
+++ b/docs/develop/cmodules.rst
@@ -91,7 +91,7 @@ This simple module named ``cexample`` provides a single function
 ``cexample.add_ints(a, b)`` which adds the two integer args together and returns
 the result. It can be found in the MicroPython source tree
 `in the examples directory <https://github.com/micropython/micropython/tree/master/examples/usercmodule/cexample>`_
-and has a source file and a Makefile fragment with content as descibed above::
+and has a source file and a Makefile fragment with content as described above::
 
     micropython/
     └──examples/
diff --git a/docs/esp32/quickref.rst b/docs/esp32/quickref.rst
index 30c9b3b95a9f9..c29688f000289 100644
--- a/docs/esp32/quickref.rst
+++ b/docs/esp32/quickref.rst
@@ -58,7 +58,7 @@ The :mod:`esp32` module::
     import esp32
 
     esp32.hall_sensor()     # read the internal hall sensor
-    esp32.raw_temperature() # read the internal temperature of the MCU, in Farenheit
+    esp32.raw_temperature() # read the internal temperature of the MCU, in Fahrenheit
     esp32.ULP()             # access to the Ultra-Low-Power Co-processor
 
 Note that the temperature sensor in the ESP32 will typically read higher than
diff --git a/docs/esp8266/quickref.rst b/docs/esp8266/quickref.rst
index a478b66581d93..b9a46ab112a0c 100644
--- a/docs/esp8266/quickref.rst
+++ b/docs/esp8266/quickref.rst
@@ -58,7 +58,7 @@ The :mod:`network` module::
     wlan.scan()             # scan for access points
     wlan.isconnected()      # check if the station is connected to an AP
     wlan.connect('essid', 'password') # connect to an AP
-    wlan.config('mac')      # get the interface's MAC adddress
+    wlan.config('mac')      # get the interface's MAC address
     wlan.ifconfig()         # get the interface's IP/netmask/gw/DNS addresses
 
     ap = network.WLAN(network.AP_IF) # create access-point interface
diff --git a/docs/library/esp32.rst b/docs/library/esp32.rst
index f179a31ef65e3..1cfb304c14b88 100644
--- a/docs/library/esp32.rst
+++ b/docs/library/esp32.rst
@@ -162,7 +162,7 @@ used to transmit or receive many other types of digital signals::
 The input to the RMT module is an 80MHz clock (in the future it may be able to
 configure the input clock but, for now, it's fixed). ``clock_div`` *divides*
 the clock input which determines the resolution of the RMT channel. The
-numbers specificed in ``write_pulses`` are multiplied by the resolution to
+numbers specified in ``write_pulses`` are multiplied by the resolution to
 define the pulses.
 
 ``clock_div`` is an 8-bit divider (0-255) and each pulse can be defined by
diff --git a/docs/library/machine.Timer.rst b/docs/library/machine.Timer.rst
index 9991d3aebc2fc..77a549b40b5e9 100644
--- a/docs/library/machine.Timer.rst
+++ b/docs/library/machine.Timer.rst
@@ -9,7 +9,7 @@ the most flexible and heterogeneous kind of hardware in MCUs and SoCs,
 differently greatly from a model to a model. MicroPython's Timer class
 defines a baseline operation of executing a callback with a given period
 (or once after some delay), and allow specific boards to define more
-non-standard behavior (which thus won't be portable to other boards).
+non-standard behaviour (which thus won't be portable to other boards).
 
 See discussion of :ref:`important constraints <machine_callbacks>` on
 Timer callbacks.
diff --git a/docs/library/machine.TimerWiPy.rst b/docs/library/machine.TimerWiPy.rst
index f5b748c62e1d5..39afc23bc529e 100644
--- a/docs/library/machine.TimerWiPy.rst
+++ b/docs/library/machine.TimerWiPy.rst
@@ -16,7 +16,7 @@ the most flexible and heterogeneous kind of hardware in MCUs and SoCs,
 differently greatly from a model to a model. MicroPython's Timer class
 defines a baseline operation of executing a callback with a given period
 (or once after some delay), and allow specific boards to define more
-non-standard behavior (which thus won't be portable to other boards).
+non-standard behaviour (which thus won't be portable to other boards).
 
 See discussion of :ref:`important constraints <machine_callbacks>` on
 Timer callbacks.
@@ -115,7 +115,7 @@ Methods
 
 .. method:: timerchannel.irq(*, trigger, priority=1, handler=None)
 
-    The behavior of this callback is heavily dependent on the operating
+    The behaviour of this callback is heavily dependent on the operating
     mode of the timer channel:
 
         - If mode is ``TimerWiPy.PERIODIC`` the callback is executed periodically
diff --git a/docs/library/network.rst b/docs/library/network.rst
index bd3bc6f34ba81..a20eb2ebf5e0a 100644
--- a/docs/library/network.rst
+++ b/docs/library/network.rst
@@ -55,7 +55,7 @@ parameter should be `id`.
         Activate ("up") or deactivate ("down") the network interface, if
         a boolean argument is passed. Otherwise, query current state if
         no argument is provided. Most other methods require an active
-        interface (behavior of calling them on inactive interface is
+        interface (behaviour of calling them on inactive interface is
         undefined).
 
 .. method:: AbstractNIC.connect([service_id, key=None, *, ...])
diff --git a/docs/library/uctypes.rst b/docs/library/uctypes.rst
index 0fdc40e4840b4..b3343beb7e4a8 100644
--- a/docs/library/uctypes.rst
+++ b/docs/library/uctypes.rst
@@ -245,7 +245,7 @@ Module contents
 
 .. data:: VOID
 
-   ``VOID`` is an alias for ``UINT8``, and is provided to conviniently define
+   ``VOID`` is an alias for ``UINT8``, and is provided to conveniently define
    C's void pointers: ``(uctypes.PTR, uctypes.VOID)``.
 
 .. data:: PTR
diff --git a/docs/library/uio.rst b/docs/library/uio.rst
index dddb83a170750..adbeef08b7b49 100644
--- a/docs/library/uio.rst
+++ b/docs/library/uio.rst
@@ -18,7 +18,7 @@ Conceptual hierarchy
    Conceptual hierarchy of stream base classes is simplified in MicroPython,
    as described in this section.
 
-(Abstract) base stream classes, which serve as a foundation for behavior
+(Abstract) base stream classes, which serve as a foundation for behaviour
 of all the concrete classes, adhere to few dichotomies (pair-wise
 classifications) in CPython. In MicroPython, they are somewhat simplified
 and made implicit to achieve higher efficiencies and save resources.
@@ -41,15 +41,15 @@ more concise and efficient programs - something which is highly desirable
 for MicroPython. So, while MicroPython doesn't support buffered streams,
 it still provides for no-short-operations streams. Whether there will
 be short operations or not depends on each particular class' needs, but
-developers are strongly advised to favor no-short-operations behavior
+developers are strongly advised to favour no-short-operations behaviour
 for the reasons stated above. For example, MicroPython sockets are
 guaranteed to avoid short read/writes. Actually, at this time, there is
 no example of a short-operations stream class in the core, and one would
 be a port-specific class, where such a need is governed by hardware
 peculiarities.
 
-The no-short-operations behavior gets tricky in case of non-blocking
-streams, blocking vs non-blocking behavior being another CPython dichotomy,
+The no-short-operations behaviour gets tricky in case of non-blocking
+streams, blocking vs non-blocking behaviour being another CPython dichotomy,
 fully supported by MicroPython. Non-blocking streams never wait for
 data either to arrive or be written - they read/write whatever possible,
 or signal lack of data (or ability to write data). Clearly, this conflicts
diff --git a/docs/library/uselect.rst b/docs/library/uselect.rst
index 0c3bdfdfd9360..76202739c87e9 100644
--- a/docs/library/uselect.rst
+++ b/docs/library/uselect.rst
@@ -87,11 +87,11 @@ Methods
    `callee-owned tuple`. This function provides an efficient, allocation-free
    way to poll on streams.
 
-   If *flags* is 1, one-shot behavior for events is employed: streams for
+   If *flags* is 1, one-shot behaviour for events is employed: streams for
    which events happened will have their event masks automatically reset
    (equivalent to ``poll.modify(obj, 0)``), so new events for such a stream
    won't be processed until new mask is set with `poll.modify()`. This
-   behavior is useful for asynchronous I/O schedulers.
+   behaviour is useful for asynchronous I/O schedulers.
 
    .. admonition:: Difference to CPython
       :class: attention
diff --git a/docs/library/usocket.rst b/docs/library/usocket.rst
index bc4b4b6d5a952..39b848e593d75 100644
--- a/docs/library/usocket.rst
+++ b/docs/library/usocket.rst
@@ -222,7 +222,7 @@ Methods
    Unlike `send()`, this method will try to send all of data, by sending data
    chunk by chunk consecutively.
 
-   The behavior of this method on non-blocking sockets is undefined. Due to this,
+   The behaviour of this method on non-blocking sockets is undefined. Due to this,
    on MicroPython, it's recommended to use `write()` method instead, which
    has the same "no short writes" policy for blocking sockets, and will return
    number of bytes sent on non-blocking sockets.
diff --git a/docs/library/utime.rst b/docs/library/utime.rst
index 86fd27b3a5ac8..b7c604dc7b4ec 100644
--- a/docs/library/utime.rst
+++ b/docs/library/utime.rst
@@ -173,7 +173,7 @@ Functions
    long sleep), then once you finally look again, it may seem to you that only 1 hour
    has passed. To avoid this mistake, just look at the clock regularly. Your application
    should do the same. "Too long sleep" metaphor also maps directly to application
-   behavior: don't let your application run any single task for too long. Run tasks
+   behaviour: don't let your application run any single task for too long. Run tasks
    in steps, and do time-keeping inbetween.
 
    `ticks_diff()` is designed to accommodate various usage patterns, among them:

From 0054fff840dfda50a32c653774e91b3e19464675 Mon Sep 17 00:00:00 2001
From: Gabriel M Schuyler <gms@causalloop.com>
Date: Sun, 7 Feb 2021 12:35:47 -0600
Subject: [PATCH 0819/3533] docs/pyboard: Fix typo in pyb.Switch tutorial.

---
 docs/pyboard/tutorial/switch.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/pyboard/tutorial/switch.rst b/docs/pyboard/tutorial/switch.rst
index 96bb3784e9f8c..059b04d94acc9 100644
--- a/docs/pyboard/tutorial/switch.rst
+++ b/docs/pyboard/tutorial/switch.rst
@@ -93,7 +93,7 @@ on the pin for any changes, and the following will occur:
    running Python script.
 3. The microcontroller starts executing the special interrupt handler
    associated with the switch's external trigger.  This interrupt handler
-   get the function that you registered with ``sw.callback()`` and executes
+   gets the function that you registered with ``sw.callback()`` and executes
    it.
 4. Your callback function is executed until it finishes, returning control
    to the switch interrupt handler.

From 8172c2e9c5d5eec9a6b0a3f6cc4a2383b3d96d26 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 4 May 2021 23:36:05 +1000
Subject: [PATCH 0820/3533] rp2: Move manifest.py to boards directory.

To match other ports.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/rp2/CMakeLists.txt           | 2 +-
 ports/rp2/{ => boards}/manifest.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename ports/rp2/{ => boards}/manifest.py (74%)

diff --git a/ports/rp2/CMakeLists.txt b/ports/rp2/CMakeLists.txt
index bd3eb74384b0d..699520b240849 100644
--- a/ports/rp2/CMakeLists.txt
+++ b/ports/rp2/CMakeLists.txt
@@ -159,7 +159,7 @@ set(PICO_SDK_COMPONENTS
 
 # Define mpy-cross flags and frozen manifest
 set(MICROPY_CROSS_FLAGS -march=armv7m)
-set(MICROPY_FROZEN_MANIFEST ${PROJECT_SOURCE_DIR}/manifest.py)
+set(MICROPY_FROZEN_MANIFEST ${PROJECT_SOURCE_DIR}/boards/manifest.py)
 
 target_sources(${MICROPY_TARGET} PRIVATE
     ${MICROPY_SOURCE_PY}
diff --git a/ports/rp2/manifest.py b/ports/rp2/boards/manifest.py
similarity index 74%
rename from ports/rp2/manifest.py
rename to ports/rp2/boards/manifest.py
index a56d4b1b0923b..9df589f126787 100644
--- a/ports/rp2/manifest.py
+++ b/ports/rp2/boards/manifest.py
@@ -1,3 +1,3 @@
-freeze("modules")
+freeze("$(PORT_DIR)/modules")
 freeze("$(MPY_DIR)/drivers/onewire")
 include("$(MPY_DIR)/extmod/uasyncio/manifest.py")

From 9e29217c73f36802de616c05bee9bf7f9090f722 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 14 Apr 2021 15:37:33 +1000
Subject: [PATCH 0821/3533] unix/modffi: Use a union for passing/returning FFI
 values.

This fixes a bug where double arguments on a 32-bit architecture would not
be passed correctly because they only had 4 bytes of storage (not 8).  It
also fixes a compiler warning/error in return_ffi_value on certian
architectures: array subscript 'double[0]' is partly outside array bounds
of 'ffi_arg[1]' {aka 'long unsigned int[1]'}.

Fixes issue #7064.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/unix/modffi.c         | 62 +++++++++++++++----------------------
 tests/unix/ffi_float.py     | 13 ++++++--
 tests/unix/ffi_float.py.exp | 20 ++++++++----
 3 files changed, 50 insertions(+), 45 deletions(-)

diff --git a/ports/unix/modffi.c b/ports/unix/modffi.c
index 598a28cd54a02..5c2595ec5e0ba 100644
--- a/ports/unix/modffi.c
+++ b/ports/unix/modffi.c
@@ -56,6 +56,13 @@
  * but may be later.
  */
 
+// This union is large enough to hold any supported argument/return value.
+typedef union _ffi_union_t {
+    ffi_arg ffi;
+    float flt;
+    double dbl;
+} ffi_union_t;
+
 typedef struct _mp_obj_opaque_t {
     mp_obj_base_t base;
     void *val;
@@ -151,10 +158,10 @@ STATIC ffi_type *get_ffi_type(mp_obj_t o_in) {
     mp_raise_TypeError(MP_ERROR_TEXT("unknown type"));
 }
 
-STATIC mp_obj_t return_ffi_value(ffi_arg val, char type) {
+STATIC mp_obj_t return_ffi_value(ffi_union_t *val, char type) {
     switch (type) {
         case 's': {
-            const char *s = (const char *)(intptr_t)val;
+            const char *s = (const char *)(intptr_t)val->ffi;
             if (!s) {
                 return mp_const_none;
             }
@@ -164,20 +171,16 @@ STATIC mp_obj_t return_ffi_value(ffi_arg val, char type) {
             return mp_const_none;
         #if MICROPY_PY_BUILTINS_FLOAT
         case 'f': {
-            union { ffi_arg ffi;
-                    float flt;
-            } val_union = { .ffi = val };
-            return mp_obj_new_float_from_f(val_union.flt);
+            return mp_obj_new_float_from_f(val->flt);
         }
         case 'd': {
-            double *p = (double *)&val;
-            return mp_obj_new_float_from_d(*p);
+            return mp_obj_new_float_from_d(val->dbl);
         }
         #endif
         case 'O':
-            return (mp_obj_t)(intptr_t)val;
+            return (mp_obj_t)(intptr_t)val->ffi;
         default:
-            return mp_obj_new_int(val);
+            return mp_obj_new_int(val->ffi);
     }
 }
 
@@ -368,28 +371,26 @@ STATIC mp_obj_t ffifunc_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const
     assert(n_kw == 0);
     assert(n_args == self->cif.nargs);
 
-    ffi_arg values[n_args];
+    ffi_union_t values[n_args];
     void *valueptrs[n_args];
     const char *argtype = self->argtypes;
     for (uint i = 0; i < n_args; i++, argtype++) {
         mp_obj_t a = args[i];
         if (*argtype == 'O') {
-            values[i] = (ffi_arg)(intptr_t)a;
+            values[i].ffi = (ffi_arg)(intptr_t)a;
         #if MICROPY_PY_BUILTINS_FLOAT
         } else if (*argtype == 'f') {
-            float *p = (float *)&values[i];
-            *p = mp_obj_get_float_to_f(a);
+            values[i].flt = mp_obj_get_float_to_f(a);
         } else if (*argtype == 'd') {
-            double *p = (double *)&values[i];
-            *p = mp_obj_get_float_to_d(a);
+            values[i].dbl = mp_obj_get_float_to_d(a);
         #endif
         } else if (a == mp_const_none) {
-            values[i] = 0;
+            values[i].ffi = 0;
         } else if (mp_obj_is_int(a)) {
-            values[i] = mp_obj_int_get_truncated(a);
+            values[i].ffi = mp_obj_int_get_truncated(a);
         } else if (mp_obj_is_str(a)) {
             const char *s = mp_obj_str_get_str(a);
-            values[i] = (ffi_arg)(intptr_t)s;
+            values[i].ffi = (ffi_arg)(intptr_t)s;
         } else if (((mp_obj_base_t *)MP_OBJ_TO_PTR(a))->type->buffer_p.get_buffer != NULL) {
             mp_obj_base_t *o = (mp_obj_base_t *)MP_OBJ_TO_PTR(a);
             mp_buffer_info_t bufinfo;
@@ -397,32 +398,19 @@ STATIC mp_obj_t ffifunc_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const
             if (ret != 0) {
                 goto error;
             }
-            values[i] = (ffi_arg)(intptr_t)bufinfo.buf;
+            values[i].ffi = (ffi_arg)(intptr_t)bufinfo.buf;
         } else if (mp_obj_is_type(a, &fficallback_type)) {
             mp_obj_fficallback_t *p = MP_OBJ_TO_PTR(a);
-            values[i] = (ffi_arg)(intptr_t)p->func;
+            values[i].ffi = (ffi_arg)(intptr_t)p->func;
         } else {
             goto error;
         }
         valueptrs[i] = &values[i];
     }
 
-    // If ffi_arg is not big enough to hold a double, then we must pass along a
-    // pointer to a memory location of the correct size.
-    // TODO check if this needs to be done for other types which don't fit into
-    // ffi_arg.
-    #if MICROPY_PY_BUILTINS_FLOAT
-    if (sizeof(ffi_arg) == 4 && self->rettype == 'd') {
-        double retval;
-        ffi_call(&self->cif, self->func, &retval, valueptrs);
-        return mp_obj_new_float_from_d(retval);
-    } else
-    #endif
-    {
-        ffi_arg retval;
-        ffi_call(&self->cif, self->func, &retval, valueptrs);
-        return return_ffi_value(retval, self->rettype);
-    }
+    ffi_union_t retval;
+    ffi_call(&self->cif, self->func, &retval, valueptrs);
+    return return_ffi_value(&retval, self->rettype);
 
 error:
     mp_raise_TypeError(MP_ERROR_TEXT("don't know how to pass object to native function"));
diff --git a/tests/unix/ffi_float.py b/tests/unix/ffi_float.py
index d0393989651b3..03bd9f7f17b82 100644
--- a/tests/unix/ffi_float.py
+++ b/tests/unix/ffi_float.py
@@ -35,6 +35,15 @@ def ffi_open(names):
 # test passing double and float args
 libm = ffi_open(("libm.so", "libm.so.6", "libc.so.0", "libc.so.6", "libc.dylib"))
 tgamma = libm.func("d", "tgamma", "d")
-for fun in (tgamma,):
+for fun_name in ("tgamma",):
+    fun = globals()[fun_name]
     for val in (0.5, 1, 1.0, 1.5, 4, 4.0):
-        print("%.6f" % fun(val))
+        print(fun_name, "%.5f" % fun(val))
+
+# test passing 2x float/double args
+powf = libm.func("f", "powf", "ff")
+pow = libm.func("d", "pow", "dd")
+for fun_name in ("powf", "pow"):
+    fun = globals()[fun_name]
+    for args in ((0, 1), (1, 0), (2, 0.5), (3, 4)):
+        print(fun_name, "%.5f" % fun(*args))
diff --git a/tests/unix/ffi_float.py.exp b/tests/unix/ffi_float.py.exp
index b9d7da2bdb99c..3d90914315901 100644
--- a/tests/unix/ffi_float.py.exp
+++ b/tests/unix/ffi_float.py.exp
@@ -1,8 +1,16 @@
 1.230000
 1.230000
-1.772454
-1.000000
-1.000000
-0.886227
-6.000000
-6.000000
+tgamma 1.77245
+tgamma 1.00000
+tgamma 1.00000
+tgamma 0.88623
+tgamma 6.00000
+tgamma 6.00000
+powf 0.00000
+powf 1.00000
+powf 1.41421
+powf 81.00000
+pow 0.00000
+pow 1.00000
+pow 1.41421
+pow 81.00000

From 4791d290c61e2cc5bcd006b35ef60470920279d6 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 6 May 2021 12:11:51 +1000
Subject: [PATCH 0822/3533] extmod: Remove old comments used for auto-doc
 generation.

They are no longer used, and the text in the docs is more up to date.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/moductypes.c | 70 +++++++--------------------------------------
 extmod/moduselect.c | 16 ++++-------
 extmod/vfs_fat.c    |  7 ++---
 3 files changed, 18 insertions(+), 75 deletions(-)

diff --git a/extmod/moductypes.c b/extmod/moductypes.c
index 79a49d5c329c2..51626600ccdbd 100644
--- a/extmod/moductypes.c
+++ b/extmod/moductypes.c
@@ -34,38 +34,10 @@
 
 #if MICROPY_PY_UCTYPES
 
-/// \module uctypes - Access data structures in memory
-///
-/// The module allows to define layout of raw data structure (using terms
-/// of C language), and then access memory buffers using this definition.
-/// The module also provides convenience functions to access memory buffers
-/// contained in Python objects or wrap memory buffers in Python objects.
-/// \constant UINT8_1 - uint8_t value type
-
-/// \class struct - C-like structure
-///
-/// Encapsulalation of in-memory data structure. This class doesn't define
-/// any methods, only attribute access (for structure fields) and
-/// indexing (for pointer and array fields).
-///
-/// Usage:
-///
-///     # Define layout of a structure with 2 fields
-///     # 0 and 4 are byte offsets of fields from the beginning of struct
-///     # they are logically ORed with field type
-///     FOO_STRUCT = {"a": 0 | uctypes.UINT32, "b": 4 | uctypes.UINT8}
-///
-///     # Example memory buffer to access (contained in bytes object)
-///     buf = b"\x64\0\0\0\0x14"
-///
-///     # Create structure object referring to address of
-///     # the data in the buffer above
-///     s = uctypes.struct(FOO_STRUCT, uctypes.addressof(buf))
-///
-///     # Access fields
-///     print(s.a, s.b)
-///     # Result:
-///     # 100, 20
+// The uctypes module allows defining the layout of a raw data structure (using
+// terms of the C language), and then access memory buffers using this definition.
+// The module also provides convenience functions to access memory buffers
+// contained in Python objects or wrap memory buffers in Python objects.
 
 #define LAYOUT_LITTLE_ENDIAN (0)
 #define LAYOUT_BIG_ENDIAN    (1)
@@ -647,9 +619,8 @@ STATIC mp_int_t uctypes_get_buffer(mp_obj_t self_in, mp_buffer_info_t *bufinfo,
     return 0;
 }
 
-/// \function addressof()
-/// Return address of object's data (applies to object providing buffer
-/// interface).
+// addressof()
+// Return address of object's data (applies to objects providing the buffer interface).
 STATIC mp_obj_t uctypes_struct_addressof(mp_obj_t buf) {
     mp_buffer_info_t bufinfo;
     mp_get_buffer_raise(buf, &bufinfo, MP_BUFFER_READ);
@@ -657,19 +628,15 @@ STATIC mp_obj_t uctypes_struct_addressof(mp_obj_t buf) {
 }
 MP_DEFINE_CONST_FUN_OBJ_1(uctypes_struct_addressof_obj, uctypes_struct_addressof);
 
-/// \function bytearray_at()
-/// Capture memory at given address of given size as bytearray. Memory is
-/// captured by reference (and thus memory pointed by bytearray may change
-/// or become invalid at later time). Use bytes_at() to capture by value.
+// bytearray_at()
+// Capture memory at given address of given size as bytearray.
 STATIC mp_obj_t uctypes_struct_bytearray_at(mp_obj_t ptr, mp_obj_t size) {
     return mp_obj_new_bytearray_by_ref(mp_obj_int_get_truncated(size), (void *)(uintptr_t)mp_obj_int_get_truncated(ptr));
 }
 MP_DEFINE_CONST_FUN_OBJ_2(uctypes_struct_bytearray_at_obj, uctypes_struct_bytearray_at);
 
-/// \function bytes_at()
-/// Capture memory at given address of given size as bytes. Memory is
-/// captured by value, i.e. copied. Use bytearray_at() to capture by reference
-/// ("zero copy").
+// bytes_at()
+// Capture memory at given address of given size as bytes.
 STATIC mp_obj_t uctypes_struct_bytes_at(mp_obj_t ptr, mp_obj_t size) {
     return mp_obj_new_bytes((void *)(uintptr_t)mp_obj_int_get_truncated(ptr), mp_obj_int_get_truncated(size));
 }
@@ -695,36 +662,19 @@ STATIC const mp_rom_map_elem_t mp_module_uctypes_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_bytes_at), MP_ROM_PTR(&uctypes_struct_bytes_at_obj) },
     { MP_ROM_QSTR(MP_QSTR_bytearray_at), MP_ROM_PTR(&uctypes_struct_bytearray_at_obj) },
 
-    /// \moduleref uctypes
-
-    /// \constant NATIVE - Native structure layout - native endianness,
-    /// platform-specific field alignment
     { MP_ROM_QSTR(MP_QSTR_NATIVE), MP_ROM_INT(LAYOUT_NATIVE) },
-    /// \constant LITTLE_ENDIAN - Little-endian structure layout, tightly packed
-    /// (no alignment constraints)
     { MP_ROM_QSTR(MP_QSTR_LITTLE_ENDIAN), MP_ROM_INT(LAYOUT_LITTLE_ENDIAN) },
-    /// \constant BIG_ENDIAN - Big-endian structure layout, tightly packed
-    /// (no alignment constraints)
     { MP_ROM_QSTR(MP_QSTR_BIG_ENDIAN), MP_ROM_INT(LAYOUT_BIG_ENDIAN) },
 
-    /// \constant VOID - void value type, may be used only as pointer target type.
     { MP_ROM_QSTR(MP_QSTR_VOID), MP_ROM_INT(TYPE2SMALLINT(UINT8, VAL_TYPE_BITS)) },
 
-    /// \constant UINT8 - uint8_t value type
     { MP_ROM_QSTR(MP_QSTR_UINT8), MP_ROM_INT(TYPE2SMALLINT(UINT8, 4)) },
-    /// \constant INT8 - int8_t value type
     { MP_ROM_QSTR(MP_QSTR_INT8), MP_ROM_INT(TYPE2SMALLINT(INT8, 4)) },
-    /// \constant UINT16 - uint16_t value type
     { MP_ROM_QSTR(MP_QSTR_UINT16), MP_ROM_INT(TYPE2SMALLINT(UINT16, 4)) },
-    /// \constant INT16 - int16_t value type
     { MP_ROM_QSTR(MP_QSTR_INT16), MP_ROM_INT(TYPE2SMALLINT(INT16, 4)) },
-    /// \constant UINT32 - uint32_t value type
     { MP_ROM_QSTR(MP_QSTR_UINT32), MP_ROM_INT(TYPE2SMALLINT(UINT32, 4)) },
-    /// \constant INT32 - int32_t value type
     { MP_ROM_QSTR(MP_QSTR_INT32), MP_ROM_INT(TYPE2SMALLINT(INT32, 4)) },
-    /// \constant UINT64 - uint64_t value type
     { MP_ROM_QSTR(MP_QSTR_UINT64), MP_ROM_INT(TYPE2SMALLINT(UINT64, 4)) },
-    /// \constant INT64 - int64_t value type
     { MP_ROM_QSTR(MP_QSTR_INT64), MP_ROM_INT(TYPE2SMALLINT(INT64, 4)) },
 
     { MP_ROM_QSTR(MP_QSTR_BFUINT8), MP_ROM_INT(TYPE2SMALLINT(BFUINT8, 4)) },
diff --git a/extmod/moduselect.c b/extmod/moduselect.c
index 6d8249f42758f..fbd51960d5e57 100644
--- a/extmod/moduselect.c
+++ b/extmod/moduselect.c
@@ -40,10 +40,6 @@
 // Flags for poll()
 #define FLAG_ONESHOT (1)
 
-/// \module select - Provides select function to wait for events on a stream
-///
-/// This module provides the select function.
-
 typedef struct _poll_obj_t {
     mp_obj_t obj;
     mp_uint_t (*ioctl)(mp_obj_t obj, mp_uint_t request, uintptr_t arg, int *errcode);
@@ -111,7 +107,7 @@ STATIC mp_uint_t poll_map_poll(mp_map_t *poll_map, size_t *rwx_num) {
     return n_ready;
 }
 
-/// \function select(rlist, wlist, xlist[, timeout])
+// select(rlist, wlist, xlist[, timeout])
 STATIC mp_obj_t select_select(size_t n_args, const mp_obj_t *args) {
     // get array data from tuple/list arguments
     size_t rwx_len[3];
@@ -178,8 +174,6 @@ STATIC mp_obj_t select_select(size_t n_args, const mp_obj_t *args) {
 }
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_select_select_obj, 3, 4, select_select);
 
-/// \class Poll - poll class
-
 typedef struct _mp_obj_poll_t {
     mp_obj_base_t base;
     mp_map_t poll_map;
@@ -190,7 +184,7 @@ typedef struct _mp_obj_poll_t {
     mp_obj_t ret_tuple;
 } mp_obj_poll_t;
 
-/// \method register(obj[, eventmask])
+// register(obj[, eventmask])
 STATIC mp_obj_t poll_register(size_t n_args, const mp_obj_t *args) {
     mp_obj_poll_t *self = MP_OBJ_TO_PTR(args[0]);
     mp_uint_t flags;
@@ -204,7 +198,7 @@ STATIC mp_obj_t poll_register(size_t n_args, const mp_obj_t *args) {
 }
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(poll_register_obj, 2, 3, poll_register);
 
-/// \method unregister(obj)
+// unregister(obj)
 STATIC mp_obj_t poll_unregister(mp_obj_t self_in, mp_obj_t obj_in) {
     mp_obj_poll_t *self = MP_OBJ_TO_PTR(self_in);
     mp_map_lookup(&self->poll_map, mp_obj_id(obj_in), MP_MAP_LOOKUP_REMOVE_IF_FOUND);
@@ -213,7 +207,7 @@ STATIC mp_obj_t poll_unregister(mp_obj_t self_in, mp_obj_t obj_in) {
 }
 MP_DEFINE_CONST_FUN_OBJ_2(poll_unregister_obj, poll_unregister);
 
-/// \method modify(obj, eventmask)
+// modify(obj, eventmask)
 STATIC mp_obj_t poll_modify(mp_obj_t self_in, mp_obj_t obj_in, mp_obj_t eventmask_in) {
     mp_obj_poll_t *self = MP_OBJ_TO_PTR(self_in);
     mp_map_elem_t *elem = mp_map_lookup(&self->poll_map, mp_obj_id(obj_in), MP_MAP_LOOKUP);
@@ -348,7 +342,7 @@ STATIC const mp_obj_type_t mp_type_poll = {
     .locals_dict = (void *)&poll_locals_dict,
 };
 
-/// \function poll()
+// poll()
 STATIC mp_obj_t select_poll(void) {
     mp_obj_poll_t *poll = m_new_obj(mp_obj_poll_t);
     poll->base.type = &mp_type_poll;
diff --git a/extmod/vfs_fat.c b/extmod/vfs_fat.c
index 95b7ad9944116..644be57ae7731 100644
--- a/extmod/vfs_fat.c
+++ b/extmod/vfs_fat.c
@@ -256,7 +256,7 @@ STATIC mp_obj_t fat_vfs_mkdir(mp_obj_t vfs_in, mp_obj_t path_o) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_2(fat_vfs_mkdir_obj, fat_vfs_mkdir);
 
-/// Change current directory.
+// Change current directory.
 STATIC mp_obj_t fat_vfs_chdir(mp_obj_t vfs_in, mp_obj_t path_in) {
     mp_obj_fat_vfs_t *self = MP_OBJ_TO_PTR(vfs_in);
     const char *path;
@@ -272,7 +272,7 @@ STATIC mp_obj_t fat_vfs_chdir(mp_obj_t vfs_in, mp_obj_t path_in) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_2(fat_vfs_chdir_obj, fat_vfs_chdir);
 
-/// Get the current directory.
+// Get the current directory.
 STATIC mp_obj_t fat_vfs_getcwd(mp_obj_t vfs_in) {
     mp_obj_fat_vfs_t *self = MP_OBJ_TO_PTR(vfs_in);
     char buf[MICROPY_ALLOC_PATH_MAX + 1];
@@ -284,8 +284,7 @@ STATIC mp_obj_t fat_vfs_getcwd(mp_obj_t vfs_in) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(fat_vfs_getcwd_obj, fat_vfs_getcwd);
 
-/// \function stat(path)
-/// Get the status of a file or directory.
+// Get the status of a file or directory.
 STATIC mp_obj_t fat_vfs_stat(mp_obj_t vfs_in, mp_obj_t path_in) {
     mp_obj_fat_vfs_t *self = MP_OBJ_TO_PTR(vfs_in);
     const char *path = mp_obj_str_get_str(path_in);

From 02dc1644b6ebf1bfd5bfa2dde4d68d7272526f51 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 6 May 2021 12:31:32 +1000
Subject: [PATCH 0823/3533] extmod/moductypes: Remove double blank lines and
 debugging printf's.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/moductypes.c | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/extmod/moductypes.c b/extmod/moductypes.c
index 51626600ccdbd..f1108649aa594 100644
--- a/extmod/moductypes.c
+++ b/extmod/moductypes.c
@@ -391,10 +391,8 @@ STATIC mp_obj_t uctypes_struct_attr_op(mp_obj_t self_in, qstr attr, mp_obj_t set
         mp_int_t offset = MP_OBJ_SMALL_INT_VALUE(deref);
         mp_uint_t val_type = GET_TYPE(offset, VAL_TYPE_BITS);
         offset &= VALUE_MASK(VAL_TYPE_BITS);
-// printf("scalar type=%d offset=%x\n", val_type, offset);
 
         if (val_type <= INT64 || val_type == FLOAT32 || val_type == FLOAT64) {
-//            printf("size=%d\n", GET_SCALAR_SIZE(val_type));
             if (self->flags == LAYOUT_NATIVE) {
                 if (set_val == MP_OBJ_NULL) {
                     return get_aligned(val_type, self->addr + offset, 0);
@@ -461,7 +459,6 @@ STATIC mp_obj_t uctypes_struct_attr_op(mp_obj_t self_in, qstr attr, mp_obj_t set
     mp_int_t offset = MP_OBJ_SMALL_INT_VALUE(sub->items[0]);
     mp_uint_t agg_type = GET_TYPE(offset, AGG_TYPE_BITS);
     offset &= VALUE_MASK(AGG_TYPE_BITS);
-// printf("agg type=%d offset=%x\n", agg_type, offset);
 
     switch (agg_type) {
         case STRUCT: {
@@ -486,7 +483,6 @@ STATIC mp_obj_t uctypes_struct_attr_op(mp_obj_t self_in, qstr attr, mp_obj_t set
             o->desc = MP_OBJ_FROM_PTR(sub);
             o->addr = self->addr + offset;
             o->flags = self->flags;
-// printf("PTR/ARR base addr=%p\n", o->addr);
             return MP_OBJ_FROM_PTR(o);
         }
     }
@@ -642,7 +638,6 @@ STATIC mp_obj_t uctypes_struct_bytes_at(mp_obj_t ptr, mp_obj_t size) {
 }
 MP_DEFINE_CONST_FUN_OBJ_2(uctypes_struct_bytes_at_obj, uctypes_struct_bytes_at);
 
-
 STATIC const mp_obj_type_t uctypes_struct_type = {
     { &mp_type_type },
     .name = MP_QSTR_struct,
@@ -719,7 +714,6 @@ STATIC const mp_rom_map_elem_t mp_module_uctypes_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_PTR), MP_ROM_INT(TYPE2SMALLINT(PTR, AGG_TYPE_BITS)) },
     { MP_ROM_QSTR(MP_QSTR_ARRAY), MP_ROM_INT(TYPE2SMALLINT(ARRAY, AGG_TYPE_BITS)) },
 };
-
 STATIC MP_DEFINE_CONST_DICT(mp_module_uctypes_globals, mp_module_uctypes_globals_table);
 
 const mp_obj_module_t mp_module_uctypes = {

From 350a66a86339a66bfad29e0e8a5a40a34151bfe4 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 6 May 2021 12:40:53 +1000
Subject: [PATCH 0824/3533] extmod/moductypes: Replace numbers with macro
 constants.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/moductypes.c | 67 +++++++++++++++++++++++----------------------
 1 file changed, 34 insertions(+), 33 deletions(-)

diff --git a/extmod/moductypes.c b/extmod/moductypes.c
index f1108649aa594..97e8d7a787928 100644
--- a/extmod/moductypes.c
+++ b/extmod/moductypes.c
@@ -47,6 +47,7 @@
 #define BITF_LEN_BITS 5
 #define BITF_OFF_BITS 5
 #define OFFSET_BITS 17
+#define LEN_BITS (OFFSET_BITS + BITF_OFF_BITS)
 #if VAL_TYPE_BITS + BITF_LEN_BITS + BITF_OFF_BITS + OFFSET_BITS != 31
 #error Invalid encoding field length
 #endif
@@ -409,9 +410,9 @@ STATIC mp_obj_t uctypes_struct_attr_op(mp_obj_t self_in, qstr attr, mp_obj_t set
                 }
             }
         } else if (val_type >= BFUINT8 && val_type <= BFINT32) {
-            uint bit_offset = (offset >> 17) & 31;
-            uint bit_len = (offset >> 22) & 31;
-            offset &= (1 << 17) - 1;
+            uint bit_offset = (offset >> OFFSET_BITS) & 31;
+            uint bit_len = (offset >> LEN_BITS) & 31;
+            offset &= (1 << OFFSET_BITS) - 1;
             mp_uint_t val;
             if (self->flags == LAYOUT_NATIVE) {
                 val = get_aligned_basic(val_type & 6, self->addr + offset);
@@ -663,51 +664,51 @@ STATIC const mp_rom_map_elem_t mp_module_uctypes_globals_table[] = {
 
     { MP_ROM_QSTR(MP_QSTR_VOID), MP_ROM_INT(TYPE2SMALLINT(UINT8, VAL_TYPE_BITS)) },
 
-    { MP_ROM_QSTR(MP_QSTR_UINT8), MP_ROM_INT(TYPE2SMALLINT(UINT8, 4)) },
-    { MP_ROM_QSTR(MP_QSTR_INT8), MP_ROM_INT(TYPE2SMALLINT(INT8, 4)) },
-    { MP_ROM_QSTR(MP_QSTR_UINT16), MP_ROM_INT(TYPE2SMALLINT(UINT16, 4)) },
-    { MP_ROM_QSTR(MP_QSTR_INT16), MP_ROM_INT(TYPE2SMALLINT(INT16, 4)) },
-    { MP_ROM_QSTR(MP_QSTR_UINT32), MP_ROM_INT(TYPE2SMALLINT(UINT32, 4)) },
-    { MP_ROM_QSTR(MP_QSTR_INT32), MP_ROM_INT(TYPE2SMALLINT(INT32, 4)) },
-    { MP_ROM_QSTR(MP_QSTR_UINT64), MP_ROM_INT(TYPE2SMALLINT(UINT64, 4)) },
-    { MP_ROM_QSTR(MP_QSTR_INT64), MP_ROM_INT(TYPE2SMALLINT(INT64, 4)) },
-
-    { MP_ROM_QSTR(MP_QSTR_BFUINT8), MP_ROM_INT(TYPE2SMALLINT(BFUINT8, 4)) },
-    { MP_ROM_QSTR(MP_QSTR_BFINT8), MP_ROM_INT(TYPE2SMALLINT(BFINT8, 4)) },
-    { MP_ROM_QSTR(MP_QSTR_BFUINT16), MP_ROM_INT(TYPE2SMALLINT(BFUINT16, 4)) },
-    { MP_ROM_QSTR(MP_QSTR_BFINT16), MP_ROM_INT(TYPE2SMALLINT(BFINT16, 4)) },
-    { MP_ROM_QSTR(MP_QSTR_BFUINT32), MP_ROM_INT(TYPE2SMALLINT(BFUINT32, 4)) },
-    { MP_ROM_QSTR(MP_QSTR_BFINT32), MP_ROM_INT(TYPE2SMALLINT(BFINT32, 4)) },
-
-    { MP_ROM_QSTR(MP_QSTR_BF_POS), MP_ROM_INT(17) },
-    { MP_ROM_QSTR(MP_QSTR_BF_LEN), MP_ROM_INT(22) },
+    { MP_ROM_QSTR(MP_QSTR_UINT8), MP_ROM_INT(TYPE2SMALLINT(UINT8, VAL_TYPE_BITS)) },
+    { MP_ROM_QSTR(MP_QSTR_INT8), MP_ROM_INT(TYPE2SMALLINT(INT8, VAL_TYPE_BITS)) },
+    { MP_ROM_QSTR(MP_QSTR_UINT16), MP_ROM_INT(TYPE2SMALLINT(UINT16, VAL_TYPE_BITS)) },
+    { MP_ROM_QSTR(MP_QSTR_INT16), MP_ROM_INT(TYPE2SMALLINT(INT16, VAL_TYPE_BITS)) },
+    { MP_ROM_QSTR(MP_QSTR_UINT32), MP_ROM_INT(TYPE2SMALLINT(UINT32, VAL_TYPE_BITS)) },
+    { MP_ROM_QSTR(MP_QSTR_INT32), MP_ROM_INT(TYPE2SMALLINT(INT32, VAL_TYPE_BITS)) },
+    { MP_ROM_QSTR(MP_QSTR_UINT64), MP_ROM_INT(TYPE2SMALLINT(UINT64, VAL_TYPE_BITS)) },
+    { MP_ROM_QSTR(MP_QSTR_INT64), MP_ROM_INT(TYPE2SMALLINT(INT64, VAL_TYPE_BITS)) },
+
+    { MP_ROM_QSTR(MP_QSTR_BFUINT8), MP_ROM_INT(TYPE2SMALLINT(BFUINT8, VAL_TYPE_BITS)) },
+    { MP_ROM_QSTR(MP_QSTR_BFINT8), MP_ROM_INT(TYPE2SMALLINT(BFINT8, VAL_TYPE_BITS)) },
+    { MP_ROM_QSTR(MP_QSTR_BFUINT16), MP_ROM_INT(TYPE2SMALLINT(BFUINT16, VAL_TYPE_BITS)) },
+    { MP_ROM_QSTR(MP_QSTR_BFINT16), MP_ROM_INT(TYPE2SMALLINT(BFINT16, VAL_TYPE_BITS)) },
+    { MP_ROM_QSTR(MP_QSTR_BFUINT32), MP_ROM_INT(TYPE2SMALLINT(BFUINT32, VAL_TYPE_BITS)) },
+    { MP_ROM_QSTR(MP_QSTR_BFINT32), MP_ROM_INT(TYPE2SMALLINT(BFINT32, VAL_TYPE_BITS)) },
+
+    { MP_ROM_QSTR(MP_QSTR_BF_POS), MP_ROM_INT(OFFSET_BITS) },
+    { MP_ROM_QSTR(MP_QSTR_BF_LEN), MP_ROM_INT(LEN_BITS) },
 
     #if MICROPY_PY_BUILTINS_FLOAT
-    { MP_ROM_QSTR(MP_QSTR_FLOAT32), MP_ROM_INT(TYPE2SMALLINT(FLOAT32, 4)) },
-    { MP_ROM_QSTR(MP_QSTR_FLOAT64), MP_ROM_INT(TYPE2SMALLINT(FLOAT64, 4)) },
+    { MP_ROM_QSTR(MP_QSTR_FLOAT32), MP_ROM_INT(TYPE2SMALLINT(FLOAT32, VAL_TYPE_BITS)) },
+    { MP_ROM_QSTR(MP_QSTR_FLOAT64), MP_ROM_INT(TYPE2SMALLINT(FLOAT64, VAL_TYPE_BITS)) },
     #endif
 
     #if MICROPY_PY_UCTYPES_NATIVE_C_TYPES
     // C native type aliases. These depend on GCC-compatible predefined
     // preprocessor macros.
     #if __SIZEOF_SHORT__ == 2
-    { MP_ROM_QSTR(MP_QSTR_SHORT), MP_ROM_INT(TYPE2SMALLINT(INT16, 4)) },
-    { MP_ROM_QSTR(MP_QSTR_USHORT), MP_ROM_INT(TYPE2SMALLINT(UINT16, 4)) },
+    { MP_ROM_QSTR(MP_QSTR_SHORT), MP_ROM_INT(TYPE2SMALLINT(INT16, VAL_TYPE_BITS)) },
+    { MP_ROM_QSTR(MP_QSTR_USHORT), MP_ROM_INT(TYPE2SMALLINT(UINT16, VAL_TYPE_BITS)) },
     #endif
     #if __SIZEOF_INT__ == 4
-    { MP_ROM_QSTR(MP_QSTR_INT), MP_ROM_INT(TYPE2SMALLINT(INT32, 4)) },
-    { MP_ROM_QSTR(MP_QSTR_UINT), MP_ROM_INT(TYPE2SMALLINT(UINT32, 4)) },
+    { MP_ROM_QSTR(MP_QSTR_INT), MP_ROM_INT(TYPE2SMALLINT(INT32, VAL_TYPE_BITS)) },
+    { MP_ROM_QSTR(MP_QSTR_UINT), MP_ROM_INT(TYPE2SMALLINT(UINT32, VAL_TYPE_BITS)) },
     #endif
     #if __SIZEOF_LONG__ == 4
-    { MP_ROM_QSTR(MP_QSTR_LONG), MP_ROM_INT(TYPE2SMALLINT(INT32, 4)) },
-    { MP_ROM_QSTR(MP_QSTR_ULONG), MP_ROM_INT(TYPE2SMALLINT(UINT32, 4)) },
+    { MP_ROM_QSTR(MP_QSTR_LONG), MP_ROM_INT(TYPE2SMALLINT(INT32, VAL_TYPE_BITS)) },
+    { MP_ROM_QSTR(MP_QSTR_ULONG), MP_ROM_INT(TYPE2SMALLINT(UINT32, VAL_TYPE_BITS)) },
     #elif __SIZEOF_LONG__ == 8
-    { MP_ROM_QSTR(MP_QSTR_LONG), MP_ROM_INT(TYPE2SMALLINT(INT64, 4)) },
-    { MP_ROM_QSTR(MP_QSTR_ULONG), MP_ROM_INT(TYPE2SMALLINT(UINT64, 4)) },
+    { MP_ROM_QSTR(MP_QSTR_LONG), MP_ROM_INT(TYPE2SMALLINT(INT64, VAL_TYPE_BITS)) },
+    { MP_ROM_QSTR(MP_QSTR_ULONG), MP_ROM_INT(TYPE2SMALLINT(UINT64, VAL_TYPE_BITS)) },
     #endif
     #if __SIZEOF_LONG_LONG__ == 8
-    { MP_ROM_QSTR(MP_QSTR_LONGLONG), MP_ROM_INT(TYPE2SMALLINT(INT64, 4)) },
-    { MP_ROM_QSTR(MP_QSTR_ULONGLONG), MP_ROM_INT(TYPE2SMALLINT(UINT64, 4)) },
+    { MP_ROM_QSTR(MP_QSTR_LONGLONG), MP_ROM_INT(TYPE2SMALLINT(INT64, VAL_TYPE_BITS)) },
+    { MP_ROM_QSTR(MP_QSTR_ULONGLONG), MP_ROM_INT(TYPE2SMALLINT(UINT64, VAL_TYPE_BITS)) },
     #endif
     #endif // MICROPY_PY_UCTYPES_NATIVE_C_TYPES
 

From 47583d8cbd251d9cb3b0f4a70c5594d1329ad930 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 6 May 2021 13:11:33 +1000
Subject: [PATCH 0825/3533] extmod/moductypes: Fix size and offset calculation
 for ARRAY of FLOAT32.

uctypes.FLOAT32 has a special value representation and
uctypes_struct_scalar_size() should be used instead of GET_SCALAR_SIZE().

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/moductypes.c                      |  4 ++--
 tests/extmod/uctypes_le_float.py         | 16 ++++++++++++++++
 tests/extmod/uctypes_le_float.py.exp     |  2 ++
 tests/extmod/uctypes_sizeof_float.py     |  2 ++
 tests/extmod/uctypes_sizeof_float.py.exp |  2 ++
 5 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/extmod/moductypes.c b/extmod/moductypes.c
index 97e8d7a787928..58f0adfa4ba34 100644
--- a/extmod/moductypes.c
+++ b/extmod/moductypes.c
@@ -164,7 +164,7 @@ STATIC mp_uint_t uctypes_struct_agg_size(mp_obj_tuple_t *t, int layout_type, mp_
             mp_uint_t item_s;
             if (t->len == 2) {
                 // Elements of array are scalar
-                item_s = GET_SCALAR_SIZE(val_type);
+                item_s = uctypes_struct_scalar_size(val_type);
                 if (item_s > *max_field_size) {
                     *max_field_size = item_s;
                 }
@@ -541,7 +541,7 @@ STATIC mp_obj_t uctypes_struct_subscr(mp_obj_t self_in, mp_obj_t index_in, mp_ob
                         return value; // just !MP_OBJ_NULL
                     }
                 } else {
-                    byte *p = self->addr + GET_SCALAR_SIZE(val_type) * index;
+                    byte *p = self->addr + uctypes_struct_scalar_size(val_type) * index;
                     if (value == MP_OBJ_SENTINEL) {
                         return get_unaligned(val_type, p, self->flags);
                     } else {
diff --git a/tests/extmod/uctypes_le_float.py b/tests/extmod/uctypes_le_float.py
index 89e9a9e0abe48..5255632c912d7 100644
--- a/tests/extmod/uctypes_le_float.py
+++ b/tests/extmod/uctypes_le_float.py
@@ -22,3 +22,19 @@
 
 S.uf64 = 12.34
 print("%.4f" % S.uf64)
+
+# array of float/double
+desc = {
+    "af32": (uctypes.ARRAY | 0, uctypes.FLOAT32 | 2),
+    "af64": (uctypes.ARRAY | 0, uctypes.FLOAT64 | 2),
+}
+data = bytearray(16)
+S = uctypes.struct(uctypes.addressof(data), desc, uctypes.LITTLE_ENDIAN)
+
+S.af32[0] = 1
+S.af32[1] = 2
+print("%.4f %.4f" % (S.af32[0], S.af32[1]), data)
+
+S.af64[0] = 1
+S.af64[1] = 2
+print("%.4f %.4f" % (S.af64[0], S.af64[1]), data)
diff --git a/tests/extmod/uctypes_le_float.py.exp b/tests/extmod/uctypes_le_float.py.exp
index a35a1da2dc134..e93fcb0d97beb 100644
--- a/tests/extmod/uctypes_le_float.py.exp
+++ b/tests/extmod/uctypes_le_float.py.exp
@@ -1,3 +1,5 @@
 12.3400
 12.3400
 12.3400
+1.0000 2.0000 bytearray(b'\x00\x00\x80?\x00\x00\x00@\x00\x00\x00\x00\x00\x00\x00\x00')
+1.0000 2.0000 bytearray(b'\x00\x00\x00\x00\x00\x00\xf0?\x00\x00\x00\x00\x00\x00\x00@')
diff --git a/tests/extmod/uctypes_sizeof_float.py b/tests/extmod/uctypes_sizeof_float.py
index 351632d76bbf5..f1a4c88e2d81d 100644
--- a/tests/extmod/uctypes_sizeof_float.py
+++ b/tests/extmod/uctypes_sizeof_float.py
@@ -6,3 +6,5 @@
 
 print(uctypes.sizeof({"f": uctypes.FLOAT32}))
 print(uctypes.sizeof({"f": uctypes.FLOAT64}))
+print(uctypes.sizeof({"f": (uctypes.ARRAY | 0, uctypes.FLOAT32 | 2)}))
+print(uctypes.sizeof({"f": (uctypes.ARRAY | 0, uctypes.FLOAT64 | 2)}))
diff --git a/tests/extmod/uctypes_sizeof_float.py.exp b/tests/extmod/uctypes_sizeof_float.py.exp
index de78180725a82..82776b54ab5a0 100644
--- a/tests/extmod/uctypes_sizeof_float.py.exp
+++ b/tests/extmod/uctypes_sizeof_float.py.exp
@@ -1,2 +1,4 @@
 4
 8
+8
+16

From b98197f950b572aff2a34934e64d094e5cea6cd5 Mon Sep 17 00:00:00 2001
From: Mike Causer <mcauser@gmail.com>
Date: Fri, 30 Apr 2021 14:05:33 +1000
Subject: [PATCH 0826/3533] docs/esp32: Add UART to quickref.

---
 docs/esp32/quickref.rst | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/docs/esp32/quickref.rst b/docs/esp32/quickref.rst
index c29688f000289..2a9c8397c899a 100644
--- a/docs/esp32/quickref.rst
+++ b/docs/esp32/quickref.rst
@@ -171,6 +171,33 @@ Notes:
 * The pull value of some pins can be set to ``Pin.PULL_HOLD`` to reduce power
   consumption during deepsleep.
 
+UART (serial bus)
+-----------------
+
+See :ref:`machine.UART <machine.UART>`. ::
+
+    from machine import UART
+
+    uart1 = UART(1, baudrate=9600, tx=33, rx=32)
+    uart1.write('hello')  # write 5 bytes
+    uart1.read(5)         # read up to 5 bytes
+
+The ESP32 has three hardware UARTs: UART0, UART1 and UART2.
+They each have default GPIO assigned to them, however depending on your
+ESP32 variant and board, these pins may conflict with embedded flash,
+onboard PSRAM or peripherals.
+
+Any GPIO can be used for hardware UARTs using the GPIO matrix, so to avoid
+conflicts simply provide ``tx`` and ``rx`` pins when constructing. The default
+pins listed below.
+
+=====  =====  =====  =====
+\      UART0  UART1  UART2
+=====  =====  =====  =====
+tx     1      10     17
+rx     3      9      16
+=====  =====  =====  =====
+
 PWM (pulse width modulation)
 ----------------------------
 

From a65942a41d5bedd80b0098b1578680e72bef384b Mon Sep 17 00:00:00 2001
From: Mike Causer <mcauser@gmail.com>
Date: Fri, 30 Apr 2021 14:03:16 +1000
Subject: [PATCH 0827/3533] docs/esp32: Add WDT to quickref.

---
 docs/esp32/quickref.rst | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/docs/esp32/quickref.rst b/docs/esp32/quickref.rst
index 2a9c8397c899a..5e70275830d81 100644
--- a/docs/esp32/quickref.rst
+++ b/docs/esp32/quickref.rst
@@ -384,6 +384,17 @@ See :ref:`machine.RTC <machine.RTC>` ::
     rtc.datetime((2017, 8, 23, 1, 12, 48, 0, 0)) # set a specific date and time
     rtc.datetime() # get date and time
 
+WDT (Watchdog timer)
+--------------------
+
+See :ref:`machine.WDT <machine.WDT>`. ::
+
+    from machine import WDT
+
+    # enable the WDT with a timeout of 5s (1s is the minimum)
+    wdt = WDT(timeout=5000)
+    wdt.feed()
+
 Deep-sleep mode
 ---------------
 

From a111889705649465b2fd57a1f10bd34aae9b4435 Mon Sep 17 00:00:00 2001
From: Mike Causer <mcauser@gmail.com>
Date: Fri, 30 Apr 2021 14:04:37 +1000
Subject: [PATCH 0828/3533] docs/esp32: Add SDCard to quickref.

---
 docs/esp32/quickref.rst | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/docs/esp32/quickref.rst b/docs/esp32/quickref.rst
index 5e70275830d81..a569ff0a4e282 100644
--- a/docs/esp32/quickref.rst
+++ b/docs/esp32/quickref.rst
@@ -424,6 +424,21 @@ Notes:
 
     p1 = Pin(4, Pin.OUT, None)
 
+SD card
+-------
+
+See :ref:`machine.SDCard <machine.SDCard>`. ::
+
+    import machine, uos
+
+    # Slot 2 uses pins sck=18, cs=5, miso=19, mosi=23
+    sd = machine.SDCard(slot=2)
+    uos.mount(sd, "/sd")  # mount
+
+    uos.listdir('/sd')    # list directory contents
+
+    uos.umount('/sd')     # eject
+
 RMT
 ---
 

From 64aebed70e58ecc9623231d887d9818475174081 Mon Sep 17 00:00:00 2001
From: Mike Causer <mcauser@gmail.com>
Date: Fri, 30 Apr 2021 14:02:17 +1000
Subject: [PATCH 0829/3533] docs/esp8266: Add WDT to quickref.

---
 docs/esp8266/quickref.rst | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/docs/esp8266/quickref.rst b/docs/esp8266/quickref.rst
index b9a46ab112a0c..af2ef1ca1a9df 100644
--- a/docs/esp8266/quickref.rst
+++ b/docs/esp8266/quickref.rst
@@ -293,6 +293,17 @@ See :ref:`machine.RTC <machine.RTC>` ::
           (using a custom handler), `RTC.init()` and `RTC.deinit()` are
           currently not supported.
 
+WDT (Watchdog timer)
+--------------------
+
+See :ref:`machine.WDT <machine.WDT>`. ::
+
+    from machine import WDT
+
+    # enable the WDT
+    wdt = WDT()
+    wdt.feed()
+
 Deep-sleep mode
 ---------------
 

From 8ff3520f67bb8f7e5509129f9f561a1217ababa4 Mon Sep 17 00:00:00 2001
From: mishafarms <github@mishafarms.us>
Date: Tue, 4 May 2021 10:50:20 -0700
Subject: [PATCH 0830/3533] esp32/esp32_rmt: Clear config struct before filling
 it out.

Or unset entries will have garbage in them.

Signed-off-by: mishafarms <github@mishafarms.us>
---
 ports/esp32/esp32_rmt.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/esp32/esp32_rmt.c b/ports/esp32/esp32_rmt.c
index b547af5539f34..9619b1dd5bd01 100644
--- a/ports/esp32/esp32_rmt.c
+++ b/ports/esp32/esp32_rmt.c
@@ -96,7 +96,7 @@ STATIC mp_obj_t esp32_rmt_make_new(const mp_obj_type_t *type, size_t n_args, siz
     self->carrier_freq = carrier_freq;
     self->loop_en = false;
 
-    rmt_config_t config;
+    rmt_config_t config = {0};
     config.rmt_mode = RMT_MODE_TX;
     config.channel = (rmt_channel_t)self->channel_id;
     config.gpio_num = self->pin;

From 9eea51b730532cb33fe2531a3aade734d0a0a121 Mon Sep 17 00:00:00 2001
From: Mike Causer <mcauser@gmail.com>
Date: Tue, 20 Apr 2021 17:07:43 +1000
Subject: [PATCH 0831/3533] drivers/display/ssd1306.py: Add rotate method.

And clean up (make more efficient) display set-up commands.
---
 drivers/display/ssd1306.py | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/drivers/display/ssd1306.py b/drivers/display/ssd1306.py
index 6359c85eaaa1f..85e2bf0cb528e 100644
--- a/drivers/display/ssd1306.py
+++ b/drivers/display/ssd1306.py
@@ -37,12 +37,12 @@ def __init__(self, width, height, external_vcc):
 
     def init_display(self):
         for cmd in (
-            SET_DISP | 0x00,  # off
+            SET_DISP,  # display off
             # address setting
             SET_MEM_ADDR,
             0x00,  # horizontal
             # resolution and layout
-            SET_DISP_START_LINE | 0x00,
+            SET_DISP_START_LINE,  # start at line 0
             SET_SEG_REMAP | 0x01,  # column addr 127 mapped to SEG0
             SET_MUX_RATIO,
             self.height - 1,
@@ -66,14 +66,14 @@ def init_display(self):
             # charge pump
             SET_CHARGE_PUMP,
             0x10 if self.external_vcc else 0x14,
-            SET_DISP | 0x01,
+            SET_DISP | 0x01,  # display on
         ):  # on
             self.write_cmd(cmd)
         self.fill(0)
         self.show()
 
     def poweroff(self):
-        self.write_cmd(SET_DISP | 0x00)
+        self.write_cmd(SET_DISP)
 
     def poweron(self):
         self.write_cmd(SET_DISP | 0x01)
@@ -85,6 +85,10 @@ def contrast(self, contrast):
     def invert(self, invert):
         self.write_cmd(SET_NORM_INV | (invert & 1))
 
+    def rotate(self, rotate):
+        self.write_cmd(SET_COM_OUT_DIR | ((rotate & 1) << 3))
+        self.write_cmd(SET_SEG_REMAP | (rotate & 1))
+
     def show(self):
         x0 = 0
         x1 = self.width - 1

From fd24e649fde26bcd484b30025527768d37f5c562 Mon Sep 17 00:00:00 2001
From: Tim Radvan <tim@tjvr.org>
Date: Fri, 16 Apr 2021 12:18:04 +0100
Subject: [PATCH 0832/3533] docs/library: Add initial API reference for rp2
 module and its classes.

All the method signatures from rp2_pio.c and friends have been taken and
converted to RST format, then explanatory notes added for each signature.

Signed-off-by: Tim Radvan <tim@tjvr.org>
---
 docs/library/index.rst            |  11 +++
 docs/library/machine.rst          |   6 +-
 docs/library/rp2.Flash.rst        |  36 ++++++++
 docs/library/rp2.PIO.rst          |  94 +++++++++++++++++++++
 docs/library/rp2.StateMachine.rst | 131 ++++++++++++++++++++++++++++++
 docs/library/rp2.rst              |  83 +++++++++++++++++++
 6 files changed, 359 insertions(+), 2 deletions(-)
 create mode 100644 docs/library/rp2.Flash.rst
 create mode 100644 docs/library/rp2.PIO.rst
 create mode 100644 docs/library/rp2.StateMachine.rst
 create mode 100644 docs/library/rp2.rst

diff --git a/docs/library/index.rst b/docs/library/index.rst
index 43d9e87f3cda7..2536e8dc96d04 100644
--- a/docs/library/index.rst
+++ b/docs/library/index.rst
@@ -165,3 +165,14 @@ The following libraries are specific to the ESP8266 and ESP32.
 
   esp.rst
   esp32.rst
+
+
+Libraries specific to the RP2040
+--------------------------------
+
+The following libraries are specific to the RP2040, as used in the Raspberry Pi Pico.
+
+.. toctree::
+  :maxdepth: 2
+
+  rp2.rst
diff --git a/docs/library/machine.rst b/docs/library/machine.rst
index f831049f88e92..0a1c1c953005f 100644
--- a/docs/library/machine.rst
+++ b/docs/library/machine.rst
@@ -64,9 +64,11 @@ Interrupt related functions
 Power related functions
 -----------------------
 
-.. function:: freq()
+.. function:: freq([hz])
 
-    Returns CPU frequency in hertz.
+    Returns the CPU frequency in hertz.
+
+    On some ports this can also be used to set the CPU frequency by passing in *hz*.
 
 .. function:: idle()
 
diff --git a/docs/library/rp2.Flash.rst b/docs/library/rp2.Flash.rst
new file mode 100644
index 0000000000000..3b423adfdd894
--- /dev/null
+++ b/docs/library/rp2.Flash.rst
@@ -0,0 +1,36 @@
+.. currentmodule:: rp2
+.. _rp2.Flash:
+
+class Flash -- access to built-in flash storage
+===============================================
+
+This class gives access to the SPI flash memory.
+
+In most cases, to store persistent data on the device, you'll want to use a
+higher-level abstraction, for example the filesystem via Python's standard file
+API, but this interface is useful to :ref:`customise the filesystem
+configuration <filesystem>` or implement a low-level storage system for your
+application.
+
+
+Constructors
+------------
+
+.. class:: Flash()
+
+   Gets the singleton object for accessing the SPI flash memory.
+
+
+Methods
+-------
+
+.. method:: Flash.readblocks(block_num, buf)
+            Flash.readblocks(block_num, buf, offset)
+.. method:: Flash.writeblocks(block_num, buf)
+            Flash.writeblocks(block_num, buf, offset)
+.. method:: Flash.ioctl(cmd, arg)
+
+    These methods implement the simple and extended
+    :ref:`block protocol <block-device-interface>` defined by
+    :class:`uos.AbstractBlockDev`.
+
diff --git a/docs/library/rp2.PIO.rst b/docs/library/rp2.PIO.rst
new file mode 100644
index 0000000000000..e0675af1e9a2c
--- /dev/null
+++ b/docs/library/rp2.PIO.rst
@@ -0,0 +1,94 @@
+.. currentmodule:: rp2
+.. _rp2.PIO:
+
+class PIO -- advanced PIO usage
+===============================
+
+The :class:`PIO` class gives access to an instance of the RP2040's PIO
+(programmable I/O) interface.
+
+The preferred way to interact with PIO is using :class:`rp2.StateMachine`, the
+PIO class is for advanced use.
+
+For assembling PIO programs, see :func:`rp2.asm_pio`.
+
+
+Constructors
+------------
+
+.. class:: PIO(id)
+
+    Gets the PIO instance numbered *id*. The RP2040 has two PIO instances,
+    numbered 0 and 1.
+
+    Raises a ``ValueError`` if any other argument is provided.
+
+
+Methods
+-------
+
+.. method:: PIO.add_program(program)
+
+    Add the *program* to the instruction memory of this PIO instance.
+
+    The amount of memory available for programs on each PIO instance is
+    limited. If there isn't enough space left in the PIO's program memory
+    this method will raise ``OSError(ENOMEM)``.
+
+.. method:: PIO.remove_program([program])
+
+    Remove *program* from the instruction memory of this PIO instance.
+
+    If no program is provided, it removes all programs.
+
+    It is not an error to remove a program which has already been removed.
+
+.. method:: PIO.state_machine(id, [program, ...])
+
+    Gets the state machine numbered *id*. On the RP2040, each PIO instance has
+    four state machines, numbered 0 to 3.
+
+    Optionally initialize it with a *program*: see `StateMachine.init`.
+
+    >>> rp2.PIO(1).state_machine(3)
+    StateMachine(7)
+
+.. method:: PIO.irq(handler=None, trigger=IRQ_SM0|IRQ_SM1|IRQ_SM2|IRQ_SM3, hard=False)
+
+    Returns the IRQ object for this PIO instance.
+
+    MicroPython only uses IRQ 0 on each PIO instance. IRQ 1 is not available.
+
+    Optionally configure it.
+
+
+Constants
+---------
+
+.. data:: PIO.IN_LOW
+          PIO.IN_HIGH
+          PIO.OUT_LOW
+          PIO.OUT_HIGH
+
+    These constants are used for the *out_init*, *set_init*, and *sideset_init*
+    arguments to `asm_pio`.
+
+.. data:: PIO.SHIFT_LEFT
+          PIO.SHIFT_RIGHT
+
+    These constants are used for the *in_shiftdir* and *out_shiftdir* arguments
+    to `asm_pio` or `StateMachine.init`.
+
+.. data:: PIO.JOIN_NONE
+          PIO.JOIN_TX
+          PIO.JOIN_RX
+
+    These constants are used for the *fifo_join* argument to `asm_pio`.
+
+.. data:: PIO.IRQ_SM0
+          PIO.IRQ_SM1
+          PIO.IRQ_SM2
+          PIO.IRQ_SM3
+
+    These constants are used for the *trigger* argument to `PIO.irq`.
+
diff --git a/docs/library/rp2.StateMachine.rst b/docs/library/rp2.StateMachine.rst
new file mode 100644
index 0000000000000..8d73ccf772a7f
--- /dev/null
+++ b/docs/library/rp2.StateMachine.rst
@@ -0,0 +1,131 @@
+.. currentmodule:: rp2
+.. _rp2.StateMachine:
+
+class StateMachine -- access to the RP2040's programmable I/O interface
+=======================================================================
+
+The :class:`StateMachine` class gives access to the RP2040's PIO (programmable
+I/O) interface.
+
+For assembling PIO programs, see :func:`rp2.asm_pio`.
+
+
+Constructors
+------------
+
+.. class:: StateMachine(id, [program, ...])
+
+    Get the state machine numbered *id*. The RP2040 has two identical PIO
+    instances, each with 4 state machines: so there are 8 state machines in
+    total, numbered 0 to 7.
+
+    Optionally initialize it with the given program *program*: see
+    `StateMachine.init`.
+
+
+Methods
+-------
+
+.. method:: StateMachine.init(program, freq=-1, *, in_base=None, out_base=None, set_base=None, jmp_pin=None, sideset_base=None, in_shiftdir=None, out_shiftdir=None, push_thresh=None, pull_thresh=None)
+
+    Configure the state machine instance to run the given *program*.
+
+    The program is added to the instruction memory of this PIO instance. If the
+    instruction memory already contains this program, then its offset is
+    re-used so as to save on instruction memory.
+
+    - *freq* is the frequency in Hz to run the state machine at. Defaults to
+      the system clock frequency.
+
+      The clock divider is computed as ``system clock frequency / freq``, so
+      there can be slight rounding errors.
+
+      The minimum possible clock divider is one 65536th of the system clock: so
+      at the default system clock frequency of 125MHz, the minimum value of
+      *freq* is ``1908``. To run state machines at slower frequencies, you'll
+      need to reduce the system clock speed with `machine.freq()`.
+    - *in_base* is the first pin to use for ``in()`` instructions.
+    - *out_base* is the first pin to use for ``out()`` instructions.
+    - *set_base* is the first pin to use for ``set()`` instructions.
+    - *jmp_pin* is the first pin to use for ``jmp(pin, ...)`` instructions.
+    - *sideset_base* is the first pin to use for side-setting.
+    - *in_shiftdir* is the direction the ISR will shift, either
+      `PIO.SHIFT_LEFT` or `PIO.SHIFT_RIGHT`.
+    - *out_shiftdir* is the direction the OSR will shift, either
+      `PIO.SHIFT_LEFT` or `PIO.SHIFT_RIGHT`.
+    - *push_thresh* is the threshold in bits before auto-push or conditional
+      re-pushing is triggered.
+    - *pull_thresh* is the threshold in bits before auto-push or conditional
+      re-pushing is triggered.
+
+.. method:: StateMachine.active([value])
+
+    Gets or sets whether the state machine is currently running.
+
+    >>> sm.active()
+    True
+    >>> sm.active(0)
+    False
+
+.. method:: StateMachine.restart()
+
+    Restarts the state machine and jumps to the beginning of the program.
+
+    This method clears the state machine's internal state using the RP2040's
+    ``SM_RESTART`` register. This includes:
+
+     - input and output shift counters
+     - the contents of the input shift register
+     - the delay counter
+     - the waiting-on-IRQ state
+     - a stalled instruction run using `StateMachine.exec()`
+
+.. method:: StateMachine.exec(instr)
+
+    Execute a single PIO instruction. Uses `asm_pio_encode` to encode the
+    instruction from the given string *instr*.
+
+    >>> sm.exec("set(0, 1)")
+
+.. method:: StateMachine.get(buf=None, shift=0)
+
+    Pull a word from the state machine's RX FIFO.
+
+    If the FIFO is empty, it blocks until data arrives (i.e. the state machine
+    pushes a word).
+
+    The value is shifted right by *shift* bits before returning, i.e. the
+    return value is ``word >> shift``.
+
+.. method:: StateMachine.put(value, shift=0)
+
+    Push a word onto the state machine's TX FIFO.
+
+    If the FIFO is full, it blocks until there is space (i.e. the state machine
+    pulls a word).
+
+    The value is first shifted left by *shift* bits, i.e. the state machine
+    receives ``value << shift``.
+
+.. method:: StateMachine.rx_fifo()
+
+    Returns the number of words in the state machine's RX FIFO. A value of 0
+    indicates the FIFO is empty.
+
+    Useful for checking if data is waiting to be read, before calling
+    `StateMachine.get()`.
+
+.. method:: StateMachine.tx_fifo()
+
+    Returns the number of words in the state machine's TX FIFO. A value of 0
+    indicates the FIFO is empty.
+
+    Useful for checking if there is space to push another word using
+    `StateMachine.put()`.
+
+.. method:: StateMachine.irq(handler=None, trigger=0|1, hard=False)
+
+     Returns the IRQ object for the given StateMachine.
+
+     Optionally configure it.
+
diff --git a/docs/library/rp2.rst b/docs/library/rp2.rst
new file mode 100644
index 0000000000000..b6e7fcf429505
--- /dev/null
+++ b/docs/library/rp2.rst
@@ -0,0 +1,83 @@
+.. currentmodule:: rp2
+
+:mod:`rp2` --- functionality specific to the RP2040
+===================================================
+
+.. module:: rp2
+    :synopsis: functionality specific to the RP2
+
+The ``rp2`` module contains functions and classes specific to the RP2040, as
+used in the Raspberry Pi Pico.
+
+See the `RP2040 Python datasheet
+<https://datasheets.raspberrypi.org/pico/raspberry-pi-pico-python-sdk.pdf>`_
+for more information, and `pico-micropython-examples
+<https://github.com/raspberrypi/pico-micropython-examples/tree/master/pio>`_
+for example code.
+
+
+PIO related functions
+---------------------
+
+The ``rp2`` module includes functions for assembling PIO programs.
+
+For running PIO programs, see :class:`rp2.StateMachine`.
+
+.. function:: asm_pio(*, out_init=None, set_init=None, sideset_init=None, in_shiftdir=0, out_shiftdir=0, autopush=False, autopull=False, push_thresh=32, pull_thresh=32, fifo_join=PIO.JOIN_NONE)
+
+    Assemble a PIO program.
+
+    The following parameters control the initial state of the GPIO pins, as one
+    of `PIO.IN_LOW`, `PIO.IN_HIGH`, `PIO.OUT_LOW` or `PIO.OUT_HIGH`. If the
+    program uses more than one pin, provide a tuple, e.g.
+    ``out_init=(PIO.OUT_LOW, PIO.OUT_LOW)``.
+
+    - *out_init* configures the pins used for ``out()`` instructions.
+    - *set_init* configures the pins used for ``set()`` instructions. There can
+      be at most 5.
+    - *sideset_init* configures the pins used side-setting. There can be at
+      most 5.
+
+    The following parameters are used by default, but can be overriden in
+    `StateMachine.init()`:
+
+    - *in_shiftdir* is the default direction the ISR will shift, either
+      `PIO.SHIFT_LEFT` or `PIO.SHIFT_RIGHT`.
+    - *out_shiftdir* is the default direction the OSR will shift, either
+      `PIO.SHIFT_LEFT` or `PIO.SHIFT_RIGHT`.
+    - *push_thresh* is the threshold in bits before auto-push or conditional
+      re-pushing is triggered.
+    - *pull_thresh* is the threshold in bits before auto-push or conditional
+      re-pushing is triggered.
+
+    The remaining parameters are:
+
+    - *autopush* configures whether auto-push is enabled.
+    - *autopull* configures whether auto-pull is enabled.
+    - *fifo_join* configures whether the 4-word TX and RX FIFOs should be
+      combined into a single 8-word FIFO for one direction only. The options
+      are `PIO.JOIN_NONE`, `PIO.JOIN_RX` and `PIO.JOIN_TX`.
+
+.. function:: asm_pio_encode(instr, sideset_count)
+
+    Assemble a single PIO instruction. You usually want to use `asm_pio()`
+    instead.
+
+    >>> rp2.asm_pio_encode("set(0, 1)", 0)
+    57345
+
+.. class:: PIOASMError
+
+    This exception is raised from `asm_pio()` or `asm_pio_encode()` if there is
+    an error assembling a PIO program.
+
+
+Classes
+-------
+
+.. toctree::
+    :maxdepth: 1
+
+    rp2.Flash.rst
+    rp2.PIO.rst
+    rp2.StateMachine.rst

From 31e0b8c71c6e9bed7388439e2441465c58311393 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sat, 8 May 2021 18:14:13 +1000
Subject: [PATCH 0833/3533] esp32/mpthreadport: Don't explicitly free thread
 struct in TCB cleanup.

Because vPortCleanUpTCB runs on the FreeRTOS idle task and cannot execute
any VM or runtime related code like freeing memory.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/mpthreadport.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/ports/esp32/mpthreadport.c b/ports/esp32/mpthreadport.c
index 140a76464fe40..bbfc53d3f52c1 100644
--- a/ports/esp32/mpthreadport.c
+++ b/ports/esp32/mpthreadport.c
@@ -166,6 +166,8 @@ void mp_thread_finish(void) {
     mp_thread_mutex_unlock(&thread_mutex);
 }
 
+// This is called from the FreeRTOS idle task and is not within Python context,
+// so MP_STATE_THREAD is not valid and it does not have the GIL.
 void vPortCleanUpTCB(void *tcb) {
     if (thread == NULL) {
         // threading not yet initialised
@@ -182,8 +184,7 @@ void vPortCleanUpTCB(void *tcb) {
                 // move the start pointer
                 thread = th->next;
             }
-            // explicitly release all its memory
-            m_del(thread_t, th, 1);
+            // The "th" memory will eventually be reclaimed by the GC.
             break;
         }
     }

From 864e4ecc47f204e6ca6fbe8342e268932c89acdf Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sat, 8 May 2021 18:17:27 +1000
Subject: [PATCH 0834/3533] esp32/mpthreadport: Use binary semaphore instead of
 mutex.

So a lock can be acquired on one Python thread and then released on
another.  A test for this is added.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/mpthreadport.c   |  5 ++++-
 tests/thread/thread_lock5.py | 16 ++++++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 tests/thread/thread_lock5.py

diff --git a/ports/esp32/mpthreadport.c b/ports/esp32/mpthreadport.c
index bbfc53d3f52c1..f575d99e6ec65 100644
--- a/ports/esp32/mpthreadport.c
+++ b/ports/esp32/mpthreadport.c
@@ -192,7 +192,10 @@ void vPortCleanUpTCB(void *tcb) {
 }
 
 void mp_thread_mutex_init(mp_thread_mutex_t *mutex) {
-    mutex->handle = xSemaphoreCreateMutexStatic(&mutex->buffer);
+    // Need a binary semaphore so a lock can be acquired on one Python thread
+    // and then released on another.
+    mutex->handle = xSemaphoreCreateBinaryStatic(&mutex->buffer);
+    xSemaphoreGive(mutex->handle);
 }
 
 int mp_thread_mutex_lock(mp_thread_mutex_t *mutex, int wait) {
diff --git a/tests/thread/thread_lock5.py b/tests/thread/thread_lock5.py
new file mode 100644
index 0000000000000..830b5efa82815
--- /dev/null
+++ b/tests/thread/thread_lock5.py
@@ -0,0 +1,16 @@
+# test _thread lock objects where a lock is acquired/released by a different thread
+
+import _thread
+
+
+def thread_entry():
+    print("thread about to release lock")
+    lock.release()
+
+
+lock = _thread.allocate_lock()
+lock.acquire()
+_thread.start_new_thread(thread_entry, ())
+lock.acquire()
+print("main has lock")
+lock.release()

From 9340cfe77432b548fc6ace6e2959a07a08e8eadc Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sat, 8 May 2021 18:20:05 +1000
Subject: [PATCH 0835/3533] tests/thread: Make stress_create.py test run on
 esp32.

The esp32 port needs to be idle for finished threads and their resources to
be freed up.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/thread/stress_create.py | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/tests/thread/stress_create.py b/tests/thread/stress_create.py
index eda768fa7b5a3..877424cdf50b2 100644
--- a/tests/thread/stress_create.py
+++ b/tests/thread/stress_create.py
@@ -1,9 +1,13 @@
 # stress test for creating many threads
 
 try:
-    import utime as time
+    import utime
+
+    sleep_ms = utime.sleep_ms
 except ImportError:
     import time
+
+    sleep_ms = lambda t: time.sleep(t / 1000)
 import _thread
 
 
@@ -16,9 +20,11 @@ def thread_entry(n):
     try:
         _thread.start_new_thread(thread_entry, (thread_num,))
         thread_num += 1
-    except MemoryError:
-        pass
+    except (MemoryError, OSError) as er:
+        # Cannot create a new thead at this stage, yield for a bit to
+        # let existing threads run to completion and free up resources.
+        sleep_ms(50)
 
 # wait for the last threads to terminate
-time.sleep(1)
+sleep_ms(500)
 print("done")

From 7b923d6c72be29e2fe57740c9ea3a2135e7db6f7 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sat, 8 May 2021 18:36:27 +1000
Subject: [PATCH 0836/3533] tests/thread: Make stress_aes.py test run on
 bare-metal ports.

This is a long-running test, so make it run in reasonable time on slower,
bare-metal ports.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/thread/stress_aes.py | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/tests/thread/stress_aes.py b/tests/thread/stress_aes.py
index f73da557cb00e..1bf252a807f9a 100644
--- a/tests/thread/stress_aes.py
+++ b/tests/thread/stress_aes.py
@@ -235,7 +235,7 @@ def add(self, val):
 count = LockedCounter()
 
 
-def thread_entry():
+def thread_entry(n_loop):
     global count
 
     aes = AES(256)
@@ -244,7 +244,7 @@ def thread_entry():
     data = bytearray(128)
     # from now on we don't use the heap
 
-    for loop in range(5):
+    for loop in range(n_loop):
         # encrypt
         aes.set_key(key)
         aes.set_iv(iv)
@@ -265,8 +265,20 @@ def thread_entry():
 
 
 if __name__ == "__main__":
-    n_thread = 20
+    import sys
+
+    if sys.platform == "rp2":
+        n_thread = 1
+        n_loop = 2
+    elif sys.platform in ("esp32", "pyboard"):
+        n_thread = 2
+        n_loop = 2
+    else:
+        n_thread = 20
+        n_loop = 5
     for i in range(n_thread):
-        _thread.start_new_thread(thread_entry, ())
+        _thread.start_new_thread(thread_entry, (n_loop,))
+    thread_entry(n_loop)
     while count.value < n_thread:
         time.sleep(1)
+    print("done")

From d0de16266f92de180bd34f03aa43f1c489cd883a Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sun, 9 May 2021 00:08:30 +1000
Subject: [PATCH 0837/3533] rp2/mpthreadport: Add mp_thread_deinit to reset
 core1 on soft reset.

Any code running on core1 should be stopped on soft-reset (the GC heap is
reset so if code continues to run on core1 it will see corrupt memory).

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/rp2/main.c         | 3 +++
 ports/rp2/mpthreadport.c | 5 +++++
 ports/rp2/mpthreadport.h | 1 +
 3 files changed, 9 insertions(+)

diff --git a/ports/rp2/main.c b/ports/rp2/main.c
index 8fddeaa560510..7709a478bc80a 100644
--- a/ports/rp2/main.c
+++ b/ports/rp2/main.c
@@ -138,6 +138,9 @@ int main(int argc, char **argv) {
         mp_printf(MP_PYTHON_PRINTER, "MPY: soft reboot\n");
         rp2_pio_deinit();
         machine_pin_deinit();
+        #if MICROPY_PY_THREAD
+        mp_thread_deinit();
+        #endif
         gc_sweep_all();
         mp_deinit();
     }
diff --git a/ports/rp2/mpthreadport.c b/ports/rp2/mpthreadport.c
index fb4428772afc1..8a36cfca75a34 100644
--- a/ports/rp2/mpthreadport.c
+++ b/ports/rp2/mpthreadport.c
@@ -46,6 +46,11 @@ void mp_thread_init(void) {
     core1_entry = NULL;
 }
 
+void mp_thread_deinit(void) {
+    multicore_reset_core1();
+    core1_entry = NULL;
+}
+
 void mp_thread_gc_others(void) {
     if (get_core_num() == 0) {
         // GC running on core0, trace core1's stack, if it's running.
diff --git a/ports/rp2/mpthreadport.h b/ports/rp2/mpthreadport.h
index 5eb0bff396b98..868f8d14118dd 100644
--- a/ports/rp2/mpthreadport.h
+++ b/ports/rp2/mpthreadport.h
@@ -34,6 +34,7 @@ typedef struct mutex mp_thread_mutex_t;
 extern void *core_state[2];
 
 void mp_thread_init(void);
+void mp_thread_deinit(void);
 void mp_thread_gc_others(void);
 
 static inline void mp_thread_set_state(struct _mp_state_thread_t *state) {

From b6b39bff47b5ff1ffc322a6e795d57451d4215a8 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 4 May 2021 23:56:43 +1000
Subject: [PATCH 0838/3533] py/gc: Make gc_lock_depth have a count per thread.

This commit makes gc_lock_depth have one counter per thread, instead of one
global counter.  This makes threads properly independent with respect to
the GC, in particular threads can now independently lock the GC for
themselves without locking it for other threads.  It also means a given
thread can run a hard IRQ without temporarily locking the GC for all other
threads and potentially making them have MemoryError exceptions at random
locations (this really only occurs on MCUs with multiple cores and no GIL,
eg on the rp2 port).

The commit also removes protection of the GC lock/unlock functions, which
is no longer needed when the counter is per thread (and this also fixes the
cas where a hard IRQ calling gc_lock() may stall waiting for the mutex).

It also puts the check for `gc_lock_depth > 0` outside the GC mutex in
gc_alloc, gc_realloc and gc_free, to potentially prevent a hard IRQ from
waiting on a mutex if it does attempt to allocate heap memory (and putting
the check outside the GC mutex is now safe now that there is a
gc_lock_depth per thread).

Signed-off-by: Damien George <damien@micropython.org>
---
 lib/utils/pyexec.c                   |  4 +--
 py/gc.c                              | 45 ++++++++++++++--------------
 py/modmicropython.c                  |  4 +--
 py/modthread.c                       |  3 ++
 py/mpstate.h                         |  4 ++-
 tests/thread/thread_heap_lock.py     | 26 ++++++++++++++++
 tests/thread/thread_heap_lock.py.exp |  1 +
 7 files changed, 59 insertions(+), 28 deletions(-)
 create mode 100644 tests/thread/thread_heap_lock.py
 create mode 100644 tests/thread/thread_heap_lock.py.exp

diff --git a/lib/utils/pyexec.c b/lib/utils/pyexec.c
index d1e955d65b9a2..4446b36b61b56 100644
--- a/lib/utils/pyexec.c
+++ b/lib/utils/pyexec.c
@@ -588,8 +588,8 @@ int pyexec_friendly_repl(void) {
 
         // If the GC is locked at this point there is no way out except a reset,
         // so force the GC to be unlocked to help the user debug what went wrong.
-        if (MP_STATE_MEM(gc_lock_depth) != 0) {
-            MP_STATE_MEM(gc_lock_depth) = 0;
+        if (MP_STATE_THREAD(gc_lock_depth) != 0) {
+            MP_STATE_THREAD(gc_lock_depth) = 0;
         }
 
         vstr_reset(&line);
diff --git a/py/gc.c b/py/gc.c
index 53a0d9da4a73c..88adf2045eb42 100644
--- a/py/gc.c
+++ b/py/gc.c
@@ -150,7 +150,7 @@ void gc_init(void *start, void *end) {
     MP_STATE_MEM(gc_last_free_atb_index) = 0;
 
     // unlock the GC
-    MP_STATE_MEM(gc_lock_depth) = 0;
+    MP_STATE_THREAD(gc_lock_depth) = 0;
 
     // allow auto collection
     MP_STATE_MEM(gc_auto_collect_enabled) = 1;
@@ -174,19 +174,20 @@ void gc_init(void *start, void *end) {
 }
 
 void gc_lock(void) {
-    GC_ENTER();
-    MP_STATE_MEM(gc_lock_depth)++;
-    GC_EXIT();
+    // This does not need to be atomic or have the GC mutex because:
+    // - each thread has its own gc_lock_depth so there are no races between threads;
+    // - a hard interrupt will only change gc_lock_depth during its execution, and
+    //   upon return will restore the value of gc_lock_depth.
+    MP_STATE_THREAD(gc_lock_depth)++;
 }
 
 void gc_unlock(void) {
-    GC_ENTER();
-    MP_STATE_MEM(gc_lock_depth)--;
-    GC_EXIT();
+    // This does not need to be atomic, See comment above in gc_lock.
+    MP_STATE_THREAD(gc_lock_depth)--;
 }
 
 bool gc_is_locked(void) {
-    return MP_STATE_MEM(gc_lock_depth) != 0;
+    return MP_STATE_THREAD(gc_lock_depth) != 0;
 }
 
 // ptr should be of type void*
@@ -320,7 +321,7 @@ STATIC void gc_sweep(void) {
 
 void gc_collect_start(void) {
     GC_ENTER();
-    MP_STATE_MEM(gc_lock_depth)++;
+    MP_STATE_THREAD(gc_lock_depth)++;
     #if MICROPY_GC_ALLOC_THRESHOLD
     MP_STATE_MEM(gc_alloc_amount) = 0;
     #endif
@@ -360,13 +361,13 @@ void gc_collect_end(void) {
     gc_deal_with_stack_overflow();
     gc_sweep();
     MP_STATE_MEM(gc_last_free_atb_index) = 0;
-    MP_STATE_MEM(gc_lock_depth)--;
+    MP_STATE_THREAD(gc_lock_depth)--;
     GC_EXIT();
 }
 
 void gc_sweep_all(void) {
     GC_ENTER();
-    MP_STATE_MEM(gc_lock_depth)++;
+    MP_STATE_THREAD(gc_lock_depth)++;
     MP_STATE_MEM(gc_stack_overflow) = 0;
     gc_collect_end();
 }
@@ -445,14 +446,13 @@ void *gc_alloc(size_t n_bytes, unsigned int alloc_flags) {
         return NULL;
     }
 
-    GC_ENTER();
-
     // check if GC is locked
-    if (MP_STATE_MEM(gc_lock_depth) > 0) {
-        GC_EXIT();
+    if (MP_STATE_THREAD(gc_lock_depth) > 0) {
         return NULL;
     }
 
+    GC_ENTER();
+
     size_t i;
     size_t end_block;
     size_t start_block;
@@ -573,13 +573,13 @@ void *gc_alloc_with_finaliser(mp_uint_t n_bytes) {
 // force the freeing of a piece of memory
 // TODO: freeing here does not call finaliser
 void gc_free(void *ptr) {
-    GC_ENTER();
-    if (MP_STATE_MEM(gc_lock_depth) > 0) {
+    if (MP_STATE_THREAD(gc_lock_depth) > 0) {
         // TODO how to deal with this error?
-        GC_EXIT();
         return;
     }
 
+    GC_ENTER();
+
     DEBUG_printf("gc_free(%p)\n", ptr);
 
     if (ptr == NULL) {
@@ -674,15 +674,14 @@ void *gc_realloc(void *ptr_in, size_t n_bytes, bool allow_move) {
         return NULL;
     }
 
+    if (MP_STATE_THREAD(gc_lock_depth) > 0) {
+        return NULL;
+    }
+
     void *ptr = ptr_in;
 
     GC_ENTER();
 
-    if (MP_STATE_MEM(gc_lock_depth) > 0) {
-        GC_EXIT();
-        return NULL;
-    }
-
     // get the GC block number corresponding to this pointer
     assert(VERIFY_PTR(ptr));
     size_t block = BLOCK_FROM_PTR(ptr);
diff --git a/py/modmicropython.c b/py/modmicropython.c
index f7eadf79bd1d2..180f7f186c69a 100644
--- a/py/modmicropython.c
+++ b/py/modmicropython.c
@@ -130,13 +130,13 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_0(mp_micropython_heap_lock_obj, mp_micropython_he
 
 STATIC mp_obj_t mp_micropython_heap_unlock(void) {
     gc_unlock();
-    return MP_OBJ_NEW_SMALL_INT(MP_STATE_MEM(gc_lock_depth));
+    return MP_OBJ_NEW_SMALL_INT(MP_STATE_THREAD(gc_lock_depth));
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_0(mp_micropython_heap_unlock_obj, mp_micropython_heap_unlock);
 
 #if MICROPY_PY_MICROPYTHON_HEAP_LOCKED
 STATIC mp_obj_t mp_micropython_heap_locked(void) {
-    return MP_OBJ_NEW_SMALL_INT(MP_STATE_MEM(gc_lock_depth));
+    return MP_OBJ_NEW_SMALL_INT(MP_STATE_THREAD(gc_lock_depth));
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_0(mp_micropython_heap_locked_obj, mp_micropython_heap_locked);
 #endif
diff --git a/py/modthread.c b/py/modthread.c
index 1306dc642b018..64fbb3f198e15 100644
--- a/py/modthread.c
+++ b/py/modthread.c
@@ -171,6 +171,9 @@ STATIC void *thread_entry(void *args_in) {
     mp_pystack_init(mini_pystack, &mini_pystack[128]);
     #endif
 
+    // The GC starts off unlocked on this thread.
+    ts.gc_lock_depth = 0;
+
     // set locals and globals from the calling context
     mp_locals_set(args->dict_locals);
     mp_globals_set(args->dict_globals);
diff --git a/py/mpstate.h b/py/mpstate.h
index 2519c77e2d647..a0e3d4f143096 100644
--- a/py/mpstate.h
+++ b/py/mpstate.h
@@ -80,7 +80,6 @@ typedef struct _mp_state_mem_t {
 
     int gc_stack_overflow;
     MICROPY_GC_STACK_ENTRY_TYPE gc_stack[MICROPY_ALLOC_GC_STACK_SIZE];
-    uint16_t gc_lock_depth;
 
     // This variable controls auto garbage collection.  If set to 0 then the
     // GC won't automatically run when gc_alloc can't find enough blocks.  But
@@ -253,6 +252,9 @@ typedef struct _mp_state_thread_t {
     uint8_t *pystack_cur;
     #endif
 
+    // Locking of the GC is done per thread.
+    uint16_t gc_lock_depth;
+
     ////////////////////////////////////////////////////////////
     // START ROOT POINTER SECTION
     // Everything that needs GC scanning must start here, and
diff --git a/tests/thread/thread_heap_lock.py b/tests/thread/thread_heap_lock.py
new file mode 100644
index 0000000000000..2837e0f3661fd
--- /dev/null
+++ b/tests/thread/thread_heap_lock.py
@@ -0,0 +1,26 @@
+# test interaction of micropython.heap_lock with threads
+
+import _thread, micropython
+
+lock1 = _thread.allocate_lock()
+lock2 = _thread.allocate_lock()
+
+
+def thread_entry():
+    lock1.acquire()
+    print([1, 2, 3])
+    lock2.release()
+
+
+lock1.acquire()
+lock2.acquire()
+
+_thread.start_new_thread(thread_entry, ())
+
+micropython.heap_lock()
+lock1.release()
+lock2.acquire()
+micropython.heap_unlock()
+
+lock1.release()
+lock2.release()
diff --git a/tests/thread/thread_heap_lock.py.exp b/tests/thread/thread_heap_lock.py.exp
new file mode 100644
index 0000000000000..b5d8bb58d9bc3
--- /dev/null
+++ b/tests/thread/thread_heap_lock.py.exp
@@ -0,0 +1 @@
+[1, 2, 3]

From 4cdcbdb7531b98b2dc9a85737b760f509957e31e Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 10 May 2021 12:44:47 +1000
Subject: [PATCH 0839/3533] tests/thread: Make
 exc1,exit1,exit2,stacksize1,start1 tests run on rp2.

The RP2040 has 2 cores and supports running at most 2 Python threads (the
main one plus another), and will raise OSError if a thread cannot be
created because core1 is already in use.  This commit adjusts some thread
tests to be robust against such OSError's.  These tests now pass on rp2
boards.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/thread/thread_exc1.py       | 7 ++++++-
 tests/thread/thread_exit1.py      | 9 +++++++--
 tests/thread/thread_exit2.py      | 9 +++++++--
 tests/thread/thread_stacksize1.py | 7 ++++++-
 tests/thread/thread_start1.py     | 9 +++++++--
 5 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/tests/thread/thread_exc1.py b/tests/thread/thread_exc1.py
index 16483d7778a06..cd87740929103 100644
--- a/tests/thread/thread_exc1.py
+++ b/tests/thread/thread_exc1.py
@@ -25,7 +25,12 @@ def thread_entry():
 
 # spawn threads
 for i in range(n_thread):
-    _thread.start_new_thread(thread_entry, ())
+    while True:
+        try:
+            _thread.start_new_thread(thread_entry, ())
+            break
+        except OSError:
+            pass
 
 # busy wait for threads to finish
 while n_finished < n_thread:
diff --git a/tests/thread/thread_exit1.py b/tests/thread/thread_exit1.py
index c4a93c45a3df1..186a9be340bd1 100644
--- a/tests/thread/thread_exit1.py
+++ b/tests/thread/thread_exit1.py
@@ -13,8 +13,13 @@ def thread_entry():
     _thread.exit()
 
 
-_thread.start_new_thread(thread_entry, ())
-_thread.start_new_thread(thread_entry, ())
+for i in range(2):
+    while True:
+        try:
+            _thread.start_new_thread(thread_entry, ())
+            break
+        except OSError:
+            pass
 
 # wait for threads to finish
 time.sleep(1)
diff --git a/tests/thread/thread_exit2.py b/tests/thread/thread_exit2.py
index 0cd80e69092a8..5be7945db2205 100644
--- a/tests/thread/thread_exit2.py
+++ b/tests/thread/thread_exit2.py
@@ -13,8 +13,13 @@ def thread_entry():
     raise SystemExit
 
 
-_thread.start_new_thread(thread_entry, ())
-_thread.start_new_thread(thread_entry, ())
+for i in range(2):
+    while True:
+        try:
+            _thread.start_new_thread(thread_entry, ())
+            break
+        except OSError:
+            pass
 
 # wait for threads to finish
 time.sleep(1)
diff --git a/tests/thread/thread_stacksize1.py b/tests/thread/thread_stacksize1.py
index 5d25509b763a0..cf46b73b770e0 100644
--- a/tests/thread/thread_stacksize1.py
+++ b/tests/thread/thread_stacksize1.py
@@ -41,7 +41,12 @@ def thread_entry():
 # set stack size and spawn a few threads
 _thread.stack_size(sz)
 for i in range(n_thread):
-    _thread.start_new_thread(thread_entry, ())
+    while True:
+        try:
+            _thread.start_new_thread(thread_entry, ())
+            break
+        except OSError:
+            pass
 
 # reset stack size to default (for subsequent scripts on baremetal)
 _thread.stack_size()
diff --git a/tests/thread/thread_start1.py b/tests/thread/thread_start1.py
index f0e696840e556..7274633245a71 100644
--- a/tests/thread/thread_start1.py
+++ b/tests/thread/thread_start1.py
@@ -18,8 +18,13 @@ def thread_entry(n):
         foo()
 
 
-_thread.start_new_thread(thread_entry, (10,))
-_thread.start_new_thread(thread_entry, (20,))
+for i in range(2):
+    while True:
+        try:
+            _thread.start_new_thread(thread_entry, ((i + 1) * 10,))
+            break
+        except OSError:
+            pass
 
 # wait for threads to finish
 time.sleep(1)

From 5093d49fae5b59d6440d34b4c05f2950f40a6b9f Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 6 May 2021 10:58:12 +1000
Subject: [PATCH 0840/3533] esp32: Extend support for S2 series, and S3 where
 applicable.

Improvements made:
- PSRAM support for S2
- partition definition for 16MiB flash
- correct ADC and DAC pins
- correct GPIO and IRQ pins
- S3 components in CMakeLists

Based on original commit made by Seon Rozenblum aka @UnexpectedMaker.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/boards/sdkconfig.spiram_sx |  11 +++
 ports/esp32/machine_adc.c              |  17 +++-
 ports/esp32/machine_pin.c              | 131 ++++++++++++++++++++++---
 ports/esp32/machine_touchpad.c         |  23 +++++
 ports/esp32/main.c                     |  14 +++
 ports/esp32/main/CMakeLists.txt        |   3 +
 ports/esp32/modmachine.c               |   3 +
 ports/esp32/mphalport.c                |   7 ++
 ports/esp32/partitions-16MiB.csv       |   8 ++
 9 files changed, 201 insertions(+), 16 deletions(-)
 create mode 100644 ports/esp32/boards/sdkconfig.spiram_sx
 create mode 100644 ports/esp32/partitions-16MiB.csv

diff --git a/ports/esp32/boards/sdkconfig.spiram_sx b/ports/esp32/boards/sdkconfig.spiram_sx
new file mode 100644
index 0000000000000..18a0712cbf70f
--- /dev/null
+++ b/ports/esp32/boards/sdkconfig.spiram_sx
@@ -0,0 +1,11 @@
+# MicroPython on ESP32-S2 and ESP32-PAD1_subscript_3, ESP IDF configuration with SPIRAM support
+CONFIG_ESP32S2_SPIRAM_SUPPORT=y
+CONFIG_SPIRAM_TYPE_AUTO=y
+CONFIG_DEFAULT_PSRAM_CLK_IO=30
+CONFIG_DEFAULT_PSRAM_CS_IO=26
+CONFIG_SPIRAM_SPEED_80M=y
+CONFIG_SPIRAM=y
+CONFIG_SPIRAM_BOOT_INIT=y
+CONFIG_SPIRAM_IGNORE_NOTFOUND=y
+CONFIG_SPIRAM_USE_MEMMAP=y
+CONFIG_SPIRAM_MEMTEST=y
diff --git a/ports/esp32/machine_adc.c b/ports/esp32/machine_adc.c
index 4c19d5992bd8a..739d47da5072e 100644
--- a/ports/esp32/machine_adc.c
+++ b/ports/esp32/machine_adc.c
@@ -43,6 +43,7 @@ typedef struct _madc_obj_t {
 } madc_obj_t;
 
 STATIC const madc_obj_t madc_obj[] = {
+    #if CONFIG_IDF_TARGET_ESP32
     {{&machine_adc_type}, GPIO_NUM_36, ADC1_CHANNEL_0},
     {{&machine_adc_type}, GPIO_NUM_37, ADC1_CHANNEL_1},
     {{&machine_adc_type}, GPIO_NUM_38, ADC1_CHANNEL_2},
@@ -51,6 +52,18 @@ STATIC const madc_obj_t madc_obj[] = {
     {{&machine_adc_type}, GPIO_NUM_33, ADC1_CHANNEL_5},
     {{&machine_adc_type}, GPIO_NUM_34, ADC1_CHANNEL_6},
     {{&machine_adc_type}, GPIO_NUM_35, ADC1_CHANNEL_7},
+    #elif CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3
+    {{&machine_adc_type}, GPIO_NUM_1, ADC1_CHANNEL_0},
+    {{&machine_adc_type}, GPIO_NUM_2, ADC1_CHANNEL_1},
+    {{&machine_adc_type}, GPIO_NUM_3, ADC1_CHANNEL_2},
+    {{&machine_adc_type}, GPIO_NUM_4, ADC1_CHANNEL_3},
+    {{&machine_adc_type}, GPIO_NUM_5, ADC1_CHANNEL_4},
+    {{&machine_adc_type}, GPIO_NUM_6, ADC1_CHANNEL_5},
+    {{&machine_adc_type}, GPIO_NUM_7, ADC1_CHANNEL_6},
+    {{&machine_adc_type}, GPIO_NUM_8, ADC1_CHANNEL_7},
+    {{&machine_adc_type}, GPIO_NUM_9, ADC1_CHANNEL_8},
+    {{&machine_adc_type}, GPIO_NUM_10, ADC1_CHANNEL_9},
+    #endif
 };
 
 STATIC uint8_t adc_bit_width;
@@ -145,7 +158,7 @@ STATIC mp_obj_t madc_width(mp_obj_t cls_in, mp_obj_t width_in) {
         case ADC_WIDTH_12Bit:
             adc_bit_width = 12;
             break;
-        #elif CONFIG_IDF_TARGET_ESP32S2
+        #elif CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3
         case ADC_WIDTH_BIT_13:
             adc_bit_width = 13;
             break;
@@ -175,7 +188,7 @@ STATIC const mp_rom_map_elem_t madc_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_WIDTH_10BIT), MP_ROM_INT(ADC_WIDTH_10Bit) },
     { MP_ROM_QSTR(MP_QSTR_WIDTH_11BIT), MP_ROM_INT(ADC_WIDTH_11Bit) },
     { MP_ROM_QSTR(MP_QSTR_WIDTH_12BIT), MP_ROM_INT(ADC_WIDTH_12Bit) },
-    #elif CONFIG_IDF_TARGET_ESP32S2
+    #elif CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3
     { MP_ROM_QSTR(MP_QSTR_WIDTH_13BIT), MP_ROM_INT(ADC_WIDTH_BIT_13) },
     #endif
 };
diff --git a/ports/esp32/machine_pin.c b/ports/esp32/machine_pin.c
index 8dbdd198490b2..bd623d0413bd4 100644
--- a/ports/esp32/machine_pin.c
+++ b/ports/esp32/machine_pin.c
@@ -56,6 +56,8 @@ typedef struct _machine_pin_irq_obj_t {
 } machine_pin_irq_obj_t;
 
 STATIC const machine_pin_obj_t machine_pin_obj[] = {
+    #if CONFIG_IDF_TARGET_ESP32
+
     {{&machine_pin_type}, GPIO_NUM_0},
     {{&machine_pin_type}, GPIO_NUM_1},
     {{&machine_pin_type}, GPIO_NUM_2},
@@ -78,17 +80,10 @@ STATIC const machine_pin_obj_t machine_pin_obj[] = {
     {{&machine_pin_type}, GPIO_NUM_19},
     {{NULL}, -1},
     {{&machine_pin_type}, GPIO_NUM_21},
-    #if CONFIG_IDF_TARGET_ESP32
     {{&machine_pin_type}, GPIO_NUM_22},
     {{&machine_pin_type}, GPIO_NUM_23},
     {{NULL}, -1},
     {{&machine_pin_type}, GPIO_NUM_25},
-    #else
-    {{NULL}, -1},
-    {{NULL}, -1},
-    {{NULL}, -1},
-    {{NULL}, -1},
-    #endif
     {{&machine_pin_type}, GPIO_NUM_26},
     {{&machine_pin_type}, GPIO_NUM_27},
     {{NULL}, -1},
@@ -103,6 +98,63 @@ STATIC const machine_pin_obj_t machine_pin_obj[] = {
     {{&machine_pin_type}, GPIO_NUM_37},
     {{&machine_pin_type}, GPIO_NUM_38},
     {{&machine_pin_type}, GPIO_NUM_39},
+
+    #elif CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3
+
+    {{&machine_pin_type}, GPIO_NUM_0},
+    {{&machine_pin_type}, GPIO_NUM_1},
+    {{&machine_pin_type}, GPIO_NUM_2},
+    {{&machine_pin_type}, GPIO_NUM_3},
+    {{&machine_pin_type}, GPIO_NUM_4},
+    {{&machine_pin_type}, GPIO_NUM_5},
+    {{&machine_pin_type}, GPIO_NUM_6},
+    {{&machine_pin_type}, GPIO_NUM_7},
+    {{&machine_pin_type}, GPIO_NUM_8},
+    {{&machine_pin_type}, GPIO_NUM_9},
+    {{&machine_pin_type}, GPIO_NUM_10},
+    {{&machine_pin_type}, GPIO_NUM_11},
+    {{&machine_pin_type}, GPIO_NUM_12},
+    {{&machine_pin_type}, GPIO_NUM_13},
+    {{&machine_pin_type}, GPIO_NUM_14},
+    {{&machine_pin_type}, GPIO_NUM_15},
+    {{&machine_pin_type}, GPIO_NUM_16},
+    {{&machine_pin_type}, GPIO_NUM_17},
+    {{&machine_pin_type}, GPIO_NUM_18},
+    #if CONFIG_USB_CDC_ENABLED
+    {{NULL}, -1}, // 19 is for native USB D-
+    {{NULL}, -1}, // 20 is for native USB D-
+    #else
+    {{&machine_pin_type}, GPIO_NUM_19},
+    {{&machine_pin_type}, GPIO_NUM_20},
+    #endif
+    {{&machine_pin_type}, GPIO_NUM_21},
+    {{NULL}, -1}, // 22 not a pin
+    {{NULL}, -1}, // 23 not a pin
+    {{NULL}, -1}, // 24 not a pin
+    {{NULL}, -1}, // 25 not a pin
+    {{NULL}, -1}, // 26 FLASH/PSRAM
+    {{NULL}, -1}, // 27 FLASH/PSRAM
+    {{NULL}, -1}, // 28 FLASH/PSRAM
+    {{NULL}, -1}, // 29 FLASH/PSRAM
+    {{NULL}, -1}, // 30 FLASH/PSRAM
+    {{NULL}, -1}, // 31 FLASH/PSRAM
+    {{NULL}, -1}, // 32 FLASH/PSRAM
+    {{&machine_pin_type}, GPIO_NUM_33},
+    {{&machine_pin_type}, GPIO_NUM_34},
+    {{&machine_pin_type}, GPIO_NUM_35},
+    {{&machine_pin_type}, GPIO_NUM_36},
+    {{&machine_pin_type}, GPIO_NUM_37},
+    {{&machine_pin_type}, GPIO_NUM_38},
+    {{&machine_pin_type}, GPIO_NUM_39}, // MTCLK
+    {{&machine_pin_type}, GPIO_NUM_40}, // MTDO
+    {{&machine_pin_type}, GPIO_NUM_41}, // MTDI
+    {{&machine_pin_type}, GPIO_NUM_42}, // MTMS
+    {{&machine_pin_type}, GPIO_NUM_43}, // U0TXD
+    {{&machine_pin_type}, GPIO_NUM_44}, // U0RXD
+    {{&machine_pin_type}, GPIO_NUM_45},
+    {{&machine_pin_type}, GPIO_NUM_46},
+
+    #endif
 };
 
 // forward declaration
@@ -399,6 +451,8 @@ const mp_obj_type_t machine_pin_type = {
 STATIC const mp_obj_type_t machine_pin_irq_type;
 
 STATIC const machine_pin_irq_obj_t machine_pin_irq_object[] = {
+    #if CONFIG_IDF_TARGET_ESP32
+
     {{&machine_pin_irq_type}, GPIO_NUM_0},
     {{&machine_pin_irq_type}, GPIO_NUM_1},
     {{&machine_pin_irq_type}, GPIO_NUM_2},
@@ -421,17 +475,10 @@ STATIC const machine_pin_irq_obj_t machine_pin_irq_object[] = {
     {{&machine_pin_irq_type}, GPIO_NUM_19},
     {{NULL}, -1},
     {{&machine_pin_irq_type}, GPIO_NUM_21},
-    #if CONFIG_IDF_TARGET_ESP32
     {{&machine_pin_irq_type}, GPIO_NUM_22},
     {{&machine_pin_irq_type}, GPIO_NUM_23},
     {{NULL}, -1},
     {{&machine_pin_irq_type}, GPIO_NUM_25},
-    #else
-    {{NULL}, -1},
-    {{NULL}, -1},
-    {{NULL}, -1},
-    {{NULL}, -1},
-    #endif
     {{&machine_pin_irq_type}, GPIO_NUM_26},
     {{&machine_pin_irq_type}, GPIO_NUM_27},
     {{NULL}, -1},
@@ -446,6 +493,62 @@ STATIC const machine_pin_irq_obj_t machine_pin_irq_object[] = {
     {{&machine_pin_irq_type}, GPIO_NUM_37},
     {{&machine_pin_irq_type}, GPIO_NUM_38},
     {{&machine_pin_irq_type}, GPIO_NUM_39},
+
+    #elif CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3
+
+    {{&machine_pin_irq_type}, GPIO_NUM_0},
+    {{&machine_pin_irq_type}, GPIO_NUM_1},
+    {{&machine_pin_irq_type}, GPIO_NUM_2},
+    {{&machine_pin_irq_type}, GPIO_NUM_3},
+    {{&machine_pin_irq_type}, GPIO_NUM_4},
+    {{&machine_pin_irq_type}, GPIO_NUM_5},
+    {{&machine_pin_irq_type}, GPIO_NUM_6},
+    {{&machine_pin_irq_type}, GPIO_NUM_7},
+    {{&machine_pin_irq_type}, GPIO_NUM_8},
+    {{&machine_pin_irq_type}, GPIO_NUM_9},
+    {{&machine_pin_irq_type}, GPIO_NUM_10},
+    {{&machine_pin_irq_type}, GPIO_NUM_11},
+    {{&machine_pin_irq_type}, GPIO_NUM_12},
+    {{&machine_pin_irq_type}, GPIO_NUM_13},
+    {{&machine_pin_irq_type}, GPIO_NUM_14},
+    {{&machine_pin_irq_type}, GPIO_NUM_15},
+    {{&machine_pin_irq_type}, GPIO_NUM_16},
+    {{&machine_pin_irq_type}, GPIO_NUM_17},
+    {{&machine_pin_irq_type}, GPIO_NUM_18},
+    #if CONFIG_USB_CDC_ENABLED
+    {{NULL}, -1}, // 19 is for native USB D-
+    {{NULL}, -1}, // 20 is for native USB D-
+    #else
+    {{&machine_pin_irq_type}, GPIO_NUM_19},
+    {{&machine_pin_irq_type}, GPIO_NUM_20},
+    #endif
+    {{&machine_pin_irq_type}, GPIO_NUM_21},
+    {{NULL}, -1}, // 22 not a pin
+    {{NULL}, -1}, // 23 not a pin
+    {{NULL}, -1}, // 24 not a pin
+    {{NULL}, -1}, // 25 not a pin
+    {{NULL}, -1}, // 26 FLASH/PSRAM
+    {{NULL}, -1}, // 27 FLASH/PSRAM
+    {{NULL}, -1}, // 28 FLASH/PSRAM
+    {{NULL}, -1}, // 29 FLASH/PSRAM
+    {{NULL}, -1}, // 30 FLASH/PSRAM
+    {{NULL}, -1}, // 31 FLASH/PSRAM
+    {{NULL}, -1}, // 32 FLASH/PSRAM
+    {{&machine_pin_irq_type}, GPIO_NUM_33},
+    {{&machine_pin_irq_type}, GPIO_NUM_34},
+    {{&machine_pin_irq_type}, GPIO_NUM_35},
+    {{&machine_pin_irq_type}, GPIO_NUM_36},
+    {{&machine_pin_irq_type}, GPIO_NUM_37},
+    {{&machine_pin_irq_type}, GPIO_NUM_38},
+    {{&machine_pin_irq_type}, GPIO_NUM_39},
+    {{&machine_pin_irq_type}, GPIO_NUM_40},
+    {{&machine_pin_irq_type}, GPIO_NUM_41},
+    {{&machine_pin_irq_type}, GPIO_NUM_42},
+    {{&machine_pin_irq_type}, GPIO_NUM_43},
+    {{&machine_pin_irq_type}, GPIO_NUM_44},
+    {{&machine_pin_irq_type}, GPIO_NUM_45},
+
+    #endif
 };
 
 STATIC mp_obj_t machine_pin_irq_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
diff --git a/ports/esp32/machine_touchpad.c b/ports/esp32/machine_touchpad.c
index 335157b154902..168ac16d0eef6 100644
--- a/ports/esp32/machine_touchpad.c
+++ b/ports/esp32/machine_touchpad.c
@@ -31,7 +31,11 @@
 #if CONFIG_IDF_TARGET_ESP32
 
 #include "driver/gpio.h"
+#if CONFIG_IDF_TARGET_ESP32
 #include "driver/touch_pad.h"
+#elif CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3
+#include "driver/touch_sensor.h"
+#endif
 
 typedef struct _mtp_obj_t {
     mp_obj_base_t base;
@@ -39,6 +43,7 @@ typedef struct _mtp_obj_t {
     touch_pad_t touchpad_id;
 } mtp_obj_t;
 
+#if CONFIG_IDF_TARGET_ESP32
 STATIC const mtp_obj_t touchpad_obj[] = {
     {{&machine_touchpad_type}, GPIO_NUM_4, TOUCH_PAD_NUM0},
     {{&machine_touchpad_type}, GPIO_NUM_0, TOUCH_PAD_NUM1},
@@ -51,6 +56,24 @@ STATIC const mtp_obj_t touchpad_obj[] = {
     {{&machine_touchpad_type}, GPIO_NUM_33, TOUCH_PAD_NUM8},
     {{&machine_touchpad_type}, GPIO_NUM_32, TOUCH_PAD_NUM9},
 };
+#elif CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3
+STATIC const mtp_obj_t touchpad_obj[] = {
+    {{&machine_touchpad_type}, GPIO_NUM_1, TOUCH_PAD_NUM1},
+    {{&machine_touchpad_type}, GPIO_NUM_2, TOUCH_PAD_NUM2},
+    {{&machine_touchpad_type}, GPIO_NUM_3, TOUCH_PAD_NUM3},
+    {{&machine_touchpad_type}, GPIO_NUM_4, TOUCH_PAD_NUM4},
+    {{&machine_touchpad_type}, GPIO_NUM_5, TOUCH_PAD_NUM5},
+    {{&machine_touchpad_type}, GPIO_NUM_6, TOUCH_PAD_NUM6},
+    {{&machine_touchpad_type}, GPIO_NUM_7, TOUCH_PAD_NUM7},
+    {{&machine_touchpad_type}, GPIO_NUM_8, TOUCH_PAD_NUM8},
+    {{&machine_touchpad_type}, GPIO_NUM_9, TOUCH_PAD_NUM9},
+    {{&machine_touchpad_type}, GPIO_NUM_10, TOUCH_PAD_NUM10},
+    {{&machine_touchpad_type}, GPIO_NUM_11, TOUCH_PAD_NUM11},
+    {{&machine_touchpad_type}, GPIO_NUM_12, TOUCH_PAD_NUM12},
+    {{&machine_touchpad_type}, GPIO_NUM_13, TOUCH_PAD_NUM13},
+    {{&machine_touchpad_type}, GPIO_NUM_14, TOUCH_PAD_NUM14},
+};
+#endif
 
 STATIC mp_obj_t mtp_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw,
     const mp_obj_t *args) {
diff --git a/ports/esp32/main.c b/ports/esp32/main.c
index 7ca3d84140cf1..ff6dd69574ba6 100644
--- a/ports/esp32/main.c
+++ b/ports/esp32/main.c
@@ -42,6 +42,8 @@
 #include "esp32/spiram.h"
 #elif CONFIG_IDF_TARGET_ESP32S2
 #include "esp32s2/spiram.h"
+#elif CONFIG_IDF_TARGET_ESP32S3
+#include "esp32s3/spiram.h"
 #endif
 
 #include "py/stackctrl.h"
@@ -104,6 +106,18 @@ void mp_task(void *pvParameter) {
             mp_task_heap = malloc(mp_task_heap_size);
             break;
     }
+    #elif CONFIG_ESP32S2_SPIRAM_SUPPORT || CONFIG_ESP32S3_SPIRAM_SUPPORT
+    // Try to use the entire external SPIRAM directly for the heap
+    size_t mp_task_heap_size;
+    size_t esp_spiram_size = esp_spiram_get_size();
+    void *mp_task_heap = (void *)0x3ff80000 - esp_spiram_size;
+    if (esp_spiram_size > 0) {
+        mp_task_heap_size = esp_spiram_size;
+    } else {
+        // No SPIRAM, fallback to normal allocation
+        mp_task_heap_size = heap_caps_get_largest_free_block(MALLOC_CAP_8BIT);
+        mp_task_heap = malloc(mp_task_heap_size);
+    }
     #else
     // Allocate the uPy heap using malloc and get the largest available region
     size_t mp_task_heap_size = heap_caps_get_largest_free_block(MALLOC_CAP_8BIT);
diff --git a/ports/esp32/main/CMakeLists.txt b/ports/esp32/main/CMakeLists.txt
index 656045da90a21..1cc30b71ec558 100644
--- a/ports/esp32/main/CMakeLists.txt
+++ b/ports/esp32/main/CMakeLists.txt
@@ -128,6 +128,9 @@ if(IDF_TARGET STREQUAL "esp32")
 elseif(IDF_TARGET STREQUAL "esp32s2")
     list(APPEND IDF_COMPONENTS esp32s2)
     list(APPEND IDF_COMPONENTS tinyusb)
+elseif(IDF_TARGET STREQUAL "esp32s3")
+    list(APPEND IDF_COMPONENTS esp32s3)
+    list(APPEND IDF_COMPONENTS tinyusb)
 endif()
 
 # Register the main IDF component.
diff --git a/ports/esp32/modmachine.c b/ports/esp32/modmachine.c
index 2eb5cd2feed51..bbe7fae0335e4 100644
--- a/ports/esp32/modmachine.c
+++ b/ports/esp32/modmachine.c
@@ -42,6 +42,9 @@
 #elif CONFIG_IDF_TARGET_ESP32S2
 #include "esp32s2/rom/rtc.h"
 #include "esp32s2/clk.h"
+#elif CONFIG_IDF_TARGET_ESP32S3
+#include "esp32s3/rom/rtc.h"
+#include "esp32s3/clk.h"
 #endif
 
 #include "py/obj.h"
diff --git a/ports/esp32/mphalport.c b/ports/esp32/mphalport.c
index cf668216df9e3..a0bafb755e781 100644
--- a/ports/esp32/mphalport.c
+++ b/ports/esp32/mphalport.c
@@ -32,7 +32,14 @@
 
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"
+
+#if CONFIG_IDF_TARGET_ESP32
 #include "esp32/rom/uart.h"
+#elif CONFIG_IDF_TARGET_ESP32S2
+#include "esp32s2/rom/uart.h"
+#elif CONFIG_IDF_TARGET_ESP32S3
+#include "esp32s3/rom/uart.h"
+#endif
 
 #include "py/obj.h"
 #include "py/objstr.h"
diff --git a/ports/esp32/partitions-16MiB.csv b/ports/esp32/partitions-16MiB.csv
new file mode 100644
index 0000000000000..5133185c78b2e
--- /dev/null
+++ b/ports/esp32/partitions-16MiB.csv
@@ -0,0 +1,8 @@
+# Notes: the offset of the partition table itself is set in
+# $ESPIDF/components/partition_table/Kconfig.projbuild and the
+# offset of the factory/ota_0 partition is set in makeimg.py
+# Name,   Type, SubType, Offset,  Size, Flags
+nvs,      data, nvs,     0x9000,  0x6000,
+phy_init, data, phy,     0xf000,  0x1000,
+factory,  app,  factory, 0x10000, 0x180000,
+vfs,      data, fat,     0x200000, 0xD59F80,

From 32ec07a3504d6dcbfc53997197a3c53e8c03497f Mon Sep 17 00:00:00 2001
From: Seon Rozenblum <seon@unexpectedmaker.com>
Date: Fri, 19 Mar 2021 18:48:34 +1100
Subject: [PATCH 0841/3533] esp32/boards: Rename TINYPICO board to UM_TINYPICO.

And add default hardware SPI 0 pins in mpconfigboard.h, and
CONFIG_LWIP_LOCAL_HOSTNAME in sdkconfig.board.
---
 ports/esp32/boards/TINYPICO/mpconfigboard.h                 | 2 --
 ports/esp32/boards/{TINYPICO => UM_TINYPICO}/manifest.py    | 0
 .../boards/{TINYPICO => UM_TINYPICO}/modules/dotstar.py     | 0
 .../boards/{TINYPICO => UM_TINYPICO}/modules/tinypico.py    | 0
 .../boards/{TINYPICO => UM_TINYPICO}/mpconfigboard.cmake    | 0
 ports/esp32/boards/UM_TINYPICO/mpconfigboard.h              | 6 ++++++
 .../esp32/boards/{TINYPICO => UM_TINYPICO}/sdkconfig.board  | 1 +
 7 files changed, 7 insertions(+), 2 deletions(-)
 delete mode 100644 ports/esp32/boards/TINYPICO/mpconfigboard.h
 rename ports/esp32/boards/{TINYPICO => UM_TINYPICO}/manifest.py (100%)
 rename ports/esp32/boards/{TINYPICO => UM_TINYPICO}/modules/dotstar.py (100%)
 rename ports/esp32/boards/{TINYPICO => UM_TINYPICO}/modules/tinypico.py (100%)
 rename ports/esp32/boards/{TINYPICO => UM_TINYPICO}/mpconfigboard.cmake (100%)
 create mode 100644 ports/esp32/boards/UM_TINYPICO/mpconfigboard.h
 rename ports/esp32/boards/{TINYPICO => UM_TINYPICO}/sdkconfig.board (72%)

diff --git a/ports/esp32/boards/TINYPICO/mpconfigboard.h b/ports/esp32/boards/TINYPICO/mpconfigboard.h
deleted file mode 100644
index e63f43ed25a2f..0000000000000
--- a/ports/esp32/boards/TINYPICO/mpconfigboard.h
+++ /dev/null
@@ -1,2 +0,0 @@
-#define MICROPY_HW_BOARD_NAME "TinyPICO"
-#define MICROPY_HW_MCU_NAME "ESP32-PICO-D4"
diff --git a/ports/esp32/boards/TINYPICO/manifest.py b/ports/esp32/boards/UM_TINYPICO/manifest.py
similarity index 100%
rename from ports/esp32/boards/TINYPICO/manifest.py
rename to ports/esp32/boards/UM_TINYPICO/manifest.py
diff --git a/ports/esp32/boards/TINYPICO/modules/dotstar.py b/ports/esp32/boards/UM_TINYPICO/modules/dotstar.py
similarity index 100%
rename from ports/esp32/boards/TINYPICO/modules/dotstar.py
rename to ports/esp32/boards/UM_TINYPICO/modules/dotstar.py
diff --git a/ports/esp32/boards/TINYPICO/modules/tinypico.py b/ports/esp32/boards/UM_TINYPICO/modules/tinypico.py
similarity index 100%
rename from ports/esp32/boards/TINYPICO/modules/tinypico.py
rename to ports/esp32/boards/UM_TINYPICO/modules/tinypico.py
diff --git a/ports/esp32/boards/TINYPICO/mpconfigboard.cmake b/ports/esp32/boards/UM_TINYPICO/mpconfigboard.cmake
similarity index 100%
rename from ports/esp32/boards/TINYPICO/mpconfigboard.cmake
rename to ports/esp32/boards/UM_TINYPICO/mpconfigboard.cmake
diff --git a/ports/esp32/boards/UM_TINYPICO/mpconfigboard.h b/ports/esp32/boards/UM_TINYPICO/mpconfigboard.h
new file mode 100644
index 0000000000000..05ee5eaf72a5f
--- /dev/null
+++ b/ports/esp32/boards/UM_TINYPICO/mpconfigboard.h
@@ -0,0 +1,6 @@
+#define MICROPY_HW_BOARD_NAME "TinyPICO"
+#define MICROPY_HW_MCU_NAME "ESP32-PICO-D4"
+
+#define MICROPY_HW_SPI1_SCK (18)
+#define MICROPY_HW_SPI1_MOSI (23)
+#define MICROPY_HW_SPI1_MISO (19)
diff --git a/ports/esp32/boards/TINYPICO/sdkconfig.board b/ports/esp32/boards/UM_TINYPICO/sdkconfig.board
similarity index 72%
rename from ports/esp32/boards/TINYPICO/sdkconfig.board
rename to ports/esp32/boards/UM_TINYPICO/sdkconfig.board
index dc2c23f674e84..766419c7f81a3 100644
--- a/ports/esp32/boards/TINYPICO/sdkconfig.board
+++ b/ports/esp32/boards/UM_TINYPICO/sdkconfig.board
@@ -2,3 +2,4 @@ CONFIG_FLASHMODE_QIO=y
 CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
 CONFIG_SPIRAM_SPEED_80M=y
 CONFIG_ESP32_REV_MIN_1=y
+CONFIG_LWIP_LOCAL_HOSTNAME="UMTinyPICO"

From 0e87459e2bfd073a084fe4af00c2f75d4c815639 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 6 May 2021 11:08:00 +1000
Subject: [PATCH 0842/3533] esp32/boards: Add UM_FEATHERS2 and UM_TINYS2 board
 definitions.

Based on original commit made by Seon Rozenblum aka @UnexpectedMaker.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/boards/UM_FEATHERS2/manifest.py   |   3 +
 .../boards/UM_FEATHERS2/modules/feathers2.py  | 101 ++++++++++++++++++
 .../boards/UM_FEATHERS2/mpconfigboard.cmake   |   9 ++
 .../esp32/boards/UM_FEATHERS2/mpconfigboard.h |   5 +
 .../esp32/boards/UM_FEATHERS2/sdkconfig.board |  16 +++
 ports/esp32/boards/UM_TINYS2/manifest.py      |   2 +
 .../esp32/boards/UM_TINYS2/modules/tinys2.py  |  82 ++++++++++++++
 .../boards/UM_TINYS2/mpconfigboard.cmake      |   8 ++
 ports/esp32/boards/UM_TINYS2/mpconfigboard.h  |   9 ++
 ports/esp32/boards/UM_TINYS2/sdkconfig.board  |   6 ++
 10 files changed, 241 insertions(+)
 create mode 100644 ports/esp32/boards/UM_FEATHERS2/manifest.py
 create mode 100644 ports/esp32/boards/UM_FEATHERS2/modules/feathers2.py
 create mode 100644 ports/esp32/boards/UM_FEATHERS2/mpconfigboard.cmake
 create mode 100644 ports/esp32/boards/UM_FEATHERS2/mpconfigboard.h
 create mode 100644 ports/esp32/boards/UM_FEATHERS2/sdkconfig.board
 create mode 100644 ports/esp32/boards/UM_TINYS2/manifest.py
 create mode 100644 ports/esp32/boards/UM_TINYS2/modules/tinys2.py
 create mode 100644 ports/esp32/boards/UM_TINYS2/mpconfigboard.cmake
 create mode 100644 ports/esp32/boards/UM_TINYS2/mpconfigboard.h
 create mode 100644 ports/esp32/boards/UM_TINYS2/sdkconfig.board

diff --git a/ports/esp32/boards/UM_FEATHERS2/manifest.py b/ports/esp32/boards/UM_FEATHERS2/manifest.py
new file mode 100644
index 0000000000000..82ad0c7e49888
--- /dev/null
+++ b/ports/esp32/boards/UM_FEATHERS2/manifest.py
@@ -0,0 +1,3 @@
+include("$(PORT_DIR)/boards/manifest.py")
+freeze("$(PORT_DIR)/boards/UM_TINYPICO/modules", "dotstar.py")
+freeze("modules")
diff --git a/ports/esp32/boards/UM_FEATHERS2/modules/feathers2.py b/ports/esp32/boards/UM_FEATHERS2/modules/feathers2.py
new file mode 100644
index 0000000000000..32126fc9c9ae7
--- /dev/null
+++ b/ports/esp32/boards/UM_FEATHERS2/modules/feathers2.py
@@ -0,0 +1,101 @@
+# FeatherS2 MicroPython Helper Library
+# 2021 Seon Rozenblum - Unexpected Maker
+#
+# Project home:
+#   https://feathers2.io
+#
+# 2021-Mar-21 - v0.1 - Initial implementation
+
+# Import required libraries
+from micropython import const
+from machine import Pin, SPI, ADC
+import machine, time
+
+# FeatherS2 Hardware Pin Assignments
+
+# LDO
+LDO2 = const(21)
+
+# APA102 Dotstar pins
+DOTSTAR_CLK = const(45)
+DOTSTAR_DATA = const(40)
+
+# SPI
+SPI_MOSI = const(35)
+SPI_MISO = const(36)
+SPI_CLK = const(37)
+
+# I2C
+I2C_SDA = const(38)
+I2C_SCL = const(33)
+
+# DAC
+DAC1 = const(17)
+DAC2 = const(18)
+
+# LED & Ambient Light Sensor
+LED = const(13)
+AMB_LIGHT = const(4)
+
+# Helper functions
+
+# LED & Ambient Light Sensor control
+def set_led(state):
+    l = Pin(LED, Pin.OUT)
+    l.value(state)
+
+
+def toggle_led(state):
+    l = Pin(LED, Pin.OUT)
+    l.value(not l.value())
+
+
+# Create ADC and set attenuation and return teh ambient light value from the onboard sensor
+def get_amb_light():
+    adc = ADC(Pin(AMB_LIGHT))
+    adc.atten(ADC.ATTN_11DB)
+    return adc.read()
+
+
+# LDO2 power control
+# When we manually turn off the second LDO we also set the DotStar DATA and CLK pins to input to
+# prevent parasitic power from lighting the LED even with the LDO off, causing current use.
+# The DotStar is a beautiful LED, but parasitic power makes it a terrible choice for battery use :(
+def set_ldo2_power(state):
+    """Set the power for the on-board Dostar to allow no current draw when not needed."""
+    # Set the power pin to the inverse of state
+    ldo2 = Pin(LDO2, Pin.OUT)
+    ldo2.value(state)
+
+    if state:
+        Pin(DOTSTAR_CLK, Pin.OUT)
+        Pin(DOTSTAR_DATA, Pin.OUT)  # If power is on, set CLK to be output, otherwise input
+    else:
+        Pin(DOTSTAR_CLK, Pin.IN)
+        Pin(DOTSTAR_DATA, Pin.IN)  # If power is on, set CLK to be output, otherwise input
+
+    # A small delay to let the IO change state
+    time.sleep(0.035)
+
+
+# Dotstar rainbow colour wheel
+def dotstar_color_wheel(wheel_pos):
+    """Color wheel to allow for cycling through the rainbow of RGB colors."""
+    wheel_pos = wheel_pos % 255
+
+    if wheel_pos < 85:
+        return 255 - wheel_pos * 3, 0, wheel_pos * 3
+    elif wheel_pos < 170:
+        wheel_pos -= 85
+        return 0, wheel_pos * 3, 255 - wheel_pos * 3
+    else:
+        wheel_pos -= 170
+        return wheel_pos * 3, 255 - wheel_pos * 3, 0
+
+
+# Go into deep sleep but shut down the APA first to save power
+# Use this if you want lowest deep  sleep current
+def go_deepsleep(t):
+    """Deep sleep helper that also powers down the on-board Dotstar."""
+    set_ldo2_power(False)
+    machine.deepsleep(t)
diff --git a/ports/esp32/boards/UM_FEATHERS2/mpconfigboard.cmake b/ports/esp32/boards/UM_FEATHERS2/mpconfigboard.cmake
new file mode 100644
index 0000000000000..5e570d513bb47
--- /dev/null
+++ b/ports/esp32/boards/UM_FEATHERS2/mpconfigboard.cmake
@@ -0,0 +1,9 @@
+set(IDF_TARGET esp32s2)
+set(SDKCONFIG_DEFAULTS
+    boards/sdkconfig.base
+    boards/sdkconfig.spiram_sx
+    boards/sdkconfig.usb
+    boards/UM_FEATHERS2/sdkconfig.board
+)
+
+set(MICROPY_FROZEN_MANIFEST ${MICROPY_BOARD_DIR}/manifest.py)
\ No newline at end of file
diff --git a/ports/esp32/boards/UM_FEATHERS2/mpconfigboard.h b/ports/esp32/boards/UM_FEATHERS2/mpconfigboard.h
new file mode 100644
index 0000000000000..c045adccd9682
--- /dev/null
+++ b/ports/esp32/boards/UM_FEATHERS2/mpconfigboard.h
@@ -0,0 +1,5 @@
+#define MICROPY_HW_BOARD_NAME "FeatherS2"
+#define MICROPY_HW_MCU_NAME "ESP32-S2"
+
+#define MICROPY_PY_BLUETOOTH                (0)
+#define MICROPY_HW_ENABLE_SDCARD            (0)
\ No newline at end of file
diff --git a/ports/esp32/boards/UM_FEATHERS2/sdkconfig.board b/ports/esp32/boards/UM_FEATHERS2/sdkconfig.board
new file mode 100644
index 0000000000000..ccda7bff68129
--- /dev/null
+++ b/ports/esp32/boards/UM_FEATHERS2/sdkconfig.board
@@ -0,0 +1,16 @@
+CONFIG_FLASHMODE_QIO=y
+CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
+CONFIG_ESPTOOLPY_FLASHSIZE_DETECT=y
+CONFIG_ESPTOOLPY_AFTER_NORESET=y
+
+CONFIG_SPIRAM_MEMTEST=
+
+CONFIG_ESPTOOLPY_FLASHSIZE_4MB=
+CONFIG_ESPTOOLPY_FLASHSIZE_16MB=y
+CONFIG_PARTITION_TABLE_CUSTOM=y
+CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions-16MiB.csv"
+#CONFIG_USB_AND_UART=y
+
+# LWIP
+CONFIG_LWIP_LOCAL_HOSTNAME="UMFeatherS2"
+# end of LWIP
diff --git a/ports/esp32/boards/UM_TINYS2/manifest.py b/ports/esp32/boards/UM_TINYS2/manifest.py
new file mode 100644
index 0000000000000..7ae2ed15d9169
--- /dev/null
+++ b/ports/esp32/boards/UM_TINYS2/manifest.py
@@ -0,0 +1,2 @@
+include("$(PORT_DIR)/boards/manifest.py")
+freeze("modules")
diff --git a/ports/esp32/boards/UM_TINYS2/modules/tinys2.py b/ports/esp32/boards/UM_TINYS2/modules/tinys2.py
new file mode 100644
index 0000000000000..ca59cb123581d
--- /dev/null
+++ b/ports/esp32/boards/UM_TINYS2/modules/tinys2.py
@@ -0,0 +1,82 @@
+# TinyS2 MicroPython Helper Library
+# 2021 Seon Rozenblum - Unexpected Maker
+#
+# Project home:
+#   https://tinys2.io
+#
+# 2021-Apr-10 - v0.1 - Initial implementation
+
+# Import required libraries
+from micropython import const
+from machine import Pin, SPI, ADC
+import machine, time
+
+# TinyS2 Hardware Pin Assignments
+
+# Sense Pins
+VBUS_SENSE = const(21)
+VBAT_SENSE = const(3)
+
+
+# RGB LED Pins
+RGB_DATA = const(1)
+RGB_PWR = const(2)
+
+# SPI
+SPI_MOSI = const(35)
+SPI_MISO = const(36)
+SPI_CLK = const(37)
+
+# I2C
+I2C_SDA = const(8)
+I2C_SCL = const(9)
+
+# DAC
+DAC1 = const(17)
+DAC2 = const(18)
+
+
+# Helper functions
+def set_pixel_power(state):
+    """Enable or Disable power to the onboard NeoPixel to either show colour, or to reduce power fro deep sleep."""
+    Pin(RGB_PWR, Pin.OUT).value(state)
+
+
+def get_battery_voltage():
+    """
+    Returns the current battery voltage. If no battery is connected, returns 4.2V which is the charge voltage
+    This is an approximation only, but useful to detect if the charge state of the battery is getting low.
+    """
+    adc = ADC(Pin(VBAT_SENSE))  # Assign the ADC pin to read
+    measuredvbat = adc.read()  # Read the value
+    measuredvbat /= 8192  # divide by 8192 as we are using the default ADC voltage range of 0-1V
+    measuredvbat *= 4.2  # Multiply by 4.2V, our reference voltage
+    return round(measuredvbat, 2)
+
+
+def get_vbus_present():
+    """Detect if VBUS (5V) power source is present"""
+    return Pin(VBUS_SENSE, Pin.IN).value() == 1
+
+
+# Dotstar rainbow colour wheel
+def rgb_color_wheel(wheel_pos):
+    """Color wheel to allow for cycling through the rainbow of RGB colors."""
+    wheel_pos = wheel_pos % 255
+
+    if wheel_pos < 85:
+        return 255 - wheel_pos * 3, 0, wheel_pos * 3
+    elif wheel_pos < 170:
+        wheel_pos -= 85
+        return 0, wheel_pos * 3, 255 - wheel_pos * 3
+    else:
+        wheel_pos -= 170
+        return wheel_pos * 3, 255 - wheel_pos * 3, 0
+
+
+# Go into deep sleep but shut down the APA first to save power
+# Use this if you want lowest deep  sleep current
+def go_deepsleep(t):
+    """Deep sleep helper that also powers down the on-board Dotstar."""
+    set_pixel_power(False)
+    machine.deepsleep(t)
diff --git a/ports/esp32/boards/UM_TINYS2/mpconfigboard.cmake b/ports/esp32/boards/UM_TINYS2/mpconfigboard.cmake
new file mode 100644
index 0000000000000..928f9f8fc35d2
--- /dev/null
+++ b/ports/esp32/boards/UM_TINYS2/mpconfigboard.cmake
@@ -0,0 +1,8 @@
+set(IDF_TARGET esp32s2)
+set(SDKCONFIG_DEFAULTS
+    boards/sdkconfig.base
+    boards/sdkconfig.spiram_sx
+    boards/sdkconfig.usb
+)
+
+set(MICROPY_FROZEN_MANIFEST ${MICROPY_PORT_DIR}/boards/manifest.py)
diff --git a/ports/esp32/boards/UM_TINYS2/mpconfigboard.h b/ports/esp32/boards/UM_TINYS2/mpconfigboard.h
new file mode 100644
index 0000000000000..87d266e58c52a
--- /dev/null
+++ b/ports/esp32/boards/UM_TINYS2/mpconfigboard.h
@@ -0,0 +1,9 @@
+#define MICROPY_HW_BOARD_NAME "TinyS2"
+#define MICROPY_HW_MCU_NAME "ESP32-S2FN4R2"
+
+#define MICROPY_PY_BLUETOOTH                (0)
+#define MICROPY_HW_ENABLE_SDCARD            (0)
+
+#define MICROPY_HW_SPI1_MOSI (35)
+#define MICROPY_HW_SPI1_MISO (36)
+#define MICROPY_HW_SPI1_SCK (37)
diff --git a/ports/esp32/boards/UM_TINYS2/sdkconfig.board b/ports/esp32/boards/UM_TINYS2/sdkconfig.board
new file mode 100644
index 0000000000000..48b6749c720db
--- /dev/null
+++ b/ports/esp32/boards/UM_TINYS2/sdkconfig.board
@@ -0,0 +1,6 @@
+CONFIG_FLASHMODE_QIO=y
+CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
+CONFIG_USB_AND_UART=y
+# LWIP
+CONFIG_LWIP_LOCAL_HOSTNAME="UMTinyS2"
+# end of LWIP

From cce7096d1a031f43f72c2ea87513301c3db118dc Mon Sep 17 00:00:00 2001
From: Chris Greening <chris@cmgresearch.com>
Date: Mon, 10 May 2021 18:17:31 +0100
Subject: [PATCH 0843/3533] esp32/boards/UM_TINYPICO: Fix include of sdkconfig
 fragment.

This was broken by 32ec07a3504d6dcbfc53997197a3c53e8c03497f
---
 ports/esp32/boards/UM_TINYPICO/mpconfigboard.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/esp32/boards/UM_TINYPICO/mpconfigboard.cmake b/ports/esp32/boards/UM_TINYPICO/mpconfigboard.cmake
index 0c65103a85347..bc2541c69969d 100644
--- a/ports/esp32/boards/UM_TINYPICO/mpconfigboard.cmake
+++ b/ports/esp32/boards/UM_TINYPICO/mpconfigboard.cmake
@@ -3,7 +3,7 @@ set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.ble
     boards/sdkconfig.240mhz
     boards/sdkconfig.spiram
-    boards/TINYPICO/sdkconfig.board
+    boards/UM_TINYPICO/sdkconfig.board
 )
 
 if(NOT MICROPY_FROZEN_MANIFEST)

From 4404dababb715916262ca9aa45a5732d8454eda0 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 11 May 2021 12:46:18 +1000
Subject: [PATCH 0844/3533] rp2/CMakeLists.txt: Include tinyusb_common in
 PICO_SDK_COMPONENTS.

So the TinyUSB headers can be found during qstr processing.

Fixes issue #7236.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/rp2/CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/rp2/CMakeLists.txt b/ports/rp2/CMakeLists.txt
index 699520b240849..50cdba4ba08f8 100644
--- a/ports/rp2/CMakeLists.txt
+++ b/ports/rp2/CMakeLists.txt
@@ -154,6 +154,7 @@ set(PICO_SDK_COMPONENTS
     pico_sync
     pico_time
     pico_unique_id
+    tinyusb_common
     tinyusb_device
 )
 

From 70f50c46cc8ae0cd6802c7998874b5ea7c410119 Mon Sep 17 00:00:00 2001
From: Ayke van Laethem <aykevanlaethem@gmail.com>
Date: Mon, 9 Apr 2018 01:00:01 +0200
Subject: [PATCH 0845/3533] lib/utils: Add ARM semihosting utility functions.

This can be a replacement for a UART in custom ports.
---
 lib/utils/semihosting.c | 132 ++++++++++++++++++++++++++++++++++++++++
 lib/utils/semihosting.h |  51 ++++++++++++++++
 2 files changed, 183 insertions(+)
 create mode 100644 lib/utils/semihosting.c
 create mode 100644 lib/utils/semihosting.h

diff --git a/lib/utils/semihosting.c b/lib/utils/semihosting.c
new file mode 100644
index 0000000000000..18c7f5d57a3f3
--- /dev/null
+++ b/lib/utils/semihosting.c
@@ -0,0 +1,132 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2018 Ayke van Laethem
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "semihosting.h"
+
+// Resources:
+// http://embed.rs/articles/2016/semi-hosting-rust/
+// https://wiki.dlang.org/Minimal_semihosted_ARM_Cortex-M_%22Hello_World%22
+// https://github.com/arduino/OpenOCD/blob/master/src/target/arm_semihosting.c
+
+#define SYS_OPEN   0x01
+#define SYS_WRITEC 0x03
+#define SYS_WRITE  0x05
+#define SYS_READC  0x07
+
+// Constants:
+#define OPEN_MODE_READ  (0) // mode "r"
+#define OPEN_MODE_WRITE (4) // mode "w"
+
+#ifndef __thumb__
+#error Semihosting is only implemented for ARM microcontrollers.
+#endif
+
+static int mp_semihosting_stdout;
+
+static uint32_t mp_semihosting_call(uint32_t num, const void *arg) {
+    // A semihosting call works as follows, similar to a SVCall:
+    //   * the call is invoked by a special breakpoint: 0xAB
+    //   * the command is placed in r0
+    //   * a pointer to the arguments is placed in r1
+    //   * the return value is placed in r0
+    // Note that because it uses the breakpoint instruction, applications
+    // will hang if they're not connected to a debugger. And they'll be
+    // stuck in a breakpoint if semihosting is not specifically enabled in
+    // the debugger.
+    // Also note that semihosting is extremely slow (sometimes >100ms per
+    // call).
+    register uint32_t num_reg __asm__ ("r0") = num;
+    register const void *args_reg __asm__ ("r1") = arg;
+    __asm__ __volatile__ (
+        "bkpt 0xAB\n"         // invoke semihosting call
+        : "+r" (num_reg)      // call number and result
+        : "r" (args_reg)      // arguments
+        : "memory");          // make sure args aren't optimized away
+    return num_reg; // r0, which became the result
+}
+
+static int mp_semihosting_open_console(uint32_t mode) {
+    struct {
+        char *name;
+        uint32_t mode;
+        uint32_t name_len;
+    } args = {
+        .name = ":tt",     // magic path to console
+        .mode = mode,      // e.g. "r", "w" (see OPEN_MODE_* constants)
+        .name_len = 3,     // strlen(":tt")
+    };
+    return mp_semihosting_call(SYS_OPEN, &args);
+}
+
+void mp_semihosting_init() {
+    mp_semihosting_stdout = mp_semihosting_open_console(OPEN_MODE_WRITE);
+}
+
+int mp_semihosting_rx_char() {
+    return mp_semihosting_call(SYS_READC, NULL);
+}
+
+static void mp_semihosting_tx_char(char c) {
+    mp_semihosting_call(SYS_WRITEC, &c);
+}
+
+uint32_t mp_semihosting_tx_strn(const char *str, size_t len) {
+    if (len == 0) {
+        return 0; // nothing to do
+    }
+    if (len == 1) {
+        mp_semihosting_tx_char(*str); // maybe faster?
+        return 0;
+    }
+
+    struct {
+        uint32_t fd;
+        const char *str;
+        uint32_t len;
+    } args = {
+        .fd = mp_semihosting_stdout,
+        .str = str,
+        .len = len,
+    };
+    return mp_semihosting_call(SYS_WRITE, &args);
+}
+
+uint32_t mp_semihosting_tx_strn_cooked(const char *str, size_t len) {
+    // Write chunks of data until (excluding) the first '\n' character,
+    // insert a '\r' character, and then continue with the next chunk
+    // (starting with '\n').
+    // Doing byte-by-byte writes would be easier to implement but is far
+    // too slow.
+    size_t start = 0;
+    for (size_t i = 0; i < len; i++) {
+        if (str[i] == '\n') {
+            mp_semihosting_tx_strn(str + start, i - start);
+            mp_semihosting_tx_char('\r');
+            start = i;
+        }
+    }
+    return mp_semihosting_tx_strn(str + start, len - start);
+}
diff --git a/lib/utils/semihosting.h b/lib/utils/semihosting.h
new file mode 100644
index 0000000000000..d053a03edaae9
--- /dev/null
+++ b/lib/utils/semihosting.h
@@ -0,0 +1,51 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2018 Ayke van Laethem
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+#ifndef MICROPY_INCLUDED_LIB_UTILS_SEMIHOSTING_H
+#define MICROPY_INCLUDED_LIB_UTILS_SEMIHOSTING_H
+
+/*
+
+To use semi-hosting for a replacement UART:
+- Add lib/semihosting/semihosting.c to the Makefile sources.
+- Call mp_semihosting_init() in main(), around the time UART is initialized.
+- Replace mp_hal_stdin_rx_chr and similar in mphalport.c with the semihosting equivalent.
+- Include lib/semihosting/semihosting.h in the relevant files.
+
+Then make sure the debugger is attached and enables semihosting.  In OpenOCD this is
+done with ARM semihosting enable followed by reset.  The terminal will need further
+configuration to work with MicroPython (bash: stty raw -echo).
+
+*/
+
+#include <stddef.h>
+#include <stdint.h>
+
+void mp_semihosting_init();
+int mp_semihosting_rx_char();
+uint32_t mp_semihosting_tx_strn(const char *str, size_t len);
+uint32_t mp_semihosting_tx_strn_cooked(const char *str, size_t len);
+
+#endif // MICROPY_INCLUDED_LIB_UTILS_SEMIHOSTING_H

From 18d984c8b2053ddc17f02816cb037f13afee685a Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 11 May 2021 23:45:36 +1000
Subject: [PATCH 0846/3533] tests/run-perfbench.py: Fix native feature check.

This was broken by 8459f538eb45fd8e1e4d614298449cf18de84d75

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/run-perfbench.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/run-perfbench.py b/tests/run-perfbench.py
index 8b71ae64ce2b2..bcdbe69abbf90 100755
--- a/tests/run-perfbench.py
+++ b/tests/run-perfbench.py
@@ -85,7 +85,7 @@ def run_benchmark_on_target(target, script):
 
 def run_benchmarks(target, param_n, param_m, n_average, test_list):
     skip_complex = run_feature_test(target, "complex") != "complex"
-    skip_native = run_feature_test(target, "native_check") != ""
+    skip_native = run_feature_test(target, "native_check") != "native"
 
     for test_file in sorted(test_list):
         print(test_file + ": ", end="")

From 87e38b3cc83be7297957b5ec9b701769ffe2d6e3 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 12 May 2021 00:05:55 +1000
Subject: [PATCH 0847/3533] docs/library/rp2.rst: Fix typo
 overriden->overridden.

Signed-off-by: Damien George <damien@micropython.org>
---
 docs/library/rp2.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/library/rp2.rst b/docs/library/rp2.rst
index b6e7fcf429505..5d168bce20262 100644
--- a/docs/library/rp2.rst
+++ b/docs/library/rp2.rst
@@ -38,7 +38,7 @@ For running PIO programs, see :class:`rp2.StateMachine`.
     - *sideset_init* configures the pins used side-setting. There can be at
       most 5.
 
-    The following parameters are used by default, but can be overriden in
+    The following parameters are used by default, but can be overridden in
     `StateMachine.init()`:
 
     - *in_shiftdir* is the default direction the ISR will shift, either

From 300fc842cec1d1ef71df95c917374808ae2cafe9 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 12 May 2021 11:18:16 +1000
Subject: [PATCH 0848/3533] py/mkenv.mk: Don't emit info about BUILD_VERBOSE if
 it's set.

If the user sets V or BUILD_VERBOSE then they don't need to see this
message.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/mkenv.mk | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/py/mkenv.mk b/py/mkenv.mk
index 371d32046227d..d54f0a0d3190b 100644
--- a/py/mkenv.mk
+++ b/py/mkenv.mk
@@ -20,6 +20,7 @@ ifeq ("$(origin V)", "command line")
 BUILD_VERBOSE=$(V)
 endif
 ifndef BUILD_VERBOSE
+$(info Use make V=1 or set BUILD_VERBOSE in your environment to increase build verbosity.)
 BUILD_VERBOSE = 0
 endif
 ifeq ($(BUILD_VERBOSE),0)
@@ -27,10 +28,6 @@ Q = @
 else
 Q =
 endif
-# Since this is a new feature, advertise it
-ifeq ($(BUILD_VERBOSE),0)
-$(info Use make V=1 or set BUILD_VERBOSE in your environment to increase build verbosity.)
-endif
 
 # default settings; can be overridden in main Makefile
 

From ee4ffc1804cc39c80128185e7ea96365fa381d7e Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 28 Apr 2021 16:52:01 +1000
Subject: [PATCH 0849/3533] stm32/powerctrl: Add
 MICROPY_HW_ENTER_BOOTLOADER_VIA_RESET option.

When disabled the bootloader is entered via a direct jump.  When enabled
the bootloader is entered via a system reset then a jump.  It's enabled by
default to retain the existing behaviour, which is the recommended way.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/mpconfigboard_common.h |  5 +++++
 ports/stm32/powerctrl.c            | 34 +++++++++++++++++++++++-------
 2 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/ports/stm32/mpconfigboard_common.h b/ports/stm32/mpconfigboard_common.h
index 0df35918bef94..ce9dbdb0af8c0 100644
--- a/ports/stm32/mpconfigboard_common.h
+++ b/ports/stm32/mpconfigboard_common.h
@@ -47,6 +47,11 @@
 #define MICROPY_PY_PYB_LEGACY (1)
 #endif
 
+// Whether machine.bootloader() will enter the bootloader via reset, or direct jump.
+#ifndef MICROPY_HW_ENTER_BOOTLOADER_VIA_RESET
+#define MICROPY_HW_ENTER_BOOTLOADER_VIA_RESET (1)
+#endif
+
 // Whether to enable storage on the internal flash of the MCU
 #ifndef MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE
 #define MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE (1)
diff --git a/ports/stm32/powerctrl.c b/ports/stm32/powerctrl.c
index 573844063b664..253f1056cabe1 100644
--- a/ports/stm32/powerctrl.c
+++ b/ports/stm32/powerctrl.c
@@ -66,9 +66,11 @@
 #define HAVE_PLL48 0
 #endif
 
+#if MICROPY_HW_ENTER_BOOTLOADER_VIA_RESET
 // Location in RAM of bootloader state (just after the top of the stack)
 extern uint32_t _estack[];
 #define BL_STATE ((uint32_t *)&_estack)
+#endif
 
 static inline void powerctrl_disable_hsi_if_unused(void) {
     #if !MICROPY_HW_CLK_USE_HSI && (defined(STM32F4) || defined(STM32F7) || defined(STM32H7))
@@ -78,32 +80,47 @@ static inline void powerctrl_disable_hsi_if_unused(void) {
 }
 
 NORETURN void powerctrl_mcu_reset(void) {
+    #if MICROPY_HW_ENTER_BOOTLOADER_VIA_RESET
     BL_STATE[1] = 1; // invalidate bootloader address
     #if __DCACHE_PRESENT == 1
     SCB_CleanDCache();
     #endif
+    #endif
     NVIC_SystemReset();
 }
 
+NORETURN static __attribute__((naked)) void branch_to_bootloader(uint32_t r0, uint32_t bl_addr) {
+    __asm volatile (
+        "ldr r2, [r1, #0]\n"    // get address of stack pointer
+        "msr msp, r2\n"         // get stack pointer
+        "ldr r2, [r1, #4]\n"    // get address of destination
+        "bx r2\n"               // branch to bootloader
+        );
+    MP_UNREACHABLE;
+}
+
 NORETURN void powerctrl_enter_bootloader(uint32_t r0, uint32_t bl_addr) {
+    #if MICROPY_HW_ENTER_BOOTLOADER_VIA_RESET
+
+    // Enter the bootloader via a reset, so everything is reset (including WDT).
+    // Upon reset powerctrl_check_enter_bootloader() will jump to the bootloader.
     BL_STATE[0] = r0;
     BL_STATE[1] = bl_addr;
     #if __DCACHE_PRESENT == 1
     SCB_CleanDCache();
     #endif
     NVIC_SystemReset();
-}
 
-static __attribute__((naked)) void branch_to_bootloader(uint32_t r0, uint32_t bl_addr) {
-    __asm volatile (
-        "ldr r2, [r1, #0]\n"    // get address of stack pointer
-        "msr msp, r2\n"         // get stack pointer
-        "ldr r2, [r1, #4]\n"    // get address of destination
-        "bx r2\n"               // branch to bootloader
-        );
+    #else
+
+    // Enter the bootloader via a direct jump.
+    branch_to_bootloader(r0, bl_addr);
+
+    #endif
 }
 
 void powerctrl_check_enter_bootloader(void) {
+    #if MICROPY_HW_ENTER_BOOTLOADER_VIA_RESET
     uint32_t bl_addr = BL_STATE[1];
     BL_STATE[1] = 1; // invalidate bootloader address
     if ((bl_addr & 0xfff) == 0 && (RCC->RCC_SR & RCC_SR_SFTRSTF)) {
@@ -115,6 +132,7 @@ void powerctrl_check_enter_bootloader(void) {
         uint32_t r0 = BL_STATE[0];
         branch_to_bootloader(r0, bl_addr);
     }
+    #endif
 }
 
 #if !defined(STM32F0) && !defined(STM32L0) && !defined(STM32WB)

From 9ee116c452e6569d70cdebaade5dd25a1555b82b Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 6 May 2021 10:49:43 +1000
Subject: [PATCH 0850/3533] stm32/boardctrl: Adjust logic for running boot.py,
 main.py.

This new logic is equivalent to the old logic when the only possibilities
for reset_mode are NORMAL, SAFE_MODE and FILESYSTEM, which is the standard
case.  But the new logic also allows other reset_mode values (eg
BOOTLOADER) to run boot.py and main.py.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/boardctrl.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/ports/stm32/boardctrl.c b/ports/stm32/boardctrl.c
index 8cc519d8e9d7d..f1b7a4e81cc13 100644
--- a/ports/stm32/boardctrl.c
+++ b/ports/stm32/boardctrl.c
@@ -143,8 +143,7 @@ void boardctrl_top_soft_reset_loop(boardctrl_state_t *state) {
 }
 
 int boardctrl_run_boot_py(boardctrl_state_t *state) {
-    bool run_boot_py = state->reset_mode == BOARDCTRL_RESET_MODE_NORMAL
-        || state->reset_mode == BOARDCTRL_RESET_MODE_FACTORY_FILESYSTEM;
+    bool run_boot_py = state->reset_mode != BOARDCTRL_RESET_MODE_SAFE_MODE;
 
     if (run_boot_py) {
         // Run boot.py, if it exists.
@@ -176,8 +175,7 @@ int boardctrl_run_boot_py(boardctrl_state_t *state) {
 }
 
 int boardctrl_run_main_py(boardctrl_state_t *state) {
-    bool run_main_py = (state->reset_mode == BOARDCTRL_RESET_MODE_NORMAL
-        || state->reset_mode == BOARDCTRL_RESET_MODE_FACTORY_FILESYSTEM)
+    bool run_main_py = state->reset_mode != BOARDCTRL_RESET_MODE_SAFE_MODE
         && pyexec_mode_kind == PYEXEC_MODE_FRIENDLY_REPL;
 
     if (run_main_py) {

From 6639e282c762b1f878c2c66a1e0153ee8cb61e1a Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 12 May 2021 13:29:01 +1000
Subject: [PATCH 0851/3533] stm32/mboot: Add MBOOT_LEAVE_BOOTLOADER_VIA_RESET
 option.

It is enabled by default to get the standard behaviour of doing a reset
after it is finished, but can be disabled by a board to jump straight to
the application (likely the board needs to use MBOOT_BOARD_CLEANUP to make
this work).

The application is passed a reset mode of BOARDCTRL_RESET_MODE_BOOTLOADER
if the bootloader was active and entered via a jump.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/mboot/main.c | 64 ++++++++++++++++++++++++++++++++--------
 1 file changed, 51 insertions(+), 13 deletions(-)

diff --git a/ports/stm32/mboot/main.c b/ports/stm32/mboot/main.c
index 36b6890361572..2bee5a666f632 100644
--- a/ports/stm32/mboot/main.c
+++ b/ports/stm32/mboot/main.c
@@ -40,6 +40,11 @@
 #include "dfu.h"
 #include "pack.h"
 
+// Whether the bootloader will leave via reset, or direct jump to the application.
+#ifndef MBOOT_LEAVE_BOOTLOADER_VIA_RESET
+#define MBOOT_LEAVE_BOOTLOADER_VIA_RESET (1)
+#endif
+
 // This option selects whether to use explicit polling or IRQs for USB events.
 // In some test cases polling mode can run slightly faster, but it uses more power.
 // Polling mode will also cause failures with the mass-erase command because USB
@@ -1329,6 +1334,45 @@ static int get_reset_mode(void) {
     return reset_mode;
 }
 
+NORETURN static __attribute__((naked)) void branch_to_application(uint32_t r0, uint32_t bl_addr) {
+    __asm volatile (
+        "ldr r2, [r1, #0]\n"    // get address of stack pointer
+        "msr msp, r2\n"         // set stack pointer
+        "ldr r2, [r1, #4]\n"    // get address of destination
+        "bx r2\n"               // branch to application
+        );
+    MP_UNREACHABLE;
+}
+
+static void try_enter_application(int reset_mode) {
+    uint32_t msp = *(volatile uint32_t*)APPLICATION_ADDR;
+    if ((msp & APP_VALIDITY_BITS) != 0) {
+        // Application is invalid.
+        return;
+    }
+
+    // undo our DFU settings
+    // TODO probably should disable all IRQ sources first
+    #if defined(MBOOT_BOARD_CLEANUP)
+    MBOOT_BOARD_CLEANUP(reset_mode);
+    #endif
+    #if USE_CACHE && defined(STM32F7)
+    SCB_DisableICache();
+    SCB_DisableDCache();
+    #endif
+
+    // Jump to the application.
+    branch_to_application(reset_mode, APPLICATION_ADDR);
+}
+
+static void leave_bootloader(void) {
+    #if !MBOOT_LEAVE_BOOTLOADER_VIA_RESET
+    // Try to enter the application via a jump, if it's valid.
+    try_enter_application(BOARDCTRL_RESET_MODE_BOOTLOADER);
+    #endif
+    NVIC_SystemReset();
+}
+
 static void do_reset(void) {
     led_state_all(0);
     mp_hal_delay_ms(50);
@@ -1337,7 +1381,7 @@ static void do_reset(void) {
     i2c_slave_shutdown(MBOOT_I2Cx, I2Cx_EV_IRQn);
     #endif
     mp_hal_delay_ms(50);
-    NVIC_SystemReset();
+    leave_bootloader();
 }
 
 extern PCD_HandleTypeDef pcd_fs_handle;
@@ -1402,17 +1446,11 @@ void stm32_main(int initial_r0) {
     }
 
     int reset_mode = get_reset_mode();
-    uint32_t msp = *(volatile uint32_t*)APPLICATION_ADDR;
-    if (reset_mode != BOARDCTRL_RESET_MODE_BOOTLOADER && (msp & APP_VALIDITY_BITS) == 0) {
-        // not DFU mode so jump to application, passing through reset_mode
-        // undo our DFU settings
-        // TODO probably should disable all IRQ sources first
-        #if USE_CACHE && defined(STM32F7)
-        SCB_DisableICache();
-        SCB_DisableDCache();
-        #endif
-        __set_MSP(msp);
-        ((void (*)(uint32_t)) *((volatile uint32_t*)(APPLICATION_ADDR + 4)))(reset_mode);
+    if (reset_mode != BOARDCTRL_RESET_MODE_BOOTLOADER) {
+        // Bootloader mode was not selected so try to enter the application,
+        // passing through the reset_mode.  This will return if the application
+        // is invalid.
+        try_enter_application(reset_mode);
     }
 
 enter_bootloader:
@@ -1461,7 +1499,7 @@ void stm32_main(int initial_r0) {
         }
         // Always reset because the application is expecting to resume
         led_state_all(0);
-        NVIC_SystemReset();
+        leave_bootloader();
     }
     #endif
 

From 9a0bca2c2a6aef7b032d9c5bde378058c8258a08 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 12 May 2021 13:33:56 +1000
Subject: [PATCH 0852/3533] stm32/mboot: Make LEDs and reset-mode selection
 more configurable.

A board can now customise mboot with:
- MBOOT_LED1, MBOOT_LED2, MBOOT_LED3, MBOOT_LED4: if it needs to have
  different LEDs for mboot compared to the application
- MBOOT_BOARD_LED_INIT: if it needs a fully customised LED init function
- MBOOT_BOARD_LED_STATE: if it needs a fully customised LED state-setting
  function
- MBOOT_BOARD_GET_RESET_MODE: if it needs a fully customised function to
  get the reset mode

With full customisation, the only requirement is a single LED to show the
status of the bootloader (idle, erasing, flashing, etc), which can be
configured to do nothing if needed.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/mboot/main.c  | 71 ++++++++++++++++++++++++++++++---------
 ports/stm32/mboot/mboot.h |  2 ++
 2 files changed, 57 insertions(+), 16 deletions(-)

diff --git a/ports/stm32/mboot/main.c b/ports/stm32/mboot/main.c
index 2bee5a666f632..3a0242a8d6bf0 100644
--- a/ports/stm32/mboot/main.c
+++ b/ports/stm32/mboot/main.c
@@ -374,12 +374,27 @@ void mp_hal_pin_config_speed(uint32_t port_pin, uint32_t speed) {
 /******************************************************************************/
 // LED
 
+#if defined(MBOOT_LED1)
+#define LED0 MBOOT_LED1
+#elif defined(MICROPY_HW_LED1)
 #define LED0 MICROPY_HW_LED1
+#endif
+
+#if defined(MBOOT_LED2)
+#define LED1 MBOOT_LED2
+#elif defined(MICROPY_HW_LED2)
 #define LED1 MICROPY_HW_LED2
-#ifdef MICROPY_HW_LED3
+#endif
+
+#if defined(MBOOT_LED3)
+#define LED2 MBOOT_LED3
+#elif defined(MICROPY_HW_LED3)
 #define LED2 MICROPY_HW_LED3
 #endif
-#ifdef MICROPY_HW_LED4
+
+#if defined(MBOOT_LED4)
+#define LED3 MBOOT_LED4
+#elif defined(MICROPY_HW_LED4)
 #define LED3 MICROPY_HW_LED4
 #endif
 
@@ -397,28 +412,45 @@ static uint32_t led0_ms_interval = 0;
 static int led0_toggle_count = 0;
 
 MP_WEAK void led_init(void) {
+    #if defined(MBOOT_BOARD_LED_INIT)
+    // Custom LED init function provided by the board.
+    MBOOT_BOARD_LED_INIT();
+    #else
+    // Init LEDs using GPIO calls.
     mp_hal_pin_output(LED0);
+    #ifdef LED1
     mp_hal_pin_output(LED1);
+    #endif
     #ifdef LED2
     mp_hal_pin_output(LED2);
     #endif
     #ifdef LED3
     mp_hal_pin_output(LED3);
     #endif
+    #endif
+
     led0_cur_state = LED0_STATE_OFF;
 }
 
 MP_WEAK void led_state(uint32_t led, int val) {
+    #if defined(MBOOT_BOARD_LED_STATE)
+    // Custom LED state function provided by the board.
+    return MBOOT_BOARD_LED_STATE(led, val);
+    #else
+    // Set LEDs using GPIO calls.
     if (val) {
         MICROPY_HW_LED_ON(led);
     } else {
         MICROPY_HW_LED_OFF(led);
     }
+    #endif
 }
 
 void led_state_all(unsigned int mask) {
     led_state(LED0, mask & 1);
+    #ifdef LED1
     led_state(LED1, mask & 2);
+    #endif
     #ifdef LED2
     led_state(LED2, mask & 4);
     #endif
@@ -445,17 +477,6 @@ void led0_update() {
     }
 }
 
-/******************************************************************************/
-// USR BUTTON
-
-static void usrbtn_init(void) {
-    mp_hal_pin_config(MICROPY_HW_USRSW_PIN, MP_HAL_PIN_MODE_INPUT, MICROPY_HW_USRSW_PULL, 0);
-}
-
-static int usrbtn_state(void) {
-    return mp_hal_pin_read(MICROPY_HW_USRSW_PIN) == MICROPY_HW_USRSW_PRESSED;
-}
-
 /******************************************************************************/
 // FLASH
 
@@ -1287,6 +1308,14 @@ static int pyb_usbdd_shutdown(void) {
 /******************************************************************************/
 // main
 
+#if defined(MBOOT_BOARD_GET_RESET_MODE)
+
+static inline int mboot_get_reset_mode(void) {
+    return MBOOT_BOARD_GET_RESET_MODE();
+}
+
+#else
+
 #define RESET_MODE_NUM_STATES (4)
 #define RESET_MODE_TIMEOUT_CYCLES (8)
 #ifdef LED2
@@ -1299,7 +1328,15 @@ static int pyb_usbdd_shutdown(void) {
 #define RESET_MODE_LED_STATES 0x3210
 #endif
 
-static int get_reset_mode(void) {
+static void usrbtn_init(void) {
+    mp_hal_pin_config(MICROPY_HW_USRSW_PIN, MP_HAL_PIN_MODE_INPUT, MICROPY_HW_USRSW_PULL, 0);
+}
+
+static int usrbtn_state(void) {
+    return mp_hal_pin_read(MICROPY_HW_USRSW_PIN) == MICROPY_HW_USRSW_PRESSED;
+}
+
+static int mboot_get_reset_mode(void) {
     usrbtn_init();
     int reset_mode = BOARDCTRL_RESET_MODE_NORMAL;
     if (usrbtn_state()) {
@@ -1334,6 +1371,8 @@ static int get_reset_mode(void) {
     return reset_mode;
 }
 
+#endif
+
 NORETURN static __attribute__((naked)) void branch_to_application(uint32_t r0, uint32_t bl_addr) {
     __asm volatile (
         "ldr r2, [r1, #0]\n"    // get address of stack pointer
@@ -1445,7 +1484,7 @@ void stm32_main(int initial_r0) {
         goto enter_bootloader;
     }
 
-    int reset_mode = get_reset_mode();
+    int reset_mode = mboot_get_reset_mode();
     if (reset_mode != BOARDCTRL_RESET_MODE_BOOTLOADER) {
         // Bootloader mode was not selected so try to enter the application,
         // passing through the reset_mode.  This will return if the application
@@ -1455,7 +1494,7 @@ void stm32_main(int initial_r0) {
 
 enter_bootloader:
 
-    // Init subsystems (get_reset_mode() may call these, calling them again is ok)
+    // Init subsystems (mboot_get_reset_mode() may call these, calling them again is ok)
     led_init();
 
     // set the system clock to be HSE
diff --git a/ports/stm32/mboot/mboot.h b/ports/stm32/mboot/mboot.h
index 8f8a8afdd7c0b..3a27ce08efaf6 100644
--- a/ports/stm32/mboot/mboot.h
+++ b/ports/stm32/mboot/mboot.h
@@ -85,6 +85,8 @@ enum {
 
 extern uint8_t _estack[ELEM_DATA_SIZE];
 
+void systick_init(void);
+
 uint32_t get_le32(const uint8_t *b);
 void led_state_all(unsigned int mask);
 

From 6affcb0104336e629390b2bfba997f3446f9ea58 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 13 May 2021 16:26:07 +1000
Subject: [PATCH 0853/3533] tests/run-multitests.py: Flush stdout for each line
 of trace output.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/run-multitests.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/run-multitests.py b/tests/run-multitests.py
index 3163a48e63d2b..66ca799675454 100755
--- a/tests/run-multitests.py
+++ b/tests/run-multitests.py
@@ -243,6 +243,7 @@ def trace_instance_output(instance_idx, line):
     if cmd_args.trace_output:
         t_ms = round((time.time() - trace_t0) * 1000)
         print("{:6} i{} :".format(t_ms, instance_idx), line)
+        sys.stdout.flush()
 
 
 def run_test_on_instances(test_file, num_instances, instances):

From 57365d855734142deb030ebcd00c10efcedf554b Mon Sep 17 00:00:00 2001
From: stijn <stijn@ignitron.net>
Date: Wed, 12 May 2021 17:02:06 +0200
Subject: [PATCH 0854/3533] py/objarray: Prohibit comparison of mismatching
 types.

Array equality is defined as each element being equal but to keep
code size down MicroPython implements a binary comparison.  This
can only be used correctly for elements with the same binary layout
though so turn it into an NotImplementedError when comparing types
for which the binary comparison yielded incorrect results: types
with different sizes, and floating point numbers because nan != nan.
---
 py/objarray.c                            | 25 +++++++++++++++++++++++-
 tests/basics/array1.py                   |  9 +++++++++
 tests/basics/array_micropython.py        | 12 ++++++++++++
 tests/cpydiff/module_array_comparison.py |  9 +++++++++
 4 files changed, 54 insertions(+), 1 deletion(-)
 create mode 100644 tests/cpydiff/module_array_comparison.py

diff --git a/py/objarray.c b/py/objarray.c
index c27366d7208ef..2f1f68d81a40d 100644
--- a/py/objarray.c
+++ b/py/objarray.c
@@ -258,6 +258,16 @@ STATIC mp_obj_t array_unary_op(mp_unary_op_t op, mp_obj_t o_in) {
     }
 }
 
+STATIC int typecode_for_comparison(int typecode) {
+    if (typecode == BYTEARRAY_TYPECODE) {
+        typecode = 'B';
+    }
+    if (typecode <= 'Z') {
+        typecode += 32; // to lowercase
+    }
+    return typecode;
+}
+
 STATIC mp_obj_t array_binary_op(mp_binary_op_t op, mp_obj_t lhs_in, mp_obj_t rhs_in) {
     mp_obj_array_t *lhs = MP_OBJ_TO_PTR(lhs_in);
     switch (op) {
@@ -319,7 +329,20 @@ STATIC mp_obj_t array_binary_op(mp_binary_op_t op, mp_obj_t lhs_in, mp_obj_t rhs
             if (!mp_get_buffer(rhs_in, &rhs_bufinfo, MP_BUFFER_READ)) {
                 return mp_const_false;
             }
-            return mp_obj_new_bool(mp_seq_cmp_bytes(op, lhs_bufinfo.buf, lhs_bufinfo.len, rhs_bufinfo.buf, rhs_bufinfo.len));
+            // mp_seq_cmp_bytes is used so only compatible representations can be correctly compared.
+            // The type doesn't matter: array/bytearray/str/bytes all have the same buffer layout, so
+            // just check if the typecodes are compatible; for testing equality the types should have the
+            // same code except for signedness, and not be floating point because nan never equals nan.
+            // Note that typecode_for_comparison always returns lowercase letters to save code size.
+            // No need for (& TYPECODE_MASK) here: xxx_get_buffer already takes care of that.
+            const int lhs_code = typecode_for_comparison(lhs_bufinfo.typecode);
+            const int rhs_code = typecode_for_comparison(rhs_bufinfo.typecode);
+            if (lhs_code == rhs_code && lhs_code != 'f' && lhs_code != 'd') {
+                return mp_obj_new_bool(mp_seq_cmp_bytes(op, lhs_bufinfo.buf, lhs_bufinfo.len, rhs_bufinfo.buf, rhs_bufinfo.len));
+            }
+            // mp_obj_equal_not_equal treats returning MP_OBJ_NULL as 'fall back to pointer comparison'
+            // for MP_BINARY_OP_EQUAL but that is incompatible with CPython.
+            mp_raise_NotImplementedError(NULL);
         }
 
         default:
diff --git a/tests/basics/array1.py b/tests/basics/array1.py
index 5b3f475786a28..15789e2c99887 100644
--- a/tests/basics/array1.py
+++ b/tests/basics/array1.py
@@ -41,14 +41,23 @@
 # equality (CPython requires both sides are array)
 print(bytes(array.array('b', [0x61, 0x62, 0x63])) == b'abc')
 print(array.array('b', [0x61, 0x62, 0x63]) == b'abc')
+print(array.array('B', [0x61, 0x62, 0x63]) == b'abc')
 print(array.array('b', [0x61, 0x62, 0x63]) != b'abc')
 print(array.array('b', [0x61, 0x62, 0x63]) == b'xyz')
 print(array.array('b', [0x61, 0x62, 0x63]) != b'xyz')
 print(b'abc' == array.array('b', [0x61, 0x62, 0x63]))
+print(b'abc' == array.array('B', [0x61, 0x62, 0x63]))
 print(b'abc' != array.array('b', [0x61, 0x62, 0x63]))
 print(b'xyz' == array.array('b', [0x61, 0x62, 0x63]))
 print(b'xyz' != array.array('b', [0x61, 0x62, 0x63]))
 
+compatible_typecodes = []
+for t in ["b", "h", "i", "l", "q"]:
+  compatible_typecodes.append((t, t))
+  compatible_typecodes.append((t, t.upper()))
+for a, b in compatible_typecodes:
+  print(array.array(a, [1, 2]) == array.array(b, [1, 2]))
+
 class X(array.array):
     pass
 
diff --git a/tests/basics/array_micropython.py b/tests/basics/array_micropython.py
index 6b3dc7a93b151..44dc1d83d8efd 100644
--- a/tests/basics/array_micropython.py
+++ b/tests/basics/array_micropython.py
@@ -17,3 +17,15 @@
 a = array.array('P')
 a.append(1)
 print(a[0])
+
+# comparison between mismatching binary layouts is not implemented
+typecodes = ["b", "h", "i", "l", "q", "P", "O", "S", "f", "d"]
+for a in typecodes:
+    for b in typecodes:
+        if a == b and a not in ["f", "d"]:
+            continue
+        try:
+            array.array(a) == array.array(b)
+            print('FAIL')
+        except NotImplementedError:
+            pass
diff --git a/tests/cpydiff/module_array_comparison.py b/tests/cpydiff/module_array_comparison.py
new file mode 100644
index 0000000000000..a442af3f5bc96
--- /dev/null
+++ b/tests/cpydiff/module_array_comparison.py
@@ -0,0 +1,9 @@
+"""
+categories: Modules,array
+description: Comparison between different typecodes not supported
+cause: Code size
+workaround: Compare individual elements
+"""
+import array
+
+array.array("b", [1, 2]) == array.array("i", [1, 2])

From 09be0c083cb493c70b38079aa6fd785aa9b0b90a Mon Sep 17 00:00:00 2001
From: stijn <stijn@ignitron.net>
Date: Mon, 10 May 2021 16:40:51 +0200
Subject: [PATCH 0855/3533] py/objarray: Implement more/less comparisons for
 array.

---
 py/objarray.c              | 17 ++++++++++++-----
 tests/basics/array1.py     | 21 +++++++++++++++++++++
 tests/basics/bytearray1.py | 20 ++++++++++++++++++++
 3 files changed, 53 insertions(+), 5 deletions(-)

diff --git a/py/objarray.c b/py/objarray.c
index 2f1f68d81a40d..5bd9454716a4f 100644
--- a/py/objarray.c
+++ b/py/objarray.c
@@ -258,12 +258,13 @@ STATIC mp_obj_t array_unary_op(mp_unary_op_t op, mp_obj_t o_in) {
     }
 }
 
-STATIC int typecode_for_comparison(int typecode) {
+STATIC int typecode_for_comparison(int typecode, bool *is_unsigned) {
     if (typecode == BYTEARRAY_TYPECODE) {
         typecode = 'B';
     }
     if (typecode <= 'Z') {
         typecode += 32; // to lowercase
+        *is_unsigned = true;
     }
     return typecode;
 }
@@ -322,7 +323,11 @@ STATIC mp_obj_t array_binary_op(mp_binary_op_t op, mp_obj_t lhs_in, mp_obj_t rhs
             return mp_const_false;
         }
 
-        case MP_BINARY_OP_EQUAL: {
+        case MP_BINARY_OP_EQUAL:
+        case MP_BINARY_OP_LESS:
+        case MP_BINARY_OP_LESS_EQUAL:
+        case MP_BINARY_OP_MORE:
+        case MP_BINARY_OP_MORE_EQUAL: {
             mp_buffer_info_t lhs_bufinfo;
             mp_buffer_info_t rhs_bufinfo;
             array_get_buffer(lhs_in, &lhs_bufinfo, MP_BUFFER_READ);
@@ -333,11 +338,13 @@ STATIC mp_obj_t array_binary_op(mp_binary_op_t op, mp_obj_t lhs_in, mp_obj_t rhs
             // The type doesn't matter: array/bytearray/str/bytes all have the same buffer layout, so
             // just check if the typecodes are compatible; for testing equality the types should have the
             // same code except for signedness, and not be floating point because nan never equals nan.
+            // For > and < the types should be the same and unsigned.
             // Note that typecode_for_comparison always returns lowercase letters to save code size.
             // No need for (& TYPECODE_MASK) here: xxx_get_buffer already takes care of that.
-            const int lhs_code = typecode_for_comparison(lhs_bufinfo.typecode);
-            const int rhs_code = typecode_for_comparison(rhs_bufinfo.typecode);
-            if (lhs_code == rhs_code && lhs_code != 'f' && lhs_code != 'd') {
+            bool is_unsigned = false;
+            const int lhs_code = typecode_for_comparison(lhs_bufinfo.typecode, &is_unsigned);
+            const int rhs_code = typecode_for_comparison(rhs_bufinfo.typecode, &is_unsigned);
+            if (lhs_code == rhs_code && lhs_code != 'f' && lhs_code != 'd' && (op == MP_BINARY_OP_EQUAL || is_unsigned)) {
                 return mp_obj_new_bool(mp_seq_cmp_bytes(op, lhs_bufinfo.buf, lhs_bufinfo.len, rhs_bufinfo.buf, rhs_bufinfo.len));
             }
             // mp_obj_equal_not_equal treats returning MP_OBJ_NULL as 'fall back to pointer comparison'
diff --git a/tests/basics/array1.py b/tests/basics/array1.py
index 15789e2c99887..f21ad4bd75f90 100644
--- a/tests/basics/array1.py
+++ b/tests/basics/array1.py
@@ -66,3 +66,24 @@ class X(array.array):
 print(X('b', [0x61, 0x62, 0x63]) != b'abc')
 print(X('b', [0x61, 0x62, 0x63]) == array.array('b', [0x61, 0x62, 0x63]))
 print(X('b', [0x61, 0x62, 0x63]) != array.array('b', [0x61, 0x62, 0x63]))
+
+# other comparisons
+for typecode in ["B", "H", "I", "L", "Q"]:
+    a = array.array(typecode, [1, 1])
+    print(a < a)
+    print(a <= a)
+    print(a > a)
+    print(a >= a)
+
+    al = array.array(typecode, [1, 0])
+    ab = array.array(typecode, [1, 2])
+
+    print(a < al)
+    print(a <= al)
+    print(a > al)
+    print(a >= al)
+
+    print(a < ab)
+    print(a <= ab)
+    print(a > ab)
+    print(a >= ab)
diff --git a/tests/basics/bytearray1.py b/tests/basics/bytearray1.py
index b598500264fbe..d12292e8798ca 100644
--- a/tests/basics/bytearray1.py
+++ b/tests/basics/bytearray1.py
@@ -27,6 +27,26 @@
 print(b"1" == bytearray([1]))
 print(bytearray() == bytearray())
 
+b1 = bytearray([1, 2, 3])
+b2 = bytearray([1, 2, 3])
+b3 = bytearray([1, 3])
+print(b1 == b2)
+print(b2 != b3)
+print(b1 <= b2)
+print(b1 <= b3)
+print(b1 < b3)
+print(b1 >= b2)
+print(b3 >= b2)
+print(b3 > b2)
+print(b1 != b2)
+print(b2 == b3)
+print(b1 > b2)
+print(b1 > b3)
+print(b1 >= b3)
+print(b1 < b2)
+print(b3 < b2)
+print(b3 <= b2)
+
 # comparison with other type should return False
 print(bytearray() == 1)
 

From 43e7e5f00a601b36b5b39f1fef036d6c25d5562c Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 11 May 2021 12:54:03 +1000
Subject: [PATCH 0856/3533] lib/lwip: Switch to use GitHub mirror repo.

It is hopefully more reliable.

Signed-off-by: Damien George <damien@micropython.org>
---
 .gitmodules | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitmodules b/.gitmodules
index ceaa5342b412c..faa89c4f5cea1 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -7,7 +7,7 @@
 	url = https://github.com/atgreen/libffi
 [submodule "lib/lwip"]
 	path = lib/lwip
-	url = https://git.savannah.gnu.org/r/lwip.git
+	url = https://github.com/lwip-tcpip/lwip.git
 [submodule "lib/berkeley-db-1.xx"]
 	path = lib/berkeley-db-1.xx
 	url = https://github.com/pfalcon/berkeley-db-1.xx

From 94a3f8a4b0b29e49b8f83c522b5478c94e4d3643 Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Tue, 11 May 2021 08:24:36 -0500
Subject: [PATCH 0857/3533] tests/run-tests.py: Parallelize running tests by
 default.

This significantly reduces the time taken to run the test suite (on the
unix port).  Use `-j1` to disable this feature.

Signed-off-by: Jeff Epler <jepler@gmail.com>
---
 tests/run-tests.py | 92 +++++++++++++++++++++++++++++++++++-----------
 1 file changed, 71 insertions(+), 21 deletions(-)

diff --git a/tests/run-tests.py b/tests/run-tests.py
index a5a9b60637cc3..619df5ed361cb 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -8,6 +8,10 @@
 import inspect
 import re
 from glob import glob
+import multiprocessing
+from multiprocessing.pool import ThreadPool
+import threading
+import tempfile
 
 # See stackoverflow.com/questions/2632199: __file__ nor sys.argv[0]
 # are guaranteed to always work, this one should though.
@@ -157,12 +161,14 @@ def send_get(what):
 
             # if running via .mpy, first compile the .py file
             if args.via_mpy:
+                mpy_modname = tempfile.mktemp(dir="")
+                mpy_filename = mpy_modname + ".mpy"
                 subprocess.check_output(
                     [MPYCROSS]
                     + args.mpy_cross_flags.split()
-                    + ["-o", "mpytest.mpy", "-X", "emit=" + args.emit, test_file]
+                    + ["-o", mpy_filename, "-X", "emit=" + args.emit, test_file]
                 )
-                cmdlist.extend(["-m", "mpytest"])
+                cmdlist.extend(["-m", mpy_modname])
             else:
                 cmdlist.append(test_file)
 
@@ -175,7 +181,7 @@ def send_get(what):
 
             # clean up if we had an intermediate .mpy file
             if args.via_mpy:
-                rm_f("mpytest.mpy")
+                rm_f(mpy_filename)
 
     else:
         # run on pyboard
@@ -247,12 +253,32 @@ def run_feature_check(pyb, args, base_path, test_file):
     return run_micropython(pyb, args, base_path("feature_check", test_file), is_special=True)
 
 
-def run_tests(pyb, tests, args, result_dir):
-    test_count = 0
-    testcase_count = 0
-    passed_count = 0
-    failed_tests = []
-    skipped_tests = []
+class ThreadSafeCounter:
+    def __init__(self, start=0):
+        self._value = start
+        self._lock = threading.Lock()
+
+    def increment(self):
+        self.add(1)
+
+    def add(self, to_add):
+        with self._lock:
+            self._value += to_add
+
+    def append(self, arg):
+        self.add([arg])
+
+    @property
+    def value(self):
+        return self._value
+
+
+def run_tests(pyb, tests, args, result_dir, num_threads=1):
+    test_count = ThreadSafeCounter()
+    testcase_count = ThreadSafeCounter()
+    passed_count = ThreadSafeCounter()
+    failed_tests = ThreadSafeCounter([])
+    skipped_tests = ThreadSafeCounter([])
 
     skip_tests = set()
     skip_native = False
@@ -490,7 +516,7 @@ def run_tests(pyb, tests, args, result_dir):
         )  # native doesn't have proper traceback info
         skip_tests.add("micropython/schedule.py")  # native code doesn't check pending events
 
-    for test_file in tests:
+    def run_one_test(test_file):
         test_file = test_file.replace("\\", "/")
 
         if args.filters:
@@ -500,7 +526,7 @@ def run_tests(pyb, tests, args, result_dir):
                 if pat.search(test_file):
                     verdict = action
             if verdict == "exclude":
-                continue
+                return
 
         test_basename = test_file.replace("..", "_").replace("./", "").replace("/", "_")
         test_name = os.path.splitext(os.path.basename(test_file))[0]
@@ -533,12 +559,12 @@ def run_tests(pyb, tests, args, result_dir):
         if args.list_tests:
             if not skip_it:
                 print(test_file)
-            continue
+            return
 
         if skip_it:
             print("skip ", test_file)
             skipped_tests.append(test_name)
-            continue
+            return
 
         # get expected output
         test_file_expected = test_file + ".exp"
@@ -560,7 +586,7 @@ def run_tests(pyb, tests, args, result_dir):
         output_expected = output_expected.replace(b"\r\n", b"\n")
 
         if args.write_exp:
-            continue
+            return
 
         # run MicroPython
         output_mupy = run_micropython(pyb, args, test_file)
@@ -568,16 +594,16 @@ def run_tests(pyb, tests, args, result_dir):
         if output_mupy == b"SKIP\n":
             print("skip ", test_file)
             skipped_tests.append(test_name)
-            continue
+            return
 
-        testcase_count += len(output_expected.splitlines())
+        testcase_count.add(len(output_expected.splitlines()))
 
         filename_expected = os.path.join(result_dir, test_basename + ".exp")
         filename_mupy = os.path.join(result_dir, test_basename + ".out")
 
         if output_expected == output_mupy:
             print("pass ", test_file)
-            passed_count += 1
+            passed_count.increment()
             rm_f(filename_expected)
             rm_f(filename_mupy)
         else:
@@ -588,16 +614,32 @@ def run_tests(pyb, tests, args, result_dir):
             print("FAIL ", test_file)
             failed_tests.append(test_name)
 
-        test_count += 1
+        test_count.increment()
+
+    if pyb or args.list_tests:
+        num_threads = 1
+
+    if num_threads > 1:
+        pool = ThreadPool(num_threads)
+        pool.map(run_one_test, tests)
+    else:
+        for test in tests:
+            run_one_test(test)
 
     if args.list_tests:
         return True
 
-    print("{} tests performed ({} individual testcases)".format(test_count, testcase_count))
-    print("{} tests passed".format(passed_count))
+    print(
+        "{} tests performed ({} individual testcases)".format(
+            test_count.value, testcase_count.value
+        )
+    )
+    print("{} tests passed".format(passed_count.value))
 
+    skipped_tests = sorted(skipped_tests.value)
     if len(skipped_tests) > 0:
         print("{} tests skipped: {}".format(len(skipped_tests), " ".join(skipped_tests)))
+    failed_tests = sorted(failed_tests.value)
     if len(failed_tests) > 0:
         print("{} tests failed: {}".format(len(failed_tests), " ".join(failed_tests)))
         return False
@@ -698,6 +740,14 @@ def main():
     cmd_parser.add_argument(
         "--keep-path", action="store_true", help="do not clear MICROPYPATH when running tests"
     )
+    cmd_parser.add_argument(
+        "-j",
+        "--jobs",
+        default=multiprocessing.cpu_count(),
+        metavar="N",
+        type=int,
+        help="Number of tests to run simultaneously",
+    )
     cmd_parser.add_argument("files", nargs="*", help="input test files")
     cmd_parser.add_argument(
         "--print-failures",
@@ -800,7 +850,7 @@ def main():
 
     try:
         os.makedirs(args.result_dir, exist_ok=True)
-        res = run_tests(pyb, tests, args, args.result_dir)
+        res = run_tests(pyb, tests, args, args.result_dir, args.jobs)
     finally:
         if pyb:
             pyb.close()

From 30cbcf881daeecbc100554879e8a92d71185d9f6 Mon Sep 17 00:00:00 2001
From: Mike Causer <mcauser@gmail.com>
Date: Fri, 30 Apr 2021 14:24:44 +1000
Subject: [PATCH 0858/3533] docs/esp32: Add APA106 to quickref.

---
 docs/esp32/quickref.rst | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/docs/esp32/quickref.rst b/docs/esp32/quickref.rst
index a569ff0a4e282..68938feedce0d 100644
--- a/docs/esp32/quickref.rst
+++ b/docs/esp32/quickref.rst
@@ -483,10 +483,10 @@ Be sure to put a 4.7k pull-up resistor on the data line.  Note that
 the ``convert_temp()`` method must be called each time you want to
 sample the temperature.
 
-NeoPixel driver
----------------
+NeoPixel and APA106 driver
+--------------------------
 
-Use the ``neopixel`` module::
+Use the ``neopixel`` and ``apa106`` modules::
 
     from machine import Pin
     from neopixel import NeoPixel
@@ -497,6 +497,13 @@ Use the ``neopixel`` module::
     np.write()              # write data to all pixels
     r, g, b = np[0]         # get first pixel colour
 
+
+The APA106 driver extends NeoPixel, but internally uses a different colour order::
+
+    from apa106 import APA106
+    ap = APA106(pin, 8)
+    r, g, b = ap[0]
+
 For low-level driving of a NeoPixel::
 
     import esp
@@ -508,6 +515,7 @@ For low-level driving of a NeoPixel::
    400kHz) devices by passing ``timing=0`` when constructing the
    ``NeoPixel`` object.
 
+APA102 (DotStar) uses a different driver as it has an additional clock pin.
 
 Capacitive touch
 ----------------

From 85c51a548fc83d0776029b01b1be3748f82e296a Mon Sep 17 00:00:00 2001
From: Mike Causer <mcauser@gmail.com>
Date: Fri, 30 Apr 2021 15:57:20 +1000
Subject: [PATCH 0859/3533] docs/esp32: Mention Signal in GPIO section of
 quickref.

---
 docs/esp32/quickref.rst | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docs/esp32/quickref.rst b/docs/esp32/quickref.rst
index 68938feedce0d..1709891265d8e 100644
--- a/docs/esp32/quickref.rst
+++ b/docs/esp32/quickref.rst
@@ -171,6 +171,10 @@ Notes:
 * The pull value of some pins can be set to ``Pin.PULL_HOLD`` to reduce power
   consumption during deepsleep.
 
+There's a higher-level abstraction :ref:`machine.Signal <machine.Signal>`
+which can be used to invert a pin. Useful for illuminating active-low LEDs
+using ``on()`` or ``value(1)``.
+
 UART (serial bus)
 -----------------
 

From d43ed087aee3444a96da059dfdb532c810f7656c Mon Sep 17 00:00:00 2001
From: Mike Causer <mcauser@gmail.com>
Date: Fri, 30 Apr 2021 15:54:28 +1000
Subject: [PATCH 0860/3533] docs/esp8266: Mention Signal in GPIO section of
 quickref.

---
 docs/esp8266/quickref.rst | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docs/esp8266/quickref.rst b/docs/esp8266/quickref.rst
index af2ef1ca1a9df..c4fa779c217a5 100644
--- a/docs/esp8266/quickref.rst
+++ b/docs/esp8266/quickref.rst
@@ -138,6 +138,10 @@ Also note that Pin(16) is a special pin (used for wakeup from deepsleep
 mode) and may be not available for use with higher-level classes like
 ``Neopixel``.
 
+There's a higher-level abstraction :ref:`machine.Signal <machine.Signal>`
+which can be used to invert a pin. Useful for illuminating active-low LEDs
+using ``on()`` or ``value(1)``.
+
 UART (serial bus)
 -----------------
 

From 97fee47716627b06bfb11dbcc43f6a000d6e7257 Mon Sep 17 00:00:00 2001
From: Mike Causer <mcauser@gmail.com>
Date: Fri, 30 Apr 2021 14:00:13 +1000
Subject: [PATCH 0861/3533] docs/esp8266: Add SSD1306 to quickref and tutorial.

---
 docs/esp8266/quickref.rst         | 14 +++++
 docs/esp8266/tutorial/index.rst   |  1 +
 docs/esp8266/tutorial/ssd1306.rst | 93 +++++++++++++++++++++++++++++++
 3 files changed, 108 insertions(+)
 create mode 100644 docs/esp8266/tutorial/ssd1306.rst

diff --git a/docs/esp8266/quickref.rst b/docs/esp8266/quickref.rst
index c4fa779c217a5..bc648a348a888 100644
--- a/docs/esp8266/quickref.rst
+++ b/docs/esp8266/quickref.rst
@@ -424,6 +424,20 @@ The DHT driver is implemented in software and works on all pins::
     d.temperature() # eg. 23.6 (°C)
     d.humidity()    # eg. 41.3 (% RH)
 
+SSD1306 driver
+--------------
+
+Driver for SSD1306 monochrome OLED displays. See tutorial :ref:`ssd1306`. ::
+
+    from machine import Pin, I2C
+    import ssd1306
+
+    i2c = I2C(scl=Pin(5), sda=Pin(4), freq=100000)
+    display = ssd1306.SSD1306_I2C(128, 64, i2c)
+
+    display.text('Hello World', 0, 0, 1)
+    display.show()
+
 WebREPL (web browser interactive prompt)
 ----------------------------------------
 
diff --git a/docs/esp8266/tutorial/index.rst b/docs/esp8266/tutorial/index.rst
index 4ba211a4b2d8b..79ebd92279c55 100644
--- a/docs/esp8266/tutorial/index.rst
+++ b/docs/esp8266/tutorial/index.rst
@@ -31,4 +31,5 @@ to `<https://www.python.org>`__.
    neopixel.rst
    apa102.rst
    dht.rst
+   ssd1306.rst
    nextsteps.rst
diff --git a/docs/esp8266/tutorial/ssd1306.rst b/docs/esp8266/tutorial/ssd1306.rst
new file mode 100644
index 0000000000000..4dca82afc48f6
--- /dev/null
+++ b/docs/esp8266/tutorial/ssd1306.rst
@@ -0,0 +1,93 @@
+.. _ssd1306:
+
+Using a SSD1306 OLED display
+============================
+
+The SSD1306 OLED display uses either a SPI or I2C interface and comes in a variety of
+sizes (128x64, 128x32, 72x40, 64x48) and colours (white, yellow, blue, yellow + blue).
+
+Hardware SPI interface::
+
+    from machine import Pin, SPI
+    import ssd1306
+
+    hspi = SPI(1)  # sck=14 (scl), mosi=13 (sda), miso=12 (unused)
+
+    dc = Pin(4)    # data/command
+    rst = Pin(5)   # reset
+    cs = Pin(15)   # chip select, some modules do not have a pin for this
+
+    display = ssd1306.SSD1306_SPI(128, 64, hspi, dc, rst, cs)
+
+Software SPI interface::
+
+    from machine import Pin, SoftSPI
+    import ssd1306
+
+    spi = SoftSPI(baudrate=500000, polarity=1, phase=0, sck=Pin(14), mosi=Pin(13), miso=Pin(12))
+
+    dc = Pin(4)   # data/command
+    rst = Pin(5)  # reset
+    cs = Pin(15)  # chip select, some modules do not have a pin for this
+
+    display = ssd1306.SSD1306_SPI(128, 64, spi, dc, rst, cs)
+
+I2C interface::
+
+    from machine import Pin, I2C
+    import ssd1306
+
+    # using default address 0x3C
+    i2c = I2C(sda=Pin(4), scl=Pin(5))
+    display = ssd1306.SSD1306_I2C(128, 64, i2c)
+
+Print Hello World on the first line::
+
+    display.text('Hello, World!', 0, 0, 1)
+    display.show()
+
+Basic functions::
+
+    display.poweroff()     # power off the display, pixels persist in memory
+    display.poweron()      # power on the display, pixels redrawn
+    display.contrast(0)    # dim
+    display.contrast(255)  # bright
+    display.invert(1)      # display inverted
+    display.invert(0)      # display normal
+    display.rotate(True)   # rotate 180 degrees
+    display.rotate(False)  # rotate 0 degrees
+    display.show()         # write the contents of the FrameBuffer to display memory
+
+Subclassing FrameBuffer provides support for graphics primitives::
+
+    display.fill(0)                         # fill entire screen with colour=0
+    display.pixel(0, 10)                    # get pixel at x=0, y=10
+    display.pixel(0, 10, 1)                 # set pixel at x=0, y=10 to colour=1
+    display.hline(0, 8, 4, 1)               # draw horizontal line x=0, y=8, width=4, colour=1
+    display.vline(0, 8, 4, 1)               # draw vertical line x=0, y=8, height=4, colour=1
+    display.line(0, 0, 127, 63, 1)          # draw a line from 0,0 to 127,63
+    display.rect(10, 10, 107, 43, 1)        # draw a rectangle outline 10,10 to 107,43, colour=1
+    display.fill_rect(10, 10, 107, 43, 1)   # draw a solid rectangle 10,10 to 107,43, colour=1
+    display.text('Hello World', 0, 0, 1)    # draw some text at x=0, y=0, colour=1
+    display.scroll(20, 0)                   # scroll 20 pixels to the right
+
+    # draw another FrameBuffer on top of the current one at the given coordinates
+    import framebuf
+    fbuf = framebuf.FrameBuffer(bytearray(8 * 8 * 1), 8, 8, framebuf.MONO_VLSB)
+    fbuf.line(0, 0, 7, 7, 1)
+    display.blit(fbuf, 10, 10, 0)           # draw on top at x=10, y=10, key=0
+    display.show()
+
+Draw the MicroPython logo and print some text::
+
+    display.fill(0)
+    display.fill_rect(0, 0, 32, 32, 1)
+    display.fill_rect(2, 2, 28, 28, 0)
+    display.vline(9, 8, 22, 1)
+    display.vline(16, 2, 22, 1)
+    display.vline(23, 8, 22, 1)
+    display.fill_rect(26, 24, 2, 4, 1)
+    display.text('MicroPython', 40, 0, 1)
+    display.text('SSD1306', 40, 12, 1)
+    display.text('OLED 128x64', 40, 24, 1)
+    display.show()

From 538b9a9be5e914eae302d31d8ddedec0f049482a Mon Sep 17 00:00:00 2001
From: Mike Causer <mcauser@gmail.com>
Date: Fri, 14 May 2021 13:23:44 +1000
Subject: [PATCH 0862/3533] esp32/machine_i2c: Allow boards to configure I2C
 pins using new macros.

Following how SPI is configured (and how stm32 does it).
---
 ports/esp32/machine_i2c.c | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/ports/esp32/machine_i2c.c b/ports/esp32/machine_i2c.c
index fd5180b8d0709..d9003f45b5bed 100644
--- a/ports/esp32/machine_i2c.c
+++ b/ports/esp32/machine_i2c.c
@@ -32,14 +32,19 @@
 
 #include "driver/i2c.h"
 
-#define I2C_0_DEFAULT_SCL (GPIO_NUM_18)
-#define I2C_0_DEFAULT_SDA (GPIO_NUM_19)
+#ifndef MICROPY_HW_I2C0_SCL
+#define MICROPY_HW_I2C0_SCL (GPIO_NUM_18)
+#define MICROPY_HW_I2C0_SDA (GPIO_NUM_19)
+#endif
+
+#ifndef MICROPY_HW_I2C1_SCL
 #if CONFIG_IDF_TARGET_ESP32
-#define I2C_1_DEFAULT_SCL (GPIO_NUM_25)
-#define I2C_1_DEFAULT_SDA (GPIO_NUM_26)
+#define MICROPY_HW_I2C1_SCL (GPIO_NUM_25)
+#define MICROPY_HW_I2C1_SDA (GPIO_NUM_26)
 #else
-#define I2C_1_DEFAULT_SCL (GPIO_NUM_9)
-#define I2C_1_DEFAULT_SDA (GPIO_NUM_8)
+#define MICROPY_HW_I2C1_SCL (GPIO_NUM_9)
+#define MICROPY_HW_I2C1_SDA (GPIO_NUM_8)
+#endif
 #endif
 
 #define I2C_DEFAULT_TIMEOUT_US (10000) // 10ms
@@ -149,11 +154,11 @@ mp_obj_t machine_hw_i2c_make_new(const mp_obj_type_t *type, size_t n_args, size_
         self->base.type = &machine_hw_i2c_type;
         self->port = i2c_id;
         if (self->port == I2C_NUM_0) {
-            self->scl = I2C_0_DEFAULT_SCL;
-            self->sda = I2C_0_DEFAULT_SDA;
+            self->scl = MICROPY_HW_I2C0_SCL;
+            self->sda = MICROPY_HW_I2C0_SDA;
         } else {
-            self->scl = I2C_1_DEFAULT_SCL;
-            self->sda = I2C_1_DEFAULT_SDA;
+            self->scl = MICROPY_HW_I2C1_SCL;
+            self->sda = MICROPY_HW_I2C1_SDA;
         }
         first_init = true;
     }

From 9e65662a11c37599299ba4ab9c3ddf0510306498 Mon Sep 17 00:00:00 2001
From: Mike Causer <mcauser@gmail.com>
Date: Fri, 14 May 2021 14:00:01 +1000
Subject: [PATCH 0863/3533] esp32/boards: Set default I2C and SPI pins on
 UM_xxx boards.

And fix incorrect I2C and SPI pins in the feathers2 module.
---
 ports/esp32/boards/UM_FEATHERS2/modules/feathers2.py | 8 ++++----
 ports/esp32/boards/UM_FEATHERS2/mpconfigboard.h      | 9 ++++++++-
 ports/esp32/boards/UM_TINYPICO/mpconfigboard.h       | 3 +++
 ports/esp32/boards/UM_TINYS2/mpconfigboard.h         | 3 +++
 4 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/ports/esp32/boards/UM_FEATHERS2/modules/feathers2.py b/ports/esp32/boards/UM_FEATHERS2/modules/feathers2.py
index 32126fc9c9ae7..93c50a18102bb 100644
--- a/ports/esp32/boards/UM_FEATHERS2/modules/feathers2.py
+++ b/ports/esp32/boards/UM_FEATHERS2/modules/feathers2.py
@@ -22,12 +22,12 @@
 
 # SPI
 SPI_MOSI = const(35)
-SPI_MISO = const(36)
-SPI_CLK = const(37)
+SPI_MISO = const(37)
+SPI_CLK = const(36)
 
 # I2C
-I2C_SDA = const(38)
-I2C_SCL = const(33)
+I2C_SDA = const(8)
+I2C_SCL = const(9)
 
 # DAC
 DAC1 = const(17)
diff --git a/ports/esp32/boards/UM_FEATHERS2/mpconfigboard.h b/ports/esp32/boards/UM_FEATHERS2/mpconfigboard.h
index c045adccd9682..8d0c9f78c83ae 100644
--- a/ports/esp32/boards/UM_FEATHERS2/mpconfigboard.h
+++ b/ports/esp32/boards/UM_FEATHERS2/mpconfigboard.h
@@ -2,4 +2,11 @@
 #define MICROPY_HW_MCU_NAME "ESP32-S2"
 
 #define MICROPY_PY_BLUETOOTH                (0)
-#define MICROPY_HW_ENABLE_SDCARD            (0)
\ No newline at end of file
+#define MICROPY_HW_ENABLE_SDCARD            (0)
+
+#define MICROPY_HW_I2C0_SCL (9)
+#define MICROPY_HW_I2C0_SDA (8)
+
+#define MICROPY_HW_SPI1_MOSI (35)  // SDO
+#define MICROPY_HW_SPI1_MISO (37)  // SDI
+#define MICROPY_HW_SPI1_SCK (36)
diff --git a/ports/esp32/boards/UM_TINYPICO/mpconfigboard.h b/ports/esp32/boards/UM_TINYPICO/mpconfigboard.h
index 05ee5eaf72a5f..6bf70cc13b580 100644
--- a/ports/esp32/boards/UM_TINYPICO/mpconfigboard.h
+++ b/ports/esp32/boards/UM_TINYPICO/mpconfigboard.h
@@ -1,6 +1,9 @@
 #define MICROPY_HW_BOARD_NAME "TinyPICO"
 #define MICROPY_HW_MCU_NAME "ESP32-PICO-D4"
 
+#define MICROPY_HW_I2C0_SCL (22)
+#define MICROPY_HW_I2C0_SDA (21)
+
 #define MICROPY_HW_SPI1_SCK (18)
 #define MICROPY_HW_SPI1_MOSI (23)
 #define MICROPY_HW_SPI1_MISO (19)
diff --git a/ports/esp32/boards/UM_TINYS2/mpconfigboard.h b/ports/esp32/boards/UM_TINYS2/mpconfigboard.h
index 87d266e58c52a..1052f6d79ca2b 100644
--- a/ports/esp32/boards/UM_TINYS2/mpconfigboard.h
+++ b/ports/esp32/boards/UM_TINYS2/mpconfigboard.h
@@ -4,6 +4,9 @@
 #define MICROPY_PY_BLUETOOTH                (0)
 #define MICROPY_HW_ENABLE_SDCARD            (0)
 
+#define MICROPY_HW_I2C0_SCL (9)
+#define MICROPY_HW_I2C0_SDA (8)
+
 #define MICROPY_HW_SPI1_MOSI (35)
 #define MICROPY_HW_SPI1_MISO (36)
 #define MICROPY_HW_SPI1_SCK (37)

From 605b74f390e1ce9acdbca32d0b3215d37b96852e Mon Sep 17 00:00:00 2001
From: Mike Causer <mcauser@gmail.com>
Date: Fri, 14 May 2021 15:36:59 +1000
Subject: [PATCH 0864/3533] esp32/boards: Fix spelling mistakes in comments for
 UM_xxx boards.

---
 ports/esp32/boards/UM_FEATHERS2/modules/feathers2.py |  4 ++--
 ports/esp32/boards/UM_TINYPICO/modules/tinypico.py   |  2 +-
 ports/esp32/boards/UM_TINYS2/modules/tinys2.py       | 10 +++++-----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/ports/esp32/boards/UM_FEATHERS2/modules/feathers2.py b/ports/esp32/boards/UM_FEATHERS2/modules/feathers2.py
index 93c50a18102bb..95e1f52681606 100644
--- a/ports/esp32/boards/UM_FEATHERS2/modules/feathers2.py
+++ b/ports/esp32/boards/UM_FEATHERS2/modules/feathers2.py
@@ -50,7 +50,7 @@ def toggle_led(state):
     l.value(not l.value())
 
 
-# Create ADC and set attenuation and return teh ambient light value from the onboard sensor
+# Create ADC and set attenuation and return the ambient light value from the onboard sensor
 def get_amb_light():
     adc = ADC(Pin(AMB_LIGHT))
     adc.atten(ADC.ATTN_11DB)
@@ -62,7 +62,7 @@ def get_amb_light():
 # prevent parasitic power from lighting the LED even with the LDO off, causing current use.
 # The DotStar is a beautiful LED, but parasitic power makes it a terrible choice for battery use :(
 def set_ldo2_power(state):
-    """Set the power for the on-board Dostar to allow no current draw when not needed."""
+    """Set the power for the on-board Dotstar to allow no current draw when not needed."""
     # Set the power pin to the inverse of state
     ldo2 = Pin(LDO2, Pin.OUT)
     ldo2.value(state)
diff --git a/ports/esp32/boards/UM_TINYPICO/modules/tinypico.py b/ports/esp32/boards/UM_TINYPICO/modules/tinypico.py
index 846e07960a3f2..04b274bb53b15 100644
--- a/ports/esp32/boards/UM_TINYPICO/modules/tinypico.py
+++ b/ports/esp32/boards/UM_TINYPICO/modules/tinypico.py
@@ -80,7 +80,7 @@ def get_battery_charging():
 # need to be able to cut power to it to minimise power consumption during deep sleep or with general battery powered use
 # to minimise unneeded battery drain
 def set_dotstar_power(state):
-    """Set the power for the on-board Dostar to allow no current draw when not needed."""
+    """Set the power for the on-board Dotstar to allow no current draw when not needed."""
     # Set the power pin to the inverse of state
     if state:
         Pin(DOTSTAR_PWR, Pin.OUT, None)  # Break the PULL_HOLD on the pin
diff --git a/ports/esp32/boards/UM_TINYS2/modules/tinys2.py b/ports/esp32/boards/UM_TINYS2/modules/tinys2.py
index ca59cb123581d..0a3eaf14d4652 100644
--- a/ports/esp32/boards/UM_TINYS2/modules/tinys2.py
+++ b/ports/esp32/boards/UM_TINYS2/modules/tinys2.py
@@ -38,7 +38,7 @@
 
 # Helper functions
 def set_pixel_power(state):
-    """Enable or Disable power to the onboard NeoPixel to either show colour, or to reduce power fro deep sleep."""
+    """Enable or Disable power to the onboard NeoPixel to either show colour, or to reduce power for deep sleep."""
     Pin(RGB_PWR, Pin.OUT).value(state)
 
 
@@ -59,7 +59,7 @@ def get_vbus_present():
     return Pin(VBUS_SENSE, Pin.IN).value() == 1
 
 
-# Dotstar rainbow colour wheel
+# NeoPixel rainbow colour wheel
 def rgb_color_wheel(wheel_pos):
     """Color wheel to allow for cycling through the rainbow of RGB colors."""
     wheel_pos = wheel_pos % 255
@@ -74,9 +74,9 @@ def rgb_color_wheel(wheel_pos):
         return wheel_pos * 3, 255 - wheel_pos * 3, 0
 
 
-# Go into deep sleep but shut down the APA first to save power
-# Use this if you want lowest deep  sleep current
+# Go into deep sleep but shut down the RGB LED first to save power
+# Use this if you want lowest deep sleep current
 def go_deepsleep(t):
-    """Deep sleep helper that also powers down the on-board Dotstar."""
+    """Deep sleep helper that also powers down the on-board NeoPixel."""
     set_pixel_power(False)
     machine.deepsleep(t)

From 47e6c52f0c2bf058c5d099dd2993192e0978e172 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 14 May 2021 22:05:03 +1000
Subject: [PATCH 0865/3533] tests/cpydiff: Add test and workaround for
 function.__module__ attr.

MicroPython does not store any reference from a function object to the
module it was defined in, but there is a way to use function.__globals__ to
indirectly get the module.

See issue #7259.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/cpydiff/core_function_moduleattr.py | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 tests/cpydiff/core_function_moduleattr.py

diff --git a/tests/cpydiff/core_function_moduleattr.py b/tests/cpydiff/core_function_moduleattr.py
new file mode 100644
index 0000000000000..71747c1f409ee
--- /dev/null
+++ b/tests/cpydiff/core_function_moduleattr.py
@@ -0,0 +1,13 @@
+"""
+categories: Core,Functions
+description: Function objects do not have the ``__module__`` attribute
+cause: MicroPython is optimized for reduced code size and RAM usage.
+workaround: Use ``sys.modules[function.__globals__['__name__']]`` for non-builtin modules.
+"""
+
+
+def f():
+    pass
+
+
+print(f.__module__)

From 1446107b4d24915143f8212c2f649a0e628735cc Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 18 May 2021 00:22:53 +1000
Subject: [PATCH 0866/3533] py/objarray: Use mp_obj_memoryview_init helper in
 mp_obj_new_memoryview.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/objarray.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/py/objarray.c b/py/objarray.c
index 5bd9454716a4f..be85674f8712b 100644
--- a/py/objarray.c
+++ b/py/objarray.c
@@ -201,11 +201,7 @@ STATIC mp_obj_t bytearray_make_new(const mp_obj_type_t *type_in, size_t n_args,
 
 mp_obj_t mp_obj_new_memoryview(byte typecode, size_t nitems, void *items) {
     mp_obj_array_t *self = m_new_obj(mp_obj_array_t);
-    self->base.type = &mp_type_memoryview;
-    self->typecode = typecode;
-    self->memview_offset = 0;
-    self->len = nitems;
-    self->items = items;
+    mp_obj_memoryview_init(self, typecode, 0, nitems, items);
     return MP_OBJ_FROM_PTR(self);
 }
 

From 6d2680fa36696fd0b2fd7a595f4a26153cd84e07 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 18 May 2021 00:23:13 +1000
Subject: [PATCH 0867/3533] py/objarray: Fix constructing a memoryview from a
 memoryview.

Fixes issue #7261.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/objarray.c                 |  8 ++++++++
 tests/basics/memoryview_gc.py | 10 ++++++++++
 2 files changed, 18 insertions(+)

diff --git a/py/objarray.c b/py/objarray.c
index be85674f8712b..16a4d4aac7e25 100644
--- a/py/objarray.c
+++ b/py/objarray.c
@@ -220,6 +220,14 @@ STATIC mp_obj_t memoryview_make_new(const mp_obj_type_t *type_in, size_t n_args,
         bufinfo.len / mp_binary_get_size('@', bufinfo.typecode, NULL),
         bufinfo.buf));
 
+    // If the input object is a memoryview then need to point the items of the
+    // new memoryview to the start of the buffer so the GC can trace it.
+    if (mp_obj_get_type(args[0]) == &mp_type_memoryview) {
+        mp_obj_array_t *other = MP_OBJ_TO_PTR(args[0]);
+        self->memview_offset = other->memview_offset;
+        self->items = other->items;
+    }
+
     // test if the object can be written to
     if (mp_get_buffer(args[0], &bufinfo, MP_BUFFER_RW)) {
         self->typecode |= MP_OBJ_ARRAY_TYPECODE_FLAG_RW; // indicate writable buffer
diff --git a/tests/basics/memoryview_gc.py b/tests/basics/memoryview_gc.py
index d366cbbb15405..5cd6124ada612 100644
--- a/tests/basics/memoryview_gc.py
+++ b/tests/basics/memoryview_gc.py
@@ -21,3 +21,13 @@
 
 # check that the memoryview is still what we want
 print(list(m))
+
+# check that creating a memoryview of a memoryview retains the underlying data
+m = None
+gc.collect()  # cleanup from previous test
+m = memoryview(memoryview(bytearray(i for i in range(50)))[5:-5])
+print(sum(m), list(m[:10]))
+gc.collect()
+for i in range(10):
+    list(range(10))  # allocate memory to overwrite any reclaimed heap
+print(sum(m), list(m[:10]))

From 126b1c727118352923703719a2a3d45b9fad3c97 Mon Sep 17 00:00:00 2001
From: Bob Abeles <phil99boyd@gmail.com>
Date: Fri, 14 May 2021 07:57:19 -0700
Subject: [PATCH 0868/3533] py/nlraarch64: Add underscore prefix to function
 symbols for Darwin ABI.

The proper way to do this is to test for __APPLE__ and __MACH__, where
__APPLE__ tests for an Apple OS and __MACH__ tests that it is based on CMU
Mach.  Using both tests ensures that just Darwin (Apple's open source base
for MacOS, iOS, etc.) is recognized. __APPLE__ by itself will test for any
Apple OS, which can include older OS 7-9 and any future Apple OS. __MACH__
tests for any OS based on CMU Mach, including Darwin and GNU Hurd.

Fixes #7232.
---
 py/nlraarch64.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/py/nlraarch64.c b/py/nlraarch64.c
index 2df0dc9c85021..1295351cbe828 100644
--- a/py/nlraarch64.c
+++ b/py/nlraarch64.c
@@ -34,8 +34,13 @@
 // Implemented purely as inline assembly; inside a function, we have to deal with undoing the prologue, restoring
 // SP and LR. This way, we don't.
 __asm(
+    #if defined(__APPLE__) && defined(__MACH__)
+    "_nlr_push:              \n"
+    ".global _nlr_push       \n"
+    #else
     "nlr_push:               \n"
     ".global nlr_push        \n"
+    #endif
     "mov x9, sp              \n"
     "stp lr,  x9,  [x0,  #16]\n" // 16 == offsetof(nlr_buf_t, regs)
     "stp x19, x20, [x0,  #32]\n"
@@ -44,7 +49,11 @@ __asm(
     "stp x25, x26, [x0,  #80]\n"
     "stp x27, x28, [x0,  #96]\n"
     "str x29,      [x0, #112]\n"
+    #if defined(__APPLE__) && defined(__MACH__)
+    "b _nlr_push_tail        \n" // do the rest in C
+    #else
     "b nlr_push_tail         \n" // do the rest in C
+    #endif
     );
 
 NORETURN void nlr_jump(void *val) {

From 7ceccad4e2f1e9d073f5781c32e5b377e8391a25 Mon Sep 17 00:00:00 2001
From: Bob Abeles <phil99boyd@gmail.com>
Date: Fri, 14 May 2021 08:05:40 -0700
Subject: [PATCH 0869/3533] py/nlrx64: Correct the detection of Darwin ABI.

__APPLE__ tests for an Apple OS and __MACH__ tests that it is based on CMU
Mach.  Using both tests ensures that just Darwin is recognized.
---
 py/nlrx64.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/py/nlrx64.c b/py/nlrx64.c
index f5d02afbdb979..6f006e755ec7c 100644
--- a/py/nlrx64.c
+++ b/py/nlrx64.c
@@ -58,7 +58,7 @@ unsigned int nlr_push(nlr_buf_t *nlr) {
     #else
 
     __asm volatile (
-        #if defined(__APPLE__) || defined(__MACH__)
+        #if defined(__APPLE__) && defined(__MACH__)
         "pop    %rbp                \n" // undo function's prelude
         #endif
         "movq   (%rsp), %rax        \n" // load return %rip
@@ -70,7 +70,7 @@ unsigned int nlr_push(nlr_buf_t *nlr) {
         "movq   %r13, 56(%rdi)      \n" // store %r13 into nlr_buf
         "movq   %r14, 64(%rdi)      \n" // store %r14 into nlr_buf
         "movq   %r15, 72(%rdi)      \n" // store %r15 into nlr_buf
-        #if defined(__APPLE__) || defined(__MACH__)
+        #if defined(__APPLE__) && defined(__MACH__)
         "jmp    _nlr_push_tail      \n" // do the rest in C
         #else
         "jmp    nlr_push_tail       \n" // do the rest in C

From 94fb5e7f5a409e9596657508c6a9ed1c609de267 Mon Sep 17 00:00:00 2001
From: Bruno Martins <bruno963852@gmail.com>
Date: Fri, 14 May 2021 08:35:43 -0300
Subject: [PATCH 0870/3533] nrf: Add machine.memXX, and allow boards to
 customise some features.

---
 ports/nrf/modules/machine/modmachine.c | 4 ++++
 ports/nrf/mpconfigport.h               | 4 ----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ports/nrf/modules/machine/modmachine.c b/ports/nrf/modules/machine/modmachine.c
index 3330349cd5963..7e45b83df8173 100644
--- a/ports/nrf/modules/machine/modmachine.c
+++ b/ports/nrf/modules/machine/modmachine.c
@@ -201,6 +201,10 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_deepsleep),          MP_ROM_PTR(&machine_deepsleep_obj) },
     { MP_ROM_QSTR(MP_QSTR_reset_cause),        MP_ROM_PTR(&machine_reset_cause_obj) },
     { MP_ROM_QSTR(MP_QSTR_Pin),                MP_ROM_PTR(&pin_type) },
+    { MP_ROM_QSTR(MP_QSTR_mem8),               MP_ROM_PTR(&machine_mem8_obj) },
+    { MP_ROM_QSTR(MP_QSTR_mem16),              MP_ROM_PTR(&machine_mem16_obj) },
+    { MP_ROM_QSTR(MP_QSTR_mem32),              MP_ROM_PTR(&machine_mem32_obj) },
+    
 #if MICROPY_PY_MACHINE_UART
     { MP_ROM_QSTR(MP_QSTR_UART),               MP_ROM_PTR(&machine_hard_uart_type) },
 #endif
diff --git a/ports/nrf/mpconfigport.h b/ports/nrf/mpconfigport.h
index c246c53dd5aff..714b1cc24fce0 100644
--- a/ports/nrf/mpconfigport.h
+++ b/ports/nrf/mpconfigport.h
@@ -44,8 +44,6 @@
 #endif
 #define MICROPY_ALLOC_PATH_MAX      (512)
 #define MICROPY_PERSISTENT_CODE_LOAD (0)
-#define MICROPY_EMIT_THUMB          (0)
-#define MICROPY_EMIT_INLINE_THUMB   (0)
 #define MICROPY_COMP_MODULE_CONST   (0)
 #define MICROPY_COMP_TRIPLE_TUPLE_ASSIGN (0)
 #define MICROPY_READER_VFS          (MICROPY_VFS)
@@ -123,7 +121,6 @@
 #define MICROPY_PY_CMATH            (0)
 #define MICROPY_PY_IO               (0)
 #define MICROPY_PY_IO_FILEIO        (0)
-#define MICROPY_PY_UERRNO           (0)
 #define MICROPY_PY_URANDOM          (1)
 #define MICROPY_PY_URANDOM_EXTRA_FUNCS (1)
 #define MICROPY_PY_UCTYPES          (0)
@@ -131,7 +128,6 @@
 #define MICROPY_PY_UJSON            (0)
 #define MICROPY_PY_URE              (0)
 #define MICROPY_PY_UHEAPQ           (0)
-#define MICROPY_PY_UHASHLIB         (0)
 #define MICROPY_PY_UTIME_MP_HAL     (1)
 #define MICROPY_PY_MACHINE          (1)
 #define MICROPY_PY_MACHINE_PULSE    (0)

From ea2d83e96175ef1ed260cca917024502e01a5546 Mon Sep 17 00:00:00 2001
From: Bruno Martins <bruno963852@gmail.com>
Date: Thu, 13 May 2021 18:18:04 -0300
Subject: [PATCH 0871/3533] nrf/boards: Add support for evk_nina_b3 board.

---
 ports/nrf/boards/evk_nina_b3/mpconfigboard.h  | 85 +++++++++++++++++++
 ports/nrf/boards/evk_nina_b3/mpconfigboard.mk |  7 ++
 ports/nrf/boards/evk_nina_b3/pins.csv         | 48 +++++++++++
 3 files changed, 140 insertions(+)
 create mode 100644 ports/nrf/boards/evk_nina_b3/mpconfigboard.h
 create mode 100644 ports/nrf/boards/evk_nina_b3/mpconfigboard.mk
 create mode 100644 ports/nrf/boards/evk_nina_b3/pins.csv

diff --git a/ports/nrf/boards/evk_nina_b3/mpconfigboard.h b/ports/nrf/boards/evk_nina_b3/mpconfigboard.h
new file mode 100644
index 0000000000000..eaca796be4d67
--- /dev/null
+++ b/ports/nrf/boards/evk_nina_b3/mpconfigboard.h
@@ -0,0 +1,85 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2016 Glenn Ruben Bakke
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+// Pin numbering scheme for nrf52840-based boards
+//
+// Software Pins 0-31 correspond to physical pins
+// 0.x and software Pins 32-47 correspond to physical pins 1.x.
+//
+// Example: Pin(47) would be 1.15 on the PCA10059
+
+// Board data
+#define MICROPY_HW_BOARD_NAME       "EVK_NINA_B3"
+#define MICROPY_HW_MCU_NAME         "NRF52840"
+#define MICROPY_PY_SYS_PLATFORM     "nrf52"
+
+// Enable @viper and @native
+#define MICROPY_EMIT_THUMB          (1)
+#define MICROPY_EMIT_INLINE_THUMB   (1)
+
+// Enable optional modules
+#define MICROPY_PY_UERRNO           (1)
+#define MICROPY_PY_UHASHLIB         (1)
+
+// Peripherals Config
+#define MICROPY_PY_MACHINE_UART     (1)
+#define MICROPY_PY_MACHINE_HW_PWM   (1)
+#define MICROPY_PY_MACHINE_HW_SPI   (1)
+#define MICROPY_PY_MACHINE_TIMER    (1)
+#define MICROPY_PY_MACHINE_RTCOUNTER (1)
+#define MICROPY_PY_MACHINE_I2C      (1)
+#define MICROPY_PY_MACHINE_ADC      (1)
+#define MICROPY_PY_MACHINE_TEMP     (1)
+#define MICROPY_HW_ENABLE_RNG       (1)
+
+// Configure LEDS
+#define MICROPY_HW_HAS_LED          (1)
+#define MICROPY_HW_LED_COUNT        (3)
+#define MICROPY_HW_LED_PULLUP       (1)
+#define MICROPY_HW_LED1             (13) // LED1 RED
+#define MICROPY_HW_LED2             (25) // LED2 GREEN
+#define MICROPY_HW_LED3             (32) // LED3 BLUE
+
+// UART config
+#define MICROPY_HW_UART1_RX         (29)
+#define MICROPY_HW_UART1_TX         (45)
+#define MICROPY_HW_UART1_CTS        (44)
+#define MICROPY_HW_UART1_RTS        (31)
+#define MICROPY_HW_UART1_HWFC       (1)
+
+// SPI config
+#define MICROPY_HW_SPI0_NAME        "SPI0"
+#define MICROPY_HW_SPI0_SCK         (12)
+#define MICROPY_HW_SPI0_MOSI        (14)
+#define MICROPY_HW_SPI0_MISO        (15)
+
+// PWM Names
+#define MICROPY_HW_PWM0_NAME        "PWM0"
+#define MICROPY_HW_PWM1_NAME        "PWM1"
+#define MICROPY_HW_PWM2_NAME        "PWM2"
+
+// How Many LED indexes appear in the help() message
+#define HELP_TEXT_BOARD_LED         "1,2,3"
diff --git a/ports/nrf/boards/evk_nina_b3/mpconfigboard.mk b/ports/nrf/boards/evk_nina_b3/mpconfigboard.mk
new file mode 100644
index 0000000000000..ca555d3932aa4
--- /dev/null
+++ b/ports/nrf/boards/evk_nina_b3/mpconfigboard.mk
@@ -0,0 +1,7 @@
+MCU_SERIES = m4
+MCU_VARIANT = nrf52
+MCU_SUB_VARIANT = nrf52840
+SOFTDEV_VERSION = 6.1.1
+LD_FILES += boards/nrf52840_1M_256k.ld
+
+NRF_DEFINES += -DNRF52840_XXAA
diff --git a/ports/nrf/boards/evk_nina_b3/pins.csv b/ports/nrf/boards/evk_nina_b3/pins.csv
new file mode 100644
index 0000000000000..e6190bac0a3f7
--- /dev/null
+++ b/ports/nrf/boards/evk_nina_b3/pins.csv
@@ -0,0 +1,48 @@
+P0,P0
+P1,P1
+P2,P2,ADC0_IN0
+P3,P3,ADC0_IN1
+P4,P4,ADC0_IN2
+P5,P5,ADC0_IN3
+P6,P6
+P7,P7
+P8,P8
+P9,P9
+P10,P10
+P11,P11
+P12,P12
+P13,P13
+P14,P14
+P15,P15
+P16,P16
+P17,P17
+P18,P18
+P19,P19
+P20,P20
+P21,P21
+P22,P22
+P23,P23
+P24,P24
+P25,P25
+P26,P26
+P27,P27
+P28,P28,ADC0_IN4
+P29,P29,ADC0_IN5
+P30,P30,ADC0_IN6
+P31,P31,ADC0_IN7
+P32,P32
+P33,P33
+P34,P34
+P35,P35
+P36,P36
+P37,P37
+P38,P38
+P39,P39
+P40,P40
+P41,P41
+P42,P42
+P43,P43
+P44,P44
+P45,P45
+P46,P46
+P47,P47

From 07528d1f855cf7a970913477b40c664700a0aa4d Mon Sep 17 00:00:00 2001
From: Brett Cannon <brett@python.org>
Date: Sun, 16 May 2021 20:11:44 -0700
Subject: [PATCH 0872/3533] docs/library: Clarify what type of algorithm is
 implemented in heapq.

---
 docs/library/uheapq.rst | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/docs/library/uheapq.rst b/docs/library/uheapq.rst
index f822f1e7f32c4..9ae1f61a173dd 100644
--- a/docs/library/uheapq.rst
+++ b/docs/library/uheapq.rst
@@ -6,9 +6,11 @@
 
 |see_cpython_module| :mod:`python:heapq`.
 
-This module implements the heap queue algorithm.
+This module implements the
+`min heap queue algorithm <https://en.wikipedia.org/wiki/Heap_%28data_structure%29>`_.
 
-A heap queue is simply a list that has its elements stored in a certain way.
+A heap queue is essentially a list that has its elements stored in such a way
+that the first item of the list is always the smallest.
 
 Functions
 ---------
@@ -19,8 +21,10 @@ Functions
 
 .. function:: heappop(heap)
 
-   Pop the first item from the ``heap``, and return it.  Raises IndexError if
-   heap is empty.
+   Pop the first item from the ``heap``, and return it.  Raise ``IndexError`` if
+   ``heap`` is empty.
+   
+   The returned item will be the smallest item in the ``heap``.
 
 .. function:: heapify(x)
 

From 452fa3f8d4cd8880da06b8a41e191e2acac59c3f Mon Sep 17 00:00:00 2001
From: Brett Cannon <brett@python.org>
Date: Sun, 16 May 2021 20:21:26 -0700
Subject: [PATCH 0873/3533] docs/library: Add a blank line to fix formatting
 for ussl docs.

---
 docs/library/ussl.rst | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/library/ussl.rst b/docs/library/ussl.rst
index 14e3f3ad142ce..77d278d41df52 100644
--- a/docs/library/ussl.rst
+++ b/docs/library/ussl.rst
@@ -13,7 +13,8 @@ facilities for network sockets, both client-side and server-side.
 Functions
 ---------
 
-.. function:: ussl.wrap_socket(sock, server_side=False, keyfile=None, certfile=None, cert_reqs=CERT_NONE, ca_certs=None, do_handshake=True) 
+.. function:: ussl.wrap_socket(sock, server_side=False, keyfile=None, certfile=None, cert_reqs=CERT_NONE, ca_certs=None, do_handshake=True)
+
    Takes a `stream` *sock* (usually usocket.socket instance of ``SOCK_STREAM`` type),
    and returns an instance of ssl.SSLSocket, which wraps the underlying stream in
    an SSL context. Returned object has the usual `stream` interface methods like

From 7408ca1d7857df5ea348da35c9ee12f70a024478 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sun, 16 May 2021 13:27:54 +1000
Subject: [PATCH 0874/3533] mimxrt: Improve ticks and sleep functions using
 GPT.

SysTick cannot wake the CPU from WFI/WFE so a hardware timer is needed to
keep track of ticks/delay (similar to the nrf port).

Fixes issue #7234.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/mimxrt/Makefile     |   2 +
 ports/mimxrt/board_init.c |   7 --
 ports/mimxrt/main.c       |   2 +
 ports/mimxrt/mphalport.c  |  17 +----
 ports/mimxrt/mphalport.h  |  16 +++--
 ports/mimxrt/ticks.c      | 137 ++++++++++++++++++++++++++++++++++++++
 ports/mimxrt/ticks.h      |  35 ++++++++++
 7 files changed, 189 insertions(+), 27 deletions(-)
 create mode 100644 ports/mimxrt/ticks.c
 create mode 100644 ports/mimxrt/ticks.h

diff --git a/ports/mimxrt/Makefile b/ports/mimxrt/Makefile
index 85e77b978e9f0..3a001182a036a 100644
--- a/ports/mimxrt/Makefile
+++ b/ports/mimxrt/Makefile
@@ -82,6 +82,7 @@ SRC_TINYUSB_IMX_C += \
 	$(MCU_DIR)/project_template/clock_config.c \
 	$(MCU_DIR)/drivers/fsl_clock.c \
 	$(MCU_DIR)/drivers/fsl_gpio.c \
+	$(MCU_DIR)/drivers/fsl_gpt.c \
 	$(MCU_DIR)/drivers/fsl_common.c \
 	$(MCU_DIR)/drivers/fsl_lpuart.c \
 	$(MCU_DIR)/drivers/fsl_flexram.c \
@@ -90,6 +91,7 @@ SRC_C = \
 	main.c \
 	led.c \
 	pin.c \
+	ticks.c \
 	tusb_port.c \
 	board_init.c \
 	$(BOARD_DIR)/flash_config.c \
diff --git a/ports/mimxrt/board_init.c b/ports/mimxrt/board_init.c
index cd7dc9a7dd08e..9095c880482d3 100644
--- a/ports/mimxrt/board_init.c
+++ b/ports/mimxrt/board_init.c
@@ -53,9 +53,6 @@ void board_init(void) {
     // Enable IOCON clock
     CLOCK_EnableClock(kCLOCK_Iomuxc);
 
-    // 1ms tick timer
-    SysTick_Config(SystemCoreClock / 1000);
-
     // ------------- USB0 ------------- //
 
     // Clock
@@ -85,10 +82,6 @@ void board_init(void) {
     //  CLOCK_EnableUsbhs1Clock(kCLOCK_Usb480M, 480000000U);
 }
 
-void SysTick_Handler(void) {
-    systick_ms++;
-}
-
 void USB_OTG1_IRQHandler(void) {
     tud_int_handler(0);
     tud_task();
diff --git a/ports/mimxrt/main.c b/ports/mimxrt/main.c
index e06283a8ab37b..7832afffcb2b5 100644
--- a/ports/mimxrt/main.c
+++ b/ports/mimxrt/main.c
@@ -32,6 +32,7 @@
 #include "py/stackctrl.h"
 #include "lib/utils/gchelper.h"
 #include "lib/utils/pyexec.h"
+#include "ticks.h"
 #include "tusb.h"
 #include "led.h"
 
@@ -41,6 +42,7 @@ void board_init(void);
 
 int main(void) {
     board_init();
+    ticks_init();
     tusb_init();
     led_init();
 
diff --git a/ports/mimxrt/mphalport.c b/ports/mimxrt/mphalport.c
index 9fee3e85d0082..02a61a4f2a3bb 100644
--- a/ports/mimxrt/mphalport.c
+++ b/ports/mimxrt/mphalport.c
@@ -27,6 +27,7 @@
 
 #include "py/runtime.h"
 #include "py/mphal.h"
+#include "ticks.h"
 #include "tusb.h"
 
 #include CPU_HEADER_H
@@ -46,22 +47,6 @@ void mp_hal_set_interrupt_char(int c) {
 
 #endif
 
-void mp_hal_delay_ms(mp_uint_t ms) {
-    ms += 1;
-    uint32_t t0 = systick_ms;
-    while (systick_ms - t0 < ms) {
-        MICROPY_EVENT_POLL_HOOK
-    }
-}
-
-void mp_hal_delay_us(mp_uint_t us) {
-    uint32_t ms = us / 1000 + 1;
-    uint32_t t0 = systick_ms;
-    while (systick_ms - t0 < ms) {
-        __WFI();
-    }
-}
-
 int mp_hal_stdin_rx_chr(void) {
     for (;;) {
         // TODO
diff --git a/ports/mimxrt/mphalport.h b/ports/mimxrt/mphalport.h
index 2b9e49432cc0f..993e15156618a 100644
--- a/ports/mimxrt/mphalport.h
+++ b/ports/mimxrt/mphalport.h
@@ -28,21 +28,29 @@
 #define MICROPY_INCLUDED_MIMXRT_MPHALPORT_H
 
 #include <stdint.h>
+#include "ticks.h"
 
 #define mp_hal_pin_high(p) (GPIO_PinWrite(p->gpio, p->pin, 1U))
 #define mp_hal_pin_low(p) (GPIO_PinWrite(p->gpio, p->pin, 0U))
 #define mp_hal_pin_toggle(p) (GPIO_PortToggle(p->gpio, (1 << p->pin)))
 
-extern volatile uint32_t systick_ms;
-
 void mp_hal_set_interrupt_char(int c);
 
 static inline mp_uint_t mp_hal_ticks_ms(void) {
-    return systick_ms;
+    return ticks_ms32();
 }
 
 static inline mp_uint_t mp_hal_ticks_us(void) {
-    return systick_ms * 1000;
+    return ticks_us32();
+}
+
+static inline void mp_hal_delay_ms(mp_uint_t ms) {
+    uint64_t us = (uint64_t)ms * 1000;
+    ticks_delay_us64(us);
+}
+
+static inline void mp_hal_delay_us(mp_uint_t us) {
+    ticks_delay_us64(us);
 }
 
 static inline mp_uint_t mp_hal_ticks_cpu(void) {
diff --git a/ports/mimxrt/ticks.c b/ports/mimxrt/ticks.c
new file mode 100644
index 0000000000000..676f81b30eb26
--- /dev/null
+++ b/ports/mimxrt/ticks.c
@@ -0,0 +1,137 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "py/mphal.h"
+#include "ticks.h"
+#include "fsl_gpt.h"
+
+// General purpose timer for keeping microsecond and millisecond tick values.
+#define GPTx GPT2
+#define GPTx_IRQn GPT2_IRQn
+#define GPTx_IRQHandler GPT2_IRQHandler
+
+static uint32_t ticks_us64_upper;
+static uint32_t ticks_ms_upper;
+
+void ticks_init(void) {
+    ticks_us64_upper = 0;
+    ticks_ms_upper = 0;
+
+    gpt_config_t config;
+    config.clockSource = kGPT_ClockSource_Osc;
+    config.divider = 24; // XTAL is 24MHz
+    config.enableFreeRun = true;
+    config.enableRunInWait = true;
+    config.enableRunInStop = true;
+    config.enableRunInDoze = true;
+    config.enableRunInDbg = false;
+    config.enableMode = true;
+    GPT_Init(GPTx, &config);
+
+    GPT_EnableInterrupts(GPTx, kGPT_RollOverFlagInterruptEnable);
+    NVIC_SetPriority(GPTx_IRQn, 0); // highest priority
+    NVIC_EnableIRQ(GPTx_IRQn);
+
+    GPT_StartTimer(GPTx);
+}
+
+void GPTx_IRQHandler(void) {
+    if (GPT_GetStatusFlags(GPTx, kGPT_OutputCompare1Flag)) {
+        GPT_ClearStatusFlags(GPTx, kGPT_OutputCompare1Flag);
+        GPT_DisableInterrupts(GPTx, kGPT_OutputCompare1InterruptEnable);
+        __SEV();
+    }
+    if (GPT_GetStatusFlags(GPTx, kGPT_RollOverFlag)) {
+        GPT_ClearStatusFlags(GPTx, kGPT_RollOverFlag);
+        ++ticks_us64_upper;
+        if (++ticks_ms_upper >= 1000) {
+            // Wrap upper counter at a multiple of 1000 so that when mp_hal_ticks_ms()
+            // wraps due to overflow it wraps smoothly.
+            ticks_ms_upper = 0;
+        }
+    }
+}
+
+static void ticks_wake_after_us32(uint32_t us) {
+    if (us < 2) {
+        // Delay too short to guarantee that we won't miss it when setting the OCR below.
+        __SEV();
+    } else {
+        // Disable IRQs so setting the OCR is done without any interruption.
+        uint32_t irq_state = DisableGlobalIRQ();
+        GPT_EnableInterrupts(GPTx, kGPT_OutputCompare1InterruptEnable);
+        uint32_t oc = GPT_GetCurrentTimerCount(GPTx) + us;
+        GPT_SetOutputCompareValue(GPTx, kGPT_OutputCompare_Channel1, oc);
+        EnableGlobalIRQ(irq_state);
+    }
+}
+
+static uint64_t ticks_us64_with(uint32_t *upper_ptr) {
+    uint32_t irq_state = DisableGlobalIRQ();
+    uint32_t lower = GPT_GetCurrentTimerCount(GPTx);
+    uint32_t upper = *upper_ptr;
+    uint32_t overflow = GPT_GetStatusFlags(GPTx, kGPT_RollOverFlag);
+    EnableGlobalIRQ(irq_state);
+    if (overflow && lower < 0x80000000) {
+        // The timer counter overflowed before reading it but the IRQ handler
+        // has not yet been called, so perform the IRQ arithmetic now.
+        ++upper;
+    }
+    return (uint64_t)upper << 32 | (uint64_t)lower;
+}
+
+uint32_t ticks_us32(void) {
+    return GPT_GetCurrentTimerCount(GPTx);
+}
+
+uint64_t ticks_us64(void) {
+    return ticks_us64_with(&ticks_us64_upper);
+}
+
+uint32_t ticks_ms32(void) {
+    // This will return a value that only has the lower 32-bits valid.
+    return ticks_us64_with(&ticks_ms_upper) / 1000;
+}
+
+void ticks_delay_us64(uint64_t us) {
+    uint64_t t0 = ticks_us64();
+    for (;;) {
+        uint64_t dt = ticks_us64() - t0;
+        if (dt >= us) {
+            return;
+        }
+        dt = us - dt;
+        if (dt > 0xffffffff) {
+            dt = 0xffffffff;
+        }
+        ticks_wake_after_us32((uint32_t)dt);
+        if (dt < 50) {
+            __WFE();
+        } else {
+            MICROPY_EVENT_POLL_HOOK
+        }
+    }
+}
diff --git a/ports/mimxrt/ticks.h b/ports/mimxrt/ticks.h
new file mode 100644
index 0000000000000..11127c29cce8a
--- /dev/null
+++ b/ports/mimxrt/ticks.h
@@ -0,0 +1,35 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+#ifndef MICROPY_INCLUDED_MIMXRT_TICKS_H
+#define MICROPY_INCLUDED_MIMXRT_TICKS_H
+
+void ticks_init(void);
+uint32_t ticks_us32(void);
+uint64_t ticks_us64(void);
+uint32_t ticks_ms32(void);
+void ticks_delay_us64(uint64_t us);
+
+#endif // MICROPY_INCLUDED_MIMXRT_TICKS_H

From 9d58d46e0a28b7bd3344cae049e8085bcd75cb75 Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew@alelec.net>
Date: Tue, 28 Jul 2020 16:27:19 +1000
Subject: [PATCH 0875/3533] docs/library/pyb.Pin.rst: Update the arguments for
 Pin.init().

Add details for Pin.init() value and alt arguments.
---
 docs/library/pyb.Pin.rst | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/docs/library/pyb.Pin.rst b/docs/library/pyb.Pin.rst
index 3d019cd8e0671..6465653f74cba 100644
--- a/docs/library/pyb.Pin.rst
+++ b/docs/library/pyb.Pin.rst
@@ -98,11 +98,11 @@ Class methods
 Methods
 -------
 
-.. method:: Pin.init(mode, pull=Pin.PULL_NONE, af=-1)
+.. method:: Pin.init(mode, pull=Pin.PULL_NONE, \*, value=None, alt=-1)
 
    Initialise the pin:
 
-     - ``mode`` can be one of:
+     - *mode* can be one of:
 
         - ``Pin.IN`` - configure the pin for input;
         - ``Pin.OUT_PP`` - configure the pin for output, with push-pull control;
@@ -111,14 +111,17 @@ Methods
         - ``Pin.AF_OD`` - configure the pin for alternate function, open-drain;
         - ``Pin.ANALOG`` - configure the pin for analog.
 
-     - ``pull`` can be one of:
+     - *pull* can be one of:
 
         - ``Pin.PULL_NONE`` - no pull up or down resistors;
         - ``Pin.PULL_UP`` - enable the pull-up resistor;
         - ``Pin.PULL_DOWN`` - enable the pull-down resistor.
 
-     - when mode is ``Pin.AF_PP`` or ``Pin.AF_OD``, then af can be the index or name
-       of one of the alternate functions associated with a pin.
+     - *value* if not None will set the port output value before enabling the pin.
+
+     - *alt* can be used when mode is ``Pin.AF_PP`` or ``Pin.AF_OD`` to set the
+       index or name of one of the alternate functions associated with a pin. 
+       This arg was previously called *af* which can still be used if needed.
 
    Returns: ``None``.
 

From c24003abec78ee443ddc1bdc375c48513e45a54a Mon Sep 17 00:00:00 2001
From: Mike Causer <mcauser@gmail.com>
Date: Mon, 13 Jan 2020 17:25:01 +1100
Subject: [PATCH 0876/3533] stm32/boards: Add VCC_GND_F407VE board.

---
 ports/stm32/boards/VCC_GND_F407VE/bdev.c      |  28 +++
 .../stm32/boards/VCC_GND_F407VE/board_init.c  |   7 +
 .../boards/VCC_GND_F407VE/mpconfigboard.h     | 163 ++++++++++++++++++
 .../boards/VCC_GND_F407VE/mpconfigboard.mk    |   6 +
 ports/stm32/boards/VCC_GND_F407VE/pins.csv    | 112 ++++++++++++
 .../VCC_GND_F407VE/stm32f4xx_hal_conf.h       |  15 ++
 6 files changed, 331 insertions(+)
 create mode 100644 ports/stm32/boards/VCC_GND_F407VE/bdev.c
 create mode 100644 ports/stm32/boards/VCC_GND_F407VE/board_init.c
 create mode 100644 ports/stm32/boards/VCC_GND_F407VE/mpconfigboard.h
 create mode 100644 ports/stm32/boards/VCC_GND_F407VE/mpconfigboard.mk
 create mode 100644 ports/stm32/boards/VCC_GND_F407VE/pins.csv
 create mode 100644 ports/stm32/boards/VCC_GND_F407VE/stm32f4xx_hal_conf.h

diff --git a/ports/stm32/boards/VCC_GND_F407VE/bdev.c b/ports/stm32/boards/VCC_GND_F407VE/bdev.c
new file mode 100644
index 0000000000000..18b5b85b18f8c
--- /dev/null
+++ b/ports/stm32/boards/VCC_GND_F407VE/bdev.c
@@ -0,0 +1,28 @@
+#include "storage.h"
+
+#if !MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE
+
+// External SPI flash uses standard SPI interface
+
+STATIC const mp_soft_spi_obj_t soft_spi_bus = {
+    .delay_half = MICROPY_HW_SOFTSPI_MIN_DELAY,
+    .polarity = 0,
+    .phase = 0,
+    .sck = MICROPY_HW_SPIFLASH_SCK,
+    .mosi = MICROPY_HW_SPIFLASH_MOSI,
+    .miso = MICROPY_HW_SPIFLASH_MISO,
+};
+
+STATIC mp_spiflash_cache_t spi_bdev_cache;
+
+const mp_spiflash_config_t spiflash_config = {
+    .bus_kind = MP_SPIFLASH_BUS_SPI,
+    .bus.u_spi.cs = MICROPY_HW_SPIFLASH_CS,
+    .bus.u_spi.data = (void*)&soft_spi_bus,
+    .bus.u_spi.proto = &mp_soft_spi_proto,
+    .cache = &spi_bdev_cache,
+};
+
+spi_bdev_t spi_bdev;
+
+#endif
diff --git a/ports/stm32/boards/VCC_GND_F407VE/board_init.c b/ports/stm32/boards/VCC_GND_F407VE/board_init.c
new file mode 100644
index 0000000000000..1d5900de55858
--- /dev/null
+++ b/ports/stm32/boards/VCC_GND_F407VE/board_init.c
@@ -0,0 +1,7 @@
+#include "py/mphal.h"
+
+void VCC_GND_F407VE_board_early_init(void) {
+    // set SPI flash CS pin high
+    mp_hal_pin_output(pin_A4);
+    mp_hal_pin_write(pin_A4, 1);
+}
diff --git a/ports/stm32/boards/VCC_GND_F407VE/mpconfigboard.h b/ports/stm32/boards/VCC_GND_F407VE/mpconfigboard.h
new file mode 100644
index 0000000000000..fd896c6666884
--- /dev/null
+++ b/ports/stm32/boards/VCC_GND_F407VE/mpconfigboard.h
@@ -0,0 +1,163 @@
+/* This file is part of the MicroPython project, http://micropython.org/
+ * MIT License; Copyright (c) 2021 Damien P. George
+ */
+
+// STM32F407VET6 Mini by VCC-GND Studio
+// http://vcc-gnd.com/
+// https://item.taobao.com/item.htm?ft=t&id=523361737493
+// https://www.aliexpress.com/wholesale?SearchText=STM32F407VET6+Mini
+
+// DFU mode can be accessed by switching BOOT0 DIP ON (towards USB)
+
+#define MICROPY_HW_BOARD_NAME       "VCC-GND STM32F407VE"
+#define MICROPY_HW_MCU_NAME         "STM32F407VE"
+#define MICROPY_HW_FLASH_FS_LABEL   "VCCGNDF407VE"
+
+// 1 = use internal flash (512 KByte)
+// 0 = use external SPI flash
+#define MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE (1)
+
+#define MICROPY_HW_HAS_FLASH        (1)
+#define MICROPY_HW_ENABLE_RNG       (1)
+#define MICROPY_HW_ENABLE_RTC       (1)
+#define MICROPY_HW_ENABLE_DAC       (1)
+#define MICROPY_HW_ENABLE_USB       (1)
+#define MICROPY_HW_ENABLE_SDCARD    (1)
+
+// HSE is 25MHz
+#define MICROPY_HW_CLK_PLLM (25)            // divide external clock by this to get 1MHz
+#define MICROPY_HW_CLK_PLLN (336)           // PLL clock in MHz
+#define MICROPY_HW_CLK_PLLP (RCC_PLLP_DIV2) // divide PLL clock by this to get core clock
+#define MICROPY_HW_CLK_PLLQ (7)             // divide core clock by this to get 48MHz
+
+// The board has a 32kHz crystal for the RTC
+#define MICROPY_HW_RTC_USE_LSE      (1)
+#define MICROPY_HW_RTC_USE_US       (0)
+// #define MICROPY_HW_RTC_USE_CALOUT   (1)  // turn on/off PC13 512Hz output
+
+// USART1
+#define MICROPY_HW_UART1_TX     (pin_A9)   // PA9,PB6
+#define MICROPY_HW_UART1_RX     (pin_A10)  // PA10,PB7
+
+// USART2
+#define MICROPY_HW_UART2_TX     (pin_A2)  // PA2,PD5
+#define MICROPY_HW_UART2_RX     (pin_A3)  // PA3,PD6
+#define MICROPY_HW_UART2_RTS    (pin_A1)  // PA1,PD4
+#define MICROPY_HW_UART2_CTS    (pin_A0)  // PA0,PD3
+
+// USART3
+#define MICROPY_HW_UART3_TX     (pin_D8)  // PB10,PC10,PD8
+#define MICROPY_HW_UART3_RX     (pin_D9)  // PB11,PC11,PD9
+#define MICROPY_HW_UART3_RTS    (pin_D12) // PB14,PD12
+#define MICROPY_HW_UART3_CTS    (pin_D11) // PB13,PD11
+
+// UART4
+#define MICROPY_HW_UART4_TX     (pin_A0)  // PA0,PC10
+#define MICROPY_HW_UART4_RX     (pin_A1)  // PA1,PC11
+
+// UART5
+#define MICROPY_HW_UART5_TX     (pin_C12) // PC12
+#define MICROPY_HW_UART5_RX     (pin_D2)  // PD2
+
+// USART6
+#define MICROPY_HW_UART6_TX     (pin_C6) // PC6,PG14
+#define MICROPY_HW_UART6_RX     (pin_C7) // PC7,PG9
+
+// I2C buses
+#define MICROPY_HW_I2C1_SCL     (pin_B6)  // PB8,PB6
+#define MICROPY_HW_I2C1_SDA     (pin_B7)  // PB9,PB7
+#define MICROPY_HW_I2C2_SCL     (pin_B10) // PB10
+#define MICROPY_HW_I2C2_SDA     (pin_B11) // PB11
+#define MICROPY_HW_I2C3_SCL     (pin_A8)  // PA8
+#define MICROPY_HW_I2C3_SDA     (pin_C9)  // PC9
+// AT24C08 EEPROM on I2C1 0x50-0x53
+
+// I2S buses
+// I2S2_CK  PB13
+// I2S2_MCK PC6
+// I2S2_SD  PB15
+// I2S2_WS  PB12
+// I2S3_CK  PB3
+// I2S3_MCK PC7
+// I2S3_SD  PB5
+// I2S3_WS  PA15
+
+// SPI buses
+#define MICROPY_HW_SPI1_NSS     (pin_A4)  // PA4
+#define MICROPY_HW_SPI1_SCK     (pin_A5)  // PA5,PB3
+#define MICROPY_HW_SPI1_MISO    (pin_A6)  // PA6,PB4
+#define MICROPY_HW_SPI1_MOSI    (pin_A7)  // PA7,PB5
+
+#define MICROPY_HW_SPI2_NSS     (pin_B12) // PB12
+#define MICROPY_HW_SPI2_SCK     (pin_B13) // PB13
+#define MICROPY_HW_SPI2_MISO    (pin_B14) // PB14
+#define MICROPY_HW_SPI2_MOSI    (pin_B15) // PB15
+
+#define MICROPY_HW_SPI3_NSS     (pin_A15) // PA15
+#define MICROPY_HW_SPI3_SCK     (pin_B3)  // PB3
+#define MICROPY_HW_SPI3_MISO    (pin_B4)  // PB4
+#define MICROPY_HW_SPI3_MOSI    (pin_B5)  // PB5
+
+// CAN buses
+#define MICROPY_HW_CAN1_TX      (pin_B9)  // PB9,PD1,PA12
+#define MICROPY_HW_CAN1_RX      (pin_B8)  // PB8,PD0,PA11
+#define MICROPY_HW_CAN2_TX      (pin_B13) // PB13
+#define MICROPY_HW_CAN2_RX      (pin_B12) // PB12
+
+// DAC
+// DAC_OUT1 PA4
+// DAC_OUT2 PA5
+
+// LEDs
+#define MICROPY_HW_LED1         (pin_B9) // blue
+#define MICROPY_HW_LED_ON(pin)  (mp_hal_pin_low(pin))
+#define MICROPY_HW_LED_OFF(pin) (mp_hal_pin_high(pin))
+
+// If using external SPI flash
+#if !MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE
+
+// The board does not have onboard SPI flash. You need to add an external one.
+#define MICROPY_HW_SPIFLASH_SIZE_BITS (4 * 1024 * 1024) // W25X40 - 4 Mbit (512 KByte)
+// #define MICROPY_HW_SPIFLASH_SIZE_BITS (32 * 1024 * 1024) // W25Q32 - 32 Mbit (4 MByte)
+// #define MICROPY_HW_SPIFLASH_SIZE_BITS (64 * 1024 * 1024) // W25Q64 - 64 Mbit (8 MByte)
+// #define MICROPY_HW_SPIFLASH_SIZE_BITS (128 * 1024 * 1024) // W25Q128 - 128 Mbit (16 MByte)
+
+#define MICROPY_HW_SPIFLASH_CS      (pin_A4) // also in board_init.c
+#define MICROPY_HW_SPIFLASH_SCK     (pin_A5)
+#define MICROPY_HW_SPIFLASH_MISO    (pin_A6)
+#define MICROPY_HW_SPIFLASH_MOSI    (pin_A7)
+
+#define MICROPY_BOARD_EARLY_INIT    VCC_GND_F407VE_board_early_init
+void VCC_GND_F407VE_board_early_init(void);
+
+extern const struct _mp_spiflash_config_t spiflash_config;
+extern struct _spi_bdev_t spi_bdev;
+#define MICROPY_HW_BDEV_IOCTL(op, arg) ( \
+    (op) == BDEV_IOCTL_NUM_BLOCKS ? (MICROPY_HW_SPIFLASH_SIZE_BITS / 8 / FLASH_BLOCK_SIZE) : \
+    (op) == BDEV_IOCTL_INIT ? spi_bdev_ioctl(&spi_bdev, (op), (uint32_t)&spiflash_config) : \
+    spi_bdev_ioctl(&spi_bdev, (op), (arg)) \
+)
+#define MICROPY_HW_BDEV_READBLOCKS(dest, bl, n) spi_bdev_readblocks(&spi_bdev, (dest), (bl), (n))
+#define MICROPY_HW_BDEV_WRITEBLOCKS(src, bl, n) spi_bdev_writeblocks(&spi_bdev, (src), (bl), (n))
+
+#endif
+
+// SD card detect switch
+#define MICROPY_HW_SDCARD_DETECT_PIN        (pin_A8)
+#define MICROPY_HW_SDCARD_DETECT_PULL       (GPIO_PULLUP)
+#define MICROPY_HW_SDCARD_DETECT_PRESENT    (GPIO_PIN_RESET)
+// 1      - PC10 - DAT2/RES
+// 2      - PC11 - CD/DAT3/CS
+// 3      - PD2  - CMD/DI
+// 4      - VCC  - VDD
+// 5      - PC12 - CLK/SCLK
+// 6      - GND  - VSS
+// 7      - PC8  - DAT0/D0
+// 8      - PC9  - DAT1/RES
+// 9  SW2 - GND
+// 10 SW1 - PA8
+
+// USB config
+#define MICROPY_HW_USB_FS (1)
+// #define MICROPY_HW_USB_VBUS_DETECT_PIN (pin_A9)
+// #define MICROPY_HW_USB_OTG_ID_PIN      (pin_A10)
diff --git a/ports/stm32/boards/VCC_GND_F407VE/mpconfigboard.mk b/ports/stm32/boards/VCC_GND_F407VE/mpconfigboard.mk
new file mode 100644
index 0000000000000..b154dcfbacdc4
--- /dev/null
+++ b/ports/stm32/boards/VCC_GND_F407VE/mpconfigboard.mk
@@ -0,0 +1,6 @@
+MCU_SERIES = f4
+CMSIS_MCU = STM32F407xx
+AF_FILE = boards/stm32f405_af.csv
+LD_FILES = boards/stm32f405.ld boards/common_ifs.ld
+TEXT0_ADDR = 0x08000000
+TEXT1_ADDR = 0x08020000
diff --git a/ports/stm32/boards/VCC_GND_F407VE/pins.csv b/ports/stm32/boards/VCC_GND_F407VE/pins.csv
new file mode 100644
index 0000000000000..f04d96771b05d
--- /dev/null
+++ b/ports/stm32/boards/VCC_GND_F407VE/pins.csv
@@ -0,0 +1,112 @@
+P1_1,GND
+P1_2,GND
+P1_3,VBAT
+P1_4,VCC_3V3
+P1_5,VIN_5V
+P1_6,VIN_5V
+P1_7,PE0
+P1_8,PE1
+P1_9,PE2
+P1_10,PE3
+P1_11,PE4
+P1_12,PE5
+P1_13,PE6
+P1_14,PC13
+P1_15,PC14
+P1_16,PC15
+P1_17,PC0
+P1_18,PC1
+P1_19,PC2
+P1_20,PC3
+P1_21,PA0
+P1_22,PA2
+P1_23,PA1
+P1_24,PA3
+P1_25,PA4
+P1_26,PA5
+P1_27,PA6
+P1_28,PA7
+P1_29,PC4
+P1_30,PC5
+P1_31,PB0
+P1_32,PB1
+P1_33,PB2
+P1_34,PE7
+P1_35,PE8
+P1_36,PE9
+P2_1,PE11
+P2_2,PE10
+P2_3,PE13
+P2_4,PE12
+P2_5,PE15
+P2_6,PE14
+P2_7,PB11
+P2_8,PB10
+P2_9,PB13
+P2_10,PB12
+P2_11,PB15
+P2_12,PB14
+P2_13,PD9
+P2_14,PD8
+P2_15,PD11
+P2_16,PD10
+P2_17,PD13
+P2_18,PD12
+P2_19,PD15
+P2_20,PD14
+P3_1,PC8
+P3_2,PC6
+P3_3,PC9
+P3_4,PC7
+P3_5,PA9
+P3_6,PA8
+P3_7,PA11
+P3_8,PA10
+P3_9,PA13
+P3_10,PA12
+P3_11,PA15
+P3_12,PA14
+P3_13,PC11
+P3_14,PC10
+P3_15,PC12
+P3_16,PD0
+P3_17,PD1
+P3_18,PD2
+P3_19,PD3
+P3_20,PD4
+P3_21,PD5
+P3_22,PD6
+P3_23,PD7
+P3_24,PB3
+P3_25,PB4
+P3_26,PB5
+P3_27,PB6
+P3_28,PB7
+P3_29,PB8
+P3_30,PB9
+P3_31,GND
+P3_32,GND
+P3_33,VCC_3V3
+P3_34,VCC_3V3
+P3_35,GND
+P3_36,GND
+DAC1,PA4
+DAC2,PA5
+BLUE_LED,PB9
+BOOT1,PB2
+USB_VBUS,PA9
+USB_ID,PA10
+USB_DM,PA11
+USB_DP,PA12
+SWCLK,PA14
+SWDIO,PA13
+OSC32_IN,PC14
+OSC32_OUT,PC15
+SD_D0,PC8
+SD_D1,PC9
+SD_D2,PC10
+SD_D3,PC11
+SD_CK,PC12
+SD_CMD,PD2
+SD,PA8
+SD_SW,PA8
diff --git a/ports/stm32/boards/VCC_GND_F407VE/stm32f4xx_hal_conf.h b/ports/stm32/boards/VCC_GND_F407VE/stm32f4xx_hal_conf.h
new file mode 100644
index 0000000000000..fe2069fe1418a
--- /dev/null
+++ b/ports/stm32/boards/VCC_GND_F407VE/stm32f4xx_hal_conf.h
@@ -0,0 +1,15 @@
+#ifndef MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H
+#define MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H
+
+#include "boards/stm32f4xx_hal_conf_base.h"
+
+// Oscillator values in Hz
+#define HSE_VALUE (25000000)
+#define LSE_VALUE (32768)
+#define EXTERNAL_CLOCK_VALUE (12288000)
+
+// Oscillator timeouts in ms
+#define HSE_STARTUP_TIMEOUT (100)
+#define LSE_STARTUP_TIMEOUT (5000)
+
+#endif // MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H

From 1ca66efbf7be4f57ab31df5ecb81d27da4aefd0d Mon Sep 17 00:00:00 2001
From: Mike Causer <mcauser@gmail.com>
Date: Mon, 13 Jan 2020 17:26:01 +1100
Subject: [PATCH 0877/3533] stm32/boards: Add VCC_GND_F407ZG board.

---
 ports/stm32/boards/VCC_GND_F407ZG/bdev.c      |  28 +++
 .../stm32/boards/VCC_GND_F407ZG/board_init.c  |   7 +
 .../boards/VCC_GND_F407ZG/mpconfigboard.h     | 182 ++++++++++++++++++
 .../boards/VCC_GND_F407ZG/mpconfigboard.mk    |  10 +
 ports/stm32/boards/VCC_GND_F407ZG/pins.csv    | 157 +++++++++++++++
 .../VCC_GND_F407ZG/stm32f4xx_hal_conf.h       |  15 ++
 6 files changed, 399 insertions(+)
 create mode 100644 ports/stm32/boards/VCC_GND_F407ZG/bdev.c
 create mode 100644 ports/stm32/boards/VCC_GND_F407ZG/board_init.c
 create mode 100644 ports/stm32/boards/VCC_GND_F407ZG/mpconfigboard.h
 create mode 100644 ports/stm32/boards/VCC_GND_F407ZG/mpconfigboard.mk
 create mode 100644 ports/stm32/boards/VCC_GND_F407ZG/pins.csv
 create mode 100644 ports/stm32/boards/VCC_GND_F407ZG/stm32f4xx_hal_conf.h

diff --git a/ports/stm32/boards/VCC_GND_F407ZG/bdev.c b/ports/stm32/boards/VCC_GND_F407ZG/bdev.c
new file mode 100644
index 0000000000000..18b5b85b18f8c
--- /dev/null
+++ b/ports/stm32/boards/VCC_GND_F407ZG/bdev.c
@@ -0,0 +1,28 @@
+#include "storage.h"
+
+#if !MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE
+
+// External SPI flash uses standard SPI interface
+
+STATIC const mp_soft_spi_obj_t soft_spi_bus = {
+    .delay_half = MICROPY_HW_SOFTSPI_MIN_DELAY,
+    .polarity = 0,
+    .phase = 0,
+    .sck = MICROPY_HW_SPIFLASH_SCK,
+    .mosi = MICROPY_HW_SPIFLASH_MOSI,
+    .miso = MICROPY_HW_SPIFLASH_MISO,
+};
+
+STATIC mp_spiflash_cache_t spi_bdev_cache;
+
+const mp_spiflash_config_t spiflash_config = {
+    .bus_kind = MP_SPIFLASH_BUS_SPI,
+    .bus.u_spi.cs = MICROPY_HW_SPIFLASH_CS,
+    .bus.u_spi.data = (void*)&soft_spi_bus,
+    .bus.u_spi.proto = &mp_soft_spi_proto,
+    .cache = &spi_bdev_cache,
+};
+
+spi_bdev_t spi_bdev;
+
+#endif
diff --git a/ports/stm32/boards/VCC_GND_F407ZG/board_init.c b/ports/stm32/boards/VCC_GND_F407ZG/board_init.c
new file mode 100644
index 0000000000000..1f4663fdf9bac
--- /dev/null
+++ b/ports/stm32/boards/VCC_GND_F407ZG/board_init.c
@@ -0,0 +1,7 @@
+#include "py/mphal.h"
+
+void VCC_GND_F407ZG_board_early_init(void) {
+    // set SPI flash CS pin high
+    mp_hal_pin_output(pin_C4);
+    mp_hal_pin_write(pin_C4, 1);
+}
diff --git a/ports/stm32/boards/VCC_GND_F407ZG/mpconfigboard.h b/ports/stm32/boards/VCC_GND_F407ZG/mpconfigboard.h
new file mode 100644
index 0000000000000..bd17ab410f7c1
--- /dev/null
+++ b/ports/stm32/boards/VCC_GND_F407ZG/mpconfigboard.h
@@ -0,0 +1,182 @@
+/* This file is part of the MicroPython project, http://micropython.org/
+ * MIT License; Copyright (c) 2021 Damien P. George
+ */
+
+// STM32F407ZGT6 Mini by VCC-GND Studio
+// http://vcc-gnd.com/
+// https://item.taobao.com/item.htm?ft=t&id=523383164199
+// https://www.aliexpress.com/wholesale?SearchText=STM32F407ZGT6+Mini
+
+// DFU mode can be accessed by switching BOOT0 DIP ON (towards USB)
+
+#define MICROPY_HW_BOARD_NAME       "VCC-GND STM32F407ZG"
+#define MICROPY_HW_MCU_NAME         "STM32F407ZG"
+#define MICROPY_HW_FLASH_FS_LABEL   "VCCGNDF407ZG"
+
+// 1 = use internal flash (1 MByte)
+// 0 = use onboard SPI flash (512 KByte) Winbond W25X40
+#define MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE (0)
+
+#define MICROPY_HW_HAS_FLASH        (1)
+#define MICROPY_HW_ENABLE_RNG       (1)
+#define MICROPY_HW_ENABLE_RTC       (1)
+#define MICROPY_HW_ENABLE_DAC       (1)
+#define MICROPY_HW_ENABLE_USB       (1)
+#define MICROPY_HW_ENABLE_SDCARD    (1)
+
+// HSE is 25MHz
+#define MICROPY_HW_CLK_PLLM (25)            // divide external clock by this to get 1MHz
+#define MICROPY_HW_CLK_PLLN (336)           // PLL clock in MHz
+#define MICROPY_HW_CLK_PLLP (RCC_PLLP_DIV2) // divide PLL clock by this to get core clock
+#define MICROPY_HW_CLK_PLLQ (7)             // divide core clock by this to get 48MHz
+
+// The board has a 32kHz crystal for the RTC
+#define MICROPY_HW_RTC_USE_LSE      (1)
+#define MICROPY_HW_RTC_USE_US       (0)
+// #define MICROPY_HW_RTC_USE_CALOUT   (1)  // turn on/off PC13 512Hz output
+
+// USART1
+#define MICROPY_HW_UART1_TX     (pin_A9)   // PA9,PB6
+#define MICROPY_HW_UART1_RX     (pin_A10)  // PA10,PB7
+#define MICROPY_HW_UART1_RTS    (pin_A12)
+#define MICROPY_HW_UART1_CTS    (pin_A11)
+// USART1_CK  PA8
+
+// USART2
+#define MICROPY_HW_UART2_TX     (pin_A2)  // PA2,PD5
+#define MICROPY_HW_UART2_RX     (pin_A3)  // PA3,PD6
+#define MICROPY_HW_UART2_RTS    (pin_A1)  // PA1,PD4
+#define MICROPY_HW_UART2_CTS    (pin_A0)  // PA0,PD3
+// USART2_CK  PA4,PD7
+
+// USART3
+#define MICROPY_HW_UART3_TX     (pin_D8)  // PB10,PC10,PD8
+#define MICROPY_HW_UART3_RX     (pin_D9)  // PB11,PC11,PD9
+#define MICROPY_HW_UART3_RTS    (pin_D12) // PB14,PD12
+#define MICROPY_HW_UART3_CTS    (pin_D11) // PB13,PD11
+// USART3_CK  PB12,PC12,PD10
+
+// UART4
+#define MICROPY_HW_UART4_TX     (pin_A0)  // PA0,PC10
+#define MICROPY_HW_UART4_RX     (pin_A1)  // PA1,PC11
+
+// UART5
+#define MICROPY_HW_UART5_TX     (pin_C12) // PC12
+#define MICROPY_HW_UART5_RX     (pin_D2)  // PD2
+
+// USART6
+#define MICROPY_HW_UART6_TX     (pin_C6)  // PC6,PG14
+#define MICROPY_HW_UART6_RX     (pin_C7)  // PC7,PG9
+#define MICROPY_HW_UART6_RTS    (pin_G8)  // PG8,PG12
+#define MICROPY_HW_UART6_CTS    (pin_G13) // PG13,PG15
+// USART6_CK  PC8,PG7
+
+// I2C buses
+#define MICROPY_HW_I2C1_SCL     (pin_B6)  // PB8,PB6
+#define MICROPY_HW_I2C1_SDA     (pin_B7)  // PB9,PB7
+// I2C1_SMBA  PB5
+#define MICROPY_HW_I2C2_SCL     (pin_B10) // PB10,PF1
+#define MICROPY_HW_I2C2_SDA     (pin_B11) // PB11,PF0
+// I2C2_SMBA  PB12,PF2
+#define MICROPY_HW_I2C3_SCL     (pin_A8)  // PA8
+#define MICROPY_HW_I2C3_SDA     (pin_C9)  // PC9
+// I2C3_SMBA  PA9
+
+// AT24C08 EEPROM on I2C1 0x50-0x53
+
+// I2S buses - multiplexed with SPI2 and SPI3
+// I2S2_CK  PB10,PB13
+// I2S2_MCK PC6
+// I2S2_SD  PB15,PC3
+// I2S2_WS  PB9,PB12
+// I2S3_CK  PB3,PC10
+// I2S3_MCK PC7
+// I2S3_SD  PB5,PC12
+// I2S3_WS  PA4,PA15
+
+// SPI buses
+#define MICROPY_HW_SPI1_NSS     (pin_A4)  // PA4,PA15
+#define MICROPY_HW_SPI1_SCK     (pin_A5)  // PA5,PB3
+#define MICROPY_HW_SPI1_MISO    (pin_A6)  // PA6,PB4
+#define MICROPY_HW_SPI1_MOSI    (pin_A7)  // PA7,PB5
+
+#define MICROPY_HW_SPI2_NSS     (pin_B12) // PB12,PB9
+#define MICROPY_HW_SPI2_SCK     (pin_B13) // PB13,PB10
+#define MICROPY_HW_SPI2_MISO    (pin_B14) // PB14,PC2
+#define MICROPY_HW_SPI2_MOSI    (pin_B15) // PB15,PC3
+
+#define MICROPY_HW_SPI3_NSS     (pin_A15) // PA15,PA4
+#define MICROPY_HW_SPI3_SCK     (pin_B3)  // PB3,PC10
+#define MICROPY_HW_SPI3_MISO    (pin_B4)  // PB4,PC11
+#define MICROPY_HW_SPI3_MOSI    (pin_B5)  // PB5,PC12
+
+// CAN buses
+#define MICROPY_HW_CAN1_TX      (pin_B9)  // PB9,PD1,PA12
+#define MICROPY_HW_CAN1_RX      (pin_B8)  // PB8,PD0,PA11
+#define MICROPY_HW_CAN2_TX      (pin_B13) // PB13,PB6
+#define MICROPY_HW_CAN2_RX      (pin_B12) // PB12,PB5
+
+// DAC
+// DAC_OUT1 PA4
+// DAC_OUT2 PA5
+
+// LEDs
+#define MICROPY_HW_LED1         (pin_G15) // blue
+#define MICROPY_HW_LED_ON(pin)  (mp_hal_pin_low(pin))
+#define MICROPY_HW_LED_OFF(pin) (mp_hal_pin_high(pin))
+
+// If using onboard SPI flash
+#if !MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE
+
+// W25X40 SPI Flash = 4 Mbit (512 KByte)
+#define MICROPY_HW_SPIFLASH_SIZE_BITS (4 * 1024 * 1024)
+#define MICROPY_HW_SPIFLASH_CS      (pin_C4)
+#define MICROPY_HW_SPIFLASH_SCK     (pin_A5)
+#define MICROPY_HW_SPIFLASH_MISO    (pin_A6)
+#define MICROPY_HW_SPIFLASH_MOSI    (pin_A7)
+
+#define MICROPY_BOARD_EARLY_INIT    VCC_GND_F407ZG_board_early_init
+void VCC_GND_F407ZG_board_early_init(void);
+
+extern const struct _mp_spiflash_config_t spiflash_config;
+extern struct _spi_bdev_t spi_bdev;
+#define MICROPY_HW_BDEV_IOCTL(op, arg) ( \
+    (op) == BDEV_IOCTL_NUM_BLOCKS ? (MICROPY_HW_SPIFLASH_SIZE_BITS / 8 / FLASH_BLOCK_SIZE) : \
+    (op) == BDEV_IOCTL_INIT ? spi_bdev_ioctl(&spi_bdev, (op), (uint32_t)&spiflash_config) : \
+    spi_bdev_ioctl(&spi_bdev, (op), (arg)) \
+)
+#define MICROPY_HW_BDEV_READBLOCKS(dest, bl, n) spi_bdev_readblocks(&spi_bdev, (dest), (bl), (n))
+#define MICROPY_HW_BDEV_WRITEBLOCKS(src, bl, n) spi_bdev_writeblocks(&spi_bdev, (src), (bl), (n))
+
+#endif
+
+// SD card detect switch
+#define MICROPY_HW_SDCARD_DETECT_PIN        (pin_F10)
+#define MICROPY_HW_SDCARD_DETECT_PULL       (GPIO_PULLUP)
+#define MICROPY_HW_SDCARD_DETECT_PRESENT    (GPIO_PIN_RESET)
+// 1      - PC10 - DAT2/RES
+// 2      - PC11 - CD/DAT3/CS
+// 3      - PD2  - CMD/DI
+// 4      - VCC  - VDD
+// 5      - PC12 - CLK/SCLK
+// 6      - GND  - VSS
+// 7      - PC8  - DAT0/D0
+// 8      - PC9  - DAT1/RES
+// 9  SW2 - GND
+// 10 SW1 - PF10
+
+// USB config
+#define MICROPY_HW_USB_FS (1)
+// #define MICROPY_HW_USB_VBUS_DETECT_PIN (pin_A9)
+// #define MICROPY_HW_USB_OTG_ID_PIN      (pin_A10)
+
+// Ethernet via RMII
+#define MICROPY_HW_ETH_MDC          (pin_C1)
+#define MICROPY_HW_ETH_MDIO         (pin_A2)
+#define MICROPY_HW_ETH_RMII_REF_CLK (pin_A1)
+#define MICROPY_HW_ETH_RMII_CRS_DV  (pin_A7)
+#define MICROPY_HW_ETH_RMII_RXD0    (pin_C4)
+#define MICROPY_HW_ETH_RMII_RXD1    (pin_C5)
+#define MICROPY_HW_ETH_RMII_TX_EN   (pin_B11)
+#define MICROPY_HW_ETH_RMII_TXD0    (pin_B12)
+#define MICROPY_HW_ETH_RMII_TXD1    (pin_B13)
diff --git a/ports/stm32/boards/VCC_GND_F407ZG/mpconfigboard.mk b/ports/stm32/boards/VCC_GND_F407ZG/mpconfigboard.mk
new file mode 100644
index 0000000000000..c67807867ef17
--- /dev/null
+++ b/ports/stm32/boards/VCC_GND_F407ZG/mpconfigboard.mk
@@ -0,0 +1,10 @@
+MCU_SERIES = f4
+CMSIS_MCU = STM32F407xx
+AF_FILE = boards/stm32f405_af.csv
+LD_FILES = boards/stm32f405.ld boards/common_ifs.ld
+TEXT0_ADDR = 0x08000000
+TEXT1_ADDR = 0x08020000
+
+MICROPY_PY_LWIP = 1
+MICROPY_PY_USSL = 1
+MICROPY_SSL_MBEDTLS = 1
diff --git a/ports/stm32/boards/VCC_GND_F407ZG/pins.csv b/ports/stm32/boards/VCC_GND_F407ZG/pins.csv
new file mode 100644
index 0000000000000..780523a075f41
--- /dev/null
+++ b/ports/stm32/boards/VCC_GND_F407ZG/pins.csv
@@ -0,0 +1,157 @@
+P1_1,GND
+P1_2,GND
+P1_3,VBAT
+P1_4,VCC_3V3
+P1_5,VIN_5V
+P1_6,VIN_5V
+P1_7,PF2
+P1_8,PF3
+P1_9,PF4
+P1_10,PF5
+P1_11,PF6
+P1_12,PF7
+P1_13,PF8
+P1_14,PF9
+P1_15,PF10
+P1_16,PC0
+P1_17,PC1
+P1_18,PC2
+P1_19,PC3
+P1_20,PA0
+P1_21,PA1
+P1_22,PA2
+P1_23,PA3
+P1_24,PA4
+P1_25,PA5
+P1_26,PA6
+P1_27,PA7
+P1_28,PC4
+P1_29,PC5
+P1_30,PB0
+P1_31,PB1
+P1_32,PB2
+P1_33,PF11
+P1_34,PF12
+P1_35,PF13
+P1_36,PF14
+P1_37,PF15
+P1_38,PG0
+P1_39,PG1
+P1_40,PE7
+P1_41,PE8
+P1_42,PE9
+P1_43,GND
+P1_44,GND
+P2_1,PG7
+P2_2,PG6
+P2_3,PG5
+P2_4,PG4
+P2_5,PG3
+P2_6,PG2
+P2_7,PD15
+P2_8,PD14
+P2_9,PD13
+P2_10,PD12
+P2_11,PD11
+P2_12,PD10
+P2_13,PD9
+P2_14,PD8
+P2_15,PB15
+P2_16,PB14
+P2_17,PB13
+P2_18,PB12
+P2_19,PB11
+P2_20,PB10
+P2_21,PE15
+P2_22,PE14
+P2_23,PE13
+P2_24,PE12
+P2_25,PE11
+P2_26,PE10
+P3_1,PF1
+P3_2,PF0
+P3_3,PC15
+P3_4,PC14
+P3_5,PC13
+P3_6,PE6
+P3_7,PE5
+P3_8,PE4
+P3_9,PE3
+P3_10,PE2
+P3_11,PE1
+P3_12,PE0
+P4_1,GND
+P4_2,GND
+P4_3,VCC_3V3
+P4_4,VCC_3V3
+P4_5,PB9
+P4_6,PB8
+P4_7,PB7
+P4_8,PB6
+P4_9,PB5
+P4_10,PB4
+P4_11,PB3
+P4_12,PG15
+P4_13,PG14
+P4_14,PG13
+P4_15,PG12
+P4_16,PG11
+P4_17,PG10
+P4_18,PG9
+P4_19,PD7
+P4_20,PD6
+P4_21,PD5
+P4_22,PD4
+P4_23,PD3
+P4_24,PD2
+P4_25,PD1
+P4_26,PD0
+P4_27,PC12
+P4_28,PC11
+P4_29,PC10
+P4_30,PA15
+P4_31,PA14
+P4_32,PA13
+P4_33,PA12
+P4_34,PA11
+P4_35,PA10
+P4_36,PA9
+P4_37,PA8
+P4_38,PC9
+P4_39,PC8
+P4_40,PC7
+P4_41,PC6
+P4_42,PG8
+P4_43,GND
+P4_44,GND
+DAC1,PA4
+DAC2,PA5
+SRAM_CS,PG10
+SF_CS,PB12
+BLUE_LED,PG15
+BOOT1,PB2
+USB_VBUS,PA9
+USB_ID,PA10
+USB_DM,PA11
+USB_DP,PA12
+SWCLK,PA14
+SWDIO,PA13
+OSC32_IN,PC14
+OSC32_OUT,PC15
+SD_D0,PC8
+SD_D1,PC9
+SD_D2,PC10
+SD_D3,PC11
+SD_CK,PC12
+SD_CMD,PD2
+SD,PF10
+SD_SW,PF10
+ETH_MDC,PC1
+ETH_MDIO,PA2
+ETH_RMII_REF_CLK,PA1
+ETH_RMII_CRS_DV,PA7
+ETH_RMII_RXD0,PC4
+ETH_RMII_RXD1,PC5
+ETH_RMII_TX_EN,PB11
+ETH_RMII_TXD0,PB12
+ETH_RMII_TXD1,PB13
diff --git a/ports/stm32/boards/VCC_GND_F407ZG/stm32f4xx_hal_conf.h b/ports/stm32/boards/VCC_GND_F407ZG/stm32f4xx_hal_conf.h
new file mode 100644
index 0000000000000..fe2069fe1418a
--- /dev/null
+++ b/ports/stm32/boards/VCC_GND_F407ZG/stm32f4xx_hal_conf.h
@@ -0,0 +1,15 @@
+#ifndef MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H
+#define MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H
+
+#include "boards/stm32f4xx_hal_conf_base.h"
+
+// Oscillator values in Hz
+#define HSE_VALUE (25000000)
+#define LSE_VALUE (32768)
+#define EXTERNAL_CLOCK_VALUE (12288000)
+
+// Oscillator timeouts in ms
+#define HSE_STARTUP_TIMEOUT (100)
+#define LSE_STARTUP_TIMEOUT (5000)
+
+#endif // MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H

From 47b778332a0e89740775db544e7c22065df528c2 Mon Sep 17 00:00:00 2001
From: Mike Causer <mcauser@gmail.com>
Date: Thu, 20 May 2021 16:21:47 +1000
Subject: [PATCH 0878/3533] all: Replace busses with buses.

"buses" is the widely accepted plural form of "bus".
---
 docs/library/network.CC3K.rst                            | 2 +-
 docs/library/network.WIZNET5K.rst                        | 2 +-
 docs/library/pyb.CAN.rst                                 | 2 +-
 docs/library/pyb.I2C.rst                                 | 2 +-
 docs/library/pyb.SPI.rst                                 | 2 +-
 docs/library/pyb.UART.rst                                | 2 +-
 docs/library/pyb.rst                                     | 2 +-
 ports/stm32/boards/ADAFRUIT_F405_EXPRESS/mpconfigboard.h | 6 +++---
 ports/stm32/boards/B_L072Z_LRWAN1/mpconfigboard.h        | 4 ++--
 ports/stm32/boards/B_L475E_IOT01A/mpconfigboard.h        | 6 +++---
 ports/stm32/boards/CERB40/mpconfigboard.h                | 6 +++---
 ports/stm32/boards/ESPRUINO_PICO/mpconfigboard.h         | 4 ++--
 ports/stm32/boards/HYDRABUS/mpconfigboard.h              | 4 ++--
 ports/stm32/boards/LIMIFROG/mpconfigboard.h              | 4 ++--
 ports/stm32/boards/NETDUINO_PLUS_2/mpconfigboard.h       | 4 ++--
 ports/stm32/boards/NUCLEO_F091RC/mpconfigboard.h         | 4 ++--
 ports/stm32/boards/NUCLEO_F401RE/mpconfigboard.h         | 4 ++--
 ports/stm32/boards/NUCLEO_F411RE/mpconfigboard.h         | 4 ++--
 ports/stm32/boards/NUCLEO_F413ZH/mpconfigboard.h         | 6 +++---
 ports/stm32/boards/NUCLEO_F429ZI/mpconfigboard.h         | 6 +++---
 ports/stm32/boards/NUCLEO_F446RE/mpconfigboard.h         | 4 ++--
 ports/stm32/boards/NUCLEO_F746ZG/mpconfigboard.h         | 6 +++---
 ports/stm32/boards/NUCLEO_F767ZI/mpconfigboard.h         | 6 +++---
 ports/stm32/boards/NUCLEO_H743ZI/mpconfigboard.h         | 4 ++--
 ports/stm32/boards/NUCLEO_L073RZ/mpconfigboard.h         | 4 ++--
 ports/stm32/boards/NUCLEO_L432KC/mpconfigboard.h         | 4 ++--
 ports/stm32/boards/NUCLEO_L452RE/mpconfigboard.h         | 6 +++---
 ports/stm32/boards/NUCLEO_L476RG/mpconfigboard.h         | 6 +++---
 ports/stm32/boards/OLIMEX_E407/mpconfigboard.h           | 6 +++---
 ports/stm32/boards/PYBD_SF2/mpconfigboard.h              | 6 +++---
 ports/stm32/boards/PYBD_SF6/mpconfigboard.h              | 2 +-
 ports/stm32/boards/PYBLITEV10/mpconfigboard.h            | 4 ++--
 ports/stm32/boards/PYBV10/mpconfigboard.h                | 6 +++---
 ports/stm32/boards/PYBV11/mpconfigboard.h                | 6 +++---
 ports/stm32/boards/PYBV3/mpconfigboard.h                 | 4 ++--
 ports/stm32/boards/PYBV4/mpconfigboard.h                 | 6 +++---
 ports/stm32/boards/STM32F411DISC/mpconfigboard.h         | 4 ++--
 ports/stm32/boards/STM32F429DISC/mpconfigboard.h         | 6 +++---
 ports/stm32/boards/STM32F439/mpconfigboard.h             | 6 +++---
 ports/stm32/boards/STM32F4DISC/mpconfigboard.h           | 6 +++---
 ports/stm32/boards/STM32F769DISC/mpconfigboard.h         | 6 +++---
 ports/stm32/boards/STM32F7DISC/mpconfigboard.h           | 6 +++---
 ports/stm32/boards/STM32L476DISC/mpconfigboard.h         | 6 +++---
 ports/stm32/boards/STM32L496GDISC/mpconfigboard.h        | 4 ++--
 ports/stm32/machine_uart.c                               | 2 +-
 ports/stm32/pyb_i2c.c                                    | 2 +-
 ports/stm32/pyb_spi.c                                    | 2 +-
 ports/stm32/spi.c                                        | 2 +-
 ports/teensy/uart.c                                      | 2 +-
 49 files changed, 105 insertions(+), 105 deletions(-)

diff --git a/docs/library/network.CC3K.rst b/docs/library/network.CC3K.rst
index 18210e2d26d59..41d3fb437e992 100644
--- a/docs/library/network.CC3K.rst
+++ b/docs/library/network.CC3K.rst
@@ -25,7 +25,7 @@ For this example to work the CC3000 module must have the following connections:
     - VBEN connected to Y4
     - IRQ connected to Y3
 
-It is possible to use other SPI busses and other pins for CS, VBEN and IRQ.
+It is possible to use other SPI buses and other pins for CS, VBEN and IRQ.
 
 Constructors
 ------------
diff --git a/docs/library/network.WIZNET5K.rst b/docs/library/network.WIZNET5K.rst
index e21e3a4978f5f..9e2c40f7f3932 100644
--- a/docs/library/network.WIZNET5K.rst
+++ b/docs/library/network.WIZNET5K.rst
@@ -26,7 +26,7 @@ For this example to work the WIZnet5x00 module must have the following connectio
     - nSS connected to X5
     - nRESET connected to X4
 
-It is possible to use other SPI busses and other pins for nSS and nRESET.
+It is possible to use other SPI buses and other pins for nSS and nRESET.
 
 Constructors
 ------------
diff --git a/docs/library/pyb.CAN.rst b/docs/library/pyb.CAN.rst
index 649bcda108fcc..bcaeeba9df955 100644
--- a/docs/library/pyb.CAN.rst
+++ b/docs/library/pyb.CAN.rst
@@ -30,7 +30,7 @@ Constructors
    the bus, if any).  If extra arguments are given, the bus is initialised.
    See :meth:`CAN.init` for parameters of initialisation.
 
-   The physical pins of the CAN busses are:
+   The physical pins of the CAN buses are:
 
      - ``CAN(1)`` is on ``YA``: ``(RX, TX) = (Y3, Y4) = (PB8, PB9)``
      - ``CAN(2)`` is on ``YB``: ``(RX, TX) = (Y5, Y6) = (PB12, PB13)``
diff --git a/docs/library/pyb.I2C.rst b/docs/library/pyb.I2C.rst
index 641dcb8815873..56b036e07447b 100644
--- a/docs/library/pyb.I2C.rst
+++ b/docs/library/pyb.I2C.rst
@@ -64,7 +64,7 @@ Constructors
    the bus, if any).  If extra arguments are given, the bus is initialised.
    See ``init`` for parameters of initialisation.
 
-   The physical pins of the I2C busses on Pyboards V1.0 and V1.1 are:
+   The physical pins of the I2C buses on Pyboards V1.0 and V1.1 are:
 
      - ``I2C(1)`` is on the X position: ``(SCL, SDA) = (X9, X10) = (PB6, PB7)``
      - ``I2C(2)`` is on the Y position: ``(SCL, SDA) = (Y9, Y10) = (PB10, PB11)``
diff --git a/docs/library/pyb.SPI.rst b/docs/library/pyb.SPI.rst
index 24e2ec5a73d2c..c76b16789ad47 100644
--- a/docs/library/pyb.SPI.rst
+++ b/docs/library/pyb.SPI.rst
@@ -36,7 +36,7 @@ Constructors
    the bus, if any).  If extra arguments are given, the bus is initialised.
    See ``init`` for parameters of initialisation.
 
-   The physical pins of the SPI busses are:
+   The physical pins of the SPI buses are:
 
      - ``SPI(1)`` is on the X position: ``(NSS, SCK, MISO, MOSI) = (X5, X6, X7, X8) = (PA4, PA5, PA6, PA7)``
      - ``SPI(2)`` is on the Y position: ``(NSS, SCK, MISO, MOSI) = (Y5, Y6, Y7, Y8) = (PB12, PB13, PB14, PB15)``
diff --git a/docs/library/pyb.UART.rst b/docs/library/pyb.UART.rst
index a1d6e59002551..e1735403c44a8 100644
--- a/docs/library/pyb.UART.rst
+++ b/docs/library/pyb.UART.rst
@@ -57,7 +57,7 @@ Constructors
    the bus, if any).  If extra arguments are given, the bus is initialised.
    See ``init`` for parameters of initialisation.
 
-   The physical pins of the UART busses on Pyboard are:
+   The physical pins of the UART buses on Pyboard are:
 
      - ``UART(4)`` is on ``XA``: ``(TX, RX) = (X1, X2) = (PA0, PA1)``
      - ``UART(1)`` is on ``XB``: ``(TX, RX) = (X9, X10) = (PB6, PB7)``
diff --git a/docs/library/pyb.rst b/docs/library/pyb.rst
index addcd20a91aeb..321be3c52f2fe 100644
--- a/docs/library/pyb.rst
+++ b/docs/library/pyb.rst
@@ -126,7 +126,7 @@ Power related functions
     - pclk2: frequency of the APB2 bus
 
    If given any arguments then the function sets the frequency of the CPU,
-   and the busses if additional arguments are given.  Frequencies are given in
+   and the buses if additional arguments are given.  Frequencies are given in
    Hz.  Eg freq(120000000) sets sysclk (the CPU frequency) to 120MHz.  Note that
    not all values are supported and the largest supported frequency not greater
    than the given value will be selected.
diff --git a/ports/stm32/boards/ADAFRUIT_F405_EXPRESS/mpconfigboard.h b/ports/stm32/boards/ADAFRUIT_F405_EXPRESS/mpconfigboard.h
index 36d1d31315e38..afa81a5ba0938 100644
--- a/ports/stm32/boards/ADAFRUIT_F405_EXPRESS/mpconfigboard.h
+++ b/ports/stm32/boards/ADAFRUIT_F405_EXPRESS/mpconfigboard.h
@@ -39,7 +39,7 @@
 #define MICROPY_HW_UART6_TX     (pin_C6)  // D6
 #define MICROPY_HW_UART6_RX     (pin_C7)  // D5
 
-// I2C busses
+// I2C buses
 #define MICROPY_HW_I2C1_NAME "I2C1"
 #define MICROPY_HW_I2C1_SCL (pin_B6)  // SCL
 #define MICROPY_HW_I2C1_SDA (pin_B7)  // SDA
@@ -47,7 +47,7 @@
 #define MICROPY_HW_I2C2_SCL (pin_B10)  // TX
 #define MICROPY_HW_I2C2_SDA (pin_B11)  // RX
 
-// SPI busses
+// SPI buses
 #define MICROPY_HW_SPI1_NAME "SPIFLASH"
 #define MICROPY_HW_SPI1_NSS  (pin_A15) // FLASH CS
 #define MICROPY_HW_SPI1_SCK  (pin_B3) // FLASH CLK
@@ -59,7 +59,7 @@
 #define MICROPY_HW_SPI2_MISO (pin_B14) // MISO
 #define MICROPY_HW_SPI2_MOSI (pin_B15) // MOSI
 
-// CAN busses
+// CAN buses
 #define MICROPY_HW_CAN1_NAME "CAN1"
 #define MICROPY_HW_CAN1_TX   (pin_B9) // D10
 #define MICROPY_HW_CAN1_RX   (pin_B8) // D9
diff --git a/ports/stm32/boards/B_L072Z_LRWAN1/mpconfigboard.h b/ports/stm32/boards/B_L072Z_LRWAN1/mpconfigboard.h
index b330e8fdc1f27..0cded1bc866ac 100644
--- a/ports/stm32/boards/B_L072Z_LRWAN1/mpconfigboard.h
+++ b/ports/stm32/boards/B_L072Z_LRWAN1/mpconfigboard.h
@@ -35,11 +35,11 @@
 #define MICROPY_HW_UART_REPL        PYB_UART_2
 #define MICROPY_HW_UART_REPL_BAUD   115200
 
-// I2C busses
+// I2C buses
 #define MICROPY_HW_I2C1_SCL         (pin_B8)
 #define MICROPY_HW_I2C1_SDA         (pin_B9)
 
-// SPI busses
+// SPI buses
 #define MICROPY_HW_SPI1_NSS         (pin_A15)
 #define MICROPY_HW_SPI1_SCK         (pin_A5)
 #define MICROPY_HW_SPI1_MISO        (pin_A6)
diff --git a/ports/stm32/boards/B_L475E_IOT01A/mpconfigboard.h b/ports/stm32/boards/B_L475E_IOT01A/mpconfigboard.h
index a88bcf675685e..b017edab99313 100644
--- a/ports/stm32/boards/B_L475E_IOT01A/mpconfigboard.h
+++ b/ports/stm32/boards/B_L475E_IOT01A/mpconfigboard.h
@@ -28,20 +28,20 @@
 // USART3 config for internal use
 #define MICROPY_HW_UART3_TX     (pin_D8)
 #define MICROPY_HW_UART3_RX     (pin_D9)
-// USART4 config 
+// USART4 config
 #define MICROPY_HW_UART4_TX     (pin_A0)
 #define MICROPY_HW_UART4_RX     (pin_A1)
 // USART 1 is connected to the virtual com port on the ST-LINK
 #define MICROPY_HW_UART_REPL        PYB_UART_1
 #define MICROPY_HW_UART_REPL_BAUD   115200
 
-// I2C busses
+// I2C buses
 #define MICROPY_HW_I2C1_SCL (pin_B8)
 #define MICROPY_HW_I2C1_SDA (pin_B9)
 #define MICROPY_HW_I2C2_SCL (pin_B10)
 #define MICROPY_HW_I2C2_SDA (pin_B11)
 
-// SPI busses
+// SPI buses
 #define MICROPY_HW_SPI1_NSS     (pin_A4)
 #define MICROPY_HW_SPI1_SCK     (pin_A5)
 #define MICROPY_HW_SPI1_MISO    (pin_A6)
diff --git a/ports/stm32/boards/CERB40/mpconfigboard.h b/ports/stm32/boards/CERB40/mpconfigboard.h
index 7c166922be674..2f9199d4e02be 100644
--- a/ports/stm32/boards/CERB40/mpconfigboard.h
+++ b/ports/stm32/boards/CERB40/mpconfigboard.h
@@ -31,7 +31,7 @@
 #define MICROPY_HW_UART6_TX     (pin_C6)
 #define MICROPY_HW_UART6_RX     (pin_C7)
 
-// I2C busses
+// I2C buses
 #define MICROPY_HW_I2C1_SCL (pin_B6)
 #define MICROPY_HW_I2C1_SDA (pin_B7)
 #define MICROPY_HW_I2C2_SCL (pin_B10)
@@ -39,7 +39,7 @@
 #define MICROPY_HW_I2C3_SCL (pin_A8)
 #define MICROPY_HW_I2C3_SDA (pin_C9)
 
-// SPI busses
+// SPI buses
 #define MICROPY_HW_SPI1_NSS  (pin_A4)
 #define MICROPY_HW_SPI1_SCK  (pin_A5)
 #define MICROPY_HW_SPI1_MISO (pin_A6)
@@ -49,7 +49,7 @@
 #define MICROPY_HW_SPI3_MISO (pin_B4)
 #define MICROPY_HW_SPI3_MOSI (pin_B5)
 
-// CAN busses
+// CAN buses
 #define MICROPY_HW_CAN1_TX (pin_B9)
 #define MICROPY_HW_CAN1_RX (pin_B8)
 #define MICROPY_HW_CAN2_TX (pin_B13)
diff --git a/ports/stm32/boards/ESPRUINO_PICO/mpconfigboard.h b/ports/stm32/boards/ESPRUINO_PICO/mpconfigboard.h
index 53c7f3cd50934..ed8178d7d4d6e 100644
--- a/ports/stm32/boards/ESPRUINO_PICO/mpconfigboard.h
+++ b/ports/stm32/boards/ESPRUINO_PICO/mpconfigboard.h
@@ -32,7 +32,7 @@
 #define MICROPY_HW_UART6_TX     (pin_A11)
 #define MICROPY_HW_UART6_RX     (pin_A12)
 
-// I2C busses
+// I2C buses
 #define MICROPY_HW_I2C1_SCL (pin_B6)
 #define MICROPY_HW_I2C1_SDA (pin_B7)
 #define MICROPY_HW_I2C2_SCL (pin_B10)
@@ -40,7 +40,7 @@
 #define MICROPY_HW_I2C3_SCL (pin_A8)
 #define MICROPY_HW_I2C3_SDA (pin_B4)
 
-// SPI busses
+// SPI buses
 #define MICROPY_HW_SPI1_NSS  (pin_A4)
 #define MICROPY_HW_SPI1_SCK  (pin_A5)
 #define MICROPY_HW_SPI1_MISO (pin_A6)
diff --git a/ports/stm32/boards/HYDRABUS/mpconfigboard.h b/ports/stm32/boards/HYDRABUS/mpconfigboard.h
index d8f1a864b29a7..d894f1606cea6 100644
--- a/ports/stm32/boards/HYDRABUS/mpconfigboard.h
+++ b/ports/stm32/boards/HYDRABUS/mpconfigboard.h
@@ -30,13 +30,13 @@
 #define MICROPY_HW_UART6_TX     (pin_C6)
 #define MICROPY_HW_UART6_RX     (pin_C7)
 
-// I2C busses
+// I2C buses
 #define MICROPY_HW_I2C1_SCL (pin_B6)
 #define MICROPY_HW_I2C1_SDA (pin_B7)
 #define MICROPY_HW_I2C2_SCL (pin_B10)
 #define MICROPY_HW_I2C2_SDA (pin_B11)
 
-// SPI busses
+// SPI buses
 #define MICROPY_HW_SPI1_NSS  (pin_A4)
 #define MICROPY_HW_SPI1_SCK  (pin_A5)
 #define MICROPY_HW_SPI1_MISO (pin_A6)
diff --git a/ports/stm32/boards/LIMIFROG/mpconfigboard.h b/ports/stm32/boards/LIMIFROG/mpconfigboard.h
index 4b750c17ff4f6..be9b5a8bb878f 100644
--- a/ports/stm32/boards/LIMIFROG/mpconfigboard.h
+++ b/ports/stm32/boards/LIMIFROG/mpconfigboard.h
@@ -25,13 +25,13 @@ void LIMIFROG_board_early_init(void);
 #define MICROPY_HW_UART3_TX (pin_C10)
 #define MICROPY_HW_UART3_RX (pin_C11)
 
-// I2C busses
+// I2C buses
 #define MICROPY_HW_I2C1_SCL (pin_B8)
 #define MICROPY_HW_I2C1_SDA (pin_B9)
 #define MICROPY_HW_I2C2_SCL (pin_B10)
 #define MICROPY_HW_I2C2_SDA (pin_B11)
 
-// SPI busses
+// SPI buses
 #define MICROPY_HW_SPI1_NSS     (pin_A4)
 #define MICROPY_HW_SPI1_SCK     (pin_A5)
 #define MICROPY_HW_SPI1_MISO    (pin_A6)
diff --git a/ports/stm32/boards/NETDUINO_PLUS_2/mpconfigboard.h b/ports/stm32/boards/NETDUINO_PLUS_2/mpconfigboard.h
index d2075b52bf5f9..38bf8b41e910d 100644
--- a/ports/stm32/boards/NETDUINO_PLUS_2/mpconfigboard.h
+++ b/ports/stm32/boards/NETDUINO_PLUS_2/mpconfigboard.h
@@ -39,11 +39,11 @@ void NETDUINO_PLUS_2_board_early_init(void);
 #define MICROPY_HW_UART6_TX     (pin_C6)
 #define MICROPY_HW_UART6_RX     (pin_C7)
 
-// I2C busses
+// I2C buses
 #define MICROPY_HW_I2C1_SCL (pin_B6)
 #define MICROPY_HW_I2C1_SDA (pin_B7)
 
-// SPI busses
+// SPI buses
 #define MICROPY_HW_SPI2_NSS  (pin_B12)
 #define MICROPY_HW_SPI2_SCK  (pin_B13)
 #define MICROPY_HW_SPI2_MISO (pin_B14)
diff --git a/ports/stm32/boards/NUCLEO_F091RC/mpconfigboard.h b/ports/stm32/boards/NUCLEO_F091RC/mpconfigboard.h
index fb8de60221e99..7333dcd0c1dca 100644
--- a/ports/stm32/boards/NUCLEO_F091RC/mpconfigboard.h
+++ b/ports/stm32/boards/NUCLEO_F091RC/mpconfigboard.h
@@ -49,13 +49,13 @@
 #define MICROPY_HW_UART_REPL PYB_UART_2
 #define MICROPY_HW_UART_REPL_BAUD 115200
 
-// I2C busses
+// I2C buses
 #define MICROPY_HW_I2C1_SCL (pin_B8)        // Arduino D15, pin 3 on CN10
 #define MICROPY_HW_I2C1_SDA (pin_B9)        // Arduino D14, pin 5 on CN10
 #define MICROPY_HW_I2C2_SCL (pin_B10)       // Arduino D6,  pin 25 on CN10
 #define MICROPY_HW_I2C2_SDA (pin_B11)       //              pin 18 on CN10
 
-// SPI busses
+// SPI buses
 #define MICROPY_HW_SPI1_NSS     (pin_A15)   //              pin 17 on CN7
 #define MICROPY_HW_SPI1_SCK     (pin_A5)    // Arduino D13, pin 11 on CN10
 #define MICROPY_HW_SPI1_MISO    (pin_A6)    // Arduino D12, pin 13 on CN10
diff --git a/ports/stm32/boards/NUCLEO_F401RE/mpconfigboard.h b/ports/stm32/boards/NUCLEO_F401RE/mpconfigboard.h
index babf63c7a1c91..6b874e298c1bb 100644
--- a/ports/stm32/boards/NUCLEO_F401RE/mpconfigboard.h
+++ b/ports/stm32/boards/NUCLEO_F401RE/mpconfigboard.h
@@ -30,7 +30,7 @@
 #define MICROPY_HW_UART_REPL        PYB_UART_2
 #define MICROPY_HW_UART_REPL_BAUD   115200
 
-// I2C busses
+// I2C buses
 #define MICROPY_HW_I2C1_SCL (pin_B8)        // Arduino D15, pin 3 on CN10
 #define MICROPY_HW_I2C1_SDA (pin_B9)        //         D14, pin 5 on CN10
 #define MICROPY_HW_I2C2_SCL (pin_B10)       // Arduino D6,  pin 25 on CN10
@@ -38,7 +38,7 @@
 #define MICROPY_HW_I2C3_SCL (pin_A8)        // Arduino D7,  pin 23 on CN10
 #define MICROPY_HW_I2C3_SDA (pin_C9)        //              pin  1 on CN10
 
-// SPI busses
+// SPI buses
 #define MICROPY_HW_SPI1_NSS     (pin_A15)   //              pin 17 on CN7
 #define MICROPY_HW_SPI1_SCK     (pin_A5)    // Arduino D13, pin 11 on CN10
 #define MICROPY_HW_SPI1_MISO    (pin_A6)    // Arduino D12, pin 13 on CN10
diff --git a/ports/stm32/boards/NUCLEO_F411RE/mpconfigboard.h b/ports/stm32/boards/NUCLEO_F411RE/mpconfigboard.h
index 26b1e0b619d2e..e37ce889c38b0 100644
--- a/ports/stm32/boards/NUCLEO_F411RE/mpconfigboard.h
+++ b/ports/stm32/boards/NUCLEO_F411RE/mpconfigboard.h
@@ -21,7 +21,7 @@
 #define MICROPY_HW_UART_REPL        PYB_UART_2
 #define MICROPY_HW_UART_REPL_BAUD   115200
 
-// I2C busses
+// I2C buses
 #define MICROPY_HW_I2C1_SCL (pin_B8)        // Arduino D15, pin 3 on CN10
 #define MICROPY_HW_I2C1_SDA (pin_B9)        //         D14, pin 5 on CN10
 #define MICROPY_HW_I2C2_SCL (pin_B10)       // Arduino D6,  pin 25 on CN10
@@ -29,7 +29,7 @@
 #define MICROPY_HW_I2C3_SCL (pin_A8)        // Arduino D7,  pin 23 on CN10
 #define MICROPY_HW_I2C3_SDA (pin_C9)        //              pin  1 on CN10
 
-// SPI busses
+// SPI buses
 #define MICROPY_HW_SPI1_NSS     (pin_A15)   //              pin 17 on CN7
 #define MICROPY_HW_SPI1_SCK     (pin_A5)    // Arduino D13, pin 11 on CN10
 #define MICROPY_HW_SPI1_MISO    (pin_A6)    // Arduino D12, pin 13 on CN10
diff --git a/ports/stm32/boards/NUCLEO_F413ZH/mpconfigboard.h b/ports/stm32/boards/NUCLEO_F413ZH/mpconfigboard.h
index 2f488159a4f00..5297ceda5c4e6 100644
--- a/ports/stm32/boards/NUCLEO_F413ZH/mpconfigboard.h
+++ b/ports/stm32/boards/NUCLEO_F413ZH/mpconfigboard.h
@@ -41,7 +41,7 @@
 #define MICROPY_HW_UART_REPL        PYB_UART_3
 #define MICROPY_HW_UART_REPL_BAUD   115200
 
-// I2C busses
+// I2C buses
 #define MICROPY_HW_I2C1_SCL (pin_B8)
 #define MICROPY_HW_I2C1_SDA (pin_B9)
 #define MICROPY_HW_I2C2_SCL (pin_F1)
@@ -49,7 +49,7 @@
 #define MICROPY_HW_I2C3_SCL (pin_A8)
 #define MICROPY_HW_I2C3_SDA (pin_C9)
 
-// SPI busses
+// SPI buses
 #define MICROPY_HW_SPI1_NSS     (pin_A4) // shared with DAC
 #define MICROPY_HW_SPI1_SCK     (pin_A5) // shared with DAC
 #define MICROPY_HW_SPI1_MISO    (pin_A6)
@@ -71,7 +71,7 @@
 #define MICROPY_HW_SPI5_MISO    (pin_E13)
 #define MICROPY_HW_SPI5_MOSI    (pin_E14)
 
-// CAN busses
+// CAN buses
 #define MICROPY_HW_CAN1_TX (pin_G1)
 #define MICROPY_HW_CAN1_RX (pin_G0)
 #define MICROPY_HW_CAN2_TX (pin_G12)
diff --git a/ports/stm32/boards/NUCLEO_F429ZI/mpconfigboard.h b/ports/stm32/boards/NUCLEO_F429ZI/mpconfigboard.h
index 05c98e113f7ed..86c02b517879a 100644
--- a/ports/stm32/boards/NUCLEO_F429ZI/mpconfigboard.h
+++ b/ports/stm32/boards/NUCLEO_F429ZI/mpconfigboard.h
@@ -38,11 +38,11 @@
 #define MICROPY_HW_UART_REPL        PYB_UART_3
 #define MICROPY_HW_UART_REPL_BAUD   115200
 
-// I2C busses
+// I2C buses
 #define MICROPY_HW_I2C3_SCL (pin_A8)
 #define MICROPY_HW_I2C3_SDA (pin_C9)
 
-// SPI busses
+// SPI buses
 #define MICROPY_HW_SPI1_NSS     (pin_A4)
 #define MICROPY_HW_SPI1_SCK     (pin_B3)
 #define MICROPY_HW_SPI1_MISO    (pin_B4)
@@ -58,7 +58,7 @@
 #define MICROPY_HW_SPI5_MISO    (pin_F8)
 #define MICROPY_HW_SPI5_MOSI    (pin_F9)
 
-// CAN busses
+// CAN buses
 #define MICROPY_HW_CAN1_TX (pin_B9)
 #define MICROPY_HW_CAN1_RX (pin_B8)
 #define MICROPY_HW_CAN2_TX (pin_B13)
diff --git a/ports/stm32/boards/NUCLEO_F446RE/mpconfigboard.h b/ports/stm32/boards/NUCLEO_F446RE/mpconfigboard.h
index cd4ad36fa0ee9..27845b33aa833 100644
--- a/ports/stm32/boards/NUCLEO_F446RE/mpconfigboard.h
+++ b/ports/stm32/boards/NUCLEO_F446RE/mpconfigboard.h
@@ -24,7 +24,7 @@
 #define MICROPY_HW_UART_REPL        PYB_UART_2
 #define MICROPY_HW_UART_REPL_BAUD   115200
 
-// I2C busses
+// I2C buses
 #define MICROPY_HW_I2C1_SCL (pin_B6)        // Arduino D10, pin 17 on CN10
 #define MICROPY_HW_I2C1_SDA (pin_B7)        //              pin 21 on CN7
 #define MICROPY_HW_I2C2_SCL (pin_B10)       // Arduino D6,  pin 25 on CN10
@@ -32,7 +32,7 @@
 #define MICROPY_HW_I2C3_SCL (pin_A8)        // Arduino D7,  pin 23 on CN10
 #define MICROPY_HW_I2C3_SDA (pin_C9)        //              pin  1 on CN10
 
-// SPI busses
+// SPI buses
 #define MICROPY_HW_SPI1_NSS     (pin_A15)   //              pin 17 on CN7
 #define MICROPY_HW_SPI1_SCK     (pin_A5)    // Arduino D13, pin 11 on CN10
 #define MICROPY_HW_SPI1_MISO    (pin_A6)    // Arduino D12, pin 13 on CN10
diff --git a/ports/stm32/boards/NUCLEO_F746ZG/mpconfigboard.h b/ports/stm32/boards/NUCLEO_F746ZG/mpconfigboard.h
index c9b0c60f274b0..402efcfe31beb 100644
--- a/ports/stm32/boards/NUCLEO_F746ZG/mpconfigboard.h
+++ b/ports/stm32/boards/NUCLEO_F746ZG/mpconfigboard.h
@@ -40,19 +40,19 @@
 #define MICROPY_HW_UART_REPL        PYB_UART_3
 #define MICROPY_HW_UART_REPL_BAUD   115200
 
-// I2C busses
+// I2C buses
 #define MICROPY_HW_I2C1_SCL         (pin_B8)
 #define MICROPY_HW_I2C1_SDA         (pin_B9)
 #define MICROPY_HW_I2C3_SCL         (pin_H7)
 #define MICROPY_HW_I2C3_SDA         (pin_H8)
 
-// SPI
+// SPI buses
 #define MICROPY_HW_SPI3_NSS         (pin_A4)
 #define MICROPY_HW_SPI3_SCK         (pin_B3)
 #define MICROPY_HW_SPI3_MISO        (pin_B4)
 #define MICROPY_HW_SPI3_MOSI        (pin_B5)
 
-// CAN busses
+// CAN buses
 #define MICROPY_HW_CAN1_TX          (pin_B9)
 #define MICROPY_HW_CAN1_RX          (pin_B8)
 #define MICROPY_HW_CAN2_TX          (pin_B13)
diff --git a/ports/stm32/boards/NUCLEO_F767ZI/mpconfigboard.h b/ports/stm32/boards/NUCLEO_F767ZI/mpconfigboard.h
index b659223b4d94e..4ed9f41832d85 100644
--- a/ports/stm32/boards/NUCLEO_F767ZI/mpconfigboard.h
+++ b/ports/stm32/boards/NUCLEO_F767ZI/mpconfigboard.h
@@ -41,7 +41,7 @@ void NUCLEO_F767ZI_board_early_init(void);
 #define MICROPY_HW_UART_REPL        PYB_UART_3
 #define MICROPY_HW_UART_REPL_BAUD   115200
 
-// I2C busses
+// I2C buses
 #define MICROPY_HW_I2C1_SCL         (pin_B8)
 #define MICROPY_HW_I2C1_SDA         (pin_B9)
 #define MICROPY_HW_I2C2_SCL         (pin_F1)
@@ -49,13 +49,13 @@ void NUCLEO_F767ZI_board_early_init(void);
 #define MICROPY_HW_I2C4_SCL         (pin_F14)
 #define MICROPY_HW_I2C4_SDA         (pin_F15)
 
-// SPI
+// SPI buses
 #define MICROPY_HW_SPI3_NSS         (pin_A4)
 #define MICROPY_HW_SPI3_SCK         (pin_B3)
 #define MICROPY_HW_SPI3_MISO        (pin_B4)
 #define MICROPY_HW_SPI3_MOSI        (pin_B5)
 
-// CAN busses
+// CAN buses
 #define MICROPY_HW_CAN1_TX          (pin_D1)
 #define MICROPY_HW_CAN1_RX          (pin_D0)
 
diff --git a/ports/stm32/boards/NUCLEO_H743ZI/mpconfigboard.h b/ports/stm32/boards/NUCLEO_H743ZI/mpconfigboard.h
index 324f2b03ce0d0..f25263fd2b13c 100644
--- a/ports/stm32/boards/NUCLEO_H743ZI/mpconfigboard.h
+++ b/ports/stm32/boards/NUCLEO_H743ZI/mpconfigboard.h
@@ -49,7 +49,7 @@ void NUCLEO_H743ZI_board_early_init(void);
 #define MICROPY_HW_UART_REPL        PYB_UART_3
 #define MICROPY_HW_UART_REPL_BAUD   115200
 
-// I2C busses
+// I2C buses
 #define MICROPY_HW_I2C1_SCL         (pin_B8)
 #define MICROPY_HW_I2C1_SDA         (pin_B9)
 #define MICROPY_HW_I2C2_SCL         (pin_F1)
@@ -57,7 +57,7 @@ void NUCLEO_H743ZI_board_early_init(void);
 #define MICROPY_HW_I2C4_SCL         (pin_F14)
 #define MICROPY_HW_I2C4_SDA         (pin_F15)
 
-// SPI
+// SPI buses
 #define MICROPY_HW_SPI3_NSS         (pin_A4)
 #define MICROPY_HW_SPI3_SCK         (pin_B3)
 #define MICROPY_HW_SPI3_MISO        (pin_B4)
diff --git a/ports/stm32/boards/NUCLEO_L073RZ/mpconfigboard.h b/ports/stm32/boards/NUCLEO_L073RZ/mpconfigboard.h
index a5c5dc9a0ee7b..b7f7bc4c885ba 100644
--- a/ports/stm32/boards/NUCLEO_L073RZ/mpconfigboard.h
+++ b/ports/stm32/boards/NUCLEO_L073RZ/mpconfigboard.h
@@ -34,11 +34,11 @@
 #define MICROPY_HW_UART_REPL PYB_UART_2
 #define MICROPY_HW_UART_REPL_BAUD 115200
 
-// I2C busses
+// I2C buses
 #define MICROPY_HW_I2C1_SCL (pin_B8)        // Arduino D15, pin 3 on CN10
 #define MICROPY_HW_I2C1_SDA (pin_B9)        // Arduino D14, pin 5 on CN10
 
-// SPI busses
+// SPI buses
 #define MICROPY_HW_SPI1_NSS     (pin_A15)   //              pin 17 on CN7
 #define MICROPY_HW_SPI1_SCK     (pin_A5)    // Arduino D13, pin 11 on CN10
 #define MICROPY_HW_SPI1_MISO    (pin_A6)    // Arduino D12, pin 13 on CN10
diff --git a/ports/stm32/boards/NUCLEO_L432KC/mpconfigboard.h b/ports/stm32/boards/NUCLEO_L432KC/mpconfigboard.h
index 14b3bab8a7158..0a3ac1f185a70 100644
--- a/ports/stm32/boards/NUCLEO_L432KC/mpconfigboard.h
+++ b/ports/stm32/boards/NUCLEO_L432KC/mpconfigboard.h
@@ -42,13 +42,13 @@
 
 #define MICROPY_HW_FLASH_LATENCY    FLASH_LATENCY_4
 
-// I2C busses
+// I2C buses
 #define MICROPY_HW_I2C1_SCL (pin_A9)
 #define MICROPY_HW_I2C1_SDA (pin_A10)
 #define MICROPY_HW_I2C3_SCL (pin_A7)
 #define MICROPY_HW_I2C3_SDA (pin_B4)
 
-// SPI busses
+// SPI buses
 #define MICROPY_HW_SPI1_NSS     (pin_B0)
 #define MICROPY_HW_SPI1_SCK     (pin_A5)
 #define MICROPY_HW_SPI1_MISO    (pin_A6)
diff --git a/ports/stm32/boards/NUCLEO_L452RE/mpconfigboard.h b/ports/stm32/boards/NUCLEO_L452RE/mpconfigboard.h
index 9823ae9b9b74d..1b5827d5aec00 100644
--- a/ports/stm32/boards/NUCLEO_L452RE/mpconfigboard.h
+++ b/ports/stm32/boards/NUCLEO_L452RE/mpconfigboard.h
@@ -34,7 +34,7 @@
 #define MICROPY_HW_UART_REPL        PYB_UART_2
 #define MICROPY_HW_UART_REPL_BAUD   115200
 
-// I2C busses
+// I2C buses
 #define MICROPY_HW_I2C1_SCL     (pin_B8)    // Arduino D15, pin 3 on CN10
 #define MICROPY_HW_I2C1_SDA     (pin_B9)    // Arduino D14, pin 5 on CN10
 #define MICROPY_HW_I2C2_SCL     (pin_B10)   // Arduino D6,  pin 25 on CN10
@@ -44,7 +44,7 @@
 #define MICROPY_HW_I2C4_SCL     (pin_C0)    //              pin 38 on CN7
 #define MICROPY_HW_I2C4_SDA     (pin_C1)    //              pin 36 on CN7
 
-// SPI busses
+// SPI buses
 #define MICROPY_HW_SPI1_NSS     (pin_A15)   //              pin 17 on CN7
 #define MICROPY_HW_SPI1_SCK     (pin_A5)    // Arduino D13, pin 11 on CN10
 #define MICROPY_HW_SPI1_MISO    (pin_A6)    // Arduino D12, pin 13 on CN10
@@ -58,7 +58,7 @@
 #define MICROPY_HW_SPI3_MISO    (pin_C11)   //              pin 2 on CN7
 #define MICROPY_HW_SPI3_MOSI    (pin_C12)   //              pin 3 on CN7
 
-// CAN busses
+// CAN buses
 #define MICROPY_HW_CAN1_TX (pin_B9)
 #define MICROPY_HW_CAN1_RX (pin_B8)
 
diff --git a/ports/stm32/boards/NUCLEO_L476RG/mpconfigboard.h b/ports/stm32/boards/NUCLEO_L476RG/mpconfigboard.h
index 2899a97aceeda..a7bb0b36bbf01 100644
--- a/ports/stm32/boards/NUCLEO_L476RG/mpconfigboard.h
+++ b/ports/stm32/boards/NUCLEO_L476RG/mpconfigboard.h
@@ -46,7 +46,7 @@
 #define MICROPY_HW_UART_REPL        PYB_UART_2
 #define MICROPY_HW_UART_REPL_BAUD   115200
 
-// I2C busses
+// I2C buses
 #define MICROPY_HW_I2C1_SCL         (pin_B8)
 #define MICROPY_HW_I2C1_SDA         (pin_B9)
 #define MICROPY_HW_I2C2_SCL         (pin_B10)
@@ -54,7 +54,7 @@
 #define MICROPY_HW_I2C3_SCL         (pin_C0)
 #define MICROPY_HW_I2C3_SDA         (pin_C1)
 
-// SPI busses
+// SPI buses
 #define MICROPY_HW_SPI1_NSS         (pin_A4)
 #define MICROPY_HW_SPI1_SCK         (pin_B3)
 #define MICROPY_HW_SPI1_MISO        (pin_B4)
@@ -64,7 +64,7 @@
 #define MICROPY_HW_SPI2_MISO        (pin_B14)
 #define MICROPY_HW_SPI2_MOSI        (pin_B15)
 
-// CAN bus
+// CAN buses
 #define MICROPY_HW_CAN1_TX          (pin_A12)
 #define MICROPY_HW_CAN1_RX          (pin_A11)
 
diff --git a/ports/stm32/boards/OLIMEX_E407/mpconfigboard.h b/ports/stm32/boards/OLIMEX_E407/mpconfigboard.h
index d5cd7bb1ec665..999f97a708720 100644
--- a/ports/stm32/boards/OLIMEX_E407/mpconfigboard.h
+++ b/ports/stm32/boards/OLIMEX_E407/mpconfigboard.h
@@ -36,13 +36,13 @@
 #define MICROPY_HW_UART6_TX     (pin_C6)
 #define MICROPY_HW_UART6_RX     (pin_C7)
 
-// I2C busses
+// I2C buses
 #define MICROPY_HW_I2C1_SCL (pin_B8)
 #define MICROPY_HW_I2C1_SDA (pin_B9)
 #define MICROPY_HW_I2C2_SCL (pin_B10)
 #define MICROPY_HW_I2C2_SDA (pin_B11)
 
-// SPI busses
+// SPI buses
 #define MICROPY_HW_SPI1_NSS  (pin_A4)
 #define MICROPY_HW_SPI1_SCK  (pin_A5)
 #define MICROPY_HW_SPI1_MISO (pin_A6)
@@ -52,7 +52,7 @@
 #define MICROPY_HW_SPI2_MISO (pin_B14)
 #define MICROPY_HW_SPI2_MOSI (pin_B15)
 
-// CAN busses
+// CAN buses
 #define MICROPY_HW_CAN1_TX (pin_B9)
 #define MICROPY_HW_CAN1_RX (pin_B8)
 #define MICROPY_HW_CAN2_TX (pin_B13)
diff --git a/ports/stm32/boards/PYBD_SF2/mpconfigboard.h b/ports/stm32/boards/PYBD_SF2/mpconfigboard.h
index 57cc75efc6f92..48b3ee3eb9092 100644
--- a/ports/stm32/boards/PYBD_SF2/mpconfigboard.h
+++ b/ports/stm32/boards/PYBD_SF2/mpconfigboard.h
@@ -122,7 +122,7 @@ extern struct _spi_bdev_t spi_bdev2;
 #define MICROPY_HW_UART6_RTS        (pyb_pin_BT_RTS)
 #define MICROPY_HW_UART6_CTS        (pyb_pin_BT_CTS)
 
-// I2C busses
+// I2C buses
 #define MICROPY_HW_I2C1_NAME        "X"
 #define MICROPY_HW_I2C1_SCL         (pyb_pin_X9)
 #define MICROPY_HW_I2C1_SDA         (pyb_pin_X10)
@@ -130,7 +130,7 @@ extern struct _spi_bdev_t spi_bdev2;
 #define MICROPY_HW_I2C2_SCL         (pyb_pin_Y9)
 #define MICROPY_HW_I2C2_SDA         (pyb_pin_Y10)
 
-// SPI busses
+// SPI buses
 #define MICROPY_HW_SPI1_NAME        "X"
 #define MICROPY_HW_SPI1_NSS         (pyb_pin_X5)
 #define MICROPY_HW_SPI1_SCK         (pyb_pin_X6)
@@ -146,7 +146,7 @@ extern struct _spi_bdev_t spi_bdev2;
 #define MICROPY_HW_SPI3_MISO        (pyb_pin_W50)
 #define MICROPY_HW_SPI3_MOSI        (pyb_pin_W46)
 
-// CAN busses
+// CAN buses
 #define MICROPY_HW_CAN1_NAME        "X"
 #define MICROPY_HW_CAN1_TX          (pyb_pin_X10)
 #define MICROPY_HW_CAN1_RX          (pyb_pin_X9)
diff --git a/ports/stm32/boards/PYBD_SF6/mpconfigboard.h b/ports/stm32/boards/PYBD_SF6/mpconfigboard.h
index cbfbe39945daf..8c11d7b2eec96 100644
--- a/ports/stm32/boards/PYBD_SF6/mpconfigboard.h
+++ b/ports/stm32/boards/PYBD_SF6/mpconfigboard.h
@@ -49,7 +49,7 @@
 #define MICROPY_HW_UART7_TX         (pyb_pin_W16)
 #define MICROPY_HW_UART7_RX         (pyb_pin_W22B)
 
-// Extra CAN busses
+// Extra CAN buses
 #define MICROPY_HW_CAN2_NAME        "Y"
 #define MICROPY_HW_CAN2_TX          (pyb_pin_Y6)
 #define MICROPY_HW_CAN2_RX          (pyb_pin_Y5)
diff --git a/ports/stm32/boards/PYBLITEV10/mpconfigboard.h b/ports/stm32/boards/PYBLITEV10/mpconfigboard.h
index 77509a6003716..1643e250cb5c9 100644
--- a/ports/stm32/boards/PYBLITEV10/mpconfigboard.h
+++ b/ports/stm32/boards/PYBLITEV10/mpconfigboard.h
@@ -35,7 +35,7 @@
 #define MICROPY_HW_UART6_TX     (pin_C6)
 #define MICROPY_HW_UART6_RX     (pin_C7)
 
-// I2C busses
+// I2C buses
 #define MICROPY_HW_I2C1_NAME "X"
 #define MICROPY_HW_I2C1_SCL (pin_B6)
 #define MICROPY_HW_I2C1_SDA (pin_B7)
@@ -43,7 +43,7 @@
 #define MICROPY_HW_I2C3_SCL (pin_A8)
 #define MICROPY_HW_I2C3_SDA (pin_B8)
 
-// SPI busses
+// SPI buses
 #define MICROPY_HW_SPI1_NAME "X"
 #define MICROPY_HW_SPI1_NSS  (pin_A4) // X5
 #define MICROPY_HW_SPI1_SCK  (pin_A5) // X6
diff --git a/ports/stm32/boards/PYBV10/mpconfigboard.h b/ports/stm32/boards/PYBV10/mpconfigboard.h
index dda98776cd345..52382f44d5c14 100644
--- a/ports/stm32/boards/PYBV10/mpconfigboard.h
+++ b/ports/stm32/boards/PYBV10/mpconfigboard.h
@@ -44,7 +44,7 @@
 #define MICROPY_HW_UART6_TX     (pin_C6)
 #define MICROPY_HW_UART6_RX     (pin_C7)
 
-// I2C busses
+// I2C buses
 #define MICROPY_HW_I2C1_NAME "X"
 #define MICROPY_HW_I2C1_SCL (pin_B6)
 #define MICROPY_HW_I2C1_SDA (pin_B7)
@@ -52,7 +52,7 @@
 #define MICROPY_HW_I2C2_SCL (pin_B10)
 #define MICROPY_HW_I2C2_SDA (pin_B11)
 
-// SPI busses
+// SPI buses
 #define MICROPY_HW_SPI1_NAME "X"
 #define MICROPY_HW_SPI1_NSS  (pin_A4) // X5
 #define MICROPY_HW_SPI1_SCK  (pin_A5) // X6
@@ -64,7 +64,7 @@
 #define MICROPY_HW_SPI2_MISO (pin_B14) // Y7
 #define MICROPY_HW_SPI2_MOSI (pin_B15) // Y8
 
-// CAN busses
+// CAN buses
 #define MICROPY_HW_CAN1_NAME "YA"
 #define MICROPY_HW_CAN1_TX   (pin_B9) // Y4
 #define MICROPY_HW_CAN1_RX   (pin_B8) // Y3
diff --git a/ports/stm32/boards/PYBV11/mpconfigboard.h b/ports/stm32/boards/PYBV11/mpconfigboard.h
index 7d10c13e8fc00..8e84694048201 100644
--- a/ports/stm32/boards/PYBV11/mpconfigboard.h
+++ b/ports/stm32/boards/PYBV11/mpconfigboard.h
@@ -44,7 +44,7 @@
 #define MICROPY_HW_UART6_TX     (pin_C6)
 #define MICROPY_HW_UART6_RX     (pin_C7)
 
-// I2C busses
+// I2C buses
 #define MICROPY_HW_I2C1_NAME "X"
 #define MICROPY_HW_I2C1_SCL (pin_B6)
 #define MICROPY_HW_I2C1_SDA (pin_B7)
@@ -52,7 +52,7 @@
 #define MICROPY_HW_I2C2_SCL (pin_B10)
 #define MICROPY_HW_I2C2_SDA (pin_B11)
 
-// SPI busses
+// SPI buses
 #define MICROPY_HW_SPI1_NAME "X"
 #define MICROPY_HW_SPI1_NSS  (pin_A4) // X5
 #define MICROPY_HW_SPI1_SCK  (pin_A5) // X6
@@ -64,7 +64,7 @@
 #define MICROPY_HW_SPI2_MISO (pin_B14) // Y7
 #define MICROPY_HW_SPI2_MOSI (pin_B15) // Y8
 
-// CAN busses
+// CAN buses
 #define MICROPY_HW_CAN1_NAME "YA"
 #define MICROPY_HW_CAN1_TX   (pin_B9) // Y4
 #define MICROPY_HW_CAN1_RX   (pin_B8) // Y3
diff --git a/ports/stm32/boards/PYBV3/mpconfigboard.h b/ports/stm32/boards/PYBV3/mpconfigboard.h
index 7f1531770f307..9c956efd6d099 100644
--- a/ports/stm32/boards/PYBV3/mpconfigboard.h
+++ b/ports/stm32/boards/PYBV3/mpconfigboard.h
@@ -44,7 +44,7 @@
 #define MICROPY_HW_I2C2_SCL (pin_B10)
 #define MICROPY_HW_I2C2_SDA (pin_B11)
 
-// SPI busses
+// SPI buses
 #define MICROPY_HW_SPI1_NAME "X"
 #define MICROPY_HW_SPI1_NSS  (pin_A4) // X5
 #define MICROPY_HW_SPI1_SCK  (pin_A5) // X6
@@ -56,7 +56,7 @@
 #define MICROPY_HW_SPI2_MISO (pin_B14) // Y7
 #define MICROPY_HW_SPI2_MOSI (pin_B15) // Y8
 
-// CAN busses
+// CAN buses
 #define MICROPY_HW_CAN1_TX (pin_B9) // Y4
 #define MICROPY_HW_CAN1_RX (pin_B8) // Y3
 #define MICROPY_HW_CAN2_TX (pin_B13) // Y6
diff --git a/ports/stm32/boards/PYBV4/mpconfigboard.h b/ports/stm32/boards/PYBV4/mpconfigboard.h
index c1c60751138a8..2bd569ecdfa9f 100644
--- a/ports/stm32/boards/PYBV4/mpconfigboard.h
+++ b/ports/stm32/boards/PYBV4/mpconfigboard.h
@@ -41,7 +41,7 @@
 #define MICROPY_HW_UART6_PORT (GPIOC)
 #define MICROPY_HW_UART6_PINS (GPIO_PIN_6 | GPIO_PIN_7)
 
-// I2C busses
+// I2C buses
 #define MICROPY_HW_I2C1_NAME "X"
 #define MICROPY_HW_I2C1_SCL (pin_B6)
 #define MICROPY_HW_I2C1_SDA (pin_B7)
@@ -49,7 +49,7 @@
 #define MICROPY_HW_I2C2_SCL (pin_B10)
 #define MICROPY_HW_I2C2_SDA (pin_B11)
 
-// SPI busses
+// SPI buses
 #define MICROPY_HW_SPI1_NAME "X"
 #define MICROPY_HW_SPI1_NSS  (pin_A4) // X5
 #define MICROPY_HW_SPI1_SCK  (pin_A5) // X6
@@ -61,7 +61,7 @@
 #define MICROPY_HW_SPI2_MISO (pin_B14) // Y7
 #define MICROPY_HW_SPI2_MOSI (pin_B15) // Y8
 
-// CAN busses
+// CAN buses
 #define MICROPY_HW_CAN1_NAME "YA"
 #define MICROPY_HW_CAN1_TX   (pin_B9) // Y4
 #define MICROPY_HW_CAN1_RX   (pin_B8) // Y3
diff --git a/ports/stm32/boards/STM32F411DISC/mpconfigboard.h b/ports/stm32/boards/STM32F411DISC/mpconfigboard.h
index 13172333b7b78..97da20461257f 100644
--- a/ports/stm32/boards/STM32F411DISC/mpconfigboard.h
+++ b/ports/stm32/boards/STM32F411DISC/mpconfigboard.h
@@ -26,7 +26,7 @@
 #define MICROPY_HW_UART6_TX     (pin_C6)
 #define MICROPY_HW_UART6_RX     (pin_C7)
 
-// I2C busses
+// I2C buses
 #define MICROPY_HW_I2C1_SCL (pin_B6)
 #define MICROPY_HW_I2C1_SDA (pin_B9)
 //#define MICROPY_HW_I2C2_SCL (pin_B10)
@@ -34,7 +34,7 @@
 #define MICROPY_HW_I2C3_SCL (pin_A8)
 #define MICROPY_HW_I2C3_SDA (pin_A9)
 
-// SPI busses
+// SPI buses
 #define MICROPY_HW_SPI1_NSS  (pin_A4)
 #define MICROPY_HW_SPI1_SCK  (pin_A5)
 #define MICROPY_HW_SPI1_MISO (pin_A6)
diff --git a/ports/stm32/boards/STM32F429DISC/mpconfigboard.h b/ports/stm32/boards/STM32F429DISC/mpconfigboard.h
index 9b65f617437a4..95cab08c8fa18 100644
--- a/ports/stm32/boards/STM32F429DISC/mpconfigboard.h
+++ b/ports/stm32/boards/STM32F429DISC/mpconfigboard.h
@@ -22,11 +22,11 @@
 #define MICROPY_HW_UART2_TX     (pin_D8)
 #define MICROPY_HW_UART2_RX     (pin_D9)
 
-// I2C busses
+// I2C buses
 #define MICROPY_HW_I2C3_SCL (pin_A8)
 #define MICROPY_HW_I2C3_SDA (pin_C9)
 
-// SPI busses
+// SPI buses
 //#define MICROPY_HW_SPI1_NSS     (pin_A4)
 //#define MICROPY_HW_SPI1_SCK     (pin_A5)
 //#define MICROPY_HW_SPI1_MISO    (pin_A6)
@@ -52,7 +52,7 @@
 //#define MICROPY_HW_SPI6_MISO    (pin_G12)
 //#define MICROPY_HW_SPI6_MOSI    (pin_G14)
 
-// CAN busses
+// CAN buses
 #define MICROPY_HW_CAN1_TX (pin_B9)
 #define MICROPY_HW_CAN1_RX (pin_B8)
 #define MICROPY_HW_CAN2_TX (pin_B13)
diff --git a/ports/stm32/boards/STM32F439/mpconfigboard.h b/ports/stm32/boards/STM32F439/mpconfigboard.h
index a4e10934458f7..702ef265bb323 100644
--- a/ports/stm32/boards/STM32F439/mpconfigboard.h
+++ b/ports/stm32/boards/STM32F439/mpconfigboard.h
@@ -40,11 +40,11 @@
 #define MICROPY_HW_UART6_TX     (pin_C6)
 #define MICROPY_HW_UART6_RX     (pin_C7)
 
-// I2C busses
+// I2C buses
 #define MICROPY_HW_I2C1_SCL (pin_A8)
 #define MICROPY_HW_I2C1_SDA (pin_C9)
 
-// SPI busses
+// SPI buses
 #define MICROPY_HW_SPI1_NSS     (pin_A4)
 #define MICROPY_HW_SPI1_SCK     (pin_A5)
 #define MICROPY_HW_SPI1_MISO    (pin_A6)
@@ -74,7 +74,7 @@
 //#define MICROPY_HW_SPI6_MISO    (pin_G12)
 //#define MICROPY_HW_SPI6_MOSI    (pin_G14)
 
-// CAN busses
+// CAN buses
 #define MICROPY_HW_CAN1_TX (pin_B9)
 #define MICROPY_HW_CAN1_RX (pin_B8)
 #define MICROPY_HW_CAN2_TX (pin_B13)
diff --git a/ports/stm32/boards/STM32F4DISC/mpconfigboard.h b/ports/stm32/boards/STM32F4DISC/mpconfigboard.h
index 3e4c8261ccae6..dbe52e6b10e0b 100644
--- a/ports/stm32/boards/STM32F4DISC/mpconfigboard.h
+++ b/ports/stm32/boards/STM32F4DISC/mpconfigboard.h
@@ -43,13 +43,13 @@
 #define MICROPY_HW_UART6_TX     (pin_C6)
 #define MICROPY_HW_UART6_RX     (pin_C7)
 
-// I2C busses
+// I2C buses
 #define MICROPY_HW_I2C1_SCL (pin_B6)
 #define MICROPY_HW_I2C1_SDA (pin_B7)
 #define MICROPY_HW_I2C2_SCL (pin_B10)
 #define MICROPY_HW_I2C2_SDA (pin_B11)
 
-// SPI busses
+// SPI buses
 #define MICROPY_HW_SPI1_NSS  (pin_A4)
 #define MICROPY_HW_SPI1_SCK  (pin_A5)
 #define MICROPY_HW_SPI1_MISO (pin_A6)
@@ -59,7 +59,7 @@
 #define MICROPY_HW_SPI2_MISO (pin_B14)
 #define MICROPY_HW_SPI2_MOSI (pin_B15)
 
-// CAN busses
+// CAN buses
 #define MICROPY_HW_CAN1_TX (pin_B9)
 #define MICROPY_HW_CAN1_RX (pin_B8)
 #define MICROPY_HW_CAN2_TX (pin_B13)
diff --git a/ports/stm32/boards/STM32F769DISC/mpconfigboard.h b/ports/stm32/boards/STM32F769DISC/mpconfigboard.h
index 5004a8ecac9d0..87cefb50176ff 100644
--- a/ports/stm32/boards/STM32F769DISC/mpconfigboard.h
+++ b/ports/stm32/boards/STM32F769DISC/mpconfigboard.h
@@ -59,19 +59,19 @@ extern struct _spi_bdev_t spi_bdev;
 #define MICROPY_HW_UART_REPL        PYB_UART_1
 #define MICROPY_HW_UART_REPL_BAUD   115200
 
-// I2C busses
+// I2C buses
 #define MICROPY_HW_I2C1_SCL         (pin_B8)
 #define MICROPY_HW_I2C1_SDA         (pin_B9)
 #define MICROPY_HW_I2C3_SCL         (pin_H7)
 #define MICROPY_HW_I2C3_SDA         (pin_H8)
 
-// SPI
+// SPI buses
 #define MICROPY_HW_SPI2_NSS         (pin_A11)
 #define MICROPY_HW_SPI2_SCK         (pin_A12)
 #define MICROPY_HW_SPI2_MISO        (pin_B14)
 #define MICROPY_HW_SPI2_MOSI        (pin_B15)
 
-// CAN busses
+// CAN buses
 #define MICROPY_HW_CAN1_TX          (pin_B9)
 #define MICROPY_HW_CAN1_RX          (pin_B8)
 #define MICROPY_HW_CAN2_TX          (pin_B13)
diff --git a/ports/stm32/boards/STM32F7DISC/mpconfigboard.h b/ports/stm32/boards/STM32F7DISC/mpconfigboard.h
index b07f0a7b8ffc7..cf7061902ee75 100644
--- a/ports/stm32/boards/STM32F7DISC/mpconfigboard.h
+++ b/ports/stm32/boards/STM32F7DISC/mpconfigboard.h
@@ -38,20 +38,20 @@ void STM32F7DISC_board_early_init(void);
 #define MICROPY_HW_UART_REPL        PYB_UART_1
 #define MICROPY_HW_UART_REPL_BAUD   115200
 
-// I2C busses
+// I2C buses
 #define MICROPY_HW_I2C1_SCL         (pin_B8)
 #define MICROPY_HW_I2C1_SDA         (pin_B9)
 
 #define MICROPY_HW_I2C3_SCL         (pin_H7)
 #define MICROPY_HW_I2C3_SDA         (pin_H8)
 
-// SPI
+// SPI buses
 #define MICROPY_HW_SPI2_NSS         (pin_I0)
 #define MICROPY_HW_SPI2_SCK         (pin_I1)
 #define MICROPY_HW_SPI2_MISO        (pin_B14)
 #define MICROPY_HW_SPI2_MOSI        (pin_B15)
 
-// CAN busses
+// CAN buses
 #define MICROPY_HW_CAN1_TX          (pin_B9)
 #define MICROPY_HW_CAN1_RX          (pin_B8)
 #define MICROPY_HW_CAN2_TX          (pin_B13)
diff --git a/ports/stm32/boards/STM32L476DISC/mpconfigboard.h b/ports/stm32/boards/STM32L476DISC/mpconfigboard.h
index ad62f761e55f3..58fb8ef1440d2 100644
--- a/ports/stm32/boards/STM32L476DISC/mpconfigboard.h
+++ b/ports/stm32/boards/STM32L476DISC/mpconfigboard.h
@@ -50,19 +50,19 @@ extern struct _spi_bdev_t spi_bdev;
 #define MICROPY_HW_UART_REPL        PYB_UART_2
 #define MICROPY_HW_UART_REPL_BAUD   115200
 
-// I2C busses
+// I2C buses
 #define MICROPY_HW_I2C1_SCL (pin_B6)
 #define MICROPY_HW_I2C1_SDA (pin_B7)
 #define MICROPY_HW_I2C2_SCL (pin_B10)
 #define MICROPY_HW_I2C2_SDA (pin_B11)
 
-// SPI busses
+// SPI buses
 #define MICROPY_HW_SPI2_NSS     (pin_D0)
 #define MICROPY_HW_SPI2_SCK     (pin_D1)
 #define MICROPY_HW_SPI2_MISO    (pin_D3)
 #define MICROPY_HW_SPI2_MOSI    (pin_D4)
 
-// CAN busses
+// CAN buses
 #define MICROPY_HW_CAN1_TX (pin_B9)
 #define MICROPY_HW_CAN1_RX (pin_B8)
 
diff --git a/ports/stm32/boards/STM32L496GDISC/mpconfigboard.h b/ports/stm32/boards/STM32L496GDISC/mpconfigboard.h
index 5d9fa25bc3b84..d4d78454af7ee 100644
--- a/ports/stm32/boards/STM32L496GDISC/mpconfigboard.h
+++ b/ports/stm32/boards/STM32L496GDISC/mpconfigboard.h
@@ -26,13 +26,13 @@
 #define MICROPY_HW_UART_REPL        PYB_UART_2
 #define MICROPY_HW_UART_REPL_BAUD   115200
 
-// I2C busses
+// I2C buses
 #define MICROPY_HW_I2C1_SCL (pin_G14)
 #define MICROPY_HW_I2C1_SDA (pin_G13)
 #define MICROPY_HW_I2C2_SCL (pin_H4)
 #define MICROPY_HW_I2C2_SDA (pin_B14)
 
-// SPI busses
+// SPI buses
 // -> To the arduino connector
 #define MICROPY_HW_SPI1_NSS     (pin_A15)
 #define MICROPY_HW_SPI1_SCK     (pin_A5)
diff --git a/ports/stm32/machine_uart.c b/ports/stm32/machine_uart.c
index eceb5b6e7a8b2..1b8db2e3e633e 100644
--- a/ports/stm32/machine_uart.c
+++ b/ports/stm32/machine_uart.c
@@ -294,7 +294,7 @@ STATIC mp_obj_t pyb_uart_init_helper(pyb_uart_obj_t *self, size_t n_args, const
 /// the bus, if any).  If extra arguments are given, the bus is initialised.
 /// See `init` for parameters of initialisation.
 ///
-/// The physical pins of the UART busses are:
+/// The physical pins of the UART buses are:
 ///
 ///   - `UART(4)` is on `XA`: `(TX, RX) = (X1, X2) = (PA0, PA1)`
 ///   - `UART(1)` is on `XB`: `(TX, RX) = (X9, X10) = (PB6, PB7)`
diff --git a/ports/stm32/pyb_i2c.c b/ports/stm32/pyb_i2c.c
index ee8b498a1359c..f0bd38333d6c1 100644
--- a/ports/stm32/pyb_i2c.c
+++ b/ports/stm32/pyb_i2c.c
@@ -660,7 +660,7 @@ STATIC mp_obj_t pyb_i2c_init_helper(const pyb_i2c_obj_t *self, size_t n_args, co
 /// the bus, if any).  If extra arguments are given, the bus is initialised.
 /// See `init` for parameters of initialisation.
 ///
-/// The physical pins of the I2C busses are:
+/// The physical pins of the I2C buses are:
 ///
 ///   - `I2C(1)` is on the X position: `(SCL, SDA) = (X9, X10) = (PB6, PB7)`
 ///   - `I2C(2)` is on the Y position: `(SCL, SDA) = (Y9, Y10) = (PB10, PB11)`
diff --git a/ports/stm32/pyb_spi.c b/ports/stm32/pyb_spi.c
index cc9dd1163623d..99a1cd77b4dbd 100644
--- a/ports/stm32/pyb_spi.c
+++ b/ports/stm32/pyb_spi.c
@@ -125,7 +125,7 @@ STATIC mp_obj_t pyb_spi_init_helper(const pyb_spi_obj_t *self, size_t n_args, co
 // the bus, if any).  If extra arguments are given, the bus is initialised.
 // See `init` for parameters of initialisation.
 //
-// The physical pins of the SPI busses are:
+// The physical pins of the SPI buses are:
 //   - `SPI(1)` is on the X position: `(NSS, SCK, MISO, MOSI) = (X5, X6, X7, X8) = (PA4, PA5, PA6, PA7)`
 //   - `SPI(2)` is on the Y position: `(NSS, SCK, MISO, MOSI) = (Y5, Y6, Y7, Y8) = (PB12, PB13, PB14, PB15)`
 //
diff --git a/ports/stm32/spi.c b/ports/stm32/spi.c
index f8ab791898d3f..d3b3a784e86f9 100644
--- a/ports/stm32/spi.c
+++ b/ports/stm32/spi.c
@@ -31,7 +31,7 @@
 #include "py/mphal.h"
 #include "spi.h"
 
-// Possible DMA configurations for SPI busses:
+// Possible DMA configurations for SPI buses:
 // SPI1_TX: DMA2_Stream3.CHANNEL_3 or DMA2_Stream5.CHANNEL_3
 // SPI1_RX: DMA2_Stream0.CHANNEL_3 or DMA2_Stream2.CHANNEL_3
 // SPI2_TX: DMA1_Stream4.CHANNEL_0
diff --git a/ports/teensy/uart.c b/ports/teensy/uart.c
index 471b40ee0169d..6373047b004f6 100644
--- a/ports/teensy/uart.c
+++ b/ports/teensy/uart.c
@@ -302,7 +302,7 @@ STATIC mp_obj_t pyb_uart_init_helper(pyb_uart_obj_t *self, uint n_args, const mp
 /// the bus, if any).  If extra arguments are given, the bus is initialised.
 /// See `init` for parameters of initialisation.
 ///
-/// The physical pins of the UART busses are:
+/// The physical pins of the UART buses are:
 ///
 ///   - `UART(4)` is on `XA`: `(TX, RX) = (X1, X2) = (PA0, PA1)`
 ///   - `UART(1)` is on `XB`: `(TX, RX) = (X9, X10) = (PB6, PB7)`

From 04927dfaca06d68a35ff1a5700a5e4eb283b5f2d Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sat, 14 Nov 2020 18:54:26 +1100
Subject: [PATCH 0879/3533] tools/mpy_ld.py: Support R_X86_64_GOTPCREL reloc
 for x86-64 arch.

This can be treated by the linker the same as R_X86_64_REX_GOTPCRELX,
according to https://reviews.llvm.org/D18301.

Signed-off-by: Damien George <damien@micropython.org>
---
 tools/mpy_ld.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/tools/mpy_ld.py b/tools/mpy_ld.py
index 774966a7f68a0..852249943887e 100755
--- a/tools/mpy_ld.py
+++ b/tools/mpy_ld.py
@@ -73,6 +73,7 @@
 R_ARM_BASE_PREL = 25  # aka R_ARM_GOTPC
 R_ARM_GOT_BREL = 26  # aka R_ARM_GOT32
 R_ARM_THM_JUMP24 = 30
+R_X86_64_GOTPCREL = 9
 R_X86_64_REX_GOTPCRELX = 42
 R_386_GOT32X = 43
 
@@ -132,7 +133,7 @@ def __init__(self, name, mpy_feature, qstr_entry_size, word_size, arch_got, asm_
         | MICROPY_OPT_CACHE_MAP_LOOKUP_IN_BYTECODE,
         2,
         8,
-        (R_X86_64_REX_GOTPCRELX,),
+        (R_X86_64_GOTPCREL, R_X86_64_REX_GOTPCRELX),
         asm_jump_x86,
     ),
     "armv7m": ArchData(
@@ -536,7 +537,10 @@ def do_relocation_text(env, text_addr, r):
         # Relcation pointing to GOT
         reloc = addr = env.got_entries[s.name].offset
 
-    elif env.arch.name == "EM_X86_64" and r_info_type == R_X86_64_REX_GOTPCRELX:
+    elif env.arch.name == "EM_X86_64" and r_info_type in (
+        R_X86_64_GOTPCREL,
+        R_X86_64_REX_GOTPCRELX,
+    ):
         # Relcation pointing to GOT
         got_entry = env.got_entries[s.name]
         addr = env.got_section.addr + got_entry.offset

From f49d47c167ce97b48ff3e9cbbc016b09664390f5 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 24 Nov 2020 23:37:05 +1100
Subject: [PATCH 0880/3533] py/asmx64: Support use of top 8 regs in src_r64
 argument.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/asmx64.c | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/py/asmx64.c b/py/asmx64.c
index fd64eaf98b1c1..62df5c6d4ad79 100644
--- a/py/asmx64.c
+++ b/py/asmx64.c
@@ -285,31 +285,28 @@ void asm_x64_mov_r64_to_mem64(asm_x64_t *as, int src_r64, int dest_r64, int dest
 }
 
 void asm_x64_mov_mem8_to_r64zx(asm_x64_t *as, int src_r64, int src_disp, int dest_r64) {
-    assert(src_r64 < 8);
-    if (dest_r64 < 8) {
+    if (src_r64 < 8 && dest_r64 < 8) {
         asm_x64_write_byte_2(as, 0x0f, OPCODE_MOVZX_RM8_TO_R64);
     } else {
-        asm_x64_write_byte_3(as, REX_PREFIX | REX_R, 0x0f, OPCODE_MOVZX_RM8_TO_R64);
+        asm_x64_write_byte_3(as, REX_PREFIX | REX_R_FROM_R64(dest_r64) | REX_B_FROM_R64(src_r64), 0x0f, OPCODE_MOVZX_RM8_TO_R64);
     }
     asm_x64_write_r64_disp(as, dest_r64, src_r64, src_disp);
 }
 
 void asm_x64_mov_mem16_to_r64zx(asm_x64_t *as, int src_r64, int src_disp, int dest_r64) {
-    assert(src_r64 < 8);
-    if (dest_r64 < 8) {
+    if (src_r64 < 8 && dest_r64 < 8) {
         asm_x64_write_byte_2(as, 0x0f, OPCODE_MOVZX_RM16_TO_R64);
     } else {
-        asm_x64_write_byte_3(as, REX_PREFIX | REX_R, 0x0f, OPCODE_MOVZX_RM16_TO_R64);
+        asm_x64_write_byte_3(as, REX_PREFIX | REX_R_FROM_R64(dest_r64) | REX_B_FROM_R64(src_r64), 0x0f, OPCODE_MOVZX_RM16_TO_R64);
     }
     asm_x64_write_r64_disp(as, dest_r64, src_r64, src_disp);
 }
 
 void asm_x64_mov_mem32_to_r64zx(asm_x64_t *as, int src_r64, int src_disp, int dest_r64) {
-    assert(src_r64 < 8);
-    if (dest_r64 < 8) {
+    if (src_r64 < 8 && dest_r64 < 8) {
         asm_x64_write_byte_1(as, OPCODE_MOV_RM64_TO_R64);
     } else {
-        asm_x64_write_byte_2(as, REX_PREFIX | REX_R, OPCODE_MOV_RM64_TO_R64);
+        asm_x64_write_byte_2(as, REX_PREFIX | REX_R_FROM_R64(dest_r64) | REX_B_FROM_R64(src_r64), OPCODE_MOV_RM64_TO_R64);
     }
     asm_x64_write_r64_disp(as, dest_r64, src_r64, src_disp);
 }

From 5176a2d7325d941d8f2f41b31eab87b6e7a83f06 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 24 Nov 2020 23:37:58 +1100
Subject: [PATCH 0881/3533] py/emitnative: Fix x86-64 emitter to generate
 correct 8/16-bit stores.

Fixes issue #6643.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/emitnative.c                      |  4 ++--
 tests/micropython/viper_misc2.py     | 21 +++++++++++++++++++++
 tests/micropython/viper_misc2.py.exp |  1 +
 3 files changed, 24 insertions(+), 2 deletions(-)
 create mode 100644 tests/micropython/viper_misc2.py
 create mode 100644 tests/micropython/viper_misc2.py.exp

diff --git a/py/emitnative.c b/py/emitnative.c
index 052a505911d2a..425ba2d33e528 100644
--- a/py/emitnative.c
+++ b/py/emitnative.c
@@ -1769,7 +1769,7 @@ STATIC void emit_native_store_subscr(emit_t *emit) {
             int reg_index = REG_ARG_2;
             int reg_value = REG_ARG_3;
             emit_pre_pop_reg_flexible(emit, &vtype_base, &reg_base, reg_index, reg_value);
-            #if N_X86
+            #if N_X64 || N_X86
             // special case: x86 needs byte stores to be from lower 4 regs (REG_ARG_3 is EDX)
             emit_pre_pop_reg(emit, &vtype_value, reg_value);
             #else
@@ -1856,7 +1856,7 @@ STATIC void emit_native_store_subscr(emit_t *emit) {
                 EMIT_NATIVE_VIPER_TYPE_ERROR(emit,
                     MP_ERROR_TEXT("can't store with '%q' index"), vtype_to_qstr(vtype_index));
             }
-            #if N_X86
+            #if N_X64 || N_X86
             // special case: x86 needs byte stores to be from lower 4 regs (REG_ARG_3 is EDX)
             emit_pre_pop_reg(emit, &vtype_value, reg_value);
             #else
diff --git a/tests/micropython/viper_misc2.py b/tests/micropython/viper_misc2.py
new file mode 100644
index 0000000000000..8f0be487d626d
--- /dev/null
+++ b/tests/micropython/viper_misc2.py
@@ -0,0 +1,21 @@
+# Miscellaneous viper tests
+
+# Test correct use of registers in load and store
+@micropython.viper
+def expand(dest: ptr8, source: ptr8, length: int):
+    n = 0
+    for x in range(0, length, 2):
+        c = source[x]
+        d = source[x + 1]
+        dest[n] = (c & 0xE0) | ((c & 0x1C) >> 1)
+        n += 1
+        dest[n] = ((c & 3) << 6) | ((d & 0xE0) >> 4)
+        n += 1
+        dest[n] = ((d & 0x1C) << 3) | ((d & 3) << 2)
+        n += 1
+
+
+source = b"\xaa\xaa\xff\xff"
+dest = bytearray(len(source) // 2 * 3)
+expand(dest, source, len(source))
+print(dest)
diff --git a/tests/micropython/viper_misc2.py.exp b/tests/micropython/viper_misc2.py.exp
new file mode 100644
index 0000000000000..eff2f5e41d244
--- /dev/null
+++ b/tests/micropython/viper_misc2.py.exp
@@ -0,0 +1 @@
+bytearray(b'\xa4\x8aH\xee\xce\xec')

From a96afae90f6e5d693173382561d06e583b0b5fa5 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 14 May 2021 14:10:37 +1000
Subject: [PATCH 0882/3533] stm32/sdio: Fix case of SDIO DMA turning off mid
 transfer.

The DMA driver will turn off DMA if it hasn't been used for an amount of
time (to save power).  The SDIO driver for cyw43 WLAN was not informing the
DMA driver that it was using DMA and there was a chance that the DMA would
turn off in the middle of an SDIO DMA transfer.  The symptoms of this would
be printing of SDIO error messages and a failure to communicate with the
cyw43 WLAN module.

This commit fixes this issue by changing the SDIO driver to use the
dma_nohal_XXX API to initialise and start the DMA.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/dma.c  |  2 +-
 ports/stm32/sdio.c | 35 +++++++++++++++++++----------------
 2 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/ports/stm32/dma.c b/ports/stm32/dma.c
index 4320315ba4e5d..d4b41771b0810 100644
--- a/ports/stm32/dma.c
+++ b/ports/stm32/dma.c
@@ -40,7 +40,7 @@
 #define DMA_IDLE_TICK_MAX   (8) // 8*8 = 64 msec
 #define DMA_IDLE_TICK(tick) (((tick) & ~(SYSTICK_DISPATCH_NUM_SLOTS - 1) & DMA_SYSTICK_MASK) == 0)
 
-#define ENABLE_SDIO (MICROPY_HW_ENABLE_SDCARD || MICROPY_HW_ENABLE_MMCARD)
+#define ENABLE_SDIO (MICROPY_HW_ENABLE_SDCARD || MICROPY_HW_ENABLE_MMCARD || MICROPY_PY_NETWORK_CYW43)
 
 typedef enum {
     dma_id_not_defined=-1,
diff --git a/ports/stm32/sdio.c b/ports/stm32/sdio.c
index dfd409257759a..0291e3e81d3c0 100644
--- a/ports/stm32/sdio.c
+++ b/ports/stm32/sdio.c
@@ -28,6 +28,7 @@
 
 #include "py/mperrno.h"
 #include "py/mphal.h"
+#include "dma.h"
 #include "pin.h"
 #include "pin_static_af.h"
 #include "pendsv.h"
@@ -382,27 +383,21 @@ int sdio_transfer_cmd53(bool write, uint32_t block_size, uint32_t arg, size_t le
         }
 
         #if defined(STM32F7)
-        DMA2->LIFCR = 0x3f << 22;
-        DMA2_Stream3->FCR = 0x07; // ?
-        DMA2_Stream3->PAR = (uint32_t)&SDMMC->FIFO;
         if ((uint32_t)buf & 3) {
             printf("sdio_transfer_cmd53: buf=%p is not aligned for DMA\n", buf);
             return -MP_EINVAL;
         }
-        DMA2_Stream3->M0AR = (uint32_t)buf;
-        DMA2_Stream3->NDTR = ((len + block_size - 1) & ~(block_size - 1)) / 4;
-        DMA2_Stream3->CR = 4 << 25 // channel 4
-            | 1 << 23 // MBURST INCR4
-            | 1 << 21 // PBURST INCR4
-            | 3 << 16 // PL very high
-            | 2 << 13 // MSIZE word
-            | 2 << 11 // PSIZE word
-            | 1 << 10 // MINC enabled
-            | 0 << 9 // PINC disabled
-            | write << 6 // DIR mem-to-periph
-            | 1 << 5 // PFCTRL periph is flow controller
-            | 1 << 0 // EN
+        uint32_t dma_config =
+            2 << DMA_SxCR_MSIZE_Pos // MSIZE word
+                | 2 << DMA_SxCR_PSIZE_Pos // PSIZE word
+                | write << DMA_SxCR_DIR_Pos // DIR mem-to-periph
+                | 1 << DMA_SxCR_PFCTRL_Pos // PFCTRL periph is flow controller
         ;
+        uint32_t dma_src = (uint32_t)buf;
+        uint32_t dma_dest = (uint32_t)&SDMMC->FIFO;
+        uint32_t dma_len = ((len + block_size - 1) & ~(block_size - 1)) / 4;
+        dma_nohal_init(&dma_SDIO_0, dma_config);
+        dma_nohal_start(&dma_SDIO_0, dma_src, dma_dest, dma_len);
         #else
         SDMMC->IDMABASE0 = (uint32_t)buf;
         SDMMC->IDMACTRL = SDMMC_IDMA_IDMAEN;
@@ -456,6 +451,9 @@ int sdio_transfer_cmd53(bool write, uint32_t block_size, uint32_t arg, size_t le
             #else
             printf("sdio_transfer_cmd53: timeout wr=%d len=%u dma=%u buf_idx=%u STA=%08x SDMMC=%08x:%08x IDMA=%08x\n", write, (uint)len, (uint)dma, sdmmc_buf_cur - buf, (uint)SDMMC->STA, (uint)SDMMC->DCOUNT, (uint)SDMMC->DCTRL, (uint)SDMMC->IDMACTRL);
             #endif
+            if (sdmmc_dma) {
+                dma_nohal_deinit(&dma_SDIO_0);
+            }
             return -MP_ETIMEDOUT;
         }
     }
@@ -468,6 +466,9 @@ int sdio_transfer_cmd53(bool write, uint32_t block_size, uint32_t arg, size_t le
         #else
         printf("sdio_transfer_cmd53: error=%08lx wr=%d len=%u dma=%u buf_idx=%u STA=%08x SDMMC=%08x:%08x IDMA=%08x\n", sdmmc_error, write, (uint)len, (uint)dma, sdmmc_buf_cur - buf, (uint)SDMMC->STA, (uint)SDMMC->DCOUNT, (uint)SDMMC->DCTRL, (uint)SDMMC->IDMACTRL);
         #endif
+        if (sdmmc_dma) {
+            dma_nohal_deinit(&dma_SDIO_0);
+        }
         return -(0x1000000 | sdmmc_error);
     }
 
@@ -476,6 +477,8 @@ int sdio_transfer_cmd53(bool write, uint32_t block_size, uint32_t arg, size_t le
             printf("sdio_transfer_cmd53: didn't transfer correct length: cur=%p top=%p\n", sdmmc_buf_cur, sdmmc_buf_top);
             return -MP_EIO;
         }
+    } else {
+        dma_nohal_deinit(&dma_SDIO_0);
     }
 
     return 0;

From 748339b28126e69fd2dc2778b2a182901d0a4693 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 18 May 2021 22:17:45 +1000
Subject: [PATCH 0883/3533] stm32/uart: Configure pull-up only on RX and CTS,
 not TX and RTS.

RX and CTS are the input pins and pull-ups are enabled so they don't cause
a problem if left unconnected.  But the output pins don't need a pull up
(they were originally all configured with pull up in commit
8f7491a109a555ca897ae49efe98f4cc2b080311).

If needed, the pull-ups can be disabled in Python using machine.Pin after
the UART is constructed.

See issue #4369.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/uart.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ports/stm32/uart.c b/ports/stm32/uart.c
index a2b69967b6e41..9f74416170f86 100644
--- a/ports/stm32/uart.c
+++ b/ports/stm32/uart.c
@@ -474,10 +474,11 @@ bool uart_init(pyb_uart_obj_t *uart_obj,
     }
 
     uint32_t mode = MP_HAL_PIN_MODE_ALT;
-    uint32_t pull = MP_HAL_PIN_PULL_UP;
 
     for (uint i = 0; i < 4; i++) {
         if (pins[i] != NULL) {
+            // Configure pull-up on RX and CTS (the input pins).
+            uint32_t pull = (i & 1) ? MP_HAL_PIN_PULL_UP : MP_HAL_PIN_PULL_NONE;
             bool ret = mp_hal_pin_config_alt(pins[i], mode, pull, uart_fn, uart_unit);
             if (!ret) {
                 return false;

From ea81bcf1c0ddeb8be34192cbededecfa425c039b Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 17 May 2021 23:57:45 +1000
Subject: [PATCH 0884/3533] stm32/mboot: Leave bootloader from thread mode, not
 from IRQ.

Leaving the bootloader from an IRQ (eg USB or I2C IRQ) will not work if
MBOOT_LEAVE_BOOTLOADER_VIA_RESET is disabled, ie if mboot jumps directly to
the application.  This is because the CPU will still be in IRQ state when
the application starts and IRQs of lower priority will be blocked.

Fix this by setting a flag when the bootloader should finish, and exit the
bootloader always from the main (top level) thread.

This also improves the USB behaviour of mboot: it no longer abruptly
disconnects when the manifest command is sent.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/mboot/dfu.h  |  2 ++
 ports/stm32/mboot/main.c | 33 ++++++++++++++++-----------------
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/ports/stm32/mboot/dfu.h b/ports/stm32/mboot/dfu.h
index 73db3545d8d55..e867a3e22d0c6 100644
--- a/ports/stm32/mboot/dfu.h
+++ b/ports/stm32/mboot/dfu.h
@@ -26,6 +26,7 @@
 #ifndef MICROPY_INCLUDED_STM32_MBOOT_DFU_H
 #define MICROPY_INCLUDED_STM32_MBOOT_DFU_H
 
+#include <stdbool.h>
 #include <stdint.h>
 
 // DFU spec: https://www.usb.org/sites/default/files/DFU_1.1.pdf
@@ -106,6 +107,7 @@ typedef struct _dfu_state_t {
     dfu_cmd_t cmd;
     dfu_status_t status;
     uint8_t error;
+    bool leave_dfu;
     uint16_t wBlockNum;
     uint16_t wLength;
     uint32_t addr;
diff --git a/ports/stm32/mboot/main.c b/ports/stm32/mboot/main.c
index 3a0242a8d6bf0..c1e1d59d235db 100644
--- a/ports/stm32/mboot/main.c
+++ b/ports/stm32/mboot/main.c
@@ -106,8 +106,6 @@ static volatile uint32_t systick_ms;
 // Global dfu state
 dfu_context_t dfu_context SECTION_NOZERO_BSS;
 
-static void do_reset(void);
-
 uint32_t get_le32(const uint8_t *b) {
     return b[0] | b[1] << 8 | b[2] << 16 | b[3] << 24;
 }
@@ -771,7 +769,7 @@ void i2c_slave_process_rx_end(i2c_slave_t *i2c) {
         memcpy(buf + 12 + sizeof(MICROPY_HW_MCU_NAME), MICROPY_HW_BOARD_NAME, sizeof(MICROPY_HW_BOARD_NAME) - 1);
         len = 12 + sizeof(MICROPY_HW_MCU_NAME) + sizeof(MICROPY_HW_BOARD_NAME) - 1;
     } else if (buf[0] == I2C_CMD_RESET && len == 0) {
-        do_reset();
+        dfu_context.leave_dfu = true;
     } else if (buf[0] == I2C_CMD_GETLAYOUT && len == 0) {
         len = strlen(FLASH_LAYOUT_STR);
         memcpy(buf, FLASH_LAYOUT_STR, len);
@@ -864,6 +862,7 @@ static void dfu_init(void) {
     dfu_context.cmd = DFU_CMD_NONE;
     dfu_context.status = DFU_STATUS_OK;
     dfu_context.error = 0;
+    dfu_context.leave_dfu = false;
     dfu_context.addr = 0x08000000;
 }
 
@@ -931,7 +930,8 @@ static void dfu_handle_rx(int cmd, int arg, int len, const void *buf) {
 
 static void dfu_process(void) {
     if (dfu_context.state == DFU_STATE_MANIFEST) {
-        do_reset();
+        // Set a flag to leave DFU mode from the main thread (here we are in an IRQ handler).
+        dfu_context.leave_dfu = true;
     }
 
     if (dfu_context.state == DFU_STATE_BUSY) {
@@ -1412,17 +1412,6 @@ static void leave_bootloader(void) {
     NVIC_SystemReset();
 }
 
-static void do_reset(void) {
-    led_state_all(0);
-    mp_hal_delay_ms(50);
-    pyb_usbdd_shutdown();
-    #if defined(MBOOT_I2C_SCL)
-    i2c_slave_shutdown(MBOOT_I2Cx, I2Cx_EV_IRQn);
-    #endif
-    mp_hal_delay_ms(50);
-    leave_bootloader();
-}
-
 extern PCD_HandleTypeDef pcd_fs_handle;
 extern PCD_HandleTypeDef pcd_hs_handle;
 
@@ -1561,7 +1550,7 @@ void stm32_main(int initial_r0) {
     #if MBOOT_USB_RESET_ON_DISCONNECT
     bool has_connected = false;
     #endif
-    for (;;) {
+    while (!dfu_context.leave_dfu) {
         #if USE_USB_POLLING
         #if MBOOT_USB_AUTODETECT_PORT || MICROPY_HW_USB_MAIN_DEV == USB_PHY_FS_ID
         if (USB_OTG_FS->GINTSTS & USB_OTG_FS->GINTMSK) {
@@ -1585,10 +1574,20 @@ void stm32_main(int initial_r0) {
             has_connected = true;
         }
         if (has_connected && pyb_usbdd.hUSBDDevice.dev_state == USBD_STATE_SUSPENDED) {
-            do_reset();
+            break;
         }
         #endif
     }
+
+    // Shutdown and leave the bootloader.
+    led_state_all(0);
+    mp_hal_delay_ms(50);
+    pyb_usbdd_shutdown();
+    #if defined(MBOOT_I2C_SCL)
+    i2c_slave_shutdown(MBOOT_I2Cx, I2Cx_EV_IRQn);
+    #endif
+    mp_hal_delay_ms(50);
+    leave_bootloader();
 }
 
 void NMI_Handler(void) {

From 247d7e2e8e7ec262a141b0fc4190a94cce8103ef Mon Sep 17 00:00:00 2001
From: Tobias Thyrrestrup <tt@LEGO.com>
Date: Tue, 18 May 2021 15:38:49 +0200
Subject: [PATCH 0885/3533] tools/pydfu.py: Remove default VID/PID values.

As the new default behaviour, this allows PyDFU to be used with all
devices, not just the ones matching a specific set of VID/PID values.  But
it's still possible to specify VID/PID if needed to narrow down the
selection of the USB device.

Signed-off-by: Tobias Thyrrestrup <tt@LEGO.com>
---
 tools/pydfu.py | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/tools/pydfu.py b/tools/pydfu.py
index 42b4fa2da6feb..ea658d300bf38 100755
--- a/tools/pydfu.py
+++ b/tools/pydfu.py
@@ -23,10 +23,6 @@
 import usb.util
 import zlib
 
-# VID/PID
-__VID = 0x0483
-__PID = 0xDF11
-
 # USB request __TIMEOUT
 __TIMEOUT = 4000
 
@@ -112,10 +108,10 @@ def find_dfu_cfg_descr(descr):
     return None
 
 
-def init():
+def init(**kwargs):
     """Initializes the found DFU device so that we can program it."""
     global __dev, __cfg_descr
-    devices = get_dfu_devices(idVendor=__VID, idProduct=__PID)
+    devices = get_dfu_devices(**kwargs)
     if not devices:
         raise ValueError("No DFU device found")
     if len(devices) > 1:
@@ -565,15 +561,13 @@ def cli_progress(addr, offset, size):
 def main():
     """Test program for verifying this files functionality."""
     global __verbose
-    global __VID
-    global __PID
     # Parse CMD args
     parser = argparse.ArgumentParser(description="DFU Python Util")
     parser.add_argument(
         "-l", "--list", help="list available DFU devices", action="store_true", default=False
     )
-    parser.add_argument("--vid", help="USB Vendor ID", type=lambda x: int(x, 0), default=__VID)
-    parser.add_argument("--pid", help="USB Product ID", type=lambda x: int(x, 0), default=__PID)
+    parser.add_argument("--vid", help="USB Vendor ID", type=lambda x: int(x, 0), default=None)
+    parser.add_argument("--pid", help="USB Product ID", type=lambda x: int(x, 0), default=None)
     parser.add_argument(
         "-m", "--mass-erase", help="mass erase device", action="store_true", default=False
     )
@@ -588,14 +582,18 @@ def main():
 
     __verbose = args.verbose
 
-    __VID = args.vid
-    __PID = args.pid
+    kwargs = {}
+    if args.vid:
+        kwargs["idVendor"] = args.vid
+
+    if args.pid:
+        kwargs["idProduct"] = args.pid
 
     if args.list:
-        list_dfu_devices(idVendor=__VID, idProduct=__PID)
+        list_dfu_devices(**kwargs)
         return
 
-    init()
+    init(**kwargs)
 
     command_run = False
     if args.mass_erase:

From a7a9f2fe897d2c4e3c18618c996460224df08114 Mon Sep 17 00:00:00 2001
From: Maureen Helm <maureen.helm@nxp.com>
Date: Thu, 20 May 2021 22:12:35 -0500
Subject: [PATCH 0886/3533] tools/ci.sh: Update zephyr docker image to v0.17.3.

Updates the zephyr docker image and SDK to the latest versions.

Signed-off-by: Maureen Helm <maureen.helm@nxp.com>
---
 tools/ci.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/ci.sh b/tools/ci.sh
index 33cf364ddd22d..57421ae242bcd 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -479,14 +479,14 @@ function ci_windows_build {
 # ports/zephyr
 
 function ci_zephyr_setup {
-    docker pull zephyrprojectrtos/ci:v0.11.13
+    docker pull zephyrprojectrtos/ci:v0.17.3
     docker run --name zephyr-ci -d -it \
       -v "$(pwd)":/micropython \
-      -e ZEPHYR_SDK_INSTALL_DIR=/opt/sdk/zephyr-sdk-0.12.2 \
+      -e ZEPHYR_SDK_INSTALL_DIR=/opt/toolchains/zephyr-sdk-0.12.4 \
       -e ZEPHYR_TOOLCHAIN_VARIANT=zephyr \
       -e ZEPHYR_BASE=/zephyrproject/zephyr \
       -w /micropython/ports/zephyr \
-      zephyrprojectrtos/ci:v0.11.13
+      zephyrprojectrtos/ci:v0.17.3
     docker ps -a
 }
 

From e61ac453dcabaeca2406f1fb6ef113522f341aa2 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sat, 22 May 2021 22:09:25 +1000
Subject: [PATCH 0887/3533] py/mkrules.cmake: Add MPY_LIB_DIR and BOARD_DIR to
 makemanifest call.

So that the FROZEN_MANIFEST option in cmake works the same as make.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/mkrules.cmake | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/py/mkrules.cmake b/py/mkrules.cmake
index f20240c62b299..7589255b2039a 100644
--- a/py/mkrules.cmake
+++ b/py/mkrules.cmake
@@ -125,9 +125,13 @@ if(MICROPY_FROZEN_MANIFEST)
         MICROPY_MODULE_FROZEN_MPY=\(1\)
     )
 
+    if(NOT MICROPY_LIB_DIR)
+        set(MICROPY_LIB_DIR ${MICROPY_DIR}/../micropython-lib)
+    endif()
+
     add_custom_command(
         OUTPUT ${MICROPY_FROZEN_CONTENT}
-        COMMAND ${Python3_EXECUTABLE} ${MICROPY_DIR}/tools/makemanifest.py -o ${MICROPY_FROZEN_CONTENT} -v "MPY_DIR=${MICROPY_DIR}" -v "PORT_DIR=${MICROPY_PORT_DIR}" -b "${CMAKE_BINARY_DIR}" -f${MICROPY_CROSS_FLAGS} ${MICROPY_FROZEN_MANIFEST}
+        COMMAND ${Python3_EXECUTABLE} ${MICROPY_DIR}/tools/makemanifest.py -o ${MICROPY_FROZEN_CONTENT} -v "MPY_DIR=${MICROPY_DIR}" -v "MPY_LIB_DIR=${MICROPY_LIB_DIR}" -v "PORT_DIR=${MICROPY_PORT_DIR}" -v "BOARD_DIR=${MICROPY_BOARD_DIR}" -b "${CMAKE_BINARY_DIR}" -f${MICROPY_CROSS_FLAGS} ${MICROPY_FROZEN_MANIFEST}
         DEPENDS MICROPY_FORCE_BUILD
             ${MICROPY_QSTRDEFS_GENERATED}
         VERBATIM

From 3b950ed2959c603ff30dd6052c157e7981c4d2d6 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sat, 22 May 2021 22:10:09 +1000
Subject: [PATCH 0888/3533] tools/ci.sh: Use FROZEN_MANIFEST in an esp32 build
 to test feature.

This tests that FROZEN_MANIFEST works with cmake (on esp32 at least).

Signed-off-by: Damien George <damien@micropython.org>
---
 tools/ci.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/ci.sh b/tools/ci.sh
index 57421ae242bcd..7b38ce0df04fc 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -109,7 +109,7 @@ function ci_esp32_build {
     make ${MAKEOPTS} -C ports/esp32 submodules
     make ${MAKEOPTS} -C ports/esp32
     make ${MAKEOPTS} -C ports/esp32 clean
-    make ${MAKEOPTS} -C ports/esp32 USER_C_MODULES=../../../examples/usercmodule/micropython.cmake
+    make ${MAKEOPTS} -C ports/esp32 USER_C_MODULES=../../../examples/usercmodule/micropython.cmake FROZEN_MANIFEST=$(pwd)/ports/esp32/boards/manifest.py
     if [ -d $IDF_PATH/components/esp32s2 ]; then
         make ${MAKEOPTS} -C ports/esp32 BOARD=GENERIC_S2
     fi

From 0aa01b0205adc7544315fed602029e792a235b2e Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 25 May 2021 00:04:01 +1000
Subject: [PATCH 0889/3533] lib/mbedtls: Switch to currently latest commit of
 LTS branch v2.16.

Signed-off-by: Damien George <damien@micropython.org>
---
 lib/mbedtls | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/mbedtls b/lib/mbedtls
index 1b6a24f759cef..1bc2c9cb8b8fe 160000
--- a/lib/mbedtls
+++ b/lib/mbedtls
@@ -1 +1 @@
-Subproject commit 1b6a24f759cefbb4a69ae9476885d7f42a847e3d
+Subproject commit 1bc2c9cb8b8fe4659bd94b8ebba5a4c02029b7fa

From ff5d39529c3bf331dd8171aaa24937b2650f40fd Mon Sep 17 00:00:00 2001
From: Philipp Ebensberger <philipp.ebensberger@3bricks-software.de>
Date: Fri, 21 Aug 2020 16:03:21 +0200
Subject: [PATCH 0890/3533] mimxrt: Implement machine.Pin class.

- modified pin type from pin_obj_t to machine_pin_obj_t
- created machine_pin.c
- implemented basic version of make-pins.py to genertate pins.c/.h files
  automatically; the only alternate function currently supported is GPIO
- added af.csv files for all supported MCUs
- replaced pins.c/pins.h files with pin.csv for all boards
- implemented on/off/high/low/value/init methods
- Implemented IN/OUT/OPEN_DRAIN modes
- modified LDFLAGS for DEBUG build to get usefull .elf file for debugging

Signed-off-by: Philipp Ebensberger
---
 ports/mimxrt/Makefile                         |  41 ++-
 ports/mimxrt/README.md                        |   5 +-
 ports/mimxrt/board_init.c                     |   2 -
 .../boards/MIMXRT1010_EVK/mpconfigboard.h     |   2 +-
 .../boards/MIMXRT1010_EVK/mpconfigboard.mk    |  19 ++
 ports/mimxrt/boards/MIMXRT1010_EVK/pins.c     |  33 ---
 ports/mimxrt/boards/MIMXRT1010_EVK/pins.csv   |  57 ++++
 ports/mimxrt/boards/MIMXRT1010_EVK/pins.h     |  30 --
 ports/mimxrt/boards/MIMXRT1011.ld             |   2 +-
 ports/mimxrt/boards/MIMXRT1011_af.csv         |  44 +++
 .../boards/MIMXRT1020_EVK/mpconfigboard.h     |   3 +-
 .../boards/MIMXRT1020_EVK/mpconfigboard.mk    |  18 ++
 ports/mimxrt/boards/MIMXRT1020_EVK/pins.c     |  33 ---
 ports/mimxrt/boards/MIMXRT1020_EVK/pins.csv   |  33 +++
 ports/mimxrt/boards/MIMXRT1020_EVK/pins.h     |  30 --
 ports/mimxrt/boards/MIMXRT1021_af.csv         |  94 ++++++
 .../boards/MIMXRT1050_EVK/mpconfigboard.h     |   2 +-
 ports/mimxrt/boards/MIMXRT1050_EVK/pins.c     |  33 ---
 ports/mimxrt/boards/MIMXRT1050_EVK/pins.csv   |  51 ++++
 ports/mimxrt/boards/MIMXRT1050_EVK/pins.h     |  30 --
 ports/mimxrt/boards/MIMXRT1052_af.csv         | 125 ++++++++
 .../boards/MIMXRT1060_EVK/mpconfigboard.h     |   2 +-
 .../boards/MIMXRT1060_EVK/mpconfigboard.mk    |  19 ++
 ports/mimxrt/boards/MIMXRT1060_EVK/pins.c     |  33 ---
 ports/mimxrt/boards/MIMXRT1060_EVK/pins.csv   |  51 ++++
 ports/mimxrt/boards/MIMXRT1060_EVK/pins.h     |  30 --
 ports/mimxrt/boards/MIMXRT1062_af.csv         | 125 ++++++++
 .../boards/MIMXRT1064_EVK/mpconfigboard.h     |   2 +-
 ports/mimxrt/boards/MIMXRT1064_EVK/pins.c     |  33 ---
 ports/mimxrt/boards/MIMXRT1064_EVK/pins.csv   |  51 ++++
 ports/mimxrt/boards/MIMXRT1064_EVK/pins.h     |  30 --
 ports/mimxrt/boards/MIMXRT1064_af.csv         | 125 ++++++++
 ports/mimxrt/boards/TEENSY40/mpconfigboard.h  |   2 +-
 ports/mimxrt/boards/TEENSY40/pins.c           |  33 ---
 ports/mimxrt/boards/TEENSY40/pins.csv         |  55 ++++
 ports/mimxrt/boards/TEENSY40/pins.h           |  30 --
 ports/mimxrt/boards/make-pins.py              | 259 +++++++++++++++++
 ports/mimxrt/boards/mimxrt_prefix.c           |  26 ++
 ports/mimxrt/led.c                            |   6 +-
 ports/mimxrt/led.h                            |   2 +-
 ports/mimxrt/machine_pin.c                    | 273 ++++++++++++++++++
 ports/mimxrt/modmachine.c                     |   2 +
 ports/mimxrt/mphalport.h                      |   4 +
 ports/mimxrt/pin.c                            | 106 ++++++-
 ports/mimxrt/pin.h                            | 112 ++++---
 ports/mimxrt/tusb_port.c                      |   2 +-
 46 files changed, 1662 insertions(+), 438 deletions(-)
 delete mode 100644 ports/mimxrt/boards/MIMXRT1010_EVK/pins.c
 create mode 100644 ports/mimxrt/boards/MIMXRT1010_EVK/pins.csv
 delete mode 100644 ports/mimxrt/boards/MIMXRT1010_EVK/pins.h
 create mode 100644 ports/mimxrt/boards/MIMXRT1011_af.csv
 delete mode 100644 ports/mimxrt/boards/MIMXRT1020_EVK/pins.c
 create mode 100644 ports/mimxrt/boards/MIMXRT1020_EVK/pins.csv
 delete mode 100644 ports/mimxrt/boards/MIMXRT1020_EVK/pins.h
 create mode 100644 ports/mimxrt/boards/MIMXRT1021_af.csv
 delete mode 100644 ports/mimxrt/boards/MIMXRT1050_EVK/pins.c
 create mode 100644 ports/mimxrt/boards/MIMXRT1050_EVK/pins.csv
 delete mode 100644 ports/mimxrt/boards/MIMXRT1050_EVK/pins.h
 create mode 100644 ports/mimxrt/boards/MIMXRT1052_af.csv
 delete mode 100644 ports/mimxrt/boards/MIMXRT1060_EVK/pins.c
 create mode 100644 ports/mimxrt/boards/MIMXRT1060_EVK/pins.csv
 delete mode 100644 ports/mimxrt/boards/MIMXRT1060_EVK/pins.h
 create mode 100644 ports/mimxrt/boards/MIMXRT1062_af.csv
 delete mode 100644 ports/mimxrt/boards/MIMXRT1064_EVK/pins.c
 create mode 100644 ports/mimxrt/boards/MIMXRT1064_EVK/pins.csv
 delete mode 100644 ports/mimxrt/boards/MIMXRT1064_EVK/pins.h
 create mode 100644 ports/mimxrt/boards/MIMXRT1064_af.csv
 delete mode 100644 ports/mimxrt/boards/TEENSY40/pins.c
 create mode 100644 ports/mimxrt/boards/TEENSY40/pins.csv
 delete mode 100644 ports/mimxrt/boards/TEENSY40/pins.h
 create mode 100644 ports/mimxrt/boards/make-pins.py
 create mode 100644 ports/mimxrt/boards/mimxrt_prefix.c
 create mode 100644 ports/mimxrt/machine_pin.c

diff --git a/ports/mimxrt/Makefile b/ports/mimxrt/Makefile
index 3a001182a036a..0c893f9634a8b 100644
--- a/ports/mimxrt/Makefile
+++ b/ports/mimxrt/Makefile
@@ -23,6 +23,16 @@ GIT_SUBMODULES = lib/tinyusb lib/nxp_driver
 MCU_DIR = lib/nxp_driver/sdk/devices/$(MCU_SERIES)
 LD_FILES = boards/$(MCU_SERIES).ld $(TOP)/$(MCU_DIR)/gcc/$(MCU_SERIES)xxxxx_flexspi_nor.ld
 
+MAKE_PINS = boards/make-pins.py
+BOARD_PINS = $(BOARD_DIR)/pins.csv
+AF_FILE = boards/$(MCU_SERIES)_af.csv
+PREFIX_FILE = boards/mimxrt_prefix.c
+GEN_PINS_SRC = $(BUILD)/pins_gen.c
+GEN_PINS_HDR = $(HEADER_BUILD)/pins.h
+GEN_PINS_QSTR = $(BUILD)/pins_qstr.h
+GEN_PINS_AF_CONST = $(HEADER_BUILD)/pins_af_const.h
+GEN_PINS_AF_PY = $(BUILD)/pins_af.py
+
 # mcu driver cause following warnings
 #CFLAGS += -Wno-error=float-equal -Wno-error=nested-externs
 CFLAGS += -Wno-error=unused-parameter
@@ -49,12 +59,14 @@ CFLAGS += -DXIP_EXTERNAL_FLASH=1 \
 	-D__START=main \
 	-DCPU_HEADER_H='<$(MCU_SERIES).h>'
 
-LDFLAGS = $(addprefix -T,$(LD_FILES)) -Map=$@.map --cref
+LDFLAGS = $(addprefix -T,$(LD_FILES)) -Map=$@.map --cref --print-memory-usage
 LIBS = $(shell $(CC) $(CFLAGS) -print-libgcc-file-name)
 
 # Tune for Debugging or Optimization
 ifeq ($(DEBUG),1)
 CFLAGS += -O0 -ggdb
+LDFLAGS += --gc-sections
+CFLAGS += -fdata-sections -ffunction-sections
 else
 CFLAGS += -Os -DNDEBUG
 LDFLAGS += --gc-sections
@@ -95,8 +107,8 @@ SRC_C = \
 	tusb_port.c \
 	board_init.c \
 	$(BOARD_DIR)/flash_config.c \
-	$(BOARD_DIR)/pins.c \
 	machine_led.c \
+	machine_pin.c \
 	modutime.c \
 	modmachine.c \
 	mphalport.c \
@@ -116,15 +128,17 @@ SRC_S = lib/utils/gchelper_m3.s \
 # List of sources for qstr extraction
 SRC_QSTR += \
 	machine_led.c \
+	machine_pin.c \
 	modutime.c \
 	modmachine.c \
 	pin.c \
-	$(BOARD_DIR)/pins.c \
+	$(GEN_PINS_SRC) \
 
 OBJ += $(PY_O)
 OBJ += $(addprefix $(BUILD)/, $(SRC_C:.c=.o))
 OBJ += $(addprefix $(BUILD)/, $(SRC_S:.s=.o))
 OBJ += $(addprefix $(BUILD)/, $(SRC_SS:.S=.o))
+OBJ += $(BUILD)/pins_gen.o
 
 # Workaround for bug in older gcc, warning on "static usbd_device_t _usbd_dev = { 0 };"
 $(BUILD)/lib/tinyusb/src/device/usbd.o: CFLAGS += -Wno-missing-braces
@@ -142,4 +156,25 @@ $(BUILD)/firmware.bin: $(BUILD)/firmware.elf
 $(BUILD)/firmware.hex: $(BUILD)/firmware.elf
 	$(Q)$(OBJCOPY) -O ihex -R .eeprom $< $@
 
+# Making OBJ use an order-only depenedency on the generated pins.h file
+# has the side effect of making the pins.h file before we actually compile
+# any of the objects. The normal dependency generation will deal with the
+# case when pins.h is modified. But when it doesn't exist, we don't know
+# which source files might need it.
+$(OBJ): | $(GEN_PINS_HDR)
+
+# With conditional pins, we may need to regenerate qstrdefs.h when config
+# options change.
+$(HEADER_BUILD)/qstrdefs.generated.h: $(BOARD_DIR)/mpconfigboard.h
+
+# Use a pattern rule here so that make will only call make-pins.py once to make
+# both pins_gen.c and pins.h
+$(BUILD)/%_gen.c $(HEADER_BUILD)/%.h: $(BOARD_PINS) $(MAKE_PINS) $(AF_FILE) $(PREFIX_FILE) | $(HEADER_BUILD)
+	$(ECHO) "Create $@"
+	$(Q)$(PYTHON) $(MAKE_PINS) --board $(BOARD_PINS) --af $(AF_FILE)\
+		--prefix $(PREFIX_FILE) --hdr $(GEN_PINS_HDR) > $(GEN_PINS_SRC)
+
+$(BUILD)/pins_gen.o: $(BUILD)/pins_gen.c
+	$(call compile_c)
+
 include $(TOP)/py/mkrules.mk
diff --git a/ports/mimxrt/README.md b/ports/mimxrt/README.md
index a2b5cf79a16ae..c24939f478791 100644
--- a/ports/mimxrt/README.md
+++ b/ports/mimxrt/README.md
@@ -5,10 +5,13 @@ Currently supports Teensy 4.0 and the i.MX RT1010 EVK board.
 
 Features:
   - REPL over USB VCP
+  - machine.Pin
 
 Known issues:
   - pyboard.py doesn't work with files larger than 64 bytes
+  - machine.Pin class currently does not support GPIOMUX option of
+    i.MX RT101x variants
 
 TODO:
   - Enable TCM
-  - Peripherals (pins, LED, Timers, etc)
+  - Peripherals (LED, Timers, etc)
diff --git a/ports/mimxrt/board_init.c b/ports/mimxrt/board_init.c
index 9095c880482d3..0336cdf6865d3 100644
--- a/ports/mimxrt/board_init.c
+++ b/ports/mimxrt/board_init.c
@@ -39,8 +39,6 @@
 
 #include "clock_config.h"
 
-#define LED_STATE_ON (0)
-
 volatile uint32_t systick_ms = 0;
 
 const uint8_t dcd_data[] = { 0x00 };
diff --git a/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.h b/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.h
index eeddd0e0213fb..5a89423b50e35 100644
--- a/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.h
+++ b/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.h
@@ -4,6 +4,6 @@
 #define BOARD_FLASH_SIZE (16 * 1024 * 1024)
 
 // i.MX RT1010 EVK has 1 board LED
-#define MICROPY_HW_LED1_PIN (GPIO_11)
+#define MICROPY_HW_LED1_PIN (pin_GPIO_11)
 #define MICROPY_HW_LED_ON(pin) (mp_hal_pin_high(pin))
 #define MICROPY_HW_LED_OFF(pin) (mp_hal_pin_low(pin))
diff --git a/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.mk b/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.mk
index e178545845b2d..c5b5055324b17 100644
--- a/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.mk
+++ b/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.mk
@@ -2,6 +2,25 @@ MCU_SERIES = MIMXRT1011
 MCU_VARIANT = MIMXRT1011DAE5A
 
 JLINK_PATH = /media/RT1010-EVK/
+JLINK_COMMANDER_SCRIPT = $(BUILD)/script.jlink
+
+
+ifdef JLINK_IP
+JLINK_CONNECTION_SETTINGS = -IP $(JLINK_IP)
+else
+JLINK_CONNECTION_SETTINGS = -USB
+endif
+
+
+deploy_jlink: $(BUILD)/firmware.hex
+	$(Q)$(TOUCH) $(JLINK_COMMANDER_SCRIPT)
+	$(ECHO) "ExitOnError 1" > $(JLINK_COMMANDER_SCRIPT)
+	$(ECHO) "speed auto" >> $(JLINK_COMMANDER_SCRIPT)
+	$(ECHO) "r" >> $(JLINK_COMMANDER_SCRIPT)
+	$(ECHO) "st" >> $(JLINK_COMMANDER_SCRIPT)
+	$(ECHO) "loadfile \"$(realpath $(BUILD)/firmware.hex)\"" >> $(JLINK_COMMANDER_SCRIPT)
+	$(ECHO) "qc" >> $(JLINK_COMMANDER_SCRIPT)
+	$(JLINK_PATH)JLinkExe -device $(MCU_VARIANT) -if SWD $(JLINK_CONNECTION_SETTINGS) -CommanderScript $(JLINK_COMMANDER_SCRIPT)
 
 deploy: $(BUILD)/firmware.bin
 	cp $< $(JLINK_PATH)
diff --git a/ports/mimxrt/boards/MIMXRT1010_EVK/pins.c b/ports/mimxrt/boards/MIMXRT1010_EVK/pins.c
deleted file mode 100644
index e0397e09edb21..0000000000000
--- a/ports/mimxrt/boards/MIMXRT1010_EVK/pins.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2020 Philipp Ebensberger
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#include "pin.h"
-
-static pin_af_obj_t GPIO_11_af[] = {
-    PIN_AF(GPIOMUX_IO11, PIN_AF_MODE_ALT5, GPIO1, 0x10B0U),
-};
-
-pin_obj_t GPIO_11 = PIN(GPIO_11, GPIO1, 5, GPIO_11_af);
diff --git a/ports/mimxrt/boards/MIMXRT1010_EVK/pins.csv b/ports/mimxrt/boards/MIMXRT1010_EVK/pins.csv
new file mode 100644
index 0000000000000..f7fdf39643eab
--- /dev/null
+++ b/ports/mimxrt/boards/MIMXRT1010_EVK/pins.csv
@@ -0,0 +1,57 @@
+D0,GPIO_09
+D1,GPIO_10
+D2,GPIO_AD_05
+D3,GPIO_AD_06
+D4,GPIO_08
+D5,GPIO_01
+D6,GPIO_AD_01
+D7,GPIO_AD_02
+D8,GPIO_SD_02
+D9,GPIO_03
+D10,GPIO_AD_05
+D11,GPIO_AD_04
+D12,GPIO_AD_03
+D13,GPIO_AD_06
+D14,GPIO_01
+D15,GPIO_02
+CUR_A,GPIO_AD_01
+CUR_B,GPIO_AD_02
+CUR_C,GPIO_AD_07
+VOLT_DCB,GPIO_AD_09
+CUR_DCB,GPIO_AD_10
+A0,GPIO_AD_07
+A1,GPIO_AD_09
+A2,GPIO_AD_10
+A3,GPIO_AD_14
+A4,GPIO_AD_01
+A5,GPIO_AD_02
+PWM_AT,GPIO_02
+PWM_AB,GPIO_01
+PWM_BT,GPIO_04
+PWM_BB,GPIO_03
+PWM_CT,GPIO_06
+PWM_CB,GPIO_05
+ENC_A,GPIO_AD_05
+ENC_B,GPIO_AD_06
+LED_GREEN,GPIO_11
+GPIO_01,GPIO_01
+GPIO_02,GPIO_02
+GPIO_03,GPIO_03
+GPIO_04,GPIO_04
+GPIO_05,GPIO_05
+GPIO_06,GPIO_06
+GPIO_08,GPIO_08
+GPIO_09,GPIO_09
+GPIO_10,GPIO_10
+GPIO_11,GPIO_11
+GPIO_AD_01,GPIO_AD_01
+GPIO_AD_02,GPIO_AD_02
+GPIO_AD_03,GPIO_AD_03
+GPIO_AD_04,GPIO_AD_04
+GPIO_AD_05,GPIO_AD_05
+GPIO_AD_06,GPIO_AD_06
+GPIO_AD_07,GPIO_AD_07
+GPIO_AD_09,GPIO_AD_09
+GPIO_AD_10,GPIO_AD_10
+GPIO_AD_14,GPIO_AD_14
+GPIO_SD_02,GPIO_SD_02
diff --git a/ports/mimxrt/boards/MIMXRT1010_EVK/pins.h b/ports/mimxrt/boards/MIMXRT1010_EVK/pins.h
deleted file mode 100644
index 99534932a19d5..0000000000000
--- a/ports/mimxrt/boards/MIMXRT1010_EVK/pins.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2020 Philipp Ebensberger
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-// NOTE: pins.h shall only be included in in pin.h
-// hence no include guards are needed since they will be provided by pin.h
-
-extern pin_obj_t GPIO_11;
diff --git a/ports/mimxrt/boards/MIMXRT1011.ld b/ports/mimxrt/boards/MIMXRT1011.ld
index 0512c48a7f2d9..9db30adee8a46 100644
--- a/ports/mimxrt/boards/MIMXRT1011.ld
+++ b/ports/mimxrt/boards/MIMXRT1011.ld
@@ -1,5 +1,5 @@
 /* 24kiB stack. */
-__stack_size__ = 0x6000;
+__stack_size__ = 0x4000;
 _estack = __StackTop;
 _sstack = __StackLimit;
 
diff --git a/ports/mimxrt/boards/MIMXRT1011_af.csv b/ports/mimxrt/boards/MIMXRT1011_af.csv
new file mode 100644
index 0000000000000..11dd08546332b
--- /dev/null
+++ b/ports/mimxrt/boards/MIMXRT1011_af.csv
@@ -0,0 +1,44 @@
+Pad,ALT0, ALT1, ALT2, ALT3, ALT4, ALT5, ALT6, ALT7, ALT8, ALT9,ADC,ACMP,Default
+GPIO_00,FLEXSPI_B_DQS,SAI3_MCLK,LPSPI2_PCS3,LPSPI1_PCS3,PIT_TRIGGER0,GPIO1_IO00,,,,,,,ALT5
+GPIO_01,SAI1_RX_BCLK,WDOG1_ANY,FLEXPWM1_PWM0_B,LPI2C1_SDA,KPP_ROW3,GPIO1_IO01,,,,,,,ALT5
+GPIO_02,SAI1_RX_SYNC,WDOG2_B,FLEXPWM1_PWM0_A,LPI2C1_SCL,KPP_COL3,GPIO1_IO02,,,,,,,ALT5
+GPIO_03,SAI1_RX_DATA0,GPT1_COMPARE3,FLEXPWM1_PWM1_B,,SPDIF_SR_CLK,GPIO1_IO03,,,,,,,ALT5
+GPIO_04,SAI1_TX_DATA0,GPT1_CAPTURE2,FLEXPWM1_PWM1_A,,SPDIF_IN,GPIO1_IO04,,,,,,,ALT5
+GPIO_05,SAI1_TX_DATA1,GPT1_COMPARE2,FLEXPWM1_PWM2_B,LPUART4_RXD,SPDIF_OUT,GPIO1_IO05,,,,,,,ALT0
+GPIO_06,SAI1_TX_BCLK,GPT1_CAPTURE1,FLEXPWM1_PWM2_A,LPUART4_TXD,SPDIF_EXT_CLK,GPIO1_IO06,,,,,,,ALT5
+GPIO_07,SAI1_TX_SYNC,GPT1_COMPARE1,FLEXPWM1_PWM3_B,LPUART3_RXD,SPDIF_LOCK,GPIO1_IO07,LPUART1_RTS_B,,,,,,ALT5
+GPIO_08,SAI1_MCLK,GPT1_CLK,FLEXPWM1_PWM3_A,LPUART3_TXD,FLEXIO1_IO00,GPIO1_IO08,LPUART1_CTS_B,,,,,,ALT5
+GPIO_09,LPUART1_RXD,WDOG1_B,FLEXSPI_A_SS1_B,LPI2C2_SDA,FLEXIO1_IO01,GPIO1_IO09,SPDIF_SR_CLK,,,,,,ALT5
+GPIO_10,LPUART1_TXD,LPI2C1_HREQ,EWM_OUT_B,LPI2C2_SCL,FLEXIO1_IO02,GPIO1_IO10,SPDIF_IN,,,,,,ALT5
+GPIO_11,LPUART3_RXD,LPI2C1_SDA,KPP_ROW0,FLEXSPI_B_SS1_B,FLEXIO1_IO03,GPIO1_IO11,SPDIF_OUT,ARM_TRACE3,,,,,ALT5
+GPIO_12,LPUART3_TXD,LPI2C1_SCL,KPP_COL0,USB_OTG1_OC,FLEXIO1_IO04,GPIO1_IO12,SPDIF_EXT_CLK,ARM_TRACE2,,,,,ALT5
+GPIO_13,LPUART2_RXD,LPSPI2_PCS2,KPP_ROW3,USB_OTG1_ID,FLEXIO1_IO05,GPIO1_IO13,SPDIF_LOCK,ARM_TRACE1,,,,,ALT5
+GPIO_AD_00,LPUART2_TXD,LPSPI1_PCS2,KPP_COL3,USB_OTG1_PWR,FLEXIO1_IO20,GPIO1_IO14,ARM_NMI,ARM_TRACE0,,,ADC1_IN0,,ALT5
+GPIO_AD_01,LPUART4_RXD,LPSPI2_PCS1,WDOG1_ANY,LPI2C2_SDA,MQS_LEFT,GPIO1_IO15,USB_OTG1_OC,ARM_TRACE_SWO,,,ADC1_IN1,,ALT5
+GPIO_AD_02,LPUART4_TXD,LPSPI1_PCS1,WDOG2_B,LPI2C2_SCL,MQS_RIGHT,GPIO1_IO16,,ARM_TRACE_CLK,,,ADC1_IN2,,ALT5
+GPIO_AD_03,LPSPI1_SDI,PIT_TRIGGER3,FLEXPWM1_PWM2_B,KPP_ROW2,GPT2_CLK,GPIO1_IO17,SNVS_VIO_5_B,JTAG_DE_B,,,ADC1_IN3,,ALT5
+GPIO_AD_04,LPSPI1_SDO,PIT_TRIGGER2,FLEXPWM1_PWM2_A,KPP_COL2,GPT2_COMPARE1,GPIO1_IO18,SNVS_VIO_5_CTL,,,,ADC1_IN4,,ALT5
+GPIO_AD_05,LPSPI1_PCS0,PIT_TRIGGER1,FLEXPWM1_PWM3_B,KPP_ROW1,GPT2_CAPTURE1,GPIO1_IO19,,,,,ADC1_IN5,,ALT5
+GPIO_AD_06,LPSPI1_SCK,PIT_TRIGGER0,FLEXPWM1_PWM3_A,KPP_COL1,GPT2_COMPARE2,GPIO1_IO20,LPI2C1_HREQ,,,,ADC1_IN6,,ALT5
+GPIO_AD_07,LPI2C2_SDA,LPUART3_RXD,ARM_CM7_RXEV,LPUART2_RTS_B,GPT2_CAPTURE2,GPIO1_IO21,OCOTP_FUSE_LATCHED,XBAR1_INOUT03,,,ADC1_IN7,,ALT5
+GPIO_AD_08,LPI2C2_SCL,LPUART3_TXD,ARM_CM7_TXEV,LPUART2_CTS_B,GPT2_COMPARE3,GPIO1_IO22,EWM_OUT_B,JTAG_TRSTB,,,ADC1_IN8,,ALT7
+GPIO_AD_09,LPSPI2_SDI,FLEXPWM1_PWM3_X,KPP_ROW2,ARM_TRACE_SWO,FLEXIO1_IO21,GPIO1_IO23,REF_CLK_32K,JTAG_TDO,,,ADC1_IN9,,ALT7
+GPIO_AD_10,LPSPI2_SDO,FLEXPWM1_PWM2_X,KPP_COL2,PIT_TRIGGER3,FLEXIO1_IO22,GPIO1_IO24,USB_OTG1_ID,JTAG_TDI,,,ADC1_IN10,,ALT7
+GPIO_AD_11,LPSPI2_PCS0,FLEXPWM1_PWM1_X,KPP_ROW1,PIT_TRIGGER2,FLEXIO1_IO23,GPIO1_IO25,WDOG1_B,JTAG_MOD,,,ADC1_IN11,,ALT7
+GPIO_AD_12,LPSPI2_SCK,FLEXPWM1_PWM0_X,KPP_COL1,PIT_TRIGGER1,FLEXIO1_IO24,GPIO1_IO26,USB_OTG1_PWR,JTAG_TCK,,,ADC1_IN12,,ALT7
+GPIO_AD_13,LPI2C1_SDA,LPUART3_RTS_B,KPP_ROW0,LPUART4_RTS_B,FLEXIO1_IO25,GPIO1_IO27,ARM_NMI,JTAG_TMS,,,ADC1_IN13,,ALT7
+GPIO_AD_14,LPI2C1_SCL,LPUART3_CTS_B,KPP_COL0,LPUART4_CTS_B,FLEXIO1_IO26,GPIO1_IO28,REF_CLK_24M,XBAR1_INOUT02,,,ADC1_IN14,,ALT5
+GPIO_SD_00,FLEXSPI_B_SS0_B,SAI3_TX_SYNC,ARM_CM7_RXEV,CCM_STOP,FLEXIO1_IO06,GPIO2_IO00,SRC_BT_CFG2,,,,,,ALT5
+GPIO_SD_01,FLEXSPI_B_DATA1,SAI3_TX_BCLK,FLEXPWM1_PWM0_B,CCM_CLKO2,FLEXIO1_IO07,GPIO2_IO01,SRC_BT_CFG1,,,,,,ALT5
+GPIO_SD_02,FLEXSPI_B_DATA2,SAI3_TX_DATA,FLEXPWM1_PWM0_A,CCM_CLKO1,FLEXIO1_IO08,GPIO2_IO02,SRC_BT_CFG0,,,,,,ALT5
+GPIO_SD_03,FLEXSPI_B_DATA0,SAI3_RX_DATA,FLEXPWM1_PWM1_B,CCM_REF_EN_B,FLEXIO1_IO09,GPIO2_IO03,SRC_BOOT_MODE1,,,,,,ALT6
+GPIO_SD_04,FLEXSPI_B_DATA3,SAI3_RX_SYNC,FLEXPWM1_PWM1_A,CCM_WAIT,FLEXIO1_IO10,GPIO2_IO04,SRC_BOOT_MODE0,,,,,,ALT6
+GPIO_SD_05,FLEXSPI_A_SS1_B,LPI2C1_SDA,LPSPI1_SDI,,FLEXIO1_IO11,GPIO2_IO05,,,,,,,ALT5
+GPIO_SD_06,FLEXSPI_A_SS0_B,LPI2C1_SCL,LPSPI1_SDO,,FLEXIO1_IO12,GPIO2_IO06,,,,,,,ALT5
+GPIO_SD_07,FLEXSPI_A_DATA1,LPI2C2_SDA,LPSPI1_PCS0,,FLEXIO1_IO13,GPIO2_IO07,,,,,,,ALT5
+GPIO_SD_08,FLEXSPI_A_DATA2,LPI2C2_SCL,LPSPI1_SCK,,FLEXIO1_IO14,GPIO2_IO08,,,,,,,ALT5
+GPIO_SD_09,FLEXSPI_A_DATA0,LPSPI2_SDI,LPUART2_RXD,,FLEXIO1_IO15,GPIO2_IO09,,,,,,,ALT5
+GPIO_SD_10,FLEXSPI_A_SCLK,LPSPI2_SDO,LPUART2_TXD,,FLEXIO1_IO16,GPIO2_IO10,,,,,,,ALT5
+GPIO_SD_11,FLEXSPI_A_DATA3,LPSPI2_SCK,LPUART1_RXD,,FLEXIO1_IO17,GPIO2_IO11,WDOG1_RST_B_DEB,,,,,,ALT5
+GPIO_SD_12,FLEXSPI_A_DQS,LPSPI2_PCS0,LPUART1_TXD,,FLEXIO1_IO18,GPIO2_IO12,WDOG2_RST_B_DEB,,,,,,ALT5
+GPIO_SD_13,FLEXSPI_B_SCLK,SAI3_RX_BCLK,ARM_CM7_TXEV,CCM_PMIC_RDY,FLEXIO1_IO19,GPIO2_IO13,SRC_BT_CFG3,,,,,,ALT5
diff --git a/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.h b/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.h
index 8598f76bf1833..d8c0f00e276e8 100644
--- a/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.h
+++ b/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.h
@@ -4,6 +4,7 @@
 #define BOARD_FLASH_SIZE (8 * 1024 * 1024)
 
 // i.MX RT1020 EVK has 1 board LED
-#define MICROPY_HW_LED1_PIN (GPIO_AD_B0_05)
+// Todo: think about replacing the define with searching in the generated pins?
+#define MICROPY_HW_LED1_PIN (pin_GPIO_AD_B0_05)
 #define MICROPY_HW_LED_ON(pin) (mp_hal_pin_low(pin))
 #define MICROPY_HW_LED_OFF(pin) (mp_hal_pin_high(pin))
diff --git a/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.mk b/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.mk
index f3b1689524e29..0f5bb967af318 100644
--- a/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.mk
+++ b/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.mk
@@ -2,6 +2,24 @@ MCU_SERIES = MIMXRT1021
 MCU_VARIANT = MIMXRT1021DAG5A
 
 JLINK_PATH ?= /media/RT1020-EVK/
+JLINK_COMMANDER_SCRIPT = $(BUILD)/script.jlink
+
+
+ifdef JLINK_IP
+JLINK_CONNECTION_SETTINGS = -IP $(JLINK_IP)
+else
+JLINK_CONNECTION_SETTINGS =
+endif
+
+
+deploy_jlink: $(BUILD)/firmware.hex
+	$(ECHO) "ExitOnError 1" > $(JLINK_COMMANDER_SCRIPT)
+	$(ECHO) "speed auto" >> $(JLINK_COMMANDER_SCRIPT)
+	$(ECHO) "r" >> $(JLINK_COMMANDER_SCRIPT)
+	$(ECHO) "st" >> $(JLINK_COMMANDER_SCRIPT)
+	$(ECHO) "loadfile \"$(realpath $(BUILD)/firmware.hex)\"" >> $(JLINK_COMMANDER_SCRIPT)
+	$(ECHO) "qc" >> $(JLINK_COMMANDER_SCRIPT)
+	$(JLINK_PATH)JLinkExe -device $(MCU_VARIANT) -if SWD $(JLINK_CONNECTION_SETTINGS) -CommanderScript $(JLINK_COMMANDER_SCRIPT)
 
 deploy: $(BUILD)/firmware.bin
 	cp $< $(JLINK_PATH)
diff --git a/ports/mimxrt/boards/MIMXRT1020_EVK/pins.c b/ports/mimxrt/boards/MIMXRT1020_EVK/pins.c
deleted file mode 100644
index 946b6efca8b27..0000000000000
--- a/ports/mimxrt/boards/MIMXRT1020_EVK/pins.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2020 Philipp Ebensberger
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#include "pin.h"
-
-static pin_af_obj_t GPIO_AD_B0_05_af[] = {
-    PIN_AF(GPIO1_IO05, PIN_AF_MODE_ALT5, GPIO1, 0x10B0U),
-};
-
-pin_obj_t GPIO_AD_B0_05 = PIN(GPIO_AD_B0_05, GPIO1, 5, GPIO_AD_B0_05_af);
diff --git a/ports/mimxrt/boards/MIMXRT1020_EVK/pins.csv b/ports/mimxrt/boards/MIMXRT1020_EVK/pins.csv
new file mode 100644
index 0000000000000..8420bbd82156b
--- /dev/null
+++ b/ports/mimxrt/boards/MIMXRT1020_EVK/pins.csv
@@ -0,0 +1,33 @@
+D0,GPIO_AD_B1_09
+D1,GPIO_AD_B1_08
+D2,GPIO_AD_B0_09
+D3,GPIO_AD_B0_07
+D4,GPIO_AD_B0_05
+D5,GPIO_AD_B0_06
+D6,GPIO_AD_B0_14
+D7,GPIO_AD_B1_06
+D8,GPIO_AD_B1_07
+D9,GPIO_AD_B0_15
+D10,GPIO_AD_B0_11
+D11,GPIO_AD_B0_12
+D12,GPIO_AD_B0_13
+D13,GPIO_AD_B0_10
+D14,GPIO_SD_B1_03
+D15,GPIO_SD_B1_02
+A0,GPIO_AD_B1_10
+A1,GPIO_AD_B1_11
+A2,GPIO_AD_B1_12
+A3,GPIO_AD_B1_13
+A4,GPIO_AD_B1_15
+A5,GPIO_AD_B1_14
+RX,GPIO_AD_B1_09
+TX,GPIO_AD_B1_08
+SDA,GPIO_AD_B1_15
+SCL,GPIO_AD_B1_14
+I2C_SCL,GPIO_SD_B1_02
+I2C_SDA,GPIO_SD_B1_03
+SCK,GPIO_AD_B0_10
+SDI,GPIO_AD_B0_13
+SDO,GPIO_AD_B0_12
+CS,GPIO_AD_B0_11
+LED_GREEN,GPIO_AD_B0_05
\ No newline at end of file
diff --git a/ports/mimxrt/boards/MIMXRT1020_EVK/pins.h b/ports/mimxrt/boards/MIMXRT1020_EVK/pins.h
deleted file mode 100644
index 158929911c7a5..0000000000000
--- a/ports/mimxrt/boards/MIMXRT1020_EVK/pins.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2020 Philipp Ebensberger
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-// NOTE: pins.h shall only be included in in pin.h
-// hence no include guards are needed since they will be provided by pin.h
-
-extern pin_obj_t GPIO_AD_B0_05;
diff --git a/ports/mimxrt/boards/MIMXRT1021_af.csv b/ports/mimxrt/boards/MIMXRT1021_af.csv
new file mode 100644
index 0000000000000..668b415f0ba7a
--- /dev/null
+++ b/ports/mimxrt/boards/MIMXRT1021_af.csv
@@ -0,0 +1,94 @@
+Pad,ALT0, ALT1, ALT2, ALT3, ALT4, ALT5, ALT6, ALT7, ALT8, ALT9,ADC,ACMP,Default
+GPIO_AD_B0_00,JTAG_TMS,,,,,GPIO1_IO00,USBPHY1_TSTI_TX_EN,GPT1_COMPARE1,,,,,ALT0
+GPIO_AD_B0_01,JTAG_TCK,,,,,GPIO1_IO01,USBPHY1_TSTI_TX_HIZ,GPT1_CAPTURE2,,,,,ALT0
+GPIO_AD_B0_02,JTAG_MOD,,,,,GPIO1_IO02,USBPHY1_TSTI_TX_LS_MODE,GPT1_CAPTURE1,,,,,ALT0
+GPIO_AD_B0_03,JTAG_TDI,USDHC2_CD_B,WDOG1_B,SAI1_MCLK,USDHC1_WP,GPIO1_IO03,USB_OTG1_OC,CCM_PMIC_RDY,,,,,ALT0
+GPIO_AD_B0_04,JTAG_TDO,FLEXCAN1_TX,USDHC1_WP,TMR2_TIMER0,ENET_MDIO,GPIO1_IO04,USB_OTG1_PWR,EWM_OUT_B,,,,,ALT0
+GPIO_AD_B0_05,JTAG_TRSTB,FLEXCAN1_RX,USDHC1_CD_B,TMR2_TIMER1,ENET_MDC,GPIO1_IO05,USB_OTG1_ID,ARM_NMI,,,,,ALT0
+GPIO_AD_B0_06,PIT_TRIGGER0,MQS_RIGHT,LPUART1_TXD,TMR2_TIMER2,FLEXPWM2_PWMA3,GPIO1_IO06,REF_32K_OUT,,,,,,ALT5
+GPIO_AD_B0_07,PIT_TRIGGER1,MQS_LEFT,LPUART1_RXD,TMR2_TIMER3,FLEXPWM2_PWMB3,GPIO1_IO07,REF_24M_OUT,,,,,,ALT5
+GPIO_AD_B0_08,ENET_TX_CLK,LPI2C3_SCL,LPUART1_CTS_B,KPP_COL0,ENET_REF_CLK,GPIO1_IO08,ARM_CM7_TXEV,,,,,ACMP1_IN4,ALT5
+GPIO_AD_B0_09,ENET_RX_DATA1,LPI2C3_SDA,LPUART1_RTS_B,KPP_ROW0,,GPIO1_IO09,ARM_CM7_RXEV,,,,,ACMP2_IN4,ALT5
+GPIO_AD_B0_10,ENET_RX_DATA0,LPSPI1_SCK,LPUART5_TXD,KPP_COL1,FLEXPWM2_PWMA2,GPIO1_IO10,ARM_TRACE_CLK,,,,,ACMP3_IN4,ALT5
+GPIO_AD_B0_11,ENET_RX_EN,LPSPI1_PCS0,LPUART5_RXD,KPP_ROW1,FLEXPWM2_PWMB2,GPIO1_IO11,ARM_TRACE_SWO,,,,,ACMP4_IN4,ALT5
+GPIO_AD_B0_12,ENET_RX_ER,LPSPI1_SDO,LPUART3_CTS_B,KPP_COL2,FLEXPWM2_PWMA1,GPIO1_IO12,ARM_TRACE0,SNVS_VIO_5_CTL,,,ADC1_IN0,,ALT5
+GPIO_AD_B0_13,ENET_TX_EN,LPSPI1_SDI,LPUART3_RTS_B,KPP_ROW2,FLEXPWM2_PWMB1,GPIO1_IO13,,SNVS_VIO_5_B,,,ADC2_IN0,,ALT5
+GPIO_AD_B0_14,ENET_TX_DATA0,FLEXCAN2_TX,LPUART3_TXD,KPP_COL3,FLEXPWM2_PWMA0,GPIO1_IO14,,WDOG1_ANY,,,"ADC1_IN1,ADC2_IN1","ACMP1_IN0,ACMP2_IN0,ACMP3_IN0,ACMP4_IN0",ALT5
+GPIO_AD_B0_15,ENET_TX_DATA1,FLEXCAN2_RX,LPUART3_RXD,KPP_ROW3,FLEXPWM2_PWMB0,GPIO1_IO15,,,,,"ADC1_IN2,ADC2_IN2","ACMP1_IN1,ACMP2_IN1,ACMP3_IN1,ACMP4_IN1",ALT5
+GPIO_AD_B1_00,SEMC_RDY,FLEXSPI_A_DATA3,FLEXCAN2_TX,SAI1_MCLK,FLEXIO1_D15,GPIO1_IO16,ENET_1588_EVENT2_OUT,KPP_COL4,,,,ACMP1_IN2,ALT5
+GPIO_AD_B1_01,SEMC_CSX0,FLEXSPI_A_SCLK,FLEXCAN2_RX,SAI1_TX_BCLK,FLEXIO1_D14,GPIO1_IO17,ENET_1588_EVENT2_IN,KPP_ROW4,,,ADC1_IN3,ACMP2_IN2,ALT5
+GPIO_AD_B1_02,SEMC_CSX1,FLEXSPI_A_DATA0,LPSPI4_SCK,SAI1_TX_SYNC,FLEXIO1_D13,GPIO1_IO18,ENET_1588_EVENT3_OUT,KPP_COL5,,,ADC2_IN3,ACMP3_IN2,ALT5
+GPIO_AD_B1_03,SEMC_CSX2,FLEXSPI_A_DATA2,LPSPI4_PCS0,SAI1_TX_DATA0,FLEXIO1_D12,GPIO1_IO19,ENET_1588_EVENT3_IN,KPP_ROW5,,,ADC1_IN4,ACMP4_IN2,ALT5
+GPIO_AD_B1_04,SEMC_CSX3,FLEXSPI_A_DATA1,LPSPI4_SDO,SAI1_RX_SYNC,FLEXIO1_D11,GPIO1_IO20,LPSPI1_PCS1,KPP_COL6,,,ADC2_IN4,ACMP1_IN3,ALT5
+GPIO_AD_B1_05,USDHC1_WP,FLEXSPI_A_SS0_B,LPSPI4_SDI,SAI1_RX_DATA0,FLEXIO1_D10,GPIO1_IO21,LPSPI1_PCS2,KPP_ROW6,,,"ADC1_IN5,ADC2_IN5",ACMP2_IN3,ALT5
+GPIO_AD_B1_06,USDHC1_RESET_B,FLEXPWM1_PWMA0,LPUART2_CTS_B,SAI1_RX_BCLK,FLEXIO1_D09,GPIO1_IO22,LPSPI1_PCS3,KPP_COL7,,,"ADC1_IN6,ADC2_IN6",ACMP3_IN3,ALT5
+GPIO_AD_B1_07,USDHC1_VSELECT,FLEXPWM1_PWMB0,LPUART2_RTS_B,SAI1_TX_DATA1,FLEXIO1_D08,GPIO1_IO23,LPSPI3_PCS3,KPP_ROW7,,,"ADC1_IN7,ADC2_IN7",ACMP4_IN3,ALT5
+GPIO_AD_B1_08,LPI2C2_SCL,FLEXPWM1_PWMA1,LPUART2_TXD,SAI1_TX_DATA2,FLEXIO1_D07,GPIO1_IO24,LPSPI3_PCS2,XBAR_INOUT12,,,"ADC1_IN8,ADC2_IN8",ACMP1_IN5,ALT5
+GPIO_AD_B1_09,LPI2C2_SDA,FLEXPWM1_PWMB1,LPUART2_RXD,SAI1_TX_DATA3,FLEXIO1_D06,GPIO1_IO25,LPSPI3_PCS1,XBAR_INOUT13,,,"ADC1_IN9,ADC2_IN9",ACMP2_IN5,ALT5
+GPIO_AD_B1_10,USB_OTG1_PWR,FLEXPWM1_PWMA2,LPUART4_TXD,USDHC1_CD_B,FLEXIO1_D05,GPIO1_IO26,GPT2_CAPTURE1,,,,"ADC1_IN10,ADC2_IN10",ACMP3_IN5,ALT5
+GPIO_AD_B1_11,USB_OTG1_ID,FLEXPWM1_PWMB2,LPUART4_RXD,USDHC1_WP,FLEXIO1_D04,GPIO1_IO27,GPT2_COMPARE1,,,,"ADC1_IN11,ADC2_IN11",ACMP4_IN5,ALT5
+GPIO_AD_B1_12,USB_OTG1_OC,ACMP1_OUT,LPSPI3_SCK,USDHC2_CD_B,FLEXIO1_D03,GPIO1_IO28,FLEXPWM1_PWMA3,,,,"ADC1_IN12,ADC2_IN12","ACMP1_IN6,ACMP1_OUT",ALT5
+GPIO_AD_B1_13,LPI2C1_HREQ,ACMP2_OUT,LPSPI3_PCS0,USDHC2_WP,FLEXIO1_D02,GPIO1_IO29,FLEXPWM1_PWMB3,,,,"ADC1_IN13,ADC2_IN13","ACMP2_IN6,ACMP2_OUT",ALT5
+GPIO_AD_B1_14,LPI2C1_SCL,ACMP3_OUT,LPSPI3_SDO,ENET_1588_EVENT0_OUT,FLEXIO1_D01,GPIO1_IO30,,,,,"ADC1_IN14,ADC2_IN14","ACMP3_IN6,ACMP3_OUT",ALT5
+GPIO_AD_B1_15,LPI2C1_SDA,ACMP4_OUT,LPSPI3_SDI,ENET_1588_EVENT0_IN,FLEXIO1_D00,GPIO1_IO31,,,,,"ADC1_IN15,ADC2_IN15","ACMP4_IN6,ACMP4_OUT",ALT5
+GPIO_EMC_00,SEMC_DA00,TMR2_TIMER0,LPUART4_CTS_B,SPDIF_SR_CLK,LPSPI2_SCK,GPIO2_IO00,FLEXCAN1_TX,PIT_TRIGGER2,,,,,ALT5
+GPIO_EMC_01,SEMC_DA01,TMR2_TIMER1,LPUART4_RTS_B,SPDIF_OUT,LPSPI2_PCS0,GPIO2_IO01,FLEXCAN1_RX,PIT_TRIGGER3,,,,,ALT5
+GPIO_EMC_02,SEMC_DA02,TMR2_TIMER2,LPUART4_TXD,SPDIF_LOCK,LPSPI2_SDO,GPIO2_IO02,LPI2C1_SCL,,,,,,ALT5
+GPIO_EMC_03,SEMC_DA03,TMR2_TIMER3,LPUART4_RXD,SPDIF_EXT_CLK,LPSPI2_SDI,GPIO2_IO03,LPI2C1_SDA,,,,,,ALT5
+GPIO_EMC_04,SEMC_DA04,XBAR_INOUT04,SPDIF_OUT,SAI2_TX_BCLK,FLEXIO1_D16,GPIO2_IO04,USBPHY1_TSTO_PLL_CLK20DIV,,,,,,ALT5
+GPIO_EMC_05,SEMC_DA05,XBAR_INOUT05,SPDIF_IN,SAI2_TX_SYNC,FLEXIO1_D17,GPIO2_IO05,USBPHY1_TSTI_TX_HS_MODE,,,,,,ALT5
+GPIO_EMC_06,SEMC_DA06,XBAR_INOUT06,LPUART3_TXD,SAI2_TX_DATA,FLEXIO1_D18,GPIO2_IO06,USBPHY1_TSTI_TX_DN,,,,,,ALT5
+GPIO_EMC_07,SEMC_DA07,XBAR_INOUT07,LPUART3_RXD,SAI2_RX_SYNC,FLEXIO1_D19,GPIO2_IO07,USBPHY1_TSTO_RX_SQUELCH,,,,,,ALT5
+GPIO_EMC_08,SEMC_DM0,XBAR_INOUT08,FLEXCAN2_TX,SAI2_RX_DATA,FLEXIO1_D20,GPIO2_IO08,USBPHY1_TSTO_RX_DISCON_DET,,,,,,ALT5
+GPIO_EMC_09,SEMC_WE,XBAR_INOUT09,FLEXCAN2_RX,SAI2_RX_BCLK,FLEXIO1_D21,GPIO2_IO09,USBPHY1_TSTO_RX_HS_RXD,,,,,,ALT5
+GPIO_EMC_10,SEMC_CAS,XBAR_INOUT10,LPI2C4_SDA,SAI1_TX_SYNC,LPSPI2_SCK,GPIO2_IO10,FLEXPWM2_PWMX0,,,,,,ALT5
+GPIO_EMC_11,SEMC_RAS,XBAR_INOUT11,LPI2C4_SCL,SAI1_TX_BCLK,LPSPI2_PCS0,GPIO2_IO11,FLEXPWM2_PWMX1,,,,,,ALT5
+GPIO_EMC_12,SEMC_CS0,XBAR_INOUT12,LPUART6_TXD,SAI1_TX_DATA0,LPSPI2_SDO,GPIO2_IO12,FLEXPWM2_PWMX2,,,,,,ALT5
+GPIO_EMC_13,SEMC_BA0,XBAR_INOUT13,LPUART6_RXD,SAI1_RX_DATA0,LPSPI2_SDI,GPIO2_IO13,FLEXPWM2_PWMX3,CCM_PMIC_RDY,,,,,ALT5
+GPIO_EMC_14,SEMC_BA1,XBAR_INOUT14,LPUART6_CTS_B,SAI1_RX_BCLK,LPSPI2_PCS1,GPIO2_IO14,FLEXCAN1_TX,,,,,,ALT5
+GPIO_EMC_15,SEMC_ADDR10,XBAR_INOUT15,LPUART6_RTS_B,SAI1_RX_SYNC,WDOG1_B,GPIO2_IO15,FLEXCAN1_RX,,,,,,ALT5
+GPIO_EMC_16,SEMC_ADDR00,,MQS_RIGHT,SAI2_MCLK,,GPIO2_IO16,SRC_BOOT_MODE0,,,,,,ALT5
+GPIO_EMC_17,SEMC_ADDR01,,MQS_LEFT,SAI3_MCLK,,GPIO2_IO17,SRC_BOOT_MODE1,,,,,,ALT5
+GPIO_EMC_18,SEMC_ADDR02,XBAR_INOUT16,LPI2C2_SDA,SAI1_RX_SYNC,FLEXIO1_D22,GPIO2_IO18,SRC_BT_CFG0,,,,,,ALT5
+GPIO_EMC_19,SEMC_ADDR03,XBAR_INOUT17,LPI2C2_SCL,SAI1_RX_BCLK,FLEXIO1_D23,GPIO2_IO19,SRC_BT_CFG1,,,,,,ALT5
+GPIO_EMC_20,SEMC_ADDR04,FLEXPWM1_PWMA3,LPUART2_CTS_B,SAI1_MCLK,FLEXIO1_D24,GPIO2_IO20,SRC_BT_CFG2,,,,,,ALT5
+GPIO_EMC_21,SEMC_ADDR05,FLEXPWM1_PWMB3,LPUART2_RTS_B,SAI1_RX_DATA0,FLEXIO1_D25,GPIO2_IO21,SRC_BT_CFG3,,,,,,ALT5
+GPIO_EMC_22,SEMC_ADDR06,FLEXPWM1_PWMA2,LPUART2_TXD,SAI1_TX_DATA3,FLEXIO1_D26,GPIO2_IO22,SRC_BT_CFG4,,,,,,ALT5
+GPIO_EMC_23,SEMC_ADDR07,FLEXPWM1_PWMB2,LPUART2_RXD,SAI1_TX_DATA2,FLEXIO1_D27,GPIO2_IO23,SRC_BT_CFG5,,,,,,ALT5
+GPIO_EMC_24,SEMC_ADDR08,FLEXPWM1_PWMA1,LPUART8_CTS_B,SAI1_TX_DATA1,FLEXIO1_D28,GPIO2_IO24,SRC_BT_CFG6,,,,,,ALT5
+GPIO_EMC_25,SEMC_ADDR09,FLEXPWM1_PWMB1,LPUART8_RTS_B,SAI1_TX_DATA0,FLEXIO1_D29,GPIO2_IO25,SRC_BT_CFG7,,,,,,ALT5
+GPIO_EMC_26,SEMC_ADDR11,FLEXPWM1_PWMA0,LPUART8_TXD,SAI1_TX_BCLK,FLEXIO1_D30,GPIO2_IO26,SRC_BT_CFG8,,,,,,ALT5
+GPIO_EMC_27,SEMC_ADDR12,FLEXPWM1_PWMB0,LPUART8_RXD,SAI1_TX_SYNC,FLEXIO1_D31,GPIO2_IO27,SRC_BT_CFG9,,,,,,ALT5
+GPIO_EMC_28,SEMC_DQS,FLEXPWM2_PWMA3,XBAR_INOUT18,SAI3_MCLK,EWM_OUT_B,GPIO2_IO28,GPT2_CAPTURE2,FLEXPWM1_PWMX0,,,,,ALT5
+GPIO_EMC_29,SEMC_CKE,FLEXPWM2_PWMB3,XBAR_INOUT19,SAI3_RX_BCLK,WDOG2_RST_B_DEB,GPIO2_IO29,GPT2_COMPARE2,FLEXPWM1_PWMX1,,,,,ALT5
+GPIO_EMC_30,SEMC_CLK,FLEXPWM2_PWMA2,LPUART4_CTS_B,SAI3_RX_SYNC,WDOG1_RST_B_DEB,GPIO2_IO30,GPT2_COMPARE3,FLEXPWM1_PWMX2,,,,,ALT5
+GPIO_EMC_31,SEMC_DM1,FLEXPWM2_PWMB2,LPUART4_RTS_B,SAI3_RX_DATA,WDOG2_B,GPIO2_IO31,GPT2_CLK,FLEXPWM1_PWMX3,,,,,ALT5
+GPIO_EMC_32,SEMC_DA08,TMR1_TIMER0,LPUART4_TXD,SAI3_TX_DATA,LPSPI4_SCK,GPIO3_IO00,USBPHY1_TSTO_RX_FS_RXD,REF_24M_OUT,,,,,ALT5
+GPIO_EMC_33,SEMC_DA09,TMR1_TIMER1,LPUART4_RXD,SAI3_TX_BCLK,LPSPI4_PCS0,GPIO3_IO01,USBPHY1_TSTI_TX_DP,SRC_TESTER_ACK,,,,,ALT5
+GPIO_EMC_34,SEMC_DA10,TMR1_TIMER2,LPUART7_TXD,SAI3_TX_SYNC,LPSPI4_SDO,GPIO3_IO02,ENET_CRS,,,,,,ALT5
+GPIO_EMC_35,SEMC_DA11,TMR1_TIMER3,LPUART7_RXD,USDHC2_WP,LPSPI4_SDI,GPIO3_IO03,ENET_COL,,,,,,ALT5
+GPIO_EMC_36,SEMC_DA12,FLEXPWM2_PWMA1,LPUART5_CTS_B,CCM_PMIC_RDY,LPSPI4_PCS1,GPIO3_IO04,ENET_RX_CLK,USDHC1_WP,,,,,ALT5
+GPIO_EMC_37,SEMC_DA13,FLEXPWM2_PWMB1,LPUART5_RTS_B,MQS_RIGHT,LPSPI4_PCS2,GPIO3_IO05,ENET_RX_DATA3,USDHC1_VSELECT,,,,,ALT5
+GPIO_EMC_38,SEMC_DA14,FLEXPWM2_PWMA0,LPUART5_TXD,MQS_LEFT,LPSPI4_PCS3,GPIO3_IO06,ENET_RX_DATA2,USDHC1_CD_B,,,,,ALT5
+GPIO_EMC_39,SEMC_DA15,FLEXPWM2_PWMB0,LPUART5_RXD,USB_OTG1_OC,WDOG1_B,GPIO3_IO07,ENET_TX_ER,GPT1_CLK,,,,,ALT5
+GPIO_EMC_40,SEMC_CSX0,XBAR_INOUT18,SPDIF_OUT,USB_OTG1_ID,ENET_MDIO,GPIO3_IO08,ENET_TX_DATA3,GPT1_COMPARE3,,,,,ALT5
+GPIO_EMC_41,SEMC_RDY,XBAR_INOUT19,SPDIF_IN,USB_OTG1_PWR,ENET_MDC,GPIO3_IO09,ENET_TX_DATA2,GPT1_COMPARE2,,,,,ALT5
+GPIO_SD_B0_00,USDHC1_DATA2,TMR1_TIMER0,SAI1_MCLK,SAI2_MCLK,LPI2C3_SCL,GPIO3_IO13,FLEXSPI_A_SS1_B,XBAR_INOUT14,,,,,ALT5
+GPIO_SD_B0_01,USDHC1_DATA3,TMR1_TIMER1,REF_24M_OUT,SAI2_RX_SYNC,LPI2C3_SDA,GPIO3_IO14,FLEXSPI_B_SS1_B,XBAR_INOUT15,,,,,ALT5
+GPIO_SD_B0_02,USDHC1_CMD,TMR1_TIMER2,LPUART7_CTS_B,SAI2_RX_BCLK,LPSPI1_SCK,GPIO3_IO15,ENET_MDIO,XBAR_INOUT16,,,,,ALT5
+GPIO_SD_B0_03,USDHC1_CLK,TMR1_TIMER3,LPUART7_RTS_B,SAI2_RX_DATA,LPSPI1_PCS0,GPIO3_IO16,ENET_MDC,,,,,,ALT5
+GPIO_SD_B0_04,USDHC1_DATA0,FLEXCAN2_TX,LPUART7_TXD,SAI2_TX_DATA,LPSPI1_SDO,GPIO3_IO17,FLEXSPI_B_SS0_B,,,,,,ALT5
+GPIO_SD_B0_05,USDHC1_DATA1,FLEXCAN2_RX,LPUART7_RXD,SAI2_TX_BCLK,LPSPI1_SDI,GPIO3_IO18,FLEXSPI_B_DQS,,,,,,ALT5
+GPIO_SD_B0_06,USDHC1_CD_B,USDHC1_RESET_B,REF_32K_OUT,SAI2_TX_SYNC,WDOG1_B,GPIO3_IO19,XBAR_INOUT17,,,,,,ALT5
+GPIO_SD_B1_00,USDHC2_DATA2,FLEXSPI_B_DATA3,LPUART6_TXD,XBAR_INOUT10,FLEXCAN1_TX,GPIO3_IO20,,,,,,,ALT5
+GPIO_SD_B1_01,USDHC2_DATA3,FLEXSPI_B_SCLK,LPUART6_RXD,FLEXSPI_A_SS1_B,FLEXCAN1_RX,GPIO3_IO21,,,,,,,ALT5
+GPIO_SD_B1_02,USDHC2_CMD,FLEXSPI_B_DATA0,LPUART8_TXD,LPI2C4_SCL,ENET_1588_EVENT1_OUT,GPIO3_IO22,CCM_CLKO1,,,,,,ALT5
+GPIO_SD_B1_03,USDHC2_CLK,FLEXSPI_B_DATA2,LPUART8_RXD,LPI2C4_SDA,ENET_1588_EVENT1_IN,GPIO3_IO23,CCM_CLKO2,,,,,,ALT5
+GPIO_SD_B1_04,USDHC2_DATA0,FLEXSPI_B_DATA1,ENET_TX_CLK,ENET_REF_CLK,EWM_OUT_B,GPIO3_IO24,CCM_WAIT,,,,,,ALT5
+GPIO_SD_B1_05,USDHC2_DATA1,FLEXSPI_A_DQS,ENET_RX_DATA1,SAI3_MCLK,FLEXSPI_B_SS0_B,GPIO3_IO25,CCM_PMIC_RDY,,,,,,ALT5
+GPIO_SD_B1_06,USDHC2_CD_B,FLEXSPI_A_DATA3,ENET_RX_DATA0,SAI3_TX_BCLK,LPSPI2_PCS0,GPIO3_IO26,CCM_STOP,,,,,,ALT5
+GPIO_SD_B1_07,USDHC2_RESET_B,FLEXSPI_A_SCLK,ENET_RX_EN,SAI3_TX_SYNC,LPSPI2_SCK,GPIO3_IO27,,,,,,,ALT5
+GPIO_SD_B1_08,USDHC2_DATA4,FLEXSPI_A_DATA0,ENET_RX_ER,SAI3_TX_DATA,LPSPI2_SDO,GPIO3_IO28,,,,,,,ALT5
+GPIO_SD_B1_09,USDHC2_DATA5,FLEXSPI_A_DATA2,ENET_TX_EN,SAI3_RX_BCLK,LPSPI2_SDI,GPIO3_IO29,CCM_REF_EN_B,,,,,,ALT5
+GPIO_SD_B1_10,USDHC2_DATA6,FLEXSPI_A_DATA1,ENET_TX_DATA0,SAI3_RX_SYNC,LPSPI2_PCS2,GPIO3_IO30,SRC_SYSTEM_RESET,,,,,,ALT5
+GPIO_SD_B1_11,USDHC2_DATA7,FLEXSPI_A_SS0_B,ENET_TX_DATA1,SAI3_RX_DATA,LPSPI2_PCS3,GPIO3_IO31,SRC_EARLY_RESET,,,,,,ALT5
diff --git a/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.h b/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.h
index 5a733bbd97bb2..2337496d2a3be 100644
--- a/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.h
+++ b/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.h
@@ -4,6 +4,6 @@
 #define BOARD_FLASH_SIZE (64 * 1024 * 1024)
 
 // MIMXRT1050_EVK has 1 user LED
-#define MICROPY_HW_LED1_PIN (GPIO_AD_B0_09)
+#define MICROPY_HW_LED1_PIN (pin_GPIO_AD_B0_09)
 #define MICROPY_HW_LED_ON(pin) (mp_hal_pin_low(pin))
 #define MICROPY_HW_LED_OFF(pin) (mp_hal_pin_high(pin))
diff --git a/ports/mimxrt/boards/MIMXRT1050_EVK/pins.c b/ports/mimxrt/boards/MIMXRT1050_EVK/pins.c
deleted file mode 100644
index d5da9c6f99275..0000000000000
--- a/ports/mimxrt/boards/MIMXRT1050_EVK/pins.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2020 NXP
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#include "pin.h"
-
-static pin_af_obj_t GPIO_AD_B0_09_af[] = {
-    PIN_AF(GPIO1_IO09, PIN_AF_MODE_ALT5, GPIO1, 0x10B0U),
-};
-
-pin_obj_t GPIO_AD_B0_09 = PIN(GPIO_AD_B0_09, GPIO1, 9, GPIO_AD_B0_09_af);
diff --git a/ports/mimxrt/boards/MIMXRT1050_EVK/pins.csv b/ports/mimxrt/boards/MIMXRT1050_EVK/pins.csv
new file mode 100644
index 0000000000000..afd63d4f97fe8
--- /dev/null
+++ b/ports/mimxrt/boards/MIMXRT1050_EVK/pins.csv
@@ -0,0 +1,51 @@
+D0,GPIO_AD_B1_07
+D1,GPIO_AD_B1_06
+D2,GPIO_AD_B0_11
+D3,GPIO_AD_B1_08
+D4,GPIO_AD_B0_09
+D5,GPIO_AD_B0_10
+D6,GPIO_AD_B1_02
+D7,GPIO_AD_B1_03
+D8,GPIO_AD_B0_03
+D9,GPIO_AD_B0_02
+D10,GPIO_SD_B0_01
+D11,GPIO_SD_B0_02
+D12,GPIO_SD_B0_03
+D13,GPIO_SD_B0_00
+D14,GPIO_AD_B1_01
+D15,GPIO_AD_B1_00
+A0,GPIO_AD_B1_10
+A1,GPIO_AD_B1_11
+A2,GPIO_AD_B1_04
+A3,GPIO_AD_B1_05
+A4,GPIO_AD_B1_01
+A5,GPIO_AD_B1_00
+RX,GPIO_AD_B1_07
+TX,GPIO_AD_B1_06
+SCL,GPIO_AD_B1_00
+SDA,GPIO_AD_B1_01
+SCK,GPIO_SD_B0_00
+SDI,GPIO_SD_B0_03
+SDO,GPIO_SD_B0_02
+CS,GPIO_SD_B0_01
+LED_GREEN,GPIO_AD_B0_09
+GPIO_AD_B1_07,GPIO_AD_B1_07
+GPIO_AD_B1_06,GPIO_AD_B1_06
+GPIO_AD_B0_11,GPIO_AD_B0_11
+GPIO_AD_B1_08,GPIO_AD_B1_08
+GPIO_AD_B0_09,GPIO_AD_B0_09
+GPIO_AD_B0_10,GPIO_AD_B0_10
+GPIO_AD_B1_02,GPIO_AD_B1_02
+GPIO_AD_B1_03,GPIO_AD_B1_03
+GPIO_AD_B0_03,GPIO_AD_B0_03
+GPIO_AD_B0_02,GPIO_AD_B0_02
+GPIO_SD_B0_01,GPIO_SD_B0_01
+GPIO_SD_B0_02,GPIO_SD_B0_02
+GPIO_SD_B0_03,GPIO_SD_B0_03
+GPIO_SD_B0_00,GPIO_SD_B0_00
+GPIO_AD_B1_01,GPIO_AD_B1_01
+GPIO_AD_B1_00,GPIO_AD_B1_00
+GPIO_AD_B1_10,GPIO_AD_B1_10
+GPIO_AD_B1_11,GPIO_AD_B1_11
+GPIO_AD_B1_04,GPIO_AD_B1_04
+GPIO_AD_B1_05,GPIO_AD_B1_05
diff --git a/ports/mimxrt/boards/MIMXRT1050_EVK/pins.h b/ports/mimxrt/boards/MIMXRT1050_EVK/pins.h
deleted file mode 100644
index baef51c6c8612..0000000000000
--- a/ports/mimxrt/boards/MIMXRT1050_EVK/pins.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2020 NXP
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-// NOTE: pins.h shall only be included in in pin.h
-// hence no include guards are needed since they will be provided by pin.h
-
-extern pin_obj_t GPIO_AD_B0_09;
diff --git a/ports/mimxrt/boards/MIMXRT1052_af.csv b/ports/mimxrt/boards/MIMXRT1052_af.csv
new file mode 100644
index 0000000000000..754bf4ab7bf0f
--- /dev/null
+++ b/ports/mimxrt/boards/MIMXRT1052_af.csv
@@ -0,0 +1,125 @@
+Pad,ALT0, ALT1, ALT2, ALT3, ALT4, ALT5, ALT6, ALT7, ALT8, ALT9,ADC,ACMP,Default
+GPIO_AD_B0_00,FLEXPWM2_PWM3_A,XBAR_INOUT14,REF_CLK_32K,USB_OTG2_ID,LPI2C1_SCLS,GPIO1_IO00,USDHC1_RESET_B,LPSPI3_SCK,,,,ACMP1_IN4,ALT5
+GPIO_AD_B0_01,FLEXPWM2_PWM3_B,XBAR_INOUT15,REF_CLK_24M,USB_OTG1_ID,LPI2C1_SDAS,GPIO1_IO01,EWM_OUT_B,LPSPI3_SOUT,,,,ACMP2_IN4,ALT5
+GPIO_AD_B0_02,FLEXCAN2_TX,XBAR_INOUT16,LPUART6_TXD,USB_OTG1_PWR,FLEXPWM1_PWM0_X,GPIO1_IO02,LPI2C1_HREQ,LPSPI3_SIN,,,,ACMP3_IN4,ALT5
+GPIO_AD_B0_03,FLEXCAN2_RX,XBAR_INOUT17,LPUART6_RXD,USB_OTG1_OC,FLEXPWM1_PWM1_X,GPIO1_IO03,REF_CLK_24M,LPSPI3_PCS0,,,,ACMP4_IN4,ALT5
+GPIO_AD_B0_04,SRC_BOOT_MODE0,MQS_RIGHT,ENET_TX_DATA3,SAI2_TX_SYNC,CSI_DATA09,GPIO1_IO04,PIT_TRIGGER0,LPSPI3_PCS1,,,,,ALT0
+GPIO_AD_B0_05,SRC_BOOT_MODE1,MQS_LEFT,ENET_TX_DATA2,SAI2_TX_BCLK,CSI_DATA08,GPIO1_IO05,XBAR_INOUT17,LPSPI3_PCS2,,,,,ALT0
+GPIO_AD_B0_06,"JTAG_TMS,SWD_DIO",GPT2_COMPARE1,ENET_RX_CLK,SAI2_RX_BCLK,CSI_DATA07,GPIO1_IO06,XBAR_INOUT18,LPSPI3_PCS3,,,,,ALT0
+GPIO_AD_B0_07,"JTAG_TCK,SWD_CLK",GPT2_COMPARE2,ENET_TX_ER,SAI2_RX_SYNC,CSI_DATA06,GPIO1_IO07,XBAR_INOUT19,ENET_1588_EVENT3_OUT,,,,,ALT0
+GPIO_AD_B0_08,JTAG_MOD,GPT2_COMPARE3,ENET_RX_DATA3,SAI2_RX_DATA,CSI_DATA05,GPIO1_IO08,XBAR_INOUT20,ENET_1588_EVENT3_IN,,,,,ALT0
+GPIO_AD_B0_09,JTAG_TDI,FLEXPWM2_PWM3_A,ENET_RX_DATA2,SAI2_TX_DATA,CSI_DATA04,GPIO1_IO09,XBAR_INOUT21,GPT2_CLK,,,,,ALT0
+GPIO_AD_B0_10,JTAG_TDO,FLEXPWM1_PWM3_A,ENET_CRS,SAI2_MCLK,CSI_DATA03,GPIO1_IO10,XBAR_INOUT22,ENET_1588_EVENT0_OUT,,,,,ALT0
+GPIO_AD_B0_11,JTAG_TRSTB,FLEXPWM1_PWM3_B,ENET_COL,WDOG1_B,CSI_DATA02,GPIO1_IO11,XBAR_INOUT23,ENET_1588_EVENT0_IN,,,,,ALT0
+GPIO_AD_B0_12,LPI2C4_SCL,CCM_PMIC_READY,LPUART1_TXD,WDOG2_B,FLEXPWM1_PWM2_X,GPIO1_IO12,ENET_1588_EVENT1_OUT,,,,ADC1_IN1,,ALT5
+GPIO_AD_B0_13,LPI2C4_SDA,GPT1_CLK,LPUART1_RXD,EWM_OUT_B,FLEXPWM1_PWM3_X,GPIO1_IO13,ENET_1588_EVENT1_IN,REF_CLK_24M,,,ADC1_IN2,ACMP1_IN2,ALT5
+GPIO_AD_B0_14,USB_OTG2_OC,XBAR_INOUT24,LPUART1_CTS_B,ENET_1588_EVENT0_OUT,CSI_VSYNC,GPIO1_IO14,FLEXCAN2_TX,WDOG1_ANY,,,ADC1_IN3,ACMP2_IN2,ALT5
+GPIO_AD_B0_15,USB_OTG2_PWR,XBAR_INOUT25,LPUART1_RTS_B,ENET_1588_EVENT0_IN,CSI_HSYNC,GPIO1_IO15,FLEXCAN2_RX,WDOG1_RST_B_DEB,,,ADC1_IN4,ACMP3_IN2,ALT5
+GPIO_AD_B1_00,USB_OTG2_ID,TMR3_TIMER0,LPUART2_CTS_B,LPI2C1_SCL,WDOG1_B,GPIO1_IO16,USDHC1_WP,KPP_ROW7,,,"ADC1_IN5,ADC2_IN5",ACMP4_IN2,ALT5
+GPIO_AD_B1_01,USB_OTG1_PWR,TMR3_TIMER1,LPUART2_RTS_B,LPI2C1_SDA,CCM_PMIC_READY,GPIO1_IO17,USDHC1_VSELECT,KPP_COL7,,,"ADC1_IN6,ADC2_IN6","ACMP1_IN0,ACMP2_IN0,ACMP3_IN0,ACMP4_IN0",ALT5
+GPIO_AD_B1_02,USB_OTG1_ID,TMR3_TIMER2,LPUART2_TXD,SPDIF_OUT,ENET_1588_EVENT2_OUT,GPIO1_IO18,USDHC1_CD_B,KPP_ROW6,,,"ADC1_IN7,ADC2_IN7",ACMP1_IN3,ALT5
+GPIO_AD_B1_03,USB_OTG1_OC,TMR3_TIMER3,LPUART2_RXD,SPDIF_IN,ENET_1588_EVENT2_IN,GPIO1_IO19,USDHC2_CD_B,KPP_COL6,,,"ADC1_IN8,ADC2_IN8",ACMP2_IN3,ALT5
+GPIO_AD_B1_04,FLEXSPI_B_DATA3,ENET_MDC,LPUART3_CTS_B,SPDIF_SR_CLK,CSI_PIXCLK,GPIO1_IO20,USDHC2_DATA0,KPP_ROW5,,,"ADC1_IN9,ADC2_IN9",ACMP3_IN3,ALT5
+GPIO_AD_B1_05,FLEXSPI_B_DATA2,ENET_MDIO,LPUART3_RTS_B,SPDIF_OUT,CSI_MCLK,GPIO1_IO21,USDHC2_DATA1,KPP_COL5,,,"ADC1_IN10,ADC2_IN10",ACMP4_IN3,ALT5
+GPIO_AD_B1_06,FLEXSPI_B_DATA1,LPI2C3_SDA,LPUART3_TXD,SPDIF_LOCK,CSI_VSYNC,GPIO1_IO22,USDHC2_DATA2,KPP_ROW4,,,"ADC1_IN11,ADC2_IN11","ACMP1_IN1,ACMP2_IN1,ACMP3_IN1,ACMP4_IN1",ALT5
+GPIO_AD_B1_07,FLEXSPI_B_DATA0,LPI2C3_SCL,LPUART3_RXD,SPDIF_EXT_CLK,CSI_HSYNC,GPIO1_IO23,USDHC2_DATA3,KPP_COL4,,,"ADC1_IN12,ADC2_IN12",ACMP1_IN5,ALT5
+GPIO_AD_B1_08,FLEXSPI_A_SS1_B,FLEXPWM4_PWM0_A,FLEXCAN1_TX,CCM_PMIC_READY,CSI_DATA09,GPIO1_IO24,USDHC2_CMD,KPP_ROW3,,,"ADC1_IN13,ADC2_IN13",ACMP2_IN5,ALT5
+GPIO_AD_B1_09,FLEXSPI_A_DQS,FLEXPWM4_PWM1_A,FLEXCAN1_RX,SAI1_MCLK,CSI_DATA08,GPIO1_IO25,USDHC2_CLK,KPP_COL3,,,"ADC1_IN14,ADC2_IN14",ACMP3_IN5,ALT5
+GPIO_AD_B1_10,FLEXSPI_A_DATA3,WDOG1_B,LPUART8_TXD,SAI1_RX_SYNC,CSI_DATA07,GPIO1_IO26,USDHC2_WP,KPP_ROW2,,,"ADC1_IN15,ADC2_IN15",ACMP4_IN5,ALT5
+GPIO_AD_B1_11,FLEXSPI_A_DATA2,EWM_OUT_B,LPUART8_RXD,SAI1_RX_BCLK,CSI_DATA06,GPIO1_IO27,USDHC2_RESET_B,KPP_COL2,,,"ADC1_IN0,ADC2_IN0",ACMP1_IN6,ALT5
+GPIO_AD_B1_12,FLEXSPI_A_DATA1,ACMP1_OUT,LPSPI3_PCS0,SAI1_RX_DATA0,CSI_DATA05,GPIO1_IO28,USDHC2_DATA4,KPP_ROW1,,,ADC2_IN1,"ACMP1_OUT,ACMP2_IN6",ALT5
+GPIO_AD_B1_13,FLEXSPI_A_DATA0,ACMP2_OUT,LPSPI3_SIN,SAI1_TX_DATA0,CSI_DATA04,GPIO1_IO29,USDHC2_DATA5,KPP_COL1,,,ADC2_IN2,"ACMP2_OUT,ACMP3_IN6",ALT5
+GPIO_AD_B1_14,FLEXSPI_A_SCLK,ACMP3_OUT,LPSPI3_SOUT,SAI1_TX_BCLK,CSI_DATA03,GPIO1_IO30,USDHC2_DATA6,KPP_ROW0,,,ADC2_IN3,"ACMP3_OUT,ACMP4_IN6",ALT5
+GPIO_AD_B1_15,FLEXSPI_A_SS0_B,ACMP4_OUT,LPSPI3_SCK,SAI1_TX_SYNC,CSI_DATA02,GPIO1_IO31,USDHC2_DATA7,KPP_COL0,,,ADC2_IN4,ACMP4_OUT,ALT5
+GPIO_B0_00,LCD_CLK,TMR1_TIMER0,MQS_RIGHT,LPSPI4_PCS0,FLEXIO2_D00,GPIO2_IO00,SEMC_CSX1,,,,,,ALT5
+GPIO_B0_01,LCD_ENABLE,TMR1_TIMER1,MQS_LEFT,LPSPI4_SIN,FLEXIO2_D01,GPIO2_IO01,SEMC_CSX2,,,,,,ALT5
+GPIO_B0_02,LCD_HSYNC,TMR1_TIMER2,FLEXCAN1_TX,LPSPI4_SOUT,FLEXIO2_D02,GPIO2_IO02,SEMC_CSX3,,,,,,ALT5
+GPIO_B0_03,LCD_VSYNC,TMR2_TIMER0,FLEXCAN1_RX,LPSPI4_SCK,FLEXIO2_D03,GPIO2_IO03,WDOG2_RST_B_DEB,,,,,,ALT5
+GPIO_B0_04,LCD_DATA00,TMR2_TIMER1,LPI2C2_SCL,ARM_TRACE0,FLEXIO2_D04,GPIO2_IO04,SRC_BT_CFG00,,,,,,ALT5
+GPIO_B0_05,LCD_DATA01,TMR2_TIMER2,LPI2C2_SDA,ARM_TRACE1,FLEXIO2_D05,GPIO2_IO05,SRC_BT_CFG01,,,,,,ALT5
+GPIO_B0_06,LCD_DATA02,TMR3_TIMER0,FLEXPWM2_PWM0_A,ARM_TRACE2,FLEXIO2_D06,GPIO2_IO06,SRC_BT_CFG02,,,,,,ALT5
+GPIO_B0_07,LCD_DATA03,TMR3_TIMER1,FLEXPWM2_PWM0_B,ARM_TRACE3,FLEXIO2_D07,GPIO2_IO07,SRC_BT_CFG03,,,,,,ALT5
+GPIO_B0_08,LCD_DATA04,TMR3_TIMER2,FLEXPWM2_PWM1_A,LPUART3_TXD,FLEXIO2_D08,GPIO2_IO08,SRC_BT_CFG04,,,,,,ALT5
+GPIO_B0_09,LCD_DATA05,TMR4_TIMER0,FLEXPWM2_PWM1_B,LPUART3_RXD,FLEXIO2_D09,GPIO2_IO09,SRC_BT_CFG05,,,,,,ALT5
+GPIO_B0_10,LCD_DATA06,TMR4_TIMER1,FLEXPWM2_PWM2_A,"SAI1_TX_DATA3,SAI1_RX_DATA1",FLEXIO2_D10,GPIO2_IO10,SRC_BT_CFG06,,,,,,ALT5
+GPIO_B0_11,LCD_DATA07,TMR4_TIMER2,FLEXPWM2_PWM2_B,"SAI1_TX_DATA2,SAI1_RX_DATA2",FLEXIO2_D11,GPIO2_IO11,SRC_BT_CFG07,,,,,,ALT5
+GPIO_B0_12,LCD_DATA08,XBAR_INOUT10,ARM_TRACE_CLK,"SAI1_TX_DATA1,SAI1_RX_DATA3",FLEXIO2_D12,GPIO2_IO12,SRC_BT_CFG08,,,,,,ALT5
+GPIO_B0_13,LCD_DATA09,XBAR_INOUT11,ARM_TRACE_SWO,SAI1_MCLK,FLEXIO2_D13,GPIO2_IO13,SRC_BT_CFG09,,,,,,ALT5
+GPIO_B0_14,LCD_DATA10,XBAR_INOUT12,ARM_CM7_EVENT0,SAI1_RX_SYNC,FLEXIO2_D14,GPIO2_IO14,SRC_BT_CFG10,,,,,,ALT5
+GPIO_B0_15,LCD_DATA11,XBAR_INOUT13,ARM_CM7_EVENT1,SAI1_RX_BCLK,FLEXIO2_D15,GPIO2_IO15,SRC_BT_CFG11,,,,,,ALT5
+GPIO_B1_00,LCD_DATA12,XBAR_INOUT14,LPUART4_TXD,SAI1_RX_DATA0,FLEXIO2_D16,GPIO2_IO16,FLEXPWM1_PWM3_A,,,,,,ALT5
+GPIO_B1_01,LCD_DATA13,XBAR_INOUT15,LPUART4_RXD,SAI1_TX_DATA0,FLEXIO2_D17,GPIO2_IO17,FLEXPWM1_PWM3_B,,,,,,ALT5
+GPIO_B1_02,LCD_DATA14,XBAR_INOUT16,LPSPI4_PCS2,SAI1_TX_BCLK,FLEXIO2_D18,GPIO2_IO18,FLEXPWM2_PWM3_A,,,,,,ALT5
+GPIO_B1_03,LCD_DATA15,XBAR_INOUT17,LPSPI4_PCS1,SAI1_TX_SYNC,FLEXIO2_D19,GPIO2_IO19,FLEXPWM2_PWM3_B,,,,,,ALT5
+GPIO_B1_04,LCD_DATA16,LPSPI4_PCS0,CSI_DATA15,ENET_RX_DATA0,FLEXIO2_D20,GPIO2_IO20,,,,,,,ALT5
+GPIO_B1_05,LCD_DATA17,LPSPI4_SIN,CSI_DATA14,ENET_RX_DATA1,FLEXIO2_D21,GPIO2_IO21,,,,,,,ALT5
+GPIO_B1_06,LCD_DATA18,LPSPI4_SOUT,CSI_DATA13,ENET_RX_EN,FLEXIO2_D22,GPIO2_IO22,,,,,,,ALT5
+GPIO_B1_07,LCD_DATA19,LPSPI4_SCK,CSI_DATA12,ENET_TX_DATA0,FLEXIO2_D23,GPIO2_IO23,,,,,,,ALT5
+GPIO_B1_08,LCD_DATA20,TMR1_TIMER3,CSI_DATA11,ENET_TX_DATA1,FLEXIO2_D24,GPIO2_IO24,FLEXCAN2_TX,,,,,,ALT5
+GPIO_B1_09,LCD_DATA21,TMR2_TIMER3,CSI_DATA10,ENET_TX_EN,FLEXIO2_D25,GPIO2_IO25,FLEXCAN2_RX,,,,,,ALT5
+GPIO_B1_10,LCD_DATA22,TMR3_TIMER3,CSI_DATA00,ENET_TX_CLK,FLEXIO2_D26,GPIO2_IO26,ENET_REF_CLK,,,,,,ALT5
+GPIO_B1_11,LCD_DATA23,TMR4_TIMER3,CSI_DATA01,ENET_RX_ER,FLEXIO2_D27,GPIO2_IO27,LPSPI4_PCS3,,,,,,ALT5
+GPIO_B1_12,,LPUART5_TXD,CSI_PIXCLK,ENET_1588_EVENT0_IN,FLEXIO2_D28,GPIO2_IO28,USDHC1_CD_B,,,,,,ALT5
+GPIO_B1_13,WDOG1_B,LPUART5_RXD,CSI_VSYNC,ENET_1588_EVENT0_OUT,FLEXIO2_D29,GPIO2_IO29,USDHC1_WP,,,,,,ALT5
+GPIO_B1_14,ENET_MDC,FLEXPWM4_PWM2_A,CSI_HSYNC,XBAR_INOUT02,FLEXIO2_D30,GPIO2_IO30,USDHC1_VSELECT,,,,,,ALT5
+GPIO_B1_15,ENET_MDIO,FLEXPWM4_PWM3_A,CSI_MCLK,XBAR_INOUT03,FLEXIO2_D31,GPIO2_IO31,USDHC1_RESET_B,,,,,,ALT5
+GPIO_EMC_00,SEMC_DATA00,FLEXPWM4_PWM0_A,LPSPI2_SCK,XBAR_INOUT02,FLEXIO1_D00,GPIO4_IO0,USB_PHY1_TSTI_TX_LS_MODE,,,,,,ALT5
+GPIO_EMC_01,SEMC_DATA01,FLEXPWM4_PWM0_B,LPSPI2_PCS0,XBAR_INOUT03,FLEXIO1_D01,GPIO4_IO1,USB_PHY1_TSTI_TX_HS_MODE,,,,,,ALT5
+GPIO_EMC_02,SEMC_DATA02,FLEXPWM4_PWM1_A,LPSPI2_SOUT,XBAR_INOUT04,FLEXIO1_D02,GPIO4_IO2,USB_PHY1_TSTI_TX_DN,,,,,,ALT5
+GPIO_EMC_03,SEMC_DATA03,FLEXPWM4_PWM1_B,LPSPI2_SIN,XBAR_INOUT05,FLEXIO1_D03,GPIO4_IO3,USB_PHY1_TSTO_RX_SQUELCH,,,,,,ALT5
+GPIO_EMC_04,SEMC_DATA04,FLEXPWM4_PWM2_A,SAI2_TX_DATA,XBAR_INOUT06,FLEXIO1_D04,GPIO4_IO4,USB_PHY1_TSTO_RX_DISCON_DET,,,,,,ALT5
+GPIO_EMC_05,SEMC_DATA05,FLEXPWM4_PWM2_B,SAI2_TX_SYNC,XBAR_INOUT07,FLEXIO1_D05,GPIO4_IO5,USB_PHY1_TSTO_RX_HS_RXD,,,,,,ALT5
+GPIO_EMC_06,SEMC_DATA06,FLEXPWM2_PWM0_A,SAI2_TX_BCLK,XBAR_INOUT08,FLEXIO1_D06,GPIO4_IO6,USB_PHY2_TSTO_RX_FS_RXD,,,,,,ALT5
+GPIO_EMC_07,SEMC_DATA07,FLEXPWM2_PWM0_B,SAI2_MCLK,XBAR_INOUT09,FLEXIO1_D07,GPIO4_IO7,USB_PHY1_TSTO_RX_FS_RXD,,,,,,ALT5
+GPIO_EMC_08,SEMC_DM0,FLEXPWM2_PWM1_A,SAI2_RX_DATA,XBAR_INOUT17,FLEXIO1_D08,GPIO4_IO8,USB_PHY1_TSTI_TX_DP,,,,,,ALT5
+GPIO_EMC_09,SEMC_ADDR00,FLEXPWM2_PWM1_B,SAI2_RX_SYNC,FLEXCAN2_TX,FLEXIO1_D09,GPIO4_IO9,USB_PHY1_TSTI_TX_EN,,,,,,ALT5
+GPIO_EMC_10,SEMC_ADDR01,FLEXPWM2_PWM2_A,SAI2_RX_BCLK,FLEXCAN2_RX,FLEXIO1_D10,GPIO4_IO10,USB_PHY1_TSTI_TX_HIZ,,,,,,ALT5
+GPIO_EMC_11,SEMC_ADDR02,FLEXPWM2_PWM2_B,LPI2C4_SDA,USDHC2_RESET_B,FLEXIO1_D11,GPIO4_IO11,USB_PHY2_TSTO_RX_HS_RXD,,,,,,ALT5
+GPIO_EMC_12,SEMC_ADDR03,XBAR_INOUT24,LPI2C4_SCL,USDHC1_WP,FLEXPWM1_PWM3_A,GPIO4_IO12,USB_PHY1_TSTO_PLL_CLK20DIV,,,,,,ALT5
+GPIO_EMC_13,SEMC_ADDR04,XBAR_INOUT25,LPUART3_TXD,MQS_RIGHT,FLEXPWM1_PWM3_B,GPIO4_IO13,USB_PHY2_TSTO_PLL_CLK20DIV,,,,,,ALT5
+GPIO_EMC_14,SEMC_ADDR05,XBAR_INOUT19,LPUART3_RXD,MQS_LEFT,LPSPI2_PCS1,GPIO4_IO14,USB_PHY2_TSTO_RX_SQUELCH,,,,,,ALT5
+GPIO_EMC_15,SEMC_ADDR06,XBAR_INOUT20,LPUART3_CTS_B,SPDIF_OUT,TMR3_TIMER0,GPIO4_IO15,USB_PHY2_TSTO_RX_DISCON_DET,,,,,,ALT5
+GPIO_EMC_16,SEMC_ADDR07,XBAR_INOUT21,LPUART3_RTS_B,SPDIF_IN,TMR3_TIMER1,GPIO4_IO16,,,,,,,ALT5
+GPIO_EMC_17,SEMC_ADDR08,FLEXPWM4_PWM3_A,LPUART4_CTS_B,FLEXCAN1_TX,TMR3_TIMER2,GPIO4_IO17,,,,,,,ALT5
+GPIO_EMC_18,SEMC_ADDR09,FLEXPWM4_PWM3_B,LPUART4_RTS_B,FLEXCAN1_RX,TMR3_TIMER3,GPIO4_IO18,SNVS_VIO_5_CTL,,,,,,ALT5
+GPIO_EMC_19,SEMC_ADDR11,FLEXPWM2_PWM3_A,LPUART4_TXD,ENET_RX_DATA1,TMR2_TIMER0,GPIO4_IO19,SNVS_VIO_5_B,,,,,,ALT5
+GPIO_EMC_20,SEMC_ADDR12,FLEXPWM2_PWM3_B,LPUART4_RXD,ENET_RX_DATA0,TMR2_TIMER1,GPIO4_IO20,,,,,,,ALT5
+GPIO_EMC_21,SEMC_BA0,FLEXPWM3_PWM3_A,LPI2C3_SDA,ENET_TX_DATA1,TMR2_TIMER2,GPIO4_IO21,,,,,,,ALT5
+GPIO_EMC_22,SEMC_BA1,FLEXPWM3_PWM3_B,LPI2C3_SCL,ENET_TX_DATA0,TMR2_TIMER3,GPIO4_IO22,,,,,,,ALT5
+GPIO_EMC_23,SEMC_ADDR10,FLEXPWM1_PWM0_A,LPUART5_TXD,ENET_RX_EN,GPT1_CAPTURE2,GPIO4_IO23,,,,,,,ALT5
+GPIO_EMC_24,SEMC_CAS,FLEXPWM1_PWM0_B,LPUART5_RXD,ENET_TX_EN,GPT1_CAPTURE1,GPIO4_IO24,,,,,,,ALT5
+GPIO_EMC_25,SEMC_RAS,FLEXPWM1_PWM1_A,LPUART6_TXD,ENET_TX_CLK,ENET_REF_CLK,GPIO4_IO25,,,,,,,ALT5
+GPIO_EMC_26,SEMC_CLK,FLEXPWM1_PWM1_B,LPUART6_RXD,ENET_RX_ER,FLEXIO1_D12,GPIO4_IO26,,,,,,,ALT5
+GPIO_EMC_27,SEMC_CKE,FLEXPWM1_PWM2_A,LPUART5_RTS_B,LPSPI1_SCK,FLEXIO1_D13,GPIO4_IO27,,,,,,,ALT5
+GPIO_EMC_28,SEMC_WE,FLEXPWM1_PWM2_B,LPUART5_CTS_B,LPSPI1_SOUT,FLEXIO1_D14,GPIO4_IO28,,,,,,,ALT5
+GPIO_EMC_29,SEMC_CS0,FLEXPWM3_PWM0_A,LPUART6_RTS_B,LPSPI1_SIN,FLEXIO1_D15,GPIO4_IO29,,,,,,,ALT5
+GPIO_EMC_30,SEMC_DATA08,FLEXPWM3_PWM0_B,LPUART6_CTS_B,LPSPI1_PCS0,CSI_DATA23,GPIO4_IO30,,,,,,,ALT5
+GPIO_EMC_31,SEMC_DATA09,FLEXPWM3_PWM1_A,LPUART7_TXD,LPSPI1_PCS1,CSI_DATA22,GPIO4_IO31,,,,,,,ALT5
+GPIO_EMC_32,SEMC_DATA10,FLEXPWM3_PWM1_B,LPUART7_RXD,CCM_PMIC_READY,CSI_DATA21,GPIO3_IO18,,,,,,,ALT5
+GPIO_EMC_33,SEMC_DATA11,FLEXPWM3_PWM2_A,USDHC1_RESET_B,SAI3_RX_DATA,CSI_DATA20,GPIO3_IO19,,,,,,,ALT5
+GPIO_EMC_34,SEMC_DATA12,FLEXPWM3_PWM2_B,USDHC1_VSELECT,SAI3_RX_SYNC,CSI_DATA19,GPIO3_IO20,,,,,,,ALT5
+GPIO_EMC_35,SEMC_DATA13,XBAR_INOUT18,GPT1_COMPARE1,SAI3_RX_BCLK,CSI_DATA18,GPIO3_IO21,USDHC1_CD_B,,,,,,ALT5
+GPIO_EMC_36,SEMC_DATA14,XBAR_INOUT22,GPT1_COMPARE2,SAI3_TX_DATA,CSI_DATA17,GPIO3_IO22,USDHC1_WP,,,,,,ALT5
+GPIO_EMC_37,SEMC_DATA15,XBAR_INOUT23,GPT1_COMPARE3,SAI3_MCLK,CSI_DATA16,GPIO3_IO23,USDHC2_WP,,,,,,ALT5
+GPIO_EMC_38,SEMC_DM1,FLEXPWM1_PWM3_A,LPUART8_TXD,SAI3_TX_BCLK,CSI_FIELD,GPIO3_IO24,USDHC2_VSELECT,,,,,,ALT5
+GPIO_EMC_39,SEMC_DQS,FLEXPWM1_PWM3_B,LPUART8_RXD,SAI3_TX_SYNC,WDOG1_B,GPIO3_IO25,USDHC2_CD_B,,,,,,ALT5
+GPIO_EMC_40,SEMC_RDY,GPT2_CAPTURE2,LPSPI1_PCS2,USB_OTG2_OC,ENET_MDC,GPIO3_IO26,USDHC2_RESET_B,,,,,,ALT5
+GPIO_EMC_41,SEMC_CSX0,GPT2_CAPTURE1,LPSPI1_PCS3,USB_OTG2_PWR,ENET_MDIO,GPIO3_IO27,USDHC1_VSELECT,,,,,,ALT5
+GPIO_SD_B0_00,USDHC1_CMD,FLEXPWM1_PWM0_A,LPI2C3_SCL,XBAR_INOUT04,LPSPI1_SCK,GPIO3_IO12,FLEXSPI_A_SS1_B,,,,,,ALT5
+GPIO_SD_B0_01,USDHC1_CLK,FLEXPWM1_PWM0_B,LPI2C3_SDA,XBAR_INOUT05,LPSPI1_PCS0,GPIO3_IO13,FLEXSPI_B_SS1_B,,,,,,ALT5
+GPIO_SD_B0_02,USDHC1_DATA0,FLEXPWM1_PWM1_A,LPUART8_CTS_B,XBAR_INOUT06,LPSPI1_SOUT,GPIO3_IO14,,,,,,,ALT5
+GPIO_SD_B0_03,USDHC1_DATA1,FLEXPWM1_PWM1_B,LPUART8_RTS_B,XBAR_INOUT07,LPSPI1_SIN,GPIO3_IO15,,,,,,,ALT5
+GPIO_SD_B0_04,USDHC1_DATA2,FLEXPWM1_PWM2_A,LPUART8_TXD,XBAR_INOUT08,FLEXSPI_B_SS0_B,GPIO3_IO16,CCM_CLKO1,,,,,,ALT5
+GPIO_SD_B0_05,USDHC1_DATA3,FLEXPWM1_PWM2_B,LPUART8_RXD,XBAR_INOUT09,FLEXSPI_B_DQS,GPIO3_IO17,CCM_CLKO2,,,,,,ALT5
+GPIO_SD_B1_00,USDHC2_DATA3,FLEXSPI_B_DATA3,FLEXPWM1_PWM3_A,"SAI1_TX_DATA3,SAI1_RX_DATA1",LPUART4_TXD,GPIO3_IO00,,,,,,,ALT5
+GPIO_SD_B1_01,USDHC2_DATA2,FLEXSPI_B_DATA2,FLEXPWM1_PWM3_B,"SAI1_TX_DATA2,SAI1_RX_DATA2",LPUART4_RXD,GPIO3_IO01,,,,,,,ALT5
+GPIO_SD_B1_02,USDHC2_DATA1,FLEXSPI_B_DATA1,FLEXPWM2_PWM3_A,"SAI1_TX_DATA1,SAI1_RX_DATA3",FLEXCAN1_TX,GPIO3_IO02,CCM_WAIT,,,,,,ALT5
+GPIO_SD_B1_03,USDHC2_DATA0,FLEXSPI_B_DATA0,FLEXPWM2_PWM3_B,SAI1_MCLK,FLEXCAN1_RX,GPIO3_IO03,CCM_PMIC_READY,,,,,,ALT5
+GPIO_SD_B1_04,USDHC2_CLK,FLEXSPI_B_SCLK,LPI2C1_SCL,SAI1_RX_SYNC,FLEXSPI_A_SS1_B,GPIO3_IO04,CCM_STOP,,,,,,ALT5
+GPIO_SD_B1_05,USDHC2_CMD,FLEXSPI_A_DQS,LPI2C1_SDA,SAI1_RX_BCLK,FLEXSPI_B_SS0_B,GPIO3_IO05,,,,,,,ALT5
+GPIO_SD_B1_06,USDHC2_RESET_B,FLEXSPI_A_SS0_B,LPUART7_CTS_B,SAI1_RX_DATA0,LPSPI2_PCS0,GPIO3_IO06,,,,,,,ALT5
+GPIO_SD_B1_07,SEMC_CSX1,FLEXSPI_A_SCLK,LPUART7_RTS_B,SAI1_TX_DATA0,LPSPI2_SCK,GPIO3_IO07,CCM_REF_EN_B,,,,,,ALT5
+GPIO_SD_B1_08,USDHC2_DATA4,FLEXSPI_A_DATA0,LPUART7_TXD,SAI1_TX_BCLK,LPSPI2_SOUT,GPIO3_IO08,SEMC_CSX2,,,,,,ALT5
+GPIO_SD_B1_09,USDHC2_DATA5,FLEXSPI_A_DATA1,LPUART7_RXD,SAI1_TX_SYNC,LPSPI2_SIN,GPIO3_IO09,,,,,,,ALT5
+GPIO_SD_B1_10,USDHC2_DATA6,FLEXSPI_A_DATA2,LPUART2_RXD,LPI2C2_SDA,LPSPI2_PCS2,GPIO3_IO10,,,,,,,ALT5
+GPIO_SD_B1_11,USDHC2_DATA7,FLEXSPI_A_DATA3,LPUART2_TXD,LPI2C2_SCL,LPSPI2_PCS3,GPIO3_IO11,,,,,,,ALT5
diff --git a/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.h b/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.h
index 8bd2a579174aa..c9e6d8bf2c142 100644
--- a/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.h
+++ b/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.h
@@ -4,6 +4,6 @@
 #define BOARD_FLASH_SIZE (8 * 1024 * 1024)
 
 // MIMXRT1060_EVK has 1 user LED
-#define MICROPY_HW_LED1_PIN (GPIO_AD_B0_09)
+#define MICROPY_HW_LED1_PIN (pin_GPIO_AD_B0_09)
 #define MICROPY_HW_LED_ON(pin) (mp_hal_pin_low(pin))
 #define MICROPY_HW_LED_OFF(pin) (mp_hal_pin_high(pin))
diff --git a/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.mk b/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.mk
index b34169801b900..32f87046b8a5e 100644
--- a/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.mk
+++ b/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.mk
@@ -2,6 +2,25 @@ MCU_SERIES = MIMXRT1062
 MCU_VARIANT = MIMXRT1062DVJ6A
 
 JLINK_PATH ?= /media/RT1060-EVK/
+JLINK_COMMANDER_SCRIPT = $(BUILD)/script.jlink
+
+
+ifdef JLINK_IP
+JLINK_CONNECTION_SETTINGS = -IP $(JLINK_IP)
+else
+JLINK_CONNECTION_SETTINGS = -USB
+endif
+
+
+deploy_jlink: $(BUILD)/firmware.hex
+	$(Q)$(TOUCH) $(JLINK_COMMANDER_SCRIPT)
+	$(ECHO) "ExitOnError 1" > $(JLINK_COMMANDER_SCRIPT)
+	$(ECHO) "speed auto" >> $(JLINK_COMMANDER_SCRIPT)
+	$(ECHO) "r" >> $(JLINK_COMMANDER_SCRIPT)
+	$(ECHO) "st" >> $(JLINK_COMMANDER_SCRIPT)
+	$(ECHO) "loadfile \"$(realpath $(BUILD)/firmware.hex)\"" >> $(JLINK_COMMANDER_SCRIPT)
+	$(ECHO) "qc" >> $(JLINK_COMMANDER_SCRIPT)
+	$(JLINK_PATH)JLinkExe -device $(MCU_VARIANT) -if SWD $(JLINK_CONNECTION_SETTINGS) -CommanderScript $(JLINK_COMMANDER_SCRIPT)
 
 deploy: $(BUILD)/firmware.bin
 	cp $< $(JLINK_PATH)
diff --git a/ports/mimxrt/boards/MIMXRT1060_EVK/pins.c b/ports/mimxrt/boards/MIMXRT1060_EVK/pins.c
deleted file mode 100644
index d5da9c6f99275..0000000000000
--- a/ports/mimxrt/boards/MIMXRT1060_EVK/pins.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2020 NXP
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#include "pin.h"
-
-static pin_af_obj_t GPIO_AD_B0_09_af[] = {
-    PIN_AF(GPIO1_IO09, PIN_AF_MODE_ALT5, GPIO1, 0x10B0U),
-};
-
-pin_obj_t GPIO_AD_B0_09 = PIN(GPIO_AD_B0_09, GPIO1, 9, GPIO_AD_B0_09_af);
diff --git a/ports/mimxrt/boards/MIMXRT1060_EVK/pins.csv b/ports/mimxrt/boards/MIMXRT1060_EVK/pins.csv
new file mode 100644
index 0000000000000..afd63d4f97fe8
--- /dev/null
+++ b/ports/mimxrt/boards/MIMXRT1060_EVK/pins.csv
@@ -0,0 +1,51 @@
+D0,GPIO_AD_B1_07
+D1,GPIO_AD_B1_06
+D2,GPIO_AD_B0_11
+D3,GPIO_AD_B1_08
+D4,GPIO_AD_B0_09
+D5,GPIO_AD_B0_10
+D6,GPIO_AD_B1_02
+D7,GPIO_AD_B1_03
+D8,GPIO_AD_B0_03
+D9,GPIO_AD_B0_02
+D10,GPIO_SD_B0_01
+D11,GPIO_SD_B0_02
+D12,GPIO_SD_B0_03
+D13,GPIO_SD_B0_00
+D14,GPIO_AD_B1_01
+D15,GPIO_AD_B1_00
+A0,GPIO_AD_B1_10
+A1,GPIO_AD_B1_11
+A2,GPIO_AD_B1_04
+A3,GPIO_AD_B1_05
+A4,GPIO_AD_B1_01
+A5,GPIO_AD_B1_00
+RX,GPIO_AD_B1_07
+TX,GPIO_AD_B1_06
+SCL,GPIO_AD_B1_00
+SDA,GPIO_AD_B1_01
+SCK,GPIO_SD_B0_00
+SDI,GPIO_SD_B0_03
+SDO,GPIO_SD_B0_02
+CS,GPIO_SD_B0_01
+LED_GREEN,GPIO_AD_B0_09
+GPIO_AD_B1_07,GPIO_AD_B1_07
+GPIO_AD_B1_06,GPIO_AD_B1_06
+GPIO_AD_B0_11,GPIO_AD_B0_11
+GPIO_AD_B1_08,GPIO_AD_B1_08
+GPIO_AD_B0_09,GPIO_AD_B0_09
+GPIO_AD_B0_10,GPIO_AD_B0_10
+GPIO_AD_B1_02,GPIO_AD_B1_02
+GPIO_AD_B1_03,GPIO_AD_B1_03
+GPIO_AD_B0_03,GPIO_AD_B0_03
+GPIO_AD_B0_02,GPIO_AD_B0_02
+GPIO_SD_B0_01,GPIO_SD_B0_01
+GPIO_SD_B0_02,GPIO_SD_B0_02
+GPIO_SD_B0_03,GPIO_SD_B0_03
+GPIO_SD_B0_00,GPIO_SD_B0_00
+GPIO_AD_B1_01,GPIO_AD_B1_01
+GPIO_AD_B1_00,GPIO_AD_B1_00
+GPIO_AD_B1_10,GPIO_AD_B1_10
+GPIO_AD_B1_11,GPIO_AD_B1_11
+GPIO_AD_B1_04,GPIO_AD_B1_04
+GPIO_AD_B1_05,GPIO_AD_B1_05
diff --git a/ports/mimxrt/boards/MIMXRT1060_EVK/pins.h b/ports/mimxrt/boards/MIMXRT1060_EVK/pins.h
deleted file mode 100644
index baef51c6c8612..0000000000000
--- a/ports/mimxrt/boards/MIMXRT1060_EVK/pins.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2020 NXP
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-// NOTE: pins.h shall only be included in in pin.h
-// hence no include guards are needed since they will be provided by pin.h
-
-extern pin_obj_t GPIO_AD_B0_09;
diff --git a/ports/mimxrt/boards/MIMXRT1062_af.csv b/ports/mimxrt/boards/MIMXRT1062_af.csv
new file mode 100644
index 0000000000000..9b83efeddc169
--- /dev/null
+++ b/ports/mimxrt/boards/MIMXRT1062_af.csv
@@ -0,0 +1,125 @@
+Pad,ALT0, ALT1, ALT2, ALT3, ALT4, ALT5, ALT6, ALT7, ALT8, ALT9,ADC,ACMP,Default
+GPIO_AD_B0_00,FLEXPWM2_PWM3_A,XBAR_INOUT14,REF_CLK_32K,USB_OTG2_ID,LPI2C1_SCLS,GPIO1_IO00,USDHC1_RESET_B,LPSPI3_SCK,,,,ACMP1_IN4,ALT5
+GPIO_AD_B0_01,FLEXPWM2_PWM3_B,XBAR_INOUT15,REF_CLK_24M,USB_OTG1_ID,LPI2C1_SDAS,GPIO1_IO01,EWM_OUT_B,LPSPI3_SOUT,,,,ACMP2_IN4,ALT5
+GPIO_AD_B0_02,FLEXCAN2_TX,XBAR_INOUT16,LPUART6_TXD,USB_OTG1_PWR,FLEXPWM1_PWM0_X,GPIO1_IO02,LPI2C1_HREQ,LPSPI3_SIN,,,,ACMP3_IN4,ALT5
+GPIO_AD_B0_03,FLEXCAN2_RX,XBAR_INOUT17,LPUART6_RXD,USB_OTG1_OC,FLEXPWM1_PWM1_X,GPIO1_IO03,REF_CLK_24M,LPSPI3_PCS0,,,,ACMP4_IN4,ALT5
+GPIO_AD_B0_04,SRC_BOOT_MODE0,MQS_RIGHT,ENET_TX_DATA3,SAI2_TX_SYNC,CSI_DATA09,GPIO1_IO04,PIT_TRIGGER0,LPSPI3_PCS1,,,,,ALT0
+GPIO_AD_B0_05,SRC_BOOT_MODE1,MQS_LEFT,ENET_TX_DATA2,SAI2_TX_BCLK,CSI_DATA08,GPIO1_IO05,XBAR_INOUT17,LPSPI3_PCS2,,,,,ALT0
+GPIO_AD_B0_06,"JTAG_TMS,SWD_DIO",GPT2_COMPARE1,ENET_RX_CLK,SAI2_RX_BCLK,CSI_DATA07,GPIO1_IO06,XBAR_INOUT18,LPSPI3_PCS3,,,,,ALT0
+GPIO_AD_B0_07,"JTAG_TCK,SWD_CLK",GPT2_COMPARE2,ENET_TX_ER,SAI2_RX_SYNC,CSI_DATA06,GPIO1_IO07,XBAR_INOUT19,ENET_1588_EVENT3_OUT,,,,,ALT0
+GPIO_AD_B0_08,JTAG_MOD,GPT2_COMPARE3,ENET_RX_DATA3,SAI2_RX_DATA,CSI_DATA05,GPIO1_IO08,XBAR_INOUT20,ENET_1588_EVENT3_IN,,,,,ALT0
+GPIO_AD_B0_09,JTAG_TDI,FLEXPWM2_PWM3_A,ENET_RX_DATA2,SAI2_TX_DATA,CSI_DATA04,GPIO1_IO09,XBAR_INOUT21,GPT2_CLK,,,,,ALT0
+GPIO_AD_B0_10,JTAG_TDO,FLEXPWM1_PWM3_A,ENET_CRS,SAI2_MCLK,CSI_DATA03,GPIO1_IO10,XBAR_INOUT22,ENET_1588_EVENT0_OUT,FLEXCAN3_TX,,,,ALT0
+GPIO_AD_B0_11,JTAG_TRSTB,FLEXPWM1_PWM3_B,ENET_COL,WDOG1_B,CSI_DATA02,GPIO1_IO11,XBAR_INOUT23,ENET_1588_EVENT0_IN,FLEXCAN3_RX,,,,ALT0
+GPIO_AD_B0_12,LPI2C4_SCL,CCM_PMIC_READY,LPUART1_TXD,WDOG2_B,FLEXPWM1_PWM2_X,GPIO1_IO12,ENET_1588_EVENT1_OUT,,,,ADC1_IN1,,ALT5
+GPIO_AD_B0_13,LPI2C4_SDA,GPT1_CLK,LPUART1_RXD,EWM_OUT_B,FLEXPWM1_PWM3_X,GPIO1_IO13,ENET_1588_EVENT1_IN,REF_CLK_24M,,,ADC1_IN2,ACMP1_IN2,ALT5
+GPIO_AD_B0_14,USB_OTG2_OC,XBAR_INOUT24,LPUART1_CTS_B,ENET_1588_EVENT0_OUT,CSI_VSYNC,GPIO1_IO14,FLEXCAN2_TX,WDOG1_ANY,FLEXCAN3_TX,,ADC1_IN3,ACMP2_IN2,ALT5
+GPIO_AD_B0_15,USB_OTG2_PWR,XBAR_INOUT25,LPUART1_RTS_B,ENET_1588_EVENT0_IN,CSI_HSYNC,GPIO1_IO15,FLEXCAN2_RX,WDOG1_RESET_B_DEB,FLEXCAN3_RX,,ADC1_IN4,ACMP3_IN2,ALT5
+GPIO_AD_B1_00,USB_OTG2_ID,TMR3_TIMER0,LPUART2_CTS_B,LPI2C1_SCL,WDOG1_B,GPIO1_IO16,USDHC1_WP,KPP_ROW7,ENET2_1588_EVENT0_OUT,FLEXIO3_D00,"ADC1_IN5,ADC2_IN5",ACMP4_IN2,ALT5
+GPIO_AD_B1_01,USB_OTG1_PWR,TMR3_TIMER1,LPUART2_RTS_B,LPI2C1_SDA,CCM_PMIC_READY,GPIO1_IO17,USDHC1_VSELECT,KPP_COL7,ENET2_1588_EVENT0_IN,FLEXIO3_D01,"ADC1_IN6,ADC2_IN6","ACMP1_IN0,ACMP2_IN0,ACMP3_IN0,ACMP4_IN0",ALT5
+GPIO_AD_B1_02,USB_OTG1_ID,TMR3_TIMER2,LPUART2_TXD,SPDIF_OUT,ENET_1588_EVENT2_OUT,GPIO1_IO18,USDHC1_CD_B,KPP_ROW6,GPT2_CLK,FLEXIO3_D02,"ADC1_IN7,ADC2_IN7",ACMP1_IN3,ALT5
+GPIO_AD_B1_03,USB_OTG1_OC,TMR3_TIMER3,LPUART2_RXD,SPDIF_IN,ENET_1588_EVENT2_IN,GPIO1_IO19,USDHC2_CD_B,KPP_COL6,GPT2_CAPTURE1,FLEXIO3_D03,"ADC1_IN8,ADC2_IN8",ACMP2_IN3,ALT5
+GPIO_AD_B1_04,FLEXSPI_B_DATA3,ENET_MDC,LPUART3_CTS_B,SPDIF_SR_CLK,CSI_PIXCLK,GPIO1_IO20,USDHC2_DATA0,KPP_ROW5,GPT2_CAPTURE2,FLEXIO3_D04,"ADC1_IN9,ADC2_IN9",ACMP3_IN3,ALT5
+GPIO_AD_B1_05,FLEXSPI_B_DATA2,ENET_MDIO,LPUART3_RTS_B,SPDIF_OUT,CSI_MCLK,GPIO1_IO21,USDHC2_DATA1,KPP_COL5,GPT2_COMPARE1,FLEXIO3_D05,"ADC1_IN10,ADC2_IN10",ACMP4_IN3,ALT5
+GPIO_AD_B1_06,FLEXSPI_B_DATA1,LPI2C3_SDA,LPUART3_TXD,SPDIF_LOCK,CSI_VSYNC,GPIO1_IO22,USDHC2_DATA2,KPP_ROW4,GPT2_COMPARE2,FLEXIO3_D06,"ADC1_IN11,ADC2_IN11","ACMP1_IN1,ACMP2_IN1,ACMP3_IN1,ACMP4_IN1",ALT5
+GPIO_AD_B1_07,FLEXSPI_B_DATA0,LPI2C3_SCL,LPUART3_RXD,SPDIF_EXT_CLK,CSI_HSYNC,GPIO1_IO23,USDHC2_DATA3,KPP_COL4,GPT2_COMPARE3,FLEXIO3_D07,"ADC1_IN12,ADC2_IN12",ACMP1_IN5,ALT5
+GPIO_AD_B1_08,FLEXSPI_A_SS1_B,FLEXPWM4_PWM0_A,FLEXCAN1_TX,CCM_PMIC_READY,CSI_DATA09,GPIO1_IO24,USDHC2_CMD,KPP_ROW3,,FLEXIO3_D08,"ADC1_IN13,ADC2_IN13",ACMP2_IN5,ALT5
+GPIO_AD_B1_09,FLEXSPI_A_DQS,FLEXPWM4_PWM1_A,FLEXCAN1_RX,SAI1_MCLK,CSI_DATA08,GPIO1_IO25,USDHC2_CLK,KPP_COL3,,FLEXIO3_D09,"ADC1_IN14,ADC2_IN14",ACMP3_IN5,ALT5
+GPIO_AD_B1_10,FLEXSPI_A_DATA3,WDOG1_B,LPUART8_TXD,SAI1_RX_SYNC,CSI_DATA07,GPIO1_IO26,USDHC2_WP,KPP_ROW2,ENET2_1588_EVENT1_OUT,FLEXIO3_D10,"ADC1_IN15,ADC2_IN15",ACMP4_IN5,ALT5
+GPIO_AD_B1_11,FLEXSPI_A_DATA2,EWM_OUT_B,LPUART8_RXD,SAI1_RX_BCLK,CSI_DATA06,GPIO1_IO27,USDHC2_RESET_B,KPP_COL2,ENET2_1588_EVENT1_IN,FLEXIO3_D11,ADC2_IN0,ACMP1_IN6,ALT5
+GPIO_AD_B1_12,FLEXSPI_A_DATA1,ACMP_OUT00,LPSPI3_PCS0,SAI1_RX_DATA0,CSI_DATA05,GPIO1_IO28,USDHC2_DATA4,KPP_ROW1,ENET2_1588_EVENT2_OUT,FLEXIO3_D12,ADC2_IN1,"ACMP1_OUT,ACMP2_IN6",ALT5
+GPIO_AD_B1_13,FLEXSPI_A_DATA0,ACMP_OUT01,LPSPI3_SIN,SAI1_TX_DATA0,CSI_DATA04,GPIO1_IO29,USDHC2_DATA5,KPP_COL1,ENET2_1588_EVENT2_IN,FLEXIO3_D13,ADC2_IN2,"ACMP2_OUT,ACMP3_IN6",ALT5
+GPIO_AD_B1_14,FLEXSPI_A_SCLK,ACMP_OUT02,LPSPI3_SOUT,SAI1_TX_BCLK,CSI_DATA03,GPIO1_IO30,USDHC2_DATA6,KPP_ROW0,ENET2_1588_EVENT3_OUT,FLEXIO3_D14,ADC2_IN3,"ACMP3_OUT,ACMP4_IN6",ALT5
+GPIO_AD_B1_15,FLEXSPI_A_SS0_B,ACMP_OUT03,LPSPI3_SCK,SAI1_TX_SYNC,CSI_DATA02,GPIO1_IO31,USDHC2_DATA7,KPP_COL0,ENET2_1588_EVENT3_IN,FLEXIO3_D15,ADC2_IN4,ACMP4_OUT,ALT5
+GPIO_B0_00,LCD_CLK,TMR1_TIMER0,MQS_RIGHT,LPSPI4_PCS0,FLEXIO2_D00,GPIO2_IO00,SEMC_CSX1,,ENET2_MDC,,,,ALT5
+GPIO_B0_01,LCD_ENABLE,TMR1_TIMER1,MQS_LEFT,LPSPI4_SIN,FLEXIO2_D01,GPIO2_IO01,SEMC_CSX2,,ENET2_MDIO,,,,ALT5
+GPIO_B0_02,LCD_HSYNC,TMR1_TIMER2,FLEXCAN1_TX,LPSPI4_SOUT,FLEXIO2_D02,GPIO2_IO02,SEMC_CSX3,,ENET2_1588_EVENT0_OUT,,,,ALT5
+GPIO_B0_03,LCD_VSYNC,TMR2_TIMER0,FLEXCAN1_RX,LPSPI4_SCK,FLEXIO2_D03,GPIO2_IO03,WDOG2_RESET_B_DEB,,ENET2_1588_EVENT0_IN,,,,ALT5
+GPIO_B0_04,LCD_DATA00,TMR2_TIMER1,LPI2C2_SCL,ARM_TRACE0,FLEXIO2_D04,GPIO2_IO04,SRC_BT_CFG00,,ENET2_TDATA3,,,,ALT5
+GPIO_B0_05,LCD_DATA01,TMR2_TIMER2,LPI2C2_SDA,ARM_TRACE1,FLEXIO2_D05,GPIO2_IO05,SRC_BT_CFG01,,ENET2_TDATA2,,,,ALT5
+GPIO_B0_06,LCD_DATA02,TMR3_TIMER0,FLEXPWM2_PWM0_A,ARM_TRACE2,FLEXIO2_D06,GPIO2_IO06,SRC_BT_CFG02,,ENET2_RX_CLK,,,,ALT5
+GPIO_B0_07,LCD_DATA03,TMR3_TIMER1,FLEXPWM2_PWM0_B,ARM_TRACE3,FLEXIO2_D07,GPIO2_IO07,SRC_BT_CFG03,,ENET2_TX_ER,,,,ALT5
+GPIO_B0_08,LCD_DATA04,TMR3_TIMER2,FLEXPWM2_PWM1_A,LPUART3_TXD,FLEXIO2_D08,GPIO2_IO08,SRC_BT_CFG04,,ENET2_RDATA3,,,,ALT5
+GPIO_B0_09,LCD_DATA05,TMR4_TIMER0,FLEXPWM2_PWM1_B,LPUART3_RXD,FLEXIO2_D09,GPIO2_IO09,SRC_BT_CFG05,,ENET2_RDATA2,,,,ALT5
+GPIO_B0_10,LCD_DATA06,TMR4_TIMER1,FLEXPWM2_PWM2_A,"SAI1_TX_DATA3,SAI1_RX_DATA1",FLEXIO2_D10,GPIO2_IO10,SRC_BT_CFG06,,ENET2_CRS,,,,ALT5
+GPIO_B0_11,LCD_DATA07,TMR4_TIMER2,FLEXPWM2_PWM2_B,"SAI1_TX_DATA2,SAI1_RX_DATA2",FLEXIO2_D11,GPIO2_IO11,SRC_BT_CFG07,,ENET2_COL,,,,ALT5
+GPIO_B0_12,LCD_DATA08,XBAR_INOUT10,ARM_TRACE_CLK,"SAI1_TX_DATA1,SAI1_RX_DATA3",FLEXIO2_D12,GPIO2_IO12,SRC_BT_CFG08,,ENET2_TDATA0,,,,ALT5
+GPIO_B0_13,LCD_DATA09,XBAR_INOUT11,ARM_TRACE_SWO,SAI1_MCLK,FLEXIO2_D13,GPIO2_IO13,SRC_BT_CFG09,,ENET2_TDATA1,,,,ALT5
+GPIO_B0_14,LCD_DATA10,XBAR_INOUT12,ARM_TXEV,SAI1_RX_SYNC,FLEXIO2_D14,GPIO2_IO14,SRC_BT_CFG10,,ENET2_TX_EN,,,,ALT5
+GPIO_B0_15,LCD_DATA11,XBAR_INOUT13,ARM_EVENT1,SAI1_RX_DATA0,FLEXIO2_D15,GPIO2_IO15,SRC_BT_CFG11,,ENET2_TX_CLK,ENET2_REF_CLK2,,,ALT5
+GPIO_B1_00,LCD_DATA12,XBAR_INOUT14,LPUART4_TXD,SAI1_RX_DATA0,FLEXIO2_D16,GPIO2_IO16,FLEXPWM1_PWM3_A,,ENET2_RX_ER,FLEXIO3_D16,,,ALT5
+GPIO_B1_01,LCD_DATA13,XBAR_INOUT15,LPUART4_RXD,SAI1_TX_DATA0,FLEXIO2_D17,GPIO2_IO17,FLEXPWM1_PWM3_B,,ENET2_RDATA0,FLEXIO3_D17,,,ALT5
+GPIO_B1_02,LCD_DATA14,XBAR_INOUT16,LPSPI4_PCS2,SAI1_TX_BCLK,FLEXIO2_D18,GPIO2_IO18,FLEXPWM2_PWM3_A,,ENET2_RDATA1,FLEXIO3_D18,,,ALT5
+GPIO_B1_03,LCD_DATA15,XBAR_INOUT17,LPSPI4_PCS1,SAI1_TX_SYNC,FLEXIO2_D19,GPIO2_IO19,FLEXPWM2_PWM3_B,,ENET2_RX_EN,FLEXIO3_D19,,,ALT5
+GPIO_B1_04,LCD_DATA16,LPSPI4_PCS0,CSI_DATA15,ENET_RX_DATA0,FLEXIO2_D20,GPIO2_IO20,,,GPT1_CLK,FLEXIO3_D20,,,ALT5
+GPIO_B1_05,LCD_DATA17,LPSPI4_SIN,CSI_DATA14,ENET_RX_DATA1,FLEXIO2_D21,GPIO2_IO21,,,GPT1_CAPTURE1,FLEXIO3_D21,,,ALT5
+GPIO_B1_06,LCD_DATA18,LPSPI4_SOUT,CSI_DATA13,ENET_RX_EN,FLEXIO2_D22,GPIO2_IO22,,,GPT1_CAPTURE2,FLEXIO3_D22,,,ALT5
+GPIO_B1_07,LCD_DATA19,LPSPI4_SCK,CSI_DATA12,ENET_TX_DATA0,FLEXIO2_D23,GPIO2_IO23,,,GPT1_COMPARE1,FLEXIO3_D23,,,ALT5
+GPIO_B1_08,LCD_DATA20,TMR1_TIMER3,CSI_DATA11,ENET_TX_DATA1,FLEXIO2_D24,GPIO2_IO24,FLEXCAN2_TX,,GPT1_COMPARE2,FLEXIO3_D24,,,ALT5
+GPIO_B1_09,LCD_DATA21,TMR2_TIMER3,CSI_DATA10,ENET_TX_EN,FLEXIO2_D25,GPIO2_IO25,FLEXCAN2_RX,,GPT1_COMPARE3,FLEXIO3_D25,,,ALT5
+GPIO_B1_10,LCD_DATA22,TMR3_TIMER3,CSI_DATA00,ENET_TX_CLK,FLEXIO2_D26,GPIO2_IO26,ENET_REF_CLK,,,FLEXIO3_D26,,,ALT5
+GPIO_B1_11,LCD_DATA23,TMR4_TIMER3,CSI_DATA01,ENET_RX_ER,FLEXIO2_D27,GPIO2_IO27,LPSPI4_PCS3,,,FLEXIO3_D27,,,ALT5
+GPIO_B1_12,,LPUART5_TXD,CSI_PIXCLK,ENET_1588_EVENT0_IN,FLEXIO2_D28,GPIO2_IO28,USDHC1_CD_B,,,FLEXIO3_D28,,,ALT5
+GPIO_B1_13,WDOG1_B,LPUART5_RXD,CSI_VSYNC,ENET_1588_EVENT0_OUT,FLEXIO2_D29,GPIO2_IO29,USDHC1_WP,,SEMC_DQS4,FLEXIO3_D29,,,ALT5
+GPIO_B1_14,ENET_MDC,FLEXPWM4_PWM2_A,CSI_HSYNC,XBAR_INOUT02,FLEXIO2_D30,GPIO2_IO30,USDHC1_VSELECT,,ENET2_TDATA0,FLEXIO3_D30,,,ALT5
+GPIO_B1_15,ENET_MDIO,FLEXPWM4_PWM3_A,CSI_MCLK,XBAR_INOUT03,FLEXIO2_D31,GPIO2_IO31,USDHC1_RESET_B,,ENET2_TDATA1,FLEXIO3_D31,,,ALT5
+GPIO_EMC_00,SEMC_DATA00,FLEXPWM4_PWM0_A,LPSPI2_SCK,XBAR_INOUT02,FLEXIO1_D00,GPIO4_IO0,USB_PHY1_TSTI_TX_LS_MODE,,,,,,ALT5
+GPIO_EMC_01,SEMC_DATA01,FLEXPWM4_PWM0_B,LPSPI2_PCS0,XBAR_INOUT03,FLEXIO1_D01,GPIO4_IO1,USB_PHY1_TSTI_TX_HS_MODE,JTAG_DE_B,,,,,ALT5
+GPIO_EMC_02,SEMC_DATA02,FLEXPWM4_PWM1_A,LPSPI2_SOUT,XBAR_INOUT04,FLEXIO1_D02,GPIO4_IO2,USB_PHY1_TSTI_TX_DN,,,,,,ALT5
+GPIO_EMC_03,SEMC_DATA03,FLEXPWM4_PWM1_B,LPSPI2_SIN,XBAR_INOUT05,FLEXIO1_D03,GPIO4_IO3,USB_PHY1_TSTO_RX_SQUELCH,,,,,,ALT5
+GPIO_EMC_04,SEMC_DATA04,FLEXPWM4_PWM2_A,SAI2_TX_DATA,XBAR_INOUT06,FLEXIO1_D04,GPIO4_IO4,USB_PHY1_TSTO_RX_DISCON_DET,,,,,,ALT5
+GPIO_EMC_05,SEMC_DATA05,FLEXPWM4_PWM2_B,SAI2_TX_SYNC,XBAR_INOUT07,FLEXIO1_D05,GPIO4_IO5,USB_PHY1_TSTO_RX_HS_RXD,,,,,,ALT5
+GPIO_EMC_06,SEMC_DATA06,FLEXPWM2_PWM0_A,SAI2_TX_BCLK,XBAR_INOUT08,FLEXIO1_D06,GPIO4_IO6,USB_PHY2_TSTO_RX_FS_RXD,,,,,,ALT5
+GPIO_EMC_07,SEMC_DATA07,FLEXPWM2_PWM0_B,SAI2_MCLK,XBAR_INOUT09,FLEXIO1_D07,GPIO4_IO7,USB_PHY1_TSTO_RX_HS_RXD,,,,,,ALT5
+GPIO_EMC_08,SEMC_DM0,FLEXPWM2_PWM1_A,SAI2_RX_DATA,XBAR_INOUT17,FLEXIO1_D08,GPIO4_IO8,USB_PHY1_TSTI_TX_DP,,,,,,ALT5
+GPIO_EMC_09,SEMC_ADDR00,FLEXPWM2_PWM1_B,SAI2_RX_SYNC,FLEXCAN2_TX,FLEXIO1_D09,GPIO4_IO9,USB_PHY1_TSTI_TX_EN,,FLEXSPI2_B_SS1_B,,,,ALT5
+GPIO_EMC_10,SEMC_ADDR01,FLEXPWM2_PWM2_A,SAI2_RX_BCLK,FLEXCAN2_RX,FLEXIO1_D10,GPIO4_IO10,USB_PHY1_TSTI_TX_HIZ,,FLEXSPI2_B_SS0_B,,,,ALT5
+GPIO_EMC_11,SEMC_ADDR02,FLEXPWM2_PWM2_B,LPI2C4_SDA,USDHC2_RESET_B,FLEXIO1_D11,GPIO4_IO11,USB_PHY2_TSTO_RX_FS_RXD,,FLEXSPI2_B_DQS,,,,ALT5
+GPIO_EMC_12,SEMC_ADDR03,XBAR_INOUT24,LPI2C4_SCL,USDHC1_WP,FLEXPWM1_PWM3_A,GPIO4_IO12,USB_PHY1_TSTO_PLL_CLK20DIV,,FLEXSPI2_B_SCLK,,,,ALT5
+GPIO_EMC_13,SEMC_ADDR04,XBAR_INOUT25,LPUART3_TXD,MQS_RIGHT,FLEXPWM1_PWM3_B,GPIO4_IO13,USB_PHY2_TSTO_RX_FS_20DIV,,FLEXSPI2_B_DATA0,,,,ALT5
+GPIO_EMC_14,SEMC_ADDR05,XBAR_INOUT19,LPUART3_RXD,MQS_LEFT,LPSPI2_PCS1,GPIO4_IO14,USB_PHY2_TSTO_RX_FS_ELCH,,FLEXSPI2_B_DATA1,,,,ALT5
+GPIO_EMC_15,SEMC_ADDR06,XBAR_INOUT20,LPUART3_CTS_B,SPDIF_OUT,TMR3_TIMER0,GPIO4_IO15,USB_PHY2_TSTO_RX_FS_ON_DET,,FLEXSPI2_B_DATA2,,,,ALT5
+GPIO_EMC_16,SEMC_ADDR07,XBAR_INOUT21,LPUART3_RTS_B,SPDIF_IN,TMR3_TIMER1,GPIO4_IO16,,,FLEXSPI2_B_DATA3,,,,ALT5
+GPIO_EMC_17,SEMC_ADDR08,FLEXPWM4_PWM3_A,LPUART4_CTS_B,FLEXCAN1_TX,TMR3_TIMER2,GPIO4_IO17,,,,,,,ALT5
+GPIO_EMC_18,SEMC_ADDR09,FLEXPWM4_PWM3_B,LPUART4_RTS_B,FLEXCAN1_RX,TMR3_TIMER3,GPIO4_IO18,SNVS_VIO_5_CTL,,,,,,ALT5
+GPIO_EMC_19,SEMC_ADDR11,FLEXPWM2_PWM3_A,LPUART4_TXD,ENET_RX_DATA1,TMR2_TIMER0,GPIO4_IO19,SNVS_VIO_5_B,,,,,,ALT5
+GPIO_EMC_20,SEMC_ADDR12,FLEXPWM2_PWM3_B,LPUART4_RXD,ENET_RX_DATA0,TMR2_TIMER1,GPIO4_IO20,,,,,,,ALT5
+GPIO_EMC_21,SEMC_BA0,FLEXPWM3_PWM3_A,LPI2C3_SDA,ENET_TX_DATA1,TMR2_TIMER2,GPIO4_IO21,,,,,,,ALT5
+GPIO_EMC_22,SEMC_BA1,FLEXPWM3_PWM3_B,LPI2C3_SCL,ENET_TX_DATA0,TMR2_TIMER3,GPIO4_IO22,,,FLEXSPI2_A_SS1_B,,,,ALT5
+GPIO_EMC_23,SEMC_ADDR10,FLEXPWM1_PWM0_A,LPUART5_TXD,ENET_RX_EN,GPT1_CAPTURE2,GPIO4_IO23,,,FLEXSPI2_A_DQS,,,,ALT5
+GPIO_EMC_24,SEMC_CAS,FLEXPWM1_PWM0_B,LPUART5_RXD,ENET_TX_EN,GPT1_CAPTURE1,GPIO4_IO24,,,FLEXSPI2_A_SS0_B,,,,ALT5
+GPIO_EMC_25,SEMC_RAS,FLEXPWM1_PWM1_A,LPUART6_TXD,ENET_TX_CLK,ENET_REF_CLK,GPIO4_IO25,,,FLEXSPI2_A_SCLK,,,,ALT5
+GPIO_EMC_26,SEMC_CLK,FLEXPWM1_PWM1_B,LPUART6_RXD,ENET_RX_ER,FLEXIO1_D12,GPIO4_IO26,,,FLEXSPI2_A_DATA0,,,,ALT5
+GPIO_EMC_27,SEMC_CKE,FLEXPWM1_PWM2_A,LPUART5_RTS_B,LPSPI1_SCK,FLEXIO1_D13,GPIO4_IO27,,,FLEXSPI2_A_DATA1,,,,ALT5
+GPIO_EMC_28,SEMC_WE,FLEXPWM1_PWM2_B,LPUART5_CTS_B,LPSPI1_SOUT,FLEXIO1_D14,GPIO4_IO28,,,FLEXSPI2_A_DATA2,,,,ALT5
+GPIO_EMC_29,SEMC_CS0,FLEXPWM3_PWM0_A,LPUART6_RTS_B,LPSPI1_SIN,FLEXIO1_D15,GPIO4_IO29,,,FLEXSPI2_A_DATA3,,,,ALT5
+GPIO_EMC_30,SEMC_DATA08,FLEXPWM3_PWM0_B,LPUART6_CTS_B,LPSPI1_PCS0,CSI_DATA23,GPIO4_IO30,,,ENET2_TDATA0,,,,ALT5
+GPIO_EMC_31,SEMC_DATA09,FLEXPWM3_PWM1_A,LPUART7_TXD,LPSPI1_PCS1,CSI_DATA22,GPIO4_IO31,,,ENET2_TDATA1,,,,ALT5
+GPIO_EMC_32,SEMC_DATA10,FLEXPWM3_PWM1_B,LPUART7_RXD,CCM_PMIC_READY,CSI_DATA21,GPIO3_IO18,,,ENET2_TX_EN,,,,ALT5
+GPIO_EMC_33,SEMC_DATA11,FLEXPWM3_PWM2_A,USDHC1_RESET_B,SAI3_RX_DATA,CSI_DATA20,GPIO3_IO19,,,ENET2_TX_CLK,ENET2_REF_CLK2,,,ALT5
+GPIO_EMC_34,SEMC_DATA12,FLEXPWM3_PWM2_B,USDHC1_VSELECT,SAI3_RX_SYNC,CSI_DATA19,GPIO3_IO20,,,ENET2_RX_ER,,,,ALT5
+GPIO_EMC_35,SEMC_DATA13,XBAR_INOUT18,GPT1_COMPARE1,SAI3_RX_BCLK,CSI_DATA18,GPIO3_IO21,USDHC1_CD_B,,ENET2_RDATA0,,,,ALT5
+GPIO_EMC_36,SEMC_DATA14,XBAR_INOUT22,GPT1_COMPARE2,SAI3_TX_DATA,CSI_DATA17,GPIO3_IO22,USDHC1_WP,,ENET2_RDATA1,FLEXCAN3_TX,,,ALT5
+GPIO_EMC_37,SEMC_DATA15,XBAR_INOUT23,GPT1_COMPARE3,SAI3_MCLK,CSI_DATA16,GPIO3_IO23,USDHC2_WP,,ENET2_RX_EN,FLEXCAN3_RX,,,ALT5
+GPIO_EMC_38,SEMC_DM1,FLEXPWM1_PWM3_A,LPUART8_TXD,SAI3_TX_BCLK,CSI_FIELD,GPIO3_IO24,USDHC2_VSELECT,,ENET2_MDC,,,,ALT5
+GPIO_EMC_39,SEMC_DQS,FLEXPWM1_PWM3_B,LPUART8_RXD,SAI3_TX_SYNC,WDOG1_B,GPIO3_IO25,USDHC2_CD_B,,ENET2_MDIO,,,,ALT5
+GPIO_EMC_40,SEMC_RDY,GPT2_CAPTURE2,LPSPI1_PCS2,USB_OTG2_OC,ENET_MDC,GPIO3_IO26,USDHC2_RESET_B,,,,,,ALT5
+GPIO_EMC_41,SEMC_CSX0,GPT2_CAPTURE1,LPSPI1_PCS3,USB_OTG2_PWR,ENET_MDIO,GPIO3_IO27,USDHC1_VSELECT,,,,,,ALT5
+GPIO_SD_B0_00,USDHC1_CMD,FLEXPWM1_PWM0_A,LPI2C3_SCL,XBAR_INOUT04,LPSPI1_SCK,GPIO3_IO12,FLEXSPI_A_SS1_B,,ENET2_TX_EN,,,,ALT5
+GPIO_SD_B0_01,USDHC1_CLK,FLEXPWM1_PWM0_B,LPI2C3_SDA,XBAR_INOUT05,LPSPI1_PCS0,GPIO3_IO13,FLEXSPI_B_SS1_B,,ENET2_TX_CLK,ENET2_REF_CLK2,,,ALT5
+GPIO_SD_B0_02,USDHC1_DATA0,FLEXPWM1_PWM1_A,LPUART8_CTS_B,XBAR_INOUT06,LPSPI1_SOUT,GPIO3_IO14,,,ENET2_RX_ER,,,,ALT5
+GPIO_SD_B0_03,USDHC1_DATA1,FLEXPWM1_PWM1_B,LPUART8_RTS_B,XBAR_INOUT07,LPSPI1_SIN,GPIO3_IO15,,,ENET2_RDATA0,,,,ALT5
+GPIO_SD_B0_04,USDHC1_DATA2,FLEXPWM1_PWM2_A,LPUART8_TXD,XBAR_INOUT08,FLEXSPI_B_SS0_B,GPIO3_IO16,CCM_CLKO1,,ENET2_RDATA1,,,,ALT5
+GPIO_SD_B0_05,USDHC1_DATA3,FLEXPWM1_PWM2_B,LPUART8_RXD,XBAR_INOUT09,FLEXSPI_B_DQS,GPIO3_IO17,CCM_CLKO2,,ENET2_RX_EN,,,,ALT5
+GPIO_SD_B1_00,USDHC2_DATA3,FLEXSPI_B_DATA3,FLEXPWM1_PWM3_A,"SAI1_TX_DATA3,SAI1_RX_DATA1",LPUART4_TXD,GPIO3_IO00,,,SAI3_RX_DATA,,,,ALT5
+GPIO_SD_B1_01,USDHC2_DATA2,FLEXSPI_B_DATA2,FLEXPWM1_PWM3_B,"SAI1_TX_DATA2,SAI1_RX_DATA2",LPUART4_RXD,GPIO3_IO01,,,SAI3_TX_DATA,,,,ALT5
+GPIO_SD_B1_02,USDHC2_DATA1,FLEXSPI_B_DATA1,FLEXPWM2_PWM3_A,"SAI1_TX_DATA1,SAI1_RX_DATA3",FLEXCAN1_TX,GPIO3_IO02,CCM_WAIT,,SAI3_TX_SYNC,,,,ALT5
+GPIO_SD_B1_03,USDHC2_DATA0,FLEXSPI_B_DATA0,FLEXPWM2_PWM3_B,SAI1_MCLK,FLEXCAN1_RX,GPIO3_IO03,CCM_PMIC_READY,,SAI3_TX_BCLK,,,,ALT5
+GPIO_SD_B1_04,USDHC2_CLK,FLEXSPI_B_SCLK,LPI2C1_SCL,SAI1_RX_SYNC,FLEXSPI_A_SS1_B,GPIO3_IO04,CCM_STOP,,SAI3_MCLK,,,,ALT5
+GPIO_SD_B1_05,USDHC2_CMD,FLEXSPI_A_DQS,LPI2C1_SDA,SAI1_RX_BCLK,FLEXSPI_B_SS0_B,GPIO3_IO05,,,SAI3_RX_SYNC,,,,ALT5
+GPIO_SD_B1_06,USDHC2_RESET_B,FLEXSPI_A_SS0_B,LPUART7_CTS_B,SAI1_RX_DATA0,LPSPI2_PCS0,GPIO3_IO06,,,SAI3_RX_BCLK,,,,ALT5
+GPIO_SD_B1_07,SEMC_CSX1,FLEXSPI_A_SCLK,LPUART7_RTS_B,SAI1_TX_DATA0,LPSPI2_SCK,GPIO3_IO07,,,,,,,ALT5
+GPIO_SD_B1_08,USDHC2_DATA4,FLEXSPI_A_DATA0,LPUART7_TXD,SAI1_TX_BCLK,LPSPI2_SOUT,GPIO3_IO08,SEMC_CSX2,,,,,,ALT5
+GPIO_SD_B1_09,USDHC2_DATA5,FLEXSPI_A_DATA1,LPUART7_RXD,SAI1_TX_SYNC,LPSPI2_SIN,GPIO3_IO09,,,,,,,ALT5
+GPIO_SD_B1_10,USDHC2_DATA6,FLEXSPI_A_DATA2,LPUART2_RXD,LPI2C2_SDA,LPSPI2_PCS2,GPIO3_IO10,,,,,,,ALT5
+GPIO_SD_B1_11,USDHC2_DATA7,FLEXSPI_A_DATA3,LPUART2_TXD,LPI2C2_SCL,LPSPI2_PCS3,GPIO3_IO11,,,,,,,ALT5
diff --git a/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.h b/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.h
index e05c8824d26ce..3eddb4102142e 100644
--- a/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.h
+++ b/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.h
@@ -3,6 +3,6 @@
 
 
 // MIMXRT1064_EVK has 1 user LED
-#define MICROPY_HW_LED1_PIN (GPIO_AD_B0_09)
+#define MICROPY_HW_LED1_PIN (pin_GPIO_AD_B0_09)
 #define MICROPY_HW_LED_ON(pin) (mp_hal_pin_low(pin))
 #define MICROPY_HW_LED_OFF(pin) (mp_hal_pin_high(pin))
diff --git a/ports/mimxrt/boards/MIMXRT1064_EVK/pins.c b/ports/mimxrt/boards/MIMXRT1064_EVK/pins.c
deleted file mode 100644
index d5da9c6f99275..0000000000000
--- a/ports/mimxrt/boards/MIMXRT1064_EVK/pins.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2020 NXP
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#include "pin.h"
-
-static pin_af_obj_t GPIO_AD_B0_09_af[] = {
-    PIN_AF(GPIO1_IO09, PIN_AF_MODE_ALT5, GPIO1, 0x10B0U),
-};
-
-pin_obj_t GPIO_AD_B0_09 = PIN(GPIO_AD_B0_09, GPIO1, 9, GPIO_AD_B0_09_af);
diff --git a/ports/mimxrt/boards/MIMXRT1064_EVK/pins.csv b/ports/mimxrt/boards/MIMXRT1064_EVK/pins.csv
new file mode 100644
index 0000000000000..afd63d4f97fe8
--- /dev/null
+++ b/ports/mimxrt/boards/MIMXRT1064_EVK/pins.csv
@@ -0,0 +1,51 @@
+D0,GPIO_AD_B1_07
+D1,GPIO_AD_B1_06
+D2,GPIO_AD_B0_11
+D3,GPIO_AD_B1_08
+D4,GPIO_AD_B0_09
+D5,GPIO_AD_B0_10
+D6,GPIO_AD_B1_02
+D7,GPIO_AD_B1_03
+D8,GPIO_AD_B0_03
+D9,GPIO_AD_B0_02
+D10,GPIO_SD_B0_01
+D11,GPIO_SD_B0_02
+D12,GPIO_SD_B0_03
+D13,GPIO_SD_B0_00
+D14,GPIO_AD_B1_01
+D15,GPIO_AD_B1_00
+A0,GPIO_AD_B1_10
+A1,GPIO_AD_B1_11
+A2,GPIO_AD_B1_04
+A3,GPIO_AD_B1_05
+A4,GPIO_AD_B1_01
+A5,GPIO_AD_B1_00
+RX,GPIO_AD_B1_07
+TX,GPIO_AD_B1_06
+SCL,GPIO_AD_B1_00
+SDA,GPIO_AD_B1_01
+SCK,GPIO_SD_B0_00
+SDI,GPIO_SD_B0_03
+SDO,GPIO_SD_B0_02
+CS,GPIO_SD_B0_01
+LED_GREEN,GPIO_AD_B0_09
+GPIO_AD_B1_07,GPIO_AD_B1_07
+GPIO_AD_B1_06,GPIO_AD_B1_06
+GPIO_AD_B0_11,GPIO_AD_B0_11
+GPIO_AD_B1_08,GPIO_AD_B1_08
+GPIO_AD_B0_09,GPIO_AD_B0_09
+GPIO_AD_B0_10,GPIO_AD_B0_10
+GPIO_AD_B1_02,GPIO_AD_B1_02
+GPIO_AD_B1_03,GPIO_AD_B1_03
+GPIO_AD_B0_03,GPIO_AD_B0_03
+GPIO_AD_B0_02,GPIO_AD_B0_02
+GPIO_SD_B0_01,GPIO_SD_B0_01
+GPIO_SD_B0_02,GPIO_SD_B0_02
+GPIO_SD_B0_03,GPIO_SD_B0_03
+GPIO_SD_B0_00,GPIO_SD_B0_00
+GPIO_AD_B1_01,GPIO_AD_B1_01
+GPIO_AD_B1_00,GPIO_AD_B1_00
+GPIO_AD_B1_10,GPIO_AD_B1_10
+GPIO_AD_B1_11,GPIO_AD_B1_11
+GPIO_AD_B1_04,GPIO_AD_B1_04
+GPIO_AD_B1_05,GPIO_AD_B1_05
diff --git a/ports/mimxrt/boards/MIMXRT1064_EVK/pins.h b/ports/mimxrt/boards/MIMXRT1064_EVK/pins.h
deleted file mode 100644
index baef51c6c8612..0000000000000
--- a/ports/mimxrt/boards/MIMXRT1064_EVK/pins.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2020 NXP
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-// NOTE: pins.h shall only be included in in pin.h
-// hence no include guards are needed since they will be provided by pin.h
-
-extern pin_obj_t GPIO_AD_B0_09;
diff --git a/ports/mimxrt/boards/MIMXRT1064_af.csv b/ports/mimxrt/boards/MIMXRT1064_af.csv
new file mode 100644
index 0000000000000..074a3f69ab3b4
--- /dev/null
+++ b/ports/mimxrt/boards/MIMXRT1064_af.csv
@@ -0,0 +1,125 @@
+Pad,ALT0, ALT1, ALT2, ALT3, ALT4, ALT5, ALT6, ALT7, ALT8, ALT9,ADC,ACMP,Default
+GPIO_AD_B0_00,FLEXPWM2_PWM3_A,XBAR_INOUT14,REF_CLK_32K,USB_OTG2_ID,LPI2C1_SCLS,GPIO1_IO00,USDHC1_RESET_B,LPSPI3_SCK,,,,ACMP1_IN4,ALT5
+GPIO_AD_B0_01,FLEXPWM2_PWM3_B,XBAR_INOUT15,REF_CLK_24M,USB_OTG1_ID,LPI2C1_SDAS,GPIO1_IO01,EWM_OUT_B,LPSPI3_SOUT,,,,ACMP2_IN4,ALT5
+GPIO_AD_B0_02,FLEXCAN2_TX,XBAR_INOUT16,LPUART6_TXD,USB_OTG1_PWR,FLEXPWM1_PWM0_X,GPIO1_IO02,LPI2C1_HREQ,LPSPI3_SIN,,,,ACMP3_IN4,ALT5
+GPIO_AD_B0_03,FLEXCAN2_RX,XBAR_INOUT17,LPUART6_RXD,USB_OTG1_OC,FLEXPWM1_PWM1_X,GPIO1_IO03,REF_CLK_24M,LPSPI3_PCS0,,,,ACMP4_IN4,ALT5
+GPIO_AD_B0_04,SRC_BOOT_MODE0,MQS_RIGHT,ENET_TX_DATA3,SAI2_TX_SYNC,CSI_DATA09,GPIO1_IO04,PIT_TRIGGER0,LPSPI3_PCS1,,,,,ALT0
+GPIO_AD_B0_05,SRC_BOOT_MODE1,MQS_LEFT,ENET_TX_DATA2,SAI2_TX_BCLK,CSI_DATA08,GPIO1_IO05,XBAR_INOUT17,LPSPI3_PCS2,,,,,ALT0
+GPIO_AD_B0_06,"JTAG_TMS,SWD_DIO",GPT2_COMPARE1,ENET_RX_CLK,SAI2_RX_BCLK,CSI_DATA07,GPIO1_IO06,XBAR_INOUT18,LPSPI3_PCS3,,,,,ALT0
+GPIO_AD_B0_07,"JTAG_TCK,SWD_CLK",GPT2_COMPARE2,ENET_TX_ER,SAI2_RX_SYNC,CSI_DATA06,GPIO1_IO07,XBAR_INOUT19,ENET_1588_EVENT3_OUT,,,,,ALT0
+GPIO_AD_B0_08,JTAG_MOD,GPT2_COMPARE3,ENET_RX_DATA3,SAI2_RX_DATA,CSI_DATA05,GPIO1_IO08,XBAR_INOUT20,ENET_1588_EVENT3_IN,,,,,ALT0
+GPIO_AD_B0_09,JTAG_TDI,FLEXPWM2_PWM3_A,ENET_RX_DATA2,SAI2_TX_DATA,CSI_DATA04,GPIO1_IO09,XBAR_INOUT21,GPT2_CLK,,SEMC_DQS4,,,ALT0
+GPIO_AD_B0_10,JTAG_TDO,FLEXPWM1_PWM3_A,ENET_CRS,SAI2_MCLK,CSI_DATA03,GPIO1_IO10,XBAR_INOUT22,ENET_1588_EVENT0_OUT,FLEXCAN3_TX,ARM_TRACE_SWO,,,ALT0
+GPIO_AD_B0_11,JTAG_TRSTB,FLEXPWM1_PWM3_B,ENET_COL,WDOG1_B,CSI_DATA02,GPIO1_IO11,XBAR_INOUT23,ENET_1588_EVENT0_IN,FLEXCAN3_RX,SEMC_CLK6,,,ALT0
+GPIO_AD_B0_12,LPI2C4_SCL,CCM_PMIC_READY,LPUART1_TXD,WDOG2_B,FLEXPWM1_PWM2_X,GPIO1_IO12,ENET_1588_EVENT1_OUT,NMI_GLUE_NMI,,,ADC1_IN1,,ALT5
+GPIO_AD_B0_13,LPI2C4_SDA,GPT1_CLK,LPUART1_RXD,EWM_OUT_B,FLEXPWM1_PWM3_X,GPIO1_IO13,ENET_1588_EVENT1_IN,REF_CLK_24M,,,ADC1_IN2,ACMP1_IN2,ALT5
+GPIO_AD_B0_14,USB_OTG2_OC,XBAR_INOUT24,LPUART1_CTS_B,ENET_1588_EVENT0_OUT,CSI_VSYNC,GPIO1_IO14,FLEXCAN2_TX,WDOG1_ANY,FLEXCAN3_TX,,ADC1_IN3,ACMP2_IN2,ALT5
+GPIO_AD_B0_15,USB_OTG2_PWR,XBAR_INOUT25,LPUART1_RTS_B,ENET_1588_EVENT0_IN,CSI_HSYNC,GPIO1_IO15,FLEXCAN2_RX,WDOG1_RESET_B_DEB,FLEXCAN3_RX,,ADC1_IN4,ACMP3_IN2,ALT5
+GPIO_AD_B1_00,USB_OTG2_ID,TMR3_TIMER0,LPUART2_CTS_B,LPI2C1_SCL,WDOG1_B,GPIO1_IO16,USDHC1_WP,KPP_ROW7,ENET2_1588_EVENT0_OUT,FLEXIO3_D00,"ADC1_IN5,ADC2_IN5",ACMP4_IN2,ALT5
+GPIO_AD_B1_01,USB_OTG1_PWR,TMR3_TIMER1,LPUART2_RTS_B,LPI2C1_SDA,CCM_PMIC_READY,GPIO1_IO17,USDHC1_VSELECT,KPP_COL7,ENET2_1588_EVENT0_IN,FLEXIO3_D01,"ADC1_IN6,ADC2_IN6","ACMP1_IN0,ACMP2_IN0,ACMP3_IN0,ACMP4_IN0",ALT5
+GPIO_AD_B1_02,USB_OTG1_ID,TMR3_TIMER2,LPUART2_TXD,SPDIF_OUT,ENET_1588_EVENT2_OUT,GPIO1_IO18,USDHC1_CD_B,KPP_ROW6,GPT2_CLK,FLEXIO3_D02,"ADC1_IN7,ADC2_IN7",ACMP1_IN3,ALT5
+GPIO_AD_B1_03,USB_OTG1_OC,TMR3_TIMER3,LPUART2_RXD,SPDIF_IN,ENET_1588_EVENT2_IN,GPIO1_IO19,USDHC2_CD_B,KPP_COL6,GPT2_CAPTURE1,FLEXIO3_D03,"ADC1_IN8,ADC2_IN8",ACMP2_IN3,ALT5
+GPIO_AD_B1_04,FLEXSPI_B_DATA3,ENET_MDC,LPUART3_CTS_B,SPDIF_SR_CLK,CSI_PIXCLK,GPIO1_IO20,USDHC2_DATA0,KPP_ROW5,GPT2_CAPTURE2,FLEXIO3_D04,"ADC1_IN9,ADC2_IN9",ACMP3_IN3,ALT5
+GPIO_AD_B1_05,FLEXSPI_B_DATA2,ENET_MDIO,LPUART3_RTS_B,SPDIF_OUT,CSI_MCLK,GPIO1_IO21,USDHC2_DATA1,KPP_COL5,GPT2_COMPARE1,FLEXIO3_D05,"ADC1_IN10,ADC2_IN10",ACMP4_IN3,ALT5
+GPIO_AD_B1_06,FLEXSPI_B_DATA1,LPI2C3_SDA,LPUART3_TXD,SPDIF_LOCK,CSI_VSYNC,GPIO1_IO22,USDHC2_DATA2,KPP_ROW4,GPT2_COMPARE2,FLEXIO3_D06,"ADC1_IN11,ADC2_IN11","ACMP1_IN1,ACMP2_IN1,ACMP3_IN1,ACMP4_IN1",ALT5
+GPIO_AD_B1_07,FLEXSPI_B_DATA0,LPI2C3_SCL,LPUART3_RXD,SPDIF_EXT_CLK,CSI_HSYNC,GPIO1_IO23,USDHC2_DATA3,KPP_COL4,GPT2_COMPARE3,FLEXIO3_D07,"ADC1_IN12,ADC2_IN12",ACMP1_IN5,ALT5
+GPIO_AD_B1_08,FLEXSPI_A_SS1_B,FLEXPWM4_PWM0_A,FLEXCAN1_TX,CCM_PMIC_READY,CSI_DATA09,GPIO1_IO24,USDHC2_CMD,KPP_ROW3,,FLEXIO3_D08,"ADC1_IN13,ADC2_IN13",ACMP2_IN5,ALT5
+GPIO_AD_B1_09,FLEXSPI_A_DQS,FLEXPWM4_PWM1_A,FLEXCAN1_RX,SAI1_MCLK,CSI_DATA08,GPIO1_IO25,USDHC2_CLK,KPP_COL3,,FLEXIO3_D09,"ADC1_IN14,ADC2_IN14",ACMP3_IN5,ALT5
+GPIO_AD_B1_10,FLEXSPI_A_DATA3,WDOG1_B,LPUART8_TXD,SAI1_RX_SYNC,CSI_DATA07,GPIO1_IO26,USDHC2_WP,KPP_ROW2,ENET2_1588_EVENT1_OUT,FLEXIO3_D10,"ADC1_IN15,ADC2_IN15",ACMP4_IN5,ALT5
+GPIO_AD_B1_11,FLEXSPI_A_DATA2,EWM_OUT_B,LPUART8_RXD,SAI1_RX_BCLK,CSI_DATA06,GPIO1_IO27,USDHC2_RESET_B,KPP_COL2,ENET2_1588_EVENT1_IN,FLEXIO3_D11,"ADC1_IN0,ADC2_IN0",ACMP1_IN6,ALT5
+GPIO_AD_B1_12,FLEXSPI_A_DATA1,ACMP_OUT00,LPSPI3_PCS0,SAI1_RX_DATA0,CSI_DATA05,GPIO1_IO28,USDHC2_DATA4,KPP_ROW1,ENET2_1588_EVENT2_OUT,FLEXIO3_D12,ADC2_IN1,"ACMP1_OUT,ACMP2_IN6",ALT5
+GPIO_AD_B1_13,FLEXSPI_A_DATA0,ACMP_OUT01,LPSPI3_SIN,SAI1_TX_DATA0,CSI_DATA04,GPIO1_IO29,USDHC2_DATA5,KPP_COL1,ENET2_1588_EVENT2_IN,FLEXIO3_D13,ADC2_IN2,"ACMP2_OUT,ACMP3_IN6",ALT5
+GPIO_AD_B1_14,FLEXSPI_A_SCLK,ACMP_OUT02,LPSPI3_SOUT,SAI1_TX_BCLK,CSI_DATA03,GPIO1_IO30,USDHC2_DATA6,KPP_ROW0,ENET2_1588_EVENT3_OUT,FLEXIO3_D14,ADC2_IN3,"ACMP3_OUT,ACMP4_IN6",ALT5
+GPIO_AD_B1_15,FLEXSPI_A_SS0_B,AMCP_OUT03,LPSPI3_SCK,SAI1_TX_SYNC,CSI_DATA02,GPIO1_IO31,USDHC2_DATA7,KPP_COL0,ENET2_1588_EVENT3_IN,FLEXIO3_D15,ADC2_IN4,ACMP4_OUT,ALT5
+GPIO_B0_00,LCD_CLK,TMR1_TIMER0,MQS_RIGHT,LPSPI4_PCS0,FLEXIO2_D00,GPIO2_IO00,SEMC_CSX1,,ENET2_MDC,,,,ALT5
+GPIO_B0_01,LCD_ENABLE,TMR1_TIMER1,MQS_LEFT,LPSPI4_SIN,FLEXIO2_D01,GPIO2_IO01,SEMC_CSX2,,ENET2_MDIO,,,,ALT5
+GPIO_B0_02,LCD_HSYNC,TMR1_TIMER2,FLEXCAN1_TX,LPSPI4_SOUT,FLEXIO2_D02,GPIO2_IO02,SEMC_CSX3,,ENET2_1588_EVENT0_OUT,,,,ALT5
+GPIO_B0_03,LCD_VSYNC,TMR2_TIMER0,FLEXCAN1_RX,LPSPI4_SCK,FLEXIO2_D03,GPIO2_IO03,WDOG2_RESET_B_DEB,,ENET2_1588_EVENT0_IN,,,,ALT5
+GPIO_B0_04,LCD_DATA00,TMR2_TIMER1,LPI2C2_SCL,ARM_TRACE0,FLEXIO2_D04,GPIO2_IO04,SRC_BT_CFG00,,ENET2_TDATA3,,,,ALT5
+GPIO_B0_05,LCD_DATA01,TMR2_TIMER2,LPI2C2_SDA,ARM_TRACE1,FLEXIO2_D05,GPIO2_IO05,SRC_BT_CFG01,,ENET2_TDATA2,,,,ALT5
+GPIO_B0_06,LCD_DATA02,TMR3_TIMER0,FLEXPWM2_PWM0_A,ARM_TRACE2,FLEXIO2_D06,GPIO2_IO06,SRC_BT_CFG02,,ENET2_RX_CLK,,,,ALT5
+GPIO_B0_07,LCD_DATA03,TMR3_TIMER1,FLEXPWM2_PWM0_B,ARM_TRACE3,FLEXIO2_D07,GPIO2_IO07,SRC_BT_CFG03,,ENET2_TX_ER,,,,ALT5
+GPIO_B0_08,LCD_DATA04,TMR3_TIMER2,FLEXPWM2_PWM1_A,LPUART3_TXD,FLEXIO2_D08,GPIO2_IO08,SRC_BT_CFG04,,ENET2_RDATA3,,,,ALT5
+GPIO_B0_09,LCD_DATA05,TMR4_TIMER0,FLEXPWM2_PWM1_B,LPUART3_RXD,FLEXIO2_D09,GPIO2_IO09,SRC_BT_CFG05,,ENET2_RDATA2,,,,ALT5
+GPIO_B0_10,LCD_DATA06,TMR4_TIMER1,FLEXPWM2_PWM2_A,"SAI1_TX_DATA3,SAI1_RX_DATA1",FLEXIO2_D10,GPIO2_IO10,SRC_BT_CFG06,,ENET2_CRS,,,,ALT5
+GPIO_B0_11,LCD_DATA07,TMR4_TIMER2,FLEXPWM2_PWM2_B,"SAI1_TX_DATA2,SAI1_RX_DATA2",FLEXIO2_D11,GPIO2_IO11,SRC_BT_CFG07,,ENET2_COL,,,,ALT5
+GPIO_B0_12,LCD_DATA08,XBAR_INOUT10,ARM_TRACE_CLK,"SAI1_TX_DATA1,SAI1_RX_DATA3",FLEXIO2_D12,GPIO2_IO12,SRC_BT_CFG08,,ENET2_TDATA0,,,,ALT5
+GPIO_B0_13,LCD_DATA09,XBAR_INOUT11,ARM_TRACE_SWO,SAI1_MCLK,FLEXIO2_D13,GPIO2_IO13,SRC_BT_CFG09,,ENET2_TDATA1,,,,ALT5
+GPIO_B0_14,LCD_DATA10,XBAR_INOUT12,ARM_EVENT0,SAI1_RX_SYNC,FLEXIO2_D14,GPIO2_IO14,SRC_BT_CFG10,,ENET2_TX_EN,ENET2_REF_CLK2,,,ALT5
+GPIO_B0_15,LCD_DATA11,XBAR_INOUT13,ARM_EVENT1,SAI1_RX_BCLK,FLEXIO2_D15,GPIO2_IO15,SRC_BT_CFG11,,ENET2_TX_CLK,ENET2_REF_CLK2,,,ALT5
+GPIO_B1_00,LCD_DATA12,XBAR_INOUT14,LPUART4_TXD,SAI1_RX_DATA0,FLEXIO2_D16,GPIO2_IO16,FLEXPWM1_PWM3_A,,ENET2_RX_ER,FLEXIO3_D16,,,ALT5
+GPIO_B1_01,LCD_DATA13,XBAR_INOUT15,LPUART4_RXD,SAI1_TX_DATA0,FLEXIO2_D17,GPIO2_IO17,FLEXPWM1_PWM3_B,,ENET2_RDATA0,FLEXIO3_D17,,,ALT5
+GPIO_B1_02,LCD_DATA14,XBAR_INOUT16,LPSPI4_PCS2,SAI1_TX_BCLK,FLEXIO2_D18,GPIO2_IO18,FLEXPWM2_PWM3_A,,ENET2_RDATA1,FLEXIO3_D18,,,ALT5
+GPIO_B1_03,LCD_DATA15,XBAR_INOUT17,LPSPI4_PCS1,SAI1_TX_SYNC,FLEXIO2_D19,GPIO2_IO19,FLEXPWM2_PWM3_B,,ENET2_RX_EN,FLEXIO3_D19,,,ALT5
+GPIO_B1_04,LCD_DATA16,LPSPI4_PCS0,CSI_DATA15,ENET_RX_DATA0,FLEXIO2_D20,GPIO2_IO20,,,GPT1_CLK,FLEXIO3_D20,,,ALT5
+GPIO_B1_05,LCD_DATA17,LPSPI4_SIN,CSI_DATA14,ENET_RX_DATA1,FLEXIO2_D21,GPIO2_IO21,,,GPT1_CAPTURE1,FLEXIO3_D21,,,ALT5
+GPIO_B1_06,LCD_DATA18,LPSPI4_SOUT,CSI_DATA13,ENET_RX_EN,FLEXIO2_D22,GPIO2_IO22,,,GPT1_CAPTURE2,FLEXIO3_D22,,,ALT5
+GPIO_B1_07,LCD_DATA19,LPSPI4_SCK,CSI_DATA12,ENET_TX_DATA0,FLEXIO2_D23,GPIO2_IO23,,,GPT1_COMPARE1,FLEXIO3_D23,,,ALT5
+GPIO_B1_08,LCD_DATA20,TMR1_TIMER3,CSI_DATA11,ENET_TX_DATA1,FLEXIO2_D24,GPIO2_IO24,FLEXCAN2_TX,,GPT1_COMPARE2,FLEXIO3_D24,,,ALT5
+GPIO_B1_09,LCD_DATA21,TMR2_TIMER3,CSI_DATA10,ENET_TX_EN,FLEXIO2_D25,GPIO2_IO25,FLEXCAN2_RX,,GPT1_COMPARE3,FLEXIO3_D25,,,ALT5
+GPIO_B1_10,LCD_DATA22,TMR3_TIMER3,CSI_DATA00,ENET_TX_CLK,FLEXIO2_D26,GPIO2_IO26,ENET_REF_CLK,,,FLEXIO3_D26,,,ALT5
+GPIO_B1_11,LCD_DATA23,TMR4_TIMER3,CSI_DATA01,ENET_RX_ER,FLEXIO2_D27,GPIO2_IO27,LPSPI4_PCS3,,,FLEXIO3_D27,,,ALT5
+GPIO_B1_12,,LPUART5_TXD,CSI_PIXCLK,ENET_1588_EVENT0_IN,FLEXIO2_D28,GPIO2_IO28,USDHC1_CD_B,,,FLEXIO3_D28,,,ALT5
+GPIO_B1_13,WDOG1_B,LPUART5_RXD,CSI_VSYNC,ENET_1588_EVENT0_OUT,FLEXIO2_D29,GPIO2_IO29,USDHC1_WP,,,FLEXIO3_D29,,,ALT5
+GPIO_B1_14,ENET_MDC,FLEXPWM4_PWM2_A,CSI_HSYNC,XBAR_INOUT02,FLEXIO2_D30,GPIO2_IO30,USDHC1_VSELECT,,ENET2_TDATA0,FLEXIO3_D30,,,ALT5
+GPIO_B1_15,ENET_MDIO,FLEXPWM4_PWM3_A,CSI_MCLK,XBAR_INOUT03,FLEXIO2_D31,GPIO2_IO31,USDHC1_RESET_B,,ENET2_TDATA1,FLEXIO3_D31,,,ALT5
+GPIO_EMC_00,SEMC_DATA00,FLEXPWM4_PWM0_A,LPSPI2_SCK,XBAR_INOUT02,FLEXIO1_D00,GPIO4_IO0,USB_PHY1_TSTI_TX_LS_MODE,,,,,,ALT5
+GPIO_EMC_01,SEMC_DATA01,FLEXPWM4_PWM0_B,LPSPI2_PCS0,XBAR_INOUT03,FLEXIO1_D01,GPIO4_IO1,USB_PHY1_TSTI_TX_HS_MODE,JTAG_DE_B,,,,,ALT5
+GPIO_EMC_02,SEMC_DATA02,FLEXPWM4_PWM1_A,LPSPI2_SOUT,XBAR_INOUT04,FLEXIO1_D02,GPIO4_IO2,USB_PHY1_TSTI_TX_DN,,,,,,ALT5
+GPIO_EMC_03,SEMC_DATA03,FLEXPWM4_PWM1_B,LPSPI2_SIN,XBAR_INOUT05,FLEXIO1_D03,GPIO4_IO3,USB_PHY1_TSTO_RX_SQUELCH,,,,,,ALT5
+GPIO_EMC_04,SEMC_DATA04,FLEXPWM4_PWM2_A,SAI2_TX_DATA,XBAR_INOUT06,FLEXIO1_D04,GPIO4_IO4,USB_PHY1_TSTO_RX_DISCON_DET,,,,,,ALT5
+GPIO_EMC_05,SEMC_DATA05,FLEXPWM4_PWM2_B,SAI2_TX_SYNC,XBAR_INOUT07,FLEXIO1_D05,GPIO4_IO5,USB_PHY1_TSTO_RX_HS_RXD,,,,,,ALT5
+GPIO_EMC_06,SEMC_DATA06,FLEXPWM2_PWM0_A,SAI2_TX_BCLK,XBAR_INOUT08,FLEXIO1_D06,GPIO4_IO6,USB_PHY2_TSTO_RX_FS_RXD,,,,,,ALT5
+GPIO_EMC_07,SEMC_DATA07,FLEXPWM2_PWM0_B,SAI2_MCLK,XBAR_INOUT09,FLEXIO1_D07,GPIO4_IO7,USB_PHY1_TSTO_RX_HS_RXD,,,,,,ALT5
+GPIO_EMC_08,SEMC_DM0,FLEXPWM2_PWM1_A,SAI2_RX_DATA,XBAR_INOUT17,FLEXIO1_D08,GPIO4_IO8,USB_PHY1_TSTO_RX_HS_,,,,,,ALT5
+GPIO_EMC_09,SEMC_ADDR00,FLEXPWM2_PWM1_B,SAI2_RX_SYNC,FLEXCAN2_TX,FLEXIO1_D09,GPIO4_IO9,USB_PHY1_TSTI_TX_EN,,FLEXSPI2_B_SS1_B,,,,ALT5
+GPIO_EMC_10,SEMC_ADDR01,FLEXPWM2_PWM2_A,SAI2_RX_BCLK,FLEXCAN2_RX,FLEXIO1_D10,GPIO4_IO10,USB_PHY1_TSTI_TX_HIZ,,FLEXSPI2_B_SS0_B,,,,ALT5
+GPIO_EMC_11,SEMC_ADDR02,FLEXPWM2_PWM2_B,LPI2C4_SDA,USDHC2_RESET_B,FLEXIO1_D11,GPIO4_IO11,USB_PHY2_TSTO_RX_HS_RXD,,FLEXSPI2_B_DQS,,,,ALT5
+GPIO_EMC_12,SEMC_ADDR03,XBAR_INOUT24,LPI2C4_SCL,USDHC1_WP,FLEXPWM1_PWM3_A,GPIO4_IO12,USB_PHY1_TSTO_PLL_CLK20DIV,,FLEXSPI2_B_SCLK,,,,ALT5
+GPIO_EMC_13,SEMC_ADDR04,XBAR_INOUT25,LPUART3_TXD,MQS_RIGHT,FLEXPWM1_PWM3_B,GPIO4_IO13,USB_PHY2_TSTO_PLL_CLK20DIV,,FLEXSPI2_B_DATA0,,,,ALT5
+GPIO_EMC_14,SEMC_ADDR05,XBAR_INOUT19,LPUART3_RXD,MQS_LEFT,LPSPI2_PCS1,GPIO4_IO14,USB_PHY2_TSTO_RX_SQUELCH,,FLEXSPI2_B_DATA1,,,,ALT5
+GPIO_EMC_15,SEMC_ADDR06,XBAR_INOUT20,LPUART3_CTS_B,SPDIF_OUT,TMR3_TIMER0,GPIO4_IO15,USB_PHY2_TSTO_RX_DISCON_DET,,FLEXSPI2_B_DATA2,,,,ALT5
+GPIO_EMC_16,SEMC_ADDR07,XBAR_INOUT21,LPUART3_RTS_B,SPDIF_IN,TMR3_TIMER1,GPIO4_IO16,,,FLEXSPI2_B_DATA3,,,,ALT5
+GPIO_EMC_17,SEMC_ADDR08,FLEXPWM4_PWM3_A,LPUART4_CTS_B,FLEXCAN1_TX,TMR3_TIMER2,GPIO4_IO17,,,,,,,ALT5
+GPIO_EMC_18,SEMC_ADDR09,FLEXPWM4_PWM3_B,LPUART4_RTS_B,FLEXCAN1_RX,TMR3_TIMER3,GPIO4_IO18,SNVS_VIO_5_CTL,,,,,,ALT5
+GPIO_EMC_19,SEMC_ADDR11,FLEXPWM2_PWM3_A,LPUART4_TXD,ENET_RX_DATA1,TMR2_TIMER0,GPIO4_IO19,SNVS_VIO_5_B,,,,,,ALT5
+GPIO_EMC_20,SEMC_ADDR12,FLEXPWM2_PWM3_B,LPUART4_RXD,ENET_RX_DATA0,TMR2_TIMER1,GPIO4_IO20,,,,,,,ALT5
+GPIO_EMC_21,SEMC_BA0,FLEXPWM3_PWM3_A,LPI2C3_SDA,ENET_TX_DATA1,TMR2_TIMER2,GPIO4_IO21,,,,,,,ALT5
+GPIO_EMC_22,SEMC_BA1,FLEXPWM3_PWM3_B,LPI2C3_SCL,ENET_TX_DATA0,TMR2_TIMER3,GPIO4_IO22,,,FLEXSPI2_A_SS1_B,,,,ALT5
+GPIO_EMC_23,SEMC_ADDR10,FLEXPWM1_PWM0_A,LPUART5_TXD,ENET_RX_EN,GPT1_CAPTURE2,GPIO4_IO23,,,FLEXSPI2_A_DQS,,,,ALT5
+GPIO_EMC_24,SEMC_CAS,FLEXPWM1_PWM0_B,LPUART5_RXD,ENET_TX_EN,GPT1_CAPTURE1,GPIO4_IO24,,,FLEXSPI2_A_SS0_B,,,,ALT5
+GPIO_EMC_25,SEMC_RAS,FLEXPWM1_PWM1_A,LPUART6_TXD,ENET_TX_CLK,ENET_REF_CLK,GPIO4_IO25,,,FLEXSPI2_A_SCLK,,,,ALT5
+GPIO_EMC_26,SEMC_CLK,FLEXPWM1_PWM1_B,LPUART6_RXD,ENET_RX_ER,FLEXIO1_D12,GPIO4_IO26,,,FLEXSPI2_A_DATA0,,,,ALT5
+GPIO_EMC_27,SEMC_CKE,FLEXPWM1_PWM2_A,LPUART5_RTS_B,LPSPI1_SCK,FLEXIO1_D13,GPIO4_IO27,,,FLEXSPI2_A_DATA1,,,,ALT5
+GPIO_EMC_28,SEMC_WE,FLEXPWM1_PWM2_B,LPUART5_CTS_B,LPSPI1_SOUT,FLEXIO1_D14,GPIO4_IO28,,,FLEXSPI2_A_DATA2,,,,ALT5
+GPIO_EMC_29,SEMC_CS0,FLEXPWM3_PWM0_A,LPUART6_RTS_B,LPSPI1_SIN,FLEXIO1_D15,GPIO4_IO29,,,FLEXSPI2_A_DATA3,,,,ALT5
+GPIO_EMC_30,SEMC_DATA08,FLEXPWM3_PWM0_B,LPUART6_CTS_B,LPSPI1_PCS0,CSI_DATA23,GPIO4_IO30,,,ENET2_TDATA0,,,,ALT5
+GPIO_EMC_31,SEMC_DATA09,FLEXPWM3_PWM1_A,LPUART7_TXD,LPSPI1_PCS1,CSI_DATA22,GPIO4_IO31,,,ENET2_TDATA1,,,,ALT5
+GPIO_EMC_32,SEMC_DATA10,FLEXPWM3_PWM1_B,LPUART7_RXD,CCM_PMIC_READY,CSI_DATA21,GPIO3_IO18,,,ENET2_TX_EN,,,,ALT5
+GPIO_EMC_33,SEMC_DATA11,FLEXPWM3_PWM2_A,USDHC1_RESET_B,SAI3_RX_DATA,CSI_DATA20,GPIO3_IO19,,,ENET2_TX_CLK,ENET2_REF_CLK2,,,ALT5
+GPIO_EMC_34,SEMC_DATA12,FLEXPWM3_PWM2_B,USDHC1_VSELECT,SAI3_RX_SYNC,CSI_DATA19,GPIO3_IO20,,,ENET2_RX_ER,,,,ALT5
+GPIO_EMC_35,SEMC_DATA13,XBAR_INOUT18,GPT1_COMPARE1,SAI3_RX_BCLK,CSI_DATA18,GPIO3_IO21,USDHC1_CD_B,,ENET2_RDATA0,,,,ALT5
+GPIO_EMC_36,SEMC_DATA14,XBAR_INOUT22,GPT1_COMPARE2,SAI3_TX_DATA,CSI_DATA17,GPIO3_IO22,USDHC1_WP,,ENET2_RDATA1,FLEXCAN3_TX,,,ALT5
+GPIO_EMC_37,SEMC_DATA15,XBAR_INOUT23,GPT1_COMPARE3,SAI3_MCLK,CSI_DATA16,GPIO3_IO23,USDHC2_WP,,ENET2_RX_EN,FLEXCAN3_RX,,,ALT5
+GPIO_EMC_38,SEMC_DM1,FLEXPWM1_PWM3_A,LPUART8_TXD,SAI3_TX_BCLK,CSI_FIELD,GPIO3_IO24,USDHC2_VSELECT,,ENET2_MDC,,,,ALT5
+GPIO_EMC_39,SEMC_DQS,FLEXPWM1_PWM3_B,LPUART8_RXD,SAI3_TX_SYNC,WDOG1_B,GPIO3_IO25,USDHC2_CD_B,,ENET2_MDIO,,,,ALT5
+GPIO_EMC_40,SEMC_RDY,GPT2_CAPTURE2,LPSPI1_PCS2,USB_OTG2_OC,ENET_MDC,GPIO3_IO26,USDHC2_RESET_B,,,SEMC_CLK5,,,ALT5
+GPIO_EMC_41,SEMC_CSX0,GPT2_CAPTURE1,LPSPI1_PCS3,USB_OTG2_PWR,ENET_MDIO,GPIO3_IO27,USDHC1_VSELECT,,,,,,ALT5
+GPIO_SD_B0_00,USDHC1_CMD,FLEXPWM1_PWM0_A,LPI2C3_SCL,XBAR_INOUT04,LPSPI1_SCK,GPIO3_IO12,FLEXSPI_A_SS1_B,,ENET2_TX_EN,SEMC_DQS4,,,ALT5
+GPIO_SD_B0_01,USDHC1_CLK,FLEXPWM1_PWM0_B,LPI2C3_SDA,XBAR_INOUT05,LPSPI1_PCS0,GPIO3_IO13,FLEXSPI_B_SS1_B,,ENET2_TX_CLK,ENET2_REF_CLK2,,,ALT5
+GPIO_SD_B0_02,USDHC1_DATA0,FLEXPWM1_PWM1_A,LPUART8_CTS_B,XBAR_INOUT06,LPSPI1_SOUT,GPIO3_IO14,,,ENET2_RX_ER,SEMC_CLK5,,,ALT5
+GPIO_SD_B0_03,USDHC1_DATA1,FLEXPWM1_PWM1_B,LPUART8_RTS_B,XBAR_INOUT07,LPSPI1_SIN,GPIO3_IO15,,,ENET2_RDATA0,SEMC_CLK6,,,ALT5
+GPIO_SD_B0_04,USDHC1_DATA2,FLEXPWM1_PWM2_A,LPUART8_TXD,XBAR_INOUT08,FLEXSPI_B_SS0_B,GPIO3_IO16,CCM_CLKO1,,ENET2_RDATA1,,,,ALT5
+GPIO_SD_B0_05,USDHC1_DATA3,FLEXPWM1_PWM2_B,LPUART8_RXD,XBAR_INOUT09,FLEXSPI_B_DQS,GPIO3_IO17,CCM_CLKO2,,ENET2_RX_EN,,,,ALT5
+GPIO_SD_B1_00,USDHC2_DATA3,FLEXSPI_B_DATA3,FLEXPWM1_PWM3_A,"SAI1_TX_DATA3,SAI1_RX_DATA1",LPUART4_TXD,GPIO3_IO00,,,SAI3_RX_DATA,,,,ALT5
+GPIO_SD_B1_01,USDHC2_DATA2,FLEXSPI_B_DATA2,FLEXPWM1_PWM3_B,"SAI1_TX_DATA2,SAI1_RX_DATA2",LPUART4_RXD,GPIO3_IO01,,,SAI3_TX_DATA,,,,ALT5
+GPIO_SD_B1_02,USDHC2_DATA1,FLEXSPI_B_DATA1,FLEXPWM2_PWM3_A,"SAI1_TX_DATA1,SAI1_RX_DATA3",FLEXCAN1_TX,GPIO3_IO02,CCM_WAIT,,SAI3_TX_SYNC,,,,ALT5
+GPIO_SD_B1_03,USDHC2_DATA0,FLEXSPI_B_DATA0,FLEXPWM2_PWM3_B,SAI1_MCLK,FLEXCAN1_RX,GPIO3_IO03,CCM_PMIC_READY,,SAI3_TX_BCLK,,,,ALT5
+GPIO_SD_B1_04,USDHC2_CLK,FLEXSPI_B_SCLK,LPI2C1_SCL,SAI1_RX_SYNC,FLEXSPI_A_SS1_B,GPIO3_IO04,CCM_STOP,,SAI3_MCLK,,,,ALT5
+GPIO_SD_B1_05,USDHC2_CMD,FLEXSPI_A_DQS,LPI2C1_SDA,SAI1_RX_BCLK,FLEXSPI_B_SS0_B,GPIO3_IO05,,,SAI3_RX_SYNC,,,,ALT5
+GPIO_SD_B1_06,USDHC2_RESET_B,FLEXSPI_A_SS0_B,LPUART7_CTS_B,SAI1_RX_DATA0,LPSPI2_PCS0,GPIO3_IO06,,,SAI3_RX_BCLK,,,,ALT5
+GPIO_SD_B1_07,SEMC_CSX1,FLEXSPI_A_SCLK,LPUART7_RTS_B,SAI1_TX_DATA0,LPSPI2_SCK,GPIO3_IO07,,,,,,,ALT5
+GPIO_SD_B1_08,USDHC2_DATA4,FLEXSPI_A_DATA0,LPUART7_TXD,SAI1_TX_BCLK,LPSPI2_SOUT,GPIO3_IO08,SEMC_CSX2,,,,,,ALT5
+GPIO_SD_B1_09,USDHC2_DATA5,FLEXSPI_A_DATA1,LPUART7_RXD,SAI1_TX_SYNC,LPSPI2_SIN,GPIO3_IO09,,,,,,,ALT5
+GPIO_SD_B1_10,USDHC2_DATA6,FLEXSPI_A_DATA2,LPUART2_RXD,LPI2C2_SDA,LPSPI2_PCS2,GPIO3_IO10,,,,,,,ALT5
+GPIO_SD_B1_11,USDHC2_DATA7,FLEXSPI_A_DATA3,LPUART2_TXD,LPI2C2_SCL,LPSPI2_PCS3,GPIO3_IO11,,,,,,,ALT5
diff --git a/ports/mimxrt/boards/TEENSY40/mpconfigboard.h b/ports/mimxrt/boards/TEENSY40/mpconfigboard.h
index 7d564785797ad..e3d7c6a12943f 100644
--- a/ports/mimxrt/boards/TEENSY40/mpconfigboard.h
+++ b/ports/mimxrt/boards/TEENSY40/mpconfigboard.h
@@ -4,6 +4,6 @@
 #define BOARD_FLASH_SIZE (2 * 1024 * 1024)
 
 // Teensy 4.0 has 1 board LED
-#define MICROPY_HW_LED1_PIN (GPIO_B0_03)
+#define MICROPY_HW_LED1_PIN (pin_GPIO_B0_03)
 #define MICROPY_HW_LED_ON(pin) (mp_hal_pin_high(pin))
 #define MICROPY_HW_LED_OFF(pin) (mp_hal_pin_low(pin))
diff --git a/ports/mimxrt/boards/TEENSY40/pins.c b/ports/mimxrt/boards/TEENSY40/pins.c
deleted file mode 100644
index c7bfc102d4350..0000000000000
--- a/ports/mimxrt/boards/TEENSY40/pins.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2020 Philipp Ebensberger
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#include "pin.h"
-
-static pin_af_obj_t GPIO_B0_03_af[] = {
-    PIN_AF(GPIO2_IO03, PIN_AF_MODE_ALT5, GPIO2, 0x10B0U),
-};
-
-pin_obj_t GPIO_B0_03 = PIN(GPIO_B0_03, GPIO2, 3, GPIO_B0_03_af);
diff --git a/ports/mimxrt/boards/TEENSY40/pins.csv b/ports/mimxrt/boards/TEENSY40/pins.csv
new file mode 100644
index 0000000000000..c9d7c9856ddce
--- /dev/null
+++ b/ports/mimxrt/boards/TEENSY40/pins.csv
@@ -0,0 +1,55 @@
+D0,GPIO_AD_B0_03
+D1,GPIO_AD_B0_02
+D2,GPIO_EMC_04
+D3,GPIO_EMC_05
+D4,GPIO_EMC_06
+D5,GPIO_EMC_08
+D6,GPIO_B0_10
+D7,GPIO_B1_01
+D8,GPIO_B1_00
+D9,GPIO_B0_11
+D10,GPIO_B0_00
+D11,GPIO_B0_02
+D12,GPIO_B0_01
+D13,GPIO_B0_03
+D14,GPIO_AD_B1_02
+D15,GPIO_AD_B1_03
+D16,GPIO_AD_B1_07
+D17,GPIO_AD_B1_06
+D18,GPIO_AD_B1_01
+D19,GPIO_AD_B1_00
+D20,GPIO_AD_B1_10
+D21,GPIO_AD_B1_11
+D22,GPIO_AD_B1_08
+D23,GPIO_AD_B1_09
+D24,GPIO_AD_B0_12
+D25,GPIO_AD_B0_13
+D26,GPIO_AD_B1_14
+D27,GPIO_AD_B1_15
+D28,GPIO_EMC_32
+D29,GPIO_EMC_31
+D30,GPIO_EMC_37
+D31,GPIO_EMC_36
+D32,GPIO_B0_12
+D33,GPIO_EMC_07
+DAT1,GPIO_AD_B0_03
+DAT0,GPIO_AD_B0_02
+CLK,GPIO_AD_B0_01
+CMD,GPIO_ASD_B0_00
+DAT3,GPIO_SD_B0_05
+DAT2,GPIO_SD_B0_04
+A0,GPIO_AD_B1_02
+A1,GPIO_AD_B1_03
+A2,GPIO_AD_B1_07
+A3,GPIO_AD_B1_06
+A4,GPIO_AD_B1_01
+A5,GPIO_AD_B1_00
+A6,GPIO_AD_B1_10
+A7,GPIO_AD_B1_11
+A8,GPIO_AD_B1_08
+A9,GPIO_AD_B1_09
+A10,GPIO_AD_B0_12
+A11,GPIO_AD_B0_13
+A12,GPIO_AD_B1_14
+A13,GPIO_AD_B1_15
+LED,GPIO_B0_03
\ No newline at end of file
diff --git a/ports/mimxrt/boards/TEENSY40/pins.h b/ports/mimxrt/boards/TEENSY40/pins.h
deleted file mode 100644
index c0b6dcdfa9576..0000000000000
--- a/ports/mimxrt/boards/TEENSY40/pins.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2020 Philipp Ebensberger
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-// NOTE: pins.h shall only be included in in pin.h
-// hence no include guards are needed since they will be provided by pin.h
-
-extern pin_obj_t GPIO_B0_03;
diff --git a/ports/mimxrt/boards/make-pins.py b/ports/mimxrt/boards/make-pins.py
new file mode 100644
index 0000000000000..5e5b81e31e01a
--- /dev/null
+++ b/ports/mimxrt/boards/make-pins.py
@@ -0,0 +1,259 @@
+#!/usr/bin/env python
+"""Creates the pin file for the MIMXRT10xx."""
+
+from __future__ import print_function
+
+import argparse
+import sys
+import csv
+
+SUPPORTED_AFS = {"GPIO"}
+MAX_AF = 10  # AF0 .. AF9
+
+
+def parse_pad(pad_str):
+    """Parses a string and returns a (port, gpio_bit) tuple."""
+    if len(pad_str) < 4:
+        raise ValueError("Expecting pad name to be at least 4 characters")
+    if pad_str[:4] != "GPIO":
+        raise ValueError("Expecting pad name to start with GPIO")
+    return pad_str
+
+
+def af_supported(af_str):
+    for supported_af in SUPPORTED_AFS:
+        if af_str.startswith(supported_af):
+            return True
+    else:
+        return False
+
+
+class Pin(object):
+    """Holds the information associated with a pin."""
+
+    def __init__(self, pad, gpio, pin, idx=0):
+        self.idx = idx
+        self.name = pad
+        self.pad = pad
+        self.gpio = gpio
+        self.pin = pin
+        self.alt_fn = []
+        self.adc_channel = 0
+        self.board_pin = False
+
+    def set_is_board_pin(self):
+        self.board_pin = True
+
+    def is_board_pin(self):
+        return self.board_pin
+
+    def parse_adc(self, adc_str):
+        pass
+
+    def parse_af(self, af_idx, af_strs_in):
+        pass
+
+    def add_af(self, af):
+        self.alt_fn.append(af)
+
+    def print_pin_af(self):
+        if self.alt_fn:
+            print(
+                "static const machine_pin_af_obj_t pin_{0}_af[{1}] = {{".format(
+                    self.name, len(self.alt_fn)
+                )
+            )
+            for af in self.alt_fn:
+                af.print()
+            print("};")
+        else:
+            raise ValueError("Pin '{}' has no alternative functions".format(self.name))
+
+    def print(self):
+        if self.alt_fn:
+            self.print_pin_af()
+            print(
+                "const machine_pin_obj_t pin_{0} = PIN({0}, {1}, {2}, pin_{3});\n".format(
+                    self.name, self.gpio, int(self.pin), self.name + "_af"
+                )
+            )
+        else:
+            raise ValueError("Pin '{}' has no alternative functions".format(self.name))
+
+    def print_header(self, hdr_file):
+        pass
+
+
+class AlternateFunction(object):
+    """Holds the information associated with a pins alternate function."""
+
+    def __init__(self, idx, af_str):
+        self.idx = idx
+        self.af_str = af_str
+        self.instance = self.af_str.split("_")[0]
+
+    def print(self):
+        """Prints the C representation of this AF."""
+        print(
+            "    PIN_AF({0}, PIN_AF_MODE_ALT{1}, {2}, {3}),".format(
+                self.af_str, self.idx, self.instance, "0x10B0U"
+            )
+        )
+
+
+class NamedPin(object):
+    def __init__(self, name, pad, idx):
+        self.name = name
+        self.pad = pad
+        self.idx = idx
+
+
+class Pins(object):
+    def __init__(self):
+        self.cpu_pins = []
+        self.board_pins = []
+
+    def find_pin_by_num(self, pin_num):
+        for pin in self.cpu_pins:
+            if pin.pin_num == pin_num:
+                return pin
+
+    def find_pin_by_name(self, pad):
+        for pin in self.cpu_pins:
+            if pin.pad == pad:
+                return pin
+
+    def parse_board_file(self, filename):
+        with open(filename, "r") as csvfile:
+            rows = csv.reader(csvfile)
+            for row in rows:
+                pin = self.find_pin_by_name(row[1])
+                if pin and row[0]:  # Only add board pins that have a name
+                    self.board_pins.append(NamedPin(row[0], pin.pad, pin.idx))
+
+    def parse_af_file(self, filename, pad_col, af_start_col):
+        af_end_col = af_start_col + MAX_AF
+        with open(filename, "r") as csvfile:
+            rows = csv.reader(csvfile)
+            header = next(rows)
+            for idx, row in enumerate(rows):
+                pad = row[pad_col]
+                gpio, pin = row[6].split("_")
+                pin_number = pin.lstrip("IO")
+
+                pin = Pin(pad, gpio, pin_number, idx=idx)
+
+                # Parse alternate functions
+                af_idx = 0
+                for af_idx, af in enumerate(row[af_start_col:af_end_col]):
+                    if af and af_supported(af):
+                        pin.add_af(AlternateFunction(af_idx, af))
+
+                self.cpu_pins.append(pin)
+
+    @staticmethod
+    def print_named(label, pins):
+        print("")
+        print(
+            "STATIC const mp_rom_map_elem_t pin_{:s}_pins_locals_dict_table[] = {{".format(label)
+        )
+        for pin in pins:
+            print(
+                "    {{ MP_ROM_QSTR(MP_QSTR_{}), MP_ROM_PTR(&pin_{}) }},".format(pin.name, pin.pad)
+            )
+        print("};")
+        print(
+            "MP_DEFINE_CONST_DICT(machine_pin_{:s}_pins_locals_dict, pin_{:s}_pins_locals_dict_table);".format(
+                label, label
+            )
+        )
+
+    def print(self):
+        # Print Pin Object declarations
+        for pin in self.cpu_pins:
+            pin.print()
+
+        print("")
+        print("const machine_pin_obj_t* machine_pin_board_pins [] = {")
+        for pin in self.board_pins:
+            print("    &pin_{},".format(pin.pad))
+        print("};")
+        print("const uint32_t num_board_pins = {:d};".format(len(self.board_pins)))
+        # Print Pin mapping dictionaries
+        self.print_named("cpu", self.cpu_pins)
+        self.print_named("board", self.board_pins)
+        print("")
+
+    def print_header(self, hdr_filename):
+        with open(hdr_filename, "w") as hdr_file:
+            for pin in self.cpu_pins:
+                hdr_file.write("extern const machine_pin_obj_t pin_{};\n".format(pin.name))
+            hdr_file.write("extern const machine_pin_obj_t* machine_pin_board_pins[];\n")
+            hdr_file.write("extern const uint32_t num_board_pins;\n")
+            hdr_file.write("extern const mp_obj_dict_t machine_pin_cpu_pins_locals_dict;\n")
+            hdr_file.write("extern const mp_obj_dict_t machine_pin_board_pins_locals_dict;\n")
+
+
+def main():
+    parser = argparse.ArgumentParser(
+        prog="make-pins.py",
+        usage="%(prog)s [options] [command]",
+        description="Generate board specific pin file",
+    )
+    parser.add_argument(
+        "-a",
+        "--af",
+        dest="af_filename",
+        help="Specifies the alternate function file for the chip",
+        default="mimxrt1021_af.csv",
+    )
+    parser.add_argument(
+        "-b",
+        "--board",
+        dest="board_filename",
+        help="Specifies the board file",
+        default="MIMXRT1020_EVK/pins.csv",
+    )
+    parser.add_argument(
+        "-p",
+        "--prefix",
+        dest="prefix_filename",
+        help="Specifies beginning portion of generated pins file",
+        default="mimxrt_prefix.c",
+    )
+    parser.add_argument(
+        "-r",
+        "--hdr",
+        dest="hdr_filename",
+        help="Specifies name of generated pin header file",
+        default="build/pins.h",
+    )
+
+    pins = Pins()
+
+    # test code
+    args = parser.parse_args()
+    #
+
+    if args.af_filename:
+        print("// --af {:s}".format(args.af_filename))
+        pins.parse_af_file(args.af_filename, 0, 1)
+
+    if args.board_filename:
+        print("// --board {:s}".format(args.board_filename))
+        pins.parse_board_file(args.board_filename)
+
+    if args.hdr_filename:
+        print("// --hdr {:s}".format(args.hdr_filename))
+
+    if args.prefix_filename:
+        print("// --prefix {:s}".format(args.prefix_filename))
+        with open(args.prefix_filename, "r") as prefix_file:
+            print(prefix_file.read())
+
+    pins.print()
+    pins.print_header(args.hdr_filename)
+
+
+if __name__ == "__main__":
+    main()
diff --git a/ports/mimxrt/boards/mimxrt_prefix.c b/ports/mimxrt/boards/mimxrt_prefix.c
new file mode 100644
index 0000000000000..59e338976e496
--- /dev/null
+++ b/ports/mimxrt/boards/mimxrt_prefix.c
@@ -0,0 +1,26 @@
+#include <stdio.h>
+
+#include "py/obj.h"
+#include "py/mphal.h"
+#include "pin.h"
+
+#define PIN_AF(_name, _af_mode, _instance, _pad_config) \
+    { \
+        .base = { &machine_pin_af_type }, \
+        .name = MP_QSTR_##_name, \
+        .af_mode = (uint32_t)(_af_mode), \
+        .instance = (void *)(_instance), \
+        .pad_config = (uint32_t)(_pad_config), \
+    } \
+
+#define PIN(_name, _gpio, _pin, _af_list) \
+    { \
+        .base = { &machine_pin_type }, \
+        .name = MP_QSTR_##_name, \
+        .gpio = (_gpio), \
+        .pin = (uint32_t)(_pin), \
+        .muxRegister = (uint32_t)&(IOMUXC->SW_MUX_CTL_PAD[kIOMUXC_SW_MUX_CTL_PAD_##_name]), \
+        .configRegister = (uint32_t)&(IOMUXC->SW_PAD_CTL_PAD[kIOMUXC_SW_PAD_CTL_PAD_##_name]), \
+        .af_list_len = (size_t)(sizeof((_af_list)) / sizeof(machine_pin_af_obj_t)), \
+        .af_list = (_af_list), \
+    } \
diff --git a/ports/mimxrt/led.c b/ports/mimxrt/led.c
index bec97dd8f7cc4..cb9f9854646e8 100644
--- a/ports/mimxrt/led.c
+++ b/ports/mimxrt/led.c
@@ -44,7 +44,7 @@ const machine_led_obj_t machine_led_obj[NUM_LEDS] = {
 void led_init(void) {
     // Turn off LEDs and initialize
     for (mp_int_t led = 0; led < NUM_LEDS; led++) {
-        const pin_obj_t *led_pin = machine_led_obj[led].led_pin;
+        const machine_pin_obj_t *led_pin = machine_led_obj[led].led_pin;
 
         gpio_pin_config_t pin_config = {
             .outputLogic = 1U,
@@ -67,7 +67,7 @@ void led_state(machine_led_t led, int state) {
         return;
     }
 
-    const pin_obj_t *led_pin = machine_led_obj[led - 1].led_pin;
+    const machine_pin_obj_t *led_pin = machine_led_obj[led - 1].led_pin;
 
     if (state == 0) {
         // turn LED off
@@ -83,7 +83,7 @@ void led_toggle(machine_led_t led) {
         return;
     }
 
-    const pin_obj_t *led_pin = machine_led_obj[led - 1].led_pin;
+    const machine_pin_obj_t *led_pin = machine_led_obj[led - 1].led_pin;
     mp_hal_pin_toggle(led_pin);
 }
 
diff --git a/ports/mimxrt/led.h b/ports/mimxrt/led.h
index 35418321d173d..a0628e90eddc9 100644
--- a/ports/mimxrt/led.h
+++ b/ports/mimxrt/led.h
@@ -42,7 +42,7 @@ typedef enum {
 typedef struct _machine_led_obj_t {
     mp_obj_base_t base;
     mp_uint_t led_id;
-    const pin_obj_t *led_pin;
+    const machine_pin_obj_t *led_pin;
 } machine_led_obj_t;
 
 void led_init(void);
diff --git a/ports/mimxrt/machine_pin.c b/ports/mimxrt/machine_pin.c
new file mode 100644
index 0000000000000..583ee4a265192
--- /dev/null
+++ b/ports/mimxrt/machine_pin.c
@@ -0,0 +1,273 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 Philipp Ebensberger
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+#include <stdint.h>
+
+#include "fsl_gpio.h"
+#include "fsl_iomuxc.h"
+
+#include "py/runtime.h"
+#include "py/mphal.h"
+#include "pin.h"
+#include "mphalport.h"
+
+// Local functions
+STATIC mp_obj_t machine_pin_obj_init_helper(const machine_pin_obj_t *self, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args);
+
+// Class Methods
+STATIC void machine_pin_obj_print(const mp_print_t *print, mp_obj_t o, mp_print_kind_t kind);
+STATIC mp_obj_t machine_pin_obj_call(mp_obj_t self_in, mp_uint_t n_args, mp_uint_t n_kw, const mp_obj_t *args);
+STATIC mp_obj_t machine_pin_obj_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args);
+
+// Instance Methods
+STATIC mp_obj_t machine_pin_off(mp_obj_t self_in);
+STATIC mp_obj_t machine_pin_on(mp_obj_t self_in);
+STATIC mp_obj_t machine_pin_value(size_t n_args, const mp_obj_t *args);
+STATIC mp_obj_t machine_pin_init(size_t n_args, const mp_obj_t *args, mp_map_t *kw_args);
+
+// Local data
+enum {
+    PIN_INIT_ARG_MODE = 0,
+    PIN_INIT_ARG_PULL,
+    PIN_INIT_ARG_VALUE,
+    PIN_INIT_ARG_DRIVE,
+};
+
+// Pin mapping dictionaries
+const mp_obj_type_t machine_pin_cpu_pins_obj_type = {
+    { &mp_type_type },
+    .name = MP_QSTR_cpu,
+    .locals_dict = (mp_obj_t)&machine_pin_cpu_pins_locals_dict,
+};
+
+const mp_obj_type_t machine_pin_board_pins_obj_type = {
+    { &mp_type_type },
+    .name = MP_QSTR_board,
+    .locals_dict = (mp_obj_t)&machine_pin_board_pins_locals_dict,
+};
+
+STATIC mp_obj_t machine_pin_obj_call(mp_obj_t self_in, mp_uint_t n_args, mp_uint_t n_kw, const mp_obj_t *args) {
+    mp_arg_check_num(n_args, n_kw, 0, 1, false);
+    machine_pin_obj_t *self = self_in;
+
+    if (n_args == 0) {
+        return MP_OBJ_NEW_SMALL_INT(mp_hal_pin_read(self));
+    } else {
+        mp_hal_pin_write(self, mp_obj_is_true(args[0]));
+        return mp_const_none;
+    }
+}
+
+STATIC mp_obj_t machine_pin_obj_init_helper(const machine_pin_obj_t *self, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    static const mp_arg_t allowed_args[] = {
+        [PIN_INIT_ARG_MODE] { MP_QSTR_mode, MP_ARG_REQUIRED | MP_ARG_INT },
+        [PIN_INIT_ARG_PULL] { MP_QSTR_pull, MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE}},
+        [PIN_INIT_ARG_VALUE] { MP_QSTR_value, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL}},
+        [PIN_INIT_ARG_DRIVE] { MP_QSTR_drive, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = PIN_DRIVE_POWER_3}},
+        // TODO: Implement additional arguments
+        /*
+        { MP_QSTR_af, MP_ARG_INT, {.u_int = -1}}, // legacy
+        { MP_QSTR_alt, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1}},*/
+    };
+
+    // Parse args
+    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
+    mp_arg_parse_all(n_args, pos_args, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
+
+    // Get io mode
+    uint mode = args[PIN_INIT_ARG_MODE].u_int;
+    if (!IS_GPIO_MODE(mode)) {
+        mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("invalid pin mode: %d"), mode);
+    }
+
+    // Handle configuration for GPIO
+    if ((mode == PIN_MODE_IN) || (mode == PIN_MODE_OUT) || (mode == PIN_MODE_OPEN_DRAIN)) {
+        gpio_pin_config_t pin_config;
+        const machine_pin_af_obj_t *af_obj;
+        uint32_t pad_config = 0UL;
+        uint8_t pull = PIN_PULL_DISABLED;
+
+        // Generate pin configuration
+        if ((args[PIN_INIT_ARG_VALUE].u_obj != MP_OBJ_NULL) && (mp_obj_is_true(args[PIN_INIT_ARG_VALUE].u_obj))) {
+            pin_config.outputLogic = 1U;
+        } else {
+            pin_config.outputLogic = 0U;
+        }
+        pin_config.direction = mode == PIN_MODE_IN ? kGPIO_DigitalInput : kGPIO_DigitalOutput;
+        pin_config.interruptMode = kGPIO_NoIntmode;
+
+        af_obj = pin_find_af(self, PIN_AF_MODE_ALT5);  // GPIO is always ALT5
+        if (af_obj == NULL) {
+            mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("requested AF %d not available for pin %d"), PIN_AF_MODE_ALT5, mode);
+        }
+
+        // Generate pad configuration
+        if (args[PIN_INIT_ARG_PULL].u_obj != mp_const_none) {
+            pull = (uint8_t)mp_obj_get_int(args[PIN_INIT_ARG_PULL].u_obj);
+        }
+
+        pad_config |= IOMUXC_SW_PAD_CTL_PAD_SRE(0U);  // Slow Slew Rate
+        pad_config |= IOMUXC_SW_PAD_CTL_PAD_SPEED(0b01);  // medium(100MHz)
+
+        if (mode == PIN_MODE_OPEN_DRAIN) {
+            pad_config |= IOMUXC_SW_PAD_CTL_PAD_ODE(0b1);  // Open Drain Enabled
+        } else {
+            pad_config |= IOMUXC_SW_PAD_CTL_PAD_ODE(0b0);  // Open Drain Disabled
+        }
+
+        if (pull == PIN_PULL_DISABLED) {
+            pad_config |= IOMUXC_SW_PAD_CTL_PAD_PKE(0); // Pull/Keeper Disabled
+        } else if (pull == PIN_PULL_HOLD) {
+            pad_config |= IOMUXC_SW_PAD_CTL_PAD_PKE(1) | // Pull/Keeper Enabled
+                IOMUXC_SW_PAD_CTL_PAD_PUE(0);            // Keeper selected
+        } else {
+            pad_config |= IOMUXC_SW_PAD_CTL_PAD_PKE(1) |  // Pull/Keeper Enabled
+                IOMUXC_SW_PAD_CTL_PAD_PUE(1) |            // Pull selected
+                IOMUXC_SW_PAD_CTL_PAD_PUS(pull);
+        }
+
+        if (mode == PIN_MODE_IN) {
+            pad_config |= IOMUXC_SW_PAD_CTL_PAD_DSE(0b000) |  // output driver disabled
+                IOMUXC_SW_PAD_CTL_PAD_HYS(1U);  // Hysteresis enabled
+        } else {
+            uint drive = args[PIN_INIT_ARG_DRIVE].u_int;
+            if (!IS_GPIO_DRIVE(drive)) {
+                mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("invalid drive strength: %d"), drive);
+            }
+
+            pad_config |= IOMUXC_SW_PAD_CTL_PAD_DSE(drive) |
+                IOMUXC_SW_PAD_CTL_PAD_HYS(0U);  // Hysteresis disabled
+        }
+
+        // Configure PAD as GPIO
+        IOMUXC_SetPinMux(self->muxRegister, af_obj->af_mode, 0, 0, self->configRegister, 1U);  // Software Input On Field: Input Path is determined by functionality
+        IOMUXC_SetPinConfig(self->muxRegister, af_obj->af_mode, 0, 0, self->configRegister, pad_config);
+        GPIO_PinInit(self->gpio, self->pin, &pin_config);
+    }
+
+    return mp_const_none;
+}
+
+STATIC void machine_pin_obj_print(const mp_print_t *print, mp_obj_t o, mp_print_kind_t kind) {
+    (void)kind;
+    const machine_pin_obj_t *self = MP_OBJ_TO_PTR(o);
+    mp_printf(print, "Pin(%s)", qstr_str(self->name));
+}
+
+// pin(id, mode, pull, ...)
+STATIC mp_obj_t machine_pin_obj_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
+    mp_arg_check_num(n_args, n_kw, 1, MP_OBJ_FUN_ARGS_MAX, true);
+
+    const machine_pin_obj_t *pin = pin_find(args[0]);
+
+    if (n_args > 1 || n_kw > 0) {
+        // pin mode given, so configure this GPIO
+        mp_map_t kw_args;
+        mp_map_init_fixed_table(&kw_args, n_kw, args + n_args);
+        machine_pin_obj_init_helper(pin, n_args - 1, args + 1, &kw_args);
+    }
+
+    return (mp_obj_t)pin;
+}
+
+// pin.off()
+STATIC mp_obj_t machine_pin_off(mp_obj_t self_in) {
+    machine_pin_obj_t *self = self_in;
+    mp_hal_pin_low(self);
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_pin_off_obj, machine_pin_off);
+
+// pin.on()
+STATIC mp_obj_t machine_pin_on(mp_obj_t self_in) {
+    machine_pin_obj_t *self = self_in;
+    mp_hal_pin_high(self);
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_pin_on_obj, machine_pin_on);
+
+// pin.value([value])
+STATIC mp_obj_t machine_pin_value(size_t n_args, const mp_obj_t *args) {
+    return machine_pin_obj_call(args[0], (n_args - 1), 0, args + 1);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_pin_value_obj, 1, 2, machine_pin_value);
+
+// pin.init(mode, pull, [kwargs])
+STATIC mp_obj_t machine_pin_init(size_t n_args, const mp_obj_t *args, mp_map_t *kw_args) {
+    return machine_pin_obj_init_helper(args[0], n_args - 1, args + 1, kw_args);
+}
+MP_DEFINE_CONST_FUN_OBJ_KW(machine_pin_init_obj, 1, machine_pin_init);
+
+STATIC const mp_rom_map_elem_t machine_pin_locals_dict_table[] = {
+    // instance methods
+    { MP_ROM_QSTR(MP_QSTR_off),     MP_ROM_PTR(&machine_pin_off_obj) },
+    { MP_ROM_QSTR(MP_QSTR_on),      MP_ROM_PTR(&machine_pin_on_obj) },
+    { MP_ROM_QSTR(MP_QSTR_low),     MP_ROM_PTR(&machine_pin_off_obj) },
+    { MP_ROM_QSTR(MP_QSTR_high),    MP_ROM_PTR(&machine_pin_on_obj) },
+    { MP_ROM_QSTR(MP_QSTR_value),   MP_ROM_PTR(&machine_pin_value_obj) },
+    { MP_ROM_QSTR(MP_QSTR_init),    MP_ROM_PTR(&machine_pin_init_obj) },
+    // class attributes
+    { MP_ROM_QSTR(MP_QSTR_board),   MP_ROM_PTR(&machine_pin_board_pins_obj_type) },
+    { MP_ROM_QSTR(MP_QSTR_cpu),     MP_ROM_PTR(&machine_pin_cpu_pins_obj_type) },
+    // class constants
+    { MP_ROM_QSTR(MP_QSTR_IN),      MP_ROM_INT(PIN_MODE_IN) },
+    { MP_ROM_QSTR(MP_QSTR_OUT),     MP_ROM_INT(PIN_MODE_OUT) },
+    { MP_ROM_QSTR(MP_QSTR_OPEN_DRAIN), MP_ROM_INT(PIN_MODE_OPEN_DRAIN) },
+
+    { MP_ROM_QSTR(MP_QSTR_PULL_UP), MP_ROM_INT(PIN_PULL_UP_100K) },
+    { MP_ROM_QSTR(MP_QSTR_PULL_UP_47K), MP_ROM_INT(PIN_PULL_UP_47K) },
+    { MP_ROM_QSTR(MP_QSTR_PULL_UP_22K), MP_ROM_INT(PIN_PULL_UP_22K) },
+    { MP_ROM_QSTR(MP_QSTR_PULL_DOWN), MP_ROM_INT(PIN_PULL_DOWN_100K) },
+    { MP_ROM_QSTR(MP_QSTR_PULL_HOLD), MP_ROM_INT(PIN_PULL_HOLD) },
+
+    { MP_ROM_QSTR(MP_QSTR_DRIVER_OFF), MP_ROM_INT(PIN_DRIVE_OFF) },
+    { MP_ROM_QSTR(MP_QSTR_POWER_0),    MP_ROM_INT(PIN_DRIVE_POWER_0) }, // R0 (150 Ohm @3.3V / 260 Ohm @ 1.8V)
+    { MP_ROM_QSTR(MP_QSTR_POWER_1),    MP_ROM_INT(PIN_DRIVE_POWER_1) }, // R0/2
+    { MP_ROM_QSTR(MP_QSTR_POWER_2),    MP_ROM_INT(PIN_DRIVE_POWER_2) }, // R0/3
+    { MP_ROM_QSTR(MP_QSTR_POWER_3),    MP_ROM_INT(PIN_DRIVE_POWER_3) }, // R0/4
+    { MP_ROM_QSTR(MP_QSTR_POWER_4),    MP_ROM_INT(PIN_DRIVE_POWER_4) }, // R0/5
+    { MP_ROM_QSTR(MP_QSTR_POWER_5),    MP_ROM_INT(PIN_DRIVE_POWER_5) }, // R0/6
+    { MP_ROM_QSTR(MP_QSTR_POWER_6),    MP_ROM_INT(PIN_DRIVE_POWER_6) }, // R0/7
+
+};
+STATIC MP_DEFINE_CONST_DICT(machine_pin_locals_dict, machine_pin_locals_dict_table);
+
+const mp_obj_type_t machine_pin_type = {
+    {&mp_type_type},
+    .name = MP_QSTR_Pin,
+    .print = machine_pin_obj_print,
+    .call = machine_pin_obj_call,
+    .make_new = machine_pin_obj_make_new,
+    .locals_dict = (mp_obj_dict_t *)&machine_pin_locals_dict,
+};
+
+// FIXME: Create actual pin_af type!!!
+const mp_obj_type_t machine_pin_af_type = {
+    {&mp_type_type},
+    .name = MP_QSTR_PinAF,
+    .print = machine_pin_obj_print,
+    .make_new = machine_pin_obj_make_new,
+    .locals_dict = (mp_obj_dict_t *)&machine_pin_locals_dict,
+};
diff --git a/ports/mimxrt/modmachine.c b/ports/mimxrt/modmachine.c
index a6aab7b4aba53..1bb6b6a3520fa 100644
--- a/ports/mimxrt/modmachine.c
+++ b/ports/mimxrt/modmachine.c
@@ -28,6 +28,7 @@
 #include "py/runtime.h"
 #include "extmod/machine_mem.h"
 #include "led.h"
+#include "pin.h"
 
 #include CPU_HEADER_H
 
@@ -52,6 +53,7 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     #if NUM_LEDS
     { MP_ROM_QSTR(MP_QSTR_LED),                 MP_ROM_PTR(&machine_led_type) },
     #endif
+    { MP_ROM_QSTR(MP_QSTR_Pin),                 MP_ROM_PTR(&machine_pin_type) },
 };
 STATIC MP_DEFINE_CONST_DICT(machine_module_globals, machine_module_globals_table);
 
diff --git a/ports/mimxrt/mphalport.h b/ports/mimxrt/mphalport.h
index 993e15156618a..a6a28ab4a585c 100644
--- a/ports/mimxrt/mphalport.h
+++ b/ports/mimxrt/mphalport.h
@@ -29,10 +29,14 @@
 
 #include <stdint.h>
 #include "ticks.h"
+#include "pin.h"
 
+#define mp_hal_pin_obj_t const machine_pin_obj_t *
 #define mp_hal_pin_high(p) (GPIO_PinWrite(p->gpio, p->pin, 1U))
 #define mp_hal_pin_low(p) (GPIO_PinWrite(p->gpio, p->pin, 0U))
+#define mp_hal_pin_write(p, value) (GPIO_PinWrite(p->gpio, p->pin, value))
 #define mp_hal_pin_toggle(p) (GPIO_PortToggle(p->gpio, (1 << p->pin)))
+#define mp_hal_pin_read(p) (GPIO_PinRead(p->gpio, p->pin))
 
 void mp_hal_set_interrupt_char(int c);
 
diff --git a/ports/mimxrt/pin.c b/ports/mimxrt/pin.c
index b30f4be41ceae..7a437661e3865 100644
--- a/ports/mimxrt/pin.c
+++ b/ports/mimxrt/pin.c
@@ -24,14 +24,104 @@
  * THE SOFTWARE.
  */
 
+#include "py/runtime.h"
 #include "pin.h"
 
-const mp_obj_type_t pin_type = {
-    .base = {&mp_type_type},
-    .name = MP_QSTR_Pin,
-};
 
-const mp_obj_type_t pin_af_type = {
-    {&mp_type_type},
-    .name = MP_QSTR_PinAF,
-};
+void pin_init(void) {
+    return;
+}
+
+uint32_t pin_get_mode(const machine_pin_obj_t *pin) {
+    uint32_t pin_mode = PIN_MODE_ALT;
+    uint32_t config_register = *((volatile uint32_t *)pin->configRegister);
+    uint8_t af_mode = pin_get_af(pin);
+
+    if (af_mode == PIN_AF_MODE_ALT5) {
+        bool open_drain_enabled = (config_register & IOMUXC_SW_PAD_CTL_PAD_ODE_MASK) >> IOMUXC_SW_PAD_CTL_PAD_ODE_SHIFT;
+
+        if (open_drain_enabled) {
+            pin_mode = PIN_MODE_OPEN_DRAIN;
+        } else {
+            // Check pin direction
+            if ((pin->gpio->GDIR & (1U << pin->pin)) >> pin->pin) {
+                pin_mode = PIN_MODE_OUT;
+            } else {
+                pin_mode = PIN_MODE_IN;
+            }
+        }
+    }
+
+    return pin_mode;
+}
+
+uint32_t pin_get_af(const machine_pin_obj_t *pin) {
+    uint32_t mux_register = *((volatile uint32_t *)pin->muxRegister);
+
+    // Read configured AF-Mode of pin
+    return (uint32_t)(mux_register & IOMUXC_SW_MUX_CTL_PAD_MUX_MODE_MASK) >> IOMUXC_SW_MUX_CTL_PAD_MUX_MODE_SHIFT;
+}
+
+const machine_pin_obj_t *pin_find(mp_obj_t user_obj) {
+    const machine_pin_obj_t *pin_obj;
+
+    // If a pin was provided, then use it
+    if (mp_obj_is_type(user_obj, &machine_pin_type)) {
+        pin_obj = user_obj;
+        return pin_obj;
+    }
+
+    // If pin is SMALL_INT
+    if (mp_obj_is_small_int(user_obj)) {
+        uint8_t value = MP_OBJ_SMALL_INT_VALUE(user_obj);
+        if (value < num_board_pins) {
+            return machine_pin_board_pins[value];
+        }
+    }
+
+    // See if the pin name matches a board pin
+    pin_obj = pin_find_named_pin(&machine_pin_board_pins_locals_dict, user_obj);
+    if (pin_obj) {
+        return pin_obj;
+    }
+
+    // See if the pin name matches a cpu pin
+    pin_obj = pin_find_named_pin(&machine_pin_cpu_pins_locals_dict, user_obj);
+    if (pin_obj) {
+        return pin_obj;
+    }
+
+    mp_raise_ValueError(MP_ERROR_TEXT("Pin doesn't exist"));
+}
+
+const machine_pin_obj_t *pin_find_named_pin(const mp_obj_dict_t *named_pins, mp_obj_t name) {
+    mp_map_t *named_map = mp_obj_dict_get_map((mp_obj_t)named_pins);
+    mp_map_elem_t *named_elem = mp_map_lookup(named_map, name, MP_MAP_LOOKUP);
+    if (named_elem != NULL && named_elem->value != NULL) {
+        return named_elem->value;
+    }
+    return NULL;
+}
+
+const machine_pin_af_obj_t *pin_find_af(const machine_pin_obj_t *pin, uint8_t fn) {
+    const machine_pin_af_obj_t *af_obj = NULL;
+
+    for (int i = 0; i < pin->af_list_len; ++i) {
+        af_obj = &pin->af_list[i];
+        if (af_obj->af_mode == fn) {
+            return af_obj;
+        }
+    }
+
+    return NULL;
+}
+
+const machine_pin_af_obj_t *pin_find_af_by_index(const machine_pin_obj_t *pin, mp_uint_t af_idx) {
+    // TODO: Implement pin_find_af_by_index function
+    return NULL;
+}
+
+const machine_pin_af_obj_t *pin_find_af_by_name(const machine_pin_obj_t *pin, const char *name) {
+    // TODO: Implement pin_find_af_by_name function
+    return NULL;
+}
diff --git a/ports/mimxrt/pin.h b/ports/mimxrt/pin.h
index cfb1e6b572502..268b505b3856b 100644
--- a/ports/mimxrt/pin.h
+++ b/ports/mimxrt/pin.h
@@ -27,12 +27,32 @@
 #ifndef MICROPY_INCLUDED_MIMXRT_PIN_H
 #define MICROPY_INCLUDED_MIMXRT_PIN_H
 
-#include "fsl_gpio.h"
+#include <stdint.h>
 #include "py/obj.h"
+#include "fsl_gpio.h"
+
+// ------------------------------------------------------------------------------------------------------------------ //
+
+#define IS_GPIO_MODE(MODE) (((MODE) == PIN_MODE_IN) || \
+    ((MODE) == PIN_MODE_OUT) || \
+    ((MODE) == PIN_MODE_OPEN_DRAIN) || \
+    ((MODE) == PIN_MODE_ALT))
+
+#define IS_GPIO_DRIVE(DRIVE) (((DRIVE) == PIN_DRIVE_OFF) || \
+    ((DRIVE) == PIN_DRIVE_POWER_0) || \
+    ((DRIVE) == PIN_DRIVE_POWER_1) || \
+    ((DRIVE) == PIN_DRIVE_POWER_2) || \
+    ((DRIVE) == PIN_DRIVE_POWER_3) || \
+    ((DRIVE) == PIN_DRIVE_POWER_4) || \
+    ((DRIVE) == PIN_DRIVE_POWER_5) || \
+    ((DRIVE) == PIN_DRIVE_POWER_6))
+
+// ------------------------------------------------------------------------------------------------------------------ //
 
 enum {
     PIN_MODE_IN = 0,
     PIN_MODE_OUT,
+    PIN_MODE_OPEN_DRAIN,
     PIN_MODE_ALT,
 };
 
@@ -47,13 +67,38 @@ enum {
     PIN_AF_MODE_ALT8,
 };
 
+enum {
+    PIN_PULL_DOWN_100K = 0,
+    PIN_PULL_UP_47K,
+    PIN_PULL_UP_100K,
+    PIN_PULL_UP_22K,
+    PIN_PULL_DISABLED,
+    PIN_PULL_HOLD,
+};
+
+enum {
+    PIN_DRIVE_OFF = 0b000,
+    PIN_DRIVE_POWER_0, // R0 (150 Ohm @3.3V / 260 Ohm @ 1.8V)
+    PIN_DRIVE_POWER_1, // R0/2
+    PIN_DRIVE_POWER_2, // R0/3
+    PIN_DRIVE_POWER_3, // R0/4
+    PIN_DRIVE_POWER_4, // R0/5
+    PIN_DRIVE_POWER_5, // R0/6
+    PIN_DRIVE_POWER_6, // R0/7
+};
+
+
+
+
+// ------------------------------------------------------------------------------------------------------------------ //
+
 typedef struct {
     mp_obj_base_t base;
     qstr name;  // port name
-    uint32_t af_mode;  // alternate function
+    uint8_t af_mode;  // alternate function
     void *instance;  // pointer to peripheral instance for alternate function
     uint32_t pad_config;  // pad configuration for alternate function
-} pin_af_obj_t;
+} machine_pin_af_obj_t;
 
 typedef struct {
     mp_obj_base_t base;
@@ -62,39 +107,38 @@ typedef struct {
     uint32_t pin;  // pin number
     uint32_t muxRegister;
     uint32_t configRegister;
-    uint32_t mode;  // current pin mode
-    uint32_t af_mode;  // current alternate function mode
     size_t af_list_len;  // length of available alternate functions list
-    const pin_af_obj_t *af_list;  // pointer tolist with alternate functions
-} pin_obj_t;
-
-extern const mp_obj_type_t pin_type;
-extern const mp_obj_type_t pin_af_type;
-
-#define PIN_AF(_name, _af_mode, _instance, _pad_config) \
-    { \
-        .base = { &pin_af_type }, \
-        .name = MP_QSTR_##_name, \
-        .af_mode = (uint32_t)(_af_mode), \
-        .instance = (void *)(_instance), \
-        .pad_config = (uint32_t)(_pad_config), \
-    } \
-
-#define PIN(_name, _gpio, _pin, _af_list) \
-    { \
-        .base = { &pin_type }, \
-        .name = MP_QSTR_##_name, \
-        .gpio = (_gpio), \
-        .pin = (uint32_t)(_pin), \
-        .muxRegister = (uint32_t)&(IOMUXC->SW_MUX_CTL_PAD[kIOMUXC_SW_MUX_CTL_PAD_##_name]), \
-        .configRegister = (uint32_t)&(IOMUXC->SW_PAD_CTL_PAD[kIOMUXC_SW_PAD_CTL_PAD_##_name]), \
-        .mode = PIN_MODE_IN, \
-        .af_mode = PIN_AF_MODE_ALT5, \
-        .af_list_len = (size_t)(sizeof((_af_list)) / sizeof(pin_af_obj_t)), \
-        .af_list = (_af_list), \
-    } \
+    const machine_pin_af_obj_t *af_list;  // pointer tolist with alternate functions
+} machine_pin_obj_t;
+
+// ------------------------------------------------------------------------------------------------------------------ //
+
+extern const mp_obj_type_t machine_pin_type;
+extern const mp_obj_type_t machine_pin_af_type;
+
+// ------------------------------------------------------------------------------------------------------------------ //
 
 // Include board specific pins
-#include "pins.h"
+#include "genhdr/pins.h"  // pins.h must included at this location
+
+extern const machine_pin_obj_t *machine_pin_board_pins[];
+extern const uint32_t num_board_pins;
+
+extern const mp_obj_type_t machine_pin_board_pins_obj_type;
+extern const mp_obj_type_t machine_pin_cpu_pins_obj_type;
+
+extern const mp_obj_dict_t machine_pin_cpu_pins_locals_dict;
+extern const mp_obj_dict_t machine_pin_board_pins_locals_dict;
+
+// ------------------------------------------------------------------------------------------------------------------ //
+
+void pin_init(void);
+uint32_t pin_get_mode(const machine_pin_obj_t *pin);
+uint32_t pin_get_af(const machine_pin_obj_t *pin);
+const machine_pin_obj_t *pin_find(mp_obj_t user_obj);
+const machine_pin_obj_t *pin_find_named_pin(const mp_obj_dict_t *named_pins, mp_obj_t name);
+const machine_pin_af_obj_t *pin_find_af(const machine_pin_obj_t *pin, uint8_t fn);
+const machine_pin_af_obj_t *pin_find_af_by_index(const machine_pin_obj_t *pin, mp_uint_t af_idx);
+const machine_pin_af_obj_t *pin_find_af_by_name(const machine_pin_obj_t *pin, const char *name);
 
 #endif // MICROPY_INCLUDED_MIMXRT_PIN_H
diff --git a/ports/mimxrt/tusb_port.c b/ports/mimxrt/tusb_port.c
index 0d73b09235b64..2b1ccabbe783a 100644
--- a/ports/mimxrt/tusb_port.c
+++ b/ports/mimxrt/tusb_port.c
@@ -76,7 +76,7 @@ static const uint8_t usbd_desc_cfg[USBD_DESC_LEN] = {
 
 static const char *const usbd_desc_str[] = {
     [USBD_STR_MANUF] = "MicroPython",
-    [USBD_STR_PRODUCT] = "Board in FS mode",
+    [USBD_STR_PRODUCT] = "Board in FS mode", // Todo: fix string to indicate that product is running in High Speed mode
     [USBD_STR_SERIAL] = "000000000000", // TODO
     [USBD_STR_CDC] = "Board CDC",
 };

From c326d9a67ba1846bba38f284fa9b8f712dd2d48a Mon Sep 17 00:00:00 2001
From: Philipp Ebensberger <philipp.ebensberger@3bricks-software.de>
Date: Sat, 24 Apr 2021 22:15:12 +0200
Subject: [PATCH 0891/3533] mimxrt: Enable built-in help.

---
 ports/mimxrt/mpconfigport.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/mimxrt/mpconfigport.h b/ports/mimxrt/mpconfigport.h
index 65b91675a5de6..e6b15e1b71777 100644
--- a/ports/mimxrt/mpconfigport.h
+++ b/ports/mimxrt/mpconfigport.h
@@ -58,6 +58,7 @@
 #define MICROPY_PY_BUILTINS_FILTER          (0)
 #define MICROPY_PY_BUILTINS_REVERSED        (1)
 #define MICROPY_PY_BUILTINS_MIN_MAX         (0)
+#define MICROPY_PY_BUILTINS_HELP            (1)
 #define MICROPY_PY___FILE__                 (0)
 #define MICROPY_PY_MICROPYTHON_MEM_INFO     (1)
 #define MICROPY_PY_ARRAY_SLICE_ASSIGN       (1)

From 5f68f0d08ab1effd0fae8a00bdda46dbc788d9db Mon Sep 17 00:00:00 2001
From: Philipp Ebensberger <philipp.ebensberger@3bricks-software.de>
Date: Sat, 24 Apr 2021 21:34:07 +0200
Subject: [PATCH 0892/3533] github/workflows: Add CI workflow for mimxrt port.

---
 .github/workflows/ports_mimxrt.yml | 23 +++++++++++++++++++++++
 tools/ci.sh                        | 13 +++++++++++++
 2 files changed, 36 insertions(+)
 create mode 100644 .github/workflows/ports_mimxrt.yml

diff --git a/.github/workflows/ports_mimxrt.yml b/.github/workflows/ports_mimxrt.yml
new file mode 100644
index 0000000000000..8fbc2209e4139
--- /dev/null
+++ b/.github/workflows/ports_mimxrt.yml
@@ -0,0 +1,23 @@
+name: mimxrt port
+
+on:
+  push:
+  pull_request:
+    paths:
+      - '.github/workflows/*.yml'
+      - 'tools/**'
+      - 'py/**'
+      - 'extmod/**'
+      - 'lib/**'
+      - 'drivers/**'
+      - 'ports/mimxrt/**'
+
+jobs:
+  build:
+    runs-on: ubuntu-20.04
+    steps:
+    - uses: actions/checkout@v2
+    - name: Install packages
+      run: source tools/ci.sh && ci_mimxrt_setup
+    - name: Build
+      run: source tools/ci.sh && ci_mimxrt_build
diff --git a/tools/ci.sh b/tools/ci.sh
index 7b38ce0df04fc..df812141f5e5f 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -138,6 +138,19 @@ function ci_esp8266_build {
     make ${MAKEOPTS} -C ports/esp8266 BOARD=GENERIC_1M
 }
 
+########################################################################################
+# ports/mimxrt
+
+function ci_mimxrt_setup {
+    ci_gcc_arm_setup
+}
+
+function ci_mimxrt_build {
+    make ${MAKEOPTS} -C ports/mimxrt submodules
+    make ${MAKEOPTS} -C ports/mimxrt BOARD=MIMXRT1020_EVK
+    make ${MAKEOPTS} -C ports/mimxrt BOARD=TEENSY40
+}
+
 ########################################################################################
 # ports/nrf
 

From c732b80f0584156b6ff98e8baa90c011539bf88a Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Tue, 25 May 2021 14:49:21 +0200
Subject: [PATCH 0893/3533] mimxrt: Extend the Pin module for SoftI2C, SoftSPI
 support.

This change consists mostly of changing and extending the required
definitions in mphalport.h.
---
 ports/mimxrt/machine_pin.c | 14 ++++++++++++++
 ports/mimxrt/mphalport.h   | 14 +++++++++++++-
 ports/mimxrt/pin.h         |  1 +
 3 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/ports/mimxrt/machine_pin.c b/ports/mimxrt/machine_pin.c
index 583ee4a265192..f63778cbe517a 100644
--- a/ports/mimxrt/machine_pin.c
+++ b/ports/mimxrt/machine_pin.c
@@ -68,6 +68,20 @@ const mp_obj_type_t machine_pin_board_pins_obj_type = {
     .locals_dict = (mp_obj_t)&machine_pin_board_pins_locals_dict,
 };
 
+// Simplified mode setting used by the extmod modules
+void machine_pin_set_mode(const machine_pin_obj_t *self, uint8_t mode) {
+    gpio_pin_config_t pin_config = {kGPIO_DigitalInput, 1, kGPIO_NoIntmode};
+
+    pin_config.direction = (mode == PIN_MODE_IN ? kGPIO_DigitalInput : kGPIO_DigitalOutput);
+    GPIO_PinInit(self->gpio, self->pin, &pin_config);
+    if (mode == PIN_MODE_OPEN_DRAIN) {
+        uint32_t pad_config = *(uint32_t *)self->configRegister;
+        pad_config |= IOMUXC_SW_PAD_CTL_PAD_ODE(0b1) | IOMUXC_SW_PAD_CTL_PAD_DSE(0b110);
+        IOMUXC_SetPinMux(self->muxRegister, PIN_AF_MODE_ALT5, 0, 0, self->configRegister, 1U);  // Software Input On Field: Input Path is determined by functionality
+        IOMUXC_SetPinConfig(self->muxRegister, PIN_AF_MODE_ALT5, 0, 0, self->configRegister, pad_config);
+    }
+}
+
 STATIC mp_obj_t machine_pin_obj_call(mp_obj_t self_in, mp_uint_t n_args, mp_uint_t n_kw, const mp_obj_t *args) {
     mp_arg_check_num(n_args, n_kw, 0, 1, false);
     machine_pin_obj_t *self = self_in;
diff --git a/ports/mimxrt/mphalport.h b/ports/mimxrt/mphalport.h
index a6a28ab4a585c..78b390b4eb578 100644
--- a/ports/mimxrt/mphalport.h
+++ b/ports/mimxrt/mphalport.h
@@ -31,12 +31,22 @@
 #include "ticks.h"
 #include "pin.h"
 
+#define MP_HAL_PIN_FMT                  "%q"
+
 #define mp_hal_pin_obj_t const machine_pin_obj_t *
+#define mp_hal_get_pin_obj(o)   pin_find(o)
+#define mp_hal_pin_name(p)      ((p)->name)
+#define mp_hal_pin_input(p) machine_pin_set_mode(p, PIN_MODE_IN);
+#define mp_hal_pin_output(p) machine_pin_set_mode(p, PIN_MODE_OUT);
+#define mp_hal_pin_open_drain(p) machine_pin_set_mode(p, PIN_MODE_OPEN_DRAIN);
 #define mp_hal_pin_high(p) (GPIO_PinWrite(p->gpio, p->pin, 1U))
 #define mp_hal_pin_low(p) (GPIO_PinWrite(p->gpio, p->pin, 0U))
 #define mp_hal_pin_write(p, value) (GPIO_PinWrite(p->gpio, p->pin, value))
 #define mp_hal_pin_toggle(p) (GPIO_PortToggle(p->gpio, (1 << p->pin)))
-#define mp_hal_pin_read(p) (GPIO_PinRead(p->gpio, p->pin))
+#define mp_hal_pin_read(p) (GPIO_PinReadPadStatus(p->gpio, p->pin))
+
+#define mp_hal_pin_od_low(p)    mp_hal_pin_low(p)
+#define mp_hal_pin_od_high(p)   mp_hal_pin_high(p)
 
 void mp_hal_set_interrupt_char(int c);
 
@@ -57,6 +67,8 @@ static inline void mp_hal_delay_us(mp_uint_t us) {
     ticks_delay_us64(us);
 }
 
+#define mp_hal_delay_us_fast(us) mp_hal_delay_us(us)
+
 static inline mp_uint_t mp_hal_ticks_cpu(void) {
     return 0;
 }
diff --git a/ports/mimxrt/pin.h b/ports/mimxrt/pin.h
index 268b505b3856b..6afedd1f59e1b 100644
--- a/ports/mimxrt/pin.h
+++ b/ports/mimxrt/pin.h
@@ -140,5 +140,6 @@ const machine_pin_obj_t *pin_find_named_pin(const mp_obj_dict_t *named_pins, mp_
 const machine_pin_af_obj_t *pin_find_af(const machine_pin_obj_t *pin, uint8_t fn);
 const machine_pin_af_obj_t *pin_find_af_by_index(const machine_pin_obj_t *pin, mp_uint_t af_idx);
 const machine_pin_af_obj_t *pin_find_af_by_name(const machine_pin_obj_t *pin, const char *name);
+void machine_pin_set_mode(const machine_pin_obj_t *pin, uint8_t mode);
 
 #endif // MICROPY_INCLUDED_MIMXRT_PIN_H

From 4ee8ec6931e6a5958d2a5710c6a8f7cd7c0f3862 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 25 May 2021 22:15:58 +1000
Subject: [PATCH 0894/3533] py/asmarm: Use builtin func to flush I- and D-cache
 on ARM 7 archs.

The inline assembler code does not work for __ARM_ARCH == 7.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/asmarm.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/py/asmarm.c b/py/asmarm.c
index e91421578b274..5662d75e19527 100644
--- a/py/asmarm.c
+++ b/py/asmarm.c
@@ -40,7 +40,7 @@
 
 void asm_arm_end_pass(asm_arm_t *as) {
     if (as->base.pass == MP_ASM_PASS_EMIT) {
-        #if defined(__linux__) && defined(__GNUC__)
+        #if (defined(__linux__) && defined(__GNUC__)) || __ARM_ARCH == 7
         char *start = mp_asm_base_get_code(&as->base);
         char *end = start + mp_asm_base_get_code_size(&as->base);
         __builtin___clear_cache(start, end);
@@ -48,10 +48,10 @@ void asm_arm_end_pass(asm_arm_t *as) {
         // flush I- and D-cache
         asm volatile (
             "0:"
-            "mrc p15, 0, r15, c7, c10, 3\n"
+            "mrc p15, 0, r15, c7, c10, 3\n" // test and clean D-cache
             "bne 0b\n"
             "mov r0, #0\n"
-            "mcr p15, 0, r0, c7, c7, 0\n"
+            "mcr p15, 0, r0, c7, c7, 0\n" // invalidate I-cache and D-cache
             : : : "r0", "cc");
         #endif
     }

From 2c1a6a237d4e68c077c175d16f4d76518c00e4d2 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 25 May 2021 22:16:06 +1000
Subject: [PATCH 0895/3533] tools/mpy-tool.py: Support relocating ARMv6 arch.

Signed-off-by: Damien George <damien@micropython.org>
---
 tools/mpy-tool.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/mpy-tool.py b/tools/mpy-tool.py
index ea756d3ee2a5c..bfc3cf27e3f46 100755
--- a/tools/mpy-tool.py
+++ b/tools/mpy-tool.py
@@ -532,6 +532,7 @@ def _link_qstr(self, pc, kind, qst):
             if config.native_arch in (
                 MP_NATIVE_ARCH_X86,
                 MP_NATIVE_ARCH_X64,
+                MP_NATIVE_ARCH_ARMV6,
                 MP_NATIVE_ARCH_XTENSA,
                 MP_NATIVE_ARCH_XTENSAWIN,
             ):

From f5cba77e50c9b3ae73d01cb373ad3226247ccd7b Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 25 May 2021 22:16:11 +1000
Subject: [PATCH 0896/3533] tools/tinytest-codegen.py: Add command-line option
 to exclude tests.

Signed-off-by: Damien George <damien@micropython.org>
---
 tools/tinytest-codegen.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tools/tinytest-codegen.py b/tools/tinytest-codegen.py
index 116a217b4bbc7..cba0b94480ba8 100755
--- a/tools/tinytest-codegen.py
+++ b/tools/tinytest-codegen.py
@@ -108,9 +108,12 @@ def script_to_map(test_file):
     description="Convert native MicroPython tests to tinytest/upytesthelper C code"
 )
 argparser.add_argument("--stdin", action="store_true", help="read list of tests from stdin")
+argparser.add_argument("--exclude", action="append", help="exclude test by name")
 args = argparser.parse_args()
 
 if not args.stdin:
+    if args.exclude:
+        exclude_tests += tuple(args.exclude)
     for group in test_dirs:
         tests += [test for test in glob("{}/*.py".format(group)) if test not in exclude_tests]
 else:

From b84406f3133a36a703a1506d754fc046dd955922 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 25 May 2021 22:16:08 +1000
Subject: [PATCH 0897/3533] qemu-arm: Add support for Cortex-A9 via sabrelite
 board.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/qemu-arm/Makefile       | 21 ++++++++++++----
 ports/qemu-arm/Makefile.test  |  7 +++++-
 ports/qemu-arm/imx6.ld        | 47 +++++++++++++++++++++++++++++++++++
 ports/qemu-arm/mpconfigport.h | 11 +++++---
 ports/qemu-arm/startup.c      | 27 ++++++++++++++++++++
 ports/qemu-arm/uart.c         | 27 ++++++++++++++++++++
 6 files changed, 131 insertions(+), 9 deletions(-)
 create mode 100644 ports/qemu-arm/imx6.ld

diff --git a/ports/qemu-arm/Makefile b/ports/qemu-arm/Makefile
index aebc5afaeb773..22d0bf39cd961 100644
--- a/ports/qemu-arm/Makefile
+++ b/ports/qemu-arm/Makefile
@@ -16,7 +16,8 @@ ifeq ($(BOARD),netduino2)
 CFLAGS += -mthumb -mcpu=cortex-m3 -mfloat-abi=soft
 CFLAGS += -DQEMU_SOC_STM32
 LDSCRIPT = stm32.ld
-SRC_BOARD_O = lib/utils/gchelper_m3.o
+SRC_BOARD_O = lib/utils/gchelper_native.o lib/utils/gchelper_m3.o
+MPY_CROSS_FLAGS += -march=armv7m
 endif
 
 ifeq ($(BOARD),microbit)
@@ -24,14 +25,26 @@ CFLAGS += -mthumb -mcpu=cortex-m0 -mfloat-abi=soft
 CFLAGS += -DQEMU_SOC_NRF51
 LDSCRIPT = nrf51.ld
 QEMU_EXTRA = -global nrf51-soc.flash-size=1048576 -global nrf51-soc.sram-size=262144
-SRC_BOARD_O = lib/utils/gchelper_m0.o
+SRC_BOARD_O = lib/utils/gchelper_native.o lib/utils/gchelper_m0.o
+MPY_CROSS_FLAGS += -march=armv7m
 endif
 
 ifeq ($(BOARD),mps2-an385)
 CFLAGS += -mthumb -mcpu=cortex-m3 -mfloat-abi=soft
 CFLAGS += -DQEMU_SOC_MPS2
 LDSCRIPT = mps2.ld
-SRC_BOARD_O = lib/utils/gchelper_m3.o
+SRC_BOARD_O = lib/utils/gchelper_native.o lib/utils/gchelper_m3.o
+MPY_CROSS_FLAGS += -march=armv7m
+endif
+
+ifeq ($(BOARD),sabrelite)
+CFLAGS += -mcpu=cortex-a9
+CFLAGS += -DQEMU_SOC_IMX6
+LDSCRIPT = imx6.ld
+QEMU_EXTRA = -m 128M
+SRC_BOARD_O = lib/utils/gchelper_generic.o
+# It's really armv7a but closest supported value is armv6.
+MPY_CROSS_FLAGS += -march=armv6
 endif
 
 CROSS_COMPILE ?= arm-none-eabi-
@@ -95,7 +108,6 @@ LIB_SRC_C += $(addprefix lib/,\
 	libm/atanf.c \
 	libm/atan2f.c \
 	libm/roundf.c \
-	utils/gchelper_native.c \
 	utils/sys_stdio_mphal.c \
 	)
 
@@ -125,7 +137,6 @@ ifneq ($(FROZEN_MANIFEST),)
 CFLAGS += -DMICROPY_MODULE_FROZEN_STR
 CFLAGS += -DMICROPY_MODULE_FROZEN_MPY
 CFLAGS += -DMICROPY_QSTR_EXTRA_POOL=mp_qstr_frozen_const_pool
-MPY_CROSS_FLAGS += -march=armv7m
 endif
 
 all: run
diff --git a/ports/qemu-arm/Makefile.test b/ports/qemu-arm/Makefile.test
index 6b7f1dc7ab46c..b4ad6114b8046 100644
--- a/ports/qemu-arm/Makefile.test
+++ b/ports/qemu-arm/Makefile.test
@@ -4,6 +4,11 @@ FROZEN_MANIFEST ?= "freeze('test-frzmpy')"
 
 include Makefile
 
+ifeq ($(BOARD),sabrelite)
+# These don't work on Cortex-A9.
+TESTS_EXCLUDE = inlineasm/asmdiv.py inlineasm/asmspecialregs.py
+endif
+
 CFLAGS += -DTEST
 
 .PHONY: $(BUILD)/genhdr/tests.h
@@ -11,7 +16,7 @@ CFLAGS += -DTEST
 $(BUILD)/test_main.o: $(BUILD)/genhdr/tests.h
 $(BUILD)/genhdr/tests.h:
 	(cd $(TOP)/tests; ./run-tests.py --target=qemu-arm --write-exp)
-	$(Q)echo "Generating $@";(cd $(TOP)/tests; ../tools/tinytest-codegen.py) > $@
+	$(Q)echo "Generating $@";(cd $(TOP)/tests; ../tools/tinytest-codegen.py $(addprefix --exclude ,$(TESTS_EXCLUDE))) > $@
 
 $(BUILD)/lib/tinytest/tinytest.o: CFLAGS += -DNO_FORKING
 
diff --git a/ports/qemu-arm/imx6.ld b/ports/qemu-arm/imx6.ld
new file mode 100644
index 0000000000000..7155956f15ad5
--- /dev/null
+++ b/ports/qemu-arm/imx6.ld
@@ -0,0 +1,47 @@
+/* Vector table is at 0x00000000, entry point is 0x10000000. */
+
+MEMORY
+{
+    ROM : ORIGIN = 0x00000000, LENGTH = 96K
+    RAM : ORIGIN = 0x10000000, LENGTH = 128M
+}
+
+_estack = ORIGIN(RAM) + LENGTH(RAM);
+
+SECTIONS
+{
+    .rom : {
+        . = ALIGN(4);
+        KEEP(*(.isr_vector))
+        . = ALIGN(4);
+    } > ROM
+
+    .text : {
+        . = ALIGN(4);
+        *(.text.Reset_Handler)
+        *(.text*)
+        *(.rodata*)
+        . = ALIGN(4);
+        _etext = .;
+        _sidata = _etext;
+    } > RAM
+
+    .data : AT ( _sidata )
+    {
+        . = ALIGN(4);
+        _sdata = .;
+        *(.data*)
+        . = ALIGN(4);
+        _edata = .;
+    } > RAM
+
+    .bss :
+    {
+        . = ALIGN(4);
+        _sbss = .;
+        *(.bss*)
+        *(COMMON)
+        . = ALIGN(4);
+        _ebss = .;
+    } > RAM
+}
diff --git a/ports/qemu-arm/mpconfigport.h b/ports/qemu-arm/mpconfigport.h
index 498ab3ed2cfac..1f05719caad9c 100644
--- a/ports/qemu-arm/mpconfigport.h
+++ b/ports/qemu-arm/mpconfigport.h
@@ -3,9 +3,16 @@
 // options to control how MicroPython is built
 
 #define MICROPY_ALLOC_PATH_MAX      (512)
-#define MICROPY_EMIT_X64            (0)
+
+#if defined(__ARM_ARCH_ISA_ARM)
+#define MICROPY_EMIT_ARM            (1)
+#define MICROPY_EMIT_INLINE_THUMB   (1)
+#elif defined(__ARM_ARCH_ISA_THUMB)
 #define MICROPY_EMIT_THUMB          (1)
 #define MICROPY_EMIT_INLINE_THUMB   (1)
+#define MICROPY_MAKE_POINTER_CALLABLE(p) ((void *)((mp_uint_t)(p) | 1))
+#endif
+
 #define MICROPY_MALLOC_USES_ALLOCATED_SIZE (1)
 #define MICROPY_MEM_STATS           (1)
 #define MICROPY_DEBUG_PRINTERS      (0)
@@ -43,8 +50,6 @@
 
 // type definitions for the specific machine
 
-#define MICROPY_MAKE_POINTER_CALLABLE(p) ((void *)((mp_uint_t)(p) | 1))
-
 #define MP_SSIZE_MAX (0x7fffffff)
 
 #define UINT_FMT "%lu"
diff --git a/ports/qemu-arm/startup.c b/ports/qemu-arm/startup.c
index 58bdf7af9e98e..a52b068c332ae 100644
--- a/ports/qemu-arm/startup.c
+++ b/ports/qemu-arm/startup.c
@@ -28,6 +28,27 @@ void Default_Handler(void) {
     }
 }
 
+#if defined(__ARM_ARCH_ISA_ARM)
+
+// ARM architecture with standard ARM ISA.
+
+__attribute__((naked, section(".isr_vector"))) void isr_vector(void) {
+    __asm volatile (
+        "b Reset_Handler\n"
+        "b Default_Handler\n"
+        "b Default_Handler\n"
+        "b Default_Handler\n"
+        "b Default_Handler\n"
+        "nop\n"
+        "b Default_Handler\n"
+        "b Default_Handler\n"
+        );
+}
+
+#elif defined(__ARM_ARCH_ISA_THUMB)
+
+// ARM architecture with Thumb-only ISA.
+
 const uint32_t isr_vector[] __attribute__((section(".isr_vector"))) = {
     (uint32_t)&_estack,
     (uint32_t)&Reset_Handler,
@@ -47,6 +68,8 @@ const uint32_t isr_vector[] __attribute__((section(".isr_vector"))) = {
     (uint32_t)&Default_Handler, // SysTick_Handler
 };
 
+#endif
+
 void _start(void) {
     // Enable the UART
     uart_init();
@@ -68,7 +91,11 @@ __attribute__((naked)) void exit(int status) {
         "ldr r1, =0x20026\n" // ADP_Stopped_ApplicationExit, a clean exit
         ".notclean:\n"
         "movs r0, #0x18\n" // SYS_EXIT
+        #if defined(__ARM_ARCH_ISA_ARM)
+        "svc 0x00123456\n"
+        #elif defined(__ARM_ARCH_ISA_THUMB)
         "bkpt 0xab\n"
+        #endif
         );
     for (;;) {
     }
diff --git a/ports/qemu-arm/uart.c b/ports/qemu-arm/uart.c
index 8710e9e9f681d..828398cd175a8 100644
--- a/ports/qemu-arm/uart.c
+++ b/ports/qemu-arm/uart.c
@@ -75,4 +75,31 @@ void uart_tx_strn(const char *buf, size_t len) {
     }
 }
 
+#elif defined(QEMU_SOC_IMX6)
+
+#define UART_UCR1_UARTEN (1 << 0)
+#define UART_UCR2_TXEN (1 << 2)
+
+typedef struct _UART_t {
+    volatile uint32_t URXD; // 0x00
+    volatile uint32_t r0[15];
+    volatile uint32_t UTXD; // 0x40
+    volatile uint32_t r1[15];
+    volatile uint32_t UCR1; // 0x80
+    volatile uint32_t UCR2; // 0x84
+} UART_t;
+
+#define UART1 ((UART_t *)(0x02020000))
+
+void uart_init(void) {
+    UART1->UCR1 = UART_UCR1_UARTEN;
+    UART1->UCR2 = UART_UCR2_TXEN;
+}
+
+void uart_tx_strn(const char *buf, size_t len) {
+    for (size_t i = 0; i < len; ++i) {
+        UART1->UTXD = buf[i];
+    }
+}
+
 #endif

From e7c0a8bca31063c295afdaf8e49c8ab24b70a90d Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 25 May 2021 22:14:56 +1000
Subject: [PATCH 0898/3533] tools/ci.sh: Build Cortex-A9 sabrelite board as
 part of qemu-arm CI.

Signed-off-by: Damien George <damien@micropython.org>
---
 tools/ci.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tools/ci.sh b/tools/ci.sh
index df812141f5e5f..c986c9fef80ba 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -194,6 +194,8 @@ function ci_qemu_arm_build {
     make ${MAKEOPTS} -C ports/qemu-arm CFLAGS_EXTRA=-DMP_ENDIANNESS_BIG=1
     make ${MAKEOPTS} -C ports/qemu-arm clean
     make ${MAKEOPTS} -C ports/qemu-arm -f Makefile.test test
+    make ${MAKEOPTS} -C ports/qemu-arm -f Makefile.test clean
+    make ${MAKEOPTS} -C ports/qemu-arm -f Makefile.test BOARD=sabrelite test
 }
 
 ########################################################################################

From dc86e044761a132ddd7026f0f9555f958ba8046a Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 20 May 2021 10:02:57 +1000
Subject: [PATCH 0899/3533] tests: Make float and framebuf tests skip or run on
 big-endian archs.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/extmod/framebuf16.py                                 | 7 ++++++-
 tests/extmod/framebuf_subclass.py                          | 7 ++++++-
 ...ytearray_construct.py => bytearray_construct_endian.py} | 0
 .../{bytes_construct.py => bytes_construct_endian.py}      | 2 +-
 tests/float/float_array.py                                 | 2 +-
 5 files changed, 14 insertions(+), 4 deletions(-)
 rename tests/float/{bytearray_construct.py => bytearray_construct_endian.py} (100%)
 rename tests/float/{bytes_construct.py => bytes_construct_endian.py} (77%)

diff --git a/tests/extmod/framebuf16.py b/tests/extmod/framebuf16.py
index e658f1345ad1a..cd7f5ec015836 100644
--- a/tests/extmod/framebuf16.py
+++ b/tests/extmod/framebuf16.py
@@ -1,9 +1,14 @@
 try:
-    import framebuf
+    import framebuf, usys
 except ImportError:
     print("SKIP")
     raise SystemExit
 
+# This test and its .exp file is based on a little-endian architecture.
+if usys.byteorder != "little":
+    print("SKIP")
+    raise SystemExit
+
 
 def printbuf():
     print("--8<--")
diff --git a/tests/extmod/framebuf_subclass.py b/tests/extmod/framebuf_subclass.py
index aad5d2a1e96b4..a9e3c5efc7912 100644
--- a/tests/extmod/framebuf_subclass.py
+++ b/tests/extmod/framebuf_subclass.py
@@ -1,11 +1,16 @@
 # test subclassing framebuf.FrameBuffer
 
 try:
-    import framebuf
+    import framebuf, usys
 except ImportError:
     print("SKIP")
     raise SystemExit
 
+# This test and its .exp file is based on a little-endian architecture.
+if usys.byteorder != "little":
+    print("SKIP")
+    raise SystemExit
+
 
 class FB(framebuf.FrameBuffer):
     def __init__(self, n):
diff --git a/tests/float/bytearray_construct.py b/tests/float/bytearray_construct_endian.py
similarity index 100%
rename from tests/float/bytearray_construct.py
rename to tests/float/bytearray_construct_endian.py
diff --git a/tests/float/bytes_construct.py b/tests/float/bytes_construct_endian.py
similarity index 77%
rename from tests/float/bytes_construct.py
rename to tests/float/bytes_construct_endian.py
index 0806087b0ef0e..208f56162f859 100644
--- a/tests/float/bytes_construct.py
+++ b/tests/float/bytes_construct_endian.py
@@ -1,4 +1,4 @@
-# test construction of bytearray from array with float type
+# test construction of bytes from array with float type
 
 try:
     from uarray import array
diff --git a/tests/float/float_array.py b/tests/float/float_array.py
index 3c2189869b93f..219b6b86aef25 100644
--- a/tests/float/float_array.py
+++ b/tests/float/float_array.py
@@ -22,4 +22,4 @@ def test(a):
 test(array("f"))
 test(array("d"))
 
-print("{:.4f}".format(array("f", b"\xcc\xcc\xcc=")[0]))
+print("{:.4f}".format(array("f", bytes(array("I", [0x3DCCCCCC])))[0]))

From ef16834887de02cbddf414b560e5a2af9cae4b16 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 18 May 2021 13:20:02 +1000
Subject: [PATCH 0900/3533] github/workflows: Add workflow to build and run
 unix port on MIPS.

This adds a coverage build and running of the test suite on a MIPS 32-bit
big endian architecture.  It uses the feature of qemu to execute foreign
code as though it were native to the system (using qemu user mode).  The
code compiled for MIPS will run under the qemu VM, but all syscalls made by
this code go to the host (Linux) system.

See related #7268 and #7273.

Signed-off-by: Damien George <damien@micropython.org>
---
 .github/workflows/ports_unix.yml | 14 ++++++++++++++
 tools/ci.sh                      | 27 +++++++++++++++++++++++++++
 2 files changed, 41 insertions(+)

diff --git a/.github/workflows/ports_unix.yml b/.github/workflows/ports_unix.yml
index aa4b8abdc9893..5c4a4f3047a57 100644
--- a/.github/workflows/ports_unix.yml
+++ b/.github/workflows/ports_unix.yml
@@ -186,3 +186,17 @@ jobs:
     - name: Print failures
       if: failure()
       run: tests/run-tests.py --print-failures
+
+  qemu_mips:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Install packages
+      run: source tools/ci.sh && ci_unix_qemu_mips_setup
+    - name: Build
+      run: source tools/ci.sh && ci_unix_qemu_mips_build
+    - name: Run main test suite
+      run: source tools/ci.sh && ci_unix_qemu_mips_run_tests
+    - name: Print failures
+      if: failure()
+      run: tests/run-tests.py --print-failures
diff --git a/tools/ci.sh b/tools/ci.sh
index c986c9fef80ba..23e529e5e1194 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -292,6 +292,13 @@ CI_UNIX_OPTS_SYS_SETTRACE_STACKLESS=(
     CFLAGS_EXTRA="-DMICROPY_STACKLESS=1 -DMICROPY_STACKLESS_STRICT=1 -DMICROPY_PY_SYS_SETTRACE=1"
 )
 
+CI_UNIX_OPTS_QEMU_MIPS=(
+    CROSS_COMPILE=mips-linux-gnu-
+    VARIANT=coverage
+    MICROPY_STANDALONE=1
+    LDFLAGS_EXTRA="-static"
+)
+
 function ci_unix_build_helper {
     make ${MAKEOPTS} -C mpy-cross
     make ${MAKEOPTS} -C ports/unix "$@" submodules
@@ -478,6 +485,26 @@ function ci_unix_macos_run_tests {
     (cd tests && ./run-tests.py --exclude 'uasyncio_(basic|heaplock|lock|wait_task)' --exclude 'import_pkg7.py' --exclude 'urandom_basic.py')
 }
 
+function ci_unix_qemu_mips_setup {
+    sudo apt-get update
+    sudo apt-get install gcc-mips-linux-gnu g++-mips-linux-gnu
+    sudo apt-get install qemu-user
+    qemu-mips --version
+}
+
+function ci_unix_qemu_mips_build {
+    # qemu-mips on GitHub Actions will seg-fault if not linked statically
+    ci_unix_build_helper "${CI_UNIX_OPTS_QEMU_MIPS[@]}"
+}
+
+function ci_unix_qemu_mips_run_tests {
+    # Issues with MIPS tests:
+    # - (i)listdir does not work, it always returns the empty list (it's an issue with the underlying C call)
+    # - ffi tests do not work
+    file ./ports/unix/micropython-coverage
+    (cd tests && MICROPY_MICROPYTHON=../ports/unix/micropython-coverage ./run-tests.py --exclude 'vfs_posix.py' --exclude 'ffi_(callback|float|float2).py')
+}
+
 ########################################################################################
 # ports/windows
 

From 0abf6f830cd390e2e5dbd4a2c68f611f5c9507dc Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 26 May 2021 16:57:39 +1000
Subject: [PATCH 0901/3533] esp8266/boards/GENERIC_512K: Add custom manifest
 without FS modules.

The 512k build does not have a filesystem so there is no reason to include
the filesystem-related modules.  This commit provides a custom manifest.py
for this board which no longer includes: _boot.py, flashbdev.py,
inisetup.py, upip.py, upip_utarfile.py.  This cuts the build down by about
9k of flash.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp8266/boards/GENERIC_512K/manifest.py      | 4 ++++
 ports/esp8266/boards/GENERIC_512K/mpconfigboard.mk | 2 ++
 2 files changed, 6 insertions(+)
 create mode 100644 ports/esp8266/boards/GENERIC_512K/manifest.py

diff --git a/ports/esp8266/boards/GENERIC_512K/manifest.py b/ports/esp8266/boards/GENERIC_512K/manifest.py
new file mode 100644
index 0000000000000..e7ab8ad535b6a
--- /dev/null
+++ b/ports/esp8266/boards/GENERIC_512K/manifest.py
@@ -0,0 +1,4 @@
+freeze("$(PORT_DIR)/modules", ("apa102.py", "neopixel.py", "ntptime.py", "port_diag.py"))
+freeze("$(MPY_DIR)/drivers/dht", "dht.py")
+freeze("$(MPY_DIR)/drivers/onewire")
+include("$(MPY_DIR)/extmod/webrepl/manifest.py")
diff --git a/ports/esp8266/boards/GENERIC_512K/mpconfigboard.mk b/ports/esp8266/boards/GENERIC_512K/mpconfigboard.mk
index a7566f9f19ec9..120351909bc0c 100644
--- a/ports/esp8266/boards/GENERIC_512K/mpconfigboard.mk
+++ b/ports/esp8266/boards/GENERIC_512K/mpconfigboard.mk
@@ -1 +1,3 @@
 LD_FILES = boards/esp8266_512k.ld
+
+FROZEN_MANIFEST ?= $(BOARD_DIR)/manifest.py

From 6a127810c03d7666f1866f5e48df3c102805dbe8 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 25 May 2021 16:48:29 +1000
Subject: [PATCH 0902/3533] extmod/moduhashlib: Put hash obj in final state
 after digest is called.

If digest is called then the hash object is put in a "final" state and
calling update() or digest() again will raise a ValueError (instead of
silently producing the wrong result).

See issue #4119.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/moduhashlib.c               | 33 +++++++++++++++++++++++++++-
 tests/extmod/uhashlib_final.py     | 35 ++++++++++++++++++++++++++++++
 tests/extmod/uhashlib_final.py.exp |  1 +
 3 files changed, 68 insertions(+), 1 deletion(-)
 create mode 100644 tests/extmod/uhashlib_final.py
 create mode 100644 tests/extmod/uhashlib_final.py.exp

diff --git a/extmod/moduhashlib.c b/extmod/moduhashlib.c
index 195a24334b69f..b170de9e58e13 100644
--- a/extmod/moduhashlib.c
+++ b/extmod/moduhashlib.c
@@ -60,9 +60,16 @@
 
 typedef struct _mp_obj_hash_t {
     mp_obj_base_t base;
-    char state[0];
+    bool final; // if set, update and digest raise an exception
+    uintptr_t state[0]; // must be aligned to a machine word
 } mp_obj_hash_t;
 
+static void uhashlib_ensure_not_final(mp_obj_hash_t *self) {
+    if (self->final) {
+        mp_raise_ValueError(MP_ERROR_TEXT("hash is final"));
+    }
+}
+
 #if MICROPY_PY_UHASHLIB_SHA256
 STATIC mp_obj_t uhashlib_sha256_update(mp_obj_t self_in, mp_obj_t arg);
 
@@ -78,6 +85,7 @@ STATIC mp_obj_t uhashlib_sha256_make_new(const mp_obj_type_t *type, size_t n_arg
     mp_arg_check_num(n_args, n_kw, 0, 1, false);
     mp_obj_hash_t *o = m_new_obj_var(mp_obj_hash_t, char, sizeof(mbedtls_sha256_context));
     o->base.type = type;
+    o->final = false;
     mbedtls_sha256_init((mbedtls_sha256_context *)&o->state);
     mbedtls_sha256_starts_ret((mbedtls_sha256_context *)&o->state, 0);
     if (n_args == 1) {
@@ -88,6 +96,7 @@ STATIC mp_obj_t uhashlib_sha256_make_new(const mp_obj_type_t *type, size_t n_arg
 
 STATIC mp_obj_t uhashlib_sha256_update(mp_obj_t self_in, mp_obj_t arg) {
     mp_obj_hash_t *self = MP_OBJ_TO_PTR(self_in);
+    uhashlib_ensure_not_final(self);
     mp_buffer_info_t bufinfo;
     mp_get_buffer_raise(arg, &bufinfo, MP_BUFFER_READ);
     mbedtls_sha256_update_ret((mbedtls_sha256_context *)&self->state, bufinfo.buf, bufinfo.len);
@@ -96,6 +105,8 @@ STATIC mp_obj_t uhashlib_sha256_update(mp_obj_t self_in, mp_obj_t arg) {
 
 STATIC mp_obj_t uhashlib_sha256_digest(mp_obj_t self_in) {
     mp_obj_hash_t *self = MP_OBJ_TO_PTR(self_in);
+    uhashlib_ensure_not_final(self);
+    self->final = true;
     vstr_t vstr;
     vstr_init_len(&vstr, 32);
     mbedtls_sha256_finish_ret((mbedtls_sha256_context *)&self->state, (unsigned char *)vstr.buf);
@@ -110,6 +121,7 @@ STATIC mp_obj_t uhashlib_sha256_make_new(const mp_obj_type_t *type, size_t n_arg
     mp_arg_check_num(n_args, n_kw, 0, 1, false);
     mp_obj_hash_t *o = m_new_obj_var(mp_obj_hash_t, char, sizeof(CRYAL_SHA256_CTX));
     o->base.type = type;
+    o->final = false;
     sha256_init((CRYAL_SHA256_CTX *)o->state);
     if (n_args == 1) {
         uhashlib_sha256_update(MP_OBJ_FROM_PTR(o), args[0]);
@@ -119,6 +131,7 @@ STATIC mp_obj_t uhashlib_sha256_make_new(const mp_obj_type_t *type, size_t n_arg
 
 STATIC mp_obj_t uhashlib_sha256_update(mp_obj_t self_in, mp_obj_t arg) {
     mp_obj_hash_t *self = MP_OBJ_TO_PTR(self_in);
+    uhashlib_ensure_not_final(self);
     mp_buffer_info_t bufinfo;
     mp_get_buffer_raise(arg, &bufinfo, MP_BUFFER_READ);
     sha256_update((CRYAL_SHA256_CTX *)self->state, bufinfo.buf, bufinfo.len);
@@ -127,6 +140,8 @@ STATIC mp_obj_t uhashlib_sha256_update(mp_obj_t self_in, mp_obj_t arg) {
 
 STATIC mp_obj_t uhashlib_sha256_digest(mp_obj_t self_in) {
     mp_obj_hash_t *self = MP_OBJ_TO_PTR(self_in);
+    uhashlib_ensure_not_final(self);
+    self->final = true;
     vstr_t vstr;
     vstr_init_len(&vstr, SHA256_BLOCK_SIZE);
     sha256_final((CRYAL_SHA256_CTX *)self->state, (byte *)vstr.buf);
@@ -160,6 +175,7 @@ STATIC mp_obj_t uhashlib_sha1_make_new(const mp_obj_type_t *type, size_t n_args,
     mp_arg_check_num(n_args, n_kw, 0, 1, false);
     mp_obj_hash_t *o = m_new_obj_var(mp_obj_hash_t, char, sizeof(SHA1_CTX));
     o->base.type = type;
+    o->final = false;
     SHA1_Init((SHA1_CTX *)o->state);
     if (n_args == 1) {
         uhashlib_sha1_update(MP_OBJ_FROM_PTR(o), args[0]);
@@ -169,6 +185,7 @@ STATIC mp_obj_t uhashlib_sha1_make_new(const mp_obj_type_t *type, size_t n_args,
 
 STATIC mp_obj_t uhashlib_sha1_update(mp_obj_t self_in, mp_obj_t arg) {
     mp_obj_hash_t *self = MP_OBJ_TO_PTR(self_in);
+    uhashlib_ensure_not_final(self);
     mp_buffer_info_t bufinfo;
     mp_get_buffer_raise(arg, &bufinfo, MP_BUFFER_READ);
     SHA1_Update((SHA1_CTX *)self->state, bufinfo.buf, bufinfo.len);
@@ -177,6 +194,8 @@ STATIC mp_obj_t uhashlib_sha1_update(mp_obj_t self_in, mp_obj_t arg) {
 
 STATIC mp_obj_t uhashlib_sha1_digest(mp_obj_t self_in) {
     mp_obj_hash_t *self = MP_OBJ_TO_PTR(self_in);
+    uhashlib_ensure_not_final(self);
+    self->final = true;
     vstr_t vstr;
     vstr_init_len(&vstr, SHA1_SIZE);
     SHA1_Final((byte *)vstr.buf, (SHA1_CTX *)self->state);
@@ -196,6 +215,7 @@ STATIC mp_obj_t uhashlib_sha1_make_new(const mp_obj_type_t *type, size_t n_args,
     mp_arg_check_num(n_args, n_kw, 0, 1, false);
     mp_obj_hash_t *o = m_new_obj_var(mp_obj_hash_t, char, sizeof(mbedtls_sha1_context));
     o->base.type = type;
+    o->final = false;
     mbedtls_sha1_init((mbedtls_sha1_context *)o->state);
     mbedtls_sha1_starts_ret((mbedtls_sha1_context *)o->state);
     if (n_args == 1) {
@@ -206,6 +226,7 @@ STATIC mp_obj_t uhashlib_sha1_make_new(const mp_obj_type_t *type, size_t n_args,
 
 STATIC mp_obj_t uhashlib_sha1_update(mp_obj_t self_in, mp_obj_t arg) {
     mp_obj_hash_t *self = MP_OBJ_TO_PTR(self_in);
+    uhashlib_ensure_not_final(self);
     mp_buffer_info_t bufinfo;
     mp_get_buffer_raise(arg, &bufinfo, MP_BUFFER_READ);
     mbedtls_sha1_update_ret((mbedtls_sha1_context *)self->state, bufinfo.buf, bufinfo.len);
@@ -214,6 +235,8 @@ STATIC mp_obj_t uhashlib_sha1_update(mp_obj_t self_in, mp_obj_t arg) {
 
 STATIC mp_obj_t uhashlib_sha1_digest(mp_obj_t self_in) {
     mp_obj_hash_t *self = MP_OBJ_TO_PTR(self_in);
+    uhashlib_ensure_not_final(self);
+    self->final = true;
     vstr_t vstr;
     vstr_init_len(&vstr, 20);
     mbedtls_sha1_finish_ret((mbedtls_sha1_context *)self->state, (byte *)vstr.buf);
@@ -247,6 +270,7 @@ STATIC mp_obj_t uhashlib_md5_make_new(const mp_obj_type_t *type, size_t n_args,
     mp_arg_check_num(n_args, n_kw, 0, 1, false);
     mp_obj_hash_t *o = m_new_obj_var(mp_obj_hash_t, char, sizeof(MD5_CTX));
     o->base.type = type;
+    o->final = false;
     MD5_Init((MD5_CTX *)o->state);
     if (n_args == 1) {
         uhashlib_md5_update(MP_OBJ_FROM_PTR(o), args[0]);
@@ -256,6 +280,7 @@ STATIC mp_obj_t uhashlib_md5_make_new(const mp_obj_type_t *type, size_t n_args,
 
 STATIC mp_obj_t uhashlib_md5_update(mp_obj_t self_in, mp_obj_t arg) {
     mp_obj_hash_t *self = MP_OBJ_TO_PTR(self_in);
+    uhashlib_ensure_not_final(self);
     mp_buffer_info_t bufinfo;
     mp_get_buffer_raise(arg, &bufinfo, MP_BUFFER_READ);
     MD5_Update((MD5_CTX *)self->state, bufinfo.buf, bufinfo.len);
@@ -264,6 +289,8 @@ STATIC mp_obj_t uhashlib_md5_update(mp_obj_t self_in, mp_obj_t arg) {
 
 STATIC mp_obj_t uhashlib_md5_digest(mp_obj_t self_in) {
     mp_obj_hash_t *self = MP_OBJ_TO_PTR(self_in);
+    uhashlib_ensure_not_final(self);
+    self->final = true;
     vstr_t vstr;
     vstr_init_len(&vstr, MD5_SIZE);
     MD5_Final((byte *)vstr.buf, (MD5_CTX *)self->state);
@@ -283,6 +310,7 @@ STATIC mp_obj_t uhashlib_md5_make_new(const mp_obj_type_t *type, size_t n_args,
     mp_arg_check_num(n_args, n_kw, 0, 1, false);
     mp_obj_hash_t *o = m_new_obj_var(mp_obj_hash_t, char, sizeof(mbedtls_md5_context));
     o->base.type = type;
+    o->final = false;
     mbedtls_md5_init((mbedtls_md5_context *)o->state);
     mbedtls_md5_starts_ret((mbedtls_md5_context *)o->state);
     if (n_args == 1) {
@@ -293,6 +321,7 @@ STATIC mp_obj_t uhashlib_md5_make_new(const mp_obj_type_t *type, size_t n_args,
 
 STATIC mp_obj_t uhashlib_md5_update(mp_obj_t self_in, mp_obj_t arg) {
     mp_obj_hash_t *self = MP_OBJ_TO_PTR(self_in);
+    uhashlib_ensure_not_final(self);
     mp_buffer_info_t bufinfo;
     mp_get_buffer_raise(arg, &bufinfo, MP_BUFFER_READ);
     mbedtls_md5_update_ret((mbedtls_md5_context *)self->state, bufinfo.buf, bufinfo.len);
@@ -301,6 +330,8 @@ STATIC mp_obj_t uhashlib_md5_update(mp_obj_t self_in, mp_obj_t arg) {
 
 STATIC mp_obj_t uhashlib_md5_digest(mp_obj_t self_in) {
     mp_obj_hash_t *self = MP_OBJ_TO_PTR(self_in);
+    uhashlib_ensure_not_final(self);
+    self->final = true;
     vstr_t vstr;
     vstr_init_len(&vstr, 16);
     mbedtls_md5_finish_ret((mbedtls_md5_context *)self->state, (byte *)vstr.buf);
diff --git a/tests/extmod/uhashlib_final.py b/tests/extmod/uhashlib_final.py
new file mode 100644
index 0000000000000..f562cc17807ec
--- /dev/null
+++ b/tests/extmod/uhashlib_final.py
@@ -0,0 +1,35 @@
+try:
+    import uhashlib
+except ImportError:
+    print("SKIP")
+    raise SystemExit
+
+
+for algo_name in ("md5", "sha1", "sha256"):
+    algo = getattr(uhashlib, algo_name, None)
+    if not algo:
+        continue
+
+    # Running .digest() several times in row is not supported.
+    h = algo(b"123")
+    h.digest()
+    try:
+        h.digest()
+        print("fail")
+    except ValueError:
+        # Expected path, don't print anything so test output is the
+        # same even if the algorithm is not implemented on the port.
+        pass
+
+    # Partial digests are not supported.
+    h = algo(b"123")
+    h.digest()
+    try:
+        h.update(b"456")
+        print("fail")
+    except ValueError:
+        # Expected path, don't print anything so test output is the
+        # same even if the algorithm is not implemented on the port.
+        pass
+
+print("done")
diff --git a/tests/extmod/uhashlib_final.py.exp b/tests/extmod/uhashlib_final.py.exp
new file mode 100644
index 0000000000000..19f86f493ab11
--- /dev/null
+++ b/tests/extmod/uhashlib_final.py.exp
@@ -0,0 +1 @@
+done

From 62f75376dd6932a694569e2b7a8701b3a6b13a77 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 26 May 2021 22:37:27 +1000
Subject: [PATCH 0903/3533] stm32/boards/NUCLEO_L432KC: Fix FS size and enable
 LFS1 filesystem.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/boards/NUCLEO_L432KC/mpconfigboard.h  | 2 +-
 ports/stm32/boards/NUCLEO_L432KC/mpconfigboard.mk | 1 +
 ports/stm32/boards/stm32l432.ld                   | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/ports/stm32/boards/NUCLEO_L432KC/mpconfigboard.h b/ports/stm32/boards/NUCLEO_L432KC/mpconfigboard.h
index 0a3ac1f185a70..0f1134491f979 100644
--- a/ports/stm32/boards/NUCLEO_L432KC/mpconfigboard.h
+++ b/ports/stm32/boards/NUCLEO_L432KC/mpconfigboard.h
@@ -13,13 +13,13 @@
 #define MICROPY_PY_UHEAPQ           (0)
 #define MICROPY_PY_UTIMEQ           (0)
 
-#define MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE (0)
 #define MICROPY_HW_ENABLE_RTC       (1)
 #define MICROPY_HW_ENABLE_ADC       (1)
 #define MICROPY_HW_ENABLE_DAC       (1)
 #define MICROPY_HW_ENABLE_USB       (0) // requires a custom USB connector on PA11/PA12
 #define MICROPY_HW_ENABLE_TIMER     (1)
 #define MICROPY_HW_HAS_SWITCH       (0)
+#define MICROPY_HW_HAS_FLASH        (1)
 
 // MSI is used and is 4MHz
 #define MICROPY_HW_CLK_PLLM (1)
diff --git a/ports/stm32/boards/NUCLEO_L432KC/mpconfigboard.mk b/ports/stm32/boards/NUCLEO_L432KC/mpconfigboard.mk
index 6e220a4370db3..a87b4710e74ac 100644
--- a/ports/stm32/boards/NUCLEO_L432KC/mpconfigboard.mk
+++ b/ports/stm32/boards/NUCLEO_L432KC/mpconfigboard.mk
@@ -6,6 +6,7 @@ OPENOCD_CONFIG = boards/openocd_stm32l4.cfg
 
 # MicroPython settings
 MICROPY_VFS_FAT = 0
+MICROPY_VFS_LFS1 ?= 1
 
 # Don't include default frozen modules because MCU is tight on flash space
 FROZEN_MANIFEST ?=
diff --git a/ports/stm32/boards/stm32l432.ld b/ports/stm32/boards/stm32l432.ld
index 4699543d66912..469e834f91c1f 100644
--- a/ports/stm32/boards/stm32l432.ld
+++ b/ports/stm32/boards/stm32l432.ld
@@ -6,7 +6,7 @@
 MEMORY
 {
     FLASH (rx)      : ORIGIN = 0x08000000, LENGTH = 230K /* sectors 0-114 */
-    FLASH_FS (r)    : ORIGIN = 0x08060000, LENGTH = 26K /* sectors 115-127 */
+    FLASH_FS (r)    : ORIGIN = 0x08039800, LENGTH = 26K /* sectors 115-127 */
     RAM (xrw)       : ORIGIN = 0x20000000, LENGTH = 64K /* SRAM1, 48K + SRAM2, 16K */
 }
 

From 211c3e41f12295f08a883ac326386ecb5bc8d68e Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 27 May 2021 23:57:51 +1000
Subject: [PATCH 0904/3533] stm32/boards/PYBD_SF2: Disable GCC 11 warnings for
 array bounds.

With GCC 11 there is now a warning about array bounds of OTP-mac, due to
the OTP being a literal address.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/boards/PYBD_SF2/board_init.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/ports/stm32/boards/PYBD_SF2/board_init.c b/ports/stm32/boards/PYBD_SF2/board_init.c
index d1a0a09e7a477..c3b54fa2f101a 100644
--- a/ports/stm32/boards/PYBD_SF2/board_init.c
+++ b/ports/stm32/boards/PYBD_SF2/board_init.c
@@ -64,7 +64,15 @@ void board_sleep(int value) {
 void mp_hal_get_mac(int idx, uint8_t buf[6]) {
     // Check if OTP region has a valid MAC address, and use it if it does
     if (OTP->series == 0x00d1 && OTP->mac[0] == 'H' && OTP->mac[1] == 'J' && OTP->mac[2] == '0') {
+        #if __GNUC__ >= 11
+        #pragma GCC diagnostic push
+        #pragma GCC diagnostic ignored "-Warray-bounds"
+        #pragma GCC diagnostic ignored "-Wstringop-overread"
+        #endif
         memcpy(buf, OTP->mac, 6);
+        #if __GNUC__ >= 11
+        #pragma GCC diagnostic pop
+        #endif
         buf[5] += idx;
         return;
     }

From db8704ecbd910e598fba4bc1817acf91d9da79e3 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 28 May 2021 00:09:34 +1000
Subject: [PATCH 0905/3533] esp8266,esp32: Update manifest to point to new dirs
 in micropython-lib.

Following a refactoring of micropython-lib.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/boards/manifest_release.py   |  9 +++++----
 ports/esp8266/boards/GENERIC/manifest.py | 10 +++++-----
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/ports/esp32/boards/manifest_release.py b/ports/esp32/boards/manifest_release.py
index b5c7cd111b109..8b9bcde6ffa77 100644
--- a/ports/esp32/boards/manifest_release.py
+++ b/ports/esp32/boards/manifest_release.py
@@ -1,6 +1,7 @@
 include("manifest.py")
 
-freeze("$(MPY_LIB_DIR)/upysh", "upysh.py")
-freeze("$(MPY_LIB_DIR)/urequests", "urequests.py")
-freeze("$(MPY_LIB_DIR)/umqtt.simple", "umqtt/simple.py")
-freeze("$(MPY_LIB_DIR)/umqtt.robust", "umqtt/robust.py")
+freeze("$(MPY_LIB_DIR)/python-ecosys/urequests", "urequests.py")
+
+freeze("$(MPY_LIB_DIR)/micropython/upysh", "upysh.py")
+freeze("$(MPY_LIB_DIR)/micropython/umqtt.simple", "umqtt/simple.py")
+freeze("$(MPY_LIB_DIR)/micropython/umqtt.robust", "umqtt/robust.py")
diff --git a/ports/esp8266/boards/GENERIC/manifest.py b/ports/esp8266/boards/GENERIC/manifest.py
index 46f3b837be07f..9ce3ffe3aae15 100644
--- a/ports/esp8266/boards/GENERIC/manifest.py
+++ b/ports/esp8266/boards/GENERIC/manifest.py
@@ -10,12 +10,12 @@
 # Libraries from micropython-lib, include only if the library directory exists
 if os.path.isdir(convert_path("$(MPY_LIB_DIR)")):
     # file utilities
-    freeze("$(MPY_LIB_DIR)/upysh", "upysh.py")
+    freeze("$(MPY_LIB_DIR)/micropython/upysh", "upysh.py")
 
     # requests
-    freeze("$(MPY_LIB_DIR)/urequests", "urequests.py")
-    freeze("$(MPY_LIB_DIR)/urllib.urequest", "urllib/urequest.py")
+    freeze("$(MPY_LIB_DIR)/python-ecosys/urequests", "urequests.py")
+    freeze("$(MPY_LIB_DIR)/micropython/urllib.urequest", "urllib/urequest.py")
 
     # umqtt
-    freeze("$(MPY_LIB_DIR)/umqtt.simple", "umqtt/simple.py")
-    freeze("$(MPY_LIB_DIR)/umqtt.robust", "umqtt/robust.py")
+    freeze("$(MPY_LIB_DIR)/micropython/umqtt.simple", "umqtt/simple.py")
+    freeze("$(MPY_LIB_DIR)/micropython/umqtt.robust", "umqtt/robust.py")

From 4982d0920ebd247758aa6321bb36a5eede0bd775 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sat, 29 May 2021 11:04:01 +1000
Subject: [PATCH 0906/3533] tools/pyboard.py: Track raw REPL state via
 in_raw_repl variable.

Signed-off-by: Damien George <damien@micropython.org>
---
 tools/pyboard.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tools/pyboard.py b/tools/pyboard.py
index 29a15f7eae25d..220c010937d73 100755
--- a/tools/pyboard.py
+++ b/tools/pyboard.py
@@ -255,6 +255,7 @@ class Pyboard:
     def __init__(
         self, device, baudrate=115200, user="micro", password="python", wait=0, exclusive=True
     ):
+        self.in_raw_repl = False
         self.use_raw_paste = True
         if device.startswith("exec:"):
             self.serial = ProcessToSerial(device[len("exec:") :])
@@ -348,8 +349,11 @@ def enter_raw_repl(self):
             print(data)
             raise PyboardError("could not enter raw repl")
 
+        self.in_raw_repl = True
+
     def exit_raw_repl(self):
         self.serial.write(b"\r\x02")  # ctrl-B: enter friendly REPL
+        self.in_raw_repl = False
 
     def follow(self, timeout, data_consumer=None):
         # wait for normal output

From e4ba57c5cd6f68306726891c45f36b5129b633ec Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sat, 29 May 2021 11:21:19 +1000
Subject: [PATCH 0907/3533] tools/pyboard.py: Add "soft_reset" option to
 Pyboard.enter_raw_repl().

Signed-off-by: Damien George <damien@micropython.org>
---
 tools/pyboard.py | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/tools/pyboard.py b/tools/pyboard.py
index 220c010937d73..7d06aa847d7af 100755
--- a/tools/pyboard.py
+++ b/tools/pyboard.py
@@ -322,7 +322,7 @@ def read_until(self, min_num_bytes, ending, timeout=10, data_consumer=None):
                 time.sleep(0.01)
         return data
 
-    def enter_raw_repl(self):
+    def enter_raw_repl(self, soft_reset=True):
         self.serial.write(b"\r\x03\x03")  # ctrl-C twice: interrupt any running program
 
         # flush input (without relying on serial.flushInput())
@@ -332,18 +332,23 @@ def enter_raw_repl(self):
             n = self.serial.inWaiting()
 
         self.serial.write(b"\r\x01")  # ctrl-A: enter raw REPL
-        data = self.read_until(1, b"raw REPL; CTRL-B to exit\r\n>")
-        if not data.endswith(b"raw REPL; CTRL-B to exit\r\n>"):
-            print(data)
-            raise PyboardError("could not enter raw repl")
 
-        self.serial.write(b"\x04")  # ctrl-D: soft reset
-        data = self.read_until(1, b"soft reboot\r\n")
-        if not data.endswith(b"soft reboot\r\n"):
-            print(data)
-            raise PyboardError("could not enter raw repl")
-        # By splitting this into 2 reads, it allows boot.py to print stuff,
-        # which will show up after the soft reboot and before the raw REPL.
+        if soft_reset:
+            data = self.read_until(1, b"raw REPL; CTRL-B to exit\r\n>")
+            if not data.endswith(b"raw REPL; CTRL-B to exit\r\n>"):
+                print(data)
+                raise PyboardError("could not enter raw repl")
+
+            self.serial.write(b"\x04")  # ctrl-D: soft reset
+
+            # Waiting for "soft reboot" independently to "raw REPL" (done below)
+            # allows boot.py to print, which will show up after "soft reboot"
+            # and before "raw REPL".
+            data = self.read_until(1, b"soft reboot\r\n")
+            if not data.endswith(b"soft reboot\r\n"):
+                print(data)
+                raise PyboardError("could not enter raw repl")
+
         data = self.read_until(1, b"raw REPL; CTRL-B to exit\r\n")
         if not data.endswith(b"raw REPL; CTRL-B to exit\r\n"):
             print(data)

From a60ad3364132b9c4a30b20cd91fd5cd1ac965618 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sat, 29 May 2021 17:12:54 +1000
Subject: [PATCH 0908/3533] tools/mpremote: Add new CLI utility to interact
 with remote device.

This has been under development since April 2017.  See #3034 and #6375.

Signed-off-by: Damien George <damien@micropython.org>
---
 tools/mpremote/LICENSE                     |  21 +
 tools/mpremote/README.md                   |  71 +++
 tools/mpremote/mpremote.py                 |   6 +
 tools/mpremote/mpremote/__init__.py        |   1 +
 tools/mpremote/mpremote/console.py         | 162 ++++++
 tools/mpremote/mpremote/main.py            | 477 ++++++++++++++++
 tools/mpremote/mpremote/pyboardextended.py | 621 +++++++++++++++++++++
 tools/mpremote/pyproject.toml              |   6 +
 tools/mpremote/setup.cfg                   |  25 +
 9 files changed, 1390 insertions(+)
 create mode 100644 tools/mpremote/LICENSE
 create mode 100644 tools/mpremote/README.md
 create mode 100755 tools/mpremote/mpremote.py
 create mode 100644 tools/mpremote/mpremote/__init__.py
 create mode 100644 tools/mpremote/mpremote/console.py
 create mode 100644 tools/mpremote/mpremote/main.py
 create mode 100644 tools/mpremote/mpremote/pyboardextended.py
 create mode 100644 tools/mpremote/pyproject.toml
 create mode 100644 tools/mpremote/setup.cfg

diff --git a/tools/mpremote/LICENSE b/tools/mpremote/LICENSE
new file mode 100644
index 0000000000000..5ec904cca10b1
--- /dev/null
+++ b/tools/mpremote/LICENSE
@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2021 Damien P. George
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/tools/mpremote/README.md b/tools/mpremote/README.md
new file mode 100644
index 0000000000000..a6aaa1755df5e
--- /dev/null
+++ b/tools/mpremote/README.md
@@ -0,0 +1,71 @@
+# mpremote -- MicroPython remote control
+
+This CLI tool provides an integrated set of utilities to remotely interact with
+and automate a MicroPython device over a serial connection.
+
+The simplest way to use this tool is:
+
+    mpremote
+
+This will automatically connect to the device and provide an interactive REPL.
+
+The full list of supported commands are:
+
+    mpremote connect <device>        -- connect to given device
+                                        device may be: list, auto, id:x, port:x
+                                        or any valid device name/path
+    mpremote disconnect              -- disconnect current device
+    mpremote mount <local-dir>       -- mount local directory on device
+    mpremote eval <string>           -- evaluate and print the string
+    mpremote exec <string>           -- execute the string
+    mpremote run <file>              -- run the given local script
+    mpremote fs <command> <args...>  -- execute filesystem commands on the device
+                                        command may be: cat, ls, cp, rm, mkdir, rmdir
+                                        use ":" as a prefix to specify a file on the device
+    mpremote repl                    -- enter REPL
+                                        options:
+                                            --capture <file>
+                                            --inject-code <string>
+                                            --inject-file <file>
+
+Multiple commands can be specified and they will be run sequentially.  Connection
+and disconnection will be done automatically at the start and end of the execution
+of the tool, if such commands are not explicitly given.  Automatic connection will
+search for the first available serial device.  If no action is specified then the
+REPL will be entered.
+
+Shortcuts can be defined using the macro system.  Built-in shortcuts are:
+
+- a0, a1, a2, a3: connect to `/dev/ttyACM?`
+- u0, u1, u2, u3: connect to `/dev/ttyUSB?`
+- c0, c1, c2, c3: connect to `COM?`
+- cat, ls, cp, rm, mkdir, rmdir, df: filesystem commands
+- reset: reset the device
+- bootloader: make the device enter its bootloader
+
+Any user configuration, including user-defined shortcuts, can be placed in
+.config/mpremote/config.py.  For example:
+
+    # Custom macro commands
+    commands = {
+        "c33": "connect id:334D335C3138",
+        "bl": "bootloader",
+        "double x=4": "eval x*2",
+    }
+
+Examples:
+
+    mpremote
+    mpremote a1
+    mpremote connect /dev/ttyUSB0 repl
+    mpremote ls
+    mpremote a1 ls
+    mpremote exec "import micropython; micropython.mem_info()"
+    mpremote eval 1/2 eval 3/4
+    mpremote mount .
+    mpremote mount . exec "import local_script"
+    mpremote ls
+    mpremote cat boot.py
+    mpremote cp :main.py .
+    mpremote cp main.py :
+    mpremote cp -r dir/ :
diff --git a/tools/mpremote/mpremote.py b/tools/mpremote/mpremote.py
new file mode 100755
index 0000000000000..a91ff67b15da6
--- /dev/null
+++ b/tools/mpremote/mpremote.py
@@ -0,0 +1,6 @@
+#!/usr/bin/env python3
+
+import sys
+from mpremote import main
+
+sys.exit(main.main())
diff --git a/tools/mpremote/mpremote/__init__.py b/tools/mpremote/mpremote/__init__.py
new file mode 100644
index 0000000000000..1bb8bf6d7fd4c
--- /dev/null
+++ b/tools/mpremote/mpremote/__init__.py
@@ -0,0 +1 @@
+# empty
diff --git a/tools/mpremote/mpremote/console.py b/tools/mpremote/mpremote/console.py
new file mode 100644
index 0000000000000..646bbfa22e88e
--- /dev/null
+++ b/tools/mpremote/mpremote/console.py
@@ -0,0 +1,162 @@
+import sys
+
+try:
+    import select, termios
+except ImportError:
+    termios = None
+    select = None
+    import msvcrt
+
+
+class ConsolePosix:
+    def __init__(self):
+        self.infd = sys.stdin.fileno()
+        self.infile = sys.stdin.buffer.raw
+        self.outfile = sys.stdout.buffer.raw
+        self.orig_attr = termios.tcgetattr(self.infd)
+
+    def enter(self):
+        # attr is: [iflag, oflag, cflag, lflag, ispeed, ospeed, cc]
+        attr = termios.tcgetattr(self.infd)
+        attr[0] &= ~(
+            termios.BRKINT | termios.ICRNL | termios.INPCK | termios.ISTRIP | termios.IXON
+        )
+        attr[1] = 0
+        attr[2] = attr[2] & ~(termios.CSIZE | termios.PARENB) | termios.CS8
+        attr[3] = 0
+        attr[6][termios.VMIN] = 1
+        attr[6][termios.VTIME] = 0
+        termios.tcsetattr(self.infd, termios.TCSANOW, attr)
+
+    def exit(self):
+        termios.tcsetattr(self.infd, termios.TCSANOW, self.orig_attr)
+
+    def waitchar(self):
+        # TODO pyb.serial might not have fd
+        select.select([console_in.infd, pyb.serial.fd], [], [])
+
+    def readchar(self):
+        res = select.select([self.infd], [], [], 0)
+        if res[0]:
+            return self.infile.read(1)
+        else:
+            return None
+
+    def write(self, buf):
+        self.outfile.write(buf)
+
+
+class ConsoleWindows:
+    KEY_MAP = {
+        b"H": b"A",  # UP
+        b"P": b"B",  # DOWN
+        b"M": b"C",  # RIGHT
+        b"K": b"D",  # LEFT
+        b"G": b"H",  # POS1
+        b"O": b"F",  # END
+        b"Q": b"6~",  # PGDN
+        b"I": b"5~",  # PGUP
+        b"s": b"1;5D",  # CTRL-LEFT,
+        b"t": b"1;5C",  # CTRL-RIGHT,
+        b"\x8d": b"1;5A",  #  CTRL-UP,
+        b"\x91": b"1;5B",  # CTRL-DOWN,
+        b"w": b"1;5H",  # CTRL-POS1
+        b"u": b"1;5F",  # CTRL-END
+        b"\x98": b"1;3A",  #  ALT-UP,
+        b"\xa0": b"1;3B",  # ALT-DOWN,
+        b"\x9d": b"1;3C",  #  ALT-RIGHT,
+        b"\x9b": b"1;3D",  # ALT-LEFT,
+        b"\x97": b"1;3H",  #  ALT-POS1,
+        b"\x9f": b"1;3F",  # ALT-END,
+        b"S": b"3~",  # DEL,
+        b"\x93": b"3;5~",  # CTRL-DEL
+        b"R": b"2~",  # INS
+        b"\x92": b"2;5~",  # CTRL-INS
+        b"\x94": b"Z",  # Ctrl-Tab = BACKTAB,
+    }
+
+    def enter(self):
+        pass
+
+    def exit(self):
+        pass
+
+    def inWaiting(self):
+        return 1 if msvcrt.kbhit() else 0
+
+    def waitchar(self):
+        while not (self.inWaiting() or pyb.serial.inWaiting()):
+            time.sleep(0.01)
+
+    def readchar(self):
+        if msvcrt.kbhit():
+            ch = msvcrt.getch()
+            while ch in b"\x00\xe0":  # arrow or function key prefix?
+                if not msvcrt.kbhit():
+                    return None
+                ch = msvcrt.getch()  # second call returns the actual key code
+                try:
+                    ch = b"\x1b[" + self.KEY_MAP[ch]
+                except KeyError:
+                    return None
+            return ch
+
+    def write(self, buf):
+        buf = buf.decode() if isinstance(buf, bytes) else buf
+        sys.stdout.write(buf)
+        sys.stdout.flush()
+        # for b in buf:
+        #     if isinstance(b, bytes):
+        #         msvcrt.putch(b)
+        #     else:
+        #         msvcrt.putwch(b)
+
+
+if termios:
+    Console = ConsolePosix
+    VT_ENABLED = True
+else:
+    Console = ConsoleWindows
+
+    # Windows VT mode ( >= win10 only)
+    # https://bugs.python.org/msg291732
+    import ctypes
+    from ctypes import wintypes
+
+    kernel32 = ctypes.WinDLL("kernel32", use_last_error=True)
+
+    ERROR_INVALID_PARAMETER = 0x0057
+    ENABLE_VIRTUAL_TERMINAL_PROCESSING = 0x0004
+
+    def _check_bool(result, func, args):
+        if not result:
+            raise ctypes.WinError(ctypes.get_last_error())
+        return args
+
+    LPDWORD = ctypes.POINTER(wintypes.DWORD)
+    kernel32.GetConsoleMode.errcheck = _check_bool
+    kernel32.GetConsoleMode.argtypes = (wintypes.HANDLE, LPDWORD)
+    kernel32.SetConsoleMode.errcheck = _check_bool
+    kernel32.SetConsoleMode.argtypes = (wintypes.HANDLE, wintypes.DWORD)
+
+    def set_conout_mode(new_mode, mask=0xFFFFFFFF):
+        # don't assume StandardOutput is a console.
+        # open CONOUT$ instead
+        fdout = os.open("CONOUT$", os.O_RDWR)
+        try:
+            hout = msvcrt.get_osfhandle(fdout)
+            old_mode = wintypes.DWORD()
+            kernel32.GetConsoleMode(hout, ctypes.byref(old_mode))
+            mode = (new_mode & mask) | (old_mode.value & ~mask)
+            kernel32.SetConsoleMode(hout, mode)
+            return old_mode.value
+        finally:
+            os.close(fdout)
+
+    # def enable_vt_mode():
+    mode = mask = ENABLE_VIRTUAL_TERMINAL_PROCESSING
+    try:
+        set_conout_mode(mode, mask)
+        VT_ENABLED = True
+    except WindowsError as e:
+        VT_ENABLED = False
diff --git a/tools/mpremote/mpremote/main.py b/tools/mpremote/mpremote/main.py
new file mode 100644
index 0000000000000..1ce00305eb525
--- /dev/null
+++ b/tools/mpremote/mpremote/main.py
@@ -0,0 +1,477 @@
+"""
+MicroPython Remote - Interaction and automation tool for MicroPython
+MIT license; Copyright (c) 2019-2021 Damien P. George
+
+This program provides a set of utilities to interact with and automate a
+MicroPython device over a serial connection.  Commands supported are:
+
+    mpremote                         -- auto-detect, connect and enter REPL
+    mpremote <device-shortcut>       -- connect to given device
+    mpremote connect <device>        -- connect to given device
+    mpremote disconnect              -- disconnect current device
+    mpremote mount <local-dir>       -- mount local directory on device
+    mpremote eval <string>           -- evaluate and print the string
+    mpremote exec <string>           -- execute the string
+    mpremote run <script>            -- run the given local script
+    mpremote fs <command> <args...>  -- execute filesystem commands on the device
+    mpremote repl                    -- enter REPL
+"""
+
+import os, select, sys, time
+import serial.tools.list_ports
+
+from . import pyboardextended as pyboard
+from .console import Console, ConsolePosix
+
+_PROG = "mpremote"
+
+_AUTO_CONNECT_SEARCH_LIST = [
+    "/dev/ttyACM0",
+    "/dev/ttyACM1",
+    "/dev/ttyACM2",
+    "/dev/ttyACM3",
+    "/dev/ttyUSB0",
+    "/dev/ttyUSB1",
+    "/dev/ttyUSB2",
+    "/dev/ttyUSB3",
+    "COM0",
+    "COM1",
+    "COM2",
+    "COM3",
+]
+
+_BUILTIN_COMMAND_EXPANSIONS = {
+    # Device connection shortcuts.
+    "a0": "connect /dev/ttyACM0",
+    "a1": "connect /dev/ttyACM1",
+    "a2": "connect /dev/ttyACM2",
+    "a3": "connect /dev/ttyACM3",
+    "u0": "connect /dev/ttyUSB0",
+    "u1": "connect /dev/ttyUSB1",
+    "u2": "connect /dev/ttyUSB2",
+    "u3": "connect /dev/ttyUSB3",
+    "c0": "connect COM0",
+    "c1": "connect COM1",
+    "c2": "connect COM2",
+    "c3": "connect COM3",
+    # Filesystem shortcuts.
+    "cat": "fs cat",
+    "ls": "fs ls",
+    "cp": "fs cp",
+    "rm": "fs rm",
+    "mkdir": "fs mkdir",
+    "rmdir": "fs rmdir",
+    "df": [
+        "exec",
+        "import uos\nprint('mount \\tsize \\tused \\tavail \\tuse%')\nfor _m in [''] + uos.listdir('/'):\n _s = uos.stat('/' + _m)\n if not _s[0] & 1 << 14: continue\n _s = uos.statvfs(_m)\n if _s[0]:\n  _size = _s[0] * _s[2]; _free = _s[0] * _s[3]; print(_m, _size, _size - _free, _free, int(100 * (_size - _free) / _size), sep='\\t')",
+    ],
+    # Other shortcuts.
+    "reset t_ms=100": [
+        "exec",
+        "--no-follow",
+        "import utime, umachine; utime.sleep_ms(t_ms); umachine.reset()",
+    ],
+    "bootloader t_ms=100": [
+        "exec",
+        "--no-follow",
+        "import utime, umachine; utime.sleep_ms(t_ms); umachine.bootloader()",
+    ],
+    "setrtc": [
+        "exec",
+        "import machine; machine.RTC().datetime((2020, 1, 1, 0, 10, 0, 0, 0))",
+    ],
+}
+
+
+def load_user_config():
+    # Create empty config object.
+    config = __build_class__(lambda: None, "Config")()
+    config.commands = {}
+
+    # Get config file name.
+    path = os.getenv("XDG_CONFIG_HOME")
+    if path is None:
+        path = os.getenv("HOME")
+        if path is None:
+            return config
+        path = os.path.join(path, ".config")
+    path = os.path.join(path, _PROG)
+    config_file = os.path.join(path, "config.py")
+
+    # Check if config file exists.
+    if not os.path.exists(config_file):
+        return config
+
+    # Exec the config file in its directory.
+    with open(config_file) as f:
+        config_data = f.read()
+    prev_cwd = os.getcwd()
+    os.chdir(path)
+    exec(config_data, config.__dict__)
+    os.chdir(prev_cwd)
+
+    return config
+
+
+def prepare_command_expansions(config):
+    global _command_expansions
+
+    _command_expansions = {}
+
+    for command_set in (_BUILTIN_COMMAND_EXPANSIONS, config.commands):
+        for cmd, sub in command_set.items():
+            cmd = cmd.split()
+            if len(cmd) == 1:
+                args = ()
+            else:
+                args = tuple(c.split("=") for c in cmd[1:])
+            if isinstance(sub, str):
+                sub = sub.split()
+            _command_expansions[cmd[0]] = (args, sub)
+
+
+def do_command_expansion(args):
+    def usage_error(cmd, exp_args, msg):
+        print(f"Command {cmd} {msg}; signature is:")
+        print("   ", cmd, " ".join("=".join(a) for a in exp_args))
+        sys.exit(1)
+
+    last_arg_idx = len(args)
+    pre = []
+    while args and args[0] in _command_expansions:
+        cmd = args.pop(0)
+        exp_args, exp_sub = _command_expansions[cmd]
+        for exp_arg in exp_args:
+            exp_arg_name = exp_arg[0]
+            if args and "=" not in args[0]:
+                # Argument given without a name.
+                value = args.pop(0)
+            elif args and args[0].startswith(exp_arg_name + "="):
+                # Argument given with correct name.
+                value = args.pop(0).split("=", 1)[1]
+            else:
+                # No argument given, or argument given with a different name.
+                if len(exp_arg) == 1:
+                    # Required argument (it has no default).
+                    usage_error(cmd, exp_args, f"missing argument {exp_arg_name}")
+                else:
+                    # Optional argument with a default.
+                    value = exp_arg[1]
+            pre.append(f"{exp_arg_name}={value}")
+
+        args[0:0] = exp_sub
+        last_arg_idx = len(exp_sub)
+
+    if last_arg_idx < len(args) and "=" in args[last_arg_idx]:
+        # Extra unknown arguments given.
+        arg = args[last_arg_idx].split("=", 1)[0]
+        usage_error(cmd, exp_args, f"given unexpected argument {arg}")
+        sys.exit(1)
+
+    # Insert expansion with optional setting of arguments.
+    if pre:
+        args[0:0] = ["exec", ";".join(pre)]
+
+
+def do_connect(args):
+    dev = args.pop(0)
+    try:
+        if dev == "list":
+            # List attached devices.
+            for p in sorted(serial.tools.list_ports.comports()):
+                print(
+                    "{} {} {:04x}:{:04x} {} {}".format(
+                        p.device, p.serial_number, p.pid, p.vid, p.manufacturer, p.product
+                    )
+                )
+            return None
+        elif dev == "auto":
+            # Auto-detect and auto-connect to the first available device.
+            ports = serial.tools.list_ports.comports()
+            for dev in _AUTO_CONNECT_SEARCH_LIST:
+                if any(p.device == dev for p in ports):
+                    try:
+                        return pyboard.PyboardExtended(dev, baudrate=115200)
+                    except pyboard.PyboardError as er:
+                        if not er.args[0].startswith("failed to access"):
+                            raise er
+            raise pyboard.PyboardError("no device found")
+        elif dev.startswith("id:"):
+            # Search for a device with the given serial number.
+            serial_number = dev[len("id:") :]
+            dev = None
+            for p in serial.tools.list_ports.comports():
+                if p.serial_number == serial_number:
+                    return pyboard.PyboardExtended(p.device, baudrate=115200)
+            raise pyboard.PyboardError("no device with serial number {}".format(serial_number))
+        else:
+            # Connect to the given device.
+            if dev.startswith("port:"):
+                dev = dev[len("port:") :]
+            return pyboard.PyboardExtended(dev, baudrate=115200)
+    except pyboard.PyboardError as er:
+        msg = er.args[0]
+        if msg.startswith("failed to access"):
+            msg += " (it may be in use by another program)"
+        print(msg)
+        sys.exit(1)
+
+
+def do_disconnect(pyb):
+    try:
+        if pyb.mounted:
+            if not pyb.in_raw_repl:
+                pyb.enter_raw_repl(soft_reset=False)
+            pyb.umount_local()
+        if pyb.in_raw_repl:
+            pyb.exit_raw_repl()
+    except OSError:
+        # Ignore any OSError exceptions when shutting down, eg:
+        # - pyboard.filesystem_command will close the connecton if it had an error
+        # - umounting will fail if serial port disappeared
+        pass
+    pyb.close()
+
+
+def do_filesystem(pyb, args):
+    def _list_recursive(files, path):
+        if os.path.isdir(path):
+            for entry in os.listdir(path):
+                _list_recursive(files, os.path.join(path, entry))
+        else:
+            files.append(os.path.split(path))
+
+    if args[0] == "cp" and args[1] == "-r":
+        args.pop(0)
+        args.pop(0)
+        assert args[-1] == ":"
+        args.pop()
+        src_files = []
+        for path in args:
+            _list_recursive(src_files, path)
+        known_dirs = {""}
+        pyb.exec_("import uos")
+        for dir, file in src_files:
+            dir_parts = dir.split("/")
+            for i in range(len(dir_parts)):
+                d = "/".join(dir_parts[: i + 1])
+                if d not in known_dirs:
+                    pyb.exec_("try:\n uos.mkdir('%s')\nexcept OSError as e:\n print(e)" % d)
+                    known_dirs.add(d)
+            pyboard.filesystem_command(pyb, ["cp", os.path.join(dir, file), ":" + dir + "/"])
+    else:
+        pyboard.filesystem_command(pyb, args)
+    args.clear()
+
+
+def do_repl_main_loop(pyb, console_in, console_out_write, *, code_to_inject, file_to_inject):
+    while True:
+        if isinstance(console_in, ConsolePosix):
+            # TODO pyb.serial might not have fd
+            select.select([console_in.infd, pyb.serial.fd], [], [])
+        else:
+            while not (console_in.inWaiting() or pyb.serial.inWaiting()):
+                time.sleep(0.01)
+        c = console_in.readchar()
+        if c:
+            if c == b"\x1d":  # ctrl-], quit
+                break
+            elif c == b"\x04":  # ctrl-D
+                # do a soft reset and reload the filesystem hook
+                pyb.soft_reset_with_mount(console_out_write)
+            elif c == b"\x0a" and code_to_inject is not None:  # ctrl-j, inject code
+                pyb.serial.write(code_to_inject)
+            elif c == b"\x0b" and file_to_inject is not None:  # ctrl-k, inject script
+                console_out_write(bytes("Injecting %s\r\n" % file_to_inject, "utf8"))
+                pyb.enter_raw_repl(soft_reset=False)
+                with open(file_to_inject, "rb") as f:
+                    pyfile = f.read()
+                try:
+                    pyb.exec_raw_no_follow(pyfile)
+                except pyboard.PyboardError as er:
+                    console_out_write(b"Error:\r\n")
+                    console_out_write(er)
+                pyb.exit_raw_repl()
+            else:
+                pyb.serial.write(c)
+
+        try:
+            n = pyb.serial.inWaiting()
+        except OSError as er:
+            if er.args[0] == 5:  # IO error, device disappeared
+                print("device disconnected")
+                break
+
+        if n > 0:
+            c = pyb.serial.read(1)
+            if c is not None:
+                # pass character through to the console
+                oc = ord(c)
+                if oc in (8, 9, 10, 13, 27) or 32 <= oc <= 126:
+                    console_out_write(c)
+                else:
+                    console_out_write(b"[%02x]" % ord(c))
+
+
+def do_repl(pyb, args):
+    capture_file = None
+    code_to_inject = None
+    file_to_inject = None
+
+    while len(args):
+        if args[0] == "--capture":
+            args.pop(0)
+            capture_file = args.pop(0)
+        elif args[0] == "--inject-code":
+            args.pop(0)
+            code_to_inject = bytes(args.pop(0).replace("\\n", "\r\n"), "utf8")
+        elif args[0] == "--inject-file":
+            args.pop(0)
+            file_to_inject = args.pop(0)
+        else:
+            break
+
+    print("Connected to MicroPython at %s" % pyb.device_name)
+    print("Use Ctrl-] to exit this shell")
+    if capture_file is not None:
+        print('Capturing session to file "%s"' % capture_file)
+        capture_file = open(capture_file, "wb")
+    if code_to_inject is not None:
+        print("Use Ctrl-J to inject", code_to_inject)
+    if file_to_inject is not None:
+        print('Use Ctrl-K to inject file "%s"' % file_to_inject)
+
+    console = Console()
+    console.enter()
+
+    def console_out_write(b):
+        console.write(b)
+        if capture_file is not None:
+            capture_file.write(b)
+            capture_file.flush()
+
+    try:
+        do_repl_main_loop(
+            pyb,
+            console,
+            console_out_write,
+            code_to_inject=code_to_inject,
+            file_to_inject=file_to_inject,
+        )
+    finally:
+        console.exit()
+        if capture_file is not None:
+            capture_file.close()
+
+
+def execbuffer(pyb, buf, follow):
+    ret_val = 0
+    try:
+        pyb.exec_raw_no_follow(buf)
+        if follow:
+            ret, ret_err = pyb.follow(timeout=None, data_consumer=pyboard.stdout_write_bytes)
+            if ret_err:
+                pyboard.stdout_write_bytes(ret_err)
+                ret_val = 1
+    except pyboard.PyboardError as er:
+        print(er)
+        ret_val = 1
+    except KeyboardInterrupt:
+        ret_val = 1
+    return ret_val
+
+
+def main():
+    config = load_user_config()
+    prepare_command_expansions(config)
+
+    args = sys.argv[1:]
+    pyb = None
+    did_action = False
+
+    try:
+        while args:
+            do_command_expansion(args)
+
+            cmds = {
+                "connect": (False, False, 1),
+                "disconnect": (False, False, 0),
+                "mount": (True, False, 1),
+                "repl": (False, True, 0),
+                "eval": (True, True, 1),
+                "exec": (True, True, 1),
+                "run": (True, True, 1),
+                "fs": (True, True, 1),
+            }
+            cmd = args.pop(0)
+            try:
+                need_raw_repl, is_action, num_args_min = cmds[cmd]
+            except KeyError:
+                print(f"{_PROG}: '{cmd}' is not a command")
+                return 1
+
+            if len(args) < num_args_min:
+                print(f"{_PROG}: '{cmd}' neads at least {num_args_min} argument(s)")
+                return 1
+
+            if cmd == "connect":
+                if pyb is not None:
+                    do_disconnect(pyb)
+                pyb = do_connect(args)
+                if pyb is None:
+                    did_action = True
+                continue
+
+            if pyb is None:
+                pyb = do_connect(["auto"])
+
+            if need_raw_repl:
+                if not pyb.in_raw_repl:
+                    pyb.enter_raw_repl()
+            else:
+                if pyb.in_raw_repl:
+                    pyb.exit_raw_repl()
+            if is_action:
+                did_action = True
+
+            if cmd == "disconnect":
+                do_disconnect(pyb)
+                pyb = None
+            elif cmd == "mount":
+                path = args.pop(0)
+                pyb.mount_local(path)
+                print(f"Local directory {path} is mounted at /remote")
+            elif cmd in ("exec", "eval", "run"):
+                follow = True
+                if args[0] == "--no-follow":
+                    args.pop(0)
+                    follow = False
+                if cmd == "exec":
+                    buf = args.pop(0)
+                elif cmd == "eval":
+                    buf = "print(" + args.pop(0) + ")"
+                else:
+                    filename = args.pop(0)
+                    try:
+                        with open(filename, "rb") as f:
+                            buf = f.read()
+                    except OSError:
+                        print(f"{_PROG}: could not read file '{filename}'")
+                        return 1
+                ret = execbuffer(pyb, buf, follow)
+                if ret:
+                    return ret
+            elif cmd == "fs":
+                do_filesystem(pyb, args)
+            elif cmd == "repl":
+                do_repl(pyb, args)
+
+        if not did_action:
+            if pyb is None:
+                pyb = do_connect(["auto"])
+            if pyb.in_raw_repl:
+                pyb.exit_raw_repl()
+            do_repl(pyb, args)
+    finally:
+        if pyb is not None:
+            do_disconnect(pyb)
diff --git a/tools/mpremote/mpremote/pyboardextended.py b/tools/mpremote/mpremote/pyboardextended.py
new file mode 100644
index 0000000000000..e3f259b395cc8
--- /dev/null
+++ b/tools/mpremote/mpremote/pyboardextended.py
@@ -0,0 +1,621 @@
+import os, re, serial, struct, time
+from errno import EPERM
+from .console import VT_ENABLED
+
+try:
+    from .pyboard import Pyboard, PyboardError, stdout_write_bytes, filesystem_command
+except ImportError:
+    import sys
+
+    sys.path.append(os.path.dirname(__file__) + "/../..")
+    from pyboard import Pyboard, PyboardError, stdout_write_bytes, filesystem_command
+
+fs_hook_cmds = {
+    "CMD_STAT": 1,
+    "CMD_ILISTDIR_START": 2,
+    "CMD_ILISTDIR_NEXT": 3,
+    "CMD_OPEN": 4,
+    "CMD_CLOSE": 5,
+    "CMD_READ": 6,
+    "CMD_WRITE": 7,
+    "CMD_SEEK": 8,
+    "CMD_REMOVE": 9,
+    "CMD_RENAME": 10,
+}
+
+fs_hook_code = """\
+import uos, uio, ustruct, micropython, usys
+
+
+class RemoteCommand:
+    def __init__(self, use_second_port):
+        self.buf4 = bytearray(4)
+        try:
+            import pyb
+            self.fout = pyb.USB_VCP()
+            if use_second_port:
+                self.fin = pyb.USB_VCP(1)
+            else:
+                self.fin = pyb.USB_VCP()
+        except:
+            import usys
+            self.fout = usys.stdout.buffer
+            self.fin = usys.stdin.buffer
+        import select
+        self.poller = select.poll()
+        self.poller.register(self.fin, select.POLLIN)
+
+    def poll_in(self):
+        for _ in self.poller.ipoll(1000):
+            return
+        self.end()
+        raise Exception('timeout waiting for remote')
+
+    def rd(self, n):
+        buf = bytearray(n)
+        self.rd_into(buf, n)
+        return buf
+
+    def rd_into(self, buf, n):
+        # implement reading with a timeout in case other side disappears
+        if n == 0:
+            return
+        self.poll_in()
+        r = self.fin.readinto(buf, n)
+        if r < n:
+            mv = memoryview(buf)
+            while r < n:
+                self.poll_in()
+                r += self.fin.readinto(mv[r:], n - r)
+
+    def begin(self, type):
+        micropython.kbd_intr(-1)
+        buf4 = self.buf4
+        buf4[0] = 0x18
+        buf4[1] = type
+        self.fout.write(buf4, 2)
+        # Wait for sync byte 0x18, but don't get stuck forever
+        for i in range(30):
+            self.poller.poll(1000)
+            self.fin.readinto(buf4, 1)
+            if buf4[0] == 0x18:
+                break
+
+    def end(self):
+        micropython.kbd_intr(3)
+
+    def rd_s8(self):
+        self.rd_into(self.buf4, 1)
+        n = self.buf4[0]
+        if n & 0x80:
+            n -= 0x100
+        return n
+
+    def rd_s32(self):
+        buf4 = self.buf4
+        self.rd_into(buf4, 4)
+        n = buf4[0] | buf4[1] << 8 | buf4[2] << 16 | buf4[3] << 24
+        if buf4[3] & 0x80:
+            n -= 0x100000000
+        return n
+
+    def rd_u32(self):
+        buf4 = self.buf4
+        self.rd_into(buf4, 4)
+        return buf4[0] | buf4[1] << 8 | buf4[2] << 16 | buf4[3] << 24
+
+    def rd_bytes(self, buf):
+        # TODO if n is large (eg >256) then we may miss bytes on stdin
+        n = self.rd_s32()
+        if buf is None:
+            ret = buf = bytearray(n)
+        else:
+            ret = n
+        self.rd_into(buf, n)
+        return ret
+
+    def rd_str(self):
+        n = self.rd_s32()
+        if n == 0:
+            return ''
+        else:
+            return str(self.rd(n), 'utf8')
+
+    def wr_s8(self, i):
+        self.buf4[0] = i
+        self.fout.write(self.buf4, 1)
+
+    def wr_s32(self, i):
+        ustruct.pack_into('<i', self.buf4, 0, i)
+        self.fout.write(self.buf4)
+
+    def wr_bytes(self, b):
+        self.wr_s32(len(b))
+        self.fout.write(b)
+
+    # str and bytes act the same in MicroPython
+    wr_str = wr_bytes
+
+
+class RemoteFile(uio.IOBase):
+    def __init__(self, cmd, fd, is_text):
+        self.cmd = cmd
+        self.fd = fd
+        self.is_text = is_text
+
+    def __enter__(self):
+        return self
+
+    def __exit__(self, a, b, c):
+        self.close()
+
+    def ioctl(self, request, arg):
+        if request == 4:  # CLOSE
+            self.close()
+        return 0
+
+    def flush(self):
+        pass
+
+    def close(self):
+        if self.fd is None:
+            return
+        c = self.cmd
+        c.begin(CMD_CLOSE)
+        c.wr_s8(self.fd)
+        c.end()
+        self.fd = None
+
+    def read(self, n=-1):
+        c = self.cmd
+        c.begin(CMD_READ)
+        c.wr_s8(self.fd)
+        c.wr_s32(n)
+        data = c.rd_bytes(None)
+        c.end()
+        if self.is_text:
+            data = str(data, 'utf8')
+        else:
+            data = bytes(data)
+        return data
+
+    def readinto(self, buf):
+        c = self.cmd
+        c.begin(CMD_READ)
+        c.wr_s8(self.fd)
+        c.wr_s32(len(buf))
+        n = c.rd_bytes(buf)
+        c.end()
+        return n
+
+    def readline(self):
+        l = ''
+        while 1:
+            c = self.read(1)
+            l += c
+            if c == '\\n' or c == '':
+                return l
+
+    def readlines(self):
+        ls = []
+        while 1:
+            l = self.readline()
+            if not l:
+                return ls
+            ls.append(l)
+
+    def write(self, buf):
+        c = self.cmd
+        c.begin(CMD_WRITE)
+        c.wr_s8(self.fd)
+        c.wr_bytes(buf)
+        n = c.rd_s32()
+        c.end()
+        return n
+
+    def seek(self, n):
+        c = self.cmd
+        c.begin(CMD_SEEK)
+        c.wr_s8(self.fd)
+        c.wr_s32(n)
+        n = c.rd_s32()
+        c.end()
+        return n
+
+
+class RemoteFS:
+    def __init__(self, cmd):
+        self.cmd = cmd
+
+    def mount(self, readonly, mkfs):
+        pass
+
+    def umount(self):
+        pass
+
+    def chdir(self, path):
+        if not path.startswith("/"):
+            path = self.path + path
+        if not path.endswith("/"):
+            path += "/"
+        if path != "/":
+            self.stat(path)
+        self.path = path
+
+    def getcwd(self):
+        return self.path
+
+    def remove(self, path):
+        c = self.cmd
+        c.begin(CMD_REMOVE)
+        c.wr_str(self.path + path)
+        res = c.rd_s32()
+        c.end()
+        if res < 0:
+            raise OSError(-res)
+
+    def rename(self, old, new):
+        c = self.cmd
+        c.begin(CMD_RENAME)
+        c.wr_str(self.path + old)
+        c.wr_str(self.path + new)
+        res = c.rd_s32()
+        c.end()
+        if res < 0:
+            raise OSError(-res)
+
+    def stat(self, path):
+        c = self.cmd
+        c.begin(CMD_STAT)
+        c.wr_str(self.path + path)
+        res = c.rd_s8()
+        if res < 0:
+            c.end()
+            raise OSError(-res)
+        mode = c.rd_u32()
+        size = c.rd_u32()
+        atime = c.rd_u32()
+        mtime = c.rd_u32()
+        ctime = c.rd_u32()
+        c.end()
+        return mode, 0, 0, 0, 0, 0, size, atime, mtime, ctime
+
+    def ilistdir(self, path):
+        c = self.cmd
+        c.begin(CMD_ILISTDIR_START)
+        c.wr_str(self.path + path)
+        res = c.rd_s8()
+        c.end()
+        if res < 0:
+            raise OSError(-res)
+        def next():
+            while True:
+                c.begin(CMD_ILISTDIR_NEXT)
+                name = c.rd_str()
+                if name:
+                    type = c.rd_u32()
+                    c.end()
+                    yield (name, type, 0)
+                else:
+                    c.end()
+                    break
+        return next()
+
+    def open(self, path, mode):
+        c = self.cmd
+        c.begin(CMD_OPEN)
+        c.wr_str(self.path + path)
+        c.wr_str(mode)
+        fd = c.rd_s8()
+        c.end()
+        if fd < 0:
+            raise OSError(-fd)
+        return RemoteFile(c, fd, mode.find('b') == -1)
+
+
+def __mount(use_second_port):
+    uos.mount(RemoteFS(RemoteCommand(use_second_port)), '/remote')
+    uos.chdir('/remote')
+"""
+
+# Apply basic compression on hook code.
+for key, value in fs_hook_cmds.items():
+    fs_hook_code = re.sub(key, str(value), fs_hook_code)
+fs_hook_code = re.sub(" *#.*$", "", fs_hook_code, flags=re.MULTILINE)
+fs_hook_code = re.sub("\n\n+", "\n", fs_hook_code)
+fs_hook_code = re.sub("    ", " ", fs_hook_code)
+fs_hook_code = re.sub("rd_", "r", fs_hook_code)
+fs_hook_code = re.sub("wr_", "w", fs_hook_code)
+fs_hook_code = re.sub("buf4", "b4", fs_hook_code)
+
+
+class PyboardCommand:
+    def __init__(self, fin, fout, path):
+        self.fin = fin
+        self.fout = fout
+        self.root = path + "/"
+        self.data_ilistdir = ["", []]
+        self.data_files = []
+
+    def rd_s8(self):
+        return struct.unpack("<b", self.fin.read(1))[0]
+
+    def rd_s32(self):
+        return struct.unpack("<i", self.fin.read(4))[0]
+
+    def rd_bytes(self):
+        n = self.rd_s32()
+        return self.fin.read(n)
+
+    def rd_str(self):
+        n = self.rd_s32()
+        if n == 0:
+            return ""
+        else:
+            return str(self.fin.read(n), "utf8")
+
+    def wr_s8(self, i):
+        self.fout.write(struct.pack("<b", i))
+
+    def wr_s32(self, i):
+        self.fout.write(struct.pack("<i", i))
+
+    def wr_u32(self, i):
+        self.fout.write(struct.pack("<I", i))
+
+    def wr_bytes(self, b):
+        self.wr_s32(len(b))
+        self.fout.write(b)
+
+    def wr_str(self, s):
+        b = bytes(s, "utf8")
+        self.wr_s32(len(b))
+        self.fout.write(b)
+
+    def log_cmd(self, msg):
+        print(f"[{msg}]", end="\r\n")
+
+    def path_check(self, path):
+        parent = os.path.realpath(self.root)
+        child = os.path.realpath(path)
+        if parent != os.path.commonpath([parent, child]):
+            raise OSError(EPERM, "")  # File is outside mounted dir
+
+    def do_stat(self):
+        path = self.root + self.rd_str()
+        # self.log_cmd(f"stat {path}")
+        try:
+            self.path_check(path)
+            stat = os.stat(path)
+        except OSError as er:
+            self.wr_s8(-abs(er.errno))
+        else:
+            self.wr_s8(0)
+            # Note: st_ino would need to be 64-bit if added here
+            self.wr_u32(stat.st_mode)
+            self.wr_u32(stat.st_size)
+            self.wr_u32(int(stat.st_atime))
+            self.wr_u32(int(stat.st_mtime))
+            self.wr_u32(int(stat.st_ctime))
+
+    def do_ilistdir_start(self):
+        path = self.root + self.rd_str()
+        try:
+            self.path_check(path)
+            self.wr_s8(0)
+        except OSError as er:
+            self.wr_s8(-abs(er.errno))
+        else:
+            self.data_ilistdir[0] = path
+            self.data_ilistdir[1] = os.listdir(path)
+
+    def do_ilistdir_next(self):
+        if self.data_ilistdir[1]:
+            entry = self.data_ilistdir[1].pop(0)
+            try:
+                stat = os.lstat(self.data_ilistdir[0] + "/" + entry)
+                mode = stat.st_mode & 0xC000
+            except OSError as er:
+                mode = 0
+            self.wr_str(entry)
+            self.wr_u32(mode)
+        else:
+            self.wr_str("")
+
+    def do_open(self):
+        path = self.root + self.rd_str()
+        mode = self.rd_str()
+        # self.log_cmd(f"open {path} {mode}")
+        try:
+            self.path_check(path)
+            f = open(path, mode)
+        except OSError as er:
+            self.wr_s8(-abs(er.errno))
+        else:
+            is_text = mode.find("b") == -1
+            try:
+                fd = self.data_files.index(None)
+                self.data_files[fd] = (f, is_text)
+            except ValueError:
+                fd = len(self.data_files)
+                self.data_files.append((f, is_text))
+            self.wr_s8(fd)
+
+    def do_close(self):
+        fd = self.rd_s8()
+        # self.log_cmd(f"close {fd}")
+        self.data_files[fd][0].close()
+        self.data_files[fd] = None
+
+    def do_read(self):
+        fd = self.rd_s8()
+        n = self.rd_s32()
+        buf = self.data_files[fd][0].read(n)
+        if self.data_files[fd][1]:
+            buf = bytes(buf, "utf8")
+        self.wr_bytes(buf)
+        # self.log_cmd(f"read {fd} {n} -> {len(buf)}")
+
+    def do_seek(self):
+        fd = self.rd_s8()
+        n = self.rd_s32()
+        # self.log_cmd(f"seek {fd} {n}")
+        self.data_files[fd][0].seek(n)
+        self.wr_s32(n)
+
+    def do_write(self):
+        fd = self.rd_s8()
+        buf = self.rd_bytes()
+        if self.data_files[fd][1]:
+            buf = str(buf, "utf8")
+        n = self.data_files[fd][0].write(buf)
+        self.wr_s32(n)
+        # self.log_cmd(f"write {fd} {len(buf)} -> {n}")
+
+    def do_remove(self):
+        path = self.root + self.rd_str()
+        # self.log_cmd(f"remove {path}")
+        try:
+            self.path_check(path)
+            os.remove(path)
+            ret = 0
+        except OSError as er:
+            ret = -abs(er.errno)
+        self.wr_s32(ret)
+
+    def do_rename(self):
+        old = self.root + self.rd_str()
+        new = self.root + self.rd_str()
+        # self.log_cmd(f"rename {old} {new}")
+        try:
+            self.path_check(old)
+            self.path_check(new)
+            os.rename(old, new)
+            ret = 0
+        except OSError as er:
+            ret = -abs(er.errno)
+        self.wr_s32(ret)
+
+    cmd_table = {
+        fs_hook_cmds["CMD_STAT"]: do_stat,
+        fs_hook_cmds["CMD_ILISTDIR_START"]: do_ilistdir_start,
+        fs_hook_cmds["CMD_ILISTDIR_NEXT"]: do_ilistdir_next,
+        fs_hook_cmds["CMD_OPEN"]: do_open,
+        fs_hook_cmds["CMD_CLOSE"]: do_close,
+        fs_hook_cmds["CMD_READ"]: do_read,
+        fs_hook_cmds["CMD_WRITE"]: do_write,
+        fs_hook_cmds["CMD_SEEK"]: do_seek,
+        fs_hook_cmds["CMD_REMOVE"]: do_remove,
+        fs_hook_cmds["CMD_RENAME"]: do_rename,
+    }
+
+
+class SerialIntercept:
+    def __init__(self, serial, cmd):
+        self.orig_serial = serial
+        self.cmd = cmd
+        self.buf = b""
+        self.orig_serial.timeout = 5.0
+
+    def _check_input(self, blocking):
+        if blocking or self.orig_serial.inWaiting() > 0:
+            c = self.orig_serial.read(1)
+            if c == b"\x18":
+                # a special command
+                c = self.orig_serial.read(1)[0]
+                self.orig_serial.write(b"\x18")  # Acknowledge command
+                PyboardCommand.cmd_table[c](self.cmd)
+            elif not VT_ENABLED and c == b"\x1b":
+                # ESC code, ignore these on windows
+                esctype = self.orig_serial.read(1)
+                if esctype == b"[":  # CSI
+                    while not (0x40 < self.orig_serial.read(1)[0] < 0x7E):
+                        # Looking for "final byte" of escape sequence
+                        pass
+            else:
+                self.buf += c
+
+    @property
+    def fd(self):
+        return self.orig_serial.fd
+
+    def close(self):
+        self.orig_serial.close()
+
+    def inWaiting(self):
+        self._check_input(False)
+        return len(self.buf)
+
+    def read(self, n):
+        while len(self.buf) < n:
+            self._check_input(True)
+        out = self.buf[:n]
+        self.buf = self.buf[n:]
+        return out
+
+    def write(self, buf):
+        self.orig_serial.write(buf)
+
+
+class PyboardExtended(Pyboard):
+    def __init__(self, dev, *args, **kwargs):
+        super().__init__(dev, *args, **kwargs)
+        self.device_name = dev
+        self.mounted = False
+
+    def mount_local(self, path, dev_out=None):
+        fout = self.serial
+        if dev_out is not None:
+            try:
+                fout = serial.Serial(dev_out)
+            except serial.SerialException:
+                port = list(serial.tools.list_ports.grep(dev_out))
+                if not port:
+                    raise
+                for p in port:
+                    try:
+                        fout = serial.Serial(p.device)
+                        break
+                    except serial.SerialException:
+                        pass
+        self.mounted = True
+        if self.eval('"RemoteFS" in globals()') == b"False":
+            self.exec_(fs_hook_code)
+        self.exec_("__mount(%s)" % (dev_out is not None))
+        self.cmd = PyboardCommand(self.serial, fout, path)
+        self.serial = SerialIntercept(self.serial, self.cmd)
+        self.dev_out = dev_out
+
+    def soft_reset_with_mount(self, out_callback):
+        self.serial.write(b"\x04")
+        if not self.mounted:
+            return
+
+        # Wait for a response to the soft-reset command.
+        for i in range(10):
+            if self.serial.inWaiting():
+                break
+            time.sleep(0.05)
+        else:
+            # Device didn't respond so it wasn't in a state to do a soft reset.
+            return
+
+        out_callback(self.serial.read(1))
+        self.serial = self.serial.orig_serial
+        n = self.serial.inWaiting()
+        while n > 0:
+            buf = self.serial.read(n)
+            out_callback(buf)
+            time.sleep(0.1)
+            n = self.serial.inWaiting()
+        self.serial.write(b"\x01")
+        self.exec_(fs_hook_code)
+        self.exec_("__mount(%s)" % (self.dev_out is not None))
+        self.exit_raw_repl()
+        self.read_until(4, b">>> ")
+        self.serial = SerialIntercept(self.serial, self.cmd)
+
+    def umount_local(self):
+        if self.mounted:
+            self.exec_('uos.umount("/remote")')
+            self.mounted = False
diff --git a/tools/mpremote/pyproject.toml b/tools/mpremote/pyproject.toml
new file mode 100644
index 0000000000000..374b58cbf4636
--- /dev/null
+++ b/tools/mpremote/pyproject.toml
@@ -0,0 +1,6 @@
+[build-system]
+requires = [
+    "setuptools>=42",
+    "wheel"
+]
+build-backend = "setuptools.build_meta"
diff --git a/tools/mpremote/setup.cfg b/tools/mpremote/setup.cfg
new file mode 100644
index 0000000000000..4a1bf27c108c2
--- /dev/null
+++ b/tools/mpremote/setup.cfg
@@ -0,0 +1,25 @@
+[metadata]
+name = mpremote
+version = 0.0.4
+author = Damien George
+author_email = damien@micropython.org
+description = Tool for interacting remotely with MicroPython
+long_description = file: README.md
+long_description_content_type = text/markdown
+url = https://github.com/micropython/micropython
+project_urls =
+    Bug Tracker = https://github.com/micropython/micropython/issues
+classifiers =
+    Programming Language :: Python :: 3
+    License :: OSI Approved :: MIT License
+    Operating System :: OS Independent
+
+[options]
+packages = mpremote
+python_requires = >= 3.4
+install_requires =
+    pyserial >= 3.3
+
+[options.entry_points]
+console_scripts =
+  mpremote = mpremote.main:main

From f2dbc9102251f092e93b7c87cd8ffa5e9e5b880b Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Sun, 1 Mar 2020 09:40:43 -0600
Subject: [PATCH 0909/3533] py/compile: Raise an error on async with/for
 outside an async function.

A simple reproducer is:

   async for x in (): x

Before this change, it would cause an assertion error in mpy-cross and
micropython-coverage.
---
 py/compile.c                          | 22 ++++++++++++++++------
 tests/basics/async_syntaxerror.py     | 19 +++++++++++++++++++
 tests/basics/async_syntaxerror.py.exp |  2 ++
 3 files changed, 37 insertions(+), 6 deletions(-)
 create mode 100644 tests/basics/async_syntaxerror.py
 create mode 100644 tests/basics/async_syntaxerror.py.exp

diff --git a/py/compile.c b/py/compile.c
index 1182b8b1eb7a5..0b02746a5644c 100644
--- a/py/compile.c
+++ b/py/compile.c
@@ -1970,13 +1970,23 @@ STATIC void compile_async_stmt(compiler_t *comp, mp_parse_node_struct_t *pns) {
         compile_funcdef(comp, pns0);
         scope_t *fscope = (scope_t *)pns0->nodes[4];
         fscope->scope_flags |= MP_SCOPE_FLAG_GENERATOR;
-    } else if (MP_PARSE_NODE_STRUCT_KIND(pns0) == PN_for_stmt) {
-        // async for
-        compile_async_for_stmt(comp, pns0);
     } else {
-        // async with
-        assert(MP_PARSE_NODE_STRUCT_KIND(pns0) == PN_with_stmt);
-        compile_async_with_stmt(comp, pns0);
+        // async for/with; first verify the scope is a generator
+        int scope_flags = comp->scope_cur->scope_flags;
+        if (!(scope_flags & MP_SCOPE_FLAG_GENERATOR)) {
+            compile_syntax_error(comp, (mp_parse_node_t)pns0,
+                MP_ERROR_TEXT("async for/with outside async function"));
+            return;
+        }
+
+        if (MP_PARSE_NODE_STRUCT_KIND(pns0) == PN_for_stmt) {
+            // async for
+            compile_async_for_stmt(comp, pns0);
+        } else {
+            // async with
+            assert(MP_PARSE_NODE_STRUCT_KIND(pns0) == PN_with_stmt);
+            compile_async_with_stmt(comp, pns0);
+        }
     }
 }
 #endif
diff --git a/tests/basics/async_syntaxerror.py b/tests/basics/async_syntaxerror.py
new file mode 100644
index 0000000000000..ddd2c4b59eb89
--- /dev/null
+++ b/tests/basics/async_syntaxerror.py
@@ -0,0 +1,19 @@
+# test syntax errors using async
+
+try:
+    exec
+except NameError:
+    print("SKIP")
+    raise SystemExit
+
+
+def test_syntax(code):
+    try:
+        exec(code)
+        print("no SyntaxError")
+    except SyntaxError:
+        print("SyntaxError")
+
+
+test_syntax("async for x in (): x")
+test_syntax("async with x: x")
diff --git a/tests/basics/async_syntaxerror.py.exp b/tests/basics/async_syntaxerror.py.exp
new file mode 100644
index 0000000000000..5275689b41383
--- /dev/null
+++ b/tests/basics/async_syntaxerror.py.exp
@@ -0,0 +1,2 @@
+SyntaxError
+SyntaxError

From 9a74546f8d2783502159cd99217c7d7e5d514261 Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Mon, 10 May 2021 16:16:50 -0500
Subject: [PATCH 0910/3533] py/gc: Access the list of root pointers in an
 asan-compatible way.

Signed-off-by: Jeff Epler <jepler@gmail.com>
---
 py/gc.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/py/gc.c b/py/gc.c
index 88adf2045eb42..56111bd3b62af 100644
--- a/py/gc.c
+++ b/py/gc.c
@@ -342,9 +342,19 @@ void gc_collect_start(void) {
     #endif
 }
 
+// Address sanitizer needs to know that the access to ptrs[i] must always be
+// considered OK, even if it's a load from an address that would normally be
+// prohibited (due to being undefined, in a red zone, etc).
+#ifdef __GNUC__
+__attribute__((no_sanitize_address))
+#endif
+static void *gc_get_ptr(void **ptrs, int i) {
+    return ptrs[i];
+}
+
 void gc_collect_root(void **ptrs, size_t len) {
     for (size_t i = 0; i < len; i++) {
-        void *ptr = ptrs[i];
+        void *ptr = gc_get_ptr(ptrs, i);
         if (VERIFY_PTR(ptr)) {
             size_t block = BLOCK_FROM_PTR(ptr);
             if (ATB_GET_KIND(block) == AT_HEAD) {

From d67f4115b4be3619642c6e8694712ba5ed936e3e Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Mon, 10 May 2021 16:22:33 -0500
Subject: [PATCH 0911/3533] py/repl: Don't read past the end of import_str.

asan considers that memcmp(p, q, N) is permitted to access N bytes at each
of p and q, even for values of p and q that have a difference earlier.
Accessing additional values is frequently done in practice, reading 4 or
more bytes from each input at a time for efficiency, so when completing
"non_exist<TAB>" in the repl, this causes a diagnostic:

    ==16938==ERROR: AddressSanitizer: global-buffer-overflow on
    address 0x555555cd8dc8 at pc 0x7ffff726457b bp 0x7fffffffda20 sp 0x7fff
    READ of size 9 at 0x555555cd8dc8 thread T0
        #0 0x7ffff726457a  (/usr/lib/x86_64-linux-gnu/libasan.so.5+0xb857a)
        #1 0x555555b0e82a in mp_repl_autocomplete ../../py/repl.c:301
        #2 0x555555c89585 in readline_process_char ../../lib/mp-readline/re
        #3 0x555555c8ac6e in readline ../../lib/mp-readline/readline.c:513
        #4 0x555555b8dcbd in do_repl /home/jepler/src/micropython/ports/uni
        #5 0x555555b90859 in main_ /home/jepler/src/micropython/ports/unix/
        #6 0x555555b90a3a in main /home/jepler/src/micropython/ports/unix/m
        #7 0x7ffff619a09a in __libc_start_main ../csu/libc-start.c:308
        #8 0x55555595fd69 in _start (/home/jepler/src/micropython/ports/uni

    0x555555cd8dc8 is located 0 bytes to the right of global variable
    'import_str' defined in '../../py/repl.c:285:23' (0x555555cd8dc0) of
    size 8
      'import_str' is ascii string 'import '

Signed-off-by: Jeff Epler <jepler@gmail.com>
---
 py/repl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/py/repl.c b/py/repl.c
index 57bc21eff09f6..822e385abd241 100644
--- a/py/repl.c
+++ b/py/repl.c
@@ -297,7 +297,7 @@ size_t mp_repl_autocomplete(const char *str, size_t len, const mp_print_t *print
     if (q_first == 0) {
         // If there're no better alternatives, and if it's first word
         // in the line, try to complete "import".
-        if (s_start == org_str && s_len > 0) {
+        if (s_start == org_str && s_len > 0 && s_len < sizeof(import_str) - 1) {
             if (memcmp(s_start, import_str, s_len) == 0) {
                 *compl_str = import_str + s_len;
                 return sizeof(import_str) - 1 - s_len;

From 486fe71c6ee3fbc4bbebf348832e88880b8a5bae Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Mon, 10 May 2021 17:12:15 -0500
Subject: [PATCH 0912/3533] tests/extmod/btree_gc.py: Close the database to
 avoid a memory leak.

Signed-off-by: Jeff Epler <jepler@gmail.com>
---
 tests/extmod/btree_gc.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tests/extmod/btree_gc.py b/tests/extmod/btree_gc.py
index 153f4e7d78ec7..1845aa064095f 100644
--- a/tests/extmod/btree_gc.py
+++ b/tests/extmod/btree_gc.py
@@ -21,3 +21,6 @@
     db[b"thekey" + str(i)] = b"thelongvalue" + str(i)
     print(db[b"thekey" + str(i)])
     gc.collect()
+
+# Reclaim memory allocated by the db object.
+db.close()

From 025e4b6fbc32cd3118a5519cf6a18aa04b045abe Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sun, 30 May 2021 09:42:27 +1000
Subject: [PATCH 0913/3533] tests/basics: Split out literal tests that raise
 SyntaxWarning on CPy.

Fixes issue #7330.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/basics/is_isnot.py             | 10 ----------
 tests/basics/is_isnot_literal.py     | 13 +++++++++++++
 tests/basics/is_isnot_literal.py.exp |  8 ++++++++
 tests/basics/op_error.py             | 14 --------------
 tests/basics/op_error_literal.py     | 18 ++++++++++++++++++
 tests/basics/op_error_literal.py.exp |  3 +++
 6 files changed, 42 insertions(+), 24 deletions(-)
 create mode 100644 tests/basics/is_isnot_literal.py
 create mode 100644 tests/basics/is_isnot_literal.py.exp
 create mode 100644 tests/basics/op_error_literal.py
 create mode 100644 tests/basics/op_error_literal.py.exp

diff --git a/tests/basics/is_isnot.py b/tests/basics/is_isnot.py
index 990190aa41666..55459cb0a610e 100644
--- a/tests/basics/is_isnot.py
+++ b/tests/basics/is_isnot.py
@@ -1,14 +1,4 @@
-print(1 is 1)
-print(1 is 2)
-print(1 is not 1)
-print(1 is not 2)
-
-
 print([1, 2] is [1, 2])
 a = [1, 2]
 b = a
 print(b is a)
-
-# TODO: strings require special "is" handling, postponed
-# until qstr refactor.
-#print("a" is "a")
diff --git a/tests/basics/is_isnot_literal.py b/tests/basics/is_isnot_literal.py
new file mode 100644
index 0000000000000..1626fa949f094
--- /dev/null
+++ b/tests/basics/is_isnot_literal.py
@@ -0,0 +1,13 @@
+# test "is" and "is not" with literal arguments
+# these raise a SyntaxWarning in CPython because the results are
+# implementation dependent; see https://bugs.python.org/issue34850
+
+print(1 is 1)
+print(1 is 2)
+print(1 is not 1)
+print(1 is not 2)
+
+print("a" is "a")
+print("a" is "b")
+print("a" is not "a")
+print("a" is not "b")
diff --git a/tests/basics/is_isnot_literal.py.exp b/tests/basics/is_isnot_literal.py.exp
new file mode 100644
index 0000000000000..fc4b8f8129add
--- /dev/null
+++ b/tests/basics/is_isnot_literal.py.exp
@@ -0,0 +1,8 @@
+True
+False
+False
+True
+True
+False
+False
+True
diff --git a/tests/basics/op_error.py b/tests/basics/op_error.py
index 63c35db3f5f94..98a3ab025a03c 100644
--- a/tests/basics/op_error.py
+++ b/tests/basics/op_error.py
@@ -29,18 +29,10 @@
     print('TypeError')
 
 # unsupported subscription
-try:
-    1[0]
-except TypeError:
-    print('TypeError')
 try:
     1[0] = 1
 except TypeError:
     print('TypeError')
-try:
-    ''['']
-except TypeError:
-    print('TypeError')
 try:
     'a'[0] = 1
 except TypeError:
@@ -50,12 +42,6 @@
 except TypeError:
     print('TypeError')
 
-# not callable
-try:
-    1()
-except TypeError:
-    print('TypeError')
-
 # not an iterator
 try:
     next(1)
diff --git a/tests/basics/op_error_literal.py b/tests/basics/op_error_literal.py
new file mode 100644
index 0000000000000..00244ee2b2a20
--- /dev/null
+++ b/tests/basics/op_error_literal.py
@@ -0,0 +1,18 @@
+# test errors from bad operations with literals
+# these raise a SyntaxWarning in CPython; see https://bugs.python.org/issue15248
+
+# unsupported subscription
+try:
+    1[0]
+except TypeError:
+    print("TypeError")
+try:
+    ""[""]
+except TypeError:
+    print("TypeError")
+
+# not callable
+try:
+    1()
+except TypeError:
+    print("TypeError")
diff --git a/tests/basics/op_error_literal.py.exp b/tests/basics/op_error_literal.py.exp
new file mode 100644
index 0000000000000..a8ea4fb10b880
--- /dev/null
+++ b/tests/basics/op_error_literal.py.exp
@@ -0,0 +1,3 @@
+TypeError
+TypeError
+TypeError

From 34d4dab683c69578b0ddd1725290529dd812b291 Mon Sep 17 00:00:00 2001
From: Macarthur Inbody <133794m3r@gmail.com>
Date: Wed, 23 Dec 2020 12:05:26 -0500
Subject: [PATCH 0914/3533] extmod/modurandom: Add error message when
 getrandbits has bad value.

The random module's getrandbits() method didn't give a proper error message
when calling it with a value that was outside of the range of 1-32, which
can lead to confusion using this function (which under CPython can accept
numbers larger than 32).  Now instead of simply giving a ValueError it
gives an error message that states that the number of bits is constrained.

Also, since the random module's functions getrandbits() and randint()
differ from CPython, tests have been added to describe these differences.
For getrandbits the relevant documentation is shown and added to the docs.
The same is given for randint method so that the information is more easily
found.

Finally, since the int object lacks the bit_length() method there is a test
for that method also to include within the docs, showing the difference to
CPython.
---
 extmod/modurandom.c                         |  2 +-
 tests/cpydiff/modules_random_getrandbits.py | 12 ++++++++++++
 tests/cpydiff/modules_random_randint.py     | 12 ++++++++++++
 tests/cpydiff/types_int_bit_length.py       |  9 +++++++++
 4 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 tests/cpydiff/modules_random_getrandbits.py
 create mode 100644 tests/cpydiff/modules_random_randint.py
 create mode 100644 tests/cpydiff/types_int_bit_length.py

diff --git a/extmod/modurandom.c b/extmod/modurandom.c
index 5a736c1ebc628..f44510be9bd4a 100644
--- a/extmod/modurandom.c
+++ b/extmod/modurandom.c
@@ -88,7 +88,7 @@ STATIC uint32_t yasmarang_randbelow(uint32_t n) {
 STATIC mp_obj_t mod_urandom_getrandbits(mp_obj_t num_in) {
     int n = mp_obj_get_int(num_in);
     if (n > 32 || n == 0) {
-        mp_raise_ValueError(NULL);
+        mp_raise_ValueError(MP_ERROR_TEXT("bits must be 32 or less"));
     }
     uint32_t mask = ~0;
     // Beware of C undefined behavior when shifting by >= than bit size
diff --git a/tests/cpydiff/modules_random_getrandbits.py b/tests/cpydiff/modules_random_getrandbits.py
new file mode 100644
index 0000000000000..523e3a329d4e4
--- /dev/null
+++ b/tests/cpydiff/modules_random_getrandbits.py
@@ -0,0 +1,12 @@
+"""
+categories: Modules,random
+description: ``getrandbits`` method can only return a maximum of 32 bits at a time.
+cause: PRNG's internal state is only 32bits so it can only return a maximum of 32 bits of data at a time.
+workaround: If you need a number that has more than 32 bits then utilize the random module from micropython-lib.
+"""
+
+import random
+
+
+x = random.getrandbits(64)
+print("{}".format(x))
diff --git a/tests/cpydiff/modules_random_randint.py b/tests/cpydiff/modules_random_randint.py
new file mode 100644
index 0000000000000..b05908a157f99
--- /dev/null
+++ b/tests/cpydiff/modules_random_randint.py
@@ -0,0 +1,12 @@
+"""
+categories: Modules,random
+description: ``randint`` method can only return an integer that is at most the native word size.
+cause: PRNG is only able to generate 32 bits of state at a time. The result is then cast into a native sized int instead of a full int object.
+workaround: If you need integers larger than native wordsize use the random module from micropython-lib.
+"""
+
+import random
+
+
+x = random.randint(2 ** 128 - 1, 2 ** 128)
+print("x={}".format(x))
diff --git a/tests/cpydiff/types_int_bit_length.py b/tests/cpydiff/types_int_bit_length.py
new file mode 100644
index 0000000000000..2e907745a9e19
--- /dev/null
+++ b/tests/cpydiff/types_int_bit_length.py
@@ -0,0 +1,9 @@
+"""
+categories: Types,int
+description: ``bit_length`` method doesn't exist.
+cause: bit_length method is not implemented.
+workaround: Avoid using this method on MicroPython.
+"""
+
+x = 255
+print("{} is {} bits long.".format(x, x.bit_length()))

From c3199f56494429ba44f7e722597945dc91f3589c Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sun, 30 May 2021 16:52:08 +1000
Subject: [PATCH 0915/3533] extmod/modurandom: Support an argument of bits=0 to
 getrandbits.

This was changed in CPython 3.9; see https://bugs.python.org/issue40282.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/modurandom.c               | 5 ++++-
 tests/extmod/urandom_basic.py     | 7 +++++--
 tests/extmod/urandom_basic.py.exp | 4 ++++
 3 files changed, 13 insertions(+), 3 deletions(-)
 create mode 100644 tests/extmod/urandom_basic.py.exp

diff --git a/extmod/modurandom.c b/extmod/modurandom.c
index f44510be9bd4a..21fbac694221d 100644
--- a/extmod/modurandom.c
+++ b/extmod/modurandom.c
@@ -87,9 +87,12 @@ STATIC uint32_t yasmarang_randbelow(uint32_t n) {
 
 STATIC mp_obj_t mod_urandom_getrandbits(mp_obj_t num_in) {
     int n = mp_obj_get_int(num_in);
-    if (n > 32 || n == 0) {
+    if (n > 32 || n < 0) {
         mp_raise_ValueError(MP_ERROR_TEXT("bits must be 32 or less"));
     }
+    if (n == 0) {
+        return MP_OBJ_NEW_SMALL_INT(0);
+    }
     uint32_t mask = ~0;
     // Beware of C undefined behavior when shifting by >= than bit size
     mask >>= (32 - n);
diff --git a/tests/extmod/urandom_basic.py b/tests/extmod/urandom_basic.py
index 180197398f429..f7f5a6d691145 100644
--- a/tests/extmod/urandom_basic.py
+++ b/tests/extmod/urandom_basic.py
@@ -22,8 +22,11 @@
 random.seed(1)
 print(random.getrandbits(16) == r)
 
-# check that it throws an error for zero bits
+# check that zero bits works
+print(random.getrandbits(0))
+
+# check that it throws an error for negative bits
 try:
-    random.getrandbits(0)
+    random.getrandbits(-1)
 except ValueError:
     print("ValueError")
diff --git a/tests/extmod/urandom_basic.py.exp b/tests/extmod/urandom_basic.py.exp
new file mode 100644
index 0000000000000..d629828d790b4
--- /dev/null
+++ b/tests/extmod/urandom_basic.py.exp
@@ -0,0 +1,4 @@
+True
+True
+0
+ValueError

From 53519e322a5a0bb395676cdaa132f5e82de22909 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sun, 30 May 2021 19:25:53 +1000
Subject: [PATCH 0916/3533] py/builtinimport: Change relative import's
 ValueError to ImportError.

Following CPython change, see https://bugs.python.org/issue37444.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/builtinimport.c                        | 2 +-
 tests/import/import_pkg7.py.exp           | 8 ++++++++
 tests/import/pkg7/subpkg1/subpkg2/mod3.py | 4 ++--
 3 files changed, 11 insertions(+), 3 deletions(-)
 create mode 100644 tests/import/import_pkg7.py.exp

diff --git a/py/builtinimport.c b/py/builtinimport.c
index 874d2dd7f0f5c..abbeefced5195 100644
--- a/py/builtinimport.c
+++ b/py/builtinimport.c
@@ -313,7 +313,7 @@ mp_obj_t mp_builtin___import__(size_t n_args, const mp_obj_t *args) {
 
         // We must have some component left over to import from
         if (p == this_name) {
-            mp_raise_ValueError(MP_ERROR_TEXT("can't perform relative import"));
+            mp_raise_msg(&mp_type_ImportError, MP_ERROR_TEXT("can't perform relative import"));
         }
 
         uint new_mod_l = (mod_len == 0 ? (size_t)(p - this_name) : (size_t)(p - this_name) + 1 + mod_len);
diff --git a/tests/import/import_pkg7.py.exp b/tests/import/import_pkg7.py.exp
new file mode 100644
index 0000000000000..8f21a615f6a61
--- /dev/null
+++ b/tests/import/import_pkg7.py.exp
@@ -0,0 +1,8 @@
+pkg __name__: pkg7
+pkg __name__: pkg7.subpkg1
+pkg __name__: pkg7.subpkg1.subpkg2
+mod1
+mod2
+mod1.foo
+mod2.bar
+ImportError
diff --git a/tests/import/pkg7/subpkg1/subpkg2/mod3.py b/tests/import/pkg7/subpkg1/subpkg2/mod3.py
index 0aa916d2082d2..b0f4279fcf57b 100644
--- a/tests/import/pkg7/subpkg1/subpkg2/mod3.py
+++ b/tests/import/pkg7/subpkg1/subpkg2/mod3.py
@@ -7,5 +7,5 @@
 # attempted relative import beyond top-level package
 try:
     from .... import mod1
-except ValueError:
-    print("ValueError")
+except ImportError:
+    print("ImportError")

From a6a8941d84a4d38129bdc00be701a7ca8fc867b6 Mon Sep 17 00:00:00 2001
From: Matt Trentini <matthew.trentini@planetinnovation.com.au>
Date: Sun, 23 May 2021 17:20:43 +1000
Subject: [PATCH 0917/3533] docs/rp2: Add skeleton docs for the rp2 port.

---
 docs/index.rst               |   1 +
 docs/rp2/general.rst         |  18 +++
 docs/rp2/img/rpipico.jpg     | Bin 0 -> 89259 bytes
 docs/rp2/quickref.rst        | 288 +++++++++++++++++++++++++++++++++++
 docs/rp2/tutorial/intro.rst  |   6 +
 docs/templates/topindex.html |   4 +
 6 files changed, 317 insertions(+)
 create mode 100644 docs/rp2/general.rst
 create mode 100644 docs/rp2/img/rpipico.jpg
 create mode 100644 docs/rp2/quickref.rst
 create mode 100644 docs/rp2/tutorial/intro.rst

diff --git a/docs/index.rst b/docs/index.rst
index f760fa12a080a..58552daf51523 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -11,5 +11,6 @@ MicroPython documentation and references
     pyboard/quickref.rst
     esp8266/quickref.rst
     esp32/quickref.rst
+    rp2/quickref.rst
     wipy/quickref.rst
     unix/quickref.rst
diff --git a/docs/rp2/general.rst b/docs/rp2/general.rst
new file mode 100644
index 0000000000000..9ff83a965603a
--- /dev/null
+++ b/docs/rp2/general.rst
@@ -0,0 +1,18 @@
+.. _rp2_general:
+
+General information about the RP2xxx port
+=========================================
+
+The rp2 port supports boards powered by the Raspberry Pi Foundation's RP2xxx
+family of microcontrollers, most notably the Raspberry Pi Pico that employs
+the RP2040.
+
+Technical specifications and SoC datasheets
+-------------------------------------------
+
+Datasheets!
+
+Short summary of tech specs!
+
+Description of general structure of the port (it's built on top of the APIs
+provided by the Raspberry Pi SDK).
diff --git a/docs/rp2/img/rpipico.jpg b/docs/rp2/img/rpipico.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..336d3582775b8701d670403b0e63df8fcefc478c
GIT binary patch
literal 89259
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

literal 0
HcmV?d00001

diff --git a/docs/rp2/quickref.rst b/docs/rp2/quickref.rst
new file mode 100644
index 0000000000000..6bbe1795415f0
--- /dev/null
+++ b/docs/rp2/quickref.rst
@@ -0,0 +1,288 @@
+.. _rp2_quickref:
+
+Quick reference for the RP2
+===========================
+
+.. image:: img/rpipico.jpg
+    :alt: Raspberry Pi Pico
+    :width: 640px
+
+The Raspberry Pi Pico Development Board (image attribution: Raspberry Pi Foundation).
+
+Below is a quick reference for Raspberry Pi RP2xxx boards.  If it is your first time
+working with this board it may be useful to get an overview of the microcontroller:
+
+.. toctree::
+   :maxdepth: 1
+
+   general.rst
+   tutorial/intro.rst
+
+Installing MicroPython
+----------------------
+
+See the corresponding section of tutorial: :ref:`rp2_intro`. It also includes
+a troubleshooting subsection.
+
+General board control
+---------------------
+
+The MicroPython REPL is on the USB serial port.
+Tab-completion is useful to find out what methods an object has.
+Paste mode (ctrl-E) is useful to paste a large slab of Python code into
+the REPL.
+
+The :mod:`machine` module::
+
+    import machine
+
+    machine.freq()          # get the current frequency of the CPU
+    machine.freq(240000000) # set the CPU frequency to 240 MHz
+
+The :mod:`rp2` module::
+
+    import rp2
+
+Delay and timing
+----------------
+
+Use the :mod:`time <utime>` module::
+
+    import time
+
+    time.sleep(1)           # sleep for 1 second
+    time.sleep_ms(500)      # sleep for 500 milliseconds
+    time.sleep_us(10)       # sleep for 10 microseconds
+    start = time.ticks_ms() # get millisecond counter
+    delta = time.ticks_diff(time.ticks_ms(), start) # compute time difference
+
+Timers
+------
+
+How do they work?
+
+.. _rp2_Pins_and_GPIO:
+
+Pins and GPIO
+-------------
+
+Use the :ref:`machine.Pin <machine.Pin>` class::
+
+    from machine import Pin
+
+    p0 = Pin(0, Pin.OUT)    # create output pin on GPIO0
+    p0.on()                 # set pin to "on" (high) level
+    p0.off()                # set pin to "off" (low) level
+    p0.value(1)             # set pin to on/high
+
+    p2 = Pin(2, Pin.IN)     # create input pin on GPIO2
+    print(p2.value())       # get value, 0 or 1
+
+    p4 = Pin(4, Pin.IN, Pin.PULL_UP) # enable internal pull-up resistor
+    p5 = Pin(5, Pin.OUT, value=1) # set pin high on creation
+
+UART (serial bus)
+-----------------
+
+See :ref:`machine.UART <machine.UART>`. ::
+
+    from machine import UART
+
+    uart1 = UART(1, baudrate=9600, tx=33, rx=32)
+    uart1.write('hello')  # write 5 bytes
+    uart1.read(5)         # read up to 5 bytes
+
+
+PWM (pulse width modulation)
+----------------------------
+
+How does PWM work on the RPi RP2xxx?
+
+Use the ``machine.PWM`` class::
+
+    from machine import Pin, PWM
+
+    pwm0 = PWM(Pin(0))      # create PWM object from a pin
+    pwm0.freq()             # get current frequency
+    pwm0.freq(1000)         # set frequency
+    pwm0.duty_u16()         # get current duty cycle, range 0-65535
+    pwm0.duty_u16(200)      # set duty cycle, range 0-65535
+    pwm0.deinit()           # turn off PWM on the pin
+
+ADC (analog to digital conversion)
+----------------------------------
+
+How does the ADC module work?
+
+Use the :ref:`machine.ADC <machine.ADC>` class::
+
+    from machine import ADC
+
+    adc = ADC(Pin(32))          # create ADC object on ADC pin
+    adc.read_u16()              # read value, 0-65535 across voltage range 0.0v - 3.3v
+
+Software SPI bus
+----------------
+
+Software SPI (using bit-banging) works on all pins, and is accessed via the
+:ref:`machine.SoftSPI <machine.SoftSPI>` class::
+
+    from machine import Pin, SoftSPI
+
+    # construct a SoftSPI bus on the given pins
+    # polarity is the idle state of SCK
+    # phase=0 means sample on the first edge of SCK, phase=1 means the second
+    spi = SoftSPI(baudrate=100000, polarity=1, phase=0, sck=Pin(0), mosi=Pin(2), miso=Pin(4))
+
+    spi.init(baudrate=200000) # set the baudrate
+
+    spi.read(10)            # read 10 bytes on MISO
+    spi.read(10, 0xff)      # read 10 bytes while outputting 0xff on MOSI
+
+    buf = bytearray(50)     # create a buffer
+    spi.readinto(buf)       # read into the given buffer (reads 50 bytes in this case)
+    spi.readinto(buf, 0xff) # read into the given buffer and output 0xff on MOSI
+
+    spi.write(b'12345')     # write 5 bytes on MOSI
+
+    buf = bytearray(4)      # create a buffer
+    spi.write_readinto(b'1234', buf) # write to MOSI and read from MISO into the buffer
+    spi.write_readinto(buf, buf) # write buf to MOSI and read MISO back into buf
+
+.. Warning::
+   Currently *all* of ``sck``, ``mosi`` and ``miso`` *must* be specified when
+   initialising Software SPI.
+
+Hardware SPI bus
+----------------
+
+Hardware SPI is accessed via the :ref:`machine.SPI <machine.SPI>` class and
+has the same methods as software SPI above::
+
+    from machine import Pin, SPI
+
+    spi = SPI(1, 10000000)
+    spi = SPI(1, 10000000, sck=Pin(14), mosi=Pin(13), miso=Pin(12))
+    spi = SPI(2, baudrate=80000000, polarity=0, phase=0, bits=8, firstbit=0, sck=Pin(18), mosi=Pin(23), miso=Pin(19))
+
+Software I2C bus
+----------------
+
+Software I2C (using bit-banging) works on all output-capable pins, and is
+accessed via the :ref:`machine.SoftI2C <machine.SoftI2C>` class::
+
+    from machine import Pin, SoftI2C
+
+    i2c = SoftI2C(scl=Pin(5), sda=Pin(4), freq=100000)
+
+    i2c.scan()              # scan for devices
+
+    i2c.readfrom(0x3a, 4)   # read 4 bytes from device with address 0x3a
+    i2c.writeto(0x3a, '12') # write '12' to device with address 0x3a
+
+    buf = bytearray(10)     # create a buffer with 10 bytes
+    i2c.writeto(0x3a, buf)  # write the given buffer to the slave
+
+Hardware I2C bus
+----------------
+
+The driver is accessed via the :ref:`machine.I2C <machine.I2C>` class and
+has the same methods as software I2C above::
+
+    from machine import Pin, I2C
+
+    i2c = I2C(0)
+    i2c = I2C(1, scl=Pin(5), sda=Pin(4), freq=400000)
+
+Real time clock (RTC)
+---------------------
+
+See :ref:`machine.RTC <machine.RTC>` ::
+
+    from machine import RTC
+
+    rtc = RTC()
+    rtc.datetime((2017, 8, 23, 1, 12, 48, 0, 0)) # set a specific date and time
+    rtc.datetime() # get date and time
+
+WDT (Watchdog timer)
+--------------------
+
+Is there a watchdog timer?
+
+See :ref:`machine.WDT <machine.WDT>`. ::
+
+    from machine import WDT
+
+    # enable the WDT with a timeout of 5s (1s is the minimum)
+    wdt = WDT(timeout=5000)
+    wdt.feed()
+
+Deep-sleep mode
+---------------
+
+Is there deep-sleep support for the rp2?
+
+The following code can be used to sleep, wake and check the reset cause::
+
+    import machine
+
+    # check if the device woke from a deep sleep
+    if machine.reset_cause() == machine.DEEPSLEEP_RESET:
+        print('woke from a deep sleep')
+
+    # put the device to sleep for 10 seconds
+    machine.deepsleep(10000)
+
+OneWire driver
+--------------
+
+The OneWire driver is implemented in software and works on all pins::
+
+    from machine import Pin
+    import onewire
+
+    ow = onewire.OneWire(Pin(12)) # create a OneWire bus on GPIO12
+    ow.scan()               # return a list of devices on the bus
+    ow.reset()              # reset the bus
+    ow.readbyte()           # read a byte
+    ow.writebyte(0x12)      # write a byte on the bus
+    ow.write('123')         # write bytes on the bus
+    ow.select_rom(b'12345678') # select a specific device by its ROM code
+
+There is a specific driver for DS18S20 and DS18B20 devices::
+
+    import time, ds18x20
+    ds = ds18x20.DS18X20(ow)
+    roms = ds.scan()
+    ds.convert_temp()
+    time.sleep_ms(750)
+    for rom in roms:
+        print(ds.read_temp(rom))
+
+Be sure to put a 4.7k pull-up resistor on the data line.  Note that
+the ``convert_temp()`` method must be called each time you want to
+sample the temperature.
+
+NeoPixel and APA106 driver
+--------------------------
+
+Use the ``neopixel`` and ``apa106`` modules::
+
+    from machine import Pin
+    from neopixel import NeoPixel
+
+    pin = Pin(0, Pin.OUT)   # set GPIO0 to output to drive NeoPixels
+    np = NeoPixel(pin, 8)   # create NeoPixel driver on GPIO0 for 8 pixels
+    np[0] = (255, 255, 255) # set the first pixel to white
+    np.write()              # write data to all pixels
+    r, g, b = np[0]         # get first pixel colour
+
+
+The APA106 driver extends NeoPixel, but internally uses a different colour order::
+
+    from apa106 import APA106
+    ap = APA106(pin, 8)
+    r, g, b = ap[0]
+
+APA102 (DotStar) uses a different driver as it has an additional clock pin.
diff --git a/docs/rp2/tutorial/intro.rst b/docs/rp2/tutorial/intro.rst
new file mode 100644
index 0000000000000..5609ab3798df8
--- /dev/null
+++ b/docs/rp2/tutorial/intro.rst
@@ -0,0 +1,6 @@
+.. _rp2_intro:
+
+Getting started with MicroPython on the RP2xxx
+==============================================
+
+Let's get started!
diff --git a/docs/templates/topindex.html b/docs/templates/topindex.html
index ff766b0cf2ff0..42233942bc236 100644
--- a/docs/templates/topindex.html
+++ b/docs/templates/topindex.html
@@ -58,6 +58,10 @@ <h1>MicroPython documentation</h1>
         <a class="biglink" href="{{ pathto("esp32/quickref") }}">Quick reference for the ESP32</a><br/>
         <span class="linkdescr">pinout for ESP32-based boards, snippets of useful code, and a tutorial</span>
       </p>
+      <p class="biglink">
+        <a class="biglink" href="{{ pathto("rp2/quickref") }}">Quick reference for the Raspberry Pi RP2xxx</a><br/>
+        <span class="linkdescr">pinout for rp2xxx-based boards, snippets of useful code, and a tutorial</span>
+      </p>
       <p class="biglink">
         <a class="biglink" href="{{ pathto("wipy/quickref") }}">Quick reference for the WiPy/CC3200</a><br/>
         <span class="linkdescr">pinout for the WiPy/CC3200, snippets of useful code, and a tutorial</span>

From a18f695e294baf22bd7862e5be57aa0c820c7c77 Mon Sep 17 00:00:00 2001
From: IAMLIUBO <imliubo@makingfun.xyz>
Date: Thu, 27 May 2021 11:11:34 +0800
Subject: [PATCH 0918/3533] esp32/boards: Add M5STACK_ATOM board definition.

ATOM is a very small ESP32 development board produced by M5Stack, with a
size of 24mm * 24mm, with peripherals such as WS2812, IR, button, MPU6886
(Only Matrix), and 8 GPIO extensions.  It also has a plastic shell.
---
 ports/esp32/boards/M5STACK_ATOM/manifest.py   |  2 +
 .../esp32/boards/M5STACK_ATOM/modules/atom.py | 75 +++++++++++++++++++
 .../boards/M5STACK_ATOM/mpconfigboard.cmake   | 10 +++
 .../esp32/boards/M5STACK_ATOM/mpconfigboard.h |  2 +
 .../esp32/boards/M5STACK_ATOM/sdkconfig.board |  5 ++
 5 files changed, 94 insertions(+)
 create mode 100644 ports/esp32/boards/M5STACK_ATOM/manifest.py
 create mode 100644 ports/esp32/boards/M5STACK_ATOM/modules/atom.py
 create mode 100644 ports/esp32/boards/M5STACK_ATOM/mpconfigboard.cmake
 create mode 100644 ports/esp32/boards/M5STACK_ATOM/mpconfigboard.h
 create mode 100644 ports/esp32/boards/M5STACK_ATOM/sdkconfig.board

diff --git a/ports/esp32/boards/M5STACK_ATOM/manifest.py b/ports/esp32/boards/M5STACK_ATOM/manifest.py
new file mode 100644
index 0000000000000..7ae2ed15d9169
--- /dev/null
+++ b/ports/esp32/boards/M5STACK_ATOM/manifest.py
@@ -0,0 +1,2 @@
+include("$(PORT_DIR)/boards/manifest.py")
+freeze("modules")
diff --git a/ports/esp32/boards/M5STACK_ATOM/modules/atom.py b/ports/esp32/boards/M5STACK_ATOM/modules/atom.py
new file mode 100644
index 0000000000000..8f47585f197d4
--- /dev/null
+++ b/ports/esp32/boards/M5STACK_ATOM/modules/atom.py
@@ -0,0 +1,75 @@
+# M5Stack ATOM MicroPython Helper Library
+# MIT license; Copyright (c) 2021 IAMLIUBO work for M5STACK
+#
+# Hardware details:
+#       ATOM Lite    https://docs.m5stack.com/en/core/atom_lite
+#       ATOM Matrix  https://docs.m5stack.com/en/core/atom_matrix
+
+from micropython import const
+from machine import Pin
+import neopixel
+
+# M5STACK ATOM Hardware Pin Assignments
+"""
+          FRONT
+                  |3V3|
+|G21|   IR   G12  |G22|
+|G25|   BTN  G39  |G19|
+| 5V| WS2812  G27 |G23|
+|GNG| MPU G21 G25 |G33|
+     G32 G26 5V GND
+       Grove Port
+"""
+
+# WS2812
+WS2812_PIN = const(27)
+
+# Button
+BUTTON_PIN = const(39)
+
+# IR
+IR_PIN = const(12)
+
+# I2C
+I2C0_SCL_PIN = const(21)
+I2C0_SDA_PIN = const(25)
+
+# Grove port
+GROVE_PORT_PIN = (const(26), const(32))
+
+
+class ATOM:
+    def __init__(self, np_n):
+        self._np = neopixel.NeoPixel(pin=Pin(WS2812_PIN), n=np_n)
+        self._btn = Pin(BUTTON_PIN, Pin.IN, Pin.PULL_UP)
+
+    def get_button_status(self):
+        return self._btn.value()
+
+    def set_button_callback(self, cb):
+        self._btn.irq(trigger=Pin.IRQ_FALLING, handler=cb)
+
+    def set_pixel_color(self, num, r, g, b):
+        if num <= self._np.n:
+            self._np[num] = [r, g, b]
+            self._np.write()
+
+    def get_pixel_color(self, num):
+        if num <= self._np.n:
+            return self._np[num]
+
+    def set_pixels_color(self, r, g, b):
+        self._np.fill([r, g, b])
+        self._np.write()
+
+
+class Lite(ATOM):
+    # WS2812 number: 1
+    def __init__(self):
+        super(Lite, self).__init__(np_n=1)
+
+
+class Matrix(ATOM):
+    # WS2812 number: 25
+    def __init__(self):
+        super(Matrix, self).__init__(np_n=25)
diff --git a/ports/esp32/boards/M5STACK_ATOM/mpconfigboard.cmake b/ports/esp32/boards/M5STACK_ATOM/mpconfigboard.cmake
new file mode 100644
index 0000000000000..548337a479dad
--- /dev/null
+++ b/ports/esp32/boards/M5STACK_ATOM/mpconfigboard.cmake
@@ -0,0 +1,10 @@
+set(SDKCONFIG_DEFAULTS
+    boards/sdkconfig.base
+    boards/sdkconfig.ble
+    boards/sdkconfig.240mhz
+    boards/M5STACK_ATOM/sdkconfig.board
+)
+
+if(NOT MICROPY_FROZEN_MANIFEST)
+    set(MICROPY_FROZEN_MANIFEST ${MICROPY_BOARD_DIR}/manifest.py)
+endif()
diff --git a/ports/esp32/boards/M5STACK_ATOM/mpconfigboard.h b/ports/esp32/boards/M5STACK_ATOM/mpconfigboard.h
new file mode 100644
index 0000000000000..4270b19caf966
--- /dev/null
+++ b/ports/esp32/boards/M5STACK_ATOM/mpconfigboard.h
@@ -0,0 +1,2 @@
+#define MICROPY_HW_BOARD_NAME "M5Stack ATOM"
+#define MICROPY_HW_MCU_NAME "ESP32-PICO-D4"
diff --git a/ports/esp32/boards/M5STACK_ATOM/sdkconfig.board b/ports/esp32/boards/M5STACK_ATOM/sdkconfig.board
new file mode 100644
index 0000000000000..b299822dcb6d7
--- /dev/null
+++ b/ports/esp32/boards/M5STACK_ATOM/sdkconfig.board
@@ -0,0 +1,5 @@
+CONFIG_FLASHMODE_QIO=y
+CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
+CONFIG_SPIRAM_SPEED_80M=y
+CONFIG_ESP32_REV_MIN_1=y
+CONFIG_LWIP_LOCAL_HOSTNAME="M5StackATOM"

From c5d2095e593e5f0834179b04fcb7b3675524408d Mon Sep 17 00:00:00 2001
From: Joseph Chiu <joechiu@joechiu.com>
Date: Wed, 5 May 2021 03:43:42 -0700
Subject: [PATCH 0919/3533] esp32/espneopixel: Add support for GPIO32 and
 GPIO33.

Adds support for NeoPixels on GPIO32 and GPIO33 on ESP32.  Otherwise,
NeoPixels wired to GPIO32/33 wll silently fail without any hints to the
user.

With thanks to @robert-hh.

Fixes issue #7221.
---
 ports/esp32/espneopixel.c | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/ports/esp32/espneopixel.c b/ports/esp32/espneopixel.c
index bcdf38873be00..a5937b9c6bca7 100644
--- a/ports/esp32/espneopixel.c
+++ b/ports/esp32/espneopixel.c
@@ -11,9 +11,17 @@
 
 void IRAM_ATTR esp_neopixel_write(uint8_t pin, uint8_t *pixels, uint32_t numBytes, uint8_t timing) {
     uint8_t *p, *end, pix, mask;
-    uint32_t t, time0, time1, period, c, startTime, pinMask;
+    uint32_t t, time0, time1, period, c, startTime, pinMask, gpio_reg_set, gpio_reg_clear;
 
-    pinMask = 1 << pin;
+    if (pin < 32) {
+        pinMask = 1 << pin;
+        gpio_reg_set = GPIO_OUT_W1TS_REG;
+        gpio_reg_clear = GPIO_OUT_W1TC_REG;
+    } else {
+        pinMask = 1 << (pin - 32);
+        gpio_reg_set = GPIO_OUT1_W1TS_REG;
+        gpio_reg_clear = GPIO_OUT1_W1TC_REG;
+    }
     p = pixels;
     end = p + numBytes;
     pix = *p++;
@@ -42,12 +50,12 @@ void IRAM_ATTR esp_neopixel_write(uint8_t pin, uint8_t *pixels, uint32_t numByte
         while (((c = mp_hal_ticks_cpu()) - startTime) < period) {
             ;                                                       // Wait for bit start
         }
-        GPIO_REG_WRITE(GPIO_OUT_W1TS_REG, pinMask);                 // Set high
+        GPIO_REG_WRITE(gpio_reg_set, pinMask);                      // Set high
         startTime = c;                                              // Save start time
         while (((c = mp_hal_ticks_cpu()) - startTime) < t) {
             ;                                                       // Wait high duration
         }
-        GPIO_REG_WRITE(GPIO_OUT_W1TC_REG, pinMask);                 // Set low
+        GPIO_REG_WRITE(gpio_reg_clear, pinMask);                    // Set low
         if (!(mask >>= 1)) {                                        // Next bit/byte
             if (p >= end) {
                 break;

From fdaf2b80d9e67e9cf792b5aa034078c2fdad70d4 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Thu, 6 May 2021 20:35:33 +0200
Subject: [PATCH 0920/3533] mimxrt: Add custom help text and enable
 help("modules").

---
 ports/mimxrt/main.c         | 24 ++++++++++++++++++++++++
 ports/mimxrt/mpconfigport.h |  3 +++
 2 files changed, 27 insertions(+)

diff --git a/ports/mimxrt/main.c b/ports/mimxrt/main.c
index 7832afffcb2b5..387c96ef33a47 100644
--- a/ports/mimxrt/main.c
+++ b/ports/mimxrt/main.c
@@ -108,3 +108,27 @@ void MP_WEAK __assert_func(const char *file, int line, const char *func, const c
     }
 }
 #endif
+
+const char mimxrt_help_text[] =
+    "Welcome to MicroPython!\n"
+    "\n"
+    "For online help please visit https://micropython.org/help/.\n"
+    "\n"
+    "For access to the hardware use the 'machine' module. \n"
+    "\n"
+    "Quick overview of some objects:\n"
+    "  machine.Pin(pin) -- get a pin, eg machine.Pin(0)\n"
+    "  machine.Pin(pin, m, [p]) -- get a pin and configure it for IO mode m, pull mode p\n"
+    "    methods: init(..), value([v]), high(), low())\n"
+    "\n"
+    "Pin IO modes are: Pin.IN, Pin.OUT\n"
+    "Pin pull modes are: Pin.PULL_UP, Pin.PULL_UP_47K, Pin.PULL_UP_22K, Pin.PULL_DOWN, Pin.PULL_HOLD\n"
+    "\n"
+    "Useful control commands:\n"
+    "  CTRL-C -- interrupt a running program\n"
+    "  CTRL-D -- on a blank line, do a soft reset of the board\n"
+    "  CTRL-E -- on a blank line, enter paste mode\n"
+    "\n"
+    "For further help on a specific object, type help(obj)\n"
+    "For a list of available modules, type help('modules')\n"
+;
diff --git a/ports/mimxrt/mpconfigport.h b/ports/mimxrt/mpconfigport.h
index e6b15e1b71777..72e804f676ca1 100644
--- a/ports/mimxrt/mpconfigport.h
+++ b/ports/mimxrt/mpconfigport.h
@@ -43,6 +43,7 @@
 #define MICROPY_ENABLE_GC                   (1)
 #define MICROPY_KBD_EXCEPTION               (1)
 #define MICROPY_HELPER_REPL                 (1)
+#define MICROPY_REPL_AUTO_INDENT            (1)
 #define MICROPY_LONGINT_IMPL                (MICROPY_LONGINT_IMPL_MPZ)
 #define MICROPY_ENABLE_SOURCE_LINE          (1)
 #define MICROPY_ERROR_REPORTING             (MICROPY_ERROR_REPORTING_TERSE)
@@ -59,6 +60,8 @@
 #define MICROPY_PY_BUILTINS_REVERSED        (1)
 #define MICROPY_PY_BUILTINS_MIN_MAX         (0)
 #define MICROPY_PY_BUILTINS_HELP            (1)
+#define MICROPY_PY_BUILTINS_HELP_MODULES    (1)
+#define MICROPY_PY_BUILTINS_HELP_TEXT       mimxrt_help_text
 #define MICROPY_PY___FILE__                 (0)
 #define MICROPY_PY_MICROPYTHON_MEM_INFO     (1)
 #define MICROPY_PY_ARRAY_SLICE_ASSIGN       (1)

From c303b15f10d2925edf11392058e30e86deac9b91 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Fri, 7 May 2021 09:42:26 +0200
Subject: [PATCH 0921/3533] mimxrt: Enable frozen modules.

---
 ports/mimxrt/Makefile           | 3 +++
 ports/mimxrt/boards/manifest.py | 1 +
 ports/mimxrt/mpconfigport.h     | 2 ++
 3 files changed, 6 insertions(+)
 create mode 100644 ports/mimxrt/boards/manifest.py

diff --git a/ports/mimxrt/Makefile b/ports/mimxrt/Makefile
index 0c893f9634a8b..b4f581ccdc6ab 100644
--- a/ports/mimxrt/Makefile
+++ b/ports/mimxrt/Makefile
@@ -15,6 +15,9 @@ include $(BOARD_DIR)/mpconfigboard.mk
 QSTR_DEFS = qstrdefsport.h
 QSTR_GLOBAL_DEPENDENCIES = $(BOARD_DIR)/mpconfigboard.h
 
+# MicroPython feature configurations
+FROZEN_MANIFEST ?= boards/manifest.py
+
 # Include py core make definitions
 include $(TOP)/py/py.mk
 
diff --git a/ports/mimxrt/boards/manifest.py b/ports/mimxrt/boards/manifest.py
new file mode 100644
index 0000000000000..c80309cf675a2
--- /dev/null
+++ b/ports/mimxrt/boards/manifest.py
@@ -0,0 +1 @@
+freeze("$(PORT_DIR)/modules")
diff --git a/ports/mimxrt/mpconfigport.h b/ports/mimxrt/mpconfigport.h
index 72e804f676ca1..63ee5ea5ccdd0 100644
--- a/ports/mimxrt/mpconfigport.h
+++ b/ports/mimxrt/mpconfigport.h
@@ -48,6 +48,8 @@
 #define MICROPY_ENABLE_SOURCE_LINE          (1)
 #define MICROPY_ERROR_REPORTING             (MICROPY_ERROR_REPORTING_TERSE)
 #define MICROPY_CAN_OVERRIDE_BUILTINS       (1)
+#define MICROPY_MODULE_FROZEN_MPY           (1)
+#define MICROPY_QSTR_EXTRA_POOL             mp_qstr_frozen_const_pool
 
 // Control over Python builtins
 #define MICROPY_PY_BUILTINS_STR_COUNT       (0)

From dfd4324eb1b758e37cfc77da8467e7f5d72f519c Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Fri, 7 May 2021 15:21:09 +0200
Subject: [PATCH 0922/3533] mimxrt: Add flash storage support with VFS and
 littlefs filesystem.

This commit adds full support for a filesystem on all boards, with a block
device object mimxrt.Flash() and uos.VfsLfs2 enabled.

Main changes are:
- Refactoring of linker scripts to accomodate reserved area for VFS.  VFS
  will take up most of the available flash. 1M is reserved for code.  9K is
  reserved for flash configuration, interrupts, etc.
- Addition of _boot.py with filesystem init code, called from main.c.
- Definition of the mimxrt module with a Flash class in modmimxrt.[ch].
- Implementation of a flash driver class in mimxrt_flash.c.  All flashing
  related functions are stored in ITCM RAM.
- Addition of the uos module with filesystem functions.
- Implementation of uos.urandom() for the sake of completeness of the uos
  module.

It uses sample code from CircuitPython supplied under MIT license, which
uses the NXP SDK example code.

Done in collaboration with Philipp Ebensberger aka @alphaFred who
contributed the essential part to enable writing to flash while code is
executing, among other things.
---
 ports/mimxrt/Makefile                         |  17 +-
 .../boards/MIMXRT1010_EVK/MIMXRT1010_EVK.ld   |   1 +
 .../evkmimxrt1010_flexspi_nor_config.h        |  44 ++-
 .../boards/MIMXRT1010_EVK/flash_config.c      |  76 ++++-
 .../boards/MIMXRT1010_EVK/mpconfigboard.h     |   1 +
 ports/mimxrt/boards/MIMXRT1011.ld             |  28 +-
 .../boards/MIMXRT1020_EVK/MIMXRT1020_EVK.ld   |   1 +
 .../evkmimxrt1020_flexspi_nor_config.h        |  44 ++-
 .../boards/MIMXRT1020_EVK/flash_config.c      |  89 +++++-
 .../boards/MIMXRT1020_EVK/mpconfigboard.h     |   1 +
 ports/mimxrt/boards/MIMXRT1021.ld             |  24 +-
 .../boards/MIMXRT1050_EVK/MIMXRT1050_EVK.ld   |   1 +
 .../evkmimxrt1050_flexspi_nor_config.h        |  44 ++-
 .../boards/MIMXRT1050_EVK/flash_config.c      |  81 +++++-
 .../boards/MIMXRT1050_EVK/mpconfigboard.h     |   1 +
 ports/mimxrt/boards/MIMXRT1052.ld             |  25 +-
 .../boards/MIMXRT1060_EVK/MIMXRT1060_EVK.ld   |   1 +
 .../evkmimxrt1060_flexspi_nor_config.h        |  44 ++-
 .../boards/MIMXRT1060_EVK/flash_config.c      |  76 ++++-
 .../boards/MIMXRT1060_EVK/mpconfigboard.h     |   1 +
 ports/mimxrt/boards/MIMXRT1062.ld             |  24 +-
 ports/mimxrt/boards/MIMXRT1064.ld             |  24 +-
 .../boards/MIMXRT1064_EVK/MIMXRT1064_EVK.ld   |   1 +
 .../evkmimxrt1064_flexspi_nor_config.h        |  45 ++-
 .../boards/MIMXRT1064_EVK/flash_config.c      |  76 ++++-
 .../boards/MIMXRT1064_EVK/mpconfigboard.h     |   1 +
 ports/mimxrt/boards/TEENSY40/TEENSY40.ld      |   2 +
 ports/mimxrt/boards/TEENSY40/flash_config.c   |  99 ++++++-
 ports/mimxrt/boards/TEENSY40/mpconfigboard.h  |   1 +
 .../TEENSY40/teensy40_flexspi_nor_config.h    |  47 ++--
 ports/mimxrt/boards/common.ld                 | 262 ++++++++++++++++++
 ports/mimxrt/hal/flexspi_nor_flash.c          | 219 +++++++++++++++
 ports/mimxrt/hal/flexspi_nor_flash.h          |  42 +++
 ports/mimxrt/main.c                           |  33 ++-
 ports/mimxrt/mimxrt_flash.c                   | 221 +++++++++++++++
 ports/mimxrt/modmimxrt.c                      |  39 +++
 ports/mimxrt/modmimxrt.h                      |  34 +++
 ports/mimxrt/modules/_boot.py                 |  15 +
 ports/mimxrt/moduos.c                         | 129 +++++++++
 ports/mimxrt/mpconfigport.h                   |  27 +-
 ports/mimxrt/mphalport.c                      |   9 +
 ports/mimxrt/mphalport.h                      |   5 +
 42 files changed, 1745 insertions(+), 210 deletions(-)
 create mode 100644 ports/mimxrt/boards/MIMXRT1010_EVK/MIMXRT1010_EVK.ld
 create mode 100644 ports/mimxrt/boards/MIMXRT1020_EVK/MIMXRT1020_EVK.ld
 create mode 100644 ports/mimxrt/boards/MIMXRT1050_EVK/MIMXRT1050_EVK.ld
 create mode 100644 ports/mimxrt/boards/MIMXRT1060_EVK/MIMXRT1060_EVK.ld
 create mode 100644 ports/mimxrt/boards/MIMXRT1064_EVK/MIMXRT1064_EVK.ld
 create mode 100644 ports/mimxrt/boards/TEENSY40/TEENSY40.ld
 create mode 100644 ports/mimxrt/boards/common.ld
 create mode 100644 ports/mimxrt/hal/flexspi_nor_flash.c
 create mode 100644 ports/mimxrt/hal/flexspi_nor_flash.h
 create mode 100644 ports/mimxrt/mimxrt_flash.c
 create mode 100644 ports/mimxrt/modmimxrt.c
 create mode 100644 ports/mimxrt/modmimxrt.h
 create mode 100644 ports/mimxrt/modules/_boot.py
 create mode 100644 ports/mimxrt/moduos.c

diff --git a/ports/mimxrt/Makefile b/ports/mimxrt/Makefile
index b4f581ccdc6ab..7feab6cd75ef4 100644
--- a/ports/mimxrt/Makefile
+++ b/ports/mimxrt/Makefile
@@ -17,6 +17,7 @@ QSTR_GLOBAL_DEPENDENCIES = $(BOARD_DIR)/mpconfigboard.h
 
 # MicroPython feature configurations
 FROZEN_MANIFEST ?= boards/manifest.py
+MICROPY_VFS_LFS2 ?= 1
 
 # Include py core make definitions
 include $(TOP)/py/py.mk
@@ -24,7 +25,7 @@ include $(TOP)/py/py.mk
 GIT_SUBMODULES = lib/tinyusb lib/nxp_driver
 
 MCU_DIR = lib/nxp_driver/sdk/devices/$(MCU_SERIES)
-LD_FILES = boards/$(MCU_SERIES).ld $(TOP)/$(MCU_DIR)/gcc/$(MCU_SERIES)xxxxx_flexspi_nor.ld
+LD_FILES = boards/$(BOARD)/$(BOARD).ld boards/$(MCU_SERIES).ld boards/common.ld
 
 MAKE_PINS = boards/make-pins.py
 BOARD_PINS = $(BOARD_DIR)/pins.csv
@@ -59,8 +60,10 @@ CFLAGS += -DXIP_EXTERNAL_FLASH=1 \
 	-DXIP_BOOT_HEADER_ENABLE=1 \
 	-DCFG_TUSB_MCU=OPT_MCU_MIMXRT10XX \
 	-D__STARTUP_CLEAR_BSS \
+	-D__STARTUP_INITIALIZE_RAMFUNCTION \
 	-D__START=main \
 	-DCPU_HEADER_H='<$(MCU_SERIES).h>'
+CFLAGS += $(CFLAGS_MOD) $(CFLAGS_EXTRA)
 
 LDFLAGS = $(addprefix -T,$(LD_FILES)) -Map=$@.map --cref --print-memory-usage
 LIBS = $(shell $(CC) $(CFLAGS) -print-libgcc-file-name)
@@ -101,6 +104,8 @@ SRC_TINYUSB_IMX_C += \
 	$(MCU_DIR)/drivers/fsl_common.c \
 	$(MCU_DIR)/drivers/fsl_lpuart.c \
 	$(MCU_DIR)/drivers/fsl_flexram.c \
+	$(MCU_DIR)/drivers/fsl_flexspi.c \
+	$(MCU_DIR)/drivers/fsl_trng.c \
 
 SRC_C = \
 	main.c \
@@ -112,15 +117,20 @@ SRC_C = \
 	$(BOARD_DIR)/flash_config.c \
 	machine_led.c \
 	machine_pin.c \
+	mimxrt_flash.c \
 	modutime.c \
 	modmachine.c \
+	modmimxrt.c \
+	moduos.c \
 	mphalport.c \
+	hal/flexspi_nor_flash.c \
 	lib/mp-readline/readline.c \
 	lib/libc/string0.c \
 	lib/utils/gchelper_native.c \
 	lib/utils/printf.c \
 	lib/utils/pyexec.c \
 	lib/utils/stdout_helpers.c \
+	lib/utils/sys_stdio_mphal.c \
 	$(SRC_TINYUSB_C) \
 	$(SRC_TINYUSB_IMX_C) \
 
@@ -132,15 +142,20 @@ SRC_S = lib/utils/gchelper_m3.s \
 SRC_QSTR += \
 	machine_led.c \
 	machine_pin.c \
+	mimxrt_flash.c \
 	modutime.c \
 	modmachine.c \
+	modmimxrt.c \
+	moduos.c \
 	pin.c \
+	lib/utils/sys_stdio_mphal.c \
 	$(GEN_PINS_SRC) \
 
 OBJ += $(PY_O)
 OBJ += $(addprefix $(BUILD)/, $(SRC_C:.c=.o))
 OBJ += $(addprefix $(BUILD)/, $(SRC_S:.s=.o))
 OBJ += $(addprefix $(BUILD)/, $(SRC_SS:.S=.o))
+OBJ += $(addprefix $(BUILD)/, $(SRC_MOD:.c=.o))
 OBJ += $(BUILD)/pins_gen.o
 
 # Workaround for bug in older gcc, warning on "static usbd_device_t _usbd_dev = { 0 };"
diff --git a/ports/mimxrt/boards/MIMXRT1010_EVK/MIMXRT1010_EVK.ld b/ports/mimxrt/boards/MIMXRT1010_EVK/MIMXRT1010_EVK.ld
new file mode 100644
index 0000000000000..83da7ec73c680
--- /dev/null
+++ b/ports/mimxrt/boards/MIMXRT1010_EVK/MIMXRT1010_EVK.ld
@@ -0,0 +1 @@
+flash_size = 16M;
\ No newline at end of file
diff --git a/ports/mimxrt/boards/MIMXRT1010_EVK/evkmimxrt1010_flexspi_nor_config.h b/ports/mimxrt/boards/MIMXRT1010_EVK/evkmimxrt1010_flexspi_nor_config.h
index 8fa31c8320f33..2cb4535edc15b 100644
--- a/ports/mimxrt/boards/MIMXRT1010_EVK/evkmimxrt1010_flexspi_nor_config.h
+++ b/ports/mimxrt/boards/MIMXRT1010_EVK/evkmimxrt1010_flexspi_nor_config.h
@@ -211,34 +211,19 @@ typedef struct _FlexSPIConfig
 } flexspi_mem_config_t;
 
 /*  */
-#define NOR_CMD_INDEX_READ CMD_INDEX_READ               //!< 0
-#define NOR_CMD_INDEX_READSTATUS CMD_INDEX_READSTATUS   //!< 1
-#define NOR_CMD_INDEX_WRITEENABLE CMD_INDEX_WRITEENABLE //!< 2
-#define NOR_CMD_INDEX_ERASESECTOR 3                     //!< 3
-#define NOR_CMD_INDEX_PAGEPROGRAM CMD_INDEX_WRITE       //!< 4
-#define NOR_CMD_INDEX_CHIPERASE 5                       //!< 5
-#define NOR_CMD_INDEX_DUMMY 6                           //!< 6
-#define NOR_CMD_INDEX_ERASEBLOCK 7                      //!< 7
-
-#define NOR_CMD_LUT_SEQ_IDX_READ CMD_LUT_SEQ_IDX_READ //!< 0  READ LUT sequence id in lookupTable stored in config block
-#define NOR_CMD_LUT_SEQ_IDX_READSTATUS \
-    CMD_LUT_SEQ_IDX_READSTATUS //!< 1  Read Status LUT sequence id in lookupTable stored in config block
-#define NOR_CMD_LUT_SEQ_IDX_READSTATUS_XPI \
-    2 //!< 2  Read status DPI/QPI/OPI sequence id in lookupTable stored in config block
-#define NOR_CMD_LUT_SEQ_IDX_WRITEENABLE \
-    CMD_LUT_SEQ_IDX_WRITEENABLE //!< 3  Write Enable sequence id in lookupTable stored in config block
-#define NOR_CMD_LUT_SEQ_IDX_WRITEENABLE_XPI \
-    4 //!< 4  Write Enable DPI/QPI/OPI sequence id in lookupTable stored in config block
-#define NOR_CMD_LUT_SEQ_IDX_ERASESECTOR 5 //!< 5  Erase Sector sequence id in lookupTable stored in config block
-#define NOR_CMD_LUT_SEQ_IDX_ERASEBLOCK 8  //!< 8 Erase Block sequence id in lookupTable stored in config block
-#define NOR_CMD_LUT_SEQ_IDX_PAGEPROGRAM \
-    CMD_LUT_SEQ_IDX_WRITE                //!< 9  Program sequence id in lookupTable stored in config block
-#define NOR_CMD_LUT_SEQ_IDX_CHIPERASE 11 //!< 11 Chip Erase sequence in lookupTable id stored in config block
-#define NOR_CMD_LUT_SEQ_IDX_READ_SFDP 13 //!< 13 Read SFDP sequence in lookupTable id stored in config block
-#define NOR_CMD_LUT_SEQ_IDX_RESTORE_NOCMD \
-    14 //!< 14 Restore 0-4-4/0-8-8 mode sequence id in lookupTable stored in config block
-#define NOR_CMD_LUT_SEQ_IDX_EXIT_NOCMD \
-    15 //!< 15 Exit 0-4-4/0-8-8 mode sequence id in lookupTable stored in config blobk
+#define NOR_CMD_LUT_SEQ_IDX_READ_NORMAL 0
+#define NOR_CMD_LUT_SEQ_IDX_READSTATUSREG 1
+#define NOR_CMD_LUT_SEQ_IDX_READ_FAST_QUAD 2
+#define NOR_CMD_LUT_SEQ_IDX_WRITEENABLE 3
+#define NOR_CMD_LUT_SEQ_IDX_READSTATUS_XPI 4
+#define NOR_CMD_LUT_SEQ_IDX_ERASESECTOR 5
+#define NOR_CMD_LUT_SEQ_IDX_WRITESTATUSREG 6
+#define NOR_CMD_LUT_SEQ_IDX_PAGEPROGRAM_QUAD 7
+#define NOR_CMD_LUT_SEQ_IDX_READID 8
+#define NOR_CMD_LUT_SEQ_IDX_PAGEPROGRAM 9
+#define NOR_CMD_LUT_SEQ_IDX_ENTERQPI 10
+#define NOR_CMD_LUT_SEQ_IDX_CHIPERASE 11
+#define NOR_CMD_LUT_SEQ_IDX_EXITQPI 12
 
 /*
  *  Serial NOR configuration block
@@ -259,6 +244,9 @@ typedef struct _flexspi_nor_config
     uint32_t reserve2[11];          //!< Reserved for future use
 } flexspi_nor_config_t;
 
+#define FLASH_BUSY_STATUS_POL 0
+#define FLASH_BUSY_STATUS_OFFSET 0
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/ports/mimxrt/boards/MIMXRT1010_EVK/flash_config.c b/ports/mimxrt/boards/MIMXRT1010_EVK/flash_config.c
index a03ee07865ba9..5e7e5dcf15fb0 100644
--- a/ports/mimxrt/boards/MIMXRT1010_EVK/flash_config.c
+++ b/ports/mimxrt/boards/MIMXRT1010_EVK/flash_config.c
@@ -37,9 +37,83 @@ const flexspi_nor_config_t qspiflash_config = {
             .sflashA1Size     = 16u * 1024u * 1024u,
             .lookupTable =
                 {
-                    // Read LUTs
+                    // 0 Read LUTs 0 -> 0
                     FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0xEB, RADDR_SDR, FLEXSPI_4PAD, 0x18),
                     FLEXSPI_LUT_SEQ(DUMMY_SDR, FLEXSPI_4PAD, 0x06, READ_SDR, FLEXSPI_4PAD, 0x04),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 1 Read status register -> 1
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x05, READ_SDR, FLEXSPI_1PAD, 0x01),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 2 Fast read quad mode - SDR
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x6B, RADDR_SDR, FLEXSPI_1PAD, 0x18),
+                    FLEXSPI_LUT_SEQ(DUMMY_SDR, FLEXSPI_4PAD, 0x08, READ_SDR, FLEXSPI_4PAD, 0x04),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 3 Write Enable -> 3
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x06, STOP, FLEXSPI_1PAD, 0),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 4 Read extend parameters
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x81, READ_SDR, FLEXSPI_1PAD, 0x04),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 5 Erase Sector -> 5
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x20, RADDR_SDR, FLEXSPI_1PAD, 24),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 6 Write Status Reg
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x01, WRITE_SDR, FLEXSPI_1PAD, 0x04),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 7 Page Program - quad mode (-> 9)
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x32, RADDR_SDR, FLEXSPI_1PAD, 0x18),
+                    FLEXSPI_LUT_SEQ(WRITE_SDR, FLEXSPI_4PAD, 0x04, STOP, FLEXSPI_1PAD, 0),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 8 Read ID
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x90, DUMMY_SDR, FLEXSPI_1PAD, 24),
+                    FLEXSPI_LUT_SEQ(READ_SDR, FLEXSPI_1PAD, 0x00, 0, 0, 0),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 9 Page Program - single mode -> 9
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x02, RADDR_SDR, FLEXSPI_1PAD, 24),
+                    FLEXSPI_LUT_SEQ(WRITE_SDR, FLEXSPI_1PAD, 0, 0, 0, 0),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 10 Enter QPI mode
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x35, STOP, FLEXSPI_1PAD, 0),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 11 Erase Chip
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x60, STOP, FLEXSPI_1PAD, 0),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 12 Exit QPI mode
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_4PAD, 0xF5, STOP, FLEXSPI_1PAD, 0),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
                 },
         },
     .pageSize           = 256u,
diff --git a/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.h b/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.h
index 5a89423b50e35..3eb32681252ba 100644
--- a/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.h
+++ b/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.h
@@ -7,3 +7,4 @@
 #define MICROPY_HW_LED1_PIN (pin_GPIO_11)
 #define MICROPY_HW_LED_ON(pin) (mp_hal_pin_high(pin))
 #define MICROPY_HW_LED_OFF(pin) (mp_hal_pin_low(pin))
+#define BOARD_FLASH_CONFIG_HEADER_H "evkmimxrt1010_flexspi_nor_config.h"
diff --git a/ports/mimxrt/boards/MIMXRT1011.ld b/ports/mimxrt/boards/MIMXRT1011.ld
index 9db30adee8a46..d9a495685689a 100644
--- a/ports/mimxrt/boards/MIMXRT1011.ld
+++ b/ports/mimxrt/boards/MIMXRT1011.ld
@@ -1,5 +1,25 @@
-/* 24kiB stack. */
-__stack_size__ = 0x4000;
+/* Memory configuration */
+flash_start         = 0x60000000;
+flash_end           = DEFINED(reserved_size) ? ((flash_start) + (flash_size - reserved_size)) : ((flash_start) + (flash_size));
+flash_config_start  = 0x60000400;
+flash_config_size   = 0x00000C00;
+ivt_start           = 0x60001000;
+ivt_size            = 0x00001000;
+interrupts_start    = 0x60002000;
+interrupts_size     = 0x00000400;
+text_start          = 0x60002400;
+text_size           = ((((text_start) + 1M) + (4k - 1)) & ~(4k - 1)) - (text_start); /* reserve 1M for code but align on 4k boundary */
+vfs_start           = (text_start) + (text_size);
+vfs_size            = ((flash_end) - (vfs_start));
+itcm_start          = 0x00000000;
+itcm_size           = 0x00008000;
+dtcm_start          = 0x20000000;
+dtcm_size           = 0x00008000;
+ocrm_start          = 0x20200000;
+ocrm_size           = 0x00010000;
+
+/* 20kiB stack. */
+__stack_size__ = 0x5000;
 _estack = __StackTop;
 _sstack = __StackLimit;
 
@@ -7,5 +27,5 @@ _sstack = __StackLimit;
 __heap_size__ = 0;
 
 /* Use second OCRAM bank for GC heap. */
-_gc_heap_start = ORIGIN(m_data2);
-_gc_heap_end = ORIGIN(m_data2) + LENGTH(m_data2);
+_gc_heap_start = ORIGIN(m_ocrm);
+_gc_heap_end = ORIGIN(m_ocrm) + LENGTH(m_ocrm);
diff --git a/ports/mimxrt/boards/MIMXRT1020_EVK/MIMXRT1020_EVK.ld b/ports/mimxrt/boards/MIMXRT1020_EVK/MIMXRT1020_EVK.ld
new file mode 100644
index 0000000000000..fd1bf32ede778
--- /dev/null
+++ b/ports/mimxrt/boards/MIMXRT1020_EVK/MIMXRT1020_EVK.ld
@@ -0,0 +1 @@
+flash_size = 8M;
\ No newline at end of file
diff --git a/ports/mimxrt/boards/MIMXRT1020_EVK/evkmimxrt1020_flexspi_nor_config.h b/ports/mimxrt/boards/MIMXRT1020_EVK/evkmimxrt1020_flexspi_nor_config.h
index c0c6ea243672c..195c0c225e338 100644
--- a/ports/mimxrt/boards/MIMXRT1020_EVK/evkmimxrt1020_flexspi_nor_config.h
+++ b/ports/mimxrt/boards/MIMXRT1020_EVK/evkmimxrt1020_flexspi_nor_config.h
@@ -212,34 +212,19 @@ typedef struct _FlexSPIConfig
 } flexspi_mem_config_t;
 
 /*  */
-#define NOR_CMD_INDEX_READ CMD_INDEX_READ               //!< 0
-#define NOR_CMD_INDEX_READSTATUS CMD_INDEX_READSTATUS   //!< 1
-#define NOR_CMD_INDEX_WRITEENABLE CMD_INDEX_WRITEENABLE //!< 2
-#define NOR_CMD_INDEX_ERASESECTOR 3                     //!< 3
-#define NOR_CMD_INDEX_PAGEPROGRAM CMD_INDEX_WRITE       //!< 4
-#define NOR_CMD_INDEX_CHIPERASE 5                       //!< 5
-#define NOR_CMD_INDEX_DUMMY 6                           //!< 6
-#define NOR_CMD_INDEX_ERASEBLOCK 7                      //!< 7
-
-#define NOR_CMD_LUT_SEQ_IDX_READ CMD_LUT_SEQ_IDX_READ //!< 0  READ LUT sequence id in lookupTable stored in config block
-#define NOR_CMD_LUT_SEQ_IDX_READSTATUS \
-    CMD_LUT_SEQ_IDX_READSTATUS //!< 1  Read Status LUT sequence id in lookupTable stored in config block
-#define NOR_CMD_LUT_SEQ_IDX_READSTATUS_XPI \
-    2 //!< 2  Read status DPI/QPI/OPI sequence id in lookupTable stored in config block
-#define NOR_CMD_LUT_SEQ_IDX_WRITEENABLE \
-    CMD_LUT_SEQ_IDX_WRITEENABLE //!< 3  Write Enable sequence id in lookupTable stored in config block
-#define NOR_CMD_LUT_SEQ_IDX_WRITEENABLE_XPI \
-    4 //!< 4  Write Enable DPI/QPI/OPI sequence id in lookupTable stored in config block
-#define NOR_CMD_LUT_SEQ_IDX_ERASESECTOR 5 //!< 5  Erase Sector sequence id in lookupTable stored in config block
-#define NOR_CMD_LUT_SEQ_IDX_ERASEBLOCK 8  //!< 8 Erase Block sequence id in lookupTable stored in config block
-#define NOR_CMD_LUT_SEQ_IDX_PAGEPROGRAM \
-    CMD_LUT_SEQ_IDX_WRITE                //!< 9  Program sequence id in lookupTable stored in config block
-#define NOR_CMD_LUT_SEQ_IDX_CHIPERASE 11 //!< 11 Chip Erase sequence in lookupTable id stored in config block
-#define NOR_CMD_LUT_SEQ_IDX_READ_SFDP 13 //!< 13 Read SFDP sequence in lookupTable id stored in config block
-#define NOR_CMD_LUT_SEQ_IDX_RESTORE_NOCMD \
-    14 //!< 14 Restore 0-4-4/0-8-8 mode sequence id in lookupTable stored in config block
-#define NOR_CMD_LUT_SEQ_IDX_EXIT_NOCMD \
-    15 //!< 15 Exit 0-4-4/0-8-8 mode sequence id in lookupTable stored in config blobk
+#define NOR_CMD_LUT_SEQ_IDX_READ_NORMAL 0
+#define NOR_CMD_LUT_SEQ_IDX_READSTATUSREG 1
+#define NOR_CMD_LUT_SEQ_IDX_READ_FAST_QUAD 2
+#define NOR_CMD_LUT_SEQ_IDX_WRITEENABLE 3
+#define NOR_CMD_LUT_SEQ_IDX_READSTATUS_XPI 4
+#define NOR_CMD_LUT_SEQ_IDX_ERASESECTOR 5
+#define NOR_CMD_LUT_SEQ_IDX_WRITESTATUSREG 6
+#define NOR_CMD_LUT_SEQ_IDX_PAGEPROGRAM_QUAD 7
+#define NOR_CMD_LUT_SEQ_IDX_READID 8
+#define NOR_CMD_LUT_SEQ_IDX_PAGEPROGRAM 9
+#define NOR_CMD_LUT_SEQ_IDX_ENTERQPI 10
+#define NOR_CMD_LUT_SEQ_IDX_CHIPERASE 11
+#define NOR_CMD_LUT_SEQ_IDX_EXITQPI 12
 
 /*
  *  Serial NOR configuration block
@@ -260,6 +245,9 @@ typedef struct _flexspi_nor_config
     uint32_t reserve2[11];          //!< Reserved for future use
 } flexspi_nor_config_t;
 
+#define FLASH_BUSY_STATUS_POL 0
+#define FLASH_BUSY_STATUS_OFFSET 0
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/ports/mimxrt/boards/MIMXRT1020_EVK/flash_config.c b/ports/mimxrt/boards/MIMXRT1020_EVK/flash_config.c
index 56007931a90d7..5377cc1b25ac7 100644
--- a/ports/mimxrt/boards/MIMXRT1020_EVK/flash_config.c
+++ b/ports/mimxrt/boards/MIMXRT1020_EVK/flash_config.c
@@ -32,20 +32,105 @@ const flexspi_nor_config_t qspiflash_config = {
             .readSampleClkSrc = kFlexSPIReadSampleClk_LoopbackFromDqsPad,
             .csHoldTime       = 3u,
             .csSetupTime      = 3u,
+            .busyOffset = FLASH_BUSY_STATUS_OFFSET,     // Status bit 0 indicates busy.
+            .busyBitPolarity = FLASH_BUSY_STATUS_POL,   // Busy when the bit is 1.
+            .deviceModeCfgEnable = 1u,
+            .deviceModeType = kDeviceConfigCmdType_QuadEnable,
+            .deviceModeSeq = {
+                .seqId = 4u,
+                .seqNum = 1u,
+            },
+            .deviceModeArg = 0x40,
             // Enable DDR mode, Wordaddassable, Safe configuration, Differential clock
+            .deviceType = kFlexSpiDeviceType_SerialNOR,
             .sflashPadType = kSerialFlash_4Pads,
-            .serialClkFreq = kFlexSpiSerialClk_100MHz,
+            .serialClkFreq = kFlexSpiSerialClk_30MHz,
             .sflashA1Size  = 8u * 1024u * 1024u,
             .lookupTable =
                 {
-                    // Read LUTs
+                    // 0 Read LUTs 0 -> 0
                     FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0xEB, RADDR_SDR, FLEXSPI_4PAD, 0x18),
                     FLEXSPI_LUT_SEQ(DUMMY_SDR, FLEXSPI_4PAD, 0x06, READ_SDR, FLEXSPI_4PAD, 0x04),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 1 Read status register -> 1
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x05, READ_SDR, FLEXSPI_1PAD, 0x01),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 2 Fast read quad mode - SDR
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x6B, RADDR_SDR, FLEXSPI_1PAD, 0x18),
+                    FLEXSPI_LUT_SEQ(DUMMY_SDR, FLEXSPI_4PAD, 0x08, READ_SDR, FLEXSPI_4PAD, 0x04),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 3 Write Enable -> 3
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x06, STOP, FLEXSPI_1PAD, 0),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 4 Read extend parameters
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x81, READ_SDR, FLEXSPI_1PAD, 0x04),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 5 Erase Sector -> 5
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x20, RADDR_SDR, FLEXSPI_1PAD, 24),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 6 Write Status Reg
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x01, WRITE_SDR, FLEXSPI_1PAD, 0x04),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 7 Page Program - quad mode (-> 9)
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x32, RADDR_SDR, FLEXSPI_1PAD, 0x18),
+                    FLEXSPI_LUT_SEQ(WRITE_SDR, FLEXSPI_4PAD, 0x04, STOP, FLEXSPI_1PAD, 0),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 8 Read ID
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x90, DUMMY_SDR, FLEXSPI_1PAD, 24),
+                    FLEXSPI_LUT_SEQ(READ_SDR, FLEXSPI_1PAD, 0x00, 0, 0, 0),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 9 Page Program - single mode -> 9
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x02, RADDR_SDR, FLEXSPI_1PAD, 24),
+                    FLEXSPI_LUT_SEQ(WRITE_SDR, FLEXSPI_1PAD, 0, 0, 0, 0),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 10 Enter QPI mode
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x35, STOP, FLEXSPI_1PAD, 0),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 11 Erase Chip
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x60, STOP, FLEXSPI_1PAD, 0),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 12 Exit QPI mode
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_4PAD, 0xF5, STOP, FLEXSPI_1PAD, 0),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
                 },
         },
     .pageSize           = 256u,
     .sectorSize         = 4u * 1024u,
     .blockSize          = 256u * 1024u,
     .isUniformBlockSize = false,
+    .ipcmdSerialClkFreq = kFlexSpiSerialClk_30MHz,
 };
 #endif /* XIP_BOOT_HEADER_ENABLE */
diff --git a/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.h b/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.h
index d8c0f00e276e8..a025c85bf3462 100644
--- a/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.h
+++ b/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.h
@@ -8,3 +8,4 @@
 #define MICROPY_HW_LED1_PIN (pin_GPIO_AD_B0_05)
 #define MICROPY_HW_LED_ON(pin) (mp_hal_pin_low(pin))
 #define MICROPY_HW_LED_OFF(pin) (mp_hal_pin_high(pin))
+#define BOARD_FLASH_CONFIG_HEADER_H "evkmimxrt1020_flexspi_nor_config.h"
diff --git a/ports/mimxrt/boards/MIMXRT1021.ld b/ports/mimxrt/boards/MIMXRT1021.ld
index 6b59649fcaf7e..de0f259dcc9e2 100644
--- a/ports/mimxrt/boards/MIMXRT1021.ld
+++ b/ports/mimxrt/boards/MIMXRT1021.ld
@@ -1,8 +1,28 @@
+/* Memory configuration */
+flash_start         = 0x60000000;
+flash_end           = DEFINED(reserved_size) ? ((flash_start) + (flash_size - reserved_size)) : ((flash_start) + (flash_size));
+flash_config_start  = flash_start;
+flash_config_size   = 0x00001000;
+ivt_start           = 0x60001000;
+ivt_size            = 0x00001000;
+interrupts_start    = 0x60002000;
+interrupts_size     = 0x00000400;
+text_start          = 0x60002400;
+text_size           = ((((text_start) + 1M) + (4k - 1)) & ~(4k - 1)) - (text_start); /* reserve 1M for code but align on 4k boundary */
+vfs_start           = (text_start) + (text_size);
+vfs_size            = ((flash_end) - (vfs_start));
+itcm_start          = 0x00000000;
+itcm_size           = 0x00010000;
+dtcm_start          = 0x20000000;
+dtcm_size           = 0x00010000;
+ocrm_start          = 0x20200000;
+ocrm_size           = 0x00020000;
+
 /* 24kiB stack. */
 __stack_size__ = 0x6000;
 _estack = __StackTop;
 _sstack = __StackLimit;
 
 /* Use second OCRAM bank for GC heap. */
-_gc_heap_start = ORIGIN(m_data2);
-_gc_heap_end = ORIGIN(m_data2) + LENGTH(m_data2);
+_gc_heap_start = ORIGIN(m_ocrm);
+_gc_heap_end = ORIGIN(m_ocrm) + LENGTH(m_ocrm);
diff --git a/ports/mimxrt/boards/MIMXRT1050_EVK/MIMXRT1050_EVK.ld b/ports/mimxrt/boards/MIMXRT1050_EVK/MIMXRT1050_EVK.ld
new file mode 100644
index 0000000000000..fd1bf32ede778
--- /dev/null
+++ b/ports/mimxrt/boards/MIMXRT1050_EVK/MIMXRT1050_EVK.ld
@@ -0,0 +1 @@
+flash_size = 8M;
\ No newline at end of file
diff --git a/ports/mimxrt/boards/MIMXRT1050_EVK/evkmimxrt1050_flexspi_nor_config.h b/ports/mimxrt/boards/MIMXRT1050_EVK/evkmimxrt1050_flexspi_nor_config.h
index d8e842452e0cc..e038967e17088 100644
--- a/ports/mimxrt/boards/MIMXRT1050_EVK/evkmimxrt1050_flexspi_nor_config.h
+++ b/ports/mimxrt/boards/MIMXRT1050_EVK/evkmimxrt1050_flexspi_nor_config.h
@@ -209,34 +209,19 @@ typedef struct _FlexSPIConfig
 } flexspi_mem_config_t;
 
 /*  */
-#define NOR_CMD_INDEX_READ        CMD_INDEX_READ        //!< 0
-#define NOR_CMD_INDEX_READSTATUS  CMD_INDEX_READSTATUS  //!< 1
-#define NOR_CMD_INDEX_WRITEENABLE CMD_INDEX_WRITEENABLE //!< 2
-#define NOR_CMD_INDEX_ERASESECTOR 3                     //!< 3
-#define NOR_CMD_INDEX_PAGEPROGRAM CMD_INDEX_WRITE       //!< 4
-#define NOR_CMD_INDEX_CHIPERASE   5                     //!< 5
-#define NOR_CMD_INDEX_DUMMY       6                     //!< 6
-#define NOR_CMD_INDEX_ERASEBLOCK  7                     //!< 7
-
-#define NOR_CMD_LUT_SEQ_IDX_READ CMD_LUT_SEQ_IDX_READ //!< 0  READ LUT sequence id in lookupTable stored in config block
-#define NOR_CMD_LUT_SEQ_IDX_READSTATUS \
-    CMD_LUT_SEQ_IDX_READSTATUS //!< 1  Read Status LUT sequence id in lookupTable stored in config block
-#define NOR_CMD_LUT_SEQ_IDX_READSTATUS_XPI \
-    2 //!< 2  Read status DPI/QPI/OPI sequence id in lookupTable stored in config block
-#define NOR_CMD_LUT_SEQ_IDX_WRITEENABLE \
-    CMD_LUT_SEQ_IDX_WRITEENABLE //!< 3  Write Enable sequence id in lookupTable stored in config block
-#define NOR_CMD_LUT_SEQ_IDX_WRITEENABLE_XPI \
-    4 //!< 4  Write Enable DPI/QPI/OPI sequence id in lookupTable stored in config block
-#define NOR_CMD_LUT_SEQ_IDX_ERASESECTOR 5 //!< 5  Erase Sector sequence id in lookupTable stored in config block
-#define NOR_CMD_LUT_SEQ_IDX_ERASEBLOCK  8 //!< 8 Erase Block sequence id in lookupTable stored in config block
-#define NOR_CMD_LUT_SEQ_IDX_PAGEPROGRAM \
-    CMD_LUT_SEQ_IDX_WRITE                //!< 9  Program sequence id in lookupTable stored in config block
-#define NOR_CMD_LUT_SEQ_IDX_CHIPERASE 11 //!< 11 Chip Erase sequence in lookupTable id stored in config block
-#define NOR_CMD_LUT_SEQ_IDX_READ_SFDP 13 //!< 13 Read SFDP sequence in lookupTable id stored in config block
-#define NOR_CMD_LUT_SEQ_IDX_RESTORE_NOCMD \
-    14 //!< 14 Restore 0-4-4/0-8-8 mode sequence id in lookupTable stored in config block
-#define NOR_CMD_LUT_SEQ_IDX_EXIT_NOCMD \
-    15 //!< 15 Exit 0-4-4/0-8-8 mode sequence id in lookupTable stored in config blobk
+#define NOR_CMD_LUT_SEQ_IDX_READ_NORMAL 0
+#define NOR_CMD_LUT_SEQ_IDX_READSTATUSREG 1
+#define NOR_CMD_LUT_SEQ_IDX_READ_FAST_QUAD 2
+#define NOR_CMD_LUT_SEQ_IDX_WRITEENABLE 3
+#define NOR_CMD_LUT_SEQ_IDX_READSTATUS_XPI 4
+#define NOR_CMD_LUT_SEQ_IDX_ERASESECTOR 5
+#define NOR_CMD_LUT_SEQ_IDX_WRITESTATUSREG 6
+#define NOR_CMD_LUT_SEQ_IDX_PAGEPROGRAM_QUAD 7
+#define NOR_CMD_LUT_SEQ_IDX_READID 8
+#define NOR_CMD_LUT_SEQ_IDX_PAGEPROGRAM 9
+#define NOR_CMD_LUT_SEQ_IDX_ENTERQPI 10
+#define NOR_CMD_LUT_SEQ_IDX_CHIPERASE 11
+#define NOR_CMD_LUT_SEQ_IDX_EXITQPI 12
 
 /*
  *  Serial NOR configuration block
@@ -257,6 +242,9 @@ typedef struct _flexspi_nor_config
     uint32_t reserve2[11];          //!< Reserved for future use
 } flexspi_nor_config_t;
 
+#define FLASH_BUSY_STATUS_POL 0
+#define FLASH_BUSY_STATUS_OFFSET 0
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/ports/mimxrt/boards/MIMXRT1050_EVK/flash_config.c b/ports/mimxrt/boards/MIMXRT1050_EVK/flash_config.c
index 8203f4811ace1..2a9303fc98101 100644
--- a/ports/mimxrt/boards/MIMXRT1050_EVK/flash_config.c
+++ b/ports/mimxrt/boards/MIMXRT1050_EVK/flash_config.c
@@ -41,10 +41,83 @@ const flexspi_nor_config_t qspiflash_config = {
             .dataValidTime = {16u, 16u},
             .lookupTable =
                 {
-                    // Read LUTs
-                    FLEXSPI_LUT_SEQ(CMD_DDR, FLEXSPI_8PAD, 0xA0, RADDR_DDR, FLEXSPI_8PAD, 0x18),
-                    FLEXSPI_LUT_SEQ(CADDR_DDR, FLEXSPI_8PAD, 0x10, DUMMY_DDR, FLEXSPI_8PAD, 0x06),
-                    FLEXSPI_LUT_SEQ(READ_DDR, FLEXSPI_8PAD, 0x04, STOP, FLEXSPI_1PAD, 0x0),
+                    // 0 Read LUTs 0 -> 0
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0xEB, RADDR_SDR, FLEXSPI_4PAD, 0x18),
+                    FLEXSPI_LUT_SEQ(DUMMY_SDR, FLEXSPI_4PAD, 0x06, READ_SDR, FLEXSPI_4PAD, 0x04),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 1 Read status register -> 1
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x05, READ_SDR, FLEXSPI_1PAD, 0x01),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 2 Fast read quad mode - SDR
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x6B, RADDR_SDR, FLEXSPI_1PAD, 0x18),
+                    FLEXSPI_LUT_SEQ(DUMMY_SDR, FLEXSPI_4PAD, 0x08, READ_SDR, FLEXSPI_4PAD, 0x04),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 3 Write Enable -> 3
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x06, STOP, FLEXSPI_1PAD, 0),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 4 Read extend parameters
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x81, READ_SDR, FLEXSPI_1PAD, 0x04),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 5 Erase Sector -> 5
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x20, RADDR_SDR, FLEXSPI_1PAD, 24),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 6 Write Status Reg
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x01, WRITE_SDR, FLEXSPI_1PAD, 0x04),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 7 Page Program - quad mode (-> 9)
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x32, RADDR_SDR, FLEXSPI_1PAD, 0x18),
+                    FLEXSPI_LUT_SEQ(WRITE_SDR, FLEXSPI_4PAD, 0x04, STOP, FLEXSPI_1PAD, 0),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 8 Read ID
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x90, DUMMY_SDR, FLEXSPI_1PAD, 24),
+                    FLEXSPI_LUT_SEQ(READ_SDR, FLEXSPI_1PAD, 0x00, 0, 0, 0),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 9 Page Program - single mode -> 9
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x02, RADDR_SDR, FLEXSPI_1PAD, 24),
+                    FLEXSPI_LUT_SEQ(WRITE_SDR, FLEXSPI_1PAD, 0, 0, 0, 0),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 10 Enter QPI mode
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x35, STOP, FLEXSPI_1PAD, 0),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 11 Erase Chip
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x60, STOP, FLEXSPI_1PAD, 0),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 12 Exit QPI mode
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_4PAD, 0xF5, STOP, FLEXSPI_1PAD, 0),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
                 },
         },
     .pageSize           = 512u,
diff --git a/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.h b/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.h
index 2337496d2a3be..9b7664841ed6d 100644
--- a/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.h
+++ b/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.h
@@ -7,3 +7,4 @@
 #define MICROPY_HW_LED1_PIN (pin_GPIO_AD_B0_09)
 #define MICROPY_HW_LED_ON(pin) (mp_hal_pin_low(pin))
 #define MICROPY_HW_LED_OFF(pin) (mp_hal_pin_high(pin))
+#define BOARD_FLASH_CONFIG_HEADER_H "evkmimxrt1050_flexspi_nor_config.h"
diff --git a/ports/mimxrt/boards/MIMXRT1052.ld b/ports/mimxrt/boards/MIMXRT1052.ld
index 836a119e5e471..f78773531a9f7 100644
--- a/ports/mimxrt/boards/MIMXRT1052.ld
+++ b/ports/mimxrt/boards/MIMXRT1052.ld
@@ -1,7 +1,28 @@
+/* Memory configuration */
+flash_start         = 0x60000000;
+flash_end           = DEFINED(reserved_size) ? ((flash_start) + (flash_size - reserved_size)) : ((flash_start) + (flash_size));
+flash_config_start  = flash_start;
+flash_config_size   = 0x00001000;
+ivt_start           = 0x60001000;
+ivt_size            = 0x00001000;
+interrupts_start    = 0x60002000;
+interrupts_size     = 0x00000400;
+text_start          = 0x60002400;
+text_size           = ((((text_start) + 1M) + (4k - 1)) & ~(4k - 1)) - (text_start); /* reserve 1M for code but align on 4k boundary */
+vfs_start           = (text_start) + (text_size);
+vfs_size            = ((flash_end) - (vfs_start));
+itcm_start          = 0x00000000;
+itcm_size           = 0x00020000;
+dtcm_start          = 0x20000000;
+dtcm_size           = 0x00020000;
+ocrm_start          = 0x20200000;
+ocrm_size           = 0x00040000;
+
+/* 24kiB stack. */
 __stack_size__ = 0x6000;
 _estack = __StackTop;
 _sstack = __StackLimit;
 
 /* Use second OCRAM bank for GC heap. */
-_gc_heap_start = ORIGIN(m_data2);
-_gc_heap_end = ORIGIN(m_data2) + LENGTH(m_data2);
+_gc_heap_start = ORIGIN(m_ocrm);
+_gc_heap_end = ORIGIN(m_ocrm) + LENGTH(m_ocrm);
diff --git a/ports/mimxrt/boards/MIMXRT1060_EVK/MIMXRT1060_EVK.ld b/ports/mimxrt/boards/MIMXRT1060_EVK/MIMXRT1060_EVK.ld
new file mode 100644
index 0000000000000..fd1bf32ede778
--- /dev/null
+++ b/ports/mimxrt/boards/MIMXRT1060_EVK/MIMXRT1060_EVK.ld
@@ -0,0 +1 @@
+flash_size = 8M;
\ No newline at end of file
diff --git a/ports/mimxrt/boards/MIMXRT1060_EVK/evkmimxrt1060_flexspi_nor_config.h b/ports/mimxrt/boards/MIMXRT1060_EVK/evkmimxrt1060_flexspi_nor_config.h
index 8bb771fd8ad44..03bdac1f1cb82 100644
--- a/ports/mimxrt/boards/MIMXRT1060_EVK/evkmimxrt1060_flexspi_nor_config.h
+++ b/ports/mimxrt/boards/MIMXRT1060_EVK/evkmimxrt1060_flexspi_nor_config.h
@@ -210,34 +210,19 @@ typedef struct _FlexSPIConfig
 } flexspi_mem_config_t;
 
 /*  */
-#define NOR_CMD_INDEX_READ        CMD_INDEX_READ        //!< 0
-#define NOR_CMD_INDEX_READSTATUS  CMD_INDEX_READSTATUS  //!< 1
-#define NOR_CMD_INDEX_WRITEENABLE CMD_INDEX_WRITEENABLE //!< 2
-#define NOR_CMD_INDEX_ERASESECTOR 3                     //!< 3
-#define NOR_CMD_INDEX_PAGEPROGRAM CMD_INDEX_WRITE       //!< 4
-#define NOR_CMD_INDEX_CHIPERASE   5                     //!< 5
-#define NOR_CMD_INDEX_DUMMY       6                     //!< 6
-#define NOR_CMD_INDEX_ERASEBLOCK  7                     //!< 7
-
-#define NOR_CMD_LUT_SEQ_IDX_READ CMD_LUT_SEQ_IDX_READ //!< 0  READ LUT sequence id in lookupTable stored in config block
-#define NOR_CMD_LUT_SEQ_IDX_READSTATUS \
-    CMD_LUT_SEQ_IDX_READSTATUS //!< 1  Read Status LUT sequence id in lookupTable stored in config block
-#define NOR_CMD_LUT_SEQ_IDX_READSTATUS_XPI \
-    2 //!< 2  Read status DPI/QPI/OPI sequence id in lookupTable stored in config block
-#define NOR_CMD_LUT_SEQ_IDX_WRITEENABLE \
-    CMD_LUT_SEQ_IDX_WRITEENABLE //!< 3  Write Enable sequence id in lookupTable stored in config block
-#define NOR_CMD_LUT_SEQ_IDX_WRITEENABLE_XPI \
-    4 //!< 4  Write Enable DPI/QPI/OPI sequence id in lookupTable stored in config block
-#define NOR_CMD_LUT_SEQ_IDX_ERASESECTOR 5 //!< 5  Erase Sector sequence id in lookupTable stored in config block
-#define NOR_CMD_LUT_SEQ_IDX_ERASEBLOCK  8 //!< 8 Erase Block sequence id in lookupTable stored in config block
-#define NOR_CMD_LUT_SEQ_IDX_PAGEPROGRAM \
-    CMD_LUT_SEQ_IDX_WRITE                //!< 9  Program sequence id in lookupTable stored in config block
-#define NOR_CMD_LUT_SEQ_IDX_CHIPERASE 11 //!< 11 Chip Erase sequence in lookupTable id stored in config block
-#define NOR_CMD_LUT_SEQ_IDX_READ_SFDP 13 //!< 13 Read SFDP sequence in lookupTable id stored in config block
-#define NOR_CMD_LUT_SEQ_IDX_RESTORE_NOCMD \
-    14 //!< 14 Restore 0-4-4/0-8-8 mode sequence id in lookupTable stored in config block
-#define NOR_CMD_LUT_SEQ_IDX_EXIT_NOCMD \
-    15 //!< 15 Exit 0-4-4/0-8-8 mode sequence id in lookupTable stored in config blobk
+#define NOR_CMD_LUT_SEQ_IDX_READ_NORMAL 0
+#define NOR_CMD_LUT_SEQ_IDX_READSTATUSREG 1
+#define NOR_CMD_LUT_SEQ_IDX_READ_FAST_QUAD 2
+#define NOR_CMD_LUT_SEQ_IDX_WRITEENABLE 3
+#define NOR_CMD_LUT_SEQ_IDX_READSTATUS_XPI 4
+#define NOR_CMD_LUT_SEQ_IDX_ERASESECTOR 5
+#define NOR_CMD_LUT_SEQ_IDX_WRITESTATUSREG 6
+#define NOR_CMD_LUT_SEQ_IDX_PAGEPROGRAM_QUAD 7
+#define NOR_CMD_LUT_SEQ_IDX_READID 8
+#define NOR_CMD_LUT_SEQ_IDX_PAGEPROGRAM 9
+#define NOR_CMD_LUT_SEQ_IDX_ENTERQPI 10
+#define NOR_CMD_LUT_SEQ_IDX_CHIPERASE 11
+#define NOR_CMD_LUT_SEQ_IDX_EXITQPI 12
 
 /*
  *  Serial NOR configuration block
@@ -258,6 +243,9 @@ typedef struct _flexspi_nor_config
     uint32_t reserve2[11];          //!< Reserved for future use
 } flexspi_nor_config_t;
 
+#define FLASH_BUSY_STATUS_POL 0
+#define FLASH_BUSY_STATUS_OFFSET 0
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/ports/mimxrt/boards/MIMXRT1060_EVK/flash_config.c b/ports/mimxrt/boards/MIMXRT1060_EVK/flash_config.c
index 095a922e9efe1..3fa584b73af8e 100644
--- a/ports/mimxrt/boards/MIMXRT1060_EVK/flash_config.c
+++ b/ports/mimxrt/boards/MIMXRT1060_EVK/flash_config.c
@@ -35,9 +35,83 @@ const flexspi_nor_config_t qspiflash_config = {
             .sflashA1Size     = 8u * 1024u * 1024u,
             .lookupTable =
                 {
-                    // Read LUTs
+                    // 0 Read LUTs 0 -> 0
                     FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0xEB, RADDR_SDR, FLEXSPI_4PAD, 0x18),
                     FLEXSPI_LUT_SEQ(DUMMY_SDR, FLEXSPI_4PAD, 0x06, READ_SDR, FLEXSPI_4PAD, 0x04),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 1 Read status register -> 1
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x05, READ_SDR, FLEXSPI_1PAD, 0x01),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 2 Fast read quad mode - SDR
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x6B, RADDR_SDR, FLEXSPI_1PAD, 0x18),
+                    FLEXSPI_LUT_SEQ(DUMMY_SDR, FLEXSPI_4PAD, 0x08, READ_SDR, FLEXSPI_4PAD, 0x04),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 3 Write Enable -> 3
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x06, STOP, FLEXSPI_1PAD, 0),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 4 Read extend parameters
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x81, READ_SDR, FLEXSPI_1PAD, 0x04),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 5 Erase Sector -> 5
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x20, RADDR_SDR, FLEXSPI_1PAD, 24),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 6 Write Status Reg
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x01, WRITE_SDR, FLEXSPI_1PAD, 0x04),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 7 Page Program - quad mode (-> 9)
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x32, RADDR_SDR, FLEXSPI_1PAD, 0x18),
+                    FLEXSPI_LUT_SEQ(WRITE_SDR, FLEXSPI_4PAD, 0x04, STOP, FLEXSPI_1PAD, 0),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 8 Read ID
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x90, DUMMY_SDR, FLEXSPI_1PAD, 24),
+                    FLEXSPI_LUT_SEQ(READ_SDR, FLEXSPI_1PAD, 0x00, 0, 0, 0),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 9 Page Program - single mode -> 9
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x02, RADDR_SDR, FLEXSPI_1PAD, 24),
+                    FLEXSPI_LUT_SEQ(WRITE_SDR, FLEXSPI_1PAD, 0, 0, 0, 0),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 10 Enter QPI mode
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x35, STOP, FLEXSPI_1PAD, 0),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 11 Erase Chip
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x60, STOP, FLEXSPI_1PAD, 0),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 12 Exit QPI mode
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_4PAD, 0xF5, STOP, FLEXSPI_1PAD, 0),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
                 },
         },
     .pageSize           = 256u,
diff --git a/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.h b/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.h
index c9e6d8bf2c142..3974f9325715e 100644
--- a/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.h
+++ b/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.h
@@ -7,3 +7,4 @@
 #define MICROPY_HW_LED1_PIN (pin_GPIO_AD_B0_09)
 #define MICROPY_HW_LED_ON(pin) (mp_hal_pin_low(pin))
 #define MICROPY_HW_LED_OFF(pin) (mp_hal_pin_high(pin))
+#define BOARD_FLASH_CONFIG_HEADER_H "evkmimxrt1060_flexspi_nor_config.h"
diff --git a/ports/mimxrt/boards/MIMXRT1062.ld b/ports/mimxrt/boards/MIMXRT1062.ld
index 23520b5624733..5ab7e153329dc 100644
--- a/ports/mimxrt/boards/MIMXRT1062.ld
+++ b/ports/mimxrt/boards/MIMXRT1062.ld
@@ -1,8 +1,28 @@
+/* Memory configuration */
+flash_start         = 0x60000000;
+flash_end           = DEFINED(reserved_size) ? ((flash_start) + (flash_size - reserved_size)) : ((flash_start) + (flash_size));
+flash_config_start  = flash_start;
+flash_config_size   = 0x00001000;
+ivt_start           = 0x60001000;
+ivt_size            = 0x00001000;
+interrupts_start    = 0x60002000;
+interrupts_size     = 0x00000400;
+text_start          = 0x60002400;
+text_size           = ((((text_start) + 1M) + (4k - 1)) & ~(4k - 1)) - (text_start); /* reserve 1M for code but align on 4k boundary */
+vfs_start           = (text_start) + (text_size);
+vfs_size            = ((flash_end) - (vfs_start));
+itcm_start          = 0x00000000;
+itcm_size           = 0x00020000;
+dtcm_start          = 0x20000000;
+dtcm_size           = 0x00020000;
+ocrm_start          = 0x20200000;
+ocrm_size           = 0x000C0000;
+
 /* 32kiB stack. */
 __stack_size__ = 0x8000;
 _estack = __StackTop;
 _sstack = __StackLimit;
 
 /* Use second OCRAM bank for GC heap. */
-_gc_heap_start = ORIGIN(m_data2);
-_gc_heap_end = ORIGIN(m_data2) + LENGTH(m_data2);
+_gc_heap_start = ORIGIN(m_ocrm);
+_gc_heap_end = ORIGIN(m_ocrm) + LENGTH(m_ocrm);
diff --git a/ports/mimxrt/boards/MIMXRT1064.ld b/ports/mimxrt/boards/MIMXRT1064.ld
index bf37c21802581..236d984293e23 100644
--- a/ports/mimxrt/boards/MIMXRT1064.ld
+++ b/ports/mimxrt/boards/MIMXRT1064.ld
@@ -1,8 +1,28 @@
+/* Memory configuration */
+flash_start         = 0x60000000;
+flash_end           = DEFINED(reserved_size) ? ((flash_start) + (flash_size - reserved_size)) : ((flash_start) + (flash_size));
+flash_config_start  = flash_start;
+flash_config_size   = 0x00001000;
+ivt_start           = 0x60001000;
+ivt_size            = 0x00001000;
+interrupts_start    = 0x60002000;
+interrupts_size     = 0x00000400;
+text_start          = 0x60002400;
+text_size           = ((((text_start) + 1M) + (4k - 1)) & ~(4k - 1)) - (text_start); /* reserve 1M for code but align on 4k boundary */
+vfs_start           = (text_start) + (text_size);
+vfs_size            = ((flash_end) - (vfs_start));
+itcm_start          = 0x00000000;
+itcm_size           = 0x00020000;
+dtcm_start          = 0x20000000;
+dtcm_size           = 0x00020000;
+ocrm_start          = 0x20200000;
+ocrm_size           = 0x000C0000;
+
 /* 24kiB stack. */
 __stack_size__ = 0x6000;
 _estack = __StackTop;
 _sstack = __StackLimit;
 
 /* Use second OCRAM bank for GC heap. */
-_gc_heap_start = ORIGIN(m_data2);
-_gc_heap_end = ORIGIN(m_data2) + LENGTH(m_data2);
\ No newline at end of file
+_gc_heap_start = ORIGIN(m_ocrm);
+_gc_heap_end = ORIGIN(m_ocrm) + LENGTH(m_ocrm);
\ No newline at end of file
diff --git a/ports/mimxrt/boards/MIMXRT1064_EVK/MIMXRT1064_EVK.ld b/ports/mimxrt/boards/MIMXRT1064_EVK/MIMXRT1064_EVK.ld
new file mode 100644
index 0000000000000..fd1bf32ede778
--- /dev/null
+++ b/ports/mimxrt/boards/MIMXRT1064_EVK/MIMXRT1064_EVK.ld
@@ -0,0 +1 @@
+flash_size = 8M;
\ No newline at end of file
diff --git a/ports/mimxrt/boards/MIMXRT1064_EVK/evkmimxrt1064_flexspi_nor_config.h b/ports/mimxrt/boards/MIMXRT1064_EVK/evkmimxrt1064_flexspi_nor_config.h
index efdfe583fb82c..3c433f3be9960 100644
--- a/ports/mimxrt/boards/MIMXRT1064_EVK/evkmimxrt1064_flexspi_nor_config.h
+++ b/ports/mimxrt/boards/MIMXRT1064_EVK/evkmimxrt1064_flexspi_nor_config.h
@@ -210,35 +210,19 @@ typedef struct _FlexSPIConfig
 } flexspi_mem_config_t;
 
 /*  */
-#define NOR_CMD_INDEX_READ CMD_INDEX_READ               //!< 0
-#define NOR_CMD_INDEX_READSTATUS CMD_INDEX_READSTATUS   //!< 1
-#define NOR_CMD_INDEX_WRITEENABLE CMD_INDEX_WRITEENABLE //!< 2
-#define NOR_CMD_INDEX_ERASESECTOR 3                     //!< 3
-#define NOR_CMD_INDEX_PAGEPROGRAM CMD_INDEX_WRITE       //!< 4
-#define NOR_CMD_INDEX_CHIPERASE 5                       //!< 5
-#define NOR_CMD_INDEX_DUMMY 6                           //!< 6
-#define NOR_CMD_INDEX_ERASEBLOCK 7                      //!< 7
-
-#define NOR_CMD_LUT_SEQ_IDX_READ CMD_LUT_SEQ_IDX_READ //!< 0  READ LUT sequence id in lookupTable stored in config block
-#define NOR_CMD_LUT_SEQ_IDX_READSTATUS \
-    CMD_LUT_SEQ_IDX_READSTATUS //!< 1  Read Status LUT sequence id in lookupTable stored in config block
-#define NOR_CMD_LUT_SEQ_IDX_READSTATUS_XPI \
-    2 //!< 2  Read status DPI/QPI/OPI sequence id in lookupTable stored in config block
-#define NOR_CMD_LUT_SEQ_IDX_WRITEENABLE \
-    CMD_LUT_SEQ_IDX_WRITEENABLE //!< 3  Write Enable sequence id in lookupTable stored in config block
-#define NOR_CMD_LUT_SEQ_IDX_WRITEENABLE_XPI \
-    4 //!< 4  Write Enable DPI/QPI/OPI sequence id in lookupTable stored in config block
-#define NOR_CMD_LUT_SEQ_IDX_ERASESECTOR 5 //!< 5  Erase Sector sequence id in lookupTable stored in config block
-#define NOR_CMD_LUT_SEQ_IDX_ERASEBLOCK 8  //!< 8 Erase Block sequence id in lookupTable stored in config block
-#define NOR_CMD_LUT_SEQ_IDX_PAGEPROGRAM \
-    CMD_LUT_SEQ_IDX_WRITE                //!< 9  Program sequence id in lookupTable stored in config block
-#define NOR_CMD_LUT_SEQ_IDX_CHIPERASE 11 //!< 11 Chip Erase sequence in lookupTable id stored in config block
-#define NOR_CMD_LUT_SEQ_IDX_READ_SFDP 13 //!< 13 Read SFDP sequence in lookupTable id stored in config block
-#define NOR_CMD_LUT_SEQ_IDX_RESTORE_NOCMD \
-    14 //!< 14 Restore 0-4-4/0-8-8 mode sequence id in lookupTable stored in config block
-#define NOR_CMD_LUT_SEQ_IDX_EXIT_NOCMD \
-    15 //!< 15 Exit 0-4-4/0-8-8 mode sequence id in lookupTable stored in config blobk
-
+#define NOR_CMD_LUT_SEQ_IDX_READ_NORMAL 0
+#define NOR_CMD_LUT_SEQ_IDX_READSTATUSREG 1
+#define NOR_CMD_LUT_SEQ_IDX_READ_FAST_QUAD 2
+#define NOR_CMD_LUT_SEQ_IDX_WRITEENABLE 3
+#define NOR_CMD_LUT_SEQ_IDX_READSTATUS_XPI 4
+#define NOR_CMD_LUT_SEQ_IDX_ERASESECTOR 5
+#define NOR_CMD_LUT_SEQ_IDX_WRITESTATUSREG 6
+#define NOR_CMD_LUT_SEQ_IDX_PAGEPROGRAM_QUAD 7
+#define NOR_CMD_LUT_SEQ_IDX_READID 8
+#define NOR_CMD_LUT_SEQ_IDX_PAGEPROGRAM 9
+#define NOR_CMD_LUT_SEQ_IDX_ENTERQPI 10
+#define NOR_CMD_LUT_SEQ_IDX_CHIPERASE 11
+#define NOR_CMD_LUT_SEQ_IDX_EXITQPI 12
 /*
  *  Serial NOR configuration block
  */
@@ -258,6 +242,9 @@ typedef struct _flexspi_nor_config
     uint32_t reserve2[11];          //!< Reserved for future use
 } flexspi_nor_config_t;
 
+#define FLASH_BUSY_STATUS_POL 0
+#define FLASH_BUSY_STATUS_OFFSET 0
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/ports/mimxrt/boards/MIMXRT1064_EVK/flash_config.c b/ports/mimxrt/boards/MIMXRT1064_EVK/flash_config.c
index bfb1c2d59aa25..9338c6948ad56 100644
--- a/ports/mimxrt/boards/MIMXRT1064_EVK/flash_config.c
+++ b/ports/mimxrt/boards/MIMXRT1064_EVK/flash_config.c
@@ -36,9 +36,83 @@ const flexspi_nor_config_t qspiflash_config = {
             .sflashA1Size  = 8u * 1024u * 1024u,
             .lookupTable =
                 {
-                    // Read LUTs
+                    // 0 Read LUTs 0 -> 0
                     FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0xEB, RADDR_SDR, FLEXSPI_4PAD, 0x18),
                     FLEXSPI_LUT_SEQ(DUMMY_SDR, FLEXSPI_4PAD, 0x06, READ_SDR, FLEXSPI_4PAD, 0x04),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 1 Read status register -> 1
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x05, READ_SDR, FLEXSPI_1PAD, 0x01),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 2 Fast read quad mode - SDR
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x6B, RADDR_SDR, FLEXSPI_1PAD, 0x18),
+                    FLEXSPI_LUT_SEQ(DUMMY_SDR, FLEXSPI_4PAD, 0x08, READ_SDR, FLEXSPI_4PAD, 0x04),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 3 Write Enable -> 3
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x06, STOP, FLEXSPI_1PAD, 0),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 4 Read extend parameters
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x81, READ_SDR, FLEXSPI_1PAD, 0x04),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 5 Erase Sector -> 5
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x20, RADDR_SDR, FLEXSPI_1PAD, 24),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 6 Write Status Reg
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x01, WRITE_SDR, FLEXSPI_1PAD, 0x04),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 7 Page Program - quad mode (-> 9)
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x32, RADDR_SDR, FLEXSPI_1PAD, 0x18),
+                    FLEXSPI_LUT_SEQ(WRITE_SDR, FLEXSPI_4PAD, 0x04, STOP, FLEXSPI_1PAD, 0),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 8 Read ID
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x90, DUMMY_SDR, FLEXSPI_1PAD, 24),
+                    FLEXSPI_LUT_SEQ(READ_SDR, FLEXSPI_1PAD, 0x00, 0, 0, 0),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 9 Page Program - single mode -> 9
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x02, RADDR_SDR, FLEXSPI_1PAD, 24),
+                    FLEXSPI_LUT_SEQ(WRITE_SDR, FLEXSPI_1PAD, 0, 0, 0, 0),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 10 Enter QPI mode
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x35, STOP, FLEXSPI_1PAD, 0),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 11 Erase Chip
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x60, STOP, FLEXSPI_1PAD, 0),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 12 Exit QPI mode
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_4PAD, 0xF5, STOP, FLEXSPI_1PAD, 0),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
                 },
         },
     .pageSize           = 256u,
diff --git a/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.h b/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.h
index 3eddb4102142e..01e2e10bb53c3 100644
--- a/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.h
+++ b/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.h
@@ -6,3 +6,4 @@
 #define MICROPY_HW_LED1_PIN (pin_GPIO_AD_B0_09)
 #define MICROPY_HW_LED_ON(pin) (mp_hal_pin_low(pin))
 #define MICROPY_HW_LED_OFF(pin) (mp_hal_pin_high(pin))
+#define BOARD_FLASH_CONFIG_HEADER_H "evkmimxrt1064_flexspi_nor_config.h"
diff --git a/ports/mimxrt/boards/TEENSY40/TEENSY40.ld b/ports/mimxrt/boards/TEENSY40/TEENSY40.ld
new file mode 100644
index 0000000000000..a3b696db661a3
--- /dev/null
+++ b/ports/mimxrt/boards/TEENSY40/TEENSY40.ld
@@ -0,0 +1,2 @@
+flash_size = 2M;
+reserved_size = 4K;
\ No newline at end of file
diff --git a/ports/mimxrt/boards/TEENSY40/flash_config.c b/ports/mimxrt/boards/TEENSY40/flash_config.c
index 39a6b910886c9..7a63cf825d5f2 100644
--- a/ports/mimxrt/boards/TEENSY40/flash_config.c
+++ b/ports/mimxrt/boards/TEENSY40/flash_config.c
@@ -32,20 +32,113 @@ const flexspi_nor_config_t qspiflash_config = {
             .readSampleClkSrc = kFlexSPIReadSampleClk_LoopbackFromDqsPad,
             .csHoldTime       = 3u,
             .csSetupTime      = 3u,
+
+            .busyOffset = FLASH_BUSY_STATUS_OFFSET,     // Status bit 0 indicates busy.
+            .busyBitPolarity = FLASH_BUSY_STATUS_POL,   // Busy when the bit is 1.
+
+            .deviceModeCfgEnable = 1u,
+            .deviceModeType = kDeviceConfigCmdType_QuadEnable,
+            .deviceModeSeq = {
+                .seqId = 4u,
+                .seqNum = 1u,
+            },
+            .deviceModeArg = 0x0200,
+            .configCmdEnable = 1u,
+            .configModeType[0] = kDeviceConfigCmdType_Generic,
+            .configCmdSeqs[0] = {
+                .seqId = 2u,
+                .seqNum = 1u,
+            },
+            .deviceType = kFlexSpiDeviceType_SerialNOR,
             // Enable DDR mode, Wordaddassable, Safe configuration, Differential clock
             .sflashPadType = kSerialFlash_4Pads,
-            .serialClkFreq = kFlexSpiSerialClk_100MHz,
+            .serialClkFreq = kFlexSpiSerialClk_60MHz,
             .sflashA1Size  = 2u * 1024u * 1024u,
             .lookupTable =
                 {
-                    // Read LUTs
+                    // 0 Read LUTs 0 -> 0
                     FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0xEB, RADDR_SDR, FLEXSPI_4PAD, 0x18),
                     FLEXSPI_LUT_SEQ(DUMMY_SDR, FLEXSPI_4PAD, 0x06, READ_SDR, FLEXSPI_4PAD, 0x04),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 1 Read status register -> 1
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x05, READ_SDR, FLEXSPI_1PAD, 0x01),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 2 Fast read quad mode - SDR
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x6B, RADDR_SDR, FLEXSPI_1PAD, 0x18),
+                    FLEXSPI_LUT_SEQ(DUMMY_SDR, FLEXSPI_4PAD, 0x08, READ_SDR, FLEXSPI_4PAD, 0x04),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 3 Write Enable -> 3
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x06, STOP, FLEXSPI_1PAD, 0),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 4 Read extend parameters
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x81, READ_SDR, FLEXSPI_1PAD, 0x04),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 5 Erase Sector -> 5
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x20, RADDR_SDR, FLEXSPI_1PAD, 24),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 6 Write Status Reg
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x01, WRITE_SDR, FLEXSPI_1PAD, 0x04),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 7 Page Program - quad mode (-> 9)
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x32, RADDR_SDR, FLEXSPI_1PAD, 0x18),
+                    FLEXSPI_LUT_SEQ(WRITE_SDR, FLEXSPI_4PAD, 0x04, STOP, FLEXSPI_1PAD, 0),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 8 Read ID
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x90, DUMMY_SDR, FLEXSPI_1PAD, 24),
+                    FLEXSPI_LUT_SEQ(READ_SDR, FLEXSPI_1PAD, 0x00, 0, 0, 0),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 9 Page Program - single mode -> 9
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x02, RADDR_SDR, FLEXSPI_1PAD, 24),
+                    FLEXSPI_LUT_SEQ(WRITE_SDR, FLEXSPI_1PAD, 0, 0, 0, 0),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 10 Enter QPI mode
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x35, STOP, FLEXSPI_1PAD, 0),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 11 Erase Chip
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x60, STOP, FLEXSPI_1PAD, 0),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 12 Exit QPI mode
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_4PAD, 0xF5, STOP, FLEXSPI_1PAD, 0),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
                 },
         },
     .pageSize           = 256u,
     .sectorSize         = 4u * 1024u,
-    .blockSize          = 256u * 1024u,
+    .ipcmdSerialClkFreq = kFlexSpiSerialClk_30MHz,
+    .blockSize          = 0x00010000,
     .isUniformBlockSize = false,
 };
 #endif /* XIP_BOOT_HEADER_ENABLE */
diff --git a/ports/mimxrt/boards/TEENSY40/mpconfigboard.h b/ports/mimxrt/boards/TEENSY40/mpconfigboard.h
index e3d7c6a12943f..c6f11b51d191d 100644
--- a/ports/mimxrt/boards/TEENSY40/mpconfigboard.h
+++ b/ports/mimxrt/boards/TEENSY40/mpconfigboard.h
@@ -7,3 +7,4 @@
 #define MICROPY_HW_LED1_PIN (pin_GPIO_B0_03)
 #define MICROPY_HW_LED_ON(pin) (mp_hal_pin_high(pin))
 #define MICROPY_HW_LED_OFF(pin) (mp_hal_pin_low(pin))
+#define BOARD_FLASH_CONFIG_HEADER_H "teensy40_flexspi_nor_config.h"
diff --git a/ports/mimxrt/boards/TEENSY40/teensy40_flexspi_nor_config.h b/ports/mimxrt/boards/TEENSY40/teensy40_flexspi_nor_config.h
index 2c7bf48b62d81..445a0baccc62a 100644
--- a/ports/mimxrt/boards/TEENSY40/teensy40_flexspi_nor_config.h
+++ b/ports/mimxrt/boards/TEENSY40/teensy40_flexspi_nor_config.h
@@ -28,7 +28,7 @@
 /* FLEXSPI Feature related definitions */
 #define FLEXSPI_FEATURE_HAS_PARALLEL_MODE 1
 
-/* Lookup table related defintions */
+/* Lookup table related definitions */
 #define CMD_INDEX_READ 0
 #define CMD_INDEX_READSTATUS 1
 #define CMD_INDEX_WRITEENABLE 2
@@ -37,6 +37,7 @@
 #define CMD_LUT_SEQ_IDX_READ 0
 #define CMD_LUT_SEQ_IDX_READSTATUS 1
 #define CMD_LUT_SEQ_IDX_WRITEENABLE 3
+#define CMD_LUT_SEQ_IDX_ERASE 5
 #define CMD_LUT_SEQ_IDX_WRITE 9
 
 #define CMD_SDR 0x01
@@ -212,34 +213,19 @@ typedef struct _FlexSPIConfig
 } flexspi_mem_config_t;
 
 /*  */
-#define NOR_CMD_INDEX_READ CMD_INDEX_READ               //!< 0
-#define NOR_CMD_INDEX_READSTATUS CMD_INDEX_READSTATUS   //!< 1
-#define NOR_CMD_INDEX_WRITEENABLE CMD_INDEX_WRITEENABLE //!< 2
-#define NOR_CMD_INDEX_ERASESECTOR 3                     //!< 3
-#define NOR_CMD_INDEX_PAGEPROGRAM CMD_INDEX_WRITE       //!< 4
-#define NOR_CMD_INDEX_CHIPERASE 5                       //!< 5
-#define NOR_CMD_INDEX_DUMMY 6                           //!< 6
-#define NOR_CMD_INDEX_ERASEBLOCK 7                      //!< 7
-
-#define NOR_CMD_LUT_SEQ_IDX_READ CMD_LUT_SEQ_IDX_READ //!< 0  READ LUT sequence id in lookupTable stored in config block
-#define NOR_CMD_LUT_SEQ_IDX_READSTATUS \
-    CMD_LUT_SEQ_IDX_READSTATUS //!< 1  Read Status LUT sequence id in lookupTable stored in config block
-#define NOR_CMD_LUT_SEQ_IDX_READSTATUS_XPI \
-    2 //!< 2  Read status DPI/QPI/OPI sequence id in lookupTable stored in config block
-#define NOR_CMD_LUT_SEQ_IDX_WRITEENABLE \
-    CMD_LUT_SEQ_IDX_WRITEENABLE //!< 3  Write Enable sequence id in lookupTable stored in config block
-#define NOR_CMD_LUT_SEQ_IDX_WRITEENABLE_XPI \
-    4 //!< 4  Write Enable DPI/QPI/OPI sequence id in lookupTable stored in config block
-#define NOR_CMD_LUT_SEQ_IDX_ERASESECTOR 5 //!< 5  Erase Sector sequence id in lookupTable stored in config block
-#define NOR_CMD_LUT_SEQ_IDX_ERASEBLOCK 8  //!< 8 Erase Block sequence id in lookupTable stored in config block
-#define NOR_CMD_LUT_SEQ_IDX_PAGEPROGRAM \
-    CMD_LUT_SEQ_IDX_WRITE                //!< 9  Program sequence id in lookupTable stored in config block
-#define NOR_CMD_LUT_SEQ_IDX_CHIPERASE 11 //!< 11 Chip Erase sequence in lookupTable id stored in config block
-#define NOR_CMD_LUT_SEQ_IDX_READ_SFDP 13 //!< 13 Read SFDP sequence in lookupTable id stored in config block
-#define NOR_CMD_LUT_SEQ_IDX_RESTORE_NOCMD \
-    14 //!< 14 Restore 0-4-4/0-8-8 mode sequence id in lookupTable stored in config block
-#define NOR_CMD_LUT_SEQ_IDX_EXIT_NOCMD \
-    15 //!< 15 Exit 0-4-4/0-8-8 mode sequence id in lookupTable stored in config blobk
+#define NOR_CMD_LUT_SEQ_IDX_READ_NORMAL 0
+#define NOR_CMD_LUT_SEQ_IDX_READSTATUSREG 1
+#define NOR_CMD_LUT_SEQ_IDX_READ_FAST_QUAD 2
+#define NOR_CMD_LUT_SEQ_IDX_WRITEENABLE 3
+#define NOR_CMD_LUT_SEQ_IDX_READSTATUS_XPI 4
+#define NOR_CMD_LUT_SEQ_IDX_ERASESECTOR 5
+#define NOR_CMD_LUT_SEQ_IDX_WRITESTATUSREG 6
+#define NOR_CMD_LUT_SEQ_IDX_PAGEPROGRAM_QUAD 7
+#define NOR_CMD_LUT_SEQ_IDX_READID 8
+#define NOR_CMD_LUT_SEQ_IDX_PAGEPROGRAM 9
+#define NOR_CMD_LUT_SEQ_IDX_ENTERQPI 10
+#define NOR_CMD_LUT_SEQ_IDX_CHIPERASE 11
+#define NOR_CMD_LUT_SEQ_IDX_EXITQPI 12
 
 /*
  *  Serial NOR configuration block
@@ -260,6 +246,9 @@ typedef struct _flexspi_nor_config
     uint32_t reserve2[11];          //!< Reserved for future use
 } flexspi_nor_config_t;
 
+#define FLASH_BUSY_STATUS_POL 0
+#define FLASH_BUSY_STATUS_OFFSET 0
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/ports/mimxrt/boards/common.ld b/ports/mimxrt/boards/common.ld
new file mode 100644
index 0000000000000..e5d91f1191f16
--- /dev/null
+++ b/ports/mimxrt/boards/common.ld
@@ -0,0 +1,262 @@
+/*
+** ###################################################################
+** Linker script inspired by NXP linker script for MIMXRT10xx
+** 
+** Copyright for original linker script:
+**     Copyright 2016 Freescale Semiconductor, Inc.
+**     Copyright 2016-2018 NXP
+**     SPDX-License-Identifier: BSD-3-Clause
+**
+**     http:                 www.nxp.com
+**     mail:                 support@nxp.com
+**
+** Integrated ideas from CircuitPython:
+** SPDX-License-Identifier: The MIT License (MIT)
+** SPDX-FileCopyrightText: Copyright (c) 2020 Scott Shawcroft (tannewt)
+**
+** Copyright (c) 2021 Philipp Ebensberger
+**
+** ###################################################################
+*/
+
+/* Entry Point */
+ENTRY(Reset_Handler)
+
+HEAP_SIZE  = DEFINED(__heap_size__)  ? __heap_size__  : 0x0400;
+STACK_SIZE = DEFINED(__stack_size__) ? __stack_size__ : 0x0400;
+
+/* Reserved Area
+ * Users can create a reserved area at the end of the flash memory via 
+ * 'reserved_size' variable. The size of the reserved area should be a multiple
+ * of the sector size of the flash memory!
+ */
+reserved_size = DEFINED(reserved_size) ? reserved_size : 0k;
+
+/* Specify the memory areas */
+MEMORY
+{
+  m_flash_config (RX) : ORIGIN = flash_config_start,    LENGTH = flash_config_size
+  m_ivt          (RX) : ORIGIN = ivt_start,             LENGTH = ivt_size
+  m_interrupts   (RX) : ORIGIN = interrupts_start,      LENGTH = interrupts_size
+  m_text         (RX) : ORIGIN = text_start,            LENGTH = text_size
+  m_vfs          (RX) : ORIGIN = vfs_start,             LENGTH = vfs_size
+  /* Teensy uses the last bit of flash for recovery. */
+  m_reserved     (RX) : ORIGIN = (vfs_start + vfs_size), LENGTH = reserved_size  
+  m_itcm         (RX) : ORIGIN = itcm_start,            LENGTH = itcm_size
+  m_dtcm         (RW) : ORIGIN = dtcm_start,            LENGTH = dtcm_size
+  m_ocrm         (RW) : ORIGIN = ocrm_start,            LENGTH = ocrm_size
+}
+
+/* Define output sections */
+SECTIONS
+{
+  __flash_start = flash_start;
+  __vfs_start = ORIGIN(m_vfs);
+  __vfs_end = __vfs_start + LENGTH(m_vfs);  
+  
+  .flash_config :
+  {
+    . = ALIGN(4);
+    __FLASH_BASE = .;
+    KEEP(* (.boot_hdr.conf))     /* flash config section */
+    . = ALIGN(4);
+  } > m_flash_config
+
+  ivt_begin = ORIGIN(m_flash_config) + LENGTH(m_flash_config);
+
+  .ivt : AT(ivt_begin)
+  {
+    . = ALIGN(4);
+    KEEP(* (.boot_hdr.ivt))           /* ivt section */
+    KEEP(* (.boot_hdr.boot_data))     /* boot section */
+    KEEP(* (.boot_hdr.dcd_data))      /* dcd section */
+    . = ALIGN(4);
+  } > m_ivt
+
+  /* The startup code goes first into internal RAM */
+  .interrupts :
+  {
+    __VECTOR_TABLE = .;
+    . = ALIGN(4);
+    KEEP(*(.isr_vector))     /* Startup code */
+    . = ALIGN(4);
+  } > m_interrupts
+
+  __VECTOR_RAM = __VECTOR_TABLE;
+  __RAM_VECTOR_TABLE_SIZE_BYTES = 0x0;
+
+  /* The program code and other data goes into internal RAM */
+  .text :
+  {
+    . = ALIGN(4);
+    *(EXCLUDE_FILE(*fsl_flexspi.o) .text*) /* .text* sections (code) */
+    *(.rodata)               /* .rodata sections (constants, strings, etc.) */
+    *(.rodata*)              /* .rodata* sections (constants, strings, etc.) */
+    *(.glue_7)               /* glue arm to thumb code */
+    *(.glue_7t)              /* glue thumb to arm code */
+    *(.eh_frame)
+    KEEP (*(.init))
+    KEEP (*(.fini))
+    . = ALIGN(4);
+  } > m_text
+
+  .ARM.extab :
+  {
+    *(.ARM.extab* .gnu.linkonce.armextab.*)
+  } > m_text
+
+  .ARM :
+  {
+    __exidx_start = .;
+    *(.ARM.exidx*)
+    __exidx_end = .;
+  } > m_text
+
+ .ctors :
+  {
+    __CTOR_LIST__ = .;
+    /* gcc uses crtbegin.o to find the start of
+       the constructors, so we make sure it is
+       first.  Because this is a wildcard, it
+       doesn't matter if the user does not
+       actually link against crtbegin.o; the
+       linker won't look for a file to match a
+       wildcard.  The wildcard also means that it
+       doesn't matter which directory crtbegin.o
+       is in.  */
+    KEEP (*crtbegin.o(.ctors))
+    KEEP (*crtbegin?.o(.ctors))
+    /* We don't want to include the .ctor section from
+       from the crtend.o file until after the sorted ctors.
+       The .ctor section from the crtend file contains the
+       end of ctors marker and it must be last */
+    KEEP (*(EXCLUDE_FILE(*crtend?.o *crtend.o) .ctors))
+    KEEP (*(SORT(.ctors.*)))
+    KEEP (*(.ctors))
+    __CTOR_END__ = .;
+  } > m_text
+
+  .dtors :
+  {
+    __DTOR_LIST__ = .;
+    KEEP (*crtbegin.o(.dtors))
+    KEEP (*crtbegin?.o(.dtors))
+    KEEP (*(EXCLUDE_FILE(*crtend?.o *crtend.o) .dtors))
+    KEEP (*(SORT(.dtors.*)))
+    KEEP (*(.dtors))
+    __DTOR_END__ = .;
+  } > m_text
+
+  .preinit_array :
+  {
+    PROVIDE_HIDDEN (__preinit_array_start = .);
+    KEEP (*(.preinit_array*))
+    PROVIDE_HIDDEN (__preinit_array_end = .);
+  } > m_text
+
+  .init_array :
+  {
+    PROVIDE_HIDDEN (__init_array_start = .);
+    KEEP (*(SORT(.init_array.*)))
+    KEEP (*(.init_array*))
+    PROVIDE_HIDDEN (__init_array_end = .);
+  } > m_text
+
+  .fini_array :
+  {
+    PROVIDE_HIDDEN (__fini_array_start = .);
+    KEEP (*(SORT(.fini_array.*)))
+    KEEP (*(.fini_array*))
+    PROVIDE_HIDDEN (__fini_array_end = .);
+  } > m_text
+  
+  __etext = .;    /* define a global symbol at end of code */
+  __DATA_ROM = .; /* Symbol is used by startup for data initialization */
+
+  .data : AT(__DATA_ROM)
+  {
+    . = ALIGN(4);
+    __DATA_RAM = .;
+    __data_start__ = .;      /* create a global symbol at data start */
+    *(m_usb_dma_init_data)
+    *(.data)                 /* .data sections */
+    *(.data*)                /* .data* sections */
+    KEEP(*(.jcr*))
+    . = ALIGN(4);
+    __data_end__ = .;        /* define a global symbol at data end */
+  } > m_dtcm
+
+  __RAM_FUNCTIONS_ROM = __DATA_ROM + (__data_end__ - __data_start__);
+  .ram_functions : AT(__RAM_FUNCTIONS_ROM)
+  {
+    . = ALIGN(4);
+    __ram_function_start__ = .;
+    *fsl_flexspi.o(.text*)
+    *(.ram_functions*)
+    . = ALIGN(4);
+    __ram_function_end__ = .;
+  } > m_itcm  
+
+  __NDATA_ROM = __DATA_ROM + (__ram_function_end__ - __data_start__);
+  .ncache.init : AT(__NDATA_ROM)
+  {
+    __noncachedata_start__ = .;   /* create a global symbol at ncache data start */
+    *(NonCacheable.init)
+    . = ALIGN(4);
+    __noncachedata_init_end__ = .;   /* create a global symbol at initialized ncache data end */
+  } > m_dtcm
+  . = __noncachedata_init_end__;
+  .ncache :
+  {
+    *(NonCacheable)
+    . = ALIGN(4);
+    __noncachedata_end__ = .;     /* define a global symbol at ncache data end */
+  } > m_dtcm
+
+  __DATA_END = __NDATA_ROM + (__noncachedata_init_end__ - __noncachedata_start__);
+  text_end = ORIGIN(m_text) + LENGTH(m_text);
+  ASSERT(__DATA_END <= text_end, "region m_text overflowed with text and data")
+
+  /* Uninitialized data section */
+  .bss :
+  {
+    /* This is used by the startup in order to initialize the .bss section */
+    . = ALIGN(4);
+    __START_BSS = .;
+    __bss_start__ = .;
+    *(m_usb_dma_noninit_data)
+    *(.bss)
+    *(.bss*)
+    *(COMMON)
+    . = ALIGN(4);
+    __bss_end__ = .;
+    __END_BSS = .;
+  } > m_dtcm
+
+  .heap :
+  {
+    . = ALIGN(8);
+    __end__ = .;
+    PROVIDE(end = .);
+    __HeapBase = .;
+    . += HEAP_SIZE;
+    __HeapLimit = .;
+    __heap_limit = .; /* Add for _sbrk */
+  } > m_dtcm
+
+  .stack :
+  {
+    . = ALIGN(8);
+    . += STACK_SIZE;
+  } > m_dtcm
+
+  /* Initializes stack on the end of block */
+  __StackTop   = ORIGIN(m_dtcm) + LENGTH(m_dtcm);
+  __StackLimit = __StackTop - STACK_SIZE;
+  PROVIDE(__stack = __StackTop);
+
+  .ARM.attributes 0 : { *(.ARM.attributes) }
+
+  ASSERT(__StackLimit >= __HeapLimit, "region m_dtcm overflowed with stack and heap")
+}
+
diff --git a/ports/mimxrt/hal/flexspi_nor_flash.c b/ports/mimxrt/hal/flexspi_nor_flash.c
new file mode 100644
index 0000000000000..a70d234d6e4a9
--- /dev/null
+++ b/ports/mimxrt/hal/flexspi_nor_flash.c
@@ -0,0 +1,219 @@
+/*
+ * Based largely on examples provided by NXP:
+ *
+ * Copyright (c) 2016, Freescale Semiconductor, Inc.
+ * Copyright 2016-2020 NXP
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
+ * Port-specific extensions and adaptions:
+ *
+ * The MIT License (MIT)
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * Copyright (c) 2021 Damien P. George
+ * Copyright (c) 2021 Philipp Ebensberger
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+#include <assert.h>
+#include "fsl_common.h"
+#include "flexspi_nor_flash.h"
+
+void flexspi_nor_reset(FLEXSPI_Type *base) __attribute__((section(".ram_functions")));
+void flexspi_nor_reset(FLEXSPI_Type *base) {
+    // Using content of FLEXSPI_SoftwareReset directly to prevent issues when compiler does not inline function
+    base->MCR0 |= FLEXSPI_MCR0_SWRESET_MASK;
+    while (base->MCR0 & FLEXSPI_MCR0_SWRESET_MASK)
+    {
+    }
+}
+
+status_t flexspi_nor_write_enable(FLEXSPI_Type *base, uint32_t baseAddr) __attribute__((section(".ram_functions")));
+status_t flexspi_nor_write_enable(FLEXSPI_Type *base, uint32_t baseAddr) {
+    flexspi_transfer_t flashXfer;
+    status_t status;
+
+    /* Write neable */
+    flashXfer.deviceAddress = baseAddr;
+    flashXfer.port = kFLEXSPI_PortA1;
+    flashXfer.cmdType = kFLEXSPI_Command;
+    flashXfer.SeqNumber = 1;
+    flashXfer.seqIndex = NOR_CMD_LUT_SEQ_IDX_WRITEENABLE;
+
+    status = FLEXSPI_TransferBlocking(base, &flashXfer);
+
+    return status;
+}
+
+status_t flexspi_nor_wait_bus_busy(FLEXSPI_Type *base) __attribute__((section(".ram_functions"))) ;
+status_t flexspi_nor_wait_bus_busy(FLEXSPI_Type *base) {
+    /* Wait status ready. */
+    bool isBusy;
+    uint32_t readValue;
+    status_t status;
+    flexspi_transfer_t flashXfer;
+
+    flashXfer.deviceAddress = 0;
+    flashXfer.port = kFLEXSPI_PortA1;
+    flashXfer.cmdType = kFLEXSPI_Read;
+    flashXfer.SeqNumber = 1;
+    flashXfer.seqIndex = NOR_CMD_LUT_SEQ_IDX_READSTATUSREG;
+    flashXfer.data = &readValue;
+    flashXfer.dataSize = 1;
+
+    do {
+        status = FLEXSPI_TransferBlocking(base, &flashXfer);
+
+        if (status != kStatus_Success) {
+            return status;
+        }
+        if (FLASH_BUSY_STATUS_POL) {
+            if (readValue & (1U << FLASH_BUSY_STATUS_OFFSET)) {
+                isBusy = false;
+            } else {
+                isBusy = true;
+            }
+        } else {
+            if (readValue & (1U << FLASH_BUSY_STATUS_OFFSET)) {
+                isBusy = true;
+            } else {
+                isBusy = false;
+            }
+        }
+    } while (isBusy);
+
+    return status;
+}
+
+status_t flexspi_nor_enable_quad_mode(FLEXSPI_Type *base) __attribute__((section(".ram_functions"))) ;
+status_t flexspi_nor_enable_quad_mode(FLEXSPI_Type *base) {
+    flexspi_transfer_t flashXfer;
+    status_t status;
+    uint32_t writeValue = 0x40;
+
+    /* Write neable */
+    status = flexspi_nor_write_enable(base, 0);
+
+    if (status != kStatus_Success) {
+        return status;
+    }
+
+    /* Enable quad mode. */
+    flashXfer.deviceAddress = 0;
+    flashXfer.port = kFLEXSPI_PortA1;
+    flashXfer.cmdType = kFLEXSPI_Write;
+    flashXfer.SeqNumber = 1;
+    flashXfer.seqIndex = NOR_CMD_LUT_SEQ_IDX_WRITESTATUSREG;
+    flashXfer.data = &writeValue;
+    flashXfer.dataSize = 1;
+
+    status = FLEXSPI_TransferBlocking(base, &flashXfer);
+    if (status != kStatus_Success) {
+        return status;
+    }
+
+    status = flexspi_nor_wait_bus_busy(base);
+
+    return status;
+}
+
+status_t flexspi_nor_flash_erase_sector(FLEXSPI_Type *base, uint32_t address) __attribute__((section(".ram_functions"))) ;
+status_t flexspi_nor_flash_erase_sector(FLEXSPI_Type *base, uint32_t address) {
+    status_t status;
+    flexspi_transfer_t flashXfer;
+
+    /* Write enable */
+    status = flexspi_nor_write_enable(base, address);
+
+    if (status != kStatus_Success) {
+        return status;
+    }
+
+    /* Erase sector */
+    flashXfer.deviceAddress = address;
+    flashXfer.port = kFLEXSPI_PortA1;
+    flashXfer.cmdType = kFLEXSPI_Command;
+    flashXfer.SeqNumber = 1;
+    flashXfer.seqIndex = NOR_CMD_LUT_SEQ_IDX_ERASESECTOR;
+    status = FLEXSPI_TransferBlocking(base, &flashXfer);
+
+    if (status != kStatus_Success) {
+        return status;
+    }
+
+    status = flexspi_nor_wait_bus_busy(base);
+
+    flexspi_nor_reset(base);
+
+    return status;
+}
+
+status_t flexspi_nor_flash_page_program(FLEXSPI_Type *base, uint32_t dstAddr, const uint32_t *src, uint32_t size) __attribute__((section(".ram_functions"))) ;
+status_t flexspi_nor_flash_page_program(FLEXSPI_Type *base, uint32_t dstAddr, const uint32_t *src, uint32_t size) {
+    status_t status;
+    flexspi_transfer_t flashXfer;
+
+    /* Write enable */
+    status = flexspi_nor_write_enable(base, dstAddr);
+
+    if (status != kStatus_Success) {
+        return status;
+    }
+
+    /* Prepare page program command */
+    flashXfer.deviceAddress = dstAddr;
+    flashXfer.port = kFLEXSPI_PortA1;
+    flashXfer.cmdType = kFLEXSPI_Write;
+    flashXfer.SeqNumber = 1;
+    flashXfer.seqIndex = NOR_CMD_LUT_SEQ_IDX_PAGEPROGRAM_QUAD;
+    flashXfer.data = (uint32_t *) src;
+    flashXfer.dataSize = size;
+    status = FLEXSPI_TransferBlocking(base, &flashXfer);
+
+    if (status != kStatus_Success) {
+        return status;
+    }
+
+    status = flexspi_nor_wait_bus_busy(base);
+
+    flexspi_nor_reset(FLEXSPI);
+
+    return status;
+}
+
+status_t flexspi_nor_get_vendor_id(FLEXSPI_Type *base, uint8_t *vendorId) __attribute__((section(".ram_functions"))) ;
+status_t flexspi_nor_get_vendor_id(FLEXSPI_Type *base, uint8_t *vendorId) {
+    uint32_t temp;
+    flexspi_transfer_t flashXfer;
+    flashXfer.deviceAddress = 0;
+    flashXfer.port = kFLEXSPI_PortA1;
+    flashXfer.cmdType = kFLEXSPI_Read;
+    flashXfer.SeqNumber = 1;
+    flashXfer.seqIndex = NOR_CMD_LUT_SEQ_IDX_READID;
+    flashXfer.data = &temp;
+    flashXfer.dataSize = 2;
+
+    status_t status = FLEXSPI_TransferBlocking(base, &flashXfer);
+
+    *vendorId = temp;
+
+    return status;
+}
diff --git a/ports/mimxrt/hal/flexspi_nor_flash.h b/ports/mimxrt/hal/flexspi_nor_flash.h
new file mode 100644
index 0000000000000..43cd7efdc7941
--- /dev/null
+++ b/ports/mimxrt/hal/flexspi_nor_flash.h
@@ -0,0 +1,42 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013, 2014 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+#ifndef MICROPY_INCLUDED_MIMXRT_HAL_FLEXSPI_NOR_FLASH_H
+#define MICROPY_INCLUDED_MIMXRT_HAL_FLEXSPI_NOR_FLASH_H
+
+#include "fsl_flexspi.h"
+#include "mpconfigport.h"
+#include BOARD_FLASH_CONFIG_HEADER_H
+
+// Defined in boards flash_config.c
+extern flexspi_nor_config_t qspiflash_config;
+
+status_t flexspi_nor_get_vendor_id(FLEXSPI_Type *base, uint8_t *vendorId);
+status_t flexspi_nor_init(void);
+void flexspi_nor_update_lut(void);
+status_t flexspi_nor_flash_erase_sector(FLEXSPI_Type *base, uint32_t address);
+status_t flexspi_nor_flash_page_program(FLEXSPI_Type *base, uint32_t address, const uint32_t *src, uint32_t size);
+
+#endif // MICROPY_INCLUDED_MIMXRT_HAL_FLEXSPI_NOR_FLASH_H
diff --git a/ports/mimxrt/main.c b/ports/mimxrt/main.c
index 387c96ef33a47..76fd7ef76c181 100644
--- a/ports/mimxrt/main.c
+++ b/ports/mimxrt/main.c
@@ -30,6 +30,7 @@
 #include "py/gc.h"
 #include "py/mperrno.h"
 #include "py/stackctrl.h"
+#include "lib/mp-readline/readline.h"
 #include "lib/utils/gchelper.h"
 #include "lib/utils/pyexec.h"
 #include "ticks.h"
@@ -57,6 +58,24 @@ int main(void) {
         mp_obj_list_append(mp_sys_path, MP_OBJ_NEW_QSTR(MP_QSTR_));
         mp_obj_list_init(MP_OBJ_TO_PTR(mp_sys_argv), 0);
 
+        // Initialise sub-systems.
+        readline_init0();
+
+        // Execute _boot.py to set up the filesystem.
+        pyexec_frozen_module("_boot.py");
+
+        // Execute user scripts.
+        int ret = pyexec_file_if_exists("boot.py");
+        if (ret & PYEXEC_FORCED_EXIT) {
+            goto soft_reset_exit;
+        }
+        if (pyexec_mode_kind == PYEXEC_MODE_FRIENDLY_REPL) {
+            ret = pyexec_file_if_exists("main.py");
+            if (ret & PYEXEC_FORCED_EXIT) {
+                goto soft_reset_exit;
+            }
+        }
+
         for (;;) {
             if (pyexec_mode_kind == PYEXEC_MODE_RAW_REPL) {
                 if (pyexec_raw_repl() != 0) {
@@ -69,6 +88,7 @@ int main(void) {
             }
         }
 
+    soft_reset_exit:
         mp_printf(MP_PYTHON_PRINTER, "MPY: soft reboot\n");
         gc_sweep_all();
         mp_deinit();
@@ -83,19 +103,6 @@ void gc_collect(void) {
     gc_collect_end();
 }
 
-mp_lexer_t *mp_lexer_new_from_file(const char *filename) {
-    mp_raise_OSError(MP_ENOENT);
-}
-
-mp_import_stat_t mp_import_stat(const char *path) {
-    return MP_IMPORT_STAT_NO_EXIST;
-}
-
-mp_obj_t mp_builtin_open(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs) {
-    return mp_const_none;
-}
-MP_DEFINE_CONST_FUN_OBJ_KW(mp_builtin_open_obj, 1, mp_builtin_open);
-
 void nlr_jump_fail(void *val) {
     for (;;) {
     }
diff --git a/ports/mimxrt/mimxrt_flash.c b/ports/mimxrt/mimxrt_flash.c
new file mode 100644
index 0000000000000..6b89bfa532f9b
--- /dev/null
+++ b/ports/mimxrt/mimxrt_flash.c
@@ -0,0 +1,221 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020-2021 Damien P. George
+ * Copyright (c) 2021 Philipp Ebensberger
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include <string.h>
+
+#include "py/runtime.h"
+#include "extmod/vfs.h"
+#include "modmimxrt.h"
+#include "hal/flexspi_nor_flash.h"
+
+// BOARD_FLASH_SIZE is defined in mpconfigport.h
+#define SECTOR_SIZE_BYTES (qspiflash_config.sectorSize)
+#define PAGE_SIZE_BYTES (qspiflash_config.pageSize)
+
+#ifndef MICROPY_HW_FLASH_STORAGE_BYTES
+#define MICROPY_HW_FLASH_STORAGE_BYTES (((uint32_t)&__vfs_end) - ((uint32_t)&__vfs_start))
+#endif
+
+#ifndef MICROPY_HW_FLASH_STORAGE_BASE
+#define MICROPY_HW_FLASH_STORAGE_BASE (((uint32_t)&__vfs_start) - ((uint32_t)&__flash_start))
+#endif
+
+// Linker symbols
+extern uint8_t __vfs_start;
+extern uint8_t __vfs_end;
+extern uint8_t __flash_start;
+
+extern flexspi_nor_config_t qspiflash_config;
+
+typedef struct _mimxrt_flash_obj_t {
+    mp_obj_base_t base;
+    uint32_t flash_base;
+    uint32_t flash_size;
+} mimxrt_flash_obj_t;
+
+STATIC mimxrt_flash_obj_t mimxrt_flash_obj = {
+    .base = { &mimxrt_flash_type }
+};
+
+// flash_erase_block(erase_addr_bytes)
+// erases the 4k sector starting at adddr
+status_t flash_erase_block(uint32_t erase_addr) __attribute__((section(".ram_functions")));
+status_t flash_erase_block(uint32_t erase_addr) {
+    status_t status;
+    SCB_CleanInvalidateDCache();
+    SCB_DisableDCache();
+    __disable_irq();
+    status = flexspi_nor_flash_erase_sector(FLEXSPI, erase_addr);
+    __enable_irq();
+    SCB_EnableDCache();
+    return status;
+}
+
+// flash_write_block(flash_dest_addr_bytes, data_source, length_bytes)
+// writes length_byte data to the destination address
+// length is a multiple of the page size = 256
+// the vfs driver takes care for erasing the sector if required
+status_t flash_write_block(uint32_t dest_addr, const uint8_t *src, uint32_t length) __attribute__((section(".ram_functions")));
+status_t flash_write_block(uint32_t dest_addr, const uint8_t *src, uint32_t length) {
+    status_t status;
+    SCB_CleanInvalidateDCache();
+    SCB_DisableDCache();
+    // write sector in page size chunks
+    for (int i = 0; i < length; i += PAGE_SIZE_BYTES) {
+        __disable_irq();
+        status = flexspi_nor_flash_page_program(FLEXSPI, dest_addr + i, (uint32_t *)(src + i), PAGE_SIZE_BYTES);
+        __enable_irq();
+        if (status != kStatus_Success) {
+            break;
+        }
+    }
+    SCB_EnableDCache();
+    return status;
+}
+
+STATIC mp_obj_t mimxrt_flash_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
+    // Check args.
+    mp_arg_check_num(n_args, n_kw, 0, 0, false);
+
+    // Upload the custom flash configuration
+    // This should be performed by the boot ROM but for some reason it is not.
+    FLEXSPI_UpdateLUT(FLEXSPI, 0,
+        qspiflash_config.memConfig.lookupTable,
+        sizeof(qspiflash_config.memConfig.lookupTable) / sizeof(qspiflash_config.memConfig.lookupTable[0]));
+
+    // Configure FLEXSPI IP FIFO access.
+    FLEXSPI->MCR0 &= ~(FLEXSPI_MCR0_ARDFEN_MASK);
+    FLEXSPI->MCR0 &= ~(FLEXSPI_MCR0_ATDFEN_MASK);
+    FLEXSPI->MCR0 |= FLEXSPI_MCR0_ARDFEN(0);
+    FLEXSPI->MCR0 |= FLEXSPI_MCR0_ATDFEN(0);
+
+    // Update information based on linker symbols.
+    mimxrt_flash_obj.flash_base = MICROPY_HW_FLASH_STORAGE_BASE;
+    mimxrt_flash_obj.flash_size = MICROPY_HW_FLASH_STORAGE_BYTES;
+
+    // Return singleton object.
+    return MP_OBJ_FROM_PTR(&mimxrt_flash_obj);
+}
+
+// readblocks(block_num, buf, [offset])
+// read size of buffer number of bytes from block (with offset) into buffer
+STATIC mp_obj_t mimxrt_flash_readblocks(size_t n_args, const mp_obj_t *args) {
+    mimxrt_flash_obj_t *self = MP_OBJ_TO_PTR(args[0]);
+    mp_buffer_info_t bufinfo;
+    mp_get_buffer_raise(args[2], &bufinfo, MP_BUFFER_WRITE);
+    // if (n_args == 4) {
+    //     mp_printf(MP_PYTHON_PRINTER, "readblocks: nargs = %d, block = %d, offset = %d, len = %d\n",
+    //         n_args, mp_obj_get_int(args[1]), mp_obj_get_int(args[3]), bufinfo.len);
+    // } else {
+    //     mp_printf(MP_PYTHON_PRINTER, "readblocks: nargs = %d, block = %d, len = %d\n",
+    //         n_args, mp_obj_get_int(args[1]), bufinfo.len);
+    // }
+    // Calculate read offset from block number.
+    uint32_t offset = mp_obj_get_int(args[1]) * SECTOR_SIZE_BYTES;
+    // Add optional offset
+    if (n_args == 4) {
+        offset += mp_obj_get_int(args[3]);
+    }
+    memcpy(bufinfo.buf, (uint8_t *)(FlexSPI_AMBA_BASE + self->flash_base + offset), bufinfo.len);
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mimxrt_flash_readblocks_obj, 3, 4, mimxrt_flash_readblocks);
+
+// writeblocks(block_num, buf, [offset])
+// Erase block based on block_num and write buffer size number of bytes from buffer into block. If additional offset
+// parameter is provided only write operation at block start + offset will be performed.
+// This requires a prior erase operation of the block!
+STATIC mp_obj_t mimxrt_flash_writeblocks(size_t n_args, const mp_obj_t *args) {
+    status_t status;
+    mimxrt_flash_obj_t *self = MP_OBJ_TO_PTR(args[0]);
+    mp_buffer_info_t bufinfo;
+    mp_get_buffer_raise(args[2], &bufinfo, MP_BUFFER_READ);
+
+    // Calculate read offset from block number.
+    uint32_t offset = mp_obj_get_int(args[1]) * SECTOR_SIZE_BYTES;
+
+    if (n_args == 3) {
+        status = flash_erase_block(self->flash_base + offset);
+
+        if (status != kStatus_Success) {
+            mp_raise_msg_varg(&mp_type_OSError, MP_ERROR_TEXT("flash erase command failed with %d"), status);
+        }
+    } else {
+        // Add optional offset
+        offset += mp_obj_get_int(args[3]);
+    }
+
+    status = flash_write_block(self->flash_base + offset, bufinfo.buf, bufinfo.len);
+
+    if (status != kStatus_Success) {
+        mp_raise_msg_varg(&mp_type_OSError, MP_ERROR_TEXT("flash block write command failed with %d"), status);
+    }
+
+    return MP_OBJ_NEW_SMALL_INT(status != kStatus_Success);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mimxrt_flash_writeblocks_obj, 3, 4, mimxrt_flash_writeblocks);
+
+// ioctl(op, arg)
+STATIC mp_obj_t mimxrt_flash_ioctl(mp_obj_t self_in, mp_obj_t cmd_in, mp_obj_t arg_in) {
+    mimxrt_flash_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    mp_int_t cmd = mp_obj_get_int(cmd_in);
+    status_t status;
+    switch (cmd) {
+        case MP_BLOCKDEV_IOCTL_INIT:
+            return MP_OBJ_NEW_SMALL_INT(0);
+        case MP_BLOCKDEV_IOCTL_DEINIT:
+            return MP_OBJ_NEW_SMALL_INT(0);
+        case MP_BLOCKDEV_IOCTL_SYNC:
+            return MP_OBJ_NEW_SMALL_INT(0);
+        case MP_BLOCKDEV_IOCTL_BLOCK_COUNT:
+            return MP_OBJ_NEW_SMALL_INT(self->flash_size / SECTOR_SIZE_BYTES);
+        case MP_BLOCKDEV_IOCTL_BLOCK_SIZE:
+            return MP_OBJ_NEW_SMALL_INT(SECTOR_SIZE_BYTES);
+        case MP_BLOCKDEV_IOCTL_BLOCK_ERASE: {
+            uint32_t offset = mp_obj_get_int(arg_in) * SECTOR_SIZE_BYTES;
+            status = flash_erase_block(self->flash_base + offset);
+            return MP_OBJ_NEW_SMALL_INT(status != kStatus_Success);
+        }
+        default:
+            return mp_const_none;
+    }
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_3(mimxrt_flash_ioctl_obj, mimxrt_flash_ioctl);
+
+STATIC const mp_rom_map_elem_t mimxrt_flash_locals_dict_table[] = {
+    { MP_ROM_QSTR(MP_QSTR_readblocks), MP_ROM_PTR(&mimxrt_flash_readblocks_obj) },
+    { MP_ROM_QSTR(MP_QSTR_writeblocks), MP_ROM_PTR(&mimxrt_flash_writeblocks_obj) },
+    { MP_ROM_QSTR(MP_QSTR_ioctl), MP_ROM_PTR(&mimxrt_flash_ioctl_obj) },
+};
+STATIC MP_DEFINE_CONST_DICT(mimxrt_flash_locals_dict, mimxrt_flash_locals_dict_table);
+
+const mp_obj_type_t mimxrt_flash_type = {
+    { &mp_type_type },
+    .name = MP_QSTR_Flash,
+    .make_new = mimxrt_flash_make_new,
+    .locals_dict = (mp_obj_dict_t *)&mimxrt_flash_locals_dict,
+};
diff --git a/ports/mimxrt/modmimxrt.c b/ports/mimxrt/modmimxrt.c
new file mode 100644
index 0000000000000..addd4ba4d2ade
--- /dev/null
+++ b/ports/mimxrt/modmimxrt.c
@@ -0,0 +1,39 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020-2021 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "py/runtime.h"
+#include "modmimxrt.h"
+
+STATIC const mp_rom_map_elem_t mimxrt_module_globals_table[] = {
+    { MP_ROM_QSTR(MP_QSTR___name__),            MP_ROM_QSTR(MP_QSTR_mimxrt) },
+    { MP_ROM_QSTR(MP_QSTR_Flash),               MP_ROM_PTR(&mimxrt_flash_type) },
+};
+STATIC MP_DEFINE_CONST_DICT(mimxrt_module_globals, mimxrt_module_globals_table);
+
+const mp_obj_module_t mp_module_mimxrt = {
+    .base = { &mp_type_module },
+    .globals = (mp_obj_dict_t *)&mimxrt_module_globals,
+};
diff --git a/ports/mimxrt/modmimxrt.h b/ports/mimxrt/modmimxrt.h
new file mode 100644
index 0000000000000..e047716691807
--- /dev/null
+++ b/ports/mimxrt/modmimxrt.h
@@ -0,0 +1,34 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020-2021 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+#ifndef MICROPY_INCLUDED_MIMXRT_MODMIMXRT_H
+#define MICROPY_INCLUDED_MIMXRT_MODMIMXRT_H
+
+#include "py/obj.h"
+
+extern const mp_obj_type_t mimxrt_flash_type;
+extern const mp_obj_module_t mp_module_mimxrt;
+
+#endif // MICROPY_INCLUDED_MIMXRT_MODMIMXRT_H
diff --git a/ports/mimxrt/modules/_boot.py b/ports/mimxrt/modules/_boot.py
new file mode 100644
index 0000000000000..892d0047357e8
--- /dev/null
+++ b/ports/mimxrt/modules/_boot.py
@@ -0,0 +1,15 @@
+# _boot.py
+# Try to mount the filesystem, and format the flash if it doesn't exist.
+# Note: the flash requires the programming size to be aligned to 256 bytes.
+
+import os
+import mimxrt
+
+bdev = mimxrt.Flash()
+
+try:
+    vfs = os.VfsLfs2(bdev, progsize=256)
+except:
+    os.VfsLfs2.mkfs(bdev, progsize=256)
+    vfs = os.VfsLfs2(bdev, progsize=256)
+os.mount(vfs, "/")
diff --git a/ports/mimxrt/moduos.c b/ports/mimxrt/moduos.c
new file mode 100644
index 0000000000000..fe914ce610c03
--- /dev/null
+++ b/ports/mimxrt/moduos.c
@@ -0,0 +1,129 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2016 Damien P. George
+ *
+ * use of the TRNG by
+ * Copyright (c) 2017 Scott Shawcroft for Adafruit Industries
+ * Copyright (c) 2019 Artur Pacholec
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "py/objstr.h"
+#include "py/runtime.h"
+#include "extmod/vfs.h"
+#include "extmod/vfs_lfs.h"
+#include "genhdr/mpversion.h"
+#include "fsl_trng.h"
+
+STATIC const qstr os_uname_info_fields[] = {
+    MP_QSTR_sysname, MP_QSTR_nodename,
+    MP_QSTR_release, MP_QSTR_version, MP_QSTR_machine
+};
+STATIC const MP_DEFINE_STR_OBJ(os_uname_info_sysname_obj, MICROPY_PY_SYS_PLATFORM);
+STATIC const MP_DEFINE_STR_OBJ(os_uname_info_nodename_obj, MICROPY_PY_SYS_PLATFORM);
+STATIC const MP_DEFINE_STR_OBJ(os_uname_info_release_obj, MICROPY_VERSION_STRING);
+STATIC const MP_DEFINE_STR_OBJ(os_uname_info_version_obj, MICROPY_GIT_TAG " on " MICROPY_BUILD_DATE);
+STATIC const MP_DEFINE_STR_OBJ(os_uname_info_machine_obj, MICROPY_HW_BOARD_NAME " with " MICROPY_HW_MCU_NAME);
+
+STATIC MP_DEFINE_ATTRTUPLE(
+    os_uname_info_obj,
+    os_uname_info_fields,
+    5,
+    (mp_obj_t)&os_uname_info_sysname_obj,
+    (mp_obj_t)&os_uname_info_nodename_obj,
+    (mp_obj_t)&os_uname_info_release_obj,
+    (mp_obj_t)&os_uname_info_version_obj,
+    (mp_obj_t)&os_uname_info_machine_obj
+    );
+
+STATIC mp_obj_t os_uname(void) {
+    return (mp_obj_t)&os_uname_info_obj;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(os_uname_obj, os_uname);
+
+STATIC mp_obj_t os_urandom(mp_obj_t num) {
+    mp_int_t n = mp_obj_get_int(num);
+    static bool initialized = false;
+    vstr_t vstr;
+    vstr_init_len(&vstr, n);
+
+    if (!initialized) {
+        trng_config_t trngConfig;
+
+        TRNG_GetDefaultConfig(&trngConfig);
+        trngConfig.sampleMode = kTRNG_SampleModeVonNeumann;
+
+        TRNG_Init(TRNG, &trngConfig);
+        initialized = true;
+    }
+    TRNG_GetRandomData(TRNG, vstr.buf, n);
+
+    return mp_obj_new_str_from_vstr(&mp_type_bytes, &vstr);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(os_urandom_obj, os_urandom);
+
+STATIC const mp_rom_map_elem_t os_module_globals_table[] = {
+    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_uos) },
+
+    { MP_ROM_QSTR(MP_QSTR_uname), MP_ROM_PTR(&os_uname_obj) },
+    { MP_ROM_QSTR(MP_QSTR_urandom), MP_ROM_PTR(&os_urandom_obj) },
+
+    #if MICROPY_VFS
+    { MP_ROM_QSTR(MP_QSTR_chdir), MP_ROM_PTR(&mp_vfs_chdir_obj) },
+    { MP_ROM_QSTR(MP_QSTR_getcwd), MP_ROM_PTR(&mp_vfs_getcwd_obj) },
+    { MP_ROM_QSTR(MP_QSTR_listdir), MP_ROM_PTR(&mp_vfs_listdir_obj) },
+    { MP_ROM_QSTR(MP_QSTR_mkdir), MP_ROM_PTR(&mp_vfs_mkdir_obj) },
+    { MP_ROM_QSTR(MP_QSTR_remove), MP_ROM_PTR(&mp_vfs_remove_obj) },
+    { MP_ROM_QSTR(MP_QSTR_rename), MP_ROM_PTR(&mp_vfs_rename_obj) },
+    { MP_ROM_QSTR(MP_QSTR_rmdir), MP_ROM_PTR(&mp_vfs_rmdir_obj) },
+    { MP_ROM_QSTR(MP_QSTR_stat), MP_ROM_PTR(&mp_vfs_stat_obj) },
+    { MP_ROM_QSTR(MP_QSTR_statvfs), MP_ROM_PTR(&mp_vfs_statvfs_obj) },
+    #endif
+
+    // The following are MicroPython extensions.
+
+    #if MICROPY_PY_OS_DUPTERM
+    { MP_ROM_QSTR(MP_QSTR_dupterm), MP_ROM_PTR(&mp_uos_dupterm_obj) },
+    #endif
+
+    #if MICROPY_VFS
+    { MP_ROM_QSTR(MP_QSTR_ilistdir), MP_ROM_PTR(&mp_vfs_ilistdir_obj) },
+    { MP_ROM_QSTR(MP_QSTR_mount), MP_ROM_PTR(&mp_vfs_mount_obj) },
+    { MP_ROM_QSTR(MP_QSTR_umount), MP_ROM_PTR(&mp_vfs_umount_obj) },
+    #if MICROPY_VFS_FAT
+    { MP_ROM_QSTR(MP_QSTR_VfsFat), MP_ROM_PTR(&mp_fat_vfs_type) },
+    #endif
+    #if MICROPY_VFS_LFS1
+    { MP_ROM_QSTR(MP_QSTR_VfsLfs1), MP_ROM_PTR(&mp_type_vfs_lfs1) },
+    #endif
+    #if MICROPY_VFS_LFS2
+    { MP_ROM_QSTR(MP_QSTR_VfsLfs2), MP_ROM_PTR(&mp_type_vfs_lfs2) },
+    #endif
+    #endif
+};
+STATIC MP_DEFINE_CONST_DICT(os_module_globals, os_module_globals_table);
+
+const mp_obj_module_t mp_module_uos = {
+    .base = { &mp_type_module },
+    .globals = (mp_obj_dict_t *)&os_module_globals,
+};
diff --git a/ports/mimxrt/mpconfigport.h b/ports/mimxrt/mpconfigport.h
index 63ee5ea5ccdd0..db1944a9b8ac0 100644
--- a/ports/mimxrt/mpconfigport.h
+++ b/ports/mimxrt/mpconfigport.h
@@ -34,20 +34,26 @@
 #define MICROPY_GC_ALLOC_THRESHOLD          (0)
 #define MICROPY_ALLOC_PARSE_CHUNK_INIT      (32)
 #define MICROPY_ALLOC_PATH_MAX              (256)
-#define MICROPY_QSTR_BYTES_IN_HASH          (1)
 
 // Compiler configuration
 #define MICROPY_COMP_CONST                  (0)
 
 // Python internal features
+#define MICROPY_READER_VFS                  (1)
 #define MICROPY_ENABLE_GC                   (1)
+#define MICROPY_ENABLE_FINALISER            (1)
+#define MICROPY_STACK_CHECK                 (1)
+#define MICROPY_ENABLE_EMERGENCY_EXCEPTION_BUF  (1)
 #define MICROPY_KBD_EXCEPTION               (1)
 #define MICROPY_HELPER_REPL                 (1)
 #define MICROPY_REPL_AUTO_INDENT            (1)
 #define MICROPY_LONGINT_IMPL                (MICROPY_LONGINT_IMPL_MPZ)
 #define MICROPY_ENABLE_SOURCE_LINE          (1)
-#define MICROPY_ERROR_REPORTING             (MICROPY_ERROR_REPORTING_TERSE)
+#define MICROPY_STREAMS_NON_BLOCK           (1)
+#define MICROPY_MODULE_BUILTIN_INIT         (1)
+#define MICROPY_MODULE_WEAK_LINKS           (1)
 #define MICROPY_CAN_OVERRIDE_BUILTINS       (1)
+#define MICROPY_VFS                         (1)
 #define MICROPY_MODULE_FROZEN_MPY           (1)
 #define MICROPY_QSTR_EXTRA_POOL             mp_qstr_frozen_const_pool
 
@@ -68,22 +74,39 @@
 #define MICROPY_PY_MICROPYTHON_MEM_INFO     (1)
 #define MICROPY_PY_ARRAY_SLICE_ASSIGN       (1)
 #define MICROPY_PY_COLLECTIONS              (0)
+#define MICROPY_PY_IO_IOBASE                (1)
+#define MICROPY_PY_IO_FILEIO                (1)
 #define MICROPY_PY_SYS_MAXSIZE              (1)
+#define MICROPY_PY_SYS_PLATFORM             "mimxrt"
+#define MICROPY_PY_SYS_STDFILES             (1)
+#define MICROPY_PY_SYS_STDIO_BUFFER         (1)
 
 // Extended modules
 #define MICROPY_PY_UTIME_MP_HAL             (1)
 #define MICROPY_PY_MACHINE                  (1)
 
+// Use VfsLfs2's types for fileio/textio
+#define mp_type_fileio mp_type_vfs_lfs2_fileio
+#define mp_type_textio mp_type_vfs_lfs2_textio
+
+// Use VFS's functions for import stat and builtin open
+#define mp_import_stat mp_vfs_import_stat
+#define mp_builtin_open_obj mp_vfs_open_obj
+
 // Hooks to add builtins
 
 #define MICROPY_PORT_BUILTINS \
     { MP_ROM_QSTR(MP_QSTR_open), MP_ROM_PTR(&mp_builtin_open_obj) },
 
 extern const struct _mp_obj_module_t mp_module_machine;
+extern const struct _mp_obj_module_t mp_module_mimxrt;
+extern const struct _mp_obj_module_t mp_module_uos;
 extern const struct _mp_obj_module_t mp_module_utime;
 
 #define MICROPY_PORT_BUILTIN_MODULES \
     { MP_ROM_QSTR(MP_QSTR_machine), MP_ROM_PTR(&mp_module_machine) }, \
+    { MP_ROM_QSTR(MP_QSTR_mimxrt), (mp_obj_t)&mp_module_mimxrt }, \
+    { MP_ROM_QSTR(MP_QSTR_uos), MP_ROM_PTR(&mp_module_uos) }, \
     { MP_ROM_QSTR(MP_QSTR_utime), MP_ROM_PTR(&mp_module_utime) }, \
 
 #define MICROPY_PORT_ROOT_POINTERS \
diff --git a/ports/mimxrt/mphalport.c b/ports/mimxrt/mphalport.c
index 02a61a4f2a3bb..faecafbbcda34 100644
--- a/ports/mimxrt/mphalport.c
+++ b/ports/mimxrt/mphalport.c
@@ -26,6 +26,7 @@
  */
 
 #include "py/runtime.h"
+#include "py/stream.h"
 #include "py/mphal.h"
 #include "ticks.h"
 #include "tusb.h"
@@ -47,6 +48,14 @@ void mp_hal_set_interrupt_char(int c) {
 
 #endif
 
+uintptr_t mp_hal_stdio_poll(uintptr_t poll_flags) {
+    uintptr_t ret = 0;
+    if (tud_cdc_connected() && tud_cdc_available()) {
+        ret |= MP_STREAM_POLL_RD;
+    }
+    return ret;
+}
+
 int mp_hal_stdin_rx_chr(void) {
     for (;;) {
         // TODO
diff --git a/ports/mimxrt/mphalport.h b/ports/mimxrt/mphalport.h
index 78b390b4eb578..fd664346dd91d 100644
--- a/ports/mimxrt/mphalport.h
+++ b/ports/mimxrt/mphalport.h
@@ -73,4 +73,9 @@ static inline mp_uint_t mp_hal_ticks_cpu(void) {
     return 0;
 }
 
+static inline uint64_t mp_hal_time_ns(void) {
+    // TODO: Implement this function.
+    return 0UL;
+}
+
 #endif // MICROPY_INCLUDED_MIMXRT_MPHALPORT_H

From 745b4319a21cfebefead76c7fcacd0b619d48063 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Mon, 17 May 2021 12:31:11 +0200
Subject: [PATCH 0923/3533] mimxrt/boards/TEENSY40: Re-create the flash FS
 after deploy.

This is required since the Teensy Halfkay loader attempts to erase all of
the flash but fails to do so, at least in my tests.  Formatting brings it
back to a known state.
---
 ports/mimxrt/Makefile                         |  2 ++
 ports/mimxrt/boards/TEENSY40/format.py        | 11 +++++++++++
 ports/mimxrt/boards/TEENSY40/mpconfigboard.mk |  2 ++
 3 files changed, 15 insertions(+)
 create mode 100644 ports/mimxrt/boards/TEENSY40/format.py

diff --git a/ports/mimxrt/Makefile b/ports/mimxrt/Makefile
index 7feab6cd75ef4..956291b3227a2 100644
--- a/ports/mimxrt/Makefile
+++ b/ports/mimxrt/Makefile
@@ -2,6 +2,8 @@ BOARD ?= TEENSY40
 BOARD_DIR ?= boards/$(BOARD)
 BUILD ?= build-$(BOARD)
 
+PORT ?= /dev/ttyACM0
+
 CROSS_COMPILE ?= arm-none-eabi-
 
 ifeq ($(wildcard $(BOARD_DIR)/.),)
diff --git a/ports/mimxrt/boards/TEENSY40/format.py b/ports/mimxrt/boards/TEENSY40/format.py
new file mode 100644
index 0000000000000..75e5aa95caef0
--- /dev/null
+++ b/ports/mimxrt/boards/TEENSY40/format.py
@@ -0,0 +1,11 @@
+# format.py
+# Re-create the file system
+
+import os
+import mimxrt
+
+bdev = mimxrt.Flash()
+
+os.VfsLfs2.mkfs(bdev, progsize=256)
+vfs = os.VfsLfs2(bdev, progsize=256)
+os.mount(vfs, "/")
diff --git a/ports/mimxrt/boards/TEENSY40/mpconfigboard.mk b/ports/mimxrt/boards/TEENSY40/mpconfigboard.mk
index 6b939a3afde9d..79365d0da863d 100644
--- a/ports/mimxrt/boards/TEENSY40/mpconfigboard.mk
+++ b/ports/mimxrt/boards/TEENSY40/mpconfigboard.mk
@@ -3,3 +3,5 @@ MCU_VARIANT = MIMXRT1062DVJ6A
 
 deploy: $(BUILD)/firmware.hex
 	teensy_loader_cli --mcu=imxrt1062 -v -w $<
+	sleep 1
+	$(PYTHON) $(TOP)/tools/pyboard.py --device $(PORT) $(BOARD_DIR)/format.py

From 934505ac33b60066398f75a45af3896b9672a661 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 2 Jun 2021 00:02:21 +1000
Subject: [PATCH 0924/3533] tools/ci.sh: Build mpy-cross as part of
 ci_mimxrt_build.

Signed-off-by: Damien George <damien@micropython.org>
---
 tools/ci.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/ci.sh b/tools/ci.sh
index 23e529e5e1194..22b43d451336e 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -146,6 +146,7 @@ function ci_mimxrt_setup {
 }
 
 function ci_mimxrt_build {
+    make ${MAKEOPTS} -C mpy-cross
     make ${MAKEOPTS} -C ports/mimxrt submodules
     make ${MAKEOPTS} -C ports/mimxrt BOARD=MIMXRT1020_EVK
     make ${MAKEOPTS} -C ports/mimxrt BOARD=TEENSY40

From 4c407c790fd8c9efb89f91ab4805fc459970a833 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Tue, 18 May 2021 17:27:00 +0200
Subject: [PATCH 0925/3533] mimxrt: Add the Timer class to the machine module.

It supports three hardware timer channels based on the PIT timers of the
MIMXRT MCU.  The timer id's are 0, 1 and 2.  On soft reboot all active
timers will be stopped via finalisers.
---
 ports/mimxrt/Makefile        |   3 +
 ports/mimxrt/board_init.c    |   4 +
 ports/mimxrt/machine_timer.c | 210 +++++++++++++++++++++++++++++++++++
 ports/mimxrt/modmachine.c    |   2 +
 ports/mimxrt/modmachine.h    |  36 ++++++
 ports/mimxrt/mpconfigport.h  |   7 +-
 6 files changed, 261 insertions(+), 1 deletion(-)
 create mode 100644 ports/mimxrt/machine_timer.c
 create mode 100644 ports/mimxrt/modmachine.h

diff --git a/ports/mimxrt/Makefile b/ports/mimxrt/Makefile
index 956291b3227a2..21eab51fe7834 100644
--- a/ports/mimxrt/Makefile
+++ b/ports/mimxrt/Makefile
@@ -107,6 +107,7 @@ SRC_TINYUSB_IMX_C += \
 	$(MCU_DIR)/drivers/fsl_lpuart.c \
 	$(MCU_DIR)/drivers/fsl_flexram.c \
 	$(MCU_DIR)/drivers/fsl_flexspi.c \
+	$(MCU_DIR)/drivers/fsl_pit.c \
 	$(MCU_DIR)/drivers/fsl_trng.c \
 
 SRC_C = \
@@ -119,6 +120,7 @@ SRC_C = \
 	$(BOARD_DIR)/flash_config.c \
 	machine_led.c \
 	machine_pin.c \
+	machine_timer.c \
 	mimxrt_flash.c \
 	modutime.c \
 	modmachine.c \
@@ -144,6 +146,7 @@ SRC_S = lib/utils/gchelper_m3.s \
 SRC_QSTR += \
 	machine_led.c \
 	machine_pin.c \
+	machine_timer.c \
 	mimxrt_flash.c \
 	modutime.c \
 	modmachine.c \
diff --git a/ports/mimxrt/board_init.c b/ports/mimxrt/board_init.c
index 0336cdf6865d3..01f6848ea6725 100644
--- a/ports/mimxrt/board_init.c
+++ b/ports/mimxrt/board_init.c
@@ -38,6 +38,7 @@
 #include "fsl_lpuart.h"
 
 #include "clock_config.h"
+#include "modmachine.h"
 
 volatile uint32_t systick_ms = 0;
 
@@ -78,6 +79,9 @@ void board_init(void) {
     // USB1
     //  CLOCK_EnableUsbhs1PhyPllClock(kCLOCK_Usbphy480M, 480000000U);
     //  CLOCK_EnableUsbhs1Clock(kCLOCK_Usb480M, 480000000U);
+
+    // PIT
+    machine_timer_init_PIT();
 }
 
 void USB_OTG1_IRQHandler(void) {
diff --git a/ports/mimxrt/machine_timer.c b/ports/mimxrt/machine_timer.c
new file mode 100644
index 0000000000000..466860583ab94
--- /dev/null
+++ b/ports/mimxrt/machine_timer.c
@@ -0,0 +1,210 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020-2021 Damien P. George
+ * Copyright (c) 2021 Robert Hammelrath
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "py/runtime.h"
+#include "py/mperrno.h"
+#include "py/mphal.h"
+#include "fsl_pit.h"
+#include "modmachine.h"
+
+#define ALARM_ID_INVALID (-1)
+#define TIMER_MODE_ONE_SHOT (0)
+#define TIMER_MODE_PERIODIC (1)
+#define TIMER_MIN_PERIOD 1
+
+#define alarm_callback PIT_IRQHandler
+#define PIT_SOURCE_CLOCK CLOCK_GetFreq(kCLOCK_OscClk)
+#define PIT_IRQ_ID PIT_IRQn
+
+typedef struct _machine_timer_obj_t {
+    mp_obj_base_t base;
+    int8_t id;
+    int8_t channel;
+    uint32_t mode;
+    uint32_t tick_hz;
+    uint32_t delta_us; // for periodic mode
+    mp_obj_t callback;
+} machine_timer_obj_t;
+
+static const int8_t channel_no[MICROPY_HW_PIT_NUM_CHANNELS] = {0, 2, 3}; // no channel 1
+static pit_config_t pit_config;
+
+// This is the interrupt handler
+// To tell which channel fired one has to poll the flags
+void alarm_callback(void) {
+    for (uint8_t index = 0; index < MICROPY_HW_PIT_NUM_CHANNELS; index++) {
+        uint32_t flag;
+        machine_timer_obj_t *self = MP_STATE_PORT(timer_table)[index];
+        if (self != NULL) {
+            flag = PIT_GetStatusFlags(PIT, self->channel);
+            if (flag & kPIT_TimerFlag) { // channel fired
+                PIT_ClearStatusFlags(PIT, self->channel, kPIT_TimerFlag);
+                __DSB();
+
+                mp_sched_schedule(self->callback, MP_OBJ_FROM_PTR(self));
+
+                if (self->mode == TIMER_MODE_ONE_SHOT) {
+                    PIT_StopTimer(PIT, self->channel);
+                }
+            }
+        }
+    }
+}
+
+STATIC void machine_timer_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+    machine_timer_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    qstr mode = self->mode == TIMER_MODE_ONE_SHOT ? MP_QSTR_ONE_SHOT : MP_QSTR_PERIODIC;
+    mp_printf(print, "Timer(channel=%d, mode=%q, period=%d, tick_hz=%d)",
+        self->id, mode, self->delta_us / self->tick_hz, self->tick_hz);
+}
+
+STATIC mp_obj_t machine_timer_init_helper(machine_timer_obj_t *self, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    enum { ARG_mode, ARG_callback, ARG_period, ARG_tick_hz, ARG_freq, };
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_mode,         MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = TIMER_MODE_PERIODIC} },
+        { MP_QSTR_callback,     MP_ARG_REQUIRED | MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
+        { MP_QSTR_period,       MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 0xffffffff} },
+        { MP_QSTR_tick_hz,      MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 1000} },
+        { MP_QSTR_freq,         MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
+    };
+
+    // Parse args
+    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
+    mp_arg_parse_all(n_args, pos_args, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
+
+    MP_STATE_PORT(timer_table)[self->id] = self;  // Insert into the table
+
+    self->mode = args[ARG_mode].u_int;
+    if (args[ARG_freq].u_obj != mp_const_none) {
+        // Frequency specified in Hz
+        #if MICROPY_PY_BUILTINS_FLOAT
+        self->delta_us = (uint32_t)(MICROPY_FLOAT_CONST(1000000.0) / mp_obj_get_float(args[ARG_freq].u_obj));
+        #else
+        self->delta_us = 1000000 / mp_obj_get_int(args[ARG_freq].u_obj);
+        #endif
+    } else {
+        // Period specified
+        self->tick_hz = args[ARG_tick_hz].u_int;
+        self->delta_us = (uint64_t)args[ARG_period].u_int * 1000000 / self->tick_hz;
+    }
+    if (self->delta_us < TIMER_MIN_PERIOD) {
+        self->delta_us = TIMER_MIN_PERIOD;
+    }
+
+    self->callback = args[ARG_callback].u_obj;
+
+    // Set timer period for channel id
+    PIT_SetTimerPeriod(PIT, self->channel, USEC_TO_COUNT(self->delta_us, PIT_SOURCE_CLOCK));
+
+    // Enable timer interrupts for the channel
+    PIT_EnableInterrupts(PIT, self->channel, kPIT_TimerInterruptEnable);
+
+    // Enable at the NVIC
+    EnableIRQ(PIT_IRQ_ID);
+
+    // Start channel 0
+    PIT_StartTimer(PIT, self->channel);
+
+    return mp_const_none;
+}
+
+STATIC mp_obj_t machine_timer_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
+    machine_timer_obj_t *self = m_new_obj_with_finaliser(machine_timer_obj_t);
+    self->base.type = &machine_timer_type;
+    self->id = ALARM_ID_INVALID;
+
+    // Get timer id in the range of 0..2
+    mp_int_t id = 0;
+    if (n_args > 0) {
+        id = mp_obj_get_int(args[0]);
+        --n_args;
+        ++args;
+    }
+    if (id < 0 || id >= MICROPY_HW_PIT_NUM_CHANNELS) {
+        mp_raise_ValueError(MP_ERROR_TEXT("Timer does not exist"));
+    }
+
+    // Set initial values
+    self->id = id;
+    self->channel = channel_no[id];
+
+    if (n_args > 0 || n_kw > 0) {
+        // Start the timer
+        mp_map_t kw_args;
+        mp_map_init_fixed_table(&kw_args, n_kw, args + n_args);
+        machine_timer_init_helper(self, n_args, args, &kw_args);
+    }
+
+    return MP_OBJ_FROM_PTR(self);
+}
+
+STATIC mp_obj_t machine_timer_init(size_t n_args, const mp_obj_t *args, mp_map_t *kw_args) {
+    machine_timer_obj_t *self = MP_OBJ_TO_PTR(args[0]);
+    PIT_StopTimer(PIT, self->channel);
+    return machine_timer_init_helper(self, n_args - 1, args + 1, kw_args);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_KW(machine_timer_init_obj, 1, machine_timer_init);
+
+STATIC mp_obj_t machine_timer_deinit(mp_obj_t self_in) {
+    machine_timer_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    PIT_StopTimer(PIT, self->channel);
+    MP_STATE_PORT(timer_table)[self->id] = NULL;
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_timer_deinit_obj, machine_timer_deinit);
+
+// Initialize clock an first config
+void machine_timer_init_PIT(void) {
+    // PIT timer
+    // Enable clock gate for GPIO1
+    CLOCK_EnableClock(kCLOCK_Gpio1); // ?
+    // Set PERCLK_CLK source to OSC_CLK
+    CLOCK_SetMux(kCLOCK_PerclkMux, 1U);
+    // Set PERCLK_CLK divider to 1
+    CLOCK_SetDiv(kCLOCK_PerclkDiv, 0U);
+
+    PIT_GetDefaultConfig(&pit_config);
+    PIT_Init(PIT, &pit_config);
+}
+
+STATIC const mp_rom_map_elem_t machine_timer_locals_dict_table[] = {
+    { MP_ROM_QSTR(MP_QSTR___del__), MP_ROM_PTR(&machine_timer_deinit_obj) },
+    { MP_ROM_QSTR(MP_QSTR_init), MP_ROM_PTR(&machine_timer_init_obj) },
+    { MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&machine_timer_deinit_obj) },
+
+    { MP_ROM_QSTR(MP_QSTR_ONE_SHOT), MP_ROM_INT(TIMER_MODE_ONE_SHOT) },
+    { MP_ROM_QSTR(MP_QSTR_PERIODIC), MP_ROM_INT(TIMER_MODE_PERIODIC) },
+};
+STATIC MP_DEFINE_CONST_DICT(machine_timer_locals_dict, machine_timer_locals_dict_table);
+
+const mp_obj_type_t machine_timer_type = {
+    { &mp_type_type },
+    .name = MP_QSTR_Timer,
+    .print = machine_timer_print,
+    .make_new = machine_timer_make_new,
+    .locals_dict = (mp_obj_dict_t *)&machine_timer_locals_dict,
+};
diff --git a/ports/mimxrt/modmachine.c b/ports/mimxrt/modmachine.c
index 1bb6b6a3520fa..75fe1cd20fc55 100644
--- a/ports/mimxrt/modmachine.c
+++ b/ports/mimxrt/modmachine.c
@@ -29,6 +29,7 @@
 #include "extmod/machine_mem.h"
 #include "led.h"
 #include "pin.h"
+#include "modmachine.h"
 
 #include CPU_HEADER_H
 
@@ -54,6 +55,7 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_LED),                 MP_ROM_PTR(&machine_led_type) },
     #endif
     { MP_ROM_QSTR(MP_QSTR_Pin),                 MP_ROM_PTR(&machine_pin_type) },
+    { MP_ROM_QSTR(MP_QSTR_Timer),               MP_ROM_PTR(&machine_timer_type) },
 };
 STATIC MP_DEFINE_CONST_DICT(machine_module_globals, machine_module_globals_table);
 
diff --git a/ports/mimxrt/modmachine.h b/ports/mimxrt/modmachine.h
new file mode 100644
index 0000000000000..8741e20587353
--- /dev/null
+++ b/ports/mimxrt/modmachine.h
@@ -0,0 +1,36 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Damien P. George
+ * Copyright (c) 2021 Robert Hammelrath
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+#ifndef MICROPY_INCLUDED_MIMXRT_MODMACHINE_H
+#define MICROPY_INCLUDED_MIMXRT_MODMACHINE_H
+
+#include "py/obj.h"
+
+extern const mp_obj_type_t machine_timer_type;
+
+void machine_timer_init_PIT(void);
+
+#endif // MICROPY_INCLUDED_MIMXRT_MODMACHINE_H
diff --git a/ports/mimxrt/mpconfigport.h b/ports/mimxrt/mpconfigport.h
index db1944a9b8ac0..e02de87bad624 100644
--- a/ports/mimxrt/mpconfigport.h
+++ b/ports/mimxrt/mpconfigport.h
@@ -53,6 +53,8 @@
 #define MICROPY_MODULE_BUILTIN_INIT         (1)
 #define MICROPY_MODULE_WEAK_LINKS           (1)
 #define MICROPY_CAN_OVERRIDE_BUILTINS       (1)
+#define MICROPY_ENABLE_SCHEDULER            (1)
+#define MICROPY_SCHEDULER_DEPTH             (8)
 #define MICROPY_VFS                         (1)
 #define MICROPY_MODULE_FROZEN_MPY           (1)
 #define MICROPY_QSTR_EXTRA_POOL             mp_qstr_frozen_const_pool
@@ -109,8 +111,11 @@ extern const struct _mp_obj_module_t mp_module_utime;
     { MP_ROM_QSTR(MP_QSTR_uos), MP_ROM_PTR(&mp_module_uos) }, \
     { MP_ROM_QSTR(MP_QSTR_utime), MP_ROM_PTR(&mp_module_utime) }, \
 
+#define MICROPY_HW_PIT_NUM_CHANNELS 3
+
 #define MICROPY_PORT_ROOT_POINTERS \
-    const char *readline_hist[8];
+    const char *readline_hist[8]; \
+    struct _machine_timer_obj_t *timer_table[MICROPY_HW_PIT_NUM_CHANNELS];
 
 #define MP_STATE_PORT MP_STATE_VM
 

From 5226d6e1ee7282bf40a45708b98067446b157bce Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Tue, 1 Jun 2021 18:23:13 +0200
Subject: [PATCH 0926/3533] mimxrt: Remove __WFE() from
 MICROPY_EVENT_POLL_HOOK.

The device is unreliable with the WFE included.  This needs further
investigation.
---
 ports/mimxrt/mpconfigport.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ports/mimxrt/mpconfigport.h b/ports/mimxrt/mpconfigport.h
index e02de87bad624..98e01abe137bc 100644
--- a/ports/mimxrt/mpconfigport.h
+++ b/ports/mimxrt/mpconfigport.h
@@ -125,7 +125,6 @@ extern const struct _mp_obj_module_t mp_module_utime;
     do { \
         extern void mp_handle_pending(bool); \
         mp_handle_pending(true); \
-        __WFE(); \
     } while (0);
 
 #define MICROPY_MAKE_POINTER_CALLABLE(p) ((void *)((mp_uint_t)(p) | 1))

From cdd95ce73705ec8dc5249a7e22092a8ce374576d Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Tue, 1 Jun 2021 20:49:22 +0200
Subject: [PATCH 0927/3533] mimxrt/machine_timer: Reuse any existing timer
 objects.

So there is a 1-1 mapping of hardware timer to Python object.
---
 ports/mimxrt/machine_timer.c | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/ports/mimxrt/machine_timer.c b/ports/mimxrt/machine_timer.c
index 466860583ab94..260873ae6504d 100644
--- a/ports/mimxrt/machine_timer.c
+++ b/ports/mimxrt/machine_timer.c
@@ -31,7 +31,6 @@
 #include "fsl_pit.h"
 #include "modmachine.h"
 
-#define ALARM_ID_INVALID (-1)
 #define TIMER_MODE_ONE_SHOT (0)
 #define TIMER_MODE_PERIODIC (1)
 #define TIMER_MIN_PERIOD 1
@@ -96,8 +95,6 @@ STATIC mp_obj_t machine_timer_init_helper(machine_timer_obj_t *self, size_t n_ar
     mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
     mp_arg_parse_all(n_args, pos_args, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
 
-    MP_STATE_PORT(timer_table)[self->id] = self;  // Insert into the table
-
     self->mode = args[ARG_mode].u_int;
     if (args[ARG_freq].u_obj != mp_const_none) {
         // Frequency specified in Hz
@@ -133,9 +130,7 @@ STATIC mp_obj_t machine_timer_init_helper(machine_timer_obj_t *self, size_t n_ar
 }
 
 STATIC mp_obj_t machine_timer_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
-    machine_timer_obj_t *self = m_new_obj_with_finaliser(machine_timer_obj_t);
-    self->base.type = &machine_timer_type;
-    self->id = ALARM_ID_INVALID;
+    machine_timer_obj_t *self;
 
     // Get timer id in the range of 0..2
     mp_int_t id = 0;
@@ -148,6 +143,16 @@ STATIC mp_obj_t machine_timer_make_new(const mp_obj_type_t *type, size_t n_args,
         mp_raise_ValueError(MP_ERROR_TEXT("Timer does not exist"));
     }
 
+    // check, if a timer exists at that channel and stop it first
+    if (MP_STATE_PORT(timer_table)[id] != NULL) {
+        PIT_StopTimer(PIT, channel_no[id]);
+        self = MP_STATE_PORT(timer_table)[id];
+    } else {
+        self = m_new_obj_with_finaliser(machine_timer_obj_t);
+        self->base.type = &machine_timer_type;
+        MP_STATE_PORT(timer_table)[id] = self;
+    }
+
     // Set initial values
     self->id = id;
     self->channel = channel_no[id];
@@ -162,6 +167,14 @@ STATIC mp_obj_t machine_timer_make_new(const mp_obj_type_t *type, size_t n_args,
     return MP_OBJ_FROM_PTR(self);
 }
 
+STATIC mp_obj_t machine_timer___del__(mp_obj_t self_in) {
+    machine_timer_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    PIT_StopTimer(PIT, self->channel);
+    MP_STATE_PORT(timer_table)[self->id] = NULL;
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_timer___del___obj, machine_timer___del__);
+
 STATIC mp_obj_t machine_timer_init(size_t n_args, const mp_obj_t *args, mp_map_t *kw_args) {
     machine_timer_obj_t *self = MP_OBJ_TO_PTR(args[0]);
     PIT_StopTimer(PIT, self->channel);
@@ -172,7 +185,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_KW(machine_timer_init_obj, 1, machine_timer_init)
 STATIC mp_obj_t machine_timer_deinit(mp_obj_t self_in) {
     machine_timer_obj_t *self = MP_OBJ_TO_PTR(self_in);
     PIT_StopTimer(PIT, self->channel);
-    MP_STATE_PORT(timer_table)[self->id] = NULL;
     return mp_const_none;
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_timer_deinit_obj, machine_timer_deinit);
@@ -192,7 +204,7 @@ void machine_timer_init_PIT(void) {
 }
 
 STATIC const mp_rom_map_elem_t machine_timer_locals_dict_table[] = {
-    { MP_ROM_QSTR(MP_QSTR___del__), MP_ROM_PTR(&machine_timer_deinit_obj) },
+    { MP_ROM_QSTR(MP_QSTR___del__), MP_ROM_PTR(&machine_timer___del___obj) },
     { MP_ROM_QSTR(MP_QSTR_init), MP_ROM_PTR(&machine_timer_init_obj) },
     { MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&machine_timer_deinit_obj) },
 

From d79105d7c0f68e65ff175b752d9895241e355c08 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Wed, 2 Jun 2021 09:00:05 +0200
Subject: [PATCH 0928/3533] mimxrt/machine_timer: Leave the Timer clock source
 at IPG clock.

Setting it to OSC_CLK interferes the utime module's functionality.  This is
still an area demanding an understanding.
---
 ports/mimxrt/machine_timer.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/ports/mimxrt/machine_timer.c b/ports/mimxrt/machine_timer.c
index 260873ae6504d..334a020c15cc1 100644
--- a/ports/mimxrt/machine_timer.c
+++ b/ports/mimxrt/machine_timer.c
@@ -36,7 +36,7 @@
 #define TIMER_MIN_PERIOD 1
 
 #define alarm_callback PIT_IRQHandler
-#define PIT_SOURCE_CLOCK CLOCK_GetFreq(kCLOCK_OscClk)
+#define PIT_SOURCE_CLOCK CLOCK_GetIpgFreq()
 #define PIT_IRQ_ID PIT_IRQn
 
 typedef struct _machine_timer_obj_t {
@@ -194,8 +194,6 @@ void machine_timer_init_PIT(void) {
     // PIT timer
     // Enable clock gate for GPIO1
     CLOCK_EnableClock(kCLOCK_Gpio1); // ?
-    // Set PERCLK_CLK source to OSC_CLK
-    CLOCK_SetMux(kCLOCK_PerclkMux, 1U);
     // Set PERCLK_CLK divider to 1
     CLOCK_SetDiv(kCLOCK_PerclkDiv, 0U);
 

From 2f365d234e9e985710a174c05091054c011e37d7 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Thu, 20 May 2021 16:16:25 +0200
Subject: [PATCH 0929/3533] mimxrt/machine_rtc: Add the RTC class to the
 machine module.

Initial version, using the LP RTC clock.  It provides setting the date and
time with rtc.init() or rtc.datetime(), and reading the date and time with
rtc.datetime() or rtc.now().  The method weekday() reports the weekday of
the current date.  It starts with 0 for Monday.

The tuple order for datetime() and now() matches the CPython sequence:
(year, month, day, hour, minute, second, microsecond, TZ).  TZ is ignored
and reported as None.  Microsecond is provided at a best effort.

If a battery is not supplied, the default boot date/time is 1970/1/1 0:0:0.
With a battery, the clock continues to run even when the board is not
powered.  The clock is quite precise.  If not, using rtc.calibration() may
help.
---
 ports/mimxrt/Makefile      |   3 +
 ports/mimxrt/machine_rtc.c | 156 +++++++++++++++++++++++++++++++++++++
 ports/mimxrt/modmachine.c  |   1 +
 ports/mimxrt/modmachine.h  |   1 +
 4 files changed, 161 insertions(+)
 create mode 100644 ports/mimxrt/machine_rtc.c

diff --git a/ports/mimxrt/Makefile b/ports/mimxrt/Makefile
index 21eab51fe7834..732485edd97d1 100644
--- a/ports/mimxrt/Makefile
+++ b/ports/mimxrt/Makefile
@@ -108,6 +108,7 @@ SRC_TINYUSB_IMX_C += \
 	$(MCU_DIR)/drivers/fsl_flexram.c \
 	$(MCU_DIR)/drivers/fsl_flexspi.c \
 	$(MCU_DIR)/drivers/fsl_pit.c \
+	$(MCU_DIR)/drivers/fsl_snvs_lp.c \
 	$(MCU_DIR)/drivers/fsl_trng.c \
 
 SRC_C = \
@@ -120,6 +121,7 @@ SRC_C = \
 	$(BOARD_DIR)/flash_config.c \
 	machine_led.c \
 	machine_pin.c \
+	machine_rtc.c \
 	machine_timer.c \
 	mimxrt_flash.c \
 	modutime.c \
@@ -146,6 +148,7 @@ SRC_S = lib/utils/gchelper_m3.s \
 SRC_QSTR += \
 	machine_led.c \
 	machine_pin.c \
+	machine_rtc.c \
 	machine_timer.c \
 	mimxrt_flash.c \
 	modutime.c \
diff --git a/ports/mimxrt/machine_rtc.c b/ports/mimxrt/machine_rtc.c
new file mode 100644
index 0000000000000..949d0b51f861a
--- /dev/null
+++ b/ports/mimxrt/machine_rtc.c
@@ -0,0 +1,156 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Damien P. George
+ * Copyright (c) 2021 "Robert Hammelrath" <robert@hammelrath.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "py/runtime.h"
+#include "modmachine.h"
+#include "ticks.h"
+#include "fsl_snvs_lp.h"
+
+typedef struct _machine_rtc_obj_t {
+    mp_obj_base_t base;
+    mp_obj_t callback;
+} machine_rtc_obj_t;
+
+// Singleton RTC object.
+STATIC const machine_rtc_obj_t machine_rtc_obj = {{&machine_rtc_type}};
+
+// Calculate the weekday from the date.
+// The result is zero based with 0 = Sunday.
+// by Michael Keith and Tom Craver, 1990.
+static int calc_weekday(int y, int m, int d) {
+    return (d += m < 3 ? y-- : y - 2, 23 * m / 9 + d + 4 + y / 4 - y / 100 + y / 400) % 7;
+}
+
+STATIC mp_obj_t machine_rtc_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
+    // Check arguments.
+    mp_arg_check_num(n_args, n_kw, 0, 0, false);
+
+    // Start up the RTC if needed.
+    SNVS_LP_SRTC_StartTimer(SNVS);
+
+    // Return constant object.
+    return (mp_obj_t)&machine_rtc_obj;
+}
+
+STATIC mp_obj_t machine_rtc_datetime_helper(size_t n_args, const mp_obj_t *args) {
+    if (n_args == 1) {
+        // Get date and time.
+        snvs_lp_srtc_datetime_t srtc_date;
+        SNVS_LP_SRTC_GetDatetime(SNVS, &srtc_date);
+
+        mp_obj_t tuple[8] = {
+            mp_obj_new_int(srtc_date.year),
+            mp_obj_new_int(srtc_date.month),
+            mp_obj_new_int(srtc_date.day),
+            mp_obj_new_int(srtc_date.hour),
+            mp_obj_new_int(srtc_date.minute),
+            mp_obj_new_int(srtc_date.second),
+            mp_obj_new_int(ticks_us64() % 1000000),
+            mp_const_none,
+        };
+        return mp_obj_new_tuple(8, tuple);
+    } else {
+        // Set date and time.
+        mp_obj_t *items;
+        mp_int_t year;
+        mp_obj_get_array_fixed_n(args[1], 8, &items);
+
+        snvs_lp_srtc_datetime_t srtc_date;
+        year = mp_obj_get_int(items[0]);
+        srtc_date.year = year >= 100 ? year : year + 2000; // allow 21 for 2021
+        srtc_date.month = mp_obj_get_int(items[1]);
+        srtc_date.day = mp_obj_get_int(items[2]);
+        srtc_date.hour = mp_obj_get_int(items[3]);
+        srtc_date.minute = mp_obj_get_int(items[4]);
+        srtc_date.second = mp_obj_get_int(items[5]);
+        if (SNVS_LP_SRTC_SetDatetime(SNVS, &srtc_date) != kStatus_Success) {
+            mp_raise_ValueError(NULL);
+        }
+
+        return mp_const_none;
+    }
+}
+
+STATIC mp_obj_t machine_rtc_datetime(mp_uint_t n_args, const mp_obj_t *args) {
+    return machine_rtc_datetime_helper(n_args, args);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_rtc_datetime_obj, 1, 2, machine_rtc_datetime);
+
+STATIC mp_obj_t machine_rtc_now(mp_obj_t self_in) {
+    return machine_rtc_datetime_helper(1, &self_in);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_rtc_now_obj, machine_rtc_now);
+
+STATIC mp_obj_t machine_rtc_init(mp_obj_t self_in, mp_obj_t date) {
+    mp_obj_t args[2] = {self_in, date};
+    machine_rtc_datetime_helper(2, args);
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(machine_rtc_init_obj, machine_rtc_init);
+
+STATIC mp_obj_t machine_rtc_weekday(mp_obj_t self_in) {
+    (void)self_in; // unused
+    int day;
+    snvs_lp_srtc_datetime_t srtc_date;
+    SNVS_LP_SRTC_GetDatetime(SNVS, &srtc_date);
+    day = calc_weekday(srtc_date.year, srtc_date.month, srtc_date.day);
+    return MP_OBJ_NEW_SMALL_INT((day + 6) % 7);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_rtc_weekday_obj, machine_rtc_weekday);
+
+// calibration(cal)
+// When the argument is a number in the range [-16 to 15], set the calibration value.
+STATIC mp_obj_t machine_rtc_calibration(mp_obj_t self_in, mp_obj_t cal_in) {
+    mp_int_t cal = 0;
+    snvs_lp_srtc_config_t snvsSrtcConfig;
+    cal = mp_obj_get_int(cal_in);
+    if (cal < -16 || cal > 15) {
+        mp_raise_ValueError(MP_ERROR_TEXT("value out of range -16 to 15"));
+    } else {
+        snvsSrtcConfig.srtcCalEnable = true;
+        snvsSrtcConfig.srtcCalValue = cal & 0x1f; // 5 bit 2's complement
+        SNVS_LP_SRTC_Init(SNVS, &snvsSrtcConfig);
+    }
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(machine_rtc_calibration_obj, machine_rtc_calibration);
+
+STATIC const mp_rom_map_elem_t machine_rtc_locals_dict_table[] = {
+    { MP_ROM_QSTR(MP_QSTR_init), MP_ROM_PTR(&machine_rtc_init_obj) },
+    { MP_ROM_QSTR(MP_QSTR_datetime), MP_ROM_PTR(&machine_rtc_datetime_obj) },
+    { MP_ROM_QSTR(MP_QSTR_now), MP_ROM_PTR(&machine_rtc_now_obj) },
+    { MP_ROM_QSTR(MP_QSTR_weekday), MP_ROM_PTR(&machine_rtc_weekday_obj) },
+    { MP_ROM_QSTR(MP_QSTR_calibration), MP_ROM_PTR(&machine_rtc_calibration_obj) },
+};
+STATIC MP_DEFINE_CONST_DICT(machine_rtc_locals_dict, machine_rtc_locals_dict_table);
+
+const mp_obj_type_t machine_rtc_type = {
+    { &mp_type_type },
+    .name = MP_QSTR_RTC,
+    .make_new = machine_rtc_make_new,
+    .locals_dict = (mp_obj_t)&machine_rtc_locals_dict,
+};
diff --git a/ports/mimxrt/modmachine.c b/ports/mimxrt/modmachine.c
index 75fe1cd20fc55..ff4ca7cf9f4f4 100644
--- a/ports/mimxrt/modmachine.c
+++ b/ports/mimxrt/modmachine.c
@@ -56,6 +56,7 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     #endif
     { MP_ROM_QSTR(MP_QSTR_Pin),                 MP_ROM_PTR(&machine_pin_type) },
     { MP_ROM_QSTR(MP_QSTR_Timer),               MP_ROM_PTR(&machine_timer_type) },
+    { MP_ROM_QSTR(MP_QSTR_RTC),                 MP_ROM_PTR(&machine_rtc_type) },
 };
 STATIC MP_DEFINE_CONST_DICT(machine_module_globals, machine_module_globals_table);
 
diff --git a/ports/mimxrt/modmachine.h b/ports/mimxrt/modmachine.h
index 8741e20587353..d165c00e6d650 100644
--- a/ports/mimxrt/modmachine.h
+++ b/ports/mimxrt/modmachine.h
@@ -30,6 +30,7 @@
 #include "py/obj.h"
 
 extern const mp_obj_type_t machine_timer_type;
+extern const mp_obj_type_t machine_rtc_type;
 
 void machine_timer_init_PIT(void);
 

From a40e1473dc5a399d2586da32c3abb96413b5463c Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Wed, 26 May 2021 11:29:34 +0200
Subject: [PATCH 0930/3533] mimxrt: Add floating point support.

Since not all boards support double fp, all board specific .mk files are
affected too.
---
 ports/mimxrt/Makefile                         | 109 ++++++++++++++++++
 .../boards/MIMXRT1010_EVK/mpconfigboard.mk    |   2 +
 .../boards/MIMXRT1020_EVK/mpconfigboard.mk    |   2 +
 .../boards/MIMXRT1050_EVK/mpconfigboard.mk    |   2 +
 .../boards/MIMXRT1060_EVK/mpconfigboard.mk    |   2 +
 .../boards/MIMXRT1064_EVK/mpconfigboard.mk    |   2 +
 ports/mimxrt/boards/TEENSY40/mpconfigboard.mk |   2 +
 7 files changed, 121 insertions(+)

diff --git a/ports/mimxrt/Makefile b/ports/mimxrt/Makefile
index 732485edd97d1..141bc2c49b677 100644
--- a/ports/mimxrt/Makefile
+++ b/ports/mimxrt/Makefile
@@ -67,6 +67,21 @@ CFLAGS += -DXIP_EXTERNAL_FLASH=1 \
 	-DCPU_HEADER_H='<$(MCU_SERIES).h>'
 CFLAGS += $(CFLAGS_MOD) $(CFLAGS_EXTRA)
 
+# Configure floating point support
+ifeq ($(MICROPY_FLOAT_IMPL),double)
+CFLAGS += -DMICROPY_FLOAT_IMPL=MICROPY_FLOAT_IMPL_DOUBLE
+else
+ifeq ($(MICROPY_FLOAT_IMPL),none)
+CFLAGS += -DMICROPY_FLOAT_IMPL=MICROPY_FLOAT_IMPL_NONE
+else
+CFLAGS += -DMICROPY_FLOAT_IMPL=MICROPY_FLOAT_IMPL_FLOAT
+CFLAGS += -fsingle-precision-constant
+endif
+endif
+
+SUPPORTS_HARDWARE_FP_SINGLE = 0
+SUPPORTS_HARDWARE_FP_DOUBLE = 0
+
 LDFLAGS = $(addprefix -T,$(LD_FILES)) -Map=$@.map --cref --print-memory-usage
 LIBS = $(shell $(CC) $(CFLAGS) -print-libgcc-file-name)
 
@@ -140,6 +155,99 @@ SRC_C = \
 	$(SRC_TINYUSB_C) \
 	$(SRC_TINYUSB_IMX_C) \
 
+ifeq ($(MICROPY_FLOAT_IMPL),double)
+LIBM_SRC_C += $(addprefix lib/libm_dbl/,\
+	__cos.c \
+	__expo2.c \
+	__fpclassify.c \
+	__rem_pio2.c \
+	__rem_pio2_large.c \
+	__signbit.c \
+	__sin.c \
+	__tan.c \
+	acos.c \
+	acosh.c \
+	asin.c \
+	asinh.c \
+	atan.c \
+	atan2.c \
+	atanh.c \
+	ceil.c \
+	cos.c \
+	cosh.c \
+	copysign.c \
+	erf.c \
+	exp.c \
+	expm1.c \
+	floor.c \
+	fmod.c \
+	frexp.c \
+	ldexp.c \
+	lgamma.c \
+	log.c \
+	log10.c \
+	log1p.c \
+	modf.c \
+	nearbyint.c \
+	pow.c \
+	rint.c \
+	round.c \
+	scalbn.c \
+	sin.c \
+	sinh.c \
+	tan.c \
+	tanh.c \
+	tgamma.c \
+	trunc.c \
+	)
+ifeq ($(SUPPORTS_HARDWARE_FP_DOUBLE),1)
+LIBM_SRC_C += lib/libm_dbl/thumb_vfp_sqrt.c
+else
+LIBM_SRC_C += lib/libm_dbl/sqrt.c
+endif
+else
+LIBM_SRC_C += $(addprefix lib/libm/,\
+	math.c \
+	acoshf.c \
+	asinfacosf.c \
+	asinhf.c \
+	atan2f.c \
+	atanf.c \
+	atanhf.c \
+	ef_rem_pio2.c \
+	erf_lgamma.c \
+	fmodf.c \
+	kf_cos.c \
+	kf_rem_pio2.c \
+	kf_sin.c \
+	kf_tan.c \
+	log1pf.c \
+	nearbyintf.c \
+	roundf.c \
+	sf_cos.c \
+	sf_erf.c \
+	sf_frexp.c \
+	sf_ldexp.c \
+	sf_modf.c \
+	sf_sin.c \
+	sf_tan.c \
+	wf_lgamma.c \
+	wf_tgamma.c \
+	)
+ifeq ($(SUPPORTS_HARDWARE_FP_SINGLE),1)
+LIBM_SRC_C += lib/libm/thumb_vfp_sqrtf.c
+else
+LIBM_SRC_C += lib/libm/ef_sqrt.c
+endif
+endif
+
+LIBM_O = $(addprefix $(BUILD)/, $(LIBM_SRC_C:.c=.o))
+
+# Too many warnings in libm_dbl, disable for now.
+ifeq ($(MICROPY_FLOAT_IMPL),double)
+$(LIBM_O): CFLAGS := $(filter-out -Wdouble-promotion -Wfloat-conversion, $(CFLAGS))
+endif
+
 SRC_SS = $(MCU_DIR)/gcc/startup_$(MCU_SERIES).S
 
 SRC_S = lib/utils/gchelper_m3.s \
@@ -160,6 +268,7 @@ SRC_QSTR += \
 	$(GEN_PINS_SRC) \
 
 OBJ += $(PY_O)
+OBJ += $(LIBM_O)
 OBJ += $(addprefix $(BUILD)/, $(SRC_C:.c=.o))
 OBJ += $(addprefix $(BUILD)/, $(SRC_S:.s=.o))
 OBJ += $(addprefix $(BUILD)/, $(SRC_SS:.S=.o))
diff --git a/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.mk b/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.mk
index c5b5055324b17..ca8efcd5bf5df 100644
--- a/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.mk
+++ b/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.mk
@@ -1,6 +1,8 @@
 MCU_SERIES = MIMXRT1011
 MCU_VARIANT = MIMXRT1011DAE5A
 
+MICROPY_FLOAT_IMPL = single
+
 JLINK_PATH = /media/RT1010-EVK/
 JLINK_COMMANDER_SCRIPT = $(BUILD)/script.jlink
 
diff --git a/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.mk b/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.mk
index 0f5bb967af318..b0bbd705cbfc9 100644
--- a/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.mk
+++ b/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.mk
@@ -1,6 +1,8 @@
 MCU_SERIES = MIMXRT1021
 MCU_VARIANT = MIMXRT1021DAG5A
 
+MICROPY_FLOAT_IMPL = double
+
 JLINK_PATH ?= /media/RT1020-EVK/
 JLINK_COMMANDER_SCRIPT = $(BUILD)/script.jlink
 
diff --git a/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.mk b/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.mk
index 61cca4d63f204..e338ec6cf8af6 100644
--- a/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.mk
+++ b/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.mk
@@ -1,6 +1,8 @@
 MCU_SERIES = MIMXRT1052
 MCU_VARIANT = MIMXRT1052DVL6B
 
+MICROPY_FLOAT_IMPL = double
+
 JLINK_PATH ?= /media/RT1050-EVK/
 
 deploy: $(BUILD)/firmware.bin
diff --git a/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.mk b/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.mk
index 32f87046b8a5e..b7ea5fcbe1974 100644
--- a/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.mk
+++ b/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.mk
@@ -1,6 +1,8 @@
 MCU_SERIES = MIMXRT1062
 MCU_VARIANT = MIMXRT1062DVJ6A
 
+MICROPY_FLOAT_IMPL = double
+
 JLINK_PATH ?= /media/RT1060-EVK/
 JLINK_COMMANDER_SCRIPT = $(BUILD)/script.jlink
 
diff --git a/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.mk b/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.mk
index 700988919146d..bd4c496416ac3 100644
--- a/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.mk
+++ b/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.mk
@@ -1,6 +1,8 @@
 MCU_SERIES = MIMXRT1064
 MCU_VARIANT = MIMXRT1064DVL6A
 
+MICROPY_FLOAT_IMPL = double
+
 JLINK_PATH ?= /media/RT1064-EVK/
 
 CFLAGS += -DBOARD_FLASH_SIZE=0x400000
diff --git a/ports/mimxrt/boards/TEENSY40/mpconfigboard.mk b/ports/mimxrt/boards/TEENSY40/mpconfigboard.mk
index 79365d0da863d..0f818af42cd06 100644
--- a/ports/mimxrt/boards/TEENSY40/mpconfigboard.mk
+++ b/ports/mimxrt/boards/TEENSY40/mpconfigboard.mk
@@ -1,6 +1,8 @@
 MCU_SERIES = MIMXRT1062
 MCU_VARIANT = MIMXRT1062DVJ6A
 
+MICROPY_FLOAT_IMPL = double
+
 deploy: $(BUILD)/firmware.hex
 	teensy_loader_cli --mcu=imxrt1062 -v -w $<
 	sleep 1

From bbdc98f72e019ef1370add51a3ad9ec991bfbc40 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Wed, 26 May 2021 13:19:38 +0200
Subject: [PATCH 0931/3533] mimxrt: Enable many Python and some extmod
 features.

Besides Python features this includes the extmod modules which make use of
the Pin module, especially machine.softSPI, machine.SoftI2C and onewire.
---
 ports/mimxrt/Makefile                |  3 ++
 ports/mimxrt/boards/manifest.py      |  2 +
 ports/mimxrt/hal/flexspi_nor_flash.h |  2 +-
 ports/mimxrt/machine_pin.c           |  8 +--
 ports/mimxrt/main.c                  |  2 +-
 ports/mimxrt/modmachine.c            |  9 +++-
 ports/mimxrt/mpconfigport.h          | 79 ++++++++++++++++++++++++----
 ports/mimxrt/mphalport.h             |  3 ++
 8 files changed, 91 insertions(+), 17 deletions(-)

diff --git a/ports/mimxrt/Makefile b/ports/mimxrt/Makefile
index 141bc2c49b677..de7b9fd3ee188 100644
--- a/ports/mimxrt/Makefile
+++ b/ports/mimxrt/Makefile
@@ -152,6 +152,8 @@ SRC_C = \
 	lib/utils/pyexec.c \
 	lib/utils/stdout_helpers.c \
 	lib/utils/sys_stdio_mphal.c \
+	drivers/bus/softspi.c \
+	extmod/modonewire.c \
 	$(SRC_TINYUSB_C) \
 	$(SRC_TINYUSB_IMX_C) \
 
@@ -265,6 +267,7 @@ SRC_QSTR += \
 	moduos.c \
 	pin.c \
 	lib/utils/sys_stdio_mphal.c \
+	extmod/modonewire.c \
 	$(GEN_PINS_SRC) \
 
 OBJ += $(PY_O)
diff --git a/ports/mimxrt/boards/manifest.py b/ports/mimxrt/boards/manifest.py
index c80309cf675a2..9df589f126787 100644
--- a/ports/mimxrt/boards/manifest.py
+++ b/ports/mimxrt/boards/manifest.py
@@ -1 +1,3 @@
 freeze("$(PORT_DIR)/modules")
+freeze("$(MPY_DIR)/drivers/onewire")
+include("$(MPY_DIR)/extmod/uasyncio/manifest.py")
diff --git a/ports/mimxrt/hal/flexspi_nor_flash.h b/ports/mimxrt/hal/flexspi_nor_flash.h
index 43cd7efdc7941..a9a9bbe700d0c 100644
--- a/ports/mimxrt/hal/flexspi_nor_flash.h
+++ b/ports/mimxrt/hal/flexspi_nor_flash.h
@@ -27,7 +27,7 @@
 #define MICROPY_INCLUDED_MIMXRT_HAL_FLEXSPI_NOR_FLASH_H
 
 #include "fsl_flexspi.h"
-#include "mpconfigport.h"
+#include "mpconfigboard.h"
 #include BOARD_FLASH_CONFIG_HEADER_H
 
 // Defined in boards flash_config.c
diff --git a/ports/mimxrt/machine_pin.c b/ports/mimxrt/machine_pin.c
index f63778cbe517a..ebe95059bfffc 100644
--- a/ports/mimxrt/machine_pin.c
+++ b/ports/mimxrt/machine_pin.c
@@ -39,7 +39,7 @@ STATIC mp_obj_t machine_pin_obj_init_helper(const machine_pin_obj_t *self, size_
 // Class Methods
 STATIC void machine_pin_obj_print(const mp_print_t *print, mp_obj_t o, mp_print_kind_t kind);
 STATIC mp_obj_t machine_pin_obj_call(mp_obj_t self_in, mp_uint_t n_args, mp_uint_t n_kw, const mp_obj_t *args);
-STATIC mp_obj_t machine_pin_obj_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args);
+mp_obj_t mp_pin_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args);
 
 // Instance Methods
 STATIC mp_obj_t machine_pin_off(mp_obj_t self_in);
@@ -191,7 +191,7 @@ STATIC void machine_pin_obj_print(const mp_print_t *print, mp_obj_t o, mp_print_
 }
 
 // pin(id, mode, pull, ...)
-STATIC mp_obj_t machine_pin_obj_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
+mp_obj_t mp_pin_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
     mp_arg_check_num(n_args, n_kw, 1, MP_OBJ_FUN_ARGS_MAX, true);
 
     const machine_pin_obj_t *pin = pin_find(args[0]);
@@ -273,7 +273,7 @@ const mp_obj_type_t machine_pin_type = {
     .name = MP_QSTR_Pin,
     .print = machine_pin_obj_print,
     .call = machine_pin_obj_call,
-    .make_new = machine_pin_obj_make_new,
+    .make_new = mp_pin_make_new,
     .locals_dict = (mp_obj_dict_t *)&machine_pin_locals_dict,
 };
 
@@ -282,6 +282,6 @@ const mp_obj_type_t machine_pin_af_type = {
     {&mp_type_type},
     .name = MP_QSTR_PinAF,
     .print = machine_pin_obj_print,
-    .make_new = machine_pin_obj_make_new,
+    .make_new = mp_pin_make_new,
     .locals_dict = (mp_obj_dict_t *)&machine_pin_locals_dict,
 };
diff --git a/ports/mimxrt/main.c b/ports/mimxrt/main.c
index 76fd7ef76c181..74c8a7014beaf 100644
--- a/ports/mimxrt/main.c
+++ b/ports/mimxrt/main.c
@@ -128,7 +128,7 @@ const char mimxrt_help_text[] =
     "  machine.Pin(pin, m, [p]) -- get a pin and configure it for IO mode m, pull mode p\n"
     "    methods: init(..), value([v]), high(), low())\n"
     "\n"
-    "Pin IO modes are: Pin.IN, Pin.OUT\n"
+    "Pin IO modes are: Pin.IN, Pin.OUT, Pin.OPEN_DRAIN\n"
     "Pin pull modes are: Pin.PULL_UP, Pin.PULL_UP_47K, Pin.PULL_UP_22K, Pin.PULL_DOWN, Pin.PULL_HOLD\n"
     "\n"
     "Useful control commands:\n"
diff --git a/ports/mimxrt/modmachine.c b/ports/mimxrt/modmachine.c
index ff4ca7cf9f4f4..96cae3a828f1f 100644
--- a/ports/mimxrt/modmachine.c
+++ b/ports/mimxrt/modmachine.c
@@ -27,9 +27,13 @@
 
 #include "py/runtime.h"
 #include "extmod/machine_mem.h"
+#include "extmod/machine_i2c.h"
+#include "extmod/machine_signal.h"
+#include "extmod/machine_spi.h"
 #include "led.h"
 #include "pin.h"
 #include "modmachine.h"
+#include "fsl_clock.h"
 
 #include CPU_HEADER_H
 
@@ -40,7 +44,7 @@ STATIC mp_obj_t machine_reset(void) {
 MP_DEFINE_CONST_FUN_OBJ_0(machine_reset_obj, machine_reset);
 
 STATIC mp_obj_t machine_freq(void) {
-    return MP_OBJ_NEW_SMALL_INT(0);
+    return MP_OBJ_NEW_SMALL_INT(CLOCK_GetFreq(kCLOCK_CpuClk));
 }
 MP_DEFINE_CONST_FUN_OBJ_0(machine_freq_obj, machine_freq);
 
@@ -57,6 +61,9 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_Pin),                 MP_ROM_PTR(&machine_pin_type) },
     { MP_ROM_QSTR(MP_QSTR_Timer),               MP_ROM_PTR(&machine_timer_type) },
     { MP_ROM_QSTR(MP_QSTR_RTC),                 MP_ROM_PTR(&machine_rtc_type) },
+    { MP_ROM_QSTR(MP_QSTR_Signal),              MP_ROM_PTR(&machine_signal_type) },
+    { MP_ROM_QSTR(MP_QSTR_SoftI2C),             MP_ROM_PTR(&mp_machine_soft_i2c_type) },
+    { MP_ROM_QSTR(MP_QSTR_SoftSPI),             MP_ROM_PTR(&mp_machine_soft_spi_type) },
 };
 STATIC MP_DEFINE_CONST_DICT(machine_module_globals, machine_module_globals_table);
 
diff --git a/ports/mimxrt/mpconfigport.h b/ports/mimxrt/mpconfigport.h
index 98e01abe137bc..0af87264a52c4 100644
--- a/ports/mimxrt/mpconfigport.h
+++ b/ports/mimxrt/mpconfigport.h
@@ -28,6 +28,7 @@
 
 // Board specific definitions
 #include "mpconfigboard.h"
+#include "fsl_common.h"
 
 // Memory allocation policies
 #define MICROPY_GC_STACK_ENTRY_TYPE         uint16_t
@@ -35,6 +36,11 @@
 #define MICROPY_ALLOC_PARSE_CHUNK_INIT      (32)
 #define MICROPY_ALLOC_PATH_MAX              (256)
 
+// MicroPython emitters
+#define MICROPY_PERSISTENT_CODE_LOAD        (1)
+#define MICROPY_EMIT_THUMB                  (1)
+#define MICROPY_EMIT_INLINE_THUMB           (1)
+
 // Compiler configuration
 #define MICROPY_COMP_CONST                  (0)
 
@@ -60,32 +66,64 @@
 #define MICROPY_QSTR_EXTRA_POOL             mp_qstr_frozen_const_pool
 
 // Control over Python builtins
-#define MICROPY_PY_BUILTINS_STR_COUNT       (0)
+#define MICROPY_PY_FUNCTION_ATTRS           (1)
+#define MICROPY_PY_DESCRIPTORS              (1)
+#define MICROPY_PY_DELATTR_SETATTR          (1)
+#define MICROPY_PY_BUILTINS_STR_UNICODE     (1)
+#define MICROPY_PY_BUILTINS_STR_CENTER      (1)
+#define MICROPY_PY_BUILTINS_STR_PARTITION   (1)
+#define MICROPY_PY_BUILTINS_STR_SPLITLINES  (1)
 #define MICROPY_PY_BUILTINS_MEMORYVIEW      (1)
-#define MICROPY_PY_BUILTINS_SET             (1)
-#define MICROPY_PY_BUILTINS_FROZENSET       (0)
-#define MICROPY_PY_BUILTINS_PROPERTY        (0)
-#define MICROPY_PY_BUILTINS_ENUMERATE       (0)
-#define MICROPY_PY_BUILTINS_FILTER          (0)
-#define MICROPY_PY_BUILTINS_REVERSED        (1)
-#define MICROPY_PY_BUILTINS_MIN_MAX         (0)
+#define MICROPY_PY_BUILTINS_SLICE_ATTRS     (1)
+#define MICROPY_PY_BUILTINS_SLICE_INDICES   (1)
+#define MICROPY_PY_BUILTINS_FROZENSET       (1)
+#define MICROPY_PY_BUILTINS_ROUND_INT       (1)
+#define MICROPY_PY_ALL_SPECIAL_METHODS      (1)
+#define MICROPY_PY_REVERSE_SPECIAL_METHODS  (1)
+#define MICROPY_PY_BUILTINS_COMPILE         (1)
+#define MICROPY_PY_BUILTINS_INPUT           (1)
+#define MICROPY_PY_BUILTINS_POW3            (1)
 #define MICROPY_PY_BUILTINS_HELP            (1)
 #define MICROPY_PY_BUILTINS_HELP_MODULES    (1)
 #define MICROPY_PY_BUILTINS_HELP_TEXT       mimxrt_help_text
-#define MICROPY_PY___FILE__                 (0)
 #define MICROPY_PY_MICROPYTHON_MEM_INFO     (1)
 #define MICROPY_PY_ARRAY_SLICE_ASSIGN       (1)
-#define MICROPY_PY_COLLECTIONS              (0)
+#define MICROPY_PY_COLLECTIONS_DEQUE        (1)
+#define MICROPY_PY_COLLECTIONS_ORDEREDDICT  (1)
+#define MICROPY_PY_MATH_SPECIAL_FUNCTIONS   (1)
+#define MICROPY_PY_MATH_FACTORIAL           (1)
+#define MICROPY_PY_MATH_ISCLOSE             (1)
+#define MICROPY_PY_CMATH                    (1)
 #define MICROPY_PY_IO_IOBASE                (1)
 #define MICROPY_PY_IO_FILEIO                (1)
 #define MICROPY_PY_SYS_MAXSIZE              (1)
 #define MICROPY_PY_SYS_PLATFORM             "mimxrt"
 #define MICROPY_PY_SYS_STDFILES             (1)
 #define MICROPY_PY_SYS_STDIO_BUFFER         (1)
+#define MICROPY_PY_UERRNO                   (1)
 
 // Extended modules
+#define MICROPY_EPOCH_IS_1970               (1)
+#define MICROPY_PY_UASYNCIO                 (1)
+#define MICROPY_PY_UCTYPES                  (1)
+#define MICROPY_PY_UZLIB                    (1)
+#define MICROPY_PY_UJSON                    (1)
+#define MICROPY_PY_URE                      (1)
+#define MICROPY_PY_URE_MATCH_GROUPS         (1)
+#define MICROPY_PY_URE_MATCH_SPAN_START_END (1)
+#define MICROPY_PY_URE_SUB                  (1)
+#define MICROPY_PY_UHASHLIB                 (1)
+#define MICROPY_PY_UBINASCII                (1)
+#define MICROPY_PY_UBINASCII_CRC32          (1)
 #define MICROPY_PY_UTIME_MP_HAL             (1)
+#define MICROPY_PY_URANDOM                  (1)
+#define MICROPY_PY_URANDOM_EXTRA_FUNCS      (1)
+#define MICROPY_PY_USELECT                  (1)
 #define MICROPY_PY_MACHINE                  (1)
+#define MICROPY_PY_MACHINE_PIN_MAKE_NEW     mp_pin_make_new
+#define MICROPY_PY_MACHINE_I2C              (1)
+#define MICROPY_PY_MACHINE_SPI              (1)
+#define MICROPY_PY_FRAMEBUF                 (1)
 
 // Use VfsLfs2's types for fileio/textio
 #define mp_type_fileio mp_type_vfs_lfs2_fileio
@@ -97,11 +135,24 @@
 
 // Hooks to add builtins
 
+__attribute__((always_inline)) static inline void enable_irq(uint32_t state) {
+    __set_PRIMASK(state);
+}
+
+__attribute__((always_inline)) static inline uint32_t disable_irq(void) {
+    uint32_t state = __get_PRIMASK();
+    return state;
+}
+
+#define MICROPY_BEGIN_ATOMIC_SECTION()     disable_irq()
+#define MICROPY_END_ATOMIC_SECTION(state)  enable_irq(state)
+
 #define MICROPY_PORT_BUILTINS \
     { MP_ROM_QSTR(MP_QSTR_open), MP_ROM_PTR(&mp_builtin_open_obj) },
 
 extern const struct _mp_obj_module_t mp_module_machine;
 extern const struct _mp_obj_module_t mp_module_mimxrt;
+extern const struct _mp_obj_module_t mp_module_onewire;
 extern const struct _mp_obj_module_t mp_module_uos;
 extern const struct _mp_obj_module_t mp_module_utime;
 
@@ -110,6 +161,7 @@ extern const struct _mp_obj_module_t mp_module_utime;
     { MP_ROM_QSTR(MP_QSTR_mimxrt), (mp_obj_t)&mp_module_mimxrt }, \
     { MP_ROM_QSTR(MP_QSTR_uos), MP_ROM_PTR(&mp_module_uos) }, \
     { MP_ROM_QSTR(MP_QSTR_utime), MP_ROM_PTR(&mp_module_utime) }, \
+    { MP_ROM_QSTR(MP_QSTR__onewire), MP_ROM_PTR(&mp_module_onewire) }, \
 
 #define MICROPY_HW_PIT_NUM_CHANNELS 3
 
@@ -129,10 +181,17 @@ extern const struct _mp_obj_module_t mp_module_utime;
 
 #define MICROPY_MAKE_POINTER_CALLABLE(p) ((void *)((mp_uint_t)(p) | 1))
 
+#define MP_HAL_CLEAN_DCACHE(addr, size) \
+    (SCB_CleanDCache_by_Addr((uint32_t *)((uint32_t)addr & ~0x1f), \
+    ((uint32_t)((uint8_t *)addr + size + 0x1f) & ~0x1f) - ((uint32_t)addr & ~0x1f)))
+
 #define MP_SSIZE_MAX (0x7fffffff)
 typedef int mp_int_t; // must be pointer size
 typedef unsigned mp_uint_t; // must be pointer size
 typedef long mp_off_t;
 
+// Need an implementation of the log2 function which is not a macro.
+#define MP_NEED_LOG2 (1)
+
 // Need to provide a declaration/definition of alloca()
 #include <alloca.h>
diff --git a/ports/mimxrt/mphalport.h b/ports/mimxrt/mphalport.h
index fd664346dd91d..0db11836f8f32 100644
--- a/ports/mimxrt/mphalport.h
+++ b/ports/mimxrt/mphalport.h
@@ -48,6 +48,9 @@
 #define mp_hal_pin_od_low(p)    mp_hal_pin_low(p)
 #define mp_hal_pin_od_high(p)   mp_hal_pin_high(p)
 
+#define mp_hal_quiet_timing_enter() MICROPY_BEGIN_ATOMIC_SECTION()
+#define mp_hal_quiet_timing_exit(irq_state) MICROPY_END_ATOMIC_SECTION(irq_state)
+
 void mp_hal_set_interrupt_char(int c);
 
 static inline mp_uint_t mp_hal_ticks_ms(void) {

From b8c65b174f95c1fa1117d4f307a1c5a450607e33 Mon Sep 17 00:00:00 2001
From: Philipp Ebensberger <philipp.ebensberger@3bricks-software.de>
Date: Sat, 24 Apr 2021 21:34:07 +0200
Subject: [PATCH 0932/3533] mimxrt/machine_adc: Add the ADC class to the
 machine module.

This adds the machine.ADC class with the read_u16() method.  make-pins.py
and supporting files are updated to generate ADC information.
---
 ports/mimxrt/Makefile               |   7 +-
 ports/mimxrt/board_init.c           |   3 +
 ports/mimxrt/boards/make-pins.py    |  54 +++++++++--
 ports/mimxrt/boards/mimxrt_prefix.c |  12 ++-
 ports/mimxrt/machine_adc.c          | 145 ++++++++++++++++++++++++++++
 ports/mimxrt/modmachine.c           |   1 +
 ports/mimxrt/modmachine.h           |   2 +
 ports/mimxrt/pin.h                  |  11 ++-
 8 files changed, 223 insertions(+), 12 deletions(-)
 create mode 100644 ports/mimxrt/machine_adc.c

diff --git a/ports/mimxrt/Makefile b/ports/mimxrt/Makefile
index de7b9fd3ee188..cacbcc1a37e61 100644
--- a/ports/mimxrt/Makefile
+++ b/ports/mimxrt/Makefile
@@ -111,10 +111,11 @@ SRC_TINYUSB_C += \
 	lib/tinyusb/src/class/vendor/vendor_device.c \
 	lib/tinyusb/src/portable/nxp/transdimension/dcd_transdimension.c
 
-SRC_TINYUSB_IMX_C += \
+SRC_HAL_IMX_C += \
 	$(MCU_DIR)/system_$(MCU_SERIES).c \
 	$(MCU_DIR)/xip/fsl_flexspi_nor_boot.c \
 	$(MCU_DIR)/project_template/clock_config.c \
+	$(MCU_DIR)/drivers/fsl_adc.c \
 	$(MCU_DIR)/drivers/fsl_clock.c \
 	$(MCU_DIR)/drivers/fsl_gpio.c \
 	$(MCU_DIR)/drivers/fsl_gpt.c \
@@ -134,6 +135,7 @@ SRC_C = \
 	tusb_port.c \
 	board_init.c \
 	$(BOARD_DIR)/flash_config.c \
+	machine_adc.c \
 	machine_led.c \
 	machine_pin.c \
 	machine_rtc.c \
@@ -155,7 +157,7 @@ SRC_C = \
 	drivers/bus/softspi.c \
 	extmod/modonewire.c \
 	$(SRC_TINYUSB_C) \
-	$(SRC_TINYUSB_IMX_C) \
+	$(SRC_HAL_IMX_C) \
 
 ifeq ($(MICROPY_FLOAT_IMPL),double)
 LIBM_SRC_C += $(addprefix lib/libm_dbl/,\
@@ -256,6 +258,7 @@ SRC_S = lib/utils/gchelper_m3.s \
 
 # List of sources for qstr extraction
 SRC_QSTR += \
+	machine_adc.c \
 	machine_led.c \
 	machine_pin.c \
 	machine_rtc.c \
diff --git a/ports/mimxrt/board_init.c b/ports/mimxrt/board_init.c
index 01f6848ea6725..65024ff3e26c0 100644
--- a/ports/mimxrt/board_init.c
+++ b/ports/mimxrt/board_init.c
@@ -80,6 +80,9 @@ void board_init(void) {
     //  CLOCK_EnableUsbhs1PhyPllClock(kCLOCK_Usbphy480M, 480000000U);
     //  CLOCK_EnableUsbhs1Clock(kCLOCK_Usb480M, 480000000U);
 
+    // ADC
+    machine_adc_init();
+
     // PIT
     machine_timer_init_PIT();
 }
diff --git a/ports/mimxrt/boards/make-pins.py b/ports/mimxrt/boards/make-pins.py
index 5e5b81e31e01a..e9e32a504728b 100644
--- a/ports/mimxrt/boards/make-pins.py
+++ b/ports/mimxrt/boards/make-pins.py
@@ -6,9 +6,11 @@
 import argparse
 import sys
 import csv
+import re
 
 SUPPORTED_AFS = {"GPIO"}
 MAX_AF = 10  # AF0 .. AF9
+ADC_COL = 11
 
 
 def parse_pad(pad_str):
@@ -38,7 +40,7 @@ def __init__(self, pad, gpio, pin, idx=0):
         self.gpio = gpio
         self.pin = pin
         self.alt_fn = []
-        self.adc_channel = 0
+        self.adc_fns = []
         self.board_pin = False
 
     def set_is_board_pin(self):
@@ -48,7 +50,13 @@ def is_board_pin(self):
         return self.board_pin
 
     def parse_adc(self, adc_str):
-        pass
+        adc_regex = r"ADC(?P<instance>\d*)_IN(?P<channel>\d*)"
+
+        matches = re.finditer(adc_regex, adc_str, re.MULTILINE)
+        for match in matches:
+            self.adc_fns.append(
+                AdcFunction(instance=match.group("instance"), channel=match.group("channel"))
+            )
 
     def parse_af(self, af_idx, af_strs_in):
         pass
@@ -69,14 +77,34 @@ def print_pin_af(self):
         else:
             raise ValueError("Pin '{}' has no alternative functions".format(self.name))
 
+    def print_pin_adc(self):
+        if self.adc_fns:
+            print(
+                "static const machine_pin_adc_obj_t pin_{0}_adc[{1}] = {{".format(
+                    self.name, len(self.adc_fns)
+                )
+            )
+            for adc_fn in self.adc_fns:
+                adc_fn.print()
+            print("};")
+
     def print(self):
         if self.alt_fn:
             self.print_pin_af()
-            print(
-                "const machine_pin_obj_t pin_{0} = PIN({0}, {1}, {2}, pin_{3});\n".format(
-                    self.name, self.gpio, int(self.pin), self.name + "_af"
+            self.print_pin_adc()
+
+            if self.adc_fns:
+                print(
+                    "const machine_pin_obj_t pin_{0} = PIN({0}, {1}, {2}, pin_{0}_af, {3}, pin_{0}_adc);\n".format(
+                        self.name, self.gpio, int(self.pin), len(self.adc_fns)
+                    )
+                )
+            else:
+                print(
+                    "const machine_pin_obj_t pin_{0} = PIN({0}, {1}, {2}, pin_{0}_af, {3}, NULL);\n".format(
+                        self.name, self.gpio, int(self.pin), len(self.adc_fns)
+                    )
                 )
-            )
         else:
             raise ValueError("Pin '{}' has no alternative functions".format(self.name))
 
@@ -84,6 +112,18 @@ def print_header(self, hdr_file):
         pass
 
 
+class AdcFunction(object):
+    """Holds the information associated with a pins ADC function."""
+
+    def __init__(self, instance, channel):
+        self.instance = instance
+        self.channel = channel
+
+    def print(self):
+        """Prints the C representation of this AF."""
+        print(f"    PIN_ADC(ADC{self.instance}, {self.channel}),")
+
+
 class AlternateFunction(object):
     """Holds the information associated with a pins alternate function."""
 
@@ -149,6 +189,8 @@ def parse_af_file(self, filename, pad_col, af_start_col):
                     if af and af_supported(af):
                         pin.add_af(AlternateFunction(af_idx, af))
 
+                pin.parse_adc(row[ADC_COL])
+
                 self.cpu_pins.append(pin)
 
     @staticmethod
diff --git a/ports/mimxrt/boards/mimxrt_prefix.c b/ports/mimxrt/boards/mimxrt_prefix.c
index 59e338976e496..96ba6a0d5e749 100644
--- a/ports/mimxrt/boards/mimxrt_prefix.c
+++ b/ports/mimxrt/boards/mimxrt_prefix.c
@@ -13,7 +13,13 @@
         .pad_config = (uint32_t)(_pad_config), \
     } \
 
-#define PIN(_name, _gpio, _pin, _af_list) \
+#define PIN_ADC(_instance, _channel) \
+    { \
+        .instance = (_instance), \
+        .channel = (_channel) \
+    } \
+
+#define PIN(_name, _gpio, _pin, _af_list, _adc_list_len, _adc_list) \
     { \
         .base = { &machine_pin_type }, \
         .name = MP_QSTR_##_name, \
@@ -21,6 +27,8 @@
         .pin = (uint32_t)(_pin), \
         .muxRegister = (uint32_t)&(IOMUXC->SW_MUX_CTL_PAD[kIOMUXC_SW_MUX_CTL_PAD_##_name]), \
         .configRegister = (uint32_t)&(IOMUXC->SW_PAD_CTL_PAD[kIOMUXC_SW_PAD_CTL_PAD_##_name]), \
-        .af_list_len = (size_t)(sizeof((_af_list)) / sizeof(machine_pin_af_obj_t)), \
+        .af_list_len = (uint8_t)(sizeof((_af_list)) / sizeof(machine_pin_af_obj_t)), \
+        .adc_list_len = (_adc_list_len), \
         .af_list = (_af_list), \
+        .adc_list = (_adc_list), \
     } \
diff --git a/ports/mimxrt/machine_adc.c b/ports/mimxrt/machine_adc.c
new file mode 100644
index 0000000000000..8bf5e7b9a8adb
--- /dev/null
+++ b/ports/mimxrt/machine_adc.c
@@ -0,0 +1,145 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Philipp Ebensberger
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include <stdint.h>
+#include "py/obj.h"
+#include "py/runtime.h"
+#include "py/mphal.h"
+
+#include "fsl_adc.h"
+#include "fsl_gpio.h"
+#include "fsl_iomuxc.h"
+
+#include "modmachine.h"
+
+typedef struct _machine_adc_obj_t {
+    mp_obj_base_t base;
+    ADC_Type *adc;
+    uint8_t channel;
+    uint8_t channel_group;
+    uint16_t resolution;
+} machine_adc_obj_t;
+
+STATIC ADC_Type *const adc_bases[] = ADC_BASE_PTRS;
+
+STATIC void adc_obj_print(const mp_print_t *print, mp_obj_t o, mp_print_kind_t kind) {
+    (void)kind;
+    machine_adc_obj_t *self = MP_OBJ_TO_PTR(o);
+
+    // Get ADC adc id
+    for (int i = 1; i < sizeof(adc_bases) / sizeof(ADC_Type *); ++i) {
+        if (adc_bases[i] == self->adc) {
+            mp_printf(print, "ADC(%u, channel=%u)", i, self->channel);
+            break;
+        }
+    }
+}
+
+STATIC mp_obj_t adc_obj_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
+    mp_arg_check_num(n_args, n_kw, 1, 1, false);
+
+    // Unpack and check parameter
+    const machine_pin_obj_t *pin = pin_find(args[0]);
+
+    if (pin->adc_list_len == 0) {
+        mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("Pin(%q) does not have ADC capabilities"), pin->name);
+    }
+
+    // Extract arguments
+    ADC_Type *adc_instance = pin->adc_list[0].instance;  // NOTE: we only use the first ADC assignment - multiple assignments are not supported for now
+    uint8_t channel = pin->adc_list[0].channel;
+
+    // Configure ADC peripheral channel
+    adc_channel_config_t channel_config = {
+        .channelNumber = (uint32_t)channel,
+        .enableInterruptOnConversionCompleted = false,
+    };
+    ADC_SetChannelConfig(adc_instance, 0UL, &channel_config);  // NOTE: we always choose channel group '0' since we only perform software triggered conversion
+
+    // Create ADC Instance
+    machine_adc_obj_t *o = m_new_obj(machine_adc_obj_t);
+    o->base.type = &machine_adc_type;
+    o->adc = adc_instance;
+    o->channel = (uint8_t)channel;
+    o->channel_group = 0;
+    o->resolution = 4096;  // NOTE: currently only 12bit resolution supported
+
+    return MP_OBJ_FROM_PTR(o);
+}
+
+// read_u16()
+STATIC mp_obj_t machine_adc_read_u16(mp_obj_t self_in) {
+    machine_adc_obj_t *self = MP_OBJ_TO_PTR(self_in);
+
+    // Initiate conversion
+    adc_channel_config_t channel_config = {
+        .channelNumber = self->channel,
+        .enableInterruptOnConversionCompleted = false,
+    };
+    ADC_SetChannelConfig(self->adc, (uint32_t)self->channel_group, &channel_config);
+
+    // Wait for conversion to finish
+    while (!ADC_GetChannelStatusFlags(self->adc, (uint32_t)self->channel_group)) {
+        // do nothing
+    }
+
+    // Measure input voltage
+    uint32_t value = ADC_GetChannelConversionValue(self->adc, (uint32_t)self->channel_group);
+    return MP_OBJ_NEW_SMALL_INT(value * 65535 / self->resolution);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_adc_read_u16_obj, machine_adc_read_u16);
+
+STATIC const mp_rom_map_elem_t adc_locals_dict_table[] = {
+    { MP_ROM_QSTR(MP_QSTR_read_u16), MP_ROM_PTR(&machine_adc_read_u16_obj) },
+};
+
+STATIC MP_DEFINE_CONST_DICT(adc_locals_dict, adc_locals_dict_table);
+
+const mp_obj_type_t machine_adc_type = {
+    {&mp_type_type},
+    .name = MP_QSTR_ADC,
+    .print = adc_obj_print,
+    .make_new = adc_obj_make_new,
+    .locals_dict = (mp_obj_dict_t *)&adc_locals_dict,
+};
+
+void machine_adc_init(void) {
+    for (int i = 1; i < sizeof(adc_bases) / sizeof(ADC_Type *); ++i) {
+        ADC_Type *adc_instance = adc_bases[i];
+
+        // Configure ADC perpheral
+        adc_config_t config;
+        ADC_GetDefaultConfig(&config);
+        ADC_Init(adc_instance, &config);
+
+        // Perform calibration
+        status_t calib_state = ADC_DoAutoCalibration(adc_instance);
+
+        if (calib_state == kStatus_Fail) {
+            mp_printf(&mp_plat_print, "Calibration for ADC Instance %d failed", i);
+        }
+    }
+}
diff --git a/ports/mimxrt/modmachine.c b/ports/mimxrt/modmachine.c
index 96cae3a828f1f..dfee91992da2f 100644
--- a/ports/mimxrt/modmachine.c
+++ b/ports/mimxrt/modmachine.c
@@ -59,6 +59,7 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_LED),                 MP_ROM_PTR(&machine_led_type) },
     #endif
     { MP_ROM_QSTR(MP_QSTR_Pin),                 MP_ROM_PTR(&machine_pin_type) },
+    { MP_ROM_QSTR(MP_QSTR_ADC),                 MP_ROM_PTR(&machine_adc_type) },
     { MP_ROM_QSTR(MP_QSTR_Timer),               MP_ROM_PTR(&machine_timer_type) },
     { MP_ROM_QSTR(MP_QSTR_RTC),                 MP_ROM_PTR(&machine_rtc_type) },
     { MP_ROM_QSTR(MP_QSTR_Signal),              MP_ROM_PTR(&machine_signal_type) },
diff --git a/ports/mimxrt/modmachine.h b/ports/mimxrt/modmachine.h
index d165c00e6d650..a7b577fa79990 100644
--- a/ports/mimxrt/modmachine.h
+++ b/ports/mimxrt/modmachine.h
@@ -29,9 +29,11 @@
 
 #include "py/obj.h"
 
+extern const mp_obj_type_t machine_adc_type;
 extern const mp_obj_type_t machine_timer_type;
 extern const mp_obj_type_t machine_rtc_type;
 
+void machine_adc_init(void);
 void machine_timer_init_PIT(void);
 
 #endif // MICROPY_INCLUDED_MIMXRT_MODMACHINE_H
diff --git a/ports/mimxrt/pin.h b/ports/mimxrt/pin.h
index 6afedd1f59e1b..7a05d2d64d57f 100644
--- a/ports/mimxrt/pin.h
+++ b/ports/mimxrt/pin.h
@@ -100,6 +100,11 @@ typedef struct {
     uint32_t pad_config;  // pad configuration for alternate function
 } machine_pin_af_obj_t;
 
+typedef struct {
+    ADC_Type *instance;
+    uint8_t channel;
+} machine_pin_adc_obj_t;
+
 typedef struct {
     mp_obj_base_t base;
     qstr name;  // pad name
@@ -107,8 +112,10 @@ typedef struct {
     uint32_t pin;  // pin number
     uint32_t muxRegister;
     uint32_t configRegister;
-    size_t af_list_len;  // length of available alternate functions list
-    const machine_pin_af_obj_t *af_list;  // pointer tolist with alternate functions
+    uint8_t af_list_len;  // length of available alternate functions list
+    uint8_t adc_list_len; // length of available ADC options list
+    const machine_pin_af_obj_t *af_list;  // pointer to list with alternate functions
+    const machine_pin_adc_obj_t *adc_list; // pointer to list with ADC options
 } machine_pin_obj_t;
 
 // ------------------------------------------------------------------------------------------------------------------ //

From 53fea8598e86285e25194735cfc0c2f31cef57a1 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Tue, 1 Jun 2021 20:15:55 +0200
Subject: [PATCH 0933/3533] mimxrt/boards: Add board configuration files for
 Teensy 4.1.

These are at the moment more or less identical to the Teensy 4.0 files,
except for the pins.csv file and the flash size.
---
 ports/mimxrt/boards/TEENSY41/TEENSY41.ld      |   2 +
 ports/mimxrt/boards/TEENSY41/flash_config.c   | 144 ++++++++++
 ports/mimxrt/boards/TEENSY41/mpconfigboard.h  |  10 +
 ports/mimxrt/boards/TEENSY41/mpconfigboard.mk |   7 +
 ports/mimxrt/boards/TEENSY41/pins.csv         |  83 ++++++
 .../TEENSY41/teensy41_flexspi_nor_config.h    | 259 ++++++++++++++++++
 6 files changed, 505 insertions(+)
 create mode 100755 ports/mimxrt/boards/TEENSY41/TEENSY41.ld
 create mode 100755 ports/mimxrt/boards/TEENSY41/flash_config.c
 create mode 100755 ports/mimxrt/boards/TEENSY41/mpconfigboard.h
 create mode 100755 ports/mimxrt/boards/TEENSY41/mpconfigboard.mk
 create mode 100755 ports/mimxrt/boards/TEENSY41/pins.csv
 create mode 100755 ports/mimxrt/boards/TEENSY41/teensy41_flexspi_nor_config.h

diff --git a/ports/mimxrt/boards/TEENSY41/TEENSY41.ld b/ports/mimxrt/boards/TEENSY41/TEENSY41.ld
new file mode 100755
index 0000000000000..7f3cfc302a69b
--- /dev/null
+++ b/ports/mimxrt/boards/TEENSY41/TEENSY41.ld
@@ -0,0 +1,2 @@
+flash_size = 8M;
+reserved_size = 4K;
diff --git a/ports/mimxrt/boards/TEENSY41/flash_config.c b/ports/mimxrt/boards/TEENSY41/flash_config.c
new file mode 100755
index 0000000000000..f5066216d1c1a
--- /dev/null
+++ b/ports/mimxrt/boards/TEENSY41/flash_config.c
@@ -0,0 +1,144 @@
+/*
+ * Copyright 2018 NXP
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+// Based on tinyusb/hw/bsp/teensy_40/teensy40_flexspi_nor_config.c
+
+#include "teensy41_flexspi_nor_config.h"
+
+/* Component ID definition, used by tools. */
+#ifndef FSL_COMPONENT_ID
+#define FSL_COMPONENT_ID "platform.drivers.xip_board"
+#endif
+
+/*******************************************************************************
+ * Code
+ ******************************************************************************/
+#if defined(XIP_BOOT_HEADER_ENABLE) && (XIP_BOOT_HEADER_ENABLE == 1)
+#if defined(__CC_ARM) || defined(__ARMCC_VERSION) || defined(__GNUC__)
+__attribute__((section(".boot_hdr.conf")))
+#elif defined(__ICCARM__)
+#pragma location = ".boot_hdr.conf"
+#endif
+
+const flexspi_nor_config_t qspiflash_config = {
+    .memConfig =
+        {
+            .tag              = FLEXSPI_CFG_BLK_TAG,
+            .version          = FLEXSPI_CFG_BLK_VERSION,
+            .readSampleClkSrc = kFlexSPIReadSampleClk_LoopbackFromDqsPad,
+            .csHoldTime       = 3u,
+            .csSetupTime      = 3u,
+
+            .busyOffset = FLASH_BUSY_STATUS_OFFSET,     // Status bit 0 indicates busy.
+            .busyBitPolarity = FLASH_BUSY_STATUS_POL,   // Busy when the bit is 1.
+
+            .deviceModeCfgEnable = 1u,
+            .deviceModeType = kDeviceConfigCmdType_QuadEnable,
+            .deviceModeSeq = {
+                .seqId = 4u,
+                .seqNum = 1u,
+            },
+            .deviceModeArg = 0x0200,
+            .configCmdEnable = 1u,
+            .configModeType[0] = kDeviceConfigCmdType_Generic,
+            .configCmdSeqs[0] = {
+                .seqId = 2u,
+                .seqNum = 1u,
+            },
+            .deviceType = kFlexSpiDeviceType_SerialNOR,
+            // Enable DDR mode, Wordaddassable, Safe configuration, Differential clock
+            .sflashPadType = kSerialFlash_4Pads,
+            .serialClkFreq = kFlexSpiSerialClk_60MHz,
+            .sflashA1Size  = 8u * 1024u * 1024u,
+            .lookupTable =
+                {
+                    // 0 Read LUTs 0 -> 0
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0xEB, RADDR_SDR, FLEXSPI_4PAD, 0x18),
+                    FLEXSPI_LUT_SEQ(DUMMY_SDR, FLEXSPI_4PAD, 0x06, READ_SDR, FLEXSPI_4PAD, 0x04),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 1 Read status register -> 1
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x05, READ_SDR, FLEXSPI_1PAD, 0x01),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 2 Fast read quad mode - SDR
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x6B, RADDR_SDR, FLEXSPI_1PAD, 0x18),
+                    FLEXSPI_LUT_SEQ(DUMMY_SDR, FLEXSPI_4PAD, 0x08, READ_SDR, FLEXSPI_4PAD, 0x04),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 3 Write Enable -> 3
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x06, STOP, FLEXSPI_1PAD, 0),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 4 Read extend parameters
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x81, READ_SDR, FLEXSPI_1PAD, 0x04),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 5 Erase Sector -> 5
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x20, RADDR_SDR, FLEXSPI_1PAD, 24),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 6 Write Status Reg
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x01, WRITE_SDR, FLEXSPI_1PAD, 0x04),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 7 Page Program - quad mode (-> 9)
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x32, RADDR_SDR, FLEXSPI_1PAD, 0x18),
+                    FLEXSPI_LUT_SEQ(WRITE_SDR, FLEXSPI_4PAD, 0x04, STOP, FLEXSPI_1PAD, 0),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 8 Read ID
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x90, DUMMY_SDR, FLEXSPI_1PAD, 24),
+                    FLEXSPI_LUT_SEQ(READ_SDR, FLEXSPI_1PAD, 0x00, 0, 0, 0),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 9 Page Program - single mode -> 9
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x02, RADDR_SDR, FLEXSPI_1PAD, 24),
+                    FLEXSPI_LUT_SEQ(WRITE_SDR, FLEXSPI_1PAD, 0, 0, 0, 0),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 10 Enter QPI mode
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x35, STOP, FLEXSPI_1PAD, 0),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 11 Erase Chip
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x60, STOP, FLEXSPI_1PAD, 0),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+
+                    // 12 Exit QPI mode
+                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_4PAD, 0xF5, STOP, FLEXSPI_1PAD, 0),
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                },
+        },
+    .pageSize           = 256u,
+    .sectorSize         = 4u * 1024u,
+    .ipcmdSerialClkFreq = kFlexSpiSerialClk_30MHz,
+    .blockSize          = 0x00010000,
+    .isUniformBlockSize = false,
+};
+#endif /* XIP_BOOT_HEADER_ENABLE */
diff --git a/ports/mimxrt/boards/TEENSY41/mpconfigboard.h b/ports/mimxrt/boards/TEENSY41/mpconfigboard.h
new file mode 100755
index 0000000000000..6acfa11cdbe26
--- /dev/null
+++ b/ports/mimxrt/boards/TEENSY41/mpconfigboard.h
@@ -0,0 +1,10 @@
+#define MICROPY_HW_BOARD_NAME "Teensy 4.1"
+#define MICROPY_HW_MCU_NAME   "MIMXRT1062DVJ6A"
+
+#define BOARD_FLASH_SIZE (8 * 1024 * 1024)
+
+// Teensy 4.1 has 1 board LED
+#define MICROPY_HW_LED1_PIN (pin_GPIO_B0_03)
+#define MICROPY_HW_LED_ON(pin) (mp_hal_pin_high(pin))
+#define MICROPY_HW_LED_OFF(pin) (mp_hal_pin_low(pin))
+#define BOARD_FLASH_CONFIG_HEADER_H "teensy41_flexspi_nor_config.h"
diff --git a/ports/mimxrt/boards/TEENSY41/mpconfigboard.mk b/ports/mimxrt/boards/TEENSY41/mpconfigboard.mk
new file mode 100755
index 0000000000000..beab16c08600c
--- /dev/null
+++ b/ports/mimxrt/boards/TEENSY41/mpconfigboard.mk
@@ -0,0 +1,7 @@
+MCU_SERIES = MIMXRT1062
+MCU_VARIANT = MIMXRT1062DVJ6A
+
+MICROPY_FLOAT_IMPL = double
+
+deploy: $(BUILD)/firmware.hex
+	teensy_loader_cli --mcu=imxrt1062 -v -w $<
diff --git a/ports/mimxrt/boards/TEENSY41/pins.csv b/ports/mimxrt/boards/TEENSY41/pins.csv
new file mode 100755
index 0000000000000..88b91f25403ec
--- /dev/null
+++ b/ports/mimxrt/boards/TEENSY41/pins.csv
@@ -0,0 +1,83 @@
+D0,GPIO_AD_B0_03
+D1,GPIO_AD_B0_02
+D2,GPIO_EMC_04
+D3,GPIO_EMC_05
+D4,GPIO_EMC_06
+D5,GPIO_EMC_08
+D6,GPIO_B0_10
+D7,GPIO_B1_01
+D8,GPIO_B1_00
+D9,GPIO_B0_11
+D10,GPIO_B0_00
+D11,GPIO_B0_02
+D12,GPIO_B0_01
+D13,GPIO_B0_03
+D14,GPIO_AD_B1_02
+D15,GPIO_AD_B1_03
+D16,GPIO_AD_B1_07
+D17,GPIO_AD_B1_06
+D18,GPIO_AD_B1_01
+D19,GPIO_AD_B1_00
+D20,GPIO_AD_B1_10
+D21,GPIO_AD_B1_11
+D22,GPIO_AD_B1_08
+D23,GPIO_AD_B1_09
+D24,GPIO_AD_B0_12
+D25,GPIO_AD_B0_13
+D26,GPIO_AD_B1_14
+D27,GPIO_AD_B1_15
+D28,GPIO_EMC_32
+D29,GPIO_EMC_31
+D30,GPIO_EMC_37
+D31,GPIO_EMC_36
+D32,GPIO_B0_12
+D33,GPIO_EMC_07
+D34,GPIO_B1_13
+D35,GPIO_B1_12
+D36,GPIO_B1_02
+D37,GPIO_B1_03
+D38,GPIO_AD_B1_12
+D39,GPIO_AD_B1_13
+D40,GPIO_AD_B1_04
+D41,GPIO_AD_B1_05
+D42,GPIO_SD_B0_03
+D43,GPIO_SD_B0_02
+D44,GPIO_SD_B0_01
+D45,GPIO_SD_B0_00
+D46,GPIO_SD_B0_05
+D47,GPIO_SD_B0_04
+D48,GPIO_EMC_24
+D49,GPIO_EMC_27
+D50,GPIO_EMC_28
+D51,GPIO_EMC_22
+D52,GPIO_EMC_26
+D53,GPIO_EMC_25
+D54,GPIO_EMC_29
+DAT1,GPIO_SD_B0_03
+DAT0,GPIO_SD_B0_02
+CLK,GPIO_SD_B0_01
+CMD,GPIO_SD_B0_00
+DAT3,GPIO_SD_B0_05
+DAT2,GPIO_SD_B0_04
+PSRAM_CS,GPIO_EMC_24
+QSPI_IO1,GPIO_EMC_27
+QSPI_IO2,GPIO_EMC_28
+FLASH_CS,GPIO_EMC_22
+QSPI_IO0,GPIO_EMC_26
+QSPI_CLK,GPIO_EMC_25
+QSPI_IO3,GPIO_EMC_29
+A0,GPIO_AD_B1_02
+A1,GPIO_AD_B1_03
+A2,GPIO_AD_B1_07
+A3,GPIO_AD_B1_06
+A4,GPIO_AD_B1_01
+A5,GPIO_AD_B1_00
+A6,GPIO_AD_B1_10
+A7,GPIO_AD_B1_11
+A8,GPIO_AD_B1_08
+A9,GPIO_AD_B1_09
+A10,GPIO_AD_B0_12
+A11,GPIO_AD_B0_13
+A12,GPIO_AD_B1_14
+A13,GPIO_AD_B1_15
+LED,GPIO_B0_03
\ No newline at end of file
diff --git a/ports/mimxrt/boards/TEENSY41/teensy41_flexspi_nor_config.h b/ports/mimxrt/boards/TEENSY41/teensy41_flexspi_nor_config.h
new file mode 100755
index 0000000000000..445a0baccc62a
--- /dev/null
+++ b/ports/mimxrt/boards/TEENSY41/teensy41_flexspi_nor_config.h
@@ -0,0 +1,259 @@
+/*
+ * Copyright 2018 NXP
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+// Based on tinyusb/hw/bsp/teensy_40/teensy40_flexspi_nor_config.h
+
+#ifndef __TEENSY40_FLEXSPI_NOR_CONFIG__
+#define __TEENSY40_FLEXSPI_NOR_CONFIG__
+
+#include <stdint.h>
+#include <stdbool.h>
+#include "fsl_common.h"
+
+/*! @name Driver version */
+/*@{*/
+/*! @brief XIP_BOARD driver version 2.0.0. */
+#define FSL_XIP_BOARD_DRIVER_VERSION (MAKE_VERSION(2, 0, 0))
+/*@}*/
+
+/* FLEXSPI memory config block related defintions */
+#define FLEXSPI_CFG_BLK_TAG (0x42464346UL)     // ascii "FCFB" Big Endian
+#define FLEXSPI_CFG_BLK_VERSION (0x56010400UL) // V1.4.0
+#define FLEXSPI_CFG_BLK_SIZE (512)
+
+/* FLEXSPI Feature related definitions */
+#define FLEXSPI_FEATURE_HAS_PARALLEL_MODE 1
+
+/* Lookup table related definitions */
+#define CMD_INDEX_READ 0
+#define CMD_INDEX_READSTATUS 1
+#define CMD_INDEX_WRITEENABLE 2
+#define CMD_INDEX_WRITE 4
+
+#define CMD_LUT_SEQ_IDX_READ 0
+#define CMD_LUT_SEQ_IDX_READSTATUS 1
+#define CMD_LUT_SEQ_IDX_WRITEENABLE 3
+#define CMD_LUT_SEQ_IDX_ERASE 5
+#define CMD_LUT_SEQ_IDX_WRITE 9
+
+#define CMD_SDR 0x01
+#define CMD_DDR 0x21
+#define RADDR_SDR 0x02
+#define RADDR_DDR 0x22
+#define CADDR_SDR 0x03
+#define CADDR_DDR 0x23
+#define MODE1_SDR 0x04
+#define MODE1_DDR 0x24
+#define MODE2_SDR 0x05
+#define MODE2_DDR 0x25
+#define MODE4_SDR 0x06
+#define MODE4_DDR 0x26
+#define MODE8_SDR 0x07
+#define MODE8_DDR 0x27
+#define WRITE_SDR 0x08
+#define WRITE_DDR 0x28
+#define READ_SDR 0x09
+#define READ_DDR 0x29
+#define LEARN_SDR 0x0A
+#define LEARN_DDR 0x2A
+#define DATSZ_SDR 0x0B
+#define DATSZ_DDR 0x2B
+#define DUMMY_SDR 0x0C
+#define DUMMY_DDR 0x2C
+#define DUMMY_RWDS_SDR 0x0D
+#define DUMMY_RWDS_DDR 0x2D
+#define JMP_ON_CS 0x1F
+#define STOP 0
+
+#define FLEXSPI_1PAD 0
+#define FLEXSPI_2PAD 1
+#define FLEXSPI_4PAD 2
+#define FLEXSPI_8PAD 3
+
+#define FLEXSPI_LUT_SEQ(cmd0, pad0, op0, cmd1, pad1, op1)                                                              \
+    (FLEXSPI_LUT_OPERAND0(op0) | FLEXSPI_LUT_NUM_PADS0(pad0) | FLEXSPI_LUT_OPCODE0(cmd0) | FLEXSPI_LUT_OPERAND1(op1) | \
+     FLEXSPI_LUT_NUM_PADS1(pad1) | FLEXSPI_LUT_OPCODE1(cmd1))
+
+//!@brief Definitions for FlexSPI Serial Clock Frequency
+typedef enum _FlexSpiSerialClockFreq
+{
+    kFlexSpiSerialClk_30MHz  = 1,
+    kFlexSpiSerialClk_50MHz  = 2,
+    kFlexSpiSerialClk_60MHz  = 3,
+    kFlexSpiSerialClk_75MHz  = 4,
+    kFlexSpiSerialClk_80MHz  = 5,
+    kFlexSpiSerialClk_100MHz = 6,
+    kFlexSpiSerialClk_120MHz = 7,
+    kFlexSpiSerialClk_133MHz = 8,
+    kFlexSpiSerialClk_166MHz = 9,
+} flexspi_serial_clk_freq_t;
+
+//!@brief FlexSPI clock configuration type
+enum
+{
+    kFlexSpiClk_SDR, //!< Clock configure for SDR mode
+    kFlexSpiClk_DDR, //!< Clock configurat for DDR mode
+};
+
+//!@brief FlexSPI Read Sample Clock Source definition
+typedef enum _FlashReadSampleClkSource
+{
+    kFlexSPIReadSampleClk_LoopbackInternally      = 0,
+    kFlexSPIReadSampleClk_LoopbackFromDqsPad      = 1,
+    kFlexSPIReadSampleClk_LoopbackFromSckPad      = 2,
+    kFlexSPIReadSampleClk_ExternalInputFromDqsPad = 3,
+} flexspi_read_sample_clk_t;
+
+//!@brief Misc feature bit definitions
+enum
+{
+    kFlexSpiMiscOffset_DiffClkEnable            = 0, //!< Bit for Differential clock enable
+    kFlexSpiMiscOffset_Ck2Enable                = 1, //!< Bit for CK2 enable
+    kFlexSpiMiscOffset_ParallelEnable           = 2, //!< Bit for Parallel mode enable
+    kFlexSpiMiscOffset_WordAddressableEnable    = 3, //!< Bit for Word Addressable enable
+    kFlexSpiMiscOffset_SafeConfigFreqEnable     = 4, //!< Bit for Safe Configuration Frequency enable
+    kFlexSpiMiscOffset_PadSettingOverrideEnable = 5, //!< Bit for Pad setting override enable
+    kFlexSpiMiscOffset_DdrModeEnable            = 6, //!< Bit for DDR clock confiuration indication.
+};
+
+//!@brief Flash Type Definition
+enum
+{
+    kFlexSpiDeviceType_SerialNOR    = 1,    //!< Flash devices are Serial NOR
+    kFlexSpiDeviceType_SerialNAND   = 2,    //!< Flash devices are Serial NAND
+    kFlexSpiDeviceType_SerialRAM    = 3,    //!< Flash devices are Serial RAM/HyperFLASH
+    kFlexSpiDeviceType_MCP_NOR_NAND = 0x12, //!< Flash device is MCP device, A1 is Serial NOR, A2 is Serial NAND
+    kFlexSpiDeviceType_MCP_NOR_RAM  = 0x13, //!< Flash deivce is MCP device, A1 is Serial NOR, A2 is Serial RAMs
+};
+
+//!@brief Flash Pad Definitions
+enum
+{
+    kSerialFlash_1Pad  = 1,
+    kSerialFlash_2Pads = 2,
+    kSerialFlash_4Pads = 4,
+    kSerialFlash_8Pads = 8,
+};
+
+//!@brief FlexSPI LUT Sequence structure
+typedef struct _lut_sequence
+{
+    uint8_t seqNum; //!< Sequence Number, valid number: 1-16
+    uint8_t seqId;  //!< Sequence Index, valid number: 0-15
+    uint16_t reserved;
+} flexspi_lut_seq_t;
+
+//!@brief Flash Configuration Command Type
+enum
+{
+    kDeviceConfigCmdType_Generic,    //!< Generic command, for example: configure dummy cycles, drive strength, etc
+    kDeviceConfigCmdType_QuadEnable, //!< Quad Enable command
+    kDeviceConfigCmdType_Spi2Xpi,    //!< Switch from SPI to DPI/QPI/OPI mode
+    kDeviceConfigCmdType_Xpi2Spi,    //!< Switch from DPI/QPI/OPI to SPI mode
+    kDeviceConfigCmdType_Spi2NoCmd,  //!< Switch to 0-4-4/0-8-8 mode
+    kDeviceConfigCmdType_Reset,      //!< Reset device command
+};
+
+//!@brief FlexSPI Memory Configuration Block
+typedef struct _FlexSPIConfig
+{
+    uint32_t tag;               //!< [0x000-0x003] Tag, fixed value 0x42464346UL
+    uint32_t version;           //!< [0x004-0x007] Version,[31:24] -'V', [23:16] - Major, [15:8] - Minor, [7:0] - bugfix
+    uint32_t reserved0;         //!< [0x008-0x00b] Reserved for future use
+    uint8_t readSampleClkSrc;   //!< [0x00c-0x00c] Read Sample Clock Source, valid value: 0/1/3
+    uint8_t csHoldTime;         //!< [0x00d-0x00d] CS hold time, default value: 3
+    uint8_t csSetupTime;        //!< [0x00e-0x00e] CS setup time, default value: 3
+    uint8_t columnAddressWidth; //!< [0x00f-0x00f] Column Address with, for HyperBus protocol, it is fixed to 3, For
+    //! Serial NAND, need to refer to datasheet
+    uint8_t deviceModeCfgEnable; //!< [0x010-0x010] Device Mode Configure enable flag, 1 - Enable, 0 - Disable
+    uint8_t deviceModeType; //!< [0x011-0x011] Specify the configuration command type:Quad Enable, DPI/QPI/OPI switch,
+    //! Generic configuration, etc.
+    uint16_t waitTimeCfgCommands; //!< [0x012-0x013] Wait time for all configuration commands, unit: 100us, Used for
+    //! DPI/QPI/OPI switch or reset command
+    flexspi_lut_seq_t deviceModeSeq; //!< [0x014-0x017] Device mode sequence info, [7:0] - LUT sequence id, [15:8] - LUt
+    //! sequence number, [31:16] Reserved
+    uint32_t deviceModeArg;    //!< [0x018-0x01b] Argument/Parameter for device configuration
+    uint8_t configCmdEnable;   //!< [0x01c-0x01c] Configure command Enable Flag, 1 - Enable, 0 - Disable
+    uint8_t configModeType[3]; //!< [0x01d-0x01f] Configure Mode Type, similar as deviceModeTpe
+    flexspi_lut_seq_t
+        configCmdSeqs[3]; //!< [0x020-0x02b] Sequence info for Device Configuration command, similar as deviceModeSeq
+    uint32_t reserved1;   //!< [0x02c-0x02f] Reserved for future use
+    uint32_t configCmdArgs[3];     //!< [0x030-0x03b] Arguments/Parameters for device Configuration commands
+    uint32_t reserved2;            //!< [0x03c-0x03f] Reserved for future use
+    uint32_t controllerMiscOption; //!< [0x040-0x043] Controller Misc Options, see Misc feature bit definitions for more
+    //! details
+    uint8_t deviceType;    //!< [0x044-0x044] Device Type:  See Flash Type Definition for more details
+    uint8_t sflashPadType; //!< [0x045-0x045] Serial Flash Pad Type: 1 - Single, 2 - Dual, 4 - Quad, 8 - Octal
+    uint8_t serialClkFreq; //!< [0x046-0x046] Serial Flash Frequencey, device specific definitions, See System Boot
+    //! Chapter for more details
+    uint8_t lutCustomSeqEnable; //!< [0x047-0x047] LUT customization Enable, it is required if the program/erase cannot
+    //! be done using 1 LUT sequence, currently, only applicable to HyperFLASH
+    uint32_t reserved3[2];           //!< [0x048-0x04f] Reserved for future use
+    uint32_t sflashA1Size;           //!< [0x050-0x053] Size of Flash connected to A1
+    uint32_t sflashA2Size;           //!< [0x054-0x057] Size of Flash connected to A2
+    uint32_t sflashB1Size;           //!< [0x058-0x05b] Size of Flash connected to B1
+    uint32_t sflashB2Size;           //!< [0x05c-0x05f] Size of Flash connected to B2
+    uint32_t csPadSettingOverride;   //!< [0x060-0x063] CS pad setting override value
+    uint32_t sclkPadSettingOverride; //!< [0x064-0x067] SCK pad setting override value
+    uint32_t dataPadSettingOverride; //!< [0x068-0x06b] data pad setting override value
+    uint32_t dqsPadSettingOverride;  //!< [0x06c-0x06f] DQS pad setting override value
+    uint32_t timeoutInMs;            //!< [0x070-0x073] Timeout threshold for read status command
+    uint32_t commandInterval;        //!< [0x074-0x077] CS deselect interval between two commands
+    uint16_t dataValidTime[2]; //!< [0x078-0x07b] CLK edge to data valid time for PORT A and PORT B, in terms of 0.1ns
+    uint16_t busyOffset;       //!< [0x07c-0x07d] Busy offset, valid value: 0-31
+    uint16_t busyBitPolarity;  //!< [0x07e-0x07f] Busy flag polarity, 0 - busy flag is 1 when flash device is busy, 1 -
+    //! busy flag is 0 when flash device is busy
+    uint32_t lookupTable[64];           //!< [0x080-0x17f] Lookup table holds Flash command sequences
+    flexspi_lut_seq_t lutCustomSeq[12]; //!< [0x180-0x1af] Customizable LUT Sequences
+    uint32_t reserved4[4];              //!< [0x1b0-0x1bf] Reserved for future use
+} flexspi_mem_config_t;
+
+/*  */
+#define NOR_CMD_LUT_SEQ_IDX_READ_NORMAL 0
+#define NOR_CMD_LUT_SEQ_IDX_READSTATUSREG 1
+#define NOR_CMD_LUT_SEQ_IDX_READ_FAST_QUAD 2
+#define NOR_CMD_LUT_SEQ_IDX_WRITEENABLE 3
+#define NOR_CMD_LUT_SEQ_IDX_READSTATUS_XPI 4
+#define NOR_CMD_LUT_SEQ_IDX_ERASESECTOR 5
+#define NOR_CMD_LUT_SEQ_IDX_WRITESTATUSREG 6
+#define NOR_CMD_LUT_SEQ_IDX_PAGEPROGRAM_QUAD 7
+#define NOR_CMD_LUT_SEQ_IDX_READID 8
+#define NOR_CMD_LUT_SEQ_IDX_PAGEPROGRAM 9
+#define NOR_CMD_LUT_SEQ_IDX_ENTERQPI 10
+#define NOR_CMD_LUT_SEQ_IDX_CHIPERASE 11
+#define NOR_CMD_LUT_SEQ_IDX_EXITQPI 12
+
+/*
+ *  Serial NOR configuration block
+ */
+typedef struct _flexspi_nor_config
+{
+    flexspi_mem_config_t memConfig; //!< Common memory configuration info via FlexSPI
+    uint32_t pageSize;              //!< Page size of Serial NOR
+    uint32_t sectorSize;            //!< Sector size of Serial NOR
+    uint8_t ipcmdSerialClkFreq;     //!< Clock frequency for IP command
+    uint8_t isUniformBlockSize;     //!< Sector/Block size is the same
+    uint8_t reserved0[2];           //!< Reserved for future use
+    uint8_t serialNorType;          //!< Serial NOR Flash type: 0/1/2/3
+    uint8_t needExitNoCmdMode;      //!< Need to exit NoCmd mode before other IP command
+    uint8_t halfClkForNonReadCmd;   //!< Half the Serial Clock for non-read command: true/false
+    uint8_t needRestoreNoCmdMode;   //!< Need to Restore NoCmd mode after IP commmand execution
+    uint32_t blockSize;             //!< Block size
+    uint32_t reserve2[11];          //!< Reserved for future use
+} flexspi_nor_config_t;
+
+#define FLASH_BUSY_STATUS_POL 0
+#define FLASH_BUSY_STATUS_OFFSET 0
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* __EVKMIMXRT1060_FLEXSPI_NOR_CONFIG__ */

From fad0efdcf277dcc5698d59445074f4ee806d7976 Mon Sep 17 00:00:00 2001
From: leo chung <gewalalb@gmail.com>
Date: Wed, 2 Jun 2021 10:27:27 +0800
Subject: [PATCH 0934/3533] esp32/Makefile: Fix wrong target for
 partition-table.bin.

   "$(BUILD)/partition_table/partition  -table.bin" is typing mistake.

Signed-off-by: leo chung <gewalalb@gmail.com>
---
 ports/esp32/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/esp32/Makefile b/ports/esp32/Makefile
index 5a40cd956940e..5065221635a8e 100644
--- a/ports/esp32/Makefile
+++ b/ports/esp32/Makefile
@@ -38,7 +38,7 @@ all:
     		$(BUILD)/micropython.bin \
     		$(BUILD)/firmware.bin
 
-$(BUILD)/bootloader/bootloader.bin $(BUILD)/partition_table/partition  -table.bin $(BUILD)/micropython.bin: FORCE
+$(BUILD)/bootloader/bootloader.bin $(BUILD)/partition_table/partition-table.bin $(BUILD)/micropython.bin: FORCE
 
 clean:
 	idf.py $(IDFPY_FLAGS) fullclean

From a70a4e6688c6b29797b1e314ce2841e8e4fecb7b Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 4 Jun 2021 01:17:09 +1000
Subject: [PATCH 0935/3533] py/emitglue: Always flush caches when assigning
 native ARM code.

Prior to this commit, cache flushing for ARM native code was done only in
the assembler code asm_thumb_end_pass()/asm_arm_end_pass(), at the last
pass of the assembler.  But this misses flushing the cache when loading
native code from an .mpy file, ie in persistentcode.c.

The change here makes sure the cache is always flushed/cleaned/invalidated
when assigning native code on ARM architectures.

This problem was found running tests/micropython/import_mpy_native_gc.py on
the mimxrt port.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/asmarm.c   | 19 -------------------
 py/asmarm.h   |  4 +++-
 py/asmthumb.c | 15 ---------------
 py/asmthumb.h |  4 +++-
 py/emitglue.c | 25 +++++++++++++++++++++++++
 5 files changed, 31 insertions(+), 36 deletions(-)

diff --git a/py/asmarm.c b/py/asmarm.c
index 5662d75e19527..4ba93d0806eaa 100644
--- a/py/asmarm.c
+++ b/py/asmarm.c
@@ -38,25 +38,6 @@
 
 #define SIGNED_FIT24(x) (((x) & 0xff800000) == 0) || (((x) & 0xff000000) == 0xff000000)
 
-void asm_arm_end_pass(asm_arm_t *as) {
-    if (as->base.pass == MP_ASM_PASS_EMIT) {
-        #if (defined(__linux__) && defined(__GNUC__)) || __ARM_ARCH == 7
-        char *start = mp_asm_base_get_code(&as->base);
-        char *end = start + mp_asm_base_get_code_size(&as->base);
-        __builtin___clear_cache(start, end);
-        #elif defined(__arm__)
-        // flush I- and D-cache
-        asm volatile (
-            "0:"
-            "mrc p15, 0, r15, c7, c10, 3\n" // test and clean D-cache
-            "bne 0b\n"
-            "mov r0, #0\n"
-            "mcr p15, 0, r0, c7, c7, 0\n" // invalidate I-cache and D-cache
-            : : : "r0", "cc");
-        #endif
-    }
-}
-
 // Insert word into instruction flow
 STATIC void emit(asm_arm_t *as, uint op) {
     uint8_t *c = mp_asm_base_get_cur_to_write_bytes(&as->base, 4);
diff --git a/py/asmarm.h b/py/asmarm.h
index 46da661faa9ba..0e029f20e9d74 100644
--- a/py/asmarm.h
+++ b/py/asmarm.h
@@ -72,7 +72,9 @@ typedef struct _asm_arm_t {
     uint stack_adjust;
 } asm_arm_t;
 
-void asm_arm_end_pass(asm_arm_t *as);
+static inline void asm_arm_end_pass(asm_arm_t *as) {
+    (void)as;
+}
 
 void asm_arm_entry(asm_arm_t *as, int num_locals);
 void asm_arm_exit(asm_arm_t *as);
diff --git a/py/asmthumb.c b/py/asmthumb.c
index f7ac87fa0f934..db4520ce123cf 100644
--- a/py/asmthumb.c
+++ b/py/asmthumb.c
@@ -35,7 +35,6 @@
 
 #include "py/mpstate.h"
 #include "py/persistentcode.h"
-#include "py/mphal.h"
 #include "py/asmthumb.h"
 
 #define UNSIGNED_FIT5(x) ((uint32_t)(x) < 32)
@@ -62,20 +61,6 @@ static inline byte *asm_thumb_get_cur_to_write_bytes(asm_thumb_t *as, int n) {
     return mp_asm_base_get_cur_to_write_bytes(&as->base, n);
 }
 
-void asm_thumb_end_pass(asm_thumb_t *as) {
-    (void)as;
-    // could check labels are resolved...
-
-    #if __ICACHE_PRESENT == 1
-    if (as->base.pass == MP_ASM_PASS_EMIT) {
-        // flush D-cache, so the code emitted is stored in memory
-        MP_HAL_CLEAN_DCACHE(as->base.code_base, as->base.code_size);
-        // invalidate I-cache
-        SCB_InvalidateICache();
-    }
-    #endif
-}
-
 /*
 STATIC void asm_thumb_write_byte_1(asm_thumb_t *as, byte b1) {
     byte *c = asm_thumb_get_cur_to_write_bytes(as, 1);
diff --git a/py/asmthumb.h b/py/asmthumb.h
index 17a0cca98c583..1a01d20c6914f 100644
--- a/py/asmthumb.h
+++ b/py/asmthumb.h
@@ -70,7 +70,9 @@ typedef struct _asm_thumb_t {
     uint32_t stack_adjust;
 } asm_thumb_t;
 
-void asm_thumb_end_pass(asm_thumb_t *as);
+static inline void asm_thumb_end_pass(asm_thumb_t *as) {
+    (void)as;
+}
 
 void asm_thumb_entry(asm_thumb_t *as, int num_locals);
 void asm_thumb_exit(asm_thumb_t *as);
diff --git a/py/emitglue.c b/py/emitglue.c
index 0ef708a3f3f56..09b48682ffbd1 100644
--- a/py/emitglue.c
+++ b/py/emitglue.c
@@ -108,6 +108,31 @@ void mp_emit_glue_assign_native(mp_raw_code_t *rc, mp_raw_code_kind_t kind, void
 
     assert(kind == MP_CODE_NATIVE_PY || kind == MP_CODE_NATIVE_VIPER || kind == MP_CODE_NATIVE_ASM);
 
+    // Some architectures require flushing/invalidation of the I/D caches,
+    // so that the generated native code which was created in data RAM will
+    // be available for execution from instruction RAM.
+    #if MICROPY_EMIT_THUMB || MICROPY_EMIT_INLINE_THUMB
+    #if __ICACHE_PRESENT == 1
+    // Flush D-cache, so the code emitted is stored in RAM.
+    MP_HAL_CLEAN_DCACHE(fun_data, fun_len);
+    // Invalidate I-cache, so the newly-created code is reloaded from RAM.
+    SCB_InvalidateICache();
+    #endif
+    #elif MICROPY_EMIT_ARM
+    #if (defined(__linux__) && defined(__GNUC__)) || __ARM_ARCH == 7
+    __builtin___clear_cache(fun_data, (uint8_t *)fun_data + fun_len);
+    #elif defined(__arm__)
+    // Flush I-cache and D-cache.
+    asm volatile (
+        "0:"
+        "mrc p15, 0, r15, c7, c10, 3\n" // test and clean D-cache
+        "bne 0b\n"
+        "mov r0, #0\n"
+        "mcr p15, 0, r0, c7, c7, 0\n" // invalidate I-cache and D-cache
+        : : : "r0", "cc");
+    #endif
+    #endif
+
     rc->kind = kind;
     rc->scope_flags = scope_flags;
     rc->n_pos_args = n_pos_args;

From 5e1d3c8b5dff212ced531497a37651571991ddc0 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sat, 5 Jun 2021 10:40:48 +1000
Subject: [PATCH 0936/3533] py/stackctrl: Prevent unused-var warning when stack
 checking disabled.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/stackctrl.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/py/stackctrl.h b/py/stackctrl.h
index ff8da0ab138c3..c21288b2b1f57 100644
--- a/py/stackctrl.h
+++ b/py/stackctrl.h
@@ -40,7 +40,7 @@ void mp_stack_check(void);
 
 #else
 
-#define mp_stack_set_limit(limit)
+#define mp_stack_set_limit(limit) (void)(limit)
 #define MP_STACK_CHECK()
 
 #endif

From 36cb365cadfc9597d10a60c0581268fa47305b69 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sat, 5 Jun 2021 10:36:15 +1000
Subject: [PATCH 0937/3533] unix/main: Increase stack limit on ARM
 architectures.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/unix/main.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/ports/unix/main.c b/ports/unix/main.c
index e33c1742d8301..a5db0869df844 100644
--- a/ports/unix/main.c
+++ b/ports/unix/main.c
@@ -451,7 +451,13 @@ MP_NOINLINE int main_(int argc, char **argv) {
     signal(SIGPIPE, SIG_IGN);
     #endif
 
-    mp_stack_set_limit(40000 * (sizeof(void *) / 4));
+    // Define a reasonable stack limit to detect stack overflow.
+    mp_uint_t stack_limit = 40000 * (sizeof(void *) / 4);
+    #if defined(__arm__) && !defined(__thumb2__)
+    // ARM (non-Thumb) architectures require more stack.
+    stack_limit *= 2;
+    #endif
+    mp_stack_set_limit(stack_limit);
 
     pre_process_options(argc, argv);
 

From b15e1ef5a6c40b543e2b0d65252ef1475d03005e Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 4 Jun 2021 23:40:47 +1000
Subject: [PATCH 0938/3533] github/workflows: Add workflow to build and run
 unix port on ARM.

Following on from ef16834887de02cbddf414b560e5a2af9cae4b16, this adds a
coverage build and running of the test suite on an ARM 32-bit Linux-based
architecture.

Signed-off-by: Damien George <damien@micropython.org>
---
 .github/workflows/ports_unix.yml | 14 ++++++++++++++
 tools/ci.sh                      | 25 +++++++++++++++++++++++++
 2 files changed, 39 insertions(+)

diff --git a/.github/workflows/ports_unix.yml b/.github/workflows/ports_unix.yml
index 5c4a4f3047a57..c6ddd53037173 100644
--- a/.github/workflows/ports_unix.yml
+++ b/.github/workflows/ports_unix.yml
@@ -200,3 +200,17 @@ jobs:
     - name: Print failures
       if: failure()
       run: tests/run-tests.py --print-failures
+
+  qemu_arm:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Install packages
+      run: source tools/ci.sh && ci_unix_qemu_arm_setup
+    - name: Build
+      run: source tools/ci.sh && ci_unix_qemu_arm_build
+    - name: Run main test suite
+      run: source tools/ci.sh && ci_unix_qemu_arm_run_tests
+    - name: Print failures
+      if: failure()
+      run: tests/run-tests.py --print-failures
diff --git a/tools/ci.sh b/tools/ci.sh
index 22b43d451336e..e726ae40a7f52 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -300,6 +300,12 @@ CI_UNIX_OPTS_QEMU_MIPS=(
     LDFLAGS_EXTRA="-static"
 )
 
+CI_UNIX_OPTS_QEMU_ARM=(
+    CROSS_COMPILE=arm-linux-gnueabi-
+    VARIANT=coverage
+    MICROPY_STANDALONE=1
+)
+
 function ci_unix_build_helper {
     make ${MAKEOPTS} -C mpy-cross
     make ${MAKEOPTS} -C ports/unix "$@" submodules
@@ -506,6 +512,25 @@ function ci_unix_qemu_mips_run_tests {
     (cd tests && MICROPY_MICROPYTHON=../ports/unix/micropython-coverage ./run-tests.py --exclude 'vfs_posix.py' --exclude 'ffi_(callback|float|float2).py')
 }
 
+function ci_unix_qemu_arm_setup {
+    sudo apt-get update
+    sudo apt-get install gcc-arm-linux-gnueabi g++-arm-linux-gnueabi
+    sudo apt-get install qemu-user
+    qemu-arm --version
+}
+
+function ci_unix_qemu_arm_build {
+    ci_unix_build_helper "${CI_UNIX_OPTS_QEMU_ARM[@]}"
+}
+
+function ci_unix_qemu_arm_run_tests {
+    # Issues with ARM tests:
+    # - (i)listdir does not work, it always returns the empty list (it's an issue with the underlying C call)
+    export QEMU_LD_PREFIX=/usr/arm-linux-gnueabi
+    file ./ports/unix/micropython-coverage
+    (cd tests && MICROPY_MICROPYTHON=../ports/unix/micropython-coverage ./run-tests.py --exclude 'vfs_posix.py')
+}
+
 ########################################################################################
 # ports/windows
 

From f17c0db5f7bedd6653dc4559b3adb6d5c424a648 Mon Sep 17 00:00:00 2001
From: Maureen Helm <maureen.helm@nxp.com>
Date: Thu, 20 May 2021 20:52:37 -0500
Subject: [PATCH 0939/3533] zephyr: Update disk access configuration for Zephyr
 v2.6.0.

Zephyr's Kconfig symbols and defaults for SDHC/SDMMC disk drivers and
the disk access subsystem were reworked between Zephyr v2.5.0 and
v2.6.0. Update MicroPython accordingly.

Signed-off-by: Maureen Helm <maureen.helm@nxp.com>
---
 ports/zephyr/boards/mimxrt1050_evk.conf | 3 +--
 ports/zephyr/main.c                     | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/ports/zephyr/boards/mimxrt1050_evk.conf b/ports/zephyr/boards/mimxrt1050_evk.conf
index 051ab7e60b4ac..c4abf726a450c 100644
--- a/ports/zephyr/boards/mimxrt1050_evk.conf
+++ b/ports/zephyr/boards/mimxrt1050_evk.conf
@@ -1,9 +1,8 @@
 # Required for zephyr.DiskAccess block devices
 CONFIG_DISK_ACCESS=y
-CONFIG_DISK_ACCESS_SDHC=y
 
 CONFIG_USB=y
 CONFIG_USB_DEVICE_STACK=y
 CONFIG_USB_DEVICE_PRODUCT="Zephyr MicroPython"
 CONFIG_USB_MASS_STORAGE=y
-CONFIG_MASS_STORAGE_DISK_NAME="SDHC"
+CONFIG_MASS_STORAGE_DISK_NAME="SDMMC"
diff --git a/ports/zephyr/main.c b/ports/zephyr/main.c
index f8ec0a0d27e68..7172f37824668 100644
--- a/ports/zephyr/main.c
+++ b/ports/zephyr/main.c
@@ -100,8 +100,8 @@ STATIC void vfs_init(void) {
     const char *mount_point_str = NULL;
     int ret = 0;
 
-    #ifdef CONFIG_DISK_ACCESS_SDHC
-    mp_obj_t args[] = { mp_obj_new_str(CONFIG_DISK_SDHC_VOLUME_NAME, strlen(CONFIG_DISK_SDHC_VOLUME_NAME)) };
+    #ifdef CONFIG_DISK_DRIVER_SDMMC
+    mp_obj_t args[] = { mp_obj_new_str(CONFIG_SDMMC_VOLUME_NAME, strlen(CONFIG_SDMMC_VOLUME_NAME)) };
     bdev = zephyr_disk_access_type.make_new(&zephyr_disk_access_type, ARRAY_SIZE(args), 0, args);
     mount_point_str = "/sd";
     #elif defined(CONFIG_FLASH_MAP) && FLASH_AREA_LABEL_EXISTS(storage)

From 3331b1811d104739121462a30bc3340951965edf Mon Sep 17 00:00:00 2001
From: Maureen Helm <maureen.helm@nxp.com>
Date: Thu, 20 May 2021 21:03:25 -0500
Subject: [PATCH 0940/3533] zephyr: Disable CONFIG_NET_SOCKETS_POSIX_NAMES.

Zephyr's default value for CONFIG_NET_SOCKETS_POSIX_NAMES was changed
from false to true between Zephyr v2.5.0 and v2.6.0. This caused
conflicts in MicroPython, which uses the zsock_ prefixed functions, so
disable it.

Signed-off-by: Maureen Helm <maureen.helm@nxp.com>
---
 ports/zephyr/prj.conf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/zephyr/prj.conf b/ports/zephyr/prj.conf
index 9e855036d2b84..b6559e4f730ac 100644
--- a/ports/zephyr/prj.conf
+++ b/ports/zephyr/prj.conf
@@ -26,6 +26,7 @@ CONFIG_NET_IPV6=y
 CONFIG_NET_UDP=y
 CONFIG_NET_TCP=y
 CONFIG_NET_SOCKETS=y
+CONFIG_NET_SOCKETS_POSIX_NAMES=n
 CONFIG_TEST_RANDOM_GENERATOR=y
 
 CONFIG_NET_CONFIG_SETTINGS=y

From 5cb2ade65b9540dd1abdbfee944bcb9f1f1c52aa Mon Sep 17 00:00:00 2001
From: Maureen Helm <maureen.helm@nxp.com>
Date: Thu, 20 May 2021 21:48:10 -0500
Subject: [PATCH 0941/3533] zephyr: Update to Zephyr v2.6.0.

Updates the zephyr port build instructions and CI to use the latest
zephyr release tag.

Signed-off-by: Maureen Helm <maureen.helm@nxp.com>
---
 ports/zephyr/README.md | 6 +++---
 tools/ci.sh            | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ports/zephyr/README.md b/ports/zephyr/README.md
index cdc3c70f0e616..9d6c223b47382 100644
--- a/ports/zephyr/README.md
+++ b/ports/zephyr/README.md
@@ -4,7 +4,7 @@ MicroPython port to Zephyr RTOS
 This is a work-in-progress port of MicroPython to Zephyr RTOS
 (http://zephyrproject.org).
 
-This port requires Zephyr version v2.5.0, and may also work on higher
+This port requires Zephyr version v2.6.0, and may also work on higher
 versions.  All boards supported
 by Zephyr (with standard level of features support, like UART console)
 should work with MicroPython (but not all were tested).
@@ -38,13 +38,13 @@ setup is correct.
 If you already have Zephyr installed but are having issues building the
 MicroPython port then try installing the correct version of Zephyr via:
 
-    $ west init zephyrproject -m https://github.com/zephyrproject-rtos/zephyr --mr v2.5.0
+    $ west init zephyrproject -m https://github.com/zephyrproject-rtos/zephyr --mr v2.6.0
 
 Alternatively, you don't have to redo the Zephyr installation to just
 switch from master to a tagged release, you can instead do:
 
     $ cd zephyrproject/zephyr
-    $ git checkout v2.5.0
+    $ git checkout v2.6.0
     $ west update
 
 With Zephyr installed you may then need to configure your environment,
diff --git a/tools/ci.sh b/tools/ci.sh
index e726ae40a7f52..96c1bf89af206 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -559,7 +559,7 @@ function ci_zephyr_setup {
 }
 
 function ci_zephyr_install {
-    docker exec zephyr-ci west init --mr v2.5.0 /zephyrproject
+    docker exec zephyr-ci west init --mr v2.6.0 /zephyrproject
     docker exec -w /zephyrproject zephyr-ci west update
     docker exec -w /zephyrproject zephyr-ci west zephyr-export
 }

From 80e79a777de8a43a37964be672da9e2449f4ec53 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sun, 25 Apr 2021 22:30:19 +1000
Subject: [PATCH 0942/3533] zephyr: Add initial ubluetooth module integration.

Currently only advertising and scanning are supported, using the ring
buffer for events (ie not synchronous events at this stage).

The ble_gap_advertise.py multi-test passes (tested on a nucleo_wb55rg
board).

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/zephyr/CMakeLists.txt        |   1 +
 ports/zephyr/main.c                |   4 +
 ports/zephyr/modbluetooth_zephyr.c | 410 +++++++++++++++++++++++++++++
 ports/zephyr/mpconfigport.h        |  11 +-
 ports/zephyr/src/zephyr_start.c    |   4 +
 5 files changed, 429 insertions(+), 1 deletion(-)
 create mode 100644 ports/zephyr/modbluetooth_zephyr.c

diff --git a/ports/zephyr/CMakeLists.txt b/ports/zephyr/CMakeLists.txt
index e30759e064464..80adea5d86892 100644
--- a/ports/zephyr/CMakeLists.txt
+++ b/ports/zephyr/CMakeLists.txt
@@ -40,6 +40,7 @@ set(MICROPY_SOURCE_PORT
     machine_i2c.c
     machine_pin.c
     machine_uart.c
+    modbluetooth_zephyr.c
     modmachine.c
     moduos.c
     modusocket.c
diff --git a/ports/zephyr/main.c b/ports/zephyr/main.c
index 7172f37824668..38285ad944962 100644
--- a/ports/zephyr/main.c
+++ b/ports/zephyr/main.c
@@ -49,6 +49,7 @@
 #include "py/stackctrl.h"
 #include "lib/utils/pyexec.h"
 #include "lib/mp-readline/readline.h"
+#include "extmod/modbluetooth.h"
 
 #if MICROPY_VFS
 #include "extmod/vfs.h"
@@ -168,6 +169,9 @@ int real_main(void) {
 
     printf("soft reboot\n");
 
+    #if MICROPY_PY_BLUETOOTH
+    mp_bluetooth_deinit();
+    #endif
     #if MICROPY_PY_MACHINE
     machine_pin_deinit();
     #endif
diff --git a/ports/zephyr/modbluetooth_zephyr.c b/ports/zephyr/modbluetooth_zephyr.c
new file mode 100644
index 0000000000000..6b3a10d47114e
--- /dev/null
+++ b/ports/zephyr/modbluetooth_zephyr.c
@@ -0,0 +1,410 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2019-2021 Damien P. George
+ * Copyright (c) 2019-2020 Jim Mussared
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "py/runtime.h"
+#include "py/mperrno.h"
+#include "py/mphal.h"
+
+#if MICROPY_PY_BLUETOOTH
+
+#include <bluetooth/bluetooth.h>
+#include <bluetooth/hci.h>
+#include "extmod/modbluetooth.h"
+
+#define DEBUG_printf(...) // printk("BLE: " __VA_ARGS__)
+
+#define BLE_HCI_SCAN_ITVL_MIN 0x10
+#define BLE_HCI_SCAN_ITVL_MAX 0xffff
+#define BLE_HCI_SCAN_WINDOW_MIN 0x10
+#define BLE_HCI_SCAN_WINDOW_MAX 0xffff
+
+#define ERRNO_BLUETOOTH_NOT_ACTIVE MP_ENODEV
+
+enum {
+    MP_BLUETOOTH_ZEPHYR_BLE_STATE_OFF,
+    MP_BLUETOOTH_ZEPHYR_BLE_STATE_ACTIVE,
+    MP_BLUETOOTH_ZEPHYR_BLE_STATE_SUSPENDED,
+};
+
+enum {
+    MP_BLUETOOTH_ZEPHYR_GAP_SCAN_STATE_INACTIVE,
+    MP_BLUETOOTH_ZEPHYR_GAP_SCAN_STATE_DEACTIVATING,
+    MP_BLUETOOTH_ZEPHYR_GAP_SCAN_STATE_ACTIVE,
+};
+
+typedef struct _mp_bluetooth_zephyr_root_pointers_t {
+    // Characteristic (and descriptor) value storage.
+    mp_gatts_db_t gatts_db;
+} mp_bluetooth_zephyr_root_pointers_t;
+
+STATIC int mp_bluetooth_zephyr_ble_state;
+
+#if MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE
+STATIC int mp_bluetooth_zephyr_gap_scan_state;
+STATIC struct k_timer mp_bluetooth_zephyr_gap_scan_timer;
+STATIC struct bt_le_scan_cb mp_bluetooth_zephyr_gap_scan_cb_struct;
+#endif
+
+STATIC int bt_err_to_errno(int err) {
+    // Zephyr uses errno codes directly, but they are negative.
+    return -err;
+}
+
+// modbluetooth (and the layers above it) work in BE for addresses, Zephyr works in LE.
+STATIC void reverse_addr_byte_order(uint8_t *addr_out, const bt_addr_le_t *addr_in) {
+    for (int i = 0; i < 6; ++i) {
+        addr_out[i] = addr_in->a.val[5 - i];
+    }
+}
+
+#if MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE
+void gap_scan_cb_recv(const struct bt_le_scan_recv_info *info, struct net_buf_simple *buf) {
+    DEBUG_printf("gap_scan_cb_recv: adv_type=%d\n", info->adv_type);
+
+    if (!mp_bluetooth_is_active()) {
+        return;
+    }
+
+    if (mp_bluetooth_zephyr_gap_scan_state != MP_BLUETOOTH_ZEPHYR_GAP_SCAN_STATE_ACTIVE) {
+        return;
+    }
+
+    uint8_t addr[6];
+    reverse_addr_byte_order(addr, info->addr);
+    mp_bluetooth_gap_on_scan_result(info->addr->type, addr, info->adv_type, info->rssi, buf->data, buf->len);
+}
+
+STATIC mp_obj_t gap_scan_stop(mp_obj_t unused) {
+    (void)unused;
+    mp_bluetooth_gap_scan_stop();
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(gap_scan_stop_obj, gap_scan_stop);
+
+void gap_scan_cb_timeout(struct k_timer *timer_id) {
+    DEBUG_printf("gap_scan_cb_timeout\n");
+    // Cannot call bt_le_scan_stop from a timer callback because this callback may be
+    // preempting the BT stack.  So schedule it to be called from the main thread.
+    while (!mp_sched_schedule(MP_OBJ_FROM_PTR(&gap_scan_stop_obj), mp_const_none)) {
+        k_yield();
+    }
+    // Indicate scanning has stopped so that no more scan result events are generated
+    // (they may still come in until bt_le_scan_stop is called by gap_scan_stop).
+    mp_bluetooth_zephyr_gap_scan_state = MP_BLUETOOTH_ZEPHYR_GAP_SCAN_STATE_DEACTIVATING;
+}
+#endif
+
+int mp_bluetooth_init(void) {
+    DEBUG_printf("mp_bluetooth_init\n");
+
+    // Clean up if necessary.
+    mp_bluetooth_deinit();
+
+    // Allocate memory for state.
+    MP_STATE_PORT(bluetooth_zephyr_root_pointers) = m_new0(mp_bluetooth_zephyr_root_pointers_t, 1);
+    mp_bluetooth_gatts_db_create(&MP_STATE_PORT(bluetooth_zephyr_root_pointers)->gatts_db);
+
+    #if MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE
+    mp_bluetooth_zephyr_gap_scan_state = MP_BLUETOOTH_ZEPHYR_GAP_SCAN_STATE_INACTIVE;
+    k_timer_init(&mp_bluetooth_zephyr_gap_scan_timer, gap_scan_cb_timeout, NULL);
+    mp_bluetooth_zephyr_gap_scan_cb_struct.recv = gap_scan_cb_recv;
+    mp_bluetooth_zephyr_gap_scan_cb_struct.timeout = NULL; // currently not implemented in Zephyr
+    bt_le_scan_cb_register(&mp_bluetooth_zephyr_gap_scan_cb_struct);
+    #endif
+
+    if (mp_bluetooth_zephyr_ble_state == MP_BLUETOOTH_ZEPHYR_BLE_STATE_OFF) {
+        // bt_enable can only be called once.
+        int ret = bt_enable(NULL);
+        if (ret) {
+            return bt_err_to_errno(ret);
+        }
+    }
+
+    mp_bluetooth_zephyr_ble_state = MP_BLUETOOTH_ZEPHYR_BLE_STATE_ACTIVE;
+
+    DEBUG_printf("mp_bluetooth_init: ready\n");
+
+    return 0;
+}
+
+void mp_bluetooth_deinit(void) {
+    DEBUG_printf("mp_bluetooth_deinit %d\n", mp_bluetooth_zephyr_ble_state);
+    if (mp_bluetooth_zephyr_ble_state == MP_BLUETOOTH_ZEPHYR_BLE_STATE_OFF
+        || mp_bluetooth_zephyr_ble_state == MP_BLUETOOTH_ZEPHYR_BLE_STATE_SUSPENDED) {
+        return;
+    }
+
+    mp_bluetooth_gap_advertise_stop();
+
+    #if MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE
+    mp_bluetooth_gap_scan_stop();
+    bt_le_scan_cb_unregister(&mp_bluetooth_zephyr_gap_scan_cb_struct);
+    #endif
+
+    // There is no way to turn off the BT stack in Zephyr, so just set the
+    // state as suspended so it can be correctly reactivated later.
+    mp_bluetooth_zephyr_ble_state = MP_BLUETOOTH_ZEPHYR_BLE_STATE_SUSPENDED;
+
+    MP_STATE_PORT(bluetooth_zephyr_root_pointers) = NULL;
+}
+
+bool mp_bluetooth_is_active(void) {
+    return mp_bluetooth_zephyr_ble_state == MP_BLUETOOTH_ZEPHYR_BLE_STATE_ACTIVE;
+}
+
+void mp_bluetooth_get_current_address(uint8_t *addr_type, uint8_t *addr) {
+    if (!mp_bluetooth_is_active()) {
+        mp_raise_OSError(ERRNO_BLUETOOTH_NOT_ACTIVE);
+    }
+    bt_addr_le_t le_addr;
+    size_t count = 1;
+    bt_id_get(&le_addr, &count);
+    if (count == 0) {
+        mp_raise_OSError(EIO);
+    }
+    reverse_addr_byte_order(addr, &le_addr);
+    *addr_type = le_addr.type;
+}
+
+void mp_bluetooth_set_address_mode(uint8_t addr_mode) {
+    // TODO: implement
+}
+
+size_t mp_bluetooth_gap_get_device_name(const uint8_t **buf) {
+    const char *name = bt_get_name();
+    *buf = (const uint8_t *)name;
+    return strlen(name);
+}
+
+int mp_bluetooth_gap_set_device_name(const uint8_t *buf, size_t len) {
+    char tmp_buf[CONFIG_BT_DEVICE_NAME_MAX + 1];
+    if (len + 1 > sizeof(tmp_buf)) {
+        return MP_EINVAL;
+    }
+    memcpy(tmp_buf, buf, len);
+    tmp_buf[len] = '\0';
+    return bt_err_to_errno(bt_set_name(tmp_buf));
+}
+
+// Zephyr takes advertising/scan data as an array of (type, len, payload) packets,
+// and this function constructs such an array from raw advertising/scan data.
+STATIC void mp_bluetooth_prepare_bt_data(const uint8_t *data, size_t len, struct bt_data *bt_data, size_t *bt_len) {
+    size_t i = 0;
+    const uint8_t *d = data;
+    while (d < data + len && i < *bt_len) {
+        bt_data[i].type = d[1];
+        bt_data[i].data_len = d[0] - 1;
+        bt_data[i].data = &d[2];
+        i += 1;
+        d += 1 + d[0];
+    }
+    *bt_len = i;
+}
+
+int mp_bluetooth_gap_advertise_start(bool connectable, int32_t interval_us, const uint8_t *adv_data, size_t adv_data_len, const uint8_t *sr_data, size_t sr_data_len) {
+    if (!mp_bluetooth_is_active()) {
+        return ERRNO_BLUETOOTH_NOT_ACTIVE;
+    }
+
+    mp_bluetooth_gap_advertise_stop();
+
+    struct bt_data bt_ad_data[8];
+    size_t bt_ad_len = 0;
+    if (adv_data) {
+        bt_ad_len = MP_ARRAY_SIZE(bt_ad_data);
+        mp_bluetooth_prepare_bt_data(adv_data, adv_data_len, bt_ad_data, &bt_ad_len);
+    }
+
+    struct bt_data bt_sd_data[8];
+    size_t bt_sd_len = 0;
+    if (sr_data) {
+        bt_sd_len = MP_ARRAY_SIZE(bt_sd_data);
+        mp_bluetooth_prepare_bt_data(sr_data, sr_data_len, bt_sd_data, &bt_sd_len);
+    }
+
+    struct bt_le_adv_param param = {
+        .id = 0,
+        .sid = 0,
+        .secondary_max_skip = 0,
+        .options = (connectable ? BT_LE_ADV_OPT_CONNECTABLE : 0)
+            | BT_LE_ADV_OPT_ONE_TIME
+            | BT_LE_ADV_OPT_USE_IDENTITY
+            | BT_LE_ADV_OPT_SCANNABLE,
+        .interval_min = interval_us / 625,
+        .interval_max = interval_us / 625 + 1, // min/max cannot be the same value
+        .peer = NULL,
+    };
+
+    return bt_err_to_errno(bt_le_adv_start(&param, bt_ad_data, bt_ad_len, bt_sd_data, bt_sd_len));
+}
+
+void mp_bluetooth_gap_advertise_stop(void) {
+    // Note: bt_le_adv_stop returns 0 if adv is already stopped.
+    int ret = bt_le_adv_stop();
+    if (ret != 0) {
+        mp_raise_OSError(bt_err_to_errno(ret));
+    }
+}
+
+int mp_bluetooth_gatts_register_service_begin(bool append) {
+    if (!mp_bluetooth_is_active()) {
+        return ERRNO_BLUETOOTH_NOT_ACTIVE;
+    }
+
+    if (append) {
+        // Don't support append yet (modbluetooth.c doesn't support it yet anyway).
+        return MP_EOPNOTSUPP;
+    }
+
+    // Reset the gatt characteristic value db.
+    mp_bluetooth_gatts_db_reset(MP_STATE_PORT(bluetooth_zephyr_root_pointers)->gatts_db);
+
+    return MP_EOPNOTSUPP;
+}
+
+int mp_bluetooth_gatts_register_service_end(void) {
+    return MP_EOPNOTSUPP;
+}
+
+int mp_bluetooth_gatts_register_service(mp_obj_bluetooth_uuid_t *service_uuid, mp_obj_bluetooth_uuid_t **characteristic_uuids, uint16_t *characteristic_flags, mp_obj_bluetooth_uuid_t **descriptor_uuids, uint16_t *descriptor_flags, uint8_t *num_descriptors, uint16_t *handles, size_t num_characteristics) {
+    return MP_EOPNOTSUPP;
+}
+
+int mp_bluetooth_gap_disconnect(uint16_t conn_handle) {
+    if (!mp_bluetooth_is_active()) {
+        return ERRNO_BLUETOOTH_NOT_ACTIVE;
+    }
+    return MP_EOPNOTSUPP;
+}
+
+int mp_bluetooth_gatts_read(uint16_t value_handle, uint8_t **value, size_t *value_len) {
+    if (!mp_bluetooth_is_active()) {
+        return ERRNO_BLUETOOTH_NOT_ACTIVE;
+    }
+    return mp_bluetooth_gatts_db_read(MP_STATE_PORT(bluetooth_zephyr_root_pointers)->gatts_db, value_handle, value, value_len);
+}
+
+int mp_bluetooth_gatts_write(uint16_t value_handle, const uint8_t *value, size_t value_len) {
+    if (!mp_bluetooth_is_active()) {
+        return ERRNO_BLUETOOTH_NOT_ACTIVE;
+    }
+    return mp_bluetooth_gatts_db_write(MP_STATE_PORT(bluetooth_zephyr_root_pointers)->gatts_db, value_handle, value, value_len);
+}
+
+int mp_bluetooth_gatts_notify(uint16_t conn_handle, uint16_t value_handle) {
+    if (!mp_bluetooth_is_active()) {
+        return ERRNO_BLUETOOTH_NOT_ACTIVE;
+    }
+    return MP_EOPNOTSUPP;
+}
+
+int mp_bluetooth_gatts_notify_send(uint16_t conn_handle, uint16_t value_handle, const uint8_t *value, size_t value_len) {
+    if (!mp_bluetooth_is_active()) {
+        return ERRNO_BLUETOOTH_NOT_ACTIVE;
+    }
+    return MP_EOPNOTSUPP;
+}
+
+int mp_bluetooth_gatts_indicate(uint16_t conn_handle, uint16_t value_handle) {
+    if (!mp_bluetooth_is_active()) {
+        return ERRNO_BLUETOOTH_NOT_ACTIVE;
+    }
+    return MP_EOPNOTSUPP;
+}
+
+int mp_bluetooth_gatts_set_buffer(uint16_t value_handle, size_t len, bool append) {
+    if (!mp_bluetooth_is_active()) {
+        return ERRNO_BLUETOOTH_NOT_ACTIVE;
+    }
+    return MP_EOPNOTSUPP;
+}
+
+int mp_bluetooth_get_preferred_mtu(void) {
+    if (!mp_bluetooth_is_active()) {
+        mp_raise_OSError(ERRNO_BLUETOOTH_NOT_ACTIVE);
+    }
+    mp_raise_OSError(MP_EOPNOTSUPP);
+}
+
+int mp_bluetooth_set_preferred_mtu(uint16_t mtu) {
+    if (!mp_bluetooth_is_active()) {
+        return ERRNO_BLUETOOTH_NOT_ACTIVE;
+    }
+    return MP_EOPNOTSUPP;
+}
+
+#if MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE
+
+int mp_bluetooth_gap_scan_start(int32_t duration_ms, int32_t interval_us, int32_t window_us, bool active_scan) {
+    // Stop any ongoing GAP scan.
+    int ret = mp_bluetooth_gap_scan_stop();
+    if (ret) {
+        return ret;
+    }
+
+    struct bt_le_scan_param param = {
+        .type = active_scan ? BT_HCI_LE_SCAN_ACTIVE : BT_HCI_LE_SCAN_PASSIVE,
+        .options = BT_LE_SCAN_OPT_NONE,
+        .interval = MAX(BLE_HCI_SCAN_ITVL_MIN, MIN(BLE_HCI_SCAN_ITVL_MAX, interval_us / 625)),
+        .window = MAX(BLE_HCI_SCAN_WINDOW_MIN, MIN(BLE_HCI_SCAN_WINDOW_MAX, window_us / 625)),
+    };
+    k_timer_start(&mp_bluetooth_zephyr_gap_scan_timer, K_MSEC(duration_ms), K_NO_WAIT);
+    mp_bluetooth_zephyr_gap_scan_state = MP_BLUETOOTH_ZEPHYR_GAP_SCAN_STATE_ACTIVE;
+    int err = bt_le_scan_start(&param, NULL);
+    return bt_err_to_errno(err);
+}
+
+int mp_bluetooth_gap_scan_stop(void) {
+    DEBUG_printf("mp_bluetooth_gap_scan_stop\n");
+    if (!mp_bluetooth_is_active()) {
+        return ERRNO_BLUETOOTH_NOT_ACTIVE;
+    }
+    if (mp_bluetooth_zephyr_gap_scan_state == MP_BLUETOOTH_ZEPHYR_GAP_SCAN_STATE_INACTIVE) {
+        // Already stopped.
+        return 0;
+    }
+    mp_bluetooth_zephyr_gap_scan_state = MP_BLUETOOTH_ZEPHYR_GAP_SCAN_STATE_INACTIVE;
+    k_timer_stop(&mp_bluetooth_zephyr_gap_scan_timer);
+    int err = bt_le_scan_stop();
+    if (err == 0) {
+        mp_bluetooth_gap_on_scan_complete();
+        return 0;
+    }
+    return bt_err_to_errno(err);
+}
+
+int mp_bluetooth_gap_peripheral_connect(uint8_t addr_type, const uint8_t *addr, int32_t duration_ms) {
+    DEBUG_printf("mp_bluetooth_gap_peripheral_connect\n");
+    if (!mp_bluetooth_is_active()) {
+        return ERRNO_BLUETOOTH_NOT_ACTIVE;
+    }
+    return MP_EOPNOTSUPP;
+}
+
+#endif // MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE
+
+#endif // MICROPY_PY_BLUETOOTH
diff --git a/ports/zephyr/mpconfigport.h b/ports/zephyr/mpconfigport.h
index 162ac8a5766a2..c7f46530031c6 100644
--- a/ports/zephyr/mpconfigport.h
+++ b/ports/zephyr/mpconfigport.h
@@ -52,6 +52,7 @@
 #define MICROPY_PY_BUILTINS_REVERSED (0)
 #define MICROPY_PY_BUILTINS_SET     (0)
 #define MICROPY_PY_BUILTINS_STR_COUNT (0)
+#define MICROPY_PY_BUILTINS_MEMORYVIEW (1)
 #define MICROPY_PY_BUILTINS_HELP    (1)
 #define MICROPY_PY_BUILTINS_HELP_TEXT zephyr_help_text
 #define MICROPY_PY_ARRAY            (0)
@@ -69,6 +70,13 @@
 #define MICROPY_PY_UERRNO           (1)
 #define MICROPY_PY_USOCKET          (1)
 #endif
+#ifdef CONFIG_BT
+#define MICROPY_PY_BLUETOOTH        (1)
+#ifdef CONFIG_BT_CENTRAL
+#define MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE (1)
+#endif
+#define MICROPY_PY_BLUETOOTH_ENABLE_GATT_CLIENT (0)
+#endif
 #define MICROPY_PY_UBINASCII        (1)
 #define MICROPY_PY_UHASHLIB         (1)
 #define MICROPY_PY_UOS              (1)
@@ -123,7 +131,8 @@ typedef long mp_off_t;
 
 #define MICROPY_PORT_ROOT_POINTERS \
     const char *readline_hist[8]; \
-    void *machine_pin_irq_list; /* Linked list of pin irq objects */
+    void *machine_pin_irq_list; /* Linked list of pin irq objects */ \
+    struct _mp_bluetooth_zephyr_root_pointers_t *bluetooth_zephyr_root_pointers;
 
 extern const struct _mp_obj_module_t mp_module_machine;
 extern const struct _mp_obj_module_t mp_module_time;
diff --git a/ports/zephyr/src/zephyr_start.c b/ports/zephyr/src/zephyr_start.c
index 2e0993451bde4..62ee922a86c6d 100644
--- a/ports/zephyr/src/zephyr_start.c
+++ b/ports/zephyr/src/zephyr_start.c
@@ -36,4 +36,8 @@ void main(void) {
     zephyr_getchar_init();
 #endif
     real_main();
+
+    // This is needed so the linker includes k_timer_init, z_impl_k_timer_start
+    // and z_impl_k_timer_stop, as used by libmicropython.a.
+    k_timer_start(NULL, K_MSEC(0), K_MSEC(0));
 }

From d00523ba0c04348d6b733c80a5d8a92468cde536 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sun, 25 Apr 2021 22:30:45 +1000
Subject: [PATCH 0943/3533] zephyr/boards: Enable ubluetooth on nucleo_wb55rg
 board.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/zephyr/boards/nucleo_wb55rg.conf | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ports/zephyr/boards/nucleo_wb55rg.conf b/ports/zephyr/boards/nucleo_wb55rg.conf
index 369dabddebf20..baf0f28075553 100644
--- a/ports/zephyr/boards/nucleo_wb55rg.conf
+++ b/ports/zephyr/boards/nucleo_wb55rg.conf
@@ -1,2 +1,6 @@
 CONFIG_CONSOLE_SUBSYS=n
 CONFIG_NETWORKING=n
+CONFIG_BT=y
+CONFIG_BT_DEVICE_NAME_DYNAMIC=y
+CONFIG_BT_PERIPHERAL=y
+CONFIG_BT_CENTRAL=y

From da8e47da21caba25994b6160ef8a2095ca1871ac Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 26 Apr 2021 00:37:11 +1000
Subject: [PATCH 0944/3533] tests/run-multitests.py: Allow to work without
 sys.stdout on target.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/run-multitests.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tests/run-multitests.py b/tests/run-multitests.py
index 66ca799675454..b4afc1e52612a 100755
--- a/tests/run-multitests.py
+++ b/tests/run-multitests.py
@@ -32,8 +32,10 @@
 class multitest:
     @staticmethod
     def flush():
-        if hasattr(sys.stdout, "flush"):
+        try:
             sys.stdout.flush()
+        except AttributeError:
+            pass
     @staticmethod
     def skip():
         print("SKIP")

From 784208543448e8022b185a82015e107f04960738 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 26 Apr 2021 00:37:36 +1000
Subject: [PATCH 0945/3533] tests/multi_bluetooth/ble_gap_advertise.py: Allow
 to work without set.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/multi_bluetooth/ble_gap_advertise.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/multi_bluetooth/ble_gap_advertise.py b/tests/multi_bluetooth/ble_gap_advertise.py
index bb1ef94a71e7b..67c8bf4593965 100644
--- a/tests/multi_bluetooth/ble_gap_advertise.py
+++ b/tests/multi_bluetooth/ble_gap_advertise.py
@@ -30,14 +30,14 @@ def instance0():
 def instance1():
     multitest.next()
     finished = False
-    adv_types = set()
+    adv_types = {}
     adv_data = None
 
     def irq(ev, data):
         nonlocal finished, adv_types, adv_data
         if ev == _IRQ_SCAN_RESULT:
             if data[0] == BDADDR[0] and data[1] == BDADDR[1]:
-                adv_types.add(data[2])
+                adv_types[data[2]] = True
                 if adv_data is None:
                     adv_data = bytes(data[4])
                 else:

From 20a8f4f7ec2f691e2381a150ac6e246df9c58077 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sat, 5 Jun 2021 22:28:05 +1000
Subject: [PATCH 0946/3533] tests/unix: Add ffi test for integer types.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/unix/ffi_lib.c        |  33 +++++++++
 tests/unix/ffi_types.py     |  51 ++++++++++++++
 tests/unix/ffi_types.py.exp | 136 ++++++++++++++++++++++++++++++++++++
 tools/ci.sh                 |  10 +++
 4 files changed, 230 insertions(+)
 create mode 100644 tests/unix/ffi_lib.c
 create mode 100644 tests/unix/ffi_types.py
 create mode 100644 tests/unix/ffi_types.py.exp

diff --git a/tests/unix/ffi_lib.c b/tests/unix/ffi_lib.c
new file mode 100644
index 0000000000000..35340536aeede
--- /dev/null
+++ b/tests/unix/ffi_lib.c
@@ -0,0 +1,33 @@
+#include <stdint.h>
+
+int8_t f8i(int8_t x) {
+    return x ^ 1;
+}
+
+uint8_t f8u(uint8_t x) {
+    return x ^ 1;
+}
+
+int16_t f16i(int16_t x) {
+    return x ^ 1;
+}
+
+uint16_t f16u(uint16_t x) {
+    return x ^ 1;
+}
+
+int32_t f32i(int32_t x) {
+    return x ^ 1;
+}
+
+uint32_t f32u(uint32_t x) {
+    return x ^ 1;
+}
+
+int64_t f64i(int64_t x) {
+    return x ^ 1;
+}
+
+uint64_t f64u(uint64_t x) {
+    return x ^ 1;
+}
diff --git a/tests/unix/ffi_types.py b/tests/unix/ffi_types.py
new file mode 100644
index 0000000000000..fd94c509d05ed
--- /dev/null
+++ b/tests/unix/ffi_types.py
@@ -0,0 +1,51 @@
+# test 8/16/32/64 bit signed/unsigned integer arguments and return types for ffi functions
+# requires ffi_lib.c to be compiled as: $(CC) -shared -o ffi_lib.so ffi_lib.c
+
+import uos, usys
+
+try:
+    import ffi
+except ImportError:
+    print("SKIP")
+    raise SystemExit
+
+ffi_lib_filename = "./" + usys.argv[0].rsplit("/", 1)[0] + "/ffi_lib.so"
+try:
+    uos.stat(ffi_lib_filename)
+except OSError:
+    print("SKIP")
+    raise SystemExit
+
+ffi_lib = ffi.open(ffi_lib_filename)
+
+f8i = ffi_lib.func("b", "f8i", "b")
+f8u = ffi_lib.func("B", "f8u", "B")
+f16i = ffi_lib.func("h", "f16i", "h")
+f16u = ffi_lib.func("H", "f16u", "H")
+f32i = ffi_lib.func("i", "f32i", "i")
+f32u = ffi_lib.func("I", "f32u", "I")
+f64i = ffi_lib.func("q", "f64i", "q")
+f64u = ffi_lib.func("Q", "f64u", "Q")
+
+for func_name in ("f8i", "f8u", "f16i", "f16u", "f32i", "f32u", "f64i", "f64u"):
+    func = globals()[func_name]
+    for val in (
+        0,
+        0x7F,
+        0x80,
+        0xFF,
+        0x100,
+        0x7FFF,
+        0x8000,
+        0xFFFF,
+        0x10000,
+        0x7FFFFFFF,
+        0x80000000,
+        0xFFFFFFFF,
+        0x100000000,
+        0x7FFF_FFFF_FFFF_FFFF,
+        0x8000_0000_0000_0000,
+        0xFFFF_FFFF_FFFF_FFFF,
+        0x1_0000_0000_0000_0000,
+    ):
+        print("{}({:x}) = {:x}".format(func_name, val, func(val)))
diff --git a/tests/unix/ffi_types.py.exp b/tests/unix/ffi_types.py.exp
new file mode 100644
index 0000000000000..d6324477d6105
--- /dev/null
+++ b/tests/unix/ffi_types.py.exp
@@ -0,0 +1,136 @@
+f8i(0) = 1
+f8i(7f) = 7e
+f8i(80) = -7f
+f8i(ff) = -2
+f8i(100) = 1
+f8i(7fff) = -2
+f8i(8000) = 1
+f8i(ffff) = -2
+f8i(10000) = 1
+f8i(7fffffff) = -2
+f8i(80000000) = 1
+f8i(ffffffff) = -2
+f8i(100000000) = 1
+f8i(7fffffffffffffff) = -2
+f8i(8000000000000000) = 1
+f8i(ffffffffffffffff) = -2
+f8i(10000000000000000) = 1
+f8u(0) = 1
+f8u(7f) = 7e
+f8u(80) = 81
+f8u(ff) = fe
+f8u(100) = 1
+f8u(7fff) = fe
+f8u(8000) = 1
+f8u(ffff) = fe
+f8u(10000) = 1
+f8u(7fffffff) = fe
+f8u(80000000) = 1
+f8u(ffffffff) = fe
+f8u(100000000) = 1
+f8u(7fffffffffffffff) = fe
+f8u(8000000000000000) = 1
+f8u(ffffffffffffffff) = fe
+f8u(10000000000000000) = 1
+f16i(0) = 1
+f16i(7f) = 7e
+f16i(80) = 81
+f16i(ff) = fe
+f16i(100) = 101
+f16i(7fff) = 7ffe
+f16i(8000) = -7fff
+f16i(ffff) = -2
+f16i(10000) = 1
+f16i(7fffffff) = -2
+f16i(80000000) = 1
+f16i(ffffffff) = -2
+f16i(100000000) = 1
+f16i(7fffffffffffffff) = -2
+f16i(8000000000000000) = 1
+f16i(ffffffffffffffff) = -2
+f16i(10000000000000000) = 1
+f16u(0) = 1
+f16u(7f) = 7e
+f16u(80) = 81
+f16u(ff) = fe
+f16u(100) = 101
+f16u(7fff) = 7ffe
+f16u(8000) = 8001
+f16u(ffff) = fffe
+f16u(10000) = 1
+f16u(7fffffff) = fffe
+f16u(80000000) = 1
+f16u(ffffffff) = fffe
+f16u(100000000) = 1
+f16u(7fffffffffffffff) = fffe
+f16u(8000000000000000) = 1
+f16u(ffffffffffffffff) = fffe
+f16u(10000000000000000) = 1
+f32i(0) = 1
+f32i(7f) = 7e
+f32i(80) = 81
+f32i(ff) = fe
+f32i(100) = 101
+f32i(7fff) = 7ffe
+f32i(8000) = 8001
+f32i(ffff) = fffe
+f32i(10000) = 10001
+f32i(7fffffff) = 7ffffffe
+f32i(80000000) = -7fffffff
+f32i(ffffffff) = -2
+f32i(100000000) = 1
+f32i(7fffffffffffffff) = -2
+f32i(8000000000000000) = 1
+f32i(ffffffffffffffff) = -2
+f32i(10000000000000000) = 1
+f32u(0) = 1
+f32u(7f) = 7e
+f32u(80) = 81
+f32u(ff) = fe
+f32u(100) = 101
+f32u(7fff) = 7ffe
+f32u(8000) = 8001
+f32u(ffff) = fffe
+f32u(10000) = 10001
+f32u(7fffffff) = 7ffffffe
+f32u(80000000) = 80000001
+f32u(ffffffff) = fffffffe
+f32u(100000000) = 1
+f32u(7fffffffffffffff) = fffffffe
+f32u(8000000000000000) = 1
+f32u(ffffffffffffffff) = fffffffe
+f32u(10000000000000000) = 1
+f64i(0) = 1
+f64i(7f) = 7e
+f64i(80) = 81
+f64i(ff) = fe
+f64i(100) = 101
+f64i(7fff) = 7ffe
+f64i(8000) = 8001
+f64i(ffff) = fffe
+f64i(10000) = 10001
+f64i(7fffffff) = 7ffffffe
+f64i(80000000) = 80000001
+f64i(ffffffff) = fffffffe
+f64i(100000000) = 100000001
+f64i(7fffffffffffffff) = 7ffffffffffffffe
+f64i(8000000000000000) = -7fffffffffffffff
+f64i(ffffffffffffffff) = -2
+f64i(10000000000000000) = 1
+f64u(0) = 1
+f64u(7f) = 7e
+f64u(80) = 81
+f64u(ff) = fe
+f64u(100) = 101
+f64u(7fff) = 7ffe
+f64u(8000) = 8001
+f64u(ffff) = fffe
+f64u(10000) = 10001
+f64u(7fffffff) = 7ffffffe
+f64u(80000000) = 80000001
+f64u(ffffffff) = fffffffe
+f64u(100000000) = 100000001
+f64u(7fffffffffffffff) = 7ffffffffffffffe
+f64u(8000000000000000) = 8000000000000001
+f64u(ffffffffffffffff) = fffffffffffffffe
+f64u(10000000000000000) = 1
diff --git a/tools/ci.sh b/tools/ci.sh
index 96c1bf89af206..30395733225c1 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -313,6 +313,10 @@ function ci_unix_build_helper {
     make ${MAKEOPTS} -C ports/unix "$@"
 }
 
+function ci_unix_build_ffi_lib_helper {
+    $1 $2 -shared -o tests/unix/ffi_lib.so tests/unix/ffi_lib.c
+}
+
 function ci_unix_run_tests_helper {
     make -C ports/unix "$@" test
 }
@@ -359,6 +363,7 @@ function ci_unix_minimal_run_tests {
 
 function ci_unix_standard_build {
     ci_unix_build_helper VARIANT=standard
+    ci_unix_build_ffi_lib_helper gcc
 }
 
 function ci_unix_standard_run_tests {
@@ -379,6 +384,7 @@ function ci_unix_coverage_setup {
 
 function ci_unix_coverage_build {
     ci_unix_build_helper VARIANT=coverage
+    ci_unix_build_ffi_lib_helper gcc
 }
 
 function ci_unix_coverage_run_tests {
@@ -403,6 +409,7 @@ function ci_unix_32bit_setup {
 
 function ci_unix_coverage_32bit_build {
     ci_unix_build_helper VARIANT=coverage MICROPY_FORCE_32BIT=1
+    ci_unix_build_ffi_lib_helper gcc -m32
 }
 
 function ci_unix_coverage_32bit_run_tests {
@@ -416,6 +423,7 @@ function ci_unix_coverage_32bit_run_native_mpy_tests {
 function ci_unix_nanbox_build {
     # Use Python 2 to check that it can run the build scripts
     ci_unix_build_helper PYTHON=python2 VARIANT=nanbox
+    ci_unix_build_ffi_lib_helper gcc -m32
 }
 
 function ci_unix_nanbox_run_tests {
@@ -424,6 +432,7 @@ function ci_unix_nanbox_run_tests {
 
 function ci_unix_float_build {
     ci_unix_build_helper VARIANT=standard CFLAGS_EXTRA="-DMICROPY_FLOAT_IMPL=MICROPY_FLOAT_IMPL_FLOAT"
+    ci_unix_build_ffi_lib_helper gcc
 }
 
 function ci_unix_float_run_tests {
@@ -521,6 +530,7 @@ function ci_unix_qemu_arm_setup {
 
 function ci_unix_qemu_arm_build {
     ci_unix_build_helper "${CI_UNIX_OPTS_QEMU_ARM[@]}"
+    ci_unix_build_ffi_lib_helper arm-linux-gnueabi-gcc
 }
 
 function ci_unix_qemu_arm_run_tests {

From 525a920ca5f284b7eb5875550ae0febcd1714a06 Mon Sep 17 00:00:00 2001
From: Abilio Marques <abiliojr@gmail.com>
Date: Sun, 16 May 2021 05:30:25 +0200
Subject: [PATCH 0947/3533] unix/modffi: Fix conversion between Python integers
 and ffi types.

This commit fixes the following problems converting to/from Python integers
and ffi types:
- integers of 8 and 16 bits not working on big endian
- integers of 64 bits not working on 32 bits architectures
- unsigned returns were converted to signed Python integers

Fixes issue #7269.
---
 ports/unix/modffi.c | 64 ++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 63 insertions(+), 1 deletion(-)

diff --git a/ports/unix/modffi.c b/ports/unix/modffi.c
index 5c2595ec5e0ba..12a33619e00e5 100644
--- a/ports/unix/modffi.c
+++ b/ports/unix/modffi.c
@@ -35,6 +35,7 @@
 #include "py/runtime.h"
 #include "py/binary.h"
 #include "py/mperrno.h"
+#include "py/objint.h"
 
 /*
  * modffi uses character codes to encode a value type, based on "struct"
@@ -59,6 +60,11 @@
 // This union is large enough to hold any supported argument/return value.
 typedef union _ffi_union_t {
     ffi_arg ffi;
+    unsigned char B;
+    unsigned short int H;
+    unsigned int I;
+    unsigned long int L;
+    unsigned long long int Q;
     float flt;
     double dbl;
 } ffi_union_t;
@@ -177,6 +183,20 @@ STATIC mp_obj_t return_ffi_value(ffi_union_t *val, char type) {
             return mp_obj_new_float_from_d(val->dbl);
         }
         #endif
+        case 'b':
+        case 'h':
+        case 'i':
+        case 'l':
+            return mp_obj_new_int((signed)val->ffi);
+        case 'B':
+        case 'H':
+        case 'I':
+        case 'L':
+            return mp_obj_new_int_from_uint(val->ffi);
+        case 'q':
+            return mp_obj_new_int_from_ll(val->Q);
+        case 'Q':
+            return mp_obj_new_int_from_ull(val->Q);
         case 'O':
             return (mp_obj_t)(intptr_t)val->ffi;
         default:
@@ -365,6 +385,48 @@ STATIC void ffifunc_print(const mp_print_t *print, mp_obj_t self_in, mp_print_ki
     mp_printf(print, "<ffifunc %p>", self->func);
 }
 
+STATIC unsigned long long ffi_get_int_value(mp_obj_t o) {
+    if (mp_obj_is_small_int(o)) {
+        return MP_OBJ_SMALL_INT_VALUE(o);
+    } else {
+        unsigned long long res;
+        mp_obj_int_to_bytes_impl(o, MP_ENDIANNESS_BIG, sizeof(res), (byte *)&res);
+        return res;
+    }
+}
+
+STATIC ffi_union_t ffi_int_obj_to_ffi_union(mp_obj_t o, const char argtype) {
+    ffi_union_t ret;
+    if ((argtype | 0x20) == 'q') {
+        ret.Q = ffi_get_int_value(o);
+        return ret;
+    } else {
+        mp_uint_t val = mp_obj_int_get_truncated(o);
+        switch (argtype) {
+            case 'b':
+            case 'B':
+                ret.B = val;
+                break;
+            case 'h':
+            case 'H':
+                ret.H = val;
+                break;
+            case 'i':
+            case 'I':
+                ret.I = val;
+                break;
+            case 'l':
+            case 'L':
+                ret.L = val;
+                break;
+            default:
+                ret.ffi = val;
+                break;
+        }
+    }
+    return ret;
+}
+
 STATIC mp_obj_t ffifunc_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
     (void)n_kw;
     mp_obj_ffifunc_t *self = MP_OBJ_TO_PTR(self_in);
@@ -387,7 +449,7 @@ STATIC mp_obj_t ffifunc_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const
         } else if (a == mp_const_none) {
             values[i].ffi = 0;
         } else if (mp_obj_is_int(a)) {
-            values[i].ffi = mp_obj_int_get_truncated(a);
+            values[i] = ffi_int_obj_to_ffi_union(a, *argtype);
         } else if (mp_obj_is_str(a)) {
             const char *s = mp_obj_str_get_str(a);
             values[i].ffi = (ffi_arg)(intptr_t)s;

From de2e081260395f47d21bf39a97f3461df3d8b94f Mon Sep 17 00:00:00 2001
From: Miguel Grinberg <miguel.grinberg@gmail.com>
Date: Mon, 7 Jun 2021 11:40:09 +0100
Subject: [PATCH 0948/3533] extmod/uasyncio: Fix start_server and wait_closed
 race condition.

This fix prevents server.wait_closed() from raising an AttributeError when
trying to access server.task.  This can happen if it is called immediately
after start_server().
---
 extmod/uasyncio/stream.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/extmod/uasyncio/stream.py b/extmod/uasyncio/stream.py
index 395ff1f6afdf9..2a259e618f169 100644
--- a/extmod/uasyncio/stream.py
+++ b/extmod/uasyncio/stream.py
@@ -112,7 +112,6 @@ async def _serve(self, cb, host, port, backlog):
         s.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
         s.bind(ai[-1])
         s.listen(backlog)
-        self.task = core.cur_task
         # Accept incoming connections
         while True:
             try:
@@ -135,7 +134,7 @@ async def _serve(self, cb, host, port, backlog):
 # TODO could use an accept-callback on socket read activity instead of creating a task
 async def start_server(cb, host, port, backlog=5):
     s = Server()
-    core.create_task(s._serve(cb, host, port, backlog))
+    s.task = core.create_task(s._serve(cb, host, port, backlog))
     return s
 
 

From 8c02b94946c437ed841fe294442b1f0d2401c678 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolt=C3=A1n=20V=C3=B6r=C3=B6s?= <zvoros@gmail.com>
Date: Sat, 5 Jun 2021 19:53:46 +0200
Subject: [PATCH 0949/3533] nrf: Add more math sources to Makefile, and enable
 log2 implementation.

This commit adds a few math functions to the source list in the Makefile,
and implements the log2f function, so that ulab can be compiled on the nrf
boards.  It also addresses part of #5162.
---
 ports/nrf/Makefile       | 19 ++++++++++++++++++-
 ports/nrf/mpconfigport.h |  4 ++++
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/ports/nrf/Makefile b/ports/nrf/Makefile
index 86809508042c1..a3f914dbc13f4 100644
--- a/ports/nrf/Makefile
+++ b/ports/nrf/Makefile
@@ -160,8 +160,16 @@ SRC_LIB += $(addprefix lib/,\
         libm/sf_modf.c \
         libm/sf_ldexp.c \
         libm/asinfacosf.c \
+        libm/acoshf.c \
+        libm/asinhf.c \
         libm/atanf.c \
         libm/atan2f.c \
+        libm/atanhf.c \
+        libm/log1pf.c \
+        libm/sf_erf.c \
+        libm/erf_lgamma.c \
+        libm/wf_lgamma.c \
+        libm/wf_tgamma.c \
         libm/roundf.c \
 	)
 
@@ -186,8 +194,17 @@ SRC_LIB += $(addprefix lib/,\
         libm/sf_modf.c \
         libm/sf_ldexp.c \
         libm/asinfacosf.c \
+        libm/acoshf.c \
+        libm/asinhf.c \
         libm/atanf.c \
         libm/atan2f.c \
+        libm/atanhf.c \
+        libm/log1pf.c \
+        libm/sf_erf.c \
+        libm/erf_lgamma.c \
+        libm/wf_lgamma.c \
+        libm/wf_tgamma.c \
+        libm/roundf.c \
         )
 
 SRC_NRFX += $(addprefix lib/nrfx/drivers/src/,\
@@ -481,7 +498,7 @@ $(BUILD)/$(OUTPUT_FILENAME).elf: $(OBJ)
 	$(Q)$(SIZE) $@
 
 # List of sources for qstr extraction
-SRC_QSTR += $(SRC_C) $(SRC_LIB) $(DRIVERS_SRC_C) $(SRC_BOARD_MODULES) $(SRC_MOD) 
+SRC_QSTR += $(SRC_C) $(SRC_LIB) $(DRIVERS_SRC_C) $(SRC_BOARD_MODULES) $(SRC_MOD)
 
 # Append any auto-generated sources that are needed by sources listed in
 # SRC_QSTR
diff --git a/ports/nrf/mpconfigport.h b/ports/nrf/mpconfigport.h
index 714b1cc24fce0..183fdf6818554 100644
--- a/ports/nrf/mpconfigport.h
+++ b/ports/nrf/mpconfigport.h
@@ -330,3 +330,7 @@ extern const struct _mp_obj_module_t ble_module;
 #include <alloca.h>
 
 #define MICROPY_PIN_DEFS_PORT_H "pin_defs_nrf5.h"
+
+#ifndef MP_NEED_LOG2
+#define MP_NEED_LOG2                (1)
+#endif

From 71e3538a3274322ea845959d75283d1e96fefb6b Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 19 May 2021 23:43:21 +1000
Subject: [PATCH 0950/3533] stm32/usb: Add USB_VCP.irq method, to set a
 callback on USB data RX.

Usage:

    usb = pyb.USB_VCP()
    usb.irq(lambda u:print(u, u.read()), usb.IRQ_RX)

Signed-off-by: Damien George <damien@micropython.org>
---
 docs/library/pyb.USB_VCP.rst     | 14 +++++++
 ports/stm32/mpconfigport.h       |  3 ++
 ports/stm32/usb.c                | 71 +++++++++++++++++++++++++++++++-
 ports/stm32/usbd_cdc_interface.c |  2 +
 ports/stm32/usbd_cdc_interface.h |  2 +
 5 files changed, 91 insertions(+), 1 deletion(-)

diff --git a/docs/library/pyb.USB_VCP.rst b/docs/library/pyb.USB_VCP.rst
index bbcbc0701b3b4..1e44e53fd8be1 100644
--- a/docs/library/pyb.USB_VCP.rst
+++ b/docs/library/pyb.USB_VCP.rst
@@ -109,6 +109,16 @@ Methods
 
    Return value: number of bytes sent.
 
+.. method:: USB_VCP.irq(handler=None, trigger=0, hard=False)
+
+   Register *handler* to be called whenever an event specified by *trigger*
+   occurs.  The *handler* function must take exactly one argument, which will
+   be the USB VCP object.  Pass in ``None`` to disable the callback.
+
+   Valid values for *trigger* are:
+
+     - ``USB_VCP.IRQ_RX``: new data is available for reading from the USB VCP object.
+
 
 Constants
 ---------
@@ -117,3 +127,7 @@ Constants
           USB_VCP.CTS
 
    to select the flow control type.
+
+.. data:: USB_VCP.IRQ_RX
+
+   IRQ trigger values for :meth:`USB_VCP.irq`.
diff --git a/ports/stm32/mpconfigport.h b/ports/stm32/mpconfigport.h
index 28a2d6a76df79..ff58c515e37c7 100644
--- a/ports/stm32/mpconfigport.h
+++ b/ports/stm32/mpconfigport.h
@@ -383,6 +383,9 @@ struct _mp_bluetooth_btstack_root_pointers_t;
     /* pointers to all CAN objects (if they have been created) */ \
     struct _pyb_can_obj_t *pyb_can_obj_all[MICROPY_HW_MAX_CAN]; \
     \
+    /* USB_VCP IRQ callbacks (if they have been set) */ \
+    mp_obj_t pyb_usb_vcp_irq[MICROPY_HW_USB_CDC_NUM]; \
+    \
     /* list of registered NICs */ \
     mp_obj_list_t mod_network_nic_list; \
     \
diff --git a/ports/stm32/usb.c b/ports/stm32/usb.c
index 5003bb27cc235..eba95de49fb58 100644
--- a/ports/stm32/usb.c
+++ b/ports/stm32/usb.c
@@ -39,6 +39,7 @@
 #include "py/stream.h"
 #include "py/mperrno.h"
 #include "py/mphal.h"
+#include "lib/utils/mpirq.h"
 #include "bufhelper.h"
 #include "storage.h"
 #include "sdcard.h"
@@ -70,6 +71,9 @@
 #define MAX_ENDPOINT(dev_id) (8)
 #endif
 
+// Constants for USB_VCP.irq trigger.
+#define USBD_CDC_IRQ_RX (1)
+
 STATIC void pyb_usb_vcp_init0(void);
 
 // this will be persistent across a soft-reset
@@ -219,6 +223,7 @@ const mp_rom_obj_tuple_t pyb_usb_hid_keyboard_obj = {
 
 void pyb_usb_init0(void) {
     for (int i = 0; i < MICROPY_HW_USB_CDC_NUM; ++i) {
+        usb_device.usbd_cdc_itf[i].cdc_idx = i;
         usb_device.usbd_cdc_itf[i].attached_to_repl = false;
     }
     #if MICROPY_HW_USB_HID
@@ -644,14 +649,42 @@ const pyb_usb_vcp_obj_t pyb_usb_vcp_obj[MICROPY_HW_USB_CDC_NUM] = {
     #endif
 };
 
+STATIC bool pyb_usb_vcp_irq_scheduled[MICROPY_HW_USB_CDC_NUM];
+
 STATIC void pyb_usb_vcp_init0(void) {
+    for (size_t i = 0; i < MICROPY_HW_USB_CDC_NUM; ++i) {
+        MP_STATE_PORT(pyb_usb_vcp_irq)[i] = mp_const_none;
+        pyb_usb_vcp_irq_scheduled[i] = false;
+    }
+
     // Activate USB_VCP(0) on dupterm slot 1 for the REPL
     MP_STATE_VM(dupterm_objs[1]) = MP_OBJ_FROM_PTR(&pyb_usb_vcp_obj[0]);
     usb_vcp_attach_to_repl(&pyb_usb_vcp_obj[0], true);
 }
 
+STATIC mp_obj_t pyb_usb_vcp_irq_run(mp_obj_t self_in) {
+    pyb_usb_vcp_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    uint8_t idx = self->cdc_itf->cdc_idx;
+    mp_obj_t callback = MP_STATE_PORT(pyb_usb_vcp_irq)[idx];
+    pyb_usb_vcp_irq_scheduled[idx] = false;
+    if (callback != mp_const_none && usbd_cdc_rx_num(self->cdc_itf)) {
+        mp_call_function_1(callback, self_in);
+    }
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(pyb_usb_vcp_irq_run_obj, pyb_usb_vcp_irq_run);
+
+void usbd_cdc_rx_event_callback(usbd_cdc_itf_t *cdc) {
+    uint8_t idx = cdc->cdc_idx;
+    mp_obj_t self = MP_OBJ_FROM_PTR(&pyb_usb_vcp_obj[idx]);
+    mp_obj_t callback = MP_STATE_PORT(pyb_usb_vcp_irq)[idx];
+    if (callback != mp_const_none && !pyb_usb_vcp_irq_scheduled[idx]) {
+        pyb_usb_vcp_irq_scheduled[idx] = mp_sched_schedule(MP_OBJ_FROM_PTR(&pyb_usb_vcp_irq_run_obj), self);
+    }
+}
+
 STATIC void pyb_usb_vcp_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
-    int id = ((pyb_usb_vcp_obj_t *)MP_OBJ_TO_PTR(self_in))->cdc_itf - &usb_device.usbd_cdc_itf[0];
+    int id = ((pyb_usb_vcp_obj_t *)MP_OBJ_TO_PTR(self_in))->cdc_itf->cdc_idx;
     mp_printf(print, "USB_VCP(%u)", id);
 }
 
@@ -796,6 +829,40 @@ STATIC mp_obj_t pyb_usb_vcp_recv(size_t n_args, const mp_obj_t *args, mp_map_t *
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_KW(pyb_usb_vcp_recv_obj, 1, pyb_usb_vcp_recv);
 
+// irq(handler=None, trigger=0, hard=False)
+STATIC mp_obj_t pyb_usb_vcp_irq(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    mp_arg_val_t args[MP_IRQ_ARG_INIT_NUM_ARGS];
+    mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args, MP_IRQ_ARG_INIT_NUM_ARGS, mp_irq_init_args, args);
+    pyb_usb_vcp_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]);
+
+    if (n_args > 1 || kw_args->used != 0) {
+        // Check the handler.
+        mp_obj_t handler = args[MP_IRQ_ARG_INIT_handler].u_obj;
+        if (handler != mp_const_none && !mp_obj_is_callable(handler)) {
+            mp_raise_ValueError(MP_ERROR_TEXT("handler must be None or callable"));
+        }
+
+        // Check the trigger.
+        mp_uint_t trigger = args[MP_IRQ_ARG_INIT_trigger].u_int;
+        if (trigger == 0) {
+            handler = mp_const_none;
+        } else if (trigger != USBD_CDC_IRQ_RX) {
+            mp_raise_ValueError(MP_ERROR_TEXT("unsupported trigger"));
+        }
+
+        // Check hard/soft.
+        if (args[MP_IRQ_ARG_INIT_hard].u_bool) {
+            mp_raise_ValueError(MP_ERROR_TEXT("hard unsupported"));
+        }
+
+        // Reconfigure the IRQ.
+        MP_STATE_PORT(pyb_usb_vcp_irq)[self->cdc_itf->cdc_idx] = handler;
+    }
+
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_KW(pyb_usb_vcp_irq_obj, 1, pyb_usb_vcp_irq);
+
 mp_obj_t pyb_usb_vcp___exit__(size_t n_args, const mp_obj_t *args) {
     return mp_const_none;
 }
@@ -814,6 +881,7 @@ STATIC const mp_rom_map_elem_t pyb_usb_vcp_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_readlines), MP_ROM_PTR(&mp_stream_unbuffered_readlines_obj)},
     { MP_ROM_QSTR(MP_QSTR_write), MP_ROM_PTR(&mp_stream_write_obj) },
     { MP_ROM_QSTR(MP_QSTR_close), MP_ROM_PTR(&mp_identity_obj) },
+    { MP_ROM_QSTR(MP_QSTR_irq), MP_ROM_PTR(&pyb_usb_vcp_irq_obj) },
     { MP_ROM_QSTR(MP_QSTR___del__), MP_ROM_PTR(&mp_identity_obj) },
     { MP_ROM_QSTR(MP_QSTR___enter__), MP_ROM_PTR(&mp_identity_obj) },
     { MP_ROM_QSTR(MP_QSTR___exit__), MP_ROM_PTR(&pyb_usb_vcp___exit___obj) },
@@ -821,6 +889,7 @@ STATIC const mp_rom_map_elem_t pyb_usb_vcp_locals_dict_table[] = {
     // class constants
     { MP_ROM_QSTR(MP_QSTR_RTS), MP_ROM_INT(USBD_CDC_FLOWCONTROL_RTS) },
     { MP_ROM_QSTR(MP_QSTR_CTS), MP_ROM_INT(USBD_CDC_FLOWCONTROL_CTS) },
+    { MP_ROM_QSTR(MP_QSTR_IRQ_RX), MP_ROM_INT(USBD_CDC_IRQ_RX) },
 };
 
 STATIC MP_DEFINE_CONST_DICT(pyb_usb_vcp_locals_dict, pyb_usb_vcp_locals_dict_table);
diff --git a/ports/stm32/usbd_cdc_interface.c b/ports/stm32/usbd_cdc_interface.c
index a465f608a655e..a1ac5fd22faaf 100644
--- a/ports/stm32/usbd_cdc_interface.c
+++ b/ports/stm32/usbd_cdc_interface.c
@@ -308,6 +308,8 @@ int8_t usbd_cdc_receive(usbd_cdc_state_t *cdc_in, size_t len) {
         }
     }
 
+    usbd_cdc_rx_event_callback(cdc);
+
     if ((cdc->flow & USBD_CDC_FLOWCONTROL_RTS) && (usbd_cdc_rx_buffer_full(cdc))) {
         cdc->rx_buf_full = true;
         return USBD_BUSY;
diff --git a/ports/stm32/usbd_cdc_interface.h b/ports/stm32/usbd_cdc_interface.h
index d0509b09f9a99..6b510f2399226 100644
--- a/ports/stm32/usbd_cdc_interface.h
+++ b/ports/stm32/usbd_cdc_interface.h
@@ -63,6 +63,7 @@ typedef struct _usbd_cdc_itf_t {
     uint16_t tx_buf_ptr_out_next; // next position of above once transmission finished
     uint8_t tx_need_empty_packet; // used to flush the USB IN endpoint if the last packet was exactly the endpoint packet size
 
+    uint8_t cdc_idx; // between 0 and MICROPY_HW_USB_CDC_NUM-1
     volatile uint8_t connect_state; // indicates if we are connected
     uint8_t attached_to_repl; // indicates if interface is connected to REPL
     uint8_t flow; // USBD_CDC_FLOWCONTROL_* setting flags
@@ -82,5 +83,6 @@ void usbd_cdc_tx_always(usbd_cdc_itf_t *cdc, const uint8_t *buf, uint32_t len);
 
 int usbd_cdc_rx_num(usbd_cdc_itf_t *cdc);
 int usbd_cdc_rx(usbd_cdc_itf_t *cdc, uint8_t *buf, uint32_t len, uint32_t timeout);
+void usbd_cdc_rx_event_callback(usbd_cdc_itf_t *cdc);
 
 #endif // MICROPY_INCLUDED_STM32_USBD_CDC_INTERFACE_H

From cf849d84b984081b1b745edbad2dccd06bdb339f Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 10 Jun 2021 22:48:17 +1000
Subject: [PATCH 0951/3533] stm32/boards: Enable
 MICROPY_HW_SPIFLASH_ENABLE_CACHE on VCC_GND boards.

Because these boards use the SPI flash cache in their bdev.c configuration.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/boards/VCC_GND_F407VE/mpconfigboard.h | 1 +
 ports/stm32/boards/VCC_GND_F407ZG/mpconfigboard.h | 1 +
 2 files changed, 2 insertions(+)

diff --git a/ports/stm32/boards/VCC_GND_F407VE/mpconfigboard.h b/ports/stm32/boards/VCC_GND_F407VE/mpconfigboard.h
index fd896c6666884..e9e1f55c26b92 100644
--- a/ports/stm32/boards/VCC_GND_F407VE/mpconfigboard.h
+++ b/ports/stm32/boards/VCC_GND_F407VE/mpconfigboard.h
@@ -132,6 +132,7 @@ void VCC_GND_F407VE_board_early_init(void);
 
 extern const struct _mp_spiflash_config_t spiflash_config;
 extern struct _spi_bdev_t spi_bdev;
+#define MICROPY_HW_SPIFLASH_ENABLE_CACHE (1)
 #define MICROPY_HW_BDEV_IOCTL(op, arg) ( \
     (op) == BDEV_IOCTL_NUM_BLOCKS ? (MICROPY_HW_SPIFLASH_SIZE_BITS / 8 / FLASH_BLOCK_SIZE) : \
     (op) == BDEV_IOCTL_INIT ? spi_bdev_ioctl(&spi_bdev, (op), (uint32_t)&spiflash_config) : \
diff --git a/ports/stm32/boards/VCC_GND_F407ZG/mpconfigboard.h b/ports/stm32/boards/VCC_GND_F407ZG/mpconfigboard.h
index bd17ab410f7c1..37eeff513862a 100644
--- a/ports/stm32/boards/VCC_GND_F407ZG/mpconfigboard.h
+++ b/ports/stm32/boards/VCC_GND_F407ZG/mpconfigboard.h
@@ -140,6 +140,7 @@ void VCC_GND_F407ZG_board_early_init(void);
 
 extern const struct _mp_spiflash_config_t spiflash_config;
 extern struct _spi_bdev_t spi_bdev;
+#define MICROPY_HW_SPIFLASH_ENABLE_CACHE (1)
 #define MICROPY_HW_BDEV_IOCTL(op, arg) ( \
     (op) == BDEV_IOCTL_NUM_BLOCKS ? (MICROPY_HW_SPIFLASH_SIZE_BITS / 8 / FLASH_BLOCK_SIZE) : \
     (op) == BDEV_IOCTL_INIT ? spi_bdev_ioctl(&spi_bdev, (op), (uint32_t)&spiflash_config) : \

From 61f91de361c2c44e43fe326ea961b3cf68fcc310 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 10 Jun 2021 22:48:54 +1000
Subject: [PATCH 0952/3533] stm32/sdram: Prevent array-bounds warnings with GCC
 11.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/sdram.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/ports/stm32/sdram.c b/ports/stm32/sdram.c
index 2791df277afa2..514192519a900 100644
--- a/ports/stm32/sdram.c
+++ b/ports/stm32/sdram.c
@@ -276,6 +276,13 @@ void sdram_leave_low_power(void) {
         (0 << 9U));                                                  // Mode Register Definition
 }
 
+#if __GNUC__ >= 11
+// Prevent array bounds warnings when accessing SDRAM_START_ADDRESS as a memory pointer.
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Warray-bounds"
+#pragma GCC diagnostic ignored "-Wstringop-overflow"
+#endif
+
 bool sdram_test(bool fast) {
     uint8_t const pattern = 0xaa;
     uint8_t const antipattern = 0x55;
@@ -325,4 +332,8 @@ bool sdram_test(bool fast) {
     return true;
 }
 
+#if __GNUC__ >= 11
+#pragma GCC diagnostic pop
+#endif
+
 #endif // FMC_SDRAM_BANK

From 865abba197e4c1ccb4540f023b79035305effdb6 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 11 Jun 2021 15:28:07 +1000
Subject: [PATCH 0953/3533] esp32/makeimg.py: Load sizes from partition table
 and verify data fits.

Changes introduced are:
- the application offset is now loaded from the partition table instead of
  being hard-coded to 0x10000
- maximum size of all sections is computed using the partition table
- an error is generated if any section overflows its allocated space
- remaining bytes are printed for each section

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/makeimg.py           | 50 +++++++++++++++++++++++++++-----
 ports/esp32/partitions-16MiB.csv |  3 +-
 ports/esp32/partitions-2MiB.csv  |  3 +-
 ports/esp32/partitions-ota.csv   |  3 +-
 ports/esp32/partitions.csv       |  3 +-
 5 files changed, 46 insertions(+), 16 deletions(-)

diff --git a/ports/esp32/makeimg.py b/ports/esp32/makeimg.py
index 9f27ed6ef883d..fd0458318896a 100644
--- a/ports/esp32/makeimg.py
+++ b/ports/esp32/makeimg.py
@@ -1,19 +1,44 @@
-import sys
+# Combine bootloader, partition table and application into a final binary.
+
+import os, sys
+
+sys.path.append(os.getenv("IDF_PATH") + "/components/partition_table")
+
+import gen_esp32part
 
 OFFSET_BOOTLOADER = 0x1000
 OFFSET_PARTITIONS = 0x8000
-OFFSET_APPLICATION = 0x10000
+
+
+def load_partition_table(filename):
+    with open(filename, "rb") as f:
+        return gen_esp32part.PartitionTable.from_binary(f.read())
+
+
+partition_table = load_partition_table(sys.argv[2])
+
+max_size_bootloader = OFFSET_PARTITIONS - OFFSET_BOOTLOADER
+max_size_partitions = 0
+offset_application = 0
+max_size_application = 0
+
+for part in partition_table:
+    if part.name == "nvs":
+        max_size_partitions = part.offset - OFFSET_PARTITIONS
+    elif part.type == gen_esp32part.APP_TYPE and offset_application == 0:
+        offset_application = part.offset
+        max_size_application = part.size
 
 files_in = [
-    ("bootloader", OFFSET_BOOTLOADER, sys.argv[1]),
-    ("partitions", OFFSET_PARTITIONS, sys.argv[2]),
-    ("application", OFFSET_APPLICATION, sys.argv[3]),
+    ("bootloader", OFFSET_BOOTLOADER, max_size_bootloader, sys.argv[1]),
+    ("partitions", OFFSET_PARTITIONS, max_size_partitions, sys.argv[2]),
+    ("application", offset_application, max_size_application, sys.argv[3]),
 ]
 file_out = sys.argv[4]
 
 cur_offset = OFFSET_BOOTLOADER
 with open(file_out, "wb") as fout:
-    for name, offset, file_in in files_in:
+    for name, offset, max_size, file_in in files_in:
         assert offset >= cur_offset
         fout.write(b"\xff" * (offset - cur_offset))
         cur_offset = offset
@@ -21,5 +46,14 @@
             data = fin.read()
             fout.write(data)
             cur_offset += len(data)
-            print("%-12s% 8d" % (name, len(data)))
-    print("%-12s% 8d" % ("total", cur_offset))
+            print(
+                "%-12s@0x%06x % 8d  (% 8d remaining)"
+                % (name, offset, len(data), max_size - len(data))
+            )
+            if len(data) > max_size:
+                print(
+                    "ERROR: %s overflows allocated space of %d bytes by %d bytes"
+                    % (name, max_size, len(data) - max_size)
+                )
+                sys.exit(1)
+    print("%-22s% 8d" % ("total", cur_offset))
diff --git a/ports/esp32/partitions-16MiB.csv b/ports/esp32/partitions-16MiB.csv
index 5133185c78b2e..20d06bad4773e 100644
--- a/ports/esp32/partitions-16MiB.csv
+++ b/ports/esp32/partitions-16MiB.csv
@@ -1,6 +1,5 @@
 # Notes: the offset of the partition table itself is set in
-# $ESPIDF/components/partition_table/Kconfig.projbuild and the
-# offset of the factory/ota_0 partition is set in makeimg.py
+# $IDF_PATH/components/partition_table/Kconfig.projbuild.
 # Name,   Type, SubType, Offset,  Size, Flags
 nvs,      data, nvs,     0x9000,  0x6000,
 phy_init, data, phy,     0xf000,  0x1000,
diff --git a/ports/esp32/partitions-2MiB.csv b/ports/esp32/partitions-2MiB.csv
index 2d3d4c120446c..73925a5144760 100644
--- a/ports/esp32/partitions-2MiB.csv
+++ b/ports/esp32/partitions-2MiB.csv
@@ -1,6 +1,5 @@
 # Notes: the offset of the partition table itself is set in
-# $ESPIDF/components/partition_table/Kconfig.projbuild and the
-# offset of the factory/ota_0 partition is set in makeimg.py
+# $IDF_PATH/components/partition_table/Kconfig.projbuild.
 # Name,     Type, SubType, Offset,   Size, Flags
 nvs,        data, nvs,     0x9000,   0x6000,
 phy_init,   data, phy,     0xf000,   0x1000,
diff --git a/ports/esp32/partitions-ota.csv b/ports/esp32/partitions-ota.csv
index 08576b6a36af2..094ad76660ddf 100644
--- a/ports/esp32/partitions-ota.csv
+++ b/ports/esp32/partitions-ota.csv
@@ -1,7 +1,6 @@
 # Partition table for MicroPython with OTA support using 4MB flash
 # Notes: the offset of the partition table itself is set in
-# $ESPIDF/components/partition_table/Kconfig.projbuild and the
-# offset of the factory/ota_0 partition is set in makeimg.py
+# $IDF_PATH/components/partition_table/Kconfig.projbuild.
 # Name,   Type, SubType, Offset,   Size,     Flags
 nvs,      data, nvs,     0x9000,   0x4000,
 otadata,  data, ota,     0xd000,   0x2000,
diff --git a/ports/esp32/partitions.csv b/ports/esp32/partitions.csv
index 68ab4b356a91e..d304dccc53ee9 100644
--- a/ports/esp32/partitions.csv
+++ b/ports/esp32/partitions.csv
@@ -1,6 +1,5 @@
 # Notes: the offset of the partition table itself is set in
-# $ESPIDF/components/partition_table/Kconfig.projbuild and the
-# offset of the factory/ota_0 partition is set in makeimg.py
+# $IDF_PATH/components/partition_table/Kconfig.projbuild.
 # Name,   Type, SubType, Offset,  Size, Flags
 nvs,      data, nvs,     0x9000,  0x6000,
 phy_init, data, phy,     0xf000,  0x1000,

From f314cac60472719e1856565533e5b87920ddf32d Mon Sep 17 00:00:00 2001
From: noslaver <noam575@gmail.com>
Date: Sat, 1 Aug 2020 22:41:55 +0300
Subject: [PATCH 0954/3533] esp32/partitions-2MiB.csv: Update table so firmware
 fits.

The current MicroPython app size is larger than the size allocated in the
partitions table.
---
 ports/esp32/partitions-2MiB.csv | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/esp32/partitions-2MiB.csv b/ports/esp32/partitions-2MiB.csv
index 73925a5144760..ea6626825c0c7 100644
--- a/ports/esp32/partitions-2MiB.csv
+++ b/ports/esp32/partitions-2MiB.csv
@@ -3,5 +3,5 @@
 # Name,     Type, SubType, Offset,   Size, Flags
 nvs,        data, nvs,     0x9000,   0x6000,
 phy_init,   data, phy,     0xf000,   0x1000,
-factory,    app,  factory, 0x10000,  0x110000,
-vfs,        data, fat,     0x120000, 0xA0000,
+factory,    app,  factory, 0x10000,  0x160000,
+vfs,        data, fat,     0x170000, 0x50000,

From da8aad18a4508476aa041406c0b06f5df4a8e59b Mon Sep 17 00:00:00 2001
From: IhorNehrutsa <IhorNehrutsa@gmail.com>
Date: Fri, 11 Jun 2021 02:20:22 +0300
Subject: [PATCH 0955/3533] esp32/README: Describe how to select compatible
 version of existing IDF.

---
 ports/esp32/README.md | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/ports/esp32/README.md b/ports/esp32/README.md
index c349f44b27ef3..c7d40070d154c 100644
--- a/ports/esp32/README.md
+++ b/ports/esp32/README.md
@@ -50,10 +50,19 @@ To check out a copy of the IDF use git clone:
 $ git clone -b v4.0.2 --recursive https://github.com/espressif/esp-idf.git
 ```
 
-You can replace `v4.0.2` with `v4.1.1` or any other supported version.
+You can replace `v4.0.2` with `v4.1.1` or `v4.2` or any other supported version.
 (You don't need a full recursive clone; see the `ci_esp32_setup` function in
 `tools/ci.sh` in this repository for more detailed set-up commands.)
 
+If you already have a copy of the IDF then checkout a version compatible with
+MicroPython and update the submodules using:
+
+```bash
+$ cd esp-idf
+$ git checkout v4.2
+$ git submodule update --init --recursive
+```
+
 After you've cloned and checked out the IDF to the correct version, run the
 `install.sh` script:
 

From c0499bc2b9a7b4ceb1e0bdd65e900be162810d3d Mon Sep 17 00:00:00 2001
From: Peter Hinch <peter@hinch.me.uk>
Date: Tue, 21 Jan 2020 10:36:08 +0000
Subject: [PATCH 0956/3533] docs/library/machine.RTC.rst: Document datetime
 method and fix ex code.

This is the minimum change to fix the example code so it actually runs on
the majority of ports.
---
 docs/library/machine.RTC.rst | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/docs/library/machine.RTC.rst b/docs/library/machine.RTC.rst
index ae5446ef74fee..be2be2eee5eea 100644
--- a/docs/library/machine.RTC.rst
+++ b/docs/library/machine.RTC.rst
@@ -10,8 +10,8 @@ and time.
 Example usage::
 
     rtc = machine.RTC()
-    rtc.init((2014, 5, 1, 4, 13, 0, 0, 0))
-    print(rtc.now())
+    rtc.datetime((2020, 1, 21, 2, 10, 32, 36, 0))
+    print(rtc.datetime())
 
 
 Constructors
@@ -24,6 +24,20 @@ Constructors
 Methods
 -------
 
+.. method:: RTC.datetime([datetimetuple])
+
+   Get or set the date and time of the RTC.
+
+   With no arguments, this method returns an 8-tuple with the current
+   date and time.  With 1 argument (being an 8-tuple) it sets the date
+   and time.
+
+   The 8-tuple has the following format:
+
+       (year, month, day, weekday, hours, minutes, seconds, subseconds)
+
+   The meaning of the ``subseconds`` field is hardware dependent.
+
 .. method:: RTC.init(datetime)
 
    Initialise the RTC. Datetime is a tuple of the form:

From 37d01d4be3ab5d86e6d4042ccf140cd13a55ac4c Mon Sep 17 00:00:00 2001
From: Krzysztof Adamski <k@japko.eu>
Date: Thu, 18 Feb 2021 19:45:23 +0100
Subject: [PATCH 0957/3533] rp2/machine_rtc: Add initial support for RTC.

Initial support for machine.RTC on rp2 port. It only supports datetime()
method and nothing else. The method gets/returns a tuple of 8 items, just
like esp32 port, for example, but the usec parameter is ignored as the RP2
RTC only works up to seconds precision.

The Pico RTC isn't very useful as the time is lost during reset and there
seems to be no way to easily power up just the RTC clock with a low current
voltage, but still there seems to be use-cases for that, see issues #6831,
and a Thonny issue #1592. It was also requested for inclusion on v1.15
roadmap on #6832.

Signed-off-by: Krzysztof Adamski <k@japko.eu>
---
 ports/rp2/CMakeLists.txt |   3 +
 ports/rp2/machine_rtc.c  | 120 +++++++++++++++++++++++++++++++++++++++
 ports/rp2/modmachine.c   |   1 +
 ports/rp2/modmachine.h   |   1 +
 4 files changed, 125 insertions(+)
 create mode 100644 ports/rp2/machine_rtc.c

diff --git a/ports/rp2/CMakeLists.txt b/ports/rp2/CMakeLists.txt
index 50cdba4ba08f8..2d6037712e1a0 100644
--- a/ports/rp2/CMakeLists.txt
+++ b/ports/rp2/CMakeLists.txt
@@ -86,6 +86,7 @@ set(MICROPY_SOURCE_PORT
     machine_i2c.c
     machine_pin.c
     machine_pwm.c
+    machine_rtc.c
     machine_spi.c
     machine_timer.c
     machine_uart.c
@@ -113,6 +114,7 @@ set(MICROPY_SOURCE_QSTR
     ${PROJECT_SOURCE_DIR}/machine_i2c.c
     ${PROJECT_SOURCE_DIR}/machine_pin.c
     ${PROJECT_SOURCE_DIR}/machine_pwm.c
+    ${PROJECT_SOURCE_DIR}/machine_rtc.c
     ${PROJECT_SOURCE_DIR}/machine_spi.c
     ${PROJECT_SOURCE_DIR}/machine_timer.c
     ${PROJECT_SOURCE_DIR}/machine_uart.c
@@ -154,6 +156,7 @@ set(PICO_SDK_COMPONENTS
     pico_sync
     pico_time
     pico_unique_id
+    pico_util
     tinyusb_common
     tinyusb_device
 )
diff --git a/ports/rp2/machine_rtc.c b/ports/rp2/machine_rtc.c
new file mode 100644
index 0000000000000..8ead51af13f11
--- /dev/null
+++ b/ports/rp2/machine_rtc.c
@@ -0,0 +1,120 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 "Krzysztof Adamski" <k@japko.eu>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include <stdio.h>
+#include <string.h>
+
+#include <time.h>
+#include <sys/time.h>
+
+#include "py/nlr.h"
+#include "py/obj.h"
+#include "py/runtime.h"
+#include "py/mphal.h"
+#include "py/mperrno.h"
+#include "lib/timeutils/timeutils.h"
+#include "hardware/rtc.h"
+#include "pico/util/datetime.h"
+#include "modmachine.h"
+
+typedef struct _machine_rtc_obj_t {
+    mp_obj_base_t base;
+} machine_rtc_obj_t;
+
+// singleton RTC object
+STATIC const machine_rtc_obj_t machine_rtc_obj = {{&machine_rtc_type}};
+
+STATIC mp_obj_t machine_rtc_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
+    // check arguments
+    mp_arg_check_num(n_args, n_kw, 0, 0, false);
+    bool r = rtc_running();
+
+    if (!r) {
+        // This shouldn't happen as rtc_init() is already called in main so
+        // it's here just in case
+        rtc_init();
+        datetime_t t = { .month = 1, .day = 1 };
+        rtc_set_datetime(&t);
+    }
+    // return constant object
+    return (mp_obj_t)&machine_rtc_obj;
+}
+
+STATIC mp_obj_t machine_rtc_datetime(mp_uint_t n_args, const mp_obj_t *args) {
+    if (n_args == 1) {
+        bool ret;
+        datetime_t t;
+
+        ret = rtc_get_datetime(&t);
+        if (!ret) {
+            mp_raise_OSError(MP_EIO);
+        }
+
+        mp_obj_t tuple[8] = {
+            mp_obj_new_int(t.year),
+            mp_obj_new_int(t.month),
+            mp_obj_new_int(t.day),
+            mp_obj_new_int(t.dotw),
+            mp_obj_new_int(t.hour),
+            mp_obj_new_int(t.min),
+            mp_obj_new_int(t.sec),
+            mp_obj_new_int(0)
+        };
+
+        return mp_obj_new_tuple(8, tuple);
+    } else {
+        mp_obj_t *items;
+
+        mp_obj_get_array_fixed_n(args[1], 8, &items);
+
+        datetime_t t = {
+            .year = mp_obj_get_int(items[0]),
+            .month = mp_obj_get_int(items[1]),
+            .day = mp_obj_get_int(items[2]),
+            .dotw = mp_obj_get_int(items[3]),
+            .hour = mp_obj_get_int(items[4]),
+            .min = mp_obj_get_int(items[5]),
+            .sec = mp_obj_get_int(items[6]),
+        };
+
+        rtc_set_datetime(&t);
+
+    }
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_rtc_datetime_obj, 1, 2, machine_rtc_datetime);
+
+STATIC const mp_rom_map_elem_t machine_rtc_locals_dict_table[] = {
+    { MP_ROM_QSTR(MP_QSTR_datetime), MP_ROM_PTR(&machine_rtc_datetime_obj) },
+};
+STATIC MP_DEFINE_CONST_DICT(machine_rtc_locals_dict, machine_rtc_locals_dict_table);
+
+const mp_obj_type_t machine_rtc_type = {
+    { &mp_type_type },
+    .name = MP_QSTR_RTC,
+    .make_new = machine_rtc_make_new,
+    .locals_dict = (mp_obj_t)&machine_rtc_locals_dict,
+};
diff --git a/ports/rp2/modmachine.c b/ports/rp2/modmachine.c
index cd7dcaade59bd..3656a7db5a448 100644
--- a/ports/rp2/modmachine.c
+++ b/ports/rp2/modmachine.c
@@ -164,6 +164,7 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_SoftI2C),             MP_ROM_PTR(&mp_machine_soft_i2c_type) },
     { MP_ROM_QSTR(MP_QSTR_Pin),                 MP_ROM_PTR(&machine_pin_type) },
     { MP_ROM_QSTR(MP_QSTR_PWM),                 MP_ROM_PTR(&machine_pwm_type) },
+    { MP_ROM_QSTR(MP_QSTR_RTC),                 MP_ROM_PTR(&machine_rtc_type) },
     { MP_ROM_QSTR(MP_QSTR_Signal),              MP_ROM_PTR(&machine_signal_type) },
     { MP_ROM_QSTR(MP_QSTR_SPI),                 MP_ROM_PTR(&machine_spi_type) },
     { MP_ROM_QSTR(MP_QSTR_SoftSPI),             MP_ROM_PTR(&mp_machine_soft_spi_type) },
diff --git a/ports/rp2/modmachine.h b/ports/rp2/modmachine.h
index d09c83aee2c9e..c79bcfdad1f25 100644
--- a/ports/rp2/modmachine.h
+++ b/ports/rp2/modmachine.h
@@ -7,6 +7,7 @@ extern const mp_obj_type_t machine_adc_type;
 extern const mp_obj_type_t machine_hw_i2c_type;
 extern const mp_obj_type_t machine_pin_type;
 extern const mp_obj_type_t machine_pwm_type;
+extern const mp_obj_type_t machine_rtc_type;
 extern const mp_obj_type_t machine_spi_type;
 extern const mp_obj_type_t machine_timer_type;
 extern const mp_obj_type_t machine_uart_type;

From fd4eec5555f93950ee14a45851d13ab7b781077e Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sat, 12 Jun 2021 08:19:07 +0200
Subject: [PATCH 0958/3533] mimxrt/machine_rtc: Change RTC.datetime() tuple to
 match other ports.

This change moves the datetime tuple format back to the one used by all the
other ports:

    (year, month, day, weekday, hour, minute, second, microsecond)

Weekday is a number between 0 and 6, with 0 assigned to Monday.  It has to
be provided when setting the RTC with datetime(), but will be ignored on
entry and calculated when needed.

The weekday() method was removed, since that is now again a part of the
datetime tuple.

The now() method was updated so it continues to return a tuple that matches
CPython's datetime module.
---
 ports/mimxrt/machine_rtc.c | 40 +++++++++++++++++++++-----------------
 1 file changed, 22 insertions(+), 18 deletions(-)

diff --git a/ports/mimxrt/machine_rtc.c b/ports/mimxrt/machine_rtc.c
index 949d0b51f861a..4c88466cf767c 100644
--- a/ports/mimxrt/machine_rtc.c
+++ b/ports/mimxrt/machine_rtc.c
@@ -39,10 +39,10 @@ typedef struct _machine_rtc_obj_t {
 STATIC const machine_rtc_obj_t machine_rtc_obj = {{&machine_rtc_type}};
 
 // Calculate the weekday from the date.
-// The result is zero based with 0 = Sunday.
+// The result is zero based with 0 = Monday.
 // by Michael Keith and Tom Craver, 1990.
 static int calc_weekday(int y, int m, int d) {
-    return (d += m < 3 ? y-- : y - 2, 23 * m / 9 + d + 4 + y / 4 - y / 100 + y / 400) % 7;
+    return ((d += m < 3 ? y-- : y - 2, 23 * m / 9 + d + 4 + y / 4 - y / 100 + y / 400) + 6) % 7;
 }
 
 STATIC mp_obj_t machine_rtc_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
@@ -66,11 +66,11 @@ STATIC mp_obj_t machine_rtc_datetime_helper(size_t n_args, const mp_obj_t *args)
             mp_obj_new_int(srtc_date.year),
             mp_obj_new_int(srtc_date.month),
             mp_obj_new_int(srtc_date.day),
+            mp_obj_new_int(calc_weekday(srtc_date.year, srtc_date.month, srtc_date.day)),
             mp_obj_new_int(srtc_date.hour),
             mp_obj_new_int(srtc_date.minute),
             mp_obj_new_int(srtc_date.second),
             mp_obj_new_int(ticks_us64() % 1000000),
-            mp_const_none,
         };
         return mp_obj_new_tuple(8, tuple);
     } else {
@@ -84,9 +84,10 @@ STATIC mp_obj_t machine_rtc_datetime_helper(size_t n_args, const mp_obj_t *args)
         srtc_date.year = year >= 100 ? year : year + 2000; // allow 21 for 2021
         srtc_date.month = mp_obj_get_int(items[1]);
         srtc_date.day = mp_obj_get_int(items[2]);
-        srtc_date.hour = mp_obj_get_int(items[3]);
-        srtc_date.minute = mp_obj_get_int(items[4]);
-        srtc_date.second = mp_obj_get_int(items[5]);
+        // Ignore weekday at items[3]
+        srtc_date.hour = mp_obj_get_int(items[4]);
+        srtc_date.minute = mp_obj_get_int(items[5]);
+        srtc_date.second = mp_obj_get_int(items[6]);
         if (SNVS_LP_SRTC_SetDatetime(SNVS, &srtc_date) != kStatus_Success) {
             mp_raise_ValueError(NULL);
         }
@@ -101,7 +102,21 @@ STATIC mp_obj_t machine_rtc_datetime(mp_uint_t n_args, const mp_obj_t *args) {
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_rtc_datetime_obj, 1, 2, machine_rtc_datetime);
 
 STATIC mp_obj_t machine_rtc_now(mp_obj_t self_in) {
-    return machine_rtc_datetime_helper(1, &self_in);
+    // Get date and time in CPython order.
+    snvs_lp_srtc_datetime_t srtc_date;
+    SNVS_LP_SRTC_GetDatetime(SNVS, &srtc_date);
+
+    mp_obj_t tuple[8] = {
+        mp_obj_new_int(srtc_date.year),
+        mp_obj_new_int(srtc_date.month),
+        mp_obj_new_int(srtc_date.day),
+        mp_obj_new_int(srtc_date.hour),
+        mp_obj_new_int(srtc_date.minute),
+        mp_obj_new_int(srtc_date.second),
+        mp_obj_new_int((ticks_us64() + us_offset) % 1000000),
+        mp_const_none,
+    };
+    return mp_obj_new_tuple(8, tuple);
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_rtc_now_obj, machine_rtc_now);
 
@@ -112,16 +127,6 @@ STATIC mp_obj_t machine_rtc_init(mp_obj_t self_in, mp_obj_t date) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_2(machine_rtc_init_obj, machine_rtc_init);
 
-STATIC mp_obj_t machine_rtc_weekday(mp_obj_t self_in) {
-    (void)self_in; // unused
-    int day;
-    snvs_lp_srtc_datetime_t srtc_date;
-    SNVS_LP_SRTC_GetDatetime(SNVS, &srtc_date);
-    day = calc_weekday(srtc_date.year, srtc_date.month, srtc_date.day);
-    return MP_OBJ_NEW_SMALL_INT((day + 6) % 7);
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_rtc_weekday_obj, machine_rtc_weekday);
-
 // calibration(cal)
 // When the argument is a number in the range [-16 to 15], set the calibration value.
 STATIC mp_obj_t machine_rtc_calibration(mp_obj_t self_in, mp_obj_t cal_in) {
@@ -143,7 +148,6 @@ STATIC const mp_rom_map_elem_t machine_rtc_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_init), MP_ROM_PTR(&machine_rtc_init_obj) },
     { MP_ROM_QSTR(MP_QSTR_datetime), MP_ROM_PTR(&machine_rtc_datetime_obj) },
     { MP_ROM_QSTR(MP_QSTR_now), MP_ROM_PTR(&machine_rtc_now_obj) },
-    { MP_ROM_QSTR(MP_QSTR_weekday), MP_ROM_PTR(&machine_rtc_weekday_obj) },
     { MP_ROM_QSTR(MP_QSTR_calibration), MP_ROM_PTR(&machine_rtc_calibration_obj) },
 };
 STATIC MP_DEFINE_CONST_DICT(machine_rtc_locals_dict, machine_rtc_locals_dict_table);

From 3ab8806c0d2fe77e9785216563b419cfadff71b0 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sat, 12 Jun 2021 08:45:01 +0200
Subject: [PATCH 0959/3533] mimxrt/machine_rtc: Maintain microsecond offset.

The supplied value for microseconds in datetime() will be treated as a
starting value for the reported microseconds.  Due to internal processing
in setting the time, there is an offset about 1 ms.
---
 ports/mimxrt/machine_rtc.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ports/mimxrt/machine_rtc.c b/ports/mimxrt/machine_rtc.c
index 4c88466cf767c..4de3419c1cf72 100644
--- a/ports/mimxrt/machine_rtc.c
+++ b/ports/mimxrt/machine_rtc.c
@@ -37,6 +37,7 @@ typedef struct _machine_rtc_obj_t {
 
 // Singleton RTC object.
 STATIC const machine_rtc_obj_t machine_rtc_obj = {{&machine_rtc_type}};
+uint32_t us_offset = 0;
 
 // Calculate the weekday from the date.
 // The result is zero based with 0 = Monday.
@@ -70,7 +71,7 @@ STATIC mp_obj_t machine_rtc_datetime_helper(size_t n_args, const mp_obj_t *args)
             mp_obj_new_int(srtc_date.hour),
             mp_obj_new_int(srtc_date.minute),
             mp_obj_new_int(srtc_date.second),
-            mp_obj_new_int(ticks_us64() % 1000000),
+            mp_obj_new_int((ticks_us64() + us_offset) % 1000000),
         };
         return mp_obj_new_tuple(8, tuple);
     } else {
@@ -91,6 +92,7 @@ STATIC mp_obj_t machine_rtc_datetime_helper(size_t n_args, const mp_obj_t *args)
         if (SNVS_LP_SRTC_SetDatetime(SNVS, &srtc_date) != kStatus_Success) {
             mp_raise_ValueError(NULL);
         }
+        us_offset = (1000000 + mp_obj_get_int(items[7]) - ticks_us64() % 1000000) % 1000000;
 
         return mp_const_none;
     }

From c4ed17ff345ee59f284a2f6d1ec18034eeb311a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolt=C3=A1n=20V=C3=B6r=C3=B6s?= <zvoros@gmail.com>
Date: Sat, 12 Jun 2021 15:09:24 +0200
Subject: [PATCH 0960/3533] tests/cpydiff: Add test for array constructor with
 overflowing value.

---
 tests/cpydiff/module_array_constructor.py | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 tests/cpydiff/module_array_constructor.py

diff --git a/tests/cpydiff/module_array_constructor.py b/tests/cpydiff/module_array_constructor.py
new file mode 100644
index 0000000000000..08cf2ef2d1c3c
--- /dev/null
+++ b/tests/cpydiff/module_array_constructor.py
@@ -0,0 +1,10 @@
+"""
+categories: Modules,array
+description: Overflow checking is not implemented
+cause: MicroPython implements implicit truncation in order to reduce code size and execution time
+workaround: If CPython compatibility is needed then mask the value explicitly
+"""
+import array
+
+a = array.array("b", [257])
+print(a)

From 51614ce365d4ec683560106d2af56f15d5ff38fa Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Sun, 6 Jun 2021 21:42:48 +0200
Subject: [PATCH 0961/3533] stm32/eth: Add low-power mode configuration option.

Add low power functionality configurable with:

    lan.config(low_power=True/False)
---
 ports/stm32/eth.c         | 62 ++++++++++++++++++++++++++++++++-------
 ports/stm32/eth.h         |  1 +
 ports/stm32/network_lan.c |  4 +++
 3 files changed, 56 insertions(+), 11 deletions(-)

diff --git a/ports/stm32/eth.c b/ports/stm32/eth.c
index 7a08e8c28c34d..30f8a1014e1e1 100644
--- a/ports/stm32/eth.c
+++ b/ports/stm32/eth.c
@@ -46,6 +46,7 @@
 #define PHY_BCR                 (0x0000)
 #define PHY_BCR_SOFT_RESET      (0x8000)
 #define PHY_BCR_AUTONEG_EN      (0x1000)
+#define PHY_BCR_POWER_DOWN      (0x0800U)
 
 #undef PHY_BSR
 #define PHY_BSR                 (0x0001)
@@ -188,17 +189,6 @@ STATIC uint32_t eth_phy_read(uint32_t reg) {
 void eth_init(eth_t *self, int mac_idx) {
     mp_hal_get_mac(mac_idx, &self->netif.hwaddr[0]);
     self->netif.hwaddr_len = 6;
-}
-
-void eth_set_trace(eth_t *self, uint32_t value) {
-    self->trace_flags = value;
-}
-
-STATIC int eth_mac_init(eth_t *self) {
-    // Configure MPU
-    uint32_t irq_state = mpu_config_start();
-    mpu_config_region(MPU_REGION_ETH, (uint32_t)&eth_dma, MPU_CONFIG_ETH(MPU_REGION_SIZE_16KB));
-    mpu_config_end(irq_state);
 
     // Configure GPIO
     mp_hal_pin_config_alt_static(MICROPY_HW_ETH_MDC, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE, STATIC_AF_ETH_MDC);
@@ -211,6 +201,27 @@ STATIC int eth_mac_init(eth_t *self) {
     mp_hal_pin_config_alt_static(MICROPY_HW_ETH_RMII_TXD0, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE, STATIC_AF_ETH_RMII_TXD0);
     mp_hal_pin_config_alt_static(MICROPY_HW_ETH_RMII_TXD1, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE, STATIC_AF_ETH_RMII_TXD1);
 
+    // Enable peripheral clock
+    #if defined(STM32H7)
+    __HAL_RCC_ETH1MAC_CLK_ENABLE();
+    __HAL_RCC_ETH1TX_CLK_ENABLE();
+    __HAL_RCC_ETH1RX_CLK_ENABLE();
+    #else
+    __HAL_RCC_ETH_CLK_ENABLE();
+    #endif
+}
+
+void eth_set_trace(eth_t *self, uint32_t value) {
+    self->trace_flags = value;
+}
+
+STATIC int eth_mac_init(eth_t *self) {
+    // Configure MPU
+    uint32_t irq_state = mpu_config_start();
+    mpu_config_region(MPU_REGION_ETH, (uint32_t)&eth_dma, MPU_CONFIG_ETH(MPU_REGION_SIZE_16KB));
+    mpu_config_end(irq_state);
+
+    // Enable peripheral clock
     #if defined(STM32H7)
     __HAL_RCC_ETH1MAC_CLK_ENABLE();
     __HAL_RCC_ETH1TX_CLK_ENABLE();
@@ -791,6 +802,10 @@ int eth_link_status(eth_t *self) {
 
 int eth_start(eth_t *self) {
     eth_lwip_deinit(self);
+
+    // Make sure Eth is Not in low power mode.
+    eth_low_power_mode(self, false);
+
     int ret = eth_mac_init(self);
     if (ret < 0) {
         return ret;
@@ -805,4 +820,29 @@ int eth_stop(eth_t *self) {
     return 0;
 }
 
+void eth_low_power_mode(eth_t *self, bool enable) {
+    (void)self;
+
+    // Enable eth clock
+    #if defined(STM32H7)
+    __HAL_RCC_ETH1MAC_CLK_ENABLE();
+    #else
+    __HAL_RCC_ETH_CLK_ENABLE();
+    #endif
+
+    uint16_t bcr = eth_phy_read(PHY_BCR);
+    if (enable) {
+        // Enable low-power mode.
+        eth_phy_write(PHY_BCR, bcr | PHY_BCR_POWER_DOWN);
+        // Disable eth clock.
+        #if defined(STM32H7)
+        __HAL_RCC_ETH1MAC_CLK_DISABLE();
+        #else
+        __HAL_RCC_ETH_CLK_DISABLE();
+        #endif
+    } else {
+        // Disable low-power mode.
+        eth_phy_write(PHY_BCR, bcr & (~PHY_BCR_POWER_DOWN));
+    }
+}
 #endif // defined(MICROPY_HW_ETH_MDC)
diff --git a/ports/stm32/eth.h b/ports/stm32/eth.h
index fd46c7fa7c01b..47344b9526fd4 100644
--- a/ports/stm32/eth.h
+++ b/ports/stm32/eth.h
@@ -35,5 +35,6 @@ struct netif *eth_netif(eth_t *self);
 int eth_link_status(eth_t *self);
 int eth_start(eth_t *self);
 int eth_stop(eth_t *self);
+void eth_low_power_mode(eth_t *self, bool enable);
 
 #endif // MICROPY_INCLUDED_STM32_ETH_H
diff --git a/ports/stm32/network_lan.c b/ports/stm32/network_lan.c
index 19b4e786d9ea5..6dd9aadb650a0 100644
--- a/ports/stm32/network_lan.c
+++ b/ports/stm32/network_lan.c
@@ -134,6 +134,10 @@ STATIC mp_obj_t network_lan_config(size_t n_args, const mp_obj_t *args, mp_map_t
                         eth_set_trace(self->eth, mp_obj_get_int(e->value));
                         break;
                     }
+                    case MP_QSTR_low_power: {
+                        eth_low_power_mode(self->eth, mp_obj_get_int(e->value));
+                        break;
+                    }
                     default:
                         mp_raise_ValueError(MP_ERROR_TEXT("unknown config param"));
                 }

From 66115a37444350b166384ae8be95639aef5a5af4 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Sun, 6 Jun 2021 21:49:40 +0200
Subject: [PATCH 0962/3533] stm32/eth: Fix eth_link_status function to use
 correct BSR bit.

Fixes #7346.
---
 ports/stm32/eth.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/ports/stm32/eth.c b/ports/stm32/eth.c
index 30f8a1014e1e1..79165e11916b9 100644
--- a/ports/stm32/eth.c
+++ b/ports/stm32/eth.c
@@ -791,11 +791,10 @@ int eth_link_status(eth_t *self) {
             return 2; // link no-ip;
         }
     } else {
-        int s = eth_phy_read(0) | eth_phy_read(0x10) << 16;
-        if (s == 0) {
-            return 0; // link down
+        if (eth_phy_read(PHY_BSR) & PHY_BSR_LINK_STATUS) {
+            return 1; // link up
         } else {
-            return 1; // link join
+            return 0; // link down
         }
     }
 }

From e7f7094ef60d91c89d05d2b006f2eb80fff3efd6 Mon Sep 17 00:00:00 2001
From: Krzysztof Adamski <k@japko.eu>
Date: Sun, 13 Jun 2021 10:27:45 +0200
Subject: [PATCH 0963/3533] rp2/machine_rtc: Check return value from
 rtc_set_datetime.

The rtc_set_datetime() from pico-sdk will validate the values in the
datetime_t structure and refuse to set the time if they aren't valid. It
makes sense to raise an exception if this happens instead of failing
silently which might be confusing (as an example, see:
https://github.com/micropython/micropython/pull/6928#issuecomment-860166044
).
---
 ports/rp2/machine_rtc.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ports/rp2/machine_rtc.c b/ports/rp2/machine_rtc.c
index 8ead51af13f11..797bee5ed3f15 100644
--- a/ports/rp2/machine_rtc.c
+++ b/ports/rp2/machine_rtc.c
@@ -100,7 +100,9 @@ STATIC mp_obj_t machine_rtc_datetime(mp_uint_t n_args, const mp_obj_t *args) {
             .sec = mp_obj_get_int(items[6]),
         };
 
-        rtc_set_datetime(&t);
+        if (!rtc_set_datetime(&t)) {
+            mp_raise_OSError(MP_EINVAL);
+        }
 
     }
     return mp_const_none;

From 95048129b1d93854c25f501c02801929aeeb23f0 Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <pavol@rusnak.io>
Date: Sun, 6 Jun 2021 21:49:40 +0200
Subject: [PATCH 0964/3533] unix: Fix build on arm64-darwin due to integer
 cast.

This fixes error: cast to smaller integer type 'int' from 'pthread_t'.
pthread_t is defined as long, not as int.

Signed-off-by: Pavol Rusnak <pavol@rusnak.io>
---
 ports/unix/mpthreadport.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/unix/mpthreadport.c b/ports/unix/mpthreadport.c
index cbc4901f69f4e..d3243b337ff47 100644
--- a/ports/unix/mpthreadport.c
+++ b/ports/unix/mpthreadport.c
@@ -126,7 +126,7 @@ void mp_thread_init(void) {
     thread->next = NULL;
 
     #if defined(__APPLE__)
-    snprintf(thread_signal_done_name, sizeof(thread_signal_done_name), "micropython_sem_%d", (int)thread->id);
+    snprintf(thread_signal_done_name, sizeof(thread_signal_done_name), "micropython_sem_%ld", (long)thread->id);
     thread_signal_done_p = sem_open(thread_signal_done_name, O_CREAT | O_EXCL, 0666, 0);
     #else
     sem_init(&thread_signal_done, 0, 0);

From b0b8ebc4f6e337e18c79367ccc5f379dfa8681d9 Mon Sep 17 00:00:00 2001
From: Mike Teachman <mike.teachman@gmail.com>
Date: Thu, 3 Jun 2021 09:43:56 -0700
Subject: [PATCH 0965/3533] extmod/uasyncio: Add readinto() method to Stream
 class.

With docs and a multi-test using TCP server/client.

This method is a MicroPython extension, although there is discussion of
adding it to CPython: https://bugs.python.org/issue41305

Signed-off-by: Mike Teachman <mike.teachman@gmail.com>
---
 docs/library/uasyncio.rst                    |  8 ++
 extmod/uasyncio/stream.py                    |  4 +
 tests/multi_net/uasyncio_tcp_readinto.py     | 80 ++++++++++++++++++++
 tests/multi_net/uasyncio_tcp_readinto.py.exp | 11 +++
 4 files changed, 103 insertions(+)
 create mode 100644 tests/multi_net/uasyncio_tcp_readinto.py
 create mode 100644 tests/multi_net/uasyncio_tcp_readinto.py.exp

diff --git a/docs/library/uasyncio.rst b/docs/library/uasyncio.rst
index 1efee56e9688b..0be3288296d7c 100644
--- a/docs/library/uasyncio.rst
+++ b/docs/library/uasyncio.rst
@@ -240,6 +240,14 @@ TCP stream connections
 
     This is a coroutine.
 
+.. method:: Stream.readinto(buf)
+
+    Read up to n bytes into *buf* with n being equal to the length of *buf*.
+
+    Return the number of bytes read into *buf*.
+
+    This is a coroutine, and a MicroPython extension.
+
 .. method:: Stream.readline()
 
     Read a line and return it.
diff --git a/extmod/uasyncio/stream.py b/extmod/uasyncio/stream.py
index 2a259e618f169..3a68881da3f1c 100644
--- a/extmod/uasyncio/stream.py
+++ b/extmod/uasyncio/stream.py
@@ -30,6 +30,10 @@ async def read(self, n):
         yield core._io_queue.queue_read(self.s)
         return self.s.read(n)
 
+    async def readinto(self, buf):
+        yield core._io_queue.queue_read(self.s)
+        return self.s.readinto(buf)
+
     async def readexactly(self, n):
         r = b""
         while n:
diff --git a/tests/multi_net/uasyncio_tcp_readinto.py b/tests/multi_net/uasyncio_tcp_readinto.py
new file mode 100644
index 0000000000000..631997652aa8f
--- /dev/null
+++ b/tests/multi_net/uasyncio_tcp_readinto.py
@@ -0,0 +1,80 @@
+# Test uasyncio stream readinto() method using TCP server/client
+
+try:
+    import uasyncio as asyncio
+except ImportError:
+    try:
+        import asyncio
+    except ImportError:
+        print("SKIP")
+        raise SystemExit
+
+try:
+    import uarray as array
+except ImportError:
+    try:
+        import array
+    except ImportError:
+        print("SKIP")
+        raise SystemExit
+
+PORT = 8000
+
+
+async def handle_connection(reader, writer):
+    writer.write(b"ab")
+    await writer.drain()
+
+    writer.write(b"c")
+    await writer.drain()
+
+    print("close")
+    writer.close()
+    await writer.wait_closed()
+
+    print("done")
+    ev.set()
+
+
+async def tcp_server():
+    global ev
+    ev = asyncio.Event()
+    server = await asyncio.start_server(handle_connection, "0.0.0.0", PORT)
+    print("server running")
+    multitest.next()
+    async with server:
+        await asyncio.wait_for(ev.wait(), 10)
+
+
+async def tcp_client():
+    reader, writer = await asyncio.open_connection(IP, PORT)
+
+    ba = bytearray(2)
+    n = await reader.readinto(ba)
+    print(n)
+    print(ba[:n])
+
+    a = array.array("b", [0, 0])
+    n = await reader.readinto(a)
+    print(n)
+    print(a[:n])
+
+    try:
+        n = await reader.readinto(5)
+    except TypeError as er:
+        print("TypeError")
+
+    try:
+        n = await reader.readinto()
+    except TypeError as er:
+        print("TypeError")
+
+
+def instance0():
+    multitest.globals(IP=multitest.get_network_ip())
+    asyncio.run(tcp_server())
+
+
+def instance1():
+    multitest.next()
+    asyncio.run(tcp_client())
diff --git a/tests/multi_net/uasyncio_tcp_readinto.py.exp b/tests/multi_net/uasyncio_tcp_readinto.py.exp
new file mode 100644
index 0000000000000..2d40ba1e634ec
--- /dev/null
+++ b/tests/multi_net/uasyncio_tcp_readinto.py.exp
@@ -0,0 +1,11 @@
+--- instance0 ---
+server running
+close
+done
+--- instance1 ---
+2
+bytearray(b'ab')
+1
+array('b', [99])
+TypeError
+TypeError

From 77c529e8be7302a8436152ead6dacf050c03d601 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sun, 13 Jun 2021 23:55:15 +1000
Subject: [PATCH 0966/3533] tools/mpremote: Use available ports instead of
 auto-connect list.

Using just the list of available ports, instead of a hard-coded list of
possible ports, means that all ports will be available for auto connection.
And the order that they will be attempted in will match what's printed by
"mpremote connect list" (and will be the same as before, trying ACMx before
USBx).  Auto-connect will also now work on Mac, and will allow all COM
ports on Windows.

Signed-off-by: Damien George <damien@micropython.org>
---
 tools/mpremote/mpremote/main.py | 29 ++++++-----------------------
 1 file changed, 6 insertions(+), 23 deletions(-)

diff --git a/tools/mpremote/mpremote/main.py b/tools/mpremote/mpremote/main.py
index 1ce00305eb525..121eec3bfa4e6 100644
--- a/tools/mpremote/mpremote/main.py
+++ b/tools/mpremote/mpremote/main.py
@@ -25,21 +25,6 @@
 
 _PROG = "mpremote"
 
-_AUTO_CONNECT_SEARCH_LIST = [
-    "/dev/ttyACM0",
-    "/dev/ttyACM1",
-    "/dev/ttyACM2",
-    "/dev/ttyACM3",
-    "/dev/ttyUSB0",
-    "/dev/ttyUSB1",
-    "/dev/ttyUSB2",
-    "/dev/ttyUSB3",
-    "COM0",
-    "COM1",
-    "COM2",
-    "COM3",
-]
-
 _BUILTIN_COMMAND_EXPANSIONS = {
     # Device connection shortcuts.
     "a0": "connect /dev/ttyACM0",
@@ -187,14 +172,12 @@ def do_connect(args):
             return None
         elif dev == "auto":
             # Auto-detect and auto-connect to the first available device.
-            ports = serial.tools.list_ports.comports()
-            for dev in _AUTO_CONNECT_SEARCH_LIST:
-                if any(p.device == dev for p in ports):
-                    try:
-                        return pyboard.PyboardExtended(dev, baudrate=115200)
-                    except pyboard.PyboardError as er:
-                        if not er.args[0].startswith("failed to access"):
-                            raise er
+            for p in sorted(serial.tools.list_ports.comports()):
+                try:
+                    return pyboard.PyboardExtended(p.device, baudrate=115200)
+                except pyboard.PyboardError as er:
+                    if not er.args[0].startswith("failed to access"):
+                        raise er
             raise pyboard.PyboardError("no device found")
         elif dev.startswith("id:"):
             # Search for a device with the given serial number.

From d2dcd05adc0228dcb46cd31d5cc4751d88460b80 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sun, 13 Jun 2021 23:59:03 +1000
Subject: [PATCH 0967/3533] tools/mpremote: Use signal to capture and handle
 ctrl-C on Windows.

Now a ctrl-C will not stop mpremote, rather this character will be passed
through to the attached device.

The mpremote version is also increased to 0.0.5.

Signed-off-by: Damien George <damien@micropython.org>
---
 tools/mpremote/mpremote/console.py | 31 +++++++++++++++++++-----------
 tools/mpremote/mpremote/main.py    |  9 ++-------
 tools/mpremote/setup.cfg           |  2 +-
 3 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/tools/mpremote/mpremote/console.py b/tools/mpremote/mpremote/console.py
index 646bbfa22e88e..2652c7393b442 100644
--- a/tools/mpremote/mpremote/console.py
+++ b/tools/mpremote/mpremote/console.py
@@ -1,11 +1,11 @@
-import sys
+import sys, time
 
 try:
     import select, termios
 except ImportError:
     termios = None
     select = None
-    import msvcrt
+    import msvcrt, signal
 
 
 class ConsolePosix:
@@ -31,9 +31,9 @@ def enter(self):
     def exit(self):
         termios.tcsetattr(self.infd, termios.TCSANOW, self.orig_attr)
 
-    def waitchar(self):
-        # TODO pyb.serial might not have fd
-        select.select([console_in.infd, pyb.serial.fd], [], [])
+    def waitchar(self, pyb_serial):
+        # TODO pyb_serial might not have fd
+        select.select([self.infd, pyb_serial.fd], [], [])
 
     def readchar(self):
         res = select.select([self.infd], [], [], 0)
@@ -75,20 +75,29 @@ class ConsoleWindows:
         b"\x94": b"Z",  # Ctrl-Tab = BACKTAB,
     }
 
+    def __init__(self):
+        self.ctrl_c = 0
+
+    def _sigint_handler(self, signo, frame):
+        self.ctrl_c += 1
+
     def enter(self):
-        pass
+        signal.signal(signal.SIGINT, self._sigint_handler)
 
     def exit(self):
-        pass
+        signal.signal(signal.SIGINT, signal.SIG_DFL)
 
     def inWaiting(self):
-        return 1 if msvcrt.kbhit() else 0
+        return 1 if self.ctrl_c or msvcrt.kbhit() else 0
 
-    def waitchar(self):
-        while not (self.inWaiting() or pyb.serial.inWaiting()):
+    def waitchar(self, pyb_serial):
+        while not (self.inWaiting() or pyb_serial.inWaiting()):
             time.sleep(0.01)
 
     def readchar(self):
+        if self.ctrl_c:
+            self.ctrl_c -= 1
+            return b"\x03"
         if msvcrt.kbhit():
             ch = msvcrt.getch()
             while ch in b"\x00\xe0":  # arrow or function key prefix?
@@ -120,7 +129,7 @@ def write(self, buf):
 
     # Windows VT mode ( >= win10 only)
     # https://bugs.python.org/msg291732
-    import ctypes
+    import ctypes, os
     from ctypes import wintypes
 
     kernel32 = ctypes.WinDLL("kernel32", use_last_error=True)
diff --git a/tools/mpremote/mpremote/main.py b/tools/mpremote/mpremote/main.py
index 121eec3bfa4e6..b7c46a1f11f5f 100644
--- a/tools/mpremote/mpremote/main.py
+++ b/tools/mpremote/mpremote/main.py
@@ -17,7 +17,7 @@
     mpremote repl                    -- enter REPL
 """
 
-import os, select, sys, time
+import os, sys
 import serial.tools.list_ports
 
 from . import pyboardextended as pyboard
@@ -249,12 +249,7 @@ def _list_recursive(files, path):
 
 def do_repl_main_loop(pyb, console_in, console_out_write, *, code_to_inject, file_to_inject):
     while True:
-        if isinstance(console_in, ConsolePosix):
-            # TODO pyb.serial might not have fd
-            select.select([console_in.infd, pyb.serial.fd], [], [])
-        else:
-            while not (console_in.inWaiting() or pyb.serial.inWaiting()):
-                time.sleep(0.01)
+        console_in.waitchar(pyb.serial)
         c = console_in.readchar()
         if c:
             if c == b"\x1d":  # ctrl-], quit
diff --git a/tools/mpremote/setup.cfg b/tools/mpremote/setup.cfg
index 4a1bf27c108c2..4e78d05a945b5 100644
--- a/tools/mpremote/setup.cfg
+++ b/tools/mpremote/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = mpremote
-version = 0.0.4
+version = 0.0.5
 author = Damien George
 author_email = damien@micropython.org
 description = Tool for interacting remotely with MicroPython

From 689476c576dc4ea5e944f396bd4bf2b95e08cf70 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sun, 30 May 2021 18:18:33 +0200
Subject: [PATCH 0968/3533] mimxrt/machine_uart: Add the UART class to the
 machine module.

The implementation uses the LPUARTx devices.  Up to 8 UARTs can be used,
given that the pins are accessible.  E.g. 8 on Teensy 4.1, 5 on
MIMXRT1020_EVK.

For Tennsy 4.0 and 4.1 the UART numbers are as printed on the pinout 1..N.
The MIMXRT10xx-EVK boards have only one UART named, which gets the number
1.  All other UART are assigned to different Pins:

MIMXRT1010-EVK:
    D0/D1   UART 1
    D6/D7   UART 2
    A0/D4   UART 3

MIMXRT1020-EVK:
    D0/D1   UART 1
    D6/D9   UART 2
    D10/D12 UART 3
    D14/D15 UART 4
    A0/A1   UART 5

MIMXRT1050-EVK, MIMXRT1060-EVK, MIMXRT1064-EVK:
    D0/D1   UART 1
    D7/D6   UART 2
    D8/D9   UART 3
    A1/A0   UART 4
---
 ports/mimxrt/Makefile                         |   2 +
 .../boards/MIMXRT1010_EVK/mpconfigboard.h     |  14 +
 ports/mimxrt/boards/MIMXRT1010_EVK/pins.csv   |  21 -
 .../boards/MIMXRT1020_EVK/mpconfigboard.h     |  21 +
 .../boards/MIMXRT1050_EVK/mpconfigboard.h     |  19 +
 ports/mimxrt/boards/MIMXRT1050_EVK/pins.csv   |  20 -
 .../boards/MIMXRT1060_EVK/mpconfigboard.h     |  19 +
 ports/mimxrt/boards/MIMXRT1060_EVK/pins.csv   |  20 -
 .../boards/MIMXRT1064_EVK/mpconfigboard.h     |  20 +-
 ports/mimxrt/boards/MIMXRT1064_EVK/pins.csv   |  20 -
 ports/mimxrt/boards/TEENSY40/mpconfigboard.h  |  14 +
 ports/mimxrt/boards/TEENSY41/mpconfigboard.h  |  14 +
 ports/mimxrt/machine_uart.c                   | 465 ++++++++++++++++++
 ports/mimxrt/modmachine.c                     |   1 +
 ports/mimxrt/modmachine.h                     |   1 +
 15 files changed, 589 insertions(+), 82 deletions(-)
 create mode 100644 ports/mimxrt/machine_uart.c

diff --git a/ports/mimxrt/Makefile b/ports/mimxrt/Makefile
index cacbcc1a37e61..3af2a554728be 100644
--- a/ports/mimxrt/Makefile
+++ b/ports/mimxrt/Makefile
@@ -140,6 +140,7 @@ SRC_C = \
 	machine_pin.c \
 	machine_rtc.c \
 	machine_timer.c \
+	machine_uart.c \
 	mimxrt_flash.c \
 	modutime.c \
 	modmachine.c \
@@ -263,6 +264,7 @@ SRC_QSTR += \
 	machine_pin.c \
 	machine_rtc.c \
 	machine_timer.c \
+	machine_uart.c \
 	mimxrt_flash.c \
 	modutime.c \
 	modmachine.c \
diff --git a/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.h b/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.h
index 3eb32681252ba..5a373a3ca6464 100644
--- a/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.h
+++ b/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.h
@@ -8,3 +8,17 @@
 #define MICROPY_HW_LED_ON(pin) (mp_hal_pin_high(pin))
 #define MICROPY_HW_LED_OFF(pin) (mp_hal_pin_low(pin))
 #define BOARD_FLASH_CONFIG_HEADER_H "evkmimxrt1010_flexspi_nor_config.h"
+
+// Define mapping logical UART # to hardware UART #
+// LPUART1 on D0/D1 -> 1
+// LPUART3 on A0/D4 -> 3
+// LPUART4 on D6/D7 -> 2
+
+#define MICROPY_HW_UART_NUM     (sizeof(uart_index_table) / sizeof(uart_index_table)[0])
+#define MICROPY_HW_UART_INDEX   { 0, 1, 4, 3 }
+
+#define IOMUX_TABLE_UART \
+    { IOMUXC_GPIO_10_LPUART1_TXD }, { IOMUXC_GPIO_09_LPUART1_RXD }, \
+    { 0 }, { 0 }, \
+    { IOMUXC_GPIO_08_LPUART3_TXD }, { IOMUXC_GPIO_AD_07_LPUART3_RXD }, \
+    { IOMUXC_GPIO_AD_02_LPUART4_TXD }, { IOMUXC_GPIO_AD_01_LPUART4_RXD },
diff --git a/ports/mimxrt/boards/MIMXRT1010_EVK/pins.csv b/ports/mimxrt/boards/MIMXRT1010_EVK/pins.csv
index f7fdf39643eab..1f01215ddd947 100644
--- a/ports/mimxrt/boards/MIMXRT1010_EVK/pins.csv
+++ b/ports/mimxrt/boards/MIMXRT1010_EVK/pins.csv
@@ -34,24 +34,3 @@ PWM_CB,GPIO_05
 ENC_A,GPIO_AD_05
 ENC_B,GPIO_AD_06
 LED_GREEN,GPIO_11
-GPIO_01,GPIO_01
-GPIO_02,GPIO_02
-GPIO_03,GPIO_03
-GPIO_04,GPIO_04
-GPIO_05,GPIO_05
-GPIO_06,GPIO_06
-GPIO_08,GPIO_08
-GPIO_09,GPIO_09
-GPIO_10,GPIO_10
-GPIO_11,GPIO_11
-GPIO_AD_01,GPIO_AD_01
-GPIO_AD_02,GPIO_AD_02
-GPIO_AD_03,GPIO_AD_03
-GPIO_AD_04,GPIO_AD_04
-GPIO_AD_05,GPIO_AD_05
-GPIO_AD_06,GPIO_AD_06
-GPIO_AD_07,GPIO_AD_07
-GPIO_AD_09,GPIO_AD_09
-GPIO_AD_10,GPIO_AD_10
-GPIO_AD_14,GPIO_AD_14
-GPIO_SD_02,GPIO_SD_02
diff --git a/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.h b/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.h
index a025c85bf3462..5a595074ad553 100644
--- a/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.h
+++ b/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.h
@@ -9,3 +9,24 @@
 #define MICROPY_HW_LED_ON(pin) (mp_hal_pin_low(pin))
 #define MICROPY_HW_LED_OFF(pin) (mp_hal_pin_high(pin))
 #define BOARD_FLASH_CONFIG_HEADER_H "evkmimxrt1020_flexspi_nor_config.h"
+
+// Define mapping logical UART # to hardware UART #
+// D3/D5   LPUART1  Not usable, Since D3 is blocked.
+// D0/D1   LPUART2 -> 1
+// D6/D9   LPUART3 -> 2
+// D10/D12 LPUART5 -> 3
+// D14/D15 LPUART8 -> 4
+// A0/A1   LPUART4 -> 5
+
+#define MICROPY_HW_UART_NUM     (sizeof(uart_index_table) / sizeof(uart_index_table)[0])
+#define MICROPY_HW_UART_INDEX   { 0, 2, 3, 5, 8, 4 }
+
+#define IOMUX_TABLE_UART \
+    { IOMUXC_GPIO_AD_B0_06_LPUART1_TX }, { IOMUXC_GPIO_AD_B0_07_LPUART1_RX }, \
+    { IOMUXC_GPIO_AD_B1_08_LPUART2_TX }, { IOMUXC_GPIO_AD_B1_09_LPUART2_RX }, \
+    { IOMUXC_GPIO_AD_B0_14_LPUART3_TX }, { IOMUXC_GPIO_AD_B0_15_LPUART3_RX }, \
+    { IOMUXC_GPIO_AD_B1_10_LPUART4_TX }, { IOMUXC_GPIO_AD_B1_11_LPUART4_RX }, \
+    { IOMUXC_GPIO_AD_B0_10_LPUART5_TX }, { IOMUXC_GPIO_AD_B0_11_LPUART5_RX }, \
+    { 0 }, { 0 }, \
+    { 0 }, { 0 }, \
+    { IOMUXC_GPIO_SD_B1_02_LPUART8_TX }, { IOMUXC_GPIO_SD_B1_03_LPUART8_RX },
diff --git a/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.h b/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.h
index 9b7664841ed6d..51e0e2dc4715b 100644
--- a/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.h
+++ b/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.h
@@ -8,3 +8,22 @@
 #define MICROPY_HW_LED_ON(pin) (mp_hal_pin_low(pin))
 #define MICROPY_HW_LED_OFF(pin) (mp_hal_pin_high(pin))
 #define BOARD_FLASH_CONFIG_HEADER_H "evkmimxrt1050_flexspi_nor_config.h"
+
+// Define mapping logical UART # to hardware UART #
+// LPUART3 on D0/D1  -> 1
+// LPUART2 on D7/D6  -> 2
+// LPUART6 on D8/D9  -> 3
+// LPUART8 on A1/A0  -> 4
+
+#define MICROPY_HW_UART_NUM     (sizeof(uart_index_table) / sizeof(uart_index_table)[0])
+#define MICROPY_HW_UART_INDEX   { 0, 3, 2, 6, 8 }
+
+#define IOMUX_TABLE_UART \
+    { 0 }, { 0 }, \
+    { IOMUXC_GPIO_AD_B1_02_LPUART2_TX }, { IOMUXC_GPIO_AD_B1_03_LPUART2_RX }, \
+    { IOMUXC_GPIO_AD_B1_06_LPUART3_TX }, { IOMUXC_GPIO_AD_B1_07_LPUART3_RX }, \
+    { 0 }, { 0 }, \
+    { 0 }, { 0 }, \
+    { IOMUXC_GPIO_AD_B0_02_LPUART6_TX }, { IOMUXC_GPIO_AD_B0_03_LPUART6_RX }, \
+    { 0 }, { 0 }, \
+    { IOMUXC_GPIO_AD_B1_10_LPUART8_TX }, { IOMUXC_GPIO_AD_B1_11_LPUART8_RX },
diff --git a/ports/mimxrt/boards/MIMXRT1050_EVK/pins.csv b/ports/mimxrt/boards/MIMXRT1050_EVK/pins.csv
index afd63d4f97fe8..366a141ff8e14 100644
--- a/ports/mimxrt/boards/MIMXRT1050_EVK/pins.csv
+++ b/ports/mimxrt/boards/MIMXRT1050_EVK/pins.csv
@@ -29,23 +29,3 @@ SDI,GPIO_SD_B0_03
 SDO,GPIO_SD_B0_02
 CS,GPIO_SD_B0_01
 LED_GREEN,GPIO_AD_B0_09
-GPIO_AD_B1_07,GPIO_AD_B1_07
-GPIO_AD_B1_06,GPIO_AD_B1_06
-GPIO_AD_B0_11,GPIO_AD_B0_11
-GPIO_AD_B1_08,GPIO_AD_B1_08
-GPIO_AD_B0_09,GPIO_AD_B0_09
-GPIO_AD_B0_10,GPIO_AD_B0_10
-GPIO_AD_B1_02,GPIO_AD_B1_02
-GPIO_AD_B1_03,GPIO_AD_B1_03
-GPIO_AD_B0_03,GPIO_AD_B0_03
-GPIO_AD_B0_02,GPIO_AD_B0_02
-GPIO_SD_B0_01,GPIO_SD_B0_01
-GPIO_SD_B0_02,GPIO_SD_B0_02
-GPIO_SD_B0_03,GPIO_SD_B0_03
-GPIO_SD_B0_00,GPIO_SD_B0_00
-GPIO_AD_B1_01,GPIO_AD_B1_01
-GPIO_AD_B1_00,GPIO_AD_B1_00
-GPIO_AD_B1_10,GPIO_AD_B1_10
-GPIO_AD_B1_11,GPIO_AD_B1_11
-GPIO_AD_B1_04,GPIO_AD_B1_04
-GPIO_AD_B1_05,GPIO_AD_B1_05
diff --git a/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.h b/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.h
index 3974f9325715e..02372a3c548ca 100644
--- a/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.h
+++ b/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.h
@@ -8,3 +8,22 @@
 #define MICROPY_HW_LED_ON(pin) (mp_hal_pin_low(pin))
 #define MICROPY_HW_LED_OFF(pin) (mp_hal_pin_high(pin))
 #define BOARD_FLASH_CONFIG_HEADER_H "evkmimxrt1060_flexspi_nor_config.h"
+
+// Define mapping logical UART # to hardware UART #
+// LPUART3 on D0/D1  -> 1
+// LPUART2 on D7/D6  -> 2
+// LPUART6 on D8/D9  -> 3
+// LPUART8 on A1/A0  -> 4
+
+#define MICROPY_HW_UART_NUM     (sizeof(uart_index_table) / sizeof(uart_index_table)[0])
+#define MICROPY_HW_UART_INDEX   { 0, 3, 2, 6, 8 }
+
+#define IOMUX_TABLE_UART \
+    { 0 }, { 0 }, \
+    { IOMUXC_GPIO_AD_B1_02_LPUART2_TX }, { IOMUXC_GPIO_AD_B1_03_LPUART2_RX }, \
+    { IOMUXC_GPIO_AD_B1_06_LPUART3_TX }, { IOMUXC_GPIO_AD_B1_07_LPUART3_RX }, \
+    { 0 }, { 0 }, \
+    { 0 }, { 0 }, \
+    { IOMUXC_GPIO_AD_B0_02_LPUART6_TX }, { IOMUXC_GPIO_AD_B0_03_LPUART6_RX }, \
+    { 0 }, { 0 }, \
+    { IOMUXC_GPIO_AD_B1_10_LPUART8_TX }, { IOMUXC_GPIO_AD_B1_11_LPUART8_RX },
diff --git a/ports/mimxrt/boards/MIMXRT1060_EVK/pins.csv b/ports/mimxrt/boards/MIMXRT1060_EVK/pins.csv
index afd63d4f97fe8..366a141ff8e14 100644
--- a/ports/mimxrt/boards/MIMXRT1060_EVK/pins.csv
+++ b/ports/mimxrt/boards/MIMXRT1060_EVK/pins.csv
@@ -29,23 +29,3 @@ SDI,GPIO_SD_B0_03
 SDO,GPIO_SD_B0_02
 CS,GPIO_SD_B0_01
 LED_GREEN,GPIO_AD_B0_09
-GPIO_AD_B1_07,GPIO_AD_B1_07
-GPIO_AD_B1_06,GPIO_AD_B1_06
-GPIO_AD_B0_11,GPIO_AD_B0_11
-GPIO_AD_B1_08,GPIO_AD_B1_08
-GPIO_AD_B0_09,GPIO_AD_B0_09
-GPIO_AD_B0_10,GPIO_AD_B0_10
-GPIO_AD_B1_02,GPIO_AD_B1_02
-GPIO_AD_B1_03,GPIO_AD_B1_03
-GPIO_AD_B0_03,GPIO_AD_B0_03
-GPIO_AD_B0_02,GPIO_AD_B0_02
-GPIO_SD_B0_01,GPIO_SD_B0_01
-GPIO_SD_B0_02,GPIO_SD_B0_02
-GPIO_SD_B0_03,GPIO_SD_B0_03
-GPIO_SD_B0_00,GPIO_SD_B0_00
-GPIO_AD_B1_01,GPIO_AD_B1_01
-GPIO_AD_B1_00,GPIO_AD_B1_00
-GPIO_AD_B1_10,GPIO_AD_B1_10
-GPIO_AD_B1_11,GPIO_AD_B1_11
-GPIO_AD_B1_04,GPIO_AD_B1_04
-GPIO_AD_B1_05,GPIO_AD_B1_05
diff --git a/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.h b/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.h
index 01e2e10bb53c3..e8492c92244f3 100644
--- a/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.h
+++ b/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.h
@@ -1,9 +1,27 @@
 #define MICROPY_HW_BOARD_NAME "i.MX RT1064 EVK"
 #define MICROPY_HW_MCU_NAME   "MIMXRT1064DVL6A"
 
-
 // MIMXRT1064_EVK has 1 user LED
 #define MICROPY_HW_LED1_PIN (pin_GPIO_AD_B0_09)
 #define MICROPY_HW_LED_ON(pin) (mp_hal_pin_low(pin))
 #define MICROPY_HW_LED_OFF(pin) (mp_hal_pin_high(pin))
 #define BOARD_FLASH_CONFIG_HEADER_H "evkmimxrt1064_flexspi_nor_config.h"
+
+// Define mapping logical UART # to hardware UART #
+// LPUART3 on D0/D1  -> 1
+// LPUART2 on D7/D6  -> 2
+// LPUART6 on D8/D9  -> 3
+// LPUART8 on A1/A0  -> 4
+
+#define MICROPY_HW_UART_NUM     (sizeof(uart_index_table) / sizeof(uart_index_table)[0])
+#define MICROPY_HW_UART_INDEX   { 0, 3, 2, 6, 8 }
+
+#define IOMUX_TABLE_UART \
+    { 0 }, { 0 }, \
+    { IOMUXC_GPIO_AD_B1_02_LPUART2_TX }, { IOMUXC_GPIO_AD_B1_03_LPUART2_RX }, \
+    { IOMUXC_GPIO_AD_B1_06_LPUART3_TX }, { IOMUXC_GPIO_AD_B1_07_LPUART3_RX }, \
+    { 0 }, { 0 }, \
+    { 0 }, { 0 }, \
+    { IOMUXC_GPIO_AD_B0_02_LPUART6_TX }, { IOMUXC_GPIO_AD_B0_03_LPUART6_RX }, \
+    { 0 }, { 0 }, \
+    { IOMUXC_GPIO_AD_B1_10_LPUART8_TX }, { IOMUXC_GPIO_AD_B1_11_LPUART8_RX },
diff --git a/ports/mimxrt/boards/MIMXRT1064_EVK/pins.csv b/ports/mimxrt/boards/MIMXRT1064_EVK/pins.csv
index afd63d4f97fe8..366a141ff8e14 100644
--- a/ports/mimxrt/boards/MIMXRT1064_EVK/pins.csv
+++ b/ports/mimxrt/boards/MIMXRT1064_EVK/pins.csv
@@ -29,23 +29,3 @@ SDI,GPIO_SD_B0_03
 SDO,GPIO_SD_B0_02
 CS,GPIO_SD_B0_01
 LED_GREEN,GPIO_AD_B0_09
-GPIO_AD_B1_07,GPIO_AD_B1_07
-GPIO_AD_B1_06,GPIO_AD_B1_06
-GPIO_AD_B0_11,GPIO_AD_B0_11
-GPIO_AD_B1_08,GPIO_AD_B1_08
-GPIO_AD_B0_09,GPIO_AD_B0_09
-GPIO_AD_B0_10,GPIO_AD_B0_10
-GPIO_AD_B1_02,GPIO_AD_B1_02
-GPIO_AD_B1_03,GPIO_AD_B1_03
-GPIO_AD_B0_03,GPIO_AD_B0_03
-GPIO_AD_B0_02,GPIO_AD_B0_02
-GPIO_SD_B0_01,GPIO_SD_B0_01
-GPIO_SD_B0_02,GPIO_SD_B0_02
-GPIO_SD_B0_03,GPIO_SD_B0_03
-GPIO_SD_B0_00,GPIO_SD_B0_00
-GPIO_AD_B1_01,GPIO_AD_B1_01
-GPIO_AD_B1_00,GPIO_AD_B1_00
-GPIO_AD_B1_10,GPIO_AD_B1_10
-GPIO_AD_B1_11,GPIO_AD_B1_11
-GPIO_AD_B1_04,GPIO_AD_B1_04
-GPIO_AD_B1_05,GPIO_AD_B1_05
diff --git a/ports/mimxrt/boards/TEENSY40/mpconfigboard.h b/ports/mimxrt/boards/TEENSY40/mpconfigboard.h
index c6f11b51d191d..6bbac0a976dd5 100644
--- a/ports/mimxrt/boards/TEENSY40/mpconfigboard.h
+++ b/ports/mimxrt/boards/TEENSY40/mpconfigboard.h
@@ -8,3 +8,17 @@
 #define MICROPY_HW_LED_ON(pin) (mp_hal_pin_high(pin))
 #define MICROPY_HW_LED_OFF(pin) (mp_hal_pin_low(pin))
 #define BOARD_FLASH_CONFIG_HEADER_H "teensy40_flexspi_nor_config.h"
+
+// UART config: 7 UARTs at the pins for Teensy 4.0
+#define MICROPY_HW_UART_NUM     (sizeof(uart_index_table) / sizeof(uart_index_table)[0])
+#define MICROPY_HW_UART_INDEX   { 0, 6, 4, 2, 3, 8, 1, 7 }
+
+#define IOMUX_TABLE_UART \
+    { IOMUXC_GPIO_AD_B0_12_LPUART1_TX }, { IOMUXC_GPIO_AD_B0_13_LPUART1_RX }, \
+    { IOMUXC_GPIO_AD_B1_02_LPUART2_TX }, { IOMUXC_GPIO_AD_B1_03_LPUART2_RX }, \
+    { IOMUXC_GPIO_AD_B1_06_LPUART3_TX }, { IOMUXC_GPIO_AD_B1_07_LPUART3_RX }, \
+    { IOMUXC_GPIO_B1_00_LPUART4_TX }, { IOMUXC_GPIO_B1_01_LPUART4_RX }, \
+    { 0 }, { 0 }, \
+    { IOMUXC_GPIO_AD_B0_02_LPUART6_TX }, { IOMUXC_GPIO_AD_B0_03_LPUART6_RX }, \
+    { IOMUXC_GPIO_EMC_31_LPUART7_TX }, { IOMUXC_GPIO_EMC_32_LPUART7_RX }, \
+    { IOMUXC_GPIO_AD_B1_10_LPUART8_TX }, { IOMUXC_GPIO_AD_B1_11_LPUART8_RX },
diff --git a/ports/mimxrt/boards/TEENSY41/mpconfigboard.h b/ports/mimxrt/boards/TEENSY41/mpconfigboard.h
index 6acfa11cdbe26..1e07cb29cabe8 100755
--- a/ports/mimxrt/boards/TEENSY41/mpconfigboard.h
+++ b/ports/mimxrt/boards/TEENSY41/mpconfigboard.h
@@ -8,3 +8,17 @@
 #define MICROPY_HW_LED_ON(pin) (mp_hal_pin_high(pin))
 #define MICROPY_HW_LED_OFF(pin) (mp_hal_pin_low(pin))
 #define BOARD_FLASH_CONFIG_HEADER_H "teensy41_flexspi_nor_config.h"
+
+// UART config: 8 UARTs at the pins for Teensy 4.1
+#define MICROPY_HW_UART_NUM     (sizeof(uart_index_table) / sizeof(uart_index_table)[0])
+#define MICROPY_HW_UART_INDEX   { 0, 6, 4, 2, 3, 8, 1, 7, 5 }
+
+#define IOMUX_TABLE_UART \
+    { IOMUXC_GPIO_AD_B0_12_LPUART1_TX }, { IOMUXC_GPIO_AD_B0_13_LPUART1_RX }, \
+    { IOMUXC_GPIO_AD_B1_02_LPUART2_TX }, { IOMUXC_GPIO_AD_B1_03_LPUART2_RX }, \
+    { IOMUXC_GPIO_AD_B1_06_LPUART3_TX }, { IOMUXC_GPIO_AD_B1_07_LPUART3_RX }, \
+    { IOMUXC_GPIO_B1_00_LPUART4_TX }, { IOMUXC_GPIO_B1_01_LPUART4_RX }, \
+    { IOMUXC_GPIO_B1_12_LPUART5_TX }, { IOMUXC_GPIO_B1_13_LPUART5_RX }, \
+    { IOMUXC_GPIO_AD_B0_02_LPUART6_TX }, { IOMUXC_GPIO_AD_B0_03_LPUART6_RX }, \
+    { IOMUXC_GPIO_EMC_31_LPUART7_TX }, { IOMUXC_GPIO_EMC_32_LPUART7_RX }, \
+    { IOMUXC_GPIO_AD_B1_10_LPUART8_TX }, { IOMUXC_GPIO_AD_B1_11_LPUART8_RX },
diff --git a/ports/mimxrt/machine_uart.c b/ports/mimxrt/machine_uart.c
new file mode 100644
index 0000000000000..abdb7ed97eebb
--- /dev/null
+++ b/ports/mimxrt/machine_uart.c
@@ -0,0 +1,465 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020-2021 Damien P. George
+ * Copyright (c) 2021 Robert Hammelrath
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "py/runtime.h"
+#include "py/stream.h"
+#include "py/mphal.h"
+#include "ticks.h"
+#include "fsl_common.h"
+#include "fsl_lpuart.h"
+#include "fsl_iomuxc.h"
+
+#define DEFAULT_UART_BAUDRATE (115200)
+#define DEFAULT_BUFFER_SIZE (256)
+#define MIN_BUFFER_SIZE  (32)
+#define MAX_BUFFER_SIZE  (32766)
+
+#define UART_INVERT_TX (1)
+#define UART_INVERT_RX (2)
+#define UART_INVERT_MASK (UART_INVERT_TX | UART_INVERT_RX)
+
+typedef struct _machine_uart_obj_t {
+    mp_obj_base_t base;
+    struct _lpuart_handle handle;
+    lpuart_config_t config;
+    LPUART_Type *lpuart;
+    uint16_t timeout;       // timeout waiting for first char (in ms)
+    uint16_t timeout_char;  // timeout waiting between chars (in ms)
+    uint8_t id;
+    uint8_t invert;
+    uint16_t tx_status;
+    uint8_t *txbuf;
+    uint16_t txbuf_len;
+    bool new;
+} machine_uart_obj_t;
+
+typedef struct _iomux_table_t {
+    uint32_t muxRegister;
+    uint32_t muxMode;
+    uint32_t inputRegister;
+    uint32_t inputDaisy;
+    uint32_t configRegister;
+} iomux_table_t;
+
+extern const mp_obj_type_t machine_uart_type;
+
+STATIC const uint8_t uart_index_table[] = MICROPY_HW_UART_INDEX;
+STATIC LPUART_Type *uart_base_ptr_table[] = LPUART_BASE_PTRS;
+static const iomux_table_t iomux_table_uart[] = {
+    IOMUX_TABLE_UART
+};
+
+STATIC const char *_parity_name[] = {"None", "", "0", "1"};  // Is defined as 0, 2, 3
+STATIC const char *_invert_name[] = {"None", "INV_TX", "INV_RX", "INV_TX|INV_RX"};
+
+#define RX (iomux_table_uart[index + 1])
+#define TX (iomux_table_uart[index])
+
+bool lpuart_set_iomux(int8_t uart) {
+    int index = (uart - 1) * 2;
+
+    if (TX.muxRegister != 0) {
+        IOMUXC_SetPinMux(TX.muxRegister, TX.muxMode, TX.inputRegister, TX.inputDaisy, TX.configRegister, 0U);
+        IOMUXC_SetPinConfig(TX.muxRegister, TX.muxMode, TX.inputRegister, TX.inputDaisy, TX.configRegister, 0x10B0u);
+
+        IOMUXC_SetPinMux(RX.muxRegister, RX.muxMode, RX.inputRegister, RX.inputDaisy, RX.configRegister, 0U);
+        IOMUXC_SetPinConfig(RX.muxRegister, RX.muxMode, RX.inputRegister, RX.inputDaisy, RX.configRegister, 0x10B0u);
+        return true;
+    } else {
+        return false;
+    }
+}
+
+uint32_t UART_SrcFreq(void) {
+    uint32_t freq;
+    // To make it simple, we assume default PLL and divider settings, and the
+    // only variable from application is use PLL3 source or OSC source.
+    if (CLOCK_GetMux(kCLOCK_UartMux) == 0) { // PLL3 div6 80M
+        freq = (CLOCK_GetPllFreq(kCLOCK_PllUsb1) / 6U) / (CLOCK_GetDiv(kCLOCK_UartDiv) + 1U);
+    } else {
+        freq = CLOCK_GetOscFreq() / (CLOCK_GetDiv(kCLOCK_UartDiv) + 1U);
+    }
+    return freq;
+}
+
+void LPUART_UserCallback(LPUART_Type *base, lpuart_handle_t *handle, status_t status, void *userData) {
+    machine_uart_obj_t *self = userData;
+    if (kStatus_LPUART_TxIdle == status) {
+        self->tx_status = kStatus_LPUART_TxIdle;
+    }
+
+    if (kStatus_LPUART_RxRingBufferOverrun == status) {
+        ; // Ringbuffer full, deassert RTS if flow control is enabled
+    }
+}
+
+STATIC void machine_uart_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+    machine_uart_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    mp_printf(print, "UART(%u, baudrate=%u, bits=%u, parity=%s, stop=%u, "
+        "rxbuf=%d, txbuf=%d, timeout=%u, timeout_char=%u, invert=%s)",
+        self->id, self->config.baudRate_Bps, 8 - self->config.dataBitsCount,
+        _parity_name[self->config.parityMode], self->config.stopBitCount + 1,
+        self->handle.rxRingBufferSize, self->txbuf_len, self->timeout, self->timeout_char,
+        _invert_name[self->invert]);
+}
+
+STATIC mp_obj_t machine_uart_init_helper(machine_uart_obj_t *self, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    enum { ARG_baudrate, ARG_bits, ARG_parity, ARG_stop,
+           ARG_timeout, ARG_timeout_char, ARG_invert, ARG_rxbuf, ARG_txbuf};
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_baudrate, MP_ARG_INT, {.u_int = -1} },
+        { MP_QSTR_bits, MP_ARG_INT, {.u_int = -1} },
+        { MP_QSTR_parity, MP_ARG_OBJ, {.u_rom_obj = MP_ROM_INT(-1)} },
+        { MP_QSTR_stop, MP_ARG_INT, {.u_int = -1} },
+        { MP_QSTR_timeout, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} },
+        { MP_QSTR_timeout_char, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} },
+        { MP_QSTR_invert, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} },
+        { MP_QSTR_rxbuf, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} },
+        { MP_QSTR_txbuf, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} },
+    };
+
+    // Parse args
+    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
+    mp_arg_parse_all(n_args, pos_args, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
+
+    // Set baudrate if configured.
+    if (args[ARG_baudrate].u_int > 0) {
+        self->config.baudRate_Bps = args[ARG_baudrate].u_int;
+    }
+
+    // Set bits if configured.
+    if (args[ARG_bits].u_int > 0) {
+        self->config.dataBitsCount = 8 - args[ARG_bits].u_int;
+    }
+
+    // Set parity if configured.
+    if (args[ARG_parity].u_obj != MP_OBJ_NEW_SMALL_INT(-1)) {
+        if (args[ARG_parity].u_obj == mp_const_none) {
+            self->config.parityMode = kLPUART_ParityDisabled;
+        } else if (mp_obj_get_int(args[ARG_parity].u_obj) & 1) {
+            self->config.parityMode = kLPUART_ParityOdd;
+        } else {
+            self->config.parityMode = kLPUART_ParityEven;
+        }
+    }
+
+    // Set stop bits if configured.
+    if (args[ARG_stop].u_int > 0) {
+        self->config.stopBitCount = args[ARG_stop].u_int - 1;
+    }
+
+    // Set timeout if configured.
+    if (args[ARG_timeout].u_int >= 0) {
+        self->timeout = args[ARG_timeout].u_int;
+    }
+
+    // Set timeout_char if configured.
+    if (args[ARG_timeout_char].u_int >= 0) {
+        self->timeout_char = args[ARG_timeout_char].u_int;
+    }
+
+    // Set line inversion if configured.
+    if (args[ARG_invert].u_int >= 0) {
+        if (args[ARG_invert].u_int & ~UART_INVERT_MASK) {
+            mp_raise_ValueError(MP_ERROR_TEXT("bad inversion mask"));
+        }
+        self->invert = args[ARG_invert].u_int;
+    }
+
+    self->tx_status = kStatus_LPUART_TxIdle;
+    self->config.enableTx = true;
+    self->config.enableRx = true;
+
+    // Set the RX buffer size if configured.
+    size_t rxbuf_len = DEFAULT_BUFFER_SIZE;
+    if (args[ARG_rxbuf].u_int > 0) {
+        rxbuf_len = args[ARG_rxbuf].u_int;
+        if (rxbuf_len < MIN_BUFFER_SIZE) {
+            rxbuf_len = MIN_BUFFER_SIZE;
+        } else if (rxbuf_len > MAX_BUFFER_SIZE) {
+            mp_raise_ValueError(MP_ERROR_TEXT("rxbuf too large"));
+        }
+    }
+
+    // Set the TX buffer size if configured.
+    size_t txbuf_len = DEFAULT_BUFFER_SIZE;
+    if (args[ARG_txbuf].u_int > 0) {
+        txbuf_len = args[ARG_txbuf].u_int;
+        if (txbuf_len < MIN_BUFFER_SIZE) {
+            txbuf_len = MIN_BUFFER_SIZE;
+        } else if (txbuf_len > MAX_BUFFER_SIZE) {
+            mp_raise_ValueError(MP_ERROR_TEXT("txbuf too large"));
+        }
+    }
+
+    // Initialise the UART peripheral if any arguments given, or it was not initialised previously.
+    if (n_args > 1 || self->new) {
+        self->new = false;
+        // may be obsolete
+        if (self->config.baudRate_Bps == 0) {
+            self->config.baudRate_Bps = DEFAULT_UART_BAUDRATE;
+        }
+
+        // Make sure timeout_char is at least as long as a whole character (13 bits to be safe).
+        uint32_t min_timeout_char = 13000 / self->config.baudRate_Bps + 1;
+        if (self->timeout_char < min_timeout_char) {
+            self->timeout_char = min_timeout_char;
+        }
+
+        LPUART_Init(self->lpuart, &self->config, UART_SrcFreq()); // ??
+        LPUART_TransferCreateHandle(self->lpuart, &self->handle,  LPUART_UserCallback, self);
+        uint8_t *buffer = m_new(uint8_t, rxbuf_len + 1);
+        LPUART_TransferStartRingBuffer(self->lpuart, &self->handle, buffer, rxbuf_len);
+        self->txbuf = m_new(uint8_t, txbuf_len); // Allocate the TX buffer.
+        self->txbuf_len = txbuf_len;
+
+        // The Uart supports inverting, but not the fsl API, so it has to coded directly
+        // And it has to be done after LPUART_Init.
+        if (self->invert & UART_INVERT_RX) {
+            LPUART_EnableRx(self->lpuart, false);
+            self->lpuart->STAT |= 1 << LPUART_STAT_RXINV_SHIFT;
+            LPUART_EnableRx(self->lpuart, true);
+        }
+        if (self->invert & UART_INVERT_TX) {
+            LPUART_EnableTx(self->lpuart, false);
+            self->lpuart->CTRL |= 1 << LPUART_CTRL_TXINV_SHIFT;
+            LPUART_EnableTx(self->lpuart, true);
+        }
+        // Send long break; drop that code for a shorter break duration
+        LPUART_EnableTx(self->lpuart, false);
+        self->lpuart->STAT |= 1 << LPUART_STAT_BRK13_SHIFT;
+        LPUART_EnableTx(self->lpuart, true);
+
+        // Allocate the TX ring buffer. Not used yet, but maybe later.
+
+        // ringbuf_alloc(&(self->write_buffer), txbuf_len + 1);
+        // MP_STATE_PORT(rp2_uart_tx_buffer[uart_id]) = self->write_buffer.buf;
+
+    }
+
+    return MP_OBJ_FROM_PTR(self);
+}
+
+STATIC mp_obj_t machine_uart_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
+    mp_arg_check_num(n_args, n_kw, 1, MP_OBJ_FUN_ARGS_MAX, true);
+
+    // Get UART bus.
+    int uart_id = mp_obj_get_int(args[0]);
+    if (uart_id < 1 || uart_id > MICROPY_HW_UART_NUM) {
+        mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("UART(%d) doesn't exist"), uart_id);
+    }
+
+    // Create the UART object and fill it with defaults.
+    uint8_t uart_hw_id = uart_index_table[uart_id];  // the hw uart number 1..n
+    machine_uart_obj_t *self = m_new_obj(machine_uart_obj_t);
+    self->base.type = &machine_uart_type;
+    self->id = uart_id;
+    self->lpuart = uart_base_ptr_table[uart_hw_id];
+    self->invert = false;
+    self->timeout = 1;
+    self->timeout_char = 1;
+    self->new = true;
+    LPUART_GetDefaultConfig(&self->config);
+
+    // Configure board-specific pin MUX based on the hardware device number.
+    lpuart_set_iomux(uart_hw_id);
+
+    mp_map_t kw_args;
+    mp_map_init_fixed_table(&kw_args, n_kw, args + n_args);
+    return machine_uart_init_helper(self, n_args - 1, args + 1, &kw_args);
+}
+
+// uart.init(baud, [kwargs])
+STATIC mp_obj_t machine_uart_init(size_t n_args, const mp_obj_t *args, mp_map_t *kw_args) {
+    return machine_uart_init_helper(args[0], n_args - 1, args + 1, kw_args);
+}
+MP_DEFINE_CONST_FUN_OBJ_KW(machine_uart_init_obj, 1, machine_uart_init);
+
+STATIC mp_obj_t machine_uart_any(mp_obj_t self_in) {
+    machine_uart_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    size_t count = LPUART_TransferGetRxRingBufferLength(self->lpuart, &self->handle);
+    return MP_OBJ_NEW_SMALL_INT(count);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_uart_any_obj, machine_uart_any);
+
+STATIC mp_obj_t machine_uart_sendbreak(mp_obj_t self_in) {
+    machine_uart_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    self->lpuart->CTRL |= 1 << LPUART_CTRL_SBK_SHIFT; // Set SBK bit
+    self->lpuart->CTRL &= ~LPUART_CTRL_SBK_MASK; // Clear SBK bit
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_uart_sendbreak_obj, machine_uart_sendbreak);
+
+STATIC const mp_rom_map_elem_t machine_uart_locals_dict_table[] = {
+    { MP_ROM_QSTR(MP_QSTR_init), MP_ROM_PTR(&machine_uart_init_obj) },
+
+    { MP_ROM_QSTR(MP_QSTR_any), MP_ROM_PTR(&machine_uart_any_obj) },
+
+    { MP_ROM_QSTR(MP_QSTR_read), MP_ROM_PTR(&mp_stream_read_obj) },
+    { MP_ROM_QSTR(MP_QSTR_readline), MP_ROM_PTR(&mp_stream_unbuffered_readline_obj) },
+    { MP_ROM_QSTR(MP_QSTR_readinto), MP_ROM_PTR(&mp_stream_readinto_obj) },
+    { MP_ROM_QSTR(MP_QSTR_write), MP_ROM_PTR(&mp_stream_write_obj) },
+
+    { MP_ROM_QSTR(MP_QSTR_sendbreak), MP_ROM_PTR(&machine_uart_sendbreak_obj) },
+
+    { MP_ROM_QSTR(MP_QSTR_INV_TX), MP_ROM_INT(UART_INVERT_TX) },
+    { MP_ROM_QSTR(MP_QSTR_INV_RX), MP_ROM_INT(UART_INVERT_RX) },
+
+};
+STATIC MP_DEFINE_CONST_DICT(machine_uart_locals_dict, machine_uart_locals_dict_table);
+
+STATIC mp_uint_t machine_uart_read(mp_obj_t self_in, void *buf_in, mp_uint_t size, int *errcode) {
+    machine_uart_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    uint64_t t = ticks_us64() + (uint64_t)self->timeout * 1000;
+    uint64_t timeout_char_us = (uint64_t)self->timeout_char * 1000;
+    lpuart_transfer_t xfer;
+    uint8_t *dest = buf_in;
+    size_t avail;
+    size_t nget;
+
+    for (size_t received = 0; received < size;) {
+        // Wait for the first/next character.
+        while ((avail = LPUART_TransferGetRxRingBufferLength(self->lpuart, &self->handle)) <= 0) {
+            if (ticks_us64() > t) { // timed out
+                if (received <= 0) {
+                    *errcode = MP_EAGAIN;
+                    return MP_STREAM_ERROR;
+                } else {
+                    return received;
+                }
+            }
+            MICROPY_EVENT_POLL_HOOK
+        }
+        // Get as many bytes as possible to meet the need.
+        nget = avail < (size - received) ? avail : size - received;
+        xfer.data = dest + received;
+        xfer.dataSize = nget;
+        LPUART_TransferReceiveNonBlocking(self->lpuart, &self->handle, &xfer, NULL);
+        received += nget;
+        t = ticks_us64() + timeout_char_us;
+    }
+    return size;
+}
+
+STATIC mp_uint_t machine_uart_write(mp_obj_t self_in, const void *buf_in, mp_uint_t size, int *errcode) {
+    machine_uart_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    lpuart_transfer_t xfer;
+    uint64_t t;
+    size_t remaining = size;
+    size_t offset = 0;
+    uint8_t fifo_size = FSL_FEATURE_LPUART_FIFO_SIZEn(0);
+
+    // First check if a previous transfer is still ongoing,
+    // then wait at least the number of remaining character times.
+    t = ticks_us64() + (uint64_t)(self->handle.txDataSize + fifo_size) * (13000000 / self->config.baudRate_Bps + 1000);
+    while (self->tx_status != kStatus_LPUART_TxIdle) {
+        if (ticks_us64() > t) { // timed out, hard error
+            *errcode = MP_ETIMEDOUT;
+            return MP_STREAM_ERROR;
+        }
+        MICROPY_EVENT_POLL_HOOK
+    }
+
+    // Check if the first part has to be sent semi-blocking.
+    if (size > self->txbuf_len) {
+        // Send the first block.
+        xfer.data = (uint8_t *)buf_in;
+        offset = xfer.dataSize = size - self->txbuf_len;
+        self->tx_status = kStatus_LPUART_TxBusy;
+        LPUART_TransferSendNonBlocking(self->lpuart, &self->handle, &xfer);
+
+        // Wait at least the number of character times for this chunk.
+        t = ticks_us64() + (uint64_t)xfer.dataSize * (13000000 / self->config.baudRate_Bps + 1000);
+        while (self->handle.txDataSize) {
+            // Wait for the first/next character to be sent.
+            if (ticks_us64() > t) { // timed out
+                if (self->handle.txDataSize >= size) {
+                    *errcode = MP_ETIMEDOUT;
+                    return MP_STREAM_ERROR;
+                } else {
+                    return size - self->handle.txDataSize;
+                }
+            }
+            MICROPY_EVENT_POLL_HOOK
+        }
+        remaining = self->txbuf_len;
+    } else {
+        // The data fits into the tx buffer.
+        offset = 0;
+        remaining = size;
+    }
+
+    // Send the remaining data without waiting for completion.
+    memcpy(self->txbuf, (uint8_t *)buf_in + offset, remaining);
+    xfer.data = self->txbuf;
+    xfer.dataSize = remaining;
+    self->tx_status = kStatus_LPUART_TxBusy;
+    LPUART_TransferSendNonBlocking(self->lpuart, &self->handle, &xfer);
+
+    return size;
+}
+
+STATIC mp_uint_t machine_uart_ioctl(mp_obj_t self_in, mp_uint_t request, mp_uint_t arg, int *errcode) {
+    machine_uart_obj_t *self = self_in;
+    mp_uint_t ret;
+    if (request == MP_STREAM_POLL) {
+        uintptr_t flags = arg;
+        ret = 0;
+        if (flags & MP_STREAM_POLL_RD) {
+            uint32_t count;
+            count = LPUART_TransferGetRxRingBufferLength(self->lpuart, &self->handle);
+            if (count > 0) {
+                ret |= MP_STREAM_POLL_RD;
+            }
+        }
+        if ((flags & MP_STREAM_POLL_WR)) {
+            ret |= MP_STREAM_POLL_WR;
+        }
+    } else {
+        *errcode = MP_EINVAL;
+        ret = MP_STREAM_ERROR;
+    }
+    return ret;
+}
+
+STATIC const mp_stream_p_t uart_stream_p = {
+    .read = machine_uart_read,
+    .write = machine_uart_write,
+    .ioctl = machine_uart_ioctl,
+    .is_text = false,
+};
+
+const mp_obj_type_t machine_uart_type = {
+    { &mp_type_type },
+    .name = MP_QSTR_UART,
+    .print = machine_uart_print,
+    .make_new = machine_uart_make_new,
+    .getiter = mp_identity_getiter,
+    .iternext = mp_stream_unbuffered_iter,
+    .protocol = &uart_stream_p,
+    .locals_dict = (mp_obj_dict_t *)&machine_uart_locals_dict,
+};
diff --git a/ports/mimxrt/modmachine.c b/ports/mimxrt/modmachine.c
index dfee91992da2f..09aa250c5febe 100644
--- a/ports/mimxrt/modmachine.c
+++ b/ports/mimxrt/modmachine.c
@@ -65,6 +65,7 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_Signal),              MP_ROM_PTR(&machine_signal_type) },
     { MP_ROM_QSTR(MP_QSTR_SoftI2C),             MP_ROM_PTR(&mp_machine_soft_i2c_type) },
     { MP_ROM_QSTR(MP_QSTR_SoftSPI),             MP_ROM_PTR(&mp_machine_soft_spi_type) },
+    { MP_ROM_QSTR(MP_QSTR_UART),                MP_ROM_PTR(&machine_uart_type) },
 };
 STATIC MP_DEFINE_CONST_DICT(machine_module_globals, machine_module_globals_table);
 
diff --git a/ports/mimxrt/modmachine.h b/ports/mimxrt/modmachine.h
index a7b577fa79990..0b9e89cb23b25 100644
--- a/ports/mimxrt/modmachine.h
+++ b/ports/mimxrt/modmachine.h
@@ -32,6 +32,7 @@
 extern const mp_obj_type_t machine_adc_type;
 extern const mp_obj_type_t machine_timer_type;
 extern const mp_obj_type_t machine_rtc_type;
+extern const mp_obj_type_t machine_uart_type;
 
 void machine_adc_init(void);
 void machine_timer_init_PIT(void);

From 7417c6ac91e47798b9c9eba2e7cd8f3dc1bbcc57 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sat, 5 Jun 2021 14:06:04 +0200
Subject: [PATCH 0969/3533] mimxrt/machine_pin: Implement pin.irq()
 functionality.

---
 ports/mimxrt/Makefile                         |   2 +
 .../boards/MIMXRT1010_EVK/mpconfigboard.h     |   2 +
 .../boards/MIMXRT1020_EVK/mpconfigboard.h     |   2 +
 .../boards/MIMXRT1050_EVK/mpconfigboard.h     |   2 +
 .../boards/MIMXRT1060_EVK/mpconfigboard.h     |   2 +
 .../boards/MIMXRT1064_EVK/mpconfigboard.h     |   2 +
 ports/mimxrt/boards/TEENSY40/mpconfigboard.h  |   2 +
 ports/mimxrt/boards/TEENSY41/mpconfigboard.h  |   2 +
 ports/mimxrt/machine_pin.c                    | 193 +++++++++++++++++-
 ports/mimxrt/main.c                           |   2 +
 ports/mimxrt/modmachine.h                     |   1 +
 ports/mimxrt/mpconfigport.h                   |   3 +-
 ports/mimxrt/pin.h                            |   7 +
 13 files changed, 220 insertions(+), 2 deletions(-)
 mode change 100755 => 100644 ports/mimxrt/boards/TEENSY41/mpconfigboard.h

diff --git a/ports/mimxrt/Makefile b/ports/mimxrt/Makefile
index 3af2a554728be..638c6b124e934 100644
--- a/ports/mimxrt/Makefile
+++ b/ports/mimxrt/Makefile
@@ -151,6 +151,7 @@ SRC_C = \
 	lib/mp-readline/readline.c \
 	lib/libc/string0.c \
 	lib/utils/gchelper_native.c \
+	lib/utils/mpirq.c \
 	lib/utils/printf.c \
 	lib/utils/pyexec.c \
 	lib/utils/stdout_helpers.c \
@@ -271,6 +272,7 @@ SRC_QSTR += \
 	modmimxrt.c \
 	moduos.c \
 	pin.c \
+	lib/utils/mpirq.c \
 	lib/utils/sys_stdio_mphal.c \
 	extmod/modonewire.c \
 	$(GEN_PINS_SRC) \
diff --git a/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.h b/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.h
index 5a373a3ca6464..fdaeac7eed283 100644
--- a/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.h
+++ b/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.h
@@ -9,6 +9,8 @@
 #define MICROPY_HW_LED_OFF(pin) (mp_hal_pin_low(pin))
 #define BOARD_FLASH_CONFIG_HEADER_H "evkmimxrt1010_flexspi_nor_config.h"
 
+#define MICROPY_HW_NUM_PIN_IRQS (2 * 32)
+
 // Define mapping logical UART # to hardware UART #
 // LPUART1 on D0/D1 -> 1
 // LPUART3 on A0/D4 -> 3
diff --git a/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.h b/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.h
index 5a595074ad553..8238762a0b552 100644
--- a/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.h
+++ b/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.h
@@ -10,6 +10,8 @@
 #define MICROPY_HW_LED_OFF(pin) (mp_hal_pin_high(pin))
 #define BOARD_FLASH_CONFIG_HEADER_H "evkmimxrt1020_flexspi_nor_config.h"
 
+#define MICROPY_HW_NUM_PIN_IRQS (3 * 32)
+
 // Define mapping logical UART # to hardware UART #
 // D3/D5   LPUART1  Not usable, Since D3 is blocked.
 // D0/D1   LPUART2 -> 1
diff --git a/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.h b/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.h
index 51e0e2dc4715b..659c33263ebfd 100644
--- a/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.h
+++ b/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.h
@@ -9,6 +9,8 @@
 #define MICROPY_HW_LED_OFF(pin) (mp_hal_pin_high(pin))
 #define BOARD_FLASH_CONFIG_HEADER_H "evkmimxrt1050_flexspi_nor_config.h"
 
+#define MICROPY_HW_NUM_PIN_IRQS (4 * 32 + 3)
+
 // Define mapping logical UART # to hardware UART #
 // LPUART3 on D0/D1  -> 1
 // LPUART2 on D7/D6  -> 2
diff --git a/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.h b/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.h
index 02372a3c548ca..4fcc697e26c44 100644
--- a/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.h
+++ b/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.h
@@ -9,6 +9,8 @@
 #define MICROPY_HW_LED_OFF(pin) (mp_hal_pin_high(pin))
 #define BOARD_FLASH_CONFIG_HEADER_H "evkmimxrt1060_flexspi_nor_config.h"
 
+#define MICROPY_HW_NUM_PIN_IRQS (4 * 32 + 3)
+
 // Define mapping logical UART # to hardware UART #
 // LPUART3 on D0/D1  -> 1
 // LPUART2 on D7/D6  -> 2
diff --git a/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.h b/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.h
index e8492c92244f3..7549899512489 100644
--- a/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.h
+++ b/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.h
@@ -7,6 +7,8 @@
 #define MICROPY_HW_LED_OFF(pin) (mp_hal_pin_high(pin))
 #define BOARD_FLASH_CONFIG_HEADER_H "evkmimxrt1064_flexspi_nor_config.h"
 
+#define MICROPY_HW_NUM_PIN_IRQS (4 * 32 + 3)
+
 // Define mapping logical UART # to hardware UART #
 // LPUART3 on D0/D1  -> 1
 // LPUART2 on D7/D6  -> 2
diff --git a/ports/mimxrt/boards/TEENSY40/mpconfigboard.h b/ports/mimxrt/boards/TEENSY40/mpconfigboard.h
index 6bbac0a976dd5..316116b2b9db3 100644
--- a/ports/mimxrt/boards/TEENSY40/mpconfigboard.h
+++ b/ports/mimxrt/boards/TEENSY40/mpconfigboard.h
@@ -9,6 +9,8 @@
 #define MICROPY_HW_LED_OFF(pin) (mp_hal_pin_low(pin))
 #define BOARD_FLASH_CONFIG_HEADER_H "teensy40_flexspi_nor_config.h"
 
+#define MICROPY_HW_NUM_PIN_IRQS (4 * 32 + 3)
+
 // UART config: 7 UARTs at the pins for Teensy 4.0
 #define MICROPY_HW_UART_NUM     (sizeof(uart_index_table) / sizeof(uart_index_table)[0])
 #define MICROPY_HW_UART_INDEX   { 0, 6, 4, 2, 3, 8, 1, 7 }
diff --git a/ports/mimxrt/boards/TEENSY41/mpconfigboard.h b/ports/mimxrt/boards/TEENSY41/mpconfigboard.h
old mode 100755
new mode 100644
index 1e07cb29cabe8..4bbb41f309cc1
--- a/ports/mimxrt/boards/TEENSY41/mpconfigboard.h
+++ b/ports/mimxrt/boards/TEENSY41/mpconfigboard.h
@@ -9,6 +9,8 @@
 #define MICROPY_HW_LED_OFF(pin) (mp_hal_pin_low(pin))
 #define BOARD_FLASH_CONFIG_HEADER_H "teensy41_flexspi_nor_config.h"
 
+#define MICROPY_HW_NUM_PIN_IRQS (4 * 32 + 3)
+
 // UART config: 8 UARTs at the pins for Teensy 4.1
 #define MICROPY_HW_UART_NUM     (sizeof(uart_index_table) / sizeof(uart_index_table)[0])
 #define MICROPY_HW_UART_INDEX   { 0, 6, 4, 2, 3, 8, 1, 7, 5 }
diff --git a/ports/mimxrt/machine_pin.c b/ports/mimxrt/machine_pin.c
index ebe95059bfffc..dc26cdfc1236a 100644
--- a/ports/mimxrt/machine_pin.c
+++ b/ports/mimxrt/machine_pin.c
@@ -4,6 +4,7 @@
  * The MIT License (MIT)
  *
  * Copyright (c) 2020 Philipp Ebensberger
+ * Copyright (c) 2021 Robert Hammelrath
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -30,8 +31,8 @@
 
 #include "py/runtime.h"
 #include "py/mphal.h"
+#include "lib/utils/mpirq.h"
 #include "pin.h"
-#include "mphalport.h"
 
 // Local functions
 STATIC mp_obj_t machine_pin_obj_init_helper(const machine_pin_obj_t *self, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args);
@@ -68,6 +69,95 @@ const mp_obj_type_t machine_pin_board_pins_obj_type = {
     .locals_dict = (mp_obj_t)&machine_pin_board_pins_locals_dict,
 };
 
+STATIC const mp_irq_methods_t machine_pin_irq_methods;
+
+static GPIO_Type *gpiobases[] = GPIO_BASE_PTRS;
+STATIC const uint16_t GPIO_combined_low_irqs[] = GPIO_COMBINED_LOW_IRQS;
+STATIC const uint16_t GPIO_combined_high_irqs[] = GPIO_COMBINED_HIGH_IRQS;
+STATIC const uint16_t IRQ_mapping[] = {kGPIO_NoIntmode, kGPIO_IntRisingEdge, kGPIO_IntFallingEdge, kGPIO_IntRisingOrFallingEdge};
+#define GET_PIN_IRQ_INDEX(gpio_nr, pin) ((gpio_nr - 1) * 32 + pin)
+
+int GPIO_get_instance(GPIO_Type *gpio) {
+    int gpio_nr;
+    for (gpio_nr = 0; gpio_nr < ARRAY_SIZE(gpiobases); gpio_nr++) {
+        if (gpio == gpiobases[gpio_nr]) {
+            return gpio_nr;
+        }
+    }
+    return 0;
+}
+
+void call_handler(GPIO_Type *gpio, int gpio_nr, int pin) {
+    uint32_t mask = 1 << pin;
+    uint32_t isr = gpio->ISR & gpio->IMR;
+    for (int i = 0; i < 16; i++, pin++, mask <<= 1) {
+        // Did the ISR fire? Consider only the bits that are enabled.
+        if (isr & mask) {
+            gpio->ISR = mask; // clear the ISR flag
+            int index = GET_PIN_IRQ_INDEX(gpio_nr, pin);
+            machine_pin_irq_obj_t *irq = MP_STATE_PORT(machine_pin_irq_objects[index]);
+            if (irq != NULL) {
+                irq->flags = irq->trigger;
+                mp_irq_handler(&irq->base);
+            }
+        }
+    }
+}
+
+// 10 GPIO IRQ handlers, each covering 16 bits.
+
+void GPIO1_Combined_0_15_IRQHandler(void) {
+    call_handler(gpiobases[1], 1, 0);
+}
+
+void GPIO1_Combined_16_31_IRQHandler(void) {
+    call_handler(gpiobases[1], 1, 16);
+}
+
+void GPIO2_Combined_0_15_IRQHandler(void) {
+    call_handler(gpiobases[2], 2, 0);
+}
+
+void GPIO2_Combined_16_31_IRQHandler(void) {
+    call_handler(gpiobases[2], 2, 16);
+}
+
+void GPIO3_Combined_0_15_IRQHandler(void) {
+    call_handler(gpiobases[3], 3, 0);
+}
+
+void GPIO3_Combined_16_31_IRQHandler(void) {
+    call_handler(gpiobases[3], 3, 16);
+}
+
+void GPIO4_Combined_0_15_IRQHandler(void) {
+    call_handler(gpiobases[4], 4, 0);
+}
+
+void GPIO4_Combined_16_31_IRQHandler(void) {
+    call_handler(gpiobases[4], 4, 16);
+}
+
+void GPIO5_Combined_0_15_IRQHandler(void) {
+    call_handler(gpiobases[5], 5, 0);
+}
+
+void GPIO5_Combined_16_31_IRQHandler(void) {
+    call_handler(gpiobases[5], 5, 16);
+}
+
+// Deinit all pin IRQ handlers.
+void machine_pin_irq_deinit(void) {
+    for (int i = 0; i < ARRAY_SIZE(MP_STATE_PORT(machine_pin_irq_objects)); ++i) {
+        machine_pin_irq_obj_t *irq = MP_STATE_PORT(machine_pin_irq_objects[i]);
+        if (irq != NULL) {
+            machine_pin_obj_t *self = MP_OBJ_TO_PTR(irq->base.parent);
+            GPIO_PortDisableInterrupts(self->gpio, 1U << self->pin);
+            MP_STATE_PORT(machine_pin_irq_objects[i]) = NULL;
+        }
+    }
+}
+
 // Simplified mode setting used by the extmod modules
 void machine_pin_set_mode(const machine_pin_obj_t *self, uint8_t mode) {
     gpio_pin_config_t pin_config = {kGPIO_DigitalInput, 1, kGPIO_NoIntmode};
@@ -234,6 +324,69 @@ STATIC mp_obj_t machine_pin_init(size_t n_args, const mp_obj_t *args, mp_map_t *
 }
 MP_DEFINE_CONST_FUN_OBJ_KW(machine_pin_init_obj, 1, machine_pin_init);
 
+// pin.irq(handler=None, trigger=IRQ_FALLING|IRQ_RISING, hard=False)
+STATIC mp_obj_t machine_pin_irq(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    enum { ARG_handler, ARG_trigger, ARG_hard };
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_handler, MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
+        { MP_QSTR_trigger, MP_ARG_INT, {.u_int = 3} },
+        { MP_QSTR_hard, MP_ARG_BOOL, {.u_bool = false} },
+    };
+    machine_pin_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]);
+    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
+    mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
+
+    // Get the IRQ object.
+    uint32_t gpio_nr = GPIO_get_instance(self->gpio);
+    uint32_t index = GET_PIN_IRQ_INDEX(gpio_nr, self->pin);
+    if (index >= ARRAY_SIZE(MP_STATE_PORT(machine_pin_irq_objects))) {
+        mp_raise_ValueError(MP_ERROR_TEXT("IRQ not supported on given Pin"));
+    }
+    machine_pin_irq_obj_t *irq = MP_STATE_PORT(machine_pin_irq_objects[index]);
+
+    // Allocate the IRQ object if it doesn't already exist.
+    if (irq == NULL) {
+        irq = m_new_obj(machine_pin_irq_obj_t);
+        irq->base.base.type = &mp_irq_type;
+        irq->base.methods = (mp_irq_methods_t *)&machine_pin_irq_methods;
+        irq->base.parent = MP_OBJ_FROM_PTR(self);
+        irq->base.handler = mp_const_none;
+        irq->base.ishard = false;
+        MP_STATE_PORT(machine_pin_irq_objects[index]) = irq;
+    }
+
+    if (n_args > 1 || kw_args->used != 0) {
+        // Configure IRQ.
+        uint32_t irq_num = self->pin < 16 ? GPIO_combined_low_irqs[gpio_nr] : GPIO_combined_high_irqs[gpio_nr];
+
+        // Disable all IRQs from the affected source while data is updated.
+        DisableIRQ(irq_num);
+        GPIO_PortDisableInterrupts(self->gpio, 1U << self->pin);
+
+        // Update IRQ data.
+        irq->base.handler = args[ARG_handler].u_obj;
+        irq->base.ishard = args[ARG_hard].u_bool;
+        irq->flags = 0;
+        if (args[ARG_trigger].u_int >= ARRAY_SIZE(IRQ_mapping)) {
+            mp_raise_ValueError(MP_ERROR_TEXT("IRQ mode not supported"));
+        }
+        irq->trigger = IRQ_mapping[args[ARG_trigger].u_int];
+
+        // Enable IRQ if a handler is given.
+        if (args[ARG_handler].u_obj != mp_const_none) {
+            // Set the pin mode
+            GPIO_PinSetInterruptConfig(self->gpio, self->pin, irq->trigger);
+            // Enable the specific Pin interrupt
+            GPIO_PortEnableInterrupts(self->gpio, 1U << self->pin);
+        }
+        // Enable LEVEL1 interrupt again
+        EnableIRQ(irq_num);
+    }
+
+    return MP_OBJ_FROM_PTR(irq);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_KW(machine_pin_irq_obj, 1, machine_pin_irq);
+
 STATIC const mp_rom_map_elem_t machine_pin_locals_dict_table[] = {
     // instance methods
     { MP_ROM_QSTR(MP_QSTR_off),     MP_ROM_PTR(&machine_pin_off_obj) },
@@ -242,6 +395,7 @@ STATIC const mp_rom_map_elem_t machine_pin_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_high),    MP_ROM_PTR(&machine_pin_on_obj) },
     { MP_ROM_QSTR(MP_QSTR_value),   MP_ROM_PTR(&machine_pin_value_obj) },
     { MP_ROM_QSTR(MP_QSTR_init),    MP_ROM_PTR(&machine_pin_init_obj) },
+    { MP_ROM_QSTR(MP_QSTR_irq),     MP_ROM_PTR(&machine_pin_irq_obj) },
     // class attributes
     { MP_ROM_QSTR(MP_QSTR_board),   MP_ROM_PTR(&machine_pin_board_pins_obj_type) },
     { MP_ROM_QSTR(MP_QSTR_cpu),     MP_ROM_PTR(&machine_pin_cpu_pins_obj_type) },
@@ -265,6 +419,9 @@ STATIC const mp_rom_map_elem_t machine_pin_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_POWER_5),    MP_ROM_INT(PIN_DRIVE_POWER_5) }, // R0/6
     { MP_ROM_QSTR(MP_QSTR_POWER_6),    MP_ROM_INT(PIN_DRIVE_POWER_6) }, // R0/7
 
+    { MP_ROM_QSTR(MP_QSTR_IRQ_RISING), MP_ROM_INT(1) },
+    { MP_ROM_QSTR(MP_QSTR_IRQ_FALLING), MP_ROM_INT(2) },
+
 };
 STATIC MP_DEFINE_CONST_DICT(machine_pin_locals_dict, machine_pin_locals_dict_table);
 
@@ -285,3 +442,37 @@ const mp_obj_type_t machine_pin_af_type = {
     .make_new = mp_pin_make_new,
     .locals_dict = (mp_obj_dict_t *)&machine_pin_locals_dict,
 };
+
+STATIC mp_uint_t machine_pin_irq_trigger(mp_obj_t self_in, mp_uint_t new_trigger) {
+    machine_pin_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    uint32_t gpio_nr = GPIO_get_instance(self->gpio);
+    machine_pin_irq_obj_t *irq = MP_STATE_PORT(machine_pin_irq_objects[GET_PIN_IRQ_INDEX(gpio_nr, self->pin)]);
+    uint32_t irq_num = self->pin < 16 ? GPIO_combined_low_irqs[gpio_nr] : GPIO_combined_high_irqs[gpio_nr];
+    DisableIRQ(irq_num);
+    irq->flags = 0;
+    irq->trigger = new_trigger;
+    // Configure the interrupt.
+    GPIO_PinSetInterruptConfig(self->gpio, self->pin, irq->trigger);
+    // Enable LEVEL1 interrupt.
+    EnableIRQ(irq_num);
+    // Enable the specific pin interrupt.
+    GPIO_PortEnableInterrupts(self->gpio, 1U << self->pin);
+    return 0;
+}
+
+STATIC mp_uint_t machine_pin_irq_info(mp_obj_t self_in, mp_uint_t info_type) {
+    machine_pin_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    uint32_t gpio_nr = GPIO_get_instance(self->gpio);
+    machine_pin_irq_obj_t *irq = MP_STATE_PORT(machine_pin_irq_objects[GET_PIN_IRQ_INDEX(gpio_nr, self->pin)]);
+    if (info_type == MP_IRQ_INFO_FLAGS) {
+        return irq->flags;
+    } else if (info_type == MP_IRQ_INFO_TRIGGERS) {
+        return irq->trigger;
+    }
+    return 0;
+}
+
+STATIC const mp_irq_methods_t machine_pin_irq_methods = {
+    .trigger = machine_pin_irq_trigger,
+    .info = machine_pin_irq_info,
+};
diff --git a/ports/mimxrt/main.c b/ports/mimxrt/main.c
index 74c8a7014beaf..bd1c3e8884e93 100644
--- a/ports/mimxrt/main.c
+++ b/ports/mimxrt/main.c
@@ -36,6 +36,7 @@
 #include "ticks.h"
 #include "tusb.h"
 #include "led.h"
+#include "modmachine.h"
 
 extern uint8_t _sstack, _estack, _gc_heap_start, _gc_heap_end;
 
@@ -90,6 +91,7 @@ int main(void) {
 
     soft_reset_exit:
         mp_printf(MP_PYTHON_PRINTER, "MPY: soft reboot\n");
+        machine_pin_irq_deinit();
         gc_sweep_all();
         mp_deinit();
     }
diff --git a/ports/mimxrt/modmachine.h b/ports/mimxrt/modmachine.h
index 0b9e89cb23b25..5ac86557642bc 100644
--- a/ports/mimxrt/modmachine.h
+++ b/ports/mimxrt/modmachine.h
@@ -35,6 +35,7 @@ extern const mp_obj_type_t machine_rtc_type;
 extern const mp_obj_type_t machine_uart_type;
 
 void machine_adc_init(void);
+void machine_pin_irq_deinit(void);
 void machine_timer_init_PIT(void);
 
 #endif // MICROPY_INCLUDED_MIMXRT_MODMACHINE_H
diff --git a/ports/mimxrt/mpconfigport.h b/ports/mimxrt/mpconfigport.h
index 0af87264a52c4..49953bb57e2df 100644
--- a/ports/mimxrt/mpconfigport.h
+++ b/ports/mimxrt/mpconfigport.h
@@ -167,7 +167,8 @@ extern const struct _mp_obj_module_t mp_module_utime;
 
 #define MICROPY_PORT_ROOT_POINTERS \
     const char *readline_hist[8]; \
-    struct _machine_timer_obj_t *timer_table[MICROPY_HW_PIT_NUM_CHANNELS];
+    struct _machine_timer_obj_t *timer_table[MICROPY_HW_PIT_NUM_CHANNELS]; \
+    void *machine_pin_irq_objects[MICROPY_HW_NUM_PIN_IRQS]; \
 
 #define MP_STATE_PORT MP_STATE_VM
 
diff --git a/ports/mimxrt/pin.h b/ports/mimxrt/pin.h
index 7a05d2d64d57f..ace4d184361d6 100644
--- a/ports/mimxrt/pin.h
+++ b/ports/mimxrt/pin.h
@@ -29,6 +29,7 @@
 
 #include <stdint.h>
 #include "py/obj.h"
+#include "lib/utils/mpirq.h"
 #include "fsl_gpio.h"
 
 // ------------------------------------------------------------------------------------------------------------------ //
@@ -118,6 +119,12 @@ typedef struct {
     const machine_pin_adc_obj_t *adc_list; // pointer to list with ADC options
 } machine_pin_obj_t;
 
+typedef struct _machine_pin_irq_obj_t {
+    mp_irq_obj_t base;
+    uint32_t flags;
+    uint32_t trigger;
+} machine_pin_irq_obj_t;
+
 // ------------------------------------------------------------------------------------------------------------------ //
 
 extern const mp_obj_type_t machine_pin_type;

From 8edc3aacdda7b65ad6dd6ad4af0bb1a570ef9f47 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sun, 13 Jun 2021 16:42:19 +0200
Subject: [PATCH 0970/3533] mimxrt/modutime: Extend the time module.

Methods added:
- time.time()
- time.time_ns()
- time.gmtime()
- time.localtime()
- time.mktime()

The rp2 port was uses as the template for the change.
---
 ports/mimxrt/Makefile      |  1 +
 ports/mimxrt/machine_rtc.c |  2 +-
 ports/mimxrt/modutime.c    | 81 ++++++++++++++++++++++++++++++++++++++
 ports/mimxrt/mphalport.c   |  9 +++++
 ports/mimxrt/mphalport.h   |  4 --
 5 files changed, 92 insertions(+), 5 deletions(-)

diff --git a/ports/mimxrt/Makefile b/ports/mimxrt/Makefile
index 638c6b124e934..3b530a970078b 100644
--- a/ports/mimxrt/Makefile
+++ b/ports/mimxrt/Makefile
@@ -150,6 +150,7 @@ SRC_C = \
 	hal/flexspi_nor_flash.c \
 	lib/mp-readline/readline.c \
 	lib/libc/string0.c \
+	lib/timeutils/timeutils.c \
 	lib/utils/gchelper_native.c \
 	lib/utils/mpirq.c \
 	lib/utils/printf.c \
diff --git a/ports/mimxrt/machine_rtc.c b/ports/mimxrt/machine_rtc.c
index 4de3419c1cf72..76f414925eb5d 100644
--- a/ports/mimxrt/machine_rtc.c
+++ b/ports/mimxrt/machine_rtc.c
@@ -42,7 +42,7 @@ uint32_t us_offset = 0;
 // Calculate the weekday from the date.
 // The result is zero based with 0 = Monday.
 // by Michael Keith and Tom Craver, 1990.
-static int calc_weekday(int y, int m, int d) {
+int calc_weekday(int y, int m, int d) {
     return ((d += m < 3 ? y-- : y - 2, 23 * m / 9 + d + 4 + y / 4 - y / 100 + y / 400) + 6) % 7;
 }
 
diff --git a/ports/mimxrt/modutime.c b/ports/mimxrt/modutime.c
index bbdbda44e288f..a47bc073f2753 100644
--- a/ports/mimxrt/modutime.c
+++ b/ports/mimxrt/modutime.c
@@ -25,11 +25,92 @@
  * THE SOFTWARE.
  */
 
+#include "py/runtime.h"
+#include "lib/timeutils/timeutils.h"
 #include "extmod/utime_mphal.h"
+#include "fsl_snvs_lp.h"
+
+extern int calc_weekday(int y, int m, int d);
+
+// localtime([secs])
+// Convert a time expressed in seconds since the Epoch into an 8-tuple which
+// contains: (year, month, mday, hour, minute, second, weekday, yearday)
+// If secs is not provided or None, then the current time from the RTC is used.
+STATIC mp_obj_t time_localtime(size_t n_args, const mp_obj_t *args) {
+    if (n_args == 0 || args[0] == mp_const_none) {
+        // Get current date and time.
+        snvs_lp_srtc_datetime_t t;
+        SNVS_LP_SRTC_GetDatetime(SNVS, &t);
+        mp_obj_t tuple[8] = {
+            mp_obj_new_int(t.year),
+            mp_obj_new_int(t.month),
+            mp_obj_new_int(t.day),
+            mp_obj_new_int(t.hour),
+            mp_obj_new_int(t.minute),
+            mp_obj_new_int(t.second),
+            mp_obj_new_int(calc_weekday(t.year, t.month, t.day)),
+            mp_obj_new_int(timeutils_year_day(t.year, t.month, t.day)),
+        };
+        return mp_obj_new_tuple(8, tuple);
+    } else {
+        // Convert given seconds to tuple.
+        mp_int_t seconds = mp_obj_get_int(args[0]);
+        timeutils_struct_time_t tm;
+        timeutils_seconds_since_epoch_to_struct_time(seconds, &tm);
+        mp_obj_t tuple[8] = {
+            tuple[0] = mp_obj_new_int(tm.tm_year),
+            tuple[1] = mp_obj_new_int(tm.tm_mon),
+            tuple[2] = mp_obj_new_int(tm.tm_mday),
+            tuple[3] = mp_obj_new_int(tm.tm_hour),
+            tuple[4] = mp_obj_new_int(tm.tm_min),
+            tuple[5] = mp_obj_new_int(tm.tm_sec),
+            tuple[6] = mp_obj_new_int(tm.tm_wday),
+            tuple[7] = mp_obj_new_int(tm.tm_yday),
+        };
+        return mp_obj_new_tuple(8, tuple);
+    }
+}
+MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(time_localtime_obj, 0, 1, time_localtime);
+
+// mktime()
+// This is inverse function of localtime. It's argument is a full 8-tuple
+// which expresses a time as per localtime. It returns an integer which is
+// the number of seconds since the Epoch.
+STATIC mp_obj_t time_mktime(mp_obj_t tuple) {
+    size_t len;
+    mp_obj_t *elem;
+    mp_obj_get_array(tuple, &len, &elem);
+
+    // localtime generates a tuple of len 8. CPython uses 9, so we accept both.
+    if (len < 8 || len > 9) {
+        mp_raise_TypeError(MP_ERROR_TEXT("mktime needs a tuple of length 8 or 9"));
+    }
+
+    return mp_obj_new_int_from_uint(timeutils_mktime(mp_obj_get_int(elem[0]),
+        mp_obj_get_int(elem[1]), mp_obj_get_int(elem[2]), mp_obj_get_int(elem[3]),
+        mp_obj_get_int(elem[4]), mp_obj_get_int(elem[5])));
+}
+MP_DEFINE_CONST_FUN_OBJ_1(time_mktime_obj, time_mktime);
+
+// time()
+// Return the number of seconds since the Epoch.
+STATIC mp_obj_t time_time(void) {
+    snvs_lp_srtc_datetime_t t;
+    SNVS_LP_SRTC_GetDatetime(SNVS, &t);
+    return mp_obj_new_int_from_ull(timeutils_seconds_since_epoch(t.year, t.month, t.day, t.hour, t.minute, t.second));
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(time_time_obj, time_time);
 
 STATIC const mp_rom_map_elem_t time_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_utime) },
 
+    { MP_ROM_QSTR(MP_QSTR_gmtime), MP_ROM_PTR(&time_localtime_obj) },
+    { MP_ROM_QSTR(MP_QSTR_localtime), MP_ROM_PTR(&time_localtime_obj) },
+    { MP_ROM_QSTR(MP_QSTR_mktime), MP_ROM_PTR(&time_mktime_obj) },
+
+    { MP_ROM_QSTR(MP_QSTR_time), MP_ROM_PTR(&time_time_obj) },
+    { MP_ROM_QSTR(MP_QSTR_time_ns), MP_ROM_PTR(&mp_utime_time_ns_obj) },
+
     { MP_ROM_QSTR(MP_QSTR_sleep), MP_ROM_PTR(&mp_utime_sleep_obj) },
     { MP_ROM_QSTR(MP_QSTR_sleep_ms), MP_ROM_PTR(&mp_utime_sleep_ms_obj) },
     { MP_ROM_QSTR(MP_QSTR_sleep_us), MP_ROM_PTR(&mp_utime_sleep_us_obj) },
diff --git a/ports/mimxrt/mphalport.c b/ports/mimxrt/mphalport.c
index faecafbbcda34..942deae5b709f 100644
--- a/ports/mimxrt/mphalport.c
+++ b/ports/mimxrt/mphalport.c
@@ -28,8 +28,10 @@
 #include "py/runtime.h"
 #include "py/stream.h"
 #include "py/mphal.h"
+#include "lib/timeutils/timeutils.h"
 #include "ticks.h"
 #include "tusb.h"
+#include "fsl_snvs_lp.h"
 
 #include CPU_HEADER_H
 
@@ -94,3 +96,10 @@ void mp_hal_stdout_tx_strn(const char *str, mp_uint_t len) {
     //     USARTx->USART.DATA.bit.DATA = *str++;
     // }
 }
+
+uint64_t mp_hal_time_ns(void) {
+    snvs_lp_srtc_datetime_t t;
+    SNVS_LP_SRTC_GetDatetime(SNVS, &t);
+    uint64_t s = timeutils_seconds_since_epoch(t.year, t.month, t.day, t.hour, t.minute, t.second);
+    return s * 1000000000ULL;
+}
diff --git a/ports/mimxrt/mphalport.h b/ports/mimxrt/mphalport.h
index 0db11836f8f32..94f43001d0d67 100644
--- a/ports/mimxrt/mphalport.h
+++ b/ports/mimxrt/mphalport.h
@@ -76,9 +76,5 @@ static inline mp_uint_t mp_hal_ticks_cpu(void) {
     return 0;
 }
 
-static inline uint64_t mp_hal_time_ns(void) {
-    // TODO: Implement this function.
-    return 0UL;
-}
 
 #endif // MICROPY_INCLUDED_MIMXRT_MPHALPORT_H

From 514bf1a1911ac9173a00820b7e09dfb387e6b941 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 14 Jun 2021 22:32:51 +1000
Subject: [PATCH 0971/3533] extmod/uasyncio: Fix race with cancelled task
 waiting on finished task.

This commit fixes a problem with a race between cancellation of task A and
completion of task B, when A waits on B.  If task B completes just before
task A is cancelled then the cancellation of A does not work.  Instead,
the CancelledError meant to cancel A gets passed through to B (that's
expected behaviour) but B handles it as a "Task exception wasn't retrieved"
scenario, printing out such a message (this is because finished tasks point
their "coro" attribute to themselves to indicate they are done, and
implement the throw() method, but that method inadvertently catches the
CancelledError).  The correct behaviour is for B to bounce that
CancelledError back out.

This bug is mainly seen when wait_for() is used, and in that context the
symptoms are:
- occurs when using wait_for(T, S), if the task T being waited on finishes
  at exactly the same time as the wait-for timeout S expires
- task T will have run to completion
- the "Task exception wasn't retrieved message" is printed with
  "<class 'CancelledError'>" as the error (ie no traceback)
- the wait_for(T, S) call never returns (it's never put back on the
  uasyncio run queue) and all tasks waiting on this are blocked forever
  from running
- uasyncio otherwise continues to function and other tasks continue to be
  scheduled as normal

The fix here reworks the "waiting" attribute of Task to be called "state"
and uses it to indicate whether a task is: running and not awaited on,
running and awaited on, finished and not awaited on, or finished and
awaited on.  This means the task does not need to point "coro" to itself to
indicate finished, and also allows removal of the throw() method.

A benefit of this is that "Task exception wasn't retrieved" messages can go
back to being able to print the name of the coroutine function.

Fixes issue #7386.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/moduasyncio.c                          | 69 ++++++-------------
 extmod/uasyncio/core.py                       | 46 ++++++++-----
 extmod/uasyncio/task.py                       | 31 +++------
 .../uasyncio_cancel_wait_on_finished.py       | 41 +++++++++++
 .../uasyncio_cancel_wait_on_finished.py.exp   |  7 ++
 5 files changed, 111 insertions(+), 83 deletions(-)
 create mode 100644 tests/extmod/uasyncio_cancel_wait_on_finished.py
 create mode 100644 tests/extmod/uasyncio_cancel_wait_on_finished.py.exp

diff --git a/extmod/moduasyncio.c b/extmod/moduasyncio.c
index fe0f748cac986..9717e3856714d 100644
--- a/extmod/moduasyncio.c
+++ b/extmod/moduasyncio.c
@@ -31,12 +31,19 @@
 
 #if MICROPY_PY_UASYNCIO
 
+#define TASK_STATE_RUNNING_NOT_WAITED_ON (mp_const_true)
+#define TASK_STATE_DONE_NOT_WAITED_ON (mp_const_none)
+#define TASK_STATE_DONE_WAS_WAITED_ON (mp_const_false)
+
+#define TASK_IS_DONE(task) ( \
+    (task)->state == TASK_STATE_DONE_NOT_WAITED_ON \
+    || (task)->state == TASK_STATE_DONE_WAS_WAITED_ON)
+
 typedef struct _mp_obj_task_t {
     mp_pairheap_t pairheap;
     mp_obj_t coro;
     mp_obj_t data;
-    mp_obj_t waiting;
-
+    mp_obj_t state;
     mp_obj_t ph_key;
 } mp_obj_task_t;
 
@@ -146,9 +153,6 @@ STATIC const mp_obj_type_t task_queue_type = {
 /******************************************************************************/
 // Task class
 
-// For efficiency, the task object is stored to the coro entry when the task is done.
-#define TASK_IS_DONE(task) ((task)->coro == MP_OBJ_FROM_PTR(task))
-
 // This is the core uasyncio context with cur_task, _task_queue and CancelledError.
 STATIC mp_obj_t uasyncio_context = MP_OBJ_NULL;
 
@@ -159,7 +163,7 @@ STATIC mp_obj_t task_make_new(const mp_obj_type_t *type, size_t n_args, size_t n
     mp_pairheap_init_node(task_lt, &self->pairheap);
     self->coro = args[0];
     self->data = mp_const_none;
-    self->waiting = mp_const_none;
+    self->state = TASK_STATE_RUNNING_NOT_WAITED_ON;
     self->ph_key = MP_OBJ_NEW_SMALL_INT(0);
     if (n_args == 2) {
         uasyncio_context = args[1];
@@ -218,24 +222,6 @@ STATIC mp_obj_t task_cancel(mp_obj_t self_in) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(task_cancel_obj, task_cancel);
 
-STATIC mp_obj_t task_throw(mp_obj_t self_in, mp_obj_t value_in) {
-    // This task raised an exception which was uncaught; handle that now.
-    mp_obj_task_t *self = MP_OBJ_TO_PTR(self_in);
-    // Set the data because it was cleared by the main scheduling loop.
-    self->data = value_in;
-    if (self->waiting == mp_const_none) {
-        // Nothing await'ed on the task so call the exception handler.
-        mp_obj_t _exc_context = mp_obj_dict_get(uasyncio_context, MP_OBJ_NEW_QSTR(MP_QSTR__exc_context));
-        mp_obj_dict_store(_exc_context, MP_OBJ_NEW_QSTR(MP_QSTR_exception), value_in);
-        mp_obj_dict_store(_exc_context, MP_OBJ_NEW_QSTR(MP_QSTR_future), self_in);
-        mp_obj_t Loop = mp_obj_dict_get(uasyncio_context, MP_OBJ_NEW_QSTR(MP_QSTR_Loop));
-        mp_obj_t call_exception_handler = mp_load_attr(Loop, MP_QSTR_call_exception_handler);
-        mp_call_function_1(call_exception_handler, _exc_context);
-    }
-    return mp_const_none;
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(task_throw_obj, task_throw);
-
 STATIC void task_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
     mp_obj_task_t *self = MP_OBJ_TO_PTR(self_in);
     if (dest[0] == MP_OBJ_NULL) {
@@ -244,32 +230,24 @@ STATIC void task_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
             dest[0] = self->coro;
         } else if (attr == MP_QSTR_data) {
             dest[0] = self->data;
-        } else if (attr == MP_QSTR_waiting) {
-            if (self->waiting != mp_const_none && self->waiting != mp_const_false) {
-                dest[0] = self->waiting;
-            }
+        } else if (attr == MP_QSTR_state) {
+            dest[0] = self->state;
         } else if (attr == MP_QSTR_done) {
             dest[0] = MP_OBJ_FROM_PTR(&task_done_obj);
             dest[1] = self_in;
         } else if (attr == MP_QSTR_cancel) {
             dest[0] = MP_OBJ_FROM_PTR(&task_cancel_obj);
             dest[1] = self_in;
-        } else if (attr == MP_QSTR_throw) {
-            dest[0] = MP_OBJ_FROM_PTR(&task_throw_obj);
-            dest[1] = self_in;
         } else if (attr == MP_QSTR_ph_key) {
             dest[0] = self->ph_key;
         }
     } else if (dest[1] != MP_OBJ_NULL) {
         // Store
-        if (attr == MP_QSTR_coro) {
-            self->coro = dest[1];
-            dest[0] = MP_OBJ_NULL;
-        } else if (attr == MP_QSTR_data) {
+        if (attr == MP_QSTR_data) {
             self->data = dest[1];
             dest[0] = MP_OBJ_NULL;
-        } else if (attr == MP_QSTR_waiting) {
-            self->waiting = dest[1];
+        } else if (attr == MP_QSTR_state) {
+            self->state = dest[1];
             dest[0] = MP_OBJ_NULL;
         }
     }
@@ -278,15 +256,12 @@ STATIC void task_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
 STATIC mp_obj_t task_getiter(mp_obj_t self_in, mp_obj_iter_buf_t *iter_buf) {
     (void)iter_buf;
     mp_obj_task_t *self = MP_OBJ_TO_PTR(self_in);
-    if (self->waiting == mp_const_none) {
-        // The is the first access of the "waiting" entry.
-        if (TASK_IS_DONE(self)) {
-            // Signal that the completed-task has been await'ed on.
-            self->waiting = mp_const_false;
-        } else {
-            // Lazily allocate the waiting queue.
-            self->waiting = task_queue_make_new(&task_queue_type, 0, 0, NULL);
-        }
+    if (TASK_IS_DONE(self)) {
+        // Signal that the completed-task has been await'ed on.
+        self->state = TASK_STATE_DONE_WAS_WAITED_ON;
+    } else if (self->state == TASK_STATE_RUNNING_NOT_WAITED_ON) {
+        // Allocate the waiting queue.
+        self->state = task_queue_make_new(&task_queue_type, 0, 0, NULL);
     }
     return self_in;
 }
@@ -299,7 +274,7 @@ STATIC mp_obj_t task_iternext(mp_obj_t self_in) {
     } else {
         // Put calling task on waiting queue.
         mp_obj_t cur_task = mp_obj_dict_get(uasyncio_context, MP_OBJ_NEW_QSTR(MP_QSTR_cur_task));
-        mp_obj_t args[2] = { self->waiting, cur_task };
+        mp_obj_t args[2] = { self->state, cur_task };
         task_queue_push_sorted(2, args);
         // Set calling task's data to this task that it waits on, to double-link it.
         ((mp_obj_task_t *)MP_OBJ_TO_PTR(cur_task))->data = self_in;
diff --git a/extmod/uasyncio/core.py b/extmod/uasyncio/core.py
index d74763f6a696e..12833cf0cdf9c 100644
--- a/extmod/uasyncio/core.py
+++ b/extmod/uasyncio/core.py
@@ -175,6 +175,10 @@ def run_until_complete(main_task=None):
             if not exc:
                 t.coro.send(None)
             else:
+                # If the task is finished and on the run queue and gets here, then it
+                # had an exception and was not await'ed on.  Throwing into it now will
+                # raise StopIteration and the code below will catch this and run the
+                # call_exception_handler function.
                 t.data = None
                 t.coro.throw(exc)
         except excs_all as er:
@@ -185,22 +189,32 @@ def run_until_complete(main_task=None):
                 if isinstance(er, StopIteration):
                     return er.value
                 raise er
-            # Schedule any other tasks waiting on the completion of this task
-            waiting = False
-            if hasattr(t, "waiting"):
-                while t.waiting.peek():
-                    _task_queue.push_head(t.waiting.pop_head())
-                    waiting = True
-                t.waiting = None  # Free waiting queue head
-            if not waiting and not isinstance(er, excs_stop):
-                # An exception ended this detached task, so queue it for later
-                # execution to handle the uncaught exception if no other task retrieves
-                # the exception in the meantime (this is handled by Task.throw).
-                _task_queue.push_head(t)
-            # Indicate task is done by setting coro to the task object itself
-            t.coro = t
-            # Save return value of coro to pass up to caller
-            t.data = er
+            if t.state:
+                # Task was running but is now finished.
+                waiting = False
+                if t.state is True:
+                    # "None" indicates that the task is complete and not await'ed on (yet).
+                    t.state = None
+                else:
+                    # Schedule any other tasks waiting on the completion of this task.
+                    while t.state.peek():
+                        _task_queue.push_head(t.state.pop_head())
+                        waiting = True
+                    # "False" indicates that the task is complete and has been await'ed on.
+                    t.state = False
+                if not waiting and not isinstance(er, excs_stop):
+                    # An exception ended this detached task, so queue it for later
+                    # execution to handle the uncaught exception if no other task retrieves
+                    # the exception in the meantime (this is handled by Task.throw).
+                    _task_queue.push_head(t)
+                # Save return value of coro to pass up to caller.
+                t.data = er
+            elif t.state is None:
+                # Task is already finished and nothing await'ed on the task,
+                # so call the exception handler.
+                _exc_context["exception"] = exc
+                _exc_context["future"] = t
+                Loop.call_exception_handler(_exc_context)
 
 
 # Create a new task from a coroutine and run it until it finishes
diff --git a/extmod/uasyncio/task.py b/extmod/uasyncio/task.py
index 68ddf496f08a2..26df7b1725be8 100644
--- a/extmod/uasyncio/task.py
+++ b/extmod/uasyncio/task.py
@@ -123,6 +123,7 @@ class Task:
     def __init__(self, coro, globals=None):
         self.coro = coro  # Coroutine of this Task
         self.data = None  # General data for queue it is waiting on
+        self.state = True  # None, False, True or a TaskQueue instance
         self.ph_key = 0  # Pairing heap
         self.ph_child = None  # Paring heap
         self.ph_child_last = None  # Paring heap
@@ -130,30 +131,30 @@ def __init__(self, coro, globals=None):
         self.ph_rightmost_parent = None  # Paring heap
 
     def __iter__(self):
-        if self.coro is self:
-            # Signal that the completed-task has been await'ed on.
-            self.waiting = None
-        elif not hasattr(self, "waiting"):
-            # Lazily allocated head of linked list of Tasks waiting on completion of this task.
-            self.waiting = TaskQueue()
+        if not self.state:
+            # Task finished, signal that is has been await'ed on.
+            self.state = False
+        elif self.state is True:
+            # Allocated head of linked list of Tasks waiting on completion of this task.
+            self.state = TaskQueue()
         return self
 
     def __next__(self):
-        if self.coro is self:
+        if not self.state:
             # Task finished, raise return value to caller so it can continue.
             raise self.data
         else:
             # Put calling task on waiting queue.
-            self.waiting.push_head(core.cur_task)
+            self.state.push_head(core.cur_task)
             # Set calling task's data to this task that it waits on, to double-link it.
             core.cur_task.data = self
 
     def done(self):
-        return self.coro is self
+        return not self.state
 
     def cancel(self):
         # Check if task is already finished.
-        if self.coro is self:
+        if not self.state:
             return False
         # Can't cancel self (not supported yet).
         if self is core.cur_task:
@@ -172,13 +173,3 @@ def cancel(self):
             core._task_queue.push_head(self)
         self.data = core.CancelledError
         return True
-
-    def throw(self, value):
-        # This task raised an exception which was uncaught; handle that now.
-        # Set the data because it was cleared by the main scheduling loop.
-        self.data = value
-        if not hasattr(self, "waiting"):
-            # Nothing await'ed on the task so call the exception handler.
-            core._exc_context["exception"] = value
-            core._exc_context["future"] = self
-            core.Loop.call_exception_handler(core._exc_context)
diff --git a/tests/extmod/uasyncio_cancel_wait_on_finished.py b/tests/extmod/uasyncio_cancel_wait_on_finished.py
new file mode 100644
index 0000000000000..66b36dd60d42b
--- /dev/null
+++ b/tests/extmod/uasyncio_cancel_wait_on_finished.py
@@ -0,0 +1,41 @@
+# Test cancelling a task that is waiting on a task that just finishes.
+
+try:
+    import uasyncio as asyncio
+except ImportError:
+    try:
+        import asyncio
+    except ImportError:
+        print("SKIP")
+        raise SystemExit
+
+
+async def sleep_task():
+    print("sleep_task sleep")
+    await asyncio.sleep(0)
+    print("sleep_task wake")
+
+
+async def wait_task(t):
+    print("wait_task wait")
+    await t
+    print("wait_task wake")
+
+
+async def main():
+    waiting_task = asyncio.create_task(wait_task(asyncio.create_task(sleep_task())))
+
+    print("main sleep")
+    await asyncio.sleep(0)
+    print("main sleep")
+    await asyncio.sleep(0)
+
+    waiting_task.cancel()
+    print("main wait")
+    try:
+        await waiting_task
+    except asyncio.CancelledError as er:
+        print(repr(er))
+
+
+asyncio.run(main())
diff --git a/tests/extmod/uasyncio_cancel_wait_on_finished.py.exp b/tests/extmod/uasyncio_cancel_wait_on_finished.py.exp
new file mode 100644
index 0000000000000..60e871bfe56f0
--- /dev/null
+++ b/tests/extmod/uasyncio_cancel_wait_on_finished.py.exp
@@ -0,0 +1,7 @@
+main sleep
+sleep_task sleep
+wait_task wait
+main sleep
+sleep_task wake
+main wait
+CancelledError()

From 8107c9b75bb5b4936fe68edaa6f65fb3de8904bc Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 17 Jun 2021 12:22:18 +1000
Subject: [PATCH 0972/3533] extmod/nimble: Remove TODO comment about
 notify_custom freeing om.

The comments in NimBLE for ble_gattc_notify_custom() state that "This
function consumes the supplied mbuf regardless of the outcome.".  And
inspection of NimBLE code shows that this is the case.  So the comment can
be removed.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/nimble/modbluetooth_nimble.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/extmod/nimble/modbluetooth_nimble.c b/extmod/nimble/modbluetooth_nimble.c
index e3a2f872e5ecb..f4b9ccb60073c 100644
--- a/extmod/nimble/modbluetooth_nimble.c
+++ b/extmod/nimble/modbluetooth_nimble.c
@@ -1030,7 +1030,6 @@ int mp_bluetooth_gatts_notify_send(uint16_t conn_handle, uint16_t value_handle,
     if (om == NULL) {
         return MP_ENOMEM;
     }
-    // TODO: check that notify_custom takes ownership of om, if not os_mbuf_free_chain(om).
     return ble_hs_err_to_errno(ble_gattc_notify_custom(conn_handle, value_handle, om));
 }
 

From 48437cec4547a21af73102c1ccdf079f63fff534 Mon Sep 17 00:00:00 2001
From: Tobias Eydam <eydam-prototyping@outlook.com>
Date: Sun, 18 Apr 2021 21:38:36 +0200
Subject: [PATCH 0973/3533] esp32/network_lan: Add Ethernet support for IDF
 v4.1 and above.

Ethernet-PHYs from ESP-IDF (LAN8720, IP101, RTL8201, DP83848) are now
supported in IDF v4.1 and above.  PHY_KSZ8041 is only for ESP-IDF 4.3 and
above.  ESP32S2 is not supported.

Signed-off-by: Tobias Eydam <eydam-prototyping@outlook.com>
---
 ports/esp32/modnetwork.c  |  33 +++---
 ports/esp32/modnetwork.h  |   3 +-
 ports/esp32/network_lan.c | 235 ++++++++++++++++++++++++++------------
 3 files changed, 177 insertions(+), 94 deletions(-)

diff --git a/ports/esp32/modnetwork.c b/ports/esp32/modnetwork.c
index f772fa2cf6420..9a8d5b2e13437 100644
--- a/ports/esp32/modnetwork.c
+++ b/ports/esp32/modnetwork.c
@@ -666,13 +666,6 @@ STATIC mp_obj_t esp_config(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs
                 case WIFI_IF_STA:
                     ESP_EXCEPTIONS(esp_wifi_get_mac(self->if_id, mac));
                     return mp_obj_new_bytes(mac, sizeof(mac));
-
-                #if !MICROPY_ESP_IDF_4
-                case ESP_IF_ETH:
-                    esp_eth_get_mac(mac);
-                    return mp_obj_new_bytes(mac, sizeof(mac));
-                #endif
-
                 default:
                     goto unknown;
             }
@@ -753,12 +746,12 @@ STATIC mp_obj_t esp_phy_mode(size_t n_args, const mp_obj_t *args) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(esp_phy_mode_obj, 0, 1, esp_phy_mode);
 
-
 STATIC const mp_rom_map_elem_t mp_module_network_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_network) },
     { MP_ROM_QSTR(MP_QSTR___init__), MP_ROM_PTR(&esp_initialize_obj) },
     { MP_ROM_QSTR(MP_QSTR_WLAN), MP_ROM_PTR(&get_wlan_obj) },
-    #if !MICROPY_ESP_IDF_4
+
+    #if (ESP_IDF_VERSION_MAJOR == 4) && (ESP_IDF_VERSION_MINOR >= 1) && (CONFIG_IDF_TARGET_ESP32)
     { MP_ROM_QSTR(MP_QSTR_LAN), MP_ROM_PTR(&get_lan_obj) },
     #endif
     { MP_ROM_QSTR(MP_QSTR_PPP), MP_ROM_PTR(&ppp_make_new_obj) },
@@ -784,18 +777,22 @@ STATIC const mp_rom_map_elem_t mp_module_network_globals_table[] = {
     #endif
     { MP_ROM_QSTR(MP_QSTR_AUTH_MAX), MP_ROM_INT(WIFI_AUTH_MAX) },
 
+    #if (ESP_IDF_VERSION_MAJOR == 4) && (ESP_IDF_VERSION_MINOR >= 1) && (CONFIG_IDF_TARGET_ESP32)
     { MP_ROM_QSTR(MP_QSTR_PHY_LAN8720), MP_ROM_INT(PHY_LAN8720) },
-    { MP_ROM_QSTR(MP_QSTR_PHY_TLK110), MP_ROM_INT(PHY_TLK110) },
     { MP_ROM_QSTR(MP_QSTR_PHY_IP101), MP_ROM_INT(PHY_IP101) },
+    { MP_ROM_QSTR(MP_QSTR_PHY_RTL8201), MP_ROM_INT(PHY_RTL8201) },
+    { MP_ROM_QSTR(MP_QSTR_PHY_DP83848), MP_ROM_INT(PHY_DP83848) },
+    #if ESP_IDF_VERSION_MINOR >= 3
+    // PHY_KSZ8041 is new in ESP-IDF v4.3
+    { MP_ROM_QSTR(MP_QSTR_PHY_KSZ8041), MP_ROM_INT(PHY_KSZ8041) },
+    #endif
 
-    // ETH Clock modes from ESP-IDF
-    #if !MICROPY_ESP_IDF_4
-    { MP_ROM_QSTR(MP_QSTR_ETH_CLOCK_GPIO0_IN), MP_ROM_INT(ETH_CLOCK_GPIO0_IN) },
-    // Disabled at Aug 22nd 2018, reenabled Jan 28th 2019 in ESP-IDF
-    // Because we use older SDK, it's currently disabled
-    // { MP_ROM_QSTR(MP_QSTR_ETH_CLOCK_GPIO0_OUT), MP_ROM_INT(ETH_CLOCK_GPIO0_OUT) },
-    { MP_ROM_QSTR(MP_QSTR_ETH_CLOCK_GPIO16_OUT), MP_ROM_INT(ETH_CLOCK_GPIO16_OUT) },
-    { MP_ROM_QSTR(MP_QSTR_ETH_CLOCK_GPIO17_OUT), MP_ROM_INT(ETH_CLOCK_GPIO17_OUT) },
+    { MP_ROM_QSTR(MP_QSTR_ETH_INITIALIZED), MP_ROM_INT(ETH_INITIALIZED)},
+    { MP_ROM_QSTR(MP_QSTR_ETH_STARTED), MP_ROM_INT(ETH_STARTED)},
+    { MP_ROM_QSTR(MP_QSTR_ETH_STOPPED), MP_ROM_INT(ETH_STOPPED)},
+    { MP_ROM_QSTR(MP_QSTR_ETH_CONNECTED), MP_ROM_INT(ETH_CONNECTED)},
+    { MP_ROM_QSTR(MP_QSTR_ETH_DISCONNECTED), MP_ROM_INT(ETH_DISCONNECTED)},
+    { MP_ROM_QSTR(MP_QSTR_ETH_GOT_IP), MP_ROM_INT(ETH_GOT_IP)},
     #endif
 
     { MP_ROM_QSTR(MP_QSTR_STAT_IDLE), MP_ROM_INT(STAT_IDLE)},
diff --git a/ports/esp32/modnetwork.h b/ports/esp32/modnetwork.h
index db1b3d1300932..be6aa67068b5c 100644
--- a/ports/esp32/modnetwork.h
+++ b/ports/esp32/modnetwork.h
@@ -26,7 +26,8 @@
 #ifndef MICROPY_INCLUDED_ESP32_MODNETWORK_H
 #define MICROPY_INCLUDED_ESP32_MODNETWORK_H
 
-enum { PHY_LAN8720, PHY_TLK110, PHY_IP101 };
+enum { PHY_LAN8720, PHY_IP101, PHY_RTL8201, PHY_DP83848, PHY_KSZ8041 };
+enum { ETH_INITIALIZED, ETH_STARTED, ETH_STOPPED, ETH_CONNECTED, ETH_DISCONNECTED, ETH_GOT_IP };
 
 MP_DECLARE_CONST_FUN_OBJ_KW(get_lan_obj);
 MP_DECLARE_CONST_FUN_OBJ_1(ppp_make_new_obj);
diff --git a/ports/esp32/network_lan.c b/ports/esp32/network_lan.c
index 7a4ad49e01ceb..34e5cba258483 100644
--- a/ports/esp32/network_lan.c
+++ b/ports/esp32/network_lan.c
@@ -4,6 +4,7 @@
  * The MIT License (MIT)
  *
  * Copyright (c) 2017 "Eric Poulsen" <eric@zyxod.com>
+ * Copyright (c) 2021 "Tobias Eydam" <tobiaseydam@hotmail.com>
  *
  * Based on the ESP IDF example code which is Public Domain / CC0
  *
@@ -26,15 +27,19 @@
  * THE SOFTWARE.
  */
 
-#if !MICROPY_ESP_IDF_4
 #include "py/runtime.h"
 #include "py/mphal.h"
 
-#include "eth_phy/phy.h"
-#include "eth_phy/phy_tlk110.h"
-#include "eth_phy/phy_lan8720.h"
-#include "eth_phy/phy_ip101.h"
-#include "tcpip_adapter.h"
+#include "esp_idf_version.h"
+
+// LAN only for ESP32 (not ESP32S2) and only for ESP-IDF v4.1 and higher
+#if (ESP_IDF_VERSION_MAJOR == 4) && (ESP_IDF_VERSION_MINOR >= 1) && (CONFIG_IDF_TARGET_ESP32)
+
+#include "esp_eth.h"
+#include "esp_eth_mac.h"
+#include "esp_event.h"
+#include "esp_log.h"
+#include "esp_netif.h"
 
 #include "modnetwork.h"
 
@@ -48,47 +53,43 @@ typedef struct _lan_if_obj_t {
     int8_t phy_power_pin;
     uint8_t phy_addr;
     uint8_t phy_type;
-    eth_phy_check_link_func link_func;
-    eth_phy_power_enable_func power_func;
+    esp_eth_phy_t *phy;
+    esp_netif_t *eth_netif;
+    esp_eth_handle_t eth_handle;
 } lan_if_obj_t;
 
 const mp_obj_type_t lan_if_type;
 STATIC lan_if_obj_t lan_obj = {{&lan_if_type}, ESP_IF_ETH, false, false};
-
-STATIC void phy_power_enable(bool enable) {
-    lan_if_obj_t *self = &lan_obj;
-
-    if (self->phy_power_pin != -1) {
-
-        if (!enable) {
-            // Do the PHY-specific power_enable(false) function before powering down
-            self->power_func(false);
-        }
-
-        gpio_pad_select_gpio(self->phy_power_pin);
-        gpio_set_direction(self->phy_power_pin, GPIO_MODE_OUTPUT);
-        if (enable) {
-            gpio_set_level(self->phy_power_pin, 1);
-        } else {
-            gpio_set_level(self->phy_power_pin, 0);
-        }
-
-        // Allow the power up/down to take effect, min 300us
-        vTaskDelay(1);
-
-        if (enable) {
-            // Run the PHY-specific power on operations now the PHY has power
-            self->power_func(true);
-        }
+STATIC uint8_t eth_status = 0;
+
+static void eth_event_handler(void *arg, esp_event_base_t event_base,
+    int32_t event_id, void *event_data) {
+    switch (event_id) {
+        case ETHERNET_EVENT_CONNECTED:
+            eth_status = ETH_CONNECTED;
+            ESP_LOGI("ethernet", "Ethernet Link Up");
+            break;
+        case ETHERNET_EVENT_DISCONNECTED:
+            eth_status = ETH_DISCONNECTED;
+            ESP_LOGI("ethernet", "Ethernet Link Down");
+            break;
+        case ETHERNET_EVENT_START:
+            eth_status = ETH_STARTED;
+            ESP_LOGI("ethernet", "Ethernet Started");
+            break;
+        case ETHERNET_EVENT_STOP:
+            eth_status = ETH_STOPPED;
+            ESP_LOGI("ethernet", "Ethernet Stopped");
+            break;
+        case IP_EVENT_ETH_GOT_IP:
+            eth_status = ETH_GOT_IP;
+            ESP_LOGI("ethernet", "Ethernet Got IP");
+            break;
+        default:
+            break;
     }
 }
 
-STATIC void init_lan_rmii() {
-    lan_if_obj_t *self = &lan_obj;
-    phy_rmii_configure_data_interface_pins();
-    phy_rmii_smi_configure_pins(self->mdc_pin, self->mdio_pin);
-}
-
 STATIC mp_obj_t get_lan(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     lan_if_obj_t *self = &lan_obj;
 
@@ -96,7 +97,7 @@ STATIC mp_obj_t get_lan(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_ar
         return MP_OBJ_FROM_PTR(&lan_obj);
     }
 
-    enum { ARG_id, ARG_mdc, ARG_mdio, ARG_power, ARG_phy_addr, ARG_phy_type, ARG_clock_mode };
+    enum { ARG_id, ARG_mdc, ARG_mdio, ARG_power, ARG_phy_addr, ARG_phy_type };
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_id,           MP_ARG_OBJ, {.u_obj = mp_const_none} },
         { MP_QSTR_mdc,          MP_ARG_KW_ONLY | MP_ARG_REQUIRED | MP_ARG_OBJ },
@@ -104,7 +105,6 @@ STATIC mp_obj_t get_lan(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_ar
         { MP_QSTR_power,        MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = mp_const_none} },
         { MP_QSTR_phy_addr,     MP_ARG_KW_ONLY | MP_ARG_REQUIRED | MP_ARG_INT },
         { MP_QSTR_phy_type,     MP_ARG_KW_ONLY | MP_ARG_REQUIRED | MP_ARG_INT },
-        { MP_QSTR_clock_mode,   MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} },
     };
 
     mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
@@ -123,56 +123,91 @@ STATIC mp_obj_t get_lan(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_ar
     if (args[ARG_phy_addr].u_int < 0x00 || args[ARG_phy_addr].u_int > 0x1f) {
         mp_raise_ValueError(MP_ERROR_TEXT("invalid phy address"));
     }
+    self->phy_addr = args[ARG_phy_addr].u_int;
 
     if (args[ARG_phy_type].u_int != PHY_LAN8720 &&
-        args[ARG_phy_type].u_int != PHY_TLK110 &&
-        args[ARG_phy_type].u_int != PHY_IP101) {
+        args[ARG_phy_type].u_int != PHY_IP101 &&
+        args[ARG_phy_type].u_int != PHY_RTL8201 &&
+        #if ESP_IDF_VERSION_MINOR >= 3      // KSZ8041 is new in ESP-IDF v4.3
+        args[ARG_phy_type].u_int != PHY_KSZ8041 &&
+        #endif
+        args[ARG_phy_type].u_int != PHY_DP83848) {
         mp_raise_ValueError(MP_ERROR_TEXT("invalid phy type"));
     }
 
-    if (args[ARG_clock_mode].u_int != -1 &&
-        args[ARG_clock_mode].u_int != ETH_CLOCK_GPIO0_IN &&
-        // Disabled due ESP-IDF (see modnetwork.c note)
-        // args[ARG_clock_mode].u_int != ETH_CLOCK_GPIO0_OUT &&
-        args[ARG_clock_mode].u_int != ETH_CLOCK_GPIO16_OUT &&
-        args[ARG_clock_mode].u_int != ETH_CLOCK_GPIO17_OUT) {
-        mp_raise_ValueError(MP_ERROR_TEXT("invalid clock mode"));
-    }
+    eth_mac_config_t mac_config = ETH_MAC_DEFAULT_CONFIG();
+    mac_config.smi_mdc_gpio_num = self->mdc_pin;
+    mac_config.smi_mdio_gpio_num = self->mdio_pin;
+    esp_eth_mac_t *mac = esp_eth_mac_new_esp32(&mac_config);
 
-    eth_config_t config;
+    eth_phy_config_t phy_config = ETH_PHY_DEFAULT_CONFIG();
+    phy_config.phy_addr = self->phy_addr;
+    phy_config.reset_gpio_num = self->phy_power_pin;
+    self->phy = NULL;
 
     switch (args[ARG_phy_type].u_int) {
-        case PHY_TLK110:
-            config = phy_tlk110_default_ethernet_config;
-            break;
         case PHY_LAN8720:
-            config = phy_lan8720_default_ethernet_config;
+            self->phy = esp_eth_phy_new_lan8720(&phy_config);
             break;
         case PHY_IP101:
-            config = phy_ip101_default_ethernet_config;
+            self->phy = esp_eth_phy_new_ip101(&phy_config);
+            break;
+        case PHY_RTL8201:
+            self->phy = esp_eth_phy_new_rtl8201(&phy_config);
+            break;
+        case PHY_DP83848:
+            self->phy = esp_eth_phy_new_dp83848(&phy_config);
+            break;
+        case PHY_KSZ8041:
+            #if ESP_IDF_VERSION_MINOR >= 3      // KSZ8041 is new in ESP-IDF v4.3
+            self->phy = esp_eth_phy_new_ksz8041(&phy_config);
             break;
+            #endif
+        default:
+            mp_raise_ValueError(MP_ERROR_TEXT("unknown phy"));
     }
 
-    self->link_func = config.phy_check_link;
+    if (esp_netif_init() != ESP_OK) {
+        mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("esp_netif_init failed"));
+    }
+
+    esp_netif_config_t cfg = ESP_NETIF_DEFAULT_ETH();
+    self->eth_netif = esp_netif_new(&cfg);
 
-    // Replace default power func with our own
-    self->power_func = config.phy_power_enable;
-    config.phy_power_enable = phy_power_enable;
+    if (esp_eth_set_default_handlers(self->eth_netif) != ESP_OK) {
+        mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("esp_eth_set_default_handlers failed (invalid parameter)"));
+    }
 
-    config.phy_addr = args[ARG_phy_addr].u_int;
-    config.gpio_config = init_lan_rmii;
-    config.tcpip_input = tcpip_adapter_eth_input;
+    if (esp_event_handler_register(ETH_EVENT, ESP_EVENT_ANY_ID, &eth_event_handler, NULL) != ESP_OK) {
+        mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("esp_event_handler_register failed"));
+    }
 
-    if (args[ARG_clock_mode].u_int != -1) {
-        config.clock_mode = args[ARG_clock_mode].u_int;
+    if (esp_event_handler_register(IP_EVENT, ESP_EVENT_ANY_ID, &eth_event_handler, NULL) != ESP_OK) {
+        mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("esp_event_handler_register failed"));
     }
 
-    if (esp_eth_init(&config) == ESP_OK) {
+    esp_eth_config_t config = ETH_DEFAULT_CONFIG(mac, self->phy);
+
+    esp_err_t esp_err = esp_eth_driver_install(&config, &self->eth_handle);
+    if (esp_err == ESP_OK) {
         self->active = false;
         self->initialized = true;
     } else {
-        mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("esp_eth_init() failed"));
+        if (esp_err == ESP_ERR_INVALID_ARG) {
+            mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("esp_eth_driver_install failed with invalid argument"));
+        } else if (esp_err == ESP_ERR_NO_MEM) {
+            mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("esp_eth_driver_install failed with no memory for driver"));
+        } else {
+            mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("esp_eth_driver_install failed"));
+        }
     }
+
+    if (esp_netif_attach(self->eth_netif, esp_eth_new_netif_glue(self->eth_handle)) != ESP_OK) {
+        mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("esp_netif_attach failed"));
+    }
+
+    eth_status = ETH_INITIALIZED;
+
     return MP_OBJ_FROM_PTR(&lan_obj);
 }
 MP_DEFINE_CONST_FUN_OBJ_KW(get_lan_obj, 0, get_lan);
@@ -182,37 +217,87 @@ STATIC mp_obj_t lan_active(size_t n_args, const mp_obj_t *args) {
 
     if (n_args > 1) {
         if (mp_obj_is_true(args[1])) {
-            self->active = (esp_eth_enable() == ESP_OK);
+            self->active = (esp_eth_start(self->eth_handle) == ESP_OK);
             if (!self->active) {
                 mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("ethernet enable failed"));
             }
         } else {
-            self->active = !(esp_eth_disable() == ESP_OK);
+            self->active = !(esp_eth_stop(self->eth_handle) == ESP_OK);
             if (self->active) {
                 mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("ethernet disable failed"));
             }
         }
     }
+
     return mp_obj_new_bool(self->active);
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(lan_active_obj, 1, 2, lan_active);
 
 STATIC mp_obj_t lan_status(mp_obj_t self_in) {
-    return mp_const_none;
+    return MP_OBJ_NEW_SMALL_INT(eth_status);
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(lan_status_obj, lan_status);
 
 STATIC mp_obj_t lan_isconnected(mp_obj_t self_in) {
     lan_if_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    return self->active ? mp_obj_new_bool(self->link_func()) : mp_const_false;
+    return self->active ? mp_obj_new_bool(self->phy->get_link(self->phy) == ETH_LINK_UP) : mp_const_false;
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(lan_isconnected_obj, lan_isconnected);
 
+STATIC mp_obj_t lan_config(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs) {
+    if (n_args != 1 && kwargs->used != 0) {
+        mp_raise_TypeError(MP_ERROR_TEXT("either pos or kw args are allowed"));
+    }
+    lan_if_obj_t *self = MP_OBJ_TO_PTR(args[0]);
+    #define QS(x) (uintptr_t)MP_OBJ_NEW_QSTR(x)
+
+    if (kwargs->used != 0) {
+
+        for (size_t i = 0; i < kwargs->alloc; i++) {
+            if (mp_map_slot_is_filled(kwargs, i)) {
+                switch ((uintptr_t)kwargs->table[i].key) {
+                    case QS(MP_QSTR_mac): {
+                        mp_buffer_info_t bufinfo;
+                        mp_get_buffer_raise(kwargs->table[i].value, &bufinfo, MP_BUFFER_READ);
+                        if (bufinfo.len != 6) {
+                            mp_raise_ValueError(MP_ERROR_TEXT("invalid buffer length"));
+                        }
+                        esp_eth_ioctl(self->eth_handle, ETH_CMD_S_MAC_ADDR, bufinfo.buf);
+                        break;
+                    }
+                    default:
+                        break;
+                }
+            }
+        }
+        return mp_const_none;
+    }
+
+    if (n_args != 2) {
+        mp_raise_TypeError(MP_ERROR_TEXT("can query only one param"));
+    }
+
+    mp_obj_t val = mp_const_none;
+
+    switch ((uintptr_t)args[1]) {
+        case QS(MP_QSTR_mac): {
+            uint8_t mac[6];
+            esp_eth_ioctl(self->eth_handle, ETH_CMD_G_MAC_ADDR, mac);
+            return mp_obj_new_bytes(mac, sizeof(mac));
+        }
+        default:
+            mp_raise_ValueError(MP_ERROR_TEXT("unknown config param"));
+    }
+
+    return val;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_KW(lan_config_obj, 1, lan_config);
+
 STATIC const mp_rom_map_elem_t lan_if_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_active), MP_ROM_PTR(&lan_active_obj) },
     { MP_ROM_QSTR(MP_QSTR_isconnected), MP_ROM_PTR(&lan_isconnected_obj) },
     { MP_ROM_QSTR(MP_QSTR_status), MP_ROM_PTR(&lan_status_obj) },
-    { MP_ROM_QSTR(MP_QSTR_config), MP_ROM_PTR(&esp_config_obj) },
+    { MP_ROM_QSTR(MP_QSTR_config), MP_ROM_PTR(&lan_config_obj) },
     { MP_ROM_QSTR(MP_QSTR_ifconfig), MP_ROM_PTR(&esp_ifconfig_obj) },
 };
 
@@ -224,4 +309,4 @@ const mp_obj_type_t lan_if_type = {
     .locals_dict = (mp_obj_dict_t *)&lan_if_locals_dict,
 };
 
-#endif // !MICROPY_ESP_IDF_4
+#endif

From 060066804a4543e79c0bdc60a1221bb8628982e9 Mon Sep 17 00:00:00 2001
From: Thomas Wenrich <twenrich@gmail.com>
Date: Sun, 13 Jun 2021 16:22:49 +0200
Subject: [PATCH 0974/3533] esp32/modnetwork: Add "reconnects" option to WLAN
 STA interface.

This adds a wlan.config(reconnects=N) option to set the number of reconnect
attempts that will be made if the WLAN connection goes down.  The default
is N=-1 (infinite retries, current behavior).  Setting
wlan.config(reconnects=0) will disable the reconnect attempts.

A nice side effect of reconnects=0 is that wlan.status() will report the
disconnect reason now.  See related issue #5326.
---
 ports/esp32/modnetwork.c | 44 ++++++++++++++++++++++++++++++++--------
 1 file changed, 36 insertions(+), 8 deletions(-)

diff --git a/ports/esp32/modnetwork.c b/ports/esp32/modnetwork.c
index 9a8d5b2e13437..e2bd20a1a9d8f 100644
--- a/ports/esp32/modnetwork.c
+++ b/ports/esp32/modnetwork.c
@@ -142,12 +142,16 @@ static uint8_t wifi_sta_disconn_reason = 0;
 static bool mdns_initialised = false;
 #endif
 
+static uint8_t conf_wifi_sta_reconnects = 0;
+static uint8_t wifi_sta_reconnects;
+
 // This function is called by the system-event task and so runs in a different
 // thread to the main MicroPython task.  It must not raise any Python exceptions.
 static esp_err_t event_handler(void *ctx, system_event_t *event) {
     switch (event->event_id) {
         case SYSTEM_EVENT_STA_START:
             ESP_LOGI("wifi", "STA_START");
+            wifi_sta_reconnects = 0;
             break;
         case SYSTEM_EVENT_STA_CONNECTED:
             ESP_LOGI("network", "CONNECTED");
@@ -199,15 +203,23 @@ static esp_err_t event_handler(void *ctx, system_event_t *event) {
             wifi_sta_connected = false;
             if (wifi_sta_connect_requested) {
                 wifi_mode_t mode;
-                if (esp_wifi_get_mode(&mode) == ESP_OK) {
-                    if (mode & WIFI_MODE_STA) {
-                        // STA is active so attempt to reconnect.
-                        esp_err_t e = esp_wifi_connect();
-                        if (e != ESP_OK) {
-                            ESP_LOGI("wifi", "error attempting to reconnect: 0x%04x", e);
-                        }
+                if (esp_wifi_get_mode(&mode) != ESP_OK) {
+                    break;
+                }
+                if (!(mode & WIFI_MODE_STA)) {
+                    break;
+                }
+                if (conf_wifi_sta_reconnects) {
+                    ESP_LOGI("wifi", "reconnect counter=%d, max=%d",
+                        wifi_sta_reconnects, conf_wifi_sta_reconnects);
+                    if (++wifi_sta_reconnects >= conf_wifi_sta_reconnects) {
+                        break;
                     }
                 }
+                esp_err_t e = esp_wifi_connect();
+                if (e != ESP_OK) {
+                    ESP_LOGI("wifi", "error attempting to reconnect: 0x%04x", e);
+                }
             }
             break;
         }
@@ -361,6 +373,7 @@ STATIC mp_obj_t esp_connect(size_t n_args, const mp_obj_t *pos_args, mp_map_t *k
         ESP_EXCEPTIONS(esp_wifi_set_config(ESP_IF_WIFI_STA, &wifi_sta_config));
     }
 
+    wifi_sta_reconnects = 0;
     // connect to the WiFi AP
     MP_THREAD_GIL_EXIT();
     ESP_EXCEPTIONS(esp_wifi_connect());
@@ -395,7 +408,9 @@ STATIC mp_obj_t esp_status(size_t n_args, const mp_obj_t *args) {
             if (wifi_sta_connected) {
                 // Happy path, connected with IP
                 return MP_OBJ_NEW_SMALL_INT(STAT_GOT_IP);
-            } else if (wifi_sta_connect_requested) {
+            } else if (wifi_sta_connect_requested
+                       && (conf_wifi_sta_reconnects == 0
+                           || wifi_sta_reconnects < conf_wifi_sta_reconnects)) {
                 // No connection or error, but is requested = Still connecting
                 return MP_OBJ_NEW_SMALL_INT(STAT_CONNECTING);
             } else if (wifi_sta_disconn_reason == 0) {
@@ -633,6 +648,14 @@ STATIC mp_obj_t esp_config(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs
                         cfg.ap.max_connection = mp_obj_get_int(kwargs->table[i].value);
                         break;
                     }
+                    case QS(MP_QSTR_reconnects): {
+                        int reconnects = mp_obj_get_int(kwargs->table[i].value);
+                        req_if = WIFI_IF_STA;
+                        // parameter reconnects == -1 means to retry forever.
+                        // here means conf_wifi_sta_reconnects == 0 to retry forever.
+                        conf_wifi_sta_reconnects = (reconnects == -1) ? 0 : reconnects + 1;
+                        break;
+                    }
                     default:
                         goto unknown;
                 }
@@ -704,6 +727,11 @@ STATIC mp_obj_t esp_config(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs
             val = MP_OBJ_NEW_SMALL_INT(cfg.ap.max_connection);
             break;
         }
+        case QS(MP_QSTR_reconnects):
+            req_if = WIFI_IF_STA;
+            int rec = conf_wifi_sta_reconnects - 1;
+            val = MP_OBJ_NEW_SMALL_INT(rec);
+            break;
         default:
             goto unknown;
     }

From 364670ecf10b2f31e9a207bc440cfb731dcfa603 Mon Sep 17 00:00:00 2001
From: Thomas Wenrich <twenrich@gmail.com>
Date: Sun, 13 Jun 2021 16:23:53 +0200
Subject: [PATCH 0975/3533] docs/esp32: Document WLAN "reconnects" config
 option.

---
 docs/esp32/quickref.rst       | 8 ++++++++
 docs/library/network.WLAN.rst | 1 +
 2 files changed, 9 insertions(+)

diff --git a/docs/esp32/quickref.rst b/docs/esp32/quickref.rst
index 1709891265d8e..77c7027c400d3 100644
--- a/docs/esp32/quickref.rst
+++ b/docs/esp32/quickref.rst
@@ -102,6 +102,14 @@ Once the network is established the :mod:`socket <usocket>` module can be used
 to create and use TCP/UDP sockets as usual, and the ``urequests`` module for
 convenient HTTP requests.
 
+After a call to ``wlan.connect()``, the device will by default retry to connect
+**forever**, even when the authentication failed or no AP is in range.
+``wlan.status()`` will return ``network.STAT_CONNECTING`` in this state until a
+connection succeeds or the interface gets disabled.  This can be changed by
+calling ``wlan.config(reconnects=n)``, where n are the number of desired reconnect
+attempts (0 means it won't retry, -1 will restore the default behaviour of trying
+to reconnect forever).
+
 Delay and timing
 ----------------
 
diff --git a/docs/library/network.WLAN.rst b/docs/library/network.WLAN.rst
index fcdaa41b36345..88bd3a3707ddb 100644
--- a/docs/library/network.WLAN.rst
+++ b/docs/library/network.WLAN.rst
@@ -129,4 +129,5 @@ Methods
    authmode       Authentication mode supported (enumeration, see module constants)
    password       Access password (string)
    dhcp_hostname  The DHCP hostname to use
+   reconnects     Number of reconnect attempts to make (integer, 0=none, -1=unlimited)
    =============  ===========

From 89945b1989dfa412e263389ea837aa6ad64fc596 Mon Sep 17 00:00:00 2001
From: Jonathan Hogg <me@jonathanhogg.com>
Date: Wed, 16 Jun 2021 13:31:46 +0100
Subject: [PATCH 0976/3533] esp32/machine_hw_spi: Allow None for unused pins in
 initializer.

Make the hardware SPI initializer method match the `init()` method by
allowing `None` to be given for `sck`/`mosi`/`miso` to specify an unused
signal.
---
 ports/esp32/machine_hw_spi.c | 32 +++++++++++++++++++++++++++++---
 1 file changed, 29 insertions(+), 3 deletions(-)

diff --git a/ports/esp32/machine_hw_spi.c b/ports/esp32/machine_hw_spi.c
index a49a58035ae3e..98c0abaefdb97 100644
--- a/ports/esp32/machine_hw_spi.c
+++ b/ports/esp32/machine_hw_spi.c
@@ -411,6 +411,32 @@ mp_obj_t machine_hw_spi_make_new(const mp_obj_type_t *type, size_t n_args, size_
     }
     self->base.type = &machine_hw_spi_type;
 
+    int8_t sck, mosi, miso;
+
+    if (args[ARG_sck].u_obj == MP_OBJ_NULL) {
+        sck = default_pins->sck;
+    } else if (args[ARG_sck].u_obj == mp_const_none) {
+        sck = -1;
+    } else {
+        sck = machine_pin_get_id(args[ARG_sck].u_obj);
+    }
+
+    if (args[ARG_mosi].u_obj == MP_OBJ_NULL) {
+        mosi = default_pins->mosi;
+    } else if (args[ARG_mosi].u_obj == mp_const_none) {
+        mosi = -1;
+    } else {
+        mosi = machine_pin_get_id(args[ARG_mosi].u_obj);
+    }
+
+    if (args[ARG_miso].u_obj == MP_OBJ_NULL) {
+        miso = default_pins->miso;
+    } else if (args[ARG_miso].u_obj == mp_const_none) {
+        miso = -1;
+    } else {
+        miso = machine_pin_get_id(args[ARG_miso].u_obj);
+    }
+
     machine_hw_spi_init_internal(
         self,
         args[ARG_id].u_int,
@@ -419,9 +445,9 @@ mp_obj_t machine_hw_spi_make_new(const mp_obj_type_t *type, size_t n_args, size_
         args[ARG_phase].u_int,
         args[ARG_bits].u_int,
         args[ARG_firstbit].u_int,
-        args[ARG_sck].u_obj == MP_OBJ_NULL ? default_pins->sck : machine_pin_get_id(args[ARG_sck].u_obj),
-        args[ARG_mosi].u_obj == MP_OBJ_NULL ? default_pins->mosi : machine_pin_get_id(args[ARG_mosi].u_obj),
-        args[ARG_miso].u_obj == MP_OBJ_NULL ? default_pins->miso : machine_pin_get_id(args[ARG_miso].u_obj));
+        sck,
+        mosi,
+        miso);
 
     return MP_OBJ_FROM_PTR(self);
 }

From bc7822d8e95c40a9d5e403fd22c82b1bbad53b8b Mon Sep 17 00:00:00 2001
From: Mike Causer <mcauser@gmail.com>
Date: Thu, 17 Jun 2021 12:49:14 +1000
Subject: [PATCH 0977/3533] drivers/display/ssd1306.py: Add support for 72x40
 displays.

The 72x40 OLED requires selecting the internal IREF, as opposed to the
default external IREF.  This is an undocumented feature in the SSD1306
datasheet, but is present in the SSD1315 datasheet.  It's possible the
72x40 OLED is actually using the newer SSD1315 controller.  Sending the
IREF select command to SSD1306 displays has no effect on them, so it's
added to the init_display() instead of wrapping in an "if width = 72".

Also tested on a 128x64 OLED using the SSD1315 controller (smaller ribbon
cable) and the proposed change has no effect on the display, as the module
comes with the correct current limiting resistor.  Internal and external
IREF work the same.

Fixes issue #7281.
---
 drivers/display/ssd1306.py | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/drivers/display/ssd1306.py b/drivers/display/ssd1306.py
index 85e2bf0cb528e..a504cdadcc94e 100644
--- a/drivers/display/ssd1306.py
+++ b/drivers/display/ssd1306.py
@@ -15,6 +15,7 @@
 SET_DISP_START_LINE = const(0x40)
 SET_SEG_REMAP = const(0xA0)
 SET_MUX_RATIO = const(0xA8)
+SET_IREF_SELECT = const(0xAD)
 SET_COM_OUT_DIR = const(0xC0)
 SET_DISP_OFFSET = const(0xD3)
 SET_COM_PIN_CFG = const(0xDA)
@@ -63,6 +64,8 @@ def init_display(self):
             0xFF,  # maximum
             SET_ENTIRE_ON,  # output follows RAM contents
             SET_NORM_INV,  # not inverted
+            SET_IREF_SELECT,
+            0x30,  # enable internal IREF during display on
             # charge pump
             SET_CHARGE_PUMP,
             0x10 if self.external_vcc else 0x14,
@@ -92,10 +95,11 @@ def rotate(self, rotate):
     def show(self):
         x0 = 0
         x1 = self.width - 1
-        if self.width == 64:
-            # displays with width of 64 pixels are shifted by 32
-            x0 += 32
-            x1 += 32
+        if self.width != 128:
+            # narrow displays use centred columns
+            col_offset = (128 - self.width) // 2
+            x0 += col_offset
+            x1 += col_offset
         self.write_cmd(SET_COL_ADDR)
         self.write_cmd(x0)
         self.write_cmd(x1)

From 4eb13c50cd87eff8374b9bffc3d7c15b1bf5e35f Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 18 Jun 2021 00:14:21 +1000
Subject: [PATCH 0978/3533] esp32/machine_sdcard: Use deinit_p to deinit SD bus
 in SPI mode.

Fixes issue #7352.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/machine_sdcard.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/ports/esp32/machine_sdcard.c b/ports/esp32/machine_sdcard.c
index c9a9face7c242..3f70311f748d4 100644
--- a/ports/esp32/machine_sdcard.c
+++ b/ports/esp32/machine_sdcard.c
@@ -256,7 +256,14 @@ STATIC mp_obj_t sd_deinit(mp_obj_t self_in) {
     DEBUG_printf("De-init host\n");
 
     if (self->flags & SDCARD_CARD_FLAGS_HOST_INIT_DONE) {
-        self->host.deinit();
+        #if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(4, 2, 0)
+        if (self->host.flags & SDMMC_HOST_FLAG_DEINIT_ARG) {
+            self->host.deinit_p(self->host.slot);
+        } else
+        #endif
+        {
+            self->host.deinit();
+        }
         self->flags &= ~SDCARD_CARD_FLAGS_HOST_INIT_DONE;
     }
 

From eb7ae538f91b5041c92887290756c9526bf38df8 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 18 Jun 2021 14:13:18 +1000
Subject: [PATCH 0979/3533] esp8266/boards/GENERIC_512K: Add custom minimal
 _boot.py.

Commit 0abf6f830cd390e2e5dbd4a2c68f611f5c9507dc removed _boot.py from the
manifest for the GENERIC_512K board because the build does not include a
filesystem.  But the main code expects _boot.py to be there and prints an
error if it's not.  So add a custom _boot.py, which just sets the
gc.threshold().

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp8266/boards/GENERIC_512K/_boot.py    | 3 +++
 ports/esp8266/boards/GENERIC_512K/manifest.py | 1 +
 2 files changed, 4 insertions(+)
 create mode 100644 ports/esp8266/boards/GENERIC_512K/_boot.py

diff --git a/ports/esp8266/boards/GENERIC_512K/_boot.py b/ports/esp8266/boards/GENERIC_512K/_boot.py
new file mode 100644
index 0000000000000..1a55cfd36c55e
--- /dev/null
+++ b/ports/esp8266/boards/GENERIC_512K/_boot.py
@@ -0,0 +1,3 @@
+import gc
+
+gc.threshold((gc.mem_free() + gc.mem_alloc()) // 4)
diff --git a/ports/esp8266/boards/GENERIC_512K/manifest.py b/ports/esp8266/boards/GENERIC_512K/manifest.py
index e7ab8ad535b6a..5674f280b5480 100644
--- a/ports/esp8266/boards/GENERIC_512K/manifest.py
+++ b/ports/esp8266/boards/GENERIC_512K/manifest.py
@@ -1,3 +1,4 @@
+freeze("$(BOARD_DIR)", "_boot.py", opt=3)
 freeze("$(PORT_DIR)/modules", ("apa102.py", "neopixel.py", "ntptime.py", "port_diag.py"))
 freeze("$(MPY_DIR)/drivers/dht", "dht.py")
 freeze("$(MPY_DIR)/drivers/onewire")

From bc89cdeb45b66961b56e2354f2a0be9ef611ad7b Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 18 Jun 2021 14:15:37 +1000
Subject: [PATCH 0980/3533] py/gc: Only use no_sanitize_address attribute for
 GCC 4.8 and above.

It's not supported on older GCC versions.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/gc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/py/gc.c b/py/gc.c
index 56111bd3b62af..8284c435ba94c 100644
--- a/py/gc.c
+++ b/py/gc.c
@@ -345,7 +345,7 @@ void gc_collect_start(void) {
 // Address sanitizer needs to know that the access to ptrs[i] must always be
 // considered OK, even if it's a load from an address that would normally be
 // prohibited (due to being undefined, in a red zone, etc).
-#ifdef __GNUC__
+#if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 8))
 __attribute__((no_sanitize_address))
 #endif
 static void *gc_get_ptr(void **ptrs, int i) {

From adf35cbab096a4a207ad3eca5323b0e164e7171d Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 18 Jun 2021 14:16:07 +1000
Subject: [PATCH 0981/3533] tests/float: Make bytes/bytearray construct tests
 work with obj repr C.

2.5 can be represented correctly in object representation C, but 2.3 cannot
(it is slightly truncated).

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/float/bytearray_construct_endian.py | 2 +-
 tests/float/bytes_construct_endian.py     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/float/bytearray_construct_endian.py b/tests/float/bytearray_construct_endian.py
index 257d37d1bea0a..47f2b793c0616 100644
--- a/tests/float/bytearray_construct_endian.py
+++ b/tests/float/bytearray_construct_endian.py
@@ -9,4 +9,4 @@
         print("SKIP")
         raise SystemExit
 
-print(bytearray(array("f", [1, 2.3])))
+print(bytearray(array("f", [1, 2.5])))
diff --git a/tests/float/bytes_construct_endian.py b/tests/float/bytes_construct_endian.py
index 208f56162f859..4e15acc8bc710 100644
--- a/tests/float/bytes_construct_endian.py
+++ b/tests/float/bytes_construct_endian.py
@@ -9,4 +9,4 @@
         print("SKIP")
         raise SystemExit
 
-print(bytes(array("f", [1, 2.3])))
+print(bytes(array("f", [1, 2.5])))

From 7c51cb2307eaca1a1ccc071e0bb5eb4a5f734610 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 18 Jun 2021 16:38:06 +1000
Subject: [PATCH 0982/3533] all: Bump version to 1.16.

Signed-off-by: Damien George <damien@micropython.org>
---
 docs/conf.py  | 2 +-
 py/mpconfig.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/conf.py b/docs/conf.py
index 53cbf9baeddc0..fcaadfaf0abb6 100755
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -74,7 +74,7 @@
 #
 # We don't follow "The short X.Y version" vs "The full version, including alpha/beta/rc tags"
 # breakdown, so use the same version identifier for both to avoid confusion.
-version = release = '1.15'
+version = release = '1.16'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/py/mpconfig.h b/py/mpconfig.h
index 7337994a5e85d..d40637dfaf6b4 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -28,7 +28,7 @@
 
 // Current version of MicroPython
 #define MICROPY_VERSION_MAJOR 1
-#define MICROPY_VERSION_MINOR 15
+#define MICROPY_VERSION_MINOR 16
 #define MICROPY_VERSION_MICRO 0
 
 // Combined version as a 32-bit number for convenience

From ca920f72184c50f61002aa9d5cd01555b1e28b7b Mon Sep 17 00:00:00 2001
From: David Lechner <david@pybricks.com>
Date: Mon, 10 May 2021 21:53:22 -0500
Subject: [PATCH 0983/3533] py/mpstate: Make exceptions thread-local.

This moves mp_pending_exception from mp_state_vm_t to mp_state_thread_t.
This allows exceptions to be scheduled on a specific thread.

Signed-off-by: David Lechner <david@pybricks.com>
---
 ports/esp8266/modnetwork.c                         |  2 +-
 .../nrf/boards/microbit/modules/microbitdisplay.c  |  2 +-
 ports/nrf/modules/music/modmusic.c                 |  2 +-
 ports/pic16bit/board.c                             |  2 +-
 ports/stm32/pendsv.c                               |  4 ++--
 ports/unix/unix_mphal.c                            |  2 +-
 ports/windows/windows_mphal.c                      |  2 +-
 py/modthread.c                                     |  3 ++-
 py/mpstate.h                                       |  6 +++---
 py/profile.c                                       |  2 +-
 py/runtime.c                                       |  2 +-
 py/scheduler.c                                     | 14 +++++++-------
 py/vm.c                                            | 10 +++++-----
 13 files changed, 27 insertions(+), 26 deletions(-)

diff --git a/ports/esp8266/modnetwork.c b/ports/esp8266/modnetwork.c
index 3b8ef4b21fba7..8d153acf0fe33 100644
--- a/ports/esp8266/modnetwork.c
+++ b/ports/esp8266/modnetwork.c
@@ -237,7 +237,7 @@ STATIC mp_obj_t esp_scan(mp_obj_t self_in) {
     while (esp_scan_list != NULL) {
         // our esp_scan_cb is called via ets_loop_iter so it's safe to set the
         // esp_scan_list variable to NULL without disabling interrupts
-        if (MP_STATE_VM(mp_pending_exception) != NULL) {
+        if (MP_STATE_THREAD(mp_pending_exception) != NULL) {
             esp_scan_list = NULL;
             mp_handle_pending(true);
         }
diff --git a/ports/nrf/boards/microbit/modules/microbitdisplay.c b/ports/nrf/boards/microbit/modules/microbitdisplay.c
index c2eaf4179bcdf..a0508886d796c 100644
--- a/ports/nrf/boards/microbit/modules/microbitdisplay.c
+++ b/ports/nrf/boards/microbit/modules/microbitdisplay.c
@@ -149,7 +149,7 @@ STATIC void async_stop(void) {
 STATIC void wait_for_event(void) {
     while (!wakeup_event) {
         // allow CTRL-C to stop the animation
-        if (MP_STATE_VM(mp_pending_exception) != MP_OBJ_NULL) {
+        if (MP_STATE_THREAD(mp_pending_exception) != MP_OBJ_NULL) {
             async_stop();
             return;
         }
diff --git a/ports/nrf/modules/music/modmusic.c b/ports/nrf/modules/music/modmusic.c
index 168e7613f581b..e7e351f859ff1 100644
--- a/ports/nrf/modules/music/modmusic.c
+++ b/ports/nrf/modules/music/modmusic.c
@@ -140,7 +140,7 @@ STATIC void wait_async_music_idle(void) {
     // wait for the async music state to become idle
     while (music_data->async_state != ASYNC_MUSIC_STATE_IDLE) {
         // allow CTRL-C to stop the music
-        if (MP_STATE_VM(mp_pending_exception) != MP_OBJ_NULL) {
+        if (MP_STATE_THREAD(mp_pending_exception) != MP_OBJ_NULL) {
             music_data->async_state = ASYNC_MUSIC_STATE_IDLE;
             pwm_set_duty_cycle(music_data->async_pin->pin, 0); // TODO: remove pin setting.
             break;
diff --git a/ports/pic16bit/board.c b/ports/pic16bit/board.c
index 977dd2cfa810b..b0e9d17270c0d 100644
--- a/ports/pic16bit/board.c
+++ b/ports/pic16bit/board.c
@@ -140,7 +140,7 @@ int switch_get(int sw) {
 // TODO need an irq
 void uart_rx_irq(void) {
     if (c == interrupt_char) {
-        MP_STATE_VM(mp_pending_exception) = MP_STATE_PORT(keyboard_interrupt_obj);
+        MP_STATE_THREAD(mp_pending_exception) = MP_STATE_PORT(keyboard_interrupt_obj);
     }
 }
 */
diff --git a/ports/stm32/pendsv.c b/ports/stm32/pendsv.c
index 3181ba616a5a4..2887ac57232ba 100644
--- a/ports/stm32/pendsv.c
+++ b/ports/stm32/pendsv.c
@@ -60,10 +60,10 @@ void pendsv_init(void) {
 // the given exception object using nlr_jump in the context of the top-level
 // thread.
 void pendsv_kbd_intr(void) {
-    if (MP_STATE_VM(mp_pending_exception) == MP_OBJ_NULL) {
+    if (MP_STATE_THREAD(mp_pending_exception) == MP_OBJ_NULL) {
         mp_sched_keyboard_interrupt();
     } else {
-        MP_STATE_VM(mp_pending_exception) = MP_OBJ_NULL;
+        MP_STATE_THREAD(mp_pending_exception) = MP_OBJ_NULL;
         pendsv_object = &MP_STATE_VM(mp_kbd_exception);
         SCB->ICSR = SCB_ICSR_PENDSVSET_Msk;
     }
diff --git a/ports/unix/unix_mphal.c b/ports/unix/unix_mphal.c
index d62991d34d04a..111844abc4ba9 100644
--- a/ports/unix/unix_mphal.c
+++ b/ports/unix/unix_mphal.c
@@ -54,7 +54,7 @@ STATIC void sighandler(int signum) {
         sigprocmask(SIG_SETMASK, &mask, NULL);
         nlr_raise(MP_OBJ_FROM_PTR(&MP_STATE_VM(mp_kbd_exception)));
         #else
-        if (MP_STATE_VM(mp_pending_exception) == MP_OBJ_FROM_PTR(&MP_STATE_VM(mp_kbd_exception))) {
+        if (MP_STATE_THREAD(mp_pending_exception) == MP_OBJ_FROM_PTR(&MP_STATE_VM(mp_kbd_exception))) {
             // this is the second time we are called, so die straight away
             exit(1);
         }
diff --git a/ports/windows/windows_mphal.c b/ports/windows/windows_mphal.c
index dd196f67af36b..ba1d982ad9fb8 100644
--- a/ports/windows/windows_mphal.c
+++ b/ports/windows/windows_mphal.c
@@ -80,7 +80,7 @@ void mp_hal_stdio_mode_orig(void) {
 // the thread created for handling it might not be running yet so we'd miss the notification.
 BOOL WINAPI console_sighandler(DWORD evt) {
     if (evt == CTRL_C_EVENT) {
-        if (MP_STATE_VM(mp_pending_exception) == MP_OBJ_FROM_PTR(&MP_STATE_VM(mp_kbd_exception))) {
+        if (MP_STATE_THREAD(mp_pending_exception) == MP_OBJ_FROM_PTR(&MP_STATE_VM(mp_kbd_exception))) {
             // this is the second time we are called, so die straight away
             exit(1);
         }
diff --git a/py/modthread.c b/py/modthread.c
index 64fbb3f198e15..29b765493ac3d 100644
--- a/py/modthread.c
+++ b/py/modthread.c
@@ -174,6 +174,8 @@ STATIC void *thread_entry(void *args_in) {
     // The GC starts off unlocked on this thread.
     ts.gc_lock_depth = 0;
 
+    ts.mp_pending_exception = MP_OBJ_NULL;
+
     // set locals and globals from the calling context
     mp_locals_set(args->dict_locals);
     mp_globals_set(args->dict_globals);
@@ -184,7 +186,6 @@ STATIC void *thread_entry(void *args_in) {
     mp_thread_start();
 
     // TODO set more thread-specific state here:
-    //  mp_pending_exception? (root pointer)
     //  cur_exception (root pointer)
 
     DEBUG_printf("[thread] start ts=%p args=%p stack=%p\n", &ts, &args, MP_STATE_THREAD(stack_top));
diff --git a/py/mpstate.h b/py/mpstate.h
index a0e3d4f143096..f5fb5b707bf09 100644
--- a/py/mpstate.h
+++ b/py/mpstate.h
@@ -137,9 +137,6 @@ typedef struct _mp_state_vm_t {
     // dictionary with loaded modules (may be exposed as sys.modules)
     mp_obj_dict_t mp_loaded_modules_dict;
 
-    // pending exception object (MP_OBJ_NULL if not pending)
-    volatile mp_obj_t mp_pending_exception;
-
     #if MICROPY_ENABLE_SCHEDULER
     mp_sched_item_t sched_queue[MICROPY_SCHEDULER_DEPTH];
     #endif
@@ -266,6 +263,9 @@ typedef struct _mp_state_thread_t {
 
     nlr_buf_t *nlr_top;
 
+    // pending exception object (MP_OBJ_NULL if not pending)
+    volatile mp_obj_t mp_pending_exception;
+
     #if MICROPY_PY_SYS_SETTRACE
     mp_obj_t prof_trace_callback;
     bool prof_callback_is_executing;
diff --git a/py/profile.c b/py/profile.c
index e5fb35f0ede49..054a0f9e614ce 100644
--- a/py/profile.c
+++ b/py/profile.c
@@ -297,7 +297,7 @@ STATIC mp_obj_t mp_prof_callback_invoke(mp_obj_t callback, prof_callback_args_t
 
     mp_prof_is_executing = false;
 
-    if (MP_STATE_VM(mp_pending_exception) != MP_OBJ_NULL) {
+    if (MP_STATE_THREAD(mp_pending_exception) != MP_OBJ_NULL) {
         mp_handle_pending(true);
     }
     return top;
diff --git a/py/runtime.c b/py/runtime.c
index 1ca0702e19fb9..cda26a9cf85a2 100644
--- a/py/runtime.c
+++ b/py/runtime.c
@@ -62,7 +62,7 @@ void mp_init(void) {
     qstr_init();
 
     // no pending exceptions to start with
-    MP_STATE_VM(mp_pending_exception) = MP_OBJ_NULL;
+    MP_STATE_THREAD(mp_pending_exception) = MP_OBJ_NULL;
     #if MICROPY_ENABLE_SCHEDULER
     MP_STATE_VM(sched_state) = MP_SCHED_IDLE;
     MP_STATE_VM(sched_idx) = 0;
diff --git a/py/scheduler.c b/py/scheduler.c
index 0671a34a8cad9..0114a7a58b1a2 100644
--- a/py/scheduler.c
+++ b/py/scheduler.c
@@ -29,7 +29,7 @@
 #include "py/runtime.h"
 
 void MICROPY_WRAP_MP_SCHED_EXCEPTION(mp_sched_exception)(mp_obj_t exc) {
-    MP_STATE_VM(mp_pending_exception) = exc;
+    MP_STATE_THREAD(mp_pending_exception) = exc;
     #if MICROPY_ENABLE_SCHEDULER
     if (MP_STATE_VM(sched_state) == MP_SCHED_IDLE) {
         MP_STATE_VM(sched_state) = MP_SCHED_PENDING;
@@ -66,9 +66,9 @@ void mp_handle_pending(bool raise_exc) {
         mp_uint_t atomic_state = MICROPY_BEGIN_ATOMIC_SECTION();
         // Re-check state is still pending now that we're in the atomic section.
         if (MP_STATE_VM(sched_state) == MP_SCHED_PENDING) {
-            mp_obj_t obj = MP_STATE_VM(mp_pending_exception);
+            mp_obj_t obj = MP_STATE_THREAD(mp_pending_exception);
             if (obj != MP_OBJ_NULL) {
-                MP_STATE_VM(mp_pending_exception) = MP_OBJ_NULL;
+                MP_STATE_THREAD(mp_pending_exception) = MP_OBJ_NULL;
                 if (!mp_sched_num_pending()) {
                     MP_STATE_VM(sched_state) = MP_SCHED_IDLE;
                 }
@@ -115,7 +115,7 @@ void mp_sched_unlock(void) {
     assert(MP_STATE_VM(sched_state) < 0);
     if (++MP_STATE_VM(sched_state) == 0) {
         // vm became unlocked
-        if (MP_STATE_VM(mp_pending_exception) != MP_OBJ_NULL || mp_sched_num_pending()) {
+        if (MP_STATE_THREAD(mp_pending_exception) != MP_OBJ_NULL || mp_sched_num_pending()) {
             MP_STATE_VM(sched_state) = MP_SCHED_PENDING;
         } else {
             MP_STATE_VM(sched_state) = MP_SCHED_IDLE;
@@ -148,9 +148,9 @@ bool MICROPY_WRAP_MP_SCHED_SCHEDULE(mp_sched_schedule)(mp_obj_t function, mp_obj
 
 // A variant of this is inlined in the VM at the pending exception check
 void mp_handle_pending(bool raise_exc) {
-    if (MP_STATE_VM(mp_pending_exception) != MP_OBJ_NULL) {
-        mp_obj_t obj = MP_STATE_VM(mp_pending_exception);
-        MP_STATE_VM(mp_pending_exception) = MP_OBJ_NULL;
+    if (MP_STATE_THREAD(mp_pending_exception) != MP_OBJ_NULL) {
+        mp_obj_t obj = MP_STATE_THREAD(mp_pending_exception);
+        MP_STATE_THREAD(mp_pending_exception) = MP_OBJ_NULL;
         if (raise_exc) {
             nlr_raise(obj);
         }
diff --git a/py/vm.c b/py/vm.c
index c97070b78b6ba..f9a589c9d1da5 100644
--- a/py/vm.c
+++ b/py/vm.c
@@ -1375,9 +1375,9 @@ unwind_jump:;
                     // Re-check state is still pending now that we're in the atomic section.
                     if (MP_STATE_VM(sched_state) == MP_SCHED_PENDING) {
                         MARK_EXC_IP_SELECTIVE();
-                        mp_obj_t obj = MP_STATE_VM(mp_pending_exception);
+                        mp_obj_t obj = MP_STATE_THREAD(mp_pending_exception);
                         if (obj != MP_OBJ_NULL) {
-                            MP_STATE_VM(mp_pending_exception) = MP_OBJ_NULL;
+                            MP_STATE_THREAD(mp_pending_exception) = MP_OBJ_NULL;
                             if (!mp_sched_num_pending()) {
                                 MP_STATE_VM(sched_state) = MP_SCHED_IDLE;
                             }
@@ -1391,10 +1391,10 @@ unwind_jump:;
                 }
                 #else
                 // This is an inlined variant of mp_handle_pending
-                if (MP_STATE_VM(mp_pending_exception) != MP_OBJ_NULL) {
+                if (MP_STATE_THREAD(mp_pending_exception) != MP_OBJ_NULL) {
                     MARK_EXC_IP_SELECTIVE();
-                    mp_obj_t obj = MP_STATE_VM(mp_pending_exception);
-                    MP_STATE_VM(mp_pending_exception) = MP_OBJ_NULL;
+                    mp_obj_t obj = MP_STATE_THREAD(mp_pending_exception);
+                    MP_STATE_THREAD(mp_pending_exception) = MP_OBJ_NULL;
                     RAISE(obj);
                 }
                 #endif

From 259d9b69fe1f0e5c473bad85755d59233e0d182e Mon Sep 17 00:00:00 2001
From: David Lechner <david@pybricks.com>
Date: Mon, 10 May 2021 22:18:17 -0500
Subject: [PATCH 0984/3533] py/mpstate: Schedule KeyboardInterrupt on main
 thread.

This introduces a new macro to get the main thread and uses it to ensure
that asynchronous exceptions such as KeyboardInterrupt (CTRL+C) are only
scheduled on the main thread. This is more deterministic than being
scheduled on a random thread and is more in line with CPython that only
allow signal handlers to run on the main thread.

Fixes issue #7026.

Signed-off-by: David Lechner <david@pybricks.com>
---
 ports/pic16bit/board.c        | 2 +-
 ports/stm32/pendsv.c          | 4 ++--
 ports/unix/unix_mphal.c       | 2 +-
 ports/windows/windows_mphal.c | 2 +-
 py/mpstate.h                  | 3 ++-
 py/scheduler.c                | 4 +++-
 6 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/ports/pic16bit/board.c b/ports/pic16bit/board.c
index b0e9d17270c0d..8cc2e88f34488 100644
--- a/ports/pic16bit/board.c
+++ b/ports/pic16bit/board.c
@@ -140,7 +140,7 @@ int switch_get(int sw) {
 // TODO need an irq
 void uart_rx_irq(void) {
     if (c == interrupt_char) {
-        MP_STATE_THREAD(mp_pending_exception) = MP_STATE_PORT(keyboard_interrupt_obj);
+        MP_STATE_MAIN_THREAD(mp_pending_exception) = MP_STATE_PORT(keyboard_interrupt_obj);
     }
 }
 */
diff --git a/ports/stm32/pendsv.c b/ports/stm32/pendsv.c
index 2887ac57232ba..c5b2fcf92a732 100644
--- a/ports/stm32/pendsv.c
+++ b/ports/stm32/pendsv.c
@@ -60,10 +60,10 @@ void pendsv_init(void) {
 // the given exception object using nlr_jump in the context of the top-level
 // thread.
 void pendsv_kbd_intr(void) {
-    if (MP_STATE_THREAD(mp_pending_exception) == MP_OBJ_NULL) {
+    if (MP_STATE_MAIN_THREAD(mp_pending_exception) == MP_OBJ_NULL) {
         mp_sched_keyboard_interrupt();
     } else {
-        MP_STATE_THREAD(mp_pending_exception) = MP_OBJ_NULL;
+        MP_STATE_MAIN_THREAD(mp_pending_exception) = MP_OBJ_NULL;
         pendsv_object = &MP_STATE_VM(mp_kbd_exception);
         SCB->ICSR = SCB_ICSR_PENDSVSET_Msk;
     }
diff --git a/ports/unix/unix_mphal.c b/ports/unix/unix_mphal.c
index 111844abc4ba9..1d3c52bf16a99 100644
--- a/ports/unix/unix_mphal.c
+++ b/ports/unix/unix_mphal.c
@@ -54,7 +54,7 @@ STATIC void sighandler(int signum) {
         sigprocmask(SIG_SETMASK, &mask, NULL);
         nlr_raise(MP_OBJ_FROM_PTR(&MP_STATE_VM(mp_kbd_exception)));
         #else
-        if (MP_STATE_THREAD(mp_pending_exception) == MP_OBJ_FROM_PTR(&MP_STATE_VM(mp_kbd_exception))) {
+        if (MP_STATE_MAIN_THREAD(mp_pending_exception) == MP_OBJ_FROM_PTR(&MP_STATE_VM(mp_kbd_exception))) {
             // this is the second time we are called, so die straight away
             exit(1);
         }
diff --git a/ports/windows/windows_mphal.c b/ports/windows/windows_mphal.c
index ba1d982ad9fb8..7a3d881a34430 100644
--- a/ports/windows/windows_mphal.c
+++ b/ports/windows/windows_mphal.c
@@ -80,7 +80,7 @@ void mp_hal_stdio_mode_orig(void) {
 // the thread created for handling it might not be running yet so we'd miss the notification.
 BOOL WINAPI console_sighandler(DWORD evt) {
     if (evt == CTRL_C_EVENT) {
-        if (MP_STATE_THREAD(mp_pending_exception) == MP_OBJ_FROM_PTR(&MP_STATE_VM(mp_kbd_exception))) {
+        if (MP_STATE_MAIN_THREAD(mp_pending_exception) == MP_OBJ_FROM_PTR(&MP_STATE_VM(mp_kbd_exception))) {
             // this is the second time we are called, so die straight away
             exit(1);
         }
diff --git a/py/mpstate.h b/py/mpstate.h
index f5fb5b707bf09..e42d13fb20582 100644
--- a/py/mpstate.h
+++ b/py/mpstate.h
@@ -285,12 +285,13 @@ extern mp_state_ctx_t mp_state_ctx;
 
 #define MP_STATE_VM(x) (mp_state_ctx.vm.x)
 #define MP_STATE_MEM(x) (mp_state_ctx.mem.x)
+#define MP_STATE_MAIN_THREAD(x) (mp_state_ctx.thread.x)
 
 #if MICROPY_PY_THREAD
 extern mp_state_thread_t *mp_thread_get_state(void);
 #define MP_STATE_THREAD(x) (mp_thread_get_state()->x)
 #else
-#define MP_STATE_THREAD(x) (mp_state_ctx.thread.x)
+#define MP_STATE_THREAD(x)  MP_STATE_MAIN_THREAD(x)
 #endif
 
 #endif // MICROPY_INCLUDED_PY_MPSTATE_H
diff --git a/py/scheduler.c b/py/scheduler.c
index 0114a7a58b1a2..bd0bbf2078f6c 100644
--- a/py/scheduler.c
+++ b/py/scheduler.c
@@ -28,8 +28,10 @@
 
 #include "py/runtime.h"
 
+// Schedules an exception on the main thread (for exceptions "thrown" by async
+// sources such as interrupts and UNIX signal handlers).
 void MICROPY_WRAP_MP_SCHED_EXCEPTION(mp_sched_exception)(mp_obj_t exc) {
-    MP_STATE_THREAD(mp_pending_exception) = exc;
+    MP_STATE_MAIN_THREAD(mp_pending_exception) = exc;
     #if MICROPY_ENABLE_SCHEDULER
     if (MP_STATE_VM(sched_state) == MP_SCHED_IDLE) {
         MP_STATE_VM(sched_state) = MP_SCHED_PENDING;

From bbf9dd849a61c1f3e2d53d0a54fc61012f0dae1e Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sat, 19 Jun 2021 09:08:15 +1000
Subject: [PATCH 0985/3533] esp32/boards/sdkconfig.base: Disable
 MEMPROT_FEATURE to alloc from IRAM.

Dynamically generate/loaded native code (eg from @micropython.native or
native .mpy files) needs to be able allocate from IRAM, and the memory
protection feature must be disabled for that to work.  Disabling it is
needed to get native code working on ESP32-S2 and -C3.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/boards/sdkconfig.base | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ports/esp32/boards/sdkconfig.base b/ports/esp32/boards/sdkconfig.base
index 4d9e38077d908..5ca3f6a1a2b13 100644
--- a/ports/esp32/boards/sdkconfig.base
+++ b/ports/esp32/boards/sdkconfig.base
@@ -29,6 +29,10 @@ CONFIG_ESP32_XTAL_FREQ_AUTO=y
 # Power Management
 CONFIG_PM_ENABLE=y
 
+# Memory protection
+# This is required to allow allocating IRAM
+CONFIG_ESP_SYSTEM_MEMPROT_FEATURE=n
+
 # FreeRTOS
 CONFIG_FREERTOS_THREAD_LOCAL_STORAGE_POINTERS=2
 CONFIG_FREERTOS_SUPPORT_STATIC_ALLOCATION=y

From 2fa975c26465a1afed93b5723435e7cfe96e129f Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Tue, 21 May 2019 20:02:18 +1000
Subject: [PATCH 0986/3533] LICENSE: Reference third-party licenses.

This is to provide a summary of the licenses used by MicroPython.

- Add SPDX identifier for every directory that includes
  non-MIT-licensed content.
- Add brief summary.
- Update docs license to be more explicit.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 LICENSE      | 65 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 docs/conf.py |  2 +-
 2 files changed, 66 insertions(+), 1 deletion(-)

diff --git a/LICENSE b/LICENSE
index 3193eb8cec189..7f39931ba7caa 100644
--- a/LICENSE
+++ b/LICENSE
@@ -19,3 +19,68 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
+
+--------------------------------------------------------------------------------
+
+Unless specified otherwise (see below), the above license and copyright applies
+to all files in this repository.
+
+Individual files may include additional copyright holders.
+
+The various ports of MicroPython may include third-party software that is
+licensed under different terms. These licenses are summarised in the tree
+below, please refer to these files and directories for further license and
+copyright information. Note that (L)GPL-licensed code listed below is only
+used during the build process and is not part of the compiled source code.
+
+/ (MIT)
+    /drivers
+        /cc3000 (BSD-3-clause)
+        /cc3100 (BSD-3-clause)
+        /wiznet5k (BSD-3-clause)
+    /extmod
+        /crypto-algorithms (NONE)
+        /re15 (BSD-3-clause)
+        /uzlib (Zlib)
+    /lib
+        /asf4 (Apache-2.0)
+        /axtls (BSD-3-clause)
+            /config
+                /scripts
+                    /config (GPL-2.0-or-later)
+                /Rules.mak (GPL-2.0)
+        /berkeley-db-1xx (BSD-4-clause)
+        /btstack (See btstack/LICENSE)
+        /cmsis (BSD-3-clause)
+        /libhydrogen (ISC)
+        /littlefs (BSD-3-clause)
+        /lwip (BSD-3-clause)
+        /mynewt-nimble (Apache-2.0)
+        /nrfx (BSD-3-clause)
+        /nxp_driver (BSD-3-Clause)
+        /oofatfs (BSD-1-clause)
+        /pico-sdk (BSD-3-clause)
+        /stm32lib (BSD-3-clause)
+        /tinytest (BSD-3-clause)
+        /tinyusb (MIT)
+    /logo (uses OFL-1.1)
+    /ports
+        /cc3200
+            /hal (BSD-3-clause)
+            /simplelink (BSD-3-clause)
+            /FreeRTOS (GPL-2.0 with FreeRTOS exception)
+        /stm32
+            /usbd*.c (MCD-ST Liberty SW License Agreement V2)
+            /stm32_it.* (MIT + BSD-3-clause)
+            /system_stm32*.c (MIT + BSD-3-clause)
+            /boards
+                /startup_stm32*.s (BSD-3-clause)
+                /*/stm32*.h (BSD-3-clause)
+            /usbdev (MCD-ST Liberty SW License Agreement V2)
+            /usbhost (MCD-ST Liberty SW License Agreement V2)
+        /teensy
+            /core (PJRC.COM)
+        /zephyr
+            /src (Apache-2.0)
+    /tools
+        /dfu.py (LGPL-3.0-only)
diff --git a/docs/conf.py b/docs/conf.py
index fcaadfaf0abb6..239934bfa7f1e 100755
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -66,7 +66,7 @@
 
 # General information about the project.
 project = 'MicroPython'
-copyright = '2014-2021, Damien P. George, Paul Sokolovsky, and contributors'
+copyright = '- The MicroPython Documentation is Copyright © 2014-2021, Damien P. George, Paul Sokolovsky, and contributors'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the

From b3a34dde36485581a89de105ca7c0dd0d0fe49bb Mon Sep 17 00:00:00 2001
From: Michael Weiss <github@mishafarms.us>
Date: Fri, 26 Mar 2021 00:12:13 -0700
Subject: [PATCH 0987/3533] esp32,esp8266: Add __len__ to NeoPixel driver to
 support iterating.

Signed-off-by: mishafarms <github@mishafarms.us>
---
 ports/esp32/modules/neopixel.py   | 3 +++
 ports/esp8266/modules/neopixel.py | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/ports/esp32/modules/neopixel.py b/ports/esp32/modules/neopixel.py
index aa0de8112b5a4..f5c919398825e 100644
--- a/ports/esp32/modules/neopixel.py
+++ b/ports/esp32/modules/neopixel.py
@@ -15,6 +15,9 @@ def __init__(self, pin, n, bpp=3, timing=1):
         self.pin.init(pin.OUT)
         self.timing = timing
 
+    def __len__(self):
+        return self.n
+
     def __setitem__(self, index, val):
         offset = index * self.bpp
         for i in range(self.bpp):
diff --git a/ports/esp8266/modules/neopixel.py b/ports/esp8266/modules/neopixel.py
index 501a2689e79f4..9dc153372f877 100644
--- a/ports/esp8266/modules/neopixel.py
+++ b/ports/esp8266/modules/neopixel.py
@@ -15,6 +15,9 @@ def __init__(self, pin, n, bpp=3, timing=1):
         self.pin.init(pin.OUT)
         self.timing = timing
 
+    def __len__(self):
+        return self.n
+
     def __setitem__(self, index, val):
         offset = index * self.bpp
         for i in range(self.bpp):

From 60f1f769840db954825631206dc1b4f54ffe1468 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 19 May 2021 16:54:43 +1000
Subject: [PATCH 0988/3533] stm32/softtimer: Add soft_timer_reinsert() helper
 function.

And call mp_pairheap_init_node() in soft_timer_static_init() so that
reinsert can be called after static_init.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/softtimer.c | 1 +
 ports/stm32/softtimer.h | 7 +++++++
 2 files changed, 8 insertions(+)

diff --git a/ports/stm32/softtimer.c b/ports/stm32/softtimer.c
index 7f19eccd2d36d..c9c59cab0eed0 100644
--- a/ports/stm32/softtimer.c
+++ b/ports/stm32/softtimer.c
@@ -122,6 +122,7 @@ void soft_timer_gc_mark_all(void) {
 }
 
 void soft_timer_static_init(soft_timer_entry_t *entry, uint16_t mode, uint32_t delta_ms, void (*cb)(soft_timer_entry_t *)) {
+    mp_pairheap_init_node(soft_timer_lt, &entry->pairheap);
     entry->flags = 0;
     entry->mode = mode;
     entry->delta_ms = delta_ms;
diff --git a/ports/stm32/softtimer.h b/ports/stm32/softtimer.h
index 25d828a9fd453..9c14f16d615cd 100644
--- a/ports/stm32/softtimer.h
+++ b/ports/stm32/softtimer.h
@@ -56,4 +56,11 @@ void soft_timer_static_init(soft_timer_entry_t *entry, uint16_t mode, uint32_t d
 void soft_timer_insert(soft_timer_entry_t *entry, uint32_t initial_delta_ms);
 void soft_timer_remove(soft_timer_entry_t *entry);
 
+// The timer will be reinserted into the heap so that it is called after initial_delta_ms milliseconds.
+// After that, if it's periodic, it will continue to be called every entry->delta_ms milliseconds.
+static inline void soft_timer_reinsert(soft_timer_entry_t *entry, uint32_t initial_delta_ms) {
+    soft_timer_remove(entry);
+    soft_timer_insert(entry, initial_delta_ms);
+}
+
 #endif // MICROPY_INCLUDED_STM32_SOFTTIMER_H

From 74c2c31811271c76cd55aa53296003ca8f6a1e16 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 12 May 2021 17:18:22 +1000
Subject: [PATCH 0989/3533] stm32/mpbthciport: Change from systick to
 soft-timer for BT scheduling.

Instead of using systick the BT subsystem is now scheduled using a soft
timer.  This means it is scheduled only when it is enabled.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/main.c          |  4 +-
 ports/stm32/mpbthciport.c   | 85 +++++++++++++++++++++++--------------
 ports/stm32/mpbthciport.h   | 42 ++++++++++++++++++
 ports/stm32/mpbtstackport.c |  5 +++
 ports/stm32/mpnimbleport.c  |  7 +++
 ports/stm32/rfcore.c        |  4 +-
 ports/stm32/systick.h       |  3 --
 7 files changed, 111 insertions(+), 39 deletions(-)
 create mode 100644 ports/stm32/mpbthciport.h

diff --git a/ports/stm32/main.c b/ports/stm32/main.c
index ca80daaceb5a8..c8de2fd868b9f 100644
--- a/ports/stm32/main.c
+++ b/ports/stm32/main.c
@@ -54,6 +54,7 @@
 #endif
 
 #include "boardctrl.h"
+#include "mpbthciport.h"
 #include "mpu.h"
 #include "rfcore.h"
 #include "systick.h"
@@ -440,8 +441,7 @@ void stm32_main(uint32_t reset_mode) {
     systick_enable_dispatch(SYSTICK_DISPATCH_LWIP, mod_network_lwip_poll_wrapper);
     #endif
     #if MICROPY_PY_BLUETOOTH
-    extern void mp_bluetooth_hci_systick(uint32_t ticks_ms);
-    systick_enable_dispatch(SYSTICK_DISPATCH_BLUETOOTH_HCI, mp_bluetooth_hci_systick);
+    mp_bluetooth_hci_init();
     #endif
 
     #if MICROPY_PY_NETWORK_CYW43
diff --git a/ports/stm32/mpbthciport.c b/ports/stm32/mpbthciport.c
index c3cd864e2b7ad..accb913e1f712 100644
--- a/ports/stm32/mpbthciport.c
+++ b/ports/stm32/mpbthciport.c
@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2018-2020 Damien P. George
+ * Copyright (c) 2018-2021 Damien P. George
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -28,7 +28,8 @@
 #include "py/mphal.h"
 #include "extmod/mpbthci.h"
 #include "extmod/modbluetooth.h"
-#include "systick.h"
+#include "mpbthciport.h"
+#include "softtimer.h"
 #include "pendsv.h"
 #include "lib/utils/mpirq.h"
 
@@ -38,22 +39,48 @@
 
 uint8_t mp_bluetooth_hci_cmd_buf[4 + 256];
 
-// Must be provided by the stack bindings (e.g. mpnimbleport.c or mpbtstackport.c).
-// Request new data from the uart and pass to the stack, and run pending events/callouts.
-extern void mp_bluetooth_hci_poll(void);
+// Soft timer for scheduling a HCI poll.
+STATIC soft_timer_entry_t mp_bluetooth_hci_soft_timer;
 
-// Hook for pendsv poller to run this periodically every 128ms
-#define BLUETOOTH_HCI_TICK(tick) (((tick) & ~(SYSTICK_DISPATCH_NUM_SLOTS - 1) & 0x7f) == 0)
+#if MICROPY_PY_BLUETOOTH_USE_SYNC_EVENTS
+// Prevent double-enqueuing of the scheduled task.
+STATIC volatile bool events_task_is_scheduled;
+#endif
+
+// This is called by soft_timer and executes at IRQ_PRI_PENDSV.
+STATIC void mp_bluetooth_hci_soft_timer_callback(soft_timer_entry_t *self) {
+    mp_bluetooth_hci_poll_now();
+}
+
+void mp_bluetooth_hci_init(void) {
+    #if MICROPY_PY_BLUETOOTH_USE_SYNC_EVENTS
+    events_task_is_scheduled = false;
+    #endif
+    soft_timer_static_init(
+        &mp_bluetooth_hci_soft_timer,
+        SOFT_TIMER_MODE_ONE_SHOT,
+        0,
+        mp_bluetooth_hci_soft_timer_callback
+        );
+}
+
+STATIC void mp_bluetooth_hci_start_polling(void) {
+    #if MICROPY_PY_BLUETOOTH_USE_SYNC_EVENTS
+    events_task_is_scheduled = false;
+    #endif
+    mp_bluetooth_hci_poll_now();
+}
+
+void mp_bluetooth_hci_poll_in_ms(uint32_t ms) {
+    soft_timer_reinsert(&mp_bluetooth_hci_soft_timer, ms);
+}
 
 #if MICROPY_PY_BLUETOOTH_USE_SYNC_EVENTS
 
 // For synchronous mode, we run all BLE stack code inside a scheduled task.
-// This task is scheduled periodically (every 128ms) via SysTick, or
+// This task is scheduled periodically via a soft timer, or
 // immediately on HCI UART RXIDLE.
 
-// Prevent double-enqueuing of the scheduled task.
-STATIC volatile bool events_task_is_scheduled = false;
-
 STATIC mp_obj_t run_events_scheduled_task(mp_obj_t none_in) {
     (void)none_in;
     events_task_is_scheduled = false;
@@ -65,23 +92,20 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(run_events_scheduled_task_obj, run_events_sched
 
 // Called periodically (systick) or directly (e.g. UART RX IRQ) in order to
 // request that processing happens ASAP in the scheduler.
-void mp_bluetooth_hci_systick(uint32_t ticks_ms) {
-    if (events_task_is_scheduled) {
-        return;
-    }
-
-    if (ticks_ms == 0 || BLUETOOTH_HCI_TICK(ticks_ms)) {
+void mp_bluetooth_hci_poll_now(void) {
+    if (!events_task_is_scheduled) {
         events_task_is_scheduled = mp_sched_schedule(MP_OBJ_FROM_PTR(&run_events_scheduled_task_obj), mp_const_none);
+        if (!events_task_is_scheduled) {
+            // The schedule queue is full, set callback to try again soon.
+            mp_bluetooth_hci_poll_in_ms(5);
+        }
     }
 }
 
 #else // !MICROPY_PY_BLUETOOTH_USE_SYNC_EVENTS
 
-// Called periodically (systick) or directly (e.g. uart irq).
-void mp_bluetooth_hci_systick(uint32_t ticks_ms) {
-    if (ticks_ms == 0 || BLUETOOTH_HCI_TICK(ticks_ms)) {
-        pendsv_schedule_dispatch(PENDSV_DISPATCH_BLUETOOTH_HCI, mp_bluetooth_hci_poll);
-    }
+void mp_bluetooth_hci_poll_now(void) {
+    pendsv_schedule_dispatch(PENDSV_DISPATCH_BLUETOOTH_HCI, mp_bluetooth_hci_poll);
 }
 
 #endif
@@ -104,14 +128,13 @@ int mp_bluetooth_hci_uart_init(uint32_t port, uint32_t baudrate) {
 
     DEBUG_printf("mp_bluetooth_hci_uart_init (stm32 rfcore)\n");
 
-    #if MICROPY_PY_BLUETOOTH_USE_SYNC_EVENTS
-    events_task_is_scheduled = false;
-    #endif
-
     rfcore_ble_init();
     hci_uart_rx_buf_cur = 0;
     hci_uart_rx_buf_len = 0;
 
+    // Start the HCI polling to process any initial events/packets.
+    mp_bluetooth_hci_start_polling();
+
     return 0;
 }
 
@@ -163,7 +186,6 @@ int mp_bluetooth_hci_uart_readchar(void) {
 /******************************************************************************/
 // HCI over UART
 
-#include "pendsv.h"
 #include "uart.h"
 
 pyb_uart_obj_t mp_bluetooth_hci_uart_obj;
@@ -173,7 +195,7 @@ static uint8_t hci_uart_rxbuf[768];
 
 mp_obj_t mp_uart_interrupt(mp_obj_t self_in) {
     // Queue up the scheduler to run the HCI UART and event processing ASAP.
-    mp_bluetooth_hci_systick(0);
+    mp_bluetooth_hci_poll_now();
 
     return mp_const_none;
 }
@@ -182,10 +204,6 @@ MP_DEFINE_CONST_FUN_OBJ_1(mp_uart_interrupt_obj, mp_uart_interrupt);
 int mp_bluetooth_hci_uart_init(uint32_t port, uint32_t baudrate) {
     DEBUG_printf("mp_bluetooth_hci_uart_init (stm32)\n");
 
-    #if MICROPY_PY_BLUETOOTH_USE_SYNC_EVENTS
-    events_task_is_scheduled = false;
-    #endif
-
     // bits (8), stop (1), parity (none) and flow (rts/cts) are assumed to match MYNEWT_VAL_BLE_HCI_UART_ constants in syscfg.h.
     mp_bluetooth_hci_uart_obj.base.type = &pyb_uart_type;
     mp_bluetooth_hci_uart_obj.uart_id = port;
@@ -208,6 +226,9 @@ int mp_bluetooth_hci_uart_init(uint32_t port, uint32_t baudrate) {
     mp_bluetooth_hci_uart_irq_obj.ishard = true;
     uart_irq_config(&mp_bluetooth_hci_uart_obj, true);
 
+    // Start the HCI polling to process any initial events/packets.
+    mp_bluetooth_hci_start_polling();
+
     return 0;
 }
 
diff --git a/ports/stm32/mpbthciport.h b/ports/stm32/mpbthciport.h
new file mode 100644
index 0000000000000..77919ee0e6355
--- /dev/null
+++ b/ports/stm32/mpbthciport.h
@@ -0,0 +1,42 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+#ifndef MICROPY_INCLUDED_STM32_MPBTHCIPORT_H
+#define MICROPY_INCLUDED_STM32_MPBTHCIPORT_H
+
+// Initialise the HCI subsystem (should be called once, early on).
+void mp_bluetooth_hci_init(void);
+
+// Poll the HCI now, or after a certain timeout.
+void mp_bluetooth_hci_poll_now(void);
+void mp_bluetooth_hci_poll_in_ms(uint32_t ms);
+
+// Must be provided by the stack bindings (e.g. mpnimbleport.c or mpbtstackport.c).
+// Request new data from the uart and pass to the stack, and run pending events/callouts.
+// This is a low-level function and should not be called directly, use
+// mp_bluetooth_hci_poll_now/mp_bluetooth_hci_poll_in_ms instead.
+void mp_bluetooth_hci_poll(void);
+
+#endif // MICROPY_INCLUDED_STM32_MPBTHCIPORT_H
diff --git a/ports/stm32/mpbtstackport.c b/ports/stm32/mpbtstackport.c
index 3dfd8cb3c4a85..abe4f6d3e20a1 100644
--- a/ports/stm32/mpbtstackport.c
+++ b/ports/stm32/mpbtstackport.c
@@ -38,6 +38,7 @@
 #include "extmod/mpbthci.h"
 #include "extmod/btstack/btstack_hci_uart.h"
 #include "extmod/btstack/modbluetooth_btstack.h"
+#include "mpbthciport.h"
 
 // The IRQ functionality in btstack_run_loop_embedded.c is not used, so the
 // following three functions are empty.
@@ -75,6 +76,10 @@ void mp_bluetooth_hci_poll(void) {
 
     // Call the BTstack run loop.
     btstack_run_loop_embedded_execute_once();
+
+    // Call this function again in 128ms to check for new events.
+    // TODO: improve this by only calling back when needed.
+    mp_bluetooth_hci_poll_in_ms(128);
 }
 
 void mp_bluetooth_btstack_port_init(void) {
diff --git a/ports/stm32/mpnimbleport.c b/ports/stm32/mpnimbleport.c
index 0ba76fb277ea2..e2d39e271ce6c 100644
--- a/ports/stm32/mpnimbleport.c
+++ b/ports/stm32/mpnimbleport.c
@@ -40,6 +40,7 @@
 #include "extmod/modbluetooth.h"
 #include "extmod/nimble/modbluetooth_nimble.h"
 #include "extmod/nimble/hal/hal_uart.h"
+#include "mpbthciport.h"
 
 // Get any pending data from the UART and send it to NimBLE's HCI buffers.
 // Any further processing by NimBLE will be run via its event queue.
@@ -56,6 +57,12 @@ void mp_bluetooth_hci_poll(void) {
         // Run any remaining events (e.g. if there was no UART data).
         mp_bluetooth_nimble_os_eventq_run_all();
     }
+
+    if (mp_bluetooth_nimble_ble_state != MP_BLUETOOTH_NIMBLE_BLE_STATE_OFF) {
+        // Call this function again in 128ms to check for new events.
+        // TODO: improve this by only calling back when needed.
+        mp_bluetooth_hci_poll_in_ms(128);
+    }
 }
 
 // --- Port-specific helpers for the generic NimBLE bindings. -----------------
diff --git a/ports/stm32/rfcore.c b/ports/stm32/rfcore.c
index 049f6bdc10c34..67b63679a72a6 100644
--- a/ports/stm32/rfcore.c
+++ b/ports/stm32/rfcore.c
@@ -32,6 +32,7 @@
 #include "py/mphal.h"
 #include "py/runtime.h"
 #include "extmod/modbluetooth.h"
+#include "mpbthciport.h"
 #include "rtc.h"
 #include "rfcore.h"
 
@@ -714,8 +715,7 @@ void IPCC_C1_RX_IRQHandler(void) {
 
         #if MICROPY_PY_BLUETOOTH
         // Queue up the scheduler to process UART data and run events.
-        extern void mp_bluetooth_hci_systick(uint32_t ticks_ms);
-        mp_bluetooth_hci_systick(0);
+        mp_bluetooth_hci_poll_now();
         #endif
     }
 
diff --git a/ports/stm32/systick.h b/ports/stm32/systick.h
index 6aef3f2e4e731..6a05a4990ac6a 100644
--- a/ports/stm32/systick.h
+++ b/ports/stm32/systick.h
@@ -37,9 +37,6 @@ enum {
     #if MICROPY_PY_NETWORK && MICROPY_PY_LWIP
     SYSTICK_DISPATCH_LWIP,
     #endif
-    #if MICROPY_PY_BLUETOOTH
-    SYSTICK_DISPATCH_BLUETOOTH_HCI,
-    #endif
     SYSTICK_DISPATCH_MAX
 };
 

From 38bc5a9f67b9dd05833de36a4ae2e74afd10a0e9 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 13 May 2021 23:33:32 +1000
Subject: [PATCH 0990/3533] stm32: Provide a custom BTstack runloop that
 integrates with soft timer.

It reschedules the BT HCI poll soft timer so that it is called exactly when
the next timer expires.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/btstack/btstack.mk   |  1 -
 ports/stm32/mpbtstackport.c | 94 +++++++++++++++++++++++++++++--------
 ports/unix/Makefile         |  1 +
 3 files changed, 75 insertions(+), 21 deletions(-)

diff --git a/extmod/btstack/btstack.mk b/extmod/btstack/btstack.mk
index 17bbb16f88f72..9e1857263b561 100644
--- a/extmod/btstack/btstack.mk
+++ b/extmod/btstack/btstack.mk
@@ -30,7 +30,6 @@ INC += -I$(BTSTACK_DIR)/3rd-party/yxml
 SRC_BTSTACK = \
 	$(addprefix lib/btstack/src/, $(SRC_FILES)) \
 	$(addprefix lib/btstack/src/ble/, $(filter-out %_tlv.c, $(SRC_BLE_FILES))) \
-	lib/btstack/platform/embedded/btstack_run_loop_embedded.c
 
 ifeq ($(MICROPY_BLUETOOTH_BTSTACK_USB),1)
 ifeq ($(MICROPY_BLUETOOTH_BTSTACK_H4),1)
diff --git a/ports/stm32/mpbtstackport.c b/ports/stm32/mpbtstackport.c
index abe4f6d3e20a1..795534042eaec 100644
--- a/ports/stm32/mpbtstackport.c
+++ b/ports/stm32/mpbtstackport.c
@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2020 Damien P. George
+ * Copyright (c) 2020-2021 Damien P. George
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -31,31 +31,79 @@
 #if MICROPY_PY_BLUETOOTH && MICROPY_BLUETOOTH_BTSTACK
 
 #include "lib/btstack/src/btstack.h"
-#include "lib/btstack/platform/embedded/btstack_run_loop_embedded.h"
-#include "lib/btstack/platform/embedded/hal_cpu.h"
-#include "lib/btstack/platform/embedded/hal_time_ms.h"
-
 #include "extmod/mpbthci.h"
 #include "extmod/btstack/btstack_hci_uart.h"
 #include "extmod/btstack/modbluetooth_btstack.h"
 #include "mpbthciport.h"
 
-// The IRQ functionality in btstack_run_loop_embedded.c is not used, so the
-// following three functions are empty.
+void mp_bluetooth_hci_poll_in_ms(uint32_t ms);
+
+static btstack_linked_list_t mp_btstack_runloop_timers;
+
+static void mp_btstack_runloop_init(void) {
+    mp_btstack_runloop_timers = NULL;
+}
+
+static void mp_btstack_runloop_set_timer(btstack_timer_source_t *tim, uint32_t timeout_ms) {
+    tim->timeout = mp_hal_ticks_ms() + timeout_ms + 1;
+}
+
+static void mp_btstack_runloop_add_timer(btstack_timer_source_t *tim) {
+    btstack_linked_item_t **node = &mp_btstack_runloop_timers;
+    for (; *node; node = &(*node)->next) {
+        btstack_timer_source_t *node_tim = (btstack_timer_source_t *)*node;
+        if (node_tim == tim) {
+            // Timer is already in the list, don't add it.
+            return;
+        }
+        int32_t delta = btstack_time_delta(tim->timeout, node_tim->timeout);
+        if (delta < 0) {
+            // Found sorted location in list.
+            break;
+        }
+    }
+
+    // Insert timer into list in sorted location.
+    tim->item.next = *node;
+    *node = &tim->item;
+
+    // Reschedule the HCI poll if this timer is at the head of the list.
+    if (mp_btstack_runloop_timers == &tim->item) {
+        int32_t delta_ms = btstack_time_delta(tim->timeout, mp_hal_ticks_ms());
+        mp_bluetooth_hci_poll_in_ms(delta_ms);
+    }
+}
 
-void hal_cpu_disable_irqs(void) {
+static bool mp_btstack_runloop_remove_timer(btstack_timer_source_t *tim) {
+    return btstack_linked_list_remove(&mp_btstack_runloop_timers, (btstack_linked_item_t *)tim);
 }
 
-void hal_cpu_enable_irqs(void) {
+static void mp_btstack_runloop_execute(void) {
+    // Should not be called.
 }
 
-void hal_cpu_enable_irqs_and_sleep(void) {
+static void mp_btstack_runloop_dump_timer(void) {
+    // Not implemented/needed.
 }
 
-uint32_t hal_time_ms(void) {
+static uint32_t mp_btstack_runloop_get_time_ms(void) {
     return mp_hal_ticks_ms();
 }
 
+static const btstack_run_loop_t mp_btstack_runloop_stm32 = {
+    &mp_btstack_runloop_init,
+    NULL, // add_data_source,
+    NULL, // remove_data_source,
+    NULL, // enable_data_source_callbacks,
+    NULL, // disable_data_source_callbacks,
+    &mp_btstack_runloop_set_timer,
+    &mp_btstack_runloop_add_timer,
+    &mp_btstack_runloop_remove_timer,
+    &mp_btstack_runloop_execute,
+    &mp_btstack_runloop_dump_timer,
+    &mp_btstack_runloop_get_time_ms,
+};
+
 STATIC const hci_transport_config_uart_t hci_transport_config_uart = {
     HCI_TRANSPORT_CONFIG_UART,
     MICROPY_HW_BLE_UART_BAUDRATE,
@@ -69,26 +117,32 @@ void mp_bluetooth_hci_poll(void) {
         return;
     }
 
-    // Process uart data.
+    // Process UART data.
     if (mp_bluetooth_btstack_state != MP_BLUETOOTH_BTSTACK_STATE_HALTING) {
         mp_bluetooth_btstack_hci_uart_process();
     }
 
-    // Call the BTstack run loop.
-    btstack_run_loop_embedded_execute_once();
-
-    // Call this function again in 128ms to check for new events.
-    // TODO: improve this by only calling back when needed.
-    mp_bluetooth_hci_poll_in_ms(128);
+    // Process any BTstack timers.
+    while (mp_btstack_runloop_timers != NULL) {
+        btstack_timer_source_t *tim = (btstack_timer_source_t *)mp_btstack_runloop_timers;
+        int32_t delta_ms = btstack_time_delta(tim->timeout, mp_hal_ticks_ms());
+        if (delta_ms > 0) {
+            // Timer has not expired yet, reschedule HCI poll for this timer.
+            mp_bluetooth_hci_poll_in_ms(delta_ms);
+            break;
+        }
+        btstack_linked_list_pop(&mp_btstack_runloop_timers);
+        tim->process(tim);
+    }
 }
 
 void mp_bluetooth_btstack_port_init(void) {
     static bool run_loop_init = false;
     if (!run_loop_init) {
         run_loop_init = true;
-        btstack_run_loop_init(btstack_run_loop_embedded_get_instance());
+        btstack_run_loop_init(&mp_btstack_runloop_stm32);
     } else {
-        btstack_run_loop_embedded_get_instance()->init();
+        mp_btstack_runloop_stm32.init();
     }
 
     // hci_dump_open(NULL, HCI_DUMP_STDOUT);
diff --git a/ports/unix/Makefile b/ports/unix/Makefile
index fe86018aa0ecc..d97e4bc7e0a51 100644
--- a/ports/unix/Makefile
+++ b/ports/unix/Makefile
@@ -177,6 +177,7 @@ endif
 # BTstack is enabled.
 GIT_SUBMODULES += lib/btstack
 include $(TOP)/extmod/btstack/btstack.mk
+SRC_BTSTACK += lib/btstack/platform/embedded/btstack_run_loop_embedded.c
 
 else
 

From 0fc0f7536b9d73935f22c3e74747eacad7d3de74 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 20 May 2021 12:19:34 +1000
Subject: [PATCH 0991/3533] extmod/btstack: Add missing call to
 mp_bluetooth_hci_uart_deinit.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/btstack/btstack_hci_uart.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/extmod/btstack/btstack_hci_uart.c b/extmod/btstack/btstack_hci_uart.c
index 7205dba069365..83e865b71d2d3 100644
--- a/extmod/btstack/btstack_hci_uart.c
+++ b/extmod/btstack/btstack_hci_uart.c
@@ -86,6 +86,7 @@ STATIC int btstack_uart_open(void) {
 
 STATIC int btstack_uart_close(void) {
     mp_bluetooth_hci_controller_deinit();
+    mp_bluetooth_hci_uart_deinit();
     return 0;
 }
 

From 6ed5b843cf55a96156328b08b011ba919af22fb4 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 23 Jun 2021 14:58:39 +1000
Subject: [PATCH 0992/3533] extmod/btstack: Check that BLE is active before
 performing operations.

Otherwise it can easily lead to a hard crash.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/btstack/modbluetooth_btstack.c | 69 +++++++++++++++++++++++++++
 1 file changed, 69 insertions(+)

diff --git a/extmod/btstack/modbluetooth_btstack.c b/extmod/btstack/modbluetooth_btstack.c
index 5f047e32541f4..9c88878038802 100644
--- a/extmod/btstack/modbluetooth_btstack.c
+++ b/extmod/btstack/modbluetooth_btstack.c
@@ -849,6 +849,11 @@ int mp_bluetooth_gap_set_device_name(const uint8_t *buf, size_t len) {
 
 int mp_bluetooth_gap_advertise_start(bool connectable, int32_t interval_us, const uint8_t *adv_data, size_t adv_data_len, const uint8_t *sr_data, size_t sr_data_len) {
     DEBUG_printf("mp_bluetooth_gap_advertise_start\n");
+
+    if (!mp_bluetooth_is_active()) {
+        return ERRNO_BLUETOOTH_NOT_ACTIVE;
+    }
+
     uint16_t adv_int_min = interval_us / 625;
     uint16_t adv_int_max = interval_us / 625;
     uint8_t adv_type = connectable ? 0 : 2;
@@ -885,6 +890,11 @@ int mp_bluetooth_gap_advertise_start(bool connectable, int32_t interval_us, cons
 
 void mp_bluetooth_gap_advertise_stop(void) {
     DEBUG_printf("mp_bluetooth_gap_advertise_stop\n");
+
+    if (!mp_bluetooth_is_active()) {
+        return;
+    }
+
     gap_advertisements_enable(false);
     MP_STATE_PORT(bluetooth_btstack_root_pointers)->adv_data_alloc = 0;
     MP_STATE_PORT(bluetooth_btstack_root_pointers)->adv_data = NULL;
@@ -892,6 +902,11 @@ void mp_bluetooth_gap_advertise_stop(void) {
 
 int mp_bluetooth_gatts_register_service_begin(bool append) {
     DEBUG_printf("mp_bluetooth_gatts_register_service_begin\n");
+
+    if (!mp_bluetooth_is_active()) {
+        return ERRNO_BLUETOOTH_NOT_ACTIVE;
+    }
+
     if (!append) {
         // This will reset the DB.
         // Becase the DB is statically allocated, there's no problem with just re-initing it.
@@ -1064,16 +1079,27 @@ int mp_bluetooth_gatts_register_service_end(void) {
 
 int mp_bluetooth_gatts_read(uint16_t value_handle, uint8_t **value, size_t *value_len) {
     DEBUG_printf("mp_bluetooth_gatts_read\n");
+    if (!mp_bluetooth_is_active()) {
+        return ERRNO_BLUETOOTH_NOT_ACTIVE;
+    }
     return mp_bluetooth_gatts_db_read(MP_STATE_PORT(bluetooth_btstack_root_pointers)->gatts_db, value_handle, value, value_len);
 }
 
 int mp_bluetooth_gatts_write(uint16_t value_handle, const uint8_t *value, size_t value_len) {
     DEBUG_printf("mp_bluetooth_gatts_write\n");
+    if (!mp_bluetooth_is_active()) {
+        return ERRNO_BLUETOOTH_NOT_ACTIVE;
+    }
     return mp_bluetooth_gatts_db_write(MP_STATE_PORT(bluetooth_btstack_root_pointers)->gatts_db, value_handle, value, value_len);
 }
 
 int mp_bluetooth_gatts_notify(uint16_t conn_handle, uint16_t value_handle) {
     DEBUG_printf("mp_bluetooth_gatts_notify\n");
+
+    if (!mp_bluetooth_is_active()) {
+        return ERRNO_BLUETOOTH_NOT_ACTIVE;
+    }
+
     // Note: btstack doesn't appear to support sending a notification without a value, so include the stored value.
     uint8_t *data = NULL;
     size_t len = 0;
@@ -1084,6 +1110,10 @@ int mp_bluetooth_gatts_notify(uint16_t conn_handle, uint16_t value_handle) {
 int mp_bluetooth_gatts_notify_send(uint16_t conn_handle, uint16_t value_handle, const uint8_t *value, size_t value_len) {
     DEBUG_printf("mp_bluetooth_gatts_notify_send\n");
 
+    if (!mp_bluetooth_is_active()) {
+        return ERRNO_BLUETOOTH_NOT_ACTIVE;
+    }
+
     // Attempt to send immediately. If it succeeds, btstack will copy the buffer.
     MICROPY_PY_BLUETOOTH_ENTER
     int err = att_server_notify(conn_handle, value_handle, value, value_len);
@@ -1110,6 +1140,10 @@ int mp_bluetooth_gatts_notify_send(uint16_t conn_handle, uint16_t value_handle,
 int mp_bluetooth_gatts_indicate(uint16_t conn_handle, uint16_t value_handle) {
     DEBUG_printf("mp_bluetooth_gatts_indicate\n");
 
+    if (!mp_bluetooth_is_active()) {
+        return ERRNO_BLUETOOTH_NOT_ACTIVE;
+    }
+
     uint8_t *data = NULL;
     size_t len = 0;
     mp_bluetooth_gatts_db_read(MP_STATE_PORT(bluetooth_btstack_root_pointers)->gatts_db, value_handle, &data, &len);
@@ -1142,6 +1176,9 @@ int mp_bluetooth_gatts_indicate(uint16_t conn_handle, uint16_t value_handle) {
 
 int mp_bluetooth_gatts_set_buffer(uint16_t value_handle, size_t len, bool append) {
     DEBUG_printf("mp_bluetooth_gatts_set_buffer\n");
+    if (!mp_bluetooth_is_active()) {
+        return ERRNO_BLUETOOTH_NOT_ACTIVE;
+    }
     return mp_bluetooth_gatts_db_resize(MP_STATE_PORT(bluetooth_btstack_root_pointers)->gatts_db, value_handle, len, append);
 }
 
@@ -1165,6 +1202,9 @@ int mp_bluetooth_set_preferred_mtu(uint16_t mtu) {
 
 int mp_bluetooth_gap_disconnect(uint16_t conn_handle) {
     DEBUG_printf("mp_bluetooth_gap_disconnect\n");
+    if (!mp_bluetooth_is_active()) {
+        return ERRNO_BLUETOOTH_NOT_ACTIVE;
+    }
     gap_disconnect(conn_handle);
     return 0;
 }
@@ -1195,6 +1235,10 @@ STATIC void scan_duration_timeout_handler(btstack_timer_source_t *ds) {
 int mp_bluetooth_gap_scan_start(int32_t duration_ms, int32_t interval_us, int32_t window_us, bool active_scan) {
     DEBUG_printf("mp_bluetooth_gap_scan_start\n");
 
+    if (!mp_bluetooth_is_active()) {
+        return ERRNO_BLUETOOTH_NOT_ACTIVE;
+    }
+
     if (duration_ms > 0) {
         btstack_run_loop_set_timer(&scan_duration_timeout, duration_ms);
         btstack_run_loop_set_timer_handler(&scan_duration_timeout, scan_duration_timeout_handler);
@@ -1209,6 +1253,9 @@ int mp_bluetooth_gap_scan_start(int32_t duration_ms, int32_t interval_us, int32_
 
 int mp_bluetooth_gap_scan_stop(void) {
     DEBUG_printf("mp_bluetooth_gap_scan_stop\n");
+    if (!mp_bluetooth_is_active()) {
+        return ERRNO_BLUETOOTH_NOT_ACTIVE;
+    }
     btstack_run_loop_remove_timer(&scan_duration_timeout);
     gap_stop_scan();
     mp_bluetooth_gap_on_scan_complete();
@@ -1240,6 +1287,11 @@ int mp_bluetooth_gap_peripheral_connect(uint8_t addr_type, const uint8_t *addr,
 
 int mp_bluetooth_gattc_discover_primary_services(uint16_t conn_handle, const mp_obj_bluetooth_uuid_t *uuid) {
     DEBUG_printf("mp_bluetooth_gattc_discover_primary_services\n");
+
+    if (!mp_bluetooth_is_active()) {
+        return ERRNO_BLUETOOTH_NOT_ACTIVE;
+    }
+
     uint8_t err;
     if (uuid) {
         if (uuid->type == MP_BLUETOOTH_UUID_TYPE_16) {
@@ -1260,6 +1312,11 @@ int mp_bluetooth_gattc_discover_primary_services(uint16_t conn_handle, const mp_
 
 int mp_bluetooth_gattc_discover_characteristics(uint16_t conn_handle, uint16_t start_handle, uint16_t end_handle, const mp_obj_bluetooth_uuid_t *uuid) {
     DEBUG_printf("mp_bluetooth_gattc_discover_characteristics\n");
+
+    if (!mp_bluetooth_is_active()) {
+        return ERRNO_BLUETOOTH_NOT_ACTIVE;
+    }
+
     gatt_client_service_t service = {
         // Only start/end handles needed for gatt_client_discover_characteristics_for_service.
         .start_group_handle = start_handle,
@@ -1287,6 +1344,11 @@ int mp_bluetooth_gattc_discover_characteristics(uint16_t conn_handle, uint16_t s
 
 int mp_bluetooth_gattc_discover_descriptors(uint16_t conn_handle, uint16_t start_handle, uint16_t end_handle) {
     DEBUG_printf("mp_bluetooth_gattc_discover_descriptors\n");
+
+    if (!mp_bluetooth_is_active()) {
+        return ERRNO_BLUETOOTH_NOT_ACTIVE;
+    }
+
     gatt_client_characteristic_t characteristic = {
         // Only start/end handles needed for gatt_client_discover_characteristic_descriptors.
         .start_handle = start_handle,
@@ -1301,12 +1363,19 @@ int mp_bluetooth_gattc_discover_descriptors(uint16_t conn_handle, uint16_t start
 
 int mp_bluetooth_gattc_read(uint16_t conn_handle, uint16_t value_handle) {
     DEBUG_printf("mp_bluetooth_gattc_read\n");
+    if (!mp_bluetooth_is_active()) {
+        return ERRNO_BLUETOOTH_NOT_ACTIVE;
+    }
     return btstack_error_to_errno(gatt_client_read_value_of_characteristic_using_value_handle(&btstack_packet_handler_read, conn_handle, value_handle));
 }
 
 int mp_bluetooth_gattc_write(uint16_t conn_handle, uint16_t value_handle, const uint8_t *value, size_t *value_len, unsigned int mode) {
     DEBUG_printf("mp_bluetooth_gattc_write\n");
 
+    if (!mp_bluetooth_is_active()) {
+        return ERRNO_BLUETOOTH_NOT_ACTIVE;
+    }
+
     // We should be distinguishing between gatt_client_write_value_of_characteristic vs
     // gatt_client_write_characteristic_descriptor_using_descriptor_handle.
     // However both are implemented using send_gatt_write_attribute_value_request under the hood,

From 63b8b796103327cdaf61936ef25046a696e92db6 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 23 Jun 2021 14:37:33 +1000
Subject: [PATCH 0993/3533] stm32/usb: Make irq's default trigger enable all
 events.

Following how other .irq() methods work on other objects.

Signed-off-by: Damien George <damien@micropython.org>
---
 docs/library/pyb.USB_VCP.rst |  2 +-
 ports/stm32/usb.c            | 12 +++++++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/docs/library/pyb.USB_VCP.rst b/docs/library/pyb.USB_VCP.rst
index 1e44e53fd8be1..1cca8dcadf6fc 100644
--- a/docs/library/pyb.USB_VCP.rst
+++ b/docs/library/pyb.USB_VCP.rst
@@ -109,7 +109,7 @@ Methods
 
    Return value: number of bytes sent.
 
-.. method:: USB_VCP.irq(handler=None, trigger=0, hard=False)
+.. method:: USB_VCP.irq(handler=None, trigger=IRQ_RX, hard=False)
 
    Register *handler* to be called whenever an event specified by *trigger*
    occurs.  The *handler* function must take exactly one argument, which will
diff --git a/ports/stm32/usb.c b/ports/stm32/usb.c
index eba95de49fb58..5e3802651b074 100644
--- a/ports/stm32/usb.c
+++ b/ports/stm32/usb.c
@@ -829,11 +829,17 @@ STATIC mp_obj_t pyb_usb_vcp_recv(size_t n_args, const mp_obj_t *args, mp_map_t *
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_KW(pyb_usb_vcp_recv_obj, 1, pyb_usb_vcp_recv);
 
-// irq(handler=None, trigger=0, hard=False)
+// irq(handler=None, trigger=IRQ_RX, hard=False)
 STATIC mp_obj_t pyb_usb_vcp_irq(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
-    mp_arg_val_t args[MP_IRQ_ARG_INIT_NUM_ARGS];
-    mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args, MP_IRQ_ARG_INIT_NUM_ARGS, mp_irq_init_args, args);
+    enum { ARG_handler, ARG_trigger, ARG_hard };
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_handler, MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
+        { MP_QSTR_trigger, MP_ARG_INT, {.u_int = USBD_CDC_IRQ_RX} },
+        { MP_QSTR_hard, MP_ARG_BOOL, {.u_bool = false} },
+    };
     pyb_usb_vcp_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]);
+    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
+    mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
 
     if (n_args > 1 || kw_args->used != 0) {
         // Check the handler.

From 3588d14ae6a611764a0f83867754da691fba7127 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 21 Jun 2021 14:56:37 +1000
Subject: [PATCH 0994/3533] tools/autobuild: Add scripts to build release
 firmware.

Signed-off-by: Damien George <damien@micropython.org>
---
 tools/autobuild/autobuild.sh            | 90 +++++++++++++++++++++++++
 tools/autobuild/build-cc3200-latest.sh  | 32 +++++++++
 tools/autobuild/build-esp32-latest.sh   | 45 +++++++++++++
 tools/autobuild/build-esp8266-latest.sh | 66 ++++++++++++++++++
 tools/autobuild/build-rp2-latest.sh     | 32 +++++++++
 tools/autobuild/build-stm32-latest.sh   | 56 +++++++++++++++
 tools/autobuild/remove_old_firmware.py  | 72 ++++++++++++++++++++
 7 files changed, 393 insertions(+)
 create mode 100755 tools/autobuild/autobuild.sh
 create mode 100755 tools/autobuild/build-cc3200-latest.sh
 create mode 100755 tools/autobuild/build-esp32-latest.sh
 create mode 100755 tools/autobuild/build-esp8266-latest.sh
 create mode 100755 tools/autobuild/build-rp2-latest.sh
 create mode 100755 tools/autobuild/build-stm32-latest.sh
 create mode 100755 tools/autobuild/remove_old_firmware.py

diff --git a/tools/autobuild/autobuild.sh b/tools/autobuild/autobuild.sh
new file mode 100755
index 0000000000000..45822f2b7dc25
--- /dev/null
+++ b/tools/autobuild/autobuild.sh
@@ -0,0 +1,90 @@
+#!/bin/bash
+#
+# Build firmware for ports.
+#
+# Requirements:
+# - All toolchains must be in path (arm-none-eabi-gcc, xtensa-lx106-elf)
+# - IDF_PATH_V4 must be set
+# - MICROPY_AUTOBUILD_MICROPYTHON_REPO must be set to location of micropython repository
+# - MICROPY_AUTOBUILD_MAKE must be set to the make command to use, eg "make -j2"
+#
+# Optional settings:
+# - MICROPY_AUTOBUILD_REMOTE_MACHINE can be set to a remote ssh machine to copy files to
+# - MICROPY_AUTOBUILD_REMOTE_DIR can be set to destination directory on remote machine
+
+if [ ! -d "$IDF_PATH_V4" ]; then
+    echo "must set IDF_PATH_V4"
+    exit 1
+fi
+
+if [ ! -d "$MICROPY_AUTOBUILD_MICROPYTHON_REPO" ]; then
+    echo "must set MICROPY_AUTOBUILD_MICROPYTHON_REPO"
+    exit 1
+fi
+
+if [ -z "$MICROPY_AUTOBUILD_MAKE" ]; then
+    echo "must set MICROPY_AUTOBUILD_MAKE"
+    exit 1
+fi
+
+########################################
+# Initialisation
+
+# get directory of this script for access to other build scripts
+AUTODIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+
+# make local directory to put firmware
+LOCAL_FIRMWARE=/tmp/autobuild-firmware-$$
+mkdir -p ${LOCAL_FIRMWARE}
+
+# get latest MicroPython
+git -C ${MICROPY_AUTOBUILD_MICROPYTHON_REPO} pull
+git -C ${MICROPY_AUTOBUILD_MICROPYTHON_REPO} submodule update --init
+git -C ${MICROPY_AUTOBUILD_MICROPYTHON_REPO}/lib/pico-sdk submodule update --init
+
+########################################
+# Build all firmware
+
+pushd ${MICROPY_AUTOBUILD_MICROPYTHON_REPO}
+
+# build cross compiler
+make -C mpy-cross
+
+# make the firmware tag
+FW_DATE=$(date '+%Y%m%d')
+FW_GIT="$(git describe --dirty || echo unknown)"
+FW_TAG="-$FW_DATE-unstable-$FW_GIT"
+
+# build new firmware
+cd ports/stm32
+${AUTODIR}/build-stm32-latest.sh ${FW_TAG} ${LOCAL_FIRMWARE}
+cd ../cc3200
+${AUTODIR}/build-cc3200-latest.sh ${FW_TAG} ${LOCAL_FIRMWARE}
+cd ../esp8266
+${AUTODIR}/build-esp8266-latest.sh ${FW_TAG} ${LOCAL_FIRMWARE}
+cd ../esp32
+${AUTODIR}/build-esp32-latest.sh ${IDF_PATH_V4} ${FW_TAG} ${LOCAL_FIRMWARE}
+cd ../rp2
+${AUTODIR}/build-rp2-latest.sh ${FW_TAG} ${LOCAL_FIRMWARE}
+
+popd
+
+########################################
+# Copy firmware to remote machine
+
+if [ -z "$MICROPY_AUTOBUILD_REMOTE_MACHINE" -o -z "$MICROPY_AUTOBUILD_REMOTE_DIR" ]; then
+    echo "No remote given, leaving firmware in ${LOCAL_FIRMWARE}"
+    exit 0
+fi
+
+# copy new firmware to remote machine
+scp ${LOCAL_FIRMWARE}/* ${MICROPY_AUTOBUILD_REMOTE_MACHINE}:${MICROPY_AUTOBUILD_REMOTE_DIR}/
+
+# remove old firmware
+${AUTODIR}/remove_old_firmware.py ${MICROPY_AUTOBUILD_REMOTE_MACHINE} ${MICROPY_AUTOBUILD_REMOTE_DIR}
+
+########################################
+# Clean up
+
+/bin/rm -v ${LOCAL_FIRMWARE}/*
+/bin/rmdir ${LOCAL_FIRMWARE}
diff --git a/tools/autobuild/build-cc3200-latest.sh b/tools/autobuild/build-cc3200-latest.sh
new file mode 100755
index 0000000000000..3c6d400365679
--- /dev/null
+++ b/tools/autobuild/build-cc3200-latest.sh
@@ -0,0 +1,32 @@
+#!/bin/bash
+
+# function for building firmware
+function do_build() {
+    descr=$1
+    board=$2
+    shift
+    shift
+    echo "building $descr $board"
+    build_dir=/tmp/cc3200-build-$board
+    $MICROPY_AUTOBUILD_MAKE -B $@ BTARGET=application BOARD=$board BUILD=$build_dir || exit 1
+    zip $dest_dir/$descr$fw_tag.zip $build_dir/mcuimg.bin
+    rm -rf $build_dir
+}
+
+# check/get parameters
+if [ $# != 2 ]; then
+    echo "usage: $0 <fw-tag> <dest-dir>"
+    exit 1
+fi
+
+fw_tag=$1
+dest_dir=$2
+
+# check we are in the correct directory
+if [ ! -r application.mk ]; then
+    echo "must be in cc3200 directory"
+    exit 1
+fi
+
+# build the versions
+do_build wipy WIPY
diff --git a/tools/autobuild/build-esp32-latest.sh b/tools/autobuild/build-esp32-latest.sh
new file mode 100755
index 0000000000000..e433332c9eea8
--- /dev/null
+++ b/tools/autobuild/build-esp32-latest.sh
@@ -0,0 +1,45 @@
+#!/bin/bash
+#
+# Build esp32 port
+
+# for debugging
+#exec &> /tmp/esp-log-$$.txt
+
+# function for building firmware
+function do_build() {
+    descr=$1
+    board=$2
+    shift
+    shift
+    echo "building $descr $board"
+    build_dir=/tmp/esp32-build-$board
+    rm -rf $build_dir # be sure we don't have anything leftover from a previous build
+    make $@ BOARD=$board BUILD=$build_dir || exit 1
+    mv $build_dir/firmware.bin $dest_dir/$descr$fw_tag.bin
+    mv $build_dir/micropython.elf $dest_dir/$descr$fw_tag.elf
+    mv $build_dir/micropython.map $dest_dir/$descr$fw_tag.map
+    rm -rf $build_dir
+}
+
+# check/get parameters
+if [ $# != 3 ]; then
+    echo "usage: $0 <idf-path> <fw-tag> <dest-dir>"
+    exit 1
+fi
+
+idf_path=$1
+fw_tag=$2
+dest_dir=$3
+
+# check we are in the correct directory
+if [ ! -r modesp32.c ]; then
+    echo "must be in esp32 directory"
+    exit 1
+fi
+
+source $idf_path/export.sh
+
+# build the versions
+do_build esp32 GENERIC FROZEN_MANIFEST=$(pwd)/boards/manifest_release.py
+do_build esp32spiram GENERIC_SPIRAM FROZEN_MANIFEST=$(pwd)/boards/manifest_release.py
+do_build tinypico UM_TINYPICO
diff --git a/tools/autobuild/build-esp8266-latest.sh b/tools/autobuild/build-esp8266-latest.sh
new file mode 100755
index 0000000000000..fe79587fd1cb4
--- /dev/null
+++ b/tools/autobuild/build-esp8266-latest.sh
@@ -0,0 +1,66 @@
+#!/bin/bash
+
+PYTHON3=python3
+yaota8266=$HOME/yaota8266
+
+# for debugging
+#exec &> /tmp/esp-log-$$.txt
+
+# function for building firmware
+function do_build() {
+    descr=$1
+    board=$2
+    shift
+    shift
+    echo "building $descr $board"
+    #build_dir=/tmp/esp8266-build-$board
+    build_dir=build-$board # until esp8266.ld is fixed
+    rm -rf $build_dir # be sure we don't have anything leftover from a previous build
+    $MICROPY_AUTOBUILD_MAKE $@ BOARD=$board BUILD=$build_dir || exit 1
+    mv $build_dir/firmware-combined.bin $dest_dir/$descr$fw_tag.bin
+    mv $build_dir/firmware.elf $dest_dir/$descr$fw_tag.elf
+    mv $build_dir/firmware.map $dest_dir/$descr$fw_tag.map
+    rm -rf $build_dir
+}
+
+function do_build_ota() {
+    descr=$1
+    board=$2
+    shift
+    shift
+    echo "building $descr $board"
+    #build_dir=/tmp/esp8266-build-$board
+    build_dir=build-$board # until esp8266.ld is fixed
+    rm -rf $build_dir # be sure we don't have anything leftover from a previous build
+    $MICROPY_AUTOBUILD_MAKE $@ BOARD=$board BUILD=$build_dir || exit 1
+    cat $yaota8266/yaota8266.bin $build_dir/firmware-ota.bin > $dest_dir/$descr$fw_tag.bin
+    cwd=$(pwd)
+    pushd $yaota8266/ota-client
+    $PYTHON3 ota_client.py sign $cwd/$build_dir/firmware-ota.bin 
+    popd
+    mv $build_dir/firmware-ota.bin.ota $dest_dir/$descr$fw_tag.ota
+    mv $build_dir/firmware.elf $dest_dir/$descr$fw_tag.elf
+    mv $build_dir/firmware.map $dest_dir/$descr$fw_tag.map
+    #rm -rf $build_dir
+}
+
+# check/get parameters
+if [ $# != 2 ]; then
+    echo "usage: $0 <fw-tag> <dest-dir>"
+    exit 1
+fi
+
+fw_tag=$1
+dest_dir=$2
+
+# check we are in the correct directory
+if [ ! -r boards/esp8266_common.ld ]; then
+    echo "must be in esp8266 directory"
+    exit 1
+fi
+
+# build the versions
+do_build esp8266 GENERIC
+do_build esp8266-512k GENERIC_512K
+do_build esp8266-1m GENERIC_1M
+do_build_ota esp8266-ota GENERIC ota
diff --git a/tools/autobuild/build-rp2-latest.sh b/tools/autobuild/build-rp2-latest.sh
new file mode 100755
index 0000000000000..5124686e217aa
--- /dev/null
+++ b/tools/autobuild/build-rp2-latest.sh
@@ -0,0 +1,32 @@
+#!/bin/bash
+
+# function for building firmware
+function do_build() {
+    descr=$1
+    board=$2
+    shift
+    shift
+    echo "building $descr $board"
+    build_dir=/tmp/rp2-build-$board
+    $MICROPY_AUTOBUILD_MAKE $@ BOARD=$board BUILD=$build_dir || exit 1
+    mv $build_dir/firmware.uf2 $dest_dir/$descr$fw_tag.uf2
+    rm -rf $build_dir
+}
+
+# check/get parameters
+if [ $# != 2 ]; then
+    echo "usage: $0 <fw-tag> <dest-dir>"
+    exit 1
+fi
+
+fw_tag=$1
+dest_dir=$2
+
+# check we are in the correct directory
+if [ ! -r modrp2.c ]; then
+    echo "must be in rp2 directory"
+    exit 1
+fi
+
+# build the boards
+do_build rp2-pico PICO
diff --git a/tools/autobuild/build-stm32-latest.sh b/tools/autobuild/build-stm32-latest.sh
new file mode 100755
index 0000000000000..226c14a41eb28
--- /dev/null
+++ b/tools/autobuild/build-stm32-latest.sh
@@ -0,0 +1,56 @@
+#!/bin/bash
+
+# function for building firmware
+function do_build() {
+    descr=$1
+    board=$2
+    shift
+    shift
+    echo "building $descr $board"
+    build_dir=/tmp/stm-build-$board
+    $MICROPY_AUTOBUILD_MAKE -B $@ BOARD=$board BUILD=$build_dir || exit 1
+    mv $build_dir/firmware.dfu $dest_dir/$descr$fw_tag.dfu
+    rm -rf $build_dir
+}
+
+# check/get parameters
+if [ $# != 2 ]; then
+    echo "usage: $0 <fw-tag> <dest-dir>"
+    exit 1
+fi
+
+fw_tag=$1
+dest_dir=$2
+
+# check we are in the correct directory
+if [ ! -r modpyb.c ]; then
+    echo "must be in stm directory"
+    exit 1
+fi
+
+# build the versions
+do_build pybv3 PYBV3
+do_build pybv3-network PYBV3 MICROPY_PY_WIZNET5K=5200 MICROPY_PY_CC3K=1
+do_build pybv10 PYBV10
+do_build pybv10-dp PYBV10 MICROPY_FLOAT_IMPL=double
+do_build pybv10-thread PYBV10 CFLAGS_EXTRA='-DMICROPY_PY_THREAD=1'
+do_build pybv10-dp-thread PYBV10 MICROPY_FLOAT_IMPL=double CFLAGS_EXTRA='-DMICROPY_PY_THREAD=1'
+do_build pybv10-network PYBV10 MICROPY_PY_WIZNET5K=5200 MICROPY_PY_CC3K=1
+do_build pybv11 PYBV11
+do_build pybv11-dp PYBV11 MICROPY_FLOAT_IMPL=double
+do_build pybv11-thread PYBV11 CFLAGS_EXTRA='-DMICROPY_PY_THREAD=1'
+do_build pybv11-dp-thread PYBV11 MICROPY_FLOAT_IMPL=double CFLAGS_EXTRA='-DMICROPY_PY_THREAD=1'
+do_build pybv11-network PYBV11 MICROPY_PY_WIZNET5K=5200 MICROPY_PY_CC3K=1
+do_build pyblitev10 PYBLITEV10
+do_build pyblitev10-dp PYBLITEV10 MICROPY_FLOAT_IMPL=double
+do_build pyblitev10-thread PYBLITEV10 CFLAGS_EXTRA='-DMICROPY_PY_THREAD=1'
+do_build pyblitev10-dp-thread PYBLITEV10 MICROPY_FLOAT_IMPL=double CFLAGS_EXTRA='-DMICROPY_PY_THREAD=1'
+do_build pyblitev10-network PYBLITEV10 MICROPY_PY_WIZNET5K=5200 MICROPY_PY_CC3K=1
+do_build PYBD-SF2 PYBD_SF2
+do_build PYBD-SF3 PYBD_SF3
+do_build PYBD-SF6 PYBD_SF6
+
+for board in boards/{NUCLEO_*,STM32F*DISC,B_L*,USBDONGLE_WB55,ESPRUINO_PICO} ; do
+    bd=$(basename $board)
+    do_build $bd $bd USE_MBOOT=0 MBOOT_ENABLE_PACKING=0
+done
diff --git a/tools/autobuild/remove_old_firmware.py b/tools/autobuild/remove_old_firmware.py
new file mode 100755
index 0000000000000..e9d2e8aae8e98
--- /dev/null
+++ b/tools/autobuild/remove_old_firmware.py
@@ -0,0 +1,72 @@
+#!/usr/bin/env python3
+
+import re, subprocess, sys
+
+
+DEBUG = False
+DRY_RUN = False
+NUM_KEEP_PER_BOARD = 4
+
+
+def main():
+    ssh_machine = sys.argv[1]
+    ssh_firmware_dir = sys.argv[2]
+
+    # SSH to get list of existing files.
+    p = subprocess.run(
+        ["ssh", ssh_machine, "find", ssh_firmware_dir, "-name", "\\*-unstable-v\\*"],
+        capture_output=True,
+    )
+    if p.returncode != 0:
+        print(p.stderr)
+        return
+    all_files = p.stdout.split(b"\n")
+
+    # Parse all files to organise into boards/date/version.
+    boards = {}
+    for file in all_files:
+        m = re.match(
+            rb"([a-z/.]+)/([A-Za-z0-9_-]+)-(20[0-9]{6})-unstable-(v[0-9.-]+-g[0-9a-f]+).",
+            file,
+        )
+        if not m:
+            continue
+        dir, board, date, version = m.groups()
+        if board not in boards:
+            boards[board] = {}
+        if (date, version) not in boards[board]:
+            boards[board][(date, version)] = []
+        boards[board][(date, version)].append(file)
+
+    # Collect files to remove based on date and version.
+    remove = []
+    for board in boards.values():
+        filelist = [(date, version, files) for (date, version), files in board.items()]
+        filelist.sort(reverse=True)
+        keep = []
+        for date, version, files in filelist:
+            if keep and version == keep[-1]:
+                remove.extend(files)
+            elif len(keep) >= NUM_KEEP_PER_BOARD:
+                remove.extend(files)
+            else:
+                keep.append(version)
+
+    if DEBUG:
+        all_files.sort(reverse=True)
+        for file in all_files:
+            print(file, file in remove)
+        print(len(remove), "/", len(all_files))
+
+    # Do removal of files.
+    for file in remove:
+        file = str(file, "ascii")
+        print("remove:", file)
+        if not DRY_RUN:
+            p = subprocess.run(["ssh", ssh_machine, "/bin/rm", file], capture_output=True)
+            if p.returncode != 0:
+                print(p.stderr)
+
+
+if __name__ == "__main__":
+    main()

From c99e4995fd6bb19fa4d0d587f1b72f46efcf9785 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 21 Jun 2021 14:59:20 +1000
Subject: [PATCH 0995/3533] tools: Remove obsolete build-stm-latest.sh script.

The tools/autobuild/ scripts replace this.

Signed-off-by: Damien George <damien@micropython.org>
---
 tools/build-stm-latest.sh | 42 ---------------------------------------
 1 file changed, 42 deletions(-)
 delete mode 100755 tools/build-stm-latest.sh

diff --git a/tools/build-stm-latest.sh b/tools/build-stm-latest.sh
deleted file mode 100755
index 07cb168daa584..0000000000000
--- a/tools/build-stm-latest.sh
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/bash
-
-# function for building firmware
-function do_build() {
-    descr=$1
-    board=$2
-    shift
-    shift
-    echo "building $descr $board"
-    build_dir=/tmp/stm-build-$board
-    make -B $@ BOARD=$board BUILD=$build_dir || exit 1
-    mv $build_dir/firmware.dfu $dest_dir/$descr-$date-$git_tag.dfu
-    rm -rf $build_dir
-}
-
-# check/get parameters
-if [ $# != 1 ]; then
-    echo "usage: $0 <dest-dir>"
-    exit 1
-fi
-
-dest_dir=$1
-
-# check we are in the correct directory
-if [ ! -r modpyb.c ]; then
-    echo "must be in stm directory"
-    exit 1
-fi
-
-# get the date
-date=$(date '+%Y-%m-%d')
-
-# get the git tag
-git_tag="$(git describe --dirty || echo unknown)"
-
-# build the versions
-do_build pybv3 PYBV3
-do_build pybv3-network PYBV3 MICROPY_PY_WIZNET5K=1 MICROPY_PY_CC3K=1
-do_build pybv10 PYBV10
-do_build pybv10-network PYBV10 MICROPY_PY_WIZNET5K=1 MICROPY_PY_CC3K=1
-do_build stm32f4disc STM32F4DISC
-do_build espruino-pico ESPRUINO_PICO

From 0009a7dc305b9cce693b2e3fe94174c85dc1ef2e Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 24 Jun 2021 16:03:25 +1000
Subject: [PATCH 0996/3533] esp32/main: Allow MICROPY_DIR to be overridden.

This is necessary when building a custom out-of-tree board.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/main/CMakeLists.txt | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ports/esp32/main/CMakeLists.txt b/ports/esp32/main/CMakeLists.txt
index 1cc30b71ec558..d01656e567cfe 100644
--- a/ports/esp32/main/CMakeLists.txt
+++ b/ports/esp32/main/CMakeLists.txt
@@ -1,5 +1,7 @@
 # Set location of base MicroPython directory.
-get_filename_component(MICROPY_DIR ${PROJECT_DIR}/../.. ABSOLUTE)
+if(NOT MICROPY_DIR)
+    get_filename_component(MICROPY_DIR ${PROJECT_DIR}/../.. ABSOLUTE)
+endif()
 
 # Include core source components.
 include(${MICROPY_DIR}/py/py.cmake)

From 413f34cd8f244d1ce8b3c73386fdd57241165a1b Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Tue, 8 Jun 2021 07:45:56 -0500
Subject: [PATCH 0997/3533] all: Fix signed shifts and NULL access errors from
 -fsanitize=undefined.

Fixes the following (the line numbers match commit 0e87459e2bfd07):

../../extmod/crypto-algorithms/sha256.c:49:19: runtime error: left shif...
../../extmod/moduasyncio.c:106:35: runtime error: member access within ...
../../py/binary.c:210:13: runtime error: left shift of negative value -...
../../py/mpz.c:744:16: runtime error: negation of -9223372036854775808 ...
../../py/objint.c:109:22: runtime error: left shift of 1 by 31 places c...
../../py/objint_mpz.c:374:9: runtime error: left shift of 4611686018427...
../../py/objint_mpz.c:374:9: runtime error: left shift of negative valu...
../../py/parsenum.c:106:14: runtime error: left shift of 46116860184273...
../../py/runtime.c:395:33: runtime error: left shift of negative value ...
../../py/showbc.c:177:28: runtime error: left shift of negative value -...
../../py/vm.c:321:36: runtime error: left shift of negative value -1```

Testing was done on an amd64 Debian Buster system using gcc-8.3 and these
settings:

    CFLAGS += -g3 -Og -fsanitize=undefined
    LDFLAGS += -fsanitize=undefined

The introduced TASK_PAIRHEAP macro's conditional (x ? &x->i : NULL)
assembles (under amd64 gcc 8.3 -Os) to the same as &x->i, since i is the
initial field of the struct.  However, for the purposes of undefined
behavior analysis the conditional is needed.

Signed-off-by: Jeff Epler <jepler@gmail.com>
---
 extmod/crypto-algorithms/sha256.c | 2 +-
 extmod/moduasyncio.c              | 5 ++++-
 py/binary.c                       | 2 +-
 py/mpz.c                          | 2 +-
 py/objint.c                       | 6 +++---
 py/runtime.c                      | 2 +-
 py/showbc.c                       | 2 +-
 py/smallint.h                     | 2 +-
 py/vm.c                           | 2 +-
 9 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/extmod/crypto-algorithms/sha256.c b/extmod/crypto-algorithms/sha256.c
index 24e964749b693..ce0377208d4e4 100644
--- a/extmod/crypto-algorithms/sha256.c
+++ b/extmod/crypto-algorithms/sha256.c
@@ -46,7 +46,7 @@ static void sha256_transform(CRYAL_SHA256_CTX *ctx, const BYTE data[])
 	WORD a, b, c, d, e, f, g, h, i, j, t1, t2, m[64];
 
 	for (i = 0, j = 0; i < 16; ++i, j += 4)
-		m[i] = (data[j] << 24) | (data[j + 1] << 16) | (data[j + 2] << 8) | (data[j + 3]);
+		m[i] = ((uint32_t)data[j] << 24) | (data[j + 1] << 16) | (data[j + 2] << 8) | (data[j + 3]);
 	for ( ; i < 64; ++i)
 		m[i] = SIG1(m[i - 2]) + m[i - 7] + SIG0(m[i - 15]) + m[i - 16];
 
diff --git a/extmod/moduasyncio.c b/extmod/moduasyncio.c
index 9717e3856714d..dd2d1e747557c 100644
--- a/extmod/moduasyncio.c
+++ b/extmod/moduasyncio.c
@@ -31,6 +31,9 @@
 
 #if MICROPY_PY_UASYNCIO
 
+// Used when task cannot be guaranteed to be non-NULL.
+#define TASK_PAIRHEAP(task) ((task) ? &(task)->pairheap : NULL)
+
 #define TASK_STATE_RUNNING_NOT_WAITED_ON (mp_const_true)
 #define TASK_STATE_DONE_NOT_WAITED_ON (mp_const_none)
 #define TASK_STATE_DONE_WAS_WAITED_ON (mp_const_false)
@@ -110,7 +113,7 @@ STATIC mp_obj_t task_queue_push_sorted(size_t n_args, const mp_obj_t *args) {
         assert(mp_obj_is_small_int(args[2]));
         task->ph_key = args[2];
     }
-    self->heap = (mp_obj_task_t *)mp_pairheap_push(task_lt, &self->heap->pairheap, &task->pairheap);
+    self->heap = (mp_obj_task_t *)mp_pairheap_push(task_lt, TASK_PAIRHEAP(self->heap), TASK_PAIRHEAP(task));
     return mp_const_none;
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(task_queue_push_sorted_obj, 2, 3, task_queue_push_sorted);
diff --git a/py/binary.c b/py/binary.c
index 5c098b223d6c2..05e658c952411 100644
--- a/py/binary.c
+++ b/py/binary.c
@@ -202,7 +202,7 @@ long long mp_binary_get_int(size_t size, bool is_signed, bool big_endian, const
         delta = 1;
     }
 
-    long long val = 0;
+    unsigned long long val = 0;
     if (is_signed && *src & 0x80) {
         val = -1;
     }
diff --git a/py/mpz.c b/py/mpz.c
index e0d249c214ff5..75e1fb1fdb60f 100644
--- a/py/mpz.c
+++ b/py/mpz.c
@@ -741,7 +741,7 @@ void mpz_set_from_ll(mpz_t *z, long long val, bool is_signed) {
     unsigned long long uval;
     if (is_signed && val < 0) {
         z->neg = 1;
-        uval = -val;
+        uval = -(unsigned long long)val;
     } else {
         z->neg = 0;
         uval = val;
diff --git a/py/objint.c b/py/objint.c
index 00375d388ee9b..5ff5e7de4b574 100644
--- a/py/objint.c
+++ b/py/objint.c
@@ -106,14 +106,14 @@ STATIC mp_fp_as_int_class_t mp_classify_fp_as_int(mp_float_t val) {
         #if MICROPY_FLOAT_IMPL == MICROPY_FLOAT_IMPL_DOUBLE
         e |= u.i[MP_ENDIANNESS_BIG] != 0;
         #endif
-        if ((e & ~(1 << MP_FLOAT_SIGN_SHIFT_I32)) == 0) {
+        if ((e & ~(1U << MP_FLOAT_SIGN_SHIFT_I32)) == 0) {
             // handle case of -0 (when sign is set but rest of bits are zero)
             e = 0;
         } else {
-            e += ((1 << MP_FLOAT_EXP_BITS) - 1) << MP_FLOAT_EXP_SHIFT_I32;
+            e += ((1U << MP_FLOAT_EXP_BITS) - 1) << MP_FLOAT_EXP_SHIFT_I32;
         }
     } else {
-        e &= ~((1 << MP_FLOAT_EXP_SHIFT_I32) - 1);
+        e &= ~((1U << MP_FLOAT_EXP_SHIFT_I32) - 1);
     }
     // 8 * sizeof(uintptr_t) counts the number of bits for a small int
     // TODO provide a way to configure this properly
diff --git a/py/runtime.c b/py/runtime.c
index cda26a9cf85a2..261670d4f304b 100644
--- a/py/runtime.c
+++ b/py/runtime.c
@@ -392,7 +392,7 @@ mp_obj_t mp_binary_op(mp_binary_op_t op, mp_obj_t lhs, mp_obj_t rhs) {
                         goto generic_binary_op;
                     } else {
                         // use standard precision
-                        lhs_val <<= rhs_val;
+                        lhs_val = (mp_uint_t)lhs_val << rhs_val;
                     }
                     break;
                 }
diff --git a/py/showbc.c b/py/showbc.c
index 8941dd7544487..cb81b883596e3 100644
--- a/py/showbc.c
+++ b/py/showbc.c
@@ -174,7 +174,7 @@ const byte *mp_bytecode_print_str(const mp_print_t *print, const byte *ip) {
                 num--;
             }
             do {
-                num = (num << 7) | (*ip & 0x7f);
+                num = ((mp_uint_t)num << 7) | (*ip & 0x7f);
             } while ((*ip++ & 0x80) != 0);
             mp_printf(print, "LOAD_CONST_SMALL_INT " INT_FMT, num);
             break;
diff --git a/py/smallint.h b/py/smallint.h
index 58d843e8a1e35..67daf9b9fa11f 100644
--- a/py/smallint.h
+++ b/py/smallint.h
@@ -37,7 +37,7 @@
 #if MICROPY_OBJ_REPR == MICROPY_OBJ_REPR_A || MICROPY_OBJ_REPR == MICROPY_OBJ_REPR_C
 
 #define MP_SMALL_INT_MIN ((mp_int_t)(((mp_int_t)MP_OBJ_WORD_MSBIT_HIGH) >> 1))
-#define MP_SMALL_INT_FITS(n) ((((n) ^ ((n) << 1)) & MP_OBJ_WORD_MSBIT_HIGH) == 0)
+#define MP_SMALL_INT_FITS(n) ((((n) ^ ((mp_uint_t)(n) << 1)) & MP_OBJ_WORD_MSBIT_HIGH) == 0)
 // Mask to truncate mp_int_t to positive value
 #define MP_SMALL_INT_POSITIVE_MASK ~(MP_OBJ_WORD_MSBIT_HIGH | (MP_OBJ_WORD_MSBIT_HIGH >> 1))
 
diff --git a/py/vm.c b/py/vm.c
index f9a589c9d1da5..5365014fcb13e 100644
--- a/py/vm.c
+++ b/py/vm.c
@@ -312,7 +312,7 @@ FRAME_SETUP();
                     DISPATCH();
 
                 ENTRY(MP_BC_LOAD_CONST_SMALL_INT): {
-                    mp_int_t num = 0;
+                    mp_uint_t num = 0;
                     if ((ip[0] & 0x40) != 0) {
                         // Number is negative
                         num--;

From cb332ddae8075001a1a9e6af0fa8aa191602dee8 Mon Sep 17 00:00:00 2001
From: Amir Gonnen <amirgonnen@gmail.com>
Date: Tue, 15 Jun 2021 09:02:50 +0300
Subject: [PATCH 0998/3533] unix/modffi: Add option to lock GC in callback, and
 cfun access.

Add an optional 'lock' kwarg to callback that locks GC and scheduler.  This
allows the callback to be invoked asynchronously in 'interrupt context',
for example as a signal handler.

Also add the 'cfun' member function to callback, that allows retrieving the
C callback function address.  This is needed when the callback should be
set to a struct field.

See related #7373.

Signed-off-by: Amir Gonnen <amirgonnen@gmail.com>
---
 ports/unix/modffi.c | 76 ++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 71 insertions(+), 5 deletions(-)

diff --git a/ports/unix/modffi.c b/ports/unix/modffi.c
index 12a33619e00e5..0ff37a99f5be3 100644
--- a/ports/unix/modffi.c
+++ b/ports/unix/modffi.c
@@ -36,6 +36,7 @@
 #include "py/binary.h"
 #include "py/mperrno.h"
 #include "py/objint.h"
+#include "py/gc.h"
 
 /*
  * modffi uses character codes to encode a value type, based on "struct"
@@ -100,6 +101,7 @@ typedef struct _mp_obj_fficallback_t {
     void *func;
     ffi_closure *clo;
     char rettype;
+    mp_obj_t pyfunc;
     ffi_cif cif;
     ffi_type *params[];
 } mp_obj_fficallback_t;
@@ -266,19 +268,69 @@ STATIC mp_obj_t mod_ffi_func(mp_obj_t rettype, mp_obj_t addr_in, mp_obj_t argtyp
 }
 MP_DEFINE_CONST_FUN_OBJ_3(mod_ffi_func_obj, mod_ffi_func);
 
-STATIC void call_py_func(ffi_cif *cif, void *ret, void **args, void *func) {
+STATIC void call_py_func(ffi_cif *cif, void *ret, void **args, void *user_data) {
     mp_obj_t pyargs[cif->nargs];
+    mp_obj_fficallback_t *o = user_data;
+    mp_obj_t pyfunc = o->pyfunc;
+
     for (uint i = 0; i < cif->nargs; i++) {
         pyargs[i] = mp_obj_new_int(*(mp_int_t *)args[i]);
     }
-    mp_obj_t res = mp_call_function_n_kw(MP_OBJ_FROM_PTR(func), cif->nargs, 0, pyargs);
+    mp_obj_t res = mp_call_function_n_kw(pyfunc, cif->nargs, 0, pyargs);
 
     if (res != mp_const_none) {
         *(ffi_arg *)ret = mp_obj_int_get_truncated(res);
     }
 }
 
-STATIC mp_obj_t mod_ffi_callback(mp_obj_t rettype_in, mp_obj_t func_in, mp_obj_t paramtypes_in) {
+STATIC void call_py_func_with_lock(ffi_cif *cif, void *ret, void **args, void *user_data) {
+    mp_obj_t pyargs[cif->nargs];
+    mp_obj_fficallback_t *o = user_data;
+    mp_obj_t pyfunc = o->pyfunc;
+    nlr_buf_t nlr;
+
+    #if MICROPY_ENABLE_SCHEDULER
+    mp_sched_lock();
+    #endif
+    gc_lock();
+
+    if (nlr_push(&nlr) == 0) {
+        for (uint i = 0; i < cif->nargs; i++) {
+            pyargs[i] = mp_obj_new_int(*(mp_int_t *)args[i]);
+        }
+        mp_obj_t res = mp_call_function_n_kw(pyfunc, cif->nargs, 0, pyargs);
+
+        if (res != mp_const_none) {
+            *(ffi_arg *)ret = mp_obj_int_get_truncated(res);
+        }
+        nlr_pop();
+    } else {
+        // Uncaught exception
+        mp_printf(MICROPY_ERROR_PRINTER, "Uncaught exception in FFI callback\n");
+        mp_obj_print_exception(MICROPY_ERROR_PRINTER, MP_OBJ_FROM_PTR(nlr.ret_val));
+    }
+
+    gc_unlock();
+    #if MICROPY_ENABLE_SCHEDULER
+    mp_sched_unlock();
+    #endif
+}
+
+STATIC mp_obj_t mod_ffi_callback(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    // first 3 args are positional: retttype, func, paramtypes.
+    mp_obj_t rettype_in = pos_args[0];
+    mp_obj_t func_in = pos_args[1];
+    mp_obj_t paramtypes_in = pos_args[2];
+
+    // arg parsing is used only for additional kwargs
+    enum { ARG_lock };
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_lock,        MP_ARG_KW_ONLY | MP_ARG_BOOL,  {.u_bool = false} },
+    };
+    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
+    mp_arg_parse_all(n_args - 3, pos_args + 3, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
+    bool lock_in = args[ARG_lock].u_bool;
+
     const char *rettype = mp_obj_str_get_str(rettype_in);
 
     mp_int_t nparams = MP_OBJ_SMALL_INT_VALUE(mp_obj_len_maybe(paramtypes_in));
@@ -288,6 +340,7 @@ STATIC mp_obj_t mod_ffi_callback(mp_obj_t rettype_in, mp_obj_t func_in, mp_obj_t
     o->clo = ffi_closure_alloc(sizeof(ffi_closure), &o->func);
 
     o->rettype = *rettype;
+    o->pyfunc = func_in;
 
     mp_obj_iter_buf_t iter_buf;
     mp_obj_t iterable = mp_getiter(paramtypes_in, &iter_buf);
@@ -302,14 +355,15 @@ STATIC mp_obj_t mod_ffi_callback(mp_obj_t rettype_in, mp_obj_t func_in, mp_obj_t
         mp_raise_ValueError(MP_ERROR_TEXT("error in ffi_prep_cif"));
     }
 
-    res = ffi_prep_closure_loc(o->clo, &o->cif, call_py_func, MP_OBJ_TO_PTR(func_in), o->func);
+    res = ffi_prep_closure_loc(o->clo, &o->cif,
+        lock_in? call_py_func_with_lock: call_py_func, o, o->func);
     if (res != FFI_OK) {
         mp_raise_ValueError(MP_ERROR_TEXT("ffi_prep_closure_loc"));
     }
 
     return MP_OBJ_FROM_PTR(o);
 }
-MP_DEFINE_CONST_FUN_OBJ_3(mod_ffi_callback_obj, mod_ffi_callback);
+MP_DEFINE_CONST_FUN_OBJ_KW(mod_ffi_callback_obj, 3, mod_ffi_callback);
 
 STATIC mp_obj_t ffimod_var(mp_obj_t self_in, mp_obj_t vartype_in, mp_obj_t symname_in) {
     mp_obj_ffimod_t *self = MP_OBJ_TO_PTR(self_in);
@@ -493,10 +547,22 @@ STATIC void fficallback_print(const mp_print_t *print, mp_obj_t self_in, mp_prin
     mp_printf(print, "<fficallback %p>", self->func);
 }
 
+STATIC mp_obj_t fficallback_cfun(mp_obj_t self_in) {
+    mp_obj_fficallback_t *self = MP_OBJ_TO_PTR(self_in);
+    return mp_obj_new_int_from_ull((uintptr_t)self->func);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(fficallback_cfun_obj, fficallback_cfun);
+
+STATIC const mp_rom_map_elem_t fficallback_locals_dict_table[] = {
+    { MP_ROM_QSTR(MP_QSTR_cfun), MP_ROM_PTR(&fficallback_cfun_obj) }
+};
+STATIC MP_DEFINE_CONST_DICT(fficallback_locals_dict, fficallback_locals_dict_table);
+
 STATIC const mp_obj_type_t fficallback_type = {
     { &mp_type_type },
     .name = MP_QSTR_fficallback,
     .print = fficallback_print,
+    .locals_dict = (mp_obj_dict_t *)&fficallback_locals_dict
 };
 
 // FFI variable

From b51ae20c0714ea987ac0988c5d02b59e08048632 Mon Sep 17 00:00:00 2001
From: David Lechner <david@pybricks.com>
Date: Sun, 2 Jun 2019 15:57:27 -0500
Subject: [PATCH 0999/3533] py/mperrno: Add MP_ECANCELED error code.

This is useful when binding asynchronous functions in C.

Signed-off-by: David Lechner <david@pybricks.com>
---
 py/mperrno.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/py/mperrno.h b/py/mperrno.h
index 0cad75a17cbf9..6f6d816b8f496 100644
--- a/py/mperrno.h
+++ b/py/mperrno.h
@@ -81,6 +81,7 @@
 #define MP_EHOSTUNREACH     (113) // No route to host
 #define MP_EALREADY         (114) // Operation already in progress
 #define MP_EINPROGRESS      (115) // Operation now in progress
+#define MP_ECANCELED        (125) // Operation canceled
 
 #else
 
@@ -136,6 +137,7 @@
 #define MP_EHOSTUNREACH     EHOSTUNREACH
 #define MP_EALREADY         EALREADY
 #define MP_EINPROGRESS      EINPROGRESS
+#define MP_ECANCELED        ECANCELED
 
 #endif
 

From 6409bbcb720be6c83d1fef3b7da14094b174a783 Mon Sep 17 00:00:00 2001
From: Krzysztof Adamski <k@japko.eu>
Date: Sun, 20 Jun 2021 11:36:55 +0200
Subject: [PATCH 1000/3533] mimxrt: Move calc_weekday helper function to
 timeutils.

This function may be useful for other ports as well so lets move it to
timeutils so it can be reused.

Signed-off-by: Krzysztof Adamski <k@japko.eu>
---
 lib/timeutils/timeutils.c  |  7 +++++++
 lib/timeutils/timeutils.h  |  2 ++
 ports/mimxrt/machine_rtc.c | 10 ++--------
 ports/mimxrt/modutime.c    |  4 +---
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/lib/timeutils/timeutils.c b/lib/timeutils/timeutils.c
index af210d9943bee..7c74f5fc37715 100644
--- a/lib/timeutils/timeutils.c
+++ b/lib/timeutils/timeutils.c
@@ -213,3 +213,10 @@ mp_uint_t timeutils_mktime_2000(mp_uint_t year, mp_int_t month, mp_int_t mday,
     }
     return timeutils_seconds_since_2000(year, month, mday, hours, minutes, seconds);
 }
+
+// Calculate the weekday from the date.
+// The result is zero based with 0 = Monday.
+// by Michael Keith and Tom Craver, 1990.
+int timeutils_calc_weekday(int y, int m, int d) {
+    return ((d += m < 3 ? y-- : y - 2, 23 * m / 9 + d + 4 + y / 4 - y / 100 + y / 400) + 6) % 7;
+}
diff --git a/lib/timeutils/timeutils.h b/lib/timeutils/timeutils.h
index 2d40f773cc53e..66e2a77f139ed 100644
--- a/lib/timeutils/timeutils.h
+++ b/lib/timeutils/timeutils.h
@@ -100,4 +100,6 @@ static inline int64_t timeutils_nanoseconds_since_epoch_to_nanoseconds_since_197
 
 #endif
 
+int timeutils_calc_weekday(int y, int m, int d);
+
 #endif // MICROPY_INCLUDED_LIB_TIMEUTILS_TIMEUTILS_H
diff --git a/ports/mimxrt/machine_rtc.c b/ports/mimxrt/machine_rtc.c
index 76f414925eb5d..d00d139f79078 100644
--- a/ports/mimxrt/machine_rtc.c
+++ b/ports/mimxrt/machine_rtc.c
@@ -26,6 +26,7 @@
  */
 
 #include "py/runtime.h"
+#include "lib/timeutils/timeutils.h"
 #include "modmachine.h"
 #include "ticks.h"
 #include "fsl_snvs_lp.h"
@@ -39,13 +40,6 @@ typedef struct _machine_rtc_obj_t {
 STATIC const machine_rtc_obj_t machine_rtc_obj = {{&machine_rtc_type}};
 uint32_t us_offset = 0;
 
-// Calculate the weekday from the date.
-// The result is zero based with 0 = Monday.
-// by Michael Keith and Tom Craver, 1990.
-int calc_weekday(int y, int m, int d) {
-    return ((d += m < 3 ? y-- : y - 2, 23 * m / 9 + d + 4 + y / 4 - y / 100 + y / 400) + 6) % 7;
-}
-
 STATIC mp_obj_t machine_rtc_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
     // Check arguments.
     mp_arg_check_num(n_args, n_kw, 0, 0, false);
@@ -67,7 +61,7 @@ STATIC mp_obj_t machine_rtc_datetime_helper(size_t n_args, const mp_obj_t *args)
             mp_obj_new_int(srtc_date.year),
             mp_obj_new_int(srtc_date.month),
             mp_obj_new_int(srtc_date.day),
-            mp_obj_new_int(calc_weekday(srtc_date.year, srtc_date.month, srtc_date.day)),
+            mp_obj_new_int(timeutils_calc_weekday(srtc_date.year, srtc_date.month, srtc_date.day)),
             mp_obj_new_int(srtc_date.hour),
             mp_obj_new_int(srtc_date.minute),
             mp_obj_new_int(srtc_date.second),
diff --git a/ports/mimxrt/modutime.c b/ports/mimxrt/modutime.c
index a47bc073f2753..2a88a4224bcd4 100644
--- a/ports/mimxrt/modutime.c
+++ b/ports/mimxrt/modutime.c
@@ -30,8 +30,6 @@
 #include "extmod/utime_mphal.h"
 #include "fsl_snvs_lp.h"
 
-extern int calc_weekday(int y, int m, int d);
-
 // localtime([secs])
 // Convert a time expressed in seconds since the Epoch into an 8-tuple which
 // contains: (year, month, mday, hour, minute, second, weekday, yearday)
@@ -48,7 +46,7 @@ STATIC mp_obj_t time_localtime(size_t n_args, const mp_obj_t *args) {
             mp_obj_new_int(t.hour),
             mp_obj_new_int(t.minute),
             mp_obj_new_int(t.second),
-            mp_obj_new_int(calc_weekday(t.year, t.month, t.day)),
+            mp_obj_new_int(timeutils_calc_weekday(t.year, t.month, t.day)),
             mp_obj_new_int(timeutils_year_day(t.year, t.month, t.day)),
         };
         return mp_obj_new_tuple(8, tuple);

From 35b1359a3ab082515e537bbb9129573e9dda1162 Mon Sep 17 00:00:00 2001
From: Krzysztof Adamski <k@japko.eu>
Date: Sun, 20 Jun 2021 11:44:16 +0200
Subject: [PATCH 1001/3533] rp2: Use 0=Monday datetime convention in RTC.

The RTC in rp2 can store any, even wrong, number as a weekday in RTC.  It
was, however, discussed in #7394 that we would like to unify all ports and
use 0 as Monday, not Sunday in the machine.RTC implementation.

This patch makes sure that the default date set in RTC is adheres to this
convention.  It also fixes the example in quickref to use proper weekday to
avoid confusion.

Signed-off-by: Krzysztof Adamski <k@japko.eu>
---
 docs/rp2/quickref.rst | 2 +-
 ports/rp2/main.c      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/rp2/quickref.rst b/docs/rp2/quickref.rst
index 6bbe1795415f0..4c8c02dc0cc5b 100644
--- a/docs/rp2/quickref.rst
+++ b/docs/rp2/quickref.rst
@@ -202,7 +202,7 @@ See :ref:`machine.RTC <machine.RTC>` ::
     from machine import RTC
 
     rtc = RTC()
-    rtc.datetime((2017, 8, 23, 1, 12, 48, 0, 0)) # set a specific date and time
+    rtc.datetime((2017, 8, 23, 2, 12, 48, 0, 0)) # set a specific date and time
     rtc.datetime() # get date and time
 
 WDT (Watchdog timer)
diff --git a/ports/rp2/main.c b/ports/rp2/main.c
index 7709a478bc80a..8c5772171aac9 100644
--- a/ports/rp2/main.c
+++ b/ports/rp2/main.c
@@ -80,7 +80,7 @@ int main(int argc, char **argv) {
         .year = 2021,
         .month = 1,
         .day = 1,
-        .dotw = 5, // 0 is Sunday, so 5 is Friday
+        .dotw = 4, // 0 is Monday, so 4 is Friday
         .hour = 0,
         .min = 0,
         .sec = 0,

From feb7e2e864639d82cc22729d4011b8ea663e9d1d Mon Sep 17 00:00:00 2001
From: Krzysztof Adamski <k@japko.eu>
Date: Sun, 20 Jun 2021 11:49:56 +0200
Subject: [PATCH 1002/3533] rp2/machine_rtc: In RTC.datetime, compute weekday
 automatically.

Calculating the weekday each time you want to set a date is error prone and
tiresome.  MicroPython can do it on its own - hardware on some ports do not
support storing weekday in hardware and always computes it on the fly,
ignoring the value given to the constructor.

During discussion for #7432 the conclusion was that there seems to be no
obvious reason to let user set the weekday to an incorrect value so it
makes sense to just ignore the provided weekday value and always compute
the correct value.  This patch introduces this change for the rp2 port.

Signed-off-by: Krzysztof Adamski <k@japko.eu>
---
 ports/rp2/machine_rtc.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ports/rp2/machine_rtc.c b/ports/rp2/machine_rtc.c
index 797bee5ed3f15..a7c55b616b175 100644
--- a/ports/rp2/machine_rtc.c
+++ b/ports/rp2/machine_rtc.c
@@ -94,11 +94,12 @@ STATIC mp_obj_t machine_rtc_datetime(mp_uint_t n_args, const mp_obj_t *args) {
             .year = mp_obj_get_int(items[0]),
             .month = mp_obj_get_int(items[1]),
             .day = mp_obj_get_int(items[2]),
-            .dotw = mp_obj_get_int(items[3]),
             .hour = mp_obj_get_int(items[4]),
             .min = mp_obj_get_int(items[5]),
             .sec = mp_obj_get_int(items[6]),
         };
+        // Deliberately ignore the weekday argument and compute the proper value
+        t.dotw = timeutils_calc_weekday(t.year, t.month, t.day);
 
         if (!rtc_set_datetime(&t)) {
             mp_raise_OSError(MP_EINVAL);

From 8cebd56a11be1d3fbc87344f4e18fcdec6382b37 Mon Sep 17 00:00:00 2001
From: David Lechner <david@pybricks.com>
Date: Thu, 24 Jun 2021 10:52:47 -0500
Subject: [PATCH 1003/3533] tools/ci.sh: Run apt-get update in
 ci_powerpc_setup.

This fixes failing builds when the GitHub CI image lags behind Ubuntu
security updates.
---
 tools/ci.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/ci.sh b/tools/ci.sh
index 30395733225c1..6d7c643f5d82e 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -172,6 +172,7 @@ function ci_nrf_build {
 # ports/powerpc
 
 function ci_powerpc_setup {
+    sudo apt-get update
     sudo apt-get install gcc-powerpc64le-linux-gnu libc6-dev-ppc64el-cross
 }
 

From 115acadf9211fddc8b5857af287daa622dc615c1 Mon Sep 17 00:00:00 2001
From: David Lechner <david@lechnology.com>
Date: Mon, 1 Jun 2020 12:18:58 -0500
Subject: [PATCH 1004/3533] mpy-cross: Disable stack check when building with
 Emscripten.

`mpy-cross` can be compiled to WASM using Emscripten, but it is not happy
unless the stack check is disabled.

Signed-off-by: David Lechner <david@pybricks.com>
---
 mpy-cross/mpconfigport.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/mpy-cross/mpconfigport.h b/mpy-cross/mpconfigport.h
index 7ff3d1b6b4b09..96d3726562925 100644
--- a/mpy-cross/mpconfigport.h
+++ b/mpy-cross/mpconfigport.h
@@ -62,7 +62,9 @@
 #define MICROPY_READER_POSIX        (1)
 #define MICROPY_ENABLE_RUNTIME      (0)
 #define MICROPY_ENABLE_GC           (1)
+#ifndef __EMSCRIPTEN__
 #define MICROPY_STACK_CHECK         (1)
+#endif
 #define MICROPY_HELPER_LEXER_UNIX   (1)
 #define MICROPY_LONGINT_IMPL        (MICROPY_LONGINT_IMPL_MPZ)
 #define MICROPY_ENABLE_SOURCE_LINE  (1)

From 08e0e065f4fa26cb1f52567ad53052310bc656e6 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 24 Jun 2021 09:43:54 +1000
Subject: [PATCH 1005/3533] py/makeqstrdefs.py: Don't include .h files
 explicitly in preprocessing.

Only include .c and .cpp files explicitly in the list of files passed to
the preprocessor for QSTR extraction.  All relevant .h files will be
included in this process by "#include" from the .c(pp) files.  In
particular for moduledefs.h, this is included by py/objmodule.c (and
doesn't actually contain any extractable MP_QSTR_xxx, but rather defines
macros with MP_QSTR_xxx's in them which are then part of py/objmodule.c).

The main reason for this change is to simplify the preprocessing step on
the javascript port, which tries to compile .h files as C++ precompiled
headers if they are passed with -E to clang.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/makeqstrdefs.py | 2 +-
 py/mkrules.mk      | 2 +-
 py/py.mk           | 2 --
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/py/makeqstrdefs.py b/py/makeqstrdefs.py
index ad4f22d5e4cf3..187a9aeeaa48a 100644
--- a/py/makeqstrdefs.py
+++ b/py/makeqstrdefs.py
@@ -34,7 +34,7 @@ def preprocess():
     for source in sources:
         if source.endswith(".cpp"):
             cxxsources.append(source)
-        else:
+        elif source.endswith(".c"):
             csources.append(source)
     try:
         os.makedirs(os.path.dirname(args.output[0]))
diff --git a/py/mkrules.mk b/py/mkrules.mk
index eb8477cbb1d8b..b8d07ef56d551 100644
--- a/py/mkrules.mk
+++ b/py/mkrules.mk
@@ -100,7 +100,7 @@ $(OBJ): | $(HEADER_BUILD)/qstrdefs.generated.h $(HEADER_BUILD)/mpversion.h $(OBJ
 # - else, if list of newer prerequisites ($?) is not empty, then process just these ($?)
 # - else, process all source files ($^) [this covers "make -B" which can set $? to empty]
 # See more information about this process in docs/develop/qstr.rst.
-$(HEADER_BUILD)/qstr.i.last: $(SRC_QSTR) $(QSTR_GLOBAL_DEPENDENCIES) | $(QSTR_GLOBAL_REQUIREMENTS)
+$(HEADER_BUILD)/qstr.i.last: $(SRC_QSTR) $(QSTR_GLOBAL_DEPENDENCIES) $(HEADER_BUILD)/moduledefs.h | $(QSTR_GLOBAL_REQUIREMENTS)
 	$(ECHO) "GEN $@"
 	$(Q)$(PYTHON) $(PY_SRC)/makeqstrdefs.py pp $(CPP) output $(HEADER_BUILD)/qstr.i.last cflags $(QSTR_GEN_CFLAGS) cxxflags $(QSTR_GEN_CXXFLAGS) sources $^ dependencies $(QSTR_GLOBAL_DEPENDENCIES) changed_sources $?
 
diff --git a/py/py.mk b/py/py.mk
index 59abc8f50373b..ab01b0ec21e9f 100644
--- a/py/py.mk
+++ b/py/py.mk
@@ -269,8 +269,6 @@ $(HEADER_BUILD)/moduledefs.h: $(SRC_QSTR) $(QSTR_GLOBAL_DEPENDENCIES) | $(HEADER
 	@$(ECHO) "GEN $@"
 	$(Q)$(PYTHON) $(PY_SRC)/makemoduledefs.py --vpath="., $(TOP), $(USER_C_MODULES)" $(SRC_QSTR) > $@
 
-SRC_QSTR += $(HEADER_BUILD)/moduledefs.h
-
 # Standard C functions like memset need to be compiled with special flags so
 # the compiler does not optimise these functions in terms of themselves.
 CFLAGS_BUILTIN ?= -ffreestanding -fno-builtin -fno-lto

From cfd08448a1cba0040ad3c62bce02b5f8bd76dd1d Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 24 Jun 2021 11:45:13 +1000
Subject: [PATCH 1006/3533] py: Mark unused arguments from bytecode decoding
 macros.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/bc.h     | 7 +++++--
 py/objfun.c | 3 ++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/py/bc.h b/py/bc.h
index 16f314e19936f..ef5afeae16577 100644
--- a/py/bc.h
+++ b/py/bc.h
@@ -128,7 +128,9 @@
 
 #define MP_BC_PRELUDE_SIG_DECODE(ip) \
     size_t n_state, n_exc_stack, scope_flags, n_pos_args, n_kwonly_args, n_def_pos_args; \
-    MP_BC_PRELUDE_SIG_DECODE_INTO(ip, n_state, n_exc_stack, scope_flags, n_pos_args, n_kwonly_args, n_def_pos_args)
+    MP_BC_PRELUDE_SIG_DECODE_INTO(ip, n_state, n_exc_stack, scope_flags, n_pos_args, n_kwonly_args, n_def_pos_args); \
+    (void)n_state; (void)n_exc_stack; (void)scope_flags; \
+    (void)n_pos_args; (void)n_kwonly_args; (void)n_def_pos_args
 
 #define MP_BC_PRELUDE_SIZE_ENCODE(I, C, out_byte, out_env)      \
     do {                                                            \
@@ -163,7 +165,8 @@
 
 #define MP_BC_PRELUDE_SIZE_DECODE(ip) \
     size_t n_info, n_cell; \
-    MP_BC_PRELUDE_SIZE_DECODE_INTO(ip, n_info, n_cell)
+    MP_BC_PRELUDE_SIZE_DECODE_INTO(ip, n_info, n_cell); \
+    (void)n_info; (void)n_cell
 
 // Sentinel value for mp_code_state_t.exc_sp_idx
 #define MP_CODE_STATE_EXC_SP_IDX_SENTINEL ((uint16_t)-1)
diff --git a/py/objfun.c b/py/objfun.c
index 178f834431cf1..d86a4d235a24a 100644
--- a/py/objfun.c
+++ b/py/objfun.c
@@ -200,7 +200,8 @@ STATIC void dump_args(const mp_obj_t *a, size_t sz) {
         const uint8_t *ip = bytecode; \
         size_t n_exc_stack, scope_flags, n_pos_args, n_kwonly_args, n_def_args; \
         MP_BC_PRELUDE_SIG_DECODE_INTO(ip, n_state_out_var, n_exc_stack, scope_flags, n_pos_args, n_kwonly_args, n_def_args); \
-                                    \
+        (void)scope_flags; (void)n_pos_args; (void)n_kwonly_args; (void)n_def_args; \
+        \
         /* state size in bytes */                                                 \
         state_size_out_var = n_state_out_var * sizeof(mp_obj_t)                   \
             + n_exc_stack * sizeof(mp_exc_stack_t);                \

From c13853f4dab9c65ee6d1af99b25f999b16ef2827 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 24 Jun 2021 10:04:15 +1000
Subject: [PATCH 1007/3533] javascript: Rework Makefile and GC so it works with
 latest Emscripten.

The GC now works correctly using asyncify and the functions
emscripten_scan_stack() and emscripten_scan_registers().  Stack/call depth
is monitored via the use of the pystack option.

Fixes issue #6738.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/javascript/JSBackend.patch | 10 ----------
 ports/javascript/Makefile        | 26 +++++++++-----------------
 ports/javascript/README.md       | 22 ++++++----------------
 ports/javascript/main.c          | 21 ++++++++-------------
 4 files changed, 23 insertions(+), 56 deletions(-)
 delete mode 100644 ports/javascript/JSBackend.patch

diff --git a/ports/javascript/JSBackend.patch b/ports/javascript/JSBackend.patch
deleted file mode 100644
index a5fd41a3fbe38..0000000000000
--- a/ports/javascript/JSBackend.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- JSBackend.cpp	2018-01-10 16:35:07.331418145 +1100
-+++ JSBackend_mp_js.cpp	2018-01-10 16:40:04.804633134 +1100
-@@ -4280,6 +4280,7 @@
- 
- void JSWriter::calculateNativizedVars(const Function *F) {
-   NativizedVars.clear();
-+  return;
- 
-   for (Function::const_iterator I = F->begin(), BE = F->end(); I != BE; ++I) {
-     auto BI = &*I;
diff --git a/ports/javascript/Makefile b/ports/javascript/Makefile
index 97236755464cb..171f53b95286f 100644
--- a/ports/javascript/Makefile
+++ b/ports/javascript/Makefile
@@ -6,24 +6,16 @@ QSTR_DEFS = qstrdefsport.h
 
 include $(TOP)/py/py.mk
 
-CC = emcc -g4
-LD = emcc -g4
+CC = emcc
+LD = emcc
 
 INC += -I.
 INC += -I$(TOP)
 INC += -I$(BUILD)
 
-CPP = clang -E
-
-ifdef EMSCRIPTEN
-    CPP += -isystem $(EMSCRIPTEN)/system/include/libc -cxx-isystem $(EMSCRIPTEN)/system/include/libcxx
-endif
-
-CFLAGS = -m32 -Wall -Werror -Wdouble-promotion -Wfloat-conversion $(INC) -std=c99 $(COPT)
-LDFLAGS = -m32 -Wl,-Map=$@.map,--cref -Wl,--gc-sections
-
-CFLAGS += -O0 -DNDEBUG
-CFLAGS += -fdata-sections -ffunction-sections
+CFLAGS += -std=c99 -Wall -Werror -Wdouble-promotion -Wfloat-conversion
+CFLAGS += -O3 -DNDEBUG
+CFLAGS += $(INC)
 
 ifneq ($(FROZEN_MPY_DIR),)
 # To use frozen bytecode, put your .py files in a subdirectory (eg frozen/) and
@@ -46,12 +38,12 @@ SRC_C = \
 
 SRC_QSTR += $(SRC_C)
 
-OBJ = 
-OBJ = $(PY_O) 
+OBJ += $(PY_O)
 OBJ += $(addprefix $(BUILD)/, $(SRC_LIB:.c=.o))
 OBJ += $(addprefix $(BUILD)/, $(SRC_C:.c=.o))
 
-JSFLAGS = -O0 -s EXPORTED_FUNCTIONS="['_mp_js_init', '_mp_js_init_repl', '_mp_js_do_str', '_mp_js_process_char', '_mp_hal_get_interrupt_char', '_mp_sched_keyboard_interrupt']" -s EXTRA_EXPORTED_RUNTIME_METHODS="['ccall', 'cwrap']" -s "BINARYEN_TRAP_MODE='clamp'" --memory-init-file 0 --js-library library.js
+JSFLAGS += -s ASYNCIFY
+JSFLAGS += -s EXPORTED_FUNCTIONS="['_mp_js_init', '_mp_js_init_repl', '_mp_js_do_str', '_mp_js_process_char', '_mp_hal_get_interrupt_char', '_mp_sched_keyboard_interrupt']" -s EXTRA_EXPORTED_RUNTIME_METHODS="['ccall', 'cwrap']" -s --memory-init-file 0 --js-library library.js
 
 all: $(BUILD)/micropython.js
 
@@ -65,6 +57,6 @@ min: $(BUILD)/micropython.js
 
 test: $(BUILD)/micropython.js $(TOP)/tests/run-tests.py
 	$(eval DIRNAME=ports/$(notdir $(CURDIR)))
-	cd $(TOP)/tests && MICROPY_MICROPYTHON=../ports/javascript/node_run.sh ./run-tests.py
+	cd $(TOP)/tests && MICROPY_MICROPYTHON=../ports/javascript/node_run.sh ./run-tests.py -j1
 
 include $(TOP)/py/mkrules.mk
diff --git a/ports/javascript/README.md b/ports/javascript/README.md
index ac268bb3bfddf..39808943b1043 100644
--- a/ports/javascript/README.md
+++ b/ports/javascript/README.md
@@ -7,17 +7,7 @@ Dependencies
 ------------
 
 Building micropython.js bears the same requirements as the standard MicroPython
-ports with the addition of Emscripten (and uglify-js for the minified file). 
-
-A standard installation of Emscripten should provide functional code, however
-if memory errors are encountered it may be worthwhile to modify the tool.
-`emscripten-fastcomp/lib/Target/JSBackend.cpp` may require the minor fix 
-found in JSBackend.patch. This patch attempts to address situations where
-C code running through Emscripten is denied access to Javascript variables 
-leading to false-positives in the MicroPython garbage collector as variables 
-with pointers exclusively in Javascript will be erased prematurely.
-Refer to Emscripten documentation for instructions on building Emscripten 
-from source.
+ports with the addition of Emscripten (and uglify-js for the minified file).
 
 Build instructions
 ------------------
@@ -39,15 +29,15 @@ Access the repl with:
 
 Stack size may be modified using:
 
-	$ node build/micropython.js -X stack=64K
+    $ node build/micropython.js -X stack=64K
 
 Where stack size may be represented in Bytes, KiB or MiB.
 
 MicroPython scripts may be executed using:
 
-	$ node build/micropython.js hello.py
+    $ node build/micropython.js hello.py
 
-Alternatively micropython.js may by accessed by other javascript programs in node 
+Alternatively micropython.js may by accessed by other javascript programs in node
 using the require command and the general API outlined below. For example:
 
 ```javascript
@@ -85,7 +75,7 @@ demonstrates basic functionality:
 ```
 
 MicroPython code execution will suspend the browser so be sure to atomize usage
-within this environment. Unfortunately interrupts have not been implemented for the 
+within this environment. Unfortunately interrupts have not been implemented for the
 browser.
 
 Testing
@@ -124,5 +114,5 @@ the repl.
 mp_js_process_char(char)
 ```
 
-Input character into MicroPython repl. `char` must be of type `number`. This 
+Input character into MicroPython repl. `char` must be of type `number`. This
 will execute MicroPython code when necessary.
diff --git a/ports/javascript/main.c b/ports/javascript/main.c
index 5d295f92956e9..c56f1a2cba8e3 100644
--- a/ports/javascript/main.c
+++ b/ports/javascript/main.c
@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2013, 2014 Damien P. George and 2017, 2018 Rami Ali
+ * Copyright (c) 2013-2021 Damien P. George and 2017, 2018 Rami Ali
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -36,6 +36,7 @@
 #include "py/mperrno.h"
 #include "lib/utils/pyexec.h"
 
+#include "emscripten.h"
 #include "library.h"
 
 #if MICROPY_ENABLE_COMPILER
@@ -70,8 +71,6 @@ int do_str(const char *src, mp_parse_input_kind_t input_kind) {
 }
 #endif
 
-static char *stack_top;
-
 int mp_js_do_str(const char *code) {
     return do_str(code, MP_PARSE_FILE_INPUT);
 }
@@ -81,9 +80,6 @@ int mp_js_process_char(int c) {
 }
 
 void mp_js_init(int heap_size) {
-    int stack_dummy;
-    stack_top = (char *)&stack_dummy;
-
     #if MICROPY_ENABLE_GC
     char *heap = (char *)malloc(heap_size * sizeof(char));
     gc_init(heap, heap + heap_size);
@@ -105,15 +101,14 @@ void mp_js_init_repl() {
     pyexec_event_repl_init();
 }
 
+STATIC void gc_scan_func(void *begin, void *end) {
+    gc_collect_root((void **)begin, (void **)end - (void **)begin + 1);
+}
+
 void gc_collect(void) {
-    // WARNING: This gc_collect implementation doesn't try to get root
-    // pointers from CPU registers, and thus may function incorrectly.
-    jmp_buf dummy;
-    if (setjmp(dummy) == 0) {
-        longjmp(dummy, 1);
-    }
     gc_collect_start();
-    gc_collect_root((void *)stack_top, ((mp_uint_t)(void *)(&dummy + 1) - (mp_uint_t)stack_top) / sizeof(mp_uint_t));
+    emscripten_scan_stack(gc_scan_func);
+    emscripten_scan_registers(gc_scan_func);
     gc_collect_end();
 }
 

From 2dc4f843bcadeeeeda3f2af81dd700733babe5eb Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 24 Jun 2021 10:09:57 +1000
Subject: [PATCH 1008/3533] github/workflows: Add workflow to build and test
 javascript port.

Signed-off-by: Damien George <damien@micropython.org>
---
 .github/workflows/ports_javascript.yml | 24 ++++++++++++++++++++++++
 tools/ci.sh                            | 18 ++++++++++++++++++
 2 files changed, 42 insertions(+)
 create mode 100644 .github/workflows/ports_javascript.yml

diff --git a/.github/workflows/ports_javascript.yml b/.github/workflows/ports_javascript.yml
new file mode 100644
index 0000000000000..244dc966aa6d9
--- /dev/null
+++ b/.github/workflows/ports_javascript.yml
@@ -0,0 +1,24 @@
+name: javascript port
+
+on:
+  push:
+  pull_request:
+    paths:
+      - '.github/workflows/*.yml'
+      - 'tools/**'
+      - 'py/**'
+      - 'extmod/**'
+      - 'lib/**'
+      - 'ports/javascript/**'
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Install packages
+      run: source tools/ci.sh && ci_javascript_setup
+    - name: Build
+      run: source tools/ci.sh && ci_javascript_build
+    - name: Run tests
+      run: source tools/ci.sh && ci_javascript_run_tests
diff --git a/tools/ci.sh b/tools/ci.sh
index 6d7c643f5d82e..a82eedd20dcba 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -138,6 +138,24 @@ function ci_esp8266_build {
     make ${MAKEOPTS} -C ports/esp8266 BOARD=GENERIC_1M
 }
 
+########################################################################################
+# ports/javascript
+
+function ci_javascript_setup {
+    git clone https://github.com/emscripten-core/emsdk.git
+    (cd emsdk && ./emsdk install latest && ./emsdk activate latest)
+}
+
+function ci_javascript_build {
+    source emsdk/emsdk_env.sh
+    make ${MAKEOPTS} -C ports/javascript
+}
+
+function ci_javascript_run_tests {
+    # This port is very slow at running, so only run a few of the tests.
+    (cd tests && MICROPY_MICROPYTHON=../ports/javascript/node_run.sh ./run-tests.py -j1 basics/builtin_*.py)
+}
+
 ########################################################################################
 # ports/mimxrt
 

From 180c54d6cc4e744082f7f76f484646db47d25adb Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 25 Jun 2021 11:09:31 +1000
Subject: [PATCH 1009/3533] tests/extmod: Make uasyncio_heaplock test more
 deterministic.

This helps the test pass on systems with an inaccurate sleep time.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/extmod/uasyncio_heaplock.py     | 6 +++---
 tests/extmod/uasyncio_heaplock.py.exp | 2 --
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/tests/extmod/uasyncio_heaplock.py b/tests/extmod/uasyncio_heaplock.py
index 771d3f0d97ab7..3a92d36c9f57b 100644
--- a/tests/extmod/uasyncio_heaplock.py
+++ b/tests/extmod/uasyncio_heaplock.py
@@ -29,15 +29,15 @@ async def task(id, n, t):
 
 
 async def main():
-    t1 = asyncio.create_task(task(1, 4, 10))
-    t2 = asyncio.create_task(task(2, 4, 25))
+    t1 = asyncio.create_task(task(1, 4, 20))
+    t2 = asyncio.create_task(task(2, 2, 50))
 
     micropython.heap_lock()
 
     print("start")
     await asyncio.sleep_ms(1)
     print("sleep")
-    await asyncio.sleep_ms(100)
+    await asyncio.sleep_ms(70)
     print("finish")
 
     micropython.heap_unlock()
diff --git a/tests/extmod/uasyncio_heaplock.py.exp b/tests/extmod/uasyncio_heaplock.py.exp
index a967cc319712f..68c6366c6f1bf 100644
--- a/tests/extmod/uasyncio_heaplock.py.exp
+++ b/tests/extmod/uasyncio_heaplock.py.exp
@@ -6,6 +6,4 @@ sleep
 1 2
 2 1
 1 3
-2 2
-2 3
 finish

From 30422ca7c24f02ea34fdbc61466d5fb4baa0af8a Mon Sep 17 00:00:00 2001
From: Jonathan Hogg <me@jonathanhogg.com>
Date: Thu, 24 Jun 2021 15:34:16 +0100
Subject: [PATCH 1010/3533] esp32/esp32_rmt: Fix RMT looping in newer IDF
 versions.

When looping, now disable the TX interrupt after calling rmt_write_items()
function to handle change in IDF behaviour (since v4.1).  Also check length
of pulses to ensure it fits hardware limit.

Fixes issue #7403.
---
 ports/esp32/esp32_rmt.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/ports/esp32/esp32_rmt.c b/ports/esp32/esp32_rmt.c
index 9619b1dd5bd01..8c8f0f2e06ca5 100644
--- a/ports/esp32/esp32_rmt.c
+++ b/ports/esp32/esp32_rmt.c
@@ -218,6 +218,10 @@ STATIC mp_obj_t esp32_rmt_write_pulses(size_t n_args, const mp_obj_t *pos_args,
     mp_obj_get_array(pulses, &pulses_length, &pulses_ptr);
 
     mp_uint_t num_items = (pulses_length / 2) + (pulses_length % 2);
+    if (self->loop_en && num_items > 63) {
+        mp_raise_ValueError(MP_ERROR_TEXT("too many pulses for loop"));
+    }
+
     if (num_items > self->num_items) {
         self->items = (rmt_item32_t *)m_realloc(self->items, num_items * sizeof(rmt_item32_t *));
         self->num_items = num_items;
@@ -241,12 +245,12 @@ STATIC mp_obj_t esp32_rmt_write_pulses(size_t n_args, const mp_obj_t *pos_args,
             check_esp_err(rmt_set_tx_loop_mode(self->channel_id, false));
         }
         check_esp_err(rmt_wait_tx_done(self->channel_id, portMAX_DELAY));
-        check_esp_err(rmt_set_tx_intr_en(self->channel_id, false));
     }
 
     check_esp_err(rmt_write_items(self->channel_id, self->items, num_items, false /* non-blocking */));
 
     if (self->loop_en) {
+        check_esp_err(rmt_set_tx_intr_en(self->channel_id, false));
         check_esp_err(rmt_set_tx_loop_mode(self->channel_id, true));
     }
 

From c940597314e504e1e3d59bfb6f6e667c9708ba79 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 25 Jun 2021 12:01:46 +1000
Subject: [PATCH 1011/3533] github/workflows: Switch from Coveralls to Codecov.

As discussed in #7455, Coveralls doesn't work properly anymore, it has
many spurious errors with reduced coverage.

Signed-off-by: Damien George <damien@micropython.org>
---
 .github/workflows/ports_unix.yml | 8 +++++---
 README.md                        | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ports_unix.yml b/.github/workflows/ports_unix.yml
index c6ddd53037173..ffba437f16655 100644
--- a/.github/workflows/ports_unix.yml
+++ b/.github/workflows/ports_unix.yml
@@ -70,10 +70,12 @@ jobs:
         mkdir -p coverage
         lcov --rc lcov_branch_coverage=1 --directory ports/unix/build-coverage --capture --output-file coverage/lcov.info.all
         lcov --remove coverage/lcov.info.all '*/lib/*' '*/ports/unix/*' '*/utils/*' --output-file coverage/lcov.info
-    - name: Send to coveralls
-      uses: coverallsapp/github-action@master
+    - name: Upload coverage to Codecov
+      uses: codecov/codecov-action@v1
       with:
-        github-token: ${{ secrets.GITHUB_TOKEN }}
+        files: coverage/lcov.info
+        fail_ci_if_error: true
+        verbose: true
     - name: Print failures
       if: failure()
       run: tests/run-tests.py --print-failures
diff --git a/README.md b/README.md
index f75590a5ba7d0..d197924f0e759 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-[![CI badge](https://github.com/micropython/micropython/workflows/unix%20port/badge.svg)](https://github.com/micropython/micropython/actions?query=branch%3Amaster+event%3Apush) [![Coverage badge](https://coveralls.io/repos/micropython/micropython/badge.png?branch=master)](https://coveralls.io/r/micropython/micropython?branch=master)
+[![CI badge](https://github.com/micropython/micropython/workflows/unix%20port/badge.svg)](https://github.com/micropython/micropython/actions?query=branch%3Amaster+event%3Apush) [![codecov](https://codecov.io/gh/micropython/micropython/branch/master/graph/badge.svg?token=I92PfD05sD)](https://codecov.io/gh/micropython/micropython)
 
 The MicroPython project
 =======================

From f3e4ed82a11243dfed0e0370ab0d77e947ff6d34 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sat, 26 Jun 2021 12:16:31 +1000
Subject: [PATCH 1012/3533] github/workflows: Switch from lcov to gcov.

Coverage calculated by Codecov has the same reliability/deterministic
issues as Coveralls did, so the problem is likely to do with the output of
lcov/gcov, rather than the analysis and display of the data.

Switch from lcov to gcov for data generation to try and simplify this
process of computing coverage.

Signed-off-by: Damien George <damien@micropython.org>
---
 .github/workflows/ports_unix.yml | 8 +++-----
 tools/ci.sh                      | 1 -
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/ports_unix.yml b/.github/workflows/ports_unix.yml
index ffba437f16655..673e6152fa94a 100644
--- a/.github/workflows/ports_unix.yml
+++ b/.github/workflows/ports_unix.yml
@@ -65,15 +65,13 @@ jobs:
       run: source tools/ci.sh && ci_native_mpy_modules_build
     - name: Test importing .mpy generated by mpy_ld.py
       run: source tools/ci.sh && ci_unix_coverage_run_native_mpy_tests
-    - name: Run lcov coverage analysis
+    - name: Run gcov coverage analysis
       run: |
-        mkdir -p coverage
-        lcov --rc lcov_branch_coverage=1 --directory ports/unix/build-coverage --capture --output-file coverage/lcov.info.all
-        lcov --remove coverage/lcov.info.all '*/lib/*' '*/ports/unix/*' '*/utils/*' --output-file coverage/lcov.info
+        (cd ports/unix && gcov -o build-coverage/py ../../py/*.c || true)
+        (cd ports/unix && gcov -o build-coverage/extmod ../../extmod/*.c || true)
     - name: Upload coverage to Codecov
       uses: codecov/codecov-action@v1
       with:
-        files: coverage/lcov.info
         fail_ci_if_error: true
         verbose: true
     - name: Print failures
diff --git a/tools/ci.sh b/tools/ci.sh
index a82eedd20dcba..ec122129dd979 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -394,7 +394,6 @@ function ci_unix_standard_run_perfbench {
 }
 
 function ci_unix_coverage_setup {
-    sudo apt-get install lcov
     sudo pip3 install setuptools
     sudo pip3 install pyelftools
     gcc --version

From f45412793e78cd5013b83b8de5219183eb53eca5 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Wed, 9 Jun 2021 10:47:18 +0200
Subject: [PATCH 1013/3533] mimxrt/machine_spi: Add the SPI class to the
 machine module.

This class supports SPI bus controller mode, with blocking transfers.

SPI device numbers start at 0, to comply with the pinout of the Teensy
boards.  With the configured clock frequency the fastest baud rate is
33MHz.  For messages longer 16 bytes DMA is used.  The class uses the
existing framework with extmod/machine_spi.c.

Extended driver options:

- drive=n with n being between 1 and 6 or PIN.POWER_1 to PIN.POWER_6.
  Since the pins used by the SPI are fixed, no Pin settings can be made.
  Thus the drive option is added allowing to control ringing and crosstalk
  on the connection.

- gap_ns=nnnnn is the time between sent data items in a frame given in ns.
  Default is 2 clock cycles.
---
 ports/mimxrt/Makefile                         |   8 +
 .../boards/MIMXRT1010_EVK/mpconfigboard.h     |   9 +
 .../boards/MIMXRT1020_EVK/mpconfigboard.h     |  16 +
 .../boards/MIMXRT1050_EVK/mpconfigboard.h     |  12 +
 .../boards/MIMXRT1060_EVK/mpconfigboard.h     |  12 +
 .../boards/MIMXRT1064_EVK/mpconfigboard.h     |  12 +
 ports/mimxrt/boards/TEENSY40/mpconfigboard.h  |  18 +
 ports/mimxrt/boards/TEENSY41/mpconfigboard.h  |  18 +
 ports/mimxrt/dma_channel.c                    |  51 +++
 ports/mimxrt/dma_channel.h                    |  34 ++
 ports/mimxrt/machine_spi.c                    | 334 ++++++++++++++++++
 ports/mimxrt/modmachine.c                     |   1 +
 ports/mimxrt/modmachine.h                     |   1 +
 13 files changed, 526 insertions(+)
 create mode 100644 ports/mimxrt/dma_channel.c
 create mode 100644 ports/mimxrt/dma_channel.h
 create mode 100644 ports/mimxrt/machine_spi.c

diff --git a/ports/mimxrt/Makefile b/ports/mimxrt/Makefile
index 3b530a970078b..870248373e47b 100644
--- a/ports/mimxrt/Makefile
+++ b/ports/mimxrt/Makefile
@@ -116,10 +116,15 @@ SRC_HAL_IMX_C += \
 	$(MCU_DIR)/xip/fsl_flexspi_nor_boot.c \
 	$(MCU_DIR)/project_template/clock_config.c \
 	$(MCU_DIR)/drivers/fsl_adc.c \
+	$(MCU_DIR)/drivers/fsl_cache.c \
 	$(MCU_DIR)/drivers/fsl_clock.c \
+	$(MCU_DIR)/drivers/fsl_dmamux.c \
+	$(MCU_DIR)/drivers/fsl_edma.c \
 	$(MCU_DIR)/drivers/fsl_gpio.c \
 	$(MCU_DIR)/drivers/fsl_gpt.c \
 	$(MCU_DIR)/drivers/fsl_common.c \
+	$(MCU_DIR)/drivers/fsl_lpspi.c \
+	$(MCU_DIR)/drivers/fsl_lpspi_edma.c \
 	$(MCU_DIR)/drivers/fsl_lpuart.c \
 	$(MCU_DIR)/drivers/fsl_flexram.c \
 	$(MCU_DIR)/drivers/fsl_flexspi.c \
@@ -134,11 +139,13 @@ SRC_C = \
 	ticks.c \
 	tusb_port.c \
 	board_init.c \
+	dma_channel.c \
 	$(BOARD_DIR)/flash_config.c \
 	machine_adc.c \
 	machine_led.c \
 	machine_pin.c \
 	machine_rtc.c \
+	machine_spi.c \
 	machine_timer.c \
 	machine_uart.c \
 	mimxrt_flash.c \
@@ -265,6 +272,7 @@ SRC_QSTR += \
 	machine_led.c \
 	machine_pin.c \
 	machine_rtc.c \
+	machine_spi.c \
 	machine_timer.c \
 	machine_uart.c \
 	mimxrt_flash.c \
diff --git a/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.h b/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.h
index fdaeac7eed283..3576706264946 100644
--- a/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.h
+++ b/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.h
@@ -24,3 +24,12 @@
     { 0 }, { 0 }, \
     { IOMUXC_GPIO_08_LPUART3_TXD }, { IOMUXC_GPIO_AD_07_LPUART3_RXD }, \
     { IOMUXC_GPIO_AD_02_LPUART4_TXD }, { IOMUXC_GPIO_AD_01_LPUART4_RXD },
+
+#define MICROPY_HW_SPI_INDEX { 1 }
+
+#define IOMUX_TABLE_SPI \
+    { IOMUXC_GPIO_AD_06_LPSPI1_SCK }, { IOMUXC_GPIO_AD_05_LPSPI1_PCS0 }, \
+    { IOMUXC_GPIO_AD_04_LPSPI1_SDO }, { IOMUXC_GPIO_AD_03_LPSPI1_SDI },
+
+#define DMA_REQ_SRC_RX { 0, kDmaRequestMuxLPSPI1Rx, kDmaRequestMuxLPSPI2Rx }
+#define DMA_REQ_SRC_TX { 0, kDmaRequestMuxLPSPI1Tx, kDmaRequestMuxLPSPI2Tx } 
diff --git a/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.h b/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.h
index 8238762a0b552..55254d58f6561 100644
--- a/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.h
+++ b/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.h
@@ -32,3 +32,19 @@
     { 0 }, { 0 }, \
     { 0 }, { 0 }, \
     { IOMUXC_GPIO_SD_B1_02_LPUART8_TX }, { IOMUXC_GPIO_SD_B1_03_LPUART8_RX },
+
+#define MICROPY_HW_SPI_INDEX { 1, 3 }
+
+#define IOMUX_TABLE_SPI \
+    { IOMUXC_GPIO_AD_B0_10_LPSPI1_SCK }, { IOMUXC_GPIO_AD_B0_11_LPSPI1_PCS0 }, \
+    { IOMUXC_GPIO_AD_B0_12_LPSPI1_SDO }, { IOMUXC_GPIO_AD_B0_13_LPSPI1_SDI }, \
+    { 0 }, { 0 }, \
+    { 0 }, { 0 }, \
+    { IOMUXC_GPIO_AD_B1_12_LPSPI3_SCK }, { IOMUXC_GPIO_AD_B1_13_LPSPI3_PCS0 }, \
+    { IOMUXC_GPIO_AD_B1_14_LPSPI3_SDO }, { IOMUXC_GPIO_AD_B1_15_LPSPI3_SDI }, 
+
+#define DMA_REQ_SRC_RX { 0, kDmaRequestMuxLPSPI1Rx, kDmaRequestMuxLPSPI2Rx, \
+                            kDmaRequestMuxLPSPI3Rx, kDmaRequestMuxLPSPI4Rx }
+
+#define DMA_REQ_SRC_TX { 0, kDmaRequestMuxLPSPI1Tx, kDmaRequestMuxLPSPI2Tx, \
+                            kDmaRequestMuxLPSPI3Tx, kDmaRequestMuxLPSPI4Tx } 
diff --git a/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.h b/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.h
index 659c33263ebfd..db08b1064d42b 100644
--- a/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.h
+++ b/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.h
@@ -29,3 +29,15 @@
     { IOMUXC_GPIO_AD_B0_02_LPUART6_TX }, { IOMUXC_GPIO_AD_B0_03_LPUART6_RX }, \
     { 0 }, { 0 }, \
     { IOMUXC_GPIO_AD_B1_10_LPUART8_TX }, { IOMUXC_GPIO_AD_B1_11_LPUART8_RX },
+
+#define MICROPY_HW_SPI_INDEX { 1 }
+
+#define IOMUX_TABLE_SPI \
+    { IOMUXC_GPIO_SD_B0_00_LPSPI1_SCK }, { IOMUXC_GPIO_SD_B0_01_LPSPI1_PCS0 }, \
+    { IOMUXC_GPIO_SD_B0_02_LPSPI1_SDO }, { IOMUXC_GPIO_SD_B0_03_LPSPI1_SDI },
+
+#define DMA_REQ_SRC_RX { 0, kDmaRequestMuxLPSPI1Rx, kDmaRequestMuxLPSPI2Rx, \
+                            kDmaRequestMuxLPSPI3Rx, kDmaRequestMuxLPSPI4Rx }
+
+#define DMA_REQ_SRC_TX { 0, kDmaRequestMuxLPSPI1Tx, kDmaRequestMuxLPSPI2Tx, \
+                            kDmaRequestMuxLPSPI3Tx, kDmaRequestMuxLPSPI4Tx } 
diff --git a/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.h b/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.h
index 4fcc697e26c44..451d53dafdc52 100644
--- a/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.h
+++ b/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.h
@@ -29,3 +29,15 @@
     { IOMUXC_GPIO_AD_B0_02_LPUART6_TX }, { IOMUXC_GPIO_AD_B0_03_LPUART6_RX }, \
     { 0 }, { 0 }, \
     { IOMUXC_GPIO_AD_B1_10_LPUART8_TX }, { IOMUXC_GPIO_AD_B1_11_LPUART8_RX },
+
+#define MICROPY_HW_SPI_INDEX { 1 }
+
+#define IOMUX_TABLE_SPI \
+    { IOMUXC_GPIO_SD_B0_00_LPSPI1_SCK }, { IOMUXC_GPIO_SD_B0_01_LPSPI1_PCS0 }, \
+    { IOMUXC_GPIO_SD_B0_02_LPSPI1_SDO }, { IOMUXC_GPIO_SD_B0_03_LPSPI1_SDI },
+
+#define DMA_REQ_SRC_RX { 0, kDmaRequestMuxLPSPI1Rx, kDmaRequestMuxLPSPI2Rx, \
+                            kDmaRequestMuxLPSPI3Rx, kDmaRequestMuxLPSPI4Rx }
+
+#define DMA_REQ_SRC_TX { 0, kDmaRequestMuxLPSPI1Tx, kDmaRequestMuxLPSPI2Tx, \
+                            kDmaRequestMuxLPSPI3Tx, kDmaRequestMuxLPSPI4Tx } 
diff --git a/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.h b/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.h
index 7549899512489..e300efef321ea 100644
--- a/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.h
+++ b/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.h
@@ -27,3 +27,15 @@
     { IOMUXC_GPIO_AD_B0_02_LPUART6_TX }, { IOMUXC_GPIO_AD_B0_03_LPUART6_RX }, \
     { 0 }, { 0 }, \
     { IOMUXC_GPIO_AD_B1_10_LPUART8_TX }, { IOMUXC_GPIO_AD_B1_11_LPUART8_RX },
+
+#define MICROPY_HW_SPI_INDEX { 1 }
+
+#define IOMUX_TABLE_SPI \
+    { IOMUXC_GPIO_SD_B0_00_LPSPI1_SCK }, { IOMUXC_GPIO_SD_B0_01_LPSPI1_PCS0 }, \
+    { IOMUXC_GPIO_SD_B0_02_LPSPI1_SDO }, { IOMUXC_GPIO_SD_B0_03_LPSPI1_SDI },
+
+#define DMA_REQ_SRC_RX { 0, kDmaRequestMuxLPSPI1Rx, kDmaRequestMuxLPSPI2Rx, \
+                            kDmaRequestMuxLPSPI3Rx, kDmaRequestMuxLPSPI4Rx }
+
+#define DMA_REQ_SRC_TX { 0, kDmaRequestMuxLPSPI1Tx, kDmaRequestMuxLPSPI2Tx, \
+                            kDmaRequestMuxLPSPI3Tx, kDmaRequestMuxLPSPI4Tx } 
diff --git a/ports/mimxrt/boards/TEENSY40/mpconfigboard.h b/ports/mimxrt/boards/TEENSY40/mpconfigboard.h
index 316116b2b9db3..8b38d047f8020 100644
--- a/ports/mimxrt/boards/TEENSY40/mpconfigboard.h
+++ b/ports/mimxrt/boards/TEENSY40/mpconfigboard.h
@@ -24,3 +24,21 @@
     { IOMUXC_GPIO_AD_B0_02_LPUART6_TX }, { IOMUXC_GPIO_AD_B0_03_LPUART6_RX }, \
     { IOMUXC_GPIO_EMC_31_LPUART7_TX }, { IOMUXC_GPIO_EMC_32_LPUART7_RX }, \
     { IOMUXC_GPIO_AD_B1_10_LPUART8_TX }, { IOMUXC_GPIO_AD_B1_11_LPUART8_RX },
+
+#define MICROPY_HW_SPI_INDEX { 4, 3}
+
+#define IOMUX_TABLE_SPI \
+    { 0 }, { 0 }, \
+    { 0 }, { 0 }, \
+    { 0 }, { 0 }, \
+    { 0 }, { 0 }, \
+    { IOMUXC_GPIO_AD_B1_15_LPSPI3_SCK }, { IOMUXC_GPIO_AD_B0_03_LPSPI3_PCS0 }, \
+    { IOMUXC_GPIO_AD_B1_14_LPSPI3_SDO }, { IOMUXC_GPIO_AD_B0_02_LPSPI3_SDI }, \
+    { IOMUXC_GPIO_B0_03_LPSPI4_SCK }, { IOMUXC_GPIO_B0_00_LPSPI4_PCS0 }, \
+    { IOMUXC_GPIO_B0_02_LPSPI4_SDO }, { IOMUXC_GPIO_B0_01_LPSPI4_SDI },
+
+#define DMA_REQ_SRC_RX { 0, kDmaRequestMuxLPSPI1Rx, kDmaRequestMuxLPSPI2Rx, \
+                            kDmaRequestMuxLPSPI3Rx, kDmaRequestMuxLPSPI4Rx }
+
+#define DMA_REQ_SRC_TX { 0, kDmaRequestMuxLPSPI1Tx, kDmaRequestMuxLPSPI2Tx, \
+                            kDmaRequestMuxLPSPI3Tx, kDmaRequestMuxLPSPI4Tx } 
diff --git a/ports/mimxrt/boards/TEENSY41/mpconfigboard.h b/ports/mimxrt/boards/TEENSY41/mpconfigboard.h
index 4bbb41f309cc1..455bf8d69c774 100644
--- a/ports/mimxrt/boards/TEENSY41/mpconfigboard.h
+++ b/ports/mimxrt/boards/TEENSY41/mpconfigboard.h
@@ -24,3 +24,21 @@
     { IOMUXC_GPIO_AD_B0_02_LPUART6_TX }, { IOMUXC_GPIO_AD_B0_03_LPUART6_RX }, \
     { IOMUXC_GPIO_EMC_31_LPUART7_TX }, { IOMUXC_GPIO_EMC_32_LPUART7_RX }, \
     { IOMUXC_GPIO_AD_B1_10_LPUART8_TX }, { IOMUXC_GPIO_AD_B1_11_LPUART8_RX },
+
+#define MICROPY_HW_SPI_INDEX { 4, 3, 1 }
+
+#define IOMUX_TABLE_SPI \
+    { IOMUXC_GPIO_SD_B0_00_LPSPI1_SCK }, { IOMUXC_GPIO_SD_B0_01_LPSPI1_PCS0 }, \
+    { IOMUXC_GPIO_SD_B0_02_LPSPI1_SDO }, { IOMUXC_GPIO_SD_B0_03_LPSPI1_SDI }, \
+    { 0 }, { 0 }, \
+    { 0 }, { 0 }, \
+    { IOMUXC_GPIO_AD_B1_15_LPSPI3_SCK }, { IOMUXC_GPIO_AD_B1_12_LPSPI3_PCS0 }, \
+    { IOMUXC_GPIO_AD_B1_14_LPSPI3_SDO }, { IOMUXC_GPIO_AD_B1_13_LPSPI3_SDI }, \
+    { IOMUXC_GPIO_B0_03_LPSPI4_SCK }, { IOMUXC_GPIO_B0_00_LPSPI4_PCS0 }, \
+    { IOMUXC_GPIO_B0_02_LPSPI4_SDO }, { IOMUXC_GPIO_B0_01_LPSPI4_SDI },
+
+#define DMA_REQ_SRC_RX { 0, kDmaRequestMuxLPSPI1Rx, kDmaRequestMuxLPSPI2Rx, \
+                            kDmaRequestMuxLPSPI3Rx, kDmaRequestMuxLPSPI4Rx }
+
+#define DMA_REQ_SRC_TX { 0, kDmaRequestMuxLPSPI1Tx, kDmaRequestMuxLPSPI2Tx, \
+                            kDmaRequestMuxLPSPI3Tx, kDmaRequestMuxLPSPI4Tx } 
diff --git a/ports/mimxrt/dma_channel.c b/ports/mimxrt/dma_channel.c
new file mode 100644
index 0000000000000..3dd043a66bfe3
--- /dev/null
+++ b/ports/mimxrt/dma_channel.c
@@ -0,0 +1,51 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Robert Hammelrath
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "dma_channel.h"
+
+// List of channel flags: true: channel used, false: channel available
+static bool channel_list[32] = { true, true, true, true, false, false, false, false,
+                                 false, false, false, false, false, false, false, false,
+                                 false, false, false, false, false, false, false, false,
+                                 false, false, false, false, false, false, false, false };
+
+// allocate_channel(): retrieve an available channel. Return the number or -1
+int allocate_dma_channel(void) {
+    for (int i = 0; i < ARRAY_SIZE(channel_list); i++) {
+        if (channel_list[i] == false) { // Channel available
+            channel_list[i] = true;
+            return i;
+        }
+    }
+    return -1;
+}
+
+// free_channel(n): Declare channel as free
+void free_dma_channel(int n) {
+    if (n >= 0 && n <= ARRAY_SIZE(channel_list)) {
+        channel_list[n] = false;
+    }
+}
diff --git a/ports/mimxrt/dma_channel.h b/ports/mimxrt/dma_channel.h
new file mode 100644
index 0000000000000..3fe66a3dbb4fd
--- /dev/null
+++ b/ports/mimxrt/dma_channel.h
@@ -0,0 +1,34 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Robert Hammelrath
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+#ifndef MICROPY_INCLUDED_MIMXRT_DMACHANNEL_H
+#define MICROPY_INCLUDED_MIMXRT_DMACHANNEL_H
+
+#include "py/runtime.h"
+
+int allocate_dma_channel(void);
+void free_dma_channel(int n);
+
+#endif // MICROPY_INCLUDED_MIMXRT_DMACHANNEL_H
diff --git a/ports/mimxrt/machine_spi.c b/ports/mimxrt/machine_spi.c
new file mode 100644
index 0000000000000..41843b06d9eae
--- /dev/null
+++ b/ports/mimxrt/machine_spi.c
@@ -0,0 +1,334 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020-2021 Damien P. George
+ * Copyright (c) 2021 Robert Hammelrath
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "py/runtime.h"
+#include "py/mphal.h"
+#include "py/mperrno.h"
+#include "extmod/machine_spi.h"
+#include "modmachine.h"
+#include "dma_channel.h"
+
+#include "fsl_cache.h"
+#include "fsl_dmamux.h"
+#include "fsl_iomuxc.h"
+#include "fsl_lpspi.h"
+#include "fsl_lpspi_edma.h"
+
+#define DEFAULT_SPI_BAUDRATE    (1000000)
+#define DEFAULT_SPI_POLARITY    (0)
+#define DEFAULT_SPI_PHASE       (0)
+#define DEFAULT_SPI_BITS        (8)
+#define DEFAULT_SPI_FIRSTBIT    (kLPSPI_MsbFirst)
+#define DEFAULT_SPI_DRIVE       (6)
+
+#define CLOCK_DIVIDER           (1)
+
+#define MICROPY_HW_SPI_NUM MP_ARRAY_SIZE(spi_index_table)
+
+#define SCK (iomux_table[index])
+#define CS0 (iomux_table[index + 1])
+#define SDO (iomux_table[index + 2])
+#define SDI (iomux_table[index + 3])
+
+typedef struct _machine_spi_obj_t {
+    mp_obj_base_t base;
+    uint8_t spi_id;
+    uint8_t mode;
+    uint8_t spi_hw_id;
+    bool transfer_busy;
+    LPSPI_Type *spi_inst;
+    lpspi_master_config_t *master_config;
+} machine_spi_obj_t;
+
+typedef struct _iomux_table_t {
+    uint32_t muxRegister;
+    uint32_t muxMode;
+    uint32_t inputRegister;
+    uint32_t inputDaisy;
+    uint32_t configRegister;
+} iomux_table_t;
+
+STATIC const uint8_t spi_index_table[] = MICROPY_HW_SPI_INDEX;
+STATIC LPSPI_Type *spi_base_ptr_table[] = LPSPI_BASE_PTRS;
+static const iomux_table_t iomux_table[] = {
+    IOMUX_TABLE_SPI
+};
+
+static uint16_t dma_req_src_rx[] = DMA_REQ_SRC_RX;
+static uint16_t dma_req_src_tx[] = DMA_REQ_SRC_TX;
+
+bool lpspi_set_iomux(int8_t spi, uint8_t drive) {
+    int index = (spi - 1) * 4;
+
+    if (SCK.muxRegister != 0) {
+        IOMUXC_SetPinMux(SCK.muxRegister, SCK.muxMode, SCK.inputRegister, SCK.inputDaisy, SCK.configRegister, 0U);
+        IOMUXC_SetPinConfig(SCK.muxRegister, SCK.muxMode, SCK.inputRegister, SCK.inputDaisy, SCK.configRegister,
+            0x1080u | drive << IOMUXC_SW_PAD_CTL_PAD_DSE_SHIFT);
+
+        IOMUXC_SetPinMux(CS0.muxRegister, CS0.muxMode, CS0.inputRegister, CS0.inputDaisy, CS0.configRegister, 0U);
+        IOMUXC_SetPinConfig(CS0.muxRegister, CS0.muxMode, CS0.inputRegister, CS0.inputDaisy, CS0.configRegister,
+            0x1080u | drive << IOMUXC_SW_PAD_CTL_PAD_DSE_SHIFT);
+
+        IOMUXC_SetPinMux(SDO.muxRegister, SDO.muxMode, SDO.inputRegister, SDO.inputDaisy, SDO.configRegister, 0U);
+        IOMUXC_SetPinConfig(SDO.muxRegister, SDO.muxMode, SDO.inputRegister, SDO.inputDaisy, SDO.configRegister,
+            0x1080u | drive << IOMUXC_SW_PAD_CTL_PAD_DSE_SHIFT);
+
+        IOMUXC_SetPinMux(SDI.muxRegister, SDI.muxMode, SDI.inputRegister, SDI.inputDaisy, SDI.configRegister, 0U);
+        IOMUXC_SetPinConfig(SDI.muxRegister, SDI.muxMode, SDI.inputRegister, SDI.inputDaisy, SDI.configRegister,
+            0x1080u | drive << IOMUXC_SW_PAD_CTL_PAD_DSE_SHIFT);
+
+        return true;
+    } else {
+        return false;
+    }
+}
+
+STATIC void machine_spi_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+    static const char *firstbit_str[] = {"MSB", "LSB"};
+    machine_spi_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    mp_printf(print, "SPI(%u, baudrate=%u, polarity=%u, phase=%u, bits=%u, firstbit=%s, gap_ns=%d)",
+        self->spi_id, self->master_config->baudRate, self->master_config->cpol,
+        self->master_config->cpha, self->master_config->bitsPerFrame,
+        firstbit_str[self->master_config->direction], self->master_config->betweenTransferDelayInNanoSec);
+}
+
+mp_obj_t machine_spi_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
+    enum { ARG_id, ARG_baudrate, ARG_polarity, ARG_phase, ARG_bits, ARG_firstbit, ARG_gap_ns, ARG_drive };
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_id,       MP_ARG_REQUIRED | MP_ARG_OBJ },
+        { MP_QSTR_baudrate, MP_ARG_INT, {.u_int = DEFAULT_SPI_BAUDRATE} },
+        { MP_QSTR_polarity, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = DEFAULT_SPI_POLARITY} },
+        { MP_QSTR_phase,    MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = DEFAULT_SPI_PHASE} },
+        { MP_QSTR_bits,     MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = DEFAULT_SPI_BITS} },
+        { MP_QSTR_firstbit, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = DEFAULT_SPI_FIRSTBIT} },
+        { MP_QSTR_gap_ns,   MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} },
+        { MP_QSTR_drive,    MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = DEFAULT_SPI_DRIVE} },
+    };
+
+    static bool clk_init = true;
+
+    // Parse the arguments.
+    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
+    mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
+
+    // Get the SPI bus id.
+    int spi_id = mp_obj_get_int(args[ARG_id].u_obj);
+    if (spi_id < 0 || spi_id >= MP_ARRAY_SIZE(spi_index_table)) {
+        mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("SPI(%d) doesn't exist"), spi_id);
+    }
+
+    // Get peripheral object.
+    uint8_t spi_hw_id = spi_index_table[spi_id];  // the hw spi number 1..n
+    machine_spi_obj_t *self = m_new_obj(machine_spi_obj_t);
+    self->base.type = &machine_spi_type;
+    self->spi_id = spi_id;
+    self->spi_inst = spi_base_ptr_table[spi_hw_id];
+    self->spi_hw_id = spi_hw_id;
+
+    uint8_t drive = args[ARG_drive].u_int;
+    if (drive < 1 || drive > 7) {
+        drive = DEFAULT_SPI_DRIVE;
+    }
+
+    if (clk_init) {
+        clk_init = false;
+        /*Set clock source for LPSPI*/
+        CLOCK_SetMux(kCLOCK_LpspiMux, 1);  // Clock source is kCLOCK_Usb1PllPfd1Clk
+        CLOCK_SetDiv(kCLOCK_LpspiDiv, CLOCK_DIVIDER);
+    }
+    lpspi_set_iomux(spi_index_table[spi_id], drive);
+    LPSPI_Reset(self->spi_inst);
+    LPSPI_Enable(self->spi_inst, false);  // Disable first before new settings are applies
+
+    self->master_config = m_new_obj(lpspi_master_config_t);
+    LPSPI_MasterGetDefaultConfig(self->master_config);
+    // Initialise the SPI peripheral.
+    self->master_config->baudRate = args[ARG_baudrate].u_int;
+    self->master_config->betweenTransferDelayInNanoSec = 1000000000 / self->master_config->baudRate * 2;
+    self->master_config->cpol = args[ARG_polarity].u_int;
+    self->master_config->cpha = args[ARG_phase].u_int;
+    self->master_config->bitsPerFrame = args[ARG_bits].u_int;
+    self->master_config->direction = args[ARG_firstbit].u_int;
+    if (args[ARG_gap_ns].u_int != -1) {
+        self->master_config->betweenTransferDelayInNanoSec = args[ARG_gap_ns].u_int;
+    }
+    LPSPI_MasterInit(self->spi_inst, self->master_config, CLOCK_GetFreq(kCLOCK_Usb1PllPfd0Clk) / (CLOCK_DIVIDER + 1));
+
+    return MP_OBJ_FROM_PTR(self);
+}
+
+STATIC void machine_spi_init(mp_obj_base_t *self_in, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    enum { ARG_baudrate, ARG_polarity, ARG_phase, ARG_bits, ARG_firstbit, ARG_gap_ns };
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_baudrate, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} },
+        { MP_QSTR_polarity, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} },
+        { MP_QSTR_phase,    MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} },
+        { MP_QSTR_bits,     MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} },
+        { MP_QSTR_firstbit, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} },
+        { MP_QSTR_gap_ns,   MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} },
+    };
+
+    // Parse the arguments.
+    machine_spi_obj_t *self = (machine_spi_obj_t *)self_in;
+    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
+    mp_arg_parse_all(n_args, pos_args, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
+
+    // Reconfigure the baudrate if requested.
+    if (args[ARG_baudrate].u_int != -1) {
+        self->master_config->baudRate = args[ARG_baudrate].u_int;
+        self->master_config->betweenTransferDelayInNanoSec = 1000000000 / self->master_config->baudRate * 2;
+    }
+    // Reconfigure the format if requested.
+    if (args[ARG_polarity].u_int != -1) {
+        self->master_config->cpol = args[ARG_polarity].u_int;
+    }
+    if (args[ARG_phase].u_int != -1) {
+        self->master_config->cpha = args[ARG_phase].u_int;
+    }
+    if (args[ARG_bits].u_int != -1) {
+        self->master_config->bitsPerFrame = args[ARG_bits].u_int;
+    }
+    if (args[ARG_firstbit].u_int != -1) {
+        self->master_config->direction = args[ARG_firstbit].u_int;
+    }
+    if (args[ARG_gap_ns].u_int != -1) {
+        self->master_config->betweenTransferDelayInNanoSec = args[ARG_gap_ns].u_int;
+    }
+    LPSPI_Enable(self->spi_inst, false);  // Disable first before new settings are applies
+    LPSPI_MasterInit(self->spi_inst, self->master_config, CLOCK_GetFreq(kCLOCK_Usb1PllPfd0Clk) / (CLOCK_DIVIDER + 1));
+}
+
+void LPSPI_EDMAMasterCallback(LPSPI_Type *base, lpspi_master_edma_handle_t *handle, status_t status, void *self_in) {
+    machine_spi_obj_t *self = (machine_spi_obj_t *)self_in;
+    self->transfer_busy = false;
+}
+
+STATIC void machine_spi_transfer(mp_obj_base_t *self_in, size_t len, const uint8_t *src, uint8_t *dest) {
+    machine_spi_obj_t *self = (machine_spi_obj_t *)self_in;
+    // Use DMA for large transfers if channels are available
+    const size_t dma_min_size_threshold = 16;  // That's the FIFO size
+
+    int chan_tx = -1;
+    int chan_rx = -1;
+    if (len >= dma_min_size_threshold) {
+        // Use two DMA channels to service the two FIFOs
+        chan_rx = allocate_dma_channel();
+        chan_tx = allocate_dma_channel();
+    }
+    bool use_dma = chan_rx >= 0 && chan_tx >= 0;
+
+    if (use_dma) {
+        edma_config_t userConfig;
+
+        /* DMA MUX init*/
+        DMAMUX_Init(DMAMUX);
+
+        DMAMUX_SetSource(DMAMUX, chan_rx, dma_req_src_rx[self->spi_hw_id]); // ## SPIn source
+        DMAMUX_EnableChannel(DMAMUX, chan_rx);
+
+        DMAMUX_SetSource(DMAMUX, chan_tx, dma_req_src_tx[self->spi_hw_id]);
+        DMAMUX_EnableChannel(DMAMUX, chan_tx);
+
+        EDMA_GetDefaultConfig(&userConfig);
+        EDMA_Init(DMA0, &userConfig);
+
+        lpspi_master_edma_handle_t g_master_edma_handle;
+        edma_handle_t lpspiEdmaMasterRxRegToRxDataHandle;
+        edma_handle_t lpspiEdmaMasterTxDataToTxRegHandle;
+
+        // Set up lpspi EDMA master
+        EDMA_CreateHandle(&(lpspiEdmaMasterRxRegToRxDataHandle), DMA0, chan_rx);
+        EDMA_CreateHandle(&(lpspiEdmaMasterTxDataToTxRegHandle), DMA0, chan_tx);
+        LPSPI_MasterTransferCreateHandleEDMA(self->spi_inst, &g_master_edma_handle, LPSPI_EDMAMasterCallback, self,
+            &lpspiEdmaMasterRxRegToRxDataHandle,
+            &lpspiEdmaMasterTxDataToTxRegHandle);
+        // Start master transfer
+        lpspi_transfer_t masterXfer;
+        masterXfer.txData = (uint8_t *)src;
+        masterXfer.rxData = (uint8_t *)dest;
+        masterXfer.dataSize = len;
+        masterXfer.configFlags = kLPSPI_MasterPcs0 | kLPSPI_MasterPcsContinuous | kLPSPI_MasterByteSwap;
+
+        // Reconfigure the TCR, required after switch between DMA vs. non-DMA
+        LPSPI_Enable(self->spi_inst, false);  // Disable first before new settings are applied
+        self->spi_inst->TCR = LPSPI_TCR_CPOL(self->master_config->cpol) | LPSPI_TCR_CPHA(self->master_config->cpha) |
+            LPSPI_TCR_LSBF(self->master_config->direction) | LPSPI_TCR_FRAMESZ(self->master_config->bitsPerFrame - 1) |
+            (self->spi_inst->TCR & LPSPI_TCR_PRESCALE_MASK) | LPSPI_TCR_PCS(self->master_config->whichPcs);
+        LPSPI_Enable(self->spi_inst, true);
+
+        self->transfer_busy = true;
+        if (dest) {
+            L1CACHE_DisableDCache();
+        } else if (src) {
+            DCACHE_CleanByRange((uint32_t)src, len);
+        }
+        LPSPI_MasterTransferEDMA(self->spi_inst, &g_master_edma_handle, &masterXfer);
+
+        while (self->transfer_busy) {
+            MICROPY_EVENT_POLL_HOOK
+        }
+        L1CACHE_EnableDCache();
+    }
+    // Release DMA channels, even if never allocated.
+    if (chan_rx >= 0) {
+        free_dma_channel(chan_rx);
+    }
+    if (chan_tx >= 0) {
+        free_dma_channel(chan_tx);
+    }
+
+    if (!use_dma) {
+        // Reconfigure the TCR, required after switch between DMA vs. non-DMA
+        LPSPI_Enable(self->spi_inst, false);  // Disable first before new settings are applied
+        self->spi_inst->TCR = LPSPI_TCR_CPOL(self->master_config->cpol) | LPSPI_TCR_CPHA(self->master_config->cpha) |
+            LPSPI_TCR_LSBF(self->master_config->direction) | LPSPI_TCR_FRAMESZ(self->master_config->bitsPerFrame - 1) |
+            (self->spi_inst->TCR & LPSPI_TCR_PRESCALE_MASK) | LPSPI_TCR_PCS(self->master_config->whichPcs);
+        LPSPI_Enable(self->spi_inst, true);
+
+        lpspi_transfer_t masterXfer;
+        masterXfer.txData = (uint8_t *)src;
+        masterXfer.rxData = (uint8_t *)dest;
+        masterXfer.dataSize = len;
+        masterXfer.configFlags = kLPSPI_MasterPcs0 | kLPSPI_MasterPcsContinuous | kLPSPI_MasterByteSwap;
+
+        LPSPI_MasterTransferBlocking(self->spi_inst, &masterXfer);
+    }
+}
+
+STATIC const mp_machine_spi_p_t machine_spi_p = {
+    .init = machine_spi_init,
+    .transfer = machine_spi_transfer,
+};
+
+const mp_obj_type_t machine_spi_type = {
+    { &mp_type_type },
+    .name = MP_QSTR_SPI,
+    .print = machine_spi_print,
+    .make_new = machine_spi_make_new,
+    .protocol = &machine_spi_p,
+    .locals_dict = (mp_obj_dict_t *)&mp_machine_spi_locals_dict,
+};
diff --git a/ports/mimxrt/modmachine.c b/ports/mimxrt/modmachine.c
index 09aa250c5febe..ed23510cff8be 100644
--- a/ports/mimxrt/modmachine.c
+++ b/ports/mimxrt/modmachine.c
@@ -65,6 +65,7 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_Signal),              MP_ROM_PTR(&machine_signal_type) },
     { MP_ROM_QSTR(MP_QSTR_SoftI2C),             MP_ROM_PTR(&mp_machine_soft_i2c_type) },
     { MP_ROM_QSTR(MP_QSTR_SoftSPI),             MP_ROM_PTR(&mp_machine_soft_spi_type) },
+    { MP_ROM_QSTR(MP_QSTR_SPI),                 MP_ROM_PTR(&machine_spi_type) },
     { MP_ROM_QSTR(MP_QSTR_UART),                MP_ROM_PTR(&machine_uart_type) },
 };
 STATIC MP_DEFINE_CONST_DICT(machine_module_globals, machine_module_globals_table);
diff --git a/ports/mimxrt/modmachine.h b/ports/mimxrt/modmachine.h
index 5ac86557642bc..eba8e6db8ff0a 100644
--- a/ports/mimxrt/modmachine.h
+++ b/ports/mimxrt/modmachine.h
@@ -32,6 +32,7 @@
 extern const mp_obj_type_t machine_adc_type;
 extern const mp_obj_type_t machine_timer_type;
 extern const mp_obj_type_t machine_rtc_type;
+extern const mp_obj_type_t machine_spi_type;
 extern const mp_obj_type_t machine_uart_type;
 
 void machine_adc_init(void);

From a262faa2274e4c6297e735afe2a6c944ce58fd70 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sun, 6 Jun 2021 08:11:20 +0200
Subject: [PATCH 1014/3533] mimxrt/moduos: Seed the PRNG on boot using the
 TRNG.

---
 ports/mimxrt/moduos.c       | 27 ++++++++++++++++++++-------
 ports/mimxrt/mpconfigport.h |  3 +++
 2 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/ports/mimxrt/moduos.c b/ports/mimxrt/moduos.c
index fe914ce610c03..225cd4ddd2b2b 100644
--- a/ports/mimxrt/moduos.c
+++ b/ports/mimxrt/moduos.c
@@ -61,21 +61,34 @@ STATIC mp_obj_t os_uname(void) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_0(os_uname_obj, os_uname);
 
-STATIC mp_obj_t os_urandom(mp_obj_t num) {
-    mp_int_t n = mp_obj_get_int(num);
-    static bool initialized = false;
-    vstr_t vstr;
-    vstr_init_len(&vstr, n);
+static bool initialized = false;
 
-    if (!initialized) {
-        trng_config_t trngConfig;
+STATIC void trng_start(void) {
+    trng_config_t trngConfig;
 
+    if (!initialized) {
         TRNG_GetDefaultConfig(&trngConfig);
         trngConfig.sampleMode = kTRNG_SampleModeVonNeumann;
 
         TRNG_Init(TRNG, &trngConfig);
         initialized = true;
     }
+}
+
+uint32_t trng_random_u32(void) {
+    uint32_t rngval;
+
+    trng_start();
+    TRNG_GetRandomData(TRNG, (uint8_t *)&rngval, 4);
+    return rngval;
+}
+
+STATIC mp_obj_t os_urandom(mp_obj_t num) {
+    mp_int_t n = mp_obj_get_int(num);
+    vstr_t vstr;
+    vstr_init_len(&vstr, n);
+
+    trng_start();
     TRNG_GetRandomData(TRNG, vstr.buf, n);
 
     return mp_obj_new_str_from_vstr(&mp_type_bytes, &vstr);
diff --git a/ports/mimxrt/mpconfigport.h b/ports/mimxrt/mpconfigport.h
index 49953bb57e2df..8afdc8502cb81 100644
--- a/ports/mimxrt/mpconfigport.h
+++ b/ports/mimxrt/mpconfigport.h
@@ -30,6 +30,8 @@
 #include "mpconfigboard.h"
 #include "fsl_common.h"
 
+uint32_t trng_random_u32(void);
+
 // Memory allocation policies
 #define MICROPY_GC_STACK_ENTRY_TYPE         uint16_t
 #define MICROPY_GC_ALLOC_THRESHOLD          (0)
@@ -118,6 +120,7 @@
 #define MICROPY_PY_UTIME_MP_HAL             (1)
 #define MICROPY_PY_URANDOM                  (1)
 #define MICROPY_PY_URANDOM_EXTRA_FUNCS      (1)
+#define MICROPY_PY_URANDOM_SEED_INIT_FUNC   (trng_random_u32())
 #define MICROPY_PY_USELECT                  (1)
 #define MICROPY_PY_MACHINE                  (1)
 #define MICROPY_PY_MACHINE_PIN_MAKE_NEW     mp_pin_make_new

From b35566af799ccb76711d228f1314f7df53ee42bc Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Tue, 8 Jun 2021 13:34:53 +0200
Subject: [PATCH 1015/3533] mimxrt/boards: Set vfs partition start to 1 MBbyte.

This avoids the irritation of the PJRC HalfKay loader on Teensy 4.0.  Block
0 and 1 are properly erased and the additional formatting in the make
script is not required anymore.
---
 ports/mimxrt/boards/MIMXRT1062.ld             | 4 ++--
 ports/mimxrt/boards/TEENSY40/mpconfigboard.mk | 2 --
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/ports/mimxrt/boards/MIMXRT1062.ld b/ports/mimxrt/boards/MIMXRT1062.ld
index 5ab7e153329dc..5edf70ee46b65 100644
--- a/ports/mimxrt/boards/MIMXRT1062.ld
+++ b/ports/mimxrt/boards/MIMXRT1062.ld
@@ -8,8 +8,8 @@ ivt_size            = 0x00001000;
 interrupts_start    = 0x60002000;
 interrupts_size     = 0x00000400;
 text_start          = 0x60002400;
-text_size           = ((((text_start) + 1M) + (4k - 1)) & ~(4k - 1)) - (text_start); /* reserve 1M for code but align on 4k boundary */
-vfs_start           = (text_start) + (text_size);
+vfs_start           = 0x60100000;
+text_size           = ((vfs_start) - (text_start));
 vfs_size            = ((flash_end) - (vfs_start));
 itcm_start          = 0x00000000;
 itcm_size           = 0x00020000;
diff --git a/ports/mimxrt/boards/TEENSY40/mpconfigboard.mk b/ports/mimxrt/boards/TEENSY40/mpconfigboard.mk
index 0f818af42cd06..beab16c08600c 100644
--- a/ports/mimxrt/boards/TEENSY40/mpconfigboard.mk
+++ b/ports/mimxrt/boards/TEENSY40/mpconfigboard.mk
@@ -5,5 +5,3 @@ MICROPY_FLOAT_IMPL = double
 
 deploy: $(BUILD)/firmware.hex
 	teensy_loader_cli --mcu=imxrt1062 -v -w $<
-	sleep 1
-	$(PYTHON) $(TOP)/tools/pyboard.py --device $(PORT) $(BOARD_DIR)/format.py

From 4eabff53cb390f555758ac9c326f75e900dc5a11 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Wed, 16 Jun 2021 09:06:05 +0200
Subject: [PATCH 1016/3533] mimxrt/main: Skip running main.py if boot.py
 failed.

See related #7379.
---
 ports/mimxrt/main.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ports/mimxrt/main.c b/ports/mimxrt/main.c
index bd1c3e8884e93..d605c91555c8c 100644
--- a/ports/mimxrt/main.c
+++ b/ports/mimxrt/main.c
@@ -70,7 +70,8 @@ int main(void) {
         if (ret & PYEXEC_FORCED_EXIT) {
             goto soft_reset_exit;
         }
-        if (pyexec_mode_kind == PYEXEC_MODE_FRIENDLY_REPL) {
+        // Do not execute main.py if boot.py failed
+        if (pyexec_mode_kind == PYEXEC_MODE_FRIENDLY_REPL && ret != 0) {
             ret = pyexec_file_if_exists("main.py");
             if (ret & PYEXEC_FORCED_EXIT) {
                 goto soft_reset_exit;

From c8284c9b5045023803d3c0492954509e7b997aa5 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Fri, 18 Jun 2021 12:52:22 +0200
Subject: [PATCH 1017/3533] mimxrt/main: Extend the information returned by
 help().

---
 ports/mimxrt/main.c | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/ports/mimxrt/main.c b/ports/mimxrt/main.c
index d605c91555c8c..c93e89c8ab3c4 100644
--- a/ports/mimxrt/main.c
+++ b/ports/mimxrt/main.c
@@ -131,8 +131,23 @@ const char mimxrt_help_text[] =
     "  machine.Pin(pin, m, [p]) -- get a pin and configure it for IO mode m, pull mode p\n"
     "    methods: init(..), value([v]), high(), low())\n"
     "\n"
-    "Pin IO modes are: Pin.IN, Pin.OUT, Pin.OPEN_DRAIN\n"
-    "Pin pull modes are: Pin.PULL_UP, Pin.PULL_UP_47K, Pin.PULL_UP_22K, Pin.PULL_DOWN, Pin.PULL_HOLD\n"
+    "    Pins are numbered board specific, either 0-n, or 'D0'-'Dn', or 'A0' - 'An',\n"
+    "    according to the boards's pinout sheet.\n"
+    "    Pin IO modes are: Pin.IN, Pin.OUT, Pin.OPEN_DRAIN\n"
+    "    Pin pull modes are: Pin.PULL_UP, Pin.PULL_UP_47K, Pin.PULL_UP_22K, Pin.PULL_DOWN, Pin.PULL_HOLD\n"
+    "  machine.ADC(pin) -- make an analog object from a pin\n"
+    "    methods: read_u16()\n"
+    "  machine.UART(id, baudrate=115200) -- create an UART object (id=1 - 8)\n"
+    "    methods: init(), write(buf), any()\n"
+    "             buf=read(n), readinto(buf), buf=readline()\n"
+    "    The RX and TX pins are fixed and board-specific.\n"
+    "  machine.SoftI2C() -- create an Soft I2C object\n"
+    "    methods: readfrom(addr, buf, stop=True), writeto(addr, buf, stop=True)\n"
+    "             readfrom_mem(addr, memaddr, arg), writeto_mem(addr, memaddr, arg)\n"
+    "  machine.SoftSPI(baudrate=1000000) -- create an SPI object ()\n"
+    "    methods: read(nbytes, write=0x00), write(buf), write_readinto(wr_buf, rd_buf)\n"
+    "  machine.Timer(id, freq, callback) -- create a hardware timer object (id=0,1,2)\n"
+    "    eg: machine.Timer(freq=1, callback=lambda t:print(t))\n"
     "\n"
     "Useful control commands:\n"
     "  CTRL-C -- interrupt a running program\n"

From 552e11bf64f4cc5da6601d74e754694ad6da07ea Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sat, 19 Jun 2021 07:55:03 +0200
Subject: [PATCH 1018/3533] mimxrt/mimxrt_flash: Remove commented-out code.

---
 ports/mimxrt/mimxrt_flash.c | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/ports/mimxrt/mimxrt_flash.c b/ports/mimxrt/mimxrt_flash.c
index 6b89bfa532f9b..bf054c87f4664 100644
--- a/ports/mimxrt/mimxrt_flash.c
+++ b/ports/mimxrt/mimxrt_flash.c
@@ -127,13 +127,6 @@ STATIC mp_obj_t mimxrt_flash_readblocks(size_t n_args, const mp_obj_t *args) {
     mimxrt_flash_obj_t *self = MP_OBJ_TO_PTR(args[0]);
     mp_buffer_info_t bufinfo;
     mp_get_buffer_raise(args[2], &bufinfo, MP_BUFFER_WRITE);
-    // if (n_args == 4) {
-    //     mp_printf(MP_PYTHON_PRINTER, "readblocks: nargs = %d, block = %d, offset = %d, len = %d\n",
-    //         n_args, mp_obj_get_int(args[1]), mp_obj_get_int(args[3]), bufinfo.len);
-    // } else {
-    //     mp_printf(MP_PYTHON_PRINTER, "readblocks: nargs = %d, block = %d, len = %d\n",
-    //         n_args, mp_obj_get_int(args[1]), bufinfo.len);
-    // }
     // Calculate read offset from block number.
     uint32_t offset = mp_obj_get_int(args[1]) * SECTOR_SIZE_BYTES;
     // Add optional offset

From cbc9a591a437177ac978302c16b56dd6cb46104f Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sat, 19 Jun 2021 10:51:45 +0200
Subject: [PATCH 1019/3533] mimxrt/modmachine: Add a few minor methods to the
 machine module.

Mostly for compatibility reasons:
- idle()
- disable_irq()
- enable_irq()
- time_pulse_us()
---
 ports/mimxrt/modmachine.c   | 27 +++++++++++++++++++++++++++
 ports/mimxrt/mpconfigport.h |  1 +
 2 files changed, 28 insertions(+)

diff --git a/ports/mimxrt/modmachine.c b/ports/mimxrt/modmachine.c
index ed23510cff8be..e821f15070c05 100644
--- a/ports/mimxrt/modmachine.c
+++ b/ports/mimxrt/modmachine.c
@@ -28,6 +28,7 @@
 #include "py/runtime.h"
 #include "extmod/machine_mem.h"
 #include "extmod/machine_i2c.h"
+#include "extmod/machine_pulse.h"
 #include "extmod/machine_signal.h"
 #include "extmod/machine_spi.h"
 #include "led.h"
@@ -48,6 +49,25 @@ STATIC mp_obj_t machine_freq(void) {
 }
 MP_DEFINE_CONST_FUN_OBJ_0(machine_freq_obj, machine_freq);
 
+STATIC mp_obj_t machine_idle(void) {
+    MICROPY_EVENT_POLL_HOOK;
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(machine_idle_obj, machine_idle);
+
+STATIC mp_obj_t machine_disable_irq(void) {
+    uint32_t state = MICROPY_BEGIN_ATOMIC_SECTION();
+    return mp_obj_new_int(state);
+}
+MP_DEFINE_CONST_FUN_OBJ_0(machine_disable_irq_obj, machine_disable_irq);
+
+STATIC mp_obj_t machine_enable_irq(mp_obj_t state_in) {
+    uint32_t state = mp_obj_get_int(state_in);
+    MICROPY_END_ATOMIC_SECTION(state);
+    return mp_const_none;
+}
+MP_DEFINE_CONST_FUN_OBJ_1(machine_enable_irq_obj, machine_enable_irq);
+
 STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__),            MP_ROM_QSTR(MP_QSTR_umachine) },
     { MP_ROM_QSTR(MP_QSTR_reset),               MP_ROM_PTR(&machine_reset_obj) },
@@ -67,6 +87,13 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_SoftSPI),             MP_ROM_PTR(&mp_machine_soft_spi_type) },
     { MP_ROM_QSTR(MP_QSTR_SPI),                 MP_ROM_PTR(&machine_spi_type) },
     { MP_ROM_QSTR(MP_QSTR_UART),                MP_ROM_PTR(&machine_uart_type) },
+
+    { MP_ROM_QSTR(MP_QSTR_idle),                MP_ROM_PTR(&machine_idle_obj) },
+
+    { MP_ROM_QSTR(MP_QSTR_disable_irq),         MP_ROM_PTR(&machine_disable_irq_obj) },
+    { MP_ROM_QSTR(MP_QSTR_enable_irq),          MP_ROM_PTR(&machine_enable_irq_obj) },
+
+    { MP_ROM_QSTR(MP_QSTR_time_pulse_us),       MP_ROM_PTR(&machine_time_pulse_us_obj) },
 };
 STATIC MP_DEFINE_CONST_DICT(machine_module_globals, machine_module_globals_table);
 
diff --git a/ports/mimxrt/mpconfigport.h b/ports/mimxrt/mpconfigport.h
index 8afdc8502cb81..e1e102797aebd 100644
--- a/ports/mimxrt/mpconfigport.h
+++ b/ports/mimxrt/mpconfigport.h
@@ -124,6 +124,7 @@ uint32_t trng_random_u32(void);
 #define MICROPY_PY_USELECT                  (1)
 #define MICROPY_PY_MACHINE                  (1)
 #define MICROPY_PY_MACHINE_PIN_MAKE_NEW     mp_pin_make_new
+#define MICROPY_PY_MACHINE_PULSE            (1)
 #define MICROPY_PY_MACHINE_I2C              (1)
 #define MICROPY_PY_MACHINE_SPI              (1)
 #define MICROPY_PY_FRAMEBUF                 (1)

From 7ec95c2768793c28351d13a9c471991bb2d6dcff Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 25 Jun 2021 16:53:20 +1000
Subject: [PATCH 1020/3533] extmod/uasyncio: Get addr and bind server socket
 before creating task.

Currently when using uasyncio.start_server() the socket configuration is
done inside a uasyncio.create_task() background function.  If the address
and port are already in use however this throws an OSError which cannot be
cleanly caught behind the create_task().

This commit moves the getaddrinfo and socket binding to the start_server()
function, and only creates the task if that succeeds.  This means that any
OSError from the initial socket configuration is propagated directly up the
call stack, compatible with CPython behaviour.

See #7444.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/uasyncio/stream.py                     | 27 +++++++++-------
 tests/net_hosted/uasyncio_start_server.py     | 31 +++++++++++++++++++
 tests/net_hosted/uasyncio_start_server.py.exp |  5 +++
 3 files changed, 51 insertions(+), 12 deletions(-)
 create mode 100644 tests/net_hosted/uasyncio_start_server.py
 create mode 100644 tests/net_hosted/uasyncio_start_server.py.exp

diff --git a/extmod/uasyncio/stream.py b/extmod/uasyncio/stream.py
index 3a68881da3f1c..8de2d2599fd1d 100644
--- a/extmod/uasyncio/stream.py
+++ b/extmod/uasyncio/stream.py
@@ -107,15 +107,7 @@ def close(self):
     async def wait_closed(self):
         await self.task
 
-    async def _serve(self, cb, host, port, backlog):
-        import usocket as socket
-
-        ai = socket.getaddrinfo(host, port)[0]  # TODO this is blocking!
-        s = socket.socket()
-        s.setblocking(False)
-        s.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
-        s.bind(ai[-1])
-        s.listen(backlog)
+    async def _serve(self, s, cb):
         # Accept incoming connections
         while True:
             try:
@@ -137,9 +129,20 @@ async def _serve(self, cb, host, port, backlog):
 # Helper function to start a TCP stream server, running as a new task
 # TODO could use an accept-callback on socket read activity instead of creating a task
 async def start_server(cb, host, port, backlog=5):
-    s = Server()
-    s.task = core.create_task(s._serve(cb, host, port, backlog))
-    return s
+    import usocket as socket
+
+    # Create and bind server socket.
+    host = socket.getaddrinfo(host, port)[0]  # TODO this is blocking!
+    s = socket.socket()
+    s.setblocking(False)
+    s.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
+    s.bind(host[-1])
+    s.listen(backlog)
+
+    # Create and return server object and task.
+    srv = Server()
+    srv.task = core.create_task(srv._serve(s, cb))
+    return srv
 
 
 ################################################################################
diff --git a/tests/net_hosted/uasyncio_start_server.py b/tests/net_hosted/uasyncio_start_server.py
new file mode 100644
index 0000000000000..f13402979f86b
--- /dev/null
+++ b/tests/net_hosted/uasyncio_start_server.py
@@ -0,0 +1,31 @@
+# Test basic behaviour of uasyncio.start_server()
+
+try:
+    import uasyncio as asyncio
+except ImportError:
+    try:
+        import asyncio
+    except ImportError:
+        print("SKIP")
+        raise SystemExit
+
+
+async def test():
+    # Test creating 2 servers using the same address
+    print("create server1")
+    server1 = await asyncio.start_server(None, "0.0.0.0", 8000)
+    try:
+        print("create server2")
+        await asyncio.start_server(None, "0.0.0.0", 8000)
+    except OSError as er:
+        print("OSError")
+
+    # Wait for server to close.
+    async with server1:
+        print("sleep")
+        await asyncio.sleep(0)
+
+    print("done")
+
+
+asyncio.run(test())
diff --git a/tests/net_hosted/uasyncio_start_server.py.exp b/tests/net_hosted/uasyncio_start_server.py.exp
new file mode 100644
index 0000000000000..0fb8e6a63b079
--- /dev/null
+++ b/tests/net_hosted/uasyncio_start_server.py.exp
@@ -0,0 +1,5 @@
+create server1
+create server2
+OSError
+sleep
+done

From 4ada56d4cb4c518d2a78f7d7a600a4537188310a Mon Sep 17 00:00:00 2001
From: Yonatan Goldschmidt <yon.goldschmidt@gmail.com>
Date: Thu, 12 Dec 2019 00:09:20 +0200
Subject: [PATCH 1021/3533] tools/makemanifest.py: Allow passing flags to
 mpy-tool.py.

---
 py/mkrules.mk         | 2 +-
 tools/makemanifest.py | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/py/mkrules.mk b/py/mkrules.mk
index b8d07ef56d551..038a49329b13f 100644
--- a/py/mkrules.mk
+++ b/py/mkrules.mk
@@ -139,7 +139,7 @@ $(HEADER_BUILD):
 ifneq ($(FROZEN_MANIFEST),)
 # to build frozen_content.c from a manifest
 $(BUILD)/frozen_content.c: FORCE $(BUILD)/genhdr/qstrdefs.generated.h
-	$(Q)$(MAKE_MANIFEST) -o $@ -v "MPY_DIR=$(TOP)" -v "MPY_LIB_DIR=$(MPY_LIB_DIR)" -v "PORT_DIR=$(shell pwd)" -v "BOARD_DIR=$(BOARD_DIR)" -b "$(BUILD)" $(if $(MPY_CROSS_FLAGS),-f"$(MPY_CROSS_FLAGS)",) $(FROZEN_MANIFEST)
+	$(Q)$(MAKE_MANIFEST) -o $@ -v "MPY_DIR=$(TOP)" -v "MPY_LIB_DIR=$(MPY_LIB_DIR)" -v "PORT_DIR=$(shell pwd)" -v "BOARD_DIR=$(BOARD_DIR)" -b "$(BUILD)" $(if $(MPY_CROSS_FLAGS),-f"$(MPY_CROSS_FLAGS)",) --mpy-tool-flags="$(MPY_TOOL_FLAGS)" $(FROZEN_MANIFEST)
 
 ifneq ($(FROZEN_DIR),)
 $(error FROZEN_DIR cannot be used in conjunction with FROZEN_MANIFEST)
diff --git a/tools/makemanifest.py b/tools/makemanifest.py
index 51de01dd8a3d5..7897a83c6ee10 100644
--- a/tools/makemanifest.py
+++ b/tools/makemanifest.py
@@ -248,6 +248,7 @@ def main():
         "-f", "--mpy-cross-flags", default="", help="flags to pass to mpy-cross"
     )
     cmd_parser.add_argument("-v", "--var", action="append", help="variables to substitute")
+    cmd_parser.add_argument("--mpy-tool-flags", default="", help="flags to pass to mpy-tool")
     cmd_parser.add_argument("files", nargs="+", help="input manifest list")
     args = cmd_parser.parse_args()
 
@@ -341,6 +342,7 @@ def main():
                 "-q",
                 args.build_dir + "/genhdr/qstrdefs.preprocessed.h",
             ]
+            + args.mpy_tool_flags.split()
             + mpy_files
         )
         if res != 0:

From 87985fc7e98454f16e8e054d846fa871688a2ef5 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 11 Jun 2021 10:47:51 +1000
Subject: [PATCH 1022/3533] stm32/boardctrl: Skip running main.py if boot.py
 had an error.

Previous behaviour was: if boot.py had an exception then main.py would
still run, which is arguably unexpected behaviour.

This commit changes the behaviour so main.py is not run if boot.py has an
error.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/boardctrl.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ports/stm32/boardctrl.c b/ports/stm32/boardctrl.c
index f1b7a4e81cc13..fa71d8e7f4e5a 100644
--- a/ports/stm32/boardctrl.c
+++ b/ports/stm32/boardctrl.c
@@ -155,6 +155,8 @@ int boardctrl_run_boot_py(boardctrl_state_t *state) {
             return BOARDCTRL_GOTO_SOFT_RESET_EXIT;
         }
         if (!ret) {
+            // There was an error, prevent main.py from running and flash LEDs.
+            state->reset_mode = BOARDCTRL_RESET_MODE_SAFE_MODE;
             flash_error(4);
         }
     }

From f4dce15c87c9ff6c51d8a9a7a80347465468b7af Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Sat, 19 Jun 2021 15:30:46 +0200
Subject: [PATCH 1023/3533] stm32/sdio: Fix undefined reference to DMA stream
 on H7.

Follow up to a96afae90f6e5d693173382561d06e583b0b5fa5
---
 ports/stm32/sdio.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/ports/stm32/sdio.c b/ports/stm32/sdio.c
index 0291e3e81d3c0..3fb84a4d81529 100644
--- a/ports/stm32/sdio.c
+++ b/ports/stm32/sdio.c
@@ -451,9 +451,11 @@ int sdio_transfer_cmd53(bool write, uint32_t block_size, uint32_t arg, size_t le
             #else
             printf("sdio_transfer_cmd53: timeout wr=%d len=%u dma=%u buf_idx=%u STA=%08x SDMMC=%08x:%08x IDMA=%08x\n", write, (uint)len, (uint)dma, sdmmc_buf_cur - buf, (uint)SDMMC->STA, (uint)SDMMC->DCOUNT, (uint)SDMMC->DCTRL, (uint)SDMMC->IDMACTRL);
             #endif
+            #if defined(STM32F7)
             if (sdmmc_dma) {
                 dma_nohal_deinit(&dma_SDIO_0);
             }
+            #endif
             return -MP_ETIMEDOUT;
         }
     }
@@ -466,9 +468,11 @@ int sdio_transfer_cmd53(bool write, uint32_t block_size, uint32_t arg, size_t le
         #else
         printf("sdio_transfer_cmd53: error=%08lx wr=%d len=%u dma=%u buf_idx=%u STA=%08x SDMMC=%08x:%08x IDMA=%08x\n", sdmmc_error, write, (uint)len, (uint)dma, sdmmc_buf_cur - buf, (uint)SDMMC->STA, (uint)SDMMC->DCOUNT, (uint)SDMMC->DCTRL, (uint)SDMMC->IDMACTRL);
         #endif
+        #if defined(STM32F7)
         if (sdmmc_dma) {
             dma_nohal_deinit(&dma_SDIO_0);
         }
+        #endif
         return -(0x1000000 | sdmmc_error);
     }
 
@@ -478,7 +482,9 @@ int sdio_transfer_cmd53(bool write, uint32_t block_size, uint32_t arg, size_t le
             return -MP_EIO;
         }
     } else {
+        #if defined(STM32F7)
         dma_nohal_deinit(&dma_SDIO_0);
+        #endif
     }
 
     return 0;

From a32a7421d668c355629f28275eb756068633c41a Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Sat, 19 Jun 2021 19:56:49 +0200
Subject: [PATCH 1024/3533] stm32/dma: Add DMAMUX configuration for H7 to fix
 dma_nohal_init.

Fixes issue #5619.
---
 ports/stm32/dma.c | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/ports/stm32/dma.c b/ports/stm32/dma.c
index d4b41771b0810..de308869171fa 100644
--- a/ports/stm32/dma.c
+++ b/ports/stm32/dma.c
@@ -1120,6 +1120,36 @@ void dma_nohal_init(const dma_descr_t *descr, uint32_t config) {
         init->FIFOMode              // DMDIS
         | init->FIFOThreshold       // FTH
     ;
+
+    #if defined(STM32H7)
+    // Configure DMAMUX
+    uint32_t request = descr->sub_instance & DMAMUX_CxCR_DMAREQ_ID;
+    if ((dma >= DMA1_Stream0 && dma <= DMA1_Stream7) || (dma >= DMA2_Stream0 && dma <= DMA2_Stream7)) {
+        // DMA1/2 channels 0 to 7 are hardwired to DMAMUX1 channels 0-15.
+        uint32_t stream = (((uint32_t)dma & 0xff) - 16) / 24 + ((dma >= DMA2_Stream0) ? 8 : 0);
+        // Set DMAMUX channel peripheral request.
+        ((DMAMUX_Channel_TypeDef *)(((uint32_t)DMAMUX1_Channel0) + (stream * 4)))->CCR = request;
+        DMAMUX1_ChannelStatus->CFR = 1 << (stream & 0x1F);
+        // Configure DMAMUX request generator if needed.
+        if (request >= DMA_REQUEST_GENERATOR0 && request <= DMA_REQUEST_GENERATOR7) {
+            ((DMAMUX_RequestGen_TypeDef *)(((uint32_t)DMAMUX1_RequestGenerator0) + ((request - 1) * 4)))->RGCR = 0;
+            DMAMUX1_RequestGenStatus->RGCFR = 1 << (request - 1);
+        }
+    #if ENABLE_BDMA // TODO: BDMA is Not currently supported by this driver.
+    } else if (dma >= BDMA_Channel0 && dma <= BDMA_Channel7) {
+        // BDMA channels 0 to 7 are hardwired to DMAMUX2 channels 0-7.
+        uint32_t stream = (((uint32_t)dma & 0xff) - 8) / 20;
+        // Set DMAMUX channel peripheral request.
+        ((DMAMUX_Channel_TypeDef *)(((uint32_t)DMAMUX2_Channel0) + (stream * 4)))->CCR = request;
+        DMAMUX2_ChannelStatus->CFR = 1 << (stream & 0x1F);
+        // Configure DMAMUX request generator if needed.
+        if (request >= DMA_REQUEST_GENERATOR0 && request <= DMA_REQUEST_GENERATOR7) {
+            ((DMAMUX_RequestGen_TypeDef *)(((uint32_t)DMAMUX2_RequestGenerator0) + ((request - 1) * 4)))->RGCR = 0;
+            DMAMUX2_RequestGenStatus->RGCFR = 1 << (request - 1);
+        }
+    #endif // ENABLE_BDMA
+    }
+    #endif // STM32H7
 }
 
 void dma_nohal_deinit(const dma_descr_t *descr) {

From 8182f34584d577da4ff8e26acbe677765cfbca23 Mon Sep 17 00:00:00 2001
From: David Lechner <david@pybricks.com>
Date: Mon, 28 Jun 2021 12:03:01 -0500
Subject: [PATCH 1025/3533] stm32/main: Call mp_deinit() at end of main.

This adds a call to mp_deinit() in the main function of the STM32 port.
This enables the use of MICROPY_PORT_DEINIT_FUNC on that port, as well as
cleaning up the GIL if threading is enabled.
---
 ports/stm32/main.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/stm32/main.c b/ports/stm32/main.c
index c8de2fd868b9f..6df7374ccee6a 100644
--- a/ports/stm32/main.c
+++ b/ports/stm32/main.c
@@ -662,6 +662,7 @@ void stm32_main(uint32_t reset_mode) {
     MICROPY_BOARD_END_SOFT_RESET(&state);
 
     gc_sweep_all();
+    mp_deinit();
 
     goto soft_reset;
 }

From efa97beb992049978f0e7be6e4e2f01249054362 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Wed, 23 Jun 2021 21:18:45 +0200
Subject: [PATCH 1026/3533] tools/autobuild: Add mimxrt port to build scripts
 for nightly builds.

The firmware for Teensy 4.0, Teensy 4.1 and MIMXRT1020_EVK are created.
Users of other MIMXRT10xx_EVK boards should be able to build the firmware
themselves, they might need specific DEBUG settings.

The Makefile had to be changed in order to build the .bin file as well.
---
 ports/mimxrt/Makefile                  |  2 +-
 tools/autobuild/autobuild.sh           |  2 ++
 tools/autobuild/build-mimxrt-latest.sh | 36 ++++++++++++++++++++++++++
 3 files changed, 39 insertions(+), 1 deletion(-)
 create mode 100755 tools/autobuild/build-mimxrt-latest.sh

diff --git a/ports/mimxrt/Makefile b/ports/mimxrt/Makefile
index 870248373e47b..fdb1325fddcbb 100644
--- a/ports/mimxrt/Makefile
+++ b/ports/mimxrt/Makefile
@@ -297,7 +297,7 @@ OBJ += $(BUILD)/pins_gen.o
 # Workaround for bug in older gcc, warning on "static usbd_device_t _usbd_dev = { 0 };"
 $(BUILD)/lib/tinyusb/src/device/usbd.o: CFLAGS += -Wno-missing-braces
 
-all: $(BUILD)/firmware.hex
+all: $(BUILD)/firmware.hex $(BUILD)/firmware.bin
 
 $(BUILD)/firmware.elf: $(OBJ)
 	$(ECHO) "LINK $@"
diff --git a/tools/autobuild/autobuild.sh b/tools/autobuild/autobuild.sh
index 45822f2b7dc25..0498443811f57 100755
--- a/tools/autobuild/autobuild.sh
+++ b/tools/autobuild/autobuild.sh
@@ -66,6 +66,8 @@ cd ../esp32
 ${AUTODIR}/build-esp32-latest.sh ${IDF_PATH_V4} ${FW_TAG} ${LOCAL_FIRMWARE}
 cd ../rp2
 ${AUTODIR}/build-rp2-latest.sh ${FW_TAG} ${LOCAL_FIRMWARE}
+cd ../mimxrt
+${AUTODIR}/build-mimxrt-latest.sh ${FW_TAG} ${LOCAL_FIRMWARE}
 
 popd
 
diff --git a/tools/autobuild/build-mimxrt-latest.sh b/tools/autobuild/build-mimxrt-latest.sh
new file mode 100755
index 0000000000000..e36b294acaf28
--- /dev/null
+++ b/tools/autobuild/build-mimxrt-latest.sh
@@ -0,0 +1,36 @@
+#!/bin/bash
+
+# function for building firmware
+function do_build() {
+    descr=$1
+    board=$2
+    ext=$3
+    shift
+    shift
+    shift
+    echo "building $descr $board"
+    build_dir=/tmp/mimxrt-build-$board
+    $MICROPY_AUTOBUILD_MAKE $@ BOARD=$board BUILD=$build_dir || exit 1
+    mv $build_dir/firmware.$ext $dest_dir/$descr$fw_tag.$ext
+    rm -rf $build_dir
+}
+
+# check/get parameters
+if [ $# != 2 ]; then
+    echo "usage: $0 <fw-tag> <dest-dir>"
+    exit 1
+fi
+
+fw_tag=$1
+dest_dir=$2
+
+# check we are in the correct directory
+if [ ! -r modmimxrt.c ]; then
+    echo "must be in mimxrt directory"
+    exit 1
+fi
+
+# build the boards
+do_build TEENSY40 TEENSY40 hex
+do_build TEENSY41 TEENSY41 hex
+do_build MIMXRT1020_EVK MIMXRT1020_EVK bin

From 41adf178309759d5965c15972f04987a2635314c Mon Sep 17 00:00:00 2001
From: Frank Pilhofer <frank.pilhofer@zuehlke.com>
Date: Fri, 25 Jun 2021 01:51:27 -0700
Subject: [PATCH 1027/3533] tools/pyboard.py: Add cmd-line option to make soft
 reset configurable.

Leaves the default as-is, but allows using --no-soft-reset to disable the
soft reset when connecting.
---
 tools/pyboard.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/tools/pyboard.py b/tools/pyboard.py
index 7d06aa847d7af..e460c69e24c5d 100755
--- a/tools/pyboard.py
+++ b/tools/pyboard.py
@@ -656,6 +656,12 @@ def main():
         help="seconds to wait for USB connected board to become available",
     )
     group = cmd_parser.add_mutually_exclusive_group()
+    group.add_argument(
+        "--soft-reset",
+        default=True,
+        action=argparse.BooleanOptionalAction,
+        help="Whether to perform a soft reset when connecting to the board.",
+    )
     group.add_argument(
         "--follow",
         action="store_true",
@@ -695,7 +701,7 @@ def main():
         # we must enter raw-REPL mode to execute commands
         # this will do a soft-reset of the board
         try:
-            pyb.enter_raw_repl()
+            pyb.enter_raw_repl(args.soft_reset)
         except PyboardError as er:
             print(er)
             pyb.close()

From 58e4d723383dfd9856520728b0920ff20fa76407 Mon Sep 17 00:00:00 2001
From: David Lechner <david@pybricks.com>
Date: Wed, 8 Apr 2020 12:17:28 -0500
Subject: [PATCH 1028/3533] py/objexcept: Pretty print OSError also when it has
 2 arguments.

This extends pretty-printing of OSError's to handle two arguments when the
exception name is known.

Signed-off-by: David Lechner <david@pybricks.com>
---
 py/objexcept.c             | 25 ++++++++++++++++---------
 tests/basics/errno1.py     |  4 ++++
 tests/basics/errno1.py.exp |  2 ++
 3 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/py/objexcept.c b/py/objexcept.c
index f03bb1b416cfc..a10bd2c18788a 100644
--- a/py/objexcept.c
+++ b/py/objexcept.c
@@ -163,17 +163,24 @@ void mp_obj_exception_print(const mp_print_t *print, mp_obj_t o_in, mp_print_kin
         if (o->args == NULL || o->args->len == 0) {
             mp_print_str(print, "");
             return;
-        } else if (o->args->len == 1) {
-            #if MICROPY_PY_UERRNO
-            // try to provide a nice OSError error message
-            if (o->base.type == &mp_type_OSError && mp_obj_is_small_int(o->args->items[0])) {
-                qstr qst = mp_errno_to_str(o->args->items[0]);
-                if (qst != MP_QSTRnull) {
-                    mp_printf(print, "[Errno " INT_FMT "] %q", MP_OBJ_SMALL_INT_VALUE(o->args->items[0]), qst);
-                    return;
+        }
+
+        #if MICROPY_PY_UERRNO
+        // try to provide a nice OSError error message
+        if (o->base.type == &mp_type_OSError && o->args->len > 0 && o->args->len < 3 && mp_obj_is_small_int(o->args->items[0])) {
+            qstr qst = mp_errno_to_str(o->args->items[0]);
+            if (qst != MP_QSTRnull) {
+                mp_printf(print, "[Errno " INT_FMT "] %q", MP_OBJ_SMALL_INT_VALUE(o->args->items[0]), qst);
+                if (o->args->len > 1) {
+                    mp_print_str(print, ": ");
+                    mp_obj_print_helper(print, o->args->items[1], PRINT_STR);
                 }
+                return;
             }
-            #endif
+        }
+        #endif
+
+        if (o->args->len == 1) {
             mp_obj_print_helper(print, o->args->items[0], PRINT_STR);
             return;
         }
diff --git a/tests/basics/errno1.py b/tests/basics/errno1.py
index d7a5ccd542ac5..d9a895a972d62 100644
--- a/tests/basics/errno1.py
+++ b/tests/basics/errno1.py
@@ -12,6 +12,10 @@
 # check that errors are rendered in a nice way
 msg = str(OSError(uerrno.EIO))
 print(msg[:7], msg[-5:])
+msg = str(OSError(uerrno.EIO, "details"))
+print(msg[:7], msg[-14:])
+msg = str(OSError(uerrno.EIO, "details", "more details"))
+print(msg[:1], msg[-28:])
 
 # check that unknown errno is still rendered
 print(str(OSError(9999)))
diff --git a/tests/basics/errno1.py.exp b/tests/basics/errno1.py.exp
index 7dd22757dddcd..58605b4767a2b 100644
--- a/tests/basics/errno1.py.exp
+++ b/tests/basics/errno1.py.exp
@@ -1,4 +1,6 @@
 <class 'int'>
 [Errno  ] EIO
+[Errno  ] EIO: details
+( , 'details', 'more details')
 9999
 uerrno

From 18e48a71ee69557a5340c8652f2e73e586063be3 Mon Sep 17 00:00:00 2001
From: Jonathan Hogg <me@jonathanhogg.com>
Date: Wed, 30 Jun 2021 19:00:50 +0100
Subject: [PATCH 1029/3533] esp32/esp32_rmt: Enhance RMT with idle_level and
 write_pulses modes.

This change allows specification of the idle level and TX carrier output
level (through changed initialisation API), and more flexible specification
of pulses for write_pulses.

This is a breaking change for the esp32.RMT constructor API.  Previous code
of this form:

    esp32.RMT(..., carrier_duty_percent=D, carrier_freq=F)

will now raise an exception and should be changed to:

    esp32.RMT(..., tx_carrier=(F, D, 1))
---
 ports/esp32/esp32_rmt.c | 147 +++++++++++++++++++++++-----------------
 1 file changed, 84 insertions(+), 63 deletions(-)

diff --git a/ports/esp32/esp32_rmt.c b/ports/esp32/esp32_rmt.c
index 8c8f0f2e06ca5..37ecef324877d 100644
--- a/ports/esp32/esp32_rmt.c
+++ b/ports/esp32/esp32_rmt.c
@@ -52,8 +52,6 @@ typedef struct _esp32_rmt_obj_t {
     uint8_t channel_id;
     gpio_num_t pin;
     uint8_t clock_div;
-    uint16_t carrier_duty_percent;
-    uint32_t carrier_freq;
     mp_uint_t num_items;
     rmt_item32_t *items;
     bool loop_en;
@@ -64,24 +62,16 @@ STATIC mp_obj_t esp32_rmt_make_new(const mp_obj_type_t *type, size_t n_args, siz
         { MP_QSTR_id,        MP_ARG_REQUIRED | MP_ARG_INT, {.u_int = -1} },
         { MP_QSTR_pin,       MP_ARG_REQUIRED | MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = mp_const_none} },
         { MP_QSTR_clock_div,                   MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 8} }, // 100ns resolution
-        { MP_QSTR_carrier_duty_percent,        MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 50} },
-        { MP_QSTR_carrier_freq,                MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 0} },
+        { MP_QSTR_idle_level,                  MP_ARG_KW_ONLY | MP_ARG_BOOL, {.u_bool = false} }, // low voltage
+        { MP_QSTR_tx_carrier,                  MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = mp_const_none} }, // no carrier
     };
     mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
     mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
     mp_uint_t channel_id = args[0].u_int;
     gpio_num_t pin_id = machine_pin_get_id(args[1].u_obj);
     mp_uint_t clock_div = args[2].u_int;
-
-    bool carrier_en = false;
-    mp_uint_t carrier_duty_percent = 0;
-    mp_uint_t carrier_freq = 0;
-
-    if (args[4].u_int > 0) {
-        carrier_en = true;
-        carrier_duty_percent = args[3].u_int;
-        carrier_freq = args[4].u_int;
-    }
+    mp_uint_t idle_level = args[3].u_bool;
+    mp_obj_t tx_carrier_obj = args[4].u_obj;
 
     if (clock_div < 1 || clock_div > 255) {
         mp_raise_ValueError(MP_ERROR_TEXT("clock_div must be between 1 and 255"));
@@ -92,8 +82,6 @@ STATIC mp_obj_t esp32_rmt_make_new(const mp_obj_type_t *type, size_t n_args, siz
     self->channel_id = channel_id;
     self->pin = pin_id;
     self->clock_div = clock_div;
-    self->carrier_duty_percent = carrier_duty_percent;
-    self->carrier_freq = carrier_freq;
     self->loop_en = false;
 
     rmt_config_t config = {0};
@@ -103,12 +91,30 @@ STATIC mp_obj_t esp32_rmt_make_new(const mp_obj_type_t *type, size_t n_args, siz
     config.mem_block_num = 1;
     config.tx_config.loop_en = 0;
 
-    config.tx_config.carrier_en = carrier_en;
+    if (tx_carrier_obj != mp_const_none) {
+        mp_obj_t *tx_carrier_details = NULL;
+        mp_obj_get_array_fixed_n(tx_carrier_obj, 3, &tx_carrier_details);
+        mp_uint_t frequency = mp_obj_get_int(tx_carrier_details[0]);
+        mp_uint_t duty = mp_obj_get_int(tx_carrier_details[1]);
+        mp_uint_t level = mp_obj_is_true(tx_carrier_details[2]);
+
+        if (frequency == 0) {
+            mp_raise_ValueError(MP_ERROR_TEXT("tx_carrier frequency must be >0"));
+        }
+        if (duty > 100) {
+            mp_raise_ValueError(MP_ERROR_TEXT("tx_carrier duty must be 0..100"));
+        }
+
+        config.tx_config.carrier_en = 1;
+        config.tx_config.carrier_freq_hz = frequency;
+        config.tx_config.carrier_duty_percent = duty;
+        config.tx_config.carrier_level = level;
+    } else {
+        config.tx_config.carrier_en = 0;
+    }
+
     config.tx_config.idle_output_en = 1;
-    config.tx_config.idle_level = 0;
-    config.tx_config.carrier_duty_percent = self->carrier_duty_percent;
-    config.tx_config.carrier_freq_hz = self->carrier_freq;
-    config.tx_config.carrier_level = 1;
+    config.tx_config.idle_level = idle_level;
 
     config.clk_div = self->clock_div;
 
@@ -121,14 +127,11 @@ STATIC mp_obj_t esp32_rmt_make_new(const mp_obj_type_t *type, size_t n_args, siz
 STATIC void esp32_rmt_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     esp32_rmt_obj_t *self = MP_OBJ_TO_PTR(self_in);
     if (self->pin != -1) {
-        mp_printf(print, "RMT(channel=%u, pin=%u, source_freq=%u, clock_div=%u",
-            self->channel_id, self->pin, APB_CLK_FREQ, self->clock_div);
-        if (self->carrier_freq > 0) {
-            mp_printf(print, ", carrier_freq=%u, carrier_duty_percent=%u)",
-                self->carrier_freq, self->carrier_duty_percent);
-        } else {
-            mp_printf(print, ")");
-        }
+        bool idle_output_en;
+        rmt_idle_level_t idle_level;
+        check_esp_err(rmt_get_idle_level(self->channel_id, &idle_output_en, &idle_level));
+        mp_printf(print, "RMT(channel=%u, pin=%u, source_freq=%u, clock_div=%u, idle_level=%u)",
+            self->channel_id, self->pin, APB_CLK_FREQ, self->clock_div, idle_level);
     } else {
         mp_printf(print, "RMT()");
     }
@@ -162,7 +165,7 @@ STATIC mp_obj_t esp32_rmt_clock_div(mp_obj_t self_in) {
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(esp32_rmt_clock_div_obj, esp32_rmt_clock_div);
 
 // Query whether the channel has finished sending pulses. Takes an optional
-// timeout (in ticks of the 80MHz clock), returning true if the pulse stream has
+// timeout (in milliseconds), returning true if the pulse stream has
 // completed or false if they are still transmitting (or timeout is reached).
 STATIC mp_obj_t esp32_rmt_wait_done(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     static const mp_arg_t allowed_args[] = {
@@ -175,7 +178,7 @@ STATIC mp_obj_t esp32_rmt_wait_done(size_t n_args, const mp_obj_t *pos_args, mp_
 
     esp32_rmt_obj_t *self = MP_OBJ_TO_PTR(args[0].u_obj);
 
-    esp_err_t err = rmt_wait_tx_done(self->channel_id, args[1].u_int);
+    esp_err_t err = rmt_wait_tx_done(self->channel_id, args[1].u_int / portTICK_PERIOD_MS);
     return err == ESP_OK ? mp_const_true : mp_const_false;
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_KW(esp32_rmt_wait_done_obj, 1, esp32_rmt_wait_done);
@@ -195,45 +198,63 @@ STATIC mp_obj_t esp32_rmt_loop(mp_obj_t self_in, mp_obj_t loop) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_2(esp32_rmt_loop_obj, esp32_rmt_loop);
 
-STATIC mp_obj_t esp32_rmt_write_pulses(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
-    static const mp_arg_t allowed_args[] = {
-        { MP_QSTR_self,   MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_obj = mp_const_none} },
-        { MP_QSTR_pulses, MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_obj = mp_const_none} },
-        { MP_QSTR_start,  MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 1} },
-    };
-
-    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
-    mp_arg_parse_all(n_args, pos_args, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
-
-    esp32_rmt_obj_t *self = MP_OBJ_TO_PTR(args[0].u_obj);
-    mp_obj_t pulses = args[1].u_obj;
-    mp_uint_t start = args[2].u_int;
-
-    if (start > 1) {
-        mp_raise_ValueError(MP_ERROR_TEXT("start must be 0 or 1"));
+STATIC mp_obj_t esp32_rmt_write_pulses(size_t n_args, const mp_obj_t *args) {
+    esp32_rmt_obj_t *self = MP_OBJ_TO_PTR(args[0]);
+    mp_obj_t duration_obj = args[1];
+    mp_obj_t data_obj = n_args > 2 ? args[2] : mp_const_true;
+
+    mp_uint_t duration = 0;
+    size_t duration_length = 0;
+    mp_obj_t *duration_ptr = NULL;
+    mp_uint_t data = 0;
+    size_t data_length = 0;
+    mp_obj_t *data_ptr = NULL;
+    mp_uint_t num_pulses = 0;
+
+    if (!(mp_obj_is_type(data_obj, &mp_type_tuple) || mp_obj_is_type(data_obj, &mp_type_list))) {
+        // Mode 1: array of durations, toggle initial data value
+        mp_obj_get_array(duration_obj, &duration_length, &duration_ptr);
+        data = mp_obj_is_true(data_obj);
+        num_pulses = duration_length;
+    } else if (mp_obj_is_int(duration_obj)) {
+        // Mode 2: constant duration, array of data values
+        duration = mp_obj_get_int(duration_obj);
+        mp_obj_get_array(data_obj, &data_length, &data_ptr);
+        num_pulses = data_length;
+    } else {
+        // Mode 3: arrays of durations and data values
+        mp_obj_get_array(duration_obj, &duration_length, &duration_ptr);
+        mp_obj_get_array(data_obj, &data_length, &data_ptr);
+        if (duration_length != data_length) {
+            mp_raise_ValueError(MP_ERROR_TEXT("duration and data must have same length"));
+        }
+        num_pulses = duration_length;
     }
 
-    size_t pulses_length = 0;
-    mp_obj_t *pulses_ptr = NULL;
-    mp_obj_get_array(pulses, &pulses_length, &pulses_ptr);
-
-    mp_uint_t num_items = (pulses_length / 2) + (pulses_length % 2);
-    if (self->loop_en && num_items > 63) {
-        mp_raise_ValueError(MP_ERROR_TEXT("too many pulses for loop"));
+    if (num_pulses == 0) {
+        mp_raise_ValueError(MP_ERROR_TEXT("No pulses"));
+    }
+    if (self->loop_en && num_pulses > 126) {
+        mp_raise_ValueError(MP_ERROR_TEXT("Too many pulses for loop"));
     }
 
+    mp_uint_t num_items = (num_pulses / 2) + (num_pulses % 2);
     if (num_items > self->num_items) {
         self->items = (rmt_item32_t *)m_realloc(self->items, num_items * sizeof(rmt_item32_t *));
         self->num_items = num_items;
     }
 
-    for (mp_uint_t item_index = 0; item_index < num_items; item_index++) {
-        mp_uint_t pulse_index = item_index * 2;
-        self->items[item_index].duration0 = mp_obj_get_int(pulses_ptr[pulse_index++]);
-        self->items[item_index].level0 = start++; // Note that start _could_ wrap.
-        if (pulse_index < pulses_length) {
-            self->items[item_index].duration1 = mp_obj_get_int(pulses_ptr[pulse_index]);
-            self->items[item_index].level1 = start++;
+    for (mp_uint_t item_index = 0, pulse_index = 0; item_index < num_items; item_index++) {
+        self->items[item_index].duration0 = duration_length ? mp_obj_get_int(duration_ptr[pulse_index]) : duration;
+        self->items[item_index].level0 = data_length ? mp_obj_is_true(data_ptr[pulse_index]) : data++;
+        pulse_index++;
+        if (pulse_index < num_pulses) {
+            self->items[item_index].duration1 = duration_length ? mp_obj_get_int(duration_ptr[pulse_index]) : duration;
+            self->items[item_index].level1 = data_length ? mp_obj_is_true(data_ptr[pulse_index]) : data++;
+            pulse_index++;
+        } else {
+            self->items[item_index].duration1 = 0;
+            self->items[item_index].level1 = 0;
         }
     }
 
@@ -247,7 +268,7 @@ STATIC mp_obj_t esp32_rmt_write_pulses(size_t n_args, const mp_obj_t *pos_args,
         check_esp_err(rmt_wait_tx_done(self->channel_id, portMAX_DELAY));
     }
 
-    check_esp_err(rmt_write_items(self->channel_id, self->items, num_items, false /* non-blocking */));
+    check_esp_err(rmt_write_items(self->channel_id, self->items, num_items, false));
 
     if (self->loop_en) {
         check_esp_err(rmt_set_tx_intr_en(self->channel_id, false));
@@ -256,7 +277,7 @@ STATIC mp_obj_t esp32_rmt_write_pulses(size_t n_args, const mp_obj_t *pos_args,
 
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(esp32_rmt_write_pulses_obj, 2, esp32_rmt_write_pulses);
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(esp32_rmt_write_pulses_obj, 2, 3, esp32_rmt_write_pulses);
 
 STATIC const mp_rom_map_elem_t esp32_rmt_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR___del__), MP_ROM_PTR(&esp32_rmt_deinit_obj) },

From 0b3332c8e14db8a229070224955062f143b138cc Mon Sep 17 00:00:00 2001
From: Jonathan Hogg <me@jonathanhogg.com>
Date: Wed, 30 Jun 2021 19:01:16 +0100
Subject: [PATCH 1030/3533] docs/library: Document new esp32.RMT features and
 fix wait_done.

Add new API for specifying the idle level and TX carrier output level, and
new write_pulses modes of operation.  Also fix wait_done documentation
which was inverted and wrong about timing.
---
 docs/library/esp32.rst | 81 +++++++++++++++++++++++-------------------
 1 file changed, 45 insertions(+), 36 deletions(-)

diff --git a/docs/library/esp32.rst b/docs/library/esp32.rst
index 1cfb304c14b88..fc90968037bc4 100644
--- a/docs/library/esp32.rst
+++ b/docs/library/esp32.rst
@@ -150,14 +150,13 @@ used to transmit or receive many other types of digital signals::
     from machine import Pin
 
     r = esp32.RMT(0, pin=Pin(18), clock_div=8)
-    r  # RMT(channel=0, pin=18, source_freq=80000000, clock_div=8)
+    r  # RMT(channel=0, pin=18, source_freq=80000000, clock_div=8, idle_level=0)
 
-    # To use carrier frequency
-    r = esp32.RMT(0, pin=Pin(18), clock_div=8, carrier_freq=38000)
-    r  # RMT(channel=0, pin=18, source_freq=80000000, clock_div=8, carrier_freq=38000, carrier_duty_percent=50)
+    # To apply a carrier frequency to the high output
+    r = esp32.RMT(0, pin=Pin(18), clock_div=8, tx_carrier=(38000, 50, 1))
 
     # The channel resolution is 100ns (1/(source_freq/clock_div)).
-    r.write_pulses((1, 20, 2, 40), start=0)  # Send 0 for 100ns, 1 for 2000ns, 0 for 200ns, 1 for 4000ns
+    r.write_pulses((1, 20, 2, 40), 0)  # Send 0 for 100ns, 1 for 2000ns, 0 for 200ns, 1 for 4000ns
 
 The input to the RMT module is an 80MHz clock (in the future it may be able to
 configure the input clock but, for now, it's fixed). ``clock_div`` *divides*
@@ -169,9 +168,6 @@ define the pulses.
 multiplying the resolution by a 15-bit (0-32,768) number. There are eight
 channels (0-7) and each can have a different clock divider.
 
-To enable the carrier frequency feature of the esp32 hardware, specify the
-``carrier_freq`` as something like 38000, a typical IR carrier frequency.
-
 So, in the example above, the 80MHz clock is divided by 8. Thus the
 resolution is (1/(80Mhz/8)) 100ns. Since the ``start`` level is 0 and toggles
 with each number, the bitstream is ``0101`` with durations of [100ns, 2000ns,
@@ -186,16 +182,21 @@ For more details see Espressif's `ESP-IDF RMT documentation.
    *beta feature* and the interface may change in the future.
 
 
-.. class:: RMT(channel, *, pin=None, clock_div=8, carrier_freq=0, carrier_duty_percent=50)
+.. class:: RMT(channel, *, pin=None, clock_div=8, idle_level=False, tx_carrier=None)
 
     This class provides access to one of the eight RMT channels. *channel* is
     required and identifies which RMT channel (0-7) will be configured. *pin*,
     also required, configures which Pin is bound to the RMT channel. *clock_div*
     is an 8-bit clock divider that divides the source clock (80MHz) to the RMT
-    channel allowing the resolution to be specified. *carrier_freq* is used to
-    enable the carrier feature and specify its frequency, default value is ``0``
-    (not enabled).  To enable, specify a positive integer.  *carrier_duty_percent*
-    defaults to 50.
+    channel allowing the resolution to be specified. *idle_level* specifies
+    what level the output will be when no transmission is in progress and can
+    be any value that converts to a boolean, with ``True`` representing high
+    voltage and ``False`` representing low.
+
+    To enable the transmission carrier feature, *tx_carrier* should be a tuple
+    of three positive integers: carrier frequency, duty percent (``0`` to
+    ``100``) and the output level to apply the carrier to (a boolean as per
+    *idle_level*).
 
 .. method:: RMT.source_freq()
 
@@ -207,39 +208,47 @@ For more details see Espressif's `ESP-IDF RMT documentation.
     Return the clock divider. Note that the channel resolution is
     ``1 / (source_freq / clock_div)``.
 
-.. method:: RMT.wait_done(timeout=0)
+.. method:: RMT.wait_done(*, timeout=0)
 
-    Returns ``True`` if the channel is currently transmitting a stream of pulses
-    started with a call to `RMT.write_pulses`.
-
-    If *timeout* (defined in ticks of ``source_freq / clock_div``) is specified
-    the method will wait for *timeout* or until transmission is complete,
-    returning ``False`` if the channel continues to transmit. If looping is
-    enabled with `RMT.loop` and a stream has started, then this method will
-    always (wait and) return ``False``.
+    Returns ``True`` if the channel is idle or ``False`` if a sequence of
+    pulses started with `RMT.write_pulses` is being transmitted. If the
+    *timeout* keyword argument is given then block for up to this many
+    milliseconds for transmission to complete.
 
 .. method:: RMT.loop(enable_loop)
 
     Configure looping on the channel. *enable_loop* is bool, set to ``True`` to
     enable looping on the *next* call to `RMT.write_pulses`. If called with
-    ``False`` while a looping stream is currently being transmitted then the
-    current set of pulses will be completed before transmission stops.
+    ``False`` while a looping sequence is currently being transmitted then the
+    current loop iteration will be completed and then transmission will stop.
+
+.. method:: RMT.write_pulses(duration, data=True)
+
+    Begin transmitting a sequence. There are three ways to specify this:
+
+    **Mode 1:** *duration* is a list or tuple of durations. The optional *data*
+    argument specifies the initial output level. The output level will toggle
+    after each duration.
+
+    **Mode 2:** *duration* is a positive integer and *data* is a list or tuple
+    of output levels. *duration* specifies a fixed duration for each.
 
-.. method:: RMT.write_pulses(pulses, start)
+    **Mode 3:** *duration* and *data* are lists or tuples of equal length,
+    specifying individual durations and the output level for each.
 
-    Begin sending *pulses*, a list or tuple defining the stream of pulses. The
-    length of each pulse is defined by a number to be multiplied by the channel
-    resolution ``(1 / (source_freq / clock_div))``. *start* defines whether the
-    stream starts at 0 or 1.
+    Durations are in integer units of the channel resolution (as described
+    above), between 1 and 32767 units. Output levels are any value that can
+    be converted to a boolean, with ``True`` representing high voltage and
+    ``False`` representing low.
 
-    If transmission of a stream is currently in progress then this method will
-    block until transmission of that stream has ended before beginning sending
-    *pulses*.
+    If transmission of an earlier sequence is in progress then this method will
+    block until that transmission is complete before beginning the new sequence.
 
-    If looping is enabled with `RMT.loop`, the stream of pulses will be repeated
-    indefinitely. Further calls to `RMT.write_pulses` will end the previous
-    stream - blocking until the last set of pulses has been transmitted -
-    before starting the next stream.
+    If looping has been enabled with `RMT.loop`, the sequence will be
+    repeated indefinitely. Further calls to this method will block until the
+    end of the current loop iteration before immediately beginning to loop the
+    new sequence of pulses. Looping sequences longer than 126 pulses is not
+    supported by the hardware.
 
 
 Ultra-Low-Power co-processor

From 076caf317e0a2ea689723d4295b5a6236a09d010 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 2 Jul 2021 23:10:22 +1000
Subject: [PATCH 1031/3533] javascript/Makefile: Suppress compiler errors from
 array bounds.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/javascript/Makefile | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ports/javascript/Makefile b/ports/javascript/Makefile
index 171f53b95286f..9cc45d3ef941e 100644
--- a/ports/javascript/Makefile
+++ b/ports/javascript/Makefile
@@ -59,4 +59,7 @@ test: $(BUILD)/micropython.js $(TOP)/tests/run-tests.py
 	$(eval DIRNAME=ports/$(notdir $(CURDIR)))
 	cd $(TOP)/tests && MICROPY_MICROPYTHON=../ports/javascript/node_run.sh ./run-tests.py -j1
 
+# Disable errors for array-bounds warnings on "sp[-MP_OBJ_ITER_BUF_NSLOTS + 2]" access.
+$(BUILD)/py/vm.o: CFLAGS += -Wno-error=array-bounds
+
 include $(TOP)/py/mkrules.mk

From d1decdfa937368bc83adf6829eba6743d75136d0 Mon Sep 17 00:00:00 2001
From: Andrew Scheller <github@loowis.durge.org>
Date: Fri, 2 Jul 2021 09:50:25 +0100
Subject: [PATCH 1032/3533] tools/mpremote: Swap order of PID and VID in
 connect-list output.

Fixes issue #7481.
---
 tools/mpremote/mpremote/main.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/mpremote/mpremote/main.py b/tools/mpremote/mpremote/main.py
index b7c46a1f11f5f..d225bf2e41dfb 100644
--- a/tools/mpremote/mpremote/main.py
+++ b/tools/mpremote/mpremote/main.py
@@ -166,7 +166,7 @@ def do_connect(args):
             for p in sorted(serial.tools.list_ports.comports()):
                 print(
                     "{} {} {:04x}:{:04x} {} {}".format(
-                        p.device, p.serial_number, p.pid, p.vid, p.manufacturer, p.product
+                        p.device, p.serial_number, p.vid, p.pid, p.manufacturer, p.product
                     )
                 )
             return None

From ff7be31f264c359b6f11fcc2cec8489dfe4905bd Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Wed, 16 Jun 2021 23:44:52 +0200
Subject: [PATCH 1033/3533] stm32/adc: Allow using ADC12 and ADC3 for H7.

* Modify common functions in adc.c to accept ADC handle.
* Most external channels are connected to ADC12 which is used by default.
* For ADCAll (internal channels) ADC3 is used instead.
* Issue #4435 is possibly related (at least partially fixed).
---
 ports/stm32/adc.c | 68 ++++++++++++++++++++++++++++-------------------
 1 file changed, 40 insertions(+), 28 deletions(-)

diff --git a/ports/stm32/adc.c b/ports/stm32/adc.c
index 5fa22d7c78d3a..6f709e9098b60 100644
--- a/ports/stm32/adc.c
+++ b/ports/stm32/adc.c
@@ -51,16 +51,9 @@
 ///     val = adc.read_core_vref()      # read MCU VREF
 
 /* ADC defintions */
-
-#if defined(STM32H7)
-#define ADCx                    (ADC3)
-#define PIN_ADC_MASK            PIN_ADC3
-#define pin_adc_table           pin_adc3
-#else
 #define ADCx                    (ADC1)
 #define PIN_ADC_MASK            PIN_ADC1
 #define pin_adc_table           pin_adc1
-#endif
 
 #define ADCx_CLK_ENABLE         __HAL_RCC_ADC1_CLK_ENABLE
 
@@ -142,7 +135,7 @@
     defined(STM32F746xx) || defined(STM32F765xx) || \
     defined(STM32F767xx) || defined(STM32F769xx)
 #define VBAT_DIV (4)
-#elif defined(STM32H743xx)
+#elif defined(STM32H743xx) || defined(STM32H747xx)
 #define VBAT_DIV (4)
 #elif defined(STM32L432xx) || \
     defined(STM32L451xx) || defined(STM32L452xx) || \
@@ -214,12 +207,12 @@ STATIC bool is_adcx_channel(int channel) {
     #endif
 }
 
-STATIC void adc_wait_for_eoc_or_timeout(int32_t timeout) {
+STATIC void adc_wait_for_eoc_or_timeout(ADC_HandleTypeDef *adcHandle, int32_t timeout) {
     uint32_t tickstart = HAL_GetTick();
     #if defined(STM32F4) || defined(STM32F7)
-    while ((ADCx->SR & ADC_FLAG_EOC) != ADC_FLAG_EOC) {
+    while ((adcHandle->Instance->SR & ADC_FLAG_EOC) != ADC_FLAG_EOC) {
     #elif defined(STM32F0) || defined(STM32H7) || defined(STM32L4) || defined(STM32WB)
-    while (READ_BIT(ADCx->ISR, ADC_FLAG_EOC) != ADC_FLAG_EOC) {
+    while (READ_BIT(adcHandle->Instance->ISR, ADC_FLAG_EOC) != ADC_FLAG_EOC) {
     #else
     #error Unsupported processor
         #endif
@@ -229,11 +222,15 @@ STATIC void adc_wait_for_eoc_or_timeout(int32_t timeout) {
     }
 }
 
-STATIC void adcx_clock_enable(void) {
+STATIC void adcx_clock_enable(ADC_HandleTypeDef *adch) {
     #if defined(STM32F0) || defined(STM32F4) || defined(STM32F7)
     ADCx_CLK_ENABLE();
     #elif defined(STM32H7)
-    __HAL_RCC_ADC3_CLK_ENABLE();
+    if (adch->Instance == ADC3) {
+        __HAL_RCC_ADC3_CLK_ENABLE();
+    } else {
+        __HAL_RCC_ADC12_CLK_ENABLE();
+    }
     __HAL_RCC_ADC_CONFIG(RCC_ADCCLKSOURCE_CLKP);
     #elif defined(STM32L4) || defined(STM32WB)
     if (__HAL_RCC_GET_ADC_SOURCE() == RCC_ADCCLKSOURCE_NONE) {
@@ -246,9 +243,8 @@ STATIC void adcx_clock_enable(void) {
 }
 
 STATIC void adcx_init_periph(ADC_HandleTypeDef *adch, uint32_t resolution) {
-    adcx_clock_enable();
+    adcx_clock_enable(adch);
 
-    adch->Instance = ADCx;
     adch->Init.Resolution = resolution;
     adch->Init.ContinuousConvMode = DISABLE;
     adch->Init.DiscontinuousConvMode = DISABLE;
@@ -308,6 +304,7 @@ STATIC void adc_init_single(pyb_obj_adc_t *adc_obj) {
         mp_hal_pin_config(pin, MP_HAL_PIN_MODE_ADC, MP_HAL_PIN_PULL_NONE, 0);
     }
 
+    adc_obj->handle.Instance = ADCx;
     adcx_init_periph(&adc_obj->handle, ADC_RESOLUTION_12B);
 
     #if defined(STM32L4) && defined(ADC_DUALMODE_REGSIMULT_INJECSIMULT)
@@ -335,7 +332,11 @@ STATIC void adc_config_channel(ADC_HandleTypeDef *adc_handle, uint32_t channel)
     #if defined(STM32F0)
     sConfig.SamplingTime = ADC_SAMPLETIME_55CYCLES_5;
     #elif defined(STM32F4) || defined(STM32F7)
-    sConfig.SamplingTime = ADC_SAMPLETIME_15CYCLES;
+    if (__HAL_ADC_IS_CHANNEL_INTERNAL(channel)) {
+        sConfig.SamplingTime = ADC_SAMPLETIME_480CYCLES;
+    } else {
+        sConfig.SamplingTime = ADC_SAMPLETIME_15CYCLES;
+    }
     #elif defined(STM32H7)
     if (__HAL_ADC_IS_CHANNEL_INTERNAL(channel)) {
         sConfig.SamplingTime = ADC_SAMPLETIME_810CYCLES_5;
@@ -370,8 +371,8 @@ STATIC void adc_config_channel(ADC_HandleTypeDef *adc_handle, uint32_t channel)
 
 STATIC uint32_t adc_read_channel(ADC_HandleTypeDef *adcHandle) {
     HAL_ADC_Start(adcHandle);
-    adc_wait_for_eoc_or_timeout(EOC_TIMEOUT);
-    uint32_t value = ADCx->DR;
+    adc_wait_for_eoc_or_timeout(adcHandle, EOC_TIMEOUT);
+    uint32_t value = adcHandle->Instance->DR;
     HAL_ADC_Stop(adcHandle);
     return value;
 }
@@ -529,19 +530,19 @@ STATIC mp_obj_t adc_read_timed(mp_obj_t self_in, mp_obj_t buf_in, mp_obj_t freq_
         } else {
             // for subsequent samples we can just set the "start sample" bit
             #if defined(STM32F4) || defined(STM32F7)
-            ADCx->CR2 |= (uint32_t)ADC_CR2_SWSTART;
+            self->handle.Instance->CR2 |= (uint32_t)ADC_CR2_SWSTART;
             #elif defined(STM32F0) || defined(STM32H7) || defined(STM32L4) || defined(STM32WB)
-            SET_BIT(ADCx->CR, ADC_CR_ADSTART);
+            SET_BIT(self->handle.Instance->CR, ADC_CR_ADSTART);
             #else
             #error Unsupported processor
             #endif
         }
 
         // wait for sample to complete
-        adc_wait_for_eoc_or_timeout(EOC_TIMEOUT);
+        adc_wait_for_eoc_or_timeout(&self->handle, EOC_TIMEOUT);
 
         // read value
-        uint value = ADCx->DR;
+        uint value = self->handle.Instance->DR;
 
         // store value in buffer
         if (typesize == 1) {
@@ -608,9 +609,9 @@ STATIC mp_obj_t adc_read_timed_multi(mp_obj_t adc_array_in, mp_obj_t buf_array_i
     adc_config_channel(&adc0->handle, adc0->channel);
     HAL_ADC_Start(&adc0->handle);
     // Wait for sample to complete and discard
-    adc_wait_for_eoc_or_timeout(EOC_TIMEOUT);
+    adc_wait_for_eoc_or_timeout(&adc0->handle, EOC_TIMEOUT);
     // Read (and discard) value
-    uint value = ADCx->DR;
+    uint value = adc0->handle.Instance->DR;
 
     // Ensure first sample is on a timer tick
     __HAL_TIM_CLEAR_FLAG(tim, TIM_FLAG_UPDATE);
@@ -639,17 +640,17 @@ STATIC mp_obj_t adc_read_timed_multi(mp_obj_t adc_array_in, mp_obj_t buf_array_i
             // for the first sample we need to turn the ADC on
             // ADC is started: set the "start sample" bit
             #if defined(STM32F4) || defined(STM32F7)
-            ADCx->CR2 |= (uint32_t)ADC_CR2_SWSTART;
+            adc->handle.Instance->CR2 |= (uint32_t)ADC_CR2_SWSTART;
             #elif defined(STM32F0) || defined(STM32H7) || defined(STM32L4) || defined(STM32WB)
-            SET_BIT(ADCx->CR, ADC_CR_ADSTART);
+            SET_BIT(adc->handle.Instance->CR, ADC_CR_ADSTART);
             #else
             #error Unsupported processor
             #endif
             // wait for sample to complete
-            adc_wait_for_eoc_or_timeout(EOC_TIMEOUT);
+            adc_wait_for_eoc_or_timeout(&adc->handle, EOC_TIMEOUT);
 
             // read value
-            value = ADCx->DR;
+            value = adc->handle.Instance->DR;
 
             // store values in buffer
             if (typesize == 1) {
@@ -723,13 +724,24 @@ void adc_init_all(pyb_adc_all_obj_t *adc_all, uint32_t resolution, uint32_t en_m
         if (en_mask & (1 << channel)) {
             // Channels 0-16 correspond to real pins. Configure the GPIO pin in
             // ADC mode.
+            #if defined(STM32H7)
+            const pin_obj_t *pin = pin_adc3[channel];
+            #else
             const pin_obj_t *pin = pin_adc_table[channel];
+            #endif
             if (pin) {
                 mp_hal_pin_config(pin, MP_HAL_PIN_MODE_ADC, MP_HAL_PIN_PULL_NONE, 0);
             }
         }
     }
 
+    #if defined(STM32H7)
+    // On the H7 the internal channels are connected to ADC3. To read internal channels
+    // with ADCAll, ADC3 must be used here, and ADC12 is used to read the GPIO channels.
+    adc_all->handle.Instance = ADC3;
+    #else
+    adc_all->handle.Instance = ADCx;
+    #endif
     adcx_init_periph(&adc_all->handle, resolution);
 }
 

From 0e11966ce9ea2345458d2e6127ee28486c4cb65d Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Thu, 1 Jul 2021 16:15:31 +0200
Subject: [PATCH 1034/3533] stm32/adc: Define the ADC instance used for
 internal channels.

---
 ports/stm32/adc.c | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/ports/stm32/adc.c b/ports/stm32/adc.c
index 6f709e9098b60..55dc3083b6dc9 100644
--- a/ports/stm32/adc.c
+++ b/ports/stm32/adc.c
@@ -55,6 +55,17 @@
 #define PIN_ADC_MASK            PIN_ADC1
 #define pin_adc_table           pin_adc1
 
+#if defined(STM32H7)
+// On the H7 ADC3 is used for ADCAll to be able to read internal
+// channels. For all other GPIO channels, ADC12 is used instead.
+#define ADCALLx                 (ADC3)
+#define pin_adcall_table        pin_adc3
+#else
+// Use ADC1 for ADCAll instance by default for all other MCUs.
+#define ADCALLx                 (ADC1)
+#define pin_adcall_table        pin_adc1
+#endif
+
 #define ADCx_CLK_ENABLE         __HAL_RCC_ADC1_CLK_ENABLE
 
 #if defined(STM32F0)
@@ -724,24 +735,14 @@ void adc_init_all(pyb_adc_all_obj_t *adc_all, uint32_t resolution, uint32_t en_m
         if (en_mask & (1 << channel)) {
             // Channels 0-16 correspond to real pins. Configure the GPIO pin in
             // ADC mode.
-            #if defined(STM32H7)
-            const pin_obj_t *pin = pin_adc3[channel];
-            #else
-            const pin_obj_t *pin = pin_adc_table[channel];
-            #endif
+            const pin_obj_t *pin = pin_adcall_table[channel];
             if (pin) {
                 mp_hal_pin_config(pin, MP_HAL_PIN_MODE_ADC, MP_HAL_PIN_PULL_NONE, 0);
             }
         }
     }
 
-    #if defined(STM32H7)
-    // On the H7 the internal channels are connected to ADC3. To read internal channels
-    // with ADCAll, ADC3 must be used here, and ADC12 is used to read the GPIO channels.
-    adc_all->handle.Instance = ADC3;
-    #else
-    adc_all->handle.Instance = ADCx;
-    #endif
+    adc_all->handle.Instance = ADCALLx;
     adcx_init_periph(&adc_all->handle, resolution);
 }
 

From 86ef96535295de130185dcf41f0c514cf5192ae4 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 1 Jul 2021 12:04:48 +1000
Subject: [PATCH 1035/3533] stm32/adc: Simplify and generalise how pin_adcX
 table is defined.

The ADC_FIRST_GPIO_CHANNEL and ADC_LAST_GPIO_CHANNEL macros are no longer
needed.  Instead the pin_adcX table (X = 1, 2, 3) is now generated to be
the exact size needed for a given MCU, and MP_ARRAY_SIZE(pin_adcX) is used
to determine the upper bound.

This commit also allows CPU pins to be excluded from ADC configuration if
they are hidden by prefixing their name with a "-".

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/adc.c               | 38 ++++++----------------
 ports/stm32/boards/make-pins.py | 57 +++++++++++++++++----------------
 2 files changed, 40 insertions(+), 55 deletions(-)

diff --git a/ports/stm32/adc.c b/ports/stm32/adc.c
index 55dc3083b6dc9..09cd3306bbf57 100644
--- a/ports/stm32/adc.c
+++ b/ports/stm32/adc.c
@@ -70,8 +70,6 @@
 
 #if defined(STM32F0)
 
-#define ADC_FIRST_GPIO_CHANNEL  (0)
-#define ADC_LAST_GPIO_CHANNEL   (15)
 #define ADC_SCALE_V             (3.3f)
 #define ADC_CAL_ADDRESS         (0x1ffff7ba)
 #define ADC_CAL1                ((uint16_t *)0x1ffff7b8)
@@ -80,8 +78,6 @@
 
 #elif defined(STM32F4)
 
-#define ADC_FIRST_GPIO_CHANNEL  (0)
-#define ADC_LAST_GPIO_CHANNEL   (15)
 #define ADC_SCALE_V             (3.3f)
 #define ADC_CAL_ADDRESS         (0x1fff7a2a)
 #define ADC_CAL1                ((uint16_t *)(ADC_CAL_ADDRESS + 2))
@@ -90,8 +86,6 @@
 
 #elif defined(STM32F7)
 
-#define ADC_FIRST_GPIO_CHANNEL  (0)
-#define ADC_LAST_GPIO_CHANNEL   (15)
 #define ADC_SCALE_V             (3.3f)
 #if defined(STM32F722xx) || defined(STM32F723xx) || \
     defined(STM32F732xx) || defined(STM32F733xx)
@@ -106,8 +100,6 @@
 
 #elif defined(STM32H7)
 
-#define ADC_FIRST_GPIO_CHANNEL  (0)
-#define ADC_LAST_GPIO_CHANNEL   (16)
 #define ADC_SCALE_V             (3.3f)
 #define ADC_CAL_ADDRESS         (0x1FF1E860)
 #define ADC_CAL1                ((uint16_t *)(0x1FF1E820))
@@ -116,8 +108,6 @@
 
 #elif defined(STM32L4) || defined(STM32WB)
 
-#define ADC_FIRST_GPIO_CHANNEL  (1)
-#define ADC_LAST_GPIO_CHANNEL   (16)
 #define ADC_SCALE_V             (VREFINT_CAL_VREF / 1000.0f)
 #define ADC_CAL_ADDRESS         (VREFINT_CAL_ADDR)
 #define ADC_CAL1                (TEMPSENSOR_CAL1_ADDR)
@@ -179,7 +169,7 @@
 typedef struct _pyb_obj_adc_t {
     mp_obj_base_t base;
     mp_obj_t pin_name;
-    int channel;
+    uint32_t channel;
     ADC_HandleTypeDef handle;
 } pyb_obj_adc_t;
 
@@ -308,13 +298,6 @@ STATIC void adcx_init_periph(ADC_HandleTypeDef *adch, uint32_t resolution) {
 }
 
 STATIC void adc_init_single(pyb_obj_adc_t *adc_obj) {
-
-    if (ADC_FIRST_GPIO_CHANNEL <= adc_obj->channel && adc_obj->channel <= ADC_LAST_GPIO_CHANNEL) {
-        // Channels 0-16 correspond to real pins. Configure the GPIO pin in ADC mode.
-        const pin_obj_t *pin = pin_adc_table[adc_obj->channel];
-        mp_hal_pin_config(pin, MP_HAL_PIN_MODE_ADC, MP_HAL_PIN_PULL_NONE, 0);
-    }
-
     adc_obj->handle.Instance = ADCx;
     adcx_init_periph(&adc_obj->handle, ADC_RESOLUTION_12B);
 
@@ -431,8 +414,8 @@ STATIC mp_obj_t adc_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_
     } else {
         const pin_obj_t *pin = pin_find(pin_obj);
         if ((pin->adc_num & PIN_ADC_MASK) == 0) {
-            // No ADC1 function on that pin
-            mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("pin %q does not have ADC capabilities"), pin->name);
+            // No ADC function on the given pin.
+            mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("Pin(%q) doesn't have ADC capabilities"), pin->name);
         }
         channel = pin->adc_channel;
     }
@@ -441,11 +424,11 @@ STATIC mp_obj_t adc_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_
         mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("not a valid ADC Channel: %d"), channel);
     }
 
-
-    if (ADC_FIRST_GPIO_CHANNEL <= channel && channel <= ADC_LAST_GPIO_CHANNEL) {
-        // these channels correspond to physical GPIO ports so make sure they exist
-        if (pin_adc_table[channel] == NULL) {
-            mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("channel %d not available on this board"), channel);
+    // If this channel corresponds to a pin then configure the pin in ADC mode.
+    if (channel < MP_ARRAY_SIZE(pin_adc_table)) {
+        const pin_obj_t *pin = pin_adc_table[channel];
+        if (pin != NULL) {
+            mp_hal_pin_config(pin, MP_HAL_PIN_MODE_ADC, MP_HAL_PIN_PULL_NONE, 0);
         }
     }
 
@@ -730,11 +713,10 @@ void adc_init_all(pyb_adc_all_obj_t *adc_all, uint32_t resolution, uint32_t en_m
             mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("resolution %d not supported"), resolution);
     }
 
-    for (uint32_t channel = ADC_FIRST_GPIO_CHANNEL; channel <= ADC_LAST_GPIO_CHANNEL; ++channel) {
+    for (uint32_t channel = 0; channel < MP_ARRAY_SIZE(pin_adcall_table); ++channel) {
         // only initialise those channels that are selected with the en_mask
         if (en_mask & (1 << channel)) {
-            // Channels 0-16 correspond to real pins. Configure the GPIO pin in
-            // ADC mode.
+            // If this channel corresponds to a pin then configure the pin in ADC mode.
             const pin_obj_t *pin = pin_adcall_table[channel];
             if (pin) {
                 mp_hal_pin_config(pin, MP_HAL_PIN_MODE_ADC, MP_HAL_PIN_PULL_NONE, 0);
diff --git a/ports/stm32/boards/make-pins.py b/ports/stm32/boards/make-pins.py
index a195323318112..70213de6ac344 100755
--- a/ports/stm32/boards/make-pins.py
+++ b/ports/stm32/boards/make-pins.py
@@ -287,6 +287,7 @@ class Pins(object):
     def __init__(self):
         self.cpu_pins = []  # list of NamedPin objects
         self.board_pins = []  # list of NamedPin objects
+        self.adc_table_size = {}  # maps ADC number X to size of pin_adcX table
 
     def find_pin(self, port_num, pin_num):
         for named_pin in self.cpu_pins:
@@ -353,27 +354,27 @@ def print(self):
         self.print_named("board", self.board_pins)
 
     def print_adc(self, adc_num):
-        print("")
-        print("const pin_obj_t * const pin_adc{:d}[] = {{".format(adc_num))
-        for channel in range(17):
-            if channel == 16:
-                print("#if defined(STM32L4)")
-            adc_found = False
-            for named_pin in self.cpu_pins:
-                pin = named_pin.pin()
-                if (
-                    pin.is_board_pin()
-                    and (pin.adc_num & (1 << (adc_num - 1)))
-                    and (pin.adc_channel == channel)
-                ):
-                    print("  &pin_{:s}_obj, // {:d}".format(pin.cpu_pin_name(), channel))
-                    adc_found = True
-                    break
-            if not adc_found:
-                print("  NULL,    // {:d}".format(channel))
-            if channel == 16:
-                print("#endif")
-        print("};")
+        adc_pins = {}
+        for named_pin in self.cpu_pins:
+            pin = named_pin.pin()
+            if (
+                pin.is_board_pin()
+                and not named_pin.is_hidden()
+                and (pin.adc_num & (1 << (adc_num - 1)))
+            ):
+                adc_pins[pin.adc_channel] = pin
+        if adc_pins:
+            table_size = max(adc_pins) + 1
+            self.adc_table_size[adc_num] = table_size
+            print("")
+            print("const pin_obj_t * const pin_adc{:d}[{:d}] = {{".format(adc_num, table_size))
+            for channel in range(table_size):
+                if channel in adc_pins:
+                    obj = "&pin_{:s}_obj".format(adc_pins[channel].cpu_pin_name())
+                else:
+                    obj = "NULL"
+                print("  [{:d}] = {},".format(channel, obj))
+            print("};")
 
     def print_header(self, hdr_filename, obj_decls):
         with open(hdr_filename, "wt") as hdr_file:
@@ -382,9 +383,12 @@ def print_header(self, hdr_filename, obj_decls):
                     pin = named_pin.pin()
                     if pin.is_board_pin():
                         pin.print_header(hdr_file)
-                hdr_file.write("extern const pin_obj_t * const pin_adc1[];\n")
-                hdr_file.write("extern const pin_obj_t * const pin_adc2[];\n")
-                hdr_file.write("extern const pin_obj_t * const pin_adc3[];\n")
+                for adc_num, table_size in self.adc_table_size.items():
+                    hdr_file.write(
+                        "extern const pin_obj_t * const pin_adc{:d}[{:d}];\n".format(
+                            adc_num, table_size
+                        )
+                    )
             # provide #define's mapping board to cpu name
             for named_pin in self.board_pins:
                 hdr_file.write(
@@ -569,9 +573,8 @@ def main():
         with open(args.prefix_filename, "r") as prefix_file:
             print(prefix_file.read())
     pins.print()
-    pins.print_adc(1)
-    pins.print_adc(2)
-    pins.print_adc(3)
+    for i in range(1, 4):
+        pins.print_adc(i)
     pins.print_header(args.hdr_filename, args.hdr_obj_decls)
     pins.print_qstr(args.qstr_filename)
     pins.print_af_hdr(args.af_const_filename)

From c8e9e04541e9aae0168d644979472cacb8b84d68 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 30 Jun 2021 12:46:19 +1000
Subject: [PATCH 1036/3533] lib/tinyusb: Update to version 0.10.1.

Signed-off-by: Damien George <damien@micropython.org>
---
 lib/tinyusb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/tinyusb b/lib/tinyusb
index 7b62c71dd5ec4..d49938d0f5052 160000
--- a/lib/tinyusb
+++ b/lib/tinyusb
@@ -1 +1 @@
-Subproject commit 7b62c71dd5ec42e61499d2d83902df9484842670
+Subproject commit d49938d0f5052bce70e55c652b657c0a6a7e84fe

From d67bd494b5eca14b1e981e51b30580b1e7d07c43 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 30 Jun 2021 12:47:06 +1000
Subject: [PATCH 1037/3533] lib/pico-sdk: Update to version 1.2.0.

Signed-off-by: Damien George <damien@micropython.org>
---
 lib/pico-sdk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/pico-sdk b/lib/pico-sdk
index fc10a97c386f6..bfcbefafc5d2a 160000
--- a/lib/pico-sdk
+++ b/lib/pico-sdk
@@ -1 +1 @@
-Subproject commit fc10a97c386f65c1a44c68684fe52a56aaf50df0
+Subproject commit bfcbefafc5d2a210551a4d9d80b4303d4ae0adf7

From 031fe0f144e4bc37fc35d682cbb3bcffc79886b1 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 30 Jun 2021 12:47:40 +1000
Subject: [PATCH 1038/3533] rp2/CMakeLists.txt: Suppress compiler errors for
 pico-sdk and tinyusb.

These warnings appear with GCC 11.  Keep them as warnings but not as
compiler errors so they can be dealt with properly in the future.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/rp2/CMakeLists.txt | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/ports/rp2/CMakeLists.txt b/ports/rp2/CMakeLists.txt
index 2d6037712e1a0..eb2b3d2a2597f 100644
--- a/ports/rp2/CMakeLists.txt
+++ b/ports/rp2/CMakeLists.txt
@@ -188,6 +188,20 @@ target_compile_options(${MICROPY_TARGET} PRIVATE
     -Werror
 )
 
+set_source_files_properties(
+    ${PICO_SDK_PATH}/src/rp2_common/pico_double/double_math.c
+    ${PICO_SDK_PATH}/src/rp2_common/pico_float/float_math.c
+    PROPERTIES
+    COMPILE_OPTIONS "-Wno-error=uninitialized"
+)
+
+set_source_files_properties(
+    ${PICO_TINYUSB_PATH}/src/portable/raspberrypi/rp2040/dcd_rp2040.c
+    ${PICO_TINYUSB_PATH}/src/portable/raspberrypi/rp2040/rp2040_usb.c
+    PROPERTIES
+    COMPILE_OPTIONS "-Wno-error=array-bounds;-Wno-error=unused-but-set-variable"
+)
+
 target_compile_definitions(${MICROPY_TARGET} PRIVATE
     FFCONF_H=\"${MICROPY_OOFATFS_DIR}/ffconf.h\"
     LFS1_NO_MALLOC LFS1_NO_DEBUG LFS1_NO_WARN LFS1_NO_ERROR LFS1_NO_ASSERT

From 8a5bfe44a5b686b479ef0638e25fe968099f2a28 Mon Sep 17 00:00:00 2001
From: Mike Teachman <mike.teachman@gmail.com>
Date: Fri, 16 Apr 2021 21:27:40 -0700
Subject: [PATCH 1039/3533] esp32,stm32: Add new machine.I2S class for I2S
 protocol support.

This commit adds I2S protocol support for the esp32 and stm32 ports, via
a new machine.I2S class.  It builds on the stm32 work of blmorris, #1361.

Features include:
- a consistent I2S API across the esp32 and stm32 ports
- I2S configurations supported:
  - master transmit and master receive
  - 16-bit and 32-bit sample sizes
  - mono and stereo formats
  - sampling frequency
  - 3 modes of operation:
    - blocking
    - non-blocking with callback
    - uasyncio
  - internal ring buffer size can be tuned
- documentation for Pyboards and esp32-based boards
- tested on the following development boards:
  - Pyboard D SF2W
  - Pyboard V1.1
  - ESP32 with SPIRAM
  - ESP32

Signed-off-by: Mike Teachman <mike.teachman@gmail.com>
---
 docs/esp32/quickref.rst                     |   18 +
 docs/library/machine.I2S.rst                |  162 +++
 docs/library/machine.rst                    |    1 +
 docs/pyboard/quickref.rst                   |   20 +
 ports/esp32/machine_i2s.c                   |  809 +++++++++++++
 ports/esp32/main.c                          |    1 +
 ports/esp32/main/CMakeLists.txt             |    1 +
 ports/esp32/modmachine.c                    |    1 +
 ports/esp32/modmachine.h                    |    2 +
 ports/stm32/Makefile                        |   13 +
 ports/stm32/boards/PYBD_SF2/mpconfigboard.h |    5 +
 ports/stm32/boards/PYBV10/mpconfigboard.h   |    4 +
 ports/stm32/boards/PYBV11/mpconfigboard.h   |    4 +
 ports/stm32/boards/make-pins.py             |    2 +-
 ports/stm32/dma.c                           |   35 +
 ports/stm32/dma.h                           |    4 +
 ports/stm32/machine_i2s.c                   | 1126 +++++++++++++++++++
 ports/stm32/main.c                          |    4 +
 ports/stm32/modmachine.c                    |    3 +
 ports/stm32/modmachine.h                    |    2 +
 ports/stm32/pin_defs_stm32.h                |    2 +
 21 files changed, 2218 insertions(+), 1 deletion(-)
 create mode 100644 docs/library/machine.I2S.rst
 create mode 100644 ports/esp32/machine_i2s.c
 create mode 100644 ports/stm32/machine_i2s.c

diff --git a/docs/esp32/quickref.rst b/docs/esp32/quickref.rst
index 77c7027c400d3..0b825d52080a8 100644
--- a/docs/esp32/quickref.rst
+++ b/docs/esp32/quickref.rst
@@ -385,6 +385,24 @@ has the same methods as software I2C above::
     i2c = I2C(0)
     i2c = I2C(1, scl=Pin(5), sda=Pin(4), freq=400000)
 
+I2S bus
+-------
+
+See :ref:`machine.I2S <machine.I2S>`. ::
+
+    from machine import I2S, Pin
+    
+    i2s = I2S(0, sck=Pin(13), ws=Pin(14), sd=Pin(34), mode=I2S.TX, bits=16, format=I2S.STEREO, rate=44100, ibuf=40000) # create I2S object
+    i2s.write(buf)             # write buffer of audio samples to I2S device
+    
+    i2s = I2S(1, sck=Pin(33), ws=Pin(25), sd=Pin(32), mode=I2S.RX, bits=16, format=I2S.MONO, rate=22050, ibuf=40000) # create I2S object
+    i2s.readinto(buf)          # fill buffer with audio samples from I2S device
+    
+The I2S class is currently available as a Technical Preview.  During the preview period, feedback from 
+users is encouraged.  Based on this feedback, the I2S class API and implementation may be changed.
+
+ESP32 has two I2S buses with id=0 and id=1
+
 Real time clock (RTC)
 ---------------------
 
diff --git a/docs/library/machine.I2S.rst b/docs/library/machine.I2S.rst
new file mode 100644
index 0000000000000..48f03b419d0be
--- /dev/null
+++ b/docs/library/machine.I2S.rst
@@ -0,0 +1,162 @@
+.. currentmodule:: machine
+.. _machine.I2S:
+
+class I2S -- Inter-IC Sound bus protocol
+========================================
+
+I2S is a synchronous serial protocol used to connect digital audio devices. 
+At the physical level, a bus consists of 3 lines: SCK, WS, SD.
+The I2S class supports Master operation.  Slave operation is not supported.
+
+The I2S class is currently available as a Technical Preview.  During the preview period, feedback from 
+users is encouraged.  Based on this feedback, the I2S class API and implementation may be changed.
+
+I2S objects can be created and initialized using::
+
+    from machine import I2S
+    from machine import Pin
+    
+    # ESP32
+    sck_pin = Pin(14)   # Serial clock output
+    ws_pin = Pin(13)    # Word clock output
+    sdout_pin = Pin(12) # Serial data output
+    
+    or
+    
+    # PyBoards
+    sck_pin = Pin("Y6")   # Serial clock output
+    ws_pin = Pin("Y5")    # Word clock output
+    sdout_pin = Pin("Y8") # Serial data output
+    
+    audio_out = I2S(2, 
+                    sck=sck_pin, ws=ws_pin, sdin=sdin_pin,    
+                    mode=I2S.TX, 
+                    bits=16,                       
+                    format=I2S.MONO,
+                    rate=44100, 
+                    ibuf=20000)
+                   
+    audio_in = I2S(2, 
+                   sck=sck_pin, ws=ws_pin, sdin=sdin_pin,    
+                   mode=I2S.RX, 
+                   bits=32,                       
+                   format=I2S.STEREO,
+                   rate=22050, 
+                   ibuf=20000)
+                    
+3 modes of operation are supported:
+ - blocking 
+ - non-blocking 
+ - uasyncio
+  
+blocking::
+ 
+   num_written = audio_out.write(buf) # blocks until buf emptied
+
+   num_read = audio_in.readinto(buf) # blocks until buf filled
+   
+non-blocking::
+ 
+   audio_out.irq(i2s_callback)         # i2s_callback is called when buf is emptied
+   num_written = audio_out.write(buf)  # returns immediately
+        
+   audio_in.irq(i2s_callback)          # i2s_callback is called when buf is filled
+   num_read = audio_in.readinto(buf)   # returns immediately    
+ 
+uasyncio::
+ 
+   swriter = uasyncio.StreamWriter(audio_out)
+   swriter.write(buf)
+   await swriter.drain()
+   
+   sreader = uasyncio.StreamReader(audio_in)
+   num_read = await sreader.readinto(buf)
+ 
+Constructor
+-----------
+
+.. class:: I2S(id, *, sck, ws, sd, mode, bits, format, rate, ibuf)
+
+   Construct an I2S object of the given id:
+   
+   - ``id`` identifies a particular I2S bus.  
+
+   ``id`` is board and port specific:
+ 
+     - PYBv1.0/v1.1: has one I2S bus with id=2.
+     - PYBD-SFxW: has two I2S buses with id=1 and id=2. 
+     - ESP32: has two I2S buses with id=0 and id=1. 
+   
+   Keyword-only parameters that are supported on all ports:
+    
+     - ``sck`` is a pin object for the serial clock line
+     - ``ws`` is a pin object for the word select line
+     - ``sd`` is a pin object for the serial data line
+     - ``mode`` specifies receive or transmit
+     - ``bits`` specifies sample size (bits), 16 or 32
+     - ``format`` specifies channel format, STEREO or MONO
+     - ``rate`` specifies audio sampling rate (samples/s)
+     - ``ibuf`` specifies internal buffer length (bytes)
+     
+   For all ports, DMA runs continuously in the background and allows user applications to perform other operations while 
+   sample data is transfered between the internal buffer and the I2S peripheral unit. 
+   Increasing the size of the internal buffer has the potential to increase the time that user applications can perform non-I2S operations
+   before underflow (e.g. ``write`` method) or overflow (e.g. ``readinto`` method).
+
+Methods
+-------
+
+.. method:: I2S.init(sck, ...)
+
+  see Constructor for argument descriptions
+     
+.. method:: I2S.deinit()
+
+  Deinitialize the I2S bus
+  
+.. method::  I2S.readinto(buf)
+
+  Read audio samples into the buffer specified by ``buf``.  ``buf`` must support the buffer protocol, such as bytearray or array. 
+  "buf" byte ordering is little-endian.  For Stereo format, left channel sample precedes right channel sample. For Mono format, 
+  the left channel sample data is used.
+  Returns number of bytes read 
+  
+.. method::  I2S.write(buf)
+
+  Write audio samples contained in ``buf``. ``buf`` must support the buffer protocol, such as bytearray or array.
+  "buf" byte ordering is little-endian.  For Stereo format, left channel sample precedes right channel sample. For Mono format, 
+  the sample data is written to both the right and left channels.
+  Returns number of bytes written 
+  
+.. method::  I2S.irq(handler)
+
+  Set a callback. ``handler`` is called when ``buf`` is emptied (``write`` method) or becomes full (``readinto`` method).  
+  Setting a callback changes the ``write`` and ``readinto`` methods to non-blocking operation.
+  ``handler`` is called in the context of the MicroPython scheduler.
+  
+.. staticmethod::  I2S.shift(buf, bits, shift)
+
+  bitwise shift of all samples contained in ``buf``. ``bits`` specifies sample size in bits. ``shift`` specifies the number of bits to shift each sample. 
+  Positive for left shift, negative for right shift. 
+  Typically used for volume control.  Each bit shift changes sample volume by 6dB.
+  
+Constants
+---------
+
+.. data:: I2S.RX
+
+   for initialising the I2S bus ``mode`` to receive
+
+.. data:: I2S.TX
+
+   for initialising the I2S bus ``mode`` to transmit
+
+.. data:: I2S.STEREO
+
+   for initialising the I2S bus ``format`` to stereo
+
+.. data:: I2S.MONO
+
+   for initialising the I2S bus ``format`` to mono
+
+
diff --git a/docs/library/machine.rst b/docs/library/machine.rst
index 0a1c1c953005f..26f99680a0a7d 100644
--- a/docs/library/machine.rst
+++ b/docs/library/machine.rst
@@ -181,6 +181,7 @@ Classes
    machine.UART.rst
    machine.SPI.rst
    machine.I2C.rst
+   machine.I2S.rst   
    machine.RTC.rst
    machine.Timer.rst
    machine.WDT.rst
diff --git a/docs/pyboard/quickref.rst b/docs/pyboard/quickref.rst
index 3dbd0930436f4..3ea3190999a02 100644
--- a/docs/pyboard/quickref.rst
+++ b/docs/pyboard/quickref.rst
@@ -219,6 +219,26 @@ eg ``I2C(1)``.  Software I2C is also available by explicitly specifying the
 
 Note: for legacy I2C support see :ref:`pyb.I2C <pyb.I2C>`.
 
+I2S bus
+-------
+
+See :ref:`machine.I2S <machine.I2S>`. ::
+
+    from machine import I2S, Pin
+    
+    i2s = I2S(2, sck=Pin('Y6'), ws=Pin('Y5'), sd=Pin('Y8'), mode=I2S.TX, bits=16, format=I2S.STEREO, rate=44100, ibuf=40000) # create I2S object
+    i2s.write(buf)             # write buffer of audio samples to I2S device
+    
+    i2s = I2S(1, sck=Pin('X5'), ws=Pin('X6'), sd=Pin('Y4'), mode=I2S.RX, bits=16, format=I2S.MONO, rate=22050, ibuf=40000) # create I2S object
+    i2s.readinto(buf)          # fill buffer with audio samples from I2S device
+    
+The I2S class is currently available as a Technical Preview.  During the preview period, feedback from 
+users is encouraged.  Based on this feedback, the I2S class API and implementation may be changed.
+
+PYBv1.0/v1.1 has one I2S bus with id=2.  
+PYBD-SFxW has two I2S buses with id=1 and id=2.  
+I2S is shared with SPI.  
+    
 CAN bus (controller area network)
 ---------------------------------
 
diff --git a/ports/esp32/machine_i2s.c b/ports/esp32/machine_i2s.c
new file mode 100644
index 0000000000000..b0d02e74f6105
--- /dev/null
+++ b/ports/esp32/machine_i2s.c
@@ -0,0 +1,809 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Mike Teachman
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include <stdio.h>
+#include <stdint.h>
+#include <string.h>
+#include <stdlib.h>
+#include <stdbool.h>
+
+#include "py/obj.h"
+#include "py/runtime.h"
+#include "py/misc.h"
+#include "py/stream.h"
+#include "py/objstr.h"
+#include "modmachine.h"
+#include "mphalport.h"
+
+#include "driver/i2s.h"
+#include "soc/i2s_reg.h"
+#include "freertos/FreeRTOS.h"
+#include "freertos/task.h"
+#include "freertos/queue.h"
+#include "esp_task.h"
+
+// The I2S module has 3 modes of operation:
+//
+// Mode1:  Blocking
+// - readinto() and write() methods block until the supplied buffer is filled (read) or emptied (write)
+// - this is the default mode of operation
+//
+// Mode2:  Non-Blocking
+// - readinto() and write() methods return immediately.
+// - buffer filling and emptying happens asynchronously to the main MicroPython task
+// - a callback function is called when the supplied buffer has been filled (read) or emptied (write)
+// - non-blocking mode is enabled when a callback is set with the irq() method
+// - a FreeRTOS task is created to implement the asynchronous background operations
+// - a FreeRTOS queue is used to transfer the supplied buffer to the background task
+//
+// Mode3: Uasyncio
+// - implements the stream protocol
+// - uasyncio mode is enabled when the ioctl() function is called
+// - the I2S event queue is used to detect that I2S samples can be read or written from/to DMA memory
+//
+// The samples contained in the app buffer supplied for the readinto() and write() methods have the following convention:
+//   Mono:  little endian format
+//   Stereo:  little endian format, left channel first
+//
+// I2S terms:
+//   "frame":  consists of two audio samples (Left audio sample + Right audio sample)
+//
+// Misc:
+// - for Mono configuration:
+//   - readinto method: samples are gathered from the L channel only
+//   - write method: every sample is output to both the L and R channels
+// - for readinto method the I2S hardware is read using 8-byte frames
+//   (this is standard for almost all I2S hardware, such as MEMS microphones)
+// - all sample data transfers use DMA
+
+#define I2S_TASK_PRIORITY        (ESP_TASK_PRIO_MIN + 1)
+#define I2S_TASK_STACK_SIZE      (2048)
+
+#define DMA_BUF_LEN_IN_I2S_FRAMES (256)
+
+// The transform buffer is used with the readinto() method to bridge the opaque DMA memory on the ESP devices
+// with the app buffer.  It facilitates audio sample transformations.  e.g.  32-bits samples to 16-bit samples.
+// The size of 240 bytes is an engineering optimum that balances transfer performance with an acceptable use of heap space
+#define SIZEOF_TRANSFORM_BUFFER_IN_BYTES (240)
+
+#define NUM_I2S_USER_FORMATS (4)
+#define I2S_RX_FRAME_SIZE_IN_BYTES (8)
+
+typedef enum {
+    MONO,
+    STEREO
+} format_t;
+
+typedef enum {
+    BLOCKING,
+    NON_BLOCKING,
+    UASYNCIO
+} io_mode_t;
+
+typedef enum {
+    I2S_TX_TRANSFER,
+    I2S_RX_TRANSFER,
+} direction_t;
+
+typedef struct _non_blocking_descriptor_t {
+    mp_buffer_info_t appbuf;
+    mp_obj_t callback;
+    direction_t direction;
+} non_blocking_descriptor_t;
+
+typedef struct _machine_i2s_obj_t {
+    mp_obj_base_t base;
+    i2s_port_t port;
+    mp_hal_pin_obj_t sck;
+    mp_hal_pin_obj_t ws;
+    mp_hal_pin_obj_t sd;
+    int8_t mode;
+    i2s_bits_per_sample_t bits;
+    format_t format;
+    int32_t rate;
+    int32_t ibuf;
+    mp_obj_t callback_for_non_blocking;
+    io_mode_t io_mode;
+    uint8_t transform_buffer[SIZEOF_TRANSFORM_BUFFER_IN_BYTES];
+    QueueHandle_t i2s_event_queue;
+    QueueHandle_t non_blocking_mode_queue;
+    TaskHandle_t non_blocking_mode_task;
+} machine_i2s_obj_t;
+
+STATIC mp_obj_t machine_i2s_deinit(mp_obj_t self_in);
+
+// The frame map is used with the readinto() method to transform the audio sample data coming
+// from DMA memory (32-bit stereo, with the L and R channels reversed) to the format specified
+// in the I2S constructor.  e.g.  16-bit mono
+STATIC const int8_t i2s_frame_map[NUM_I2S_USER_FORMATS][I2S_RX_FRAME_SIZE_IN_BYTES] = {
+    { 6,  7, -1, -1, -1, -1, -1, -1 },  // Mono, 16-bits
+    { 4,  5,  6,  7, -1, -1, -1, -1 },  // Mono, 32-bits
+    { 6,  7,  2,  3, -1, -1, -1, -1 },  // Stereo, 16-bits
+    { 4,  5,  6,  7,  0,  1,  2,  3 },  // Stereo, 32-bits
+};
+
+STATIC machine_i2s_obj_t *machine_i2s_obj[I2S_NUM_MAX];
+
+void machine_i2s_init0() {
+    for (i2s_port_t p = 0; p < I2S_NUM_MAX; p++) {
+        machine_i2s_obj[p] = NULL;
+    }
+}
+
+//  The following function takes a sample buffer and swaps L/R channels
+//
+//  Background:  For 32-bit stereo, the ESP-IDF API has a L/R channel orientation that breaks
+//               convention with other ESP32 channel formats
+//
+//   appbuf[] = [L_0-7, L_8-15, L_16-23, L_24-31, R_0-7, R_8-15, R_16-23, R_24-31] = [Left channel, Right channel]
+//   dma[] =    [R_0-7, R_8-15, R_16-23, R_24-31, L_0-7, L_8-15, L_16-23, L_24-31] = [Right channel, Left channel]
+//
+//   where:
+//     L_0-7 is the least significant byte of the 32 bit sample in the Left channel
+//     L_24-31 is the most significant byte of the 32 bit sample in the Left channel
+//
+//  Example:
+//
+//   appbuf[] = [0x99, 0xBB, 0x11, 0x22, 0x44, 0x55, 0xAB, 0x77] = [Left channel, Right channel]
+//   dma[] =    [0x44, 0x55, 0xAB, 0x77, 0x99, 0xBB, 0x11, 0x22] = [Right channel,  Left channel]
+//   where:
+//      LEFT Channel =  0x99, 0xBB, 0x11, 0x22
+//      RIGHT Channel = 0x44, 0x55, 0xAB, 0x77
+//
+//    samples in appbuf are in little endian format:
+//       0x77 is the most significant byte of the 32-bit sample
+//       0x44 is the least significant byte of the 32-bit sample
+STATIC void swap_32_bit_stereo_channels(mp_buffer_info_t *bufinfo) {
+    int32_t swap_sample;
+    int32_t *sample = bufinfo->buf;
+    uint32_t num_samples = bufinfo->len / 4;
+    for (uint32_t i = 0; i < num_samples; i += 2) {
+        swap_sample = sample[i + 1];
+        sample[i + 1] = sample[i];
+        sample[i] = swap_sample;
+    }
+}
+
+STATIC int8_t get_frame_mapping_index(i2s_bits_per_sample_t bits, format_t format) {
+    if (format == MONO) {
+        if (bits == I2S_BITS_PER_SAMPLE_16BIT) {
+            return 0;
+        } else { // 32 bits
+            return 1;
+        }
+    } else { // STEREO
+        if (bits == I2S_BITS_PER_SAMPLE_16BIT) {
+            return 2;
+        } else { // 32 bits
+            return 3;
+        }
+    }
+}
+
+STATIC i2s_bits_per_sample_t get_dma_bits(uint8_t mode, i2s_bits_per_sample_t bits) {
+    if (mode == (I2S_MODE_MASTER | I2S_MODE_TX)) {
+        return bits;
+    } else { // Master Rx
+        // read 32 bit samples for I2S hardware.  e.g. MEMS microphones
+        return I2S_BITS_PER_SAMPLE_32BIT;
+    }
+}
+
+STATIC i2s_channel_fmt_t get_dma_format(uint8_t mode, format_t format) {
+    if (mode == (I2S_MODE_MASTER | I2S_MODE_TX)) {
+        if (format == MONO) {
+            return I2S_CHANNEL_FMT_ONLY_LEFT;
+        } else {  // STEREO
+            return I2S_CHANNEL_FMT_RIGHT_LEFT;
+        }
+    } else { // Master Rx
+        // read stereo frames for all I2S hardware
+        return I2S_CHANNEL_FMT_RIGHT_LEFT;
+    }
+}
+
+STATIC uint32_t get_dma_buf_count(uint8_t mode, i2s_bits_per_sample_t bits, format_t format, int32_t ibuf) {
+    // calculate how many DMA buffers need to be allocated
+    uint32_t dma_frame_size_in_bytes =
+        (get_dma_bits(mode, bits) / 8) * (get_dma_format(mode, format) == I2S_CHANNEL_FMT_RIGHT_LEFT ? 2: 1);
+
+    uint32_t dma_buf_count = ibuf / (DMA_BUF_LEN_IN_I2S_FRAMES * dma_frame_size_in_bytes);
+
+    return dma_buf_count;
+}
+
+STATIC uint32_t fill_appbuf_from_dma(machine_i2s_obj_t *self, mp_buffer_info_t *appbuf) {
+
+    // copy audio samples from DMA memory to the app buffer
+    // audio samples are read from DMA memory in chunks
+    // loop, reading and copying chunks until the app buffer is filled
+    // For uasyncio mode, the loop will make an early exit if DMA memory becomes empty
+    // Example:
+    //   a MicroPython I2S object is configured for 16-bit mono (2 bytes per audio sample).
+    //   For every frame coming from DMA (8 bytes), 2 bytes are "cherry picked" and
+    //   copied to the supplied app buffer.
+    //   Thus, for every 1 byte copied to the app buffer, 4 bytes are read from DMA memory.
+    //   If a 8kB app buffer is supplied, 32kB of audio samples is read from DMA memory.
+
+    uint32_t a_index = 0;
+    uint8_t *app_p = appbuf->buf;
+    uint8_t appbuf_sample_size_in_bytes = (self->bits / 8) * (self->format == STEREO ? 2: 1);
+    uint32_t num_bytes_needed_from_dma = appbuf->len * (I2S_RX_FRAME_SIZE_IN_BYTES / appbuf_sample_size_in_bytes);
+    while (num_bytes_needed_from_dma) {
+        uint32_t num_bytes_requested_from_dma = MIN(sizeof(self->transform_buffer), num_bytes_needed_from_dma);
+        uint32_t num_bytes_received_from_dma = 0;
+
+        TickType_t delay;
+        if (self->io_mode == UASYNCIO) {
+            delay = 0; // stop i2s_read() operation if DMA memory becomes empty
+        } else {
+            delay = portMAX_DELAY;  // block until supplied buffer is filled
+        }
+
+        // read a chunk of audio samples from DMA memory
+        check_esp_err(i2s_read(
+            self->port,
+            self->transform_buffer,
+            num_bytes_requested_from_dma,
+            &num_bytes_received_from_dma,
+            delay));
+
+        // process the transform buffer one frame at a time.
+        // copy selected bytes from the transform buffer into the user supplied appbuf.
+        // Example:
+        //   a MicroPython I2S object is configured for 16-bit mono.  This configuration associates to
+        //   a frame map index of 0 = { 6,  7, -1, -1, -1, -1, -1, -1 } in the i2s_frame_map array
+        //   This mapping indicates:
+        //      appbuf[x+0] = frame[6]
+        //      appbuf[x+1] = frame[7]
+        //      frame bytes 0-5 are not used
+
+        uint32_t t_index = 0;
+        uint8_t f_index = get_frame_mapping_index(self->bits, self->format);
+        while (t_index < num_bytes_received_from_dma) {
+            uint8_t *transform_p = self->transform_buffer + t_index;
+
+            for (uint8_t i = 0; i < I2S_RX_FRAME_SIZE_IN_BYTES; i++) {
+                int8_t t_to_a_mapping = i2s_frame_map[f_index][i];
+                if (t_to_a_mapping != -1) {
+                    *app_p++ = transform_p[t_to_a_mapping];
+                    a_index++;
+                }
+                t_index++;
+            }
+        }
+
+        num_bytes_needed_from_dma -= num_bytes_received_from_dma;
+
+        if ((self->io_mode == UASYNCIO) && (num_bytes_received_from_dma < num_bytes_requested_from_dma)) {
+            // Unable to fill the entire app buffer from DMA memory.  This indicates all DMA RX buffers are empty.
+            // Clear the I2S event queue so ioctl() indicates that the I2S object cannot currently
+            // supply more audio samples
+            xQueueReset(self->i2s_event_queue);
+            break;
+        }
+    }
+
+    return a_index;
+}
+
+STATIC uint32_t copy_appbuf_to_dma(machine_i2s_obj_t *self, mp_buffer_info_t *appbuf) {
+    if ((self->bits == I2S_BITS_PER_SAMPLE_32BIT) && (self->format == STEREO)) {
+        swap_32_bit_stereo_channels(appbuf);
+    }
+
+    uint32_t num_bytes_written = 0;
+
+    TickType_t delay;
+    if (self->io_mode == UASYNCIO) {
+        delay = 0;  // stop i2s_write() operation if DMA memory becomes full
+    } else {
+        delay = portMAX_DELAY;  // block until supplied buffer is emptied
+    }
+
+    check_esp_err(i2s_write(self->port, appbuf->buf, appbuf->len, &num_bytes_written, delay));
+
+    if ((self->io_mode == UASYNCIO) && (num_bytes_written < appbuf->len)) {
+        // Unable to empty the entire app buffer into DMA memory.  This indicates all DMA TX buffers are full.
+        // Clear the I2S event queue so ioctl() indicates that the I2S object cannot currently
+        // accept more audio samples
+        xQueueReset(self->i2s_event_queue);
+
+        // Undo the swap transformation as the buffer has not been completely emptied.
+        // The uasyncio stream writer will use the same buffer in a future write call.
+        if ((self->bits == I2S_BITS_PER_SAMPLE_32BIT) && (self->format == STEREO)) {
+            swap_32_bit_stereo_channels(appbuf);
+        }
+    }
+    return num_bytes_written;
+}
+
+// FreeRTOS task used for non-blocking mode
+STATIC void task_for_non_blocking_mode(void *self_in) {
+    machine_i2s_obj_t *self = (machine_i2s_obj_t *)self_in;
+
+    non_blocking_descriptor_t descriptor;
+
+    for (;;) {
+        if (xQueueReceive(self->non_blocking_mode_queue, &descriptor, portMAX_DELAY)) {
+            if (descriptor.direction == I2S_TX_TRANSFER) {
+                copy_appbuf_to_dma(self, &descriptor.appbuf);
+            } else { // RX
+                fill_appbuf_from_dma(self, &descriptor.appbuf);
+            }
+            mp_sched_schedule(descriptor.callback, MP_OBJ_FROM_PTR(self));
+        }
+    }
+}
+
+STATIC void machine_i2s_init_helper(machine_i2s_obj_t *self, size_t n_pos_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+
+    enum {
+        ARG_sck,
+        ARG_ws,
+        ARG_sd,
+        ARG_mode,
+        ARG_bits,
+        ARG_format,
+        ARG_rate,
+        ARG_ibuf,
+    };
+
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_sck,      MP_ARG_KW_ONLY | MP_ARG_REQUIRED | MP_ARG_OBJ,   {.u_obj = MP_OBJ_NULL} },
+        { MP_QSTR_ws,       MP_ARG_KW_ONLY | MP_ARG_REQUIRED | MP_ARG_OBJ,   {.u_obj = MP_OBJ_NULL} },
+        { MP_QSTR_sd,       MP_ARG_KW_ONLY | MP_ARG_REQUIRED | MP_ARG_OBJ,   {.u_obj = MP_OBJ_NULL} },
+        { MP_QSTR_mode,     MP_ARG_KW_ONLY | MP_ARG_REQUIRED | MP_ARG_INT,   {.u_int = -1} },
+        { MP_QSTR_bits,     MP_ARG_KW_ONLY | MP_ARG_REQUIRED | MP_ARG_INT,   {.u_int = -1} },
+        { MP_QSTR_format,   MP_ARG_KW_ONLY | MP_ARG_REQUIRED | MP_ARG_INT,   {.u_int = -1} },
+        { MP_QSTR_rate,     MP_ARG_KW_ONLY | MP_ARG_REQUIRED | MP_ARG_INT,   {.u_int = -1} },
+        { MP_QSTR_ibuf,     MP_ARG_KW_ONLY | MP_ARG_REQUIRED | MP_ARG_INT,   {.u_int = -1} },
+    };
+
+    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
+    mp_arg_parse_all(n_pos_args, pos_args, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
+
+    //
+    // ---- Check validity of arguments ----
+    //
+
+    // are Pins valid?
+    int8_t sck = args[ARG_sck].u_obj == MP_OBJ_NULL ? -1 : mp_hal_get_pin_obj(args[ARG_sck].u_obj);
+    int8_t ws = args[ARG_ws].u_obj == MP_OBJ_NULL ? -1 : mp_hal_get_pin_obj(args[ARG_ws].u_obj);
+    int8_t sd = args[ARG_sd].u_obj == MP_OBJ_NULL ? -1 : mp_hal_get_pin_obj(args[ARG_sd].u_obj);
+
+    // is Mode valid?
+    i2s_mode_t mode = args[ARG_mode].u_int;
+    if ((mode != (I2S_MODE_MASTER | I2S_MODE_RX)) &&
+        (mode != (I2S_MODE_MASTER | I2S_MODE_TX))) {
+        mp_raise_ValueError(MP_ERROR_TEXT("invalid mode"));
+    }
+
+    // is Bits valid?
+    i2s_bits_per_sample_t bits = args[ARG_bits].u_int;
+    if ((bits != I2S_BITS_PER_SAMPLE_16BIT) &&
+        (bits != I2S_BITS_PER_SAMPLE_32BIT)) {
+        mp_raise_ValueError(MP_ERROR_TEXT("invalid bits"));
+    }
+
+    // is Format valid?
+    format_t format = args[ARG_format].u_int;
+    if ((format != STEREO) &&
+        (format != MONO)) {
+        mp_raise_ValueError(MP_ERROR_TEXT("invalid format"));
+    }
+
+    // is Rate valid?
+    // Not checked:  ESP-IDF I2S API does not indicate a valid range for sample rate
+
+    // is Ibuf valid?
+    // Not checked: ESP-IDF I2S API will return error if requested buffer size exceeds available memory
+
+    self->sck = sck;
+    self->ws = ws;
+    self->sd = sd;
+    self->mode = mode;
+    self->bits = bits;
+    self->format = format;
+    self->rate = args[ARG_rate].u_int;
+    self->ibuf = args[ARG_ibuf].u_int;
+    self->callback_for_non_blocking = MP_OBJ_NULL;
+    self->i2s_event_queue = NULL;
+    self->non_blocking_mode_queue = NULL;
+    self->non_blocking_mode_task = NULL;
+    self->io_mode = BLOCKING;
+
+    i2s_config_t i2s_config;
+    i2s_config.communication_format = I2S_COMM_FORMAT_I2S;
+    i2s_config.mode = mode;
+    i2s_config.bits_per_sample = get_dma_bits(mode, bits);
+    i2s_config.channel_format = get_dma_format(mode, format);
+    i2s_config.sample_rate = self->rate;
+    i2s_config.intr_alloc_flags = ESP_INTR_FLAG_LOWMED;
+    i2s_config.dma_buf_count = get_dma_buf_count(mode, bits, format, self->ibuf);
+    i2s_config.dma_buf_len = DMA_BUF_LEN_IN_I2S_FRAMES;
+    i2s_config.use_apll = false;
+
+    // I2S queue size equals the number of DMA buffers
+    check_esp_err(i2s_driver_install(self->port, &i2s_config, i2s_config.dma_buf_count, &self->i2s_event_queue));
+
+    // apply low-level workaround for bug in some ESP-IDF versions that swap
+    // the left and right channels
+    // https://github.com/espressif/esp-idf/issues/6625
+    REG_SET_BIT(I2S_CONF_REG(self->port), I2S_TX_MSB_RIGHT);
+    REG_SET_BIT(I2S_CONF_REG(self->port), I2S_RX_MSB_RIGHT);
+
+    i2s_pin_config_t pin_config;
+    pin_config.bck_io_num = self->sck;
+    pin_config.ws_io_num = self->ws;
+
+    if (mode == (I2S_MODE_MASTER | I2S_MODE_RX)) {
+        pin_config.data_in_num = self->sd;
+        pin_config.data_out_num = -1;
+    } else { // TX
+        pin_config.data_in_num = -1;
+        pin_config.data_out_num = self->sd;
+    }
+
+    check_esp_err(i2s_set_pin(self->port, &pin_config));
+}
+
+STATIC void machine_i2s_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+    machine_i2s_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    mp_printf(print, "I2S(id=%u,\n"
+        "sck="MP_HAL_PIN_FMT ",\n"
+        "ws="MP_HAL_PIN_FMT ",\n"
+        "sd="MP_HAL_PIN_FMT ",\n"
+        "mode=%u,\n"
+        "bits=%u, format=%u,\n"
+        "rate=%d, ibuf=%d)",
+        self->port,
+        mp_hal_pin_name(self->sck),
+        mp_hal_pin_name(self->ws),
+        mp_hal_pin_name(self->sd),
+        self->mode,
+        self->bits, self->format,
+        self->rate, self->ibuf
+        );
+}
+
+STATIC mp_obj_t machine_i2s_make_new(const mp_obj_type_t *type, size_t n_pos_args, size_t n_kw_args, const mp_obj_t *args) {
+    mp_arg_check_num(n_pos_args, n_kw_args, 1, MP_OBJ_FUN_ARGS_MAX, true);
+
+    i2s_port_t port = mp_obj_get_int(args[0]);
+    if (port < 0 || port >= I2S_NUM_MAX) {
+        mp_raise_ValueError(MP_ERROR_TEXT("invalid id"));
+    }
+
+    machine_i2s_obj_t *self;
+    if (machine_i2s_obj[port] == NULL) {
+        self = m_new_obj(machine_i2s_obj_t);
+        machine_i2s_obj[port] = self;
+        self->base.type = &machine_i2s_type;
+        self->port = port;
+    } else {
+        self = machine_i2s_obj[port];
+        machine_i2s_deinit(self);
+    }
+
+    mp_map_t kw_args;
+    mp_map_init_fixed_table(&kw_args, n_kw_args, args + n_pos_args);
+    machine_i2s_init_helper(self, n_pos_args - 1, args + 1, &kw_args);
+
+    return MP_OBJ_FROM_PTR(self);
+}
+
+STATIC mp_obj_t machine_i2s_obj_init(mp_uint_t n_pos_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    machine_i2s_obj_t *self = pos_args[0];
+    machine_i2s_deinit(self);
+    machine_i2s_init_helper(self, n_pos_args - 1, pos_args + 1, kw_args);
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_KW(machine_i2s_init_obj, 1, machine_i2s_obj_init);
+
+STATIC mp_obj_t machine_i2s_deinit(mp_obj_t self_in) {
+    machine_i2s_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    i2s_driver_uninstall(self->port);
+
+    if (self->non_blocking_mode_task != NULL) {
+        vTaskDelete(self->non_blocking_mode_task);
+        self->non_blocking_mode_task = NULL;
+    }
+
+    if (self->non_blocking_mode_queue != NULL) {
+        vQueueDelete(self->non_blocking_mode_queue);
+        self->non_blocking_mode_queue = NULL;
+    }
+
+    self->i2s_event_queue = NULL;
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_i2s_deinit_obj, machine_i2s_deinit);
+
+STATIC mp_obj_t machine_i2s_irq(mp_obj_t self_in, mp_obj_t handler) {
+    machine_i2s_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    if (handler != mp_const_none && !mp_obj_is_callable(handler)) {
+        mp_raise_ValueError(MP_ERROR_TEXT("invalid callback"));
+    }
+
+    if (handler != mp_const_none) {
+        self->io_mode = NON_BLOCKING;
+
+        // create a queue linking the MicroPython task to a FreeRTOS task
+        // that manages the non blocking mode of operation
+        self->non_blocking_mode_queue = xQueueCreate(1, sizeof(non_blocking_descriptor_t));
+
+        // non-blocking mode requires a background FreeRTOS task
+        if (xTaskCreatePinnedToCore(
+            task_for_non_blocking_mode,
+            "i2s_non_blocking",
+            I2S_TASK_STACK_SIZE,
+            self,
+            I2S_TASK_PRIORITY,
+            (TaskHandle_t *)&self->non_blocking_mode_task,
+            MP_TASK_COREID) != pdPASS) {
+
+            mp_raise_msg(&mp_type_RuntimeError, MP_ERROR_TEXT("failed to create I2S task"));
+        }
+    } else {
+        if (self->non_blocking_mode_task != NULL) {
+            vTaskDelete(self->non_blocking_mode_task);
+            self->non_blocking_mode_task = NULL;
+        }
+
+        if (self->non_blocking_mode_queue != NULL) {
+            vQueueDelete(self->non_blocking_mode_queue);
+            self->non_blocking_mode_queue = NULL;
+        }
+
+        self->io_mode = BLOCKING;
+    }
+
+    self->callback_for_non_blocking = handler;
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(machine_i2s_irq_obj, machine_i2s_irq);
+
+// Shift() is typically used as a volume control.
+// shift=1 increases volume by 6dB, shift=-1 decreases volume by 6dB
+STATIC mp_obj_t machine_i2s_shift(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    enum { ARG_buf, ARG_bits, ARG_shift};
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_buf,    MP_ARG_REQUIRED | MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = mp_const_none} },
+        { MP_QSTR_bits,   MP_ARG_REQUIRED | MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} },
+        { MP_QSTR_shift,  MP_ARG_REQUIRED | MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} },
+    };
+
+    // parse args
+    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
+    mp_arg_parse_all(n_args, pos_args, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
+
+    mp_buffer_info_t bufinfo;
+    mp_get_buffer_raise(args[ARG_buf].u_obj, &bufinfo, MP_BUFFER_RW);
+
+    int16_t *buf_16 = bufinfo.buf;
+    int32_t *buf_32 = bufinfo.buf;
+
+    uint8_t bits = args[ARG_bits].u_int;
+    int8_t shift = args[ARG_shift].u_int;
+
+    uint32_t num_audio_samples;
+    switch (bits) {
+        case 16:
+            num_audio_samples = bufinfo.len / 2;
+            break;
+
+        case 32:
+            num_audio_samples = bufinfo.len / 4;
+            break;
+
+        default:
+            mp_raise_ValueError(MP_ERROR_TEXT("invalid bits"));
+            break;
+    }
+
+    for (uint32_t i = 0; i < num_audio_samples; i++) {
+        switch (bits) {
+            case 16:
+                if (shift >= 0) {
+                    buf_16[i] = buf_16[i] << shift;
+                } else {
+                    buf_16[i] = buf_16[i] >> abs(shift);
+                }
+                break;
+            case 32:
+                if (shift >= 0) {
+                    buf_32[i] = buf_32[i] << shift;
+                } else {
+                    buf_32[i] = buf_32[i] >> abs(shift);
+                }
+                break;
+        }
+    }
+
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_KW(machine_i2s_shift_fun_obj, 0, machine_i2s_shift);
+STATIC MP_DEFINE_CONST_STATICMETHOD_OBJ(machine_i2s_shift_obj, MP_ROM_PTR(&machine_i2s_shift_fun_obj));
+
+STATIC const mp_rom_map_elem_t machine_i2s_locals_dict_table[] = {
+    // Methods
+    { MP_ROM_QSTR(MP_QSTR_init),            MP_ROM_PTR(&machine_i2s_init_obj) },
+    { MP_ROM_QSTR(MP_QSTR_readinto),        MP_ROM_PTR(&mp_stream_readinto_obj) },
+    { MP_ROM_QSTR(MP_QSTR_write),           MP_ROM_PTR(&mp_stream_write_obj) },
+    { MP_ROM_QSTR(MP_QSTR_deinit),          MP_ROM_PTR(&machine_i2s_deinit_obj) },
+    { MP_ROM_QSTR(MP_QSTR_irq),             MP_ROM_PTR(&machine_i2s_irq_obj) },
+
+    // Static method
+    { MP_ROM_QSTR(MP_QSTR_shift),           MP_ROM_PTR(&machine_i2s_shift_obj) },
+
+    // Constants
+    { MP_ROM_QSTR(MP_QSTR_RX),              MP_ROM_INT(I2S_MODE_MASTER | I2S_MODE_RX) },
+    { MP_ROM_QSTR(MP_QSTR_TX),              MP_ROM_INT(I2S_MODE_MASTER | I2S_MODE_TX) },
+    { MP_ROM_QSTR(MP_QSTR_STEREO),          MP_ROM_INT(STEREO) },
+    { MP_ROM_QSTR(MP_QSTR_MONO),            MP_ROM_INT(MONO) },
+};
+MP_DEFINE_CONST_DICT(machine_i2s_locals_dict, machine_i2s_locals_dict_table);
+
+STATIC mp_uint_t machine_i2s_stream_read(mp_obj_t self_in, void *buf_in, mp_uint_t size, int *errcode) {
+    machine_i2s_obj_t *self = MP_OBJ_TO_PTR(self_in);
+
+    if (self->mode != (I2S_MODE_MASTER | I2S_MODE_RX)) {
+        *errcode = MP_EPERM;
+        return MP_STREAM_ERROR;
+    }
+
+    uint8_t appbuf_sample_size_in_bytes = (self->bits / 8) * (self->format == STEREO ? 2: 1);
+    if (size % appbuf_sample_size_in_bytes != 0) {
+        *errcode = MP_EINVAL;
+        return MP_STREAM_ERROR;
+    }
+
+    if (size == 0) {
+        return 0;
+    }
+
+    if (self->io_mode == NON_BLOCKING) {
+        non_blocking_descriptor_t descriptor;
+        descriptor.appbuf.buf = (void *)buf_in;
+        descriptor.appbuf.len = size;
+        descriptor.callback = self->callback_for_non_blocking;
+        descriptor.direction = I2S_RX_TRANSFER;
+        // send the descriptor to the task that handles non-blocking mode
+        xQueueSend(self->non_blocking_mode_queue, &descriptor, 0);
+        return size;
+    } else { // blocking or uasyncio mode
+        mp_buffer_info_t appbuf;
+        appbuf.buf = (void *)buf_in;
+        appbuf.len = size;
+        uint32_t num_bytes_read = fill_appbuf_from_dma(self, &appbuf);
+        return num_bytes_read;
+    }
+}
+
+STATIC mp_uint_t machine_i2s_stream_write(mp_obj_t self_in, const void *buf_in, mp_uint_t size, int *errcode) {
+    machine_i2s_obj_t *self = MP_OBJ_TO_PTR(self_in);
+
+    if (self->mode != (I2S_MODE_MASTER | I2S_MODE_TX)) {
+        *errcode = MP_EPERM;
+        return MP_STREAM_ERROR;
+    }
+
+    if (size == 0) {
+        return 0;
+    }
+
+    if (self->io_mode == NON_BLOCKING) {
+        non_blocking_descriptor_t descriptor;
+        descriptor.appbuf.buf = (void *)buf_in;
+        descriptor.appbuf.len = size;
+        descriptor.callback = self->callback_for_non_blocking;
+        descriptor.direction = I2S_TX_TRANSFER;
+        // send the descriptor to the task that handles non-blocking mode
+        xQueueSend(self->non_blocking_mode_queue, &descriptor, 0);
+        return size;
+    } else { // blocking or uasyncio mode
+        mp_buffer_info_t appbuf;
+        appbuf.buf = (void *)buf_in;
+        appbuf.len = size;
+        uint32_t num_bytes_written = copy_appbuf_to_dma(self, &appbuf);
+        return num_bytes_written;
+    }
+}
+
+STATIC mp_uint_t machine_i2s_ioctl(mp_obj_t self_in, mp_uint_t request, mp_uint_t arg, int *errcode) {
+    machine_i2s_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    mp_uint_t ret;
+    mp_uint_t flags = arg;
+    self->io_mode = UASYNCIO; // a call to ioctl() is an indication that uasyncio is being used
+
+    if (request == MP_STREAM_POLL) {
+        ret = 0;
+
+        if (flags & MP_STREAM_POLL_RD) {
+            if (self->mode != (I2S_MODE_MASTER | I2S_MODE_RX)) {
+                *errcode = MP_EPERM;
+                return MP_STREAM_ERROR;
+            }
+
+            i2s_event_t i2s_event;
+
+            // check event queue to determine if a DMA buffer has been filled
+            // (which is an indication that at least one DMA buffer is available to be read)
+            // note:  timeout = 0 so the call is non-blocking
+            if (xQueueReceive(self->i2s_event_queue, &i2s_event, 0)) {
+                if (i2s_event.type == I2S_EVENT_RX_DONE) {
+                    // getting here means that at least one DMA buffer is now full
+                    // indicating that audio samples can be read from the I2S object
+                    ret |= MP_STREAM_POLL_RD;
+                }
+            }
+        }
+
+        if (flags & MP_STREAM_POLL_WR) {
+            if (self->mode != (I2S_MODE_MASTER | I2S_MODE_TX)) {
+                *errcode = MP_EPERM;
+                return MP_STREAM_ERROR;
+            }
+
+            i2s_event_t i2s_event;
+
+            // check event queue to determine if a DMA buffer has been emptied
+            // (which is an indication that at least one DMA buffer is available to be written)
+            // note:  timeout = 0 so the call is non-blocking
+            if (xQueueReceive(self->i2s_event_queue, &i2s_event, 0)) {
+                if (i2s_event.type == I2S_EVENT_TX_DONE) {
+                    // getting here means that at least one DMA buffer is now empty
+                    // indicating that audio samples can be written to the I2S object
+                    ret |= MP_STREAM_POLL_WR;
+                }
+            }
+        }
+    } else {
+        *errcode = MP_EINVAL;
+        ret = MP_STREAM_ERROR;
+    }
+
+    return ret;
+}
+
+STATIC const mp_stream_p_t i2s_stream_p = {
+    .read = machine_i2s_stream_read,
+    .write = machine_i2s_stream_write,
+    .ioctl = machine_i2s_ioctl,
+    .is_text = false,
+};
+
+const mp_obj_type_t machine_i2s_type = {
+    { &mp_type_type },
+    .name = MP_QSTR_I2S,
+    .print = machine_i2s_print,
+    .getiter = mp_identity_getiter,
+    .iternext = mp_stream_unbuffered_iter,
+    .protocol = &i2s_stream_p,
+    .make_new = machine_i2s_make_new,
+    .locals_dict = (mp_obj_dict_t *)&machine_i2s_locals_dict,
+};
diff --git a/ports/esp32/main.c b/ports/esp32/main.c
index ff6dd69574ba6..b04831fff16ca 100644
--- a/ports/esp32/main.c
+++ b/ports/esp32/main.c
@@ -138,6 +138,7 @@ void mp_task(void *pvParameter) {
 
     // initialise peripherals
     machine_pins_init();
+    machine_i2s_init0();
 
     // run boot-up scripts
     pyexec_frozen_module("_boot.py");
diff --git a/ports/esp32/main/CMakeLists.txt b/ports/esp32/main/CMakeLists.txt
index d01656e567cfe..fb08c2759e1b9 100644
--- a/ports/esp32/main/CMakeLists.txt
+++ b/ports/esp32/main/CMakeLists.txt
@@ -52,6 +52,7 @@ set(MICROPY_SOURCE_PORT
     ${PROJECT_DIR}/machine_adc.c
     ${PROJECT_DIR}/machine_dac.c
     ${PROJECT_DIR}/machine_i2c.c
+    ${PROJECT_DIR}/machine_i2s.c
     ${PROJECT_DIR}/machine_pwm.c
     ${PROJECT_DIR}/machine_uart.c
     ${PROJECT_DIR}/modmachine.c
diff --git a/ports/esp32/modmachine.c b/ports/esp32/modmachine.c
index bbe7fae0335e4..c46f8ab8d7ff3 100644
--- a/ports/esp32/modmachine.c
+++ b/ports/esp32/modmachine.c
@@ -280,6 +280,7 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_DAC), MP_ROM_PTR(&machine_dac_type) },
     { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&machine_hw_i2c_type) },
     { MP_ROM_QSTR(MP_QSTR_SoftI2C), MP_ROM_PTR(&mp_machine_soft_i2c_type) },
+    { MP_ROM_QSTR(MP_QSTR_I2S), MP_ROM_PTR(&machine_i2s_type) },
     { MP_ROM_QSTR(MP_QSTR_PWM), MP_ROM_PTR(&machine_pwm_type) },
     { MP_ROM_QSTR(MP_QSTR_RTC), MP_ROM_PTR(&machine_rtc_type) },
     { MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&machine_hw_spi_type) },
diff --git a/ports/esp32/modmachine.h b/ports/esp32/modmachine.h
index 3e99e11205afc..7bf03b0cabc7e 100644
--- a/ports/esp32/modmachine.h
+++ b/ports/esp32/modmachine.h
@@ -18,6 +18,7 @@ extern const mp_obj_type_t machine_dac_type;
 extern const mp_obj_type_t machine_pwm_type;
 extern const mp_obj_type_t machine_hw_i2c_type;
 extern const mp_obj_type_t machine_hw_spi_type;
+extern const mp_obj_type_t machine_i2s_type;
 extern const mp_obj_type_t machine_uart_type;
 extern const mp_obj_type_t machine_rtc_type;
 extern const mp_obj_type_t machine_sdcard_type;
@@ -27,5 +28,6 @@ void machine_deinit(void);
 void machine_pins_init(void);
 void machine_pins_deinit(void);
 void machine_timer_deinit_all(void);
+void machine_i2s_init0();
 
 #endif // MICROPY_INCLUDED_ESP32_MODMACHINE_H
diff --git a/ports/stm32/Makefile b/ports/stm32/Makefile
index e94e7d72f363f..4ec03c17460a6 100644
--- a/ports/stm32/Makefile
+++ b/ports/stm32/Makefile
@@ -318,6 +318,7 @@ SRC_C += \
 	help.c \
 	machine_adc.c \
 	machine_i2c.c \
+	machine_i2s.c \
 	machine_spi.c \
 	machine_timer.c \
 	machine_uart.c \
@@ -427,6 +428,18 @@ ifeq ($(MCU_SERIES),$(filter $(MCU_SERIES),f0 f4 f7 h7 l4))
 endif
 endif
 
+ifeq ($(MCU_SERIES),$(filter $(MCU_SERIES),f0 f4 f7 l0))
+HAL_SRC_C += $(addprefix $(HAL_DIR)/Src/stm32$(MCU_SERIES)xx_,\
+	hal_i2s.c \
+	)
+endif
+
+ifeq ($(MCU_SERIES),$(filter $(MCU_SERIES),f4))
+HAL_SRC_C += $(addprefix $(HAL_DIR)/Src/stm32$(MCU_SERIES)xx_,\
+	hal_i2s_ex.c \
+	)
+endif
+
 USBDEV_SRC_C += $(addprefix $(USBDEV_DIR)/,\
 	core/src/usbd_core.c \
 	core/src/usbd_ctlreq.c \
diff --git a/ports/stm32/boards/PYBD_SF2/mpconfigboard.h b/ports/stm32/boards/PYBD_SF2/mpconfigboard.h
index 48b3ee3eb9092..ed76b3f9711fd 100644
--- a/ports/stm32/boards/PYBD_SF2/mpconfigboard.h
+++ b/ports/stm32/boards/PYBD_SF2/mpconfigboard.h
@@ -40,6 +40,7 @@
 #define MICROPY_HW_ENABLE_SDCARD    (1)
 #define MICROPY_HW_ENABLE_MMCARD    (1)
 #define MICROPY_HW_ENABLE_RF_SWITCH (1)
+#define MICROPY_HW_ENABLE_I2S       (1)
 
 #define MICROPY_BOARD_EARLY_INIT    board_early_init
 #define MICROPY_BOARD_ENTER_STOP    board_sleep(1);
@@ -146,6 +147,10 @@ extern struct _spi_bdev_t spi_bdev2;
 #define MICROPY_HW_SPI3_MISO        (pyb_pin_W50)
 #define MICROPY_HW_SPI3_MOSI        (pyb_pin_W46)
 
+// I2S buses
+#define MICROPY_HW_I2S1             (1)
+#define MICROPY_HW_I2S2             (1)
+
 // CAN buses
 #define MICROPY_HW_CAN1_NAME        "X"
 #define MICROPY_HW_CAN1_TX          (pyb_pin_X10)
diff --git a/ports/stm32/boards/PYBV10/mpconfigboard.h b/ports/stm32/boards/PYBV10/mpconfigboard.h
index 52382f44d5c14..50ef3ae26912c 100644
--- a/ports/stm32/boards/PYBV10/mpconfigboard.h
+++ b/ports/stm32/boards/PYBV10/mpconfigboard.h
@@ -11,6 +11,7 @@
 #define MICROPY_HW_ENABLE_DAC       (1)
 #define MICROPY_HW_ENABLE_USB       (1)
 #define MICROPY_HW_ENABLE_SDCARD    (1)
+#define MICROPY_HW_ENABLE_I2S       (1)
 
 // HSE is 8MHz
 #define MICROPY_HW_CLK_PLLM (8)
@@ -64,6 +65,9 @@
 #define MICROPY_HW_SPI2_MISO (pin_B14) // Y7
 #define MICROPY_HW_SPI2_MOSI (pin_B15) // Y8
 
+// I2S buses
+#define MICROPY_HW_I2S2      (1)
+
 // CAN buses
 #define MICROPY_HW_CAN1_NAME "YA"
 #define MICROPY_HW_CAN1_TX   (pin_B9) // Y4
diff --git a/ports/stm32/boards/PYBV11/mpconfigboard.h b/ports/stm32/boards/PYBV11/mpconfigboard.h
index 8e84694048201..aec83d1349129 100644
--- a/ports/stm32/boards/PYBV11/mpconfigboard.h
+++ b/ports/stm32/boards/PYBV11/mpconfigboard.h
@@ -11,6 +11,7 @@
 #define MICROPY_HW_ENABLE_DAC       (1)
 #define MICROPY_HW_ENABLE_USB       (1)
 #define MICROPY_HW_ENABLE_SDCARD    (1)
+#define MICROPY_HW_ENABLE_I2S       (1)
 
 // HSE is 12MHz
 #define MICROPY_HW_CLK_PLLM (12)
@@ -64,6 +65,9 @@
 #define MICROPY_HW_SPI2_MISO (pin_B14) // Y7
 #define MICROPY_HW_SPI2_MOSI (pin_B15) // Y8
 
+// I2S buses
+#define MICROPY_HW_I2S2      (1)
+
 // CAN buses
 #define MICROPY_HW_CAN1_NAME "YA"
 #define MICROPY_HW_CAN1_TX   (pin_B9) // Y4
diff --git a/ports/stm32/boards/make-pins.py b/ports/stm32/boards/make-pins.py
index 70213de6ac344..d898832f09606 100755
--- a/ports/stm32/boards/make-pins.py
+++ b/ports/stm32/boards/make-pins.py
@@ -22,7 +22,7 @@
 
 CONDITIONAL_VAR = {
     "I2C": "MICROPY_HW_I2C{num}_SCL",
-    "I2S": "MICROPY_HW_ENABLE_I2S{num}",
+    "I2S": "MICROPY_HW_I2S{num}",
     "SPI": "MICROPY_HW_SPI{num}_SCK",
     "UART": "MICROPY_HW_UART{num}_TX",
     "LPUART": "MICROPY_HW_LPUART{num}_TX",
diff --git a/ports/stm32/dma.c b/ports/stm32/dma.c
index de308869171fa..ba09dc1707925 100644
--- a/ports/stm32/dma.c
+++ b/ports/stm32/dma.c
@@ -103,6 +103,31 @@ static const DMA_InitTypeDef dma_init_struct_spi_i2c = {
     #endif
 };
 
+#if MICROPY_HW_ENABLE_I2S
+// Default parameters to dma_init() for i2s; Channel and Direction
+// vary depending on the peripheral instance so they get passed separately
+static const DMA_InitTypeDef dma_init_struct_i2s = {
+    #if defined(STM32F4) || defined(STM32F7)
+    .Channel = 0,
+    #elif defined(STM32H7) || defined(STM32L0) || defined(STM32L4)
+    .Request = 0,
+    #endif
+    .Direction = DMA_MEMORY_TO_PERIPH,
+    .PeriphInc = DMA_PINC_DISABLE,
+    .MemInc = DMA_MINC_ENABLE,
+    .PeriphDataAlignment = DMA_PDATAALIGN_HALFWORD,
+    .MemDataAlignment = DMA_MDATAALIGN_HALFWORD,
+    .Mode = DMA_CIRCULAR,
+    .Priority = DMA_PRIORITY_LOW,
+    #if defined(STM32F4) || defined(STM32F7) || defined(STM32H7)
+    .FIFOMode = DMA_FIFOMODE_DISABLE,
+    .FIFOThreshold = DMA_FIFO_THRESHOLD_FULL,
+    .MemBurst = DMA_MBURST_SINGLE,
+    .PeriphBurst = DMA_PBURST_SINGLE
+    #endif
+};
+#endif
+
 #if ENABLE_SDIO && !defined(STM32H7)
 // Parameters to dma_init() for SDIO tx and rx.
 static const DMA_InitTypeDef dma_init_struct_sdio = {
@@ -242,6 +267,10 @@ const dma_descr_t dma_I2C_3_RX = { DMA1_Stream2, DMA_CHANNEL_3, dma_id_2,   &dma
 const dma_descr_t dma_I2C_2_RX = { DMA1_Stream2, DMA_CHANNEL_7, dma_id_2,   &dma_init_struct_spi_i2c };
 const dma_descr_t dma_SPI_2_RX = { DMA1_Stream3, DMA_CHANNEL_0, dma_id_3,   &dma_init_struct_spi_i2c };
 const dma_descr_t dma_SPI_2_TX = { DMA1_Stream4, DMA_CHANNEL_0, dma_id_4,   &dma_init_struct_spi_i2c };
+#if MICROPY_HW_ENABLE_I2S
+const dma_descr_t dma_I2S_2_RX = { DMA1_Stream3, DMA_CHANNEL_0, dma_id_3,   &dma_init_struct_i2s };
+const dma_descr_t dma_I2S_2_TX = { DMA1_Stream4, DMA_CHANNEL_0, dma_id_4,   &dma_init_struct_i2s };
+#endif
 const dma_descr_t dma_I2C_3_TX = { DMA1_Stream4, DMA_CHANNEL_3, dma_id_4,   &dma_init_struct_spi_i2c };
 #if defined(STM32F7)
 const dma_descr_t dma_I2C_4_TX = { DMA1_Stream5, DMA_CHANNEL_2, dma_id_5,   &dma_init_struct_spi_i2c };
@@ -266,6 +295,9 @@ const dma_descr_t dma_SDMMC_2 = { DMA2_Stream0, DMA_CHANNEL_11, dma_id_8,  &dma_
 const dma_descr_t dma_DCMI_0 = { DMA2_Stream1, DMA_CHANNEL_1, dma_id_9,  &dma_init_struct_dcmi };
 #endif
 const dma_descr_t dma_SPI_1_RX = { DMA2_Stream2, DMA_CHANNEL_3, dma_id_10,  &dma_init_struct_spi_i2c };
+#if MICROPY_HW_ENABLE_I2S
+const dma_descr_t dma_I2S_1_RX = { DMA2_Stream2, DMA_CHANNEL_3, dma_id_10,  &dma_init_struct_i2s };
+#endif
 const dma_descr_t dma_SPI_5_RX = { DMA2_Stream3, DMA_CHANNEL_2, dma_id_11,  &dma_init_struct_spi_i2c };
 #if ENABLE_SDIO
 const dma_descr_t dma_SDIO_0 = { DMA2_Stream3, DMA_CHANNEL_4, dma_id_11,  &dma_init_struct_sdio };
@@ -275,6 +307,9 @@ const dma_descr_t dma_SPI_5_TX = { DMA2_Stream4, DMA_CHANNEL_2, dma_id_12,  &dma
 const dma_descr_t dma_SPI_4_TX = { DMA2_Stream4, DMA_CHANNEL_5, dma_id_12,  &dma_init_struct_spi_i2c };
 const dma_descr_t dma_SPI_6_TX = { DMA2_Stream5, DMA_CHANNEL_1, dma_id_13,  &dma_init_struct_spi_i2c };
 const dma_descr_t dma_SPI_1_TX = { DMA2_Stream5, DMA_CHANNEL_3, dma_id_13,  &dma_init_struct_spi_i2c };
+#if MICROPY_HW_ENABLE_I2S
+const dma_descr_t dma_I2S_1_TX = { DMA2_Stream5, DMA_CHANNEL_3, dma_id_13,  &dma_init_struct_i2s };
+#endif
 // #if defined(STM32F7) && defined(SDMMC2) && ENABLE_SDIO
 // const dma_descr_t dma_SDMMC_2 = { DMA2_Stream5, DMA_CHANNEL_11, dma_id_13,  &dma_init_struct_sdio };
 // #endif
diff --git a/ports/stm32/dma.h b/ports/stm32/dma.h
index 5a17276a49de2..8bd101a61183f 100644
--- a/ports/stm32/dma.h
+++ b/ports/stm32/dma.h
@@ -57,6 +57,10 @@ extern const dma_descr_t dma_SDMMC_2;
 extern const dma_descr_t dma_SPI_6_RX;
 extern const dma_descr_t dma_SDIO_0;
 extern const dma_descr_t dma_DCMI_0;
+extern const dma_descr_t dma_I2S_1_RX;
+extern const dma_descr_t dma_I2S_1_TX;
+extern const dma_descr_t dma_I2S_2_RX;
+extern const dma_descr_t dma_I2S_2_TX;
 
 #elif defined(STM32L0)
 
diff --git a/ports/stm32/machine_i2s.c b/ports/stm32/machine_i2s.c
new file mode 100644
index 0000000000000..d663767bf339b
--- /dev/null
+++ b/ports/stm32/machine_i2s.c
@@ -0,0 +1,1126 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2015 Bryan Morrissey
+ * Copyright (c) 2021 Mike Teachman
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include <stdio.h>
+#include <stdint.h>
+#include <string.h>
+#include <stdlib.h>
+#include <stdbool.h>
+
+#include "py/obj.h"
+#include "py/runtime.h"
+#include "py/mphal.h"
+#include "py/misc.h"
+#include "py/stream.h"
+#include "py/objstr.h"
+#include "modmachine.h"
+#include "pin.h"
+#include "dma.h"
+
+#if MICROPY_HW_ENABLE_I2S
+// The I2S module has 3 modes of operation:
+//
+// Mode1:  Blocking
+// - readinto() and write() methods block until the supplied buffer is filled (read) or emptied (write)
+// - this is the default mode of operation
+//
+// Mode2:  Non-Blocking
+// - readinto() and write() methods return immediately
+// - buffer filling and emptying happens asynchronously to the main MicroPython task
+// - a callback function is called when the supplied buffer has been filled (read) or emptied (write)
+// - non-blocking mode is enabled when a callback is set with the irq() method
+// - the DMA callbacks (1/2 complete and complete) are used to implement the asynchronous background operations
+//
+// Mode3: Uasyncio
+// - implements the stream protocol
+// - uasyncio mode is enabled when the ioctl() function is called
+// - the state of the internal ring buffer is used to detect that I2S samples can be read or written
+//
+// The samples contained in the app buffer supplied for the readinto() and write() methods have the following convention:
+//   Mono:  little endian format
+//   Stereo:  little endian format, left channel first
+//
+// I2S terms:
+//   "frame":  consists of two audio samples (Left audio sample + Right audio sample)
+//
+// Misc:
+// - for Mono configuration:
+//   - readinto method: samples are gathered from the L channel only
+//   - write method: every sample is output to both the L and R channels
+// - for readinto method the I2S hardware is read using 8-byte frames
+//   (this is standard for almost all I2S hardware, such as MEMS microphones)
+// - all 3 Modes of operation are implemented using the HAL I2S Generic Driver
+// - all sample data transfers use DMA
+// - the DMA controller is configured in Circular mode to fulfil continuous and gapless sample flows
+// - the DMA ping-pong buffer needs to be aligned to a cache line size of 32 bytes.  32 byte
+//   alignment is needed to use the routines that clean and invalidate D-Cache which work on a
+//   32 byte address boundary.  Not all STM32 devices have a D-Cache.  Buffer alignment
+//   will still happen on these devices to keep this code simple.
+
+#define MAX_I2S_STM32 (2)
+
+// DMA ping-pong buffer size was empirically determined.  It is a tradeoff between:
+// 1. memory use (smaller buffer size desirable to reduce memory footprint)
+// 2. interrupt frequency (larger buffer size desirable to reduce interrupt frequency)
+// The sizeof 1/2 of the DMA buffer must be evenly divisible by the cache line size of 32 bytes.
+#define SIZEOF_DMA_BUFFER_IN_BYTES (256)
+#define SIZEOF_HALF_DMA_BUFFER_IN_BYTES (SIZEOF_DMA_BUFFER_IN_BYTES / 2)
+
+// For non-blocking mode, to avoid underflow/overflow, sample data is written/read to/from the ring buffer at a rate faster
+// than the DMA transfer rate
+#define NON_BLOCKING_RATE_MULTIPLIER (4)
+#define SIZEOF_NON_BLOCKING_COPY_IN_BYTES (SIZEOF_HALF_DMA_BUFFER_IN_BYTES * NON_BLOCKING_RATE_MULTIPLIER)
+
+#define NUM_I2S_USER_FORMATS (4)
+#define I2S_RX_FRAME_SIZE_IN_BYTES (8)
+
+typedef enum {
+    MONO,
+    STEREO
+} format_t;
+
+typedef enum {
+    BLOCKING,
+    NON_BLOCKING,
+    UASYNCIO
+} io_mode_t;
+
+typedef enum {
+    TOP_HALF,
+    BOTTOM_HALF
+} ping_pong_t;
+
+typedef struct _ring_buf_t {
+    uint8_t *buffer;
+    size_t head;
+    size_t tail;
+    size_t size;
+} ring_buf_t;
+
+typedef struct _non_blocking_descriptor_t {
+    mp_buffer_info_t appbuf;
+    uint32_t index;
+    bool copy_in_progress;
+} non_blocking_descriptor_t;
+
+typedef struct _machine_i2s_obj_t {
+    mp_obj_base_t base;
+    uint8_t i2s_id;
+    mp_hal_pin_obj_t sck;
+    mp_hal_pin_obj_t ws;
+    mp_hal_pin_obj_t sd;
+    uint16_t mode;
+    int8_t bits;
+    format_t format;
+    int32_t rate;
+    int32_t ibuf;
+    mp_obj_t callback_for_non_blocking;
+    uint8_t dma_buffer[SIZEOF_DMA_BUFFER_IN_BYTES + 0x1f]; // 0x1f related to D-Cache alignment
+    uint8_t *dma_buffer_dcache_aligned;
+    ring_buf_t ring_buffer;
+    uint8_t *ring_buffer_storage;
+    non_blocking_descriptor_t non_blocking_descriptor;
+    io_mode_t io_mode;
+    I2S_HandleTypeDef hi2s;
+    DMA_HandleTypeDef hdma_tx;
+    DMA_HandleTypeDef hdma_rx;
+    const dma_descr_t *dma_descr_tx;
+    const dma_descr_t *dma_descr_rx;
+} machine_i2s_obj_t;
+
+STATIC mp_obj_t machine_i2s_deinit(mp_obj_t self_in);
+
+// The frame map is used with the readinto() method to transform the audio sample data coming
+// from DMA memory (32-bit stereo) to the format specified
+// in the I2S constructor.  e.g.  16-bit mono
+STATIC const int8_t i2s_frame_map[NUM_I2S_USER_FORMATS][I2S_RX_FRAME_SIZE_IN_BYTES] = {
+    { 0,  1, -1, -1, -1, -1, -1, -1 },  // Mono, 16-bits
+    { 2,  3,  0,  1, -1, -1, -1, -1 },  // Mono, 32-bits
+    { 0,  1,  4,  5, -1, -1, -1, -1 },  // Stereo, 16-bits
+    { 2,  3,  0,  1,  6,  7,  4,  5 },  // Stereo, 32-bits
+};
+
+STATIC machine_i2s_obj_t *machine_i2s_obj[MAX_I2S_STM32];
+
+void machine_i2s_init0() {
+    for (uint8_t i = 0; i < MAX_I2S_STM32; i++) {
+        machine_i2s_obj[i] = NULL;
+    }
+}
+
+// Ring Buffer
+// Thread safe when used with these constraints:
+// - Single Producer, Single Consumer
+// - Sequential atomic operations
+// One byte of capacity is used to detect buffer empty/full
+
+STATIC void ringbuf_init(ring_buf_t *rbuf, uint8_t *buffer, size_t size) {
+    rbuf->buffer = buffer;
+    rbuf->size = size;
+    rbuf->head = 0;
+    rbuf->tail = 0;
+}
+
+STATIC bool ringbuf_push(ring_buf_t *rbuf, uint8_t data) {
+    size_t next_tail = (rbuf->tail + 1) % rbuf->size;
+
+    if (next_tail != rbuf->head) {
+        rbuf->buffer[rbuf->tail] = data;
+        rbuf->tail = next_tail;
+        return true;
+    }
+
+    // full
+    return false;
+}
+
+STATIC bool ringbuf_pop(ring_buf_t *rbuf, uint8_t *data) {
+    if (rbuf->head == rbuf->tail) {
+        // empty
+        return false;
+    }
+
+    *data = rbuf->buffer[rbuf->head];
+    rbuf->head = (rbuf->head + 1) % rbuf->size;
+    return true;
+}
+
+STATIC bool ringbuf_is_empty(ring_buf_t *rbuf) {
+    return rbuf->head == rbuf->tail;
+}
+
+STATIC bool ringbuf_is_full(ring_buf_t *rbuf) {
+    return ((rbuf->tail + 1) % rbuf->size) == rbuf->head;
+}
+
+STATIC size_t ringbuf_available_data(ring_buf_t *rbuf) {
+    return (rbuf->tail - rbuf->head + rbuf->size) % rbuf->size;
+}
+
+STATIC size_t ringbuf_available_space(ring_buf_t *rbuf) {
+    return rbuf->size - ringbuf_available_data(rbuf) - 1;
+}
+
+//  For 32-bit audio samples, the STM32 HAL API expects each 32-bit sample to be encoded
+//  in an unusual byte ordering:  Byte_2, Byte_3, Byte_0, Byte_1
+//      where:  Byte_0 is the least significant byte of the 32-bit sample
+//
+//  The following function takes a buffer containing 32-bits sample values formatted as little endian
+//  and performs an in-place modification into the STM32 HAL API convention
+//
+//  Example:
+//
+//   wav_samples[] = [L_0-7,   L_8-15,  L_16-23, L_24-31, R_0-7,   R_8-15,  R_16-23, R_24-31] =  [Left channel, Right channel]
+//   stm_api[] =     [L_16-23, L_24-31, L_0-7,   L_8-15,  R_16-23, R_24-31, R_0-7,   R_8-15] = [Left channel, Right channel]
+//
+//   where:
+//      L_0-7 is the least significant byte of the 32 bit sample in the Left channel
+//      L_24-31 is the most significant byte of the 32 bit sample in the Left channel
+//
+//   wav_samples[] =  [0x99, 0xBB, 0x11, 0x22, 0x44, 0x55, 0xAB, 0x77] = [Left channel, Right channel]
+//   stm_api[] =      [0x11, 0x22, 0x99, 0xBB, 0xAB, 0x77, 0x44, 0x55] = [Left channel, Right channel]
+//
+//   where:
+//      LEFT Channel =  0x99, 0xBB, 0x11, 0x22
+//      RIGHT Channel = 0x44, 0x55, 0xAB, 0x77
+STATIC void reformat_32_bit_samples(int32_t *sample, uint32_t num_samples) {
+    int16_t sample_ms;
+    int16_t sample_ls;
+    for (uint32_t i = 0; i < num_samples; i++) {
+        sample_ls = sample[i] & 0xFFFF;
+        sample_ms = sample[i] >> 16;
+        sample[i] = (sample_ls << 16) + sample_ms;
+    }
+}
+
+STATIC int8_t get_frame_mapping_index(int8_t bits, format_t format) {
+    if (format == MONO) {
+        if (bits == 16) {
+            return 0;
+        } else { // 32 bits
+            return 1;
+        }
+    } else { // STEREO
+        if (bits == 16) {
+            return 2;
+        } else { // 32 bits
+            return 3;
+        }
+    }
+}
+
+STATIC int8_t get_dma_bits(uint16_t mode, int8_t bits) {
+    if (mode == I2S_MODE_MASTER_TX) {
+        if (bits == 16) {
+            return I2S_DATAFORMAT_16B;
+        } else {
+            return I2S_DATAFORMAT_32B;
+        }
+        return bits;
+    } else { // Master Rx
+        // always read 32 bit words for I2S e.g.  I2S MEMS microphones
+        return I2S_DATAFORMAT_32B;
+    }
+}
+
+STATIC uint32_t fill_appbuf_from_ringbuf(machine_i2s_obj_t *self, mp_buffer_info_t *appbuf) {
+
+    // copy audio samples from the ring buffer to the app buffer
+    // loop, copying samples until the app buffer is filled
+    // For uasyncio mode, the loop will make an early exit if the ring buffer becomes empty
+    // Example:
+    //   a MicroPython I2S object is configured for 16-bit mono (2 bytes per audio sample).
+    //   For every frame coming from the ring buffer (8 bytes), 2 bytes are "cherry picked" and
+    //   copied to the supplied app buffer.
+    //   Thus, for every 1 byte copied to the app buffer, 4 bytes are read from the ring buffer.
+    //   If a 8kB app buffer is supplied, 32kB of audio samples is read from the ring buffer.
+
+    uint32_t num_bytes_copied_to_appbuf = 0;
+    uint8_t *app_p = (uint8_t *)appbuf->buf;
+    uint8_t appbuf_sample_size_in_bytes = (self->bits == 16? 2 : 4) * (self->format == STEREO ? 2: 1);
+    uint32_t num_bytes_needed_from_ringbuf = appbuf->len * (I2S_RX_FRAME_SIZE_IN_BYTES / appbuf_sample_size_in_bytes);
+    uint8_t discard_byte;
+    while (num_bytes_needed_from_ringbuf) {
+
+        uint8_t f_index = get_frame_mapping_index(self->bits, self->format);
+
+        for (uint8_t i = 0; i < I2S_RX_FRAME_SIZE_IN_BYTES; i++) {
+            int8_t r_to_a_mapping = i2s_frame_map[f_index][i];
+            if (r_to_a_mapping != -1) {
+                if (self->io_mode == BLOCKING) {
+                    // poll the ringbuf until a sample becomes available,  copy into appbuf using the mapping transform
+                    while (ringbuf_pop(&self->ring_buffer, app_p + r_to_a_mapping) == false) {
+                        ;
+                    }
+                    num_bytes_copied_to_appbuf++;
+                } else if (self->io_mode == UASYNCIO) {
+                    if (ringbuf_pop(&self->ring_buffer, app_p + r_to_a_mapping) == false) {
+                        // ring buffer is empty, exit
+                        goto exit;
+                    } else {
+                        num_bytes_copied_to_appbuf++;
+                    }
+                } else {
+                    return 0;  // should never get here (non-blocking mode does not use this function)
+                }
+            } else { // r_a_mapping == -1
+                // discard unused byte from ring buffer
+                if (self->io_mode == BLOCKING) {
+                    // poll the ringbuf until a sample becomes available
+                    while (ringbuf_pop(&self->ring_buffer, &discard_byte) == false) {
+                        ;
+                    }
+                } else if (self->io_mode == UASYNCIO) {
+                    if (ringbuf_pop(&self->ring_buffer, &discard_byte) == false) {
+                        // ring buffer is empty, exit
+                        goto exit;
+                    }
+                } else {
+                    return 0;  // should never get here (non-blocking mode does not use this function)
+                }
+            }
+            num_bytes_needed_from_ringbuf--;
+        }
+        app_p += appbuf_sample_size_in_bytes;
+    }
+exit:
+    return num_bytes_copied_to_appbuf;
+}
+
+// function is used in IRQ context
+STATIC void fill_appbuf_from_ringbuf_non_blocking(machine_i2s_obj_t *self) {
+
+    // attempt to copy a block of audio samples from the ring buffer to the supplied app buffer.
+    // audio samples will be formatted as part of the copy operation
+
+    uint32_t num_bytes_copied_to_appbuf = 0;
+    uint8_t *app_p = &(((uint8_t *)self->non_blocking_descriptor.appbuf.buf)[self->non_blocking_descriptor.index]);
+
+    uint8_t appbuf_sample_size_in_bytes = (self->bits == 16? 2 : 4) * (self->format == STEREO ? 2: 1);
+    uint32_t num_bytes_remaining_to_copy_to_appbuf = self->non_blocking_descriptor.appbuf.len - self->non_blocking_descriptor.index;
+    uint32_t num_bytes_remaining_to_copy_from_ring_buffer = num_bytes_remaining_to_copy_to_appbuf *
+        (I2S_RX_FRAME_SIZE_IN_BYTES / appbuf_sample_size_in_bytes);
+    uint32_t num_bytes_needed_from_ringbuf = MIN(SIZEOF_NON_BLOCKING_COPY_IN_BYTES, num_bytes_remaining_to_copy_from_ring_buffer);
+    uint8_t discard_byte;
+    if (ringbuf_available_data(&self->ring_buffer) >= num_bytes_needed_from_ringbuf) {
+        while (num_bytes_needed_from_ringbuf) {
+
+            uint8_t f_index = get_frame_mapping_index(self->bits, self->format);
+
+            for (uint8_t i = 0; i < I2S_RX_FRAME_SIZE_IN_BYTES; i++) {
+                int8_t r_to_a_mapping = i2s_frame_map[f_index][i];
+                if (r_to_a_mapping != -1) {
+                    ringbuf_pop(&self->ring_buffer, app_p + r_to_a_mapping);
+                    num_bytes_copied_to_appbuf++;
+                } else { // r_a_mapping == -1
+                    // discard unused byte from ring buffer
+                    ringbuf_pop(&self->ring_buffer, &discard_byte);
+                }
+                num_bytes_needed_from_ringbuf--;
+            }
+            app_p += appbuf_sample_size_in_bytes;
+        }
+        self->non_blocking_descriptor.index += num_bytes_copied_to_appbuf;
+
+        if (self->non_blocking_descriptor.index >= self->non_blocking_descriptor.appbuf.len) {
+            self->non_blocking_descriptor.copy_in_progress = false;
+            mp_sched_schedule(self->callback_for_non_blocking, MP_OBJ_FROM_PTR(self));
+        }
+    }
+}
+
+STATIC uint32_t copy_appbuf_to_ringbuf(machine_i2s_obj_t *self, mp_buffer_info_t *appbuf) {
+
+    // copy audio samples from the app buffer to the ring buffer
+    // loop, reading samples until the app buffer is emptied
+    // for uasyncio mode, the loop will make an early exit if the ring buffer becomes full
+
+    uint32_t a_index = 0;
+
+    while (a_index < appbuf->len) {
+        if (self->io_mode == BLOCKING) {
+            // copy a byte to the ringbuf when space becomes available
+            while (ringbuf_push(&self->ring_buffer, ((uint8_t *)appbuf->buf)[a_index]) == false) {
+                ;
+            }
+            a_index++;
+        } else if (self->io_mode == UASYNCIO) {
+            if (ringbuf_push(&self->ring_buffer, ((uint8_t *)appbuf->buf)[a_index]) == false) {
+                // ring buffer is full, exit
+                break;
+            } else {
+                a_index++;
+            }
+        } else {
+            return 0;  // should never get here (non-blocking mode does not use this function)
+        }
+    }
+
+    return a_index;
+}
+
+// function is used in IRQ context
+STATIC void copy_appbuf_to_ringbuf_non_blocking(machine_i2s_obj_t *self) {
+
+    // copy audio samples from app buffer into ring buffer
+    uint32_t num_bytes_remaining_to_copy = self->non_blocking_descriptor.appbuf.len - self->non_blocking_descriptor.index;
+    uint32_t num_bytes_to_copy = MIN(SIZEOF_NON_BLOCKING_COPY_IN_BYTES, num_bytes_remaining_to_copy);
+
+    if (ringbuf_available_space(&self->ring_buffer) >= num_bytes_to_copy) {
+        for (uint32_t i = 0; i < num_bytes_to_copy; i++) {
+            ringbuf_push(&self->ring_buffer,
+                ((uint8_t *)self->non_blocking_descriptor.appbuf.buf)[self->non_blocking_descriptor.index + i]);
+        }
+
+        self->non_blocking_descriptor.index += num_bytes_to_copy;
+        if (self->non_blocking_descriptor.index >= self->non_blocking_descriptor.appbuf.len) {
+            self->non_blocking_descriptor.copy_in_progress = false;
+            mp_sched_schedule(self->callback_for_non_blocking, MP_OBJ_FROM_PTR(self));
+        }
+    }
+}
+
+// function is used in IRQ context
+STATIC void empty_dma(machine_i2s_obj_t *self, ping_pong_t dma_ping_pong) {
+    uint16_t dma_buffer_offset = 0;
+
+    if (dma_ping_pong == TOP_HALF) {
+        dma_buffer_offset = 0;
+    } else { // BOTTOM_HALF
+        dma_buffer_offset = SIZEOF_HALF_DMA_BUFFER_IN_BYTES;
+    }
+
+    uint8_t *dma_buffer_p = &self->dma_buffer_dcache_aligned[dma_buffer_offset];
+
+    // flush and invalidate cache so the CPU reads data placed into RAM by DMA
+    MP_HAL_CLEANINVALIDATE_DCACHE(dma_buffer_p, SIZEOF_HALF_DMA_BUFFER_IN_BYTES);
+
+    // when space exists, copy samples into ring buffer
+    if (ringbuf_available_space(&self->ring_buffer) >= SIZEOF_HALF_DMA_BUFFER_IN_BYTES) {
+        for (uint32_t i = 0; i < SIZEOF_HALF_DMA_BUFFER_IN_BYTES; i++) {
+            ringbuf_push(&self->ring_buffer, dma_buffer_p[i]);
+        }
+    }
+}
+
+// function is used in IRQ context
+STATIC void feed_dma(machine_i2s_obj_t *self, ping_pong_t dma_ping_pong) {
+    uint16_t dma_buffer_offset = 0;
+
+    if (dma_ping_pong == TOP_HALF) {
+        dma_buffer_offset = 0;
+    } else { // BOTTOM_HALF
+        dma_buffer_offset = SIZEOF_HALF_DMA_BUFFER_IN_BYTES;
+    }
+
+    uint8_t *dma_buffer_p = &self->dma_buffer_dcache_aligned[dma_buffer_offset];
+
+    // when data exists, copy samples from ring buffer
+    if (ringbuf_available_data(&self->ring_buffer) >= SIZEOF_HALF_DMA_BUFFER_IN_BYTES) {
+
+        // copy a block of samples from the ring buffer to the dma buffer.
+        // STM32 HAL API has a stereo I2S implementation, but not mono
+        // mono format is implemented by duplicating each sample into both L and R channels.
+        if ((self->format == MONO) && (self->bits == 16)) {
+            for (uint32_t i = 0; i < SIZEOF_HALF_DMA_BUFFER_IN_BYTES / 4; i++) {
+                for (uint8_t b = 0; b < sizeof(uint16_t); b++) {
+                    ringbuf_pop(&self->ring_buffer, &dma_buffer_p[i * 4 + b]);
+                    dma_buffer_p[i * 4 + b + 2] = dma_buffer_p[i * 4 + b]; // duplicated mono sample
+                }
+            }
+        } else if ((self->format == MONO) && (self->bits == 32)) {
+            for (uint32_t i = 0; i < SIZEOF_HALF_DMA_BUFFER_IN_BYTES / 8; i++) {
+                for (uint8_t b = 0; b < sizeof(uint32_t); b++) {
+                    ringbuf_pop(&self->ring_buffer, &dma_buffer_p[i * 8 + b]);
+                    dma_buffer_p[i * 8 + b + 4] = dma_buffer_p[i * 8 + b]; // duplicated mono sample
+                }
+            }
+        } else { // STEREO, both 16-bit and 32-bit
+            for (uint32_t i = 0; i < SIZEOF_HALF_DMA_BUFFER_IN_BYTES; i++) {
+                ringbuf_pop(&self->ring_buffer, &dma_buffer_p[i]);
+            }
+        }
+
+        // reformat 32 bit samples to match STM32 HAL API format
+        if (self->bits == 32) {
+            reformat_32_bit_samples((int32_t *)dma_buffer_p, SIZEOF_HALF_DMA_BUFFER_IN_BYTES / (sizeof(uint32_t)));
+        }
+    }
+
+    // flush cache to RAM so DMA can read the sample data
+    MP_HAL_CLEAN_DCACHE(dma_buffer_p, SIZEOF_HALF_DMA_BUFFER_IN_BYTES);
+}
+
+STATIC bool i2s_init(machine_i2s_obj_t *self) {
+
+    // init the GPIO lines
+    GPIO_InitTypeDef GPIO_InitStructure;
+    GPIO_InitStructure.Mode = GPIO_MODE_AF_PP;
+    GPIO_InitStructure.Speed = GPIO_SPEED_FAST;
+    GPIO_InitStructure.Pull = GPIO_PULLUP;
+
+    if (self->i2s_id == 1) {
+        self->hi2s.Instance = I2S1;
+        __SPI1_CLK_ENABLE();
+        // configure DMA streams
+        if (self->mode == I2S_MODE_MASTER_RX) {
+            self->dma_descr_rx = &dma_I2S_1_RX;
+        } else {
+            self->dma_descr_tx = &dma_I2S_1_TX;
+        }
+    } else if (self->i2s_id == 2) {
+        self->hi2s.Instance = I2S2;
+        __SPI2_CLK_ENABLE();
+        // configure DMA streams
+        if (self->mode == I2S_MODE_MASTER_RX) {
+            self->dma_descr_rx = &dma_I2S_2_RX;
+        } else {
+            self->dma_descr_tx = &dma_I2S_2_TX;
+        }
+    } else {
+        // invalid id number; should not get here as i2s object should not
+        // have been created without setting a valid i2s instance number
+        return false;
+    }
+
+    // GPIO Pin initialization
+    if (self->sck != MP_OBJ_TO_PTR(MP_OBJ_NULL)) {
+        GPIO_InitStructure.Pin = self->sck->pin_mask;
+        const pin_af_obj_t *af = pin_find_af(self->sck, AF_FN_I2S, self->i2s_id);
+        GPIO_InitStructure.Alternate = (uint8_t)af->idx;
+        HAL_GPIO_Init(self->sck->gpio, &GPIO_InitStructure);
+    }
+
+    if (self->ws != MP_OBJ_TO_PTR(MP_OBJ_NULL)) {
+        GPIO_InitStructure.Pin = self->ws->pin_mask;
+        const pin_af_obj_t *af = pin_find_af(self->ws, AF_FN_I2S, self->i2s_id);
+        GPIO_InitStructure.Alternate = (uint8_t)af->idx;
+        HAL_GPIO_Init(self->ws->gpio, &GPIO_InitStructure);
+    }
+
+    if (self->sd != MP_OBJ_TO_PTR(MP_OBJ_NULL)) {
+        GPIO_InitStructure.Pin = self->sd->pin_mask;
+        const pin_af_obj_t *af = pin_find_af(self->sd, AF_FN_I2S, self->i2s_id);
+        GPIO_InitStructure.Alternate = (uint8_t)af->idx;
+        HAL_GPIO_Init(self->sd->gpio, &GPIO_InitStructure);
+    }
+
+    if (HAL_I2S_Init(&self->hi2s) == HAL_OK) {
+        // Reset and initialize Tx and Rx DMA channels
+        if (self->mode == I2S_MODE_MASTER_RX) {
+            dma_invalidate_channel(self->dma_descr_rx);
+            dma_init(&self->hdma_rx, self->dma_descr_rx, DMA_PERIPH_TO_MEMORY, &self->hi2s);
+            self->hi2s.hdmarx = &self->hdma_rx;
+        } else {  // I2S_MODE_MASTER_TX
+            dma_invalidate_channel(self->dma_descr_tx);
+            dma_init(&self->hdma_tx, self->dma_descr_tx, DMA_MEMORY_TO_PERIPH, &self->hi2s);
+            self->hi2s.hdmatx = &self->hdma_tx;
+        }
+
+        __HAL_RCC_PLLI2S_ENABLE();  // start I2S clock
+
+        return true;
+    } else {
+        return false;
+    }
+
+}
+
+void HAL_I2S_ErrorCallback(I2S_HandleTypeDef *hi2s) {
+    uint32_t errorCode = HAL_I2S_GetError(hi2s);
+    printf("I2S Error = %ld\n", errorCode);
+}
+
+void HAL_I2S_RxCpltCallback(I2S_HandleTypeDef *hi2s) {
+    machine_i2s_obj_t *self;
+    if (hi2s->Instance == I2S1) {
+        self = machine_i2s_obj[0];
+    } else {
+        self = machine_i2s_obj[1];
+    }
+
+    // bottom half of buffer now filled,
+    // safe to empty the bottom half while the top half of buffer is being filled
+    empty_dma(self, BOTTOM_HALF);
+
+    // for non-blocking operation, this IRQ-based callback handles
+    // the readinto() method requests.
+    if ((self->io_mode == NON_BLOCKING) && (self->non_blocking_descriptor.copy_in_progress)) {
+        fill_appbuf_from_ringbuf_non_blocking(self);
+    }
+}
+
+void HAL_I2S_RxHalfCpltCallback(I2S_HandleTypeDef *hi2s) {
+    machine_i2s_obj_t *self;
+    if (hi2s->Instance == I2S1) {
+        self = machine_i2s_obj[0];
+    } else {
+        self = machine_i2s_obj[1];
+    }
+
+    // top half of buffer now filled,
+    // safe to empty the top half while the bottom half of buffer is being filled
+    empty_dma(self, TOP_HALF);
+
+    // for non-blocking operation, this IRQ-based callback handles
+    // the readinto() method requests.
+    if ((self->io_mode == NON_BLOCKING) && (self->non_blocking_descriptor.copy_in_progress)) {
+        fill_appbuf_from_ringbuf_non_blocking(self);
+    }
+}
+
+void HAL_I2S_TxCpltCallback(I2S_HandleTypeDef *hi2s) {
+    machine_i2s_obj_t *self;
+
+    if (hi2s->Instance == I2S1) {
+        self = machine_i2s_obj[0];
+    } else {
+        self = machine_i2s_obj[1];
+    }
+
+    // for non-blocking operation, this IRQ-based callback handles
+    // the write() method requests.
+    if ((self->io_mode == NON_BLOCKING) && (self->non_blocking_descriptor.copy_in_progress)) {
+        copy_appbuf_to_ringbuf_non_blocking(self);
+    }
+
+    // bottom half of buffer now emptied,
+    // safe to fill the bottom half while the top half of buffer is being emptied
+    feed_dma(self, BOTTOM_HALF);
+}
+
+void HAL_I2S_TxHalfCpltCallback(I2S_HandleTypeDef *hi2s) {
+    machine_i2s_obj_t *self;
+    if (hi2s->Instance == I2S1) {
+        self = machine_i2s_obj[0];
+    } else {
+        self = machine_i2s_obj[1];
+    }
+
+    // for non-blocking operation, this IRQ-based callback handles
+    // the write() method requests.
+    if ((self->io_mode == NON_BLOCKING) && (self->non_blocking_descriptor.copy_in_progress)) {
+        copy_appbuf_to_ringbuf_non_blocking(self);
+    }
+
+    // top half of buffer now emptied,
+    // safe to fill the top half while the bottom half of buffer is being emptied
+    feed_dma(self, TOP_HALF);
+}
+
+STATIC void machine_i2s_init_helper(machine_i2s_obj_t *self, size_t n_pos_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+
+    enum {
+        ARG_sck,
+        ARG_ws,
+        ARG_sd,
+        ARG_mode,
+        ARG_bits,
+        ARG_format,
+        ARG_rate,
+        ARG_ibuf,
+    };
+
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_sck,      MP_ARG_KW_ONLY | MP_ARG_REQUIRED | MP_ARG_OBJ,   {.u_obj = MP_OBJ_NULL} },
+        { MP_QSTR_ws,       MP_ARG_KW_ONLY | MP_ARG_REQUIRED | MP_ARG_OBJ,   {.u_obj = MP_OBJ_NULL} },
+        { MP_QSTR_sd,       MP_ARG_KW_ONLY | MP_ARG_REQUIRED | MP_ARG_OBJ,   {.u_obj = MP_OBJ_NULL} },
+        { MP_QSTR_mode,     MP_ARG_KW_ONLY | MP_ARG_REQUIRED | MP_ARG_INT,   {.u_int = -1} },
+        { MP_QSTR_bits,     MP_ARG_KW_ONLY | MP_ARG_REQUIRED | MP_ARG_INT,   {.u_int = -1} },
+        { MP_QSTR_format,   MP_ARG_KW_ONLY | MP_ARG_REQUIRED | MP_ARG_INT,   {.u_int = -1} },
+        { MP_QSTR_rate,     MP_ARG_KW_ONLY | MP_ARG_REQUIRED | MP_ARG_INT,   {.u_int = -1} },
+        { MP_QSTR_ibuf,     MP_ARG_KW_ONLY | MP_ARG_REQUIRED | MP_ARG_INT,   {.u_int = -1} },
+    };
+
+    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
+    mp_arg_parse_all(n_pos_args, pos_args, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
+
+    memset(&self->hi2s, 0, sizeof(self->hi2s));
+
+    //
+    // ---- Check validity of arguments ----
+    //
+
+    // are I2S pin assignments valid?
+    const pin_af_obj_t *pin_af;
+
+    // is SCK valid?
+    if (mp_obj_is_type(args[ARG_sck].u_obj, &pin_type)) {
+        pin_af = pin_find_af(MP_OBJ_TO_PTR(args[ARG_sck].u_obj), AF_FN_I2S, self->i2s_id);
+        if (pin_af->type != AF_PIN_TYPE_I2S_CK) {
+            mp_raise_ValueError(MP_ERROR_TEXT("invalid SCK pin"));
+        }
+    } else {
+        mp_raise_ValueError(MP_ERROR_TEXT("SCK not a Pin type"));
+    }
+
+    // is WS valid?
+    if (mp_obj_is_type(args[ARG_ws].u_obj, &pin_type)) {
+        pin_af = pin_find_af(MP_OBJ_TO_PTR(args[ARG_ws].u_obj), AF_FN_I2S, self->i2s_id);
+        if (pin_af->type != AF_PIN_TYPE_I2S_WS) {
+            mp_raise_ValueError(MP_ERROR_TEXT("invalid WS pin"));
+        }
+    } else {
+        mp_raise_ValueError(MP_ERROR_TEXT("WS not a Pin type"));
+    }
+
+    // is SD valid?
+    if (mp_obj_is_type(args[ARG_sd].u_obj, &pin_type)) {
+        pin_af = pin_find_af(MP_OBJ_TO_PTR(args[ARG_sd].u_obj), AF_FN_I2S, self->i2s_id);
+        if (pin_af->type != AF_PIN_TYPE_I2S_SD) {
+            mp_raise_ValueError(MP_ERROR_TEXT("invalid SD pin"));
+        }
+    } else {
+        mp_raise_ValueError(MP_ERROR_TEXT("SD not a Pin type"));
+    }
+
+    // is Mode valid?
+    uint16_t i2s_mode = args[ARG_mode].u_int;
+    if ((i2s_mode != (I2S_MODE_MASTER_RX)) &&
+        (i2s_mode != (I2S_MODE_MASTER_TX))) {
+        mp_raise_ValueError(MP_ERROR_TEXT("invalid mode"));
+    }
+
+    // is Bits valid?
+    int8_t i2s_bits = args[ARG_bits].u_int;
+    if ((i2s_bits != 16) &&
+        (i2s_bits != 32)) {
+        mp_raise_ValueError(MP_ERROR_TEXT("invalid bits"));
+    }
+
+    // is Format valid?
+    format_t i2s_format = args[ARG_format].u_int;
+    if ((i2s_format != MONO) &&
+        (i2s_format != STEREO)) {
+        mp_raise_ValueError(MP_ERROR_TEXT("invalid format"));
+    }
+
+    // is Rate valid?
+    // Not checked
+
+    // is Ibuf valid?
+    int32_t ring_buffer_len = args[ARG_ibuf].u_int;
+    if (ring_buffer_len > 0) {
+        uint8_t *buffer = m_new(uint8_t, ring_buffer_len);
+        self->ring_buffer_storage = buffer;
+        ringbuf_init(&self->ring_buffer, buffer, ring_buffer_len);
+    } else {
+        mp_raise_ValueError(MP_ERROR_TEXT("invalid ibuf"));
+    }
+
+    self->sck = MP_OBJ_TO_PTR(args[ARG_sck].u_obj);
+    self->ws = MP_OBJ_TO_PTR(args[ARG_ws].u_obj);
+    self->sd = MP_OBJ_TO_PTR(args[ARG_sd].u_obj);
+    self->mode = i2s_mode;
+    self->bits = i2s_bits;
+    self->format = i2s_format;
+    self->rate = args[ARG_rate].u_int;
+    self->ibuf = ring_buffer_len;
+    self->callback_for_non_blocking = MP_OBJ_NULL;
+    self->non_blocking_descriptor.copy_in_progress = false;
+    self->io_mode = BLOCKING;
+
+    I2S_InitTypeDef *init = &self->hi2s.Init;
+    init->Mode = i2s_mode;
+    init->Standard = I2S_STANDARD_PHILIPS;
+    init->DataFormat = get_dma_bits(self->mode, self->bits);
+    init->MCLKOutput = I2S_MCLKOUTPUT_DISABLE;
+    init->AudioFreq = args[ARG_rate].u_int;
+    init->CPOL = I2S_CPOL_LOW;
+    init->ClockSource = I2S_CLOCK_PLL;
+
+    // init the I2S bus
+    if (!i2s_init(self)) {
+        mp_raise_msg_varg(&mp_type_OSError, MP_ERROR_TEXT("I2S init failed"));
+    }
+
+    // start DMA.  DMA is configured to run continuously, using a circular buffer configuration
+    uint32_t number_of_samples = 0;
+    if (init->DataFormat == I2S_DATAFORMAT_16B) {
+        number_of_samples = SIZEOF_DMA_BUFFER_IN_BYTES / sizeof(uint16_t);
+    } else {  // 32 bits
+        number_of_samples = SIZEOF_DMA_BUFFER_IN_BYTES / sizeof(uint32_t);
+    }
+
+    HAL_StatusTypeDef status;
+    if (self->mode == I2S_MODE_MASTER_TX) {
+        status = HAL_I2S_Transmit_DMA(&self->hi2s, (void *)self->dma_buffer_dcache_aligned, number_of_samples);
+    } else {  // RX
+        status = HAL_I2S_Receive_DMA(&self->hi2s, (void *)self->dma_buffer_dcache_aligned, number_of_samples);
+    }
+
+    if (status != HAL_OK) {
+        mp_raise_msg_varg(&mp_type_OSError, MP_ERROR_TEXT("DMA init failed"));
+    }
+}
+
+STATIC void machine_i2s_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+    machine_i2s_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    mp_printf(print, "I2S(id=%u,\n"
+        "sck="MP_HAL_PIN_FMT ",\n"
+        "ws="MP_HAL_PIN_FMT ",\n"
+        "sd="MP_HAL_PIN_FMT ",\n"
+        "mode=%u,\n"
+        "bits=%u, format=%u,\n"
+        "rate=%d, ibuf=%d)",
+        self->i2s_id,
+        mp_hal_pin_name(self->sck),
+        mp_hal_pin_name(self->ws),
+        mp_hal_pin_name(self->sd),
+        self->mode,
+        self->bits, self->format,
+        self->rate, self->ibuf
+        );
+}
+
+STATIC mp_obj_t machine_i2s_make_new(const mp_obj_type_t *type, size_t n_pos_args, size_t n_kw_args, const mp_obj_t *args) {
+    mp_arg_check_num(n_pos_args, n_kw_args, 1, MP_OBJ_FUN_ARGS_MAX, true);
+    uint8_t i2s_id = mp_obj_get_int(args[0]);
+    uint8_t i2s_id_zero_base = 0;
+
+    if (0) {
+    #ifdef MICROPY_HW_I2S1
+    } else if (i2s_id == 1) {
+        i2s_id_zero_base = 0;
+    #endif
+    #ifdef MICROPY_HW_I2S2
+    } else if (i2s_id == 2) {
+        i2s_id_zero_base = 1;
+    #endif
+    } else {
+        mp_raise_ValueError(MP_ERROR_TEXT("invalid id"));
+    }
+
+    machine_i2s_obj_t *self;
+    if (machine_i2s_obj[i2s_id_zero_base] == NULL) {
+        self = m_new_obj(machine_i2s_obj_t);
+        machine_i2s_obj[i2s_id_zero_base] = self;
+        self->base.type = &machine_i2s_type;
+        self->i2s_id = i2s_id;
+    } else {
+        self = machine_i2s_obj[i2s_id_zero_base];
+        machine_i2s_deinit(MP_OBJ_FROM_PTR(self));
+    }
+
+    // align DMA buffer start to the cache line size (32 bytes)
+    self->dma_buffer_dcache_aligned = (uint8_t *)((uint32_t)(self->dma_buffer + 0x1f) & ~0x1f);
+
+    mp_map_t kw_args;
+    mp_map_init_fixed_table(&kw_args, n_kw_args, args + n_pos_args);
+    machine_i2s_init_helper(self, n_pos_args - 1, args + 1, &kw_args);
+
+    return MP_OBJ_FROM_PTR(self);
+}
+
+STATIC mp_obj_t machine_i2s_init(size_t n_pos_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    machine_i2s_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]);
+    machine_i2s_deinit(MP_OBJ_FROM_PTR(self));
+    machine_i2s_init_helper(self, n_pos_args - 1, pos_args + 1, kw_args);
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_KW(machine_i2s_init_obj, 1, machine_i2s_init);
+
+STATIC mp_obj_t machine_i2s_deinit(mp_obj_t self_in) {
+
+    machine_i2s_obj_t *self = MP_OBJ_TO_PTR(self_in);
+
+    dma_deinit(self->dma_descr_tx);
+    dma_deinit(self->dma_descr_rx);
+    HAL_I2S_DeInit(&self->hi2s);
+
+    if (self->hi2s.Instance == I2S1) {
+        __SPI1_FORCE_RESET();
+        __SPI1_RELEASE_RESET();
+        __SPI1_CLK_DISABLE();
+    } else if (self->hi2s.Instance == I2S2) {
+        __SPI2_FORCE_RESET();
+        __SPI2_RELEASE_RESET();
+        __SPI2_CLK_DISABLE();
+    }
+
+    m_free(self->ring_buffer_storage);
+
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_i2s_deinit_obj, machine_i2s_deinit);
+
+STATIC mp_obj_t machine_i2s_irq(mp_obj_t self_in, mp_obj_t handler) {
+    machine_i2s_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    if (handler != mp_const_none && !mp_obj_is_callable(handler)) {
+        mp_raise_ValueError(MP_ERROR_TEXT("invalid callback"));
+    }
+
+    if (handler != mp_const_none) {
+        self->io_mode = NON_BLOCKING;
+    } else {
+        self->io_mode = BLOCKING;
+    }
+
+    self->callback_for_non_blocking = handler;
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(machine_i2s_irq_obj, machine_i2s_irq);
+
+// Shift() is typically used as a volume control.
+// shift=1 increases volume by 6dB, shift=-1 decreases volume by 6dB
+STATIC mp_obj_t machine_i2s_shift(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    enum { ARG_buf, ARG_bits, ARG_shift};
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_buf,    MP_ARG_REQUIRED | MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
+        { MP_QSTR_bits,   MP_ARG_REQUIRED | MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} },
+        { MP_QSTR_shift, MP_ARG_REQUIRED | MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} },
+    };
+
+    // parse args
+    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
+    mp_arg_parse_all(n_args, pos_args, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
+
+    mp_buffer_info_t bufinfo;
+    mp_get_buffer_raise(args[ARG_buf].u_obj, &bufinfo, MP_BUFFER_RW);
+
+    int16_t *buf_16 = bufinfo.buf;
+    int32_t *buf_32 = bufinfo.buf;
+
+    uint8_t bits = args[ARG_bits].u_int;
+    int8_t shift = args[ARG_shift].u_int;
+
+    uint32_t num_audio_samples;
+    switch (bits) {
+        case 16:
+            num_audio_samples = bufinfo.len / sizeof(uint16_t);
+            break;
+
+        case 32:
+            num_audio_samples = bufinfo.len / sizeof(uint32_t);
+            break;
+
+        default:
+            mp_raise_ValueError(MP_ERROR_TEXT("invalid bits"));
+            break;
+    }
+
+    for (uint32_t i = 0; i < num_audio_samples; i++) {
+        switch (bits) {
+            case 16:
+                if (shift >= 0) {
+                    buf_16[i] = buf_16[i] << shift;
+                } else {
+                    buf_16[i] = buf_16[i] >> abs(shift);
+                }
+                break;
+            case 32:
+                if (shift >= 0) {
+                    buf_32[i] = buf_32[i] << shift;
+                } else {
+                    buf_32[i] = buf_32[i] >> abs(shift);
+                }
+                break;
+        }
+    }
+
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_KW(machine_i2s_shift_fun_obj, 0, machine_i2s_shift);
+STATIC MP_DEFINE_CONST_STATICMETHOD_OBJ(machine_i2s_shift_obj, MP_ROM_PTR(&machine_i2s_shift_fun_obj));
+
+STATIC const mp_rom_map_elem_t machine_i2s_locals_dict_table[] = {
+    // Methods
+    { MP_ROM_QSTR(MP_QSTR_init),            MP_ROM_PTR(&machine_i2s_init_obj) },
+    { MP_ROM_QSTR(MP_QSTR_readinto),        MP_ROM_PTR(&mp_stream_readinto_obj) },
+    { MP_ROM_QSTR(MP_QSTR_write),           MP_ROM_PTR(&mp_stream_write_obj) },
+    { MP_ROM_QSTR(MP_QSTR_deinit),          MP_ROM_PTR(&machine_i2s_deinit_obj) },
+    { MP_ROM_QSTR(MP_QSTR_irq),             MP_ROM_PTR(&machine_i2s_irq_obj) },
+
+    // Static method
+    { MP_ROM_QSTR(MP_QSTR_shift),           MP_ROM_PTR(&machine_i2s_shift_obj) },
+
+    // Constants
+    { MP_ROM_QSTR(MP_QSTR_RX),              MP_ROM_INT(I2S_MODE_MASTER_RX) },
+    { MP_ROM_QSTR(MP_QSTR_TX),              MP_ROM_INT(I2S_MODE_MASTER_TX) },
+    { MP_ROM_QSTR(MP_QSTR_STEREO),          MP_ROM_INT(STEREO) },
+    { MP_ROM_QSTR(MP_QSTR_MONO),            MP_ROM_INT(MONO) },
+};
+MP_DEFINE_CONST_DICT(machine_i2s_locals_dict, machine_i2s_locals_dict_table);
+
+STATIC mp_uint_t machine_i2s_stream_read(mp_obj_t self_in, void *buf_in, mp_uint_t size, int *errcode) {
+    machine_i2s_obj_t *self = MP_OBJ_TO_PTR(self_in);
+
+    if (self->mode != I2S_MODE_MASTER_RX) {
+        *errcode = MP_EPERM;
+        return MP_STREAM_ERROR;
+    }
+
+    uint8_t appbuf_sample_size_in_bytes = (self->bits / 8) * (self->format == STEREO ? 2: 1);
+    if (size % appbuf_sample_size_in_bytes != 0) {
+        *errcode = MP_EINVAL;
+        return MP_STREAM_ERROR;
+    }
+
+    if (size == 0) {
+        return 0;
+    }
+
+    if (self->io_mode == NON_BLOCKING) {
+        self->non_blocking_descriptor.appbuf.buf = (void *)buf_in;
+        self->non_blocking_descriptor.appbuf.len = size;
+        self->non_blocking_descriptor.index = 0;
+        self->non_blocking_descriptor.copy_in_progress = true;
+        return size;
+    } else { // blocking or uasyncio mode
+        mp_buffer_info_t appbuf;
+        appbuf.buf = (void *)buf_in;
+        appbuf.len = size;
+        uint32_t num_bytes_read = fill_appbuf_from_ringbuf(self, &appbuf);
+        return num_bytes_read;
+    }
+}
+
+STATIC mp_uint_t machine_i2s_stream_write(mp_obj_t self_in, const void *buf_in, mp_uint_t size, int *errcode) {
+    machine_i2s_obj_t *self = MP_OBJ_TO_PTR(self_in);
+
+    if (self->mode != I2S_MODE_MASTER_TX) {
+        *errcode = MP_EPERM;
+        return MP_STREAM_ERROR;
+    }
+
+    if (size == 0) {
+        return 0;
+    }
+
+    if (self->io_mode == NON_BLOCKING) {
+        self->non_blocking_descriptor.appbuf.buf = (void *)buf_in;
+        self->non_blocking_descriptor.appbuf.len = size;
+        self->non_blocking_descriptor.index = 0;
+        self->non_blocking_descriptor.copy_in_progress = true;
+        return size;
+    } else { // blocking or uasyncio mode
+        mp_buffer_info_t appbuf;
+        appbuf.buf = (void *)buf_in;
+        appbuf.len = size;
+        uint32_t num_bytes_written = copy_appbuf_to_ringbuf(self, &appbuf);
+        return num_bytes_written;
+    }
+}
+
+STATIC mp_uint_t machine_i2s_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_t arg, int *errcode) {
+    machine_i2s_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    mp_uint_t ret;
+    uintptr_t flags = arg;
+    self->io_mode = UASYNCIO; // a call to ioctl() is an indication that uasyncio is being used
+
+    if (request == MP_STREAM_POLL) {
+        ret = 0;
+
+        if (flags & MP_STREAM_POLL_RD) {
+            if (self->mode != I2S_MODE_MASTER_RX) {
+                *errcode = MP_EPERM;
+                return MP_STREAM_ERROR;
+            }
+
+            if (!ringbuf_is_empty(&self->ring_buffer)) {
+                ret |= MP_STREAM_POLL_RD;
+            }
+        }
+
+        if (flags & MP_STREAM_POLL_WR) {
+            if (self->mode != I2S_MODE_MASTER_TX) {
+                *errcode = MP_EPERM;
+                return MP_STREAM_ERROR;
+            }
+
+            if (!ringbuf_is_full(&self->ring_buffer)) {
+                ret |= MP_STREAM_POLL_WR;
+            }
+        }
+    } else {
+        *errcode = MP_EINVAL;
+        ret = MP_STREAM_ERROR;
+    }
+
+    return ret;
+}
+
+STATIC const mp_stream_p_t i2s_stream_p = {
+    .read = machine_i2s_stream_read,
+    .write = machine_i2s_stream_write,
+    .ioctl = machine_i2s_ioctl,
+    .is_text = false,
+};
+
+const mp_obj_type_t machine_i2s_type = {
+    { &mp_type_type },
+    .name = MP_QSTR_I2S,
+    .print = machine_i2s_print,
+    .getiter = mp_identity_getiter,
+    .iternext = mp_stream_unbuffered_iter,
+    .protocol = &i2s_stream_p,
+    .make_new = machine_i2s_make_new,
+    .locals_dict = (mp_obj_dict_t *)&machine_i2s_locals_dict,
+};
+
+#endif // MICROPY_HW_ENABLE_I2S
+
diff --git a/ports/stm32/main.c b/ports/stm32/main.c
index 6df7374ccee6a..86b8fb7972055 100644
--- a/ports/stm32/main.c
+++ b/ports/stm32/main.c
@@ -527,6 +527,10 @@ void stm32_main(uint32_t reset_mode) {
     pyb_usb_init0();
     #endif
 
+    #if MICROPY_HW_ENABLE_I2S
+    machine_i2s_init0();
+    #endif
+
     // Initialise the local flash filesystem.
     // Create it if needed, mount in on /flash, and set it as current dir.
     bool mounted_flash = false;
diff --git a/ports/stm32/modmachine.c b/ports/stm32/modmachine.c
index aee563ee881d1..66c696982b9b2 100644
--- a/ports/stm32/modmachine.c
+++ b/ports/stm32/modmachine.c
@@ -431,6 +431,9 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_SPI),                 MP_ROM_PTR(&machine_hard_spi_type) },
     { MP_ROM_QSTR(MP_QSTR_SoftSPI),             MP_ROM_PTR(&mp_machine_soft_spi_type) },
     #endif
+    #if MICROPY_HW_ENABLE_I2S
+    { MP_ROM_QSTR(MP_QSTR_I2S),                 MP_ROM_PTR(&machine_i2s_type) },
+    #endif
     { MP_ROM_QSTR(MP_QSTR_UART),                MP_ROM_PTR(&pyb_uart_type) },
     { MP_ROM_QSTR(MP_QSTR_WDT),                 MP_ROM_PTR(&pyb_wdt_type) },
     { MP_ROM_QSTR(MP_QSTR_Timer),               MP_ROM_PTR(&machine_timer_type) },
diff --git a/ports/stm32/modmachine.h b/ports/stm32/modmachine.h
index e846208540f72..0e6c000a801f6 100644
--- a/ports/stm32/modmachine.h
+++ b/ports/stm32/modmachine.h
@@ -31,9 +31,11 @@
 extern const mp_obj_type_t machine_adc_type;
 extern const mp_obj_type_t machine_timer_type;
 extern const mp_obj_type_t machine_hard_i2c_type;
+extern const mp_obj_type_t machine_i2s_type;
 
 void machine_init(void);
 void machine_deinit(void);
+void machine_i2s_init0();
 
 MP_DECLARE_CONST_FUN_OBJ_VAR_BETWEEN(machine_info_obj);
 MP_DECLARE_CONST_FUN_OBJ_0(machine_unique_id_obj);
diff --git a/ports/stm32/pin_defs_stm32.h b/ports/stm32/pin_defs_stm32.h
index 9285c190a63e0..d90ef1bb6d5cd 100644
--- a/ports/stm32/pin_defs_stm32.h
+++ b/ports/stm32/pin_defs_stm32.h
@@ -109,6 +109,7 @@ enum {
 // some #defines to massage things. Also I2S and SPI share the same
 // peripheral.
 
+#define GPIO_AF5_I2S1   GPIO_AF5_SPI1
 #define GPIO_AF5_I2S2   GPIO_AF5_SPI2
 #define GPIO_AF5_I2S3   GPIO_AF5_I2S3ext
 #define GPIO_AF6_I2S2   GPIO_AF6_I2S2ext
@@ -116,6 +117,7 @@ enum {
 #define GPIO_AF7_I2S2   GPIO_AF7_SPI2
 #define GPIO_AF7_I2S3   GPIO_AF7_I2S3ext
 
+#define I2S1  SPI1
 #define I2S2  SPI2
 #define I2S3  SPI3
 

From 3966f67746abef0bf475003c7fe889648be38991 Mon Sep 17 00:00:00 2001
From: Julia <julia.hathaway@nxp.com>
Date: Mon, 14 Jun 2021 16:57:29 -0500
Subject: [PATCH 1040/3533] zephyr/machine_spi: Add support for hardware SPI.

Adds support for hardware SPI to the zephyr port.  Consistent with other
ports, such as rp2 and stm32, we only implement the SPI protocol functions
(init and transfer).  Explicit sck/mosi/miso selection is not supported
and new SPI instances are initialized with default values.
---
 ports/zephyr/CMakeLists.txt                 |   1 +
 ports/zephyr/README.md                      |   9 +
 ports/zephyr/boards/frdm_k64f.conf          |   1 +
 ports/zephyr/boards/mimxrt685_evk_cm33.conf |   2 +
 ports/zephyr/machine_spi.c                  | 211 ++++++++++++++++++++
 ports/zephyr/modmachine.c                   |   4 +
 ports/zephyr/modmachine.h                   |   1 +
 ports/zephyr/mpconfigport.h                 |   4 +
 8 files changed, 233 insertions(+)
 create mode 100644 ports/zephyr/boards/mimxrt685_evk_cm33.conf
 create mode 100644 ports/zephyr/machine_spi.c

diff --git a/ports/zephyr/CMakeLists.txt b/ports/zephyr/CMakeLists.txt
index 80adea5d86892..5c09fc76ee7ab 100644
--- a/ports/zephyr/CMakeLists.txt
+++ b/ports/zephyr/CMakeLists.txt
@@ -38,6 +38,7 @@ set(MICROPY_SOURCE_PORT
     main.c
     help.c
     machine_i2c.c
+    machine_spi.c
     machine_pin.c
     machine_uart.c
     modbluetooth_zephyr.c
diff --git a/ports/zephyr/README.md b/ports/zephyr/README.md
index 9d6c223b47382..e0b02af222ac2 100644
--- a/ports/zephyr/README.md
+++ b/ports/zephyr/README.md
@@ -15,6 +15,7 @@ Features supported at this time:
 * `utime` module for time measurements and delays.
 * `machine.Pin` class for GPIO control, with IRQ support.
 * `machine.I2C` class for I2C control.
+* `machine.SPI` class for SPI control.
 * `usocket` module for networking (IPv4/IPv6).
 * "Frozen modules" support to allow to bundle Python modules together
   with firmware. Including complete applications, including with
@@ -135,6 +136,14 @@ Example of using I2C to scan for I2C slaves:
     i2c = I2C("I2C_0")
     i2c.scan()
 
+Example of using SPI to write a buffer to the MOSI pin:
+
+    from machine import SPI
+
+    spi = SPI("SPI_0")
+    spi.init(baudrate=500000, polarity=1, phase=1, bits=8, firstbit=SPI.MSB)
+    spi.write(b'abcd')
+
 
 Minimal build
 -------------
diff --git a/ports/zephyr/boards/frdm_k64f.conf b/ports/zephyr/boards/frdm_k64f.conf
index 483e9a29bbcd4..c164c0c32c567 100644
--- a/ports/zephyr/boards/frdm_k64f.conf
+++ b/ports/zephyr/boards/frdm_k64f.conf
@@ -3,6 +3,7 @@ CONFIG_NET_L2_ETHERNET=y
 
 # Hardware features
 CONFIG_I2C=y
+CONFIG_SPI=y
 
 # Sensor drivers
 CONFIG_FXOS8700=y
diff --git a/ports/zephyr/boards/mimxrt685_evk_cm33.conf b/ports/zephyr/boards/mimxrt685_evk_cm33.conf
new file mode 100644
index 0000000000000..827222b887cf3
--- /dev/null
+++ b/ports/zephyr/boards/mimxrt685_evk_cm33.conf
@@ -0,0 +1,2 @@
+# Hardware features
+CONFIG_SPI=y
diff --git a/ports/zephyr/machine_spi.c b/ports/zephyr/machine_spi.c
new file mode 100644
index 0000000000000..2add7ff60b064
--- /dev/null
+++ b/ports/zephyr/machine_spi.c
@@ -0,0 +1,211 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright 2021 NXP
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include <stdio.h>
+#include <stdint.h>
+#include <string.h>
+
+#include <zephyr.h>
+#include <drivers/spi.h>
+
+#include "py/runtime.h"
+#include "py/gc.h"
+#include "py/mphal.h"
+#include "py/mperrno.h"
+#include "extmod/machine_spi.h"
+#include "modmachine.h"
+
+#if MICROPY_PY_MACHINE_SPI
+
+#define DEFAULT_SPI_BAUDRATE    (50000)
+#define DEFAULT_SPI_POLARITY    (0)
+#define DEFAULT_SPI_PHASE       (0)
+#define DEFAULT_SPI_BITS        (8)
+#define DEFAULT_SPI_FIRSTBIT    (SPI_TRANSFER_MSB)
+#define SPI_LOOP                (0)    // For testing, enable loop mode by setting SPI_LOOP (1)
+
+typedef struct _machine_hard_spi_obj_t {
+    mp_obj_base_t base;
+    const struct device *dev;
+    struct spi_config config;
+} machine_hard_spi_obj_t;
+
+STATIC void machine_hard_spi_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+    machine_hard_spi_obj_t *self = self_in;
+    mp_printf(print, "SPI(%s, baudrate=%u, polarity=%u, phase=%u, bits=%u, firstbit=%s)",
+        self->dev->name,
+        self->config.frequency,
+        (self->config.operation & 0x2) >> 1,
+        (self->config.operation & 0x4) >> 2,
+        (self->config.operation & ~0x1F) >> 5,
+        ((self->config.operation & 0x10) >> 4) == SPI_TRANSFER_MSB ? "MSB" : "LSB");
+}
+
+mp_obj_t machine_hard_spi_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
+    enum {ARG_id, ARG_baudrate, ARG_polarity, ARG_phase, ARG_bits, ARG_firstbit, ARG_sck, ARG_mosi, ARG_miso};
+
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_id, MP_ARG_REQUIRED | MP_ARG_OBJ },
+        { MP_QSTR_baudrate, MP_ARG_INT, {.u_int = DEFAULT_SPI_BAUDRATE} },
+        { MP_QSTR_polarity, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = DEFAULT_SPI_POLARITY} },
+        { MP_QSTR_phase, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = DEFAULT_SPI_PHASE} },
+        { MP_QSTR_bits, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = DEFAULT_SPI_BITS} },
+        { MP_QSTR_firstbit, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = DEFAULT_SPI_FIRSTBIT} },
+        { MP_QSTR_sck, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
+        { MP_QSTR_mosi, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
+        { MP_QSTR_miso, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
+    };
+
+    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
+    mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
+
+    const char *dev_name = mp_obj_str_get_str(args[ARG_id].u_obj);
+    const struct device *dev = device_get_binding(dev_name);
+
+    if (dev == NULL) {
+        mp_raise_ValueError(MP_ERROR_TEXT("device not found"));
+    }
+
+    if ((args[ARG_sck].u_obj != MP_OBJ_NULL) || (args[ARG_miso].u_obj != MP_OBJ_NULL) || (args[ARG_mosi].u_obj != MP_OBJ_NULL)) {
+        mp_raise_NotImplementedError(MP_ERROR_TEXT("explicit choice of sck/miso/mosi is not implemented"));
+    }
+
+    struct spi_config cfg = {
+        .frequency = args[ARG_baudrate].u_int,
+        .operation = (SPI_OP_MODE_MASTER |
+            args[ARG_polarity].u_int << 1 |
+                args[ARG_phase].u_int << 2 |
+                SPI_LOOP << 3 |
+                args[ARG_firstbit].u_int << 4 |
+                args[ARG_bits].u_int << 5 |
+                SPI_LINES_SINGLE),
+        .slave = 0,
+        .cs = NULL
+    };
+
+    machine_hard_spi_obj_t *self = m_new_obj(machine_hard_spi_obj_t);
+
+    self->base.type = &machine_hard_spi_type;
+    self->dev = dev;
+    self->config = cfg;
+
+    return MP_OBJ_FROM_PTR(self);
+}
+
+STATIC void machine_hard_spi_init(mp_obj_base_t *obj, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    enum {ARG_baudrate, ARG_polarity, ARG_phase, ARG_bits, ARG_firstbit};
+
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_baudrate, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} },
+        { MP_QSTR_polarity, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} },
+        { MP_QSTR_phase, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} },
+        { MP_QSTR_bits, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} },
+        { MP_QSTR_firstbit, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} },
+    };
+
+    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
+    mp_arg_parse_all(n_args, pos_args, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
+
+    machine_hard_spi_obj_t *self = (machine_hard_spi_obj_t *)obj;
+
+    uint32_t baudrate;
+    uint16_t operation = self->config.operation;
+
+    if (args[ARG_baudrate].u_int != -1) {
+        baudrate = args[ARG_baudrate].u_int;
+    } else {
+        baudrate = self->config.frequency;
+    }
+
+    if (args[ARG_polarity].u_int != -1) {
+        operation = (operation & ~0x2) | (args[ARG_polarity].u_int << 1);
+    }
+
+    if (args[ARG_phase].u_int != -1) {
+        operation = (operation & ~0x4) | (args[ARG_phase].u_int << 2);
+    }
+
+    if (args[ARG_bits].u_int != -1) {
+        operation = (operation & 0x1F) | (args[ARG_bits].u_int << 5);
+    }
+
+    if (args[ARG_firstbit].u_int != -1) {
+        operation = (operation & ~0x10) | (args[ARG_firstbit].u_int << 4);
+    }
+
+    struct spi_config cfg = {
+        .frequency = baudrate,
+        .operation = operation,
+        .slave = 0,
+        .cs = NULL
+    };
+
+    self->config = cfg;
+}
+
+STATIC void machine_hard_spi_transfer(mp_obj_base_t *obj, size_t len, const uint8_t *src, uint8_t *dest) {
+    machine_hard_spi_obj_t *self = (machine_hard_spi_obj_t *)obj;
+
+    int ret;
+
+    struct spi_buf tx_bufs[1];
+    tx_bufs[0].buf = (uint8_t *)src;
+    tx_bufs[0].len = len;
+    const struct spi_buf_set tx = {
+        .buffers = tx_bufs,
+        .count = ARRAY_SIZE(tx_bufs)
+    };
+
+    struct spi_buf rx_bufs[1];
+    rx_bufs[0].buf = dest;
+    rx_bufs[0].len = len;
+    const struct spi_buf_set rx = {
+        .buffers = rx_bufs,
+        .count = ARRAY_SIZE(rx_bufs)
+    };
+
+    ret = spi_transceive(self->dev, &self->config, &tx, &rx);
+
+    if (ret < 0) {
+        mp_raise_OSError(-ret);
+    }
+}
+
+STATIC const mp_machine_spi_p_t machine_hard_spi_p = {
+    .init = machine_hard_spi_init,
+    .transfer = machine_hard_spi_transfer,
+};
+
+const mp_obj_type_t machine_hard_spi_type = {
+    { &mp_type_type },
+    .name = MP_QSTR_SPI,
+    .print = machine_hard_spi_print,
+    .make_new = machine_hard_spi_make_new,
+    .protocol = &machine_hard_spi_p,
+    .locals_dict = (mp_obj_dict_t *)&mp_machine_spi_locals_dict,
+};
+
+#endif // MICROPY_PY_MACHINE_SPI
diff --git a/ports/zephyr/modmachine.c b/ports/zephyr/modmachine.c
index 4353083eebd8f..adec9160be676 100644
--- a/ports/zephyr/modmachine.c
+++ b/ports/zephyr/modmachine.c
@@ -36,6 +36,7 @@
 #include "extmod/machine_signal.h"
 #include "extmod/machine_pulse.h"
 #include "extmod/machine_i2c.h"
+#include "extmod/machine_spi.h"
 #include "modmachine.h"
 
 #if MICROPY_PY_MACHINE
@@ -70,6 +71,9 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     #if MICROPY_PY_MACHINE_I2C
     { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&machine_hard_i2c_type) },
     #endif
+    #if MICROPY_PY_MACHINE_SPI
+    { MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&machine_hard_spi_type) },
+    #endif
     { MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&machine_uart_type) },
     { MP_ROM_QSTR(MP_QSTR_Pin), MP_ROM_PTR(&machine_pin_type) },
     { MP_ROM_QSTR(MP_QSTR_Signal), MP_ROM_PTR(&machine_signal_type) },
diff --git a/ports/zephyr/modmachine.h b/ports/zephyr/modmachine.h
index 957f2dd4f9709..a3cdd2b30fe6d 100644
--- a/ports/zephyr/modmachine.h
+++ b/ports/zephyr/modmachine.h
@@ -5,6 +5,7 @@
 
 extern const mp_obj_type_t machine_pin_type;
 extern const mp_obj_type_t machine_hard_i2c_type;
+extern const mp_obj_type_t machine_hard_spi_type;
 extern const mp_obj_type_t machine_uart_type;
 
 MP_DECLARE_CONST_FUN_OBJ_0(machine_info_obj);
diff --git a/ports/zephyr/mpconfigport.h b/ports/zephyr/mpconfigport.h
index c7f46530031c6..501c39a1bb12f 100644
--- a/ports/zephyr/mpconfigport.h
+++ b/ports/zephyr/mpconfigport.h
@@ -29,6 +29,7 @@
 #include "autoconf.h"
 // Included here to get basic Zephyr environment (macros, etc.)
 #include <zephyr.h>
+#include <drivers/spi.h>
 
 // Usually passed from Makefile
 #ifndef MICROPY_HEAP_SIZE
@@ -62,6 +63,9 @@
 #define MICROPY_PY_MICROPYTHON_MEM_INFO (1)
 #define MICROPY_PY_MACHINE          (1)
 #define MICROPY_PY_MACHINE_I2C      (1)
+#define MICROPY_PY_MACHINE_SPI      (1)
+#define MICROPY_PY_MACHINE_SPI_MSB (SPI_TRANSFER_MSB)
+#define MICROPY_PY_MACHINE_SPI_LSB (SPI_TRANSFER_LSB)
 #define MICROPY_PY_MACHINE_PIN_MAKE_NEW mp_pin_make_new
 #define MICROPY_MODULE_WEAK_LINKS   (1)
 #define MICROPY_PY_STRUCT           (0)

From d934f8c8a8bb896595a6b976126222b438f383ea Mon Sep 17 00:00:00 2001
From: David Lechner <david@pybricks.com>
Date: Mon, 5 Jul 2021 10:37:34 -0500
Subject: [PATCH 1041/3533] py/makeversionhdr: Add --tags arg to git describe.

This adds the --tags argument to the git describe command that is used
to define the MICROPY_GIT_TAG macro. This makes it match non-annotated
tags. This is useful for MicroPython derivatives that don't use
annotated tags.

Signed-off-by: David Lechner <david@pybricks.com>
---
 py/makeversionhdr.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/py/makeversionhdr.py b/py/makeversionhdr.py
index 2f4bc9182664e..54b7fa9ab7d2a 100644
--- a/py/makeversionhdr.py
+++ b/py/makeversionhdr.py
@@ -23,7 +23,7 @@ def get_version_info_from_git():
     # Note: git describe doesn't work if no tag is available
     try:
         git_tag = subprocess.check_output(
-            ["git", "describe", "--dirty", "--always", "--match", "v[1-9].*"],
+            ["git", "describe", "--tags", "--dirty", "--always", "--match", "v[1-9].*"],
             stderr=subprocess.STDOUT,
             universal_newlines=True,
         ).strip()

From c1f74b300548912f92edb4ae004dc486e0b7c8bf Mon Sep 17 00:00:00 2001
From: Tom McDermott <spon@wattwatchers.com.au>
Date: Mon, 5 Aug 2019 21:09:14 +1000
Subject: [PATCH 1042/3533] docs/library: Warn that ustruct doesn't handle
 spaces in format strings.

And also add a test to capture the CPython difference.
---
 docs/library/ustruct.rst                            |  5 +++++
 .../cpydiff/modules_struct_whitespace_in_format.py  | 13 +++++++++++++
 2 files changed, 18 insertions(+)
 create mode 100644 tests/cpydiff/modules_struct_whitespace_in_format.py

diff --git a/docs/library/ustruct.rst b/docs/library/ustruct.rst
index 357d622b2b88a..bfcd84e2d8efe 100644
--- a/docs/library/ustruct.rst
+++ b/docs/library/ustruct.rst
@@ -12,6 +12,11 @@ Supported format codes: ``b``, ``B``, ``h``, ``H``, ``i``, ``I``, ``l``,
 ``L``, ``q``, ``Q``, ``s``, ``P``, ``f``, ``d`` (the latter 2 depending
 on the floating-point support).
 
+.. admonition:: Difference to CPython
+   :class: attention
+
+   Whitespace is not supported in format strings.
+
 Functions
 ---------
 
diff --git a/tests/cpydiff/modules_struct_whitespace_in_format.py b/tests/cpydiff/modules_struct_whitespace_in_format.py
new file mode 100644
index 0000000000000..dd0f8b48fcd03
--- /dev/null
+++ b/tests/cpydiff/modules_struct_whitespace_in_format.py
@@ -0,0 +1,13 @@
+"""
+categories: Modules,struct
+description: Struct pack with whitespace in format, whitespace ignored by CPython, error on uPy
+cause: MicroPython is optimised for code size.
+workaround: Don't use spaces in format strings.
+"""
+import struct
+
+try:
+    print(struct.pack('b b', 1, 2))
+    print('Should have worked')
+except:
+    print('struct.error')

From cd506d6220d322a80d634fcb00d35d7d1aa11989 Mon Sep 17 00:00:00 2001
From: David Lechner <david@pybricks.com>
Date: Tue, 6 Jul 2021 18:18:57 -0500
Subject: [PATCH 1043/3533] tests/cpydiff/modules_struct_whitespace_in_format:
 Run black.

This test snuck through without proper formatting and is causing CI for
other unrelated changes to fail.

Signed-off-by: David Lechner <david@pybricks.com>
---
 tests/cpydiff/modules_struct_whitespace_in_format.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/cpydiff/modules_struct_whitespace_in_format.py b/tests/cpydiff/modules_struct_whitespace_in_format.py
index dd0f8b48fcd03..a882b38569a95 100644
--- a/tests/cpydiff/modules_struct_whitespace_in_format.py
+++ b/tests/cpydiff/modules_struct_whitespace_in_format.py
@@ -7,7 +7,7 @@
 import struct
 
 try:
-    print(struct.pack('b b', 1, 2))
-    print('Should have worked')
+    print(struct.pack("b b", 1, 2))
+    print("Should have worked")
 except:
-    print('struct.error')
+    print("struct.error")

From e10a044d7cdd0aad4c21f1d3cfca03b4a48de8bb Mon Sep 17 00:00:00 2001
From: finefoot <33361833+finefoot@users.noreply.github.com>
Date: Mon, 28 Jun 2021 23:36:01 +0200
Subject: [PATCH 1044/3533] docs/esp8266/tutorial: Change flash mode from dio
 to dout.

For some boards, even -fm dio is too fast and they require -fm dout.  This
commit links to the esptool wiki about available flash modes and changes
dio to dout.
---
 docs/esp8266/tutorial/intro.rst | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/docs/esp8266/tutorial/intro.rst b/docs/esp8266/tutorial/intro.rst
index bbf0457fff5ab..a5deb3532f6b2 100644
--- a/docs/esp8266/tutorial/intro.rst
+++ b/docs/esp8266/tutorial/intro.rst
@@ -109,10 +109,12 @@ PC.  You may also need to reduce the baudrate if you get errors when flashing
 that you have.
 
 For some boards with a particular FlashROM configuration (e.g. some variants of
-a NodeMCU board) you may need to use the following command to deploy
-the firmware (note the ``-fm dio`` option)::
+a NodeMCU board) you may need to manually set a compatible
+`SPI Flash Mode <https://github.com/espressif/esptool/wiki/SPI-Flash-Modes>`_.
+You'd usually pick the fastest option that is compatible with your device, but
+the ``-fm dout`` option (the slowest option) should have the best compatibility::
 
-    esptool.py --port /dev/ttyUSB0 --baud 460800 write_flash --flash_size=detect -fm dio 0 esp8266-20170108-v1.8.7.bin
+    esptool.py --port /dev/ttyUSB0 --baud 460800 write_flash --flash_size=detect -fm dout 0 esp8266-20170108-v1.8.7.bin
 
 If the above commands run without error then MicroPython should be installed on
 your board!

From 3d9af877215c9f904a7d64c3fa4da79e5780a818 Mon Sep 17 00:00:00 2001
From: Bryan Tong Minh <bryan.tongminh@gmail.com>
Date: Sat, 10 Aug 2019 10:47:56 +0200
Subject: [PATCH 1045/3533] windows/Makefile: Add .exe extension to executables
 name.

Uses the same logic applied in 5b57ae985ff7064dd7b09b0ce891697bfaa5dae2
to determine when to add .exe.

See related: #3310, #3361, #3370, #4143, #5727.
---
 ports/windows/.appveyor.yml |  5 +----
 ports/windows/Makefile      |  2 +-
 py/mkrules.mk               | 11 +++++++++--
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/ports/windows/.appveyor.yml b/ports/windows/.appveyor.yml
index 1ec72bbb38937..a4cd1f1e8c050 100644
--- a/ports/windows/.appveyor.yml
+++ b/ports/windows/.appveyor.yml
@@ -63,10 +63,7 @@ after_test:
       throw "$env:MSYSTEM build exited with code $LASTEXITCODE"
     }
     cd (Join-Path $env:APPVEYOR_BUILD_FOLDER 'mpy-cross')
-    # Building of mpy-cross hasn't been fixed across all possible windows/WSL/...
-    # variations and the STRIP step tries to strip mpy-cross whereas that should be
-    # mpy-cross.exe. Workaround for now by skipping actual strip and size commands.
-    C:\msys64\usr\bin\bash.exe -l -c "make -B -j4 V=1 STRIP=echo SIZE=echo"
+    C:\msys64\usr\bin\bash.exe -l -c "make -B -j4 V=1"
     if ($LASTEXITCODE -ne 0) {
       throw "$env:MSYSTEM mpy_cross build exited with code $LASTEXITCODE"
     }
diff --git a/ports/windows/Makefile b/ports/windows/Makefile
index 3bfbc18304818..b48c9378b5280 100644
--- a/ports/windows/Makefile
+++ b/ports/windows/Makefile
@@ -2,7 +2,7 @@ include ../../py/mkenv.mk
 -include mpconfigport.mk
 
 # define main target
-PROG = micropython.exe
+PROG = micropython
 
 # qstr definitions (must come before including py.mk)
 QSTR_DEFS = ../unix/qstrdefsport.h
diff --git a/py/mkrules.mk b/py/mkrules.mk
index 038a49329b13f..63f704967fe86 100644
--- a/py/mkrules.mk
+++ b/py/mkrules.mk
@@ -178,6 +178,13 @@ endif
 ifneq ($(PROG),)
 # Build a standalone executable (unix does this)
 
+# The executable should have an .exe extension for builds targetting 'pure'
+# Windows, i.e. msvc or mingw builds, but not when using msys or cygwin's gcc.
+COMPILER_TARGET := $(shell $(CC) -dumpmachine)
+ifneq (,$(findstring mingw,$(COMPILER_TARGET)))
+PROG := $(PROG).exe
+endif
+
 all: $(PROG)
 
 $(PROG): $(OBJ)
@@ -186,9 +193,9 @@ $(PROG): $(OBJ)
 # we may want to compile using Thumb, but link with non-Thumb libc.
 	$(Q)$(CC) -o $@ $^ $(LIB) $(LDFLAGS)
 ifndef DEBUG
-	$(Q)$(STRIP) $(STRIPFLAGS_EXTRA) $(PROG)
+	$(Q)$(STRIP) $(STRIPFLAGS_EXTRA) $@
 endif
-	$(Q)$(SIZE) $$(find $(BUILD) -path "$(BUILD)/build/frozen*.o") $(PROG)
+	$(Q)$(SIZE) $$(find $(BUILD) -path "$(BUILD)/build/frozen*.o") $@
 
 clean: clean-prog
 clean-prog:

From 20a6044952281a4f55a5ee83bcaca88ec1b870f9 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 6 Jul 2021 11:23:21 +1000
Subject: [PATCH 1046/3533] lib/utils/stdout_helpers: Make
 mp_hal_stdout_tx_strn_cooked efficient.

To reduce the number of calls to mp_hal_stdout_tx_strn and improve the
overall throughput of printing data.  This implementation is taken from
ports/stm32/mphalport.c.

Signed-off-by: Damien George <damien@micropython.org>
---
 lib/utils/stdout_helpers.c | 46 +++++++++++++++++++++++++++++++++-----
 1 file changed, 41 insertions(+), 5 deletions(-)

diff --git a/lib/utils/stdout_helpers.c b/lib/utils/stdout_helpers.c
index 3de11975719a8..6a24cc2eba11f 100644
--- a/lib/utils/stdout_helpers.c
+++ b/lib/utils/stdout_helpers.c
@@ -1,6 +1,30 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
 #include <string.h>
-#include <unistd.h>
-#include "py/mpconfig.h"
 #include "py/mphal.h"
 
 /*
@@ -10,13 +34,25 @@
  */
 
 // Send "cooked" string of given length, where every occurrence of
-// LF character is replaced with CR LF.
+// LF character is replaced with CR LF ("\n" is converted to "\r\n").
+// This is an optimised version to reduce the number of calls made
+// to mp_hal_stdout_tx_strn.
 void mp_hal_stdout_tx_strn_cooked(const char *str, size_t len) {
+    const char *last = str;
     while (len--) {
         if (*str == '\n') {
-            mp_hal_stdout_tx_strn("\r", 1);
+            if (str > last) {
+                mp_hal_stdout_tx_strn(last, str - last);
+            }
+            mp_hal_stdout_tx_strn("\r\n", 2);
+            ++str;
+            last = str;
+        } else {
+            ++str;
         }
-        mp_hal_stdout_tx_strn(str++, 1);
+    }
+    if (str > last) {
+        mp_hal_stdout_tx_strn(last, str - last);
     }
 }
 

From 132d93886fd7431a739957b0d2e3bd1b7fdcf404 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 6 Jul 2021 11:25:41 +1000
Subject: [PATCH 1047/3533] ports: Use common mp_hal_stdout_tx_strn_cooked
 instead of custom one.

To reduce code duplication.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/cc3200/application.mk     |  1 +
 ports/cc3200/hal/cc3200_hal.c   | 23 -----------------------
 ports/esp32/main/CMakeLists.txt |  1 +
 ports/esp32/mphalport.c         | 24 ------------------------
 ports/esp8266/Makefile          |  1 +
 ports/esp8266/esp_mphal.c       | 23 -----------------------
 ports/stm32/Makefile            |  1 +
 ports/stm32/mphalport.c         | 24 ------------------------
 8 files changed, 4 insertions(+), 94 deletions(-)

diff --git a/ports/cc3200/application.mk b/ports/cc3200/application.mk
index 2125274ae138f..5c8fc9e40e5ff 100644
--- a/ports/cc3200/application.mk
+++ b/ports/cc3200/application.mk
@@ -147,6 +147,7 @@ APP_LIB_SRC_C = $(addprefix lib/,\
 	utils/gchelper_native.c \
 	utils/pyexec.c \
 	utils/interrupt_char.c \
+	utils/stdout_helpers.c \
 	utils/sys_stdio_mphal.c \
 	)
 
diff --git a/ports/cc3200/hal/cc3200_hal.c b/ports/cc3200/hal/cc3200_hal.c
index bdb7d33d4a242..3a35e39e1f55e 100644
--- a/ports/cc3200/hal/cc3200_hal.c
+++ b/ports/cc3200/hal/cc3200_hal.c
@@ -141,10 +141,6 @@ void mp_hal_delay_ms(mp_uint_t delay) {
     }
 }
 
-void mp_hal_stdout_tx_str(const char *str) {
-    mp_hal_stdout_tx_strn(str, strlen(str));
-}
-
 void mp_hal_stdout_tx_strn(const char *str, size_t len) {
     if (MP_STATE_PORT(os_term_dup_obj)) {
         if (mp_obj_is_type(MP_STATE_PORT(os_term_dup_obj)->stream_o, &pyb_uart_type)) {
@@ -158,25 +154,6 @@ void mp_hal_stdout_tx_strn(const char *str, size_t len) {
     telnet_tx_strn(str, len);
 }
 
-void mp_hal_stdout_tx_strn_cooked (const char *str, size_t len) {
-    int32_t nslen = 0;
-    const char *_str = str;
-
-    for (int i = 0; i < len; i++) {
-        if (str[i] == '\n') {
-            mp_hal_stdout_tx_strn(_str, nslen);
-            mp_hal_stdout_tx_strn("\r\n", 2);
-            _str += nslen + 1;
-            nslen = 0;
-        } else {
-            nslen++;
-        }
-    }
-    if (_str < str + len) {
-        mp_hal_stdout_tx_strn(_str, nslen);
-    }
-}
-
 int mp_hal_stdin_rx_chr(void) {
     for ( ;; ) {
         // read telnet first
diff --git a/ports/esp32/main/CMakeLists.txt b/ports/esp32/main/CMakeLists.txt
index fb08c2759e1b9..ed72a8d68bccc 100644
--- a/ports/esp32/main/CMakeLists.txt
+++ b/ports/esp32/main/CMakeLists.txt
@@ -27,6 +27,7 @@ set(MICROPY_SOURCE_LIB
     ${MICROPY_DIR}/lib/oofatfs/ffunicode.c
     ${MICROPY_DIR}/lib/timeutils/timeutils.c
     ${MICROPY_DIR}/lib/utils/interrupt_char.c
+    ${MICROPY_DIR}/lib/utils/stdout_helpers.c
     ${MICROPY_DIR}/lib/utils/sys_stdio_mphal.c
     ${MICROPY_DIR}/lib/utils/pyexec.c
 )
diff --git a/ports/esp32/mphalport.c b/ports/esp32/mphalport.c
index a0bafb755e781..db2146d93d2eb 100644
--- a/ports/esp32/mphalport.c
+++ b/ports/esp32/mphalport.c
@@ -108,10 +108,6 @@ int mp_hal_stdin_rx_chr(void) {
     }
 }
 
-void mp_hal_stdout_tx_str(const char *str) {
-    mp_hal_stdout_tx_strn(str, strlen(str));
-}
-
 void mp_hal_stdout_tx_strn(const char *str, uint32_t len) {
     // Only release the GIL if many characters are being sent
     bool release_gil = len > 20;
@@ -131,26 +127,6 @@ void mp_hal_stdout_tx_strn(const char *str, uint32_t len) {
     mp_uos_dupterm_tx_strn(str, len);
 }
 
-// Efficiently convert "\n" to "\r\n"
-void mp_hal_stdout_tx_strn_cooked(const char *str, size_t len) {
-    const char *last = str;
-    while (len--) {
-        if (*str == '\n') {
-            if (str > last) {
-                mp_hal_stdout_tx_strn(last, str - last);
-            }
-            mp_hal_stdout_tx_strn("\r\n", 2);
-            ++str;
-            last = str;
-        } else {
-            ++str;
-        }
-    }
-    if (str > last) {
-        mp_hal_stdout_tx_strn(last, str - last);
-    }
-}
-
 uint32_t mp_hal_ticks_ms(void) {
     return esp_timer_get_time() / 1000;
 }
diff --git a/ports/esp8266/Makefile b/ports/esp8266/Makefile
index 02ea05f76e064..9d6aea603aa84 100644
--- a/ports/esp8266/Makefile
+++ b/ports/esp8266/Makefile
@@ -145,6 +145,7 @@ LIB_SRC_C = $(addprefix lib/,\
 	timeutils/timeutils.c \
 	utils/pyexec.c \
 	utils/interrupt_char.c \
+	utils/stdout_helpers.c \
 	utils/sys_stdio_mphal.c \
 	)
 
diff --git a/ports/esp8266/esp_mphal.c b/ports/esp8266/esp_mphal.c
index 54f9611e56233..06e6cd0af5edd 100644
--- a/ports/esp8266/esp_mphal.c
+++ b/ports/esp8266/esp_mphal.c
@@ -91,33 +91,10 @@ void mp_hal_debug_str(const char *str) {
 }
 #endif
 
-void mp_hal_stdout_tx_str(const char *str) {
-    mp_uos_dupterm_tx_strn(str, strlen(str));
-}
-
 void mp_hal_stdout_tx_strn(const char *str, uint32_t len) {
     mp_uos_dupterm_tx_strn(str, len);
 }
 
-void mp_hal_stdout_tx_strn_cooked(const char *str, uint32_t len) {
-    const char *last = str;
-    while (len--) {
-        if (*str == '\n') {
-            if (str > last) {
-                mp_uos_dupterm_tx_strn(last, str - last);
-            }
-            mp_uos_dupterm_tx_strn("\r\n", 2);
-            ++str;
-            last = str;
-        } else {
-            ++str;
-        }
-    }
-    if (str > last) {
-        mp_uos_dupterm_tx_strn(last, str - last);
-    }
-}
-
 void mp_hal_debug_tx_strn_cooked(void *env, const char *str, uint32_t len) {
     (void)env;
     while (len--) {
diff --git a/ports/stm32/Makefile b/ports/stm32/Makefile
index 4ec03c17460a6..9c63707071c70 100644
--- a/ports/stm32/Makefile
+++ b/ports/stm32/Makefile
@@ -167,6 +167,7 @@ LIB_SRC_C += $(addprefix lib/,\
 	utils/gchelper_native.c \
 	utils/pyexec.c \
 	utils/interrupt_char.c \
+	utils/stdout_helpers.c \
 	utils/sys_stdio_mphal.c \
 	utils/mpirq.c \
 	)
diff --git a/ports/stm32/mphalport.c b/ports/stm32/mphalport.c
index 0e40911ed1852..81e84ef933323 100644
--- a/ports/stm32/mphalport.c
+++ b/ports/stm32/mphalport.c
@@ -53,10 +53,6 @@ MP_WEAK int mp_hal_stdin_rx_chr(void) {
     }
 }
 
-void mp_hal_stdout_tx_str(const char *str) {
-    mp_hal_stdout_tx_strn(str, strlen(str));
-}
-
 MP_WEAK void mp_hal_stdout_tx_strn(const char *str, size_t len) {
     if (MP_STATE_PORT(pyb_stdio_uart) != NULL) {
         uart_tx_strn(MP_STATE_PORT(pyb_stdio_uart), str, len);
@@ -67,26 +63,6 @@ MP_WEAK void mp_hal_stdout_tx_strn(const char *str, size_t len) {
     mp_uos_dupterm_tx_strn(str, len);
 }
 
-// Efficiently convert "\n" to "\r\n"
-void mp_hal_stdout_tx_strn_cooked(const char *str, size_t len) {
-    const char *last = str;
-    while (len--) {
-        if (*str == '\n') {
-            if (str > last) {
-                mp_hal_stdout_tx_strn(last, str - last);
-            }
-            mp_hal_stdout_tx_strn("\r\n", 2);
-            ++str;
-            last = str;
-        } else {
-            ++str;
-        }
-    }
-    if (str > last) {
-        mp_hal_stdout_tx_strn(last, str - last);
-    }
-}
-
 #if __CORTEX_M >= 0x03
 void mp_hal_ticks_cpu_enable(void) {
     if (!(DWT->CTRL & DWT_CTRL_CYCCNTENA_Msk)) {

From 0613d3e3561a82fffa36594647ef916b19bc912b Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 6 Jul 2021 11:34:19 +1000
Subject: [PATCH 1048/3533] rp2/tusb_config.h: Set CFG_TUD_CDC_EP_BUFSIZE to
 256.

This improves the speed of data going out of the MCU.

See related #7479.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/rp2/tusb_config.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/rp2/tusb_config.h b/ports/rp2/tusb_config.h
index 1402edf3795b5..8c2a9f75601e2 100644
--- a/ports/rp2/tusb_config.h
+++ b/ports/rp2/tusb_config.h
@@ -28,6 +28,7 @@
 #define CFG_TUSB_RHPORT0_MODE   (OPT_MODE_DEVICE)
 
 #define CFG_TUD_CDC             (1)
+#define CFG_TUD_CDC_EP_BUFSIZE  (256)
 #define CFG_TUD_CDC_RX_BUFSIZE  (256)
 #define CFG_TUD_CDC_TX_BUFSIZE  (256)
 

From 2e634d5ead9bfce8cdacf317470534a16d8e6631 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 8 Jul 2021 23:40:00 +1000
Subject: [PATCH 1049/3533] lib/axtls: Switch to repo at micropython/axtls.

Signed-off-by: Damien George <damien@micropython.org>
---
 .gitmodules | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index faa89c4f5cea1..9fd45dfecf00d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,7 +1,6 @@
 [submodule "lib/axtls"]
 	path = lib/axtls
-	url = https://github.com/pfalcon/axtls
-	branch = micropython
+	url = https://github.com/micropython/axtls.git
 [submodule "lib/libffi"]
 	path = lib/libffi
 	url = https://github.com/atgreen/libffi

From 75c1609c3a36f40f2dc9d5f92a8b35678eb6e6d8 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 8 Jul 2021 23:40:33 +1000
Subject: [PATCH 1050/3533] lib/axtls: Update to latest axtls 2.1.5 wih
 additional commits.

Changes are:
- update axTLS from 2.1.3 to 2.1.5
- os_port.h is now provided by the user of the library
- PLATFORM_RNG_U8 can be defined for get_random
- fix -fsanitize=undefined diagnostics

Signed-off-by: Damien George <damien@micropython.org>
---
 lib/axtls | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/axtls b/lib/axtls
index 43a6e6bd3bbc0..531cab9c278c9 160000
--- a/lib/axtls
+++ b/lib/axtls
@@ -1 +1 @@
-Subproject commit 43a6e6bd3bbc03dc501e16b89fba0ef042ed3ea0
+Subproject commit 531cab9c278c947d268bd4c94ecab9153a961b43

From e2f0b181f94c7f0843102b02912680d916b0b7d0 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 8 Jul 2021 23:51:49 +1000
Subject: [PATCH 1051/3533] extmod/axtls-include: Add axtls_os_port.h to
 customise axTLS.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/axtls-include/axtls_os_port.h | 55 ++++++++++++++++++++++++++++
 1 file changed, 55 insertions(+)
 create mode 100644 extmod/axtls-include/axtls_os_port.h

diff --git a/extmod/axtls-include/axtls_os_port.h b/extmod/axtls-include/axtls_os_port.h
new file mode 100644
index 0000000000000..a58b13d7ccf3c
--- /dev/null
+++ b/extmod/axtls-include/axtls_os_port.h
@@ -0,0 +1,55 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+#ifndef AXTLS_OS_PORT_H
+#define AXTLS_OS_PORT_H
+
+#include <errno.h>
+#include "py/stream.h"
+#include "extmod/crypto-algorithms/sha256.h"
+
+#define SSL_CTX_MUTEX_INIT(mutex)
+#define SSL_CTX_MUTEX_DESTROY(mutex)
+#define SSL_CTX_LOCK(mutex)
+#define SSL_CTX_UNLOCK(mutex)
+
+#define SOCKET_READ(s, buf, size)       mp_stream_posix_read((void *)s, buf, size)
+#define SOCKET_WRITE(s, buf, size)      mp_stream_posix_write((void *)s, buf, size)
+#define SOCKET_CLOSE(A)                 UNUSED
+#define SOCKET_ERRNO()                  errno
+
+#define SHA256_CTX                      CRYAL_SHA256_CTX
+#define SHA256_Init(ctx)                sha256_init(ctx)
+#define SHA256_Update(ctx, buf, size)   sha256_update(ctx, buf, size)
+#define SHA256_Final(hash, ctx)         sha256_final(ctx, hash)
+
+#define TTY_FLUSH()
+
+#ifdef WDEV_HWRNG
+// For esp8266 port: use the hardware RNG.
+#define PLATFORM_RNG_U8()               (*WDEV_HWRNG)
+#endif
+
+#endif // AXTLS_OS_PORT_H

From d1d172f536247df4716b76b105a875477ea75d65 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 12 Jul 2021 16:33:19 +1000
Subject: [PATCH 1052/3533] lib/re1.5: Move re1.5 code from extmod to lib.

It's third-party code, and not necessarily tied to extmod.

Signed-off-by: Damien George <damien@micropython.org>
---
 {extmod => lib}/re1.5/charclass.c     | 0
 {extmod => lib}/re1.5/compilecode.c   | 0
 {extmod => lib}/re1.5/dumpcode.c      | 0
 {extmod => lib}/re1.5/re1.5.h         | 0
 {extmod => lib}/re1.5/recursiveloop.c | 0
 5 files changed, 0 insertions(+), 0 deletions(-)
 rename {extmod => lib}/re1.5/charclass.c (100%)
 rename {extmod => lib}/re1.5/compilecode.c (100%)
 rename {extmod => lib}/re1.5/dumpcode.c (100%)
 rename {extmod => lib}/re1.5/re1.5.h (100%)
 rename {extmod => lib}/re1.5/recursiveloop.c (100%)

diff --git a/extmod/re1.5/charclass.c b/lib/re1.5/charclass.c
similarity index 100%
rename from extmod/re1.5/charclass.c
rename to lib/re1.5/charclass.c
diff --git a/extmod/re1.5/compilecode.c b/lib/re1.5/compilecode.c
similarity index 100%
rename from extmod/re1.5/compilecode.c
rename to lib/re1.5/compilecode.c
diff --git a/extmod/re1.5/dumpcode.c b/lib/re1.5/dumpcode.c
similarity index 100%
rename from extmod/re1.5/dumpcode.c
rename to lib/re1.5/dumpcode.c
diff --git a/extmod/re1.5/re1.5.h b/lib/re1.5/re1.5.h
similarity index 100%
rename from extmod/re1.5/re1.5.h
rename to lib/re1.5/re1.5.h
diff --git a/extmod/re1.5/recursiveloop.c b/lib/re1.5/recursiveloop.c
similarity index 100%
rename from extmod/re1.5/recursiveloop.c
rename to lib/re1.5/recursiveloop.c

From d1bfb271d7686708fe8711a177629c8bf6e7f6a6 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 12 Jul 2021 16:33:28 +1000
Subject: [PATCH 1053/3533] lib/uzlib: Move uzlib code from extmod to lib.

It's third-party code, and not necessarily tied to extmod.

Signed-off-by: Damien George <damien@micropython.org>
---
 {extmod => lib}/uzlib/adler32.c     | 0
 {extmod => lib}/uzlib/crc32.c       | 0
 {extmod => lib}/uzlib/defl_static.h | 0
 {extmod => lib}/uzlib/tinf.h        | 0
 {extmod => lib}/uzlib/tinf_compat.h | 0
 {extmod => lib}/uzlib/tinfgzip.c    | 0
 {extmod => lib}/uzlib/tinflate.c    | 0
 {extmod => lib}/uzlib/tinfzlib.c    | 0
 {extmod => lib}/uzlib/uzlib.h       | 0
 {extmod => lib}/uzlib/uzlib_conf.h  | 0
 10 files changed, 0 insertions(+), 0 deletions(-)
 rename {extmod => lib}/uzlib/adler32.c (100%)
 rename {extmod => lib}/uzlib/crc32.c (100%)
 rename {extmod => lib}/uzlib/defl_static.h (100%)
 rename {extmod => lib}/uzlib/tinf.h (100%)
 rename {extmod => lib}/uzlib/tinf_compat.h (100%)
 rename {extmod => lib}/uzlib/tinfgzip.c (100%)
 rename {extmod => lib}/uzlib/tinflate.c (100%)
 rename {extmod => lib}/uzlib/tinfzlib.c (100%)
 rename {extmod => lib}/uzlib/uzlib.h (100%)
 rename {extmod => lib}/uzlib/uzlib_conf.h (100%)

diff --git a/extmod/uzlib/adler32.c b/lib/uzlib/adler32.c
similarity index 100%
rename from extmod/uzlib/adler32.c
rename to lib/uzlib/adler32.c
diff --git a/extmod/uzlib/crc32.c b/lib/uzlib/crc32.c
similarity index 100%
rename from extmod/uzlib/crc32.c
rename to lib/uzlib/crc32.c
diff --git a/extmod/uzlib/defl_static.h b/lib/uzlib/defl_static.h
similarity index 100%
rename from extmod/uzlib/defl_static.h
rename to lib/uzlib/defl_static.h
diff --git a/extmod/uzlib/tinf.h b/lib/uzlib/tinf.h
similarity index 100%
rename from extmod/uzlib/tinf.h
rename to lib/uzlib/tinf.h
diff --git a/extmod/uzlib/tinf_compat.h b/lib/uzlib/tinf_compat.h
similarity index 100%
rename from extmod/uzlib/tinf_compat.h
rename to lib/uzlib/tinf_compat.h
diff --git a/extmod/uzlib/tinfgzip.c b/lib/uzlib/tinfgzip.c
similarity index 100%
rename from extmod/uzlib/tinfgzip.c
rename to lib/uzlib/tinfgzip.c
diff --git a/extmod/uzlib/tinflate.c b/lib/uzlib/tinflate.c
similarity index 100%
rename from extmod/uzlib/tinflate.c
rename to lib/uzlib/tinflate.c
diff --git a/extmod/uzlib/tinfzlib.c b/lib/uzlib/tinfzlib.c
similarity index 100%
rename from extmod/uzlib/tinfzlib.c
rename to lib/uzlib/tinfzlib.c
diff --git a/extmod/uzlib/uzlib.h b/lib/uzlib/uzlib.h
similarity index 100%
rename from extmod/uzlib/uzlib.h
rename to lib/uzlib/uzlib.h
diff --git a/extmod/uzlib/uzlib_conf.h b/lib/uzlib/uzlib_conf.h
similarity index 100%
rename from extmod/uzlib/uzlib_conf.h
rename to lib/uzlib/uzlib_conf.h

From 6dd92d7742adf06c699c52f6b7830efe2f7cc3bd Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 12 Jul 2021 16:33:33 +1000
Subject: [PATCH 1054/3533] lib/crypto-algorithms: Move crypto-algorithms code
 from extmod to lib.

It's third-party code, and not necessarily tied to extmod.

Signed-off-by: Damien George <damien@micropython.org>
---
 {extmod => lib}/crypto-algorithms/sha256.c | 0
 {extmod => lib}/crypto-algorithms/sha256.h | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename {extmod => lib}/crypto-algorithms/sha256.c (100%)
 rename {extmod => lib}/crypto-algorithms/sha256.h (100%)

diff --git a/extmod/crypto-algorithms/sha256.c b/lib/crypto-algorithms/sha256.c
similarity index 100%
rename from extmod/crypto-algorithms/sha256.c
rename to lib/crypto-algorithms/sha256.c
diff --git a/extmod/crypto-algorithms/sha256.h b/lib/crypto-algorithms/sha256.h
similarity index 100%
rename from extmod/crypto-algorithms/sha256.h
rename to lib/crypto-algorithms/sha256.h

From 966e8bf934273056af3162887fe1df014601a66d Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 12 Jul 2021 16:33:39 +1000
Subject: [PATCH 1055/3533] LICENSE: Update for move of crypto-algorithms,
 re1.5, uzlib to lib.

Signed-off-by: Damien George <damien@micropython.org>
---
 LICENSE | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/LICENSE b/LICENSE
index 7f39931ba7caa..5b5c37f7d1ead 100644
--- a/LICENSE
+++ b/LICENSE
@@ -38,10 +38,6 @@ used during the build process and is not part of the compiled source code.
         /cc3000 (BSD-3-clause)
         /cc3100 (BSD-3-clause)
         /wiznet5k (BSD-3-clause)
-    /extmod
-        /crypto-algorithms (NONE)
-        /re15 (BSD-3-clause)
-        /uzlib (Zlib)
     /lib
         /asf4 (Apache-2.0)
         /axtls (BSD-3-clause)
@@ -52,6 +48,7 @@ used during the build process and is not part of the compiled source code.
         /berkeley-db-1xx (BSD-4-clause)
         /btstack (See btstack/LICENSE)
         /cmsis (BSD-3-clause)
+        /crypto-algorithms (NONE)
         /libhydrogen (ISC)
         /littlefs (BSD-3-clause)
         /lwip (BSD-3-clause)
@@ -60,9 +57,11 @@ used during the build process and is not part of the compiled source code.
         /nxp_driver (BSD-3-Clause)
         /oofatfs (BSD-1-clause)
         /pico-sdk (BSD-3-clause)
+        /re15 (BSD-3-clause)
         /stm32lib (BSD-3-clause)
         /tinytest (BSD-3-clause)
         /tinyusb (MIT)
+        /uzlib (Zlib)
     /logo (uses OFL-1.1)
     /ports
         /cc3200

From 94dfaff18bd1941c773f89359e40db5b555cd3ef Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 12 Jul 2021 16:34:27 +1000
Subject: [PATCH 1056/3533] extmod: Update for move of crypto-algorithms,
 re1.5, uzlib to lib.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/axtls-include/axtls_os_port.h |  2 +-
 extmod/modubinascii.c                |  2 +-
 extmod/moduhashlib.c                 |  4 ++--
 extmod/modure.c                      | 10 +++++-----
 extmod/moduzlib.c                    | 12 ++++++------
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/extmod/axtls-include/axtls_os_port.h b/extmod/axtls-include/axtls_os_port.h
index a58b13d7ccf3c..ef2683acfc701 100644
--- a/extmod/axtls-include/axtls_os_port.h
+++ b/extmod/axtls-include/axtls_os_port.h
@@ -28,7 +28,7 @@
 
 #include <errno.h>
 #include "py/stream.h"
-#include "extmod/crypto-algorithms/sha256.h"
+#include "lib/crypto-algorithms/sha256.h"
 
 #define SSL_CTX_MUTEX_INIT(mutex)
 #define SSL_CTX_MUTEX_DESTROY(mutex)
diff --git a/extmod/modubinascii.c b/extmod/modubinascii.c
index 9e4f86fbd2356..fab7717c4ebb5 100644
--- a/extmod/modubinascii.c
+++ b/extmod/modubinascii.c
@@ -218,7 +218,7 @@ STATIC mp_obj_t mod_binascii_b2a_base64(mp_obj_t data) {
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_binascii_b2a_base64_obj, mod_binascii_b2a_base64);
 
 #if MICROPY_PY_UBINASCII_CRC32
-#include "uzlib/tinf.h"
+#include "lib/uzlib/tinf.h"
 
 STATIC mp_obj_t mod_binascii_crc32(size_t n_args, const mp_obj_t *args) {
     mp_buffer_info_t bufinfo;
diff --git a/extmod/moduhashlib.c b/extmod/moduhashlib.c
index b170de9e58e13..e97e8cb75d625 100644
--- a/extmod/moduhashlib.c
+++ b/extmod/moduhashlib.c
@@ -40,7 +40,7 @@
 #if MICROPY_SSL_MBEDTLS
 #include "mbedtls/sha256.h"
 #else
-#include "crypto-algorithms/sha256.h"
+#include "lib/crypto-algorithms/sha256.h"
 #endif
 
 #endif
@@ -115,7 +115,7 @@ STATIC mp_obj_t uhashlib_sha256_digest(mp_obj_t self_in) {
 
 #else
 
-#include "crypto-algorithms/sha256.c"
+#include "lib/crypto-algorithms/sha256.c"
 
 STATIC mp_obj_t uhashlib_sha256_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
     mp_arg_check_num(n_args, n_kw, 0, 1, false);
diff --git a/extmod/modure.c b/extmod/modure.c
index 220587b42f9a3..d0829e8c5df2a 100644
--- a/extmod/modure.c
+++ b/extmod/modure.c
@@ -37,7 +37,7 @@
 
 #define re1_5_stack_chk() MP_STACK_CHECK()
 
-#include "re1.5/re1.5.h"
+#include "lib/re1.5/re1.5.h"
 
 #define FLAG_DEBUG 0x1000
 
@@ -454,11 +454,11 @@ const mp_obj_module_t mp_module_ure = {
 // only if module is enabled by config setting.
 
 #define re1_5_fatal(x) assert(!x)
-#include "re1.5/compilecode.c"
+#include "lib/re1.5/compilecode.c"
 #if MICROPY_PY_URE_DEBUG
-#include "re1.5/dumpcode.c"
+#include "lib/re1.5/dumpcode.c"
 #endif
-#include "re1.5/recursiveloop.c"
-#include "re1.5/charclass.c"
+#include "lib/re1.5/recursiveloop.c"
+#include "lib/re1.5/charclass.c"
 
 #endif // MICROPY_PY_URE
diff --git a/extmod/moduzlib.c b/extmod/moduzlib.c
index ab70d67479b4e..999cb48131422 100644
--- a/extmod/moduzlib.c
+++ b/extmod/moduzlib.c
@@ -33,7 +33,7 @@
 
 #if MICROPY_PY_UZLIB
 
-#include "uzlib/tinf.h"
+#include "lib/uzlib/tinf.h"
 
 #if 0 // print debugging info
 #define DEBUG_printf DEBUG_printf
@@ -223,10 +223,10 @@ const mp_obj_module_t mp_module_uzlib = {
 // Source files #include'd here to make sure they're compiled in
 // only if module is enabled by config setting.
 
-#include "uzlib/tinflate.c"
-#include "uzlib/tinfzlib.c"
-#include "uzlib/tinfgzip.c"
-#include "uzlib/adler32.c"
-#include "uzlib/crc32.c"
+#include "lib/uzlib/tinflate.c"
+#include "lib/uzlib/tinfzlib.c"
+#include "lib/uzlib/tinfgzip.c"
+#include "lib/uzlib/adler32.c"
+#include "lib/uzlib/crc32.c"
 
 #endif // MICROPY_PY_UZLIB

From 925878b2f83e09987bd1688746b92898ee8bbcac Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 12 Jul 2021 16:34:43 +1000
Subject: [PATCH 1057/3533] ports: Update for move of crypto-algorithms, uzlib
 to lib.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/memory.h         | 2 +-
 ports/stm32/mboot/Makefile   | 8 ++++----
 ports/stm32/mboot/gzstream.c | 2 +-
 ports/stm32/mboot/main.c     | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/ports/esp32/memory.h b/ports/esp32/memory.h
index f3777b0e3962f..1f07fe409d7eb 100644
--- a/ports/esp32/memory.h
+++ b/ports/esp32/memory.h
@@ -1,2 +1,2 @@
-// this is needed for extmod/crypto-algorithms/sha256.c
+// this is needed for lib/crypto-algorithms/sha256.c
 #include <string.h>
diff --git a/ports/stm32/mboot/Makefile b/ports/stm32/mboot/Makefile
index 17de685a61cea..41a1a73bc529a 100755
--- a/ports/stm32/mboot/Makefile
+++ b/ports/stm32/mboot/Makefile
@@ -114,10 +114,10 @@ LIB_SRC_C += \
 	lib/littlefs/lfs2_util.c \
 	lib/oofatfs/ff.c \
 	lib/oofatfs/ffunicode.c \
-	extmod/uzlib/crc32.c \
-	extmod/uzlib/adler32.c \
-	extmod/uzlib/tinflate.c \
-	extmod/uzlib/tinfgzip.c
+	lib/uzlib/adler32.c \
+	lib/uzlib/crc32.c \
+	lib/uzlib/tinfgzip.c \
+	lib/uzlib/tinflate.c
 
 SRC_C += \
 	main.c \
diff --git a/ports/stm32/mboot/gzstream.c b/ports/stm32/mboot/gzstream.c
index 652302e42bf04..6ed8a21d99495 100644
--- a/ports/stm32/mboot/gzstream.c
+++ b/ports/stm32/mboot/gzstream.c
@@ -27,7 +27,7 @@
 #include <string.h>
 
 #include "py/mphal.h"
-#include "extmod/uzlib/uzlib.h"
+#include "lib/uzlib/uzlib.h"
 #include "gzstream.h"
 #include "mboot.h"
 
diff --git a/ports/stm32/mboot/main.c b/ports/stm32/mboot/main.c
index c1e1d59d235db..6c7d2c7714a8e 100644
--- a/ports/stm32/mboot/main.c
+++ b/ports/stm32/mboot/main.c
@@ -28,7 +28,7 @@
 #include <string.h>
 
 #include "py/mphal.h"
-#include "extmod/crypto-algorithms/sha256.c"
+#include "lib/crypto-algorithms/sha256.c"
 #include "boardctrl.h"
 #include "usbd_core.h"
 #include "storage.h"

From 4d546713ec8858cbf908de45de11cbfc46a20971 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 9 Jul 2021 12:38:25 +1000
Subject: [PATCH 1058/3533] shared: Introduce new top-level dir and move 1st
 party lib code there.

This commit moves all first-party code developed for this project from lib/
to shared/, so that lib/ now only contains third-party code.

The following directories are moved as-is from lib to shared:

    lib/libc            -> shared/libc
    lib/memzip          -> shared/memzip
    lib/netutils        -> shared/netutils
    lib/timeutils       -> shared/timeutils
    lib/upytesthelper   -> shared/upytesthelper

All files in lib/embed/ have been moved to shared/libc/.

lib/mp-readline has been moved to shared/readline.

lib/utils has been moved to shared/runtime, with the exception of
lib/utils/printf.c which has been moved to shared/libc/printf.c.

Signed-off-by: Damien George <damien@micropython.org>
---
 {lib/embed => shared/libc}/__errno.c             | 0
 {lib/embed => shared/libc}/abort_.c              | 0
 {lib/utils => shared/libc}/printf.c              | 0
 {lib => shared}/libc/string0.c                   | 0
 {lib => shared}/memzip/README.md                 | 0
 {lib => shared}/memzip/import.c                  | 0
 {lib => shared}/memzip/lexermemzip.c             | 0
 {lib => shared}/memzip/make-memzip.py            | 0
 {lib => shared}/memzip/memzip.c                  | 0
 {lib => shared}/memzip/memzip.h                  | 0
 {lib => shared}/netutils/dhcpserver.c            | 0
 {lib => shared}/netutils/dhcpserver.h            | 0
 {lib => shared}/netutils/netutils.c              | 0
 {lib => shared}/netutils/netutils.h              | 0
 {lib => shared}/netutils/trace.c                 | 0
 {lib/mp-readline => shared/readline}/readline.c  | 0
 {lib/mp-readline => shared/readline}/readline.h  | 0
 {lib/utils => shared/runtime}/gchelper.h         | 0
 {lib/utils => shared/runtime}/gchelper_generic.c | 0
 {lib/utils => shared/runtime}/gchelper_m0.s      | 0
 {lib/utils => shared/runtime}/gchelper_m3.s      | 0
 {lib/utils => shared/runtime}/gchelper_native.c  | 0
 {lib/utils => shared/runtime}/interrupt_char.c   | 0
 {lib/utils => shared/runtime}/interrupt_char.h   | 0
 {lib/utils => shared/runtime}/mpirq.c            | 0
 {lib/utils => shared/runtime}/mpirq.h            | 0
 {lib/utils => shared/runtime}/pyexec.c           | 0
 {lib/utils => shared/runtime}/pyexec.h           | 0
 {lib/utils => shared/runtime}/semihosting.c      | 0
 {lib/utils => shared/runtime}/semihosting.h      | 0
 {lib/utils => shared/runtime}/stdout_helpers.c   | 0
 {lib/utils => shared/runtime}/sys_stdio_mphal.c  | 0
 {lib => shared}/timeutils/timeutils.c            | 0
 {lib => shared}/timeutils/timeutils.h            | 0
 {lib => shared}/upytesthelper/upytesthelper.c    | 0
 {lib => shared}/upytesthelper/upytesthelper.h    | 0
 36 files changed, 0 insertions(+), 0 deletions(-)
 rename {lib/embed => shared/libc}/__errno.c (100%)
 rename {lib/embed => shared/libc}/abort_.c (100%)
 rename {lib/utils => shared/libc}/printf.c (100%)
 rename {lib => shared}/libc/string0.c (100%)
 rename {lib => shared}/memzip/README.md (100%)
 rename {lib => shared}/memzip/import.c (100%)
 rename {lib => shared}/memzip/lexermemzip.c (100%)
 rename {lib => shared}/memzip/make-memzip.py (100%)
 rename {lib => shared}/memzip/memzip.c (100%)
 rename {lib => shared}/memzip/memzip.h (100%)
 rename {lib => shared}/netutils/dhcpserver.c (100%)
 rename {lib => shared}/netutils/dhcpserver.h (100%)
 rename {lib => shared}/netutils/netutils.c (100%)
 rename {lib => shared}/netutils/netutils.h (100%)
 rename {lib => shared}/netutils/trace.c (100%)
 rename {lib/mp-readline => shared/readline}/readline.c (100%)
 rename {lib/mp-readline => shared/readline}/readline.h (100%)
 rename {lib/utils => shared/runtime}/gchelper.h (100%)
 rename {lib/utils => shared/runtime}/gchelper_generic.c (100%)
 rename {lib/utils => shared/runtime}/gchelper_m0.s (100%)
 rename {lib/utils => shared/runtime}/gchelper_m3.s (100%)
 rename {lib/utils => shared/runtime}/gchelper_native.c (100%)
 rename {lib/utils => shared/runtime}/interrupt_char.c (100%)
 rename {lib/utils => shared/runtime}/interrupt_char.h (100%)
 rename {lib/utils => shared/runtime}/mpirq.c (100%)
 rename {lib/utils => shared/runtime}/mpirq.h (100%)
 rename {lib/utils => shared/runtime}/pyexec.c (100%)
 rename {lib/utils => shared/runtime}/pyexec.h (100%)
 rename {lib/utils => shared/runtime}/semihosting.c (100%)
 rename {lib/utils => shared/runtime}/semihosting.h (100%)
 rename {lib/utils => shared/runtime}/stdout_helpers.c (100%)
 rename {lib/utils => shared/runtime}/sys_stdio_mphal.c (100%)
 rename {lib => shared}/timeutils/timeutils.c (100%)
 rename {lib => shared}/timeutils/timeutils.h (100%)
 rename {lib => shared}/upytesthelper/upytesthelper.c (100%)
 rename {lib => shared}/upytesthelper/upytesthelper.h (100%)

diff --git a/lib/embed/__errno.c b/shared/libc/__errno.c
similarity index 100%
rename from lib/embed/__errno.c
rename to shared/libc/__errno.c
diff --git a/lib/embed/abort_.c b/shared/libc/abort_.c
similarity index 100%
rename from lib/embed/abort_.c
rename to shared/libc/abort_.c
diff --git a/lib/utils/printf.c b/shared/libc/printf.c
similarity index 100%
rename from lib/utils/printf.c
rename to shared/libc/printf.c
diff --git a/lib/libc/string0.c b/shared/libc/string0.c
similarity index 100%
rename from lib/libc/string0.c
rename to shared/libc/string0.c
diff --git a/lib/memzip/README.md b/shared/memzip/README.md
similarity index 100%
rename from lib/memzip/README.md
rename to shared/memzip/README.md
diff --git a/lib/memzip/import.c b/shared/memzip/import.c
similarity index 100%
rename from lib/memzip/import.c
rename to shared/memzip/import.c
diff --git a/lib/memzip/lexermemzip.c b/shared/memzip/lexermemzip.c
similarity index 100%
rename from lib/memzip/lexermemzip.c
rename to shared/memzip/lexermemzip.c
diff --git a/lib/memzip/make-memzip.py b/shared/memzip/make-memzip.py
similarity index 100%
rename from lib/memzip/make-memzip.py
rename to shared/memzip/make-memzip.py
diff --git a/lib/memzip/memzip.c b/shared/memzip/memzip.c
similarity index 100%
rename from lib/memzip/memzip.c
rename to shared/memzip/memzip.c
diff --git a/lib/memzip/memzip.h b/shared/memzip/memzip.h
similarity index 100%
rename from lib/memzip/memzip.h
rename to shared/memzip/memzip.h
diff --git a/lib/netutils/dhcpserver.c b/shared/netutils/dhcpserver.c
similarity index 100%
rename from lib/netutils/dhcpserver.c
rename to shared/netutils/dhcpserver.c
diff --git a/lib/netutils/dhcpserver.h b/shared/netutils/dhcpserver.h
similarity index 100%
rename from lib/netutils/dhcpserver.h
rename to shared/netutils/dhcpserver.h
diff --git a/lib/netutils/netutils.c b/shared/netutils/netutils.c
similarity index 100%
rename from lib/netutils/netutils.c
rename to shared/netutils/netutils.c
diff --git a/lib/netutils/netutils.h b/shared/netutils/netutils.h
similarity index 100%
rename from lib/netutils/netutils.h
rename to shared/netutils/netutils.h
diff --git a/lib/netutils/trace.c b/shared/netutils/trace.c
similarity index 100%
rename from lib/netutils/trace.c
rename to shared/netutils/trace.c
diff --git a/lib/mp-readline/readline.c b/shared/readline/readline.c
similarity index 100%
rename from lib/mp-readline/readline.c
rename to shared/readline/readline.c
diff --git a/lib/mp-readline/readline.h b/shared/readline/readline.h
similarity index 100%
rename from lib/mp-readline/readline.h
rename to shared/readline/readline.h
diff --git a/lib/utils/gchelper.h b/shared/runtime/gchelper.h
similarity index 100%
rename from lib/utils/gchelper.h
rename to shared/runtime/gchelper.h
diff --git a/lib/utils/gchelper_generic.c b/shared/runtime/gchelper_generic.c
similarity index 100%
rename from lib/utils/gchelper_generic.c
rename to shared/runtime/gchelper_generic.c
diff --git a/lib/utils/gchelper_m0.s b/shared/runtime/gchelper_m0.s
similarity index 100%
rename from lib/utils/gchelper_m0.s
rename to shared/runtime/gchelper_m0.s
diff --git a/lib/utils/gchelper_m3.s b/shared/runtime/gchelper_m3.s
similarity index 100%
rename from lib/utils/gchelper_m3.s
rename to shared/runtime/gchelper_m3.s
diff --git a/lib/utils/gchelper_native.c b/shared/runtime/gchelper_native.c
similarity index 100%
rename from lib/utils/gchelper_native.c
rename to shared/runtime/gchelper_native.c
diff --git a/lib/utils/interrupt_char.c b/shared/runtime/interrupt_char.c
similarity index 100%
rename from lib/utils/interrupt_char.c
rename to shared/runtime/interrupt_char.c
diff --git a/lib/utils/interrupt_char.h b/shared/runtime/interrupt_char.h
similarity index 100%
rename from lib/utils/interrupt_char.h
rename to shared/runtime/interrupt_char.h
diff --git a/lib/utils/mpirq.c b/shared/runtime/mpirq.c
similarity index 100%
rename from lib/utils/mpirq.c
rename to shared/runtime/mpirq.c
diff --git a/lib/utils/mpirq.h b/shared/runtime/mpirq.h
similarity index 100%
rename from lib/utils/mpirq.h
rename to shared/runtime/mpirq.h
diff --git a/lib/utils/pyexec.c b/shared/runtime/pyexec.c
similarity index 100%
rename from lib/utils/pyexec.c
rename to shared/runtime/pyexec.c
diff --git a/lib/utils/pyexec.h b/shared/runtime/pyexec.h
similarity index 100%
rename from lib/utils/pyexec.h
rename to shared/runtime/pyexec.h
diff --git a/lib/utils/semihosting.c b/shared/runtime/semihosting.c
similarity index 100%
rename from lib/utils/semihosting.c
rename to shared/runtime/semihosting.c
diff --git a/lib/utils/semihosting.h b/shared/runtime/semihosting.h
similarity index 100%
rename from lib/utils/semihosting.h
rename to shared/runtime/semihosting.h
diff --git a/lib/utils/stdout_helpers.c b/shared/runtime/stdout_helpers.c
similarity index 100%
rename from lib/utils/stdout_helpers.c
rename to shared/runtime/stdout_helpers.c
diff --git a/lib/utils/sys_stdio_mphal.c b/shared/runtime/sys_stdio_mphal.c
similarity index 100%
rename from lib/utils/sys_stdio_mphal.c
rename to shared/runtime/sys_stdio_mphal.c
diff --git a/lib/timeutils/timeutils.c b/shared/timeutils/timeutils.c
similarity index 100%
rename from lib/timeutils/timeutils.c
rename to shared/timeutils/timeutils.c
diff --git a/lib/timeutils/timeutils.h b/shared/timeutils/timeutils.h
similarity index 100%
rename from lib/timeutils/timeutils.h
rename to shared/timeutils/timeutils.h
diff --git a/lib/upytesthelper/upytesthelper.c b/shared/upytesthelper/upytesthelper.c
similarity index 100%
rename from lib/upytesthelper/upytesthelper.c
rename to shared/upytesthelper/upytesthelper.c
diff --git a/lib/upytesthelper/upytesthelper.h b/shared/upytesthelper/upytesthelper.h
similarity index 100%
rename from lib/upytesthelper/upytesthelper.h
rename to shared/upytesthelper/upytesthelper.h

From 136369d72f5b99ec23c9c9f178a590bde968e2ee Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 9 Jul 2021 14:19:15 +1000
Subject: [PATCH 1059/3533] all: Update to point to files in new shared/
 directory.

Signed-off-by: Damien George <damien@micropython.org>
---
 docs/develop/porting.rst                  | 12 +++++-----
 drivers/cyw43/cyw43.h                     |  2 +-
 drivers/cyw43/cyw43_lwip.c                |  2 +-
 examples/embedding/Makefile.upylib        | 16 ++++++-------
 extmod/extmod.cmake                       |  4 ++--
 extmod/extmod.mk                          |  2 +-
 extmod/modlwip.c                          |  2 +-
 extmod/uos_dupterm.c                      |  2 +-
 extmod/vfs_fat.c                          |  2 +-
 extmod/vfs_lfs.c                          |  2 +-
 extmod/vfs_lfsx.c                         |  2 +-
 mpy-cross/Makefile                        |  2 +-
 mpy-cross/gccollect.c                     |  2 +-
 mpy-cross/mpy-cross.vcxproj               |  4 ++--
 ports/bare-arm/lib.c                      |  2 +-
 ports/cc3200/application.mk               | 21 +++++++++-------
 ports/cc3200/bootmgr/bootloader.mk        |  6 ++---
 ports/cc3200/fatfs_port.c                 |  2 +-
 ports/cc3200/ftp/ftp.c                    |  2 +-
 ports/cc3200/mods/moduos.c                |  2 +-
 ports/cc3200/mods/modusocket.c            |  2 +-
 ports/cc3200/mods/modutime.c              |  2 +-
 ports/cc3200/mods/modwlan.c               |  4 ++--
 ports/cc3200/mods/pybrtc.c                |  2 +-
 ports/cc3200/mods/pybuart.c               |  2 +-
 ports/cc3200/mptask.c                     |  6 ++---
 ports/cc3200/telnet/telnet.c              |  2 +-
 ports/cc3200/util/gccollect.c             |  2 +-
 ports/esp32/fatfs_port.c                  |  2 +-
 ports/esp32/machine_rtc.c                 |  2 +-
 ports/esp32/main.c                        |  4 ++--
 ports/esp32/main/CMakeLists.txt           | 19 +++++++++------
 ports/esp32/modesp32.c                    |  2 +-
 ports/esp32/modmachine.c                  |  2 +-
 ports/esp32/modnetwork.c                  |  2 +-
 ports/esp32/modsocket.c                   |  2 +-
 ports/esp32/modutime.c                    |  2 +-
 ports/esp32/mphalport.c                   |  4 ++--
 ports/esp32/mphalport.h                   |  2 +-
 ports/esp32/network_ppp.c                 |  2 +-
 ports/esp8266/Makefile                    | 20 +++++++++-------
 ports/esp8266/boards/esp8266_common.ld    | 16 ++++++-------
 ports/esp8266/esp_mphal.c                 |  2 +-
 ports/esp8266/esp_mphal.h                 |  2 +-
 ports/esp8266/fatfs_port.c                |  2 +-
 ports/esp8266/machine_rtc.c               |  2 +-
 ports/esp8266/main.c                      |  4 ++--
 ports/esp8266/modmachine.c                |  2 +-
 ports/esp8266/modnetwork.c                |  2 +-
 ports/esp8266/modutime.c                  |  2 +-
 ports/esp8266/uart.c                      |  2 +-
 ports/javascript/Makefile                 | 12 +++++-----
 ports/javascript/main.c                   |  2 +-
 ports/javascript/modutime.c               |  2 +-
 ports/javascript/mphalport.h              |  2 +-
 ports/mimxrt/Makefile                     | 24 +++++++++----------
 ports/mimxrt/machine_pin.c                |  2 +-
 ports/mimxrt/machine_rtc.c                |  2 +-
 ports/mimxrt/main.c                       |  6 ++---
 ports/mimxrt/modutime.c                   |  2 +-
 ports/mimxrt/mphalport.c                  |  2 +-
 ports/mimxrt/pin.h                        |  2 +-
 ports/minimal/Makefile                    | 10 ++++----
 ports/minimal/main.c                      |  2 +-
 ports/nrf/Makefile                        | 12 +++++-----
 ports/nrf/drivers/bluetooth/ble_uart.c    |  2 +-
 ports/nrf/main.c                          |  2 +-
 ports/nrf/modules/board/modboard.c        |  2 +-
 ports/nrf/modules/machine/modmachine.c    |  2 +-
 ports/nrf/modules/machine/uart.c          |  2 +-
 ports/pic16bit/Makefile                   |  6 ++---
 ports/pic16bit/main.c                     |  4 ++--
 ports/powerpc/Makefile                    | 10 ++++----
 ports/powerpc/main.c                      |  2 +-
 ports/qemu-arm/Makefile                   | 12 +++++-----
 ports/qemu-arm/Makefile.test              |  2 +-
 ports/qemu-arm/mpconfigport.h             |  2 +-
 ports/qemu-arm/test_main.c                |  2 +-
 ports/rp2/CMakeLists.txt                  | 20 ++++++++--------
 ports/rp2/machine_pin.c                   |  2 +-
 ports/rp2/machine_rtc.c                   |  2 +-
 ports/rp2/main.c                          |  6 ++---
 ports/rp2/modmachine.c                    |  2 +-
 ports/rp2/modutime.c                      |  2 +-
 ports/rp2/mphalport.c                     |  2 +-
 ports/rp2/rp2_pio.c                       |  2 +-
 ports/samd/Makefile                       | 16 ++++++-------
 ports/samd/main.c                         |  4 ++--
 ports/stm32/Makefile                      | 29 ++++++++++++-----------
 ports/stm32/boardctrl.c                   |  2 +-
 ports/stm32/eth.c                         |  2 +-
 ports/stm32/gccollect.c                   |  2 +-
 ports/stm32/machine_uart.c                |  4 ++--
 ports/stm32/main.c                        |  4 ++--
 ports/stm32/mboot/Makefile                |  4 ++--
 ports/stm32/modmachine.c                  |  2 +-
 ports/stm32/modnetwork.c                  |  2 +-
 ports/stm32/modnwcc3k.c                   |  2 +-
 ports/stm32/modnwwiznet5k.c               |  2 +-
 ports/stm32/modpyb.c                      |  2 +-
 ports/stm32/moduos.c                      |  2 +-
 ports/stm32/modusocket.c                  |  2 +-
 ports/stm32/modutime.c                    |  2 +-
 ports/stm32/mpbthciport.c                 |  2 +-
 ports/stm32/network_wiznet5k.c            |  2 +-
 ports/stm32/pendsv.c                      |  2 +-
 ports/stm32/rtc.c                         |  2 +-
 ports/stm32/uart.c                        |  4 ++--
 ports/stm32/uart.h                        |  2 +-
 ports/stm32/usb.c                         |  2 +-
 ports/stm32/usbd_cdc_interface.c          |  2 +-
 ports/teensy/Makefile                     | 24 +++++++++----------
 ports/teensy/main.c                       |  6 ++---
 ports/teensy/modpyb.c                     |  2 +-
 ports/unix/Makefile                       | 14 +++++------
 ports/unix/gccollect.c                    |  2 +-
 ports/unix/input.c                        |  2 +-
 ports/unix/main.c                         |  2 +-
 ports/unix/mphalport.h                    |  2 +-
 ports/unix/mpthreadport.c                 |  2 +-
 ports/windows/Makefile                    |  6 ++---
 ports/windows/micropython.vcxproj         |  6 ++---
 ports/zephyr/CMakeLists.txt               | 19 +++++++++------
 ports/zephyr/machine_pin.c                |  2 +-
 ports/zephyr/main.c                       |  8 +++----
 ports/zephyr/mpconfigport_bin_testsuite.h |  2 +-
 ports/zephyr/mphalport.h                  |  2 +-
 py/modbuiltins.c                          |  2 +-
 py/mpconfig.h                             |  2 +-
 py/py.mk                                  |  6 ++---
 shared/memzip/README.md                   |  8 +++----
 shared/netutils/dhcpserver.c              |  2 +-
 shared/netutils/netutils.c                |  2 +-
 shared/netutils/trace.c                   |  2 +-
 shared/readline/readline.c                |  2 +-
 shared/runtime/gchelper_generic.c         |  2 +-
 shared/runtime/gchelper_native.c          |  2 +-
 shared/runtime/mpirq.c                    |  2 +-
 shared/runtime/pyexec.c                   |  4 ++--
 shared/timeutils/timeutils.c              |  2 +-
 tools/codeformat.py                       |  6 ++---
 141 files changed, 324 insertions(+), 306 deletions(-)

diff --git a/docs/develop/porting.rst b/docs/develop/porting.rst
index 59dd570008bcd..08f3557f1835d 100644
--- a/docs/develop/porting.rst
+++ b/docs/develop/porting.rst
@@ -42,8 +42,8 @@ The basic MicroPython firmware is implemented in the main port file, e.g ``main.
    #include "py/gc.h"
    #include "py/mperrno.h"
    #include "py/stackctrl.h"
-   #include "lib/utils/gchelper.h"
-   #include "lib/utils/pyexec.h"
+   #include "shared/runtime/gchelper.h"
+   #include "shared/runtime/pyexec.h"
 
    // Allocate memory for the MicroPython GC heap.
    static char heap[4096];
@@ -106,10 +106,10 @@ We also need a Makefile at this point for the port:
    SRC_C = \
        main.c \
        mphalport.c \
-       lib/mp-readline/readline.c \
-       lib/utils/gchelper_generic.c \
-       lib/utils/pyexec.c \
-       lib/utils/stdout_helpers.c \
+       shared/readline/readline.c \
+       shared/runtime/gchelper_generic.c \
+       shared/runtime/pyexec.c \
+       shared/runtime/stdout_helpers.c \
 
    # Define the required object files.
    OBJ = $(PY_CORE_O) $(addprefix $(BUILD)/, $(SRC_C:.c=.o))
diff --git a/drivers/cyw43/cyw43.h b/drivers/cyw43/cyw43.h
index d7f08cb5dfeed..7d3e30f5d4eda 100644
--- a/drivers/cyw43/cyw43.h
+++ b/drivers/cyw43/cyw43.h
@@ -28,7 +28,7 @@
 
 #include "lwip/netif.h"
 #include "lwip/dhcp.h"
-#include "lib/netutils/dhcpserver.h"
+#include "shared/netutils/dhcpserver.h"
 #include "drivers/cyw43/cyw43_ll.h"
 
 // For trace_flags
diff --git a/drivers/cyw43/cyw43_lwip.c b/drivers/cyw43/cyw43_lwip.c
index f3ca59e3a4bf8..16ae6023755a1 100644
--- a/drivers/cyw43/cyw43_lwip.c
+++ b/drivers/cyw43/cyw43_lwip.c
@@ -28,7 +28,7 @@
 #include <string.h>
 
 #include "py/mphal.h"
-#include "lib/netutils/netutils.h"
+#include "shared/netutils/netutils.h"
 #include "lwip/etharp.h"
 #include "lwip/dns.h"
 #include "lwip/apps/mdns.h"
diff --git a/examples/embedding/Makefile.upylib b/examples/embedding/Makefile.upylib
index 00def493d650f..14260a719ff30 100644
--- a/examples/embedding/Makefile.upylib
+++ b/examples/embedding/Makefile.upylib
@@ -82,9 +82,9 @@ endif
 endif
 
 ifeq ($(MICROPY_USE_READLINE),1)
-INC +=  -I$(MPTOP)/lib/mp-readline
+INC += -I$(MPTOP)/shared/readline
 CFLAGS_MOD += -DMICROPY_USE_READLINE=1
-LIB_SRC_C_EXTRA += mp-readline/readline.c
+SHARED_SRC_C_EXTRA += readline/readline.c
 endif
 ifeq ($(MICROPY_USE_READLINE),2)
 CFLAGS_MOD += -DMICROPY_USE_READLINE=2
@@ -145,19 +145,19 @@ SRC_C = $(addprefix ports/unix/,\
 	$(SRC_MOD) \
 	)
 
-LIB_SRC_C = $(addprefix lib/,\
-	$(LIB_SRC_C_EXTRA) \
-	utils/printf.c \
-	utils/gchelper_generic.c \
+SHARED_SRC_C = $(addprefix shared/,\
+	libc/printf.c \
+	runtime/gchelper_generic.c \
 	timeutils/timeutils.c \
+	$(SHARED_SRC_C_EXTRA) \
 	)
 
 OBJ = $(PY_O)
 OBJ += $(addprefix $(BUILD)/, $(SRC_C:.c=.o))
-OBJ += $(addprefix $(BUILD)/, $(LIB_SRC_C:.c=.o))
+OBJ += $(addprefix $(BUILD)/, $(SHARED_SRC_C:.c=.o))
 
 # List of sources for qstr extraction
-SRC_QSTR += $(SRC_C) $(LIB_SRC_C)
+SRC_QSTR += $(SRC_C) $(SHARED_SRC_C)
 # Append any auto-generated sources that are needed by sources listed in
 # SRC_QSTR
 SRC_QSTR_AUTO_DEPS +=
diff --git a/extmod/extmod.cmake b/extmod/extmod.cmake
index a54047519d76e..9ea2ba0af9463 100644
--- a/extmod/extmod.cmake
+++ b/extmod/extmod.cmake
@@ -4,8 +4,8 @@ set(MICROPY_EXTMOD_DIR "${MICROPY_DIR}/extmod")
 set(MICROPY_OOFATFS_DIR "${MICROPY_DIR}/lib/oofatfs")
 
 set(MICROPY_SOURCE_EXTMOD
-    ${MICROPY_DIR}/lib/embed/abort_.c
-    ${MICROPY_DIR}/lib/utils/printf.c
+    ${MICROPY_DIR}/shared/libc/abort_.c
+    ${MICROPY_DIR}/shared/libc/printf.c
     ${MICROPY_EXTMOD_DIR}/machine_i2c.c
     ${MICROPY_EXTMOD_DIR}/machine_mem.c
     ${MICROPY_EXTMOD_DIR}/machine_pulse.c
diff --git a/extmod/extmod.mk b/extmod/extmod.mk
index b000b058d7bd4..ff24a549a9a07 100644
--- a/extmod/extmod.mk
+++ b/extmod/extmod.mk
@@ -153,7 +153,7 @@ LWIP_DIR = lib/lwip/src
 INC += -I$(TOP)/$(LWIP_DIR)/include
 CFLAGS_MOD += -DMICROPY_PY_LWIP=1
 $(BUILD)/$(LWIP_DIR)/core/ipv4/dhcp.o: CFLAGS_MOD += -Wno-address
-SRC_MOD += extmod/modlwip.c lib/netutils/netutils.c
+SRC_MOD += extmod/modlwip.c shared/netutils/netutils.c
 SRC_MOD += $(addprefix $(LWIP_DIR)/,\
 	apps/mdns/mdns.c \
 	core/def.c \
diff --git a/extmod/modlwip.c b/extmod/modlwip.c
index 1d557a6a84b5a..00fd1096451fa 100644
--- a/extmod/modlwip.c
+++ b/extmod/modlwip.c
@@ -35,7 +35,7 @@
 #include "py/mperrno.h"
 #include "py/mphal.h"
 
-#include "lib/netutils/netutils.h"
+#include "shared/netutils/netutils.h"
 
 #include "lwip/init.h"
 #include "lwip/tcp.h"
diff --git a/extmod/uos_dupterm.c b/extmod/uos_dupterm.c
index b661803875f7f..d55767de21255 100644
--- a/extmod/uos_dupterm.c
+++ b/extmod/uos_dupterm.c
@@ -33,7 +33,7 @@
 #include "py/objarray.h"
 #include "py/stream.h"
 #include "extmod/misc.h"
-#include "lib/utils/interrupt_char.h"
+#include "shared/runtime/interrupt_char.h"
 
 #if MICROPY_PY_OS_DUPTERM
 
diff --git a/extmod/vfs_fat.c b/extmod/vfs_fat.c
index 644be57ae7731..41284500b4600 100644
--- a/extmod/vfs_fat.c
+++ b/extmod/vfs_fat.c
@@ -37,7 +37,7 @@
 #include "py/mperrno.h"
 #include "lib/oofatfs/ff.h"
 #include "extmod/vfs_fat.h"
-#include "lib/timeutils/timeutils.h"
+#include "shared/timeutils/timeutils.h"
 
 #if FF_MAX_SS == FF_MIN_SS
 #define SECSIZE(fs) (FF_MIN_SS)
diff --git a/extmod/vfs_lfs.c b/extmod/vfs_lfs.c
index dd78269a460ab..f6a9a24623a93 100644
--- a/extmod/vfs_lfs.c
+++ b/extmod/vfs_lfs.c
@@ -26,7 +26,7 @@
 
 #include "py/runtime.h"
 #include "py/mphal.h"
-#include "lib/timeutils/timeutils.h"
+#include "shared/timeutils/timeutils.h"
 #include "extmod/vfs.h"
 #include "extmod/vfs_lfs.h"
 
diff --git a/extmod/vfs_lfsx.c b/extmod/vfs_lfsx.c
index f865e46060234..e1324f82c73fd 100644
--- a/extmod/vfs_lfsx.c
+++ b/extmod/vfs_lfsx.c
@@ -34,7 +34,7 @@
 #include "py/objstr.h"
 #include "py/mperrno.h"
 #include "extmod/vfs.h"
-#include "lib/timeutils/timeutils.h"
+#include "shared/timeutils/timeutils.h"
 
 STATIC int MP_VFS_LFSx(dev_ioctl)(const struct LFSx_API (config) * c, int cmd, int arg, bool must_return_int) {
     mp_obj_t ret = mp_vfs_blockdev_ioctl(c->context, cmd, arg);
diff --git a/mpy-cross/Makefile b/mpy-cross/Makefile
index 971f2f81aa593..2189dff9058ea 100644
--- a/mpy-cross/Makefile
+++ b/mpy-cross/Makefile
@@ -48,7 +48,7 @@ LDFLAGS = $(LDFLAGS_MOD) $(LDFLAGS_ARCH) -lm $(LDFLAGS_EXTRA)
 SRC_C = \
 	main.c \
 	gccollect.c \
-	lib/utils/gchelper_generic.c \
+	shared/runtime/gchelper_generic.c \
 
 # Add fmode when compiling with mingw gcc
 COMPILER_TARGET := $(shell $(CC) -dumpmachine)
diff --git a/mpy-cross/gccollect.c b/mpy-cross/gccollect.c
index 120f1a225249c..72d4204c28980 100644
--- a/mpy-cross/gccollect.c
+++ b/mpy-cross/gccollect.c
@@ -29,7 +29,7 @@
 #include "py/mpstate.h"
 #include "py/gc.h"
 
-#include "lib/utils/gchelper.h"
+#include "shared/runtime/gchelper.h"
 
 #if MICROPY_ENABLE_GC
 
diff --git a/mpy-cross/mpy-cross.vcxproj b/mpy-cross/mpy-cross.vcxproj
index 74a366712a204..e70b29ae14d7b 100644
--- a/mpy-cross/mpy-cross.vcxproj
+++ b/mpy-cross/mpy-cross.vcxproj
@@ -89,7 +89,7 @@
   <Import Project="$(PyMsvcDir)sources.props" />
   <ItemGroup>
     <ClCompile Include="@(PyCoreSource)" />
-    <ClCompile Include="$(PyBaseDir)lib/utils/gchelper_generic.c" >
+    <ClCompile Include="$(PyBaseDir)shared/runtime/gchelper_generic.c" >
       <PreprocessorDefinitions>MICROPY_GCREGS_SETJMP</PreprocessorDefinitions>
     </ClCompile>
     <ClCompile Include="$(PyBaseDir)mpy-cross\gccollect.c"/>
@@ -103,4 +103,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/ports/bare-arm/lib.c b/ports/bare-arm/lib.c
index ee7c1d765e9d4..6ef450bea0f1a 100644
--- a/ports/bare-arm/lib.c
+++ b/ports/bare-arm/lib.c
@@ -54,7 +54,7 @@ void free(void *p) {
 }
 
 // These standard string functions are needed by the runtime, and can be
-// provided either by the system or lib/libc/string0.c.  The implementations
+// provided either by the system or shared/libc/string0.c.  The implementations
 // here are very simple.
 
 int memcmp(const void *s1, const void *s2, size_t n) {
diff --git a/ports/cc3200/application.mk b/ports/cc3200/application.mk
index 5c8fc9e40e5ff..25a9925ea00ea 100644
--- a/ports/cc3200/application.mk
+++ b/ports/cc3200/application.mk
@@ -140,15 +140,18 @@ APP_MAIN_SRC_C = \
 APP_LIB_SRC_C = $(addprefix lib/,\
 	oofatfs/ff.c \
 	oofatfs/ffunicode.c \
+	)
+
+APP_SHARED_SRC_C = $(addprefix shared/,\
 	libc/string0.c \
-	mp-readline/readline.c \
+	readline/readline.c \
 	netutils/netutils.c \
 	timeutils/timeutils.c \
-	utils/gchelper_native.c \
-	utils/pyexec.c \
-	utils/interrupt_char.c \
-	utils/stdout_helpers.c \
-	utils/sys_stdio_mphal.c \
+	runtime/gchelper_native.c \
+	runtime/pyexec.c \
+	runtime/interrupt_char.c \
+	runtime/stdout_helpers.c \
+	runtime/sys_stdio_mphal.c \
 	)
 
 APP_STM_SRC_C = $(addprefix ports/stm32/,\
@@ -158,12 +161,12 @@ APP_STM_SRC_C = $(addprefix ports/stm32/,\
 
 OBJ = $(PY_O) $(addprefix $(BUILD)/, $(APP_FATFS_SRC_C:.c=.o) $(APP_RTOS_SRC_C:.c=.o) $(APP_FTP_SRC_C:.c=.o) $(APP_HAL_SRC_C:.c=.o) $(APP_MISC_SRC_C:.c=.o))
 OBJ += $(addprefix $(BUILD)/, $(APP_MODS_SRC_C:.c=.o) $(APP_CC3100_SRC_C:.c=.o) $(APP_SL_SRC_C:.c=.o) $(APP_TELNET_SRC_C:.c=.o) $(APP_UTIL_SRC_C:.c=.o) $(APP_UTIL_SRC_S:.s=.o))
-OBJ += $(addprefix $(BUILD)/, $(APP_MAIN_SRC_C:.c=.o) $(APP_LIB_SRC_C:.c=.o) $(APP_STM_SRC_C:.c=.o))
-OBJ += $(BUILD)/lib/utils/gchelper_m3.o
+OBJ += $(addprefix $(BUILD)/, $(APP_MAIN_SRC_C:.c=.o) $(APP_SHARED_SRC_C:.c=.o) $(APP_LIB_SRC_C:.c=.o) $(APP_STM_SRC_C:.c=.o))
+OBJ += $(BUILD)/shared/runtime/gchelper_m3.o
 OBJ += $(BUILD)/pins.o
 
 # List of sources for qstr extraction
-SRC_QSTR += $(APP_MODS_SRC_C) $(APP_MISC_SRC_C) $(APP_STM_SRC_C)
+SRC_QSTR += $(APP_MODS_SRC_C) $(APP_MISC_SRC_C) $(APP_STM_SRC_C) $(APP_SHARED_SRC_C)
 # Append any auto-generated sources that are needed by sources listed in
 # SRC_QSTR
 SRC_QSTR_AUTO_DEPS +=
diff --git a/ports/cc3200/bootmgr/bootloader.mk b/ports/cc3200/bootmgr/bootloader.mk
index 44f1b7f42dfdd..1dc2f8286057d 100644
--- a/ports/cc3200/bootmgr/bootloader.mk
+++ b/ports/cc3200/bootmgr/bootloader.mk
@@ -65,14 +65,14 @@ BOOT_PY_SRC_C = $(addprefix py/,\
 	mpprint.c \
 	)
 
-BOOT_LIB_SRC_C = $(addprefix lib/,\
+BOOT_SHARED_SRC_C = $(addprefix shared/,\
+	libc/printf.c \
 	libc/string0.c \
-	utils/printf.c \
 	)
 
 OBJ  = $(addprefix $(BUILD)/, $(BOOT_HAL_SRC_C:.c=.o) $(BOOT_SL_SRC_C:.c=.o) $(BOOT_CC3100_SRC_C:.c=.o) $(BOOT_UTIL_SRC_C:.c=.o) $(BOOT_MISC_SRC_C:.c=.o))
 OBJ += $(addprefix $(BUILD)/, $(BOOT_MAIN_SRC_C:.c=.o) $(BOOT_MAIN_SRC_S:.s=.o) $(BOOT_PY_SRC_C:.c=.o))
-OBJ += $(addprefix $(BUILD)/, $(BOOT_LIB_SRC_C:.c=.o))
+OBJ += $(addprefix $(BUILD)/, $(BOOT_SHARED_SRC_C:.c=.o))
 
 # Add the linker script
 LINKER_SCRIPT = bootmgr/bootmgr.lds
diff --git a/ports/cc3200/fatfs_port.c b/ports/cc3200/fatfs_port.c
index 993684d8c693c..39b350db60357 100644
--- a/ports/cc3200/fatfs_port.c
+++ b/ports/cc3200/fatfs_port.c
@@ -27,7 +27,7 @@
 
 #include "py/runtime.h"
 #include "lib/oofatfs/ff.h"
-#include "lib/timeutils/timeutils.h"
+#include "shared/timeutils/timeutils.h"
 #include "mods/pybrtc.h"
 
 #if FF_FS_REENTRANT
diff --git a/ports/cc3200/ftp/ftp.c b/ports/cc3200/ftp/ftp.c
index 37680bc939dde..d999e810d9e0a 100644
--- a/ports/cc3200/ftp/ftp.c
+++ b/ports/cc3200/ftp/ftp.c
@@ -28,7 +28,7 @@
 #include <stdio.h>
 
 #include "py/runtime.h"
-#include "lib/timeutils/timeutils.h"
+#include "shared/timeutils/timeutils.h"
 #include "lib/oofatfs/ff.h"
 #include "extmod/vfs.h"
 #include "extmod/vfs_fat.h"
diff --git a/ports/cc3200/mods/moduos.c b/ports/cc3200/mods/moduos.c
index 53521fe66cfc9..8c3dcf696aafa 100644
--- a/ports/cc3200/mods/moduos.c
+++ b/ports/cc3200/mods/moduos.c
@@ -31,7 +31,7 @@
 #include "py/objtuple.h"
 #include "py/objstr.h"
 #include "py/runtime.h"
-#include "lib/timeutils/timeutils.h"
+#include "shared/timeutils/timeutils.h"
 #include "lib/oofatfs/ff.h"
 #include "lib/oofatfs/diskio.h"
 #include "genhdr/mpversion.h"
diff --git a/ports/cc3200/mods/modusocket.c b/ports/cc3200/mods/modusocket.c
index 5dac0a0102387..51815a31f9ff8 100644
--- a/ports/cc3200/mods/modusocket.c
+++ b/ports/cc3200/mods/modusocket.c
@@ -35,7 +35,7 @@
 #include "py/runtime.h"
 #include "py/stream.h"
 #include "py/mphal.h"
-#include "lib/netutils/netutils.h"
+#include "shared/netutils/netutils.h"
 #include "modnetwork.h"
 #include "modusocket.h"
 
diff --git a/ports/cc3200/mods/modutime.c b/ports/cc3200/mods/modutime.c
index e77065ef450db..c5ff6072f59a4 100644
--- a/ports/cc3200/mods/modutime.c
+++ b/ports/cc3200/mods/modutime.c
@@ -33,7 +33,7 @@
 #include "py/obj.h"
 #include "py/smallint.h"
 #include "py/mphal.h"
-#include "lib/timeutils/timeutils.h"
+#include "shared/timeutils/timeutils.h"
 #include "extmod/utime_mphal.h"
 #include "inc/hw_types.h"
 #include "inc/hw_ints.h"
diff --git a/ports/cc3200/mods/modwlan.c b/ports/cc3200/mods/modwlan.c
index 7aa8f0e2c4494..920079b589ae6 100644
--- a/ports/cc3200/mods/modwlan.c
+++ b/ports/cc3200/mods/modwlan.c
@@ -35,8 +35,8 @@
 #include "py/runtime.h"
 #include "py/stream.h"
 #include "py/mphal.h"
-#include "lib/timeutils/timeutils.h"
-#include "lib/netutils/netutils.h"
+#include "shared/timeutils/timeutils.h"
+#include "shared/netutils/netutils.h"
 #include "modnetwork.h"
 #include "modusocket.h"
 #include "modwlan.h"
diff --git a/ports/cc3200/mods/pybrtc.c b/ports/cc3200/mods/pybrtc.c
index f0704eecdaa92..6c1918831c8c2 100644
--- a/ports/cc3200/mods/pybrtc.c
+++ b/ports/cc3200/mods/pybrtc.c
@@ -29,7 +29,7 @@
 #include "py/obj.h"
 #include "py/runtime.h"
 #include "py/mperrno.h"
-#include "lib/timeutils/timeutils.h"
+#include "shared/timeutils/timeutils.h"
 #include "inc/hw_types.h"
 #include "inc/hw_ints.h"
 #include "inc/hw_memmap.h"
diff --git a/ports/cc3200/mods/pybuart.c b/ports/cc3200/mods/pybuart.c
index ac2af7032ee91..b8e8cbb682fab 100644
--- a/ports/cc3200/mods/pybuart.c
+++ b/ports/cc3200/mods/pybuart.c
@@ -33,7 +33,7 @@
 #include "py/objlist.h"
 #include "py/stream.h"
 #include "py/mphal.h"
-#include "lib/utils/interrupt_char.h"
+#include "shared/runtime/interrupt_char.h"
 #include "inc/hw_types.h"
 #include "inc/hw_ints.h"
 #include "inc/hw_memmap.h"
diff --git a/ports/cc3200/mptask.c b/ports/cc3200/mptask.c
index 71b650ff858c8..b764c4712c630 100644
--- a/ports/cc3200/mptask.c
+++ b/ports/cc3200/mptask.c
@@ -33,7 +33,7 @@
 #include "py/runtime.h"
 #include "py/gc.h"
 #include "py/mphal.h"
-#include "lib/mp-readline/readline.h"
+#include "shared/readline/readline.h"
 #include "lib/oofatfs/ff.h"
 #include "lib/oofatfs/diskio.h"
 #include "extmod/vfs.h"
@@ -49,8 +49,8 @@
 #include "pybuart.h"
 #include "pybpin.h"
 #include "pybrtc.h"
-#include "lib/utils/pyexec.h"
-#include "lib/utils/gchelper.h"
+#include "shared/runtime/pyexec.h"
+#include "shared/runtime/gchelper.h"
 #include "gccollect.h"
 #include "mperror.h"
 #include "simplelink.h"
diff --git a/ports/cc3200/telnet/telnet.c b/ports/cc3200/telnet/telnet.c
index 9f51d4cd85959..c4daac3426d1c 100644
--- a/ports/cc3200/telnet/telnet.c
+++ b/ports/cc3200/telnet/telnet.c
@@ -28,7 +28,7 @@
 
 #include "py/runtime.h"
 #include "py/mphal.h"
-#include "lib/utils/interrupt_char.h"
+#include "shared/runtime/interrupt_char.h"
 #include "telnet.h"
 #include "simplelink.h"
 #include "modnetwork.h"
diff --git a/ports/cc3200/util/gccollect.c b/ports/cc3200/util/gccollect.c
index eac0c86b0268d..0ff179e48b1b8 100644
--- a/ports/cc3200/util/gccollect.c
+++ b/ports/cc3200/util/gccollect.c
@@ -30,7 +30,7 @@
 
 #include "py/gc.h"
 #include "py/mpthread.h"
-#include "lib/utils/gchelper.h"
+#include "shared/runtime/gchelper.h"
 #include "gccollect.h"
 
 /******************************************************************************
diff --git a/ports/esp32/fatfs_port.c b/ports/esp32/fatfs_port.c
index 7fce654c0997c..b9ad30a128b86 100644
--- a/ports/esp32/fatfs_port.c
+++ b/ports/esp32/fatfs_port.c
@@ -28,7 +28,7 @@
 
 #include <sys/time.h>
 #include "lib/oofatfs/ff.h"
-#include "lib/timeutils/timeutils.h"
+#include "shared/timeutils/timeutils.h"
 
 DWORD get_fattime(void) {
     struct timeval tv;
diff --git a/ports/esp32/machine_rtc.c b/ports/esp32/machine_rtc.c
index 1b6a71b5b4181..52227c93b8af0 100644
--- a/ports/esp32/machine_rtc.c
+++ b/ports/esp32/machine_rtc.c
@@ -36,7 +36,7 @@
 #include "py/obj.h"
 #include "py/runtime.h"
 #include "py/mphal.h"
-#include "lib/timeutils/timeutils.h"
+#include "shared/timeutils/timeutils.h"
 #include "modmachine.h"
 #include "machine_rtc.h"
 
diff --git a/ports/esp32/main.c b/ports/esp32/main.c
index b04831fff16ca..c1b8e8a31d626 100644
--- a/ports/esp32/main.c
+++ b/ports/esp32/main.c
@@ -54,8 +54,8 @@
 #include "py/repl.h"
 #include "py/gc.h"
 #include "py/mphal.h"
-#include "lib/mp-readline/readline.h"
-#include "lib/utils/pyexec.h"
+#include "shared/readline/readline.h"
+#include "shared/runtime/pyexec.h"
 #include "uart.h"
 #include "usb.h"
 #include "modmachine.h"
diff --git a/ports/esp32/main/CMakeLists.txt b/ports/esp32/main/CMakeLists.txt
index ed72a8d68bccc..f2b3dd4a4f75a 100644
--- a/ports/esp32/main/CMakeLists.txt
+++ b/ports/esp32/main/CMakeLists.txt
@@ -15,21 +15,24 @@ set(MICROPY_QSTRDEFS_PORT
     ${PROJECT_DIR}/qstrdefsport.h
 )
 
+set(MICROPY_SOURCE_SHARED
+    ${MICROPY_DIR}/shared/readline/readline.c
+    ${MICROPY_DIR}/shared/netutils/netutils.c
+    ${MICROPY_DIR}/shared/timeutils/timeutils.c
+    ${MICROPY_DIR}/shared/runtime/interrupt_char.c
+    ${MICROPY_DIR}/shared/runtime/stdout_helpers.c
+    ${MICROPY_DIR}/shared/runtime/sys_stdio_mphal.c
+    ${MICROPY_DIR}/shared/runtime/pyexec.c
+)
+
 set(MICROPY_SOURCE_LIB
     ${MICROPY_DIR}/lib/littlefs/lfs1.c
     ${MICROPY_DIR}/lib/littlefs/lfs1_util.c
     ${MICROPY_DIR}/lib/littlefs/lfs2.c
     ${MICROPY_DIR}/lib/littlefs/lfs2_util.c
     ${MICROPY_DIR}/lib/mbedtls_errors/mp_mbedtls_errors.c
-    ${MICROPY_DIR}/lib/mp-readline/readline.c
-    ${MICROPY_DIR}/lib/netutils/netutils.c
     ${MICROPY_DIR}/lib/oofatfs/ff.c
     ${MICROPY_DIR}/lib/oofatfs/ffunicode.c
-    ${MICROPY_DIR}/lib/timeutils/timeutils.c
-    ${MICROPY_DIR}/lib/utils/interrupt_char.c
-    ${MICROPY_DIR}/lib/utils/stdout_helpers.c
-    ${MICROPY_DIR}/lib/utils/sys_stdio_mphal.c
-    ${MICROPY_DIR}/lib/utils/pyexec.c
 )
 
 set(MICROPY_SOURCE_DRIVERS
@@ -80,6 +83,7 @@ set(MICROPY_SOURCE_QSTR
     ${MICROPY_SOURCE_PY}
     ${MICROPY_SOURCE_EXTMOD}
     ${MICROPY_SOURCE_USERMOD}
+    ${MICROPY_SOURCE_SHARED}
     ${MICROPY_SOURCE_LIB}
     ${MICROPY_SOURCE_PORT}
 )
@@ -142,6 +146,7 @@ idf_component_register(
     SRCS
         ${MICROPY_SOURCE_PY}
         ${MICROPY_SOURCE_EXTMOD}
+        ${MICROPY_SOURCE_SHARED}
         ${MICROPY_SOURCE_LIB}
         ${MICROPY_SOURCE_DRIVERS}
         ${MICROPY_SOURCE_PORT}
diff --git a/ports/esp32/modesp32.c b/ports/esp32/modesp32.c
index 3ed5343380015..042c8b8566f31 100644
--- a/ports/esp32/modesp32.c
+++ b/ports/esp32/modesp32.c
@@ -40,7 +40,7 @@
 #include "py/obj.h"
 #include "py/runtime.h"
 #include "py/mphal.h"
-#include "lib/timeutils/timeutils.h"
+#include "shared/timeutils/timeutils.h"
 #include "modmachine.h"
 #include "machine_rtc.h"
 #include "modesp32.h"
diff --git a/ports/esp32/modmachine.c b/ports/esp32/modmachine.c
index c46f8ab8d7ff3..a4e0724cee2b2 100644
--- a/ports/esp32/modmachine.c
+++ b/ports/esp32/modmachine.c
@@ -49,7 +49,7 @@
 
 #include "py/obj.h"
 #include "py/runtime.h"
-#include "lib/utils/pyexec.h"
+#include "shared/runtime/pyexec.h"
 #include "extmod/machine_mem.h"
 #include "extmod/machine_signal.h"
 #include "extmod/machine_pulse.h"
diff --git a/ports/esp32/modnetwork.c b/ports/esp32/modnetwork.c
index e2bd20a1a9d8f..3977256166d9c 100644
--- a/ports/esp32/modnetwork.c
+++ b/ports/esp32/modnetwork.c
@@ -40,7 +40,7 @@
 #include "py/runtime.h"
 #include "py/mphal.h"
 #include "py/mperrno.h"
-#include "lib/netutils/netutils.h"
+#include "shared/netutils/netutils.h"
 #include "esp_eth.h"
 #include "esp_wifi.h"
 #include "esp_log.h"
diff --git a/ports/esp32/modsocket.c b/ports/esp32/modsocket.c
index 67b1d7d6f0591..be950ac1f65c7 100644
--- a/ports/esp32/modsocket.c
+++ b/ports/esp32/modsocket.c
@@ -45,7 +45,7 @@
 #include "py/mphal.h"
 #include "py/stream.h"
 #include "py/mperrno.h"
-#include "lib/netutils/netutils.h"
+#include "shared/netutils/netutils.h"
 #include "mdns.h"
 #include "modnetwork.h"
 
diff --git a/ports/esp32/modutime.c b/ports/esp32/modutime.c
index cf7178e0b1c2d..f864df678f404 100644
--- a/ports/esp32/modutime.c
+++ b/ports/esp32/modutime.c
@@ -31,7 +31,7 @@
 #include <sys/time.h>
 
 #include "py/runtime.h"
-#include "lib/timeutils/timeutils.h"
+#include "shared/timeutils/timeutils.h"
 #include "extmod/utime_mphal.h"
 
 STATIC mp_obj_t time_localtime(size_t n_args, const mp_obj_t *args) {
diff --git a/ports/esp32/mphalport.c b/ports/esp32/mphalport.c
index db2146d93d2eb..de7fdfcec3bfa 100644
--- a/ports/esp32/mphalport.c
+++ b/ports/esp32/mphalport.c
@@ -47,8 +47,8 @@
 #include "py/mpstate.h"
 #include "py/mphal.h"
 #include "extmod/misc.h"
-#include "lib/timeutils/timeutils.h"
-#include "lib/utils/pyexec.h"
+#include "shared/timeutils/timeutils.h"
+#include "shared/runtime/pyexec.h"
 #include "mphalport.h"
 #include "usb.h"
 
diff --git a/ports/esp32/mphalport.h b/ports/esp32/mphalport.h
index 60cc308d68275..2ba6f96b6a6a3 100644
--- a/ports/esp32/mphalport.h
+++ b/ports/esp32/mphalport.h
@@ -30,7 +30,7 @@
 #define INCLUDED_MPHALPORT_H
 
 #include "py/ringbuf.h"
-#include "lib/utils/interrupt_char.h"
+#include "shared/runtime/interrupt_char.h"
 
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"
diff --git a/ports/esp32/network_ppp.c b/ports/esp32/network_ppp.c
index db2292ca03f7e..d74283c19cf63 100644
--- a/ports/esp32/network_ppp.c
+++ b/ports/esp32/network_ppp.c
@@ -30,7 +30,7 @@
 #include "py/mphal.h"
 #include "py/objtype.h"
 #include "py/stream.h"
-#include "lib/netutils/netutils.h"
+#include "shared/netutils/netutils.h"
 #include "modmachine.h"
 
 #include "netif/ppp/ppp.h"
diff --git a/ports/esp8266/Makefile b/ports/esp8266/Makefile
index 9d6aea603aa84..b54193afef92a 100644
--- a/ports/esp8266/Makefile
+++ b/ports/esp8266/Makefile
@@ -119,8 +119,6 @@ EXTMOD_SRC_C = $(addprefix extmod/,\
         )
 
 LIB_SRC_C = $(addprefix lib/,\
-	embed/__errno.c \
-	libc/string0.c \
 	libm/math.c \
 	libm/fmodf.c \
 	libm/nearbyintf.c \
@@ -140,13 +138,18 @@ LIB_SRC_C = $(addprefix lib/,\
 	libm/atanf.c \
 	libm/atan2f.c \
 	libm/roundf.c \
-	mp-readline/readline.c \
+	)
+
+SHARED_SRC_C = $(addprefix shared/,\
+	libc/__errno.c \
+	libc/string0.c \
 	netutils/netutils.c \
+	readline/readline.c \
+	runtime/interrupt_char.c \
+	runtime/pyexec.c \
+	runtime/stdout_helpers.c \
+	runtime/sys_stdio_mphal.c \
 	timeutils/timeutils.c \
-	utils/pyexec.c \
-	utils/interrupt_char.c \
-	utils/stdout_helpers.c \
-	utils/sys_stdio_mphal.c \
 	)
 
 DRIVERS_SRC_C = $(addprefix drivers/,\
@@ -162,11 +165,12 @@ OBJ += $(PY_O)
 OBJ += $(addprefix $(BUILD)/, $(SRC_C:.c=.o))
 OBJ += $(addprefix $(BUILD)/, $(SRC_S:.s=.o))
 OBJ += $(addprefix $(BUILD)/, $(EXTMOD_SRC_C:.c=.o))
+OBJ += $(addprefix $(BUILD)/, $(SHARED_SRC_C:.c=.o))
 OBJ += $(addprefix $(BUILD)/, $(LIB_SRC_C:.c=.o))
 OBJ += $(addprefix $(BUILD)/, $(DRIVERS_SRC_C:.c=.o))
 
 # List of sources for qstr extraction
-SRC_QSTR += $(SRC_C) $(EXTMOD_SRC_C) $(LIB_SRC_C) $(DRIVERS_SRC_C)
+SRC_QSTR += $(SRC_C) $(EXTMOD_SRC_C) $(SHARED_SRC_C) $(DRIVERS_SRC_C)
 # Append any auto-generated sources that are needed by sources listed in SRC_QSTR
 SRC_QSTR_AUTO_DEPS +=
 
diff --git a/ports/esp8266/boards/esp8266_common.ld b/ports/esp8266/boards/esp8266_common.ld
index c6e37d942c6bf..f40ff1e5fce14 100644
--- a/ports/esp8266/boards/esp8266_common.ld
+++ b/ports/esp8266/boards/esp8266_common.ld
@@ -134,14 +134,14 @@ SECTIONS
         *lib/berkeley-db-1.xx/*.o(.literal*, .text*)
         *lib/libm/*.o*(.literal*, .text*)
         *lib/littlefs/*.o*(.literal*, .text*)
-        *lib/mp-readline/*.o(.literal*, .text*)
-        *lib/netutils/*.o*(.literal*, .text*)
-        *lib/timeutils/*.o*(.literal*, .text*)
-        *lib/utils/printf.o*(.literal*, .text*)
-        *lib/utils/sys_stdio_mphal.o*(.literal*, .text*)
-        *lib/utils/pyexec.o*(.literal*, .text*)
-        *lib/utils/stdout_helpers.o*(.literal*, .text*)
-        *lib/utils/interrupt_char.o*(.literal*, .text*)
+        *shared/libc/printf.o*(.literal*, .text*)
+        *shared/netutils/*.o*(.literal*, .text*)
+        *shared/readline/*.o(.literal*, .text*)
+        *shared/runtime/interrupt_char.o*(.literal*, .text*)
+        *shared/runtime/pyexec.o*(.literal*, .text*)
+        *shared/runtime/stdout_helpers.o*(.literal*, .text*)
+        *shared/runtime/sys_stdio_mphal.o*(.literal*, .text*)
+        *shared/timeutils/*.o*(.literal*, .text*)
         *drivers/bus/*.o(.literal* .text*)
 
         build-*/main.o(.literal* .text*)
diff --git a/ports/esp8266/esp_mphal.c b/ports/esp8266/esp_mphal.c
index 06e6cd0af5edd..3cb4807333c4a 100644
--- a/ports/esp8266/esp_mphal.c
+++ b/ports/esp8266/esp_mphal.c
@@ -34,7 +34,7 @@
 #include "py/runtime.h"
 #include "py/stream.h"
 #include "extmod/misc.h"
-#include "lib/utils/pyexec.h"
+#include "shared/runtime/pyexec.h"
 
 STATIC byte stdin_ringbuf_array[256];
 ringbuf_t stdin_ringbuf = {stdin_ringbuf_array, sizeof(stdin_ringbuf_array), 0, 0};
diff --git a/ports/esp8266/esp_mphal.h b/ports/esp8266/esp_mphal.h
index e9cf7e548d3fa..b0351877e8cfd 100644
--- a/ports/esp8266/esp_mphal.h
+++ b/ports/esp8266/esp_mphal.h
@@ -26,7 +26,7 @@
 
 #include "user_interface.h"
 #include "py/ringbuf.h"
-#include "lib/utils/interrupt_char.h"
+#include "shared/runtime/interrupt_char.h"
 #include "xtirq.h"
 
 void mp_sched_keyboard_interrupt(void);
diff --git a/ports/esp8266/fatfs_port.c b/ports/esp8266/fatfs_port.c
index bbd10519359a0..3ffc90040c182 100644
--- a/ports/esp8266/fatfs_port.c
+++ b/ports/esp8266/fatfs_port.c
@@ -25,7 +25,7 @@
  */
 
 #include "py/obj.h"
-#include "lib/timeutils/timeutils.h"
+#include "shared/timeutils/timeutils.h"
 #include "lib/oofatfs/ff.h"
 #include "modmachine.h"
 
diff --git a/ports/esp8266/machine_rtc.c b/ports/esp8266/machine_rtc.c
index e7b750fd92c8d..38049ce724939 100644
--- a/ports/esp8266/machine_rtc.c
+++ b/ports/esp8266/machine_rtc.c
@@ -28,7 +28,7 @@
 #include <string.h>
 
 #include "py/runtime.h"
-#include "lib/timeutils/timeutils.h"
+#include "shared/timeutils/timeutils.h"
 #include "user_interface.h"
 #include "modmachine.h"
 
diff --git a/ports/esp8266/main.c b/ports/esp8266/main.c
index a73fbbcf5f25f..404188346cc00 100644
--- a/ports/esp8266/main.c
+++ b/ports/esp8266/main.c
@@ -39,8 +39,8 @@
 #define USE_US_TIMER 1
 
 #include "extmod/misc.h"
-#include "lib/mp-readline/readline.h"
-#include "lib/utils/pyexec.h"
+#include "shared/readline/readline.h"
+#include "shared/runtime/pyexec.h"
 #include "gccollect.h"
 #include "user_interface.h"
 
diff --git a/ports/esp8266/modmachine.c b/ports/esp8266/modmachine.c
index 86c1d728d5369..2b1f0f0835224 100644
--- a/ports/esp8266/modmachine.c
+++ b/ports/esp8266/modmachine.c
@@ -30,7 +30,7 @@
 
 #include "py/obj.h"
 #include "py/runtime.h"
-#include "lib/utils/pyexec.h"
+#include "shared/runtime/pyexec.h"
 
 // This needs to be set before we include the RTOS headers
 #define USE_US_TIMER 1
diff --git a/ports/esp8266/modnetwork.c b/ports/esp8266/modnetwork.c
index 8d153acf0fe33..949aeba1069df 100644
--- a/ports/esp8266/modnetwork.c
+++ b/ports/esp8266/modnetwork.c
@@ -31,7 +31,7 @@
 #include "py/objlist.h"
 #include "py/runtime.h"
 #include "py/mphal.h"
-#include "lib/netutils/netutils.h"
+#include "shared/netutils/netutils.h"
 #include "queue.h"
 #include "user_interface.h"
 #include "espconn.h"
diff --git a/ports/esp8266/modutime.c b/ports/esp8266/modutime.c
index bcfbf7baf2c66..1d4ecc05f2ada 100644
--- a/ports/esp8266/modutime.c
+++ b/ports/esp8266/modutime.c
@@ -32,7 +32,7 @@
 #include "py/runtime.h"
 #include "py/mphal.h"
 #include "py/smallint.h"
-#include "lib/timeutils/timeutils.h"
+#include "shared/timeutils/timeutils.h"
 #include "modmachine.h"
 #include "user_interface.h"
 #include "extmod/utime_mphal.h"
diff --git a/ports/esp8266/uart.c b/ports/esp8266/uart.c
index 5ac71da07df1a..978a7efc38edf 100644
--- a/ports/esp8266/uart.c
+++ b/ports/esp8266/uart.c
@@ -285,7 +285,7 @@ void ICACHE_FLASH_ATTR uart0_set_rxbuf(uint8 *buf, int len) {
 // Task-based UART interface
 
 #include "py/obj.h"
-#include "lib/utils/pyexec.h"
+#include "shared/runtime/pyexec.h"
 
 #if MICROPY_REPL_EVENT_DRIVEN
 void ICACHE_FLASH_ATTR uart_task_handler(os_event_t *evt) {
diff --git a/ports/javascript/Makefile b/ports/javascript/Makefile
index 9cc45d3ef941e..34bbe5f2f7c06 100644
--- a/ports/javascript/Makefile
+++ b/ports/javascript/Makefile
@@ -24,11 +24,11 @@ CFLAGS += -DMICROPY_QSTR_EXTRA_POOL=mp_qstr_frozen_const_pool
 CFLAGS += -DMICROPY_MODULE_FROZEN_MPY
 endif
 
-SRC_LIB = $(addprefix lib/,\
-	utils/interrupt_char.c \
-	utils/stdout_helpers.c \
-	utils/pyexec.c \
-	mp-readline/readline.c \
+SRC_SHARED = $(addprefix shared/,\
+	runtime/interrupt_char.c \
+	runtime/stdout_helpers.c \
+	runtime/pyexec.c \
+	readline/readline.c \
 	)
 
 SRC_C = \
@@ -39,7 +39,7 @@ SRC_C = \
 SRC_QSTR += $(SRC_C)
 
 OBJ += $(PY_O)
-OBJ += $(addprefix $(BUILD)/, $(SRC_LIB:.c=.o))
+OBJ += $(addprefix $(BUILD)/, $(SRC_SHARED:.c=.o))
 OBJ += $(addprefix $(BUILD)/, $(SRC_C:.c=.o))
 
 JSFLAGS += -s ASYNCIFY
diff --git a/ports/javascript/main.c b/ports/javascript/main.c
index c56f1a2cba8e3..7a04b8eea3078 100644
--- a/ports/javascript/main.c
+++ b/ports/javascript/main.c
@@ -34,7 +34,7 @@
 #include "py/repl.h"
 #include "py/gc.h"
 #include "py/mperrno.h"
-#include "lib/utils/pyexec.h"
+#include "shared/runtime/pyexec.h"
 
 #include "emscripten.h"
 #include "library.h"
diff --git a/ports/javascript/modutime.c b/ports/javascript/modutime.c
index d05d832ab153d..05ff8b22f37b7 100644
--- a/ports/javascript/modutime.c
+++ b/ports/javascript/modutime.c
@@ -32,7 +32,7 @@
 #include "py/smallint.h"
 #include "py/obj.h"
 #include "py/runtime.h"
-#include "lib/timeutils/timeutils.h"
+#include "shared/timeutils/timeutils.h"
 #include "extmod/utime_mphal.h"
 
 STATIC const mp_rom_map_elem_t time_module_globals_table[] = {
diff --git a/ports/javascript/mphalport.h b/ports/javascript/mphalport.h
index 614ce8526a032..3e2c439f32784 100644
--- a/ports/javascript/mphalport.h
+++ b/ports/javascript/mphalport.h
@@ -25,7 +25,7 @@
  */
 
 #include "py/obj.h"
-#include "lib/utils/interrupt_char.h"
+#include "shared/runtime/interrupt_char.h"
 
 #define mp_hal_stdin_rx_chr() (0)
 void mp_hal_stdout_tx_strn(const char *str, size_t len);
diff --git a/ports/mimxrt/Makefile b/ports/mimxrt/Makefile
index fdb1325fddcbb..64d9864cbbf8c 100644
--- a/ports/mimxrt/Makefile
+++ b/ports/mimxrt/Makefile
@@ -155,15 +155,15 @@ SRC_C = \
 	moduos.c \
 	mphalport.c \
 	hal/flexspi_nor_flash.c \
-	lib/mp-readline/readline.c \
-	lib/libc/string0.c \
-	lib/timeutils/timeutils.c \
-	lib/utils/gchelper_native.c \
-	lib/utils/mpirq.c \
-	lib/utils/printf.c \
-	lib/utils/pyexec.c \
-	lib/utils/stdout_helpers.c \
-	lib/utils/sys_stdio_mphal.c \
+	shared/libc/printf.c \
+	shared/libc/string0.c \
+	shared/readline/readline.c \
+	shared/runtime/gchelper_native.c \
+	shared/runtime/mpirq.c \
+	shared/runtime/pyexec.c \
+	shared/runtime/stdout_helpers.c \
+	shared/runtime/sys_stdio_mphal.c \
+	shared/timeutils/timeutils.c \
 	drivers/bus/softspi.c \
 	extmod/modonewire.c \
 	$(SRC_TINYUSB_C) \
@@ -264,7 +264,7 @@ endif
 
 SRC_SS = $(MCU_DIR)/gcc/startup_$(MCU_SERIES).S
 
-SRC_S = lib/utils/gchelper_m3.s \
+SRC_S = shared/runtime/gchelper_m3.s \
 
 # List of sources for qstr extraction
 SRC_QSTR += \
@@ -281,8 +281,8 @@ SRC_QSTR += \
 	modmimxrt.c \
 	moduos.c \
 	pin.c \
-	lib/utils/mpirq.c \
-	lib/utils/sys_stdio_mphal.c \
+	shared/runtime/mpirq.c \
+	shared/runtime/sys_stdio_mphal.c \
 	extmod/modonewire.c \
 	$(GEN_PINS_SRC) \
 
diff --git a/ports/mimxrt/machine_pin.c b/ports/mimxrt/machine_pin.c
index dc26cdfc1236a..3a1151ba81861 100644
--- a/ports/mimxrt/machine_pin.c
+++ b/ports/mimxrt/machine_pin.c
@@ -31,7 +31,7 @@
 
 #include "py/runtime.h"
 #include "py/mphal.h"
-#include "lib/utils/mpirq.h"
+#include "shared/runtime/mpirq.h"
 #include "pin.h"
 
 // Local functions
diff --git a/ports/mimxrt/machine_rtc.c b/ports/mimxrt/machine_rtc.c
index d00d139f79078..f08e73fa550e0 100644
--- a/ports/mimxrt/machine_rtc.c
+++ b/ports/mimxrt/machine_rtc.c
@@ -26,7 +26,7 @@
  */
 
 #include "py/runtime.h"
-#include "lib/timeutils/timeutils.h"
+#include "shared/timeutils/timeutils.h"
 #include "modmachine.h"
 #include "ticks.h"
 #include "fsl_snvs_lp.h"
diff --git a/ports/mimxrt/main.c b/ports/mimxrt/main.c
index c93e89c8ab3c4..e81974afaa7e2 100644
--- a/ports/mimxrt/main.c
+++ b/ports/mimxrt/main.c
@@ -30,9 +30,9 @@
 #include "py/gc.h"
 #include "py/mperrno.h"
 #include "py/stackctrl.h"
-#include "lib/mp-readline/readline.h"
-#include "lib/utils/gchelper.h"
-#include "lib/utils/pyexec.h"
+#include "shared/readline/readline.h"
+#include "shared/runtime/gchelper.h"
+#include "shared/runtime/pyexec.h"
 #include "ticks.h"
 #include "tusb.h"
 #include "led.h"
diff --git a/ports/mimxrt/modutime.c b/ports/mimxrt/modutime.c
index 2a88a4224bcd4..d3be7c2ea6d96 100644
--- a/ports/mimxrt/modutime.c
+++ b/ports/mimxrt/modutime.c
@@ -26,7 +26,7 @@
  */
 
 #include "py/runtime.h"
-#include "lib/timeutils/timeutils.h"
+#include "shared/timeutils/timeutils.h"
 #include "extmod/utime_mphal.h"
 #include "fsl_snvs_lp.h"
 
diff --git a/ports/mimxrt/mphalport.c b/ports/mimxrt/mphalport.c
index 942deae5b709f..ff7e988dfff86 100644
--- a/ports/mimxrt/mphalport.c
+++ b/ports/mimxrt/mphalport.c
@@ -28,7 +28,7 @@
 #include "py/runtime.h"
 #include "py/stream.h"
 #include "py/mphal.h"
-#include "lib/timeutils/timeutils.h"
+#include "shared/timeutils/timeutils.h"
 #include "ticks.h"
 #include "tusb.h"
 #include "fsl_snvs_lp.h"
diff --git a/ports/mimxrt/pin.h b/ports/mimxrt/pin.h
index ace4d184361d6..8d80490d1c464 100644
--- a/ports/mimxrt/pin.h
+++ b/ports/mimxrt/pin.h
@@ -29,7 +29,7 @@
 
 #include <stdint.h>
 #include "py/obj.h"
-#include "lib/utils/mpirq.h"
+#include "shared/runtime/mpirq.h"
 #include "fsl_gpio.h"
 
 // ------------------------------------------------------------------------------------------------------------------ //
diff --git a/ports/minimal/Makefile b/ports/minimal/Makefile
index bce544ec176b5..0e79d581bed02 100644
--- a/ports/minimal/Makefile
+++ b/ports/minimal/Makefile
@@ -46,14 +46,14 @@ LIBS =
 SRC_C = \
 	main.c \
 	uart_core.c \
-	lib/utils/printf.c \
-	lib/utils/stdout_helpers.c \
-	lib/utils/pyexec.c \
-	lib/mp-readline/readline.c \
+	shared/libc/printf.c \
+	shared/readline/readline.c \
+	shared/runtime/pyexec.c \
+	shared/runtime/stdout_helpers.c \
 	$(BUILD)/_frozen_mpy.c \
 
 ifeq ($(CROSS), 1)
-SRC_C += lib/libc/string0.c
+SRC_C += shared/libc/string0.c
 endif
 
 OBJ = $(PY_CORE_O) $(addprefix $(BUILD)/, $(SRC_C:.c=.o))
diff --git a/ports/minimal/main.c b/ports/minimal/main.c
index aa6d10ee3750c..006ca0a4d0cc2 100644
--- a/ports/minimal/main.c
+++ b/ports/minimal/main.c
@@ -7,7 +7,7 @@
 #include "py/repl.h"
 #include "py/gc.h"
 #include "py/mperrno.h"
-#include "lib/utils/pyexec.h"
+#include "shared/runtime/pyexec.h"
 
 #if MICROPY_ENABLE_COMPILER
 void do_str(const char *src, mp_parse_input_kind_t input_kind) {
diff --git a/ports/nrf/Makefile b/ports/nrf/Makefile
index a3f914dbc13f4..7428ab82c0993 100644
--- a/ports/nrf/Makefile
+++ b/ports/nrf/Makefile
@@ -70,7 +70,7 @@ INC += -I./modules/ubluepy
 INC += -I./modules/music
 INC += -I./modules/ble
 INC += -I./modules/board
-INC += -I../../lib/mp-readline
+INC += -I../../shared/readline
 INC += -I./drivers/bluetooth
 INC += -I./drivers
 INC += -I../../lib/nrfx/
@@ -216,12 +216,12 @@ include drivers/secureboot/secureboot.mk
 
 endif
 
-SRC_LIB += $(addprefix lib/,\
+SRC_LIB += $(addprefix shared/,\
 	libc/string0.c \
-	mp-readline/readline.c \
-	utils/pyexec.c \
-	utils/sys_stdio_mphal.c \
-	utils/interrupt_char.c \
+	readline/readline.c \
+	runtime/pyexec.c \
+	runtime/sys_stdio_mphal.c \
+	runtime/interrupt_char.c \
 	timeutils/timeutils.c \
 	)
 
diff --git a/ports/nrf/drivers/bluetooth/ble_uart.c b/ports/nrf/drivers/bluetooth/ble_uart.c
index 96c2025d0ff71..c3712fe8c978f 100644
--- a/ports/nrf/drivers/bluetooth/ble_uart.c
+++ b/ports/nrf/drivers/bluetooth/ble_uart.c
@@ -30,7 +30,7 @@
 #include "ble_uart.h"
 #include "ringbuffer.h"
 #include "mphalport.h"
-#include "lib/utils/interrupt_char.h"
+#include "shared/runtime/interrupt_char.h"
 #include "py/runtime.h"
 
 #if MICROPY_PY_SYS_STDFILES
diff --git a/ports/nrf/main.c b/ports/nrf/main.c
index 86ba83342b9f3..3de5a310f06fe 100644
--- a/ports/nrf/main.c
+++ b/ports/nrf/main.c
@@ -38,7 +38,7 @@
 #include "py/stackctrl.h"
 #include "py/gc.h"
 #include "py/compile.h"
-#include "lib/utils/pyexec.h"
+#include "shared/runtime/pyexec.h"
 #include "readline.h"
 #include "gccollect.h"
 #include "modmachine.h"
diff --git a/ports/nrf/modules/board/modboard.c b/ports/nrf/modules/board/modboard.c
index 5f59a52a6b868..647af5035bc30 100644
--- a/ports/nrf/modules/board/modboard.c
+++ b/ports/nrf/modules/board/modboard.c
@@ -25,7 +25,7 @@
  */
 
 #include "py/builtin.h"
-#include "lib/utils/pyexec.h"
+#include "shared/runtime/pyexec.h"
 #include "py/runtime.h"
 #include "py/obj.h"
 #include "led.h"
diff --git a/ports/nrf/modules/machine/modmachine.c b/ports/nrf/modules/machine/modmachine.c
index 7e45b83df8173..fb3267e0dbaf3 100644
--- a/ports/nrf/modules/machine/modmachine.c
+++ b/ports/nrf/modules/machine/modmachine.c
@@ -33,7 +33,7 @@
 #include "extmod/machine_mem.h"
 #include "extmod/machine_pulse.h"
 #include "extmod/machine_i2c.h"
-#include "lib/utils/pyexec.h"
+#include "shared/runtime/pyexec.h"
 #include "lib/oofatfs/ff.h"
 #include "lib/oofatfs/diskio.h"
 #include "gccollect.h"
diff --git a/ports/nrf/modules/machine/uart.c b/ports/nrf/modules/machine/uart.c
index af95ae4b8d985..2cc421aa1f333 100644
--- a/ports/nrf/modules/machine/uart.c
+++ b/ports/nrf/modules/machine/uart.c
@@ -38,7 +38,7 @@
 #include "py/ringbuf.h"
 #include "pin.h"
 #include "genhdr/pins.h"
-#include "lib/utils/interrupt_char.h"
+#include "shared/runtime/interrupt_char.h"
 
 #include "uart.h"
 #include "mpconfigboard.h"
diff --git a/ports/pic16bit/Makefile b/ports/pic16bit/Makefile
index 3c2bd54ea231f..f0d55ec875e35 100644
--- a/ports/pic16bit/Makefile
+++ b/ports/pic16bit/Makefile
@@ -39,9 +39,9 @@ SRC_C = \
 	modpyb.c \
 	modpybled.c \
 	modpybswitch.c \
-	lib/utils/pyexec.c \
-	lib/utils/sys_stdio_mphal.c \
-	lib/mp-readline/readline.c \
+	shared/runtime/pyexec.c \
+	shared/runtime/sys_stdio_mphal.c \
+	shared/readline/readline.c \
 
 SRC_S = \
 #	gchelper.s \
diff --git a/ports/pic16bit/main.c b/ports/pic16bit/main.c
index 07db3f58270c6..adb9276071dad 100644
--- a/ports/pic16bit/main.c
+++ b/ports/pic16bit/main.c
@@ -34,8 +34,8 @@
 #include "py/gc.h"
 #include "py/mphal.h"
 #include "py/mperrno.h"
-#include "lib/utils/pyexec.h"
-#include "lib/mp-readline/readline.h"
+#include "shared/runtime/pyexec.h"
+#include "shared/readline/readline.h"
 #include "board.h"
 #include "modpyb.h"
 
diff --git a/ports/powerpc/Makefile b/ports/powerpc/Makefile
index 1f5ec80d43653..cca170dc022df 100644
--- a/ports/powerpc/Makefile
+++ b/ports/powerpc/Makefile
@@ -34,11 +34,11 @@ LIBS =
 SRC_C = \
 	main.c \
 	uart_$(UART).c \
-	lib/utils/printf.c \
-	lib/utils/stdout_helpers.c \
-	lib/utils/pyexec.c \
-	lib/libc/string0.c \
-	lib/mp-readline/readline.c \
+	shared/libc/printf.c \
+	shared/libc/string0.c \
+	shared/readline/readline.c \
+	shared/runtime/pyexec.c \
+	shared/runtime/stdout_helpers.c \
 	$(BUILD)/_frozen_mpy.c \
 
 OBJ = $(PY_CORE_O)
diff --git a/ports/powerpc/main.c b/ports/powerpc/main.c
index fdeec13abe0a5..a66d737c1391e 100644
--- a/ports/powerpc/main.c
+++ b/ports/powerpc/main.c
@@ -32,7 +32,7 @@
 #include "py/gc.h"
 #include "py/mperrno.h"
 #include "py/stackctrl.h"
-#include "lib/utils/pyexec.h"
+#include "shared/runtime/pyexec.h"
 
 void __stack_chk_fail(void);
 void __stack_chk_fail(void) {
diff --git a/ports/qemu-arm/Makefile b/ports/qemu-arm/Makefile
index 22d0bf39cd961..4a6d63a0148a7 100644
--- a/ports/qemu-arm/Makefile
+++ b/ports/qemu-arm/Makefile
@@ -16,7 +16,7 @@ ifeq ($(BOARD),netduino2)
 CFLAGS += -mthumb -mcpu=cortex-m3 -mfloat-abi=soft
 CFLAGS += -DQEMU_SOC_STM32
 LDSCRIPT = stm32.ld
-SRC_BOARD_O = lib/utils/gchelper_native.o lib/utils/gchelper_m3.o
+SRC_BOARD_O = shared/runtime/gchelper_native.o shared/runtime/gchelper_m3.o
 MPY_CROSS_FLAGS += -march=armv7m
 endif
 
@@ -25,7 +25,7 @@ CFLAGS += -mthumb -mcpu=cortex-m0 -mfloat-abi=soft
 CFLAGS += -DQEMU_SOC_NRF51
 LDSCRIPT = nrf51.ld
 QEMU_EXTRA = -global nrf51-soc.flash-size=1048576 -global nrf51-soc.sram-size=262144
-SRC_BOARD_O = lib/utils/gchelper_native.o lib/utils/gchelper_m0.o
+SRC_BOARD_O = shared/runtime/gchelper_native.o shared/runtime/gchelper_m0.o
 MPY_CROSS_FLAGS += -march=armv7m
 endif
 
@@ -33,7 +33,7 @@ ifeq ($(BOARD),mps2-an385)
 CFLAGS += -mthumb -mcpu=cortex-m3 -mfloat-abi=soft
 CFLAGS += -DQEMU_SOC_MPS2
 LDSCRIPT = mps2.ld
-SRC_BOARD_O = lib/utils/gchelper_native.o lib/utils/gchelper_m3.o
+SRC_BOARD_O = shared/runtime/gchelper_native.o shared/runtime/gchelper_m3.o
 MPY_CROSS_FLAGS += -march=armv7m
 endif
 
@@ -42,7 +42,7 @@ CFLAGS += -mcpu=cortex-a9
 CFLAGS += -DQEMU_SOC_IMX6
 LDSCRIPT = imx6.ld
 QEMU_EXTRA = -m 128M
-SRC_BOARD_O = lib/utils/gchelper_generic.o
+SRC_BOARD_O = shared/runtime/gchelper_generic.o
 # It's really armv7a but closest supported value is armv6.
 MPY_CROSS_FLAGS += -march=armv6
 endif
@@ -79,6 +79,8 @@ SRC_COMMON_C = \
 	uart.c \
 	moduos.c \
 	modmachine.c \
+	shared/libc/string0.c \
+	shared/runtime/sys_stdio_mphal.c \
 
 SRC_RUN_C = \
 	main.c \
@@ -88,7 +90,6 @@ SRC_TEST_C = \
 	lib/tinytest/tinytest.c \
 
 LIB_SRC_C += $(addprefix lib/,\
-	libc/string0.c \
 	libm/math.c \
 	libm/fmodf.c \
 	libm/nearbyintf.c \
@@ -108,7 +109,6 @@ LIB_SRC_C += $(addprefix lib/,\
 	libm/atanf.c \
 	libm/atan2f.c \
 	libm/roundf.c \
-	utils/sys_stdio_mphal.c \
 	)
 
 OBJ_COMMON =
diff --git a/ports/qemu-arm/Makefile.test b/ports/qemu-arm/Makefile.test
index b4ad6114b8046..e0f3a541695d8 100644
--- a/ports/qemu-arm/Makefile.test
+++ b/ports/qemu-arm/Makefile.test
@@ -1,4 +1,4 @@
-LIB_SRC_C = lib/upytesthelper/upytesthelper.c
+LIB_SRC_C = shared/upytesthelper/upytesthelper.c
 
 FROZEN_MANIFEST ?= "freeze('test-frzmpy')"
 
diff --git a/ports/qemu-arm/mpconfigport.h b/ports/qemu-arm/mpconfigport.h
index 1f05719caad9c..270995979c0a7 100644
--- a/ports/qemu-arm/mpconfigport.h
+++ b/ports/qemu-arm/mpconfigport.h
@@ -74,7 +74,7 @@ extern const struct _mp_obj_module_t mp_module_uos;
 #include <alloca.h>
 
 #ifdef TEST
-#include "lib/upytesthelper/upytesthelper.h"
+#include "shared/upytesthelper/upytesthelper.h"
 #undef MP_PLAT_PRINT_STRN
 #define MP_PLAT_PRINT_STRN(str, len) upytest_output(str, len)
 #endif
diff --git a/ports/qemu-arm/test_main.c b/ports/qemu-arm/test_main.c
index a59a8de0ad31a..284b287311ccd 100644
--- a/ports/qemu-arm/test_main.c
+++ b/ports/qemu-arm/test_main.c
@@ -11,7 +11,7 @@
 #include "py/stackctrl.h"
 #include "py/gc.h"
 #include "py/mperrno.h"
-#include "lib/utils/gchelper.h"
+#include "shared/runtime/gchelper.h"
 #include "lib/tinytest/tinytest.h"
 #include "lib/tinytest/tinytest_macros.h"
 
diff --git a/ports/rp2/CMakeLists.txt b/ports/rp2/CMakeLists.txt
index eb2b3d2a2597f..3dea793ef9cf2 100644
--- a/ports/rp2/CMakeLists.txt
+++ b/ports/rp2/CMakeLists.txt
@@ -64,16 +64,16 @@ set(MICROPY_SOURCE_LIB
     ${MICROPY_DIR}/lib/littlefs/lfs1_util.c
     ${MICROPY_DIR}/lib/littlefs/lfs2.c
     ${MICROPY_DIR}/lib/littlefs/lfs2_util.c
-    ${MICROPY_DIR}/lib/mp-readline/readline.c
     ${MICROPY_DIR}/lib/oofatfs/ff.c
     ${MICROPY_DIR}/lib/oofatfs/ffunicode.c
-    ${MICROPY_DIR}/lib/timeutils/timeutils.c
-    ${MICROPY_DIR}/lib/utils/gchelper_m0.s
-    ${MICROPY_DIR}/lib/utils/gchelper_native.c
-    ${MICROPY_DIR}/lib/utils/mpirq.c
-    ${MICROPY_DIR}/lib/utils/pyexec.c
-    ${MICROPY_DIR}/lib/utils/stdout_helpers.c
-    ${MICROPY_DIR}/lib/utils/sys_stdio_mphal.c
+    ${MICROPY_DIR}/shared/readline/readline.c
+    ${MICROPY_DIR}/shared/runtime/gchelper_m0.s
+    ${MICROPY_DIR}/shared/runtime/gchelper_native.c
+    ${MICROPY_DIR}/shared/runtime/mpirq.c
+    ${MICROPY_DIR}/shared/runtime/pyexec.c
+    ${MICROPY_DIR}/shared/runtime/stdout_helpers.c
+    ${MICROPY_DIR}/shared/runtime/sys_stdio_mphal.c
+    ${MICROPY_DIR}/shared/timeutils/timeutils.c
 )
 
 set(MICROPY_SOURCE_DRIVERS
@@ -108,8 +108,8 @@ set(MICROPY_SOURCE_QSTR
     ${MICROPY_SOURCE_PY}
     ${MICROPY_SOURCE_EXTMOD}
     ${MICROPY_SOURCE_USERMOD}
-    ${MICROPY_DIR}/lib/utils/mpirq.c
-    ${MICROPY_DIR}/lib/utils/sys_stdio_mphal.c
+    ${MICROPY_DIR}/shared/runtime/mpirq.c
+    ${MICROPY_DIR}/shared/runtime/sys_stdio_mphal.c
     ${PROJECT_SOURCE_DIR}/machine_adc.c
     ${PROJECT_SOURCE_DIR}/machine_i2c.c
     ${PROJECT_SOURCE_DIR}/machine_pin.c
diff --git a/ports/rp2/machine_pin.c b/ports/rp2/machine_pin.c
index 0525e0f9f68bd..aa3cad6ef0404 100644
--- a/ports/rp2/machine_pin.c
+++ b/ports/rp2/machine_pin.c
@@ -29,7 +29,7 @@
 
 #include "py/runtime.h"
 #include "py/mphal.h"
-#include "lib/utils/mpirq.h"
+#include "shared/runtime/mpirq.h"
 #include "modmachine.h"
 #include "extmod/virtpin.h"
 
diff --git a/ports/rp2/machine_rtc.c b/ports/rp2/machine_rtc.c
index a7c55b616b175..9d59124a66e1f 100644
--- a/ports/rp2/machine_rtc.c
+++ b/ports/rp2/machine_rtc.c
@@ -35,7 +35,7 @@
 #include "py/runtime.h"
 #include "py/mphal.h"
 #include "py/mperrno.h"
-#include "lib/timeutils/timeutils.h"
+#include "shared/timeutils/timeutils.h"
 #include "hardware/rtc.h"
 #include "pico/util/datetime.h"
 #include "modmachine.h"
diff --git a/ports/rp2/main.c b/ports/rp2/main.c
index 8c5772171aac9..e615f69112940 100644
--- a/ports/rp2/main.c
+++ b/ports/rp2/main.c
@@ -32,9 +32,9 @@
 #include "py/mperrno.h"
 #include "py/mphal.h"
 #include "py/stackctrl.h"
-#include "lib/mp-readline/readline.h"
-#include "lib/utils/gchelper.h"
-#include "lib/utils/pyexec.h"
+#include "shared/readline/readline.h"
+#include "shared/runtime/gchelper.h"
+#include "shared/runtime/pyexec.h"
 #include "tusb.h"
 #include "uart.h"
 #include "modmachine.h"
diff --git a/ports/rp2/modmachine.c b/ports/rp2/modmachine.c
index 3656a7db5a448..1b2b2adad7b80 100644
--- a/ports/rp2/modmachine.c
+++ b/ports/rp2/modmachine.c
@@ -26,7 +26,7 @@
 
 #include "py/runtime.h"
 #include "py/mphal.h"
-#include "lib/utils/pyexec.h"
+#include "shared/runtime/pyexec.h"
 #include "extmod/machine_i2c.h"
 #include "extmod/machine_mem.h"
 #include "extmod/machine_pulse.h"
diff --git a/ports/rp2/modutime.c b/ports/rp2/modutime.c
index 4835a0ee11e63..8041ae65b63cc 100644
--- a/ports/rp2/modutime.c
+++ b/ports/rp2/modutime.c
@@ -25,7 +25,7 @@
  */
 
 #include "py/runtime.h"
-#include "lib/timeutils/timeutils.h"
+#include "shared/timeutils/timeutils.h"
 #include "extmod/utime_mphal.h"
 #include "hardware/rtc.h"
 
diff --git a/ports/rp2/mphalport.c b/ports/rp2/mphalport.c
index 1d77bc8f5d676..3385323db0c63 100644
--- a/ports/rp2/mphalport.c
+++ b/ports/rp2/mphalport.c
@@ -27,7 +27,7 @@
 #include "py/runtime.h"
 #include "py/stream.h"
 #include "py/mphal.h"
-#include "lib/timeutils/timeutils.h"
+#include "shared/timeutils/timeutils.h"
 #include "tusb.h"
 #include "uart.h"
 #include "hardware/rtc.h"
diff --git a/ports/rp2/rp2_pio.c b/ports/rp2/rp2_pio.c
index 44928c0a885a9..414fa8bd70c1e 100644
--- a/ports/rp2/rp2_pio.c
+++ b/ports/rp2/rp2_pio.c
@@ -30,7 +30,7 @@
 #include "py/runtime.h"
 #include "py/mperrno.h"
 #include "py/mphal.h"
-#include "lib/utils/mpirq.h"
+#include "shared/runtime/mpirq.h"
 #include "modrp2.h"
 
 #include "hardware/clocks.h"
diff --git a/ports/samd/Makefile b/ports/samd/Makefile
index ffd0f06a3f85c..d29d9c5b24f97 100644
--- a/ports/samd/Makefile
+++ b/ports/samd/Makefile
@@ -53,27 +53,27 @@ SRC_C = \
 	samd_isr.c \
 	samd_soc.c \
 	tusb_port.c \
-	lib/libc/string0.c \
 	lib/libm/ef_sqrt.c \
 	lib/libm/fmodf.c \
 	lib/libm/math.c \
 	lib/libm/nearbyintf.c \
-	lib/mp-readline/readline.c \
 	lib/tinyusb/src/class/cdc/cdc_device.c \
 	lib/tinyusb/src/common/tusb_fifo.c \
 	lib/tinyusb/src/device/usbd.c \
 	lib/tinyusb/src/device/usbd_control.c \
 	lib/tinyusb/src/portable/microchip/samd/dcd_samd.c \
 	lib/tinyusb/src/tusb.c \
-	lib/utils/gchelper_native.c \
-	lib/utils/printf.c \
-	lib/utils/pyexec.c \
-	lib/utils/stdout_helpers.c \
+	shared/libc/printf.c \
+	shared/libc/string0.c \
+	shared/readline/readline.c \
+	shared/runtime/gchelper_native.c \
+	shared/runtime/pyexec.c \
+	shared/runtime/stdout_helpers.c \
 
 ifeq ($(MCU_SERIES),SAMD21)
-SRC_S = lib/utils/gchelper_m0.s
+SRC_S = shared/runtime/gchelper_m0.s
 else
-SRC_S = lib/utils/gchelper_m3.s
+SRC_S = shared/runtime/gchelper_m3.s
 endif
 
 # List of sources for qstr extraction
diff --git a/ports/samd/main.c b/ports/samd/main.c
index 038373ceb403b..1c72f04ab8a97 100644
--- a/ports/samd/main.c
+++ b/ports/samd/main.c
@@ -29,8 +29,8 @@
 #include "py/gc.h"
 #include "py/mperrno.h"
 #include "py/stackctrl.h"
-#include "lib/utils/gchelper.h"
-#include "lib/utils/pyexec.h"
+#include "shared/runtime/gchelper.h"
+#include "shared/runtime/pyexec.h"
 
 extern uint8_t _sstack, _estack, _sheap, _eheap;
 
diff --git a/ports/stm32/Makefile b/ports/stm32/Makefile
index 9c63707071c70..ebf1466118d1d 100644
--- a/ports/stm32/Makefile
+++ b/ports/stm32/Makefile
@@ -157,19 +157,19 @@ endif
 # Options for mpy-cross
 MPY_CROSS_FLAGS += -march=armv7m
 
-LIB_SRC_C += $(addprefix lib/,\
+SHARED_SRC_C += $(addprefix shared/,\
 	libc/string0.c \
-	mp-readline/readline.c \
+	netutils/dhcpserver.c \
 	netutils/netutils.c \
 	netutils/trace.c \
-	netutils/dhcpserver.c \
+	readline/readline.c \
+	runtime/gchelper_native.c \
+	runtime/interrupt_char.c \
+	runtime/mpirq.c \
+	runtime/pyexec.c \
+	runtime/stdout_helpers.c \
+	runtime/sys_stdio_mphal.c \
 	timeutils/timeutils.c \
-	utils/gchelper_native.c \
-	utils/pyexec.c \
-	utils/interrupt_char.c \
-	utils/stdout_helpers.c \
-	utils/sys_stdio_mphal.c \
-	utils/mpirq.c \
 	)
 
 ifeq ($(MICROPY_FLOAT_IMPL),double)
@@ -359,18 +359,18 @@ SRC_O += \
 ifeq ($(MCU_SERIES),f0)
 SRC_O += \
 	resethandler_m0.o \
-	lib/utils/gchelper_m0.o
+	shared/runtime/gchelper_m0.o
 else
 ifeq ($(MCU_SERIES),l0)
 CSUPEROPT = -Os # save some code space
 SRC_O += \
 	resethandler_m0.o \
-	lib/utils/gchelper_m0.o
+	shared/runtime/gchelper_m0.o
 else
 SRC_O += \
 	system_stm32.o \
 	resethandler.o \
-	lib/utils/gchelper_m3.o
+	shared/runtime/gchelper_m3.o
 endif
 endif
 
@@ -542,6 +542,7 @@ endif
 OBJ += $(PY_O)
 OBJ += $(addprefix $(BUILD)/, $(LIB_SRC_C:.c=.o))
 OBJ += $(LIBM_O)
+OBJ += $(addprefix $(BUILD)/, $(SHARED_SRC_C:.c=.o))
 OBJ += $(addprefix $(BUILD)/, $(EXTMOD_SRC_C:.c=.o))
 OBJ += $(addprefix $(BUILD)/, $(DRIVERS_SRC_C:.c=.o))
 OBJ += $(addprefix $(BUILD)/, $(HAL_SRC_C:.c=.o))
@@ -555,7 +556,7 @@ OBJ += $(BUILD)/pins_$(BOARD).o
 # This file contains performance critical functions so turn up the optimisation
 # level.  It doesn't add much to the code size and improves performance a bit.
 # Don't use -O3 with this file because gcc tries to optimise memset in terms of itself.
-$(BUILD)/lib/libc/string0.o: COPT += -O2
+$(BUILD)/shared/libc/string0.o: COPT += -O2
 
 # We put several files into the first 16K section with the ISRs.
 # If we compile these using -O0 then it won't fit. So if you really want these
@@ -728,7 +729,7 @@ GEN_CDCINF_FILE = $(HEADER_BUILD)/pybcdc.inf
 GEN_CDCINF_HEADER = $(HEADER_BUILD)/pybcdc_inf.h
 
 # List of sources for qstr extraction
-SRC_QSTR += $(SRC_C) $(SRC_CXX) $(SRC_MOD) $(LIB_SRC_C) $(EXTMOD_SRC_C)
+SRC_QSTR += $(SRC_C) $(SRC_CXX) $(SRC_MOD) $(SHARED_SRC_C) $(EXTMOD_SRC_C)
 # Append any auto-generated sources that are needed by sources listed in
 # SRC_QSTR
 SRC_QSTR_AUTO_DEPS += $(GEN_CDCINF_HEADER)
diff --git a/ports/stm32/boardctrl.c b/ports/stm32/boardctrl.c
index fa71d8e7f4e5a..922f218e92f90 100644
--- a/ports/stm32/boardctrl.c
+++ b/ports/stm32/boardctrl.c
@@ -26,7 +26,7 @@
 
 #include "py/runtime.h"
 #include "py/mphal.h"
-#include "lib/utils/pyexec.h"
+#include "shared/runtime/pyexec.h"
 #include "boardctrl.h"
 #include "led.h"
 #include "usrsw.h"
diff --git a/ports/stm32/eth.c b/ports/stm32/eth.c
index 79165e11916b9..f174b6af0d57e 100644
--- a/ports/stm32/eth.c
+++ b/ports/stm32/eth.c
@@ -27,7 +27,7 @@
 #include <string.h>
 #include "py/mphal.h"
 #include "py/mperrno.h"
-#include "lib/netutils/netutils.h"
+#include "shared/netutils/netutils.h"
 #include "pin_static_af.h"
 #include "modnetwork.h"
 #include "mpu.h"
diff --git a/ports/stm32/gccollect.c b/ports/stm32/gccollect.c
index 8b47b121ec2c3..bd697a2af3b5a 100644
--- a/ports/stm32/gccollect.c
+++ b/ports/stm32/gccollect.c
@@ -30,7 +30,7 @@
 #include "py/mpstate.h"
 #include "py/gc.h"
 #include "py/mpthread.h"
-#include "lib/utils/gchelper.h"
+#include "shared/runtime/gchelper.h"
 #include "gccollect.h"
 #include "softtimer.h"
 #include "systick.h"
diff --git a/ports/stm32/machine_uart.c b/ports/stm32/machine_uart.c
index 1b8db2e3e633e..354a1e26acd46 100644
--- a/ports/stm32/machine_uart.c
+++ b/ports/stm32/machine_uart.c
@@ -32,8 +32,8 @@
 #include "py/stream.h"
 #include "py/mperrno.h"
 #include "py/mphal.h"
-#include "lib/utils/interrupt_char.h"
-#include "lib/utils/mpirq.h"
+#include "shared/runtime/interrupt_char.h"
+#include "shared/runtime/mpirq.h"
 #include "uart.h"
 #include "irq.h"
 #include "pendsv.h"
diff --git a/ports/stm32/main.c b/ports/stm32/main.c
index 86b8fb7972055..d7afb9e4af259 100644
--- a/ports/stm32/main.c
+++ b/ports/stm32/main.c
@@ -32,8 +32,8 @@
 #include "py/gc.h"
 #include "py/mperrno.h"
 #include "py/mphal.h"
-#include "lib/mp-readline/readline.h"
-#include "lib/utils/pyexec.h"
+#include "shared/readline/readline.h"
+#include "shared/runtime/pyexec.h"
 #include "lib/oofatfs/ff.h"
 #include "lib/littlefs/lfs1.h"
 #include "lib/littlefs/lfs1_util.h"
diff --git a/ports/stm32/mboot/Makefile b/ports/stm32/mboot/Makefile
index 41a1a73bc529a..553fc4ac667fe 100755
--- a/ports/stm32/mboot/Makefile
+++ b/ports/stm32/mboot/Makefile
@@ -105,9 +105,9 @@ else
 COPT += -Os -DNDEBUG
 endif
 
-$(BUILD)/lib/libc/string0.o: CFLAGS += $(CFLAGS_BUILTIN)
+$(BUILD)/shared/libc/string0.o: CFLAGS += $(CFLAGS_BUILTIN)
 LIB_SRC_C += \
-	lib/libc/string0.c \
+	shared/libc/string0.c \
 	lib/littlefs/lfs1.c \
 	lib/littlefs/lfs1_util.c \
 	lib/littlefs/lfs2.c \
diff --git a/ports/stm32/modmachine.c b/ports/stm32/modmachine.c
index 66c696982b9b2..2b7e22d13a20c 100644
--- a/ports/stm32/modmachine.c
+++ b/ports/stm32/modmachine.c
@@ -38,7 +38,7 @@
 #include "extmod/machine_pulse.h"
 #include "extmod/machine_i2c.h"
 #include "extmod/machine_spi.h"
-#include "lib/utils/pyexec.h"
+#include "shared/runtime/pyexec.h"
 #include "lib/oofatfs/ff.h"
 #include "extmod/vfs.h"
 #include "extmod/vfs_fat.h"
diff --git a/ports/stm32/modnetwork.c b/ports/stm32/modnetwork.c
index 4279df0884c3d..06c4eb05db8ea 100644
--- a/ports/stm32/modnetwork.c
+++ b/ports/stm32/modnetwork.c
@@ -31,7 +31,7 @@
 #include "py/objlist.h"
 #include "py/runtime.h"
 #include "py/mphal.h"
-#include "lib/netutils/netutils.h"
+#include "shared/netutils/netutils.h"
 #include "systick.h"
 #include "pendsv.h"
 #include "modnetwork.h"
diff --git a/ports/stm32/modnwcc3k.c b/ports/stm32/modnwcc3k.c
index b52958ba2291f..07178b65c7ba1 100644
--- a/ports/stm32/modnwcc3k.c
+++ b/ports/stm32/modnwcc3k.c
@@ -36,7 +36,7 @@
 #include "py/runtime.h"
 #include "py/mperrno.h"
 #include "py/mphal.h"
-#include "lib/netutils/netutils.h"
+#include "shared/netutils/netutils.h"
 #include "modnetwork.h"
 #include "pin.h"
 #include "spi.h"
diff --git a/ports/stm32/modnwwiznet5k.c b/ports/stm32/modnwwiznet5k.c
index 204b9fcc3f0cd..1e18d03ca1fbc 100644
--- a/ports/stm32/modnwwiznet5k.c
+++ b/ports/stm32/modnwwiznet5k.c
@@ -33,7 +33,7 @@
 #include "py/stream.h"
 #include "py/mperrno.h"
 #include "py/mphal.h"
-#include "lib/netutils/netutils.h"
+#include "shared/netutils/netutils.h"
 #include "modnetwork.h"
 #include "pin.h"
 #include "spi.h"
diff --git a/ports/stm32/modpyb.c b/ports/stm32/modpyb.c
index c92090699108e..b9e2bac03f195 100644
--- a/ports/stm32/modpyb.c
+++ b/ports/stm32/modpyb.c
@@ -29,7 +29,7 @@
 
 #include "py/runtime.h"
 #include "py/mphal.h"
-#include "lib/utils/pyexec.h"
+#include "shared/runtime/pyexec.h"
 #include "drivers/dht/dht.h"
 #include "stm32_it.h"
 #include "irq.h"
diff --git a/ports/stm32/moduos.c b/ports/stm32/moduos.c
index 6f9740c645fe5..5b2335272fd64 100644
--- a/ports/stm32/moduos.c
+++ b/ports/stm32/moduos.c
@@ -30,7 +30,7 @@
 #include "py/runtime.h"
 #include "py/objtuple.h"
 #include "py/objstr.h"
-#include "lib/timeutils/timeutils.h"
+#include "shared/timeutils/timeutils.h"
 #include "lib/oofatfs/ff.h"
 #include "lib/oofatfs/diskio.h"
 #include "extmod/misc.h"
diff --git a/ports/stm32/modusocket.c b/ports/stm32/modusocket.c
index 2732d472b5cdc..c59fc85226072 100644
--- a/ports/stm32/modusocket.c
+++ b/ports/stm32/modusocket.c
@@ -32,7 +32,7 @@
 #include "py/runtime.h"
 #include "py/stream.h"
 #include "py/mperrno.h"
-#include "lib/netutils/netutils.h"
+#include "shared/netutils/netutils.h"
 #include "modnetwork.h"
 
 #if MICROPY_PY_USOCKET && !MICROPY_PY_LWIP
diff --git a/ports/stm32/modutime.c b/ports/stm32/modutime.c
index 4bce45eb33315..1a22c34b6ba7e 100644
--- a/ports/stm32/modutime.c
+++ b/ports/stm32/modutime.c
@@ -30,7 +30,7 @@
 #include "py/runtime.h"
 #include "py/smallint.h"
 #include "py/obj.h"
-#include "lib/timeutils/timeutils.h"
+#include "shared/timeutils/timeutils.h"
 #include "extmod/utime_mphal.h"
 #include "systick.h"
 #include "portmodules.h"
diff --git a/ports/stm32/mpbthciport.c b/ports/stm32/mpbthciport.c
index accb913e1f712..369c91e30386c 100644
--- a/ports/stm32/mpbthciport.c
+++ b/ports/stm32/mpbthciport.c
@@ -31,7 +31,7 @@
 #include "mpbthciport.h"
 #include "softtimer.h"
 #include "pendsv.h"
-#include "lib/utils/mpirq.h"
+#include "shared/runtime/mpirq.h"
 
 #if MICROPY_PY_BLUETOOTH
 
diff --git a/ports/stm32/network_wiznet5k.c b/ports/stm32/network_wiznet5k.c
index c85ef5e88e7b0..bd4c02cb054d8 100644
--- a/ports/stm32/network_wiznet5k.c
+++ b/ports/stm32/network_wiznet5k.c
@@ -34,7 +34,7 @@
 
 #if MICROPY_PY_WIZNET5K && MICROPY_PY_LWIP
 
-#include "lib/netutils/netutils.h"
+#include "shared/netutils/netutils.h"
 #include "drivers/wiznet5k/ethernet/socket.h"
 #include "lwip/err.h"
 #include "lwip/dns.h"
diff --git a/ports/stm32/pendsv.c b/ports/stm32/pendsv.c
index c5b2fcf92a732..d4c4496f1b33c 100644
--- a/ports/stm32/pendsv.c
+++ b/ports/stm32/pendsv.c
@@ -27,7 +27,7 @@
 #include <stdlib.h>
 
 #include "py/runtime.h"
-#include "lib/utils/interrupt_char.h"
+#include "shared/runtime/interrupt_char.h"
 #include "pendsv.h"
 #include "irq.h"
 
diff --git a/ports/stm32/rtc.c b/ports/stm32/rtc.c
index 02b0f2dbd1364..ab8b49e188206 100644
--- a/ports/stm32/rtc.c
+++ b/ports/stm32/rtc.c
@@ -27,7 +27,7 @@
 #include <stdio.h>
 
 #include "py/runtime.h"
-#include "lib/timeutils/timeutils.h"
+#include "shared/timeutils/timeutils.h"
 #include "extint.h"
 #include "rtc.h"
 #include "irq.h"
diff --git a/ports/stm32/uart.c b/ports/stm32/uart.c
index 9f74416170f86..b15be85336b8c 100644
--- a/ports/stm32/uart.c
+++ b/ports/stm32/uart.c
@@ -32,8 +32,8 @@
 #include "py/stream.h"
 #include "py/mperrno.h"
 #include "py/mphal.h"
-#include "lib/utils/interrupt_char.h"
-#include "lib/utils/mpirq.h"
+#include "shared/runtime/interrupt_char.h"
+#include "shared/runtime/mpirq.h"
 #include "uart.h"
 #include "irq.h"
 #include "pendsv.h"
diff --git a/ports/stm32/uart.h b/ports/stm32/uart.h
index 0490a617f67c6..286b6cdec036a 100644
--- a/ports/stm32/uart.h
+++ b/ports/stm32/uart.h
@@ -26,7 +26,7 @@
 #ifndef MICROPY_INCLUDED_STM32_UART_H
 #define MICROPY_INCLUDED_STM32_UART_H
 
-#include "lib/utils/mpirq.h"
+#include "shared/runtime/mpirq.h"
 
 typedef enum {
     PYB_UART_NONE = 0,
diff --git a/ports/stm32/usb.c b/ports/stm32/usb.c
index 5e3802651b074..838613f283899 100644
--- a/ports/stm32/usb.c
+++ b/ports/stm32/usb.c
@@ -39,7 +39,7 @@
 #include "py/stream.h"
 #include "py/mperrno.h"
 #include "py/mphal.h"
-#include "lib/utils/mpirq.h"
+#include "shared/runtime/mpirq.h"
 #include "bufhelper.h"
 #include "storage.h"
 #include "sdcard.h"
diff --git a/ports/stm32/usbd_cdc_interface.c b/ports/stm32/usbd_cdc_interface.c
index a1ac5fd22faaf..5f27bbe29a6e0 100644
--- a/ports/stm32/usbd_cdc_interface.c
+++ b/ports/stm32/usbd_cdc_interface.c
@@ -42,7 +42,7 @@
 #include "pendsv.h"
 
 #include "py/obj.h"
-#include "lib/utils/interrupt_char.h"
+#include "shared/runtime/interrupt_char.h"
 #include "irq.h"
 
 #if MICROPY_HW_ENABLE_USB
diff --git a/ports/teensy/Makefile b/ports/teensy/Makefile
index cf9529442a96e..d1ff421621568 100644
--- a/ports/teensy/Makefile
+++ b/ports/teensy/Makefile
@@ -100,12 +100,12 @@ STM_SRC_C = $(addprefix ports/stm32/,\
 	pin_named_pins.c \
 	)
 
-LIB_SRC_C = $(addprefix lib/,\
+SHARED_SRC_C = $(addprefix shared/,\
 	libc/string0.c \
-	mp-readline/readline.c \
-	utils/gchelper_native.c \
-	utils/pyexec.c \
-	utils/sys_stdio_mphal.c \
+	readline/readline.c \
+	runtime/gchelper_native.c \
+	runtime/pyexec.c \
+	runtime/sys_stdio_mphal.c \
 	)
 
 SRC_TEENSY = $(addprefix core/,\
@@ -120,8 +120,8 @@ SRC_TEENSY = $(addprefix core/,\
 	)
 
 OBJ = $(PY_O) $(addprefix $(BUILD)/, $(SRC_C:.c=.o) $(STM_SRC_C:.c=.o) $(SRC_TEENSY:.c=.o))
-OBJ += $(addprefix $(BUILD)/, $(LIB_SRC_C:.c=.o))
-OBJ += $(BUILD)/lib/utils/gchelper_m3.o
+OBJ += $(addprefix $(BUILD)/, $(SHARED_SRC_C:.c=.o))
+OBJ += $(BUILD)/shared/runtime/gchelper_m3.o
 OBJ += $(BUILD)/pins_gen.o
 
 all: hex
@@ -129,13 +129,13 @@ hex: $(BUILD)/micropython.hex
 
 ifeq ($(USE_MEMZIP),1)
 SRC_C += \
-	lib/memzip/import.c \
-	lib/memzip/lexermemzip.c \
-	lib/memzip/memzip.c \
+	shared/memzip/import.c \
+	shared/memzip/lexermemzip.c \
+	shared/memzip/memzip.c \
 
 OBJ += $(BUILD)/memzip-files.o
 
-MAKE_MEMZIP = $(TOP)/lib/memzip/make-memzip.py
+MAKE_MEMZIP = $(TOP)/shared/memzip/make-memzip.py
 ifeq ($(MEMZIP_DIR),)
 MEMZIP_DIR = memzip_files
 endif
@@ -207,7 +207,7 @@ GEN_PINS_AF_CONST = $(HEADER_BUILD)/pins_af_const.h
 GEN_PINS_AF_PY = $(BUILD)/pins_af.py
 
 # List of sources for qstr extraction
-SRC_QSTR += $(SRC_C) $(STM_SRC_C) $(LIB_SRC_C)
+SRC_QSTR += $(SRC_C) $(STM_SRC_C) $(SHARED_SRC_C)
 # Append any auto-generated sources that are needed by sources listed in
 # SRC_QSTR
 SRC_QSTR_AUTO_DEPS +=
diff --git a/ports/teensy/main.c b/ports/teensy/main.c
index d4c5f0396faf1..6ebdcde21cbe7 100644
--- a/ports/teensy/main.c
+++ b/ports/teensy/main.c
@@ -9,9 +9,9 @@
 #include "py/gc.h"
 #include "py/mphal.h"
 #include "gccollect.h"
-#include "lib/utils/gchelper.h"
-#include "lib/utils/pyexec.h"
-#include "lib/mp-readline/readline.h"
+#include "shared/readline/readline.h"
+#include "shared/runtime/gchelper.h"
+#include "shared/runtime/pyexec.h"
 #include "lexermemzip.h"
 
 #include "Arduino.h"
diff --git a/ports/teensy/modpyb.c b/ports/teensy/modpyb.c
index 6671b3abdce0e..f5bb3ea7b8227 100644
--- a/ports/teensy/modpyb.c
+++ b/ports/teensy/modpyb.c
@@ -33,7 +33,7 @@
 #include "py/gc.h"
 #include "py/mphal.h"
 
-#include "lib/utils/pyexec.h"
+#include "shared/runtime/pyexec.h"
 
 #include "gccollect.h"
 #include "systick.h"
diff --git a/ports/unix/Makefile b/ports/unix/Makefile
index d97e4bc7e0a51..faa978f3f83a1 100644
--- a/ports/unix/Makefile
+++ b/ports/unix/Makefile
@@ -117,9 +117,9 @@ endif
 endif
 
 ifeq ($(MICROPY_USE_READLINE),1)
-INC +=  -I$(TOP)/lib/mp-readline
+INC += -I$(TOP)/shared/readline
 CFLAGS_MOD += -DMICROPY_USE_READLINE=1
-LIB_SRC_C_EXTRA += mp-readline/readline.c
+SHARED_SRC_C_EXTRA += readline/readline.c
 endif
 ifeq ($(MICROPY_PY_TERMIOS),1)
 CFLAGS_MOD += -DMICROPY_PY_TERMIOS=1
@@ -241,10 +241,10 @@ SRC_C += \
 	$(SRC_MOD) \
 	$(wildcard $(VARIANT_DIR)/*.c)
 
-LIB_SRC_C += $(addprefix lib/,\
-	$(LIB_SRC_C_EXTRA) \
+SHARED_SRC_C += $(addprefix shared/,\
+	runtime/gchelper_generic.c \
 	timeutils/timeutils.c \
-	utils/gchelper_generic.c \
+	$(SHARED_SRC_C_EXTRA) \
 	)
 
 SRC_CXX += \
@@ -253,11 +253,11 @@ SRC_CXX += \
 OBJ = $(PY_O)
 OBJ += $(addprefix $(BUILD)/, $(SRC_C:.c=.o))
 OBJ += $(addprefix $(BUILD)/, $(SRC_CXX:.cpp=.o))
-OBJ += $(addprefix $(BUILD)/, $(LIB_SRC_C:.c=.o))
+OBJ += $(addprefix $(BUILD)/, $(SHARED_SRC_C:.c=.o))
 OBJ += $(addprefix $(BUILD)/, $(EXTMOD_SRC_C:.c=.o))
 
 # List of sources for qstr extraction
-SRC_QSTR += $(SRC_C) $(SRC_CXX) $(LIB_SRC_C) $(EXTMOD_SRC_C)
+SRC_QSTR += $(SRC_C) $(SRC_CXX) $(SHARED_SRC_C) $(EXTMOD_SRC_C)
 # Append any auto-generated sources that are needed by sources listed in
 # SRC_QSTR
 SRC_QSTR_AUTO_DEPS +=
diff --git a/ports/unix/gccollect.c b/ports/unix/gccollect.c
index f0441e4ea3860..79b17663c32e4 100644
--- a/ports/unix/gccollect.c
+++ b/ports/unix/gccollect.c
@@ -29,7 +29,7 @@
 #include "py/mpstate.h"
 #include "py/gc.h"
 
-#include "lib/utils/gchelper.h"
+#include "shared/runtime/gchelper.h"
 
 #if MICROPY_ENABLE_GC
 
diff --git a/ports/unix/input.c b/ports/unix/input.c
index 4a77d1b278159..c5bf7197388cc 100644
--- a/ports/unix/input.c
+++ b/ports/unix/input.c
@@ -35,7 +35,7 @@
 #include "input.h"
 
 #if MICROPY_USE_READLINE == 1
-#include "lib/mp-readline/readline.h"
+#include "shared/readline/readline.h"
 #endif
 
 #if MICROPY_USE_READLINE == 0
diff --git a/ports/unix/main.c b/ports/unix/main.c
index a5db0869df844..031bdd75d106e 100644
--- a/ports/unix/main.c
+++ b/ports/unix/main.c
@@ -159,7 +159,7 @@ STATIC int execute_from_lexer(int source_kind, const void *source, mp_parse_inpu
 }
 
 #if MICROPY_USE_READLINE == 1
-#include "lib/mp-readline/readline.h"
+#include "shared/readline/readline.h"
 #else
 STATIC char *strjoin(const char *s1, int sep_char, const char *s2) {
     int l1 = strlen(s1);
diff --git a/ports/unix/mphalport.h b/ports/unix/mphalport.h
index 89d23ca5d22e9..510f9d939d653 100644
--- a/ports/unix/mphalport.h
+++ b/ports/unix/mphalport.h
@@ -52,7 +52,7 @@ static inline int mp_hal_readline(vstr_t *vstr, const char *p) {
 #elif MICROPY_PY_BUILTINS_INPUT && MICROPY_USE_READLINE == 1
 
 #include "py/misc.h"
-#include "lib/mp-readline/readline.h"
+#include "shared/readline/readline.h"
 // For built-in input() we need to wrap the standard readline() to enable raw mode
 #define mp_hal_readline mp_hal_readline
 static inline int mp_hal_readline(vstr_t *vstr, const char *p) {
diff --git a/ports/unix/mpthreadport.c b/ports/unix/mpthreadport.c
index d3243b337ff47..63aac1da38520 100644
--- a/ports/unix/mpthreadport.c
+++ b/ports/unix/mpthreadport.c
@@ -39,7 +39,7 @@
 #include <sched.h>
 #include <semaphore.h>
 
-#include "lib/utils/gchelper.h"
+#include "shared/runtime/gchelper.h"
 
 // Some platforms don't have SIGRTMIN but if we do have it, use it to avoid
 // potential conflict with other uses of the more commonly used SIGUSR1.
diff --git a/ports/windows/Makefile b/ports/windows/Makefile
index b48c9378b5280..d87affa15cd32 100644
--- a/ports/windows/Makefile
+++ b/ports/windows/Makefile
@@ -28,8 +28,8 @@ endif
 
 # source files
 SRC_C = \
-	lib/utils/gchelper_generic.c \
-	lib/utils/printf.c \
+	shared/libc/printf.c \
+	shared/runtime/gchelper_generic.c \
 	ports/unix/main.c \
 	ports/unix/input.c \
 	ports/unix/modos.c \
@@ -47,7 +47,7 @@ OBJ = $(PY_O) $(addprefix $(BUILD)/, $(SRC_C:.c=.o))
 
 ifeq ($(MICROPY_USE_READLINE),1)
 CFLAGS_MOD += -DMICROPY_USE_READLINE=1
-SRC_C += lib/mp-readline/readline.c
+SRC_C += shared/readline/readline.c
 endif
 
 LIB += -lws2_32
diff --git a/ports/windows/micropython.vcxproj b/ports/windows/micropython.vcxproj
index 73a837a8408ab..1beca9e508d42 100644
--- a/ports/windows/micropython.vcxproj
+++ b/ports/windows/micropython.vcxproj
@@ -85,8 +85,8 @@
   <ItemGroup>
     <ClCompile Include="@(PyCoreSource)" />
     <ClCompile Include="@(PyExtModSource)" />
-    <ClCompile Include="$(PyBaseDir)lib\mp-readline\*.c" />
-    <ClCompile Include="$(PyBaseDir)lib\utils\gchelper_generic.c" />
+    <ClCompile Include="$(PyBaseDir)shared\readline\*.c" />
+    <ClCompile Include="$(PyBaseDir)shared\runtime\gchelper_generic.c" />
     <ClCompile Include="$(PyBaseDir)ports\windows\*.c" />
     <ClCompile Include="$(PyBaseDir)ports\windows\msvc\*.c" />
     <ClCompile Include="$(PyBaseDir)ports\unix\gccollect.c"/>
@@ -109,4 +109,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/ports/zephyr/CMakeLists.txt b/ports/zephyr/CMakeLists.txt
index 5c09fc76ee7ab..ca18f2cb91ea8 100644
--- a/ports/zephyr/CMakeLists.txt
+++ b/ports/zephyr/CMakeLists.txt
@@ -54,14 +54,18 @@ set(MICROPY_SOURCE_PORT
 )
 list(TRANSFORM MICROPY_SOURCE_PORT PREPEND ${MICROPY_PORT_DIR}/)
 
-set(MICROPY_SOURCE_LIB
+set(MICROPY_SOURCE_SHARED
+    libc/printf.c
+    readline/readline.c
+    runtime/interrupt_char.c
+    runtime/mpirq.c
+    runtime/pyexec.c
+    runtime/stdout_helpers.c
     timeutils/timeutils.c
-    utils/mpirq.c
-    utils/stdout_helpers.c
-    utils/printf.c
-    utils/pyexec.c
-    utils/interrupt_char.c
-    mp-readline/readline.c
+)
+list(TRANSFORM MICROPY_SOURCE_SHARED PREPEND ${MICROPY_DIR}/shared/)
+
+set(MICROPY_SOURCE_LIB
     oofatfs/ff.c
     oofatfs/ffunicode.c
     littlefs/lfs1.c
@@ -74,6 +78,7 @@ list(TRANSFORM MICROPY_SOURCE_LIB PREPEND ${MICROPY_DIR}/lib/)
 set(MICROPY_SOURCE_QSTR
     ${MICROPY_SOURCE_PY}
     ${MICROPY_SOURCE_EXTMOD}
+    ${MICROPY_SOURCE_SHARED}
     ${MICROPY_SOURCE_LIB}
     ${MICROPY_SOURCE_PORT}
 )
diff --git a/ports/zephyr/machine_pin.c b/ports/zephyr/machine_pin.c
index 34c822c2f05a5..f9da2433c03f9 100644
--- a/ports/zephyr/machine_pin.c
+++ b/ports/zephyr/machine_pin.c
@@ -35,7 +35,7 @@
 #include "py/runtime.h"
 #include "py/gc.h"
 #include "py/mphal.h"
-#include "lib/utils/mpirq.h"
+#include "shared/runtime/mpirq.h"
 #include "modmachine.h"
 
 #if MICROPY_PY_MACHINE
diff --git a/ports/zephyr/main.c b/ports/zephyr/main.c
index 38285ad944962..63190bd5edd67 100644
--- a/ports/zephyr/main.c
+++ b/ports/zephyr/main.c
@@ -47,8 +47,8 @@
 #include "py/gc.h"
 #include "py/mphal.h"
 #include "py/stackctrl.h"
-#include "lib/utils/pyexec.h"
-#include "lib/mp-readline/readline.h"
+#include "shared/runtime/pyexec.h"
+#include "shared/readline/readline.h"
 #include "extmod/modbluetooth.h"
 
 #if MICROPY_VFS
@@ -59,9 +59,9 @@
 #include "modzephyr.h"
 
 #ifdef TEST
-#include "lib/upytesthelper/upytesthelper.h"
+#include "shared/upytesthelper/upytesthelper.h"
 #include "lib/tinytest/tinytest.c"
-#include "lib/upytesthelper/upytesthelper.c"
+#include "shared/upytesthelper/upytesthelper.c"
 #include TEST
 #endif
 
diff --git a/ports/zephyr/mpconfigport_bin_testsuite.h b/ports/zephyr/mpconfigport_bin_testsuite.h
index 684b4f41c24e8..4367067af3eb5 100644
--- a/ports/zephyr/mpconfigport_bin_testsuite.h
+++ b/ports/zephyr/mpconfigport_bin_testsuite.h
@@ -26,6 +26,6 @@
 #include "mpconfigport.h"
 
 #ifdef TEST
-#include "lib/upytesthelper/upytesthelper.h"
+#include "shared/upytesthelper/upytesthelper.h"
 #define MP_PLAT_PRINT_STRN(str, len) upytest_output(str, len)
 #endif
diff --git a/ports/zephyr/mphalport.h b/ports/zephyr/mphalport.h
index 63a18e138866a..ba902a76aaa93 100644
--- a/ports/zephyr/mphalport.h
+++ b/ports/zephyr/mphalport.h
@@ -1,5 +1,5 @@
 #include <zephyr.h>
-#include "lib/utils/interrupt_char.h"
+#include "shared/runtime/interrupt_char.h"
 
 void mp_hal_init(void);
 void mp_hal_wait_sem(struct k_sem *sem, uint32_t timeout_ms);
diff --git a/py/modbuiltins.c b/py/modbuiltins.c
index ac41942b9ca90..c9a49685a45c8 100644
--- a/py/modbuiltins.c
+++ b/py/modbuiltins.c
@@ -230,7 +230,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(mp_builtin_hex_obj, mp_builtin_hex);
 #if MICROPY_PY_BUILTINS_INPUT
 
 #include "py/mphal.h"
-#include "lib/mp-readline/readline.h"
+#include "shared/readline/readline.h"
 
 // A port can define mp_hal_readline if they want to use a custom function here
 #ifndef mp_hal_readline
diff --git a/py/mpconfig.h b/py/mpconfig.h
index d40637dfaf6b4..48c4c6d347d44 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -1063,7 +1063,7 @@ typedef double mp_float_t;
 #endif
 
 // Whether to provide the built-in input() function. The implementation of this
-// uses mp-readline, so can only be enabled if the port uses this readline.
+// uses shared/readline, so can only be enabled if the port uses this readline.
 #ifndef MICROPY_PY_BUILTINS_INPUT
 #define MICROPY_PY_BUILTINS_INPUT (0)
 #endif
diff --git a/py/py.mk b/py/py.mk
index ab01b0ec21e9f..bc9232ef4f0ef 100644
--- a/py/py.mk
+++ b/py/py.mk
@@ -209,8 +209,8 @@ PY_EXTMOD_O_BASENAME = \
 	extmod/vfs_lfs.o \
 	extmod/utime_mphal.o \
 	extmod/uos_dupterm.o \
-	lib/embed/abort_.o \
-	lib/utils/printf.o \
+	shared/libc/abort_.o \
+	shared/libc/printf.o \
 
 # prepend the build destination prefix to the py object files
 PY_CORE_O = $(addprefix $(BUILD)/, $(PY_CORE_O_BASENAME))
@@ -272,7 +272,7 @@ $(HEADER_BUILD)/moduledefs.h: $(SRC_QSTR) $(QSTR_GLOBAL_DEPENDENCIES) | $(HEADER
 # Standard C functions like memset need to be compiled with special flags so
 # the compiler does not optimise these functions in terms of themselves.
 CFLAGS_BUILTIN ?= -ffreestanding -fno-builtin -fno-lto
-$(BUILD)/lib/libc/string0.o: CFLAGS += $(CFLAGS_BUILTIN)
+$(BUILD)/shared/libc/string0.o: CFLAGS += $(CFLAGS_BUILTIN)
 
 # Force nlr code to always be compiled with space-saving optimisation so
 # that the function preludes are of a minimal and predictable form.
diff --git a/shared/memzip/README.md b/shared/memzip/README.md
index 287d0fc4894a2..3938e3198c953 100644
--- a/shared/memzip/README.md
+++ b/shared/memzip/README.md
@@ -10,13 +10,13 @@ a C file which contains the data from the zip file.
 A typical addition to a makefile would look like:
 ```
 SRC_C += \
-    lib/memzip/import.c \
-    lib/memzip/lexermemzip.c \
-    lib/memzip/memzip.c \
+    shared/memzip/import.c \
+    shared/memzip/lexermemzip.c \
+    shared/memzip/memzip.c \
 
 OBJ += $(BUILD)/memzip-files.o
 
-MAKE_MEMZIP = ../lib/memzip/make-memzip.py
+MAKE_MEMZIP = ../shared/memzip/make-memzip.py
 
 $(BUILD)/memzip-files.o: $(BUILD)/memzip-files.c
     $(call compile_c)
diff --git a/shared/netutils/dhcpserver.c b/shared/netutils/dhcpserver.c
index 7f97ee6e462ce..9db42b3fd9d2d 100644
--- a/shared/netutils/dhcpserver.c
+++ b/shared/netutils/dhcpserver.c
@@ -35,7 +35,7 @@
 
 #if MICROPY_PY_LWIP
 
-#include "lib/netutils/dhcpserver.h"
+#include "shared/netutils/dhcpserver.h"
 #include "lwip/udp.h"
 
 #define DHCPDISCOVER    (1)
diff --git a/shared/netutils/netutils.c b/shared/netutils/netutils.c
index 40fbd5bca353d..84b4405c41d38 100644
--- a/shared/netutils/netutils.c
+++ b/shared/netutils/netutils.c
@@ -30,7 +30,7 @@
 #include <string.h>
 
 #include "py/runtime.h"
-#include "lib/netutils/netutils.h"
+#include "shared/netutils/netutils.h"
 
 // Takes an array with a raw IPv4 address and returns something like '192.168.0.1'.
 mp_obj_t netutils_format_ipv4_addr(uint8_t *ip, netutils_endian_t endian) {
diff --git a/shared/netutils/trace.c b/shared/netutils/trace.c
index 1610966c2dac1..a6dfb42c28f00 100644
--- a/shared/netutils/trace.c
+++ b/shared/netutils/trace.c
@@ -25,7 +25,7 @@
  */
 
 #include "py/mphal.h"
-#include "lib/netutils/netutils.h"
+#include "shared/netutils/netutils.h"
 
 static uint32_t get_be16(const uint8_t *buf) {
     return buf[0] << 8 | buf[1];
diff --git a/shared/readline/readline.c b/shared/readline/readline.c
index 296c8aa4ab543..cad85b4e6b5c2 100644
--- a/shared/readline/readline.c
+++ b/shared/readline/readline.c
@@ -31,7 +31,7 @@
 #include "py/mpstate.h"
 #include "py/repl.h"
 #include "py/mphal.h"
-#include "lib/mp-readline/readline.h"
+#include "shared/readline/readline.h"
 
 #if 0 // print debugging info
 #define DEBUG_PRINT (1)
diff --git a/shared/runtime/gchelper_generic.c b/shared/runtime/gchelper_generic.c
index 3e7e33ab18ae0..dcd35f9c7e494 100644
--- a/shared/runtime/gchelper_generic.c
+++ b/shared/runtime/gchelper_generic.c
@@ -28,7 +28,7 @@
 
 #include "py/mpstate.h"
 #include "py/gc.h"
-#include "lib/utils/gchelper.h"
+#include "shared/runtime/gchelper.h"
 
 #if MICROPY_ENABLE_GC
 
diff --git a/shared/runtime/gchelper_native.c b/shared/runtime/gchelper_native.c
index 6bf386b5192b8..1e4af9c84479e 100644
--- a/shared/runtime/gchelper_native.c
+++ b/shared/runtime/gchelper_native.c
@@ -28,7 +28,7 @@
 
 #include "py/mpstate.h"
 #include "py/gc.h"
-#include "lib/utils/gchelper.h"
+#include "shared/runtime/gchelper.h"
 
 #if MICROPY_ENABLE_GC
 
diff --git a/shared/runtime/mpirq.c b/shared/runtime/mpirq.c
index 02139f24dc5fc..8e474bf5a2b13 100644
--- a/shared/runtime/mpirq.c
+++ b/shared/runtime/mpirq.c
@@ -29,7 +29,7 @@
 
 #include "py/runtime.h"
 #include "py/gc.h"
-#include "lib/utils/mpirq.h"
+#include "shared/runtime/mpirq.h"
 
 #if MICROPY_ENABLE_SCHEDULER
 
diff --git a/shared/runtime/pyexec.c b/shared/runtime/pyexec.c
index 4446b36b61b56..006ec096f7bcd 100644
--- a/shared/runtime/pyexec.c
+++ b/shared/runtime/pyexec.c
@@ -39,8 +39,8 @@
 #include "irq.h"
 #include "usb.h"
 #endif
-#include "lib/mp-readline/readline.h"
-#include "lib/utils/pyexec.h"
+#include "shared/readline/readline.h"
+#include "shared/runtime/pyexec.h"
 #include "genhdr/mpversion.h"
 
 pyexec_mode_kind_t pyexec_mode_kind = PYEXEC_MODE_FRIENDLY_REPL;
diff --git a/shared/timeutils/timeutils.c b/shared/timeutils/timeutils.c
index 7c74f5fc37715..6bf3eca84a82b 100644
--- a/shared/timeutils/timeutils.c
+++ b/shared/timeutils/timeutils.c
@@ -27,7 +27,7 @@
 
 #include "py/obj.h"
 
-#include "lib/timeutils/timeutils.h"
+#include "shared/timeutils/timeutils.h"
 
 // LEAPOCH corresponds to 2000-03-01, which is a mod-400 year, immediately
 // after Feb 29. We calculate seconds as a signed integer relative to that.
diff --git a/tools/codeformat.py b/tools/codeformat.py
index 81a3cdcf8e5a2..f8202c66b950c 100755
--- a/tools/codeformat.py
+++ b/tools/codeformat.py
@@ -39,9 +39,9 @@
     "extmod/btstack/*.[ch]",
     "extmod/nimble/*.[ch]",
     "lib/mbedtls_errors/tester.c",
-    "lib/netutils/*.[ch]",
-    "lib/timeutils/*.[ch]",
-    "lib/utils/*.[ch]",
+    "shared/netutils/*.[ch]",
+    "shared/timeutils/*.[ch]",
+    "shared/runtime/*.[ch]",
     "mpy-cross/*.[ch]",
     "ports/*/*.[ch]",
     "ports/windows/msvc/**/*.[ch]",

From e3291e1801f27e49ac0e6be275c742777507207f Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 13 Jul 2021 00:17:02 +1000
Subject: [PATCH 1060/3533] lib,shared: Update README's based on contents of
 these dirs.

Signed-off-by: Damien George <damien@micropython.org>
---
 lib/README.md    | 5 +++--
 shared/README.md | 3 +++
 2 files changed, 6 insertions(+), 2 deletions(-)
 create mode 100644 shared/README.md

diff --git a/lib/README.md b/lib/README.md
index e719821bfc7fa..fd7cba910af6a 100644
--- a/lib/README.md
+++ b/lib/README.md
@@ -1,2 +1,3 @@
-This directory contains standard, low-level C libraries with emphasis on
-being independent and efficient.  They can be used by any port.
+This directory contains third-party, low-level C libraries and SDKs.
+Libraries that do not target any specific platform are generally chosen
+based on them being independent and efficient.
diff --git a/shared/README.md b/shared/README.md
new file mode 100644
index 0000000000000..073187b249ecb
--- /dev/null
+++ b/shared/README.md
@@ -0,0 +1,3 @@
+This directory contains libraries, utilities and helper code developed
+specifically for this project.  The code is intended to be portable and
+usable by any port.

From 831cc4a61da2d5958858d8e1016e951fb248a882 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 13 Jul 2021 15:22:39 +1000
Subject: [PATCH 1061/3533] stm32/boards/NUCLEO_F446RE: Fix I2C1 pin assignment
 to match datasheet.

Thanks to @aureliano2nd.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/boards/NUCLEO_F446RE/mpconfigboard.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/stm32/boards/NUCLEO_F446RE/mpconfigboard.h b/ports/stm32/boards/NUCLEO_F446RE/mpconfigboard.h
index 27845b33aa833..30044ef2b46e5 100644
--- a/ports/stm32/boards/NUCLEO_F446RE/mpconfigboard.h
+++ b/ports/stm32/boards/NUCLEO_F446RE/mpconfigboard.h
@@ -25,8 +25,8 @@
 #define MICROPY_HW_UART_REPL_BAUD   115200
 
 // I2C buses
-#define MICROPY_HW_I2C1_SCL (pin_B6)        // Arduino D10, pin 17 on CN10
-#define MICROPY_HW_I2C1_SDA (pin_B7)        //              pin 21 on CN7
+#define MICROPY_HW_I2C1_SCL (pin_B8)        // Arduino D15, pin 3 on CN10
+#define MICROPY_HW_I2C1_SDA (pin_B9)        // Arduino D14, pin 5 on CN10
 #define MICROPY_HW_I2C2_SCL (pin_B10)       // Arduino D6,  pin 25 on CN10
 #define MICROPY_HW_I2C2_SDA (pin_B3)        // Arduino D3,  pin 31 on CN10
 #define MICROPY_HW_I2C3_SCL (pin_A8)        // Arduino D7,  pin 23 on CN10

From 240888a0d2caa2e8ac8518c7ce0743ddec7e2a84 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 13 Jul 2021 15:56:41 +1000
Subject: [PATCH 1062/3533] unix/Makefile: Add back LIB_SRC_C to list of object
 files.

This fixes the dev build (it needs LIB_SRC_C for Bluetooth) which was
broken by 136369d72f5b99ec23c9c9f178a590bde968e2ee.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/unix/Makefile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/unix/Makefile b/ports/unix/Makefile
index faa978f3f83a1..36b6322d86c29 100644
--- a/ports/unix/Makefile
+++ b/ports/unix/Makefile
@@ -255,6 +255,7 @@ OBJ += $(addprefix $(BUILD)/, $(SRC_C:.c=.o))
 OBJ += $(addprefix $(BUILD)/, $(SRC_CXX:.cpp=.o))
 OBJ += $(addprefix $(BUILD)/, $(SHARED_SRC_C:.c=.o))
 OBJ += $(addprefix $(BUILD)/, $(EXTMOD_SRC_C:.c=.o))
+OBJ += $(addprefix $(BUILD)/, $(LIB_SRC_C:.c=.o))
 
 # List of sources for qstr extraction
 SRC_QSTR += $(SRC_C) $(SRC_CXX) $(SHARED_SRC_C) $(EXTMOD_SRC_C)

From 0ee256b8b163863d065e6fe203bc384772694075 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 13 Jul 2021 15:58:04 +1000
Subject: [PATCH 1063/3533] github/workflows: Add workflow to build and test
 unix dev variant.

Signed-off-by: Damien George <damien@micropython.org>
---
 .github/workflows/ports_unix.yml | 12 ++++++++++++
 tools/ci.sh                      |  8 ++++++++
 2 files changed, 20 insertions(+)

diff --git a/.github/workflows/ports_unix.yml b/.github/workflows/ports_unix.yml
index 673e6152fa94a..0e6a98f6b226a 100644
--- a/.github/workflows/ports_unix.yml
+++ b/.github/workflows/ports_unix.yml
@@ -51,6 +51,18 @@ jobs:
       if: failure()
       run: tests/run-tests.py --print-failures
 
+  dev:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Build
+      run: source tools/ci.sh && ci_unix_dev_build
+    - name: Run main test suite
+      run: source tools/ci.sh && ci_unix_dev_run_tests
+    - name: Print failures
+      if: failure()
+      run: tests/run-tests.py --print-failures
+
   coverage:
     runs-on: ubuntu-latest
     steps:
diff --git a/tools/ci.sh b/tools/ci.sh
index ec122129dd979..815e7287570e8 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -393,6 +393,14 @@ function ci_unix_standard_run_perfbench {
     (cd tests && MICROPY_CPYTHON3=python3 MICROPY_MICROPYTHON=../ports/unix/micropython ./run-perfbench.py 1000 1000)
 }
 
+function ci_unix_dev_build {
+    ci_unix_build_helper VARIANT=dev
+}
+
+function ci_unix_dev_run_tests {
+    ci_unix_run_tests_helper VARIANT=dev
+}
+
 function ci_unix_coverage_setup {
     sudo pip3 install setuptools
     sudo pip3 install pyelftools

From 6430cd3e02d4ec4a8fc949754b434f745b1973e6 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 13 Jul 2021 16:18:15 +1000
Subject: [PATCH 1064/3533] unix/variants: Enable help and help("modules") on
 standard and dev.

See related #1354, #2906, #3436.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/unix/variants/dev/mpconfigvariant.h      | 2 ++
 ports/unix/variants/standard/mpconfigvariant.h | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/ports/unix/variants/dev/mpconfigvariant.h b/ports/unix/variants/dev/mpconfigvariant.h
index 7c3e84cc44e11..54ad99323625b 100644
--- a/ports/unix/variants/dev/mpconfigvariant.h
+++ b/ports/unix/variants/dev/mpconfigvariant.h
@@ -31,6 +31,8 @@
 #define MICROPY_VFS                             (1)
 #define MICROPY_VFS_POSIX                       (1)
 
+#define MICROPY_PY_BUILTINS_HELP                (1)
+#define MICROPY_PY_BUILTINS_HELP_MODULES        (1)
 #define MICROPY_PY_SYS_SETTRACE                 (1)
 #define MICROPY_PY_UOS_VFS                      (1)
 #define MICROPY_PY_URANDOM_EXTRA_FUNCS          (1)
diff --git a/ports/unix/variants/standard/mpconfigvariant.h b/ports/unix/variants/standard/mpconfigvariant.h
index 79b8fe2a3be2b..3cdcfa8e9b8c9 100644
--- a/ports/unix/variants/standard/mpconfigvariant.h
+++ b/ports/unix/variants/standard/mpconfigvariant.h
@@ -24,3 +24,5 @@
  * THE SOFTWARE.
  */
 
+#define MICROPY_PY_BUILTINS_HELP                (1)
+#define MICROPY_PY_BUILTINS_HELP_MODULES        (1)

From 22fdb2130284ddea3ebe1d271d05d670546e788f Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Wed, 14 Jul 2021 00:18:35 +1000
Subject: [PATCH 1065/3533] windows/appveyor: Update to VS 2017 and use Python
 3.8 for build/test.

MicroPython implements some 3.5+ features, and this change helps to reduce
the need for some .exp files in the test suite.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/windows/.appveyor.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/windows/.appveyor.yml b/ports/windows/.appveyor.yml
index a4cd1f1e8c050..40fdff2934efa 100644
--- a/ports/windows/.appveyor.yml
+++ b/ports/windows/.appveyor.yml
@@ -1,10 +1,10 @@
-image: Visual Studio 2013
+image: Visual Studio 2017
 clone_depth: 1
 skip_tags: true
 
 environment:
   # Python version used
-  MICROPY_CPYTHON3: c:/python34/python.exe
+  MICROPY_CPYTHON3: c:/python38/python.exe
 
 init:
   # Set build version number to commit to be travis-like

From b8255dd2e00f926106083de7a9b41869b226e96b Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 29 Jun 2021 22:39:24 +1000
Subject: [PATCH 1066/3533] py/vm: Simplify handling of MP_OBJ_STOP_ITERATION
 in yield-from opcode.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/objgenerator.c |  6 ++++--
 py/runtime.c      |  6 +++---
 py/vm.c           | 13 +++----------
 3 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/py/objgenerator.c b/py/objgenerator.c
index 543685fac7860..1ee7b8b1db900 100644
--- a/py/objgenerator.c
+++ b/py/objgenerator.c
@@ -152,8 +152,9 @@ mp_vm_return_kind_t mp_obj_gen_resume(mp_obj_t self_in, mp_obj_t send_value, mp_
     mp_check_self(mp_obj_is_type(self_in, &mp_type_gen_instance));
     mp_obj_gen_instance_t *self = MP_OBJ_TO_PTR(self_in);
     if (self->code_state.ip == 0) {
-        // Trying to resume already stopped generator
-        *ret_val = MP_OBJ_STOP_ITERATION;
+        // Trying to resume an already stopped generator.
+        // This is an optimised "raise StopIteration(None)".
+        *ret_val = mp_const_none;
         return MP_VM_RETURN_NORMAL;
     }
 
@@ -212,6 +213,7 @@ mp_vm_return_kind_t mp_obj_gen_resume(mp_obj_t self_in, mp_obj_t send_value, mp_
             // subsequent next() may re-execute statements after last yield
             // again and again, leading to side effects.
             self->code_state.ip = 0;
+            // This is an optimised "raise StopIteration(*ret_val)".
             *ret_val = *self->code_state.sp;
             break;
 
diff --git a/py/runtime.c b/py/runtime.c
index 261670d4f304b..b53711bbe27d4 100644
--- a/py/runtime.c
+++ b/py/runtime.c
@@ -1272,7 +1272,6 @@ mp_obj_t mp_iternext(mp_obj_t o_in) {
     }
 }
 
-// TODO: Unclear what to do with StopIterarion exception here.
 mp_vm_return_kind_t mp_resume(mp_obj_t self_in, mp_obj_t send_value, mp_obj_t throw_value, mp_obj_t *ret_val) {
     assert((send_value != MP_OBJ_NULL) ^ (throw_value != MP_OBJ_NULL));
     const mp_obj_type_t *type = mp_obj_get_type(self_in);
@@ -1287,8 +1286,9 @@ mp_vm_return_kind_t mp_resume(mp_obj_t self_in, mp_obj_t send_value, mp_obj_t th
         if (ret != MP_OBJ_STOP_ITERATION) {
             return MP_VM_RETURN_YIELD;
         } else {
-            // Emulate raise StopIteration()
-            // Special case, handled in vm.c
+            // The generator is finished.
+            // This is an optimised "raise StopIteration(None)".
+            *ret_val = mp_const_none;
             return MP_VM_RETURN_NORMAL;
         }
     }
diff --git a/py/vm.c b/py/vm.c
index 5365014fcb13e..bbfc9914ebe11 100644
--- a/py/vm.c
+++ b/py/vm.c
@@ -1257,16 +1257,9 @@ unwind_jump:;
                         PUSH(ret_value);
                         goto yield;
                     } else if (ret_kind == MP_VM_RETURN_NORMAL) {
-                        // Pop exhausted gen
-                        sp--;
-                        if (ret_value == MP_OBJ_STOP_ITERATION) {
-                            // Optimize StopIteration
-                            // TODO: get StopIteration's value
-                            PUSH(mp_const_none);
-                        } else {
-                            PUSH(ret_value);
-                        }
-
+                        // The generator has finished, and returned a value via StopIteration
+                        // Replace exhausted generator with the returned value
+                        SET_TOP(ret_value);
                         // If we injected GeneratorExit downstream, then even
                         // if it was swallowed, we re-raise GeneratorExit
                         GENERATOR_EXIT_IF_NEEDED(t_exc);

From e3825e28e61561427fd5811c1167e05ee3372eb4 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 29 Jun 2021 17:32:18 +1000
Subject: [PATCH 1067/3533] py/objexcept: Make mp_obj_exception_get_value
 support subclassed excs.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/objexcept.c                   | 27 +++++++++++++--------------
 tests/basics/subclass_native3.py | 20 ++++++++++++++++++++
 2 files changed, 33 insertions(+), 14 deletions(-)

diff --git a/py/objexcept.c b/py/objexcept.c
index a10bd2c18788a..b4f5018c0697e 100644
--- a/py/objexcept.c
+++ b/py/objexcept.c
@@ -111,6 +111,15 @@ mp_obj_t mp_alloc_emergency_exception_buf(mp_obj_t size_in) {
 #endif
 #endif  // MICROPY_ENABLE_EMERGENCY_EXCEPTION_BUF
 
+STATIC mp_obj_exception_t *get_native_exception(mp_obj_t self_in) {
+    assert(mp_obj_is_exception_instance(self_in));
+    if (mp_obj_is_native_exception_instance(self_in)) {
+        return MP_OBJ_TO_PTR(self_in);
+    } else {
+        return MP_OBJ_TO_PTR(((mp_obj_instance_t *)MP_OBJ_TO_PTR(self_in))->subobj[0]);
+    }
+}
+
 STATIC void decompress_error_text_maybe(mp_obj_exception_t *o) {
     #if MICROPY_ROM_TEXT_COMPRESSION
     if (o->args->len == 1 && mp_obj_is_type(o->args->items[0], &mp_type_str)) {
@@ -240,7 +249,7 @@ mp_obj_t mp_obj_exception_make_new(const mp_obj_type_t *type, size_t n_args, siz
 
 // Get exception "value" - that is, first argument, or None
 mp_obj_t mp_obj_exception_get_value(mp_obj_t self_in) {
-    mp_obj_exception_t *self = MP_OBJ_TO_PTR(self_in);
+    mp_obj_exception_t *self = get_native_exception(self_in);
     if (self->args->len == 0) {
         return mp_const_none;
     } else {
@@ -559,25 +568,15 @@ bool mp_obj_exception_match(mp_obj_t exc, mp_const_obj_t exc_type) {
 
 // traceback handling functions
 
-#define GET_NATIVE_EXCEPTION(self, self_in) \
-    /* make sure self_in is an exception instance */ \
-    assert(mp_obj_is_exception_instance(self_in)); \
-    mp_obj_exception_t *self; \
-    if (mp_obj_is_native_exception_instance(self_in)) { \
-        self = MP_OBJ_TO_PTR(self_in); \
-    } else { \
-        self = MP_OBJ_TO_PTR(((mp_obj_instance_t *)MP_OBJ_TO_PTR(self_in))->subobj[0]); \
-    }
-
 void mp_obj_exception_clear_traceback(mp_obj_t self_in) {
-    GET_NATIVE_EXCEPTION(self, self_in);
+    mp_obj_exception_t *self = get_native_exception(self_in);
     // just set the traceback to the null object
     // we don't want to call any memory management functions here
     self->traceback_data = NULL;
 }
 
 void mp_obj_exception_add_traceback(mp_obj_t self_in, qstr file, size_t line, qstr block) {
-    GET_NATIVE_EXCEPTION(self, self_in);
+    mp_obj_exception_t *self = get_native_exception(self_in);
 
     // append this traceback info to traceback data
     // if memory allocation fails (eg because gc is locked), just return
@@ -630,7 +629,7 @@ void mp_obj_exception_add_traceback(mp_obj_t self_in, qstr file, size_t line, qs
 }
 
 void mp_obj_exception_get_traceback(mp_obj_t self_in, size_t *n, size_t **values) {
-    GET_NATIVE_EXCEPTION(self, self_in);
+    mp_obj_exception_t *self = get_native_exception(self_in);
 
     if (self->traceback_data == NULL) {
         *n = 0;
diff --git a/tests/basics/subclass_native3.py b/tests/basics/subclass_native3.py
index ac5aabfed7b25..0c45c4924fdaf 100644
--- a/tests/basics/subclass_native3.py
+++ b/tests/basics/subclass_native3.py
@@ -34,6 +34,26 @@ class MyStopIteration(StopIteration):
 print(MyStopIteration(1).value)
 
 
+class Iter:
+    def __iter__(self):
+        return self
+
+    def __next__(self):
+        # This exception will stop the "yield from", with a value of 3
+        raise MyStopIteration(3)
+
+
+def gen():
+    print((yield from Iter()))
+    return 4
+
+
+try:
+    next(gen())
+except StopIteration as er:
+    print(er.args)
+
+
 class MyOSError(OSError):
     pass
 

From bb00125aaac8376b8cc4c8f3da2423fcf6dae496 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 29 Jun 2021 17:34:34 +1000
Subject: [PATCH 1068/3533] py: Support single argument to optimised
 MP_OBJ_STOP_ITERATION.

The MP_OBJ_STOP_ITERATION optimisation is a shortcut for creating a
StopIteration() exception object, and means that heap memory does not need
to be allocated for the exception (in cases where it can be used).  This
commit allows this optimised object to take an optional argument (before,
it could only have no argument).

The commit also adds some new tests to cover corner cases with
StopIteration and generators that previously did not work.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/modbuiltins.c                       |  4 +-
 py/mpstate.h                           |  3 ++
 py/objgenerator.c                      | 30 +++++-------
 py/objgetitemiter.c                    |  1 -
 py/runtime.c                           | 20 ++++++--
 py/runtime.h                           |  6 +++
 tests/basics/gen_yield_from_stopped.py | 12 +++++
 tests/basics/stopiteration.py          | 63 ++++++++++++++++++++++++++
 8 files changed, 115 insertions(+), 24 deletions(-)
 create mode 100644 tests/basics/stopiteration.py

diff --git a/py/modbuiltins.c b/py/modbuiltins.c
index c9a49685a45c8..a7e49a1ed9a47 100644
--- a/py/modbuiltins.c
+++ b/py/modbuiltins.c
@@ -322,7 +322,7 @@ STATIC mp_obj_t mp_builtin_next(size_t n_args, const mp_obj_t *args) {
     if (n_args == 1) {
         mp_obj_t ret = mp_iternext_allow_raise(args[0]);
         if (ret == MP_OBJ_STOP_ITERATION) {
-            mp_raise_type(&mp_type_StopIteration);
+            mp_raise_StopIteration(MP_STATE_THREAD(stop_iteration_arg));
         } else {
             return ret;
         }
@@ -336,7 +336,7 @@ MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_builtin_next_obj, 1, 2, mp_builtin_next);
 STATIC mp_obj_t mp_builtin_next(mp_obj_t o) {
     mp_obj_t ret = mp_iternext_allow_raise(o);
     if (ret == MP_OBJ_STOP_ITERATION) {
-        mp_raise_type(&mp_type_StopIteration);
+        mp_raise_StopIteration(MP_STATE_THREAD(stop_iteration_arg));
     } else {
         return ret;
     }
diff --git a/py/mpstate.h b/py/mpstate.h
index e42d13fb20582..07335bae4c500 100644
--- a/py/mpstate.h
+++ b/py/mpstate.h
@@ -266,6 +266,9 @@ typedef struct _mp_state_thread_t {
     // pending exception object (MP_OBJ_NULL if not pending)
     volatile mp_obj_t mp_pending_exception;
 
+    // If MP_OBJ_STOP_ITERATION is propagated then this holds its argument.
+    mp_obj_t stop_iteration_arg;
+
     #if MICROPY_PY_SYS_SETTRACE
     mp_obj_t prof_trace_callback;
     bool prof_callback_is_executing;
diff --git a/py/objgenerator.c b/py/objgenerator.c
index 1ee7b8b1db900..784310092ea11 100644
--- a/py/objgenerator.c
+++ b/py/objgenerator.c
@@ -238,16 +238,20 @@ mp_vm_return_kind_t mp_obj_gen_resume(mp_obj_t self_in, mp_obj_t send_value, mp_
     return ret_kind;
 }
 
-STATIC mp_obj_t gen_resume_and_raise(mp_obj_t self_in, mp_obj_t send_value, mp_obj_t throw_value) {
+STATIC mp_obj_t gen_resume_and_raise(mp_obj_t self_in, mp_obj_t send_value, mp_obj_t throw_value, bool raise_stop_iteration) {
     mp_obj_t ret;
     switch (mp_obj_gen_resume(self_in, send_value, throw_value, &ret)) {
         case MP_VM_RETURN_NORMAL:
         default:
-            // Optimize return w/o value in case generator is used in for loop
-            if (ret == mp_const_none || ret == MP_OBJ_STOP_ITERATION) {
-                return MP_OBJ_STOP_ITERATION;
+            // A normal return is a StopIteration, either raise it or return
+            // MP_OBJ_STOP_ITERATION as an optimisation.
+            if (ret == mp_const_none) {
+                ret = MP_OBJ_NULL;
+            }
+            if (raise_stop_iteration) {
+                mp_raise_StopIteration(ret);
             } else {
-                nlr_raise(mp_obj_new_exception_arg1(&mp_type_StopIteration, ret));
+                return mp_make_stop_iteration(ret);
             }
 
         case MP_VM_RETURN_YIELD:
@@ -259,16 +263,11 @@ STATIC mp_obj_t gen_resume_and_raise(mp_obj_t self_in, mp_obj_t send_value, mp_o
 }
 
 STATIC mp_obj_t gen_instance_iternext(mp_obj_t self_in) {
-    return gen_resume_and_raise(self_in, mp_const_none, MP_OBJ_NULL);
+    return gen_resume_and_raise(self_in, mp_const_none, MP_OBJ_NULL, false);
 }
 
 STATIC mp_obj_t gen_instance_send(mp_obj_t self_in, mp_obj_t send_value) {
-    mp_obj_t ret = gen_resume_and_raise(self_in, send_value, MP_OBJ_NULL);
-    if (ret == MP_OBJ_STOP_ITERATION) {
-        mp_raise_type(&mp_type_StopIteration);
-    } else {
-        return ret;
-    }
+    return gen_resume_and_raise(self_in, send_value, MP_OBJ_NULL, true);
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_2(gen_instance_send_obj, gen_instance_send);
 
@@ -290,12 +289,7 @@ STATIC mp_obj_t gen_instance_throw(size_t n_args, const mp_obj_t *args) {
         exc = args[2];
     }
 
-    mp_obj_t ret = gen_resume_and_raise(args[0], mp_const_none, exc);
-    if (ret == MP_OBJ_STOP_ITERATION) {
-        mp_raise_type(&mp_type_StopIteration);
-    } else {
-        return ret;
-    }
+    return gen_resume_and_raise(args[0], mp_const_none, exc, true);
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(gen_instance_throw_obj, 2, 4, gen_instance_throw);
 
diff --git a/py/objgetitemiter.c b/py/objgetitemiter.c
index 2670314ab2f32..31ed4a9228ce5 100644
--- a/py/objgetitemiter.c
+++ b/py/objgetitemiter.c
@@ -48,7 +48,6 @@ STATIC mp_obj_t it_iternext(mp_obj_t self_in) {
         // an exception was raised
         mp_obj_type_t *t = (mp_obj_type_t *)((mp_obj_base_t *)nlr.ret_val)->type;
         if (t == &mp_type_StopIteration || t == &mp_type_IndexError) {
-            // return MP_OBJ_STOP_ITERATION instead of raising
             return MP_OBJ_STOP_ITERATION;
         } else {
             // re-raise exception
diff --git a/py/runtime.c b/py/runtime.c
index b53711bbe27d4..2c849fe950c0f 100644
--- a/py/runtime.c
+++ b/py/runtime.c
@@ -1217,6 +1217,7 @@ mp_obj_t mp_getiter(mp_obj_t o_in, mp_obj_iter_buf_t *iter_buf) {
 mp_obj_t mp_iternext_allow_raise(mp_obj_t o_in) {
     const mp_obj_type_t *type = mp_obj_get_type(o_in);
     if (type->iternext != NULL) {
+        MP_STATE_THREAD(stop_iteration_arg) = MP_OBJ_NULL;
         return type->iternext(o_in);
     } else {
         // check for __next__ method
@@ -1242,6 +1243,7 @@ mp_obj_t mp_iternext(mp_obj_t o_in) {
     MP_STACK_CHECK(); // enumerate, filter, map and zip can recursively call mp_iternext
     const mp_obj_type_t *type = mp_obj_get_type(o_in);
     if (type->iternext != NULL) {
+        MP_STATE_THREAD(stop_iteration_arg) = MP_OBJ_NULL;
         return type->iternext(o_in);
     } else {
         // check for __next__ method
@@ -1256,7 +1258,7 @@ mp_obj_t mp_iternext(mp_obj_t o_in) {
                 return ret;
             } else {
                 if (mp_obj_is_subclass_fast(MP_OBJ_FROM_PTR(((mp_obj_base_t *)nlr.ret_val)->type), MP_OBJ_FROM_PTR(&mp_type_StopIteration))) {
-                    return MP_OBJ_STOP_ITERATION;
+                    return mp_make_stop_iteration(mp_obj_exception_get_value(MP_OBJ_FROM_PTR(nlr.ret_val)));
                 } else {
                     nlr_jump(nlr.ret_val);
                 }
@@ -1281,14 +1283,18 @@ mp_vm_return_kind_t mp_resume(mp_obj_t self_in, mp_obj_t send_value, mp_obj_t th
     }
 
     if (type->iternext != NULL && send_value == mp_const_none) {
+        MP_STATE_THREAD(stop_iteration_arg) = MP_OBJ_NULL;
         mp_obj_t ret = type->iternext(self_in);
         *ret_val = ret;
         if (ret != MP_OBJ_STOP_ITERATION) {
             return MP_VM_RETURN_YIELD;
         } else {
             // The generator is finished.
-            // This is an optimised "raise StopIteration(None)".
-            *ret_val = mp_const_none;
+            // This is an optimised "raise StopIteration(*ret_val)".
+            *ret_val = MP_STATE_THREAD(stop_iteration_arg);
+            if (*ret_val == MP_OBJ_NULL) {
+                *ret_val = mp_const_none;
+            }
             return MP_VM_RETURN_NORMAL;
         }
     }
@@ -1559,6 +1565,14 @@ NORETURN void mp_raise_NotImplementedError(mp_rom_error_text_t msg) {
 
 #endif
 
+NORETURN void mp_raise_StopIteration(mp_obj_t arg) {
+    if (arg == MP_OBJ_NULL) {
+        mp_raise_type(&mp_type_StopIteration);
+    } else {
+        nlr_raise(mp_obj_new_exception_arg1(&mp_type_StopIteration, arg));
+    }
+}
+
 NORETURN void mp_raise_OSError(int errno_) {
     nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(errno_)));
 }
diff --git a/py/runtime.h b/py/runtime.h
index 7d2cb94e84312..8484479a544fe 100644
--- a/py/runtime.h
+++ b/py/runtime.h
@@ -154,6 +154,11 @@ mp_obj_t mp_iternext_allow_raise(mp_obj_t o); // may return MP_OBJ_STOP_ITERATIO
 mp_obj_t mp_iternext(mp_obj_t o); // will always return MP_OBJ_STOP_ITERATION instead of raising StopIteration(...)
 mp_vm_return_kind_t mp_resume(mp_obj_t self_in, mp_obj_t send_value, mp_obj_t throw_value, mp_obj_t *ret_val);
 
+static inline mp_obj_t mp_make_stop_iteration(mp_obj_t o) {
+    MP_STATE_THREAD(stop_iteration_arg) = o;
+    return MP_OBJ_STOP_ITERATION;
+}
+
 mp_obj_t mp_make_raise_obj(mp_obj_t o);
 
 mp_obj_t mp_import_name(qstr name, mp_obj_t fromlist, mp_obj_t level);
@@ -179,6 +184,7 @@ NORETURN void mp_raise_TypeError(mp_rom_error_text_t msg);
 NORETURN void mp_raise_NotImplementedError(mp_rom_error_text_t msg);
 #endif
 
+NORETURN void mp_raise_StopIteration(mp_obj_t arg);
 NORETURN void mp_raise_OSError(int errno_);
 NORETURN void mp_raise_recursion_depth(void);
 
diff --git a/tests/basics/gen_yield_from_stopped.py b/tests/basics/gen_yield_from_stopped.py
index 468679b61508d..82feefed08bf7 100644
--- a/tests/basics/gen_yield_from_stopped.py
+++ b/tests/basics/gen_yield_from_stopped.py
@@ -16,3 +16,15 @@ def run():
     next(run())
 except StopIteration:
     print("StopIteration")
+
+
+# Where "f" is a native generator
+def run():
+    print((yield from f))
+
+
+f = zip()
+try:
+    next(run())
+except StopIteration:
+    print("StopIteration")
diff --git a/tests/basics/stopiteration.py b/tests/basics/stopiteration.py
new file mode 100644
index 0000000000000..d4719c9bc35ec
--- /dev/null
+++ b/tests/basics/stopiteration.py
@@ -0,0 +1,63 @@
+# test StopIteration interaction with generators
+
+try:
+    enumerate, exec
+except:
+    print("SKIP")
+    raise SystemExit
+
+
+def get_stop_iter_arg(msg, code):
+    try:
+        exec(code)
+        print("FAIL")
+    except StopIteration as er:
+        print(msg, er.args)
+
+
+class A:
+    def __iter__(self):
+        return self
+
+    def __next__(self):
+        raise StopIteration(42)
+
+
+class B:
+    def __getitem__(self, index):
+        # argument to StopIteration should get ignored
+        raise StopIteration(42)
+
+
+def gen(x):
+    return x
+    yield
+
+
+def gen2(x):
+    try:
+        yield
+    except ValueError:
+        pass
+    return x
+
+
+get_stop_iter_arg("next", "next(A())")
+get_stop_iter_arg("iter", "next(iter(B()))")
+get_stop_iter_arg("enumerate", "next(enumerate(A()))")
+get_stop_iter_arg("map", "next(map(lambda x:x, A()))")
+get_stop_iter_arg("zip", "next(zip(A()))")
+g = gen(None)
+get_stop_iter_arg("generator0", "next(g)")
+get_stop_iter_arg("generator1", "next(g)")
+g = gen(42)
+get_stop_iter_arg("generator0", "next(g)")
+get_stop_iter_arg("generator1", "next(g)")
+get_stop_iter_arg("send", "gen(None).send(None)")
+get_stop_iter_arg("send", "gen(42).send(None)")
+g = gen2(None)
+next(g)
+get_stop_iter_arg("throw", "g.throw(ValueError)")
+g = gen2(42)
+next(g)
+get_stop_iter_arg("throw", "g.throw(ValueError)")

From 38a204ed9605a9233a66c86538562fab821ce63a Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 14 Jul 2021 22:56:52 +1000
Subject: [PATCH 1069/3533] py: Introduce and use mp_raise_type_arg helper.

To reduce code size.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/modure.c     |  6 +++---
 extmod/moduzlib.c   |  2 +-
 ports/unix/modjni.c |  4 ++--
 py/dynruntime.h     |  1 +
 py/objdict.c        |  6 +++---
 py/objset.c         |  2 +-
 py/objstr.c         |  2 +-
 py/pystack.c        |  3 +--
 py/runtime.c        | 11 +++++++----
 py/runtime.h        |  1 +
 10 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/extmod/modure.c b/extmod/modure.c
index d0829e8c5df2a..738a2b9843ee6 100644
--- a/extmod/modure.c
+++ b/extmod/modure.c
@@ -68,7 +68,7 @@ STATIC mp_obj_t match_group(mp_obj_t self_in, mp_obj_t no_in) {
     mp_obj_match_t *self = MP_OBJ_TO_PTR(self_in);
     mp_int_t no = mp_obj_get_int(no_in);
     if (no < 0 || no >= self->num_matches) {
-        nlr_raise(mp_obj_new_exception_arg1(&mp_type_IndexError, no_in));
+        mp_raise_type_arg(&mp_type_IndexError, no_in);
     }
 
     const char *start = self->caps[no * 2];
@@ -107,7 +107,7 @@ STATIC void match_span_helper(size_t n_args, const mp_obj_t *args, mp_obj_t span
     if (n_args == 2) {
         no = mp_obj_get_int(args[1]);
         if (no < 0 || no >= self->num_matches) {
-            nlr_raise(mp_obj_new_exception_arg1(&mp_type_IndexError, args[1]));
+            mp_raise_type_arg(&mp_type_IndexError, args[1]);
         }
     }
 
@@ -334,7 +334,7 @@ STATIC mp_obj_t re_sub_helper(size_t n_args, const mp_obj_t *args) {
                     }
 
                     if (match_no >= (unsigned int)match->num_matches) {
-                        nlr_raise(mp_obj_new_exception_arg1(&mp_type_IndexError, MP_OBJ_NEW_SMALL_INT(match_no)));
+                        mp_raise_type_arg(&mp_type_IndexError, MP_OBJ_NEW_SMALL_INT(match_no));
                     }
 
                     const char *start_match = match->caps[match_no * 2];
diff --git a/extmod/moduzlib.c b/extmod/moduzlib.c
index 999cb48131422..f78c349085f76 100644
--- a/extmod/moduzlib.c
+++ b/extmod/moduzlib.c
@@ -201,7 +201,7 @@ STATIC mp_obj_t mod_uzlib_decompress(size_t n_args, const mp_obj_t *args) {
     return res;
 
 error:
-    nlr_raise(mp_obj_new_exception_arg1(&mp_type_ValueError, MP_OBJ_NEW_SMALL_INT(st)));
+    mp_raise_type_arg(&mp_type_ValueError, MP_OBJ_NEW_SMALL_INT(st));
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_uzlib_decompress_obj, 1, 3, mod_uzlib_decompress);
 
diff --git a/ports/unix/modjni.c b/ports/unix/modjni.c
index 74e7221de3037..bd151050eae49 100644
--- a/ports/unix/modjni.c
+++ b/ports/unix/modjni.c
@@ -102,9 +102,9 @@ STATIC void check_exception(void) {
         mp_obj_t py_e = new_jobject(exc);
         JJ1(ExceptionClear);
         if (JJ(IsInstanceOf, exc, IndexException_class)) {
-            nlr_raise(mp_obj_new_exception_arg1(&mp_type_IndexError, py_e));
+            mp_raise_type_arg(&mp_type_IndexError, py_e);
         }
-        nlr_raise(mp_obj_new_exception_arg1(&mp_type_Exception, py_e));
+        mp_raise_type_arg(&mp_type_Exception, py_e);
     }
 }
 
diff --git a/py/dynruntime.h b/py/dynruntime.h
index a8256c19487c4..fdb91ed37e98c 100644
--- a/py/dynruntime.h
+++ b/py/dynruntime.h
@@ -215,6 +215,7 @@ static inline mp_obj_t mp_obj_len_dyn(mp_obj_t o) {
 #define mp_obj_new_exception_arg1(e_type, arg)  (mp_obj_new_exception_arg1_dyn((e_type), (arg)))
 
 #define nlr_raise(o)                            (mp_raise_dyn(o))
+#define mp_raise_type_arg(type, arg)            (mp_raise_dyn(mp_obj_new_exception_arg1_dyn((type), (arg))))
 #define mp_raise_msg(type, msg)                 (mp_fun_table.raise_msg((type), (msg)))
 #define mp_raise_OSError(er)                    (mp_raise_OSError_dyn(er))
 #define mp_raise_NotImplementedError(msg)       (mp_raise_msg(&mp_type_NotImplementedError, (msg)))
diff --git a/py/objdict.c b/py/objdict.c
index aea5952d3ddad..63e5381c66449 100644
--- a/py/objdict.c
+++ b/py/objdict.c
@@ -190,7 +190,7 @@ mp_obj_t mp_obj_dict_get(mp_obj_t self_in, mp_obj_t index) {
     mp_obj_dict_t *self = MP_OBJ_TO_PTR(self_in);
     mp_map_elem_t *elem = mp_map_lookup(&self->map, index, MP_MAP_LOOKUP);
     if (elem == NULL) {
-        nlr_raise(mp_obj_new_exception_arg1(&mp_type_KeyError, index));
+        mp_raise_type_arg(&mp_type_KeyError, index);
     } else {
         return elem->value;
     }
@@ -206,7 +206,7 @@ STATIC mp_obj_t dict_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) {
         mp_obj_dict_t *self = MP_OBJ_TO_PTR(self_in);
         mp_map_elem_t *elem = mp_map_lookup(&self->map, index, MP_MAP_LOOKUP);
         if (elem == NULL) {
-            nlr_raise(mp_obj_new_exception_arg1(&mp_type_KeyError, index));
+            mp_raise_type_arg(&mp_type_KeyError, index);
         } else {
             return elem->value;
         }
@@ -295,7 +295,7 @@ STATIC mp_obj_t dict_get_helper(size_t n_args, const mp_obj_t *args, mp_map_look
     if (elem == NULL || elem->value == MP_OBJ_NULL) {
         if (n_args == 2) {
             if (lookup_kind == MP_MAP_LOOKUP_REMOVE_IF_FOUND) {
-                nlr_raise(mp_obj_new_exception_arg1(&mp_type_KeyError, args[1]));
+                mp_raise_type_arg(&mp_type_KeyError, args[1]);
             } else {
                 value = mp_const_none;
             }
diff --git a/py/objset.c b/py/objset.c
index dac9b1138291e..d2508bfbf9e3f 100644
--- a/py/objset.c
+++ b/py/objset.c
@@ -372,7 +372,7 @@ STATIC mp_obj_t set_remove(mp_obj_t self_in, mp_obj_t item) {
     check_set(self_in);
     mp_obj_set_t *self = MP_OBJ_TO_PTR(self_in);
     if (mp_set_lookup(&self->set, item, MP_MAP_LOOKUP_REMOVE_IF_FOUND) == MP_OBJ_NULL) {
-        nlr_raise(mp_obj_new_exception_arg1(&mp_type_KeyError, item));
+        mp_raise_type_arg(&mp_type_KeyError, item);
     }
     return mp_const_none;
 }
diff --git a/py/objstr.c b/py/objstr.c
index 98657bd217b93..7d7f0e1dfa452 100644
--- a/py/objstr.c
+++ b/py/objstr.c
@@ -1081,7 +1081,7 @@ STATIC vstr_t mp_obj_str_format_helper(const char *str, const char *top, int *ar
                 field_name = lookup;
                 mp_map_elem_t *key_elem = mp_map_lookup(kwargs, field_q, MP_MAP_LOOKUP);
                 if (key_elem == NULL) {
-                    nlr_raise(mp_obj_new_exception_arg1(&mp_type_KeyError, field_q));
+                    mp_raise_type_arg(&mp_type_KeyError, field_q);
                 }
                 arg = key_elem->value;
             }
diff --git a/py/pystack.c b/py/pystack.c
index f7323fd7401e7..ea5f0d9d1127e 100644
--- a/py/pystack.c
+++ b/py/pystack.c
@@ -43,8 +43,7 @@ void *mp_pystack_alloc(size_t n_bytes) {
     #endif
     if (MP_STATE_THREAD(pystack_cur) + n_bytes > MP_STATE_THREAD(pystack_end)) {
         // out of memory in the pystack
-        nlr_raise(mp_obj_new_exception_arg1(&mp_type_RuntimeError,
-            MP_OBJ_NEW_QSTR(MP_QSTR_pystack_space_exhausted)));
+        mp_raise_type_arg(&mp_type_RuntimeError, MP_OBJ_NEW_QSTR(MP_QSTR_pystack_space_exhausted));
     }
     void *ptr = MP_STATE_THREAD(pystack_cur);
     MP_STATE_THREAD(pystack_cur) += n_bytes;
diff --git a/py/runtime.c b/py/runtime.c
index 2c849fe950c0f..19686c310ba7b 100644
--- a/py/runtime.c
+++ b/py/runtime.c
@@ -1565,21 +1565,24 @@ NORETURN void mp_raise_NotImplementedError(mp_rom_error_text_t msg) {
 
 #endif
 
+NORETURN void mp_raise_type_arg(const mp_obj_type_t *exc_type, mp_obj_t arg) {
+    nlr_raise(mp_obj_new_exception_arg1(exc_type, arg));
+}
+
 NORETURN void mp_raise_StopIteration(mp_obj_t arg) {
     if (arg == MP_OBJ_NULL) {
         mp_raise_type(&mp_type_StopIteration);
     } else {
-        nlr_raise(mp_obj_new_exception_arg1(&mp_type_StopIteration, arg));
+        mp_raise_type_arg(&mp_type_StopIteration, arg);
     }
 }
 
 NORETURN void mp_raise_OSError(int errno_) {
-    nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(errno_)));
+    mp_raise_type_arg(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(errno_));
 }
 
 #if MICROPY_STACK_CHECK || MICROPY_ENABLE_PYSTACK
 NORETURN void mp_raise_recursion_depth(void) {
-    nlr_raise(mp_obj_new_exception_arg1(&mp_type_RuntimeError,
-        MP_OBJ_NEW_QSTR(MP_QSTR_maximum_space_recursion_space_depth_space_exceeded)));
+    mp_raise_type_arg(&mp_type_RuntimeError, MP_OBJ_NEW_QSTR(MP_QSTR_maximum_space_recursion_space_depth_space_exceeded));
 }
 #endif
diff --git a/py/runtime.h b/py/runtime.h
index 8484479a544fe..f0d41f38df77f 100644
--- a/py/runtime.h
+++ b/py/runtime.h
@@ -184,6 +184,7 @@ NORETURN void mp_raise_TypeError(mp_rom_error_text_t msg);
 NORETURN void mp_raise_NotImplementedError(mp_rom_error_text_t msg);
 #endif
 
+NORETURN void mp_raise_type_arg(const mp_obj_type_t *exc_type, mp_obj_t arg);
 NORETURN void mp_raise_StopIteration(mp_obj_t arg);
 NORETURN void mp_raise_OSError(int errno_);
 NORETURN void mp_raise_recursion_depth(void);

From 74085f167e09694f1d32d3fb3d212066091f9f7d Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 14 Jul 2021 23:25:18 +1000
Subject: [PATCH 1070/3533] py/modsys: Optimise sys.exit for code size by using
 exception helpers.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/modsys.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/py/modsys.c b/py/modsys.c
index 586b13e747130..64349f3c306a5 100644
--- a/py/modsys.c
+++ b/py/modsys.c
@@ -110,13 +110,11 @@ STATIC const MP_DEFINE_STR_OBJ(mp_sys_platform_obj, MICROPY_PY_SYS_PLATFORM);
 
 // exit([retval]): raise SystemExit, with optional argument given to the exception
 STATIC mp_obj_t mp_sys_exit(size_t n_args, const mp_obj_t *args) {
-    mp_obj_t exc;
     if (n_args == 0) {
-        exc = mp_obj_new_exception(&mp_type_SystemExit);
+        mp_raise_type(&mp_type_SystemExit);
     } else {
-        exc = mp_obj_new_exception_arg1(&mp_type_SystemExit, args[0]);
+        mp_raise_type_arg(&mp_type_SystemExit, args[0]);
     }
-    nlr_raise(exc);
 }
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_sys_exit_obj, 0, 1, mp_sys_exit);
 

From 022b8a7fea5e74b6b83895b2ff555ceab9af478c Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 14 Jul 2021 23:28:25 +1000
Subject: [PATCH 1071/3533] py/objexcept: Make mp_obj_new_exception_arg1
 inline.

This function is rarely used so making it inline reduces code size.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/obj.h       | 5 ++++-
 py/objexcept.c | 6 ------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/py/obj.h b/py/obj.h
index 86e5d83125cb5..578c55eefbf31 100644
--- a/py/obj.h
+++ b/py/obj.h
@@ -739,7 +739,6 @@ mp_obj_t mp_obj_new_int_from_float(mp_float_t val);
 mp_obj_t mp_obj_new_complex(mp_float_t real, mp_float_t imag);
 #endif
 mp_obj_t mp_obj_new_exception(const mp_obj_type_t *exc_type);
-mp_obj_t mp_obj_new_exception_arg1(const mp_obj_type_t *exc_type, mp_obj_t arg);
 mp_obj_t mp_obj_new_exception_args(const mp_obj_type_t *exc_type, size_t n_args, const mp_obj_t *args);
 #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_NONE
 #define mp_obj_new_exception_msg(exc_type, msg) mp_obj_new_exception(exc_type)
@@ -825,6 +824,10 @@ mp_obj_t mp_obj_exception_get_value(mp_obj_t self_in);
 mp_obj_t mp_obj_exception_make_new(const mp_obj_type_t *type_in, size_t n_args, size_t n_kw, const mp_obj_t *args);
 mp_obj_t mp_alloc_emergency_exception_buf(mp_obj_t size_in);
 void mp_init_emergency_exception_buf(void);
+static inline mp_obj_t mp_obj_new_exception_arg1(const mp_obj_type_t *exc_type, mp_obj_t arg) {
+    assert(exc_type->make_new == mp_obj_exception_make_new);
+    return mp_obj_exception_make_new(exc_type, 1, 0, &arg);
+}
 
 // str
 bool mp_obj_str_equal(mp_obj_t s1, mp_obj_t s2);
diff --git a/py/objexcept.c b/py/objexcept.c
index b4f5018c0697e..7a86c36471b62 100644
--- a/py/objexcept.c
+++ b/py/objexcept.c
@@ -378,12 +378,6 @@ mp_obj_t mp_obj_new_exception(const mp_obj_type_t *exc_type) {
     return mp_obj_exception_make_new(exc_type, 0, 0, NULL);
 }
 
-// "Optimized" version for common(?) case of having 1 exception arg
-mp_obj_t mp_obj_new_exception_arg1(const mp_obj_type_t *exc_type, mp_obj_t arg) {
-    assert(exc_type->make_new == mp_obj_exception_make_new);
-    return mp_obj_exception_make_new(exc_type, 1, 0, &arg);
-}
-
 mp_obj_t mp_obj_new_exception_args(const mp_obj_type_t *exc_type, size_t n_args, const mp_obj_t *args) {
     assert(exc_type->make_new == mp_obj_exception_make_new);
     return mp_obj_exception_make_new(exc_type, n_args, 0, args);

From 70b8e1d1f5df9b8f80992daa5d60460d45998a8e Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 14 Jul 2021 23:38:49 +1000
Subject: [PATCH 1072/3533] py/obj: Fix formatting of comment for
 mp_obj_is_integer.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/obj.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/py/obj.h b/py/obj.h
index 578c55eefbf31..11918ba17657d 100644
--- a/py/obj.h
+++ b/py/obj.h
@@ -779,9 +779,11 @@ bool mp_obj_is_callable(mp_obj_t o_in);
 mp_obj_t mp_obj_equal_not_equal(mp_binary_op_t op, mp_obj_t o1, mp_obj_t o2);
 bool mp_obj_equal(mp_obj_t o1, mp_obj_t o2);
 
+// returns true if o is bool, small int or long int
 static inline bool mp_obj_is_integer(mp_const_obj_t o) {
     return mp_obj_is_int(o) || mp_obj_is_bool(o);
-}                                                                                                        // returns true if o is bool, small int or long int
+}
+
 mp_int_t mp_obj_get_int(mp_const_obj_t arg);
 mp_int_t mp_obj_get_int_truncated(mp_const_obj_t arg);
 bool mp_obj_get_int_maybe(mp_const_obj_t arg, mp_int_t *value);

From 06277a916940eee1064eebb491c3e13d67fe6a18 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 14 Jul 2021 23:40:24 +1000
Subject: [PATCH 1073/3533] mimxrt/machine_led: Use mp_raise_msg_varg helper.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/mimxrt/machine_led.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/mimxrt/machine_led.c b/ports/mimxrt/machine_led.c
index 07c7b180a10e6..4082eb34bbbfb 100644
--- a/ports/mimxrt/machine_led.c
+++ b/ports/mimxrt/machine_led.c
@@ -44,7 +44,7 @@ STATIC mp_obj_t led_obj_make_new(const mp_obj_type_t *type, size_t n_args, size_
 
     // Check led id is in range
     if (!(1 <= led_id && led_id <= NUM_LEDS)) {
-        nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError, "LED(%d) doesn't exist", led_id));
+        mp_raise_msg_varg(&mp_type_ValueError, "LED(%d) doesn't exist", led_id);
     }
 
     // Return reference to static object

From 98c5703027e7db9a030f747f4dd1684407230656 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sat, 19 Jun 2021 22:09:40 +0200
Subject: [PATCH 1074/3533] mimxrt/machine_i2c: Add hardware-based machine.I2C
 to machine module.

It uses non-blocking transfer of data.  Advantage over SoftI2C:
- Higher data rate up to ~3 MHZ.
- Full protocol support.
---
 ports/mimxrt/Makefile                         |   2 +
 .../boards/MIMXRT1010_EVK/mpconfigboard.h     |  12 +
 .../boards/MIMXRT1020_EVK/mpconfigboard.h     |  17 +-
 .../boards/MIMXRT1050_EVK/mpconfigboard.h     |  12 +
 .../boards/MIMXRT1060_EVK/mpconfigboard.h     |  12 +
 .../boards/MIMXRT1064_EVK/mpconfigboard.h     |  12 +
 ports/mimxrt/boards/TEENSY40/mpconfigboard.h  |  14 ++
 ports/mimxrt/boards/TEENSY41/mpconfigboard.h  |  14 ++
 ports/mimxrt/machine_i2c.c                    | 217 ++++++++++++++++++
 ports/mimxrt/modmachine.c                     |   1 +
 ports/mimxrt/modmachine.h                     |   1 +
 11 files changed, 313 insertions(+), 1 deletion(-)
 create mode 100644 ports/mimxrt/machine_i2c.c

diff --git a/ports/mimxrt/Makefile b/ports/mimxrt/Makefile
index 64d9864cbbf8c..580dc32c7eb16 100644
--- a/ports/mimxrt/Makefile
+++ b/ports/mimxrt/Makefile
@@ -123,6 +123,7 @@ SRC_HAL_IMX_C += \
 	$(MCU_DIR)/drivers/fsl_gpio.c \
 	$(MCU_DIR)/drivers/fsl_gpt.c \
 	$(MCU_DIR)/drivers/fsl_common.c \
+	$(MCU_DIR)/drivers/fsl_lpi2c.c \
 	$(MCU_DIR)/drivers/fsl_lpspi.c \
 	$(MCU_DIR)/drivers/fsl_lpspi_edma.c \
 	$(MCU_DIR)/drivers/fsl_lpuart.c \
@@ -142,6 +143,7 @@ SRC_C = \
 	dma_channel.c \
 	$(BOARD_DIR)/flash_config.c \
 	machine_adc.c \
+	machine_i2c.c \
 	machine_led.c \
 	machine_pin.c \
 	machine_rtc.c \
diff --git a/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.h b/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.h
index 3576706264946..756eaf85eb7b5 100644
--- a/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.h
+++ b/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.h
@@ -33,3 +33,15 @@
 
 #define DMA_REQ_SRC_RX { 0, kDmaRequestMuxLPSPI1Rx, kDmaRequestMuxLPSPI2Rx }
 #define DMA_REQ_SRC_TX { 0, kDmaRequestMuxLPSPI1Tx, kDmaRequestMuxLPSPI2Tx } 
+
+// Define mapping hardware I2C # to logical I2C #
+// SDA/SCL  HW-I2C    Logical I2C
+// D14/D15  LPI2C1 ->    0
+// D0/D1    LPI2C2 ->    1
+// D6/D7    LPI2C2 ->    1   Alternatively possible GPIO_AD_01, GPIO_AD_02
+
+#define MICROPY_HW_I2C_INDEX   { 1, 2 }
+
+#define IOMUX_TABLE_I2C \
+    { IOMUXC_GPIO_02_LPI2C1_SCL }, { IOMUXC_GPIO_01_LPI2C1_SDA }, \
+    { IOMUXC_GPIO_10_LPI2C2_SCL }, { IOMUXC_GPIO_09_LPI2C2_SDA },
diff --git a/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.h b/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.h
index 55254d58f6561..b0574fad0f3e5 100644
--- a/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.h
+++ b/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.h
@@ -13,7 +13,8 @@
 #define MICROPY_HW_NUM_PIN_IRQS (3 * 32)
 
 // Define mapping logical UART # to hardware UART #
-// D3/D5   LPUART1  Not usable, Since D3 is blocked.
+// RX/TX   HW-UART    Logical UART
+// D3/D5   LPUART1    Not usable, Since D3 is blocked.
 // D0/D1   LPUART2 -> 1
 // D6/D9   LPUART3 -> 2
 // D10/D12 LPUART5 -> 3
@@ -48,3 +49,17 @@
 
 #define DMA_REQ_SRC_TX { 0, kDmaRequestMuxLPSPI1Tx, kDmaRequestMuxLPSPI2Tx, \
                             kDmaRequestMuxLPSPI3Tx, kDmaRequestMuxLPSPI4Tx } 
+
+// Define mapping hardware I2C # to logical I2C #
+// SDA/SCL  HW-I2C    Logical I2C
+// D14/D15  LPI2C4 ->    0
+// A4/A5    LPI2C1 ->    1
+// D0/D1    LPI2C2 ->    2
+
+#define MICROPY_HW_I2C_INDEX   { 4, 1, 2 }
+
+#define IOMUX_TABLE_I2C \
+    { IOMUXC_GPIO_AD_B1_14_LPI2C1_SCL }, { IOMUXC_GPIO_AD_B1_15_LPI2C1_SDA }, \
+    { IOMUXC_GPIO_AD_B1_08_LPI2C2_SCL }, { IOMUXC_GPIO_AD_B1_09_LPI2C2_SDA }, \
+    { 0 }, { 0 }, \
+    { IOMUXC_GPIO_SD_B1_02_LPI2C4_SCL }, { IOMUXC_GPIO_SD_B1_03_LPI2C4_SDA },
diff --git a/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.h b/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.h
index db08b1064d42b..5d920d52867e2 100644
--- a/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.h
+++ b/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.h
@@ -41,3 +41,15 @@
 
 #define DMA_REQ_SRC_TX { 0, kDmaRequestMuxLPSPI1Tx, kDmaRequestMuxLPSPI2Tx, \
                             kDmaRequestMuxLPSPI3Tx, kDmaRequestMuxLPSPI4Tx } 
+
+// Define the mapping hardware I2C # to logical I2C #
+// SDA/SCL  HW-I2C    Logical I2C
+// D14/D15  LPI2C1 ->    0
+// D1/D0    LPI2C3 ->    1
+
+#define MICROPY_HW_I2C_INDEX   { 1, 3 }
+
+#define IOMUX_TABLE_I2C \
+    { IOMUXC_GPIO_AD_B1_00_LPI2C1_SCL }, { IOMUXC_GPIO_AD_B1_01_LPI2C1_SDA }, \
+    { 0 }, { 0 }, \
+    { IOMUXC_GPIO_AD_B1_07_LPI2C3_SCL }, { IOMUXC_GPIO_AD_B1_06_LPI2C3_SDA },
diff --git a/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.h b/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.h
index 451d53dafdc52..f849cba966131 100644
--- a/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.h
+++ b/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.h
@@ -41,3 +41,15 @@
 
 #define DMA_REQ_SRC_TX { 0, kDmaRequestMuxLPSPI1Tx, kDmaRequestMuxLPSPI2Tx, \
                             kDmaRequestMuxLPSPI3Tx, kDmaRequestMuxLPSPI4Tx } 
+
+// Define the mapping hardware I2C # to logical I2C #
+// SDA/SCL  HW-I2C    Logical I2C
+// D14/D15  LPI2C1 ->    0
+// D1/D0    LPI2C3 ->    1
+
+#define MICROPY_HW_I2C_INDEX   { 1, 3 }
+
+#define IOMUX_TABLE_I2C \
+    { IOMUXC_GPIO_AD_B1_00_LPI2C1_SCL }, { IOMUXC_GPIO_AD_B1_01_LPI2C1_SDA }, \
+    { 0 }, { 0 }, \
+    { IOMUXC_GPIO_AD_B1_07_LPI2C3_SCL }, { IOMUXC_GPIO_AD_B1_06_LPI2C3_SDA },
diff --git a/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.h b/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.h
index e300efef321ea..2301f34131c70 100644
--- a/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.h
+++ b/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.h
@@ -39,3 +39,15 @@
 
 #define DMA_REQ_SRC_TX { 0, kDmaRequestMuxLPSPI1Tx, kDmaRequestMuxLPSPI2Tx, \
                             kDmaRequestMuxLPSPI3Tx, kDmaRequestMuxLPSPI4Tx } 
+
+// Define the mapping hardware I2C # to logical I2C #
+// SDA/SCL  HW-I2C    Logical I2C
+// D14/D15  LPI2C1 ->    0
+// D1/D0    LPI2C3 ->    1
+
+#define MICROPY_HW_I2C_INDEX   { 1, 3 }
+
+#define IOMUX_TABLE_I2C \
+    { IOMUXC_GPIO_AD_B1_00_LPI2C1_SCL }, { IOMUXC_GPIO_AD_B1_01_LPI2C1_SDA }, \
+    { 0 }, { 0 }, \
+    { IOMUXC_GPIO_AD_B1_07_LPI2C3_SCL }, { IOMUXC_GPIO_AD_B1_06_LPI2C3_SDA },
diff --git a/ports/mimxrt/boards/TEENSY40/mpconfigboard.h b/ports/mimxrt/boards/TEENSY40/mpconfigboard.h
index 8b38d047f8020..b6c81a42298ec 100644
--- a/ports/mimxrt/boards/TEENSY40/mpconfigboard.h
+++ b/ports/mimxrt/boards/TEENSY40/mpconfigboard.h
@@ -42,3 +42,17 @@
 
 #define DMA_REQ_SRC_TX { 0, kDmaRequestMuxLPSPI1Tx, kDmaRequestMuxLPSPI2Tx, \
                             kDmaRequestMuxLPSPI3Tx, kDmaRequestMuxLPSPI4Tx } 
+
+// Define mapping hardware I2C # to logical I2C #
+// SDA/SCL  HW-I2C    Logical I2C
+// 17/16    LPI2C3 ->    0
+// 18/19    LPI2C1 ->    1
+// 25/24    LPI2C4 ->    2
+
+#define MICROPY_HW_I2C_INDEX   { 1, 3, 4 }
+
+#define IOMUX_TABLE_I2C \
+    { IOMUXC_GPIO_AD_B1_00_LPI2C1_SCL }, { IOMUXC_GPIO_AD_B1_01_LPI2C1_SDA }, \
+    { 0 }, { 0 }, \
+    { IOMUXC_GPIO_AD_B1_07_LPI2C3_SCL }, { IOMUXC_GPIO_AD_B1_06_LPI2C3_SDA }, \
+    { IOMUXC_GPIO_AD_B0_12_LPI2C4_SCL }, { IOMUXC_GPIO_AD_B0_13_LPI2C4_SDA },
diff --git a/ports/mimxrt/boards/TEENSY41/mpconfigboard.h b/ports/mimxrt/boards/TEENSY41/mpconfigboard.h
index 455bf8d69c774..17d2751682585 100644
--- a/ports/mimxrt/boards/TEENSY41/mpconfigboard.h
+++ b/ports/mimxrt/boards/TEENSY41/mpconfigboard.h
@@ -42,3 +42,17 @@
 
 #define DMA_REQ_SRC_TX { 0, kDmaRequestMuxLPSPI1Tx, kDmaRequestMuxLPSPI2Tx, \
                             kDmaRequestMuxLPSPI3Tx, kDmaRequestMuxLPSPI4Tx } 
+
+// Define mapping hardware I2C # to logical I2C #
+// SDA/SCL  HW-I2C    Logical I2C
+// 17/16    LPI2C3 ->    0
+// 18/19    LPI2C1 ->    1
+// 25/24    LPI2C4 ->    2
+
+#define MICROPY_HW_I2C_INDEX   { 1, 3, 4 }
+
+#define IOMUX_TABLE_I2C \
+    { IOMUXC_GPIO_AD_B1_00_LPI2C1_SCL }, { IOMUXC_GPIO_AD_B1_01_LPI2C1_SDA }, \
+    { 0 }, { 0 }, \
+    { IOMUXC_GPIO_AD_B1_07_LPI2C3_SCL }, { IOMUXC_GPIO_AD_B1_06_LPI2C3_SDA }, \
+    { IOMUXC_GPIO_AD_B0_12_LPI2C4_SCL }, { IOMUXC_GPIO_AD_B0_13_LPI2C4_SDA },
diff --git a/ports/mimxrt/machine_i2c.c b/ports/mimxrt/machine_i2c.c
new file mode 100644
index 0000000000000..618d0a2581cd1
--- /dev/null
+++ b/ports/mimxrt/machine_i2c.c
@@ -0,0 +1,217 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020-2021 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "py/runtime.h"
+#include "py/mphal.h"
+#include "py/mperrno.h"
+#include "extmod/machine_i2c.h"
+#include "modmachine.h"
+
+#include "fsl_iomuxc.h"
+#include "fsl_lpi2c.h"
+
+#define DEFAULT_I2C_FREQ        (400000)
+#define DEFAULT_I2C_DRIVE       (6)
+
+// Select USB1 PLL (480 MHz) as master lpi2c clock source
+#define LPI2C_CLOCK_SOURCE_SELECT (0U)
+// Clock divider for master lpi2c clock source
+#define LPI2C_CLOCK_SOURCE_DIVIDER (1U)
+// Get frequency of lpi2c clock = 30 MHz
+#define LPI2C_CLOCK_FREQUENCY ((CLOCK_GetFreq(kCLOCK_Usb1PllClk) / 8) / (LPI2C_CLOCK_SOURCE_DIVIDER + 1U))
+
+typedef struct _machine_i2c_obj_t {
+    mp_obj_base_t base;
+    LPI2C_Type *i2c_inst;
+    uint8_t i2c_id;
+    uint8_t i2c_hw_id;
+    bool transfer_busy;
+    status_t transfer_status;
+    lpi2c_master_config_t *master_config;
+} machine_i2c_obj_t;
+
+typedef struct _iomux_table_t {
+    uint32_t muxRegister;
+    uint32_t muxMode;
+    uint32_t inputRegister;
+    uint32_t inputDaisy;
+    uint32_t configRegister;
+} iomux_table_t;
+
+STATIC const uint8_t i2c_index_table[] = MICROPY_HW_I2C_INDEX;
+STATIC LPI2C_Type *i2c_base_ptr_table[] = LPI2C_BASE_PTRS;
+static const iomux_table_t iomux_table[] = { IOMUX_TABLE_I2C };
+
+#define MICROPY_HW_I2C_NUM     ARRAY_SIZE(i2c_index_table)
+
+#define SCL (iomux_table[index])
+#define SDA (iomux_table[index + 1])
+
+bool lpi2c_set_iomux(int8_t hw_i2c, uint8_t drive) {
+    int index = (hw_i2c - 1) * 2;
+
+    if (SCL.muxRegister != 0) {
+        IOMUXC_SetPinMux(SCL.muxRegister, SCL.muxMode, SCL.inputRegister, SCL.inputDaisy, SCL.configRegister, 1U);
+        IOMUXC_SetPinConfig(SCL.muxRegister, SCL.muxMode, SCL.inputRegister, SCL.inputDaisy, SCL.configRegister,
+            0xF880u | drive << IOMUXC_SW_PAD_CTL_PAD_DSE_SHIFT);
+
+        IOMUXC_SetPinMux(SDA.muxRegister, SDA.muxMode, SDA.inputRegister, SDA.inputDaisy, SDA.configRegister, 1U);
+        IOMUXC_SetPinConfig(SDA.muxRegister, SDA.muxMode, SDA.inputRegister, SDA.inputDaisy, SDA.configRegister,
+            0xF880u | drive << IOMUXC_SW_PAD_CTL_PAD_DSE_SHIFT);
+        return true;
+    } else {
+        return false;
+    }
+}
+
+STATIC void machine_i2c_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+    machine_i2c_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    mp_printf(print, "I2C(%u, freq=%u)",
+        self->i2c_id, self->master_config->baudRate_Hz);
+}
+
+mp_obj_t machine_i2c_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
+    enum { ARG_id, ARG_freq, ARG_drive};
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_id, MP_ARG_REQUIRED | MP_ARG_OBJ },
+        { MP_QSTR_freq, MP_ARG_INT, {.u_int = DEFAULT_I2C_FREQ} },
+        { MP_QSTR_drive, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = DEFAULT_I2C_DRIVE} },
+    };
+
+    static bool clk_init = true;
+
+    // Parse args.
+    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
+    mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
+
+    // Get I2C bus.
+    int i2c_id = mp_obj_get_int(args[ARG_id].u_obj);
+    if (i2c_id < 0 || i2c_id >= MICROPY_HW_I2C_NUM) {
+        mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("I2C(%d) doesn't exist"), i2c_id);
+    }
+
+    // Get I2C Object.
+    machine_i2c_obj_t *self = m_new_obj(machine_i2c_obj_t);
+    self->base.type = &machine_i2c_type;
+    self->i2c_id = i2c_id;
+    self->i2c_hw_id = i2c_index_table[i2c_id];  // the hw i2c number 1..n
+    self->i2c_inst = i2c_base_ptr_table[self->i2c_hw_id];
+
+    uint8_t drive = args[ARG_drive].u_int;
+    if (drive < 1 || drive > 7) {
+        drive = DEFAULT_I2C_DRIVE;
+    }
+
+    if (clk_init) {
+        clk_init = false;
+        // Set clock source for LPI2C
+        CLOCK_SetMux(kCLOCK_Lpi2cMux, LPI2C_CLOCK_SOURCE_SELECT); // USB1 PLL (480 MHz)
+        CLOCK_SetDiv(kCLOCK_Lpi2cDiv, LPI2C_CLOCK_SOURCE_DIVIDER);
+    }
+
+    // Initialise the I2C peripheral if any arguments given, or it was not initialised previously.
+    lpi2c_set_iomux(self->i2c_hw_id, drive);
+    self->master_config = m_new_obj(lpi2c_master_config_t);
+    LPI2C_MasterGetDefaultConfig(self->master_config);
+    // Initialise the I2C peripheral.
+    self->master_config->baudRate_Hz = args[ARG_freq].u_int;
+    LPI2C_MasterInit(self->i2c_inst, self->master_config, LPI2C_CLOCK_FREQUENCY);
+
+    return MP_OBJ_FROM_PTR(self);
+}
+
+static void lpi2c_master_callback(LPI2C_Type *base, lpi2c_master_handle_t *handle, status_t status, void *self_in) {
+    machine_i2c_obj_t *self = (machine_i2c_obj_t *)self_in;
+
+    self->transfer_busy = false;
+    self->transfer_status = status;
+}
+
+STATIC int machine_i2c_transfer_single(mp_obj_base_t *self_in, uint16_t addr, size_t len, uint8_t *buf, unsigned int flags) {
+    machine_i2c_obj_t *self = (machine_i2c_obj_t *)self_in;
+    status_t ret;
+    lpi2c_master_handle_t g_master_handle;
+    lpi2c_master_transfer_t masterXfer = {0};
+    LPI2C_MasterTransferCreateHandle(self->i2c_inst, &g_master_handle, lpi2c_master_callback, self);
+
+    if (flags & MP_MACHINE_I2C_FLAG_READ) {
+        masterXfer.direction = kLPI2C_Read;
+    } else {
+        masterXfer.direction = kLPI2C_Write;
+    }
+    if (addr < 0x80) {  // 7 or 10 bit address?
+        masterXfer.slaveAddress = addr;
+    } else {
+        masterXfer.slaveAddress = 0x78 | ((addr >> 8) & 0x03);
+        masterXfer.subaddress = addr & 0xff;
+        masterXfer.subaddressSize = 1;
+    }
+    masterXfer.data = buf;
+    masterXfer.dataSize = len;
+    if (flags & MP_MACHINE_I2C_FLAG_STOP) {
+        masterXfer.flags = kLPI2C_TransferDefaultFlag;
+    } else {
+        masterXfer.flags = kLPI2C_TransferNoStopFlag;
+    }
+    self->transfer_busy = true;
+
+    // Send master data to slave in non-blocking mode
+    ret = LPI2C_MasterTransferNonBlocking(self->i2c_inst, &g_master_handle, &masterXfer);
+    if (ret != kStatus_Success) {
+        return -MP_EIO;
+    }
+    //  Wait for the transfer to complete
+    while (self->transfer_busy) {
+        MICROPY_EVENT_POLL_HOOK
+    }
+
+    // Transfer will not send a stop in case of errors like NAK. So it's done here.
+    if (flags & MP_MACHINE_I2C_FLAG_STOP && self->transfer_status != kStatus_Success) {
+        LPI2C_MasterStop(self->i2c_inst);
+    }
+
+    if (self->transfer_status == kStatus_Success) {
+        return len;
+    } else if (self->transfer_status == kStatus_LPI2C_Nak) {
+        return -MP_ENODEV;
+    } else {
+        return -MP_EIO;
+    }
+}
+
+STATIC const mp_machine_i2c_p_t machine_i2c_p = {
+    .transfer = mp_machine_i2c_transfer_adaptor,
+    .transfer_single = machine_i2c_transfer_single,
+};
+
+const mp_obj_type_t machine_i2c_type = {
+    { &mp_type_type },
+    .name = MP_QSTR_I2C,
+    .print = machine_i2c_print,
+    .make_new = machine_i2c_make_new,
+    .protocol = &machine_i2c_p,
+    .locals_dict = (mp_obj_dict_t *)&mp_machine_i2c_locals_dict,
+};
diff --git a/ports/mimxrt/modmachine.c b/ports/mimxrt/modmachine.c
index e821f15070c05..150615ca03a92 100644
--- a/ports/mimxrt/modmachine.c
+++ b/ports/mimxrt/modmachine.c
@@ -85,6 +85,7 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_Signal),              MP_ROM_PTR(&machine_signal_type) },
     { MP_ROM_QSTR(MP_QSTR_SoftI2C),             MP_ROM_PTR(&mp_machine_soft_i2c_type) },
     { MP_ROM_QSTR(MP_QSTR_SoftSPI),             MP_ROM_PTR(&mp_machine_soft_spi_type) },
+    { MP_ROM_QSTR(MP_QSTR_I2C),                 MP_ROM_PTR(&machine_i2c_type) },
     { MP_ROM_QSTR(MP_QSTR_SPI),                 MP_ROM_PTR(&machine_spi_type) },
     { MP_ROM_QSTR(MP_QSTR_UART),                MP_ROM_PTR(&machine_uart_type) },
 
diff --git a/ports/mimxrt/modmachine.h b/ports/mimxrt/modmachine.h
index eba8e6db8ff0a..9732093bd865d 100644
--- a/ports/mimxrt/modmachine.h
+++ b/ports/mimxrt/modmachine.h
@@ -32,6 +32,7 @@
 extern const mp_obj_type_t machine_adc_type;
 extern const mp_obj_type_t machine_timer_type;
 extern const mp_obj_type_t machine_rtc_type;
+extern const mp_obj_type_t machine_i2c_type;
 extern const mp_obj_type_t machine_spi_type;
 extern const mp_obj_type_t machine_uart_type;
 

From eb3029c6697007eac7a76a8bd34452cedbd2c526 Mon Sep 17 00:00:00 2001
From: Jonathan Hogg <me@jonathanhogg.com>
Date: Mon, 12 Jul 2021 11:35:25 +0100
Subject: [PATCH 1075/3533] esp32/machine_spi: Calculate actual attained
 baudrate.

Calculate the actual baudrate that the hardware is capable of achieving
and remember it so that printing the SPI object will show this. Fixes
#7530.
---
 ports/esp32/machine_hw_spi.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/ports/esp32/machine_hw_spi.c b/ports/esp32/machine_hw_spi.c
index 98c0abaefdb97..2792216cc07d6 100644
--- a/ports/esp32/machine_hw_spi.c
+++ b/ports/esp32/machine_hw_spi.c
@@ -144,9 +144,13 @@ STATIC void machine_hw_spi_init_internal(
         changed = true;
     }
 
-    if (baudrate != -1 && baudrate != self->baudrate) {
-        self->baudrate = baudrate;
-        changed = true;
+    if (baudrate != -1) {
+        // calculate the actual clock frequency that the SPI peripheral can produce
+        baudrate = spi_get_actual_clock(APB_CLK_FREQ, baudrate, 0);
+        if (baudrate != self->baudrate) {
+            self->baudrate = baudrate;
+            changed = true;
+        }
     }
 
     if (polarity != -1 && polarity != self->polarity) {

From 8be29b9b1b0fc2709d6ace3a9ff32092052359f6 Mon Sep 17 00:00:00 2001
From: Jonathan Hogg <me@jonathanhogg.com>
Date: Fri, 16 Jul 2021 16:12:45 +0100
Subject: [PATCH 1076/3533] esp32/machine_hw_spi: Use a 2 item SPI queue for
 long transfers.

Using a 2-item transaction queue instead of 1 allows long transfers to
be executed with the minimum inter-transaction delay. Limit maximum
transaction length to ensure an integer multiple of the SPI `bits`
setting are transferred. Fixes #7511.
---
 ports/esp32/machine_hw_spi.c | 52 ++++++++++++++++++++++++++++--------
 1 file changed, 41 insertions(+), 11 deletions(-)

diff --git a/ports/esp32/machine_hw_spi.c b/ports/esp32/machine_hw_spi.c
index 2792216cc07d6..5b59f2431cc68 100644
--- a/ports/esp32/machine_hw_spi.c
+++ b/ports/esp32/machine_hw_spi.c
@@ -217,7 +217,7 @@ STATIC void machine_hw_spi_init_internal(
         .clock_speed_hz = self->baudrate,
         .mode = self->phase | (self->polarity << 1),
         .spics_io_num = -1, // No CS pin
-        .queue_size = 1,
+        .queue_size = 2,
         .flags = self->firstbit == MICROPY_PY_MACHINE_SPI_LSB ? SPI_DEVICE_TXBIT_LSBFIRST | SPI_DEVICE_RXBIT_LSBFIRST : 0,
         .pre_cb = NULL
     };
@@ -273,6 +273,17 @@ STATIC void machine_hw_spi_deinit(mp_obj_base_t *self_in) {
     }
 }
 
+STATIC mp_uint_t gcd(mp_uint_t x, mp_uint_t y) {
+    while (x != y) {
+        if (x > y) {
+            x -= y;
+        } else {
+            y -= x;
+        }
+    }
+    return x;
+}
+
 STATIC void machine_hw_spi_transfer(mp_obj_base_t *self_in, size_t len, const uint8_t *src, uint8_t *dest) {
     machine_hw_spi_obj_t *self = MP_OBJ_TO_PTR(self_in);
 
@@ -281,13 +292,16 @@ STATIC void machine_hw_spi_transfer(mp_obj_base_t *self_in, size_t len, const ui
         return;
     }
 
-    struct spi_transaction_t transaction = { 0 };
-
     // Round to nearest whole set of bits
     int bits_to_send = len * 8 / self->bits * self->bits;
 
+    if (!bits_to_send) {
+        mp_raise_ValueError(MP_ERROR_TEXT("buffer too short"));
+    }
 
     if (len <= 4) {
+        spi_transaction_t transaction = { 0 };
+
         if (src != NULL) {
             memcpy(&transaction.tx_data, src, len);
         }
@@ -302,26 +316,42 @@ STATIC void machine_hw_spi_transfer(mp_obj_base_t *self_in, size_t len, const ui
     } else {
         int offset = 0;
         int bits_remaining = bits_to_send;
+        int optimum_word_size = 8 * self->bits / gcd(8, self->bits);
+        int max_transaction_bits = MP_HW_SPI_MAX_XFER_BITS / optimum_word_size * optimum_word_size;
+        spi_transaction_t *transaction, *result, transactions[2];
+        int i = 0;
+
+        spi_device_acquire_bus(self->spi, portMAX_DELAY);
 
         while (bits_remaining) {
-            memset(&transaction, 0, sizeof(transaction));
+            transaction = transactions + i++ % 2;
+            memset(transaction, 0, sizeof(spi_transaction_t));
 
-            transaction.length =
-                bits_remaining > MP_HW_SPI_MAX_XFER_BITS ? MP_HW_SPI_MAX_XFER_BITS : bits_remaining;
+            transaction->length =
+                bits_remaining > max_transaction_bits ? max_transaction_bits : bits_remaining;
 
             if (src != NULL) {
-                transaction.tx_buffer = src + offset;
+                transaction->tx_buffer = src + offset;
             }
             if (dest != NULL) {
-                transaction.rx_buffer = dest + offset;
+                transaction->rx_buffer = dest + offset;
             }
 
-            spi_device_transmit(self->spi, &transaction);
-            bits_remaining -= transaction.length;
+            spi_device_queue_trans(self->spi, transaction, portMAX_DELAY);
+            bits_remaining -= transaction->length;
+
+            if (offset > 0) {
+                // wait for previously queued transaction
+                spi_device_get_trans_result(self->spi, &result, portMAX_DELAY);
+            }
 
             // doesn't need ceil(); loop ends when bits_remaining is 0
-            offset += transaction.length / 8;
+            offset += transaction->length / 8;
         }
+
+        // wait for last transaction
+        spi_device_get_trans_result(self->spi, &result, portMAX_DELAY);
+        spi_device_release_bus(self->spi);
     }
 }
 

From 8758504f0f1c300ec2bc40f4e3b9627c8e8562dd Mon Sep 17 00:00:00 2001
From: David Lechner <david@pybricks.com>
Date: Tue, 6 Jul 2021 18:08:18 -0500
Subject: [PATCH 1077/3533] extmod/moduselect: Conditionally compile select().

This adds #if MICROPY_PY_USELECT_SELECT around the uselect.select()
function. According to the docs, this function is only for CPython
compatibility and should not normally be used. So we can disable it
and save a few bytes of flash space where possible.

Signed-off-by: David Lechner <david@pybricks.com>
---
 extmod/moduselect.c | 4 ++++
 py/mpconfig.h       | 7 +++++++
 2 files changed, 11 insertions(+)

diff --git a/extmod/moduselect.c b/extmod/moduselect.c
index fbd51960d5e57..cf47f02afefa0 100644
--- a/extmod/moduselect.c
+++ b/extmod/moduselect.c
@@ -107,6 +107,7 @@ STATIC mp_uint_t poll_map_poll(mp_map_t *poll_map, size_t *rwx_num) {
     return n_ready;
 }
 
+#if MICROPY_PY_USELECT_SELECT
 // select(rlist, wlist, xlist[, timeout])
 STATIC mp_obj_t select_select(size_t n_args, const mp_obj_t *args) {
     // get array data from tuple/list arguments
@@ -173,6 +174,7 @@ STATIC mp_obj_t select_select(size_t n_args, const mp_obj_t *args) {
     }
 }
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_select_select_obj, 3, 4, select_select);
+#endif // MICROPY_PY_USELECT_SELECT
 
 typedef struct _mp_obj_poll_t {
     mp_obj_base_t base;
@@ -355,7 +357,9 @@ MP_DEFINE_CONST_FUN_OBJ_0(mp_select_poll_obj, select_poll);
 
 STATIC const mp_rom_map_elem_t mp_module_select_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_uselect) },
+    #if MICROPY_PY_USELECT_SELECT
     { MP_ROM_QSTR(MP_QSTR_select), MP_ROM_PTR(&mp_select_select_obj) },
+    #endif
     { MP_ROM_QSTR(MP_QSTR_poll), MP_ROM_PTR(&mp_select_poll_obj) },
     { MP_ROM_QSTR(MP_QSTR_POLLIN), MP_ROM_INT(MP_STREAM_POLL_RD) },
     { MP_ROM_QSTR(MP_QSTR_POLLOUT), MP_ROM_INT(MP_STREAM_POLL_WR) },
diff --git a/py/mpconfig.h b/py/mpconfig.h
index 48c4c6d347d44..f67e11cd4b03a 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -1316,6 +1316,13 @@ typedef double mp_float_t;
 #define MICROPY_PY_USELECT (0)
 #endif
 
+// Whether to enable the select() function in the "uselect" module (baremetal
+// implementation). This is present for compatibility but can be disabled to
+// save space.
+#ifndef MICROPY_PY_USELECT_SELECT
+#define MICROPY_PY_USELECT_SELECT (1)
+#endif
+
 // Whether to provide "utime" module functions implementation
 // in terms of mp_hal_* functions.
 #ifndef MICROPY_PY_UTIME_MP_HAL

From 12e3fcc78575295a881a10553adc979e9a530a21 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Thu, 8 Jul 2021 16:25:12 +1000
Subject: [PATCH 1078/3533] extmod/nimble: Fix leak in l2cap_send if
 send-while-stalled.

A correctly-behaved application shouldn't do this, but in the
case where the channel is stalled, there's still enough room
in the mbuf pool, then we'll fail the send (BLE_HS_EBUSY) so
the mbuf needs to be freed.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 extmod/nimble/modbluetooth_nimble.c | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/extmod/nimble/modbluetooth_nimble.c b/extmod/nimble/modbluetooth_nimble.c
index f4b9ccb60073c..8bbec54881260 100644
--- a/extmod/nimble/modbluetooth_nimble.c
+++ b/extmod/nimble/modbluetooth_nimble.c
@@ -1682,7 +1682,19 @@ int mp_bluetooth_l2cap_send(uint16_t conn_handle, uint16_t cid, const uint8_t *b
         *stalled = true;
         err = 0;
     } else {
-        *stalled = false;
+        if (err) {
+            // Anything except stalled means it won't attempt to send,
+            // so free the mbuf (we're failing the op entirely).
+            os_mbuf_free_chain(sdu_tx);
+        } else {
+            *stalled = false;
+        }
+    }
+
+    // Sometimes we see what looks like BLE_HS_EAGAIN (but it's actually
+    // OS_ENOMEM in disguise). Fixed in NimBLE v1.4.
+    if (err == OS_ENOMEM) {
+        return MP_ENOMEM;
     }
 
     // Other error codes such as BLE_HS_EBUSY (we're stalled) or BLE_HS_EBADDATA (bigger than MTU).

From 74db526cf059d1bc30be38c28c36cf5d1156ae53 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sat, 17 Jul 2021 23:25:07 +1000
Subject: [PATCH 1079/3533] extmod/btstack/btstack.mk: Use
 -Wno-implicit-fallthrough, not =0.

In 2ae3c890bd923b4c39bba3d2e2f2d75eca5dcc06, -Wimplicit-fallthrough=0 was
added to get the build to pass.  This option is equivalent to
-Wno-implicit-fallthrough, and the latter is compatible with clang (while
the former is not).

Fixes issue #7546.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/btstack/btstack.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extmod/btstack/btstack.mk b/extmod/btstack/btstack.mk
index 9e1857263b561..7ecc230003175 100644
--- a/extmod/btstack/btstack.mk
+++ b/extmod/btstack/btstack.mk
@@ -67,7 +67,7 @@ endif
 LIB_SRC_C += $(SRC_BTSTACK)
 
 # Suppress some warnings.
-BTSTACK_WARNING_CFLAGS = -Wno-old-style-definition -Wno-unused-variable -Wno-unused-parameter -Wimplicit-fallthrough=0
+BTSTACK_WARNING_CFLAGS = -Wno-old-style-definition -Wno-unused-variable -Wno-unused-parameter -Wno-implicit-fallthrough
 ifneq ($(CC),clang)
 BTSTACK_WARNING_CFLAGS += -Wno-format
 endif

From cbc8d5b61f0742e810ad45bd27d8daa11f3dbbf8 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sat, 17 Jul 2021 23:05:49 +1000
Subject: [PATCH 1080/3533] tools/ci.sh: Build unix dev variant as part of
 macOS CI.

To test BTstack build on macOS.

Signed-off-by: Damien George <damien@micropython.org>
---
 tools/ci.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tools/ci.sh b/tools/ci.sh
index 815e7287570e8..4ff4ba35ba556 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -515,6 +515,8 @@ function ci_unix_macos_build {
     #make ${MAKEOPTS} -C ports/unix deplibs
     make ${MAKEOPTS} -C ports/unix
     # check for additional compiler errors/warnings
+    make ${MAKEOPTS} -C ports/unix VARIANT=dev submodules
+    make ${MAKEOPTS} -C ports/unix VARIANT=dev
     make ${MAKEOPTS} -C ports/unix VARIANT=coverage submodules
     make ${MAKEOPTS} -C ports/unix VARIANT=coverage
 }

From fdd5b18133e9d9f5a4e76be22ece6632d11d7fee Mon Sep 17 00:00:00 2001
From: David P <dpoirier@y7mail.com>
Date: Sat, 12 Jun 2021 14:51:05 +1000
Subject: [PATCH 1081/3533] docs: Replace master/slave with
 controller/peripheral in I2C and SPI.

See https://www.oshwa.org/a-resolution-to-redefine-spi-signal-names
---
 docs/esp32/quickref.rst            |  2 +-
 docs/esp8266/quickref.rst          |  6 ++--
 docs/library/machine.I2C.rst       | 38 ++++++++++-----------
 docs/library/machine.I2S.rst       |  2 +-
 docs/library/machine.SPI.rst       | 14 ++++----
 docs/library/pyb.I2C.rst           | 54 +++++++++++++++---------------
 docs/library/pyb.SPI.rst           | 20 +++++------
 docs/pyboard/quickref.rst          | 12 +++----
 docs/pyboard/tutorial/amp_skin.rst |  2 +-
 docs/pyboard/tutorial/lcd_skin.rst |  6 ++--
 docs/rp2/quickref.rst              |  2 +-
 docs/wipy/quickref.rst             | 14 ++++----
 12 files changed, 86 insertions(+), 86 deletions(-)

diff --git a/docs/esp32/quickref.rst b/docs/esp32/quickref.rst
index 0b825d52080a8..56c3721148207 100644
--- a/docs/esp32/quickref.rst
+++ b/docs/esp32/quickref.rst
@@ -361,7 +361,7 @@ accessed via the :ref:`machine.SoftI2C <machine.SoftI2C>` class::
     i2c.writeto(0x3a, '12') # write '12' to device with address 0x3a
 
     buf = bytearray(10)     # create a buffer with 10 bytes
-    i2c.writeto(0x3a, buf)  # write the given buffer to the slave
+    i2c.writeto(0x3a, buf)  # write the given buffer to the peripheral
 
 Hardware I2C bus
 ----------------
diff --git a/docs/esp8266/quickref.rst b/docs/esp8266/quickref.rst
index bc648a348a888..72b35966978ee 100644
--- a/docs/esp8266/quickref.rst
+++ b/docs/esp8266/quickref.rst
@@ -270,11 +270,11 @@ alias of :ref:`machine.SoftI2C <machine.SoftI2C>`)::
     # construct an I2C bus
     i2c = I2C(scl=Pin(5), sda=Pin(4), freq=100000)
 
-    i2c.readfrom(0x3a, 4)   # read 4 bytes from slave device with address 0x3a
-    i2c.writeto(0x3a, '12') # write '12' to slave device with address 0x3a
+    i2c.readfrom(0x3a, 4)   # read 4 bytes from peripheral device with address 0x3a
+    i2c.writeto(0x3a, '12') # write '12' to peripheral device with address 0x3a
 
     buf = bytearray(10)     # create a buffer with 10 bytes
-    i2c.writeto(0x3a, buf)  # write the given buffer to the slave
+    i2c.writeto(0x3a, buf)  # write the given buffer to the peripheral
 
 Real time clock (RTC)
 ---------------------
diff --git a/docs/library/machine.I2C.rst b/docs/library/machine.I2C.rst
index f9b951564611b..f46d64ef51d4d 100644
--- a/docs/library/machine.I2C.rst
+++ b/docs/library/machine.I2C.rst
@@ -28,15 +28,15 @@ Example usage::
                                     # depending on the port, extra parameters may be required
                                     # to select the peripheral and/or pins to use
 
-    i2c.scan()                      # scan for slaves, returning a list of 7-bit addresses
+    i2c.scan()                      # scan for peripherals, returning a list of 7-bit addresses
 
-    i2c.writeto(42, b'123')         # write 3 bytes to slave with 7-bit address 42
-    i2c.readfrom(42, 4)             # read 4 bytes from slave with 7-bit address 42
+    i2c.writeto(42, b'123')         # write 3 bytes to peripheral with 7-bit address 42
+    i2c.readfrom(42, 4)             # read 4 bytes from peripheral with 7-bit address 42
 
-    i2c.readfrom_mem(42, 8, 3)      # read 3 bytes from memory of slave 42,
-                                    #   starting at memory-address 8 in the slave
-    i2c.writeto_mem(42, 2, b'\x10') # write 1 byte to memory of slave 42
-                                    #   starting at address 2 in the slave
+    i2c.readfrom_mem(42, 8, 3)      # read 3 bytes from memory of peripheral 42,
+                                    #   starting at memory-address 8 in the peripheral
+    i2c.writeto_mem(42, 2, b'\x10') # write 1 byte to memory of peripheral 42
+                                    #   starting at address 2 in the peripheral
 
 Constructors
 ------------
@@ -95,7 +95,7 @@ General Methods
 Primitive I2C operations
 ------------------------
 
-The following methods implement the primitive I2C master bus operations and can
+The following methods implement the primitive I2C controller bus operations and can
 be combined to make any I2C transaction.  They are provided if you need more
 control over the bus, otherwise the standard methods (see below) can be used.
 
@@ -115,7 +115,7 @@ These methods are only available on the `machine.SoftI2C` class.
    read is the length of *buf*.  An ACK will be sent on the bus after
    receiving all but the last byte.  After the last byte is received, if *nack*
    is true then a NACK will be sent, otherwise an ACK will be sent (and in this
-   case the slave assumes more bytes are going to be read in a later call).
+   case the peripheral assumes more bytes are going to be read in a later call).
 
 .. method:: I2C.write(buf)
 
@@ -126,18 +126,18 @@ These methods are only available on the `machine.SoftI2C` class.
 Standard bus operations
 -----------------------
 
-The following methods implement the standard I2C master read and write
-operations that target a given slave device.
+The following methods implement the standard I2C controller read and write
+operations that target a given peripheral device.
 
 .. method:: I2C.readfrom(addr, nbytes, stop=True, /)
 
-   Read *nbytes* from the slave specified by *addr*.
+   Read *nbytes* from the peripheral specified by *addr*.
    If *stop* is true then a STOP condition is generated at the end of the transfer.
    Returns a `bytes` object with the data read.
 
 .. method:: I2C.readfrom_into(addr, buf, stop=True, /)
 
-   Read into *buf* from the slave specified by *addr*.
+   Read into *buf* from the peripheral specified by *addr*.
    The number of bytes read will be the length of *buf*.
    If *stop* is true then a STOP condition is generated at the end of the transfer.
 
@@ -145,7 +145,7 @@ operations that target a given slave device.
 
 .. method:: I2C.writeto(addr, buf, stop=True, /)
 
-   Write the bytes from *buf* to the slave specified by *addr*.  If a
+   Write the bytes from *buf* to the peripheral specified by *addr*.  If a
    NACK is received following the write of a byte from *buf* then the
    remaining bytes are not sent.  If *stop* is true then a STOP condition is
    generated at the end of the transfer, even if a NACK is received.
@@ -153,7 +153,7 @@ operations that target a given slave device.
 
 .. method:: I2C.writevto(addr, vector, stop=True, /)
 
-   Write the bytes contained in *vector* to the slave specified by *addr*.
+   Write the bytes contained in *vector* to the peripheral specified by *addr*.
    *vector* should be a tuple or list of objects with the buffer protocol.
    The *addr* is sent once and then the bytes from each object in *vector*
    are written out sequentially.  The objects in *vector* may be zero bytes
@@ -170,19 +170,19 @@ Memory operations
 
 Some I2C devices act as a memory device (or set of registers) that can be read
 from and written to.  In this case there are two addresses associated with an
-I2C transaction: the slave address and the memory address.  The following
+I2C transaction: the peripheral address and the memory address.  The following
 methods are convenience functions to communicate with such devices.
 
 .. method:: I2C.readfrom_mem(addr, memaddr, nbytes, *, addrsize=8)
 
-   Read *nbytes* from the slave specified by *addr* starting from the memory
+   Read *nbytes* from the peripheral specified by *addr* starting from the memory
    address specified by *memaddr*.
    The argument *addrsize* specifies the address size in bits.
    Returns a `bytes` object with the data read.
 
 .. method:: I2C.readfrom_mem_into(addr, memaddr, buf, *, addrsize=8)
 
-   Read into *buf* from the slave specified by *addr* starting from the
+   Read into *buf* from the peripheral specified by *addr* starting from the
    memory address specified by *memaddr*.  The number of bytes read is the
    length of *buf*.
    The argument *addrsize* specifies the address size in bits (on ESP8266
@@ -192,7 +192,7 @@ methods are convenience functions to communicate with such devices.
 
 .. method:: I2C.writeto_mem(addr, memaddr, buf, *, addrsize=8)
 
-   Write *buf* to the slave specified by *addr* starting from the
+   Write *buf* to the peripheral specified by *addr* starting from the
    memory address specified by *memaddr*.
    The argument *addrsize* specifies the address size in bits (on ESP8266
    this argument is not recognised and the address size is always 8 bits).
diff --git a/docs/library/machine.I2S.rst b/docs/library/machine.I2S.rst
index 48f03b419d0be..e1c6af990ca6f 100644
--- a/docs/library/machine.I2S.rst
+++ b/docs/library/machine.I2S.rst
@@ -6,7 +6,7 @@ class I2S -- Inter-IC Sound bus protocol
 
 I2S is a synchronous serial protocol used to connect digital audio devices. 
 At the physical level, a bus consists of 3 lines: SCK, WS, SD.
-The I2S class supports Master operation.  Slave operation is not supported.
+The I2S class supports controller operation.  Peripheral operation is not supported.
 
 The I2S class is currently available as a Technical Preview.  During the preview period, feedback from 
 users is encouraged.  Based on this feedback, the I2S class API and implementation may be changed.
diff --git a/docs/library/machine.SPI.rst b/docs/library/machine.SPI.rst
index 7565241eb1cd2..46ac2ec74ceba 100644
--- a/docs/library/machine.SPI.rst
+++ b/docs/library/machine.SPI.rst
@@ -1,14 +1,14 @@
 .. currentmodule:: machine
 .. _machine.SPI:
 
-class SPI -- a Serial Peripheral Interface bus protocol (master side)
-=====================================================================
+class SPI -- a Serial Peripheral Interface bus protocol (controller side)
+=========================================================================
 
-SPI is a synchronous serial protocol that is driven by a master. At the
+SPI is a synchronous serial protocol that is driven by a controller. At the
 physical level, a bus consists of 3 lines: SCK, MOSI, MISO. Multiple devices
 can share the same bus. Each device should have a separate, 4th signal,
-SS (Slave Select), to select a particular device on a bus with which
-communication takes place. Management of an SS signal should happen in
+CS (Chip Select), to select a particular device on a bus with which
+communication takes place. Management of a CS signal should happen in
 user code (via machine.Pin class).
 
 Both hardware and software SPI implementations exist via the
@@ -102,9 +102,9 @@ Methods
 Constants
 ---------
 
-.. data:: SPI.MASTER
+.. data:: SPI.CONTROLLER
 
-   for initialising the SPI bus to master; this is only used for the WiPy
+   for initialising the SPI bus to controller; this is only used for the WiPy
 
 .. data:: SPI.MSB
 
diff --git a/docs/library/pyb.I2C.rst b/docs/library/pyb.I2C.rst
index 56b036e07447b..f60b506861c3a 100644
--- a/docs/library/pyb.I2C.rst
+++ b/docs/library/pyb.I2C.rst
@@ -14,11 +14,11 @@ Example::
 
     from pyb import I2C
 
-    i2c = I2C(1)                         # create on bus 1
-    i2c = I2C(1, I2C.MASTER)             # create and init as a master
-    i2c.init(I2C.MASTER, baudrate=20000) # init as a master
-    i2c.init(I2C.SLAVE, addr=0x42)       # init as a slave with given address
-    i2c.deinit()                         # turn off the peripheral
+    i2c = I2C(1)                             # create on bus 1
+    i2c = I2C(1, I2C.CONTROLLER)             # create and init as a controller
+    i2c.init(I2C.CONTROLLER, baudrate=20000) # init as a controller
+    i2c.init(I2C.PERIPHERAL, addr=0x42)      # init as a peripheral with given address
+    i2c.deinit()                             # turn off the I2C unit
 
 Printing the i2c object gives you information about its configuration.
 
@@ -37,21 +37,21 @@ You can specify a timeout (in ms)::
 
     i2c.send(b'123', timeout=2000)   # timeout after 2 seconds
 
-A master must specify the recipient's address::
+A controller must specify the recipient's address::
 
-    i2c.init(I2C.MASTER)
-    i2c.send('123', 0x42)        # send 3 bytes to slave with address 0x42
+    i2c.init(I2C.CONTROLLER)
+    i2c.send('123', 0x42)        # send 3 bytes to peripheral with address 0x42
     i2c.send(b'456', addr=0x42)  # keyword for address
 
 Master also has other methods::
 
-    i2c.is_ready(0x42)           # check if slave 0x42 is ready
-    i2c.scan()                   # scan for slaves on the bus, returning
+    i2c.is_ready(0x42)           # check if peripheral 0x42 is ready
+    i2c.scan()                   # scan for peripherals on the bus, returning
                                  #   a list of valid addresses
-    i2c.mem_read(3, 0x42, 2)     # read 3 bytes from memory of slave 0x42,
-                                 #   starting at address 2 in the slave
-    i2c.mem_write('abc', 0x42, 2, timeout=1000) # write 'abc' (3 bytes) to memory of slave 0x42
-                                                # starting at address 2 in the slave, timeout after 1 second
+    i2c.mem_read(3, 0x42, 2)     # read 3 bytes from memory of peripheral 0x42,
+                                 #   starting at address 2 in the peripheral
+    i2c.mem_write('abc', 0x42, 2, timeout=1000) # write 'abc' (3 bytes) to memory of peripheral 0x42
+                                                # starting at address 2 in the peripheral, timeout after 1 second
 
 Constructors
 ------------
@@ -88,9 +88,9 @@ Methods
 
   Initialise the I2C bus with the given parameters:
 
-     - ``mode`` must be either ``I2C.MASTER`` or ``I2C.SLAVE``
-     - ``addr`` is the 7-bit address (only sensible for a slave)
-     - ``baudrate`` is the SCL clock rate (only sensible for a master)
+     - ``mode`` must be either ``I2C.CONTROLLER`` or ``I2C.PERIPHERAL``
+     - ``addr`` is the 7-bit address (only sensible for a peripheral)
+     - ``baudrate`` is the SCL clock rate (only sensible for a controller)
      - ``gencall`` is whether to support general call mode
      - ``dma`` is whether to allow the use of DMA for the I2C transfers (note
        that DMA transfers have more precise timing but currently do not handle bus
@@ -98,7 +98,7 @@ Methods
 
 .. method:: I2C.is_ready(addr)
 
-   Check if an I2C device responds to the given address.  Only valid when in master mode.
+   Check if an I2C device responds to the given address.  Only valid when in controller mode.
 
 .. method:: I2C.mem_read(data, addr, memaddr, *, timeout=5000, addr_size=8)
 
@@ -111,7 +111,7 @@ Methods
      - ``addr_size`` selects width of memaddr: 8 or 16 bits
 
    Returns the read data.
-   This is only valid in master mode.
+   This is only valid in controller mode.
 
 .. method:: I2C.mem_write(data, addr, memaddr, *, timeout=5000, addr_size=8)
 
@@ -124,7 +124,7 @@ Methods
      - ``addr_size`` selects width of memaddr: 8 or 16 bits
 
    Returns ``None``.
-   This is only valid in master mode.
+   This is only valid in controller mode.
 
 .. method:: I2C.recv(recv, addr=0x00, *, timeout=5000)
 
@@ -132,7 +132,7 @@ Methods
 
      - ``recv`` can be an integer, which is the number of bytes to receive,
        or a mutable buffer, which will be filled with received bytes
-     - ``addr`` is the address to receive from (only required in master mode)
+     - ``addr`` is the address to receive from (only required in controller mode)
      - ``timeout`` is the timeout in milliseconds to wait for the receive
 
    Return value: if ``recv`` is an integer then a new buffer of the bytes received,
@@ -143,7 +143,7 @@ Methods
    Send data on the bus:
 
      - ``send`` is the data to send (an integer to send, or a buffer object)
-     - ``addr`` is the address to send to (only required in master mode)
+     - ``addr`` is the address to send to (only required in controller mode)
      - ``timeout`` is the timeout in milliseconds to wait for the send
 
    Return value: ``None``.
@@ -151,15 +151,15 @@ Methods
 .. method:: I2C.scan()
 
    Scan all I2C addresses from 0x01 to 0x7f and return a list of those that respond.
-   Only valid when in master mode.
+   Only valid when in controller mode.
 
 Constants
 ---------
 
-.. data:: I2C.MASTER
+.. data:: I2C.CONTROLLER
 
-   for initialising the bus to master mode
+   for initialising the bus to controller mode
 
-.. data:: I2C.SLAVE
+.. data:: I2C.PERIPHERAL
 
-   for initialising the bus to slave mode
+   for initialising the bus to peripheral mode
diff --git a/docs/library/pyb.SPI.rst b/docs/library/pyb.SPI.rst
index c76b16789ad47..1bdb73a5dd170 100644
--- a/docs/library/pyb.SPI.rst
+++ b/docs/library/pyb.SPI.rst
@@ -1,19 +1,19 @@
 .. currentmodule:: pyb
 .. _pyb.SPI:
 
-class SPI -- a master-driven serial protocol
-============================================
+class SPI -- a controller-driven serial protocol
+================================================
 
-SPI is a serial protocol that is driven by a master.  At the physical level
+SPI is a serial protocol that is driven by a controller.  At the physical level
 there are 3 lines: SCK, MOSI, MISO.
 
 See usage model of I2C; SPI is very similar.  Main difference is
 parameters to init the SPI bus::
 
     from pyb import SPI
-    spi = SPI(1, SPI.MASTER, baudrate=600000, polarity=1, phase=0, crc=0x7)
+    spi = SPI(1, SPI.CONTROLLER, baudrate=600000, polarity=1, phase=0, crc=0x7)
 
-Only required parameter is mode, SPI.MASTER or SPI.SLAVE.  Polarity can be
+Only required parameter is mode, SPI.CONTROLLER or SPI.PERIPHERAL.  Polarity can be
 0 or 1, and is the level the idle clock line sits at.  Phase can be 0 or 1
 to sample data on the first or second clock edge respectively.  Crc can be
 None for no CRC, or a polynomial specifier.
@@ -55,8 +55,8 @@ Methods
 
    Initialise the SPI bus with the given parameters:
 
-     - ``mode`` must be either ``SPI.MASTER`` or ``SPI.SLAVE``.
-     - ``baudrate`` is the SCK clock rate (only sensible for a master).
+     - ``mode`` must be either ``SPI.CONTROLLER`` or ``SPI.PERIPHERAL``.
+     - ``baudrate`` is the SCK clock rate (only sensible for a controller).
      - ``prescaler`` is the prescaler to use to derive SCK from the APB bus frequency;
        use of ``prescaler`` overrides ``baudrate``.
      - ``polarity`` can be 0 or 1, and is the level the idle clock line sits at.
@@ -112,10 +112,10 @@ Methods
 Constants
 ---------
 
-.. data:: SPI.MASTER
-.. data:: SPI.SLAVE
+.. data:: SPI.CONTROLLER
+.. data:: SPI.PERIPHERAL
 
-   for initialising the SPI bus to master or slave mode
+   for initialising the SPI bus to controller or peripheral mode
 
 .. data:: SPI.LSB
 .. data:: SPI.MSB
diff --git a/docs/pyboard/quickref.rst b/docs/pyboard/quickref.rst
index 3ea3190999a02..49b67eee425a6 100644
--- a/docs/pyboard/quickref.rst
+++ b/docs/pyboard/quickref.rst
@@ -191,7 +191,7 @@ See :ref:`pyb.SPI <pyb.SPI>`. ::
 
     from pyb import SPI
 
-    spi = SPI(1, SPI.MASTER, baudrate=200000, polarity=1, phase=0)
+    spi = SPI(1, SPI.CONTROLLER, baudrate=200000, polarity=1, phase=0)
     spi.send('hello')
     spi.recv(5) # receive 5 bytes on the bus
     spi.send_recv('hello') # send and receive 5 bytes
@@ -210,12 +210,12 @@ eg ``I2C(1)``.  Software I2C is also available by explicitly specifying the
     i2c = I2C('X', freq=400000)                 # create hardware I2c object
     i2c = I2C(scl='X1', sda='X2', freq=100000)  # create software I2C object
 
-    i2c.scan()                          # returns list of slave addresses
-    i2c.writeto(0x42, 'hello')          # write 5 bytes to slave with address 0x42
-    i2c.readfrom(0x42, 5)               # read 5 bytes from slave
+    i2c.scan()                          # returns list of peripheral addresses
+    i2c.writeto(0x42, 'hello')          # write 5 bytes to peripheral with address 0x42
+    i2c.readfrom(0x42, 5)               # read 5 bytes from peripheral
 
-    i2c.readfrom_mem(0x42, 0x10, 2)     # read 2 bytes from slave 0x42, slave memory 0x10
-    i2c.writeto_mem(0x42, 0x10, 'xy')   # write 2 bytes to slave 0x42, slave memory 0x10
+    i2c.readfrom_mem(0x42, 0x10, 2)     # read 2 bytes from peripheral 0x42, peripheral memory 0x10
+    i2c.writeto_mem(0x42, 0x10, 'xy')   # write 2 bytes to peripheral 0x42, peripheral memory 0x10
 
 Note: for legacy I2C support see :ref:`pyb.I2C <pyb.I2C>`.
 
diff --git a/docs/pyboard/tutorial/amp_skin.rst b/docs/pyboard/tutorial/amp_skin.rst
index bcb583261381c..b6558959ead38 100644
--- a/docs/pyboard/tutorial/amp_skin.rst
+++ b/docs/pyboard/tutorial/amp_skin.rst
@@ -30,7 +30,7 @@ To set the volume, define the following function::
 
     import pyb
     def volume(val):
-        pyb.I2C(1, pyb.I2C.MASTER).mem_write(val, 46, 0)
+        pyb.I2C(1, pyb.I2C.CONTROLLER).mem_write(val, 46, 0)
 
 Then you can do::
 
diff --git a/docs/pyboard/tutorial/lcd_skin.rst b/docs/pyboard/tutorial/lcd_skin.rst
index 288ac1bf08be2..4df0041607c75 100644
--- a/docs/pyboard/tutorial/lcd_skin.rst
+++ b/docs/pyboard/tutorial/lcd_skin.rst
@@ -51,7 +51,7 @@ MPR121 capacitive touch sensor has address 90.
 To get started, try::
 
     >>> import pyb
-    >>> i2c = pyb.I2C(1, pyb.I2C.MASTER)
+    >>> i2c = pyb.I2C(1, pyb.I2C.CONTROLLER)
     >>> i2c.mem_write(4, 90, 0x5e)
     >>> touch = i2c.mem_read(1, 90, 0)[0]
 
@@ -68,7 +68,7 @@ directory or ``lib/`` directory) and then try::
 
     >>> import pyb
     >>> import mpr121
-    >>> m = mpr121.MPR121(pyb.I2C(1, pyb.I2C.MASTER))
+    >>> m = mpr121.MPR121(pyb.I2C(1, pyb.I2C.CONTROLLER))
     >>> for i in range(100):
     ...   print(m.touch_status())
     ...   pyb.delay(100)
@@ -80,7 +80,7 @@ Try touching each one in turn.
 Note that if you put the LCD skin in the Y-position, then you need to
 initialise the I2C bus using::
 
-    >>> m = mpr121.MPR121(pyb.I2C(2, pyb.I2C.MASTER))
+    >>> m = mpr121.MPR121(pyb.I2C(2, pyb.I2C.CONTROLLER))
 
 There is also a demo which uses the LCD and the touch sensors together,
 and can be found `here <http://micropython.org/resources/examples/lcddemo.py>`__.
diff --git a/docs/rp2/quickref.rst b/docs/rp2/quickref.rst
index 4c8c02dc0cc5b..c18eb4a0b9027 100644
--- a/docs/rp2/quickref.rst
+++ b/docs/rp2/quickref.rst
@@ -181,7 +181,7 @@ accessed via the :ref:`machine.SoftI2C <machine.SoftI2C>` class::
     i2c.writeto(0x3a, '12') # write '12' to device with address 0x3a
 
     buf = bytearray(10)     # create a buffer with 10 bytes
-    i2c.writeto(0x3a, buf)  # write the given buffer to the slave
+    i2c.writeto(0x3a, buf)  # write the given buffer to the peripheral
 
 Hardware I2C bus
 ----------------
diff --git a/docs/wipy/quickref.rst b/docs/wipy/quickref.rst
index a22ea45b55149..f9ea3d501ed4a 100644
--- a/docs/wipy/quickref.rst
+++ b/docs/wipy/quickref.rst
@@ -107,8 +107,8 @@ See :ref:`machine.SPI <machine.SPI>`. ::
 
     from machine import SPI
 
-    # configure the SPI master @ 2MHz
-    spi = SPI(0, SPI.MASTER, baudrate=200000, polarity=0, phase=0)
+    # configure the SPI controller @ 2MHz
+    spi = SPI(0, SPI.CONTROLLER, baudrate=2_000_000, polarity=0, phase=0)
     spi.write('hello')
     spi.read(5) # receive 5 bytes on the bus
     rbuf = bytearray(5)
@@ -122,11 +122,11 @@ See :ref:`machine.I2C <machine.I2C>`. ::
     from machine import I2C
     # configure the I2C bus
     i2c = I2C(baudrate=100000)
-    i2c.scan() # returns list of slave addresses
-    i2c.writeto(0x42, 'hello') # send 5 bytes to slave with address 0x42
-    i2c.readfrom(0x42, 5) # receive 5 bytes from slave
-    i2c.readfrom_mem(0x42, 0x10, 2) # read 2 bytes from slave 0x42, slave memory 0x10
-    i2c.writeto_mem(0x42, 0x10, 'xy') # write 2 bytes to slave 0x42, slave memory 0x10
+    i2c.scan() # returns list of peripheral addresses
+    i2c.writeto(0x42, 'hello') # send 5 bytes to peripheral with address 0x42
+    i2c.readfrom(0x42, 5) # receive 5 bytes from peripheral
+    i2c.readfrom_mem(0x42, 0x10, 2) # read 2 bytes from peripheral 0x42, peripheral memory 0x10
+    i2c.writeto_mem(0x42, 0x10, 'xy') # write 2 bytes to peripheral 0x42, peripheral memory 0x10
 
 Watchdog timer (WDT)
 --------------------

From f365025c9c699a4a42c103b9ff01071ebc8d57c8 Mon Sep 17 00:00:00 2001
From: David P <dpoirier@y7mail.com>
Date: Sat, 12 Jun 2021 14:53:44 +1000
Subject: [PATCH 1082/3533] stm32: Replace master/slave with
 controller/peripheral in I2C and SPI.

Replace "master" with "controller" and "slave" with "peripheral" in
comments, errors, and debug messages.

Add CONTROLLER and PERIPHERAL constants to pyb.SPI and pyb.I2C classes;
retain MASTER and SLAVE constants for backward compatiblity.
---
 ports/stm32/pyb_i2c.c  | 63 ++++++++++++++++++++++--------------------
 ports/stm32/pyb_spi.c  | 19 +++++++------
 ports/stm32/spi.c      |  4 +--
 tests/pyb/i2c.py       |  2 +-
 tests/pyb/i2c_accel.py |  2 +-
 tests/pyb/i2c_error.py |  2 +-
 tests/pyb/pyb_f405.py  |  2 +-
 tests/pyb/spi.py       | 14 ++++++----
 tests/pyb/spi.py.exp   |  4 +--
 9 files changed, 60 insertions(+), 52 deletions(-)

diff --git a/ports/stm32/pyb_i2c.c b/ports/stm32/pyb_i2c.c
index f0bd38333d6c1..dbcf4bcb811b9 100644
--- a/ports/stm32/pyb_i2c.c
+++ b/ports/stm32/pyb_i2c.c
@@ -49,14 +49,14 @@
 ///     from pyb import I2C
 ///
 ///     i2c = I2C(1)                         # create on bus 1
-///     i2c = I2C(1, I2C.MASTER)             # create and init as a master
-///     i2c.init(I2C.MASTER, baudrate=20000) # init as a master
-///     i2c.init(I2C.SLAVE, addr=0x42)       # init as a slave with given address
-///     i2c.deinit()                         # turn off the peripheral
+///     i2c = I2C(1, I2C.CONTROLLER)         # create and init as a controller
+///     i2c.init(I2C.CONTROLLER, baudrate=20000) # init as a controller
+///     i2c.init(I2C.PERIPHERAL, addr=0x42)  # init as a peripheral with given address
+///     i2c.deinit()                         # turn off the I2C unit
 ///
 /// Printing the i2c object gives you information about its configuration.
 ///
-/// Basic methods for slave are send and recv:
+/// Basic methods for peripheral are send and recv:
 ///
 ///     i2c.send('abc')      # send 3 bytes
 ///     i2c.send(0x42)       # send a single byte, given by the number
@@ -71,19 +71,19 @@
 ///
 ///     i2c.send(b'123', timeout=2000)   # timout after 2 seconds
 ///
-/// A master must specify the recipient's address:
+/// A controller must specify the recipient's address:
 ///
-///     i2c.init(I2C.MASTER)
-///     i2c.send('123', 0x42)        # send 3 bytes to slave with address 0x42
+///     i2c.init(I2C.CONTROLLER)
+///     i2c.send('123', 0x42)        # send 3 bytes to peripheral with address 0x42
 ///     i2c.send(b'456', addr=0x42)  # keyword for address
 ///
 /// Master also has other methods:
 ///
-///     i2c.is_ready(0x42)           # check if slave 0x42 is ready
-///     i2c.scan()                   # scan for slaves on the bus, returning
+///     i2c.is_ready(0x42)           # check if peripheral 0x42 is ready
+///     i2c.scan()                   # scan for peripherals on the bus, returning
 ///                                  #   a list of valid addresses
-///     i2c.mem_read(3, 0x42, 2)     # read 3 bytes from memory of slave 0x42,
-///                                  #   starting at address 2 in the slave
+///     i2c.mem_read(3, 0x42, 2)     # read 3 bytes from memory of peripheral 0x42,
+///                                  #   starting at address 2 in the peripheral
 ///     i2c.mem_write('abc', 0x42, 2, timeout=1000)
 #define PYB_I2C_MASTER (0)
 #define PYB_I2C_SLAVE  (1)
@@ -578,7 +578,7 @@ STATIC void pyb_i2c_print(const mp_print_t *print, mp_obj_t self_in, mp_print_ki
         mp_printf(print, "I2C(%u)", i2c_num);
     } else {
         if (in_master_mode(self)) {
-            mp_printf(print, "I2C(%u, I2C.MASTER, baudrate=%u"
+            mp_printf(print, "I2C(%u, I2C.CONTROLLER, baudrate=%u"
                 #if PYB_I2C_TIMINGR
                 ", timingr=0x%08x"
                 #endif
@@ -588,7 +588,7 @@ STATIC void pyb_i2c_print(const mp_print_t *print, mp_obj_t self_in, mp_print_ki
                 #endif
                 );
         } else {
-            mp_printf(print, "I2C(%u, I2C.SLAVE, addr=0x%02x)", i2c_num, (self->i2c->Instance->OAR1 >> 1) & 0x7f);
+            mp_printf(print, "I2C(%u, I2C.PERIPHERAL, addr=0x%02x)", i2c_num, (self->i2c->Instance->OAR1 >> 1) & 0x7f);
         }
     }
 }
@@ -597,9 +597,9 @@ STATIC void pyb_i2c_print(const mp_print_t *print, mp_obj_t self_in, mp_print_ki
 ///
 /// Initialise the I2C bus with the given parameters:
 ///
-///   - `mode` must be either `I2C.MASTER` or `I2C.SLAVE`
-///   - `addr` is the 7-bit address (only sensible for a slave)
-///   - `baudrate` is the SCL clock rate (only sensible for a master)
+///   - `mode` must be either `I2C.CONTROLLER` or `I2C.PERIPHERAL`
+///   - `addr` is the 7-bit address (only sensible for a peripheral)
+///   - `baudrate` is the SCL clock rate (only sensible for a controller)
 ///   - `gencall` is whether to support general call mode
 STATIC mp_obj_t pyb_i2c_init_helper(const pyb_i2c_obj_t *self, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     static const mp_arg_t allowed_args[] = {
@@ -621,7 +621,7 @@ STATIC mp_obj_t pyb_i2c_init_helper(const pyb_i2c_obj_t *self, size_t n_args, co
     I2C_InitTypeDef *init = &self->i2c->Init;
 
     if (args[0].u_int == PYB_I2C_MASTER) {
-        // use a special address to indicate we are a master
+        // use a special address to indicate we are a controller
         init->OwnAddress1 = PYB_I2C_MASTER_ADDRESS;
     } else {
         init->OwnAddress1 = (args[1].u_int << 1) & 0xfe;
@@ -697,12 +697,12 @@ STATIC mp_obj_t pyb_i2c_deinit(mp_obj_t self_in) {
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(pyb_i2c_deinit_obj, pyb_i2c_deinit);
 
 /// \method is_ready(addr)
-/// Check if an I2C device responds to the given address.  Only valid when in master mode.
+/// Check if an I2C device responds to the given address.  Only valid when in controller mode.
 STATIC mp_obj_t pyb_i2c_is_ready(mp_obj_t self_in, mp_obj_t i2c_addr_o) {
     pyb_i2c_obj_t *self = MP_OBJ_TO_PTR(self_in);
 
     if (!in_master_mode(self)) {
-        mp_raise_TypeError(MP_ERROR_TEXT("I2C must be a master"));
+        mp_raise_TypeError(MP_ERROR_TEXT("I2C must be a controller"));
     }
 
     mp_uint_t i2c_addr = mp_obj_get_int(i2c_addr_o) << 1;
@@ -720,12 +720,12 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(pyb_i2c_is_ready_obj, pyb_i2c_is_ready);
 
 /// \method scan()
 /// Scan all I2C addresses from 0x08 to 0x77 and return a list of those that respond.
-/// Only valid when in master mode.
+/// Only valid when in controller mode.
 STATIC mp_obj_t pyb_i2c_scan(mp_obj_t self_in) {
     pyb_i2c_obj_t *self = MP_OBJ_TO_PTR(self_in);
 
     if (!in_master_mode(self)) {
-        mp_raise_TypeError(MP_ERROR_TEXT("I2C must be a master"));
+        mp_raise_TypeError(MP_ERROR_TEXT("I2C must be a controller"));
     }
 
     mp_obj_t list = mp_obj_new_list(0, NULL);
@@ -745,7 +745,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(pyb_i2c_scan_obj, pyb_i2c_scan);
 /// Send data on the bus:
 ///
 ///   - `send` is the data to send (an integer to send, or a buffer object)
-///   - `addr` is the address to send to (only required in master mode)
+///   - `addr` is the address to send to (only required in controller mode)
 ///   - `timeout` is the timeout in milliseconds to wait for the send
 ///
 /// Return value: `None`.
@@ -824,7 +824,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_KW(pyb_i2c_send_obj, 1, pyb_i2c_send);
 ///
 ///   - `recv` can be an integer, which is the number of bytes to receive,
 ///     or a mutable buffer, which will be filled with received bytes
-///   - `addr` is the address to receive from (only required in master mode)
+///   - `addr` is the address to receive from (only required in controller mode)
 ///   - `timeout` is the timeout in milliseconds to wait for the receive
 ///
 /// Return value: if `recv` is an integer then a new buffer of the bytes received,
@@ -910,7 +910,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_KW(pyb_i2c_recv_obj, 1, pyb_i2c_recv);
 ///   - `addr_size` selects width of memaddr: 8 or 16 bits
 ///
 /// Returns the read data.
-/// This is only valid in master mode.
+/// This is only valid in controller mode.
 STATIC const mp_arg_t pyb_i2c_mem_read_allowed_args[] = {
     { MP_QSTR_data,    MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
     { MP_QSTR_addr,    MP_ARG_REQUIRED | MP_ARG_INT, {.u_int = 0} },
@@ -926,7 +926,7 @@ STATIC mp_obj_t pyb_i2c_mem_read(size_t n_args, const mp_obj_t *pos_args, mp_map
     mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args, MP_ARRAY_SIZE(pyb_i2c_mem_read_allowed_args), pyb_i2c_mem_read_allowed_args, args);
 
     if (!in_master_mode(self)) {
-        mp_raise_TypeError(MP_ERROR_TEXT("I2C must be a master"));
+        mp_raise_TypeError(MP_ERROR_TEXT("I2C must be a controller"));
     }
 
     // get the buffer to read into
@@ -986,7 +986,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_KW(pyb_i2c_mem_read_obj, 1, pyb_i2c_mem_read);
 ///   - `addr_size` selects width of memaddr: 8 or 16 bits
 ///
 /// Returns `None`.
-/// This is only valid in master mode.
+/// This is only valid in controller mode.
 STATIC mp_obj_t pyb_i2c_mem_write(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     // parse args (same as mem_read)
     pyb_i2c_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]);
@@ -994,7 +994,7 @@ STATIC mp_obj_t pyb_i2c_mem_write(size_t n_args, const mp_obj_t *pos_args, mp_ma
     mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args, MP_ARRAY_SIZE(pyb_i2c_mem_read_allowed_args), pyb_i2c_mem_read_allowed_args, args);
 
     if (!in_master_mode(self)) {
-        mp_raise_TypeError(MP_ERROR_TEXT("I2C must be a master"));
+        mp_raise_TypeError(MP_ERROR_TEXT("I2C must be a controller"));
     }
 
     // get the buffer to write from
@@ -1051,8 +1051,11 @@ STATIC const mp_rom_map_elem_t pyb_i2c_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_mem_write), MP_ROM_PTR(&pyb_i2c_mem_write_obj) },
 
     // class constants
-    /// \constant MASTER - for initialising the bus to master mode
-    /// \constant SLAVE - for initialising the bus to slave mode
+    /// \constant CONTROLLER - for initialising the bus to controller mode
+    /// \constant PERIPHERAL - for initialising the bus to peripheral mode
+    { MP_ROM_QSTR(MP_QSTR_CONTROLLER), MP_ROM_INT(PYB_I2C_MASTER) },
+    { MP_ROM_QSTR(MP_QSTR_PERIPHERAL),  MP_ROM_INT(PYB_I2C_SLAVE) },
+    // TODO - remove MASTER/SLAVE when CONTROLLER/PERIPHERAL gain wide adoption
     { MP_ROM_QSTR(MP_QSTR_MASTER), MP_ROM_INT(PYB_I2C_MASTER) },
     { MP_ROM_QSTR(MP_QSTR_SLAVE), MP_ROM_INT(PYB_I2C_SLAVE) },
 };
diff --git a/ports/stm32/pyb_spi.c b/ports/stm32/pyb_spi.c
index 99a1cd77b4dbd..abb7ba41db0d1 100644
--- a/ports/stm32/pyb_spi.c
+++ b/ports/stm32/pyb_spi.c
@@ -32,18 +32,18 @@
 /******************************************************************************/
 // MicroPython bindings for legacy pyb API
 
-// class pyb.SPI - a master-driven serial protocol
+// class pyb.SPI - a controller-driven serial protocol
 //
-// SPI is a serial protocol that is driven by a master.  At the physical level
+// SPI is a serial protocol that is driven by a controller.  At the physical level
 // there are 3 lines: SCK, MOSI, MISO.
 //
 // See usage model of I2C; SPI is very similar.  Main difference is
 // parameters to init the SPI bus:
 //
 //     from pyb import SPI
-//     spi = SPI(1, SPI.MASTER, baudrate=600000, polarity=1, phase=0, crc=0x7)
+//     spi = SPI(1, SPI.CONTROLLER, baudrate=600000, polarity=1, phase=0, crc=0x7)
 //
-// Only required parameter is mode, SPI.MASTER or SPI.SLAVE.  Polarity can be
+// Only required parameter is mode, SPI.CONTROLLER or SPI.PERIPHERAL.  Polarity can be
 // 0 or 1, and is the level the idle clock line sits at.  Phase can be 0 or 1
 // to sample data on the first or second clock edge respectively.  Crc can be
 // None for no CRC, or a polynomial specifier.
@@ -72,8 +72,8 @@ STATIC void pyb_spi_print(const mp_print_t *print, mp_obj_t self_in, mp_print_ki
 // init(mode, baudrate=328125, *, polarity=1, phase=0, bits=8, firstbit=SPI.MSB, ti=False, crc=None)
 //
 // Initialise the SPI bus with the given parameters:
-//   - `mode` must be either `SPI.MASTER` or `SPI.SLAVE`.
-//   - `baudrate` is the SCK clock rate (only sensible for a master).
+//   - `mode` must be either `SPI.CONTROLLER` or `SPI.PERIPHERAL`.
+//   - `baudrate` is the SCK clock rate (only sensible for a controller).
 STATIC mp_obj_t pyb_spi_init_helper(const pyb_spi_obj_t *self, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_mode,     MP_ARG_REQUIRED | MP_ARG_INT, {.u_int = 0} },
@@ -319,10 +319,13 @@ STATIC const mp_rom_map_elem_t pyb_spi_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_send_recv), MP_ROM_PTR(&pyb_spi_send_recv_obj) },
 
     // class constants
-    /// \constant MASTER - for initialising the bus to master mode
-    /// \constant SLAVE - for initialising the bus to slave mode
+    /// \constant CONTROLLER - for initialising the bus to controller mode
+    /// \constant PERIPHERAL - for initialising the bus to peripheral mode
     /// \constant MSB - set the first bit to MSB
     /// \constant LSB - set the first bit to LSB
+    { MP_ROM_QSTR(MP_QSTR_CONTROLLER), MP_ROM_INT(SPI_MODE_MASTER) },
+    { MP_ROM_QSTR(MP_QSTR_PERIPHERAL),  MP_ROM_INT(SPI_MODE_SLAVE) },
+    // TODO - remove MASTER/SLAVE when CONTROLLER/PERIPHERAL gain wide adoption
     { MP_ROM_QSTR(MP_QSTR_MASTER), MP_ROM_INT(SPI_MODE_MASTER) },
     { MP_ROM_QSTR(MP_QSTR_SLAVE),  MP_ROM_INT(SPI_MODE_SLAVE) },
     { MP_ROM_QSTR(MP_QSTR_MSB),    MP_ROM_INT(SPI_FIRSTBIT_MSB) },
diff --git a/ports/stm32/spi.c b/ports/stm32/spi.c
index d3b3a784e86f9..0ce6b5abc6f15 100644
--- a/ports/stm32/spi.c
+++ b/ports/stm32/spi.c
@@ -640,14 +640,14 @@ void spi_print(const mp_print_t *print, const spi_t *spi_obj, bool legacy) {
             #endif
             uint baudrate = spi_get_source_freq(spi) >> log_prescaler;
             if (legacy) {
-                mp_printf(print, ", SPI.MASTER");
+                mp_printf(print, ", SPI.CONTROLLER");
             }
             mp_printf(print, ", baudrate=%u", baudrate);
             if (legacy) {
                 mp_printf(print, ", prescaler=%u", 1 << log_prescaler);
             }
         } else {
-            mp_printf(print, ", SPI.SLAVE");
+            mp_printf(print, ", SPI.PERIPHERAL");
         }
         mp_printf(print, ", polarity=%u, phase=%u, bits=%u", spi->Init.CLKPolarity == SPI_POLARITY_LOW ? 0 : 1, spi->Init.CLKPhase == SPI_PHASE_1EDGE ? 0 : 1, spi->Init.DataSize == SPI_DATASIZE_8BIT ? 8 : 16);
         if (spi->Init.CRCCalculation == SPI_CRCCALCULATION_ENABLE) {
diff --git a/tests/pyb/i2c.py b/tests/pyb/i2c.py
index bc9dba8781aa9..c968843273a59 100644
--- a/tests/pyb/i2c.py
+++ b/tests/pyb/i2c.py
@@ -11,6 +11,6 @@
 
 i2c = I2C(1)
 
-i2c.init(I2C.MASTER, baudrate=400000)
+i2c.init(I2C.CONTROLLER, baudrate=400000)
 print(i2c.scan())
 i2c.deinit()
diff --git a/tests/pyb/i2c_accel.py b/tests/pyb/i2c_accel.py
index 8c74fa60e61b2..8b87d406d06ee 100644
--- a/tests/pyb/i2c_accel.py
+++ b/tests/pyb/i2c_accel.py
@@ -11,7 +11,7 @@
 
 pyb.Accel()  # this will init the MMA for us
 
-i2c = I2C(1, I2C.MASTER, baudrate=400000)
+i2c = I2C(1, I2C.CONTROLLER, baudrate=400000)
 
 print(i2c.scan())
 print(i2c.is_ready(accel_addr))
diff --git a/tests/pyb/i2c_error.py b/tests/pyb/i2c_error.py
index b17a26325d037..1228962f5f408 100644
--- a/tests/pyb/i2c_error.py
+++ b/tests/pyb/i2c_error.py
@@ -11,7 +11,7 @@
 pyb.Accel()
 
 # get I2C bus
-i2c = I2C(1, I2C.MASTER, dma=True)
+i2c = I2C(1, I2C.CONTROLLER, dma=True)
 
 # test polling mem_read
 pyb.disable_irq()
diff --git a/tests/pyb/pyb_f405.py b/tests/pyb/pyb_f405.py
index 243381056e133..d7431a11a12aa 100644
--- a/tests/pyb/pyb_f405.py
+++ b/tests/pyb/pyb_f405.py
@@ -10,7 +10,7 @@
 print(type(pyb.rng()))
 
 # test HAL error specific to F405
-i2c = pyb.I2C(2, pyb.I2C.MASTER)
+i2c = pyb.I2C(2, pyb.I2C.CONTROLLER)
 try:
     i2c.recv(1, 1)
 except OSError as e:
diff --git a/tests/pyb/spi.py b/tests/pyb/spi.py
index 73d39e7245e48..7df6aeb45775d 100644
--- a/tests/pyb/spi.py
+++ b/tests/pyb/spi.py
@@ -11,12 +11,14 @@
 spi = SPI(1)
 print(spi)
 
-spi = SPI(1, SPI.MASTER)
-spi = SPI(1, SPI.MASTER, baudrate=500000)
-spi = SPI(1, SPI.MASTER, 500000, polarity=1, phase=0, bits=8, firstbit=SPI.MSB, ti=False, crc=None)
-print(str(spi)[:28], str(spi)[49:])  # don't print baudrate/prescaler
+spi = SPI(1, SPI.CONTROLLER)
+spi = SPI(1, SPI.CONTROLLER, baudrate=500000)
+spi = SPI(
+    1, SPI.CONTROLLER, 500000, polarity=1, phase=0, bits=8, firstbit=SPI.MSB, ti=False, crc=None
+)
+print(str(spi)[:32], str(spi)[53:])  # don't print baudrate/prescaler
 
-spi.init(SPI.SLAVE, phase=1)
+spi.init(SPI.PERIPHERAL, phase=1)
 print(spi)
 try:
     # need to flush input before we get an error (error is what we want to test)
@@ -25,7 +27,7 @@
 except OSError:
     print("OSError")
 
-spi.init(SPI.MASTER)
+spi.init(SPI.CONTROLLER)
 spi.send(1, timeout=100)
 print(spi.recv(1, timeout=100))
 print(spi.send_recv(1, timeout=100))
diff --git a/tests/pyb/spi.py.exp b/tests/pyb/spi.py.exp
index 473c173a58d8b..661bace9008d3 100644
--- a/tests/pyb/spi.py.exp
+++ b/tests/pyb/spi.py.exp
@@ -3,8 +3,8 @@ ValueError 0
 SPI 1
 SPI 2
 SPI(1)
-SPI(1, SPI.MASTER, baudrate= , polarity=1, phase=0, bits=8)
-SPI(1, SPI.SLAVE, polarity=1, phase=1, bits=8)
+SPI(1, SPI.CONTROLLER, baudrate= , polarity=1, phase=0, bits=8)
+SPI(1, SPI.PERIPHERAL, polarity=1, phase=1, bits=8)
 OSError
 b'\xff'
 b'\xff'

From d3f6ce7dc31542d0962e3ca4c753f47a4ec4f818 Mon Sep 17 00:00:00 2001
From: David P <dpoirier@y7mail.com>
Date: Sat, 12 Jun 2021 14:54:47 +1000
Subject: [PATCH 1083/3533] nrf/modules: Replace master/slave with
 controller/peripheral in SPI.

Also remove mistaken usage of MASTER/SLAVE constants in comments.
---
 ports/nrf/modules/machine/spi.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ports/nrf/modules/machine/spi.c b/ports/nrf/modules/machine/spi.c
index 2510c275020fd..880d946a29f95 100644
--- a/ports/nrf/modules/machine/spi.c
+++ b/ports/nrf/modules/machine/spi.c
@@ -46,18 +46,18 @@
 #endif
 
 /// \moduleref machine
-/// \class SPI - a master-driven serial protocol
+/// \class SPI - a controller-driven serial protocol
 ///
-/// SPI is a serial protocol that is driven by a master.  At the physical level
+/// SPI is a serial protocol that is driven by a controller.  At the physical level
 /// there are 3 lines: SCK, MOSI, MISO.
 ///
 /// See usage model of I2C; SPI is very similar.  Main difference is
 /// parameters to init the SPI bus:
 ///
 ///     from machine import SPI
-///     spi = SPI(1, SPI.MASTER, baudrate=600000, polarity=1, phase=0, crc=0x7)
+///     spi = SPI(1, baudrate=600000, polarity=1, phase=0, crc=0x7)
 ///
-/// Only required parameter is mode, SPI.MASTER or SPI.SLAVE.  Polarity can be
+/// Polarity can be
 /// 0 or 1, and is the level the idle clock line sits at.  Phase can be 0 or 1
 /// to sample data on the first or second clock edge respectively.  Crc can be
 /// None for no CRC, or a polynomial specifier.

From 1f9243f8d41885dd5ddf5a5c8f45af15e50ed100 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sun, 18 Jul 2021 12:11:10 +1000
Subject: [PATCH 1084/3533] esp32/machine_dac: Add MICROPY_PY_MACHINE_DAC
 option, enable by default.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/machine_dac.c  | 12 +++++++-----
 ports/esp32/modmachine.c   |  2 ++
 ports/esp32/mpconfigport.h |  3 +++
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/ports/esp32/machine_dac.c b/ports/esp32/machine_dac.c
index 146ef60aa81d8..35826d4a99a8b 100644
--- a/ports/esp32/machine_dac.c
+++ b/ports/esp32/machine_dac.c
@@ -27,15 +27,15 @@
 
 #include <stdio.h>
 
-#include "esp_log.h"
-
-#include "driver/gpio.h"
-#include "driver/dac.h"
-
 #include "py/runtime.h"
 #include "py/mphal.h"
 #include "modmachine.h"
 
+#if MICROPY_PY_MACHINE_DAC
+
+#include "driver/gpio.h"
+#include "driver/dac.h"
+
 typedef struct _mdac_obj_t {
     mp_obj_base_t base;
     gpio_num_t gpio_id;
@@ -111,3 +111,5 @@ const mp_obj_type_t machine_dac_type = {
     .make_new = mdac_make_new,
     .locals_dict = (mp_obj_t)&mdac_locals_dict,
 };
+
+#endif // MICROPY_PY_MACHINE_DAC
diff --git a/ports/esp32/modmachine.c b/ports/esp32/modmachine.c
index a4e0724cee2b2..5a7658dbbb123 100644
--- a/ports/esp32/modmachine.c
+++ b/ports/esp32/modmachine.c
@@ -277,7 +277,9 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_TouchPad), MP_ROM_PTR(&machine_touchpad_type) },
     #endif
     { MP_ROM_QSTR(MP_QSTR_ADC), MP_ROM_PTR(&machine_adc_type) },
+    #if MICROPY_PY_MACHINE_DAC
     { MP_ROM_QSTR(MP_QSTR_DAC), MP_ROM_PTR(&machine_dac_type) },
+    #endif
     { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&machine_hw_i2c_type) },
     { MP_ROM_QSTR(MP_QSTR_SoftI2C), MP_ROM_PTR(&mp_machine_soft_i2c_type) },
     { MP_ROM_QSTR(MP_QSTR_I2S), MP_ROM_PTR(&machine_i2s_type) },
diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h
index a06c910470192..aadf4620de6b0 100644
--- a/ports/esp32/mpconfigport.h
+++ b/ports/esp32/mpconfigport.h
@@ -153,6 +153,9 @@
 #define MICROPY_PY_MACHINE_SPI              (1)
 #define MICROPY_PY_MACHINE_SPI_MSB          (0)
 #define MICROPY_PY_MACHINE_SPI_LSB          (1)
+#ifndef MICROPY_PY_MACHINE_DAC
+#define MICROPY_PY_MACHINE_DAC              (1)
+#endif
 #ifndef MICROPY_HW_ENABLE_SDCARD
 #define MICROPY_HW_ENABLE_SDCARD            (1)
 #endif

From 0fc0ccabec9b919b7984f418f49537acec5f39c9 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sun, 18 Jul 2021 12:11:15 +1000
Subject: [PATCH 1085/3533] esp32/machine_i2s: Add MICROPY_PY_MACHINE_I2S
 option, enable by default.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/machine_i2s.c  | 4 ++++
 ports/esp32/main.c         | 2 ++
 ports/esp32/modmachine.c   | 2 ++
 ports/esp32/mpconfigport.h | 3 +++
 4 files changed, 11 insertions(+)

diff --git a/ports/esp32/machine_i2s.c b/ports/esp32/machine_i2s.c
index b0d02e74f6105..099796cf4320d 100644
--- a/ports/esp32/machine_i2s.c
+++ b/ports/esp32/machine_i2s.c
@@ -38,6 +38,8 @@
 #include "modmachine.h"
 #include "mphalport.h"
 
+#if MICROPY_PY_MACHINE_I2S
+
 #include "driver/i2s.h"
 #include "soc/i2s_reg.h"
 #include "freertos/FreeRTOS.h"
@@ -807,3 +809,5 @@ const mp_obj_type_t machine_i2s_type = {
     .make_new = machine_i2s_make_new,
     .locals_dict = (mp_obj_dict_t *)&machine_i2s_locals_dict,
 };
+
+#endif // MICROPY_PY_MACHINE_I2S
diff --git a/ports/esp32/main.c b/ports/esp32/main.c
index c1b8e8a31d626..66068ccffaf2b 100644
--- a/ports/esp32/main.c
+++ b/ports/esp32/main.c
@@ -138,7 +138,9 @@ void mp_task(void *pvParameter) {
 
     // initialise peripherals
     machine_pins_init();
+    #if MICROPY_PY_MACHINE_I2S
     machine_i2s_init0();
+    #endif
 
     // run boot-up scripts
     pyexec_frozen_module("_boot.py");
diff --git a/ports/esp32/modmachine.c b/ports/esp32/modmachine.c
index 5a7658dbbb123..aa009944bd16b 100644
--- a/ports/esp32/modmachine.c
+++ b/ports/esp32/modmachine.c
@@ -282,7 +282,9 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     #endif
     { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&machine_hw_i2c_type) },
     { MP_ROM_QSTR(MP_QSTR_SoftI2C), MP_ROM_PTR(&mp_machine_soft_i2c_type) },
+    #if MICROPY_PY_MACHINE_I2S
     { MP_ROM_QSTR(MP_QSTR_I2S), MP_ROM_PTR(&machine_i2s_type) },
+    #endif
     { MP_ROM_QSTR(MP_QSTR_PWM), MP_ROM_PTR(&machine_pwm_type) },
     { MP_ROM_QSTR(MP_QSTR_RTC), MP_ROM_PTR(&machine_rtc_type) },
     { MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&machine_hw_spi_type) },
diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h
index aadf4620de6b0..e4375bd0be429 100644
--- a/ports/esp32/mpconfigport.h
+++ b/ports/esp32/mpconfigport.h
@@ -156,6 +156,9 @@
 #ifndef MICROPY_PY_MACHINE_DAC
 #define MICROPY_PY_MACHINE_DAC              (1)
 #endif
+#ifndef MICROPY_PY_MACHINE_I2S
+#define MICROPY_PY_MACHINE_I2S              (1)
+#endif
 #ifndef MICROPY_HW_ENABLE_SDCARD
 #define MICROPY_HW_ENABLE_SDCARD            (1)
 #endif

From 59dbbe9be7f91f53f60803559db88cfb75cf1c2a Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sun, 18 Jul 2021 12:11:18 +1000
Subject: [PATCH 1086/3533] esp32: Fix use of mp_int_t, size_t and uintptr_t.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/machine_i2s.c   | 14 +++++++-------
 ports/esp32/machine_rtc.c   |  4 ++--
 ports/esp32/machine_timer.c |  2 +-
 ports/esp32/machine_uart.c  |  2 +-
 ports/esp32/modesp32.c      |  2 +-
 ports/esp32/mphalport.c     |  2 +-
 6 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/ports/esp32/machine_i2s.c b/ports/esp32/machine_i2s.c
index 099796cf4320d..c650a33befb0a 100644
--- a/ports/esp32/machine_i2s.c
+++ b/ports/esp32/machine_i2s.c
@@ -255,8 +255,8 @@ STATIC uint32_t fill_appbuf_from_dma(machine_i2s_obj_t *self, mp_buffer_info_t *
     uint8_t appbuf_sample_size_in_bytes = (self->bits / 8) * (self->format == STEREO ? 2: 1);
     uint32_t num_bytes_needed_from_dma = appbuf->len * (I2S_RX_FRAME_SIZE_IN_BYTES / appbuf_sample_size_in_bytes);
     while (num_bytes_needed_from_dma) {
-        uint32_t num_bytes_requested_from_dma = MIN(sizeof(self->transform_buffer), num_bytes_needed_from_dma);
-        uint32_t num_bytes_received_from_dma = 0;
+        size_t num_bytes_requested_from_dma = MIN(sizeof(self->transform_buffer), num_bytes_needed_from_dma);
+        size_t num_bytes_received_from_dma = 0;
 
         TickType_t delay;
         if (self->io_mode == UASYNCIO) {
@@ -312,12 +312,12 @@ STATIC uint32_t fill_appbuf_from_dma(machine_i2s_obj_t *self, mp_buffer_info_t *
     return a_index;
 }
 
-STATIC uint32_t copy_appbuf_to_dma(machine_i2s_obj_t *self, mp_buffer_info_t *appbuf) {
+STATIC size_t copy_appbuf_to_dma(machine_i2s_obj_t *self, mp_buffer_info_t *appbuf) {
     if ((self->bits == I2S_BITS_PER_SAMPLE_32BIT) && (self->format == STEREO)) {
         swap_32_bit_stereo_channels(appbuf);
     }
 
-    uint32_t num_bytes_written = 0;
+    size_t num_bytes_written = 0;
 
     TickType_t delay;
     if (self->io_mode == UASYNCIO) {
@@ -518,7 +518,7 @@ STATIC mp_obj_t machine_i2s_make_new(const mp_obj_type_t *type, size_t n_pos_arg
     return MP_OBJ_FROM_PTR(self);
 }
 
-STATIC mp_obj_t machine_i2s_obj_init(mp_uint_t n_pos_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+STATIC mp_obj_t machine_i2s_obj_init(size_t n_pos_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     machine_i2s_obj_t *self = pos_args[0];
     machine_i2s_deinit(self);
     machine_i2s_init_helper(self, n_pos_args - 1, pos_args + 1, kw_args);
@@ -731,12 +731,12 @@ STATIC mp_uint_t machine_i2s_stream_write(mp_obj_t self_in, const void *buf_in,
         mp_buffer_info_t appbuf;
         appbuf.buf = (void *)buf_in;
         appbuf.len = size;
-        uint32_t num_bytes_written = copy_appbuf_to_dma(self, &appbuf);
+        size_t num_bytes_written = copy_appbuf_to_dma(self, &appbuf);
         return num_bytes_written;
     }
 }
 
-STATIC mp_uint_t machine_i2s_ioctl(mp_obj_t self_in, mp_uint_t request, mp_uint_t arg, int *errcode) {
+STATIC mp_uint_t machine_i2s_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_t arg, int *errcode) {
     machine_i2s_obj_t *self = MP_OBJ_TO_PTR(self_in);
     mp_uint_t ret;
     mp_uint_t flags = arg;
diff --git a/ports/esp32/machine_rtc.c b/ports/esp32/machine_rtc.c
index 52227c93b8af0..72d7b5c8280aa 100644
--- a/ports/esp32/machine_rtc.c
+++ b/ports/esp32/machine_rtc.c
@@ -121,7 +121,7 @@ STATIC mp_obj_t machine_rtc_datetime_helper(mp_uint_t n_args, const mp_obj_t *ar
         return mp_const_none;
     }
 }
-STATIC mp_obj_t machine_rtc_datetime(mp_uint_t n_args, const mp_obj_t *args) {
+STATIC mp_obj_t machine_rtc_datetime(size_t n_args, const mp_obj_t *args) {
     return machine_rtc_datetime_helper(n_args, args);
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_rtc_datetime_obj, 1, 2, machine_rtc_datetime);
@@ -142,7 +142,7 @@ STATIC mp_obj_t machine_rtc_init(mp_obj_t self_in, mp_obj_t date) {
 STATIC MP_DEFINE_CONST_FUN_OBJ_2(machine_rtc_init_obj, machine_rtc_init);
 
 #if MICROPY_HW_RTC_USER_MEM_MAX > 0
-STATIC mp_obj_t machine_rtc_memory(mp_uint_t n_args, const mp_obj_t *args) {
+STATIC mp_obj_t machine_rtc_memory(size_t n_args, const mp_obj_t *args) {
     if (n_args == 1) {
         // read RTC memory
         uint8_t rtcram[MICROPY_HW_RTC_USER_MEM_MAX];
diff --git a/ports/esp32/machine_timer.c b/ports/esp32/machine_timer.c
index 696127af771da..3b14581498655 100644
--- a/ports/esp32/machine_timer.c
+++ b/ports/esp32/machine_timer.c
@@ -229,7 +229,7 @@ STATIC mp_obj_t machine_timer_deinit(mp_obj_t self_in) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_timer_deinit_obj, machine_timer_deinit);
 
-STATIC mp_obj_t machine_timer_init(mp_uint_t n_args, const mp_obj_t *args, mp_map_t *kw_args) {
+STATIC mp_obj_t machine_timer_init(size_t n_args, const mp_obj_t *args, mp_map_t *kw_args) {
     return machine_timer_init_helper(args[0], n_args - 1, args + 1, kw_args);
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_KW(machine_timer_init_obj, 1, machine_timer_init);
diff --git a/ports/esp32/machine_uart.c b/ports/esp32/machine_uart.c
index e256b9be439c0..2953ac171c057 100644
--- a/ports/esp32/machine_uart.c
+++ b/ports/esp32/machine_uart.c
@@ -443,7 +443,7 @@ STATIC mp_uint_t machine_uart_write(mp_obj_t self_in, const void *buf_in, mp_uin
     return bytes_written;
 }
 
-STATIC mp_uint_t machine_uart_ioctl(mp_obj_t self_in, mp_uint_t request, mp_uint_t arg, int *errcode) {
+STATIC mp_uint_t machine_uart_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_t arg, int *errcode) {
     machine_uart_obj_t *self = self_in;
     mp_uint_t ret;
     if (request == MP_STREAM_POLL) {
diff --git a/ports/esp32/modesp32.c b/ports/esp32/modesp32.c
index 042c8b8566f31..7faff32046e8f 100644
--- a/ports/esp32/modesp32.c
+++ b/ports/esp32/modesp32.c
@@ -109,7 +109,7 @@ STATIC mp_obj_t esp32_wake_on_ext1(size_t n_args, const mp_obj_t *pos_args, mp_m
 
     // Check that all pins are allowed
     if (args[ARG_pins].u_obj != mp_const_none) {
-        mp_uint_t len = 0;
+        size_t len = 0;
         mp_obj_t *elem;
         mp_obj_get_array(args[ARG_pins].u_obj, &len, &elem);
         ext1_pins = 0;
diff --git a/ports/esp32/mphalport.c b/ports/esp32/mphalport.c
index de7fdfcec3bfa..0f94e129bcb25 100644
--- a/ports/esp32/mphalport.c
+++ b/ports/esp32/mphalport.c
@@ -108,7 +108,7 @@ int mp_hal_stdin_rx_chr(void) {
     }
 }
 
-void mp_hal_stdout_tx_strn(const char *str, uint32_t len) {
+void mp_hal_stdout_tx_strn(const char *str, size_t len) {
     // Only release the GIL if many characters are being sent
     bool release_gil = len > 20;
     if (release_gil) {

From 6823514845c13339efb0e3ff716d2cfa72297d72 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sun, 18 Jul 2021 12:11:21 +1000
Subject: [PATCH 1087/3533] esp32: Add initial support for ESP32C3 SoCs.

Supported features for this SoC are:
- UART REPL, filesystem
- Pin, ADC, PWM, SoftI2C, SoftSPI, Timer, RTC
- OneWire, DHT, NeoPixel
- RMT
- WiFi, Bluetooth

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/espneopixel.c       | 13 ++++---
 ports/esp32/gccollect.c         | 19 +++++++++-
 ports/esp32/machine_adc.c       |  6 ++++
 ports/esp32/machine_hw_spi.c    |  4 +++
 ports/esp32/machine_pin.c       | 62 +++++++++++++++++++++++++++++++++
 ports/esp32/main.c              |  9 ++++-
 ports/esp32/main/CMakeLists.txt |  6 ++++
 ports/esp32/modesp32.c          |  3 +-
 ports/esp32/modmachine.c        | 11 +++++-
 ports/esp32/mpconfigport.h      |  5 +++
 ports/esp32/mphalport.c         |  2 ++
 ports/esp32/mphalport.h         |  4 +++
 ports/esp32/uart.c              |  2 +-
 13 files changed, 136 insertions(+), 10 deletions(-)

diff --git a/ports/esp32/espneopixel.c b/ports/esp32/espneopixel.c
index a5937b9c6bca7..0b9308e2c070b 100644
--- a/ports/esp32/espneopixel.c
+++ b/ports/esp32/espneopixel.c
@@ -13,14 +13,17 @@ void IRAM_ATTR esp_neopixel_write(uint8_t pin, uint8_t *pixels, uint32_t numByte
     uint8_t *p, *end, pix, mask;
     uint32_t t, time0, time1, period, c, startTime, pinMask, gpio_reg_set, gpio_reg_clear;
 
-    if (pin < 32) {
-        pinMask = 1 << pin;
-        gpio_reg_set = GPIO_OUT_W1TS_REG;
-        gpio_reg_clear = GPIO_OUT_W1TC_REG;
-    } else {
+    #if !CONFIG_IDF_TARGET_ESP32C3
+    if (pin >= 32) {
         pinMask = 1 << (pin - 32);
         gpio_reg_set = GPIO_OUT1_W1TS_REG;
         gpio_reg_clear = GPIO_OUT1_W1TC_REG;
+    } else
+    #endif
+    {
+        pinMask = 1 << pin;
+        gpio_reg_set = GPIO_OUT_W1TS_REG;
+        gpio_reg_clear = GPIO_OUT_W1TC_REG;
     }
     p = pixels;
     end = p + numBytes;
diff --git a/ports/esp32/gccollect.c b/ports/esp32/gccollect.c
index 7d5da57e7685e..403a3c7dfa0fb 100644
--- a/ports/esp32/gccollect.c
+++ b/ports/esp32/gccollect.c
@@ -35,8 +35,10 @@
 #include "py/mpthread.h"
 #include "gccollect.h"
 #include "soc/cpu.h"
-#include "xtensa/hal.h"
 
+#if CONFIG_IDF_TARGET_ESP32 || CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3
+
+#include "xtensa/hal.h"
 
 static void gc_collect_inner(int level) {
     if (level < XCHAL_NUM_AREGS / 8) {
@@ -64,3 +66,18 @@ void gc_collect(void) {
     gc_collect_inner(0);
     gc_collect_end();
 }
+
+#elif CONFIG_IDF_TARGET_ESP32C3
+
+#include "shared/runtime/gchelper.h"
+
+void gc_collect(void) {
+    gc_collect_start();
+    gc_helper_collect_regs_and_stack();
+    #if MICROPY_PY_THREAD
+    mp_thread_gc_others();
+    #endif
+    gc_collect_end();
+}
+
+#endif
diff --git a/ports/esp32/machine_adc.c b/ports/esp32/machine_adc.c
index 739d47da5072e..5ac05d56b5a86 100644
--- a/ports/esp32/machine_adc.c
+++ b/ports/esp32/machine_adc.c
@@ -52,6 +52,12 @@ STATIC const madc_obj_t madc_obj[] = {
     {{&machine_adc_type}, GPIO_NUM_33, ADC1_CHANNEL_5},
     {{&machine_adc_type}, GPIO_NUM_34, ADC1_CHANNEL_6},
     {{&machine_adc_type}, GPIO_NUM_35, ADC1_CHANNEL_7},
+    #elif CONFIG_IDF_TARGET_ESP32C3
+    {{&machine_adc_type}, GPIO_NUM_0, ADC1_CHANNEL_0},
+    {{&machine_adc_type}, GPIO_NUM_1, ADC1_CHANNEL_1},
+    {{&machine_adc_type}, GPIO_NUM_2, ADC1_CHANNEL_2},
+    {{&machine_adc_type}, GPIO_NUM_3, ADC1_CHANNEL_3},
+    {{&machine_adc_type}, GPIO_NUM_4, ADC1_CHANNEL_4},
     #elif CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3
     {{&machine_adc_type}, GPIO_NUM_1, ADC1_CHANNEL_0},
     {{&machine_adc_type}, GPIO_NUM_2, ADC1_CHANNEL_1},
diff --git a/ports/esp32/machine_hw_spi.c b/ports/esp32/machine_hw_spi.c
index 5b59f2431cc68..76b1896bba120 100644
--- a/ports/esp32/machine_hw_spi.c
+++ b/ports/esp32/machine_hw_spi.c
@@ -53,6 +53,10 @@
 #define MP_HW_SPI_MAX_XFER_BYTES (4092)
 #define MP_HW_SPI_MAX_XFER_BITS (MP_HW_SPI_MAX_XFER_BYTES * 8) // Has to be an even multiple of 8
 
+#if CONFIG_IDF_TARGET_ESP32C3
+#define HSPI_HOST SPI2_HOST
+#endif
+
 typedef struct _machine_hw_spi_default_pins_t {
     int8_t sck;
     int8_t mosi;
diff --git a/ports/esp32/machine_pin.c b/ports/esp32/machine_pin.c
index bd623d0413bd4..477623796a5de 100644
--- a/ports/esp32/machine_pin.c
+++ b/ports/esp32/machine_pin.c
@@ -40,6 +40,10 @@
 #include "machine_rtc.h"
 #include "modesp32.h"
 
+#if CONFIG_IDF_TARGET_ESP32C3
+#include "hal/gpio_ll.h"
+#endif
+
 // Used to implement a range of pull capabilities
 #define GPIO_PULL_DOWN (1)
 #define GPIO_PULL_UP   (2)
@@ -99,6 +103,31 @@ STATIC const machine_pin_obj_t machine_pin_obj[] = {
     {{&machine_pin_type}, GPIO_NUM_38},
     {{&machine_pin_type}, GPIO_NUM_39},
 
+    #elif CONFIG_IDF_TARGET_ESP32C3
+
+    {{&machine_pin_type}, GPIO_NUM_0},
+    {{&machine_pin_type}, GPIO_NUM_1},
+    {{&machine_pin_type}, GPIO_NUM_2},
+    {{&machine_pin_type}, GPIO_NUM_3},
+    {{&machine_pin_type}, GPIO_NUM_4},
+    {{&machine_pin_type}, GPIO_NUM_5},
+    {{&machine_pin_type}, GPIO_NUM_6},
+    {{&machine_pin_type}, GPIO_NUM_7},
+    {{&machine_pin_type}, GPIO_NUM_8},
+    {{&machine_pin_type}, GPIO_NUM_9},
+    {{&machine_pin_type}, GPIO_NUM_10},
+    {{&machine_pin_type}, GPIO_NUM_11},
+    {{&machine_pin_type}, GPIO_NUM_12},
+    {{&machine_pin_type}, GPIO_NUM_13},
+    {{&machine_pin_type}, GPIO_NUM_14},
+    {{&machine_pin_type}, GPIO_NUM_15},
+    {{&machine_pin_type}, GPIO_NUM_16},
+    {{&machine_pin_type}, GPIO_NUM_17},
+    {{&machine_pin_type}, GPIO_NUM_18},
+    {{&machine_pin_type}, GPIO_NUM_19},
+    {{&machine_pin_type}, GPIO_NUM_20},
+    {{&machine_pin_type}, GPIO_NUM_21},
+
     #elif CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3
 
     {{&machine_pin_type}, GPIO_NUM_0},
@@ -213,10 +242,18 @@ STATIC mp_obj_t machine_pin_obj_init_helper(const machine_pin_obj_t *self, size_
     // reset the pin to digital if this is a mode-setting init (grab it back from ADC)
     if (args[ARG_mode].u_obj != mp_const_none) {
         if (rtc_gpio_is_valid_gpio(self->id)) {
+            #if !CONFIG_IDF_TARGET_ESP32C3
             rtc_gpio_deinit(self->id);
+            #endif
         }
     }
 
+    #if CONFIG_IDF_TARGET_ESP32C3
+    if (self->id == 18 || self->id == 19) {
+        CLEAR_PERI_REG_MASK(USB_DEVICE_CONF0_REG, USB_DEVICE_USB_PAD_ENABLE);
+    }
+    #endif
+
     // configure the pin for gpio
     gpio_pad_select_gpio(self->id);
 
@@ -494,6 +531,31 @@ STATIC const machine_pin_irq_obj_t machine_pin_irq_object[] = {
     {{&machine_pin_irq_type}, GPIO_NUM_38},
     {{&machine_pin_irq_type}, GPIO_NUM_39},
 
+    #elif CONFIG_IDF_TARGET_ESP32C3
+
+    {{&machine_pin_irq_type}, GPIO_NUM_0},
+    {{&machine_pin_irq_type}, GPIO_NUM_1},
+    {{&machine_pin_irq_type}, GPIO_NUM_2},
+    {{&machine_pin_irq_type}, GPIO_NUM_3},
+    {{&machine_pin_irq_type}, GPIO_NUM_4},
+    {{&machine_pin_irq_type}, GPIO_NUM_5},
+    {{&machine_pin_irq_type}, GPIO_NUM_6},
+    {{&machine_pin_irq_type}, GPIO_NUM_7},
+    {{&machine_pin_irq_type}, GPIO_NUM_8},
+    {{&machine_pin_irq_type}, GPIO_NUM_9},
+    {{&machine_pin_irq_type}, GPIO_NUM_10},
+    {{&machine_pin_irq_type}, GPIO_NUM_11},
+    {{&machine_pin_irq_type}, GPIO_NUM_12},
+    {{&machine_pin_irq_type}, GPIO_NUM_13},
+    {{&machine_pin_irq_type}, GPIO_NUM_14},
+    {{&machine_pin_irq_type}, GPIO_NUM_15},
+    {{&machine_pin_irq_type}, GPIO_NUM_16},
+    {{&machine_pin_irq_type}, GPIO_NUM_17},
+    {{&machine_pin_irq_type}, GPIO_NUM_18},
+    {{&machine_pin_irq_type}, GPIO_NUM_19},
+    {{&machine_pin_irq_type}, GPIO_NUM_20},
+    {{&machine_pin_irq_type}, GPIO_NUM_21},
+
     #elif CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3
 
     {{&machine_pin_irq_type}, GPIO_NUM_0},
diff --git a/ports/esp32/main.c b/ports/esp32/main.c
index 66068ccffaf2b..0650c8d71d89b 100644
--- a/ports/esp32/main.c
+++ b/ports/esp32/main.c
@@ -70,6 +70,13 @@
 #define MP_TASK_PRIORITY        (ESP_TASK_PRIO_MIN + 1)
 #define MP_TASK_STACK_SIZE      (16 * 1024)
 
+// Set the margin for detecting stack overflow, depending on the CPU architecture.
+#if CONFIG_IDF_TARGET_ESP32C3
+#define MP_TASK_STACK_LIMIT_MARGIN (2048)
+#else
+#define MP_TASK_STACK_LIMIT_MARGIN (1024)
+#endif
+
 int vprintf_null(const char *format, va_list ap) {
     // do nothing: this is used as a log target during raw repl mode
     return 0;
@@ -127,7 +134,7 @@ void mp_task(void *pvParameter) {
 soft_reset:
     // initialise the stack pointer for the main thread
     mp_stack_set_top((void *)sp);
-    mp_stack_set_limit(MP_TASK_STACK_SIZE - 1024);
+    mp_stack_set_limit(MP_TASK_STACK_SIZE - MP_TASK_STACK_LIMIT_MARGIN);
     gc_init(mp_task_heap, mp_task_heap + mp_task_heap_size);
     mp_init();
     mp_obj_list_init(mp_sys_path, 0);
diff --git a/ports/esp32/main/CMakeLists.txt b/ports/esp32/main/CMakeLists.txt
index f2b3dd4a4f75a..1ca30b0cb9b82 100644
--- a/ports/esp32/main/CMakeLists.txt
+++ b/ports/esp32/main/CMakeLists.txt
@@ -34,6 +34,9 @@ set(MICROPY_SOURCE_LIB
     ${MICROPY_DIR}/lib/oofatfs/ff.c
     ${MICROPY_DIR}/lib/oofatfs/ffunicode.c
 )
+if(IDF_TARGET STREQUAL "esp32c3")
+    list(APPEND MICROPY_SOURCE_LIB ${MICROPY_DIR}/shared/runtime/gchelper_generic.c)
+endif()
 
 set(MICROPY_SOURCE_DRIVERS
     ${MICROPY_DIR}/drivers/bus/softspi.c
@@ -133,6 +136,9 @@ endif()
 
 if(IDF_TARGET STREQUAL "esp32")
     list(APPEND IDF_COMPONENTS esp32)
+elseif(IDF_TARGET STREQUAL "esp32c3")
+    list(APPEND IDF_COMPONENTS esp32c3)
+    list(APPEND IDF_COMPONENTS riscv)
 elseif(IDF_TARGET STREQUAL "esp32s2")
     list(APPEND IDF_COMPONENTS esp32s2)
     list(APPEND IDF_COMPONENTS tinyusb)
diff --git a/ports/esp32/modesp32.c b/ports/esp32/modesp32.c
index 7faff32046e8f..75e5b3ed8b5a3 100644
--- a/ports/esp32/modesp32.c
+++ b/ports/esp32/modesp32.c
@@ -30,7 +30,6 @@
 #include <time.h>
 #include <sys/time.h>
 #include "soc/rtc_cntl_reg.h"
-#include "soc/sens_reg.h"
 #include "driver/gpio.h"
 #include "driver/adc.h"
 #include "esp_heap_caps.h"
@@ -134,6 +133,8 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_KW(esp32_wake_on_ext1_obj, 0, esp32_wake_on_ext1)
 
 #if CONFIG_IDF_TARGET_ESP32
 
+#include "soc/sens_reg.h"
+
 STATIC mp_obj_t esp32_raw_temperature(void) {
     SET_PERI_REG_BITS(SENS_SAR_MEAS_WAIT2_REG, SENS_FORCE_XPD_SAR, 3, SENS_FORCE_XPD_SAR_S);
     SET_PERI_REG_BITS(SENS_SAR_TSENS_CTRL_REG, SENS_TSENS_CLK_DIV, 10, SENS_TSENS_CLK_DIV_S);
diff --git a/ports/esp32/modmachine.c b/ports/esp32/modmachine.c
index aa009944bd16b..50c0cff990174 100644
--- a/ports/esp32/modmachine.c
+++ b/ports/esp32/modmachine.c
@@ -34,7 +34,6 @@
 #include "freertos/task.h"
 #include "esp_sleep.h"
 #include "esp_pm.h"
-#include "driver/touch_pad.h"
 
 #if CONFIG_IDF_TARGET_ESP32
 #include "esp32/rom/rtc.h"
@@ -70,6 +69,10 @@ typedef enum {
 
 STATIC bool is_soft_reset = 0;
 
+#if CONFIG_IDF_TARGET_ESP32C3
+int esp_clk_cpu_freq(void);
+#endif
+
 STATIC mp_obj_t machine_freq(size_t n_args, const mp_obj_t *args) {
     if (n_args == 0) {
         // get
@@ -82,6 +85,8 @@ STATIC mp_obj_t machine_freq(size_t n_args, const mp_obj_t *args) {
         }
         #if CONFIG_IDF_TARGET_ESP32
         esp_pm_config_esp32_t pm;
+        #elif CONFIG_IDF_TARGET_ESP32C3
+        esp_pm_config_esp32c3_t pm;
         #elif CONFIG_IDF_TARGET_ESP32S2
         esp_pm_config_esp32s2_t pm;
         #endif
@@ -117,6 +122,8 @@ STATIC mp_obj_t machine_sleep_helper(wake_type_t wake_type, size_t n_args, const
         esp_sleep_enable_timer_wakeup(((uint64_t)expiry) * 1000);
     }
 
+    #if !CONFIG_IDF_TARGET_ESP32C3
+
     if (machine_rtc_config.ext0_pin != -1 && (machine_rtc_config.ext0_wake_types & wake_type)) {
         esp_sleep_enable_ext0_wakeup(machine_rtc_config.ext0_pin, machine_rtc_config.ext0_level ? 1 : 0);
     }
@@ -133,6 +140,8 @@ STATIC mp_obj_t machine_sleep_helper(wake_type_t wake_type, size_t n_args, const
         }
     }
 
+    #endif
+
     switch (wake_type) {
         case MACHINE_WAKE_SLEEP:
             esp_light_sleep_start();
diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h
index e4375bd0be429..46d8a38af1779 100644
--- a/ports/esp32/mpconfigport.h
+++ b/ports/esp32/mpconfigport.h
@@ -11,13 +11,18 @@
 // object representation and NLR handling
 #define MICROPY_OBJ_REPR                    (MICROPY_OBJ_REPR_A)
 #define MICROPY_NLR_SETJMP                  (1)
+#if CONFIG_IDF_TARGET_ESP32C3
+#define MICROPY_GCREGS_SETJMP               (1)
+#endif
 
 // memory allocation policies
 #define MICROPY_ALLOC_PATH_MAX              (128)
 
 // emitters
 #define MICROPY_PERSISTENT_CODE_LOAD        (1)
+#if !CONFIG_IDF_TARGET_ESP32C3
 #define MICROPY_EMIT_XTENSAWIN              (1)
+#endif
 
 // compiler configuration
 #define MICROPY_COMP_MODULE_CONST           (1)
diff --git a/ports/esp32/mphalport.c b/ports/esp32/mphalport.c
index 0f94e129bcb25..e795b5c991bb0 100644
--- a/ports/esp32/mphalport.c
+++ b/ports/esp32/mphalport.c
@@ -35,6 +35,8 @@
 
 #if CONFIG_IDF_TARGET_ESP32
 #include "esp32/rom/uart.h"
+#elif CONFIG_IDF_TARGET_ESP32C3
+#include "esp32c3/rom/uart.h"
 #elif CONFIG_IDF_TARGET_ESP32S2
 #include "esp32s2/rom/uart.h"
 #elif CONFIG_IDF_TARGET_ESP32S3
diff --git a/ports/esp32/mphalport.h b/ports/esp32/mphalport.h
index 2ba6f96b6a6a3..2dad8fa924c43 100644
--- a/ports/esp32/mphalport.h
+++ b/ports/esp32/mphalport.h
@@ -51,7 +51,11 @@ void check_esp_err(esp_err_t code);
 uint32_t mp_hal_ticks_us(void);
 __attribute__((always_inline)) static inline uint32_t mp_hal_ticks_cpu(void) {
     uint32_t ccount;
+    #if CONFIG_IDF_TARGET_ESP32C3
+    __asm__ __volatile__ ("csrr %0, 0x7E2" : "=r" (ccount)); // Machine Performance Counter Value
+    #else
     __asm__ __volatile__ ("rsr %0,ccount" : "=a" (ccount));
+    #endif
     return ccount;
 }
 
diff --git a/ports/esp32/uart.c b/ports/esp32/uart.c
index c4fe41eaff39c..480b364a59908 100644
--- a/ports/esp32/uart.c
+++ b/ports/esp32/uart.c
@@ -51,7 +51,7 @@ STATIC void IRAM_ATTR uart_irq_handler(void *arg) {
     while (uart->status.rxfifo_cnt) {
         #if CONFIG_IDF_TARGET_ESP32
         uint8_t c = uart->fifo.rw_byte;
-        #elif CONFIG_IDF_TARGET_ESP32S2
+        #elif CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32S2
         uint8_t c = READ_PERI_REG(UART_FIFO_AHB_REG(0)); // UART0
         #endif
         if (c == mp_interrupt_char) {

From c77225ae5b043af67338ec8cc6d52f6fc3448150 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sun, 18 Jul 2021 12:11:23 +1000
Subject: [PATCH 1088/3533] esp32/boards/GENERIC_C3: Add generic C3-based
 board.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/boards/GENERIC_C3/mpconfigboard.cmake | 10 ++++++++++
 ports/esp32/boards/GENERIC_C3/mpconfigboard.h     |  8 ++++++++
 2 files changed, 18 insertions(+)
 create mode 100644 ports/esp32/boards/GENERIC_C3/mpconfigboard.cmake
 create mode 100644 ports/esp32/boards/GENERIC_C3/mpconfigboard.h

diff --git a/ports/esp32/boards/GENERIC_C3/mpconfigboard.cmake b/ports/esp32/boards/GENERIC_C3/mpconfigboard.cmake
new file mode 100644
index 0000000000000..4f31884231b15
--- /dev/null
+++ b/ports/esp32/boards/GENERIC_C3/mpconfigboard.cmake
@@ -0,0 +1,10 @@
+set(IDF_TARGET esp32c3)
+
+set(SDKCONFIG_DEFAULTS
+    boards/sdkconfig.base
+    boards/sdkconfig.ble
+)
+
+if(NOT MICROPY_FROZEN_MANIFEST)
+    set(MICROPY_FROZEN_MANIFEST ${MICROPY_PORT_DIR}/boards/manifest.py)
+endif()
diff --git a/ports/esp32/boards/GENERIC_C3/mpconfigboard.h b/ports/esp32/boards/GENERIC_C3/mpconfigboard.h
new file mode 100644
index 0000000000000..d403e70e46d48
--- /dev/null
+++ b/ports/esp32/boards/GENERIC_C3/mpconfigboard.h
@@ -0,0 +1,8 @@
+// This configuration is for a generic ESP32C3 board with 4MiB (or more) of flash.
+
+#define MICROPY_HW_BOARD_NAME               "ESP32C3 module"
+#define MICROPY_HW_MCU_NAME                 "ESP32C3"
+
+#define MICROPY_HW_ENABLE_SDCARD            (0)
+#define MICROPY_PY_MACHINE_DAC              (0)
+#define MICROPY_PY_MACHINE_I2S              (0)

From 9f71a11d3fd18f811301d36fd37e2c2bb0c9d406 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sun, 18 Jul 2021 22:57:19 +1000
Subject: [PATCH 1089/3533] tools/ci.sh: Build GENERIC_C3 board as part of
 esp32 CI.

Signed-off-by: Damien George <damien@micropython.org>
---
 tools/ci.sh | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/tools/ci.sh b/tools/ci.sh
index 4ff4ba35ba556..a6e38b70eaf9f 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -86,12 +86,19 @@ function ci_esp32_setup_helper {
     git clone https://github.com/espressif/esp-idf.git
     git -C esp-idf checkout $1
     git -C esp-idf submodule update --init \
-        components/bt/controller/lib \
         components/bt/host/nimble/nimble \
         components/esp_wifi \
         components/esptool_py/esptool \
         components/lwip/lwip \
         components/mbedtls/mbedtls
+    if [ -d esp-idf/components/bt/controller/esp32 ]; then
+        git -C esp-idf submodule update --init \
+            components/bt/controller/lib_esp32 \
+            components/bt/controller/lib_esp32c3_family
+    else
+        git -C esp-idf submodule update --init \
+            components/bt/controller/lib
+    fi
     ./esp-idf/install.sh
 }
 
@@ -100,7 +107,7 @@ function ci_esp32_idf402_setup {
 }
 
 function ci_esp32_idf43_setup {
-    ci_esp32_setup_helper v4.3-beta2
+    ci_esp32_setup_helper v4.3
 }
 
 function ci_esp32_build {
@@ -110,6 +117,9 @@ function ci_esp32_build {
     make ${MAKEOPTS} -C ports/esp32
     make ${MAKEOPTS} -C ports/esp32 clean
     make ${MAKEOPTS} -C ports/esp32 USER_C_MODULES=../../../examples/usercmodule/micropython.cmake FROZEN_MANIFEST=$(pwd)/ports/esp32/boards/manifest.py
+    if [ -d $IDF_PATH/components/esp32c3 ]; then
+        make ${MAKEOPTS} -C ports/esp32 BOARD=GENERIC_C3
+    fi
     if [ -d $IDF_PATH/components/esp32s2 ]; then
         make ${MAKEOPTS} -C ports/esp32 BOARD=GENERIC_S2
     fi

From 8599f7a68d07624a6759f73a694d769b956ae79d Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Wed, 7 Jul 2021 23:47:20 +0200
Subject: [PATCH 1090/3533] rp2/machine_uart: Add hardware flow control
 support.

---
 ports/rp2/machine_uart.c | 59 +++++++++++++++++++++++++++++++++++++---
 1 file changed, 55 insertions(+), 4 deletions(-)

diff --git a/ports/rp2/machine_uart.c b/ports/rp2/machine_uart.c
index 2da3ab41f86fa..b26a162c2fd08 100644
--- a/ports/rp2/machine_uart.c
+++ b/ports/rp2/machine_uart.c
@@ -40,8 +40,12 @@
 #define DEFAULT_UART_STOP (1)
 #define DEFAULT_UART0_TX (0)
 #define DEFAULT_UART0_RX (1)
+#define DEFAULT_UART0_CTS (2)
+#define DEFAULT_UART0_RTS (3)
 #define DEFAULT_UART1_TX (4)
 #define DEFAULT_UART1_RX (5)
+#define DEFAULT_UART1_CTS (6)
+#define DEFAULT_UART1_RTS (7)
 #define DEFAULT_BUFFER_SIZE (256)
 #define MIN_BUFFER_SIZE  (32)
 #define MAX_BUFFER_SIZE  (32766)
@@ -49,11 +53,16 @@
 #define IS_VALID_PERIPH(uart, pin)  (((((pin) + 4) & 8) >> 3) == (uart))
 #define IS_VALID_TX(uart, pin)      (((pin) & 3) == 0 && IS_VALID_PERIPH(uart, pin))
 #define IS_VALID_RX(uart, pin)      (((pin) & 3) == 1 && IS_VALID_PERIPH(uart, pin))
+#define IS_VALID_CTS(uart, pin)     (((pin) & 3) == 2 && IS_VALID_PERIPH(uart, pin))
+#define IS_VALID_RTS(uart, pin)     (((pin) & 3) == 3 && IS_VALID_PERIPH(uart, pin))
 
 #define UART_INVERT_TX (1)
 #define UART_INVERT_RX (2)
 #define UART_INVERT_MASK (UART_INVERT_TX | UART_INVERT_RX)
 
+#define UART_HWCONTROL_CTS  (1)
+#define UART_HWCONTROL_RTS  (2)
+
 typedef struct _machine_uart_obj_t {
     mp_obj_base_t base;
     uart_inst_t *const uart;
@@ -64,9 +73,12 @@ typedef struct _machine_uart_obj_t {
     uint8_t stop;
     uint8_t tx;
     uint8_t rx;
+    uint8_t cts;
+    uint8_t rts;
     uint16_t timeout;       // timeout waiting for first char (in ms)
     uint16_t timeout_char;  // timeout waiting between chars (in ms)
     uint8_t invert;
+    uint8_t flow;
     ringbuf_t read_buffer;
     bool read_lock;
     ringbuf_t write_buffer;
@@ -75,9 +87,9 @@ typedef struct _machine_uart_obj_t {
 
 STATIC machine_uart_obj_t machine_uart_obj[] = {
     {{&machine_uart_type}, uart0, 0, 0, DEFAULT_UART_BITS, UART_PARITY_NONE, DEFAULT_UART_STOP,
-     DEFAULT_UART0_TX, DEFAULT_UART0_RX, 0, 0, 0, {NULL, 1, 0, 0}, 0, {NULL, 1, 0, 0}, 0},
+     DEFAULT_UART0_TX, DEFAULT_UART0_RX, DEFAULT_UART0_CTS, DEFAULT_UART0_RTS, 0, 0, 0, 0, {NULL, 1, 0, 0}, 0, {NULL, 1, 0, 0}, 0},
     {{&machine_uart_type}, uart1, 1, 0, DEFAULT_UART_BITS, UART_PARITY_NONE, DEFAULT_UART_STOP,
-     DEFAULT_UART1_TX, DEFAULT_UART1_RX, 0, 0, 0, {NULL, 1, 0, 0}, 0, {NULL, 1, 0, 0}, 0,},
+     DEFAULT_UART1_TX, DEFAULT_UART1_RX, DEFAULT_UART1_CTS, DEFAULT_UART1_RTS, 0, 0, 0, 0, {NULL, 1, 0, 0}, 0, {NULL, 1, 0, 0}, 0},
 };
 
 STATIC const char *_parity_name[] = {"None", "0", "1"};
@@ -140,8 +152,8 @@ STATIC void machine_uart_print(const mp_print_t *print, mp_obj_t self_in, mp_pri
 }
 
 STATIC mp_obj_t machine_uart_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
-    enum { ARG_id, ARG_baudrate, ARG_bits, ARG_parity, ARG_stop, ARG_tx, ARG_rx,
-           ARG_timeout, ARG_timeout_char, ARG_invert, ARG_txbuf, ARG_rxbuf};
+    enum { ARG_id, ARG_baudrate, ARG_bits, ARG_parity, ARG_stop, ARG_tx, ARG_rx, ARG_cts, ARG_rts,
+           ARG_timeout, ARG_timeout_char, ARG_invert, ARG_flow, ARG_txbuf, ARG_rxbuf};
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_id, MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
         { MP_QSTR_baudrate, MP_ARG_INT, {.u_int = -1} },
@@ -150,9 +162,12 @@ STATIC mp_obj_t machine_uart_make_new(const mp_obj_type_t *type, size_t n_args,
         { MP_QSTR_stop, MP_ARG_INT, {.u_int = -1} },
         { MP_QSTR_tx, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
         { MP_QSTR_rx, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
+        { MP_QSTR_cts, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
+        { MP_QSTR_rts, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
         { MP_QSTR_timeout, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} },
         { MP_QSTR_timeout_char, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} },
         { MP_QSTR_invert, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} },
+        { MP_QSTR_flow, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} },
         { MP_QSTR_txbuf, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} },
         { MP_QSTR_rxbuf, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} },
     };
@@ -212,6 +227,22 @@ STATIC mp_obj_t machine_uart_make_new(const mp_obj_type_t *type, size_t n_args,
         self->rx = rx;
     }
 
+    // Set CTS/RTS pins if configured.
+    if (args[ARG_cts].u_obj != mp_const_none) {
+        int cts = mp_hal_get_pin_obj(args[ARG_cts].u_obj);
+        if (!IS_VALID_CTS(self->uart_id, cts)) {
+            mp_raise_ValueError(MP_ERROR_TEXT("bad CTS pin"));
+        }
+        self->cts = cts;
+    }
+    if (args[ARG_rts].u_obj != mp_const_none) {
+        int rts = mp_hal_get_pin_obj(args[ARG_rts].u_obj);
+        if (!IS_VALID_RTS(self->uart_id, rts)) {
+            mp_raise_ValueError(MP_ERROR_TEXT("bad RTS pin"));
+        }
+        self->rts = rts;
+    }
+
     // Set timeout if configured.
     if (args[ARG_timeout].u_int >= 0) {
         self->timeout = args[ARG_timeout].u_int;
@@ -230,6 +261,14 @@ STATIC mp_obj_t machine_uart_make_new(const mp_obj_type_t *type, size_t n_args,
         self->invert = args[ARG_invert].u_int;
     }
 
+    // Set hardware flow control if configured.
+    if (args[ARG_flow].u_int >= 0) {
+        if (args[ARG_flow].u_int & ~(UART_HWCONTROL_CTS | UART_HWCONTROL_RTS)) {
+            mp_raise_ValueError(MP_ERROR_TEXT("bad hardware flow control mask"));
+        }
+        self->flow = args[ARG_flow].u_int;
+    }
+
     self->read_lock = false;
 
     // Set the RX buffer size if configured.
@@ -278,6 +317,15 @@ STATIC mp_obj_t machine_uart_make_new(const mp_obj_type_t *type, size_t n_args,
             gpio_set_outover(self->tx, GPIO_OVERRIDE_INVERT);
         }
 
+        // Set hardware flow control if configured.
+        if (self->flow & UART_HWCONTROL_CTS) {
+            gpio_set_function(self->cts, GPIO_FUNC_UART);
+        }
+        if (self->flow & UART_HWCONTROL_RTS) {
+            gpio_set_function(self->rts, GPIO_FUNC_UART);
+        }
+        uart_set_hw_flow(self->uart, self->flow & UART_HWCONTROL_CTS, self->flow & UART_HWCONTROL_RTS);
+
         // Allocate the RX/TX buffers.
         ringbuf_alloc(&(self->read_buffer), rxbuf_len + 1);
         MP_STATE_PORT(rp2_uart_rx_buffer[uart_id]) = self->read_buffer.buf;
@@ -333,6 +381,9 @@ STATIC const mp_rom_map_elem_t machine_uart_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_INV_TX), MP_ROM_INT(UART_INVERT_TX) },
     { MP_ROM_QSTR(MP_QSTR_INV_RX), MP_ROM_INT(UART_INVERT_RX) },
 
+    { MP_ROM_QSTR(MP_QSTR_CTS), MP_ROM_INT(UART_HWCONTROL_CTS) },
+    { MP_ROM_QSTR(MP_QSTR_RTS), MP_ROM_INT(UART_HWCONTROL_RTS) },
+
 };
 STATIC MP_DEFINE_CONST_DICT(machine_uart_locals_dict, machine_uart_locals_dict_table);
 

From 4f2a10bfc91d5d49837de581eb09d21293f84e2c Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Wed, 7 Jul 2021 23:56:29 +0200
Subject: [PATCH 1091/3533] rp2/machine_uart: Allow overriding default machine
 UART pins.

---
 ports/rp2/machine_uart.c | 31 +++++++++++++++++++++----------
 1 file changed, 21 insertions(+), 10 deletions(-)

diff --git a/ports/rp2/machine_uart.c b/ports/rp2/machine_uart.c
index b26a162c2fd08..c6206cebe6973 100644
--- a/ports/rp2/machine_uart.c
+++ b/ports/rp2/machine_uart.c
@@ -38,14 +38,23 @@
 #define DEFAULT_UART_BAUDRATE (115200)
 #define DEFAULT_UART_BITS (8)
 #define DEFAULT_UART_STOP (1)
-#define DEFAULT_UART0_TX (0)
-#define DEFAULT_UART0_RX (1)
-#define DEFAULT_UART0_CTS (2)
-#define DEFAULT_UART0_RTS (3)
-#define DEFAULT_UART1_TX (4)
-#define DEFAULT_UART1_RX (5)
-#define DEFAULT_UART1_CTS (6)
-#define DEFAULT_UART1_RTS (7)
+
+// UART 0 default pins
+#if !defined(MICROPY_HW_UART0_TX)
+#define MICROPY_HW_UART0_TX (0)
+#define MICROPY_HW_UART0_RX (1)
+#define MICROPY_HW_UART0_CTS (2)
+#define MICROPY_HW_UART0_RTS (3)
+#endif
+
+// UART 1 default pins
+#if !defined(MICROPY_HW_UART1_TX)
+#define MICROPY_HW_UART1_TX (4)
+#define MICROPY_HW_UART1_RX (5)
+#define MICROPY_HW_UART1_CTS (6)
+#define MICROPY_HW_UART1_RTS (7)
+#endif
+
 #define DEFAULT_BUFFER_SIZE (256)
 #define MIN_BUFFER_SIZE  (32)
 #define MAX_BUFFER_SIZE  (32766)
@@ -87,9 +96,11 @@ typedef struct _machine_uart_obj_t {
 
 STATIC machine_uart_obj_t machine_uart_obj[] = {
     {{&machine_uart_type}, uart0, 0, 0, DEFAULT_UART_BITS, UART_PARITY_NONE, DEFAULT_UART_STOP,
-     DEFAULT_UART0_TX, DEFAULT_UART0_RX, DEFAULT_UART0_CTS, DEFAULT_UART0_RTS, 0, 0, 0, 0, {NULL, 1, 0, 0}, 0, {NULL, 1, 0, 0}, 0},
+     MICROPY_HW_UART0_TX, MICROPY_HW_UART0_RX, MICROPY_HW_UART0_CTS, MICROPY_HW_UART0_RTS,
+     0, 0, 0, 0, {NULL, 1, 0, 0}, 0, {NULL, 1, 0, 0}, 0},
     {{&machine_uart_type}, uart1, 1, 0, DEFAULT_UART_BITS, UART_PARITY_NONE, DEFAULT_UART_STOP,
-     DEFAULT_UART1_TX, DEFAULT_UART1_RX, DEFAULT_UART1_CTS, DEFAULT_UART1_RTS, 0, 0, 0, 0, {NULL, 1, 0, 0}, 0, {NULL, 1, 0, 0}, 0},
+     MICROPY_HW_UART1_TX, MICROPY_HW_UART1_RX, MICROPY_HW_UART1_CTS, MICROPY_HW_UART1_RTS,
+     0, 0, 0, 0, {NULL, 1, 0, 0}, 0, {NULL, 1, 0, 0}, 0},
 };
 
 STATIC const char *_parity_name[] = {"None", "0", "1"};

From 79da7757cc942f202b2f6a276ddcc1d42b484328 Mon Sep 17 00:00:00 2001
From: Mike Causer <mcauser@gmail.com>
Date: Fri, 9 Jul 2021 09:51:59 +1000
Subject: [PATCH 1092/3533] rp2/machine_i2c: Allow boards to configure I2C pins
 using new macros.

---
 ports/rp2/machine_i2c.c | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/ports/rp2/machine_i2c.c b/ports/rp2/machine_i2c.c
index 0852cc19938e1..3b895ba4d44e0 100644
--- a/ports/rp2/machine_i2c.c
+++ b/ports/rp2/machine_i2c.c
@@ -33,10 +33,16 @@
 #include "hardware/i2c.h"
 
 #define DEFAULT_I2C_FREQ (400000)
-#define DEFAULT_I2C0_SCL (9)
-#define DEFAULT_I2C0_SDA (8)
-#define DEFAULT_I2C1_SCL (7)
-#define DEFAULT_I2C1_SDA (6)
+
+#ifndef MICROPY_HW_I2C0_SCL
+#define MICROPY_HW_I2C0_SCL (9)
+#define MICROPY_HW_I2C0_SDA (8)
+#endif
+
+#ifndef MICROPY_HW_I2C1_SCL
+#define MICROPY_HW_I2C1_SCL (7)
+#define MICROPY_HW_I2C1_SDA (6)
+#endif
 
 // SDA/SCL on even/odd pins, I2C0/I2C1 on even/odd pairs of pins.
 #define IS_VALID_SCL(i2c, pin) (((pin) & 1) == 1 && (((pin) & 2) >> 1) == (i2c))
@@ -52,8 +58,8 @@ typedef struct _machine_i2c_obj_t {
 } machine_i2c_obj_t;
 
 STATIC machine_i2c_obj_t machine_i2c_obj[] = {
-    {{&machine_hw_i2c_type}, i2c0, 0, DEFAULT_I2C0_SCL, DEFAULT_I2C0_SDA, 0},
-    {{&machine_hw_i2c_type}, i2c1, 1, DEFAULT_I2C1_SCL, DEFAULT_I2C1_SDA, 0},
+    {{&machine_hw_i2c_type}, i2c0, 0, MICROPY_HW_I2C0_SCL, MICROPY_HW_I2C0_SDA, 0},
+    {{&machine_hw_i2c_type}, i2c1, 1, MICROPY_HW_I2C1_SCL, MICROPY_HW_I2C1_SDA, 0},
 };
 
 STATIC void machine_i2c_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {

From cc77b306396ce7979baaac69b5d7abef7da29110 Mon Sep 17 00:00:00 2001
From: Mike Causer <mcauser@gmail.com>
Date: Fri, 9 Jul 2021 11:07:37 +1000
Subject: [PATCH 1093/3533] rp2/machine_spi: Allow boards to configure SPI pins
 using new macros.

---
 ports/rp2/machine_spi.c | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/ports/rp2/machine_spi.c b/ports/rp2/machine_spi.c
index 478c0614557c2..332f44694548d 100644
--- a/ports/rp2/machine_spi.c
+++ b/ports/rp2/machine_spi.c
@@ -38,12 +38,18 @@
 #define DEFAULT_SPI_PHASE       (0)
 #define DEFAULT_SPI_BITS        (8)
 #define DEFAULT_SPI_FIRSTBIT    (SPI_MSB_FIRST)
-#define DEFAULT_SPI0_SCK        (6)
-#define DEFAULT_SPI0_MOSI       (7)
-#define DEFAULT_SPI0_MISO       (4)
-#define DEFAULT_SPI1_SCK        (10)
-#define DEFAULT_SPI1_MOSI       (11)
-#define DEFAULT_SPI1_MISO       (8)
+
+#ifndef MICROPY_HW_SPI0_SCK
+#define MICROPY_HW_SPI0_SCK     (6)
+#define MICROPY_HW_SPI0_MOSI    (7)
+#define MICROPY_HW_SPI0_MISO    (4)
+#endif
+
+#ifndef MICROPY_HW_SPI1_SCK
+#define MICROPY_HW_SPI1_SCK     (10)
+#define MICROPY_HW_SPI1_MOSI    (11)
+#define MICROPY_HW_SPI1_MISO    (8)
+#endif
 
 #define IS_VALID_PERIPH(spi, pin)   ((((pin) & 8) >> 3) == (spi))
 #define IS_VALID_SCK(spi, pin)      (((pin) & 3) == 2 && IS_VALID_PERIPH(spi, pin))
@@ -68,13 +74,13 @@ STATIC machine_spi_obj_t machine_spi_obj[] = {
     {
         {&machine_spi_type}, spi0, 0,
         DEFAULT_SPI_POLARITY, DEFAULT_SPI_PHASE, DEFAULT_SPI_BITS, DEFAULT_SPI_FIRSTBIT,
-        DEFAULT_SPI0_SCK, DEFAULT_SPI0_MOSI, DEFAULT_SPI0_MISO,
+        MICROPY_HW_SPI0_SCK, MICROPY_HW_SPI0_MOSI, MICROPY_HW_SPI0_MISO,
         0,
     },
     {
         {&machine_spi_type}, spi1, 1,
         DEFAULT_SPI_POLARITY, DEFAULT_SPI_PHASE, DEFAULT_SPI_BITS, DEFAULT_SPI_FIRSTBIT,
-        DEFAULT_SPI1_SCK, DEFAULT_SPI1_MOSI, DEFAULT_SPI1_MISO,
+        MICROPY_HW_SPI1_SCK, MICROPY_HW_SPI1_MOSI, MICROPY_HW_SPI1_MISO,
         0,
     },
 };

From d0227d5862ce57ec064563febf5b644cb39d2c07 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sat, 17 Jul 2021 23:18:40 +1000
Subject: [PATCH 1094/3533] py/emitnative: Reuse need_reg_all func in
 need_stack_settled.

To reduce code size and code duplication.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/emitnative.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/py/emitnative.c b/py/emitnative.c
index 425ba2d33e528..a40d690f2d775 100644
--- a/py/emitnative.c
+++ b/py/emitnative.c
@@ -841,10 +841,13 @@ STATIC void need_reg_single(emit_t *emit, int reg_needed, int skip_stack_pos) {
     }
 }
 
+// Ensures all unsettled registers that hold Python values are copied to the
+// concrete Python stack.  All registers are then free to use.
 STATIC void need_reg_all(emit_t *emit) {
     for (int i = 0; i < emit->stack_size; i++) {
         stack_info_t *si = &emit->stack_info[i];
         if (si->kind == STACK_REG) {
+            DEBUG_printf("    reg(%u) to local(%u)\n", si->data.u_reg, emit->stack_start + i);
             si->kind = STACK_VALUE;
             emit_native_mov_state_reg(emit, emit->stack_start + i, si->data.u_reg);
         }
@@ -871,16 +874,13 @@ STATIC vtype_kind_t load_reg_stack_imm(emit_t *emit, int reg_dest, const stack_i
     }
 }
 
+// Copies all unsettled registers and immediates that are Python values into the
+// concrete Python stack.  This ensures the concrete Python stack holds valid
+// values for the current stack_size.
+// This function may clobber REG_TEMP0.
 STATIC void need_stack_settled(emit_t *emit) {
     DEBUG_printf("  need_stack_settled; stack_size=%d\n", emit->stack_size);
-    for (int i = 0; i < emit->stack_size; i++) {
-        stack_info_t *si = &emit->stack_info[i];
-        if (si->kind == STACK_REG) {
-            DEBUG_printf("    reg(%u) to local(%u)\n", si->data.u_reg, emit->stack_start + i);
-            si->kind = STACK_VALUE;
-            emit_native_mov_state_reg(emit, emit->stack_start + i, si->data.u_reg);
-        }
-    }
+    need_reg_all(emit);
     for (int i = 0; i < emit->stack_size; i++) {
         stack_info_t *si = &emit->stack_info[i];
         if (si->kind == STACK_IMM) {

From 0e3752e82a61b2378547457c4041270db3909c39 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Mon, 19 Jul 2021 13:13:32 +1000
Subject: [PATCH 1095/3533] py/emitnative: Ensure stack settling is safe
 mid-branch.

And add a test for the case where REG_RET could be in use.

Fixes #7523.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 py/emitnative.c                      |  7 ++++---
 tests/micropython/native_misc.py     | 10 ++++++++++
 tests/micropython/native_misc.py.exp |  2 ++
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/py/emitnative.c b/py/emitnative.c
index a40d690f2d775..7c7c3428397a9 100644
--- a/py/emitnative.c
+++ b/py/emitnative.c
@@ -877,7 +877,7 @@ STATIC vtype_kind_t load_reg_stack_imm(emit_t *emit, int reg_dest, const stack_i
 // Copies all unsettled registers and immediates that are Python values into the
 // concrete Python stack.  This ensures the concrete Python stack holds valid
 // values for the current stack_size.
-// This function may clobber REG_TEMP0.
+// This function may clobber REG_TEMP1.
 STATIC void need_stack_settled(emit_t *emit) {
     DEBUG_printf("  need_stack_settled; stack_size=%d\n", emit->stack_size);
     need_reg_all(emit);
@@ -886,8 +886,9 @@ STATIC void need_stack_settled(emit_t *emit) {
         if (si->kind == STACK_IMM) {
             DEBUG_printf("    imm(" INT_FMT ") to local(%u)\n", si->data.u_imm, emit->stack_start + i);
             si->kind = STACK_VALUE;
-            si->vtype = load_reg_stack_imm(emit, REG_TEMP0, si, false);
-            emit_native_mov_state_reg(emit, emit->stack_start + i, REG_TEMP0);
+            // using REG_TEMP1 to avoid clobbering REG_TEMP0 (aka REG_RET)
+            si->vtype = load_reg_stack_imm(emit, REG_TEMP1, si, false);
+            emit_native_mov_state_reg(emit, emit->stack_start + i, REG_TEMP1);
         }
     }
 }
diff --git a/tests/micropython/native_misc.py b/tests/micropython/native_misc.py
index 7c5415375e05b..f5ef807fe13f0 100644
--- a/tests/micropython/native_misc.py
+++ b/tests/micropython/native_misc.py
@@ -38,3 +38,13 @@ def f(a):
 
 f(False)
 f(True)
+
+
+# stack settling in branch
+@micropython.native
+def f(a):
+    print(1, 2, 3, 4 if a else 5)
+
+
+f(False)
+f(True)
diff --git a/tests/micropython/native_misc.py.exp b/tests/micropython/native_misc.py.exp
index b3e1389ef711b..8eec04228f043 100644
--- a/tests/micropython/native_misc.py.exp
+++ b/tests/micropython/native_misc.py.exp
@@ -4,3 +4,5 @@
 6
 True
 False
+1 2 3 5
+1 2 3 4

From da74ef661587011132570abfe70114ca8ccd679c Mon Sep 17 00:00:00 2001
From: NitiKaur <nitikaur102@gmail.com>
Date: Sat, 10 Jul 2021 13:35:52 +0530
Subject: [PATCH 1096/3533] docs/rp2: Enhance quickref and change image to Pico
 pinout.

---
 docs/rp2/img/pico_pinout.png | Bin 0 -> 186434 bytes
 docs/rp2/img/rpipico.jpg     | Bin 89259 -> 0 bytes
 docs/rp2/quickref.rst        |  94 ++++++++++++++++++++---------------
 3 files changed, 53 insertions(+), 41 deletions(-)
 create mode 100644 docs/rp2/img/pico_pinout.png
 delete mode 100644 docs/rp2/img/rpipico.jpg

diff --git a/docs/rp2/img/pico_pinout.png b/docs/rp2/img/pico_pinout.png
new file mode 100644
index 0000000000000000000000000000000000000000..7bee29274e9d23096b8bbc8f9b9af00d18dacf2b
GIT binary patch
literal 186434
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%0AA^IwoC+Wpzl
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
TdD^?c0}x-tzlv3h7zF+w6~>!c

literal 0
HcmV?d00001

diff --git a/docs/rp2/img/rpipico.jpg b/docs/rp2/img/rpipico.jpg
deleted file mode 100644
index 336d3582775b8701d670403b0e63df8fcefc478c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 89259
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

diff --git a/docs/rp2/quickref.rst b/docs/rp2/quickref.rst
index c18eb4a0b9027..65e98d700b1fa 100644
--- a/docs/rp2/quickref.rst
+++ b/docs/rp2/quickref.rst
@@ -3,7 +3,7 @@
 Quick reference for the RP2
 ===========================
 
-.. image:: img/rpipico.jpg
+.. image:: img/pico_pinout.png
     :alt: Raspberry Pi Pico
     :width: 640px
 
@@ -27,10 +27,9 @@ a troubleshooting subsection.
 General board control
 ---------------------
 
-The MicroPython REPL is on the USB serial port.
-Tab-completion is useful to find out what methods an object has.
-Paste mode (ctrl-E) is useful to paste a large slab of Python code into
-the REPL.
+The MicroPython REPL is accessed via the USB serial port. Tab-completion is useful to
+find out what methods an object has. Paste mode (ctrl-E) is useful to paste a
+large slab of Python code into the REPL.
 
 The :mod:`machine` module::
 
@@ -59,7 +58,19 @@ Use the :mod:`time <utime>` module::
 Timers
 ------
 
-How do they work?
+RP2040's system timer peripheral provides a global microsecond timebase and
+generates interrupts for it.  The software timer is available currently,
+and there are unlimited number of them (memory permitting). There is no need
+to specify the timer id (id=-1 is supported at the moment) as it will default
+to this.
+
+Use the :mod:`machine.Timer` class::
+
+    from machine import Timer
+
+    tim = Timer(period=5000, mode=Timer.ONE_SHOT, callback=lambda t:print(1))
+    tim.init(period=2000, mode=Timer.PERIODIC, callback=lambda t:print(2))
+
 
 .. _rp2_Pins_and_GPIO:
 
@@ -84,19 +95,28 @@ Use the :ref:`machine.Pin <machine.Pin>` class::
 UART (serial bus)
 -----------------
 
-See :ref:`machine.UART <machine.UART>`. ::
+There are two UARTs, UART0 and UART1. UART0 can be mapped to GPIO 0/1, 12/13
+and 16/17, and UART1 to GPIO 4/5 and 8/9.
+
 
-    from machine import UART
+See :ref:`machine.UART <machine.UART>`. ::
 
-    uart1 = UART(1, baudrate=9600, tx=33, rx=32)
+    from machine import UART, Pin
+    uart1 = UART(1, baudrate=9600, tx=Pin(4), rx=Pin(5))
     uart1.write('hello')  # write 5 bytes
     uart1.read(5)         # read up to 5 bytes
 
+.. note::
+
+    REPL over UART is disabled by default. You can see the :ref:`rp2_intro` for
+    details on how to enable REPL over UART.
+
 
 PWM (pulse width modulation)
 ----------------------------
 
-How does PWM work on the RPi RP2xxx?
+There are 8 independent channels each of which have 2 outputs making it 16
+PWM channels in total which can be clocked from 7Hz to 125Mhz.
 
 Use the ``machine.PWM`` class::
 
@@ -112,14 +132,18 @@ Use the ``machine.PWM`` class::
 ADC (analog to digital conversion)
 ----------------------------------
 
-How does the ADC module work?
+RP2040 has five ADC channels in total, four of which are 12-bit SAR based
+ADCs: GP26, GP27, GP28 and GP29. The input signal for ADC0, ADC1, ADC2 and
+ADC3 can be connected with GP26, GP27, GP28, GP29 respectively (On Pico board,
+GP29 is connected to VSYS). The standard ADC range is 0-3.3V. The fifth
+channel is connected to the in-built temperature sensor and can be used for
+measuring the temperature.
 
 Use the :ref:`machine.ADC <machine.ADC>` class::
 
-    from machine import ADC
-
-    adc = ADC(Pin(32))          # create ADC object on ADC pin
-    adc.read_u16()              # read value, 0-65535 across voltage range 0.0v - 3.3v
+    from machine import ADC, Pin
+    adc = ADC(Pin(26))     # create ADC object on ADC pin
+    adc.read_u16()         # read value, 0-65535 across voltage range 0.0v - 3.3v
 
 Software SPI bus
 ----------------
@@ -132,7 +156,7 @@ Software SPI (using bit-banging) works on all pins, and is accessed via the
     # construct a SoftSPI bus on the given pins
     # polarity is the idle state of SCK
     # phase=0 means sample on the first edge of SCK, phase=1 means the second
-    spi = SoftSPI(baudrate=100000, polarity=1, phase=0, sck=Pin(0), mosi=Pin(2), miso=Pin(4))
+    spi = SoftSPI(baudrate=100_000, polarity=1, phase=0, sck=Pin(0), mosi=Pin(2), miso=Pin(4))
 
     spi.init(baudrate=200000) # set the baudrate
 
@@ -156,14 +180,15 @@ Software SPI (using bit-banging) works on all pins, and is accessed via the
 Hardware SPI bus
 ----------------
 
-Hardware SPI is accessed via the :ref:`machine.SPI <machine.SPI>` class and
-has the same methods as software SPI above::
+The RP2040 has 2 hardware SPI buses which is accessed via the
+:ref:`machine.SPI <machine.SPI>` class and has the same methods as software
+SPI above::
 
     from machine import Pin, SPI
 
-    spi = SPI(1, 10000000)
-    spi = SPI(1, 10000000, sck=Pin(14), mosi=Pin(13), miso=Pin(12))
-    spi = SPI(2, baudrate=80000000, polarity=0, phase=0, bits=8, firstbit=0, sck=Pin(18), mosi=Pin(23), miso=Pin(19))
+    spi = SPI(1, 10_000_000)  # Default assignment: sck=Pin(10), mosi=Pin(11), miso=Pin(8)
+    spi = SPI(1, 10_000_000, sck=Pin(14), mosi=Pin(15), miso=Pin(12))
+    spi = SPI(0, baudrate=80_000_000, polarity=0, phase=0, bits=8, sck=Pin(6), mosi=Pin(7), miso=Pin(4))
 
 Software I2C bus
 ----------------
@@ -173,7 +198,7 @@ accessed via the :ref:`machine.SoftI2C <machine.SoftI2C>` class::
 
     from machine import Pin, SoftI2C
 
-    i2c = SoftI2C(scl=Pin(5), sda=Pin(4), freq=100000)
+    i2c = SoftI2C(scl=Pin(5), sda=Pin(4), freq=100_000)
 
     i2c.scan()              # scan for devices
 
@@ -191,8 +216,8 @@ has the same methods as software I2C above::
 
     from machine import Pin, I2C
 
-    i2c = I2C(0)
-    i2c = I2C(1, scl=Pin(5), sda=Pin(4), freq=400000)
+    i2c = I2C(0)   # default assignment: scl=Pin(9), sda=Pin(8)
+    i2c = I2C(1, scl=Pin(3), sda=Pin(2), freq=400_000)
 
 Real time clock (RTC)
 ---------------------
@@ -202,13 +227,15 @@ See :ref:`machine.RTC <machine.RTC>` ::
     from machine import RTC
 
     rtc = RTC()
-    rtc.datetime((2017, 8, 23, 2, 12, 48, 0, 0)) # set a specific date and time
+    rtc.datetime((2017, 8, 23, 2, 12, 48, 0, 0)) # set a specific date and
+                                                 # time, eg. 2017/8/23 1:12:48
     rtc.datetime() # get date and time
 
 WDT (Watchdog timer)
 --------------------
 
-Is there a watchdog timer?
+The RP2040 has a watchdog which is a countdown timer that can restart
+parts of the chip if it reaches zero.
 
 See :ref:`machine.WDT <machine.WDT>`. ::
 
@@ -218,21 +245,6 @@ See :ref:`machine.WDT <machine.WDT>`. ::
     wdt = WDT(timeout=5000)
     wdt.feed()
 
-Deep-sleep mode
----------------
-
-Is there deep-sleep support for the rp2?
-
-The following code can be used to sleep, wake and check the reset cause::
-
-    import machine
-
-    # check if the device woke from a deep sleep
-    if machine.reset_cause() == machine.DEEPSLEEP_RESET:
-        print('woke from a deep sleep')
-
-    # put the device to sleep for 10 seconds
-    machine.deepsleep(10000)
 
 OneWire driver
 --------------

From 6a9133a8b5fc2c19635ae0260569837aaaad2b37 Mon Sep 17 00:00:00 2001
From: NitiKaur <nitikaur102@gmail.com>
Date: Sat, 10 Jul 2021 17:41:53 +0530
Subject: [PATCH 1097/3533] docs/rp2: Update general section to give a brief
 technical overview.

---
 docs/rp2/general.rst | 26 ++++++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/docs/rp2/general.rst b/docs/rp2/general.rst
index 9ff83a965603a..7042d0d25b31b 100644
--- a/docs/rp2/general.rst
+++ b/docs/rp2/general.rst
@@ -10,9 +10,27 @@ the RP2040.
 Technical specifications and SoC datasheets
 -------------------------------------------
 
-Datasheets!
+For detailed technical specifications, please refer to the `datasheets
+<https://datasheets.raspberrypi.org/rp2040/rp2040-datasheet.pdf>`_
 
-Short summary of tech specs!
+The RP2040 microcontroller is manufactured on a 40 nm silicon process in a 7x7mm
+QFN-56 SMD package. The key features include:
 
-Description of general structure of the port (it's built on top of the APIs
-provided by the Raspberry Pi SDK).
+* 133 MHz dual ARM Cortex-M0+ cores (overclockable to over 400 MHz)
+* 264KB SRAM in six independent banks
+* No internal Flash or EEPROM memory (after reset, the bootloader loads
+  firmware from either the external flash memory or USB bus into internal SRAM)
+* QSPI bus controller, which
+  supports up to 16 MB of external Flash memory
+* On-chip programmable LDO togenerate core voltage
+* 2 on-chip PLLs to generate USB and core clocks
+* 30 GPIOpins, of which 4 can optionally be used as analog inputs
+
+The peripherals include:
+
+* 2 UARTs
+* 2 SPI controllers
+* 2 I2C contollers
+* 16 PWM channels
+* USB 1.1 controller
+* 8 PIO state machines

From db6d60b07967f6d75d74349b021b262cb8fee628 Mon Sep 17 00:00:00 2001
From: Josh Lloyd <j.nevercast@gmail.com>
Date: Wed, 20 Nov 2019 17:21:35 +1300
Subject: [PATCH 1098/3533] extmod/utime: Always invoke mp_hal_delay_ms when >=
 to 0ms.

This makes sleep_ms(0) useful as a "yield" so event processing and thread
switching can take place.

Fixes issue #5345.
---
 extmod/utime_mphal.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extmod/utime_mphal.c b/extmod/utime_mphal.c
index d053cf128b871..3d1cdfd820629 100644
--- a/extmod/utime_mphal.c
+++ b/extmod/utime_mphal.c
@@ -48,7 +48,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(mp_utime_sleep_obj, time_sleep);
 
 STATIC mp_obj_t time_sleep_ms(mp_obj_t arg) {
     mp_int_t ms = mp_obj_get_int(arg);
-    if (ms > 0) {
+    if (ms >= 0) {
         mp_hal_delay_ms(ms);
     }
     return mp_const_none;

From a5221c47eb60500506abf2c9967429879277714b Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 22 Jul 2021 00:04:01 +1000
Subject: [PATCH 1099/3533] docs/library/utime.rst: Clarify behaviour and
 precision of sleep ms/us.

This description is based on the existing bare-metal ports implementations.

Signed-off-by: Damien George <damien@micropython.org>
---
 docs/library/utime.rst | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/docs/library/utime.rst b/docs/library/utime.rst
index b7c604dc7b4ec..ef2a572aa4f22 100644
--- a/docs/library/utime.rst
+++ b/docs/library/utime.rst
@@ -74,10 +74,19 @@ Functions
 
    Delay for given number of milliseconds, should be positive or 0.
 
+   This function will delay for at least the given number of milliseconds, but
+   may take longer than that if other processing must take place, for example
+   interrupt handlers or other threads.  Passing in 0 for *ms* will still allow
+   this other processing to occur.  Use `sleep_us()` for more precise delays.
+
 .. function:: sleep_us(us)
 
    Delay for given number of microseconds, should be positive or 0.
 
+   This function attempts to provide an accurate delay of at least *us*
+   microseconds, but it may take longer if the system has other higher priority
+   processing to perform.
+
 .. function:: ticks_ms()
 
     Returns an increasing millisecond counter with an arbitrary reference point, that

From 6bc50c4fa9da1d97f1ff14b1331d8d497962ed17 Mon Sep 17 00:00:00 2001
From: Josh Lloyd <j.nevercast@gmail.com>
Date: Wed, 20 Nov 2019 17:18:09 +1300
Subject: [PATCH 1100/3533] stm32/systick: Always POLL_HOOK when delaying for
 milliseconds.

Call MICROPY_EVENT_POLL_HOOK even on very short delays so that busy loops
that call sleep_ms still yield to events and other threads.

See related issue #5344.
---
 ports/stm32/systick.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/stm32/systick.c b/ports/stm32/systick.c
index d70fc005395c3..7d1e318ac0545 100644
--- a/ports/stm32/systick.c
+++ b/ports/stm32/systick.c
@@ -96,12 +96,12 @@ void mp_hal_delay_ms(mp_uint_t Delay) {
         // IRQs enabled, so can use systick counter to do the delay
         uint32_t start = uwTick;
         // Wraparound of tick is taken care of by 2's complement arithmetic.
-        while (uwTick - start < Delay) {
+        do {
             // This macro will execute the necessary idle behaviour.  It may
             // raise an exception, switch threads or enter sleep mode (waiting for
             // (at least) the SysTick interrupt).
             MICROPY_EVENT_POLL_HOOK
-        }
+        } while (uwTick - start < Delay);
     } else {
         // IRQs disabled, so need to use a busy loop for the delay.
         // To prevent possible overflow of the counter we use a double loop.

From 2cfbe5bc0fe2c8ed24c6f35abbc82ef8415d17e4 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 21 Jul 2021 01:32:15 +1000
Subject: [PATCH 1101/3533] esp32/modmachine: Release the GIL in
 machine.idle().

So that other threads get a chance to run when taskYIELD() is called.

See issue #5344.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/modmachine.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ports/esp32/modmachine.c b/ports/esp32/modmachine.c
index 50c0cff990174..34fe8600ae216 100644
--- a/ports/esp32/modmachine.c
+++ b/ports/esp32/modmachine.c
@@ -232,7 +232,9 @@ STATIC mp_obj_t machine_unique_id(void) {
 STATIC MP_DEFINE_CONST_FUN_OBJ_0(machine_unique_id_obj, machine_unique_id);
 
 STATIC mp_obj_t machine_idle(void) {
+    MP_THREAD_GIL_EXIT();
     taskYIELD();
+    MP_THREAD_GIL_ENTER();
     return mp_const_none;
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_0(machine_idle_obj, machine_idle);

From 6214fa3f9ecdfb146aaec09afc9d586e76257d5a Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 21 Jul 2021 01:33:16 +1000
Subject: [PATCH 1102/3533] esp32/mphalport: Always yield at least once in
 delay_ms.

This helps the OS switch to and give other threads processing time during
the sleep.  It also ensures that pending events are handled, even when
sleeping for 0ms.

Fixes issue #5344.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/mphalport.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/ports/esp32/mphalport.c b/ports/esp32/mphalport.c
index e795b5c991bb0..6e6fd26ef443a 100644
--- a/ports/esp32/mphalport.c
+++ b/ports/esp32/mphalport.c
@@ -142,14 +142,22 @@ void mp_hal_delay_ms(uint32_t ms) {
     uint64_t dt;
     uint64_t t0 = esp_timer_get_time();
     for (;;) {
+        mp_handle_pending(true);
+        MICROPY_PY_USOCKET_EVENTS_HANDLER
+        MP_THREAD_GIL_EXIT();
         uint64_t t1 = esp_timer_get_time();
         dt = t1 - t0;
         if (dt + portTICK_PERIOD_MS * 1000 >= us) {
             // doing a vTaskDelay would take us beyond requested delay time
+            taskYIELD();
+            MP_THREAD_GIL_ENTER();
+            t1 = esp_timer_get_time();
+            dt = t1 - t0;
             break;
+        } else {
+            ulTaskNotifyTake(pdFALSE, 1);
+            MP_THREAD_GIL_ENTER();
         }
-        MICROPY_EVENT_POLL_HOOK
-        ulTaskNotifyTake(pdFALSE, 1);
     }
     if (dt < us) {
         // do the remaining delay accurately

From 7649f5fbd2fb2e9b9153da47a4af4b538ca3ae65 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Fri, 9 Jul 2021 15:49:25 +0200
Subject: [PATCH 1103/3533] stm32/sdram: Make SDRAM test cache aware, and
 optional failure with msg.

* Make SDRAM test cache-aware for newer MCUs.
* Use the defined data bus width (instead of the fixed 8-bits).
* Allow optional failure on error with verbose error messages.
* Test speed is now inverted (test accepts exhaustive instead fast).
---
 ports/stm32/main.c  |  2 +-
 ports/stm32/sdram.c | 88 ++++++++++++++++++++++++++++++++++++---------
 ports/stm32/sdram.h |  2 +-
 3 files changed, 73 insertions(+), 19 deletions(-)

diff --git a/ports/stm32/main.c b/ports/stm32/main.c
index d7afb9e4af259..3ff7077ac2dce 100644
--- a/ports/stm32/main.c
+++ b/ports/stm32/main.c
@@ -404,7 +404,7 @@ void stm32_main(uint32_t reset_mode) {
     bool sdram_valid = true;
     UNUSED(sdram_valid);
     #if MICROPY_HW_SDRAM_STARTUP_TEST
-    sdram_valid = sdram_test(true);
+    sdram_valid = sdram_test(false);
     #endif
     #endif
     #if MICROPY_PY_THREAD
diff --git a/ports/stm32/sdram.c b/ports/stm32/sdram.c
index 514192519a900..e0e350083686c 100644
--- a/ports/stm32/sdram.c
+++ b/ports/stm32/sdram.c
@@ -283,52 +283,106 @@ void sdram_leave_low_power(void) {
 #pragma GCC diagnostic ignored "-Wstringop-overflow"
 #endif
 
-bool sdram_test(bool fast) {
+bool __attribute__((optimize("O0"))) sdram_test(bool exhaustive) {
     uint8_t const pattern = 0xaa;
     uint8_t const antipattern = 0x55;
     uint8_t *const mem_base = (uint8_t *)sdram_start();
 
-    /* test data bus */
-    for (uint8_t i = 1; i; i <<= 1) {
-        *mem_base = i;
-        if (*mem_base != i) {
-            printf("data bus lines test failed! data (%d)\n", i);
+    #if MICROPY_HW_SDRAM_TEST_FAIL_ON_ERROR
+    char error_buffer[1024];
+    #endif
+
+    #if (__DCACHE_PRESENT == 1)
+    bool i_cache_disabled = false;
+    bool d_cache_disabled = false;
+
+    // Disable caches for testing.
+    if (SCB->CCR & (uint32_t)SCB_CCR_IC_Msk) {
+        SCB_DisableICache();
+        i_cache_disabled = true;
+    }
+
+    if (SCB->CCR & (uint32_t)SCB_CCR_DC_Msk) {
+        SCB_DisableDCache();
+        d_cache_disabled = true;
+    }
+    #endif
+
+    // Test data bus
+    for (uint32_t i = 0; i < MICROPY_HW_SDRAM_MEM_BUS_WIDTH; i++) {
+        *((uint32_t *)mem_base) = (1 << i);
+        if (*((uint32_t *)mem_base) != (1 << i)) {
+            #if MICROPY_HW_SDRAM_TEST_FAIL_ON_ERROR
+            snprintf(error_buffer, sizeof(error_buffer),
+                "Data bus test failed at 0x%p expected 0x%x found 0x%lx",
+                &mem_base[0], (1 << i), ((uint32_t *)mem_base)[0]);
+            __fatal_error(error_buffer);
+            #endif
             return false;
         }
     }
 
-    /* test address bus */
-    /* Check individual address lines */
+    // Test address bus
     for (uint32_t i = 1; i < MICROPY_HW_SDRAM_SIZE; i <<= 1) {
         mem_base[i] = pattern;
         if (mem_base[i] != pattern) {
-            printf("address bus lines test failed! address (%p)\n", &mem_base[i]);
+            #if MICROPY_HW_SDRAM_TEST_FAIL_ON_ERROR
+            snprintf(error_buffer, sizeof(error_buffer),
+                "Address bus test failed at 0x%p expected 0x%x found 0x%x",
+                &mem_base[i], pattern, mem_base[i]);
+            __fatal_error(error_buffer);
+            #endif
             return false;
         }
     }
 
-    /* Check for aliasing (overlaping addresses) */
+    // Check for aliasing (overlaping addresses)
     mem_base[0] = antipattern;
     for (uint32_t i = 1; i < MICROPY_HW_SDRAM_SIZE; i <<= 1) {
         if (mem_base[i] != pattern) {
-            printf("address bus overlap %p\n", &mem_base[i]);
+            #if MICROPY_HW_SDRAM_TEST_FAIL_ON_ERROR
+            snprintf(error_buffer, sizeof(error_buffer),
+                "Address bus overlap at 0x%p expected 0x%x found 0x%x",
+                &mem_base[i], pattern, mem_base[i]);
+            __fatal_error(error_buffer);
+            #endif
             return false;
         }
     }
 
-    /* test all ram cells */
-    if (!fast) {
-        for (uint32_t i = 0; i < MICROPY_HW_SDRAM_SIZE; ++i) {
+    // Test all RAM cells
+    if (exhaustive) {
+        // Write all memory first then compare, so even if the cache
+        // is enabled, it's not just writing and reading from cache.
+        // Note: This test should also detect refresh rate issues.
+        for (uint32_t i = 0; i < MICROPY_HW_SDRAM_SIZE; i++) {
             mem_base[i] = pattern;
+        }
+
+        for (uint32_t i = 0; i < MICROPY_HW_SDRAM_SIZE; i++) {
             if (mem_base[i] != pattern) {
-                printf("address bus test failed! address (%p)\n", &mem_base[i]);
+                #if MICROPY_HW_SDRAM_TEST_FAIL_ON_ERROR
+                snprintf(error_buffer, sizeof(error_buffer),
+                    "Address bus slow test failed at 0x%p expected 0x%x found 0x%x",
+                    &mem_base[i], pattern, mem_base[i]);
+                __fatal_error(error_buffer);
+                #endif
                 return false;
             }
         }
-    } else {
-        memset(mem_base, pattern, MICROPY_HW_SDRAM_SIZE);
     }
 
+    #if (__DCACHE_PRESENT == 1)
+    // Re-enable caches if they were enabled before the test started.
+    if (i_cache_disabled) {
+        SCB_EnableICache();
+    }
+
+    if (d_cache_disabled) {
+        SCB_EnableDCache();
+    }
+    #endif
+
     return true;
 }
 
diff --git a/ports/stm32/sdram.h b/ports/stm32/sdram.h
index 773a30802f87f..f7a124adddf3a 100644
--- a/ports/stm32/sdram.h
+++ b/ports/stm32/sdram.h
@@ -13,5 +13,5 @@ void *sdram_start(void);
 void *sdram_end(void);
 void sdram_enter_low_power(void);
 void sdram_leave_low_power(void);
-bool sdram_test(bool fast);
+bool sdram_test(bool exhaustive);
 #endif // __SDRAM_H__

From a5ac3d5645e99a897f3213149587a43b62779c35 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 22 Jul 2021 16:18:54 +1000
Subject: [PATCH 1104/3533] samd: Add support for building with user C modules.

Fixes issue #7545.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/samd/Makefile    | 19 ++++++++++++++++++-
 ports/samd/main.c      |  5 +++++
 ports/samd/sections.ld | 16 +++++++++++++---
 3 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/ports/samd/Makefile b/ports/samd/Makefile
index d29d9c5b24f97..a84fc3b12dbe8 100644
--- a/ports/samd/Makefile
+++ b/ports/samd/Makefile
@@ -33,7 +33,11 @@ CFLAGS_MCU_SAMD21 = -mtune=cortex-m0plus -mcpu=cortex-m0plus -msoft-float
 CFLAGS_MCU_SAMD51 = -mtune=cortex-m4 -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard
 CFLAGS = $(INC) -Wall -Werror -std=c99 -nostdlib -mthumb $(CFLAGS_MCU_$(MCU_SERIES)) -fsingle-precision-constant -Wdouble-promotion
 CFLAGS += -DMCU_$(MCU_SERIES) -D__$(CMSIS_MCU)__
+CFLAGS += $(CFLAGS_MOD)
+
 LDFLAGS = -nostdlib $(addprefix -T,$(LD_FILES)) -Map=$@.map --cref
+LDFLAGS += $(LDFLAGS_MOD)
+
 LIBS = $(shell $(CC) $(CFLAGS) -print-libgcc-file-name)
 
 # Tune for Debugging or Optimization
@@ -45,6 +49,14 @@ LDFLAGS += --gc-sections
 CFLAGS += -fdata-sections -ffunction-sections
 endif
 
+# Flags for optional C++ source code
+CXXFLAGS += $(filter-out -std=c99,$(CFLAGS))
+CXXFLAGS += $(CXXFLAGS_MOD)
+ifneq ($(SRC_CXX)$(SRC_MOD_CXX),)
+LIBSTDCPP_FILE_NAME = "$(shell $(CXX) $(CXXFLAGS) -print-file-name=libstdc++.a)"
+LDFLAGS += -L"$(shell dirname $(LIBSTDCPP_FILE_NAME))"
+endif
+
 SRC_C = \
 	main.c \
 	modutime.c \
@@ -70,6 +82,10 @@ SRC_C = \
 	shared/runtime/pyexec.c \
 	shared/runtime/stdout_helpers.c \
 
+SRC_C += $(SRC_MOD)
+
+SRC_CXX += $(SRC_MOD_CXX)
+
 ifeq ($(MCU_SERIES),SAMD21)
 SRC_S = shared/runtime/gchelper_m0.s
 else
@@ -77,10 +93,11 @@ SRC_S = shared/runtime/gchelper_m3.s
 endif
 
 # List of sources for qstr extraction
-SRC_QSTR += modutime.c modmachine.c
+SRC_QSTR += modutime.c modmachine.c $(SRC_MOD) $(SRC_CXX)
 
 OBJ += $(PY_O)
 OBJ += $(addprefix $(BUILD)/, $(SRC_C:.c=.o))
+OBJ += $(addprefix $(BUILD)/, $(SRC_CXX:.cpp=.o))
 OBJ += $(addprefix $(BUILD)/, $(SRC_S:.s=.o))
 
 # Workaround for bug in older gcc, warning on "static usbd_device_t _usbd_dev = { 0 };"
diff --git a/ports/samd/main.c b/ports/samd/main.c
index 1c72f04ab8a97..5d84a9e882231 100644
--- a/ports/samd/main.c
+++ b/ports/samd/main.c
@@ -87,6 +87,11 @@ void nlr_jump_fail(void *val) {
     }
 }
 
+void abort(void) {
+    for (;;) {
+    }
+}
+
 #ifndef NDEBUG
 void MP_WEAK __assert_func(const char *file, int line, const char *func, const char *expr) {
     mp_printf(MP_PYTHON_PRINTER, "Assertion '%s' failed, at file %s:%d\n", expr, file, line);
diff --git a/ports/samd/sections.ld b/ports/samd/sections.ld
index cbcad463d0580..743e70a300e7f 100644
--- a/ports/samd/sections.ld
+++ b/ports/samd/sections.ld
@@ -11,10 +11,20 @@ SECTIONS
         *(.rodata*)
         . = ALIGN(4);
         _etext = .;
-        _sidata = _etext;
     } >FLASH
 
-    .data : AT ( _sidata )
+    /* For C++ exception handling */
+    .ARM :
+    {
+        __exidx_start = .;
+        *(.ARM.exidx*)
+        __exidx_end = .;
+    } >FLASH
+
+    /* Used by the start-up code to initialise data */
+    _sidata = LOADADDR(.data);
+
+    .data :
     {
         . = ALIGN(4);
         _sdata = .;
@@ -22,7 +32,7 @@ SECTIONS
         *(.data*)
         . = ALIGN(4);
         _edata = .;
-    } >RAM
+    } >RAM AT> FLASH
 
     .bss :
     {

From 7f69246895ed4df78909c3558b91624ad3b3986c Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 22 Jul 2021 17:13:10 +1000
Subject: [PATCH 1105/3533] docs/library/uasyncio.rst: Document stream
 readexactly() method.

Signed-off-by: Damien George <damien@micropython.org>
---
 docs/library/uasyncio.rst | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/docs/library/uasyncio.rst b/docs/library/uasyncio.rst
index 0be3288296d7c..11b9c6aee4136 100644
--- a/docs/library/uasyncio.rst
+++ b/docs/library/uasyncio.rst
@@ -248,6 +248,14 @@ TCP stream connections
 
     This is a coroutine, and a MicroPython extension.
 
+.. method:: Stream.readexactly(n)
+
+    Read exactly *n* bytes and return them as a bytes object.
+
+    Raises an ``EOFError`` exception if the stream ends before reading *n* bytes.
+
+    This is a coroutine.
+
 .. method:: Stream.readline()
 
     Read a line and return it.

From 0256e1ab8b8ca376a9c4da83e375ff01ce1b8af0 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 22 Jul 2021 18:31:49 +1000
Subject: [PATCH 1106/3533] tools/autobuild: Use separate IDF version to build
 newer esp32 SoCs.

Signed-off-by: Damien George <damien@micropython.org>
---
 tools/autobuild/autobuild.sh          | 15 +++++++++++----
 tools/autobuild/build-esp32-latest.sh | 12 ++++++++----
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/tools/autobuild/autobuild.sh b/tools/autobuild/autobuild.sh
index 0498443811f57..a14c7890f7395 100755
--- a/tools/autobuild/autobuild.sh
+++ b/tools/autobuild/autobuild.sh
@@ -4,7 +4,8 @@
 #
 # Requirements:
 # - All toolchains must be in path (arm-none-eabi-gcc, xtensa-lx106-elf)
-# - IDF_PATH_V4 must be set
+# - IDF_PATH_V42 must be set
+# - IDF_PATH_V43 must be set
 # - MICROPY_AUTOBUILD_MICROPYTHON_REPO must be set to location of micropython repository
 # - MICROPY_AUTOBUILD_MAKE must be set to the make command to use, eg "make -j2"
 #
@@ -12,8 +13,13 @@
 # - MICROPY_AUTOBUILD_REMOTE_MACHINE can be set to a remote ssh machine to copy files to
 # - MICROPY_AUTOBUILD_REMOTE_DIR can be set to destination directory on remote machine
 
-if [ ! -d "$IDF_PATH_V4" ]; then
-    echo "must set IDF_PATH_V4"
+if [ ! -d "$IDF_PATH_V42" ]; then
+    echo "must set IDF_PATH_V42"
+    exit 1
+fi
+
+if [ ! -d "$IDF_PATH_V43" ]; then
+    echo "must set IDF_PATH_V43"
     exit 1
 fi
 
@@ -63,7 +69,8 @@ ${AUTODIR}/build-cc3200-latest.sh ${FW_TAG} ${LOCAL_FIRMWARE}
 cd ../esp8266
 ${AUTODIR}/build-esp8266-latest.sh ${FW_TAG} ${LOCAL_FIRMWARE}
 cd ../esp32
-${AUTODIR}/build-esp32-latest.sh ${IDF_PATH_V4} ${FW_TAG} ${LOCAL_FIRMWARE}
+${AUTODIR}/build-esp32-latest.sh ${IDF_PATH_V42} ${FW_TAG} ${LOCAL_FIRMWARE}
+${AUTODIR}/build-esp32-latest.sh ${IDF_PATH_V43} ${FW_TAG} ${LOCAL_FIRMWARE}
 cd ../rp2
 ${AUTODIR}/build-rp2-latest.sh ${FW_TAG} ${LOCAL_FIRMWARE}
 cd ../mimxrt
diff --git a/tools/autobuild/build-esp32-latest.sh b/tools/autobuild/build-esp32-latest.sh
index e433332c9eea8..3f94dbb5bee21 100755
--- a/tools/autobuild/build-esp32-latest.sh
+++ b/tools/autobuild/build-esp32-latest.sh
@@ -39,7 +39,11 @@ fi
 
 source $idf_path/export.sh
 
-# build the versions
-do_build esp32 GENERIC FROZEN_MANIFEST=$(pwd)/boards/manifest_release.py
-do_build esp32spiram GENERIC_SPIRAM FROZEN_MANIFEST=$(pwd)/boards/manifest_release.py
-do_build tinypico UM_TINYPICO
+# build the boards, based on the IDF version
+if idf.py --version | grep -q v4.2; then
+    do_build esp32 GENERIC FROZEN_MANIFEST=$(pwd)/boards/manifest_release.py
+    do_build esp32spiram GENERIC_SPIRAM FROZEN_MANIFEST=$(pwd)/boards/manifest_release.py
+    do_build tinypico UM_TINYPICO
+else
+    do_build esp32c3 GENERIC_C3
+fi

From 25159129dd9e22474d09235ce6d7a4156fd13c6f Mon Sep 17 00:00:00 2001
From: Seon Rozenblum <seon@unexpectedmaker.com>
Date: Fri, 16 Jul 2021 12:50:32 +1000
Subject: [PATCH 1107/3533] tools/autobuild: Add FeatherS2 and TinyS2 to esp32
 auto builds.

---
 tools/autobuild/build-esp32-latest.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tools/autobuild/build-esp32-latest.sh b/tools/autobuild/build-esp32-latest.sh
index 3f94dbb5bee21..cc04d833e50f7 100755
--- a/tools/autobuild/build-esp32-latest.sh
+++ b/tools/autobuild/build-esp32-latest.sh
@@ -46,4 +46,6 @@ if idf.py --version | grep -q v4.2; then
     do_build tinypico UM_TINYPICO
 else
     do_build esp32c3 GENERIC_C3
+    do_build tinys2 UM_TINYS2
+    do_build featherS2 UM_FEATHERS2
 fi

From b099db4426c3a47e842c3e8afd5b5bb05cbcdd72 Mon Sep 17 00:00:00 2001
From: Roberto Colistete Jr <roberto.colistete@gmail.com>
Date: Fri, 24 Jul 2020 04:13:05 -0300
Subject: [PATCH 1108/3533] esp8266/Makefile: Add more libm files to build.

Allows MICROPY_PY_MATH_SPECIAL_FUNCTIONS to be enabled, and for ulab to be
built as a user C module.
---
 ports/esp8266/Makefile       | 8 ++++++++
 ports/esp8266/mpconfigport.h | 3 +++
 2 files changed, 11 insertions(+)

diff --git a/ports/esp8266/Makefile b/ports/esp8266/Makefile
index b54193afef92a..56c7cc87f6757 100644
--- a/ports/esp8266/Makefile
+++ b/ports/esp8266/Makefile
@@ -123,21 +123,29 @@ LIB_SRC_C = $(addprefix lib/,\
 	libm/fmodf.c \
 	libm/nearbyintf.c \
 	libm/ef_sqrt.c \
+	libm/erf_lgamma.c \
 	libm/kf_rem_pio2.c \
 	libm/kf_sin.c \
 	libm/kf_cos.c \
 	libm/kf_tan.c \
 	libm/ef_rem_pio2.c \
+	libm/sf_erf.c \
 	libm/sf_sin.c \
 	libm/sf_cos.c \
 	libm/sf_tan.c \
 	libm/sf_frexp.c \
 	libm/sf_modf.c \
 	libm/sf_ldexp.c \
+	libm/acoshf.c \
 	libm/asinfacosf.c \
+	libm/asinhf.c \
 	libm/atanf.c \
+	libm/atanhf.c \
 	libm/atan2f.c \
+	libm/log1pf.c \
 	libm/roundf.c \
+	libm/wf_lgamma.c \
+	libm/wf_tgamma.c \
 	)
 
 SHARED_SRC_C = $(addprefix shared/,\
diff --git a/ports/esp8266/mpconfigport.h b/ports/esp8266/mpconfigport.h
index ac47f0aa29059..8bc24e00ebad8 100644
--- a/ports/esp8266/mpconfigport.h
+++ b/ports/esp8266/mpconfigport.h
@@ -186,6 +186,9 @@ extern const struct _mp_obj_module_t mp_module_onewire;
     mp_obj_t pin_irq_handler[16]; \
     byte *uart0_rxbuf; \
 
+// We need an implementation of the log2 function which is not a macro
+#define MP_NEED_LOG2 (1)
+
 // We need to provide a declaration/definition of alloca()
 #include <alloca.h>
 

From 753b08cae663b33465d92d3dd145b81f89b1b6ea Mon Sep 17 00:00:00 2001
From: Sashkoiv <sashkoiv@gmail.com>
Date: Wed, 19 Feb 2020 10:30:44 +0200
Subject: [PATCH 1109/3533] stm32/boards/NUCLEO_F446RE: Enable CAN bus support.

---
 ports/stm32/boards/NUCLEO_F446RE/mpconfigboard.h | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/ports/stm32/boards/NUCLEO_F446RE/mpconfigboard.h b/ports/stm32/boards/NUCLEO_F446RE/mpconfigboard.h
index 30044ef2b46e5..681231578e23d 100644
--- a/ports/stm32/boards/NUCLEO_F446RE/mpconfigboard.h
+++ b/ports/stm32/boards/NUCLEO_F446RE/mpconfigboard.h
@@ -53,6 +53,12 @@
 #define MICROPY_HW_SPI4_MISO    (pin_A1)    //              pin 30 on CN7
 #define MICROPY_HW_SPI4_MOSI    (pin_A11)   //              pin 14 on CN10
 
+// CAN buses
+#define MICROPY_HW_CAN1_TX      (pin_B9)    //              pin 5 on CN10
+#define MICROPY_HW_CAN1_RX      (pin_B8)    //              pin 3 on CN10
+#define MICROPY_HW_CAN2_TX      (pin_B6)    //              pin 17 on CN10
+#define MICROPY_HW_CAN2_RX      (pin_B5)    //              pin 29 on CN10
+
 // USRSW is pulled low. Pressing the button makes the input go high.
 #define MICROPY_HW_USRSW_PIN        (pin_C13)
 #define MICROPY_HW_USRSW_PULL       (GPIO_NOPULL)

From 14b853eae052f6d8ef285931336ca1212af76716 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 23 Jul 2021 12:02:03 +1000
Subject: [PATCH 1110/3533] minimal/Makefile: Add support for building with
 user C modules.

Fixes issue #5750.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/minimal/Makefile | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/ports/minimal/Makefile b/ports/minimal/Makefile
index 0e79d581bed02..21e3fe3f7687a 100644
--- a/ports/minimal/Makefile
+++ b/ports/minimal/Makefile
@@ -41,6 +41,14 @@ CFLAGS += -Os -DNDEBUG
 CFLAGS += -fdata-sections -ffunction-sections
 endif
 
+# Flags for optional C++ source code
+CXXFLAGS += $(filter-out -std=c99,$(CFLAGS))
+CXXFLAGS += $(CXXFLAGS_MOD)
+
+# Flags for user C modules
+CFLAGS += $(CFLAGS_MOD)
+LDFLAGS += $(LDFLAGS_MOD)
+
 LIBS =
 
 SRC_C = \
@@ -56,7 +64,14 @@ ifeq ($(CROSS), 1)
 SRC_C += shared/libc/string0.c
 endif
 
-OBJ = $(PY_CORE_O) $(addprefix $(BUILD)/, $(SRC_C:.c=.o))
+SRC_C += $(SRC_MOD)
+
+SRC_CXX += $(SRC_MOD_CXX)
+
+SRC_QSTR += $(SRC_MOD) $(SRC_MOD_CXX)
+
+OBJ += $(PY_CORE_O) $(addprefix $(BUILD)/, $(SRC_C:.c=.o))
+OBJ += $(addprefix $(BUILD)/, $(SRC_CXX:.cpp=.o))
 
 ifeq ($(CROSS), 1)
 all: $(BUILD)/firmware.dfu

From 4e39ff221abff9d1d7d7fc654da67a89a7543112 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Thu, 20 Feb 2020 22:30:49 +1100
Subject: [PATCH 1111/3533] py/runtime: Fix bool unary op for subclasses of
 native types.

Previously a subclass of a type that didn't implement unary_op, or didn't
handle MP_UNARY_OP_BOOL, would raise TypeError on bool conversion.

Fixes #5677.
---
 py/runtime.c             | 6 ++++++
 tests/basics/unary_op.py | 7 +++++++
 2 files changed, 13 insertions(+)

diff --git a/py/runtime.c b/py/runtime.c
index 19686c310ba7b..27e5bc13eb1a8 100644
--- a/py/runtime.c
+++ b/py/runtime.c
@@ -284,6 +284,12 @@ mp_obj_t mp_unary_op(mp_unary_op_t op, mp_obj_t arg) {
                 return result;
             }
         }
+        if (op == MP_UNARY_OP_BOOL) {
+            // Type doesn't have unary_op (or didn't handle MP_UNARY_OP_BOOL),
+            // so is implicitly True as this code path is impossible to reach
+            // if arg==mp_const_none.
+            return mp_const_true;
+        }
         // With MP_UNARY_OP_INT, mp_unary_op() becomes a fallback for mp_obj_get_int().
         // In this case provide a more focused error message to not confuse, e.g. chr(1.0)
         #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
diff --git a/tests/basics/unary_op.py b/tests/basics/unary_op.py
index bd78a20d0d6f6..2239e2b206476 100644
--- a/tests/basics/unary_op.py
+++ b/tests/basics/unary_op.py
@@ -23,5 +23,12 @@ class A: pass
 # check user instances derived from builtins
 class B(int): pass
 print(not B())
+print(True if B() else False)
 class C(list): pass
 print(not C())
+print(True if C() else False)
+# type doesn't define unary_op
+class D(type): pass
+d = D("foo", (), {})
+print(not d)
+print(True if d else False)

From 7870ec03701eb0bac44edf8c98e367a669918658 Mon Sep 17 00:00:00 2001
From: Michel Bouwmans <m.bouwmans@ep-games.eu>
Date: Tue, 13 Jul 2021 10:48:09 +0200
Subject: [PATCH 1112/3533] tools/mpremote: Add seek whence for mounted files.

Fixes issue #7534.

Signed-off-by: Michel Bouwmans <m.bouwmans@ep-games.eu>
---
 tools/mpremote/mpremote/pyboardextended.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/tools/mpremote/mpremote/pyboardextended.py b/tools/mpremote/mpremote/pyboardextended.py
index e3f259b395cc8..6f439e2dd09f4 100644
--- a/tools/mpremote/mpremote/pyboardextended.py
+++ b/tools/mpremote/mpremote/pyboardextended.py
@@ -26,6 +26,7 @@
 fs_hook_code = """\
 import uos, uio, ustruct, micropython, usys
 
+SEEK_SET = 0
 
 class RemoteCommand:
     def __init__(self, use_second_port):
@@ -213,11 +214,12 @@ def write(self, buf):
         c.end()
         return n
 
-    def seek(self, n):
+    def seek(self, n, whence=SEEK_SET):
         c = self.cmd
         c.begin(CMD_SEEK)
         c.wr_s8(self.fd)
         c.wr_s32(n)
+        c.wr_s8(whence)
         n = c.rd_s32()
         c.end()
         return n
@@ -459,8 +461,9 @@ def do_read(self):
     def do_seek(self):
         fd = self.rd_s8()
         n = self.rd_s32()
+        whence = self.rd_s8()
         # self.log_cmd(f"seek {fd} {n}")
-        self.data_files[fd][0].seek(n)
+        n = self.data_files[fd][0].seek(n, whence)
         self.wr_s32(n)
 
     def do_write(self):

From 92464f11b0db59456a7cf3f1181f38c200a29210 Mon Sep 17 00:00:00 2001
From: Michel Bouwmans <m.bouwmans@ep-games.eu>
Date: Thu, 22 Jul 2021 23:57:52 +0200
Subject: [PATCH 1113/3533] tools/mpremote: Raise OSError on unsupported
 RemoteFile.seek.

Signed-off-by: Michel Bouwmans <m.bouwmans@ep-games.eu>
---
 tools/mpremote/mpremote/pyboardextended.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/tools/mpremote/mpremote/pyboardextended.py b/tools/mpremote/mpremote/pyboardextended.py
index 6f439e2dd09f4..abdffb7532e57 100644
--- a/tools/mpremote/mpremote/pyboardextended.py
+++ b/tools/mpremote/mpremote/pyboardextended.py
@@ -1,4 +1,4 @@
-import os, re, serial, struct, time
+import io, os, re, serial, struct, time
 from errno import EPERM
 from .console import VT_ENABLED
 
@@ -222,6 +222,8 @@ def seek(self, n, whence=SEEK_SET):
         c.wr_s8(whence)
         n = c.rd_s32()
         c.end()
+        if n < 0:
+            raise OSError(n)
         return n
 
 
@@ -463,7 +465,10 @@ def do_seek(self):
         n = self.rd_s32()
         whence = self.rd_s8()
         # self.log_cmd(f"seek {fd} {n}")
-        n = self.data_files[fd][0].seek(n, whence)
+        try:
+            n = self.data_files[fd][0].seek(n, whence)
+        except io.UnsupportedOperation:
+            n = -1
         self.wr_s32(n)
 
     def do_write(self):

From 53dfb279da4c2502c5040227329b06e3ea79fd63 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Wed, 21 Jul 2021 17:02:01 +1000
Subject: [PATCH 1114/3533] extmod/modbluetooth: Clamp MTU values to
 32->UINT16_MAX.

---
 extmod/modbluetooth.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/extmod/modbluetooth.c b/extmod/modbluetooth.c
index e379a8c6a304c..bf8d071a943cd 100644
--- a/extmod/modbluetooth.c
+++ b/extmod/modbluetooth.c
@@ -842,7 +842,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(bluetooth_ble_gattc_exchange_mtu_obj, bluetooth
 STATIC mp_obj_t bluetooth_ble_l2cap_listen(mp_obj_t self_in, mp_obj_t psm_in, mp_obj_t mtu_in) {
     (void)self_in;
     mp_int_t psm = mp_obj_get_int(psm_in);
-    mp_int_t mtu = mp_obj_get_int(mtu_in);
+    mp_int_t mtu = MAX(32, MIN(UINT16_MAX, mp_obj_get_int(mtu_in)));
     return bluetooth_handle_errno(mp_bluetooth_l2cap_listen(psm, mtu));
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_3(bluetooth_ble_l2cap_listen_obj, bluetooth_ble_l2cap_listen);
@@ -850,7 +850,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_3(bluetooth_ble_l2cap_listen_obj, bluetooth_ble_l
 STATIC mp_obj_t bluetooth_ble_l2cap_connect(size_t n_args, const mp_obj_t *args) {
     mp_int_t conn_handle = mp_obj_get_int(args[1]);
     mp_int_t psm = mp_obj_get_int(args[2]);
-    mp_int_t mtu = mp_obj_get_int(args[3]);
+    mp_int_t mtu = MAX(32, MIN(UINT16_MAX, mp_obj_get_int(args[3])));
     return bluetooth_handle_errno(mp_bluetooth_l2cap_connect(conn_handle, psm, mtu));
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(bluetooth_ble_l2cap_connect_obj, 4, 4, bluetooth_ble_l2cap_connect);

From edfb5d56c8392b1c0933abf49e757b90f2c07859 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Wed, 21 Jul 2021 17:04:41 +1000
Subject: [PATCH 1115/3533] extmod/nimble: Allow modbluetooth binding to hook
 "sent HCI packet".

---
 extmod/nimble/hal/hal_uart.c        | 6 ++++++
 extmod/nimble/modbluetooth_nimble.c | 3 +++
 extmod/nimble/modbluetooth_nimble.h | 3 +++
 3 files changed, 12 insertions(+)

diff --git a/extmod/nimble/hal/hal_uart.c b/extmod/nimble/hal/hal_uart.c
index cd5e49e30b4c0..84a964fde9ebc 100644
--- a/extmod/nimble/hal/hal_uart.c
+++ b/extmod/nimble/hal/hal_uart.c
@@ -27,6 +27,7 @@
 #include "py/runtime.h"
 #include "py/mphal.h"
 #include "nimble/ble.h"
+#include "extmod/nimble/modbluetooth_nimble.h"
 #include "extmod/nimble/hal/hal_uart.h"
 #include "extmod/nimble/nimble/nimble_npl_os.h"
 #include "extmod/mpbthci.h"
@@ -74,6 +75,11 @@ void hal_uart_start_tx(uint32_t port) {
     #endif
 
     mp_bluetooth_hci_uart_write(mp_bluetooth_hci_cmd_buf, len);
+
+    if (len > 0) {
+        // Allow modbluetooth bindings to hook "sent packet" (e.g. to unstall l2cap channels).
+        mp_bluetooth_nimble_sent_hci_packet();
+    }
 }
 
 int hal_uart_close(uint32_t port) {
diff --git a/extmod/nimble/modbluetooth_nimble.c b/extmod/nimble/modbluetooth_nimble.c
index 8bbec54881260..f3679354f4471 100644
--- a/extmod/nimble/modbluetooth_nimble.c
+++ b/extmod/nimble/modbluetooth_nimble.c
@@ -1392,6 +1392,9 @@ int mp_bluetooth_gattc_exchange_mtu(uint16_t conn_handle) {
 
 #endif // MICROPY_PY_BLUETOOTH_ENABLE_GATT_CLIENT
 
+void mp_bluetooth_nimble_sent_hci_packet(void) {
+}
+
 #if MICROPY_PY_BLUETOOTH_ENABLE_L2CAP_CHANNELS
 
 // Fortunately NimBLE uses mbuf chains correctly with L2CAP COC (rather than
diff --git a/extmod/nimble/modbluetooth_nimble.h b/extmod/nimble/modbluetooth_nimble.h
index 9ed64368b2d5f..15648a9959a60 100644
--- a/extmod/nimble/modbluetooth_nimble.h
+++ b/extmod/nimble/modbluetooth_nimble.h
@@ -71,5 +71,8 @@ void mp_bluetooth_nimble_port_start(void);
 // Tell the port to stop its background task.
 void mp_bluetooth_nimble_port_shutdown(void);
 
+// --- Called by the HCI UART layer to let us know when packets have been sent.
+void mp_bluetooth_nimble_sent_hci_packet(void);
+
 
 #endif // MICROPY_INCLUDED_EXTMOD_NIMBLE_MODBLUETOOTH_NIMBLE_H

From 341158c251c032fe1116395d60ea69c6dc406898 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Wed, 21 Jul 2021 17:47:13 +1000
Subject: [PATCH 1116/3533] extmod/nimble: Add "memory stalling" mechanism for
 l2cap_send.

When l2cap_send detects that the sys mempool is running low (used to store
the outgoing HCI payloads), it will report stalled back to the application,
and then only unstall once these HCI payloads have been sent.

This prevents a situation where a remote receiver with very large MTU can
cause NimBLE to queue up more than MYNEWT_VAL_MSYS_1_BLOCK_COUNT (i.e. 12)
payloads, causing further attempts to send to fail with ENOMEM (even though
the channel is not stalled and we have room in the channel mbufs). The
regular credit/stall flow control is not effective here because the
receiver's MTU is large enough that it will not activate (i.e. there are
lots of credits available).

Thresholds of 1/2 (stall) and 1/4 (unstall) chosen to allow headroom for
other payloads (e.g. notifications) and that when a regular stall occurs it
might keep sending (and creating more payloads) in the background.
---
 extmod/nimble/modbluetooth_nimble.c | 48 +++++++++++++++++++++++++----
 1 file changed, 42 insertions(+), 6 deletions(-)

diff --git a/extmod/nimble/modbluetooth_nimble.c b/extmod/nimble/modbluetooth_nimble.c
index f3679354f4471..d7ad7e17c9323 100644
--- a/extmod/nimble/modbluetooth_nimble.c
+++ b/extmod/nimble/modbluetooth_nimble.c
@@ -1392,7 +1392,16 @@ int mp_bluetooth_gattc_exchange_mtu(uint16_t conn_handle) {
 
 #endif // MICROPY_PY_BLUETOOTH_ENABLE_GATT_CLIENT
 
+#if MICROPY_PY_BLUETOOTH_ENABLE_L2CAP_CHANNELS
+STATIC void unstall_l2cap_channel(void);
+#endif
+
 void mp_bluetooth_nimble_sent_hci_packet(void) {
+    #if MICROPY_PY_BLUETOOTH_ENABLE_L2CAP_CHANNELS
+    if (os_msys_num_free() >= os_msys_count() * 3 / 4) {
+        unstall_l2cap_channel();
+    }
+    #endif
 }
 
 #if MICROPY_PY_BLUETOOTH_ENABLE_L2CAP_CHANNELS
@@ -1416,6 +1425,7 @@ typedef struct _mp_bluetooth_nimble_l2cap_channel_t {
     struct os_mempool sdu_mempool;
     struct os_mbuf *rx_pending;
     bool irq_in_progress;
+    bool mem_stalled;
     uint16_t mtu;
     os_membuf_t sdu_mem[];
 } mp_bluetooth_nimble_l2cap_channel_t;
@@ -1433,6 +1443,19 @@ STATIC void destroy_l2cap_channel() {
     }
 }
 
+STATIC void unstall_l2cap_channel(void) {
+    // Whenever we send an HCI packet and the sys mempool is now less than 1/4 full,
+    // we can unstall the L2CAP channel if it was marked as "mem_stalled" by
+    // mp_bluetooth_l2cap_send. (This happens if the pool is half-empty).
+    mp_bluetooth_nimble_l2cap_channel_t *chan = MP_STATE_PORT(bluetooth_nimble_root_pointers)->l2cap_chan;
+    if (!chan || !chan->mem_stalled) {
+        return;
+    }
+    DEBUG_printf("unstall_l2cap_channel: count %d, free: %d\n", os_msys_count(), os_msys_num_free());
+    chan->mem_stalled = false;
+    mp_bluetooth_on_l2cap_send_ready(chan->chan->conn_handle, chan->chan->scid, 0);
+}
+
 STATIC int l2cap_channel_event(struct ble_l2cap_event *event, void *arg) {
     DEBUG_printf("l2cap_channel_event: type=%d\n", event->type);
     mp_bluetooth_nimble_l2cap_channel_t *chan = (mp_bluetooth_nimble_l2cap_channel_t *)arg;
@@ -1528,9 +1551,13 @@ STATIC int l2cap_channel_event(struct ble_l2cap_event *event, void *arg) {
         }
         case BLE_L2CAP_EVENT_COC_TX_UNSTALLED: {
             DEBUG_printf("l2cap_channel_event: tx_unstalled: conn_handle=%d status=%d\n", event->tx_unstalled.conn_handle, event->tx_unstalled.status);
-            ble_l2cap_get_chan_info(event->receive.chan, &info);
-            // Map status to {0,1} (i.e. "sent everything", or "partial send").
-            mp_bluetooth_on_l2cap_send_ready(event->tx_unstalled.conn_handle, info.scid, event->tx_unstalled.status == 0 ? 0 : 1);
+            assert(event->tx_unstalled.conn_handle == chan->chan->conn_handle);
+            // Don't unstall if we're still waiting for room in the sys pool.
+            if (!chan->mem_stalled) {
+                ble_l2cap_get_chan_info(event->receive.chan, &info);
+                // Map status to {0,1} (i.e. "sent everything", or "partial send").
+                mp_bluetooth_on_l2cap_send_ready(event->tx_unstalled.conn_handle, info.scid, event->tx_unstalled.status == 0 ? 0 : 1);
+            }
             break;
         }
         case BLE_L2CAP_EVENT_COC_RECONFIG_COMPLETED: {
@@ -1678,10 +1705,13 @@ int mp_bluetooth_l2cap_send(uint16_t conn_handle, uint16_t cid, const uint8_t *b
         return MP_ENOMEM;
     }
 
+    *stalled = false;
+
     err = ble_l2cap_send(chan->chan, sdu_tx);
     if (err == BLE_HS_ESTALLED) {
         // Stalled means that this one will still send but any future ones
         // will fail until we receive an unstalled event.
+        DEBUG_printf("mp_bluetooth_l2cap_send: credit stall\n");
         *stalled = true;
         err = 0;
     } else {
@@ -1689,15 +1719,21 @@ int mp_bluetooth_l2cap_send(uint16_t conn_handle, uint16_t cid, const uint8_t *b
             // Anything except stalled means it won't attempt to send,
             // so free the mbuf (we're failing the op entirely).
             os_mbuf_free_chain(sdu_tx);
-        } else {
-            *stalled = false;
         }
     }
 
+    if (os_msys_num_free() <= os_msys_count() / 2) {
+        // If the sys mempool is less than half-full, then back off sending more
+        // on this channel.
+        DEBUG_printf("mp_bluetooth_l2cap_send: forcing mem stall: count %d, free: %d\n", os_msys_count(), os_msys_num_free());
+        chan->mem_stalled = true;
+        *stalled = true;
+    }
+
     // Sometimes we see what looks like BLE_HS_EAGAIN (but it's actually
     // OS_ENOMEM in disguise). Fixed in NimBLE v1.4.
     if (err == OS_ENOMEM) {
-        return MP_ENOMEM;
+        err = BLE_HS_ENOMEM;
     }
 
     // Other error codes such as BLE_HS_EBUSY (we're stalled) or BLE_HS_EBADDATA (bigger than MTU).

From aecb697c72ac1fdb9f549daa5734e2ffbd37a6d3 Mon Sep 17 00:00:00 2001
From: Chris Wilson <christopher.david.wilson@gmail.com>
Date: Sun, 11 Jul 2021 16:39:56 -0700
Subject: [PATCH 1117/3533] stm32/boards: Add support for SparkFun STM32
 MicroMod Processor board.

Signed-off-by: Chris Wilson <christopher.david.wilson@gmail.com>
---
 .../boards/SPARKFUN_MICROMOD_STM32/bdev.c     |  28 +++++
 .../SPARKFUN_MICROMOD_STM32/board_init.c      |  11 ++
 .../SPARKFUN_MICROMOD_STM32/mpconfigboard.h   | 100 ++++++++++++++++++
 .../SPARKFUN_MICROMOD_STM32/mpconfigboard.mk  |  16 +++
 .../boards/SPARKFUN_MICROMOD_STM32/pins.csv   |  57 ++++++++++
 .../stm32f4xx_hal_conf.h                      |  19 ++++
 6 files changed, 231 insertions(+)
 create mode 100644 ports/stm32/boards/SPARKFUN_MICROMOD_STM32/bdev.c
 create mode 100644 ports/stm32/boards/SPARKFUN_MICROMOD_STM32/board_init.c
 create mode 100644 ports/stm32/boards/SPARKFUN_MICROMOD_STM32/mpconfigboard.h
 create mode 100644 ports/stm32/boards/SPARKFUN_MICROMOD_STM32/mpconfigboard.mk
 create mode 100644 ports/stm32/boards/SPARKFUN_MICROMOD_STM32/pins.csv
 create mode 100644 ports/stm32/boards/SPARKFUN_MICROMOD_STM32/stm32f4xx_hal_conf.h

diff --git a/ports/stm32/boards/SPARKFUN_MICROMOD_STM32/bdev.c b/ports/stm32/boards/SPARKFUN_MICROMOD_STM32/bdev.c
new file mode 100644
index 0000000000000..18b5b85b18f8c
--- /dev/null
+++ b/ports/stm32/boards/SPARKFUN_MICROMOD_STM32/bdev.c
@@ -0,0 +1,28 @@
+#include "storage.h"
+
+#if !MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE
+
+// External SPI flash uses standard SPI interface
+
+STATIC const mp_soft_spi_obj_t soft_spi_bus = {
+    .delay_half = MICROPY_HW_SOFTSPI_MIN_DELAY,
+    .polarity = 0,
+    .phase = 0,
+    .sck = MICROPY_HW_SPIFLASH_SCK,
+    .mosi = MICROPY_HW_SPIFLASH_MOSI,
+    .miso = MICROPY_HW_SPIFLASH_MISO,
+};
+
+STATIC mp_spiflash_cache_t spi_bdev_cache;
+
+const mp_spiflash_config_t spiflash_config = {
+    .bus_kind = MP_SPIFLASH_BUS_SPI,
+    .bus.u_spi.cs = MICROPY_HW_SPIFLASH_CS,
+    .bus.u_spi.data = (void*)&soft_spi_bus,
+    .bus.u_spi.proto = &mp_soft_spi_proto,
+    .cache = &spi_bdev_cache,
+};
+
+spi_bdev_t spi_bdev;
+
+#endif
diff --git a/ports/stm32/boards/SPARKFUN_MICROMOD_STM32/board_init.c b/ports/stm32/boards/SPARKFUN_MICROMOD_STM32/board_init.c
new file mode 100644
index 0000000000000..0184bc8205f39
--- /dev/null
+++ b/ports/stm32/boards/SPARKFUN_MICROMOD_STM32/board_init.c
@@ -0,0 +1,11 @@
+#include "py/mphal.h"
+
+void board_early_init(void) {
+
+#if !MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE
+    // set external SPI flash CS pin high
+    mp_hal_pin_output(MICROPY_HW_SPIFLASH_CS);
+    mp_hal_pin_write(MICROPY_HW_SPIFLASH_CS, 1);
+#endif
+
+}
diff --git a/ports/stm32/boards/SPARKFUN_MICROMOD_STM32/mpconfigboard.h b/ports/stm32/boards/SPARKFUN_MICROMOD_STM32/mpconfigboard.h
new file mode 100644
index 0000000000000..0c451a4dbb5e6
--- /dev/null
+++ b/ports/stm32/boards/SPARKFUN_MICROMOD_STM32/mpconfigboard.h
@@ -0,0 +1,100 @@
+// The Sparkfun MicroMod spec uses a zero-based peripheral numbering scheme.
+// In cases where the 0th peripheral is the default, the "0" is omitted from
+// the name (e.g. "I2C" instead of "I2C0").
+//
+// Note: UART (UART0) is not present in the edge connector pinout because the
+// primary debug serial port is exposed as a virtual serial port over USB,
+// i.e. Serial.print() should print over USB VCP, not UART_TX1.
+//
+// For more details, see https://www.sparkfun.com/micromod#tech-specs
+
+#define MICROPY_HW_BOARD_NAME "SparkFun STM32 MicroMod Processor"
+#define MICROPY_HW_MCU_NAME "STM32F405RG"
+
+// 1 = use STM32 internal flash (1 MByte)
+// 0 = use onboard external SPI flash (16 MByte)
+#define MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE (0)
+
+#define MICROPY_HW_HAS_FLASH (1)
+#define MICROPY_HW_ENABLE_RNG (1)
+#define MICROPY_HW_ENABLE_RTC (1)
+#define MICROPY_HW_ENABLE_DAC (1)
+#define MICROPY_HW_ENABLE_USB (1)
+
+// External SPI Flash config
+#if !MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE
+
+// 128 Mbit (16 MByte) external SPI flash
+#define MICROPY_HW_SPIFLASH_SIZE_BITS (128 * 1024 * 1024)
+
+#define MICROPY_HW_SPIFLASH_CS (pin_C3)
+#define MICROPY_HW_SPIFLASH_SCK (pin_C10)
+#define MICROPY_HW_SPIFLASH_MOSI (pin_C12)
+#define MICROPY_HW_SPIFLASH_MISO (pin_C11)
+
+#define MICROPY_BOARD_EARLY_INIT board_early_init
+void board_early_init(void);
+
+extern const struct _mp_spiflash_config_t spiflash_config;
+extern struct _spi_bdev_t spi_bdev;
+#define MICROPY_HW_SPIFLASH_ENABLE_CACHE (1)
+#define MICROPY_HW_BDEV_IOCTL(op, arg) ( \
+    (op) == BDEV_IOCTL_NUM_BLOCKS ? (MICROPY_HW_SPIFLASH_SIZE_BITS / 8 / FLASH_BLOCK_SIZE) : \
+    (op) == BDEV_IOCTL_INIT ? spi_bdev_ioctl(&spi_bdev, (op), (uint32_t)&spiflash_config) : \
+    spi_bdev_ioctl(&spi_bdev, (op), (arg)) \
+)
+#define MICROPY_HW_BDEV_READBLOCKS(dest, bl, n) spi_bdev_readblocks(&spi_bdev, (dest), (bl), (n))
+#define MICROPY_HW_BDEV_WRITEBLOCKS(src, bl, n) spi_bdev_writeblocks(&spi_bdev, (src), (bl), (n))
+#define MICROPY_HW_BDEV_SPIFLASH_EXTENDED (&spi_bdev) // for extended block protocol
+
+#endif // !MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE
+
+// STM32 HSE config
+// The module has a 12 MHz crystal for the HSE oscillator.
+#define MICROPY_HW_CLK_PLLM (12)
+#define MICROPY_HW_CLK_PLLN (336)
+#define MICROPY_HW_CLK_PLLP (RCC_PLLP_DIV2)
+#define MICROPY_HW_CLK_PLLQ (7)
+#define MICROPY_HW_CLK_LAST_FREQ (1)
+
+// STM32 LSE config
+// The module has a 32.768 kHz crystal for the LSE (RTC).
+#define MICROPY_HW_RTC_USE_LSE (1)
+#define MICROPY_HW_RTC_USE_US (0)
+#define MICROPY_HW_RTC_USE_CALOUT (1)
+
+// UART1 config (MicroMod UART1)
+#define MICROPY_HW_UART1_NAME "UART1"
+#define MICROPY_HW_UART1_TX (pin_A2)
+#define MICROPY_HW_UART1_RX (pin_A3)
+
+// CAN1 config (MicroMod CAN)
+#define MICROPY_HW_CAN1_NAME "CAN"
+#define MICROPY_HW_CAN1_TX (pin_B9)
+#define MICROPY_HW_CAN1_RX (pin_B8)
+
+// I2C1 config (MicroMod I2C)
+#define MICROPY_HW_I2C1_NAME "I2C"
+#define MICROPY_HW_I2C1_SCL (pin_B10)
+#define MICROPY_HW_I2C1_SDA (pin_B11)
+
+// I2C2 config (MicroMod I2C1)
+#define MICROPY_HW_I2C2_NAME "I2C1"
+#define MICROPY_HW_I2C2_SCL (pin_B6)
+#define MICROPY_HW_I2C2_SDA (pin_B7)
+
+// SPI1 config (MicroMod SPI)
+#define MICROPY_HW_SPI1_NAME "SPI"
+#define MICROPY_HW_SPI1_NSS (pin_C4)
+#define MICROPY_HW_SPI1_SCK (pin_A5)
+#define MICROPY_HW_SPI1_MISO (pin_A6)
+#define MICROPY_HW_SPI1_MOSI (pin_A7)
+
+// LED1 config
+// The module has a single blue status LED.
+#define MICROPY_HW_LED1 (pin_A15)
+#define MICROPY_HW_LED_ON(pin) (mp_hal_pin_high(pin))
+#define MICROPY_HW_LED_OFF(pin) (mp_hal_pin_low(pin))
+
+// USB device config
+#define MICROPY_HW_USB_FS (1)
diff --git a/ports/stm32/boards/SPARKFUN_MICROMOD_STM32/mpconfigboard.mk b/ports/stm32/boards/SPARKFUN_MICROMOD_STM32/mpconfigboard.mk
new file mode 100644
index 0000000000000..cb78a7846d933
--- /dev/null
+++ b/ports/stm32/boards/SPARKFUN_MICROMOD_STM32/mpconfigboard.mk
@@ -0,0 +1,16 @@
+MCU_SERIES = f4
+CMSIS_MCU = STM32F405xx
+AF_FILE = boards/stm32f405_af.csv
+ifeq ($(USE_MBOOT),1)
+# When using Mboot all the text goes together after the filesystem
+LD_FILES = boards/stm32f405.ld boards/common_blifs.ld
+TEXT0_ADDR = 0x08020000
+else
+# When not using Mboot the ISR text goes first, then the rest after the filesystem
+LD_FILES = boards/stm32f405.ld boards/common_ifs.ld
+TEXT0_ADDR = 0x08000000
+TEXT1_ADDR = 0x08020000
+endif
+
+# MicroPython settings
+MICROPY_VFS_LFS2 = 1
diff --git a/ports/stm32/boards/SPARKFUN_MICROMOD_STM32/pins.csv b/ports/stm32/boards/SPARKFUN_MICROMOD_STM32/pins.csv
new file mode 100644
index 0000000000000..5e77de3005cc4
--- /dev/null
+++ b/ports/stm32/boards/SPARKFUN_MICROMOD_STM32/pins.csv
@@ -0,0 +1,57 @@
+G2,PA0
+BUS2,PA0
+BATT_SENSE,PA1
+UART_TX1,PA2
+UART_RX1,PA3
+AUD_LRCLK,PA4
+SPI_SCK,PA5
+SPI_MISO,PA6
+SPI_CIPO,PA6
+SPI_MOSI,PA7
+SPI_COPI,PA7
+G1,PA8
+BUS1,PA8
+USB_DN,PA11
+USB_DP,PA12
+SWDIO,PA13
+SWDCK,PA14
+STATUS_LED,PA15
+A1,PB0
+I2C_INT,PB1
+AUD_BCLK,PB3
+AUD_OUT,PB4
+AUD_IN,PB5
+I2C_SCL1,PB6
+I2C_SDA1,PB7
+CAN_RX,PB8
+CAN_TX,PB9
+I2C_SCL,PB10
+I2C_SDA,PB11
+USB_HOST_ID,PB12
+G11,PB12
+USB_HOST_VBUS,PB13
+G10,PB13
+USB_HOST_DN,PB14
+USB_HOST_DP,PB15
+D0,PC0
+D1,PC1
+G6,PC2
+BUS6,PC2
+SPI_FLASH_CS,PC3
+SPI_CS,PC4
+A0,PC5
+PWM0,PC6
+PWM1,PC7
+G3,PC8
+BUS3,PC8
+G4,PC9
+BUS4,PC9
+SPI_FLASH_SCK,PC10
+SPI_FLASH_MISO,PC11
+SPI_FLASH_MOSI,PC12
+G5,PC13
+BUS5,PC13
+OSC32_IN,PC14
+OSC32_OUT,PC15
+G0,PD2
+BUS0,PD2
diff --git a/ports/stm32/boards/SPARKFUN_MICROMOD_STM32/stm32f4xx_hal_conf.h b/ports/stm32/boards/SPARKFUN_MICROMOD_STM32/stm32f4xx_hal_conf.h
new file mode 100644
index 0000000000000..9719157e55cdf
--- /dev/null
+++ b/ports/stm32/boards/SPARKFUN_MICROMOD_STM32/stm32f4xx_hal_conf.h
@@ -0,0 +1,19 @@
+/* This file is part of the MicroPython project, http://micropython.org/
+ * The MIT License (MIT)
+ * Copyright (c) 2019 Damien P. George
+ */
+#ifndef MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H
+#define MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H
+
+#include "boards/stm32f4xx_hal_conf_base.h"
+
+// Oscillator values in Hz
+#define HSE_VALUE (12000000)
+#define LSE_VALUE (32768)
+#define EXTERNAL_CLOCK_VALUE (12288000)
+
+// Oscillator timeouts in ms
+#define HSE_STARTUP_TIMEOUT (100)
+#define LSE_STARTUP_TIMEOUT (5000)
+
+#endif // MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H

From 2e62e13455780517047c32279fc8bf2812810602 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Mon, 19 Jul 2021 23:58:26 +0200
Subject: [PATCH 1118/3533] rp2/machine_uart: Fix poll ioctl to also check
 hardware FIFO.

The RX IRQ does not trigger if the FIFO is less than the trigger level, in
which case characters may be available in the FIFO, yet not in the ringbuf,
and the ioctl returns false.
---
 ports/rp2/machine_uart.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/rp2/machine_uart.c b/ports/rp2/machine_uart.c
index c6206cebe6973..2431f496eb432 100644
--- a/ports/rp2/machine_uart.c
+++ b/ports/rp2/machine_uart.c
@@ -477,7 +477,7 @@ STATIC mp_uint_t machine_uart_ioctl(mp_obj_t self_in, mp_uint_t request, mp_uint
     if (request == MP_STREAM_POLL) {
         uintptr_t flags = arg;
         ret = 0;
-        if ((flags & MP_STREAM_POLL_RD) && ringbuf_avail(&self->read_buffer) > 0) {
+        if ((flags & MP_STREAM_POLL_RD) && (uart_is_readable(self->uart) || ringbuf_avail(&self->read_buffer) > 0)) {
             ret |= MP_STREAM_POLL_RD;
         }
         if ((flags & MP_STREAM_POLL_WR) && ringbuf_free(&self->write_buffer) > 0) {

From ee49ae8f82c22b43777aa9e73a1b7a6825304d13 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Fri, 23 Jul 2021 14:04:36 +0200
Subject: [PATCH 1119/3533] rp2/machine_uart: Fix read when FIFO has chars but
 ringbuf doesn't.

Prior to this fix, if the UART hardware FIFO had a few chars but still
below the FIFO trigger threshold, and the ringbuf was empty, the read
function would timeout if timeout==0 (the default timeout).

This fix follows the suggestion of @iabdalkader.
---
 ports/rp2/machine_uart.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/ports/rp2/machine_uart.c b/ports/rp2/machine_uart.c
index 2431f496eb432..a8ec149f4b1ac 100644
--- a/ports/rp2/machine_uart.c
+++ b/ports/rp2/machine_uart.c
@@ -407,6 +407,13 @@ STATIC mp_uint_t machine_uart_read(mp_obj_t self_in, void *buf_in, mp_uint_t siz
     for (size_t i = 0; i < size; i++) {
         // Wait for the first/next character
         while (ringbuf_avail(&self->read_buffer) == 0) {
+            if (uart_is_readable(self->uart)) {
+                // Force a few incoming bytes to the buffer
+                self->read_lock = true;
+                uart_drain_rx_fifo(self);
+                self->read_lock = false;
+                break;
+            }
             if (time_us_64() > t) {  // timed out
                 if (i <= 0) {
                     *errcode = MP_EAGAIN;
@@ -416,10 +423,6 @@ STATIC mp_uint_t machine_uart_read(mp_obj_t self_in, void *buf_in, mp_uint_t siz
                 }
             }
             MICROPY_EVENT_POLL_HOOK
-            // Force a few incoming bytes to the buffer
-            self->read_lock = true;
-            uart_drain_rx_fifo(self);
-            self->read_lock = false;
         }
         *dest++ = ringbuf_get(&(self->read_buffer));
         t = time_us_64() + timeout_char_us;

From fef21144047201d639b2692e3a55083c7180cb29 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 26 Jul 2021 13:03:42 +1000
Subject: [PATCH 1120/3533] stm32/uart: Fix LPUART1 baudrate set/get.

It needs to use a different function because the formula to compute the
baudrate on LPUART1 is different to a normal UART.

Fixes issue #7466.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/boards/stm32h7xx_hal_conf_base.h |  1 +
 ports/stm32/boards/stm32l0xx_hal_conf_base.h |  1 +
 ports/stm32/boards/stm32l4xx_hal_conf_base.h |  1 +
 ports/stm32/boards/stm32wbxx_hal_conf_base.h |  1 +
 ports/stm32/uart.c                           | 19 +++++++++++++++++++
 5 files changed, 23 insertions(+)

diff --git a/ports/stm32/boards/stm32h7xx_hal_conf_base.h b/ports/stm32/boards/stm32h7xx_hal_conf_base.h
index c07ae93e37e04..08928ed5933cd 100644
--- a/ports/stm32/boards/stm32h7xx_hal_conf_base.h
+++ b/ports/stm32/boards/stm32h7xx_hal_conf_base.h
@@ -54,6 +54,7 @@
 #include "stm32h7xx_hal_usart.h"
 #include "stm32h7xx_hal_wwdg.h"
 #include "stm32h7xx_ll_adc.h"
+#include "stm32h7xx_ll_lpuart.h"
 #include "stm32h7xx_ll_pwr.h"
 #include "stm32h7xx_ll_rtc.h"
 #include "stm32h7xx_ll_usart.h"
diff --git a/ports/stm32/boards/stm32l0xx_hal_conf_base.h b/ports/stm32/boards/stm32l0xx_hal_conf_base.h
index cc033666af8c3..7b569907e8d6a 100644
--- a/ports/stm32/boards/stm32l0xx_hal_conf_base.h
+++ b/ports/stm32/boards/stm32l0xx_hal_conf_base.h
@@ -47,6 +47,7 @@
 #include "stm32l0xx_hal_usart.h"
 #include "stm32l0xx_hal_wwdg.h"
 #include "stm32l0xx_ll_adc.h"
+#include "stm32l0xx_ll_lpuart.h"
 #include "stm32l0xx_ll_rtc.h"
 #include "stm32l0xx_ll_usart.h"
 
diff --git a/ports/stm32/boards/stm32l4xx_hal_conf_base.h b/ports/stm32/boards/stm32l4xx_hal_conf_base.h
index 8d77a80a7096e..4f3a78d509e9f 100644
--- a/ports/stm32/boards/stm32l4xx_hal_conf_base.h
+++ b/ports/stm32/boards/stm32l4xx_hal_conf_base.h
@@ -51,6 +51,7 @@
 #include "stm32l4xx_hal_usart.h"
 #include "stm32l4xx_hal_wwdg.h"
 #include "stm32l4xx_ll_adc.h"
+#include "stm32l4xx_ll_lpuart.h"
 #include "stm32l4xx_ll_rtc.h"
 #include "stm32l4xx_ll_usart.h"
 
diff --git a/ports/stm32/boards/stm32wbxx_hal_conf_base.h b/ports/stm32/boards/stm32wbxx_hal_conf_base.h
index 72af0262a28b2..b03ad26864f9f 100644
--- a/ports/stm32/boards/stm32wbxx_hal_conf_base.h
+++ b/ports/stm32/boards/stm32wbxx_hal_conf_base.h
@@ -42,6 +42,7 @@
 #include "stm32wbxx_hal_uart.h"
 #include "stm32wbxx_hal_usart.h"
 #include "stm32wbxx_ll_adc.h"
+#include "stm32wbxx_ll_lpuart.h"
 #include "stm32wbxx_ll_rtc.h"
 #include "stm32wbxx_ll_usart.h"
 
diff --git a/ports/stm32/uart.c b/ports/stm32/uart.c
index b15be85336b8c..002b1f168d8ce 100644
--- a/ports/stm32/uart.c
+++ b/ports/stm32/uart.c
@@ -746,6 +746,15 @@ uint32_t uart_get_source_freq(pyb_uart_obj_t *self) {
 }
 
 uint32_t uart_get_baudrate(pyb_uart_obj_t *self) {
+    #if defined(LPUART1)
+    if (self->uart_id == PYB_LPUART_1) {
+        return LL_LPUART_GetBaudRate(self->uartx, uart_get_source_freq(self)
+            #if defined(STM32H7) || defined(STM32WB)
+            , self->uartx->PRESC
+            #endif
+            );
+    }
+    #endif
     return LL_USART_GetBaudRate(self->uartx, uart_get_source_freq(self),
         #if defined(STM32H7) || defined(STM32WB)
         self->uartx->PRESC,
@@ -754,6 +763,16 @@ uint32_t uart_get_baudrate(pyb_uart_obj_t *self) {
 }
 
 void uart_set_baudrate(pyb_uart_obj_t *self, uint32_t baudrate) {
+    #if defined(LPUART1)
+    if (self->uart_id == PYB_LPUART_1) {
+        LL_LPUART_SetBaudRate(self->uartx, uart_get_source_freq(self),
+            #if defined(STM32H7) || defined(STM32WB)
+            LL_LPUART_PRESCALER_DIV1,
+            #endif
+            baudrate);
+        return;
+    }
+    #endif
     LL_USART_SetBaudRate(self->uartx, uart_get_source_freq(self),
         #if defined(STM32H7) || defined(STM32WB)
         LL_USART_PRESCALER_DIV1,

From aa0cf873bf2c475cf2798461a5e9927e31a53012 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 26 Jul 2021 13:21:30 +1000
Subject: [PATCH 1121/3533] stm32/uart: Support low baudrates on LPUART1.

By selecting a larger prescaler when needed.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/uart.c | 22 +++++++++++++++++++++-
 ports/stm32/uart.h |  1 +
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/ports/stm32/uart.c b/ports/stm32/uart.c
index 002b1f168d8ce..d2953b2646979 100644
--- a/ports/stm32/uart.c
+++ b/ports/stm32/uart.c
@@ -488,7 +488,7 @@ bool uart_init(pyb_uart_obj_t *uart_obj,
 
     uart_obj->uartx = UARTx;
 
-    // init UARTx
+    // Set the initialisation parameters for the UART.
     UART_HandleTypeDef huart;
     memset(&huart, 0, sizeof(huart));
     huart.Instance = UARTx;
@@ -499,6 +499,26 @@ bool uart_init(pyb_uart_obj_t *uart_obj,
     huart.Init.Mode = UART_MODE_TX_RX;
     huart.Init.HwFlowCtl = flow;
     huart.Init.OverSampling = UART_OVERSAMPLING_16;
+    #if !defined(STM32F4)
+    huart.Init.OneBitSampling = UART_ONE_BIT_SAMPLE_DISABLE;
+    #endif
+
+    #if defined(STM32H7) || defined(STM32WB)
+    // Compute the smallest prescaler that will allow the given baudrate.
+    uint32_t presc = UART_PRESCALER_DIV1;
+    if (uart_obj->uart_id == PYB_LPUART_1) {
+        uint32_t source_clk = uart_get_source_freq(uart_obj);
+        for (; presc < UART_PRESCALER_DIV256; ++presc) {
+            uint32_t brr = UART_DIV_LPUART(source_clk, baudrate, presc);
+            if (brr <= LPUART_BRR_MASK) {
+                break;
+            }
+        }
+    }
+    huart.Init.ClockPrescaler = presc;
+    #endif
+
+    // Initialise the UART hardware.
     HAL_UART_Init(&huart);
 
     // Disable all individual UART IRQs, but enable the global handler
diff --git a/ports/stm32/uart.h b/ports/stm32/uart.h
index 286b6cdec036a..0a268ad465d69 100644
--- a/ports/stm32/uart.h
+++ b/ports/stm32/uart.h
@@ -88,6 +88,7 @@ void uart_deinit(pyb_uart_obj_t *uart_obj);
 void uart_irq_handler(mp_uint_t uart_id);
 
 void uart_attach_to_repl(pyb_uart_obj_t *self, bool attached);
+uint32_t uart_get_source_freq(pyb_uart_obj_t *self);
 uint32_t uart_get_baudrate(pyb_uart_obj_t *self);
 void uart_set_baudrate(pyb_uart_obj_t *self, uint32_t baudrate);
 

From 0f0006f4e15f710b4d2fa6a27cb932f580194729 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mat=C3=BA=C5=A1=20Olek=C5=A1=C3=A1k?=
 <oleksak.matus@gmail.com>
Date: Mon, 4 Jan 2021 20:27:46 +0100
Subject: [PATCH 1122/3533] stm32/boards/STM32F429DISC: Set correct UART2 pins
 and add UART3/6.

---
 ports/stm32/boards/STM32F429DISC/mpconfigboard.h | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/ports/stm32/boards/STM32F429DISC/mpconfigboard.h b/ports/stm32/boards/STM32F429DISC/mpconfigboard.h
index 95cab08c8fa18..cfd9ef9d08ac1 100644
--- a/ports/stm32/boards/STM32F429DISC/mpconfigboard.h
+++ b/ports/stm32/boards/STM32F429DISC/mpconfigboard.h
@@ -19,8 +19,12 @@
 // UART config
 #define MICROPY_HW_UART1_TX     (pin_A9)
 #define MICROPY_HW_UART1_RX     (pin_A10)
-#define MICROPY_HW_UART2_TX     (pin_D8)
-#define MICROPY_HW_UART2_RX     (pin_D9)
+#define MICROPY_HW_UART2_TX     (pin_D5)
+#define MICROPY_HW_UART2_RX     (pin_D6)
+#define MICROPY_HW_UART3_TX     (pin_C10)
+#define MICROPY_HW_UART3_RX     (pin_C11)
+#define MICROPY_HW_UART6_TX     (pin_C6)
+#define MICROPY_HW_UART6_RX     (pin_C7)
 
 // I2C buses
 #define MICROPY_HW_I2C3_SCL (pin_A8)

From 224ac355cd39eea4a6717692446c4eaf1949be77 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 27 Jul 2021 16:46:10 +1000
Subject: [PATCH 1123/3533] stm32/boards/NUCLEO_F439ZI: Add board definition
 for NUCLEO_F439ZI.

Signed-off-by: Damien George <damien@micropython.org>
---
 .../boards/NUCLEO_F439ZI/mpconfigboard.h      |  81 +++++++++++
 .../boards/NUCLEO_F439ZI/mpconfigboard.mk     |  11 ++
 ports/stm32/boards/NUCLEO_F439ZI/pins.csv     | 129 ++++++++++++++++++
 .../boards/NUCLEO_F439ZI/stm32f4xx_hal_conf.h |  19 +++
 4 files changed, 240 insertions(+)
 create mode 100644 ports/stm32/boards/NUCLEO_F439ZI/mpconfigboard.h
 create mode 100644 ports/stm32/boards/NUCLEO_F439ZI/mpconfigboard.mk
 create mode 100644 ports/stm32/boards/NUCLEO_F439ZI/pins.csv
 create mode 100644 ports/stm32/boards/NUCLEO_F439ZI/stm32f4xx_hal_conf.h

diff --git a/ports/stm32/boards/NUCLEO_F439ZI/mpconfigboard.h b/ports/stm32/boards/NUCLEO_F439ZI/mpconfigboard.h
new file mode 100644
index 0000000000000..010e3b1f5f7d3
--- /dev/null
+++ b/ports/stm32/boards/NUCLEO_F439ZI/mpconfigboard.h
@@ -0,0 +1,81 @@
+#define MICROPY_HW_BOARD_NAME       "NUCLEO-F439ZI"
+#define MICROPY_HW_MCU_NAME         "STM32F439ZIT6"
+
+#define MICROPY_HW_HAS_SWITCH       (1)
+#define MICROPY_HW_HAS_FLASH        (1)
+#define MICROPY_HW_ENABLE_RNG       (1)
+#define MICROPY_HW_ENABLE_RTC       (1)
+#define MICROPY_HW_ENABLE_USB       (1)
+
+// HSE is 8MHz from ST-LINK, in bypass mode, run SYSCLK at 168MHz
+#define MICROPY_HW_CLK_USE_BYPASS   (1)
+#define MICROPY_HW_CLK_PLLM         (8)
+#define MICROPY_HW_CLK_PLLN         (336)
+#define MICROPY_HW_CLK_PLLP         (RCC_PLLP_DIV2)
+#define MICROPY_HW_CLK_PLLQ         (7)
+#define MICROPY_HW_FLASH_LATENCY    FLASH_LATENCY_5
+
+// The board has a 32768Hz crystal for LSE
+#define MICROPY_HW_RTC_USE_LSE      (1)
+#define MICROPY_HW_RTC_USE_US       (1)
+
+// UART config
+#define MICROPY_HW_UART2_TX         (pin_D5)
+#define MICROPY_HW_UART2_RX         (pin_D6)
+#define MICROPY_HW_UART2_RTS        (pin_D4)
+#define MICROPY_HW_UART2_CTS        (pin_D3)
+#define MICROPY_HW_UART3_TX         (pin_D8)
+#define MICROPY_HW_UART3_RX         (pin_D9)
+#define MICROPY_HW_UART6_TX         (pin_G14)
+#define MICROPY_HW_UART6_RX         (pin_G9)
+#define MICROPY_HW_UART_REPL        PYB_UART_3
+#define MICROPY_HW_UART_REPL_BAUD   115200
+
+// I2C buses
+#define MICROPY_HW_I2C1_SCL         (pin_B8)
+#define MICROPY_HW_I2C1_SDA         (pin_B9)
+#define MICROPY_HW_I2C2_SCL         (pin_F1)
+#define MICROPY_HW_I2C2_SDA         (pin_F0)
+
+// SPI buses
+#define MICROPY_HW_SPI1_NSS         (pin_D14)
+#define MICROPY_HW_SPI1_SCK         (pin_A5)
+#define MICROPY_HW_SPI1_MISO        (pin_A6)
+#define MICROPY_HW_SPI1_MOSI        (pin_A7)
+#define MICROPY_HW_SPI3_NSS         (pin_A4)
+#define MICROPY_HW_SPI3_SCK         (pin_B3)
+#define MICROPY_HW_SPI3_MISO        (pin_B4)
+#define MICROPY_HW_SPI3_MOSI        (pin_B5)
+
+// CAN buses
+#define MICROPY_HW_CAN1_TX          (pin_D1)
+#define MICROPY_HW_CAN1_RX          (pin_D0)
+
+// USRSW is pulled low; pressing the button makes the input go high.
+#define MICROPY_HW_USRSW_PIN        (pin_C13)
+#define MICROPY_HW_USRSW_PULL       (GPIO_NOPULL)
+#define MICROPY_HW_USRSW_EXTI_MODE  (GPIO_MODE_IT_RISING)
+#define MICROPY_HW_USRSW_PRESSED    (1)
+
+// LEDs
+#define MICROPY_HW_LED1             (pin_B0) // green
+#define MICROPY_HW_LED2             (pin_B7) // blue
+#define MICROPY_HW_LED3             (pin_B14) // red
+#define MICROPY_HW_LED_ON(pin)      (mp_hal_pin_high(pin))
+#define MICROPY_HW_LED_OFF(pin)     (mp_hal_pin_low(pin))
+
+// USB config (CN13 - USB OTG FS)
+#define MICROPY_HW_USB_FS              (1)
+#define MICROPY_HW_USB_VBUS_DETECT_PIN (pin_A9)
+#define MICROPY_HW_USB_OTG_ID_PIN      (pin_A10)
+
+// Ethernet via RMII
+#define MICROPY_HW_ETH_MDC          (pin_C1)
+#define MICROPY_HW_ETH_MDIO         (pin_A2)
+#define MICROPY_HW_ETH_RMII_REF_CLK (pin_A1)
+#define MICROPY_HW_ETH_RMII_CRS_DV  (pin_A7)
+#define MICROPY_HW_ETH_RMII_RXD0    (pin_C4)
+#define MICROPY_HW_ETH_RMII_RXD1    (pin_C5)
+#define MICROPY_HW_ETH_RMII_TX_EN   (pin_G11)
+#define MICROPY_HW_ETH_RMII_TXD0    (pin_G13)
+#define MICROPY_HW_ETH_RMII_TXD1    (pin_B13)
diff --git a/ports/stm32/boards/NUCLEO_F439ZI/mpconfigboard.mk b/ports/stm32/boards/NUCLEO_F439ZI/mpconfigboard.mk
new file mode 100644
index 0000000000000..52702b5112c89
--- /dev/null
+++ b/ports/stm32/boards/NUCLEO_F439ZI/mpconfigboard.mk
@@ -0,0 +1,11 @@
+MCU_SERIES = f4
+CMSIS_MCU = STM32F439xx
+AF_FILE = boards/stm32f439_af.csv
+LD_FILES = boards/stm32f439.ld boards/common_ifs.ld
+TEXT0_ADDR = 0x08000000
+TEXT1_ADDR = 0x08020000
+
+# MicroPython settings
+MICROPY_PY_LWIP = 1
+MICROPY_PY_USSL = 1
+MICROPY_SSL_MBEDTLS = 1
diff --git a/ports/stm32/boards/NUCLEO_F439ZI/pins.csv b/ports/stm32/boards/NUCLEO_F439ZI/pins.csv
new file mode 100644
index 0000000000000..cea3678ed4b89
--- /dev/null
+++ b/ports/stm32/boards/NUCLEO_F439ZI/pins.csv
@@ -0,0 +1,129 @@
+,PA0
+,PA1
+,PA2
+,PA3
+,PA4
+,PA5
+,PA6
+,PA7
+,PA8
+,PA9
+,PA10
+,PA11
+,PA12
+,PA13
+,PA14
+,PA15
+,PB0
+,PB1
+,PB2
+,PB3
+,PB4
+,PB5
+,PB6
+,PB7
+,PB8
+,PB9
+,PB10
+,PB11
+,PB12
+,PB13
+,PB14
+,PB15
+,PC0
+,PC1
+,PC2
+,PC3
+,PC4
+,PC5
+,PC6
+,PC7
+,PC8
+,PC9
+,PC10
+,PC11
+,PC12
+,PC13
+,PC14
+,PC15
+,PD0
+,PD1
+,PD2
+,PD3
+,PD4
+,PD5
+,PD6
+,PD7
+,PD8
+,PD9
+,PD10
+,PD11
+,PD12
+,PD13
+,PD14
+,PD15
+,PE0
+,PE1
+,PE2
+,PE3
+,PE4
+,PE5
+,PE6
+,PE7
+,PE8
+,PE9
+,PE10
+,PE11
+,PE12
+,PE13
+,PE14
+,PE15
+,PF0
+,PF1
+,PF2
+,PF3
+,PF4
+,PF5
+,PF6
+,PF7
+,PF8
+,PF9
+,PF10
+,PF11
+,PF12
+,PF13
+,PF14
+,PF15
+,PG0
+,PG1
+,PG2
+,PG3
+,PG4
+,PG5
+,PG6
+,PG7
+,PG8
+,PG9
+,PG10
+,PG11
+,PG12
+,PG13
+,PG14
+,PG15
+SW,PC13
+LED_GREEN,PB0
+LED_BLUE,PB7
+LED_RED,PB14
+USB_VBUS,PA9
+USB_ID,PA10
+USB_DM,PA11
+USB_DP,PA12
+ETH_MDC,PC1
+ETH_MDIO,PA2
+ETH_RMII_REF_CLK,PA1
+ETH_RMII_CRS_DV,PA7
+ETH_RMII_RXD0,PC4
+ETH_RMII_RXD1,PC5
+ETH_RMII_TX_EN,PG11
+ETH_RMII_TXD0,PG13
+ETH_RMII_TXD1,PB13
diff --git a/ports/stm32/boards/NUCLEO_F439ZI/stm32f4xx_hal_conf.h b/ports/stm32/boards/NUCLEO_F439ZI/stm32f4xx_hal_conf.h
new file mode 100644
index 0000000000000..de19251e0808a
--- /dev/null
+++ b/ports/stm32/boards/NUCLEO_F439ZI/stm32f4xx_hal_conf.h
@@ -0,0 +1,19 @@
+/* This file is part of the MicroPython project, http://micropython.org/
+ * The MIT License (MIT)
+ * Copyright (c) 2019 Damien P. George
+ */
+#ifndef MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H
+#define MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H
+
+#include "boards/stm32f4xx_hal_conf_base.h"
+
+// Oscillator values in Hz
+#define HSE_VALUE (8000000)
+#define LSE_VALUE (32768)
+#define EXTERNAL_CLOCK_VALUE (12288000)
+
+// Oscillator timeouts in ms
+#define HSE_STARTUP_TIMEOUT (100)
+#define LSE_STARTUP_TIMEOUT (5000)
+
+#endif // MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H

From 7a1edb91cbd47379c29e46d9c85acd9504a6eb89 Mon Sep 17 00:00:00 2001
From: Tobias Thyrrestrup <tt@LEGO.com>
Date: Wed, 21 Jul 2021 13:45:33 +0200
Subject: [PATCH 1124/3533] stm32/boards/LEGO_HUB_NO6: Add board definition for
 LEGO_HUB_NO6.

Add basic support for LEGO HUB NO.6 (e.g. LEGO SPIKE Prime, LEGO MINDSTORMS
Robot Inventor).

See README.md for details.

Thanks to @dpgeorge for helping put this together.

Signed-off-by: Tobias Thyrrestrup <tt@LEGO.com>
---
 ports/stm32/boards/LEGO_HUB_NO6/README.md     |  79 +++
 ports/stm32/boards/LEGO_HUB_NO6/bdev.c        |  63 ++
 .../LEGO_HUB_NO6/bluetooth_init_cc2564C_1.5.c | 616 ++++++++++++++++++
 ports/stm32/boards/LEGO_HUB_NO6/board_init.c  | 170 +++++
 ports/stm32/boards/LEGO_HUB_NO6/cc2564.c      |  85 +++
 ports/stm32/boards/LEGO_HUB_NO6/hub_display.c | 180 +++++
 ports/stm32/boards/LEGO_HUB_NO6/hub_display.h |   4 +
 .../stm32/boards/LEGO_HUB_NO6/mboot_memory.ld |  10 +
 .../stm32/boards/LEGO_HUB_NO6/mpconfigboard.h | 122 ++++
 .../boards/LEGO_HUB_NO6/mpconfigboard.mk      |  22 +
 ports/stm32/boards/LEGO_HUB_NO6/pins.csv      | 114 ++++
 .../stm32/boards/LEGO_HUB_NO6/stm32f413xg.ld  |  27 +
 .../boards/LEGO_HUB_NO6/stm32f4xx_hal_conf.h  |  19 +
 13 files changed, 1511 insertions(+)
 create mode 100644 ports/stm32/boards/LEGO_HUB_NO6/README.md
 create mode 100644 ports/stm32/boards/LEGO_HUB_NO6/bdev.c
 create mode 100644 ports/stm32/boards/LEGO_HUB_NO6/bluetooth_init_cc2564C_1.5.c
 create mode 100644 ports/stm32/boards/LEGO_HUB_NO6/board_init.c
 create mode 100644 ports/stm32/boards/LEGO_HUB_NO6/cc2564.c
 create mode 100644 ports/stm32/boards/LEGO_HUB_NO6/hub_display.c
 create mode 100644 ports/stm32/boards/LEGO_HUB_NO6/hub_display.h
 create mode 100644 ports/stm32/boards/LEGO_HUB_NO6/mboot_memory.ld
 create mode 100644 ports/stm32/boards/LEGO_HUB_NO6/mpconfigboard.h
 create mode 100644 ports/stm32/boards/LEGO_HUB_NO6/mpconfigboard.mk
 create mode 100644 ports/stm32/boards/LEGO_HUB_NO6/pins.csv
 create mode 100644 ports/stm32/boards/LEGO_HUB_NO6/stm32f413xg.ld
 create mode 100644 ports/stm32/boards/LEGO_HUB_NO6/stm32f4xx_hal_conf.h

diff --git a/ports/stm32/boards/LEGO_HUB_NO6/README.md b/ports/stm32/boards/LEGO_HUB_NO6/README.md
new file mode 100644
index 0000000000000..c566ada9d009e
--- /dev/null
+++ b/ports/stm32/boards/LEGO_HUB_NO6/README.md
@@ -0,0 +1,79 @@
+LEGO Hub No.6
+=============
+
+This board definition is for the LEGO Hub No. 6, a LEGO control unit with a 5x5
+LED display, 6 Powered Up ports, speaker, 6-DOF sensor, Bluetooth, external SPI
+flash storage, and a rechargeable battery.  The Hub can work without the battery if
+it is plugged in to, and powered by, its USB port.  But without the battery the LEDs
+and power on the Powered Up ports will not function.
+
+Features that are currently supported:
+- standard MicroPython
+- machine and bluetooth modules
+- filesystem
+- USB VCP, MSC and HID
+
+The Hub has a bootloader preinstalled at 0x08000000 (which is 32kiB in size) which
+cannot be erased.  This bootloader is entered by holding down the Bluetooth button,
+plugging in USB to power it up, then releasing the Bluetooth button after 5 seconds,
+at which point the USB DFU device appears.  If the battery is installed then the
+Bluetooth button's RGB LED will cycle colours.  When this bootloader is active, the
+flash from 0x08008000 and up can be erased and programmed via USB DFU.
+
+The built-in bootloader has some drawbacks: it cannot be entered programmatically,
+and it does not keep the Hub powered up when running from battery (which requires
+keeping BAT_PWR_EN high).  As such, this board is configured to work with mboot as
+a secondary bootloader: mboot is placed at 0x08008000 and the main application
+firmware at 0x08010000.  When mboot is installed it can be entered programatically
+via machine.bootloader(), or by holding down the left arrow button when powering
+on the Hub and waiting until the display says "B" before releasing the button.
+
+Installing MicroPython
+----------------------
+
+You first need to build and install mboot, which only needs to be done once.  From
+the root of this repository run:
+
+    $ cd ports/stm32/mboot
+    $ make BOARD=LEGO_HUB_NO6
+
+Now enter the built-in bootloader by holding down the Bluetooth button for 5
+seconds while powering up the Hub via USB.  Then run:
+
+    $ make BOARD=LEGO_HUB_NO6 deploy
+
+mboot should now be installed.  Enter mboot by holding down the left arrow
+button when powering up the Hub.  The display will cycle the letters: N, S, F, B.
+When it gets to "B" release the left arrow and it will start mboot.  The Hub then
+blinks the centre button red once per second, and appears as a USB DFU device.
+
+Now build MicroPython (start at the root of this repository):
+
+    $ cd mpy-cross
+    $ make
+    $ cd ../ports/stm32
+    $ make submodules
+    $ make BOARD=LEGO_HUB_NO6
+
+And deploy to the Hub (making sure mboot is active, the centre button is blinking
+red):
+
+    $ make BOARD=LEGO_HUB_NO6 deploy
+
+If successful, the Hub should now appear as a USB serial and mass storage device.
+
+Using MicroPython on the Hub
+----------------------------
+
+Access the MicroPython REPL using mpremote (pip install mpremote), or with any
+serial terminal program.
+
+To scan for BLE devices:
+
+    >>> import bluetooth
+    >>> ble = bluetooth.BLE()
+    >>> ble.irq(lambda *x: print(*x))
+    >>> ble.active(1)
+    >>> ble.gap_scan(2000, 625, 625)
+
+Use help("modules") to see available built-in modules.
\ No newline at end of file
diff --git a/ports/stm32/boards/LEGO_HUB_NO6/bdev.c b/ports/stm32/boards/LEGO_HUB_NO6/bdev.c
new file mode 100644
index 0000000000000..44671edb153a5
--- /dev/null
+++ b/ports/stm32/boards/LEGO_HUB_NO6/bdev.c
@@ -0,0 +1,63 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "py/obj.h"
+#include "storage.h"
+
+#define CMD_EXIT_4_BYTE_ADDRESS_MODE (0xE9)
+
+STATIC const mp_soft_spi_obj_t soft_spi_bus = {
+    .delay_half = MICROPY_HW_SOFTSPI_MIN_DELAY,
+    .polarity = 0,
+    .phase = 0,
+    .sck = MICROPY_HW_SPIFLASH_SCK,
+    .mosi = MICROPY_HW_SPIFLASH_MOSI,
+    .miso = MICROPY_HW_SPIFLASH_MISO,
+};
+
+STATIC mp_spiflash_cache_t spi_bdev_cache;
+
+const mp_spiflash_config_t spiflash_config = {
+    .bus_kind = MP_SPIFLASH_BUS_SPI,
+    .bus.u_spi.cs = MICROPY_HW_SPIFLASH_NSS,
+    .bus.u_spi.data = (void *)&soft_spi_bus,
+    .bus.u_spi.proto = &mp_soft_spi_proto,
+    .cache = &spi_bdev_cache,
+};
+
+spi_bdev_t spi_bdev;
+
+int32_t board_bdev_ioctl(void) {
+    int32_t ret = spi_bdev_ioctl(&spi_bdev, BDEV_IOCTL_INIT, (uint32_t)&spiflash_config);
+
+    // Exit 4-byte address mode
+    uint8_t cmd = CMD_EXIT_4_BYTE_ADDRESS_MODE;
+    mp_hal_pin_write(MICROPY_HW_SPIFLASH_NSS, 0);
+    mp_soft_spi_proto.transfer(MP_OBJ_FROM_PTR(&soft_spi_bus), 1, &cmd, NULL);
+    mp_hal_pin_write(MICROPY_HW_SPIFLASH_NSS, 1);
+
+    return ret;
+}
diff --git a/ports/stm32/boards/LEGO_HUB_NO6/bluetooth_init_cc2564C_1.5.c b/ports/stm32/boards/LEGO_HUB_NO6/bluetooth_init_cc2564C_1.5.c
new file mode 100644
index 0000000000000..ec41fdfeefbca
--- /dev/null
+++ b/ports/stm32/boards/LEGO_HUB_NO6/bluetooth_init_cc2564C_1.5.c
@@ -0,0 +1,616 @@
+// This file contains CC256x initialisation code, and was generated by BTstack via:
+//  $ cd chipset/cc256x
+//  $ make -f Makefile.inc BTSTACK_ROOT=../.. bluetooth_init_cc2564C_1.4.c
+#if !BUILDING_MBOOT
+ 
+ // init script created from
+// - /Users/dktobthy/Downloads/cc256xc_bt_spv1.5/CC256XC_BT_SP/v1.5/initscripts-TIInit_6.12.26.bts
+// - AKA TIInit_6.12.26.bts
+// - /Users/dktobthy/Downloads/cc256xc_bt_spv1.5/CC256XC_BT_SP/v1.5/initscripts-TIInit_6.12.26_ble_add-on.bts
+#include <stdint.h>
+#include "lib/btstack/chipset/cc256x/btstack_chipset_cc256x.h"
+
+
+const uint16_t cc256x_init_script_lmp_subversion = 0x9a1a;
+
+uint16_t btstack_chipset_cc256x_lmp_subversion(void){
+    return cc256x_init_script_lmp_subversion;
+}
+
+#if defined(__GNUC__) && defined(__MSP430X__) && (__MSP430X__ > 0)
+__attribute__((section (".fartext")))
+#endif
+#ifdef __AVR__
+__attribute__((__progmem__))
+#endif
+const uint8_t cc256x_init_script[] = {
+
+    // #--------------------------------------------------------------------------------
+    // # Description : Orca C ROM Initialization Script
+    // #
+    // # Compatibility: Orca, 12.0.26 ROM
+    // #
+    // # Last Updated: 17-May-2021  10:31:30.07
+    // #
+    // # Version     : 12_26.24
+    // #
+    // #
+    // #
+    // #
+    // # Notes       : Use this script on Orca C, 12.0.26 ROM device only (FW v12.0.26)
+    // #--------------------------------------------------------------------------------
+    // #################################################################
+    // ## START of CC256x Add-On
+    // #################################################################
+    // 
+    // ## Change UART baudrate
+    // 
+    // #################################################################
+    // ## END of CC256x Add-On
+    // #################################################################
+    // 
+    0x01, 0x37, 0xfe, 0x02, 0x0c, 0x1a, 
+
+    // 
+    // 
+    0x01, 0x05, 0xff, 0xff, 0xd0, 0x65, 0x08, 0x00, 0xfa, 0x0c, 0x1a, 0x09, 0x18, 0x01, 0x6a, 
+    0xc8, 0x7b, 0x00, 0x02, 0x89, 0x7b, 0x01, 0x43, 0x09, 0x48, 0x51, 0x30, 0x02, 0x88, 0x06, 
+    0x48, 0x91, 0x42, 0x03, 0xd1, 0x04, 0x49, 0x09, 0x78, 0x01, 0x29, 0x01, 0xd0, 0x5d, 0x30, 
+    0xf7, 0x46, 0xff, 0x30, 0xd8, 0x30, 0xf7, 0x46, 0x76, 0x24, 0x08, 0x00, 0xbd, 0x28, 0x02, 
+    0x00, 0x69, 0x53, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb5, 0x00, 
+    0x69, 0xff, 0x21, 0x02, 0x31, 0x09, 0x5c, 0x09, 0x29, 0x05, 0xd1, 0x01, 0x21, 0x00, 0x22, 
+    0x8e, 0x46, 0x6d, 0x4b, 0xfe, 0x44, 0x18, 0x47, 0x00, 0xbd, 0x6c, 0x4a, 0x11, 0x88, 0x01, 
+    0x20, 0x40, 0x03, 0x08, 0x43, 0x10, 0x80, 0xf7, 0x46, 0x30, 0xb5, 0x00, 0x69, 0xf4, 0x21, 
+    0x08, 0x5c, 0x01, 0x28, 0x16, 0xd1, 0xea, 0x48, 0x00, 0x78, 0x03, 0x28, 0x12, 0xd0, 0x00, 
+    0x25, 0x28, 0x1c, 0xe8, 0x49, 0x01, 0x24, 0xa6, 0x46, 0xe7, 0x4a, 0xfe, 0x44, 0x10, 0x47, 
+    0x00, 0x28, 0x08, 0xd0, 
+
+    0x01, 0x05, 0xff, 0xff, 0xca, 0x66, 0x08, 0x00, 0xfa, 0xe6, 0x49, 0xe6, 0x4a, 0xbb, 0x32, 
+    0x20, 0x20, 0x2b, 0x1c, 0xa6, 0x46, 0xe5, 0x4c, 0xfe, 0x44, 0x20, 0x47, 0x30, 0xbd, 0x70, 
+    0xb5, 0x85, 0x69, 0x00, 0x7d, 0x80, 0x1f, 0x11, 0xd0, 0x47, 0x38, 0x2e, 0xd1, 0xa9, 0x79, 
+    0x28, 0x20, 0x48, 0x43, 0xdf, 0x4a, 0x10, 0x18, 0x23, 0x22, 0x12, 0x5c, 0x01, 0x2a, 0x25, 
+    0xd1, 0x80, 0x7b, 0x00, 0x28, 0x22, 0xd0, 0xdb, 0x4a, 0x00, 0x20, 0x50, 0x54, 0x70, 0xbd, 
+    0x01, 0x24, 0xa6, 0x46, 0xd9, 0x48, 0xfe, 0x44, 0x00, 0x47, 0x01, 0x28, 0x05, 0xd0, 0xa6, 
+    0x46, 0xd6, 0x48, 0xfe, 0x44, 0x00, 0x47, 0x04, 0x28, 0x11, 0xd1, 0xe8, 0x78, 0x00, 0x28, 
+    0x0e, 0xd1, 0x0e, 0x26, 0x31, 0x1c, 0xd3, 0x4d, 0x28, 0x1c, 0x14, 0x38, 0xa6, 0x46, 0xd0, 
+    0x4a, 0xfe, 0x44, 0x10, 0x47, 0x28, 0x1c, 0x31, 0x1c, 0xa6, 0x46, 0xcd, 0x4a, 0xfe, 0x44, 
+    0x10, 0x47, 0x70, 0xbd, 0x70, 0xb5, 0x01, 0x1c, 0x88, 0x69, 0x89, 0x8a, 0xcb, 0x4a, 0x89, 
+    0x1a, 0x1c, 0xd0, 0x1c, 0x39, 0x20, 0xd1, 0xc5, 0x7a, 0x01, 0x21, 0x0c, 0x1c, 0x8e, 0x46, 
+    0xc8, 0x4a, 0xfe, 0x44, 0x10, 0x47, 0x06, 0x1c, 0x10, 0x20, 0xa6, 0x46, 0xc6, 0x49, 0xfe, 
+    0x44, 0x08, 0x47, 0x00, 0x2d, 0x11, 0xd0, 0x02, 0x2e, 0x0f, 0xd0, 0xc3, 0x49, 0xc4, 0x4a, 
+    0xd9, 0x32, 0x20, 0x20, 0x00, 0x23, 0xa6, 0x46, 0xb7, 0x4c, 0xfe, 0x44, 0x20, 0x47, 0x70, 
+    0xbd, 0xc0, 0x7a, 0x00, 0x28, 0x02, 0xd1, 0x00, 0x20, 0xbe, 0x49, 0x08, 0x70, 0x70, 0xbd, 
+    0x00, 0xb5, 0x00, 0x69, 0xff, 0x21, 0x04, 0x31, 0x09, 0x5c, 0x06, 0x29, 0x06, 0xd1, 0xff, 
+    0x21, 0x05, 0x31, 0x0a, 0x5c, 0x2c, 0x2a, 0x01, 0xd1, 0x2d, 0x22, 0x0a, 0x54, 0xff, 0x21, 
+    0x05, 0x31, 0x09, 0x5c, 
+
+    0x01, 0x05, 0xff, 0xff, 0xc4, 0x67, 0x08, 0x00, 0xfa, 0x34, 0x29, 0x11, 0xd1, 0xff, 0x21, 
+    0x0b, 0x31, 0x09, 0x5c, 0x91, 0x29, 0x0c, 0xd1, 0xf1, 0x21, 0x09, 0x5c, 0x60, 0x22, 0x4a, 
+    0x43, 0xeb, 0x4b, 0x00, 0x21, 0x99, 0x54, 0x06, 0x21, 0x01, 0x22, 0x96, 0x46, 0xe9, 0x4a, 
+    0xfe, 0x44, 0x10, 0x47, 0x00, 0xbd, 0xf0, 0xb5, 0x06, 0x1c, 0xf7, 0x69, 0x08, 0x20, 0xc0, 
+    0x19, 0x01, 0x24, 0xa6, 0x46, 0xe4, 0x49, 0xfe, 0x44, 0x08, 0x47, 0xc1, 0x7b, 0x09, 0x02, 
+    0x80, 0x7b, 0x08, 0x43, 0x05, 0x04, 0x2d, 0x0c, 0x02, 0x2d, 0x12, 0xd0, 0xef, 0x48, 0x00, 
+    0x88, 0xa8, 0x42, 0x0e, 0xd1, 0xee, 0x48, 0x00, 0x78, 0x01, 0x28, 0x0a, 0xd1, 0xed, 0x48, 
+    0x82, 0x8f, 0x81, 0x6b, 0x08, 0x1c, 0x10, 0x43, 0x04, 0xd0, 0x38, 0x1c, 0xa6, 0x46, 0xea, 
+    0x4b, 0xfe, 0x44, 0x18, 0x47, 0x35, 0x60, 0xe9, 0x48, 0x24, 0x30, 0x30, 0x62, 0xf0, 0xbd, 
+    0xc0, 0x46, 0xdd, 0x9d, 0x00, 0x00, 0x3e, 0xa6, 0x1b, 0x00, 0xf0, 0xb5, 0x86, 0xb0, 0x04, 
+    0x90, 0x81, 0x69, 0x05, 0x91, 0x81, 0x8a, 0xe2, 0x48, 0x09, 0x1a, 0xdc, 0x4d, 0x00, 0xd1, 
+    0xba, 0xe0, 0xe1, 0x4a, 0x89, 0x1a, 0x00, 0xd1, 0xaf, 0xe0, 0x07, 0x38, 0x09, 0x1a, 0x35, 
+    0xd0, 0xde, 0x48, 0x09, 0x1a, 0x28, 0xd0, 0x05, 0x39, 0x26, 0xd0, 0x13, 0x39, 0x33, 0xd1, 
+    0xdc, 0x48, 0x05, 0x1c, 0x84, 0x3d, 0x00, 0x78, 0x02, 0x28, 0x2d, 0xd1, 0x01, 0x24, 0xa6, 
+    0x46, 0xd9, 0x48, 0xfe, 0x44, 0x00, 0x47, 0x00, 0x28, 0x26, 0xd1, 0xa6, 0x46, 0xd7, 0x48, 
+    0xfe, 0x44, 0x00, 0x47, 0x00, 0x28, 0x20, 0xd1, 0xa6, 0x46, 0xd5, 0x48, 0xfe, 0x44, 0x00, 
+    0x47, 0x00, 0x28, 0x1a, 0xd1, 0x28, 0x78, 0x00, 0x28, 0x17, 0xd1, 0xa8, 0x78, 0x00, 0x28, 
+    0x14, 0xd1, 0xa6, 0x20, 
+
+    0x01, 0x05, 0xff, 0xff, 0xbe, 0x68, 0x08, 0x00, 0xfa, 0xa6, 0x46, 0xcf, 0x49, 0xfe, 0x44, 
+    0x08, 0x47, 0xc4, 0xe0, 0x05, 0x98, 0x81, 0x88, 0x41, 0x18, 0x08, 0x7c, 0x02, 0x28, 0x00, 
+    0xda, 0xbd, 0xe0, 0x80, 0x1e, 0x08, 0x74, 0xba, 0xe0, 0x51, 0x3d, 0x28, 0x78, 0x2a, 0x28, 
+    0x02, 0xd0, 0x33, 0x28, 0x00, 0xd0, 0xb3, 0xe0, 0x0e, 0x21, 0x05, 0x98, 0x0f, 0x18, 0x44, 
+    0x20, 0x0c, 0x21, 0x1a, 0x22, 0x01, 0x24, 0xa6, 0x46, 0xc2, 0x4b, 0xfe, 0x44, 0x18, 0x47, 
+    0xc1, 0x4e, 0xb1, 0x78, 0xf2, 0x78, 0xc1, 0x48, 0xa6, 0x46, 0xc1, 0x4b, 0xfe, 0x44, 0x18, 
+    0x47, 0x06, 0x21, 0x05, 0x98, 0x81, 0x80, 0x28, 0x78, 0xbf, 0x4d, 0x2a, 0x28, 0x26, 0xd0, 
+    0x0a, 0x26, 0x3e, 0x70, 0x01, 0x37, 0x38, 0x1c, 0x00, 0x21, 0xa6, 0x46, 0xba, 0x4a, 0xfe, 
+    0x44, 0x10, 0x47, 0x07, 0x1c, 0x3e, 0x70, 0x01, 0x37, 0x38, 0x1c, 0x0d, 0x21, 0xa6, 0x46, 
+    0xb5, 0x4a, 0xfe, 0x44, 0x10, 0x47, 0x07, 0x1c, 0xa6, 0x46, 0xb5, 0x48, 0xfe, 0x44, 0x00, 
+    0x47, 0x81, 0x02, 0xae, 0x48, 0xc0, 0x78, 0x40, 0x06, 0x40, 0x0e, 0x08, 0x43, 0x05, 0x43, 
+    0x29, 0x04, 0x09, 0x0c, 0x38, 0x1c, 0xa6, 0x46, 0xac, 0x4a, 0xfe, 0x44, 0x10, 0x47, 0x08, 
+    0x26, 0x24, 0xe0, 0x08, 0x26, 0x3e, 0x70, 0x01, 0x37, 0x38, 0x1c, 0x00, 0x21, 0xa6, 0x46, 
+    0xa6, 0x4a, 0xfe, 0x44, 0x10, 0x47, 0x07, 0x1c, 0x3e, 0x70, 0x01, 0x37, 0x38, 0x1c, 0x0d, 
+    0x21, 0xa6, 0x46, 0xa2, 0x4a, 0xfe, 0x44, 0x10, 0x47, 0x07, 0x1c, 0xa6, 0x46, 0xa1, 0x48, 
+    0xfe, 0x44, 0x00, 0x47, 0x81, 0x02, 0x9a, 0x48, 0xc0, 0x78, 0x40, 0x06, 0x40, 0x0e, 0x08, 
+    0x43, 0x05, 0x43, 0x29, 0x04, 0x09, 0x0c, 0x38, 0x1c, 0xa6, 0x46, 0x98, 0x4a, 0xfe, 0x44, 
+    0x10, 0x47, 0x05, 0x98, 
+
+    0x01, 0x05, 0xff, 0xff, 0xb8, 0x69, 0x08, 0x00, 0xfa, 0x46, 0x80, 0xff, 0x21, 0x02, 0x31, 
+    0x00, 0x22, 0xa6, 0x46, 0xed, 0x4b, 0xfe, 0x44, 0x18, 0x47, 0x3f, 0xe0, 0xec, 0x49, 0x00, 
+    0x20, 0x08, 0x70, 0x08, 0x74, 0xeb, 0x49, 0x08, 0x70, 0x3c, 0xe0, 0x05, 0x98, 0x00, 0x21, 
+    0x6a, 0x46, 0x01, 0x24, 0xa6, 0x46, 0xe8, 0x4b, 0xfe, 0x44, 0x18, 0x47, 0x02, 0xa8, 0x00, 
+    0x21, 0x06, 0x22, 0xa6, 0x46, 0xe5, 0x4b, 0xfe, 0x44, 0x18, 0x47, 0x00, 0x26, 0x02, 0xe0, 
+    0x70, 0x1c, 0x06, 0x04, 0x36, 0x0c, 0x28, 0x1c, 0x4f, 0x38, 0x00, 0x78, 0x86, 0x42, 0x23, 
+    0xda, 0x11, 0x20, 0x40, 0x01, 0x70, 0x43, 0xea, 0x49, 0x0f, 0x18, 0x10, 0x20, 0xc0, 0x19, 
+    0x69, 0x46, 0xa6, 0x46, 0xe8, 0x4a, 0xfe, 0x44, 0x10, 0x47, 0x00, 0x28, 0xe9, 0xd1, 0x68, 
+    0x46, 0x02, 0xa9, 0xa6, 0x46, 0xe4, 0x4a, 0xfe, 0x44, 0x10, 0x47, 0x00, 0x28, 0xe1, 0xd0, 
+    0xb8, 0x78, 0x01, 0x28, 0xde, 0xd0, 0x05, 0x98, 0x69, 0x49, 0x3a, 0x22, 0xa6, 0x46, 0xdf, 
+    0x4b, 0xfe, 0x44, 0x18, 0x47, 0xec, 0x49, 0xe2, 0x31, 0x04, 0x98, 0x01, 0x62, 0x06, 0xb0, 
+    0xf0, 0xbd, 0xc0, 0x46, 0x18, 0x32, 0x08, 0x00, 0xce, 0x04, 0x00, 0x00, 0x23, 0xb9, 0x02, 
+    0x00, 0x85, 0x71, 0x08, 0x00, 0xfd, 0x79, 0x00, 0x00, 0xc9, 0x70, 0x08, 0x00, 0xd4, 0x1d, 
+    0x08, 0x00, 0x94, 0x54, 0x08, 0x00, 0x8f, 0x8d, 0x01, 0x00, 0xfd, 0x06, 0x05, 0x00, 0x14, 
+    0x05, 0x1a, 0x00, 0xa2, 0xfd, 0x00, 0x00, 0x65, 0x2d, 0x00, 0x00, 0x7d, 0xca, 0x03, 0x00, 
+    0xc5, 0x71, 0x08, 0x00, 0x79, 0x47, 0x00, 0x00, 0x78, 0x24, 0x08, 0x00, 0xf0, 0xb5, 0x07, 
+    0x1c, 0xba, 0x69, 0x50, 0x78, 0xfe, 0x69, 0x25, 0x21, 0x43, 0x1a, 0xe4, 0x49, 0x32, 0xd0, 
+    0x01, 0x3b, 0x68, 0xd1, 
+
+    0x01, 0x05, 0xff, 0xff, 0xb2, 0x6a, 0x08, 0x00, 0xfa, 0x04, 0x23, 0xb3, 0x80, 0x0c, 0x23, 
+    0x9d, 0x19, 0x40, 0x00, 0x12, 0x78, 0x02, 0x43, 0x2a, 0x70, 0x01, 0x35, 0x08, 0x78, 0x2a, 
+    0x28, 0x05, 0xd0, 0x33, 0x28, 0x01, 0xd1, 0x0a, 0x20, 0x02, 0xe0, 0x07, 0x20, 0x00, 0xe0, 
+    0x08, 0x20, 0x28, 0x70, 0x01, 0x35, 0x28, 0x1c, 0x0d, 0x21, 0x01, 0x24, 0xa6, 0x46, 0x4b, 
+    0x4a, 0xfe, 0x44, 0x10, 0x47, 0x05, 0x1c, 0xa6, 0x46, 0x4b, 0x48, 0xfe, 0x44, 0x00, 0x47, 
+    0x82, 0x02, 0xd2, 0x48, 0x00, 0x78, 0x40, 0x06, 0x41, 0x0e, 0x11, 0x43, 0x45, 0x48, 0x08, 
+    0x43, 0x01, 0x04, 0x09, 0x0c, 0x28, 0x1c, 0xa6, 0x46, 0x41, 0x4a, 0xfe, 0x44, 0x10, 0x47, 
+    0x2f, 0xe0, 0x04, 0x23, 0xb3, 0x80, 0x0c, 0x23, 0x9d, 0x19, 0x40, 0x00, 0x12, 0x78, 0x02, 
+    0x43, 0x2a, 0x70, 0x01, 0x35, 0x08, 0x78, 0x2a, 0x28, 0x05, 0xd0, 0x33, 0x28, 0x01, 0xd1, 
+    0x0a, 0x20, 0x02, 0xe0, 0x07, 0x20, 0x00, 0xe0, 0x08, 0x20, 0x28, 0x70, 0x01, 0x35, 0x28, 
+    0x1c, 0x0d, 0x21, 0x01, 0x24, 0xa6, 0x46, 0x33, 0x4a, 0xfe, 0x44, 0x10, 0x47, 0x05, 0x1c, 
+    0xa6, 0x46, 0x32, 0x48, 0xfe, 0x44, 0x00, 0x47, 0x82, 0x02, 0xb9, 0x48, 0x00, 0x78, 0x40, 
+    0x06, 0x41, 0x0e, 0x11, 0x43, 0x2d, 0x48, 0x08, 0x43, 0x01, 0x04, 0x09, 0x0c, 0x28, 0x1c, 
+    0xa6, 0x46, 0x29, 0x4a, 0xfe, 0x44, 0x10, 0x47, 0x06, 0x20, 0x70, 0x80, 0x03, 0x20, 0x30, 
+    0x80, 0xe3, 0x48, 0xe2, 0x49, 0x08, 0x18, 0x38, 0x62, 0xf0, 0xbd, 0xc0, 0x46, 0x76, 0xa0, 
+    0x1b, 0x00, 0xc5, 0x8e, 0x00, 0x00, 0x5b, 0x19, 0x04, 0x00, 0x10, 0xb5, 0xde, 0x48, 0x00, 
+    0x21, 0x01, 0x24, 0xa6, 0x46, 0xdd, 0x4a, 0xfe, 0x44, 0x10, 0x47, 0xdc, 0x49, 0x01, 0x28, 
+    0x01, 0xd0, 0x00, 0x20, 
+
+    0x01, 0x05, 0xff, 0xff, 0xac, 0x6b, 0x08, 0x00, 0xfa, 0x01, 0xe0, 0x08, 0x68, 0x01, 0x30, 
+    0x08, 0x60, 0xa6, 0x46, 0xd9, 0x48, 0xfe, 0x44, 0x00, 0x47, 0x00, 0x28, 0x06, 0xd0, 0x0b, 
+    0x48, 0x00, 0x78, 0x02, 0x28, 0x02, 0xd1, 0x02, 0x20, 0xd5, 0x49, 0x08, 0x80, 0x10, 0xbd, 
+    0xba, 0x53, 0x08, 0x00, 0x90, 0xa1, 0x1b, 0x00, 0xa8, 0x59, 0x08, 0x00, 0x25, 0x6f, 0x04, 
+    0x00, 0x79, 0x6c, 0x04, 0x00, 0x05, 0x04, 0x00, 0x00, 0xfe, 0x07, 0x00, 0x00, 0x05, 0x10, 
+    0x00, 0x00, 0x45, 0x10, 0x08, 0x00, 0xc1, 0x72, 0x03, 0x00, 0x1b, 0x5f, 0x03, 0x00, 0x53, 
+    0x38, 0x02, 0x00, 0x21, 0xf0, 0x04, 0x00, 0xdb, 0x8e, 0x04, 0x00, 0xfc, 0x53, 0x08, 0x00, 
+    0xc6, 0x02, 0x00, 0x00, 0x8d, 0x8f, 0x04, 0x00, 0xf9, 0x2d, 0x00, 0x00, 0x00, 0x82, 0xff, 
+    0xff, 0xa9, 0x57, 0x05, 0x00, 0xf8, 0xb5, 0x80, 0x8a, 0xff, 0x21, 0x0b, 0x31, 0x88, 0x42, 
+    0x5c, 0xd0, 0xff, 0x21, 0x45, 0x31, 0x88, 0x42, 0x16, 0xd1, 0xc1, 0x48, 0x00, 0x78, 0x02, 
+    0x28, 0x12, 0xd1, 0xb9, 0x49, 0xff, 0x20, 0x41, 0x30, 0x40, 0x18, 0x00, 0x90, 0xb8, 0x48, 
+    0x40, 0x5c, 0x00, 0x26, 0x86, 0x42, 0x10, 0xd3, 0x51, 0x25, 0xad, 0x00, 0x28, 0x1c, 0x01, 
+    0x24, 0xa6, 0x46, 0xb4, 0x49, 0xfe, 0x44, 0x08, 0x47, 0x00, 0x28, 0x6d, 0xd1, 0x28, 0x1c, 
+    0xb2, 0x49, 0xa6, 0x46, 0xb2, 0x4a, 0xfe, 0x44, 0x10, 0x47, 0xf8, 0xbd, 0xb1, 0x00, 0x00, 
+    0x98, 0x45, 0x58, 0x00, 0x2d, 0x30, 0xd0, 0xfe, 0x20, 0x40, 0x5d, 0x00, 0x28, 0x2c, 0xd0, 
+    0xf2, 0x20, 0x41, 0x5d, 0x00, 0x29, 0x28, 0xd1, 0xff, 0x20, 0x02, 0x30, 0x40, 0x5d, 0x01, 
+    0x28, 0x23, 0xd0, 0x24, 0x20, 0x01, 0x24, 0xa6, 0x46, 0xa6, 0x4a, 0xfe, 0x44, 0x10, 0x47, 
+    0x00, 0x06, 0x00, 0x0e, 
+
+    0x01, 0x05, 0xff, 0xff, 0xa6, 0x6c, 0x08, 0x00, 0xfa, 0xf3, 0x22, 0x51, 0x5d, 0x81, 0x42, 
+    0x17, 0xd0, 0x50, 0x55, 0x00, 0x28, 0x14, 0xd1, 0x2f, 0x8d, 0x39, 0x1c, 0xe7, 0x48, 0xa6, 
+    0x46, 0xe7, 0x4a, 0xfe, 0x44, 0x10, 0x47, 0x29, 0x8e, 0x79, 0x18, 0x08, 0x1a, 0x40, 0x1e, 
+    0x39, 0x1c, 0xa6, 0x46, 0xe3, 0x4a, 0xfe, 0x44, 0x10, 0x47, 0x40, 0x00, 0x28, 0x86, 0x28, 
+    0x8e, 0x40, 0x08, 0x28, 0x86, 0x01, 0x36, 0xdf, 0x48, 0x00, 0x78, 0xb2, 0xe7, 0x00, 0x20, 
+    0x01, 0x24, 0xa6, 0x46, 0xdd, 0x49, 0xfe, 0x44, 0x08, 0x47, 0x01, 0x1c, 0x00, 0x90, 0xdc, 
+    0x4d, 0x28, 0x68, 0x01, 0x30, 0x28, 0x60, 0x0b, 0x27, 0x7f, 0x01, 0xda, 0x4e, 0xda, 0x48, 
+    0x00, 0x8d, 0x32, 0x68, 0x10, 0x18, 0x80, 0x01, 0x80, 0x09, 0xa6, 0x46, 0xd8, 0x4a, 0xfe, 
+    0x44, 0x10, 0x47, 0x00, 0x28, 0x11, 0xdd, 0x00, 0x98, 0x30, 0x60, 0x28, 0x68, 0x03, 0x28, 
+    0x0a, 0xd9, 0x00, 0x20, 0xa6, 0x46, 0xd3, 0x49, 0xfe, 0x44, 0x08, 0x47, 0xcf, 0x48, 0x38, 
+    0x5c, 0xa6, 0x46, 0xd0, 0x49, 0xfe, 0x44, 0x08, 0x47, 0x00, 0x20, 0x28, 0x60, 0xf8, 0xbd, 
+    0x30, 0xb5, 0x05, 0x69, 0x24, 0x20, 0x00, 0x21, 0x01, 0x24, 0xa6, 0x46, 0x7a, 0x4a, 0xfe, 
+    0x44, 0x10, 0x47, 0xf3, 0x21, 0x48, 0x55, 0x51, 0x25, 0xad, 0x00, 0x28, 0x1c, 0xa6, 0x46, 
+    0x72, 0x49, 0xfe, 0x44, 0x08, 0x47, 0x00, 0x28, 0x05, 0xd1, 0x28, 0x1c, 0x70, 0x49, 0xa6, 
+    0x46, 0x70, 0x4a, 0xfe, 0x44, 0x10, 0x47, 0x30, 0xbd, 0xed, 0x49, 0x02, 0x00, 0xab, 0x11, 
+    0x08, 0x00, 0x63, 0x66, 0x08, 0x00, 0x99, 0x2d, 0x00, 0x00, 0xe9, 0x63, 0x05, 0x00, 0x41, 
+    0x69, 0x00, 0x7e, 0x00, 0x28, 0x11, 0xd1, 0xff, 0x22, 0x04, 0x32, 0x50, 0x5c, 0x01, 0x28, 
+    0x0c, 0xd1, 0xff, 0x20, 
+
+    0x01, 0x05, 0xff, 0xff, 0xa0, 0x6d, 0x08, 0x00, 0xfa, 0x05, 0x30, 0x43, 0x5c, 0x1b, 0x2b, 
+    0x07, 0xd1, 0xff, 0x23, 0x0a, 0x33, 0x5b, 0x5c, 0x01, 0x2b, 0x02, 0xd1, 0x00, 0x23, 0x53, 
+    0x54, 0x43, 0x54, 0xf7, 0x46, 0xc0, 0x46, 0x00, 0x00, 0x08, 0x00, 0x49, 0x8f, 0x03, 0x00, 
+    0x85, 0x48, 0x02, 0x00, 0x10, 0xb5, 0x80, 0x69, 0x00, 0x88, 0x02, 0x28, 0x13, 0xd1, 0x54, 
+    0x48, 0x9c, 0x30, 0x01, 0x79, 0xff, 0x29, 0x0e, 0xd0, 0x00, 0x78, 0x03, 0x28, 0x03, 0xd0, 
+    0x01, 0x28, 0x01, 0xd0, 0x02, 0x28, 0x07, 0xd1, 0x01, 0x20, 0x04, 0x1c, 0x86, 0x46, 0xa2, 
+    0x49, 0xfe, 0x44, 0x08, 0x47, 0xa2, 0x48, 0x04, 0x70, 0x10, 0xbd, 0x25, 0x00, 0x00, 0x00, 
+    0x10, 0xb5, 0xc0, 0x69, 0x80, 0x78, 0x80, 0x38, 0x00, 0x06, 0x00, 0x0e, 0x02, 0x28, 0x13, 
+    0xd1, 0x44, 0x48, 0x9c, 0x30, 0x01, 0x79, 0xff, 0x29, 0x0e, 0xd0, 0x00, 0x78, 0x03, 0x28, 
+    0x03, 0xd0, 0x01, 0x28, 0x01, 0xd0, 0x02, 0x28, 0x07, 0xd1, 0x01, 0x20, 0x04, 0x1c, 0x86, 
+    0x46, 0x93, 0x49, 0xfe, 0x44, 0x08, 0x47, 0x92, 0x48, 0x04, 0x70, 0x10, 0xbd, 0xc0, 0x46, 
+    0x69, 0x53, 0x08, 0x00, 0xff, 0x53, 0x08, 0x00, 0x10, 0xb5, 0x00, 0x69, 0xfe, 0x21, 0x09, 
+    0x5c, 0x02, 0x29, 0x06, 0xd0, 0xd0, 0x21, 0x09, 0x58, 0x82, 0x8d, 0xd2, 0x00, 0x54, 0x23, 
+    0x1b, 0x18, 0x05, 0xe0, 0x54, 0x21, 0x0b, 0x18, 0x02, 0x8d, 0x06, 0x20, 0x42, 0x43, 0xd9, 
+    0x6f, 0x50, 0x18, 0x80, 0x01, 0x81, 0x09, 0xd8, 0x6d, 0x01, 0x24, 0xa6, 0x46, 0x7f, 0x4a, 
+    0xfe, 0x44, 0x10, 0x47, 0x00, 0x28, 0x12, 0xdc, 0x28, 0x48, 0x9c, 0x30, 0x01, 0x79, 0xff, 
+    0x29, 0x0d, 0xd0, 0x00, 0x78, 0x03, 0x28, 0x03, 0xd0, 0x01, 0x28, 0x01, 0xd0, 0x02, 0x28, 
+    0x06, 0xd1, 0x20, 0x1c, 
+
+    0x01, 0x05, 0xff, 0xff, 0x9a, 0x6e, 0x08, 0x00, 0xfa, 0xa6, 0x46, 0x77, 0x49, 0xfe, 0x44, 
+    0x08, 0x47, 0x77, 0x48, 0x04, 0x70, 0x10, 0xbd, 0x10, 0xb5, 0x1b, 0x48, 0x00, 0x68, 0x50, 
+    0x28, 0x06, 0xd9, 0x17, 0x48, 0x00, 0x21, 0x01, 0x22, 0x96, 0x46, 0x78, 0x4a, 0xfe, 0x44, 
+    0x10, 0x47, 0x71, 0x48, 0x00, 0x78, 0xff, 0x21, 0x21, 0x31, 0x41, 0x43, 0x6e, 0x48, 0x41, 
+    0x18, 0x6f, 0x4c, 0x20, 0x78, 0x14, 0x28, 0x0d, 0xda, 0x00, 0x28, 0x14, 0xd0, 0x6d, 0x49, 
+    0x09, 0x78, 0xc9, 0x08, 0x05, 0xd3, 0x01, 0x20, 0x86, 0x46, 0x6b, 0x49, 0xfe, 0x44, 0x08, 
+    0x47, 0x20, 0x78, 0x40, 0x1c, 0x07, 0xe0, 0xff, 0x20, 0x08, 0x70, 0x01, 0x20, 0x86, 0x46, 
+    0x67, 0x48, 0xfe, 0x44, 0x00, 0x47, 0x00, 0x20, 0x20, 0x70, 0x10, 0xbd, 0xc0, 0x46, 0x4e, 
+    0x05, 0x00, 0x00, 0xb5, 0xcc, 0x00, 0x00, 0xf8, 0x21, 0x19, 0x00, 0xb3, 0x08, 0x05, 0x00, 
+    0x5c, 0x66, 0x08, 0x00, 0x71, 0xcd, 0x01, 0x00, 0x4a, 0x24, 0x19, 0x00, 0x54, 0x24, 0x08, 
+    0x00, 0x07, 0x0e, 0x00, 0x00, 0x21, 0xcb, 0x03, 0x00, 0x00, 0x66, 0xe3, 0x01, 0x0b, 0xc9, 
+    0x03, 0x00, 0x2b, 0xf0, 0x04, 0x00, 0x45, 0x10, 0x08, 0x00, 0xf0, 0xb5, 0x06, 0x1c, 0x74, 
+    0x69, 0x30, 0x69, 0x5d, 0x4d, 0x29, 0x78, 0x33, 0x7e, 0x0a, 0x22, 0x9b, 0x1a, 0x6d, 0xd0, 
+    0x06, 0x3b, 0x53, 0xd0, 0x31, 0x3b, 0x2e, 0xd0, 0x3b, 0x3b, 0x03, 0x2b, 0x78, 0xd8, 0xff, 
+    0x21, 0x7d, 0x31, 0x09, 0x5d, 0x02, 0x29, 0x73, 0xd1, 0xff, 0x22, 0x81, 0x32, 0x01, 0x78, 
+    0x11, 0x55, 0xff, 0x21, 0x82, 0x31, 0x09, 0x19, 0x42, 0x78, 0x01, 0x30, 0x0a, 0x70, 0xff, 
+    0x22, 0x83, 0x32, 0x12, 0x19, 0x43, 0x78, 0x13, 0x70, 0x40, 0x78, 0xff, 0x23, 0x25, 0x33, 
+    0x18, 0x55, 0x08, 0x78, 
+
+    0x01, 0x05, 0xff, 0xff, 0x94, 0x6f, 0x08, 0x00, 0xfa, 0x19, 0x28, 0x5d, 0xd1, 0x10, 0x78, 
+    0x37, 0x28, 0x5a, 0xd1, 0x20, 0x1c, 0x05, 0x21, 0x00, 0x22, 0x01, 0x25, 0xae, 0x46, 0x3d, 
+    0x4b, 0xfe, 0x44, 0x18, 0x47, 0x20, 0x1c, 0xae, 0x46, 0x3c, 0x49, 0xfe, 0x44, 0x08, 0x47, 
+    0x48, 0xe0, 0x00, 0x29, 0x0a, 0xd1, 0x8a, 0x20, 0x00, 0x19, 0x3b, 0x49, 0x30, 0x22, 0x01, 
+    0x23, 0x9e, 0x46, 0x3a, 0x4b, 0xfe, 0x44, 0x18, 0x47, 0x00, 0x28, 0x3f, 0xd1, 0xff, 0x20, 
+    0x5d, 0x30, 0x01, 0x5d, 0x05, 0x20, 0x03, 0x1c, 0x20, 0x1c, 0x41, 0x22, 0x01, 0x27, 0xbe, 
+    0x46, 0x34, 0x4f, 0xfe, 0x44, 0x38, 0x47, 0x20, 0x1c, 0x05, 0x21, 0x01, 0x22, 0x96, 0x46, 
+    0x2a, 0x4b, 0xfe, 0x44, 0x18, 0x47, 0x00, 0x20, 0x28, 0x70, 0x25, 0xe0, 0xff, 0x21, 0x7d, 
+    0x31, 0x00, 0x78, 0x08, 0x55, 0x2c, 0x4a, 0x20, 0x1c, 0x09, 0x5c, 0x53, 0x78, 0x99, 0x42, 
+    0x02, 0xdb, 0x12, 0x78, 0x91, 0x42, 0x1c, 0xdd, 0xff, 0x21, 0x79, 0x31, 0x09, 0x5c, 0x10, 
+    0x22, 0x20, 0x23, 0x01, 0x24, 0xa6, 0x46, 0x23, 0x4c, 0xfe, 0x44, 0x20, 0x47, 0x0d, 0xe0, 
+    0x24, 0x48, 0x00, 0x78, 0x33, 0x28, 0x0d, 0xdb, 0xff, 0x20, 0x79, 0x30, 0x01, 0x5d, 0x20, 
+    0x1c, 0x29, 0x23, 0x01, 0x24, 0xa6, 0x46, 0x1c, 0x4c, 0xfe, 0x44, 0x20, 0x47, 0x17, 0x48, 
+    0x16, 0x49, 0x08, 0x18, 0x30, 0x62, 0xf0, 0xbd, 0xc0, 0x46, 0xff, 0xff, 0xff, 0x01, 0x95, 
+    0x49, 0x05, 0x00, 0x5b, 0x32, 0x08, 0x00, 0xd1, 0xa1, 0x04, 0x00, 0x50, 0x66, 0x08, 0x00, 
+    0x54, 0x66, 0x08, 0x00, 0x48, 0x10, 0x08, 0x00, 0x3f, 0xa2, 0x04, 0x00, 0xab, 0xea, 0x01, 
+    0x00, 0x3d, 0x1d, 0x03, 0x00, 0x58, 0x66, 0x08, 0x00, 0xb9, 0x26, 0x08, 0x00, 0x61, 0x66, 
+    0x08, 0x00, 0x60, 0x66, 
+
+    0x01, 0x05, 0xff, 0xff, 0x8e, 0x70, 0x08, 0x00, 0xfa, 0x08, 0x00, 0x35, 0x57, 0x08, 0x00, 
+    0x5d, 0x9a, 0x03, 0x00, 0x43, 0x1c, 0x03, 0x00, 0xfd, 0x06, 0x05, 0x00, 0x7f, 0xa6, 0x01, 
+    0x00, 0xb3, 0x53, 0x04, 0x00, 0xa4, 0x0f, 0x00, 0x00, 0xf9, 0xd2, 0x00, 0x00, 0xdc, 0x0f, 
+    0x08, 0x00, 0x5f, 0x6a, 0x05, 0x00, 0xed, 0xe7, 0x00, 0x00, 0xb2, 0x11, 0x08, 0x00, 0x63, 
+    0x66, 0x08, 0x00, 0x69, 0x53, 0x08, 0x00, 0x40, 0x1e, 0x80, 0x00, 0x8c, 0x4b, 0x19, 0x50, 
+    0x8a, 0x49, 0x0a, 0x50, 0xf7, 0x46, 0xf0, 0xb5, 0x01, 0x1c, 0x88, 0x69, 0x82, 0x88, 0x53, 
+    0x04, 0x5b, 0x0c, 0x88, 0x4e, 0x88, 0x4f, 0x89, 0x4d, 0x03, 0xd0, 0x60, 0x2b, 0x01, 0xdc, 
+    0xb2, 0x42, 0x14, 0xd0, 0x82, 0x88, 0x01, 0x23, 0x1b, 0x03, 0x54, 0x04, 0x64, 0x0f, 0x24, 
+    0x03, 0x9c, 0x42, 0x08, 0xdb, 0x3b, 0x1c, 0x01, 0x33, 0x54, 0x04, 0x24, 0x0d, 0xe4, 0x00, 
+    0x9c, 0x42, 0x01, 0xda, 0xba, 0x42, 0x03, 0xd0, 0xff, 0x20, 0x88, 0x60, 0xe8, 0x1d, 0xf0, 
+    0xbd, 0x01, 0x24, 0xa6, 0x46, 0x7b, 0x49, 0xfe, 0x44, 0x08, 0x47, 0x38, 0x1c, 0xa6, 0x46, 
+    0x7a, 0x49, 0xfe, 0x44, 0x08, 0x47, 0x30, 0x1c, 0xa6, 0x46, 0x77, 0x49, 0xfe, 0x44, 0x08, 
+    0x47, 0xa6, 0x46, 0x76, 0x48, 0xfe, 0x44, 0x00, 0x47, 0x38, 0x1c, 0xa6, 0x46, 0x73, 0x49, 
+    0xfe, 0x44, 0x08, 0x47, 0xe8, 0x48, 0x01, 0x68, 0x30, 0x1c, 0xa6, 0x46, 0x71, 0x4a, 0xfe, 
+    0x44, 0x10, 0x47, 0x71, 0x48, 0x40, 0x19, 0xf0, 0xbd, 0x01, 0x1c, 0x0a, 0x7d, 0x6f, 0x48, 
+    0x00, 0x2a, 0x02, 0xd0, 0xc9, 0x68, 0x01, 0x29, 0x01, 0xd0, 0x4f, 0x30, 0xf7, 0x46, 0x31, 
+    0x30, 0xf7, 0x46, 0x41, 0x68, 0x02, 0x39, 0x41, 0x60, 0xe9, 0x48, 0x3f, 0x30, 0xf7, 0x46, 
+    0x1c, 0xb5, 0x41, 0x68, 
+
+    0x01, 0x05, 0xff, 0xff, 0x88, 0x71, 0x08, 0x00, 0xfa, 0xe8, 0x4c, 0x00, 0x29, 0x17, 0xd0, 
+    0x41, 0x69, 0xb0, 0x20, 0x40, 0x18, 0xb8, 0x31, 0x6a, 0x46, 0x01, 0x23, 0x9e, 0x46, 0xe2, 
+    0x4b, 0xfe, 0x44, 0x18, 0x47, 0x00, 0x99, 0xe2, 0x48, 0xe4, 0x38, 0x41, 0x43, 0x68, 0x46, 
+    0x80, 0x88, 0x41, 0x18, 0xff, 0x20, 0xae, 0x30, 0x81, 0x42, 0x02, 0xd9, 0x20, 0x1c, 0xbf, 
+    0x30, 0x1c, 0xbd, 0x20, 0x1c, 0xdf, 0x30, 0x1c, 0xbd, 0x10, 0xb5, 0x04, 0x1c, 0xc8, 0x68, 
+    0x0a, 0x21, 0x01, 0x22, 0x96, 0x46, 0xe0, 0x4a, 0xfe, 0x44, 0x10, 0x47, 0x00, 0x28, 0x00, 
+    0xd1, 0x8c, 0x20, 0xa0, 0x60, 0xde, 0x48, 0xdb, 0x30, 0x10, 0xbd, 0xde, 0x49, 0x04, 0x39, 
+    0x09, 0x78, 0x00, 0x29, 0x01, 0xd1, 0x00, 0x21, 0x41, 0x60, 0x41, 0x68, 0x42, 0x69, 0x51, 
+    0x1a, 0x41, 0x60, 0xd8, 0x48, 0x55, 0x30, 0xf7, 0x46, 0xd8, 0x49, 0x09, 0x78, 0x00, 0x29, 
+    0x04, 0xd1, 0x01, 0x7d, 0xd5, 0x48, 0x02, 0x30, 0xff, 0x22, 0x42, 0x54, 0xd5, 0x48, 0x4f, 
+    0x30, 0xf7, 0x46, 0x01, 0x1c, 0x8a, 0x69, 0x4b, 0x68, 0xd3, 0x48, 0x9a, 0x42, 0x01, 0xd9, 
+    0x3b, 0x30, 0xf7, 0x46, 0xca, 0x60, 0x79, 0x30, 0xf7, 0x46, 0xd1, 0x48, 0xcf, 0x49, 0x08, 
+    0x80, 0xd0, 0x48, 0xff, 0x30, 0xde, 0x30, 0xf7, 0x46, 0xc2, 0x69, 0xff, 0x21, 0x11, 0x31, 
+    0x8b, 0x5c, 0xcd, 0x49, 0x5b, 0x08, 0x08, 0xd3, 0xff, 0x23, 0x02, 0x33, 0x9a, 0x5c, 0x02, 
+    0x2a, 0x03, 0xd0, 0x01, 0x2a, 0x01, 0xd0, 0x03, 0x2a, 0x02, 0xd1, 0x08, 0x1c, 0x5b, 0x30, 
+    0xf7, 0x46, 0xff, 0x22, 0x42, 0x60, 0x08, 0x1c, 0x39, 0x30, 0xf7, 0x46, 0x00, 0xb5, 0x40, 
+    0x68, 0x01, 0x21, 0x8e, 0x46, 0xc2, 0x49, 0xfe, 0x44, 0x08, 0x47, 0xc2, 0x48, 0x57, 0x30, 
+    0x00, 0xbd, 0x02, 0x8a, 
+
+    0x01, 0x05, 0xff, 0xff, 0x82, 0x72, 0x08, 0x00, 0xfa, 0x01, 0x79, 0x0a, 0x29, 0x00, 0xdb, 
+    0x0a, 0x21, 0xe8, 0x48, 0x8a, 0x42, 0x01, 0xdd, 0x5f, 0x30, 0xf7, 0x46, 0x5b, 0x30, 0xf7, 
+    0x46, 0xf0, 0xb5, 0x01, 0x24, 0xa6, 0x46, 0xe4, 0x48, 0xfe, 0x44, 0x00, 0x47, 0x01, 0x28, 
+    0x05, 0xd0, 0xa6, 0x46, 0xe1, 0x48, 0xfe, 0x44, 0x00, 0x47, 0x04, 0x28, 0x19, 0xd1, 0x02, 
+    0x26, 0xdf, 0x4d, 0x28, 0x79, 0x00, 0x28, 0x11, 0xd0, 0xe8, 0x7a, 0x06, 0x28, 0x0e, 0xd1, 
+    0x0e, 0x20, 0x01, 0x1c, 0xea, 0x4f, 0x38, 0x1c, 0x14, 0x38, 0xa6, 0x46, 0xe7, 0x4a, 0xfe, 
+    0x44, 0x10, 0x47, 0x38, 0x1c, 0x0e, 0x21, 0xa6, 0x46, 0xe4, 0x4a, 0xfe, 0x44, 0x10, 0x47, 
+    0x70, 0x35, 0x01, 0x3e, 0xe7, 0xd1, 0xa6, 0x46, 0xe3, 0x48, 0xfe, 0x44, 0x00, 0x47, 0xe2, 
+    0x49, 0x0b, 0x48, 0x54, 0x30, 0x40, 0x18, 0xf0, 0xbd, 0xc0, 0x46, 0x04, 0xf3, 0x1a, 0x00, 
+    0x80, 0x7b, 0x08, 0x00, 0x03, 0x80, 0x00, 0x00, 0x17, 0x10, 0x00, 0x00, 0xc9, 0xfb, 0x04, 
+    0x00, 0xbb, 0x15, 0x04, 0x00, 0x7d, 0xca, 0x03, 0x00, 0x05, 0x43, 0x02, 0x00, 0x0b, 0xc9, 
+    0x03, 0x00, 0xab, 0x02, 0x00, 0x00, 0xb1, 0x33, 0x02, 0x00, 0xf0, 0xb5, 0x8d, 0xb0, 0x01, 
+    0x90, 0x81, 0x69, 0x02, 0x91, 0x01, 0x7d, 0x03, 0x91, 0x42, 0x68, 0x00, 0x92, 0x80, 0x8b, 
+    0x40, 0x00, 0x04, 0x90, 0x6b, 0x48, 0x83, 0x30, 0x00, 0x78, 0x40, 0x00, 0x05, 0x90, 0x00, 
+    0x29, 0x01, 0xd1, 0x00, 0x20, 0xe1, 0xe0, 0x04, 0x98, 0x02, 0x04, 0x12, 0x0c, 0x06, 0x92, 
+    0x02, 0x98, 0x03, 0x99, 0x6b, 0x46, 0x01, 0x24, 0xa6, 0x46, 0xc6, 0x4d, 0xfe, 0x44, 0x28, 
+    0x47, 0x07, 0x90, 0x00, 0x9e, 0x00, 0x20, 0x08, 0x90, 0x80, 0x48, 0x09, 0x90, 0x0a, 0x90, 
+    0x7f, 0xe0, 0x09, 0x98, 
+
+    0x01, 0x05, 0xff, 0xff, 0x7c, 0x73, 0x08, 0x00, 0xfa, 0x00, 0x28, 0x2b, 0xd0, 0x0b, 0x98, 
+    0x09, 0x90, 0x28, 0xe0, 0x05, 0x98, 0x87, 0x42, 0x25, 0xdb, 0x90, 0x79, 0x03, 0x28, 0x01, 
+    0xd0, 0x01, 0x28, 0x20, 0xd1, 0x79, 0x19, 0x05, 0x98, 0x08, 0x1a, 0x07, 0x99, 0xa6, 0x46, 
+    0xb8, 0x4a, 0xfe, 0x44, 0x10, 0x47, 0x07, 0x1c, 0x28, 0x1c, 0x07, 0x99, 0xa6, 0x46, 0xb5, 
+    0x4a, 0xfe, 0x44, 0x10, 0x47, 0x01, 0x04, 0x09, 0x0c, 0x3a, 0x04, 0x12, 0x0c, 0x00, 0x20, 
+    0xa6, 0x46, 0xb1, 0x4b, 0xfe, 0x44, 0x18, 0x47, 0x00, 0x28, 0x04, 0xd1, 0x0a, 0x98, 0x00, 
+    0x28, 0x03, 0xd0, 0x0a, 0x97, 0x01, 0xe0, 0x00, 0x20, 0x0a, 0x90, 0xb6, 0x68, 0x00, 0x2e, 
+    0x03, 0xd0, 0x30, 0x88, 0x07, 0x99, 0x88, 0x42, 0x49, 0xdb, 0x08, 0x98, 0x00, 0x28, 0x46, 
+    0xd1, 0x61, 0x49, 0x09, 0x98, 0x88, 0x42, 0x42, 0xd1, 0x0a, 0x98, 0x88, 0x42, 0x3f, 0xd1, 
+    0x03, 0x98, 0x00, 0x28, 0x2c, 0xd0, 0x02, 0x9d, 0x03, 0x98, 0x0c, 0x90, 0x00, 0x27, 0x28, 
+    0x88, 0x0b, 0x90, 0x04, 0x99, 0xa6, 0x46, 0x9c, 0x4a, 0xfe, 0x44, 0x10, 0x47, 0x00, 0x28, 
+    0x07, 0xd0, 0x0b, 0x99, 0x04, 0x98, 0xa6, 0x46, 0x98, 0x4a, 0xfe, 0x44, 0x10, 0x47, 0x00, 
+    0x28, 0x11, 0xd1, 0x08, 0x98, 0xb8, 0x42, 0x09, 0xd0, 0x08, 0x98, 0xc1, 0x00, 0x02, 0x98, 
+    0x40, 0x18, 0x29, 0x1c, 0x08, 0x22, 0xa6, 0x46, 0xef, 0x4b, 0xfe, 0x44, 0x18, 0x47, 0x08, 
+    0x98, 0x40, 0x1c, 0x00, 0x06, 0x00, 0x0e, 0x08, 0x90, 0x08, 0x35, 0x01, 0x37, 0x0c, 0x98, 
+    0x01, 0x38, 0x0c, 0x90, 0xd6, 0xd1, 0x08, 0x98, 0x00, 0x28, 0x0c, 0xd0, 0x02, 0x98, 0x08, 
+    0x99, 0x06, 0x9a, 0x6b, 0x46, 0xa6, 0x46, 0x85, 0x4d, 0xfe, 0x44, 0x28, 0x47, 0x07, 0x90, 
+    0x00, 0x9e, 0x3f, 0x48, 
+
+    0x01, 0x05, 0xff, 0xff, 0x76, 0x74, 0x08, 0x00, 0xfa, 0x09, 0x90, 0x0a, 0x90, 0x00, 0x2e, 
+    0x3a, 0xd0, 0x35, 0x88, 0x07, 0x98, 0x85, 0x42, 0x36, 0xda, 0xb0, 0x68, 0x00, 0x28, 0x05, 
+    0xd0, 0x00, 0x88, 0x07, 0x99, 0x88, 0x42, 0x01, 0xdc, 0x47, 0x1b, 0x04, 0xe0, 0x07, 0x98, 
+    0x40, 0x1b, 0x00, 0x99, 0x09, 0x88, 0x0f, 0x18, 0x72, 0x68, 0x91, 0x88, 0x05, 0x98, 0x40, 
+    0x18, 0x87, 0x42, 0x00, 0xda, 0x6a, 0xe7, 0x48, 0x19, 0x07, 0x99, 0xa6, 0x46, 0x73, 0x4a, 
+    0xfe, 0x44, 0x10, 0x47, 0x0b, 0x90, 0x79, 0x19, 0x05, 0x98, 0x08, 0x1a, 0x07, 0x99, 0xa6, 
+    0x46, 0x6e, 0x4a, 0xfe, 0x44, 0x10, 0x47, 0x02, 0x04, 0x12, 0x0c, 0x0b, 0x98, 0x01, 0x04, 
+    0x09, 0x0c, 0x00, 0x20, 0xa6, 0x46, 0x6a, 0x4b, 0xfe, 0x44, 0x18, 0x47, 0x00, 0x28, 0x00, 
+    0xd1, 0x48, 0xe7, 0x00, 0x20, 0x09, 0x90, 0x06, 0xe0, 0xc0, 0x46, 0xe0, 0x31, 0x08, 0x00, 
+    0x1f, 0x48, 0x09, 0x99, 0x81, 0x42, 0x02, 0xd0, 0x09, 0x98, 0x0a, 0x90, 0x02, 0xe0, 0x0a, 
+    0x99, 0x81, 0x42, 0x01, 0xd0, 0x0a, 0x98, 0x04, 0xe0, 0x06, 0x98, 0xa6, 0x46, 0xe8, 0x49, 
+    0xfe, 0x44, 0x08, 0x47, 0x01, 0x99, 0x48, 0x60, 0xe5, 0x48, 0xff, 0x30, 0x10, 0x30, 0x0d, 
+    0xb0, 0xf0, 0xbd, 0xb7, 0x4b, 0x04, 0x00, 0x4f, 0x81, 0x03, 0x00, 0xfd, 0x79, 0x00, 0x00, 
+    0xc6, 0x05, 0x00, 0x00, 0xe0, 0x49, 0x09, 0x78, 0x2a, 0x29, 0x05, 0xd0, 0x33, 0x29, 0x01, 
+    0xd1, 0x0a, 0x21, 0x02, 0xe0, 0x06, 0x21, 0x00, 0xe0, 0x08, 0x21, 0x41, 0x60, 0xf1, 0x48, 
+    0x43, 0x30, 0xf7, 0x46, 0xc0, 0x46, 0x65, 0x2d, 0x00, 0x00, 0x79, 0x47, 0x00, 0x00, 0x0d, 
+    0x13, 0x02, 0x00, 0x76, 0x24, 0x08, 0x00, 0xe0, 0xa0, 0x1b, 0x00, 0x89, 0x28, 0x05, 0x00, 
+    0x3d, 0x39, 0x02, 0x00, 
+
+    0x01, 0x05, 0xff, 0xff, 0x70, 0x75, 0x08, 0x00, 0xfa, 0x60, 0x5b, 0x08, 0x00, 0xff, 0xff, 
+    0x00, 0x00, 0xd9, 0xaa, 0x00, 0x00, 0xd5, 0x75, 0x00, 0x00, 0x23, 0x01, 0x05, 0x00, 0xb3, 
+    0x09, 0x02, 0x00, 0xfc, 0xb5, 0x00, 0x90, 0xe2, 0x48, 0x00, 0x78, 0x02, 0x28, 0x43, 0xd1, 
+    0xe1, 0x49, 0xff, 0x20, 0x41, 0x30, 0x40, 0x18, 0x01, 0x90, 0xe0, 0x48, 0x40, 0x5c, 0x00, 
+    0x26, 0x38, 0xe0, 0xb1, 0x00, 0x01, 0x98, 0x45, 0x58, 0x00, 0x2d, 0x30, 0xd0, 0xfe, 0x20, 
+    0x40, 0x5d, 0x00, 0x28, 0x2c, 0xd0, 0xf2, 0x20, 0x41, 0x5d, 0x00, 0x29, 0x28, 0xd1, 0xff, 
+    0x20, 0x02, 0x30, 0x40, 0x5d, 0x01, 0x28, 0x23, 0xd0, 0x24, 0x20, 0x01, 0x24, 0xa6, 0x46, 
+    0xe7, 0x4a, 0xfe, 0x44, 0x10, 0x47, 0x00, 0x06, 0x00, 0x0e, 0xf3, 0x22, 0x51, 0x5d, 0x81, 
+    0x42, 0x17, 0xd0, 0x50, 0x55, 0x00, 0x28, 0x14, 0xd1, 0x2f, 0x8d, 0x39, 0x1c, 0xe1, 0x48, 
+    0xa6, 0x46, 0x24, 0x4a, 0xfe, 0x44, 0x10, 0x47, 0x29, 0x8e, 0x79, 0x18, 0x08, 0x1a, 0x40, 
+    0x1e, 0x39, 0x1c, 0xa6, 0x46, 0x20, 0x4a, 0xfe, 0x44, 0x10, 0x47, 0x40, 0x00, 0x28, 0x86, 
+    0x28, 0x8e, 0x40, 0x08, 0x28, 0x86, 0x01, 0x36, 0xd8, 0x48, 0x00, 0x78, 0x86, 0x42, 0xc4, 
+    0xd3, 0xff, 0x21, 0x41, 0x31, 0x00, 0x98, 0x41, 0x60, 0xd6, 0x48, 0xd5, 0x49, 0x08, 0x18, 
+    0xfc, 0xbd, 0xf9, 0x97, 0x00, 0x00, 0x8f, 0x8d, 0x01, 0x00, 0xa4, 0x13, 0x08, 0x00, 0x10, 
+    0xb5, 0x00, 0x79, 0x01, 0x28, 0x06, 0xd1, 0x88, 0x8b, 0x09, 0x7d, 0x01, 0x22, 0x96, 0x46, 
+    0xce, 0x4a, 0xfe, 0x44, 0x10, 0x47, 0xce, 0x4c, 0x20, 0x78, 0x01, 0x28, 0x04, 0xd1, 0x01, 
+    0x20, 0x86, 0x46, 0xcc, 0x48, 0xfe, 0x44, 0x00, 0x47, 0x00, 0x20, 0x20, 0x70, 0xca, 0x49, 
+    0xc5, 0x48, 0x88, 0x38, 
+
+    0x01, 0x05, 0xff, 0xff, 0x6a, 0x76, 0x08, 0x00, 0xfa, 0x40, 0x18, 0x10, 0xbd, 0xc0, 0x46, 
+    0xe5, 0x06, 0x05, 0x00, 0x14, 0x05, 0x1a, 0x00, 0x77, 0xc5, 0x01, 0x00, 0xb9, 0xc5, 0x01, 
+    0x00, 0xa1, 0x95, 0x01, 0x00, 0x95, 0x49, 0x05, 0x00, 0x21, 0x96, 0x01, 0x00, 0xf0, 0xb5, 
+    0x86, 0xb0, 0x01, 0x92, 0x02, 0x91, 0x06, 0x1c, 0x88, 0x68, 0x00, 0x6a, 0x03, 0x90, 0x80, 
+    0x00, 0x01, 0x99, 0x44, 0x18, 0x04, 0x94, 0x04, 0x19, 0x05, 0x94, 0x04, 0x19, 0x01, 0x98, 
+    0x03, 0x99, 0x01, 0x25, 0xae, 0x46, 0xb8, 0x4a, 0xfe, 0x44, 0x10, 0x47, 0x04, 0x98, 0x03, 
+    0x99, 0xae, 0x46, 0xb5, 0x4a, 0xfe, 0x44, 0x10, 0x47, 0x05, 0x98, 0x03, 0x99, 0xae, 0x46, 
+    0xb2, 0x4a, 0xfe, 0x44, 0x10, 0x47, 0x02, 0x98, 0x80, 0x68, 0xc7, 0x69, 0x70, 0x68, 0x03, 
+    0x99, 0xae, 0x46, 0xae, 0x4a, 0xfe, 0x44, 0x10, 0x47, 0x00, 0x28, 0x50, 0xd1, 0x30, 0x68, 
+    0x39, 0x1c, 0x03, 0x9a, 0xae, 0x46, 0xab, 0x4b, 0xfe, 0x44, 0x18, 0x47, 0x00, 0x28, 0x47, 
+    0xd5, 0x70, 0x68, 0x39, 0x1c, 0x03, 0x9a, 0xae, 0x46, 0xa6, 0x4b, 0xfe, 0x44, 0x18, 0x47, 
+    0x00, 0x28, 0x3e, 0xd5, 0x30, 0x68, 0x01, 0x99, 0x02, 0x9a, 0x23, 0x1c, 0xae, 0x46, 0xa2, 
+    0x4f, 0xfe, 0x44, 0x38, 0x47, 0x00, 0x94, 0x30, 0x68, 0x01, 0x99, 0x04, 0x9a, 0x02, 0x9b, 
+    0xae, 0x46, 0x9f, 0x4f, 0xfe, 0x44, 0x38, 0x47, 0x00, 0x94, 0x30, 0x68, 0x02, 0x99, 0x89, 
+    0x68, 0xc9, 0x6a, 0x01, 0x9a, 0x02, 0x9b, 0xae, 0x46, 0x99, 0x4f, 0xfe, 0x44, 0x38, 0x47, 
+    0x01, 0x98, 0x04, 0x99, 0x05, 0x9a, 0x02, 0x9b, 0xae, 0x46, 0x96, 0x4f, 0xfe, 0x44, 0x38, 
+    0x47, 0x02, 0x98, 0x80, 0x68, 0x01, 0x6b, 0x05, 0x98, 0x01, 0x9a, 0x02, 0x9b, 0xae, 0x46, 
+    0x91, 0x4f, 0xfe, 0x44, 
+
+    0x01, 0x05, 0xff, 0xff, 0x64, 0x77, 0x08, 0x00, 0xfa, 0x38, 0x47, 0x70, 0x68, 0x04, 0x99, 
+    0x02, 0x9a, 0x23, 0x1c, 0xae, 0x46, 0x8b, 0x4c, 0xfe, 0x44, 0x20, 0x47, 0x01, 0x98, 0x04, 
+    0x99, 0x03, 0x9a, 0xae, 0x46, 0x87, 0x4b, 0xfe, 0x44, 0x18, 0x47, 0x00, 0x28, 0x02, 0xd0, 
+    0x00, 0x20, 0xc0, 0x43, 0x00, 0xe0, 0x00, 0x20, 0x06, 0xb0, 0xf0, 0xbd, 0xf0, 0xb5, 0x85, 
+    0xb0, 0x45, 0x69, 0x86, 0x69, 0xc0, 0x69, 0x02, 0x90, 0x0f, 0x6a, 0x48, 0x6a, 0x03, 0x90, 
+    0x88, 0x6b, 0x04, 0x90, 0x28, 0x1c, 0x00, 0x95, 0x31, 0x6a, 0x89, 0x00, 0x4d, 0x19, 0x01, 
+    0x95, 0x4d, 0x19, 0x31, 0x68, 0x01, 0x29, 0x0d, 0xd1, 0x72, 0x69, 0x39, 0x1c, 0x01, 0x24, 
+    0xa6, 0x46, 0x0d, 0x4b, 0xfe, 0x44, 0x18, 0x47, 0x72, 0x69, 0x01, 0x98, 0xb9, 0x18, 0xa6, 
+    0x46, 0x09, 0x4b, 0xfe, 0x44, 0x18, 0x47, 0x68, 0x46, 0x02, 0x99, 0x2a, 0x1c, 0x01, 0x24, 
+    0xa6, 0x46, 0x71, 0x4b, 0xfe, 0x44, 0x18, 0x47, 0x73, 0x49, 0x70, 0x4d, 0x00, 0x28, 0x06, 
+    0xd0, 0x0c, 0x70, 0x28, 0x1c, 0x21, 0x30, 0x0d, 0xe0, 0xc0, 0x46, 0x5d, 0x5f, 0x05, 0x00, 
+    0x00, 0x20, 0x08, 0x70, 0xb2, 0x69, 0x03, 0x98, 0x04, 0x99, 0xa6, 0x46, 0x69, 0x4b, 0xfe, 
+    0x44, 0x18, 0x47, 0x28, 0x1c, 0xa9, 0x30, 0x05, 0xb0, 0xf0, 0xbd, 0x69, 0x48, 0x00, 0x78, 
+    0x00, 0x07, 0x40, 0x0e, 0x89, 0x6b, 0x49, 0x06, 0x89, 0x0c, 0x08, 0x18, 0x64, 0x49, 0x08, 
+    0x80, 0x65, 0x48, 0xc5, 0x30, 0xf7, 0x46, 0x01, 0x1c, 0x0a, 0x79, 0x63, 0x48, 0x06, 0x2a, 
+    0x03, 0xdb, 0x92, 0x1f, 0x4a, 0x60, 0x2f, 0x30, 0xf7, 0x46, 0x79, 0x30, 0xf7, 0x46, 0x01, 
+    0x1c, 0x88, 0x69, 0x43, 0x78, 0x3e, 0x22, 0x1a, 0x40, 0x5d, 0x48, 0x06, 0x2a, 0x05, 0xdb, 
+    0x9a, 0x06, 0x92, 0x0e, 
+
+    0x01, 0x05, 0xff, 0xff, 0x5e, 0x78, 0x08, 0x00, 0xfa, 0x06, 0x3a, 0x4a, 0x60, 0x23, 0x30, 
+    0xf7, 0x46, 0x49, 0x30, 0xf7, 0x46, 0x30, 0xb5, 0x45, 0x68, 0xff, 0x20, 0x11, 0x30, 0x40, 
+    0x5d, 0x80, 0x09, 0x0c, 0xd3, 0x11, 0x21, 0x09, 0x01, 0x4a, 0x5d, 0xdf, 0x20, 0x10, 0x40, 
+    0x48, 0x55, 0x28, 0x1c, 0x00, 0x21, 0x01, 0x22, 0x96, 0x46, 0x50, 0x4a, 0xfe, 0x44, 0x10, 
+    0x47, 0x01, 0x20, 0x04, 0x1c, 0x86, 0x46, 0x4e, 0x49, 0xfe, 0x44, 0x08, 0x47, 0xa9, 0x8b, 
+    0x28, 0x1c, 0xa6, 0x46, 0x4c, 0x4a, 0xfe, 0x44, 0x10, 0x47, 0x4c, 0x48, 0x9b, 0x30, 0x30, 
+    0xbd, 0x6d, 0x95, 0x00, 0x00, 0x4d, 0x96, 0x01, 0x00, 0x69, 0x53, 0x08, 0x00, 0x10, 0xb5, 
+    0x02, 0x1c, 0x4c, 0x20, 0x43, 0x5a, 0x46, 0x48, 0x06, 0x2b, 0x0d, 0xdb, 0x19, 0x24, 0xe4, 
+    0x01, 0xa3, 0x42, 0x09, 0xdc, 0x54, 0x23, 0x59, 0x5a, 0x0a, 0x29, 0x05, 0xdb, 0xa1, 0x42, 
+    0x03, 0xdc, 0x00, 0x21, 0x51, 0x60, 0x99, 0x30, 0x10, 0xbd, 0x3f, 0x4a, 0x00, 0x21, 0xff, 
+    0x23, 0x21, 0x33, 0x4b, 0x43, 0xd3, 0x5c, 0xff, 0x2b, 0x04, 0xd0, 0x49, 0x1c, 0x09, 0x06, 
+    0x09, 0x0e, 0x0a, 0x29, 0xf4, 0xdb, 0x49, 0x1e, 0x39, 0x4a, 0x11, 0x70, 0x01, 0x21, 0x38, 
+    0x4a, 0x11, 0x70, 0xff, 0x30, 0x26, 0x30, 0x10, 0xbd, 0xc0, 0x46, 0x7b, 0x5e, 0x02, 0x00, 
+    0x45, 0x10, 0x08, 0x00, 0x54, 0x24, 0x08, 0x00, 0x07, 0x0e, 0x00, 0x00, 0x7f, 0xb5, 0x45, 
+    0x69, 0x10, 0x26, 0x32, 0x1c, 0x68, 0x46, 0x00, 0x21, 0x01, 0x24, 0xa6, 0x46, 0x2e, 0x4b, 
+    0xfe, 0x44, 0x18, 0x47, 0xff, 0x20, 0x31, 0x30, 0x40, 0x19, 0x69, 0x46, 0x32, 0x1c, 0xa6, 
+    0x46, 0x2b, 0x4b, 0xfe, 0x44, 0x18, 0x47, 0x00, 0x28, 0x08, 0xd1, 0xff, 0x20, 0x25, 0x30, 
+    0x05, 0x21, 0x41, 0x55, 
+
+    0x01, 0x05, 0xff, 0xff, 0x58, 0x79, 0x08, 0x00, 0xfa, 0x28, 0x1c, 0xa6, 0x46, 0x26, 0x49, 
+    0xfe, 0x44, 0x08, 0x47, 0x26, 0x48, 0x6f, 0x30, 0x00, 0x90, 0x7f, 0xbd, 0x25, 0x48, 0xa5, 
+    0x30, 0xf7, 0x46, 0x2b, 0xf0, 0x04, 0x00, 0xff, 0xff, 0xff, 0x01, 0x5b, 0x32, 0x08, 0x00, 
+    0x8f, 0x02, 0x00, 0x00, 0xcd, 0x92, 0x01, 0x00, 0x6f, 0x4b, 0x02, 0x00, 0x58, 0x66, 0x08, 
+    0x00, 0x43, 0x1c, 0x03, 0x00, 0xf5, 0x70, 0x00, 0x00, 0x21, 0x37, 0x05, 0x00, 0xe9, 0x36, 
+    0x05, 0x00, 0xa9, 0x36, 0x05, 0x00, 0xc3, 0x6c, 0x05, 0x00, 0xa5, 0x6c, 0x05, 0x00, 0xd1, 
+    0x1c, 0x05, 0x00, 0x8d, 0x76, 0x08, 0x00, 0x91, 0x48, 0x05, 0x00, 0x47, 0x37, 0x05, 0x00, 
+    0x63, 0x66, 0x08, 0x00, 0x1c, 0x30, 0x19, 0x00, 0x96, 0xa5, 0x1b, 0x00, 0x61, 0x61, 0x03, 
+    0x00, 0xe1, 0x72, 0x03, 0x00, 0x5f, 0x73, 0x03, 0x00, 0xf5, 0x56, 0x02, 0x00, 0xbb, 0x88, 
+    0x03, 0x00, 0x3b, 0x3b, 0x02, 0x00, 0x9d, 0xcf, 0x02, 0x00, 0x6d, 0x23, 0x03, 0x00, 0xb9, 
+    0x26, 0x08, 0x00, 0x61, 0x66, 0x08, 0x00, 0x60, 0x66, 0x08, 0x00, 0xe9, 0x63, 0x05, 0x00, 
+    0x5f, 0x6a, 0x05, 0x00, 0xd5, 0x12, 0x04, 0x00, 0x5f, 0xde, 0x04, 0x00, 0xbd, 0x65, 0x01, 
+    0x00, 0xff, 0xb5, 0x68, 0x46, 0xff, 0xf7, 0xc0, 0xf9, 0xff, 0xbd, 0xff, 0xb5, 0x68, 0x46, 
+    0xff, 0xf7, 0xd9, 0xf9, 0xff, 0xbd, 0xff, 0xb5, 0x68, 0x46, 0xff, 0xf7, 0x00, 0xf9, 0xff, 
+    0xbd, 0xff, 0xb5, 0x68, 0x46, 0xff, 0xf7, 0xb5, 0xf8, 0xff, 0xbd, 0xff, 0xb5, 0x68, 0x46, 
+    0xff, 0xf7, 0x3a, 0xfa, 0xff, 0xbd, 0xff, 0xb5, 0x68, 0x46, 0xff, 0xf7, 0x81, 0xfa, 0xff, 
+    0xbd, 0xff, 0xb5, 0x68, 0x46, 0xff, 0xf7, 0xdc, 0xf9, 0xff, 0xbd, 0xff, 0xb5, 0x68, 0x46, 
+    0xff, 0xf7, 0xf9, 0xf9, 
+
+    0x01, 0x05, 0xff, 0x6b, 0x52, 0x7a, 0x08, 0x00, 0x66, 0xff, 0xbd, 0xff, 0xb5, 0x68, 0x46, 
+    0xfe, 0xf7, 0x41, 0xfe, 0xff, 0xbd, 0xff, 0xb5, 0x68, 0x46, 0xfe, 0xf7, 0x73, 0xfe, 0xff, 
+    0xbd, 0xff, 0xb5, 0x68, 0x46, 0xfe, 0xf7, 0x19, 0xfe, 0xff, 0xbd, 0xff, 0xb5, 0x68, 0x46, 
+    0xfe, 0xf7, 0xff, 0xfd, 0xff, 0xbd, 0xff, 0xb5, 0x68, 0x46, 0xfe, 0xf7, 0x08, 0xfe, 0xff, 
+    0xbd, 0xff, 0xb5, 0x68, 0x46, 0xff, 0xf7, 0x07, 0xf8, 0xff, 0xbd, 0xff, 0xb5, 0x68, 0x46, 
+    0xff, 0xf7, 0x55, 0xf9, 0xff, 0xbd, 0xff, 0xb5, 0x68, 0x46, 0xfe, 0xf7, 0xd5, 0xfe, 0xff, 
+    0xbd, 0xff, 0xb5, 0x68, 0x46, 0xfe, 0xf7, 0x7b, 0xfe, 0xff, 0xbd, 0xff, 0xb5, 0x68, 0x46, 
+    0xfe, 0xf7, 0x9c, 0xfe, 0xff, 0xbd, 
+
+    0x01, 0x05, 0xff, 0x8d, 0x78, 0x7b, 0x08, 0x00, 0x88, 0x00, 0xb5, 0xf8, 0xf0, 0xe3, 0xfa, 
+    0x00, 0xbd, 0xd7, 0x70, 0x08, 0x00, 0x79, 0x71, 0x08, 0x00, 0x3d, 0x72, 0x08, 0x00, 0x6d, 
+    0x72, 0x08, 0x00, 0x81, 0x72, 0x08, 0x00, 0x99, 0x72, 0x08, 0x00, 0x35, 0x75, 0x08, 0x00, 
+    0x89, 0x75, 0x08, 0x00, 0x95, 0x77, 0x08, 0x00, 0x61, 0x71, 0x08, 0x00, 0xd5, 0x65, 0x08, 
+    0x00, 0xe5, 0x71, 0x08, 0x00, 0x01, 0x72, 0x08, 0x00, 0x19, 0x72, 0x08, 0x00, 0x2f, 0x72, 
+    0x08, 0x00, 0x29, 0x73, 0x08, 0x00, 0x39, 0x76, 0x08, 0x00, 0x1b, 0x78, 0x08, 0x00, 0x35, 
+    0x78, 0x08, 0x00, 0x4b, 0x78, 0x08, 0x00, 0x6b, 0x78, 0x08, 0x00, 0xc5, 0x71, 0x08, 0x00, 
+    0xbd, 0x78, 0x08, 0x00, 0x25, 0x79, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6b, 0x79, 0x08, 0x00, 
+
+    0x01, 0x05, 0xff, 0x85, 0x04, 0xf3, 0x1a, 0x00, 0x80, 0xce, 0xfb, 0x04, 0x00, 0xf4, 0x4b, 
+    0x04, 0x00, 0x0c, 0x76, 0x00, 0x00, 0x06, 0x0a, 0x02, 0x00, 0x50, 0x98, 0x00, 0x00, 0xb4, 
+    0xc6, 0x01, 0x00, 0xb8, 0x5e, 0x02, 0x00, 0x58, 0x95, 0x01, 0x00, 0x2e, 0x49, 0x05, 0x00, 
+    0xde, 0x33, 0x02, 0x00, 0x14, 0x29, 0x02, 0x00, 0x60, 0x13, 0x02, 0x00, 0xd6, 0x28, 0x05, 
+    0x00, 0x74, 0x39, 0x02, 0x00, 0x88, 0xac, 0x00, 0x00, 0x7a, 0x95, 0x00, 0x00, 0xe8, 0x72, 
+    0x00, 0x00, 0x1c, 0x62, 0x03, 0x00, 0x0e, 0x73, 0x03, 0x00, 0x7e, 0x73, 0x03, 0x00, 0x34, 
+    0xd0, 0x02, 0x00, 0x52, 0x48, 0x00, 0x00, 0x04, 0x24, 0x03, 0x00, 0xa0, 0xde, 0x04, 0x00, 
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x5a, 0x66, 
+    0x01, 0x00, 
+
+    0x01, 0x05, 0xff, 0xff, 0x00, 0x00, 0x18, 0x00, 0xfa, 0x70, 0xb5, 0x3a, 0x4d, 0xae, 0x7f, 
+    0x01, 0x24, 0xa6, 0x46, 0x36, 0x48, 0xfe, 0x44, 0x00, 0x47, 0xb0, 0x42, 0xf8, 0xd1, 0x03, 
+    0x20, 0x17, 0x21, 0x89, 0x01, 0xa6, 0x46, 0x32, 0x4a, 0xfe, 0x44, 0x10, 0x47, 0xad, 0x7f, 
+    0xa6, 0x46, 0x2f, 0x48, 0xfe, 0x44, 0x00, 0x47, 0xa8, 0x42, 0xf9, 0xd1, 0xfe, 0xe7, 0x30, 
+    0xb5, 0x2e, 0x49, 0x08, 0x1f, 0x2e, 0x4a, 0x10, 0x60, 0x31, 0x48, 0x02, 0x1c, 0x71, 0x3a, 
+    0x93, 0x24, 0x01, 0x23, 0xa3, 0x54, 0x2b, 0x4b, 0x0b, 0x60, 0x02, 0x23, 0x13, 0x71, 0x2a, 
+    0x4b, 0x4b, 0x60, 0x03, 0x23, 0x53, 0x71, 0x29, 0x4b, 0x8b, 0x60, 0x04, 0x23, 0x03, 0x70, 
+    0x29, 0x4b, 0xcb, 0x60, 0x05, 0x23, 0x83, 0x73, 0x28, 0x4b, 0x0b, 0x61, 0x06, 0x23, 0x03, 
+    0x73, 0x27, 0x4b, 0x4b, 0x61, 0x07, 0x23, 0x43, 0x71, 0x26, 0x4b, 0x8b, 0x61, 0x08, 0x24, 
+    0x03, 0x1c, 0x33, 0x3b, 0x1c, 0x70, 0x24, 0x4b, 0xcb, 0x61, 0x09, 0x23, 0xd3, 0x74, 0x23, 
+    0x4b, 0x0b, 0x62, 0x0a, 0x23, 0xd3, 0x71, 0xd3, 0x1d, 0x22, 0x4c, 0x4c, 0x62, 0x0b, 0x24, 
+    0x44, 0x77, 0x21, 0x4c, 0x8c, 0x62, 0x0c, 0x25, 0x04, 0x1c, 0x3d, 0x3c, 0x25, 0x70, 0x1f, 
+    0x4c, 0xcc, 0x62, 0x0f, 0x38, 0x0d, 0x24, 0x04, 0x70, 0x1d, 0x4c, 0x0c, 0x63, 0x0e, 0x24, 
+    0x04, 0x73, 0x1c, 0x4c, 0x4c, 0x63, 0x0f, 0x24, 0x44, 0x73, 0x1b, 0x4c, 0x8c, 0x63, 0x10, 
+    0x24, 0x04, 0x77, 0x1a, 0x48, 0xc8, 0x63, 0x11, 0x20, 0x10, 0x70, 0x19, 0x48, 0x08, 0x64, 
+    0x12, 0x20, 0x98, 0x76, 0x18, 0x48, 0x48, 0x64, 0x30, 0xbd, 0xc0, 0x46, 0x25, 0x86, 0x04, 
+    0x00, 0x1b, 0x90, 0x04, 0x00, 0x6c, 0x52, 0x08, 0x00, 0x08, 0x66, 0x08, 0x00, 0x20, 0x55, 
+    0x08, 0x00, 0x73, 0x7a, 
+
+    0x01, 0x05, 0xff, 0xff, 0xfa, 0x00, 0x18, 0x00, 0xfa, 0x08, 0x00, 0x5f, 0x7a, 0x08, 0x00, 
+    0x55, 0x7a, 0x08, 0x00, 0x95, 0x55, 0x08, 0x00, 0xa5, 0x7a, 0x08, 0x00, 0x7d, 0x7a, 0x08, 
+    0x00, 0x69, 0x7a, 0x08, 0x00, 0xaf, 0x7a, 0x08, 0x00, 0x9b, 0x7a, 0x08, 0x00, 0x87, 0x7a, 
+    0x08, 0x00, 0x19, 0x7a, 0x08, 0x00, 0x91, 0x7a, 0x08, 0x00, 0x23, 0x7a, 0x08, 0x00, 0x05, 
+    0x7a, 0x08, 0x00, 0x0f, 0x7a, 0x08, 0x00, 0x41, 0x7a, 0x08, 0x00, 0x4b, 0x7a, 0x08, 0x00, 
+    0x2d, 0x7a, 0x08, 0x00, 0x37, 0x7a, 0x08, 0x00, 0xf0, 0xb5, 0x31, 0x4e, 0x0c, 0x22, 0x32, 
+    0x70, 0x1a, 0x23, 0x73, 0x70, 0x09, 0x20, 0xb0, 0x70, 0x18, 0x20, 0xf0, 0x70, 0x03, 0x20, 
+    0x2e, 0x4d, 0x29, 0x1c, 0x01, 0x39, 0x01, 0x24, 0xa6, 0x46, 0x2a, 0x4f, 0xfe, 0x44, 0x38, 
+    0x47, 0xb2, 0x78, 0xf3, 0x78, 0x03, 0x20, 0x29, 0x1c, 0xa6, 0x46, 0x26, 0x4e, 0xfe, 0x44, 
+    0x30, 0x47, 0x03, 0x20, 0x29, 0x1c, 0x01, 0x31, 0xa6, 0x46, 0x25, 0x4a, 0xfe, 0x44, 0x10, 
+    0x47, 0xa6, 0x46, 0x24, 0x48, 0xfe, 0x44, 0x00, 0x47, 0x23, 0x4b, 0x00, 0x21, 0x08, 0x1c, 
+    0x1a, 0x68, 0x00, 0x2a, 0x04, 0xd0, 0x02, 0x07, 0x15, 0x0f, 0x22, 0x1c, 0xaa, 0x40, 0x11, 
+    0x43, 0x02, 0x07, 0x12, 0x0f, 0x0f, 0x2a, 0x05, 0xd1, 0xc5, 0x08, 0x06, 0x22, 0x2a, 0x40, 
+    0x1b, 0x4d, 0xa9, 0x52, 0x00, 0x21, 0x04, 0x33, 0x01, 0x30, 0x20, 0x28, 0xe9, 0xd3, 0x1a, 
+    0x48, 0x01, 0x1c, 0x50, 0x31, 0x0c, 0x70, 0x0a, 0x21, 0x16, 0x4a, 0x11, 0x70, 0x33, 0x21, 
+    0x01, 0x70, 0x00, 0x25, 0x16, 0x48, 0x05, 0x60, 0x28, 0x1c, 0xa6, 0x46, 0x16, 0x49, 0xfe, 
+    0x44, 0x08, 0x47, 0x13, 0x49, 0x08, 0x60, 0x14, 0x48, 0x05, 0x60, 0x07, 0x20, 0x14, 0x49, 
+    0x08, 0x70, 0x14, 0x4a, 
+
+    0x01, 0x05, 0xff, 0x65, 0xf4, 0x01, 0x18, 0x00, 0x60, 0x91, 0x78, 0x02, 0x20, 0x08, 0x43, 
+    0x90, 0x70, 0x12, 0x48, 0x05, 0x70, 0x12, 0x48, 0x05, 0x70, 0x12, 0x48, 0x05, 0x70, 0xf0, 
+    0xbd, 0xc0, 0x46, 0xfc, 0x53, 0x08, 0x00, 0x31, 0x90, 0x04, 0x00, 0xc6, 0x05, 0x00, 0x00, 
+    0x1b, 0x90, 0x04, 0x00, 0x33, 0x00, 0x18, 0x00, 0x80, 0x7b, 0x08, 0x00, 0x84, 0xf3, 0x1a, 
+    0x00, 0x6d, 0x22, 0x08, 0x00, 0x69, 0x53, 0x08, 0x00, 0x50, 0x66, 0x08, 0x00, 0x54, 0x66, 
+    0x08, 0x00, 0xd1, 0xa1, 0x04, 0x00, 0x5c, 0x66, 0x08, 0x00, 0xb3, 0x11, 0x08, 0x00, 0xe4, 
+    0x15, 0x08, 0x00, 0x63, 0x66, 0x08, 0x00, 0x60, 0x66, 0x08, 0x00, 0x61, 0x66, 0x08, 0x00, 
+    
+
+    0x01, 0x83, 0xff, 0x14, 0x79, 0x7b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+
+    // 
+    // ######
+    // ### Set the BT Core spec to 4.2 for Bluetopia stack compatibility
+    // ### Remove below VS command for default BT core spec 5.1
+    0x01, 0x09, 0xfd, 0x08, 0x68, 0x53, 0x08, 0x00, 0x00, 0x2a, 0x00, 0xff, 
+
+    // ######
+    // 
+    0x01, 0x0c, 0xfd, 0x09, 0x01, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x64, 0x00, 
+
+    0x01, 0x09, 0xfd, 0x08, 0x58, 0x60, 0x1a, 0x00, 0x00, 0x10, 0x00, 0x10, 
+
+    0x01, 0x09, 0xfd, 0x08, 0x10, 0x60, 0x1a, 0x00, 0x10, 0x00, 0x10, 0x00, 
+
+    0x01, 0x1c, 0xfd, 0x14, 0xff, 0x88, 0x13, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 
+    0xff, 0xff, 0xff, 0x00, 0xfa, 0x00, 0xff, 0xff, 0x00, 
+
+    // 
+    // 
+    // ##--------------------------------------------------------------------------------
+    // ## Description:   ORCA_C Commercial PHY FW Initialization Script
+    // ##--------------------------------------------------------------------------------
+    0x01, 0x76, 0xfd, 0x31, 0x01, 0x21, 0x54, 0x00, 0x00, 0x61, 0x57, 0x00, 0x00, 0x14, 0x05, 
+    0x0a, 0x05, 0x00, 0x07, 0x06, 0x0a, 0x04, 0x05, 0x08, 0x09, 0x0b, 0x0c, 0x0d, 0x0e, 0x10, 
+    0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 
+    0x10, 0x10, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 
+
+    // BTstack: added HCI_VS_SET_POWER_VECTOR(GFSK) 0xFD82 template
+    0x01, 0x82, 0xfd, 0x14, 0x00, 0x9c, 0x18, 0xd2, 0xd2, 0xd2, 0xd2, 0xd2, 0xd2, 0xd2, 0xdc,
+    0xe6, 0xf0, 0xfa, 0x04, 0x0e, 0x18, 0xff, 0x00, 0x00,
+
+    // BTstack: added HCI_VS_SET_POWER_VECTOR(EDR2) 0xFD82 template
+    0x01, 0x82, 0xfd, 0x14, 0x01, 0x9c, 0xce, 0xce, 0xce, 0xce, 0xce, 0xce, 0xce, 0xce, 0xd8, 
+    0xe2, 0xec, 0xf6, 0x00, 0x0a, 0x14, 0xff, 0x00, 0x00,
+
+    // BTstack: added HCI_VS_SET_POWER_VECTOR(EDR3) 0xFD82 for EDR3 template
+    0x01, 0x82, 0xfd, 0x14, 0x02, 0x9c, 0xce, 0xce, 0xce, 0xce, 0xce, 0xce, 0xce, 0xce, 0xd8,
+    0xe2, 0xec, 0xf6, 0x00, 0x0a, 0x14, 0xff, 0x00, 0x00,
+
+    // BTstack: added HCI_VS_SET_CLASS2_SINGLE_POWER 0xFD87 template
+    0x01, 0x87, 0xfd, 0x03, 0x0d, 0x0d, 0x0d,
+
+    0x01, 0x80, 0xfd, 0x06, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 
+
+    0x01, 0x80, 0xfd, 0x06, 0x3c, 0xf0, 0x5f, 0x00, 0x00, 0x00, 
+
+    // 
+    // 
+    // 
+    0x01, 0x38, 0xfe, 0x00, 
+
+    // 
+    // #################################################################
+    // ## START of CC2564 Adds-On
+    // #################################################################
+    // 
+    // ## Enable fast clock XTAL support
+    0x01, 0x1c, 0xfd, 0x14, 0x01, 0x88, 0x13, 0x00, 0x00, 0xd0, 0x07, 0x00, 0x00, 0xff, 0xff, 
+    0x04, 0xff, 0xff, 0xff, 0xfa, 0x00, 0x00, 0x00, 0x00, 
+
+    // 
+    // ## Enable eHCILL
+    0x01, 0x2b, 0xfd, 0x05, 0x10, 0x00, 0x50, 0x00, 0x96, 
+
+    // 
+    0x01, 0x0c, 0xfd, 0x09, 0x01, 0x01, 0x00, 0xff, 0xff, 0xff, 0xff, 0x64, 0x00, 
+
+    // 
+    // #################################################################
+    // ## END of CC2564 Adds-On
+    // #################################################################
+    0x01, 0x5b, 0xfd, 0x02, 0x01, 0x01, 
+
+    // 
+    0x01, 0xdd, 0xfd, 0x01, 0x01, 
+
+};
+
+const uint32_t cc256x_init_script_size = 6771;
+
+#endif
\ No newline at end of file
diff --git a/ports/stm32/boards/LEGO_HUB_NO6/board_init.c b/ports/stm32/boards/LEGO_HUB_NO6/board_init.c
new file mode 100644
index 0000000000000..3f22bfc8fce2b
--- /dev/null
+++ b/ports/stm32/boards/LEGO_HUB_NO6/board_init.c
@@ -0,0 +1,170 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "py/mphal.h"
+#include "irq.h"
+
+void board_init(void) {
+    if (query_irq() == IRQ_STATE_DISABLED) {
+        enable_irq(IRQ_STATE_ENABLED);
+    }
+
+    // Enable 3V3 for all ports
+    mp_hal_pin_output(pyb_pin_PORT_3V3_EN);
+    mp_hal_pin_high(pyb_pin_PORT_3V3_EN);
+
+    // Port A
+    // Enable RX/TX buffer
+    mp_hal_pin_output(pyb_pin_PORTA_EN);
+    mp_hal_pin_low(pyb_pin_PORTA_EN);
+
+    // Port B
+    // Enable RX/TX buffer
+    mp_hal_pin_output(pyb_pin_PORTB_EN);
+    mp_hal_pin_low(pyb_pin_PORTB_EN);
+
+    // Port C
+    // Enable RX/TX buffer
+    mp_hal_pin_output(pyb_pin_PORTC_EN);
+    mp_hal_pin_low(pyb_pin_PORTC_EN);
+
+    // Port D
+    // Enable RX/TX buffer
+    mp_hal_pin_output(pyb_pin_PORTD_EN);
+    mp_hal_pin_low(pyb_pin_PORTD_EN);
+
+    // Port E
+    // Enable RX/TX buffer
+    mp_hal_pin_output(pyb_pin_PORTE_EN);
+    mp_hal_pin_low(pyb_pin_PORTE_EN);
+    // Disable RS485 driver
+    mp_hal_pin_output(pyb_pin_PORTE_RTS);
+    mp_hal_pin_low(pyb_pin_PORTE_RTS);
+
+    // Port F
+    // Enable RX/TX buffer
+    mp_hal_pin_output(pyb_pin_PORTF_EN);
+    mp_hal_pin_low(pyb_pin_PORTF_EN);
+    // Disable RS485 driver
+    mp_hal_pin_output(pyb_pin_PORTF_RTS);
+    mp_hal_pin_low(pyb_pin_PORTF_RTS);
+}
+
+#if BUILDING_MBOOT
+
+#include "mboot/mboot.h"
+#include "boardctrl.h"
+#include "adc.h"
+#include "hub_display.h"
+
+#define RESET_MODE_NUM_STATES (4)
+#define RESET_MODE_TIMEOUT_CYCLES (8)
+
+#define PATTERN_B (0x00651946)
+#define PATTERN_F (0x0021184e)
+#define PATTERN_N (0x01296ad2)
+#define PATTERN_S (0x0064104c)
+
+static void board_led_pattern(int reset_mode, uint16_t brightness) {
+    static const uint32_t pixels[] = {
+        0,
+        PATTERN_N,
+        PATTERN_S,
+        PATTERN_F,
+        PATTERN_B,
+    };
+    uint32_t pixel = pixels[reset_mode];
+    for (int i = 0; i < 25; ++i) {
+        hub_display_set(i, brightness * ((pixel >> i) & 1));
+    }
+    hub_display_update();
+}
+
+static void board_button_init(void) {
+    mp_hal_pin_config(pin_A1, MP_HAL_PIN_MODE_ADC, MP_HAL_PIN_PULL_NONE, 0);
+    adc_config(ADC1, 12);
+}
+
+static int board_button_state(void) {
+    uint16_t value = adc_config_and_read_u16(ADC1, 1, ADC_SAMPLETIME_15CYCLES);
+    return value < 44000;
+}
+
+void board_mboot_cleanup(int reset_mode) {
+    board_led_pattern(0, 0);
+    hub_display_off();
+}
+
+void board_mboot_led_init(void) {
+    hub_display_on();
+}
+
+void board_mboot_led_state(int led, int state) {
+    if (state) {
+        hub_display_set(28, 0x7fff);
+        hub_display_set(31, 0x7fff);
+    } else {
+        hub_display_set(28, 0);
+        hub_display_set(31, 0);
+    }
+    hub_display_update();
+}
+
+int board_mboot_get_reset_mode(void) {
+    board_button_init();
+    int reset_mode = BOARDCTRL_RESET_MODE_NORMAL;
+    if (board_button_state()) {
+        // Cycle through reset modes while USR is held.
+        // Timeout is roughly 20s, where reset_mode=1.
+        systick_init();
+        hub_display_on();
+        reset_mode = 0;
+        for (int i = 0; i < (RESET_MODE_NUM_STATES * RESET_MODE_TIMEOUT_CYCLES + 1) * 32; i++) {
+            if (i % 32 == 0) {
+                if (++reset_mode > RESET_MODE_NUM_STATES) {
+                    reset_mode = BOARDCTRL_RESET_MODE_NORMAL;
+                }
+                board_led_pattern(reset_mode, 0x7fff);
+            }
+            if (!board_button_state()) {
+                break;
+            }
+            mp_hal_delay_ms(19);
+        }
+        // Flash the selected reset mode.
+        for (int i = 0; i < 6; i++) {
+            board_led_pattern(reset_mode, 0x0fff);
+            mp_hal_delay_ms(50);
+            board_led_pattern(reset_mode, 0x7fff);
+            mp_hal_delay_ms(50);
+        }
+        mp_hal_delay_ms(300);
+    }
+    board_led_pattern(0, 0);
+    return reset_mode;
+}
+
+#endif
diff --git a/ports/stm32/boards/LEGO_HUB_NO6/cc2564.c b/ports/stm32/boards/LEGO_HUB_NO6/cc2564.c
new file mode 100644
index 0000000000000..c54daf3002fe3
--- /dev/null
+++ b/ports/stm32/boards/LEGO_HUB_NO6/cc2564.c
@@ -0,0 +1,85 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include <stdio.h>
+
+#include "py/runtime.h"
+#include "py/mphal.h"
+#include "timer.h"
+#include "extmod/mpbthci.h"
+
+#if !BUILDING_MBOOT
+
+#define CC2564_PIN_CTS (pyb_pin_BT_CTS)
+#define CC2564_PIN_RTS (pyb_pin_BT_RTS)
+#define CC2564_PIN_BT_SLOWCLK (pyb_pin_BT_SLOWCLK)
+#define CC2564_PIN_BT_ENABLE (pyb_pin_BT_ENABLE)
+
+STATIC void cc2564_wait_cts_low(mp_hal_pin_obj_t cts, uint32_t timeout_ms) {
+    for (int i = 0; i < timeout_ms; ++i) {
+        if (mp_hal_pin_read(cts) == 0) {
+            break;
+        }
+        mp_hal_delay_ms(1);
+    }
+}
+
+int mp_bluetooth_hci_controller_init(void) {
+    // Pull BTNSHUTD low to disable chip.
+    mp_hal_pin_output(CC2564_PIN_BT_ENABLE);
+    mp_hal_pin_low(CC2564_PIN_BT_ENABLE);
+
+    // Output a 32768Hz signal on BTSLOWCLK.
+    //  tim8 = pyb.Timer(8, freq=32768)
+    //  tim8_ch4 = tim8.channel(4, pyb.Timer.PWM, pin=btclk)
+    //  tim8_ch4.pulse_width_percent(50)
+    mp_obj_t args[6] = { MP_OBJ_NEW_SMALL_INT(8), MP_OBJ_NEW_QSTR(MP_QSTR_freq), MP_OBJ_NEW_SMALL_INT(32768), MP_OBJ_NULL };
+    mp_obj_t tim8 = pyb_timer_type.make_new(&pyb_timer_type, 1, 1, args);
+    mp_load_method(tim8, MP_QSTR_channel, args);
+    args[2] = MP_OBJ_NEW_SMALL_INT(4);
+    args[3] = MP_OBJ_NEW_SMALL_INT(0); // CHANNEL_MODE_PWM_NORMAL
+    args[4] = MP_OBJ_NEW_QSTR(MP_QSTR_pin);
+    args[5] = (mp_obj_t)CC2564_PIN_BT_SLOWCLK;
+    mp_obj_t tim8_ch4 = mp_call_method_n_kw(2, 1, args);
+    mp_load_method(tim8_ch4, MP_QSTR_pulse_width_percent, args);
+    args[2] = MP_OBJ_NEW_SMALL_INT(50);
+    mp_call_method_n_kw(1, 0, args);
+
+    // Pull BTNSHUTD high to enable chip and wait for CTS to go low to indicate ready.
+    mp_hal_pin_high(CC2564_PIN_BT_ENABLE);
+    cc2564_wait_cts_low(CC2564_PIN_CTS, 500);
+
+    return 0;
+}
+
+int mp_bluetooth_hci_controller_deinit(void) {
+    // Pull BTNSHUTD low to disable chip.
+    mp_hal_pin_low(CC2564_PIN_BT_ENABLE);
+
+    return 0;
+}
+
+#endif
diff --git a/ports/stm32/boards/LEGO_HUB_NO6/hub_display.c b/ports/stm32/boards/LEGO_HUB_NO6/hub_display.c
new file mode 100644
index 0000000000000..1efc388c7723f
--- /dev/null
+++ b/ports/stm32/boards/LEGO_HUB_NO6/hub_display.c
@@ -0,0 +1,180 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "py/mphal.h"
+#include "hub_display.h"
+
+// Map pixel number 0-24, and 25-36 to TLC bit number.
+static const uint8_t hub_display_pixel_map[] = {
+    // 5x5 display
+     9,  11,   6,   1,  14,
+    10,  19,   8,   0,  26,
+    23,  18,   3,   2,  24,
+    21,  20,  15,  13,  25,
+    22,   7,  17,  12,  38,
+    // RGB Bluetooth button
+    27, 28, 29,
+    // RGB middle button (left and right)
+    39, 40, 41, 42, 43, 44,
+    // RGB battery indicator
+    45, 46, 47,
+};
+
+static bool hub_display_init;
+static uint8_t hub_display_gs_state[96];
+
+static void hub_display_tim_init(void) {
+    // TLC maximum GSCLK freq: 33MHz
+
+    // tim12, ch2, pwm
+
+    TIM_TypeDef *tim = TIM12;
+
+    __HAL_RCC_TIM12_CLK_ENABLE();
+    tim->CR1 = TIM_CR1_ARPE;
+
+    // Configure PWM mode.
+    uint32_t ch = 1; // ch2
+    uint32_t reg = 6 << TIM_CCMR1_OC1M_Pos // PWM1 mode
+        | 1 << TIM_CCMR1_OC1PE_Pos // preload enabled
+        | 0 << TIM_CCMR1_CC1S_Pos // output mode
+        ;
+    uint32_t shift = 8 * (ch & 1);
+    tim->CCMR1 = (tim->CCMR1 & ~(0xff << shift)) | reg << shift;
+
+    // Enable output on pin, active high for normal channel.
+    reg = TIM_CCER_CC1E;
+    shift = 4 * ch;
+    tim->CCER = (tim->CCER & ~(0xf << shift)) | reg << shift;
+
+    // Enable the timer if it's not already running.
+    tim->CR1 |= TIM_CR1_CEN;
+
+    // fast
+    tim->PSC = 0;
+    tim->ARR = 2;
+
+    // 50% duty
+    tim->CCR2 = 2;
+    tim->EGR = 1; // UG
+
+    mp_hal_pin_config(pin_B15, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE, 9);
+}
+
+static void hub_display_spi_init(void) {
+    // TLC maximum SPI freq: 25MHz
+
+    SPI_TypeDef *spi = SPI1;
+
+    __HAL_RCC_SPI1_CLK_ENABLE();
+    spi->CR1 = SPI_CR1_SSM | SPI_CR1_SSI | 0 << SPI_CR1_BR_Pos | SPI_CR1_MSTR;
+    spi->CR1 |= SPI_CR1_SPE;
+
+    mp_hal_pin_config(pin_A5, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE, 5);
+    mp_hal_pin_config(pin_A6, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE, 5);
+    mp_hal_pin_config(pin_A7, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE, 5);
+}
+
+static void hub_display_spi_write(uint8_t value) {
+    SPI_TypeDef *spi = SPI1;
+    spi->DR = value;
+    while (!(spi->SR & SPI_SR_TXE)) {
+    }
+}
+
+// dc: dot control
+// mc: maximum current
+// bc: global brightness control
+// fc: function control
+static void hub_display_latch_ctrl(uint8_t dc, uint32_t mc, uint32_t bc, uint8_t fc) {
+    hub_display_spi_write(1);                   // bit 768
+    hub_display_spi_write(0x96);                // bits 760-767
+    for (int i = 0; i < 48; ++i) {
+        hub_display_spi_write(0);
+    }
+    hub_display_spi_write(fc >> 2);             // bits 368-375
+    hub_display_spi_write(fc << 6 | bc >> 15);  // bits 360-367
+    hub_display_spi_write(bc >> 7);             // bits 352-359
+    hub_display_spi_write(bc << 1 | mc >> 8);   // bits 344-351
+    hub_display_spi_write(mc);                  // bits 336-343
+    for (int i = 0; i < 42; ++i) {
+        hub_display_spi_write(dc);
+    }
+    mp_hal_pin_high(pin_A15);
+    mp_hal_delay_us(1);
+    mp_hal_pin_low(pin_A15);
+}
+
+void hub_display_set(uint8_t led, uint16_t value) {
+    led = hub_display_pixel_map[led];
+    hub_display_gs_state[led * 2] = value;
+    hub_display_gs_state[led * 2 + 1] = value >> 8;
+}
+
+void hub_display_update(void) {
+    if (!hub_display_init) {
+        return;
+    }
+    hub_display_spi_write(0);
+    for (int i = 0; i < 96; ++i) {
+        hub_display_spi_write(hub_display_gs_state[95 - i]);
+    }
+    mp_hal_pin_high(pin_A15);
+    mp_hal_delay_us(1);
+    mp_hal_pin_low(pin_A15);
+}
+
+void hub_display_on(void) {
+    if (hub_display_init) {
+        return;
+    }
+    mp_hal_pin_output(pin_A15);
+    mp_hal_pin_low(pin_A15);
+    hub_display_spi_init();
+    for (int i = 0; i < 2; ++i) {
+        hub_display_latch_ctrl(0xff, 0, 0x1fffff, 0x11);
+    }
+    hub_display_tim_init();
+    hub_display_init = true;
+}
+
+void hub_display_off(void) {
+    if (!hub_display_init) {
+        return;
+    }
+    __HAL_RCC_TIM12_CLK_DISABLE();
+    __HAL_RCC_TIM12_FORCE_RESET();
+    __HAL_RCC_TIM12_RELEASE_RESET();
+    __HAL_RCC_SPI1_CLK_DISABLE();
+    __HAL_RCC_SPI1_FORCE_RESET();
+    __HAL_RCC_SPI1_RELEASE_RESET();
+    mp_hal_pin_config(pin_A5, MP_HAL_PIN_MODE_ANALOG, MP_HAL_PIN_PULL_NONE, 0);
+    mp_hal_pin_config(pin_A6, MP_HAL_PIN_MODE_ANALOG, MP_HAL_PIN_PULL_NONE, 0);
+    mp_hal_pin_config(pin_A7, MP_HAL_PIN_MODE_ANALOG, MP_HAL_PIN_PULL_NONE, 0);
+    mp_hal_pin_config(pin_A15, MP_HAL_PIN_MODE_ANALOG, MP_HAL_PIN_PULL_NONE, 0);
+    mp_hal_pin_config(pin_B15, MP_HAL_PIN_MODE_ANALOG, MP_HAL_PIN_PULL_NONE, 0);
+    hub_display_init = false;
+}
diff --git a/ports/stm32/boards/LEGO_HUB_NO6/hub_display.h b/ports/stm32/boards/LEGO_HUB_NO6/hub_display.h
new file mode 100644
index 0000000000000..7623e128a804c
--- /dev/null
+++ b/ports/stm32/boards/LEGO_HUB_NO6/hub_display.h
@@ -0,0 +1,4 @@
+void hub_display_on(void);
+void hub_display_off(void);
+void hub_display_update(void);
+void hub_display_set(uint8_t led, uint16_t value);
diff --git a/ports/stm32/boards/LEGO_HUB_NO6/mboot_memory.ld b/ports/stm32/boards/LEGO_HUB_NO6/mboot_memory.ld
new file mode 100644
index 0000000000000..dd914c8e88e33
--- /dev/null
+++ b/ports/stm32/boards/LEGO_HUB_NO6/mboot_memory.ld
@@ -0,0 +1,10 @@
+/*
+    Linker script fragment for mboot on an STM32xxx MCU.
+    This defines the memory sections for the bootloader to use.
+*/
+MEMORY
+{
+    FLASH_BL (rx)   : ORIGIN = 0x08008000, LENGTH = 32K
+    RAM (xrw)       : ORIGIN = 0x20000000, LENGTH = 120K
+}
+
diff --git a/ports/stm32/boards/LEGO_HUB_NO6/mpconfigboard.h b/ports/stm32/boards/LEGO_HUB_NO6/mpconfigboard.h
new file mode 100644
index 0000000000000..a0869fda7a1f1
--- /dev/null
+++ b/ports/stm32/boards/LEGO_HUB_NO6/mpconfigboard.h
@@ -0,0 +1,122 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ * The MIT License (MIT)
+ * Copyright (c) 2021 Damien P. George
+ */
+
+#include <stdint.h>
+
+#define MICROPY_HW_BOARD_NAME                    "LEGO Technic Hub No.6"
+#define MICROPY_HW_MCU_NAME                      "STM32F413"
+
+#define MICROPY_HW_HAS_SWITCH                    (0)
+#define MICROPY_HW_HAS_FLASH                     (0)
+#define MICROPY_PY_PYB_LEGACY                    (0)
+#define MICROPY_HW_ENTER_BOOTLOADER_VIA_RESET    (0)
+#define MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE (0)
+#define MICROPY_HW_ENABLE_RTC                    (1)
+#define MICROPY_HW_ENABLE_RNG                    (1)
+#define MICROPY_HW_ENABLE_DAC                    (1)
+#define MICROPY_HW_ENABLE_USB                    (1)
+
+// HSE is 16MHz, CPU freq set to 100MHz, buses at maximum freq
+#define MICROPY_HW_CLK_PLLM                      (16)
+#define MICROPY_HW_CLK_PLLN                      (200)
+#define MICROPY_HW_CLK_PLLP                      (RCC_PLLP_DIV2)
+#define MICROPY_HW_CLK_PLLQ                      (4)
+#define MICROPY_HW_CLK_AHB_DIV                   (RCC_SYSCLK_DIV1)
+#define MICROPY_HW_CLK_APB1_DIV                  (RCC_HCLK_DIV2)
+#define MICROPY_HW_CLK_APB2_DIV                  (RCC_HCLK_DIV1)
+
+// For 2.7 to 3.6 V, 75 to 100 MHz: 3 wait states.
+#define MICROPY_HW_FLASH_LATENCY                 FLASH_LATENCY_3
+
+// UART buses
+// Bluetooth HCI
+#define MICROPY_HW_UART2_CTS                     (pin_D3)
+#define MICROPY_HW_UART2_RTS                     (pin_D4)
+#define MICROPY_HW_UART2_TX                      (pin_D5)
+#define MICROPY_HW_UART2_RX                      (pin_D6)
+// Port B
+#define MICROPY_HW_UART4_TX                      (pin_D1)
+#define MICROPY_HW_UART4_RX                      (pin_D0)
+// Port D
+#define MICROPY_HW_UART5_TX                      (pin_C12)
+#define MICROPY_HW_UART5_RX                      (pin_D2)
+// Port A
+#define MICROPY_HW_UART7_TX                      (pin_E8)
+#define MICROPY_HW_UART7_RX                      (pin_E7)
+// Port C
+#define MICROPY_HW_UART8_TX                      (pin_E1)
+#define MICROPY_HW_UART8_RX                      (pin_E0)
+// Port F
+#define MICROPY_HW_UART9_TX                      (pin_D15)
+#define MICROPY_HW_UART9_RX                      (pin_D14)
+// Port E
+#define MICROPY_HW_UART10_TX                     (pin_E3)
+#define MICROPY_HW_UART10_RX                     (pin_E2)
+
+// SPI buses
+#define MICROPY_HW_SPI1_NSS                      (pin_A4) // shared with DAC
+#define MICROPY_HW_SPI1_SCK                      (pin_A5) // shared with DAC
+#define MICROPY_HW_SPI1_MISO                     (pin_A6)
+#define MICROPY_HW_SPI1_MOSI                     (pin_A7)
+
+// USB config
+#define MICROPY_HW_USB_VBUS_DETECT_PIN           (pin_A9)
+#define MICROPY_HW_USB_FS                        (1)
+#define MICROPY_HW_USB_MSC                       (1)
+
+// Bluetooth config
+#define MICROPY_HW_BLE_UART_ID                   (PYB_UART_2)
+#define MICROPY_HW_BLE_UART_BAUDRATE             (115200)
+#define MICROPY_HW_BLE_UART_BAUDRATE_SECONDARY   (921600)
+#define MICROPY_HW_BLE_BTSTACK_CHIPSET_INSTANCE  btstack_chipset_cc256x_instance()
+
+// SPI flash, for R/W storage
+#define MICROPY_HW_SPIFLASH_ENABLE_CACHE         (1)
+#define MICROPY_HW_SPIFLASH_SIZE_BITS            (256 * 1024 * 1024)
+#define MICROPY_HW_SPIFLASH_NSS                  (pin_B12)
+#define MICROPY_HW_SPIFLASH_SCK                  (pin_B13)
+#define MICROPY_HW_SPIFLASH_MISO                 (pin_C2)
+#define MICROPY_HW_SPIFLASH_MOSI                 (pin_C3)
+
+// SPI flash, block device config
+extern int32_t board_bdev_ioctl(void);
+extern struct _spi_bdev_t spi_bdev;
+#define MICROPY_HW_BDEV_IOCTL(op, arg) ( \
+    (op) == BDEV_IOCTL_NUM_BLOCKS ? (MICROPY_HW_SPIFLASH_SIZE_BITS / 8 / FLASH_BLOCK_SIZE - 1) : \
+    (op) == BDEV_IOCTL_INIT ? board_bdev_ioctl() : \
+    spi_bdev_ioctl(&spi_bdev, (op), (arg)) \
+    )
+
+// Jump over first block (bl + 1) as it is cleared by bootloader
+#define MICROPY_HW_BDEV_READBLOCKS(dest, bl, n) spi_bdev_readblocks(&spi_bdev, (dest), (bl + 1), (n))
+#define MICROPY_HW_BDEV_WRITEBLOCKS(src, bl, n) spi_bdev_writeblocks(&spi_bdev, (src), (bl + 1), (n))
+#define MICROPY_HW_BDEV_SPIFLASH_EXTENDED (&spi_bdev) // for extended block protocol
+
+// Board control config
+#define MICROPY_BOARD_STARTUP                    board_init
+
+/******************************************************************************/
+// Bootloader configuration
+
+#define MBOOT_LEAVE_BOOTLOADER_VIA_RESET         (0)
+
+#define MBOOT_LED1                               0
+#define MBOOT_BOARD_LED_INIT                     board_mboot_led_init
+#define MBOOT_BOARD_LED_STATE                    board_mboot_led_state
+
+#define MBOOT_BOARD_EARLY_INIT                   board_init
+#define MBOOT_BOARD_CLEANUP                      board_mboot_cleanup
+#define MBOOT_BOARD_GET_RESET_MODE               board_mboot_get_reset_mode
+
+/******************************************************************************/
+// Function declarations
+
+void board_init(void);
+void board_mboot_cleanup(int reset_mode);
+void board_mboot_led_init(void);
+void board_mboot_led_state(int led, int state);
+int board_mboot_get_reset_mode(void);
+void *btstack_chipset_cc256x_instance(void);
diff --git a/ports/stm32/boards/LEGO_HUB_NO6/mpconfigboard.mk b/ports/stm32/boards/LEGO_HUB_NO6/mpconfigboard.mk
new file mode 100644
index 0000000000000..56527af7d3948
--- /dev/null
+++ b/ports/stm32/boards/LEGO_HUB_NO6/mpconfigboard.mk
@@ -0,0 +1,22 @@
+MCU_SERIES = f4
+CMSIS_MCU = STM32F413xx
+AF_FILE = boards/stm32f413_af.csv
+LD_FILES = boards/LEGO_HUB_NO6/stm32f413xg.ld boards/common_bl.ld
+TEXT0_ADDR = 0x08010000
+
+BOOTLOADER_DFU_USB_VID ?= 0x0694
+BOOTLOADER_DFU_USB_PID ?= 0x0008
+
+# MicroPython settings
+MICROPY_PY_BLUETOOTH ?= 1
+MICROPY_BLUETOOTH_NIMBLE ?= 0
+MICROPY_BLUETOOTH_BTSTACK ?= 1
+MICROPY_VFS_LFS2 ?= 1
+
+ifneq ($(BUILDING_MBOOT),1)
+LIB_SRC_C += lib/btstack/chipset/cc256x/btstack_chipset_cc256x.c
+endif
+
+# Bootloader settings
+MBOOT_TEXT0_ADDR = 0x08008000
+MBOOT_LD_FILES = ../boards/LEGO_HUB_NO6/mboot_memory.ld stm32_sections.ld
diff --git a/ports/stm32/boards/LEGO_HUB_NO6/pins.csv b/ports/stm32/boards/LEGO_HUB_NO6/pins.csv
new file mode 100644
index 0000000000000..9e56e2c79de4f
--- /dev/null
+++ b/ports/stm32/boards/LEGO_HUB_NO6/pins.csv
@@ -0,0 +1,114 @@
+CHG_ISET_PWM,PA0
+BUTTONS_ADC,PA1
+BT_ENABLE,PA2
+CHG_IMON_ADC,PA3
+SND_DAC,PA4
+TLC_SCLK,PA5
+TLC_SOUT,PA6
+TLC_SIN,PA7
+PORTB_EN,PA8
+USB_VBUS,PA9
+PORTA_EN,PA10
+USB_DM,PA11
+USB_DP,PA12
+BAT_PWR_EN,PA13
+PORT_3V3_EN,PA14
+TLC_LAT,PA15
+BAT_NTC,PB0
+PORTF_M2,PB1
+PORTD_EN,PB2
+LSM6_SDA,PB3
+LSM6_INT1,PB4
+PORTE_EN,PB5
+PORTC_M1,PB6
+PORTC_M2,PB7
+PORTD_M1,PB8
+PORTD_M2,PB9
+LSM6_SCL,PB10
+,PB11
+,PB12
+,PB13
+,PB14
+TLC_GS_CLK,PB15
+BAT_IMON_ADC,PC0
+BAT_VMON_ADC,PC1
+,PC2
+,PC3
+CHGOK_CENBTN_3V3OK_ADC,PC4
+PORTF_EN,PC5
+PORTE_M1,PC6
+PORTE_M2,PC7
+PORTF_M1,PC8
+BT_SLOWCLK,PC9
+SND_AMP_EN,PC10
+,PC11
+PORTD_TX,PC12
+,PC13
+,PC14
+,PC15
+PORTB_RX,PD0
+PORTB_TX,PD1
+PORTD_RX,PD2
+BT_CTS,PD3
+BT_RTS,PD4
+BT_TX,PD5
+BT_RX,PD6
+,PD7
+,PD8
+,PD9
+,PD10
+,PD11
+,PD12
+,PD13
+PORTF_RX,PD14
+PORTF_TX,PD15
+PORTC_RX,PE0
+PORTC_TX,PE1
+PORTE_RX,PE2
+PORTE_TX,PE3
+,PE4
+PORTC_EN,PE5
+,PE6
+PORTA_RX,PE7
+PORTA_TX,PE8
+PORTA_M1,PE9
+PORTE_RTS,PE10
+PORTA_M2,PE11
+,PE12
+PORTB_M1,PE13
+PORTB_M2,PE14
+PORTF_RTS,PE15
+,PF0
+,PF1
+,PF2
+,PF3
+,PF4
+,PF5
+,PF6
+,PF7
+,PF8
+,PF9
+,PF10
+,PF11
+,PF12
+,PF13
+,PF14
+,PF15
+,PG0
+,PG1
+,PG2
+,PG3
+,PG4
+,PG5
+,PG6
+,PG7
+,PG8
+,PG9
+,PG10
+,PG11
+,PG12
+,PG13
+,PG14
+,PG15
+,PH0
+,PH1
diff --git a/ports/stm32/boards/LEGO_HUB_NO6/stm32f413xg.ld b/ports/stm32/boards/LEGO_HUB_NO6/stm32f413xg.ld
new file mode 100644
index 0000000000000..d3c43a6948316
--- /dev/null
+++ b/ports/stm32/boards/LEGO_HUB_NO6/stm32f413xg.ld
@@ -0,0 +1,27 @@
+/*
+    GNU linker script for STM32F413xg (1MB flash, 320kB RAM)
+*/
+
+/* Specify the memory areas */
+/* FLASH_FS2 is placed before FLASH_TEXT to support 1MB and 1.5MB FLASH with common code in flashbdev.c */
+MEMORY
+{
+    FLASH (rx)      : ORIGIN = 0x08000000, LENGTH = 1024K /* entire flash */
+    FLASH_APP (rx)  : ORIGIN = 0x08010000, LENGTH = 976K
+    RAM (xrw)       : ORIGIN = 0x20000000, LENGTH = 320K /* SRAM1 + SRAM2 */
+}
+
+/* produce a link error if there is not this amount of RAM for these sections */
+_minimum_stack_size = 2K;
+_minimum_heap_size = 16K;
+
+/* Define the stack.  The stack is full descending so begins just above last byte
+   of RAM.  Note that EABI requires the stack to be 8-byte aligned for a call. */
+_estack = ORIGIN(RAM) + LENGTH(RAM) - _estack_reserve;
+_sstack = _estack - 12K; /* tunable */
+
+/* RAM extents for the garbage collector */
+_ram_start = ORIGIN(RAM);
+_ram_end = ORIGIN(RAM) + LENGTH(RAM);
+_heap_start = _ebss; /* heap starts just after statically allocated memory */
+_heap_end = _sstack;
diff --git a/ports/stm32/boards/LEGO_HUB_NO6/stm32f4xx_hal_conf.h b/ports/stm32/boards/LEGO_HUB_NO6/stm32f4xx_hal_conf.h
new file mode 100644
index 0000000000000..7d6344f0a2453
--- /dev/null
+++ b/ports/stm32/boards/LEGO_HUB_NO6/stm32f4xx_hal_conf.h
@@ -0,0 +1,19 @@
+/* This file is part of the MicroPython project, http://micropython.org/
+ * The MIT License (MIT)
+ * Copyright (c) 2019 Damien P. George
+ */
+#ifndef MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H
+#define MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H
+
+#include "boards/stm32f4xx_hal_conf_base.h"
+
+// Oscillator values in Hz
+#define HSE_VALUE (16000000)
+#define LSE_VALUE (32768)
+#define EXTERNAL_CLOCK_VALUE (12288000)
+
+// Oscillator timeouts in ms
+#define HSE_STARTUP_TIMEOUT (100)
+#define LSE_STARTUP_TIMEOUT (5000)
+
+#endif // MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H

From 60e3e51753c99674e27b338809f3b7abdc352929 Mon Sep 17 00:00:00 2001
From: Tobias Thyrrestrup <tt@LEGO.com>
Date: Fri, 23 Jul 2021 10:28:57 +0200
Subject: [PATCH 1125/3533] stm32/Makefile: Update to only pull in used
 Bluetooth library.

---
 ports/stm32/Makefile | 4 +++-
 tools/ci.sh          | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/ports/stm32/Makefile b/ports/stm32/Makefile
index ebf1466118d1d..d78e2b4851113 100644
--- a/ports/stm32/Makefile
+++ b/ports/stm32/Makefile
@@ -34,7 +34,7 @@ MBOOT_TEXT0_ADDR ?= 0x08000000
 # include py core make definitions
 include $(TOP)/py/py.mk
 
-GIT_SUBMODULES = lib/libhydrogen lib/lwip lib/mbedtls lib/mynewt-nimble lib/stm32lib
+GIT_SUBMODULES = lib/libhydrogen lib/lwip lib/mbedtls lib/stm32lib
 
 MCU_SERIES_UPPER = $(shell echo $(MCU_SERIES) | tr '[:lower:]' '[:upper:]')
 CMSIS_MCU_LOWER = $(shell echo $(CMSIS_MCU) | tr '[:upper:]' '[:lower:]')
@@ -522,12 +522,14 @@ endif
 endif
 
 ifeq ($(MICROPY_BLUETOOTH_NIMBLE),1)
+GIT_SUBMODULES += lib/mynewt-nimble
 CFLAGS_MOD += -DMICROPY_PY_BLUETOOTH_ENABLE_L2CAP_CHANNELS=1
 include $(TOP)/extmod/nimble/nimble.mk
 SRC_C += mpnimbleport.c
 endif
 
 ifeq ($(MICROPY_BLUETOOTH_BTSTACK),1)
+GIT_SUBMODULES += lib/btstack
 MICROPY_BLUETOOTH_BTSTACK_H4 ?= 1
 include $(TOP)/extmod/btstack/btstack.mk
 SRC_C += mpbtstackport.c
diff --git a/tools/ci.sh b/tools/ci.sh
index a6e38b70eaf9f..efc68c03e4b28 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -267,6 +267,7 @@ function ci_stm32_pyb_build {
     make ${MAKEOPTS} -C mpy-cross
     make ${MAKEOPTS} -C ports/stm32 submodules
     git submodule update --init lib/btstack
+    git submodule update --init lib/mynewt-nimble
     make ${MAKEOPTS} -C ports/stm32 BOARD=PYBV11 MICROPY_PY_WIZNET5K=5200 MICROPY_PY_CC3K=1 USER_C_MODULES=../../examples/usercmodule
     make ${MAKEOPTS} -C ports/stm32 BOARD=PYBD_SF2
     make ${MAKEOPTS} -C ports/stm32 BOARD=PYBD_SF6 NANBOX=1 MICROPY_BLUETOOTH_NIMBLE=0 MICROPY_BLUETOOTH_BTSTACK=1
@@ -277,6 +278,7 @@ function ci_stm32_pyb_build {
 function ci_stm32_nucleo_build {
     make ${MAKEOPTS} -C mpy-cross
     make ${MAKEOPTS} -C ports/stm32 submodules
+    git submodule update --init lib/mynewt-nimble
     make ${MAKEOPTS} -C ports/stm32 BOARD=NUCLEO_F091RC
     make ${MAKEOPTS} -C ports/stm32 BOARD=NUCLEO_H743ZI CFLAGS_EXTRA='-DMICROPY_PY_THREAD=1'
     make ${MAKEOPTS} -C ports/stm32 BOARD=NUCLEO_L073RZ

From 40b8ff0a6fd737bdad8e0559994a55b7c2ce0786 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sat, 31 Jul 2021 15:09:16 +1000
Subject: [PATCH 1126/3533] stm32/README.md: Update supported MCUs, and
 submodule and mboot use.

Also mention mpremote as a way to access the REPL.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/README.md | 42 +++++++++++++++++++++++++++++++-----------
 1 file changed, 31 insertions(+), 11 deletions(-)

diff --git a/ports/stm32/README.md b/ports/stm32/README.md
index f2fdb4dd3bffe..6b5f096d73a50 100644
--- a/ports/stm32/README.md
+++ b/ports/stm32/README.md
@@ -2,11 +2,13 @@ MicroPython port to STM32 MCUs
 ==============================
 
 This directory contains the port of MicroPython to ST's line of STM32
-microcontrollers.  Supported MCU series are: STM32F0, STM32F4, STM32F7 and
-STM32L4.  Parts of the code here utilise the STM32Cube HAL library.
+microcontrollers.  Supported MCU series are: STM32F0, STM32F4, STM32F7,
+STM32H7, STM32L0, STM32L4 and STM32WB.  Parts of the code here utilise the
+STM32Cube HAL library.
 
 The officially supported boards are the line of pyboards: PYBv1.0 and PYBv1.1
-(both with STM32F405), and PYBLITEv1.0 (with STM32F411).  See
+(both with STM32F405), PYBLITEv1.0 (with STM32F411) and PYBD-SFx (with
+STM32F7xx MCUs).  See
 [micropython.org/pyboard](http://www.micropython.org/pyboard/) for further
 details.
 
@@ -40,18 +42,31 @@ see [here](https://launchpad.net/gcc-arm-embedded) for the main GCC ARM
 Embedded page.  The compiler can be changed using the `CROSS_COMPILE` variable
 when invoking `make`.
 
-First the submodules must be obtained using:
+Next, the board to build must be selected.  The default board is PYBV10 but any
+of the names of the subdirectories in the `boards/` directory is a valid board.
+The board name must be passed as the argument to `BOARD=` when invoking `make`.
 
-    $ make submodules
+All boards require certain submodules to be obtained before they can be built.
+The correct set of submodules can be initialised using (with `PYBV11` as an
+example of the selected board):
 
-Then to build for a given board, run:
+    $ make BOARD=PYBV11 submodules
+
+Then to build the board's firmware run:
 
     $ make BOARD=PYBV11
 
-The default board is PYBV10 but any of the names of the subdirectories in the
-`boards/` directory can be passed as the argument to `BOARD=`.  The above command
-should produce binary images in the `build-PYBV11/` subdirectory (or the
-equivalent directory for the board specified).
+The above command should produce binary images in the `build-PYBV11/`
+subdirectory (or the equivalent directory for the board specified).
+
+Note that some boards require the mboot bootloader to be built and deployed
+before flashing the main firmware.  For such boards an information message
+about this will be printed at the end of the main firmware build.  Mboot
+can be built via:
+
+    $ make -C mboot BOARD=STM32F769DISC
+
+For more information about mboot see mboot/README.md.
 
 
 ### Flashing the Firmware using DFU mode
@@ -140,6 +155,11 @@ Accessing the board
 -------------------
 
 Once built and deployed, access the MicroPython REPL (the Python prompt) via USB
-serial or UART, depending on the board.  For the pyboard you can try:
+serial or UART, depending on the board.  There are many ways to do this, one of
+which is via `mpremote` (install it using `pip install mpremote`):
+
+    $ mpremote
+
+Other options are `picocom` and `screen`, for example:
 
     $ picocom /dev/ttyACM0

From e29259d171300b9b8de81c736f717ba6de9c8253 Mon Sep 17 00:00:00 2001
From: oclyke <owen.lyke@sparkfun.com>
Date: Thu, 22 Jul 2021 17:42:30 -0600
Subject: [PATCH 1127/3533] extmod/uasyncio: In open_connection use address
 info in socket creation.

Rudimentary support for various address families.

Signed-off-by: oclyke <oclyke@gmail.com>
---
 extmod/uasyncio/stream.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/extmod/uasyncio/stream.py b/extmod/uasyncio/stream.py
index 8de2d2599fd1d..af3b8feab3588 100644
--- a/extmod/uasyncio/stream.py
+++ b/extmod/uasyncio/stream.py
@@ -79,8 +79,8 @@ async def open_connection(host, port):
     from uerrno import EINPROGRESS
     import usocket as socket
 
-    ai = socket.getaddrinfo(host, port)[0]  # TODO this is blocking!
-    s = socket.socket()
+    ai = socket.getaddrinfo(host, port, 0, socket.SOCK_STREAM)[0]  # TODO this is blocking!
+    s = socket.socket(ai[0], ai[1], ai[2])
     s.setblocking(False)
     ss = Stream(s)
     try:

From 1074c784b0b35c826e0c65b36d2e77ea17970103 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Tue, 20 Jul 2021 08:18:18 +0200
Subject: [PATCH 1128/3533] mimxrt: Add support for Hyperflash chips.

Hyperflash is used by the MIMXRT1050_EVKB, MIMXRT1060_EVK and
MIMXRT1064_EVK boards.

This commit includes:
- add support for Hyperflash
- modify MIMXRT1060_EVK and MIMXRT1064_EVK to change from QSPI to
  hyperflash.
- minor incidental changes to other boards so they still build

Note: Erasing a sector on the hyperflash is slow. It takes about a second,
which seems too long, but matches the data sheet.
---
 ports/mimxrt/Makefile                         |   3 +-
 .../boards/MIMXRT1010_EVK/mpconfigboard.h     |   1 +
 .../boards/MIMXRT1010_EVK/mpconfigboard.mk    |   3 +
 .../boards/MIMXRT1020_EVK/mpconfigboard.h     |   1 +
 .../boards/MIMXRT1020_EVK/mpconfigboard.mk    |   3 +
 .../boards/MIMXRT1050_EVK/mpconfigboard.h     |   1 +
 .../boards/MIMXRT1050_EVK/mpconfigboard.mk    |   3 +
 ports/mimxrt/boards/MIMXRT1052.ld             |   4 +-
 .../boards/MIMXRT1060_EVK/MIMXRT1060_EVK.ld   |   2 +-
 .../evkmimxrt1060_flexspi_nor_config.h        |  10 +-
 .../boards/MIMXRT1060_EVK/flash_config.c      | 242 ++++++++++-------
 .../boards/MIMXRT1060_EVK/mpconfigboard.h     |   1 +
 .../boards/MIMXRT1060_EVK/mpconfigboard.mk    |   3 +
 ports/mimxrt/boards/MIMXRT1064.ld             |   6 +-
 .../boards/MIMXRT1064_EVK/MIMXRT1064_EVK.ld   |   2 +-
 .../evkmimxrt1064_flexspi_nor_config.h        |  15 +-
 .../boards/MIMXRT1064_EVK/flash_config.c      | 241 ++++++++++-------
 .../boards/MIMXRT1064_EVK/mpconfigboard.h     |   1 +
 .../boards/MIMXRT1064_EVK/mpconfigboard.mk    |   3 +
 ports/mimxrt/boards/TEENSY40/mpconfigboard.h  |   1 +
 ports/mimxrt/boards/TEENSY40/mpconfigboard.mk |   3 +
 ports/mimxrt/boards/TEENSY41/mpconfigboard.h  |   1 +
 ports/mimxrt/boards/TEENSY41/mpconfigboard.mk |   3 +
 ports/mimxrt/boards/common.ld                 |   5 +
 ports/mimxrt/hal/flexspi_hyper_flash.c        | 247 ++++++++++++++++++
 ports/mimxrt/hal/flexspi_hyper_flash.h        |  71 +++++
 ports/mimxrt/hal/flexspi_nor_flash.h          |  21 ++
 ports/mimxrt/mimxrt_flash.c                   |  25 +-
 ports/mimxrt/mpconfigport.h                   |   1 +
 29 files changed, 725 insertions(+), 198 deletions(-)
 create mode 100644 ports/mimxrt/hal/flexspi_hyper_flash.c
 create mode 100644 ports/mimxrt/hal/flexspi_hyper_flash.h

diff --git a/ports/mimxrt/Makefile b/ports/mimxrt/Makefile
index 580dc32c7eb16..818a2a3c84e3e 100644
--- a/ports/mimxrt/Makefile
+++ b/ports/mimxrt/Makefile
@@ -133,7 +133,7 @@ SRC_HAL_IMX_C += \
 	$(MCU_DIR)/drivers/fsl_snvs_lp.c \
 	$(MCU_DIR)/drivers/fsl_trng.c \
 
-SRC_C = \
+SRC_C += \
 	main.c \
 	led.c \
 	pin.c \
@@ -156,7 +156,6 @@ SRC_C = \
 	modmimxrt.c \
 	moduos.c \
 	mphalport.c \
-	hal/flexspi_nor_flash.c \
 	shared/libc/printf.c \
 	shared/libc/string0.c \
 	shared/readline/readline.c \
diff --git a/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.h b/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.h
index 756eaf85eb7b5..2cdb433e18e69 100644
--- a/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.h
+++ b/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.h
@@ -8,6 +8,7 @@
 #define MICROPY_HW_LED_ON(pin) (mp_hal_pin_high(pin))
 #define MICROPY_HW_LED_OFF(pin) (mp_hal_pin_low(pin))
 #define BOARD_FLASH_CONFIG_HEADER_H "evkmimxrt1010_flexspi_nor_config.h"
+#define BOARD_FLASH_OPS_HEADER_H "hal/flexspi_nor_flash.h"
 
 #define MICROPY_HW_NUM_PIN_IRQS (2 * 32)
 
diff --git a/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.mk b/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.mk
index ca8efcd5bf5df..ccc8ffeb4144d 100644
--- a/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.mk
+++ b/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.mk
@@ -3,6 +3,9 @@ MCU_VARIANT = MIMXRT1011DAE5A
 
 MICROPY_FLOAT_IMPL = single
 
+SRC_C += \
+	hal/flexspi_nor_flash.c \
+
 JLINK_PATH = /media/RT1010-EVK/
 JLINK_COMMANDER_SCRIPT = $(BUILD)/script.jlink
 
diff --git a/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.h b/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.h
index b0574fad0f3e5..d2a2cbbdbd1fd 100644
--- a/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.h
+++ b/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.h
@@ -9,6 +9,7 @@
 #define MICROPY_HW_LED_ON(pin) (mp_hal_pin_low(pin))
 #define MICROPY_HW_LED_OFF(pin) (mp_hal_pin_high(pin))
 #define BOARD_FLASH_CONFIG_HEADER_H "evkmimxrt1020_flexspi_nor_config.h"
+#define BOARD_FLASH_OPS_HEADER_H "hal/flexspi_nor_flash.h"
 
 #define MICROPY_HW_NUM_PIN_IRQS (3 * 32)
 
diff --git a/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.mk b/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.mk
index b0bbd705cbfc9..f8f66b0dff7cd 100644
--- a/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.mk
+++ b/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.mk
@@ -3,6 +3,9 @@ MCU_VARIANT = MIMXRT1021DAG5A
 
 MICROPY_FLOAT_IMPL = double
 
+SRC_C += \
+	hal/flexspi_nor_flash.c \
+
 JLINK_PATH ?= /media/RT1020-EVK/
 JLINK_COMMANDER_SCRIPT = $(BUILD)/script.jlink
 
diff --git a/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.h b/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.h
index 5d920d52867e2..af0975bc17a94 100644
--- a/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.h
+++ b/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.h
@@ -8,6 +8,7 @@
 #define MICROPY_HW_LED_ON(pin) (mp_hal_pin_low(pin))
 #define MICROPY_HW_LED_OFF(pin) (mp_hal_pin_high(pin))
 #define BOARD_FLASH_CONFIG_HEADER_H "evkmimxrt1050_flexspi_nor_config.h"
+#define BOARD_FLASH_OPS_HEADER_H "hal/flexspi_nor_flash.h"
 
 #define MICROPY_HW_NUM_PIN_IRQS (4 * 32 + 3)
 
diff --git a/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.mk b/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.mk
index e338ec6cf8af6..61826b6f606c5 100644
--- a/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.mk
+++ b/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.mk
@@ -3,6 +3,9 @@ MCU_VARIANT = MIMXRT1052DVL6B
 
 MICROPY_FLOAT_IMPL = double
 
+SRC_C += \
+	hal/flexspi_nor_flash.c \
+
 JLINK_PATH ?= /media/RT1050-EVK/
 
 deploy: $(BUILD)/firmware.bin
diff --git a/ports/mimxrt/boards/MIMXRT1052.ld b/ports/mimxrt/boards/MIMXRT1052.ld
index f78773531a9f7..75192979406d9 100644
--- a/ports/mimxrt/boards/MIMXRT1052.ld
+++ b/ports/mimxrt/boards/MIMXRT1052.ld
@@ -8,8 +8,8 @@ ivt_size            = 0x00001000;
 interrupts_start    = 0x60002000;
 interrupts_size     = 0x00000400;
 text_start          = 0x60002400;
-text_size           = ((((text_start) + 1M) + (4k - 1)) & ~(4k - 1)) - (text_start); /* reserve 1M for code but align on 4k boundary */
-vfs_start           = (text_start) + (text_size);
+vfs_start           = 0x60100000;
+text_size           = ((vfs_start) - (text_start));
 vfs_size            = ((flash_end) - (vfs_start));
 itcm_start          = 0x00000000;
 itcm_size           = 0x00020000;
diff --git a/ports/mimxrt/boards/MIMXRT1060_EVK/MIMXRT1060_EVK.ld b/ports/mimxrt/boards/MIMXRT1060_EVK/MIMXRT1060_EVK.ld
index fd1bf32ede778..f616178a9bed2 100644
--- a/ports/mimxrt/boards/MIMXRT1060_EVK/MIMXRT1060_EVK.ld
+++ b/ports/mimxrt/boards/MIMXRT1060_EVK/MIMXRT1060_EVK.ld
@@ -1 +1 @@
-flash_size = 8M;
\ No newline at end of file
+flash_size = 64M;
\ No newline at end of file
diff --git a/ports/mimxrt/boards/MIMXRT1060_EVK/evkmimxrt1060_flexspi_nor_config.h b/ports/mimxrt/boards/MIMXRT1060_EVK/evkmimxrt1060_flexspi_nor_config.h
index 03bdac1f1cb82..cff520e0e267c 100644
--- a/ports/mimxrt/boards/MIMXRT1060_EVK/evkmimxrt1060_flexspi_nor_config.h
+++ b/ports/mimxrt/boards/MIMXRT1060_EVK/evkmimxrt1060_flexspi_nor_config.h
@@ -10,7 +10,7 @@
 
 #include <stdint.h>
 #include <stdbool.h>
-#include "fsl_common.h"
+#include "fsl_flexspi.h"
 
 /*! @name Driver version */
 /*@{*/
@@ -224,6 +224,14 @@ typedef struct _FlexSPIConfig
 #define NOR_CMD_LUT_SEQ_IDX_CHIPERASE 11
 #define NOR_CMD_LUT_SEQ_IDX_EXITQPI 12
 
+#define HYPERFLASH_CMD_LUT_SEQ_IDX_READDATA    0
+#define HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEDATA   1
+#define HYPERFLASH_CMD_LUT_SEQ_IDX_READSTATUS  2
+#define HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEENABLE 4
+#define HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR 6
+#define HYPERFLASH_CMD_LUT_SEQ_IDX_PAGEPROGRAM 10
+#define HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP   12
+
 /*
  *  Serial NOR configuration block
  */
diff --git a/ports/mimxrt/boards/MIMXRT1060_EVK/flash_config.c b/ports/mimxrt/boards/MIMXRT1060_EVK/flash_config.c
index 3fa584b73af8e..e28f58154751d 100644
--- a/ports/mimxrt/boards/MIMXRT1060_EVK/flash_config.c
+++ b/ports/mimxrt/boards/MIMXRT1060_EVK/flash_config.c
@@ -25,98 +25,162 @@ __attribute__((section(".boot_hdr.conf")))
 const flexspi_nor_config_t qspiflash_config = {
     .memConfig =
         {
-            .tag              = FLEXSPI_CFG_BLK_TAG,
-            .version          = FLEXSPI_CFG_BLK_VERSION,
-            .readSampleClkSrc = kFlexSPIReadSampleClk_LoopbackFromDqsPad,
-            .csHoldTime       = 3u,
-            .csSetupTime      = 3u,
-            .sflashPadType    = kSerialFlash_4Pads,
-            .serialClkFreq    = kFlexSpiSerialClk_100MHz,
-            .sflashA1Size     = 8u * 1024u * 1024u,
+            .tag                = FLEXSPI_CFG_BLK_TAG,
+            .version            = FLEXSPI_CFG_BLK_VERSION,
+            .readSampleClkSrc   = kFlexSPIReadSampleClk_ExternalInputFromDqsPad,
+            .csHoldTime         = 3u,
+            .csSetupTime        = 3u,
+            .columnAddressWidth = 3u,
+            // Enable DDR mode, Wordaddressable, Safe configuration, Differential clock
+            .controllerMiscOption =
+                (1u << kFlexSpiMiscOffset_DdrModeEnable) | (1u << kFlexSpiMiscOffset_WordAddressableEnable) |
+                (1u << kFlexSpiMiscOffset_SafeConfigFreqEnable) | (1u << kFlexSpiMiscOffset_DiffClkEnable),
+            .sflashPadType = kSerialFlash_8Pads,
+            .serialClkFreq = kFlexSpiSerialClk_133MHz,
+            .sflashA1Size  = 64u * 1024u * 1024u,
+            .dataValidTime = {16u, 16u},
             .lookupTable =
                 {
-                    // 0 Read LUTs 0 -> 0
-                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0xEB, RADDR_SDR, FLEXSPI_4PAD, 0x18),
-                    FLEXSPI_LUT_SEQ(DUMMY_SDR, FLEXSPI_4PAD, 0x06, READ_SDR, FLEXSPI_4PAD, 0x04),
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-
-                    // 1 Read status register -> 1
-                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x05, READ_SDR, FLEXSPI_1PAD, 0x01),
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-
-                    // 2 Fast read quad mode - SDR
-                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x6B, RADDR_SDR, FLEXSPI_1PAD, 0x18),
-                    FLEXSPI_LUT_SEQ(DUMMY_SDR, FLEXSPI_4PAD, 0x08, READ_SDR, FLEXSPI_4PAD, 0x04),
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-
-                    // 3 Write Enable -> 3
-                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x06, STOP, FLEXSPI_1PAD, 0),
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-
-                    // 4 Read extend parameters
-                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x81, READ_SDR, FLEXSPI_1PAD, 0x04),
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-
-                    // 5 Erase Sector -> 5
-                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x20, RADDR_SDR, FLEXSPI_1PAD, 24),
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-
-                    // 6 Write Status Reg
-                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x01, WRITE_SDR, FLEXSPI_1PAD, 0x04),
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-
-                    // 7 Page Program - quad mode (-> 9)
-                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x32, RADDR_SDR, FLEXSPI_1PAD, 0x18),
-                    FLEXSPI_LUT_SEQ(WRITE_SDR, FLEXSPI_4PAD, 0x04, STOP, FLEXSPI_1PAD, 0),
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-
-                    // 8 Read ID
-                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x90, DUMMY_SDR, FLEXSPI_1PAD, 24),
-                    FLEXSPI_LUT_SEQ(READ_SDR, FLEXSPI_1PAD, 0x00, 0, 0, 0),
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-
-                    // 9 Page Program - single mode -> 9
-                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x02, RADDR_SDR, FLEXSPI_1PAD, 24),
-                    FLEXSPI_LUT_SEQ(WRITE_SDR, FLEXSPI_1PAD, 0, 0, 0, 0),
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-
-                    // 10 Enter QPI mode
-                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x35, STOP, FLEXSPI_1PAD, 0),
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-
-                    // 11 Erase Chip
-                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x60, STOP, FLEXSPI_1PAD, 0),
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-
-                    // 12 Exit QPI mode
-                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_4PAD, 0xF5, STOP, FLEXSPI_1PAD, 0),
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    /* 0 Read Data */
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_READDATA] =
+                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xA0, kFLEXSPI_Command_RADDR_DDR, kFLEXSPI_8PAD, 0x18),
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_READDATA + 1] = FLEXSPI_LUT_SEQ(
+                        kFLEXSPI_Command_CADDR_DDR, kFLEXSPI_8PAD, 0x10, kFLEXSPI_Command_READ_DDR, kFLEXSPI_8PAD, 0x04),
+
+                    /* 1 Write Data */
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEDATA] =
+                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x20, kFLEXSPI_Command_RADDR_DDR, kFLEXSPI_8PAD, 0x18),
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEDATA + 1] = FLEXSPI_LUT_SEQ(
+                        kFLEXSPI_Command_CADDR_DDR, kFLEXSPI_8PAD, 0x10, kFLEXSPI_Command_WRITE_DDR, kFLEXSPI_8PAD, 0x02),
+
+                    /* 2 Read Status */
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_READSTATUS] =
+                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00),
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_READSTATUS + 1] = FLEXSPI_LUT_SEQ(
+                        kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xAA), // ADDR 0x555
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_READSTATUS + 2] =
+                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x05),
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_READSTATUS + 3] = FLEXSPI_LUT_SEQ(
+                        kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x70), // DATA 0x70
+                    // +1
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_READSTATUS + 4] =
+                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xA0, kFLEXSPI_Command_RADDR_DDR, kFLEXSPI_8PAD, 0x18),
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_READSTATUS + 5] = FLEXSPI_LUT_SEQ(
+                        kFLEXSPI_Command_CADDR_DDR, kFLEXSPI_8PAD, 0x10, kFLEXSPI_Command_DUMMY_RWDS_DDR, kFLEXSPI_8PAD, 0x0B),
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_READSTATUS + 6] =
+                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_READ_DDR, kFLEXSPI_8PAD, 0x04, kFLEXSPI_Command_STOP, kFLEXSPI_1PAD, 0x0),
+
+                    /* 4 Write Enable */
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEENABLE] =
+                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x20, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00),
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEENABLE + 1] = FLEXSPI_LUT_SEQ(
+                        kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xAA), // ADDR 0x555
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEENABLE + 2] =
+                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x05),
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEENABLE + 3] = FLEXSPI_LUT_SEQ(
+                        kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xAA), // DATA 0xAA
+                    // +1
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEENABLE + 4] =
+                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x20, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00),
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEENABLE + 5] =
+                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x55),
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEENABLE + 6] =
+                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x02),
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEENABLE + 7] =
+                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x55),
+
+                    /* 6 Erase Sector  */
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR] =
+                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00),
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 1] = FLEXSPI_LUT_SEQ(
+                        kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xAA), // ADDR 0x555
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 2] =
+                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x05),
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 3] = FLEXSPI_LUT_SEQ(
+                        kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x80), // DATA 0x80
+                    // +1
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 4] =
+                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00),
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 5] =
+                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xAA),
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 6] =
+                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x05),
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 7] = FLEXSPI_LUT_SEQ(
+                        kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xAA), // ADDR 0x555
+                    // +2
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 8] =
+                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00),
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 9] =
+                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x55),
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 10] =
+                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x02),
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 11] =
+                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x55),
+                    // +3
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 12] =
+                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_RADDR_DDR, kFLEXSPI_8PAD, 0x18),
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 13] =
+                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_CADDR_DDR, kFLEXSPI_8PAD, 0x10, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00),
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 14] =
+                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x30, kFLEXSPI_Command_STOP, kFLEXSPI_1PAD, 0x00),
+
+                    /* 10 program page with word program command sequence */
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_PAGEPROGRAM] =
+                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x20, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00),
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_PAGEPROGRAM + 1] = FLEXSPI_LUT_SEQ(
+                        kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xAA), // ADDR 0x555
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_PAGEPROGRAM + 2] =
+                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x05),
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_PAGEPROGRAM + 3] = FLEXSPI_LUT_SEQ(
+                        kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xA0), // DATA 0xA0
+                    // +1
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_PAGEPROGRAM + 4] =
+                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x20, kFLEXSPI_Command_RADDR_DDR, kFLEXSPI_8PAD, 0x18),
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_PAGEPROGRAM + 5] = FLEXSPI_LUT_SEQ(
+                        kFLEXSPI_Command_CADDR_DDR, kFLEXSPI_8PAD, 0x10, kFLEXSPI_Command_WRITE_DDR, kFLEXSPI_8PAD, 0x80),
+
+                    /* 12 Erase chip */
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP] =
+                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00),
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 1] =
+                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xAA),
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 2] =
+                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x05),
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 3] =
+                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x80),
+                    // +1
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 4] =
+                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00),
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 5] =
+                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xAA),
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 6] =
+                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x05),
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 7] =
+                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xAA),
+                    // +2
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 8] =
+                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00),
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 9] =
+                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x55),
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 10] =
+                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x02),
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 11] =
+                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x55),
+                    // +3
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 12] =
+                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00),
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 13] =
+                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xAA),
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 14] =
+                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x05),
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 15] =
+                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x10),
                 },
         },
-    .pageSize           = 256u,
-    .sectorSize         = 4u * 1024u,
-    .blockSize          = 64u * 1024u,
-    .isUniformBlockSize = false,
+    .pageSize           = 512u,
+    .sectorSize         = 256u * 1024u,
+    .blockSize          = 256u * 1024u,
+    .isUniformBlockSize = true,
 };
+
 #endif /* XIP_BOOT_HEADER_ENABLE */
diff --git a/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.h b/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.h
index f849cba966131..c207da832e5eb 100644
--- a/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.h
+++ b/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.h
@@ -8,6 +8,7 @@
 #define MICROPY_HW_LED_ON(pin) (mp_hal_pin_low(pin))
 #define MICROPY_HW_LED_OFF(pin) (mp_hal_pin_high(pin))
 #define BOARD_FLASH_CONFIG_HEADER_H "evkmimxrt1060_flexspi_nor_config.h"
+#define BOARD_FLASH_OPS_HEADER_H "hal/flexspi_hyper_flash.h"
 
 #define MICROPY_HW_NUM_PIN_IRQS (4 * 32 + 3)
 
diff --git a/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.mk b/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.mk
index b7ea5fcbe1974..f5eaf3eab568d 100644
--- a/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.mk
+++ b/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.mk
@@ -3,6 +3,9 @@ MCU_VARIANT = MIMXRT1062DVJ6A
 
 MICROPY_FLOAT_IMPL = double
 
+SRC_C += \
+	hal/flexspi_hyper_flash.c \
+
 JLINK_PATH ?= /media/RT1060-EVK/
 JLINK_COMMANDER_SCRIPT = $(BUILD)/script.jlink
 
diff --git a/ports/mimxrt/boards/MIMXRT1064.ld b/ports/mimxrt/boards/MIMXRT1064.ld
index 236d984293e23..820393001745b 100644
--- a/ports/mimxrt/boards/MIMXRT1064.ld
+++ b/ports/mimxrt/boards/MIMXRT1064.ld
@@ -8,8 +8,8 @@ ivt_size            = 0x00001000;
 interrupts_start    = 0x60002000;
 interrupts_size     = 0x00000400;
 text_start          = 0x60002400;
-text_size           = ((((text_start) + 1M) + (4k - 1)) & ~(4k - 1)) - (text_start); /* reserve 1M for code but align on 4k boundary */
-vfs_start           = (text_start) + (text_size);
+vfs_start           = 0x60100000;
+text_size           = ((vfs_start) - (text_start));
 vfs_size            = ((flash_end) - (vfs_start));
 itcm_start          = 0x00000000;
 itcm_size           = 0x00020000;
@@ -25,4 +25,4 @@ _sstack = __StackLimit;
 
 /* Use second OCRAM bank for GC heap. */
 _gc_heap_start = ORIGIN(m_ocrm);
-_gc_heap_end = ORIGIN(m_ocrm) + LENGTH(m_ocrm);
\ No newline at end of file
+_gc_heap_end = ORIGIN(m_ocrm) + LENGTH(m_ocrm);
diff --git a/ports/mimxrt/boards/MIMXRT1064_EVK/MIMXRT1064_EVK.ld b/ports/mimxrt/boards/MIMXRT1064_EVK/MIMXRT1064_EVK.ld
index fd1bf32ede778..f616178a9bed2 100644
--- a/ports/mimxrt/boards/MIMXRT1064_EVK/MIMXRT1064_EVK.ld
+++ b/ports/mimxrt/boards/MIMXRT1064_EVK/MIMXRT1064_EVK.ld
@@ -1 +1 @@
-flash_size = 8M;
\ No newline at end of file
+flash_size = 64M;
\ No newline at end of file
diff --git a/ports/mimxrt/boards/MIMXRT1064_EVK/evkmimxrt1064_flexspi_nor_config.h b/ports/mimxrt/boards/MIMXRT1064_EVK/evkmimxrt1064_flexspi_nor_config.h
index 3c433f3be9960..7560f248368ce 100644
--- a/ports/mimxrt/boards/MIMXRT1064_EVK/evkmimxrt1064_flexspi_nor_config.h
+++ b/ports/mimxrt/boards/MIMXRT1064_EVK/evkmimxrt1064_flexspi_nor_config.h
@@ -10,7 +10,7 @@
 
 #include <stdint.h>
 #include <stdbool.h>
-#include "fsl_common.h"
+#include "fsl_flexspi.h"
 
 /*! @name Driver version */
 /*@{*/
@@ -19,9 +19,9 @@
 /*@}*/
 
 /* FLEXSPI memory config block related defintions */
-#define FLEXSPI_CFG_BLK_TAG (0x42464346UL)     // ascii "FCFB" Big Endian
+#define FLEXSPI_CFG_BLK_TAG     (0x42464346UL) // ascii "FCFB" Big Endian
 #define FLEXSPI_CFG_BLK_VERSION (0x56010400UL) // V1.4.0
-#define FLEXSPI_CFG_BLK_SIZE (512)
+#define FLEXSPI_CFG_BLK_SIZE    (512)
 
 /* FLEXSPI Feature related definitions */
 #define FLEXSPI_FEATURE_HAS_PARALLEL_MODE 1
@@ -223,6 +223,15 @@ typedef struct _FlexSPIConfig
 #define NOR_CMD_LUT_SEQ_IDX_ENTERQPI 10
 #define NOR_CMD_LUT_SEQ_IDX_CHIPERASE 11
 #define NOR_CMD_LUT_SEQ_IDX_EXITQPI 12
+
+#define HYPERFLASH_CMD_LUT_SEQ_IDX_READDATA    0
+#define HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEDATA   1
+#define HYPERFLASH_CMD_LUT_SEQ_IDX_READSTATUS  2
+#define HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEENABLE 4
+#define HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR 6
+#define HYPERFLASH_CMD_LUT_SEQ_IDX_PAGEPROGRAM 10
+#define HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP   12
+
 /*
  *  Serial NOR configuration block
  */
diff --git a/ports/mimxrt/boards/MIMXRT1064_EVK/flash_config.c b/ports/mimxrt/boards/MIMXRT1064_EVK/flash_config.c
index 9338c6948ad56..f308b7f8add4d 100644
--- a/ports/mimxrt/boards/MIMXRT1064_EVK/flash_config.c
+++ b/ports/mimxrt/boards/MIMXRT1064_EVK/flash_config.c
@@ -25,99 +25,162 @@ __attribute__((section(".boot_hdr.conf")))
 const flexspi_nor_config_t qspiflash_config = {
     .memConfig =
         {
-            .tag              = FLEXSPI_CFG_BLK_TAG,
-            .version          = FLEXSPI_CFG_BLK_VERSION,
-            .readSampleClkSrc = kFlexSPIReadSampleClk_LoopbackFromDqsPad,
-            .csHoldTime       = 3u,
-            .csSetupTime      = 3u,
-            // Enable DDR mode, Wordaddassable, Safe configuration, Differential clock
-            .sflashPadType = kSerialFlash_4Pads,
-            .serialClkFreq = kFlexSpiSerialClk_100MHz,
-            .sflashA1Size  = 8u * 1024u * 1024u,
+            .tag                = FLEXSPI_CFG_BLK_TAG,
+            .version            = FLEXSPI_CFG_BLK_VERSION,
+            .readSampleClkSrc   = kFlexSPIReadSampleClk_ExternalInputFromDqsPad,
+            .csHoldTime         = 3u,
+            .csSetupTime        = 3u,
+            .columnAddressWidth = 3u,
+            // Enable DDR mode, Wordaddressable, Safe configuration, Differential clock
+            .controllerMiscOption =
+                (1u << kFlexSpiMiscOffset_DdrModeEnable) | (1u << kFlexSpiMiscOffset_WordAddressableEnable) |
+                (1u << kFlexSpiMiscOffset_SafeConfigFreqEnable) | (1u << kFlexSpiMiscOffset_DiffClkEnable),
+            .sflashPadType = kSerialFlash_8Pads,
+            .serialClkFreq = kFlexSpiSerialClk_133MHz,
+            .sflashA1Size  = 64u * 1024u * 1024u,
+            .dataValidTime = {16u, 16u},
             .lookupTable =
                 {
-                    // 0 Read LUTs 0 -> 0
-                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0xEB, RADDR_SDR, FLEXSPI_4PAD, 0x18),
-                    FLEXSPI_LUT_SEQ(DUMMY_SDR, FLEXSPI_4PAD, 0x06, READ_SDR, FLEXSPI_4PAD, 0x04),
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-
-                    // 1 Read status register -> 1
-                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x05, READ_SDR, FLEXSPI_1PAD, 0x01),
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-
-                    // 2 Fast read quad mode - SDR
-                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x6B, RADDR_SDR, FLEXSPI_1PAD, 0x18),
-                    FLEXSPI_LUT_SEQ(DUMMY_SDR, FLEXSPI_4PAD, 0x08, READ_SDR, FLEXSPI_4PAD, 0x04),
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-
-                    // 3 Write Enable -> 3
-                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x06, STOP, FLEXSPI_1PAD, 0),
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-
-                    // 4 Read extend parameters
-                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x81, READ_SDR, FLEXSPI_1PAD, 0x04),
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-
-                    // 5 Erase Sector -> 5
-                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x20, RADDR_SDR, FLEXSPI_1PAD, 24),
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-
-                    // 6 Write Status Reg
-                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x01, WRITE_SDR, FLEXSPI_1PAD, 0x04),
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-
-                    // 7 Page Program - quad mode (-> 9)
-                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x32, RADDR_SDR, FLEXSPI_1PAD, 0x18),
-                    FLEXSPI_LUT_SEQ(WRITE_SDR, FLEXSPI_4PAD, 0x04, STOP, FLEXSPI_1PAD, 0),
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-
-                    // 8 Read ID
-                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x90, DUMMY_SDR, FLEXSPI_1PAD, 24),
-                    FLEXSPI_LUT_SEQ(READ_SDR, FLEXSPI_1PAD, 0x00, 0, 0, 0),
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-
-                    // 9 Page Program - single mode -> 9
-                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x02, RADDR_SDR, FLEXSPI_1PAD, 24),
-                    FLEXSPI_LUT_SEQ(WRITE_SDR, FLEXSPI_1PAD, 0, 0, 0, 0),
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-
-                    // 10 Enter QPI mode
-                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x35, STOP, FLEXSPI_1PAD, 0),
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-
-                    // 11 Erase Chip
-                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x60, STOP, FLEXSPI_1PAD, 0),
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-
-                    // 12 Exit QPI mode
-                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_4PAD, 0xF5, STOP, FLEXSPI_1PAD, 0),
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
+                    /* 0 Read Data */
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_READDATA] =
+                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xA0, kFLEXSPI_Command_RADDR_DDR, kFLEXSPI_8PAD, 0x18),
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_READDATA + 1] = FLEXSPI_LUT_SEQ(
+                        kFLEXSPI_Command_CADDR_DDR, kFLEXSPI_8PAD, 0x10, kFLEXSPI_Command_READ_DDR, kFLEXSPI_8PAD, 0x04),
+
+                    /* 1 Write Data */
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEDATA] =
+                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x20, kFLEXSPI_Command_RADDR_DDR, kFLEXSPI_8PAD, 0x18),
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEDATA + 1] = FLEXSPI_LUT_SEQ(
+                        kFLEXSPI_Command_CADDR_DDR, kFLEXSPI_8PAD, 0x10, kFLEXSPI_Command_WRITE_DDR, kFLEXSPI_8PAD, 0x02),
+
+                    /* 2 Read Status */
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_READSTATUS] =
+                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00),
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_READSTATUS + 1] = FLEXSPI_LUT_SEQ(
+                        kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xAA), // ADDR 0x555
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_READSTATUS + 2] =
+                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x05),
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_READSTATUS + 3] = FLEXSPI_LUT_SEQ(
+                        kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x70), // DATA 0x70
+                    // +1
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_READSTATUS + 4] =
+                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xA0, kFLEXSPI_Command_RADDR_DDR, kFLEXSPI_8PAD, 0x18),
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_READSTATUS + 5] = FLEXSPI_LUT_SEQ(
+                        kFLEXSPI_Command_CADDR_DDR, kFLEXSPI_8PAD, 0x10, kFLEXSPI_Command_DUMMY_RWDS_DDR, kFLEXSPI_8PAD, 0x0B),
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_READSTATUS + 6] =
+                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_READ_DDR, kFLEXSPI_8PAD, 0x04, kFLEXSPI_Command_STOP, kFLEXSPI_1PAD, 0x0),
+
+                    /* 4 Write Enable */
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEENABLE] =
+                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x20, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00),
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEENABLE + 1] = FLEXSPI_LUT_SEQ(
+                        kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xAA), // ADDR 0x555
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEENABLE + 2] =
+                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x05),
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEENABLE + 3] = FLEXSPI_LUT_SEQ(
+                        kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xAA), // DATA 0xAA
+                    // +1
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEENABLE + 4] =
+                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x20, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00),
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEENABLE + 5] =
+                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x55),
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEENABLE + 6] =
+                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x02),
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEENABLE + 7] =
+                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x55),
+
+                    /* 6 Erase Sector  */
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR] =
+                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00),
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 1] = FLEXSPI_LUT_SEQ(
+                        kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xAA), // ADDR 0x555
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 2] =
+                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x05),
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 3] = FLEXSPI_LUT_SEQ(
+                        kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x80), // DATA 0x80
+                    // +1
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 4] =
+                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00),
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 5] =
+                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xAA),
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 6] =
+                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x05),
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 7] = FLEXSPI_LUT_SEQ(
+                        kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xAA), // ADDR 0x555
+                    // +2
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 8] =
+                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00),
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 9] =
+                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x55),
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 10] =
+                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x02),
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 11] =
+                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x55),
+                    // +3
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 12] =
+                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_RADDR_DDR, kFLEXSPI_8PAD, 0x18),
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 13] =
+                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_CADDR_DDR, kFLEXSPI_8PAD, 0x10, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00),
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 14] =
+                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x30, kFLEXSPI_Command_STOP, kFLEXSPI_1PAD, 0x00),
+
+                    /* 10 program page with word program command sequence */
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_PAGEPROGRAM] =
+                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x20, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00),
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_PAGEPROGRAM + 1] = FLEXSPI_LUT_SEQ(
+                        kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xAA), // ADDR 0x555
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_PAGEPROGRAM + 2] =
+                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x05),
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_PAGEPROGRAM + 3] = FLEXSPI_LUT_SEQ(
+                        kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xA0), // DATA 0xA0
+                    // +1
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_PAGEPROGRAM + 4] =
+                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x20, kFLEXSPI_Command_RADDR_DDR, kFLEXSPI_8PAD, 0x18),
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_PAGEPROGRAM + 5] = FLEXSPI_LUT_SEQ(
+                        kFLEXSPI_Command_CADDR_DDR, kFLEXSPI_8PAD, 0x10, kFLEXSPI_Command_WRITE_DDR, kFLEXSPI_8PAD, 0x80),
+
+                    /* 12 Erase chip */
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP] =
+                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00),
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 1] =
+                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xAA),
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 2] =
+                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x05),
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 3] =
+                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x80),
+                    // +1
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 4] =
+                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00),
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 5] =
+                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xAA),
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 6] =
+                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x05),
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 7] =
+                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xAA),
+                    // +2
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 8] =
+                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00),
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 9] =
+                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x55),
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 10] =
+                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x02),
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 11] =
+                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x55),
+                    // +3
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 12] =
+                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00),
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 13] =
+                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xAA),
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 14] =
+                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x05),
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 15] =
+                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x10),
                 },
         },
-    .pageSize           = 256u,
-    .sectorSize         = 4u * 1024u,
+    .pageSize           = 512u,
+    .sectorSize         = 256u * 1024u,
     .blockSize          = 256u * 1024u,
-    .isUniformBlockSize = false,
+    .isUniformBlockSize = true,
 };
+
 #endif /* XIP_BOOT_HEADER_ENABLE */
diff --git a/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.h b/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.h
index 2301f34131c70..59f28b0e2a5cf 100644
--- a/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.h
+++ b/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.h
@@ -6,6 +6,7 @@
 #define MICROPY_HW_LED_ON(pin) (mp_hal_pin_low(pin))
 #define MICROPY_HW_LED_OFF(pin) (mp_hal_pin_high(pin))
 #define BOARD_FLASH_CONFIG_HEADER_H "evkmimxrt1064_flexspi_nor_config.h"
+#define BOARD_FLASH_OPS_HEADER_H "hal/flexspi_hyper_flash.h"
 
 #define MICROPY_HW_NUM_PIN_IRQS (4 * 32 + 3)
 
diff --git a/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.mk b/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.mk
index bd4c496416ac3..444fe99672097 100644
--- a/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.mk
+++ b/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.mk
@@ -3,6 +3,9 @@ MCU_VARIANT = MIMXRT1064DVL6A
 
 MICROPY_FLOAT_IMPL = double
 
+SRC_C += \
+	hal/flexspi_hyper_flash.c \
+
 JLINK_PATH ?= /media/RT1064-EVK/
 
 CFLAGS += -DBOARD_FLASH_SIZE=0x400000
diff --git a/ports/mimxrt/boards/TEENSY40/mpconfigboard.h b/ports/mimxrt/boards/TEENSY40/mpconfigboard.h
index b6c81a42298ec..aacee4623cd92 100644
--- a/ports/mimxrt/boards/TEENSY40/mpconfigboard.h
+++ b/ports/mimxrt/boards/TEENSY40/mpconfigboard.h
@@ -8,6 +8,7 @@
 #define MICROPY_HW_LED_ON(pin) (mp_hal_pin_high(pin))
 #define MICROPY_HW_LED_OFF(pin) (mp_hal_pin_low(pin))
 #define BOARD_FLASH_CONFIG_HEADER_H "teensy40_flexspi_nor_config.h"
+#define BOARD_FLASH_OPS_HEADER_H "hal/flexspi_nor_flash.h"
 
 #define MICROPY_HW_NUM_PIN_IRQS (4 * 32 + 3)
 
diff --git a/ports/mimxrt/boards/TEENSY40/mpconfigboard.mk b/ports/mimxrt/boards/TEENSY40/mpconfigboard.mk
index beab16c08600c..a15dd78128905 100644
--- a/ports/mimxrt/boards/TEENSY40/mpconfigboard.mk
+++ b/ports/mimxrt/boards/TEENSY40/mpconfigboard.mk
@@ -3,5 +3,8 @@ MCU_VARIANT = MIMXRT1062DVJ6A
 
 MICROPY_FLOAT_IMPL = double
 
+SRC_C += \
+	hal/flexspi_nor_flash.c \
+
 deploy: $(BUILD)/firmware.hex
 	teensy_loader_cli --mcu=imxrt1062 -v -w $<
diff --git a/ports/mimxrt/boards/TEENSY41/mpconfigboard.h b/ports/mimxrt/boards/TEENSY41/mpconfigboard.h
index 17d2751682585..a72bd127b6ad0 100644
--- a/ports/mimxrt/boards/TEENSY41/mpconfigboard.h
+++ b/ports/mimxrt/boards/TEENSY41/mpconfigboard.h
@@ -8,6 +8,7 @@
 #define MICROPY_HW_LED_ON(pin) (mp_hal_pin_high(pin))
 #define MICROPY_HW_LED_OFF(pin) (mp_hal_pin_low(pin))
 #define BOARD_FLASH_CONFIG_HEADER_H "teensy41_flexspi_nor_config.h"
+#define BOARD_FLASH_OPS_HEADER_H "hal/flexspi_nor_flash.h"
 
 #define MICROPY_HW_NUM_PIN_IRQS (4 * 32 + 3)
 
diff --git a/ports/mimxrt/boards/TEENSY41/mpconfigboard.mk b/ports/mimxrt/boards/TEENSY41/mpconfigboard.mk
index beab16c08600c..a15dd78128905 100755
--- a/ports/mimxrt/boards/TEENSY41/mpconfigboard.mk
+++ b/ports/mimxrt/boards/TEENSY41/mpconfigboard.mk
@@ -3,5 +3,8 @@ MCU_VARIANT = MIMXRT1062DVJ6A
 
 MICROPY_FLOAT_IMPL = double
 
+SRC_C += \
+	hal/flexspi_nor_flash.c \
+
 deploy: $(BUILD)/firmware.hex
 	teensy_loader_cli --mcu=imxrt1062 -v -w $<
diff --git a/ports/mimxrt/boards/common.ld b/ports/mimxrt/boards/common.ld
index e5d91f1191f16..6f45da24d1011 100644
--- a/ports/mimxrt/boards/common.ld
+++ b/ports/mimxrt/boards/common.ld
@@ -178,12 +178,14 @@ SECTIONS
     . = ALIGN(4);
     __DATA_RAM = .;
     __data_start__ = .;      /* create a global symbol at data start */
+    __data_section_table = .;
     *(m_usb_dma_init_data)
     *(.data)                 /* .data sections */
     *(.data*)                /* .data* sections */
     KEEP(*(.jcr*))
     . = ALIGN(4);
     __data_end__ = .;        /* define a global symbol at data end */
+    __data_section_table_end = .;
   } > m_dtcm
 
   __RAM_FUNCTIONS_ROM = __DATA_ROM + (__data_end__ - __data_start__);
@@ -224,12 +226,14 @@ SECTIONS
     . = ALIGN(4);
     __START_BSS = .;
     __bss_start__ = .;
+    __bss_section_table = .;
     *(m_usb_dma_noninit_data)
     *(.bss)
     *(.bss*)
     *(COMMON)
     . = ALIGN(4);
     __bss_end__ = .;
+    __bss_section_table_end = .;
     __END_BSS = .;
   } > m_dtcm
 
@@ -253,6 +257,7 @@ SECTIONS
   /* Initializes stack on the end of block */
   __StackTop   = ORIGIN(m_dtcm) + LENGTH(m_dtcm);
   __StackLimit = __StackTop - STACK_SIZE;
+  _vStackTop = __StackTop;
   PROVIDE(__stack = __StackTop);
 
   .ARM.attributes 0 : { *(.ARM.attributes) }
diff --git a/ports/mimxrt/hal/flexspi_hyper_flash.c b/ports/mimxrt/hal/flexspi_hyper_flash.c
new file mode 100644
index 0000000000000..fb71d4d941cbf
--- /dev/null
+++ b/ports/mimxrt/hal/flexspi_hyper_flash.c
@@ -0,0 +1,247 @@
+/*
+ * Copyright (c) 2016, Freescale Semiconductor, Inc.
+ * Copyright 2016-2021 NXP
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#include "fsl_clock.h"
+#include "flexspi_hyper_flash.h"
+
+// Copy of a few (pseudo-)functions from fsl_clock.h, which were nor reliably
+// inlined when they should be. That caused DEBUG mode to fail.
+// It does not increase the code size, since they were supposed to be inline.
+
+__attribute__((always_inline)) static inline void clock_set_div(clock_div_t divider, uint32_t value) {
+    uint32_t busyShift;
+
+    busyShift                   = CCM_TUPLE_BUSY_SHIFT(divider);
+    CCM_TUPLE_REG(CCM, divider) = (CCM_TUPLE_REG(CCM, divider) & (~CCM_TUPLE_MASK(divider))) |
+                                  (((uint32_t)((value) << CCM_TUPLE_SHIFT(divider))) & CCM_TUPLE_MASK(divider));
+
+    /* Clock switch need Handshake? */
+    if (CCM_NO_BUSY_WAIT != busyShift) {
+        /* Wait until CCM internal handshake finish. */
+        while (CCM->CDHIPR & (1U << busyShift)) {}
+    }
+}
+
+__attribute__((always_inline)) static inline void clock_control_gate(clock_ip_name_t name, clock_gate_value_t value) {
+    uint32_t index = ((uint32_t)name) >> 8U;
+    uint32_t shift = ((uint32_t)name) & 0x1FU;
+    volatile uint32_t *reg;
+
+    reg  = ((volatile uint32_t *)&CCM->CCGR0) + index;
+    *reg = ((*reg) & ~(3U << shift)) | (((uint32_t)value) << shift);
+}
+
+__attribute__((always_inline)) static inline void clock_enable_clock(clock_ip_name_t name) {
+    clock_control_gate(name, kCLOCK_ClockNeededRunWait);
+}
+
+__attribute__((always_inline)) static inline void clock_disable_clock(clock_ip_name_t name) {
+    clock_control_gate(name, kCLOCK_ClockNotNeeded);
+}
+
+#define DIV_PAGE_PGM	4
+#define DIV_ERASE_PGM	4
+#define DIV_READ		0
+
+static void SetFlexSPIDiv(uint32_t div) __attribute__((section(".ram_functions")));
+static void SetFlexSPIDiv(uint32_t div) {
+    FLEXSPI_Enable(FLEXSPI, false);
+    clock_disable_clock(kCLOCK_FlexSpi);
+    clock_set_div(kCLOCK_FlexspiDiv, div); /* flexspi clock 332M, DDR mode, internal clock 166M. */
+    clock_enable_clock(kCLOCK_FlexSpi);
+    FLEXSPI_Enable(FLEXSPI, true);	
+}
+
+status_t flexspi_nor_hyperbus_read(FLEXSPI_Type *base, uint32_t addr, uint32_t *buffer, uint32_t bytes) __attribute__((section(".ram_functions")));
+status_t flexspi_nor_hyperbus_read(FLEXSPI_Type *base, uint32_t addr, uint32_t *buffer, uint32_t bytes) {
+    flexspi_transfer_t flashXfer;
+    status_t status;
+
+    flashXfer.deviceAddress = addr * 2;
+    flashXfer.port          = kFLEXSPI_PortA1;
+    flashXfer.cmdType       = kFLEXSPI_Read;
+    flashXfer.SeqNumber     = 1;
+    flashXfer.seqIndex      = HYPERFLASH_CMD_LUT_SEQ_IDX_READDATA;
+    flashXfer.data          = buffer;
+    flashXfer.dataSize      = bytes;
+    status                  = FLEXSPI_TransferBlocking(base, &flashXfer);
+
+    return status;
+}
+
+status_t flexspi_nor_hyperbus_write(FLEXSPI_Type *base, uint32_t addr, uint32_t *buffer, uint32_t bytes) __attribute__((section(".ram_functions")));
+status_t flexspi_nor_hyperbus_write(FLEXSPI_Type *base, uint32_t addr, uint32_t *buffer, uint32_t bytes) {
+    flexspi_transfer_t flashXfer;
+    status_t status;
+
+    flashXfer.deviceAddress = addr * 2;
+    flashXfer.port          = kFLEXSPI_PortA1;
+    flashXfer.cmdType       = kFLEXSPI_Write;
+    flashXfer.SeqNumber     = 1;
+    flashXfer.seqIndex      = HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEDATA;
+    flashXfer.data          = buffer;
+    flashXfer.dataSize      = bytes;
+    status                  = FLEXSPI_TransferBlocking(base, &flashXfer);
+
+    return status;
+}
+
+status_t flexspi_nor_write_enable(FLEXSPI_Type *base, uint32_t baseAddr) __attribute__((section(".ram_functions")));
+status_t flexspi_nor_write_enable(FLEXSPI_Type *base, uint32_t baseAddr) {
+    flexspi_transfer_t flashXfer;
+    status_t status;
+
+    /* Write enable */
+    flashXfer.deviceAddress = baseAddr;
+    flashXfer.port          = kFLEXSPI_PortA1;
+    flashXfer.cmdType       = kFLEXSPI_Command;
+    flashXfer.SeqNumber     = 2;
+    flashXfer.seqIndex      = HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEENABLE;
+
+    status = FLEXSPI_TransferBlocking(base, &flashXfer);
+
+    return status;
+}
+
+status_t flexspi_nor_wait_bus_busy(FLEXSPI_Type *base) __attribute__((section(".ram_functions")));
+status_t flexspi_nor_wait_bus_busy(FLEXSPI_Type *base) {
+    /* Wait status ready. */
+    bool isBusy;
+    uint32_t readValue;
+    status_t status;
+    flexspi_transfer_t flashXfer;
+
+    flashXfer.deviceAddress = 0;
+    flashXfer.port          = kFLEXSPI_PortA1;
+    flashXfer.cmdType       = kFLEXSPI_Read;
+    flashXfer.SeqNumber     = 2;
+    flashXfer.seqIndex      = HYPERFLASH_CMD_LUT_SEQ_IDX_READSTATUS;
+    flashXfer.data          = &readValue;
+    flashXfer.dataSize      = 2;
+
+    do {
+        status = FLEXSPI_TransferBlocking(base, &flashXfer);
+
+        if (status != kStatus_Success) {
+            return status;
+        }
+        if (readValue & 0x8000) {
+            isBusy = false;
+        } else {
+            isBusy = true;
+        }
+
+        if (readValue & 0x3200) {
+            status = kStatus_Fail;
+            break;
+        }
+
+    } while (isBusy);
+
+    return status;
+}
+
+status_t flexspi_nor_flash_erase_sector(FLEXSPI_Type *base, uint32_t address) __attribute__((section(".ram_functions")));
+status_t flexspi_nor_flash_erase_sector(FLEXSPI_Type *base, uint32_t address) {
+    status_t status;
+    flexspi_transfer_t flashXfer;
+
+    /* Write enable */
+    status = flexspi_nor_write_enable(base, address);
+
+    if (status != kStatus_Success) {
+        return status;
+    }
+
+    flashXfer.deviceAddress = address;
+    flashXfer.port          = kFLEXSPI_PortA1;
+    flashXfer.cmdType       = kFLEXSPI_Command;
+    flashXfer.SeqNumber     = 4;
+    flashXfer.seqIndex      = HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR;
+    status                  = FLEXSPI_TransferBlocking(base, &flashXfer);
+
+    if (status != kStatus_Success) {
+        return status;
+    }
+
+    status = flexspi_nor_wait_bus_busy(base);
+
+    return status;
+}
+
+status_t flexspi_nor_flash_page_program(FLEXSPI_Type *base, uint32_t address, const uint32_t *src,  uint32_t size ) __attribute__((section(".ram_functions")));
+status_t flexspi_nor_flash_page_program(FLEXSPI_Type *base, uint32_t address, const uint32_t *src,  uint32_t size) {
+    status_t status;
+    flexspi_transfer_t flashXfer;
+
+    /* Speed down flexspi clock */
+	SetFlexSPIDiv(DIV_PAGE_PGM);
+
+    /* Write enable */
+    status = flexspi_nor_write_enable(base, address);
+
+    if (status != kStatus_Success) {
+        return status;
+    }
+
+    /* Prepare page program command */
+    flashXfer.deviceAddress = address;
+    flashXfer.port          = kFLEXSPI_PortA1;
+    flashXfer.cmdType       = kFLEXSPI_Write;
+    flashXfer.SeqNumber     = 2;
+    flashXfer.seqIndex      = HYPERFLASH_CMD_LUT_SEQ_IDX_PAGEPROGRAM;
+    flashXfer.data          = (uint32_t *)src;
+    flashXfer.dataSize      = size;
+    status                  = FLEXSPI_TransferBlocking(base, &flashXfer);
+
+    if (status != kStatus_Success) {
+        return status;
+    }
+
+    status = flexspi_nor_wait_bus_busy(base);
+
+	SetFlexSPIDiv(DIV_READ);
+
+    return status;
+}
+
+status_t flexspi_nor_hyperflash_cfi(FLEXSPI_Type *base) __attribute__((section(".ram_functions")));
+status_t flexspi_nor_hyperflash_cfi(FLEXSPI_Type *base) {
+    /*
+     * Read ID-CFI Parameters
+     */
+    // CFI Entry
+    status_t status;
+    uint32_t buffer[2];
+    uint8_t data[4] = {0x00, 0x98};
+    status          = flexspi_nor_hyperbus_write(base, 0x555, (uint32_t *)data, 2);
+    if (status != kStatus_Success) {
+        return status;
+    }
+
+    // ID-CFI Read
+    // Read Query Unique ASCII String
+    status = flexspi_nor_hyperbus_read(base, 0x10, &buffer[0], sizeof(buffer));
+    if (status != kStatus_Success) {
+        return status;
+    }
+    buffer[1] &= 0xFFFF;
+    // Check that the data read out is  unicode "QRY" in big-endian order
+    if ((buffer[0] != 0x52005100) || (buffer[1] != 0x5900)) {
+        status = kStatus_Fail;
+        return status;
+    }
+    // ASO Exit 0xF000
+    data[1] = 0xF0;
+    status  = flexspi_nor_hyperbus_write(base, 0x0, (uint32_t *)data, 2);
+    if (status != kStatus_Success) {
+        return status;
+    }
+
+    return status;
+}
diff --git a/ports/mimxrt/hal/flexspi_hyper_flash.h b/ports/mimxrt/hal/flexspi_hyper_flash.h
new file mode 100644
index 0000000000000..bba76c132403c
--- /dev/null
+++ b/ports/mimxrt/hal/flexspi_hyper_flash.h
@@ -0,0 +1,71 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013, 2014 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+#ifndef MICROPY_INCLUDED_MIMXRT_HAL_FLEXSPI_HYPER_FLASH_H
+#define MICROPY_INCLUDED_MIMXRT_HAL_FLEXSPI_HYPER_FLASH_H
+
+#include "mpconfigboard.h"
+#include "fsl_flexspi.h"
+#include BOARD_FLASH_CONFIG_HEADER_H
+
+// Defined in boards flash_config.c
+extern flexspi_nor_config_t qspiflash_config;
+
+status_t flexspi_nor_hyperflash_cfi(FLEXSPI_Type *base);
+void flexspi_hyper_flash_init(void);
+void flexspi_nor_update_lut(void);
+status_t flexspi_nor_flash_erase_sector(FLEXSPI_Type *base, uint32_t address);
+status_t flexspi_nor_flash_page_program(FLEXSPI_Type *base, uint32_t address, const uint32_t *src, uint32_t size);
+
+static inline uint32_t flexspi_get_frequency(void) {
+    uint32_t div;
+    uint32_t fre;
+
+    /* Clock divider:
+       000 divided by 1
+       001 divided by 2
+       010 divided by 3
+       011 divided by 4
+       100 divided by 5
+       101 divided by 6
+       110 divided by 7
+       111 divided by 8
+     */
+    div = CLOCK_GetDiv(kCLOCK_FlexspiDiv);
+    /* Get frequency */
+    fre = CLOCK_GetFreq(kCLOCK_Usb1PllPfd0Clk) / (div + 0x01U);
+
+    return fre;
+}
+
+#define HYPERFLASH_CMD_LUT_SEQ_IDX_READDATA    0
+#define HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEDATA   1
+#define HYPERFLASH_CMD_LUT_SEQ_IDX_READSTATUS  2
+#define HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEENABLE 4
+#define HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR 6
+#define HYPERFLASH_CMD_LUT_SEQ_IDX_PAGEPROGRAM 10
+#define HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP   12
+
+#endif // MICROPY_INCLUDED_MIMXRT_HAL_FLEXSPI_HYPER_FLASH_H
diff --git a/ports/mimxrt/hal/flexspi_nor_flash.h b/ports/mimxrt/hal/flexspi_nor_flash.h
index a9a9bbe700d0c..c34df74168e3a 100644
--- a/ports/mimxrt/hal/flexspi_nor_flash.h
+++ b/ports/mimxrt/hal/flexspi_nor_flash.h
@@ -39,4 +39,25 @@ void flexspi_nor_update_lut(void);
 status_t flexspi_nor_flash_erase_sector(FLEXSPI_Type *base, uint32_t address);
 status_t flexspi_nor_flash_page_program(FLEXSPI_Type *base, uint32_t address, const uint32_t *src, uint32_t size);
 
+static inline uint32_t flexspi_get_frequency(void) {
+    uint32_t div;
+    uint32_t fre;
+
+    /* Clock divider:
+       000 divided by 1
+       001 divided by 2
+       010 divided by 3
+       011 divided by 4
+       100 divided by 5
+       101 divided by 6
+       110 divided by 7
+       111 divided by 8
+     */
+    div = CLOCK_GetDiv(kCLOCK_FlexspiDiv);
+    /* Get frequency */
+    fre = CLOCK_GetFreq(kCLOCK_Usb1PllPfd0Clk) / (div + 0x01U);
+
+    return fre;
+}
+
 #endif // MICROPY_INCLUDED_MIMXRT_HAL_FLEXSPI_NOR_FLASH_H
diff --git a/ports/mimxrt/mimxrt_flash.c b/ports/mimxrt/mimxrt_flash.c
index bf054c87f4664..79c4e676dc142 100644
--- a/ports/mimxrt/mimxrt_flash.c
+++ b/ports/mimxrt/mimxrt_flash.c
@@ -30,9 +30,10 @@
 #include "py/runtime.h"
 #include "extmod/vfs.h"
 #include "modmimxrt.h"
-#include "hal/flexspi_nor_flash.h"
+#include BOARD_FLASH_OPS_HEADER_H
 
 // BOARD_FLASH_SIZE is defined in mpconfigport.h
+
 #define SECTOR_SIZE_BYTES (qspiflash_config.sectorSize)
 #define PAGE_SIZE_BYTES (qspiflash_config.pageSize)
 
@@ -62,7 +63,7 @@ STATIC mimxrt_flash_obj_t mimxrt_flash_obj = {
 };
 
 // flash_erase_block(erase_addr_bytes)
-// erases the 4k sector starting at adddr
+// erases the sector starting at addr. Sector size according to the flash properties.
 status_t flash_erase_block(uint32_t erase_addr) __attribute__((section(".ram_functions")));
 status_t flash_erase_block(uint32_t erase_addr) {
     status_t status;
@@ -77,21 +78,31 @@ status_t flash_erase_block(uint32_t erase_addr) {
 
 // flash_write_block(flash_dest_addr_bytes, data_source, length_bytes)
 // writes length_byte data to the destination address
-// length is a multiple of the page size = 256
 // the vfs driver takes care for erasing the sector if required
 status_t flash_write_block(uint32_t dest_addr, const uint8_t *src, uint32_t length) __attribute__((section(".ram_functions")));
 status_t flash_write_block(uint32_t dest_addr, const uint8_t *src, uint32_t length) {
     status_t status;
+    uint32_t size;
+    uint32_t next_addr;
+
     SCB_CleanInvalidateDCache();
     SCB_DisableDCache();
-    // write sector in page size chunks
-    for (int i = 0; i < length; i += PAGE_SIZE_BYTES) {
+    // write data in chunks not crossing a page boundary
+    while (length > 0) {
+        next_addr = dest_addr - (dest_addr % PAGE_SIZE_BYTES) + PAGE_SIZE_BYTES; // next page boundary
+        size = next_addr - dest_addr;  // maximal chunk length
+        if (size > length) { // compare against remaining data size
+            size = length;
+        }
         __disable_irq();
-        status = flexspi_nor_flash_page_program(FLEXSPI, dest_addr + i, (uint32_t *)(src + i), PAGE_SIZE_BYTES);
+        status = flexspi_nor_flash_page_program(FLEXSPI, dest_addr, (uint32_t *)src, size);
         __enable_irq();
         if (status != kStatus_Success) {
             break;
         }
+        length -= size;
+        src += size;
+        dest_addr += size;
     }
     SCB_EnableDCache();
     return status;
@@ -105,7 +116,7 @@ STATIC mp_obj_t mimxrt_flash_make_new(const mp_obj_type_t *type, size_t n_args,
     // This should be performed by the boot ROM but for some reason it is not.
     FLEXSPI_UpdateLUT(FLEXSPI, 0,
         qspiflash_config.memConfig.lookupTable,
-        sizeof(qspiflash_config.memConfig.lookupTable) / sizeof(qspiflash_config.memConfig.lookupTable[0]));
+        ARRAY_SIZE(qspiflash_config.memConfig.lookupTable));
 
     // Configure FLEXSPI IP FIFO access.
     FLEXSPI->MCR0 &= ~(FLEXSPI_MCR0_ARDFEN_MASK);
diff --git a/ports/mimxrt/mpconfigport.h b/ports/mimxrt/mpconfigport.h
index e1e102797aebd..1066b93e16aee 100644
--- a/ports/mimxrt/mpconfigport.h
+++ b/ports/mimxrt/mpconfigport.h
@@ -145,6 +145,7 @@ __attribute__((always_inline)) static inline void enable_irq(uint32_t state) {
 
 __attribute__((always_inline)) static inline uint32_t disable_irq(void) {
     uint32_t state = __get_PRIMASK();
+    __disable_irq();
     return state;
 }
 

From b2533fe47930b12e695e2afbef2019c664261790 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Thu, 29 Jul 2021 17:48:03 +0200
Subject: [PATCH 1129/3533] mimxrt/boards: Add support for the MIMXRT1050_EVKB
 board.

---
 .../boards/MIMXRT1050_EVKB/MIMXRT1050_EVKB.ld |   1 +
 .../evkbmimxrt1050_flexspi_nor_config.h       | 263 ++++++++++++++++++
 .../boards/MIMXRT1050_EVKB/flash_config.c     | 186 +++++++++++++
 .../boards/MIMXRT1050_EVKB/mpconfigboard.h    |  69 +++++
 .../boards/MIMXRT1050_EVKB/mpconfigboard.mk   |  12 +
 ports/mimxrt/boards/MIMXRT1050_EVKB/pins.csv  |  31 +++
 6 files changed, 562 insertions(+)
 create mode 100644 ports/mimxrt/boards/MIMXRT1050_EVKB/MIMXRT1050_EVKB.ld
 create mode 100644 ports/mimxrt/boards/MIMXRT1050_EVKB/evkbmimxrt1050_flexspi_nor_config.h
 create mode 100644 ports/mimxrt/boards/MIMXRT1050_EVKB/flash_config.c
 create mode 100644 ports/mimxrt/boards/MIMXRT1050_EVKB/mpconfigboard.h
 create mode 100644 ports/mimxrt/boards/MIMXRT1050_EVKB/mpconfigboard.mk
 create mode 100644 ports/mimxrt/boards/MIMXRT1050_EVKB/pins.csv

diff --git a/ports/mimxrt/boards/MIMXRT1050_EVKB/MIMXRT1050_EVKB.ld b/ports/mimxrt/boards/MIMXRT1050_EVKB/MIMXRT1050_EVKB.ld
new file mode 100644
index 0000000000000..f616178a9bed2
--- /dev/null
+++ b/ports/mimxrt/boards/MIMXRT1050_EVKB/MIMXRT1050_EVKB.ld
@@ -0,0 +1 @@
+flash_size = 64M;
\ No newline at end of file
diff --git a/ports/mimxrt/boards/MIMXRT1050_EVKB/evkbmimxrt1050_flexspi_nor_config.h b/ports/mimxrt/boards/MIMXRT1050_EVKB/evkbmimxrt1050_flexspi_nor_config.h
new file mode 100644
index 0000000000000..02ac394e95aba
--- /dev/null
+++ b/ports/mimxrt/boards/MIMXRT1050_EVKB/evkbmimxrt1050_flexspi_nor_config.h
@@ -0,0 +1,263 @@
+/*
+ * Copyright 2018 NXP
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#ifndef __EVKMIMXRT1050_FLEXSPI_NOR_CONFIG__
+#define __EVKMIMXRT1050_FLEXSPI_NOR_CONFIG__
+
+#include <stdint.h>
+#include <stdbool.h>
+#include "fsl_flexspi.h"
+
+/*! @name Driver version */
+/*@{*/
+/*! @brief XIP_BOARD driver version 2.0.0. */
+#define FSL_XIP_BOARD_DRIVER_VERSION (MAKE_VERSION(2, 0, 0))
+/*@}*/
+
+/* FLEXSPI memory config block related defintions */
+#define FLEXSPI_CFG_BLK_TAG     (0x42464346UL) // ascii "FCFB" Big Endian
+#define FLEXSPI_CFG_BLK_VERSION (0x56010400UL) // V1.4.0
+#define FLEXSPI_CFG_BLK_SIZE    (512)
+
+/* FLEXSPI Feature related definitions */
+#define FLEXSPI_FEATURE_HAS_PARALLEL_MODE 1
+
+/* Lookup table related defintions */
+#define CMD_INDEX_READ        0
+#define CMD_INDEX_READSTATUS  1
+#define CMD_INDEX_WRITEENABLE 2
+#define CMD_INDEX_WRITE       4
+
+#define CMD_LUT_SEQ_IDX_READ        0
+#define CMD_LUT_SEQ_IDX_READSTATUS  1
+#define CMD_LUT_SEQ_IDX_WRITEENABLE 3
+#define CMD_LUT_SEQ_IDX_WRITE       9
+
+#define CMD_SDR        0x01
+#define CMD_DDR        0x21
+#define RADDR_SDR      0x02
+#define RADDR_DDR      0x22
+#define CADDR_SDR      0x03
+#define CADDR_DDR      0x23
+#define MODE1_SDR      0x04
+#define MODE1_DDR      0x24
+#define MODE2_SDR      0x05
+#define MODE2_DDR      0x25
+#define MODE4_SDR      0x06
+#define MODE4_DDR      0x26
+#define MODE8_SDR      0x07
+#define MODE8_DDR      0x27
+#define WRITE_SDR      0x08
+#define WRITE_DDR      0x28
+#define READ_SDR       0x09
+#define READ_DDR       0x29
+#define LEARN_SDR      0x0A
+#define LEARN_DDR      0x2A
+#define DATSZ_SDR      0x0B
+#define DATSZ_DDR      0x2B
+#define DUMMY_SDR      0x0C
+#define DUMMY_DDR      0x2C
+#define DUMMY_RWDS_SDR 0x0D
+#define DUMMY_RWDS_DDR 0x2D
+#define JMP_ON_CS      0x1F
+#define STOP           0
+
+#define FLEXSPI_1PAD 0
+#define FLEXSPI_2PAD 1
+#define FLEXSPI_4PAD 2
+#define FLEXSPI_8PAD 3
+
+#define FLEXSPI_LUT_SEQ(cmd0, pad0, op0, cmd1, pad1, op1)                                                              \
+    (FLEXSPI_LUT_OPERAND0(op0) | FLEXSPI_LUT_NUM_PADS0(pad0) | FLEXSPI_LUT_OPCODE0(cmd0) | FLEXSPI_LUT_OPERAND1(op1) | \
+     FLEXSPI_LUT_NUM_PADS1(pad1) | FLEXSPI_LUT_OPCODE1(cmd1))
+
+//!@brief Definitions for FlexSPI Serial Clock Frequency
+typedef enum _FlexSpiSerialClockFreq
+{
+    kFlexSpiSerialClk_30MHz  = 1,
+    kFlexSpiSerialClk_50MHz  = 2,
+    kFlexSpiSerialClk_60MHz  = 3,
+    kFlexSpiSerialClk_75MHz  = 4,
+    kFlexSpiSerialClk_80MHz  = 5,
+    kFlexSpiSerialClk_100MHz = 6,
+    kFlexSpiSerialClk_133MHz = 7,
+    kFlexSpiSerialClk_166MHz = 8,
+} flexspi_serial_clk_freq_t;
+
+//!@brief FlexSPI clock configuration type
+enum
+{
+    kFlexSpiClk_SDR, //!< Clock configure for SDR mode
+    kFlexSpiClk_DDR, //!< Clock configurat for DDR mode
+};
+
+//!@brief FlexSPI Read Sample Clock Source definition
+typedef enum _FlashReadSampleClkSource
+{
+    kFlexSPIReadSampleClk_LoopbackInternally      = 0,
+    kFlexSPIReadSampleClk_LoopbackFromDqsPad      = 1,
+    kFlexSPIReadSampleClk_LoopbackFromSckPad      = 2,
+    kFlexSPIReadSampleClk_ExternalInputFromDqsPad = 3,
+} flexspi_read_sample_clk_t;
+
+//!@brief Misc feature bit definitions
+enum
+{
+    kFlexSpiMiscOffset_DiffClkEnable            = 0, //!< Bit for Differential clock enable
+    kFlexSpiMiscOffset_Ck2Enable                = 1, //!< Bit for CK2 enable
+    kFlexSpiMiscOffset_ParallelEnable           = 2, //!< Bit for Parallel mode enable
+    kFlexSpiMiscOffset_WordAddressableEnable    = 3, //!< Bit for Word Addressable enable
+    kFlexSpiMiscOffset_SafeConfigFreqEnable     = 4, //!< Bit for Safe Configuration Frequency enable
+    kFlexSpiMiscOffset_PadSettingOverrideEnable = 5, //!< Bit for Pad setting override enable
+    kFlexSpiMiscOffset_DdrModeEnable            = 6, //!< Bit for DDR clock confiuration indication.
+};
+
+//!@brief Flash Type Definition
+enum
+{
+    kFlexSpiDeviceType_SerialNOR    = 1,    //!< Flash devices are Serial NOR
+    kFlexSpiDeviceType_SerialNAND   = 2,    //!< Flash devices are Serial NAND
+    kFlexSpiDeviceType_SerialRAM    = 3,    //!< Flash devices are Serial RAM/HyperFLASH
+    kFlexSpiDeviceType_MCP_NOR_NAND = 0x12, //!< Flash device is MCP device, A1 is Serial NOR, A2 is Serial NAND
+    kFlexSpiDeviceType_MCP_NOR_RAM  = 0x13, //!< Flash deivce is MCP device, A1 is Serial NOR, A2 is Serial RAMs
+};
+
+//!@brief Flash Pad Definitions
+enum
+{
+    kSerialFlash_1Pad  = 1,
+    kSerialFlash_2Pads = 2,
+    kSerialFlash_4Pads = 4,
+    kSerialFlash_8Pads = 8,
+};
+
+//!@brief FlexSPI LUT Sequence structure
+typedef struct _lut_sequence
+{
+    uint8_t seqNum; //!< Sequence Number, valid number: 1-16
+    uint8_t seqId;  //!< Sequence Index, valid number: 0-15
+    uint16_t reserved;
+} flexspi_lut_seq_t;
+
+//!@brief Flash Configuration Command Type
+enum
+{
+    kDeviceConfigCmdType_Generic,    //!< Generic command, for example: configure dummy cycles, drive strength, etc
+    kDeviceConfigCmdType_QuadEnable, //!< Quad Enable command
+    kDeviceConfigCmdType_Spi2Xpi,    //!< Switch from SPI to DPI/QPI/OPI mode
+    kDeviceConfigCmdType_Xpi2Spi,    //!< Switch from DPI/QPI/OPI to SPI mode
+    kDeviceConfigCmdType_Spi2NoCmd,  //!< Switch to 0-4-4/0-8-8 mode
+    kDeviceConfigCmdType_Reset,      //!< Reset device command
+};
+
+//!@brief FlexSPI Memory Configuration Block
+typedef struct _FlexSPIConfig
+{
+    uint32_t tag;               //!< [0x000-0x003] Tag, fixed value 0x42464346UL
+    uint32_t version;           //!< [0x004-0x007] Version,[31:24] -'V', [23:16] - Major, [15:8] - Minor, [7:0] - bugfix
+    uint32_t reserved0;         //!< [0x008-0x00b] Reserved for future use
+    uint8_t readSampleClkSrc;   //!< [0x00c-0x00c] Read Sample Clock Source, valid value: 0/1/3
+    uint8_t csHoldTime;         //!< [0x00d-0x00d] CS hold time, default value: 3
+    uint8_t csSetupTime;        //!< [0x00e-0x00e] CS setup time, default value: 3
+    uint8_t columnAddressWidth; //!< [0x00f-0x00f] Column Address with, for HyperBus protocol, it is fixed to 3, For
+    //! Serial NAND, need to refer to datasheet
+    uint8_t deviceModeCfgEnable; //!< [0x010-0x010] Device Mode Configure enable flag, 1 - Enable, 0 - Disable
+    uint8_t deviceModeType; //!< [0x011-0x011] Specify the configuration command type:Quad Enable, DPI/QPI/OPI switch,
+    //! Generic configuration, etc.
+    uint16_t waitTimeCfgCommands; //!< [0x012-0x013] Wait time for all configuration commands, unit: 100us, Used for
+    //! DPI/QPI/OPI switch or reset command
+    flexspi_lut_seq_t deviceModeSeq; //!< [0x014-0x017] Device mode sequence info, [7:0] - LUT sequence id, [15:8] - LUt
+    //! sequence number, [31:16] Reserved
+    uint32_t deviceModeArg;    //!< [0x018-0x01b] Argument/Parameter for device configuration
+    uint8_t configCmdEnable;   //!< [0x01c-0x01c] Configure command Enable Flag, 1 - Enable, 0 - Disable
+    uint8_t configModeType[3]; //!< [0x01d-0x01f] Configure Mode Type, similar as deviceModeTpe
+    flexspi_lut_seq_t
+        configCmdSeqs[3]; //!< [0x020-0x02b] Sequence info for Device Configuration command, similar as deviceModeSeq
+    uint32_t reserved1;   //!< [0x02c-0x02f] Reserved for future use
+    uint32_t configCmdArgs[3];     //!< [0x030-0x03b] Arguments/Parameters for device Configuration commands
+    uint32_t reserved2;            //!< [0x03c-0x03f] Reserved for future use
+    uint32_t controllerMiscOption; //!< [0x040-0x043] Controller Misc Options, see Misc feature bit definitions for more
+    //! details
+    uint8_t deviceType;    //!< [0x044-0x044] Device Type:  See Flash Type Definition for more details
+    uint8_t sflashPadType; //!< [0x045-0x045] Serial Flash Pad Type: 1 - Single, 2 - Dual, 4 - Quad, 8 - Octal
+    uint8_t serialClkFreq; //!< [0x046-0x046] Serial Flash Frequencey, device specific definitions, See System Boot
+    //! Chapter for more details
+    uint8_t lutCustomSeqEnable; //!< [0x047-0x047] LUT customization Enable, it is required if the program/erase cannot
+    //! be done using 1 LUT sequence, currently, only applicable to HyperFLASH
+    uint32_t reserved3[2];           //!< [0x048-0x04f] Reserved for future use
+    uint32_t sflashA1Size;           //!< [0x050-0x053] Size of Flash connected to A1
+    uint32_t sflashA2Size;           //!< [0x054-0x057] Size of Flash connected to A2
+    uint32_t sflashB1Size;           //!< [0x058-0x05b] Size of Flash connected to B1
+    uint32_t sflashB2Size;           //!< [0x05c-0x05f] Size of Flash connected to B2
+    uint32_t csPadSettingOverride;   //!< [0x060-0x063] CS pad setting override value
+    uint32_t sclkPadSettingOverride; //!< [0x064-0x067] SCK pad setting override value
+    uint32_t dataPadSettingOverride; //!< [0x068-0x06b] data pad setting override value
+    uint32_t dqsPadSettingOverride;  //!< [0x06c-0x06f] DQS pad setting override value
+    uint32_t timeoutInMs;            //!< [0x070-0x073] Timeout threshold for read status command
+    uint32_t commandInterval;        //!< [0x074-0x077] CS deselect interval between two commands
+    uint16_t dataValidTime[2]; //!< [0x078-0x07b] CLK edge to data valid time for PORT A and PORT B, in terms of 0.1ns
+    uint16_t busyOffset;       //!< [0x07c-0x07d] Busy offset, valid value: 0-31
+    uint16_t busyBitPolarity;  //!< [0x07e-0x07f] Busy flag polarity, 0 - busy flag is 1 when flash device is busy, 1 -
+    //! busy flag is 0 when flash device is busy
+    uint32_t lookupTable[64];           //!< [0x080-0x17f] Lookup table holds Flash command sequences
+    flexspi_lut_seq_t lutCustomSeq[12]; //!< [0x180-0x1af] Customizable LUT Sequences
+    uint32_t reserved4[4];              //!< [0x1b0-0x1bf] Reserved for future use
+} flexspi_mem_config_t;
+
+/*  */
+#define NOR_CMD_LUT_SEQ_IDX_READ_NORMAL 0
+#define NOR_CMD_LUT_SEQ_IDX_READSTATUSREG 1
+#define NOR_CMD_LUT_SEQ_IDX_READ_FAST_QUAD 2
+#define NOR_CMD_LUT_SEQ_IDX_WRITEENABLE 3
+#define NOR_CMD_LUT_SEQ_IDX_READSTATUS_XPI 4
+#define NOR_CMD_LUT_SEQ_IDX_ERASESECTOR 5
+#define NOR_CMD_LUT_SEQ_IDX_WRITESTATUSREG 6
+#define NOR_CMD_LUT_SEQ_IDX_PAGEPROGRAM_QUAD 7
+#define NOR_CMD_LUT_SEQ_IDX_READID 8
+#define NOR_CMD_LUT_SEQ_IDX_PAGEPROGRAM 9
+#define NOR_CMD_LUT_SEQ_IDX_ENTERQPI 10
+#define NOR_CMD_LUT_SEQ_IDX_CHIPERASE 11
+#define NOR_CMD_LUT_SEQ_IDX_EXITQPI 12
+
+#define HYPERFLASH_CMD_LUT_SEQ_IDX_READDATA    0
+#define HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEDATA   1
+#define HYPERFLASH_CMD_LUT_SEQ_IDX_READSTATUS  2
+#define HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEENABLE 4
+#define HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR 6
+#define HYPERFLASH_CMD_LUT_SEQ_IDX_PAGEPROGRAM 10
+#define HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP   12
+
+/*
+ *  Serial NOR configuration block
+ */
+typedef struct _flexspi_nor_config
+{
+    flexspi_mem_config_t memConfig; //!< Common memory configuration info via FlexSPI
+    uint32_t pageSize;              //!< Page size of Serial NOR
+    uint32_t sectorSize;            //!< Sector size of Serial NOR
+    uint8_t ipcmdSerialClkFreq;     //!< Clock frequency for IP command
+    uint8_t isUniformBlockSize;     //!< Sector/Block size is the same
+    uint8_t reserved0[2];           //!< Reserved for future use
+    uint8_t serialNorType;          //!< Serial NOR Flash type: 0/1/2/3
+    uint8_t needExitNoCmdMode;      //!< Need to exit NoCmd mode before other IP command
+    uint8_t halfClkForNonReadCmd;   //!< Half the Serial Clock for non-read command: true/false
+    uint8_t needRestoreNoCmdMode;   //!< Need to Restore NoCmd mode after IP commmand execution
+    uint32_t blockSize;             //!< Block size
+    uint32_t reserve2[11];          //!< Reserved for future use
+} flexspi_nor_config_t;
+
+#define FLASH_BUSY_STATUS_POL 0
+#define FLASH_BUSY_STATUS_OFFSET 0
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* __EVKMIMXRT1050_FLEXSPI_NOR_CONFIG__ */
diff --git a/ports/mimxrt/boards/MIMXRT1050_EVKB/flash_config.c b/ports/mimxrt/boards/MIMXRT1050_EVKB/flash_config.c
new file mode 100644
index 0000000000000..e8190bcb6c064
--- /dev/null
+++ b/ports/mimxrt/boards/MIMXRT1050_EVKB/flash_config.c
@@ -0,0 +1,186 @@
+/*
+ * Copyright 2018 NXP
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#include "evkbmimxrt1050_flexspi_nor_config.h"
+
+/* Component ID definition, used by tools. */
+#ifndef FSL_COMPONENT_ID
+#define FSL_COMPONENT_ID "platform.drivers.xip_board"
+#endif
+
+/*******************************************************************************
+ * Code
+ ******************************************************************************/
+#if defined(XIP_BOOT_HEADER_ENABLE) && (XIP_BOOT_HEADER_ENABLE == 1)
+#if defined(__CC_ARM) || defined(__ARMCC_VERSION) || defined(__GNUC__)
+__attribute__((section(".boot_hdr.conf")))
+#elif defined(__ICCARM__)
+#pragma location = ".boot_hdr.conf"
+#endif
+
+const flexspi_nor_config_t qspiflash_config = {
+    .memConfig =
+        {
+            .tag                = FLEXSPI_CFG_BLK_TAG,
+            .version            = FLEXSPI_CFG_BLK_VERSION,
+            .readSampleClkSrc   = kFlexSPIReadSampleClk_ExternalInputFromDqsPad,
+            .csHoldTime         = 3u,
+            .csSetupTime        = 3u,
+            .columnAddressWidth = 3u,
+            // Enable DDR mode, Wordaddressable, Safe configuration, Differential clock
+            .controllerMiscOption =
+                (1u << kFlexSpiMiscOffset_DdrModeEnable) | (1u << kFlexSpiMiscOffset_WordAddressableEnable) |
+                (1u << kFlexSpiMiscOffset_SafeConfigFreqEnable) | (1u << kFlexSpiMiscOffset_DiffClkEnable),
+            .sflashPadType = kSerialFlash_8Pads,
+            .serialClkFreq = kFlexSpiSerialClk_133MHz,
+            .sflashA1Size  = 64u * 1024u * 1024u,
+            .dataValidTime = {16u, 16u},
+            .lookupTable =
+                {
+                    /* 0 Read Data */
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_READDATA] =
+                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xA0, kFLEXSPI_Command_RADDR_DDR, kFLEXSPI_8PAD, 0x18),
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_READDATA + 1] = FLEXSPI_LUT_SEQ(
+                        kFLEXSPI_Command_CADDR_DDR, kFLEXSPI_8PAD, 0x10, kFLEXSPI_Command_READ_DDR, kFLEXSPI_8PAD, 0x04),
+
+                    /* 1 Write Data */
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEDATA] =
+                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x20, kFLEXSPI_Command_RADDR_DDR, kFLEXSPI_8PAD, 0x18),
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEDATA + 1] = FLEXSPI_LUT_SEQ(
+                        kFLEXSPI_Command_CADDR_DDR, kFLEXSPI_8PAD, 0x10, kFLEXSPI_Command_WRITE_DDR, kFLEXSPI_8PAD, 0x02),
+
+                    /* 2 Read Status */
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_READSTATUS] =
+                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00),
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_READSTATUS + 1] = FLEXSPI_LUT_SEQ(
+                        kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xAA), // ADDR 0x555
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_READSTATUS + 2] =
+                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x05),
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_READSTATUS + 3] = FLEXSPI_LUT_SEQ(
+                        kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x70), // DATA 0x70
+                    // +1
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_READSTATUS + 4] =
+                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xA0, kFLEXSPI_Command_RADDR_DDR, kFLEXSPI_8PAD, 0x18),
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_READSTATUS + 5] = FLEXSPI_LUT_SEQ(
+                        kFLEXSPI_Command_CADDR_DDR, kFLEXSPI_8PAD, 0x10, kFLEXSPI_Command_DUMMY_RWDS_DDR, kFLEXSPI_8PAD, 0x0B),
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_READSTATUS + 6] =
+                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_READ_DDR, kFLEXSPI_8PAD, 0x04, kFLEXSPI_Command_STOP, kFLEXSPI_1PAD, 0x0),
+
+                    /* 4 Write Enable */
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEENABLE] =
+                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x20, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00),
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEENABLE + 1] = FLEXSPI_LUT_SEQ(
+                        kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xAA), // ADDR 0x555
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEENABLE + 2] =
+                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x05),
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEENABLE + 3] = FLEXSPI_LUT_SEQ(
+                        kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xAA), // DATA 0xAA
+                    // +1
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEENABLE + 4] =
+                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x20, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00),
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEENABLE + 5] =
+                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x55),
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEENABLE + 6] =
+                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x02),
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEENABLE + 7] =
+                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x55),
+
+                    /* 6 Erase Sector  */
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR] =
+                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00),
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 1] = FLEXSPI_LUT_SEQ(
+                        kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xAA), // ADDR 0x555
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 2] =
+                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x05),
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 3] = FLEXSPI_LUT_SEQ(
+                        kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x80), // DATA 0x80
+                    // +1
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 4] =
+                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00),
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 5] =
+                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xAA),
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 6] =
+                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x05),
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 7] = FLEXSPI_LUT_SEQ(
+                        kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xAA), // ADDR 0x555
+                    // +2
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 8] =
+                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00),
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 9] =
+                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x55),
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 10] =
+                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x02),
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 11] =
+                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x55),
+                    // +3
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 12] =
+                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_RADDR_DDR, kFLEXSPI_8PAD, 0x18),
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 13] =
+                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_CADDR_DDR, kFLEXSPI_8PAD, 0x10, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00),
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 14] =
+                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x30, kFLEXSPI_Command_STOP, kFLEXSPI_1PAD, 0x00),
+
+                    /* 10 program page with word program command sequence */
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_PAGEPROGRAM] =
+                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x20, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00),
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_PAGEPROGRAM + 1] = FLEXSPI_LUT_SEQ(
+                        kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xAA), // ADDR 0x555
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_PAGEPROGRAM + 2] =
+                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x05),
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_PAGEPROGRAM + 3] = FLEXSPI_LUT_SEQ(
+                        kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xA0), // DATA 0xA0
+                    // +1
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_PAGEPROGRAM + 4] =
+                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x20, kFLEXSPI_Command_RADDR_DDR, kFLEXSPI_8PAD, 0x18),
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_PAGEPROGRAM + 5] = FLEXSPI_LUT_SEQ(
+                        kFLEXSPI_Command_CADDR_DDR, kFLEXSPI_8PAD, 0x10, kFLEXSPI_Command_WRITE_DDR, kFLEXSPI_8PAD, 0x80),
+
+                    /* 12 Erase chip */
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP] =
+                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00),
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 1] =
+                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xAA),
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 2] =
+                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x05),
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 3] =
+                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x80),
+                    // +1
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 4] =
+                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00),
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 5] =
+                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xAA),
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 6] =
+                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x05),
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 7] =
+                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xAA),
+                    // +2
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 8] =
+                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00),
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 9] =
+                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x55),
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 10] =
+                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x02),
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 11] =
+                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x55),
+                    // +3
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 12] =
+                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00),
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 13] =
+                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xAA),
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 14] =
+                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x05),
+                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 15] =
+                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x10),
+                },
+        },
+    .pageSize           = 512u,
+    .sectorSize         = 256u * 1024u,
+    .blockSize          = 256u * 1024u,
+    .isUniformBlockSize = true,
+};
+
+#endif /* XIP_BOOT_HEADER_ENABLE */
diff --git a/ports/mimxrt/boards/MIMXRT1050_EVKB/mpconfigboard.h b/ports/mimxrt/boards/MIMXRT1050_EVKB/mpconfigboard.h
new file mode 100644
index 0000000000000..518240b03fc5a
--- /dev/null
+++ b/ports/mimxrt/boards/MIMXRT1050_EVKB/mpconfigboard.h
@@ -0,0 +1,69 @@
+#define MICROPY_HW_BOARD_NAME "i.MX RT1050 EVKB"
+#define MICROPY_HW_MCU_NAME   "MIMXRT1052DVL6B"
+
+#define BOARD_FLASH_SIZE (64 * 1024 * 1024)
+
+// MIMXRT1050_EVKB has 1 user LED
+#define MICROPY_HW_LED1_PIN (pin_GPIO_AD_B0_09)
+#define MICROPY_HW_LED_ON(pin) (mp_hal_pin_low(pin))
+#define MICROPY_HW_LED_OFF(pin) (mp_hal_pin_high(pin))
+#define BOARD_FLASH_CONFIG_HEADER_H "evkbmimxrt1050_flexspi_nor_config.h"
+#define BOARD_FLASH_OPS_HEADER_H "hal/flexspi_hyper_flash.h"
+
+#define MICROPY_HW_NUM_PIN_IRQS (4 * 32 + 3)
+
+// Define mapping logical UART # to hardware UART #
+// LPUART3 on D0/D1  -> 1
+// LPUART2 on D7/D6  -> 2
+// LPUART6 on D8/D9  -> 3
+// LPUART8 on A1/A0  -> 4
+
+#define MICROPY_HW_UART_NUM     (sizeof(uart_index_table) / sizeof(uart_index_table)[0])
+#define MICROPY_HW_UART_INDEX   { 0, 3, 2, 6, 8 }
+
+#define IOMUX_TABLE_UART \
+    { 0 }, { 0 }, \
+    { IOMUXC_GPIO_AD_B1_02_LPUART2_TX }, { IOMUXC_GPIO_AD_B1_03_LPUART2_RX }, \
+    { IOMUXC_GPIO_AD_B1_06_LPUART3_TX }, { IOMUXC_GPIO_AD_B1_07_LPUART3_RX }, \
+    { 0 }, { 0 }, \
+    { 0 }, { 0 }, \
+    { IOMUXC_GPIO_AD_B0_02_LPUART6_TX }, { IOMUXC_GPIO_AD_B0_03_LPUART6_RX }, \
+    { 0 }, { 0 }, \
+    { IOMUXC_GPIO_AD_B1_10_LPUART8_TX }, { IOMUXC_GPIO_AD_B1_11_LPUART8_RX },
+
+#define MICROPY_HW_SPI_INDEX { 1 }
+
+#define IOMUX_TABLE_SPI \
+    { IOMUXC_GPIO_SD_B0_00_LPSPI1_SCK }, { IOMUXC_GPIO_SD_B0_01_LPSPI1_PCS0 }, \
+    { IOMUXC_GPIO_SD_B0_02_LPSPI1_SDO }, { IOMUXC_GPIO_SD_B0_03_LPSPI1_SDI },
+
+#define DMA_REQ_SRC_RX { 0, kDmaRequestMuxLPSPI1Rx, kDmaRequestMuxLPSPI2Rx, \
+                            kDmaRequestMuxLPSPI3Rx, kDmaRequestMuxLPSPI4Rx }
+
+#define DMA_REQ_SRC_TX { 0, kDmaRequestMuxLPSPI1Tx, kDmaRequestMuxLPSPI2Tx, \
+                            kDmaRequestMuxLPSPI3Tx, kDmaRequestMuxLPSPI4Tx } 
+
+// Define the mapping hardware I2C # to logical I2C #
+// SDA/SCL  HW-I2C    Logical I2C
+// D14/D15  LPI2C1 ->    0
+// D1/D0    LPI2C3 ->    1
+
+#define MICROPY_HW_I2C_INDEX   { 1, 3 }
+
+#define IOMUX_TABLE_I2C \
+    { IOMUXC_GPIO_AD_B1_00_LPI2C1_SCL }, { IOMUXC_GPIO_AD_B1_01_LPI2C1_SDA }, \
+    { 0 }, { 0 }, \
+    { IOMUXC_GPIO_AD_B1_07_LPI2C3_SCL }, { IOMUXC_GPIO_AD_B1_06_LPI2C3_SDA },
+
+#define USDHC_DUMMY_PIN NULL , 0
+
+#define MICROPY_USDHC1 \
+    { \
+        .cmd = {GPIO_SD_B0_00_USDHC1_CMD}, \
+        .clk = { GPIO_SD_B0_01_USDHC1_CLK }, \
+        .cd_b = { GPIO_B1_12_USDHC1_CD_B },\
+        .data0 = { GPIO_SD_B0_02_USDHC1_DATA0 },\
+        .data1 = { GPIO_SD_B0_03_USDHC1_DATA1 },\
+        .data2 = { GPIO_SD_B0_04_USDHC1_DATA2 },\
+        .data3 = { GPIO_SD_B0_05_USDHC1_DATA3 },\
+    }
diff --git a/ports/mimxrt/boards/MIMXRT1050_EVKB/mpconfigboard.mk b/ports/mimxrt/boards/MIMXRT1050_EVKB/mpconfigboard.mk
new file mode 100644
index 0000000000000..c9e32612ca165
--- /dev/null
+++ b/ports/mimxrt/boards/MIMXRT1050_EVKB/mpconfigboard.mk
@@ -0,0 +1,12 @@
+MCU_SERIES = MIMXRT1052
+MCU_VARIANT = MIMXRT1052DVL6B
+
+MICROPY_FLOAT_IMPL = double
+
+SRC_C += \
+	hal/flexspi_hyper_flash.c \
+
+JLINK_PATH ?= /media/RT1050-EVKB/
+
+deploy: $(BUILD)/firmware.bin
+	cp $< $(JLINK_PATH)
diff --git a/ports/mimxrt/boards/MIMXRT1050_EVKB/pins.csv b/ports/mimxrt/boards/MIMXRT1050_EVKB/pins.csv
new file mode 100644
index 0000000000000..366a141ff8e14
--- /dev/null
+++ b/ports/mimxrt/boards/MIMXRT1050_EVKB/pins.csv
@@ -0,0 +1,31 @@
+D0,GPIO_AD_B1_07
+D1,GPIO_AD_B1_06
+D2,GPIO_AD_B0_11
+D3,GPIO_AD_B1_08
+D4,GPIO_AD_B0_09
+D5,GPIO_AD_B0_10
+D6,GPIO_AD_B1_02
+D7,GPIO_AD_B1_03
+D8,GPIO_AD_B0_03
+D9,GPIO_AD_B0_02
+D10,GPIO_SD_B0_01
+D11,GPIO_SD_B0_02
+D12,GPIO_SD_B0_03
+D13,GPIO_SD_B0_00
+D14,GPIO_AD_B1_01
+D15,GPIO_AD_B1_00
+A0,GPIO_AD_B1_10
+A1,GPIO_AD_B1_11
+A2,GPIO_AD_B1_04
+A3,GPIO_AD_B1_05
+A4,GPIO_AD_B1_01
+A5,GPIO_AD_B1_00
+RX,GPIO_AD_B1_07
+TX,GPIO_AD_B1_06
+SCL,GPIO_AD_B1_00
+SDA,GPIO_AD_B1_01
+SCK,GPIO_SD_B0_00
+SDI,GPIO_SD_B0_03
+SDO,GPIO_SD_B0_02
+CS,GPIO_SD_B0_01
+LED_GREEN,GPIO_AD_B0_09

From 4445c73b113d8a35506ae5467559a7302dc79c7a Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Thu, 29 Jul 2021 17:52:19 +0200
Subject: [PATCH 1130/3533] tools/autobuild: Add the MIMXRT1050_EVKB board to
 the daily builds.

---
 tools/autobuild/build-mimxrt-latest.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/autobuild/build-mimxrt-latest.sh b/tools/autobuild/build-mimxrt-latest.sh
index e36b294acaf28..4db65c09169b3 100755
--- a/tools/autobuild/build-mimxrt-latest.sh
+++ b/tools/autobuild/build-mimxrt-latest.sh
@@ -34,3 +34,4 @@ fi
 do_build TEENSY40 TEENSY40 hex
 do_build TEENSY41 TEENSY41 hex
 do_build MIMXRT1020_EVK MIMXRT1020_EVK bin
+do_build MIMXRT1050_EVKB MIMXRT1050_EVKB bin

From afcc77cebc38020d838e0af5ef4c9b7d3028a6c3 Mon Sep 17 00:00:00 2001
From: David Lechner <david@pybricks.com>
Date: Fri, 30 Jul 2021 10:26:17 -0500
Subject: [PATCH 1131/3533] py/builtinimport: Fix condition for including
 do_execute_raw_code().

Commit e33bc597 ("py: Remove calls to file reader functions when these
are disabled.") changed the condition for one caller of
do_execute_raw_code() from

    MICROPY_PERSISTENT_CODE_LOAD

to

    MICROPY_HAS_FILE_READER && MICROPY_PERSISTENT_CODE_LOAD

The condition that enables compiling the function itself needs to be
changed to match.

Signed-off-by: David Lechner <david@pybricks.com>
---
 py/builtinimport.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/py/builtinimport.c b/py/builtinimport.c
index abbeefced5195..cdee5e4070bbd 100644
--- a/py/builtinimport.c
+++ b/py/builtinimport.c
@@ -142,7 +142,7 @@ STATIC void do_load_from_lexer(mp_obj_t module_obj, mp_lexer_t *lex) {
 }
 #endif
 
-#if MICROPY_PERSISTENT_CODE_LOAD || MICROPY_MODULE_FROZEN_MPY
+#if (MICROPY_HAS_FILE_READER && MICROPY_PERSISTENT_CODE_LOAD) || MICROPY_MODULE_FROZEN_MPY
 STATIC void do_execute_raw_code(mp_obj_t module_obj, mp_raw_code_t *raw_code, const char *source_name) {
     (void)source_name;
 

From 7ae9e6ef6900ad2d386bf5453b47a89b026b51f1 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Tue, 27 Jul 2021 18:32:38 +0200
Subject: [PATCH 1132/3533] rp2/tusb_port: Allow boards to configure USB VID
 and PID.

By defining MICROPY_HW_USB_VID and MICROPY_HW_USB_PID.
---
 ports/rp2/tusb_port.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/ports/rp2/tusb_port.c b/ports/rp2/tusb_port.c
index 874d837b9b5e5..8896be90774df 100644
--- a/ports/rp2/tusb_port.c
+++ b/ports/rp2/tusb_port.c
@@ -27,8 +27,12 @@
 #include "tusb.h"
 #include "pico/unique_id.h"
 
-#define USBD_VID (0x2E8A) // Raspberry Pi
-#define USBD_PID (0x0005) // RP2 MicroPython
+#ifndef MICROPY_HW_USB_VID
+#define MICROPY_HW_USB_VID (0x2E8A) // Raspberry Pi
+#endif
+#ifndef MICROPY_HW_USB_PID
+#define MICROPY_HW_USB_PID (0x0005) // RP2 MicroPython
+#endif
 
 #define USBD_DESC_LEN (TUD_CONFIG_DESC_LEN + TUD_CDC_DESC_LEN)
 #define USBD_MAX_POWER_MA (250)
@@ -58,8 +62,8 @@ static const tusb_desc_device_t usbd_desc_device = {
     .bDeviceSubClass = MISC_SUBCLASS_COMMON,
     .bDeviceProtocol = MISC_PROTOCOL_IAD,
     .bMaxPacketSize0 = CFG_TUD_ENDPOINT0_SIZE,
-    .idVendor = USBD_VID,
-    .idProduct = USBD_PID,
+    .idVendor = MICROPY_HW_USB_VID,
+    .idProduct = MICROPY_HW_USB_PID,
     .bcdDevice = 0x0100,
     .iManufacturer = USBD_STR_MANUF,
     .iProduct = USBD_STR_PRODUCT,

From 23e2e0077910a7a47c0c0fc752b9056bdccfd5bb Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Fri, 30 Jul 2021 03:42:08 +0200
Subject: [PATCH 1133/3533] rp2/boards/ADAFRUIT_FEATHER_RP2040: Configure
 custom VID/PID.

---
 ports/rp2/boards/ADAFRUIT_FEATHER_RP2040/mpconfigboard.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ports/rp2/boards/ADAFRUIT_FEATHER_RP2040/mpconfigboard.h b/ports/rp2/boards/ADAFRUIT_FEATHER_RP2040/mpconfigboard.h
index 5068d35541a51..3d7b2e714a00e 100644
--- a/ports/rp2/boards/ADAFRUIT_FEATHER_RP2040/mpconfigboard.h
+++ b/ports/rp2/boards/ADAFRUIT_FEATHER_RP2040/mpconfigboard.h
@@ -1,3 +1,6 @@
 // Board and hardware specific configuration
 #define MICROPY_HW_BOARD_NAME                   "Adafruit Feather RP2040"
 #define MICROPY_HW_FLASH_STORAGE_BYTES          (3072 * 1024)
+
+#define MICROPY_HW_USB_VID (0x239A)
+#define MICROPY_HW_USB_PID (0x80F2)

From 49497084f18fe05248ee35e474f5f3d559671fd1 Mon Sep 17 00:00:00 2001
From: Mike Causer <mcauser@gmail.com>
Date: Sat, 24 Jul 2021 02:02:35 +1000
Subject: [PATCH 1134/3533] rp2/boards/ADAFRUIT_FEATHER_RP2040: Configure
 I2C/SPI default pins.

---
 .../ADAFRUIT_FEATHER_RP2040/mpconfigboard.h   | 20 ++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/ports/rp2/boards/ADAFRUIT_FEATHER_RP2040/mpconfigboard.h b/ports/rp2/boards/ADAFRUIT_FEATHER_RP2040/mpconfigboard.h
index 3d7b2e714a00e..84d2bf20dbc6d 100644
--- a/ports/rp2/boards/ADAFRUIT_FEATHER_RP2040/mpconfigboard.h
+++ b/ports/rp2/boards/ADAFRUIT_FEATHER_RP2040/mpconfigboard.h
@@ -1,6 +1,20 @@
-// Board and hardware specific configuration
-#define MICROPY_HW_BOARD_NAME                   "Adafruit Feather RP2040"
-#define MICROPY_HW_FLASH_STORAGE_BYTES          (3072 * 1024)
+// https://www.adafruit.com/product/4884
+// https://learn.adafruit.com/adafruit-feather-rp2040-pico/pinouts
+
+#define MICROPY_HW_BOARD_NAME          "Adafruit Feather RP2040"
+#define MICROPY_HW_FLASH_STORAGE_BYTES (7 * 1024 * 1024)
 
 #define MICROPY_HW_USB_VID (0x239A)
 #define MICROPY_HW_USB_PID (0x80F2)
+
+// STEMMA QT / Qwiic on I2C1
+#define MICROPY_HW_I2C1_SCL  (3)
+#define MICROPY_HW_I2C1_SDA  (2)
+
+#define MICROPY_HW_SPI0_SCK  (18)
+#define MICROPY_HW_SPI0_MOSI (19)
+#define MICROPY_HW_SPI0_MISO (20)
+
+// NeoPixel GPIO16, power not toggleable
+
+// Red user LED GPIO13

From 6986a8d680421aafd4141962f1684cc4c693ddb3 Mon Sep 17 00:00:00 2001
From: Mike Causer <mcauser@gmail.com>
Date: Sat, 24 Jul 2021 02:06:38 +1000
Subject: [PATCH 1135/3533] rp2/boards/SPARKFUN_PROMICRO: Configure
 UART/I2C/SPI default pins.

---
 .../boards/SPARKFUN_PROMICRO/mpconfigboard.h  | 25 ++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/ports/rp2/boards/SPARKFUN_PROMICRO/mpconfigboard.h b/ports/rp2/boards/SPARKFUN_PROMICRO/mpconfigboard.h
index d6c8007ba01e7..65b29eecd1511 100644
--- a/ports/rp2/boards/SPARKFUN_PROMICRO/mpconfigboard.h
+++ b/ports/rp2/boards/SPARKFUN_PROMICRO/mpconfigboard.h
@@ -1,3 +1,22 @@
-// Board and hardware specific configuration
-#define MICROPY_HW_BOARD_NAME                   "SparkFun Pro Micro RP2040"
-#define MICROPY_HW_FLASH_STORAGE_BYTES          (15 * 1024 * 1024)
+// https://www.sparkfun.com/products/17717
+
+#define MICROPY_HW_BOARD_NAME          "SparkFun Pro Micro RP2040"
+#define MICROPY_HW_FLASH_STORAGE_BYTES (15 * 1024 * 1024)
+
+#define MICROPY_HW_USB_VID (0x1B4F)
+#define MICROPY_HW_USB_PID (0x0026)
+
+#define MICROPY_HW_UART1_TX  (8)
+#define MICROPY_HW_UART1_RX  (9)
+#define MICROPY_HW_UART1_CTS (10)
+#define MICROPY_HW_UART1_RTS (11)
+
+// Qwiic on I2C0
+#define MICROPY_HW_I2C0_SCL  (17)
+#define MICROPY_HW_I2C0_SDA  (16)
+
+#define MICROPY_HW_SPI0_SCK  (22)
+#define MICROPY_HW_SPI0_MOSI (23)
+#define MICROPY_HW_SPI0_MISO (20)
+
+// NeoPixel data GPIO25, power not toggleable

From e7a3e6ee6a1d5073dc0590e386f86152d5744539 Mon Sep 17 00:00:00 2001
From: Mike Causer <mcauser@gmail.com>
Date: Sat, 24 Jul 2021 02:08:01 +1000
Subject: [PATCH 1136/3533] rp2/boards/SPARKFUN_THINGPLUS: Configure I2C/SPI
 default pins.

---
 .../boards/SPARKFUN_THINGPLUS/mpconfigboard.h | 34 +++++++++++++++++--
 1 file changed, 31 insertions(+), 3 deletions(-)

diff --git a/ports/rp2/boards/SPARKFUN_THINGPLUS/mpconfigboard.h b/ports/rp2/boards/SPARKFUN_THINGPLUS/mpconfigboard.h
index 9749acd25adf8..f88ba5dd63c8d 100644
--- a/ports/rp2/boards/SPARKFUN_THINGPLUS/mpconfigboard.h
+++ b/ports/rp2/boards/SPARKFUN_THINGPLUS/mpconfigboard.h
@@ -1,3 +1,31 @@
-// Board and hardware specific configuration
-#define MICROPY_HW_BOARD_NAME                   "SparkFun Thing Plus RP2040"
-#define MICROPY_HW_FLASH_STORAGE_BYTES          (15 * 1024 * 1024)
+// https://www.sparkfun.com/products/17745
+
+#define MICROPY_HW_BOARD_NAME          "SparkFun Thing Plus RP2040"
+#define MICROPY_HW_FLASH_STORAGE_BYTES (15 * 1024 * 1024)
+
+#define MICROPY_HW_USB_VID (0x1B4F)
+#define MICROPY_HW_USB_PID (0x0025)
+
+#define MICROPY_HW_I2C0_SCL  (17)
+#define MICROPY_HW_I2C0_SDA  (16)
+
+// Qwiic on I2C1
+#define MICROPY_HW_I2C1_SCL  (7)
+#define MICROPY_HW_I2C1_SDA  (6)
+
+#define MICROPY_HW_SPI0_SCK  (2)
+#define MICROPY_HW_SPI0_MOSI (3)
+#define MICROPY_HW_SPI0_MISO (4)
+
+// MicroSD on SPI1
+#define MICROPY_HW_SPI1_SCK  (14)
+#define MICROPY_HW_SPI1_MOSI (15)
+#define MICROPY_HW_SPI1_MISO (12)
+
+// Battery fuel guage MAX17048 on I2C1
+// BATT_ALERT GPIO24
+
+// NeoPixel data GPIO8, power not toggleable
+// data out is broken out to a pin
+
+// Blue user LED GPIO25

From 043848158df7d211f30d83b2565a7d3039b0592e Mon Sep 17 00:00:00 2001
From: Mike Causer <mcauser@gmail.com>
Date: Sat, 24 Jul 2021 02:11:56 +1000
Subject: [PATCH 1137/3533] rp2/boards: Add Adafruit ItsyBitsy RP2040.

---
 .../mpconfigboard.cmake                       |  1 +
 .../ADAFRUIT_ITSYBITSY_RP2040/mpconfigboard.h | 21 +++++++++++++++++++
 2 files changed, 22 insertions(+)
 create mode 100644 ports/rp2/boards/ADAFRUIT_ITSYBITSY_RP2040/mpconfigboard.cmake
 create mode 100644 ports/rp2/boards/ADAFRUIT_ITSYBITSY_RP2040/mpconfigboard.h

diff --git a/ports/rp2/boards/ADAFRUIT_ITSYBITSY_RP2040/mpconfigboard.cmake b/ports/rp2/boards/ADAFRUIT_ITSYBITSY_RP2040/mpconfigboard.cmake
new file mode 100644
index 0000000000000..711e24ed598a6
--- /dev/null
+++ b/ports/rp2/boards/ADAFRUIT_ITSYBITSY_RP2040/mpconfigboard.cmake
@@ -0,0 +1 @@
+# cmake file for Adafruit ItsyBitsy RP2040
diff --git a/ports/rp2/boards/ADAFRUIT_ITSYBITSY_RP2040/mpconfigboard.h b/ports/rp2/boards/ADAFRUIT_ITSYBITSY_RP2040/mpconfigboard.h
new file mode 100644
index 0000000000000..8f5551172bf97
--- /dev/null
+++ b/ports/rp2/boards/ADAFRUIT_ITSYBITSY_RP2040/mpconfigboard.h
@@ -0,0 +1,21 @@
+// https://www.adafruit.com/product/4888
+// https://learn.adafruit.com/adafruit-itsybitsy-rp2040/pinouts
+
+#define MICROPY_HW_BOARD_NAME          "Adafruit ItsyBitsy RP2040"
+#define MICROPY_HW_FLASH_STORAGE_BYTES (7 * 1024 * 1024)
+
+#define MICROPY_HW_USB_VID (0x239A)
+#define MICROPY_HW_USB_PID (0x80FE)
+
+#define MICROPY_HW_I2C0_SCL  (3)
+#define MICROPY_HW_I2C0_SDA  (2)
+
+#define MICROPY_HW_SPI0_SCK  (18)
+#define MICROPY_HW_SPI0_MOSI (19)
+#define MICROPY_HW_SPI0_MISO (20)
+
+// NeoPixel data GPIO17, power GPIO16
+
+// Red user LED GPIO11
+
+// Boot button GPIO13

From 02cbe018a523c46a0c835bc7c77dfe491e90a5c0 Mon Sep 17 00:00:00 2001
From: Mike Causer <mcauser@gmail.com>
Date: Sat, 24 Jul 2021 02:12:52 +1000
Subject: [PATCH 1138/3533] rp2/boards: Add Adafruit QT Py RP2040.

---
 .../ADAFRUIT_QTPY_RP2040/mpconfigboard.cmake  |  1 +
 .../ADAFRUIT_QTPY_RP2040/mpconfigboard.h      | 28 +++++++++++++++++++
 2 files changed, 29 insertions(+)
 create mode 100644 ports/rp2/boards/ADAFRUIT_QTPY_RP2040/mpconfigboard.cmake
 create mode 100644 ports/rp2/boards/ADAFRUIT_QTPY_RP2040/mpconfigboard.h

diff --git a/ports/rp2/boards/ADAFRUIT_QTPY_RP2040/mpconfigboard.cmake b/ports/rp2/boards/ADAFRUIT_QTPY_RP2040/mpconfigboard.cmake
new file mode 100644
index 0000000000000..799ced5cd80c8
--- /dev/null
+++ b/ports/rp2/boards/ADAFRUIT_QTPY_RP2040/mpconfigboard.cmake
@@ -0,0 +1 @@
+# cmake file for Adafruit QT Py RP2040
diff --git a/ports/rp2/boards/ADAFRUIT_QTPY_RP2040/mpconfigboard.h b/ports/rp2/boards/ADAFRUIT_QTPY_RP2040/mpconfigboard.h
new file mode 100644
index 0000000000000..ca341cedd8d21
--- /dev/null
+++ b/ports/rp2/boards/ADAFRUIT_QTPY_RP2040/mpconfigboard.h
@@ -0,0 +1,28 @@
+// https://www.adafruit.com/product/4900
+// https://learn.adafruit.com/adafruit-qt-py-2040/pinouts
+
+#define MICROPY_HW_BOARD_NAME          "Adafruit QT Py RP2040"
+#define MICROPY_HW_FLASH_STORAGE_BYTES (7 * 1024 * 1024)
+
+#define MICROPY_HW_USB_VID (0x239A)
+#define MICROPY_HW_USB_PID (0x80F8)
+
+#define MICROPY_HW_UART1_TX  (20)
+#define MICROPY_HW_UART1_RX  (5)
+#define MICROPY_HW_UART1_CTS (10)
+#define MICROPY_HW_UART1_RTS (7)
+
+#define MICROPY_HW_I2C0_SCL  (25)
+#define MICROPY_HW_I2C0_SDA  (24)
+
+// STEMMA QT / Qwiic on I2C1
+#define MICROPY_HW_I2C1_SCL  (23)
+#define MICROPY_HW_I2C1_SDA  (22)
+
+#define MICROPY_HW_SPI0_SCK  (6)
+#define MICROPY_HW_SPI0_MOSI (3)
+#define MICROPY_HW_SPI0_MISO (4)
+
+// NeoPixel data GPIO12, power GPIO11
+
+// Boot button GPIO21

From 95eff8d96ab6a347d2aa5987110467760c703dfd Mon Sep 17 00:00:00 2001
From: Mike Causer <mcauser@gmail.com>
Date: Sat, 24 Jul 2021 02:14:10 +1000
Subject: [PATCH 1139/3533] rp2/boards: Add Pimoroni Pico LiPo 4MB.

---
 .../PIMORONI_PICOLIPO_4MB/mpconfigboard.cmake |  1 +
 .../PIMORONI_PICOLIPO_4MB/mpconfigboard.h     | 28 +++++++++++++++++++
 2 files changed, 29 insertions(+)
 create mode 100644 ports/rp2/boards/PIMORONI_PICOLIPO_4MB/mpconfigboard.cmake
 create mode 100644 ports/rp2/boards/PIMORONI_PICOLIPO_4MB/mpconfigboard.h

diff --git a/ports/rp2/boards/PIMORONI_PICOLIPO_4MB/mpconfigboard.cmake b/ports/rp2/boards/PIMORONI_PICOLIPO_4MB/mpconfigboard.cmake
new file mode 100644
index 0000000000000..8da827a17d280
--- /dev/null
+++ b/ports/rp2/boards/PIMORONI_PICOLIPO_4MB/mpconfigboard.cmake
@@ -0,0 +1 @@
+# cmake file for Pimoroni Pico LiPo 4MB
diff --git a/ports/rp2/boards/PIMORONI_PICOLIPO_4MB/mpconfigboard.h b/ports/rp2/boards/PIMORONI_PICOLIPO_4MB/mpconfigboard.h
new file mode 100644
index 0000000000000..fd45547e1b286
--- /dev/null
+++ b/ports/rp2/boards/PIMORONI_PICOLIPO_4MB/mpconfigboard.h
@@ -0,0 +1,28 @@
+// https://shop.pimoroni.com/products/pimoroni-pico-lipo?variant=39386149093459
+
+#define MICROPY_HW_BOARD_NAME          "Pimoroni Pico LiPo 4MB"
+#define MICROPY_HW_FLASH_STORAGE_BYTES (3 * 1024 * 1024)
+
+#define MICROPY_HW_USB_VID (0x2E8A)
+#define MICROPY_HW_USB_PID (0x1002)
+
+#define MICROPY_HW_UART1_TX  (8)
+#define MICROPY_HW_UART1_RX  (9)
+#define MICROPY_HW_UART1_CTS (10)
+#define MICROPY_HW_UART1_RTS (11)
+
+// Qwiic on I2C0
+#define MICROPY_HW_I2C0_SCL  (4)
+#define MICROPY_HW_I2C0_SDA  (5)
+
+#define MICROPY_HW_SPI0_SCK  (18)
+#define MICROPY_HW_SPI0_MOSI (19)
+#define MICROPY_HW_SPI0_MISO (16)
+
+// User LED GPIO25
+
+// VBUS_SENSE GPIO24
+
+// BAT_SENSE GPIO29
+
+// Boot button GPIO23

From 042a4bebc3c84ae3ae81bcc32d9d8eed71c1a0b9 Mon Sep 17 00:00:00 2001
From: Mike Causer <mcauser@gmail.com>
Date: Sat, 24 Jul 2021 02:15:00 +1000
Subject: [PATCH 1140/3533] rp2/boards: Add Pimoroni Pico LiPo 16MB.

---
 .../mpconfigboard.cmake                       |  1 +
 .../PIMORONI_PICOLIPO_16MB/mpconfigboard.h    | 28 +++++++++++++++++++
 2 files changed, 29 insertions(+)
 create mode 100644 ports/rp2/boards/PIMORONI_PICOLIPO_16MB/mpconfigboard.cmake
 create mode 100644 ports/rp2/boards/PIMORONI_PICOLIPO_16MB/mpconfigboard.h

diff --git a/ports/rp2/boards/PIMORONI_PICOLIPO_16MB/mpconfigboard.cmake b/ports/rp2/boards/PIMORONI_PICOLIPO_16MB/mpconfigboard.cmake
new file mode 100644
index 0000000000000..b98ff4495658f
--- /dev/null
+++ b/ports/rp2/boards/PIMORONI_PICOLIPO_16MB/mpconfigboard.cmake
@@ -0,0 +1 @@
+# cmake file for Pimoroni Pico LiPo 16MB
diff --git a/ports/rp2/boards/PIMORONI_PICOLIPO_16MB/mpconfigboard.h b/ports/rp2/boards/PIMORONI_PICOLIPO_16MB/mpconfigboard.h
new file mode 100644
index 0000000000000..68478f7613c55
--- /dev/null
+++ b/ports/rp2/boards/PIMORONI_PICOLIPO_16MB/mpconfigboard.h
@@ -0,0 +1,28 @@
+// https://shop.pimoroni.com/products/pimoroni-pico-lipo?variant=39335427080275
+
+#define MICROPY_HW_BOARD_NAME          "Pimoroni Pico LiPo 16MB"
+#define MICROPY_HW_FLASH_STORAGE_BYTES (7 * 1024 * 1024)
+
+#define MICROPY_HW_USB_VID (0x2E8A)
+#define MICROPY_HW_USB_PID (0x1003)
+
+#define MICROPY_HW_UART1_TX  (8)
+#define MICROPY_HW_UART1_RX  (9)
+#define MICROPY_HW_UART1_CTS (10)
+#define MICROPY_HW_UART1_RTS (11)
+
+// Qwiic on I2C0
+#define MICROPY_HW_I2C0_SCL  (4)
+#define MICROPY_HW_I2C0_SDA  (5)
+
+#define MICROPY_HW_SPI0_SCK  (18)
+#define MICROPY_HW_SPI0_MOSI (19)
+#define MICROPY_HW_SPI0_MISO (16)
+
+// User LED GPIO25
+
+// VBUS_SENSE GPIO24
+
+// BAT_SENSE GPIO29
+
+// Boot button GPIO23

From 71722c84ca43c0f80db74d3f89e036982083a163 Mon Sep 17 00:00:00 2001
From: Mike Causer <mcauser@gmail.com>
Date: Sat, 24 Jul 2021 02:15:58 +1000
Subject: [PATCH 1141/3533] rp2/boards: Add Pimoroni Tiny 2040.

---
 .../PIMORONI_TINY2040/mpconfigboard.cmake       |  1 +
 .../boards/PIMORONI_TINY2040/mpconfigboard.h    | 17 +++++++++++++++++
 2 files changed, 18 insertions(+)
 create mode 100644 ports/rp2/boards/PIMORONI_TINY2040/mpconfigboard.cmake
 create mode 100644 ports/rp2/boards/PIMORONI_TINY2040/mpconfigboard.h

diff --git a/ports/rp2/boards/PIMORONI_TINY2040/mpconfigboard.cmake b/ports/rp2/boards/PIMORONI_TINY2040/mpconfigboard.cmake
new file mode 100644
index 0000000000000..b6c4b3efc3efb
--- /dev/null
+++ b/ports/rp2/boards/PIMORONI_TINY2040/mpconfigboard.cmake
@@ -0,0 +1 @@
+# cmake file for Pimoroni Tiny 2040
diff --git a/ports/rp2/boards/PIMORONI_TINY2040/mpconfigboard.h b/ports/rp2/boards/PIMORONI_TINY2040/mpconfigboard.h
new file mode 100644
index 0000000000000..50cb2bd59936f
--- /dev/null
+++ b/ports/rp2/boards/PIMORONI_TINY2040/mpconfigboard.h
@@ -0,0 +1,17 @@
+// https://shop.pimoroni.com/products/tiny-2040
+
+#define MICROPY_HW_BOARD_NAME          "Pimoroni Tiny 2040"
+#define MICROPY_HW_FLASH_STORAGE_BYTES (7 * 1024 * 1024)
+
+#define MICROPY_HW_USB_VID (0x16D0)
+#define MICROPY_HW_USB_PID (0x08C7)
+
+#define MICROPY_HW_I2C0_SCL  (4)
+#define MICROPY_HW_I2C0_SDA  (5)
+
+// RGB LED, active low
+// Red LED 18
+// Green LED 19
+// Blue LED 20
+
+// Boot button GPIO23

From a3675294ae39a724aec6959238c45af0dea92f21 Mon Sep 17 00:00:00 2001
From: Will Sowerbutts <will@sowerbutts.com>
Date: Sun, 14 Feb 2021 16:34:26 +0000
Subject: [PATCH 1142/3533] esp32/machine_uart: Add flow kw-arg to enable
 hardware flow control.

This enables optional support for the hardware UART to use the RTS and/or
CTS pins for flow control.

The new "flow" constructor keyword specifies a bitmask of RTS and/or CTS.
This matches the interface used by machine.UART on stm32 and rp2.

Previously on ESP32 it was possible to specify which pins to use for the
RTS and CTS signals, but hardware flow control was never functional: CTS
was not checked before transmitting bytes, and RTS was always driven high
(signalling no buffer space available).  With this patch, CTS and RTS both
operate as expected.

This also includes an update to the machine.UART documentation.

Signed-off-by: Will Sowerbutts <will@sowerbutts.com>
---
 docs/library/machine.UART.rst | 11 +++++++++++
 ports/esp32/machine_uart.c    | 28 +++++++++++++++++++++++++++-
 2 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/docs/library/machine.UART.rst b/docs/library/machine.UART.rst
index 957d58ca18256..2eb2e20cb3200 100644
--- a/docs/library/machine.UART.rst
+++ b/docs/library/machine.UART.rst
@@ -56,11 +56,22 @@ Methods
 
      - *tx* specifies the TX pin to use.
      - *rx* specifies the RX pin to use.
+     - *rts* specifies the RTS (output) pin to use for hardware receive flow control.
+     - *cts* specifies the CTS (input) pin to use for hardware transmit flow control.
      - *txbuf* specifies the length in characters of the TX buffer.
      - *rxbuf* specifies the length in characters of the RX buffer.
      - *timeout* specifies the time to wait for the first character (in ms).
      - *timeout_char* specifies the time to wait between characters (in ms).
      - *invert* specifies which lines to invert.
+     - *flow* specifies which hardware flow control signals to use. The value
+       is a bitmask. 
+
+         - ``0`` will ignore hardware flow control signals.
+         - ``UART.RTS`` will enable receive flow control by using the RTS output pin to
+           signal if the receive FIFO has sufficient space to accept more data.
+         - ``UART.CTS`` will enable transmit flow control by pausing transmission when the
+           CTS input pin signals that the receiver is running low on buffer space.
+         - ``UART.RTS | UART.CTS`` will enable both, for full hardware flow control.
 
    On the WiPy only the following keyword-only parameter is supported:
 
diff --git a/ports/esp32/machine_uart.c b/ports/esp32/machine_uart.c
index 2953ac171c057..3c90a721508ac 100644
--- a/ports/esp32/machine_uart.c
+++ b/ports/esp32/machine_uart.c
@@ -53,6 +53,7 @@
 typedef struct _machine_uart_obj_t {
     mp_obj_base_t base;
     uart_port_t uart_num;
+    uart_hw_flowcontrol_t flowcontrol;
     uint8_t bits;
     uint8_t parity;
     uint8_t stop;
@@ -107,11 +108,25 @@ STATIC void machine_uart_print(const mp_print_t *print, mp_obj_t self_in, mp_pri
             mp_printf(print, "INV_CTS");
         }
     }
+    if (self->flowcontrol) {
+        mp_printf(print, ", flow=");
+        uint32_t flow_mask = self->flowcontrol;
+        if (flow_mask & UART_HW_FLOWCTRL_RTS) {
+            mp_printf(print, "RTS");
+            flow_mask &= ~UART_HW_FLOWCTRL_RTS;
+            if (flow_mask) {
+                mp_printf(print, "|");
+            }
+        }
+        if (flow_mask & UART_HW_FLOWCTRL_CTS) {
+            mp_printf(print, "CTS");
+        }
+    }
     mp_printf(print, ")");
 }
 
 STATIC void machine_uart_init_helper(machine_uart_obj_t *self, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
-    enum { ARG_baudrate, ARG_bits, ARG_parity, ARG_stop, ARG_tx, ARG_rx, ARG_rts, ARG_cts, ARG_txbuf, ARG_rxbuf, ARG_timeout, ARG_timeout_char, ARG_invert };
+    enum { ARG_baudrate, ARG_bits, ARG_parity, ARG_stop, ARG_tx, ARG_rx, ARG_rts, ARG_cts, ARG_txbuf, ARG_rxbuf, ARG_timeout, ARG_timeout_char, ARG_invert, ARG_flow };
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_baudrate, MP_ARG_INT, {.u_int = 0} },
         { MP_QSTR_bits, MP_ARG_INT, {.u_int = 0} },
@@ -126,6 +141,7 @@ STATIC void machine_uart_init_helper(machine_uart_obj_t *self, size_t n_args, co
         { MP_QSTR_timeout, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 0} },
         { MP_QSTR_timeout_char, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 0} },
         { MP_QSTR_invert, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 0} },
+        { MP_QSTR_flow, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 0} },
     };
     mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
     mp_arg_parse_all(n_args, pos_args, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
@@ -257,6 +273,13 @@ STATIC void machine_uart_init_helper(machine_uart_obj_t *self, size_t n_args, co
     }
     self->invert = args[ARG_invert].u_int;
     uart_set_line_inverse(self->uart_num, self->invert);
+
+    // set hardware flow control
+    if (args[ARG_flow].u_int & ~UART_HW_FLOWCTRL_CTS_RTS) {
+        mp_raise_ValueError(MP_ERROR_TEXT("invalid flow control mask"));
+    }
+    self->flowcontrol = args[ARG_flow].u_int;
+    uart_set_hw_flow_ctrl(self->uart_num, self->flowcontrol, UART_FIFO_LEN - UART_FIFO_LEN / 4);
 }
 
 STATIC mp_obj_t machine_uart_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
@@ -400,6 +423,9 @@ STATIC const mp_rom_map_elem_t machine_uart_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_INV_RX), MP_ROM_INT(UART_INV_RX) },
     { MP_ROM_QSTR(MP_QSTR_INV_RTS), MP_ROM_INT(UART_INV_RTS) },
     { MP_ROM_QSTR(MP_QSTR_INV_CTS), MP_ROM_INT(UART_INV_CTS) },
+
+    { MP_ROM_QSTR(MP_QSTR_RTS), MP_ROM_INT(UART_HW_FLOWCTRL_RTS) },
+    { MP_ROM_QSTR(MP_QSTR_CTS), MP_ROM_INT(UART_HW_FLOWCTRL_CTS) },
 };
 
 STATIC MP_DEFINE_CONST_DICT(machine_uart_locals_dict, machine_uart_locals_dict_table);

From 028fc815cdb63b2ea50bc1f377177b19b6a3f9cc Mon Sep 17 00:00:00 2001
From: Patrick Van Oosterwijck <patrick@silicognition.com>
Date: Fri, 23 Jul 2021 19:31:51 -0600
Subject: [PATCH 1143/3533] esp32/boards: Add Silicognition wESP32 board
 configuration.

For rev 7+ boards with 16MB of flash.  Partition table allocates 2.4 MiB
for MicroPython, 11 MiB for the filesystem.
---
 .../boards/SIL_WESP32/mpconfigboard.cmake     | 10 +++++++++
 ports/esp32/boards/SIL_WESP32/mpconfigboard.h |  2 ++
 ports/esp32/boards/SIL_WESP32/sdkconfig.board | 22 +++++++++++++++++++
 ports/esp32/partitions-16MiB-ota.csv          | 10 +++++++++
 4 files changed, 44 insertions(+)
 create mode 100644 ports/esp32/boards/SIL_WESP32/mpconfigboard.cmake
 create mode 100644 ports/esp32/boards/SIL_WESP32/mpconfigboard.h
 create mode 100644 ports/esp32/boards/SIL_WESP32/sdkconfig.board
 create mode 100644 ports/esp32/partitions-16MiB-ota.csv

diff --git a/ports/esp32/boards/SIL_WESP32/mpconfigboard.cmake b/ports/esp32/boards/SIL_WESP32/mpconfigboard.cmake
new file mode 100644
index 0000000000000..885d4eaa26c0c
--- /dev/null
+++ b/ports/esp32/boards/SIL_WESP32/mpconfigboard.cmake
@@ -0,0 +1,10 @@
+set(SDKCONFIG_DEFAULTS
+    boards/sdkconfig.base
+    boards/sdkconfig.ble
+    boards/sdkconfig.240mhz
+    boards/SIL_WESP32/sdkconfig.board
+)
+
+if(NOT MICROPY_FROZEN_MANIFEST)
+    set(MICROPY_FROZEN_MANIFEST ${MICROPY_PORT_DIR}/boards/manifest.py)
+endif()
diff --git a/ports/esp32/boards/SIL_WESP32/mpconfigboard.h b/ports/esp32/boards/SIL_WESP32/mpconfigboard.h
new file mode 100644
index 0000000000000..fc66aac64ca69
--- /dev/null
+++ b/ports/esp32/boards/SIL_WESP32/mpconfigboard.h
@@ -0,0 +1,2 @@
+#define MICROPY_HW_BOARD_NAME "Silicognition wESP32"
+#define MICROPY_HW_MCU_NAME "ESP32"
diff --git a/ports/esp32/boards/SIL_WESP32/sdkconfig.board b/ports/esp32/boards/SIL_WESP32/sdkconfig.board
new file mode 100644
index 0000000000000..98eef1d109167
--- /dev/null
+++ b/ports/esp32/boards/SIL_WESP32/sdkconfig.board
@@ -0,0 +1,22 @@
+# 16 MB flash
+
+CONFIG_ESPTOOLPY_FLASHSIZE_4MB=
+CONFIG_ESPTOOLPY_FLASHSIZE_8MB=
+CONFIG_ESPTOOLPY_FLASHSIZE_16MB=y
+CONFIG_ESPTOOLPY_FLASHSIZE="16MB"
+
+# Fast flash
+
+CONFIG_FLASHMODE_QIO=y
+CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
+CONFIG_ESP32_REV_MIN_1=y
+
+# OTA
+
+CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE=y
+CONFIG_PARTITION_TABLE_CUSTOM=y
+CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions-16MiB-ota.csv"
+
+# Network name
+
+CONFIG_LWIP_LOCAL_HOSTNAME="wESP32"
diff --git a/ports/esp32/partitions-16MiB-ota.csv b/ports/esp32/partitions-16MiB-ota.csv
new file mode 100644
index 0000000000000..a6f83bc46b860
--- /dev/null
+++ b/ports/esp32/partitions-16MiB-ota.csv
@@ -0,0 +1,10 @@
+# Partition table for MicroPython with OTA support using 16MB flash
+# Notes: the offset of the partition table itself is set in
+# $IDF_PATH/components/partition_table/Kconfig.projbuild.
+# Name,   Type, SubType, Offset,   Size,     Flags
+nvs,      data, nvs,     0x9000,   0x4000,
+otadata,  data, ota,     0xd000,   0x2000,
+phy_init, data, phy,     0xf000,   0x1000,
+ota_0,    app,  ota_0,   0x10000,  0x270000,
+ota_1,    app,  ota_1,   0x280000, 0x270000,
+vfs,      data, fat,     0x4f0000, 0xb10000,

From bfc8e88ce165fc3d25dd12e6dc6853d3c8cd4a5e Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Wed, 4 Aug 2021 15:35:00 +1000
Subject: [PATCH 1144/3533] esp32/mpconfigport.h: Enable reverse and inplace
 special methods.

Reverse operations are supported on stm32 and rp2, and esp32 has enough
space to also enable inplace operations, to make it complete.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/esp32/mpconfigport.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h
index 46d8a38af1779..d60e2823dfebe 100644
--- a/ports/esp32/mpconfigport.h
+++ b/ports/esp32/mpconfigport.h
@@ -82,6 +82,8 @@
 #define MICROPY_PY_BUILTINS_RANGE_ATTRS     (1)
 #define MICROPY_PY_BUILTINS_ROUND_INT       (1)
 #define MICROPY_PY_ALL_SPECIAL_METHODS      (1)
+#define MICROPY_PY_ALL_INPLACE_SPECIAL_METHODS (1)
+#define MICROPY_PY_REVERSE_SPECIAL_METHODS  (1)
 #define MICROPY_PY_BUILTINS_COMPILE         (1)
 #define MICROPY_PY_BUILTINS_ENUMERATE       (1)
 #define MICROPY_PY_BUILTINS_EXECFILE        (1)

From 8616129f2e382310802950db066178648a9429a3 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 3 Aug 2021 22:46:24 +1000
Subject: [PATCH 1145/3533] esp8266,esp32: Include hidden networks in WLAN.scan
 results.

Addresses issues #2697 and #5329.

Signed-off-by: Damien George <damien@micropython.org>
---
 docs/library/network.WLAN.rst | 2 ++
 ports/esp32/modnetwork.c      | 2 +-
 ports/esp8266/modnetwork.c    | 4 +++-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/docs/library/network.WLAN.rst b/docs/library/network.WLAN.rst
index 88bd3a3707ddb..35e4b798ae0b6 100644
--- a/docs/library/network.WLAN.rst
+++ b/docs/library/network.WLAN.rst
@@ -46,6 +46,8 @@ Methods
 .. method:: WLAN.scan()
 
     Scan for the available wireless networks.
+    Hidden networks -- where the SSID is not broadcast -- will also be scanned
+    if the WLAN interface allows it.
 
     Scanning is only possible on STA interface. Returns list of tuples with
     the information about WiFi access points:
diff --git a/ports/esp32/modnetwork.c b/ports/esp32/modnetwork.c
index 3977256166d9c..2b64105e793a1 100644
--- a/ports/esp32/modnetwork.c
+++ b/ports/esp32/modnetwork.c
@@ -466,7 +466,7 @@ STATIC mp_obj_t esp_scan(mp_obj_t self_in) {
 
     mp_obj_t list = mp_obj_new_list(0, NULL);
     wifi_scan_config_t config = { 0 };
-    // XXX how do we scan hidden APs (and if we can scan them, are they really hidden?)
+    config.show_hidden = true;
     MP_THREAD_GIL_EXIT();
     esp_err_t status = esp_wifi_scan_start(&config, 1);
     MP_THREAD_GIL_ENTER();
diff --git a/ports/esp8266/modnetwork.c b/ports/esp8266/modnetwork.c
index 949aeba1069df..f0cd83aeec357 100644
--- a/ports/esp8266/modnetwork.c
+++ b/ports/esp8266/modnetwork.c
@@ -233,7 +233,9 @@ STATIC mp_obj_t esp_scan(mp_obj_t self_in) {
     }
     mp_obj_t list = mp_obj_new_list(0, NULL);
     esp_scan_list = &list;
-    wifi_station_scan(NULL, (scan_done_cb_t)esp_scan_cb);
+    struct scan_config config = {0};
+    config.show_hidden = 1;
+    wifi_station_scan(&config, (scan_done_cb_t)esp_scan_cb);
     while (esp_scan_list != NULL) {
         // our esp_scan_cb is called via ets_loop_iter so it's safe to set the
         // esp_scan_list variable to NULL without disabling interrupts

From ffc854f17f1c4a3a9904fa8909f0b6ab5385206f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Peter=20Z=C3=BCger?= <zueger.peter@icloud.com>
Date: Wed, 3 Feb 2021 09:24:25 +0100
Subject: [PATCH 1146/3533] extmod/modujson: Add support for dump/dumps
 separators keyword-argument.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Optionally enabled via MICROPY_PY_UJSON_SEPARATORS.  Enabled by default.

For dump, make sure mp_get_stream_raise is called after
mod_ujson_separators since CPython does it in this order (if both
separators and stream are invalid, separators will raise an exception
first).

Add separators argument in the docs as well.

Signed-off-by: Peter Züger <zueger.peter@icloud.com>
Signed-off-by: Damien George <damien@micropython.org>
---
 docs/library/ujson.rst | 10 ++++++--
 extmod/modujson.c      | 58 ++++++++++++++++++++++++++++++++++++++++++
 py/mpconfig.h          |  5 ++++
 py/mpprint.h           |  8 ++++++
 py/objdict.c           | 11 ++++++--
 py/objlist.c           |  7 ++++-
 py/objtuple.c          |  6 ++++-
 7 files changed, 99 insertions(+), 6 deletions(-)

diff --git a/docs/library/ujson.rst b/docs/library/ujson.rst
index 5668eb21a8061..65ed1867e6e87 100644
--- a/docs/library/ujson.rst
+++ b/docs/library/ujson.rst
@@ -12,14 +12,20 @@ data format.
 Functions
 ---------
 
-.. function:: dump(obj, stream)
+.. function:: dump(obj, stream, separators=None)
 
    Serialise *obj* to a JSON string, writing it to the given *stream*.
 
-.. function:: dumps(obj)
+   If specified, separators should be an ``(item_separator, key_separator)``
+   tuple. The default is ``(', ', ': ')``. To get the most compact JSON
+   representation, you should specify ``(',', ':')`` to eliminate whitespace.
+
+.. function:: dumps(obj, separators=None)
 
    Return *obj* represented as a JSON string.
 
+   The arguments have the same meaning as in `dump`.
+
 .. function:: load(stream)
 
    Parse the given *stream*, interpreting it as a JSON string and
diff --git a/extmod/modujson.c b/extmod/modujson.c
index 8dff673580279..e5bfb0d966399 100644
--- a/extmod/modujson.c
+++ b/extmod/modujson.c
@@ -34,6 +34,62 @@
 
 #if MICROPY_PY_UJSON
 
+#if MICROPY_PY_UJSON_SEPARATORS
+
+enum {
+    DUMP_MODE_TO_STRING = 1,
+    DUMP_MODE_TO_STREAM = 2,
+};
+
+STATIC mp_obj_t mod_ujson_dump_helper(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args, unsigned int mode) {
+    enum { ARG_separators };
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_separators, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
+    };
+
+    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
+    mp_arg_parse_all(n_args - mode, pos_args + mode, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
+
+    mp_print_ext_t print_ext;
+
+    if (args[ARG_separators].u_obj == mp_const_none) {
+        print_ext.item_separator = ", ";
+        print_ext.key_separator = ": ";
+    } else {
+        mp_obj_t *items;
+        mp_obj_get_array_fixed_n(args[ARG_separators].u_obj, 2, &items);
+        print_ext.item_separator = mp_obj_str_get_str(items[0]);
+        print_ext.key_separator = mp_obj_str_get_str(items[1]);
+    }
+
+    if (mode == DUMP_MODE_TO_STRING) {
+        // dumps(obj)
+        vstr_t vstr;
+        vstr_init_print(&vstr, 8, &print_ext.base);
+        mp_obj_print_helper(&print_ext.base, pos_args[0], PRINT_JSON);
+        return mp_obj_new_str_from_vstr(&mp_type_str, &vstr);
+    } else {
+        // dump(obj, stream)
+        print_ext.base.data = MP_OBJ_TO_PTR(pos_args[1]);
+        print_ext.base.print_strn = mp_stream_write_adaptor;
+        mp_get_stream_raise(pos_args[1], MP_STREAM_OP_WRITE);
+        mp_obj_print_helper(&print_ext.base, pos_args[0], PRINT_JSON);
+        return mp_const_none;
+    }
+}
+
+STATIC mp_obj_t mod_ujson_dump(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    return mod_ujson_dump_helper(n_args, pos_args, kw_args, DUMP_MODE_TO_STREAM);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_KW(mod_ujson_dump_obj, 2, mod_ujson_dump);
+
+STATIC mp_obj_t mod_ujson_dumps(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    return mod_ujson_dump_helper(n_args, pos_args, kw_args, DUMP_MODE_TO_STRING);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_KW(mod_ujson_dumps_obj, 1, mod_ujson_dumps);
+
+#else
+
 STATIC mp_obj_t mod_ujson_dump(mp_obj_t obj, mp_obj_t stream) {
     mp_get_stream_raise(stream, MP_STREAM_OP_WRITE);
     mp_print_t print = {MP_OBJ_TO_PTR(stream), mp_stream_write_adaptor};
@@ -51,6 +107,8 @@ STATIC mp_obj_t mod_ujson_dumps(mp_obj_t obj) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_ujson_dumps_obj, mod_ujson_dumps);
 
+#endif
+
 // The function below implements a simple non-recursive JSON parser.
 //
 // The JSON specification is at http://www.ietf.org/rfc/rfc4627.txt
diff --git a/py/mpconfig.h b/py/mpconfig.h
index f67e11cd4b03a..a91c39b018e01 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -1380,6 +1380,11 @@ typedef double mp_float_t;
 #define MICROPY_PY_UJSON (0)
 #endif
 
+// Whether to support the "separators" argument to dump, dumps
+#ifndef MICROPY_PY_UJSON_SEPARATORS
+#define MICROPY_PY_UJSON_SEPARATORS (1)
+#endif
+
 #ifndef MICROPY_PY_URE
 #define MICROPY_PY_URE (0)
 #endif
diff --git a/py/mpprint.h b/py/mpprint.h
index aef9015deba30..0dff9a770ada7 100644
--- a/py/mpprint.h
+++ b/py/mpprint.h
@@ -52,6 +52,14 @@ typedef struct _mp_print_t {
     mp_print_strn_t print_strn;
 } mp_print_t;
 
+typedef struct _mp_print_ext_t {
+    mp_print_t base;
+    const char *item_separator;
+    const char *key_separator;
+}mp_print_ext_t;
+
+#define MP_PRINT_GET_EXT(print) ((mp_print_ext_t *)print)
+
 // All (non-debug) prints go through one of the two interfaces below.
 // 1) Wrapper for platform print function, which wraps MP_PLAT_PRINT_STRN.
 extern const mp_print_t mp_plat_print;
diff --git a/py/objdict.c b/py/objdict.c
index 63e5381c66449..ed4376aa4f0ac 100644
--- a/py/objdict.c
+++ b/py/objdict.c
@@ -69,8 +69,15 @@ STATIC mp_map_elem_t *dict_iter_next(mp_obj_dict_t *dict, size_t *cur) {
 STATIC void dict_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     mp_obj_dict_t *self = MP_OBJ_TO_PTR(self_in);
     bool first = true;
+    const char *item_separator = ", ";
+    const char *key_separator = ": ";
     if (!(MICROPY_PY_UJSON && kind == PRINT_JSON)) {
         kind = PRINT_REPR;
+    } else {
+        #if MICROPY_PY_UJSON_SEPARATORS
+        item_separator = MP_PRINT_GET_EXT(print)->item_separator;
+        key_separator = MP_PRINT_GET_EXT(print)->key_separator;
+        #endif
     }
     if (MICROPY_PY_COLLECTIONS_ORDEREDDICT && self->base.type != &mp_type_dict && kind != PRINT_JSON) {
         mp_printf(print, "%q(", self->base.type->name);
@@ -80,7 +87,7 @@ STATIC void dict_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_
     mp_map_elem_t *next = NULL;
     while ((next = dict_iter_next(self, &cur)) != NULL) {
         if (!first) {
-            mp_print_str(print, ", ");
+            mp_print_str(print, item_separator);
         }
         first = false;
         bool add_quote = MICROPY_PY_UJSON && kind == PRINT_JSON && !mp_obj_is_str_or_bytes(next->key);
@@ -91,7 +98,7 @@ STATIC void dict_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_
         if (add_quote) {
             mp_print_str(print, "\"");
         }
-        mp_print_str(print, ": ");
+        mp_print_str(print, key_separator);
         mp_obj_print_helper(print, next->value, kind);
     }
     mp_print_str(print, "}");
diff --git a/py/objlist.c b/py/objlist.c
index 8c989facc0dfe..f431e273df0af 100644
--- a/py/objlist.c
+++ b/py/objlist.c
@@ -44,13 +44,18 @@ STATIC mp_obj_t list_pop(size_t n_args, const mp_obj_t *args);
 
 STATIC void list_print(const mp_print_t *print, mp_obj_t o_in, mp_print_kind_t kind) {
     mp_obj_list_t *o = MP_OBJ_TO_PTR(o_in);
+    const char *item_separator = ", ";
     if (!(MICROPY_PY_UJSON && kind == PRINT_JSON)) {
         kind = PRINT_REPR;
+    } else {
+        #if MICROPY_PY_UJSON_SEPARATORS
+        item_separator = MP_PRINT_GET_EXT(print)->item_separator;
+        #endif
     }
     mp_print_str(print, "[");
     for (size_t i = 0; i < o->len; i++) {
         if (i > 0) {
-            mp_print_str(print, ", ");
+            mp_print_str(print, item_separator);
         }
         mp_obj_print_helper(print, o->items[i], kind);
     }
diff --git a/py/objtuple.c b/py/objtuple.c
index 07a560ac08aac..67d7bc356f4ca 100644
--- a/py/objtuple.c
+++ b/py/objtuple.c
@@ -39,15 +39,19 @@
 
 void mp_obj_tuple_print(const mp_print_t *print, mp_obj_t o_in, mp_print_kind_t kind) {
     mp_obj_tuple_t *o = MP_OBJ_TO_PTR(o_in);
+    const char *item_separator = ", ";
     if (MICROPY_PY_UJSON && kind == PRINT_JSON) {
         mp_print_str(print, "[");
+        #if MICROPY_PY_UJSON_SEPARATORS
+        item_separator = MP_PRINT_GET_EXT(print)->item_separator;
+        #endif
     } else {
         mp_print_str(print, "(");
         kind = PRINT_REPR;
     }
     for (size_t i = 0; i < o->len; i++) {
         if (i > 0) {
-            mp_print_str(print, ", ");
+            mp_print_str(print, item_separator);
         }
         mp_obj_print_helper(print, o->items[i], kind);
     }

From d290f369d08990cba4b5c2e0d207f8603c5166b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Peter=20Z=C3=BCger?= <zueger.peter@icloud.com>
Date: Sun, 30 May 2021 14:28:13 +0200
Subject: [PATCH 1147/3533] tests/extmod/ujson: Add tests for dump/dumps
 separators argument.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Basically just copied ujson_dump(s).py and added various valid/invalid
separator tests.

Signed-off-by: Peter Züger <zueger.peter@icloud.com>
---
 tests/extmod/ujson_dump_separators.py  | 62 ++++++++++++++++++++++++++
 tests/extmod/ujson_dumps_separators.py | 60 +++++++++++++++++++++++++
 2 files changed, 122 insertions(+)
 create mode 100644 tests/extmod/ujson_dump_separators.py
 create mode 100644 tests/extmod/ujson_dumps_separators.py

diff --git a/tests/extmod/ujson_dump_separators.py b/tests/extmod/ujson_dump_separators.py
new file mode 100644
index 0000000000000..e19b99a26d727
--- /dev/null
+++ b/tests/extmod/ujson_dump_separators.py
@@ -0,0 +1,62 @@
+try:
+    from uio import StringIO
+    import ujson as json
+except:
+    try:
+        from io import StringIO
+        import json
+    except ImportError:
+        print("SKIP")
+        raise SystemExit
+
+for sep in [
+    None,
+    (", ", ": "),
+    (",", ": "),
+    (",", ":"),
+    [", ", ": "],
+    [",", ": "],
+    [",", ":"],
+]:
+    s = StringIO()
+    json.dump(False, s, separators=sep)
+    print(s.getvalue())
+
+    s = StringIO()
+    json.dump({"a": (2, [3, None])}, s, separators=sep)
+    print(s.getvalue())
+
+    # dump to a small-int not allowed
+    try:
+        json.dump(123, 1, separators=sep)
+    except (AttributeError, OSError):  # CPython and uPy have different errors
+        print("Exception")
+
+    # dump to an object not allowed
+    try:
+        json.dump(123, {}, separators=sep)
+    except (AttributeError, OSError):  # CPython and uPy have different errors
+        print("Exception")
+
+
+try:
+    s = StringIO()
+    json.dump(False, s, separators={"a": 1})
+except (TypeError, ValueError):  # CPython and uPy have different errors
+    print("Exception")
+
+# invalid separator types
+for sep in [1, object()]:
+    try:
+        s = StringIO()
+        json.dump(False, s, separators=sep)
+    except TypeError:
+        print("Exception")
+
+# too many/ not enough separators
+for sep in [(), (",", ":", "?"), (",",), []]:
+    try:
+        s = StringIO()
+        json.dump(False, s, separators=sep)
+    except ValueError:
+        print("Exception")
diff --git a/tests/extmod/ujson_dumps_separators.py b/tests/extmod/ujson_dumps_separators.py
new file mode 100644
index 0000000000000..efb541fe8bfad
--- /dev/null
+++ b/tests/extmod/ujson_dumps_separators.py
@@ -0,0 +1,60 @@
+try:
+    import ujson as json
+except ImportError:
+    try:
+        import json
+    except ImportError:
+        print("SKIP")
+        raise SystemExit
+
+for sep in [
+    None,
+    (", ", ": "),
+    (",", ": "),
+    (",", ":"),
+    [", ", ": "],
+    [",", ": "],
+    [",", ":"],
+]:
+    print(json.dumps(False, separators=sep))
+    print(json.dumps(True, separators=sep))
+    print(json.dumps(None, separators=sep))
+    print(json.dumps(1, separators=sep))
+    print(json.dumps("abc", separators=sep))
+    print(json.dumps("\x00\x01\x7e", separators=sep))
+    print(json.dumps([], separators=sep))
+    print(json.dumps([1], separators=sep))
+    print(json.dumps([1, 2], separators=sep))
+    print(json.dumps([1, True], separators=sep))
+    print(json.dumps((), separators=sep))
+    print(json.dumps((1,), separators=sep))
+    print(json.dumps((1, 2), separators=sep))
+    print(json.dumps((1, (2, 3)), separators=sep))
+    print(json.dumps({}, separators=sep))
+    print(json.dumps({"a": 1}, separators=sep))
+    print(json.dumps({"a": (2, [3, None])}, separators=sep))
+    print(json.dumps('"quoted"', separators=sep))
+    print(json.dumps("space\n\r\tspace", separators=sep))
+    print(json.dumps({None: -1}, separators=sep))
+    print(json.dumps({False: 0}, separators=sep))
+    print(json.dumps({True: 1}, separators=sep))
+    print(json.dumps({1: 2}, separators=sep))
+
+try:
+    json.dumps(False, separators={"a": 1})
+except (TypeError, ValueError):  # CPython and uPy have different errors
+    print("Exception")
+
+# invalid separator types
+for sep in [1, object()]:
+    try:
+        json.dumps(False, separators=sep)
+    except TypeError:
+        print("Exception")
+
+# too many/ not enough separators
+for sep in [(), (",", ":", "?"), (",",), []]:
+    try:
+        json.dumps(False, separators=sep)
+    except ValueError:
+        print("Exception")

From 78718fffb1f3010c7a40bb4c29c6ddf5b8dadaa3 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 3 Aug 2021 22:30:15 +1000
Subject: [PATCH 1148/3533] py/mkrules: Automatically build mpy-cross if it
 doesn't exist.

Commit 41739506589ec8397613c86d8f682fb7f86c0a9f removed automatic building
of mpy-cross, which rebuilt it whenever any of its dependent source files
changed.

But needing to build mpy-cross, and not knowing how, is a frequent issue.
This commit aims to help by automatically building mpy-cross only if it
doesn't exist.  For Makefiles it uses an order-only prerequisite, while
for CMake it uses a custom command.

If MICROPY_MPYCROSS (which is what makemanifest.py uses to locate the
mpy-cross executable) is defined in the environment then automatic build
will not be attempted, allowing a way to prevent this auto-build if needed.

Thanks to Trammell Hudson aka @osresearch for the original idea; see #5760.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/mkenv.mk      |  6 +++++-
 py/mkrules.cmake | 16 ++++++++++++++++
 py/mkrules.mk    | 12 +++++++++---
 3 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/py/mkenv.mk b/py/mkenv.mk
index d54f0a0d3190b..2b247974b68e4 100644
--- a/py/mkenv.mk
+++ b/py/mkenv.mk
@@ -55,11 +55,15 @@ AR = $(CROSS_COMPILE)ar
 
 MAKE_MANIFEST = $(PYTHON) $(TOP)/tools/makemanifest.py
 MAKE_FROZEN = $(PYTHON) $(TOP)/tools/make-frozen.py
-MPY_CROSS = $(TOP)/mpy-cross/mpy-cross
 MPY_TOOL = $(PYTHON) $(TOP)/tools/mpy-tool.py
 
 MPY_LIB_DIR = $(TOP)/../micropython-lib
 
+ifeq ($(MICROPY_MPYCROSS),)
+MICROPY_MPYCROSS = $(TOP)/mpy-cross/mpy-cross
+MICROPY_MPYCROSS_DEPENDENCY = $(MICROPY_MPYCROSS)
+endif
+
 all:
 .PHONY: all
 
diff --git a/py/mkrules.cmake b/py/mkrules.cmake
index 7589255b2039a..9d08017931963 100644
--- a/py/mkrules.cmake
+++ b/py/mkrules.cmake
@@ -129,11 +129,27 @@ if(MICROPY_FROZEN_MANIFEST)
         set(MICROPY_LIB_DIR ${MICROPY_DIR}/../micropython-lib)
     endif()
 
+    # If MICROPY_MPYCROSS is not explicitly defined in the environment (which
+    # is what makemanifest.py will use) then create an mpy-cross dependency
+    # to automatically build mpy-cross if needed.
+    set(MICROPY_MPYCROSS $ENV{MICROPY_MPYCROSS})
+    if(NOT MICROPY_MPYCROSS)
+        set(MICROPY_MPYCROSS_DEPENDENCY ${MICROPY_DIR}/mpy-cross/mpy-cross)
+        if(NOT MICROPY_MAKE_EXECUTABLE)
+            set(MICROPY_MAKE_EXECUTABLE make)
+        endif()
+        add_custom_command(
+            OUTPUT ${MICROPY_MPYCROSS_DEPENDENCY}
+            COMMAND ${MICROPY_MAKE_EXECUTABLE} -C ${MICROPY_DIR}/mpy-cross
+        )
+    endif()
+
     add_custom_command(
         OUTPUT ${MICROPY_FROZEN_CONTENT}
         COMMAND ${Python3_EXECUTABLE} ${MICROPY_DIR}/tools/makemanifest.py -o ${MICROPY_FROZEN_CONTENT} -v "MPY_DIR=${MICROPY_DIR}" -v "MPY_LIB_DIR=${MICROPY_LIB_DIR}" -v "PORT_DIR=${MICROPY_PORT_DIR}" -v "BOARD_DIR=${MICROPY_BOARD_DIR}" -b "${CMAKE_BINARY_DIR}" -f${MICROPY_CROSS_FLAGS} ${MICROPY_FROZEN_MANIFEST}
         DEPENDS MICROPY_FORCE_BUILD
             ${MICROPY_QSTRDEFS_GENERATED}
+            ${MICROPY_MPYCROSS_DEPENDENCY}
         VERBATIM
     )
 endif()
diff --git a/py/mkrules.mk b/py/mkrules.mk
index 63f704967fe86..730ad45890d60 100644
--- a/py/mkrules.mk
+++ b/py/mkrules.mk
@@ -136,9 +136,15 @@ $(OBJ_DIRS):
 $(HEADER_BUILD):
 	$(MKDIR) -p $@
 
+ifneq ($(MICROPY_MPYCROSS_DEPENDENCY),)
+# to automatically build mpy-cross, if needed
+$(MICROPY_MPYCROSS_DEPENDENCY):
+	$(MAKE) -C $(dir $@)
+endif
+
 ifneq ($(FROZEN_MANIFEST),)
 # to build frozen_content.c from a manifest
-$(BUILD)/frozen_content.c: FORCE $(BUILD)/genhdr/qstrdefs.generated.h
+$(BUILD)/frozen_content.c: FORCE $(BUILD)/genhdr/qstrdefs.generated.h | $(MICROPY_MPYCROSS_DEPENDENCY)
 	$(Q)$(MAKE_MANIFEST) -o $@ -v "MPY_DIR=$(TOP)" -v "MPY_LIB_DIR=$(MPY_LIB_DIR)" -v "PORT_DIR=$(shell pwd)" -v "BOARD_DIR=$(BOARD_DIR)" -b "$(BUILD)" $(if $(MPY_CROSS_FLAGS),-f"$(MPY_CROSS_FLAGS)",) --mpy-tool-flags="$(MPY_TOOL_FLAGS)" $(FROZEN_MANIFEST)
 
 ifneq ($(FROZEN_DIR),)
@@ -164,10 +170,10 @@ FROZEN_MPY_PY_FILES := $(shell find -L $(FROZEN_MPY_DIR) -type f -name '*.py' |
 FROZEN_MPY_MPY_FILES := $(addprefix $(BUILD)/frozen_mpy/,$(FROZEN_MPY_PY_FILES:.py=.mpy))
 
 # to build .mpy files from .py files
-$(BUILD)/frozen_mpy/%.mpy: $(FROZEN_MPY_DIR)/%.py
+$(BUILD)/frozen_mpy/%.mpy: $(FROZEN_MPY_DIR)/%.py | $(MICROPY_MPYCROSS_DEPENDENCY)
 	@$(ECHO) "MPY $<"
 	$(Q)$(MKDIR) -p $(dir $@)
-	$(Q)$(MPY_CROSS) -o $@ -s $(<:$(FROZEN_MPY_DIR)/%=%) $(MPY_CROSS_FLAGS) $<
+	$(Q)$(MICROPY_MPYCROSS) -o $@ -s $(<:$(FROZEN_MPY_DIR)/%=%) $(MPY_CROSS_FLAGS) $<
 
 # to build frozen_mpy.c from all .mpy files
 $(BUILD)/frozen_mpy.c: $(FROZEN_MPY_MPY_FILES) $(BUILD)/genhdr/qstrdefs.generated.h

From 45f9a38451ce7419c9a97f8f2b471746a383c7b7 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 5 Aug 2021 13:00:35 +1000
Subject: [PATCH 1149/3533] docs/library/machine.I2S.rst: Fix use of sd pin in
 examples.

Signed-off-by: Damien George <damien@micropython.org>
---
 docs/library/machine.I2S.rst | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/library/machine.I2S.rst b/docs/library/machine.I2S.rst
index e1c6af990ca6f..45877a5ae0abd 100644
--- a/docs/library/machine.I2S.rst
+++ b/docs/library/machine.I2S.rst
@@ -19,17 +19,17 @@ I2S objects can be created and initialized using::
     # ESP32
     sck_pin = Pin(14)   # Serial clock output
     ws_pin = Pin(13)    # Word clock output
-    sdout_pin = Pin(12) # Serial data output
+    sd_pin = Pin(12)    # Serial data output
     
     or
     
     # PyBoards
     sck_pin = Pin("Y6")   # Serial clock output
     ws_pin = Pin("Y5")    # Word clock output
-    sdout_pin = Pin("Y8") # Serial data output
+    sd_pin = Pin("Y8")    # Serial data output
     
     audio_out = I2S(2, 
-                    sck=sck_pin, ws=ws_pin, sdin=sdin_pin,    
+                    sck=sck_pin, ws=ws_pin, sd=sd_pin,
                     mode=I2S.TX, 
                     bits=16,                       
                     format=I2S.MONO,
@@ -37,7 +37,7 @@ I2S objects can be created and initialized using::
                     ibuf=20000)
                    
     audio_in = I2S(2, 
-                   sck=sck_pin, ws=ws_pin, sdin=sdin_pin,    
+                   sck=sck_pin, ws=ws_pin, sd=sd_pin,
                    mode=I2S.RX, 
                    bits=32,                       
                    format=I2S.STEREO,

From 96c6b8cae3ad5037c41f4e029974fb17d727d012 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sun, 1 Aug 2021 11:04:15 +1000
Subject: [PATCH 1150/3533] ports: Rename USBD_VID/PID config macros to
 MICROPY_HW_USB_VID/PID.

For consistency with other board-level config macros that begin with
MICROPY_HW_USB.

Also allow boards in the mimxrt, nrf and samd ports to configure these
values.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/mimxrt/tusb_port.c                | 10 +++++----
 ports/nrf/drivers/usb/usb_descriptors.c | 10 +++++----
 ports/samd/tusb_port.c                  | 10 +++++----
 ports/stm32/Makefile                    |  2 +-
 ports/stm32/main.c                      |  6 +++---
 ports/stm32/mpconfigboard_common.h      | 27 +++++++++++++++++++++++++
 ports/stm32/usb.c                       | 24 +++++++++++-----------
 ports/stm32/usb.h                       | 16 ---------------
 tools/insert-usb-ids.py                 |  7 ++++---
 9 files changed, 65 insertions(+), 47 deletions(-)

diff --git a/ports/mimxrt/tusb_port.c b/ports/mimxrt/tusb_port.c
index 2b1ccabbe783a..128861a49a0b5 100644
--- a/ports/mimxrt/tusb_port.c
+++ b/ports/mimxrt/tusb_port.c
@@ -26,8 +26,10 @@
 
 #include "tusb.h"
 
-#define USBD_VID (0xf055)
-#define USBD_PID (0x9802)
+#ifndef MICROPY_HW_USB_VID
+#define MICROPY_HW_USB_VID (0xf055)
+#define MICROPY_HW_USB_PID (0x9802)
+#endif
 
 #define USBD_DESC_LEN (TUD_CONFIG_DESC_LEN + TUD_CDC_DESC_LEN)
 #define USBD_MAX_POWER_MA (250)
@@ -57,8 +59,8 @@ static const tusb_desc_device_t usbd_desc_device = {
     .bDeviceSubClass = MISC_SUBCLASS_COMMON,
     .bDeviceProtocol = MISC_PROTOCOL_IAD,
     .bMaxPacketSize0 = CFG_TUD_ENDPOINT0_SIZE,
-    .idVendor = USBD_VID,
-    .idProduct = USBD_PID,
+    .idVendor = MICROPY_HW_USB_VID,
+    .idProduct = MICROPY_HW_USB_PID,
     .bcdDevice = 0x0100,
     .iManufacturer = USBD_STR_MANUF,
     .iProduct = USBD_STR_PRODUCT,
diff --git a/ports/nrf/drivers/usb/usb_descriptors.c b/ports/nrf/drivers/usb/usb_descriptors.c
index e9436ded54fe8..b1edfcc18fd8f 100644
--- a/ports/nrf/drivers/usb/usb_descriptors.c
+++ b/ports/nrf/drivers/usb/usb_descriptors.c
@@ -26,8 +26,10 @@
 
 #include "tusb.h"
 
-#define USBD_VID (0xf055)
-#define USBD_PID (0x9802)
+#ifndef MICROPY_HW_USB_VID
+#define MICROPY_HW_USB_VID (0xf055)
+#define MICROPY_HW_USB_PID (0x9802)
+#endif
 
 #define USBD_DESC_LEN (TUD_CONFIG_DESC_LEN + TUD_CDC_DESC_LEN)
 #define USBD_MAX_POWER_MA (250)
@@ -57,8 +59,8 @@ static const tusb_desc_device_t usbd_desc_device = {
     .bDeviceSubClass    = MISC_SUBCLASS_COMMON,
     .bDeviceProtocol    = MISC_PROTOCOL_IAD,
     .bMaxPacketSize0    = CFG_TUD_ENDOINT0_SIZE,
-    .idVendor           = USBD_VID,
-    .idProduct          = USBD_PID,
+    .idVendor           = MICROPY_HW_USB_VID,
+    .idProduct          = MICROPY_HW_USB_PID,
     .bcdDevice          = 0x0100,
     .iManufacturer      = USBD_STR_MANUF,
     .iProduct           = USBD_STR_PRODUCT,
diff --git a/ports/samd/tusb_port.c b/ports/samd/tusb_port.c
index e96f332464b5a..2098334fbae61 100644
--- a/ports/samd/tusb_port.c
+++ b/ports/samd/tusb_port.c
@@ -27,8 +27,10 @@
 #include "samd_soc.h"
 #include "tusb.h"
 
-#define USBD_VID (0xf055)
-#define USBD_PID (0x9802)
+#ifndef MICROPY_HW_USB_VID
+#define MICROPY_HW_USB_VID (0xf055)
+#define MICROPY_HW_USB_PID (0x9802)
+#endif
 
 #define USBD_DESC_LEN (TUD_CONFIG_DESC_LEN + TUD_CDC_DESC_LEN)
 #define USBD_MAX_POWER_MA (250)
@@ -58,8 +60,8 @@ static const tusb_desc_device_t usbd_desc_device = {
     .bDeviceSubClass = MISC_SUBCLASS_COMMON,
     .bDeviceProtocol = MISC_PROTOCOL_IAD,
     .bMaxPacketSize0 = CFG_TUD_ENDOINT0_SIZE,
-    .idVendor = USBD_VID,
-    .idProduct = USBD_PID,
+    .idVendor = MICROPY_HW_USB_VID,
+    .idProduct = MICROPY_HW_USB_PID,
     .bcdDevice = 0x0100,
     .iManufacturer = USBD_STR_MANUF,
     .iProduct = USBD_STR_PRODUCT,
diff --git a/ports/stm32/Makefile b/ports/stm32/Makefile
index d78e2b4851113..fd76f20a6d221 100644
--- a/ports/stm32/Makefile
+++ b/ports/stm32/Makefile
@@ -725,7 +725,7 @@ GEN_PINS_AF_PY = $(BUILD)/pins_af.py
 INSERT_USB_IDS = $(TOP)/tools/insert-usb-ids.py
 FILE2H = $(TOP)/tools/file2h.py
 
-USB_IDS_FILE = usb.h
+USB_IDS_FILE = mpconfigboard_common.h
 CDCINF_TEMPLATE = pybcdc.inf_template
 GEN_CDCINF_FILE = $(HEADER_BUILD)/pybcdc.inf
 GEN_CDCINF_HEADER = $(HEADER_BUILD)/pybcdc_inf.h
diff --git a/ports/stm32/main.c b/ports/stm32/main.c
index 3ff7077ac2dce..d55f1a2c30897 100644
--- a/ports/stm32/main.c
+++ b/ports/stm32/main.c
@@ -582,13 +582,13 @@ void stm32_main(uint32_t reset_mode) {
     // init USB device to default setting if it was not already configured
     if (!(pyb_usb_flags & PYB_USB_FLAG_USB_MODE_CALLED)) {
         #if MICROPY_HW_USB_MSC
-        const uint16_t pid = USBD_PID_CDC_MSC;
+        const uint16_t pid = MICROPY_HW_USB_PID_CDC_MSC;
         const uint8_t mode = USBD_MODE_CDC_MSC;
         #else
-        const uint16_t pid = USBD_PID_CDC;
+        const uint16_t pid = MICROPY_HW_USB_PID_CDC;
         const uint8_t mode = USBD_MODE_CDC;
         #endif
-        pyb_usb_dev_init(pyb_usb_dev_detect(), USBD_VID, pid, mode, 0, NULL, NULL);
+        pyb_usb_dev_init(pyb_usb_dev_detect(), MICROPY_HW_USB_VID, pid, mode, 0, NULL, NULL);
     }
     #endif
 
diff --git a/ports/stm32/mpconfigboard_common.h b/ports/stm32/mpconfigboard_common.h
index ce9dbdb0af8c0..46456420dad07 100644
--- a/ports/stm32/mpconfigboard_common.h
+++ b/ports/stm32/mpconfigboard_common.h
@@ -177,6 +177,33 @@
 #define MICROPY_HW_UART_IS_RESERVED(uart_id) (false)
 #endif
 
+/*****************************************************************************/
+// USB configuration
+
+// The USBD_xxx VID/PID macros have been renamed to MICROPY_HW_USB_xxx.
+#ifdef USBD_VID
+#error "Old USBD_VID configuration option used"
+#endif
+
+// Default VID and PID values to use for the USB device.  If MICROPY_HW_USB_VID
+// is defined by a board then all needed PID options must also be defined.  The
+// VID and PID can also be set dynamically in pyb.usb_mode().
+// Windows needs a different PID to distinguish different device configurations.
+#ifndef MICROPY_HW_USB_VID
+#define MICROPY_HW_USB_VID              (0xf055)
+#define MICROPY_HW_USB_PID_CDC_MSC      (0x9800)
+#define MICROPY_HW_USB_PID_CDC_HID      (0x9801)
+#define MICROPY_HW_USB_PID_CDC          (0x9802)
+#define MICROPY_HW_USB_PID_MSC          (0x9803)
+#define MICROPY_HW_USB_PID_CDC2_MSC     (0x9804)
+#define MICROPY_HW_USB_PID_CDC2         (0x9805)
+#define MICROPY_HW_USB_PID_CDC3         (0x9806)
+#define MICROPY_HW_USB_PID_CDC3_MSC     (0x9807)
+#define MICROPY_HW_USB_PID_CDC_MSC_HID  (0x9808)
+#define MICROPY_HW_USB_PID_CDC2_MSC_HID (0x9809)
+#define MICROPY_HW_USB_PID_CDC3_MSC_HID (0x980a)
+#endif
+
 /*****************************************************************************/
 // General configuration
 
diff --git a/ports/stm32/usb.c b/ports/stm32/usb.c
index 838613f283899..1ed45592e9c18 100644
--- a/ports/stm32/usb.c
+++ b/ports/stm32/usb.c
@@ -412,7 +412,7 @@ STATIC mp_obj_t pyb_usb_mode(size_t n_args, const mp_obj_t *pos_args, mp_map_t *
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_mode, MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
         { MP_QSTR_port, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} },
-        { MP_QSTR_vid, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = USBD_VID} },
+        { MP_QSTR_vid, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = MICROPY_HW_USB_VID} },
         { MP_QSTR_pid, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} },
         #if MICROPY_HW_USB_MSC
         { MP_QSTR_msc, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_PTR(&mp_const_empty_tuple_obj)} },
@@ -489,61 +489,61 @@ STATIC mp_obj_t pyb_usb_mode(size_t n_args, const mp_obj_t *pos_args, mp_map_t *
     uint8_t mode;
     if (strcmp(mode_str, "CDC+MSC") == 0 || strcmp(mode_str, "VCP+MSC") == 0) {
         if (pid == -1) {
-            pid = USBD_PID_CDC_MSC;
+            pid = MICROPY_HW_USB_PID_CDC_MSC;
         }
         mode = USBD_MODE_CDC_MSC;
     } else if (strcmp(mode_str, "VCP+MSC+HID") == 0) {
         if (pid == -1) {
-            pid = USBD_PID_CDC_MSC_HID;
+            pid = MICROPY_HW_USB_PID_CDC_MSC_HID;
         }
         mode = USBD_MODE_CDC_MSC_HID;
     #if MICROPY_HW_USB_CDC_NUM >= 2
     } else if (strcmp(mode_str, "VCP+VCP") == 0) {
         if (pid == -1) {
-            pid = USBD_PID_CDC2;
+            pid = MICROPY_HW_USB_PID_CDC2;
         }
         mode = USBD_MODE_CDC2;
     } else if (strcmp(mode_str, "VCP+VCP+MSC") == 0) {
         if (pid == -1) {
-            pid = USBD_PID_CDC2_MSC;
+            pid = MICROPY_HW_USB_PID_CDC2_MSC;
         }
         mode = USBD_MODE_CDC2_MSC;
     } else if (strcmp(mode_str, "2xVCP+MSC+HID") == 0) {
         if (pid == -1) {
-            pid = USBD_PID_CDC2_MSC_HID;
+            pid = MICROPY_HW_USB_PID_CDC2_MSC_HID;
         }
         mode = USBD_MODE_CDC2_MSC_HID;
     #endif
     #if MICROPY_HW_USB_CDC_NUM >= 3
     } else if (strcmp(mode_str, "3xVCP") == 0) {
         if (pid == -1) {
-            pid = USBD_PID_CDC3;
+            pid = MICROPY_HW_USB_PID_CDC3;
         }
         mode = USBD_MODE_CDC3;
     } else if (strcmp(mode_str, "3xVCP+MSC") == 0) {
         if (pid == -1) {
-            pid = USBD_PID_CDC3_MSC;
+            pid = MICROPY_HW_USB_PID_CDC3_MSC;
         }
         mode = USBD_MODE_CDC3_MSC;
     } else if (strcmp(mode_str, "3xVCP+MSC+HID") == 0) {
         if (pid == -1) {
-            pid = USBD_PID_CDC3_MSC_HID;
+            pid = MICROPY_HW_USB_PID_CDC3_MSC_HID;
         }
         mode = USBD_MODE_CDC3_MSC_HID;
     #endif
     } else if (strcmp(mode_str, "CDC+HID") == 0 || strcmp(mode_str, "VCP+HID") == 0) {
         if (pid == -1) {
-            pid = USBD_PID_CDC_HID;
+            pid = MICROPY_HW_USB_PID_CDC_HID;
         }
         mode = USBD_MODE_CDC_HID;
     } else if (strcmp(mode_str, "CDC") == 0 || strcmp(mode_str, "VCP") == 0) {
         if (pid == -1) {
-            pid = USBD_PID_CDC;
+            pid = MICROPY_HW_USB_PID_CDC;
         }
         mode = USBD_MODE_CDC;
     } else if (strcmp(mode_str, "MSC") == 0) {
         if (pid == -1) {
-            pid = USBD_PID_MSC;
+            pid = MICROPY_HW_USB_PID_MSC;
         }
         mode = USBD_MODE_MSC;
     } else {
diff --git a/ports/stm32/usb.h b/ports/stm32/usb.h
index 295038ebd4289..3c382887adce5 100644
--- a/ports/stm32/usb.h
+++ b/ports/stm32/usb.h
@@ -30,22 +30,6 @@
 
 #define PYB_USB_FLAG_USB_MODE_CALLED    (0x0002)
 
-#ifndef USBD_VID
-// Windows needs a different PID to distinguish different device configurations
-#define USBD_VID         (0xf055)
-#define USBD_PID_CDC_MSC (0x9800)
-#define USBD_PID_CDC_HID (0x9801)
-#define USBD_PID_CDC     (0x9802)
-#define USBD_PID_MSC     (0x9803)
-#define USBD_PID_CDC2_MSC (0x9804)
-#define USBD_PID_CDC2    (0x9805)
-#define USBD_PID_CDC3    (0x9806)
-#define USBD_PID_CDC3_MSC (0x9807)
-#define USBD_PID_CDC_MSC_HID (0x9808)
-#define USBD_PID_CDC2_MSC_HID (0x9809)
-#define USBD_PID_CDC3_MSC_HID (0x980a)
-#endif
-
 typedef enum {
     PYB_USB_STORAGE_MEDIUM_NONE = 0,
     PYB_USB_STORAGE_MEDIUM_FLASH,
diff --git a/tools/insert-usb-ids.py b/tools/insert-usb-ids.py
index b1d848ad4e350..9b53f3f68af2a 100644
--- a/tools/insert-usb-ids.py
+++ b/tools/insert-usb-ids.py
@@ -8,6 +8,7 @@
 import re
 import string
 
+config_prefix = "MICROPY_HW_USB_"
 needed_keys = ("USB_PID_CDC_MSC", "USB_PID_CDC_HID", "USB_PID_CDC", "USB_VID")
 
 
@@ -16,10 +17,10 @@ def parse_usb_ids(filename):
     for line in open(filename).readlines():
         line = line.rstrip("\r\n")
         match = re.match("^#define\s+(\w+)\s+\(0x([0-9A-Fa-f]+)\)$", line)
-        if match and match.group(1).startswith("USBD_"):
-            key = match.group(1).replace("USBD", "USB")
+        if match and match.group(1).startswith(config_prefix):
+            key = match.group(1).replace(config_prefix, "USB_")
             val = match.group(2)
-            print("key =", key, "val =", val)
+            # print("key =", key, "val =", val)
             if key in needed_keys:
                 rv[key] = val
     for k in needed_keys:

From f28e8b90730a3af5dc4149dd2d4e25468944aff6 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 5 Aug 2021 12:01:01 +1000
Subject: [PATCH 1151/3533] stm32/usbd_desc: Rename USBD_xxx descriptor opts to
 MICROPY_HW_USB_xxx.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/mpconfigboard_common.h | 46 ++++++++++++++++++++++++--
 ports/stm32/usbd_desc.c            | 52 ++++++------------------------
 2 files changed, 53 insertions(+), 45 deletions(-)

diff --git a/ports/stm32/mpconfigboard_common.h b/ports/stm32/mpconfigboard_common.h
index 46456420dad07..24c5e1a3cd258 100644
--- a/ports/stm32/mpconfigboard_common.h
+++ b/ports/stm32/mpconfigboard_common.h
@@ -180,9 +180,17 @@
 /*****************************************************************************/
 // USB configuration
 
-// The USBD_xxx VID/PID macros have been renamed to MICROPY_HW_USB_xxx.
-#ifdef USBD_VID
-#error "Old USBD_VID configuration option used"
+// The USBD_xxx macros have been renamed to MICROPY_HW_USB_xxx.
+#if defined(USBD_VID) \
+    || defined(USBD_LANGID_STRING) \
+    || defined(USBD_MANUFACTURER_STRING) \
+    || defined(USBD_PRODUCT_HS_STRING) \
+    || defined(USBD_PRODUCT_FS_STRING) \
+    || defined(USBD_CONFIGURATION_HS_STRING) \
+    || defined(USBD_INTERFACE_HS_STRING) \
+    || defined(USBD_CONFIGURATION_FS_STRING) \
+    || defined(USBD_INTERFACE_FS_STRING)
+#error "Old USBD_xxx configuration option used, renamed to MICROPY_HW_USB_xxx"
 #endif
 
 // Default VID and PID values to use for the USB device.  If MICROPY_HW_USB_VID
@@ -204,6 +212,38 @@
 #define MICROPY_HW_USB_PID_CDC3_MSC_HID (0x980a)
 #endif
 
+#ifndef MICROPY_HW_USB_LANGID_STRING
+#define MICROPY_HW_USB_LANGID_STRING            0x409
+#endif
+
+#ifndef MICROPY_HW_USB_MANUFACTURER_STRING
+#define MICROPY_HW_USB_MANUFACTURER_STRING      "MicroPython"
+#endif
+
+#ifndef MICROPY_HW_USB_PRODUCT_HS_STRING
+#define MICROPY_HW_USB_PRODUCT_HS_STRING        "Pyboard Virtual Comm Port in HS Mode"
+#endif
+
+#ifndef MICROPY_HW_USB_PRODUCT_FS_STRING
+#define MICROPY_HW_USB_PRODUCT_FS_STRING        "Pyboard Virtual Comm Port in FS Mode"
+#endif
+
+#ifndef MICROPY_HW_USB_CONFIGURATION_HS_STRING
+#define MICROPY_HW_USB_CONFIGURATION_HS_STRING  "Pyboard Config"
+#endif
+
+#ifndef MICROPY_HW_USB_INTERFACE_HS_STRING
+#define MICROPY_HW_USB_INTERFACE_HS_STRING      "Pyboard Interface"
+#endif
+
+#ifndef MICROPY_HW_USB_CONFIGURATION_FS_STRING
+#define MICROPY_HW_USB_CONFIGURATION_FS_STRING  "Pyboard Config"
+#endif
+
+#ifndef MICROPY_HW_USB_INTERFACE_FS_STRING
+#define MICROPY_HW_USB_INTERFACE_FS_STRING      "Pyboard Interface"
+#endif
+
 /*****************************************************************************/
 // General configuration
 
diff --git a/ports/stm32/usbd_desc.c b/ports/stm32/usbd_desc.c
index aa6837163de4d..fd50029fc5acf 100644
--- a/ports/stm32/usbd_desc.c
+++ b/ports/stm32/usbd_desc.c
@@ -36,46 +36,14 @@
 // need this header just for MP_HAL_UNIQUE_ID_ADDRESS
 #include "py/mphal.h"
 
-// need this header for any overrides to the below constants
+// Need this header for MICROPY_HW_USB_xxx configuration values.
 #include "py/mpconfig.h"
 
-#ifndef USBD_LANGID_STRING
-#define USBD_LANGID_STRING            0x409
-#endif
-
-#ifndef USBD_MANUFACTURER_STRING
-#define USBD_MANUFACTURER_STRING      "MicroPython"
-#endif
-
-#ifndef USBD_PRODUCT_HS_STRING
-#define USBD_PRODUCT_HS_STRING        "Pyboard Virtual Comm Port in HS Mode"
-#endif
-
-#ifndef USBD_PRODUCT_FS_STRING
-#define USBD_PRODUCT_FS_STRING        "Pyboard Virtual Comm Port in FS Mode"
-#endif
-
-#ifndef USBD_CONFIGURATION_HS_STRING
-#define USBD_CONFIGURATION_HS_STRING  "Pyboard Config"
-#endif
-
-#ifndef USBD_INTERFACE_HS_STRING
-#define USBD_INTERFACE_HS_STRING      "Pyboard Interface"
-#endif
-
-#ifndef USBD_CONFIGURATION_FS_STRING
-#define USBD_CONFIGURATION_FS_STRING  "Pyboard Config"
-#endif
-
-#ifndef USBD_INTERFACE_FS_STRING
-#define USBD_INTERFACE_FS_STRING      "Pyboard Interface"
-#endif
-
 __ALIGN_BEGIN static const uint8_t USBD_LangIDDesc[USB_LEN_LANGID_STR_DESC] __ALIGN_END = {
     USB_LEN_LANGID_STR_DESC,
     USB_DESC_TYPE_STRING,
-    LOBYTE(USBD_LANGID_STRING),
-    HIBYTE(USBD_LANGID_STRING),
+    LOBYTE(MICROPY_HW_USB_LANGID_STRING),
+    HIBYTE(MICROPY_HW_USB_LANGID_STRING),
 };
 
 // set the VID, PID and device release number
@@ -140,14 +108,14 @@ STATIC uint8_t *USBD_StrDescriptor(USBD_HandleTypeDef *pdev, uint8_t idx, uint16
             return (uint8_t *)USBD_LangIDDesc; // the data should only be read from this buf
 
         case USBD_IDX_MFC_STR:
-            str = USBD_MANUFACTURER_STRING;
+            str = MICROPY_HW_USB_MANUFACTURER_STRING;
             break;
 
         case USBD_IDX_PRODUCT_STR:
             if (pdev->dev_speed == USBD_SPEED_HIGH) {
-                str = USBD_PRODUCT_HS_STRING;
+                str = MICROPY_HW_USB_PRODUCT_HS_STRING;
             } else {
-                str = USBD_PRODUCT_FS_STRING;
+                str = MICROPY_HW_USB_PRODUCT_FS_STRING;
             }
             break;
 
@@ -174,17 +142,17 @@ STATIC uint8_t *USBD_StrDescriptor(USBD_HandleTypeDef *pdev, uint8_t idx, uint16
 
         case USBD_IDX_CONFIG_STR:
             if (pdev->dev_speed == USBD_SPEED_HIGH) {
-                str = USBD_CONFIGURATION_HS_STRING;
+                str = MICROPY_HW_USB_CONFIGURATION_HS_STRING;
             } else {
-                str = USBD_CONFIGURATION_FS_STRING;
+                str = MICROPY_HW_USB_CONFIGURATION_FS_STRING;
             }
             break;
 
         case USBD_IDX_INTERFACE_STR:
             if (pdev->dev_speed == USBD_SPEED_HIGH) {
-                str = USBD_INTERFACE_HS_STRING;
+                str = MICROPY_HW_USB_INTERFACE_HS_STRING;
             } else {
-                str = USBD_INTERFACE_FS_STRING;
+                str = MICROPY_HW_USB_INTERFACE_FS_STRING;
             }
             break;
 

From 3b32b3d1b31f957d2ed57d69bc0c503bbdf2a4cf Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 5 Aug 2021 12:21:58 +1000
Subject: [PATCH 1152/3533] stm32/usbd_cdc_interface: Rename USBD_CDC_xx opts
 to MICROPY_HW_USB_xx.

Signed-off-by: Damien George <damien@micropython.org>
---
 .../boards/B_L072Z_LRWAN1/mpconfigboard.h      |  4 ++--
 .../stm32/boards/NUCLEO_L432KC/mpconfigboard.h |  4 ++--
 ports/stm32/boards/NUCLEO_WB55/mpconfigboard.h |  4 ++--
 .../boards/USBDONGLE_WB55/mpconfigboard.h      |  4 ++--
 ports/stm32/mpconfigboard_common.h             | 16 +++++++++++++++-
 ports/stm32/usbd_cdc_interface.c               | 18 +++++++++---------
 ports/stm32/usbd_cdc_interface.h               | 15 +++++----------
 7 files changed, 37 insertions(+), 28 deletions(-)

diff --git a/ports/stm32/boards/B_L072Z_LRWAN1/mpconfigboard.h b/ports/stm32/boards/B_L072Z_LRWAN1/mpconfigboard.h
index 0cded1bc866ac..08ded0e03e0ab 100644
--- a/ports/stm32/boards/B_L072Z_LRWAN1/mpconfigboard.h
+++ b/ports/stm32/boards/B_L072Z_LRWAN1/mpconfigboard.h
@@ -67,5 +67,5 @@
 #define MICROPY_HW_USB_FS           (1)
 #define MICROPY_HW_USB_MSC          (0)
 #define MICROPY_HW_USB_HID          (0)
-#define USBD_CDC_RX_DATA_SIZE       (256)
-#define USBD_CDC_TX_DATA_SIZE       (256)
+#define MICROPY_HW_USB_CDC_RX_DATA_SIZE (256)
+#define MICROPY_HW_USB_CDC_TX_DATA_SIZE (256)
diff --git a/ports/stm32/boards/NUCLEO_L432KC/mpconfigboard.h b/ports/stm32/boards/NUCLEO_L432KC/mpconfigboard.h
index 0f1134491f979..8b3a8f38b10f4 100644
--- a/ports/stm32/boards/NUCLEO_L432KC/mpconfigboard.h
+++ b/ports/stm32/boards/NUCLEO_L432KC/mpconfigboard.h
@@ -67,5 +67,5 @@
 #define MICROPY_HW_USB_FS           (MICROPY_HW_ENABLE_USB)
 #define MICROPY_HW_USB_MSC          (0)
 #define MICROPY_HW_USB_HID          (0)
-#define USBD_CDC_RX_DATA_SIZE       (256)
-#define USBD_CDC_TX_DATA_SIZE       (256)
+#define MICROPY_HW_USB_CDC_RX_DATA_SIZE (256)
+#define MICROPY_HW_USB_CDC_TX_DATA_SIZE (256)
diff --git a/ports/stm32/boards/NUCLEO_WB55/mpconfigboard.h b/ports/stm32/boards/NUCLEO_WB55/mpconfigboard.h
index 179369d943cbd..a7473b9d6a9d4 100644
--- a/ports/stm32/boards/NUCLEO_WB55/mpconfigboard.h
+++ b/ports/stm32/boards/NUCLEO_WB55/mpconfigboard.h
@@ -59,8 +59,8 @@
 
 // USB config
 #define MICROPY_HW_USB_FS           (1)
-#define USBD_CDC_RX_DATA_SIZE       (512)
-#define USBD_CDC_TX_DATA_SIZE       (512)
+#define MICROPY_HW_USB_CDC_RX_DATA_SIZE (512)
+#define MICROPY_HW_USB_CDC_TX_DATA_SIZE (512)
 
 // Bluetooth config
 #define MICROPY_HW_BLE_UART_ID       (0)
diff --git a/ports/stm32/boards/USBDONGLE_WB55/mpconfigboard.h b/ports/stm32/boards/USBDONGLE_WB55/mpconfigboard.h
index fdb061900b898..d4b12ae5bf336 100644
--- a/ports/stm32/boards/USBDONGLE_WB55/mpconfigboard.h
+++ b/ports/stm32/boards/USBDONGLE_WB55/mpconfigboard.h
@@ -43,8 +43,8 @@
 
 // USB config
 #define MICROPY_HW_USB_FS           (1)
-#define USBD_CDC_RX_DATA_SIZE       (512)
-#define USBD_CDC_TX_DATA_SIZE       (512)
+#define MICROPY_HW_USB_CDC_RX_DATA_SIZE (512)
+#define MICROPY_HW_USB_CDC_TX_DATA_SIZE (512)
 
 // Bluetooth config
 #define MICROPY_HW_BLE_UART_ID       (0)
diff --git a/ports/stm32/mpconfigboard_common.h b/ports/stm32/mpconfigboard_common.h
index 24c5e1a3cd258..0cf6adce332f7 100644
--- a/ports/stm32/mpconfigboard_common.h
+++ b/ports/stm32/mpconfigboard_common.h
@@ -189,7 +189,9 @@
     || defined(USBD_CONFIGURATION_HS_STRING) \
     || defined(USBD_INTERFACE_HS_STRING) \
     || defined(USBD_CONFIGURATION_FS_STRING) \
-    || defined(USBD_INTERFACE_FS_STRING)
+    || defined(USBD_INTERFACE_FS_STRING) \
+    || defined(USBD_CDC_RX_DATA_SIZE) \
+    || defined(USBD_CDC_TX_DATA_SIZE)
 #error "Old USBD_xxx configuration option used, renamed to MICROPY_HW_USB_xxx"
 #endif
 
@@ -244,6 +246,18 @@
 #define MICROPY_HW_USB_INTERFACE_FS_STRING      "Pyboard Interface"
 #endif
 
+// Amount of incoming buffer space for each CDC instance.
+// This must be 2 or greater, and a power of 2.
+#ifndef MICROPY_HW_USB_CDC_RX_DATA_SIZE
+#define MICROPY_HW_USB_CDC_RX_DATA_SIZE (1024)
+#endif
+
+// Amount of outgoing buffer space for each CDC instance.
+// This must be a power of 2 and no greater than 16384.
+#ifndef MICROPY_HW_USB_CDC_TX_DATA_SIZE
+#define MICROPY_HW_USB_CDC_TX_DATA_SIZE (1024)
+#endif
+
 /*****************************************************************************/
 // General configuration
 
diff --git a/ports/stm32/usbd_cdc_interface.c b/ports/stm32/usbd_cdc_interface.c
index 5f27bbe29a6e0..61a7c824868bc 100644
--- a/ports/stm32/usbd_cdc_interface.c
+++ b/ports/stm32/usbd_cdc_interface.c
@@ -172,7 +172,7 @@ int8_t usbd_cdc_control(usbd_cdc_state_t *cdc_in, uint8_t cmd, uint8_t *pbuf, ui
 }
 
 static inline uint16_t usbd_cdc_tx_buffer_mask(uint16_t val) {
-    return val & (USBD_CDC_TX_DATA_SIZE - 1);
+    return val & (MICROPY_HW_USB_CDC_TX_DATA_SIZE - 1);
 }
 
 static inline uint16_t usbd_cdc_tx_buffer_size(usbd_cdc_itf_t *cdc) {
@@ -188,18 +188,18 @@ static inline bool usbd_cdc_tx_buffer_will_be_empty(usbd_cdc_itf_t *cdc) {
 }
 
 static inline bool usbd_cdc_tx_buffer_full(usbd_cdc_itf_t *cdc) {
-    return usbd_cdc_tx_buffer_size(cdc) == USBD_CDC_TX_DATA_SIZE;
+    return usbd_cdc_tx_buffer_size(cdc) == MICROPY_HW_USB_CDC_TX_DATA_SIZE;
 }
 
 static uint16_t usbd_cdc_tx_send_length(usbd_cdc_itf_t *cdc) {
-    uint16_t to_end = USBD_CDC_TX_DATA_SIZE - usbd_cdc_tx_buffer_mask(cdc->tx_buf_ptr_out);
+    uint16_t to_end = MICROPY_HW_USB_CDC_TX_DATA_SIZE - usbd_cdc_tx_buffer_mask(cdc->tx_buf_ptr_out);
     return MIN(usbd_cdc_tx_buffer_size(cdc), to_end);
 }
 
 static void usbd_cdc_tx_buffer_put(usbd_cdc_itf_t *cdc, uint8_t data, bool check_overflow) {
     cdc->tx_buf[usbd_cdc_tx_buffer_mask(cdc->tx_buf_ptr_in)] = data;
     cdc->tx_buf_ptr_in++;
-    if (check_overflow && usbd_cdc_tx_buffer_size(cdc) > USBD_CDC_TX_DATA_SIZE) {
+    if (check_overflow && usbd_cdc_tx_buffer_size(cdc) > MICROPY_HW_USB_CDC_TX_DATA_SIZE) {
         cdc->tx_buf_ptr_out++;
         cdc->tx_buf_ptr_out_next = cdc->tx_buf_ptr_out;
     }
@@ -270,7 +270,7 @@ void HAL_PCD_SOFCallback(PCD_HandleTypeDef *hpcd) {
 
 bool usbd_cdc_rx_buffer_full(usbd_cdc_itf_t *cdc) {
     int get = cdc->rx_buf_get, put = cdc->rx_buf_put;
-    int remaining = (get - put) + (-((int)(get <= put)) & USBD_CDC_RX_DATA_SIZE);
+    int remaining = (get - put) + (-((int)(get <= put)) & MICROPY_HW_USB_CDC_RX_DATA_SIZE);
     return remaining < CDC_DATA_MAX_PACKET_SIZE + 1;
 }
 
@@ -298,7 +298,7 @@ int8_t usbd_cdc_receive(usbd_cdc_state_t *cdc_in, size_t len) {
         if (cdc->attached_to_repl && *src == mp_interrupt_char) {
             pendsv_kbd_intr();
         } else {
-            uint16_t next_put = (cdc->rx_buf_put + 1) & (USBD_CDC_RX_DATA_SIZE - 1);
+            uint16_t next_put = (cdc->rx_buf_put + 1) & (MICROPY_HW_USB_CDC_RX_DATA_SIZE - 1);
             if (next_put == cdc->rx_buf_get) {
                 // overflow, we just discard the rest of the chars
                 break;
@@ -322,7 +322,7 @@ int8_t usbd_cdc_receive(usbd_cdc_state_t *cdc_in, size_t len) {
 
 int usbd_cdc_tx_half_empty(usbd_cdc_itf_t *cdc) {
     int32_t tx_waiting = usbd_cdc_tx_buffer_size(cdc);
-    return tx_waiting <= USBD_CDC_TX_DATA_SIZE / 2;
+    return tx_waiting <= MICROPY_HW_USB_CDC_TX_DATA_SIZE / 2;
 }
 
 // Writes only the data that fits if flow & CTS, else writes all data
@@ -405,7 +405,7 @@ void usbd_cdc_tx_always(usbd_cdc_itf_t *cdc, const uint8_t *buf, uint32_t len) {
 int usbd_cdc_rx_num(usbd_cdc_itf_t *cdc) {
     int32_t rx_waiting = (int32_t)cdc->rx_buf_put - (int32_t)cdc->rx_buf_get;
     if (rx_waiting < 0) {
-        rx_waiting += USBD_CDC_RX_DATA_SIZE;
+        rx_waiting += MICROPY_HW_USB_CDC_RX_DATA_SIZE;
     }
     usbd_cdc_rx_check_resume(cdc);
     return rx_waiting;
@@ -434,7 +434,7 @@ int usbd_cdc_rx(usbd_cdc_itf_t *cdc, uint8_t *buf, uint32_t len, uint32_t timeou
 
         // Copy byte from device to user buffer
         buf[i] = cdc->rx_user_buf[cdc->rx_buf_get];
-        cdc->rx_buf_get = (cdc->rx_buf_get + 1) & (USBD_CDC_RX_DATA_SIZE - 1);
+        cdc->rx_buf_get = (cdc->rx_buf_get + 1) & (MICROPY_HW_USB_CDC_RX_DATA_SIZE - 1);
     }
     usbd_cdc_rx_check_resume(cdc);
 
diff --git a/ports/stm32/usbd_cdc_interface.h b/ports/stm32/usbd_cdc_interface.h
index 6b510f2399226..76b5c9e79bb4a 100644
--- a/ports/stm32/usbd_cdc_interface.h
+++ b/ports/stm32/usbd_cdc_interface.h
@@ -31,12 +31,7 @@
   ******************************************************************************
   */
 
-#ifndef USBD_CDC_RX_DATA_SIZE
-#define USBD_CDC_RX_DATA_SIZE (1024) // this must be 2 or greater, and a power of 2
-#endif
-#ifndef USBD_CDC_TX_DATA_SIZE
-#define USBD_CDC_TX_DATA_SIZE (1024) // This must be a power of 2 and no greater than 16384
-#endif
+#include "py/mpconfig.h"
 
 // Values for connect_state
 #define USBD_CDC_CONNECT_STATE_DISCONNECTED (0)
@@ -52,14 +47,14 @@ typedef struct _usbd_cdc_itf_t {
     usbd_cdc_state_t base; // state for the base CDC layer
 
     uint8_t rx_packet_buf[CDC_DATA_MAX_PACKET_SIZE]; // received data from USB OUT endpoint is stored in this buffer
-    uint8_t rx_user_buf[USBD_CDC_RX_DATA_SIZE]; // received data is buffered here until the user reads it
+    uint8_t rx_user_buf[MICROPY_HW_USB_CDC_RX_DATA_SIZE]; // received data is buffered here until the user reads it
     volatile uint16_t rx_buf_put; // circular buffer index
     uint16_t rx_buf_get; // circular buffer index
     uint8_t rx_buf_full; // rx from host will be blocked while this is true
 
-    uint8_t tx_buf[USBD_CDC_TX_DATA_SIZE]; // data for USB IN endpoind is stored in this buffer
-    uint16_t tx_buf_ptr_in; // increment this pointer modulo USBD_CDC_TX_DATA_SIZE when new data is available
-    volatile uint16_t tx_buf_ptr_out; // increment this pointer modulo USBD_CDC_TX_DATA_SIZE when data is drained
+    uint8_t tx_buf[MICROPY_HW_USB_CDC_TX_DATA_SIZE]; // data for USB IN endpoind is stored in this buffer
+    uint16_t tx_buf_ptr_in; // increment this pointer modulo MICROPY_HW_USB_CDC_TX_DATA_SIZE when new data is available
+    volatile uint16_t tx_buf_ptr_out; // increment this pointer modulo MICROPY_HW_USB_CDC_TX_DATA_SIZE when data is drained
     uint16_t tx_buf_ptr_out_next; // next position of above once transmission finished
     uint8_t tx_need_empty_packet; // used to flush the USB IN endpoint if the last packet was exactly the endpoint packet size
 

From f834fef6bbd28e31d8e5c04dc2092886b162fe89 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 22 Jul 2021 15:29:14 +1000
Subject: [PATCH 1153/3533] stm32/powerctrl: Support changing frequency on WB
 MCUs.

This allows changing the frequency to: 100kHz, 200kHz, 400kHz, 800kHz,
1MHz, 2MHz, 4MHz, 8MHz, 16MHz, 32MHz, 64MHz.  For frequencies 2MHz and
below, low power run (LPR) mode is enabled automatically.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/Makefile        |  3 +-
 ports/stm32/powerctrl.c     | 99 +++++++++++++++++++++++++++++++++++--
 ports/stm32/powerctrl.h     |  1 +
 ports/stm32/powerctrlboot.c |  2 +-
 4 files changed, 100 insertions(+), 5 deletions(-)

diff --git a/ports/stm32/Makefile b/ports/stm32/Makefile
index fd76f20a6d221..cdccfddcfda73 100644
--- a/ports/stm32/Makefile
+++ b/ports/stm32/Makefile
@@ -100,7 +100,7 @@ CFLAGS_MCU_h7 = $(CFLAGS_CORTEX_M) -mtune=cortex-m7 -mcpu=cortex-m7
 CFLAGS_MCU_wb = $(CFLAGS_CORTEX_M) -mtune=cortex-m4 -mcpu=cortex-m4
 
 CFLAGS += $(INC) -Wall -Wpointer-arith -Werror -Wdouble-promotion -Wfloat-conversion -std=gnu99 -nostdlib $(CFLAGS_MOD) $(CFLAGS_EXTRA)
-CFLAGS += -D$(CMSIS_MCU)
+CFLAGS += -D$(CMSIS_MCU) -DUSE_FULL_LL_DRIVER
 CFLAGS += $(CFLAGS_MCU_$(MCU_SERIES))
 CFLAGS += $(COPT)
 CFLAGS += -I$(BOARD_DIR)
@@ -396,6 +396,7 @@ HAL_SRC_C += $(addprefix $(HAL_DIR)/Src/stm32$(MCU_SERIES)xx_,\
 	hal_tim.c \
 	hal_tim_ex.c \
 	hal_uart.c \
+	ll_utils.c \
 	)
 
 ifeq ($(MCU_SERIES),$(filter $(MCU_SERIES),f4 f7 h7 l0 l4 wb))
diff --git a/ports/stm32/powerctrl.c b/ports/stm32/powerctrl.c
index 253f1056cabe1..137312ade8a05 100644
--- a/ports/stm32/powerctrl.c
+++ b/ports/stm32/powerctrl.c
@@ -519,10 +519,103 @@ int powerctrl_set_sysclk(uint32_t sysclk, uint32_t ahb, uint32_t apb1, uint32_t
 
 #elif defined(STM32WB)
 
+#include "stm32wbxx_ll_utils.h"
+
+#define LPR_THRESHOLD (2000000)
+#define VOS2_THRESHOLD (16000000)
+
+enum {
+    SYSCLK_MODE_NONE,
+    SYSCLK_MODE_MSI,
+    SYSCLK_MODE_HSE_64M,
+};
+
 int powerctrl_set_sysclk(uint32_t sysclk, uint32_t ahb, uint32_t apb1, uint32_t apb2) {
-    // For now it's not supported to change SYSCLK (only bus dividers).
-    if (sysclk != HAL_RCC_GetSysClockFreq()) {
-        return -MP_EINVAL;
+    int sysclk_mode = SYSCLK_MODE_NONE;
+    uint32_t msirange = 0;
+    uint32_t sysclk_cur = HAL_RCC_GetSysClockFreq();
+
+    if (sysclk == sysclk_cur) {
+        // SYSCLK does not need changing.
+    } else if (sysclk == 64000000) {
+        sysclk_mode = SYSCLK_MODE_HSE_64M;
+    } else {
+        for (msirange = 0; msirange < MP_ARRAY_SIZE(MSIRangeTable); ++msirange) {
+            if (MSIRangeTable[msirange] != 0 && sysclk == MSIRangeTable[msirange]) {
+                sysclk_mode = SYSCLK_MODE_MSI;
+                break;
+            }
+        }
+
+        if (sysclk_mode == SYSCLK_MODE_NONE) {
+            // Unsupported SYSCLK value.
+            return -MP_EINVAL;
+        }
+    }
+
+    // Exit LPR if SYSCLK will increase beyond threshold.
+    if (LL_PWR_IsEnabledLowPowerRunMode()) {
+        if (sysclk > LPR_THRESHOLD) {
+            if (sysclk_cur < LPR_THRESHOLD) {
+                // Must select MSI=LPR_THRESHOLD=2MHz to exit LPR.
+                LL_RCC_MSI_SetRange(LL_RCC_MSIRANGE_5);
+            }
+
+            // Exit LPR and wait for the regulator to be ready.
+            LL_PWR_ExitLowPowerRunMode();
+            while (!LL_PWR_IsActiveFlag_REGLPF()) {
+            }
+        }
+    }
+
+    // Select VOS1 if SYSCLK will increase beyond threshold.
+    if (sysclk > VOS2_THRESHOLD) {
+        LL_PWR_SetRegulVoltageScaling(LL_PWR_REGU_VOLTAGE_SCALE1);
+        while (LL_PWR_IsActiveFlag_VOS()) {
+        }
+    }
+
+    if (sysclk_mode == SYSCLK_MODE_HSE_64M) {
+        SystemClock_Config();
+    } else if (sysclk_mode == SYSCLK_MODE_MSI) {
+        // Set flash latency to maximum to ensure the latency is large enough for
+        // both the current SYSCLK and the SYSCLK that will be selected below.
+        LL_FLASH_SetLatency(LL_FLASH_LATENCY_3);
+        while (LL_FLASH_GetLatency() != LL_FLASH_LATENCY_3) {
+        }
+
+        // Before changing the MSIRANGE value, if MSI is on then it must also be ready.
+        while ((RCC->CR & (RCC_CR_MSIRDY | RCC_CR_MSION)) == RCC_CR_MSION) {
+        }
+        LL_RCC_MSI_SetRange(msirange << RCC_CR_MSIRANGE_Pos);
+
+        // Clock SYSCLK from MSI.
+        LL_RCC_SetSysClkSource(LL_RCC_SYS_CLKSOURCE_MSI);
+        while (LL_RCC_GetSysClkSource() != LL_RCC_SYS_CLKSOURCE_STATUS_MSI) {
+        }
+
+        // Disable PLL to decrease power consumption.
+        LL_RCC_PLL_Disable();
+        while (LL_RCC_PLL_IsReady() != 0) {
+        }
+        LL_RCC_PLL_DisableDomain_SYS();
+
+        // Select VOS2 if possible.
+        if (sysclk <= VOS2_THRESHOLD) {
+            LL_PWR_SetRegulVoltageScaling(LL_PWR_REGU_VOLTAGE_SCALE2);
+        }
+
+        // Enter LPR if possible.
+        if (sysclk <= LPR_THRESHOLD) {
+            LL_PWR_EnterLowPowerRunMode();
+        }
+
+        // Configure flash latency for the new SYSCLK.
+        LL_SetFlashLatency(sysclk);
+
+        // Update HAL state and SysTick.
+        SystemCoreClockUpdate();
+        powerctrl_config_systick();
     }
 
     // Return straightaway if the clocks are already at the desired frequency.
diff --git a/ports/stm32/powerctrl.h b/ports/stm32/powerctrl.h
index 9f223e794a984..eedc448b2b8a6 100644
--- a/ports/stm32/powerctrl.h
+++ b/ports/stm32/powerctrl.h
@@ -35,6 +35,7 @@ NORETURN void powerctrl_mcu_reset(void);
 NORETURN void powerctrl_enter_bootloader(uint32_t r0, uint32_t bl_addr);
 void powerctrl_check_enter_bootloader(void);
 
+void powerctrl_config_systick(void);
 int powerctrl_rcc_clock_config_pll(RCC_ClkInitTypeDef *rcc_init, uint32_t sysclk_mhz, bool need_pllsai);
 int powerctrl_set_sysclk(uint32_t sysclk, uint32_t ahb, uint32_t apb1, uint32_t apb2);
 void powerctrl_enter_stop_mode(void);
diff --git a/ports/stm32/powerctrlboot.c b/ports/stm32/powerctrlboot.c
index 880e43e04c2a2..caa5632926e85 100644
--- a/ports/stm32/powerctrlboot.c
+++ b/ports/stm32/powerctrlboot.c
@@ -28,7 +28,7 @@
 #include "irq.h"
 #include "powerctrl.h"
 
-static inline void powerctrl_config_systick(void) {
+void powerctrl_config_systick(void) {
     // Configure SYSTICK to run at 1kHz (1ms interval)
     SysTick->CTRL |= SYSTICK_CLKSOURCE_HCLK;
     SysTick_Config(HAL_RCC_GetHCLKFreq() / 1000);

From 3b594f7b27881818645a52d7aa9469c97ef10ecf Mon Sep 17 00:00:00 2001
From: Glenn Ruben Bakke <glennbakke@gmail.com>
Date: Sun, 13 Dec 2020 22:03:18 +0100
Subject: [PATCH 1154/3533] nrf/boards/common.ld: Calculate unused flash
 region.

Calculate the unused flash area on the target device.  The values will be
exposed by _unused_flash_start and _unused_flash_length.  The start address
and the length are not aligned to either word or pages.
---
 ports/nrf/boards/common.ld | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ports/nrf/boards/common.ld b/ports/nrf/boards/common.ld
index d2e5eef7627fd..866336fa0265e 100644
--- a/ports/nrf/boards/common.ld
+++ b/ports/nrf/boards/common.ld
@@ -81,3 +81,5 @@ SECTIONS
 /* Define heap and stack areas */
 _ram_end = ORIGIN(RAM) + LENGTH(RAM);
 _estack = ORIGIN(RAM) + LENGTH(RAM);
+_unused_flash_start = (_sidata + (_edata - _sdata));
+_unused_flash_len = (ORIGIN(FLASH_TEXT) + LENGTH(FLASH_TEXT)) - _unused_flash_start;

From 127cec8cae3ae486acefb4dbf71b37181bd9ed5d Mon Sep 17 00:00:00 2001
From: Glenn Ruben Bakke <glennbakke@gmail.com>
Date: Wed, 22 Jul 2020 13:58:32 +0200
Subject: [PATCH 1155/3533] nrf/modules/nrf: Add new nrf module with flash
 block device.

This commit adds the "nrf" module for port specific modules and objects.
Included in it is the "Flash" object which exposes a block device
implementation to access internal SoC flash.

Thanks to @aykevl aka Ayke van Laethem for the initial implementation.
---
 ports/nrf/Makefile                |   3 +
 ports/nrf/modules/nrf/flashbdev.c | 205 ++++++++++++++++++++++++++++++
 ports/nrf/modules/nrf/flashbdev.h |  39 ++++++
 ports/nrf/modules/nrf/modnrf.c    |  70 ++++++++++
 4 files changed, 317 insertions(+)
 create mode 100644 ports/nrf/modules/nrf/flashbdev.c
 create mode 100644 ports/nrf/modules/nrf/flashbdev.h
 create mode 100644 ports/nrf/modules/nrf/modnrf.c

diff --git a/ports/nrf/Makefile b/ports/nrf/Makefile
index 7428ab82c0993..ad099e110559b 100644
--- a/ports/nrf/Makefile
+++ b/ports/nrf/Makefile
@@ -70,6 +70,7 @@ INC += -I./modules/ubluepy
 INC += -I./modules/music
 INC += -I./modules/ble
 INC += -I./modules/board
+INC += -I./modules/nrf
 INC += -I../../shared/readline
 INC += -I./drivers/bluetooth
 INC += -I./drivers
@@ -322,6 +323,8 @@ DRIVERS_SRC_C += $(addprefix modules/,\
 	music/modmusic.c \
 	music/musictunes.c \
 	ble/modble.c \
+	nrf/modnrf.c \
+	nrf/flashbdev.c \
 	)
 
 # Custom micropython startup file with smaller interrupt vector table
diff --git a/ports/nrf/modules/nrf/flashbdev.c b/ports/nrf/modules/nrf/flashbdev.c
new file mode 100644
index 0000000000000..7a1296c5d19f6
--- /dev/null
+++ b/ports/nrf/modules/nrf/flashbdev.c
@@ -0,0 +1,205 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2017 Ayke van Laethem
+ * Copyright (c) 2019 Glenn Ruben Bakke
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include <stdint.h>
+#include <string.h>
+#include "py/runtime.h"
+#include "py/mperrno.h"
+
+#if MICROPY_PY_NRF && MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE
+
+#include "flashbdev.h"
+#include "flash.h"
+#include "extmod/vfs.h"
+
+extern byte _fs_start[];
+extern byte _fs_end[];
+
+#define FLASH_BLOCK_START (((uint32_t)_fs_start + (FLASH_PAGESIZE - 1)) / FLASH_PAGESIZE)
+
+typedef struct _nrf_flash_obj_t {
+    mp_obj_base_t base;
+    uint32_t start; // in bytes
+    uint32_t len; // in bytes
+} nrf_flash_obj_t;
+
+// This flash object represents the flash region defined by _fs_start and _fs_end
+// in memory.ld.  The start/len entries will be filled in by flashbdev_init().
+nrf_flash_obj_t nrf_flash_obj = {
+    { &nrf_flashbdev_type },
+    0,
+    0,
+};
+
+mp_obj_t nrf_flashbdev_readblocks(size_t n_args, const mp_obj_t *args) {
+    nrf_flash_obj_t *self = MP_OBJ_TO_PTR(args[0]);
+    uint32_t block_num = mp_obj_get_int(args[1]);
+    mp_buffer_info_t bufinfo;
+    mp_get_buffer_raise(args[2], &bufinfo, MP_BUFFER_WRITE);
+
+    mp_int_t address = self->start + (block_num * FLASH_PAGESIZE);
+
+    if (n_args == 4) {
+        uint32_t offset = mp_obj_get_int(args[3]);
+        address += offset;
+    }
+
+    byte *buf = bufinfo.buf;
+    byte *p = (byte *)address;
+    memcpy(buf, p, bufinfo.len);
+
+    return MP_OBJ_NEW_SMALL_INT(0);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(nrf_flashbdev_readblocks_obj, 3, 4, nrf_flashbdev_readblocks);
+
+mp_obj_t nrf_flashbdev_writeblocks(size_t n_args, const mp_obj_t *args) {
+    nrf_flash_obj_t *self = MP_OBJ_TO_PTR(args[0]);
+    uint32_t block_num = mp_obj_get_int(args[1]);
+    mp_buffer_info_t bufinfo;
+    mp_get_buffer_raise(args[2], &bufinfo, MP_BUFFER_WRITE);
+
+    mp_int_t address = self->start + (block_num * FLASH_PAGESIZE);
+
+    if (n_args == 4) {
+        uint32_t offset = mp_obj_get_int(args[3]);
+        address += offset;
+    } else {
+        flash_page_erase(address);
+    }
+
+    flash_write_bytes(address, bufinfo.buf, bufinfo.len);
+
+    return MP_OBJ_NEW_SMALL_INT(0);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(nrf_flashbdev_writeblocks_obj, 3, 4, nrf_flashbdev_writeblocks);
+
+mp_obj_t nrf_flashbdev_ioctl(mp_obj_t self_in, mp_obj_t op_in, mp_obj_t arg_in) {
+    nrf_flash_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    mp_int_t op = mp_obj_get_int(op_in);
+    switch (op) {
+        case MP_BLOCKDEV_IOCTL_INIT: {
+            return MP_OBJ_NEW_SMALL_INT(0);
+        }
+
+        case MP_BLOCKDEV_IOCTL_DEINIT: {
+            return MP_OBJ_NEW_SMALL_INT(0);
+        }
+
+        case MP_BLOCKDEV_IOCTL_SYNC: {
+            return MP_OBJ_NEW_SMALL_INT(0);
+        }
+
+        case MP_BLOCKDEV_IOCTL_BLOCK_COUNT: {
+            return MP_OBJ_NEW_SMALL_INT(self->len / FLASH_PAGESIZE);
+        }
+
+        case MP_BLOCKDEV_IOCTL_BLOCK_SIZE: {
+            return MP_OBJ_NEW_SMALL_INT(FLASH_PAGESIZE);
+        }
+
+        case MP_BLOCKDEV_IOCTL_BLOCK_ERASE: {
+            mp_int_t block_num = mp_obj_get_int(arg_in);
+            mp_int_t address = self->start + (block_num * FLASH_PAGESIZE);
+
+            if ((address & 0x3) || (address % FLASH_PAGESIZE != 0)) {
+                return MP_OBJ_NEW_SMALL_INT(-MP_EIO);
+            }
+
+            flash_page_erase(address);
+            return MP_OBJ_NEW_SMALL_INT(0);
+        }
+
+        default:
+            return mp_const_none;
+    }
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_3(nrf_flashbdev_ioctl_obj, nrf_flashbdev_ioctl);
+
+STATIC const mp_rom_map_elem_t nrf_flashbdev_locals_dict_table[] = {
+    { MP_ROM_QSTR(MP_QSTR_readblocks), MP_ROM_PTR(&nrf_flashbdev_readblocks_obj) },
+    { MP_ROM_QSTR(MP_QSTR_writeblocks), MP_ROM_PTR(&nrf_flashbdev_writeblocks_obj) },
+    { MP_ROM_QSTR(MP_QSTR_ioctl), MP_ROM_PTR(&nrf_flashbdev_ioctl_obj) },
+};
+STATIC MP_DEFINE_CONST_DICT(nrf_flashbdev_locals_dict, nrf_flashbdev_locals_dict_table);
+
+STATIC void nrf_flashbdev_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+    nrf_flash_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    mp_printf(print, "Flash(start=0x%08x, len=%u)", self->start, self->len);
+}
+
+STATIC mp_obj_t nrf_flashbdev_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
+    // Parse arguments
+    enum { ARG_start, ARG_len };
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_start, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} },
+        { MP_QSTR_len,   MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} },
+    };
+    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
+    mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
+
+    if (args[ARG_start].u_int == -1 && args[ARG_len].u_int == -1) {
+        return MP_OBJ_FROM_PTR(&nrf_flash_obj);
+    }
+
+    nrf_flash_obj_t *self = m_new_obj(nrf_flash_obj_t);
+    self->base.type = &nrf_flashbdev_type;
+
+    mp_int_t start = args[ARG_start].u_int;
+    mp_int_t len = args[ARG_len].u_int;
+
+    if ((start == -1) || (start % FLASH_PAGESIZE != 0)) {
+        mp_raise_ValueError(NULL);
+    }
+    if ((len == -1) || (len % FLASH_PAGESIZE != 0)) {
+        mp_raise_ValueError(NULL);
+    }
+
+    self->start = start;
+    self->len = len;
+
+    return MP_OBJ_FROM_PTR(self);
+}
+
+const mp_obj_type_t nrf_flashbdev_type = {
+    { &mp_type_type },
+    .name = MP_QSTR_Flash,
+    .print = nrf_flashbdev_print,
+    .make_new = nrf_flashbdev_make_new,
+    .locals_dict = (mp_obj_dict_t *)&nrf_flashbdev_locals_dict,
+};
+
+void flashbdev_init(void) {
+    // Set start to first aligned page from _fs_start.
+    mp_int_t page_start = FLASH_BLOCK_START;
+    nrf_flash_obj.start = page_start * FLASH_PAGESIZE;
+    // Trim len to only count whole pages.
+    mp_int_t page_end = (uint32_t)_fs_end / FLASH_PAGESIZE;
+    mp_int_t num_pages = page_end - page_start;
+    nrf_flash_obj.len = num_pages * FLASH_PAGESIZE;
+}
+
+#endif // MICROPY_PY_NRF && MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE
diff --git a/ports/nrf/modules/nrf/flashbdev.h b/ports/nrf/modules/nrf/flashbdev.h
new file mode 100644
index 0000000000000..29d7a12edd4b4
--- /dev/null
+++ b/ports/nrf/modules/nrf/flashbdev.h
@@ -0,0 +1,39 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2017 Ayke van Laethem
+ * Copyright (c) 2019 Glenn Ruben Bakke
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#ifndef MICROPY_INCLUDED_NRF_FLASHBDEV_H
+#define MICROPY_INCLUDED_NRF_FLASHBDEV_H
+
+#include "py/obj.h"
+#include "extmod/vfs_fat.h"
+
+extern const struct _mp_obj_type_t nrf_flashbdev_type;
+extern struct _nrf_flash_obj_t nrf_flash_obj;
+
+void flashbdev_init(void);
+
+#endif // MICROPY_INCLUDED_NRF_FLASHBDEV_H
diff --git a/ports/nrf/modules/nrf/modnrf.c b/ports/nrf/modules/nrf/modnrf.c
new file mode 100644
index 0000000000000..fd955dc62f5c3
--- /dev/null
+++ b/ports/nrf/modules/nrf/modnrf.c
@@ -0,0 +1,70 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2017 Ayke van Laethem
+ * Copyright (c) 2019 Glenn Ruben Bakke
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "py/runtime.h"
+
+#if MICROPY_PY_NRF
+
+#if MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE
+#include "flashbdev.h"
+#include "flash.h"
+
+#define FLASH_PAGE_ALIGN_UP(addr)   (((addr) - 1) + (FLASH_PAGESIZE)-(((addr) - 1) % (FLASH_PAGESIZE)))
+
+extern uint32_t _unused_flash_start;
+extern uint32_t _unused_flash_len;
+
+mp_obj_t nrf_modnrf_freeflash_start_aligned(void) {
+    return mp_obj_new_int_from_uint(FLASH_PAGE_ALIGN_UP((uint32_t)&_unused_flash_start));
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(nrf_modnrf_freeflash_start_aligned_obj, nrf_modnrf_freeflash_start_aligned);
+
+mp_obj_t nrf_modnrf_freeflash_length_aligned(void) {
+    uint32_t align_diff = FLASH_PAGE_ALIGN_UP((uint32_t)&_unused_flash_start) - ((uint32_t)&_unused_flash_start);
+    uint32_t temp_len = ((uint32_t)&_unused_flash_len) - align_diff;
+    uint32_t len_page_aligned = (temp_len / FLASH_PAGESIZE) * FLASH_PAGESIZE;
+    return mp_obj_new_int_from_uint(len_page_aligned);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(nrf_modnrf_freeflash_length_aligned_obj, nrf_modnrf_freeflash_length_aligned);
+#endif
+
+STATIC const mp_rom_map_elem_t nrf_module_globals_table[] = {
+    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_nrf) },
+    #if MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE
+    { MP_ROM_QSTR(MP_QSTR_Flash), MP_ROM_PTR(&nrf_flashbdev_type) },
+    { MP_ROM_QSTR(MP_QSTR_unused_flash_start), MP_ROM_PTR(&nrf_modnrf_freeflash_start_aligned_obj) },
+    { MP_ROM_QSTR(MP_QSTR_unused_flash_length), MP_ROM_PTR(&nrf_modnrf_freeflash_length_aligned_obj) },
+    #endif
+};
+STATIC MP_DEFINE_CONST_DICT(nrf_module_globals, nrf_module_globals_table);
+
+const mp_obj_module_t nrf_module = {
+    .base = { &mp_type_module },
+    .globals = (mp_obj_dict_t *)&nrf_module_globals,
+};
+
+#endif // MICROPY_PY_NRF

From 5a873e27eb5d03f6d5cfedab2dbf3532ac8ac849 Mon Sep 17 00:00:00 2001
From: Glenn Ruben Bakke <glennbakke@gmail.com>
Date: Thu, 23 Jul 2020 10:56:00 +0200
Subject: [PATCH 1156/3533] nrf/drivers: Add support for using flash block
 device with SoftDevice.

Update flash.c to also be compiled in when
MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE is enabled and SoftDevice is
present.

Update bluetooth/ble_drv.c to forward flash events to flash.c when
MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE is enabled.
---
 ports/nrf/drivers/bluetooth/ble_drv.c | 2 +-
 ports/nrf/drivers/flash.c             | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ports/nrf/drivers/bluetooth/ble_drv.c b/ports/nrf/drivers/bluetooth/ble_drv.c
index 3a15025cb4978..0040580933315 100644
--- a/ports/nrf/drivers/bluetooth/ble_drv.c
+++ b/ports/nrf/drivers/bluetooth/ble_drv.c
@@ -929,7 +929,7 @@ void ble_drv_discover_descriptors(void) {
 
 static void sd_evt_handler(uint32_t evt_id) {
     switch (evt_id) {
-#if MICROPY_MBFS
+#if MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE || MICROPY_MBFS
         case NRF_EVT_FLASH_OPERATION_SUCCESS:
             flash_operation_finished(FLASH_STATE_SUCCESS);
             break;
diff --git a/ports/nrf/drivers/flash.c b/ports/nrf/drivers/flash.c
index 5a7256a0c6227..85e5f71d63ae3 100644
--- a/ports/nrf/drivers/flash.c
+++ b/ports/nrf/drivers/flash.c
@@ -26,7 +26,7 @@
 
 #include "py/mpconfig.h"
 
-#if MICROPY_MBFS && BLUETOOTH_SD
+#if (MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE || MICROPY_MBFS) && BLUETOOTH_SD
 
 #include "drivers/flash.h"
 #include "drivers/bluetooth/ble_drv.h"
@@ -129,4 +129,4 @@ void flash_write_bytes(uint32_t dst, const uint8_t *src, uint32_t num_bytes) {
     }
 }
 
-#endif // MICROPY_MBFS
+#endif // (MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE || MICROPY_MBFS) && BLUETOOTH_SD

From 85cad502660e8d1359f175402aaea98695b3521f Mon Sep 17 00:00:00 2001
From: Glenn Ruben Bakke <glennbakke@gmail.com>
Date: Thu, 23 Jul 2020 12:12:24 +0200
Subject: [PATCH 1157/3533] nrf/mpconfigport.h: Expose nrf module when
 MICROPY_PY_NRF is set.

---
 ports/nrf/mpconfigport.h | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/ports/nrf/mpconfigport.h b/ports/nrf/mpconfigport.h
index 183fdf6818554..d1e9665dee2bf 100644
--- a/ports/nrf/mpconfigport.h
+++ b/ports/nrf/mpconfigport.h
@@ -179,6 +179,10 @@
 #define MICROPY_PY_TIME_TICKS       (1)
 #endif
 
+#ifndef MICROPY_PY_NRF
+#define MICROPY_PY_NRF              (0)
+#endif
+
 #define MICROPY_ENABLE_EMERGENCY_EXCEPTION_BUF   (1)
 #define MICROPY_EMERGENCY_EXCEPTION_BUF_SIZE  (0)
 
@@ -212,11 +216,18 @@ typedef long mp_off_t;
 // extra built in modules to add to the list of known ones
 extern const struct _mp_obj_module_t board_module;
 extern const struct _mp_obj_module_t machine_module;
+extern const struct _mp_obj_module_t nrf_module;
 extern const struct _mp_obj_module_t mp_module_utime;
 extern const struct _mp_obj_module_t mp_module_uos;
 extern const struct _mp_obj_module_t mp_module_ubluepy;
 extern const struct _mp_obj_module_t music_module;
 
+#if MICROPY_PY_NRF
+#define NRF_MODULE                          { MP_ROM_QSTR(MP_QSTR_nrf), MP_ROM_PTR(&nrf_module) },
+#else
+#define NRF_MODULE
+#endif
+
 #if MICROPY_PY_UBLUEPY
 #define UBLUEPY_MODULE                      { MP_ROM_QSTR(MP_QSTR_ubluepy), MP_ROM_PTR(&mp_module_ubluepy) },
 #else
@@ -255,6 +266,7 @@ extern const struct _mp_obj_module_t ble_module;
     MUSIC_MODULE \
     UBLUEPY_MODULE \
     MICROPY_BOARD_BUILTINS \
+    NRF_MODULE \
 
 
 #else
@@ -266,6 +278,7 @@ extern const struct _mp_obj_module_t ble_module;
     { MP_ROM_QSTR(MP_QSTR_uos), MP_ROM_PTR(&mp_module_uos) }, \
     MUSIC_MODULE \
     MICROPY_BOARD_BUILTINS \
+    NRF_MODULE \
 
 
 #endif // BLUETOOTH_SD

From b40dfa961dcd9c3504f742c212248444b68413b3 Mon Sep 17 00:00:00 2001
From: Glenn Ruben Bakke <glennbakke@gmail.com>
Date: Thu, 23 Jul 2020 12:29:10 +0200
Subject: [PATCH 1158/3533] nrf/README: Update README.md to reflect internal
 file systems.

This documents parameters that can be passed to make to enable a specific
file system to included in the build.  Also, document the Makefile override
parameter "FS_SIZE" that can be used to tune the size of the flash region
to use as internal flash file system.
---
 ports/nrf/README.md | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/ports/nrf/README.md b/ports/nrf/README.md
index 0341cd81cde05..a4509cc6e11de 100644
--- a/ports/nrf/README.md
+++ b/ports/nrf/README.md
@@ -117,6 +117,34 @@ For example:
 
      make BOARD=pca10040 MICROPY_VFS_FAT=1
 
+## Enable MICROPY_VFS_LFS1 or MICROPY_VFS_LFS2
+
+In order to enable `littlefs` as device flash filesystem, `MICROPY_VFS_LFS1`
+or `MICROPY_VFS_LFS2` can be set. This will be in addition of setting
+`MICROPY_VFS` in mpconfigport.h or mpconfigboard.h.
+
+For example:
+
+    make BOARD=pca10056 MICROPY_VFS_LFS2=1
+
+## Set file system size
+
+The size of the file system on the internal flash is configured by the linker
+script parameter `_fs_size`. This can either be overriden by the linker script
+or dynamically through the makefile. By seting a value to the `FS_SIZE`.
+The number will be passed directly to the linker scripts in order to calculate
+the start and end of the file system. Note that the parameter value must be in
+linker script syntax as it is passed directly.
+
+For example, if we want to override the default file system size set by the
+linker scripts to use 256K:
+
+    make BOARD=pca10056 MICROPY_VFS_LFS2=1 FS_SIZE=256K
+
+Also note that changing this size between builds might cause loss of files
+present from a previous firmware as it will format the file system due to a new
+location.
+
 ## Target Boards and Make Flags
 
 Target Board (BOARD) | Bluetooth Stack (SD)    | Bluetooth Support      | Bootloader     | Default Flash Util

From c9b72ba69418eb91595698182022f64c24d64556 Mon Sep 17 00:00:00 2001
From: Glenn Ruben Bakke <glennbakke@gmail.com>
Date: Thu, 23 Jul 2020 19:34:21 +0200
Subject: [PATCH 1159/3533] nrf/mpconfigport.h: Tune FAT FS configuration.

Disable MICROPY_FATFS_MULTI_PARTITION configuration because there is no
partition table in the flash for FATFS to read.

Also, set MICROPY_FATFS_MAX_SS to the size of a flash page.  For nrf51 the
value 1024 is set.  For nrf52/nrf91 the value 4096 is set.
---
 ports/nrf/mpconfigport.h | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/ports/nrf/mpconfigport.h b/ports/nrf/mpconfigport.h
index d1e9665dee2bf..92b87a036b314 100644
--- a/ports/nrf/mpconfigport.h
+++ b/ports/nrf/mpconfigport.h
@@ -75,7 +75,13 @@
 #define MICROPY_FATFS_LFN_CODE_PAGE    437 /* 1=SFN/ANSI 437=LFN/U.S.(OEM) */
 #define MICROPY_FATFS_USE_LABEL        (1)
 #define MICROPY_FATFS_RPATH            (2)
-#define MICROPY_FATFS_MULTI_PARTITION  (1)
+#define MICROPY_FATFS_MULTI_PARTITION  (0)
+
+#if NRF51
+    #define MICROPY_FATFS_MAX_SS       (1024)
+#else
+    #define MICROPY_FATFS_MAX_SS       (4096)
+#endif
 
 // TODO these should be generic, not bound to fatfs
 #define mp_type_fileio fatfs_type_fileio

From 0bde907a8b010e0b7a6436f3840f7350455bcd01 Mon Sep 17 00:00:00 2001
From: Glenn Ruben Bakke <glennbakke@gmail.com>
Date: Thu, 23 Jul 2020 20:57:29 +0200
Subject: [PATCH 1160/3533] nrf/Makefile: Add _fs_size linker script override
 from make.

Add posibility to override linker script "_fs_size" from make by adding the
FS_SIZE parameter.  The syntax of value is linker script syntax.  For
example, the value of 131072 bytes can be written as 128K like this:
FS_SIZE=128K.

If not set, default value for "_fs_size" from linker script will be used.
---
 ports/nrf/Makefile | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ports/nrf/Makefile b/ports/nrf/Makefile
index ad099e110559b..fb7eb5c591841 100644
--- a/ports/nrf/Makefile
+++ b/ports/nrf/Makefile
@@ -130,6 +130,10 @@ LDFLAGS = $(CFLAGS)
 LDFLAGS += -Xlinker -Map=$(@:.elf=.map)
 LDFLAGS += -mthumb -mabi=aapcs $(addprefix -T,$(LD_FILES)) -L boards/
 
+ifneq ($(FS_SIZE),)
+LDFLAGS += -Wl,'--defsym=_fs_size=$(FS_SIZE)'
+endif
+
 #Debugging/Optimization
 ifeq ($(DEBUG), 1)
 #ASMFLAGS += -g -gtabs+

From 7a833edf37ed9714abdf5b7cf96d615fe877f3b9 Mon Sep 17 00:00:00 2001
From: Glenn Ruben Bakke <glennbakke@gmail.com>
Date: Thu, 23 Jul 2020 21:08:25 +0200
Subject: [PATCH 1161/3533] nrf/modules/uos: Allow a board to configure
 MICROPY_VFS_FAT/LFS1/LFS2.

---
 ports/nrf/modules/uos/moduos.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/ports/nrf/modules/uos/moduos.c b/ports/nrf/modules/uos/moduos.c
index 98a5661f4f9ae..fd5334d004f6b 100644
--- a/ports/nrf/modules/uos/moduos.c
+++ b/ports/nrf/modules/uos/moduos.c
@@ -36,6 +36,7 @@
 #include "modules/uos/microbitfs.h"
 #include "extmod/vfs.h"
 #include "extmod/vfs_fat.h"
+#include "extmod/vfs_lfs.h"
 #include "genhdr/mpversion.h"
 #include "uart.h"
 
@@ -85,10 +86,12 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_0(os_uname_obj, os_uname);
 /// \function sync()
 /// Sync all filesystems.
 STATIC mp_obj_t os_sync(void) {
+    #if MICROPY_VFS_FAT
     for (mp_vfs_mount_t *vfs = MP_STATE_VM(vfs_mount_table); vfs != NULL; vfs = vfs->next) {
         // this assumes that vfs->obj is fs_user_mount_t with block device functions
         disk_ioctl(MP_OBJ_TO_PTR(vfs->obj), CTRL_SYNC, NULL);
     }
+    #endif
     return mp_const_none;
 }
 MP_DEFINE_CONST_FUN_OBJ_0(mod_os_sync_obj, os_sync);
@@ -174,7 +177,15 @@ STATIC const mp_rom_map_elem_t os_module_globals_table[] = {
 #if MICROPY_VFS
     { MP_ROM_QSTR(MP_QSTR_mount), MP_ROM_PTR(&mp_vfs_mount_obj) },
     { MP_ROM_QSTR(MP_QSTR_umount), MP_ROM_PTR(&mp_vfs_umount_obj) },
+    #if MICROPY_VFS_FAT
     { MP_ROM_QSTR(MP_QSTR_VfsFat), MP_ROM_PTR(&mp_fat_vfs_type) },
+    #endif
+    #if MICROPY_VFS_LFS1
+    { MP_ROM_QSTR(MP_QSTR_VfsLfs1), MP_ROM_PTR(&mp_type_vfs_lfs1) },
+    #endif
+    #if MICROPY_VFS_LFS2
+    { MP_ROM_QSTR(MP_QSTR_VfsLfs2), MP_ROM_PTR(&mp_type_vfs_lfs2) },
+    #endif
 #endif
 };
 

From f99aa82e850a32caee2ef864da673e9c5c529054 Mon Sep 17 00:00:00 2001
From: Glenn Ruben Bakke <glennbakke@gmail.com>
Date: Thu, 23 Jul 2020 21:12:34 +0200
Subject: [PATCH 1162/3533] nrf/mpconfigport.h: Enable MICROPY_PY_IO_FILEIO
 when an FS is enabled.

Enable MICROPY_PY_IO_FILEIO if MICROPY_VFS_FAT, MICROPY_VFS_LFS1
or MICROPY_VFS2 has been enabled.
---
 ports/nrf/mpconfigport.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/nrf/mpconfigport.h b/ports/nrf/mpconfigport.h
index 92b87a036b314..480368aaa1b4f 100644
--- a/ports/nrf/mpconfigport.h
+++ b/ports/nrf/mpconfigport.h
@@ -126,7 +126,7 @@
 #define MICROPY_PY_MATH_SPECIAL_FUNCTIONS (0)
 #define MICROPY_PY_CMATH            (0)
 #define MICROPY_PY_IO               (0)
-#define MICROPY_PY_IO_FILEIO        (0)
+#define MICROPY_PY_IO_FILEIO        (MICROPY_VFS_FAT || MICROPY_VFS_LFS1 || MICROPY_VFS_LFS2)
 #define MICROPY_PY_URANDOM          (1)
 #define MICROPY_PY_URANDOM_EXTRA_FUNCS (1)
 #define MICROPY_PY_UCTYPES          (0)

From 6ff3a2afef3263153d50c73ea5c0d941dc701a9d Mon Sep 17 00:00:00 2001
From: Glenn Ruben Bakke <glennbakke@gmail.com>
Date: Thu, 23 Jul 2020 21:15:05 +0200
Subject: [PATCH 1163/3533] nrf/qstrdefsport.h: Add entries for in-built FS
 mount points.

---
 ports/nrf/qstrdefsport.h | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/ports/nrf/qstrdefsport.h b/ports/nrf/qstrdefsport.h
index 9608dbb247a07..3cc2f1e6468c3 100644
--- a/ports/nrf/qstrdefsport.h
+++ b/ports/nrf/qstrdefsport.h
@@ -27,6 +27,12 @@
 // qstrs specific to this port
 // *FORMAT-OFF*
 
+// Entries for sys.path
+Q(/flash)
+
+// For uos.sep
+Q(/)
+
 Q(a)
 Q(a#)
 Q(a#:1)
@@ -138,4 +144,3 @@ Q(r4:2)
 Q(r:1)
 Q(r:2)
 Q(r:3)
-

From b0fd4372c4cb8fce22b6e90eb4deb5c7e34b9c21 Mon Sep 17 00:00:00 2001
From: Glenn Ruben Bakke <glennbakke@gmail.com>
Date: Thu, 23 Jul 2020 21:21:58 +0200
Subject: [PATCH 1164/3533] nrf/main: Add auto mount and auto format hook for
 internal flash FS.

---
 ports/nrf/main.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/ports/nrf/main.c b/ports/nrf/main.c
index 3de5a310f06fe..254d9491c086f 100644
--- a/ports/nrf/main.c
+++ b/ports/nrf/main.c
@@ -76,6 +76,13 @@
 #include "usb_cdc.h"
 #endif
 
+#if MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE
+#include "extmod/vfs_fat.h"
+#include "lib/oofatfs/ff.h"
+#include "extmod/vfs.h"
+#include "flashbdev.h"
+#endif
+
 void do_str(const char *src, mp_parse_input_kind_t input_kind) {
     mp_lexer_t *lex = mp_lexer_new_from_str_len(MP_QSTR__lt_stdin_gt_, src, strlen(src), 0);
     if (lex == NULL) {
@@ -99,6 +106,28 @@ void do_str(const char *src, mp_parse_input_kind_t input_kind) {
 extern uint32_t _heap_start;
 extern uint32_t _heap_end;
 
+#if MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE
+STATIC int vfs_mount_and_chdir(mp_obj_t bdev, mp_obj_t mount_point) {
+    nlr_buf_t nlr;
+    mp_int_t ret = -MP_EIO;
+    if (nlr_push(&nlr) == 0) {
+        mp_obj_t args[] = { bdev, mount_point };
+        mp_vfs_mount(2, args, (mp_map_t *)&mp_const_empty_map);
+        mp_vfs_chdir(mount_point);
+        ret = 0; // success
+        nlr_pop();
+    } else {
+        mp_obj_base_t *exc = nlr.ret_val;
+        if (mp_obj_is_subclass_fast(MP_OBJ_FROM_PTR(exc->type), MP_OBJ_FROM_PTR(&mp_type_OSError))) {
+            mp_obj_t v = mp_obj_exception_get_value(MP_OBJ_FROM_PTR(exc));
+            mp_obj_get_int_maybe(v, &ret); // get errno value
+            ret = -ret;
+        }
+    }
+    return ret;
+}
+#endif
+
 int main(int argc, char **argv) {
 
 
@@ -169,6 +198,23 @@ int main(int argc, char **argv) {
 
     pin_init0();
 
+    #if MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE
+    flashbdev_init();
+
+    // Try to mount the flash on "/flash" and chdir to it for the boot-up directory.
+    mp_obj_t mount_point = MP_OBJ_NEW_QSTR(MP_QSTR__slash_flash);
+    int ret = vfs_mount_and_chdir((mp_obj_t)&nrf_flash_obj, mount_point);
+
+    if ((ret == -MP_ENODEV) || (ret == -MP_EIO)) {
+        pyexec_frozen_module("_mkfs.py"); // Frozen script for formatting flash filesystem.
+        ret = vfs_mount_and_chdir((mp_obj_t)&nrf_flash_obj, mount_point);
+    }
+
+    if (ret != 0) {
+        printf("MPY: can't mount flash\n");
+    }
+    #endif
+
     #if MICROPY_MBFS
     microbit_filesystem_init();
     #endif

From 4326e0880273431d5ee8fcc0b9b081e848fdc736 Mon Sep 17 00:00:00 2001
From: Glenn Ruben Bakke <glennbakke@gmail.com>
Date: Thu, 23 Jul 2020 21:25:50 +0200
Subject: [PATCH 1165/3533] nrf/boards: Enable needed features for
 FAT/LFS1/LFS2.

Enable the following features for all boards except
nrf51 boards with SoftDevice present:

- MICROPY_VFS
- MICROPY_PY_NRF
- MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE
---
 ports/nrf/mpconfigdevice_nrf51822.h | 28 ++++++++++++++++++++++++++++
 ports/nrf/mpconfigdevice_nrf52832.h | 16 ++++++++++++++--
 ports/nrf/mpconfigdevice_nrf52840.h | 16 ++++++++++++++--
 ports/nrf/mpconfigdevice_nrf9160.h  | 16 ++++++++++++++--
 4 files changed, 70 insertions(+), 6 deletions(-)

diff --git a/ports/nrf/mpconfigdevice_nrf51822.h b/ports/nrf/mpconfigdevice_nrf51822.h
index 2f85c9f4c5468..d10e91a79ebcb 100644
--- a/ports/nrf/mpconfigdevice_nrf51822.h
+++ b/ports/nrf/mpconfigdevice_nrf51822.h
@@ -27,11 +27,19 @@
 // Board overridable build configuration.
 
 #ifndef MICROPY_MBFS
+#if defined(BLUETOOTH_SD)
 #define MICROPY_MBFS                       (1)
+#else
+#define MICROPY_MBFS                       (0)
+#endif
 #endif
 
 #ifndef MICROPY_VFS
+#if defined(BLUETOOTH_SD)
 #define MICROPY_VFS                        (0)
+#else
+#define MICROPY_VFS                        (1)
+#endif
 #endif
 
 // Board overridable feature configuration.
@@ -59,3 +67,23 @@
 #define MICROPY_PY_UBINASCII               (1)
 #endif
 #endif
+
+// Board overridable port specific feature configuration.
+
+#ifndef MICROPY_PY_NRF
+#if defined(BLUETOOTH_SD)
+#define MICROPY_PY_NRF                     (0)
+#else
+#define MICROPY_PY_NRF                     (1)
+#endif
+#endif
+
+// Board overridable hardware configuration.
+
+#ifndef MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE
+#if defined(BLUETOOTH_SD)
+#define MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE (0)
+#else
+#define MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE (1)
+#endif
+#endif
diff --git a/ports/nrf/mpconfigdevice_nrf52832.h b/ports/nrf/mpconfigdevice_nrf52832.h
index 2bfd047ca1456..cc7bcbe9b42c8 100644
--- a/ports/nrf/mpconfigdevice_nrf52832.h
+++ b/ports/nrf/mpconfigdevice_nrf52832.h
@@ -27,11 +27,11 @@
 // Board overridable build configuration.
 
 #ifndef MICROPY_MBFS
-#define MICROPY_MBFS                       (1)
+#define MICROPY_MBFS                       (0)
 #endif
 
 #ifndef MICROPY_VFS
-#define MICROPY_VFS                        (0)
+#define MICROPY_VFS                        (1)
 #endif
 
 // Board overridable feature configuration.
@@ -47,3 +47,15 @@
 #ifndef MICROPY_PY_UBINASCII
 #define MICROPY_PY_UBINASCII               (1)
 #endif
+
+// Board overridable port specific feature configuration.
+
+#ifndef MICROPY_PY_NRF
+#define MICROPY_PY_NRF                     (1)
+#endif
+
+// Board overridable hardware configuration.
+
+#ifndef MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE
+#define MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE (1)
+#endif
diff --git a/ports/nrf/mpconfigdevice_nrf52840.h b/ports/nrf/mpconfigdevice_nrf52840.h
index 2bfd047ca1456..cc7bcbe9b42c8 100644
--- a/ports/nrf/mpconfigdevice_nrf52840.h
+++ b/ports/nrf/mpconfigdevice_nrf52840.h
@@ -27,11 +27,11 @@
 // Board overridable build configuration.
 
 #ifndef MICROPY_MBFS
-#define MICROPY_MBFS                       (1)
+#define MICROPY_MBFS                       (0)
 #endif
 
 #ifndef MICROPY_VFS
-#define MICROPY_VFS                        (0)
+#define MICROPY_VFS                        (1)
 #endif
 
 // Board overridable feature configuration.
@@ -47,3 +47,15 @@
 #ifndef MICROPY_PY_UBINASCII
 #define MICROPY_PY_UBINASCII               (1)
 #endif
+
+// Board overridable port specific feature configuration.
+
+#ifndef MICROPY_PY_NRF
+#define MICROPY_PY_NRF                     (1)
+#endif
+
+// Board overridable hardware configuration.
+
+#ifndef MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE
+#define MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE (1)
+#endif
diff --git a/ports/nrf/mpconfigdevice_nrf9160.h b/ports/nrf/mpconfigdevice_nrf9160.h
index 2bfd047ca1456..cc7bcbe9b42c8 100644
--- a/ports/nrf/mpconfigdevice_nrf9160.h
+++ b/ports/nrf/mpconfigdevice_nrf9160.h
@@ -27,11 +27,11 @@
 // Board overridable build configuration.
 
 #ifndef MICROPY_MBFS
-#define MICROPY_MBFS                       (1)
+#define MICROPY_MBFS                       (0)
 #endif
 
 #ifndef MICROPY_VFS
-#define MICROPY_VFS                        (0)
+#define MICROPY_VFS                        (1)
 #endif
 
 // Board overridable feature configuration.
@@ -47,3 +47,15 @@
 #ifndef MICROPY_PY_UBINASCII
 #define MICROPY_PY_UBINASCII               (1)
 #endif
+
+// Board overridable port specific feature configuration.
+
+#ifndef MICROPY_PY_NRF
+#define MICROPY_PY_NRF                     (1)
+#endif
+
+// Board overridable hardware configuration.
+
+#ifndef MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE
+#define MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE (1)
+#endif

From 990341d18e72636c300e1880dd11500c07bd9f46 Mon Sep 17 00:00:00 2001
From: Glenn Ruben Bakke <glennbakke@gmail.com>
Date: Wed, 4 Dec 2019 07:37:19 +0100
Subject: [PATCH 1166/3533] nrf: Facilitate use of freeze manifest.

Update the Makefile to handle FROZEN_MANIFEST, and the README with some
small samples on how to use freeze manifests.  And add BOARD_DIR to the
Makefile which can be referenced in boards/<board>/mpconfigboard.mk to
include a board specific manifest.
---
 ports/nrf/Makefile  |  6 ++++--
 ports/nrf/README.md | 16 ++++++++++++++++
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/ports/nrf/Makefile b/ports/nrf/Makefile
index fb7eb5c591841..0e46885ea0b3c 100644
--- a/ports/nrf/Makefile
+++ b/ports/nrf/Makefile
@@ -5,6 +5,8 @@ ifeq ($(wildcard boards/$(BOARD)/.),)
 $(error Invalid BOARD specified)
 endif
 
+BOARD_DIR ?= boards/$(BOARD)
+
 # If SoftDevice is selected, try to use that one.
 SD ?=
 SD_LOWER = $(shell echo $(SD) | tr '[:upper:]' '[:lower:]')
@@ -537,13 +539,13 @@ GEN_PINS_QSTR = $(BUILD)/pins_qstr.h
 GEN_PINS_AF_CONST = $(HEADER_BUILD)/pins_af_const.h
 GEN_PINS_AF_PY = $(BUILD)/pins_af.py
 
-ifneq ($(FROZEN_DIR),)
+ifneq ($(FROZEN_MANIFEST)$(FROZEN_DIR),)
 # To use frozen source modules, put your .py files in a subdirectory (eg scripts/)
 # and then invoke make with FROZEN_DIR=scripts (be sure to build from scratch).
 CFLAGS += -DMICROPY_MODULE_FROZEN_STR
 endif
 
-ifneq ($(FROZEN_MPY_DIR),)
+ifneq ($(FROZEN_MANIFEST)$(FROZEN_MPY_DIR),)
 # To use frozen bytecode, put your .py files in a subdirectory (eg frozen/) and
 # then invoke make with FROZEN_MPY_DIR=frozen (be sure to build from scratch).
 CFLAGS += -DMICROPY_QSTR_EXTRA_POOL=mp_qstr_frozen_const_pool
diff --git a/ports/nrf/README.md b/ports/nrf/README.md
index a4509cc6e11de..aa8968ff92666 100644
--- a/ports/nrf/README.md
+++ b/ports/nrf/README.md
@@ -110,6 +110,22 @@ To use frozen modules, put them in a directory (e.g. `freeze/`) and supply
 
      make BOARD=pca10040 FROZEN_MPY_DIR=freeze
 
+## Compile with freeze manifest
+
+Freeze manifests can be used by definining `FROZEN_MANIFEST` pointing to a
+`manifest.py`. This can either be done by a `make` invocation or by defining
+it in the specific target board's `mpconfigboard.mk`.
+
+For example:
+
+    make BOARD=pca10040 FROZEN_MANIFEST=path/to/manifest.py
+
+In case of using the target board's makefile, add a line similar to this:
+
+    FROZEN_MANIFEST ?= $(BOARD_DIR)/manifest.py
+
+In these two examples, the manual `make` invocation will have precedence.
+
 ## Enable MICROPY_VFS_FAT
 As the `oofatfs` module is not having header guards that can exclude the implementation compile time, this port provides a flag to enable it explicitly. The MICROPY_VFS_FAT is by default set to 0 and has to be set to 1 if `oofatfs` files should be compiled. This will be in addition of setting `MICROPY_VFS` in mpconfigport.h.
 

From 4f76f6618507c01a067d69cc5b9934fafe261e18 Mon Sep 17 00:00:00 2001
From: Glenn Ruben Bakke <glennbakke@gmail.com>
Date: Wed, 9 Dec 2020 21:00:34 +0100
Subject: [PATCH 1167/3533] tools/ci.sh: Add mpy-cross build to nrf port.

---
 tools/ci.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/ci.sh b/tools/ci.sh
index efc68c03e4b28..4c216257d2fea 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -189,6 +189,7 @@ function ci_nrf_setup {
 
 function ci_nrf_build {
     ports/nrf/drivers/bluetooth/download_ble_stack.sh s140_nrf52_6_1_1
+    make ${MAKEOPTS} -C mpy-cross
     make ${MAKEOPTS} -C ports/nrf submodules
     make ${MAKEOPTS} -C ports/nrf BOARD=pca10040
     make ${MAKEOPTS} -C ports/nrf BOARD=microbit

From ffc636de2f2e91e1fecfca1b4b2691a59d83a8eb Mon Sep 17 00:00:00 2001
From: Glenn Ruben Bakke <glennbakke@gmail.com>
Date: Thu, 23 Jul 2020 23:11:14 +0200
Subject: [PATCH 1168/3533] nrf/boards: Set FROZEN_MANIFEST blank when SD
 present on nrf51 targets.

---
 ports/nrf/boards/microbit/mpconfigboard.mk     | 3 +++
 ports/nrf/boards/pca10000/mpconfigboard.mk     | 4 ++++
 ports/nrf/boards/pca10001/mpconfigboard.mk     | 4 ++++
 ports/nrf/boards/pca10028/mpconfigboard.mk     | 4 ++++
 ports/nrf/boards/pca10031/mpconfigboard.mk     | 4 ++++
 ports/nrf/boards/wt51822_s4at/mpconfigboard.mk | 4 ++++
 6 files changed, 23 insertions(+)

diff --git a/ports/nrf/boards/microbit/mpconfigboard.mk b/ports/nrf/boards/microbit/mpconfigboard.mk
index 96f430071b289..d96044195ed5d 100644
--- a/ports/nrf/boards/microbit/mpconfigboard.mk
+++ b/ports/nrf/boards/microbit/mpconfigboard.mk
@@ -2,9 +2,12 @@ MCU_SERIES = m0
 MCU_VARIANT = nrf51
 MCU_SUB_VARIANT = nrf51822
 SOFTDEV_VERSION = 8.0.0
+
 ifneq ($(SD),)
 LD_FILES += boards/microbit/custom_nrf51822_s110_microbit.ld
+FROZEN_MANIFEST ?=
 endif
+
 LD_FILES += boards/nrf51x22_256k_16k.ld
 FLASHER = pyocd
 
diff --git a/ports/nrf/boards/pca10000/mpconfigboard.mk b/ports/nrf/boards/pca10000/mpconfigboard.mk
index c0cef5f3afb38..52b8df88b789b 100644
--- a/ports/nrf/boards/pca10000/mpconfigboard.mk
+++ b/ports/nrf/boards/pca10000/mpconfigboard.mk
@@ -3,3 +3,7 @@ MCU_VARIANT = nrf51
 MCU_SUB_VARIANT = nrf51822
 SOFTDEV_VERSION = 8.0.0
 LD_FILES += boards/nrf51x22_256k_16k.ld
+
+ifneq ($(SD),)
+FROZEN_MANIFEST ?=
+endif
diff --git a/ports/nrf/boards/pca10001/mpconfigboard.mk b/ports/nrf/boards/pca10001/mpconfigboard.mk
index c0cef5f3afb38..52b8df88b789b 100644
--- a/ports/nrf/boards/pca10001/mpconfigboard.mk
+++ b/ports/nrf/boards/pca10001/mpconfigboard.mk
@@ -3,3 +3,7 @@ MCU_VARIANT = nrf51
 MCU_SUB_VARIANT = nrf51822
 SOFTDEV_VERSION = 8.0.0
 LD_FILES += boards/nrf51x22_256k_16k.ld
+
+ifneq ($(SD),)
+FROZEN_MANIFEST ?=
+endif
diff --git a/ports/nrf/boards/pca10028/mpconfigboard.mk b/ports/nrf/boards/pca10028/mpconfigboard.mk
index b3c8f21ea9111..779276ca1cbb3 100644
--- a/ports/nrf/boards/pca10028/mpconfigboard.mk
+++ b/ports/nrf/boards/pca10028/mpconfigboard.mk
@@ -3,3 +3,7 @@ MCU_VARIANT = nrf51
 MCU_SUB_VARIANT = nrf51822
 SOFTDEV_VERSION = 8.0.0
 LD_FILES += boards/nrf51x22_256k_32k.ld
+
+ifneq ($(SD),)
+FROZEN_MANIFEST ?=
+endif
diff --git a/ports/nrf/boards/pca10031/mpconfigboard.mk b/ports/nrf/boards/pca10031/mpconfigboard.mk
index b3c8f21ea9111..779276ca1cbb3 100644
--- a/ports/nrf/boards/pca10031/mpconfigboard.mk
+++ b/ports/nrf/boards/pca10031/mpconfigboard.mk
@@ -3,3 +3,7 @@ MCU_VARIANT = nrf51
 MCU_SUB_VARIANT = nrf51822
 SOFTDEV_VERSION = 8.0.0
 LD_FILES += boards/nrf51x22_256k_32k.ld
+
+ifneq ($(SD),)
+FROZEN_MANIFEST ?=
+endif
diff --git a/ports/nrf/boards/wt51822_s4at/mpconfigboard.mk b/ports/nrf/boards/wt51822_s4at/mpconfigboard.mk
index 515de07f5b935..61c36f21d98de 100644
--- a/ports/nrf/boards/wt51822_s4at/mpconfigboard.mk
+++ b/ports/nrf/boards/wt51822_s4at/mpconfigboard.mk
@@ -5,3 +5,7 @@ SOFTDEV_VERSION = 8.0.0
 LD_FILES += boards/nrf51x22_256k_16k.ld
 
 CFLAGS += -DBLUETOOTH_LFCLK_RC
+
+ifneq ($(SD),)
+FROZEN_MANIFEST ?=
+endif

From 7b6ad0ce2e6c3c623966c5568989ed5042fb9b1d Mon Sep 17 00:00:00 2001
From: Glenn Ruben Bakke <glennbakke@gmail.com>
Date: Fri, 24 Jul 2020 00:38:33 +0200
Subject: [PATCH 1169/3533] nrf/modules/scripts: Add file system formatting
 script.

Add a helper script _mkfs.py which automatically formats the file system if
nrf.Flash() is located and a VFS file system has been included in the
compilation.

The precedence is: first LFS1, LFS2 then FAT.
---
 ports/nrf/modules/scripts/_mkfs.py | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 ports/nrf/modules/scripts/_mkfs.py

diff --git a/ports/nrf/modules/scripts/_mkfs.py b/ports/nrf/modules/scripts/_mkfs.py
new file mode 100644
index 0000000000000..00522ffbb9382
--- /dev/null
+++ b/ports/nrf/modules/scripts/_mkfs.py
@@ -0,0 +1,23 @@
+import uos, nrf
+
+try:
+    from uos import VfsLfs1
+
+    uos.VfsLfs1.mkfs(nrf.Flash())
+except ImportError:
+    try:
+        from uos import VfsLfs2
+
+        uos.VfsLfs2.mkfs(nrf.Flash())
+    except ImportError:
+        try:
+            from uos import VfsFat
+
+            uos.VfsFat.mkfs(nrf.Flash())
+        except ImportError:
+            pass
+        except OSError as e:
+            if e.args[0] == 5:  # I/O Error
+                flashbdev_size = (nrf.Flash.ioctl(4, 0) * nrf.Flash.ioctl(5, 0)) // 1024
+                print()
+                print("Is `FS_SIZE=%iK` enough for FAT filesystem?" % flashbdev_size)

From aa857eb65e57a935ec3757abc35b007996433298 Mon Sep 17 00:00:00 2001
From: Glenn Ruben Bakke <glennbakke@gmail.com>
Date: Thu, 23 Jul 2020 23:12:51 +0200
Subject: [PATCH 1170/3533] nrf/Makefile: Set default manifest file for all
 targets.

Set the default manifest to "modules/manifest.py".  This includes files
from the folder "modules/scripts".  The manifest default value is overriden
by all nrf51 boards that have SoftDevice present (SD=s110) to save flash.

Also add "modules/manifest.py" which is set to freeze
"modules/scripts/_mkfs.py".
---
 ports/nrf/Makefile            | 2 ++
 ports/nrf/modules/manifest.py | 1 +
 2 files changed, 3 insertions(+)
 create mode 100644 ports/nrf/modules/manifest.py

diff --git a/ports/nrf/Makefile b/ports/nrf/Makefile
index 0e46885ea0b3c..a8a5228270f17 100644
--- a/ports/nrf/Makefile
+++ b/ports/nrf/Makefile
@@ -52,6 +52,8 @@ ifeq ($(DEBUG), 0)
 MICROPY_ROM_TEXT_COMPRESSION ?= 1
 endif
 
+FROZEN_MANIFEST ?= modules/manifest.py
+
 # include py core make definitions
 include ../../py/py.mk
 
diff --git a/ports/nrf/modules/manifest.py b/ports/nrf/modules/manifest.py
new file mode 100644
index 0000000000000..4e8482226baaf
--- /dev/null
+++ b/ports/nrf/modules/manifest.py
@@ -0,0 +1 @@
+freeze("$(PORT_DIR)/modules/scripts", "_mkfs.py")

From 23e8729d3e256a38ae4bbe68c8aa66a40e31e2e8 Mon Sep 17 00:00:00 2001
From: Glenn Ruben Bakke <glennbakke@gmail.com>
Date: Wed, 9 Dec 2020 21:01:28 +0100
Subject: [PATCH 1171/3533] nrf/mphalport: Add dummy function for
 mp_hal_time_ns().

extmod/vfs_lfs.c needs to resolve `mp_hal_time_ns()` in order to calculate
a timestamp from 1970 epoch.  A wall clock is not available in the nrf
port, hence the function is implemented to resolve compilation linkage
error.  The function always return 0.
---
 ports/nrf/mphalport.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ports/nrf/mphalport.c b/ports/nrf/mphalport.c
index b8e4c2e4d8b55..8ffb256018226 100644
--- a/ports/nrf/mphalport.c
+++ b/ports/nrf/mphalport.c
@@ -150,6 +150,10 @@ mp_uint_t mp_hal_ticks_ms(void) {
 
 #endif
 
+uint64_t mp_hal_time_ns(void) {
+    return 0;
+}
+
 // this table converts from HAL_StatusTypeDef to POSIX errno
 const byte mp_hal_status_to_errno_table[4] = {
     [HAL_OK] = 0,

From 55d4321c3eb1a99b7f135ca930878d0ce97620e6 Mon Sep 17 00:00:00 2001
From: Glenn Ruben Bakke <glennbakke@gmail.com>
Date: Thu, 23 Jul 2020 23:37:25 +0200
Subject: [PATCH 1172/3533] nrf/boards: Enable MICROPY_VFS_LFS2 for all target
 boards.

Enable LittleFS v2 for all targets, except nrf51 targets when SoftDevice is
present.
---
 ports/nrf/boards/actinius_icarus/mpconfigboard.mk         | 2 ++
 ports/nrf/boards/arduino_primo/mpconfigboard.mk           | 2 ++
 ports/nrf/boards/blueio_tag_evim/mpconfigboard.mk         | 2 ++
 ports/nrf/boards/dvk_bl652/mpconfigboard.mk               | 2 ++
 ports/nrf/boards/evk_nina_b1/mpconfigboard.mk             | 2 ++
 ports/nrf/boards/feather52/mpconfigboard.mk               | 1 +
 ports/nrf/boards/ibk_blyst_nano/mpconfigboard.mk          | 2 ++
 ports/nrf/boards/idk_blyst_nano/mpconfigboard.mk          | 2 ++
 ports/nrf/boards/microbit/mpconfigboard.mk                | 2 ++
 ports/nrf/boards/nrf52840-mdk-usb-dongle/mpconfigboard.mk | 2 ++
 ports/nrf/boards/particle_xenon/mpconfigboard.mk          | 2 ++
 ports/nrf/boards/pca10000/mpconfigboard.mk                | 2 ++
 ports/nrf/boards/pca10001/mpconfigboard.mk                | 2 ++
 ports/nrf/boards/pca10028/mpconfigboard.mk                | 2 ++
 ports/nrf/boards/pca10031/mpconfigboard.mk                | 2 ++
 ports/nrf/boards/pca10040/mpconfigboard.mk                | 2 ++
 ports/nrf/boards/pca10056/mpconfigboard.mk                | 2 ++
 ports/nrf/boards/pca10059/mpconfigboard.mk                | 2 ++
 ports/nrf/boards/pca10090/mpconfigboard.mk                | 2 ++
 ports/nrf/boards/wt51822_s4at/mpconfigboard.mk            | 2 ++
 20 files changed, 39 insertions(+)

diff --git a/ports/nrf/boards/actinius_icarus/mpconfigboard.mk b/ports/nrf/boards/actinius_icarus/mpconfigboard.mk
index c1e05fd306272..8e6f75b36ce42 100644
--- a/ports/nrf/boards/actinius_icarus/mpconfigboard.mk
+++ b/ports/nrf/boards/actinius_icarus/mpconfigboard.mk
@@ -4,3 +4,5 @@ MCU_SUB_VARIANT = nrf9160
 LD_FILES += boards/nrf9160_1M_256k.ld
 
 NRF_DEFINES += -DNRF9160_XXAA -DNRF_TRUSTZONE_NONSECURE 
+
+MICROPY_VFS_LFS2 = 1
diff --git a/ports/nrf/boards/arduino_primo/mpconfigboard.mk b/ports/nrf/boards/arduino_primo/mpconfigboard.mk
index 84685236bdddf..e814d3d5501fc 100644
--- a/ports/nrf/boards/arduino_primo/mpconfigboard.mk
+++ b/ports/nrf/boards/arduino_primo/mpconfigboard.mk
@@ -6,3 +6,5 @@ LD_FILES += boards/nrf52832_512k_64k.ld
 FLASHER = pyocd
 
 NRF_DEFINES += -DNRF52832_XXAA
+
+MICROPY_VFS_LFS2 = 1
diff --git a/ports/nrf/boards/blueio_tag_evim/mpconfigboard.mk b/ports/nrf/boards/blueio_tag_evim/mpconfigboard.mk
index 02a3177446b10..c3164c8f088ab 100644
--- a/ports/nrf/boards/blueio_tag_evim/mpconfigboard.mk
+++ b/ports/nrf/boards/blueio_tag_evim/mpconfigboard.mk
@@ -6,3 +6,5 @@ LD_FILES += boards/nrf52832_512k_64k.ld
 FLASHER = idap
 
 NRF_DEFINES += -DNRF52832_XXAA
+
+MICROPY_VFS_LFS2 = 1
diff --git a/ports/nrf/boards/dvk_bl652/mpconfigboard.mk b/ports/nrf/boards/dvk_bl652/mpconfigboard.mk
index 8730d02978fa6..30767d766a938 100644
--- a/ports/nrf/boards/dvk_bl652/mpconfigboard.mk
+++ b/ports/nrf/boards/dvk_bl652/mpconfigboard.mk
@@ -6,3 +6,5 @@ LD_FILES += boards/nrf52832_512k_64k.ld
 
 NRF_DEFINES += -DNRF52832_XXAA
 CFLAGS += -DBLUETOOTH_LFCLK_RC
+
+MICROPY_VFS_LFS2 = 1
diff --git a/ports/nrf/boards/evk_nina_b1/mpconfigboard.mk b/ports/nrf/boards/evk_nina_b1/mpconfigboard.mk
index db64a60dd3685..96245e3e45f0e 100644
--- a/ports/nrf/boards/evk_nina_b1/mpconfigboard.mk
+++ b/ports/nrf/boards/evk_nina_b1/mpconfigboard.mk
@@ -5,3 +5,5 @@ SOFTDEV_VERSION = 6.1.1
 LD_FILES += boards/nrf52832_512k_64k.ld
 
 NRF_DEFINES += -DNRF52832_XXAA
+
+MICROPY_VFS_LFS2 = 1
diff --git a/ports/nrf/boards/feather52/mpconfigboard.mk b/ports/nrf/boards/feather52/mpconfigboard.mk
index 5e0f336da4c53..96245e3e45f0e 100644
--- a/ports/nrf/boards/feather52/mpconfigboard.mk
+++ b/ports/nrf/boards/feather52/mpconfigboard.mk
@@ -6,3 +6,4 @@ LD_FILES += boards/nrf52832_512k_64k.ld
 
 NRF_DEFINES += -DNRF52832_XXAA
 
+MICROPY_VFS_LFS2 = 1
diff --git a/ports/nrf/boards/ibk_blyst_nano/mpconfigboard.mk b/ports/nrf/boards/ibk_blyst_nano/mpconfigboard.mk
index 02a3177446b10..c3164c8f088ab 100644
--- a/ports/nrf/boards/ibk_blyst_nano/mpconfigboard.mk
+++ b/ports/nrf/boards/ibk_blyst_nano/mpconfigboard.mk
@@ -6,3 +6,5 @@ LD_FILES += boards/nrf52832_512k_64k.ld
 FLASHER = idap
 
 NRF_DEFINES += -DNRF52832_XXAA
+
+MICROPY_VFS_LFS2 = 1
diff --git a/ports/nrf/boards/idk_blyst_nano/mpconfigboard.mk b/ports/nrf/boards/idk_blyst_nano/mpconfigboard.mk
index 02a3177446b10..c3164c8f088ab 100644
--- a/ports/nrf/boards/idk_blyst_nano/mpconfigboard.mk
+++ b/ports/nrf/boards/idk_blyst_nano/mpconfigboard.mk
@@ -6,3 +6,5 @@ LD_FILES += boards/nrf52832_512k_64k.ld
 FLASHER = idap
 
 NRF_DEFINES += -DNRF52832_XXAA
+
+MICROPY_VFS_LFS2 = 1
diff --git a/ports/nrf/boards/microbit/mpconfigboard.mk b/ports/nrf/boards/microbit/mpconfigboard.mk
index d96044195ed5d..6fdd2bc500085 100644
--- a/ports/nrf/boards/microbit/mpconfigboard.mk
+++ b/ports/nrf/boards/microbit/mpconfigboard.mk
@@ -6,6 +6,8 @@ SOFTDEV_VERSION = 8.0.0
 ifneq ($(SD),)
 LD_FILES += boards/microbit/custom_nrf51822_s110_microbit.ld
 FROZEN_MANIFEST ?=
+else
+MICROPY_VFS_LFS2 = 1
 endif
 
 LD_FILES += boards/nrf51x22_256k_16k.ld
diff --git a/ports/nrf/boards/nrf52840-mdk-usb-dongle/mpconfigboard.mk b/ports/nrf/boards/nrf52840-mdk-usb-dongle/mpconfigboard.mk
index ca437418d5254..3a26a92b7dc1e 100644
--- a/ports/nrf/boards/nrf52840-mdk-usb-dongle/mpconfigboard.mk
+++ b/ports/nrf/boards/nrf52840-mdk-usb-dongle/mpconfigboard.mk
@@ -17,3 +17,5 @@ endif
 LD_FILES += boards/nrf52840_1M_256k.ld
 
 NRF_DEFINES += -DNRF52840_XXAA
+
+MICROPY_VFS_LFS2 = 1
diff --git a/ports/nrf/boards/particle_xenon/mpconfigboard.mk b/ports/nrf/boards/particle_xenon/mpconfigboard.mk
index 34bead59ff3f5..d28324f76e14f 100644
--- a/ports/nrf/boards/particle_xenon/mpconfigboard.mk
+++ b/ports/nrf/boards/particle_xenon/mpconfigboard.mk
@@ -9,3 +9,5 @@ NRF_DEFINES += -DNRF52840_XXAA
 # The nrf52-particle.cfg is not included here, it can be found in the Particle Workbench
 # Note: This requires openocd >0.10
 OPENOCD_TARGET ?= boards/$(BOARD)/nrf52-particle.cfg
+
+MICROPY_VFS_LFS2 = 1
diff --git a/ports/nrf/boards/pca10000/mpconfigboard.mk b/ports/nrf/boards/pca10000/mpconfigboard.mk
index 52b8df88b789b..64cf513c042e9 100644
--- a/ports/nrf/boards/pca10000/mpconfigboard.mk
+++ b/ports/nrf/boards/pca10000/mpconfigboard.mk
@@ -6,4 +6,6 @@ LD_FILES += boards/nrf51x22_256k_16k.ld
 
 ifneq ($(SD),)
 FROZEN_MANIFEST ?=
+else
+MICROPY_VFS_LFS2 = 1
 endif
diff --git a/ports/nrf/boards/pca10001/mpconfigboard.mk b/ports/nrf/boards/pca10001/mpconfigboard.mk
index 52b8df88b789b..64cf513c042e9 100644
--- a/ports/nrf/boards/pca10001/mpconfigboard.mk
+++ b/ports/nrf/boards/pca10001/mpconfigboard.mk
@@ -6,4 +6,6 @@ LD_FILES += boards/nrf51x22_256k_16k.ld
 
 ifneq ($(SD),)
 FROZEN_MANIFEST ?=
+else
+MICROPY_VFS_LFS2 = 1
 endif
diff --git a/ports/nrf/boards/pca10028/mpconfigboard.mk b/ports/nrf/boards/pca10028/mpconfigboard.mk
index 779276ca1cbb3..83b26a1deae70 100644
--- a/ports/nrf/boards/pca10028/mpconfigboard.mk
+++ b/ports/nrf/boards/pca10028/mpconfigboard.mk
@@ -6,4 +6,6 @@ LD_FILES += boards/nrf51x22_256k_32k.ld
 
 ifneq ($(SD),)
 FROZEN_MANIFEST ?=
+else
+MICROPY_VFS_LFS2 = 1
 endif
diff --git a/ports/nrf/boards/pca10031/mpconfigboard.mk b/ports/nrf/boards/pca10031/mpconfigboard.mk
index 779276ca1cbb3..83b26a1deae70 100644
--- a/ports/nrf/boards/pca10031/mpconfigboard.mk
+++ b/ports/nrf/boards/pca10031/mpconfigboard.mk
@@ -6,4 +6,6 @@ LD_FILES += boards/nrf51x22_256k_32k.ld
 
 ifneq ($(SD),)
 FROZEN_MANIFEST ?=
+else
+MICROPY_VFS_LFS2 = 1
 endif
diff --git a/ports/nrf/boards/pca10040/mpconfigboard.mk b/ports/nrf/boards/pca10040/mpconfigboard.mk
index db64a60dd3685..96245e3e45f0e 100644
--- a/ports/nrf/boards/pca10040/mpconfigboard.mk
+++ b/ports/nrf/boards/pca10040/mpconfigboard.mk
@@ -5,3 +5,5 @@ SOFTDEV_VERSION = 6.1.1
 LD_FILES += boards/nrf52832_512k_64k.ld
 
 NRF_DEFINES += -DNRF52832_XXAA
+
+MICROPY_VFS_LFS2 = 1
diff --git a/ports/nrf/boards/pca10056/mpconfigboard.mk b/ports/nrf/boards/pca10056/mpconfigboard.mk
index ca555d3932aa4..d8ee0f8a2168a 100644
--- a/ports/nrf/boards/pca10056/mpconfigboard.mk
+++ b/ports/nrf/boards/pca10056/mpconfigboard.mk
@@ -5,3 +5,5 @@ SOFTDEV_VERSION = 6.1.1
 LD_FILES += boards/nrf52840_1M_256k.ld
 
 NRF_DEFINES += -DNRF52840_XXAA
+
+MICROPY_VFS_LFS2 = 1
diff --git a/ports/nrf/boards/pca10059/mpconfigboard.mk b/ports/nrf/boards/pca10059/mpconfigboard.mk
index ca437418d5254..3a26a92b7dc1e 100644
--- a/ports/nrf/boards/pca10059/mpconfigboard.mk
+++ b/ports/nrf/boards/pca10059/mpconfigboard.mk
@@ -17,3 +17,5 @@ endif
 LD_FILES += boards/nrf52840_1M_256k.ld
 
 NRF_DEFINES += -DNRF52840_XXAA
+
+MICROPY_VFS_LFS2 = 1
diff --git a/ports/nrf/boards/pca10090/mpconfigboard.mk b/ports/nrf/boards/pca10090/mpconfigboard.mk
index 9363900e2b5dd..cc7e7c3683da6 100644
--- a/ports/nrf/boards/pca10090/mpconfigboard.mk
+++ b/ports/nrf/boards/pca10090/mpconfigboard.mk
@@ -4,3 +4,5 @@ MCU_SUB_VARIANT = nrf9160
 LD_FILES += boards/nrf9160_1M_256k.ld
 
 NRF_DEFINES += -DNRF9160_XXAA -DNRF_TRUSTZONE_NONSECURE
+
+MICROPY_VFS_LFS2 = 1
diff --git a/ports/nrf/boards/wt51822_s4at/mpconfigboard.mk b/ports/nrf/boards/wt51822_s4at/mpconfigboard.mk
index 61c36f21d98de..d0de24ba404b7 100644
--- a/ports/nrf/boards/wt51822_s4at/mpconfigboard.mk
+++ b/ports/nrf/boards/wt51822_s4at/mpconfigboard.mk
@@ -8,4 +8,6 @@ CFLAGS += -DBLUETOOTH_LFCLK_RC
 
 ifneq ($(SD),)
 FROZEN_MANIFEST ?=
+else
+MICROPY_VFS_LFS2 = 1
 endif

From 85f0ce214e42e0d8f36602ae1b084a97ef40c462 Mon Sep 17 00:00:00 2001
From: Glenn Ruben Bakke <glennbakke@gmail.com>
Date: Sat, 25 Jul 2020 11:32:56 +0200
Subject: [PATCH 1173/3533] tools/codeformat.py: Include ports/nrf/modules/nrf
 in code formatting.

---
 tools/codeformat.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/codeformat.py b/tools/codeformat.py
index f8202c66b950c..a5d64739aa160 100755
--- a/tools/codeformat.py
+++ b/tools/codeformat.py
@@ -45,6 +45,7 @@
     "mpy-cross/*.[ch]",
     "ports/*/*.[ch]",
     "ports/windows/msvc/**/*.[ch]",
+    "ports/nrf/modules/nrf/*.[ch]",
     "py/*.[ch]",
     # Python
     "drivers/**/*.py",

From e5e05532240e464da90b7b941542a06b36baa766 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sun, 8 Aug 2021 00:47:34 +1000
Subject: [PATCH 1174/3533] nrf/modules/uos: Add ilistdir to uos module.

This was missed in the initial implementation of the uos module.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/nrf/modules/uos/moduos.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/nrf/modules/uos/moduos.c b/ports/nrf/modules/uos/moduos.c
index fd5334d004f6b..e8a3790dacce6 100644
--- a/ports/nrf/modules/uos/moduos.c
+++ b/ports/nrf/modules/uos/moduos.c
@@ -145,6 +145,7 @@ STATIC const mp_rom_map_elem_t os_module_globals_table[] = {
 #if MICROPY_VFS
     { MP_ROM_QSTR(MP_QSTR_chdir), MP_ROM_PTR(&mp_vfs_chdir_obj) },
     { MP_ROM_QSTR(MP_QSTR_getcwd), MP_ROM_PTR(&mp_vfs_getcwd_obj) },
+    { MP_ROM_QSTR(MP_QSTR_ilistdir), MP_ROM_PTR(&mp_vfs_ilistdir_obj) },
     { MP_ROM_QSTR(MP_QSTR_listdir), MP_ROM_PTR(&mp_vfs_listdir_obj) },
     { MP_ROM_QSTR(MP_QSTR_mkdir), MP_ROM_PTR(&mp_vfs_mkdir_obj) },
     { MP_ROM_QSTR(MP_QSTR_remove), MP_ROM_PTR(&mp_vfs_remove_obj) },

From 77b4cfcbc9d2f46cb275fb6027999a1bfc0feb77 Mon Sep 17 00:00:00 2001
From: Glenn Ruben Bakke <glennbakke@gmail.com>
Date: Sun, 11 Nov 2018 21:37:05 +0100
Subject: [PATCH 1175/3533] nrf/modules/nrf: Add function to enable/disable
 DCDC.

This function can be used to enable and disable the DC/DC converter with or
without the Bluetooth stack enabled.  It can also be used to query the
current state of the DC/DC.

This commit also adds a definition of ARRAY_SIZE needed by nrfx HAL-layer.
---
 ports/nrf/modules/nrf/modnrf.c | 30 +++++++++++++++++++++++++++++-
 ports/nrf/nrfx_glue.h          |  7 +++++++
 2 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/ports/nrf/modules/nrf/modnrf.c b/ports/nrf/modules/nrf/modnrf.c
index fd955dc62f5c3..fc217b1d7eeeb 100644
--- a/ports/nrf/modules/nrf/modnrf.c
+++ b/ports/nrf/modules/nrf/modnrf.c
@@ -29,15 +29,40 @@
 
 #if MICROPY_PY_NRF
 
-#if MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE
 #include "flashbdev.h"
 #include "flash.h"
+#include "nrf_power.h"
+
+#if BLUETOOTH_SD
+#include "nrf_soc.h"
+#include "ble_drv.h"
+#define BLUETOOTH_STACK_ENABLED() (ble_drv_stack_enabled())
+#endif
 
 #define FLASH_PAGE_ALIGN_UP(addr)   (((addr) - 1) + (FLASH_PAGESIZE)-(((addr) - 1) % (FLASH_PAGESIZE)))
 
 extern uint32_t _unused_flash_start;
 extern uint32_t _unused_flash_len;
 
+#if NRF_POWER_HAS_DCDCEN
+STATIC mp_obj_t dcdc(size_t n_args, const mp_obj_t *args) {
+    if (n_args > 0) {
+        bool dcdc_state = mp_obj_is_true(args[0]);
+        #if BLUETOOTH_SD
+        if (BLUETOOTH_STACK_ENABLED()) {
+            sd_power_dcdc_mode_set(dcdc_state);
+        } else
+        #endif
+        {
+            nrf_power_dcdcen_set(NRF_POWER, dcdc_state);
+        }
+    }
+    return mp_obj_new_bool(nrf_power_dcdcen_get(NRF_POWER));
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(dcdc_obj, 0, 1, dcdc);
+#endif
+
+#if MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE
 mp_obj_t nrf_modnrf_freeflash_start_aligned(void) {
     return mp_obj_new_int_from_uint(FLASH_PAGE_ALIGN_UP((uint32_t)&_unused_flash_start));
 }
@@ -54,6 +79,9 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_0(nrf_modnrf_freeflash_length_aligned_obj, nrf_mo
 
 STATIC const mp_rom_map_elem_t nrf_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_nrf) },
+    #if NRF_POWER_HAS_DCDCEN
+    { MP_ROM_QSTR(MP_QSTR_dcdc), MP_ROM_PTR(&dcdc_obj) },
+    #endif
     #if MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE
     { MP_ROM_QSTR(MP_QSTR_Flash), MP_ROM_PTR(&nrf_flashbdev_type) },
     { MP_ROM_QSTR(MP_QSTR_unused_flash_start), MP_ROM_PTR(&nrf_modnrf_freeflash_start_aligned_obj) },
diff --git a/ports/nrf/nrfx_glue.h b/ports/nrf/nrfx_glue.h
index b4a60257a893b..56e1f719dae6c 100644
--- a/ports/nrf/nrfx_glue.h
+++ b/ports/nrf/nrfx_glue.h
@@ -27,8 +27,15 @@
 #ifndef NRFX_GLUE_H
 #define NRFX_GLUE_H
 
+#include "py/mpconfig.h"
+#include "py/misc.h"
+
 #include <soc/nrfx_irqs.h>
 
+#ifndef ARRAY_SIZE
+#define ARRAY_SIZE MP_ARRAY_SIZE
+#endif
+
 #define NRFX_STATIC_ASSERT(expression)
 
 #define NRFX_ASSERT(expression)  do { bool res = expression; (void)res; } while (0)

From 8645b7c23b9d55ddc4e5927f52de5aa3da05a915 Mon Sep 17 00:00:00 2001
From: Daniel Mizyrycki <mzdaniel@glidelink.net>
Date: Sun, 8 Aug 2021 14:15:56 -0700
Subject: [PATCH 1176/3533] nrf: Enable source line on tracebacks.

---
 ports/nrf/mpconfigdevice_nrf51822.h | 8 ++++++++
 ports/nrf/mpconfigdevice_nrf52832.h | 4 ++++
 ports/nrf/mpconfigdevice_nrf52840.h | 4 ++++
 ports/nrf/mpconfigdevice_nrf9160.h  | 4 ++++
 ports/nrf/mpconfigport.h            | 1 -
 5 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/ports/nrf/mpconfigdevice_nrf51822.h b/ports/nrf/mpconfigdevice_nrf51822.h
index d10e91a79ebcb..67a81d2509894 100644
--- a/ports/nrf/mpconfigdevice_nrf51822.h
+++ b/ports/nrf/mpconfigdevice_nrf51822.h
@@ -44,6 +44,14 @@
 
 // Board overridable feature configuration.
 
+#ifndef MICROPY_ENABLE_SOURCE_LINE
+#if defined(BLUETOOTH_SD)
+#define MICROPY_ENABLE_SOURCE_LINE         (0)
+#else
+#define MICROPY_ENABLE_SOURCE_LINE         (1)
+#endif
+#endif
+
 #ifndef MICROPY_PY_ARRAY_SLICE_ASSIGN
 #if defined(BLUETOOTH_SD)
 #define MICROPY_PY_ARRAY_SLICE_ASSIGN      (0)
diff --git a/ports/nrf/mpconfigdevice_nrf52832.h b/ports/nrf/mpconfigdevice_nrf52832.h
index cc7bcbe9b42c8..fa9258f2ac03c 100644
--- a/ports/nrf/mpconfigdevice_nrf52832.h
+++ b/ports/nrf/mpconfigdevice_nrf52832.h
@@ -36,6 +36,10 @@
 
 // Board overridable feature configuration.
 
+#ifndef MICROPY_ENABLE_SOURCE_LINE
+#define MICROPY_ENABLE_SOURCE_LINE         (1)
+#endif
+
 #ifndef MICROPY_PY_ARRAY_SLICE_ASSIGN
 #define MICROPY_PY_ARRAY_SLICE_ASSIGN      (1)
 #endif
diff --git a/ports/nrf/mpconfigdevice_nrf52840.h b/ports/nrf/mpconfigdevice_nrf52840.h
index cc7bcbe9b42c8..fa9258f2ac03c 100644
--- a/ports/nrf/mpconfigdevice_nrf52840.h
+++ b/ports/nrf/mpconfigdevice_nrf52840.h
@@ -36,6 +36,10 @@
 
 // Board overridable feature configuration.
 
+#ifndef MICROPY_ENABLE_SOURCE_LINE
+#define MICROPY_ENABLE_SOURCE_LINE         (1)
+#endif
+
 #ifndef MICROPY_PY_ARRAY_SLICE_ASSIGN
 #define MICROPY_PY_ARRAY_SLICE_ASSIGN      (1)
 #endif
diff --git a/ports/nrf/mpconfigdevice_nrf9160.h b/ports/nrf/mpconfigdevice_nrf9160.h
index cc7bcbe9b42c8..fa9258f2ac03c 100644
--- a/ports/nrf/mpconfigdevice_nrf9160.h
+++ b/ports/nrf/mpconfigdevice_nrf9160.h
@@ -36,6 +36,10 @@
 
 // Board overridable feature configuration.
 
+#ifndef MICROPY_ENABLE_SOURCE_LINE
+#define MICROPY_ENABLE_SOURCE_LINE         (1)
+#endif
+
 #ifndef MICROPY_PY_ARRAY_SLICE_ASSIGN
 #define MICROPY_PY_ARRAY_SLICE_ASSIGN      (1)
 #endif
diff --git a/ports/nrf/mpconfigport.h b/ports/nrf/mpconfigport.h
index 480368aaa1b4f..af77ef69ca1e9 100644
--- a/ports/nrf/mpconfigport.h
+++ b/ports/nrf/mpconfigport.h
@@ -55,7 +55,6 @@
 #define MICROPY_REPL_EMACS_KEYS     (0)
 #define MICROPY_REPL_AUTO_INDENT    (1)
 #define MICROPY_KBD_EXCEPTION       (1)
-#define MICROPY_ENABLE_SOURCE_LINE  (0)
 #define MICROPY_LONGINT_IMPL        (MICROPY_LONGINT_IMPL_MPZ)
 #if NRF51
 #define MICROPY_FLOAT_IMPL          (MICROPY_FLOAT_IMPL_NONE)

From 3835f5f597a002149d85423dcc72371e8d8bbcc5 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 10 Aug 2021 00:18:46 +1000
Subject: [PATCH 1177/3533] esp32/makeimg.py: Get bootloader and partition
 offset from sdkconfig.

So that it works on ESP32C3, which has the bootloader at 0x0.

Fixes issue #7565.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/Makefile   |  1 +
 ports/esp32/makeimg.py | 48 +++++++++++++++++++++++++++++++++---------
 2 files changed, 39 insertions(+), 10 deletions(-)

diff --git a/ports/esp32/Makefile b/ports/esp32/Makefile
index 5065221635a8e..403b698a32335 100644
--- a/ports/esp32/Makefile
+++ b/ports/esp32/Makefile
@@ -33,6 +33,7 @@ endif
 all:
 	idf.py $(IDFPY_FLAGS) build
 	@$(PYTHON) makeimg.py \
+		$(BUILD)/sdkconfig \
 		$(BUILD)/bootloader/bootloader.bin \
 		$(BUILD)/partition_table/partition-table.bin \
     		$(BUILD)/micropython.bin \
diff --git a/ports/esp32/makeimg.py b/ports/esp32/makeimg.py
index fd0458318896a..0646ce372c531 100644
--- a/ports/esp32/makeimg.py
+++ b/ports/esp32/makeimg.py
@@ -6,8 +6,17 @@
 
 import gen_esp32part
 
-OFFSET_BOOTLOADER = 0x1000
-OFFSET_PARTITIONS = 0x8000
+OFFSET_BOOTLOADER_DEFAULT = 0x1000
+OFFSET_PARTITIONS_DEFAULT = 0x8000
+
+
+def load_sdkconfig_hex_value(filename, value, default):
+    value = "CONFIG_" + value + "="
+    with open(filename, "r") as f:
+        for line in f:
+            if line.startswith(value):
+                return int(line.split("=", 1)[1], 16)
+    return default
 
 
 def load_partition_table(filename):
@@ -15,28 +24,47 @@ def load_partition_table(filename):
         return gen_esp32part.PartitionTable.from_binary(f.read())
 
 
-partition_table = load_partition_table(sys.argv[2])
+# Extract command-line arguments.
+arg_sdkconfig = sys.argv[1]
+arg_bootloader_bin = sys.argv[2]
+arg_partitions_bin = sys.argv[3]
+arg_application_bin = sys.argv[4]
+arg_output_bin = sys.argv[5]
+
+# Load required sdkconfig values.
+offset_bootloader = load_sdkconfig_hex_value(
+    arg_sdkconfig, "BOOTLOADER_OFFSET_IN_FLASH", OFFSET_BOOTLOADER_DEFAULT
+)
+offset_partitions = load_sdkconfig_hex_value(
+    arg_sdkconfig, "PARTITION_TABLE_OFFSET", OFFSET_PARTITIONS_DEFAULT
+)
+
+# Load the partition table.
+partition_table = load_partition_table(arg_partitions_bin)
 
-max_size_bootloader = OFFSET_PARTITIONS - OFFSET_BOOTLOADER
+max_size_bootloader = offset_partitions - offset_bootloader
 max_size_partitions = 0
 offset_application = 0
 max_size_application = 0
 
+# Inspect the partition table to find offsets and maximum sizes.
 for part in partition_table:
     if part.name == "nvs":
-        max_size_partitions = part.offset - OFFSET_PARTITIONS
+        max_size_partitions = part.offset - offset_partitions
     elif part.type == gen_esp32part.APP_TYPE and offset_application == 0:
         offset_application = part.offset
         max_size_application = part.size
 
+# Define the input files, their location and maximum size.
 files_in = [
-    ("bootloader", OFFSET_BOOTLOADER, max_size_bootloader, sys.argv[1]),
-    ("partitions", OFFSET_PARTITIONS, max_size_partitions, sys.argv[2]),
-    ("application", offset_application, max_size_application, sys.argv[3]),
+    ("bootloader", offset_bootloader, max_size_bootloader, arg_bootloader_bin),
+    ("partitions", offset_partitions, max_size_partitions, arg_partitions_bin),
+    ("application", offset_application, max_size_application, arg_application_bin),
 ]
-file_out = sys.argv[4]
+file_out = arg_output_bin
 
-cur_offset = OFFSET_BOOTLOADER
+# Write output file with combined firmware.
+cur_offset = offset_bootloader
 with open(file_out, "wb") as fout:
     for name, offset, max_size, file_in in files_in:
         assert offset >= cur_offset

From 23531bca74b593890e0a3049eb08f8db043f8dc1 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Sat, 7 Aug 2021 13:24:14 +0200
Subject: [PATCH 1178/3533] rp2/CMakeLists.txt: Allow a board's cmake to set
 the manifest path.

This allows boards to add frozen modules, or bypass the port manifest
entirely.
---
 ports/rp2/CMakeLists.txt | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ports/rp2/CMakeLists.txt b/ports/rp2/CMakeLists.txt
index 3dea793ef9cf2..34fabbc8bdd6d 100644
--- a/ports/rp2/CMakeLists.txt
+++ b/ports/rp2/CMakeLists.txt
@@ -163,7 +163,9 @@ set(PICO_SDK_COMPONENTS
 
 # Define mpy-cross flags and frozen manifest
 set(MICROPY_CROSS_FLAGS -march=armv7m)
-set(MICROPY_FROZEN_MANIFEST ${PROJECT_SOURCE_DIR}/boards/manifest.py)
+if (NOT MICROPY_FROZEN_MANIFEST)
+    set(MICROPY_FROZEN_MANIFEST ${PROJECT_SOURCE_DIR}/boards/manifest.py)
+endif()
 
 target_sources(${MICROPY_TARGET} PRIVATE
     ${MICROPY_SOURCE_PY}

From a0cd18c1a5cdd9031c8a6dec27fd03419aac0096 Mon Sep 17 00:00:00 2001
From: Ned Konz <ned@bike-nomad.com>
Date: Fri, 6 Aug 2021 13:13:20 -0700
Subject: [PATCH 1179/3533] stm32/boards/NUCLEO_H743ZI2: Add modified version
 of NUCLEO_H743ZI.

This commit creates a new stm32 board for the NUCLEO_H743ZI2, which is the
current version of this from ST.  This is a modified copy of the
NUCLEO_H743ZI board, and the ZI2 board differs in a few minor ways:

- LED2 has moved from PB7 to PE1 and is now yellow rather than blue
- the USB power enable has moved from PG6 to PG10
- the USER button is now pulled down
---
 ports/stm32/boards/NUCLEO_H743ZI/board_init.c |   5 +-
 .../stm32/boards/NUCLEO_H743ZI2/board_init.c  |   1 +
 .../boards/NUCLEO_H743ZI2/mpconfigboard.h     |  25 ++++
 .../boards/NUCLEO_H743ZI2/mpconfigboard.mk    |   1 +
 ports/stm32/boards/NUCLEO_H743ZI2/pins.csv    | 130 ++++++++++++++++++
 .../NUCLEO_H743ZI2/stm32h7xx_hal_conf.h       |   1 +
 6 files changed, 160 insertions(+), 3 deletions(-)
 create mode 100644 ports/stm32/boards/NUCLEO_H743ZI2/board_init.c
 create mode 100644 ports/stm32/boards/NUCLEO_H743ZI2/mpconfigboard.h
 create mode 100644 ports/stm32/boards/NUCLEO_H743ZI2/mpconfigboard.mk
 create mode 100644 ports/stm32/boards/NUCLEO_H743ZI2/pins.csv
 create mode 100644 ports/stm32/boards/NUCLEO_H743ZI2/stm32h7xx_hal_conf.h

diff --git a/ports/stm32/boards/NUCLEO_H743ZI/board_init.c b/ports/stm32/boards/NUCLEO_H743ZI/board_init.c
index 04149c37b8a39..40f3730cc2141 100644
--- a/ports/stm32/boards/NUCLEO_H743ZI/board_init.c
+++ b/ports/stm32/boards/NUCLEO_H743ZI/board_init.c
@@ -2,7 +2,6 @@
 
 void NUCLEO_H743ZI_board_early_init(void) {
     // Turn off the USB switch
-    #define USB_PowerSwitchOn pin_G6
-    mp_hal_pin_output(USB_PowerSwitchOn);
-    mp_hal_pin_low(USB_PowerSwitchOn);
+    mp_hal_pin_output(pyb_pin_OTG_FS_POWER);
+    mp_hal_pin_low(pyb_pin_OTG_FS_POWER);
 }
diff --git a/ports/stm32/boards/NUCLEO_H743ZI2/board_init.c b/ports/stm32/boards/NUCLEO_H743ZI2/board_init.c
new file mode 100644
index 0000000000000..04caaaca9e4fa
--- /dev/null
+++ b/ports/stm32/boards/NUCLEO_H743ZI2/board_init.c
@@ -0,0 +1 @@
+#include "boards/NUCLEO_H743ZI/board_init.c"
diff --git a/ports/stm32/boards/NUCLEO_H743ZI2/mpconfigboard.h b/ports/stm32/boards/NUCLEO_H743ZI2/mpconfigboard.h
new file mode 100644
index 0000000000000..22060277de97e
--- /dev/null
+++ b/ports/stm32/boards/NUCLEO_H743ZI2/mpconfigboard.h
@@ -0,0 +1,25 @@
+#include "boards/NUCLEO_H743ZI/mpconfigboard.h"
+
+#undef MICROPY_HW_BOARD_NAME
+#define MICROPY_HW_BOARD_NAME       "NUCLEO_H743ZI2"
+
+// The board has an external 32kHz crystal attached
+#undef MICROPY_HW_RTC_USE_LSE
+#define MICROPY_HW_RTC_USE_LSE      (1)
+
+// There is no external HS crystal.
+// JP1 STLNK_RST will disable the incoming 8MHz clock
+// since it is derived from the STLINK's MCO output
+#undef MICROPY_HW_CLK_USE_BYPASS
+#define MICROPY_HW_CLK_USE_BYPASS   (1)
+
+#undef MICROPY_HW_LED2
+#define MICROPY_HW_LED2             (pin_E1)    // yellow
+
+// only when mboot is used
+// Define the user button for entering mboot
+#if defined(USE_MBOOT)
+#define MBOOT_BOOTPIN_PIN (pin_C13)
+#define MBOOT_BOOTPIN_PULL (MP_HAL_PIN_PULL_DOWN)
+#define MBOOT_BOOTPIN_ACTIVE (1)
+#endif
diff --git a/ports/stm32/boards/NUCLEO_H743ZI2/mpconfigboard.mk b/ports/stm32/boards/NUCLEO_H743ZI2/mpconfigboard.mk
new file mode 100644
index 0000000000000..e49a4d0d61580
--- /dev/null
+++ b/ports/stm32/boards/NUCLEO_H743ZI2/mpconfigboard.mk
@@ -0,0 +1 @@
+include boards/NUCLEO_H743ZI/mpconfigboard.mk
diff --git a/ports/stm32/boards/NUCLEO_H743ZI2/pins.csv b/ports/stm32/boards/NUCLEO_H743ZI2/pins.csv
new file mode 100644
index 0000000000000..450d6e432ae3f
--- /dev/null
+++ b/ports/stm32/boards/NUCLEO_H743ZI2/pins.csv
@@ -0,0 +1,130 @@
+A0,PA3
+A1,PC0
+A2,PC3
+A3,PB1
+A4,PC2
+A5,PF10
+A6,PF4
+A7,PF5
+A8,PF6
+D0,PB7
+D1,PB6
+D2,PG14
+D3,PE13
+D4,PE14
+D5,PE11
+D6,PE9
+D7,PG12
+D8,PF3
+D9,PD15
+D10,PD14
+D11,PB5
+D12,PA6
+D13,PA7
+D14,PB9
+D15,PB8
+D16,PC6
+D17,PB15
+D18,PB13
+D19,PB12
+D20,PA15
+D21,PC7
+D22,PB5
+D23,PB3
+D24,PA4
+D25,PB4
+D26,PG6
+D27,PB2
+D28,PD13
+D29,PD12
+D30,PD11
+D31,PE2
+D32,PA0
+D33,PB0
+D34,PE0
+D35,PB11
+D36,PB10
+D37,PE15
+D38,PE6
+D39,PE12
+D40,PE10
+D41,PE7
+D42,PE8
+D43,PC8
+D44,PC9
+D45,PC10
+D46,PC11
+D47,PC12
+D48,PD2
+D49,PG2
+D50,PG3
+D51,PD7
+D52,PD6
+D53,PD5
+D54,PD4
+D55,PD3
+D56,PE2
+D57,PE4
+D58,PE5
+D59,PE6
+D60,PE3
+D61,PF8
+D62,PF7
+D63,PF9
+D64,PG1
+D65,PG0
+D66,PD1
+D67,PD0
+D68,PF0
+D69,PF1
+D70,PF2
+D71,PE9
+D72,PB2
+DAC1,PA4
+DAC2,PA5
+LED1,PB0
+LED2,PE1
+LED3,PB14
+SW,PC13
+I2C1_SDA,PB9
+I2C1_SCL,PB8
+I2C2_SDA,PF0
+I2C2_SCL,PF1
+I2C4_SCL,PF14
+I2C4_SDA,PF15
+SD_D0,PC8
+SD_D1,PC9
+SD_D2,PC10
+SD_D3,PC11
+SD_CMD,PD2
+SD_CK,PC12
+SD_SW,PG2
+OTG_FS_POWER,PD10
+OTG_FS_OVER_CURRENT,PG7
+USB_VBUS,PA9
+USB_ID,PA10
+USB_DM,PA11
+USB_DP,PA12
+UART2_TX,PD5
+UART2_RX,PD6
+UART2_RTS,PD4
+UART2_CTS,PD3
+UART3_TX,PD8
+UART3_RX,PD9
+UART5_TX,PB6
+UART5_RX,PB12
+UART6_TX,PC6
+UART6_RX,PC7
+UART7_TX,PF7
+UART7_RX,PF6
+UART8_TX,PE1
+UART8_RX,PE0
+ETH_MDC,PC1
+ETH_MDIO,PA2
+ETH_RMII_REF_CLK,PA1
+ETH_RMII_CRS_DV,PA7
+ETH_RMII_RXD0,PC4
+ETH_RMII_RXD1,PC5
+ETH_RMII_TX_EN,PG11
+ETH_RMII_TXD0,PG13
+ETH_RMII_TXD1,PB13
diff --git a/ports/stm32/boards/NUCLEO_H743ZI2/stm32h7xx_hal_conf.h b/ports/stm32/boards/NUCLEO_H743ZI2/stm32h7xx_hal_conf.h
new file mode 100644
index 0000000000000..61f202e6298b1
--- /dev/null
+++ b/ports/stm32/boards/NUCLEO_H743ZI2/stm32h7xx_hal_conf.h
@@ -0,0 +1 @@
+#include "boards/NUCLEO_H743ZI/stm32h7xx_hal_conf.h"

From 42d1a1635cc35fd3a9ae28b19685184fc3c23f1e Mon Sep 17 00:00:00 2001
From: Ned Konz <ned@bike-nomad.com>
Date: Fri, 6 Aug 2021 07:28:38 -0700
Subject: [PATCH 1180/3533] stm32/mbedtls: Fix compile warning about
 uninitialized val.

---
 ports/stm32/mbedtls/mbedtls_port.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/stm32/mbedtls/mbedtls_port.c b/ports/stm32/mbedtls/mbedtls_port.c
index efb8d2c2a43ae..c31eb744aea3a 100644
--- a/ports/stm32/mbedtls/mbedtls_port.c
+++ b/ports/stm32/mbedtls/mbedtls_port.c
@@ -80,7 +80,7 @@ void m_free_mbedtls(void *ptr_in) {
 }
 
 int mbedtls_hardware_poll(void *data, unsigned char *output, size_t len, size_t *olen) {
-    uint32_t val;
+    uint32_t val = 0;
     int n = 0;
     *olen = len;
     while (len--) {

From 333e16521bc8af8a55f362c1bad2f21c4704d20b Mon Sep 17 00:00:00 2001
From: Julia Hathaway <julia.hathaway@nxp.com>
Date: Mon, 2 Aug 2021 17:01:57 -0500
Subject: [PATCH 1181/3533] docs/zephyr: Add quick reference for the Zephyr
 port.

Includes an introduction to using the Zephyr port on MicroPython.  The
quickref details examples of how to use each module the port currently
supports.  The tutorial provides additional details for Zephyr specific
modules.

Signed-off-by: Julia Hathaway <julia.hathaway@nxp.com>
---
 docs/index.rst                   |   1 +
 docs/zephyr/general.rst          |  22 +++++
 docs/zephyr/quickref.rst         | 157 +++++++++++++++++++++++++++++++
 docs/zephyr/tutorial/index.rst   |  16 ++++
 docs/zephyr/tutorial/intro.rst   |  30 ++++++
 docs/zephyr/tutorial/pins.rst    |  46 +++++++++
 docs/zephyr/tutorial/repl.rst    |  75 +++++++++++++++
 docs/zephyr/tutorial/storage.rst |  56 +++++++++++
 8 files changed, 403 insertions(+)
 create mode 100644 docs/zephyr/general.rst
 create mode 100644 docs/zephyr/quickref.rst
 create mode 100644 docs/zephyr/tutorial/index.rst
 create mode 100644 docs/zephyr/tutorial/intro.rst
 create mode 100644 docs/zephyr/tutorial/pins.rst
 create mode 100644 docs/zephyr/tutorial/repl.rst
 create mode 100644 docs/zephyr/tutorial/storage.rst

diff --git a/docs/index.rst b/docs/index.rst
index 58552daf51523..a97bff1c8408b 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -14,3 +14,4 @@ MicroPython documentation and references
     rp2/quickref.rst
     wipy/quickref.rst
     unix/quickref.rst
+    zephyr/quickref.rst
diff --git a/docs/zephyr/general.rst b/docs/zephyr/general.rst
new file mode 100644
index 0000000000000..362f03ada0604
--- /dev/null
+++ b/docs/zephyr/general.rst
@@ -0,0 +1,22 @@
+.. _zephyr_general:
+
+General information about the Zephyr port
+=========================================
+
+The Zephyr Project is a Linux Foundation hosted Collaboration Project. It’s an open
+source collaborative effort uniting developers and users in building a
+small, scalable, real-time operating system (RTOS) optimized for resource-constrained
+devices, across multiple architectures.
+
+Multitude of boards
+-------------------
+
+There is a multitude of modules and boards from different sources that are supported
+by the Zephyr OS. All boards supported by Zephyr (with standard level of features
+support, like UART console) should work with MicroPython (but not all were tested).
+The FRDM-K64f board is taken as a reference board for the port for this documentation.
+If you have another board, please make sure you have a datasheet, schematics and other
+reference materials for your board handy to look up various aspects of your board
+functioning.
+
+For a full list of Zephyr supported boards click `here (external link) <https://docs.zephyrproject.org/latest/boards/index.html#boards>`_
diff --git a/docs/zephyr/quickref.rst b/docs/zephyr/quickref.rst
new file mode 100644
index 0000000000000..783621316c703
--- /dev/null
+++ b/docs/zephyr/quickref.rst
@@ -0,0 +1,157 @@
+.. _zephyr_quickref:
+
+Quick reference for the Zephyr port
+===================================
+
+Below is a quick reference for the Zephyr port. If it is your first time working with this port please consider reading the following sections first:
+
+.. toctree::
+   :maxdepth: 1
+
+   general.rst
+   tutorial/index.rst
+
+Running MicroPython
+-------------------
+
+See the corresponding section of the tutorial: :ref:`intro`.
+
+Delay and timing
+----------------
+
+Use the :mod:`time <utime>` module::
+
+    import time
+
+    time.sleep(1)               # sleep for 1 second
+    time.sleep_ms(500)          # sleep for 500 milliseconds
+    time.sleep_us(10)           # sleep for 10 microseconds
+    start = time.ticks_ms()     # get millisecond counter
+    delta = time.ticks_diff(time.ticks_ms(), start) # compute time difference
+
+Pins and GPIO
+-------------
+
+Use the :ref:`machine.Pin <machine.Pin>` class::
+
+    from machine import Pin
+
+    pin = Pin(("GPIO_1", 21), Pin.IN)   # create input pin on GPIO1
+    print(pin)                          # print pin port and number
+
+    pin.init(Pin.OUT, Pin.PULL_UP, value=1)     # reinitialize pin
+
+    pin.value(1)                        # set pin to high
+    pin.value(0)                        # set pin to low
+
+    pin.on()                            # set pin to high
+    pin.off()                           # set pin to low
+
+    pin = Pin(("GPIO_1", 21), Pin.IN)   # create input pin on GPIO1
+
+    pin = Pin(("GPIO_1", 21), Pin.OUT, value=1)         # set pin high on creation
+
+    pin = Pin(("GPIO_1", 21), Pin.IN, Pin.PULL_UP)      # enable internal pull-up resistor
+
+    switch = Pin(("GPIO_2", 6), Pin.IN)                 # create input pin for a switch
+    switch.irq(lambda t: print("SW2 changed"))          # enable an interrupt when switch state is changed
+
+Hardware I2C bus
+----------------
+
+Hardware I2C is accessed via the :ref:`machine.I2C <machine.I2C>` class::
+
+    from machine import I2C
+
+    i2c = I2C("I2C_0")          # construct an i2c bus
+    print(i2c)                  # print device name
+
+    i2c.scan()                  # scan the device for available I2C slaves
+
+    i2c.readfrom(0x1D, 4)                # read 4 bytes from slave 0x1D
+    i2c.readfrom_mem(0x1D, 0x0D, 1)      # read 1 byte from slave 0x1D at slave memory 0x0D
+
+    i2c.writeto(0x1D, b'abcd')           # write to slave with address 0x1D
+    i2c.writeto_mem(0x1D, 0x0D, b'ab')   # write to slave 0x1D at slave memory 0x0D
+
+    buf = bytearray(8)                  # create buffer of size 8
+    i2c.writeto(0x1D, b'abcd')          # write buf to slave 0x1D
+
+Hardware SPI bus
+----------------
+
+Hardware SPI is accessed via the :ref:`machine.SPI <machine.SPI>` class::
+
+    from machine import SPI
+
+    spi = SPI("SPI_0")          # construct a spi bus with default configuration
+    spi.init(baudrate=100000, polarity=0, phase=0, bits=8, firstbit=SPI.MSB) # set configuration
+
+    # equivalently, construct spi bus and set configuration at the same time
+    spi = SPI("SPI_0", baudrate=100000, polarity=0, phase=0, bits=8, firstbit=SPI.MSB)
+    print(spi)                  # print device name and bus configuration
+
+    spi.read(4)                 # read 4 bytes on MISO
+    spi.read(4, write=0xF)      # read 4 bytes while writing 0xF on MOSI
+
+    buf = bytearray(8)          # create a buffer of size 8
+    spi.readinto(buf)           # read into the buffer (reads number of bytes equal to the buffer size)
+    spi.readinto(buf, 0xF)      # read into the buffer while writing 0xF on MOSI
+
+    spi.write(b'abcd')          # write 4 bytes on MOSI
+
+    buf = bytearray(4)                  # create buffer of size 8
+    spi.write_readinto(b'abcd', buf)    # write to MOSI and read from MISO into the buffer
+    spi.write_readinto(buf, buf)        # write buf to MOSI and read back into the buf
+
+Disk Access
+-----------
+
+Use the :ref:`zephyr.DiskAccess <zephyr.DiskAccess>` class to support filesystem::
+
+    import os
+    from zephyr import DiskAccess
+
+    block_dev = DiskAccess('SDHC')      # create a block device object for an SD card
+    os.VfsFat.mkfs(block_dev)           # create FAT filesystem object using the disk storage block
+    os.mount(block_dev, '/sd')          # mount the filesystem at the SD card subdirectory
+
+    # with the filesystem mounted, files can be manipulated as normal
+    with open('/sd/hello.txt','w') as f:     # open a new file in the directory
+        f.write('Hello world')                  # write to the file
+    print(open('/sd/hello.txt').read())      # print contents of the file
+
+Flash Area
+----------
+
+Use the :ref:`zephyr.FlashArea <zephyr.FlashArea>` class to support filesystem::
+
+    import os
+    from zephyr import FlashArea
+
+    block_dev = FlashArea(4, 4096)      # creates a block device object in the frdm-k64f flash scratch partition
+    os.VfsLfs2.mkfs(block_dev)          # create filesystem in lfs2 format using the flash block device
+    os.mount(block_dev, '/flash')       # mount the filesystem at the flash subdirectory
+
+    # with the filesystem mounted, files can be manipulated as normal
+    with open('/flash/hello.txt','w') as f:     # open a new file in the directory
+        f.write('Hello world')                  # write to the file
+    print(open('/flash/hello.txt').read())      # print contents of the file
+
+Sensor
+------
+
+Use the :ref:`zsensor.Sensor <zsensor.Sensor>` class to access sensor data::
+
+    import zsensor
+    from zsensor import Sensor
+
+    accel = Sensor("FXOX8700")    # create sensor object for the accelerometer
+
+    accel.measure()               # obtain a measurement reading from the accelerometer
+
+    # each of these prints the value taken by measure()
+    accel.float(zsensor.ACCEL_X)  # print measurement value for accelerometer X-axis sensor channel as float
+    accel.millis(zsensor.ACCEL_Y) # print measurement value for accelerometer Y-axis sensor channel in millionths
+    accel.micro(zsensor.ACCEL_Z)  # print measurement value for accelerometer Z-axis sensor channel in thousandths
+    accel.int(zsensor.ACCEL_X)    # print measurement integer value only for accelerometer X-axis sensor channel
diff --git a/docs/zephyr/tutorial/index.rst b/docs/zephyr/tutorial/index.rst
new file mode 100644
index 0000000000000..218156b3b0900
--- /dev/null
+++ b/docs/zephyr/tutorial/index.rst
@@ -0,0 +1,16 @@
+.. _zephyr_tutorial:
+
+MicroPython tutorial for the Zephyr port
+========================================
+
+This tutorial is intended to get you started with the Zephyr port.
+
+.. toctree::
+   :maxdepth: 1
+   :numbered:
+
+   intro.rst
+   repl.rst
+   storage.rst
+   pins.rst
+
diff --git a/docs/zephyr/tutorial/intro.rst b/docs/zephyr/tutorial/intro.rst
new file mode 100644
index 0000000000000..ffdbea8b399e9
--- /dev/null
+++ b/docs/zephyr/tutorial/intro.rst
@@ -0,0 +1,30 @@
+.. _intro_zephyr:
+
+Getting started with MicroPython on the Zephyr port
+===================================================
+
+Let’s get started!
+
+Requirements
+------------
+
+To use the MicroPython Zephyr port, you will need a Zephyr supported board (for a list of acceptable
+boards see :ref:`zephyr_general`).
+
+Powering up
+-----------
+
+If your board has a USB connector on it then most likely it is powered
+through this when connected to your PC. Otherwise you will need to power
+it directly. Please refer to the documentation for your board for
+further details.
+
+Getting and deploying the firmware
+----------------------------------
+
+The first step you will need to do is either clone the `MicroPython repository <https://github.com/micropython/micropython.git>`_
+or download it from the `MicroPython downloads page <http://micropython.org/download>`_. If you are an end user of MicroPython,
+it is recommended to start with the stable firmware builds. If you would like to work on development, you may follow the daily
+builds on git.
+
+Next, follow the Zephyr port readme document (``ports/zephyr/README.md``) to build and run the application on your board.
diff --git a/docs/zephyr/tutorial/pins.rst b/docs/zephyr/tutorial/pins.rst
new file mode 100644
index 0000000000000..8e1d6602af8c0
--- /dev/null
+++ b/docs/zephyr/tutorial/pins.rst
@@ -0,0 +1,46 @@
+.. _pins_zephyr:
+
+GPIO Pins
+=========
+
+Use :ref:`machine.Pin <machine.Pin>` to control I/O pins.
+
+For Zephyr, pins are initialized using a tuple of port and pin number ``(\"GPIO_x\", pin#)``
+for the ``id`` value. For example to initialize a pin for the red LED on a FRDM-k64 board::
+
+        LED = Pin(("GPIO_1", 22), Pin.OUT)
+
+Reference your board's datasheet or Zephyr documentation for pin numbers, see below for more examples.
+
+.. list-table:: Pin Formatting
+   :header-rows: 1
+
+   * - Board
+     - Pin
+     - Format
+   * - frdm_k64f
+     - Red LED = PTB22
+     - ("GPIO_1", 22)
+   * - 96b_carbon
+     - LED1 = PD2
+     - ("GPIOD", 2)
+   * - mimxrt685_evk_cm33
+     - Green LED = PIO0_14
+     - ("GPIO0", 14)
+
+Interrupts
+----------
+
+The Zephyr port also supports interrupt handling for Pins using `machine.Pin.irq() <machine.Pin.irq>`.
+To respond to Pin change IRQs run::
+
+    from machine import Pin
+
+    SW2 = Pin(("GPIO_2", 6), Pin.IN)            # create Pin object for switch 2
+    SW3 = Pin(("GPIO_0", 4), Pin.IN)            # create Pin object for switch 3
+
+    SW2.irq(lambda t: print("SW2 changed"))     # print message when SW2 state is changed (triggers change IRQ)
+    SW3.irq(lambda t: print("SW3 changed"))     # print message when SW3 state is changed (triggers change IRQ)
+
+    while True:                                 # wait
+        pass
diff --git a/docs/zephyr/tutorial/repl.rst b/docs/zephyr/tutorial/repl.rst
new file mode 100644
index 0000000000000..a7e8955d0b615
--- /dev/null
+++ b/docs/zephyr/tutorial/repl.rst
@@ -0,0 +1,75 @@
+Getting a MicroPython REPL prompt
+=================================
+
+REPL stands for Read Evaluate Print Loop, and is the name given to the
+interactive MicroPython prompt that you can access on your board through
+Zephyr. It is recommended to use REPL to test out your code and run commands.
+
+REPL over the serial port
+-------------------------
+
+The REPL is available on a UART serial peripheral specified for the board by
+the ``zephyr,console`` devicetree node. The baudrate of the REPL is 115200.
+If your board has a USB-serial convertor on it then you should be able to access
+the REPL directly from your PC.
+
+To access the prompt over USB-serial you will need to use a terminal emulator
+program. For a Linux or Mac machine, open a terminal and run::
+
+        screen /dev/ttyACM0 115200
+
+You can also try ``picocom`` or ``minicom`` instead of screen. You may have to use
+``/dev/ttyACM1`` or a higher number for ``ttyACM``. Additional permissions
+may be necessary to access this device (eg group ``uucp`` or ``dialout``, or use sudo).
+For Windows, get a terminal software, such as puTTY and connect via a serial session
+using the proper COM port.
+
+Using the REPL
+--------------
+
+With your serial program open (PuTTY, screen, picocom, etc) you may see a
+blank screen with a flashing cursor. Press Enter (or reset the board) and
+you should be presented with the following text::
+
+        *** Booting Zephyr OS build v2.6.0-rc1-416-g3056c5ec30ad  ***
+        MicroPython v2.6.0-rc1-416-g3056c5ec30 on 2021-06-24; zephyr-frdm_k64f with mk64f12
+        Type "help()" for more information.
+        >>>
+
+Now you can try running MicroPython code directly on your board.
+
+Anything you type at the prompt, indicated by ``>>>``, will be executed after you press
+the Enter key. If there is an error with the text that you enter then an error
+message is printed.
+
+Start by typing the following at the prompt to make sure it is working::
+
+        >>> print("hello world!")
+        hello world!
+
+If you already know some python you can now try some basic commands here. For
+example::
+
+        >>> 1 + 2
+        3
+        >>> 1 / 2
+        0.5
+        >>> 3 * 'Zephyr'
+        ZephyrZephyrZephyr
+
+If your board has an LED, you can blink it using the following code::
+
+        >>>import time
+        >>>from machine import Pin
+
+        >>>LED = Pin(("GPIO_1", 21), Pin.OUT)
+        >>>while True:
+        ...    LED.value(1)
+        ...    time.sleep(0.5)
+        ...    LED.value(0)
+        ...    time.sleep(0.5)
+
+The above code uses an LED location for a FRDM-K64F board (port B, pin 21;
+following Zephyr conventions ports are identified by "GPIO_x", where *x*
+starts from 0). You will need to adjust it for another board using the board's
+reference materials.
diff --git a/docs/zephyr/tutorial/storage.rst b/docs/zephyr/tutorial/storage.rst
new file mode 100644
index 0000000000000..f57a08fc40b90
--- /dev/null
+++ b/docs/zephyr/tutorial/storage.rst
@@ -0,0 +1,56 @@
+.. _storage_zephyr:
+
+Filesystems and Storage
+=======================
+
+Storage modules support virtual filesystem with FAT and littlefs formats, backed by either
+Zephyr DiskAccess or FlashArea (flash map) APIs depending on which the board supports.
+
+See `uos Filesystem Mounting <https://docs.micropython.org/en/latest/library/uos.html?highlight=os#filesystem-mounting>`_.
+
+Disk Access
+-----------
+
+The :ref:`zephyr.DiskAccess <zephyr.DiskAccess>` class can be used to access storage devices, such as SD cards.
+This class uses `Zephyr Disk Access API <https://docs.zephyrproject.org/latest/reference/storage/disk/access.html>`_ and
+implements the `uos.AbstractBlockDev` protocol.
+
+For use with SD card controllers, SD cards must be present at boot & not removed; they will
+be auto detected and initialized by filesystem at boot. Use the disk driver interface and a
+file system to access SD cards via disk access (see below).
+
+Example usage of FatFS with an SD card on the mimxrt1050_evk board::
+
+    import os
+    from zephyr import DiskAccess
+    bdev = zephyr.DiskAccess('SDHC')        # create block device object using DiskAccess
+    os.VfsFat.mkfs(bdev)                    # create FAT filesystem object using the disk storage block
+    os.mount(bdev, '/sd')                   # mount the filesystem at the SD card subdirectory
+    with open('/sd/hello.txt','w') as f:    # open a new file in the directory
+        f.write('Hello world')              # write to the file
+    print(open('/sd/hello.txt').read())     # print contents of the file
+
+
+Flash Area
+----------
+
+The :ref:`zephyr.FlashArea <zephyr.FlashArea>` class can be used to implement a low-level storage system or
+customize filesystem configurations. To store persistent data on the device, using a higher-level filesystem
+API is recommended (see below).
+
+This class uses `Zephyr Flash map API <https://docs.zephyrproject.org/latest/reference/storage/flash_map/flash_map.html#>`_ and
+implements the `uos.AbstractBlockDev` protocol.
+
+Example usage with the internal flash on the reel_board or the rv32m1_vega_ri5cy board::
+
+    import os
+    from zephyr import FlashArea
+    bdev = FlashArea(FlashArea.STORAGE, 4096)   # create block device object using FlashArea
+    os.VfsLfs2.mkfs(bdev)                       # create Little filesystem object using the flash area block
+    os.mount(bdev, '/flash')                    # mount the filesystem at the flash storage subdirectory
+    with open('/flash/hello.txt','w') as f:     # open a new file in the directory
+        f.write('Hello world')                  # write to the file
+    print(open('/flash/hello.txt').read())      # print contents of the file
+
+For boards such as the frdm_k64f in which the MicroPython application spills into the default flash storage
+partition, use the scratch partition by replacing ``FlashArea.STORAGE`` with the integer value 4.

From 6ed69906257ee59d6533dc06ddfa02db5f4fbce3 Mon Sep 17 00:00:00 2001
From: Julia Hathaway <julia.hathaway@nxp.com>
Date: Mon, 2 Aug 2021 17:08:00 -0500
Subject: [PATCH 1182/3533] docs/library/zephyr: Add libraries specific to the
 Zephyr port.

Includes documentation for Zephyr specific modules (zephyr and zsensor),
classes (DiskAccess and FlashArea), and functions.

Signed-off-by: Julia Hathaway <julia.hathaway@nxp.com>
---
 docs/library/index.rst             |  10 +++
 docs/library/zephyr.DiskAccess.rst |  38 +++++++++
 docs/library/zephyr.FlashArea.rst  |  40 ++++++++++
 docs/library/zephyr.rst            |  60 ++++++++++++++
 docs/library/zephyr.zsensor.rst    | 123 +++++++++++++++++++++++++++++
 5 files changed, 271 insertions(+)
 create mode 100644 docs/library/zephyr.DiskAccess.rst
 create mode 100644 docs/library/zephyr.FlashArea.rst
 create mode 100644 docs/library/zephyr.rst
 create mode 100644 docs/library/zephyr.zsensor.rst

diff --git a/docs/library/index.rst b/docs/library/index.rst
index 2536e8dc96d04..5fd4a8f77e7cb 100644
--- a/docs/library/index.rst
+++ b/docs/library/index.rst
@@ -176,3 +176,13 @@ The following libraries are specific to the RP2040, as used in the Raspberry Pi
   :maxdepth: 2
 
   rp2.rst
+
+Libraries specific to Zephyr
+----------------------------
+
+The following libraries are specific to the Zephyr port.
+
+.. toctree::
+  :maxdepth: 2
+
+  zephyr.rst
diff --git a/docs/library/zephyr.DiskAccess.rst b/docs/library/zephyr.DiskAccess.rst
new file mode 100644
index 0000000000000..d19d81a962e23
--- /dev/null
+++ b/docs/library/zephyr.DiskAccess.rst
@@ -0,0 +1,38 @@
+.. currentmodule:: zephyr
+.. _zephyr.DiskAccess:
+
+class DiskAccess -- access to disk storage
+==========================================
+
+Uses `Zephyr Disk Access API <https://docs.zephyrproject.org/latest/reference/storage/disk/access.html>`_.
+
+This class allows access to storage devices on the board, such as support for SD card controllers and
+interfacing with SD cards via SPI. Disk devices are automatically detected and initialized on boot using
+Zephyr devicetree data.
+
+The Zephyr disk access class enables the transfer of data between a disk device and an accessible memory buffer given a disk name,
+buffer, starting disk block, and number of sectors to read. MicroPython reads as many blocks as necessary to fill the buffer, so
+the number of sectors to read is found by dividing the buffer length by block size of the disk.
+
+Constructors
+------------
+
+.. class:: DiskAccess(disk_name)
+
+   Gets an object for accessing disk memory of the specific disk.
+   For accessing an SD card on the mimxrt1050_evk, ``disk_name`` would be ``SDHC``. See board documentation and
+   devicetree for usable disk names for your board (ex. RT boards use style USDHC#).
+
+Methods
+-------
+
+.. method:: DiskAccess.readblocks(block_num, buf)
+            DiskAccess.readblocks(block_num, buf, offset)
+.. method:: DiskAccess.writeblocks(block_num, buf)
+            DiskAccess.writeblocks(block_num, buf, offset)
+.. method:: DiskAccess.ioctl(cmd, arg)
+
+    These methods implement the simple and extended
+    :ref:`block protocol <block-device-interface>` defined by
+    :class:`uos.AbstractBlockDev`.
+
diff --git a/docs/library/zephyr.FlashArea.rst b/docs/library/zephyr.FlashArea.rst
new file mode 100644
index 0000000000000..306347d449eab
--- /dev/null
+++ b/docs/library/zephyr.FlashArea.rst
@@ -0,0 +1,40 @@
+.. currentmodule:: zephyr
+.. _zephyr.FlashArea:
+
+class FlashArea -- access to built-in flash storage
+===================================================
+
+Uses `Zephyr flash map API <https://docs.zephyrproject.org/latest/reference/storage/flash_map/flash_map.html#flash-map>`_.
+
+This class allows access to device flash partition data.
+Flash area structs consist of a globally unique ID number, the name of the flash device the partition is in,
+the start offset (expressed in relation to the flash memory beginning address per partition),
+and the size of the partition that the device represents. For fixed flash partitions, data from the device
+tree is used; however, fixed flash partitioning is not enforced in MicroPython because MCUBoot is not enabled.
+
+Constructors
+------------
+
+.. class:: FlashArea(id, block_size)
+
+   Gets an object for accessing flash memory at partition specified by ``id`` and with block size of ``block_size``.
+
+   ``id`` values are integers correlating to fixed flash partitions defined in the devicetree.
+   A commonly used partition is the designated flash storage area defined as ``FlashArea.STORAGE`` if
+   ``FLASH_AREA_LABEL_EXISTS(storage)`` returns true at boot.
+   Zephyr devicetree fixed flash partitions are ``boot_partition``, ``slot0_partition``, ``slot1_partition``, and
+   ``scratch_partition``. Because MCUBoot is not enabled by default for MicroPython, these fixed partitions can be accessed by
+   ID integer values 1, 2, 3, and 4, respectively.
+
+Methods
+-------
+
+.. method:: FlashArea.readblocks(block_num, buf)
+            FlashArea.readblocks(block_num, buf, offset)
+.. method:: FlashArea.writeblocks(block_num, buf)
+            FlashArea.writeblocks(block_num, buf, offset)
+.. method:: FlashArea.ioctl(cmd, arg)
+
+    These methods implement the simple and extended
+    :ref:`block protocol <block-device-interface>` defined by
+    :class:`uos.AbstractBlockDev`.
diff --git a/docs/library/zephyr.rst b/docs/library/zephyr.rst
new file mode 100644
index 0000000000000..da3d14a093ecf
--- /dev/null
+++ b/docs/library/zephyr.rst
@@ -0,0 +1,60 @@
+.. currentmodule:: zephyr
+
+:mod:`zephyr` --- functionality specific to the Zephyr port
+===========================================================
+
+.. module:: zephyr
+    :synopsis: functionality specific to Zephyr
+
+The ``zephyr`` module contains functions and classes specific to the Zephyr port.
+
+Functions
+---------
+
+.. function:: is_preempt_thread()
+
+   Returns true if the current thread is a preemptible thread.
+
+   Zephyr preemptible threads are those with non-negative priority values (low priority levels), which therefore,
+   can be supplanted as soon as a higher or equal priority thread becomes ready.
+
+.. function:: current_tid()
+
+   Returns the thread id of the current thread, which is used to reference the thread.
+
+.. function:: thread_analyze()
+
+   Runs the Zephyr debug thread analyzer on the current thread and prints stack size statistics in the format:
+
+    "``thread_name``-20s: STACK: unused ``available_stack_space`` usage ``stack_space_used``
+    / ``stack_size`` (``percent_stack_space_used`` %); CPU: ``cpu_utilization`` %"
+
+    * *CPU utilization is only printed if runtime statistics are configured via the ``CONFIG_THREAD_RUNTIME_STATS`` kconfig*
+
+   This function can only be accessed if ``CONFIG_THREAD_ANALYZER`` is configured for the port in ``zephyr/prj.conf``.
+   For more infomation, see documentation for Zephyr `thread analyzer
+   <https://docs.zephyrproject.org/latest/guides/debug_tools/thread-analyzer.html#thread-analyzer>`_.
+
+.. function:: shell_exec(cmd_in)
+
+   Executes the given command on an UART backend. This function can only be accessed if ``CONFIG_SHELL_BACKEND_SERIAL``
+   is configured for the port in ``zephyr/prj.conf``.
+
+   A list of possible commands can be found in the documentation for Zephyr `shell commands <https://docs.zephyrproject.org/latest/reference/shell/index.html?highlight=shell_execute_cmd#commands>`_.
+
+Classes
+-------
+
+.. toctree::
+    :maxdepth: 1
+
+    zephyr.DiskAccess.rst
+    zephyr.FlashArea.rst
+
+Additional Modules
+------------------
+
+.. toctree::
+    :maxdepth: 1
+
+    zephyr.zsensor.rst
diff --git a/docs/library/zephyr.zsensor.rst b/docs/library/zephyr.zsensor.rst
new file mode 100644
index 0000000000000..4eadc926dc1a4
--- /dev/null
+++ b/docs/library/zephyr.zsensor.rst
@@ -0,0 +1,123 @@
+.. currentmodule:: zsensor
+
+:mod:`zsensor` --- Zephyr sensor bindings
+=========================================
+
+.. module:: zsensor
+    :synopsis: zephyr sensor bindings
+
+The ``zsensor`` module contains a class for using sensors with Zephyr.
+
+.. _zsensor.Sensor:
+
+class Sensor --- sensor control for the Zephyr port
+---------------------------------------------------
+
+Use this class to access data from sensors on your board.
+See Zephyr documentation for sensor usage here: `Sensors
+<https://docs.zephyrproject.org/latest/reference/peripherals/sensor.html?highlight=sensor#sensors>`_.
+
+Sensors are defined in the Zephyr devicetree for each board. The quantities that a given sensor can
+measure are called a sensor channels. Sensors can have multiple channels to represent different axes
+of one property or different properties a sensor can measure. See `Channels`_ below for defined sensor
+channels.
+
+Constructor
+~~~~~~~~~~~
+
+.. class:: Sensor(device_name)
+
+    Device names are defined in the devicetree for your board.
+    For example, the device name for the accelerometer in the FRDM-k64f board is "FXOS8700".
+
+Methods
+~~~~~~~
+
+.. method:: Sensor.measure()
+
+    Obtains a measurement sample from the sensor device using Zephyr sensor_sample_fetch and
+    stores it in an internal driver buffer as a useful value, a pair of (integer part of value,
+    fractional part of value in 1-millionths).
+    Returns none if successful or OSError value if failure.
+
+.. method:: Sensor.get_float(sensor_channel)
+
+    Returns the value of the sensor measurement sample as a float.
+
+.. method:: Sensor.get_micros(sensor_channel)
+
+    Returns the value of the sensor measurement sample in millionths.
+    (Ex. value of ``(1, 500000)`` returns as ``1500000``)
+
+.. method:: Sensor.get_millis(sensor_channel)
+
+    Returns the value of sensor measurement sample in thousandths.
+    (Ex. value of ``(1, 500000)`` returns as ``1500``)
+
+.. method:: Sensor.get_int(sensor_channel)
+
+    Returns only the integer value of the measurement sample.
+    (Ex. value of ``(1, 500000)`` returns as ``1``)
+
+Channels
+~~~~~~~~
+
+.. data:: ACCEL_X
+
+    Acceleration on the X axis, in m/s^2.
+
+.. data:: ACCEL_Y
+
+    Acceleration on the Y axis, in m/s^2.
+
+.. data:: ACCEL_Z
+
+    Acceleration on the Z axis, in m/s^2.
+
+.. data:: GYRO_X
+
+    Angular velocity around the X axis, in radians/s.
+
+.. data:: GYRO_Y
+
+    Angular velocity around the Y axis, in radians/s.
+
+.. data:: GYRO_Z
+
+    Angular velocity around the Z axis, in radians/s.
+
+.. data:: MAGN_X
+
+    Magnetic field on the X axis, in Gauss.
+
+.. data:: MAGN_Y
+
+    Magnetic field on the Y axis, in Gauss.
+
+.. data:: MAGN_Z
+
+    Magnetic field on the Z axis, in Gauss.
+
+.. data:: DIE_TEMP
+
+    Device die temperature in degrees Celsius.
+
+.. data:: PRESS
+
+    Pressure in kilopascal.
+
+.. data:: PROX
+
+    Proximity. Dimensionless. A value of 1 indicates that an object is close.
+
+.. data:: HUMIDITY
+
+    Humidity, in percent.
+
+.. data:: LIGHT
+
+    Illuminance in visible spectrum, in lux.
+
+.. data:: ALTITUDE
+
+    Altitude, in meters.

From 671f012306e0942cbe59fcd43e25e67c289da351 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 13 Aug 2021 20:12:07 +1000
Subject: [PATCH 1183/3533] docs/templates: Add unix and zephyr quickref links
 to top-index.

Signed-off-by: Damien George <damien@micropython.org>
---
 docs/templates/topindex.html | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/docs/templates/topindex.html b/docs/templates/topindex.html
index 42233942bc236..c14f840cebd86 100644
--- a/docs/templates/topindex.html
+++ b/docs/templates/topindex.html
@@ -66,6 +66,14 @@ <h1>MicroPython documentation</h1>
         <a class="biglink" href="{{ pathto("wipy/quickref") }}">Quick reference for the WiPy/CC3200</a><br/>
         <span class="linkdescr">pinout for the WiPy/CC3200, snippets of useful code, and a tutorial</span>
       </p>
+      <p class="biglink">
+        <a class="biglink" href="{{ pathto("unix/quickref") }}">Quick reference for UNIX and Windows</a><br/>
+        <span class="linkdescr">command-line reference</span>
+      </p>
+      <p class="biglink">
+        <a class="biglink" href="{{ pathto("zephyr/quickref") }}">Quick reference for the Zephyr port</a><br/>
+        <span class="linkdescr">snippets of useful code and a tutorial</span>
+      </p>
     </td>
   </tr></table>
 

From 218606351c6f9688a3f90dad791bcb2109adcf1b Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Thu, 12 Aug 2021 13:56:13 +1000
Subject: [PATCH 1184/3533] docs: Rename ufoo.rst to foo.rst.

This is a simple rename of the files, no content changes
(other than updating index.rst to use the new paths)

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 docs/library/{uarray.rst => array.rst}        |  0
 docs/library/{ubinascii.rst => binascii.rst}  |  0
 .../library/{ubluetooth.rst => bluetooth.rst} |  0
 .../{ucollections.rst => collections.rst}     |  0
 .../library/{ucryptolib.rst => cryptolib.rst} |  0
 docs/library/{uerrno.rst => errno.rst}        |  0
 docs/library/{uhashlib.rst => hashlib.rst}    |  0
 docs/library/{uheapq.rst => heapq.rst}        |  0
 docs/library/index.rst                        | 38 +++++++++----------
 docs/library/{uio.rst => io.rst}              |  0
 docs/library/{ujson.rst => json.rst}          |  0
 docs/library/{uos.rst => os.rst}              |  0
 docs/library/{ure.rst => re.rst}              |  0
 docs/library/{uselect.rst => select.rst}      |  0
 docs/library/{usocket.rst => socket.rst}      |  0
 docs/library/{ussl.rst => ssl.rst}            |  0
 docs/library/{ustruct.rst => struct.rst}      |  0
 docs/library/{usys.rst => sys.rst}            |  0
 docs/library/{utime.rst => time.rst}          |  0
 docs/library/{uzlib.rst => zlib.rst}          |  0
 20 files changed, 19 insertions(+), 19 deletions(-)
 rename docs/library/{uarray.rst => array.rst} (100%)
 rename docs/library/{ubinascii.rst => binascii.rst} (100%)
 rename docs/library/{ubluetooth.rst => bluetooth.rst} (100%)
 rename docs/library/{ucollections.rst => collections.rst} (100%)
 rename docs/library/{ucryptolib.rst => cryptolib.rst} (100%)
 rename docs/library/{uerrno.rst => errno.rst} (100%)
 rename docs/library/{uhashlib.rst => hashlib.rst} (100%)
 rename docs/library/{uheapq.rst => heapq.rst} (100%)
 rename docs/library/{uio.rst => io.rst} (100%)
 rename docs/library/{ujson.rst => json.rst} (100%)
 rename docs/library/{uos.rst => os.rst} (100%)
 rename docs/library/{ure.rst => re.rst} (100%)
 rename docs/library/{uselect.rst => select.rst} (100%)
 rename docs/library/{usocket.rst => socket.rst} (100%)
 rename docs/library/{ussl.rst => ssl.rst} (100%)
 rename docs/library/{ustruct.rst => struct.rst} (100%)
 rename docs/library/{usys.rst => sys.rst} (100%)
 rename docs/library/{utime.rst => time.rst} (100%)
 rename docs/library/{uzlib.rst => zlib.rst} (100%)

diff --git a/docs/library/uarray.rst b/docs/library/array.rst
similarity index 100%
rename from docs/library/uarray.rst
rename to docs/library/array.rst
diff --git a/docs/library/ubinascii.rst b/docs/library/binascii.rst
similarity index 100%
rename from docs/library/ubinascii.rst
rename to docs/library/binascii.rst
diff --git a/docs/library/ubluetooth.rst b/docs/library/bluetooth.rst
similarity index 100%
rename from docs/library/ubluetooth.rst
rename to docs/library/bluetooth.rst
diff --git a/docs/library/ucollections.rst b/docs/library/collections.rst
similarity index 100%
rename from docs/library/ucollections.rst
rename to docs/library/collections.rst
diff --git a/docs/library/ucryptolib.rst b/docs/library/cryptolib.rst
similarity index 100%
rename from docs/library/ucryptolib.rst
rename to docs/library/cryptolib.rst
diff --git a/docs/library/uerrno.rst b/docs/library/errno.rst
similarity index 100%
rename from docs/library/uerrno.rst
rename to docs/library/errno.rst
diff --git a/docs/library/uhashlib.rst b/docs/library/hashlib.rst
similarity index 100%
rename from docs/library/uhashlib.rst
rename to docs/library/hashlib.rst
diff --git a/docs/library/uheapq.rst b/docs/library/heapq.rst
similarity index 100%
rename from docs/library/uheapq.rst
rename to docs/library/heapq.rst
diff --git a/docs/library/index.rst b/docs/library/index.rst
index 5fd4a8f77e7cb..638941fa5e257 100644
--- a/docs/library/index.rst
+++ b/docs/library/index.rst
@@ -73,28 +73,28 @@ it will fallback to loading the built-in ``ujson`` module.
 .. toctree::
    :maxdepth: 1
 
+   array.rst
+   binascii.rst
    builtins.rst
    cmath.rst
+   collections.rst
+   errno.rst
    gc.rst
+   hashlib.rst
+   heapq.rst
+   io.rst
+   json.rst
    math.rst
-   uarray.rst
+   os.rst
+   re.rst
+   select.rst
+   socket.rst
+   ssl.rst
+   struct.rst
+   sys.rst
+   time.rst
    uasyncio.rst
-   ubinascii.rst
-   ucollections.rst
-   uerrno.rst
-   uhashlib.rst
-   uheapq.rst
-   uio.rst
-   ujson.rst
-   uos.rst
-   ure.rst
-   uselect.rst
-   usocket.rst
-   ussl.rst
-   ustruct.rst
-   usys.rst
-   utime.rst
-   uzlib.rst
+   zlib.rst
    _thread.rst
 
 
@@ -107,13 +107,13 @@ the following libraries.
 .. toctree::
    :maxdepth: 1
 
+   bluetooth.rst
    btree.rst
+   cryptolib.rst
    framebuf.rst
    machine.rst
    micropython.rst
    network.rst
-   ubluetooth.rst
-   ucryptolib.rst
    uctypes.rst
 
 
diff --git a/docs/library/uio.rst b/docs/library/io.rst
similarity index 100%
rename from docs/library/uio.rst
rename to docs/library/io.rst
diff --git a/docs/library/ujson.rst b/docs/library/json.rst
similarity index 100%
rename from docs/library/ujson.rst
rename to docs/library/json.rst
diff --git a/docs/library/uos.rst b/docs/library/os.rst
similarity index 100%
rename from docs/library/uos.rst
rename to docs/library/os.rst
diff --git a/docs/library/ure.rst b/docs/library/re.rst
similarity index 100%
rename from docs/library/ure.rst
rename to docs/library/re.rst
diff --git a/docs/library/uselect.rst b/docs/library/select.rst
similarity index 100%
rename from docs/library/uselect.rst
rename to docs/library/select.rst
diff --git a/docs/library/usocket.rst b/docs/library/socket.rst
similarity index 100%
rename from docs/library/usocket.rst
rename to docs/library/socket.rst
diff --git a/docs/library/ussl.rst b/docs/library/ssl.rst
similarity index 100%
rename from docs/library/ussl.rst
rename to docs/library/ssl.rst
diff --git a/docs/library/ustruct.rst b/docs/library/struct.rst
similarity index 100%
rename from docs/library/ustruct.rst
rename to docs/library/struct.rst
diff --git a/docs/library/usys.rst b/docs/library/sys.rst
similarity index 100%
rename from docs/library/usys.rst
rename to docs/library/sys.rst
diff --git a/docs/library/utime.rst b/docs/library/time.rst
similarity index 100%
rename from docs/library/utime.rst
rename to docs/library/time.rst
diff --git a/docs/library/uzlib.rst b/docs/library/zlib.rst
similarity index 100%
rename from docs/library/uzlib.rst
rename to docs/library/zlib.rst

From c737cde9472741337be0c0a66e8e99695c6a9b14 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Thu, 12 Aug 2021 13:59:29 +1000
Subject: [PATCH 1185/3533] docs: Replace ufoo with foo in all docs.

Anywhere a module is mentioned, use its "non-u" name for consistency.

The "import module" vs "import umodule" is something of a FAQ, and this
commit intends to help clear that up.  As a first approximation MicroPython
is Python, and so imports should work the same as Python and use the same
name, to a first approximation.  The u-version of a module is a detail that
can be learned later on, when the user wants to understand more and have
finer control over importing.

Existing Python code should just work, as much as it is possible to do that
within the constraints of embedded systems, and the MicroPython
documentation should match the idiomatic way to write Python code.

With universal weak links for modules (via MICROPY_MODULE_WEAK_LINKS) users
can consistently use "import foo" across all ports (with the exception of
the minimal ports).  And the ability to override/extend via "foo.py"
continues to work well.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 docs/develop/library.rst         |  2 +-
 docs/develop/porting.rst         |  4 +--
 docs/esp32/quickref.rst          | 12 ++++----
 docs/esp8266/general.rst         |  4 +--
 docs/esp8266/quickref.rst        | 12 ++++----
 docs/library/array.rst           |  6 ++--
 docs/library/binascii.rst        |  6 ++--
 docs/library/bluetooth.rst       | 10 +++----
 docs/library/btree.rst           |  2 +-
 docs/library/collections.rst     | 10 +++----
 docs/library/cryptolib.rst       | 12 ++++----
 docs/library/errno.rst           | 12 ++++----
 docs/library/esp32.rst           |  2 +-
 docs/library/hashlib.rst         | 14 +++++-----
 docs/library/heapq.rst           |  6 ++--
 docs/library/index.rst           |  4 +--
 docs/library/io.rst              |  6 ++--
 docs/library/json.rst            |  6 ++--
 docs/library/machine.SDCard.rst  |  4 +--
 docs/library/network.WLAN.rst    |  2 +-
 docs/library/network.rst         | 10 +++----
 docs/library/os.rst              | 14 +++++-----
 docs/library/pyb.Flash.rst       |  2 +-
 docs/library/pyb.rst             |  4 +--
 docs/library/re.rst              | 14 +++++-----
 docs/library/rp2.Flash.rst       |  2 +-
 docs/library/select.rst          | 18 ++++++------
 docs/library/socket.rst          | 48 ++++++++++++++++----------------
 docs/library/ssl.rst             | 20 ++++++-------
 docs/library/struct.rst          |  6 ++--
 docs/library/sys.rst             | 14 +++++-----
 docs/library/time.rst            | 10 +++----
 docs/library/uctypes.rst         |  2 +-
 docs/library/zlib.rst            |  6 ++--
 docs/pyboard/quickref.rst        |  2 +-
 docs/reference/constrained.rst   |  6 ++--
 docs/reference/filesystem.rst    | 12 ++++----
 docs/reference/glossary.rst      |  2 +-
 docs/reference/speed_python.rst  |  6 ++--
 docs/rp2/quickref.rst            |  2 +-
 docs/wipy/general.rst            |  8 +++---
 docs/zephyr/tutorial/storage.rst |  6 ++--
 42 files changed, 175 insertions(+), 175 deletions(-)

diff --git a/docs/develop/library.rst b/docs/develop/library.rst
index bebddcc8a3605..47ea2dc8d2431 100644
--- a/docs/develop/library.rst
+++ b/docs/develop/library.rst
@@ -34,7 +34,7 @@ An example is the ``gc`` module discussed in :ref:`memorymanagement`.
    >>> gc.enable()
    >>>
 
-MicroPython has several other builtin standard/core modules like ``io``, ``uarray`` etc.
+MicroPython has several other builtin standard/core modules like ``io``, ``array`` etc.
 Adding a new core module involves several modifications.
 
 First, create the ``C`` file in the ``py/`` directory. In this example we are adding a
diff --git a/docs/develop/porting.rst b/docs/develop/porting.rst
index 08f3557f1835d..549227d76267c 100644
--- a/docs/develop/porting.rst
+++ b/docs/develop/porting.rst
@@ -245,8 +245,8 @@ That should give a MicroPython REPL.  You can then run commands like:
 .. code-block:: bash
 
    MicroPython v1.13 on 2021-01-01; example-board with unknown-cpu
-   >>> import usys
-   >>> usys.implementation
+   >>> import sys
+   >>> sys.implementation
    ('micropython', (1, 13, 0))
    >>>
 
diff --git a/docs/esp32/quickref.rst b/docs/esp32/quickref.rst
index 56c3721148207..3153ebd57130f 100644
--- a/docs/esp32/quickref.rst
+++ b/docs/esp32/quickref.rst
@@ -98,7 +98,7 @@ A useful function for connecting to your local WiFi network is::
                 pass
         print('network config:', wlan.ifconfig())
 
-Once the network is established the :mod:`socket <usocket>` module can be used
+Once the network is established the :mod:`socket <socket>` module can be used
 to create and use TCP/UDP sockets as usual, and the ``urequests`` module for
 convenient HTTP requests.
 
@@ -113,7 +113,7 @@ to reconnect forever).
 Delay and timing
 ----------------
 
-Use the :mod:`time <utime>` module::
+Use the :mod:`time <time>` module::
 
     import time
 
@@ -459,15 +459,15 @@ SD card
 
 See :ref:`machine.SDCard <machine.SDCard>`. ::
 
-    import machine, uos
+    import machine, os
 
     # Slot 2 uses pins sck=18, cs=5, miso=19, mosi=23
     sd = machine.SDCard(slot=2)
-    uos.mount(sd, "/sd")  # mount
+    os.mount(sd, "/sd")  # mount
 
-    uos.listdir('/sd')    # list directory contents
+    os.listdir('/sd')    # list directory contents
 
-    uos.umount('/sd')     # eject
+    os.umount('/sd')     # eject
 
 RMT
 ---
diff --git a/docs/esp8266/general.rst b/docs/esp8266/general.rst
index 4999bc2e9bb1a..be0437e752eed 100644
--- a/docs/esp8266/general.rst
+++ b/docs/esp8266/general.rst
@@ -117,7 +117,7 @@ Real-time clock
 
 RTC in ESP8266 has very bad accuracy, drift may be seconds per minute. As
 a workaround, to measure short enough intervals you can use
-``utime.time()``, etc. functions, and for wall clock time, synchronize from
+``time.time()``, etc. functions, and for wall clock time, synchronize from
 the net using included ``ntptime.py`` module.
 
 Due to limitations of the ESP8266 chip the internal real-time clock (RTC)
@@ -203,7 +203,7 @@ limitation with usage of TLS on the low-memory devices:
    communication with other devices.
 
 There are also some not implemented features specifically in MicroPython's
-``ussl`` module based on axTLS:
+``ssl`` module based on axTLS:
 
 6. Certificates are not validated (this makes connections susceptible
    to man-in-the-middle attacks).
diff --git a/docs/esp8266/quickref.rst b/docs/esp8266/quickref.rst
index 72b35966978ee..9e64723b27c74 100644
--- a/docs/esp8266/quickref.rst
+++ b/docs/esp8266/quickref.rst
@@ -78,13 +78,13 @@ A useful function for connecting to your local WiFi network is::
                 pass
         print('network config:', wlan.ifconfig())
 
-Once the network is established the :mod:`socket <usocket>` module can be used
+Once the network is established the :mod:`socket <socket>` module can be used
 to create and use TCP/UDP sockets as usual.
 
 Delay and timing
 ----------------
 
-Use the :mod:`time <utime>` module::
+Use the :mod:`time <time>` module::
 
     import time
 
@@ -171,15 +171,15 @@ attaches the REPL).
 
 To detach the REPL from UART0, use::
 
-    import uos
-    uos.dupterm(None, 1)
+    import os
+    os.dupterm(None, 1)
 
 The REPL is attached by default. If you have detached it, to reattach
 it use::
 
-    import uos, machine
+    import os, machine
     uart = machine.UART(0, 115200)
-    uos.dupterm(uart, 1)
+    os.dupterm(uart, 1)
 
 PWM (pulse width modulation)
 ----------------------------
diff --git a/docs/library/array.rst b/docs/library/array.rst
index 9fa82ff31b5c9..88d6d2263ca6b 100644
--- a/docs/library/array.rst
+++ b/docs/library/array.rst
@@ -1,7 +1,7 @@
-:mod:`uarray` -- arrays of numeric data
-=======================================
+:mod:`array` -- arrays of numeric data
+======================================
 
-.. module:: uarray
+.. module:: array
    :synopsis: efficient arrays of numeric data
 
 |see_cpython_module| :mod:`python:array`.
diff --git a/docs/library/binascii.rst b/docs/library/binascii.rst
index 721b80508e31a..fc621a8abee24 100644
--- a/docs/library/binascii.rst
+++ b/docs/library/binascii.rst
@@ -1,7 +1,7 @@
-:mod:`ubinascii` -- binary/ASCII conversions
-============================================
+:mod:`binascii` -- binary/ASCII conversions
+===========================================
 
-.. module:: ubinascii
+.. module:: binascii
    :synopsis: binary/ASCII conversions
 
 |see_cpython_module| :mod:`python:binascii`.
diff --git a/docs/library/bluetooth.rst b/docs/library/bluetooth.rst
index 3d435a7beda5a..f110bfb19579e 100644
--- a/docs/library/bluetooth.rst
+++ b/docs/library/bluetooth.rst
@@ -1,7 +1,7 @@
-:mod:`ubluetooth` --- low-level Bluetooth
-=========================================
+:mod:`bluetooth` --- low-level Bluetooth
+========================================
 
-.. module:: ubluetooth
+.. module:: bluetooth
    :synopsis: Low-level Bluetooth radio functionality
 
 This module provides an interface to a Bluetooth controller on a board.
@@ -110,7 +110,7 @@ Event Handling
 
     **Note:** As an optimisation to prevent unnecessary allocations, the ``addr``,
     ``adv_data``, ``char_data``, ``notify_data``, and ``uuid`` entries in the
-    tuples are read-only memoryview instances pointing to ubluetooth's internal
+    tuples are read-only memoryview instances pointing to :mod:`bluetooth`'s internal
     ringbuffer, and are only valid during the invocation of the IRQ handler
     function.  If your program needs to save one of these values to access after
     the IRQ handler has returned (e.g. by saving it in a class instance or global
@@ -293,7 +293,7 @@ For the ``_IRQ_PASSKEY_ACTION`` event, the available actions are::
     _PASSKEY_ACTION_NUMERIC_COMPARISON = const(4)
 
 In order to save space in the firmware, these constants are not included on the
-:mod:`ubluetooth` module. Add the ones that you need from the list above to your
+:mod:`bluetooth` module. Add the ones that you need from the list above to your
 program.
 
 
diff --git a/docs/library/btree.rst b/docs/library/btree.rst
index ba910852102d1..c093f970fabaa 100644
--- a/docs/library/btree.rst
+++ b/docs/library/btree.rst
@@ -22,7 +22,7 @@ Example::
 
     # First, we need to open a stream which holds a database
     # This is usually a file, but can be in-memory database
-    # using uio.BytesIO, a raw flash partition, etc.
+    # using io.BytesIO, a raw flash partition, etc.
     # Oftentimes, you want to create a database file if it doesn't
     # exist and open if it exists. Idiom below takes care of this.
     # DO NOT open database with "a+b" access mode.
diff --git a/docs/library/collections.rst b/docs/library/collections.rst
index b833842c1321d..21f06fded71cd 100644
--- a/docs/library/collections.rst
+++ b/docs/library/collections.rst
@@ -1,7 +1,7 @@
-:mod:`ucollections` -- collection and container types
-=====================================================
+:mod:`collections` -- collection and container types
+====================================================
 
-.. module:: ucollections
+.. module:: collections
    :synopsis: collection and container types
 
 |see_cpython_module| :mod:`python:collections`.
@@ -49,7 +49,7 @@ Classes
     a string with space-separated field named (but this is less efficient).
     Example of use::
 
-        from ucollections import namedtuple
+        from collections import namedtuple
 
         MyTuple = namedtuple("MyTuple", ("id", "name"))
         t1 = MyTuple(1, "foo")
@@ -63,7 +63,7 @@ Classes
     added. When ordered dict is iterated over, keys/items are returned in
     the order they were added::
 
-        from ucollections import OrderedDict
+        from collections import OrderedDict
 
         # To make benefit of ordered keys, OrderedDict should be initialized
         # from sequence of (key, value) pairs.
diff --git a/docs/library/cryptolib.rst b/docs/library/cryptolib.rst
index 79471c2e90ccc..e02fb0d22642a 100644
--- a/docs/library/cryptolib.rst
+++ b/docs/library/cryptolib.rst
@@ -1,7 +1,7 @@
-:mod:`ucryptolib` -- cryptographic ciphers
-==========================================
+:mod:`cryptolib` -- cryptographic ciphers
+=========================================
 
-.. module:: ucryptolib
+.. module:: cryptolib
    :synopsis: cryptographic ciphers
 
 Classes
@@ -21,9 +21,9 @@ Classes
             * *key* is an encryption/decryption key (bytes-like).
             * *mode* is:
 
-                * ``1`` (or ``ucryptolib.MODE_ECB`` if it exists) for Electronic Code Book (ECB).
-                * ``2`` (or ``ucryptolib.MODE_CBC`` if it exists) for Cipher Block Chaining (CBC).
-                * ``6`` (or ``ucryptolib.MODE_CTR`` if it exists) for Counter mode (CTR).
+                * ``1`` (or ``cryptolib.MODE_ECB`` if it exists) for Electronic Code Book (ECB).
+                * ``2`` (or ``cryptolib.MODE_CBC`` if it exists) for Cipher Block Chaining (CBC).
+                * ``6`` (or ``cryptolib.MODE_CTR`` if it exists) for Counter mode (CTR).
 
             * *IV* is an initialization vector for CBC mode.
             * For Counter mode, *IV* is the initial value for the counter.
diff --git a/docs/library/errno.rst b/docs/library/errno.rst
index 1d60c80e11c27..82303bfcb4f41 100644
--- a/docs/library/errno.rst
+++ b/docs/library/errno.rst
@@ -1,7 +1,7 @@
-:mod:`uerrno` -- system error codes
-===================================
+:mod:`errno` -- system error codes
+==================================
 
-.. module:: uerrno
+.. module:: errno
    :synopsis: system error codes
 
 |see_cpython_module| :mod:`python:errno`.
@@ -20,9 +20,9 @@ Constants
     where ``exc`` is an instance of `OSError`. Usage example::
 
         try:
-            uos.mkdir("my_dir")
+            os.mkdir("my_dir")
         except OSError as exc:
-            if exc.errno == uerrno.EEXIST:
+            if exc.errno == errno.EEXIST:
                 print("Directory already exists")
 
 .. data:: errorcode
@@ -30,5 +30,5 @@ Constants
     Dictionary mapping numeric error codes to strings with symbolic error
     code (see above)::
 
-        >>> print(uerrno.errorcode[uerrno.EEXIST])
+        >>> print(errno.errorcode[errno.EEXIST])
         EEXIST
diff --git a/docs/library/esp32.rst b/docs/library/esp32.rst
index fc90968037bc4..e3c25d2653db1 100644
--- a/docs/library/esp32.rst
+++ b/docs/library/esp32.rst
@@ -91,7 +91,7 @@ methods to enable over-the-air (OTA) updates.
 
     These methods implement the simple and :ref:`extended
     <block-device-interface>` block protocol defined by
-    :class:`uos.AbstractBlockDev`.
+    :class:`os.AbstractBlockDev`.
 
 .. method:: Partition.set_boot()
 
diff --git a/docs/library/hashlib.rst b/docs/library/hashlib.rst
index e1eddd2b7131f..e5d8dd880bd96 100644
--- a/docs/library/hashlib.rst
+++ b/docs/library/hashlib.rst
@@ -1,7 +1,7 @@
-:mod:`uhashlib` -- hashing algorithms
-=====================================
+:mod:`hashlib` -- hashing algorithms
+====================================
 
-.. module:: uhashlib
+.. module:: hashlib
    :synopsis: hashing algorithms
 
 |see_cpython_module| :mod:`python:hashlib`.
@@ -27,15 +27,15 @@ be implemented:
 Constructors
 ------------
 
-.. class:: uhashlib.sha256([data])
+.. class:: hashlib.sha256([data])
 
     Create an SHA256 hasher object and optionally feed ``data`` into it.
 
-.. class:: uhashlib.sha1([data])
+.. class:: hashlib.sha1([data])
 
     Create an SHA1 hasher object and optionally feed ``data`` into it.
 
-.. class:: uhashlib.md5([data])
+.. class:: hashlib.md5([data])
 
     Create an MD5 hasher object and optionally feed ``data`` into it.
 
@@ -53,5 +53,5 @@ Methods
 
 .. method:: hash.hexdigest()
 
-   This method is NOT implemented. Use ``ubinascii.hexlify(hash.digest())``
+   This method is NOT implemented. Use ``binascii.hexlify(hash.digest())``
    to achieve a similar effect.
diff --git a/docs/library/heapq.rst b/docs/library/heapq.rst
index 9ae1f61a173dd..5e808d544aed7 100644
--- a/docs/library/heapq.rst
+++ b/docs/library/heapq.rst
@@ -1,7 +1,7 @@
-:mod:`uheapq` -- heap queue algorithm
-=====================================
+:mod:`heapq` -- heap queue algorithm
+====================================
 
-.. module:: uheapq
+.. module:: heapq
    :synopsis: heap queue algorithm
 
 |see_cpython_module| :mod:`python:heapq`.
diff --git a/docs/library/index.rst b/docs/library/index.rst
index 638941fa5e257..9af4fec0564b7 100644
--- a/docs/library/index.rst
+++ b/docs/library/index.rst
@@ -56,7 +56,7 @@ The following standard Python libraries have been "micro-ified" to fit in with
 the philosophy of MicroPython.  They provide the core functionality of that
 module and are intended to be a drop-in replacement for the standard Python
 library.  Some modules below use a standard Python name, but prefixed with "u",
-e.g. ``ujson`` instead of ``json``. This is to signify that such a module is
+e.g. ``json`` instead of ``json``. This is to signify that such a module is
 micro-library, i.e. implements only a subset of CPython module functionality.
 By naming them differently, a user has a choice to write a Python-level module
 to extend functionality for better compatibility with CPython (indeed, this is
@@ -68,7 +68,7 @@ are available both by their u-name, and also by their non-u-name.  The
 non-u-name can be overridden by a file of that name in your library path (``sys.path``).
 For example, ``import json`` will first search for a file ``json.py`` (or package
 directory ``json``) and load that module if it is found.  If nothing is found,
-it will fallback to loading the built-in ``ujson`` module.
+it will fallback to loading the built-in ``json`` module.
 
 .. toctree::
    :maxdepth: 1
diff --git a/docs/library/io.rst b/docs/library/io.rst
index adbeef08b7b49..6b4b9f1a476f6 100644
--- a/docs/library/io.rst
+++ b/docs/library/io.rst
@@ -1,7 +1,7 @@
-:mod:`uio` -- input/output streams
-==================================
+:mod:`io` -- input/output streams
+=================================
 
-.. module:: uio
+.. module:: io
    :synopsis: input/output streams
 
 |see_cpython_module| :mod:`python:io`.
diff --git a/docs/library/json.rst b/docs/library/json.rst
index 65ed1867e6e87..f1d6364f4f9c3 100644
--- a/docs/library/json.rst
+++ b/docs/library/json.rst
@@ -1,7 +1,7 @@
-:mod:`ujson` -- JSON encoding and decoding
-==========================================
+:mod:`json` -- JSON encoding and decoding
+=========================================
 
-.. module:: ujson
+.. module:: json
    :synopsis: JSON encoding and decoding
 
 |see_cpython_module| :mod:`python:json`.
diff --git a/docs/library/machine.SDCard.rst b/docs/library/machine.SDCard.rst
index b1cf42ec0285b..96fb5b01c8a81 100644
--- a/docs/library/machine.SDCard.rst
+++ b/docs/library/machine.SDCard.rst
@@ -27,10 +27,10 @@ vary from platform to platform.
 
     This class provides access to SD or MMC storage cards using either
     a dedicated SD/MMC interface hardware or through an SPI channel.
-    The class implements the block protocol defined by :class:`uos.AbstractBlockDev`.
+    The class implements the block protocol defined by :class:`os.AbstractBlockDev`.
     This allows the mounting of an SD card to be as simple as::
 
-      uos.mount(machine.SDCard(), "/sd")
+      os.mount(machine.SDCard(), "/sd")
 
     The constructor takes the following parameters:
 
diff --git a/docs/library/network.WLAN.rst b/docs/library/network.WLAN.rst
index 35e4b798ae0b6..72091d0ea5a0f 100644
--- a/docs/library/network.WLAN.rst
+++ b/docs/library/network.WLAN.rst
@@ -55,7 +55,7 @@ Methods
         (ssid, bssid, channel, RSSI, authmode, hidden)
 
     *bssid* is hardware address of an access point, in binary form, returned as
-    bytes object. You can use `ubinascii.hexlify()` to convert it to ASCII form.
+    bytes object. You can use `binascii.hexlify()` to convert it to ASCII form.
 
     There are five values for authmode:
 
diff --git a/docs/library/network.rst b/docs/library/network.rst
index a20eb2ebf5e0a..c188bb31351a3 100644
--- a/docs/library/network.rst
+++ b/docs/library/network.rst
@@ -9,7 +9,7 @@ This module provides network drivers and routing configuration. To use this
 module, a MicroPython variant/build with network capabilities must be installed.
 Network drivers for specific hardware are available within this module and are
 used to configure hardware network interface(s). Network services provided
-by configured interfaces are then available for use via the :mod:`usocket`
+by configured interfaces are then available for use via the :mod:`socket`
 module.
 
 For example::
@@ -17,17 +17,17 @@ For example::
     # connect/ show IP config a specific network interface
     # see below for examples of specific drivers
     import network
-    import utime
+    import time
     nic = network.Driver(...)
     if not nic.isconnected():
         nic.connect()
         print("Waiting for connection...")
         while not nic.isconnected():
-            utime.sleep(1)
+            time.sleep(1)
     print(nic.ifconfig())
 
-    # now use usocket as usual
-    import usocket as socket
+    # now use socket as usual
+    import socket as socket
     addr = socket.getaddrinfo('micropython.org', 80)[0][-1]
     s = socket.socket()
     s.connect(addr)
diff --git a/docs/library/os.rst b/docs/library/os.rst
index edc94556b1722..a1eae4f245708 100644
--- a/docs/library/os.rst
+++ b/docs/library/os.rst
@@ -1,12 +1,12 @@
-:mod:`uos` -- basic "operating system" services
-===============================================
+:mod:`os` -- basic "operating system" services
+==============================================
 
-.. module:: uos
+.. module:: os
    :synopsis: basic "operating system" services
 
 |see_cpython_module| :mod:`python:os`.
 
-The ``uos`` module contains functions for filesystem access and mounting,
+The ``os`` module contains functions for filesystem access and mounting,
 terminal redirection and duplication, and the ``uname`` and ``urandom``
 functions.
 
@@ -116,7 +116,7 @@ Terminal redirection and duplication
 
    Duplicate or switch the MicroPython terminal (the REPL) on the given `stream`-like
    object. The *stream_object* argument must be a native stream object, or derive
-   from ``uio.IOBase`` and implement the ``readinto()`` and
+   from ``io.IOBase`` and implement the ``readinto()`` and
    ``write()`` methods.  The stream should be in non-blocking mode and
    ``readinto()`` should return ``None`` if there is no data available for reading.
 
@@ -207,7 +207,7 @@ represented by VFS classes.
     otherwise the timestamps will remain untouched.  Littlefs v2 filesystems without
     timestamps will work without reformatting and timestamps will be added
     transparently to existing files once they are opened for writing.  When *mtime*
-    is enabled `uos.stat` on files without timestamps will return 0 for the timestamp.
+    is enabled `os.stat` on files without timestamps will return 0 for the timestamp.
 
     See :ref:`filesystem` for more information.
 
@@ -234,7 +234,7 @@ but an actual block device class must implement the methods described below.
 
 A concrete implementation of this class will usually allow access to the
 memory-like functionality of a piece of hardware (like flash memory). A block
-device can be formatted to any supported filesystem and mounted using ``uos``
+device can be formatted to any supported filesystem and mounted using ``os``
 methods.
 
 See :ref:`filesystem` for example implementations of block devices using the
diff --git a/docs/library/pyb.Flash.rst b/docs/library/pyb.Flash.rst
index 4b0c2ce2aaa2f..01b3a0ac9e0a3 100644
--- a/docs/library/pyb.Flash.rst
+++ b/docs/library/pyb.Flash.rst
@@ -43,7 +43,7 @@ Methods
 
     These methods implement the simple and :ref:`extended
     <block-device-interface>` block protocol defined by
-    :class:`uos.AbstractBlockDev`.
+    :class:`os.AbstractBlockDev`.
 
 Hardware Note
 -------------
diff --git a/docs/library/pyb.rst b/docs/library/pyb.rst
index 321be3c52f2fe..880d68c531f88 100644
--- a/docs/library/pyb.rst
+++ b/docs/library/pyb.rst
@@ -213,11 +213,11 @@ Miscellaneous functions
 .. function:: mount(device, mountpoint, *, readonly=False, mkfs=False)
 
    .. note:: This function is deprecated. Mounting and unmounting devices should
-      be performed by :meth:`uos.mount` and :meth:`uos.umount` instead.
+      be performed by :meth:`os.mount` and :meth:`os.umount` instead.
 
    Mount a block device and make it available as part of the filesystem.
    ``device`` must be an object that provides the block protocol. (The
-   following is also deprecated. See :class:`uos.AbstractBlockDev` for the
+   following is also deprecated. See :class:`os.AbstractBlockDev` for the
    correct way to create a block device.)
 
     - ``readblocks(self, blocknum, buf)``
diff --git a/docs/library/re.rst b/docs/library/re.rst
index e94d286175cef..19b15d2d2c299 100644
--- a/docs/library/re.rst
+++ b/docs/library/re.rst
@@ -1,7 +1,7 @@
-:mod:`ure` -- simple regular expressions
-========================================
+:mod:`re` -- simple regular expressions
+=======================================
 
-.. module:: ure
+.. module:: re
    :synopsis: regular expressions
 
 |see_cpython_module| :mod:`python:re`.
@@ -95,11 +95,11 @@ Supported operators and special sequences are:
 
 Example::
 
-    import ure
+    import re
 
-    # As ure doesn't support escapes itself, use of r"" strings is not
+    # As re doesn't support escapes itself, use of r"" strings is not
     # recommended.
-    regex = ure.compile("[\r\n]")
+    regex = re.compile("[\r\n]")
 
     regex.split("line1\rline2\nline3\r\n")
 
@@ -152,7 +152,7 @@ Regex objects
 -------------
 
 Compiled regular expression. Instances of this class are created using
-`ure.compile()`.
+`re.compile()`.
 
 .. method:: regex.match(string)
             regex.search(string)
diff --git a/docs/library/rp2.Flash.rst b/docs/library/rp2.Flash.rst
index 3b423adfdd894..1e94cf519c844 100644
--- a/docs/library/rp2.Flash.rst
+++ b/docs/library/rp2.Flash.rst
@@ -32,5 +32,5 @@ Methods
 
     These methods implement the simple and extended
     :ref:`block protocol <block-device-interface>` defined by
-    :class:`uos.AbstractBlockDev`.
+    :class:`os.AbstractBlockDev`.
 
diff --git a/docs/library/select.rst b/docs/library/select.rst
index 76202739c87e9..57adbb49afd20 100644
--- a/docs/library/select.rst
+++ b/docs/library/select.rst
@@ -1,7 +1,7 @@
-:mod:`uselect` -- wait for events on a set of streams
-========================================================================
+:mod:`select` -- wait for events on a set of streams
+====================================================
 
-.. module:: uselect
+.. module:: select
    :synopsis: wait for events on a set of streams
 
 |see_cpython_module| :mod:`python:select`.
@@ -35,15 +35,15 @@ Methods
 
    Register `stream` *obj* for polling. *eventmask* is logical OR of:
 
-   * ``uselect.POLLIN``  - data available for reading
-   * ``uselect.POLLOUT`` - more data can be written
+   * ``select.POLLIN``  - data available for reading
+   * ``select.POLLOUT`` - more data can be written
 
-   Note that flags like ``uselect.POLLHUP`` and ``uselect.POLLERR`` are
+   Note that flags like ``select.POLLHUP`` and ``select.POLLERR`` are
    *not* valid as input eventmask (these are unsolicited events which
    will be returned from `poll()` regardless of whether they are asked
    for). This semantics is per POSIX.
 
-   *eventmask* defaults to ``uselect.POLLIN | uselect.POLLOUT``.
+   *eventmask* defaults to ``select.POLLIN | select.POLLOUT``.
 
    It is OK to call this function multiple times for the same *obj*.
    Successive calls will update *obj*'s eventmask to the value of
@@ -67,8 +67,8 @@ Methods
    Returns list of (``obj``, ``event``, ...) tuples. There may be other elements in
    tuple, depending on a platform and version, so don't assume that its size is 2.
    The ``event`` element specifies which events happened with a stream and
-   is a combination of ``uselect.POLL*`` constants described above. Note that
-   flags ``uselect.POLLHUP`` and ``uselect.POLLERR`` can be returned at any time
+   is a combination of ``select.POLL*`` constants described above. Note that
+   flags ``select.POLLHUP`` and ``select.POLLERR`` can be returned at any time
    (even if were not asked for), and must be acted on accordingly (the
    corresponding stream unregistered from poll and likely closed), because
    otherwise all further invocations of `poll()` may return immediately with
diff --git a/docs/library/socket.rst b/docs/library/socket.rst
index 39b848e593d75..704b614ab1c50 100644
--- a/docs/library/socket.rst
+++ b/docs/library/socket.rst
@@ -1,8 +1,8 @@
-*******************************
-:mod:`usocket` -- socket module
-*******************************
+******************************
+:mod:`socket` -- socket module
+******************************
 
-.. module:: usocket
+.. module:: socket
    :synopsis: socket module
 
 |see_cpython_module| :mod:`python:socket`.
@@ -21,13 +21,13 @@ This module provides access to the BSD socket interface.
 Socket address format(s)
 ------------------------
 
-The native socket address format of the ``usocket`` module is an opaque data type
+The native socket address format of the ``socket`` module is an opaque data type
 returned by `getaddrinfo` function, which must be used to resolve textual address
 (including numeric addresses)::
 
-    sockaddr = usocket.getaddrinfo('www.micropython.org', 80)[0][-1]
+    sockaddr = socket.getaddrinfo('www.micropython.org', 80)[0][-1]
     # You must use getaddrinfo() even for numeric addresses
-    sockaddr = usocket.getaddrinfo('127.0.0.1', 80)[0][-1]
+    sockaddr = socket.getaddrinfo('127.0.0.1', 80)[0][-1]
     # Now you can use that address
     sock.connect(addr)
 
@@ -35,7 +35,7 @@ Using `getaddrinfo` is the most efficient (both in terms of memory and processin
 power) and portable way to work with addresses.
 
 However, ``socket`` module (note the difference with native MicroPython
-``usocket`` module described here) provides CPython-compatible way to specify
+``socket`` module described here) provides CPython-compatible way to specify
 addresses using tuples, as described below. Note that depending on a
 :term:`MicroPython port`, ``socket`` module can be builtin or need to be
 installed from `micropython-lib` (as in the case of :term:`MicroPython Unix port`),
@@ -54,13 +54,13 @@ Tuple address format for ``socket`` module:
   dot-notation numeric IPv4 address, e.g. ``"8.8.8.8"``, and *port* is and
   integer port number in the range 1-65535. Note the domain names are not
   accepted as *ipv4_address*, they should be resolved first using
-  `usocket.getaddrinfo()`.
+  `socket.getaddrinfo()`.
 * IPv6: *(ipv6_address, port, flowinfo, scopeid)*, where *ipv6_address*
   is a string with colon-notation numeric IPv6 address, e.g. ``"2001:db8::1"``,
   and *port* is an integer port number in the range 1-65535. *flowinfo*
   must be 0. *scopeid* is the interface scope identifier for link-local
   addresses. Note the domain names are not accepted as *ipv6_address*,
-  they should be resolved first using `usocket.getaddrinfo()`. Availability
+  they should be resolved first using `socket.getaddrinfo()`. Availability
   of IPv6 support depends on a :term:`MicroPython port`.
 
 Functions
@@ -94,17 +94,17 @@ Functions
 
    The following example shows how to connect to a given url::
 
-      s = usocket.socket()
+      s = socket.socket()
       # This assumes that if "type" is not specified, an address for
       # SOCK_STREAM will be returned, which may be not true
-      s.connect(usocket.getaddrinfo('www.micropython.org', 80)[0][-1])
+      s.connect(socket.getaddrinfo('www.micropython.org', 80)[0][-1])
 
    Recommended use of filtering params::
 
-      s = usocket.socket()
+      s = socket.socket()
       # Guaranteed to return an address which can be connect'ed to for
       # stream operation.
-      s.connect(usocket.getaddrinfo('www.micropython.org', 80, 0, SOCK_STREAM)[0][-1])
+      s.connect(socket.getaddrinfo('www.micropython.org', 80, 0, SOCK_STREAM)[0][-1])
 
    .. admonition:: Difference to CPython
       :class: attention
@@ -113,7 +113,7 @@ Functions
       of error in this function. MicroPython doesn't have ``socket.gaierror``
       and raises OSError directly. Note that error numbers of `getaddrinfo()`
       form a separate namespace and may not match error numbers from
-      the :mod:`uerrno` module. To distinguish `getaddrinfo()` errors, they are
+      the :mod:`errno` module. To distinguish `getaddrinfo()` errors, they are
       represented by negative numbers, whereas standard system errors are
       positive numbers (error numbers are accessible using ``e.args[0]`` property
       from an exception object). The use of negative values is a provisional
@@ -124,7 +124,7 @@ Functions
    Convert a binary network address *bin_addr* of the given address family *af*
    to a textual representation::
 
-        >>> usocket.inet_ntop(usocket.AF_INET, b"\x7f\0\0\1")
+        >>> socket.inet_ntop(socket.AF_INET, b"\x7f\0\0\1")
         '127.0.0.1'
 
 .. function:: inet_pton(af, txt_addr)
@@ -132,7 +132,7 @@ Functions
    Convert a textual network address *txt_addr* of the given address family *af*
    to a binary representation::
 
-        >>> usocket.inet_pton(usocket.AF_INET, "1.2.3.4")
+        >>> socket.inet_pton(socket.AF_INET, "1.2.3.4")
         b'\x01\x02\x03\x04'
 
 Constants
@@ -152,17 +152,17 @@ Constants
           IPPROTO_TCP
 
    IP protocol numbers. Availability depends on a particular :term:`MicroPython port`.
-   Note that you don't need to specify these in a call to `usocket.socket()`,
+   Note that you don't need to specify these in a call to `socket.socket()`,
    because `SOCK_STREAM` socket type automatically selects `IPPROTO_TCP`, and
    `SOCK_DGRAM` - `IPPROTO_UDP`. Thus, the only real use of these constants
    is as an argument to `setsockopt()`.
 
-.. data:: usocket.SOL_*
+.. data:: socket.SOL_*
 
    Socket option levels (an argument to `setsockopt()`). The exact
    inventory depends on a :term:`MicroPython port`.
 
-.. data:: usocket.SO_*
+.. data:: socket.SO_*
 
    Socket options (an argument to `setsockopt()`). The exact
    inventory depends on a :term:`MicroPython port`.
@@ -260,7 +260,7 @@ Methods
    is put in blocking mode.
 
    Not every :term:`MicroPython port` supports this method. A more portable and
-   generic solution is to use `uselect.poll` object. This allows to wait on
+   generic solution is to use `select.poll` object. This allows to wait on
    multiple objects at the same time (and not just on sockets, but on generic
    `stream` objects which support polling). Example::
 
@@ -269,8 +269,8 @@ Methods
         s.read(10)  # may timeout
 
         # Use:
-        poller = uselect.poll()
-        poller.register(s, uselect.POLLIN)
+        poller = select.poll()
+        poller.register(s, select.POLLIN)
         res = poller.poll(1000)  # time in milliseconds
         if not res:
             # s is still not ready for input, i.e. operation timed out
@@ -342,7 +342,7 @@ Methods
 
    Return value: number of bytes written.
 
-.. exception:: usocket.error
+.. exception:: socket.error
 
    MicroPython does NOT have this exception.
 
diff --git a/docs/library/ssl.rst b/docs/library/ssl.rst
index 77d278d41df52..4726daa59b4ae 100644
--- a/docs/library/ssl.rst
+++ b/docs/library/ssl.rst
@@ -1,7 +1,7 @@
-:mod:`ussl` -- SSL/TLS module
-=============================
+:mod:`ssl` -- SSL/TLS module
+============================
 
-.. module:: ussl
+.. module:: ssl
    :synopsis: TLS/SSL wrapper for socket objects
 
 |see_cpython_module| :mod:`python:ssl`.
@@ -13,14 +13,14 @@ facilities for network sockets, both client-side and server-side.
 Functions
 ---------
 
-.. function:: ussl.wrap_socket(sock, server_side=False, keyfile=None, certfile=None, cert_reqs=CERT_NONE, ca_certs=None, do_handshake=True)
+.. function:: ssl.wrap_socket(sock, server_side=False, keyfile=None, certfile=None, cert_reqs=CERT_NONE, ca_certs=None, do_handshake=True)
 
-   Takes a `stream` *sock* (usually usocket.socket instance of ``SOCK_STREAM`` type),
+   Takes a `stream` *sock* (usually socket.socket instance of ``SOCK_STREAM`` type),
    and returns an instance of ssl.SSLSocket, which wraps the underlying stream in
    an SSL context. Returned object has the usual `stream` interface methods like
    ``read()``, ``write()``, etc.
    A server-side SSL socket should be created from a normal socket returned from
-   :meth:`~usocket.socket.accept()` on a non-SSL listening server socket.
+   :meth:`~socket.socket.accept()` on a non-SSL listening server socket.
 
    - *do_handshake* determines whether the handshake is done as part of the ``wrap_socket``
      or whether it is deferred to be done as part of the initial reads or writes
@@ -36,7 +36,7 @@ Functions
 
 .. warning::
 
-   Some implementations of ``ussl`` module do NOT validate server certificates,
+   Some implementations of ``ssl`` module do NOT validate server certificates,
    which makes an SSL connection established prone to man-in-the-middle attacks.
 
    CPython's ``wrap_socket`` returns an ``SSLSocket`` object which has methods typical
@@ -54,8 +54,8 @@ Exceptions
 Constants
 ---------
 
-.. data:: ussl.CERT_NONE
-          ussl.CERT_OPTIONAL
-          ussl.CERT_REQUIRED
+.. data:: ssl.CERT_NONE
+          ssl.CERT_OPTIONAL
+          ssl.CERT_REQUIRED
 
     Supported values for *cert_reqs* parameter.
diff --git a/docs/library/struct.rst b/docs/library/struct.rst
index bfcd84e2d8efe..92757aba8d50a 100644
--- a/docs/library/struct.rst
+++ b/docs/library/struct.rst
@@ -1,7 +1,7 @@
-:mod:`ustruct` -- pack and unpack primitive data types
-======================================================
+:mod:`struct` -- pack and unpack primitive data types
+=====================================================
 
-.. module:: ustruct
+.. module:: struct
    :synopsis: pack and unpack primitive data types
 
 |see_cpython_module| :mod:`python:struct`.
diff --git a/docs/library/sys.rst b/docs/library/sys.rst
index 96016438507cf..24f9e353bb006 100644
--- a/docs/library/sys.rst
+++ b/docs/library/sys.rst
@@ -1,7 +1,7 @@
-:mod:`usys` -- system specific functions
-========================================
+:mod:`sys` -- system specific functions
+=======================================
 
-.. module:: usys
+.. module:: sys
    :synopsis: system specific functions
 
 |see_cpython_module| :mod:`python:sys`.
@@ -28,10 +28,10 @@ Functions
       This function is a MicroPython extension intended to provide similar
       functionality to the :mod:`atexit` module in CPython.
 
-.. function:: print_exception(exc, file=usys.stdout, /)
+.. function:: print_exception(exc, file=sys.stdout, /)
 
    Print exception with a traceback to a file-like object *file* (or
-   `usys.stdout` by default).
+   `sys.stdout` by default).
 
    .. admonition:: Difference to CPython
       :class: attention
@@ -84,7 +84,7 @@ Constants
    value directly, but instead count number of bits in it::
 
     bits = 0
-    v = usys.maxsize
+    v = sys.maxsize
     while v:
         bits += 1
         v >>= 1
@@ -113,7 +113,7 @@ Constants
    is an identifier of a board, e.g. ``"pyboard"`` for the original MicroPython
    reference board. It thus can be used to distinguish one board from another.
    If you need to check whether your program runs on MicroPython (vs other
-   Python implementation), use `usys.implementation` instead.
+   Python implementation), use `sys.implementation` instead.
 
 .. data:: stderr
 
diff --git a/docs/library/time.rst b/docs/library/time.rst
index ef2a572aa4f22..6ca172f22128e 100644
--- a/docs/library/time.rst
+++ b/docs/library/time.rst
@@ -1,12 +1,12 @@
-:mod:`utime` -- time related functions
-======================================
+:mod:`time` -- time related functions
+=====================================
 
-.. module:: utime
+.. module:: time
    :synopsis: time related functions
 
 |see_cpython_module| :mod:`python:time`.
 
-The ``utime`` module provides functions for getting the current time and date,
+The ``time`` module provides functions for getting the current time and date,
 measuring time intervals, and for delays.
 
 **Time Epoch**: Unix port uses standard for POSIX systems epoch of
@@ -119,7 +119,7 @@ Functions
    in the system. This is usually CPU clocks, and that's why the function is named that
    way. But it doesn't have to be a CPU clock, some other timing source available in a
    system (e.g. high-resolution timer) can be used instead. The exact timing unit
-   (resolution) of this function is not specified on ``utime`` module level, but
+   (resolution) of this function is not specified on ``time`` module level, but
    documentation for a specific port may provide more specific information. This
    function is intended for very fine benchmarking or very tight real-time loops.
    Avoid using it in portable code.
diff --git a/docs/library/uctypes.rst b/docs/library/uctypes.rst
index b3343beb7e4a8..803ddacdcef5e 100644
--- a/docs/library/uctypes.rst
+++ b/docs/library/uctypes.rst
@@ -19,7 +19,7 @@ sub-fields.
 
 .. seealso::
 
-    Module :mod:`ustruct`
+    Module :mod:`struct`
         Standard Python way to access binary data structures (doesn't scale
         well to large and complex structures).
 
diff --git a/docs/library/zlib.rst b/docs/library/zlib.rst
index d40c46145ace9..96d6c245232ba 100644
--- a/docs/library/zlib.rst
+++ b/docs/library/zlib.rst
@@ -1,7 +1,7 @@
-:mod:`uzlib` -- zlib decompression
-==================================
+:mod:`zlib` -- zlib decompression
+=================================
 
-.. module:: uzlib
+.. module:: zlib
    :synopsis: zlib decompression
 
 |see_cpython_module| :mod:`python:zlib`.
diff --git a/docs/pyboard/quickref.rst b/docs/pyboard/quickref.rst
index 49b67eee425a6..ed56811ddb462 100644
--- a/docs/pyboard/quickref.rst
+++ b/docs/pyboard/quickref.rst
@@ -45,7 +45,7 @@ See :mod:`pyb`. ::
 Delay and timing
 ----------------
 
-Use the :mod:`time <utime>` module::
+Use the :mod:`time <time>` module::
 
     import time
 
diff --git a/docs/reference/constrained.rst b/docs/reference/constrained.rst
index 9c68bab9a13e0..2a5f9d7fdb5a9 100644
--- a/docs/reference/constrained.rst
+++ b/docs/reference/constrained.rst
@@ -122,7 +122,7 @@ execution from Flash, RAM may be saved as follows. The data should be located in
 Python modules and frozen as bytecode. The data must be defined as `bytes`
 objects. The compiler 'knows' that `bytes` objects are immutable and ensures
 that the objects remain in flash memory rather than being copied to RAM. The
-`ustruct` module can assist in converting between `bytes` types and other
+`struct` module can assist in converting between `bytes` types and other
 Python built-in types.
 
 When considering the implications of frozen bytecode, note that in Python
@@ -261,7 +261,7 @@ were a string.
 The Python funcitons `eval` and `exec` invoke the compiler at runtime, which
 requires significant amounts of RAM. Note that the ``pickle`` library from
 `micropython-lib` employs `exec`. It may be more RAM efficient to use the
-`ujson` library for object serialisation.
+`json` library for object serialisation.
 
 **Storing strings in flash**
 
@@ -444,7 +444,7 @@ RAM usage and speed.
 
 Where variables are required whose size is neither a byte nor a machine word
 there are standard libraries which can assist in storing these efficiently and
-in performing conversions. See the `array`, `ustruct` and `uctypes`
+in performing conversions. See the `array`, `struct` and `uctypes`
 modules.
 
 Footnote: gc.collect() return value
diff --git a/docs/reference/filesystem.rst b/docs/reference/filesystem.rst
index 9e7e6212dc679..114e5973503f2 100644
--- a/docs/reference/filesystem.rst
+++ b/docs/reference/filesystem.rst
@@ -40,7 +40,7 @@ Block devices
 -------------
 
 A block device is an instance of a class that implements the
-:class:`uos.AbstractBlockDev` protocol.
+:class:`os.AbstractBlockDev` protocol.
 
 Built-in block devices
 ~~~~~~~~~~~~~~~~~~~~~~
@@ -116,8 +116,8 @@ It can be used as follows::
 
 An example of a block device that supports both the simple and extended
 interface (i.e. both signatures and behaviours of the
-:meth:`uos.AbstractBlockDev.readblocks` and
-:meth:`uos.AbstractBlockDev.writeblocks` methods) is::
+:meth:`os.AbstractBlockDev.readblocks` and
+:meth:`os.AbstractBlockDev.writeblocks` methods) is::
 
     class RAMBlockDev:
         def __init__(self, block_size, num_blocks):
@@ -148,7 +148,7 @@ interface (i.e. both signatures and behaviours of the
                 return 0
 
 As it supports the extended interface, it can be used with :class:`littlefs
-<uos.VfsLfs2>`::
+<os.VfsLfs2>`::
 
     import os
 
@@ -166,8 +166,8 @@ normally would be used from Python code, for example::
 Filesystems
 -----------
 
-MicroPython ports can provide implementations of :class:`FAT <uos.VfsFat>`,
-:class:`littlefs v1 <uos.VfsLfs1>` and :class:`littlefs v2 <uos.VfsLfs2>`.
+MicroPython ports can provide implementations of :class:`FAT <os.VfsFat>`,
+:class:`littlefs v1 <os.VfsLfs1>` and :class:`littlefs v2 <os.VfsLfs2>`.
 
 The following table shows which filesystems are included in the firmware by
 default for given port/board combinations, however they can be optionally
diff --git a/docs/reference/glossary.rst b/docs/reference/glossary.rst
index 27a66aa76c075..da951189e2045 100644
--- a/docs/reference/glossary.rst
+++ b/docs/reference/glossary.rst
@@ -184,7 +184,7 @@ Glossary
         ``close()``, etc. A stream is an important concept in MicroPython;
         many I/O objects implement the stream interface, and thus can be used
         consistently and interchangeably in different contexts. For more
-        information on streams in MicroPython, see the `uio` module.
+        information on streams in MicroPython, see the `io` module.
 
     UART
         Acronym for "Universal Asynchronous Receiver/Transmitter". This is a
diff --git a/docs/reference/speed_python.rst b/docs/reference/speed_python.rst
index aa9777859242f..a563b2d36c821 100644
--- a/docs/reference/speed_python.rst
+++ b/docs/reference/speed_python.rst
@@ -123,7 +123,7 @@ This is a process known as profiling and is covered in textbooks and
 (for standard Python) supported by various software tools. For the type of
 smaller embedded application likely to be running on MicroPython platforms
 the slowest function or method can usually be established by judicious use
-of the timing ``ticks`` group of functions documented in `utime`.
+of the timing ``ticks`` group of functions documented in `time`.
 Code execution time can be measured in ms, us, or CPU cycles.
 
 The following enables any function or method to be timed by adding an
@@ -134,9 +134,9 @@ The following enables any function or method to be timed by adding an
     def timed_function(f, *args, **kwargs):
         myname = str(f).split(' ')[1]
         def new_func(*args, **kwargs):
-            t = utime.ticks_us()
+            t = time.ticks_us()
             result = f(*args, **kwargs)
-            delta = utime.ticks_diff(utime.ticks_us(), t)
+            delta = time.ticks_diff(time.ticks_us(), t)
             print('Function {} Time = {:6.3f}ms'.format(myname, delta/1000))
             return result
         return new_func
diff --git a/docs/rp2/quickref.rst b/docs/rp2/quickref.rst
index 65e98d700b1fa..ac9cdb86cb74d 100644
--- a/docs/rp2/quickref.rst
+++ b/docs/rp2/quickref.rst
@@ -45,7 +45,7 @@ The :mod:`rp2` module::
 Delay and timing
 ----------------
 
-Use the :mod:`time <utime>` module::
+Use the :mod:`time <time>` module::
 
     import time
 
diff --git a/docs/wipy/general.rst b/docs/wipy/general.rst
index b1109c495ad17..7f24435db3b65 100644
--- a/docs/wipy/general.rst
+++ b/docs/wipy/general.rst
@@ -296,8 +296,8 @@ and put it in '/flash/cert/'. Then do::
   ss = ssl.wrap_socket(s, cert_reqs=ssl.CERT_REQUIRED, ca_certs='/flash/cert/ca.pem')
   ss.connect(socket.getaddrinfo('cloud.blynk.cc', 8441)[0][-1])
 
-Incompatibilities in uhashlib module
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Incompatibilities in hashlib module
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Due to hardware implementation details of the WiPy, data must be buffered before being
 digested, which would make it impossible to calculate the hash of big blocks of data that
@@ -310,7 +310,7 @@ initial one) is a multiple of 4 bytes.** The last chunk may be of any length.
 
 Example::
 
-   hash = uhashlib.sha1('abcd1234', 1001)    # length of the initial piece is multiple of 4 bytes
+   hash = hashlib.sha1('abcd1234', 1001)    # length of the initial piece is multiple of 4 bytes
    hash.update('1234')                       # also multiple of 4 bytes
    ...
    hash.update('12345')                      # last chunk may be of any length
@@ -366,7 +366,7 @@ Adhoc VFS-like support
 ~~~~~~~~~~~~~~~~~~~~~~
 
 WiPy doesn't implement full MicroPython VFS support, instead following
-functions are defined in ``uos`` module:
+functions are defined in ``os`` module:
 
 .. function:: mount(block_device, mount_point, \*, readonly=False)
 
diff --git a/docs/zephyr/tutorial/storage.rst b/docs/zephyr/tutorial/storage.rst
index f57a08fc40b90..12bd0d0d351b4 100644
--- a/docs/zephyr/tutorial/storage.rst
+++ b/docs/zephyr/tutorial/storage.rst
@@ -6,14 +6,14 @@ Filesystems and Storage
 Storage modules support virtual filesystem with FAT and littlefs formats, backed by either
 Zephyr DiskAccess or FlashArea (flash map) APIs depending on which the board supports.
 
-See `uos Filesystem Mounting <https://docs.micropython.org/en/latest/library/uos.html?highlight=os#filesystem-mounting>`_.
+See `os Filesystem Mounting <https://docs.micropython.org/en/latest/library/os.html?highlight=os#filesystem-mounting>`_.
 
 Disk Access
 -----------
 
 The :ref:`zephyr.DiskAccess <zephyr.DiskAccess>` class can be used to access storage devices, such as SD cards.
 This class uses `Zephyr Disk Access API <https://docs.zephyrproject.org/latest/reference/storage/disk/access.html>`_ and
-implements the `uos.AbstractBlockDev` protocol.
+implements the `os.AbstractBlockDev` protocol.
 
 For use with SD card controllers, SD cards must be present at boot & not removed; they will
 be auto detected and initialized by filesystem at boot. Use the disk driver interface and a
@@ -39,7 +39,7 @@ customize filesystem configurations. To store persistent data on the device, usi
 API is recommended (see below).
 
 This class uses `Zephyr Flash map API <https://docs.zephyrproject.org/latest/reference/storage/flash_map/flash_map.html#>`_ and
-implements the `uos.AbstractBlockDev` protocol.
+implements the `os.AbstractBlockDev` protocol.
 
 Example usage with the internal flash on the reel_board or the rv32m1_vega_ri5cy board::
 

From ee549d725aecbe48c1f8363f5d38855f6d7f47d5 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Thu, 12 Aug 2021 15:28:12 +1000
Subject: [PATCH 1186/3533] tools/gen-cpydiff.py: Don't rename foo to ufoo in
 diff output.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 tools/gen-cpydiff.py | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/tools/gen-cpydiff.py b/tools/gen-cpydiff.py
index c9f58ec505d3a..1d458d3dcd279 100644
--- a/tools/gen-cpydiff.py
+++ b/tools/gen-cpydiff.py
@@ -50,7 +50,6 @@
 INDEX = "index.rst"
 
 HEADER = ".. This document was generated by tools/gen-cpydiff.py\n\n"
-UIMPORTLIST = {"struct", "collections", "json"}
 CLASSMAP = {"Core": "Core language", "Types": "Builtin types"}
 INDEXPRIORITY = ["syntax", "core_language", "builtin_types", "modules"]
 RSTCHARS = ["=", "-", "~", "`", ":"]
@@ -94,21 +93,12 @@ def readfiles():
     return files
 
 
-def uimports(code):
-    """converts CPython module names into MicroPython equivalents"""
-    for uimport in UIMPORTLIST:
-        uimport = bytes(uimport, "utf8")
-        code = code.replace(uimport, b"u" + uimport)
-    return code
-
-
 def run_tests(tests):
     """executes all tests"""
     results = []
     for test in tests:
         with open(TESTPATH + test.name, "rb") as f:
-            input_cpy = f.read()
-        input_upy = uimports(input_cpy)
+            input_py = f.read()
 
         process = subprocess.Popen(
             CPYTHON3,
@@ -117,7 +107,7 @@ def run_tests(tests):
             stdin=subprocess.PIPE,
             stderr=subprocess.PIPE,
         )
-        output_cpy = [com.decode("utf8") for com in process.communicate(input_cpy)]
+        output_cpy = [com.decode("utf8") for com in process.communicate(input_py)]
 
         process = subprocess.Popen(
             MICROPYTHON,
@@ -126,7 +116,7 @@ def run_tests(tests):
             stdin=subprocess.PIPE,
             stderr=subprocess.PIPE,
         )
-        output_upy = [com.decode("utf8") for com in process.communicate(input_upy)]
+        output_upy = [com.decode("utf8") for com in process.communicate(input_py)]
 
         if output_cpy[0] == output_upy[0] and output_cpy[1] == output_upy[1]:
             status = "Supported"

From d7fbc755dc208be0d252afb379ab4e9880a2b693 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Thu, 12 Aug 2021 15:15:03 +1000
Subject: [PATCH 1187/3533] docs/library/index.rst: Clarify module naming and
 purpose.

Adds section about extending built-in modules from Python.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 docs/library/index.rst      | 102 ++++++++++++++++++------------------
 docs/reference/packages.rst |   2 +
 2 files changed, 53 insertions(+), 51 deletions(-)

diff --git a/docs/library/index.rst b/docs/library/index.rst
index 9af4fec0564b7..c69050267a5ad 100644
--- a/docs/library/index.rst
+++ b/docs/library/index.rst
@@ -7,47 +7,39 @@ MicroPython libraries
 
    Important summary of this section
 
-   * MicroPython implements a subset of Python functionality for each module.
-   * To ease extensibility, MicroPython versions of standard Python modules
-     usually have ``u`` ("micro") prefix.
-   * Any particular MicroPython variant or port may miss any feature/function
-     described in this general documentation (due to resource constraints or
-     other limitations).
-
+   * MicroPython provides built-in modules that mirror the functionality of the
+     Python standard library (e.g. :mod:`os`, :mod:`time`), as well as
+     MicroPython-specific modules (e.g. :mod:`bluetooth`, :mod:`machine`).
+   * Most standard library modules implement a subset of the functionality of
+     the equivalent Python module, and in a few cases provide some
+     MicroPython-specific extensions (e.g. :mod:`array`, :mod:`os`)
+   * Due to resource constraints or other limitations, some ports or firmware
+     versions may not include all the functionality documented here.
+   * To allow for extensibility, the built-in modules can be extended from
+     Python code loaded onto the device.
 
 This chapter describes modules (function and class libraries) which are built
-into MicroPython. There are a few categories of such modules:
-
-* Modules which implement a subset of standard Python functionality and are not
-  intended to be extended by the user.
-* Modules which implement a subset of Python functionality, with a provision
-  for extension by the user (via Python code).
-* Modules which implement MicroPython extensions to the Python standard libraries.
-* Modules specific to a particular :term:`MicroPython port` and thus not portable.
-
-Note about the availability of the modules and their contents: This documentation
-in general aspires to describe all modules and functions/classes which are
-implemented in MicroPython project. However, MicroPython is highly configurable, and
-each port to a particular board/embedded system makes available only a subset
-of MicroPython libraries. For officially supported ports, there is an effort
-to either filter out non-applicable items, or mark individual descriptions
-with "Availability:" clauses describing which ports provide a given feature.
-
-With that in mind, please still be warned that some functions/classes
-in a module (or even the entire module) described in this documentation **may be
-unavailable** in a particular build of MicroPython on a particular system. The
-best place to find general information of the availability/non-availability
-of a particular feature is the "General Information" section which contains
-information pertaining to a specific :term:`MicroPython port`.
+into MicroPython. This documentation in general aspires to describe all modules
+and functions/classes which are implemented in the MicroPython project.
+However, MicroPython is highly configurable, and each port to a particular
+board/embedded system may include only a subset of the available MicroPython
+libraries.
+
+With that in mind, please be warned that some functions/classes in a module (or
+even the entire module) described in this documentation **may be unavailable**
+in a particular build of MicroPython on a particular system. The best place to
+find general information of the availability/non-availability of a particular
+feature is the "General Information" section which contains information
+pertaining to a specific :term:`MicroPython port`.
 
 On some ports you are able to discover the available, built-in libraries that
-can be imported by entering the following at the REPL::
+can be imported by entering the following at the :term:`REPL`::
 
     help('modules')
 
 Beyond the built-in libraries described in this documentation, many more
 modules from the Python standard library, as well as further MicroPython
-extensions to it, can be found in `micropython-lib`.
+extensions to it, can be found in :term:`micropython-lib`.
 
 Python standard libraries and micro-libraries
 ---------------------------------------------
@@ -55,20 +47,7 @@ Python standard libraries and micro-libraries
 The following standard Python libraries have been "micro-ified" to fit in with
 the philosophy of MicroPython.  They provide the core functionality of that
 module and are intended to be a drop-in replacement for the standard Python
-library.  Some modules below use a standard Python name, but prefixed with "u",
-e.g. ``json`` instead of ``json``. This is to signify that such a module is
-micro-library, i.e. implements only a subset of CPython module functionality.
-By naming them differently, a user has a choice to write a Python-level module
-to extend functionality for better compatibility with CPython (indeed, this is
-what done by the `micropython-lib` project mentioned above).
-
-On some embedded platforms, where it may be cumbersome to add Python-level
-wrapper modules to achieve naming compatibility with CPython, micro-modules
-are available both by their u-name, and also by their non-u-name.  The
-non-u-name can be overridden by a file of that name in your library path (``sys.path``).
-For example, ``import json`` will first search for a file ``json.py`` (or package
-directory ``json``) and load that module if it is found.  If nothing is found,
-it will fallback to loading the built-in ``json`` module.
+library.
 
 .. toctree::
    :maxdepth: 1
@@ -131,7 +110,7 @@ To access platform-specific hardware use the appropriate library, e.g.
 
 
 Libraries specific to the pyboard
----------------------------------
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 The following libraries are specific to the pyboard.
 
@@ -143,7 +122,7 @@ The following libraries are specific to the pyboard.
 
 
 Libraries specific to the WiPy
-------------------------------
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 The following libraries and classes are specific to the WiPy.
 
@@ -156,7 +135,7 @@ The following libraries and classes are specific to the WiPy.
 
 
 Libraries specific to the ESP8266 and ESP32
--------------------------------------------
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 The following libraries are specific to the ESP8266 and ESP32.
 
@@ -168,7 +147,7 @@ The following libraries are specific to the ESP8266 and ESP32.
 
 
 Libraries specific to the RP2040
---------------------------------
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 The following libraries are specific to the RP2040, as used in the Raspberry Pi Pico.
 
@@ -178,7 +157,7 @@ The following libraries are specific to the RP2040, as used in the Raspberry Pi
   rp2.rst
 
 Libraries specific to Zephyr
-----------------------------
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 The following libraries are specific to the Zephyr port.
 
@@ -186,3 +165,24 @@ The following libraries are specific to the Zephyr port.
   :maxdepth: 2
 
   zephyr.rst
+
+Extending built-in libraries from Python
+----------------------------------------
+
+In most cases, the above modules are actually named ``umodule`` rather than
+``module``, but MicroPython will alias any module prefixed with a ``u`` to the
+non-``u`` version. However a file (or :term:``frozen module``) named
+``module.py`` will take precedence over this alias.
+
+This allows the user to provide an extended implementation of a built-in library
+(perhaps to provide additional CPython compatibility). The user-provided module
+(in ``module.py``) can still use the built-in functionality by importing
+``umodule`` directly. This is used extensively in :term:`micropython-lib`. See
+:ref:`packages` for more information.
+
+This applies to both the Python standard libraries (e.g. ``os``, ``time``, etc),
+but also the MicroPython libraries too (e.g. ``machine``, ``bluetooth``, etc).
+The main exception is the port-specific libraries (``pyb``, ``esp``, etc).
+
+*Other than when you specifically want to force the use of the built-in module,
+we recommend always using ``import module`` rather than ``import umodule``.*
diff --git a/docs/reference/packages.rst b/docs/reference/packages.rst
index e9adfc176ea73..eb44992ed6324 100644
--- a/docs/reference/packages.rst
+++ b/docs/reference/packages.rst
@@ -1,3 +1,5 @@
+.. _packages:
+
 Distribution packages, package management, and deploying applications
 =====================================================================
 

From 8f45f5ee4f58c64226a25a7070de0d18727be273 Mon Sep 17 00:00:00 2001
From: Daniel Mizyrycki <mzdaniel@glidelink.net>
Date: Tue, 10 Aug 2021 15:52:25 -0700
Subject: [PATCH 1188/3533] nrf: Set .mpy features consistent with
 documentation and other ports.

This allows nrf devices to load .mpy files.  And nrf52840 and nrf9160 based
boards also support compiling and loading native code.
---
 ports/nrf/mpconfigdevice_nrf52840.h | 10 ++++++++++
 ports/nrf/mpconfigdevice_nrf9160.h  | 10 ++++++++++
 ports/nrf/mpconfigport.h            |  4 ++--
 3 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/ports/nrf/mpconfigdevice_nrf52840.h b/ports/nrf/mpconfigdevice_nrf52840.h
index fa9258f2ac03c..581c52ea81159 100644
--- a/ports/nrf/mpconfigdevice_nrf52840.h
+++ b/ports/nrf/mpconfigdevice_nrf52840.h
@@ -34,6 +34,16 @@
 #define MICROPY_VFS                        (1)
 #endif
 
+// Board overridable emitter configuration.
+
+#ifndef MICROPY_EMIT_THUMB
+#define MICROPY_EMIT_THUMB          (1)
+#endif
+
+#ifndef MICROPY_EMIT_INLINE_THUMB
+#define MICROPY_EMIT_INLINE_THUMB   (1)
+#endif
+
 // Board overridable feature configuration.
 
 #ifndef MICROPY_ENABLE_SOURCE_LINE
diff --git a/ports/nrf/mpconfigdevice_nrf9160.h b/ports/nrf/mpconfigdevice_nrf9160.h
index fa9258f2ac03c..581c52ea81159 100644
--- a/ports/nrf/mpconfigdevice_nrf9160.h
+++ b/ports/nrf/mpconfigdevice_nrf9160.h
@@ -34,6 +34,16 @@
 #define MICROPY_VFS                        (1)
 #endif
 
+// Board overridable emitter configuration.
+
+#ifndef MICROPY_EMIT_THUMB
+#define MICROPY_EMIT_THUMB          (1)
+#endif
+
+#ifndef MICROPY_EMIT_INLINE_THUMB
+#define MICROPY_EMIT_INLINE_THUMB   (1)
+#endif
+
 // Board overridable feature configuration.
 
 #ifndef MICROPY_ENABLE_SOURCE_LINE
diff --git a/ports/nrf/mpconfigport.h b/ports/nrf/mpconfigport.h
index af77ef69ca1e9..8a622d811c12b 100644
--- a/ports/nrf/mpconfigport.h
+++ b/ports/nrf/mpconfigport.h
@@ -43,7 +43,7 @@
 #define MICROPY_VFS                 (0)
 #endif
 #define MICROPY_ALLOC_PATH_MAX      (512)
-#define MICROPY_PERSISTENT_CODE_LOAD (0)
+#define MICROPY_PERSISTENT_CODE_LOAD (1)
 #define MICROPY_COMP_MODULE_CONST   (0)
 #define MICROPY_COMP_TRIPLE_TUPLE_ASSIGN (0)
 #define MICROPY_READER_VFS          (MICROPY_VFS)
@@ -103,7 +103,7 @@
 #define MICROPY_CAN_OVERRIDE_BUILTINS (1)
 #define MICROPY_USE_INTERNAL_ERRNO  (1)
 #define MICROPY_PY_FUNCTION_ATTRS   (1)
-#define MICROPY_PY_BUILTINS_STR_UNICODE (0)
+#define MICROPY_PY_BUILTINS_STR_UNICODE (1)
 #define MICROPY_PY_BUILTINS_STR_CENTER (0)
 #define MICROPY_PY_BUILTINS_STR_PARTITION (0)
 #define MICROPY_PY_BUILTINS_STR_SPLITLINES (0)

From e49f6091866b260cb8eec7a66bbd5d4d7bc22aa1 Mon Sep 17 00:00:00 2001
From: Patrick Van Oosterwijck <patrick@silicognition.com>
Date: Wed, 11 Aug 2021 12:13:09 -0600
Subject: [PATCH 1189/3533] tools/autobuild: Add auto build for Silicognition
 wESP32.

---
 tools/autobuild/build-esp32-latest.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/autobuild/build-esp32-latest.sh b/tools/autobuild/build-esp32-latest.sh
index cc04d833e50f7..92a12b2d53225 100755
--- a/tools/autobuild/build-esp32-latest.sh
+++ b/tools/autobuild/build-esp32-latest.sh
@@ -44,6 +44,7 @@ if idf.py --version | grep -q v4.2; then
     do_build esp32 GENERIC FROZEN_MANIFEST=$(pwd)/boards/manifest_release.py
     do_build esp32spiram GENERIC_SPIRAM FROZEN_MANIFEST=$(pwd)/boards/manifest_release.py
     do_build tinypico UM_TINYPICO
+    do_build wesp32 SIL_WESP32
 else
     do_build esp32c3 GENERIC_C3
     do_build tinys2 UM_TINYS2

From 90d47ee34de707c4a138f3bfe2d434b13e1e6db8 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 12 Aug 2021 15:49:27 +1000
Subject: [PATCH 1190/3533] tests/run-multitests.py: Add broadcast and wait
 facility.

Test instances can now use the following methods to synchronise their
execution:

    multitest.broadcast("sync message")
    multitest.wait("sync message")

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/run-multitests.py | 30 +++++++++++++++++++++++++-----
 1 file changed, 25 insertions(+), 5 deletions(-)

diff --git a/tests/run-multitests.py b/tests/run-multitests.py
index b4afc1e52612a..34389e429206c 100755
--- a/tests/run-multitests.py
+++ b/tests/run-multitests.py
@@ -46,6 +46,16 @@ def next():
         print("NEXT")
         multitest.flush()
     @staticmethod
+    def broadcast(msg):
+        print("BROADCAST", msg)
+        multitest.flush()
+    @staticmethod
+    def wait(msg):
+        msg = "BROADCAST " + msg
+        while True:
+            if sys.stdin.readline().rstrip() == msg:
+                return
+    @staticmethod
     def globals(**gs):
         for g in gs:
             print("SET {{}} = {{!r}}".format(g, gs[g]))
@@ -126,14 +136,12 @@ def run_script(self, script):
 
     def start_script(self, script):
         self.popen = subprocess.Popen(
-            self.argv,
+            self.argv + ["-c", script],
             stdin=subprocess.PIPE,
             stdout=subprocess.PIPE,
             stderr=subprocess.STDOUT,
             env=self.env,
         )
-        self.popen.stdin.write(script)
-        self.popen.stdin.close()
         self.finished = False
 
     def stop(self):
@@ -141,7 +149,7 @@ def stop(self):
             self.popen.terminate()
 
     def readline(self):
-        sel = select.select([self.popen.stdout.raw], [], [], 0.1)
+        sel = select.select([self.popen.stdout.raw], [], [], 0.001)
         if not sel[0]:
             self.finished = self.popen.poll() is not None
             return None, None
@@ -152,6 +160,10 @@ def readline(self):
         else:
             return str(out.rstrip(), "ascii"), None
 
+    def write(self, data):
+        self.popen.stdin.write(data)
+        self.popen.stdin.flush()
+
     def is_finished(self):
         return self.finished
 
@@ -220,6 +232,9 @@ def readline(self):
             err = None
         return str(out.rstrip(), "ascii"), err
 
+    def write(self, data):
+        self.pyb.serial.write(data)
+
     def is_finished(self):
         return self.finished
 
@@ -318,7 +333,12 @@ def run_test_on_instances(test_file, num_instances, instances):
                 last_read_time[idx] = time.time()
                 if out is not None and not any(m in out for m in IGNORE_OUTPUT_MATCHES):
                     trace_instance_output(idx, out)
-                    output[idx].append(out)
+                    if out.startswith("BROADCAST "):
+                        for instance2 in instances:
+                            if instance2 is not instance:
+                                instance2.write(bytes(out, "ascii") + b"\r\n")
+                    else:
+                        output[idx].append(out)
                 if err is not None:
                     trace_instance_output(idx, err)
                     output[idx].append(err)

From 8fcdb5490c482dc11f3be70f8ab0cf844b600fb9 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 12 Aug 2021 15:57:17 +1000
Subject: [PATCH 1191/3533] extmod/modlwip: Fix close and clean up of UDP and
 raw sockets.

The correct callback-deregister functions must be called dependent on the
socket type, otherwise resources may not be freed correctly.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/modlwip.c            | 12 +++++++-----
 tests/multi_net/udp_data.py | 35 +++++++++++++++++++++++++++++++++++
 2 files changed, 42 insertions(+), 5 deletions(-)
 create mode 100644 tests/multi_net/udp_data.py

diff --git a/extmod/modlwip.c b/extmod/modlwip.c
index 00fd1096451fa..8811742d6e440 100644
--- a/extmod/modlwip.c
+++ b/extmod/modlwip.c
@@ -1502,16 +1502,16 @@ STATIC mp_uint_t lwip_socket_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_
             return 0;
         }
 
-        // Deregister callback (pcb.tcp is set to NULL below so must deregister now)
-        tcp_arg(socket->pcb.tcp, NULL);
-        tcp_err(socket->pcb.tcp, NULL);
-        tcp_recv(socket->pcb.tcp, NULL);
-
         // Free any incoming buffers or connections that are stored
         lwip_socket_free_incoming(socket);
 
         switch (socket->type) {
             case MOD_NETWORK_SOCK_STREAM: {
+                // Deregister callback (pcb.tcp is set to NULL below so must deregister now)
+                tcp_arg(socket->pcb.tcp, NULL);
+                tcp_err(socket->pcb.tcp, NULL);
+                tcp_recv(socket->pcb.tcp, NULL);
+
                 if (socket->pcb.tcp->state != LISTEN) {
                     // Schedule a callback to abort the connection if it's not cleanly closed after
                     // the given timeout.  The callback must be set before calling tcp_close since
@@ -1525,10 +1525,12 @@ STATIC mp_uint_t lwip_socket_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_
                 break;
             }
             case MOD_NETWORK_SOCK_DGRAM:
+                udp_recv(socket->pcb.udp, NULL, NULL);
                 udp_remove(socket->pcb.udp);
                 break;
             #if MICROPY_PY_LWIP_SOCK_RAW
             case MOD_NETWORK_SOCK_RAW:
+                raw_recv(socket->pcb.raw, NULL, NULL);
                 raw_remove(socket->pcb.raw);
                 break;
             #endif
diff --git a/tests/multi_net/udp_data.py b/tests/multi_net/udp_data.py
new file mode 100644
index 0000000000000..fd3e00918f532
--- /dev/null
+++ b/tests/multi_net/udp_data.py
@@ -0,0 +1,35 @@
+# Simple test of a UDP server and client transferring data
+
+import socket
+
+NUM_NEW_SOCKETS = 4
+NUM_TRANSFERS = 4
+PORT = 8000
+
+# Server
+def instance0():
+    multitest.globals(IP=multitest.get_network_ip())
+    multitest.next()
+    for i in range(NUM_NEW_SOCKETS):
+        s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
+        s.bind(socket.getaddrinfo("0.0.0.0", PORT)[0][-1])
+        multitest.broadcast("server ready")
+        for j in range(NUM_TRANSFERS):
+            data, addr = s.recvfrom(1000)
+            print(data)
+            s.sendto(b"server to client %d %d" % (i, j), addr)
+        s.close()
+
+
+# Client
+def instance1():
+    multitest.next()
+    ai = socket.getaddrinfo(IP, PORT)[0][-1]
+    for i in range(NUM_NEW_SOCKETS):
+        s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
+        multitest.wait("server ready")
+        for j in range(NUM_TRANSFERS):
+            s.sendto(b"client to server %d %d" % (i, j), ai)
+            data, addr = s.recvfrom(1000)
+            print(data)
+        s.close()

From 1f48934312888a104a486d3655e0352657f35952 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 12 Aug 2021 17:25:10 +1000
Subject: [PATCH 1192/3533] tools/mpremote: Fix connect-list in case VID/PID
 are None.

Which can be the case on Windows and macOS for certain serial devices.

Fixes issue #7636.

Signed-off-by: Damien George <damien@micropython.org>
---
 tools/mpremote/mpremote/main.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/tools/mpremote/mpremote/main.py b/tools/mpremote/mpremote/main.py
index d225bf2e41dfb..6a6cbea573034 100644
--- a/tools/mpremote/mpremote/main.py
+++ b/tools/mpremote/mpremote/main.py
@@ -166,7 +166,12 @@ def do_connect(args):
             for p in sorted(serial.tools.list_ports.comports()):
                 print(
                     "{} {} {:04x}:{:04x} {} {}".format(
-                        p.device, p.serial_number, p.vid, p.pid, p.manufacturer, p.product
+                        p.device,
+                        p.serial_number,
+                        p.vid if isinstance(p.vid, int) else 0,
+                        p.pid if isinstance(p.pid, int) else 0,
+                        p.manufacturer,
+                        p.product,
                     )
                 )
             return None

From 162bf3c5d8055a9e9a17461878c9d058066283a5 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 12 Aug 2021 17:28:37 +1000
Subject: [PATCH 1193/3533] tools/mpremote: Add "devs" shortcut for "connect
 list".

See issue #7480.

Signed-off-by: Damien George <damien@micropython.org>
---
 tools/mpremote/mpremote/main.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/mpremote/mpremote/main.py b/tools/mpremote/mpremote/main.py
index 6a6cbea573034..6e2df5179d230 100644
--- a/tools/mpremote/mpremote/main.py
+++ b/tools/mpremote/mpremote/main.py
@@ -27,6 +27,7 @@
 
 _BUILTIN_COMMAND_EXPANSIONS = {
     # Device connection shortcuts.
+    "devs": "connect list",
     "a0": "connect /dev/ttyACM0",
     "a1": "connect /dev/ttyACM1",
     "a2": "connect /dev/ttyACM2",

From 692d36d779192f32371f7f9daa845b566f26968d Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Fri, 13 Aug 2021 01:44:08 +1000
Subject: [PATCH 1194/3533] py: Implement partial PEP-498 (f-string) support.

This implements (most of) the PEP-498 spec for f-strings and is based on
https://github.com/micropython/micropython/pull/4998 by @klardotsh.

It is implemented in the lexer as a syntax translation to `str.format`:
  f"{a}" --> "{}".format(a)

It also supports:
  f"{a=}" --> "a={}".format(a)

This is done by extracting the arguments into a temporary vstr buffer,
then after the string has been tokenized, the lexer input queue is saved
and the contents of the temporary vstr buffer are injected into the lexer
instead.

There are four main limitations:
- raw f-strings (`fr` or `rf` prefixes) are not supported and will raise
  `SyntaxError: raw f-strings are not supported`.

- literal concatenation of f-strings with adjacent strings will fail
    "{}" f"{a}" --> "{}{}".format(a)    (str.format will incorrectly use
                                         the braces from the non-f-string)
    f"{a}" f"{a}" --> "{}".format(a) "{}".format(a) (cannot concatenate)

- PEP-498 requires the full parser to understand the interpolated
  argument, however because this entirely runs in the lexer it cannot
  resolve nested braces in expressions like
    f"{'}'}"

- The !r, !s, and !a conversions are not supported.

Includes tests and cpydiffs.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 mpy-cross/mpconfigport.h             |   1 +
 ports/unix/mpconfigport.h            |   1 +
 ports/windows/mpconfigport.h         |   1 +
 py/lexer.c                           | 128 ++++++++++++++++++++++++++-
 py/lexer.h                           |  11 +++
 py/mpconfig.h                        |   5 ++
 py/parse.c                           |   8 ++
 tests/basics/string_fstring.py       |  57 ++++++++++++
 tests/cmdline/cmd_parsetree.py       |   1 +
 tests/cmdline/cmd_parsetree.py.exp   |  26 ++++--
 tests/cpydiff/core_fstring_concat.py |  12 +++
 tests/cpydiff/core_fstring_parser.py |   9 ++
 tests/cpydiff/core_fstring_raw.py    |   8 ++
 tests/cpydiff/core_fstring_repr.py   |  18 ++++
 tests/feature_check/fstring.py       |   3 +
 tests/feature_check/fstring.py.exp   |   1 +
 tests/run-tests.py                   |   8 ++
 tools/tinytest-codegen.py            |   2 +
 18 files changed, 292 insertions(+), 8 deletions(-)
 create mode 100644 tests/basics/string_fstring.py
 create mode 100644 tests/cpydiff/core_fstring_concat.py
 create mode 100644 tests/cpydiff/core_fstring_parser.py
 create mode 100644 tests/cpydiff/core_fstring_raw.py
 create mode 100644 tests/cpydiff/core_fstring_repr.py
 create mode 100644 tests/feature_check/fstring.py
 create mode 100644 tests/feature_check/fstring.py.exp

diff --git a/mpy-cross/mpconfigport.h b/mpy-cross/mpconfigport.h
index 96d3726562925..e7c8edf13559c 100644
--- a/mpy-cross/mpconfigport.h
+++ b/mpy-cross/mpconfigport.h
@@ -76,6 +76,7 @@
 #define MICROPY_CPYTHON_COMPAT      (1)
 #define MICROPY_USE_INTERNAL_PRINTF (0)
 
+#define MICROPY_PY_FSTRINGS         (1)
 #define MICROPY_PY_BUILTINS_STR_UNICODE (1)
 
 #if !(defined(MICROPY_GCREGS_SETJMP) || defined(__x86_64__) || defined(__i386__) || defined(__thumb2__) || defined(__thumb__) || defined(__arm__))
diff --git a/ports/unix/mpconfigport.h b/ports/unix/mpconfigport.h
index d838f42b3f3dc..de5a65ab73f2b 100644
--- a/ports/unix/mpconfigport.h
+++ b/ports/unix/mpconfigport.h
@@ -88,6 +88,7 @@
 #define MICROPY_PY_FUNCTION_ATTRS   (1)
 #define MICROPY_PY_DESCRIPTORS      (1)
 #define MICROPY_PY_DELATTR_SETATTR  (1)
+#define MICROPY_PY_FSTRINGS         (1)
 #define MICROPY_PY_BUILTINS_STR_UNICODE (1)
 #define MICROPY_PY_BUILTINS_STR_CENTER (1)
 #define MICROPY_PY_BUILTINS_STR_PARTITION (1)
diff --git a/ports/windows/mpconfigport.h b/ports/windows/mpconfigport.h
index 6421c93bdbc62..ffcb5b105f99c 100644
--- a/ports/windows/mpconfigport.h
+++ b/ports/windows/mpconfigport.h
@@ -66,6 +66,7 @@
 #define MICROPY_PY_FUNCTION_ATTRS   (1)
 #define MICROPY_PY_DESCRIPTORS      (1)
 #define MICROPY_PY_DELATTR_SETATTR  (1)
+#define MICROPY_PY_FSTRINGS         (1)
 #define MICROPY_PY_BUILTINS_STR_UNICODE (1)
 #define MICROPY_PY_BUILTINS_STR_CENTER (1)
 #define MICROPY_PY_BUILTINS_STR_PARTITION (1)
diff --git a/py/lexer.c b/py/lexer.c
index 07ea2b96ab578..ba118c9d2f299 100644
--- a/py/lexer.c
+++ b/py/lexer.c
@@ -62,6 +62,12 @@ STATIC bool is_char_or3(mp_lexer_t *lex, byte c1, byte c2, byte c3) {
     return lex->chr0 == c1 || lex->chr0 == c2 || lex->chr0 == c3;
 }
 
+#if MICROPY_PY_FSTRINGS
+STATIC bool is_char_or4(mp_lexer_t *lex, byte c1, byte c2, byte c3, byte c4) {
+    return lex->chr0 == c1 || lex->chr0 == c2 || lex->chr0 == c3 || lex->chr0 == c4;
+}
+#endif
+
 STATIC bool is_char_following(mp_lexer_t *lex, byte c) {
     return lex->chr1 == c;
 }
@@ -105,7 +111,13 @@ STATIC bool is_following_odigit(mp_lexer_t *lex) {
 
 STATIC bool is_string_or_bytes(mp_lexer_t *lex) {
     return is_char_or(lex, '\'', '\"')
+           #if MICROPY_PY_FSTRINGS
+           || (is_char_or4(lex, 'r', 'u', 'b', 'f') && is_char_following_or(lex, '\'', '\"'))
+           || (((is_char_and(lex, 'r', 'f') || is_char_and(lex, 'f', 'r'))
+               && is_char_following_following_or(lex, '\'', '\"')))
+           #else
            || (is_char_or3(lex, 'r', 'u', 'b') && is_char_following_or(lex, '\'', '\"'))
+           #endif
            || ((is_char_and(lex, 'r', 'b') || is_char_and(lex, 'b', 'r'))
                && is_char_following_following_or(lex, '\'', '\"'));
 }
@@ -132,9 +144,35 @@ STATIC void next_char(mp_lexer_t *lex) {
         ++lex->column;
     }
 
+    // shift the input queue forward
     lex->chr0 = lex->chr1;
     lex->chr1 = lex->chr2;
-    lex->chr2 = lex->reader.readbyte(lex->reader.data);
+
+    // and add the next byte from either the fstring args or the reader
+    #if MICROPY_PY_FSTRINGS
+    if (lex->fstring_args_idx) {
+        // if there are saved chars, then we're currently injecting fstring args
+        if (lex->fstring_args_idx < lex->fstring_args.len) {
+            lex->chr2 = lex->fstring_args.buf[lex->fstring_args_idx++];
+        } else {
+            // no more fstring arg bytes
+            lex->chr2 = '\0';
+        }
+
+        if (lex->chr0 == '\0') {
+            // consumed all fstring data, restore saved input queue
+            lex->chr0 = lex->chr0_saved;
+            lex->chr1 = lex->chr1_saved;
+            lex->chr2 = lex->chr2_saved;
+            // stop consuming fstring arg data
+            vstr_reset(&lex->fstring_args);
+            lex->fstring_args_idx = 0;
+        }
+    } else
+    #endif
+    {
+        lex->chr2 = lex->reader.readbyte(lex->reader.data);
+    }
 
     if (lex->chr1 == '\r') {
         // CR is a new line, converted to LF
@@ -272,7 +310,7 @@ STATIC bool get_hex(mp_lexer_t *lex, size_t num_digits, mp_uint_t *result) {
     return true;
 }
 
-STATIC void parse_string_literal(mp_lexer_t *lex, bool is_raw) {
+STATIC void parse_string_literal(mp_lexer_t *lex, bool is_raw, bool is_fstring) {
     // get first quoting character
     char quote_char = '\'';
     if (is_char(lex, '\"')) {
@@ -293,12 +331,57 @@ STATIC void parse_string_literal(mp_lexer_t *lex, bool is_raw) {
     }
 
     size_t n_closing = 0;
+    #if MICROPY_PY_FSTRINGS
+    if (is_fstring) {
+        // assume there's going to be interpolation, so prep the injection data
+        // fstring_args_idx==0 && len(fstring_args)>0 means we're extracting the args.
+        // only when fstring_args_idx>0 will we consume the arg data
+        // note: lex->fstring_args will be empty already (it's reset when finished)
+        vstr_add_str(&lex->fstring_args, ".format(");
+    }
+    #endif
+
     while (!is_end(lex) && (num_quotes > 1 || !is_char(lex, '\n')) && n_closing < num_quotes) {
         if (is_char(lex, quote_char)) {
             n_closing += 1;
             vstr_add_char(&lex->vstr, CUR_CHAR(lex));
         } else {
             n_closing = 0;
+
+            #if MICROPY_PY_FSTRINGS
+            while (is_fstring && is_char(lex, '{')) {
+                next_char(lex);
+                if (is_char(lex, '{')) {
+                    // "{{" is passed through unchanged to be handled by str.format
+                    vstr_add_byte(&lex->vstr, '{');
+                    next_char(lex);
+                } else {
+                    // remember the start of this argument (if we need it for f'{a=}').
+                    size_t i = lex->fstring_args.len;
+                    // extract characters inside the { until we reach the
+                    // format specifier or closing }.
+                    // (MicroPython limitation) note: this is completely unaware of
+                    // Python syntax and will not handle any expression containing '}' or ':'.
+                    // e.g. f'{"}"}' or f'{foo({})}'.
+                    while (!is_end(lex) && !is_char_or(lex, ':', '}')) {
+                        // like the default case at the end of this function, stay 8-bit clean
+                        vstr_add_byte(&lex->fstring_args, CUR_CHAR(lex));
+                        next_char(lex);
+                    }
+                    if (lex->fstring_args.buf[lex->fstring_args.len - 1] == '=') {
+                        // if the last character of the arg was '=', then inject "arg=" before the '{'.
+                        // f'{a=}' --> 'a={}'.format(a)
+                        vstr_add_strn(&lex->vstr, lex->fstring_args.buf + i, lex->fstring_args.len - i);
+                        // remove the trailing '='
+                        lex->fstring_args.len--;
+                    }
+                    // comma-separate args
+                    vstr_add_byte(&lex->fstring_args, ',');
+                }
+                vstr_add_byte(&lex->vstr, '{');
+            }
+            #endif
+
             if (is_char(lex, '\\')) {
                 next_char(lex);
                 unichar c = CUR_CHAR(lex);
@@ -451,6 +534,23 @@ STATIC bool skip_whitespace(mp_lexer_t *lex, bool stop_at_newline) {
 }
 
 void mp_lexer_to_next(mp_lexer_t *lex) {
+    #if MICROPY_PY_FSTRINGS
+    if (lex->fstring_args.len && lex->fstring_args_idx == 0) {
+        // moving onto the next token means the literal string is complete.
+        // switch into injecting the format args.
+        vstr_add_byte(&lex->fstring_args, ')');
+        lex->chr0_saved = lex->chr0;
+        lex->chr1_saved = lex->chr1;
+        lex->chr2_saved = lex->chr2;
+        lex->chr0 = lex->fstring_args.buf[0];
+        lex->chr1 = lex->fstring_args.buf[1];
+        lex->chr2 = lex->fstring_args.buf[2];
+        // we've already extracted 3 chars, but setting this non-zero also
+        // means we'll start consuming the fstring data
+        lex->fstring_args_idx = 3;
+    }
+    #endif
+
     // start new token text
     vstr_reset(&lex->vstr);
 
@@ -506,6 +606,7 @@ void mp_lexer_to_next(mp_lexer_t *lex) {
         do {
             // parse type codes
             bool is_raw = false;
+            bool is_fstring = false;
             mp_token_kind_t kind = MP_TOKEN_STRING;
             int n_char = 0;
             if (is_char(lex, 'u')) {
@@ -524,7 +625,25 @@ void mp_lexer_to_next(mp_lexer_t *lex) {
                     kind = MP_TOKEN_BYTES;
                     n_char = 2;
                 }
+                #if MICROPY_PY_FSTRINGS
+                if (is_char_following(lex, 'f')) {
+                    // raw-f-strings unsupported, immediately return (invalid) token.
+                    lex->tok_kind = MP_TOKEN_FSTRING_RAW;
+                    break;
+                }
+                #endif
+            }
+            #if MICROPY_PY_FSTRINGS
+            else if (is_char(lex, 'f')) {
+                if (is_char_following(lex, 'r')) {
+                    // raw-f-strings unsupported, immediately return (invalid) token.
+                    lex->tok_kind = MP_TOKEN_FSTRING_RAW;
+                    break;
+                }
+                n_char = 1;
+                is_fstring = true;
             }
+            #endif
 
             // Set or check token kind
             if (lex->tok_kind == MP_TOKEN_END) {
@@ -543,7 +662,7 @@ void mp_lexer_to_next(mp_lexer_t *lex) {
             }
 
             // Parse the literal
-            parse_string_literal(lex, is_raw);
+            parse_string_literal(lex, is_raw, is_fstring);
 
             // Skip whitespace so we can check if there's another string following
             skip_whitespace(lex, true);
@@ -703,6 +822,9 @@ mp_lexer_t *mp_lexer_new(qstr src_name, mp_reader_t reader) {
     lex->num_indent_level = 1;
     lex->indent_level = m_new(uint16_t, lex->alloc_indent_level);
     vstr_init(&lex->vstr, 32);
+    #if MICROPY_PY_FSTRINGS
+    vstr_init(&lex->fstring_args, 0);
+    #endif
 
     // store sentinel for first indentation level
     lex->indent_level[0] = 0;
diff --git a/py/lexer.h b/py/lexer.h
index 91767a44bf991..e16b9a8ce864c 100644
--- a/py/lexer.h
+++ b/py/lexer.h
@@ -44,6 +44,10 @@ typedef enum _mp_token_kind_t {
     MP_TOKEN_INVALID,
     MP_TOKEN_DEDENT_MISMATCH,
     MP_TOKEN_LONELY_STRING_OPEN,
+    #if MICROPY_PY_FSTRINGS
+    MP_TOKEN_MALFORMED_FSTRING,
+    MP_TOKEN_FSTRING_RAW,
+    #endif
 
     MP_TOKEN_NEWLINE,
     MP_TOKEN_INDENT,
@@ -158,6 +162,9 @@ typedef struct _mp_lexer_t {
     mp_reader_t reader;         // stream source
 
     unichar chr0, chr1, chr2;   // current cached characters from source
+    #if MICROPY_PY_FSTRINGS
+    unichar chr0_saved, chr1_saved, chr2_saved; // current cached characters from alt source
+    #endif
 
     size_t line;                // current source line
     size_t column;              // current source column
@@ -173,6 +180,10 @@ typedef struct _mp_lexer_t {
     size_t tok_column;          // token source column
     mp_token_kind_t tok_kind;   // token kind
     vstr_t vstr;                // token data
+    #if MICROPY_PY_FSTRINGS
+    vstr_t fstring_args;        // extracted arguments to pass to .format()
+    size_t fstring_args_idx;    // how many bytes of fstring_args have been read
+    #endif
 } mp_lexer_t;
 
 mp_lexer_t *mp_lexer_new(qstr src_name, mp_reader_t reader);
diff --git a/py/mpconfig.h b/py/mpconfig.h
index a91c39b018e01..a5d639efe83cb 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -875,6 +875,11 @@ typedef double mp_float_t;
 #define MICROPY_PY_ASYNC_AWAIT (1)
 #endif
 
+// Support for literal string interpolation, f-strings (see PEP 498, Python 3.6+)
+#ifndef MICROPY_PY_FSTRINGS
+#define MICROPY_PY_FSTRINGS (0)
+#endif
+
 // Support for assignment expressions with := (see PEP 572, Python 3.8+)
 #ifndef MICROPY_PY_ASSIGN_EXPR
 #define MICROPY_PY_ASSIGN_EXPR (1)
diff --git a/py/parse.c b/py/parse.c
index da2f5e796d9be..ae3fa8ea6d00a 100644
--- a/py/parse.c
+++ b/py/parse.c
@@ -1152,6 +1152,14 @@ mp_parse_tree_t mp_parse(mp_lexer_t *lex, mp_parse_input_kind_t input_kind) {
         } else if (lex->tok_kind == MP_TOKEN_DEDENT_MISMATCH) {
             exc = mp_obj_new_exception_msg(&mp_type_IndentationError,
                 MP_ERROR_TEXT("unindent doesn't match any outer indent level"));
+        #if MICROPY_PY_FSTRINGS
+        } else if (lex->tok_kind == MP_TOKEN_MALFORMED_FSTRING) {
+            exc = mp_obj_new_exception_msg(&mp_type_SyntaxError,
+                MP_ERROR_TEXT("malformed f-string"));
+        } else if (lex->tok_kind == MP_TOKEN_FSTRING_RAW) {
+            exc = mp_obj_new_exception_msg(&mp_type_SyntaxError,
+                MP_ERROR_TEXT("raw f-strings are not supported"));
+        #endif
         } else {
             exc = mp_obj_new_exception_msg(&mp_type_SyntaxError,
                 MP_ERROR_TEXT("invalid syntax"));
diff --git a/tests/basics/string_fstring.py b/tests/basics/string_fstring.py
new file mode 100644
index 0000000000000..efb7e5a8e1159
--- /dev/null
+++ b/tests/basics/string_fstring.py
@@ -0,0 +1,57 @@
+def f():
+    return 4
+def g(_):
+    return 5
+def h():
+    return 6
+
+print(f'no interpolation')
+print(f"no interpolation")
+print(f"""no interpolation""")
+
+x, y = 1, 2
+print(f'{x}')
+print(f'{x:08x}')
+print(f'{x=}')
+print(f'{x=:08x}')
+print(f'a {x} b {y} c')
+print(f'a {x:08x} b {y} c')
+print(f'a {x=} b {y} c')
+print(f'a {x=:08x} b {y} c')
+
+print(f'a {"hello"} b')
+print(f'a {f() + g("foo") + h()} b')
+print(f'a {f() + g("foo") + h()=} b')
+print(f'a {f() + g("foo") + h()=:08x} b')
+
+def foo(a, b):
+    return f'{x}{y}{a}{b}'
+print(foo(7, 8))
+
+# PEP-0498 specifies that '\\' and '#' must be disallowed explicitly, whereas
+# MicroPython relies on the syntax error as a result of the substitution.
+
+print(f"\\")
+print(f'#')
+try:
+    eval("f'{\}'")
+except SyntaxError:
+    print('SyntaxError')
+try:
+    eval("f'{#}'")
+except SyntaxError:
+    print('SyntaxError')
+
+
+# PEP-0498 specifies that handling of double braces '{{' or '}}' should
+# behave like str.format.
+print(f'{{}}')
+print(f'{{{4*10}}}', '{40}')
+
+# A single closing brace, unlike str.format should raise a syntax error.
+# MicroPython instead raises ValueError at runtime from the substitution.
+try:
+    eval("f'{{}'")
+except (ValueError, SyntaxError):
+    # MicroPython incorrectly raises ValueError here.
+    print('SyntaxError')
diff --git a/tests/cmdline/cmd_parsetree.py b/tests/cmdline/cmd_parsetree.py
index 50da369543a31..483ea893734b4 100644
--- a/tests/cmdline/cmd_parsetree.py
+++ b/tests/cmdline/cmd_parsetree.py
@@ -10,3 +10,4 @@
 e = b"a very long bytes that will not be interned"
 f = 123456789012345678901234567890
 g = 123
+h = f"fstring: '{b}'"
diff --git a/tests/cmdline/cmd_parsetree.py.exp b/tests/cmdline/cmd_parsetree.py.exp
index e64f4f782951a..cc8ba82c05b9f 100644
--- a/tests/cmdline/cmd_parsetree.py.exp
+++ b/tests/cmdline/cmd_parsetree.py.exp
@@ -1,6 +1,6 @@
 ----------------
-[   4] \(rule\|file_input_2\)(1) (n=9)
-         tok(4)
+[   4] \(rule\|file_input_2\)(1) (n=10)
+         tok(6)
 [   4]   \(rule\|for_stmt\)(22) (n=4)
            id(i)
 [   4]     \(rule\|atom_paren\)(45) (n=1)
@@ -9,7 +9,7 @@
            NULL
 [   6]   \(rule\|expr_stmt\)(5) (n=2)
            id(a)
-           tok(14)
+           tok(16)
 [   7]   \(rule\|expr_stmt\)(5) (n=2)
            id(b)
            str(str)
@@ -28,6 +28,16 @@
 [  12]   \(rule\|expr_stmt\)(5) (n=2)
            id(g)
            int(123)
+[  13]   \(rule\|expr_stmt\)(5) (n=2)
+           id(h)
+[  13]     \(rule\|atom_expr_normal\)(44) (n=2)
+[  13]       literal const(\.\+)
+[  13]       \(rule\|atom_expr_trailers\)(142) (n=2)
+[  13]         \(rule\|trailer_period\)(50) (n=1)
+                 id(format)
+[  13]         \(rule\|trailer_paren\)(48) (n=1)
+[  13]           \(rule\|arglist\)(164) (n=1)
+                   id(b)
 ----------------
 File cmdline/cmd_parsetree.py, code block '<module>' (descriptor: \.\+, bytecode @\.\+ bytes)
 Raw bytecode (code_info_size=\\d\+, bytecode_size=\\d\+):
@@ -46,6 +56,7 @@ arg names:
   bc=32 line=10
   bc=37 line=11
   bc=42 line=12
+  bc=48 line=13
 00 BUILD_TUPLE 0
 02 GET_ITER_STACK
 03 FOR_ITER 12
@@ -65,8 +76,13 @@ arg names:
 39 STORE_NAME f
 42 LOAD_CONST_SMALL_INT 123
 45 STORE_NAME g
-48 LOAD_CONST_NONE
-49 RETURN_VALUE
+48 LOAD_CONST_OBJ \.\+
+50 LOAD_METHOD format
+53 LOAD_NAME b (cache=0)
+57 CALL_METHOD n=1 nkw=0
+59 STORE_NAME h
+62 LOAD_CONST_NONE
+63 RETURN_VALUE
 mem: total=\\d\+, current=\\d\+, peak=\\d\+
 stack: \\d\+ out of \\d\+
 GC: total: \\d\+, used: \\d\+, free: \\d\+
diff --git a/tests/cpydiff/core_fstring_concat.py b/tests/cpydiff/core_fstring_concat.py
new file mode 100644
index 0000000000000..fd83527b5c176
--- /dev/null
+++ b/tests/cpydiff/core_fstring_concat.py
@@ -0,0 +1,12 @@
+"""
+categories: Core
+description: f-strings don't support concatenation with adjacent literals if the adjacent literals contain braces
+cause: MicroPython is optimised for code space.
+workaround: Use the + operator between literal strings when either is an f-string
+"""
+
+x = 1
+print("aa" f"{x}")
+print(f"{x}" "ab")
+print("a{}a" f"{x}")
+print(f"{x}" "a{}b")
diff --git a/tests/cpydiff/core_fstring_parser.py b/tests/cpydiff/core_fstring_parser.py
new file mode 100644
index 0000000000000..6917f3cfa4d8f
--- /dev/null
+++ b/tests/cpydiff/core_fstring_parser.py
@@ -0,0 +1,9 @@
+"""
+categories: Core
+description: f-strings cannot support expressions that require parsing to resolve nested braces
+cause: MicroPython is optimised for code space.
+workaround: Only use simple expressions inside f-strings
+"""
+
+f'{"hello {} world"}'
+f"{repr({})}"
diff --git a/tests/cpydiff/core_fstring_raw.py b/tests/cpydiff/core_fstring_raw.py
new file mode 100644
index 0000000000000..84e265f70fc52
--- /dev/null
+++ b/tests/cpydiff/core_fstring_raw.py
@@ -0,0 +1,8 @@
+"""
+categories: Core
+description: Raw f-strings are not supported
+cause: MicroPython is optimised for code space.
+workaround: Unknown
+"""
+
+rf"hello"
diff --git a/tests/cpydiff/core_fstring_repr.py b/tests/cpydiff/core_fstring_repr.py
new file mode 100644
index 0000000000000..fcadcbf1b9910
--- /dev/null
+++ b/tests/cpydiff/core_fstring_repr.py
@@ -0,0 +1,18 @@
+"""
+categories: Core
+description: f-strings don't support the !r, !s, and !a conversions
+cause: MicroPython is optimised for code space.
+workaround: Use repr(), str(), and ascii() explictly.
+"""
+
+
+class X:
+    def __repr__(self):
+        return "repr"
+
+    def __str__(self):
+        return "str"
+
+
+print(f"{X()!r}")
+print(f"{X()!s}")
diff --git a/tests/feature_check/fstring.py b/tests/feature_check/fstring.py
new file mode 100644
index 0000000000000..14792bce0a3ae
--- /dev/null
+++ b/tests/feature_check/fstring.py
@@ -0,0 +1,3 @@
+# check whether f-strings (PEP-498) are supported
+a = 1
+print(f"a={a}")
diff --git a/tests/feature_check/fstring.py.exp b/tests/feature_check/fstring.py.exp
new file mode 100644
index 0000000000000..73cdb8bcc8734
--- /dev/null
+++ b/tests/feature_check/fstring.py.exp
@@ -0,0 +1 @@
+a=1
diff --git a/tests/run-tests.py b/tests/run-tests.py
index 619df5ed361cb..3e97a7c87dc7e 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -290,6 +290,7 @@ def run_tests(pyb, tests, args, result_dir, num_threads=1):
     skip_const = False
     skip_revops = False
     skip_io_module = False
+    skip_fstring = False
     skip_endian = False
     has_complex = True
     has_coverage = False
@@ -348,6 +349,11 @@ def run_tests(pyb, tests, args, result_dir, num_threads=1):
         if output != b"uio\n":
             skip_io_module = True
 
+        # Check if fstring feature is enabled, and skip such tests if it doesn't
+        output = run_feature_check(pyb, args, base_path, "fstring.py")
+        if output != b"a=1\n":
+            skip_fstring = True
+
         # Check if emacs repl is supported, and skip such tests if it's not
         t = run_feature_check(pyb, args, base_path, "repl_emacs_check.py")
         if "True" not in str(t, "ascii"):
@@ -543,6 +549,7 @@ def run_one_test(test_file):
         is_async = test_name.startswith(("async_", "uasyncio_"))
         is_const = test_name.startswith("const")
         is_io_module = test_name.startswith("io_")
+        is_fstring = test_name.startswith("string_fstring")
 
         skip_it = test_file in skip_tests
         skip_it |= skip_native and is_native
@@ -555,6 +562,7 @@ def run_one_test(test_file):
         skip_it |= skip_const and is_const
         skip_it |= skip_revops and "reverse_op" in test_name
         skip_it |= skip_io_module and is_io_module
+        skip_it |= skip_fstring and is_fstring
 
         if args.list_tests:
             if not skip_it:
diff --git a/tools/tinytest-codegen.py b/tools/tinytest-codegen.py
index cba0b94480ba8..ddbe62b8460f5 100755
--- a/tools/tinytest-codegen.py
+++ b/tools/tinytest-codegen.py
@@ -99,6 +99,8 @@ def script_to_map(test_file):
     "misc/sys_settrace_loop.py",
     "misc/sys_settrace_generator.py",
     "misc/sys_settrace_features.py",
+    # don't have f-string
+    "basics/string_fstring.py",
 )
 
 output = []

From 5733c49174a200b59196f44377a1418a6c38c877 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Thu, 16 Jul 2020 13:07:41 +1000
Subject: [PATCH 1195/3533] stm32,esp32,rp2: Enable MICROPY_PY_FSTRINGS by
 default.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/esp32/mpconfigport.h | 1 +
 ports/rp2/mpconfigport.h   | 1 +
 ports/stm32/mpconfigport.h | 3 +++
 3 files changed, 5 insertions(+)

diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h
index d60e2823dfebe..a21c0d524d640 100644
--- a/ports/esp32/mpconfigport.h
+++ b/ports/esp32/mpconfigport.h
@@ -66,6 +66,7 @@
 #define MICROPY_PY_FUNCTION_ATTRS           (1)
 #define MICROPY_PY_DESCRIPTORS              (1)
 #define MICROPY_PY_DELATTR_SETATTR          (1)
+#define MICROPY_PY_FSTRINGS                 (1)
 #define MICROPY_PY_STR_BYTES_CMP_WARN       (1)
 #define MICROPY_PY_BUILTINS_STR_UNICODE     (1)
 #define MICROPY_PY_BUILTINS_STR_CENTER      (1)
diff --git a/ports/rp2/mpconfigport.h b/ports/rp2/mpconfigport.h
index 218cd72752628..ccf11d4f70994 100644
--- a/ports/rp2/mpconfigport.h
+++ b/ports/rp2/mpconfigport.h
@@ -74,6 +74,7 @@
 #define MICROPY_PY_FUNCTION_ATTRS               (1)
 #define MICROPY_PY_DESCRIPTORS                  (1)
 #define MICROPY_PY_DELATTR_SETATTR              (1)
+#define MICROPY_PY_FSTRINGS                     (1)
 #define MICROPY_PY_BUILTINS_STR_UNICODE         (1)
 #define MICROPY_PY_BUILTINS_STR_CENTER          (1)
 #define MICROPY_PY_BUILTINS_STR_PARTITION       (1)
diff --git a/ports/stm32/mpconfigport.h b/ports/stm32/mpconfigport.h
index ff58c515e37c7..7ade406b5b32d 100644
--- a/ports/stm32/mpconfigport.h
+++ b/ports/stm32/mpconfigport.h
@@ -91,6 +91,9 @@
 #define MICROPY_PY_FUNCTION_ATTRS   (1)
 #define MICROPY_PY_DESCRIPTORS      (1)
 #define MICROPY_PY_DELATTR_SETATTR  (1)
+#ifndef MICROPY_PY_FSTRINGS
+#define MICROPY_PY_FSTRINGS         (1)
+#endif
 #define MICROPY_PY_BUILTINS_STR_UNICODE (1)
 #define MICROPY_PY_BUILTINS_STR_CENTER (1)
 #define MICROPY_PY_BUILTINS_STR_PARTITION (1)

From 1d9e489af3d00d737917b09c1f0d007705e970e9 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Fri, 23 Jul 2021 15:12:26 +1000
Subject: [PATCH 1196/3533] extmod/modbluetooth: Add send_update arg to
 gatts_write.

This allows the write to trigger a notification or indication, but only to
subscribed clients. This is different to gatts_notify/gatts_indicate,
which will unconditionally notify/indicate.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 docs/library/bluetooth.rst            | 19 +++++++++++++------
 extmod/btstack/modbluetooth_btstack.c |  5 ++++-
 extmod/modbluetooth.c                 | 14 ++++++++------
 extmod/modbluetooth.h                 |  4 ++--
 extmod/nimble/modbluetooth_nimble.c   | 13 +++++++++++--
 ports/zephyr/modbluetooth_zephyr.c    |  5 ++++-
 6 files changed, 42 insertions(+), 18 deletions(-)

diff --git a/docs/library/bluetooth.rst b/docs/library/bluetooth.rst
index f110bfb19579e..7ab4d6e88c945 100644
--- a/docs/library/bluetooth.rst
+++ b/docs/library/bluetooth.rst
@@ -485,10 +485,14 @@ writes from a client to a given characteristic, use
     Reads the local value for this handle (which has either been written by
     :meth:`gatts_write <BLE.gatts_write>` or by a remote client).
 
-.. method:: BLE.gatts_write(value_handle, data, /)
+.. method:: BLE.gatts_write(value_handle, data, send_update=False, /)
 
     Writes the local value for this handle, which can be read by a client.
 
+    If *send_update* is ``True``, then any subscribed clients will be notified
+    (or indicated, depending on what they're subscribed to and which operations
+    the characteristic supports) about this write.
+
 .. method:: BLE.gatts_notify(conn_handle, value_handle, data=None, /)
 
     Sends a notification request to a connected client.
@@ -499,17 +503,20 @@ writes from a client to a given characteristic, use
     Otherwise, if *data* is ``None``, then the current local value (as
     set with :meth:`gatts_write <BLE.gatts_write>`) will be sent.
 
-.. method:: BLE.gatts_indicate(conn_handle, value_handle, /)
+    **Note:** The notification will be sent regardless of the subscription
+    status of the client to this characteristic.
 
-    Sends an indication request to a connected client.
+.. method:: BLE.gatts_indicate(conn_handle, value_handle, /)
 
-    **Note:** This does not currently support sending a custom value, it will
-    always send the current local value (as set with :meth:`gatts_write
-    <BLE.gatts_write>`).
+    Sends an indication request containing the characteristic's current value to
+    a connected client.
 
     On acknowledgment (or failure, e.g. timeout), the
     ``_IRQ_GATTS_INDICATE_DONE`` event will be raised.
 
+    **Note:** The indication will be sent regardless of the subscription
+    status of the client to this characteristic.
+
 .. method:: BLE.gatts_set_buffer(value_handle, len, append=False, /)
 
     Sets the internal buffer size for a value in bytes. This will limit the
diff --git a/extmod/btstack/modbluetooth_btstack.c b/extmod/btstack/modbluetooth_btstack.c
index 9c88878038802..4e81e21fe2877 100644
--- a/extmod/btstack/modbluetooth_btstack.c
+++ b/extmod/btstack/modbluetooth_btstack.c
@@ -1085,11 +1085,14 @@ int mp_bluetooth_gatts_read(uint16_t value_handle, uint8_t **value, size_t *valu
     return mp_bluetooth_gatts_db_read(MP_STATE_PORT(bluetooth_btstack_root_pointers)->gatts_db, value_handle, value, value_len);
 }
 
-int mp_bluetooth_gatts_write(uint16_t value_handle, const uint8_t *value, size_t value_len) {
+int mp_bluetooth_gatts_write(uint16_t value_handle, const uint8_t *value, size_t value_len, bool send_update) {
     DEBUG_printf("mp_bluetooth_gatts_write\n");
     if (!mp_bluetooth_is_active()) {
         return ERRNO_BLUETOOTH_NOT_ACTIVE;
     }
+    if (send_update) {
+        return MP_EOPNOTSUPP;
+    }
     return mp_bluetooth_gatts_db_write(MP_STATE_PORT(bluetooth_btstack_root_pointers)->gatts_db, value_handle, value, value_len);
 }
 
diff --git a/extmod/modbluetooth.c b/extmod/modbluetooth.c
index bf8d071a943cd..cb153f70e9b5c 100644
--- a/extmod/modbluetooth.c
+++ b/extmod/modbluetooth.c
@@ -717,15 +717,17 @@ STATIC mp_obj_t bluetooth_ble_gatts_read(mp_obj_t self_in, mp_obj_t value_handle
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_2(bluetooth_ble_gatts_read_obj, bluetooth_ble_gatts_read);
 
-STATIC mp_obj_t bluetooth_ble_gatts_write(mp_obj_t self_in, mp_obj_t value_handle_in, mp_obj_t data) {
-    (void)self_in;
+STATIC mp_obj_t bluetooth_ble_gatts_write(size_t n_args, const mp_obj_t *args) {
     mp_buffer_info_t bufinfo = {0};
-    mp_get_buffer_raise(data, &bufinfo, MP_BUFFER_READ);
-    int err = mp_bluetooth_gatts_write(mp_obj_get_int(value_handle_in), bufinfo.buf, bufinfo.len);
-    bluetooth_handle_errno(err);
+    mp_get_buffer_raise(args[2], &bufinfo, MP_BUFFER_READ);
+    bool send_update = false;
+    if (n_args > 3) {
+        send_update = mp_obj_is_true(args[3]);
+    }
+    bluetooth_handle_errno(mp_bluetooth_gatts_write(mp_obj_get_int(args[1]), bufinfo.buf, bufinfo.len, send_update));
     return MP_OBJ_NEW_SMALL_INT(bufinfo.len);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_3(bluetooth_ble_gatts_write_obj, bluetooth_ble_gatts_write);
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(bluetooth_ble_gatts_write_obj, 3, 4, bluetooth_ble_gatts_write);
 
 STATIC mp_obj_t bluetooth_ble_gatts_notify(size_t n_args, const mp_obj_t *args) {
     mp_int_t conn_handle = mp_obj_get_int(args[1]);
diff --git a/extmod/modbluetooth.h b/extmod/modbluetooth.h
index d126ad6c11344..43519e5941a8b 100644
--- a/extmod/modbluetooth.h
+++ b/extmod/modbluetooth.h
@@ -334,8 +334,8 @@ int mp_bluetooth_gatts_register_service_end(void);
 
 // Read the value from the local gatts db (likely this has been written by a central).
 int mp_bluetooth_gatts_read(uint16_t value_handle, uint8_t **value, size_t *value_len);
-// Write a value to the local gatts db (ready to be queried by a central).
-int mp_bluetooth_gatts_write(uint16_t value_handle, const uint8_t *value, size_t value_len);
+// Write a value to the local gatts db (ready to be queried by a central). Optionally send notifications/indications.
+int mp_bluetooth_gatts_write(uint16_t value_handle, const uint8_t *value, size_t value_len, bool send_update);
 // Notify the central that it should do a read.
 int mp_bluetooth_gatts_notify(uint16_t conn_handle, uint16_t value_handle);
 // Notify the central, including a data payload. (Note: does not set the gatts db value).
diff --git a/extmod/nimble/modbluetooth_nimble.c b/extmod/nimble/modbluetooth_nimble.c
index d7ad7e17c9323..e4b4cb68af1af 100644
--- a/extmod/nimble/modbluetooth_nimble.c
+++ b/extmod/nimble/modbluetooth_nimble.c
@@ -512,6 +512,11 @@ STATIC int central_gap_event_cb(struct ble_gap_event *event, void *arg) {
 
             return 0;
         }
+
+        case BLE_GAP_EVENT_SUBSCRIBE: {
+            DEBUG_printf("central_gap_event_cb: subscribe: handle=%d, reason=%d notify=%d indicate=%d \n", event->subscribe.attr_handle, event->subscribe.reason, event->subscribe.cur_notify, event->subscribe.cur_indicate);
+            return 0;
+        }
     }
 
     return commmon_gap_event_cb(event, arg);
@@ -1004,11 +1009,15 @@ int mp_bluetooth_gatts_read(uint16_t value_handle, uint8_t **value, size_t *valu
     return mp_bluetooth_gatts_db_read(MP_STATE_PORT(bluetooth_nimble_root_pointers)->gatts_db, value_handle, value, value_len);
 }
 
-int mp_bluetooth_gatts_write(uint16_t value_handle, const uint8_t *value, size_t value_len) {
+int mp_bluetooth_gatts_write(uint16_t value_handle, const uint8_t *value, size_t value_len, bool send_update) {
     if (!mp_bluetooth_is_active()) {
         return ERRNO_BLUETOOTH_NOT_ACTIVE;
     }
-    return mp_bluetooth_gatts_db_write(MP_STATE_PORT(bluetooth_nimble_root_pointers)->gatts_db, value_handle, value, value_len);
+    int err = mp_bluetooth_gatts_db_write(MP_STATE_PORT(bluetooth_nimble_root_pointers)->gatts_db, value_handle, value, value_len);
+    if (err == 0 && send_update) {
+        ble_gatts_chr_updated(value_handle);
+    }
+    return err;
 }
 
 // TODO: Could use ble_gatts_chr_updated to send to all subscribed centrals.
diff --git a/ports/zephyr/modbluetooth_zephyr.c b/ports/zephyr/modbluetooth_zephyr.c
index 6b3a10d47114e..5753d714760b1 100644
--- a/ports/zephyr/modbluetooth_zephyr.c
+++ b/ports/zephyr/modbluetooth_zephyr.c
@@ -308,10 +308,13 @@ int mp_bluetooth_gatts_read(uint16_t value_handle, uint8_t **value, size_t *valu
     return mp_bluetooth_gatts_db_read(MP_STATE_PORT(bluetooth_zephyr_root_pointers)->gatts_db, value_handle, value, value_len);
 }
 
-int mp_bluetooth_gatts_write(uint16_t value_handle, const uint8_t *value, size_t value_len) {
+int mp_bluetooth_gatts_write(uint16_t value_handle, const uint8_t *value, size_t value_len, bool send_update) {
     if (!mp_bluetooth_is_active()) {
         return ERRNO_BLUETOOTH_NOT_ACTIVE;
     }
+    if (send_update) {
+        return MP_EOPNOTSUPP;
+    }
     return mp_bluetooth_gatts_db_write(MP_STATE_PORT(bluetooth_zephyr_root_pointers)->gatts_db, value_handle, value, value_len);
 }
 

From c70930fb24f3e10dfde6ca7c89421eb94136d3be Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Sat, 14 Aug 2021 00:24:07 +1000
Subject: [PATCH 1197/3533] tests/multi_bluetooth/ble_subscribe.py: Add test
 for subscription.

This tests both sending indications/notifications from a server to
subscribed clients via gatts_write(...,send_update=True) and subscribing
from a client.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 tests/multi_bluetooth/ble_subscribe.py     | 246 +++++++++++++++++++++
 tests/multi_bluetooth/ble_subscribe.py.exp |  39 ++++
 2 files changed, 285 insertions(+)
 create mode 100644 tests/multi_bluetooth/ble_subscribe.py
 create mode 100644 tests/multi_bluetooth/ble_subscribe.py.exp

diff --git a/tests/multi_bluetooth/ble_subscribe.py b/tests/multi_bluetooth/ble_subscribe.py
new file mode 100644
index 0000000000000..7cbcc6319697e
--- /dev/null
+++ b/tests/multi_bluetooth/ble_subscribe.py
@@ -0,0 +1,246 @@
+# Test for sending notifications to subscribed clients.
+
+from micropython import const
+import time, machine, bluetooth
+
+TIMEOUT_MS = 5000
+
+_IRQ_CENTRAL_CONNECT = const(1)
+_IRQ_CENTRAL_DISCONNECT = const(2)
+_IRQ_GATTS_WRITE = const(3)
+_IRQ_PERIPHERAL_CONNECT = const(7)
+_IRQ_PERIPHERAL_DISCONNECT = const(8)
+_IRQ_GATTC_CHARACTERISTIC_RESULT = const(11)
+_IRQ_GATTC_CHARACTERISTIC_DONE = const(12)
+_IRQ_GATTC_DESCRIPTOR_RESULT = const(13)
+_IRQ_GATTC_DESCRIPTOR_DONE = const(14)
+_IRQ_GATTC_READ_RESULT = const(15)
+_IRQ_GATTC_READ_DONE = const(16)
+_IRQ_GATTC_WRITE_DONE = const(17)
+_IRQ_GATTC_NOTIFY = const(18)
+_IRQ_GATTC_INDICATE = const(19)
+
+_CCCD_UUID = bluetooth.UUID(const(0x2902))
+
+SERVICE_UUID = bluetooth.UUID("A5A5A5A5-FFFF-9999-1111-5A5A5A5A5A5A")
+CHAR_UUID = bluetooth.UUID("00000000-1111-2222-3333-444444444444")
+CHAR = (
+    CHAR_UUID,
+    bluetooth.FLAG_READ | bluetooth.FLAG_WRITE | bluetooth.FLAG_NOTIFY | bluetooth.FLAG_INDICATE,
+)
+SERVICE = (
+    SERVICE_UUID,
+    (CHAR,),
+)
+SERVICES = (SERVICE,)
+
+waiting_events = {}
+
+
+def irq(event, data):
+    if event == _IRQ_CENTRAL_CONNECT:
+        print("_IRQ_CENTRAL_CONNECT")
+        waiting_events[event] = data[0]
+    elif event == _IRQ_CENTRAL_DISCONNECT:
+        print("_IRQ_CENTRAL_DISCONNECT")
+    elif event == _IRQ_GATTS_WRITE:
+        print("_IRQ_GATTS_WRITE", ble.gatts_read(data[-1]))
+    elif event == _IRQ_PERIPHERAL_CONNECT:
+        print("_IRQ_PERIPHERAL_CONNECT")
+        waiting_events[event] = data[0]
+    elif event == _IRQ_PERIPHERAL_DISCONNECT:
+        print("_IRQ_PERIPHERAL_DISCONNECT")
+    elif event == _IRQ_GATTC_CHARACTERISTIC_RESULT:
+        # conn_handle, def_handle, value_handle, properties, uuid = data
+        if data[-1] == CHAR_UUID:
+            print("_IRQ_GATTC_CHARACTERISTIC_RESULT", data[-1])
+            waiting_events[event] = data[2]
+        else:
+            return
+    elif event == _IRQ_GATTC_CHARACTERISTIC_DONE:
+        print("_IRQ_GATTC_CHARACTERISTIC_DONE")
+    elif event == _IRQ_GATTC_DESCRIPTOR_RESULT:
+        # conn_handle, dsc_handle, uuid = data
+        if data[-1] == _CCCD_UUID:
+            print("_IRQ_GATTC_DESCRIPTOR_RESULT", data[-1])
+            waiting_events[event] = data[1]
+        else:
+            return
+    elif event == _IRQ_GATTC_DESCRIPTOR_DONE:
+        print("_IRQ_GATTC_DESCRIPTOR_DONE")
+    elif event == _IRQ_GATTC_READ_RESULT:
+        print("_IRQ_GATTC_READ_RESULT", bytes(data[-1]))
+    elif event == _IRQ_GATTC_READ_DONE:
+        print("_IRQ_GATTC_READ_DONE", data[-1])
+    elif event == _IRQ_GATTC_WRITE_DONE:
+        print("_IRQ_GATTC_WRITE_DONE", data[-1])
+    elif event == _IRQ_GATTC_NOTIFY:
+        print("_IRQ_GATTC_NOTIFY", bytes(data[-1]))
+    elif event == _IRQ_GATTC_INDICATE:
+        print("_IRQ_GATTC_NOTIFY", bytes(data[-1]))
+
+    if event not in waiting_events:
+        waiting_events[event] = None
+
+
+def wait_for_event(event, timeout_ms):
+    t0 = time.ticks_ms()
+    while time.ticks_diff(time.ticks_ms(), t0) < timeout_ms:
+        if event in waiting_events:
+            return waiting_events.pop(event)
+        machine.idle()
+    raise ValueError("Timeout waiting for {}".format(event))
+
+
+# Acting in peripheral role.
+def instance0():
+    multitest.globals(BDADDR=ble.config("mac"))
+    ((char_handle,),) = ble.gatts_register_services(SERVICES)
+    print("gap_advertise")
+    ble.gap_advertise(20_000, b"\x02\x01\x06\x04\xffMPY")  # \x04\x09MPY
+    multitest.next()
+    try:
+        # Write initial characteristic value (will be read by client).
+        ble.gatts_write(char_handle, "periph0")  ###
+
+        # Wait for central to connect to us.
+        conn_handle = wait_for_event(_IRQ_CENTRAL_CONNECT, TIMEOUT_MS * 10)
+
+        # A
+        # Wait for a write to the characteristic from the central (to synchronise).
+        wait_for_event(_IRQ_GATTS_WRITE, TIMEOUT_MS)
+        print("sync A")
+        # This should be local-only.
+        ble.gatts_write(char_handle, "periph1")
+        time.sleep_ms(100)
+        # Update local-only, then force notify.
+        ble.gatts_write(char_handle, "periph2")
+        ble.gatts_notify(conn_handle, char_handle)  ###
+        time.sleep_ms(100)
+        # Update local and notify subscribers. No notification should be sent.
+        ble.gatts_write(char_handle, "periph3", True)
+        time.sleep_ms(100)
+        multitest.broadcast("A")
+
+        # B
+        # Synchronise with the client (which should now be subscribed for notify).
+        wait_for_event(_IRQ_GATTS_WRITE, TIMEOUT_MS)
+        print("sync B")
+        # This should be local-only (send_update=False).
+        ble.gatts_write(char_handle, "periph4", False)
+        time.sleep_ms(100)
+        # This should notify the subscribed client.
+        ble.gatts_write(char_handle, "periph5", True)  ###
+        time.sleep_ms(100)
+        multitest.broadcast("B")
+
+        # C
+        # Synchronise with the client (which should now be subscribed for indicate).
+        wait_for_event(_IRQ_GATTS_WRITE, TIMEOUT_MS)
+        print("sync C")
+        # This should be local-only (send_update=False).
+        ble.gatts_write(char_handle, "periph6", False)
+        time.sleep_ms(100)
+        # This should indicate the subscribed client.
+        ble.gatts_write(char_handle, "periph7", True)  ###
+        time.sleep_ms(100)
+        multitest.broadcast("C")
+
+        # D
+        # Synchronise with the client (which should now be unsubscribed).
+        wait_for_event(_IRQ_GATTS_WRITE, TIMEOUT_MS)
+        print("sync D")
+        # This should be local-only (send_update=False).
+        ble.gatts_write(char_handle, "periph8", False)
+        time.sleep_ms(100)
+        # This should be local-only (no more subscribers).
+        ble.gatts_write(char_handle, "periph9", True)
+        time.sleep_ms(100)
+        # Update local-only, then another force notify.
+        ble.gatts_write(char_handle, "periph10")
+        ble.gatts_notify(conn_handle, char_handle)  ###
+        time.sleep_ms(100)
+        multitest.broadcast("D")
+
+        # Wait for the central to disconnect.
+        wait_for_event(_IRQ_CENTRAL_DISCONNECT, TIMEOUT_MS)
+    finally:
+        ble.active(0)
+
+
+# Acting in central role.
+def instance1():
+    multitest.next()
+    try:
+        # Connect to peripheral and then disconnect.
+        print("gap_connect")
+        ble.gap_connect(*BDADDR)
+        conn_handle = wait_for_event(_IRQ_PERIPHERAL_CONNECT, TIMEOUT_MS)
+
+        # Discover characteristics.
+        ble.gattc_discover_characteristics(conn_handle, 1, 65535)
+        value_handle = wait_for_event(_IRQ_GATTC_CHARACTERISTIC_RESULT, TIMEOUT_MS)
+        wait_for_event(_IRQ_GATTC_CHARACTERISTIC_DONE, TIMEOUT_MS)
+
+        # Discover CCCD.
+        ble.gattc_discover_descriptors(conn_handle, value_handle, value_handle + 5)
+        cccd_handle = wait_for_event(_IRQ_GATTC_DESCRIPTOR_RESULT, TIMEOUT_MS)
+        wait_for_event(_IRQ_GATTC_DESCRIPTOR_DONE, TIMEOUT_MS)
+
+        # Issue read of characteristic, should get initial value.
+        print("gattc_read")
+        ble.gattc_read(conn_handle, value_handle)
+        wait_for_event(_IRQ_GATTC_READ_RESULT, TIMEOUT_MS)
+
+        # While the four states are active, all incoming notifications
+        # and indications will be printed by the event handler. We
+        # should only expect to see certain ones.
+
+        # Start unsubscribed.
+        # Write to the characteristic (triggers A).
+        print("gattc_write")
+        ble.gattc_write(conn_handle, value_handle, "central0", 1)
+        wait_for_event(_IRQ_GATTC_WRITE_DONE, TIMEOUT_MS)
+        # Wait for A to complete.
+        multitest.wait("A")
+
+        # Subscribe for notify.
+        ble.gattc_write(conn_handle, cccd_handle, b"\x01\x00", 1)
+        wait_for_event(_IRQ_GATTC_WRITE_DONE, TIMEOUT_MS)
+        # Write to the characteristic (triggers B).
+        print("gattc_write")
+        ble.gattc_write(conn_handle, value_handle, "central1", 1)
+        wait_for_event(_IRQ_GATTC_WRITE_DONE, TIMEOUT_MS)
+        # Wait for B to complete.
+        multitest.wait("B")
+
+        # Subscribe for indicate.
+        ble.gattc_write(conn_handle, cccd_handle, b"\x02\x00", 1)
+        wait_for_event(_IRQ_GATTC_WRITE_DONE, TIMEOUT_MS)
+        # Write to the characteristic (triggers C).
+        print("gattc_write")
+        ble.gattc_write(conn_handle, value_handle, "central2", 1)
+        wait_for_event(_IRQ_GATTC_WRITE_DONE, TIMEOUT_MS)
+        # Wait for C to complete.
+        multitest.wait("C")
+
+        # Unsubscribe.
+        ble.gattc_write(conn_handle, cccd_handle, b"\x00\x00", 1)
+        wait_for_event(_IRQ_GATTC_WRITE_DONE, TIMEOUT_MS)
+        # Write to the characteristic (triggers D).
+        print("gattc_write")
+        ble.gattc_write(conn_handle, value_handle, "central3", 1)
+        wait_for_event(_IRQ_GATTC_WRITE_DONE, TIMEOUT_MS)
+        # Wait for D to complete.
+        multitest.wait("D")
+
+        # Disconnect from peripheral.
+        print("gap_disconnect:", ble.gap_disconnect(conn_handle))
+        wait_for_event(_IRQ_PERIPHERAL_DISCONNECT, TIMEOUT_MS)
+    finally:
+        ble.active(0)
+
+
+ble = bluetooth.BLE()
+ble.active(1)
+ble.irq(irq)
diff --git a/tests/multi_bluetooth/ble_subscribe.py.exp b/tests/multi_bluetooth/ble_subscribe.py.exp
new file mode 100644
index 0000000000000..e0b4ed2f4d0ce
--- /dev/null
+++ b/tests/multi_bluetooth/ble_subscribe.py.exp
@@ -0,0 +1,39 @@
+--- instance0 ---
+gap_advertise
+_IRQ_CENTRAL_CONNECT
+_IRQ_GATTS_WRITE b'central0'
+sync A
+_IRQ_GATTS_WRITE b'central1'
+sync B
+_IRQ_GATTS_WRITE b'central2'
+sync C
+_IRQ_GATTS_WRITE b'central3'
+sync D
+_IRQ_CENTRAL_DISCONNECT
+--- instance1 ---
+gap_connect
+_IRQ_PERIPHERAL_CONNECT
+_IRQ_GATTC_CHARACTERISTIC_RESULT UUID('00000000-1111-2222-3333-444444444444')
+_IRQ_GATTC_CHARACTERISTIC_DONE
+_IRQ_GATTC_DESCRIPTOR_RESULT UUID(0x2902)
+_IRQ_GATTC_DESCRIPTOR_DONE
+gattc_read
+_IRQ_GATTC_READ_RESULT b'periph0'
+_IRQ_GATTC_READ_DONE 0
+gattc_write
+_IRQ_GATTC_WRITE_DONE 0
+_IRQ_GATTC_NOTIFY b'periph2'
+_IRQ_GATTC_WRITE_DONE 0
+gattc_write
+_IRQ_GATTC_WRITE_DONE 0
+_IRQ_GATTC_NOTIFY b'periph5'
+_IRQ_GATTC_WRITE_DONE 0
+gattc_write
+_IRQ_GATTC_WRITE_DONE 0
+_IRQ_GATTC_NOTIFY b'periph7'
+_IRQ_GATTC_WRITE_DONE 0
+gattc_write
+_IRQ_GATTC_WRITE_DONE 0
+_IRQ_GATTC_NOTIFY b'periph10'
+gap_disconnect: True
+_IRQ_PERIPHERAL_DISCONNECT

From a1dc7277d950ddc493ee81a6c3ef736446b70352 Mon Sep 17 00:00:00 2001
From: Philipp Ebensberger <philipp.ebensberger@3bricks-software.de>
Date: Fri, 13 Aug 2021 20:47:00 +0200
Subject: [PATCH 1198/3533] mimxrt/machine_pin: Implement ioctl for Pin.

To make machine.Signal work correctly (among other things).  The solution
is taken over from the rp2 port.

Signed-off-by: Philipp Ebensberger
---
 ports/mimxrt/machine_pin.c | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/ports/mimxrt/machine_pin.c b/ports/mimxrt/machine_pin.c
index 3a1151ba81861..12975806d6559 100644
--- a/ports/mimxrt/machine_pin.c
+++ b/ports/mimxrt/machine_pin.c
@@ -32,6 +32,7 @@
 #include "py/runtime.h"
 #include "py/mphal.h"
 #include "shared/runtime/mpirq.h"
+#include "extmod/virtpin.h"
 #include "pin.h"
 
 // Local functions
@@ -425,12 +426,34 @@ STATIC const mp_rom_map_elem_t machine_pin_locals_dict_table[] = {
 };
 STATIC MP_DEFINE_CONST_DICT(machine_pin_locals_dict, machine_pin_locals_dict_table);
 
+
+STATIC mp_uint_t machine_pin_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_t arg, int *errcode) {
+    (void)errcode;
+    machine_pin_obj_t *self = self_in;
+
+    switch (request) {
+        case MP_PIN_READ: {
+            return mp_hal_pin_read(self);
+        }
+        case MP_PIN_WRITE: {
+            mp_hal_pin_write(self, arg);
+            return 0;
+        }
+    }
+    return -1;
+}
+
+STATIC const mp_pin_p_t machine_pin_obj_protocol = {
+    .ioctl = machine_pin_ioctl,
+};
+
 const mp_obj_type_t machine_pin_type = {
     {&mp_type_type},
     .name = MP_QSTR_Pin,
     .print = machine_pin_obj_print,
     .call = machine_pin_obj_call,
     .make_new = mp_pin_make_new,
+    .protocol = &machine_pin_obj_protocol,
     .locals_dict = (mp_obj_dict_t *)&machine_pin_locals_dict,
 };
 

From 5b655665ab068c4ee7de7891ae2d3cb7ed630512 Mon Sep 17 00:00:00 2001
From: Jonathan Hogg <me@jonathanhogg.com>
Date: Sun, 15 Aug 2021 17:13:16 +0100
Subject: [PATCH 1199/3533] esp32/machine_hw_spi: Release GIL during transfers.

Release the GIL while waiting for SPI transfers to complete to allow other
threads to make progress.

Fixes #7662.
---
 ports/esp32/machine_hw_spi.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ports/esp32/machine_hw_spi.c b/ports/esp32/machine_hw_spi.c
index 76b1896bba120..ca530ba943f9d 100644
--- a/ports/esp32/machine_hw_spi.c
+++ b/ports/esp32/machine_hw_spi.c
@@ -346,7 +346,9 @@ STATIC void machine_hw_spi_transfer(mp_obj_base_t *self_in, size_t len, const ui
 
             if (offset > 0) {
                 // wait for previously queued transaction
+                MP_THREAD_GIL_EXIT();
                 spi_device_get_trans_result(self->spi, &result, portMAX_DELAY);
+                MP_THREAD_GIL_ENTER();
             }
 
             // doesn't need ceil(); loop ends when bits_remaining is 0
@@ -354,7 +356,9 @@ STATIC void machine_hw_spi_transfer(mp_obj_base_t *self_in, size_t len, const ui
         }
 
         // wait for last transaction
+        MP_THREAD_GIL_EXIT();
         spi_device_get_trans_result(self->spi, &result, portMAX_DELAY);
+        MP_THREAD_GIL_ENTER();
         spi_device_release_bus(self->spi);
     }
 }

From e25c5cb8d249c3200753199a6682bc9a028b8860 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 16 Aug 2021 14:38:11 +1000
Subject: [PATCH 1200/3533] esp32/machine_pin: Make check for non-output pins
 respect chip variant.

Fixes issue #7631.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/machine_pin.c | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/ports/esp32/machine_pin.c b/ports/esp32/machine_pin.c
index 477623796a5de..181f88b78720a 100644
--- a/ports/esp32/machine_pin.c
+++ b/ports/esp32/machine_pin.c
@@ -49,6 +49,12 @@
 #define GPIO_PULL_UP   (2)
 #define GPIO_PULL_HOLD (4)
 
+#if CONFIG_IDF_TARGET_ESP32
+#define GPIO_FIRST_NON_OUTPUT (34)
+#elif CONFIG_IDF_TARGET_ESP32S2
+#define GPIO_FIRST_NON_OUTPUT (46)
+#endif
+
 typedef struct _machine_pin_obj_t {
     mp_obj_base_t base;
     gpio_num_t id;
@@ -265,11 +271,12 @@ STATIC mp_obj_t machine_pin_obj_init_helper(const machine_pin_obj_t *self, size_
     // configure mode
     if (args[ARG_mode].u_obj != mp_const_none) {
         mp_int_t pin_io_mode = mp_obj_get_int(args[ARG_mode].u_obj);
-        if (self->id >= 34 && (pin_io_mode & GPIO_MODE_DEF_OUTPUT)) {
+        #ifdef GPIO_FIRST_NON_OUTPUT
+        if (self->id >= GPIO_FIRST_NON_OUTPUT && (pin_io_mode & GPIO_MODE_DEF_OUTPUT)) {
             mp_raise_ValueError(MP_ERROR_TEXT("pin can only be input"));
-        } else {
-            gpio_set_direction(self->id, pin_io_mode);
         }
+        #endif
+        gpio_set_direction(self->id, pin_io_mode);
     }
 
     // configure pull

From 0c2cadf1c8c733878a5ecfe65fe339a8702f76bd Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Mon, 16 Aug 2021 22:43:02 +1000
Subject: [PATCH 1201/3533] unix/Makefile: Disable error compression on
 arm-linux-gnueabi-gcc.

This compiler is unable to optimise out the giant strcmp match generated
by MP_MATCH_COMPRESSED.

See github.com/micropython/micropython/pull/7659#issuecomment-899479793

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/unix/Makefile | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/ports/unix/Makefile b/ports/unix/Makefile
index 36b6322d86c29..bf9d290abfa9a 100644
--- a/ports/unix/Makefile
+++ b/ports/unix/Makefile
@@ -290,6 +290,17 @@ else
 RUN_TESTS_MPY_CROSS_FLAGS = --mpy-cross-flags='-mcache-lookup-bc'
 endif
 
+ifeq ($(CROSS_COMPILE),arm-linux-gnueabi-)
+# Force disable error text compression when compiling for ARM as the compiler
+# cannot optimise out the giant strcmp list generated for MP_MATCH_COMPRESSED.
+# Checked on:
+# arm-linux-gnueabi-gcc (Ubuntu/Linaro 7.5.0-3ubuntu1~18.04) 7.5.0
+# arm-linux-gnueabi-gcc (Ubuntu 9.3.0-17ubuntu1~20.04) 9.3.0
+# See https://github.com/micropython/micropython/pull/7659 for details.
+$(info Detected arm-linux-gnueabi-gcc. Disabling error message compression.)
+MICROPY_ROM_TEXT_COMPRESSION = 0
+endif
+
 include $(TOP)/py/mkrules.mk
 
 .PHONY: test test_full

From 91a99fcf0e79ccd8099881f744467fc32bd93672 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Mon, 16 Aug 2021 22:45:06 +1000
Subject: [PATCH 1202/3533] tests/extmod/vfs_fat_finaliser.py: Ensure alloc at
 never-used GC blocks.

Prevents the finaliser from being missed if there's a dangling reference
on the stack to one of the blocks for the files (that this test checks
that they get finalised).

See github.com/micropython/micropython/pull/7659#issuecomment-899479793

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 tests/extmod/vfs_fat_finaliser.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/tests/extmod/vfs_fat_finaliser.py b/tests/extmod/vfs_fat_finaliser.py
index e30f42f8471f5..b67afc2d94641 100644
--- a/tests/extmod/vfs_fat_finaliser.py
+++ b/tests/extmod/vfs_fat_finaliser.py
@@ -56,6 +56,13 @@ def ioctl(self, op, arg):
 # Here we test that the finaliser is actually called during a garbage collection.
 import gc
 
+# Do a large number of single-block allocations to move the GC head forwards,
+# ensuring that the files are allocated from never-before-used blocks and
+# therefore couldn't possibly have any references to them left behind on
+# the stack.
+for i in range(1024):
+    []
+
 N = 4
 for i in range(N):
     n = "x%d" % i

From af162257d377afdc08a92e40a520fc69a58e6d27 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Mon, 16 Aug 2021 23:07:46 +1000
Subject: [PATCH 1203/3533] docs/library/builtins.rst: Add module title.

This fixes the rendering on library/index.rst.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 docs/library/builtins.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/library/builtins.rst b/docs/library/builtins.rst
index 3029cd9e3bd34..7a0229c2aaaf6 100644
--- a/docs/library/builtins.rst
+++ b/docs/library/builtins.rst
@@ -1,5 +1,5 @@
-Builtin functions and exceptions
-================================
+:mod:`builtins` -- builtin functions and exceptions
+===================================================
 
 All builtin functions and exceptions are described here. They are also
 available via ``builtins`` module.

From 44818d1a35315c4dde34050eb0aac98866f9eb15 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Mon, 16 Aug 2021 23:08:20 +1000
Subject: [PATCH 1204/3533] docs/library/network.rst: Simplify socket import.

Replace `import socket as socket` with `import socket`.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 docs/library/network.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/library/network.rst b/docs/library/network.rst
index c188bb31351a3..1bd7e303bb636 100644
--- a/docs/library/network.rst
+++ b/docs/library/network.rst
@@ -27,7 +27,7 @@ For example::
     print(nic.ifconfig())
 
     # now use socket as usual
-    import socket as socket
+    import socket
     addr = socket.getaddrinfo('micropython.org', 80)[0][-1]
     s = socket.socket()
     s.connect(addr)

From 5555f147dfb23d76bab4fcb688a5a254bc487a63 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Wed, 18 Aug 2021 11:51:10 +1000
Subject: [PATCH 1205/3533] py/lexer: Clear fstring_args vstr on lexer free.

This was missed in 692d36d779192f32371f7f9daa845b566f26968d.  It's not
strictly necessary as the GC will clean it anyway, but it's good to
pre-emptively gc_free() all the blocks used in lexing/parsing.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 py/lexer.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/py/lexer.c b/py/lexer.c
index ba118c9d2f299..69c7d14a77614 100644
--- a/py/lexer.c
+++ b/py/lexer.c
@@ -878,6 +878,9 @@ void mp_lexer_free(mp_lexer_t *lex) {
     if (lex) {
         lex->reader.close(lex->reader.data);
         vstr_clear(&lex->vstr);
+        #if MICROPY_PY_FSTRINGS
+        vstr_clear(&lex->fstring_args);
+        #endif
         m_del(uint16_t, lex->indent_level, lex->alloc_indent_level);
         m_del_obj(mp_lexer_t, lex);
     }

From 226c0341ca78086b98f802d26f61220a2c19ffef Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 17 Aug 2021 13:30:05 +1000
Subject: [PATCH 1206/3533] tools/mpremote: Remove support for pyb.USB_VCP
 in/out specialisation.

The sys.stdin.buffer and sys.stdout.buffer streams work just as well (and
are just as fast) as pyb.USB_VCP on stm32 devices, so there's no need to
have the USB_VCP specialisation code, which just adds complexity.

Also, on stm32 devices with both USB and UART (or other serial interface),
if something other than the USB_VCP port is used for the serial connection
then mpremote mount will not work because it will default to reading and
writing on USB_VCP instead of the other connected serial stream.

As part of this simplification, support for a second port as input is
removed (this feature was never exposed to the user).

Signed-off-by: Damien George <damien@micropython.org>
---
 tools/mpremote/mpremote/pyboardextended.py | 47 ++++++----------------
 1 file changed, 12 insertions(+), 35 deletions(-)

diff --git a/tools/mpremote/mpremote/pyboardextended.py b/tools/mpremote/mpremote/pyboardextended.py
index abdffb7532e57..ccd3098e3824c 100644
--- a/tools/mpremote/mpremote/pyboardextended.py
+++ b/tools/mpremote/mpremote/pyboardextended.py
@@ -24,27 +24,18 @@
 }
 
 fs_hook_code = """\
-import uos, uio, ustruct, micropython, usys
+import uos, uio, ustruct, micropython
 
 SEEK_SET = 0
 
 class RemoteCommand:
-    def __init__(self, use_second_port):
+    def __init__(self):
+        import uselect, usys
         self.buf4 = bytearray(4)
-        try:
-            import pyb
-            self.fout = pyb.USB_VCP()
-            if use_second_port:
-                self.fin = pyb.USB_VCP(1)
-            else:
-                self.fin = pyb.USB_VCP()
-        except:
-            import usys
-            self.fout = usys.stdout.buffer
-            self.fin = usys.stdin.buffer
-        import select
-        self.poller = select.poll()
-        self.poller.register(self.fin, select.POLLIN)
+        self.fout = usys.stdout.buffer
+        self.fin = usys.stdin.buffer
+        self.poller = uselect.poll()
+        self.poller.register(self.fin, uselect.POLLIN)
 
     def poll_in(self):
         for _ in self.poller.ipoll(1000):
@@ -317,8 +308,8 @@ def open(self, path, mode):
         return RemoteFile(c, fd, mode.find('b') == -1)
 
 
-def __mount(use_second_port):
-    uos.mount(RemoteFS(RemoteCommand(use_second_port)), '/remote')
+def __mount():
+    uos.mount(RemoteFS(RemoteCommand()), '/remote')
     uos.chdir('/remote')
 """
 
@@ -571,28 +562,14 @@ def __init__(self, dev, *args, **kwargs):
         self.device_name = dev
         self.mounted = False
 
-    def mount_local(self, path, dev_out=None):
+    def mount_local(self, path):
         fout = self.serial
-        if dev_out is not None:
-            try:
-                fout = serial.Serial(dev_out)
-            except serial.SerialException:
-                port = list(serial.tools.list_ports.grep(dev_out))
-                if not port:
-                    raise
-                for p in port:
-                    try:
-                        fout = serial.Serial(p.device)
-                        break
-                    except serial.SerialException:
-                        pass
         self.mounted = True
         if self.eval('"RemoteFS" in globals()') == b"False":
             self.exec_(fs_hook_code)
-        self.exec_("__mount(%s)" % (dev_out is not None))
+        self.exec_("__mount()")
         self.cmd = PyboardCommand(self.serial, fout, path)
         self.serial = SerialIntercept(self.serial, self.cmd)
-        self.dev_out = dev_out
 
     def soft_reset_with_mount(self, out_callback):
         self.serial.write(b"\x04")
@@ -618,7 +595,7 @@ def soft_reset_with_mount(self, out_callback):
             n = self.serial.inWaiting()
         self.serial.write(b"\x01")
         self.exec_(fs_hook_code)
-        self.exec_("__mount(%s)" % (self.dev_out is not None))
+        self.exec_("__mount()")
         self.exit_raw_repl()
         self.read_until(4, b">>> ")
         self.serial = SerialIntercept(self.serial, self.cmd)

From 870000f35b2d278bd759c54ac59e2f97fcdc7dfd Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Tue, 10 Aug 2021 01:09:04 +1000
Subject: [PATCH 1207/3533] extmod: Add machine.bitstream.

This is a generic API for synchronously bit-banging data on a pin.

Initially this adds a single supported encoding, which supports controlling
WS2812 LEDs.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 extmod/extmod.cmake        |  1 +
 extmod/machine_bitstream.c | 65 ++++++++++++++++++++++++++++++++++++++
 extmod/machine_bitstream.h | 37 ++++++++++++++++++++++
 py/mpconfig.h              |  5 +++
 py/py.mk                   |  1 +
 5 files changed, 109 insertions(+)
 create mode 100644 extmod/machine_bitstream.c
 create mode 100644 extmod/machine_bitstream.h

diff --git a/extmod/extmod.cmake b/extmod/extmod.cmake
index 9ea2ba0af9463..c6b45b0d3e746 100644
--- a/extmod/extmod.cmake
+++ b/extmod/extmod.cmake
@@ -6,6 +6,7 @@ set(MICROPY_OOFATFS_DIR "${MICROPY_DIR}/lib/oofatfs")
 set(MICROPY_SOURCE_EXTMOD
     ${MICROPY_DIR}/shared/libc/abort_.c
     ${MICROPY_DIR}/shared/libc/printf.c
+    ${MICROPY_EXTMOD_DIR}/machine_bitstream.c
     ${MICROPY_EXTMOD_DIR}/machine_i2c.c
     ${MICROPY_EXTMOD_DIR}/machine_mem.c
     ${MICROPY_EXTMOD_DIR}/machine_pulse.c
diff --git a/extmod/machine_bitstream.c b/extmod/machine_bitstream.c
new file mode 100644
index 0000000000000..30f1ff1ea3da4
--- /dev/null
+++ b/extmod/machine_bitstream.c
@@ -0,0 +1,65 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Jim Mussared
+ * Copyright (c) 2021 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "py/runtime.h"
+#include "py/mphal.h"
+#include "extmod/machine_bitstream.h"
+
+#if MICROPY_PY_MACHINE_BITSTREAM
+
+// Timing is a 4-tuple of (high_time_0, low_time_0, high_time_1, low_time_1)
+// suitable for driving WS2812.
+#define MICROPY_MACHINE_BITSTREAM_TYPE_HIGH_LOW (0)
+
+// machine.bitstream(pin, encoding, (timing), bytes)
+STATIC mp_obj_t machine_bitstream_(size_t n_args, const mp_obj_t *args) {
+    mp_hal_pin_obj_t pin = mp_hal_get_pin_obj(args[0]);
+    int encoding = mp_obj_get_int(args[1]);
+
+    mp_buffer_info_t bufinfo;
+    mp_get_buffer_raise(args[3], &bufinfo, MP_BUFFER_READ);
+
+    switch (encoding) {
+        case MICROPY_MACHINE_BITSTREAM_TYPE_HIGH_LOW: {
+            uint32_t timing_ns[4];
+            mp_obj_t *timing;
+            mp_obj_get_array_fixed_n(args[2], 4, &timing);
+            for (size_t i = 0; i < 4; ++i) {
+                timing_ns[i] = mp_obj_get_int(timing[i]);
+            }
+            machine_bitstream_high_low(pin, timing_ns, bufinfo.buf, bufinfo.len);
+            break;
+        }
+        default:
+            mp_raise_ValueError(MP_ERROR_TEXT("encoding"));
+    }
+
+    return mp_const_none;
+}
+MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_bitstream_obj, 4, 4, machine_bitstream_);
+
+#endif // MICROPY_PY_MACHINE_BITSTREAM
diff --git a/extmod/machine_bitstream.h b/extmod/machine_bitstream.h
new file mode 100644
index 0000000000000..2e759aedd5dc0
--- /dev/null
+++ b/extmod/machine_bitstream.h
@@ -0,0 +1,37 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Jim Mussared
+ * Copyright (c) 2021 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+#ifndef MICROPY_INCLUDED_EXTMOD_MACHINE_BITSTREAM_H
+#define MICROPY_INCLUDED_EXTMOD_MACHINE_BITSTREAM_H
+
+#include "py/obj.h"
+#include "py/mphal.h"
+
+void machine_bitstream_high_low(mp_hal_pin_obj_t pin, uint32_t *timing_ns, const uint8_t *buf, size_t len);
+
+MP_DECLARE_CONST_FUN_OBJ_VAR_BETWEEN(machine_bitstream_obj);
+
+#endif // MICROPY_INCLUDED_EXTMOD_MACHINE_BITSTREAM_H
diff --git a/py/mpconfig.h b/py/mpconfig.h
index a5d639efe83cb..2e83c90c55188 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -1470,6 +1470,11 @@ typedef double mp_float_t;
 #define MICROPY_PY_MACHINE (0)
 #endif
 
+// Whether to include: bitstream
+#ifndef MICROPY_PY_MACHINE_BITSTREAM
+#define MICROPY_PY_MACHINE_BITSTREAM (0)
+#endif
+
 // Whether to include: time_pulse_us
 #ifndef MICROPY_PY_MACHINE_PULSE
 #define MICROPY_PY_MACHINE_PULSE (0)
diff --git a/py/py.mk b/py/py.mk
index bc9232ef4f0ef..609ba6cae3ca9 100644
--- a/py/py.mk
+++ b/py/py.mk
@@ -184,6 +184,7 @@ PY_EXTMOD_O_BASENAME = \
 	extmod/moducryptolib.o \
 	extmod/modubinascii.o \
 	extmod/virtpin.o \
+	extmod/machine_bitstream.o \
 	extmod/machine_mem.o \
 	extmod/machine_pinbase.o \
 	extmod/machine_signal.o \

From e64cda529521feb41cda3cc80d1074217816ee6c Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Tue, 10 Aug 2021 01:09:31 +1000
Subject: [PATCH 1208/3533] stm32: Add implementation of machine.bitstream.

Hand-written version for M0, and cycle-counter version for everything else.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/stm32/Makefile                          |   1 +
 .../boards/NUCLEO_L073RZ/mpconfigboard.h      |   2 +
 ports/stm32/machine_bitstream.c               | 204 ++++++++++++++++++
 ports/stm32/modmachine.c                      |   4 +
 ports/stm32/mpconfigport.h                    |   3 +
 py/misc.h                                     |   1 +
 6 files changed, 215 insertions(+)
 create mode 100644 ports/stm32/machine_bitstream.c

diff --git a/ports/stm32/Makefile b/ports/stm32/Makefile
index cdccfddcfda73..20426861b0e43 100644
--- a/ports/stm32/Makefile
+++ b/ports/stm32/Makefile
@@ -318,6 +318,7 @@ SRC_C += \
 	gccollect.c \
 	help.c \
 	machine_adc.c \
+	machine_bitstream.c \
 	machine_i2c.c \
 	machine_i2s.c \
 	machine_spi.c \
diff --git a/ports/stm32/boards/NUCLEO_L073RZ/mpconfigboard.h b/ports/stm32/boards/NUCLEO_L073RZ/mpconfigboard.h
index b7f7bc4c885ba..331fc95caedaa 100644
--- a/ports/stm32/boards/NUCLEO_L073RZ/mpconfigboard.h
+++ b/ports/stm32/boards/NUCLEO_L073RZ/mpconfigboard.h
@@ -19,6 +19,8 @@
 #define MICROPY_PY_UHEAPQ           (0)
 #define MICROPY_PY_UTIMEQ           (0)
 
+#define MICROPY_PY_MACHINE_BITSTREAM (0)
+
 #define MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE (0)
 #define MICROPY_HW_ENABLE_RTC       (1)
 #define MICROPY_HW_ENABLE_ADC       (0)
diff --git a/ports/stm32/machine_bitstream.c b/ports/stm32/machine_bitstream.c
new file mode 100644
index 0000000000000..6cc3679375e8a
--- /dev/null
+++ b/ports/stm32/machine_bitstream.c
@@ -0,0 +1,204 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Jim Mussared
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "py/runtime.h"
+#include "py/mphal.h"
+#include "extmod/machine_bitstream.h"
+
+#if MICROPY_PY_MACHINE_BITSTREAM
+
+#if __CORTEX_M == 0
+
+// No cycle counter on M0, do manual cycle counting instead.
+
+// STM32F091 @ 48MHz
+#define NS_CYCLES_PER_ITER_HIGH (6)
+#define NS_CYCLES_PER_ITER_LOW (6)
+#define NS_OVERHEAD_CYCLES_HIGH (12)
+#define NS_OVERHEAD_CYCLES_LOW (18)
+
+uint32_t mp_hal_delay_ns_calc(uint32_t ns, bool high) {
+    uint32_t ncycles = SystemCoreClock / 1000000 * ns / 1000;
+    uint32_t overhead = MIN(ncycles, high ? NS_OVERHEAD_CYCLES_HIGH : NS_OVERHEAD_CYCLES_LOW);
+    return MAX(1, MP_ROUND_DIVIDE(ncycles - overhead, high ? NS_CYCLES_PER_ITER_HIGH : NS_CYCLES_PER_ITER_LOW));
+}
+
+void machine_bitstream_high_low(mp_hal_pin_obj_t pin, uint32_t *timing_ns, const uint8_t *buf, size_t len) {
+    const uint32_t high_mask = pin->pin_mask;
+    const uint32_t low_mask = pin->pin_mask << 16;
+    volatile uint32_t *bsrr = &pin->gpio->BSRR;
+
+    // Convert ns to loop iterations [high_time_0, low_time_0, high_time_1, low_time_1].
+    for (size_t i = 0; i < 4; ++i) {
+        timing_ns[i] = mp_hal_delay_ns_calc(timing_ns[i], i % 2 == 0);
+    }
+
+    mp_uint_t atomic_state = MICROPY_BEGIN_ATOMIC_SECTION();
+
+    // Measured timing for F091 at 48MHz (cycle=20.83ns)
+    // timing_ns = (1,1,1,1)
+    //   high: 370
+    //   low:  500
+    //   low8: 660
+    // timing_ns = (2,2,2,2)
+    //   high: 490
+    //   low:  620
+    //   low8: 805
+
+    // --> high is 12 + n*6 cycles
+    //     low is 18 + n*6 cycles
+
+    // NeoPixel timing (400, 850, 800, 450) (+/-150ns) gives timing_ns=(1, 4, 4, 1) which in cycles is
+    // (12 + 6, 18 + 24, 12 + 24, 18 + 6) = (18, 42, 36, 24)
+    // --> (375, 875, 750, 500) nanoseconds.
+    // Measured output on logic analyser is (370, 870, 750, 490) (+/-10ns at 100MHz)
+
+    // Note: final low of LSB is longer by 8 cycles (160ns) (due to start of outer loop and fetching next byte).
+    // This is slightly outside spec, but doesn't seem to cause a problem.
+
+    __asm volatile (
+        // Force consistent register assignment.
+        // r6 = len
+        "ldr r6, %0\n"
+        // r4 = buf
+        "ldr r4, %1\n"
+        // r5 = timing_ms
+        "ldr r5, %2\n"
+
+        // Must align for consistent timing.
+        ".align 4\n"
+
+        // Don't increment/decrement before first iteration.
+        "b .outer2\n"
+        ".outer:\n"
+        // ++buf, --len
+        "  add r4, #1\n"
+        "  sub r6, #1\n"
+
+        // len iterations
+        ".outer2:\n"
+        "  cmp r6, #0\n"
+        "  beq .done\n"
+
+        // r0 = *buf
+        "  ldrb r0, [r4, #0]\n"
+
+        // 8 bits in byte
+        "  mov r7, #8\n"
+        "  .inner:\n"
+        //   *bsrr = high_mask
+        "    ldr r1, %3\n"
+        "    ldr r2, %4\n"
+        "    str r2, [r1, #0]\n"
+
+        //   r3 = (r0 >> 4) & 8    (r0 is 8 if high bit is 1 else 0)
+        "    mov r8, r6\n"
+        "    lsr r3, r0, #4\n"
+        "    mov r6, #8\n"
+        "    and r3, r6\n"
+        "    mov r6, r8\n"
+
+        //   r2 = timing_ns[r2]
+        "    ldr r2, [r5, r3]\n"
+        "    .loop1:\n sub r2, #1\n bne .loop1\n"
+
+        //   *bsrr = low_mask
+        "    ldr r2, %5\n"
+        "    str r2, [r1, #0]\n"
+
+        //   r2 = timing_ns[r3 + 4]
+        "    add r3, #4\n"
+        "    ldr r2, [r5, r3]\n"
+        "    .loop2:\n sub r2, #1\n bne .loop2\n"
+
+        //   b >>= 1
+        "    lsl r0, r0, #1\n"
+
+        "    sub r7, #1\n"
+        //   end of inner loop
+        "    beq .outer\n"
+        //   continue inner loop
+        "    b .inner\n"
+
+        ".done:\n"
+        :
+        : "m" (len), "m" (buf), "m" (timing_ns), "m" (bsrr), "m" (high_mask), "m" (low_mask)
+        : "r0", "r1", "r2", "r3", "r7", "r8"
+        );
+
+    MICROPY_END_ATOMIC_SECTION(atomic_state);
+}
+
+#else // > CORTEX_M0
+
+// Use cycle counter for timing.
+
+// Measured on PYBV11 at 168MHz & 128MHz and PYBD_SF6 at 128MHz & 144MHz.
+#define NS_CYCLES_OVERHEAD (6)
+
+void machine_bitstream_high_low(mp_hal_pin_obj_t pin, uint32_t *timing_ns, const uint8_t *buf, size_t len) {
+    const uint32_t high_mask = pin->pin_mask;
+    const uint32_t low_mask = pin->pin_mask << 16;
+    volatile uint32_t *bsrr = &pin->gpio->BSRR;
+
+    // Convert ns to cycles [high_time_0, low_time_0, high_time_1, low_time_1].
+    for (size_t i = 0; i < 4; ++i) {
+        timing_ns[i] = SystemCoreClock / 1000000 * timing_ns[i] / 1000;
+        if (timing_ns[i] > NS_CYCLES_OVERHEAD) {
+            timing_ns[i] -= NS_CYCLES_OVERHEAD;
+        }
+        if (i % 2 == 1) {
+            timing_ns[i] += timing_ns[i - 1];
+        }
+    }
+
+    mp_hal_ticks_cpu_enable();
+
+    mp_uint_t atomic_state = MICROPY_BEGIN_ATOMIC_SECTION();
+
+    for (size_t i = 0; i < len; ++i) {
+        uint8_t b = buf[i];
+        for (size_t j = 0; j < 8; ++j) {
+            DWT->CYCCNT = 0;
+            *bsrr = high_mask;
+            uint32_t *t = &timing_ns[b >> 6 & 2];
+            while (DWT->CYCCNT < t[0]) {
+                ;
+            }
+            *bsrr = low_mask;
+            b <<= 1;
+            while (DWT->CYCCNT < t[1]) {
+                ;
+            }
+        }
+    }
+
+    MICROPY_END_ATOMIC_SECTION(atomic_state);
+}
+
+#endif // > CORTEX_M0
+
+#endif // MICROPY_PY_MACHINE_BITSTREAM
diff --git a/ports/stm32/modmachine.c b/ports/stm32/modmachine.c
index 2b7e22d13a20c..1df6cbc47d43d 100644
--- a/ports/stm32/modmachine.c
+++ b/ports/stm32/modmachine.c
@@ -33,6 +33,7 @@
 #include "py/objstr.h"
 #include "py/mperrno.h"
 #include "py/mphal.h"
+#include "extmod/machine_bitstream.h"
 #include "extmod/machine_mem.h"
 #include "extmod/machine_signal.h"
 #include "extmod/machine_pulse.h"
@@ -406,6 +407,9 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_disable_irq),         MP_ROM_PTR(&machine_disable_irq_obj) },
     { MP_ROM_QSTR(MP_QSTR_enable_irq),          MP_ROM_PTR(&machine_enable_irq_obj) },
 
+    #if MICROPY_PY_MACHINE_BITSTREAM
+    { MP_ROM_QSTR(MP_QSTR_bitstream),           MP_ROM_PTR(&machine_bitstream_obj) },
+    #endif
     #if MICROPY_PY_MACHINE_PULSE
     { MP_ROM_QSTR(MP_QSTR_time_pulse_us),       MP_ROM_PTR(&machine_time_pulse_us_obj) },
     #endif
diff --git a/ports/stm32/mpconfigport.h b/ports/stm32/mpconfigport.h
index 7ade406b5b32d..fc84171b2e7da 100644
--- a/ports/stm32/mpconfigport.h
+++ b/ports/stm32/mpconfigport.h
@@ -193,6 +193,9 @@
 #define MICROPY_PY_LWIP_SOCK_RAW    (MICROPY_PY_LWIP)
 #ifndef MICROPY_PY_MACHINE
 #define MICROPY_PY_MACHINE          (1)
+#ifndef MICROPY_PY_MACHINE_BITSTREAM
+#define MICROPY_PY_MACHINE_BITSTREAM (1)
+#endif
 #define MICROPY_PY_MACHINE_PULSE    (1)
 #define MICROPY_PY_MACHINE_PIN_MAKE_NEW mp_pin_make_new
 #define MICROPY_PY_MACHINE_I2C      (1)
diff --git a/py/misc.h b/py/misc.h
index 953809838356d..e1d27dc7b8904 100644
--- a/py/misc.h
+++ b/py/misc.h
@@ -55,6 +55,7 @@ typedef unsigned int uint;
 
 // Round-up integer division
 #define MP_CEIL_DIVIDE(a, b) (((a) + (b) - 1) / (b))
+#define MP_ROUND_DIVIDE(a, b) (((a) + (b) / 2) / (b))
 
 /** memory allocation ******************************************/
 

From 71f4faac2732d932dcc03bdbc9f80434e5757edb Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Wed, 11 Aug 2021 14:26:23 +1000
Subject: [PATCH 1209/3533] esp32: Replace esp.neopixel with machine.bitstream.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/esp32/espneopixel.c       | 74 ---------------------------
 ports/esp32/machine_bitstream.c | 88 +++++++++++++++++++++++++++++++++
 ports/esp32/main/CMakeLists.txt |  2 +-
 ports/esp32/modesp.c            | 10 ----
 ports/esp32/modmachine.c        |  6 +++
 ports/esp32/modules/neopixel.py | 19 +++++--
 ports/esp32/mpconfigport.h      |  1 +
 7 files changed, 110 insertions(+), 90 deletions(-)
 delete mode 100644 ports/esp32/espneopixel.c
 create mode 100644 ports/esp32/machine_bitstream.c

diff --git a/ports/esp32/espneopixel.c b/ports/esp32/espneopixel.c
deleted file mode 100644
index 0b9308e2c070b..0000000000000
--- a/ports/esp32/espneopixel.c
+++ /dev/null
@@ -1,74 +0,0 @@
-// Original version from https://github.com/adafruit/Adafruit_NeoPixel
-// Modifications by dpgeorge to support auto-CPU-frequency detection
-
-// This is a mash-up of the Due show() code + insights from Michael Miller's
-// ESP8266 work for the NeoPixelBus library: github.com/Makuna/NeoPixelBus
-// Needs to be a separate .c file to enforce ICACHE_RAM_ATTR execution.
-
-#include "py/mpconfig.h"
-#include "py/mphal.h"
-#include "modesp.h"
-
-void IRAM_ATTR esp_neopixel_write(uint8_t pin, uint8_t *pixels, uint32_t numBytes, uint8_t timing) {
-    uint8_t *p, *end, pix, mask;
-    uint32_t t, time0, time1, period, c, startTime, pinMask, gpio_reg_set, gpio_reg_clear;
-
-    #if !CONFIG_IDF_TARGET_ESP32C3
-    if (pin >= 32) {
-        pinMask = 1 << (pin - 32);
-        gpio_reg_set = GPIO_OUT1_W1TS_REG;
-        gpio_reg_clear = GPIO_OUT1_W1TC_REG;
-    } else
-    #endif
-    {
-        pinMask = 1 << pin;
-        gpio_reg_set = GPIO_OUT_W1TS_REG;
-        gpio_reg_clear = GPIO_OUT_W1TC_REG;
-    }
-    p = pixels;
-    end = p + numBytes;
-    pix = *p++;
-    mask = 0x80;
-    startTime = 0;
-
-    uint32_t fcpu = ets_get_cpu_frequency();
-
-    if (timing == 1) {
-        // 800 KHz
-        time0 = (fcpu * 350) / 1000; // 0.35us
-        time1 = (fcpu * 800) / 1000; // 0.8us
-        period = (fcpu * 1250) / 1000; // 1.25us per bit
-    } else {
-        // 400 KHz
-        time0 = (fcpu * 500) / 1000; // 0.5us
-        time1 = (fcpu * 1200) / 1000; // 1.2us
-        period = (fcpu * 2500) / 1000; // 2.5us per bit
-    }
-
-    uint32_t irq_state = mp_hal_quiet_timing_enter();
-    for (t = time0;; t = time0) {
-        if (pix & mask) {
-            t = time1;                                              // Bit high duration
-        }
-        while (((c = mp_hal_ticks_cpu()) - startTime) < period) {
-            ;                                                       // Wait for bit start
-        }
-        GPIO_REG_WRITE(gpio_reg_set, pinMask);                      // Set high
-        startTime = c;                                              // Save start time
-        while (((c = mp_hal_ticks_cpu()) - startTime) < t) {
-            ;                                                       // Wait high duration
-        }
-        GPIO_REG_WRITE(gpio_reg_clear, pinMask);                    // Set low
-        if (!(mask >>= 1)) {                                        // Next bit/byte
-            if (p >= end) {
-                break;
-            }
-            pix = *p++;
-            mask = 0x80;
-        }
-    }
-    while ((mp_hal_ticks_cpu() - startTime) < period) {
-        ;                                              // Wait for last bit
-    }
-    mp_hal_quiet_timing_exit(irq_state);
-}
diff --git a/ports/esp32/machine_bitstream.c b/ports/esp32/machine_bitstream.c
new file mode 100644
index 0000000000000..a60fe1b1c5444
--- /dev/null
+++ b/ports/esp32/machine_bitstream.c
@@ -0,0 +1,88 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Jim Mussared
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+// This is a translation of the cycle counter implementation in ports/stm32/machine_bitstream.c.
+
+#include "py/mpconfig.h"
+#include "py/mphal.h"
+
+#if MICROPY_PY_MACHINE_BITSTREAM
+
+#define NS_TICKS_OVERHEAD (6)
+
+void IRAM_ATTR machine_bitstream_high_low(mp_hal_pin_obj_t pin, uint32_t *timing_ns, const uint8_t *buf, size_t len) {
+    uint32_t pin_mask, gpio_reg_set, gpio_reg_clear;
+    #if !CONFIG_IDF_TARGET_ESP32C3
+    if (pin >= 32) {
+        pin_mask = 1 << (pin - 32);
+        gpio_reg_set = GPIO_OUT1_W1TS_REG;
+        gpio_reg_clear = GPIO_OUT1_W1TC_REG;
+    } else
+    #endif
+    {
+        pin_mask = 1 << pin;
+        gpio_reg_set = GPIO_OUT_W1TS_REG;
+        gpio_reg_clear = GPIO_OUT_W1TC_REG;
+    }
+
+    // Convert ns to cpu ticks [high_time_0, period_0, high_time_1, period_1].
+    uint32_t fcpu_mhz = ets_get_cpu_frequency();
+    for (size_t i = 0; i < 4; ++i) {
+        timing_ns[i] = fcpu_mhz * timing_ns[i] / 1000;
+        if (timing_ns[i] > NS_TICKS_OVERHEAD) {
+            timing_ns[i] -= NS_TICKS_OVERHEAD;
+        }
+        if (i % 2 == 1) {
+            // Convert low_time to period (i.e. add high_time).
+            timing_ns[i] += timing_ns[i - 1];
+        }
+    }
+
+    uint32_t irq_state = mp_hal_quiet_timing_enter();
+
+    for (size_t i = 0; i < len; ++i) {
+        uint8_t b = buf[i];
+        for (size_t j = 0; j < 8; ++j) {
+            GPIO_REG_WRITE(gpio_reg_set, pin_mask);
+            uint32_t start_ticks = mp_hal_ticks_cpu();
+            uint32_t *t = &timing_ns[b >> 6 & 2];
+            uint32_t end_ticks = start_ticks + t[0];
+            while (mp_hal_ticks_cpu() - start_ticks < t[0]) {
+                ;
+            }
+            GPIO_REG_WRITE(gpio_reg_clear, pin_mask);
+            b <<= 1;
+            end_ticks += t[1];
+            while (mp_hal_ticks_cpu() - start_ticks < t[1]) {
+                ;
+            }
+        }
+    }
+
+    mp_hal_quiet_timing_exit(irq_state);
+}
+
+#endif // MICROPY_PY_MACHINE_BITSTREAM
diff --git a/ports/esp32/main/CMakeLists.txt b/ports/esp32/main/CMakeLists.txt
index 1ca30b0cb9b82..0e7d6ff250eba 100644
--- a/ports/esp32/main/CMakeLists.txt
+++ b/ports/esp32/main/CMakeLists.txt
@@ -53,6 +53,7 @@ set(MICROPY_SOURCE_PORT
     ${PROJECT_DIR}/help.c
     ${PROJECT_DIR}/modutime.c
     ${PROJECT_DIR}/moduos.c
+    ${PROJECT_DIR}/machine_bitstream.c
     ${PROJECT_DIR}/machine_timer.c
     ${PROJECT_DIR}/machine_pin.c
     ${PROJECT_DIR}/machine_touchpad.c
@@ -74,7 +75,6 @@ set(MICROPY_SOURCE_PORT
     ${PROJECT_DIR}/esp32_rmt.c
     ${PROJECT_DIR}/esp32_ulp.c
     ${PROJECT_DIR}/modesp32.c
-    ${PROJECT_DIR}/espneopixel.c
     ${PROJECT_DIR}/machine_hw_spi.c
     ${PROJECT_DIR}/machine_wdt.c
     ${PROJECT_DIR}/mpthreadport.c
diff --git a/ports/esp32/modesp.c b/ports/esp32/modesp.c
index 59a261e8c27ff..8a7f02575467c 100644
--- a/ports/esp32/modesp.c
+++ b/ports/esp32/modesp.c
@@ -112,15 +112,6 @@ STATIC mp_obj_t esp_gpio_matrix_out(size_t n_args, const mp_obj_t *args) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(esp_gpio_matrix_out_obj, 4, 4, esp_gpio_matrix_out);
 
-STATIC mp_obj_t esp_neopixel_write_(mp_obj_t pin, mp_obj_t buf, mp_obj_t timing) {
-    mp_buffer_info_t bufinfo;
-    mp_get_buffer_raise(buf, &bufinfo, MP_BUFFER_READ);
-    esp_neopixel_write(mp_hal_get_pin_obj(pin),
-        (uint8_t *)bufinfo.buf, bufinfo.len, mp_obj_get_int(timing));
-    return mp_const_none;
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_3(esp_neopixel_write_obj, esp_neopixel_write_);
-
 STATIC const mp_rom_map_elem_t esp_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_esp) },
 
@@ -135,7 +126,6 @@ STATIC const mp_rom_map_elem_t esp_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_gpio_matrix_in), MP_ROM_PTR(&esp_gpio_matrix_in_obj) },
     { MP_ROM_QSTR(MP_QSTR_gpio_matrix_out), MP_ROM_PTR(&esp_gpio_matrix_out_obj) },
 
-    { MP_ROM_QSTR(MP_QSTR_neopixel_write), MP_ROM_PTR(&esp_neopixel_write_obj) },
     { MP_ROM_QSTR(MP_QSTR_dht_readinto), MP_ROM_PTR(&dht_readinto_obj) },
 
     // Constants for second arg of osdebug()
diff --git a/ports/esp32/modmachine.c b/ports/esp32/modmachine.c
index 34fe8600ae216..5f94007d4995b 100644
--- a/ports/esp32/modmachine.c
+++ b/ports/esp32/modmachine.c
@@ -49,6 +49,7 @@
 #include "py/obj.h"
 #include "py/runtime.h"
 #include "shared/runtime/pyexec.h"
+#include "extmod/machine_bitstream.h"
 #include "extmod/machine_mem.h"
 #include "extmod/machine_signal.h"
 #include "extmod/machine_pulse.h"
@@ -271,7 +272,12 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_disable_irq), MP_ROM_PTR(&machine_disable_irq_obj) },
     { MP_ROM_QSTR(MP_QSTR_enable_irq), MP_ROM_PTR(&machine_enable_irq_obj) },
 
+    #if MICROPY_PY_MACHINE_BITSTREAM
+    { MP_ROM_QSTR(MP_QSTR_bitstream), MP_ROM_PTR(&machine_bitstream_obj) },
+    #endif
+    #if MICROPY_PY_MACHINE_PULSE
     { MP_ROM_QSTR(MP_QSTR_time_pulse_us), MP_ROM_PTR(&machine_time_pulse_us_obj) },
+    #endif
 
     { MP_ROM_QSTR(MP_QSTR_Timer), MP_ROM_PTR(&machine_timer_type) },
     { MP_ROM_QSTR(MP_QSTR_WDT), MP_ROM_PTR(&machine_wdt_type) },
diff --git a/ports/esp32/modules/neopixel.py b/ports/esp32/modules/neopixel.py
index f5c919398825e..9ed5155c720d4 100644
--- a/ports/esp32/modules/neopixel.py
+++ b/ports/esp32/modules/neopixel.py
@@ -1,7 +1,12 @@
-# NeoPixel driver for MicroPython on ESP32
-# MIT license; Copyright (c) 2016 Damien P. George
+# NeoPixel driver for MicroPython
+# MIT license; Copyright (c) 2016 Damien P. George, 2021 Jim Mussared
 
-from esp import neopixel_write
+from micropython import const
+from machine import bitstream
+
+_BITSTREAM_TYPE_HIGH_LOW = const(0)
+_TIMING_WS2818_800 = (400, 850, 800, 450)
+_TIMING_WS2818_400 = (800, 1700, 1600, 900)
 
 
 class NeoPixel:
@@ -13,7 +18,11 @@ def __init__(self, pin, n, bpp=3, timing=1):
         self.bpp = bpp
         self.buf = bytearray(n * bpp)
         self.pin.init(pin.OUT)
-        self.timing = timing
+        self.timing = (
+            (_TIMING_WS2818_800 if timing else _TIMING_WS2818_400)
+            if isinstance(timing, int)
+            else timing
+        )
 
     def __len__(self):
         return self.n
@@ -32,4 +41,4 @@ def fill(self, color):
             self[i] = color
 
     def write(self):
-        neopixel_write(self.pin, self.buf, self.timing)
+        bitstream(self.pin, _BITSTREAM_TYPE_HIGH_LOW, self.timing, self.buf)
diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h
index a21c0d524d640..057251fa49b3c 100644
--- a/ports/esp32/mpconfigport.h
+++ b/ports/esp32/mpconfigport.h
@@ -156,6 +156,7 @@
 #define MICROPY_PY_OS_DUPTERM               (1)
 #define MICROPY_PY_MACHINE                  (1)
 #define MICROPY_PY_MACHINE_PIN_MAKE_NEW     mp_pin_make_new
+#define MICROPY_PY_MACHINE_BITSTREAM        (1)
 #define MICROPY_PY_MACHINE_PULSE            (1)
 #define MICROPY_PY_MACHINE_I2C              (1)
 #define MICROPY_PY_MACHINE_SPI              (1)

From 39e9c0788fd533d8712d2b19ae93ab8efa56c599 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Wed, 11 Aug 2021 15:14:46 +1000
Subject: [PATCH 1210/3533] esp8266: Replace esp.neopixel with
 machine.bitstream.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/esp8266/Makefile            |  2 +-
 ports/esp8266/espneopixel.c       | 75 ------------------------------
 ports/esp8266/espneopixel.h       |  6 ---
 ports/esp8266/machine_bitstream.c | 76 +++++++++++++++++++++++++++++++
 ports/esp8266/modesp.c            | 14 ------
 ports/esp8266/modmachine.c        |  5 ++
 ports/esp8266/modules/neopixel.py | 19 ++++++--
 ports/esp8266/mpconfigport.h      |  2 +-
 8 files changed, 97 insertions(+), 102 deletions(-)
 delete mode 100644 ports/esp8266/espneopixel.c
 delete mode 100644 ports/esp8266/espneopixel.h
 create mode 100644 ports/esp8266/machine_bitstream.c

diff --git a/ports/esp8266/Makefile b/ports/esp8266/Makefile
index 56c7cc87f6757..9ea4498f411b7 100644
--- a/ports/esp8266/Makefile
+++ b/ports/esp8266/Makefile
@@ -91,10 +91,10 @@ SRC_C = \
 	lexerstr32.c \
 	uart.c \
 	esppwm.c \
-	espneopixel.c \
 	espapa102.c \
 	modpyb.c \
 	modmachine.c \
+	machine_bitstream.c \
 	machine_pin.c \
 	machine_pwm.c \
 	machine_rtc.c \
diff --git a/ports/esp8266/espneopixel.c b/ports/esp8266/espneopixel.c
deleted file mode 100644
index d2166a8b068b4..0000000000000
--- a/ports/esp8266/espneopixel.c
+++ /dev/null
@@ -1,75 +0,0 @@
-// Original version from https://github.com/adafruit/Adafruit_NeoPixel
-// Modifications by dpgeorge to support auto-CPU-frequency detection
-
-// This is a mash-up of the Due show() code + insights from Michael Miller's
-// ESP8266 work for the NeoPixelBus library: github.com/Makuna/NeoPixelBus
-// Needs to be a separate .c file to enforce ICACHE_RAM_ATTR execution.
-
-#include "py/mpconfig.h"
-#if MICROPY_ESP8266_NEOPIXEL
-
-#include "c_types.h"
-#include "eagle_soc.h"
-#include "user_interface.h"
-#include "espneopixel.h"
-#include "esp_mphal.h"
-
-#define NEO_KHZ400 (1)
-
-void /*ICACHE_RAM_ATTR*/ esp_neopixel_write(uint8_t pin, uint8_t *pixels, uint32_t numBytes, bool is800KHz) {
-
-    uint8_t *p, *end, pix, mask;
-    uint32_t t, time0, time1, period, c, startTime, pinMask;
-
-    pinMask = 1 << pin;
-    p = pixels;
-    end = p + numBytes;
-    pix = *p++;
-    mask = 0x80;
-    startTime = 0;
-
-    uint32_t fcpu = system_get_cpu_freq() * 1000000;
-
-    #ifdef NEO_KHZ400
-    if (is800KHz) {
-    #endif
-    time0 = fcpu / 2857143;  // 0.35us
-    time1 = fcpu / 1250000;  // 0.8us
-    period = fcpu / 800000;  // 1.25us per bit
-    #ifdef NEO_KHZ400
-} else {   // 400 KHz bitstream
-    time0 = fcpu / 2000000;  // 0.5uS
-    time1 = fcpu / 833333;   // 1.2us
-    period = fcpu / 400000;  // 2.5us per bit
-}
-    #endif
-
-    uint32_t irq_state = mp_hal_quiet_timing_enter();
-    for (t = time0;; t = time0) {
-        if (pix & mask) {
-            t = time1;                                    // Bit high duration
-        }
-        while (((c = mp_hal_ticks_cpu()) - startTime) < period) {
-            ;                                               // Wait for bit start
-        }
-        GPIO_REG_WRITE(GPIO_OUT_W1TS_ADDRESS, pinMask);   // Set high
-        startTime = c;                                    // Save start time
-        while (((c = mp_hal_ticks_cpu()) - startTime) < t) {
-            ;                                               // Wait high duration
-        }
-        GPIO_REG_WRITE(GPIO_OUT_W1TC_ADDRESS, pinMask);   // Set low
-        if (!(mask >>= 1)) {                              // Next bit/byte
-            if (p >= end) {
-                break;
-            }
-            pix = *p++;
-            mask = 0x80;
-        }
-    }
-    while ((mp_hal_ticks_cpu() - startTime) < period) {
-        ;                                           // Wait for last bit
-    }
-    mp_hal_quiet_timing_exit(irq_state);
-}
-
-#endif // MICROPY_ESP8266_NEOPIXEL
diff --git a/ports/esp8266/espneopixel.h b/ports/esp8266/espneopixel.h
deleted file mode 100644
index c444740ff95c0..0000000000000
--- a/ports/esp8266/espneopixel.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef MICROPY_INCLUDED_ESP8266_ESPNEOPIXEL_H
-#define MICROPY_INCLUDED_ESP8266_ESPNEOPIXEL_H
-
-void esp_neopixel_write(uint8_t pin, uint8_t *pixels, uint32_t numBytes, bool is800KHz);
-
-#endif // MICROPY_INCLUDED_ESP8266_ESPNEOPIXEL_H
diff --git a/ports/esp8266/machine_bitstream.c b/ports/esp8266/machine_bitstream.c
new file mode 100644
index 0000000000000..bc16aea44d357
--- /dev/null
+++ b/ports/esp8266/machine_bitstream.c
@@ -0,0 +1,76 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Jim Mussared
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+// This is slightly modified from the implementation in ports/esp32/machine_bitstream.c.
+
+#include "py/mpconfig.h"
+#include "py/mphal.h"
+
+#if MICROPY_PY_MACHINE_BITSTREAM
+
+#define NS_TICKS_OVERHEAD (8)
+
+void machine_bitstream_high_low(mp_hal_pin_obj_t pin, uint32_t *timing_ns, const uint8_t *buf, size_t len) {
+    uint32_t pin_mask = 1 << pin;
+
+    // Convert ns to cpu ticks [high_time_0, period_0, high_time_1, period_1].
+    uint32_t fcpu_mhz = system_get_cpu_freq();
+    for (size_t i = 0; i < 4; ++i) {
+        timing_ns[i] = fcpu_mhz * timing_ns[i] / 1000;
+        if (timing_ns[i] > NS_TICKS_OVERHEAD) {
+            timing_ns[i] -= NS_TICKS_OVERHEAD;
+        }
+        if (i % 2 == 1) {
+            // Convert low_time to period (i.e. add high_time).
+            timing_ns[i] += timing_ns[i - 1];
+        }
+    }
+
+    uint32_t irq_state = mp_hal_quiet_timing_enter();
+
+    for (size_t i = 0; i < len; ++i) {
+        uint8_t b = buf[i];
+        for (size_t j = 0; j < 8; ++j) {
+            GPIO_REG_WRITE(GPIO_OUT_W1TS_ADDRESS, pin_mask);
+            uint32_t start_ticks = mp_hal_ticks_cpu();
+            uint32_t *t = &timing_ns[b >> 6 & 2];
+            uint32_t end_ticks = start_ticks + t[0];
+            while (mp_hal_ticks_cpu() - start_ticks < t[0]) {
+                ;
+            }
+            GPIO_REG_WRITE(GPIO_OUT_W1TC_ADDRESS, pin_mask);
+            b <<= 1;
+            end_ticks += t[1];
+            while (mp_hal_ticks_cpu() - start_ticks < t[1]) {
+                ;
+            }
+        }
+    }
+
+    mp_hal_quiet_timing_exit(irq_state);
+}
+
+#endif // MICROPY_PY_MACHINE_BITSTREAM
diff --git a/ports/esp8266/modesp.c b/ports/esp8266/modesp.c
index 022447313c982..eb79d20bc5897 100644
--- a/ports/esp8266/modesp.c
+++ b/ports/esp8266/modesp.c
@@ -36,7 +36,6 @@
 #include "user_interface.h"
 #include "mem.h"
 #include "ets_alt_task.h"
-#include "espneopixel.h"
 #include "espapa102.h"
 #include "modmachine.h"
 
@@ -199,16 +198,6 @@ STATIC mp_obj_t esp_check_fw(void) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_0(esp_check_fw_obj, esp_check_fw);
 
-
-STATIC mp_obj_t esp_neopixel_write_(mp_obj_t pin, mp_obj_t buf, mp_obj_t is800k) {
-    mp_buffer_info_t bufinfo;
-    mp_get_buffer_raise(buf, &bufinfo, MP_BUFFER_READ);
-    esp_neopixel_write(mp_obj_get_pin_obj(pin)->phys_port,
-        (uint8_t *)bufinfo.buf, bufinfo.len, mp_obj_is_true(is800k));
-    return mp_const_none;
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_3(esp_neopixel_write_obj, esp_neopixel_write_);
-
 #if MICROPY_ESP8266_APA102
 STATIC mp_obj_t esp_apa102_write_(mp_obj_t clockPin, mp_obj_t dataPin, mp_obj_t buf) {
     mp_buffer_info_t bufinfo;
@@ -363,9 +352,6 @@ STATIC const mp_rom_map_elem_t esp_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_flash_erase), MP_ROM_PTR(&esp_flash_erase_obj) },
     { MP_ROM_QSTR(MP_QSTR_flash_size), MP_ROM_PTR(&esp_flash_size_obj) },
     { MP_ROM_QSTR(MP_QSTR_flash_user_start), MP_ROM_PTR(&esp_flash_user_start_obj) },
-    #if MICROPY_ESP8266_NEOPIXEL
-    { MP_ROM_QSTR(MP_QSTR_neopixel_write), MP_ROM_PTR(&esp_neopixel_write_obj) },
-    #endif
     #if MICROPY_ESP8266_APA102
     { MP_ROM_QSTR(MP_QSTR_apa102_write), MP_ROM_PTR(&esp_apa102_write_obj) },
     #endif
diff --git a/ports/esp8266/modmachine.c b/ports/esp8266/modmachine.c
index 2b1f0f0835224..6cd4583431d45 100644
--- a/ports/esp8266/modmachine.c
+++ b/ports/esp8266/modmachine.c
@@ -35,6 +35,7 @@
 // This needs to be set before we include the RTOS headers
 #define USE_US_TIMER 1
 
+#include "extmod/machine_bitstream.h"
 #include "extmod/machine_mem.h"
 #include "extmod/machine_signal.h"
 #include "extmod/machine_pulse.h"
@@ -411,6 +412,10 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_disable_irq), MP_ROM_PTR(&machine_disable_irq_obj) },
     { MP_ROM_QSTR(MP_QSTR_enable_irq), MP_ROM_PTR(&machine_enable_irq_obj) },
 
+    #if MICROPY_PY_MACHINE_BITSTREAM
+    { MP_ROM_QSTR(MP_QSTR_bitstream), MP_ROM_PTR(&machine_bitstream_obj) },
+    #endif
+
     { MP_ROM_QSTR(MP_QSTR_time_pulse_us), MP_ROM_PTR(&machine_time_pulse_us_obj) },
 
     { MP_ROM_QSTR(MP_QSTR_RTC), MP_ROM_PTR(&pyb_rtc_type) },
diff --git a/ports/esp8266/modules/neopixel.py b/ports/esp8266/modules/neopixel.py
index 9dc153372f877..9ed5155c720d4 100644
--- a/ports/esp8266/modules/neopixel.py
+++ b/ports/esp8266/modules/neopixel.py
@@ -1,7 +1,12 @@
-# NeoPixel driver for MicroPython on ESP8266
-# MIT license; Copyright (c) 2016 Damien P. George
+# NeoPixel driver for MicroPython
+# MIT license; Copyright (c) 2016 Damien P. George, 2021 Jim Mussared
 
-from esp import neopixel_write
+from micropython import const
+from machine import bitstream
+
+_BITSTREAM_TYPE_HIGH_LOW = const(0)
+_TIMING_WS2818_800 = (400, 850, 800, 450)
+_TIMING_WS2818_400 = (800, 1700, 1600, 900)
 
 
 class NeoPixel:
@@ -13,7 +18,11 @@ def __init__(self, pin, n, bpp=3, timing=1):
         self.bpp = bpp
         self.buf = bytearray(n * bpp)
         self.pin.init(pin.OUT)
-        self.timing = timing
+        self.timing = (
+            (_TIMING_WS2818_800 if timing else _TIMING_WS2818_400)
+            if isinstance(timing, int)
+            else timing
+        )
 
     def __len__(self):
         return self.n
@@ -32,4 +41,4 @@ def fill(self, color):
             self[i] = color
 
     def write(self):
-        neopixel_write(self.pin, self.buf, self.timing)
+        bitstream(self.pin, _BITSTREAM_TYPE_HIGH_LOW, self.timing, self.buf)
diff --git a/ports/esp8266/mpconfigport.h b/ports/esp8266/mpconfigport.h
index 8bc24e00ebad8..c7e2f4a44bca2 100644
--- a/ports/esp8266/mpconfigport.h
+++ b/ports/esp8266/mpconfigport.h
@@ -79,6 +79,7 @@
 #define MICROPY_PY_LWIP_SOCK_RAW    (1)
 #define MICROPY_PY_MACHINE          (1)
 #define MICROPY_PY_MACHINE_PIN_MAKE_NEW mp_pin_make_new
+#define MICROPY_PY_MACHINE_BITSTREAM (1)
 #define MICROPY_PY_MACHINE_PULSE    (1)
 #define MICROPY_PY_MACHINE_I2C      (1)
 #define MICROPY_PY_MACHINE_SPI      (1)
@@ -102,7 +103,6 @@
 #define MICROPY_FATFS_MAX_SS           (4096)
 #define MICROPY_FATFS_LFN_CODE_PAGE    437 /* 1=SFN/ANSI 437=LFN/U.S.(OEM) */
 #define MICROPY_ESP8266_APA102         (1)
-#define MICROPY_ESP8266_NEOPIXEL       (1)
 
 #define MICROPY_EVENT_POLL_HOOK {ets_event_poll();}
 #define MICROPY_VM_HOOK_COUNT (10)

From 62fd450e621c8c46a93082f8e5f5417a32ef3fb8 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Wed, 11 Aug 2021 15:22:29 +1000
Subject: [PATCH 1211/3533] drivers/neopixel: Add common
 machine.bitstream-based neopixel module.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 drivers/neopixel/manifest.py                  |  5 +++
 .../modules => drivers/neopixel}/neopixel.py  |  0
 ports/esp32/boards/manifest.py                |  1 +
 ports/esp8266/boards/GENERIC_512K/manifest.py |  3 +-
 ports/esp8266/boards/manifest.py              |  1 +
 ports/esp8266/modules/neopixel.py             | 44 -------------------
 6 files changed, 9 insertions(+), 45 deletions(-)
 create mode 100644 drivers/neopixel/manifest.py
 rename {ports/esp32/modules => drivers/neopixel}/neopixel.py (100%)
 delete mode 100644 ports/esp8266/modules/neopixel.py

diff --git a/drivers/neopixel/manifest.py b/drivers/neopixel/manifest.py
new file mode 100644
index 0000000000000..27f610adc0ad7
--- /dev/null
+++ b/drivers/neopixel/manifest.py
@@ -0,0 +1,5 @@
+freeze(
+    ".",
+    "neopixel.py",
+    opt=3,
+)
diff --git a/ports/esp32/modules/neopixel.py b/drivers/neopixel/neopixel.py
similarity index 100%
rename from ports/esp32/modules/neopixel.py
rename to drivers/neopixel/neopixel.py
diff --git a/ports/esp32/boards/manifest.py b/ports/esp32/boards/manifest.py
index b463c131faa0d..1dc1481a420df 100644
--- a/ports/esp32/boards/manifest.py
+++ b/ports/esp32/boards/manifest.py
@@ -5,3 +5,4 @@
 freeze("$(MPY_DIR)/drivers/onewire")
 include("$(MPY_DIR)/extmod/uasyncio/manifest.py")
 include("$(MPY_DIR)/extmod/webrepl/manifest.py")
+include("$(MPY_DIR)/drivers/neopixel/manifest.py")
diff --git a/ports/esp8266/boards/GENERIC_512K/manifest.py b/ports/esp8266/boards/GENERIC_512K/manifest.py
index 5674f280b5480..ee148c80892d8 100644
--- a/ports/esp8266/boards/GENERIC_512K/manifest.py
+++ b/ports/esp8266/boards/GENERIC_512K/manifest.py
@@ -1,5 +1,6 @@
 freeze("$(BOARD_DIR)", "_boot.py", opt=3)
-freeze("$(PORT_DIR)/modules", ("apa102.py", "neopixel.py", "ntptime.py", "port_diag.py"))
+freeze("$(PORT_DIR)/modules", ("apa102.py", "ntptime.py", "port_diag.py"))
 freeze("$(MPY_DIR)/drivers/dht", "dht.py")
 freeze("$(MPY_DIR)/drivers/onewire")
 include("$(MPY_DIR)/extmod/webrepl/manifest.py")
+include("$(MPY_DIR)/drivers/neopixel/manifest.py")
diff --git a/ports/esp8266/boards/manifest.py b/ports/esp8266/boards/manifest.py
index de719f8f1e29c..598572d62ad48 100644
--- a/ports/esp8266/boards/manifest.py
+++ b/ports/esp8266/boards/manifest.py
@@ -3,3 +3,4 @@
 freeze("$(MPY_DIR)/drivers/dht", "dht.py")
 freeze("$(MPY_DIR)/drivers/onewire")
 include("$(MPY_DIR)/extmod/webrepl/manifest.py")
+include("$(MPY_DIR)/drivers/neopixel/manifest.py")
diff --git a/ports/esp8266/modules/neopixel.py b/ports/esp8266/modules/neopixel.py
deleted file mode 100644
index 9ed5155c720d4..0000000000000
--- a/ports/esp8266/modules/neopixel.py
+++ /dev/null
@@ -1,44 +0,0 @@
-# NeoPixel driver for MicroPython
-# MIT license; Copyright (c) 2016 Damien P. George, 2021 Jim Mussared
-
-from micropython import const
-from machine import bitstream
-
-_BITSTREAM_TYPE_HIGH_LOW = const(0)
-_TIMING_WS2818_800 = (400, 850, 800, 450)
-_TIMING_WS2818_400 = (800, 1700, 1600, 900)
-
-
-class NeoPixel:
-    ORDER = (1, 0, 2, 3)
-
-    def __init__(self, pin, n, bpp=3, timing=1):
-        self.pin = pin
-        self.n = n
-        self.bpp = bpp
-        self.buf = bytearray(n * bpp)
-        self.pin.init(pin.OUT)
-        self.timing = (
-            (_TIMING_WS2818_800 if timing else _TIMING_WS2818_400)
-            if isinstance(timing, int)
-            else timing
-        )
-
-    def __len__(self):
-        return self.n
-
-    def __setitem__(self, index, val):
-        offset = index * self.bpp
-        for i in range(self.bpp):
-            self.buf[offset + self.ORDER[i]] = val[i]
-
-    def __getitem__(self, index):
-        offset = index * self.bpp
-        return tuple(self.buf[offset + self.ORDER[i]] for i in range(self.bpp))
-
-    def fill(self, color):
-        for i in range(self.n):
-            self[i] = color
-
-    def write(self):
-        bitstream(self.pin, _BITSTREAM_TYPE_HIGH_LOW, self.timing, self.buf)

From 53145c4c5f10c3e44ffe174b1e6968792f17ea3a Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Wed, 11 Aug 2021 16:06:11 +1000
Subject: [PATCH 1212/3533] docs: Add docs for machine.bitstream and neopixel
 module.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 docs/library/index.rst    |  1 +
 docs/library/machine.rst  | 22 ++++++++++++
 docs/library/neopixel.rst | 73 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 96 insertions(+)
 create mode 100644 docs/library/neopixel.rst

diff --git a/docs/library/index.rst b/docs/library/index.rst
index c69050267a5ad..013ff8937dbc9 100644
--- a/docs/library/index.rst
+++ b/docs/library/index.rst
@@ -92,6 +92,7 @@ the following libraries.
    framebuf.rst
    machine.rst
    micropython.rst
+   neopixel.rst
    network.rst
    uctypes.rst
 
diff --git a/docs/library/machine.rst b/docs/library/machine.rst
index 26f99680a0a7d..c2a6b39001626 100644
--- a/docs/library/machine.rst
+++ b/docs/library/machine.rst
@@ -137,6 +137,28 @@ Miscellaneous functions
    above. The timeout is the same for both cases and given by *timeout_us* (which
    is in microseconds).
 
+.. function:: bitstream(pin, encoding, timing, data, /)
+
+   Transmits *data* by bit-banging the specified *pin*. The *encoding* argument
+   specifies how the bits are encoded, and *timing* is an encoding-specific timing
+   specification.
+
+   The supported encodings are:
+
+     - ``0`` for "high low" pulse duration modulation. This will transmit 0 and
+       1 bits as timed pulses, starting with the most significant bit.
+       The *timing* must be a four-tuple of nanoseconds in the format
+       ``(high_time_0, low_time_0, high_time_1, low_time_1)``. For example,
+       ``(400, 850, 800, 450)`` is the timing specification for WS2812 RGB LEDs
+       at 800kHz.
+
+   The accuracy of the timing varies between ports. On Cortex M0 at 48MHz, it is
+   at best +/- 120ns, however on faster MCUs (ESP8266, ESP32, STM32, Pyboard), it
+   will be closer to +/-30ns.
+
+   .. note:: For controlling WS2812 / NeoPixel strips, see the :mod:`neopixel`
+      module for a higher-level API.
+
 .. function:: rng()
 
    Return a 24-bit software generated random number.
diff --git a/docs/library/neopixel.rst b/docs/library/neopixel.rst
new file mode 100644
index 0000000000000..1b37f088baa71
--- /dev/null
+++ b/docs/library/neopixel.rst
@@ -0,0 +1,73 @@
+:mod:`neopixel` --- control of WS2812 / NeoPixel LEDs
+=====================================================
+
+.. module:: neopixel
+   :synopsis: control of WS2812 / NeoPixel LEDs
+
+This module provides a driver for WS2818 / NeoPixel LEDs.
+
+.. note:: This module is only included by default on the ESP8266 and ESP32
+   ports. On STM32 / Pyboard, you can `download the module
+   <https://github.com/micropython/micropython/blob/master/drivers/neopixel/neopixel.py>`_
+   and copy it to the filesystem.
+
+class NeoPixel
+--------------
+
+This class stores pixel data for a WS2812 LED strip connected to a pin. The
+application should set pixel data and then call :meth:`NeoPixel.write`
+when it is ready to update the strip.
+
+For example::
+
+    import neopixel
+
+    # 32 LED strip connected to X8.
+    p = machine.Pin.board.X8
+    n = neopixel.NeoPixel(p, 32)
+
+    # Draw a red gradient.
+    for i in range(32):
+        n[i] = (i * 8, 0, 0)
+
+    # Update the strip.
+    n.write()
+
+Constructors
+------------
+
+.. class:: NeoPixel(pin, n, *, bpp=3, timing=1)
+
+    Construct an NeoPixel object.  The parameters are:
+
+        - *pin* is a machine.Pin instance.
+        - *n* is the number of LEDs in the strip.
+        - *bpp* is 3 for RGB LEDs, and 4 for RGBW LEDs.
+        - *timing* is 0 for 400KHz, and 1 for 800kHz LEDs (most are 800kHz).
+
+Pixel access methods
+--------------------
+
+.. method:: NeoPixel.fill(pixel)
+
+    Sets the value of all pixels to the specified *pixel* value (i.e. an
+    RGB/RGBW tuple).
+
+.. method:: NeoPixel.__len__()
+
+    Returns the number of LEDs in the strip.
+
+.. method:: NeoPixel.__setitem__(index, val)
+
+    Set the pixel at *index* to the value, which is an RGB/RGBW tuple.
+
+.. method:: NeoPixel.__getitem__(index)
+
+    Returns the pixel at *index* as an RGB/RGBW tuple.
+
+Output methods
+--------------
+
+.. method:: NeoPixel.write()
+
+    Writes the current pixel data to the strip.

From 85adc25558270c9e1815f20689475d38645b47f1 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Tue, 17 Aug 2021 20:20:29 +1000
Subject: [PATCH 1213/3533] py/mkrules.mk: Do submodule sync in "make
 submodules".

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 py/mkrules.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/py/mkrules.mk b/py/mkrules.mk
index 730ad45890d60..d0c0a53c262e5 100644
--- a/py/mkrules.mk
+++ b/py/mkrules.mk
@@ -214,6 +214,7 @@ endif
 submodules:
 	$(ECHO) "Updating submodules: $(GIT_SUBMODULES)"
 ifneq ($(GIT_SUBMODULES),)
+	$(Q)git submodule sync $(addprefix $(TOP)/,$(GIT_SUBMODULES))
 	$(Q)git submodule update --init $(addprefix $(TOP)/,$(GIT_SUBMODULES))
 endif
 .PHONY: submodules

From b352db7a6394b77fc8aa173557d00b3d93a05231 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Tue, 17 Aug 2021 20:40:20 +1000
Subject: [PATCH 1214/3533] rp2/Makefile: Add "submodules" target, to match
 other ports.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/rp2/Makefile  | 5 +++++
 ports/rp2/README.md | 1 +
 2 files changed, 6 insertions(+)

diff --git a/ports/rp2/Makefile b/ports/rp2/Makefile
index 246f29dd0913e..2af13bfbbfb2e 100644
--- a/ports/rp2/Makefile
+++ b/ports/rp2/Makefile
@@ -20,3 +20,8 @@ all:
 
 clean:
 	$(RM) -rf $(BUILD)
+
+GIT_SUBMODULES += lib/pico-sdk lib/tinyusb
+
+submodules:
+	$(MAKE) -f ../../py/mkrules.mk GIT_SUBMODULES="$(GIT_SUBMODULES)" submodules
diff --git a/ports/rp2/README.md b/ports/rp2/README.md
index d49550c5c4bd2..5836ac0cd84e3 100644
--- a/ports/rp2/README.md
+++ b/ports/rp2/README.md
@@ -29,6 +29,7 @@ Building of the RP2 firmware is done entirely using CMake, although a simple
 Makefile is also provided as a convenience.  To build the firmware run (from
 this directory):
 
+    $ make submodules
     $ make clean
     $ make
 

From 0886bf46ca31148b33d3b99d3c68e5b8359d7c5d Mon Sep 17 00:00:00 2001
From: Tobias Thyrrestrup <tt@LEGO.com>
Date: Tue, 17 Aug 2021 13:16:39 +0200
Subject: [PATCH 1215/3533] stm32/Makefile: Allow GIT_SUBMODULES and LIBS to be
 extended.

Signed-off-by: Tobias Thyrrestrup <tt@LEGO.com>
---
 ports/stm32/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/stm32/Makefile b/ports/stm32/Makefile
index 20426861b0e43..a6804ee61604e 100644
--- a/ports/stm32/Makefile
+++ b/ports/stm32/Makefile
@@ -34,7 +34,7 @@ MBOOT_TEXT0_ADDR ?= 0x08000000
 # include py core make definitions
 include $(TOP)/py/py.mk
 
-GIT_SUBMODULES = lib/libhydrogen lib/lwip lib/mbedtls lib/stm32lib
+GIT_SUBMODULES += lib/libhydrogen lib/lwip lib/mbedtls lib/stm32lib
 
 MCU_SERIES_UPPER = $(shell echo $(MCU_SERIES) | tr '[:lower:]' '[:upper:]')
 CMSIS_MCU_LOWER = $(shell echo $(CMSIS_MCU) | tr '[:upper:]' '[:lower:]')
@@ -130,7 +130,7 @@ endif
 
 LDFLAGS = -nostdlib -L $(LD_DIR) $(addprefix -T,$(LD_FILES)) -Map=$(@:.elf=.map) --cref
 LDFLAGS += --defsym=_estack_reserve=8
-LIBS = "$(shell $(CC) $(CFLAGS) -print-libgcc-file-name)"
+LIBS += "$(shell $(CC) $(CFLAGS) -print-libgcc-file-name)"
 
 # Remove uncalled code from the final image.
 CFLAGS += -fdata-sections -ffunction-sections

From ed42002c398d00d4f3753fbeec861f1c4db9fc24 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 19 Aug 2021 23:30:17 +1000
Subject: [PATCH 1216/3533] tools/autobuild: Don't use "-B" for make, it's
 already a fresh build.

And using "-B" means mpy-cross is forcefully rebuilt, sometimes with
invalid CFLAGS_EXTRA options which makes the auto-build fail.

Signed-off-by: Damien George <damien@micropython.org>
---
 tools/autobuild/build-cc3200-latest.sh | 2 +-
 tools/autobuild/build-stm32-latest.sh  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/autobuild/build-cc3200-latest.sh b/tools/autobuild/build-cc3200-latest.sh
index 3c6d400365679..0cbdb9c4286b9 100755
--- a/tools/autobuild/build-cc3200-latest.sh
+++ b/tools/autobuild/build-cc3200-latest.sh
@@ -8,7 +8,7 @@ function do_build() {
     shift
     echo "building $descr $board"
     build_dir=/tmp/cc3200-build-$board
-    $MICROPY_AUTOBUILD_MAKE -B $@ BTARGET=application BOARD=$board BUILD=$build_dir || exit 1
+    $MICROPY_AUTOBUILD_MAKE $@ BTARGET=application BOARD=$board BUILD=$build_dir || exit 1
     zip $dest_dir/$descr$fw_tag.zip $build_dir/mcuimg.bin
     rm -rf $build_dir
 }
diff --git a/tools/autobuild/build-stm32-latest.sh b/tools/autobuild/build-stm32-latest.sh
index 226c14a41eb28..283c8a45b8134 100755
--- a/tools/autobuild/build-stm32-latest.sh
+++ b/tools/autobuild/build-stm32-latest.sh
@@ -8,7 +8,7 @@ function do_build() {
     shift
     echo "building $descr $board"
     build_dir=/tmp/stm-build-$board
-    $MICROPY_AUTOBUILD_MAKE -B $@ BOARD=$board BUILD=$build_dir || exit 1
+    $MICROPY_AUTOBUILD_MAKE $@ BOARD=$board BUILD=$build_dir || exit 1
     mv $build_dir/firmware.dfu $dest_dir/$descr$fw_tag.dfu
     rm -rf $build_dir
 }

From 61d5a8b9ceab474d4137be53b422f5ece70c61a0 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 20 Aug 2021 17:04:39 +1000
Subject: [PATCH 1217/3533] stm32/stm32_it: Support TIM17 IRQs on WB MCUs.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/stm32_it.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/stm32/stm32_it.c b/ports/stm32/stm32_it.c
index dc96e2dd6cf04..4dde201a2f7f4 100644
--- a/ports/stm32/stm32_it.c
+++ b/ports/stm32/stm32_it.c
@@ -625,7 +625,7 @@ void TIM1_TRG_COM_TIM11_IRQHandler(void) {
     IRQ_EXIT(TIM1_TRG_COM_TIM11_IRQn);
 }
 
-#if defined(STM32L4)
+#if defined(STM32L4) || defined(STM32WB)
 void TIM1_TRG_COM_TIM17_IRQHandler(void) {
     IRQ_ENTER(TIM1_TRG_COM_TIM17_IRQn);
     timer_irq_handler(17);

From b51e7e9d01a696cdfefada2e374db51752d1b803 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Thu, 19 Aug 2021 17:49:33 +1000
Subject: [PATCH 1218/3533] stm32: Disable computed goto on constrained boards.

Saves ~1kiB.  Add comment to this effect to mpconfig.h.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/stm32/boards/B_L072Z_LRWAN1/mpconfigboard.h | 1 +
 ports/stm32/boards/NUCLEO_F091RC/mpconfigboard.h  | 1 +
 ports/stm32/boards/NUCLEO_L073RZ/mpconfigboard.h  | 1 +
 ports/stm32/mpconfigport.h                        | 2 ++
 py/mpconfig.h                                     | 3 ++-
 5 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/ports/stm32/boards/B_L072Z_LRWAN1/mpconfigboard.h b/ports/stm32/boards/B_L072Z_LRWAN1/mpconfigboard.h
index 08ded0e03e0ab..dfcca72afb55c 100644
--- a/ports/stm32/boards/B_L072Z_LRWAN1/mpconfigboard.h
+++ b/ports/stm32/boards/B_L072Z_LRWAN1/mpconfigboard.h
@@ -7,6 +7,7 @@
 
 #define MICROPY_EMIT_THUMB          (0)
 #define MICROPY_EMIT_INLINE_THUMB   (0)
+#define MICROPY_OPT_COMPUTED_GOTO   (0)
 #define MICROPY_PY_BUILTINS_COMPLEX (0)
 #define MICROPY_PY_GENERATOR_PEND_THROW (0)
 #define MICROPY_PY_MATH             (0)
diff --git a/ports/stm32/boards/NUCLEO_F091RC/mpconfigboard.h b/ports/stm32/boards/NUCLEO_F091RC/mpconfigboard.h
index 7333dcd0c1dca..a0bff59961c18 100644
--- a/ports/stm32/boards/NUCLEO_F091RC/mpconfigboard.h
+++ b/ports/stm32/boards/NUCLEO_F091RC/mpconfigboard.h
@@ -3,6 +3,7 @@
 
 #define MICROPY_EMIT_THUMB          (0)
 #define MICROPY_EMIT_INLINE_THUMB   (0)
+#define MICROPY_OPT_COMPUTED_GOTO   (0)
 #define MICROPY_PY_USOCKET          (0)
 #define MICROPY_PY_NETWORK          (0)
 #define MICROPY_PY_STM              (0)
diff --git a/ports/stm32/boards/NUCLEO_L073RZ/mpconfigboard.h b/ports/stm32/boards/NUCLEO_L073RZ/mpconfigboard.h
index 331fc95caedaa..c8c809eb4899e 100644
--- a/ports/stm32/boards/NUCLEO_L073RZ/mpconfigboard.h
+++ b/ports/stm32/boards/NUCLEO_L073RZ/mpconfigboard.h
@@ -7,6 +7,7 @@
 
 #define MICROPY_EMIT_THUMB          (0)
 #define MICROPY_EMIT_INLINE_THUMB   (0)
+#define MICROPY_OPT_COMPUTED_GOTO   (0)
 #define MICROPY_PY_BUILTINS_COMPLEX (0)
 #define MICROPY_PY_GENERATOR_PEND_THROW (0)
 #define MICROPY_PY_MATH             (0)
diff --git a/ports/stm32/mpconfigport.h b/ports/stm32/mpconfigport.h
index fc84171b2e7da..6f97377d9bca1 100644
--- a/ports/stm32/mpconfigport.h
+++ b/ports/stm32/mpconfigport.h
@@ -56,7 +56,9 @@
 #define MICROPY_COMP_RETURN_IF_EXPR (1)
 
 // optimisations
+#ifndef MICROPY_OPT_COMPUTED_GOTO
 #define MICROPY_OPT_COMPUTED_GOTO   (1)
+#endif
 #define MICROPY_OPT_CACHE_MAP_LOOKUP_IN_BYTECODE (0)
 #define MICROPY_OPT_MPZ_BITWISE     (1)
 #define MICROPY_OPT_MATH_FACTORIAL  (1)
diff --git a/py/mpconfig.h b/py/mpconfig.h
index 2e83c90c55188..db2aec3bf4eb6 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -483,7 +483,8 @@
 /* Optimisations                                                             */
 
 // Whether to use computed gotos in the VM, or a switch
-// Computed gotos are roughly 10% faster, and increase VM code size by a little
+// Computed gotos are roughly 10% faster, and increase VM code size by a little,
+// e.g. ~1kiB on Cortex M4.
 // Note: enabling this will use the gcc-specific extensions of ranged designated
 // initialisers and addresses of labels, which are not part of the C99 standard.
 #ifndef MICROPY_OPT_COMPUTED_GOTO

From 996f703166d8c57122756f35f7f0185666237f2b Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Fri, 20 Aug 2021 12:09:36 +1000
Subject: [PATCH 1219/3533] esp32,esp8266: Remove dead code for end_ticks in
 machine_bitstream.

The compiler was optimising this out already so it's a no-op change.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/esp32/machine_bitstream.c   | 2 --
 ports/esp8266/machine_bitstream.c | 2 --
 2 files changed, 4 deletions(-)

diff --git a/ports/esp32/machine_bitstream.c b/ports/esp32/machine_bitstream.c
index a60fe1b1c5444..9d2bb57246157 100644
--- a/ports/esp32/machine_bitstream.c
+++ b/ports/esp32/machine_bitstream.c
@@ -69,13 +69,11 @@ void IRAM_ATTR machine_bitstream_high_low(mp_hal_pin_obj_t pin, uint32_t *timing
             GPIO_REG_WRITE(gpio_reg_set, pin_mask);
             uint32_t start_ticks = mp_hal_ticks_cpu();
             uint32_t *t = &timing_ns[b >> 6 & 2];
-            uint32_t end_ticks = start_ticks + t[0];
             while (mp_hal_ticks_cpu() - start_ticks < t[0]) {
                 ;
             }
             GPIO_REG_WRITE(gpio_reg_clear, pin_mask);
             b <<= 1;
-            end_ticks += t[1];
             while (mp_hal_ticks_cpu() - start_ticks < t[1]) {
                 ;
             }
diff --git a/ports/esp8266/machine_bitstream.c b/ports/esp8266/machine_bitstream.c
index bc16aea44d357..13666f3d0fd01 100644
--- a/ports/esp8266/machine_bitstream.c
+++ b/ports/esp8266/machine_bitstream.c
@@ -57,13 +57,11 @@ void machine_bitstream_high_low(mp_hal_pin_obj_t pin, uint32_t *timing_ns, const
             GPIO_REG_WRITE(GPIO_OUT_W1TS_ADDRESS, pin_mask);
             uint32_t start_ticks = mp_hal_ticks_cpu();
             uint32_t *t = &timing_ns[b >> 6 & 2];
-            uint32_t end_ticks = start_ticks + t[0];
             while (mp_hal_ticks_cpu() - start_ticks < t[0]) {
                 ;
             }
             GPIO_REG_WRITE(GPIO_OUT_W1TC_ADDRESS, pin_mask);
             b <<= 1;
-            end_ticks += t[1];
             while (mp_hal_ticks_cpu() - start_ticks < t[1]) {
                 ;
             }

From 2296df0a327150f39ef5a915bf828daac3cd4658 Mon Sep 17 00:00:00 2001
From: Peter Hinch <peter@hinch.me.uk>
Date: Wed, 18 Aug 2021 20:05:25 +0100
Subject: [PATCH 1220/3533] extmod/modframebuf: Enable blit between different
 formats via a palette.

This achieves a substantial performance improvement when rendering glyphs
to color displays, the benefit increasing proportional to the number of
pixels in the glyph.
---
 docs/library/framebuf.rst            | 15 ++++++++----
 extmod/modframebuf.c                 |  9 ++++++-
 tests/extmod/framebuf_palette.py     | 35 ++++++++++++++++++++++++++++
 tests/extmod/framebuf_palette.py.exp |  5 ++++
 4 files changed, 59 insertions(+), 5 deletions(-)
 create mode 100644 tests/extmod/framebuf_palette.py
 create mode 100644 tests/extmod/framebuf_palette.py.exp

diff --git a/docs/library/framebuf.rst b/docs/library/framebuf.rst
index 0073ba708d8a3..13502cc7aef38 100644
--- a/docs/library/framebuf.rst
+++ b/docs/library/framebuf.rst
@@ -103,16 +103,23 @@ Other methods
     Shift the contents of the FrameBuffer by the given vector. This may
     leave a footprint of the previous colors in the FrameBuffer.
 
-.. method:: FrameBuffer.blit(fbuf, x, y[, key])
+.. method:: FrameBuffer.blit(fbuf, x, y, key=-1, palette=None)
 
     Draw another FrameBuffer on top of the current one at the given coordinates.
     If *key* is specified then it should be a color integer and the
     corresponding color will be considered transparent: all pixels with that
     color value will not be drawn.
 
-    This method works between FrameBuffer instances utilising different formats,
-    but the resulting colors may be unexpected due to the mismatch in color
-    formats.
+    The *palette* argument enables blitting between FrameBuffers with differing
+    formats. Typical usage is to render a monochrome or grayscale glyph/icon to
+    a color display. The *palette* is a FrameBuffer instance whose format is
+    that of the current FrameBuffer. The *palette* height is one pixel and its
+    pixel width is the number of colors in the source FrameBuffer. The *palette*
+    for an N-bit source needs 2**N pixels; the *palette* for a monochrome source
+    would have 2 pixels representing background and foreground colors. The
+    application assigns a color to each pixel in the *palette*. The color of the
+    current pixel will be that of that *palette* pixel whose x position is the
+    color of the corresponding source pixel.
 
 Constants
 ---------
diff --git a/extmod/modframebuf.c b/extmod/modframebuf.c
index 18b170078de14..454624dda8cb7 100644
--- a/extmod/modframebuf.c
+++ b/extmod/modframebuf.c
@@ -491,6 +491,10 @@ STATIC mp_obj_t framebuf_blit(size_t n_args, const mp_obj_t *args) {
     if (n_args > 4) {
         key = mp_obj_get_int(args[4]);
     }
+    mp_obj_framebuf_t *palette = NULL;
+    if (n_args > 5 && args[5] != mp_const_none) {
+        palette = MP_OBJ_TO_PTR(mp_obj_cast_to_native_base(args[5], MP_OBJ_FROM_PTR(&mp_type_framebuf)));
+    }
 
     if (
         (x >= self->width) ||
@@ -514,6 +518,9 @@ STATIC mp_obj_t framebuf_blit(size_t n_args, const mp_obj_t *args) {
         int cx1 = x1;
         for (int cx0 = x0; cx0 < x0end; ++cx0) {
             uint32_t col = getpixel(source, cx1, y1);
+            if (palette) {
+                col = getpixel(palette, col, 0);
+            }
             if (col != (uint32_t)key) {
                 setpixel(self, cx0, y0, col);
             }
@@ -523,7 +530,7 @@ STATIC mp_obj_t framebuf_blit(size_t n_args, const mp_obj_t *args) {
     }
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(framebuf_blit_obj, 4, 5, framebuf_blit);
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(framebuf_blit_obj, 4, 6, framebuf_blit);
 
 STATIC mp_obj_t framebuf_scroll(mp_obj_t self_in, mp_obj_t xstep_in, mp_obj_t ystep_in) {
     mp_obj_framebuf_t *self = MP_OBJ_TO_PTR(self_in);
diff --git a/tests/extmod/framebuf_palette.py b/tests/extmod/framebuf_palette.py
new file mode 100644
index 0000000000000..84db834c1500b
--- /dev/null
+++ b/tests/extmod/framebuf_palette.py
@@ -0,0 +1,35 @@
+# Test blit between different color spaces
+try:
+    import framebuf, usys
+except ImportError:
+    print("SKIP")
+    raise SystemExit
+
+# Monochrome glyph/icon
+w = 8
+h = 8
+cbuf = bytearray(w * h // 8)
+fbc = framebuf.FrameBuffer(cbuf, w, h, framebuf.MONO_HLSB)
+fbc.line(0, 0, 7, 7, 1)
+
+# RGB565 destination
+wd = 16
+hd = 16
+dest = bytearray(wd * hd * 2)
+fbd = framebuf.FrameBuffer(dest, wd, hd, framebuf.RGB565)
+
+wp = 2
+bg = 0x1234
+fg = 0xF800
+pal = bytearray(wp * 2)
+palette = framebuf.FrameBuffer(pal, wp, 1, framebuf.RGB565)
+palette.pixel(0, 0, bg)
+palette.pixel(1, 0, fg)
+
+fbd.blit(fbc, 0, 0, -1, palette)
+
+print(fbd.pixel(0, 0) == fg)
+print(fbd.pixel(7, 7) == fg)
+print(fbd.pixel(8, 8) == 0)  # Ouside blit
+print(fbd.pixel(0, 1) == bg)
+print(fbd.pixel(1, 0) == bg)
diff --git a/tests/extmod/framebuf_palette.py.exp b/tests/extmod/framebuf_palette.py.exp
new file mode 100644
index 0000000000000..2e883c51de61f
--- /dev/null
+++ b/tests/extmod/framebuf_palette.py.exp
@@ -0,0 +1,5 @@
+True
+True
+True
+True
+True

From 2a290bbfe18929fdd00e24d937d9dfc6530eb874 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Wed, 25 Aug 2021 11:06:25 +1000
Subject: [PATCH 1221/3533] tools/pyboard.py: Move --no-exclusive/--soft-reset
 out of mutex group.

The --no-exclusive flag was accidentally added to the mutex group in
178198a01df51b5f4c5ef9f38ab2fb8f6269d5f4.

The --soft-reset flag was accidentally added to the mutex group in
41adf178309759d5965c15972f04987a2635314c.

These flags can be specified independently to --[no-]follow so should not
be in that mutex group.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 tools/pyboard.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/pyboard.py b/tools/pyboard.py
index e460c69e24c5d..2608cb2a02742 100755
--- a/tools/pyboard.py
+++ b/tools/pyboard.py
@@ -655,13 +655,13 @@ def main():
         type=int,
         help="seconds to wait for USB connected board to become available",
     )
-    group = cmd_parser.add_mutually_exclusive_group()
-    group.add_argument(
+    cmd_parser.add_argument(
         "--soft-reset",
         default=True,
         action=argparse.BooleanOptionalAction,
         help="Whether to perform a soft reset when connecting to the board.",
     )
+    group = cmd_parser.add_mutually_exclusive_group()
     group.add_argument(
         "--follow",
         action="store_true",
@@ -672,7 +672,7 @@ def main():
         action="store_true",
         help="Do not follow the output after running the scripts.",
     )
-    group.add_argument(
+    cmd_parser.add_argument(
         "--no-exclusive",
         action="store_true",
         help="Do not try to open the serial device for exclusive access.",

From be43164d82dcfeb255a79c506b784185d3724bd1 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Wed, 25 Aug 2021 11:25:01 +1000
Subject: [PATCH 1222/3533] tools/pyboard.py: Make --no-follow use same
 variable as --follow.

You can set one or the other (or neither) but not both.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 tools/pyboard.py | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/tools/pyboard.py b/tools/pyboard.py
index 2608cb2a02742..44f205dad9875 100755
--- a/tools/pyboard.py
+++ b/tools/pyboard.py
@@ -665,12 +665,13 @@ def main():
     group.add_argument(
         "--follow",
         action="store_true",
+        default=None,
         help="follow the output after running the scripts [default if no scripts given]",
     )
     group.add_argument(
         "--no-follow",
-        action="store_true",
-        help="Do not follow the output after running the scripts.",
+        action="store_false",
+        dest="follow",
     )
     cmd_parser.add_argument(
         "--no-exclusive",
@@ -709,13 +710,13 @@ def main():
 
         def execbuffer(buf):
             try:
-                if args.no_follow:
-                    pyb.exec_raw_no_follow(buf)
-                    ret_err = None
-                else:
+                if args.follow is None or args.follow:
                     ret, ret_err = pyb.exec_raw(
                         buf, timeout=None, data_consumer=stdout_write_bytes
                     )
+                else:
+                    pyb.exec_raw_no_follow(buf)
+                    ret_err = None
             except PyboardError as er:
                 print(er)
                 pyb.close()

From 064a145097790d07bf32e94a36931694b65dfb26 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Wed, 25 Aug 2021 11:25:43 +1000
Subject: [PATCH 1223/3533] tools/pyboard.py: Add --exclusive to match
 --no-exclusive.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 tools/pyboard.py | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/tools/pyboard.py b/tools/pyboard.py
index 44f205dad9875..833fa7a41a81b 100755
--- a/tools/pyboard.py
+++ b/tools/pyboard.py
@@ -673,10 +673,17 @@ def main():
         action="store_false",
         dest="follow",
     )
-    cmd_parser.add_argument(
-        "--no-exclusive",
+    group = cmd_parser.add_mutually_exclusive_group()
+    group.add_argument(
+        "--exclusive",
         action="store_true",
-        help="Do not try to open the serial device for exclusive access.",
+        default=True,
+        help="Open the serial device for exclusive access [default]",
+    )
+    group.add_argument(
+        "--no-exclusive",
+        action="store_false",
+        dest="exclusive",
     )
     cmd_parser.add_argument(
         "-f",
@@ -691,7 +698,7 @@ def main():
     # open the connection to the pyboard
     try:
         pyb = Pyboard(
-            args.device, args.baudrate, args.user, args.password, args.wait, not args.no_exclusive
+            args.device, args.baudrate, args.user, args.password, args.wait, args.exclusive
         )
     except PyboardError as er:
         print(er)

From 145fedef8d74a504c4b7c000e6c305602d07feff Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Wed, 25 Aug 2021 11:27:07 +1000
Subject: [PATCH 1224/3533] tools/pyboard.py: Make --no-soft-reset consistent
 with other args.

This makes it work like --no-follow and --no-exclusive using a mutex group
and dest.  Although the current implementation with BooleanOptionAction is
neater it requires Python 3.9, so don't use this feature.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 tools/pyboard.py | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/tools/pyboard.py b/tools/pyboard.py
index 833fa7a41a81b..15ddfd745d589 100755
--- a/tools/pyboard.py
+++ b/tools/pyboard.py
@@ -655,11 +655,17 @@ def main():
         type=int,
         help="seconds to wait for USB connected board to become available",
     )
-    cmd_parser.add_argument(
+    group = cmd_parser.add_mutually_exclusive_group()
+    group.add_argument(
         "--soft-reset",
         default=True,
-        action=argparse.BooleanOptionalAction,
-        help="Whether to perform a soft reset when connecting to the board.",
+        action="store_true",
+        help="Whether to perform a soft reset when connecting to the board [default]",
+    )
+    group.add_argument(
+        "--no-soft-reset",
+        action="store_false",
+        dest="soft_reset",
     )
     group = cmd_parser.add_mutually_exclusive_group()
     group.add_argument(

From 8c4ba575fdd7730e71b339643f51ffadefbedb76 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 26 Aug 2021 23:27:46 +1000
Subject: [PATCH 1225/3533] tests/basics: Split f-string debug printing to
 separate file with .exp.

This feature {x=} was introduced in Python 3.8 so needs a separate .exp
file to run on earlier Python versions.

See https://bugs.python.org/issue36817

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/basics/string_fstring.py           |  6 ------
 tests/basics/string_fstring_debug.py     | 23 +++++++++++++++++++++++
 tests/basics/string_fstring_debug.py.exp |  6 ++++++
 tools/tinytest-codegen.py                |  1 +
 4 files changed, 30 insertions(+), 6 deletions(-)
 create mode 100644 tests/basics/string_fstring_debug.py
 create mode 100644 tests/basics/string_fstring_debug.py.exp

diff --git a/tests/basics/string_fstring.py b/tests/basics/string_fstring.py
index efb7e5a8e1159..4f7225fcad8b6 100644
--- a/tests/basics/string_fstring.py
+++ b/tests/basics/string_fstring.py
@@ -12,17 +12,11 @@ def h():
 x, y = 1, 2
 print(f'{x}')
 print(f'{x:08x}')
-print(f'{x=}')
-print(f'{x=:08x}')
 print(f'a {x} b {y} c')
 print(f'a {x:08x} b {y} c')
-print(f'a {x=} b {y} c')
-print(f'a {x=:08x} b {y} c')
 
 print(f'a {"hello"} b')
 print(f'a {f() + g("foo") + h()} b')
-print(f'a {f() + g("foo") + h()=} b')
-print(f'a {f() + g("foo") + h()=:08x} b')
 
 def foo(a, b):
     return f'{x}{y}{a}{b}'
diff --git a/tests/basics/string_fstring_debug.py b/tests/basics/string_fstring_debug.py
new file mode 100644
index 0000000000000..76a448ca069a3
--- /dev/null
+++ b/tests/basics/string_fstring_debug.py
@@ -0,0 +1,23 @@
+# test f-string debug feature {x=}
+
+
+def f():
+    return 4
+
+
+def g(_):
+    return 5
+
+
+def h():
+    return 6
+
+
+x, y = 1, 2
+print(f"{x=}")
+print(f"{x=:08x}")
+print(f"a {x=} b {y} c")
+print(f"a {x=:08x} b {y} c")
+
+print(f'a {f() + g("foo") + h()=} b')
+print(f'a {f() + g("foo") + h()=:08x} b')
diff --git a/tests/basics/string_fstring_debug.py.exp b/tests/basics/string_fstring_debug.py.exp
new file mode 100644
index 0000000000000..563030f400f07
--- /dev/null
+++ b/tests/basics/string_fstring_debug.py.exp
@@ -0,0 +1,6 @@
+x=1
+x=00000001
+a x=1 b 2 c
+a x=00000001 b 2 c
+a f() + g("foo") + h()=15 b
+a f() + g("foo") + h()=0000000f b
diff --git a/tools/tinytest-codegen.py b/tools/tinytest-codegen.py
index ddbe62b8460f5..f1169a34d4bdd 100755
--- a/tools/tinytest-codegen.py
+++ b/tools/tinytest-codegen.py
@@ -101,6 +101,7 @@ def script_to_map(test_file):
     "misc/sys_settrace_features.py",
     # don't have f-string
     "basics/string_fstring.py",
+    "basics/string_fstring_debug.py",
 )
 
 output = []

From c82244a7c0bba14564187057e46ffc871fad2404 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Thu, 19 Aug 2021 02:16:30 +0200
Subject: [PATCH 1226/3533] rp2/rp2_flash: Disable IRQs while calling
 flash_erase/program.

Flash erase/program functions disable the XIP bit.  If any code runs from
flash at the same time (eg an IRQ or code it calls) it will fail and cause
a lockup.
---
 ports/rp2/rp2_flash.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/ports/rp2/rp2_flash.c b/ports/rp2/rp2_flash.c
index b89cb6fd8919a..80bc1dc1df121 100644
--- a/ports/rp2/rp2_flash.c
+++ b/ports/rp2/rp2_flash.c
@@ -95,12 +95,20 @@ STATIC mp_obj_t rp2_flash_writeblocks(size_t n_args, const mp_obj_t *args) {
     mp_buffer_info_t bufinfo;
     mp_get_buffer_raise(args[2], &bufinfo, MP_BUFFER_READ);
     if (n_args == 3) {
+        // Flash erase/program must run in an atomic section because the XIP bit gets disabled.
+        mp_uint_t atomic_state = MICROPY_BEGIN_ATOMIC_SECTION();
         flash_range_erase(self->flash_base + offset, bufinfo.len);
+        MICROPY_END_ATOMIC_SECTION(atomic_state);
+        MICROPY_EVENT_POLL_HOOK
         // TODO check return value
     } else {
         offset += mp_obj_get_int(args[3]);
     }
+    // Flash erase/program must run in an atomic section because the XIP bit gets disabled.
+    mp_uint_t atomic_state = MICROPY_BEGIN_ATOMIC_SECTION();
     flash_range_program(self->flash_base + offset, bufinfo.buf, bufinfo.len);
+    MICROPY_END_ATOMIC_SECTION(atomic_state);
+    MICROPY_EVENT_POLL_HOOK
     // TODO check return value
     return mp_const_none;
 }
@@ -122,7 +130,10 @@ STATIC mp_obj_t rp2_flash_ioctl(mp_obj_t self_in, mp_obj_t cmd_in, mp_obj_t arg_
             return MP_OBJ_NEW_SMALL_INT(BLOCK_SIZE_BYTES);
         case MP_BLOCKDEV_IOCTL_BLOCK_ERASE: {
             uint32_t offset = mp_obj_get_int(arg_in) * BLOCK_SIZE_BYTES;
+            // Flash erase/program must run in an atomic section because the XIP bit gets disabled.
+            mp_uint_t atomic_state = MICROPY_BEGIN_ATOMIC_SECTION();
             flash_range_erase(self->flash_base + offset, BLOCK_SIZE_BYTES);
+            MICROPY_END_ATOMIC_SECTION(atomic_state);
             // TODO check return value
             return MP_OBJ_NEW_SMALL_INT(0);
         }

From 79baef843b29b098ec34789e5b9f46a66753cd01 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Fri, 20 Aug 2021 14:03:14 +0200
Subject: [PATCH 1227/3533] rp2/CMakeLists.txt: Add option to enable double tap
 reset to bootrom.

* For boards a with reset switch, pressing twice resets into bootloader.
* Enabled by linking with the pico_bootsel_via_double_reset library.
---
 ports/rp2/CMakeLists.txt | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/ports/rp2/CMakeLists.txt b/ports/rp2/CMakeLists.txt
index 34fabbc8bdd6d..fd7ec65e0f419 100644
--- a/ports/rp2/CMakeLists.txt
+++ b/ports/rp2/CMakeLists.txt
@@ -222,6 +222,13 @@ target_link_libraries(${MICROPY_TARGET}
     ${PICO_SDK_COMPONENTS}
 )
 
+if (MICROPY_HW_ENABLE_DOUBLE_TAP)
+# Enable double tap reset into bootrom.
+target_link_libraries(${MICROPY_TARGET}
+    pico_bootsel_via_double_reset
+)
+endif()
+
 # todo this is a bit brittle, but we want to move a few source files into RAM (which requires
 #  a linker script modification) until we explicitly add  macro calls around the function
 #  defs to move them into RAM.

From a3ce8f08ec19358fd1a3e64733a2644f371f7c1f Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Sat, 21 Aug 2021 18:00:11 +0200
Subject: [PATCH 1228/3533] rp2/mpconfigport.h: Allow boards to add root
 pointers.

---
 ports/rp2/mpconfigport.h | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/ports/rp2/mpconfigport.h b/ports/rp2/mpconfigport.h
index ccf11d4f70994..8d053ac1cd5fd 100644
--- a/ports/rp2/mpconfigport.h
+++ b/ports/rp2/mpconfigport.h
@@ -171,6 +171,10 @@ extern const struct _mp_obj_module_t mp_module_utime;
     { MP_ROM_QSTR(MP_QSTR_uos), MP_ROM_PTR(&mp_module_uos) }, \
     { MP_ROM_QSTR(MP_QSTR_utime), MP_ROM_PTR(&mp_module_utime) }, \
 
+#ifndef MICROPY_BOARD_ROOT_POINTERS
+#define MICROPY_BOARD_ROOT_POINTERS
+#endif
+
 #define MICROPY_PORT_ROOT_POINTERS \
     const char *readline_hist[8]; \
     void *machine_pin_irq_obj[30]; \
@@ -178,6 +182,7 @@ extern const struct _mp_obj_module_t mp_module_utime;
     void *rp2_state_machine_irq_obj[8]; \
     void *rp2_uart_rx_buffer[2]; \
     void *rp2_uart_tx_buffer[2]; \
+    MICROPY_BOARD_ROOT_POINTERS \
 
 #define MP_STATE_PORT MP_STATE_VM
 

From d63b287c851ab6bae7b9912ba20a4b33612958f9 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Fri, 20 Aug 2021 21:33:15 +1000
Subject: [PATCH 1229/3533] drivers/neopixel: Optimize fill() for speed.

This makes fill() about 7x faster (PYBV11 and PYBD_SF6) for the cost of +40
bytes of bytecode (or 120 bytes text).

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 drivers/neopixel/neopixel.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/drivers/neopixel/neopixel.py b/drivers/neopixel/neopixel.py
index 9ed5155c720d4..d83b51ebb4863 100644
--- a/drivers/neopixel/neopixel.py
+++ b/drivers/neopixel/neopixel.py
@@ -37,8 +37,11 @@ def __getitem__(self, index):
         return tuple(self.buf[offset + self.ORDER[i]] for i in range(self.bpp))
 
     def fill(self, color):
-        for i in range(self.n):
-            self[i] = color
+        for i in range(self.bpp):
+            c = color[i]
+            b = self.buf
+            for j in range(self.ORDER[i], len(self.buf), self.bpp):
+                b[j] = c
 
     def write(self):
         bitstream(self.pin, _BITSTREAM_TYPE_HIGH_LOW, self.timing, self.buf)

From e9a26791e5be6cda3a173b74087626d3cabafaa8 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Fri, 20 Aug 2021 21:49:02 +1000
Subject: [PATCH 1230/3533] drivers/neopixel: Reduce code size of driver.

Saves 71 bytes of bytecode.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 drivers/neopixel/neopixel.py | 29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/drivers/neopixel/neopixel.py b/drivers/neopixel/neopixel.py
index d83b51ebb4863..0032d36183cb8 100644
--- a/drivers/neopixel/neopixel.py
+++ b/drivers/neopixel/neopixel.py
@@ -1,15 +1,11 @@
 # NeoPixel driver for MicroPython
 # MIT license; Copyright (c) 2016 Damien P. George, 2021 Jim Mussared
 
-from micropython import const
 from machine import bitstream
 
-_BITSTREAM_TYPE_HIGH_LOW = const(0)
-_TIMING_WS2818_800 = (400, 850, 800, 450)
-_TIMING_WS2818_400 = (800, 1700, 1600, 900)
-
 
 class NeoPixel:
+    # G R B W
     ORDER = (1, 0, 2, 3)
 
     def __init__(self, pin, n, bpp=3, timing=1):
@@ -18,8 +14,10 @@ def __init__(self, pin, n, bpp=3, timing=1):
         self.bpp = bpp
         self.buf = bytearray(n * bpp)
         self.pin.init(pin.OUT)
+        # Timing arg can either be 1 for 800kHz or 0 for 400kHz,
+        # or a user-specified timing ns tuple (high_0, low_0, high_1, low_1).
         self.timing = (
-            (_TIMING_WS2818_800 if timing else _TIMING_WS2818_400)
+            ((400, 850, 800, 450) if timing else (800, 1700, 1600, 900))
             if isinstance(timing, int)
             else timing
         )
@@ -27,21 +25,22 @@ def __init__(self, pin, n, bpp=3, timing=1):
     def __len__(self):
         return self.n
 
-    def __setitem__(self, index, val):
-        offset = index * self.bpp
+    def __setitem__(self, i, v):
+        offset = i * self.bpp
         for i in range(self.bpp):
-            self.buf[offset + self.ORDER[i]] = val[i]
+            self.buf[offset + self.ORDER[i]] = v[i]
 
-    def __getitem__(self, index):
-        offset = index * self.bpp
+    def __getitem__(self, i):
+        offset = i * self.bpp
         return tuple(self.buf[offset + self.ORDER[i]] for i in range(self.bpp))
 
-    def fill(self, color):
+    def fill(self, v):
+        b = self.buf
         for i in range(self.bpp):
-            c = color[i]
-            b = self.buf
+            c = v[i]
             for j in range(self.ORDER[i], len(self.buf), self.bpp):
                 b[j] = c
 
     def write(self):
-        bitstream(self.pin, _BITSTREAM_TYPE_HIGH_LOW, self.timing, self.buf)
+        # BITSTREAM_TYPE_HIGH_LOW = 0
+        bitstream(self.pin, 0, self.timing, self.buf)

From 577a3c41925f2b043e80bed467eb2aba3a786dc7 Mon Sep 17 00:00:00 2001
From: Fernando <fepegar@gmail.com>
Date: Sun, 22 Aug 2021 10:27:28 +0100
Subject: [PATCH 1231/3533] docs/library: Fix usage of :term: for frozen module
 reference.

Signed-off-by: Fernando <fepegar@gmail.com>
---
 docs/library/index.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/library/index.rst b/docs/library/index.rst
index 013ff8937dbc9..070e9f9667ae2 100644
--- a/docs/library/index.rst
+++ b/docs/library/index.rst
@@ -172,7 +172,7 @@ Extending built-in libraries from Python
 
 In most cases, the above modules are actually named ``umodule`` rather than
 ``module``, but MicroPython will alias any module prefixed with a ``u`` to the
-non-``u`` version. However a file (or :term:``frozen module``) named
+non-``u`` version. However a file (or :term:`frozen module`) named
 ``module.py`` will take precedence over this alias.
 
 This allows the user to provide an extended implementation of a built-in library

From 4954290e8675d67e8925708230f7a23664ec4b05 Mon Sep 17 00:00:00 2001
From: Fernando <fepegar@gmail.com>
Date: Sun, 22 Aug 2021 10:28:31 +0100
Subject: [PATCH 1232/3533] docs/esp8266: Use monospace for software tools.

Signed-off-by: Fernando <fepegar@gmail.com>
---
 docs/esp8266/tutorial/repl.rst | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/esp8266/tutorial/repl.rst b/docs/esp8266/tutorial/repl.rst
index ba64fcccbe69a..196541bd02cb6 100644
--- a/docs/esp8266/tutorial/repl.rst
+++ b/docs/esp8266/tutorial/repl.rst
@@ -18,9 +18,9 @@ the REPL directly from your PC.  Otherwise you will need to have a way of
 communicating with the UART.
 
 To access the prompt over USB-serial you need to use a terminal emulator program.
-On Windows TeraTerm is a good choice, on Mac you can use the built-in screen
-program, and Linux has picocom and minicom.  Of course, there are many other
-terminal programs that will work, so pick your favourite!
+On Windows TeraTerm is a good choice, on Mac you can use the built-in ``screen``
+program, and Linux has ``picocom`` and ``minicom``.  Of course, there are many
+other terminal programs that will work, so pick your favourite!
 
 For example, on Linux you can try running::
 
@@ -37,9 +37,9 @@ WebREPL allows you to use the Python prompt over WiFi, connecting through a
 browser. The latest versions of Firefox and Chrome are supported.
 
 For your convenience, WebREPL client is hosted at
-`<http://micropython.org/webrepl>`__ . Alternatively, you can install it
+`<http://micropython.org/webrepl>`__. Alternatively, you can install it
 locally from the the GitHub repository
-`<https://github.com/micropython/webrepl>`__ .
+`<https://github.com/micropython/webrepl>`__.
 
 Before connecting to WebREPL, you should set a password and enable it via
 a normal serial connection. Initial versions of MicroPython for ESP8266

From 3720a570f2c2d1617d59a9832e4384e4479006a7 Mon Sep 17 00:00:00 2001
From: Peter Hinch <peter@hinch.me.uk>
Date: Fri, 27 Aug 2021 17:45:13 +0100
Subject: [PATCH 1233/3533] docs/reference: Mention that slicing a memoryview
 causes allocation.

---
 docs/reference/speed_python.rst | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/docs/reference/speed_python.rst b/docs/reference/speed_python.rst
index a563b2d36c821..85e956e8e6a0d 100644
--- a/docs/reference/speed_python.rst
+++ b/docs/reference/speed_python.rst
@@ -91,9 +91,11 @@ code these should be pre-allocated and passed as arguments or as bound objects.
 
 When passing slices of objects such as `bytearray` instances, Python creates
 a copy which involves allocation of the size proportional to the size of slice.
-This can be alleviated using a `memoryview` object. `memoryview` itself
-is allocated on heap, but is a small, fixed-size object, regardless of the size
-of slice it points too.
+This can be alleviated using a `memoryview` object. The `memoryview` itself
+is allocated on the heap, but is a small, fixed-size object, regardless of the size
+of slice it points too. Slicing a `memoryview` creates a new `memoryview`, so this
+cannot be done in an interrupt service routine. Further, the slice syntax ``a:b``
+causes further allocation by instantiating a ``slice(a, b)`` object.
 
 .. code:: python
 

From a66bd7a48925d318e1dd6ada756df947ffacdc12 Mon Sep 17 00:00:00 2001
From: Patrick Van Oosterwijck <patrick@silicognition.com>
Date: Thu, 26 Aug 2021 12:19:46 -0600
Subject: [PATCH 1234/3533] esp32/boards: Add GENERIC_C3_USB board with USB
 serial/JTAG support.

Add a new board type for ESP32-C3 revision 3 and up that implement the USB
serial/JTAG port on pin 18 and 19.  This variant uses the USB serial for
programming and console, leaving the UART free.

- Pins 18 and 19 are correctly reserved for this variant.  Also pins 14-17
  are reserved for flash for any ESP32-C3 so they can't be reconfigured
  anymore to crash the system.
- Added usb_serial_jtag.c and .h to implement this interface.
- Interface was tested to work correctly together with webrepl.
- Interface was tested to work correctly when sending and receiving
  large files with ampy.
- Disconnecting terminal or USB will not hang the system when it's
  trying to print.
---
 .../boards/GENERIC_C3_USB/mpconfigboard.cmake | 11 +++
 .../boards/GENERIC_C3_USB/mpconfigboard.h     |  8 ++
 .../boards/GENERIC_C3_USB/sdkconfig.board     |  9 ++
 ports/esp32/machine_pin.c                     | 13 ++-
 ports/esp32/main.c                            |  3 +
 ports/esp32/main/CMakeLists.txt               |  1 +
 ports/esp32/mphalport.c                       |  3 +
 ports/esp32/usb_serial_jtag.c                 | 98 +++++++++++++++++++
 ports/esp32/usb_serial_jtag.h                 | 32 ++++++
 9 files changed, 174 insertions(+), 4 deletions(-)
 create mode 100644 ports/esp32/boards/GENERIC_C3_USB/mpconfigboard.cmake
 create mode 100644 ports/esp32/boards/GENERIC_C3_USB/mpconfigboard.h
 create mode 100644 ports/esp32/boards/GENERIC_C3_USB/sdkconfig.board
 create mode 100644 ports/esp32/usb_serial_jtag.c
 create mode 100644 ports/esp32/usb_serial_jtag.h

diff --git a/ports/esp32/boards/GENERIC_C3_USB/mpconfigboard.cmake b/ports/esp32/boards/GENERIC_C3_USB/mpconfigboard.cmake
new file mode 100644
index 0000000000000..2b65121b96cee
--- /dev/null
+++ b/ports/esp32/boards/GENERIC_C3_USB/mpconfigboard.cmake
@@ -0,0 +1,11 @@
+set(IDF_TARGET esp32c3)
+
+set(SDKCONFIG_DEFAULTS
+    boards/sdkconfig.base
+    boards/sdkconfig.ble
+    boards/GENERIC_C3_USB/sdkconfig.board
+)
+
+if(NOT MICROPY_FROZEN_MANIFEST)
+    set(MICROPY_FROZEN_MANIFEST ${MICROPY_PORT_DIR}/boards/manifest.py)
+endif()
diff --git a/ports/esp32/boards/GENERIC_C3_USB/mpconfigboard.h b/ports/esp32/boards/GENERIC_C3_USB/mpconfigboard.h
new file mode 100644
index 0000000000000..d403e70e46d48
--- /dev/null
+++ b/ports/esp32/boards/GENERIC_C3_USB/mpconfigboard.h
@@ -0,0 +1,8 @@
+// This configuration is for a generic ESP32C3 board with 4MiB (or more) of flash.
+
+#define MICROPY_HW_BOARD_NAME               "ESP32C3 module"
+#define MICROPY_HW_MCU_NAME                 "ESP32C3"
+
+#define MICROPY_HW_ENABLE_SDCARD            (0)
+#define MICROPY_PY_MACHINE_DAC              (0)
+#define MICROPY_PY_MACHINE_I2S              (0)
diff --git a/ports/esp32/boards/GENERIC_C3_USB/sdkconfig.board b/ports/esp32/boards/GENERIC_C3_USB/sdkconfig.board
new file mode 100644
index 0000000000000..f0cbad00e4617
--- /dev/null
+++ b/ports/esp32/boards/GENERIC_C3_USB/sdkconfig.board
@@ -0,0 +1,9 @@
+CONFIG_ESP32C3_REV_MIN_3=y
+CONFIG_ESP32C3_REV_MIN=3
+CONFIG_ESP32C3_BROWNOUT_DET=y
+CONFIG_ESP32C3_BROWNOUT_DET_LVL_SEL_7=
+CONFIG_ESP32C3_BROWNOUT_DET_LVL_SEL_4=y
+CONFIG_ESP32C3_BROWNOUT_DET_LVL=4
+CONFIG_ESP_CONSOLE_UART_DEFAULT=
+CONFIG_ESP_CONSOLE_USB_CDC=
+CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG=y
diff --git a/ports/esp32/machine_pin.c b/ports/esp32/machine_pin.c
index 181f88b78720a..6c1e96879f4b1 100644
--- a/ports/esp32/machine_pin.c
+++ b/ports/esp32/machine_pin.c
@@ -125,12 +125,17 @@ STATIC const machine_pin_obj_t machine_pin_obj[] = {
     {{&machine_pin_type}, GPIO_NUM_11},
     {{&machine_pin_type}, GPIO_NUM_12},
     {{&machine_pin_type}, GPIO_NUM_13},
-    {{&machine_pin_type}, GPIO_NUM_14},
-    {{&machine_pin_type}, GPIO_NUM_15},
-    {{&machine_pin_type}, GPIO_NUM_16},
-    {{&machine_pin_type}, GPIO_NUM_17},
+    {{NULL}, -1}, // 14 FLASH
+    {{NULL}, -1}, // 15 FLASH
+    {{NULL}, -1}, // 16 FLASH
+    {{NULL}, -1}, // 17 FLASH
+    #if CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG
+    {{NULL}, -1}, // 18 is for native USB D-
+    {{NULL}, -1}, // 19 is for native USB D+
+    #else
     {{&machine_pin_type}, GPIO_NUM_18},
     {{&machine_pin_type}, GPIO_NUM_19},
+    #endif
     {{&machine_pin_type}, GPIO_NUM_20},
     {{&machine_pin_type}, GPIO_NUM_21},
 
diff --git a/ports/esp32/main.c b/ports/esp32/main.c
index 0650c8d71d89b..2ba613668175c 100644
--- a/ports/esp32/main.c
+++ b/ports/esp32/main.c
@@ -58,6 +58,7 @@
 #include "shared/runtime/pyexec.h"
 #include "uart.h"
 #include "usb.h"
+#include "usb_serial_jtag.h"
 #include "modmachine.h"
 #include "modnetwork.h"
 #include "mpthreadport.h"
@@ -89,6 +90,8 @@ void mp_task(void *pvParameter) {
     #endif
     #if CONFIG_USB_ENABLED
     usb_init();
+    #elif CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG
+    usb_serial_jtag_init();
     #else
     uart_init();
     #endif
diff --git a/ports/esp32/main/CMakeLists.txt b/ports/esp32/main/CMakeLists.txt
index 0e7d6ff250eba..057ec024419c6 100644
--- a/ports/esp32/main/CMakeLists.txt
+++ b/ports/esp32/main/CMakeLists.txt
@@ -47,6 +47,7 @@ set(MICROPY_SOURCE_PORT
     ${PROJECT_DIR}/main.c
     ${PROJECT_DIR}/uart.c
     ${PROJECT_DIR}/usb.c
+    ${PROJECT_DIR}/usb_serial_jtag.c
     ${PROJECT_DIR}/gccollect.c
     ${PROJECT_DIR}/mphalport.c
     ${PROJECT_DIR}/fatfs_port.c
diff --git a/ports/esp32/mphalport.c b/ports/esp32/mphalport.c
index 6e6fd26ef443a..de1b173ac409a 100644
--- a/ports/esp32/mphalport.c
+++ b/ports/esp32/mphalport.c
@@ -53,6 +53,7 @@
 #include "shared/runtime/pyexec.h"
 #include "mphalport.h"
 #include "usb.h"
+#include "usb_serial_jtag.h"
 
 TaskHandle_t mp_main_task_handle;
 
@@ -118,6 +119,8 @@ void mp_hal_stdout_tx_strn(const char *str, size_t len) {
     }
     #if CONFIG_USB_ENABLED
     usb_tx_strn(str, len);
+    #elif CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG
+    usb_serial_jtag_tx_strn(str, len);
     #else
     for (uint32_t i = 0; i < len; ++i) {
         uart_tx_one_char(str[i]);
diff --git a/ports/esp32/usb_serial_jtag.c b/ports/esp32/usb_serial_jtag.c
new file mode 100644
index 0000000000000..a7d06a355a2ea
--- /dev/null
+++ b/ports/esp32/usb_serial_jtag.c
@@ -0,0 +1,98 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Patrick Van Oosterwijck
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "py/runtime.h"
+#include "py/mphal.h"
+#include "usb_serial_jtag.h"
+
+#if CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG
+
+#include "hal/usb_serial_jtag_ll.h"
+#include "esp_intr_alloc.h"
+#include "soc/periph_defs.h"
+
+#define USB_SERIAL_JTAG_BUF_SIZE (64)
+
+static uint8_t rx_buf[USB_SERIAL_JTAG_BUF_SIZE];
+static volatile bool terminal_connected = false;
+
+static void usb_serial_jtag_isr_handler(void *arg) {
+    uint32_t flags = usb_serial_jtag_ll_get_intsts_mask();
+
+    if (flags & USB_SERIAL_JTAG_INTR_SOF) {
+        usb_serial_jtag_ll_clr_intsts_mask(USB_SERIAL_JTAG_INTR_SOF);
+    }
+
+    if (flags & USB_SERIAL_JTAG_INTR_SERIAL_OUT_RECV_PKT) {
+        usb_serial_jtag_ll_clr_intsts_mask(USB_SERIAL_JTAG_INTR_SERIAL_OUT_RECV_PKT);
+        size_t req_len = ringbuf_free(&stdin_ringbuf);
+        if (req_len > USB_SERIAL_JTAG_BUF_SIZE) {
+            req_len = USB_SERIAL_JTAG_BUF_SIZE;
+        }
+        size_t len = usb_serial_jtag_ll_read_rxfifo(rx_buf, req_len);
+        for (size_t i = 0; i < len; ++i) {
+            if (rx_buf[i] == mp_interrupt_char) {
+                mp_sched_keyboard_interrupt();
+            } else {
+                ringbuf_put(&stdin_ringbuf, rx_buf[i]);
+            }
+        }
+        mp_hal_wake_main_task_from_isr();
+    }
+}
+
+void usb_serial_jtag_init(void) {
+    usb_serial_jtag_ll_clr_intsts_mask(USB_SERIAL_JTAG_INTR_SERIAL_OUT_RECV_PKT |
+        USB_SERIAL_JTAG_INTR_SOF);
+    usb_serial_jtag_ll_ena_intr_mask(USB_SERIAL_JTAG_INTR_SERIAL_OUT_RECV_PKT |
+        USB_SERIAL_JTAG_INTR_SOF);
+    ESP_ERROR_CHECK(esp_intr_alloc(ETS_USB_SERIAL_JTAG_INTR_SOURCE, ESP_INTR_FLAG_LEVEL1,
+        usb_serial_jtag_isr_handler, NULL, NULL));
+}
+
+void usb_serial_jtag_tx_strn(const char *str, size_t len) {
+    while (len) {
+        size_t l = len;
+        if (l > USB_SERIAL_JTAG_PACKET_SZ_BYTES) {
+            l = USB_SERIAL_JTAG_PACKET_SZ_BYTES;
+        }
+        portTickType start_tick = xTaskGetTickCount();
+        while (!usb_serial_jtag_ll_txfifo_writable()) {
+            portTickType now_tick = xTaskGetTickCount();
+            if (!terminal_connected || now_tick > (start_tick + pdMS_TO_TICKS(200))) {
+                terminal_connected = false;
+                return;
+            }
+        }
+        terminal_connected = true;
+        l = usb_serial_jtag_ll_write_txfifo((const uint8_t *)str, l);
+        usb_serial_jtag_ll_txfifo_flush();
+        str += l;
+        len -= l;
+    }
+}
+
+#endif // CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG
diff --git a/ports/esp32/usb_serial_jtag.h b/ports/esp32/usb_serial_jtag.h
new file mode 100644
index 0000000000000..4eebb19e4b896
--- /dev/null
+++ b/ports/esp32/usb_serial_jtag.h
@@ -0,0 +1,32 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Patrick Van Oosterwijck
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+#ifndef MICROPY_INCLUDED_ESP32_USB_SERIAL_JTAG_H
+#define MICROPY_INCLUDED_ESP32_USB_SERIAL_JTAG_H
+
+void usb_serial_jtag_init(void);
+void usb_serial_jtag_tx_strn(const char *str, size_t len);
+
+#endif // MICROPY_INCLUDED_ESP32_USB_SERIAL_JTAG_H

From 6936f410abe08eb3decd798147f2724691222bfa Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 26 Aug 2021 11:38:29 +1000
Subject: [PATCH 1235/3533] stm32/storage: Make extended-block-device more
 configurable.

A board can now define the following to fully customise the extended block
device interface provided by the storage sub-system:
- MICROPY_HW_BDEV_BLOCKSIZE_EXT
- MICROPY_HW_BDEV_READBLOCKS_EXT
- MICROPY_HW_BDEV_WRITEBLOCKS_EXT
- MICROPY_HW_BDEV_ERASEBLOCKS_EXT

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/flashbdev.c |  1 +
 ports/stm32/spibdev.c   | 22 +++++++++++------
 ports/stm32/storage.c   | 54 ++++++++++++++++++-----------------------
 ports/stm32/storage.h   |  4 +--
 4 files changed, 42 insertions(+), 39 deletions(-)

diff --git a/ports/stm32/flashbdev.c b/ports/stm32/flashbdev.c
index 4153a713c8636..6ed891300dc54 100644
--- a/ports/stm32/flashbdev.c
+++ b/ports/stm32/flashbdev.c
@@ -157,6 +157,7 @@ int32_t flash_bdev_ioctl(uint32_t op, uint32_t arg) {
             return 0;
 
         case BDEV_IOCTL_NUM_BLOCKS:
+            // Units are FLASH_BLOCK_SIZE
             return FLASH_MEM_SEG1_NUM_BLOCKS + FLASH_MEM_SEG2_NUM_BLOCKS;
 
         case BDEV_IOCTL_IRQ_HANDLER:
diff --git a/ports/stm32/spibdev.c b/ports/stm32/spibdev.c
index 5090b43b1cb92..afa6f4ecdccb0 100644
--- a/ports/stm32/spibdev.c
+++ b/ports/stm32/spibdev.c
@@ -59,13 +59,6 @@ int32_t spi_bdev_ioctl(spi_bdev_t *bdev, uint32_t op, uint32_t arg) {
             }
             #endif
             return 0;
-
-        case BDEV_IOCTL_BLOCK_ERASE: {
-            uint32_t basepri = raise_irq_pri(IRQ_PRI_FLASH); // prevent cache flushing and USB access
-            mp_spiflash_erase_block(&bdev->spiflash, arg * MP_SPIFLASH_ERASE_BLOCK_SIZE);
-            restore_irq_pri(basepri);
-            return 0;
-        }
     }
     return -MP_EINVAL;
 }
@@ -108,4 +101,19 @@ int spi_bdev_writeblocks_raw(spi_bdev_t *bdev, const uint8_t *src, uint32_t bloc
     return ret;
 }
 
+int spi_bdev_eraseblocks_raw(spi_bdev_t *bdev, uint32_t block_num, uint32_t num_bytes) {
+    int ret = 0;
+    while (num_bytes >= MP_SPIFLASH_ERASE_BLOCK_SIZE) {
+        uint32_t basepri = raise_irq_pri(IRQ_PRI_FLASH); // prevent cache flushing and USB access
+        ret = mp_spiflash_erase_block(&bdev->spiflash, block_num * MP_SPIFLASH_ERASE_BLOCK_SIZE);
+        restore_irq_pri(basepri);
+        if (ret) {
+            break;
+        }
+        block_num += 1;
+        num_bytes -= MP_SPIFLASH_ERASE_BLOCK_SIZE;
+    }
+    return ret;
+}
+
 #endif
diff --git a/ports/stm32/storage.c b/ports/stm32/storage.c
index a71c4a3ea7791..fcc6d51b3d2a1 100644
--- a/ports/stm32/storage.c
+++ b/ports/stm32/storage.c
@@ -234,24 +234,27 @@ int storage_write_blocks(const uint8_t *src, uint32_t block_num, uint32_t num_bl
 
 #ifdef MICROPY_HW_BDEV_SPIFLASH_EXTENDED
 // Board defined an external SPI flash for use with extended block protocol
-#define SPIFLASH (MICROPY_HW_BDEV_SPIFLASH_EXTENDED)
-#define PYB_FLASH_NATIVE_BLOCK_SIZE (MP_SPIFLASH_ERASE_BLOCK_SIZE)
-#define MICROPY_HW_BDEV_READBLOCKS_EXT(dest, bl, off, len) (spi_bdev_readblocks_raw(SPIFLASH, (dest), (bl), (off), (len)))
-#define MICROPY_HW_BDEV_WRITEBLOCKS_EXT(dest, bl, off, len) (spi_bdev_writeblocks_raw(SPIFLASH, (dest), (bl), (off), (len)))
+#define MICROPY_HW_BDEV_BLOCKSIZE_EXT (MP_SPIFLASH_ERASE_BLOCK_SIZE)
+#define MICROPY_HW_BDEV_READBLOCKS_EXT(dest, bl, off, len) \
+    (spi_bdev_readblocks_raw(MICROPY_HW_BDEV_SPIFLASH_EXTENDED, (dest), (bl), (off), (len)))
+#define MICROPY_HW_BDEV_WRITEBLOCKS_EXT(src, bl, off, len) \
+    (spi_bdev_writeblocks_raw(MICROPY_HW_BDEV_SPIFLASH_EXTENDED, (src), (bl), (off), (len)))
+#define MICROPY_HW_BDEV_ERASEBLOCKS_EXT(bl, len) \
+    (spi_bdev_eraseblocks_raw(MICROPY_HW_BDEV_SPIFLASH_EXTENDED, (bl), (len)))
 
 #elif (MICROPY_VFS_LFS1 || MICROPY_VFS_LFS2) && MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE
 // Board uses littlefs and internal flash, so enable extended block protocol on internal flash
-#define PYB_FLASH_NATIVE_BLOCK_SIZE (FLASH_BLOCK_SIZE)
+#define MICROPY_HW_BDEV_BLOCKSIZE_EXT (FLASH_BLOCK_SIZE)
 #define MICROPY_HW_BDEV_READBLOCKS_EXT(dest, bl, off, len) (flash_bdev_readblocks_ext((dest), (bl), (off), (len)))
 #define MICROPY_HW_BDEV_WRITEBLOCKS_EXT(dest, bl, off, len) (flash_bdev_writeblocks_ext((dest), (bl), (off), (len)))
 #endif
 
-#ifndef PYB_FLASH_NATIVE_BLOCK_SIZE
-#define PYB_FLASH_NATIVE_BLOCK_SIZE (FLASH_BLOCK_SIZE)
+#ifndef MICROPY_HW_BDEV_BLOCKSIZE_EXT
+#define MICROPY_HW_BDEV_BLOCKSIZE_EXT (FLASH_BLOCK_SIZE)
 #endif
 
 #if defined(MICROPY_HW_BDEV_READBLOCKS_EXT)
-// Size of blocks is PYB_FLASH_NATIVE_BLOCK_SIZE
+// Size of blocks is MICROPY_HW_BDEV_BLOCKSIZE_EXT
 int storage_readblocks_ext(uint8_t *dest, uint32_t block, uint32_t offset, uint32_t len) {
     return MICROPY_HW_BDEV_READBLOCKS_EXT(dest, block, offset, len);
 }
@@ -261,9 +264,7 @@ typedef struct _pyb_flash_obj_t {
     mp_obj_base_t base;
     uint32_t start; // in bytes
     uint32_t len; // in bytes
-    #if defined(SPIFLASH)
     bool use_native_block_size;
-    #endif
 } pyb_flash_obj_t;
 
 // This Flash object represents the entire available flash, with emulated partition table at start
@@ -299,23 +300,21 @@ STATIC mp_obj_t pyb_flash_make_new(const mp_obj_type_t *type, size_t n_args, siz
 
     pyb_flash_obj_t *self = m_new_obj(pyb_flash_obj_t);
     self->base.type = &pyb_flash_type;
-    #if defined(SPIFLASH)
     self->use_native_block_size = false;
-    #endif
 
     uint32_t bl_len = (storage_get_block_count() - FLASH_PART1_START_BLOCK) * FLASH_BLOCK_SIZE;
 
     mp_int_t start = args[ARG_start].u_int;
     if (start == -1) {
         start = 0;
-    } else if (!(0 <= start && start < bl_len && start % PYB_FLASH_NATIVE_BLOCK_SIZE == 0)) {
+    } else if (!(0 <= start && start < bl_len && start % MICROPY_HW_BDEV_BLOCKSIZE_EXT == 0)) {
         mp_raise_ValueError(NULL);
     }
 
     mp_int_t len = args[ARG_len].u_int;
     if (len == -1) {
         len = bl_len - start;
-    } else if (!(0 < len && start + len <= bl_len && len % PYB_FLASH_NATIVE_BLOCK_SIZE == 0)) {
+    } else if (!(0 < len && start + len <= bl_len && len % MICROPY_HW_BDEV_BLOCKSIZE_EXT == 0)) {
         mp_raise_ValueError(NULL);
     }
 
@@ -340,10 +339,10 @@ STATIC mp_obj_t pyb_flash_readblocks(size_t n_args, const mp_obj_t *args) {
     else if (self != &pyb_flash_obj) {
         // Extended block read on a sub-section of the flash storage
         uint32_t offset = mp_obj_get_int(args[3]);
-        if ((block_num * PYB_FLASH_NATIVE_BLOCK_SIZE) >= self->len) {
+        if ((block_num * MICROPY_HW_BDEV_BLOCKSIZE_EXT) >= self->len) {
             ret = -MP_EFAULT; // Bad address
         } else {
-            block_num += self->start / PYB_FLASH_NATIVE_BLOCK_SIZE;
+            block_num += self->start / MICROPY_HW_BDEV_BLOCKSIZE_EXT;
             ret = MICROPY_HW_BDEV_READBLOCKS_EXT(bufinfo.buf, block_num, offset, bufinfo.len);
         }
     }
@@ -367,10 +366,10 @@ STATIC mp_obj_t pyb_flash_writeblocks(size_t n_args, const mp_obj_t *args) {
     else if (self != &pyb_flash_obj) {
         // Extended block write on a sub-section of the flash storage
         uint32_t offset = mp_obj_get_int(args[3]);
-        if ((block_num * PYB_FLASH_NATIVE_BLOCK_SIZE) >= self->len) {
+        if ((block_num * MICROPY_HW_BDEV_BLOCKSIZE_EXT) >= self->len) {
             ret = -MP_EFAULT; // Bad address
         } else {
-            block_num += self->start / PYB_FLASH_NATIVE_BLOCK_SIZE;
+            block_num += self->start / MICROPY_HW_BDEV_BLOCKSIZE_EXT;
             ret = MICROPY_HW_BDEV_WRITEBLOCKS_EXT(bufinfo.buf, block_num, offset, bufinfo.len);
         }
     }
@@ -390,11 +389,9 @@ STATIC mp_obj_t pyb_flash_ioctl(mp_obj_t self_in, mp_obj_t cmd_in, mp_obj_t arg_
                 // Will be using extended block protocol
                 if (self == &pyb_flash_obj) {
                     ret = -1;
-                #if defined(SPIFLASH)
                 } else {
-                    // Switch to use native block size of SPI flash
+                    // Switch to use native block size of the underlying storage.
                     self->use_native_block_size = true;
-                #endif
                 }
             }
             return MP_OBJ_NEW_SMALL_INT(ret);
@@ -411,10 +408,8 @@ STATIC mp_obj_t pyb_flash_ioctl(mp_obj_t self_in, mp_obj_t cmd_in, mp_obj_t arg_
             if (self == &pyb_flash_obj) {
                 // Get true size
                 n = storage_get_block_count();
-            #if defined(SPIFLASH)
             } else if (self->use_native_block_size) {
-                n = self->len / PYB_FLASH_NATIVE_BLOCK_SIZE;
-            #endif
+                n = self->len / MICROPY_HW_BDEV_BLOCKSIZE_EXT;
             } else {
                 n = self->len / FLASH_BLOCK_SIZE;
             }
@@ -423,20 +418,19 @@ STATIC mp_obj_t pyb_flash_ioctl(mp_obj_t self_in, mp_obj_t cmd_in, mp_obj_t arg_
 
         case MP_BLOCKDEV_IOCTL_BLOCK_SIZE: {
             mp_int_t n = FLASH_BLOCK_SIZE;
-            #if defined(SPIFLASH)
             if (self->use_native_block_size) {
-                n = PYB_FLASH_NATIVE_BLOCK_SIZE;
+                n = MICROPY_HW_BDEV_BLOCKSIZE_EXT;
             }
-            #endif
             return MP_OBJ_NEW_SMALL_INT(n);
         }
 
         case MP_BLOCKDEV_IOCTL_BLOCK_ERASE: {
             int ret = 0;
-            #if defined(SPIFLASH)
+            #if defined(MICROPY_HW_BDEV_ERASEBLOCKS_EXT)
             if (self->use_native_block_size) {
-                mp_int_t block_num = self->start / PYB_FLASH_NATIVE_BLOCK_SIZE + mp_obj_get_int(arg_in);
-                ret = spi_bdev_ioctl(SPIFLASH, BDEV_IOCTL_BLOCK_ERASE, block_num);
+                mp_int_t block_num = self->start / MICROPY_HW_BDEV_BLOCKSIZE_EXT + mp_obj_get_int(arg_in);
+
+                ret = MICROPY_HW_BDEV_ERASEBLOCKS_EXT(block_num, MICROPY_HW_BDEV_BLOCKSIZE_EXT);
             }
             #endif
             return MP_OBJ_NEW_SMALL_INT(ret);
diff --git a/ports/stm32/storage.h b/ports/stm32/storage.h
index 73058aad6b393..05654855aa0e7 100644
--- a/ports/stm32/storage.h
+++ b/ports/stm32/storage.h
@@ -35,8 +35,7 @@
 enum {
     BDEV_IOCTL_INIT = 1,
     BDEV_IOCTL_SYNC = 3,
-    BDEV_IOCTL_NUM_BLOCKS = 4,
-    BDEV_IOCTL_BLOCK_ERASE = 6,
+    BDEV_IOCTL_NUM_BLOCKS = 4, // units are FLASH_BLOCK_SIZE
     BDEV_IOCTL_IRQ_HANDLER = 7,
 };
 
@@ -70,6 +69,7 @@ int spi_bdev_writeblocks(spi_bdev_t *bdev, const uint8_t *src, uint32_t block_nu
 // These raw functions bypass the cache and go directly to SPI flash
 int spi_bdev_readblocks_raw(spi_bdev_t *bdev, uint8_t *dest, uint32_t block_num, uint32_t block_offset, uint32_t num_bytes);
 int spi_bdev_writeblocks_raw(spi_bdev_t *bdev, const uint8_t *src, uint32_t block_num, uint32_t block_offset, uint32_t num_bytes);
+int spi_bdev_eraseblocks_raw(spi_bdev_t *bdev, uint32_t block_num, uint32_t num_bytes);
 
 extern const struct _mp_obj_type_t pyb_flash_type;
 extern const struct _pyb_flash_obj_t pyb_flash_obj;

From e3eed26d0b247d1c4e6a89890baa74a4e1aead6b Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 26 Aug 2021 12:02:54 +1000
Subject: [PATCH 1236/3533] stm32/boards/LEGO_HUB_NO6: Change SPI flash storage
 to use hardware SPI.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/boards/LEGO_HUB_NO6/bdev.c        | 23 ++++++++++---------
 .../stm32/boards/LEGO_HUB_NO6/mpconfigboard.h | 12 ++++++----
 2 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/ports/stm32/boards/LEGO_HUB_NO6/bdev.c b/ports/stm32/boards/LEGO_HUB_NO6/bdev.c
index 44671edb153a5..a68b812ed34ff 100644
--- a/ports/stm32/boards/LEGO_HUB_NO6/bdev.c
+++ b/ports/stm32/boards/LEGO_HUB_NO6/bdev.c
@@ -26,25 +26,26 @@
 
 #include "py/obj.h"
 #include "storage.h"
+#include "spi.h"
 
 #define CMD_EXIT_4_BYTE_ADDRESS_MODE (0xE9)
 
-STATIC const mp_soft_spi_obj_t soft_spi_bus = {
-    .delay_half = MICROPY_HW_SOFTSPI_MIN_DELAY,
+STATIC const spi_proto_cfg_t spi_bus = {
+    .spi = &spi_obj[1], // SPI2 hardware peripheral
+    .baudrate = 25000000,
     .polarity = 0,
     .phase = 0,
-    .sck = MICROPY_HW_SPIFLASH_SCK,
-    .mosi = MICROPY_HW_SPIFLASH_MOSI,
-    .miso = MICROPY_HW_SPIFLASH_MISO,
+    .bits = 8,
+    .firstbit = SPI_FIRSTBIT_MSB,
 };
 
 STATIC mp_spiflash_cache_t spi_bdev_cache;
 
 const mp_spiflash_config_t spiflash_config = {
     .bus_kind = MP_SPIFLASH_BUS_SPI,
-    .bus.u_spi.cs = MICROPY_HW_SPIFLASH_NSS,
-    .bus.u_spi.data = (void *)&soft_spi_bus,
-    .bus.u_spi.proto = &mp_soft_spi_proto,
+    .bus.u_spi.cs = MICROPY_HW_SPIFLASH_CS,
+    .bus.u_spi.data = (void *)&spi_bus,
+    .bus.u_spi.proto = &spi_proto,
     .cache = &spi_bdev_cache,
 };
 
@@ -55,9 +56,9 @@ int32_t board_bdev_ioctl(void) {
 
     // Exit 4-byte address mode
     uint8_t cmd = CMD_EXIT_4_BYTE_ADDRESS_MODE;
-    mp_hal_pin_write(MICROPY_HW_SPIFLASH_NSS, 0);
-    mp_soft_spi_proto.transfer(MP_OBJ_FROM_PTR(&soft_spi_bus), 1, &cmd, NULL);
-    mp_hal_pin_write(MICROPY_HW_SPIFLASH_NSS, 1);
+    mp_hal_pin_write(MICROPY_HW_SPIFLASH_CS, 0);
+    spi_proto.transfer(MP_OBJ_FROM_PTR(&spi_bus), 1, &cmd, NULL);
+    mp_hal_pin_write(MICROPY_HW_SPIFLASH_CS, 1);
 
     return ret;
 }
diff --git a/ports/stm32/boards/LEGO_HUB_NO6/mpconfigboard.h b/ports/stm32/boards/LEGO_HUB_NO6/mpconfigboard.h
index a0869fda7a1f1..f3a2d1bf4c534 100644
--- a/ports/stm32/boards/LEGO_HUB_NO6/mpconfigboard.h
+++ b/ports/stm32/boards/LEGO_HUB_NO6/mpconfigboard.h
@@ -61,6 +61,10 @@
 #define MICROPY_HW_SPI1_SCK                      (pin_A5) // shared with DAC
 #define MICROPY_HW_SPI1_MISO                     (pin_A6)
 #define MICROPY_HW_SPI1_MOSI                     (pin_A7)
+#define MICROPY_HW_SPI2_NSS                      (pin_B12)
+#define MICROPY_HW_SPI2_SCK                      (pin_B13)
+#define MICROPY_HW_SPI2_MISO                     (pin_C2)
+#define MICROPY_HW_SPI2_MOSI                     (pin_C3)
 
 // USB config
 #define MICROPY_HW_USB_VBUS_DETECT_PIN           (pin_A9)
@@ -76,10 +80,10 @@
 // SPI flash, for R/W storage
 #define MICROPY_HW_SPIFLASH_ENABLE_CACHE         (1)
 #define MICROPY_HW_SPIFLASH_SIZE_BITS            (256 * 1024 * 1024)
-#define MICROPY_HW_SPIFLASH_NSS                  (pin_B12)
-#define MICROPY_HW_SPIFLASH_SCK                  (pin_B13)
-#define MICROPY_HW_SPIFLASH_MISO                 (pin_C2)
-#define MICROPY_HW_SPIFLASH_MOSI                 (pin_C3)
+#define MICROPY_HW_SPIFLASH_CS                   (MICROPY_HW_SPI2_NSS)
+#define MICROPY_HW_SPIFLASH_SCK                  (MICROPY_HW_SPI2_SCK)
+#define MICROPY_HW_SPIFLASH_MISO                 (MICROPY_HW_SPI2_MISO)
+#define MICROPY_HW_SPIFLASH_MOSI                 (MICROPY_HW_SPI2_MOSI)
 
 // SPI flash, block device config
 extern int32_t board_bdev_ioctl(void);

From bac791c5fdde27065c8e144aee929e20a444b10a Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 26 Aug 2021 12:03:26 +1000
Subject: [PATCH 1237/3533] stm32/boards/LEGO_HUB_NO6: Skip first 1MiB of SPI
 flash for storage.

The first 1MiB is used by the built-in bootloader and is best left as-is.

Signed-off-by: Damien George <damien@micropython.org>
---
 .../stm32/boards/LEGO_HUB_NO6/mpconfigboard.h | 28 ++++++++++++++-----
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/ports/stm32/boards/LEGO_HUB_NO6/mpconfigboard.h b/ports/stm32/boards/LEGO_HUB_NO6/mpconfigboard.h
index f3a2d1bf4c534..e208284f4394b 100644
--- a/ports/stm32/boards/LEGO_HUB_NO6/mpconfigboard.h
+++ b/ports/stm32/boards/LEGO_HUB_NO6/mpconfigboard.h
@@ -10,7 +10,7 @@
 #define MICROPY_HW_MCU_NAME                      "STM32F413"
 
 #define MICROPY_HW_HAS_SWITCH                    (0)
-#define MICROPY_HW_HAS_FLASH                     (0)
+#define MICROPY_HW_HAS_FLASH                     (1)
 #define MICROPY_PY_PYB_LEGACY                    (0)
 #define MICROPY_HW_ENTER_BOOTLOADER_VIA_RESET    (0)
 #define MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE (0)
@@ -78,8 +78,12 @@
 #define MICROPY_HW_BLE_BTSTACK_CHIPSET_INSTANCE  btstack_chipset_cc256x_instance()
 
 // SPI flash, for R/W storage
+// The first 1MiB is skipped because it's used by the built-in bootloader
+#define MICROPY_HW_SPIFLASH_OFFSET_BYTES         (1024 * 1024)
+#define MICROPY_HW_SPIFLASH_BLOCKMAP(bl)         ((bl) + MICROPY_HW_SPIFLASH_OFFSET_BYTES / FLASH_BLOCK_SIZE)
+#define MICROPY_HW_SPIFLASH_BLOCKMAP_EXT(bl)     ((bl) + MICROPY_HW_SPIFLASH_OFFSET_BYTES / MP_SPIFLASH_ERASE_BLOCK_SIZE)
 #define MICROPY_HW_SPIFLASH_ENABLE_CACHE         (1)
-#define MICROPY_HW_SPIFLASH_SIZE_BITS            (256 * 1024 * 1024)
+#define MICROPY_HW_SPIFLASH_SIZE_BITS            (256 * 1024 * 1024 - MICROPY_HW_SPIFLASH_OFFSET_BYTES * 8)
 #define MICROPY_HW_SPIFLASH_CS                   (MICROPY_HW_SPI2_NSS)
 #define MICROPY_HW_SPIFLASH_SCK                  (MICROPY_HW_SPI2_SCK)
 #define MICROPY_HW_SPIFLASH_MISO                 (MICROPY_HW_SPI2_MISO)
@@ -89,15 +93,25 @@
 extern int32_t board_bdev_ioctl(void);
 extern struct _spi_bdev_t spi_bdev;
 #define MICROPY_HW_BDEV_IOCTL(op, arg) ( \
-    (op) == BDEV_IOCTL_NUM_BLOCKS ? (MICROPY_HW_SPIFLASH_SIZE_BITS / 8 / FLASH_BLOCK_SIZE - 1) : \
+    (op) == BDEV_IOCTL_NUM_BLOCKS ? (MICROPY_HW_SPIFLASH_SIZE_BITS / 8 / FLASH_BLOCK_SIZE) : \
     (op) == BDEV_IOCTL_INIT ? board_bdev_ioctl() : \
     spi_bdev_ioctl(&spi_bdev, (op), (arg)) \
     )
 
-// Jump over first block (bl + 1) as it is cleared by bootloader
-#define MICROPY_HW_BDEV_READBLOCKS(dest, bl, n) spi_bdev_readblocks(&spi_bdev, (dest), (bl + 1), (n))
-#define MICROPY_HW_BDEV_WRITEBLOCKS(src, bl, n) spi_bdev_writeblocks(&spi_bdev, (src), (bl + 1), (n))
-#define MICROPY_HW_BDEV_SPIFLASH_EXTENDED (&spi_bdev) // for extended block protocol
+// Configuration for stardard block protocol (block size FLASH_BLOCK_SIZE).
+#define MICROPY_HW_BDEV_READBLOCKS(dest, bl, n) \
+    spi_bdev_readblocks(&spi_bdev, (dest), MICROPY_HW_SPIFLASH_BLOCKMAP(bl), (n))
+#define MICROPY_HW_BDEV_WRITEBLOCKS(src, bl, n) \
+    spi_bdev_writeblocks(&spi_bdev, (src), MICROPY_HW_SPIFLASH_BLOCKMAP(bl), (n))
+
+// Configuration for extended block protocol (block size MP_SPIFLASH_ERASE_BLOCK_SIZE).
+#define MICROPY_HW_BDEV_BLOCKSIZE_EXT (MP_SPIFLASH_ERASE_BLOCK_SIZE)
+#define MICROPY_HW_BDEV_READBLOCKS_EXT(dest, bl, off, len) \
+    (spi_bdev_readblocks_raw(&spi_bdev, (dest), MICROPY_HW_SPIFLASH_BLOCKMAP_EXT(bl), (off), (len)))
+#define MICROPY_HW_BDEV_WRITEBLOCKS_EXT(src, bl, off, len) \
+    (spi_bdev_writeblocks_raw(&spi_bdev, (src), MICROPY_HW_SPIFLASH_BLOCKMAP_EXT(bl), (off), (len)))
+#define MICROPY_HW_BDEV_ERASEBLOCKS_EXT(bl, len) \
+    (spi_bdev_eraseblocks_raw(&spi_bdev, MICROPY_HW_SPIFLASH_BLOCKMAP_EXT(bl), (len)))
 
 // Board control config
 #define MICROPY_BOARD_STARTUP                    board_init

From 6f19b9c08d7d8c03981a999d4eddeb3c500125ab Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 26 Aug 2021 12:35:16 +1000
Subject: [PATCH 1238/3533] stm32/boards/LEGO_HUB_NO6: Add make commands to
 backup/restore firmware.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/boards/LEGO_HUB_NO6/README.md     | 22 +++++++++++++++++-
 .../boards/LEGO_HUB_NO6/mpconfigboard.mk      | 23 +++++++++++++++++++
 2 files changed, 44 insertions(+), 1 deletion(-)

diff --git a/ports/stm32/boards/LEGO_HUB_NO6/README.md b/ports/stm32/boards/LEGO_HUB_NO6/README.md
index c566ada9d009e..0b88cd837bf70 100644
--- a/ports/stm32/boards/LEGO_HUB_NO6/README.md
+++ b/ports/stm32/boards/LEGO_HUB_NO6/README.md
@@ -28,6 +28,26 @@ firmware at 0x08010000.  When mboot is installed it can be entered programatical
 via machine.bootloader(), or by holding down the left arrow button when powering
 on the Hub and waiting until the display says "B" before releasing the button.
 
+Backing up original Hub firmware
+--------------------------------
+
+Before install MicroPython it is advised to backup the original LEGO firmware that
+the Hub comes installed with.  To do this, enter the built-in bootloader by holding
+down the Bluetooth button for 5 seconds while powering up the Hub via USB.  Then
+run the following command from the root of this repository:
+
+    $ cd ports/stm32
+    $ make BOARD=LEGO_HUB_NO6 backup-hub-firmware
+
+This will create a file called `lego_hub_firmware.dfu`.  Put this file in a safe
+location.  To restore it, enter the built-in bootloader again and run:
+
+    $ make BOARD=LEGO_HUB_NO6 restore-hub-firmware
+
+This will restore the original firmware but not the filesystem.  To recreate the
+original filesystem the Hub must be updated using the appropriate LEGO PC
+application.
+
 Installing MicroPython
 ----------------------
 
@@ -76,4 +96,4 @@ To scan for BLE devices:
     >>> ble.active(1)
     >>> ble.gap_scan(2000, 625, 625)
 
-Use help("modules") to see available built-in modules.
\ No newline at end of file
+Use help("modules") to see available built-in modules.
diff --git a/ports/stm32/boards/LEGO_HUB_NO6/mpconfigboard.mk b/ports/stm32/boards/LEGO_HUB_NO6/mpconfigboard.mk
index 56527af7d3948..8f8695a9cff11 100644
--- a/ports/stm32/boards/LEGO_HUB_NO6/mpconfigboard.mk
+++ b/ports/stm32/boards/LEGO_HUB_NO6/mpconfigboard.mk
@@ -20,3 +20,26 @@ endif
 # Bootloader settings
 MBOOT_TEXT0_ADDR = 0x08008000
 MBOOT_LD_FILES = ../boards/LEGO_HUB_NO6/mboot_memory.ld stm32_sections.ld
+
+# Backup/restore original Hub firmware
+
+HUB_FIRMWARE = lego_hub_firmware.dfu
+HUB_FIRMWARE_ADDR = $(MBOOT_TEXT0_ADDR)
+HUB_FIRMWARE_SIZE = 0xf8000
+
+backup-hub-firmware:
+	$(Q)$(DFU_UTIL) -a 0 \
+		-d $(BOOTLOADER_DFU_USB_VID):$(BOOTLOADER_DFU_USB_PID) \
+		-U $(HUB_FIRMWARE).bin \
+		-s $(HUB_FIRMWARE_ADDR):$(HUB_FIRMWARE_SIZE)
+	$(Q)$(PYTHON) $(DFU) \
+		-b $(HUB_FIRMWARE_ADDR):$(HUB_FIRMWARE).bin \
+		-D $(BOOTLOADER_DFU_USB_VID):$(BOOTLOADER_DFU_USB_PID) \
+		$(HUB_FIRMWARE)
+	$(Q)$(RM) $(HUB_FIRMWARE).bin
+	$(ECHO) "Backup created in $(HUB_FIRMWARE)"
+
+restore-hub-firmware:
+	$(Q)$(DFU_UTIL) -a 0 \
+		-d $(BOOTLOADER_DFU_USB_VID):$(BOOTLOADER_DFU_USB_PID) \
+		-D $(HUB_FIRMWARE)

From 52a78e69658eca65bcb8d6577df2de2db7932c9e Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 27 Aug 2021 18:06:26 +1000
Subject: [PATCH 1239/3533] drivers/cyw43: Fix cyw43_deinit so it can be called
 many times in a row.

This makes sure deinit() can be called on the interface many times without
error, and that the state of the driver is fully reset.

Fixes issue #7493.

Signed-off-by: Damien George <damien@micropython.org>
---
 drivers/cyw43/cyw43_ctrl.c | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/drivers/cyw43/cyw43_ctrl.c b/drivers/cyw43/cyw43_ctrl.c
index aaa266b0d8527..9bd7602de5ecf 100644
--- a/drivers/cyw43/cyw43_ctrl.c
+++ b/drivers/cyw43/cyw43_ctrl.c
@@ -102,28 +102,25 @@ void cyw43_init(cyw43_t *self) {
 }
 
 void cyw43_deinit(cyw43_t *self) {
+    if (cyw43_poll == NULL) {
+        return;
+    }
+
     CYW_ENTER
 
-    cyw43_ll_bus_sleep(&self->cyw43_ll, true);
-    cyw43_delay_ms(2);
+    // Stop the TCP/IP network interfaces.
     cyw43_tcpip_deinit(self, 0);
     cyw43_tcpip_deinit(self, 1);
 
-    self->itf_state = 0;
-
-    // Disable async polling
+    // Turn off the SDIO bus.
+    #if USE_SDIOIT
     sdio_enable_irq(false);
-    cyw43_poll = NULL;
-
-    #ifdef pyb_pin_WL_RFSW_VDD
-    // Turn the RF-switch off
-    mp_hal_pin_low(pyb_pin_WL_RFSW_VDD);
     #endif
-
-    // Power down the WL chip and the SDIO bus
-    mp_hal_pin_low(pyb_pin_WL_REG_ON);
     sdio_deinit();
 
+    // Power off the WLAN chip and make sure all state is reset.
+    cyw43_init(self);
+
     CYW_EXIT
 }
 

From 30691ed2a1f59fc74f6e051c70eaa7c280889381 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 27 Aug 2021 18:08:19 +1000
Subject: [PATCH 1240/3533] drivers/cyw43: Make wifi join fail if interface is
 not active.

Otherwise the Python network object continues to report that it is
attempting to connect.

Also make the return error code consistent with wifi scan.

Signed-off-by: Damien George <damien@micropython.org>
---
 drivers/cyw43/cyw43_ctrl.c | 10 +++++++++-
 extmod/network_cyw43.c     |  4 ++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/drivers/cyw43/cyw43_ctrl.c b/drivers/cyw43/cyw43_ctrl.c
index 9bd7602de5ecf..203bc812ac13f 100644
--- a/drivers/cyw43/cyw43_ctrl.c
+++ b/drivers/cyw43/cyw43_ctrl.c
@@ -27,6 +27,7 @@
 #include <stdio.h>
 #include <string.h>
 
+#include "py/mperrno.h"
 #include "py/mphal.h"
 #include "drivers/cyw43/cyw43.h"
 #include "pendsv.h"
@@ -52,6 +53,9 @@
 #define WIFI_JOIN_STATE_KEYED   (0x0800)
 #define WIFI_JOIN_STATE_ALL     (0x0e01)
 
+#define CYW43_STA_IS_ACTIVE(self) (((self)->itf_state >> CYW43_ITF_STA) & 1)
+#define CYW43_AP_IS_ACTIVE(self) (((self)->itf_state >> CYW43_ITF_AP) & 1)
+
 cyw43_t cyw43_state;
 void (*cyw43_poll)(void);
 uint32_t cyw43_sleep;
@@ -475,7 +479,7 @@ void cyw43_wifi_set_up(cyw43_t *self, int itf, bool up) {
 
 int cyw43_wifi_scan(cyw43_t *self, cyw43_wifi_scan_options_t *opts, void *env, int (*result_cb)(void*, const cyw43_ev_scan_result_t*)) {
     if (self->itf_state == 0) {
-        return -1;
+        return -MP_EPERM;
     }
 
     cyw43_ensure_up(self);
@@ -518,6 +522,10 @@ int cyw43_wifi_link_status(cyw43_t *self, int itf) {
 // WiFi STA
 
 int cyw43_wifi_join(cyw43_t *self, size_t ssid_len, const uint8_t *ssid, size_t key_len, const uint8_t *key, uint32_t auth_type, const uint8_t *bssid, uint32_t channel) {
+    if (!CYW43_STA_IS_ACTIVE(self)) {
+        return -MP_EPERM;
+    }
+
     int ret = cyw43_ensure_up(self);
     if (ret) {
         return ret;
diff --git a/extmod/network_cyw43.c b/extmod/network_cyw43.c
index adbe427b1dffc..a5ed5d5b8e067 100644
--- a/extmod/network_cyw43.c
+++ b/extmod/network_cyw43.c
@@ -196,7 +196,7 @@ STATIC mp_obj_t network_cyw43_scan(size_t n_args, const mp_obj_t *pos_args, mp_m
     int scan_res = cyw43_wifi_scan(self->cyw, &opts, MP_OBJ_TO_PTR(res), network_cyw43_scan_cb);
 
     if (scan_res < 0) {
-        mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("STA must be active"));
+        mp_raise_OSError(-scan_res);
     }
 
     // Wait for scan to finish, with a 10s timeout
@@ -240,7 +240,7 @@ STATIC mp_obj_t network_cyw43_connect(size_t n_args, const mp_obj_t *pos_args, m
     }
     int ret = cyw43_wifi_join(self->cyw, ssid.len, ssid.buf, key.len, key.buf, args[ARG_auth].u_int, bssid.buf, args[ARG_channel].u_int);
     if (ret != 0) {
-        mp_raise_OSError(ret);
+        mp_raise_OSError(-ret);
     }
     return mp_const_none;
 }

From 86371781e9623e9f1187625dfcad64c8f2fa08c0 Mon Sep 17 00:00:00 2001
From: David Lechner <david@pybricks.com>
Date: Sat, 28 Aug 2021 10:58:38 -0500
Subject: [PATCH 1241/3533] tools/uncrustify: Force 1 newline at end of file.

To keep things neat and tidy, we ensure that each file has 1 and only 1
newline at the end of each file.

Signed-off-by: David Lechner <david@pybricks.com>
---
 ports/esp32/modesp.c         | 1 -
 ports/nrf/mphalport.h        | 1 -
 ports/rp2/main.c             | 1 -
 ports/stm32/machine_i2s.c    | 1 -
 ports/stm32/modmachine.c     | 1 -
 ports/stm32/pin_defs_stm32.c | 1 -
 ports/stm32/pin_defs_stm32.h | 1 -
 tools/uncrustify.cfg         | 4 ++--
 8 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/ports/esp32/modesp.c b/ports/esp32/modesp.c
index 8a7f02575467c..8c94e0cf417ad 100644
--- a/ports/esp32/modesp.c
+++ b/ports/esp32/modesp.c
@@ -143,4 +143,3 @@ const mp_obj_module_t esp_module = {
     .base = { &mp_type_module },
     .globals = (mp_obj_dict_t *)&esp_module_globals,
 };
-
diff --git a/ports/nrf/mphalport.h b/ports/nrf/mphalport.h
index 5900559b5dd76..1ba4b6e70f081 100644
--- a/ports/nrf/mphalport.h
+++ b/ports/nrf/mphalport.h
@@ -78,4 +78,3 @@ mp_uint_t mp_hal_ticks_ms(void);
 #define mp_hal_ticks_cpu() (0)
 
 #endif
-
diff --git a/ports/rp2/main.c b/ports/rp2/main.c
index e615f69112940..d0b89c8d6dc75 100644
--- a/ports/rp2/main.c
+++ b/ports/rp2/main.c
@@ -227,4 +227,3 @@ const char rp2_help_text[] =
     "For further help on a specific object, type help(obj)\n"
     "For a list of available modules, type help('modules')\n"
 ;
-
diff --git a/ports/stm32/machine_i2s.c b/ports/stm32/machine_i2s.c
index d663767bf339b..32167cf4e959f 100644
--- a/ports/stm32/machine_i2s.c
+++ b/ports/stm32/machine_i2s.c
@@ -1123,4 +1123,3 @@ const mp_obj_type_t machine_i2s_type = {
 };
 
 #endif // MICROPY_HW_ENABLE_I2S
-
diff --git a/ports/stm32/modmachine.c b/ports/stm32/modmachine.c
index 1df6cbc47d43d..92b80b3652037 100644
--- a/ports/stm32/modmachine.c
+++ b/ports/stm32/modmachine.c
@@ -468,4 +468,3 @@ const mp_obj_module_t machine_module = {
     .base = { &mp_type_module },
     .globals = (mp_obj_dict_t *)&machine_module_globals,
 };
-
diff --git a/ports/stm32/pin_defs_stm32.c b/ports/stm32/pin_defs_stm32.c
index a3f9d039d6320..070005d217d36 100644
--- a/ports/stm32/pin_defs_stm32.c
+++ b/ports/stm32/pin_defs_stm32.c
@@ -28,4 +28,3 @@ uint32_t pin_get_pull(const pin_obj_t *pin) {
 uint32_t pin_get_af(const pin_obj_t *pin) {
     return (pin->gpio->AFR[pin->pin >> 3] >> ((pin->pin & 7) * 4)) & 0xf;
 }
-
diff --git a/ports/stm32/pin_defs_stm32.h b/ports/stm32/pin_defs_stm32.h
index d90ef1bb6d5cd..20faab4e03262 100644
--- a/ports/stm32/pin_defs_stm32.h
+++ b/ports/stm32/pin_defs_stm32.h
@@ -136,4 +136,3 @@ enum {
 };
 
 typedef GPIO_TypeDef pin_gpio_t;
-
diff --git a/tools/uncrustify.cfg b/tools/uncrustify.cfg
index 80542b903e79e..88127112e81b4 100644
--- a/tools/uncrustify.cfg
+++ b/tools/uncrustify.cfg
@@ -1409,11 +1409,11 @@ nl_start_of_file                = ignore   # ignore/add/remove/force
 nl_start_of_file_min            = 0        # unsigned number
 
 # Add or remove newline at the end of the file.
-nl_end_of_file                  = ignore   # ignore/add/remove/force
+nl_end_of_file                  = force    # ignore/add/remove/force
 
 # The minimum number of newlines at the end of the file (only used if
 # nl_end_of_file is 'add' or 'force').
-nl_end_of_file_min              = 0        # unsigned number
+nl_end_of_file_min              = 1        # unsigned number
 
 # Add or remove newline between '=' and '{'.
 nl_assign_brace                 = ignore   # ignore/add/remove/force

From 35ead0ff0f9bbebc0331841aa9bcf530e63c9ac6 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 1 Sep 2021 00:42:40 +1000
Subject: [PATCH 1242/3533] javascript/Makefile: Change variable to
 EXPORTED_RUNTIME_METHODS.

EXTRA_EXPORTED_RUNTIME_METHODS is deprecated.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/javascript/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/javascript/Makefile b/ports/javascript/Makefile
index 34bbe5f2f7c06..3fac114f5ed2b 100644
--- a/ports/javascript/Makefile
+++ b/ports/javascript/Makefile
@@ -43,7 +43,7 @@ OBJ += $(addprefix $(BUILD)/, $(SRC_SHARED:.c=.o))
 OBJ += $(addprefix $(BUILD)/, $(SRC_C:.c=.o))
 
 JSFLAGS += -s ASYNCIFY
-JSFLAGS += -s EXPORTED_FUNCTIONS="['_mp_js_init', '_mp_js_init_repl', '_mp_js_do_str', '_mp_js_process_char', '_mp_hal_get_interrupt_char', '_mp_sched_keyboard_interrupt']" -s EXTRA_EXPORTED_RUNTIME_METHODS="['ccall', 'cwrap']" -s --memory-init-file 0 --js-library library.js
+JSFLAGS += -s EXPORTED_FUNCTIONS="['_mp_js_init', '_mp_js_init_repl', '_mp_js_do_str', '_mp_js_process_char', '_mp_hal_get_interrupt_char', '_mp_sched_keyboard_interrupt']" -s EXPORTED_RUNTIME_METHODS="['ccall', 'cwrap']" -s --memory-init-file 0 --js-library library.js
 
 all: $(BUILD)/micropython.js
 

From 08ff71dfcda20c8edd8a2500136746fcba0ca434 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 1 Sep 2021 00:43:41 +1000
Subject: [PATCH 1243/3533] tests/pybnative: Make while.py test run on boards
 without pyb.delay.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/pybnative/while.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/pybnative/while.py b/tests/pybnative/while.py
index 0f397dd3772a9..10625e8717247 100644
--- a/tests/pybnative/while.py
+++ b/tests/pybnative/while.py
@@ -1,4 +1,4 @@
-import pyb
+import time, pyb
 
 
 @micropython.native
@@ -8,7 +8,7 @@ def f(led, n, d):
     while i < n:
         print(i)
         led.toggle()
-        pyb.delay(d)
+        time.sleep_ms(d)
         i += 1
     led.off()
 

From 89145c6aaded2e35a8239d457f70ef320ec57623 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 1 Sep 2021 00:49:16 +1000
Subject: [PATCH 1244/3533] tools/mpremote: Bump version to 0.0.6.

Signed-off-by: Damien George <damien@micropython.org>
---
 tools/mpremote/setup.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/mpremote/setup.cfg b/tools/mpremote/setup.cfg
index 4e78d05a945b5..261369384f7b8 100644
--- a/tools/mpremote/setup.cfg
+++ b/tools/mpremote/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = mpremote
-version = 0.0.5
+version = 0.0.6
 author = Damien George
 author_email = damien@micropython.org
 description = Tool for interacting remotely with MicroPython

From 25f30eb8a6839d662867ff335eb10d39e93dd9c8 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 2 Sep 2021 00:03:41 +1000
Subject: [PATCH 1245/3533] stm32/boards/LEGO_HUB_NO6: Add comment re
 constraints on SPI flash cfg.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/boards/LEGO_HUB_NO6/mpconfigboard.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/stm32/boards/LEGO_HUB_NO6/mpconfigboard.h b/ports/stm32/boards/LEGO_HUB_NO6/mpconfigboard.h
index e208284f4394b..b3e061efb72b3 100644
--- a/ports/stm32/boards/LEGO_HUB_NO6/mpconfigboard.h
+++ b/ports/stm32/boards/LEGO_HUB_NO6/mpconfigboard.h
@@ -79,6 +79,7 @@
 
 // SPI flash, for R/W storage
 // The first 1MiB is skipped because it's used by the built-in bootloader
+// Note: MICROPY_HW_SPIFLASH_OFFSET_BYTES must be a multiple of MP_SPIFLASH_ERASE_BLOCK_SIZE
 #define MICROPY_HW_SPIFLASH_OFFSET_BYTES         (1024 * 1024)
 #define MICROPY_HW_SPIFLASH_BLOCKMAP(bl)         ((bl) + MICROPY_HW_SPIFLASH_OFFSET_BYTES / FLASH_BLOCK_SIZE)
 #define MICROPY_HW_SPIFLASH_BLOCKMAP_EXT(bl)     ((bl) + MICROPY_HW_SPIFLASH_OFFSET_BYTES / MP_SPIFLASH_ERASE_BLOCK_SIZE)

From 7c54b6428058a236b8a48c93c255948ece7e718b Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 2 Sep 2021 00:07:13 +1000
Subject: [PATCH 1246/3533] all: Bump version to 1.17.

Signed-off-by: Damien George <damien@micropython.org>
---
 docs/conf.py  | 2 +-
 py/mpconfig.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/conf.py b/docs/conf.py
index 239934bfa7f1e..1a3c18a4f44f3 100755
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -74,7 +74,7 @@
 #
 # We don't follow "The short X.Y version" vs "The full version, including alpha/beta/rc tags"
 # breakdown, so use the same version identifier for both to avoid confusion.
-version = release = '1.16'
+version = release = '1.17'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/py/mpconfig.h b/py/mpconfig.h
index db2aec3bf4eb6..71440da394226 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -28,7 +28,7 @@
 
 // Current version of MicroPython
 #define MICROPY_VERSION_MAJOR 1
-#define MICROPY_VERSION_MINOR 16
+#define MICROPY_VERSION_MINOR 17
 #define MICROPY_VERSION_MICRO 0
 
 // Combined version as a 32-bit number for convenience

From 122d901ef1b624c26771532cb4725eaa8f85e0f4 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 2 Sep 2021 12:37:00 +1000
Subject: [PATCH 1247/3533] extmod/machine_i2c: Make SoftI2C configurable via
 macro option.

The zephyr port doesn't support SoftI2C so it's not enabled, and the legacy
I2C constructor check can be removed.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/machine_i2c.c         | 12 ++++++++++--
 ports/esp32/mpconfigport.h   |  1 +
 ports/esp8266/mpconfigport.h |  1 +
 ports/mimxrt/mpconfigport.h  |  1 +
 ports/nrf/mpconfigport.h     |  1 +
 ports/rp2/mpconfigport.h     |  1 +
 ports/stm32/mpconfigport.h   |  1 +
 ports/zephyr/machine_i2c.c   |  2 --
 py/mpconfig.h                |  5 +++++
 9 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/extmod/machine_i2c.c b/extmod/machine_i2c.c
index 44161fbbb967a..b2e39c534d8e5 100644
--- a/extmod/machine_i2c.c
+++ b/extmod/machine_i2c.c
@@ -33,7 +33,7 @@
 #include "py/runtime.h"
 #include "extmod/machine_i2c.h"
 
-#if MICROPY_PY_MACHINE_I2C
+#if MICROPY_PY_MACHINE_SOFTI2C
 
 typedef mp_machine_soft_i2c_obj_t machine_i2c_obj_t;
 
@@ -240,9 +240,13 @@ int mp_machine_soft_i2c_transfer(mp_obj_base_t *self_in, uint16_t addr, size_t n
     return transfer_ret;
 }
 
+#endif // MICROPY_PY_MACHINE_SOFTI2C
+
 /******************************************************************************/
 // Generic helper functions
 
+#if MICROPY_PY_MACHINE_I2C || MICROPY_PY_MACHINE_SOFTI2C
+
 // For use by ports that require a single buffer of data for a read/write transfer
 int mp_machine_i2c_transfer_adaptor(mp_obj_base_t *self, uint16_t addr, size_t n, mp_machine_i2c_buf_t *bufs, unsigned int flags) {
     size_t len;
@@ -628,9 +632,13 @@ STATIC const mp_rom_map_elem_t machine_i2c_locals_dict_table[] = {
 };
 MP_DEFINE_CONST_DICT(mp_machine_i2c_locals_dict, machine_i2c_locals_dict_table);
 
+#endif // MICROPY_PY_MACHINE_I2C || MICROPY_PY_MACHINE_SOFTI2C
+
 /******************************************************************************/
 // Implementation of soft I2C
 
+#if MICROPY_PY_MACHINE_SOFTI2C
+
 STATIC void mp_machine_soft_i2c_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     mp_machine_soft_i2c_obj_t *self = MP_OBJ_TO_PTR(self_in);
     mp_printf(print, "SoftI2C(scl=" MP_HAL_PIN_FMT ", sda=" MP_HAL_PIN_FMT ", freq=%u)",
@@ -711,4 +719,4 @@ const mp_obj_type_t mp_machine_soft_i2c_type = {
     .locals_dict = (mp_obj_dict_t *)&mp_machine_i2c_locals_dict,
 };
 
-#endif // MICROPY_PY_MACHINE_I2C
+#endif // MICROPY_PY_MACHINE_SOFTI2C
diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h
index 057251fa49b3c..b9e13371868b7 100644
--- a/ports/esp32/mpconfigport.h
+++ b/ports/esp32/mpconfigport.h
@@ -159,6 +159,7 @@
 #define MICROPY_PY_MACHINE_BITSTREAM        (1)
 #define MICROPY_PY_MACHINE_PULSE            (1)
 #define MICROPY_PY_MACHINE_I2C              (1)
+#define MICROPY_PY_MACHINE_SOFTI2C          (1)
 #define MICROPY_PY_MACHINE_SPI              (1)
 #define MICROPY_PY_MACHINE_SPI_MSB          (0)
 #define MICROPY_PY_MACHINE_SPI_LSB          (1)
diff --git a/ports/esp8266/mpconfigport.h b/ports/esp8266/mpconfigport.h
index c7e2f4a44bca2..4e234683b9a9f 100644
--- a/ports/esp8266/mpconfigport.h
+++ b/ports/esp8266/mpconfigport.h
@@ -82,6 +82,7 @@
 #define MICROPY_PY_MACHINE_BITSTREAM (1)
 #define MICROPY_PY_MACHINE_PULSE    (1)
 #define MICROPY_PY_MACHINE_I2C      (1)
+#define MICROPY_PY_MACHINE_SOFTI2C  (1)
 #define MICROPY_PY_MACHINE_SPI      (1)
 #define MICROPY_PY_UWEBSOCKET       (1)
 #define MICROPY_PY_WEBREPL          (1)
diff --git a/ports/mimxrt/mpconfigport.h b/ports/mimxrt/mpconfigport.h
index 1066b93e16aee..76716f705a01c 100644
--- a/ports/mimxrt/mpconfigport.h
+++ b/ports/mimxrt/mpconfigport.h
@@ -126,6 +126,7 @@ uint32_t trng_random_u32(void);
 #define MICROPY_PY_MACHINE_PIN_MAKE_NEW     mp_pin_make_new
 #define MICROPY_PY_MACHINE_PULSE            (1)
 #define MICROPY_PY_MACHINE_I2C              (1)
+#define MICROPY_PY_MACHINE_SOFTI2C          (1)
 #define MICROPY_PY_MACHINE_SPI              (1)
 #define MICROPY_PY_FRAMEBUF                 (1)
 
diff --git a/ports/nrf/mpconfigport.h b/ports/nrf/mpconfigport.h
index 8a622d811c12b..6290f85e87c55 100644
--- a/ports/nrf/mpconfigport.h
+++ b/ports/nrf/mpconfigport.h
@@ -136,6 +136,7 @@
 #define MICROPY_PY_UTIME_MP_HAL     (1)
 #define MICROPY_PY_MACHINE          (1)
 #define MICROPY_PY_MACHINE_PULSE    (0)
+#define MICROPY_PY_MACHINE_SOFTI2C  (MICROPY_PY_MACHINE_I2C)
 #define MICROPY_PY_MACHINE_SPI      (0)
 #define MICROPY_PY_MACHINE_SPI_MIN_DELAY (0)
 #define MICROPY_PY_FRAMEBUF         (0)
diff --git a/ports/rp2/mpconfigport.h b/ports/rp2/mpconfigport.h
index 8d053ac1cd5fd..04a2e48161f14 100644
--- a/ports/rp2/mpconfigport.h
+++ b/ports/rp2/mpconfigport.h
@@ -132,6 +132,7 @@
 #define MICROPY_PY_MACHINE_PIN_MAKE_NEW         mp_pin_make_new
 #define MICROPY_PY_MACHINE_PULSE                (1)
 #define MICROPY_PY_MACHINE_I2C                  (1)
+#define MICROPY_PY_MACHINE_SOFTI2C              (1)
 #define MICROPY_PY_MACHINE_SPI                  (1)
 #define MICROPY_PY_MACHINE_SPI_MSB              (SPI_MSB_FIRST)
 #define MICROPY_PY_MACHINE_SPI_LSB              (SPI_LSB_FIRST)
diff --git a/ports/stm32/mpconfigport.h b/ports/stm32/mpconfigport.h
index 6f97377d9bca1..e2863f192cb5c 100644
--- a/ports/stm32/mpconfigport.h
+++ b/ports/stm32/mpconfigport.h
@@ -201,6 +201,7 @@
 #define MICROPY_PY_MACHINE_PULSE    (1)
 #define MICROPY_PY_MACHINE_PIN_MAKE_NEW mp_pin_make_new
 #define MICROPY_PY_MACHINE_I2C      (1)
+#define MICROPY_PY_MACHINE_SOFTI2C  (1)
 #define MICROPY_PY_MACHINE_SPI      (1)
 #define MICROPY_PY_MACHINE_SPI_MSB  (SPI_FIRSTBIT_MSB)
 #define MICROPY_PY_MACHINE_SPI_LSB  (SPI_FIRSTBIT_LSB)
diff --git a/ports/zephyr/machine_i2c.c b/ports/zephyr/machine_i2c.c
index aa8823392dff0..810c3e5a9ea25 100644
--- a/ports/zephyr/machine_i2c.c
+++ b/ports/zephyr/machine_i2c.c
@@ -53,8 +53,6 @@ STATIC void machine_hard_i2c_print(const mp_print_t *print, mp_obj_t self_in, mp
 }
 
 mp_obj_t machine_hard_i2c_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
-    MP_MACHINE_I2C_CHECK_FOR_LEGACY_SOFTI2C_CONSTRUCTION(n_args, n_kw, all_args);
-
     enum { ARG_id, ARG_scl, ARG_sda, ARG_freq, ARG_timeout };
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_id, MP_ARG_REQUIRED | MP_ARG_OBJ },
diff --git a/py/mpconfig.h b/py/mpconfig.h
index 71440da394226..cc302c3cb758b 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -1485,6 +1485,11 @@ typedef double mp_float_t;
 #define MICROPY_PY_MACHINE_I2C (0)
 #endif
 
+// Whether to provide the "machine.SoftI2C" class
+#ifndef MICROPY_PY_MACHINE_SOFTI2C
+#define MICROPY_PY_MACHINE_SOFTI2C (0)
+#endif
+
 #ifndef MICROPY_PY_MACHINE_SPI
 #define MICROPY_PY_MACHINE_SPI (0)
 #endif

From afe0634c989d81f0c887308a7bc152061cb5d319 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 2 Sep 2021 12:39:28 +1000
Subject: [PATCH 1248/3533] extmod/machine_spi: Make SoftSPI configurable via
 macro option.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/machine_spi.c         | 11 +++++++----
 ports/esp32/mpconfigport.h   |  1 +
 ports/esp8266/mpconfigport.h |  1 +
 ports/mimxrt/mpconfigport.h  |  1 +
 ports/rp2/mpconfigport.h     |  1 +
 ports/stm32/mpconfigport.h   |  1 +
 py/mpconfig.h                |  5 +++++
 7 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/extmod/machine_spi.c b/extmod/machine_spi.c
index c951a5137c5ce..ae5e6677d265f 100644
--- a/extmod/machine_spi.c
+++ b/extmod/machine_spi.c
@@ -30,8 +30,6 @@
 #include "py/runtime.h"
 #include "extmod/machine_spi.h"
 
-#if MICROPY_PY_MACHINE_SPI
-
 // if a port didn't define MSB/LSB constants then provide them
 #ifndef MICROPY_PY_MACHINE_SPI_MSB
 #define MICROPY_PY_MACHINE_SPI_MSB (0)
@@ -41,6 +39,8 @@
 /******************************************************************************/
 // MicroPython bindings for generic machine.SPI
 
+#if MICROPY_PY_MACHINE_SPI || MICROPY_PY_MACHINE_SOFTSPI
+
 STATIC mp_obj_t machine_spi_init(size_t n_args, const mp_obj_t *args, mp_map_t *kw_args) {
     mp_obj_base_t *s = (mp_obj_base_t *)MP_OBJ_TO_PTR(args[0]);
     mp_machine_spi_p_t *spi_p = (mp_machine_spi_p_t *)s->type->protocol;
@@ -115,12 +115,15 @@ STATIC const mp_rom_map_elem_t machine_spi_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_MSB), MP_ROM_INT(MICROPY_PY_MACHINE_SPI_MSB) },
     { MP_ROM_QSTR(MP_QSTR_LSB), MP_ROM_INT(MICROPY_PY_MACHINE_SPI_LSB) },
 };
-
 MP_DEFINE_CONST_DICT(mp_machine_spi_locals_dict, machine_spi_locals_dict_table);
 
+#endif // MICROPY_PY_MACHINE_SPI || MICROPY_PY_MACHINE_SOFTSPI
+
 /******************************************************************************/
 // Implementation of soft SPI
 
+#if MICROPY_PY_MACHINE_SOFTSPI
+
 STATIC uint32_t baudrate_from_delay_half(uint32_t delay_half) {
     #ifdef MICROPY_HW_SOFTSPI_MIN_DELAY
     if (delay_half == MICROPY_HW_SOFTSPI_MIN_DELAY) {
@@ -258,4 +261,4 @@ const mp_obj_type_t mp_machine_soft_spi_type = {
     .locals_dict = (mp_obj_dict_t *)&mp_machine_spi_locals_dict,
 };
 
-#endif // MICROPY_PY_MACHINE_SPI
+#endif // MICROPY_PY_MACHINE_SOFTSPI
diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h
index b9e13371868b7..f8b26bfe84445 100644
--- a/ports/esp32/mpconfigport.h
+++ b/ports/esp32/mpconfigport.h
@@ -163,6 +163,7 @@
 #define MICROPY_PY_MACHINE_SPI              (1)
 #define MICROPY_PY_MACHINE_SPI_MSB          (0)
 #define MICROPY_PY_MACHINE_SPI_LSB          (1)
+#define MICROPY_PY_MACHINE_SOFTSPI          (1)
 #ifndef MICROPY_PY_MACHINE_DAC
 #define MICROPY_PY_MACHINE_DAC              (1)
 #endif
diff --git a/ports/esp8266/mpconfigport.h b/ports/esp8266/mpconfigport.h
index 4e234683b9a9f..5364dd58b52b2 100644
--- a/ports/esp8266/mpconfigport.h
+++ b/ports/esp8266/mpconfigport.h
@@ -84,6 +84,7 @@
 #define MICROPY_PY_MACHINE_I2C      (1)
 #define MICROPY_PY_MACHINE_SOFTI2C  (1)
 #define MICROPY_PY_MACHINE_SPI      (1)
+#define MICROPY_PY_MACHINE_SOFTSPI  (1)
 #define MICROPY_PY_UWEBSOCKET       (1)
 #define MICROPY_PY_WEBREPL          (1)
 #define MICROPY_PY_WEBREPL_DELAY    (20)
diff --git a/ports/mimxrt/mpconfigport.h b/ports/mimxrt/mpconfigport.h
index 76716f705a01c..88e1872cfc57a 100644
--- a/ports/mimxrt/mpconfigport.h
+++ b/ports/mimxrt/mpconfigport.h
@@ -128,6 +128,7 @@ uint32_t trng_random_u32(void);
 #define MICROPY_PY_MACHINE_I2C              (1)
 #define MICROPY_PY_MACHINE_SOFTI2C          (1)
 #define MICROPY_PY_MACHINE_SPI              (1)
+#define MICROPY_PY_MACHINE_SOFTSPI          (1)
 #define MICROPY_PY_FRAMEBUF                 (1)
 
 // Use VfsLfs2's types for fileio/textio
diff --git a/ports/rp2/mpconfigport.h b/ports/rp2/mpconfigport.h
index 04a2e48161f14..ad3de396b01a5 100644
--- a/ports/rp2/mpconfigport.h
+++ b/ports/rp2/mpconfigport.h
@@ -136,6 +136,7 @@
 #define MICROPY_PY_MACHINE_SPI                  (1)
 #define MICROPY_PY_MACHINE_SPI_MSB              (SPI_MSB_FIRST)
 #define MICROPY_PY_MACHINE_SPI_LSB              (SPI_LSB_FIRST)
+#define MICROPY_PY_MACHINE_SOFTSPI              (1)
 #define MICROPY_PY_FRAMEBUF                     (1)
 #define MICROPY_VFS                             (1)
 #define MICROPY_VFS_LFS2                        (1)
diff --git a/ports/stm32/mpconfigport.h b/ports/stm32/mpconfigport.h
index e2863f192cb5c..eff90cb25f4a5 100644
--- a/ports/stm32/mpconfigport.h
+++ b/ports/stm32/mpconfigport.h
@@ -205,6 +205,7 @@
 #define MICROPY_PY_MACHINE_SPI      (1)
 #define MICROPY_PY_MACHINE_SPI_MSB  (SPI_FIRSTBIT_MSB)
 #define MICROPY_PY_MACHINE_SPI_LSB  (SPI_FIRSTBIT_LSB)
+#define MICROPY_PY_MACHINE_SOFTSPI  (1)
 #endif
 #define MICROPY_HW_SOFTSPI_MIN_DELAY (0)
 #define MICROPY_HW_SOFTSPI_MAX_BAUDRATE (HAL_RCC_GetSysClockFreq() / 48)
diff --git a/py/mpconfig.h b/py/mpconfig.h
index cc302c3cb758b..288b105375775 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -1494,6 +1494,11 @@ typedef double mp_float_t;
 #define MICROPY_PY_MACHINE_SPI (0)
 #endif
 
+// Whether to provide the "machine.SoftSPI" class
+#ifndef MICROPY_PY_MACHINE_SOFTSPI
+#define MICROPY_PY_MACHINE_SOFTSPI (0)
+#endif
+
 #ifndef MICROPY_PY_USSL
 #define MICROPY_PY_USSL (0)
 // Whether to add finaliser code to ussl objects

From d41f6dde568df53a0f66a01a3c362e1c1e35ef14 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 2 Sep 2021 12:39:50 +1000
Subject: [PATCH 1249/3533] extmod/modonewire: Make _onewire module
 configurable via macro option.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/modonewire.c          | 4 ++++
 ports/esp32/mpconfigport.h   | 1 +
 ports/esp8266/mpconfigport.h | 1 +
 ports/mimxrt/mpconfigport.h  | 1 +
 ports/rp2/mpconfigport.h     | 1 +
 py/mpconfig.h                | 5 +++++
 6 files changed, 13 insertions(+)

diff --git a/extmod/modonewire.c b/extmod/modonewire.c
index 6abe3dfad9bff..8b34268157dea 100644
--- a/extmod/modonewire.c
+++ b/extmod/modonewire.c
@@ -30,6 +30,8 @@
 #include "py/obj.h"
 #include "py/mphal.h"
 
+#if MICROPY_PY_ONEWIRE
+
 /******************************************************************************/
 // Low-level 1-Wire routines
 
@@ -160,3 +162,5 @@ const mp_obj_module_t mp_module_onewire = {
     .base = { &mp_type_module },
     .globals = (mp_obj_dict_t *)&onewire_module_globals,
 };
+
+#endif // MICROPY_PY_ONEWIRE
diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h
index f8b26bfe84445..b306be937d8b9 100644
--- a/ports/esp32/mpconfigport.h
+++ b/ports/esp32/mpconfigport.h
@@ -182,6 +182,7 @@
 #define MICROPY_PY_WEBREPL                  (1)
 #define MICROPY_PY_FRAMEBUF                 (1)
 #define MICROPY_PY_BTREE                    (1)
+#define MICROPY_PY_ONEWIRE                  (1)
 #define MICROPY_PY_USOCKET_EVENTS           (MICROPY_PY_WEBREPL)
 #define MICROPY_PY_BLUETOOTH_RANDOM_ADDR    (1)
 #define MICROPY_PY_BLUETOOTH_DEFAULT_GAP_NAME ("ESP32")
diff --git a/ports/esp8266/mpconfigport.h b/ports/esp8266/mpconfigport.h
index 5364dd58b52b2..78263efec556a 100644
--- a/ports/esp8266/mpconfigport.h
+++ b/ports/esp8266/mpconfigport.h
@@ -86,6 +86,7 @@
 #define MICROPY_PY_MACHINE_SPI      (1)
 #define MICROPY_PY_MACHINE_SOFTSPI  (1)
 #define MICROPY_PY_UWEBSOCKET       (1)
+#define MICROPY_PY_ONEWIRE          (1)
 #define MICROPY_PY_WEBREPL          (1)
 #define MICROPY_PY_WEBREPL_DELAY    (20)
 #define MICROPY_PY_WEBREPL_STATIC_FILEBUF (1)
diff --git a/ports/mimxrt/mpconfigport.h b/ports/mimxrt/mpconfigport.h
index 88e1872cfc57a..be2b87e6a2328 100644
--- a/ports/mimxrt/mpconfigport.h
+++ b/ports/mimxrt/mpconfigport.h
@@ -130,6 +130,7 @@ uint32_t trng_random_u32(void);
 #define MICROPY_PY_MACHINE_SPI              (1)
 #define MICROPY_PY_MACHINE_SOFTSPI          (1)
 #define MICROPY_PY_FRAMEBUF                 (1)
+#define MICROPY_PY_ONEWIRE                  (1)
 
 // Use VfsLfs2's types for fileio/textio
 #define mp_type_fileio mp_type_vfs_lfs2_fileio
diff --git a/ports/rp2/mpconfigport.h b/ports/rp2/mpconfigport.h
index ad3de396b01a5..4da34cd0388b8 100644
--- a/ports/rp2/mpconfigport.h
+++ b/ports/rp2/mpconfigport.h
@@ -138,6 +138,7 @@
 #define MICROPY_PY_MACHINE_SPI_LSB              (SPI_LSB_FIRST)
 #define MICROPY_PY_MACHINE_SOFTSPI              (1)
 #define MICROPY_PY_FRAMEBUF                     (1)
+#define MICROPY_PY_ONEWIRE                      (1)
 #define MICROPY_VFS                             (1)
 #define MICROPY_VFS_LFS2                        (1)
 #define MICROPY_VFS_FAT                         (1)
diff --git a/py/mpconfig.h b/py/mpconfig.h
index 288b105375775..1b41b6bd0ffeb 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -1517,6 +1517,11 @@ typedef double mp_float_t;
 #define MICROPY_PY_BTREE (0)
 #endif
 
+// Whether to provide the low-level "_onewire" module
+#ifndef MICROPY_PY_ONEWIRE
+#define MICROPY_PY_ONEWIRE (0)
+#endif
+
 /*****************************************************************************/
 /* Hooks for a port to add builtins                                          */
 

From 1083cb2f334f4891e4dc8094f3eaaa839d2e2626 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 2 Sep 2021 12:40:48 +1000
Subject: [PATCH 1250/3533] zephyr/mphalport.h: Remove unused and unimplemented
 C-level pin API.

It gives compile warnings.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/zephyr/mphalport.h | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/ports/zephyr/mphalport.h b/ports/zephyr/mphalport.h
index ba902a76aaa93..ffe68da246a36 100644
--- a/ports/zephyr/mphalport.h
+++ b/ports/zephyr/mphalport.h
@@ -33,10 +33,3 @@ static inline uint64_t mp_hal_time_ns(void) {
 }
 
 #define mp_hal_delay_us_fast(us)   (mp_hal_delay_us(us))
-
-// C-level pin API is not currently implemented
-#define MP_HAL_PIN_FMT             "%d"
-#define mp_hal_pin_name(p)         (0)
-#define mp_hal_pin_od_low(p)       (mp_raise_NotImplementedError("mp_hal_pin_od_low"))
-#define mp_hal_pin_od_high(p)      (mp_raise_NotImplementedError("mp_hal_pin_od_high"))
-#define mp_hal_pin_open_drain(p)   (mp_raise_NotImplementedError("mp_hal_pin_open_drain"))

From 05cd17e36fbc5d3606e34e430dc72549bd1d6708 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 2 Sep 2021 13:02:49 +1000
Subject: [PATCH 1251/3533] stm32/pin: Enable GPIO clock of pin if it's
 constructed without init.

Fixes issue #7363.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/pin.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ports/stm32/pin.c b/ports/stm32/pin.c
index f1c5eee8506d4..ad153311e3792 100644
--- a/ports/stm32/pin.c
+++ b/ports/stm32/pin.c
@@ -256,6 +256,9 @@ mp_obj_t mp_pin_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw,
         mp_map_t kw_args;
         mp_map_init_fixed_table(&kw_args, n_kw, args + n_args);
         pin_obj_init_helper(pin, n_args - 1, args + 1, &kw_args);
+    } else {
+        // enable the peripheral clock so pin reading at least works
+        mp_hal_gpio_clock_enable(pin->gpio);
     }
 
     return MP_OBJ_FROM_PTR(pin);

From 9792c9105f13f8d0196677e3e4bf003a96998c7b Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 2 Sep 2021 13:03:47 +1000
Subject: [PATCH 1252/3533] stm32/main: Don't unconditionally enable GPIO
 A,B,C,D clocks.

Rely on them being enabled only when needed.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/main.c | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/ports/stm32/main.c b/ports/stm32/main.c
index d55f1a2c30897..ccc8fd1ae7f39 100644
--- a/ports/stm32/main.c
+++ b/ports/stm32/main.c
@@ -369,14 +369,6 @@ void stm32_main(uint32_t reset_mode) {
     // set the system clock to be HSE
     SystemClock_Config();
 
-    // enable GPIO clocks
-    __HAL_RCC_GPIOA_CLK_ENABLE();
-    __HAL_RCC_GPIOB_CLK_ENABLE();
-    __HAL_RCC_GPIOC_CLK_ENABLE();
-    #if defined(GPIOD)
-    __HAL_RCC_GPIOD_CLK_ENABLE();
-    #endif
-
     #if defined(STM32F4) || defined(STM32F7)
     #if defined(__HAL_RCC_DTCMRAMEN_CLK_ENABLE)
     // The STM32F746 doesn't really have CCM memory, but it does have DTCM,

From af64c2ddbd758ab6bac0fcca94c66d89046663be Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 24 Jun 2021 12:37:50 +1000
Subject: [PATCH 1253/3533] extmod/machine_pwm: Factor out machine.PWM bindings
 to common code.

This commit refactors machine.PWM and creates extmod/machine_pwm.c.  The
esp8266, esp32 and rp2 ports all use this and provide implementations of
the required PWM functionality.  This helps to reduce code duplication and
keep the same Python API across ports.

This commit does not make any functional changes.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/extmod.cmake             |   1 +
 extmod/machine_pwm.c            | 143 ++++++++++++++++++++++++++++
 extmod/machine_pwm.h            |  55 +++++++++++
 ports/esp32/machine_pwm.c       | 108 ++++++---------------
 ports/esp32/main/CMakeLists.txt |   1 -
 ports/esp32/modmachine.c        |   1 +
 ports/esp32/modmachine.h        |   1 -
 ports/esp32/mpconfigport.h      |   4 +
 ports/esp8266/Makefile          |   1 -
 ports/esp8266/machine_pwm.c     |  95 ++++++-------------
 ports/esp8266/modmachine.c      |   3 +-
 ports/esp8266/modmachine.h      |   1 -
 ports/esp8266/mpconfigport.h    |   4 +
 ports/rp2/CMakeLists.txt        |   2 -
 ports/rp2/machine_pwm.c         | 161 ++++++++++++--------------------
 ports/rp2/modmachine.c          |   1 +
 ports/rp2/modmachine.h          |   1 -
 ports/rp2/mpconfigport.h        |   3 +
 py/py.mk                        |   1 +
 19 files changed, 336 insertions(+), 251 deletions(-)
 create mode 100644 extmod/machine_pwm.c
 create mode 100644 extmod/machine_pwm.h

diff --git a/extmod/extmod.cmake b/extmod/extmod.cmake
index c6b45b0d3e746..69ec39759b815 100644
--- a/extmod/extmod.cmake
+++ b/extmod/extmod.cmake
@@ -10,6 +10,7 @@ set(MICROPY_SOURCE_EXTMOD
     ${MICROPY_EXTMOD_DIR}/machine_i2c.c
     ${MICROPY_EXTMOD_DIR}/machine_mem.c
     ${MICROPY_EXTMOD_DIR}/machine_pulse.c
+    ${MICROPY_EXTMOD_DIR}/machine_pwm.c
     ${MICROPY_EXTMOD_DIR}/machine_signal.c
     ${MICROPY_EXTMOD_DIR}/machine_spi.c
     ${MICROPY_EXTMOD_DIR}/modbluetooth.c
diff --git a/extmod/machine_pwm.c b/extmod/machine_pwm.c
new file mode 100644
index 0000000000000..ddf49c1358a5d
--- /dev/null
+++ b/extmod/machine_pwm.c
@@ -0,0 +1,143 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020-2021 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "py/runtime.h"
+
+#if MICROPY_PY_MACHINE_PWM
+
+#include "extmod/machine_pwm.h"
+
+#ifdef MICROPY_PY_MACHINE_PWM_INCLUDEFILE
+#include MICROPY_PY_MACHINE_PWM_INCLUDEFILE
+#endif
+
+#if MICROPY_PY_MACHINE_PWM_INIT
+STATIC mp_obj_t machine_pwm_init(size_t n_args, const mp_obj_t *args, mp_map_t *kw_args) {
+    mp_machine_pwm_init_helper(args[0], n_args - 1, args + 1, kw_args);
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_KW(machine_pwm_init_obj, 1, machine_pwm_init);
+#endif
+
+// PWM.deinit()
+STATIC mp_obj_t machine_pwm_deinit(mp_obj_t self_in) {
+    machine_pwm_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    mp_machine_pwm_deinit(self);
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_pwm_deinit_obj, machine_pwm_deinit);
+
+// PWM.freq([value])
+STATIC mp_obj_t machine_pwm_freq(size_t n_args, const mp_obj_t *args) {
+    machine_pwm_obj_t *self = MP_OBJ_TO_PTR(args[0]);
+    if (n_args == 1) {
+        // Get frequency.
+        return mp_machine_pwm_freq_get(self);
+    } else {
+        // Set the frequency.
+        mp_int_t freq = mp_obj_get_int(args[1]);
+        mp_machine_pwm_freq_set(self, freq);
+        return mp_const_none;
+    }
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_pwm_freq_obj, 1, 2, machine_pwm_freq);
+
+#if MICROPY_PY_MACHINE_PWM_DUTY
+// PWM.duty([duty])
+STATIC mp_obj_t machine_pwm_duty(size_t n_args, const mp_obj_t *args) {
+    machine_pwm_obj_t *self = MP_OBJ_TO_PTR(args[0]);
+    if (n_args == 1) {
+        // Get duty cycle.
+        return mp_machine_pwm_duty_get(self);
+    } else {
+        // Set duty cycle.
+        mp_int_t duty = mp_obj_get_int(args[1]);
+        mp_machine_pwm_duty_set(self, duty);
+        return mp_const_none;
+    }
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_pwm_duty_obj, 1, 2, machine_pwm_duty);
+#endif
+
+#if MICROPY_PY_MACHINE_PWM_DUTY_U16_NS
+
+// PWM.duty_u16([value])
+STATIC mp_obj_t machine_pwm_duty_u16(size_t n_args, const mp_obj_t *args) {
+    machine_pwm_obj_t *self = MP_OBJ_TO_PTR(args[0]);
+    if (n_args == 1) {
+        // Get duty cycle.
+        return mp_machine_pwm_duty_get_u16(self);
+    } else {
+        // Set duty cycle.
+        mp_int_t duty_u16 = mp_obj_get_int(args[1]);
+        mp_machine_pwm_duty_set_u16(self, duty_u16);
+        return mp_const_none;
+    }
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_pwm_duty_u16_obj, 1, 2, machine_pwm_duty_u16);
+
+// PWM.duty_ns([value])
+STATIC mp_obj_t machine_pwm_duty_ns(size_t n_args, const mp_obj_t *args) {
+    machine_pwm_obj_t *self = MP_OBJ_TO_PTR(args[0]);
+    if (n_args == 1) {
+        // Get duty cycle.
+        return mp_machine_pwm_duty_get_ns(self);
+    } else {
+        // Set duty cycle.
+        mp_int_t duty_ns = mp_obj_get_int(args[1]);
+        mp_machine_pwm_duty_set_ns(self, duty_ns);
+        return mp_const_none;
+    }
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_pwm_duty_ns_obj, 1, 2, machine_pwm_duty_ns);
+
+#endif
+
+STATIC const mp_rom_map_elem_t machine_pwm_locals_dict_table[] = {
+    #if MICROPY_PY_MACHINE_PWM_INIT
+    { MP_ROM_QSTR(MP_QSTR_init), MP_ROM_PTR(&machine_pwm_init_obj) },
+    #endif
+    { MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&machine_pwm_deinit_obj) },
+    { MP_ROM_QSTR(MP_QSTR_freq), MP_ROM_PTR(&machine_pwm_freq_obj) },
+    #if MICROPY_PY_MACHINE_PWM_DUTY
+    { MP_ROM_QSTR(MP_QSTR_duty), MP_ROM_PTR(&machine_pwm_duty_obj) },
+    #endif
+    #if MICROPY_PY_MACHINE_PWM_DUTY_U16_NS
+    { MP_ROM_QSTR(MP_QSTR_duty_u16), MP_ROM_PTR(&machine_pwm_duty_u16_obj) },
+    { MP_ROM_QSTR(MP_QSTR_duty_ns), MP_ROM_PTR(&machine_pwm_duty_ns_obj) },
+    #endif
+};
+STATIC MP_DEFINE_CONST_DICT(machine_pwm_locals_dict, machine_pwm_locals_dict_table);
+
+const mp_obj_type_t machine_pwm_type = {
+    { &mp_type_type },
+    .name = MP_QSTR_PWM,
+    .print = mp_machine_pwm_print,
+    .make_new = mp_machine_pwm_make_new,
+    .locals_dict = (mp_obj_dict_t *)&machine_pwm_locals_dict,
+};
+
+#endif // MICROPY_PY_MACHINE_PWM
diff --git a/extmod/machine_pwm.h b/extmod/machine_pwm.h
new file mode 100644
index 0000000000000..f0953014cab07
--- /dev/null
+++ b/extmod/machine_pwm.h
@@ -0,0 +1,55 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#ifndef MICROPY_INCLUDED_EXTMOD_MACHINE_PWM_H
+#define MICROPY_INCLUDED_EXTMOD_MACHINE_PWM_H
+
+#include "py/obj.h"
+
+// A port must provide this type, but it's otherwise opaque.
+typedef struct _machine_pwm_obj_t machine_pwm_obj_t;
+
+// This PWM class is implemented by machine_pwm.c.
+extern const mp_obj_type_t machine_pwm_type;
+
+// A port must provide implementations of these low-level PWM functions, either as global
+// linker symbols, or included directly if MICROPY_PY_MACHINE_PWM_INCLUDEFILE is defined.
+#ifndef MICROPY_PY_MACHINE_PWM_INCLUDEFILE
+void mp_machine_pwm_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind);
+mp_obj_t mp_machine_pwm_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args);
+void mp_machine_pwm_init_helper(machine_pwm_obj_t *self, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args);
+void mp_machine_pwm_deinit(machine_pwm_obj_t *self);
+mp_obj_t mp_machine_pwm_freq_get(machine_pwm_obj_t *self);
+void mp_machine_pwm_freq_set(machine_pwm_obj_t *self, mp_int_t freq);
+mp_obj_t mp_machine_pwm_duty_get(machine_pwm_obj_t *self);
+void mp_machine_pwm_duty_set(machine_pwm_obj_t *self, mp_int_t duty);
+mp_obj_t mp_machine_pwm_duty_get_u16(machine_pwm_obj_t *self);
+void mp_machine_pwm_duty_set_u16(machine_pwm_obj_t *self, mp_int_t duty_u16);
+mp_obj_t mp_machine_pwm_duty_get_ns(machine_pwm_obj_t *self);
+void mp_machine_pwm_duty_set_ns(machine_pwm_obj_t *self, mp_int_t duty_ns);
+#endif
+
+#endif // MICROPY_INCLUDED_EXTMOD_MACHINE_PWM_H
diff --git a/ports/esp32/machine_pwm.c b/ports/esp32/machine_pwm.c
index a7d7d29df8541..9fe06aa6999d3 100644
--- a/ports/esp32/machine_pwm.c
+++ b/ports/esp32/machine_pwm.c
@@ -23,24 +23,12 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#include <stdio.h>
-#include "driver/ledc.h"
-#include "esp_err.h"
 
-#include "py/nlr.h"
 #include "py/runtime.h"
-#include "modmachine.h"
-#include "mphalport.h"
+#include "py/mphal.h"
 
-// Forward dec'l
-extern const mp_obj_type_t machine_pwm_type;
-
-typedef struct _esp32_pwm_obj_t {
-    mp_obj_base_t base;
-    gpio_num_t pin;
-    uint8_t active;
-    uint8_t channel;
-} esp32_pwm_obj_t;
+#include "driver/ledc.h"
+#include "esp_err.h"
 
 // Which channel has which GPIO pin assigned?
 // (-1 if not assigned)
@@ -110,11 +98,17 @@ STATIC int set_freq(int newval) {
 }
 
 /******************************************************************************/
-
 // MicroPython bindings for PWM
 
-STATIC void esp32_pwm_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
-    esp32_pwm_obj_t *self = MP_OBJ_TO_PTR(self_in);
+typedef struct _machine_pwm_obj_t {
+    mp_obj_base_t base;
+    gpio_num_t pin;
+    uint8_t active;
+    uint8_t channel;
+} machine_pwm_obj_t;
+
+STATIC void mp_machine_pwm_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+    machine_pwm_obj_t *self = MP_OBJ_TO_PTR(self_in);
     mp_printf(print, "PWM(%u", self->pin);
     if (self->active) {
         mp_printf(print, ", freq=%u, duty=%u", timer_cfg.freq_hz,
@@ -123,7 +117,7 @@ STATIC void esp32_pwm_print(const mp_print_t *print, mp_obj_t self_in, mp_print_
     mp_printf(print, ")");
 }
 
-STATIC void esp32_pwm_init_helper(esp32_pwm_obj_t *self,
+STATIC void mp_machine_pwm_init_helper(machine_pwm_obj_t *self,
     size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_freq, ARG_duty };
     static const mp_arg_t allowed_args[] = {
@@ -192,13 +186,13 @@ STATIC void esp32_pwm_init_helper(esp32_pwm_obj_t *self,
     }
 }
 
-STATIC mp_obj_t esp32_pwm_make_new(const mp_obj_type_t *type,
+STATIC mp_obj_t mp_machine_pwm_make_new(const mp_obj_type_t *type,
     size_t n_args, size_t n_kw, const mp_obj_t *args) {
     mp_arg_check_num(n_args, n_kw, 1, MP_OBJ_FUN_ARGS_MAX, true);
     gpio_num_t pin_id = machine_pin_get_id(args[0]);
 
     // create PWM object from the given pin
-    esp32_pwm_obj_t *self = m_new_obj(esp32_pwm_obj_t);
+    machine_pwm_obj_t *self = m_new_obj(machine_pwm_obj_t);
     self->base.type = &machine_pwm_type;
     self->pin = pin_id;
     self->active = 0;
@@ -213,20 +207,12 @@ STATIC mp_obj_t esp32_pwm_make_new(const mp_obj_type_t *type,
     // start the PWM running for this channel
     mp_map_t kw_args;
     mp_map_init_fixed_table(&kw_args, n_kw, args + n_args);
-    esp32_pwm_init_helper(self, n_args - 1, args + 1, &kw_args);
+    mp_machine_pwm_init_helper(self, n_args - 1, args + 1, &kw_args);
 
     return MP_OBJ_FROM_PTR(self);
 }
 
-STATIC mp_obj_t esp32_pwm_init(size_t n_args,
-    const mp_obj_t *args, mp_map_t *kw_args) {
-    esp32_pwm_init_helper(args[0], n_args - 1, args + 1, kw_args);
-    return mp_const_none;
-}
-MP_DEFINE_CONST_FUN_OBJ_KW(esp32_pwm_init_obj, 1, esp32_pwm_init);
-
-STATIC mp_obj_t esp32_pwm_deinit(mp_obj_t self_in) {
-    esp32_pwm_obj_t *self = MP_OBJ_TO_PTR(self_in);
+STATIC void mp_machine_pwm_deinit(machine_pwm_obj_t *self) {
     int chan = self->channel;
 
     // Valid channel?
@@ -238,63 +224,27 @@ STATIC mp_obj_t esp32_pwm_deinit(mp_obj_t self_in) {
         self->channel = -1;
         gpio_matrix_out(self->pin, SIG_GPIO_OUT_IDX, false, false);
     }
-    return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(esp32_pwm_deinit_obj, esp32_pwm_deinit);
 
-STATIC mp_obj_t esp32_pwm_freq(size_t n_args, const mp_obj_t *args) {
-    if (n_args == 1) {
-        // get
-        return MP_OBJ_NEW_SMALL_INT(timer_cfg.freq_hz);
-    }
+STATIC mp_obj_t mp_machine_pwm_freq_get(machine_pwm_obj_t *self) {
+    return MP_OBJ_NEW_SMALL_INT(timer_cfg.freq_hz);
+}
 
-    // set
-    int tval = mp_obj_get_int(args[1]);
-    if (!set_freq(tval)) {
-        mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("bad frequency %d"), tval);
+STATIC void mp_machine_pwm_freq_set(machine_pwm_obj_t *self, mp_int_t freq) {
+    if (!set_freq(freq)) {
+        mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("bad frequency %d"), freq);
     }
-    return mp_const_none;
 }
 
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(esp32_pwm_freq_obj, 1, 2, esp32_pwm_freq);
-
-STATIC mp_obj_t esp32_pwm_duty(size_t n_args, const mp_obj_t *args) {
-    esp32_pwm_obj_t *self = MP_OBJ_TO_PTR(args[0]);
-    int duty;
-
-    if (n_args == 1) {
-        // get
-        duty = ledc_get_duty(PWMODE, self->channel);
-        duty <<= PWRES - timer_cfg.duty_resolution;
-        return MP_OBJ_NEW_SMALL_INT(duty);
-    }
+STATIC mp_obj_t mp_machine_pwm_duty_get(machine_pwm_obj_t *self) {
+    int duty = ledc_get_duty(PWMODE, self->channel);
+    duty <<= PWRES - timer_cfg.duty_resolution;
+    return MP_OBJ_NEW_SMALL_INT(duty);
+}
 
-    // set
-    duty = mp_obj_get_int(args[1]);
+STATIC void mp_machine_pwm_duty_set(machine_pwm_obj_t *self, mp_int_t duty) {
     duty &= ((1 << PWRES) - 1);
     duty >>= PWRES - timer_cfg.duty_resolution;
     ledc_set_duty(PWMODE, self->channel, duty);
     ledc_update_duty(PWMODE, self->channel);
-
-    return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(esp32_pwm_duty_obj,
-    1, 2, esp32_pwm_duty);
-
-STATIC const mp_rom_map_elem_t esp32_pwm_locals_dict_table[] = {
-    { MP_ROM_QSTR(MP_QSTR_init), MP_ROM_PTR(&esp32_pwm_init_obj) },
-    { MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&esp32_pwm_deinit_obj) },
-    { MP_ROM_QSTR(MP_QSTR_freq), MP_ROM_PTR(&esp32_pwm_freq_obj) },
-    { MP_ROM_QSTR(MP_QSTR_duty), MP_ROM_PTR(&esp32_pwm_duty_obj) },
-};
-
-STATIC MP_DEFINE_CONST_DICT(esp32_pwm_locals_dict,
-    esp32_pwm_locals_dict_table);
-
-const mp_obj_type_t machine_pwm_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_PWM,
-    .print = esp32_pwm_print,
-    .make_new = esp32_pwm_make_new,
-    .locals_dict = (mp_obj_dict_t *)&esp32_pwm_locals_dict,
-};
diff --git a/ports/esp32/main/CMakeLists.txt b/ports/esp32/main/CMakeLists.txt
index 057ec024419c6..75e123f4e0459 100644
--- a/ports/esp32/main/CMakeLists.txt
+++ b/ports/esp32/main/CMakeLists.txt
@@ -62,7 +62,6 @@ set(MICROPY_SOURCE_PORT
     ${PROJECT_DIR}/machine_dac.c
     ${PROJECT_DIR}/machine_i2c.c
     ${PROJECT_DIR}/machine_i2s.c
-    ${PROJECT_DIR}/machine_pwm.c
     ${PROJECT_DIR}/machine_uart.c
     ${PROJECT_DIR}/modmachine.c
     ${PROJECT_DIR}/modnetwork.c
diff --git a/ports/esp32/modmachine.c b/ports/esp32/modmachine.c
index 5f94007d4995b..00271a37eda3a 100644
--- a/ports/esp32/modmachine.c
+++ b/ports/esp32/modmachine.c
@@ -53,6 +53,7 @@
 #include "extmod/machine_mem.h"
 #include "extmod/machine_signal.h"
 #include "extmod/machine_pulse.h"
+#include "extmod/machine_pwm.h"
 #include "extmod/machine_i2c.h"
 #include "extmod/machine_spi.h"
 #include "modmachine.h"
diff --git a/ports/esp32/modmachine.h b/ports/esp32/modmachine.h
index 7bf03b0cabc7e..afc2ab07f4e4e 100644
--- a/ports/esp32/modmachine.h
+++ b/ports/esp32/modmachine.h
@@ -15,7 +15,6 @@ extern const mp_obj_type_t machine_pin_type;
 extern const mp_obj_type_t machine_touchpad_type;
 extern const mp_obj_type_t machine_adc_type;
 extern const mp_obj_type_t machine_dac_type;
-extern const mp_obj_type_t machine_pwm_type;
 extern const mp_obj_type_t machine_hw_i2c_type;
 extern const mp_obj_type_t machine_hw_spi_type;
 extern const mp_obj_type_t machine_i2s_type;
diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h
index b306be937d8b9..6a48ce5023aea 100644
--- a/ports/esp32/mpconfigport.h
+++ b/ports/esp32/mpconfigport.h
@@ -158,6 +158,10 @@
 #define MICROPY_PY_MACHINE_PIN_MAKE_NEW     mp_pin_make_new
 #define MICROPY_PY_MACHINE_BITSTREAM        (1)
 #define MICROPY_PY_MACHINE_PULSE            (1)
+#define MICROPY_PY_MACHINE_PWM              (1)
+#define MICROPY_PY_MACHINE_PWM_INIT         (1)
+#define MICROPY_PY_MACHINE_PWM_DUTY         (1)
+#define MICROPY_PY_MACHINE_PWM_INCLUDEFILE  "ports/esp32/machine_pwm.c"
 #define MICROPY_PY_MACHINE_I2C              (1)
 #define MICROPY_PY_MACHINE_SOFTI2C          (1)
 #define MICROPY_PY_MACHINE_SPI              (1)
diff --git a/ports/esp8266/Makefile b/ports/esp8266/Makefile
index 9ea4498f411b7..e771d8f7d3460 100644
--- a/ports/esp8266/Makefile
+++ b/ports/esp8266/Makefile
@@ -96,7 +96,6 @@ SRC_C = \
 	modmachine.c \
 	machine_bitstream.c \
 	machine_pin.c \
-	machine_pwm.c \
 	machine_rtc.c \
 	machine_adc.c \
 	machine_uart.c \
diff --git a/ports/esp8266/machine_pwm.c b/ports/esp8266/machine_pwm.c
index 1d6a6cfe5894f..f8cd937b80259 100644
--- a/ports/esp8266/machine_pwm.c
+++ b/ports/esp8266/machine_pwm.c
@@ -24,28 +24,25 @@
  * THE SOFTWARE.
  */
 
-#include <stdio.h>
-#include <stdint.h>
-
-#include "esppwm.h"
-
 #include "py/runtime.h"
 #include "modmachine.h"
 
-typedef struct _pyb_pwm_obj_t {
+#include "esppwm.h"
+
+typedef struct _machine_pwm_obj_t {
     mp_obj_base_t base;
     pyb_pin_obj_t *pin;
     uint8_t active;
     uint8_t channel;
-} pyb_pwm_obj_t;
+} machine_pwm_obj_t;
 
 STATIC bool pwm_inited = false;
 
 /******************************************************************************/
 // MicroPython bindings for PWM
 
-STATIC void pyb_pwm_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
-    pyb_pwm_obj_t *self = MP_OBJ_TO_PTR(self_in);
+STATIC void mp_machine_pwm_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+    machine_pwm_obj_t *self = MP_OBJ_TO_PTR(self_in);
     mp_printf(print, "PWM(%u", self->pin->phys_port);
     if (self->active) {
         mp_printf(print, ", freq=%u, duty=%u",
@@ -54,7 +51,7 @@ STATIC void pyb_pwm_print(const mp_print_t *print, mp_obj_t self_in, mp_print_ki
     mp_printf(print, ")");
 }
 
-STATIC void pyb_pwm_init_helper(pyb_pwm_obj_t *self, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+STATIC void mp_machine_pwm_init_helper(machine_pwm_obj_t *self, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_freq, ARG_duty };
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_freq, MP_ARG_INT, {.u_int = -1} },
@@ -80,13 +77,13 @@ STATIC void pyb_pwm_init_helper(pyb_pwm_obj_t *self, size_t n_args, const mp_obj
     pwm_start();
 }
 
-STATIC mp_obj_t pyb_pwm_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
+STATIC mp_obj_t mp_machine_pwm_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
     mp_arg_check_num(n_args, n_kw, 1, MP_OBJ_FUN_ARGS_MAX, true);
     pyb_pin_obj_t *pin = mp_obj_get_pin_obj(args[0]);
 
     // create PWM object from the given pin
-    pyb_pwm_obj_t *self = m_new_obj(pyb_pwm_obj_t);
-    self->base.type = &pyb_pwm_type;
+    machine_pwm_obj_t *self = m_new_obj(machine_pwm_obj_t);
+    self->base.type = &machine_pwm_type;
     self->pin = pin;
     self->active = 0;
     self->channel = -1;
@@ -100,71 +97,39 @@ STATIC mp_obj_t pyb_pwm_make_new(const mp_obj_type_t *type, size_t n_args, size_
     // start the PWM running for this channel
     mp_map_t kw_args;
     mp_map_init_fixed_table(&kw_args, n_kw, args + n_args);
-    pyb_pwm_init_helper(self, n_args - 1, args + 1, &kw_args);
+    mp_machine_pwm_init_helper(self, n_args - 1, args + 1, &kw_args);
 
     return MP_OBJ_FROM_PTR(self);
 }
 
-STATIC mp_obj_t pyb_pwm_init(size_t n_args, const mp_obj_t *args, mp_map_t *kw_args) {
-    pyb_pwm_init_helper(args[0], n_args - 1, args + 1, kw_args);
-    return mp_const_none;
-}
-MP_DEFINE_CONST_FUN_OBJ_KW(pyb_pwm_init_obj, 1, pyb_pwm_init);
-
-STATIC mp_obj_t pyb_pwm_deinit(mp_obj_t self_in) {
-    pyb_pwm_obj_t *self = MP_OBJ_TO_PTR(self_in);
+STATIC void mp_machine_pwm_deinit(machine_pwm_obj_t *self) {
     pwm_delete(self->channel);
     self->active = 0;
     pwm_start();
-    return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(pyb_pwm_deinit_obj, pyb_pwm_deinit);
-
-STATIC mp_obj_t pyb_pwm_freq(size_t n_args, const mp_obj_t *args) {
-    // pyb_pwm_obj_t *self = MP_OBJ_TO_PTR(args[0]);
-    if (n_args == 1) {
-        // get
-        return MP_OBJ_NEW_SMALL_INT(pwm_get_freq(0));
-    } else {
-        // set
-        pwm_set_freq(mp_obj_get_int(args[1]), 0);
-        pwm_start();
-        return mp_const_none;
-    }
+
+STATIC mp_obj_t mp_machine_pwm_freq_get(machine_pwm_obj_t *self) {
+    return MP_OBJ_NEW_SMALL_INT(pwm_get_freq(0));
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pyb_pwm_freq_obj, 1, 2, pyb_pwm_freq);
 
-STATIC mp_obj_t pyb_pwm_duty(size_t n_args, const mp_obj_t *args) {
-    pyb_pwm_obj_t *self = MP_OBJ_TO_PTR(args[0]);
+STATIC void mp_machine_pwm_freq_set(machine_pwm_obj_t *self, mp_int_t freq) {
+    pwm_set_freq(freq, 0);
+    pwm_start();
+}
+
+STATIC mp_obj_t mp_machine_pwm_duty_get(machine_pwm_obj_t *self) {
     if (!self->active) {
         pwm_add(self->pin->phys_port, self->pin->periph, self->pin->func);
         self->active = 1;
     }
-    if (n_args == 1) {
-        // get
-        return MP_OBJ_NEW_SMALL_INT(pwm_get_duty(self->channel));
-    } else {
-        // set
-        pwm_set_duty(mp_obj_get_int(args[1]), self->channel);
-        pwm_start();
-        return mp_const_none;
+    return MP_OBJ_NEW_SMALL_INT(pwm_get_duty(self->channel));
+}
+
+STATIC void mp_machine_pwm_duty_set(machine_pwm_obj_t *self, mp_int_t duty) {
+    if (!self->active) {
+        pwm_add(self->pin->phys_port, self->pin->periph, self->pin->func);
+        self->active = 1;
     }
+    pwm_set_duty(duty, self->channel);
+    pwm_start();
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pyb_pwm_duty_obj, 1, 2, pyb_pwm_duty);
-
-STATIC const mp_rom_map_elem_t pyb_pwm_locals_dict_table[] = {
-    { MP_ROM_QSTR(MP_QSTR_init), MP_ROM_PTR(&pyb_pwm_init_obj) },
-    { MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&pyb_pwm_deinit_obj) },
-    { MP_ROM_QSTR(MP_QSTR_freq), MP_ROM_PTR(&pyb_pwm_freq_obj) },
-    { MP_ROM_QSTR(MP_QSTR_duty), MP_ROM_PTR(&pyb_pwm_duty_obj) },
-};
-
-STATIC MP_DEFINE_CONST_DICT(pyb_pwm_locals_dict, pyb_pwm_locals_dict_table);
-
-const mp_obj_type_t pyb_pwm_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_PWM,
-    .print = pyb_pwm_print,
-    .make_new = pyb_pwm_make_new,
-    .locals_dict = (mp_obj_dict_t *)&pyb_pwm_locals_dict,
-};
diff --git a/ports/esp8266/modmachine.c b/ports/esp8266/modmachine.c
index 6cd4583431d45..39a890f56f172 100644
--- a/ports/esp8266/modmachine.c
+++ b/ports/esp8266/modmachine.c
@@ -39,6 +39,7 @@
 #include "extmod/machine_mem.h"
 #include "extmod/machine_signal.h"
 #include "extmod/machine_pulse.h"
+#include "extmod/machine_pwm.h"
 #include "extmod/machine_i2c.h"
 #include "extmod/machine_spi.h"
 #include "modmachine.h"
@@ -423,7 +424,7 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_WDT), MP_ROM_PTR(&esp_wdt_type) },
     { MP_ROM_QSTR(MP_QSTR_Pin), MP_ROM_PTR(&pyb_pin_type) },
     { MP_ROM_QSTR(MP_QSTR_Signal), MP_ROM_PTR(&machine_signal_type) },
-    { MP_ROM_QSTR(MP_QSTR_PWM), MP_ROM_PTR(&pyb_pwm_type) },
+    { MP_ROM_QSTR(MP_QSTR_PWM), MP_ROM_PTR(&machine_pwm_type) },
     { MP_ROM_QSTR(MP_QSTR_ADC), MP_ROM_PTR(&machine_adc_type) },
     { MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&pyb_uart_type) },
     #if MICROPY_PY_MACHINE_I2C
diff --git a/ports/esp8266/modmachine.h b/ports/esp8266/modmachine.h
index be4debd335a64..4a73d3b8e8013 100644
--- a/ports/esp8266/modmachine.h
+++ b/ports/esp8266/modmachine.h
@@ -4,7 +4,6 @@
 #include "py/obj.h"
 
 extern const mp_obj_type_t pyb_pin_type;
-extern const mp_obj_type_t pyb_pwm_type;
 extern const mp_obj_type_t machine_adc_type;
 extern const mp_obj_type_t pyb_rtc_type;
 extern const mp_obj_type_t pyb_uart_type;
diff --git a/ports/esp8266/mpconfigport.h b/ports/esp8266/mpconfigport.h
index 78263efec556a..7d6d0a34c3326 100644
--- a/ports/esp8266/mpconfigport.h
+++ b/ports/esp8266/mpconfigport.h
@@ -81,6 +81,10 @@
 #define MICROPY_PY_MACHINE_PIN_MAKE_NEW mp_pin_make_new
 #define MICROPY_PY_MACHINE_BITSTREAM (1)
 #define MICROPY_PY_MACHINE_PULSE    (1)
+#define MICROPY_PY_MACHINE_PWM      (1)
+#define MICROPY_PY_MACHINE_PWM_INIT (1)
+#define MICROPY_PY_MACHINE_PWM_DUTY (1)
+#define MICROPY_PY_MACHINE_PWM_INCLUDEFILE "ports/esp8266/machine_pwm.c"
 #define MICROPY_PY_MACHINE_I2C      (1)
 #define MICROPY_PY_MACHINE_SOFTI2C  (1)
 #define MICROPY_PY_MACHINE_SPI      (1)
diff --git a/ports/rp2/CMakeLists.txt b/ports/rp2/CMakeLists.txt
index fd7ec65e0f419..2e7347fd53055 100644
--- a/ports/rp2/CMakeLists.txt
+++ b/ports/rp2/CMakeLists.txt
@@ -85,7 +85,6 @@ set(MICROPY_SOURCE_PORT
     machine_adc.c
     machine_i2c.c
     machine_pin.c
-    machine_pwm.c
     machine_rtc.c
     machine_spi.c
     machine_timer.c
@@ -113,7 +112,6 @@ set(MICROPY_SOURCE_QSTR
     ${PROJECT_SOURCE_DIR}/machine_adc.c
     ${PROJECT_SOURCE_DIR}/machine_i2c.c
     ${PROJECT_SOURCE_DIR}/machine_pin.c
-    ${PROJECT_SOURCE_DIR}/machine_pwm.c
     ${PROJECT_SOURCE_DIR}/machine_rtc.c
     ${PROJECT_SOURCE_DIR}/machine_spi.c
     ${PROJECT_SOURCE_DIR}/machine_timer.c
diff --git a/ports/rp2/machine_pwm.c b/ports/rp2/machine_pwm.c
index ff40c5503f42b..2952a43062a33 100644
--- a/ports/rp2/machine_pwm.c
+++ b/ports/rp2/machine_pwm.c
@@ -34,8 +34,6 @@
 /******************************************************************************/
 // MicroPython bindings for machine.PWM
 
-const mp_obj_type_t machine_pwm_type;
-
 typedef struct _machine_pwm_obj_t {
     mp_obj_base_t base;
     uint8_t slice;
@@ -61,13 +59,13 @@ STATIC machine_pwm_obj_t machine_pwm_obj[] = {
     {{&machine_pwm_type}, 7, PWM_CHAN_B},
 };
 
-STATIC void machine_pwm_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+STATIC void mp_machine_pwm_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     machine_pwm_obj_t *self = MP_OBJ_TO_PTR(self_in);
     mp_printf(print, "<PWM slice=%u channel=%u>", self->slice, self->channel);
 }
 
 // PWM(pin)
-STATIC mp_obj_t machine_pwm_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
+STATIC mp_obj_t mp_machine_pwm_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
     // Check number of arguments
     mp_arg_check_num(n_args, n_kw, 1, 1, false);
 
@@ -85,113 +83,78 @@ STATIC mp_obj_t machine_pwm_make_new(const mp_obj_type_t *type, size_t n_args, s
     return MP_OBJ_FROM_PTR(self);
 }
 
-STATIC mp_obj_t machine_pwm_deinit(mp_obj_t self_in) {
-    machine_pwm_obj_t *self = MP_OBJ_TO_PTR(self_in);
+STATIC void mp_machine_pwm_deinit(machine_pwm_obj_t *self) {
     pwm_set_enabled(self->slice, false);
-    return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_pwm_deinit_obj, machine_pwm_deinit);
 
-// PWM.freq([value])
-STATIC mp_obj_t machine_pwm_freq(size_t n_args, const mp_obj_t *args) {
-    machine_pwm_obj_t *self = MP_OBJ_TO_PTR(args[0]);
+STATIC mp_obj_t mp_machine_pwm_freq_get(machine_pwm_obj_t *self) {
     uint32_t source_hz = clock_get_hz(clk_sys);
-    if (n_args == 1) {
-        // Get frequency.
-        uint32_t div16 = pwm_hw->slice[self->slice].div;
-        uint32_t top = pwm_hw->slice[self->slice].top;
-        uint32_t pwm_freq = 16 * source_hz / div16 / top;
-        return MP_OBJ_NEW_SMALL_INT(pwm_freq);
-    } else {
-        // Set the frequency, making "top" as large as possible for maximum resolution.
-        // Maximum "top" is set at 65534 to be able to achieve 100% duty with 65535.
-        #define TOP_MAX 65534
-        mp_int_t freq = mp_obj_get_int(args[1]);
-        uint32_t div16_top = 16 * source_hz / freq;
-        uint32_t top = 1;
-        for (;;) {
-            // Try a few small prime factors to get close to the desired frequency.
-            if (div16_top >= 16 * 5 && div16_top % 5 == 0 && top * 5 <= TOP_MAX) {
-                div16_top /= 5;
-                top *= 5;
-            } else if (div16_top >= 16 * 3 && div16_top % 3 == 0 && top * 3 <= TOP_MAX) {
-                div16_top /= 3;
-                top *= 3;
-            } else if (div16_top >= 16 * 2 && top * 2 <= TOP_MAX) {
-                div16_top /= 2;
-                top *= 2;
-            } else {
-                break;
-            }
-        }
-        if (div16_top < 16) {
-            mp_raise_ValueError(MP_ERROR_TEXT("freq too large"));
-        } else if (div16_top >= 256 * 16) {
-            mp_raise_ValueError(MP_ERROR_TEXT("freq too small"));
+    uint32_t div16 = pwm_hw->slice[self->slice].div;
+    uint32_t top = pwm_hw->slice[self->slice].top;
+    uint32_t pwm_freq = 16 * source_hz / div16 / top;
+    return MP_OBJ_NEW_SMALL_INT(pwm_freq);
+}
+
+STATIC void mp_machine_pwm_freq_set(machine_pwm_obj_t *self, mp_int_t freq) {
+    // Set the frequency, making "top" as large as possible for maximum resolution.
+    // Maximum "top" is set at 65534 to be able to achieve 100% duty with 65535.
+    #define TOP_MAX 65534
+    uint32_t source_hz = clock_get_hz(clk_sys);
+    uint32_t div16_top = 16 * source_hz / freq;
+    uint32_t top = 1;
+    for (;;) {
+        // Try a few small prime factors to get close to the desired frequency.
+        if (div16_top >= 16 * 5 && div16_top % 5 == 0 && top * 5 <= TOP_MAX) {
+            div16_top /= 5;
+            top *= 5;
+        } else if (div16_top >= 16 * 3 && div16_top % 3 == 0 && top * 3 <= TOP_MAX) {
+            div16_top /= 3;
+            top *= 3;
+        } else if (div16_top >= 16 * 2 && top * 2 <= TOP_MAX) {
+            div16_top /= 2;
+            top *= 2;
+        } else {
+            break;
         }
-        pwm_hw->slice[self->slice].div = div16_top;
-        pwm_hw->slice[self->slice].top = top;
-        return mp_const_none;
     }
+    if (div16_top < 16) {
+        mp_raise_ValueError(MP_ERROR_TEXT("freq too large"));
+    } else if (div16_top >= 256 * 16) {
+        mp_raise_ValueError(MP_ERROR_TEXT("freq too small"));
+    }
+    pwm_hw->slice[self->slice].div = div16_top;
+    pwm_hw->slice[self->slice].top = top;
 }
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_pwm_freq_obj, 1, 2, machine_pwm_freq);
 
-// PWM.duty_u16([value])
-STATIC mp_obj_t machine_pwm_duty_u16(size_t n_args, const mp_obj_t *args) {
-    machine_pwm_obj_t *self = MP_OBJ_TO_PTR(args[0]);
+STATIC mp_obj_t mp_machine_pwm_duty_get_u16(machine_pwm_obj_t *self) {
     uint32_t top = pwm_hw->slice[self->slice].top;
-    if (n_args == 1) {
-        // Get duty cycle.
-        uint32_t cc = pwm_hw->slice[self->slice].cc;
-        cc = (cc >> (self->channel ? PWM_CH0_CC_B_LSB : PWM_CH0_CC_A_LSB)) & 0xffff;
-        return MP_OBJ_NEW_SMALL_INT(cc * 65535 / (top + 1));
-    } else {
-        // Set duty cycle.
-        mp_int_t duty_u16 = mp_obj_get_int(args[1]);
-        uint32_t cc = duty_u16 * (top + 1) / 65535;
-        pwm_set_chan_level(self->slice, self->channel, cc);
-        pwm_set_enabled(self->slice, true);
-        return mp_const_none;
-    }
+    uint32_t cc = pwm_hw->slice[self->slice].cc;
+    cc = (cc >> (self->channel ? PWM_CH0_CC_B_LSB : PWM_CH0_CC_A_LSB)) & 0xffff;
+    return MP_OBJ_NEW_SMALL_INT(cc * 65535 / (top + 1));
+}
+
+STATIC void mp_machine_pwm_duty_set_u16(machine_pwm_obj_t *self, mp_int_t duty_u16) {
+    uint32_t top = pwm_hw->slice[self->slice].top;
+    uint32_t cc = duty_u16 * (top + 1) / 65535;
+    pwm_set_chan_level(self->slice, self->channel, cc);
+    pwm_set_enabled(self->slice, true);
 }
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_pwm_duty_u16_obj, 1, 2, machine_pwm_duty_u16);
 
-// PWM.duty_ns([value])
-STATIC mp_obj_t machine_pwm_duty_ns(size_t n_args, const mp_obj_t *args) {
-    machine_pwm_obj_t *self = MP_OBJ_TO_PTR(args[0]);
+STATIC mp_obj_t mp_machine_pwm_duty_get_ns(machine_pwm_obj_t *self) {
     uint32_t source_hz = clock_get_hz(clk_sys);
     uint32_t slice_hz = 16 * source_hz / pwm_hw->slice[self->slice].div;
-    if (n_args == 1) {
-        // Get duty cycle.
-        uint32_t cc = pwm_hw->slice[self->slice].cc;
-        cc = (cc >> (self->channel ? PWM_CH0_CC_B_LSB : PWM_CH0_CC_A_LSB)) & 0xffff;
-        return MP_OBJ_NEW_SMALL_INT((uint64_t)cc * 1000000000ULL / slice_hz);
-    } else {
-        // Set duty cycle.
-        mp_int_t duty_ns = mp_obj_get_int(args[1]);
-        uint32_t cc = (uint64_t)duty_ns * slice_hz / 1000000000ULL;
-        if (cc > 65535) {
-            mp_raise_ValueError(MP_ERROR_TEXT("duty larger than period"));
-        }
-        pwm_set_chan_level(self->slice, self->channel, cc);
-        pwm_set_enabled(self->slice, true);
-        return mp_const_none;
-    }
+    uint32_t cc = pwm_hw->slice[self->slice].cc;
+    cc = (cc >> (self->channel ? PWM_CH0_CC_B_LSB : PWM_CH0_CC_A_LSB)) & 0xffff;
+    return MP_OBJ_NEW_SMALL_INT((uint64_t)cc * 1000000000ULL / slice_hz);
 }
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_pwm_duty_ns_obj, 1, 2, machine_pwm_duty_ns);
 
-STATIC const mp_rom_map_elem_t machine_pwm_locals_dict_table[] = {
-    { MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&machine_pwm_deinit_obj) },
-    { MP_ROM_QSTR(MP_QSTR_freq), MP_ROM_PTR(&machine_pwm_freq_obj) },
-    { MP_ROM_QSTR(MP_QSTR_duty_u16), MP_ROM_PTR(&machine_pwm_duty_u16_obj) },
-    { MP_ROM_QSTR(MP_QSTR_duty_ns), MP_ROM_PTR(&machine_pwm_duty_ns_obj) },
-};
-STATIC MP_DEFINE_CONST_DICT(machine_pwm_locals_dict, machine_pwm_locals_dict_table);
-
-const mp_obj_type_t machine_pwm_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_PWM,
-    .print = machine_pwm_print,
-    .make_new = machine_pwm_make_new,
-    .locals_dict = (mp_obj_dict_t *)&machine_pwm_locals_dict,
-};
+STATIC void mp_machine_pwm_duty_set_ns(machine_pwm_obj_t *self, mp_int_t duty_ns) {
+    uint32_t source_hz = clock_get_hz(clk_sys);
+    uint32_t slice_hz = 16 * source_hz / pwm_hw->slice[self->slice].div;
+    uint32_t cc = (uint64_t)duty_ns * slice_hz / 1000000000ULL;
+    if (cc > 65535) {
+        mp_raise_ValueError(MP_ERROR_TEXT("duty larger than period"));
+    }
+    pwm_set_chan_level(self->slice, self->channel, cc);
+    pwm_set_enabled(self->slice, true);
+}
diff --git a/ports/rp2/modmachine.c b/ports/rp2/modmachine.c
index 1b2b2adad7b80..32dc3d22cca97 100644
--- a/ports/rp2/modmachine.c
+++ b/ports/rp2/modmachine.c
@@ -30,6 +30,7 @@
 #include "extmod/machine_i2c.h"
 #include "extmod/machine_mem.h"
 #include "extmod/machine_pulse.h"
+#include "extmod/machine_pwm.h"
 #include "extmod/machine_signal.h"
 #include "extmod/machine_spi.h"
 
diff --git a/ports/rp2/modmachine.h b/ports/rp2/modmachine.h
index c79bcfdad1f25..0c48565299bfb 100644
--- a/ports/rp2/modmachine.h
+++ b/ports/rp2/modmachine.h
@@ -6,7 +6,6 @@
 extern const mp_obj_type_t machine_adc_type;
 extern const mp_obj_type_t machine_hw_i2c_type;
 extern const mp_obj_type_t machine_pin_type;
-extern const mp_obj_type_t machine_pwm_type;
 extern const mp_obj_type_t machine_rtc_type;
 extern const mp_obj_type_t machine_spi_type;
 extern const mp_obj_type_t machine_timer_type;
diff --git a/ports/rp2/mpconfigport.h b/ports/rp2/mpconfigport.h
index 4da34cd0388b8..dea3775a85348 100644
--- a/ports/rp2/mpconfigport.h
+++ b/ports/rp2/mpconfigport.h
@@ -131,6 +131,9 @@
 #define MICROPY_PY_MACHINE                      (1)
 #define MICROPY_PY_MACHINE_PIN_MAKE_NEW         mp_pin_make_new
 #define MICROPY_PY_MACHINE_PULSE                (1)
+#define MICROPY_PY_MACHINE_PWM                  (1)
+#define MICROPY_PY_MACHINE_PWM_DUTY_U16_NS      (1)
+#define MICROPY_PY_MACHINE_PWM_INCLUDEFILE      "ports/rp2/machine_pwm.c"
 #define MICROPY_PY_MACHINE_I2C                  (1)
 #define MICROPY_PY_MACHINE_SOFTI2C              (1)
 #define MICROPY_PY_MACHINE_SPI                  (1)
diff --git a/py/py.mk b/py/py.mk
index 609ba6cae3ca9..be8296e5e8fab 100644
--- a/py/py.mk
+++ b/py/py.mk
@@ -189,6 +189,7 @@ PY_EXTMOD_O_BASENAME = \
 	extmod/machine_pinbase.o \
 	extmod/machine_signal.o \
 	extmod/machine_pulse.o \
+	extmod/machine_pwm.o \
 	extmod/machine_i2c.o \
 	extmod/machine_spi.o \
 	extmod/modbluetooth.o \

From bbbdef4cc1d2cb3a3f6c2d067b6988534773b2a6 Mon Sep 17 00:00:00 2001
From: YoungJoon Chun <yjchun@mac.com>
Date: Sat, 4 Sep 2021 00:20:38 +0900
Subject: [PATCH 1254/3533] rp2/mpconfigport.h: Enable heapq module.

Fixes issue #7746.
---
 ports/rp2/mpconfigport.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/rp2/mpconfigport.h b/ports/rp2/mpconfigport.h
index dea3775a85348..bb2f505b6e9d2 100644
--- a/ports/rp2/mpconfigport.h
+++ b/ports/rp2/mpconfigport.h
@@ -120,6 +120,7 @@
 #define MICROPY_PY_URE_MATCH_GROUPS             (1)
 #define MICROPY_PY_URE_MATCH_SPAN_START_END     (1)
 #define MICROPY_PY_URE_SUB                      (1)
+#define MICROPY_PY_UHEAPQ                       (1)
 #define MICROPY_PY_UHASHLIB                     (1)
 #define MICROPY_PY_UBINASCII                    (1)
 #define MICROPY_PY_UBINASCII_CRC32              (1)

From 87f97e490c4fe12ab5f06e154dc76f0dd27091a9 Mon Sep 17 00:00:00 2001
From: Philipp Ebensberger <philipp.ebensberger@3bricks-software.de>
Date: Sun, 1 Aug 2021 11:20:39 +0200
Subject: [PATCH 1255/3533] mimxrt/sdcard: Implement SDCard driver.

- Configures `PLL2->PFD0` with **198MHz** as base clock of
	`USDHCx` peripheral.
- Adds guards for SDCard related files via `MICROPY_PY_MACHINE_SDCARD`
- Adds creation of pin defines for SDCard to make-pins.py
- Adds new configuration option for SDCard peripheral pinout
        to mpconfigport.h
- Adds interrupt handling support instead of polling
- Adds support for `ADMA2` powered data transfer
- Configures SDCard to run in HS (high-speed mode) with **50MHz** only!

SDCard support is optional and requires `USDHC` peripheral.
Thus this driver is not available on `MIMXRT1010_EVK`.
SDCard support is enabled by setting `MICROPY_PY_MACHINE_SDCARD = 1`
in mpconfigboard.mk.

Signed-off-by: Philipp Ebensberger
---
 ports/mimxrt/Makefile                         |   77 +-
 ports/mimxrt/board_init.c                     |    6 +-
 .../boards/MIMXRT1010_EVK/mpconfigboard.mk    |    1 +
 .../boards/MIMXRT1020_EVK/mpconfigboard.h     |   12 +
 .../boards/MIMXRT1020_EVK/mpconfigboard.mk    |    6 +-
 .../boards/MIMXRT1050_EVK/mpconfigboard.h     |   12 +
 .../boards/MIMXRT1050_EVK/mpconfigboard.mk    |    7 +-
 .../boards/MIMXRT1050_EVKB/mpconfigboard.h    |    1 -
 .../boards/MIMXRT1050_EVKB/mpconfigboard.mk   |    7 +-
 .../boards/MIMXRT1060_EVK/mpconfigboard.h     |   12 +
 .../boards/MIMXRT1060_EVK/mpconfigboard.mk    |    6 +-
 .../boards/MIMXRT1064_EVK/mpconfigboard.h     |   12 +
 .../boards/MIMXRT1064_EVK/mpconfigboard.mk    |    7 +-
 ports/mimxrt/boards/TEENSY40/mpconfigboard.h  |   12 +
 ports/mimxrt/boards/TEENSY40/mpconfigboard.mk |    7 +-
 ports/mimxrt/boards/TEENSY40/pins.csv         |   10 +-
 ports/mimxrt/boards/TEENSY41/mpconfigboard.h  |   12 +
 ports/mimxrt/boards/TEENSY41/mpconfigboard.mk |    7 +-
 ports/mimxrt/boards/make-pins.py              |   88 +-
 ports/mimxrt/boards/mimxrt_prefix.c           |    5 +-
 ports/mimxrt/fatfs_port.c                     |   39 +
 ports/mimxrt/machine_sdcard.c                 |  222 ++++
 ports/mimxrt/modmachine.c                     |    3 +
 ports/mimxrt/modmachine.h                     |    2 +
 ports/mimxrt/modules/_boot.py                 |   23 +-
 ports/mimxrt/moduos.c                         |    1 +
 ports/mimxrt/mpconfigport.h                   |    6 +
 ports/mimxrt/pin.h                            |    5 +-
 ports/mimxrt/sdcard.c                         | 1023 +++++++++++++++++
 ports/mimxrt/sdcard.h                         |  111 ++
 30 files changed, 1672 insertions(+), 70 deletions(-)
 create mode 100644 ports/mimxrt/fatfs_port.c
 create mode 100644 ports/mimxrt/machine_sdcard.c
 create mode 100644 ports/mimxrt/sdcard.c
 create mode 100644 ports/mimxrt/sdcard.h

diff --git a/ports/mimxrt/Makefile b/ports/mimxrt/Makefile
index 818a2a3c84e3e..58fbe2df33e47 100644
--- a/ports/mimxrt/Makefile
+++ b/ports/mimxrt/Makefile
@@ -20,6 +20,7 @@ QSTR_GLOBAL_DEPENDENCIES = $(BOARD_DIR)/mpconfigboard.h
 # MicroPython feature configurations
 FROZEN_MANIFEST ?= boards/manifest.py
 MICROPY_VFS_LFS2 ?= 1
+MICROPY_VFS_FAT ?= 1
 
 # Include py core make definitions
 include $(TOP)/py/py.mk
@@ -44,27 +45,32 @@ GEN_PINS_AF_PY = $(BUILD)/pins_af.py
 CFLAGS += -Wno-error=unused-parameter
 
 INC += -I.
-INC += -I$(TOP)
-INC += -I$(BUILD)
 INC += -I$(BOARD_DIR)
-INC += -I$(TOP)/lib/cmsis/inc
+INC += -I$(BUILD)
+INC += -I$(TOP)
 INC += -I$(TOP)/$(MCU_DIR)
 INC += -I$(TOP)/$(MCU_DIR)/drivers
 INC += -I$(TOP)/$(MCU_DIR)/project_template
-INC += -I$(TOP)/lib/tinyusb/src
+INC += -I$(TOP)/lib/cmsis/inc
+INC += -I$(TOP)/lib/oofatfs
 INC += -I$(TOP)/lib/tinyusb/hw
 INC += -I$(TOP)/lib/tinyusb/hw/bsp/teensy_40
+INC += -I$(TOP)/lib/tinyusb/src
 
 CFLAGS_MCU = -mtune=cortex-m7 -mcpu=cortex-m7 -mfloat-abi=hard -mfpu=fpv5-d16
 CFLAGS += $(INC) -Wall -Werror -Wdouble-promotion -Wfloat-conversion -std=c99 -nostdlib -mthumb $(CFLAGS_MCU)
 CFLAGS += -DCPU_$(MCU_SERIES) -DCPU_$(MCU_VARIANT)
 CFLAGS += -DXIP_EXTERNAL_FLASH=1 \
 	-DXIP_BOOT_HEADER_ENABLE=1 \
+	-DFSL_SDK_ENABLE_DRIVER_CACHE_CONTROL=1 \
 	-DCFG_TUSB_MCU=OPT_MCU_MIMXRT10XX \
 	-D__STARTUP_CLEAR_BSS \
 	-D__STARTUP_INITIALIZE_RAMFUNCTION \
 	-D__START=main \
 	-DCPU_HEADER_H='<$(MCU_SERIES).h>'
+ifeq ($(MICROPY_PY_MACHINE_SDCARD),1)
+CFLAGS += -DMICROPY_PY_MACHINE_SDCARD=1
+endif
 CFLAGS += $(CFLAGS_MOD) $(CFLAGS_EXTRA)
 
 # Configure floating point support
@@ -98,64 +104,71 @@ endif
 
 # TinyUSB Stack source
 SRC_TINYUSB_C += \
-	lib/tinyusb/src/tusb.c \
-	lib/tinyusb/src/common/tusb_fifo.c \
-	lib/tinyusb/src/device/usbd.c \
-	lib/tinyusb/src/device/usbd_control.c \
-	lib/tinyusb/src/class/msc/msc_device.c \
 	lib/tinyusb/src/class/cdc/cdc_device.c \
 	lib/tinyusb/src/class/dfu/dfu_rt_device.c \
 	lib/tinyusb/src/class/hid/hid_device.c \
 	lib/tinyusb/src/class/midi/midi_device.c \
+	lib/tinyusb/src/class/msc/msc_device.c \
 	lib/tinyusb/src/class/usbtmc/usbtmc_device.c \
 	lib/tinyusb/src/class/vendor/vendor_device.c \
-	lib/tinyusb/src/portable/nxp/transdimension/dcd_transdimension.c
+	lib/tinyusb/src/common/tusb_fifo.c \
+	lib/tinyusb/src/device/usbd.c \
+	lib/tinyusb/src/device/usbd_control.c \
+	lib/tinyusb/src/portable/nxp/transdimension/dcd_transdimension.c \
+	lib/tinyusb/src/tusb.c
 
 SRC_HAL_IMX_C += \
-	$(MCU_DIR)/system_$(MCU_SERIES).c \
-	$(MCU_DIR)/xip/fsl_flexspi_nor_boot.c \
-	$(MCU_DIR)/project_template/clock_config.c \
 	$(MCU_DIR)/drivers/fsl_adc.c \
 	$(MCU_DIR)/drivers/fsl_cache.c \
 	$(MCU_DIR)/drivers/fsl_clock.c \
+	$(MCU_DIR)/drivers/fsl_common.c \
 	$(MCU_DIR)/drivers/fsl_dmamux.c \
 	$(MCU_DIR)/drivers/fsl_edma.c \
+	$(MCU_DIR)/drivers/fsl_flexram.c \
+	$(MCU_DIR)/drivers/fsl_flexspi.c \
 	$(MCU_DIR)/drivers/fsl_gpio.c \
 	$(MCU_DIR)/drivers/fsl_gpt.c \
-	$(MCU_DIR)/drivers/fsl_common.c \
 	$(MCU_DIR)/drivers/fsl_lpi2c.c \
 	$(MCU_DIR)/drivers/fsl_lpspi.c \
 	$(MCU_DIR)/drivers/fsl_lpspi_edma.c \
 	$(MCU_DIR)/drivers/fsl_lpuart.c \
-	$(MCU_DIR)/drivers/fsl_flexram.c \
-	$(MCU_DIR)/drivers/fsl_flexspi.c \
 	$(MCU_DIR)/drivers/fsl_pit.c \
 	$(MCU_DIR)/drivers/fsl_snvs_lp.c \
 	$(MCU_DIR)/drivers/fsl_trng.c \
+	$(MCU_DIR)/project_template/clock_config.c \
+	$(MCU_DIR)/system_$(MCU_SERIES).c \
+	$(MCU_DIR)/xip/fsl_flexspi_nor_boot.c \
+
+ifeq ($(MICROPY_PY_MACHINE_SDCARD),1)
+SRC_HAL_IMX_C += $(MCU_DIR)/drivers/fsl_usdhc.c
+endif
 
 SRC_C += \
-	main.c \
-	led.c \
-	pin.c \
-	ticks.c \
-	tusb_port.c \
+	$(BOARD_DIR)/flash_config.c \
 	board_init.c \
 	dma_channel.c \
-	$(BOARD_DIR)/flash_config.c \
+	drivers/bus/softspi.c \
+	extmod/modonewire.c \
+	fatfs_port.c \
+	led.c \
 	machine_adc.c \
 	machine_i2c.c \
 	machine_led.c \
 	machine_pin.c \
 	machine_rtc.c \
+	machine_sdcard.c \
 	machine_spi.c \
 	machine_timer.c \
 	machine_uart.c \
+	main.c \
 	mimxrt_flash.c \
-	modutime.c \
 	modmachine.c \
 	modmimxrt.c \
 	moduos.c \
+	modutime.c \
 	mphalport.c \
+	pin.c \
+	sdcard.c \
 	shared/libc/printf.c \
 	shared/libc/string0.c \
 	shared/readline/readline.c \
@@ -165,8 +178,8 @@ SRC_C += \
 	shared/runtime/stdout_helpers.c \
 	shared/runtime/sys_stdio_mphal.c \
 	shared/timeutils/timeutils.c \
-	drivers/bus/softspi.c \
-	extmod/modonewire.c \
+	ticks.c \
+	tusb_port.c \
 	$(SRC_TINYUSB_C) \
 	$(SRC_HAL_IMX_C) \
 
@@ -188,9 +201,9 @@ LIBM_SRC_C += $(addprefix lib/libm_dbl/,\
 	atan2.c \
 	atanh.c \
 	ceil.c \
+	copysign.c \
 	cos.c \
 	cosh.c \
-	copysign.c \
 	erf.c \
 	exp.c \
 	expm1.c \
@@ -222,7 +235,6 @@ LIBM_SRC_C += lib/libm_dbl/sqrt.c
 endif
 else
 LIBM_SRC_C += $(addprefix lib/libm/,\
-	math.c \
 	acoshf.c \
 	asinfacosf.c \
 	asinhf.c \
@@ -237,6 +249,7 @@ LIBM_SRC_C += $(addprefix lib/libm/,\
 	kf_sin.c \
 	kf_tan.c \
 	log1pf.c \
+	math.c \
 	nearbyintf.c \
 	roundf.c \
 	sf_cos.c \
@@ -263,28 +276,29 @@ ifeq ($(MICROPY_FLOAT_IMPL),double)
 $(LIBM_O): CFLAGS := $(filter-out -Wdouble-promotion -Wfloat-conversion, $(CFLAGS))
 endif
 
-SRC_SS = $(MCU_DIR)/gcc/startup_$(MCU_SERIES).S
+SRC_SS += $(MCU_DIR)/gcc/startup_$(MCU_SERIES).S
 
-SRC_S = shared/runtime/gchelper_m3.s \
+SRC_S += shared/runtime/gchelper_m3.s \
 
 # List of sources for qstr extraction
 SRC_QSTR += \
+	extmod/modonewire.c \
 	machine_adc.c \
 	machine_led.c \
 	machine_pin.c \
 	machine_rtc.c \
+	machine_sdcard.c \
 	machine_spi.c \
 	machine_timer.c \
 	machine_uart.c \
 	mimxrt_flash.c \
-	modutime.c \
 	modmachine.c \
 	modmimxrt.c \
 	moduos.c \
+	modutime.c \
 	pin.c \
 	shared/runtime/mpirq.c \
 	shared/runtime/sys_stdio_mphal.c \
-	extmod/modonewire.c \
 	$(GEN_PINS_SRC) \
 
 OBJ += $(PY_O)
@@ -327,6 +341,7 @@ $(HEADER_BUILD)/qstrdefs.generated.h: $(BOARD_DIR)/mpconfigboard.h
 $(BUILD)/%_gen.c $(HEADER_BUILD)/%.h: $(BOARD_PINS) $(MAKE_PINS) $(AF_FILE) $(PREFIX_FILE) | $(HEADER_BUILD)
 	$(ECHO) "Create $@"
 	$(Q)$(PYTHON) $(MAKE_PINS) --board $(BOARD_PINS) --af $(AF_FILE)\
+		--iomux $(abspath $(TOP)/$(MCU_DIR)/drivers/fsl_iomuxc.h) \
 		--prefix $(PREFIX_FILE) --hdr $(GEN_PINS_HDR) > $(GEN_PINS_SRC)
 
 $(BUILD)/pins_gen.o: $(BUILD)/pins_gen.c
diff --git a/ports/mimxrt/board_init.c b/ports/mimxrt/board_init.c
index 65024ff3e26c0..091e23eb5d8c9 100644
--- a/ports/mimxrt/board_init.c
+++ b/ports/mimxrt/board_init.c
@@ -40,7 +40,6 @@
 #include "clock_config.h"
 #include "modmachine.h"
 
-volatile uint32_t systick_ms = 0;
 
 const uint8_t dcd_data[] = { 0x00 };
 
@@ -85,6 +84,11 @@ void board_init(void) {
 
     // PIT
     machine_timer_init_PIT();
+
+    // SDCard
+    #if MICROPY_PY_MACHINE_SDCARD
+    machine_sdcard_init0();
+    #endif
 }
 
 void USB_OTG1_IRQHandler(void) {
diff --git a/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.mk b/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.mk
index ccc8ffeb4144d..f616d5afd4859 100644
--- a/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.mk
+++ b/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.mk
@@ -2,6 +2,7 @@ MCU_SERIES = MIMXRT1011
 MCU_VARIANT = MIMXRT1011DAE5A
 
 MICROPY_FLOAT_IMPL = single
+MICROPY_PY_MACHINE_SDCARD = 0
 
 SRC_C += \
 	hal/flexspi_nor_flash.c \
diff --git a/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.h b/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.h
index d2a2cbbdbd1fd..d7fe575abcdf5 100644
--- a/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.h
+++ b/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.h
@@ -64,3 +64,15 @@
     { IOMUXC_GPIO_AD_B1_08_LPI2C2_SCL }, { IOMUXC_GPIO_AD_B1_09_LPI2C2_SDA }, \
     { 0 }, { 0 }, \
     { IOMUXC_GPIO_SD_B1_02_LPI2C4_SCL }, { IOMUXC_GPIO_SD_B1_03_LPI2C4_SDA },
+
+#define USDHC_DUMMY_PIN NULL , 0
+#define MICROPY_USDHC1 \
+    { \
+        .cmd = {GPIO_SD_B0_02_USDHC1_CMD}, \
+        .clk = { GPIO_SD_B0_03_USDHC1_CLK }, \
+        .cd_b = { GPIO_SD_B0_06_USDHC1_CD_B },\
+        .data0 = { GPIO_SD_B0_04_USDHC1_DATA0 },\
+        .data1 = { GPIO_SD_B0_05_USDHC1_DATA1 },\
+        .data2 = { GPIO_SD_B0_00_USDHC1_DATA2 },\
+        .data3 = { GPIO_SD_B0_01_USDHC1_DATA3 },\
+    }
diff --git a/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.mk b/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.mk
index f8f66b0dff7cd..6dd16865213f1 100644
--- a/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.mk
+++ b/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.mk
@@ -2,9 +2,7 @@ MCU_SERIES = MIMXRT1021
 MCU_VARIANT = MIMXRT1021DAG5A
 
 MICROPY_FLOAT_IMPL = double
-
-SRC_C += \
-	hal/flexspi_nor_flash.c \
+MICROPY_PY_MACHINE_SDCARD = 1
 
 JLINK_PATH ?= /media/RT1020-EVK/
 JLINK_COMMANDER_SCRIPT = $(BUILD)/script.jlink
@@ -16,6 +14,8 @@ else
 JLINK_CONNECTION_SETTINGS =
 endif
 
+SRC_C += \
+	hal/flexspi_nor_flash.c
 
 deploy_jlink: $(BUILD)/firmware.hex
 	$(ECHO) "ExitOnError 1" > $(JLINK_COMMANDER_SCRIPT)
diff --git a/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.h b/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.h
index af0975bc17a94..976de9c07d009 100644
--- a/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.h
+++ b/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.h
@@ -54,3 +54,15 @@
     { IOMUXC_GPIO_AD_B1_00_LPI2C1_SCL }, { IOMUXC_GPIO_AD_B1_01_LPI2C1_SDA }, \
     { 0 }, { 0 }, \
     { IOMUXC_GPIO_AD_B1_07_LPI2C3_SCL }, { IOMUXC_GPIO_AD_B1_06_LPI2C3_SDA },
+
+#define USDHC_DUMMY_PIN NULL, 0
+#define MICROPY_USDHC1 \
+    { \
+        .cmd = {GPIO_SD_B0_00_USDHC1_CMD}, \
+        .clk = { GPIO_SD_B0_01_USDHC1_CLK }, \
+        .cd_b = { GPIO_B1_12_USDHC1_CD_B },\
+        .data0 = { GPIO_SD_B0_02_USDHC1_DATA0 },\
+        .data1 = { GPIO_SD_B0_03_USDHC1_DATA1 },\
+        .data2 = { GPIO_SD_B0_04_USDHC1_DATA2 },\
+        .data3 = { GPIO_SD_B0_05_USDHC1_DATA3 },\
+    }
diff --git a/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.mk b/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.mk
index 61826b6f606c5..fdbf47f01ec3d 100644
--- a/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.mk
+++ b/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.mk
@@ -2,11 +2,12 @@ MCU_SERIES = MIMXRT1052
 MCU_VARIANT = MIMXRT1052DVL6B
 
 MICROPY_FLOAT_IMPL = double
-
-SRC_C += \
-	hal/flexspi_nor_flash.c \
+MICROPY_PY_MACHINE_SDCARD = 1
 
 JLINK_PATH ?= /media/RT1050-EVK/
 
 deploy: $(BUILD)/firmware.bin
 	cp $< $(JLINK_PATH)
+
+SRC_C += \
+	hal/flexspi_nor_flash.c
diff --git a/ports/mimxrt/boards/MIMXRT1050_EVKB/mpconfigboard.h b/ports/mimxrt/boards/MIMXRT1050_EVKB/mpconfigboard.h
index 518240b03fc5a..963c42cb6a995 100644
--- a/ports/mimxrt/boards/MIMXRT1050_EVKB/mpconfigboard.h
+++ b/ports/mimxrt/boards/MIMXRT1050_EVKB/mpconfigboard.h
@@ -56,7 +56,6 @@
     { IOMUXC_GPIO_AD_B1_07_LPI2C3_SCL }, { IOMUXC_GPIO_AD_B1_06_LPI2C3_SDA },
 
 #define USDHC_DUMMY_PIN NULL , 0
-
 #define MICROPY_USDHC1 \
     { \
         .cmd = {GPIO_SD_B0_00_USDHC1_CMD}, \
diff --git a/ports/mimxrt/boards/MIMXRT1050_EVKB/mpconfigboard.mk b/ports/mimxrt/boards/MIMXRT1050_EVKB/mpconfigboard.mk
index c9e32612ca165..e6cd1a63e816d 100644
--- a/ports/mimxrt/boards/MIMXRT1050_EVKB/mpconfigboard.mk
+++ b/ports/mimxrt/boards/MIMXRT1050_EVKB/mpconfigboard.mk
@@ -2,11 +2,12 @@ MCU_SERIES = MIMXRT1052
 MCU_VARIANT = MIMXRT1052DVL6B
 
 MICROPY_FLOAT_IMPL = double
-
-SRC_C += \
-	hal/flexspi_hyper_flash.c \
+MICROPY_PY_MACHINE_SDCARD = 1
 
 JLINK_PATH ?= /media/RT1050-EVKB/
 
+SRC_C += \
+	hal/flexspi_hyper_flash.c
+
 deploy: $(BUILD)/firmware.bin
 	cp $< $(JLINK_PATH)
diff --git a/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.h b/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.h
index c207da832e5eb..c26364f265d29 100644
--- a/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.h
+++ b/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.h
@@ -54,3 +54,15 @@
     { IOMUXC_GPIO_AD_B1_00_LPI2C1_SCL }, { IOMUXC_GPIO_AD_B1_01_LPI2C1_SDA }, \
     { 0 }, { 0 }, \
     { IOMUXC_GPIO_AD_B1_07_LPI2C3_SCL }, { IOMUXC_GPIO_AD_B1_06_LPI2C3_SDA },
+
+#define USDHC_DUMMY_PIN NULL, 0
+#define MICROPY_USDHC1 \
+    { \
+        .cmd = {GPIO_SD_B0_00_USDHC1_CMD}, \
+        .clk = { GPIO_SD_B0_01_USDHC1_CLK }, \
+        .cd_b = { GPIO_B1_12_USDHC1_CD_B },\
+        .data0 = { GPIO_SD_B0_02_USDHC1_DATA0 },\
+        .data1 = { GPIO_SD_B0_03_USDHC1_DATA1 },\
+        .data2 = { GPIO_SD_B0_04_USDHC1_DATA2 },\
+        .data3 = { GPIO_SD_B0_05_USDHC1_DATA3 },\
+    }
diff --git a/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.mk b/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.mk
index f5eaf3eab568d..623e2617fd1e9 100644
--- a/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.mk
+++ b/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.mk
@@ -2,9 +2,7 @@ MCU_SERIES = MIMXRT1062
 MCU_VARIANT = MIMXRT1062DVJ6A
 
 MICROPY_FLOAT_IMPL = double
-
-SRC_C += \
-	hal/flexspi_hyper_flash.c \
+MICROPY_PY_MACHINE_SDCARD = 1
 
 JLINK_PATH ?= /media/RT1060-EVK/
 JLINK_COMMANDER_SCRIPT = $(BUILD)/script.jlink
@@ -16,6 +14,8 @@ else
 JLINK_CONNECTION_SETTINGS = -USB
 endif
 
+SRC_C += \
+	hal/flexspi_hyper_flash.c
 
 deploy_jlink: $(BUILD)/firmware.hex
 	$(Q)$(TOUCH) $(JLINK_COMMANDER_SCRIPT)
diff --git a/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.h b/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.h
index 59f28b0e2a5cf..4534caa296081 100644
--- a/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.h
+++ b/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.h
@@ -52,3 +52,15 @@
     { IOMUXC_GPIO_AD_B1_00_LPI2C1_SCL }, { IOMUXC_GPIO_AD_B1_01_LPI2C1_SDA }, \
     { 0 }, { 0 }, \
     { IOMUXC_GPIO_AD_B1_07_LPI2C3_SCL }, { IOMUXC_GPIO_AD_B1_06_LPI2C3_SDA },
+
+#define USDHC_DUMMY_PIN NULL, 0
+#define MICROPY_USDHC1 \
+    { \
+        .cmd = {GPIO_SD_B0_00_USDHC1_CMD}, \
+        .clk = { GPIO_SD_B0_01_USDHC1_CLK }, \
+        .cd_b = { GPIO_B1_12_USDHC1_CD_B },\
+        .data0 = { GPIO_SD_B0_02_USDHC1_DATA0 },\
+        .data1 = { GPIO_SD_B0_03_USDHC1_DATA1 },\
+        .data2 = { GPIO_SD_B0_04_USDHC1_DATA2 },\
+        .data3 = { GPIO_SD_B0_05_USDHC1_DATA3 },\
+    }
diff --git a/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.mk b/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.mk
index 444fe99672097..fe3c442faad47 100644
--- a/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.mk
+++ b/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.mk
@@ -2,9 +2,7 @@ MCU_SERIES = MIMXRT1064
 MCU_VARIANT = MIMXRT1064DVL6A
 
 MICROPY_FLOAT_IMPL = double
-
-SRC_C += \
-	hal/flexspi_hyper_flash.c \
+MICROPY_PY_MACHINE_SDCARD = 1
 
 JLINK_PATH ?= /media/RT1064-EVK/
 
@@ -12,3 +10,6 @@ CFLAGS += -DBOARD_FLASH_SIZE=0x400000
 
 deploy: $(BUILD)/firmware.bin
 	cp $< $(JLINK_PATH)
+
+SRC_C += \
+	hal/flexspi_hyper_flash.c
diff --git a/ports/mimxrt/boards/TEENSY40/mpconfigboard.h b/ports/mimxrt/boards/TEENSY40/mpconfigboard.h
index aacee4623cd92..4a69303b56e9c 100644
--- a/ports/mimxrt/boards/TEENSY40/mpconfigboard.h
+++ b/ports/mimxrt/boards/TEENSY40/mpconfigboard.h
@@ -57,3 +57,15 @@
     { 0 }, { 0 }, \
     { IOMUXC_GPIO_AD_B1_07_LPI2C3_SCL }, { IOMUXC_GPIO_AD_B1_06_LPI2C3_SDA }, \
     { IOMUXC_GPIO_AD_B0_12_LPI2C4_SCL }, { IOMUXC_GPIO_AD_B0_13_LPI2C4_SDA },
+
+#define USDHC_DUMMY_PIN NULL, 0
+#define MICROPY_USDHC1 \
+    { \
+        .cmd = {GPIO_SD_B0_00_USDHC1_CMD}, \
+        .clk = { GPIO_SD_B0_01_USDHC1_CLK }, \
+        .cd_b = { USDHC_DUMMY_PIN },\
+        .data0 = { GPIO_SD_B0_02_USDHC1_DATA0 },\
+        .data1 = { GPIO_SD_B0_03_USDHC1_DATA1 },\
+        .data2 = { GPIO_SD_B0_04_USDHC1_DATA2 },\
+        .data3 = { GPIO_SD_B0_05_USDHC1_DATA3 },\
+    }
diff --git a/ports/mimxrt/boards/TEENSY40/mpconfigboard.mk b/ports/mimxrt/boards/TEENSY40/mpconfigboard.mk
index a15dd78128905..bd70fd0925e08 100644
--- a/ports/mimxrt/boards/TEENSY40/mpconfigboard.mk
+++ b/ports/mimxrt/boards/TEENSY40/mpconfigboard.mk
@@ -2,9 +2,10 @@ MCU_SERIES = MIMXRT1062
 MCU_VARIANT = MIMXRT1062DVJ6A
 
 MICROPY_FLOAT_IMPL = double
-
-SRC_C += \
-	hal/flexspi_nor_flash.c \
+MICROPY_PY_MACHINE_SDCARD = 1
 
 deploy: $(BUILD)/firmware.hex
 	teensy_loader_cli --mcu=imxrt1062 -v -w $<
+
+SRC_C += \
+	hal/flexspi_nor_flash.c
diff --git a/ports/mimxrt/boards/TEENSY40/pins.csv b/ports/mimxrt/boards/TEENSY40/pins.csv
index c9d7c9856ddce..0ea4f1373152c 100644
--- a/ports/mimxrt/boards/TEENSY40/pins.csv
+++ b/ports/mimxrt/boards/TEENSY40/pins.csv
@@ -32,12 +32,12 @@ D30,GPIO_EMC_37
 D31,GPIO_EMC_36
 D32,GPIO_B0_12
 D33,GPIO_EMC_07
-DAT1,GPIO_AD_B0_03
-DAT0,GPIO_AD_B0_02
-CLK,GPIO_AD_B0_01
-CMD,GPIO_ASD_B0_00
-DAT3,GPIO_SD_B0_05
+CMD,GPIO_SD_B0_00
+CLK,GPIO_SD_B0_01
+DAT0,GPIO_SD_B0_02
+DAT1,GPIO_SD_B0_03
 DAT2,GPIO_SD_B0_04
+DAT3,GPIO_SD_B0_05
 A0,GPIO_AD_B1_02
 A1,GPIO_AD_B1_03
 A2,GPIO_AD_B1_07
diff --git a/ports/mimxrt/boards/TEENSY41/mpconfigboard.h b/ports/mimxrt/boards/TEENSY41/mpconfigboard.h
index a72bd127b6ad0..587bf9c620437 100644
--- a/ports/mimxrt/boards/TEENSY41/mpconfigboard.h
+++ b/ports/mimxrt/boards/TEENSY41/mpconfigboard.h
@@ -57,3 +57,15 @@
     { 0 }, { 0 }, \
     { IOMUXC_GPIO_AD_B1_07_LPI2C3_SCL }, { IOMUXC_GPIO_AD_B1_06_LPI2C3_SDA }, \
     { IOMUXC_GPIO_AD_B0_12_LPI2C4_SCL }, { IOMUXC_GPIO_AD_B0_13_LPI2C4_SDA },
+
+#define USDHC_DUMMY_PIN NULL, 0
+#define MICROPY_USDHC1 \
+    { \
+        .cmd = {GPIO_SD_B0_00_USDHC1_CMD}, \
+        .clk = { GPIO_SD_B0_01_USDHC1_CLK }, \
+        .cd_b = { USDHC_DUMMY_PIN },\
+        .data0 = { GPIO_SD_B0_02_USDHC1_DATA0 },\
+        .data1 = { GPIO_SD_B0_03_USDHC1_DATA1 },\
+        .data2 = { GPIO_SD_B0_04_USDHC1_DATA2 },\
+        .data3 = { GPIO_SD_B0_05_USDHC1_DATA3 },\
+    }
diff --git a/ports/mimxrt/boards/TEENSY41/mpconfigboard.mk b/ports/mimxrt/boards/TEENSY41/mpconfigboard.mk
index a15dd78128905..bd70fd0925e08 100755
--- a/ports/mimxrt/boards/TEENSY41/mpconfigboard.mk
+++ b/ports/mimxrt/boards/TEENSY41/mpconfigboard.mk
@@ -2,9 +2,10 @@ MCU_SERIES = MIMXRT1062
 MCU_VARIANT = MIMXRT1062DVJ6A
 
 MICROPY_FLOAT_IMPL = double
-
-SRC_C += \
-	hal/flexspi_nor_flash.c \
+MICROPY_PY_MACHINE_SDCARD = 1
 
 deploy: $(BUILD)/firmware.hex
 	teensy_loader_cli --mcu=imxrt1062 -v -w $<
+
+SRC_C += \
+	hal/flexspi_nor_flash.c
diff --git a/ports/mimxrt/boards/make-pins.py b/ports/mimxrt/boards/make-pins.py
index e9e32a504728b..d75592124ae0a 100644
--- a/ports/mimxrt/boards/make-pins.py
+++ b/ports/mimxrt/boards/make-pins.py
@@ -8,11 +8,22 @@
 import csv
 import re
 
-SUPPORTED_AFS = {"GPIO"}
+SUPPORTED_AFS = {"GPIO", "USDHC"}
 MAX_AF = 10  # AF0 .. AF9
 ADC_COL = 11
 
 
+regexes = [
+    r"IOMUXC_(?P<pin>GPIO_SD_B\d_\d\d)_(?P<function>\w+) (?P<muxRegister>\w+), (?P<muxMode>\w+), (?P<inputRegister>\w+), (?P<inputDaisy>\w+), (?P<configRegister>\w+)",
+    r"IOMUXC_(?P<pin>GPIO_AD_B\d_\d\d)_(?P<function>\w+) (?P<muxRegister>\w+), (?P<muxMode>\w+), (?P<inputRegister>\w+), (?P<inputDaisy>\w+), (?P<configRegister>\w+)",
+    r"IOMUXC_(?P<pin>GPIO_EMC_\d\d)_(?P<function>\w+) (?P<muxRegister>\w+), (?P<muxMode>\w+), (?P<inputRegister>\w+), (?P<inputDaisy>\w+), (?P<configRegister>\w+)",
+    r"IOMUXC_(?P<pin>GPIO_B\d_\d\d)_(?P<function>\w+) (?P<muxRegister>\w+), (?P<muxMode>\w+), (?P<inputRegister>\w+), (?P<inputDaisy>\w+), (?P<configRegister>\w+)",
+    r"IOMUXC_(?P<pin>GPIO_\d\d)_(?P<function>\w+) (?P<muxRegister>\w+), (?P<muxMode>\w+), (?P<inputRegister>\w+), (?P<inputDaisy>\w+), (?P<configRegister>\w+)",
+    r"IOMUXC_(?P<pin>GPIO_AD_\d\d)_(?P<function>\w+) (?P<muxRegister>\w+), (?P<muxMode>\w+), (?P<inputRegister>\w+), (?P<inputDaisy>\w+), (?P<configRegister>\w+)",
+    r"IOMUXC_(?P<pin>GPIO_SD_\d\d)_(?P<function>\w+) (?P<muxRegister>\w+), (?P<muxMode>\w+), (?P<inputRegister>\w+), (?P<inputDaisy>\w+), (?P<configRegister>\w+)",
+]
+
+
 def parse_pad(pad_str):
     """Parses a string and returns a (port, gpio_bit) tuple."""
     if len(pad_str) < 4:
@@ -127,16 +138,18 @@ def print(self):
 class AlternateFunction(object):
     """Holds the information associated with a pins alternate function."""
 
-    def __init__(self, idx, af_str):
+    def __init__(self, idx, input_reg, input_daisy, af_str):
         self.idx = idx
         self.af_str = af_str
+        self.input_reg = input_reg
+        self.input_daisy = input_daisy
         self.instance = self.af_str.split("_")[0]
 
     def print(self):
         """Prints the C representation of this AF."""
         print(
-            "    PIN_AF({0}, PIN_AF_MODE_ALT{1}, {2}, {3}),".format(
-                self.af_str, self.idx, self.instance, "0x10B0U"
+            "    PIN_AF({0}, PIN_AF_MODE_ALT{1}, {2}, {3}, {4}, {5}),".format(
+                self.af_str, self.idx, self.input_daisy, self.instance, self.input_reg, "0x10B0U"
             )
         )
 
@@ -171,8 +184,26 @@ def parse_board_file(self, filename):
                 if pin and row[0]:  # Only add board pins that have a name
                     self.board_pins.append(NamedPin(row[0], pin.pad, pin.idx))
 
-    def parse_af_file(self, filename, pad_col, af_start_col):
+    def parse_af_file(self, filename, iomux_filename, pad_col, af_start_col):
         af_end_col = af_start_col + MAX_AF
+
+        iomux_pin_config = dict()
+
+        with open(iomux_filename, "r") as ipt:
+            input_str = ipt.read()
+            for regex in regexes:
+                matches = re.finditer(regex, input_str, re.MULTILINE)
+
+                for match in matches:
+                    if match.group("pin") not in iomux_pin_config:
+                        iomux_pin_config[match.group("pin")] = {
+                            int((match.groupdict()["muxMode"].strip("U")), 16): match.groupdict()
+                        }
+                    else:
+                        iomux_pin_config[match.group("pin")][
+                            int((match.groupdict()["muxMode"].strip("U")), 16)
+                        ] = match.groupdict()
+
         with open(filename, "r") as csvfile:
             rows = csv.reader(csvfile)
             header = next(rows)
@@ -187,7 +218,16 @@ def parse_af_file(self, filename, pad_col, af_start_col):
                 af_idx = 0
                 for af_idx, af in enumerate(row[af_start_col:af_end_col]):
                     if af and af_supported(af):
-                        pin.add_af(AlternateFunction(af_idx, af))
+                        pin.add_af(
+                            AlternateFunction(
+                                af_idx,
+                                iomux_pin_config[pin.name][af_idx]["inputRegister"].strip("U"),
+                                int(
+                                    iomux_pin_config[pin.name][af_idx]["inputDaisy"].strip("U"), 16
+                                ),
+                                af,
+                            )
+                        )
 
                 pin.parse_adc(row[ADC_COL])
 
@@ -235,6 +275,33 @@ def print_header(self, hdr_filename):
             hdr_file.write("extern const mp_obj_dict_t machine_pin_cpu_pins_locals_dict;\n")
             hdr_file.write("extern const mp_obj_dict_t machine_pin_board_pins_locals_dict;\n")
 
+            hdr_file.write("\n// Defines\n")
+            usdhc_instance_factory(self.cpu_pins, hdr_file)
+
+
+def usdhc_instance_factory(pins, output_file):
+    usdhc_pins = filter(lambda p: any([af for af in p.alt_fn if "USDHC" in af.af_str]), pins)
+
+    usdhc_instances = dict()
+    for pin in usdhc_pins:
+        for idx, alt_fn in enumerate(pin.alt_fn):
+            if "USDHC" in alt_fn.instance:
+                format_string = "#define {0}_{1} &pin_{0}, {2}"
+                if alt_fn.instance not in usdhc_instances:
+                    usdhc_instances[alt_fn.instance] = [
+                        format_string.format(pin.name, alt_fn.af_str, idx)
+                    ]
+                else:
+                    usdhc_instances[alt_fn.instance].append(
+                        format_string.format(pin.name, alt_fn.af_str, idx)
+                    )
+
+    for k, v in usdhc_instances.items():
+        output_file.write(f"// {k}\n")
+        output_file.write(f"#define {k}_AVAIL (1)\n")
+        for i in v:
+            output_file.write(i + "\n")
+
 
 def main():
     parser = argparse.ArgumentParser(
@@ -249,6 +316,13 @@ def main():
         help="Specifies the alternate function file for the chip",
         default="mimxrt1021_af.csv",
     )
+    parser.add_argument(
+        "-i",
+        "--iomux",
+        dest="iomux_filename",
+        help="Specifies the fsl_iomux.h file for the chip",
+        default="fsl_iomuxc.h",
+    )
     parser.add_argument(
         "-b",
         "--board",
@@ -279,7 +353,7 @@ def main():
 
     if args.af_filename:
         print("// --af {:s}".format(args.af_filename))
-        pins.parse_af_file(args.af_filename, 0, 1)
+        pins.parse_af_file(args.af_filename, args.iomux_filename, 0, 1)
 
     if args.board_filename:
         print("// --board {:s}".format(args.board_filename))
diff --git a/ports/mimxrt/boards/mimxrt_prefix.c b/ports/mimxrt/boards/mimxrt_prefix.c
index 96ba6a0d5e749..938efc8104567 100644
--- a/ports/mimxrt/boards/mimxrt_prefix.c
+++ b/ports/mimxrt/boards/mimxrt_prefix.c
@@ -4,12 +4,14 @@
 #include "py/mphal.h"
 #include "pin.h"
 
-#define PIN_AF(_name, _af_mode, _instance, _pad_config) \
+#define PIN_AF(_name, _af_mode, _input_daisy, _instance, _input_register, _pad_config) \
     { \
         .base = { &machine_pin_af_type }, \
         .name = MP_QSTR_##_name, \
         .af_mode = (uint32_t)(_af_mode), \
+        .input_daisy = (uint8_t)(_input_daisy), \
         .instance = (void *)(_instance), \
+        .input_register = (uint32_t)(_input_register), \
         .pad_config = (uint32_t)(_pad_config), \
     } \
 
@@ -32,3 +34,4 @@
         .af_list = (_af_list), \
         .adc_list = (_adc_list), \
     } \
+
diff --git a/ports/mimxrt/fatfs_port.c b/ports/mimxrt/fatfs_port.c
new file mode 100644
index 0000000000000..7b7008667ff3e
--- /dev/null
+++ b/ports/mimxrt/fatfs_port.c
@@ -0,0 +1,39 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013, 2014 Damien P. George
+ * Copyright (c) 2021 Robert Hammelrath
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "lib/oofatfs/ff.h"
+#include "fsl_snvs_lp.h"
+
+
+MP_WEAK DWORD get_fattime(void) {
+    snvs_lp_srtc_datetime_t srtcDate;
+
+    SNVS_LP_SRTC_GetDatetime(SNVS, &srtcDate);
+
+    return ((srtcDate.year - 1980) << 25) | (srtcDate.month << 21) | (srtcDate.day << 16) |
+           (srtcDate.hour << 11) | ((srtcDate.minute << 5) | (srtcDate.second / 2));
+}
diff --git a/ports/mimxrt/machine_sdcard.c b/ports/mimxrt/machine_sdcard.c
new file mode 100644
index 0000000000000..4a92aae00cefa
--- /dev/null
+++ b/ports/mimxrt/machine_sdcard.c
@@ -0,0 +1,222 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Philipp Ebensberger
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#if MICROPY_PY_MACHINE_SDCARD
+
+#include "py/runtime.h"
+#include "py/mperrno.h"
+#include "extmod/vfs.h"
+#include "ticks.h"
+#include "fsl_cache.h"
+
+#include "sdcard.h"
+
+
+enum { SDCARD_INIT_ARG_ID };
+
+
+STATIC const mp_arg_t sdcard_init_allowed_args[] = {
+    [SDCARD_INIT_ARG_ID] = { MP_QSTR_id, MP_ARG_INT, {.u_int = 1} },
+};
+
+
+STATIC void machine_sdcard_init_helper(mimxrt_sdcard_obj_t *self) {
+    sdcard_init(self, 198000000UL);  // Initialize SDCard Host with 198MHz base clock
+    sdcard_init_pins(self);
+
+    ticks_delay_us64(2ULL * 1000ULL);  // Wait 2ms to allow USDHC signals to settle/debounce
+}
+
+STATIC mp_obj_t sdcard_obj_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
+    mp_map_t kw_args;
+    mp_map_init_fixed_table(&kw_args, n_kw, all_args + n_args);
+
+    // Parse args
+    mp_arg_val_t args[MP_ARRAY_SIZE(sdcard_init_allowed_args)];
+    mp_arg_parse_all(n_args, all_args, &kw_args, MP_ARRAY_SIZE(sdcard_init_allowed_args), sdcard_init_allowed_args, args);
+
+    // Extract arguments
+    mp_int_t sdcard_id = args[SDCARD_INIT_ARG_ID].u_int;
+
+    if (!(1 <= sdcard_id && sdcard_id <= MP_ARRAY_SIZE(mimxrt_sdcard_objs))) {
+        nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError, "SDCard(%d) doesn't exist", sdcard_id));
+    }
+
+    mimxrt_sdcard_obj_t *self = &mimxrt_sdcard_objs[(sdcard_id - 1)];
+
+    // Initialize SDCard Host
+    if (!sdcard_state_initialized(self)) {
+        machine_sdcard_init_helper(self);
+    }
+    return MP_OBJ_FROM_PTR(self);
+}
+
+// init()
+STATIC mp_obj_t machine_sdcard_init(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    mimxrt_sdcard_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]);
+
+    if (!sdcard_state_initialized(self)) {
+        machine_sdcard_init_helper(self);
+    }
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_KW(machine_sdcard_init_obj, 1, machine_sdcard_init);
+
+// deinit()
+STATIC mp_obj_t machine_sdcard_deinit(mp_obj_t self_in) {
+    mimxrt_sdcard_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    sdcard_deinit(self);
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_sdcard_deinit_obj, machine_sdcard_deinit);
+
+// readblocks(block_num, buf)
+STATIC mp_obj_t machine_sdcard_readblocks(mp_obj_t self_in, mp_obj_t block_num, mp_obj_t buf) {
+    mp_buffer_info_t bufinfo;
+    mimxrt_sdcard_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    mp_get_buffer_raise(buf, &bufinfo, MP_BUFFER_WRITE);
+
+    if (sdcard_read(self, bufinfo.buf, mp_obj_get_int(block_num), bufinfo.len / SDCARD_DEFAULT_BLOCK_SIZE)) {
+        return MP_OBJ_NEW_SMALL_INT(0);
+    } else {
+        return MP_OBJ_NEW_SMALL_INT(-MP_EIO);
+    }
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_3(machine_sdcard_readblocks_obj, machine_sdcard_readblocks);
+
+// present()
+STATIC mp_obj_t machine_sdcard_present(mp_obj_t self_in) {
+    mimxrt_sdcard_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    return mp_obj_new_bool(sdcard_detect(self));
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_sdcard_present_obj, machine_sdcard_present);
+
+STATIC mp_obj_t machine_sdcard_info(mp_obj_t self_in) {
+    mimxrt_sdcard_obj_t *self = MP_OBJ_TO_PTR(self_in);
+
+    if (sdcard_detect(self) && sdcard_state_initialized(self)) {
+        uint32_t log_block_nbr = self->block_count;
+        uint32_t log_block_size = self->block_len;
+
+        mp_obj_t tuple[2] = {
+            mp_obj_new_int_from_ull((uint64_t)log_block_nbr * (uint64_t)log_block_size),
+            mp_obj_new_int_from_uint(log_block_size),
+        };
+        return mp_obj_new_tuple(2, tuple);
+    } else {
+        return mp_const_none;
+    }
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_sdcard_info_obj, machine_sdcard_info);
+
+// writeblocks(block_num, buf)
+STATIC mp_obj_t machine_sdcard_writeblocks(mp_obj_t self_in, mp_obj_t block_num, mp_obj_t buf) {
+    mp_buffer_info_t bufinfo;
+    mimxrt_sdcard_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    mp_get_buffer_raise(buf, &bufinfo, MP_BUFFER_WRITE);
+
+    if (sdcard_write(self, bufinfo.buf, mp_obj_get_int(block_num), bufinfo.len / SDCARD_DEFAULT_BLOCK_SIZE)) {
+        return MP_OBJ_NEW_SMALL_INT(0);
+    } else {
+        return MP_OBJ_NEW_SMALL_INT(-MP_EIO);
+    }
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_3(machine_sdcard_writeblocks_obj, machine_sdcard_writeblocks);
+
+// ioctl(op, arg)
+STATIC mp_obj_t machine_sdcard_ioctl(mp_obj_t self_in, mp_obj_t cmd_in, mp_obj_t arg_in) {
+    mimxrt_sdcard_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    mp_int_t cmd = mp_obj_get_int(cmd_in);
+
+    switch (cmd) {
+        case MP_BLOCKDEV_IOCTL_INIT: {
+            if (sdcard_detect(self)) {
+                if (sdcard_power_on(self)) {
+                    return MP_OBJ_NEW_SMALL_INT(0);
+                } else {
+                    sdcard_power_off(self);
+                    return MP_OBJ_NEW_SMALL_INT(-MP_EIO);  // Initialization failed
+                }
+            } else {
+                return MP_OBJ_NEW_SMALL_INT(-MP_EIO);  // Initialization failed
+            }
+        }
+        case MP_BLOCKDEV_IOCTL_DEINIT: {
+            if (sdcard_power_off(self)) {
+                return MP_OBJ_NEW_SMALL_INT(0);
+            } else {
+                return MP_OBJ_NEW_SMALL_INT(-MP_EIO);  // Deinitialization failed
+            }
+        }
+        case MP_BLOCKDEV_IOCTL_SYNC: {
+            return MP_OBJ_NEW_SMALL_INT(0);
+        }
+        case MP_BLOCKDEV_IOCTL_BLOCK_COUNT: {
+            if (sdcard_state_initialized(self)) {
+                return MP_OBJ_NEW_SMALL_INT(self->block_count);
+            } else {
+                return MP_OBJ_NEW_SMALL_INT(-MP_EIO);  // Card not initialized
+            }
+        }
+        case MP_BLOCKDEV_IOCTL_BLOCK_SIZE: {
+            if (sdcard_state_initialized(self)) {
+                return MP_OBJ_NEW_SMALL_INT(self->block_len);
+            } else {
+                return MP_OBJ_NEW_SMALL_INT(-MP_EIO);  // Card not initialized
+            }
+        }
+        default: // unknown command
+        {
+            return mp_const_none;
+        }
+    }
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_3(machine_sdcard_ioctl_obj, machine_sdcard_ioctl);
+
+STATIC const mp_rom_map_elem_t sdcard_locals_dict_table[] = {
+    { MP_ROM_QSTR(MP_QSTR_init),        MP_ROM_PTR(&machine_sdcard_init_obj) },
+    { MP_ROM_QSTR(MP_QSTR_deinit),      MP_ROM_PTR(&machine_sdcard_deinit_obj) },
+    { MP_ROM_QSTR(MP_QSTR_present),     MP_ROM_PTR(&machine_sdcard_present_obj) },
+    { MP_ROM_QSTR(MP_QSTR_info),        MP_ROM_PTR(&machine_sdcard_info_obj) },
+    // block device protocol
+    { MP_ROM_QSTR(MP_QSTR_readblocks),  MP_ROM_PTR(&machine_sdcard_readblocks_obj) },
+    { MP_ROM_QSTR(MP_QSTR_writeblocks), MP_ROM_PTR(&machine_sdcard_writeblocks_obj) },
+    { MP_ROM_QSTR(MP_QSTR_ioctl),       MP_ROM_PTR(&machine_sdcard_ioctl_obj) },
+};
+STATIC MP_DEFINE_CONST_DICT(sdcard_locals_dict, sdcard_locals_dict_table);
+
+const mp_obj_type_t machine_sdcard_type = {
+    { &mp_type_type },
+    .name = MP_QSTR_SDCard,
+    .make_new = sdcard_obj_make_new,
+    .locals_dict = (mp_obj_dict_t *)&sdcard_locals_dict,
+};
+
+void machine_sdcard_init0(void) {
+    return;
+}
+
+#endif // MICROPY_PY_MACHINE_SDCARD
diff --git a/ports/mimxrt/modmachine.c b/ports/mimxrt/modmachine.c
index 150615ca03a92..a98d09bd0e634 100644
--- a/ports/mimxrt/modmachine.c
+++ b/ports/mimxrt/modmachine.c
@@ -82,6 +82,9 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_ADC),                 MP_ROM_PTR(&machine_adc_type) },
     { MP_ROM_QSTR(MP_QSTR_Timer),               MP_ROM_PTR(&machine_timer_type) },
     { MP_ROM_QSTR(MP_QSTR_RTC),                 MP_ROM_PTR(&machine_rtc_type) },
+    #if MICROPY_PY_MACHINE_SDCARD
+    { MP_ROM_QSTR(MP_QSTR_SDCard),              MP_ROM_PTR(&machine_sdcard_type) },
+    #endif
     { MP_ROM_QSTR(MP_QSTR_Signal),              MP_ROM_PTR(&machine_signal_type) },
     { MP_ROM_QSTR(MP_QSTR_SoftI2C),             MP_ROM_PTR(&mp_machine_soft_i2c_type) },
     { MP_ROM_QSTR(MP_QSTR_SoftSPI),             MP_ROM_PTR(&mp_machine_soft_spi_type) },
diff --git a/ports/mimxrt/modmachine.h b/ports/mimxrt/modmachine.h
index 9732093bd865d..e1a7ce0b72f46 100644
--- a/ports/mimxrt/modmachine.h
+++ b/ports/mimxrt/modmachine.h
@@ -35,9 +35,11 @@ extern const mp_obj_type_t machine_rtc_type;
 extern const mp_obj_type_t machine_i2c_type;
 extern const mp_obj_type_t machine_spi_type;
 extern const mp_obj_type_t machine_uart_type;
+extern const mp_obj_type_t machine_sdcard_type;
 
 void machine_adc_init(void);
 void machine_pin_irq_deinit(void);
 void machine_timer_init_PIT(void);
+void machine_sdcard_init0(void);
 
 #endif // MICROPY_INCLUDED_MIMXRT_MODMACHINE_H
diff --git a/ports/mimxrt/modules/_boot.py b/ports/mimxrt/modules/_boot.py
index 892d0047357e8..bc8d72224a933 100644
--- a/ports/mimxrt/modules/_boot.py
+++ b/ports/mimxrt/modules/_boot.py
@@ -3,13 +3,32 @@
 # Note: the flash requires the programming size to be aligned to 256 bytes.
 
 import os
+import sys
 import mimxrt
+from machine import Pin
 
 bdev = mimxrt.Flash()
-
 try:
     vfs = os.VfsLfs2(bdev, progsize=256)
 except:
     os.VfsLfs2.mkfs(bdev, progsize=256)
     vfs = os.VfsLfs2(bdev, progsize=256)
-os.mount(vfs, "/")
+os.mount(vfs, "/flash")
+os.chdir("/flash")
+sys.path.append("/flash")
+
+# do not mount the SD card if SKIPSD exists.
+try:
+    os.stat("SKIPSD")
+except:
+    try:
+        from machine import SDCard
+
+        sdcard = SDCard(1)
+
+        fat = os.VfsFat(sdcard)
+        os.mount(fat, "/sdcard")
+        os.chdir("/sdcard")
+        sys.path.append("/sdcard")
+    except:
+        pass  # Fail silently
diff --git a/ports/mimxrt/moduos.c b/ports/mimxrt/moduos.c
index 225cd4ddd2b2b..ff0f0824c4a3a 100644
--- a/ports/mimxrt/moduos.c
+++ b/ports/mimxrt/moduos.c
@@ -31,6 +31,7 @@
 #include "py/objstr.h"
 #include "py/runtime.h"
 #include "extmod/vfs.h"
+#include "extmod/vfs_fat.h"
 #include "extmod/vfs_lfs.h"
 #include "genhdr/mpversion.h"
 #include "fsl_trng.h"
diff --git a/ports/mimxrt/mpconfigport.h b/ports/mimxrt/mpconfigport.h
index be2b87e6a2328..9775b29efa22a 100644
--- a/ports/mimxrt/mpconfigport.h
+++ b/ports/mimxrt/mpconfigport.h
@@ -132,6 +132,12 @@ uint32_t trng_random_u32(void);
 #define MICROPY_PY_FRAMEBUF                 (1)
 #define MICROPY_PY_ONEWIRE                  (1)
 
+// fatfs configuration used in ffconf.h
+#define MICROPY_FATFS_ENABLE_LFN            (1)
+#define MICROPY_FATFS_RPATH                 (2)
+#define MICROPY_FATFS_MAX_SS                (4096)
+#define MICROPY_FATFS_LFN_CODE_PAGE         437 /* 1=SFN/ANSI 437=LFN/U.S.(OEM) */
+
 // Use VfsLfs2's types for fileio/textio
 #define mp_type_fileio mp_type_vfs_lfs2_fileio
 #define mp_type_textio mp_type_vfs_lfs2_textio
diff --git a/ports/mimxrt/pin.h b/ports/mimxrt/pin.h
index 8d80490d1c464..3520ed0f4f264 100644
--- a/ports/mimxrt/pin.h
+++ b/ports/mimxrt/pin.h
@@ -58,7 +58,8 @@ enum {
 };
 
 enum {
-    PIN_AF_MODE_ALT1 = 1,
+    PIN_AF_MODE_ALT0 = 0,
+    PIN_AF_MODE_ALT1,
     PIN_AF_MODE_ALT2,
     PIN_AF_MODE_ALT3,
     PIN_AF_MODE_ALT4,
@@ -97,7 +98,9 @@ typedef struct {
     mp_obj_base_t base;
     qstr name;  // port name
     uint8_t af_mode;  // alternate function
+    uint8_t input_daisy;
     void *instance;  // pointer to peripheral instance for alternate function
+    uint32_t input_register;
     uint32_t pad_config;  // pad configuration for alternate function
 } machine_pin_af_obj_t;
 
diff --git a/ports/mimxrt/sdcard.c b/ports/mimxrt/sdcard.c
new file mode 100644
index 0000000000000..14a78e94a5e88
--- /dev/null
+++ b/ports/mimxrt/sdcard.c
@@ -0,0 +1,1023 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Philipp Ebensberger
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#if MICROPY_PY_MACHINE_SDCARD
+
+#include "sdcard.h"
+#include "ticks.h"
+#include "fsl_iomuxc.h"
+
+#define SDCARD_VOLTAGE_WINDOW_SD                (0x80100000U)
+#define SDCARD_HIGH_CAPACITY                    (0x40000000U)
+#define SDCARD_SWITCH_1_8V_CAPACITY             ((uint32_t)0x01000000U)
+#define SDCARD_MAX_VOLT_TRIAL                   ((uint32_t)0x000000FFU)
+
+// Error
+#define SDCARD_STATUS_OUT_OF_RANGE_SHIFT        (31U)
+#define SDCARD_STATUS_ADDRESS_ERROR_SHIFT       (30U)
+#define SDCARD_STATUS_BLOCK_LEN_ERROR_SHIFT     (29U)
+#define SDCARD_STATUS_ERASE_SEQ_ERROR_SHIFT     (28U)
+#define SDCARD_STATUS_ERASE_PARAM_SHIFT         (27U)
+#define SDCARD_STATUS_WP_VIOLATION_SHIFT        (26U)
+#define SDCARD_STATUS_LOCK_UNLOCK_FAILED_SHIFT  (24U)
+#define SDCARD_STATUS_COM_CRC_ERROR_SHIFT       (23U)
+#define SDCARD_STATUS_ILLEGAL_COMMAND_SHIFT     (22U)
+#define SDCARD_STATUS_CARD_ECC_FAILED_SHIFT     (21U)
+#define SDCARD_STATUS_CC_ERROR_SHIFT            (20U)
+#define SDCARD_STATUS_ERROR_SHIFT               (19U)
+#define SDCARD_STATUS_CSD_OVERWRITE_SHIFT       (16U)
+#define SDCARD_STATUS_WP_ERASE_SKIP_SHIFT       (15U)
+#define SDCARD_STATUS_AUTH_SEQ_ERR_SHIFT        (3U)
+
+// Status Flags
+#define SDCARD_STATUS_CARD_IS_LOCKED_SHIFT      (25U)
+#define SDCARD_STATUS_CARD_ECC_DISABLED_SHIFT   (14U)
+#define SDCARD_STATUS_ERASE_RESET_SHIFT         (13U)
+#define SDCARD_STATUS_READY_FOR_DATA_SHIFT      (8U)
+#define SDCARD_STATUS_FX_EVENT_SHIFT            (6U)
+#define SDCARD_STATUS_APP_CMD_SHIFT             (5U)
+
+#define SDMMC_MASK(bit) (1U << (bit))
+#define SDMMC_R1_ALL_ERROR_FLAG \
+    (SDMMC_MASK(SDCARD_STATUS_OUT_OF_RANGE_SHIFT)) | \
+    (SDMMC_MASK(SDCARD_STATUS_ADDRESS_ERROR_SHIFT)) | \
+    (SDMMC_MASK(SDCARD_STATUS_BLOCK_LEN_ERROR_SHIFT)) | \
+    (SDMMC_MASK(SDCARD_STATUS_ERASE_SEQ_ERROR_SHIFT)) | \
+    (SDMMC_MASK(SDCARD_STATUS_ERASE_PARAM_SHIFT)) | \
+    (SDMMC_MASK(SDCARD_STATUS_WP_VIOLATION_SHIFT)) | \
+    (SDMMC_MASK(SDCARD_STATUS_LOCK_UNLOCK_FAILED_SHIFT)) | \
+    (SDMMC_MASK(SDCARD_STATUS_COM_CRC_ERROR_SHIFT)) | \
+    (SDMMC_MASK(SDCARD_STATUS_ILLEGAL_COMMAND_SHIFT)) | \
+    (SDMMC_MASK(SDCARD_STATUS_CARD_ECC_FAILED_SHIFT)) | \
+    (SDMMC_MASK(SDCARD_STATUS_CC_ERROR_SHIFT)) | \
+    (SDMMC_MASK(SDCARD_STATUS_ERROR_SHIFT)) | \
+    (SDMMC_MASK(SDCARD_STATUS_CSD_OVERWRITE_SHIFT)) | \
+    (SDMMC_MASK(SDCARD_STATUS_WP_ERASE_SKIP_SHIFT)) | \
+    (SDMMC_MASK(SDCARD_STATUS_AUTH_SEQ_ERR_SHIFT))
+
+#define SDMMC_R1_CURRENT_STATE(x) (((x) & 0x00001E00U) >> 9U)
+
+// ---
+// SD Card command identifiers
+// ---
+enum
+{
+    SDCARD_CMD_GO_IDLE_STATE        = 0U,
+    SDCARD_CMD_ALL_SEND_CID         = 2U,
+    SDCARD_CMD_SEND_REL_ADDR        = 3U,
+    SDCARD_CMD_SET_DSR              = 4U,
+    SDCARD_CMD_SELECT_CARD          = 7U,
+    SDCARD_CMD_SEND_IF_COND         = 8U,
+    SDCARD_CMD_SEND_CSD             = 9U,
+    SDCARD_CMD_SEND_CID             = 10U,
+    SDCARD_CMD_STOP_TRANSMISSION    = 12U,
+    SDCARD_CMD_SEND_STATUS          = 13U,
+    SDCARD_CMD_GO_INACTIVE_STATE    = 15U,
+    SDCARD_CMD_SET_BLOCKLENGTH      = 16U,
+    SDCARD_CMD_READ_SINGLE_BLOCK    = 17U,
+    SDCARD_CMD_READ_MULTIPLE_BLOCK  = 18U,
+    SDCARD_CMD_SET_BLOCK_COUNT      = 23U,
+    SDCARD_CMD_WRITE_SINGLE_BLOCK   = 24U,
+    SDCARD_CMD_WRITE_MULTIPLE_BLOCK = 25U,
+    SDCARD_CMD_PROGRAM_CSD          = 27U,
+    SDCARD_CMD_SET_WRITE_PROTECT    = 28U,
+    SDCARD_CMD_CLEAR_WRITE_PROTECT  = 29U,
+    SDCARD_CMD_SEND_WRITE_PROTECT   = 30U,
+    SDCARD_CMD_ERASE                = 38U,
+    SDCARD_CMD_LOCK_UNLOCK          = 42U,
+    SDCARD_CMD_APP_CMD              = 55U,
+    SDCARD_CMD_GEN_CMD              = 56U,
+    SDCARD_CMD_READ_OCR             = 58U,
+};
+
+// ---
+// SD Card application command identifiers
+// ---
+enum
+{
+    SDCARD_ACMD_SET_BUS_WIDTH       =  6U,
+    SDCARD_ACMD_SD_SEND_OP_COND     = 41U,
+};
+
+// ---
+// SD Card state identifiers
+// ---
+enum
+{
+    SDCARD_STATE_IDLE        = 0U,
+    SDCARD_STATE_READY       = 1U,
+    SDCARD_STATE_IDENTIFY    = 2U,
+    SDCARD_STATE_STANDBY     = 3U,
+    SDCARD_STATE_TRANSFER    = 4U,
+    SDCARD_STATE_SENDDATA    = 5U,
+    SDCARD_STATE_RECEIVEDATA = 6U,
+    SDCARD_STATE_PROGRAM     = 7U,
+    SDCARD_STATE_DISCONNECT  = 8U,
+};
+
+// ---
+// SD Card transfer status
+// ---
+typedef enum
+{
+    SDCARD_TRANSFER_SUCCESS = 0,
+    SDCARD_TRANSFER_ERROR,
+    SDCARD_TRANSFER_PENDING
+} sdcard_transfer_status_t;
+
+// ---
+// SD Card type definitions
+// ---
+typedef struct _cid_t {
+    uint8_t reserved_0;
+    uint16_t mdt : 12;
+    uint16_t reserved_1 : 4;
+    uint32_t psn;
+    uint8_t prv;
+    char pnm[6];
+    uint16_t oid;
+    uint8_t mid;
+} __attribute__((packed)) cid_t;
+
+typedef struct _csd_t {
+    uint32_t data[4];
+} __attribute__((packed)) csd_t;
+
+typedef struct _csr_t {
+    uint32_t data[2];
+} __attribute__((packed)) csr_t;
+
+#define DMA_DESCRIPTOR_BUFFER_SIZE (32U)
+#define DMA_DESCRIPTOR_BUFFER_ALIGN_SIZE  (4U)
+AT_NONCACHEABLE_SECTION_ALIGN(static uint32_t sdcard_adma_descriptor_table[DMA_DESCRIPTOR_BUFFER_SIZE], DMA_DESCRIPTOR_BUFFER_ALIGN_SIZE);
+
+#if defined MICROPY_USDHC1 && USDHC1_AVAIL
+const mimxrt_sdcard_obj_pins_t mimxrt_sdcard_1_obj_pins = MICROPY_USDHC1;
+#endif
+
+#if defined MICROPY_USDHC2 && USDHC2_AVAIL
+const mimxrt_sdcard_obj_pins_t mimxrt_sdcard_2_obj_pins = MICROPY_USDHC2;
+#endif
+
+#if defined MICROPY_USDHC1 && USDHC1_AVAIL
+mimxrt_sdcard_status_obj_t sdcard_usdhc1_state = {.initialized = false, .inserted = false};
+#endif
+#if defined MICROPY_USDHC2 && USDHC2_AVAIL
+mimxrt_sdcard_status_obj_t sdcard_usdhc2_state = {.initialized = false, .inserted = false};
+#endif
+
+mimxrt_sdcard_obj_t mimxrt_sdcard_objs[] =
+{
+    #if defined MICROPY_USDHC1 && USDHC1_AVAIL
+    {
+        .base.type = &machine_sdcard_type,
+        .usdhc_inst = USDHC1,
+        .state = &sdcard_usdhc1_state,
+        .rca = 0x0UL,
+        .block_len = SDCARD_DEFAULT_BLOCK_SIZE,
+        .block_count = 0UL,
+        .pins = &mimxrt_sdcard_1_obj_pins,
+    },
+    #endif
+    #if defined MICROPY_USDHC2 && USDHC2_AVAIL
+    {
+        .base.type = &machine_sdcard_type,
+        .usdhc_inst = USDHC2,
+        .state = &sdcard_usdhc2_state,
+        .rca = 0x0UL,
+        .block_len = SDCARD_DEFAULT_BLOCK_SIZE,
+        .block_count = 0UL,
+        .pins = &mimxrt_sdcard_2_obj_pins,
+    };
+    #endif
+};
+
+volatile status_t sdcard_transfer_status;
+volatile bool sdcard_transfer_done;
+
+// ---
+// Local function declarations
+// ---
+static status_t sdcard_transfer_blocking(USDHC_Type *base,
+    usdhc_handle_t *handle,
+    usdhc_transfer_t *transfer,
+    uint32_t timeout_ms);
+static void sdcard_decode_csd(mimxrt_sdcard_obj_t *sdcard, csd_t *csd);
+static bool sdcard_reset(mimxrt_sdcard_obj_t *card);
+static inline void sdcard_init_pin(const machine_pin_obj_t *pin, uint8_t af_idx, uint32_t config_value);
+
+// SD Card interrupt callbacks
+void sdcard_card_inserted_callback(USDHC_Type *base, void *userData);
+void sdcard_card_removed_callback(USDHC_Type *base, void *userData);
+void sdcard_transfer_complete_callback(USDHC_Type *base, usdhc_handle_t *handle, status_t status, void *userData);
+void sdcard_dummy_callback(USDHC_Type *base, void *userData);
+
+// SD Card commmands
+static bool sdcard_cmd_go_idle_state(mimxrt_sdcard_obj_t *card);
+static bool sdcard_cmd_oper_cond(mimxrt_sdcard_obj_t *card);
+static bool sdcard_cmd_app_cmd(mimxrt_sdcard_obj_t *card);
+static bool sdcard_cmd_sd_app_op_cond(mimxrt_sdcard_obj_t *card, uint32_t argument);
+static bool sdcard_cmd_all_send_cid(mimxrt_sdcard_obj_t *card, cid_t *cid);
+static bool sdcard_cmd_send_cid(mimxrt_sdcard_obj_t *card, cid_t *cid);
+static bool sdcard_cmd_set_rel_add(mimxrt_sdcard_obj_t *card);
+static bool sdcard_cmd_send_csd(mimxrt_sdcard_obj_t *card, csd_t *csd);
+static bool sdcard_cmd_select_card(mimxrt_sdcard_obj_t *sdcard);
+static bool sdcard_cmd_set_blocklen(mimxrt_sdcard_obj_t *sdcard);
+static bool sdcard_cmd_set_bus_width(mimxrt_sdcard_obj_t *sdcard, uint8_t bus_width);
+
+void sdcard_card_inserted_callback(USDHC_Type *base, void *userData) {
+    #if defined MICROPY_USDHC1 && USDHC1_AVAIL
+    if (base == USDHC1) {
+        sdcard_usdhc1_state.inserted = true;
+    }
+    #endif
+    #if defined MICROPY_USDHC2 && USDHC2_AVAIL
+    if (base == USDHC2) {
+        sdcard_usdhc2_state.inserted = true;
+
+    }
+    #endif
+
+    USDHC_ClearInterruptStatusFlags(base, kUSDHC_CardInsertionFlag);
+}
+
+void sdcard_card_removed_callback(USDHC_Type *base, void *userData) {
+    #if defined MICROPY_USDHC1 && USDHC1_AVAIL
+    if (base == USDHC1) {
+        sdcard_usdhc1_state.inserted = false;
+        sdcard_usdhc1_state.initialized = false;
+    }
+    #endif
+    #if defined MICROPY_USDHC2 && USDHC2_AVAIL
+    if (base == USDHC2) {
+        sdcard_usdhc2_state.inserted = false;
+        sdcard_usdhc2_state.initialized = false;
+    }
+    #endif
+
+    USDHC_ClearInterruptStatusFlags(base, kUSDHC_CardRemovalFlag);
+}
+
+void sdcard_transfer_complete_callback(USDHC_Type *base, usdhc_handle_t *handle, status_t status, void *userData) {
+    sdcard_transfer_status = status;
+    sdcard_transfer_done = true;
+    USDHC_ClearInterruptStatusFlags(base, kUSDHC_CommandCompleteFlag | kUSDHC_DataCompleteFlag);
+}
+
+void sdcard_dummy_callback(USDHC_Type *base, void *userData) {
+    return;
+}
+
+static status_t sdcard_transfer_blocking(USDHC_Type *base, usdhc_handle_t *handle, usdhc_transfer_t *transfer, uint32_t timeout_ms) {
+    uint32_t retry_ctr = 0UL;
+    status_t status;
+
+    usdhc_adma_config_t dma_config;
+
+    (void)memset(&dma_config, 0, sizeof(usdhc_adma_config_t));
+    dma_config.dmaMode = kUSDHC_DmaModeAdma2;
+    dma_config.burstLen = kUSDHC_EnBurstLenForINCR;
+    dma_config.admaTable = sdcard_adma_descriptor_table;
+    dma_config.admaTableWords = DMA_DESCRIPTOR_BUFFER_SIZE;
+
+    do {
+        status = USDHC_TransferNonBlocking(base, handle, &dma_config, transfer);
+        retry_ctr++;
+    } while (!(status == kStatus_Success) && (retry_ctr < 1000000UL));
+
+    if (status == kStatus_Success) {
+        for (int i = 0; i < timeout_ms * 100; i++) {
+            if ((sdcard_transfer_done == true) && (sdcard_transfer_status == kStatus_Success)) {
+                sdcard_transfer_done = false;
+                return kStatus_Success;
+            }
+            ticks_delay_us64(10);
+        }
+        return kStatus_Timeout;
+    } else {
+        return status;
+    }
+}
+
+static void sdcard_decode_csd(mimxrt_sdcard_obj_t *card, csd_t *csd) {
+    uint8_t csd_structure = 0x3 & (csd->data[3] >> 30);
+    uint8_t read_bl_len;
+    uint32_t c_size;
+    uint8_t c_size_mult;
+
+    switch (csd_structure)
+    {
+        case 0: {
+            read_bl_len = 0xF & (csd->data[2] >> 16);
+            c_size = ((0x3FF & csd->data[2]) << 30) | (0x3 & (csd->data[1] >> 30));
+            c_size_mult = 0x7 & (csd->data[1] >> 15);
+
+            card->block_len = (1U << (read_bl_len));
+            card->block_count = ((c_size + 1U) << (c_size_mult + 2U));
+
+            if (card->block_len != SDCARD_DEFAULT_BLOCK_SIZE) {
+                card->block_count = (card->block_count * card->block_len);
+                card->block_len = SDCARD_DEFAULT_BLOCK_SIZE;
+                card->block_count = (card->block_count / card->block_len);
+            }
+            break;
+        }
+        case 1: {
+            c_size = ((0x3F & csd->data[2]) << 16) | (0xFFFF & (csd->data[1] >> 16));
+
+            card->block_len = 512UL;
+            card->block_count = (uint32_t)(((uint64_t)(c_size + 1U) * (uint64_t)1024UL));
+            break;
+        }
+        case 2: {
+            c_size = ((0xFF & csd->data[2]) << 16) | (0xFFFF & (csd->data[1] >> 16));
+
+            card->block_len = 512UL;
+            card->block_count = (uint32_t)(((uint64_t)(c_size + 1U) * (uint64_t)1024UL));
+            break;
+        }
+        default: {
+            break;
+        }
+    }
+}
+
+static bool sdcard_cmd_go_idle_state(mimxrt_sdcard_obj_t *card) {
+    status_t status;
+    usdhc_command_t command = {
+        .index = SDCARD_CMD_GO_IDLE_STATE,
+        .argument = 0UL,
+        .type = kCARD_CommandTypeNormal,
+        .responseType = kCARD_ResponseTypeNone,
+    };
+    usdhc_transfer_t transfer = {
+        .data = NULL,
+        .command = &command,
+    };
+
+    status = sdcard_transfer_blocking(card->usdhc_inst, &card->handle, &transfer, 250);
+
+    if (status == kStatus_Success) {
+        return true;
+    } else {
+        return false;
+    }
+}
+
+static bool sdcard_cmd_oper_cond(mimxrt_sdcard_obj_t *card) {
+    status_t status;
+    usdhc_command_t command = {
+        .index = SDCARD_CMD_SEND_IF_COND,
+        .argument = 0x000001AAU,       // 2.7-3.3V range and 0xAA check pattern
+        .type = kCARD_CommandTypeNormal,
+        .responseType = kCARD_ResponseTypeR7,
+    };
+    usdhc_transfer_t transfer = {
+        .data = NULL,
+        .command = &command,
+    };
+
+    status = sdcard_transfer_blocking(card->usdhc_inst, &card->handle, &transfer, 250);
+
+    if (status == kStatus_Success) {
+        card->oper_cond = command.response[0];
+        return true;
+    } else {
+        return false;
+    }
+}
+
+static bool sdcard_cmd_app_cmd(mimxrt_sdcard_obj_t *card) {
+    status_t status;
+    usdhc_command_t command = {
+        .index = SDCARD_CMD_APP_CMD,
+        .argument = (card->rca << 16),
+        .type = kCARD_CommandTypeNormal,
+        .responseType = kCARD_ResponseTypeR1,
+    };
+    usdhc_transfer_t transfer = {
+        .data = NULL,
+        .command = &command,
+    };
+
+    status = sdcard_transfer_blocking(card->usdhc_inst, &card->handle, &transfer, 250);
+
+    if (status == kStatus_Success) {
+        card->status = command.response[0];
+        return true;
+    } else {
+        return false;
+    }
+}
+
+static bool sdcard_cmd_sd_app_op_cond(mimxrt_sdcard_obj_t *card, uint32_t argument) {
+    if (!sdcard_cmd_app_cmd(card)) {
+        return false;
+    }
+
+    status_t status;
+    usdhc_command_t command = {
+        .index = SDCARD_ACMD_SD_SEND_OP_COND,
+        .argument = argument,
+        .type = kCARD_CommandTypeNormal,
+        .responseType = kCARD_ResponseTypeR3,
+    };
+
+    usdhc_transfer_t transfer = {
+        .data = NULL,
+        .command = &command,
+    };
+
+    status = sdcard_transfer_blocking(card->usdhc_inst, &card->handle, &transfer, 250);
+
+    if (status == kStatus_Success) {
+        card->oper_cond = command.response[0];
+        return true;
+    } else {
+        return false;
+    }
+}
+
+static bool sdcard_cmd_all_send_cid(mimxrt_sdcard_obj_t *card, cid_t *cid) {
+    status_t status;
+    usdhc_command_t command = {
+        .index = SDCARD_CMD_ALL_SEND_CID,
+        .argument = 0UL,
+        .type = kCARD_CommandTypeNormal,
+        .responseType = kCARD_ResponseTypeR2,
+    };
+    usdhc_transfer_t transfer = {
+        .data = NULL,
+        .command = &command,
+    };
+
+    status = sdcard_transfer_blocking(card->usdhc_inst, &card->handle, &transfer, 250);
+
+    if (status == kStatus_Success) {
+        cid->mdt = (uint16_t)((command.response[0] & 0xFFF00U) >> 8U);
+        cid->psn = (uint32_t)(((command.response[1] & 0xFFFFFFU) << 8U) | ((command.response[0] & 0xFF000000U) >> 24U));
+        cid->prv = (uint8_t)((command.response[1] & 0xFF000000U) >> 24U);
+        cid->pnm[0] = (char)(command.response[2] & 0xFFU);
+        cid->pnm[1] = (char)((command.response[2] & 0xFF00U) >> 8U);
+        cid->pnm[2] = (char)((command.response[2] & 0xFF0000U) >> 16U);
+        cid->pnm[3] = (char)((command.response[2] & 0xFF000000U) >> 24U);
+        cid->pnm[4] = (char)(command.response[3] & 0xFFU);
+        cid->pnm[5] = '\0';
+        cid->oid = (uint16_t)((command.response[3] & 0xFFFF00U) >> 8U);
+        cid->mid = (uint8_t)((command.response[3] & 0xFF000000U) >> 24U);
+        return true;
+    } else {
+        return false;
+    }
+}
+
+static bool sdcard_cmd_send_cid(mimxrt_sdcard_obj_t *card, cid_t *cid) {
+    status_t status;
+    usdhc_command_t command = {
+        .index = SDCARD_CMD_SEND_CID,
+        .argument = (card->rca << 16),
+        .type = kCARD_CommandTypeNormal,
+        .responseType = kCARD_ResponseTypeR2,
+    };
+    usdhc_transfer_t transfer = {
+        .data = NULL,
+        .command = &command,
+    };
+
+    status = sdcard_transfer_blocking(card->usdhc_inst, &card->handle, &transfer, 250);
+
+    if (status == kStatus_Success) {
+        cid->mdt = (uint16_t)((command.response[0] & 0xFFF00U) >> 8U);
+        cid->psn = (uint32_t)(((command.response[1] & 0xFFFFFFU) << 8U) | ((command.response[0] & 0xFF000000U) >> 24U));
+        cid->prv = (uint8_t)((command.response[1] & 0xFF000000U) >> 24U);
+        cid->pnm[0] = (char)(command.response[2] & 0xFFU);
+        cid->pnm[1] = (char)((command.response[2] & 0xFF00U) >> 8U);
+        cid->pnm[2] = (char)((command.response[2] & 0xFF0000U) >> 16U);
+        cid->pnm[3] = (char)((command.response[2] & 0xFF000000U) >> 24U);
+        cid->pnm[4] = (char)(command.response[3] & 0xFFU);
+        cid->pnm[5] = '\0';
+        cid->oid = (uint16_t)((command.response[3] & 0xFFFF00U) >> 8U);
+        cid->mid = (uint8_t)((command.response[3] & 0xFF000000U) >> 24U);
+        return true;
+    } else {
+        return false;
+    }
+}
+
+static bool sdcard_cmd_set_rel_add(mimxrt_sdcard_obj_t *card) {
+    status_t status;
+    usdhc_command_t command = {
+        .index = SDCARD_CMD_SEND_REL_ADDR,
+        .argument = 0UL,
+        .type = kCARD_CommandTypeNormal,
+        .responseType = kCARD_ResponseTypeR6,
+    };
+    usdhc_transfer_t transfer = {
+        .data = NULL,
+        .command = &command,
+    };
+
+    status = sdcard_transfer_blocking(card->usdhc_inst, &card->handle, &transfer, 250);
+
+    if (status == kStatus_Success) {
+        card->rca = 0xFFFFFFFF & (command.response[0] >> 16);
+        return true;
+    } else {
+        return false;
+    }
+}
+
+static bool sdcard_cmd_send_csd(mimxrt_sdcard_obj_t *card, csd_t *csd) {
+    status_t status;
+    usdhc_command_t command = {
+        .index = SDCARD_CMD_SEND_CSD,
+        .argument = (card->rca << 16),
+        .type = kCARD_CommandTypeNormal,
+        .responseType = kCARD_ResponseTypeR2,
+    };
+    usdhc_transfer_t transfer = {
+        .data = NULL,
+        .command = &command,
+    };
+
+    status = sdcard_transfer_blocking(card->usdhc_inst, &card->handle, &transfer, 250);
+
+    if (status == kStatus_Success) {
+        csd->data[0] = command.response[0];
+        csd->data[1] = command.response[1];
+        csd->data[2] = command.response[2];
+        csd->data[3] = command.response[3];
+        return true;
+    } else {
+        return false;
+    }
+}
+
+static bool sdcard_cmd_select_card(mimxrt_sdcard_obj_t *card) {
+    status_t status;
+    usdhc_command_t command = {
+        .index = SDCARD_CMD_SELECT_CARD,
+        .argument = (card->rca << 16),
+        .type = kCARD_CommandTypeNormal,
+        .responseType = kCARD_ResponseTypeR1b,
+        .responseErrorFlags = SDMMC_R1_ALL_ERROR_FLAG,
+    };
+    usdhc_transfer_t transfer = {
+        .data = NULL,
+        .command = &command,
+    };
+
+    status = sdcard_transfer_blocking(card->usdhc_inst, &card->handle, &transfer, 250);
+
+    if (status == kStatus_Success) {
+        card->status = command.response[0];
+        return true;
+    } else {
+        return false;
+    }
+}
+
+static bool sdcard_cmd_set_blocklen(mimxrt_sdcard_obj_t *card) {
+    status_t status;
+    usdhc_command_t command = {
+        .index = SDCARD_CMD_SET_BLOCKLENGTH,
+        .argument = card->block_len,
+        .type = kCARD_CommandTypeNormal,
+        .responseType = kCARD_ResponseTypeR1,
+        .responseErrorFlags = SDMMC_R1_ALL_ERROR_FLAG,
+    };
+    usdhc_transfer_t transfer = {
+        .data = NULL,
+        .command = &command,
+    };
+
+    status = sdcard_transfer_blocking(card->usdhc_inst, &card->handle, &transfer, 250);
+
+    if (status == kStatus_Success) {
+        card->status = command.response[0];
+        return true;
+    } else {
+        return false;
+    }
+}
+
+static bool sdcard_cmd_set_bus_width(mimxrt_sdcard_obj_t *card, usdhc_data_bus_width_t bus_width) {
+    if (!sdcard_cmd_app_cmd(card)) {
+        return false;
+    }
+
+    status_t status;
+    usdhc_command_t command = {
+        .index = SDCARD_ACMD_SET_BUS_WIDTH,
+        .type = kCARD_CommandTypeNormal,
+        .responseType = kCARD_ResponseTypeR1,
+    };
+
+    if (bus_width == kUSDHC_DataBusWidth1Bit) {
+        command.argument = 0U;
+    } else if (bus_width == kUSDHC_DataBusWidth4Bit) {
+        command.argument = 2U;
+    } else {
+        return false;  // Invalid argument
+    }
+
+    usdhc_transfer_t transfer = {
+        .data = NULL,
+        .command = &command,
+    };
+
+    status = sdcard_transfer_blocking(card->usdhc_inst, &card->handle, &transfer, 250);
+
+    if (status == kStatus_Success) {
+        card->status = command.response[0];
+        return true;
+    } else {
+        return false;
+    }
+}
+
+static bool sdcard_reset(mimxrt_sdcard_obj_t *card) {
+    card->block_len = SDCARD_DEFAULT_BLOCK_SIZE;
+    card->rca = 0UL;
+    card->block_count = 0UL;
+    card->status = 0UL;
+    card->oper_cond = 0UL;
+    card->state->initialized = false;
+    return USDHC_Reset(card->usdhc_inst, (USDHC_SYS_CTRL_RSTA_MASK | USDHC_SYS_CTRL_RSTC_MASK | USDHC_SYS_CTRL_RSTD_MASK), 2048);
+}
+
+void sdcard_init(mimxrt_sdcard_obj_t *card, uint32_t base_clk) {
+    // Configure PFD0 of PLL2 (system PLL) fractional divider to 24 resulting in:
+    //  with PFD0_clk = PLL2_clk * 18 / N
+    //       PFD0_clk = 528MHz   * 18 / 24 = 396MHz
+    CLOCK_InitSysPfd(kCLOCK_Pfd0, 24U);
+
+    #if defined MICROPY_USDHC1 && USDHC1_AVAIL
+    // Configure USDHC clock source and divider
+    CLOCK_SetDiv(kCLOCK_Usdhc1Div, 1U);  // USDHC_input_clk = PFD0_clk / 2 = 198MHZ
+    CLOCK_SetMux(kCLOCK_Usdhc1Mux, 1U);  // Select PFD0 as clock input for USDHC
+    #endif
+
+    #if defined MICROPY_USDHC2 && USDHC2_AVAIL
+    // Configure USDHC clock source and divider
+    CLOCK_SetDiv(kCLOCK_Usdhc2Div, 1U);  // USDHC_input_clk = PFD0_clk / 2 = 198MHZ
+    CLOCK_SetMux(kCLOCK_Usdhc2Mux, 1U);  // Select PFD0 as clock input for USDHC
+    #endif
+
+    // Initialize USDHC
+    const usdhc_config_t config = {
+        .endianMode = kUSDHC_EndianModeLittle,
+        .dataTimeout = 0xFU,
+        .readWatermarkLevel = 128U,
+        .writeWatermarkLevel = 128U,
+    };
+    USDHC_Init(card->usdhc_inst, &config);
+
+    (void)sdcard_reset(card);
+    card->base_clk = base_clk;
+
+    usdhc_transfer_callback_t callbacks = {
+        .CardInserted = sdcard_card_inserted_callback,
+        .CardRemoved = sdcard_card_removed_callback,
+        .SdioInterrupt = sdcard_dummy_callback,
+        .BlockGap = sdcard_dummy_callback,
+        .TransferComplete = sdcard_transfer_complete_callback,
+        .ReTuning = sdcard_dummy_callback,
+    };
+
+    USDHC_TransferCreateHandle(card->usdhc_inst, &card->handle, &callbacks, NULL);
+}
+
+void sdcard_deinit(mimxrt_sdcard_obj_t *card) {
+    sdcard_power_off(card);
+    USDHC_Deinit(card->usdhc_inst);
+}
+
+static inline void sdcard_init_pin(const machine_pin_obj_t *pin, uint8_t af_idx, uint32_t config_value) {
+    machine_pin_af_obj_t af = pin->af_list[af_idx];
+
+    IOMUXC_SetPinMux(pin->muxRegister, af.af_mode, af.input_register, af.input_daisy, pin->configRegister, 0U);
+    IOMUXC_SetPinConfig(pin->muxRegister, af.af_mode, af.input_register, af.input_daisy, pin->configRegister, config_value);
+}
+
+void sdcard_init_pins(mimxrt_sdcard_obj_t *card) {
+    // speed and strength optimized for clock frequency < 100MHz
+    uint32_t speed = 1U;
+    uint32_t strength = 7U;
+    const mimxrt_sdcard_obj_pins_t *pins = card->pins;
+
+    uint32_t default_config = IOMUXC_SW_PAD_CTL_PAD_SPEED(speed) |
+        IOMUXC_SW_PAD_CTL_PAD_SRE_MASK |
+        IOMUXC_SW_PAD_CTL_PAD_PKE_MASK |
+        IOMUXC_SW_PAD_CTL_PAD_PUE_MASK |
+        IOMUXC_SW_PAD_CTL_PAD_HYS_MASK |
+        IOMUXC_SW_PAD_CTL_PAD_PUS(1) |
+        IOMUXC_SW_PAD_CTL_PAD_DSE(strength);
+    uint32_t no_cd_config = IOMUXC_SW_PAD_CTL_PAD_SPEED(speed) |
+        IOMUXC_SW_PAD_CTL_PAD_SRE_MASK |
+        IOMUXC_SW_PAD_CTL_PAD_PKE_MASK |
+        IOMUXC_SW_PAD_CTL_PAD_PUE_MASK |
+        IOMUXC_SW_PAD_CTL_PAD_HYS_MASK |
+        IOMUXC_SW_PAD_CTL_PAD_PUS(0) |
+        IOMUXC_SW_PAD_CTL_PAD_DSE(strength);
+
+    sdcard_init_pin(card->pins->clk.pin, card->pins->clk.af_idx, default_config);  // USDHC1_CLK
+    sdcard_init_pin(card->pins->cmd.pin, card->pins->cmd.af_idx, default_config);  // USDHC1_CMD
+    sdcard_init_pin(card->pins->data0.pin, card->pins->data0.af_idx, default_config);  // USDHC1_DATA0
+    sdcard_init_pin(card->pins->data1.pin, card->pins->data1.af_idx, default_config);  // USDHC1_DATA1
+    sdcard_init_pin(card->pins->data2.pin, card->pins->data2.af_idx, default_config);  // USDHC1_DATA2
+
+    if (pins->cd_b.pin) {
+        sdcard_init_pin(card->pins->data3.pin, card->pins->data3.af_idx, default_config);  // USDHC1_DATA3
+        sdcard_init_pin(card->pins->cd_b.pin, card->pins->cd_b.af_idx, default_config);  // USDHC1_CD_B
+        USDHC_CardDetectByData3(card->usdhc_inst, false);
+    } else {
+        sdcard_init_pin(card->pins->data3.pin, card->pins->data3.af_idx, no_cd_config);  // USDHC1_DATA3
+        USDHC_CardDetectByData3(card->usdhc_inst, true);
+    }
+}
+
+bool sdcard_read(mimxrt_sdcard_obj_t *card, uint8_t *buffer, uint32_t block_num, uint32_t block_count) {
+    if (!card->state->initialized) {
+        return false;
+    }
+
+    usdhc_data_t data = {
+        .enableAutoCommand12 = true,
+        .enableAutoCommand23 = false,
+        .enableIgnoreError = false,
+        .dataType = kUSDHC_TransferDataNormal,
+        .blockSize = card->block_len,
+        .blockCount = block_count,
+        .rxData = (uint32_t *)buffer,
+        .txData = NULL,
+    };
+
+    usdhc_command_t command = {
+        .index = (block_count == 1U) ? (uint32_t)SDCARD_CMD_READ_SINGLE_BLOCK : (uint32_t)SDCARD_CMD_READ_MULTIPLE_BLOCK,
+        .argument = block_num,
+        .type = kCARD_CommandTypeNormal,
+        .responseType = kCARD_ResponseTypeR1,
+        .responseErrorFlags = SDMMC_R1_ALL_ERROR_FLAG,
+    };
+
+    usdhc_transfer_t transfer = {
+        .data = &data,
+        .command = &command,
+    };
+
+    status_t status = sdcard_transfer_blocking(card->usdhc_inst, &card->handle, &transfer, 500);
+
+    if (status == kStatus_Success) {
+        card->status = command.response[0];
+        return true;
+    } else {
+        return false;
+    }
+}
+
+bool sdcard_write(mimxrt_sdcard_obj_t *card, uint8_t *buffer, uint32_t block_num, uint32_t block_count) {
+    if (!card->state->initialized) {
+        return false;
+    }
+
+    usdhc_data_t data = {
+        .enableAutoCommand12 = true,
+        .enableAutoCommand23 = false,
+        .enableIgnoreError = false,
+        .dataType = kUSDHC_TransferDataNormal,
+        .blockSize = card->block_len,
+        .blockCount = block_count,
+        .rxData = NULL,
+        .txData = (uint32_t *)buffer,
+    };
+
+    usdhc_command_t command = {
+        .index = (block_count == 1U) ? (uint32_t)SDCARD_CMD_WRITE_SINGLE_BLOCK : (uint32_t)SDCARD_CMD_WRITE_MULTIPLE_BLOCK,
+        .argument = block_num,
+        .type = kCARD_CommandTypeNormal,
+        .responseType = kCARD_ResponseTypeR1,
+        .responseErrorFlags = SDMMC_R1_ALL_ERROR_FLAG,
+    };
+
+    usdhc_transfer_t transfer = {
+        .data = &data,
+        .command = &command,
+    };
+
+    status_t status = sdcard_transfer_blocking(card->usdhc_inst, &card->handle, &transfer, 500);
+
+    if (status == kStatus_Success) {
+        card->status = command.response[0];
+        return true;
+    } else {
+        return false;
+    }
+}
+
+bool sdcard_set_active(mimxrt_sdcard_obj_t *card) {
+    return USDHC_SetCardActive(card->usdhc_inst, 8192);
+}
+
+bool sdcard_probe_bus_voltage(mimxrt_sdcard_obj_t *card) {
+    bool valid_voltage = false;
+    uint32_t count = 0UL;
+    bool status = false;
+
+    // Perform voltage validation
+    while ((count < SDCARD_MAX_VOLT_TRIAL) && (valid_voltage == false)) {
+        status = sdcard_cmd_sd_app_op_cond(card, (uint32_t)(SDCARD_VOLTAGE_WINDOW_SD |
+            SDCARD_HIGH_CAPACITY |
+            SDCARD_SWITCH_1_8V_CAPACITY));
+        if (status == false) {
+            return false;
+        }
+
+        /* Get operating voltage*/
+        valid_voltage = (((card->oper_cond >> 31U) == 1U) ? true : false);
+        count++;
+        ticks_delay_us64(1000);
+    }
+
+    if (count >= SDCARD_MAX_VOLT_TRIAL) {
+        return false;
+    } else {
+        return true;
+    }
+}
+
+bool sdcard_power_on(mimxrt_sdcard_obj_t *card) {
+    bool status = false;
+
+    // Check if card is already initialized and powered on
+    if (card->state->initialized) {
+        return true;
+    }
+
+    USDHC_SetDataBusWidth(card->usdhc_inst, kUSDHC_DataBusWidth1Bit);
+    card->bus_clk = USDHC_SetSdClock(card->usdhc_inst, card->base_clk, SDCARD_CLOCK_400KHZ);
+
+    // Start initialization process
+    status = sdcard_reset(card);
+    if (!status) {
+        return false;
+    }
+
+    status = sdcard_set_active(card);
+    if (!status) {
+        return false;
+    }
+
+    status = sdcard_cmd_go_idle_state(card);
+    if (!status) {
+        return false;
+    }
+
+    status = sdcard_cmd_oper_cond(card);
+    if (!status) {
+        return false;
+    }
+
+    status = sdcard_probe_bus_voltage(card);
+    if (!status) {
+        return false;
+    }
+
+    // ===
+    // Ready State
+    // ===
+    cid_t cid_all;
+    status = sdcard_cmd_all_send_cid(card, &cid_all);
+    if (!status) {
+        return false;
+    }
+
+    // ===
+    // Identification State
+    // ===
+    status = sdcard_cmd_set_rel_add(card);
+    if (!status) {
+        return false;
+    }
+
+    // ===
+    // Standby State
+    // ===
+    card->bus_clk = USDHC_SetSdClock(card->usdhc_inst, card->base_clk, SDCARD_CLOCK_50MHZ);
+
+    csd_t csd;
+    status = sdcard_cmd_send_csd(card, &csd);
+    if (!status) {
+        return false;
+    }
+    sdcard_decode_csd(card, &csd);
+
+    cid_t cid;
+    status = sdcard_cmd_send_cid(card, &cid);
+    if (!status) {
+        return false;
+    }
+
+    // ===
+    // Transfer State
+    // ===
+    status = sdcard_cmd_select_card(card);
+    if (!status) {
+        return false;
+    }
+
+    status = sdcard_cmd_set_blocklen(card);
+    if (!status) {
+        return false;
+    }
+
+    status = sdcard_cmd_set_bus_width(card, kUSDHC_DataBusWidth4Bit);
+    if (!status) {
+        return false;
+    }
+    USDHC_SetDataBusWidth(card->usdhc_inst, kUSDHC_DataBusWidth4Bit);
+
+
+    status = sdcard_cmd_set_blocklen(card);
+    if (!status) {
+        return false;
+    }
+
+    // Finialize initialization
+    card->state->initialized = true;
+    return true;
+}
+
+bool sdcard_power_off(mimxrt_sdcard_obj_t *card) {
+    (void)sdcard_cmd_go_idle_state(card);
+
+    // Reset card bus clock
+    USDHC_SetDataBusWidth(card->usdhc_inst, kUSDHC_DataBusWidth1Bit);
+    card->bus_clk = USDHC_SetSdClock(card->usdhc_inst, card->base_clk, SDCARD_CLOCK_400KHZ);
+
+    (void)sdcard_reset(card);
+    return true;
+}
+
+bool sdcard_detect(mimxrt_sdcard_obj_t *card) {
+    bool detect = false;
+
+    #if defined MICROPY_USDHC1 && USDHC1_AVAIL
+    if ((card->usdhc_inst == USDHC1) && (sdcard_usdhc1_state.inserted == true)) {
+        return true;
+    }
+    #endif
+    #if defined MICROPY_USDHC2 && USDHC2_AVAIL
+    if ((card->usdhc_inst == USDHC2) && (sdcard_usdhc2_state.inserted == true)) {
+        return true;
+    }
+    #endif
+
+    if (card->pins->cd_b.pin) {
+        detect = USDHC_DetectCardInsert(card->usdhc_inst);
+    } else {
+        USDHC_CardDetectByData3(card->usdhc_inst, true);
+        detect = (USDHC_GetPresentStatusFlags(card->usdhc_inst) & USDHC_PRES_STATE_DLSL(8)) != 0;
+    }
+
+    // Update card state when detected via pin state
+    #if defined MICROPY_USDHC1 && USDHC1_AVAIL
+    if (card->usdhc_inst == USDHC1) {
+        sdcard_usdhc1_state.inserted = detect;
+        sdcard_usdhc1_state.initialized = detect ? sdcard_usdhc1_state.initialized : false;
+    }
+    #endif
+    #if defined MICROPY_USDHC2 && USDHC2_AVAIL
+    if (card->usdhc_inst == USDHC2) {
+        sdcard_usdhc2_state.inserted = detect;
+        sdcard_usdhc2_state.initialized = detect ? sdcard_usdhc1_state.initialized : false;
+    }
+    #endif
+
+    return detect;
+}
+
+#endif // MICROPY_PY_MACHINE_SDCARD
diff --git a/ports/mimxrt/sdcard.h b/ports/mimxrt/sdcard.h
new file mode 100644
index 0000000000000..9219a42306702
--- /dev/null
+++ b/ports/mimxrt/sdcard.h
@@ -0,0 +1,111 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Philipp Ebensberger
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#ifndef MICROPY_INCLUDED_MIMXRT_SDCARD_H
+#define MICROPY_INCLUDED_MIMXRT_SDCARD_H
+
+#include "modmachine.h"
+#include "pin.h"
+#include "fsl_usdhc.h"
+
+// ---
+// SD Card public defines
+// ---
+#define SDCARD_DEFAULT_BLOCK_SIZE    (512U)
+#define SDCARD_CLOCK_400KHZ          (400000U)
+#define SDCARD_CLOCK_25MHZ           (25000000U)
+#define SDCARD_CLOCK_50MHZ           (50000000U)
+
+typedef struct _mimxrt_sdcard_pin_t {
+    const machine_pin_obj_t *pin;
+    uint8_t af_idx;
+} mimxrt_sdcard_pin_t;
+
+typedef struct _mimxrt_sdcard_obj_pins_t {
+    mimxrt_sdcard_pin_t cmd;
+    mimxrt_sdcard_pin_t clk;
+    mimxrt_sdcard_pin_t cd_b;
+    mimxrt_sdcard_pin_t data0;
+    mimxrt_sdcard_pin_t data1;
+    mimxrt_sdcard_pin_t data2;
+    mimxrt_sdcard_pin_t data3;
+} mimxrt_sdcard_obj_pins_t;
+
+typedef volatile struct _mimxrt_sdcard_status_obj_t {
+    bool initialized;
+    bool inserted;
+} mimxrt_sdcard_status_obj_t;
+
+typedef struct _mimxrt_sdcard_obj_t {
+    mp_obj_base_t base;
+    USDHC_Type *usdhc_inst;
+    usdhc_handle_t handle;
+    mimxrt_sdcard_status_obj_t *state;
+    uint16_t block_len;
+    uint32_t base_clk;
+    uint32_t bus_clk;
+    uint32_t rca;
+    uint32_t block_count;
+    uint32_t status;
+    uint32_t oper_cond;
+    const mimxrt_sdcard_obj_pins_t *pins;
+} mimxrt_sdcard_obj_t;
+
+// ---
+// SD Card object instances
+// ---
+#if MICROPY_PY_MACHINE_SDCARD && (defined MICROPY_USDHC1 || defined MICROPY_USDHC2)
+enum {
+    #if defined MICROPY_USDHC1 && USDHC1_AVAIL
+    SDCARD_OBJ_USDHC1_IDX,
+    #endif
+    #if defined MICROPY_USDHC2 && USDHC2_AVAIL
+    SDCARD_OBJ_USDHC2_IDX,
+    #endif
+    SDCARD_OBJ_USDHC_N
+};
+#endif
+extern mimxrt_sdcard_obj_t mimxrt_sdcard_objs[SDCARD_OBJ_USDHC_N];
+
+// ---
+// SD Card functions
+// ---
+void sdcard_init(mimxrt_sdcard_obj_t *card, uint32_t base_clk);
+void sdcard_deinit(mimxrt_sdcard_obj_t *card);
+void sdcard_init_pins(mimxrt_sdcard_obj_t *card);
+bool sdcard_read(mimxrt_sdcard_obj_t *card, uint8_t *buffer, uint32_t block_num, uint32_t block_count);
+bool sdcard_write(mimxrt_sdcard_obj_t *card, uint8_t *buffer, uint32_t block_num, uint32_t block_count);
+bool sdcard_set_active(mimxrt_sdcard_obj_t *card);
+bool sdcard_volt_validation(mimxrt_sdcard_obj_t *card);
+bool sdcard_power_on(mimxrt_sdcard_obj_t *self);
+bool sdcard_power_off(mimxrt_sdcard_obj_t *self);
+bool sdcard_detect(mimxrt_sdcard_obj_t *self);
+
+static inline bool sdcard_state_initialized(mimxrt_sdcard_obj_t *card) {
+    return card->state->initialized;
+}
+
+#endif // MICROPY_INCLUDED_MIMXRT_SDCARD_H

From 61b7c098b9a21311bbcec3b43c279ec9aada311b Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Thu, 19 Aug 2021 22:00:38 +0200
Subject: [PATCH 1256/3533] mimxrt/machine_bitstream: Add bitstream function to
 machine module.

Following the code example for ESP32 of Jim Mussard.

As a side effect:
- mp_hal_ticks_cpu() was implemented,
- mp_hal_get_cpu_freq() and mp_hal_ticks_cpu_init() were added and used.
- mp_hal_pin_high() and mp_hal_pin_low() were changed for symmetry
---
 ports/mimxrt/Makefile            |  1 +
 ports/mimxrt/machine_bitstream.c | 73 ++++++++++++++++++++++++++++++++
 ports/mimxrt/modmachine.c        |  6 ++-
 ports/mimxrt/mpconfigport.h      |  1 +
 ports/mimxrt/mphalport.h         | 15 +++++--
 5 files changed, 92 insertions(+), 4 deletions(-)
 create mode 100644 ports/mimxrt/machine_bitstream.c

diff --git a/ports/mimxrt/Makefile b/ports/mimxrt/Makefile
index 58fbe2df33e47..8b1bb2bfa7189 100644
--- a/ports/mimxrt/Makefile
+++ b/ports/mimxrt/Makefile
@@ -152,6 +152,7 @@ SRC_C += \
 	fatfs_port.c \
 	led.c \
 	machine_adc.c \
+	machine_bitstream.c \
 	machine_i2c.c \
 	machine_led.c \
 	machine_pin.c \
diff --git a/ports/mimxrt/machine_bitstream.c b/ports/mimxrt/machine_bitstream.c
new file mode 100644
index 0000000000000..c6ff469ea69a3
--- /dev/null
+++ b/ports/mimxrt/machine_bitstream.c
@@ -0,0 +1,73 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Jim Mussared
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+// This is a translation of the cycle counter implementation in ports/stm32/machine_bitstream.c.
+
+#include "py/mpconfig.h"
+#include "py/mphal.h"
+
+#if MICROPY_PY_MACHINE_BITSTREAM
+
+#define NS_TICKS_OVERHEAD (6)
+
+void machine_bitstream_high_low(mp_hal_pin_obj_t pin, uint32_t *timing_ns, const uint8_t *buf, size_t len) __attribute__((section(".ram_functions")));
+void machine_bitstream_high_low(mp_hal_pin_obj_t pin, uint32_t *timing_ns, const uint8_t *buf, size_t len) {
+    uint32_t fcpu_mhz = mp_hal_get_cpu_freq() / 1000000;
+    // Convert ns to us ticks [high_time_0, period_0, high_time_1, period_1].
+    for (size_t i = 0; i < 4; ++i) {
+        timing_ns[i] = fcpu_mhz * timing_ns[i] / 1000;
+        if (timing_ns[i] > NS_TICKS_OVERHEAD) {
+            timing_ns[i] -= NS_TICKS_OVERHEAD;
+        }
+        if (i % 2 == 1) {
+            // Convert low_time to period (i.e. add high_time).
+            timing_ns[i] += timing_ns[i - 1];
+        }
+    }
+    // Enable the CPU cycle counter, which is not always enabled.
+    mp_hal_ticks_cpu_init();
+
+    uint32_t irq_state = mp_hal_quiet_timing_enter();
+
+    for (size_t i = 0; i < len; ++i) {
+        uint8_t b = buf[i];
+        for (size_t j = 0; j < 8; ++j) {
+            uint32_t start_ticks = mp_hal_ticks_cpu();
+            mp_hal_pin_high(pin);
+            uint32_t *t = &timing_ns[b >> 6 & 2];
+            while ((mp_hal_ticks_cpu() - start_ticks) < t[0]) {
+            }
+            mp_hal_pin_low(pin);
+            b <<= 1;
+            while ((mp_hal_ticks_cpu() - start_ticks) < t[1]) {
+            }
+        }
+    }
+
+    mp_hal_quiet_timing_exit(irq_state);
+}
+
+#endif // MICROPY_PY_MACHINE_BITSTREAM
diff --git a/ports/mimxrt/modmachine.c b/ports/mimxrt/modmachine.c
index a98d09bd0e634..2e8753df122bf 100644
--- a/ports/mimxrt/modmachine.c
+++ b/ports/mimxrt/modmachine.c
@@ -26,6 +26,7 @@
  */
 
 #include "py/runtime.h"
+#include "extmod/machine_bitstream.h"
 #include "extmod/machine_mem.h"
 #include "extmod/machine_i2c.h"
 #include "extmod/machine_pulse.h"
@@ -45,7 +46,7 @@ STATIC mp_obj_t machine_reset(void) {
 MP_DEFINE_CONST_FUN_OBJ_0(machine_reset_obj, machine_reset);
 
 STATIC mp_obj_t machine_freq(void) {
-    return MP_OBJ_NEW_SMALL_INT(CLOCK_GetFreq(kCLOCK_CpuClk));
+    return MP_OBJ_NEW_SMALL_INT(mp_hal_get_cpu_freq());
 }
 MP_DEFINE_CONST_FUN_OBJ_0(machine_freq_obj, machine_freq);
 
@@ -97,6 +98,9 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_disable_irq),         MP_ROM_PTR(&machine_disable_irq_obj) },
     { MP_ROM_QSTR(MP_QSTR_enable_irq),          MP_ROM_PTR(&machine_enable_irq_obj) },
 
+    #if MICROPY_PY_MACHINE_BITSTREAM
+    { MP_ROM_QSTR(MP_QSTR_bitstream),           MP_ROM_PTR(&machine_bitstream_obj) },
+    #endif
     { MP_ROM_QSTR(MP_QSTR_time_pulse_us),       MP_ROM_PTR(&machine_time_pulse_us_obj) },
 };
 STATIC MP_DEFINE_CONST_DICT(machine_module_globals, machine_module_globals_table);
diff --git a/ports/mimxrt/mpconfigport.h b/ports/mimxrt/mpconfigport.h
index 9775b29efa22a..0fe6cd129154f 100644
--- a/ports/mimxrt/mpconfigport.h
+++ b/ports/mimxrt/mpconfigport.h
@@ -124,6 +124,7 @@ uint32_t trng_random_u32(void);
 #define MICROPY_PY_USELECT                  (1)
 #define MICROPY_PY_MACHINE                  (1)
 #define MICROPY_PY_MACHINE_PIN_MAKE_NEW     mp_pin_make_new
+#define MICROPY_PY_MACHINE_BITSTREAM        (1)
 #define MICROPY_PY_MACHINE_PULSE            (1)
 #define MICROPY_PY_MACHINE_I2C              (1)
 #define MICROPY_PY_MACHINE_SOFTI2C          (1)
diff --git a/ports/mimxrt/mphalport.h b/ports/mimxrt/mphalport.h
index 94f43001d0d67..3f0ae51bb663a 100644
--- a/ports/mimxrt/mphalport.h
+++ b/ports/mimxrt/mphalport.h
@@ -30,6 +30,7 @@
 #include <stdint.h>
 #include "ticks.h"
 #include "pin.h"
+#include "fsl_clock.h"
 
 #define MP_HAL_PIN_FMT                  "%q"
 
@@ -39,8 +40,8 @@
 #define mp_hal_pin_input(p) machine_pin_set_mode(p, PIN_MODE_IN);
 #define mp_hal_pin_output(p) machine_pin_set_mode(p, PIN_MODE_OUT);
 #define mp_hal_pin_open_drain(p) machine_pin_set_mode(p, PIN_MODE_OPEN_DRAIN);
-#define mp_hal_pin_high(p) (GPIO_PinWrite(p->gpio, p->pin, 1U))
-#define mp_hal_pin_low(p) (GPIO_PinWrite(p->gpio, p->pin, 0U))
+#define mp_hal_pin_high(p) (p->gpio->DR_SET = 1 << p->pin)
+#define mp_hal_pin_low(p) (p->gpio->DR_CLEAR = 1 << p->pin)
 #define mp_hal_pin_write(p, value) (GPIO_PinWrite(p->gpio, p->pin, value))
 #define mp_hal_pin_toggle(p) (GPIO_PortToggle(p->gpio, (1 << p->pin)))
 #define mp_hal_pin_read(p) (GPIO_PinReadPadStatus(p->gpio, p->pin))
@@ -72,8 +73,16 @@ static inline void mp_hal_delay_us(mp_uint_t us) {
 
 #define mp_hal_delay_us_fast(us) mp_hal_delay_us(us)
 
+static inline void mp_hal_ticks_cpu_init(void) {
+    DWT->CTRL |= DWT_CTRL_CYCCNTENA_Msk;
+}
+
 static inline mp_uint_t mp_hal_ticks_cpu(void) {
-    return 0;
+    return DWT->CYCCNT;
+}
+
+static inline mp_uint_t mp_hal_get_cpu_freq(void) {
+    return CLOCK_GetCpuClkFreq();
 }
 
 

From e6850838cdc1a0e0fe8e735a03e7df46d0dcdd0e Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 23 Mar 2021 12:48:35 +1100
Subject: [PATCH 1257/3533] py/parse: Simplify parse nodes representing a list.

This commit simplifies and optimises the parse tree in-memory
representation of lists of expressions, for tuples and lists, and when
tuples are used on the left-hand-side of assignments and within del
statements.  This reduces memory usage of the parse tree when such code is
compiled, and also reduces the size of the compiler.

For example, (1,) was previously the following parse tree:

    expr_stmt(5) (n=2)
      atom_paren(45) (n=1)
        testlist_comp(146) (n=2)
          int(1)
          testlist_comp_3b(149) (n=1)
            NULL
      NULL

and with this commit is now:

    expr_stmt(5) (n=2)
      atom_paren(45) (n=1)
        testlist_comp(146) (n=1)
          int(1)
      NULL

Similarly, (1, 2, 3) was previously:

    expr_stmt(5) (n=2)
      atom_paren(45) (n=1)
        testlist_comp(146) (n=2)
          int(1)
          testlist_comp_3c(150) (n=2)
            int(2)
            int(3)
      NULL

and is now:

    expr_stmt(5) (n=2)
      atom_paren(45) (n=1)
        testlist_comp(146) (n=3)
          int(1)
          int(2)
          int(3)
      NULL

Signed-off-by: Damien George <damien@micropython.org>
---
 py/compile.c | 169 ++++++++++++---------------------------------------
 py/parse.c   |  38 +++++++++++-
 2 files changed, 75 insertions(+), 132 deletions(-)

diff --git a/py/compile.c b/py/compile.c
index 0b02746a5644c..8ebcc2289fe63 100644
--- a/py/compile.c
+++ b/py/compile.c
@@ -59,6 +59,12 @@ typedef enum {
 #undef DEF_RULE_NC
 } pn_kind_t;
 
+// Whether a mp_parse_node_struct_t that has pns->kind == PN_testlist_comp
+// corresponds to a list comprehension or generator.
+#define MP_PARSE_NODE_TESTLIST_COMP_HAS_COMP_FOR(pns) \
+    (MP_PARSE_NODE_STRUCT_NUM_NODES(pns) == 2 && \
+    MP_PARSE_NODE_IS_STRUCT_KIND(pns->nodes[1], PN_comp_for))
+
 #define NEED_METHOD_TABLE MICROPY_EMIT_NATIVE
 
 #if NEED_METHOD_TABLE
@@ -317,25 +323,13 @@ STATIC void compile_delete_id(compiler_t *comp, qstr qst) {
     }
 }
 
-STATIC void c_tuple(compiler_t *comp, mp_parse_node_t pn, mp_parse_node_struct_t *pns_list) {
-    int total = 0;
-    if (!MP_PARSE_NODE_IS_NULL(pn)) {
-        compile_node(comp, pn);
-        total += 1;
-    }
-    if (pns_list != NULL) {
-        int n = MP_PARSE_NODE_STRUCT_NUM_NODES(pns_list);
-        for (int i = 0; i < n; i++) {
-            compile_node(comp, pns_list->nodes[i]);
-        }
-        total += n;
-    }
-    EMIT_ARG(build, total, MP_EMIT_BUILD_TUPLE);
-}
-
 STATIC void compile_generic_tuple(compiler_t *comp, mp_parse_node_struct_t *pns) {
     // a simple tuple expression
-    c_tuple(comp, MP_PARSE_NODE_NULL, pns);
+    size_t num_nodes = MP_PARSE_NODE_STRUCT_NUM_NODES(pns);
+    for (size_t i = 0; i < num_nodes; i++) {
+        compile_node(comp, pns->nodes[i]);
+    }
+    EMIT_ARG(build, num_nodes, MP_EMIT_BUILD_TUPLE);
 }
 
 STATIC void c_if_cond(compiler_t *comp, mp_parse_node_t pn, bool jump_if, int label) {
@@ -452,21 +446,14 @@ STATIC void c_assign_atom_expr(compiler_t *comp, mp_parse_node_struct_t *pns, as
     compile_syntax_error(comp, (mp_parse_node_t)pns, MP_ERROR_TEXT("can't assign to expression"));
 }
 
-// we need to allow for a caller passing in 1 initial node (node_head) followed by an array of nodes (nodes_tail)
-STATIC void c_assign_tuple(compiler_t *comp, mp_parse_node_t node_head, uint num_tail, mp_parse_node_t *nodes_tail) {
-    uint num_head = (node_head == MP_PARSE_NODE_NULL) ? 0 : 1;
-
+STATIC void c_assign_tuple(compiler_t *comp, uint num_tail, mp_parse_node_t *nodes_tail) {
     // look for star expression
     uint have_star_index = -1;
-    if (num_head != 0 && MP_PARSE_NODE_IS_STRUCT_KIND(node_head, PN_star_expr)) {
-        EMIT_ARG(unpack_ex, 0, num_tail);
-        have_star_index = 0;
-    }
     for (uint i = 0; i < num_tail; i++) {
         if (MP_PARSE_NODE_IS_STRUCT_KIND(nodes_tail[i], PN_star_expr)) {
             if (have_star_index == (uint)-1) {
-                EMIT_ARG(unpack_ex, num_head + i, num_tail - i - 1);
-                have_star_index = num_head + i;
+                EMIT_ARG(unpack_ex, i, num_tail - i - 1);
+                have_star_index = i;
             } else {
                 compile_syntax_error(comp, nodes_tail[i], MP_ERROR_TEXT("multiple *x in assignment"));
                 return;
@@ -474,17 +461,10 @@ STATIC void c_assign_tuple(compiler_t *comp, mp_parse_node_t node_head, uint num
         }
     }
     if (have_star_index == (uint)-1) {
-        EMIT_ARG(unpack_sequence, num_head + num_tail);
-    }
-    if (num_head != 0) {
-        if (0 == have_star_index) {
-            c_assign(comp, ((mp_parse_node_struct_t *)node_head)->nodes[0], ASSIGN_STORE);
-        } else {
-            c_assign(comp, node_head, ASSIGN_STORE);
-        }
+        EMIT_ARG(unpack_sequence, num_tail);
     }
     for (uint i = 0; i < num_tail; i++) {
-        if (num_head + i == have_star_index) {
+        if (i == have_star_index) {
             c_assign(comp, ((mp_parse_node_struct_t *)nodes_tail[i])->nodes[0], ASSIGN_STORE);
         } else {
             c_assign(comp, nodes_tail[i], ASSIGN_STORE);
@@ -526,7 +506,7 @@ STATIC void c_assign(compiler_t *comp, mp_parse_node_t pn, assign_kind_t assign_
                 if (assign_kind != ASSIGN_STORE) {
                     goto cannot_assign;
                 }
-                c_assign_tuple(comp, MP_PARSE_NODE_NULL, MP_PARSE_NODE_STRUCT_NUM_NODES(pns), pns->nodes);
+                c_assign_tuple(comp, MP_PARSE_NODE_STRUCT_NUM_NODES(pns), pns->nodes);
                 break;
 
             case PN_atom_paren:
@@ -551,13 +531,13 @@ STATIC void c_assign(compiler_t *comp, mp_parse_node_t pn, assign_kind_t assign_
                 }
                 if (MP_PARSE_NODE_IS_NULL(pns->nodes[0])) {
                     // empty list, assignment allowed
-                    c_assign_tuple(comp, MP_PARSE_NODE_NULL, 0, NULL);
+                    c_assign_tuple(comp, 0, NULL);
                 } else if (MP_PARSE_NODE_IS_STRUCT_KIND(pns->nodes[0], PN_testlist_comp)) {
                     pns = (mp_parse_node_struct_t *)pns->nodes[0];
                     goto testlist_comp;
                 } else {
                     // brackets around 1 item
-                    c_assign_tuple(comp, pns->nodes[0], 0, NULL);
+                    c_assign_tuple(comp, 1, pns->nodes);
                 }
                 break;
 
@@ -568,27 +548,10 @@ STATIC void c_assign(compiler_t *comp, mp_parse_node_t pn, assign_kind_t assign_
 
     testlist_comp:
         // lhs is a sequence
-        if (MP_PARSE_NODE_IS_STRUCT(pns->nodes[1])) {
-            mp_parse_node_struct_t *pns2 = (mp_parse_node_struct_t *)pns->nodes[1];
-            if (MP_PARSE_NODE_STRUCT_KIND(pns2) == PN_testlist_comp_3b) {
-                // sequence of one item, with trailing comma
-                assert(MP_PARSE_NODE_IS_NULL(pns2->nodes[0]));
-                c_assign_tuple(comp, pns->nodes[0], 0, NULL);
-            } else if (MP_PARSE_NODE_STRUCT_KIND(pns2) == PN_testlist_comp_3c) {
-                // sequence of many items
-                uint n = MP_PARSE_NODE_STRUCT_NUM_NODES(pns2);
-                c_assign_tuple(comp, pns->nodes[0], n, pns2->nodes);
-            } else if (MP_PARSE_NODE_STRUCT_KIND(pns2) == PN_comp_for) {
-                goto cannot_assign;
-            } else {
-                // sequence with 2 items
-                goto sequence_with_2_items;
-            }
-        } else {
-            // sequence with 2 items
-        sequence_with_2_items:
-            c_assign_tuple(comp, MP_PARSE_NODE_NULL, 2, pns->nodes);
+        if (MP_PARSE_NODE_TESTLIST_COMP_HAS_COMP_FOR(pns)) {
+            goto cannot_assign;
         }
+        c_assign_tuple(comp, MP_PARSE_NODE_STRUCT_NUM_NODES(pns), pns->nodes);
         return;
     }
     return;
@@ -983,32 +946,11 @@ STATIC void c_del_stmt(compiler_t *comp, mp_parse_node_t pn) {
         } else {
             assert(MP_PARSE_NODE_IS_STRUCT_KIND(pn, PN_testlist_comp));
             mp_parse_node_struct_t *pns = (mp_parse_node_struct_t *)pn;
-            // TODO perhaps factorise testlist_comp code with other uses of PN_testlist_comp
-
-            if (MP_PARSE_NODE_IS_STRUCT(pns->nodes[1])) {
-                mp_parse_node_struct_t *pns1 = (mp_parse_node_struct_t *)pns->nodes[1];
-                if (MP_PARSE_NODE_STRUCT_KIND(pns1) == PN_testlist_comp_3b) {
-                    // sequence of one item, with trailing comma
-                    assert(MP_PARSE_NODE_IS_NULL(pns1->nodes[0]));
-                    c_del_stmt(comp, pns->nodes[0]);
-                } else if (MP_PARSE_NODE_STRUCT_KIND(pns1) == PN_testlist_comp_3c) {
-                    // sequence of many items
-                    int n = MP_PARSE_NODE_STRUCT_NUM_NODES(pns1);
-                    c_del_stmt(comp, pns->nodes[0]);
-                    for (int i = 0; i < n; i++) {
-                        c_del_stmt(comp, pns1->nodes[i]);
-                    }
-                } else if (MP_PARSE_NODE_STRUCT_KIND(pns1) == PN_comp_for) {
-                    goto cannot_delete;
-                } else {
-                    // sequence with 2 items
-                    goto sequence_with_2_items;
-                }
-            } else {
-                // sequence with 2 items
-            sequence_with_2_items:
-                c_del_stmt(comp, pns->nodes[0]);
-                c_del_stmt(comp, pns->nodes[1]);
+            if (MP_PARSE_NODE_TESTLIST_COMP_HAS_COMP_FOR(pns)) {
+                goto cannot_delete;
+            }
+            for (size_t i = 0; i < MP_PARSE_NODE_STRUCT_NUM_NODES(pns); ++i) {
+                c_del_stmt(comp, pns->nodes[i]);
             }
         }
     } else {
@@ -2490,31 +2432,16 @@ STATIC void compile_comprehension(compiler_t *comp, mp_parse_node_struct_t *pns,
 STATIC void compile_atom_paren(compiler_t *comp, mp_parse_node_struct_t *pns) {
     if (MP_PARSE_NODE_IS_NULL(pns->nodes[0])) {
         // an empty tuple
-        c_tuple(comp, MP_PARSE_NODE_NULL, NULL);
+        EMIT_ARG(build, 0, MP_EMIT_BUILD_TUPLE);
     } else {
         assert(MP_PARSE_NODE_IS_STRUCT_KIND(pns->nodes[0], PN_testlist_comp));
         pns = (mp_parse_node_struct_t *)pns->nodes[0];
-        assert(!MP_PARSE_NODE_IS_NULL(pns->nodes[1]));
-        if (MP_PARSE_NODE_IS_STRUCT(pns->nodes[1])) {
-            mp_parse_node_struct_t *pns2 = (mp_parse_node_struct_t *)pns->nodes[1];
-            if (MP_PARSE_NODE_STRUCT_KIND(pns2) == PN_testlist_comp_3b) {
-                // tuple of one item, with trailing comma
-                assert(MP_PARSE_NODE_IS_NULL(pns2->nodes[0]));
-                c_tuple(comp, pns->nodes[0], NULL);
-            } else if (MP_PARSE_NODE_STRUCT_KIND(pns2) == PN_testlist_comp_3c) {
-                // tuple of many items
-                c_tuple(comp, pns->nodes[0], pns2);
-            } else if (MP_PARSE_NODE_STRUCT_KIND(pns2) == PN_comp_for) {
-                // generator expression
-                compile_comprehension(comp, pns, SCOPE_GEN_EXPR);
-            } else {
-                // tuple with 2 items
-                goto tuple_with_2_items;
-            }
+        if (MP_PARSE_NODE_TESTLIST_COMP_HAS_COMP_FOR(pns)) {
+            // generator expression
+            compile_comprehension(comp, pns, SCOPE_GEN_EXPR);
         } else {
-            // tuple with 2 items
-        tuple_with_2_items:
-            c_tuple(comp, MP_PARSE_NODE_NULL, pns);
+            // tuple with N items
+            compile_generic_tuple(comp, pns);
         }
     }
 }
@@ -2525,31 +2452,13 @@ STATIC void compile_atom_bracket(compiler_t *comp, mp_parse_node_struct_t *pns)
         EMIT_ARG(build, 0, MP_EMIT_BUILD_LIST);
     } else if (MP_PARSE_NODE_IS_STRUCT_KIND(pns->nodes[0], PN_testlist_comp)) {
         mp_parse_node_struct_t *pns2 = (mp_parse_node_struct_t *)pns->nodes[0];
-        if (MP_PARSE_NODE_IS_STRUCT(pns2->nodes[1])) {
-            mp_parse_node_struct_t *pns3 = (mp_parse_node_struct_t *)pns2->nodes[1];
-            if (MP_PARSE_NODE_STRUCT_KIND(pns3) == PN_testlist_comp_3b) {
-                // list of one item, with trailing comma
-                assert(MP_PARSE_NODE_IS_NULL(pns3->nodes[0]));
-                compile_node(comp, pns2->nodes[0]);
-                EMIT_ARG(build, 1, MP_EMIT_BUILD_LIST);
-            } else if (MP_PARSE_NODE_STRUCT_KIND(pns3) == PN_testlist_comp_3c) {
-                // list of many items
-                compile_node(comp, pns2->nodes[0]);
-                compile_generic_all_nodes(comp, pns3);
-                EMIT_ARG(build, 1 + MP_PARSE_NODE_STRUCT_NUM_NODES(pns3), MP_EMIT_BUILD_LIST);
-            } else if (MP_PARSE_NODE_STRUCT_KIND(pns3) == PN_comp_for) {
-                // list comprehension
-                compile_comprehension(comp, pns2, SCOPE_LIST_COMP);
-            } else {
-                // list with 2 items
-                goto list_with_2_items;
-            }
+        if (MP_PARSE_NODE_TESTLIST_COMP_HAS_COMP_FOR(pns2)) {
+            // list comprehension
+            compile_comprehension(comp, pns2, SCOPE_LIST_COMP);
         } else {
-            // list with 2 items
-        list_with_2_items:
-            compile_node(comp, pns2->nodes[0]);
-            compile_node(comp, pns2->nodes[1]);
-            EMIT_ARG(build, 2, MP_EMIT_BUILD_LIST);
+            // list with N items
+            compile_generic_all_nodes(comp, pns2);
+            EMIT_ARG(build, MP_PARSE_NODE_STRUCT_NUM_NODES(pns2), MP_EMIT_BUILD_LIST);
         }
     } else {
         // list with 1 item
diff --git a/py/parse.c b/py/parse.c
index ae3fa8ea6d00a..68c761734a9a1 100644
--- a/py/parse.c
+++ b/py/parse.c
@@ -796,9 +796,11 @@ STATIC bool fold_constants(parser_t *parser, uint8_t rule_id, size_t num_args) {
 #endif
 
 STATIC void push_result_rule(parser_t *parser, size_t src_line, uint8_t rule_id, size_t num_args) {
-    // optimise away parenthesis around an expression if possible
+    // Simplify and optimise certain rules, to reduce memory usage and simplify the compiler.
     if (rule_id == RULE_atom_paren) {
-        // there should be just 1 arg for this rule
+        // Remove parenthesis around a single expression if possible.
+        // This atom_paren rule always has a single argument, and after this
+        // optimisation that argument is either NULL or testlist_comp.
         mp_parse_node_t pn = peek_result(parser, 0);
         if (MP_PARSE_NODE_IS_NULL(pn)) {
             // need to keep parenthesis for ()
@@ -808,6 +810,34 @@ STATIC void push_result_rule(parser_t *parser, size_t src_line, uint8_t rule_id,
             // parenthesis around a single expression, so it's just the expression
             return;
         }
+    } else if (rule_id == RULE_testlist_comp) {
+        // The testlist_comp rule can be the sole argument to either atom_parent
+        // or atom_bracket, for (...) and [...] respectively.
+        assert(num_args == 2);
+        mp_parse_node_t pn = peek_result(parser, 0);
+        if (MP_PARSE_NODE_IS_STRUCT(pn)) {
+            mp_parse_node_struct_t *pns = (mp_parse_node_struct_t *)pn;
+            if (MP_PARSE_NODE_STRUCT_KIND(pns) == RULE_testlist_comp_3b) {
+                // tuple of one item, with trailing comma
+                pop_result(parser);
+                --num_args;
+            } else if (MP_PARSE_NODE_STRUCT_KIND(pns) == RULE_testlist_comp_3c) {
+                // tuple of many items, convert testlist_comp_3c to testlist_comp
+                pop_result(parser);
+                assert(pn == peek_result(parser, 0));
+                pns->kind_num_nodes = rule_id | MP_PARSE_NODE_STRUCT_NUM_NODES(pns) << 8;
+                return;
+            } else if (MP_PARSE_NODE_STRUCT_KIND(pns) == RULE_comp_for) {
+                // generator expression
+            } else {
+                // tuple with 2 items
+            }
+        } else {
+            // tuple with 2 items
+        }
+    } else if (rule_id == RULE_testlist_comp_3c) {
+        // steal first arg of outer testlist_comp rule
+        ++num_args;
     }
 
     #if MICROPY_COMP_CONST_FOLDING
@@ -827,6 +857,10 @@ STATIC void push_result_rule(parser_t *parser, size_t src_line, uint8_t rule_id,
     for (size_t i = num_args; i > 0; i--) {
         pn->nodes[i - 1] = pop_result(parser);
     }
+    if (rule_id == RULE_testlist_comp_3c) {
+        // need to push something non-null to replace stolen first arg of testlist_comp
+        push_result_node(parser, (mp_parse_node_t)pn);
+    }
     push_result_node(parser, (mp_parse_node_t)pn);
 }
 

From 318c029d4569488df97661018fdce0e2c1443a79 Mon Sep 17 00:00:00 2001
From: stijn <stijn@ignitron.net>
Date: Tue, 7 Sep 2021 11:36:58 +0200
Subject: [PATCH 1258/3533] windows/README: Remove unsupported Python
 instructions for Cygwin.

It's not possible anymore to build MicroPython on Cygwin using a
standard Windows installation of Python so don't advertise that.
Specifically: preprocessing in makeqstrdefs.py fails on the subprocess
call with 'gcc: fatal error: no input files' because one of the flags
contains double quotes and that somehow messes up the commandline.
---
 ports/windows/README.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/ports/windows/README.md b/ports/windows/README.md
index 553e87513e737..55e23de7bf15a 100644
--- a/ports/windows/README.md
+++ b/ports/windows/README.md
@@ -25,8 +25,7 @@ Install Cygwin, then install following packages using Cygwin's setup.exe:
 * mingw64-i686-gcc-core
 * mingw64-x86_64-gcc-core
 * make
-
-Also install the python3 package, or install Python globally for Windows (see below).
+* python3
 
 Build using:
 

From cc0884bb4fe7ad5087030323cfae0bf800e432b5 Mon Sep 17 00:00:00 2001
From: Peter Hinch <peter@hinch.me.uk>
Date: Tue, 7 Sep 2021 07:56:26 +0100
Subject: [PATCH 1259/3533] docs/library/os.rst: Clarify littlefs requirements
 for block erase.

---
 docs/library/os.rst | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/docs/library/os.rst b/docs/library/os.rst
index a1eae4f245708..19652ee2bc5ef 100644
--- a/docs/library/os.rst
+++ b/docs/library/os.rst
@@ -314,6 +314,12 @@ that the block device supports the extended interface.
        ``ioctl(6, ...)`` must also be intercepted. The need for others is
        hardware dependent.
 
+       Prior to any call to ``writeblocks(block, ...)`` littlefs issues
+       ``ioctl(6, block)``. This enables a device driver to erase the block
+       prior to a write if the hardware requires it. Alternatively a driver
+       might intercept ``ioctl(6, block)`` and return 0 (success). In this case
+       the driver assumes responsibility for detecting the need for erasure.
+
        Unless otherwise stated ``ioctl(op, arg)`` can return ``None``.
        Consequently an implementation can ignore unused values of ``op``. Where
        ``op`` is intercepted, the return value for operations 4 and 5 are as

From 60d3a3c3a0746312f4fd46c56d206ffad1c57796 Mon Sep 17 00:00:00 2001
From: Matt Trentini <matt.trentini@gmail.com>
Date: Thu, 9 Sep 2021 12:52:32 +1000
Subject: [PATCH 1260/3533] docs/library/bluetooth.rst: Update incorrect link
 to gatts_write.

---
 docs/library/bluetooth.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/library/bluetooth.rst b/docs/library/bluetooth.rst
index 7ab4d6e88c945..6ebceeed581d6 100644
--- a/docs/library/bluetooth.rst
+++ b/docs/library/bluetooth.rst
@@ -49,7 +49,7 @@ Configuration
     - ``'mac'``: The current address in use, depending on the current address mode.
       This returns a tuple of ``(addr_type, addr)``.
 
-      See :meth:`gatts_write <BLE.gap_scan>` for details about address type.
+      See :meth:`gatts_write <BLE.gatts_write>` for details about address type.
 
       This may only be queried while the interface is currently active.
 

From 9a7f77bfbc51f4dda5a9396d8bb4b57dcdfcdb90 Mon Sep 17 00:00:00 2001
From: Seon Rozenblum <seon@unexpectedmaker.com>
Date: Sat, 4 Sep 2021 10:41:25 +1000
Subject: [PATCH 1261/3533] esp32/boards: Add new FeatherS2-Neo board
 definition.

---
 .../esp32/boards/UM_FEATHERS2NEO/manifest.py  |  2 +
 .../UM_FEATHERS2NEO/modules/feathers2neo.py   | 90 +++++++++++++++++++
 .../UM_FEATHERS2NEO/mpconfigboard.cmake       |  8 ++
 .../boards/UM_FEATHERS2NEO/mpconfigboard.h    | 12 +++
 .../boards/UM_FEATHERS2NEO/sdkconfig.board    |  8 ++
 tools/autobuild/build-esp32-latest.sh         |  1 +
 6 files changed, 121 insertions(+)
 create mode 100644 ports/esp32/boards/UM_FEATHERS2NEO/manifest.py
 create mode 100644 ports/esp32/boards/UM_FEATHERS2NEO/modules/feathers2neo.py
 create mode 100644 ports/esp32/boards/UM_FEATHERS2NEO/mpconfigboard.cmake
 create mode 100644 ports/esp32/boards/UM_FEATHERS2NEO/mpconfigboard.h
 create mode 100644 ports/esp32/boards/UM_FEATHERS2NEO/sdkconfig.board

diff --git a/ports/esp32/boards/UM_FEATHERS2NEO/manifest.py b/ports/esp32/boards/UM_FEATHERS2NEO/manifest.py
new file mode 100644
index 0000000000000..7ae2ed15d9169
--- /dev/null
+++ b/ports/esp32/boards/UM_FEATHERS2NEO/manifest.py
@@ -0,0 +1,2 @@
+include("$(PORT_DIR)/boards/manifest.py")
+freeze("modules")
diff --git a/ports/esp32/boards/UM_FEATHERS2NEO/modules/feathers2neo.py b/ports/esp32/boards/UM_FEATHERS2NEO/modules/feathers2neo.py
new file mode 100644
index 0000000000000..857c7559d1ac8
--- /dev/null
+++ b/ports/esp32/boards/UM_FEATHERS2NEO/modules/feathers2neo.py
@@ -0,0 +1,90 @@
+# FeatherS2 Neo MicroPython Helper Library
+# 2021 Seon Rozenblum - Unexpected Maker
+#
+# Project home:
+#   https://unexpectedmaker.com/feathers2-neo
+#
+# 2021-Sep-04 - v0.1 - Initial implementation
+
+# Import required libraries
+from micropython import const
+from machine import Pin, ADC
+import machine, time
+
+# FeatherS2 Neo Hardware Pin Assignments
+
+# Sense Pins
+VBUS_SENSE = const(34)
+VBAT_SENSE = const(2)
+
+# RGB LED Pins
+RGB_DATA = const(40)
+RGB_PWR = const(39)
+
+# RGB MATRIX LED Pins
+RGB_MATRIX_DATA = const(21)
+RGB_MATRIX_PWR = const(4)
+
+# SPI
+SPI_MOSI = const(35)
+SPI_MISO = const(37)
+SPI_CLK = const(36)
+
+# I2C
+I2C_SDA = const(8)
+I2C_SCL = const(9)
+
+# DAC
+DAC1 = const(17)
+DAC2 = const(18)
+
+# Helper functions
+def set_pixel_power(state):
+    """Enable or Disable power to the onboard NeoPixel to either show colour, or to reduce power for deep sleep."""
+    Pin(RGB_PWR, Pin.OUT).value(state)
+
+
+def set_pixel_matrix_power(state):
+    """Enable or Disable power to the onboard NeoPixel RGB Matrix to either show colours, or to reduce power for deep sleep."""
+    Pin(RGB_MATRIX_PWR, Pin.OUT).value(state)
+
+
+def get_battery_voltage():
+    """
+    Returns the current battery voltage. If no battery is connected, returns 4.2V which is the charge voltage
+    This is an approximation only, but useful to detect if the charge state of the battery is getting low.
+    """
+    adc = ADC(Pin(VBAT_SENSE))  # Assign the ADC pin to read
+    measuredvbat = adc.read()  # Read the value
+    measuredvbat /= 8192  # divide by 8192 as we are using the default ADC voltage range of 0-1V
+    measuredvbat *= 4.2  # Multiply by 4.2V, our reference voltage
+    return round(measuredvbat, 2)
+
+
+def get_vbus_present():
+    """Detect if VBUS (5V) power source is present"""
+    return Pin(VBUS_SENSE, Pin.IN).value() == 1
+
+
+# NeoPixel rainbow colour wheel
+def rgb_color_wheel(wheel_pos):
+    """Color wheel to allow for cycling through the rainbow of RGB colors."""
+    wheel_pos = wheel_pos % 255
+
+    if wheel_pos < 85:
+        return 255 - wheel_pos * 3, 0, wheel_pos * 3
+    elif wheel_pos < 170:
+        wheel_pos -= 85
+        return 0, wheel_pos * 3, 255 - wheel_pos * 3
+    else:
+        wheel_pos -= 170
+        return wheel_pos * 3, 255 - wheel_pos * 3, 0
+
+
+# Go into deep sleep but shut down the RGB LED first to save power
+# Use this if you want lowest deep sleep current
+def go_deepsleep(t):
+    """Deep sleep helper that also powers down the on-board NeoPixel."""
+    set_pixel_power(False)
+    set_pixel_matrix_power(False)
+    machine.deepsleep(t)
diff --git a/ports/esp32/boards/UM_FEATHERS2NEO/mpconfigboard.cmake b/ports/esp32/boards/UM_FEATHERS2NEO/mpconfigboard.cmake
new file mode 100644
index 0000000000000..b0b3e3aa992ae
--- /dev/null
+++ b/ports/esp32/boards/UM_FEATHERS2NEO/mpconfigboard.cmake
@@ -0,0 +1,8 @@
+set(IDF_TARGET esp32s2)
+set(SDKCONFIG_DEFAULTS
+    boards/sdkconfig.base
+    boards/sdkconfig.spiram_sx
+    boards/sdkconfig.usb
+)
+
+set(MICROPY_FROZEN_MANIFEST ${MICROPY_BOARD_DIR}/manifest.py)
\ No newline at end of file
diff --git a/ports/esp32/boards/UM_FEATHERS2NEO/mpconfigboard.h b/ports/esp32/boards/UM_FEATHERS2NEO/mpconfigboard.h
new file mode 100644
index 0000000000000..5ee6874b87bab
--- /dev/null
+++ b/ports/esp32/boards/UM_FEATHERS2NEO/mpconfigboard.h
@@ -0,0 +1,12 @@
+#define MICROPY_HW_BOARD_NAME "FeatherS2 Neo"
+#define MICROPY_HW_MCU_NAME "ESP32-S2FN4R2"
+
+#define MICROPY_PY_BLUETOOTH                (0)
+#define MICROPY_HW_ENABLE_SDCARD            (0)
+
+#define MICROPY_HW_I2C0_SCL (9)
+#define MICROPY_HW_I2C0_SDA (8)
+
+#define MICROPY_HW_SPI1_MOSI (35)  // SDO
+#define MICROPY_HW_SPI1_MISO (37)  // SDI
+#define MICROPY_HW_SPI1_SCK (36)
diff --git a/ports/esp32/boards/UM_FEATHERS2NEO/sdkconfig.board b/ports/esp32/boards/UM_FEATHERS2NEO/sdkconfig.board
new file mode 100644
index 0000000000000..87a92892d07e1
--- /dev/null
+++ b/ports/esp32/boards/UM_FEATHERS2NEO/sdkconfig.board
@@ -0,0 +1,8 @@
+CONFIG_FLASHMODE_QIO=y
+CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
+CONFIG_USB_AND_UART=y
+CONFIG_ESPTOOLPY_AFTER_NORESET=y
+
+# LWIP
+CONFIG_LWIP_LOCAL_HOSTNAME="UMFeatherS2Neo"
+# end of LWIP
diff --git a/tools/autobuild/build-esp32-latest.sh b/tools/autobuild/build-esp32-latest.sh
index 92a12b2d53225..5445927ab0b7f 100755
--- a/tools/autobuild/build-esp32-latest.sh
+++ b/tools/autobuild/build-esp32-latest.sh
@@ -49,4 +49,5 @@ else
     do_build esp32c3 GENERIC_C3
     do_build tinys2 UM_TINYS2
     do_build featherS2 UM_FEATHERS2
+    do_build featherS2neo UM_FEATHERS2NEO
 fi

From 0ec5052f622307429ab5dd74f1582bcd0a8e0aa1 Mon Sep 17 00:00:00 2001
From: Patrick Van Oosterwijck <patrick@silicognition.com>
Date: Tue, 7 Sep 2021 21:33:16 -0600
Subject: [PATCH 1262/3533] tools/autobuild: Add auto build for GENERIC_C3_USB.

---
 tools/autobuild/build-esp32-latest.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/autobuild/build-esp32-latest.sh b/tools/autobuild/build-esp32-latest.sh
index 5445927ab0b7f..e0e932e026a95 100755
--- a/tools/autobuild/build-esp32-latest.sh
+++ b/tools/autobuild/build-esp32-latest.sh
@@ -47,6 +47,7 @@ if idf.py --version | grep -q v4.2; then
     do_build wesp32 SIL_WESP32
 else
     do_build esp32c3 GENERIC_C3
+    do_build esp32c3usb GENERIC_C3_USB
     do_build tinys2 UM_TINYS2
     do_build featherS2 UM_FEATHERS2
     do_build featherS2neo UM_FEATHERS2NEO

From 97bbc0bb91a6215eecdeb39c37505fda96a1d74d Mon Sep 17 00:00:00 2001
From: Boris Vinogradov <no111u3@gmail.com>
Date: Sat, 28 Aug 2021 23:19:55 +0300
Subject: [PATCH 1263/3533] stm32/boards/VCC_GND_H743VI: Add board definition
 for VCC_GND_H743VI.

---
 .../stm32/boards/VCC_GND_H743VI/board_init.c  |   9 ++
 .../boards/VCC_GND_H743VI/mpconfigboard.h     | 103 ++++++++++++++++++
 .../boards/VCC_GND_H743VI/mpconfigboard.mk    |  21 ++++
 ports/stm32/boards/VCC_GND_H743VI/pins.csv    |  80 ++++++++++++++
 .../VCC_GND_H743VI/stm32h7xx_hal_conf.h       |  19 ++++
 5 files changed, 232 insertions(+)
 create mode 100644 ports/stm32/boards/VCC_GND_H743VI/board_init.c
 create mode 100644 ports/stm32/boards/VCC_GND_H743VI/mpconfigboard.h
 create mode 100644 ports/stm32/boards/VCC_GND_H743VI/mpconfigboard.mk
 create mode 100644 ports/stm32/boards/VCC_GND_H743VI/pins.csv
 create mode 100644 ports/stm32/boards/VCC_GND_H743VI/stm32h7xx_hal_conf.h

diff --git a/ports/stm32/boards/VCC_GND_H743VI/board_init.c b/ports/stm32/boards/VCC_GND_H743VI/board_init.c
new file mode 100644
index 0000000000000..53b685ff92cff
--- /dev/null
+++ b/ports/stm32/boards/VCC_GND_H743VI/board_init.c
@@ -0,0 +1,9 @@
+#include "py/mphal.h"
+
+void VCC_GND_STM32H743VI_board_early_init(void) {
+    // set SPI and QSPI flashes CS pin high
+    mp_hal_pin_output(pin_B10);
+    mp_hal_pin_write(pin_B10, 1);
+    mp_hal_pin_output(pin_B12);
+    mp_hal_pin_write(pin_B12, 1);
+}
diff --git a/ports/stm32/boards/VCC_GND_H743VI/mpconfigboard.h b/ports/stm32/boards/VCC_GND_H743VI/mpconfigboard.h
new file mode 100644
index 0000000000000..9ef5490fdbcd4
--- /dev/null
+++ b/ports/stm32/boards/VCC_GND_H743VI/mpconfigboard.h
@@ -0,0 +1,103 @@
+/* This file is part of the MicroPython project, http://micropython.org/
+ * MIT License; Copyright (c) 2021 Damien P. George
+ */
+
+// STM32H743VIT6 H7 core board by VCC-GND Studio
+// http://vcc-gnd.com/
+// https://item.taobao.com/item.htm?ft=t&id=614466740679
+// https://www.aliexpress.com/wholesale?SearchText=STM32H743VIT6
+
+#define MICROPY_HW_BOARD_NAME       "VCC-GND STM32H743VI"
+#define MICROPY_HW_MCU_NAME         "STM32H743VI"
+#define MICROPY_HW_FLASH_FS_LABEL   "VCCGNDH743VI"
+
+#define MICROPY_HW_ENABLE_RTC       (1)
+#define MICROPY_HW_ENABLE_RNG       (1)
+#define MICROPY_HW_ENABLE_ADC       (1)
+#define MICROPY_HW_ENABLE_DAC       (1)
+#define MICROPY_HW_ENABLE_USB       (1)
+#define MICROPY_HW_ENABLE_SDCARD    (1)
+#define MICROPY_HW_HAS_SWITCH       (1)
+#define MICROPY_HW_HAS_FLASH        (1)
+
+#define MICROPY_BOARD_EARLY_INIT    VCC_GND_STM32H743VI_board_early_init
+
+// The board has an 25MHz HSE, the following gives 480MHz CPU speed
+#define MICROPY_HW_CLK_PLLM         (5)
+#define MICROPY_HW_CLK_PLLN         (192)
+#define MICROPY_HW_CLK_PLLP         (2)
+#define MICROPY_HW_CLK_PLLQ         (4)
+#define MICROPY_HW_CLK_PLLR         (2)
+
+// The USB clock is set using PLL3
+#define MICROPY_HW_CLK_PLL3M        (5)
+#define MICROPY_HW_CLK_PLL3N        (48)
+#define MICROPY_HW_CLK_PLL3P        (2)
+#define MICROPY_HW_CLK_PLL3Q        (5)
+#define MICROPY_HW_CLK_PLL3R        (2)
+
+// 5 wait states
+#define MICROPY_HW_FLASH_LATENCY    FLASH_LATENCY_5
+
+// UART config
+#define MICROPY_HW_UART2_TX         (pin_D5)
+#define MICROPY_HW_UART2_RX         (pin_D6)
+#define MICROPY_HW_UART2_RTS        (pin_D4)
+#define MICROPY_HW_UART2_CTS        (pin_D3)
+#define MICROPY_HW_UART3_TX         (pin_D8)
+#define MICROPY_HW_UART3_RX         (pin_D9)
+#define MICROPY_HW_UART5_TX         (pin_B6)
+#define MICROPY_HW_UART5_RX         (pin_B12)
+#define MICROPY_HW_UART6_TX         (pin_C6)
+#define MICROPY_HW_UART6_RX         (pin_C7)
+#define MICROPY_HW_UART8_TX         (pin_E1)
+#define MICROPY_HW_UART8_RX         (pin_E0)
+
+// I2C buses
+#define MICROPY_HW_I2C1_SCL         (pin_B6)
+#define MICROPY_HW_I2C1_SDA         (pin_B7)
+#define MICROPY_HW_I2C2_SCL         (pin_B10)
+#define MICROPY_HW_I2C2_SDA         (pin_B11)
+#define MICROPY_HW_I2C3_SCL         (pin_A8)
+#define MICROPY_HW_I2C3_SDA         (pin_C9)
+
+// SPI buses
+#define MICROPY_HW_SPI1_NSS         (pin_A4)
+#define MICROPY_HW_SPI1_SCK         (pin_A5)
+#define MICROPY_HW_SPI1_MISO        (pin_A6)
+#define MICROPY_HW_SPI1_MOSI        (pin_A7)
+#define MICROPY_HW_SPI2_NSS         (pin_B12)
+#define MICROPY_HW_SPI2_SCK         (pin_B13)
+#define MICROPY_HW_SPI2_MISO        (pin_B14)
+#define MICROPY_HW_SPI2_MOSI        (pin_B15)
+
+// USRSW is pulled low. Pressing the button makes the input go high.
+#define MICROPY_HW_USRSW_PIN        (pin_B3)
+#define MICROPY_HW_USRSW_PULL       (GPIO_NOPULL)
+#define MICROPY_HW_USRSW_EXTI_MODE  (GPIO_MODE_IT_RISING)
+#define MICROPY_HW_USRSW_PRESSED    (1)
+
+// LEDs
+#define MICROPY_HW_LED1             (pin_A13)   // red
+#define MICROPY_HW_LED2             (pin_A14)   // green
+#define MICROPY_HW_LED3             (pin_A15)   // yellow
+#define MICROPY_HW_LED4             (pin_B4)    // blue
+#define MICROPY_HW_LED_ON(pin)      (mp_hal_pin_high(pin))
+#define MICROPY_HW_LED_OFF(pin)     (mp_hal_pin_low(pin))
+
+// USB config
+#define MICROPY_HW_USB_FS           (1)
+#define MICROPY_HW_USB_VBUS_DETECT_PIN (pin_A9)
+#define MICROPY_HW_USB_OTG_ID_PIN   (pin_A10)
+
+// FDCAN bus
+#define MICROPY_HW_CAN1_NAME        "FDCAN1"
+#define MICROPY_HW_CAN1_TX          (pin_D1)
+#define MICROPY_HW_CAN1_RX          (pin_D0)
+
+// SD card detect switch
+#define MICROPY_HW_SDCARD_DETECT_PIN        (pin_A8)
+#define MICROPY_HW_SDCARD_DETECT_PULL       (GPIO_PULLUP)
+#define MICROPY_HW_SDCARD_DETECT_PRESENT    (GPIO_PIN_RESET)
+
+void VCC_GND_STM32H743VI_board_early_init(void);
diff --git a/ports/stm32/boards/VCC_GND_H743VI/mpconfigboard.mk b/ports/stm32/boards/VCC_GND_H743VI/mpconfigboard.mk
new file mode 100644
index 0000000000000..1f5fa32a1ba98
--- /dev/null
+++ b/ports/stm32/boards/VCC_GND_H743VI/mpconfigboard.mk
@@ -0,0 +1,21 @@
+USE_MBOOT ?= 0
+
+# MCU settings
+MCU_SERIES = h7
+CMSIS_MCU = STM32H743xx
+MICROPY_FLOAT_IMPL = double
+AF_FILE = boards/stm32h743_af.csv
+
+ifeq ($(USE_MBOOT),1)
+# When using Mboot all the text goes together after the filesystem
+LD_FILES = boards/stm32h743.ld boards/common_blifs.ld
+TEXT0_ADDR = 0x08040000
+else
+# When not using Mboot the ISR text goes first, then the rest after the filesystem
+LD_FILES = boards/stm32h743.ld boards/common_ifs.ld
+TEXT0_ADDR = 0x08000000
+TEXT1_ADDR = 0x08040000
+endif
+
+# MicroPython settings
+MICROPY_VFS_LFS2 = 1
diff --git a/ports/stm32/boards/VCC_GND_H743VI/pins.csv b/ports/stm32/boards/VCC_GND_H743VI/pins.csv
new file mode 100644
index 0000000000000..6668a92db6c66
--- /dev/null
+++ b/ports/stm32/boards/VCC_GND_H743VI/pins.csv
@@ -0,0 +1,80 @@
+A0,PA0
+A1,PA1
+A2,PA2
+A3,PA3
+A4,PA4
+A5,PA5
+A6,PA6
+A7,PA7
+A8,PA8
+A9,PA9
+A10,PA10
+A11,PA11
+A12,PA12
+A13,PA13
+A14,PA14
+A15,PA15
+B0,PB0
+B1,PB1
+B2,PB2
+B3,PB3
+B4,PB4
+B5,PB5
+B6,PB6
+B7,PB7
+B8,PB8
+B9,PB9
+B10,PB10
+B11,PB11
+B12,PB12
+B13,PB13
+B14,PB14
+B15,PB15
+C0,PC0
+C1,PC1
+C2,PC2
+C3,PC3
+C4,PC4
+C5,PC5
+C6,PC6
+C7,PC7
+C8,PC8
+C9,PC9
+C10,PC10
+C11,PC11
+C12,PC12
+C13,PC13
+C14,PC14
+C15,PC15
+D0,PD0
+D1,PD1
+D2,PD2
+D3,PD3
+D4,PD4
+D5,PD5
+D6,PD6
+D7,PD7
+D8,PD8
+D9,PD9
+D10,PD10
+D11,PD11
+D12,PD12
+D13,PD13
+D14,PD14
+D15,PD15
+E0,PE0
+E1,PE1
+E2,PE2
+E3,PE3
+E4,PE4
+E5,PE5
+E6,PE6
+E7,PE7
+E8,PE8
+E9,PE9
+E10,PE10
+E11,PE11
+E12,PE12
+E13,PE13
+E14,PE14
+E15,PE15
diff --git a/ports/stm32/boards/VCC_GND_H743VI/stm32h7xx_hal_conf.h b/ports/stm32/boards/VCC_GND_H743VI/stm32h7xx_hal_conf.h
new file mode 100644
index 0000000000000..c4d148b0bbafe
--- /dev/null
+++ b/ports/stm32/boards/VCC_GND_H743VI/stm32h7xx_hal_conf.h
@@ -0,0 +1,19 @@
+/* This file is part of the MicroPython project, http://micropython.org/
+ * The MIT License (MIT)
+ * Copyright (c) 2019 Damien P. George
+ */
+#ifndef MICROPY_INCLUDED_STM32H7XX_HAL_CONF_H
+#define MICROPY_INCLUDED_STM32H7XX_HAL_CONF_H
+
+#include "boards/stm32h7xx_hal_conf_base.h"
+
+// Oscillator values in Hz
+#define HSE_VALUE (25000000)
+#define LSE_VALUE (32768)
+#define EXTERNAL_CLOCK_VALUE (12288000)
+
+// Oscillator timeouts in ms
+#define HSE_STARTUP_TIMEOUT (5000)
+#define LSE_STARTUP_TIMEOUT (5000)
+
+#endif // MICROPY_INCLUDED_STM32H7XX_HAL_CONF_H

From b71c621f468e50361c137f64b0241f3ecc944b7a Mon Sep 17 00:00:00 2001
From: Daniel Gorny <reverbrick@interia.pl>
Date: Tue, 7 Sep 2021 13:29:40 +0200
Subject: [PATCH 1264/3533] stm32/boards/OLIMEX_E407: Add Ethernet RMII
 support.

---
 ports/stm32/boards/OLIMEX_E407/mpconfigboard.h  | 11 +++++++++++
 ports/stm32/boards/OLIMEX_E407/mpconfigboard.mk |  5 +++++
 ports/stm32/boards/OLIMEX_E407/pins.csv         |  3 +++
 3 files changed, 19 insertions(+)

diff --git a/ports/stm32/boards/OLIMEX_E407/mpconfigboard.h b/ports/stm32/boards/OLIMEX_E407/mpconfigboard.h
index 999f97a708720..b9c94b15be6e8 100644
--- a/ports/stm32/boards/OLIMEX_E407/mpconfigboard.h
+++ b/ports/stm32/boards/OLIMEX_E407/mpconfigboard.h
@@ -78,3 +78,14 @@
 #define MICROPY_HW_USB_FS              (1)
 #define MICROPY_HW_USB_VBUS_DETECT_PIN (pin_A9)
 #define MICROPY_HW_USB_OTG_ID_PIN      (pin_A10)
+
+// Ethernet via RMII
+#define MICROPY_HW_ETH_MDC          (pin_C1)
+#define MICROPY_HW_ETH_MDIO         (pin_A2)
+#define MICROPY_HW_ETH_RMII_REF_CLK (pin_A1)
+#define MICROPY_HW_ETH_RMII_CRS_DV  (pin_A7)
+#define MICROPY_HW_ETH_RMII_RXD0    (pin_C4)
+#define MICROPY_HW_ETH_RMII_RXD1    (pin_C5)
+#define MICROPY_HW_ETH_RMII_TX_EN   (pin_G11)
+#define MICROPY_HW_ETH_RMII_TXD0    (pin_G13)
+#define MICROPY_HW_ETH_RMII_TXD1    (pin_G14)
diff --git a/ports/stm32/boards/OLIMEX_E407/mpconfigboard.mk b/ports/stm32/boards/OLIMEX_E407/mpconfigboard.mk
index b154dcfbacdc4..0d3eee83be276 100644
--- a/ports/stm32/boards/OLIMEX_E407/mpconfigboard.mk
+++ b/ports/stm32/boards/OLIMEX_E407/mpconfigboard.mk
@@ -4,3 +4,8 @@ AF_FILE = boards/stm32f405_af.csv
 LD_FILES = boards/stm32f405.ld boards/common_ifs.ld
 TEXT0_ADDR = 0x08000000
 TEXT1_ADDR = 0x08020000
+
+# MicroPython settings
+MICROPY_PY_LWIP = 1
+MICROPY_PY_USSL = 1
+MICROPY_SSL_MBEDTLS = 1
diff --git a/ports/stm32/boards/OLIMEX_E407/pins.csv b/ports/stm32/boards/OLIMEX_E407/pins.csv
index 81a9bcb853f86..cb0a49916e558 100644
--- a/ports/stm32/boards/OLIMEX_E407/pins.csv
+++ b/ports/stm32/boards/OLIMEX_E407/pins.csv
@@ -84,3 +84,6 @@ PD15,PD15
 PA0,PA0
 USB_DM,PA11
 USB_DP,PA12
+PG11,PG11
+PG13,PG13
+PG14,PG14

From 4c31d0ab60e7244a25e38f2a0bc640de6e87844f Mon Sep 17 00:00:00 2001
From: Tobias Thyrrestrup <tt@LEGO.com>
Date: Wed, 8 Sep 2021 12:22:35 +0200
Subject: [PATCH 1265/3533] stm32/boards/LEGO_HUB_NO6: Remove user paths from
 cc2564 init file.

Signed-off-by: Tobias Thyrrestrup <tt@LEGO.com>
---
 .../stm32/boards/LEGO_HUB_NO6/bluetooth_init_cc2564C_1.5.c  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ports/stm32/boards/LEGO_HUB_NO6/bluetooth_init_cc2564C_1.5.c b/ports/stm32/boards/LEGO_HUB_NO6/bluetooth_init_cc2564C_1.5.c
index ec41fdfeefbca..b185b579f87c6 100644
--- a/ports/stm32/boards/LEGO_HUB_NO6/bluetooth_init_cc2564C_1.5.c
+++ b/ports/stm32/boards/LEGO_HUB_NO6/bluetooth_init_cc2564C_1.5.c
@@ -4,9 +4,9 @@
 #if !BUILDING_MBOOT
  
  // init script created from
-// - /Users/dktobthy/Downloads/cc256xc_bt_spv1.5/CC256XC_BT_SP/v1.5/initscripts-TIInit_6.12.26.bts
+// - CC256XC_BT_SP/v1.5/initscripts-TIInit_6.12.26.bts
 // - AKA TIInit_6.12.26.bts
-// - /Users/dktobthy/Downloads/cc256xc_bt_spv1.5/CC256XC_BT_SP/v1.5/initscripts-TIInit_6.12.26_ble_add-on.bts
+// - CC256XC_BT_SP/v1.5/initscripts-TIInit_6.12.26_ble_add-on.bts
 #include <stdint.h>
 #include "lib/btstack/chipset/cc256x/btstack_chipset_cc256x.h"
 
@@ -613,4 +613,4 @@ const uint8_t cc256x_init_script[] = {
 
 const uint32_t cc256x_init_script_size = 6771;
 
-#endif
\ No newline at end of file
+#endif

From 0a510737248132430de4317d7fd4d47e76862182 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 10 Sep 2021 16:06:59 +1000
Subject: [PATCH 1266/3533] stm32/boards: Remove trailing spaces, and add
 newline at end of file.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/boards/MIKROE_CLICKER2_STM32/pins.csv | 2 +-
 ports/stm32/boards/NUCLEO_F412ZG/pins.csv         | 2 +-
 ports/stm32/boards/OLIMEX_E407/mpconfigboard.h    | 2 +-
 ports/stm32/boards/STM32F4DISC/mpconfigboard.h    | 2 +-
 ports/stm32/boards/STM32F769DISC/mpconfigboard.h  | 2 +-
 ports/stm32/boards/stm32h743.ld                   | 2 +-
 ports/stm32/boards/stm32l432_af.csv               | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/ports/stm32/boards/MIKROE_CLICKER2_STM32/pins.csv b/ports/stm32/boards/MIKROE_CLICKER2_STM32/pins.csv
index 09e1ccfb4b19b..c04d2b8c4ac86 100644
--- a/ports/stm32/boards/MIKROE_CLICKER2_STM32/pins.csv
+++ b/ports/stm32/boards/MIKROE_CLICKER2_STM32/pins.csv
@@ -85,4 +85,4 @@ T2,PE0
 T3,PA10
 USB_VBUS,PA9
 USB_DM,PA11
-USB_DP,PA12
\ No newline at end of file
+USB_DP,PA12
diff --git a/ports/stm32/boards/NUCLEO_F412ZG/pins.csv b/ports/stm32/boards/NUCLEO_F412ZG/pins.csv
index 430d0972b32f1..31dcb99ed616c 100644
--- a/ports/stm32/boards/NUCLEO_F412ZG/pins.csv
+++ b/ports/stm32/boards/NUCLEO_F412ZG/pins.csv
@@ -115,4 +115,4 @@ PH1,PH1
 SW,C13
 LED_RED,B14
 LED_GREEN,B0
-LED_BLUE,B7
\ No newline at end of file
+LED_BLUE,B7
diff --git a/ports/stm32/boards/OLIMEX_E407/mpconfigboard.h b/ports/stm32/boards/OLIMEX_E407/mpconfigboard.h
index b9c94b15be6e8..a3b23817d3586 100644
--- a/ports/stm32/boards/OLIMEX_E407/mpconfigboard.h
+++ b/ports/stm32/boards/OLIMEX_E407/mpconfigboard.h
@@ -27,7 +27,7 @@
 #define MICROPY_HW_UART3_RTS    (pin_D12)
 #define MICROPY_HW_UART3_CTS    (pin_D11)
 #if MICROPY_HW_HAS_SWITCH == 0
-// NOTE: A0 also connects to the user switch. To use UART4 you should 
+// NOTE: A0 also connects to the user switch. To use UART4 you should
 //       set MICROPY_HW_HAS_SWITCH to 0, and also remove SB20 (on the back
 //       of the board near the USER switch).
 #define MICROPY_HW_UART4_TX     (pin_A0)
diff --git a/ports/stm32/boards/STM32F4DISC/mpconfigboard.h b/ports/stm32/boards/STM32F4DISC/mpconfigboard.h
index dbe52e6b10e0b..3b291ad7624e6 100644
--- a/ports/stm32/boards/STM32F4DISC/mpconfigboard.h
+++ b/ports/stm32/boards/STM32F4DISC/mpconfigboard.h
@@ -31,7 +31,7 @@
 #define MICROPY_HW_UART3_RTS    (pin_D12)
 #define MICROPY_HW_UART3_CTS    (pin_D11)
 #if MICROPY_HW_HAS_SWITCH == 0
-// NOTE: A0 also connects to the user switch. To use UART4 you should 
+// NOTE: A0 also connects to the user switch. To use UART4 you should
 //       set MICROPY_HW_HAS_SWITCH to 0, and also remove SB20 (on the back
 //       of the board near the USER switch).
 #define MICROPY_HW_UART4_TX     (pin_A0)
diff --git a/ports/stm32/boards/STM32F769DISC/mpconfigboard.h b/ports/stm32/boards/STM32F769DISC/mpconfigboard.h
index 87cefb50176ff..981f17848f17b 100644
--- a/ports/stm32/boards/STM32F769DISC/mpconfigboard.h
+++ b/ports/stm32/boards/STM32F769DISC/mpconfigboard.h
@@ -85,7 +85,7 @@ extern struct _spi_bdev_t spi_bdev;
 
 // LEDs
 #define MICROPY_HW_LED1             (pin_J13) // red
-#define MICROPY_HW_LED2             (pin_J5) // green 
+#define MICROPY_HW_LED2             (pin_J5) // green
 #define MICROPY_HW_LED3             (pin_A12) // green
 #define MICROPY_HW_LED_ON(pin)      (mp_hal_pin_high(pin))
 #define MICROPY_HW_LED_OFF(pin)     (mp_hal_pin_low(pin))
diff --git a/ports/stm32/boards/stm32h743.ld b/ports/stm32/boards/stm32h743.ld
index 8cf8a4e591a5f..72d915b2bb1d0 100644
--- a/ports/stm32/boards/stm32h743.ld
+++ b/ports/stm32/boards/stm32h743.ld
@@ -10,7 +10,7 @@ MEMORY
     FLASH_FS (r)    : ORIGIN = 0x08020000, LENGTH = 128K    /* sector 1, 128K */
     FLASH_TEXT (rx) : ORIGIN = 0x08040000, LENGTH = 1792K   /* sectors 6*128 + 8*128 */
     DTCM (xrw)      : ORIGIN = 0x20000000, LENGTH = 128K    /* Used for storage cache */
-    RAM (xrw)       : ORIGIN = 0x24000000, LENGTH = 512K    /* AXI SRAM */    
+    RAM (xrw)       : ORIGIN = 0x24000000, LENGTH = 512K    /* AXI SRAM */
     RAM_D2 (xrw)    : ORIGIN = 0x30000000, LENGTH = 288K
 }
 
diff --git a/ports/stm32/boards/stm32l432_af.csv b/ports/stm32/boards/stm32l432_af.csv
index e1d231c40afb7..debfcd7b3548a 100644
--- a/ports/stm32/boards/stm32l432_af.csv
+++ b/ports/stm32/boards/stm32l432_af.csv
@@ -25,4 +25,4 @@ PortB,PB6,,LPTIM1_ETR,,,I2C1_SCL,,,USART1_TX,,TSC_G2_IO3,,,,SAI1_FS_B,TIM16_CH1N
 PortB,PB7,,LPTIM1_IN2,,,I2C1_SDA,,,USART1_RX,,TSC_G2_IO4,,,,,,EVENTOUT,,COMP2_INM,
 PortC,PC14,,,,,,,,,,,,,,,,EVENTOUT,,,
 PortC,PC15,,,,,,,,,,,,,,,,EVENTOUT,,,
-PortH,PH3,,,,,,,,,,,,,,,,EVENTOUT,,,
\ No newline at end of file
+PortH,PH3,,,,,,,,,,,,,,,,EVENTOUT,,,

From c7842f479836e4aec449a83ddf2907d28dde6027 Mon Sep 17 00:00:00 2001
From: Ihor Nehrutsa <Ihor.Nehrutsa@gmail.com>
Date: Fri, 10 Sep 2021 08:44:03 +0300
Subject: [PATCH 1267/3533] docs/make.bat: Change Windows output dir from
 '_build' to 'build'.

To match the output file used by Makefile.
---
 docs/make.bat | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/make.bat b/docs/make.bat
index c09487fb741ef..2a9e670e4d904 100644
--- a/docs/make.bat
+++ b/docs/make.bat
@@ -5,7 +5,7 @@ REM Command file for Sphinx documentation
 if "%SPHINXBUILD%" == "" (
 	set SPHINXBUILD=sphinx-build
 )
-set BUILDDIR=_build
+set BUILDDIR=build
 set SPHINXOPTS=-W --keep-going
 set ALLSPHINXOPTS=-d %BUILDDIR%/doctrees %SPHINXOPTS% .
 set I18NSPHINXOPTS=%SPHINXOPTS% .

From 4552f1816b194b22befb199d0adc3a67df2344b3 Mon Sep 17 00:00:00 2001
From: Peter Hinch <peter@hinch.me.uk>
Date: Fri, 10 Sep 2021 14:02:35 +0100
Subject: [PATCH 1268/3533] docs/library/machine.I2S.rst: Specify that
 I2S.shift args are kw-only.

---
 docs/library/machine.I2S.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/library/machine.I2S.rst b/docs/library/machine.I2S.rst
index 45877a5ae0abd..d64fba33e4529 100644
--- a/docs/library/machine.I2S.rst
+++ b/docs/library/machine.I2S.rst
@@ -134,7 +134,7 @@ Methods
   Setting a callback changes the ``write`` and ``readinto`` methods to non-blocking operation.
   ``handler`` is called in the context of the MicroPython scheduler.
   
-.. staticmethod::  I2S.shift(buf, bits, shift)
+.. staticmethod::  I2S.shift(*, buf, bits, shift)
 
   bitwise shift of all samples contained in ``buf``. ``bits`` specifies sample size in bits. ``shift`` specifies the number of bits to shift each sample. 
   Positive for left shift, negative for right shift. 

From f690fd3a47d493e2c30829e06502ca7b3e787fff Mon Sep 17 00:00:00 2001
From: Seon Rozenblum <seon@unexpectedmaker.com>
Date: Sat, 11 Sep 2021 14:48:11 +1000
Subject: [PATCH 1269/3533] esp32/machine_timer: Use tx_update member for IDF
 4.4 and above.

---
 ports/esp32/machine_timer.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ports/esp32/machine_timer.c b/ports/esp32/machine_timer.c
index 3b14581498655..803849e1be647 100644
--- a/ports/esp32/machine_timer.c
+++ b/ports/esp32/machine_timer.c
@@ -137,8 +137,12 @@ STATIC void machine_timer_isr(void *self_in) {
     #if CONFIG_IDF_TARGET_ESP32
     device->hw_timer[self->index].update = 1;
     #else
+    #if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(4, 4, 0)
+    device->hw_timer[self->index].update.tx_update = 1;
+    #else
     device->hw_timer[self->index].update.update = 1;
     #endif
+    #endif
     timer_ll_clear_intr_status(device, self->index);
     timer_ll_set_alarm_enable(device, self->index, self->repeat);
 

From c0761d28fc46072d73daf6bdd1c6abbbac0fc9c1 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 13 Sep 2021 18:27:39 +1000
Subject: [PATCH 1270/3533] tests/perf_bench: Use math.log instead of
 math.log2.

So MICROPY_PY_MATH_SPECIAL_FUNCTIONS is not needed for these performance
tests.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/perf_bench/bm_fft.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/perf_bench/bm_fft.py b/tests/perf_bench/bm_fft.py
index fb79a9fd28b65..9a2d03d11b97c 100644
--- a/tests/perf_bench/bm_fft.py
+++ b/tests/perf_bench/bm_fft.py
@@ -15,7 +15,7 @@ def reverse(x, bits):
 
     # Initialization
     n = len(vector)
-    levels = int(math.log2(n))
+    levels = int(math.log(n) / math.log(2))
     coef = (2 if inverse else -2) * cmath.pi / n
     exptable = [cmath.rect(1, i * coef) for i in range(n // 2)]
     vector = [vector[reverse(i, levels)] for i in range(n)]  # Copy with bit-reversed permutation

From 426785a19eeb12aef7383fbda4693575d8c4dddf Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 13 Sep 2021 22:30:24 +1000
Subject: [PATCH 1271/3533] py/emitnative: Ensure load_subscr does not clobber
 existing REG_RET.

Fixes issue #7782, and part of issue #6314.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/emitnative.c                             |  2 ++
 tests/micropython/viper_subscr_multi.py     | 20 ++++++++++++++++++++
 tests/micropython/viper_subscr_multi.py.exp |  2 ++
 3 files changed, 24 insertions(+)
 create mode 100644 tests/micropython/viper_subscr_multi.py
 create mode 100644 tests/micropython/viper_subscr_multi.py.exp

diff --git a/py/emitnative.c b/py/emitnative.c
index 7c7c3428397a9..6504f377659d0 100644
--- a/py/emitnative.c
+++ b/py/emitnative.c
@@ -1560,6 +1560,7 @@ STATIC void emit_native_load_subscr(emit_t *emit) {
             int reg_base = REG_ARG_1;
             int reg_index = REG_ARG_2;
             emit_pre_pop_reg_flexible(emit, &vtype_base, &reg_base, reg_index, reg_index);
+            need_reg_single(emit, REG_RET, 0);
             switch (vtype_base) {
                 case VTYPE_PTR8: {
                     // pointer to 8-bit memory
@@ -1623,6 +1624,7 @@ STATIC void emit_native_load_subscr(emit_t *emit) {
             int reg_index = REG_ARG_2;
             emit_pre_pop_reg_flexible(emit, &vtype_index, &reg_index, REG_ARG_1, REG_ARG_1);
             emit_pre_pop_reg(emit, &vtype_base, REG_ARG_1);
+            need_reg_single(emit, REG_RET, 0);
             if (vtype_index != VTYPE_INT && vtype_index != VTYPE_UINT) {
                 EMIT_NATIVE_VIPER_TYPE_ERROR(emit,
                     MP_ERROR_TEXT("can't load with '%q' index"), vtype_to_qstr(vtype_index));
diff --git a/tests/micropython/viper_subscr_multi.py b/tests/micropython/viper_subscr_multi.py
new file mode 100644
index 0000000000000..1561e5534db57
--- /dev/null
+++ b/tests/micropython/viper_subscr_multi.py
@@ -0,0 +1,20 @@
+# test viper with multiple subscripts in a single expression
+
+
+@micropython.viper
+def f1(b: ptr8):
+    b[0] += b[1]
+
+
+@micropython.viper
+def f2(b: ptr8, i: int):
+    b[0] += b[i]
+
+
+b = bytearray(b"\x01\x02")
+f1(b)
+print(b)
+
+b = bytearray(b"\x01\x02")
+f2(b, 1)
+print(b)
diff --git a/tests/micropython/viper_subscr_multi.py.exp b/tests/micropython/viper_subscr_multi.py.exp
new file mode 100644
index 0000000000000..a2c298bb16c91
--- /dev/null
+++ b/tests/micropython/viper_subscr_multi.py.exp
@@ -0,0 +1,2 @@
+bytearray(b'\x03\x02')
+bytearray(b'\x03\x02')

From 0d7366c9126f1b306d5cd4eaebe26c801f0e01d8 Mon Sep 17 00:00:00 2001
From: Philipp Ebensberger <philipp.ebensberger@3bricks-software.de>
Date: Fri, 20 Aug 2021 21:41:58 +0200
Subject: [PATCH 1272/3533] mimxrt: Rework flash configuration.

- Moves definition of BOARD_FLASH_SIZE and other header files related to
	flash configuration into the Makefile.
- Adds board specific clock_config.h.
- Adds board.h, pin_mux.h, and peripherals.h as they are
	required by NXP MCU SDK in order to use our own clock_config.h.
- Renames board specific FlexSPI configuration files.
- Updates flash frequency of MIMXRT1020_EVK
- Creates separated flash_config files for QSPI NOR and
	QSPI Hyper flash.
- Unifies VFS start address to be @ 1M for 1010 and 1020 boards.
- Unifies 1050EVK boards
- Adds support to both NOR and HyperFlash on boards with
	both capabilities.
- Adds automatic FlexRAM initialization to start-up code based on
	linker script and NXP HAL.
- Applies code formatting to all files in mimxrt port.

With this change the flash configuration is restructured and
organized. This simplifies the configuration process and
provides a better overview of each board's settings. With the integration
of clock_config.h, board.h, pin_mux.h, and peripherals.h we gain better
control of the settings and clock configurations. Furthermore the
implementation of an explicit FlexRAM setup improves the system
performance and allows for performance tuning.

Signed-off-by: Philipp Ebensberger
---
 ports/mimxrt/Makefile                         |  63 ++++-
 .../boards/MIMXRT1010_EVK/MIMXRT1010_EVK.ld   |   1 -
 .../MIMXRT1010_EVK_flexspi_nor_config.h       | 257 +++++++++++++++++
 .../boards/MIMXRT1010_EVK/clock_config.h      | 104 +++++++
 .../evkmimxrt1010_flexspi_nor_config.h        | 257 -----------------
 .../boards/MIMXRT1010_EVK/flash_config.c      | 124 --------
 .../boards/MIMXRT1010_EVK/mpconfigboard.h     |   6 +-
 .../boards/MIMXRT1010_EVK/mpconfigboard.mk    |   9 +-
 .../MIMXRT1010_EVK/qspi_nor_flash_config.c    | 124 ++++++++
 ports/mimxrt/boards/MIMXRT1011.ld             |  21 +-
 .../boards/MIMXRT1020_EVK/MIMXRT1020_EVK.ld   |   1 -
 .../MIMXRT1020_EVK_flexspi_nor_config.h       | 258 +++++++++++++++++
 .../boards/MIMXRT1020_EVK/clock_config.h      | 114 ++++++++
 .../evkmimxrt1020_flexspi_nor_config.h        | 258 -----------------
 .../boards/MIMXRT1020_EVK/flash_config.c      | 136 ---------
 .../boards/MIMXRT1020_EVK/mpconfigboard.h     |  22 +-
 .../boards/MIMXRT1020_EVK/mpconfigboard.mk    |   9 +-
 .../MIMXRT1020_EVK/qspi_nor_flash_config.c    | 136 +++++++++
 ports/mimxrt/boards/MIMXRT1021.ld             |  23 +-
 .../boards/MIMXRT1050_EVK/MIMXRT1050_EVK.ld   |   1 -
 .../MIMXRT1050_EVK_flexspi_nor_config.h       | 263 +++++++++++++++++
 .../boards/MIMXRT1050_EVK/clock_config.h      | 119 ++++++++
 .../evkmimxrt1050_flexspi_nor_config.h        | 255 -----------------
 .../boards/MIMXRT1050_EVK/flash_config.c      | 129 ---------
 .../boards/MIMXRT1050_EVK/mpconfigboard.h     |  21 +-
 .../boards/MIMXRT1050_EVK/mpconfigboard.mk    |   7 +-
 .../MIMXRT1050_EVK/qspi_hyper_flash_config.c  | 186 ++++++++++++
 .../MIMXRT1050_EVK/qspi_nor_flash_config.c    | 129 +++++++++
 .../boards/MIMXRT1050_EVKB/MIMXRT1050_EVKB.ld |   1 -
 .../evkbmimxrt1050_flexspi_nor_config.h       | 263 -----------------
 .../boards/MIMXRT1050_EVKB/flash_config.c     | 186 ------------
 .../boards/MIMXRT1050_EVKB/mpconfigboard.h    |  68 -----
 .../boards/MIMXRT1050_EVKB/mpconfigboard.mk   |  13 -
 ports/mimxrt/boards/MIMXRT1050_EVKB/pins.csv  |  31 --
 ports/mimxrt/boards/MIMXRT1052.ld             |  19 +-
 .../boards/MIMXRT1060_EVK/MIMXRT1060_EVK.ld   |   1 -
 .../MIMXRT1060_EVK_flexspi_nor_config.h       | 264 ++++++++++++++++++
 .../boards/MIMXRT1060_EVK/clock_config.h      | 122 ++++++++
 .../evkmimxrt1060_flexspi_nor_config.h        | 264 ------------------
 .../boards/MIMXRT1060_EVK/flash_config.c      | 186 ------------
 .../boards/MIMXRT1060_EVK/mpconfigboard.h     |  18 +-
 .../boards/MIMXRT1060_EVK/mpconfigboard.mk    |   6 +-
 .../MIMXRT1060_EVK/qspi_hyper_flash_config.c  | 186 ++++++++++++
 .../MIMXRT1060_EVK/qspi_nor_flash_config.c    | 129 +++++++++
 ports/mimxrt/boards/MIMXRT1062.ld             |  19 +-
 ports/mimxrt/boards/MIMXRT1064.ld             |  21 +-
 .../boards/MIMXRT1064_EVK/MIMXRT1064_EVK.ld   |   1 -
 .../MIMXRT1064_EVK_flexspi_nor_config.h       | 264 ++++++++++++++++++
 .../boards/MIMXRT1064_EVK/clock_config.h      | 122 ++++++++
 .../evkmimxrt1064_flexspi_nor_config.h        | 264 ------------------
 .../boards/MIMXRT1064_EVK/flash_config.c      | 186 ------------
 .../boards/MIMXRT1064_EVK/mpconfigboard.h     |  16 +-
 .../boards/MIMXRT1064_EVK/mpconfigboard.mk    |   7 +-
 .../MIMXRT1064_EVK/qspi_hyper_flash_config.c  | 186 ++++++++++++
 .../MIMXRT1064_EVK/qspi_nor_flash_config.c    | 129 +++++++++
 ports/mimxrt/boards/TEENSY40/TEENSY40.ld      |   2 -
 .../TEENSY40/TEENSY40_flexspi_nor_config.h    | 259 +++++++++++++++++
 ports/mimxrt/boards/TEENSY40/clock_config.h   | 122 ++++++++
 ports/mimxrt/boards/TEENSY40/flash_config.c   | 144 ----------
 ports/mimxrt/boards/TEENSY40/mpconfigboard.h  |  18 +-
 ports/mimxrt/boards/TEENSY40/mpconfigboard.mk |   6 +-
 .../boards/TEENSY40/qspi_nor_flash_config.c   | 144 ++++++++++
 .../TEENSY40/teensy40_flexspi_nor_config.h    | 259 -----------------
 ports/mimxrt/boards/TEENSY41/TEENSY41.ld      |   2 -
 .../TEENSY41/TEENSY41_flexspi_nor_config.h    | 259 +++++++++++++++++
 ports/mimxrt/boards/TEENSY41/clock_config.h   | 122 ++++++++
 ports/mimxrt/boards/TEENSY41/flash_config.c   | 144 ----------
 ports/mimxrt/boards/TEENSY41/mpconfigboard.h  |  18 +-
 ports/mimxrt/boards/TEENSY41/mpconfigboard.mk |   6 +-
 .../boards/TEENSY41/qspi_nor_flash_config.c   | 144 ++++++++++
 .../TEENSY41/teensy41_flexspi_nor_config.h    | 259 -----------------
 ports/mimxrt/boards/make-flexram-config.py    | 219 +++++++++++++++
 ports/mimxrt/hal/board.h                      |  33 +++
 ports/mimxrt/hal/flexspi_hyper_flash.c        |  99 +++----
 ports/mimxrt/hal/flexspi_hyper_flash.h        |   3 +-
 ports/mimxrt/hal/flexspi_nor_flash.c          |  15 +-
 ports/mimxrt/hal/flexspi_nor_flash.h          |   1 -
 ports/mimxrt/hal/peripherals.h                |   1 +
 ports/mimxrt/hal/pin_mux.h                    |   1 +
 ports/mimxrt/hal/resethandler_MIMXRT10xx.S    | 175 ++++++++++++
 tools/autobuild/build-mimxrt-latest.sh        |   2 +-
 tools/codeformat.py                           |   1 +
 82 files changed, 4830 insertions(+), 3633 deletions(-)
 delete mode 100644 ports/mimxrt/boards/MIMXRT1010_EVK/MIMXRT1010_EVK.ld
 create mode 100644 ports/mimxrt/boards/MIMXRT1010_EVK/MIMXRT1010_EVK_flexspi_nor_config.h
 create mode 100644 ports/mimxrt/boards/MIMXRT1010_EVK/clock_config.h
 delete mode 100644 ports/mimxrt/boards/MIMXRT1010_EVK/evkmimxrt1010_flexspi_nor_config.h
 delete mode 100644 ports/mimxrt/boards/MIMXRT1010_EVK/flash_config.c
 create mode 100644 ports/mimxrt/boards/MIMXRT1010_EVK/qspi_nor_flash_config.c
 delete mode 100644 ports/mimxrt/boards/MIMXRT1020_EVK/MIMXRT1020_EVK.ld
 create mode 100644 ports/mimxrt/boards/MIMXRT1020_EVK/MIMXRT1020_EVK_flexspi_nor_config.h
 create mode 100644 ports/mimxrt/boards/MIMXRT1020_EVK/clock_config.h
 delete mode 100644 ports/mimxrt/boards/MIMXRT1020_EVK/evkmimxrt1020_flexspi_nor_config.h
 delete mode 100644 ports/mimxrt/boards/MIMXRT1020_EVK/flash_config.c
 create mode 100644 ports/mimxrt/boards/MIMXRT1020_EVK/qspi_nor_flash_config.c
 delete mode 100644 ports/mimxrt/boards/MIMXRT1050_EVK/MIMXRT1050_EVK.ld
 create mode 100644 ports/mimxrt/boards/MIMXRT1050_EVK/MIMXRT1050_EVK_flexspi_nor_config.h
 create mode 100644 ports/mimxrt/boards/MIMXRT1050_EVK/clock_config.h
 delete mode 100644 ports/mimxrt/boards/MIMXRT1050_EVK/evkmimxrt1050_flexspi_nor_config.h
 delete mode 100644 ports/mimxrt/boards/MIMXRT1050_EVK/flash_config.c
 create mode 100644 ports/mimxrt/boards/MIMXRT1050_EVK/qspi_hyper_flash_config.c
 create mode 100644 ports/mimxrt/boards/MIMXRT1050_EVK/qspi_nor_flash_config.c
 delete mode 100644 ports/mimxrt/boards/MIMXRT1050_EVKB/MIMXRT1050_EVKB.ld
 delete mode 100644 ports/mimxrt/boards/MIMXRT1050_EVKB/evkbmimxrt1050_flexspi_nor_config.h
 delete mode 100644 ports/mimxrt/boards/MIMXRT1050_EVKB/flash_config.c
 delete mode 100644 ports/mimxrt/boards/MIMXRT1050_EVKB/mpconfigboard.h
 delete mode 100644 ports/mimxrt/boards/MIMXRT1050_EVKB/mpconfigboard.mk
 delete mode 100644 ports/mimxrt/boards/MIMXRT1050_EVKB/pins.csv
 delete mode 100644 ports/mimxrt/boards/MIMXRT1060_EVK/MIMXRT1060_EVK.ld
 create mode 100644 ports/mimxrt/boards/MIMXRT1060_EVK/MIMXRT1060_EVK_flexspi_nor_config.h
 create mode 100644 ports/mimxrt/boards/MIMXRT1060_EVK/clock_config.h
 delete mode 100644 ports/mimxrt/boards/MIMXRT1060_EVK/evkmimxrt1060_flexspi_nor_config.h
 delete mode 100644 ports/mimxrt/boards/MIMXRT1060_EVK/flash_config.c
 create mode 100644 ports/mimxrt/boards/MIMXRT1060_EVK/qspi_hyper_flash_config.c
 create mode 100644 ports/mimxrt/boards/MIMXRT1060_EVK/qspi_nor_flash_config.c
 delete mode 100644 ports/mimxrt/boards/MIMXRT1064_EVK/MIMXRT1064_EVK.ld
 create mode 100644 ports/mimxrt/boards/MIMXRT1064_EVK/MIMXRT1064_EVK_flexspi_nor_config.h
 create mode 100644 ports/mimxrt/boards/MIMXRT1064_EVK/clock_config.h
 delete mode 100644 ports/mimxrt/boards/MIMXRT1064_EVK/evkmimxrt1064_flexspi_nor_config.h
 delete mode 100644 ports/mimxrt/boards/MIMXRT1064_EVK/flash_config.c
 create mode 100644 ports/mimxrt/boards/MIMXRT1064_EVK/qspi_hyper_flash_config.c
 create mode 100644 ports/mimxrt/boards/MIMXRT1064_EVK/qspi_nor_flash_config.c
 delete mode 100644 ports/mimxrt/boards/TEENSY40/TEENSY40.ld
 create mode 100644 ports/mimxrt/boards/TEENSY40/TEENSY40_flexspi_nor_config.h
 create mode 100644 ports/mimxrt/boards/TEENSY40/clock_config.h
 delete mode 100644 ports/mimxrt/boards/TEENSY40/flash_config.c
 create mode 100644 ports/mimxrt/boards/TEENSY40/qspi_nor_flash_config.c
 delete mode 100644 ports/mimxrt/boards/TEENSY40/teensy40_flexspi_nor_config.h
 delete mode 100755 ports/mimxrt/boards/TEENSY41/TEENSY41.ld
 create mode 100644 ports/mimxrt/boards/TEENSY41/TEENSY41_flexspi_nor_config.h
 create mode 100644 ports/mimxrt/boards/TEENSY41/clock_config.h
 delete mode 100755 ports/mimxrt/boards/TEENSY41/flash_config.c
 create mode 100644 ports/mimxrt/boards/TEENSY41/qspi_nor_flash_config.c
 delete mode 100755 ports/mimxrt/boards/TEENSY41/teensy41_flexspi_nor_config.h
 create mode 100644 ports/mimxrt/boards/make-flexram-config.py
 create mode 100644 ports/mimxrt/hal/board.h
 create mode 100644 ports/mimxrt/hal/peripherals.h
 create mode 100644 ports/mimxrt/hal/pin_mux.h
 create mode 100644 ports/mimxrt/hal/resethandler_MIMXRT10xx.S

diff --git a/ports/mimxrt/Makefile b/ports/mimxrt/Makefile
index 8b1bb2bfa7189..fcbd97b20cf30 100644
--- a/ports/mimxrt/Makefile
+++ b/ports/mimxrt/Makefile
@@ -13,6 +13,17 @@ endif
 include ../../py/mkenv.mk
 include $(BOARD_DIR)/mpconfigboard.mk
 
+# Set optional flash configuration variables
+BOARD_FLASH_RESERVED ?=
+
+LD_MEMORY_CONFIG_DEFINES += \
+	BOARD_FLASH_TYPE=$(BOARD_FLASH_TYPE) \
+	BOARD_FLASH_SIZE=$(BOARD_FLASH_SIZE)
+
+ifdef $(BOARD_FLASH_RESERVED)
+LD_MEMORY_CONFIG_DEFINES += BOARD_FLASH_RESERVED=$(BOARD_FLASH_RESERVED)
+endif
+
 # Qstr definitions (must come before including py.mk)
 QSTR_DEFS = qstrdefsport.h
 QSTR_GLOBAL_DEPENDENCIES = $(BOARD_DIR)/mpconfigboard.h
@@ -28,9 +39,10 @@ include $(TOP)/py/py.mk
 GIT_SUBMODULES = lib/tinyusb lib/nxp_driver
 
 MCU_DIR = lib/nxp_driver/sdk/devices/$(MCU_SERIES)
-LD_FILES = boards/$(BOARD)/$(BOARD).ld boards/$(MCU_SERIES).ld boards/common.ld
+LD_FILES = boards/$(MCU_SERIES).ld boards/common.ld
 
 MAKE_PINS = boards/make-pins.py
+MAKE_FLEXRAM_LD = boards/make-flexram-config.py
 BOARD_PINS = $(BOARD_DIR)/pins.csv
 AF_FILE = boards/$(MCU_SERIES)_af.csv
 PREFIX_FILE = boards/mimxrt_prefix.c
@@ -39,18 +51,19 @@ GEN_PINS_HDR = $(HEADER_BUILD)/pins.h
 GEN_PINS_QSTR = $(BUILD)/pins_qstr.h
 GEN_PINS_AF_CONST = $(HEADER_BUILD)/pins_af_const.h
 GEN_PINS_AF_PY = $(BUILD)/pins_af.py
+GEN_FLEXRAM_CONFIG_SRC = $(BUILD)/flexram_config.s
 
 # mcu driver cause following warnings
 #CFLAGS += -Wno-error=float-equal -Wno-error=nested-externs
 CFLAGS += -Wno-error=unused-parameter
 
 INC += -I.
+INC += -Ihal
 INC += -I$(BOARD_DIR)
 INC += -I$(BUILD)
 INC += -I$(TOP)
 INC += -I$(TOP)/$(MCU_DIR)
 INC += -I$(TOP)/$(MCU_DIR)/drivers
-INC += -I$(TOP)/$(MCU_DIR)/project_template
 INC += -I$(TOP)/lib/cmsis/inc
 INC += -I$(TOP)/lib/oofatfs
 INC += -I$(TOP)/lib/tinyusb/hw
@@ -67,10 +80,20 @@ CFLAGS += -DXIP_EXTERNAL_FLASH=1 \
 	-D__STARTUP_CLEAR_BSS \
 	-D__STARTUP_INITIALIZE_RAMFUNCTION \
 	-D__START=main \
-	-DCPU_HEADER_H='<$(MCU_SERIES).h>'
+	-DCPU_HEADER_H='<$(MCU_SERIES).h>' \
+	-DBOARD_FLASH_SIZE=$(BOARD_FLASH_SIZE) \
+	-DBOARD_FLASH_CONFIG_HEADER_H=\"$(BOARD)_flexspi_nor_config.h\"
+
+ifeq ($(BOARD_FLASH_TYPE), qspi_nor)
+CFLAGS += -DBOARD_FLASH_OPS_HEADER_H=\"hal/flexspi_nor_flash.h\"
+else ifeq ($(BOARD_FLASH_TYPE), hyperflash)
+CFLAGS += -DBOARD_FLASH_OPS_HEADER_H=\"hal/flexspi_hyper_flash.h\"
+endif
+
 ifeq ($(MICROPY_PY_MACHINE_SDCARD),1)
 CFLAGS += -DMICROPY_PY_MACHINE_SDCARD=1
 endif
+
 CFLAGS += $(CFLAGS_MOD) $(CFLAGS_EXTRA)
 
 # Configure floating point support
@@ -88,7 +111,8 @@ endif
 SUPPORTS_HARDWARE_FP_SINGLE = 0
 SUPPORTS_HARDWARE_FP_DOUBLE = 0
 
-LDFLAGS = $(addprefix -T,$(LD_FILES)) -Map=$@.map --cref --print-memory-usage
+LDFLAGS = -Map=$@.map --cref --print-memory-usage
+LDDEFINES = $(addprefix -D, $(LD_MEMORY_CONFIG_DEFINES))
 LIBS = $(shell $(CC) $(CFLAGS) -print-libgcc-file-name)
 
 # Tune for Debugging or Optimization
@@ -144,7 +168,6 @@ SRC_HAL_IMX_C += $(MCU_DIR)/drivers/fsl_usdhc.c
 endif
 
 SRC_C += \
-	$(BOARD_DIR)/flash_config.c \
 	board_init.c \
 	dma_channel.c \
 	drivers/bus/softspi.c \
@@ -184,6 +207,18 @@ SRC_C += \
 	$(SRC_TINYUSB_C) \
 	$(SRC_HAL_IMX_C) \
 
+ifeq ($(BOARD_FLASH_TYPE), qspi_nor)
+SRC_C += \
+	hal/flexspi_nor_flash.c \
+	$(BOARD_DIR)/qspi_nor_flash_config.c
+else ifeq ($(BOARD_FLASH_TYPE), hyperflash)
+SRC_C += \
+	hal/flexspi_hyper_flash.c \
+	$(BOARD_DIR)/qspi_hyper_flash_config.c
+else
+$(error Error: Unknown board flash type $(BOARD_FLASH_TYPE))
+endif
+
 ifeq ($(MICROPY_FLOAT_IMPL),double)
 LIBM_SRC_C += $(addprefix lib/libm_dbl/,\
 	__cos.c \
@@ -277,7 +312,9 @@ ifeq ($(MICROPY_FLOAT_IMPL),double)
 $(LIBM_O): CFLAGS := $(filter-out -Wdouble-promotion -Wfloat-conversion, $(CFLAGS))
 endif
 
-SRC_SS += $(MCU_DIR)/gcc/startup_$(MCU_SERIES).S
+SRC_SS = \
+	$(MCU_DIR)/gcc/startup_$(MCU_SERIES).S \
+	hal/resethandler_MIMXRT10xx.S
 
 SRC_S += shared/runtime/gchelper_m3.s \
 
@@ -316,8 +353,10 @@ $(BUILD)/lib/tinyusb/src/device/usbd.o: CFLAGS += -Wno-missing-braces
 all: $(BUILD)/firmware.hex $(BUILD)/firmware.bin
 
 $(BUILD)/firmware.elf: $(OBJ)
+	$(ECHO) "PREPROCESS LINK $@"
+	$(Q)$(CC) -E -x c $(LDDEFINES) $(LD_FILES) | grep -v '^#' > $(BUILD)/link.ld
 	$(ECHO) "LINK $@"
-	$(Q)$(LD) $(LDFLAGS) -o $@ $^ $(LIBS)
+	$(Q)$(LD) -T$(BUILD)/link.ld $(LDFLAGS) -o $@ $^ $(LIBS)
 	$(Q)$(SIZE) $@
 
 $(BUILD)/firmware.bin: $(BUILD)/firmware.elf
@@ -326,17 +365,23 @@ $(BUILD)/firmware.bin: $(BUILD)/firmware.elf
 $(BUILD)/firmware.hex: $(BUILD)/firmware.elf
 	$(Q)$(OBJCOPY) -O ihex -R .eeprom $< $@
 
-# Making OBJ use an order-only depenedency on the generated pins.h file
+# Making OBJ use an order-only dependency on the generated pins.h file
 # has the side effect of making the pins.h file before we actually compile
 # any of the objects. The normal dependency generation will deal with the
 # case when pins.h is modified. But when it doesn't exist, we don't know
 # which source files might need it.
-$(OBJ): | $(GEN_PINS_HDR)
+$(OBJ): | $(GEN_PINS_HDR) $(GEN_FLEXRAM_CONFIG_SRC)
 
 # With conditional pins, we may need to regenerate qstrdefs.h when config
 # options change.
 $(HEADER_BUILD)/qstrdefs.generated.h: $(BOARD_DIR)/mpconfigboard.h
 
+$(GEN_FLEXRAM_CONFIG_SRC):
+	$(ECHO) "Create $@"
+	$(Q)$(PYTHON) $(MAKE_FLEXRAM_LD) -d $(TOP)/$(MCU_DIR)/$(MCU_SERIES).h \
+		-f $(TOP)/$(MCU_DIR)/$(MCU_SERIES)_features.h -l boards/$(MCU_SERIES).ld -c $(MCU_SERIES) > $(GEN_FLEXRAM_CONFIG_SRC)
+
+
 # Use a pattern rule here so that make will only call make-pins.py once to make
 # both pins_gen.c and pins.h
 $(BUILD)/%_gen.c $(HEADER_BUILD)/%.h: $(BOARD_PINS) $(MAKE_PINS) $(AF_FILE) $(PREFIX_FILE) | $(HEADER_BUILD)
diff --git a/ports/mimxrt/boards/MIMXRT1010_EVK/MIMXRT1010_EVK.ld b/ports/mimxrt/boards/MIMXRT1010_EVK/MIMXRT1010_EVK.ld
deleted file mode 100644
index 83da7ec73c680..0000000000000
--- a/ports/mimxrt/boards/MIMXRT1010_EVK/MIMXRT1010_EVK.ld
+++ /dev/null
@@ -1 +0,0 @@
-flash_size = 16M;
\ No newline at end of file
diff --git a/ports/mimxrt/boards/MIMXRT1010_EVK/MIMXRT1010_EVK_flexspi_nor_config.h b/ports/mimxrt/boards/MIMXRT1010_EVK/MIMXRT1010_EVK_flexspi_nor_config.h
new file mode 100644
index 0000000000000..aeb5f356ea926
--- /dev/null
+++ b/ports/mimxrt/boards/MIMXRT1010_EVK/MIMXRT1010_EVK_flexspi_nor_config.h
@@ -0,0 +1,257 @@
+/*
+ * Copyright 2019 NXP
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+// Based on tinyusb/hw/bsp/teensy_40/evkmimxrt1010_flexspi_nor_config.h
+
+#ifndef __EVKMIMXRT1011_FLEXSPI_NOR_CONFIG__
+#define __EVKMIMXRT1011_FLEXSPI_NOR_CONFIG__
+
+#include <stdint.h>
+#include <stdbool.h>
+#include "fsl_common.h"
+
+/*! @name Driver version */
+/*@{*/
+/*! @brief XIP_BOARD driver version 2.0.0. */
+#define FSL_XIP_BOARD_DRIVER_VERSION (MAKE_VERSION(2, 0, 0))
+/*@}*/
+
+/* FLEXSPI memory config block related defintions */
+#define FLEXSPI_CFG_BLK_TAG (0x42464346UL)     // ascii "FCFB" Big Endian
+#define FLEXSPI_CFG_BLK_VERSION (0x56010400UL) // V1.4.0
+#define FLEXSPI_CFG_BLK_SIZE (512)
+
+/* FLEXSPI Feature related definitions */
+#define FLEXSPI_FEATURE_HAS_PARALLEL_MODE 1
+
+/* Lookup table related defintions */
+#define CMD_INDEX_READ 0
+#define CMD_INDEX_READSTATUS 1
+#define CMD_INDEX_WRITEENABLE 2
+#define CMD_INDEX_WRITE 4
+
+#define CMD_LUT_SEQ_IDX_READ 0
+#define CMD_LUT_SEQ_IDX_READSTATUS 1
+#define CMD_LUT_SEQ_IDX_WRITEENABLE 3
+#define CMD_LUT_SEQ_IDX_WRITE 9
+
+#define CMD_SDR 0x01
+#define CMD_DDR 0x21
+#define RADDR_SDR 0x02
+#define RADDR_DDR 0x22
+#define CADDR_SDR 0x03
+#define CADDR_DDR 0x23
+#define MODE1_SDR 0x04
+#define MODE1_DDR 0x24
+#define MODE2_SDR 0x05
+#define MODE2_DDR 0x25
+#define MODE4_SDR 0x06
+#define MODE4_DDR 0x26
+#define MODE8_SDR 0x07
+#define MODE8_DDR 0x27
+#define WRITE_SDR 0x08
+#define WRITE_DDR 0x28
+#define READ_SDR 0x09
+#define READ_DDR 0x29
+#define LEARN_SDR 0x0A
+#define LEARN_DDR 0x2A
+#define DATSZ_SDR 0x0B
+#define DATSZ_DDR 0x2B
+#define DUMMY_SDR 0x0C
+#define DUMMY_DDR 0x2C
+#define DUMMY_RWDS_SDR 0x0D
+#define DUMMY_RWDS_DDR 0x2D
+#define JMP_ON_CS 0x1F
+#define STOP 0
+
+#define FLEXSPI_1PAD 0
+#define FLEXSPI_2PAD 1
+#define FLEXSPI_4PAD 2
+#define FLEXSPI_8PAD 3
+
+#define FLEXSPI_LUT_SEQ(cmd0, pad0, op0, cmd1, pad1, op1)                                                              \
+    (FLEXSPI_LUT_OPERAND0(op0) | FLEXSPI_LUT_NUM_PADS0(pad0) | FLEXSPI_LUT_OPCODE0(cmd0) | FLEXSPI_LUT_OPERAND1(op1) | \
+    FLEXSPI_LUT_NUM_PADS1(pad1) | FLEXSPI_LUT_OPCODE1(cmd1))
+
+// !@brief Definitions for FlexSPI Serial Clock Frequency
+typedef enum _FlexSpiSerialClockFreq
+{
+    kFlexSpiSerialClk_30MHz  = 1,
+    kFlexSpiSerialClk_50MHz  = 2,
+    kFlexSpiSerialClk_60MHz  = 3,
+    kFlexSpiSerialClk_75MHz  = 4,
+    kFlexSpiSerialClk_80MHz  = 5,
+    kFlexSpiSerialClk_100MHz = 6,
+    kFlexSpiSerialClk_120MHz = 7,
+    kFlexSpiSerialClk_133MHz = 8,
+} flexspi_serial_clk_freq_t;
+
+// !@brief FlexSPI clock configuration type
+enum
+{
+    kFlexSpiClk_SDR, // !< Clock configure for SDR mode
+    kFlexSpiClk_DDR, // !< Clock configurat for DDR mode
+};
+
+// !@brief FlexSPI Read Sample Clock Source definition
+typedef enum _FlashReadSampleClkSource
+{
+    kFlexSPIReadSampleClk_LoopbackInternally      = 0,
+    kFlexSPIReadSampleClk_LoopbackFromDqsPad      = 1,
+    kFlexSPIReadSampleClk_LoopbackFromSckPad      = 2,
+    kFlexSPIReadSampleClk_ExternalInputFromDqsPad = 3,
+} flexspi_read_sample_clk_t;
+
+// !@brief Misc feature bit definitions
+enum
+{
+    kFlexSpiMiscOffset_DiffClkEnable            = 0, // !< Bit for Differential clock enable
+    kFlexSpiMiscOffset_Ck2Enable                = 1, // !< Bit for CK2 enable
+    kFlexSpiMiscOffset_ParallelEnable           = 2, // !< Bit for Parallel mode enable
+    kFlexSpiMiscOffset_WordAddressableEnable    = 3, // !< Bit for Word Addressable enable
+    kFlexSpiMiscOffset_SafeConfigFreqEnable     = 4, // !< Bit for Safe Configuration Frequency enable
+    kFlexSpiMiscOffset_PadSettingOverrideEnable = 5, // !< Bit for Pad setting override enable
+    kFlexSpiMiscOffset_DdrModeEnable            = 6, // !< Bit for DDR clock confiuration indication.
+};
+
+// !@brief Flash Type Definition
+enum
+{
+    kFlexSpiDeviceType_SerialNOR    = 1,    // !< Flash devices are Serial NOR
+    kFlexSpiDeviceType_SerialNAND   = 2,    // !< Flash devices are Serial NAND
+    kFlexSpiDeviceType_SerialRAM    = 3,    // !< Flash devices are Serial RAM/HyperFLASH
+    kFlexSpiDeviceType_MCP_NOR_NAND = 0x12, // !< Flash device is MCP device, A1 is Serial NOR, A2 is Serial NAND
+    kFlexSpiDeviceType_MCP_NOR_RAM  = 0x13, // !< Flash deivce is MCP device, A1 is Serial NOR, A2 is Serial RAMs
+};
+
+// !@brief Flash Pad Definitions
+enum
+{
+    kSerialFlash_1Pad  = 1,
+    kSerialFlash_2Pads = 2,
+    kSerialFlash_4Pads = 4,
+    kSerialFlash_8Pads = 8,
+};
+
+// !@brief FlexSPI LUT Sequence structure
+typedef struct _lut_sequence
+{
+    uint8_t seqNum; // !< Sequence Number, valid number: 1-16
+    uint8_t seqId;  // !< Sequence Index, valid number: 0-15
+    uint16_t reserved;
+} flexspi_lut_seq_t;
+
+// !@brief Flash Configuration Command Type
+enum
+{
+    kDeviceConfigCmdType_Generic,    // !< Generic command, for example: configure dummy cycles, drive strength, etc
+    kDeviceConfigCmdType_QuadEnable, // !< Quad Enable command
+    kDeviceConfigCmdType_Spi2Xpi,    // !< Switch from SPI to DPI/QPI/OPI mode
+    kDeviceConfigCmdType_Xpi2Spi,    // !< Switch from DPI/QPI/OPI to SPI mode
+    kDeviceConfigCmdType_Spi2NoCmd,  // !< Switch to 0-4-4/0-8-8 mode
+    kDeviceConfigCmdType_Reset,      // !< Reset device command
+};
+
+// !@brief FlexSPI Memory Configuration Block
+typedef struct _FlexSPIConfig
+{
+    uint32_t tag;               // !< [0x000-0x003] Tag, fixed value 0x42464346UL
+    uint32_t version;           // !< [0x004-0x007] Version,[31:24] -'V', [23:16] - Major, [15:8] - Minor, [7:0] - bugfix
+    uint32_t reserved0;         // !< [0x008-0x00b] Reserved for future use
+    uint8_t readSampleClkSrc;   // !< [0x00c-0x00c] Read Sample Clock Source, valid value: 0/1/3
+    uint8_t csHoldTime;         // !< [0x00d-0x00d] CS hold time, default value: 3
+    uint8_t csSetupTime;        // !< [0x00e-0x00e] CS setup time, default value: 3
+    uint8_t columnAddressWidth; // !< [0x00f-0x00f] Column Address with, for HyperBus protocol, it is fixed to 3, For
+    // ! Serial NAND, need to refer to datasheet
+    uint8_t deviceModeCfgEnable; // !< [0x010-0x010] Device Mode Configure enable flag, 1 - Enable, 0 - Disable
+    uint8_t deviceModeType; // !< [0x011-0x011] Specify the configuration command type:Quad Enable, DPI/QPI/OPI switch,
+    // ! Generic configuration, etc.
+    uint16_t waitTimeCfgCommands; // !< [0x012-0x013] Wait time for all configuration commands, unit: 100us, Used for
+    // ! DPI/QPI/OPI switch or reset command
+    flexspi_lut_seq_t deviceModeSeq; // !< [0x014-0x017] Device mode sequence info, [7:0] - LUT sequence id, [15:8] - LUt
+    // ! sequence number, [31:16] Reserved
+    uint32_t deviceModeArg;    // !< [0x018-0x01b] Argument/Parameter for device configuration
+    uint8_t configCmdEnable;   // !< [0x01c-0x01c] Configure command Enable Flag, 1 - Enable, 0 - Disable
+    uint8_t configModeType[3]; // !< [0x01d-0x01f] Configure Mode Type, similar as deviceModeTpe
+    flexspi_lut_seq_t
+        configCmdSeqs[3]; // !< [0x020-0x02b] Sequence info for Device Configuration command, similar as deviceModeSeq
+    uint32_t reserved1;   // !< [0x02c-0x02f] Reserved for future use
+    uint32_t configCmdArgs[3];     // !< [0x030-0x03b] Arguments/Parameters for device Configuration commands
+    uint32_t reserved2;            // !< [0x03c-0x03f] Reserved for future use
+    uint32_t controllerMiscOption; // !< [0x040-0x043] Controller Misc Options, see Misc feature bit definitions for more
+    // ! details
+    uint8_t deviceType;    // !< [0x044-0x044] Device Type:  See Flash Type Definition for more details
+    uint8_t sflashPadType; // !< [0x045-0x045] Serial Flash Pad Type: 1 - Single, 2 - Dual, 4 - Quad, 8 - Octal
+    uint8_t serialClkFreq; // !< [0x046-0x046] Serial Flash Frequencey, device specific definitions, See System Boot
+    // ! Chapter for more details
+    uint8_t lutCustomSeqEnable; // !< [0x047-0x047] LUT customization Enable, it is required if the program/erase cannot
+    // ! be done using 1 LUT sequence, currently, only applicable to HyperFLASH
+    uint32_t reserved3[2];           // !< [0x048-0x04f] Reserved for future use
+    uint32_t sflashA1Size;           // !< [0x050-0x053] Size of Flash connected to A1
+    uint32_t sflashA2Size;           // !< [0x054-0x057] Size of Flash connected to A2
+    uint32_t sflashB1Size;           // !< [0x058-0x05b] Size of Flash connected to B1
+    uint32_t sflashB2Size;           // !< [0x05c-0x05f] Size of Flash connected to B2
+    uint32_t csPadSettingOverride;   // !< [0x060-0x063] CS pad setting override value
+    uint32_t sclkPadSettingOverride; // !< [0x064-0x067] SCK pad setting override value
+    uint32_t dataPadSettingOverride; // !< [0x068-0x06b] data pad setting override value
+    uint32_t dqsPadSettingOverride;  // !< [0x06c-0x06f] DQS pad setting override value
+    uint32_t timeoutInMs;            // !< [0x070-0x073] Timeout threshold for read status command
+    uint32_t commandInterval;        // !< [0x074-0x077] CS deselect interval between two commands
+    uint16_t dataValidTime[2]; // !< [0x078-0x07b] CLK edge to data valid time for PORT A and PORT B, in terms of 0.1ns
+    uint16_t busyOffset;       // !< [0x07c-0x07d] Busy offset, valid value: 0-31
+    uint16_t busyBitPolarity;  // !< [0x07e-0x07f] Busy flag polarity, 0 - busy flag is 1 when flash device is busy, 1 -
+    // ! busy flag is 0 when flash device is busy
+    uint32_t lookupTable[64];           // !< [0x080-0x17f] Lookup table holds Flash command sequences
+    flexspi_lut_seq_t lutCustomSeq[12]; // !< [0x180-0x1af] Customizable LUT Sequences
+    uint32_t reserved4[4];              // !< [0x1b0-0x1bf] Reserved for future use
+} flexspi_mem_config_t;
+
+/*  */
+#define NOR_CMD_LUT_SEQ_IDX_READ_NORMAL 0
+#define NOR_CMD_LUT_SEQ_IDX_READSTATUSREG 1
+#define NOR_CMD_LUT_SEQ_IDX_READ_FAST_QUAD 2
+#define NOR_CMD_LUT_SEQ_IDX_WRITEENABLE 3
+#define NOR_CMD_LUT_SEQ_IDX_READSTATUS_XPI 4
+#define NOR_CMD_LUT_SEQ_IDX_ERASESECTOR 5
+#define NOR_CMD_LUT_SEQ_IDX_WRITESTATUSREG 6
+#define NOR_CMD_LUT_SEQ_IDX_PAGEPROGRAM_QUAD 7
+#define NOR_CMD_LUT_SEQ_IDX_READID 8
+#define NOR_CMD_LUT_SEQ_IDX_PAGEPROGRAM 9
+#define NOR_CMD_LUT_SEQ_IDX_ENTERQPI 10
+#define NOR_CMD_LUT_SEQ_IDX_CHIPERASE 11
+#define NOR_CMD_LUT_SEQ_IDX_EXITQPI 12
+
+/*
+ *  Serial NOR configuration block
+ */
+typedef struct _flexspi_nor_config
+{
+    flexspi_mem_config_t memConfig; // !< Common memory configuration info via FlexSPI
+    uint32_t pageSize;              // !< Page size of Serial NOR
+    uint32_t sectorSize;            // !< Sector size of Serial NOR
+    uint8_t ipcmdSerialClkFreq;     // !< Clock frequency for IP command
+    uint8_t isUniformBlockSize;     // !< Sector/Block size is the same
+    uint8_t reserved0[2];           // !< Reserved for future use
+    uint8_t serialNorType;          // !< Serial NOR Flash type: 0/1/2/3
+    uint8_t needExitNoCmdMode;      // !< Need to exit NoCmd mode before other IP command
+    uint8_t halfClkForNonReadCmd;   // !< Half the Serial Clock for non-read command: true/false
+    uint8_t needRestoreNoCmdMode;   // !< Need to Restore NoCmd mode after IP commmand execution
+    uint32_t blockSize;             // !< Block size
+    uint32_t reserve2[11];          // !< Reserved for future use
+} flexspi_nor_config_t;
+
+#define FLASH_BUSY_STATUS_POL 0
+#define FLASH_BUSY_STATUS_OFFSET 0
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* __EVKMIMXRT1011_FLEXSPI_NOR_CONFIG__ */
diff --git a/ports/mimxrt/boards/MIMXRT1010_EVK/clock_config.h b/ports/mimxrt/boards/MIMXRT1010_EVK/clock_config.h
new file mode 100644
index 0000000000000..76f3df422f9d0
--- /dev/null
+++ b/ports/mimxrt/boards/MIMXRT1010_EVK/clock_config.h
@@ -0,0 +1,104 @@
+/*
+ * Copyright 2019 NXP
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#ifndef _CLOCK_CONFIG_H_
+#define _CLOCK_CONFIG_H_
+
+#include "fsl_common.h"
+
+/*******************************************************************************
+ * Definitions
+ ******************************************************************************/
+#define BOARD_XTAL0_CLK_HZ 24000000U /*!< Board xtal0 frequency in Hz */
+
+#define BOARD_XTAL32K_CLK_HZ 32768U /*!< Board xtal32k frequency in Hz */
+/*******************************************************************************
+ ************************ BOARD_InitBootClocks function ************************
+ ******************************************************************************/
+
+#if defined(__cplusplus)
+extern "C" {
+#endif /* __cplusplus*/
+
+/*!
+ * @brief This function executes default configuration of clocks.
+ *
+ */
+void BOARD_InitBootClocks(void);
+
+#if defined(__cplusplus)
+}
+#endif /* __cplusplus*/
+
+/*******************************************************************************
+ ********************** Configuration BOARD_BootClockRUN ***********************
+ ******************************************************************************/
+/*******************************************************************************
+ * Definitions for BOARD_BootClockRUN configuration
+ ******************************************************************************/
+#define BOARD_BOOTCLOCKRUN_CORE_CLOCK 500000000U /*!< Core clock frequency: 500000000Hz */
+
+/* Clock outputs (values are in Hz): */
+#define BOARD_BOOTCLOCKRUN_ADC_ALT_CLK 40000000UL
+#define BOARD_BOOTCLOCKRUN_CKIL_SYNC_CLK_ROOT 32768UL
+#define BOARD_BOOTCLOCKRUN_CLKO1_CLK 0UL
+#define BOARD_BOOTCLOCKRUN_CLKO2_CLK 0UL
+#define BOARD_BOOTCLOCKRUN_CLK_1M 1000000UL
+#define BOARD_BOOTCLOCKRUN_CLK_24M 24000000UL
+#define BOARD_BOOTCLOCKRUN_CORE_CLK_ROOT 500000000UL
+#define BOARD_BOOTCLOCKRUN_ENET_500M_REF_CLK 500000000UL
+#define BOARD_BOOTCLOCKRUN_FLEXIO1_CLK_ROOT 30000000UL
+#define BOARD_BOOTCLOCKRUN_FLEXSPI_CLK_ROOT 132000000UL
+#define BOARD_BOOTCLOCKRUN_GPT1_IPG_CLK_HIGHFREQ 62500000UL
+#define BOARD_BOOTCLOCKRUN_GPT2_IPG_CLK_HIGHFREQ 62500000UL
+#define BOARD_BOOTCLOCKRUN_IPG_CLK_ROOT 125000000UL
+#define BOARD_BOOTCLOCKRUN_LPI2C_CLK_ROOT 60000000UL
+#define BOARD_BOOTCLOCKRUN_LPSPI_CLK_ROOT 105600000UL
+#define BOARD_BOOTCLOCKRUN_MQS_MCLK 63529411UL
+#define BOARD_BOOTCLOCKRUN_PERCLK_CLK_ROOT 62500000UL
+#define BOARD_BOOTCLOCKRUN_SAI1_CLK_ROOT 63529411UL
+#define BOARD_BOOTCLOCKRUN_SAI1_MCLK1 63529411UL
+#define BOARD_BOOTCLOCKRUN_SAI1_MCLK2 63529411UL
+#define BOARD_BOOTCLOCKRUN_SAI1_MCLK3 30000000UL
+#define BOARD_BOOTCLOCKRUN_SAI3_CLK_ROOT 63529411UL
+#define BOARD_BOOTCLOCKRUN_SAI3_MCLK1 63529411UL
+#define BOARD_BOOTCLOCKRUN_SAI3_MCLK2 0UL
+#define BOARD_BOOTCLOCKRUN_SAI3_MCLK3 30000000UL
+#define BOARD_BOOTCLOCKRUN_SPDIF0_CLK_ROOT 30000000UL
+#define BOARD_BOOTCLOCKRUN_SPDIF0_EXTCLK_OUT 0UL
+#define BOARD_BOOTCLOCKRUN_TRACE_CLK_ROOT 117333333UL
+#define BOARD_BOOTCLOCKRUN_UART_CLK_ROOT 80000000UL
+#define BOARD_BOOTCLOCKRUN_USBPHY_CLK 0UL
+
+/*! @brief Usb1 PLL set for BOARD_BootClockRUN configuration.
+ */
+extern const clock_usb_pll_config_t usb1PllConfig_BOARD_BootClockRUN;
+/*! @brief Sys PLL for BOARD_BootClockRUN configuration.
+ */
+extern const clock_sys_pll_config_t sysPllConfig_BOARD_BootClockRUN;
+/*! @brief Enet PLL set for BOARD_BootClockRUN configuration.
+ */
+extern const clock_enet_pll_config_t enetPllConfig_BOARD_BootClockRUN;
+
+/*******************************************************************************
+ * API for BOARD_BootClockRUN configuration
+ ******************************************************************************/
+#if defined(__cplusplus)
+extern "C" {
+#endif /* __cplusplus*/
+
+/*!
+ * @brief This function executes configuration of clocks.
+ *
+ */
+void BOARD_BootClockRUN(void);
+
+#if defined(__cplusplus)
+}
+#endif /* __cplusplus*/
+
+#endif /* _CLOCK_CONFIG_H_ */
diff --git a/ports/mimxrt/boards/MIMXRT1010_EVK/evkmimxrt1010_flexspi_nor_config.h b/ports/mimxrt/boards/MIMXRT1010_EVK/evkmimxrt1010_flexspi_nor_config.h
deleted file mode 100644
index 2cb4535edc15b..0000000000000
--- a/ports/mimxrt/boards/MIMXRT1010_EVK/evkmimxrt1010_flexspi_nor_config.h
+++ /dev/null
@@ -1,257 +0,0 @@
-/*
- * Copyright 2019 NXP
- * All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-// Based on tinyusb/hw/bsp/teensy_40/evkmimxrt1010_flexspi_nor_config.h
-
-#ifndef __EVKMIMXRT1011_FLEXSPI_NOR_CONFIG__
-#define __EVKMIMXRT1011_FLEXSPI_NOR_CONFIG__
-
-#include <stdint.h>
-#include <stdbool.h>
-#include "fsl_common.h"
-
-/*! @name Driver version */
-/*@{*/
-/*! @brief XIP_BOARD driver version 2.0.0. */
-#define FSL_XIP_BOARD_DRIVER_VERSION (MAKE_VERSION(2, 0, 0))
-/*@}*/
-
-/* FLEXSPI memory config block related defintions */
-#define FLEXSPI_CFG_BLK_TAG (0x42464346UL)     // ascii "FCFB" Big Endian
-#define FLEXSPI_CFG_BLK_VERSION (0x56010400UL) // V1.4.0
-#define FLEXSPI_CFG_BLK_SIZE (512)
-
-/* FLEXSPI Feature related definitions */
-#define FLEXSPI_FEATURE_HAS_PARALLEL_MODE 1
-
-/* Lookup table related defintions */
-#define CMD_INDEX_READ 0
-#define CMD_INDEX_READSTATUS 1
-#define CMD_INDEX_WRITEENABLE 2
-#define CMD_INDEX_WRITE 4
-
-#define CMD_LUT_SEQ_IDX_READ 0
-#define CMD_LUT_SEQ_IDX_READSTATUS 1
-#define CMD_LUT_SEQ_IDX_WRITEENABLE 3
-#define CMD_LUT_SEQ_IDX_WRITE 9
-
-#define CMD_SDR 0x01
-#define CMD_DDR 0x21
-#define RADDR_SDR 0x02
-#define RADDR_DDR 0x22
-#define CADDR_SDR 0x03
-#define CADDR_DDR 0x23
-#define MODE1_SDR 0x04
-#define MODE1_DDR 0x24
-#define MODE2_SDR 0x05
-#define MODE2_DDR 0x25
-#define MODE4_SDR 0x06
-#define MODE4_DDR 0x26
-#define MODE8_SDR 0x07
-#define MODE8_DDR 0x27
-#define WRITE_SDR 0x08
-#define WRITE_DDR 0x28
-#define READ_SDR 0x09
-#define READ_DDR 0x29
-#define LEARN_SDR 0x0A
-#define LEARN_DDR 0x2A
-#define DATSZ_SDR 0x0B
-#define DATSZ_DDR 0x2B
-#define DUMMY_SDR 0x0C
-#define DUMMY_DDR 0x2C
-#define DUMMY_RWDS_SDR 0x0D
-#define DUMMY_RWDS_DDR 0x2D
-#define JMP_ON_CS 0x1F
-#define STOP 0
-
-#define FLEXSPI_1PAD 0
-#define FLEXSPI_2PAD 1
-#define FLEXSPI_4PAD 2
-#define FLEXSPI_8PAD 3
-
-#define FLEXSPI_LUT_SEQ(cmd0, pad0, op0, cmd1, pad1, op1)                                                              \
-    (FLEXSPI_LUT_OPERAND0(op0) | FLEXSPI_LUT_NUM_PADS0(pad0) | FLEXSPI_LUT_OPCODE0(cmd0) | FLEXSPI_LUT_OPERAND1(op1) | \
-     FLEXSPI_LUT_NUM_PADS1(pad1) | FLEXSPI_LUT_OPCODE1(cmd1))
-
-//!@brief Definitions for FlexSPI Serial Clock Frequency
-typedef enum _FlexSpiSerialClockFreq
-{
-    kFlexSpiSerialClk_30MHz  = 1,
-    kFlexSpiSerialClk_50MHz  = 2,
-    kFlexSpiSerialClk_60MHz  = 3,
-    kFlexSpiSerialClk_75MHz  = 4,
-    kFlexSpiSerialClk_80MHz  = 5,
-    kFlexSpiSerialClk_100MHz = 6,
-    kFlexSpiSerialClk_120MHz = 7,
-    kFlexSpiSerialClk_133MHz = 8,
-} flexspi_serial_clk_freq_t;
-
-//!@brief FlexSPI clock configuration type
-enum
-{
-    kFlexSpiClk_SDR, //!< Clock configure for SDR mode
-    kFlexSpiClk_DDR, //!< Clock configurat for DDR mode
-};
-
-//!@brief FlexSPI Read Sample Clock Source definition
-typedef enum _FlashReadSampleClkSource
-{
-    kFlexSPIReadSampleClk_LoopbackInternally      = 0,
-    kFlexSPIReadSampleClk_LoopbackFromDqsPad      = 1,
-    kFlexSPIReadSampleClk_LoopbackFromSckPad      = 2,
-    kFlexSPIReadSampleClk_ExternalInputFromDqsPad = 3,
-} flexspi_read_sample_clk_t;
-
-//!@brief Misc feature bit definitions
-enum
-{
-    kFlexSpiMiscOffset_DiffClkEnable            = 0, //!< Bit for Differential clock enable
-    kFlexSpiMiscOffset_Ck2Enable                = 1, //!< Bit for CK2 enable
-    kFlexSpiMiscOffset_ParallelEnable           = 2, //!< Bit for Parallel mode enable
-    kFlexSpiMiscOffset_WordAddressableEnable    = 3, //!< Bit for Word Addressable enable
-    kFlexSpiMiscOffset_SafeConfigFreqEnable     = 4, //!< Bit for Safe Configuration Frequency enable
-    kFlexSpiMiscOffset_PadSettingOverrideEnable = 5, //!< Bit for Pad setting override enable
-    kFlexSpiMiscOffset_DdrModeEnable            = 6, //!< Bit for DDR clock confiuration indication.
-};
-
-//!@brief Flash Type Definition
-enum
-{
-    kFlexSpiDeviceType_SerialNOR    = 1,    //!< Flash devices are Serial NOR
-    kFlexSpiDeviceType_SerialNAND   = 2,    //!< Flash devices are Serial NAND
-    kFlexSpiDeviceType_SerialRAM    = 3,    //!< Flash devices are Serial RAM/HyperFLASH
-    kFlexSpiDeviceType_MCP_NOR_NAND = 0x12, //!< Flash device is MCP device, A1 is Serial NOR, A2 is Serial NAND
-    kFlexSpiDeviceType_MCP_NOR_RAM  = 0x13, //!< Flash deivce is MCP device, A1 is Serial NOR, A2 is Serial RAMs
-};
-
-//!@brief Flash Pad Definitions
-enum
-{
-    kSerialFlash_1Pad  = 1,
-    kSerialFlash_2Pads = 2,
-    kSerialFlash_4Pads = 4,
-    kSerialFlash_8Pads = 8,
-};
-
-//!@brief FlexSPI LUT Sequence structure
-typedef struct _lut_sequence
-{
-    uint8_t seqNum; //!< Sequence Number, valid number: 1-16
-    uint8_t seqId;  //!< Sequence Index, valid number: 0-15
-    uint16_t reserved;
-} flexspi_lut_seq_t;
-
-//!@brief Flash Configuration Command Type
-enum
-{
-    kDeviceConfigCmdType_Generic,    //!< Generic command, for example: configure dummy cycles, drive strength, etc
-    kDeviceConfigCmdType_QuadEnable, //!< Quad Enable command
-    kDeviceConfigCmdType_Spi2Xpi,    //!< Switch from SPI to DPI/QPI/OPI mode
-    kDeviceConfigCmdType_Xpi2Spi,    //!< Switch from DPI/QPI/OPI to SPI mode
-    kDeviceConfigCmdType_Spi2NoCmd,  //!< Switch to 0-4-4/0-8-8 mode
-    kDeviceConfigCmdType_Reset,      //!< Reset device command
-};
-
-//!@brief FlexSPI Memory Configuration Block
-typedef struct _FlexSPIConfig
-{
-    uint32_t tag;               //!< [0x000-0x003] Tag, fixed value 0x42464346UL
-    uint32_t version;           //!< [0x004-0x007] Version,[31:24] -'V', [23:16] - Major, [15:8] - Minor, [7:0] - bugfix
-    uint32_t reserved0;         //!< [0x008-0x00b] Reserved for future use
-    uint8_t readSampleClkSrc;   //!< [0x00c-0x00c] Read Sample Clock Source, valid value: 0/1/3
-    uint8_t csHoldTime;         //!< [0x00d-0x00d] CS hold time, default value: 3
-    uint8_t csSetupTime;        //!< [0x00e-0x00e] CS setup time, default value: 3
-    uint8_t columnAddressWidth; //!< [0x00f-0x00f] Column Address with, for HyperBus protocol, it is fixed to 3, For
-    //! Serial NAND, need to refer to datasheet
-    uint8_t deviceModeCfgEnable; //!< [0x010-0x010] Device Mode Configure enable flag, 1 - Enable, 0 - Disable
-    uint8_t deviceModeType; //!< [0x011-0x011] Specify the configuration command type:Quad Enable, DPI/QPI/OPI switch,
-    //! Generic configuration, etc.
-    uint16_t waitTimeCfgCommands; //!< [0x012-0x013] Wait time for all configuration commands, unit: 100us, Used for
-    //! DPI/QPI/OPI switch or reset command
-    flexspi_lut_seq_t deviceModeSeq; //!< [0x014-0x017] Device mode sequence info, [7:0] - LUT sequence id, [15:8] - LUt
-    //! sequence number, [31:16] Reserved
-    uint32_t deviceModeArg;    //!< [0x018-0x01b] Argument/Parameter for device configuration
-    uint8_t configCmdEnable;   //!< [0x01c-0x01c] Configure command Enable Flag, 1 - Enable, 0 - Disable
-    uint8_t configModeType[3]; //!< [0x01d-0x01f] Configure Mode Type, similar as deviceModeTpe
-    flexspi_lut_seq_t
-        configCmdSeqs[3]; //!< [0x020-0x02b] Sequence info for Device Configuration command, similar as deviceModeSeq
-    uint32_t reserved1;   //!< [0x02c-0x02f] Reserved for future use
-    uint32_t configCmdArgs[3];     //!< [0x030-0x03b] Arguments/Parameters for device Configuration commands
-    uint32_t reserved2;            //!< [0x03c-0x03f] Reserved for future use
-    uint32_t controllerMiscOption; //!< [0x040-0x043] Controller Misc Options, see Misc feature bit definitions for more
-    //! details
-    uint8_t deviceType;    //!< [0x044-0x044] Device Type:  See Flash Type Definition for more details
-    uint8_t sflashPadType; //!< [0x045-0x045] Serial Flash Pad Type: 1 - Single, 2 - Dual, 4 - Quad, 8 - Octal
-    uint8_t serialClkFreq; //!< [0x046-0x046] Serial Flash Frequencey, device specific definitions, See System Boot
-    //! Chapter for more details
-    uint8_t lutCustomSeqEnable; //!< [0x047-0x047] LUT customization Enable, it is required if the program/erase cannot
-    //! be done using 1 LUT sequence, currently, only applicable to HyperFLASH
-    uint32_t reserved3[2];           //!< [0x048-0x04f] Reserved for future use
-    uint32_t sflashA1Size;           //!< [0x050-0x053] Size of Flash connected to A1
-    uint32_t sflashA2Size;           //!< [0x054-0x057] Size of Flash connected to A2
-    uint32_t sflashB1Size;           //!< [0x058-0x05b] Size of Flash connected to B1
-    uint32_t sflashB2Size;           //!< [0x05c-0x05f] Size of Flash connected to B2
-    uint32_t csPadSettingOverride;   //!< [0x060-0x063] CS pad setting override value
-    uint32_t sclkPadSettingOverride; //!< [0x064-0x067] SCK pad setting override value
-    uint32_t dataPadSettingOverride; //!< [0x068-0x06b] data pad setting override value
-    uint32_t dqsPadSettingOverride;  //!< [0x06c-0x06f] DQS pad setting override value
-    uint32_t timeoutInMs;            //!< [0x070-0x073] Timeout threshold for read status command
-    uint32_t commandInterval;        //!< [0x074-0x077] CS deselect interval between two commands
-    uint16_t dataValidTime[2]; //!< [0x078-0x07b] CLK edge to data valid time for PORT A and PORT B, in terms of 0.1ns
-    uint16_t busyOffset;       //!< [0x07c-0x07d] Busy offset, valid value: 0-31
-    uint16_t busyBitPolarity;  //!< [0x07e-0x07f] Busy flag polarity, 0 - busy flag is 1 when flash device is busy, 1 -
-    //! busy flag is 0 when flash device is busy
-    uint32_t lookupTable[64];           //!< [0x080-0x17f] Lookup table holds Flash command sequences
-    flexspi_lut_seq_t lutCustomSeq[12]; //!< [0x180-0x1af] Customizable LUT Sequences
-    uint32_t reserved4[4];              //!< [0x1b0-0x1bf] Reserved for future use
-} flexspi_mem_config_t;
-
-/*  */
-#define NOR_CMD_LUT_SEQ_IDX_READ_NORMAL 0
-#define NOR_CMD_LUT_SEQ_IDX_READSTATUSREG 1
-#define NOR_CMD_LUT_SEQ_IDX_READ_FAST_QUAD 2
-#define NOR_CMD_LUT_SEQ_IDX_WRITEENABLE 3
-#define NOR_CMD_LUT_SEQ_IDX_READSTATUS_XPI 4
-#define NOR_CMD_LUT_SEQ_IDX_ERASESECTOR 5
-#define NOR_CMD_LUT_SEQ_IDX_WRITESTATUSREG 6
-#define NOR_CMD_LUT_SEQ_IDX_PAGEPROGRAM_QUAD 7
-#define NOR_CMD_LUT_SEQ_IDX_READID 8
-#define NOR_CMD_LUT_SEQ_IDX_PAGEPROGRAM 9
-#define NOR_CMD_LUT_SEQ_IDX_ENTERQPI 10
-#define NOR_CMD_LUT_SEQ_IDX_CHIPERASE 11
-#define NOR_CMD_LUT_SEQ_IDX_EXITQPI 12
-
-/*
- *  Serial NOR configuration block
- */
-typedef struct _flexspi_nor_config
-{
-    flexspi_mem_config_t memConfig; //!< Common memory configuration info via FlexSPI
-    uint32_t pageSize;              //!< Page size of Serial NOR
-    uint32_t sectorSize;            //!< Sector size of Serial NOR
-    uint8_t ipcmdSerialClkFreq;     //!< Clock frequency for IP command
-    uint8_t isUniformBlockSize;     //!< Sector/Block size is the same
-    uint8_t reserved0[2];           //!< Reserved for future use
-    uint8_t serialNorType;          //!< Serial NOR Flash type: 0/1/2/3
-    uint8_t needExitNoCmdMode;      //!< Need to exit NoCmd mode before other IP command
-    uint8_t halfClkForNonReadCmd;   //!< Half the Serial Clock for non-read command: true/false
-    uint8_t needRestoreNoCmdMode;   //!< Need to Restore NoCmd mode after IP commmand execution
-    uint32_t blockSize;             //!< Block size
-    uint32_t reserve2[11];          //!< Reserved for future use
-} flexspi_nor_config_t;
-
-#define FLASH_BUSY_STATUS_POL 0
-#define FLASH_BUSY_STATUS_OFFSET 0
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* __EVKMIMXRT1011_FLEXSPI_NOR_CONFIG__ */
diff --git a/ports/mimxrt/boards/MIMXRT1010_EVK/flash_config.c b/ports/mimxrt/boards/MIMXRT1010_EVK/flash_config.c
deleted file mode 100644
index 5e7e5dcf15fb0..0000000000000
--- a/ports/mimxrt/boards/MIMXRT1010_EVK/flash_config.c
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * Copyright 2019 NXP
- * All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-// Based on tinyusb/hw/bsp/teensy_40/evkmimxrt1010_flexspi_nor_config.c
-
-#include "evkmimxrt1010_flexspi_nor_config.h"
-
-/* Component ID definition, used by tools. */
-#ifndef FSL_COMPONENT_ID
-#define FSL_COMPONENT_ID "platform.drivers.xip_board"
-#endif
-
-/*******************************************************************************
- * Code
- ******************************************************************************/
-#if defined(XIP_BOOT_HEADER_ENABLE) && (XIP_BOOT_HEADER_ENABLE == 1)
-#if defined(__CC_ARM) || defined(__ARMCC_VERSION) || defined(__GNUC__)
-__attribute__((section(".boot_hdr.conf")))
-#elif defined(__ICCARM__)
-#pragma location = ".boot_hdr.conf"
-#endif
-
-const flexspi_nor_config_t qspiflash_config = {
-    .memConfig =
-        {
-            .tag              = FLEXSPI_CFG_BLK_TAG,
-            .version          = FLEXSPI_CFG_BLK_VERSION,
-            .readSampleClkSrc = kFlexSPIReadSampleClk_LoopbackFromDqsPad,
-            .csHoldTime       = 3u,
-            .csSetupTime      = 3u,
-            .sflashPadType    = kSerialFlash_4Pads,
-            .serialClkFreq    = kFlexSpiSerialClk_100MHz,
-            .sflashA1Size     = 16u * 1024u * 1024u,
-            .lookupTable =
-                {
-                    // 0 Read LUTs 0 -> 0
-                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0xEB, RADDR_SDR, FLEXSPI_4PAD, 0x18),
-                    FLEXSPI_LUT_SEQ(DUMMY_SDR, FLEXSPI_4PAD, 0x06, READ_SDR, FLEXSPI_4PAD, 0x04),
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-
-                    // 1 Read status register -> 1
-                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x05, READ_SDR, FLEXSPI_1PAD, 0x01),
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-
-                    // 2 Fast read quad mode - SDR
-                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x6B, RADDR_SDR, FLEXSPI_1PAD, 0x18),
-                    FLEXSPI_LUT_SEQ(DUMMY_SDR, FLEXSPI_4PAD, 0x08, READ_SDR, FLEXSPI_4PAD, 0x04),
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-
-                    // 3 Write Enable -> 3
-                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x06, STOP, FLEXSPI_1PAD, 0),
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-
-                    // 4 Read extend parameters
-                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x81, READ_SDR, FLEXSPI_1PAD, 0x04),
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-
-                    // 5 Erase Sector -> 5
-                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x20, RADDR_SDR, FLEXSPI_1PAD, 24),
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-
-                    // 6 Write Status Reg
-                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x01, WRITE_SDR, FLEXSPI_1PAD, 0x04),
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-
-                    // 7 Page Program - quad mode (-> 9)
-                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x32, RADDR_SDR, FLEXSPI_1PAD, 0x18),
-                    FLEXSPI_LUT_SEQ(WRITE_SDR, FLEXSPI_4PAD, 0x04, STOP, FLEXSPI_1PAD, 0),
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-
-                    // 8 Read ID
-                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x90, DUMMY_SDR, FLEXSPI_1PAD, 24),
-                    FLEXSPI_LUT_SEQ(READ_SDR, FLEXSPI_1PAD, 0x00, 0, 0, 0),
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-
-                    // 9 Page Program - single mode -> 9
-                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x02, RADDR_SDR, FLEXSPI_1PAD, 24),
-                    FLEXSPI_LUT_SEQ(WRITE_SDR, FLEXSPI_1PAD, 0, 0, 0, 0),
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-
-                    // 10 Enter QPI mode
-                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x35, STOP, FLEXSPI_1PAD, 0),
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-
-                    // 11 Erase Chip
-                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x60, STOP, FLEXSPI_1PAD, 0),
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-
-                    // 12 Exit QPI mode
-                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_4PAD, 0xF5, STOP, FLEXSPI_1PAD, 0),
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                },
-        },
-    .pageSize           = 256u,
-    .sectorSize         = 4u * 1024u,
-    .blockSize          = 256u * 1024u,
-    .isUniformBlockSize = false,
-};
-#endif /* XIP_BOOT_HEADER_ENABLE */
diff --git a/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.h b/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.h
index 2cdb433e18e69..918513b2306ef 100644
--- a/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.h
+++ b/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.h
@@ -1,14 +1,10 @@
 #define MICROPY_HW_BOARD_NAME "i.MX RT1010 EVK"
 #define MICROPY_HW_MCU_NAME   "MIMXRT1011DAE5A"
 
-#define BOARD_FLASH_SIZE (16 * 1024 * 1024)
-
 // i.MX RT1010 EVK has 1 board LED
 #define MICROPY_HW_LED1_PIN (pin_GPIO_11)
 #define MICROPY_HW_LED_ON(pin) (mp_hal_pin_high(pin))
 #define MICROPY_HW_LED_OFF(pin) (mp_hal_pin_low(pin))
-#define BOARD_FLASH_CONFIG_HEADER_H "evkmimxrt1010_flexspi_nor_config.h"
-#define BOARD_FLASH_OPS_HEADER_H "hal/flexspi_nor_flash.h"
 
 #define MICROPY_HW_NUM_PIN_IRQS (2 * 32)
 
@@ -33,7 +29,7 @@
     { IOMUXC_GPIO_AD_04_LPSPI1_SDO }, { IOMUXC_GPIO_AD_03_LPSPI1_SDI },
 
 #define DMA_REQ_SRC_RX { 0, kDmaRequestMuxLPSPI1Rx, kDmaRequestMuxLPSPI2Rx }
-#define DMA_REQ_SRC_TX { 0, kDmaRequestMuxLPSPI1Tx, kDmaRequestMuxLPSPI2Tx } 
+#define DMA_REQ_SRC_TX { 0, kDmaRequestMuxLPSPI1Tx, kDmaRequestMuxLPSPI2Tx }
 
 // Define mapping hardware I2C # to logical I2C #
 // SDA/SCL  HW-I2C    Logical I2C
diff --git a/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.mk b/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.mk
index f616d5afd4859..c4c911d7dbf43 100644
--- a/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.mk
+++ b/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.mk
@@ -3,21 +3,18 @@ MCU_VARIANT = MIMXRT1011DAE5A
 
 MICROPY_FLOAT_IMPL = single
 MICROPY_PY_MACHINE_SDCARD = 0
+BOARD_FLASH_TYPE ?= qspi_nor
+BOARD_FLASH_SIZE ?= 0x1000000  # 16MB
 
-SRC_C += \
-	hal/flexspi_nor_flash.c \
-
-JLINK_PATH = /media/RT1010-EVK/
+JLINK_PATH ?= /media/RT1010-EVK/
 JLINK_COMMANDER_SCRIPT = $(BUILD)/script.jlink
 
-
 ifdef JLINK_IP
 JLINK_CONNECTION_SETTINGS = -IP $(JLINK_IP)
 else
 JLINK_CONNECTION_SETTINGS = -USB
 endif
 
-
 deploy_jlink: $(BUILD)/firmware.hex
 	$(Q)$(TOUCH) $(JLINK_COMMANDER_SCRIPT)
 	$(ECHO) "ExitOnError 1" > $(JLINK_COMMANDER_SCRIPT)
diff --git a/ports/mimxrt/boards/MIMXRT1010_EVK/qspi_nor_flash_config.c b/ports/mimxrt/boards/MIMXRT1010_EVK/qspi_nor_flash_config.c
new file mode 100644
index 0000000000000..83a45159c0b21
--- /dev/null
+++ b/ports/mimxrt/boards/MIMXRT1010_EVK/qspi_nor_flash_config.c
@@ -0,0 +1,124 @@
+/*
+ * Copyright 2019 NXP
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+// Based on tinyusb/hw/bsp/teensy_40/evkmimxrt1010_flexspi_nor_config.c
+
+#include BOARD_FLASH_CONFIG_HEADER_H
+
+/* Component ID definition, used by tools. */
+#ifndef FSL_COMPONENT_ID
+#define FSL_COMPONENT_ID "platform.drivers.xip_board"
+#endif
+
+/*******************************************************************************
+ * Code
+ ******************************************************************************/
+#if defined(XIP_BOOT_HEADER_ENABLE) && (XIP_BOOT_HEADER_ENABLE == 1)
+#if defined(__CC_ARM) || defined(__ARMCC_VERSION) || defined(__GNUC__)
+__attribute__((section(".boot_hdr.conf")))
+#elif defined(__ICCARM__)
+#pragma location = ".boot_hdr.conf"
+#endif
+
+const flexspi_nor_config_t qspiflash_config = {
+    .memConfig =
+    {
+        .tag = FLEXSPI_CFG_BLK_TAG,
+        .version = FLEXSPI_CFG_BLK_VERSION,
+        .readSampleClkSrc = kFlexSPIReadSampleClk_LoopbackFromDqsPad,
+        .csHoldTime = 3u,
+        .csSetupTime = 3u,
+        .sflashPadType = kSerialFlash_4Pads,
+        .serialClkFreq = kFlexSpiSerialClk_100MHz,
+        .sflashA1Size = BOARD_FLASH_SIZE,
+        .lookupTable =
+        {
+            // 0 Read LUTs 0 -> 0
+            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0xEB, RADDR_SDR, FLEXSPI_4PAD, 0x18),
+            FLEXSPI_LUT_SEQ(DUMMY_SDR, FLEXSPI_4PAD, 0x06, READ_SDR, FLEXSPI_4PAD, 0x04),
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+
+            // 1 Read status register -> 1
+            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x05, READ_SDR, FLEXSPI_1PAD, 0x01),
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+
+            // 2 Fast read quad mode - SDR
+            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x6B, RADDR_SDR, FLEXSPI_1PAD, 0x18),
+            FLEXSPI_LUT_SEQ(DUMMY_SDR, FLEXSPI_4PAD, 0x08, READ_SDR, FLEXSPI_4PAD, 0x04),
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+
+            // 3 Write Enable -> 3
+            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x06, STOP, FLEXSPI_1PAD, 0),
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+
+            // 4 Read extend parameters
+            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x81, READ_SDR, FLEXSPI_1PAD, 0x04),
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+
+            // 5 Erase Sector -> 5
+            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x20, RADDR_SDR, FLEXSPI_1PAD, 24),
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+
+            // 6 Write Status Reg
+            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x01, WRITE_SDR, FLEXSPI_1PAD, 0x04),
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+
+            // 7 Page Program - quad mode (-> 9)
+            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x32, RADDR_SDR, FLEXSPI_1PAD, 0x18),
+            FLEXSPI_LUT_SEQ(WRITE_SDR, FLEXSPI_4PAD, 0x04, STOP, FLEXSPI_1PAD, 0),
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+
+            // 8 Read ID
+            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x90, DUMMY_SDR, FLEXSPI_1PAD, 24),
+            FLEXSPI_LUT_SEQ(READ_SDR, FLEXSPI_1PAD, 0x00, 0, 0, 0),
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+
+            // 9 Page Program - single mode -> 9
+            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x02, RADDR_SDR, FLEXSPI_1PAD, 24),
+            FLEXSPI_LUT_SEQ(WRITE_SDR, FLEXSPI_1PAD, 0, 0, 0, 0),
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+
+            // 10 Enter QPI mode
+            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x35, STOP, FLEXSPI_1PAD, 0),
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+
+            // 11 Erase Chip
+            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x60, STOP, FLEXSPI_1PAD, 0),
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+
+            // 12 Exit QPI mode
+            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_4PAD, 0xF5, STOP, FLEXSPI_1PAD, 0),
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+        },
+    },
+    .pageSize = 256u,
+    .sectorSize = 4u * 1024u,
+    .blockSize = 256u * 1024u,
+    .isUniformBlockSize = false,
+};
+#endif /* XIP_BOOT_HEADER_ENABLE */
diff --git a/ports/mimxrt/boards/MIMXRT1011.ld b/ports/mimxrt/boards/MIMXRT1011.ld
index d9a495685689a..22d5da3199da9 100644
--- a/ports/mimxrt/boards/MIMXRT1011.ld
+++ b/ports/mimxrt/boards/MIMXRT1011.ld
@@ -1,15 +1,24 @@
 /* Memory configuration */
+#if BOARD_FLASH_RESERVED
+reserved_size = BOARD_FLASH_RESERVED;
+#endif
+
+#if BOARD_FLASH_TYPE==qspi_nor
 flash_start         = 0x60000000;
+#else
+#error Unknown BOARD_FLASH_TYPE
+#endif
+flash_size          = BOARD_FLASH_SIZE;
 flash_end           = DEFINED(reserved_size) ? ((flash_start) + (flash_size - reserved_size)) : ((flash_start) + (flash_size));
-flash_config_start  = 0x60000400;
+flash_config_start  = flash_start + 0x00000400;
 flash_config_size   = 0x00000C00;
-ivt_start           = 0x60001000;
+ivt_start           = flash_start + 0x00001000;
 ivt_size            = 0x00001000;
-interrupts_start    = 0x60002000;
+interrupts_start    = flash_start + 0x00002000;
 interrupts_size     = 0x00000400;
-text_start          = 0x60002400;
-text_size           = ((((text_start) + 1M) + (4k - 1)) & ~(4k - 1)) - (text_start); /* reserve 1M for code but align on 4k boundary */
-vfs_start           = (text_start) + (text_size);
+text_start          = flash_start + 0x00002400;
+vfs_start           = flash_start + 0x00100000;
+text_size           = ((vfs_start) - (text_start));
 vfs_size            = ((flash_end) - (vfs_start));
 itcm_start          = 0x00000000;
 itcm_size           = 0x00008000;
diff --git a/ports/mimxrt/boards/MIMXRT1020_EVK/MIMXRT1020_EVK.ld b/ports/mimxrt/boards/MIMXRT1020_EVK/MIMXRT1020_EVK.ld
deleted file mode 100644
index fd1bf32ede778..0000000000000
--- a/ports/mimxrt/boards/MIMXRT1020_EVK/MIMXRT1020_EVK.ld
+++ /dev/null
@@ -1 +0,0 @@
-flash_size = 8M;
\ No newline at end of file
diff --git a/ports/mimxrt/boards/MIMXRT1020_EVK/MIMXRT1020_EVK_flexspi_nor_config.h b/ports/mimxrt/boards/MIMXRT1020_EVK/MIMXRT1020_EVK_flexspi_nor_config.h
new file mode 100644
index 0000000000000..26ed3de36fe0b
--- /dev/null
+++ b/ports/mimxrt/boards/MIMXRT1020_EVK/MIMXRT1020_EVK_flexspi_nor_config.h
@@ -0,0 +1,258 @@
+/*
+ * Copyright 2019 NXP.
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+// Based on tinyusb/hw/bsp/teensy_40/evkmimxrt1020_flexspi_nor_config.h
+
+#ifndef __EVKMIMXRT1020_FLEXSPI_NOR_CONFIG__
+#define __EVKMIMXRT1020_FLEXSPI_NOR_CONFIG__
+
+#include <stdint.h>
+#include <stdbool.h>
+#include "fsl_common.h"
+
+/*! @name Driver version */
+/*@{*/
+/*! @brief XIP_BOARD driver version 2.0.0. */
+#define FSL_XIP_BOARD_DRIVER_VERSION (MAKE_VERSION(2, 0, 0))
+/*@}*/
+
+/* FLEXSPI memory config block related defintions */
+#define FLEXSPI_CFG_BLK_TAG (0x42464346UL)     // ascii "FCFB" Big Endian
+#define FLEXSPI_CFG_BLK_VERSION (0x56010400UL) // V1.4.0
+#define FLEXSPI_CFG_BLK_SIZE (512)
+
+/* FLEXSPI Feature related definitions */
+#define FLEXSPI_FEATURE_HAS_PARALLEL_MODE 1
+
+/* Lookup table related defintions */
+#define CMD_INDEX_READ 0
+#define CMD_INDEX_READSTATUS 1
+#define CMD_INDEX_WRITEENABLE 2
+#define CMD_INDEX_WRITE 4
+
+#define CMD_LUT_SEQ_IDX_READ 0
+#define CMD_LUT_SEQ_IDX_READSTATUS 1
+#define CMD_LUT_SEQ_IDX_WRITEENABLE 3
+#define CMD_LUT_SEQ_IDX_WRITE 9
+
+#define CMD_SDR 0x01
+#define CMD_DDR 0x21
+#define RADDR_SDR 0x02
+#define RADDR_DDR 0x22
+#define CADDR_SDR 0x03
+#define CADDR_DDR 0x23
+#define MODE1_SDR 0x04
+#define MODE1_DDR 0x24
+#define MODE2_SDR 0x05
+#define MODE2_DDR 0x25
+#define MODE4_SDR 0x06
+#define MODE4_DDR 0x26
+#define MODE8_SDR 0x07
+#define MODE8_DDR 0x27
+#define WRITE_SDR 0x08
+#define WRITE_DDR 0x28
+#define READ_SDR 0x09
+#define READ_DDR 0x29
+#define LEARN_SDR 0x0A
+#define LEARN_DDR 0x2A
+#define DATSZ_SDR 0x0B
+#define DATSZ_DDR 0x2B
+#define DUMMY_SDR 0x0C
+#define DUMMY_DDR 0x2C
+#define DUMMY_RWDS_SDR 0x0D
+#define DUMMY_RWDS_DDR 0x2D
+#define JMP_ON_CS 0x1F
+#define STOP 0
+
+#define FLEXSPI_1PAD 0
+#define FLEXSPI_2PAD 1
+#define FLEXSPI_4PAD 2
+#define FLEXSPI_8PAD 3
+
+#define FLEXSPI_LUT_SEQ(cmd0, pad0, op0, cmd1, pad1, op1)                                                              \
+    (FLEXSPI_LUT_OPERAND0(op0) | FLEXSPI_LUT_NUM_PADS0(pad0) | FLEXSPI_LUT_OPCODE0(cmd0) | FLEXSPI_LUT_OPERAND1(op1) | \
+    FLEXSPI_LUT_NUM_PADS1(pad1) | FLEXSPI_LUT_OPCODE1(cmd1))
+
+// !@brief Definitions for FlexSPI Serial Clock Frequency
+typedef enum _FlexSpiSerialClockFreq
+{
+    kFlexSpiSerialClk_30MHz  = 1,
+    kFlexSpiSerialClk_50MHz  = 2,
+    kFlexSpiSerialClk_60MHz  = 3,
+    kFlexSpiSerialClk_75MHz  = 4,
+    kFlexSpiSerialClk_80MHz  = 5,
+    kFlexSpiSerialClk_100MHz = 6,
+    kFlexSpiSerialClk_133MHz = 7,
+    kFlexSpiSerialClk_166MHz = 8,
+    kFlexSpiSerialClk_200MHz = 9,
+} flexspi_serial_clk_freq_t;
+
+// !@brief FlexSPI clock configuration type
+enum
+{
+    kFlexSpiClk_SDR, // !< Clock configure for SDR mode
+    kFlexSpiClk_DDR, // !< Clock configurat for DDR mode
+};
+
+// !@brief FlexSPI Read Sample Clock Source definition
+typedef enum _FlashReadSampleClkSource
+{
+    kFlexSPIReadSampleClk_LoopbackInternally      = 0,
+    kFlexSPIReadSampleClk_LoopbackFromDqsPad      = 1,
+    kFlexSPIReadSampleClk_LoopbackFromSckPad      = 2,
+    kFlexSPIReadSampleClk_ExternalInputFromDqsPad = 3,
+} flexspi_read_sample_clk_t;
+
+// !@brief Misc feature bit definitions
+enum
+{
+    kFlexSpiMiscOffset_DiffClkEnable            = 0, // !< Bit for Differential clock enable
+    kFlexSpiMiscOffset_Ck2Enable                = 1, // !< Bit for CK2 enable
+    kFlexSpiMiscOffset_ParallelEnable           = 2, // !< Bit for Parallel mode enable
+    kFlexSpiMiscOffset_WordAddressableEnable    = 3, // !< Bit for Word Addressable enable
+    kFlexSpiMiscOffset_SafeConfigFreqEnable     = 4, // !< Bit for Safe Configuration Frequency enable
+    kFlexSpiMiscOffset_PadSettingOverrideEnable = 5, // !< Bit for Pad setting override enable
+    kFlexSpiMiscOffset_DdrModeEnable            = 6, // !< Bit for DDR clock confiuration indication.
+};
+
+// !@brief Flash Type Definition
+enum
+{
+    kFlexSpiDeviceType_SerialNOR    = 1,    // !< Flash devices are Serial NOR
+    kFlexSpiDeviceType_SerialNAND   = 2,    // !< Flash devices are Serial NAND
+    kFlexSpiDeviceType_SerialRAM    = 3,    // !< Flash devices are Serial RAM/HyperFLASH
+    kFlexSpiDeviceType_MCP_NOR_NAND = 0x12, // !< Flash device is MCP device, A1 is Serial NOR, A2 is Serial NAND
+    kFlexSpiDeviceType_MCP_NOR_RAM  = 0x13, // !< Flash deivce is MCP device, A1 is Serial NOR, A2 is Serial RAMs
+};
+
+// !@brief Flash Pad Definitions
+enum
+{
+    kSerialFlash_1Pad  = 1,
+    kSerialFlash_2Pads = 2,
+    kSerialFlash_4Pads = 4,
+    kSerialFlash_8Pads = 8,
+};
+
+// !@brief FlexSPI LUT Sequence structure
+typedef struct _lut_sequence
+{
+    uint8_t seqNum; // !< Sequence Number, valid number: 1-16
+    uint8_t seqId;  // !< Sequence Index, valid number: 0-15
+    uint16_t reserved;
+} flexspi_lut_seq_t;
+
+// !@brief Flash Configuration Command Type
+enum
+{
+    kDeviceConfigCmdType_Generic,    // !< Generic command, for example: configure dummy cycles, drive strength, etc
+    kDeviceConfigCmdType_QuadEnable, // !< Quad Enable command
+    kDeviceConfigCmdType_Spi2Xpi,    // !< Switch from SPI to DPI/QPI/OPI mode
+    kDeviceConfigCmdType_Xpi2Spi,    // !< Switch from DPI/QPI/OPI to SPI mode
+    kDeviceConfigCmdType_Spi2NoCmd,  // !< Switch to 0-4-4/0-8-8 mode
+    kDeviceConfigCmdType_Reset,      // !< Reset device command
+};
+
+// !@brief FlexSPI Memory Configuration Block
+typedef struct _FlexSPIConfig
+{
+    uint32_t tag;               // !< [0x000-0x003] Tag, fixed value 0x42464346UL
+    uint32_t version;           // !< [0x004-0x007] Version,[31:24] -'V', [23:16] - Major, [15:8] - Minor, [7:0] - bugfix
+    uint32_t reserved0;         // !< [0x008-0x00b] Reserved for future use
+    uint8_t readSampleClkSrc;   // !< [0x00c-0x00c] Read Sample Clock Source, valid value: 0/1/3
+    uint8_t csHoldTime;         // !< [0x00d-0x00d] CS hold time, default value: 3
+    uint8_t csSetupTime;        // !< [0x00e-0x00e] CS setup time, default value: 3
+    uint8_t columnAddressWidth; // !< [0x00f-0x00f] Column Address with, for HyperBus protocol, it is fixed to 3, For
+    // ! Serial NAND, need to refer to datasheet
+    uint8_t deviceModeCfgEnable; // !< [0x010-0x010] Device Mode Configure enable flag, 1 - Enable, 0 - Disable
+    uint8_t deviceModeType; // !< [0x011-0x011] Specify the configuration command type:Quad Enable, DPI/QPI/OPI switch,
+    // ! Generic configuration, etc.
+    uint16_t waitTimeCfgCommands; // !< [0x012-0x013] Wait time for all configuration commands, unit: 100us, Used for
+    // ! DPI/QPI/OPI switch or reset command
+    flexspi_lut_seq_t deviceModeSeq; // !< [0x014-0x017] Device mode sequence info, [7:0] - LUT sequence id, [15:8] - LUt
+    // ! sequence number, [31:16] Reserved
+    uint32_t deviceModeArg;    // !< [0x018-0x01b] Argument/Parameter for device configuration
+    uint8_t configCmdEnable;   // !< [0x01c-0x01c] Configure command Enable Flag, 1 - Enable, 0 - Disable
+    uint8_t configModeType[3]; // !< [0x01d-0x01f] Configure Mode Type, similar as deviceModeTpe
+    flexspi_lut_seq_t
+        configCmdSeqs[3]; // !< [0x020-0x02b] Sequence info for Device Configuration command, similar as deviceModeSeq
+    uint32_t reserved1;   // !< [0x02c-0x02f] Reserved for future use
+    uint32_t configCmdArgs[3];     // !< [0x030-0x03b] Arguments/Parameters for device Configuration commands
+    uint32_t reserved2;            // !< [0x03c-0x03f] Reserved for future use
+    uint32_t controllerMiscOption; // !< [0x040-0x043] Controller Misc Options, see Misc feature bit definitions for more
+    // ! details
+    uint8_t deviceType;    // !< [0x044-0x044] Device Type:  See Flash Type Definition for more details
+    uint8_t sflashPadType; // !< [0x045-0x045] Serial Flash Pad Type: 1 - Single, 2 - Dual, 4 - Quad, 8 - Octal
+    uint8_t serialClkFreq; // !< [0x046-0x046] Serial Flash Frequencey, device specific definitions, See System Boot
+    // ! Chapter for more details
+    uint8_t lutCustomSeqEnable; // !< [0x047-0x047] LUT customization Enable, it is required if the program/erase cannot
+    // ! be done using 1 LUT sequence, currently, only applicable to HyperFLASH
+    uint32_t reserved3[2];           // !< [0x048-0x04f] Reserved for future use
+    uint32_t sflashA1Size;           // !< [0x050-0x053] Size of Flash connected to A1
+    uint32_t sflashA2Size;           // !< [0x054-0x057] Size of Flash connected to A2
+    uint32_t sflashB1Size;           // !< [0x058-0x05b] Size of Flash connected to B1
+    uint32_t sflashB2Size;           // !< [0x05c-0x05f] Size of Flash connected to B2
+    uint32_t csPadSettingOverride;   // !< [0x060-0x063] CS pad setting override value
+    uint32_t sclkPadSettingOverride; // !< [0x064-0x067] SCK pad setting override value
+    uint32_t dataPadSettingOverride; // !< [0x068-0x06b] data pad setting override value
+    uint32_t dqsPadSettingOverride;  // !< [0x06c-0x06f] DQS pad setting override value
+    uint32_t timeoutInMs;            // !< [0x070-0x073] Timeout threshold for read status command
+    uint32_t commandInterval;        // !< [0x074-0x077] CS deselect interval between two commands
+    uint16_t dataValidTime[2]; // !< [0x078-0x07b] CLK edge to data valid time for PORT A and PORT B, in terms of 0.1ns
+    uint16_t busyOffset;       // !< [0x07c-0x07d] Busy offset, valid value: 0-31
+    uint16_t busyBitPolarity;  // !< [0x07e-0x07f] Busy flag polarity, 0 - busy flag is 1 when flash device is busy, 1 -
+    // ! busy flag is 0 when flash device is busy
+    uint32_t lookupTable[64];           // !< [0x080-0x17f] Lookup table holds Flash command sequences
+    flexspi_lut_seq_t lutCustomSeq[12]; // !< [0x180-0x1af] Customizable LUT Sequences
+    uint32_t reserved4[4];              // !< [0x1b0-0x1bf] Reserved for future use
+} flexspi_mem_config_t;
+
+/*  */
+#define NOR_CMD_LUT_SEQ_IDX_READ_NORMAL 0
+#define NOR_CMD_LUT_SEQ_IDX_READSTATUSREG 1
+#define NOR_CMD_LUT_SEQ_IDX_READ_FAST_QUAD 2
+#define NOR_CMD_LUT_SEQ_IDX_WRITEENABLE 3
+#define NOR_CMD_LUT_SEQ_IDX_READSTATUS_XPI 4
+#define NOR_CMD_LUT_SEQ_IDX_ERASESECTOR 5
+#define NOR_CMD_LUT_SEQ_IDX_WRITESTATUSREG 6
+#define NOR_CMD_LUT_SEQ_IDX_PAGEPROGRAM_QUAD 7
+#define NOR_CMD_LUT_SEQ_IDX_READID 8
+#define NOR_CMD_LUT_SEQ_IDX_PAGEPROGRAM 9
+#define NOR_CMD_LUT_SEQ_IDX_ENTERQPI 10
+#define NOR_CMD_LUT_SEQ_IDX_CHIPERASE 11
+#define NOR_CMD_LUT_SEQ_IDX_EXITQPI 12
+
+/*
+ *  Serial NOR configuration block
+ */
+typedef struct _flexspi_nor_config
+{
+    flexspi_mem_config_t memConfig; // !< Common memory configuration info via FlexSPI
+    uint32_t pageSize;              // !< Page size of Serial NOR
+    uint32_t sectorSize;            // !< Sector size of Serial NOR
+    uint8_t ipcmdSerialClkFreq;     // !< Clock frequency for IP command
+    uint8_t isUniformBlockSize;     // !< Sector/Block size is the same
+    uint8_t reserved0[2];           // !< Reserved for future use
+    uint8_t serialNorType;          // !< Serial NOR Flash type: 0/1/2/3
+    uint8_t needExitNoCmdMode;      // !< Need to exit NoCmd mode before other IP command
+    uint8_t halfClkForNonReadCmd;   // !< Half the Serial Clock for non-read command: true/false
+    uint8_t needRestoreNoCmdMode;   // !< Need to Restore NoCmd mode after IP commmand execution
+    uint32_t blockSize;             // !< Block size
+    uint32_t reserve2[11];          // !< Reserved for future use
+} flexspi_nor_config_t;
+
+#define FLASH_BUSY_STATUS_POL 0
+#define FLASH_BUSY_STATUS_OFFSET 0
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* __EVKMIMXRT1020_FLEXSPI_NOR_CONFIG__ */
diff --git a/ports/mimxrt/boards/MIMXRT1020_EVK/clock_config.h b/ports/mimxrt/boards/MIMXRT1020_EVK/clock_config.h
new file mode 100644
index 0000000000000..21d4e630ae301
--- /dev/null
+++ b/ports/mimxrt/boards/MIMXRT1020_EVK/clock_config.h
@@ -0,0 +1,114 @@
+/*
+ * Copyright 2018-2019 NXP
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#ifndef _CLOCK_CONFIG_H_
+#define _CLOCK_CONFIG_H_
+
+#include "fsl_common.h"
+
+/*******************************************************************************
+ * Definitions
+ ******************************************************************************/
+#define BOARD_XTAL0_CLK_HZ 24000000U /*!< Board xtal0 frequency in Hz */
+
+#define BOARD_XTAL32K_CLK_HZ 32768U /*!< Board xtal32k frequency in Hz */
+/*******************************************************************************
+ ************************ BOARD_InitBootClocks function ************************
+ ******************************************************************************/
+
+#if defined(__cplusplus)
+extern "C" {
+#endif /* __cplusplus*/
+
+/*!
+ * @brief This function executes default configuration of clocks.
+ *
+ */
+void BOARD_InitBootClocks(void);
+
+#if defined(__cplusplus)
+}
+#endif /* __cplusplus*/
+
+/*******************************************************************************
+ ********************** Configuration BOARD_BootClockRUN ***********************
+ ******************************************************************************/
+/*******************************************************************************
+ * Definitions for BOARD_BootClockRUN configuration
+ ******************************************************************************/
+#define BOARD_BOOTCLOCKRUN_CORE_CLOCK 500000000U /*!< Core clock frequency: 500000000Hz */
+
+/* Clock outputs (values are in Hz): */
+#define BOARD_BOOTCLOCKRUN_AHB_CLK_ROOT 500000000UL
+#define BOARD_BOOTCLOCKRUN_CAN_CLK_ROOT 40000000UL
+#define BOARD_BOOTCLOCKRUN_CKIL_SYNC_CLK_ROOT 32768UL
+#define BOARD_BOOTCLOCKRUN_CLKO1_CLK 0UL
+#define BOARD_BOOTCLOCKRUN_CLKO2_CLK 0UL
+#define BOARD_BOOTCLOCKRUN_CLK_1M 1000000UL
+#define BOARD_BOOTCLOCKRUN_CLK_24M 24000000UL
+#define BOARD_BOOTCLOCKRUN_ENET1_TX_CLK 0UL
+#define BOARD_BOOTCLOCKRUN_ENET_125M_CLK 0UL
+#define BOARD_BOOTCLOCKRUN_ENET_25M_REF_CLK 0UL
+#define BOARD_BOOTCLOCKRUN_ENET_500M_REF_CLK 500000000UL
+#define BOARD_BOOTCLOCKRUN_FLEXIO1_CLK_ROOT 30000000UL
+#define BOARD_BOOTCLOCKRUN_FLEXSPI_CLK_ROOT 132000000UL
+#define BOARD_BOOTCLOCKRUN_GPT1_IPG_CLK_HIGHFREQ 62500000UL
+#define BOARD_BOOTCLOCKRUN_GPT2_IPG_CLK_HIGHFREQ 62500000UL
+#define BOARD_BOOTCLOCKRUN_IPG_CLK_ROOT 125000000UL
+#define BOARD_BOOTCLOCKRUN_LPI2C_CLK_ROOT 60000000UL
+#define BOARD_BOOTCLOCKRUN_LPSPI_CLK_ROOT 105600000UL
+#define BOARD_BOOTCLOCKRUN_MQS_MCLK 63529411UL
+#define BOARD_BOOTCLOCKRUN_PERCLK_CLK_ROOT 62500000UL
+#define BOARD_BOOTCLOCKRUN_SAI1_CLK_ROOT 63529411UL
+#define BOARD_BOOTCLOCKRUN_SAI1_MCLK1 63529411UL
+#define BOARD_BOOTCLOCKRUN_SAI1_MCLK2 63529411UL
+#define BOARD_BOOTCLOCKRUN_SAI1_MCLK3 30000000UL
+#define BOARD_BOOTCLOCKRUN_SAI2_CLK_ROOT 63529411UL
+#define BOARD_BOOTCLOCKRUN_SAI2_MCLK1 63529411UL
+#define BOARD_BOOTCLOCKRUN_SAI2_MCLK2 0UL
+#define BOARD_BOOTCLOCKRUN_SAI2_MCLK3 30000000UL
+#define BOARD_BOOTCLOCKRUN_SAI3_CLK_ROOT 63529411UL
+#define BOARD_BOOTCLOCKRUN_SAI3_MCLK1 63529411UL
+#define BOARD_BOOTCLOCKRUN_SAI3_MCLK2 0UL
+#define BOARD_BOOTCLOCKRUN_SAI3_MCLK3 30000000UL
+#define BOARD_BOOTCLOCKRUN_SEMC_CLK_ROOT 62500000UL
+#define BOARD_BOOTCLOCKRUN_SPDIF0_CLK_ROOT 30000000UL
+#define BOARD_BOOTCLOCKRUN_SPDIF0_EXTCLK_OUT 0UL
+#define BOARD_BOOTCLOCKRUN_TRACE_CLK_ROOT 117333333UL
+#define BOARD_BOOTCLOCKRUN_UART_CLK_ROOT 80000000UL
+#define BOARD_BOOTCLOCKRUN_USBPHY1_CLK 0UL
+#define BOARD_BOOTCLOCKRUN_USDHC1_CLK_ROOT 176000000UL
+#define BOARD_BOOTCLOCKRUN_USDHC2_CLK_ROOT 176000000UL
+
+/*! @brief Usb1 PLL set for BOARD_BootClockRUN configuration.
+ */
+extern const clock_usb_pll_config_t usb1PllConfig_BOARD_BootClockRUN;
+/*! @brief Sys PLL for BOARD_BootClockRUN configuration.
+ */
+extern const clock_sys_pll_config_t sysPllConfig_BOARD_BootClockRUN;
+/*! @brief Enet PLL set for BOARD_BootClockRUN configuration.
+ */
+extern const clock_enet_pll_config_t enetPllConfig_BOARD_BootClockRUN;
+
+/*******************************************************************************
+ * API for BOARD_BootClockRUN configuration
+ ******************************************************************************/
+#if defined(__cplusplus)
+extern "C" {
+#endif /* __cplusplus*/
+
+/*!
+ * @brief This function executes configuration of clocks.
+ *
+ */
+void BOARD_BootClockRUN(void);
+
+#if defined(__cplusplus)
+}
+#endif /* __cplusplus*/
+
+#endif /* _CLOCK_CONFIG_H_ */
diff --git a/ports/mimxrt/boards/MIMXRT1020_EVK/evkmimxrt1020_flexspi_nor_config.h b/ports/mimxrt/boards/MIMXRT1020_EVK/evkmimxrt1020_flexspi_nor_config.h
deleted file mode 100644
index 195c0c225e338..0000000000000
--- a/ports/mimxrt/boards/MIMXRT1020_EVK/evkmimxrt1020_flexspi_nor_config.h
+++ /dev/null
@@ -1,258 +0,0 @@
-/*
- * Copyright 2019 NXP.
- * All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-// Based on tinyusb/hw/bsp/teensy_40/evkmimxrt1020_flexspi_nor_config.h
-
-#ifndef __EVKMIMXRT1020_FLEXSPI_NOR_CONFIG__
-#define __EVKMIMXRT1020_FLEXSPI_NOR_CONFIG__
-
-#include <stdint.h>
-#include <stdbool.h>
-#include "fsl_common.h"
-
-/*! @name Driver version */
-/*@{*/
-/*! @brief XIP_BOARD driver version 2.0.0. */
-#define FSL_XIP_BOARD_DRIVER_VERSION (MAKE_VERSION(2, 0, 0))
-/*@}*/
-
-/* FLEXSPI memory config block related defintions */
-#define FLEXSPI_CFG_BLK_TAG (0x42464346UL)     // ascii "FCFB" Big Endian
-#define FLEXSPI_CFG_BLK_VERSION (0x56010400UL) // V1.4.0
-#define FLEXSPI_CFG_BLK_SIZE (512)
-
-/* FLEXSPI Feature related definitions */
-#define FLEXSPI_FEATURE_HAS_PARALLEL_MODE 1
-
-/* Lookup table related defintions */
-#define CMD_INDEX_READ 0
-#define CMD_INDEX_READSTATUS 1
-#define CMD_INDEX_WRITEENABLE 2
-#define CMD_INDEX_WRITE 4
-
-#define CMD_LUT_SEQ_IDX_READ 0
-#define CMD_LUT_SEQ_IDX_READSTATUS 1
-#define CMD_LUT_SEQ_IDX_WRITEENABLE 3
-#define CMD_LUT_SEQ_IDX_WRITE 9
-
-#define CMD_SDR 0x01
-#define CMD_DDR 0x21
-#define RADDR_SDR 0x02
-#define RADDR_DDR 0x22
-#define CADDR_SDR 0x03
-#define CADDR_DDR 0x23
-#define MODE1_SDR 0x04
-#define MODE1_DDR 0x24
-#define MODE2_SDR 0x05
-#define MODE2_DDR 0x25
-#define MODE4_SDR 0x06
-#define MODE4_DDR 0x26
-#define MODE8_SDR 0x07
-#define MODE8_DDR 0x27
-#define WRITE_SDR 0x08
-#define WRITE_DDR 0x28
-#define READ_SDR 0x09
-#define READ_DDR 0x29
-#define LEARN_SDR 0x0A
-#define LEARN_DDR 0x2A
-#define DATSZ_SDR 0x0B
-#define DATSZ_DDR 0x2B
-#define DUMMY_SDR 0x0C
-#define DUMMY_DDR 0x2C
-#define DUMMY_RWDS_SDR 0x0D
-#define DUMMY_RWDS_DDR 0x2D
-#define JMP_ON_CS 0x1F
-#define STOP 0
-
-#define FLEXSPI_1PAD 0
-#define FLEXSPI_2PAD 1
-#define FLEXSPI_4PAD 2
-#define FLEXSPI_8PAD 3
-
-#define FLEXSPI_LUT_SEQ(cmd0, pad0, op0, cmd1, pad1, op1)                                                              \
-    (FLEXSPI_LUT_OPERAND0(op0) | FLEXSPI_LUT_NUM_PADS0(pad0) | FLEXSPI_LUT_OPCODE0(cmd0) | FLEXSPI_LUT_OPERAND1(op1) | \
-     FLEXSPI_LUT_NUM_PADS1(pad1) | FLEXSPI_LUT_OPCODE1(cmd1))
-
-//!@brief Definitions for FlexSPI Serial Clock Frequency
-typedef enum _FlexSpiSerialClockFreq
-{
-    kFlexSpiSerialClk_30MHz  = 1,
-    kFlexSpiSerialClk_50MHz  = 2,
-    kFlexSpiSerialClk_60MHz  = 3,
-    kFlexSpiSerialClk_75MHz  = 4,
-    kFlexSpiSerialClk_80MHz  = 5,
-    kFlexSpiSerialClk_100MHz = 6,
-    kFlexSpiSerialClk_133MHz = 7,
-    kFlexSpiSerialClk_166MHz = 8,
-    kFlexSpiSerialClk_200MHz = 9,
-} flexspi_serial_clk_freq_t;
-
-//!@brief FlexSPI clock configuration type
-enum
-{
-    kFlexSpiClk_SDR, //!< Clock configure for SDR mode
-    kFlexSpiClk_DDR, //!< Clock configurat for DDR mode
-};
-
-//!@brief FlexSPI Read Sample Clock Source definition
-typedef enum _FlashReadSampleClkSource
-{
-    kFlexSPIReadSampleClk_LoopbackInternally      = 0,
-    kFlexSPIReadSampleClk_LoopbackFromDqsPad      = 1,
-    kFlexSPIReadSampleClk_LoopbackFromSckPad      = 2,
-    kFlexSPIReadSampleClk_ExternalInputFromDqsPad = 3,
-} flexspi_read_sample_clk_t;
-
-//!@brief Misc feature bit definitions
-enum
-{
-    kFlexSpiMiscOffset_DiffClkEnable            = 0, //!< Bit for Differential clock enable
-    kFlexSpiMiscOffset_Ck2Enable                = 1, //!< Bit for CK2 enable
-    kFlexSpiMiscOffset_ParallelEnable           = 2, //!< Bit for Parallel mode enable
-    kFlexSpiMiscOffset_WordAddressableEnable    = 3, //!< Bit for Word Addressable enable
-    kFlexSpiMiscOffset_SafeConfigFreqEnable     = 4, //!< Bit for Safe Configuration Frequency enable
-    kFlexSpiMiscOffset_PadSettingOverrideEnable = 5, //!< Bit for Pad setting override enable
-    kFlexSpiMiscOffset_DdrModeEnable            = 6, //!< Bit for DDR clock confiuration indication.
-};
-
-//!@brief Flash Type Definition
-enum
-{
-    kFlexSpiDeviceType_SerialNOR    = 1,    //!< Flash devices are Serial NOR
-    kFlexSpiDeviceType_SerialNAND   = 2,    //!< Flash devices are Serial NAND
-    kFlexSpiDeviceType_SerialRAM    = 3,    //!< Flash devices are Serial RAM/HyperFLASH
-    kFlexSpiDeviceType_MCP_NOR_NAND = 0x12, //!< Flash device is MCP device, A1 is Serial NOR, A2 is Serial NAND
-    kFlexSpiDeviceType_MCP_NOR_RAM  = 0x13, //!< Flash deivce is MCP device, A1 is Serial NOR, A2 is Serial RAMs
-};
-
-//!@brief Flash Pad Definitions
-enum
-{
-    kSerialFlash_1Pad  = 1,
-    kSerialFlash_2Pads = 2,
-    kSerialFlash_4Pads = 4,
-    kSerialFlash_8Pads = 8,
-};
-
-//!@brief FlexSPI LUT Sequence structure
-typedef struct _lut_sequence
-{
-    uint8_t seqNum; //!< Sequence Number, valid number: 1-16
-    uint8_t seqId;  //!< Sequence Index, valid number: 0-15
-    uint16_t reserved;
-} flexspi_lut_seq_t;
-
-//!@brief Flash Configuration Command Type
-enum
-{
-    kDeviceConfigCmdType_Generic,    //!< Generic command, for example: configure dummy cycles, drive strength, etc
-    kDeviceConfigCmdType_QuadEnable, //!< Quad Enable command
-    kDeviceConfigCmdType_Spi2Xpi,    //!< Switch from SPI to DPI/QPI/OPI mode
-    kDeviceConfigCmdType_Xpi2Spi,    //!< Switch from DPI/QPI/OPI to SPI mode
-    kDeviceConfigCmdType_Spi2NoCmd,  //!< Switch to 0-4-4/0-8-8 mode
-    kDeviceConfigCmdType_Reset,      //!< Reset device command
-};
-
-//!@brief FlexSPI Memory Configuration Block
-typedef struct _FlexSPIConfig
-{
-    uint32_t tag;               //!< [0x000-0x003] Tag, fixed value 0x42464346UL
-    uint32_t version;           //!< [0x004-0x007] Version,[31:24] -'V', [23:16] - Major, [15:8] - Minor, [7:0] - bugfix
-    uint32_t reserved0;         //!< [0x008-0x00b] Reserved for future use
-    uint8_t readSampleClkSrc;   //!< [0x00c-0x00c] Read Sample Clock Source, valid value: 0/1/3
-    uint8_t csHoldTime;         //!< [0x00d-0x00d] CS hold time, default value: 3
-    uint8_t csSetupTime;        //!< [0x00e-0x00e] CS setup time, default value: 3
-    uint8_t columnAddressWidth; //!< [0x00f-0x00f] Column Address with, for HyperBus protocol, it is fixed to 3, For
-    //! Serial NAND, need to refer to datasheet
-    uint8_t deviceModeCfgEnable; //!< [0x010-0x010] Device Mode Configure enable flag, 1 - Enable, 0 - Disable
-    uint8_t deviceModeType; //!< [0x011-0x011] Specify the configuration command type:Quad Enable, DPI/QPI/OPI switch,
-    //! Generic configuration, etc.
-    uint16_t waitTimeCfgCommands; //!< [0x012-0x013] Wait time for all configuration commands, unit: 100us, Used for
-    //! DPI/QPI/OPI switch or reset command
-    flexspi_lut_seq_t deviceModeSeq; //!< [0x014-0x017] Device mode sequence info, [7:0] - LUT sequence id, [15:8] - LUt
-    //! sequence number, [31:16] Reserved
-    uint32_t deviceModeArg;    //!< [0x018-0x01b] Argument/Parameter for device configuration
-    uint8_t configCmdEnable;   //!< [0x01c-0x01c] Configure command Enable Flag, 1 - Enable, 0 - Disable
-    uint8_t configModeType[3]; //!< [0x01d-0x01f] Configure Mode Type, similar as deviceModeTpe
-    flexspi_lut_seq_t
-        configCmdSeqs[3]; //!< [0x020-0x02b] Sequence info for Device Configuration command, similar as deviceModeSeq
-    uint32_t reserved1;   //!< [0x02c-0x02f] Reserved for future use
-    uint32_t configCmdArgs[3];     //!< [0x030-0x03b] Arguments/Parameters for device Configuration commands
-    uint32_t reserved2;            //!< [0x03c-0x03f] Reserved for future use
-    uint32_t controllerMiscOption; //!< [0x040-0x043] Controller Misc Options, see Misc feature bit definitions for more
-    //! details
-    uint8_t deviceType;    //!< [0x044-0x044] Device Type:  See Flash Type Definition for more details
-    uint8_t sflashPadType; //!< [0x045-0x045] Serial Flash Pad Type: 1 - Single, 2 - Dual, 4 - Quad, 8 - Octal
-    uint8_t serialClkFreq; //!< [0x046-0x046] Serial Flash Frequencey, device specific definitions, See System Boot
-    //! Chapter for more details
-    uint8_t lutCustomSeqEnable; //!< [0x047-0x047] LUT customization Enable, it is required if the program/erase cannot
-    //! be done using 1 LUT sequence, currently, only applicable to HyperFLASH
-    uint32_t reserved3[2];           //!< [0x048-0x04f] Reserved for future use
-    uint32_t sflashA1Size;           //!< [0x050-0x053] Size of Flash connected to A1
-    uint32_t sflashA2Size;           //!< [0x054-0x057] Size of Flash connected to A2
-    uint32_t sflashB1Size;           //!< [0x058-0x05b] Size of Flash connected to B1
-    uint32_t sflashB2Size;           //!< [0x05c-0x05f] Size of Flash connected to B2
-    uint32_t csPadSettingOverride;   //!< [0x060-0x063] CS pad setting override value
-    uint32_t sclkPadSettingOverride; //!< [0x064-0x067] SCK pad setting override value
-    uint32_t dataPadSettingOverride; //!< [0x068-0x06b] data pad setting override value
-    uint32_t dqsPadSettingOverride;  //!< [0x06c-0x06f] DQS pad setting override value
-    uint32_t timeoutInMs;            //!< [0x070-0x073] Timeout threshold for read status command
-    uint32_t commandInterval;        //!< [0x074-0x077] CS deselect interval between two commands
-    uint16_t dataValidTime[2]; //!< [0x078-0x07b] CLK edge to data valid time for PORT A and PORT B, in terms of 0.1ns
-    uint16_t busyOffset;       //!< [0x07c-0x07d] Busy offset, valid value: 0-31
-    uint16_t busyBitPolarity;  //!< [0x07e-0x07f] Busy flag polarity, 0 - busy flag is 1 when flash device is busy, 1 -
-    //! busy flag is 0 when flash device is busy
-    uint32_t lookupTable[64];           //!< [0x080-0x17f] Lookup table holds Flash command sequences
-    flexspi_lut_seq_t lutCustomSeq[12]; //!< [0x180-0x1af] Customizable LUT Sequences
-    uint32_t reserved4[4];              //!< [0x1b0-0x1bf] Reserved for future use
-} flexspi_mem_config_t;
-
-/*  */
-#define NOR_CMD_LUT_SEQ_IDX_READ_NORMAL 0
-#define NOR_CMD_LUT_SEQ_IDX_READSTATUSREG 1
-#define NOR_CMD_LUT_SEQ_IDX_READ_FAST_QUAD 2
-#define NOR_CMD_LUT_SEQ_IDX_WRITEENABLE 3
-#define NOR_CMD_LUT_SEQ_IDX_READSTATUS_XPI 4
-#define NOR_CMD_LUT_SEQ_IDX_ERASESECTOR 5
-#define NOR_CMD_LUT_SEQ_IDX_WRITESTATUSREG 6
-#define NOR_CMD_LUT_SEQ_IDX_PAGEPROGRAM_QUAD 7
-#define NOR_CMD_LUT_SEQ_IDX_READID 8
-#define NOR_CMD_LUT_SEQ_IDX_PAGEPROGRAM 9
-#define NOR_CMD_LUT_SEQ_IDX_ENTERQPI 10
-#define NOR_CMD_LUT_SEQ_IDX_CHIPERASE 11
-#define NOR_CMD_LUT_SEQ_IDX_EXITQPI 12
-
-/*
- *  Serial NOR configuration block
- */
-typedef struct _flexspi_nor_config
-{
-    flexspi_mem_config_t memConfig; //!< Common memory configuration info via FlexSPI
-    uint32_t pageSize;              //!< Page size of Serial NOR
-    uint32_t sectorSize;            //!< Sector size of Serial NOR
-    uint8_t ipcmdSerialClkFreq;     //!< Clock frequency for IP command
-    uint8_t isUniformBlockSize;     //!< Sector/Block size is the same
-    uint8_t reserved0[2];           //!< Reserved for future use
-    uint8_t serialNorType;          //!< Serial NOR Flash type: 0/1/2/3
-    uint8_t needExitNoCmdMode;      //!< Need to exit NoCmd mode before other IP command
-    uint8_t halfClkForNonReadCmd;   //!< Half the Serial Clock for non-read command: true/false
-    uint8_t needRestoreNoCmdMode;   //!< Need to Restore NoCmd mode after IP commmand execution
-    uint32_t blockSize;             //!< Block size
-    uint32_t reserve2[11];          //!< Reserved for future use
-} flexspi_nor_config_t;
-
-#define FLASH_BUSY_STATUS_POL 0
-#define FLASH_BUSY_STATUS_OFFSET 0
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* __EVKMIMXRT1020_FLEXSPI_NOR_CONFIG__ */
diff --git a/ports/mimxrt/boards/MIMXRT1020_EVK/flash_config.c b/ports/mimxrt/boards/MIMXRT1020_EVK/flash_config.c
deleted file mode 100644
index 5377cc1b25ac7..0000000000000
--- a/ports/mimxrt/boards/MIMXRT1020_EVK/flash_config.c
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * Copyright 2019 NXP.
- * All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-// Based on tinyusb/hw/bsp/teensy_40/evkmimxrt1010_flexspi_nor_config.c
-
-#include "evkmimxrt1020_flexspi_nor_config.h"
-
-/* Component ID definition, used by tools. */
-#ifndef FSL_COMPONENT_ID
-#define FSL_COMPONENT_ID "platform.drivers.xip_board"
-#endif
-
-/*******************************************************************************
- * Code
- ******************************************************************************/
-#if defined(XIP_BOOT_HEADER_ENABLE) && (XIP_BOOT_HEADER_ENABLE == 1)
-#if defined(__ARMCC_VERSION) || defined(__GNUC__)
-__attribute__((section(".boot_hdr.conf")))
-#elif defined(__ICCARM__)
-#pragma location = ".boot_hdr.conf"
-#endif
-
-const flexspi_nor_config_t qspiflash_config = {
-    .memConfig =
-        {
-            .tag              = FLEXSPI_CFG_BLK_TAG,
-            .version          = FLEXSPI_CFG_BLK_VERSION,
-            .readSampleClkSrc = kFlexSPIReadSampleClk_LoopbackFromDqsPad,
-            .csHoldTime       = 3u,
-            .csSetupTime      = 3u,
-            .busyOffset = FLASH_BUSY_STATUS_OFFSET,     // Status bit 0 indicates busy.
-            .busyBitPolarity = FLASH_BUSY_STATUS_POL,   // Busy when the bit is 1.
-            .deviceModeCfgEnable = 1u,
-            .deviceModeType = kDeviceConfigCmdType_QuadEnable,
-            .deviceModeSeq = {
-                .seqId = 4u,
-                .seqNum = 1u,
-            },
-            .deviceModeArg = 0x40,
-            // Enable DDR mode, Wordaddassable, Safe configuration, Differential clock
-            .deviceType = kFlexSpiDeviceType_SerialNOR,
-            .sflashPadType = kSerialFlash_4Pads,
-            .serialClkFreq = kFlexSpiSerialClk_30MHz,
-            .sflashA1Size  = 8u * 1024u * 1024u,
-            .lookupTable =
-                {
-                    // 0 Read LUTs 0 -> 0
-                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0xEB, RADDR_SDR, FLEXSPI_4PAD, 0x18),
-                    FLEXSPI_LUT_SEQ(DUMMY_SDR, FLEXSPI_4PAD, 0x06, READ_SDR, FLEXSPI_4PAD, 0x04),
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-
-                    // 1 Read status register -> 1
-                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x05, READ_SDR, FLEXSPI_1PAD, 0x01),
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-
-                    // 2 Fast read quad mode - SDR
-                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x6B, RADDR_SDR, FLEXSPI_1PAD, 0x18),
-                    FLEXSPI_LUT_SEQ(DUMMY_SDR, FLEXSPI_4PAD, 0x08, READ_SDR, FLEXSPI_4PAD, 0x04),
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-
-                    // 3 Write Enable -> 3
-                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x06, STOP, FLEXSPI_1PAD, 0),
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-
-                    // 4 Read extend parameters
-                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x81, READ_SDR, FLEXSPI_1PAD, 0x04),
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-
-                    // 5 Erase Sector -> 5
-                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x20, RADDR_SDR, FLEXSPI_1PAD, 24),
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-
-                    // 6 Write Status Reg
-                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x01, WRITE_SDR, FLEXSPI_1PAD, 0x04),
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-
-                    // 7 Page Program - quad mode (-> 9)
-                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x32, RADDR_SDR, FLEXSPI_1PAD, 0x18),
-                    FLEXSPI_LUT_SEQ(WRITE_SDR, FLEXSPI_4PAD, 0x04, STOP, FLEXSPI_1PAD, 0),
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-
-                    // 8 Read ID
-                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x90, DUMMY_SDR, FLEXSPI_1PAD, 24),
-                    FLEXSPI_LUT_SEQ(READ_SDR, FLEXSPI_1PAD, 0x00, 0, 0, 0),
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-
-                    // 9 Page Program - single mode -> 9
-                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x02, RADDR_SDR, FLEXSPI_1PAD, 24),
-                    FLEXSPI_LUT_SEQ(WRITE_SDR, FLEXSPI_1PAD, 0, 0, 0, 0),
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-
-                    // 10 Enter QPI mode
-                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x35, STOP, FLEXSPI_1PAD, 0),
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-
-                    // 11 Erase Chip
-                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x60, STOP, FLEXSPI_1PAD, 0),
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-
-                    // 12 Exit QPI mode
-                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_4PAD, 0xF5, STOP, FLEXSPI_1PAD, 0),
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                },
-        },
-    .pageSize           = 256u,
-    .sectorSize         = 4u * 1024u,
-    .blockSize          = 256u * 1024u,
-    .isUniformBlockSize = false,
-    .ipcmdSerialClkFreq = kFlexSpiSerialClk_30MHz,
-};
-#endif /* XIP_BOOT_HEADER_ENABLE */
diff --git a/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.h b/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.h
index d7fe575abcdf5..35c24b3d47c3c 100644
--- a/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.h
+++ b/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.h
@@ -1,15 +1,11 @@
 #define MICROPY_HW_BOARD_NAME "i.MX RT1020 EVK"
 #define MICROPY_HW_MCU_NAME   "MIMXRT1021DAG5A"
 
-#define BOARD_FLASH_SIZE (8 * 1024 * 1024)
-
 // i.MX RT1020 EVK has 1 board LED
 // Todo: think about replacing the define with searching in the generated pins?
 #define MICROPY_HW_LED1_PIN (pin_GPIO_AD_B0_05)
 #define MICROPY_HW_LED_ON(pin) (mp_hal_pin_low(pin))
 #define MICROPY_HW_LED_OFF(pin) (mp_hal_pin_high(pin))
-#define BOARD_FLASH_CONFIG_HEADER_H "evkmimxrt1020_flexspi_nor_config.h"
-#define BOARD_FLASH_OPS_HEADER_H "hal/flexspi_nor_flash.h"
 
 #define MICROPY_HW_NUM_PIN_IRQS (3 * 32)
 
@@ -43,13 +39,13 @@
     { 0 }, { 0 }, \
     { 0 }, { 0 }, \
     { IOMUXC_GPIO_AD_B1_12_LPSPI3_SCK }, { IOMUXC_GPIO_AD_B1_13_LPSPI3_PCS0 }, \
-    { IOMUXC_GPIO_AD_B1_14_LPSPI3_SDO }, { IOMUXC_GPIO_AD_B1_15_LPSPI3_SDI }, 
+    { IOMUXC_GPIO_AD_B1_14_LPSPI3_SDO }, { IOMUXC_GPIO_AD_B1_15_LPSPI3_SDI },
 
 #define DMA_REQ_SRC_RX { 0, kDmaRequestMuxLPSPI1Rx, kDmaRequestMuxLPSPI2Rx, \
-                            kDmaRequestMuxLPSPI3Rx, kDmaRequestMuxLPSPI4Rx }
+                         kDmaRequestMuxLPSPI3Rx, kDmaRequestMuxLPSPI4Rx }
 
 #define DMA_REQ_SRC_TX { 0, kDmaRequestMuxLPSPI1Tx, kDmaRequestMuxLPSPI2Tx, \
-                            kDmaRequestMuxLPSPI3Tx, kDmaRequestMuxLPSPI4Tx } 
+                         kDmaRequestMuxLPSPI3Tx, kDmaRequestMuxLPSPI4Tx }
 
 // Define mapping hardware I2C # to logical I2C #
 // SDA/SCL  HW-I2C    Logical I2C
@@ -65,14 +61,14 @@
     { 0 }, { 0 }, \
     { IOMUXC_GPIO_SD_B1_02_LPI2C4_SCL }, { IOMUXC_GPIO_SD_B1_03_LPI2C4_SDA },
 
-#define USDHC_DUMMY_PIN NULL , 0
+#define USDHC_DUMMY_PIN NULL, 0
 #define MICROPY_USDHC1 \
     { \
         .cmd = {GPIO_SD_B0_02_USDHC1_CMD}, \
         .clk = { GPIO_SD_B0_03_USDHC1_CLK }, \
-        .cd_b = { GPIO_SD_B0_06_USDHC1_CD_B },\
-        .data0 = { GPIO_SD_B0_04_USDHC1_DATA0 },\
-        .data1 = { GPIO_SD_B0_05_USDHC1_DATA1 },\
-        .data2 = { GPIO_SD_B0_00_USDHC1_DATA2 },\
-        .data3 = { GPIO_SD_B0_01_USDHC1_DATA3 },\
+        .cd_b = { GPIO_SD_B0_06_USDHC1_CD_B }, \
+        .data0 = { GPIO_SD_B0_04_USDHC1_DATA0 }, \
+        .data1 = { GPIO_SD_B0_05_USDHC1_DATA1 }, \
+        .data2 = { GPIO_SD_B0_00_USDHC1_DATA2 }, \
+        .data3 = { GPIO_SD_B0_01_USDHC1_DATA3 }, \
     }
diff --git a/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.mk b/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.mk
index 6dd16865213f1..34b714e623576 100644
--- a/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.mk
+++ b/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.mk
@@ -3,21 +3,20 @@ MCU_VARIANT = MIMXRT1021DAG5A
 
 MICROPY_FLOAT_IMPL = double
 MICROPY_PY_MACHINE_SDCARD = 1
+BOARD_FLASH_TYPE ?= qspi_nor
+BOARD_FLASH_SIZE ?= 0x800000  # 8MB
 
 JLINK_PATH ?= /media/RT1020-EVK/
 JLINK_COMMANDER_SCRIPT = $(BUILD)/script.jlink
 
-
 ifdef JLINK_IP
 JLINK_CONNECTION_SETTINGS = -IP $(JLINK_IP)
 else
-JLINK_CONNECTION_SETTINGS =
+JLINK_CONNECTION_SETTINGS = -USB
 endif
 
-SRC_C += \
-	hal/flexspi_nor_flash.c
-
 deploy_jlink: $(BUILD)/firmware.hex
+	$(Q)$(TOUCH) $(JLINK_COMMANDER_SCRIPT)
 	$(ECHO) "ExitOnError 1" > $(JLINK_COMMANDER_SCRIPT)
 	$(ECHO) "speed auto" >> $(JLINK_COMMANDER_SCRIPT)
 	$(ECHO) "r" >> $(JLINK_COMMANDER_SCRIPT)
diff --git a/ports/mimxrt/boards/MIMXRT1020_EVK/qspi_nor_flash_config.c b/ports/mimxrt/boards/MIMXRT1020_EVK/qspi_nor_flash_config.c
new file mode 100644
index 0000000000000..7b2584d3de691
--- /dev/null
+++ b/ports/mimxrt/boards/MIMXRT1020_EVK/qspi_nor_flash_config.c
@@ -0,0 +1,136 @@
+/*
+ * Copyright 2019 NXP.
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+// Based on tinyusb/hw/bsp/teensy_40/evkmimxrt1010_flexspi_nor_config.c
+
+#include BOARD_FLASH_CONFIG_HEADER_H
+
+/* Component ID definition, used by tools. */
+#ifndef FSL_COMPONENT_ID
+#define FSL_COMPONENT_ID "platform.drivers.xip_board"
+#endif
+
+/*******************************************************************************
+ * Code
+ ******************************************************************************/
+#if defined(XIP_BOOT_HEADER_ENABLE) && (XIP_BOOT_HEADER_ENABLE == 1)
+#if defined(__ARMCC_VERSION) || defined(__GNUC__)
+__attribute__((section(".boot_hdr.conf")))
+#elif defined(__ICCARM__)
+#pragma location = ".boot_hdr.conf"
+#endif
+
+const flexspi_nor_config_t qspiflash_config = {
+    .memConfig =
+    {
+        .tag = FLEXSPI_CFG_BLK_TAG,
+        .version = FLEXSPI_CFG_BLK_VERSION,
+        .readSampleClkSrc = kFlexSPIReadSampleClk_LoopbackFromDqsPad,
+        .csHoldTime = 3u,
+        .csSetupTime = 3u,
+        .busyOffset = FLASH_BUSY_STATUS_OFFSET,         // Status bit 0 indicates busy.
+        .busyBitPolarity = FLASH_BUSY_STATUS_POL,       // Busy when the bit is 1.
+        .deviceModeCfgEnable = 1u,
+        .deviceModeType = kDeviceConfigCmdType_QuadEnable,
+        .deviceModeSeq = {
+            .seqId = 4u,
+            .seqNum = 1u,
+        },
+        .deviceModeArg = 0x40,
+        // Enable DDR mode, Wordaddassable, Safe configuration, Differential clock
+        .deviceType = kFlexSpiDeviceType_SerialNOR,
+        .sflashPadType = kSerialFlash_4Pads,
+        .serialClkFreq = kFlexSpiSerialClk_100MHz,
+        .sflashA1Size = BOARD_FLASH_SIZE,
+        .lookupTable =
+        {
+            // 0 Read LUTs 0 -> 0
+            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0xEB, RADDR_SDR, FLEXSPI_4PAD, 0x18),
+            FLEXSPI_LUT_SEQ(DUMMY_SDR, FLEXSPI_4PAD, 0x06, READ_SDR, FLEXSPI_4PAD, 0x04),
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+
+            // 1 Read status register -> 1
+            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x05, READ_SDR, FLEXSPI_1PAD, 0x01),
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+
+            // 2 Fast read quad mode - SDR
+            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x6B, RADDR_SDR, FLEXSPI_1PAD, 0x18),
+            FLEXSPI_LUT_SEQ(DUMMY_SDR, FLEXSPI_4PAD, 0x08, READ_SDR, FLEXSPI_4PAD, 0x04),
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+
+            // 3 Write Enable -> 3
+            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x06, STOP, FLEXSPI_1PAD, 0),
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+
+            // 4 Read extend parameters
+            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x81, READ_SDR, FLEXSPI_1PAD, 0x04),
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+
+            // 5 Erase Sector -> 5
+            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x20, RADDR_SDR, FLEXSPI_1PAD, 24),
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+
+            // 6 Write Status Reg
+            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x01, WRITE_SDR, FLEXSPI_1PAD, 0x04),
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+
+            // 7 Page Program - quad mode (-> 9)
+            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x32, RADDR_SDR, FLEXSPI_1PAD, 0x18),
+            FLEXSPI_LUT_SEQ(WRITE_SDR, FLEXSPI_4PAD, 0x04, STOP, FLEXSPI_1PAD, 0),
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+
+            // 8 Read ID
+            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x90, DUMMY_SDR, FLEXSPI_1PAD, 24),
+            FLEXSPI_LUT_SEQ(READ_SDR, FLEXSPI_1PAD, 0x00, 0, 0, 0),
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+
+            // 9 Page Program - single mode -> 9
+            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x02, RADDR_SDR, FLEXSPI_1PAD, 24),
+            FLEXSPI_LUT_SEQ(WRITE_SDR, FLEXSPI_1PAD, 0, 0, 0, 0),
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+
+            // 10 Enter QPI mode
+            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x35, STOP, FLEXSPI_1PAD, 0),
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+
+            // 11 Erase Chip
+            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x60, STOP, FLEXSPI_1PAD, 0),
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+
+            // 12 Exit QPI mode
+            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_4PAD, 0xF5, STOP, FLEXSPI_1PAD, 0),
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+        },
+    },
+    .pageSize = 256u,
+    .sectorSize = 4u * 1024u,
+    .blockSize = 256u * 1024u,
+    .isUniformBlockSize = false,
+    // .ipcmdSerialClkFreq = kFlexSpiSerialClk_30MHz,
+};
+#endif /* XIP_BOOT_HEADER_ENABLE */
diff --git a/ports/mimxrt/boards/MIMXRT1021.ld b/ports/mimxrt/boards/MIMXRT1021.ld
index de0f259dcc9e2..92cd59d668363 100644
--- a/ports/mimxrt/boards/MIMXRT1021.ld
+++ b/ports/mimxrt/boards/MIMXRT1021.ld
@@ -1,20 +1,29 @@
 /* Memory configuration */
+#if defined BOARD_FLASH_RESERVED
+reserved_size = BOARD_FLASH_RESERVED;
+#endif
+
+#if BOARD_FLASH_TYPE == qspi_nor
 flash_start         = 0x60000000;
+#else
+#error Unknown BOARD_FLASH_TYPE
+#endif
+flash_size          = BOARD_FLASH_SIZE;
 flash_end           = DEFINED(reserved_size) ? ((flash_start) + (flash_size - reserved_size)) : ((flash_start) + (flash_size));
 flash_config_start  = flash_start;
 flash_config_size   = 0x00001000;
-ivt_start           = 0x60001000;
+ivt_start           = flash_start + 0x00001000;
 ivt_size            = 0x00001000;
-interrupts_start    = 0x60002000;
+interrupts_start    = flash_start + 0x00002000;
 interrupts_size     = 0x00000400;
-text_start          = 0x60002400;
-text_size           = ((((text_start) + 1M) + (4k - 1)) & ~(4k - 1)) - (text_start); /* reserve 1M for code but align on 4k boundary */
-vfs_start           = (text_start) + (text_size);
+text_start          = flash_start + 0x00002400;
+vfs_start           = flash_start + 0x00100000;
+text_size           = ((vfs_start) - (text_start));
 vfs_size            = ((flash_end) - (vfs_start));
 itcm_start          = 0x00000000;
-itcm_size           = 0x00010000;
+itcm_size           = 0x00008000;
 dtcm_start          = 0x20000000;
-dtcm_size           = 0x00010000;
+dtcm_size           = 0x00018000;
 ocrm_start          = 0x20200000;
 ocrm_size           = 0x00020000;
 
diff --git a/ports/mimxrt/boards/MIMXRT1050_EVK/MIMXRT1050_EVK.ld b/ports/mimxrt/boards/MIMXRT1050_EVK/MIMXRT1050_EVK.ld
deleted file mode 100644
index fd1bf32ede778..0000000000000
--- a/ports/mimxrt/boards/MIMXRT1050_EVK/MIMXRT1050_EVK.ld
+++ /dev/null
@@ -1 +0,0 @@
-flash_size = 8M;
\ No newline at end of file
diff --git a/ports/mimxrt/boards/MIMXRT1050_EVK/MIMXRT1050_EVK_flexspi_nor_config.h b/ports/mimxrt/boards/MIMXRT1050_EVK/MIMXRT1050_EVK_flexspi_nor_config.h
new file mode 100644
index 0000000000000..b4e9217416895
--- /dev/null
+++ b/ports/mimxrt/boards/MIMXRT1050_EVK/MIMXRT1050_EVK_flexspi_nor_config.h
@@ -0,0 +1,263 @@
+/*
+ * Copyright 2018 NXP
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#ifndef __EVKMIMXRT1050_FLEXSPI_NOR_CONFIG__
+#define __EVKMIMXRT1050_FLEXSPI_NOR_CONFIG__
+
+#include <stdint.h>
+#include <stdbool.h>
+#include "fsl_flexspi.h"
+
+/*! @name Driver version */
+/*@{*/
+/*! @brief XIP_BOARD driver version 2.0.0. */
+#define FSL_XIP_BOARD_DRIVER_VERSION (MAKE_VERSION(2, 0, 0))
+/*@}*/
+
+/* FLEXSPI memory config block related defintions */
+#define FLEXSPI_CFG_BLK_TAG     (0x42464346UL) // ascii "FCFB" Big Endian
+#define FLEXSPI_CFG_BLK_VERSION (0x56010400UL) // V1.4.0
+#define FLEXSPI_CFG_BLK_SIZE    (512)
+
+/* FLEXSPI Feature related definitions */
+#define FLEXSPI_FEATURE_HAS_PARALLEL_MODE 1
+
+/* Lookup table related defintions */
+#define CMD_INDEX_READ        0
+#define CMD_INDEX_READSTATUS  1
+#define CMD_INDEX_WRITEENABLE 2
+#define CMD_INDEX_WRITE       4
+
+#define CMD_LUT_SEQ_IDX_READ        0
+#define CMD_LUT_SEQ_IDX_READSTATUS  1
+#define CMD_LUT_SEQ_IDX_WRITEENABLE 3
+#define CMD_LUT_SEQ_IDX_WRITE       9
+
+#define CMD_SDR        0x01
+#define CMD_DDR        0x21
+#define RADDR_SDR      0x02
+#define RADDR_DDR      0x22
+#define CADDR_SDR      0x03
+#define CADDR_DDR      0x23
+#define MODE1_SDR      0x04
+#define MODE1_DDR      0x24
+#define MODE2_SDR      0x05
+#define MODE2_DDR      0x25
+#define MODE4_SDR      0x06
+#define MODE4_DDR      0x26
+#define MODE8_SDR      0x07
+#define MODE8_DDR      0x27
+#define WRITE_SDR      0x08
+#define WRITE_DDR      0x28
+#define READ_SDR       0x09
+#define READ_DDR       0x29
+#define LEARN_SDR      0x0A
+#define LEARN_DDR      0x2A
+#define DATSZ_SDR      0x0B
+#define DATSZ_DDR      0x2B
+#define DUMMY_SDR      0x0C
+#define DUMMY_DDR      0x2C
+#define DUMMY_RWDS_SDR 0x0D
+#define DUMMY_RWDS_DDR 0x2D
+#define JMP_ON_CS      0x1F
+#define STOP           0
+
+#define FLEXSPI_1PAD 0
+#define FLEXSPI_2PAD 1
+#define FLEXSPI_4PAD 2
+#define FLEXSPI_8PAD 3
+
+#define FLEXSPI_LUT_SEQ(cmd0, pad0, op0, cmd1, pad1, op1)                                                              \
+    (FLEXSPI_LUT_OPERAND0(op0) | FLEXSPI_LUT_NUM_PADS0(pad0) | FLEXSPI_LUT_OPCODE0(cmd0) | FLEXSPI_LUT_OPERAND1(op1) | \
+    FLEXSPI_LUT_NUM_PADS1(pad1) | FLEXSPI_LUT_OPCODE1(cmd1))
+
+// !@brief Definitions for FlexSPI Serial Clock Frequency
+typedef enum _FlexSpiSerialClockFreq
+{
+    kFlexSpiSerialClk_30MHz  = 1,
+    kFlexSpiSerialClk_50MHz  = 2,
+    kFlexSpiSerialClk_60MHz  = 3,
+    kFlexSpiSerialClk_75MHz  = 4,
+    kFlexSpiSerialClk_80MHz  = 5,
+    kFlexSpiSerialClk_100MHz = 6,
+    kFlexSpiSerialClk_133MHz = 7,
+    kFlexSpiSerialClk_166MHz = 8,
+} flexspi_serial_clk_freq_t;
+
+// !@brief FlexSPI clock configuration type
+enum
+{
+    kFlexSpiClk_SDR, // !< Clock configure for SDR mode
+    kFlexSpiClk_DDR, // !< Clock configurat for DDR mode
+};
+
+// !@brief FlexSPI Read Sample Clock Source definition
+typedef enum _FlashReadSampleClkSource
+{
+    kFlexSPIReadSampleClk_LoopbackInternally      = 0,
+    kFlexSPIReadSampleClk_LoopbackFromDqsPad      = 1,
+    kFlexSPIReadSampleClk_LoopbackFromSckPad      = 2,
+    kFlexSPIReadSampleClk_ExternalInputFromDqsPad = 3,
+} flexspi_read_sample_clk_t;
+
+// !@brief Misc feature bit definitions
+enum
+{
+    kFlexSpiMiscOffset_DiffClkEnable            = 0, // !< Bit for Differential clock enable
+    kFlexSpiMiscOffset_Ck2Enable                = 1, // !< Bit for CK2 enable
+    kFlexSpiMiscOffset_ParallelEnable           = 2, // !< Bit for Parallel mode enable
+    kFlexSpiMiscOffset_WordAddressableEnable    = 3, // !< Bit for Word Addressable enable
+    kFlexSpiMiscOffset_SafeConfigFreqEnable     = 4, // !< Bit for Safe Configuration Frequency enable
+    kFlexSpiMiscOffset_PadSettingOverrideEnable = 5, // !< Bit for Pad setting override enable
+    kFlexSpiMiscOffset_DdrModeEnable            = 6, // !< Bit for DDR clock confiuration indication.
+};
+
+// !@brief Flash Type Definition
+enum
+{
+    kFlexSpiDeviceType_SerialNOR    = 1,    // !< Flash devices are Serial NOR
+    kFlexSpiDeviceType_SerialNAND   = 2,    // !< Flash devices are Serial NAND
+    kFlexSpiDeviceType_SerialRAM    = 3,    // !< Flash devices are Serial RAM/HyperFLASH
+    kFlexSpiDeviceType_MCP_NOR_NAND = 0x12, // !< Flash device is MCP device, A1 is Serial NOR, A2 is Serial NAND
+    kFlexSpiDeviceType_MCP_NOR_RAM  = 0x13, // !< Flash deivce is MCP device, A1 is Serial NOR, A2 is Serial RAMs
+};
+
+// !@brief Flash Pad Definitions
+enum
+{
+    kSerialFlash_1Pad  = 1,
+    kSerialFlash_2Pads = 2,
+    kSerialFlash_4Pads = 4,
+    kSerialFlash_8Pads = 8,
+};
+
+// !@brief FlexSPI LUT Sequence structure
+typedef struct _lut_sequence
+{
+    uint8_t seqNum; // !< Sequence Number, valid number: 1-16
+    uint8_t seqId;  // !< Sequence Index, valid number: 0-15
+    uint16_t reserved;
+} flexspi_lut_seq_t;
+
+// !@brief Flash Configuration Command Type
+enum
+{
+    kDeviceConfigCmdType_Generic,    // !< Generic command, for example: configure dummy cycles, drive strength, etc
+    kDeviceConfigCmdType_QuadEnable, // !< Quad Enable command
+    kDeviceConfigCmdType_Spi2Xpi,    // !< Switch from SPI to DPI/QPI/OPI mode
+    kDeviceConfigCmdType_Xpi2Spi,    // !< Switch from DPI/QPI/OPI to SPI mode
+    kDeviceConfigCmdType_Spi2NoCmd,  // !< Switch to 0-4-4/0-8-8 mode
+    kDeviceConfigCmdType_Reset,      // !< Reset device command
+};
+
+// !@brief FlexSPI Memory Configuration Block
+typedef struct _FlexSPIConfig
+{
+    uint32_t tag;               // !< [0x000-0x003] Tag, fixed value 0x42464346UL
+    uint32_t version;           // !< [0x004-0x007] Version,[31:24] -'V', [23:16] - Major, [15:8] - Minor, [7:0] - bugfix
+    uint32_t reserved0;         // !< [0x008-0x00b] Reserved for future use
+    uint8_t readSampleClkSrc;   // !< [0x00c-0x00c] Read Sample Clock Source, valid value: 0/1/3
+    uint8_t csHoldTime;         // !< [0x00d-0x00d] CS hold time, default value: 3
+    uint8_t csSetupTime;        // !< [0x00e-0x00e] CS setup time, default value: 3
+    uint8_t columnAddressWidth; // !< [0x00f-0x00f] Column Address with, for HyperBus protocol, it is fixed to 3, For
+    // ! Serial NAND, need to refer to datasheet
+    uint8_t deviceModeCfgEnable; // !< [0x010-0x010] Device Mode Configure enable flag, 1 - Enable, 0 - Disable
+    uint8_t deviceModeType; // !< [0x011-0x011] Specify the configuration command type:Quad Enable, DPI/QPI/OPI switch,
+    // ! Generic configuration, etc.
+    uint16_t waitTimeCfgCommands; // !< [0x012-0x013] Wait time for all configuration commands, unit: 100us, Used for
+    // ! DPI/QPI/OPI switch or reset command
+    flexspi_lut_seq_t deviceModeSeq; // !< [0x014-0x017] Device mode sequence info, [7:0] - LUT sequence id, [15:8] - LUt
+    // ! sequence number, [31:16] Reserved
+    uint32_t deviceModeArg;    // !< [0x018-0x01b] Argument/Parameter for device configuration
+    uint8_t configCmdEnable;   // !< [0x01c-0x01c] Configure command Enable Flag, 1 - Enable, 0 - Disable
+    uint8_t configModeType[3]; // !< [0x01d-0x01f] Configure Mode Type, similar as deviceModeTpe
+    flexspi_lut_seq_t
+        configCmdSeqs[3]; // !< [0x020-0x02b] Sequence info for Device Configuration command, similar as deviceModeSeq
+    uint32_t reserved1;   // !< [0x02c-0x02f] Reserved for future use
+    uint32_t configCmdArgs[3];     // !< [0x030-0x03b] Arguments/Parameters for device Configuration commands
+    uint32_t reserved2;            // !< [0x03c-0x03f] Reserved for future use
+    uint32_t controllerMiscOption; // !< [0x040-0x043] Controller Misc Options, see Misc feature bit definitions for more
+    // ! details
+    uint8_t deviceType;    // !< [0x044-0x044] Device Type:  See Flash Type Definition for more details
+    uint8_t sflashPadType; // !< [0x045-0x045] Serial Flash Pad Type: 1 - Single, 2 - Dual, 4 - Quad, 8 - Octal
+    uint8_t serialClkFreq; // !< [0x046-0x046] Serial Flash Frequencey, device specific definitions, See System Boot
+    // ! Chapter for more details
+    uint8_t lutCustomSeqEnable; // !< [0x047-0x047] LUT customization Enable, it is required if the program/erase cannot
+    // ! be done using 1 LUT sequence, currently, only applicable to HyperFLASH
+    uint32_t reserved3[2];           // !< [0x048-0x04f] Reserved for future use
+    uint32_t sflashA1Size;           // !< [0x050-0x053] Size of Flash connected to A1
+    uint32_t sflashA2Size;           // !< [0x054-0x057] Size of Flash connected to A2
+    uint32_t sflashB1Size;           // !< [0x058-0x05b] Size of Flash connected to B1
+    uint32_t sflashB2Size;           // !< [0x05c-0x05f] Size of Flash connected to B2
+    uint32_t csPadSettingOverride;   // !< [0x060-0x063] CS pad setting override value
+    uint32_t sclkPadSettingOverride; // !< [0x064-0x067] SCK pad setting override value
+    uint32_t dataPadSettingOverride; // !< [0x068-0x06b] data pad setting override value
+    uint32_t dqsPadSettingOverride;  // !< [0x06c-0x06f] DQS pad setting override value
+    uint32_t timeoutInMs;            // !< [0x070-0x073] Timeout threshold for read status command
+    uint32_t commandInterval;        // !< [0x074-0x077] CS deselect interval between two commands
+    uint16_t dataValidTime[2]; // !< [0x078-0x07b] CLK edge to data valid time for PORT A and PORT B, in terms of 0.1ns
+    uint16_t busyOffset;       // !< [0x07c-0x07d] Busy offset, valid value: 0-31
+    uint16_t busyBitPolarity;  // !< [0x07e-0x07f] Busy flag polarity, 0 - busy flag is 1 when flash device is busy, 1 -
+    // ! busy flag is 0 when flash device is busy
+    uint32_t lookupTable[64];           // !< [0x080-0x17f] Lookup table holds Flash command sequences
+    flexspi_lut_seq_t lutCustomSeq[12]; // !< [0x180-0x1af] Customizable LUT Sequences
+    uint32_t reserved4[4];              // !< [0x1b0-0x1bf] Reserved for future use
+} flexspi_mem_config_t;
+
+/*  */
+#define NOR_CMD_LUT_SEQ_IDX_READ_NORMAL 0
+#define NOR_CMD_LUT_SEQ_IDX_READSTATUSREG 1
+#define NOR_CMD_LUT_SEQ_IDX_READ_FAST_QUAD 2
+#define NOR_CMD_LUT_SEQ_IDX_WRITEENABLE 3
+#define NOR_CMD_LUT_SEQ_IDX_READSTATUS_XPI 4
+#define NOR_CMD_LUT_SEQ_IDX_ERASESECTOR 5
+#define NOR_CMD_LUT_SEQ_IDX_WRITESTATUSREG 6
+#define NOR_CMD_LUT_SEQ_IDX_PAGEPROGRAM_QUAD 7
+#define NOR_CMD_LUT_SEQ_IDX_READID 8
+#define NOR_CMD_LUT_SEQ_IDX_PAGEPROGRAM 9
+#define NOR_CMD_LUT_SEQ_IDX_ENTERQPI 10
+#define NOR_CMD_LUT_SEQ_IDX_CHIPERASE 11
+#define NOR_CMD_LUT_SEQ_IDX_EXITQPI 12
+
+#define HYPERFLASH_CMD_LUT_SEQ_IDX_READDATA    0
+#define HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEDATA   1
+#define HYPERFLASH_CMD_LUT_SEQ_IDX_READSTATUS  2
+#define HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEENABLE 4
+#define HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR 6
+#define HYPERFLASH_CMD_LUT_SEQ_IDX_PAGEPROGRAM 10
+#define HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP   12
+
+/*
+ *  Serial NOR configuration block
+ */
+typedef struct _flexspi_nor_config
+{
+    flexspi_mem_config_t memConfig; // !< Common memory configuration info via FlexSPI
+    uint32_t pageSize;              // !< Page size of Serial NOR
+    uint32_t sectorSize;            // !< Sector size of Serial NOR
+    uint8_t ipcmdSerialClkFreq;     // !< Clock frequency for IP command
+    uint8_t isUniformBlockSize;     // !< Sector/Block size is the same
+    uint8_t reserved0[2];           // !< Reserved for future use
+    uint8_t serialNorType;          // !< Serial NOR Flash type: 0/1/2/3
+    uint8_t needExitNoCmdMode;      // !< Need to exit NoCmd mode before other IP command
+    uint8_t halfClkForNonReadCmd;   // !< Half the Serial Clock for non-read command: true/false
+    uint8_t needRestoreNoCmdMode;   // !< Need to Restore NoCmd mode after IP commmand execution
+    uint32_t blockSize;             // !< Block size
+    uint32_t reserve2[11];          // !< Reserved for future use
+} flexspi_nor_config_t;
+
+#define FLASH_BUSY_STATUS_POL 0
+#define FLASH_BUSY_STATUS_OFFSET 0
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* __EVKMIMXRT1050_FLEXSPI_NOR_CONFIG__ */
diff --git a/ports/mimxrt/boards/MIMXRT1050_EVK/clock_config.h b/ports/mimxrt/boards/MIMXRT1050_EVK/clock_config.h
new file mode 100644
index 0000000000000..f213ac7e238dd
--- /dev/null
+++ b/ports/mimxrt/boards/MIMXRT1050_EVK/clock_config.h
@@ -0,0 +1,119 @@
+/*
+ * Copyright 2017-2019 NXP
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#ifndef _CLOCK_CONFIG_H_
+#define _CLOCK_CONFIG_H_
+
+#include "fsl_common.h"
+
+/*******************************************************************************
+ * Definitions
+ ******************************************************************************/
+#define BOARD_XTAL0_CLK_HZ 24000000U /*!< Board xtal0 frequency in Hz */
+
+#define BOARD_XTAL32K_CLK_HZ 32768U /*!< Board xtal32k frequency in Hz */
+/*******************************************************************************
+ ************************ BOARD_InitBootClocks function ************************
+ ******************************************************************************/
+
+#if defined(__cplusplus)
+extern "C" {
+#endif /* __cplusplus*/
+
+/*!
+ * @brief This function executes default configuration of clocks.
+ *
+ */
+void BOARD_InitBootClocks(void);
+
+#if defined(__cplusplus)
+}
+#endif /* __cplusplus*/
+
+/*******************************************************************************
+ ********************** Configuration BOARD_BootClockRUN ***********************
+ ******************************************************************************/
+/*******************************************************************************
+ * Definitions for BOARD_BootClockRUN configuration
+ ******************************************************************************/
+#define BOARD_BOOTCLOCKRUN_CORE_CLOCK 600000000U /*!< Core clock frequency: 600000000Hz */
+
+/* Clock outputs (values are in Hz): */
+#define BOARD_BOOTCLOCKRUN_AHB_CLK_ROOT 600000000UL
+#define BOARD_BOOTCLOCKRUN_CAN_CLK_ROOT 40000000UL
+#define BOARD_BOOTCLOCKRUN_CKIL_SYNC_CLK_ROOT 32768UL
+#define BOARD_BOOTCLOCKRUN_CLKO1_CLK 0UL
+#define BOARD_BOOTCLOCKRUN_CLKO2_CLK 0UL
+#define BOARD_BOOTCLOCKRUN_CLK_1M 1000000UL
+#define BOARD_BOOTCLOCKRUN_CLK_24M 24000000UL
+#define BOARD_BOOTCLOCKRUN_CSI_CLK_ROOT 12000000UL
+#define BOARD_BOOTCLOCKRUN_ENET1_TX_CLK 2400000UL
+#define BOARD_BOOTCLOCKRUN_ENET_125M_CLK 2400000UL
+#define BOARD_BOOTCLOCKRUN_ENET_25M_REF_CLK 1200000UL
+#define BOARD_BOOTCLOCKRUN_FLEXIO1_CLK_ROOT 30000000UL
+#define BOARD_BOOTCLOCKRUN_FLEXIO2_CLK_ROOT 30000000UL
+#define BOARD_BOOTCLOCKRUN_FLEXSPI_CLK_ROOT 160000000UL
+#define BOARD_BOOTCLOCKRUN_GPT1_IPG_CLK_HIGHFREQ 75000000UL
+#define BOARD_BOOTCLOCKRUN_GPT2_IPG_CLK_HIGHFREQ 75000000UL
+#define BOARD_BOOTCLOCKRUN_IPG_CLK_ROOT 150000000UL
+#define BOARD_BOOTCLOCKRUN_LCDIF_CLK_ROOT 9642857UL
+#define BOARD_BOOTCLOCKRUN_LPI2C_CLK_ROOT 60000000UL
+#define BOARD_BOOTCLOCKRUN_LPSPI_CLK_ROOT 105600000UL
+#define BOARD_BOOTCLOCKRUN_LVDS1_CLK 1200000000UL
+#define BOARD_BOOTCLOCKRUN_MQS_MCLK 63529411UL
+#define BOARD_BOOTCLOCKRUN_PERCLK_CLK_ROOT 75000000UL
+#define BOARD_BOOTCLOCKRUN_PLL7_MAIN_CLK 24000000UL
+#define BOARD_BOOTCLOCKRUN_SAI1_CLK_ROOT 63529411UL
+#define BOARD_BOOTCLOCKRUN_SAI1_MCLK1 63529411UL
+#define BOARD_BOOTCLOCKRUN_SAI1_MCLK2 63529411UL
+#define BOARD_BOOTCLOCKRUN_SAI1_MCLK3 30000000UL
+#define BOARD_BOOTCLOCKRUN_SAI2_CLK_ROOT 63529411UL
+#define BOARD_BOOTCLOCKRUN_SAI2_MCLK1 63529411UL
+#define BOARD_BOOTCLOCKRUN_SAI2_MCLK2 0UL
+#define BOARD_BOOTCLOCKRUN_SAI2_MCLK3 30000000UL
+#define BOARD_BOOTCLOCKRUN_SAI3_CLK_ROOT 63529411UL
+#define BOARD_BOOTCLOCKRUN_SAI3_MCLK1 63529411UL
+#define BOARD_BOOTCLOCKRUN_SAI3_MCLK2 0UL
+#define BOARD_BOOTCLOCKRUN_SAI3_MCLK3 30000000UL
+#define BOARD_BOOTCLOCKRUN_SEMC_CLK_ROOT 75000000UL
+#define BOARD_BOOTCLOCKRUN_SPDIF0_CLK_ROOT 30000000UL
+#define BOARD_BOOTCLOCKRUN_SPDIF0_EXTCLK_OUT 0UL
+#define BOARD_BOOTCLOCKRUN_TRACE_CLK_ROOT 117333333UL
+#define BOARD_BOOTCLOCKRUN_UART_CLK_ROOT 80000000UL
+#define BOARD_BOOTCLOCKRUN_USBPHY1_CLK 0UL
+#define BOARD_BOOTCLOCKRUN_USBPHY2_CLK 0UL
+#define BOARD_BOOTCLOCKRUN_USDHC1_CLK_ROOT 198000000UL
+#define BOARD_BOOTCLOCKRUN_USDHC2_CLK_ROOT 198000000UL
+
+/*! @brief Arm PLL set for BOARD_BootClockRUN configuration.
+ */
+extern const clock_arm_pll_config_t armPllConfig_BOARD_BootClockRUN;
+/*! @brief Usb1 PLL set for BOARD_BootClockRUN configuration.
+ */
+extern const clock_usb_pll_config_t usb1PllConfig_BOARD_BootClockRUN;
+/*! @brief Sys PLL for BOARD_BootClockRUN configuration.
+ */
+extern const clock_sys_pll_config_t sysPllConfig_BOARD_BootClockRUN;
+
+/*******************************************************************************
+ * API for BOARD_BootClockRUN configuration
+ ******************************************************************************/
+#if defined(__cplusplus)
+extern "C" {
+#endif /* __cplusplus*/
+
+/*!
+ * @brief This function executes configuration of clocks.
+ *
+ */
+void BOARD_BootClockRUN(void);
+
+#if defined(__cplusplus)
+}
+#endif /* __cplusplus*/
+
+#endif /* _CLOCK_CONFIG_H_ */
diff --git a/ports/mimxrt/boards/MIMXRT1050_EVK/evkmimxrt1050_flexspi_nor_config.h b/ports/mimxrt/boards/MIMXRT1050_EVK/evkmimxrt1050_flexspi_nor_config.h
deleted file mode 100644
index e038967e17088..0000000000000
--- a/ports/mimxrt/boards/MIMXRT1050_EVK/evkmimxrt1050_flexspi_nor_config.h
+++ /dev/null
@@ -1,255 +0,0 @@
-/*
- * Copyright 2018 NXP
- * All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-#ifndef __EVKMIMXRT1050_FLEXSPI_NOR_CONFIG__
-#define __EVKMIMXRT1050_FLEXSPI_NOR_CONFIG__
-
-#include <stdint.h>
-#include <stdbool.h>
-#include "fsl_common.h"
-
-/*! @name Driver version */
-/*@{*/
-/*! @brief XIP_BOARD driver version 2.0.0. */
-#define FSL_XIP_BOARD_DRIVER_VERSION (MAKE_VERSION(2, 0, 0))
-/*@}*/
-
-/* FLEXSPI memory config block related defintions */
-#define FLEXSPI_CFG_BLK_TAG     (0x42464346UL) // ascii "FCFB" Big Endian
-#define FLEXSPI_CFG_BLK_VERSION (0x56010400UL) // V1.4.0
-#define FLEXSPI_CFG_BLK_SIZE    (512)
-
-/* FLEXSPI Feature related definitions */
-#define FLEXSPI_FEATURE_HAS_PARALLEL_MODE 1
-
-/* Lookup table related defintions */
-#define CMD_INDEX_READ        0
-#define CMD_INDEX_READSTATUS  1
-#define CMD_INDEX_WRITEENABLE 2
-#define CMD_INDEX_WRITE       4
-
-#define CMD_LUT_SEQ_IDX_READ        0
-#define CMD_LUT_SEQ_IDX_READSTATUS  1
-#define CMD_LUT_SEQ_IDX_WRITEENABLE 3
-#define CMD_LUT_SEQ_IDX_WRITE       9
-
-#define CMD_SDR        0x01
-#define CMD_DDR        0x21
-#define RADDR_SDR      0x02
-#define RADDR_DDR      0x22
-#define CADDR_SDR      0x03
-#define CADDR_DDR      0x23
-#define MODE1_SDR      0x04
-#define MODE1_DDR      0x24
-#define MODE2_SDR      0x05
-#define MODE2_DDR      0x25
-#define MODE4_SDR      0x06
-#define MODE4_DDR      0x26
-#define MODE8_SDR      0x07
-#define MODE8_DDR      0x27
-#define WRITE_SDR      0x08
-#define WRITE_DDR      0x28
-#define READ_SDR       0x09
-#define READ_DDR       0x29
-#define LEARN_SDR      0x0A
-#define LEARN_DDR      0x2A
-#define DATSZ_SDR      0x0B
-#define DATSZ_DDR      0x2B
-#define DUMMY_SDR      0x0C
-#define DUMMY_DDR      0x2C
-#define DUMMY_RWDS_SDR 0x0D
-#define DUMMY_RWDS_DDR 0x2D
-#define JMP_ON_CS      0x1F
-#define STOP           0
-
-#define FLEXSPI_1PAD 0
-#define FLEXSPI_2PAD 1
-#define FLEXSPI_4PAD 2
-#define FLEXSPI_8PAD 3
-
-#define FLEXSPI_LUT_SEQ(cmd0, pad0, op0, cmd1, pad1, op1)                                                              \
-    (FLEXSPI_LUT_OPERAND0(op0) | FLEXSPI_LUT_NUM_PADS0(pad0) | FLEXSPI_LUT_OPCODE0(cmd0) | FLEXSPI_LUT_OPERAND1(op1) | \
-     FLEXSPI_LUT_NUM_PADS1(pad1) | FLEXSPI_LUT_OPCODE1(cmd1))
-
-//!@brief Definitions for FlexSPI Serial Clock Frequency
-typedef enum _FlexSpiSerialClockFreq
-{
-    kFlexSpiSerialClk_30MHz  = 1,
-    kFlexSpiSerialClk_50MHz  = 2,
-    kFlexSpiSerialClk_60MHz  = 3,
-    kFlexSpiSerialClk_75MHz  = 4,
-    kFlexSpiSerialClk_80MHz  = 5,
-    kFlexSpiSerialClk_100MHz = 6,
-    kFlexSpiSerialClk_133MHz = 7,
-    kFlexSpiSerialClk_166MHz = 8,
-} flexspi_serial_clk_freq_t;
-
-//!@brief FlexSPI clock configuration type
-enum
-{
-    kFlexSpiClk_SDR, //!< Clock configure for SDR mode
-    kFlexSpiClk_DDR, //!< Clock configurat for DDR mode
-};
-
-//!@brief FlexSPI Read Sample Clock Source definition
-typedef enum _FlashReadSampleClkSource
-{
-    kFlexSPIReadSampleClk_LoopbackInternally      = 0,
-    kFlexSPIReadSampleClk_LoopbackFromDqsPad      = 1,
-    kFlexSPIReadSampleClk_LoopbackFromSckPad      = 2,
-    kFlexSPIReadSampleClk_ExternalInputFromDqsPad = 3,
-} flexspi_read_sample_clk_t;
-
-//!@brief Misc feature bit definitions
-enum
-{
-    kFlexSpiMiscOffset_DiffClkEnable            = 0, //!< Bit for Differential clock enable
-    kFlexSpiMiscOffset_Ck2Enable                = 1, //!< Bit for CK2 enable
-    kFlexSpiMiscOffset_ParallelEnable           = 2, //!< Bit for Parallel mode enable
-    kFlexSpiMiscOffset_WordAddressableEnable    = 3, //!< Bit for Word Addressable enable
-    kFlexSpiMiscOffset_SafeConfigFreqEnable     = 4, //!< Bit for Safe Configuration Frequency enable
-    kFlexSpiMiscOffset_PadSettingOverrideEnable = 5, //!< Bit for Pad setting override enable
-    kFlexSpiMiscOffset_DdrModeEnable            = 6, //!< Bit for DDR clock confiuration indication.
-};
-
-//!@brief Flash Type Definition
-enum
-{
-    kFlexSpiDeviceType_SerialNOR    = 1,    //!< Flash devices are Serial NOR
-    kFlexSpiDeviceType_SerialNAND   = 2,    //!< Flash devices are Serial NAND
-    kFlexSpiDeviceType_SerialRAM    = 3,    //!< Flash devices are Serial RAM/HyperFLASH
-    kFlexSpiDeviceType_MCP_NOR_NAND = 0x12, //!< Flash device is MCP device, A1 is Serial NOR, A2 is Serial NAND
-    kFlexSpiDeviceType_MCP_NOR_RAM  = 0x13, //!< Flash deivce is MCP device, A1 is Serial NOR, A2 is Serial RAMs
-};
-
-//!@brief Flash Pad Definitions
-enum
-{
-    kSerialFlash_1Pad  = 1,
-    kSerialFlash_2Pads = 2,
-    kSerialFlash_4Pads = 4,
-    kSerialFlash_8Pads = 8,
-};
-
-//!@brief FlexSPI LUT Sequence structure
-typedef struct _lut_sequence
-{
-    uint8_t seqNum; //!< Sequence Number, valid number: 1-16
-    uint8_t seqId;  //!< Sequence Index, valid number: 0-15
-    uint16_t reserved;
-} flexspi_lut_seq_t;
-
-//!@brief Flash Configuration Command Type
-enum
-{
-    kDeviceConfigCmdType_Generic,    //!< Generic command, for example: configure dummy cycles, drive strength, etc
-    kDeviceConfigCmdType_QuadEnable, //!< Quad Enable command
-    kDeviceConfigCmdType_Spi2Xpi,    //!< Switch from SPI to DPI/QPI/OPI mode
-    kDeviceConfigCmdType_Xpi2Spi,    //!< Switch from DPI/QPI/OPI to SPI mode
-    kDeviceConfigCmdType_Spi2NoCmd,  //!< Switch to 0-4-4/0-8-8 mode
-    kDeviceConfigCmdType_Reset,      //!< Reset device command
-};
-
-//!@brief FlexSPI Memory Configuration Block
-typedef struct _FlexSPIConfig
-{
-    uint32_t tag;               //!< [0x000-0x003] Tag, fixed value 0x42464346UL
-    uint32_t version;           //!< [0x004-0x007] Version,[31:24] -'V', [23:16] - Major, [15:8] - Minor, [7:0] - bugfix
-    uint32_t reserved0;         //!< [0x008-0x00b] Reserved for future use
-    uint8_t readSampleClkSrc;   //!< [0x00c-0x00c] Read Sample Clock Source, valid value: 0/1/3
-    uint8_t csHoldTime;         //!< [0x00d-0x00d] CS hold time, default value: 3
-    uint8_t csSetupTime;        //!< [0x00e-0x00e] CS setup time, default value: 3
-    uint8_t columnAddressWidth; //!< [0x00f-0x00f] Column Address with, for HyperBus protocol, it is fixed to 3, For
-    //! Serial NAND, need to refer to datasheet
-    uint8_t deviceModeCfgEnable; //!< [0x010-0x010] Device Mode Configure enable flag, 1 - Enable, 0 - Disable
-    uint8_t deviceModeType; //!< [0x011-0x011] Specify the configuration command type:Quad Enable, DPI/QPI/OPI switch,
-    //! Generic configuration, etc.
-    uint16_t waitTimeCfgCommands; //!< [0x012-0x013] Wait time for all configuration commands, unit: 100us, Used for
-    //! DPI/QPI/OPI switch or reset command
-    flexspi_lut_seq_t deviceModeSeq; //!< [0x014-0x017] Device mode sequence info, [7:0] - LUT sequence id, [15:8] - LUt
-    //! sequence number, [31:16] Reserved
-    uint32_t deviceModeArg;    //!< [0x018-0x01b] Argument/Parameter for device configuration
-    uint8_t configCmdEnable;   //!< [0x01c-0x01c] Configure command Enable Flag, 1 - Enable, 0 - Disable
-    uint8_t configModeType[3]; //!< [0x01d-0x01f] Configure Mode Type, similar as deviceModeTpe
-    flexspi_lut_seq_t
-        configCmdSeqs[3]; //!< [0x020-0x02b] Sequence info for Device Configuration command, similar as deviceModeSeq
-    uint32_t reserved1;   //!< [0x02c-0x02f] Reserved for future use
-    uint32_t configCmdArgs[3];     //!< [0x030-0x03b] Arguments/Parameters for device Configuration commands
-    uint32_t reserved2;            //!< [0x03c-0x03f] Reserved for future use
-    uint32_t controllerMiscOption; //!< [0x040-0x043] Controller Misc Options, see Misc feature bit definitions for more
-    //! details
-    uint8_t deviceType;    //!< [0x044-0x044] Device Type:  See Flash Type Definition for more details
-    uint8_t sflashPadType; //!< [0x045-0x045] Serial Flash Pad Type: 1 - Single, 2 - Dual, 4 - Quad, 8 - Octal
-    uint8_t serialClkFreq; //!< [0x046-0x046] Serial Flash Frequencey, device specific definitions, See System Boot
-    //! Chapter for more details
-    uint8_t lutCustomSeqEnable; //!< [0x047-0x047] LUT customization Enable, it is required if the program/erase cannot
-    //! be done using 1 LUT sequence, currently, only applicable to HyperFLASH
-    uint32_t reserved3[2];           //!< [0x048-0x04f] Reserved for future use
-    uint32_t sflashA1Size;           //!< [0x050-0x053] Size of Flash connected to A1
-    uint32_t sflashA2Size;           //!< [0x054-0x057] Size of Flash connected to A2
-    uint32_t sflashB1Size;           //!< [0x058-0x05b] Size of Flash connected to B1
-    uint32_t sflashB2Size;           //!< [0x05c-0x05f] Size of Flash connected to B2
-    uint32_t csPadSettingOverride;   //!< [0x060-0x063] CS pad setting override value
-    uint32_t sclkPadSettingOverride; //!< [0x064-0x067] SCK pad setting override value
-    uint32_t dataPadSettingOverride; //!< [0x068-0x06b] data pad setting override value
-    uint32_t dqsPadSettingOverride;  //!< [0x06c-0x06f] DQS pad setting override value
-    uint32_t timeoutInMs;            //!< [0x070-0x073] Timeout threshold for read status command
-    uint32_t commandInterval;        //!< [0x074-0x077] CS deselect interval between two commands
-    uint16_t dataValidTime[2]; //!< [0x078-0x07b] CLK edge to data valid time for PORT A and PORT B, in terms of 0.1ns
-    uint16_t busyOffset;       //!< [0x07c-0x07d] Busy offset, valid value: 0-31
-    uint16_t busyBitPolarity;  //!< [0x07e-0x07f] Busy flag polarity, 0 - busy flag is 1 when flash device is busy, 1 -
-    //! busy flag is 0 when flash device is busy
-    uint32_t lookupTable[64];           //!< [0x080-0x17f] Lookup table holds Flash command sequences
-    flexspi_lut_seq_t lutCustomSeq[12]; //!< [0x180-0x1af] Customizable LUT Sequences
-    uint32_t reserved4[4];              //!< [0x1b0-0x1bf] Reserved for future use
-} flexspi_mem_config_t;
-
-/*  */
-#define NOR_CMD_LUT_SEQ_IDX_READ_NORMAL 0
-#define NOR_CMD_LUT_SEQ_IDX_READSTATUSREG 1
-#define NOR_CMD_LUT_SEQ_IDX_READ_FAST_QUAD 2
-#define NOR_CMD_LUT_SEQ_IDX_WRITEENABLE 3
-#define NOR_CMD_LUT_SEQ_IDX_READSTATUS_XPI 4
-#define NOR_CMD_LUT_SEQ_IDX_ERASESECTOR 5
-#define NOR_CMD_LUT_SEQ_IDX_WRITESTATUSREG 6
-#define NOR_CMD_LUT_SEQ_IDX_PAGEPROGRAM_QUAD 7
-#define NOR_CMD_LUT_SEQ_IDX_READID 8
-#define NOR_CMD_LUT_SEQ_IDX_PAGEPROGRAM 9
-#define NOR_CMD_LUT_SEQ_IDX_ENTERQPI 10
-#define NOR_CMD_LUT_SEQ_IDX_CHIPERASE 11
-#define NOR_CMD_LUT_SEQ_IDX_EXITQPI 12
-
-/*
- *  Serial NOR configuration block
- */
-typedef struct _flexspi_nor_config
-{
-    flexspi_mem_config_t memConfig; //!< Common memory configuration info via FlexSPI
-    uint32_t pageSize;              //!< Page size of Serial NOR
-    uint32_t sectorSize;            //!< Sector size of Serial NOR
-    uint8_t ipcmdSerialClkFreq;     //!< Clock frequency for IP command
-    uint8_t isUniformBlockSize;     //!< Sector/Block size is the same
-    uint8_t reserved0[2];           //!< Reserved for future use
-    uint8_t serialNorType;          //!< Serial NOR Flash type: 0/1/2/3
-    uint8_t needExitNoCmdMode;      //!< Need to exit NoCmd mode before other IP command
-    uint8_t halfClkForNonReadCmd;   //!< Half the Serial Clock for non-read command: true/false
-    uint8_t needRestoreNoCmdMode;   //!< Need to Restore NoCmd mode after IP commmand execution
-    uint32_t blockSize;             //!< Block size
-    uint32_t reserve2[11];          //!< Reserved for future use
-} flexspi_nor_config_t;
-
-#define FLASH_BUSY_STATUS_POL 0
-#define FLASH_BUSY_STATUS_OFFSET 0
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* __EVKMIMXRT1050_FLEXSPI_NOR_CONFIG__ */
diff --git a/ports/mimxrt/boards/MIMXRT1050_EVK/flash_config.c b/ports/mimxrt/boards/MIMXRT1050_EVK/flash_config.c
deleted file mode 100644
index 2a9303fc98101..0000000000000
--- a/ports/mimxrt/boards/MIMXRT1050_EVK/flash_config.c
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * Copyright 2018 NXP
- * All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-#include "evkmimxrt1050_flexspi_nor_config.h"
-
-/* Component ID definition, used by tools. */
-#ifndef FSL_COMPONENT_ID
-#define FSL_COMPONENT_ID "platform.drivers.xip_board"
-#endif
-
-/*******************************************************************************
- * Code
- ******************************************************************************/
-#if defined(XIP_BOOT_HEADER_ENABLE) && (XIP_BOOT_HEADER_ENABLE == 1)
-#if defined(__CC_ARM) || defined(__ARMCC_VERSION) || defined(__GNUC__)
-__attribute__((section(".boot_hdr.conf")))
-#elif defined(__ICCARM__)
-#pragma location = ".boot_hdr.conf"
-#endif
-
-const flexspi_nor_config_t qspiflash_config = {
-    .memConfig =
-        {
-            .tag                = FLEXSPI_CFG_BLK_TAG,
-            .version            = FLEXSPI_CFG_BLK_VERSION,
-            .readSampleClkSrc   = kFlexSPIReadSampleClk_ExternalInputFromDqsPad,
-            .csHoldTime         = 3u,
-            .csSetupTime        = 3u,
-            .columnAddressWidth = 3u,
-            // Enable DDR mode, Wordaddassable, Safe configuration, Differential clock
-            .controllerMiscOption =
-                (1u << kFlexSpiMiscOffset_DdrModeEnable) | (1u << kFlexSpiMiscOffset_WordAddressableEnable) |
-                (1u << kFlexSpiMiscOffset_SafeConfigFreqEnable) | (1u << kFlexSpiMiscOffset_DiffClkEnable),
-            .sflashPadType = kSerialFlash_8Pads,
-            .serialClkFreq = kFlexSpiSerialClk_133MHz,
-            .sflashA1Size  = 64u * 1024u * 1024u,
-            .dataValidTime = {16u, 16u},
-            .lookupTable =
-                {
-                    // 0 Read LUTs 0 -> 0
-                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0xEB, RADDR_SDR, FLEXSPI_4PAD, 0x18),
-                    FLEXSPI_LUT_SEQ(DUMMY_SDR, FLEXSPI_4PAD, 0x06, READ_SDR, FLEXSPI_4PAD, 0x04),
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-
-                    // 1 Read status register -> 1
-                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x05, READ_SDR, FLEXSPI_1PAD, 0x01),
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-
-                    // 2 Fast read quad mode - SDR
-                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x6B, RADDR_SDR, FLEXSPI_1PAD, 0x18),
-                    FLEXSPI_LUT_SEQ(DUMMY_SDR, FLEXSPI_4PAD, 0x08, READ_SDR, FLEXSPI_4PAD, 0x04),
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-
-                    // 3 Write Enable -> 3
-                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x06, STOP, FLEXSPI_1PAD, 0),
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-
-                    // 4 Read extend parameters
-                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x81, READ_SDR, FLEXSPI_1PAD, 0x04),
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-
-                    // 5 Erase Sector -> 5
-                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x20, RADDR_SDR, FLEXSPI_1PAD, 24),
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-
-                    // 6 Write Status Reg
-                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x01, WRITE_SDR, FLEXSPI_1PAD, 0x04),
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-
-                    // 7 Page Program - quad mode (-> 9)
-                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x32, RADDR_SDR, FLEXSPI_1PAD, 0x18),
-                    FLEXSPI_LUT_SEQ(WRITE_SDR, FLEXSPI_4PAD, 0x04, STOP, FLEXSPI_1PAD, 0),
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-
-                    // 8 Read ID
-                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x90, DUMMY_SDR, FLEXSPI_1PAD, 24),
-                    FLEXSPI_LUT_SEQ(READ_SDR, FLEXSPI_1PAD, 0x00, 0, 0, 0),
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-
-                    // 9 Page Program - single mode -> 9
-                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x02, RADDR_SDR, FLEXSPI_1PAD, 24),
-                    FLEXSPI_LUT_SEQ(WRITE_SDR, FLEXSPI_1PAD, 0, 0, 0, 0),
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-
-                    // 10 Enter QPI mode
-                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x35, STOP, FLEXSPI_1PAD, 0),
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-
-                    // 11 Erase Chip
-                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x60, STOP, FLEXSPI_1PAD, 0),
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-
-                    // 12 Exit QPI mode
-                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_4PAD, 0xF5, STOP, FLEXSPI_1PAD, 0),
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                },
-        },
-    .pageSize           = 512u,
-    .sectorSize         = 256u * 1024u,
-    .blockSize          = 256u * 1024u,
-    .isUniformBlockSize = true,
-};
-
-#endif /* XIP_BOOT_HEADER_ENABLE */
diff --git a/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.h b/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.h
index 976de9c07d009..b6b70be0587cb 100644
--- a/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.h
+++ b/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.h
@@ -1,14 +1,10 @@
 #define MICROPY_HW_BOARD_NAME "i.MX RT1050 EVK"
 #define MICROPY_HW_MCU_NAME   "MIMXRT1052DVL6B"
 
-#define BOARD_FLASH_SIZE (64 * 1024 * 1024)
-
-// MIMXRT1050_EVK has 1 user LED
+// MIMXRT1050_EVKB has 1 user LED
 #define MICROPY_HW_LED1_PIN (pin_GPIO_AD_B0_09)
 #define MICROPY_HW_LED_ON(pin) (mp_hal_pin_low(pin))
 #define MICROPY_HW_LED_OFF(pin) (mp_hal_pin_high(pin))
-#define BOARD_FLASH_CONFIG_HEADER_H "evkmimxrt1050_flexspi_nor_config.h"
-#define BOARD_FLASH_OPS_HEADER_H "hal/flexspi_nor_flash.h"
 
 #define MICROPY_HW_NUM_PIN_IRQS (4 * 32 + 3)
 
@@ -38,10 +34,10 @@
     { IOMUXC_GPIO_SD_B0_02_LPSPI1_SDO }, { IOMUXC_GPIO_SD_B0_03_LPSPI1_SDI },
 
 #define DMA_REQ_SRC_RX { 0, kDmaRequestMuxLPSPI1Rx, kDmaRequestMuxLPSPI2Rx, \
-                            kDmaRequestMuxLPSPI3Rx, kDmaRequestMuxLPSPI4Rx }
+                         kDmaRequestMuxLPSPI3Rx, kDmaRequestMuxLPSPI4Rx }
 
 #define DMA_REQ_SRC_TX { 0, kDmaRequestMuxLPSPI1Tx, kDmaRequestMuxLPSPI2Tx, \
-                            kDmaRequestMuxLPSPI3Tx, kDmaRequestMuxLPSPI4Tx } 
+                         kDmaRequestMuxLPSPI3Tx, kDmaRequestMuxLPSPI4Tx }
 
 // Define the mapping hardware I2C # to logical I2C #
 // SDA/SCL  HW-I2C    Logical I2C
@@ -56,13 +52,14 @@
     { IOMUXC_GPIO_AD_B1_07_LPI2C3_SCL }, { IOMUXC_GPIO_AD_B1_06_LPI2C3_SDA },
 
 #define USDHC_DUMMY_PIN NULL, 0
+
 #define MICROPY_USDHC1 \
     { \
         .cmd = {GPIO_SD_B0_00_USDHC1_CMD}, \
         .clk = { GPIO_SD_B0_01_USDHC1_CLK }, \
-        .cd_b = { GPIO_B1_12_USDHC1_CD_B },\
-        .data0 = { GPIO_SD_B0_02_USDHC1_DATA0 },\
-        .data1 = { GPIO_SD_B0_03_USDHC1_DATA1 },\
-        .data2 = { GPIO_SD_B0_04_USDHC1_DATA2 },\
-        .data3 = { GPIO_SD_B0_05_USDHC1_DATA3 },\
+        .cd_b = { GPIO_B1_12_USDHC1_CD_B }, \
+        .data0 = { GPIO_SD_B0_02_USDHC1_DATA0 }, \
+        .data1 = { GPIO_SD_B0_03_USDHC1_DATA1 }, \
+        .data2 = { GPIO_SD_B0_04_USDHC1_DATA2 }, \
+        .data3 = { GPIO_SD_B0_05_USDHC1_DATA3 }, \
     }
diff --git a/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.mk b/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.mk
index fdbf47f01ec3d..1ea85b7b4fef2 100644
--- a/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.mk
+++ b/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.mk
@@ -3,11 +3,10 @@ MCU_VARIANT = MIMXRT1052DVL6B
 
 MICROPY_FLOAT_IMPL = double
 MICROPY_PY_MACHINE_SDCARD = 1
+BOARD_FLASH_TYPE ?= hyperflash
+BOARD_FLASH_SIZE ?= 0x4000000  # 64MB
 
-JLINK_PATH ?= /media/RT1050-EVK/
+JLINK_PATH ?= /media/RT1050-EVKB/
 
 deploy: $(BUILD)/firmware.bin
 	cp $< $(JLINK_PATH)
-
-SRC_C += \
-	hal/flexspi_nor_flash.c
diff --git a/ports/mimxrt/boards/MIMXRT1050_EVK/qspi_hyper_flash_config.c b/ports/mimxrt/boards/MIMXRT1050_EVK/qspi_hyper_flash_config.c
new file mode 100644
index 0000000000000..1b3349f911a12
--- /dev/null
+++ b/ports/mimxrt/boards/MIMXRT1050_EVK/qspi_hyper_flash_config.c
@@ -0,0 +1,186 @@
+/*
+ * Copyright 2018 NXP
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#include BOARD_FLASH_CONFIG_HEADER_H
+
+/* Component ID definition, used by tools. */
+#ifndef FSL_COMPONENT_ID
+#define FSL_COMPONENT_ID "platform.drivers.xip_board"
+#endif
+
+/*******************************************************************************
+ * Code
+ ******************************************************************************/
+#if defined(XIP_BOOT_HEADER_ENABLE) && (XIP_BOOT_HEADER_ENABLE == 1)
+#if defined(__CC_ARM) || defined(__ARMCC_VERSION) || defined(__GNUC__)
+__attribute__((section(".boot_hdr.conf")))
+#elif defined(__ICCARM__)
+#pragma location = ".boot_hdr.conf"
+#endif
+
+const flexspi_nor_config_t qspiflash_config = {
+    .memConfig =
+    {
+        .tag = FLEXSPI_CFG_BLK_TAG,
+        .version = FLEXSPI_CFG_BLK_VERSION,
+        .readSampleClkSrc = kFlexSPIReadSampleClk_ExternalInputFromDqsPad,
+        .csHoldTime = 3u,
+        .csSetupTime = 3u,
+        .columnAddressWidth = 3u,
+        // Enable DDR mode, Wordaddressable, Safe configuration, Differential clock
+        .controllerMiscOption =
+            (1u << kFlexSpiMiscOffset_DdrModeEnable) | (1u << kFlexSpiMiscOffset_WordAddressableEnable) |
+            (1u << kFlexSpiMiscOffset_SafeConfigFreqEnable) | (1u << kFlexSpiMiscOffset_DiffClkEnable),
+        .sflashPadType = kSerialFlash_8Pads,
+        .serialClkFreq = kFlexSpiSerialClk_133MHz,
+        .sflashA1Size = BOARD_FLASH_SIZE,
+        .dataValidTime = {16u, 16u},
+        .lookupTable =
+        {
+            /* 0 Read Data */
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_READDATA] =
+                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xA0, kFLEXSPI_Command_RADDR_DDR, kFLEXSPI_8PAD, 0x18),
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_READDATA + 1] = FLEXSPI_LUT_SEQ(
+                kFLEXSPI_Command_CADDR_DDR, kFLEXSPI_8PAD, 0x10, kFLEXSPI_Command_READ_DDR, kFLEXSPI_8PAD, 0x04),
+
+            /* 1 Write Data */
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEDATA] =
+                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x20, kFLEXSPI_Command_RADDR_DDR, kFLEXSPI_8PAD, 0x18),
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEDATA + 1] = FLEXSPI_LUT_SEQ(
+                kFLEXSPI_Command_CADDR_DDR, kFLEXSPI_8PAD, 0x10, kFLEXSPI_Command_WRITE_DDR, kFLEXSPI_8PAD, 0x02),
+
+            /* 2 Read Status */
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_READSTATUS] =
+                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00),
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_READSTATUS + 1] = FLEXSPI_LUT_SEQ(
+                kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xAA),         // ADDR 0x555
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_READSTATUS + 2] =
+                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x05),
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_READSTATUS + 3] = FLEXSPI_LUT_SEQ(
+                kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x70),         // DATA 0x70
+            // +1
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_READSTATUS + 4] =
+                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xA0, kFLEXSPI_Command_RADDR_DDR, kFLEXSPI_8PAD, 0x18),
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_READSTATUS + 5] = FLEXSPI_LUT_SEQ(
+                kFLEXSPI_Command_CADDR_DDR, kFLEXSPI_8PAD, 0x10, kFLEXSPI_Command_DUMMY_RWDS_DDR, kFLEXSPI_8PAD, 0x0B),
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_READSTATUS + 6] =
+                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_READ_DDR, kFLEXSPI_8PAD, 0x04, kFLEXSPI_Command_STOP, kFLEXSPI_1PAD, 0x0),
+
+            /* 4 Write Enable */
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEENABLE] =
+                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x20, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00),
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEENABLE + 1] = FLEXSPI_LUT_SEQ(
+                kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xAA),         // ADDR 0x555
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEENABLE + 2] =
+                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x05),
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEENABLE + 3] = FLEXSPI_LUT_SEQ(
+                kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xAA),         // DATA 0xAA
+            // +1
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEENABLE + 4] =
+                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x20, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00),
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEENABLE + 5] =
+                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x55),
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEENABLE + 6] =
+                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x02),
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEENABLE + 7] =
+                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x55),
+
+            /* 6 Erase Sector  */
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR] =
+                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00),
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 1] = FLEXSPI_LUT_SEQ(
+                kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xAA),         // ADDR 0x555
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 2] =
+                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x05),
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 3] = FLEXSPI_LUT_SEQ(
+                kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x80),         // DATA 0x80
+            // +1
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 4] =
+                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00),
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 5] =
+                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xAA),
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 6] =
+                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x05),
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 7] = FLEXSPI_LUT_SEQ(
+                kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xAA),         // ADDR 0x555
+            // +2
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 8] =
+                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00),
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 9] =
+                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x55),
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 10] =
+                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x02),
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 11] =
+                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x55),
+            // +3
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 12] =
+                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_RADDR_DDR, kFLEXSPI_8PAD, 0x18),
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 13] =
+                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_CADDR_DDR, kFLEXSPI_8PAD, 0x10, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00),
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 14] =
+                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x30, kFLEXSPI_Command_STOP, kFLEXSPI_1PAD, 0x00),
+
+            /* 10 program page with word program command sequence */
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_PAGEPROGRAM] =
+                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x20, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00),
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_PAGEPROGRAM + 1] = FLEXSPI_LUT_SEQ(
+                kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xAA),         // ADDR 0x555
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_PAGEPROGRAM + 2] =
+                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x05),
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_PAGEPROGRAM + 3] = FLEXSPI_LUT_SEQ(
+                kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xA0),         // DATA 0xA0
+            // +1
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_PAGEPROGRAM + 4] =
+                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x20, kFLEXSPI_Command_RADDR_DDR, kFLEXSPI_8PAD, 0x18),
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_PAGEPROGRAM + 5] = FLEXSPI_LUT_SEQ(
+                kFLEXSPI_Command_CADDR_DDR, kFLEXSPI_8PAD, 0x10, kFLEXSPI_Command_WRITE_DDR, kFLEXSPI_8PAD, 0x80),
+
+            /* 12 Erase chip */
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP] =
+                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00),
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 1] =
+                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xAA),
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 2] =
+                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x05),
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 3] =
+                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x80),
+            // +1
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 4] =
+                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00),
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 5] =
+                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xAA),
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 6] =
+                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x05),
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 7] =
+                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xAA),
+            // +2
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 8] =
+                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00),
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 9] =
+                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x55),
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 10] =
+                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x02),
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 11] =
+                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x55),
+            // +3
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 12] =
+                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00),
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 13] =
+                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xAA),
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 14] =
+                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x05),
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 15] =
+                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x10),
+        },
+    },
+    .pageSize = 512u,
+    .sectorSize = 256u * 1024u,
+    .blockSize = 256u * 1024u,
+    .isUniformBlockSize = true,
+};
+
+#endif /* XIP_BOOT_HEADER_ENABLE */
diff --git a/ports/mimxrt/boards/MIMXRT1050_EVK/qspi_nor_flash_config.c b/ports/mimxrt/boards/MIMXRT1050_EVK/qspi_nor_flash_config.c
new file mode 100644
index 0000000000000..290c6bc152a9e
--- /dev/null
+++ b/ports/mimxrt/boards/MIMXRT1050_EVK/qspi_nor_flash_config.c
@@ -0,0 +1,129 @@
+/*
+ * Copyright 2018 NXP
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#include BOARD_FLASH_CONFIG_HEADER_H
+
+/* Component ID definition, used by tools. */
+#ifndef FSL_COMPONENT_ID
+#define FSL_COMPONENT_ID "platform.drivers.xip_board"
+#endif
+
+/*******************************************************************************
+ * Code
+ ******************************************************************************/
+#if defined(XIP_BOOT_HEADER_ENABLE) && (XIP_BOOT_HEADER_ENABLE == 1)
+#if defined(__CC_ARM) || defined(__ARMCC_VERSION) || defined(__GNUC__)
+__attribute__((section(".boot_hdr.conf")))
+#elif defined(__ICCARM__)
+#pragma location = ".boot_hdr.conf"
+#endif
+
+const flexspi_nor_config_t qspiflash_config = {
+    .memConfig =
+    {
+        .tag = FLEXSPI_CFG_BLK_TAG,
+        .version = FLEXSPI_CFG_BLK_VERSION,
+        .readSampleClkSrc = kFlexSPIReadSampleClk_ExternalInputFromDqsPad,
+        .csHoldTime = 3u,
+        .csSetupTime = 3u,
+        .columnAddressWidth = 3u,
+        // Enable DDR mode, Wordaddassable, Safe configuration, Differential clock
+        .controllerMiscOption =
+            (1u << kFlexSpiMiscOffset_DdrModeEnable) | (1u << kFlexSpiMiscOffset_WordAddressableEnable) |
+            (1u << kFlexSpiMiscOffset_SafeConfigFreqEnable) | (1u << kFlexSpiMiscOffset_DiffClkEnable),
+        .sflashPadType = kSerialFlash_8Pads,
+        .serialClkFreq = kFlexSpiSerialClk_133MHz,
+        .sflashA1Size = BOARD_FLASH_SIZE,
+        .dataValidTime = {16u, 16u},
+        .lookupTable =
+        {
+            // 0 Read LUTs 0 -> 0
+            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0xEB, RADDR_SDR, FLEXSPI_4PAD, 0x18),
+            FLEXSPI_LUT_SEQ(DUMMY_SDR, FLEXSPI_4PAD, 0x06, READ_SDR, FLEXSPI_4PAD, 0x04),
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+
+            // 1 Read status register -> 1
+            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x05, READ_SDR, FLEXSPI_1PAD, 0x01),
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+
+            // 2 Fast read quad mode - SDR
+            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x6B, RADDR_SDR, FLEXSPI_1PAD, 0x18),
+            FLEXSPI_LUT_SEQ(DUMMY_SDR, FLEXSPI_4PAD, 0x08, READ_SDR, FLEXSPI_4PAD, 0x04),
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+
+            // 3 Write Enable -> 3
+            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x06, STOP, FLEXSPI_1PAD, 0),
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+
+            // 4 Read extend parameters
+            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x81, READ_SDR, FLEXSPI_1PAD, 0x04),
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+
+            // 5 Erase Sector -> 5
+            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x20, RADDR_SDR, FLEXSPI_1PAD, 24),
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+
+            // 6 Write Status Reg
+            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x01, WRITE_SDR, FLEXSPI_1PAD, 0x04),
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+
+            // 7 Page Program - quad mode (-> 9)
+            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x32, RADDR_SDR, FLEXSPI_1PAD, 0x18),
+            FLEXSPI_LUT_SEQ(WRITE_SDR, FLEXSPI_4PAD, 0x04, STOP, FLEXSPI_1PAD, 0),
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+
+            // 8 Read ID
+            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x90, DUMMY_SDR, FLEXSPI_1PAD, 24),
+            FLEXSPI_LUT_SEQ(READ_SDR, FLEXSPI_1PAD, 0x00, 0, 0, 0),
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+
+            // 9 Page Program - single mode -> 9
+            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x02, RADDR_SDR, FLEXSPI_1PAD, 24),
+            FLEXSPI_LUT_SEQ(WRITE_SDR, FLEXSPI_1PAD, 0, 0, 0, 0),
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+
+            // 10 Enter QPI mode
+            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x35, STOP, FLEXSPI_1PAD, 0),
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+
+            // 11 Erase Chip
+            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x60, STOP, FLEXSPI_1PAD, 0),
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+
+            // 12 Exit QPI mode
+            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_4PAD, 0xF5, STOP, FLEXSPI_1PAD, 0),
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+        },
+    },
+    .pageSize = 512u,
+    .sectorSize = 256u * 1024u,
+    .blockSize = 256u * 1024u,
+    .isUniformBlockSize = true,
+};
+
+#endif /* XIP_BOOT_HEADER_ENABLE */
diff --git a/ports/mimxrt/boards/MIMXRT1050_EVKB/MIMXRT1050_EVKB.ld b/ports/mimxrt/boards/MIMXRT1050_EVKB/MIMXRT1050_EVKB.ld
deleted file mode 100644
index f616178a9bed2..0000000000000
--- a/ports/mimxrt/boards/MIMXRT1050_EVKB/MIMXRT1050_EVKB.ld
+++ /dev/null
@@ -1 +0,0 @@
-flash_size = 64M;
\ No newline at end of file
diff --git a/ports/mimxrt/boards/MIMXRT1050_EVKB/evkbmimxrt1050_flexspi_nor_config.h b/ports/mimxrt/boards/MIMXRT1050_EVKB/evkbmimxrt1050_flexspi_nor_config.h
deleted file mode 100644
index 02ac394e95aba..0000000000000
--- a/ports/mimxrt/boards/MIMXRT1050_EVKB/evkbmimxrt1050_flexspi_nor_config.h
+++ /dev/null
@@ -1,263 +0,0 @@
-/*
- * Copyright 2018 NXP
- * All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-#ifndef __EVKMIMXRT1050_FLEXSPI_NOR_CONFIG__
-#define __EVKMIMXRT1050_FLEXSPI_NOR_CONFIG__
-
-#include <stdint.h>
-#include <stdbool.h>
-#include "fsl_flexspi.h"
-
-/*! @name Driver version */
-/*@{*/
-/*! @brief XIP_BOARD driver version 2.0.0. */
-#define FSL_XIP_BOARD_DRIVER_VERSION (MAKE_VERSION(2, 0, 0))
-/*@}*/
-
-/* FLEXSPI memory config block related defintions */
-#define FLEXSPI_CFG_BLK_TAG     (0x42464346UL) // ascii "FCFB" Big Endian
-#define FLEXSPI_CFG_BLK_VERSION (0x56010400UL) // V1.4.0
-#define FLEXSPI_CFG_BLK_SIZE    (512)
-
-/* FLEXSPI Feature related definitions */
-#define FLEXSPI_FEATURE_HAS_PARALLEL_MODE 1
-
-/* Lookup table related defintions */
-#define CMD_INDEX_READ        0
-#define CMD_INDEX_READSTATUS  1
-#define CMD_INDEX_WRITEENABLE 2
-#define CMD_INDEX_WRITE       4
-
-#define CMD_LUT_SEQ_IDX_READ        0
-#define CMD_LUT_SEQ_IDX_READSTATUS  1
-#define CMD_LUT_SEQ_IDX_WRITEENABLE 3
-#define CMD_LUT_SEQ_IDX_WRITE       9
-
-#define CMD_SDR        0x01
-#define CMD_DDR        0x21
-#define RADDR_SDR      0x02
-#define RADDR_DDR      0x22
-#define CADDR_SDR      0x03
-#define CADDR_DDR      0x23
-#define MODE1_SDR      0x04
-#define MODE1_DDR      0x24
-#define MODE2_SDR      0x05
-#define MODE2_DDR      0x25
-#define MODE4_SDR      0x06
-#define MODE4_DDR      0x26
-#define MODE8_SDR      0x07
-#define MODE8_DDR      0x27
-#define WRITE_SDR      0x08
-#define WRITE_DDR      0x28
-#define READ_SDR       0x09
-#define READ_DDR       0x29
-#define LEARN_SDR      0x0A
-#define LEARN_DDR      0x2A
-#define DATSZ_SDR      0x0B
-#define DATSZ_DDR      0x2B
-#define DUMMY_SDR      0x0C
-#define DUMMY_DDR      0x2C
-#define DUMMY_RWDS_SDR 0x0D
-#define DUMMY_RWDS_DDR 0x2D
-#define JMP_ON_CS      0x1F
-#define STOP           0
-
-#define FLEXSPI_1PAD 0
-#define FLEXSPI_2PAD 1
-#define FLEXSPI_4PAD 2
-#define FLEXSPI_8PAD 3
-
-#define FLEXSPI_LUT_SEQ(cmd0, pad0, op0, cmd1, pad1, op1)                                                              \
-    (FLEXSPI_LUT_OPERAND0(op0) | FLEXSPI_LUT_NUM_PADS0(pad0) | FLEXSPI_LUT_OPCODE0(cmd0) | FLEXSPI_LUT_OPERAND1(op1) | \
-     FLEXSPI_LUT_NUM_PADS1(pad1) | FLEXSPI_LUT_OPCODE1(cmd1))
-
-//!@brief Definitions for FlexSPI Serial Clock Frequency
-typedef enum _FlexSpiSerialClockFreq
-{
-    kFlexSpiSerialClk_30MHz  = 1,
-    kFlexSpiSerialClk_50MHz  = 2,
-    kFlexSpiSerialClk_60MHz  = 3,
-    kFlexSpiSerialClk_75MHz  = 4,
-    kFlexSpiSerialClk_80MHz  = 5,
-    kFlexSpiSerialClk_100MHz = 6,
-    kFlexSpiSerialClk_133MHz = 7,
-    kFlexSpiSerialClk_166MHz = 8,
-} flexspi_serial_clk_freq_t;
-
-//!@brief FlexSPI clock configuration type
-enum
-{
-    kFlexSpiClk_SDR, //!< Clock configure for SDR mode
-    kFlexSpiClk_DDR, //!< Clock configurat for DDR mode
-};
-
-//!@brief FlexSPI Read Sample Clock Source definition
-typedef enum _FlashReadSampleClkSource
-{
-    kFlexSPIReadSampleClk_LoopbackInternally      = 0,
-    kFlexSPIReadSampleClk_LoopbackFromDqsPad      = 1,
-    kFlexSPIReadSampleClk_LoopbackFromSckPad      = 2,
-    kFlexSPIReadSampleClk_ExternalInputFromDqsPad = 3,
-} flexspi_read_sample_clk_t;
-
-//!@brief Misc feature bit definitions
-enum
-{
-    kFlexSpiMiscOffset_DiffClkEnable            = 0, //!< Bit for Differential clock enable
-    kFlexSpiMiscOffset_Ck2Enable                = 1, //!< Bit for CK2 enable
-    kFlexSpiMiscOffset_ParallelEnable           = 2, //!< Bit for Parallel mode enable
-    kFlexSpiMiscOffset_WordAddressableEnable    = 3, //!< Bit for Word Addressable enable
-    kFlexSpiMiscOffset_SafeConfigFreqEnable     = 4, //!< Bit for Safe Configuration Frequency enable
-    kFlexSpiMiscOffset_PadSettingOverrideEnable = 5, //!< Bit for Pad setting override enable
-    kFlexSpiMiscOffset_DdrModeEnable            = 6, //!< Bit for DDR clock confiuration indication.
-};
-
-//!@brief Flash Type Definition
-enum
-{
-    kFlexSpiDeviceType_SerialNOR    = 1,    //!< Flash devices are Serial NOR
-    kFlexSpiDeviceType_SerialNAND   = 2,    //!< Flash devices are Serial NAND
-    kFlexSpiDeviceType_SerialRAM    = 3,    //!< Flash devices are Serial RAM/HyperFLASH
-    kFlexSpiDeviceType_MCP_NOR_NAND = 0x12, //!< Flash device is MCP device, A1 is Serial NOR, A2 is Serial NAND
-    kFlexSpiDeviceType_MCP_NOR_RAM  = 0x13, //!< Flash deivce is MCP device, A1 is Serial NOR, A2 is Serial RAMs
-};
-
-//!@brief Flash Pad Definitions
-enum
-{
-    kSerialFlash_1Pad  = 1,
-    kSerialFlash_2Pads = 2,
-    kSerialFlash_4Pads = 4,
-    kSerialFlash_8Pads = 8,
-};
-
-//!@brief FlexSPI LUT Sequence structure
-typedef struct _lut_sequence
-{
-    uint8_t seqNum; //!< Sequence Number, valid number: 1-16
-    uint8_t seqId;  //!< Sequence Index, valid number: 0-15
-    uint16_t reserved;
-} flexspi_lut_seq_t;
-
-//!@brief Flash Configuration Command Type
-enum
-{
-    kDeviceConfigCmdType_Generic,    //!< Generic command, for example: configure dummy cycles, drive strength, etc
-    kDeviceConfigCmdType_QuadEnable, //!< Quad Enable command
-    kDeviceConfigCmdType_Spi2Xpi,    //!< Switch from SPI to DPI/QPI/OPI mode
-    kDeviceConfigCmdType_Xpi2Spi,    //!< Switch from DPI/QPI/OPI to SPI mode
-    kDeviceConfigCmdType_Spi2NoCmd,  //!< Switch to 0-4-4/0-8-8 mode
-    kDeviceConfigCmdType_Reset,      //!< Reset device command
-};
-
-//!@brief FlexSPI Memory Configuration Block
-typedef struct _FlexSPIConfig
-{
-    uint32_t tag;               //!< [0x000-0x003] Tag, fixed value 0x42464346UL
-    uint32_t version;           //!< [0x004-0x007] Version,[31:24] -'V', [23:16] - Major, [15:8] - Minor, [7:0] - bugfix
-    uint32_t reserved0;         //!< [0x008-0x00b] Reserved for future use
-    uint8_t readSampleClkSrc;   //!< [0x00c-0x00c] Read Sample Clock Source, valid value: 0/1/3
-    uint8_t csHoldTime;         //!< [0x00d-0x00d] CS hold time, default value: 3
-    uint8_t csSetupTime;        //!< [0x00e-0x00e] CS setup time, default value: 3
-    uint8_t columnAddressWidth; //!< [0x00f-0x00f] Column Address with, for HyperBus protocol, it is fixed to 3, For
-    //! Serial NAND, need to refer to datasheet
-    uint8_t deviceModeCfgEnable; //!< [0x010-0x010] Device Mode Configure enable flag, 1 - Enable, 0 - Disable
-    uint8_t deviceModeType; //!< [0x011-0x011] Specify the configuration command type:Quad Enable, DPI/QPI/OPI switch,
-    //! Generic configuration, etc.
-    uint16_t waitTimeCfgCommands; //!< [0x012-0x013] Wait time for all configuration commands, unit: 100us, Used for
-    //! DPI/QPI/OPI switch or reset command
-    flexspi_lut_seq_t deviceModeSeq; //!< [0x014-0x017] Device mode sequence info, [7:0] - LUT sequence id, [15:8] - LUt
-    //! sequence number, [31:16] Reserved
-    uint32_t deviceModeArg;    //!< [0x018-0x01b] Argument/Parameter for device configuration
-    uint8_t configCmdEnable;   //!< [0x01c-0x01c] Configure command Enable Flag, 1 - Enable, 0 - Disable
-    uint8_t configModeType[3]; //!< [0x01d-0x01f] Configure Mode Type, similar as deviceModeTpe
-    flexspi_lut_seq_t
-        configCmdSeqs[3]; //!< [0x020-0x02b] Sequence info for Device Configuration command, similar as deviceModeSeq
-    uint32_t reserved1;   //!< [0x02c-0x02f] Reserved for future use
-    uint32_t configCmdArgs[3];     //!< [0x030-0x03b] Arguments/Parameters for device Configuration commands
-    uint32_t reserved2;            //!< [0x03c-0x03f] Reserved for future use
-    uint32_t controllerMiscOption; //!< [0x040-0x043] Controller Misc Options, see Misc feature bit definitions for more
-    //! details
-    uint8_t deviceType;    //!< [0x044-0x044] Device Type:  See Flash Type Definition for more details
-    uint8_t sflashPadType; //!< [0x045-0x045] Serial Flash Pad Type: 1 - Single, 2 - Dual, 4 - Quad, 8 - Octal
-    uint8_t serialClkFreq; //!< [0x046-0x046] Serial Flash Frequencey, device specific definitions, See System Boot
-    //! Chapter for more details
-    uint8_t lutCustomSeqEnable; //!< [0x047-0x047] LUT customization Enable, it is required if the program/erase cannot
-    //! be done using 1 LUT sequence, currently, only applicable to HyperFLASH
-    uint32_t reserved3[2];           //!< [0x048-0x04f] Reserved for future use
-    uint32_t sflashA1Size;           //!< [0x050-0x053] Size of Flash connected to A1
-    uint32_t sflashA2Size;           //!< [0x054-0x057] Size of Flash connected to A2
-    uint32_t sflashB1Size;           //!< [0x058-0x05b] Size of Flash connected to B1
-    uint32_t sflashB2Size;           //!< [0x05c-0x05f] Size of Flash connected to B2
-    uint32_t csPadSettingOverride;   //!< [0x060-0x063] CS pad setting override value
-    uint32_t sclkPadSettingOverride; //!< [0x064-0x067] SCK pad setting override value
-    uint32_t dataPadSettingOverride; //!< [0x068-0x06b] data pad setting override value
-    uint32_t dqsPadSettingOverride;  //!< [0x06c-0x06f] DQS pad setting override value
-    uint32_t timeoutInMs;            //!< [0x070-0x073] Timeout threshold for read status command
-    uint32_t commandInterval;        //!< [0x074-0x077] CS deselect interval between two commands
-    uint16_t dataValidTime[2]; //!< [0x078-0x07b] CLK edge to data valid time for PORT A and PORT B, in terms of 0.1ns
-    uint16_t busyOffset;       //!< [0x07c-0x07d] Busy offset, valid value: 0-31
-    uint16_t busyBitPolarity;  //!< [0x07e-0x07f] Busy flag polarity, 0 - busy flag is 1 when flash device is busy, 1 -
-    //! busy flag is 0 when flash device is busy
-    uint32_t lookupTable[64];           //!< [0x080-0x17f] Lookup table holds Flash command sequences
-    flexspi_lut_seq_t lutCustomSeq[12]; //!< [0x180-0x1af] Customizable LUT Sequences
-    uint32_t reserved4[4];              //!< [0x1b0-0x1bf] Reserved for future use
-} flexspi_mem_config_t;
-
-/*  */
-#define NOR_CMD_LUT_SEQ_IDX_READ_NORMAL 0
-#define NOR_CMD_LUT_SEQ_IDX_READSTATUSREG 1
-#define NOR_CMD_LUT_SEQ_IDX_READ_FAST_QUAD 2
-#define NOR_CMD_LUT_SEQ_IDX_WRITEENABLE 3
-#define NOR_CMD_LUT_SEQ_IDX_READSTATUS_XPI 4
-#define NOR_CMD_LUT_SEQ_IDX_ERASESECTOR 5
-#define NOR_CMD_LUT_SEQ_IDX_WRITESTATUSREG 6
-#define NOR_CMD_LUT_SEQ_IDX_PAGEPROGRAM_QUAD 7
-#define NOR_CMD_LUT_SEQ_IDX_READID 8
-#define NOR_CMD_LUT_SEQ_IDX_PAGEPROGRAM 9
-#define NOR_CMD_LUT_SEQ_IDX_ENTERQPI 10
-#define NOR_CMD_LUT_SEQ_IDX_CHIPERASE 11
-#define NOR_CMD_LUT_SEQ_IDX_EXITQPI 12
-
-#define HYPERFLASH_CMD_LUT_SEQ_IDX_READDATA    0
-#define HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEDATA   1
-#define HYPERFLASH_CMD_LUT_SEQ_IDX_READSTATUS  2
-#define HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEENABLE 4
-#define HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR 6
-#define HYPERFLASH_CMD_LUT_SEQ_IDX_PAGEPROGRAM 10
-#define HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP   12
-
-/*
- *  Serial NOR configuration block
- */
-typedef struct _flexspi_nor_config
-{
-    flexspi_mem_config_t memConfig; //!< Common memory configuration info via FlexSPI
-    uint32_t pageSize;              //!< Page size of Serial NOR
-    uint32_t sectorSize;            //!< Sector size of Serial NOR
-    uint8_t ipcmdSerialClkFreq;     //!< Clock frequency for IP command
-    uint8_t isUniformBlockSize;     //!< Sector/Block size is the same
-    uint8_t reserved0[2];           //!< Reserved for future use
-    uint8_t serialNorType;          //!< Serial NOR Flash type: 0/1/2/3
-    uint8_t needExitNoCmdMode;      //!< Need to exit NoCmd mode before other IP command
-    uint8_t halfClkForNonReadCmd;   //!< Half the Serial Clock for non-read command: true/false
-    uint8_t needRestoreNoCmdMode;   //!< Need to Restore NoCmd mode after IP commmand execution
-    uint32_t blockSize;             //!< Block size
-    uint32_t reserve2[11];          //!< Reserved for future use
-} flexspi_nor_config_t;
-
-#define FLASH_BUSY_STATUS_POL 0
-#define FLASH_BUSY_STATUS_OFFSET 0
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* __EVKMIMXRT1050_FLEXSPI_NOR_CONFIG__ */
diff --git a/ports/mimxrt/boards/MIMXRT1050_EVKB/flash_config.c b/ports/mimxrt/boards/MIMXRT1050_EVKB/flash_config.c
deleted file mode 100644
index e8190bcb6c064..0000000000000
--- a/ports/mimxrt/boards/MIMXRT1050_EVKB/flash_config.c
+++ /dev/null
@@ -1,186 +0,0 @@
-/*
- * Copyright 2018 NXP
- * All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-#include "evkbmimxrt1050_flexspi_nor_config.h"
-
-/* Component ID definition, used by tools. */
-#ifndef FSL_COMPONENT_ID
-#define FSL_COMPONENT_ID "platform.drivers.xip_board"
-#endif
-
-/*******************************************************************************
- * Code
- ******************************************************************************/
-#if defined(XIP_BOOT_HEADER_ENABLE) && (XIP_BOOT_HEADER_ENABLE == 1)
-#if defined(__CC_ARM) || defined(__ARMCC_VERSION) || defined(__GNUC__)
-__attribute__((section(".boot_hdr.conf")))
-#elif defined(__ICCARM__)
-#pragma location = ".boot_hdr.conf"
-#endif
-
-const flexspi_nor_config_t qspiflash_config = {
-    .memConfig =
-        {
-            .tag                = FLEXSPI_CFG_BLK_TAG,
-            .version            = FLEXSPI_CFG_BLK_VERSION,
-            .readSampleClkSrc   = kFlexSPIReadSampleClk_ExternalInputFromDqsPad,
-            .csHoldTime         = 3u,
-            .csSetupTime        = 3u,
-            .columnAddressWidth = 3u,
-            // Enable DDR mode, Wordaddressable, Safe configuration, Differential clock
-            .controllerMiscOption =
-                (1u << kFlexSpiMiscOffset_DdrModeEnable) | (1u << kFlexSpiMiscOffset_WordAddressableEnable) |
-                (1u << kFlexSpiMiscOffset_SafeConfigFreqEnable) | (1u << kFlexSpiMiscOffset_DiffClkEnable),
-            .sflashPadType = kSerialFlash_8Pads,
-            .serialClkFreq = kFlexSpiSerialClk_133MHz,
-            .sflashA1Size  = 64u * 1024u * 1024u,
-            .dataValidTime = {16u, 16u},
-            .lookupTable =
-                {
-                    /* 0 Read Data */
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_READDATA] =
-                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xA0, kFLEXSPI_Command_RADDR_DDR, kFLEXSPI_8PAD, 0x18),
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_READDATA + 1] = FLEXSPI_LUT_SEQ(
-                        kFLEXSPI_Command_CADDR_DDR, kFLEXSPI_8PAD, 0x10, kFLEXSPI_Command_READ_DDR, kFLEXSPI_8PAD, 0x04),
-
-                    /* 1 Write Data */
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEDATA] =
-                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x20, kFLEXSPI_Command_RADDR_DDR, kFLEXSPI_8PAD, 0x18),
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEDATA + 1] = FLEXSPI_LUT_SEQ(
-                        kFLEXSPI_Command_CADDR_DDR, kFLEXSPI_8PAD, 0x10, kFLEXSPI_Command_WRITE_DDR, kFLEXSPI_8PAD, 0x02),
-
-                    /* 2 Read Status */
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_READSTATUS] =
-                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00),
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_READSTATUS + 1] = FLEXSPI_LUT_SEQ(
-                        kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xAA), // ADDR 0x555
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_READSTATUS + 2] =
-                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x05),
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_READSTATUS + 3] = FLEXSPI_LUT_SEQ(
-                        kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x70), // DATA 0x70
-                    // +1
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_READSTATUS + 4] =
-                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xA0, kFLEXSPI_Command_RADDR_DDR, kFLEXSPI_8PAD, 0x18),
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_READSTATUS + 5] = FLEXSPI_LUT_SEQ(
-                        kFLEXSPI_Command_CADDR_DDR, kFLEXSPI_8PAD, 0x10, kFLEXSPI_Command_DUMMY_RWDS_DDR, kFLEXSPI_8PAD, 0x0B),
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_READSTATUS + 6] =
-                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_READ_DDR, kFLEXSPI_8PAD, 0x04, kFLEXSPI_Command_STOP, kFLEXSPI_1PAD, 0x0),
-
-                    /* 4 Write Enable */
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEENABLE] =
-                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x20, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00),
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEENABLE + 1] = FLEXSPI_LUT_SEQ(
-                        kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xAA), // ADDR 0x555
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEENABLE + 2] =
-                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x05),
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEENABLE + 3] = FLEXSPI_LUT_SEQ(
-                        kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xAA), // DATA 0xAA
-                    // +1
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEENABLE + 4] =
-                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x20, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00),
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEENABLE + 5] =
-                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x55),
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEENABLE + 6] =
-                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x02),
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEENABLE + 7] =
-                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x55),
-
-                    /* 6 Erase Sector  */
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR] =
-                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00),
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 1] = FLEXSPI_LUT_SEQ(
-                        kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xAA), // ADDR 0x555
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 2] =
-                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x05),
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 3] = FLEXSPI_LUT_SEQ(
-                        kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x80), // DATA 0x80
-                    // +1
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 4] =
-                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00),
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 5] =
-                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xAA),
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 6] =
-                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x05),
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 7] = FLEXSPI_LUT_SEQ(
-                        kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xAA), // ADDR 0x555
-                    // +2
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 8] =
-                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00),
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 9] =
-                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x55),
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 10] =
-                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x02),
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 11] =
-                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x55),
-                    // +3
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 12] =
-                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_RADDR_DDR, kFLEXSPI_8PAD, 0x18),
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 13] =
-                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_CADDR_DDR, kFLEXSPI_8PAD, 0x10, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00),
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 14] =
-                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x30, kFLEXSPI_Command_STOP, kFLEXSPI_1PAD, 0x00),
-
-                    /* 10 program page with word program command sequence */
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_PAGEPROGRAM] =
-                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x20, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00),
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_PAGEPROGRAM + 1] = FLEXSPI_LUT_SEQ(
-                        kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xAA), // ADDR 0x555
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_PAGEPROGRAM + 2] =
-                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x05),
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_PAGEPROGRAM + 3] = FLEXSPI_LUT_SEQ(
-                        kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xA0), // DATA 0xA0
-                    // +1
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_PAGEPROGRAM + 4] =
-                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x20, kFLEXSPI_Command_RADDR_DDR, kFLEXSPI_8PAD, 0x18),
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_PAGEPROGRAM + 5] = FLEXSPI_LUT_SEQ(
-                        kFLEXSPI_Command_CADDR_DDR, kFLEXSPI_8PAD, 0x10, kFLEXSPI_Command_WRITE_DDR, kFLEXSPI_8PAD, 0x80),
-
-                    /* 12 Erase chip */
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP] =
-                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00),
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 1] =
-                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xAA),
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 2] =
-                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x05),
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 3] =
-                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x80),
-                    // +1
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 4] =
-                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00),
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 5] =
-                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xAA),
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 6] =
-                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x05),
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 7] =
-                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xAA),
-                    // +2
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 8] =
-                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00),
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 9] =
-                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x55),
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 10] =
-                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x02),
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 11] =
-                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x55),
-                    // +3
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 12] =
-                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00),
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 13] =
-                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xAA),
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 14] =
-                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x05),
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 15] =
-                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x10),
-                },
-        },
-    .pageSize           = 512u,
-    .sectorSize         = 256u * 1024u,
-    .blockSize          = 256u * 1024u,
-    .isUniformBlockSize = true,
-};
-
-#endif /* XIP_BOOT_HEADER_ENABLE */
diff --git a/ports/mimxrt/boards/MIMXRT1050_EVKB/mpconfigboard.h b/ports/mimxrt/boards/MIMXRT1050_EVKB/mpconfigboard.h
deleted file mode 100644
index 963c42cb6a995..0000000000000
--- a/ports/mimxrt/boards/MIMXRT1050_EVKB/mpconfigboard.h
+++ /dev/null
@@ -1,68 +0,0 @@
-#define MICROPY_HW_BOARD_NAME "i.MX RT1050 EVKB"
-#define MICROPY_HW_MCU_NAME   "MIMXRT1052DVL6B"
-
-#define BOARD_FLASH_SIZE (64 * 1024 * 1024)
-
-// MIMXRT1050_EVKB has 1 user LED
-#define MICROPY_HW_LED1_PIN (pin_GPIO_AD_B0_09)
-#define MICROPY_HW_LED_ON(pin) (mp_hal_pin_low(pin))
-#define MICROPY_HW_LED_OFF(pin) (mp_hal_pin_high(pin))
-#define BOARD_FLASH_CONFIG_HEADER_H "evkbmimxrt1050_flexspi_nor_config.h"
-#define BOARD_FLASH_OPS_HEADER_H "hal/flexspi_hyper_flash.h"
-
-#define MICROPY_HW_NUM_PIN_IRQS (4 * 32 + 3)
-
-// Define mapping logical UART # to hardware UART #
-// LPUART3 on D0/D1  -> 1
-// LPUART2 on D7/D6  -> 2
-// LPUART6 on D8/D9  -> 3
-// LPUART8 on A1/A0  -> 4
-
-#define MICROPY_HW_UART_NUM     (sizeof(uart_index_table) / sizeof(uart_index_table)[0])
-#define MICROPY_HW_UART_INDEX   { 0, 3, 2, 6, 8 }
-
-#define IOMUX_TABLE_UART \
-    { 0 }, { 0 }, \
-    { IOMUXC_GPIO_AD_B1_02_LPUART2_TX }, { IOMUXC_GPIO_AD_B1_03_LPUART2_RX }, \
-    { IOMUXC_GPIO_AD_B1_06_LPUART3_TX }, { IOMUXC_GPIO_AD_B1_07_LPUART3_RX }, \
-    { 0 }, { 0 }, \
-    { 0 }, { 0 }, \
-    { IOMUXC_GPIO_AD_B0_02_LPUART6_TX }, { IOMUXC_GPIO_AD_B0_03_LPUART6_RX }, \
-    { 0 }, { 0 }, \
-    { IOMUXC_GPIO_AD_B1_10_LPUART8_TX }, { IOMUXC_GPIO_AD_B1_11_LPUART8_RX },
-
-#define MICROPY_HW_SPI_INDEX { 1 }
-
-#define IOMUX_TABLE_SPI \
-    { IOMUXC_GPIO_SD_B0_00_LPSPI1_SCK }, { IOMUXC_GPIO_SD_B0_01_LPSPI1_PCS0 }, \
-    { IOMUXC_GPIO_SD_B0_02_LPSPI1_SDO }, { IOMUXC_GPIO_SD_B0_03_LPSPI1_SDI },
-
-#define DMA_REQ_SRC_RX { 0, kDmaRequestMuxLPSPI1Rx, kDmaRequestMuxLPSPI2Rx, \
-                            kDmaRequestMuxLPSPI3Rx, kDmaRequestMuxLPSPI4Rx }
-
-#define DMA_REQ_SRC_TX { 0, kDmaRequestMuxLPSPI1Tx, kDmaRequestMuxLPSPI2Tx, \
-                            kDmaRequestMuxLPSPI3Tx, kDmaRequestMuxLPSPI4Tx } 
-
-// Define the mapping hardware I2C # to logical I2C #
-// SDA/SCL  HW-I2C    Logical I2C
-// D14/D15  LPI2C1 ->    0
-// D1/D0    LPI2C3 ->    1
-
-#define MICROPY_HW_I2C_INDEX   { 1, 3 }
-
-#define IOMUX_TABLE_I2C \
-    { IOMUXC_GPIO_AD_B1_00_LPI2C1_SCL }, { IOMUXC_GPIO_AD_B1_01_LPI2C1_SDA }, \
-    { 0 }, { 0 }, \
-    { IOMUXC_GPIO_AD_B1_07_LPI2C3_SCL }, { IOMUXC_GPIO_AD_B1_06_LPI2C3_SDA },
-
-#define USDHC_DUMMY_PIN NULL , 0
-#define MICROPY_USDHC1 \
-    { \
-        .cmd = {GPIO_SD_B0_00_USDHC1_CMD}, \
-        .clk = { GPIO_SD_B0_01_USDHC1_CLK }, \
-        .cd_b = { GPIO_B1_12_USDHC1_CD_B },\
-        .data0 = { GPIO_SD_B0_02_USDHC1_DATA0 },\
-        .data1 = { GPIO_SD_B0_03_USDHC1_DATA1 },\
-        .data2 = { GPIO_SD_B0_04_USDHC1_DATA2 },\
-        .data3 = { GPIO_SD_B0_05_USDHC1_DATA3 },\
-    }
diff --git a/ports/mimxrt/boards/MIMXRT1050_EVKB/mpconfigboard.mk b/ports/mimxrt/boards/MIMXRT1050_EVKB/mpconfigboard.mk
deleted file mode 100644
index e6cd1a63e816d..0000000000000
--- a/ports/mimxrt/boards/MIMXRT1050_EVKB/mpconfigboard.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-MCU_SERIES = MIMXRT1052
-MCU_VARIANT = MIMXRT1052DVL6B
-
-MICROPY_FLOAT_IMPL = double
-MICROPY_PY_MACHINE_SDCARD = 1
-
-JLINK_PATH ?= /media/RT1050-EVKB/
-
-SRC_C += \
-	hal/flexspi_hyper_flash.c
-
-deploy: $(BUILD)/firmware.bin
-	cp $< $(JLINK_PATH)
diff --git a/ports/mimxrt/boards/MIMXRT1050_EVKB/pins.csv b/ports/mimxrt/boards/MIMXRT1050_EVKB/pins.csv
deleted file mode 100644
index 366a141ff8e14..0000000000000
--- a/ports/mimxrt/boards/MIMXRT1050_EVKB/pins.csv
+++ /dev/null
@@ -1,31 +0,0 @@
-D0,GPIO_AD_B1_07
-D1,GPIO_AD_B1_06
-D2,GPIO_AD_B0_11
-D3,GPIO_AD_B1_08
-D4,GPIO_AD_B0_09
-D5,GPIO_AD_B0_10
-D6,GPIO_AD_B1_02
-D7,GPIO_AD_B1_03
-D8,GPIO_AD_B0_03
-D9,GPIO_AD_B0_02
-D10,GPIO_SD_B0_01
-D11,GPIO_SD_B0_02
-D12,GPIO_SD_B0_03
-D13,GPIO_SD_B0_00
-D14,GPIO_AD_B1_01
-D15,GPIO_AD_B1_00
-A0,GPIO_AD_B1_10
-A1,GPIO_AD_B1_11
-A2,GPIO_AD_B1_04
-A3,GPIO_AD_B1_05
-A4,GPIO_AD_B1_01
-A5,GPIO_AD_B1_00
-RX,GPIO_AD_B1_07
-TX,GPIO_AD_B1_06
-SCL,GPIO_AD_B1_00
-SDA,GPIO_AD_B1_01
-SCK,GPIO_SD_B0_00
-SDI,GPIO_SD_B0_03
-SDO,GPIO_SD_B0_02
-CS,GPIO_SD_B0_01
-LED_GREEN,GPIO_AD_B0_09
diff --git a/ports/mimxrt/boards/MIMXRT1052.ld b/ports/mimxrt/boards/MIMXRT1052.ld
index 75192979406d9..d8c51d530a30f 100644
--- a/ports/mimxrt/boards/MIMXRT1052.ld
+++ b/ports/mimxrt/boards/MIMXRT1052.ld
@@ -1,14 +1,25 @@
 /* Memory configuration */
+#if BOARD_FLASH_RESERVED
+reserved_size = BOARD_FLASH_RESERVED;
+#endif
+
+#if BOARD_FLASH_TYPE==qspi_nor
+flash_start         = 0x60000000;
+#elif BOARD_FLASH_TYPE==hyperflash
 flash_start         = 0x60000000;
+#else
+#error Unknown BOARD_FLASH_TYPE
+#endif
+flash_size          = BOARD_FLASH_SIZE;
 flash_end           = DEFINED(reserved_size) ? ((flash_start) + (flash_size - reserved_size)) : ((flash_start) + (flash_size));
 flash_config_start  = flash_start;
 flash_config_size   = 0x00001000;
-ivt_start           = 0x60001000;
+ivt_start           = flash_start + 0x00001000;
 ivt_size            = 0x00001000;
-interrupts_start    = 0x60002000;
+interrupts_start    = flash_start + 0x00002000;
 interrupts_size     = 0x00000400;
-text_start          = 0x60002400;
-vfs_start           = 0x60100000;
+text_start          = flash_start + 0x00002400;
+vfs_start           = flash_start + 0x00100000;
 text_size           = ((vfs_start) - (text_start));
 vfs_size            = ((flash_end) - (vfs_start));
 itcm_start          = 0x00000000;
diff --git a/ports/mimxrt/boards/MIMXRT1060_EVK/MIMXRT1060_EVK.ld b/ports/mimxrt/boards/MIMXRT1060_EVK/MIMXRT1060_EVK.ld
deleted file mode 100644
index f616178a9bed2..0000000000000
--- a/ports/mimxrt/boards/MIMXRT1060_EVK/MIMXRT1060_EVK.ld
+++ /dev/null
@@ -1 +0,0 @@
-flash_size = 64M;
\ No newline at end of file
diff --git a/ports/mimxrt/boards/MIMXRT1060_EVK/MIMXRT1060_EVK_flexspi_nor_config.h b/ports/mimxrt/boards/MIMXRT1060_EVK/MIMXRT1060_EVK_flexspi_nor_config.h
new file mode 100644
index 0000000000000..e447733f06d91
--- /dev/null
+++ b/ports/mimxrt/boards/MIMXRT1060_EVK/MIMXRT1060_EVK_flexspi_nor_config.h
@@ -0,0 +1,264 @@
+/*
+ * Copyright 2018 NXP
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#ifndef __EVKMIMXRT1060_FLEXSPI_NOR_CONFIG__
+#define __EVKMIMXRT1060_FLEXSPI_NOR_CONFIG__
+
+#include <stdint.h>
+#include <stdbool.h>
+#include "fsl_flexspi.h"
+
+/*! @name Driver version */
+/*@{*/
+/*! @brief XIP_BOARD driver version 2.0.0. */
+#define FSL_XIP_BOARD_DRIVER_VERSION (MAKE_VERSION(2, 0, 0))
+/*@}*/
+
+/* FLEXSPI memory config block related defintions */
+#define FLEXSPI_CFG_BLK_TAG     (0x42464346UL) // ascii "FCFB" Big Endian
+#define FLEXSPI_CFG_BLK_VERSION (0x56010400UL) // V1.4.0
+#define FLEXSPI_CFG_BLK_SIZE    (512)
+
+/* FLEXSPI Feature related definitions */
+#define FLEXSPI_FEATURE_HAS_PARALLEL_MODE 1
+
+/* Lookup table related defintions */
+#define CMD_INDEX_READ        0
+#define CMD_INDEX_READSTATUS  1
+#define CMD_INDEX_WRITEENABLE 2
+#define CMD_INDEX_WRITE       4
+
+#define CMD_LUT_SEQ_IDX_READ        0
+#define CMD_LUT_SEQ_IDX_READSTATUS  1
+#define CMD_LUT_SEQ_IDX_WRITEENABLE 3
+#define CMD_LUT_SEQ_IDX_WRITE       9
+
+#define CMD_SDR        0x01
+#define CMD_DDR        0x21
+#define RADDR_SDR      0x02
+#define RADDR_DDR      0x22
+#define CADDR_SDR      0x03
+#define CADDR_DDR      0x23
+#define MODE1_SDR      0x04
+#define MODE1_DDR      0x24
+#define MODE2_SDR      0x05
+#define MODE2_DDR      0x25
+#define MODE4_SDR      0x06
+#define MODE4_DDR      0x26
+#define MODE8_SDR      0x07
+#define MODE8_DDR      0x27
+#define WRITE_SDR      0x08
+#define WRITE_DDR      0x28
+#define READ_SDR       0x09
+#define READ_DDR       0x29
+#define LEARN_SDR      0x0A
+#define LEARN_DDR      0x2A
+#define DATSZ_SDR      0x0B
+#define DATSZ_DDR      0x2B
+#define DUMMY_SDR      0x0C
+#define DUMMY_DDR      0x2C
+#define DUMMY_RWDS_SDR 0x0D
+#define DUMMY_RWDS_DDR 0x2D
+#define JMP_ON_CS      0x1F
+#define STOP           0
+
+#define FLEXSPI_1PAD 0
+#define FLEXSPI_2PAD 1
+#define FLEXSPI_4PAD 2
+#define FLEXSPI_8PAD 3
+
+#define FLEXSPI_LUT_SEQ(cmd0, pad0, op0, cmd1, pad1, op1)                                                              \
+    (FLEXSPI_LUT_OPERAND0(op0) | FLEXSPI_LUT_NUM_PADS0(pad0) | FLEXSPI_LUT_OPCODE0(cmd0) | FLEXSPI_LUT_OPERAND1(op1) | \
+    FLEXSPI_LUT_NUM_PADS1(pad1) | FLEXSPI_LUT_OPCODE1(cmd1))
+
+// !@brief Definitions for FlexSPI Serial Clock Frequency
+typedef enum _FlexSpiSerialClockFreq
+{
+    kFlexSpiSerialClk_30MHz  = 1,
+    kFlexSpiSerialClk_50MHz  = 2,
+    kFlexSpiSerialClk_60MHz  = 3,
+    kFlexSpiSerialClk_75MHz  = 4,
+    kFlexSpiSerialClk_80MHz  = 5,
+    kFlexSpiSerialClk_100MHz = 6,
+    kFlexSpiSerialClk_120MHz = 7,
+    kFlexSpiSerialClk_133MHz = 8,
+    kFlexSpiSerialClk_166MHz = 9,
+} flexspi_serial_clk_freq_t;
+
+// !@brief FlexSPI clock configuration type
+enum
+{
+    kFlexSpiClk_SDR, // !< Clock configure for SDR mode
+    kFlexSpiClk_DDR, // !< Clock configurat for DDR mode
+};
+
+// !@brief FlexSPI Read Sample Clock Source definition
+typedef enum _FlashReadSampleClkSource
+{
+    kFlexSPIReadSampleClk_LoopbackInternally      = 0,
+    kFlexSPIReadSampleClk_LoopbackFromDqsPad      = 1,
+    kFlexSPIReadSampleClk_LoopbackFromSckPad      = 2,
+    kFlexSPIReadSampleClk_ExternalInputFromDqsPad = 3,
+} flexspi_read_sample_clk_t;
+
+// !@brief Misc feature bit definitions
+enum
+{
+    kFlexSpiMiscOffset_DiffClkEnable            = 0, // !< Bit for Differential clock enable
+    kFlexSpiMiscOffset_Ck2Enable                = 1, // !< Bit for CK2 enable
+    kFlexSpiMiscOffset_ParallelEnable           = 2, // !< Bit for Parallel mode enable
+    kFlexSpiMiscOffset_WordAddressableEnable    = 3, // !< Bit for Word Addressable enable
+    kFlexSpiMiscOffset_SafeConfigFreqEnable     = 4, // !< Bit for Safe Configuration Frequency enable
+    kFlexSpiMiscOffset_PadSettingOverrideEnable = 5, // !< Bit for Pad setting override enable
+    kFlexSpiMiscOffset_DdrModeEnable            = 6, // !< Bit for DDR clock confiuration indication.
+};
+
+// !@brief Flash Type Definition
+enum
+{
+    kFlexSpiDeviceType_SerialNOR    = 1,    // !< Flash devices are Serial NOR
+    kFlexSpiDeviceType_SerialNAND   = 2,    // !< Flash devices are Serial NAND
+    kFlexSpiDeviceType_SerialRAM    = 3,    // !< Flash devices are Serial RAM/HyperFLASH
+    kFlexSpiDeviceType_MCP_NOR_NAND = 0x12, // !< Flash device is MCP device, A1 is Serial NOR, A2 is Serial NAND
+    kFlexSpiDeviceType_MCP_NOR_RAM  = 0x13, // !< Flash deivce is MCP device, A1 is Serial NOR, A2 is Serial RAMs
+};
+
+// !@brief Flash Pad Definitions
+enum
+{
+    kSerialFlash_1Pad  = 1,
+    kSerialFlash_2Pads = 2,
+    kSerialFlash_4Pads = 4,
+    kSerialFlash_8Pads = 8,
+};
+
+// !@brief FlexSPI LUT Sequence structure
+typedef struct _lut_sequence
+{
+    uint8_t seqNum; // !< Sequence Number, valid number: 1-16
+    uint8_t seqId;  // !< Sequence Index, valid number: 0-15
+    uint16_t reserved;
+} flexspi_lut_seq_t;
+
+// !@brief Flash Configuration Command Type
+enum
+{
+    kDeviceConfigCmdType_Generic,    // !< Generic command, for example: configure dummy cycles, drive strength, etc
+    kDeviceConfigCmdType_QuadEnable, // !< Quad Enable command
+    kDeviceConfigCmdType_Spi2Xpi,    // !< Switch from SPI to DPI/QPI/OPI mode
+    kDeviceConfigCmdType_Xpi2Spi,    // !< Switch from DPI/QPI/OPI to SPI mode
+    kDeviceConfigCmdType_Spi2NoCmd,  // !< Switch to 0-4-4/0-8-8 mode
+    kDeviceConfigCmdType_Reset,      // !< Reset device command
+};
+
+// !@brief FlexSPI Memory Configuration Block
+typedef struct _FlexSPIConfig
+{
+    uint32_t tag;               // !< [0x000-0x003] Tag, fixed value 0x42464346UL
+    uint32_t version;           // !< [0x004-0x007] Version,[31:24] -'V', [23:16] - Major, [15:8] - Minor, [7:0] - bugfix
+    uint32_t reserved0;         // !< [0x008-0x00b] Reserved for future use
+    uint8_t readSampleClkSrc;   // !< [0x00c-0x00c] Read Sample Clock Source, valid value: 0/1/3
+    uint8_t csHoldTime;         // !< [0x00d-0x00d] CS hold time, default value: 3
+    uint8_t csSetupTime;        // !< [0x00e-0x00e] CS setup time, default value: 3
+    uint8_t columnAddressWidth; // !< [0x00f-0x00f] Column Address with, for HyperBus protocol, it is fixed to 3, For
+    // ! Serial NAND, need to refer to datasheet
+    uint8_t deviceModeCfgEnable; // !< [0x010-0x010] Device Mode Configure enable flag, 1 - Enable, 0 - Disable
+    uint8_t deviceModeType; // !< [0x011-0x011] Specify the configuration command type:Quad Enable, DPI/QPI/OPI switch,
+    // ! Generic configuration, etc.
+    uint16_t waitTimeCfgCommands; // !< [0x012-0x013] Wait time for all configuration commands, unit: 100us, Used for
+    // ! DPI/QPI/OPI switch or reset command
+    flexspi_lut_seq_t deviceModeSeq; // !< [0x014-0x017] Device mode sequence info, [7:0] - LUT sequence id, [15:8] - LUt
+    // ! sequence number, [31:16] Reserved
+    uint32_t deviceModeArg;    // !< [0x018-0x01b] Argument/Parameter for device configuration
+    uint8_t configCmdEnable;   // !< [0x01c-0x01c] Configure command Enable Flag, 1 - Enable, 0 - Disable
+    uint8_t configModeType[3]; // !< [0x01d-0x01f] Configure Mode Type, similar as deviceModeTpe
+    flexspi_lut_seq_t
+        configCmdSeqs[3]; // !< [0x020-0x02b] Sequence info for Device Configuration command, similar as deviceModeSeq
+    uint32_t reserved1;   // !< [0x02c-0x02f] Reserved for future use
+    uint32_t configCmdArgs[3];     // !< [0x030-0x03b] Arguments/Parameters for device Configuration commands
+    uint32_t reserved2;            // !< [0x03c-0x03f] Reserved for future use
+    uint32_t controllerMiscOption; // !< [0x040-0x043] Controller Misc Options, see Misc feature bit definitions for more
+    // ! details
+    uint8_t deviceType;    // !< [0x044-0x044] Device Type:  See Flash Type Definition for more details
+    uint8_t sflashPadType; // !< [0x045-0x045] Serial Flash Pad Type: 1 - Single, 2 - Dual, 4 - Quad, 8 - Octal
+    uint8_t serialClkFreq; // !< [0x046-0x046] Serial Flash Frequencey, device specific definitions, See System Boot
+    // ! Chapter for more details
+    uint8_t lutCustomSeqEnable; // !< [0x047-0x047] LUT customization Enable, it is required if the program/erase cannot
+    // ! be done using 1 LUT sequence, currently, only applicable to HyperFLASH
+    uint32_t reserved3[2];           // !< [0x048-0x04f] Reserved for future use
+    uint32_t sflashA1Size;           // !< [0x050-0x053] Size of Flash connected to A1
+    uint32_t sflashA2Size;           // !< [0x054-0x057] Size of Flash connected to A2
+    uint32_t sflashB1Size;           // !< [0x058-0x05b] Size of Flash connected to B1
+    uint32_t sflashB2Size;           // !< [0x05c-0x05f] Size of Flash connected to B2
+    uint32_t csPadSettingOverride;   // !< [0x060-0x063] CS pad setting override value
+    uint32_t sclkPadSettingOverride; // !< [0x064-0x067] SCK pad setting override value
+    uint32_t dataPadSettingOverride; // !< [0x068-0x06b] data pad setting override value
+    uint32_t dqsPadSettingOverride;  // !< [0x06c-0x06f] DQS pad setting override value
+    uint32_t timeoutInMs;            // !< [0x070-0x073] Timeout threshold for read status command
+    uint32_t commandInterval;        // !< [0x074-0x077] CS deselect interval between two commands
+    uint16_t dataValidTime[2]; // !< [0x078-0x07b] CLK edge to data valid time for PORT A and PORT B, in terms of 0.1ns
+    uint16_t busyOffset;       // !< [0x07c-0x07d] Busy offset, valid value: 0-31
+    uint16_t busyBitPolarity;  // !< [0x07e-0x07f] Busy flag polarity, 0 - busy flag is 1 when flash device is busy, 1 -
+    // ! busy flag is 0 when flash device is busy
+    uint32_t lookupTable[64];           // !< [0x080-0x17f] Lookup table holds Flash command sequences
+    flexspi_lut_seq_t lutCustomSeq[12]; // !< [0x180-0x1af] Customizable LUT Sequences
+    uint32_t reserved4[4];              // !< [0x1b0-0x1bf] Reserved for future use
+} flexspi_mem_config_t;
+
+/*  */
+#define NOR_CMD_LUT_SEQ_IDX_READ_NORMAL 0
+#define NOR_CMD_LUT_SEQ_IDX_READSTATUSREG 1
+#define NOR_CMD_LUT_SEQ_IDX_READ_FAST_QUAD 2
+#define NOR_CMD_LUT_SEQ_IDX_WRITEENABLE 3
+#define NOR_CMD_LUT_SEQ_IDX_READSTATUS_XPI 4
+#define NOR_CMD_LUT_SEQ_IDX_ERASESECTOR 5
+#define NOR_CMD_LUT_SEQ_IDX_WRITESTATUSREG 6
+#define NOR_CMD_LUT_SEQ_IDX_PAGEPROGRAM_QUAD 7
+#define NOR_CMD_LUT_SEQ_IDX_READID 8
+#define NOR_CMD_LUT_SEQ_IDX_PAGEPROGRAM 9
+#define NOR_CMD_LUT_SEQ_IDX_ENTERQPI 10
+#define NOR_CMD_LUT_SEQ_IDX_CHIPERASE 11
+#define NOR_CMD_LUT_SEQ_IDX_EXITQPI 12
+
+#define HYPERFLASH_CMD_LUT_SEQ_IDX_READDATA    0
+#define HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEDATA   1
+#define HYPERFLASH_CMD_LUT_SEQ_IDX_READSTATUS  2
+#define HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEENABLE 4
+#define HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR 6
+#define HYPERFLASH_CMD_LUT_SEQ_IDX_PAGEPROGRAM 10
+#define HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP   12
+
+/*
+ *  Serial NOR configuration block
+ */
+typedef struct _flexspi_nor_config
+{
+    flexspi_mem_config_t memConfig; // !< Common memory configuration info via FlexSPI
+    uint32_t pageSize;              // !< Page size of Serial NOR
+    uint32_t sectorSize;            // !< Sector size of Serial NOR
+    uint8_t ipcmdSerialClkFreq;     // !< Clock frequency for IP command
+    uint8_t isUniformBlockSize;     // !< Sector/Block size is the same
+    uint8_t reserved0[2];           // !< Reserved for future use
+    uint8_t serialNorType;          // !< Serial NOR Flash type: 0/1/2/3
+    uint8_t needExitNoCmdMode;      // !< Need to exit NoCmd mode before other IP command
+    uint8_t halfClkForNonReadCmd;   // !< Half the Serial Clock for non-read command: true/false
+    uint8_t needRestoreNoCmdMode;   // !< Need to Restore NoCmd mode after IP commmand execution
+    uint32_t blockSize;             // !< Block size
+    uint32_t reserve2[11];          // !< Reserved for future use
+} flexspi_nor_config_t;
+
+#define FLASH_BUSY_STATUS_POL 0
+#define FLASH_BUSY_STATUS_OFFSET 0
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* __EVKMIMXRT1060_FLEXSPI_NOR_CONFIG__ */
diff --git a/ports/mimxrt/boards/MIMXRT1060_EVK/clock_config.h b/ports/mimxrt/boards/MIMXRT1060_EVK/clock_config.h
new file mode 100644
index 0000000000000..0822024847717
--- /dev/null
+++ b/ports/mimxrt/boards/MIMXRT1060_EVK/clock_config.h
@@ -0,0 +1,122 @@
+/*
+ * Copyright 2018-2019 NXP
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#ifndef _CLOCK_CONFIG_H_
+#define _CLOCK_CONFIG_H_
+
+#include "fsl_common.h"
+
+/*******************************************************************************
+ * Definitions
+ ******************************************************************************/
+#define BOARD_XTAL0_CLK_HZ 24000000U /*!< Board xtal0 frequency in Hz */
+
+#define BOARD_XTAL32K_CLK_HZ 32768U /*!< Board xtal32k frequency in Hz */
+/*******************************************************************************
+ ************************ BOARD_InitBootClocks function ************************
+ ******************************************************************************/
+
+#if defined(__cplusplus)
+extern "C" {
+#endif /* __cplusplus*/
+
+/*!
+ * @brief This function executes default configuration of clocks.
+ *
+ */
+void BOARD_InitBootClocks(void);
+
+#if defined(__cplusplus)
+}
+#endif /* __cplusplus*/
+
+/*******************************************************************************
+ ********************** Configuration BOARD_BootClockRUN ***********************
+ ******************************************************************************/
+/*******************************************************************************
+ * Definitions for BOARD_BootClockRUN configuration
+ ******************************************************************************/
+#define BOARD_BOOTCLOCKRUN_CORE_CLOCK 600000000U /*!< Core clock frequency: 600000000Hz */
+
+/* Clock outputs (values are in Hz): */
+#define BOARD_BOOTCLOCKRUN_AHB_CLK_ROOT 600000000UL
+#define BOARD_BOOTCLOCKRUN_CAN_CLK_ROOT 40000000UL
+#define BOARD_BOOTCLOCKRUN_CKIL_SYNC_CLK_ROOT 32768UL
+#define BOARD_BOOTCLOCKRUN_CLKO1_CLK 0UL
+#define BOARD_BOOTCLOCKRUN_CLKO2_CLK 0UL
+#define BOARD_BOOTCLOCKRUN_CLK_1M 1000000UL
+#define BOARD_BOOTCLOCKRUN_CLK_24M 24000000UL
+#define BOARD_BOOTCLOCKRUN_CSI_CLK_ROOT 12000000UL
+#define BOARD_BOOTCLOCKRUN_ENET1_TX_CLK 2400000UL
+#define BOARD_BOOTCLOCKRUN_ENET2_125M_CLK 1200000UL
+#define BOARD_BOOTCLOCKRUN_ENET2_TX_CLK 1200000UL
+#define BOARD_BOOTCLOCKRUN_ENET_125M_CLK 2400000UL
+#define BOARD_BOOTCLOCKRUN_ENET_25M_REF_CLK 1200000UL
+#define BOARD_BOOTCLOCKRUN_FLEXIO1_CLK_ROOT 30000000UL
+#define BOARD_BOOTCLOCKRUN_FLEXIO2_CLK_ROOT 30000000UL
+#define BOARD_BOOTCLOCKRUN_FLEXSPI2_CLK_ROOT 130909090UL
+#define BOARD_BOOTCLOCKRUN_FLEXSPI_CLK_ROOT 130909090UL
+#define BOARD_BOOTCLOCKRUN_GPT1_IPG_CLK_HIGHFREQ 75000000UL
+#define BOARD_BOOTCLOCKRUN_GPT2_IPG_CLK_HIGHFREQ 75000000UL
+#define BOARD_BOOTCLOCKRUN_IPG_CLK_ROOT 150000000UL
+#define BOARD_BOOTCLOCKRUN_LCDIF_CLK_ROOT 9642857UL
+#define BOARD_BOOTCLOCKRUN_LPI2C_CLK_ROOT 60000000UL
+#define BOARD_BOOTCLOCKRUN_LPSPI_CLK_ROOT 105600000UL
+#define BOARD_BOOTCLOCKRUN_LVDS1_CLK 1200000000UL
+#define BOARD_BOOTCLOCKRUN_MQS_MCLK 63529411UL
+#define BOARD_BOOTCLOCKRUN_PERCLK_CLK_ROOT 75000000UL
+#define BOARD_BOOTCLOCKRUN_PLL7_MAIN_CLK 24000000UL
+#define BOARD_BOOTCLOCKRUN_SAI1_CLK_ROOT 63529411UL
+#define BOARD_BOOTCLOCKRUN_SAI1_MCLK1 63529411UL
+#define BOARD_BOOTCLOCKRUN_SAI1_MCLK2 63529411UL
+#define BOARD_BOOTCLOCKRUN_SAI1_MCLK3 30000000UL
+#define BOARD_BOOTCLOCKRUN_SAI2_CLK_ROOT 63529411UL
+#define BOARD_BOOTCLOCKRUN_SAI2_MCLK1 63529411UL
+#define BOARD_BOOTCLOCKRUN_SAI2_MCLK2 0UL
+#define BOARD_BOOTCLOCKRUN_SAI2_MCLK3 30000000UL
+#define BOARD_BOOTCLOCKRUN_SAI3_CLK_ROOT 63529411UL
+#define BOARD_BOOTCLOCKRUN_SAI3_MCLK1 63529411UL
+#define BOARD_BOOTCLOCKRUN_SAI3_MCLK2 0UL
+#define BOARD_BOOTCLOCKRUN_SAI3_MCLK3 30000000UL
+#define BOARD_BOOTCLOCKRUN_SEMC_CLK_ROOT 75000000UL
+#define BOARD_BOOTCLOCKRUN_SPDIF0_CLK_ROOT 30000000UL
+#define BOARD_BOOTCLOCKRUN_SPDIF0_EXTCLK_OUT 0UL
+#define BOARD_BOOTCLOCKRUN_TRACE_CLK_ROOT 117333333UL
+#define BOARD_BOOTCLOCKRUN_UART_CLK_ROOT 80000000UL
+#define BOARD_BOOTCLOCKRUN_USBPHY1_CLK 0UL
+#define BOARD_BOOTCLOCKRUN_USBPHY2_CLK 0UL
+#define BOARD_BOOTCLOCKRUN_USDHC1_CLK_ROOT 198000000UL
+#define BOARD_BOOTCLOCKRUN_USDHC2_CLK_ROOT 198000000UL
+
+/*! @brief Arm PLL set for BOARD_BootClockRUN configuration.
+ */
+extern const clock_arm_pll_config_t armPllConfig_BOARD_BootClockRUN;
+/*! @brief Usb1 PLL set for BOARD_BootClockRUN configuration.
+ */
+extern const clock_usb_pll_config_t usb1PllConfig_BOARD_BootClockRUN;
+/*! @brief Sys PLL for BOARD_BootClockRUN configuration.
+ */
+extern const clock_sys_pll_config_t sysPllConfig_BOARD_BootClockRUN;
+
+/*******************************************************************************
+ * API for BOARD_BootClockRUN configuration
+ ******************************************************************************/
+#if defined(__cplusplus)
+extern "C" {
+#endif /* __cplusplus*/
+
+/*!
+ * @brief This function executes configuration of clocks.
+ *
+ */
+void BOARD_BootClockRUN(void);
+
+#if defined(__cplusplus)
+}
+#endif /* __cplusplus*/
+
+#endif /* _CLOCK_CONFIG_H_ */
diff --git a/ports/mimxrt/boards/MIMXRT1060_EVK/evkmimxrt1060_flexspi_nor_config.h b/ports/mimxrt/boards/MIMXRT1060_EVK/evkmimxrt1060_flexspi_nor_config.h
deleted file mode 100644
index cff520e0e267c..0000000000000
--- a/ports/mimxrt/boards/MIMXRT1060_EVK/evkmimxrt1060_flexspi_nor_config.h
+++ /dev/null
@@ -1,264 +0,0 @@
-/*
- * Copyright 2018 NXP
- * All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-#ifndef __EVKMIMXRT1060_FLEXSPI_NOR_CONFIG__
-#define __EVKMIMXRT1060_FLEXSPI_NOR_CONFIG__
-
-#include <stdint.h>
-#include <stdbool.h>
-#include "fsl_flexspi.h"
-
-/*! @name Driver version */
-/*@{*/
-/*! @brief XIP_BOARD driver version 2.0.0. */
-#define FSL_XIP_BOARD_DRIVER_VERSION (MAKE_VERSION(2, 0, 0))
-/*@}*/
-
-/* FLEXSPI memory config block related defintions */
-#define FLEXSPI_CFG_BLK_TAG     (0x42464346UL) // ascii "FCFB" Big Endian
-#define FLEXSPI_CFG_BLK_VERSION (0x56010400UL) // V1.4.0
-#define FLEXSPI_CFG_BLK_SIZE    (512)
-
-/* FLEXSPI Feature related definitions */
-#define FLEXSPI_FEATURE_HAS_PARALLEL_MODE 1
-
-/* Lookup table related defintions */
-#define CMD_INDEX_READ        0
-#define CMD_INDEX_READSTATUS  1
-#define CMD_INDEX_WRITEENABLE 2
-#define CMD_INDEX_WRITE       4
-
-#define CMD_LUT_SEQ_IDX_READ        0
-#define CMD_LUT_SEQ_IDX_READSTATUS  1
-#define CMD_LUT_SEQ_IDX_WRITEENABLE 3
-#define CMD_LUT_SEQ_IDX_WRITE       9
-
-#define CMD_SDR        0x01
-#define CMD_DDR        0x21
-#define RADDR_SDR      0x02
-#define RADDR_DDR      0x22
-#define CADDR_SDR      0x03
-#define CADDR_DDR      0x23
-#define MODE1_SDR      0x04
-#define MODE1_DDR      0x24
-#define MODE2_SDR      0x05
-#define MODE2_DDR      0x25
-#define MODE4_SDR      0x06
-#define MODE4_DDR      0x26
-#define MODE8_SDR      0x07
-#define MODE8_DDR      0x27
-#define WRITE_SDR      0x08
-#define WRITE_DDR      0x28
-#define READ_SDR       0x09
-#define READ_DDR       0x29
-#define LEARN_SDR      0x0A
-#define LEARN_DDR      0x2A
-#define DATSZ_SDR      0x0B
-#define DATSZ_DDR      0x2B
-#define DUMMY_SDR      0x0C
-#define DUMMY_DDR      0x2C
-#define DUMMY_RWDS_SDR 0x0D
-#define DUMMY_RWDS_DDR 0x2D
-#define JMP_ON_CS      0x1F
-#define STOP           0
-
-#define FLEXSPI_1PAD 0
-#define FLEXSPI_2PAD 1
-#define FLEXSPI_4PAD 2
-#define FLEXSPI_8PAD 3
-
-#define FLEXSPI_LUT_SEQ(cmd0, pad0, op0, cmd1, pad1, op1)                                                              \
-    (FLEXSPI_LUT_OPERAND0(op0) | FLEXSPI_LUT_NUM_PADS0(pad0) | FLEXSPI_LUT_OPCODE0(cmd0) | FLEXSPI_LUT_OPERAND1(op1) | \
-     FLEXSPI_LUT_NUM_PADS1(pad1) | FLEXSPI_LUT_OPCODE1(cmd1))
-
-//!@brief Definitions for FlexSPI Serial Clock Frequency
-typedef enum _FlexSpiSerialClockFreq
-{
-    kFlexSpiSerialClk_30MHz  = 1,
-    kFlexSpiSerialClk_50MHz  = 2,
-    kFlexSpiSerialClk_60MHz  = 3,
-    kFlexSpiSerialClk_75MHz  = 4,
-    kFlexSpiSerialClk_80MHz  = 5,
-    kFlexSpiSerialClk_100MHz = 6,
-    kFlexSpiSerialClk_120MHz = 7,
-    kFlexSpiSerialClk_133MHz = 8,
-    kFlexSpiSerialClk_166MHz = 9,
-} flexspi_serial_clk_freq_t;
-
-//!@brief FlexSPI clock configuration type
-enum
-{
-    kFlexSpiClk_SDR, //!< Clock configure for SDR mode
-    kFlexSpiClk_DDR, //!< Clock configurat for DDR mode
-};
-
-//!@brief FlexSPI Read Sample Clock Source definition
-typedef enum _FlashReadSampleClkSource
-{
-    kFlexSPIReadSampleClk_LoopbackInternally      = 0,
-    kFlexSPIReadSampleClk_LoopbackFromDqsPad      = 1,
-    kFlexSPIReadSampleClk_LoopbackFromSckPad      = 2,
-    kFlexSPIReadSampleClk_ExternalInputFromDqsPad = 3,
-} flexspi_read_sample_clk_t;
-
-//!@brief Misc feature bit definitions
-enum
-{
-    kFlexSpiMiscOffset_DiffClkEnable            = 0, //!< Bit for Differential clock enable
-    kFlexSpiMiscOffset_Ck2Enable                = 1, //!< Bit for CK2 enable
-    kFlexSpiMiscOffset_ParallelEnable           = 2, //!< Bit for Parallel mode enable
-    kFlexSpiMiscOffset_WordAddressableEnable    = 3, //!< Bit for Word Addressable enable
-    kFlexSpiMiscOffset_SafeConfigFreqEnable     = 4, //!< Bit for Safe Configuration Frequency enable
-    kFlexSpiMiscOffset_PadSettingOverrideEnable = 5, //!< Bit for Pad setting override enable
-    kFlexSpiMiscOffset_DdrModeEnable            = 6, //!< Bit for DDR clock confiuration indication.
-};
-
-//!@brief Flash Type Definition
-enum
-{
-    kFlexSpiDeviceType_SerialNOR    = 1,    //!< Flash devices are Serial NOR
-    kFlexSpiDeviceType_SerialNAND   = 2,    //!< Flash devices are Serial NAND
-    kFlexSpiDeviceType_SerialRAM    = 3,    //!< Flash devices are Serial RAM/HyperFLASH
-    kFlexSpiDeviceType_MCP_NOR_NAND = 0x12, //!< Flash device is MCP device, A1 is Serial NOR, A2 is Serial NAND
-    kFlexSpiDeviceType_MCP_NOR_RAM  = 0x13, //!< Flash deivce is MCP device, A1 is Serial NOR, A2 is Serial RAMs
-};
-
-//!@brief Flash Pad Definitions
-enum
-{
-    kSerialFlash_1Pad  = 1,
-    kSerialFlash_2Pads = 2,
-    kSerialFlash_4Pads = 4,
-    kSerialFlash_8Pads = 8,
-};
-
-//!@brief FlexSPI LUT Sequence structure
-typedef struct _lut_sequence
-{
-    uint8_t seqNum; //!< Sequence Number, valid number: 1-16
-    uint8_t seqId;  //!< Sequence Index, valid number: 0-15
-    uint16_t reserved;
-} flexspi_lut_seq_t;
-
-//!@brief Flash Configuration Command Type
-enum
-{
-    kDeviceConfigCmdType_Generic,    //!< Generic command, for example: configure dummy cycles, drive strength, etc
-    kDeviceConfigCmdType_QuadEnable, //!< Quad Enable command
-    kDeviceConfigCmdType_Spi2Xpi,    //!< Switch from SPI to DPI/QPI/OPI mode
-    kDeviceConfigCmdType_Xpi2Spi,    //!< Switch from DPI/QPI/OPI to SPI mode
-    kDeviceConfigCmdType_Spi2NoCmd,  //!< Switch to 0-4-4/0-8-8 mode
-    kDeviceConfigCmdType_Reset,      //!< Reset device command
-};
-
-//!@brief FlexSPI Memory Configuration Block
-typedef struct _FlexSPIConfig
-{
-    uint32_t tag;               //!< [0x000-0x003] Tag, fixed value 0x42464346UL
-    uint32_t version;           //!< [0x004-0x007] Version,[31:24] -'V', [23:16] - Major, [15:8] - Minor, [7:0] - bugfix
-    uint32_t reserved0;         //!< [0x008-0x00b] Reserved for future use
-    uint8_t readSampleClkSrc;   //!< [0x00c-0x00c] Read Sample Clock Source, valid value: 0/1/3
-    uint8_t csHoldTime;         //!< [0x00d-0x00d] CS hold time, default value: 3
-    uint8_t csSetupTime;        //!< [0x00e-0x00e] CS setup time, default value: 3
-    uint8_t columnAddressWidth; //!< [0x00f-0x00f] Column Address with, for HyperBus protocol, it is fixed to 3, For
-    //! Serial NAND, need to refer to datasheet
-    uint8_t deviceModeCfgEnable; //!< [0x010-0x010] Device Mode Configure enable flag, 1 - Enable, 0 - Disable
-    uint8_t deviceModeType; //!< [0x011-0x011] Specify the configuration command type:Quad Enable, DPI/QPI/OPI switch,
-    //! Generic configuration, etc.
-    uint16_t waitTimeCfgCommands; //!< [0x012-0x013] Wait time for all configuration commands, unit: 100us, Used for
-    //! DPI/QPI/OPI switch or reset command
-    flexspi_lut_seq_t deviceModeSeq; //!< [0x014-0x017] Device mode sequence info, [7:0] - LUT sequence id, [15:8] - LUt
-    //! sequence number, [31:16] Reserved
-    uint32_t deviceModeArg;    //!< [0x018-0x01b] Argument/Parameter for device configuration
-    uint8_t configCmdEnable;   //!< [0x01c-0x01c] Configure command Enable Flag, 1 - Enable, 0 - Disable
-    uint8_t configModeType[3]; //!< [0x01d-0x01f] Configure Mode Type, similar as deviceModeTpe
-    flexspi_lut_seq_t
-        configCmdSeqs[3]; //!< [0x020-0x02b] Sequence info for Device Configuration command, similar as deviceModeSeq
-    uint32_t reserved1;   //!< [0x02c-0x02f] Reserved for future use
-    uint32_t configCmdArgs[3];     //!< [0x030-0x03b] Arguments/Parameters for device Configuration commands
-    uint32_t reserved2;            //!< [0x03c-0x03f] Reserved for future use
-    uint32_t controllerMiscOption; //!< [0x040-0x043] Controller Misc Options, see Misc feature bit definitions for more
-    //! details
-    uint8_t deviceType;    //!< [0x044-0x044] Device Type:  See Flash Type Definition for more details
-    uint8_t sflashPadType; //!< [0x045-0x045] Serial Flash Pad Type: 1 - Single, 2 - Dual, 4 - Quad, 8 - Octal
-    uint8_t serialClkFreq; //!< [0x046-0x046] Serial Flash Frequencey, device specific definitions, See System Boot
-    //! Chapter for more details
-    uint8_t lutCustomSeqEnable; //!< [0x047-0x047] LUT customization Enable, it is required if the program/erase cannot
-    //! be done using 1 LUT sequence, currently, only applicable to HyperFLASH
-    uint32_t reserved3[2];           //!< [0x048-0x04f] Reserved for future use
-    uint32_t sflashA1Size;           //!< [0x050-0x053] Size of Flash connected to A1
-    uint32_t sflashA2Size;           //!< [0x054-0x057] Size of Flash connected to A2
-    uint32_t sflashB1Size;           //!< [0x058-0x05b] Size of Flash connected to B1
-    uint32_t sflashB2Size;           //!< [0x05c-0x05f] Size of Flash connected to B2
-    uint32_t csPadSettingOverride;   //!< [0x060-0x063] CS pad setting override value
-    uint32_t sclkPadSettingOverride; //!< [0x064-0x067] SCK pad setting override value
-    uint32_t dataPadSettingOverride; //!< [0x068-0x06b] data pad setting override value
-    uint32_t dqsPadSettingOverride;  //!< [0x06c-0x06f] DQS pad setting override value
-    uint32_t timeoutInMs;            //!< [0x070-0x073] Timeout threshold for read status command
-    uint32_t commandInterval;        //!< [0x074-0x077] CS deselect interval between two commands
-    uint16_t dataValidTime[2]; //!< [0x078-0x07b] CLK edge to data valid time for PORT A and PORT B, in terms of 0.1ns
-    uint16_t busyOffset;       //!< [0x07c-0x07d] Busy offset, valid value: 0-31
-    uint16_t busyBitPolarity;  //!< [0x07e-0x07f] Busy flag polarity, 0 - busy flag is 1 when flash device is busy, 1 -
-    //! busy flag is 0 when flash device is busy
-    uint32_t lookupTable[64];           //!< [0x080-0x17f] Lookup table holds Flash command sequences
-    flexspi_lut_seq_t lutCustomSeq[12]; //!< [0x180-0x1af] Customizable LUT Sequences
-    uint32_t reserved4[4];              //!< [0x1b0-0x1bf] Reserved for future use
-} flexspi_mem_config_t;
-
-/*  */
-#define NOR_CMD_LUT_SEQ_IDX_READ_NORMAL 0
-#define NOR_CMD_LUT_SEQ_IDX_READSTATUSREG 1
-#define NOR_CMD_LUT_SEQ_IDX_READ_FAST_QUAD 2
-#define NOR_CMD_LUT_SEQ_IDX_WRITEENABLE 3
-#define NOR_CMD_LUT_SEQ_IDX_READSTATUS_XPI 4
-#define NOR_CMD_LUT_SEQ_IDX_ERASESECTOR 5
-#define NOR_CMD_LUT_SEQ_IDX_WRITESTATUSREG 6
-#define NOR_CMD_LUT_SEQ_IDX_PAGEPROGRAM_QUAD 7
-#define NOR_CMD_LUT_SEQ_IDX_READID 8
-#define NOR_CMD_LUT_SEQ_IDX_PAGEPROGRAM 9
-#define NOR_CMD_LUT_SEQ_IDX_ENTERQPI 10
-#define NOR_CMD_LUT_SEQ_IDX_CHIPERASE 11
-#define NOR_CMD_LUT_SEQ_IDX_EXITQPI 12
-
-#define HYPERFLASH_CMD_LUT_SEQ_IDX_READDATA    0
-#define HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEDATA   1
-#define HYPERFLASH_CMD_LUT_SEQ_IDX_READSTATUS  2
-#define HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEENABLE 4
-#define HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR 6
-#define HYPERFLASH_CMD_LUT_SEQ_IDX_PAGEPROGRAM 10
-#define HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP   12
-
-/*
- *  Serial NOR configuration block
- */
-typedef struct _flexspi_nor_config
-{
-    flexspi_mem_config_t memConfig; //!< Common memory configuration info via FlexSPI
-    uint32_t pageSize;              //!< Page size of Serial NOR
-    uint32_t sectorSize;            //!< Sector size of Serial NOR
-    uint8_t ipcmdSerialClkFreq;     //!< Clock frequency for IP command
-    uint8_t isUniformBlockSize;     //!< Sector/Block size is the same
-    uint8_t reserved0[2];           //!< Reserved for future use
-    uint8_t serialNorType;          //!< Serial NOR Flash type: 0/1/2/3
-    uint8_t needExitNoCmdMode;      //!< Need to exit NoCmd mode before other IP command
-    uint8_t halfClkForNonReadCmd;   //!< Half the Serial Clock for non-read command: true/false
-    uint8_t needRestoreNoCmdMode;   //!< Need to Restore NoCmd mode after IP commmand execution
-    uint32_t blockSize;             //!< Block size
-    uint32_t reserve2[11];          //!< Reserved for future use
-} flexspi_nor_config_t;
-
-#define FLASH_BUSY_STATUS_POL 0
-#define FLASH_BUSY_STATUS_OFFSET 0
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* __EVKMIMXRT1060_FLEXSPI_NOR_CONFIG__ */
diff --git a/ports/mimxrt/boards/MIMXRT1060_EVK/flash_config.c b/ports/mimxrt/boards/MIMXRT1060_EVK/flash_config.c
deleted file mode 100644
index e28f58154751d..0000000000000
--- a/ports/mimxrt/boards/MIMXRT1060_EVK/flash_config.c
+++ /dev/null
@@ -1,186 +0,0 @@
-/*
- * Copyright 2018 NXP
- * All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-#include "evkmimxrt1060_flexspi_nor_config.h"
-
-/* Component ID definition, used by tools. */
-#ifndef FSL_COMPONENT_ID
-#define FSL_COMPONENT_ID "platform.drivers.xip_board"
-#endif
-
-/*******************************************************************************
- * Code
- ******************************************************************************/
-#if defined(XIP_BOOT_HEADER_ENABLE) && (XIP_BOOT_HEADER_ENABLE == 1)
-#if defined(__CC_ARM) || defined(__ARMCC_VERSION) || defined(__GNUC__)
-__attribute__((section(".boot_hdr.conf")))
-#elif defined(__ICCARM__)
-#pragma location = ".boot_hdr.conf"
-#endif
-
-const flexspi_nor_config_t qspiflash_config = {
-    .memConfig =
-        {
-            .tag                = FLEXSPI_CFG_BLK_TAG,
-            .version            = FLEXSPI_CFG_BLK_VERSION,
-            .readSampleClkSrc   = kFlexSPIReadSampleClk_ExternalInputFromDqsPad,
-            .csHoldTime         = 3u,
-            .csSetupTime        = 3u,
-            .columnAddressWidth = 3u,
-            // Enable DDR mode, Wordaddressable, Safe configuration, Differential clock
-            .controllerMiscOption =
-                (1u << kFlexSpiMiscOffset_DdrModeEnable) | (1u << kFlexSpiMiscOffset_WordAddressableEnable) |
-                (1u << kFlexSpiMiscOffset_SafeConfigFreqEnable) | (1u << kFlexSpiMiscOffset_DiffClkEnable),
-            .sflashPadType = kSerialFlash_8Pads,
-            .serialClkFreq = kFlexSpiSerialClk_133MHz,
-            .sflashA1Size  = 64u * 1024u * 1024u,
-            .dataValidTime = {16u, 16u},
-            .lookupTable =
-                {
-                    /* 0 Read Data */
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_READDATA] =
-                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xA0, kFLEXSPI_Command_RADDR_DDR, kFLEXSPI_8PAD, 0x18),
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_READDATA + 1] = FLEXSPI_LUT_SEQ(
-                        kFLEXSPI_Command_CADDR_DDR, kFLEXSPI_8PAD, 0x10, kFLEXSPI_Command_READ_DDR, kFLEXSPI_8PAD, 0x04),
-
-                    /* 1 Write Data */
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEDATA] =
-                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x20, kFLEXSPI_Command_RADDR_DDR, kFLEXSPI_8PAD, 0x18),
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEDATA + 1] = FLEXSPI_LUT_SEQ(
-                        kFLEXSPI_Command_CADDR_DDR, kFLEXSPI_8PAD, 0x10, kFLEXSPI_Command_WRITE_DDR, kFLEXSPI_8PAD, 0x02),
-
-                    /* 2 Read Status */
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_READSTATUS] =
-                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00),
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_READSTATUS + 1] = FLEXSPI_LUT_SEQ(
-                        kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xAA), // ADDR 0x555
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_READSTATUS + 2] =
-                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x05),
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_READSTATUS + 3] = FLEXSPI_LUT_SEQ(
-                        kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x70), // DATA 0x70
-                    // +1
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_READSTATUS + 4] =
-                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xA0, kFLEXSPI_Command_RADDR_DDR, kFLEXSPI_8PAD, 0x18),
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_READSTATUS + 5] = FLEXSPI_LUT_SEQ(
-                        kFLEXSPI_Command_CADDR_DDR, kFLEXSPI_8PAD, 0x10, kFLEXSPI_Command_DUMMY_RWDS_DDR, kFLEXSPI_8PAD, 0x0B),
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_READSTATUS + 6] =
-                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_READ_DDR, kFLEXSPI_8PAD, 0x04, kFLEXSPI_Command_STOP, kFLEXSPI_1PAD, 0x0),
-
-                    /* 4 Write Enable */
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEENABLE] =
-                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x20, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00),
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEENABLE + 1] = FLEXSPI_LUT_SEQ(
-                        kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xAA), // ADDR 0x555
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEENABLE + 2] =
-                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x05),
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEENABLE + 3] = FLEXSPI_LUT_SEQ(
-                        kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xAA), // DATA 0xAA
-                    // +1
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEENABLE + 4] =
-                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x20, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00),
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEENABLE + 5] =
-                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x55),
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEENABLE + 6] =
-                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x02),
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEENABLE + 7] =
-                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x55),
-
-                    /* 6 Erase Sector  */
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR] =
-                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00),
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 1] = FLEXSPI_LUT_SEQ(
-                        kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xAA), // ADDR 0x555
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 2] =
-                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x05),
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 3] = FLEXSPI_LUT_SEQ(
-                        kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x80), // DATA 0x80
-                    // +1
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 4] =
-                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00),
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 5] =
-                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xAA),
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 6] =
-                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x05),
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 7] = FLEXSPI_LUT_SEQ(
-                        kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xAA), // ADDR 0x555
-                    // +2
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 8] =
-                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00),
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 9] =
-                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x55),
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 10] =
-                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x02),
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 11] =
-                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x55),
-                    // +3
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 12] =
-                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_RADDR_DDR, kFLEXSPI_8PAD, 0x18),
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 13] =
-                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_CADDR_DDR, kFLEXSPI_8PAD, 0x10, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00),
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 14] =
-                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x30, kFLEXSPI_Command_STOP, kFLEXSPI_1PAD, 0x00),
-
-                    /* 10 program page with word program command sequence */
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_PAGEPROGRAM] =
-                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x20, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00),
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_PAGEPROGRAM + 1] = FLEXSPI_LUT_SEQ(
-                        kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xAA), // ADDR 0x555
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_PAGEPROGRAM + 2] =
-                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x05),
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_PAGEPROGRAM + 3] = FLEXSPI_LUT_SEQ(
-                        kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xA0), // DATA 0xA0
-                    // +1
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_PAGEPROGRAM + 4] =
-                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x20, kFLEXSPI_Command_RADDR_DDR, kFLEXSPI_8PAD, 0x18),
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_PAGEPROGRAM + 5] = FLEXSPI_LUT_SEQ(
-                        kFLEXSPI_Command_CADDR_DDR, kFLEXSPI_8PAD, 0x10, kFLEXSPI_Command_WRITE_DDR, kFLEXSPI_8PAD, 0x80),
-
-                    /* 12 Erase chip */
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP] =
-                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00),
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 1] =
-                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xAA),
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 2] =
-                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x05),
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 3] =
-                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x80),
-                    // +1
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 4] =
-                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00),
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 5] =
-                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xAA),
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 6] =
-                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x05),
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 7] =
-                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xAA),
-                    // +2
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 8] =
-                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00),
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 9] =
-                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x55),
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 10] =
-                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x02),
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 11] =
-                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x55),
-                    // +3
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 12] =
-                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00),
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 13] =
-                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xAA),
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 14] =
-                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x05),
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 15] =
-                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x10),
-                },
-        },
-    .pageSize           = 512u,
-    .sectorSize         = 256u * 1024u,
-    .blockSize          = 256u * 1024u,
-    .isUniformBlockSize = true,
-};
-
-#endif /* XIP_BOOT_HEADER_ENABLE */
diff --git a/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.h b/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.h
index c26364f265d29..5cf31aa25abd8 100644
--- a/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.h
+++ b/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.h
@@ -1,14 +1,10 @@
 #define MICROPY_HW_BOARD_NAME "i.MX RT1060 EVK"
 #define MICROPY_HW_MCU_NAME   "MIMXRT1062DVJ6A"
 
-#define BOARD_FLASH_SIZE (8 * 1024 * 1024)
-
 // MIMXRT1060_EVK has 1 user LED
 #define MICROPY_HW_LED1_PIN (pin_GPIO_AD_B0_09)
 #define MICROPY_HW_LED_ON(pin) (mp_hal_pin_low(pin))
 #define MICROPY_HW_LED_OFF(pin) (mp_hal_pin_high(pin))
-#define BOARD_FLASH_CONFIG_HEADER_H "evkmimxrt1060_flexspi_nor_config.h"
-#define BOARD_FLASH_OPS_HEADER_H "hal/flexspi_hyper_flash.h"
 
 #define MICROPY_HW_NUM_PIN_IRQS (4 * 32 + 3)
 
@@ -38,10 +34,10 @@
     { IOMUXC_GPIO_SD_B0_02_LPSPI1_SDO }, { IOMUXC_GPIO_SD_B0_03_LPSPI1_SDI },
 
 #define DMA_REQ_SRC_RX { 0, kDmaRequestMuxLPSPI1Rx, kDmaRequestMuxLPSPI2Rx, \
-                            kDmaRequestMuxLPSPI3Rx, kDmaRequestMuxLPSPI4Rx }
+                         kDmaRequestMuxLPSPI3Rx, kDmaRequestMuxLPSPI4Rx }
 
 #define DMA_REQ_SRC_TX { 0, kDmaRequestMuxLPSPI1Tx, kDmaRequestMuxLPSPI2Tx, \
-                            kDmaRequestMuxLPSPI3Tx, kDmaRequestMuxLPSPI4Tx } 
+                         kDmaRequestMuxLPSPI3Tx, kDmaRequestMuxLPSPI4Tx }
 
 // Define the mapping hardware I2C # to logical I2C #
 // SDA/SCL  HW-I2C    Logical I2C
@@ -60,9 +56,9 @@
     { \
         .cmd = {GPIO_SD_B0_00_USDHC1_CMD}, \
         .clk = { GPIO_SD_B0_01_USDHC1_CLK }, \
-        .cd_b = { GPIO_B1_12_USDHC1_CD_B },\
-        .data0 = { GPIO_SD_B0_02_USDHC1_DATA0 },\
-        .data1 = { GPIO_SD_B0_03_USDHC1_DATA1 },\
-        .data2 = { GPIO_SD_B0_04_USDHC1_DATA2 },\
-        .data3 = { GPIO_SD_B0_05_USDHC1_DATA3 },\
+        .cd_b = { GPIO_B1_12_USDHC1_CD_B }, \
+        .data0 = { GPIO_SD_B0_02_USDHC1_DATA0 }, \
+        .data1 = { GPIO_SD_B0_03_USDHC1_DATA1 }, \
+        .data2 = { GPIO_SD_B0_04_USDHC1_DATA2 }, \
+        .data3 = { GPIO_SD_B0_05_USDHC1_DATA3 }, \
     }
diff --git a/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.mk b/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.mk
index 623e2617fd1e9..1e041c8eb58dd 100644
--- a/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.mk
+++ b/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.mk
@@ -3,20 +3,18 @@ MCU_VARIANT = MIMXRT1062DVJ6A
 
 MICROPY_FLOAT_IMPL = double
 MICROPY_PY_MACHINE_SDCARD = 1
+BOARD_FLASH_TYPE ?= qspi_nor
+BOARD_FLASH_SIZE ?= 0x800000  # 8MB
 
 JLINK_PATH ?= /media/RT1060-EVK/
 JLINK_COMMANDER_SCRIPT = $(BUILD)/script.jlink
 
-
 ifdef JLINK_IP
 JLINK_CONNECTION_SETTINGS = -IP $(JLINK_IP)
 else
 JLINK_CONNECTION_SETTINGS = -USB
 endif
 
-SRC_C += \
-	hal/flexspi_hyper_flash.c
-
 deploy_jlink: $(BUILD)/firmware.hex
 	$(Q)$(TOUCH) $(JLINK_COMMANDER_SCRIPT)
 	$(ECHO) "ExitOnError 1" > $(JLINK_COMMANDER_SCRIPT)
diff --git a/ports/mimxrt/boards/MIMXRT1060_EVK/qspi_hyper_flash_config.c b/ports/mimxrt/boards/MIMXRT1060_EVK/qspi_hyper_flash_config.c
new file mode 100644
index 0000000000000..1b3349f911a12
--- /dev/null
+++ b/ports/mimxrt/boards/MIMXRT1060_EVK/qspi_hyper_flash_config.c
@@ -0,0 +1,186 @@
+/*
+ * Copyright 2018 NXP
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#include BOARD_FLASH_CONFIG_HEADER_H
+
+/* Component ID definition, used by tools. */
+#ifndef FSL_COMPONENT_ID
+#define FSL_COMPONENT_ID "platform.drivers.xip_board"
+#endif
+
+/*******************************************************************************
+ * Code
+ ******************************************************************************/
+#if defined(XIP_BOOT_HEADER_ENABLE) && (XIP_BOOT_HEADER_ENABLE == 1)
+#if defined(__CC_ARM) || defined(__ARMCC_VERSION) || defined(__GNUC__)
+__attribute__((section(".boot_hdr.conf")))
+#elif defined(__ICCARM__)
+#pragma location = ".boot_hdr.conf"
+#endif
+
+const flexspi_nor_config_t qspiflash_config = {
+    .memConfig =
+    {
+        .tag = FLEXSPI_CFG_BLK_TAG,
+        .version = FLEXSPI_CFG_BLK_VERSION,
+        .readSampleClkSrc = kFlexSPIReadSampleClk_ExternalInputFromDqsPad,
+        .csHoldTime = 3u,
+        .csSetupTime = 3u,
+        .columnAddressWidth = 3u,
+        // Enable DDR mode, Wordaddressable, Safe configuration, Differential clock
+        .controllerMiscOption =
+            (1u << kFlexSpiMiscOffset_DdrModeEnable) | (1u << kFlexSpiMiscOffset_WordAddressableEnable) |
+            (1u << kFlexSpiMiscOffset_SafeConfigFreqEnable) | (1u << kFlexSpiMiscOffset_DiffClkEnable),
+        .sflashPadType = kSerialFlash_8Pads,
+        .serialClkFreq = kFlexSpiSerialClk_133MHz,
+        .sflashA1Size = BOARD_FLASH_SIZE,
+        .dataValidTime = {16u, 16u},
+        .lookupTable =
+        {
+            /* 0 Read Data */
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_READDATA] =
+                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xA0, kFLEXSPI_Command_RADDR_DDR, kFLEXSPI_8PAD, 0x18),
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_READDATA + 1] = FLEXSPI_LUT_SEQ(
+                kFLEXSPI_Command_CADDR_DDR, kFLEXSPI_8PAD, 0x10, kFLEXSPI_Command_READ_DDR, kFLEXSPI_8PAD, 0x04),
+
+            /* 1 Write Data */
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEDATA] =
+                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x20, kFLEXSPI_Command_RADDR_DDR, kFLEXSPI_8PAD, 0x18),
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEDATA + 1] = FLEXSPI_LUT_SEQ(
+                kFLEXSPI_Command_CADDR_DDR, kFLEXSPI_8PAD, 0x10, kFLEXSPI_Command_WRITE_DDR, kFLEXSPI_8PAD, 0x02),
+
+            /* 2 Read Status */
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_READSTATUS] =
+                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00),
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_READSTATUS + 1] = FLEXSPI_LUT_SEQ(
+                kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xAA),         // ADDR 0x555
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_READSTATUS + 2] =
+                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x05),
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_READSTATUS + 3] = FLEXSPI_LUT_SEQ(
+                kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x70),         // DATA 0x70
+            // +1
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_READSTATUS + 4] =
+                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xA0, kFLEXSPI_Command_RADDR_DDR, kFLEXSPI_8PAD, 0x18),
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_READSTATUS + 5] = FLEXSPI_LUT_SEQ(
+                kFLEXSPI_Command_CADDR_DDR, kFLEXSPI_8PAD, 0x10, kFLEXSPI_Command_DUMMY_RWDS_DDR, kFLEXSPI_8PAD, 0x0B),
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_READSTATUS + 6] =
+                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_READ_DDR, kFLEXSPI_8PAD, 0x04, kFLEXSPI_Command_STOP, kFLEXSPI_1PAD, 0x0),
+
+            /* 4 Write Enable */
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEENABLE] =
+                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x20, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00),
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEENABLE + 1] = FLEXSPI_LUT_SEQ(
+                kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xAA),         // ADDR 0x555
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEENABLE + 2] =
+                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x05),
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEENABLE + 3] = FLEXSPI_LUT_SEQ(
+                kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xAA),         // DATA 0xAA
+            // +1
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEENABLE + 4] =
+                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x20, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00),
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEENABLE + 5] =
+                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x55),
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEENABLE + 6] =
+                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x02),
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEENABLE + 7] =
+                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x55),
+
+            /* 6 Erase Sector  */
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR] =
+                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00),
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 1] = FLEXSPI_LUT_SEQ(
+                kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xAA),         // ADDR 0x555
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 2] =
+                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x05),
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 3] = FLEXSPI_LUT_SEQ(
+                kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x80),         // DATA 0x80
+            // +1
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 4] =
+                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00),
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 5] =
+                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xAA),
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 6] =
+                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x05),
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 7] = FLEXSPI_LUT_SEQ(
+                kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xAA),         // ADDR 0x555
+            // +2
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 8] =
+                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00),
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 9] =
+                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x55),
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 10] =
+                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x02),
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 11] =
+                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x55),
+            // +3
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 12] =
+                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_RADDR_DDR, kFLEXSPI_8PAD, 0x18),
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 13] =
+                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_CADDR_DDR, kFLEXSPI_8PAD, 0x10, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00),
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 14] =
+                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x30, kFLEXSPI_Command_STOP, kFLEXSPI_1PAD, 0x00),
+
+            /* 10 program page with word program command sequence */
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_PAGEPROGRAM] =
+                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x20, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00),
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_PAGEPROGRAM + 1] = FLEXSPI_LUT_SEQ(
+                kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xAA),         // ADDR 0x555
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_PAGEPROGRAM + 2] =
+                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x05),
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_PAGEPROGRAM + 3] = FLEXSPI_LUT_SEQ(
+                kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xA0),         // DATA 0xA0
+            // +1
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_PAGEPROGRAM + 4] =
+                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x20, kFLEXSPI_Command_RADDR_DDR, kFLEXSPI_8PAD, 0x18),
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_PAGEPROGRAM + 5] = FLEXSPI_LUT_SEQ(
+                kFLEXSPI_Command_CADDR_DDR, kFLEXSPI_8PAD, 0x10, kFLEXSPI_Command_WRITE_DDR, kFLEXSPI_8PAD, 0x80),
+
+            /* 12 Erase chip */
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP] =
+                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00),
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 1] =
+                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xAA),
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 2] =
+                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x05),
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 3] =
+                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x80),
+            // +1
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 4] =
+                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00),
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 5] =
+                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xAA),
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 6] =
+                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x05),
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 7] =
+                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xAA),
+            // +2
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 8] =
+                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00),
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 9] =
+                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x55),
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 10] =
+                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x02),
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 11] =
+                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x55),
+            // +3
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 12] =
+                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00),
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 13] =
+                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xAA),
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 14] =
+                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x05),
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 15] =
+                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x10),
+        },
+    },
+    .pageSize = 512u,
+    .sectorSize = 256u * 1024u,
+    .blockSize = 256u * 1024u,
+    .isUniformBlockSize = true,
+};
+
+#endif /* XIP_BOOT_HEADER_ENABLE */
diff --git a/ports/mimxrt/boards/MIMXRT1060_EVK/qspi_nor_flash_config.c b/ports/mimxrt/boards/MIMXRT1060_EVK/qspi_nor_flash_config.c
new file mode 100644
index 0000000000000..290c6bc152a9e
--- /dev/null
+++ b/ports/mimxrt/boards/MIMXRT1060_EVK/qspi_nor_flash_config.c
@@ -0,0 +1,129 @@
+/*
+ * Copyright 2018 NXP
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#include BOARD_FLASH_CONFIG_HEADER_H
+
+/* Component ID definition, used by tools. */
+#ifndef FSL_COMPONENT_ID
+#define FSL_COMPONENT_ID "platform.drivers.xip_board"
+#endif
+
+/*******************************************************************************
+ * Code
+ ******************************************************************************/
+#if defined(XIP_BOOT_HEADER_ENABLE) && (XIP_BOOT_HEADER_ENABLE == 1)
+#if defined(__CC_ARM) || defined(__ARMCC_VERSION) || defined(__GNUC__)
+__attribute__((section(".boot_hdr.conf")))
+#elif defined(__ICCARM__)
+#pragma location = ".boot_hdr.conf"
+#endif
+
+const flexspi_nor_config_t qspiflash_config = {
+    .memConfig =
+    {
+        .tag = FLEXSPI_CFG_BLK_TAG,
+        .version = FLEXSPI_CFG_BLK_VERSION,
+        .readSampleClkSrc = kFlexSPIReadSampleClk_ExternalInputFromDqsPad,
+        .csHoldTime = 3u,
+        .csSetupTime = 3u,
+        .columnAddressWidth = 3u,
+        // Enable DDR mode, Wordaddassable, Safe configuration, Differential clock
+        .controllerMiscOption =
+            (1u << kFlexSpiMiscOffset_DdrModeEnable) | (1u << kFlexSpiMiscOffset_WordAddressableEnable) |
+            (1u << kFlexSpiMiscOffset_SafeConfigFreqEnable) | (1u << kFlexSpiMiscOffset_DiffClkEnable),
+        .sflashPadType = kSerialFlash_8Pads,
+        .serialClkFreq = kFlexSpiSerialClk_133MHz,
+        .sflashA1Size = BOARD_FLASH_SIZE,
+        .dataValidTime = {16u, 16u},
+        .lookupTable =
+        {
+            // 0 Read LUTs 0 -> 0
+            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0xEB, RADDR_SDR, FLEXSPI_4PAD, 0x18),
+            FLEXSPI_LUT_SEQ(DUMMY_SDR, FLEXSPI_4PAD, 0x06, READ_SDR, FLEXSPI_4PAD, 0x04),
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+
+            // 1 Read status register -> 1
+            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x05, READ_SDR, FLEXSPI_1PAD, 0x01),
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+
+            // 2 Fast read quad mode - SDR
+            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x6B, RADDR_SDR, FLEXSPI_1PAD, 0x18),
+            FLEXSPI_LUT_SEQ(DUMMY_SDR, FLEXSPI_4PAD, 0x08, READ_SDR, FLEXSPI_4PAD, 0x04),
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+
+            // 3 Write Enable -> 3
+            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x06, STOP, FLEXSPI_1PAD, 0),
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+
+            // 4 Read extend parameters
+            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x81, READ_SDR, FLEXSPI_1PAD, 0x04),
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+
+            // 5 Erase Sector -> 5
+            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x20, RADDR_SDR, FLEXSPI_1PAD, 24),
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+
+            // 6 Write Status Reg
+            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x01, WRITE_SDR, FLEXSPI_1PAD, 0x04),
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+
+            // 7 Page Program - quad mode (-> 9)
+            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x32, RADDR_SDR, FLEXSPI_1PAD, 0x18),
+            FLEXSPI_LUT_SEQ(WRITE_SDR, FLEXSPI_4PAD, 0x04, STOP, FLEXSPI_1PAD, 0),
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+
+            // 8 Read ID
+            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x90, DUMMY_SDR, FLEXSPI_1PAD, 24),
+            FLEXSPI_LUT_SEQ(READ_SDR, FLEXSPI_1PAD, 0x00, 0, 0, 0),
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+
+            // 9 Page Program - single mode -> 9
+            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x02, RADDR_SDR, FLEXSPI_1PAD, 24),
+            FLEXSPI_LUT_SEQ(WRITE_SDR, FLEXSPI_1PAD, 0, 0, 0, 0),
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+
+            // 10 Enter QPI mode
+            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x35, STOP, FLEXSPI_1PAD, 0),
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+
+            // 11 Erase Chip
+            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x60, STOP, FLEXSPI_1PAD, 0),
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+
+            // 12 Exit QPI mode
+            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_4PAD, 0xF5, STOP, FLEXSPI_1PAD, 0),
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+        },
+    },
+    .pageSize = 512u,
+    .sectorSize = 256u * 1024u,
+    .blockSize = 256u * 1024u,
+    .isUniformBlockSize = true,
+};
+
+#endif /* XIP_BOOT_HEADER_ENABLE */
diff --git a/ports/mimxrt/boards/MIMXRT1062.ld b/ports/mimxrt/boards/MIMXRT1062.ld
index 5edf70ee46b65..03c1193344593 100644
--- a/ports/mimxrt/boards/MIMXRT1062.ld
+++ b/ports/mimxrt/boards/MIMXRT1062.ld
@@ -1,14 +1,25 @@
 /* Memory configuration */
+#if BOARD_FLASH_RESERVED
+reserved_size = BOARD_FLASH_RESERVED;
+#endif
+
+#if BOARD_FLASH_TYPE==qspi_nor
+flash_start         = 0x60000000;
+#elif BOARD_FLASH_TYPE==hyperflash
 flash_start         = 0x60000000;
+#else
+#error Unknown BOARD_FLASH_TYPE
+#endif
+flash_size          = BOARD_FLASH_SIZE;
 flash_end           = DEFINED(reserved_size) ? ((flash_start) + (flash_size - reserved_size)) : ((flash_start) + (flash_size));
 flash_config_start  = flash_start;
 flash_config_size   = 0x00001000;
-ivt_start           = 0x60001000;
+ivt_start           = flash_start + 0x00001000;
 ivt_size            = 0x00001000;
-interrupts_start    = 0x60002000;
+interrupts_start    = flash_start + 0x00002000;
 interrupts_size     = 0x00000400;
-text_start          = 0x60002400;
-vfs_start           = 0x60100000;
+text_start          = flash_start + 0x00002400;
+vfs_start           = flash_start + 0x00100000;
 text_size           = ((vfs_start) - (text_start));
 vfs_size            = ((flash_end) - (vfs_start));
 itcm_start          = 0x00000000;
diff --git a/ports/mimxrt/boards/MIMXRT1064.ld b/ports/mimxrt/boards/MIMXRT1064.ld
index 820393001745b..88720896f4c4c 100644
--- a/ports/mimxrt/boards/MIMXRT1064.ld
+++ b/ports/mimxrt/boards/MIMXRT1064.ld
@@ -1,14 +1,27 @@
 /* Memory configuration */
+#if BOARD_FLASH_RESERVED
+reserved_size = BOARD_FLASH_RESERVED;
+#endif
+
+#if BOARD_FLASH_TYPE==qspi_nor
+flash_start         = 0x60000000;
+#elif BOARD_FLASH_TYPE==hyperflash
 flash_start         = 0x60000000;
+#elif BOARD_FLASH_TYPE==internal
+flash_start         = 0x70000000;
+#else
+#error Unknown BOARD_FLASH_TYPE
+#endif
+flash_size          = BOARD_FLASH_SIZE;
 flash_end           = DEFINED(reserved_size) ? ((flash_start) + (flash_size - reserved_size)) : ((flash_start) + (flash_size));
 flash_config_start  = flash_start;
 flash_config_size   = 0x00001000;
-ivt_start           = 0x60001000;
+ivt_start           = flash_start + 0x00001000;
 ivt_size            = 0x00001000;
-interrupts_start    = 0x60002000;
+interrupts_start    = flash_start + 0x00002000;
 interrupts_size     = 0x00000400;
-text_start          = 0x60002400;
-vfs_start           = 0x60100000;
+text_start          = flash_start + 0x00002400;
+vfs_start           = flash_start + 0x00100000;
 text_size           = ((vfs_start) - (text_start));
 vfs_size            = ((flash_end) - (vfs_start));
 itcm_start          = 0x00000000;
diff --git a/ports/mimxrt/boards/MIMXRT1064_EVK/MIMXRT1064_EVK.ld b/ports/mimxrt/boards/MIMXRT1064_EVK/MIMXRT1064_EVK.ld
deleted file mode 100644
index f616178a9bed2..0000000000000
--- a/ports/mimxrt/boards/MIMXRT1064_EVK/MIMXRT1064_EVK.ld
+++ /dev/null
@@ -1 +0,0 @@
-flash_size = 64M;
\ No newline at end of file
diff --git a/ports/mimxrt/boards/MIMXRT1064_EVK/MIMXRT1064_EVK_flexspi_nor_config.h b/ports/mimxrt/boards/MIMXRT1064_EVK/MIMXRT1064_EVK_flexspi_nor_config.h
new file mode 100644
index 0000000000000..01b3194e3146f
--- /dev/null
+++ b/ports/mimxrt/boards/MIMXRT1064_EVK/MIMXRT1064_EVK_flexspi_nor_config.h
@@ -0,0 +1,264 @@
+/*
+ * Copyright 2018 NXP
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#ifndef __EVKMIMXRT1064_FLEXSPI_NOR_CONFIG__
+#define __EVKMIMXRT1064_FLEXSPI_NOR_CONFIG__
+
+#include <stdint.h>
+#include <stdbool.h>
+#include "fsl_flexspi.h"
+
+/*! @name Driver version */
+/*@{*/
+/*! @brief XIP_BOARD driver version 2.0.0. */
+#define FSL_XIP_BOARD_DRIVER_VERSION (MAKE_VERSION(2, 0, 0))
+/*@}*/
+
+/* FLEXSPI memory config block related defintions */
+#define FLEXSPI_CFG_BLK_TAG     (0x42464346UL) // ascii "FCFB" Big Endian
+#define FLEXSPI_CFG_BLK_VERSION (0x56010400UL) // V1.4.0
+#define FLEXSPI_CFG_BLK_SIZE    (512)
+
+/* FLEXSPI Feature related definitions */
+#define FLEXSPI_FEATURE_HAS_PARALLEL_MODE 1
+
+/* Lookup table related defintions */
+#define CMD_INDEX_READ 0
+#define CMD_INDEX_READSTATUS 1
+#define CMD_INDEX_WRITEENABLE 2
+#define CMD_INDEX_WRITE 4
+
+#define CMD_LUT_SEQ_IDX_READ 0
+#define CMD_LUT_SEQ_IDX_READSTATUS 1
+#define CMD_LUT_SEQ_IDX_WRITEENABLE 3
+#define CMD_LUT_SEQ_IDX_WRITE 9
+
+#define CMD_SDR 0x01
+#define CMD_DDR 0x21
+#define RADDR_SDR 0x02
+#define RADDR_DDR 0x22
+#define CADDR_SDR 0x03
+#define CADDR_DDR 0x23
+#define MODE1_SDR 0x04
+#define MODE1_DDR 0x24
+#define MODE2_SDR 0x05
+#define MODE2_DDR 0x25
+#define MODE4_SDR 0x06
+#define MODE4_DDR 0x26
+#define MODE8_SDR 0x07
+#define MODE8_DDR 0x27
+#define WRITE_SDR 0x08
+#define WRITE_DDR 0x28
+#define READ_SDR 0x09
+#define READ_DDR 0x29
+#define LEARN_SDR 0x0A
+#define LEARN_DDR 0x2A
+#define DATSZ_SDR 0x0B
+#define DATSZ_DDR 0x2B
+#define DUMMY_SDR 0x0C
+#define DUMMY_DDR 0x2C
+#define DUMMY_RWDS_SDR 0x0D
+#define DUMMY_RWDS_DDR 0x2D
+#define JMP_ON_CS 0x1F
+#define STOP 0
+
+#define FLEXSPI_1PAD 0
+#define FLEXSPI_2PAD 1
+#define FLEXSPI_4PAD 2
+#define FLEXSPI_8PAD 3
+
+#define FLEXSPI_LUT_SEQ(cmd0, pad0, op0, cmd1, pad1, op1)                                                              \
+    (FLEXSPI_LUT_OPERAND0(op0) | FLEXSPI_LUT_NUM_PADS0(pad0) | FLEXSPI_LUT_OPCODE0(cmd0) | FLEXSPI_LUT_OPERAND1(op1) | \
+    FLEXSPI_LUT_NUM_PADS1(pad1) | FLEXSPI_LUT_OPCODE1(cmd1))
+
+// !@brief Definitions for FlexSPI Serial Clock Frequency
+typedef enum _FlexSpiSerialClockFreq
+{
+    kFlexSpiSerialClk_30MHz  = 1,
+    kFlexSpiSerialClk_50MHz  = 2,
+    kFlexSpiSerialClk_60MHz  = 3,
+    kFlexSpiSerialClk_75MHz  = 4,
+    kFlexSpiSerialClk_80MHz  = 5,
+    kFlexSpiSerialClk_100MHz = 6,
+    kFlexSpiSerialClk_120MHz = 7,
+    kFlexSpiSerialClk_133MHz = 8,
+    kFlexSpiSerialClk_166MHz = 9,
+} flexspi_serial_clk_freq_t;
+
+// !@brief FlexSPI clock configuration type
+enum
+{
+    kFlexSpiClk_SDR, // !< Clock configure for SDR mode
+    kFlexSpiClk_DDR, // !< Clock configurat for DDR mode
+};
+
+// !@brief FlexSPI Read Sample Clock Source definition
+typedef enum _FlashReadSampleClkSource
+{
+    kFlexSPIReadSampleClk_LoopbackInternally      = 0,
+    kFlexSPIReadSampleClk_LoopbackFromDqsPad      = 1,
+    kFlexSPIReadSampleClk_LoopbackFromSckPad      = 2,
+    kFlexSPIReadSampleClk_ExternalInputFromDqsPad = 3,
+} flexspi_read_sample_clk_t;
+
+// !@brief Misc feature bit definitions
+enum
+{
+    kFlexSpiMiscOffset_DiffClkEnable            = 0, // !< Bit for Differential clock enable
+    kFlexSpiMiscOffset_Ck2Enable                = 1, // !< Bit for CK2 enable
+    kFlexSpiMiscOffset_ParallelEnable           = 2, // !< Bit for Parallel mode enable
+    kFlexSpiMiscOffset_WordAddressableEnable    = 3, // !< Bit for Word Addressable enable
+    kFlexSpiMiscOffset_SafeConfigFreqEnable     = 4, // !< Bit for Safe Configuration Frequency enable
+    kFlexSpiMiscOffset_PadSettingOverrideEnable = 5, // !< Bit for Pad setting override enable
+    kFlexSpiMiscOffset_DdrModeEnable            = 6, // !< Bit for DDR clock confiuration indication.
+};
+
+// !@brief Flash Type Definition
+enum
+{
+    kFlexSpiDeviceType_SerialNOR    = 1,    // !< Flash devices are Serial NOR
+    kFlexSpiDeviceType_SerialNAND   = 2,    // !< Flash devices are Serial NAND
+    kFlexSpiDeviceType_SerialRAM    = 3,    // !< Flash devices are Serial RAM/HyperFLASH
+    kFlexSpiDeviceType_MCP_NOR_NAND = 0x12, // !< Flash device is MCP device, A1 is Serial NOR, A2 is Serial NAND
+    kFlexSpiDeviceType_MCP_NOR_RAM  = 0x13, // !< Flash deivce is MCP device, A1 is Serial NOR, A2 is Serial RAMs
+};
+
+// !@brief Flash Pad Definitions
+enum
+{
+    kSerialFlash_1Pad  = 1,
+    kSerialFlash_2Pads = 2,
+    kSerialFlash_4Pads = 4,
+    kSerialFlash_8Pads = 8,
+};
+
+// !@brief FlexSPI LUT Sequence structure
+typedef struct _lut_sequence
+{
+    uint8_t seqNum; // !< Sequence Number, valid number: 1-16
+    uint8_t seqId;  // !< Sequence Index, valid number: 0-15
+    uint16_t reserved;
+} flexspi_lut_seq_t;
+
+// !@brief Flash Configuration Command Type
+enum
+{
+    kDeviceConfigCmdType_Generic,    // !< Generic command, for example: configure dummy cycles, drive strength, etc
+    kDeviceConfigCmdType_QuadEnable, // !< Quad Enable command
+    kDeviceConfigCmdType_Spi2Xpi,    // !< Switch from SPI to DPI/QPI/OPI mode
+    kDeviceConfigCmdType_Xpi2Spi,    // !< Switch from DPI/QPI/OPI to SPI mode
+    kDeviceConfigCmdType_Spi2NoCmd,  // !< Switch to 0-4-4/0-8-8 mode
+    kDeviceConfigCmdType_Reset,      // !< Reset device command
+};
+
+// !@brief FlexSPI Memory Configuration Block
+typedef struct _FlexSPIConfig
+{
+    uint32_t tag;               // !< [0x000-0x003] Tag, fixed value 0x42464346UL
+    uint32_t version;           // !< [0x004-0x007] Version,[31:24] -'V', [23:16] - Major, [15:8] - Minor, [7:0] - bugfix
+    uint32_t reserved0;         // !< [0x008-0x00b] Reserved for future use
+    uint8_t readSampleClkSrc;   // !< [0x00c-0x00c] Read Sample Clock Source, valid value: 0/1/3
+    uint8_t csHoldTime;         // !< [0x00d-0x00d] CS hold time, default value: 3
+    uint8_t csSetupTime;        // !< [0x00e-0x00e] CS setup time, default value: 3
+    uint8_t columnAddressWidth; // !< [0x00f-0x00f] Column Address with, for HyperBus protocol, it is fixed to 3, For
+    // ! Serial NAND, need to refer to datasheet
+    uint8_t deviceModeCfgEnable; // !< [0x010-0x010] Device Mode Configure enable flag, 1 - Enable, 0 - Disable
+    uint8_t deviceModeType; // !< [0x011-0x011] Specify the configuration command type:Quad Enable, DPI/QPI/OPI switch,
+    // ! Generic configuration, etc.
+    uint16_t waitTimeCfgCommands; // !< [0x012-0x013] Wait time for all configuration commands, unit: 100us, Used for
+    // ! DPI/QPI/OPI switch or reset command
+    flexspi_lut_seq_t deviceModeSeq; // !< [0x014-0x017] Device mode sequence info, [7:0] - LUT sequence id, [15:8] - LUt
+    // ! sequence number, [31:16] Reserved
+    uint32_t deviceModeArg;    // !< [0x018-0x01b] Argument/Parameter for device configuration
+    uint8_t configCmdEnable;   // !< [0x01c-0x01c] Configure command Enable Flag, 1 - Enable, 0 - Disable
+    uint8_t configModeType[3]; // !< [0x01d-0x01f] Configure Mode Type, similar as deviceModeTpe
+    flexspi_lut_seq_t
+        configCmdSeqs[3]; // !< [0x020-0x02b] Sequence info for Device Configuration command, similar as deviceModeSeq
+    uint32_t reserved1;   // !< [0x02c-0x02f] Reserved for future use
+    uint32_t configCmdArgs[3];     // !< [0x030-0x03b] Arguments/Parameters for device Configuration commands
+    uint32_t reserved2;            // !< [0x03c-0x03f] Reserved for future use
+    uint32_t controllerMiscOption; // !< [0x040-0x043] Controller Misc Options, see Misc feature bit definitions for more
+    // ! details
+    uint8_t deviceType;    // !< [0x044-0x044] Device Type:  See Flash Type Definition for more details
+    uint8_t sflashPadType; // !< [0x045-0x045] Serial Flash Pad Type: 1 - Single, 2 - Dual, 4 - Quad, 8 - Octal
+    uint8_t serialClkFreq; // !< [0x046-0x046] Serial Flash Frequencey, device specific definitions, See System Boot
+    // ! Chapter for more details
+    uint8_t lutCustomSeqEnable; // !< [0x047-0x047] LUT customization Enable, it is required if the program/erase cannot
+    // ! be done using 1 LUT sequence, currently, only applicable to HyperFLASH
+    uint32_t reserved3[2];           // !< [0x048-0x04f] Reserved for future use
+    uint32_t sflashA1Size;           // !< [0x050-0x053] Size of Flash connected to A1
+    uint32_t sflashA2Size;           // !< [0x054-0x057] Size of Flash connected to A2
+    uint32_t sflashB1Size;           // !< [0x058-0x05b] Size of Flash connected to B1
+    uint32_t sflashB2Size;           // !< [0x05c-0x05f] Size of Flash connected to B2
+    uint32_t csPadSettingOverride;   // !< [0x060-0x063] CS pad setting override value
+    uint32_t sclkPadSettingOverride; // !< [0x064-0x067] SCK pad setting override value
+    uint32_t dataPadSettingOverride; // !< [0x068-0x06b] data pad setting override value
+    uint32_t dqsPadSettingOverride;  // !< [0x06c-0x06f] DQS pad setting override value
+    uint32_t timeoutInMs;            // !< [0x070-0x073] Timeout threshold for read status command
+    uint32_t commandInterval;        // !< [0x074-0x077] CS deselect interval between two commands
+    uint16_t dataValidTime[2]; // !< [0x078-0x07b] CLK edge to data valid time for PORT A and PORT B, in terms of 0.1ns
+    uint16_t busyOffset;       // !< [0x07c-0x07d] Busy offset, valid value: 0-31
+    uint16_t busyBitPolarity;  // !< [0x07e-0x07f] Busy flag polarity, 0 - busy flag is 1 when flash device is busy, 1 -
+    // ! busy flag is 0 when flash device is busy
+    uint32_t lookupTable[64];           // !< [0x080-0x17f] Lookup table holds Flash command sequences
+    flexspi_lut_seq_t lutCustomSeq[12]; // !< [0x180-0x1af] Customizable LUT Sequences
+    uint32_t reserved4[4];              // !< [0x1b0-0x1bf] Reserved for future use
+} flexspi_mem_config_t;
+
+/*  */
+#define NOR_CMD_LUT_SEQ_IDX_READ_NORMAL 0
+#define NOR_CMD_LUT_SEQ_IDX_READSTATUSREG 1
+#define NOR_CMD_LUT_SEQ_IDX_READ_FAST_QUAD 2
+#define NOR_CMD_LUT_SEQ_IDX_WRITEENABLE 3
+#define NOR_CMD_LUT_SEQ_IDX_READSTATUS_XPI 4
+#define NOR_CMD_LUT_SEQ_IDX_ERASESECTOR 5
+#define NOR_CMD_LUT_SEQ_IDX_WRITESTATUSREG 6
+#define NOR_CMD_LUT_SEQ_IDX_PAGEPROGRAM_QUAD 7
+#define NOR_CMD_LUT_SEQ_IDX_READID 8
+#define NOR_CMD_LUT_SEQ_IDX_PAGEPROGRAM 9
+#define NOR_CMD_LUT_SEQ_IDX_ENTERQPI 10
+#define NOR_CMD_LUT_SEQ_IDX_CHIPERASE 11
+#define NOR_CMD_LUT_SEQ_IDX_EXITQPI 12
+
+#define HYPERFLASH_CMD_LUT_SEQ_IDX_READDATA    0
+#define HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEDATA   1
+#define HYPERFLASH_CMD_LUT_SEQ_IDX_READSTATUS  2
+#define HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEENABLE 4
+#define HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR 6
+#define HYPERFLASH_CMD_LUT_SEQ_IDX_PAGEPROGRAM 10
+#define HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP   12
+
+/*
+ *  Serial NOR configuration block
+ */
+typedef struct _flexspi_nor_config
+{
+    flexspi_mem_config_t memConfig; // !< Common memory configuration info via FlexSPI
+    uint32_t pageSize;              // !< Page size of Serial NOR
+    uint32_t sectorSize;            // !< Sector size of Serial NOR
+    uint8_t ipcmdSerialClkFreq;     // !< Clock frequency for IP command
+    uint8_t isUniformBlockSize;     // !< Sector/Block size is the same
+    uint8_t reserved0[2];           // !< Reserved for future use
+    uint8_t serialNorType;          // !< Serial NOR Flash type: 0/1/2/3
+    uint8_t needExitNoCmdMode;      // !< Need to exit NoCmd mode before other IP command
+    uint8_t halfClkForNonReadCmd;   // !< Half the Serial Clock for non-read command: true/false
+    uint8_t needRestoreNoCmdMode;   // !< Need to Restore NoCmd mode after IP commmand execution
+    uint32_t blockSize;             // !< Block size
+    uint32_t reserve2[11];          // !< Reserved for future use
+} flexspi_nor_config_t;
+
+#define FLASH_BUSY_STATUS_POL 0
+#define FLASH_BUSY_STATUS_OFFSET 0
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* __EVKMIMXRT1064_FLEXSPI_NOR_CONFIG__ */
diff --git a/ports/mimxrt/boards/MIMXRT1064_EVK/clock_config.h b/ports/mimxrt/boards/MIMXRT1064_EVK/clock_config.h
new file mode 100644
index 0000000000000..13bc925a105c3
--- /dev/null
+++ b/ports/mimxrt/boards/MIMXRT1064_EVK/clock_config.h
@@ -0,0 +1,122 @@
+/*
+ * Copyright 2018-2019 NXP
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#ifndef _CLOCK_CONFIG_H_
+#define _CLOCK_CONFIG_H_
+
+#include "fsl_common.h"
+
+/*******************************************************************************
+ * Definitions
+ ******************************************************************************/
+#define BOARD_XTAL0_CLK_HZ 24000000U /*!< Board xtal0 frequency in Hz */
+
+#define BOARD_XTAL32K_CLK_HZ 32768U /*!< Board xtal32k frequency in Hz */
+/*******************************************************************************
+ ************************ BOARD_InitBootClocks function ************************
+ ******************************************************************************/
+
+#if defined(__cplusplus)
+extern "C" {
+#endif /* __cplusplus*/
+
+/*!
+ * @brief This function executes default configuration of clocks.
+ *
+ */
+void BOARD_InitBootClocks(void);
+
+#if defined(__cplusplus)
+}
+#endif /* __cplusplus*/
+
+/*******************************************************************************
+ ********************** Configuration BOARD_BootClockRUN ***********************
+ ******************************************************************************/
+/*******************************************************************************
+ * Definitions for BOARD_BootClockRUN configuration
+ ******************************************************************************/
+#define BOARD_BOOTCLOCKRUN_CORE_CLOCK 600000000U /*!< Core clock frequency: 600000000Hz */
+
+/* Clock outputs (values are in Hz): */
+#define BOARD_BOOTCLOCKRUN_AHB_CLK_ROOT 600000000UL
+#define BOARD_BOOTCLOCKRUN_CAN_CLK_ROOT 40000000UL
+#define BOARD_BOOTCLOCKRUN_CKIL_SYNC_CLK_ROOT 32768UL
+#define BOARD_BOOTCLOCKRUN_CLKO1_CLK 0UL
+#define BOARD_BOOTCLOCKRUN_CLKO2_CLK 0UL
+#define BOARD_BOOTCLOCKRUN_CLK_1M 1000000UL
+#define BOARD_BOOTCLOCKRUN_CLK_24M 24000000UL
+#define BOARD_BOOTCLOCKRUN_CSI_CLK_ROOT 12000000UL
+#define BOARD_BOOTCLOCKRUN_ENET1_TX_CLK 2400000UL
+#define BOARD_BOOTCLOCKRUN_ENET2_125M_CLK 1200000UL
+#define BOARD_BOOTCLOCKRUN_ENET2_TX_CLK 1200000UL
+#define BOARD_BOOTCLOCKRUN_ENET_125M_CLK 2400000UL
+#define BOARD_BOOTCLOCKRUN_ENET_25M_REF_CLK 1200000UL
+#define BOARD_BOOTCLOCKRUN_FLEXIO1_CLK_ROOT 30000000UL
+#define BOARD_BOOTCLOCKRUN_FLEXIO2_CLK_ROOT 30000000UL
+#define BOARD_BOOTCLOCKRUN_FLEXSPI2_CLK_ROOT 130909090UL
+#define BOARD_BOOTCLOCKRUN_FLEXSPI_CLK_ROOT 130909090UL
+#define BOARD_BOOTCLOCKRUN_GPT1_IPG_CLK_HIGHFREQ 75000000UL
+#define BOARD_BOOTCLOCKRUN_GPT2_IPG_CLK_HIGHFREQ 75000000UL
+#define BOARD_BOOTCLOCKRUN_IPG_CLK_ROOT 150000000UL
+#define BOARD_BOOTCLOCKRUN_LCDIF_CLK_ROOT 67500000UL
+#define BOARD_BOOTCLOCKRUN_LPI2C_CLK_ROOT 60000000UL
+#define BOARD_BOOTCLOCKRUN_LPSPI_CLK_ROOT 105600000UL
+#define BOARD_BOOTCLOCKRUN_LVDS1_CLK 1200000000UL
+#define BOARD_BOOTCLOCKRUN_MQS_MCLK 63529411UL
+#define BOARD_BOOTCLOCKRUN_PERCLK_CLK_ROOT 75000000UL
+#define BOARD_BOOTCLOCKRUN_PLL7_MAIN_CLK 24000000UL
+#define BOARD_BOOTCLOCKRUN_SAI1_CLK_ROOT 63529411UL
+#define BOARD_BOOTCLOCKRUN_SAI1_MCLK1 63529411UL
+#define BOARD_BOOTCLOCKRUN_SAI1_MCLK2 63529411UL
+#define BOARD_BOOTCLOCKRUN_SAI1_MCLK3 30000000UL
+#define BOARD_BOOTCLOCKRUN_SAI2_CLK_ROOT 63529411UL
+#define BOARD_BOOTCLOCKRUN_SAI2_MCLK1 63529411UL
+#define BOARD_BOOTCLOCKRUN_SAI2_MCLK2 0UL
+#define BOARD_BOOTCLOCKRUN_SAI2_MCLK3 30000000UL
+#define BOARD_BOOTCLOCKRUN_SAI3_CLK_ROOT 63529411UL
+#define BOARD_BOOTCLOCKRUN_SAI3_MCLK1 63529411UL
+#define BOARD_BOOTCLOCKRUN_SAI3_MCLK2 0UL
+#define BOARD_BOOTCLOCKRUN_SAI3_MCLK3 30000000UL
+#define BOARD_BOOTCLOCKRUN_SEMC_CLK_ROOT 75000000UL
+#define BOARD_BOOTCLOCKRUN_SPDIF0_CLK_ROOT 30000000UL
+#define BOARD_BOOTCLOCKRUN_SPDIF0_EXTCLK_OUT 0UL
+#define BOARD_BOOTCLOCKRUN_TRACE_CLK_ROOT 117333333UL
+#define BOARD_BOOTCLOCKRUN_UART_CLK_ROOT 80000000UL
+#define BOARD_BOOTCLOCKRUN_USBPHY1_CLK 0UL
+#define BOARD_BOOTCLOCKRUN_USBPHY2_CLK 0UL
+#define BOARD_BOOTCLOCKRUN_USDHC1_CLK_ROOT 198000000UL
+#define BOARD_BOOTCLOCKRUN_USDHC2_CLK_ROOT 198000000UL
+
+/*! @brief Arm PLL set for BOARD_BootClockRUN configuration.
+ */
+extern const clock_arm_pll_config_t armPllConfig_BOARD_BootClockRUN;
+/*! @brief Usb1 PLL set for BOARD_BootClockRUN configuration.
+ */
+extern const clock_usb_pll_config_t usb1PllConfig_BOARD_BootClockRUN;
+/*! @brief Sys PLL for BOARD_BootClockRUN configuration.
+ */
+extern const clock_sys_pll_config_t sysPllConfig_BOARD_BootClockRUN;
+
+/*******************************************************************************
+ * API for BOARD_BootClockRUN configuration
+ ******************************************************************************/
+#if defined(__cplusplus)
+extern "C" {
+#endif /* __cplusplus*/
+
+/*!
+ * @brief This function executes configuration of clocks.
+ *
+ */
+void BOARD_BootClockRUN(void);
+
+#if defined(__cplusplus)
+}
+#endif /* __cplusplus*/
+
+#endif /* _CLOCK_CONFIG_H_ */
diff --git a/ports/mimxrt/boards/MIMXRT1064_EVK/evkmimxrt1064_flexspi_nor_config.h b/ports/mimxrt/boards/MIMXRT1064_EVK/evkmimxrt1064_flexspi_nor_config.h
deleted file mode 100644
index 7560f248368ce..0000000000000
--- a/ports/mimxrt/boards/MIMXRT1064_EVK/evkmimxrt1064_flexspi_nor_config.h
+++ /dev/null
@@ -1,264 +0,0 @@
-/*
- * Copyright 2018 NXP
- * All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-#ifndef __EVKMIMXRT1064_FLEXSPI_NOR_CONFIG__
-#define __EVKMIMXRT1064_FLEXSPI_NOR_CONFIG__
-
-#include <stdint.h>
-#include <stdbool.h>
-#include "fsl_flexspi.h"
-
-/*! @name Driver version */
-/*@{*/
-/*! @brief XIP_BOARD driver version 2.0.0. */
-#define FSL_XIP_BOARD_DRIVER_VERSION (MAKE_VERSION(2, 0, 0))
-/*@}*/
-
-/* FLEXSPI memory config block related defintions */
-#define FLEXSPI_CFG_BLK_TAG     (0x42464346UL) // ascii "FCFB" Big Endian
-#define FLEXSPI_CFG_BLK_VERSION (0x56010400UL) // V1.4.0
-#define FLEXSPI_CFG_BLK_SIZE    (512)
-
-/* FLEXSPI Feature related definitions */
-#define FLEXSPI_FEATURE_HAS_PARALLEL_MODE 1
-
-/* Lookup table related defintions */
-#define CMD_INDEX_READ 0
-#define CMD_INDEX_READSTATUS 1
-#define CMD_INDEX_WRITEENABLE 2
-#define CMD_INDEX_WRITE 4
-
-#define CMD_LUT_SEQ_IDX_READ 0
-#define CMD_LUT_SEQ_IDX_READSTATUS 1
-#define CMD_LUT_SEQ_IDX_WRITEENABLE 3
-#define CMD_LUT_SEQ_IDX_WRITE 9
-
-#define CMD_SDR 0x01
-#define CMD_DDR 0x21
-#define RADDR_SDR 0x02
-#define RADDR_DDR 0x22
-#define CADDR_SDR 0x03
-#define CADDR_DDR 0x23
-#define MODE1_SDR 0x04
-#define MODE1_DDR 0x24
-#define MODE2_SDR 0x05
-#define MODE2_DDR 0x25
-#define MODE4_SDR 0x06
-#define MODE4_DDR 0x26
-#define MODE8_SDR 0x07
-#define MODE8_DDR 0x27
-#define WRITE_SDR 0x08
-#define WRITE_DDR 0x28
-#define READ_SDR 0x09
-#define READ_DDR 0x29
-#define LEARN_SDR 0x0A
-#define LEARN_DDR 0x2A
-#define DATSZ_SDR 0x0B
-#define DATSZ_DDR 0x2B
-#define DUMMY_SDR 0x0C
-#define DUMMY_DDR 0x2C
-#define DUMMY_RWDS_SDR 0x0D
-#define DUMMY_RWDS_DDR 0x2D
-#define JMP_ON_CS 0x1F
-#define STOP 0
-
-#define FLEXSPI_1PAD 0
-#define FLEXSPI_2PAD 1
-#define FLEXSPI_4PAD 2
-#define FLEXSPI_8PAD 3
-
-#define FLEXSPI_LUT_SEQ(cmd0, pad0, op0, cmd1, pad1, op1)                                                              \
-    (FLEXSPI_LUT_OPERAND0(op0) | FLEXSPI_LUT_NUM_PADS0(pad0) | FLEXSPI_LUT_OPCODE0(cmd0) | FLEXSPI_LUT_OPERAND1(op1) | \
-     FLEXSPI_LUT_NUM_PADS1(pad1) | FLEXSPI_LUT_OPCODE1(cmd1))
-
-//!@brief Definitions for FlexSPI Serial Clock Frequency
-typedef enum _FlexSpiSerialClockFreq
-{
-    kFlexSpiSerialClk_30MHz  = 1,
-    kFlexSpiSerialClk_50MHz  = 2,
-    kFlexSpiSerialClk_60MHz  = 3,
-    kFlexSpiSerialClk_75MHz  = 4,
-    kFlexSpiSerialClk_80MHz  = 5,
-    kFlexSpiSerialClk_100MHz = 6,
-    kFlexSpiSerialClk_120MHz = 7,
-    kFlexSpiSerialClk_133MHz = 8,
-    kFlexSpiSerialClk_166MHz = 9,
-} flexspi_serial_clk_freq_t;
-
-//!@brief FlexSPI clock configuration type
-enum
-{
-    kFlexSpiClk_SDR, //!< Clock configure for SDR mode
-    kFlexSpiClk_DDR, //!< Clock configurat for DDR mode
-};
-
-//!@brief FlexSPI Read Sample Clock Source definition
-typedef enum _FlashReadSampleClkSource
-{
-    kFlexSPIReadSampleClk_LoopbackInternally      = 0,
-    kFlexSPIReadSampleClk_LoopbackFromDqsPad      = 1,
-    kFlexSPIReadSampleClk_LoopbackFromSckPad      = 2,
-    kFlexSPIReadSampleClk_ExternalInputFromDqsPad = 3,
-} flexspi_read_sample_clk_t;
-
-//!@brief Misc feature bit definitions
-enum
-{
-    kFlexSpiMiscOffset_DiffClkEnable            = 0, //!< Bit for Differential clock enable
-    kFlexSpiMiscOffset_Ck2Enable                = 1, //!< Bit for CK2 enable
-    kFlexSpiMiscOffset_ParallelEnable           = 2, //!< Bit for Parallel mode enable
-    kFlexSpiMiscOffset_WordAddressableEnable    = 3, //!< Bit for Word Addressable enable
-    kFlexSpiMiscOffset_SafeConfigFreqEnable     = 4, //!< Bit for Safe Configuration Frequency enable
-    kFlexSpiMiscOffset_PadSettingOverrideEnable = 5, //!< Bit for Pad setting override enable
-    kFlexSpiMiscOffset_DdrModeEnable            = 6, //!< Bit for DDR clock confiuration indication.
-};
-
-//!@brief Flash Type Definition
-enum
-{
-    kFlexSpiDeviceType_SerialNOR    = 1,    //!< Flash devices are Serial NOR
-    kFlexSpiDeviceType_SerialNAND   = 2,    //!< Flash devices are Serial NAND
-    kFlexSpiDeviceType_SerialRAM    = 3,    //!< Flash devices are Serial RAM/HyperFLASH
-    kFlexSpiDeviceType_MCP_NOR_NAND = 0x12, //!< Flash device is MCP device, A1 is Serial NOR, A2 is Serial NAND
-    kFlexSpiDeviceType_MCP_NOR_RAM  = 0x13, //!< Flash deivce is MCP device, A1 is Serial NOR, A2 is Serial RAMs
-};
-
-//!@brief Flash Pad Definitions
-enum
-{
-    kSerialFlash_1Pad  = 1,
-    kSerialFlash_2Pads = 2,
-    kSerialFlash_4Pads = 4,
-    kSerialFlash_8Pads = 8,
-};
-
-//!@brief FlexSPI LUT Sequence structure
-typedef struct _lut_sequence
-{
-    uint8_t seqNum; //!< Sequence Number, valid number: 1-16
-    uint8_t seqId;  //!< Sequence Index, valid number: 0-15
-    uint16_t reserved;
-} flexspi_lut_seq_t;
-
-//!@brief Flash Configuration Command Type
-enum
-{
-    kDeviceConfigCmdType_Generic,    //!< Generic command, for example: configure dummy cycles, drive strength, etc
-    kDeviceConfigCmdType_QuadEnable, //!< Quad Enable command
-    kDeviceConfigCmdType_Spi2Xpi,    //!< Switch from SPI to DPI/QPI/OPI mode
-    kDeviceConfigCmdType_Xpi2Spi,    //!< Switch from DPI/QPI/OPI to SPI mode
-    kDeviceConfigCmdType_Spi2NoCmd,  //!< Switch to 0-4-4/0-8-8 mode
-    kDeviceConfigCmdType_Reset,      //!< Reset device command
-};
-
-//!@brief FlexSPI Memory Configuration Block
-typedef struct _FlexSPIConfig
-{
-    uint32_t tag;               //!< [0x000-0x003] Tag, fixed value 0x42464346UL
-    uint32_t version;           //!< [0x004-0x007] Version,[31:24] -'V', [23:16] - Major, [15:8] - Minor, [7:0] - bugfix
-    uint32_t reserved0;         //!< [0x008-0x00b] Reserved for future use
-    uint8_t readSampleClkSrc;   //!< [0x00c-0x00c] Read Sample Clock Source, valid value: 0/1/3
-    uint8_t csHoldTime;         //!< [0x00d-0x00d] CS hold time, default value: 3
-    uint8_t csSetupTime;        //!< [0x00e-0x00e] CS setup time, default value: 3
-    uint8_t columnAddressWidth; //!< [0x00f-0x00f] Column Address with, for HyperBus protocol, it is fixed to 3, For
-    //! Serial NAND, need to refer to datasheet
-    uint8_t deviceModeCfgEnable; //!< [0x010-0x010] Device Mode Configure enable flag, 1 - Enable, 0 - Disable
-    uint8_t deviceModeType; //!< [0x011-0x011] Specify the configuration command type:Quad Enable, DPI/QPI/OPI switch,
-    //! Generic configuration, etc.
-    uint16_t waitTimeCfgCommands; //!< [0x012-0x013] Wait time for all configuration commands, unit: 100us, Used for
-    //! DPI/QPI/OPI switch or reset command
-    flexspi_lut_seq_t deviceModeSeq; //!< [0x014-0x017] Device mode sequence info, [7:0] - LUT sequence id, [15:8] - LUt
-    //! sequence number, [31:16] Reserved
-    uint32_t deviceModeArg;    //!< [0x018-0x01b] Argument/Parameter for device configuration
-    uint8_t configCmdEnable;   //!< [0x01c-0x01c] Configure command Enable Flag, 1 - Enable, 0 - Disable
-    uint8_t configModeType[3]; //!< [0x01d-0x01f] Configure Mode Type, similar as deviceModeTpe
-    flexspi_lut_seq_t
-        configCmdSeqs[3]; //!< [0x020-0x02b] Sequence info for Device Configuration command, similar as deviceModeSeq
-    uint32_t reserved1;   //!< [0x02c-0x02f] Reserved for future use
-    uint32_t configCmdArgs[3];     //!< [0x030-0x03b] Arguments/Parameters for device Configuration commands
-    uint32_t reserved2;            //!< [0x03c-0x03f] Reserved for future use
-    uint32_t controllerMiscOption; //!< [0x040-0x043] Controller Misc Options, see Misc feature bit definitions for more
-    //! details
-    uint8_t deviceType;    //!< [0x044-0x044] Device Type:  See Flash Type Definition for more details
-    uint8_t sflashPadType; //!< [0x045-0x045] Serial Flash Pad Type: 1 - Single, 2 - Dual, 4 - Quad, 8 - Octal
-    uint8_t serialClkFreq; //!< [0x046-0x046] Serial Flash Frequencey, device specific definitions, See System Boot
-    //! Chapter for more details
-    uint8_t lutCustomSeqEnable; //!< [0x047-0x047] LUT customization Enable, it is required if the program/erase cannot
-    //! be done using 1 LUT sequence, currently, only applicable to HyperFLASH
-    uint32_t reserved3[2];           //!< [0x048-0x04f] Reserved for future use
-    uint32_t sflashA1Size;           //!< [0x050-0x053] Size of Flash connected to A1
-    uint32_t sflashA2Size;           //!< [0x054-0x057] Size of Flash connected to A2
-    uint32_t sflashB1Size;           //!< [0x058-0x05b] Size of Flash connected to B1
-    uint32_t sflashB2Size;           //!< [0x05c-0x05f] Size of Flash connected to B2
-    uint32_t csPadSettingOverride;   //!< [0x060-0x063] CS pad setting override value
-    uint32_t sclkPadSettingOverride; //!< [0x064-0x067] SCK pad setting override value
-    uint32_t dataPadSettingOverride; //!< [0x068-0x06b] data pad setting override value
-    uint32_t dqsPadSettingOverride;  //!< [0x06c-0x06f] DQS pad setting override value
-    uint32_t timeoutInMs;            //!< [0x070-0x073] Timeout threshold for read status command
-    uint32_t commandInterval;        //!< [0x074-0x077] CS deselect interval between two commands
-    uint16_t dataValidTime[2]; //!< [0x078-0x07b] CLK edge to data valid time for PORT A and PORT B, in terms of 0.1ns
-    uint16_t busyOffset;       //!< [0x07c-0x07d] Busy offset, valid value: 0-31
-    uint16_t busyBitPolarity;  //!< [0x07e-0x07f] Busy flag polarity, 0 - busy flag is 1 when flash device is busy, 1 -
-    //! busy flag is 0 when flash device is busy
-    uint32_t lookupTable[64];           //!< [0x080-0x17f] Lookup table holds Flash command sequences
-    flexspi_lut_seq_t lutCustomSeq[12]; //!< [0x180-0x1af] Customizable LUT Sequences
-    uint32_t reserved4[4];              //!< [0x1b0-0x1bf] Reserved for future use
-} flexspi_mem_config_t;
-
-/*  */
-#define NOR_CMD_LUT_SEQ_IDX_READ_NORMAL 0
-#define NOR_CMD_LUT_SEQ_IDX_READSTATUSREG 1
-#define NOR_CMD_LUT_SEQ_IDX_READ_FAST_QUAD 2
-#define NOR_CMD_LUT_SEQ_IDX_WRITEENABLE 3
-#define NOR_CMD_LUT_SEQ_IDX_READSTATUS_XPI 4
-#define NOR_CMD_LUT_SEQ_IDX_ERASESECTOR 5
-#define NOR_CMD_LUT_SEQ_IDX_WRITESTATUSREG 6
-#define NOR_CMD_LUT_SEQ_IDX_PAGEPROGRAM_QUAD 7
-#define NOR_CMD_LUT_SEQ_IDX_READID 8
-#define NOR_CMD_LUT_SEQ_IDX_PAGEPROGRAM 9
-#define NOR_CMD_LUT_SEQ_IDX_ENTERQPI 10
-#define NOR_CMD_LUT_SEQ_IDX_CHIPERASE 11
-#define NOR_CMD_LUT_SEQ_IDX_EXITQPI 12
-
-#define HYPERFLASH_CMD_LUT_SEQ_IDX_READDATA    0
-#define HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEDATA   1
-#define HYPERFLASH_CMD_LUT_SEQ_IDX_READSTATUS  2
-#define HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEENABLE 4
-#define HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR 6
-#define HYPERFLASH_CMD_LUT_SEQ_IDX_PAGEPROGRAM 10
-#define HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP   12
-
-/*
- *  Serial NOR configuration block
- */
-typedef struct _flexspi_nor_config
-{
-    flexspi_mem_config_t memConfig; //!< Common memory configuration info via FlexSPI
-    uint32_t pageSize;              //!< Page size of Serial NOR
-    uint32_t sectorSize;            //!< Sector size of Serial NOR
-    uint8_t ipcmdSerialClkFreq;     //!< Clock frequency for IP command
-    uint8_t isUniformBlockSize;     //!< Sector/Block size is the same
-    uint8_t reserved0[2];           //!< Reserved for future use
-    uint8_t serialNorType;          //!< Serial NOR Flash type: 0/1/2/3
-    uint8_t needExitNoCmdMode;      //!< Need to exit NoCmd mode before other IP command
-    uint8_t halfClkForNonReadCmd;   //!< Half the Serial Clock for non-read command: true/false
-    uint8_t needRestoreNoCmdMode;   //!< Need to Restore NoCmd mode after IP commmand execution
-    uint32_t blockSize;             //!< Block size
-    uint32_t reserve2[11];          //!< Reserved for future use
-} flexspi_nor_config_t;
-
-#define FLASH_BUSY_STATUS_POL 0
-#define FLASH_BUSY_STATUS_OFFSET 0
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* __EVKMIMXRT1064_FLEXSPI_NOR_CONFIG__ */
diff --git a/ports/mimxrt/boards/MIMXRT1064_EVK/flash_config.c b/ports/mimxrt/boards/MIMXRT1064_EVK/flash_config.c
deleted file mode 100644
index f308b7f8add4d..0000000000000
--- a/ports/mimxrt/boards/MIMXRT1064_EVK/flash_config.c
+++ /dev/null
@@ -1,186 +0,0 @@
-/*
- * Copyright 2018 NXP
- * All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-#include "evkmimxrt1064_flexspi_nor_config.h"
-
-/* Component ID definition, used by tools. */
-#ifndef FSL_COMPONENT_ID
-#define FSL_COMPONENT_ID "platform.drivers.xip_board"
-#endif
-
-/*******************************************************************************
- * Code
- ******************************************************************************/
-#if defined(XIP_BOOT_HEADER_ENABLE) && (XIP_BOOT_HEADER_ENABLE == 1)
-#if defined(__CC_ARM) || defined(__ARMCC_VERSION) || defined(__GNUC__)
-__attribute__((section(".boot_hdr.conf")))
-#elif defined(__ICCARM__)
-#pragma location = ".boot_hdr.conf"
-#endif
-
-const flexspi_nor_config_t qspiflash_config = {
-    .memConfig =
-        {
-            .tag                = FLEXSPI_CFG_BLK_TAG,
-            .version            = FLEXSPI_CFG_BLK_VERSION,
-            .readSampleClkSrc   = kFlexSPIReadSampleClk_ExternalInputFromDqsPad,
-            .csHoldTime         = 3u,
-            .csSetupTime        = 3u,
-            .columnAddressWidth = 3u,
-            // Enable DDR mode, Wordaddressable, Safe configuration, Differential clock
-            .controllerMiscOption =
-                (1u << kFlexSpiMiscOffset_DdrModeEnable) | (1u << kFlexSpiMiscOffset_WordAddressableEnable) |
-                (1u << kFlexSpiMiscOffset_SafeConfigFreqEnable) | (1u << kFlexSpiMiscOffset_DiffClkEnable),
-            .sflashPadType = kSerialFlash_8Pads,
-            .serialClkFreq = kFlexSpiSerialClk_133MHz,
-            .sflashA1Size  = 64u * 1024u * 1024u,
-            .dataValidTime = {16u, 16u},
-            .lookupTable =
-                {
-                    /* 0 Read Data */
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_READDATA] =
-                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xA0, kFLEXSPI_Command_RADDR_DDR, kFLEXSPI_8PAD, 0x18),
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_READDATA + 1] = FLEXSPI_LUT_SEQ(
-                        kFLEXSPI_Command_CADDR_DDR, kFLEXSPI_8PAD, 0x10, kFLEXSPI_Command_READ_DDR, kFLEXSPI_8PAD, 0x04),
-
-                    /* 1 Write Data */
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEDATA] =
-                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x20, kFLEXSPI_Command_RADDR_DDR, kFLEXSPI_8PAD, 0x18),
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEDATA + 1] = FLEXSPI_LUT_SEQ(
-                        kFLEXSPI_Command_CADDR_DDR, kFLEXSPI_8PAD, 0x10, kFLEXSPI_Command_WRITE_DDR, kFLEXSPI_8PAD, 0x02),
-
-                    /* 2 Read Status */
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_READSTATUS] =
-                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00),
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_READSTATUS + 1] = FLEXSPI_LUT_SEQ(
-                        kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xAA), // ADDR 0x555
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_READSTATUS + 2] =
-                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x05),
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_READSTATUS + 3] = FLEXSPI_LUT_SEQ(
-                        kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x70), // DATA 0x70
-                    // +1
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_READSTATUS + 4] =
-                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xA0, kFLEXSPI_Command_RADDR_DDR, kFLEXSPI_8PAD, 0x18),
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_READSTATUS + 5] = FLEXSPI_LUT_SEQ(
-                        kFLEXSPI_Command_CADDR_DDR, kFLEXSPI_8PAD, 0x10, kFLEXSPI_Command_DUMMY_RWDS_DDR, kFLEXSPI_8PAD, 0x0B),
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_READSTATUS + 6] =
-                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_READ_DDR, kFLEXSPI_8PAD, 0x04, kFLEXSPI_Command_STOP, kFLEXSPI_1PAD, 0x0),
-
-                    /* 4 Write Enable */
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEENABLE] =
-                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x20, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00),
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEENABLE + 1] = FLEXSPI_LUT_SEQ(
-                        kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xAA), // ADDR 0x555
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEENABLE + 2] =
-                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x05),
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEENABLE + 3] = FLEXSPI_LUT_SEQ(
-                        kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xAA), // DATA 0xAA
-                    // +1
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEENABLE + 4] =
-                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x20, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00),
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEENABLE + 5] =
-                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x55),
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEENABLE + 6] =
-                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x02),
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEENABLE + 7] =
-                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x55),
-
-                    /* 6 Erase Sector  */
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR] =
-                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00),
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 1] = FLEXSPI_LUT_SEQ(
-                        kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xAA), // ADDR 0x555
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 2] =
-                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x05),
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 3] = FLEXSPI_LUT_SEQ(
-                        kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x80), // DATA 0x80
-                    // +1
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 4] =
-                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00),
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 5] =
-                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xAA),
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 6] =
-                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x05),
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 7] = FLEXSPI_LUT_SEQ(
-                        kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xAA), // ADDR 0x555
-                    // +2
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 8] =
-                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00),
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 9] =
-                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x55),
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 10] =
-                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x02),
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 11] =
-                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x55),
-                    // +3
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 12] =
-                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_RADDR_DDR, kFLEXSPI_8PAD, 0x18),
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 13] =
-                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_CADDR_DDR, kFLEXSPI_8PAD, 0x10, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00),
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 14] =
-                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x30, kFLEXSPI_Command_STOP, kFLEXSPI_1PAD, 0x00),
-
-                    /* 10 program page with word program command sequence */
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_PAGEPROGRAM] =
-                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x20, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00),
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_PAGEPROGRAM + 1] = FLEXSPI_LUT_SEQ(
-                        kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xAA), // ADDR 0x555
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_PAGEPROGRAM + 2] =
-                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x05),
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_PAGEPROGRAM + 3] = FLEXSPI_LUT_SEQ(
-                        kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xA0), // DATA 0xA0
-                    // +1
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_PAGEPROGRAM + 4] =
-                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x20, kFLEXSPI_Command_RADDR_DDR, kFLEXSPI_8PAD, 0x18),
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_PAGEPROGRAM + 5] = FLEXSPI_LUT_SEQ(
-                        kFLEXSPI_Command_CADDR_DDR, kFLEXSPI_8PAD, 0x10, kFLEXSPI_Command_WRITE_DDR, kFLEXSPI_8PAD, 0x80),
-
-                    /* 12 Erase chip */
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP] =
-                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00),
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 1] =
-                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xAA),
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 2] =
-                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x05),
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 3] =
-                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x80),
-                    // +1
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 4] =
-                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00),
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 5] =
-                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xAA),
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 6] =
-                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x05),
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 7] =
-                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xAA),
-                    // +2
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 8] =
-                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00),
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 9] =
-                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x55),
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 10] =
-                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x02),
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 11] =
-                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x55),
-                    // +3
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 12] =
-                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00),
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 13] =
-                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xAA),
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 14] =
-                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x05),
-                    [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 15] =
-                        FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x10),
-                },
-        },
-    .pageSize           = 512u,
-    .sectorSize         = 256u * 1024u,
-    .blockSize          = 256u * 1024u,
-    .isUniformBlockSize = true,
-};
-
-#endif /* XIP_BOOT_HEADER_ENABLE */
diff --git a/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.h b/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.h
index 4534caa296081..ab8a80a3a40b3 100644
--- a/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.h
+++ b/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.h
@@ -5,8 +5,6 @@
 #define MICROPY_HW_LED1_PIN (pin_GPIO_AD_B0_09)
 #define MICROPY_HW_LED_ON(pin) (mp_hal_pin_low(pin))
 #define MICROPY_HW_LED_OFF(pin) (mp_hal_pin_high(pin))
-#define BOARD_FLASH_CONFIG_HEADER_H "evkmimxrt1064_flexspi_nor_config.h"
-#define BOARD_FLASH_OPS_HEADER_H "hal/flexspi_hyper_flash.h"
 
 #define MICROPY_HW_NUM_PIN_IRQS (4 * 32 + 3)
 
@@ -36,10 +34,10 @@
     { IOMUXC_GPIO_SD_B0_02_LPSPI1_SDO }, { IOMUXC_GPIO_SD_B0_03_LPSPI1_SDI },
 
 #define DMA_REQ_SRC_RX { 0, kDmaRequestMuxLPSPI1Rx, kDmaRequestMuxLPSPI2Rx, \
-                            kDmaRequestMuxLPSPI3Rx, kDmaRequestMuxLPSPI4Rx }
+                         kDmaRequestMuxLPSPI3Rx, kDmaRequestMuxLPSPI4Rx }
 
 #define DMA_REQ_SRC_TX { 0, kDmaRequestMuxLPSPI1Tx, kDmaRequestMuxLPSPI2Tx, \
-                            kDmaRequestMuxLPSPI3Tx, kDmaRequestMuxLPSPI4Tx } 
+                         kDmaRequestMuxLPSPI3Tx, kDmaRequestMuxLPSPI4Tx }
 
 // Define the mapping hardware I2C # to logical I2C #
 // SDA/SCL  HW-I2C    Logical I2C
@@ -58,9 +56,9 @@
     { \
         .cmd = {GPIO_SD_B0_00_USDHC1_CMD}, \
         .clk = { GPIO_SD_B0_01_USDHC1_CLK }, \
-        .cd_b = { GPIO_B1_12_USDHC1_CD_B },\
-        .data0 = { GPIO_SD_B0_02_USDHC1_DATA0 },\
-        .data1 = { GPIO_SD_B0_03_USDHC1_DATA1 },\
-        .data2 = { GPIO_SD_B0_04_USDHC1_DATA2 },\
-        .data3 = { GPIO_SD_B0_05_USDHC1_DATA3 },\
+        .cd_b = { GPIO_B1_12_USDHC1_CD_B }, \
+        .data0 = { GPIO_SD_B0_02_USDHC1_DATA0 }, \
+        .data1 = { GPIO_SD_B0_03_USDHC1_DATA1 }, \
+        .data2 = { GPIO_SD_B0_04_USDHC1_DATA2 }, \
+        .data3 = { GPIO_SD_B0_05_USDHC1_DATA3 }, \
     }
diff --git a/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.mk b/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.mk
index fe3c442faad47..19655da6168fe 100644
--- a/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.mk
+++ b/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.mk
@@ -3,13 +3,10 @@ MCU_VARIANT = MIMXRT1064DVL6A
 
 MICROPY_FLOAT_IMPL = double
 MICROPY_PY_MACHINE_SDCARD = 1
+BOARD_FLASH_TYPE ?= hyperflash
+BOARD_FLASH_SIZE ?= 0x4000000  # 64MB
 
 JLINK_PATH ?= /media/RT1064-EVK/
 
-CFLAGS += -DBOARD_FLASH_SIZE=0x400000
-
 deploy: $(BUILD)/firmware.bin
 	cp $< $(JLINK_PATH)
-
-SRC_C += \
-	hal/flexspi_hyper_flash.c
diff --git a/ports/mimxrt/boards/MIMXRT1064_EVK/qspi_hyper_flash_config.c b/ports/mimxrt/boards/MIMXRT1064_EVK/qspi_hyper_flash_config.c
new file mode 100644
index 0000000000000..1b3349f911a12
--- /dev/null
+++ b/ports/mimxrt/boards/MIMXRT1064_EVK/qspi_hyper_flash_config.c
@@ -0,0 +1,186 @@
+/*
+ * Copyright 2018 NXP
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#include BOARD_FLASH_CONFIG_HEADER_H
+
+/* Component ID definition, used by tools. */
+#ifndef FSL_COMPONENT_ID
+#define FSL_COMPONENT_ID "platform.drivers.xip_board"
+#endif
+
+/*******************************************************************************
+ * Code
+ ******************************************************************************/
+#if defined(XIP_BOOT_HEADER_ENABLE) && (XIP_BOOT_HEADER_ENABLE == 1)
+#if defined(__CC_ARM) || defined(__ARMCC_VERSION) || defined(__GNUC__)
+__attribute__((section(".boot_hdr.conf")))
+#elif defined(__ICCARM__)
+#pragma location = ".boot_hdr.conf"
+#endif
+
+const flexspi_nor_config_t qspiflash_config = {
+    .memConfig =
+    {
+        .tag = FLEXSPI_CFG_BLK_TAG,
+        .version = FLEXSPI_CFG_BLK_VERSION,
+        .readSampleClkSrc = kFlexSPIReadSampleClk_ExternalInputFromDqsPad,
+        .csHoldTime = 3u,
+        .csSetupTime = 3u,
+        .columnAddressWidth = 3u,
+        // Enable DDR mode, Wordaddressable, Safe configuration, Differential clock
+        .controllerMiscOption =
+            (1u << kFlexSpiMiscOffset_DdrModeEnable) | (1u << kFlexSpiMiscOffset_WordAddressableEnable) |
+            (1u << kFlexSpiMiscOffset_SafeConfigFreqEnable) | (1u << kFlexSpiMiscOffset_DiffClkEnable),
+        .sflashPadType = kSerialFlash_8Pads,
+        .serialClkFreq = kFlexSpiSerialClk_133MHz,
+        .sflashA1Size = BOARD_FLASH_SIZE,
+        .dataValidTime = {16u, 16u},
+        .lookupTable =
+        {
+            /* 0 Read Data */
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_READDATA] =
+                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xA0, kFLEXSPI_Command_RADDR_DDR, kFLEXSPI_8PAD, 0x18),
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_READDATA + 1] = FLEXSPI_LUT_SEQ(
+                kFLEXSPI_Command_CADDR_DDR, kFLEXSPI_8PAD, 0x10, kFLEXSPI_Command_READ_DDR, kFLEXSPI_8PAD, 0x04),
+
+            /* 1 Write Data */
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEDATA] =
+                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x20, kFLEXSPI_Command_RADDR_DDR, kFLEXSPI_8PAD, 0x18),
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEDATA + 1] = FLEXSPI_LUT_SEQ(
+                kFLEXSPI_Command_CADDR_DDR, kFLEXSPI_8PAD, 0x10, kFLEXSPI_Command_WRITE_DDR, kFLEXSPI_8PAD, 0x02),
+
+            /* 2 Read Status */
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_READSTATUS] =
+                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00),
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_READSTATUS + 1] = FLEXSPI_LUT_SEQ(
+                kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xAA),         // ADDR 0x555
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_READSTATUS + 2] =
+                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x05),
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_READSTATUS + 3] = FLEXSPI_LUT_SEQ(
+                kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x70),         // DATA 0x70
+            // +1
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_READSTATUS + 4] =
+                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xA0, kFLEXSPI_Command_RADDR_DDR, kFLEXSPI_8PAD, 0x18),
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_READSTATUS + 5] = FLEXSPI_LUT_SEQ(
+                kFLEXSPI_Command_CADDR_DDR, kFLEXSPI_8PAD, 0x10, kFLEXSPI_Command_DUMMY_RWDS_DDR, kFLEXSPI_8PAD, 0x0B),
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_READSTATUS + 6] =
+                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_READ_DDR, kFLEXSPI_8PAD, 0x04, kFLEXSPI_Command_STOP, kFLEXSPI_1PAD, 0x0),
+
+            /* 4 Write Enable */
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEENABLE] =
+                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x20, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00),
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEENABLE + 1] = FLEXSPI_LUT_SEQ(
+                kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xAA),         // ADDR 0x555
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEENABLE + 2] =
+                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x05),
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEENABLE + 3] = FLEXSPI_LUT_SEQ(
+                kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xAA),         // DATA 0xAA
+            // +1
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEENABLE + 4] =
+                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x20, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00),
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEENABLE + 5] =
+                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x55),
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEENABLE + 6] =
+                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x02),
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEENABLE + 7] =
+                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x55),
+
+            /* 6 Erase Sector  */
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR] =
+                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00),
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 1] = FLEXSPI_LUT_SEQ(
+                kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xAA),         // ADDR 0x555
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 2] =
+                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x05),
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 3] = FLEXSPI_LUT_SEQ(
+                kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x80),         // DATA 0x80
+            // +1
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 4] =
+                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00),
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 5] =
+                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xAA),
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 6] =
+                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x05),
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 7] = FLEXSPI_LUT_SEQ(
+                kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xAA),         // ADDR 0x555
+            // +2
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 8] =
+                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00),
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 9] =
+                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x55),
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 10] =
+                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x02),
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 11] =
+                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x55),
+            // +3
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 12] =
+                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_RADDR_DDR, kFLEXSPI_8PAD, 0x18),
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 13] =
+                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_CADDR_DDR, kFLEXSPI_8PAD, 0x10, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00),
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 14] =
+                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x30, kFLEXSPI_Command_STOP, kFLEXSPI_1PAD, 0x00),
+
+            /* 10 program page with word program command sequence */
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_PAGEPROGRAM] =
+                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x20, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00),
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_PAGEPROGRAM + 1] = FLEXSPI_LUT_SEQ(
+                kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xAA),         // ADDR 0x555
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_PAGEPROGRAM + 2] =
+                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x05),
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_PAGEPROGRAM + 3] = FLEXSPI_LUT_SEQ(
+                kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xA0),         // DATA 0xA0
+            // +1
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_PAGEPROGRAM + 4] =
+                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x20, kFLEXSPI_Command_RADDR_DDR, kFLEXSPI_8PAD, 0x18),
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_PAGEPROGRAM + 5] = FLEXSPI_LUT_SEQ(
+                kFLEXSPI_Command_CADDR_DDR, kFLEXSPI_8PAD, 0x10, kFLEXSPI_Command_WRITE_DDR, kFLEXSPI_8PAD, 0x80),
+
+            /* 12 Erase chip */
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP] =
+                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00),
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 1] =
+                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xAA),
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 2] =
+                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x05),
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 3] =
+                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x80),
+            // +1
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 4] =
+                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00),
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 5] =
+                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xAA),
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 6] =
+                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x05),
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 7] =
+                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xAA),
+            // +2
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 8] =
+                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00),
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 9] =
+                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x55),
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 10] =
+                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x02),
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 11] =
+                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x55),
+            // +3
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 12] =
+                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00),
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 13] =
+                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xAA),
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 14] =
+                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x05),
+            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 15] =
+                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x10),
+        },
+    },
+    .pageSize = 512u,
+    .sectorSize = 256u * 1024u,
+    .blockSize = 256u * 1024u,
+    .isUniformBlockSize = true,
+};
+
+#endif /* XIP_BOOT_HEADER_ENABLE */
diff --git a/ports/mimxrt/boards/MIMXRT1064_EVK/qspi_nor_flash_config.c b/ports/mimxrt/boards/MIMXRT1064_EVK/qspi_nor_flash_config.c
new file mode 100644
index 0000000000000..290c6bc152a9e
--- /dev/null
+++ b/ports/mimxrt/boards/MIMXRT1064_EVK/qspi_nor_flash_config.c
@@ -0,0 +1,129 @@
+/*
+ * Copyright 2018 NXP
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#include BOARD_FLASH_CONFIG_HEADER_H
+
+/* Component ID definition, used by tools. */
+#ifndef FSL_COMPONENT_ID
+#define FSL_COMPONENT_ID "platform.drivers.xip_board"
+#endif
+
+/*******************************************************************************
+ * Code
+ ******************************************************************************/
+#if defined(XIP_BOOT_HEADER_ENABLE) && (XIP_BOOT_HEADER_ENABLE == 1)
+#if defined(__CC_ARM) || defined(__ARMCC_VERSION) || defined(__GNUC__)
+__attribute__((section(".boot_hdr.conf")))
+#elif defined(__ICCARM__)
+#pragma location = ".boot_hdr.conf"
+#endif
+
+const flexspi_nor_config_t qspiflash_config = {
+    .memConfig =
+    {
+        .tag = FLEXSPI_CFG_BLK_TAG,
+        .version = FLEXSPI_CFG_BLK_VERSION,
+        .readSampleClkSrc = kFlexSPIReadSampleClk_ExternalInputFromDqsPad,
+        .csHoldTime = 3u,
+        .csSetupTime = 3u,
+        .columnAddressWidth = 3u,
+        // Enable DDR mode, Wordaddassable, Safe configuration, Differential clock
+        .controllerMiscOption =
+            (1u << kFlexSpiMiscOffset_DdrModeEnable) | (1u << kFlexSpiMiscOffset_WordAddressableEnable) |
+            (1u << kFlexSpiMiscOffset_SafeConfigFreqEnable) | (1u << kFlexSpiMiscOffset_DiffClkEnable),
+        .sflashPadType = kSerialFlash_8Pads,
+        .serialClkFreq = kFlexSpiSerialClk_133MHz,
+        .sflashA1Size = BOARD_FLASH_SIZE,
+        .dataValidTime = {16u, 16u},
+        .lookupTable =
+        {
+            // 0 Read LUTs 0 -> 0
+            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0xEB, RADDR_SDR, FLEXSPI_4PAD, 0x18),
+            FLEXSPI_LUT_SEQ(DUMMY_SDR, FLEXSPI_4PAD, 0x06, READ_SDR, FLEXSPI_4PAD, 0x04),
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+
+            // 1 Read status register -> 1
+            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x05, READ_SDR, FLEXSPI_1PAD, 0x01),
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+
+            // 2 Fast read quad mode - SDR
+            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x6B, RADDR_SDR, FLEXSPI_1PAD, 0x18),
+            FLEXSPI_LUT_SEQ(DUMMY_SDR, FLEXSPI_4PAD, 0x08, READ_SDR, FLEXSPI_4PAD, 0x04),
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+
+            // 3 Write Enable -> 3
+            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x06, STOP, FLEXSPI_1PAD, 0),
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+
+            // 4 Read extend parameters
+            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x81, READ_SDR, FLEXSPI_1PAD, 0x04),
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+
+            // 5 Erase Sector -> 5
+            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x20, RADDR_SDR, FLEXSPI_1PAD, 24),
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+
+            // 6 Write Status Reg
+            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x01, WRITE_SDR, FLEXSPI_1PAD, 0x04),
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+
+            // 7 Page Program - quad mode (-> 9)
+            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x32, RADDR_SDR, FLEXSPI_1PAD, 0x18),
+            FLEXSPI_LUT_SEQ(WRITE_SDR, FLEXSPI_4PAD, 0x04, STOP, FLEXSPI_1PAD, 0),
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+
+            // 8 Read ID
+            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x90, DUMMY_SDR, FLEXSPI_1PAD, 24),
+            FLEXSPI_LUT_SEQ(READ_SDR, FLEXSPI_1PAD, 0x00, 0, 0, 0),
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+
+            // 9 Page Program - single mode -> 9
+            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x02, RADDR_SDR, FLEXSPI_1PAD, 24),
+            FLEXSPI_LUT_SEQ(WRITE_SDR, FLEXSPI_1PAD, 0, 0, 0, 0),
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+
+            // 10 Enter QPI mode
+            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x35, STOP, FLEXSPI_1PAD, 0),
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+
+            // 11 Erase Chip
+            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x60, STOP, FLEXSPI_1PAD, 0),
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+
+            // 12 Exit QPI mode
+            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_4PAD, 0xF5, STOP, FLEXSPI_1PAD, 0),
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+        },
+    },
+    .pageSize = 512u,
+    .sectorSize = 256u * 1024u,
+    .blockSize = 256u * 1024u,
+    .isUniformBlockSize = true,
+};
+
+#endif /* XIP_BOOT_HEADER_ENABLE */
diff --git a/ports/mimxrt/boards/TEENSY40/TEENSY40.ld b/ports/mimxrt/boards/TEENSY40/TEENSY40.ld
deleted file mode 100644
index a3b696db661a3..0000000000000
--- a/ports/mimxrt/boards/TEENSY40/TEENSY40.ld
+++ /dev/null
@@ -1,2 +0,0 @@
-flash_size = 2M;
-reserved_size = 4K;
\ No newline at end of file
diff --git a/ports/mimxrt/boards/TEENSY40/TEENSY40_flexspi_nor_config.h b/ports/mimxrt/boards/TEENSY40/TEENSY40_flexspi_nor_config.h
new file mode 100644
index 0000000000000..b06def76c0bb0
--- /dev/null
+++ b/ports/mimxrt/boards/TEENSY40/TEENSY40_flexspi_nor_config.h
@@ -0,0 +1,259 @@
+/*
+ * Copyright 2018 NXP
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+// Based on tinyusb/hw/bsp/teensy_40/teensy40_flexspi_nor_config.h
+
+#ifndef __TEENSY40_FLEXSPI_NOR_CONFIG__
+#define __TEENSY40_FLEXSPI_NOR_CONFIG__
+
+#include <stdint.h>
+#include <stdbool.h>
+#include "fsl_common.h"
+
+/*! @name Driver version */
+/*@{*/
+/*! @brief XIP_BOARD driver version 2.0.0. */
+#define FSL_XIP_BOARD_DRIVER_VERSION (MAKE_VERSION(2, 0, 0))
+/*@}*/
+
+/* FLEXSPI memory config block related defintions */
+#define FLEXSPI_CFG_BLK_TAG (0x42464346UL)     // ascii "FCFB" Big Endian
+#define FLEXSPI_CFG_BLK_VERSION (0x56010400UL) // V1.4.0
+#define FLEXSPI_CFG_BLK_SIZE (512)
+
+/* FLEXSPI Feature related definitions */
+#define FLEXSPI_FEATURE_HAS_PARALLEL_MODE 1
+
+/* Lookup table related definitions */
+#define CMD_INDEX_READ 0
+#define CMD_INDEX_READSTATUS 1
+#define CMD_INDEX_WRITEENABLE 2
+#define CMD_INDEX_WRITE 4
+
+#define CMD_LUT_SEQ_IDX_READ 0
+#define CMD_LUT_SEQ_IDX_READSTATUS 1
+#define CMD_LUT_SEQ_IDX_WRITEENABLE 3
+#define CMD_LUT_SEQ_IDX_ERASE 5
+#define CMD_LUT_SEQ_IDX_WRITE 9
+
+#define CMD_SDR 0x01
+#define CMD_DDR 0x21
+#define RADDR_SDR 0x02
+#define RADDR_DDR 0x22
+#define CADDR_SDR 0x03
+#define CADDR_DDR 0x23
+#define MODE1_SDR 0x04
+#define MODE1_DDR 0x24
+#define MODE2_SDR 0x05
+#define MODE2_DDR 0x25
+#define MODE4_SDR 0x06
+#define MODE4_DDR 0x26
+#define MODE8_SDR 0x07
+#define MODE8_DDR 0x27
+#define WRITE_SDR 0x08
+#define WRITE_DDR 0x28
+#define READ_SDR 0x09
+#define READ_DDR 0x29
+#define LEARN_SDR 0x0A
+#define LEARN_DDR 0x2A
+#define DATSZ_SDR 0x0B
+#define DATSZ_DDR 0x2B
+#define DUMMY_SDR 0x0C
+#define DUMMY_DDR 0x2C
+#define DUMMY_RWDS_SDR 0x0D
+#define DUMMY_RWDS_DDR 0x2D
+#define JMP_ON_CS 0x1F
+#define STOP 0
+
+#define FLEXSPI_1PAD 0
+#define FLEXSPI_2PAD 1
+#define FLEXSPI_4PAD 2
+#define FLEXSPI_8PAD 3
+
+#define FLEXSPI_LUT_SEQ(cmd0, pad0, op0, cmd1, pad1, op1)                                                              \
+    (FLEXSPI_LUT_OPERAND0(op0) | FLEXSPI_LUT_NUM_PADS0(pad0) | FLEXSPI_LUT_OPCODE0(cmd0) | FLEXSPI_LUT_OPERAND1(op1) | \
+    FLEXSPI_LUT_NUM_PADS1(pad1) | FLEXSPI_LUT_OPCODE1(cmd1))
+
+// !@brief Definitions for FlexSPI Serial Clock Frequency
+typedef enum _FlexSpiSerialClockFreq
+{
+    kFlexSpiSerialClk_30MHz  = 1,
+    kFlexSpiSerialClk_50MHz  = 2,
+    kFlexSpiSerialClk_60MHz  = 3,
+    kFlexSpiSerialClk_75MHz  = 4,
+    kFlexSpiSerialClk_80MHz  = 5,
+    kFlexSpiSerialClk_100MHz = 6,
+    kFlexSpiSerialClk_120MHz = 7,
+    kFlexSpiSerialClk_133MHz = 8,
+    kFlexSpiSerialClk_166MHz = 9,
+} flexspi_serial_clk_freq_t;
+
+// !@brief FlexSPI clock configuration type
+enum
+{
+    kFlexSpiClk_SDR, // !< Clock configure for SDR mode
+    kFlexSpiClk_DDR, // !< Clock configurat for DDR mode
+};
+
+// !@brief FlexSPI Read Sample Clock Source definition
+typedef enum _FlashReadSampleClkSource
+{
+    kFlexSPIReadSampleClk_LoopbackInternally      = 0,
+    kFlexSPIReadSampleClk_LoopbackFromDqsPad      = 1,
+    kFlexSPIReadSampleClk_LoopbackFromSckPad      = 2,
+    kFlexSPIReadSampleClk_ExternalInputFromDqsPad = 3,
+} flexspi_read_sample_clk_t;
+
+// !@brief Misc feature bit definitions
+enum
+{
+    kFlexSpiMiscOffset_DiffClkEnable            = 0, // !< Bit for Differential clock enable
+    kFlexSpiMiscOffset_Ck2Enable                = 1, // !< Bit for CK2 enable
+    kFlexSpiMiscOffset_ParallelEnable           = 2, // !< Bit for Parallel mode enable
+    kFlexSpiMiscOffset_WordAddressableEnable    = 3, // !< Bit for Word Addressable enable
+    kFlexSpiMiscOffset_SafeConfigFreqEnable     = 4, // !< Bit for Safe Configuration Frequency enable
+    kFlexSpiMiscOffset_PadSettingOverrideEnable = 5, // !< Bit for Pad setting override enable
+    kFlexSpiMiscOffset_DdrModeEnable            = 6, // !< Bit for DDR clock confiuration indication.
+};
+
+// !@brief Flash Type Definition
+enum
+{
+    kFlexSpiDeviceType_SerialNOR    = 1,    // !< Flash devices are Serial NOR
+    kFlexSpiDeviceType_SerialNAND   = 2,    // !< Flash devices are Serial NAND
+    kFlexSpiDeviceType_SerialRAM    = 3,    // !< Flash devices are Serial RAM/HyperFLASH
+    kFlexSpiDeviceType_MCP_NOR_NAND = 0x12, // !< Flash device is MCP device, A1 is Serial NOR, A2 is Serial NAND
+    kFlexSpiDeviceType_MCP_NOR_RAM  = 0x13, // !< Flash deivce is MCP device, A1 is Serial NOR, A2 is Serial RAMs
+};
+
+// !@brief Flash Pad Definitions
+enum
+{
+    kSerialFlash_1Pad  = 1,
+    kSerialFlash_2Pads = 2,
+    kSerialFlash_4Pads = 4,
+    kSerialFlash_8Pads = 8,
+};
+
+// !@brief FlexSPI LUT Sequence structure
+typedef struct _lut_sequence
+{
+    uint8_t seqNum; // !< Sequence Number, valid number: 1-16
+    uint8_t seqId;  // !< Sequence Index, valid number: 0-15
+    uint16_t reserved;
+} flexspi_lut_seq_t;
+
+// !@brief Flash Configuration Command Type
+enum
+{
+    kDeviceConfigCmdType_Generic,    // !< Generic command, for example: configure dummy cycles, drive strength, etc
+    kDeviceConfigCmdType_QuadEnable, // !< Quad Enable command
+    kDeviceConfigCmdType_Spi2Xpi,    // !< Switch from SPI to DPI/QPI/OPI mode
+    kDeviceConfigCmdType_Xpi2Spi,    // !< Switch from DPI/QPI/OPI to SPI mode
+    kDeviceConfigCmdType_Spi2NoCmd,  // !< Switch to 0-4-4/0-8-8 mode
+    kDeviceConfigCmdType_Reset,      // !< Reset device command
+};
+
+// !@brief FlexSPI Memory Configuration Block
+typedef struct _FlexSPIConfig
+{
+    uint32_t tag;               // !< [0x000-0x003] Tag, fixed value 0x42464346UL
+    uint32_t version;           // !< [0x004-0x007] Version,[31:24] -'V', [23:16] - Major, [15:8] - Minor, [7:0] - bugfix
+    uint32_t reserved0;         // !< [0x008-0x00b] Reserved for future use
+    uint8_t readSampleClkSrc;   // !< [0x00c-0x00c] Read Sample Clock Source, valid value: 0/1/3
+    uint8_t csHoldTime;         // !< [0x00d-0x00d] CS hold time, default value: 3
+    uint8_t csSetupTime;        // !< [0x00e-0x00e] CS setup time, default value: 3
+    uint8_t columnAddressWidth; // !< [0x00f-0x00f] Column Address with, for HyperBus protocol, it is fixed to 3, For
+    // ! Serial NAND, need to refer to datasheet
+    uint8_t deviceModeCfgEnable; // !< [0x010-0x010] Device Mode Configure enable flag, 1 - Enable, 0 - Disable
+    uint8_t deviceModeType; // !< [0x011-0x011] Specify the configuration command type:Quad Enable, DPI/QPI/OPI switch,
+    // ! Generic configuration, etc.
+    uint16_t waitTimeCfgCommands; // !< [0x012-0x013] Wait time for all configuration commands, unit: 100us, Used for
+    // ! DPI/QPI/OPI switch or reset command
+    flexspi_lut_seq_t deviceModeSeq; // !< [0x014-0x017] Device mode sequence info, [7:0] - LUT sequence id, [15:8] - LUt
+    // ! sequence number, [31:16] Reserved
+    uint32_t deviceModeArg;    // !< [0x018-0x01b] Argument/Parameter for device configuration
+    uint8_t configCmdEnable;   // !< [0x01c-0x01c] Configure command Enable Flag, 1 - Enable, 0 - Disable
+    uint8_t configModeType[3]; // !< [0x01d-0x01f] Configure Mode Type, similar as deviceModeTpe
+    flexspi_lut_seq_t
+        configCmdSeqs[3]; // !< [0x020-0x02b] Sequence info for Device Configuration command, similar as deviceModeSeq
+    uint32_t reserved1;   // !< [0x02c-0x02f] Reserved for future use
+    uint32_t configCmdArgs[3];     // !< [0x030-0x03b] Arguments/Parameters for device Configuration commands
+    uint32_t reserved2;            // !< [0x03c-0x03f] Reserved for future use
+    uint32_t controllerMiscOption; // !< [0x040-0x043] Controller Misc Options, see Misc feature bit definitions for more
+    // ! details
+    uint8_t deviceType;    // !< [0x044-0x044] Device Type:  See Flash Type Definition for more details
+    uint8_t sflashPadType; // !< [0x045-0x045] Serial Flash Pad Type: 1 - Single, 2 - Dual, 4 - Quad, 8 - Octal
+    uint8_t serialClkFreq; // !< [0x046-0x046] Serial Flash Frequencey, device specific definitions, See System Boot
+    // ! Chapter for more details
+    uint8_t lutCustomSeqEnable; // !< [0x047-0x047] LUT customization Enable, it is required if the program/erase cannot
+    // ! be done using 1 LUT sequence, currently, only applicable to HyperFLASH
+    uint32_t reserved3[2];           // !< [0x048-0x04f] Reserved for future use
+    uint32_t sflashA1Size;           // !< [0x050-0x053] Size of Flash connected to A1
+    uint32_t sflashA2Size;           // !< [0x054-0x057] Size of Flash connected to A2
+    uint32_t sflashB1Size;           // !< [0x058-0x05b] Size of Flash connected to B1
+    uint32_t sflashB2Size;           // !< [0x05c-0x05f] Size of Flash connected to B2
+    uint32_t csPadSettingOverride;   // !< [0x060-0x063] CS pad setting override value
+    uint32_t sclkPadSettingOverride; // !< [0x064-0x067] SCK pad setting override value
+    uint32_t dataPadSettingOverride; // !< [0x068-0x06b] data pad setting override value
+    uint32_t dqsPadSettingOverride;  // !< [0x06c-0x06f] DQS pad setting override value
+    uint32_t timeoutInMs;            // !< [0x070-0x073] Timeout threshold for read status command
+    uint32_t commandInterval;        // !< [0x074-0x077] CS deselect interval between two commands
+    uint16_t dataValidTime[2]; // !< [0x078-0x07b] CLK edge to data valid time for PORT A and PORT B, in terms of 0.1ns
+    uint16_t busyOffset;       // !< [0x07c-0x07d] Busy offset, valid value: 0-31
+    uint16_t busyBitPolarity;  // !< [0x07e-0x07f] Busy flag polarity, 0 - busy flag is 1 when flash device is busy, 1 -
+    // ! busy flag is 0 when flash device is busy
+    uint32_t lookupTable[64];           // !< [0x080-0x17f] Lookup table holds Flash command sequences
+    flexspi_lut_seq_t lutCustomSeq[12]; // !< [0x180-0x1af] Customizable LUT Sequences
+    uint32_t reserved4[4];              // !< [0x1b0-0x1bf] Reserved for future use
+} flexspi_mem_config_t;
+
+/*  */
+#define NOR_CMD_LUT_SEQ_IDX_READ_NORMAL 0
+#define NOR_CMD_LUT_SEQ_IDX_READSTATUSREG 1
+#define NOR_CMD_LUT_SEQ_IDX_READ_FAST_QUAD 2
+#define NOR_CMD_LUT_SEQ_IDX_WRITEENABLE 3
+#define NOR_CMD_LUT_SEQ_IDX_READSTATUS_XPI 4
+#define NOR_CMD_LUT_SEQ_IDX_ERASESECTOR 5
+#define NOR_CMD_LUT_SEQ_IDX_WRITESTATUSREG 6
+#define NOR_CMD_LUT_SEQ_IDX_PAGEPROGRAM_QUAD 7
+#define NOR_CMD_LUT_SEQ_IDX_READID 8
+#define NOR_CMD_LUT_SEQ_IDX_PAGEPROGRAM 9
+#define NOR_CMD_LUT_SEQ_IDX_ENTERQPI 10
+#define NOR_CMD_LUT_SEQ_IDX_CHIPERASE 11
+#define NOR_CMD_LUT_SEQ_IDX_EXITQPI 12
+
+/*
+ *  Serial NOR configuration block
+ */
+typedef struct _flexspi_nor_config
+{
+    flexspi_mem_config_t memConfig; // !< Common memory configuration info via FlexSPI
+    uint32_t pageSize;              // !< Page size of Serial NOR
+    uint32_t sectorSize;            // !< Sector size of Serial NOR
+    uint8_t ipcmdSerialClkFreq;     // !< Clock frequency for IP command
+    uint8_t isUniformBlockSize;     // !< Sector/Block size is the same
+    uint8_t reserved0[2];           // !< Reserved for future use
+    uint8_t serialNorType;          // !< Serial NOR Flash type: 0/1/2/3
+    uint8_t needExitNoCmdMode;      // !< Need to exit NoCmd mode before other IP command
+    uint8_t halfClkForNonReadCmd;   // !< Half the Serial Clock for non-read command: true/false
+    uint8_t needRestoreNoCmdMode;   // !< Need to Restore NoCmd mode after IP commmand execution
+    uint32_t blockSize;             // !< Block size
+    uint32_t reserve2[11];          // !< Reserved for future use
+} flexspi_nor_config_t;
+
+#define FLASH_BUSY_STATUS_POL 0
+#define FLASH_BUSY_STATUS_OFFSET 0
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* __EVKMIMXRT1060_FLEXSPI_NOR_CONFIG__ */
diff --git a/ports/mimxrt/boards/TEENSY40/clock_config.h b/ports/mimxrt/boards/TEENSY40/clock_config.h
new file mode 100644
index 0000000000000..0822024847717
--- /dev/null
+++ b/ports/mimxrt/boards/TEENSY40/clock_config.h
@@ -0,0 +1,122 @@
+/*
+ * Copyright 2018-2019 NXP
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#ifndef _CLOCK_CONFIG_H_
+#define _CLOCK_CONFIG_H_
+
+#include "fsl_common.h"
+
+/*******************************************************************************
+ * Definitions
+ ******************************************************************************/
+#define BOARD_XTAL0_CLK_HZ 24000000U /*!< Board xtal0 frequency in Hz */
+
+#define BOARD_XTAL32K_CLK_HZ 32768U /*!< Board xtal32k frequency in Hz */
+/*******************************************************************************
+ ************************ BOARD_InitBootClocks function ************************
+ ******************************************************************************/
+
+#if defined(__cplusplus)
+extern "C" {
+#endif /* __cplusplus*/
+
+/*!
+ * @brief This function executes default configuration of clocks.
+ *
+ */
+void BOARD_InitBootClocks(void);
+
+#if defined(__cplusplus)
+}
+#endif /* __cplusplus*/
+
+/*******************************************************************************
+ ********************** Configuration BOARD_BootClockRUN ***********************
+ ******************************************************************************/
+/*******************************************************************************
+ * Definitions for BOARD_BootClockRUN configuration
+ ******************************************************************************/
+#define BOARD_BOOTCLOCKRUN_CORE_CLOCK 600000000U /*!< Core clock frequency: 600000000Hz */
+
+/* Clock outputs (values are in Hz): */
+#define BOARD_BOOTCLOCKRUN_AHB_CLK_ROOT 600000000UL
+#define BOARD_BOOTCLOCKRUN_CAN_CLK_ROOT 40000000UL
+#define BOARD_BOOTCLOCKRUN_CKIL_SYNC_CLK_ROOT 32768UL
+#define BOARD_BOOTCLOCKRUN_CLKO1_CLK 0UL
+#define BOARD_BOOTCLOCKRUN_CLKO2_CLK 0UL
+#define BOARD_BOOTCLOCKRUN_CLK_1M 1000000UL
+#define BOARD_BOOTCLOCKRUN_CLK_24M 24000000UL
+#define BOARD_BOOTCLOCKRUN_CSI_CLK_ROOT 12000000UL
+#define BOARD_BOOTCLOCKRUN_ENET1_TX_CLK 2400000UL
+#define BOARD_BOOTCLOCKRUN_ENET2_125M_CLK 1200000UL
+#define BOARD_BOOTCLOCKRUN_ENET2_TX_CLK 1200000UL
+#define BOARD_BOOTCLOCKRUN_ENET_125M_CLK 2400000UL
+#define BOARD_BOOTCLOCKRUN_ENET_25M_REF_CLK 1200000UL
+#define BOARD_BOOTCLOCKRUN_FLEXIO1_CLK_ROOT 30000000UL
+#define BOARD_BOOTCLOCKRUN_FLEXIO2_CLK_ROOT 30000000UL
+#define BOARD_BOOTCLOCKRUN_FLEXSPI2_CLK_ROOT 130909090UL
+#define BOARD_BOOTCLOCKRUN_FLEXSPI_CLK_ROOT 130909090UL
+#define BOARD_BOOTCLOCKRUN_GPT1_IPG_CLK_HIGHFREQ 75000000UL
+#define BOARD_BOOTCLOCKRUN_GPT2_IPG_CLK_HIGHFREQ 75000000UL
+#define BOARD_BOOTCLOCKRUN_IPG_CLK_ROOT 150000000UL
+#define BOARD_BOOTCLOCKRUN_LCDIF_CLK_ROOT 9642857UL
+#define BOARD_BOOTCLOCKRUN_LPI2C_CLK_ROOT 60000000UL
+#define BOARD_BOOTCLOCKRUN_LPSPI_CLK_ROOT 105600000UL
+#define BOARD_BOOTCLOCKRUN_LVDS1_CLK 1200000000UL
+#define BOARD_BOOTCLOCKRUN_MQS_MCLK 63529411UL
+#define BOARD_BOOTCLOCKRUN_PERCLK_CLK_ROOT 75000000UL
+#define BOARD_BOOTCLOCKRUN_PLL7_MAIN_CLK 24000000UL
+#define BOARD_BOOTCLOCKRUN_SAI1_CLK_ROOT 63529411UL
+#define BOARD_BOOTCLOCKRUN_SAI1_MCLK1 63529411UL
+#define BOARD_BOOTCLOCKRUN_SAI1_MCLK2 63529411UL
+#define BOARD_BOOTCLOCKRUN_SAI1_MCLK3 30000000UL
+#define BOARD_BOOTCLOCKRUN_SAI2_CLK_ROOT 63529411UL
+#define BOARD_BOOTCLOCKRUN_SAI2_MCLK1 63529411UL
+#define BOARD_BOOTCLOCKRUN_SAI2_MCLK2 0UL
+#define BOARD_BOOTCLOCKRUN_SAI2_MCLK3 30000000UL
+#define BOARD_BOOTCLOCKRUN_SAI3_CLK_ROOT 63529411UL
+#define BOARD_BOOTCLOCKRUN_SAI3_MCLK1 63529411UL
+#define BOARD_BOOTCLOCKRUN_SAI3_MCLK2 0UL
+#define BOARD_BOOTCLOCKRUN_SAI3_MCLK3 30000000UL
+#define BOARD_BOOTCLOCKRUN_SEMC_CLK_ROOT 75000000UL
+#define BOARD_BOOTCLOCKRUN_SPDIF0_CLK_ROOT 30000000UL
+#define BOARD_BOOTCLOCKRUN_SPDIF0_EXTCLK_OUT 0UL
+#define BOARD_BOOTCLOCKRUN_TRACE_CLK_ROOT 117333333UL
+#define BOARD_BOOTCLOCKRUN_UART_CLK_ROOT 80000000UL
+#define BOARD_BOOTCLOCKRUN_USBPHY1_CLK 0UL
+#define BOARD_BOOTCLOCKRUN_USBPHY2_CLK 0UL
+#define BOARD_BOOTCLOCKRUN_USDHC1_CLK_ROOT 198000000UL
+#define BOARD_BOOTCLOCKRUN_USDHC2_CLK_ROOT 198000000UL
+
+/*! @brief Arm PLL set for BOARD_BootClockRUN configuration.
+ */
+extern const clock_arm_pll_config_t armPllConfig_BOARD_BootClockRUN;
+/*! @brief Usb1 PLL set for BOARD_BootClockRUN configuration.
+ */
+extern const clock_usb_pll_config_t usb1PllConfig_BOARD_BootClockRUN;
+/*! @brief Sys PLL for BOARD_BootClockRUN configuration.
+ */
+extern const clock_sys_pll_config_t sysPllConfig_BOARD_BootClockRUN;
+
+/*******************************************************************************
+ * API for BOARD_BootClockRUN configuration
+ ******************************************************************************/
+#if defined(__cplusplus)
+extern "C" {
+#endif /* __cplusplus*/
+
+/*!
+ * @brief This function executes configuration of clocks.
+ *
+ */
+void BOARD_BootClockRUN(void);
+
+#if defined(__cplusplus)
+}
+#endif /* __cplusplus*/
+
+#endif /* _CLOCK_CONFIG_H_ */
diff --git a/ports/mimxrt/boards/TEENSY40/flash_config.c b/ports/mimxrt/boards/TEENSY40/flash_config.c
deleted file mode 100644
index 7a63cf825d5f2..0000000000000
--- a/ports/mimxrt/boards/TEENSY40/flash_config.c
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- * Copyright 2018 NXP
- * All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-// Based on tinyusb/hw/bsp/teensy_40/teensy40_flexspi_nor_config.c
-
-#include "teensy40_flexspi_nor_config.h"
-
-/* Component ID definition, used by tools. */
-#ifndef FSL_COMPONENT_ID
-#define FSL_COMPONENT_ID "platform.drivers.xip_board"
-#endif
-
-/*******************************************************************************
- * Code
- ******************************************************************************/
-#if defined(XIP_BOOT_HEADER_ENABLE) && (XIP_BOOT_HEADER_ENABLE == 1)
-#if defined(__CC_ARM) || defined(__ARMCC_VERSION) || defined(__GNUC__)
-__attribute__((section(".boot_hdr.conf")))
-#elif defined(__ICCARM__)
-#pragma location = ".boot_hdr.conf"
-#endif
-
-const flexspi_nor_config_t qspiflash_config = {
-    .memConfig =
-        {
-            .tag              = FLEXSPI_CFG_BLK_TAG,
-            .version          = FLEXSPI_CFG_BLK_VERSION,
-            .readSampleClkSrc = kFlexSPIReadSampleClk_LoopbackFromDqsPad,
-            .csHoldTime       = 3u,
-            .csSetupTime      = 3u,
-
-            .busyOffset = FLASH_BUSY_STATUS_OFFSET,     // Status bit 0 indicates busy.
-            .busyBitPolarity = FLASH_BUSY_STATUS_POL,   // Busy when the bit is 1.
-
-            .deviceModeCfgEnable = 1u,
-            .deviceModeType = kDeviceConfigCmdType_QuadEnable,
-            .deviceModeSeq = {
-                .seqId = 4u,
-                .seqNum = 1u,
-            },
-            .deviceModeArg = 0x0200,
-            .configCmdEnable = 1u,
-            .configModeType[0] = kDeviceConfigCmdType_Generic,
-            .configCmdSeqs[0] = {
-                .seqId = 2u,
-                .seqNum = 1u,
-            },
-            .deviceType = kFlexSpiDeviceType_SerialNOR,
-            // Enable DDR mode, Wordaddassable, Safe configuration, Differential clock
-            .sflashPadType = kSerialFlash_4Pads,
-            .serialClkFreq = kFlexSpiSerialClk_60MHz,
-            .sflashA1Size  = 2u * 1024u * 1024u,
-            .lookupTable =
-                {
-                    // 0 Read LUTs 0 -> 0
-                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0xEB, RADDR_SDR, FLEXSPI_4PAD, 0x18),
-                    FLEXSPI_LUT_SEQ(DUMMY_SDR, FLEXSPI_4PAD, 0x06, READ_SDR, FLEXSPI_4PAD, 0x04),
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-
-                    // 1 Read status register -> 1
-                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x05, READ_SDR, FLEXSPI_1PAD, 0x01),
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-
-                    // 2 Fast read quad mode - SDR
-                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x6B, RADDR_SDR, FLEXSPI_1PAD, 0x18),
-                    FLEXSPI_LUT_SEQ(DUMMY_SDR, FLEXSPI_4PAD, 0x08, READ_SDR, FLEXSPI_4PAD, 0x04),
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-
-                    // 3 Write Enable -> 3
-                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x06, STOP, FLEXSPI_1PAD, 0),
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-
-                    // 4 Read extend parameters
-                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x81, READ_SDR, FLEXSPI_1PAD, 0x04),
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-
-                    // 5 Erase Sector -> 5
-                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x20, RADDR_SDR, FLEXSPI_1PAD, 24),
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-
-                    // 6 Write Status Reg
-                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x01, WRITE_SDR, FLEXSPI_1PAD, 0x04),
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-
-                    // 7 Page Program - quad mode (-> 9)
-                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x32, RADDR_SDR, FLEXSPI_1PAD, 0x18),
-                    FLEXSPI_LUT_SEQ(WRITE_SDR, FLEXSPI_4PAD, 0x04, STOP, FLEXSPI_1PAD, 0),
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-
-                    // 8 Read ID
-                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x90, DUMMY_SDR, FLEXSPI_1PAD, 24),
-                    FLEXSPI_LUT_SEQ(READ_SDR, FLEXSPI_1PAD, 0x00, 0, 0, 0),
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-
-                    // 9 Page Program - single mode -> 9
-                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x02, RADDR_SDR, FLEXSPI_1PAD, 24),
-                    FLEXSPI_LUT_SEQ(WRITE_SDR, FLEXSPI_1PAD, 0, 0, 0, 0),
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-
-                    // 10 Enter QPI mode
-                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x35, STOP, FLEXSPI_1PAD, 0),
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-
-                    // 11 Erase Chip
-                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x60, STOP, FLEXSPI_1PAD, 0),
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-
-                    // 12 Exit QPI mode
-                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_4PAD, 0xF5, STOP, FLEXSPI_1PAD, 0),
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                },
-        },
-    .pageSize           = 256u,
-    .sectorSize         = 4u * 1024u,
-    .ipcmdSerialClkFreq = kFlexSpiSerialClk_30MHz,
-    .blockSize          = 0x00010000,
-    .isUniformBlockSize = false,
-};
-#endif /* XIP_BOOT_HEADER_ENABLE */
diff --git a/ports/mimxrt/boards/TEENSY40/mpconfigboard.h b/ports/mimxrt/boards/TEENSY40/mpconfigboard.h
index 4a69303b56e9c..ae0a234629cca 100644
--- a/ports/mimxrt/boards/TEENSY40/mpconfigboard.h
+++ b/ports/mimxrt/boards/TEENSY40/mpconfigboard.h
@@ -1,14 +1,10 @@
 #define MICROPY_HW_BOARD_NAME "Teensy 4.0"
 #define MICROPY_HW_MCU_NAME   "MIMXRT1062DVJ6A"
 
-#define BOARD_FLASH_SIZE (2 * 1024 * 1024)
-
 // Teensy 4.0 has 1 board LED
 #define MICROPY_HW_LED1_PIN (pin_GPIO_B0_03)
 #define MICROPY_HW_LED_ON(pin) (mp_hal_pin_high(pin))
 #define MICROPY_HW_LED_OFF(pin) (mp_hal_pin_low(pin))
-#define BOARD_FLASH_CONFIG_HEADER_H "teensy40_flexspi_nor_config.h"
-#define BOARD_FLASH_OPS_HEADER_H "hal/flexspi_nor_flash.h"
 
 #define MICROPY_HW_NUM_PIN_IRQS (4 * 32 + 3)
 
@@ -39,10 +35,10 @@
     { IOMUXC_GPIO_B0_02_LPSPI4_SDO }, { IOMUXC_GPIO_B0_01_LPSPI4_SDI },
 
 #define DMA_REQ_SRC_RX { 0, kDmaRequestMuxLPSPI1Rx, kDmaRequestMuxLPSPI2Rx, \
-                            kDmaRequestMuxLPSPI3Rx, kDmaRequestMuxLPSPI4Rx }
+                         kDmaRequestMuxLPSPI3Rx, kDmaRequestMuxLPSPI4Rx }
 
 #define DMA_REQ_SRC_TX { 0, kDmaRequestMuxLPSPI1Tx, kDmaRequestMuxLPSPI2Tx, \
-                            kDmaRequestMuxLPSPI3Tx, kDmaRequestMuxLPSPI4Tx } 
+                         kDmaRequestMuxLPSPI3Tx, kDmaRequestMuxLPSPI4Tx }
 
 // Define mapping hardware I2C # to logical I2C #
 // SDA/SCL  HW-I2C    Logical I2C
@@ -63,9 +59,9 @@
     { \
         .cmd = {GPIO_SD_B0_00_USDHC1_CMD}, \
         .clk = { GPIO_SD_B0_01_USDHC1_CLK }, \
-        .cd_b = { USDHC_DUMMY_PIN },\
-        .data0 = { GPIO_SD_B0_02_USDHC1_DATA0 },\
-        .data1 = { GPIO_SD_B0_03_USDHC1_DATA1 },\
-        .data2 = { GPIO_SD_B0_04_USDHC1_DATA2 },\
-        .data3 = { GPIO_SD_B0_05_USDHC1_DATA3 },\
+        .cd_b = { USDHC_DUMMY_PIN }, \
+        .data0 = { GPIO_SD_B0_02_USDHC1_DATA0 }, \
+        .data1 = { GPIO_SD_B0_03_USDHC1_DATA1 }, \
+        .data2 = { GPIO_SD_B0_04_USDHC1_DATA2 }, \
+        .data3 = { GPIO_SD_B0_05_USDHC1_DATA3 }, \
     }
diff --git a/ports/mimxrt/boards/TEENSY40/mpconfigboard.mk b/ports/mimxrt/boards/TEENSY40/mpconfigboard.mk
index bd70fd0925e08..170f93dcf88bd 100644
--- a/ports/mimxrt/boards/TEENSY40/mpconfigboard.mk
+++ b/ports/mimxrt/boards/TEENSY40/mpconfigboard.mk
@@ -3,9 +3,9 @@ MCU_VARIANT = MIMXRT1062DVJ6A
 
 MICROPY_FLOAT_IMPL = double
 MICROPY_PY_MACHINE_SDCARD = 1
+BOARD_FLASH_TYPE ?= qspi_nor
+BOARD_FLASH_SIZE ?= 0x200000  # 2MB
+BOARD_FLASH_RESERVED ?= 0x1000  # 4KB
 
 deploy: $(BUILD)/firmware.hex
 	teensy_loader_cli --mcu=imxrt1062 -v -w $<
-
-SRC_C += \
-	hal/flexspi_nor_flash.c
diff --git a/ports/mimxrt/boards/TEENSY40/qspi_nor_flash_config.c b/ports/mimxrt/boards/TEENSY40/qspi_nor_flash_config.c
new file mode 100644
index 0000000000000..71d871b7519ed
--- /dev/null
+++ b/ports/mimxrt/boards/TEENSY40/qspi_nor_flash_config.c
@@ -0,0 +1,144 @@
+/*
+ * Copyright 2018 NXP
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+// Based on tinyusb/hw/bsp/teensy_40/teensy40_flexspi_nor_config.c
+
+#include BOARD_FLASH_CONFIG_HEADER_H
+
+/* Component ID definition, used by tools. */
+#ifndef FSL_COMPONENT_ID
+#define FSL_COMPONENT_ID "platform.drivers.xip_board"
+#endif
+
+/*******************************************************************************
+ * Code
+ ******************************************************************************/
+#if defined(XIP_BOOT_HEADER_ENABLE) && (XIP_BOOT_HEADER_ENABLE == 1)
+#if defined(__CC_ARM) || defined(__ARMCC_VERSION) || defined(__GNUC__)
+__attribute__((section(".boot_hdr.conf")))
+#elif defined(__ICCARM__)
+#pragma location = ".boot_hdr.conf"
+#endif
+
+const flexspi_nor_config_t qspiflash_config = {
+    .memConfig =
+    {
+        .tag = FLEXSPI_CFG_BLK_TAG,
+        .version = FLEXSPI_CFG_BLK_VERSION,
+        .readSampleClkSrc = kFlexSPIReadSampleClk_LoopbackFromDqsPad,
+        .csHoldTime = 3u,
+        .csSetupTime = 3u,
+
+        .busyOffset = FLASH_BUSY_STATUS_OFFSET,         // Status bit 0 indicates busy.
+        .busyBitPolarity = FLASH_BUSY_STATUS_POL,       // Busy when the bit is 1.
+
+        .deviceModeCfgEnable = 1u,
+        .deviceModeType = kDeviceConfigCmdType_QuadEnable,
+        .deviceModeSeq = {
+            .seqId = 4u,
+            .seqNum = 1u,
+        },
+        .deviceModeArg = 0x0200,
+        .configCmdEnable = 1u,
+        .configModeType[0] = kDeviceConfigCmdType_Generic,
+        .configCmdSeqs[0] = {
+            .seqId = 2u,
+            .seqNum = 1u,
+        },
+        .deviceType = kFlexSpiDeviceType_SerialNOR,
+        // Enable DDR mode, Wordaddassable, Safe configuration, Differential clock
+        .sflashPadType = kSerialFlash_4Pads,
+        .serialClkFreq = kFlexSpiSerialClk_60MHz,
+        .sflashA1Size = BOARD_FLASH_SIZE,
+        .lookupTable =
+        {
+            // 0 Read LUTs 0 -> 0
+            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0xEB, RADDR_SDR, FLEXSPI_4PAD, 0x18),
+            FLEXSPI_LUT_SEQ(DUMMY_SDR, FLEXSPI_4PAD, 0x06, READ_SDR, FLEXSPI_4PAD, 0x04),
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+
+            // 1 Read status register -> 1
+            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x05, READ_SDR, FLEXSPI_1PAD, 0x01),
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+
+            // 2 Fast read quad mode - SDR
+            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x6B, RADDR_SDR, FLEXSPI_1PAD, 0x18),
+            FLEXSPI_LUT_SEQ(DUMMY_SDR, FLEXSPI_4PAD, 0x08, READ_SDR, FLEXSPI_4PAD, 0x04),
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+
+            // 3 Write Enable -> 3
+            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x06, STOP, FLEXSPI_1PAD, 0),
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+
+            // 4 Read extend parameters
+            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x81, READ_SDR, FLEXSPI_1PAD, 0x04),
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+
+            // 5 Erase Sector -> 5
+            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x20, RADDR_SDR, FLEXSPI_1PAD, 24),
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+
+            // 6 Write Status Reg
+            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x01, WRITE_SDR, FLEXSPI_1PAD, 0x04),
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+
+            // 7 Page Program - quad mode (-> 9)
+            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x32, RADDR_SDR, FLEXSPI_1PAD, 0x18),
+            FLEXSPI_LUT_SEQ(WRITE_SDR, FLEXSPI_4PAD, 0x04, STOP, FLEXSPI_1PAD, 0),
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+
+            // 8 Read ID
+            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x90, DUMMY_SDR, FLEXSPI_1PAD, 24),
+            FLEXSPI_LUT_SEQ(READ_SDR, FLEXSPI_1PAD, 0x00, 0, 0, 0),
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+
+            // 9 Page Program - single mode -> 9
+            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x02, RADDR_SDR, FLEXSPI_1PAD, 24),
+            FLEXSPI_LUT_SEQ(WRITE_SDR, FLEXSPI_1PAD, 0, 0, 0, 0),
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+
+            // 10 Enter QPI mode
+            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x35, STOP, FLEXSPI_1PAD, 0),
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+
+            // 11 Erase Chip
+            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x60, STOP, FLEXSPI_1PAD, 0),
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+
+            // 12 Exit QPI mode
+            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_4PAD, 0xF5, STOP, FLEXSPI_1PAD, 0),
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+        },
+    },
+    .pageSize = 256u,
+    .sectorSize = 4u * 1024u,
+    .ipcmdSerialClkFreq = kFlexSpiSerialClk_30MHz,
+    .blockSize = 0x00010000,
+    .isUniformBlockSize = false,
+};
+#endif /* XIP_BOOT_HEADER_ENABLE */
diff --git a/ports/mimxrt/boards/TEENSY40/teensy40_flexspi_nor_config.h b/ports/mimxrt/boards/TEENSY40/teensy40_flexspi_nor_config.h
deleted file mode 100644
index 445a0baccc62a..0000000000000
--- a/ports/mimxrt/boards/TEENSY40/teensy40_flexspi_nor_config.h
+++ /dev/null
@@ -1,259 +0,0 @@
-/*
- * Copyright 2018 NXP
- * All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-// Based on tinyusb/hw/bsp/teensy_40/teensy40_flexspi_nor_config.h
-
-#ifndef __TEENSY40_FLEXSPI_NOR_CONFIG__
-#define __TEENSY40_FLEXSPI_NOR_CONFIG__
-
-#include <stdint.h>
-#include <stdbool.h>
-#include "fsl_common.h"
-
-/*! @name Driver version */
-/*@{*/
-/*! @brief XIP_BOARD driver version 2.0.0. */
-#define FSL_XIP_BOARD_DRIVER_VERSION (MAKE_VERSION(2, 0, 0))
-/*@}*/
-
-/* FLEXSPI memory config block related defintions */
-#define FLEXSPI_CFG_BLK_TAG (0x42464346UL)     // ascii "FCFB" Big Endian
-#define FLEXSPI_CFG_BLK_VERSION (0x56010400UL) // V1.4.0
-#define FLEXSPI_CFG_BLK_SIZE (512)
-
-/* FLEXSPI Feature related definitions */
-#define FLEXSPI_FEATURE_HAS_PARALLEL_MODE 1
-
-/* Lookup table related definitions */
-#define CMD_INDEX_READ 0
-#define CMD_INDEX_READSTATUS 1
-#define CMD_INDEX_WRITEENABLE 2
-#define CMD_INDEX_WRITE 4
-
-#define CMD_LUT_SEQ_IDX_READ 0
-#define CMD_LUT_SEQ_IDX_READSTATUS 1
-#define CMD_LUT_SEQ_IDX_WRITEENABLE 3
-#define CMD_LUT_SEQ_IDX_ERASE 5
-#define CMD_LUT_SEQ_IDX_WRITE 9
-
-#define CMD_SDR 0x01
-#define CMD_DDR 0x21
-#define RADDR_SDR 0x02
-#define RADDR_DDR 0x22
-#define CADDR_SDR 0x03
-#define CADDR_DDR 0x23
-#define MODE1_SDR 0x04
-#define MODE1_DDR 0x24
-#define MODE2_SDR 0x05
-#define MODE2_DDR 0x25
-#define MODE4_SDR 0x06
-#define MODE4_DDR 0x26
-#define MODE8_SDR 0x07
-#define MODE8_DDR 0x27
-#define WRITE_SDR 0x08
-#define WRITE_DDR 0x28
-#define READ_SDR 0x09
-#define READ_DDR 0x29
-#define LEARN_SDR 0x0A
-#define LEARN_DDR 0x2A
-#define DATSZ_SDR 0x0B
-#define DATSZ_DDR 0x2B
-#define DUMMY_SDR 0x0C
-#define DUMMY_DDR 0x2C
-#define DUMMY_RWDS_SDR 0x0D
-#define DUMMY_RWDS_DDR 0x2D
-#define JMP_ON_CS 0x1F
-#define STOP 0
-
-#define FLEXSPI_1PAD 0
-#define FLEXSPI_2PAD 1
-#define FLEXSPI_4PAD 2
-#define FLEXSPI_8PAD 3
-
-#define FLEXSPI_LUT_SEQ(cmd0, pad0, op0, cmd1, pad1, op1)                                                              \
-    (FLEXSPI_LUT_OPERAND0(op0) | FLEXSPI_LUT_NUM_PADS0(pad0) | FLEXSPI_LUT_OPCODE0(cmd0) | FLEXSPI_LUT_OPERAND1(op1) | \
-     FLEXSPI_LUT_NUM_PADS1(pad1) | FLEXSPI_LUT_OPCODE1(cmd1))
-
-//!@brief Definitions for FlexSPI Serial Clock Frequency
-typedef enum _FlexSpiSerialClockFreq
-{
-    kFlexSpiSerialClk_30MHz  = 1,
-    kFlexSpiSerialClk_50MHz  = 2,
-    kFlexSpiSerialClk_60MHz  = 3,
-    kFlexSpiSerialClk_75MHz  = 4,
-    kFlexSpiSerialClk_80MHz  = 5,
-    kFlexSpiSerialClk_100MHz = 6,
-    kFlexSpiSerialClk_120MHz = 7,
-    kFlexSpiSerialClk_133MHz = 8,
-    kFlexSpiSerialClk_166MHz = 9,
-} flexspi_serial_clk_freq_t;
-
-//!@brief FlexSPI clock configuration type
-enum
-{
-    kFlexSpiClk_SDR, //!< Clock configure for SDR mode
-    kFlexSpiClk_DDR, //!< Clock configurat for DDR mode
-};
-
-//!@brief FlexSPI Read Sample Clock Source definition
-typedef enum _FlashReadSampleClkSource
-{
-    kFlexSPIReadSampleClk_LoopbackInternally      = 0,
-    kFlexSPIReadSampleClk_LoopbackFromDqsPad      = 1,
-    kFlexSPIReadSampleClk_LoopbackFromSckPad      = 2,
-    kFlexSPIReadSampleClk_ExternalInputFromDqsPad = 3,
-} flexspi_read_sample_clk_t;
-
-//!@brief Misc feature bit definitions
-enum
-{
-    kFlexSpiMiscOffset_DiffClkEnable            = 0, //!< Bit for Differential clock enable
-    kFlexSpiMiscOffset_Ck2Enable                = 1, //!< Bit for CK2 enable
-    kFlexSpiMiscOffset_ParallelEnable           = 2, //!< Bit for Parallel mode enable
-    kFlexSpiMiscOffset_WordAddressableEnable    = 3, //!< Bit for Word Addressable enable
-    kFlexSpiMiscOffset_SafeConfigFreqEnable     = 4, //!< Bit for Safe Configuration Frequency enable
-    kFlexSpiMiscOffset_PadSettingOverrideEnable = 5, //!< Bit for Pad setting override enable
-    kFlexSpiMiscOffset_DdrModeEnable            = 6, //!< Bit for DDR clock confiuration indication.
-};
-
-//!@brief Flash Type Definition
-enum
-{
-    kFlexSpiDeviceType_SerialNOR    = 1,    //!< Flash devices are Serial NOR
-    kFlexSpiDeviceType_SerialNAND   = 2,    //!< Flash devices are Serial NAND
-    kFlexSpiDeviceType_SerialRAM    = 3,    //!< Flash devices are Serial RAM/HyperFLASH
-    kFlexSpiDeviceType_MCP_NOR_NAND = 0x12, //!< Flash device is MCP device, A1 is Serial NOR, A2 is Serial NAND
-    kFlexSpiDeviceType_MCP_NOR_RAM  = 0x13, //!< Flash deivce is MCP device, A1 is Serial NOR, A2 is Serial RAMs
-};
-
-//!@brief Flash Pad Definitions
-enum
-{
-    kSerialFlash_1Pad  = 1,
-    kSerialFlash_2Pads = 2,
-    kSerialFlash_4Pads = 4,
-    kSerialFlash_8Pads = 8,
-};
-
-//!@brief FlexSPI LUT Sequence structure
-typedef struct _lut_sequence
-{
-    uint8_t seqNum; //!< Sequence Number, valid number: 1-16
-    uint8_t seqId;  //!< Sequence Index, valid number: 0-15
-    uint16_t reserved;
-} flexspi_lut_seq_t;
-
-//!@brief Flash Configuration Command Type
-enum
-{
-    kDeviceConfigCmdType_Generic,    //!< Generic command, for example: configure dummy cycles, drive strength, etc
-    kDeviceConfigCmdType_QuadEnable, //!< Quad Enable command
-    kDeviceConfigCmdType_Spi2Xpi,    //!< Switch from SPI to DPI/QPI/OPI mode
-    kDeviceConfigCmdType_Xpi2Spi,    //!< Switch from DPI/QPI/OPI to SPI mode
-    kDeviceConfigCmdType_Spi2NoCmd,  //!< Switch to 0-4-4/0-8-8 mode
-    kDeviceConfigCmdType_Reset,      //!< Reset device command
-};
-
-//!@brief FlexSPI Memory Configuration Block
-typedef struct _FlexSPIConfig
-{
-    uint32_t tag;               //!< [0x000-0x003] Tag, fixed value 0x42464346UL
-    uint32_t version;           //!< [0x004-0x007] Version,[31:24] -'V', [23:16] - Major, [15:8] - Minor, [7:0] - bugfix
-    uint32_t reserved0;         //!< [0x008-0x00b] Reserved for future use
-    uint8_t readSampleClkSrc;   //!< [0x00c-0x00c] Read Sample Clock Source, valid value: 0/1/3
-    uint8_t csHoldTime;         //!< [0x00d-0x00d] CS hold time, default value: 3
-    uint8_t csSetupTime;        //!< [0x00e-0x00e] CS setup time, default value: 3
-    uint8_t columnAddressWidth; //!< [0x00f-0x00f] Column Address with, for HyperBus protocol, it is fixed to 3, For
-    //! Serial NAND, need to refer to datasheet
-    uint8_t deviceModeCfgEnable; //!< [0x010-0x010] Device Mode Configure enable flag, 1 - Enable, 0 - Disable
-    uint8_t deviceModeType; //!< [0x011-0x011] Specify the configuration command type:Quad Enable, DPI/QPI/OPI switch,
-    //! Generic configuration, etc.
-    uint16_t waitTimeCfgCommands; //!< [0x012-0x013] Wait time for all configuration commands, unit: 100us, Used for
-    //! DPI/QPI/OPI switch or reset command
-    flexspi_lut_seq_t deviceModeSeq; //!< [0x014-0x017] Device mode sequence info, [7:0] - LUT sequence id, [15:8] - LUt
-    //! sequence number, [31:16] Reserved
-    uint32_t deviceModeArg;    //!< [0x018-0x01b] Argument/Parameter for device configuration
-    uint8_t configCmdEnable;   //!< [0x01c-0x01c] Configure command Enable Flag, 1 - Enable, 0 - Disable
-    uint8_t configModeType[3]; //!< [0x01d-0x01f] Configure Mode Type, similar as deviceModeTpe
-    flexspi_lut_seq_t
-        configCmdSeqs[3]; //!< [0x020-0x02b] Sequence info for Device Configuration command, similar as deviceModeSeq
-    uint32_t reserved1;   //!< [0x02c-0x02f] Reserved for future use
-    uint32_t configCmdArgs[3];     //!< [0x030-0x03b] Arguments/Parameters for device Configuration commands
-    uint32_t reserved2;            //!< [0x03c-0x03f] Reserved for future use
-    uint32_t controllerMiscOption; //!< [0x040-0x043] Controller Misc Options, see Misc feature bit definitions for more
-    //! details
-    uint8_t deviceType;    //!< [0x044-0x044] Device Type:  See Flash Type Definition for more details
-    uint8_t sflashPadType; //!< [0x045-0x045] Serial Flash Pad Type: 1 - Single, 2 - Dual, 4 - Quad, 8 - Octal
-    uint8_t serialClkFreq; //!< [0x046-0x046] Serial Flash Frequencey, device specific definitions, See System Boot
-    //! Chapter for more details
-    uint8_t lutCustomSeqEnable; //!< [0x047-0x047] LUT customization Enable, it is required if the program/erase cannot
-    //! be done using 1 LUT sequence, currently, only applicable to HyperFLASH
-    uint32_t reserved3[2];           //!< [0x048-0x04f] Reserved for future use
-    uint32_t sflashA1Size;           //!< [0x050-0x053] Size of Flash connected to A1
-    uint32_t sflashA2Size;           //!< [0x054-0x057] Size of Flash connected to A2
-    uint32_t sflashB1Size;           //!< [0x058-0x05b] Size of Flash connected to B1
-    uint32_t sflashB2Size;           //!< [0x05c-0x05f] Size of Flash connected to B2
-    uint32_t csPadSettingOverride;   //!< [0x060-0x063] CS pad setting override value
-    uint32_t sclkPadSettingOverride; //!< [0x064-0x067] SCK pad setting override value
-    uint32_t dataPadSettingOverride; //!< [0x068-0x06b] data pad setting override value
-    uint32_t dqsPadSettingOverride;  //!< [0x06c-0x06f] DQS pad setting override value
-    uint32_t timeoutInMs;            //!< [0x070-0x073] Timeout threshold for read status command
-    uint32_t commandInterval;        //!< [0x074-0x077] CS deselect interval between two commands
-    uint16_t dataValidTime[2]; //!< [0x078-0x07b] CLK edge to data valid time for PORT A and PORT B, in terms of 0.1ns
-    uint16_t busyOffset;       //!< [0x07c-0x07d] Busy offset, valid value: 0-31
-    uint16_t busyBitPolarity;  //!< [0x07e-0x07f] Busy flag polarity, 0 - busy flag is 1 when flash device is busy, 1 -
-    //! busy flag is 0 when flash device is busy
-    uint32_t lookupTable[64];           //!< [0x080-0x17f] Lookup table holds Flash command sequences
-    flexspi_lut_seq_t lutCustomSeq[12]; //!< [0x180-0x1af] Customizable LUT Sequences
-    uint32_t reserved4[4];              //!< [0x1b0-0x1bf] Reserved for future use
-} flexspi_mem_config_t;
-
-/*  */
-#define NOR_CMD_LUT_SEQ_IDX_READ_NORMAL 0
-#define NOR_CMD_LUT_SEQ_IDX_READSTATUSREG 1
-#define NOR_CMD_LUT_SEQ_IDX_READ_FAST_QUAD 2
-#define NOR_CMD_LUT_SEQ_IDX_WRITEENABLE 3
-#define NOR_CMD_LUT_SEQ_IDX_READSTATUS_XPI 4
-#define NOR_CMD_LUT_SEQ_IDX_ERASESECTOR 5
-#define NOR_CMD_LUT_SEQ_IDX_WRITESTATUSREG 6
-#define NOR_CMD_LUT_SEQ_IDX_PAGEPROGRAM_QUAD 7
-#define NOR_CMD_LUT_SEQ_IDX_READID 8
-#define NOR_CMD_LUT_SEQ_IDX_PAGEPROGRAM 9
-#define NOR_CMD_LUT_SEQ_IDX_ENTERQPI 10
-#define NOR_CMD_LUT_SEQ_IDX_CHIPERASE 11
-#define NOR_CMD_LUT_SEQ_IDX_EXITQPI 12
-
-/*
- *  Serial NOR configuration block
- */
-typedef struct _flexspi_nor_config
-{
-    flexspi_mem_config_t memConfig; //!< Common memory configuration info via FlexSPI
-    uint32_t pageSize;              //!< Page size of Serial NOR
-    uint32_t sectorSize;            //!< Sector size of Serial NOR
-    uint8_t ipcmdSerialClkFreq;     //!< Clock frequency for IP command
-    uint8_t isUniformBlockSize;     //!< Sector/Block size is the same
-    uint8_t reserved0[2];           //!< Reserved for future use
-    uint8_t serialNorType;          //!< Serial NOR Flash type: 0/1/2/3
-    uint8_t needExitNoCmdMode;      //!< Need to exit NoCmd mode before other IP command
-    uint8_t halfClkForNonReadCmd;   //!< Half the Serial Clock for non-read command: true/false
-    uint8_t needRestoreNoCmdMode;   //!< Need to Restore NoCmd mode after IP commmand execution
-    uint32_t blockSize;             //!< Block size
-    uint32_t reserve2[11];          //!< Reserved for future use
-} flexspi_nor_config_t;
-
-#define FLASH_BUSY_STATUS_POL 0
-#define FLASH_BUSY_STATUS_OFFSET 0
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* __EVKMIMXRT1060_FLEXSPI_NOR_CONFIG__ */
diff --git a/ports/mimxrt/boards/TEENSY41/TEENSY41.ld b/ports/mimxrt/boards/TEENSY41/TEENSY41.ld
deleted file mode 100755
index 7f3cfc302a69b..0000000000000
--- a/ports/mimxrt/boards/TEENSY41/TEENSY41.ld
+++ /dev/null
@@ -1,2 +0,0 @@
-flash_size = 8M;
-reserved_size = 4K;
diff --git a/ports/mimxrt/boards/TEENSY41/TEENSY41_flexspi_nor_config.h b/ports/mimxrt/boards/TEENSY41/TEENSY41_flexspi_nor_config.h
new file mode 100644
index 0000000000000..b06def76c0bb0
--- /dev/null
+++ b/ports/mimxrt/boards/TEENSY41/TEENSY41_flexspi_nor_config.h
@@ -0,0 +1,259 @@
+/*
+ * Copyright 2018 NXP
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+// Based on tinyusb/hw/bsp/teensy_40/teensy40_flexspi_nor_config.h
+
+#ifndef __TEENSY40_FLEXSPI_NOR_CONFIG__
+#define __TEENSY40_FLEXSPI_NOR_CONFIG__
+
+#include <stdint.h>
+#include <stdbool.h>
+#include "fsl_common.h"
+
+/*! @name Driver version */
+/*@{*/
+/*! @brief XIP_BOARD driver version 2.0.0. */
+#define FSL_XIP_BOARD_DRIVER_VERSION (MAKE_VERSION(2, 0, 0))
+/*@}*/
+
+/* FLEXSPI memory config block related defintions */
+#define FLEXSPI_CFG_BLK_TAG (0x42464346UL)     // ascii "FCFB" Big Endian
+#define FLEXSPI_CFG_BLK_VERSION (0x56010400UL) // V1.4.0
+#define FLEXSPI_CFG_BLK_SIZE (512)
+
+/* FLEXSPI Feature related definitions */
+#define FLEXSPI_FEATURE_HAS_PARALLEL_MODE 1
+
+/* Lookup table related definitions */
+#define CMD_INDEX_READ 0
+#define CMD_INDEX_READSTATUS 1
+#define CMD_INDEX_WRITEENABLE 2
+#define CMD_INDEX_WRITE 4
+
+#define CMD_LUT_SEQ_IDX_READ 0
+#define CMD_LUT_SEQ_IDX_READSTATUS 1
+#define CMD_LUT_SEQ_IDX_WRITEENABLE 3
+#define CMD_LUT_SEQ_IDX_ERASE 5
+#define CMD_LUT_SEQ_IDX_WRITE 9
+
+#define CMD_SDR 0x01
+#define CMD_DDR 0x21
+#define RADDR_SDR 0x02
+#define RADDR_DDR 0x22
+#define CADDR_SDR 0x03
+#define CADDR_DDR 0x23
+#define MODE1_SDR 0x04
+#define MODE1_DDR 0x24
+#define MODE2_SDR 0x05
+#define MODE2_DDR 0x25
+#define MODE4_SDR 0x06
+#define MODE4_DDR 0x26
+#define MODE8_SDR 0x07
+#define MODE8_DDR 0x27
+#define WRITE_SDR 0x08
+#define WRITE_DDR 0x28
+#define READ_SDR 0x09
+#define READ_DDR 0x29
+#define LEARN_SDR 0x0A
+#define LEARN_DDR 0x2A
+#define DATSZ_SDR 0x0B
+#define DATSZ_DDR 0x2B
+#define DUMMY_SDR 0x0C
+#define DUMMY_DDR 0x2C
+#define DUMMY_RWDS_SDR 0x0D
+#define DUMMY_RWDS_DDR 0x2D
+#define JMP_ON_CS 0x1F
+#define STOP 0
+
+#define FLEXSPI_1PAD 0
+#define FLEXSPI_2PAD 1
+#define FLEXSPI_4PAD 2
+#define FLEXSPI_8PAD 3
+
+#define FLEXSPI_LUT_SEQ(cmd0, pad0, op0, cmd1, pad1, op1)                                                              \
+    (FLEXSPI_LUT_OPERAND0(op0) | FLEXSPI_LUT_NUM_PADS0(pad0) | FLEXSPI_LUT_OPCODE0(cmd0) | FLEXSPI_LUT_OPERAND1(op1) | \
+    FLEXSPI_LUT_NUM_PADS1(pad1) | FLEXSPI_LUT_OPCODE1(cmd1))
+
+// !@brief Definitions for FlexSPI Serial Clock Frequency
+typedef enum _FlexSpiSerialClockFreq
+{
+    kFlexSpiSerialClk_30MHz  = 1,
+    kFlexSpiSerialClk_50MHz  = 2,
+    kFlexSpiSerialClk_60MHz  = 3,
+    kFlexSpiSerialClk_75MHz  = 4,
+    kFlexSpiSerialClk_80MHz  = 5,
+    kFlexSpiSerialClk_100MHz = 6,
+    kFlexSpiSerialClk_120MHz = 7,
+    kFlexSpiSerialClk_133MHz = 8,
+    kFlexSpiSerialClk_166MHz = 9,
+} flexspi_serial_clk_freq_t;
+
+// !@brief FlexSPI clock configuration type
+enum
+{
+    kFlexSpiClk_SDR, // !< Clock configure for SDR mode
+    kFlexSpiClk_DDR, // !< Clock configurat for DDR mode
+};
+
+// !@brief FlexSPI Read Sample Clock Source definition
+typedef enum _FlashReadSampleClkSource
+{
+    kFlexSPIReadSampleClk_LoopbackInternally      = 0,
+    kFlexSPIReadSampleClk_LoopbackFromDqsPad      = 1,
+    kFlexSPIReadSampleClk_LoopbackFromSckPad      = 2,
+    kFlexSPIReadSampleClk_ExternalInputFromDqsPad = 3,
+} flexspi_read_sample_clk_t;
+
+// !@brief Misc feature bit definitions
+enum
+{
+    kFlexSpiMiscOffset_DiffClkEnable            = 0, // !< Bit for Differential clock enable
+    kFlexSpiMiscOffset_Ck2Enable                = 1, // !< Bit for CK2 enable
+    kFlexSpiMiscOffset_ParallelEnable           = 2, // !< Bit for Parallel mode enable
+    kFlexSpiMiscOffset_WordAddressableEnable    = 3, // !< Bit for Word Addressable enable
+    kFlexSpiMiscOffset_SafeConfigFreqEnable     = 4, // !< Bit for Safe Configuration Frequency enable
+    kFlexSpiMiscOffset_PadSettingOverrideEnable = 5, // !< Bit for Pad setting override enable
+    kFlexSpiMiscOffset_DdrModeEnable            = 6, // !< Bit for DDR clock confiuration indication.
+};
+
+// !@brief Flash Type Definition
+enum
+{
+    kFlexSpiDeviceType_SerialNOR    = 1,    // !< Flash devices are Serial NOR
+    kFlexSpiDeviceType_SerialNAND   = 2,    // !< Flash devices are Serial NAND
+    kFlexSpiDeviceType_SerialRAM    = 3,    // !< Flash devices are Serial RAM/HyperFLASH
+    kFlexSpiDeviceType_MCP_NOR_NAND = 0x12, // !< Flash device is MCP device, A1 is Serial NOR, A2 is Serial NAND
+    kFlexSpiDeviceType_MCP_NOR_RAM  = 0x13, // !< Flash deivce is MCP device, A1 is Serial NOR, A2 is Serial RAMs
+};
+
+// !@brief Flash Pad Definitions
+enum
+{
+    kSerialFlash_1Pad  = 1,
+    kSerialFlash_2Pads = 2,
+    kSerialFlash_4Pads = 4,
+    kSerialFlash_8Pads = 8,
+};
+
+// !@brief FlexSPI LUT Sequence structure
+typedef struct _lut_sequence
+{
+    uint8_t seqNum; // !< Sequence Number, valid number: 1-16
+    uint8_t seqId;  // !< Sequence Index, valid number: 0-15
+    uint16_t reserved;
+} flexspi_lut_seq_t;
+
+// !@brief Flash Configuration Command Type
+enum
+{
+    kDeviceConfigCmdType_Generic,    // !< Generic command, for example: configure dummy cycles, drive strength, etc
+    kDeviceConfigCmdType_QuadEnable, // !< Quad Enable command
+    kDeviceConfigCmdType_Spi2Xpi,    // !< Switch from SPI to DPI/QPI/OPI mode
+    kDeviceConfigCmdType_Xpi2Spi,    // !< Switch from DPI/QPI/OPI to SPI mode
+    kDeviceConfigCmdType_Spi2NoCmd,  // !< Switch to 0-4-4/0-8-8 mode
+    kDeviceConfigCmdType_Reset,      // !< Reset device command
+};
+
+// !@brief FlexSPI Memory Configuration Block
+typedef struct _FlexSPIConfig
+{
+    uint32_t tag;               // !< [0x000-0x003] Tag, fixed value 0x42464346UL
+    uint32_t version;           // !< [0x004-0x007] Version,[31:24] -'V', [23:16] - Major, [15:8] - Minor, [7:0] - bugfix
+    uint32_t reserved0;         // !< [0x008-0x00b] Reserved for future use
+    uint8_t readSampleClkSrc;   // !< [0x00c-0x00c] Read Sample Clock Source, valid value: 0/1/3
+    uint8_t csHoldTime;         // !< [0x00d-0x00d] CS hold time, default value: 3
+    uint8_t csSetupTime;        // !< [0x00e-0x00e] CS setup time, default value: 3
+    uint8_t columnAddressWidth; // !< [0x00f-0x00f] Column Address with, for HyperBus protocol, it is fixed to 3, For
+    // ! Serial NAND, need to refer to datasheet
+    uint8_t deviceModeCfgEnable; // !< [0x010-0x010] Device Mode Configure enable flag, 1 - Enable, 0 - Disable
+    uint8_t deviceModeType; // !< [0x011-0x011] Specify the configuration command type:Quad Enable, DPI/QPI/OPI switch,
+    // ! Generic configuration, etc.
+    uint16_t waitTimeCfgCommands; // !< [0x012-0x013] Wait time for all configuration commands, unit: 100us, Used for
+    // ! DPI/QPI/OPI switch or reset command
+    flexspi_lut_seq_t deviceModeSeq; // !< [0x014-0x017] Device mode sequence info, [7:0] - LUT sequence id, [15:8] - LUt
+    // ! sequence number, [31:16] Reserved
+    uint32_t deviceModeArg;    // !< [0x018-0x01b] Argument/Parameter for device configuration
+    uint8_t configCmdEnable;   // !< [0x01c-0x01c] Configure command Enable Flag, 1 - Enable, 0 - Disable
+    uint8_t configModeType[3]; // !< [0x01d-0x01f] Configure Mode Type, similar as deviceModeTpe
+    flexspi_lut_seq_t
+        configCmdSeqs[3]; // !< [0x020-0x02b] Sequence info for Device Configuration command, similar as deviceModeSeq
+    uint32_t reserved1;   // !< [0x02c-0x02f] Reserved for future use
+    uint32_t configCmdArgs[3];     // !< [0x030-0x03b] Arguments/Parameters for device Configuration commands
+    uint32_t reserved2;            // !< [0x03c-0x03f] Reserved for future use
+    uint32_t controllerMiscOption; // !< [0x040-0x043] Controller Misc Options, see Misc feature bit definitions for more
+    // ! details
+    uint8_t deviceType;    // !< [0x044-0x044] Device Type:  See Flash Type Definition for more details
+    uint8_t sflashPadType; // !< [0x045-0x045] Serial Flash Pad Type: 1 - Single, 2 - Dual, 4 - Quad, 8 - Octal
+    uint8_t serialClkFreq; // !< [0x046-0x046] Serial Flash Frequencey, device specific definitions, See System Boot
+    // ! Chapter for more details
+    uint8_t lutCustomSeqEnable; // !< [0x047-0x047] LUT customization Enable, it is required if the program/erase cannot
+    // ! be done using 1 LUT sequence, currently, only applicable to HyperFLASH
+    uint32_t reserved3[2];           // !< [0x048-0x04f] Reserved for future use
+    uint32_t sflashA1Size;           // !< [0x050-0x053] Size of Flash connected to A1
+    uint32_t sflashA2Size;           // !< [0x054-0x057] Size of Flash connected to A2
+    uint32_t sflashB1Size;           // !< [0x058-0x05b] Size of Flash connected to B1
+    uint32_t sflashB2Size;           // !< [0x05c-0x05f] Size of Flash connected to B2
+    uint32_t csPadSettingOverride;   // !< [0x060-0x063] CS pad setting override value
+    uint32_t sclkPadSettingOverride; // !< [0x064-0x067] SCK pad setting override value
+    uint32_t dataPadSettingOverride; // !< [0x068-0x06b] data pad setting override value
+    uint32_t dqsPadSettingOverride;  // !< [0x06c-0x06f] DQS pad setting override value
+    uint32_t timeoutInMs;            // !< [0x070-0x073] Timeout threshold for read status command
+    uint32_t commandInterval;        // !< [0x074-0x077] CS deselect interval between two commands
+    uint16_t dataValidTime[2]; // !< [0x078-0x07b] CLK edge to data valid time for PORT A and PORT B, in terms of 0.1ns
+    uint16_t busyOffset;       // !< [0x07c-0x07d] Busy offset, valid value: 0-31
+    uint16_t busyBitPolarity;  // !< [0x07e-0x07f] Busy flag polarity, 0 - busy flag is 1 when flash device is busy, 1 -
+    // ! busy flag is 0 when flash device is busy
+    uint32_t lookupTable[64];           // !< [0x080-0x17f] Lookup table holds Flash command sequences
+    flexspi_lut_seq_t lutCustomSeq[12]; // !< [0x180-0x1af] Customizable LUT Sequences
+    uint32_t reserved4[4];              // !< [0x1b0-0x1bf] Reserved for future use
+} flexspi_mem_config_t;
+
+/*  */
+#define NOR_CMD_LUT_SEQ_IDX_READ_NORMAL 0
+#define NOR_CMD_LUT_SEQ_IDX_READSTATUSREG 1
+#define NOR_CMD_LUT_SEQ_IDX_READ_FAST_QUAD 2
+#define NOR_CMD_LUT_SEQ_IDX_WRITEENABLE 3
+#define NOR_CMD_LUT_SEQ_IDX_READSTATUS_XPI 4
+#define NOR_CMD_LUT_SEQ_IDX_ERASESECTOR 5
+#define NOR_CMD_LUT_SEQ_IDX_WRITESTATUSREG 6
+#define NOR_CMD_LUT_SEQ_IDX_PAGEPROGRAM_QUAD 7
+#define NOR_CMD_LUT_SEQ_IDX_READID 8
+#define NOR_CMD_LUT_SEQ_IDX_PAGEPROGRAM 9
+#define NOR_CMD_LUT_SEQ_IDX_ENTERQPI 10
+#define NOR_CMD_LUT_SEQ_IDX_CHIPERASE 11
+#define NOR_CMD_LUT_SEQ_IDX_EXITQPI 12
+
+/*
+ *  Serial NOR configuration block
+ */
+typedef struct _flexspi_nor_config
+{
+    flexspi_mem_config_t memConfig; // !< Common memory configuration info via FlexSPI
+    uint32_t pageSize;              // !< Page size of Serial NOR
+    uint32_t sectorSize;            // !< Sector size of Serial NOR
+    uint8_t ipcmdSerialClkFreq;     // !< Clock frequency for IP command
+    uint8_t isUniformBlockSize;     // !< Sector/Block size is the same
+    uint8_t reserved0[2];           // !< Reserved for future use
+    uint8_t serialNorType;          // !< Serial NOR Flash type: 0/1/2/3
+    uint8_t needExitNoCmdMode;      // !< Need to exit NoCmd mode before other IP command
+    uint8_t halfClkForNonReadCmd;   // !< Half the Serial Clock for non-read command: true/false
+    uint8_t needRestoreNoCmdMode;   // !< Need to Restore NoCmd mode after IP commmand execution
+    uint32_t blockSize;             // !< Block size
+    uint32_t reserve2[11];          // !< Reserved for future use
+} flexspi_nor_config_t;
+
+#define FLASH_BUSY_STATUS_POL 0
+#define FLASH_BUSY_STATUS_OFFSET 0
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* __EVKMIMXRT1060_FLEXSPI_NOR_CONFIG__ */
diff --git a/ports/mimxrt/boards/TEENSY41/clock_config.h b/ports/mimxrt/boards/TEENSY41/clock_config.h
new file mode 100644
index 0000000000000..0822024847717
--- /dev/null
+++ b/ports/mimxrt/boards/TEENSY41/clock_config.h
@@ -0,0 +1,122 @@
+/*
+ * Copyright 2018-2019 NXP
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#ifndef _CLOCK_CONFIG_H_
+#define _CLOCK_CONFIG_H_
+
+#include "fsl_common.h"
+
+/*******************************************************************************
+ * Definitions
+ ******************************************************************************/
+#define BOARD_XTAL0_CLK_HZ 24000000U /*!< Board xtal0 frequency in Hz */
+
+#define BOARD_XTAL32K_CLK_HZ 32768U /*!< Board xtal32k frequency in Hz */
+/*******************************************************************************
+ ************************ BOARD_InitBootClocks function ************************
+ ******************************************************************************/
+
+#if defined(__cplusplus)
+extern "C" {
+#endif /* __cplusplus*/
+
+/*!
+ * @brief This function executes default configuration of clocks.
+ *
+ */
+void BOARD_InitBootClocks(void);
+
+#if defined(__cplusplus)
+}
+#endif /* __cplusplus*/
+
+/*******************************************************************************
+ ********************** Configuration BOARD_BootClockRUN ***********************
+ ******************************************************************************/
+/*******************************************************************************
+ * Definitions for BOARD_BootClockRUN configuration
+ ******************************************************************************/
+#define BOARD_BOOTCLOCKRUN_CORE_CLOCK 600000000U /*!< Core clock frequency: 600000000Hz */
+
+/* Clock outputs (values are in Hz): */
+#define BOARD_BOOTCLOCKRUN_AHB_CLK_ROOT 600000000UL
+#define BOARD_BOOTCLOCKRUN_CAN_CLK_ROOT 40000000UL
+#define BOARD_BOOTCLOCKRUN_CKIL_SYNC_CLK_ROOT 32768UL
+#define BOARD_BOOTCLOCKRUN_CLKO1_CLK 0UL
+#define BOARD_BOOTCLOCKRUN_CLKO2_CLK 0UL
+#define BOARD_BOOTCLOCKRUN_CLK_1M 1000000UL
+#define BOARD_BOOTCLOCKRUN_CLK_24M 24000000UL
+#define BOARD_BOOTCLOCKRUN_CSI_CLK_ROOT 12000000UL
+#define BOARD_BOOTCLOCKRUN_ENET1_TX_CLK 2400000UL
+#define BOARD_BOOTCLOCKRUN_ENET2_125M_CLK 1200000UL
+#define BOARD_BOOTCLOCKRUN_ENET2_TX_CLK 1200000UL
+#define BOARD_BOOTCLOCKRUN_ENET_125M_CLK 2400000UL
+#define BOARD_BOOTCLOCKRUN_ENET_25M_REF_CLK 1200000UL
+#define BOARD_BOOTCLOCKRUN_FLEXIO1_CLK_ROOT 30000000UL
+#define BOARD_BOOTCLOCKRUN_FLEXIO2_CLK_ROOT 30000000UL
+#define BOARD_BOOTCLOCKRUN_FLEXSPI2_CLK_ROOT 130909090UL
+#define BOARD_BOOTCLOCKRUN_FLEXSPI_CLK_ROOT 130909090UL
+#define BOARD_BOOTCLOCKRUN_GPT1_IPG_CLK_HIGHFREQ 75000000UL
+#define BOARD_BOOTCLOCKRUN_GPT2_IPG_CLK_HIGHFREQ 75000000UL
+#define BOARD_BOOTCLOCKRUN_IPG_CLK_ROOT 150000000UL
+#define BOARD_BOOTCLOCKRUN_LCDIF_CLK_ROOT 9642857UL
+#define BOARD_BOOTCLOCKRUN_LPI2C_CLK_ROOT 60000000UL
+#define BOARD_BOOTCLOCKRUN_LPSPI_CLK_ROOT 105600000UL
+#define BOARD_BOOTCLOCKRUN_LVDS1_CLK 1200000000UL
+#define BOARD_BOOTCLOCKRUN_MQS_MCLK 63529411UL
+#define BOARD_BOOTCLOCKRUN_PERCLK_CLK_ROOT 75000000UL
+#define BOARD_BOOTCLOCKRUN_PLL7_MAIN_CLK 24000000UL
+#define BOARD_BOOTCLOCKRUN_SAI1_CLK_ROOT 63529411UL
+#define BOARD_BOOTCLOCKRUN_SAI1_MCLK1 63529411UL
+#define BOARD_BOOTCLOCKRUN_SAI1_MCLK2 63529411UL
+#define BOARD_BOOTCLOCKRUN_SAI1_MCLK3 30000000UL
+#define BOARD_BOOTCLOCKRUN_SAI2_CLK_ROOT 63529411UL
+#define BOARD_BOOTCLOCKRUN_SAI2_MCLK1 63529411UL
+#define BOARD_BOOTCLOCKRUN_SAI2_MCLK2 0UL
+#define BOARD_BOOTCLOCKRUN_SAI2_MCLK3 30000000UL
+#define BOARD_BOOTCLOCKRUN_SAI3_CLK_ROOT 63529411UL
+#define BOARD_BOOTCLOCKRUN_SAI3_MCLK1 63529411UL
+#define BOARD_BOOTCLOCKRUN_SAI3_MCLK2 0UL
+#define BOARD_BOOTCLOCKRUN_SAI3_MCLK3 30000000UL
+#define BOARD_BOOTCLOCKRUN_SEMC_CLK_ROOT 75000000UL
+#define BOARD_BOOTCLOCKRUN_SPDIF0_CLK_ROOT 30000000UL
+#define BOARD_BOOTCLOCKRUN_SPDIF0_EXTCLK_OUT 0UL
+#define BOARD_BOOTCLOCKRUN_TRACE_CLK_ROOT 117333333UL
+#define BOARD_BOOTCLOCKRUN_UART_CLK_ROOT 80000000UL
+#define BOARD_BOOTCLOCKRUN_USBPHY1_CLK 0UL
+#define BOARD_BOOTCLOCKRUN_USBPHY2_CLK 0UL
+#define BOARD_BOOTCLOCKRUN_USDHC1_CLK_ROOT 198000000UL
+#define BOARD_BOOTCLOCKRUN_USDHC2_CLK_ROOT 198000000UL
+
+/*! @brief Arm PLL set for BOARD_BootClockRUN configuration.
+ */
+extern const clock_arm_pll_config_t armPllConfig_BOARD_BootClockRUN;
+/*! @brief Usb1 PLL set for BOARD_BootClockRUN configuration.
+ */
+extern const clock_usb_pll_config_t usb1PllConfig_BOARD_BootClockRUN;
+/*! @brief Sys PLL for BOARD_BootClockRUN configuration.
+ */
+extern const clock_sys_pll_config_t sysPllConfig_BOARD_BootClockRUN;
+
+/*******************************************************************************
+ * API for BOARD_BootClockRUN configuration
+ ******************************************************************************/
+#if defined(__cplusplus)
+extern "C" {
+#endif /* __cplusplus*/
+
+/*!
+ * @brief This function executes configuration of clocks.
+ *
+ */
+void BOARD_BootClockRUN(void);
+
+#if defined(__cplusplus)
+}
+#endif /* __cplusplus*/
+
+#endif /* _CLOCK_CONFIG_H_ */
diff --git a/ports/mimxrt/boards/TEENSY41/flash_config.c b/ports/mimxrt/boards/TEENSY41/flash_config.c
deleted file mode 100755
index f5066216d1c1a..0000000000000
--- a/ports/mimxrt/boards/TEENSY41/flash_config.c
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- * Copyright 2018 NXP
- * All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-// Based on tinyusb/hw/bsp/teensy_40/teensy40_flexspi_nor_config.c
-
-#include "teensy41_flexspi_nor_config.h"
-
-/* Component ID definition, used by tools. */
-#ifndef FSL_COMPONENT_ID
-#define FSL_COMPONENT_ID "platform.drivers.xip_board"
-#endif
-
-/*******************************************************************************
- * Code
- ******************************************************************************/
-#if defined(XIP_BOOT_HEADER_ENABLE) && (XIP_BOOT_HEADER_ENABLE == 1)
-#if defined(__CC_ARM) || defined(__ARMCC_VERSION) || defined(__GNUC__)
-__attribute__((section(".boot_hdr.conf")))
-#elif defined(__ICCARM__)
-#pragma location = ".boot_hdr.conf"
-#endif
-
-const flexspi_nor_config_t qspiflash_config = {
-    .memConfig =
-        {
-            .tag              = FLEXSPI_CFG_BLK_TAG,
-            .version          = FLEXSPI_CFG_BLK_VERSION,
-            .readSampleClkSrc = kFlexSPIReadSampleClk_LoopbackFromDqsPad,
-            .csHoldTime       = 3u,
-            .csSetupTime      = 3u,
-
-            .busyOffset = FLASH_BUSY_STATUS_OFFSET,     // Status bit 0 indicates busy.
-            .busyBitPolarity = FLASH_BUSY_STATUS_POL,   // Busy when the bit is 1.
-
-            .deviceModeCfgEnable = 1u,
-            .deviceModeType = kDeviceConfigCmdType_QuadEnable,
-            .deviceModeSeq = {
-                .seqId = 4u,
-                .seqNum = 1u,
-            },
-            .deviceModeArg = 0x0200,
-            .configCmdEnable = 1u,
-            .configModeType[0] = kDeviceConfigCmdType_Generic,
-            .configCmdSeqs[0] = {
-                .seqId = 2u,
-                .seqNum = 1u,
-            },
-            .deviceType = kFlexSpiDeviceType_SerialNOR,
-            // Enable DDR mode, Wordaddassable, Safe configuration, Differential clock
-            .sflashPadType = kSerialFlash_4Pads,
-            .serialClkFreq = kFlexSpiSerialClk_60MHz,
-            .sflashA1Size  = 8u * 1024u * 1024u,
-            .lookupTable =
-                {
-                    // 0 Read LUTs 0 -> 0
-                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0xEB, RADDR_SDR, FLEXSPI_4PAD, 0x18),
-                    FLEXSPI_LUT_SEQ(DUMMY_SDR, FLEXSPI_4PAD, 0x06, READ_SDR, FLEXSPI_4PAD, 0x04),
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-
-                    // 1 Read status register -> 1
-                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x05, READ_SDR, FLEXSPI_1PAD, 0x01),
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-
-                    // 2 Fast read quad mode - SDR
-                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x6B, RADDR_SDR, FLEXSPI_1PAD, 0x18),
-                    FLEXSPI_LUT_SEQ(DUMMY_SDR, FLEXSPI_4PAD, 0x08, READ_SDR, FLEXSPI_4PAD, 0x04),
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-
-                    // 3 Write Enable -> 3
-                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x06, STOP, FLEXSPI_1PAD, 0),
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-
-                    // 4 Read extend parameters
-                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x81, READ_SDR, FLEXSPI_1PAD, 0x04),
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-
-                    // 5 Erase Sector -> 5
-                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x20, RADDR_SDR, FLEXSPI_1PAD, 24),
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-
-                    // 6 Write Status Reg
-                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x01, WRITE_SDR, FLEXSPI_1PAD, 0x04),
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-
-                    // 7 Page Program - quad mode (-> 9)
-                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x32, RADDR_SDR, FLEXSPI_1PAD, 0x18),
-                    FLEXSPI_LUT_SEQ(WRITE_SDR, FLEXSPI_4PAD, 0x04, STOP, FLEXSPI_1PAD, 0),
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-
-                    // 8 Read ID
-                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x90, DUMMY_SDR, FLEXSPI_1PAD, 24),
-                    FLEXSPI_LUT_SEQ(READ_SDR, FLEXSPI_1PAD, 0x00, 0, 0, 0),
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-
-                    // 9 Page Program - single mode -> 9
-                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x02, RADDR_SDR, FLEXSPI_1PAD, 24),
-                    FLEXSPI_LUT_SEQ(WRITE_SDR, FLEXSPI_1PAD, 0, 0, 0, 0),
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-
-                    // 10 Enter QPI mode
-                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x35, STOP, FLEXSPI_1PAD, 0),
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-
-                    // 11 Erase Chip
-                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x60, STOP, FLEXSPI_1PAD, 0),
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-
-                    // 12 Exit QPI mode
-                    FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_4PAD, 0xF5, STOP, FLEXSPI_1PAD, 0),
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                    FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0), // Filler
-                },
-        },
-    .pageSize           = 256u,
-    .sectorSize         = 4u * 1024u,
-    .ipcmdSerialClkFreq = kFlexSpiSerialClk_30MHz,
-    .blockSize          = 0x00010000,
-    .isUniformBlockSize = false,
-};
-#endif /* XIP_BOOT_HEADER_ENABLE */
diff --git a/ports/mimxrt/boards/TEENSY41/mpconfigboard.h b/ports/mimxrt/boards/TEENSY41/mpconfigboard.h
index 587bf9c620437..7890ba762c1c4 100644
--- a/ports/mimxrt/boards/TEENSY41/mpconfigboard.h
+++ b/ports/mimxrt/boards/TEENSY41/mpconfigboard.h
@@ -1,14 +1,10 @@
 #define MICROPY_HW_BOARD_NAME "Teensy 4.1"
 #define MICROPY_HW_MCU_NAME   "MIMXRT1062DVJ6A"
 
-#define BOARD_FLASH_SIZE (8 * 1024 * 1024)
-
 // Teensy 4.1 has 1 board LED
 #define MICROPY_HW_LED1_PIN (pin_GPIO_B0_03)
 #define MICROPY_HW_LED_ON(pin) (mp_hal_pin_high(pin))
 #define MICROPY_HW_LED_OFF(pin) (mp_hal_pin_low(pin))
-#define BOARD_FLASH_CONFIG_HEADER_H "teensy41_flexspi_nor_config.h"
-#define BOARD_FLASH_OPS_HEADER_H "hal/flexspi_nor_flash.h"
 
 #define MICROPY_HW_NUM_PIN_IRQS (4 * 32 + 3)
 
@@ -39,10 +35,10 @@
     { IOMUXC_GPIO_B0_02_LPSPI4_SDO }, { IOMUXC_GPIO_B0_01_LPSPI4_SDI },
 
 #define DMA_REQ_SRC_RX { 0, kDmaRequestMuxLPSPI1Rx, kDmaRequestMuxLPSPI2Rx, \
-                            kDmaRequestMuxLPSPI3Rx, kDmaRequestMuxLPSPI4Rx }
+                         kDmaRequestMuxLPSPI3Rx, kDmaRequestMuxLPSPI4Rx }
 
 #define DMA_REQ_SRC_TX { 0, kDmaRequestMuxLPSPI1Tx, kDmaRequestMuxLPSPI2Tx, \
-                            kDmaRequestMuxLPSPI3Tx, kDmaRequestMuxLPSPI4Tx } 
+                         kDmaRequestMuxLPSPI3Tx, kDmaRequestMuxLPSPI4Tx }
 
 // Define mapping hardware I2C # to logical I2C #
 // SDA/SCL  HW-I2C    Logical I2C
@@ -63,9 +59,9 @@
     { \
         .cmd = {GPIO_SD_B0_00_USDHC1_CMD}, \
         .clk = { GPIO_SD_B0_01_USDHC1_CLK }, \
-        .cd_b = { USDHC_DUMMY_PIN },\
-        .data0 = { GPIO_SD_B0_02_USDHC1_DATA0 },\
-        .data1 = { GPIO_SD_B0_03_USDHC1_DATA1 },\
-        .data2 = { GPIO_SD_B0_04_USDHC1_DATA2 },\
-        .data3 = { GPIO_SD_B0_05_USDHC1_DATA3 },\
+        .cd_b = { USDHC_DUMMY_PIN }, \
+        .data0 = { GPIO_SD_B0_02_USDHC1_DATA0 }, \
+        .data1 = { GPIO_SD_B0_03_USDHC1_DATA1 }, \
+        .data2 = { GPIO_SD_B0_04_USDHC1_DATA2 }, \
+        .data3 = { GPIO_SD_B0_05_USDHC1_DATA3 }, \
     }
diff --git a/ports/mimxrt/boards/TEENSY41/mpconfigboard.mk b/ports/mimxrt/boards/TEENSY41/mpconfigboard.mk
index bd70fd0925e08..9a29a9b75d571 100755
--- a/ports/mimxrt/boards/TEENSY41/mpconfigboard.mk
+++ b/ports/mimxrt/boards/TEENSY41/mpconfigboard.mk
@@ -3,9 +3,9 @@ MCU_VARIANT = MIMXRT1062DVJ6A
 
 MICROPY_FLOAT_IMPL = double
 MICROPY_PY_MACHINE_SDCARD = 1
+BOARD_FLASH_TYPE ?= qspi_nor
+BOARD_FLASH_SIZE ?= 0x800000  # 8MB
+BOARD_FLASH_RESERVED ?= 0x1000  # 4KB
 
 deploy: $(BUILD)/firmware.hex
 	teensy_loader_cli --mcu=imxrt1062 -v -w $<
-
-SRC_C += \
-	hal/flexspi_nor_flash.c
diff --git a/ports/mimxrt/boards/TEENSY41/qspi_nor_flash_config.c b/ports/mimxrt/boards/TEENSY41/qspi_nor_flash_config.c
new file mode 100644
index 0000000000000..71d871b7519ed
--- /dev/null
+++ b/ports/mimxrt/boards/TEENSY41/qspi_nor_flash_config.c
@@ -0,0 +1,144 @@
+/*
+ * Copyright 2018 NXP
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+// Based on tinyusb/hw/bsp/teensy_40/teensy40_flexspi_nor_config.c
+
+#include BOARD_FLASH_CONFIG_HEADER_H
+
+/* Component ID definition, used by tools. */
+#ifndef FSL_COMPONENT_ID
+#define FSL_COMPONENT_ID "platform.drivers.xip_board"
+#endif
+
+/*******************************************************************************
+ * Code
+ ******************************************************************************/
+#if defined(XIP_BOOT_HEADER_ENABLE) && (XIP_BOOT_HEADER_ENABLE == 1)
+#if defined(__CC_ARM) || defined(__ARMCC_VERSION) || defined(__GNUC__)
+__attribute__((section(".boot_hdr.conf")))
+#elif defined(__ICCARM__)
+#pragma location = ".boot_hdr.conf"
+#endif
+
+const flexspi_nor_config_t qspiflash_config = {
+    .memConfig =
+    {
+        .tag = FLEXSPI_CFG_BLK_TAG,
+        .version = FLEXSPI_CFG_BLK_VERSION,
+        .readSampleClkSrc = kFlexSPIReadSampleClk_LoopbackFromDqsPad,
+        .csHoldTime = 3u,
+        .csSetupTime = 3u,
+
+        .busyOffset = FLASH_BUSY_STATUS_OFFSET,         // Status bit 0 indicates busy.
+        .busyBitPolarity = FLASH_BUSY_STATUS_POL,       // Busy when the bit is 1.
+
+        .deviceModeCfgEnable = 1u,
+        .deviceModeType = kDeviceConfigCmdType_QuadEnable,
+        .deviceModeSeq = {
+            .seqId = 4u,
+            .seqNum = 1u,
+        },
+        .deviceModeArg = 0x0200,
+        .configCmdEnable = 1u,
+        .configModeType[0] = kDeviceConfigCmdType_Generic,
+        .configCmdSeqs[0] = {
+            .seqId = 2u,
+            .seqNum = 1u,
+        },
+        .deviceType = kFlexSpiDeviceType_SerialNOR,
+        // Enable DDR mode, Wordaddassable, Safe configuration, Differential clock
+        .sflashPadType = kSerialFlash_4Pads,
+        .serialClkFreq = kFlexSpiSerialClk_60MHz,
+        .sflashA1Size = BOARD_FLASH_SIZE,
+        .lookupTable =
+        {
+            // 0 Read LUTs 0 -> 0
+            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0xEB, RADDR_SDR, FLEXSPI_4PAD, 0x18),
+            FLEXSPI_LUT_SEQ(DUMMY_SDR, FLEXSPI_4PAD, 0x06, READ_SDR, FLEXSPI_4PAD, 0x04),
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+
+            // 1 Read status register -> 1
+            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x05, READ_SDR, FLEXSPI_1PAD, 0x01),
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+
+            // 2 Fast read quad mode - SDR
+            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x6B, RADDR_SDR, FLEXSPI_1PAD, 0x18),
+            FLEXSPI_LUT_SEQ(DUMMY_SDR, FLEXSPI_4PAD, 0x08, READ_SDR, FLEXSPI_4PAD, 0x04),
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+
+            // 3 Write Enable -> 3
+            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x06, STOP, FLEXSPI_1PAD, 0),
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+
+            // 4 Read extend parameters
+            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x81, READ_SDR, FLEXSPI_1PAD, 0x04),
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+
+            // 5 Erase Sector -> 5
+            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x20, RADDR_SDR, FLEXSPI_1PAD, 24),
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+
+            // 6 Write Status Reg
+            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x01, WRITE_SDR, FLEXSPI_1PAD, 0x04),
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+
+            // 7 Page Program - quad mode (-> 9)
+            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x32, RADDR_SDR, FLEXSPI_1PAD, 0x18),
+            FLEXSPI_LUT_SEQ(WRITE_SDR, FLEXSPI_4PAD, 0x04, STOP, FLEXSPI_1PAD, 0),
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+
+            // 8 Read ID
+            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x90, DUMMY_SDR, FLEXSPI_1PAD, 24),
+            FLEXSPI_LUT_SEQ(READ_SDR, FLEXSPI_1PAD, 0x00, 0, 0, 0),
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+
+            // 9 Page Program - single mode -> 9
+            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x02, RADDR_SDR, FLEXSPI_1PAD, 24),
+            FLEXSPI_LUT_SEQ(WRITE_SDR, FLEXSPI_1PAD, 0, 0, 0, 0),
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+
+            // 10 Enter QPI mode
+            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x35, STOP, FLEXSPI_1PAD, 0),
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+
+            // 11 Erase Chip
+            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x60, STOP, FLEXSPI_1PAD, 0),
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+
+            // 12 Exit QPI mode
+            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_4PAD, 0xF5, STOP, FLEXSPI_1PAD, 0),
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+        },
+    },
+    .pageSize = 256u,
+    .sectorSize = 4u * 1024u,
+    .ipcmdSerialClkFreq = kFlexSpiSerialClk_30MHz,
+    .blockSize = 0x00010000,
+    .isUniformBlockSize = false,
+};
+#endif /* XIP_BOOT_HEADER_ENABLE */
diff --git a/ports/mimxrt/boards/TEENSY41/teensy41_flexspi_nor_config.h b/ports/mimxrt/boards/TEENSY41/teensy41_flexspi_nor_config.h
deleted file mode 100755
index 445a0baccc62a..0000000000000
--- a/ports/mimxrt/boards/TEENSY41/teensy41_flexspi_nor_config.h
+++ /dev/null
@@ -1,259 +0,0 @@
-/*
- * Copyright 2018 NXP
- * All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-// Based on tinyusb/hw/bsp/teensy_40/teensy40_flexspi_nor_config.h
-
-#ifndef __TEENSY40_FLEXSPI_NOR_CONFIG__
-#define __TEENSY40_FLEXSPI_NOR_CONFIG__
-
-#include <stdint.h>
-#include <stdbool.h>
-#include "fsl_common.h"
-
-/*! @name Driver version */
-/*@{*/
-/*! @brief XIP_BOARD driver version 2.0.0. */
-#define FSL_XIP_BOARD_DRIVER_VERSION (MAKE_VERSION(2, 0, 0))
-/*@}*/
-
-/* FLEXSPI memory config block related defintions */
-#define FLEXSPI_CFG_BLK_TAG (0x42464346UL)     // ascii "FCFB" Big Endian
-#define FLEXSPI_CFG_BLK_VERSION (0x56010400UL) // V1.4.0
-#define FLEXSPI_CFG_BLK_SIZE (512)
-
-/* FLEXSPI Feature related definitions */
-#define FLEXSPI_FEATURE_HAS_PARALLEL_MODE 1
-
-/* Lookup table related definitions */
-#define CMD_INDEX_READ 0
-#define CMD_INDEX_READSTATUS 1
-#define CMD_INDEX_WRITEENABLE 2
-#define CMD_INDEX_WRITE 4
-
-#define CMD_LUT_SEQ_IDX_READ 0
-#define CMD_LUT_SEQ_IDX_READSTATUS 1
-#define CMD_LUT_SEQ_IDX_WRITEENABLE 3
-#define CMD_LUT_SEQ_IDX_ERASE 5
-#define CMD_LUT_SEQ_IDX_WRITE 9
-
-#define CMD_SDR 0x01
-#define CMD_DDR 0x21
-#define RADDR_SDR 0x02
-#define RADDR_DDR 0x22
-#define CADDR_SDR 0x03
-#define CADDR_DDR 0x23
-#define MODE1_SDR 0x04
-#define MODE1_DDR 0x24
-#define MODE2_SDR 0x05
-#define MODE2_DDR 0x25
-#define MODE4_SDR 0x06
-#define MODE4_DDR 0x26
-#define MODE8_SDR 0x07
-#define MODE8_DDR 0x27
-#define WRITE_SDR 0x08
-#define WRITE_DDR 0x28
-#define READ_SDR 0x09
-#define READ_DDR 0x29
-#define LEARN_SDR 0x0A
-#define LEARN_DDR 0x2A
-#define DATSZ_SDR 0x0B
-#define DATSZ_DDR 0x2B
-#define DUMMY_SDR 0x0C
-#define DUMMY_DDR 0x2C
-#define DUMMY_RWDS_SDR 0x0D
-#define DUMMY_RWDS_DDR 0x2D
-#define JMP_ON_CS 0x1F
-#define STOP 0
-
-#define FLEXSPI_1PAD 0
-#define FLEXSPI_2PAD 1
-#define FLEXSPI_4PAD 2
-#define FLEXSPI_8PAD 3
-
-#define FLEXSPI_LUT_SEQ(cmd0, pad0, op0, cmd1, pad1, op1)                                                              \
-    (FLEXSPI_LUT_OPERAND0(op0) | FLEXSPI_LUT_NUM_PADS0(pad0) | FLEXSPI_LUT_OPCODE0(cmd0) | FLEXSPI_LUT_OPERAND1(op1) | \
-     FLEXSPI_LUT_NUM_PADS1(pad1) | FLEXSPI_LUT_OPCODE1(cmd1))
-
-//!@brief Definitions for FlexSPI Serial Clock Frequency
-typedef enum _FlexSpiSerialClockFreq
-{
-    kFlexSpiSerialClk_30MHz  = 1,
-    kFlexSpiSerialClk_50MHz  = 2,
-    kFlexSpiSerialClk_60MHz  = 3,
-    kFlexSpiSerialClk_75MHz  = 4,
-    kFlexSpiSerialClk_80MHz  = 5,
-    kFlexSpiSerialClk_100MHz = 6,
-    kFlexSpiSerialClk_120MHz = 7,
-    kFlexSpiSerialClk_133MHz = 8,
-    kFlexSpiSerialClk_166MHz = 9,
-} flexspi_serial_clk_freq_t;
-
-//!@brief FlexSPI clock configuration type
-enum
-{
-    kFlexSpiClk_SDR, //!< Clock configure for SDR mode
-    kFlexSpiClk_DDR, //!< Clock configurat for DDR mode
-};
-
-//!@brief FlexSPI Read Sample Clock Source definition
-typedef enum _FlashReadSampleClkSource
-{
-    kFlexSPIReadSampleClk_LoopbackInternally      = 0,
-    kFlexSPIReadSampleClk_LoopbackFromDqsPad      = 1,
-    kFlexSPIReadSampleClk_LoopbackFromSckPad      = 2,
-    kFlexSPIReadSampleClk_ExternalInputFromDqsPad = 3,
-} flexspi_read_sample_clk_t;
-
-//!@brief Misc feature bit definitions
-enum
-{
-    kFlexSpiMiscOffset_DiffClkEnable            = 0, //!< Bit for Differential clock enable
-    kFlexSpiMiscOffset_Ck2Enable                = 1, //!< Bit for CK2 enable
-    kFlexSpiMiscOffset_ParallelEnable           = 2, //!< Bit for Parallel mode enable
-    kFlexSpiMiscOffset_WordAddressableEnable    = 3, //!< Bit for Word Addressable enable
-    kFlexSpiMiscOffset_SafeConfigFreqEnable     = 4, //!< Bit for Safe Configuration Frequency enable
-    kFlexSpiMiscOffset_PadSettingOverrideEnable = 5, //!< Bit for Pad setting override enable
-    kFlexSpiMiscOffset_DdrModeEnable            = 6, //!< Bit for DDR clock confiuration indication.
-};
-
-//!@brief Flash Type Definition
-enum
-{
-    kFlexSpiDeviceType_SerialNOR    = 1,    //!< Flash devices are Serial NOR
-    kFlexSpiDeviceType_SerialNAND   = 2,    //!< Flash devices are Serial NAND
-    kFlexSpiDeviceType_SerialRAM    = 3,    //!< Flash devices are Serial RAM/HyperFLASH
-    kFlexSpiDeviceType_MCP_NOR_NAND = 0x12, //!< Flash device is MCP device, A1 is Serial NOR, A2 is Serial NAND
-    kFlexSpiDeviceType_MCP_NOR_RAM  = 0x13, //!< Flash deivce is MCP device, A1 is Serial NOR, A2 is Serial RAMs
-};
-
-//!@brief Flash Pad Definitions
-enum
-{
-    kSerialFlash_1Pad  = 1,
-    kSerialFlash_2Pads = 2,
-    kSerialFlash_4Pads = 4,
-    kSerialFlash_8Pads = 8,
-};
-
-//!@brief FlexSPI LUT Sequence structure
-typedef struct _lut_sequence
-{
-    uint8_t seqNum; //!< Sequence Number, valid number: 1-16
-    uint8_t seqId;  //!< Sequence Index, valid number: 0-15
-    uint16_t reserved;
-} flexspi_lut_seq_t;
-
-//!@brief Flash Configuration Command Type
-enum
-{
-    kDeviceConfigCmdType_Generic,    //!< Generic command, for example: configure dummy cycles, drive strength, etc
-    kDeviceConfigCmdType_QuadEnable, //!< Quad Enable command
-    kDeviceConfigCmdType_Spi2Xpi,    //!< Switch from SPI to DPI/QPI/OPI mode
-    kDeviceConfigCmdType_Xpi2Spi,    //!< Switch from DPI/QPI/OPI to SPI mode
-    kDeviceConfigCmdType_Spi2NoCmd,  //!< Switch to 0-4-4/0-8-8 mode
-    kDeviceConfigCmdType_Reset,      //!< Reset device command
-};
-
-//!@brief FlexSPI Memory Configuration Block
-typedef struct _FlexSPIConfig
-{
-    uint32_t tag;               //!< [0x000-0x003] Tag, fixed value 0x42464346UL
-    uint32_t version;           //!< [0x004-0x007] Version,[31:24] -'V', [23:16] - Major, [15:8] - Minor, [7:0] - bugfix
-    uint32_t reserved0;         //!< [0x008-0x00b] Reserved for future use
-    uint8_t readSampleClkSrc;   //!< [0x00c-0x00c] Read Sample Clock Source, valid value: 0/1/3
-    uint8_t csHoldTime;         //!< [0x00d-0x00d] CS hold time, default value: 3
-    uint8_t csSetupTime;        //!< [0x00e-0x00e] CS setup time, default value: 3
-    uint8_t columnAddressWidth; //!< [0x00f-0x00f] Column Address with, for HyperBus protocol, it is fixed to 3, For
-    //! Serial NAND, need to refer to datasheet
-    uint8_t deviceModeCfgEnable; //!< [0x010-0x010] Device Mode Configure enable flag, 1 - Enable, 0 - Disable
-    uint8_t deviceModeType; //!< [0x011-0x011] Specify the configuration command type:Quad Enable, DPI/QPI/OPI switch,
-    //! Generic configuration, etc.
-    uint16_t waitTimeCfgCommands; //!< [0x012-0x013] Wait time for all configuration commands, unit: 100us, Used for
-    //! DPI/QPI/OPI switch or reset command
-    flexspi_lut_seq_t deviceModeSeq; //!< [0x014-0x017] Device mode sequence info, [7:0] - LUT sequence id, [15:8] - LUt
-    //! sequence number, [31:16] Reserved
-    uint32_t deviceModeArg;    //!< [0x018-0x01b] Argument/Parameter for device configuration
-    uint8_t configCmdEnable;   //!< [0x01c-0x01c] Configure command Enable Flag, 1 - Enable, 0 - Disable
-    uint8_t configModeType[3]; //!< [0x01d-0x01f] Configure Mode Type, similar as deviceModeTpe
-    flexspi_lut_seq_t
-        configCmdSeqs[3]; //!< [0x020-0x02b] Sequence info for Device Configuration command, similar as deviceModeSeq
-    uint32_t reserved1;   //!< [0x02c-0x02f] Reserved for future use
-    uint32_t configCmdArgs[3];     //!< [0x030-0x03b] Arguments/Parameters for device Configuration commands
-    uint32_t reserved2;            //!< [0x03c-0x03f] Reserved for future use
-    uint32_t controllerMiscOption; //!< [0x040-0x043] Controller Misc Options, see Misc feature bit definitions for more
-    //! details
-    uint8_t deviceType;    //!< [0x044-0x044] Device Type:  See Flash Type Definition for more details
-    uint8_t sflashPadType; //!< [0x045-0x045] Serial Flash Pad Type: 1 - Single, 2 - Dual, 4 - Quad, 8 - Octal
-    uint8_t serialClkFreq; //!< [0x046-0x046] Serial Flash Frequencey, device specific definitions, See System Boot
-    //! Chapter for more details
-    uint8_t lutCustomSeqEnable; //!< [0x047-0x047] LUT customization Enable, it is required if the program/erase cannot
-    //! be done using 1 LUT sequence, currently, only applicable to HyperFLASH
-    uint32_t reserved3[2];           //!< [0x048-0x04f] Reserved for future use
-    uint32_t sflashA1Size;           //!< [0x050-0x053] Size of Flash connected to A1
-    uint32_t sflashA2Size;           //!< [0x054-0x057] Size of Flash connected to A2
-    uint32_t sflashB1Size;           //!< [0x058-0x05b] Size of Flash connected to B1
-    uint32_t sflashB2Size;           //!< [0x05c-0x05f] Size of Flash connected to B2
-    uint32_t csPadSettingOverride;   //!< [0x060-0x063] CS pad setting override value
-    uint32_t sclkPadSettingOverride; //!< [0x064-0x067] SCK pad setting override value
-    uint32_t dataPadSettingOverride; //!< [0x068-0x06b] data pad setting override value
-    uint32_t dqsPadSettingOverride;  //!< [0x06c-0x06f] DQS pad setting override value
-    uint32_t timeoutInMs;            //!< [0x070-0x073] Timeout threshold for read status command
-    uint32_t commandInterval;        //!< [0x074-0x077] CS deselect interval between two commands
-    uint16_t dataValidTime[2]; //!< [0x078-0x07b] CLK edge to data valid time for PORT A and PORT B, in terms of 0.1ns
-    uint16_t busyOffset;       //!< [0x07c-0x07d] Busy offset, valid value: 0-31
-    uint16_t busyBitPolarity;  //!< [0x07e-0x07f] Busy flag polarity, 0 - busy flag is 1 when flash device is busy, 1 -
-    //! busy flag is 0 when flash device is busy
-    uint32_t lookupTable[64];           //!< [0x080-0x17f] Lookup table holds Flash command sequences
-    flexspi_lut_seq_t lutCustomSeq[12]; //!< [0x180-0x1af] Customizable LUT Sequences
-    uint32_t reserved4[4];              //!< [0x1b0-0x1bf] Reserved for future use
-} flexspi_mem_config_t;
-
-/*  */
-#define NOR_CMD_LUT_SEQ_IDX_READ_NORMAL 0
-#define NOR_CMD_LUT_SEQ_IDX_READSTATUSREG 1
-#define NOR_CMD_LUT_SEQ_IDX_READ_FAST_QUAD 2
-#define NOR_CMD_LUT_SEQ_IDX_WRITEENABLE 3
-#define NOR_CMD_LUT_SEQ_IDX_READSTATUS_XPI 4
-#define NOR_CMD_LUT_SEQ_IDX_ERASESECTOR 5
-#define NOR_CMD_LUT_SEQ_IDX_WRITESTATUSREG 6
-#define NOR_CMD_LUT_SEQ_IDX_PAGEPROGRAM_QUAD 7
-#define NOR_CMD_LUT_SEQ_IDX_READID 8
-#define NOR_CMD_LUT_SEQ_IDX_PAGEPROGRAM 9
-#define NOR_CMD_LUT_SEQ_IDX_ENTERQPI 10
-#define NOR_CMD_LUT_SEQ_IDX_CHIPERASE 11
-#define NOR_CMD_LUT_SEQ_IDX_EXITQPI 12
-
-/*
- *  Serial NOR configuration block
- */
-typedef struct _flexspi_nor_config
-{
-    flexspi_mem_config_t memConfig; //!< Common memory configuration info via FlexSPI
-    uint32_t pageSize;              //!< Page size of Serial NOR
-    uint32_t sectorSize;            //!< Sector size of Serial NOR
-    uint8_t ipcmdSerialClkFreq;     //!< Clock frequency for IP command
-    uint8_t isUniformBlockSize;     //!< Sector/Block size is the same
-    uint8_t reserved0[2];           //!< Reserved for future use
-    uint8_t serialNorType;          //!< Serial NOR Flash type: 0/1/2/3
-    uint8_t needExitNoCmdMode;      //!< Need to exit NoCmd mode before other IP command
-    uint8_t halfClkForNonReadCmd;   //!< Half the Serial Clock for non-read command: true/false
-    uint8_t needRestoreNoCmdMode;   //!< Need to Restore NoCmd mode after IP commmand execution
-    uint32_t blockSize;             //!< Block size
-    uint32_t reserve2[11];          //!< Reserved for future use
-} flexspi_nor_config_t;
-
-#define FLASH_BUSY_STATUS_POL 0
-#define FLASH_BUSY_STATUS_OFFSET 0
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* __EVKMIMXRT1060_FLEXSPI_NOR_CONFIG__ */
diff --git a/ports/mimxrt/boards/make-flexram-config.py b/ports/mimxrt/boards/make-flexram-config.py
new file mode 100644
index 0000000000000..0a667ff5b7857
--- /dev/null
+++ b/ports/mimxrt/boards/make-flexram-config.py
@@ -0,0 +1,219 @@
+#!/usr/bin/env python3
+#
+# This file is part of the MicroPython project, http://micropython.org/
+#
+# The MIT License (MIT)
+#
+# Copyright (c) 2021 Philipp Ebensberger
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+"""Evaluate FlexRAM configuration and generate startup code."""
+
+import re
+import argparse
+
+# Regex for linker script configuration
+ocram_regex = r"^\s*ocrm_size\s*=\s*(?P<size>.*);"
+dtcm_regex = r"^\s*dtcm_size\s*=\s*(?P<size>.*);"
+itcm_regex = r"^\s*itcm_size\s*=\s*(?P<size>.*);"
+
+# Regex for GPR register base define in NXL hal
+gpr_base_regex = r"^.*IOMUXC_GPR_BASE\s*\((?P<base_addr>\w*)u\)"
+
+# Regex for FlexRAM parameters in NXP HAL
+fsl_ram_bank_size_regex = r"^.*FSL_FEATURE_FLEXRAM_INTERNAL_RAM_BANK_SIZE\s*\((?P<size>\w*)\)"
+fsl_bank_nbr_regex = (
+    r"^.*FSL_FEATURE_FLEXRAM_INTERNAL_RAM_TOTAL_BANK_NUMBERS\s*\((?P<number>\w*)\)"
+)
+
+
+"""
+According to AN12077:
+    The minimum configuration of OCRAM is 64 KB. This is required
+    due to ROM code requires at least 64 KB of RAM for its execution.
+
+    2.1.1.1. Static configuration - Page 4
+"""
+ocram_min_size = 0x00010000  # 64 KB
+
+# Value parser
+def mimxrt_default_parser(defines_file, features_file, ld_script):
+    with open(ld_script, "r") as input_file:
+        input_str = input_file.read()
+    #
+    ocram_match = re.search(ocram_regex, input_str, re.MULTILINE)
+    dtcm_match = re.search(dtcm_regex, input_str, re.MULTILINE)
+    itcm_match = re.search(itcm_regex, input_str, re.MULTILINE)
+
+    with open(defines_file, "r") as input_file:
+        input_str = input_file.read()
+    mcu_define_file_match = re.search(gpr_base_regex, input_str, re.MULTILINE)
+
+    with open(features_file, "r") as input_file:
+        input_str = input_file.read()
+    fsl_ram_bank_size_match = re.search(fsl_ram_bank_size_regex, input_str, re.MULTILINE)
+    fsl_bank_nbr_match = re.search(fsl_bank_nbr_regex, input_str, re.MULTILINE)
+    #
+    extract = {
+        "ocram_size": int(ocram_match.group("size"), 16),
+        "dtcm_size": int(dtcm_match.group("size"), 16),
+        "itcm_size": int(itcm_match.group("size"), 16),
+        "gpr_base_addr": int(mcu_define_file_match.group("base_addr"), 16),
+        "fsl_ram_bank_size": int(fsl_ram_bank_size_match.group("size")),
+        "fsl_bank_nbr": int(fsl_bank_nbr_match.group("number")),
+    }
+    # Evaluate configuration
+    if extract["ocram_size"] < ocram_min_size:
+        raise ValueError("OCRAM size must be at least {:08X}!".format(ocram_min_size))
+
+    if (extract["ocram_size"] % extract["fsl_ram_bank_size"]) != 0:
+        raise ValueError("Configuration invalid!")
+
+    # Check if DTCM and ITCM size is either multiple of 32k or 4k,8k or 16k
+    if extract["dtcm_size"] != 0x0:
+        if extract["dtcm_size"] % extract["fsl_ram_bank_size"] != 0:
+            if extract["dtcm_size"] not in (0x00000000, 0x00001000, 0x00002000, 0x00004000):
+                raise ValueError("Configuration invalid!")
+
+    if extract["itcm_size"] != 0x0:
+        if extract["itcm_size"] % extract["fsl_ram_bank_size"] != 0:
+            if extract["itcm_size"] not in (0x00000000, 0x00001000, 0x00002000, 0x00004000):
+                raise ValueError("Configuration invalid!")
+    #
+    return extract
+
+
+# Code generators
+def mimxrt_default_gen_code(extract_dict):
+    flexram_bank_cfg = "0b"
+    avail_flexram = extract_dict["fsl_ram_bank_size"] * extract_dict["fsl_bank_nbr"]
+
+    if (
+        extract_dict["ocram_size"] + extract_dict["dtcm_size"] + extract_dict["itcm_size"]
+    ) > avail_flexram:
+        raise ValueError("Configuration exceeds available FlexRAM!")
+
+    bit_patterns = (
+        (extract_dict["ocram_size"], "01"),
+        (extract_dict["dtcm_size"], "10"),
+        (extract_dict["itcm_size"], "11"),
+    )
+
+    for size, pattern in bit_patterns:
+        for _ in range(0, size, extract_dict["fsl_ram_bank_size"]):
+            flexram_bank_cfg += pattern
+
+    # Generate GPR Register config
+    print(".equ __iomux_gpr14_adr, 0x{:08X}".format(extract_dict["gpr_base_addr"] + 0x38))
+    print(".equ __iomux_gpr16_adr, 0x{:08X}".format(extract_dict["gpr_base_addr"] + 0x40))
+    print(".equ __iomux_gpr17_adr, 0x{:08X}".format(extract_dict["gpr_base_addr"] + 0x44))
+    print(
+        ".equ __iomux_gpr17_value, 0x{:08X} /* {}k OCRAM, {}k DTCM, {}k ITCM */".format(
+            int(flexram_bank_cfg, 2),
+            extract_dict["ocram_size"] // 1024,
+            extract_dict["dtcm_size"] // 1024,
+            extract_dict["itcm_size"] // 1024,
+        )
+    )
+
+
+def mimxrt_106x_gen_code(extract_dict):
+    flexram_bank_cfg = "0b"
+    avail_flexram = extract_dict["fsl_ram_bank_size"] * extract_dict["fsl_bank_nbr"]
+    flexram_configurable_ocram = (
+        extract_dict["ocram_size"] % 524288
+    )  # 512kB OCRAM are not part of FlexRAM configurable memory
+
+    if (
+        flexram_configurable_ocram + extract_dict["dtcm_size"] + extract_dict["itcm_size"]
+    ) > avail_flexram:
+        raise ValueError("Configuration exceeds available FlexRAM!")
+
+    for size, pattern in (
+        (flexram_configurable_ocram, "01"),
+        (extract_dict["dtcm_size"], "10"),
+        (extract_dict["itcm_size"], "11"),
+    ):
+        for _ in range(0, size, extract_dict["fsl_ram_bank_size"]):
+            flexram_bank_cfg += pattern
+
+    # Generate GPR Register config
+    print(".equ __iomux_gpr14_adr, 0x{:08X}".format(extract_dict["gpr_base_addr"] + 0x38))
+    print(".equ __iomux_gpr16_adr, 0x{:08X}".format(extract_dict["gpr_base_addr"] + 0x40))
+    print(".equ __iomux_gpr17_adr, 0x{:08X}".format(extract_dict["gpr_base_addr"] + 0x44))
+    print(
+        ".equ __iomux_gpr17_value, 0x{:08X} /* {}k OCRAM (512k OCRAM, {}k from FlexRAM), {}k DTCM, {}k ITCM */".format(
+            int(flexram_bank_cfg, 2),
+            extract_dict["ocram_size"] // 1024,
+            flexram_configurable_ocram // 1024,
+            extract_dict["dtcm_size"] // 1024,
+            extract_dict["itcm_size"] // 1024,
+        )
+    )
+
+
+def main(defines_file, features_file, ld_script, controller):
+    dispatcher = {
+        "MIMXRT1011": (mimxrt_default_parser, mimxrt_default_gen_code),
+        "MIMXRT1021": (mimxrt_default_parser, mimxrt_default_gen_code),
+        "MIMXRT1052": (mimxrt_default_parser, mimxrt_default_gen_code),
+        "MIMXRT1062": (mimxrt_default_parser, mimxrt_106x_gen_code),
+        "MIMXRT1064": (mimxrt_default_parser, mimxrt_106x_gen_code),
+    }
+
+    extractor, code_generator = dispatcher[controller]
+
+    extract_dict = extractor(defines_file, features_file, ld_script)
+    code_generator(extract_dict)
+
+
+if __name__ == "__main__":
+    parser = argparse.ArgumentParser(
+        prog="make-flexram-ld.py",
+        usage="%(prog)s [options] [command]",
+        description="Evaluate FlexRAM configuration and generate startup code.",
+    )
+    parser.add_argument(
+        "-d",
+        "--defines_file",
+        dest="defines_file",
+        help="Path to MCU defines file",
+        default="../../../lib/nxp_driver/sdk/devices/MIMXRT1021/MIMXRT1021.h",
+    )
+    parser.add_argument(
+        "-f",
+        "--features_file",
+        dest="features_file",
+        help="Path to MCU features file",
+        default="../../../lib/nxp_driver/sdk/devices/MIMXRT1021/MIMXRT1021_features.h",
+    )
+    parser.add_argument(
+        "-l",
+        "--ld_file",
+        dest="linker_file",
+        help="Path to the aggregated linker-script",
+        default="MIMXRT1021.ld",
+    )
+    parser.add_argument(
+        "-c", "--controller", dest="controller", help="Controller name", default="MIMXRT1021"
+    )
+    #
+    args = parser.parse_args()
+    main(args.defines_file, args.features_file, args.linker_file, args.controller)
diff --git a/ports/mimxrt/hal/board.h b/ports/mimxrt/hal/board.h
new file mode 100644
index 0000000000000..ce5e047976f28
--- /dev/null
+++ b/ports/mimxrt/hal/board.h
@@ -0,0 +1,33 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Philipp Ebensberger
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#ifndef MICROPY_INCLUDED_MIMXRT_BOARD_H
+#define MICROPY_INCLUDED_MIMXRT_BOARD_H
+
+#include "clock_config.h"
+#include "fsl_common.h"
+
+#endif /* MICROPY_INCLUDED_MIMXRT_BOARD_H */
diff --git a/ports/mimxrt/hal/flexspi_hyper_flash.c b/ports/mimxrt/hal/flexspi_hyper_flash.c
index fb71d4d941cbf..c7b41658a4988 100644
--- a/ports/mimxrt/hal/flexspi_hyper_flash.c
+++ b/ports/mimxrt/hal/flexspi_hyper_flash.c
@@ -16,14 +16,15 @@
 __attribute__((always_inline)) static inline void clock_set_div(clock_div_t divider, uint32_t value) {
     uint32_t busyShift;
 
-    busyShift                   = CCM_TUPLE_BUSY_SHIFT(divider);
+    busyShift = CCM_TUPLE_BUSY_SHIFT(divider);
     CCM_TUPLE_REG(CCM, divider) = (CCM_TUPLE_REG(CCM, divider) & (~CCM_TUPLE_MASK(divider))) |
-                                  (((uint32_t)((value) << CCM_TUPLE_SHIFT(divider))) & CCM_TUPLE_MASK(divider));
+        (((uint32_t)((value) << CCM_TUPLE_SHIFT(divider))) & CCM_TUPLE_MASK(divider));
 
     /* Clock switch need Handshake? */
     if (CCM_NO_BUSY_WAIT != busyShift) {
         /* Wait until CCM internal handshake finish. */
-        while (CCM->CDHIPR & (1U << busyShift)) {}
+        while (CCM->CDHIPR & (1U << busyShift)) {
+        }
     }
 }
 
@@ -32,7 +33,7 @@ __attribute__((always_inline)) static inline void clock_control_gate(clock_ip_na
     uint32_t shift = ((uint32_t)name) & 0x1FU;
     volatile uint32_t *reg;
 
-    reg  = ((volatile uint32_t *)&CCM->CCGR0) + index;
+    reg = ((volatile uint32_t *)&CCM->CCGR0) + index;
     *reg = ((*reg) & ~(3U << shift)) | (((uint32_t)value) << shift);
 }
 
@@ -44,9 +45,9 @@ __attribute__((always_inline)) static inline void clock_disable_clock(clock_ip_n
     clock_control_gate(name, kCLOCK_ClockNotNeeded);
 }
 
-#define DIV_PAGE_PGM	4
-#define DIV_ERASE_PGM	4
-#define DIV_READ		0
+#define DIV_PAGE_PGM    4
+#define DIV_ERASE_PGM   4
+#define DIV_READ        0
 
 static void SetFlexSPIDiv(uint32_t div) __attribute__((section(".ram_functions")));
 static void SetFlexSPIDiv(uint32_t div) {
@@ -54,7 +55,7 @@ static void SetFlexSPIDiv(uint32_t div) {
     clock_disable_clock(kCLOCK_FlexSpi);
     clock_set_div(kCLOCK_FlexspiDiv, div); /* flexspi clock 332M, DDR mode, internal clock 166M. */
     clock_enable_clock(kCLOCK_FlexSpi);
-    FLEXSPI_Enable(FLEXSPI, true);	
+    FLEXSPI_Enable(FLEXSPI, true);
 }
 
 status_t flexspi_nor_hyperbus_read(FLEXSPI_Type *base, uint32_t addr, uint32_t *buffer, uint32_t bytes) __attribute__((section(".ram_functions")));
@@ -63,13 +64,13 @@ status_t flexspi_nor_hyperbus_read(FLEXSPI_Type *base, uint32_t addr, uint32_t *
     status_t status;
 
     flashXfer.deviceAddress = addr * 2;
-    flashXfer.port          = kFLEXSPI_PortA1;
-    flashXfer.cmdType       = kFLEXSPI_Read;
-    flashXfer.SeqNumber     = 1;
-    flashXfer.seqIndex      = HYPERFLASH_CMD_LUT_SEQ_IDX_READDATA;
-    flashXfer.data          = buffer;
-    flashXfer.dataSize      = bytes;
-    status                  = FLEXSPI_TransferBlocking(base, &flashXfer);
+    flashXfer.port = kFLEXSPI_PortA1;
+    flashXfer.cmdType = kFLEXSPI_Read;
+    flashXfer.SeqNumber = 1;
+    flashXfer.seqIndex = HYPERFLASH_CMD_LUT_SEQ_IDX_READDATA;
+    flashXfer.data = buffer;
+    flashXfer.dataSize = bytes;
+    status = FLEXSPI_TransferBlocking(base, &flashXfer);
 
     return status;
 }
@@ -80,13 +81,13 @@ status_t flexspi_nor_hyperbus_write(FLEXSPI_Type *base, uint32_t addr, uint32_t
     status_t status;
 
     flashXfer.deviceAddress = addr * 2;
-    flashXfer.port          = kFLEXSPI_PortA1;
-    flashXfer.cmdType       = kFLEXSPI_Write;
-    flashXfer.SeqNumber     = 1;
-    flashXfer.seqIndex      = HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEDATA;
-    flashXfer.data          = buffer;
-    flashXfer.dataSize      = bytes;
-    status                  = FLEXSPI_TransferBlocking(base, &flashXfer);
+    flashXfer.port = kFLEXSPI_PortA1;
+    flashXfer.cmdType = kFLEXSPI_Write;
+    flashXfer.SeqNumber = 1;
+    flashXfer.seqIndex = HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEDATA;
+    flashXfer.data = buffer;
+    flashXfer.dataSize = bytes;
+    status = FLEXSPI_TransferBlocking(base, &flashXfer);
 
     return status;
 }
@@ -98,10 +99,10 @@ status_t flexspi_nor_write_enable(FLEXSPI_Type *base, uint32_t baseAddr) {
 
     /* Write enable */
     flashXfer.deviceAddress = baseAddr;
-    flashXfer.port          = kFLEXSPI_PortA1;
-    flashXfer.cmdType       = kFLEXSPI_Command;
-    flashXfer.SeqNumber     = 2;
-    flashXfer.seqIndex      = HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEENABLE;
+    flashXfer.port = kFLEXSPI_PortA1;
+    flashXfer.cmdType = kFLEXSPI_Command;
+    flashXfer.SeqNumber = 2;
+    flashXfer.seqIndex = HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEENABLE;
 
     status = FLEXSPI_TransferBlocking(base, &flashXfer);
 
@@ -117,12 +118,12 @@ status_t flexspi_nor_wait_bus_busy(FLEXSPI_Type *base) {
     flexspi_transfer_t flashXfer;
 
     flashXfer.deviceAddress = 0;
-    flashXfer.port          = kFLEXSPI_PortA1;
-    flashXfer.cmdType       = kFLEXSPI_Read;
-    flashXfer.SeqNumber     = 2;
-    flashXfer.seqIndex      = HYPERFLASH_CMD_LUT_SEQ_IDX_READSTATUS;
-    flashXfer.data          = &readValue;
-    flashXfer.dataSize      = 2;
+    flashXfer.port = kFLEXSPI_PortA1;
+    flashXfer.cmdType = kFLEXSPI_Read;
+    flashXfer.SeqNumber = 2;
+    flashXfer.seqIndex = HYPERFLASH_CMD_LUT_SEQ_IDX_READSTATUS;
+    flashXfer.data = &readValue;
+    flashXfer.dataSize = 2;
 
     do {
         status = FLEXSPI_TransferBlocking(base, &flashXfer);
@@ -159,11 +160,11 @@ status_t flexspi_nor_flash_erase_sector(FLEXSPI_Type *base, uint32_t address) {
     }
 
     flashXfer.deviceAddress = address;
-    flashXfer.port          = kFLEXSPI_PortA1;
-    flashXfer.cmdType       = kFLEXSPI_Command;
-    flashXfer.SeqNumber     = 4;
-    flashXfer.seqIndex      = HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR;
-    status                  = FLEXSPI_TransferBlocking(base, &flashXfer);
+    flashXfer.port = kFLEXSPI_PortA1;
+    flashXfer.cmdType = kFLEXSPI_Command;
+    flashXfer.SeqNumber = 4;
+    flashXfer.seqIndex = HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR;
+    status = FLEXSPI_TransferBlocking(base, &flashXfer);
 
     if (status != kStatus_Success) {
         return status;
@@ -174,13 +175,13 @@ status_t flexspi_nor_flash_erase_sector(FLEXSPI_Type *base, uint32_t address) {
     return status;
 }
 
-status_t flexspi_nor_flash_page_program(FLEXSPI_Type *base, uint32_t address, const uint32_t *src,  uint32_t size ) __attribute__((section(".ram_functions")));
+status_t flexspi_nor_flash_page_program(FLEXSPI_Type *base, uint32_t address, const uint32_t *src,  uint32_t size) __attribute__((section(".ram_functions")));
 status_t flexspi_nor_flash_page_program(FLEXSPI_Type *base, uint32_t address, const uint32_t *src,  uint32_t size) {
     status_t status;
     flexspi_transfer_t flashXfer;
 
     /* Speed down flexspi clock */
-	SetFlexSPIDiv(DIV_PAGE_PGM);
+    SetFlexSPIDiv(DIV_PAGE_PGM);
 
     /* Write enable */
     status = flexspi_nor_write_enable(base, address);
@@ -191,13 +192,13 @@ status_t flexspi_nor_flash_page_program(FLEXSPI_Type *base, uint32_t address, co
 
     /* Prepare page program command */
     flashXfer.deviceAddress = address;
-    flashXfer.port          = kFLEXSPI_PortA1;
-    flashXfer.cmdType       = kFLEXSPI_Write;
-    flashXfer.SeqNumber     = 2;
-    flashXfer.seqIndex      = HYPERFLASH_CMD_LUT_SEQ_IDX_PAGEPROGRAM;
-    flashXfer.data          = (uint32_t *)src;
-    flashXfer.dataSize      = size;
-    status                  = FLEXSPI_TransferBlocking(base, &flashXfer);
+    flashXfer.port = kFLEXSPI_PortA1;
+    flashXfer.cmdType = kFLEXSPI_Write;
+    flashXfer.SeqNumber = 2;
+    flashXfer.seqIndex = HYPERFLASH_CMD_LUT_SEQ_IDX_PAGEPROGRAM;
+    flashXfer.data = (uint32_t *)src;
+    flashXfer.dataSize = size;
+    status = FLEXSPI_TransferBlocking(base, &flashXfer);
 
     if (status != kStatus_Success) {
         return status;
@@ -205,7 +206,7 @@ status_t flexspi_nor_flash_page_program(FLEXSPI_Type *base, uint32_t address, co
 
     status = flexspi_nor_wait_bus_busy(base);
 
-	SetFlexSPIDiv(DIV_READ);
+    SetFlexSPIDiv(DIV_READ);
 
     return status;
 }
@@ -219,7 +220,7 @@ status_t flexspi_nor_hyperflash_cfi(FLEXSPI_Type *base) {
     status_t status;
     uint32_t buffer[2];
     uint8_t data[4] = {0x00, 0x98};
-    status          = flexspi_nor_hyperbus_write(base, 0x555, (uint32_t *)data, 2);
+    status = flexspi_nor_hyperbus_write(base, 0x555, (uint32_t *)data, 2);
     if (status != kStatus_Success) {
         return status;
     }
@@ -238,7 +239,7 @@ status_t flexspi_nor_hyperflash_cfi(FLEXSPI_Type *base) {
     }
     // ASO Exit 0xF000
     data[1] = 0xF0;
-    status  = flexspi_nor_hyperbus_write(base, 0x0, (uint32_t *)data, 2);
+    status = flexspi_nor_hyperbus_write(base, 0x0, (uint32_t *)data, 2);
     if (status != kStatus_Success) {
         return status;
     }
diff --git a/ports/mimxrt/hal/flexspi_hyper_flash.h b/ports/mimxrt/hal/flexspi_hyper_flash.h
index bba76c132403c..d51ca3073da64 100644
--- a/ports/mimxrt/hal/flexspi_hyper_flash.h
+++ b/ports/mimxrt/hal/flexspi_hyper_flash.h
@@ -26,15 +26,14 @@
 #ifndef MICROPY_INCLUDED_MIMXRT_HAL_FLEXSPI_HYPER_FLASH_H
 #define MICROPY_INCLUDED_MIMXRT_HAL_FLEXSPI_HYPER_FLASH_H
 
-#include "mpconfigboard.h"
 #include "fsl_flexspi.h"
+#include "mpconfigboard.h"
 #include BOARD_FLASH_CONFIG_HEADER_H
 
 // Defined in boards flash_config.c
 extern flexspi_nor_config_t qspiflash_config;
 
 status_t flexspi_nor_hyperflash_cfi(FLEXSPI_Type *base);
-void flexspi_hyper_flash_init(void);
 void flexspi_nor_update_lut(void);
 status_t flexspi_nor_flash_erase_sector(FLEXSPI_Type *base, uint32_t address);
 status_t flexspi_nor_flash_page_program(FLEXSPI_Type *base, uint32_t address, const uint32_t *src, uint32_t size);
diff --git a/ports/mimxrt/hal/flexspi_nor_flash.c b/ports/mimxrt/hal/flexspi_nor_flash.c
index a70d234d6e4a9..8c04150d12738 100644
--- a/ports/mimxrt/hal/flexspi_nor_flash.c
+++ b/ports/mimxrt/hal/flexspi_nor_flash.c
@@ -41,8 +41,7 @@ void flexspi_nor_reset(FLEXSPI_Type *base) __attribute__((section(".ram_function
 void flexspi_nor_reset(FLEXSPI_Type *base) {
     // Using content of FLEXSPI_SoftwareReset directly to prevent issues when compiler does not inline function
     base->MCR0 |= FLEXSPI_MCR0_SWRESET_MASK;
-    while (base->MCR0 & FLEXSPI_MCR0_SWRESET_MASK)
-    {
+    while (base->MCR0 & FLEXSPI_MCR0_SWRESET_MASK) {
     }
 }
 
@@ -63,7 +62,7 @@ status_t flexspi_nor_write_enable(FLEXSPI_Type *base, uint32_t baseAddr) {
     return status;
 }
 
-status_t flexspi_nor_wait_bus_busy(FLEXSPI_Type *base) __attribute__((section(".ram_functions"))) ;
+status_t flexspi_nor_wait_bus_busy(FLEXSPI_Type *base) __attribute__((section(".ram_functions")));
 status_t flexspi_nor_wait_bus_busy(FLEXSPI_Type *base) {
     /* Wait status ready. */
     bool isBusy;
@@ -103,7 +102,7 @@ status_t flexspi_nor_wait_bus_busy(FLEXSPI_Type *base) {
     return status;
 }
 
-status_t flexspi_nor_enable_quad_mode(FLEXSPI_Type *base) __attribute__((section(".ram_functions"))) ;
+status_t flexspi_nor_enable_quad_mode(FLEXSPI_Type *base) __attribute__((section(".ram_functions")));
 status_t flexspi_nor_enable_quad_mode(FLEXSPI_Type *base) {
     flexspi_transfer_t flashXfer;
     status_t status;
@@ -135,7 +134,7 @@ status_t flexspi_nor_enable_quad_mode(FLEXSPI_Type *base) {
     return status;
 }
 
-status_t flexspi_nor_flash_erase_sector(FLEXSPI_Type *base, uint32_t address) __attribute__((section(".ram_functions"))) ;
+status_t flexspi_nor_flash_erase_sector(FLEXSPI_Type *base, uint32_t address) __attribute__((section(".ram_functions")));
 status_t flexspi_nor_flash_erase_sector(FLEXSPI_Type *base, uint32_t address) {
     status_t status;
     flexspi_transfer_t flashXfer;
@@ -166,7 +165,7 @@ status_t flexspi_nor_flash_erase_sector(FLEXSPI_Type *base, uint32_t address) {
     return status;
 }
 
-status_t flexspi_nor_flash_page_program(FLEXSPI_Type *base, uint32_t dstAddr, const uint32_t *src, uint32_t size) __attribute__((section(".ram_functions"))) ;
+status_t flexspi_nor_flash_page_program(FLEXSPI_Type *base, uint32_t dstAddr, const uint32_t *src, uint32_t size) __attribute__((section(".ram_functions")));
 status_t flexspi_nor_flash_page_program(FLEXSPI_Type *base, uint32_t dstAddr, const uint32_t *src, uint32_t size) {
     status_t status;
     flexspi_transfer_t flashXfer;
@@ -184,7 +183,7 @@ status_t flexspi_nor_flash_page_program(FLEXSPI_Type *base, uint32_t dstAddr, co
     flashXfer.cmdType = kFLEXSPI_Write;
     flashXfer.SeqNumber = 1;
     flashXfer.seqIndex = NOR_CMD_LUT_SEQ_IDX_PAGEPROGRAM_QUAD;
-    flashXfer.data = (uint32_t *) src;
+    flashXfer.data = (uint32_t *)src;
     flashXfer.dataSize = size;
     status = FLEXSPI_TransferBlocking(base, &flashXfer);
 
@@ -199,7 +198,7 @@ status_t flexspi_nor_flash_page_program(FLEXSPI_Type *base, uint32_t dstAddr, co
     return status;
 }
 
-status_t flexspi_nor_get_vendor_id(FLEXSPI_Type *base, uint8_t *vendorId) __attribute__((section(".ram_functions"))) ;
+status_t flexspi_nor_get_vendor_id(FLEXSPI_Type *base, uint8_t *vendorId) __attribute__((section(".ram_functions")));
 status_t flexspi_nor_get_vendor_id(FLEXSPI_Type *base, uint8_t *vendorId) {
     uint32_t temp;
     flexspi_transfer_t flashXfer;
diff --git a/ports/mimxrt/hal/flexspi_nor_flash.h b/ports/mimxrt/hal/flexspi_nor_flash.h
index c34df74168e3a..f8c31488a9883 100644
--- a/ports/mimxrt/hal/flexspi_nor_flash.h
+++ b/ports/mimxrt/hal/flexspi_nor_flash.h
@@ -34,7 +34,6 @@
 extern flexspi_nor_config_t qspiflash_config;
 
 status_t flexspi_nor_get_vendor_id(FLEXSPI_Type *base, uint8_t *vendorId);
-status_t flexspi_nor_init(void);
 void flexspi_nor_update_lut(void);
 status_t flexspi_nor_flash_erase_sector(FLEXSPI_Type *base, uint32_t address);
 status_t flexspi_nor_flash_page_program(FLEXSPI_Type *base, uint32_t address, const uint32_t *src, uint32_t size);
diff --git a/ports/mimxrt/hal/peripherals.h b/ports/mimxrt/hal/peripherals.h
new file mode 100644
index 0000000000000..81036b0a2c5b6
--- /dev/null
+++ b/ports/mimxrt/hal/peripherals.h
@@ -0,0 +1 @@
+// Empty file, necessary for compilation with NXP MCU SDK
diff --git a/ports/mimxrt/hal/pin_mux.h b/ports/mimxrt/hal/pin_mux.h
new file mode 100644
index 0000000000000..81036b0a2c5b6
--- /dev/null
+++ b/ports/mimxrt/hal/pin_mux.h
@@ -0,0 +1 @@
+// Empty file, necessary for compilation with NXP MCU SDK
diff --git a/ports/mimxrt/hal/resethandler_MIMXRT10xx.S b/ports/mimxrt/hal/resethandler_MIMXRT10xx.S
new file mode 100644
index 0000000000000..8fe061103388b
--- /dev/null
+++ b/ports/mimxrt/hal/resethandler_MIMXRT10xx.S
@@ -0,0 +1,175 @@
+/* ------------------------------------------------------------------------- */
+/*                                                                           */
+/* Copyright 1997-2016 Freescale Semiconductor, Inc.                         */
+/* Copyright 2016-2019 NXP                                                   */
+/* All rights reserved.                                                      */
+/*                                                                           */
+/* SPDX-License-Identifier: BSD-3-Clause                                     */
+/*****************************************************************************/
+/* Version: GCC for ARM Embedded Processors                                  */
+/*****************************************************************************/
+    .syntax unified
+    .arch armv7-m
+
+#include"flexram_config.s"
+
+
+/* Reset Handler */
+
+    .thumb_func
+    .align 2
+    .globl   Reset_Handler
+    .type    Reset_Handler, %function
+Reset_Handler:
+    cpsid   i               /* Mask interrupts */
+    .equ    VTOR, 0xE000ED08
+    ldr     r0, =VTOR
+    ldr     r1, =__isr_vector
+    str     r1, [r0]
+    ldr     r2, [r1]
+    msr     msp, r2
+
+/* Reconfigure the memory map, which must match the setting of the linker script */
+    dsb
+    isb
+    ldr r0, =__iomux_gpr17_adr   /* load IOMUXC_GPR17 register address to R0 */
+    ldr r1, =__iomux_gpr17_value /* move FlexRAM configuration value to R1 */
+    str r1,[r0]                  /* store FLEXRAM configuration value to IOMUXC_GPR17 */
+    dsb
+    isb
+    ldr r0, =__iomux_gpr16_adr  /* load IOMUXC_GPR16 register address to R0 */
+    ldr r1,[r0]                 /* load IOMUXC_GPR16 register value to R1 */
+    orr r1, r1, #4              /* set corresponding FLEXRAM_BANK_CFG_SEL bit */
+    str r1,[r0]                 /* store the value to IOMUXC_GPR16 (FLEXRAM_BANK_CFG_SEL = '1') */
+    dsb
+    isb
+
+#ifndef __NO_SYSTEM_INIT
+    ldr   r0,=SystemInit
+    blx   r0
+#endif
+/*     Loop to copy data from read only memory to RAM. The ranges
+ *      of copy from/to are specified by following symbols evaluated in
+ *      linker script.
+ *      __etext: End of code section, i.e., begin of data sections to copy from.
+ *      __data_start__/__data_end__: RAM address range that data should be
+ *      __noncachedata_start__/__noncachedata_end__ : none cachable region
+ *      __ram_function_start__/__ram_function_end__ : ramfunction region
+ *      copied to. Both must be aligned to 4 bytes boundary.  */
+
+    ldr    r1, =__etext
+    ldr    r2, =__data_start__
+    ldr    r3, =__data_end__
+
+#ifdef __PERFORMANCE_IMPLEMENTATION
+/* Here are two copies of loop implementations. First one favors performance
+ * and the second one favors code size. Default uses the second one.
+ * Define macro "__PERFORMANCE_IMPLEMENTATION" in project to use the first one */
+    subs    r3, r2
+    ble    .LC1
+.LC0:
+    subs    r3, #4
+    ldr    r0, [r1, r3]
+    str    r0, [r2, r3]
+    bgt    .LC0
+.LC1:
+#else  /* code size implemenation */
+.LC0:
+    cmp     r2, r3
+    ittt    lt
+    ldrlt   r0, [r1], #4
+    strlt   r0, [r2], #4
+    blt    .LC0
+#endif
+#ifdef __STARTUP_INITIALIZE_RAMFUNCTION
+    ldr    r2, =__ram_function_start__
+    ldr    r3, =__ram_function_end__
+#ifdef __PERFORMANCE_IMPLEMENTATION
+/* Here are two copies of loop implementations. First one favors performance
+ * and the second one favors code size. Default uses the second one.
+ * Define macro "__PERFORMANCE_IMPLEMENTATION" in project to use the first one */
+    subs    r3, r2
+    ble    .LC_ramfunc_copy_end
+.LC_ramfunc_copy_start:
+    subs    r3, #4
+    ldr    r0, [r1, r3]
+    str    r0, [r2, r3]
+    bgt    .LC_ramfunc_copy_start
+.LC_ramfunc_copy_end:
+#else  /* code size implemenation */
+.LC_ramfunc_copy_start:
+    cmp     r2, r3
+    ittt    lt
+    ldrlt   r0, [r1], #4
+    strlt   r0, [r2], #4
+    blt    .LC_ramfunc_copy_start
+#endif
+#endif /* __STARTUP_INITIALIZE_RAMFUNCTION */
+#ifdef __STARTUP_INITIALIZE_NONCACHEDATA
+    ldr    r2, =__noncachedata_start__
+    ldr    r3, =__noncachedata_init_end__
+#ifdef __PERFORMANCE_IMPLEMENTATION
+/* Here are two copies of loop implementations. First one favors performance
+ * and the second one favors code size. Default uses the second one.
+ * Define macro "__PERFORMANCE_IMPLEMENTATION" in project to use the first one */
+    subs    r3, r2
+    ble    .LC3
+.LC2:
+    subs    r3, #4
+    ldr    r0, [r1, r3]
+    str    r0, [r2, r3]
+    bgt    .LC2
+.LC3:
+#else  /* code size implemenation */
+.LC2:
+    cmp     r2, r3
+    ittt    lt
+    ldrlt   r0, [r1], #4
+    strlt   r0, [r2], #4
+    blt    .LC2
+#endif
+/* zero inited ncache section initialization */
+    ldr r3, =__noncachedata_end__
+    movs    r0,0
+.LC4:
+    cmp    r2,r3
+    itt    lt
+    strlt   r0,[r2],#4
+    blt    .LC4
+#endif /* __STARTUP_INITIALIZE_NONCACHEDATA */
+
+#ifdef __STARTUP_CLEAR_BSS
+/*     This part of work usually is done in C library startup code. Otherwise,
+ *     define this macro to enable it in this startup.
+ *
+ *     Loop to zero out BSS section, which uses following symbols
+ *     in linker script:
+ *      __bss_start__: start of BSS section. Must align to 4
+ *      __bss_end__: end of BSS section. Must align to 4
+ */
+    ldr r1, =__bss_start__
+    ldr r2, =__bss_end__
+
+    movs    r0, 0
+.LC5:
+    cmp     r1, r2
+    itt    lt
+    strlt   r0, [r1], #4
+    blt    .LC5
+#endif /* __STARTUP_CLEAR_BSS */
+
+    cpsie   i               /* Unmask interrupts */
+#ifndef __START
+#define __START _start
+#endif
+#ifndef __ATOLLIC__
+    ldr   r0,=__START
+    blx   r0
+#else
+    ldr   r0,=__libc_init_array
+    blx   r0
+    ldr   r0,=main
+    bx    r0
+#endif
+    .pool
+    .size Reset_Handler, . - Reset_Handler
diff --git a/tools/autobuild/build-mimxrt-latest.sh b/tools/autobuild/build-mimxrt-latest.sh
index 4db65c09169b3..f5bc1397a55f2 100755
--- a/tools/autobuild/build-mimxrt-latest.sh
+++ b/tools/autobuild/build-mimxrt-latest.sh
@@ -34,4 +34,4 @@ fi
 do_build TEENSY40 TEENSY40 hex
 do_build TEENSY41 TEENSY41 hex
 do_build MIMXRT1020_EVK MIMXRT1020_EVK bin
-do_build MIMXRT1050_EVKB MIMXRT1050_EVKB bin
+do_build MIMXRT1050_EVK MIMXRT1050_EVK bin
diff --git a/tools/codeformat.py b/tools/codeformat.py
index a5d64739aa160..ab12745fa541b 100755
--- a/tools/codeformat.py
+++ b/tools/codeformat.py
@@ -52,6 +52,7 @@
     "examples/**/*.py",
     "extmod/**/*.py",
     "ports/**/*.py",
+    "ports/mimxrt/**/*.[ch]",
     "py/**/*.py",
     "tools/**/*.py",
     "tests/**/*.py",

From 7aab0dc5d81506de2020b7305cf2ee51894d29eb Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Sun, 22 Aug 2021 17:26:13 +0200
Subject: [PATCH 1273/3533] extmod: Move modnetwork and modusocket from stm32
 to extmod.

So they can be used by other ports.
---
 {ports/stm32 => extmod}/modnetwork.c | 35 ------------
 {ports/stm32 => extmod}/modnetwork.h |  0
 {ports/stm32 => extmod}/modusocket.c |  0
 ports/stm32/Makefile                 |  7 +--
 ports/stm32/eth.c                    |  2 +-
 ports/stm32/main.c                   |  2 +-
 ports/stm32/modnwcc3k.c              |  2 +-
 ports/stm32/modnwwiznet5k.c          |  2 +-
 ports/stm32/mpnetworkport.c          | 81 ++++++++++++++++++++++++++++
 ports/stm32/network_lan.c            |  2 +-
 ports/stm32/network_wiznet5k.c       |  2 +-
 11 files changed, 91 insertions(+), 44 deletions(-)
 rename {ports/stm32 => extmod}/modnetwork.c (88%)
 rename {ports/stm32 => extmod}/modnetwork.h (100%)
 rename {ports/stm32 => extmod}/modusocket.c (100%)
 create mode 100644 ports/stm32/mpnetworkport.c

diff --git a/ports/stm32/modnetwork.c b/extmod/modnetwork.c
similarity index 88%
rename from ports/stm32/modnetwork.c
rename to extmod/modnetwork.c
index 06c4eb05db8ea..600f1346bc127 100644
--- a/ports/stm32/modnetwork.c
+++ b/extmod/modnetwork.c
@@ -39,7 +39,6 @@
 #if MICROPY_PY_NETWORK
 
 #if MICROPY_PY_LWIP
-
 #include "lwip/netif.h"
 #include "lwip/timeouts.h"
 #include "lwip/dns.h"
@@ -47,40 +46,6 @@
 #include "lwip/apps/mdns.h"
 #include "extmod/network_cyw43.h"
 #include "drivers/cyw43/cyw43.h"
-
-// Poll lwIP every 128ms
-#define LWIP_TICK(tick) (((tick) & ~(SYSTICK_DISPATCH_NUM_SLOTS - 1) & 0x7f) == 0)
-
-u32_t sys_now(void) {
-    return mp_hal_ticks_ms();
-}
-
-STATIC void pyb_lwip_poll(void) {
-    #if MICROPY_PY_WIZNET5K
-    // Poll the NIC for incoming data
-    wiznet5k_poll();
-    #endif
-
-    // Run the lwIP internal updates
-    sys_check_timeouts();
-}
-
-void mod_network_lwip_poll_wrapper(uint32_t ticks_ms) {
-    if (LWIP_TICK(ticks_ms)) {
-        pendsv_schedule_dispatch(PENDSV_DISPATCH_LWIP, pyb_lwip_poll);
-    }
-
-    #if MICROPY_PY_NETWORK_CYW43
-    if (cyw43_poll) {
-        if (cyw43_sleep != 0) {
-            if (--cyw43_sleep == 0) {
-                pendsv_schedule_dispatch(PENDSV_DISPATCH_CYW43, cyw43_poll);
-            }
-        }
-    }
-    #endif
-}
-
 #endif
 
 /// \module network - network configuration
diff --git a/ports/stm32/modnetwork.h b/extmod/modnetwork.h
similarity index 100%
rename from ports/stm32/modnetwork.h
rename to extmod/modnetwork.h
diff --git a/ports/stm32/modusocket.c b/extmod/modusocket.c
similarity index 100%
rename from ports/stm32/modusocket.c
rename to extmod/modusocket.c
diff --git a/ports/stm32/Makefile b/ports/stm32/Makefile
index a6804ee61604e..d0a4d69a6f556 100644
--- a/ports/stm32/Makefile
+++ b/ports/stm32/Makefile
@@ -267,7 +267,9 @@ endif
 
 EXTMOD_SRC_C += $(addprefix extmod/,\
 	modonewire.c \
-        )
+	modnetwork.c \
+	modusocket.c \
+	)
 
 DRIVERS_SRC_C += $(addprefix drivers/,\
 	bus/softspi.c \
@@ -286,6 +288,7 @@ SRC_C += \
 	usbd_hid_interface.c \
 	usbd_msc_interface.c \
 	mphalport.c \
+	mpnetworkport.c \
 	mpthreadport.c \
 	irq.c \
 	pendsv.c \
@@ -329,9 +332,7 @@ SRC_C += \
 	modstm.c \
 	moduos.c \
 	modutime.c \
-	modusocket.c \
 	network_lan.c \
-	modnetwork.c \
 	extint.c \
 	usrsw.c \
 	rng.c \
diff --git a/ports/stm32/eth.c b/ports/stm32/eth.c
index f174b6af0d57e..be418235e13d4 100644
--- a/ports/stm32/eth.c
+++ b/ports/stm32/eth.c
@@ -29,7 +29,7 @@
 #include "py/mperrno.h"
 #include "shared/netutils/netutils.h"
 #include "pin_static_af.h"
-#include "modnetwork.h"
+#include "extmod/modnetwork.h"
 #include "mpu.h"
 #include "eth.h"
 
diff --git a/ports/stm32/main.c b/ports/stm32/main.c
index ccc8fd1ae7f39..e506cc5713f74 100644
--- a/ports/stm32/main.c
+++ b/ports/stm32/main.c
@@ -39,6 +39,7 @@
 #include "lib/littlefs/lfs1_util.h"
 #include "lib/littlefs/lfs2.h"
 #include "lib/littlefs/lfs2_util.h"
+#include "extmod/modnetwork.h"
 #include "extmod/vfs.h"
 #include "extmod/vfs_fat.h"
 #include "extmod/vfs_lfs.h"
@@ -83,7 +84,6 @@
 #include "servo.h"
 #include "dac.h"
 #include "can.h"
-#include "modnetwork.h"
 
 #if MICROPY_PY_THREAD
 STATIC pyb_thread_t pyb_thread_main;
diff --git a/ports/stm32/modnwcc3k.c b/ports/stm32/modnwcc3k.c
index 07178b65c7ba1..5dae9d6407e53 100644
--- a/ports/stm32/modnwcc3k.c
+++ b/ports/stm32/modnwcc3k.c
@@ -37,7 +37,7 @@
 #include "py/mperrno.h"
 #include "py/mphal.h"
 #include "shared/netutils/netutils.h"
-#include "modnetwork.h"
+#include "extmod/modnetwork.h"
 #include "pin.h"
 #include "spi.h"
 
diff --git a/ports/stm32/modnwwiznet5k.c b/ports/stm32/modnwwiznet5k.c
index 1e18d03ca1fbc..d3c2c516c3b6e 100644
--- a/ports/stm32/modnwwiznet5k.c
+++ b/ports/stm32/modnwwiznet5k.c
@@ -34,7 +34,7 @@
 #include "py/mperrno.h"
 #include "py/mphal.h"
 #include "shared/netutils/netutils.h"
-#include "modnetwork.h"
+#include "extmod/modnetwork.h"
 #include "pin.h"
 #include "spi.h"
 
diff --git a/ports/stm32/mpnetworkport.c b/ports/stm32/mpnetworkport.c
new file mode 100644
index 0000000000000..a5ee15bc67df8
--- /dev/null
+++ b/ports/stm32/mpnetworkport.c
@@ -0,0 +1,81 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2014 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include <stdio.h>
+#include <stdint.h>
+#include <string.h>
+
+#include "py/objlist.h"
+#include "py/runtime.h"
+#include "py/mphal.h"
+#include "shared/netutils/netutils.h"
+#include "systick.h"
+#include "pendsv.h"
+#include "extmod/modnetwork.h"
+
+#if MICROPY_PY_LWIP
+#include "lwip/netif.h"
+#include "lwip/timeouts.h"
+#include "lwip/dns.h"
+#include "lwip/dhcp.h"
+#include "lwip/apps/mdns.h"
+#include "extmod/network_cyw43.h"
+#include "drivers/cyw43/cyw43.h"
+
+// Poll lwIP every 128ms
+#define LWIP_TICK(tick) (((tick) & ~(SYSTICK_DISPATCH_NUM_SLOTS - 1) & 0x7f) == 0)
+
+u32_t sys_now(void) {
+    return mp_hal_ticks_ms();
+}
+
+STATIC void pyb_lwip_poll(void) {
+    #if MICROPY_PY_WIZNET5K
+    // Poll the NIC for incoming data
+    wiznet5k_poll();
+    #endif
+
+    // Run the lwIP internal updates
+    sys_check_timeouts();
+}
+
+void mod_network_lwip_poll_wrapper(uint32_t ticks_ms) {
+    if (LWIP_TICK(ticks_ms)) {
+        pendsv_schedule_dispatch(PENDSV_DISPATCH_LWIP, pyb_lwip_poll);
+    }
+
+    #if MICROPY_PY_NETWORK_CYW43
+    if (cyw43_poll) {
+        if (cyw43_sleep != 0) {
+            if (--cyw43_sleep == 0) {
+                pendsv_schedule_dispatch(PENDSV_DISPATCH_CYW43, cyw43_poll);
+            }
+        }
+    }
+    #endif
+}
+
+#endif // MICROPY_PY_LWIP
diff --git a/ports/stm32/network_lan.c b/ports/stm32/network_lan.c
index 6dd9aadb650a0..f19916a1df091 100644
--- a/ports/stm32/network_lan.c
+++ b/ports/stm32/network_lan.c
@@ -26,7 +26,7 @@
 
 #include "py/runtime.h"
 #include "py/mphal.h"
-#include "modnetwork.h"
+#include "extmod/modnetwork.h"
 #include "eth.h"
 
 #if defined(MICROPY_HW_ETH_MDC)
diff --git a/ports/stm32/network_wiznet5k.c b/ports/stm32/network_wiznet5k.c
index bd4c02cb054d8..b6f1498effa0d 100644
--- a/ports/stm32/network_wiznet5k.c
+++ b/ports/stm32/network_wiznet5k.c
@@ -29,8 +29,8 @@
 
 #include "py/runtime.h"
 #include "py/mphal.h"
+#include "extmod/modnetwork.h"
 #include "spi.h"
-#include "modnetwork.h"
 
 #if MICROPY_PY_WIZNET5K && MICROPY_PY_LWIP
 

From d889f672da7d34550eb1613d25d7d51ad8503263 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Sun, 22 Aug 2021 17:27:38 +0200
Subject: [PATCH 1274/3533] extmod/modnetwork: Add STA_IF and AP_IF constants.

---
 extmod/modnetwork.c | 4 ++++
 extmod/modnetwork.h | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/extmod/modnetwork.c b/extmod/modnetwork.c
index 600f1346bc127..043d1967a348b 100644
--- a/extmod/modnetwork.c
+++ b/extmod/modnetwork.c
@@ -110,6 +110,10 @@ STATIC const mp_rom_map_elem_t mp_module_network_globals_table[] = {
     #if MICROPY_PY_NETWORK_CYW43
     { MP_ROM_QSTR(MP_QSTR_STA_IF), MP_ROM_INT(CYW43_ITF_STA)},
     { MP_ROM_QSTR(MP_QSTR_AP_IF), MP_ROM_INT(CYW43_ITF_AP)},
+    #else
+    // Station/AP mode.
+    { MP_ROM_QSTR(MP_QSTR_STA_IF), MP_ROM_INT(MOD_NETWORK_STA_IF) },
+    { MP_ROM_QSTR(MP_QSTR_AP_IF), MP_ROM_INT(MOD_NETWORK_AP_IF) },
     #endif
 };
 
diff --git a/extmod/modnetwork.h b/extmod/modnetwork.h
index 0b6d0c4a7fbcf..9017625cf0ae1 100644
--- a/extmod/modnetwork.h
+++ b/extmod/modnetwork.h
@@ -35,6 +35,9 @@
 #define MOD_NETWORK_SOCK_DGRAM (2)
 #define MOD_NETWORK_SOCK_RAW (3)
 
+#define MOD_NETWORK_STA_IF (0)
+#define MOD_NETWORK_AP_IF (1)
+
 #if MICROPY_PY_LWIP
 
 struct netif;

From e7429389a6a6322ebf88c30bf417279dc36ecda1 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Sun, 22 Aug 2021 17:29:35 +0200
Subject: [PATCH 1275/3533] extmod/modnetwork: Add extended socket state.

---
 extmod/modnetwork.h | 6 ++++++
 extmod/modusocket.c | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/extmod/modnetwork.h b/extmod/modnetwork.h
index 9017625cf0ae1..50c8bc4b06c8c 100644
--- a/extmod/modnetwork.h
+++ b/extmod/modnetwork.h
@@ -85,9 +85,15 @@ typedef struct _mod_network_socket_obj_t {
             uint8_t domain;
             uint8_t type;
             int8_t fileno;
+            uint8_t bound;
         } u_param;
         mp_uint_t u_state;
     };
+    #if MICROPY_PY_USOCKET_EXTENDED_STATE
+    // Extended socket state for NICs/ports that need it.
+    int32_t timeout;
+    void *state;
+    #endif
 } mod_network_socket_obj_t;
 
 extern const mod_network_nic_type_t mod_network_nic_type_wiznet5k;
diff --git a/extmod/modusocket.c b/extmod/modusocket.c
index c59fc85226072..143470a96af83 100644
--- a/extmod/modusocket.c
+++ b/extmod/modusocket.c
@@ -54,6 +54,7 @@ STATIC mp_obj_t socket_make_new(const mp_obj_type_t *type, size_t n_args, size_t
     s->u_param.domain = MOD_NETWORK_AF_INET;
     s->u_param.type = MOD_NETWORK_SOCK_STREAM;
     s->u_param.fileno = -1;
+    s->u_param.bound = false;
     if (n_args >= 1) {
         s->u_param.domain = mp_obj_get_int(args[0]);
         if (n_args >= 2) {
@@ -64,6 +65,11 @@ STATIC mp_obj_t socket_make_new(const mp_obj_type_t *type, size_t n_args, size_t
         }
     }
 
+    #if MICROPY_PY_USOCKET_EXTENDED_STATE
+    s->timeout = 0;
+    s->state = NULL;
+    #endif
+
     return MP_OBJ_FROM_PTR(s);
 }
 

From c13e25c329ae65c6a7ccbb35b95406a5939bea4e Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Sun, 22 Aug 2021 17:57:52 +0200
Subject: [PATCH 1276/3533] extmod/modusocket: Add read/write stream methods to
 socket object.

Following other socket implementations.
---
 extmod/modusocket.c | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/extmod/modusocket.c b/extmod/modusocket.c
index 143470a96af83..fea81077c555a 100644
--- a/extmod/modusocket.c
+++ b/extmod/modusocket.c
@@ -362,10 +362,41 @@ STATIC const mp_rom_map_elem_t socket_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_setsockopt), MP_ROM_PTR(&socket_setsockopt_obj) },
     { MP_ROM_QSTR(MP_QSTR_settimeout), MP_ROM_PTR(&socket_settimeout_obj) },
     { MP_ROM_QSTR(MP_QSTR_setblocking), MP_ROM_PTR(&socket_setblocking_obj) },
+
+    { MP_ROM_QSTR(MP_QSTR_read), MP_ROM_PTR(&mp_stream_read_obj) },
+    { MP_ROM_QSTR(MP_QSTR_readinto), MP_ROM_PTR(&mp_stream_readinto_obj) },
+    { MP_ROM_QSTR(MP_QSTR_readline), MP_ROM_PTR(&mp_stream_unbuffered_readline_obj) },
+    { MP_ROM_QSTR(MP_QSTR_write), MP_ROM_PTR(&mp_stream_write_obj) },
 };
 
 STATIC MP_DEFINE_CONST_DICT(socket_locals_dict, socket_locals_dict_table);
 
+mp_uint_t socket_read(mp_obj_t self_in, void *buf, mp_uint_t size, int *errcode) {
+    mod_network_socket_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    if (self->nic == MP_OBJ_NULL) {
+        return MP_STREAM_ERROR;
+    }
+    mp_int_t ret = self->nic_type->recv(self, (byte *)buf, size, errcode);
+    if (ret < 0) {
+        ret = MP_STREAM_ERROR;
+        *errcode = -(*errcode); // expects a positive error code
+    }
+    return ret;
+}
+
+mp_uint_t socket_write(mp_obj_t self_in, const void *buf, mp_uint_t size, int *errcode) {
+    mod_network_socket_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    if (self->nic == MP_OBJ_NULL) {
+        return MP_STREAM_ERROR;
+    }
+    mp_int_t ret = self->nic_type->send(self, buf, size, errcode);
+    if (ret < 0) {
+        ret = MP_STREAM_ERROR;
+        *errcode = -(*errcode); // expects a positive error code
+    }
+    return ret;
+}
+
 mp_uint_t socket_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_t arg, int *errcode) {
     mod_network_socket_obj_t *self = MP_OBJ_TO_PTR(self_in);
     if (request == MP_STREAM_CLOSE) {
@@ -386,6 +417,8 @@ mp_uint_t socket_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_t arg, int *
 }
 
 STATIC const mp_stream_p_t socket_stream_p = {
+    .read = socket_read,
+    .write = socket_write,
     .ioctl = socket_ioctl,
     .is_text = false,
 };

From 4dba04a50fea01f6f8fec83d64f958f8d14e285a Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Tue, 24 Aug 2021 16:59:32 +0200
Subject: [PATCH 1277/3533] extmod/modnetwork: Define network interfaces in
 port config files.

So this network implementation becomes more generic.
---
 extmod/modnetwork.c        | 26 +++-----------------------
 extmod/modnetwork.h        | 13 +------------
 ports/stm32/mpconfigport.h | 34 ++++++++++++++++++++++++++++++++++
 3 files changed, 38 insertions(+), 35 deletions(-)

diff --git a/extmod/modnetwork.c b/extmod/modnetwork.c
index 043d1967a348b..a6a37ccb7e262 100644
--- a/extmod/modnetwork.c
+++ b/extmod/modnetwork.c
@@ -44,8 +44,6 @@
 #include "lwip/dns.h"
 #include "lwip/dhcp.h"
 #include "lwip/apps/mdns.h"
-#include "extmod/network_cyw43.h"
-#include "drivers/cyw43/cyw43.h"
 #endif
 
 /// \module network - network configuration
@@ -89,32 +87,14 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_0(network_route_obj, network_route);
 
 STATIC const mp_rom_map_elem_t mp_module_network_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_network) },
-
-    #if defined(MICROPY_HW_ETH_MDC)
-    { MP_ROM_QSTR(MP_QSTR_LAN), MP_ROM_PTR(&network_lan_type) },
-    #endif
-    #if MICROPY_PY_NETWORK_CYW43
-    { MP_ROM_QSTR(MP_QSTR_WLAN), MP_ROM_PTR(&mp_network_cyw43_type) },
-    #endif
-
-    #if MICROPY_PY_WIZNET5K
-    { MP_ROM_QSTR(MP_QSTR_WIZNET5K), MP_ROM_PTR(&mod_network_nic_type_wiznet5k) },
-    #endif
-    #if MICROPY_PY_CC3K
-    { MP_ROM_QSTR(MP_QSTR_CC3K), MP_ROM_PTR(&mod_network_nic_type_cc3k) },
-    #endif
-
     { MP_ROM_QSTR(MP_QSTR_route), MP_ROM_PTR(&network_route_obj) },
 
+    // Defined per port in mpconfigport.h
+    MICROPY_PORT_NETWORK_INTERFACES
+
     // Constants
-    #if MICROPY_PY_NETWORK_CYW43
-    { MP_ROM_QSTR(MP_QSTR_STA_IF), MP_ROM_INT(CYW43_ITF_STA)},
-    { MP_ROM_QSTR(MP_QSTR_AP_IF), MP_ROM_INT(CYW43_ITF_AP)},
-    #else
-    // Station/AP mode.
     { MP_ROM_QSTR(MP_QSTR_STA_IF), MP_ROM_INT(MOD_NETWORK_STA_IF) },
     { MP_ROM_QSTR(MP_QSTR_AP_IF), MP_ROM_INT(MOD_NETWORK_AP_IF) },
-    #endif
 };
 
 STATIC MP_DEFINE_CONST_DICT(mp_module_network_globals, mp_module_network_globals_table);
diff --git a/extmod/modnetwork.h b/extmod/modnetwork.h
index 50c8bc4b06c8c..0f493509805e3 100644
--- a/extmod/modnetwork.h
+++ b/extmod/modnetwork.h
@@ -39,17 +39,9 @@
 #define MOD_NETWORK_AP_IF (1)
 
 #if MICROPY_PY_LWIP
-
 struct netif;
-
-extern const mp_obj_type_t network_lan_type;
-extern const mp_obj_type_t mod_network_nic_type_wiznet5k;
-
 void mod_network_lwip_poll_wrapper(uint32_t ticks_ms);
 mp_obj_t mod_network_nic_ifconfig(struct netif *netif, size_t n_args, const mp_obj_t *args);
-
-void wiznet5k_poll(void);
-
 #else
 
 struct _mod_network_socket_obj_t;
@@ -96,10 +88,7 @@ typedef struct _mod_network_socket_obj_t {
     #endif
 } mod_network_socket_obj_t;
 
-extern const mod_network_nic_type_t mod_network_nic_type_wiznet5k;
-extern const mod_network_nic_type_t mod_network_nic_type_cc3k;
-
-#endif
+#endif // MICROPY_PY_LWIP
 
 void mod_network_init(void);
 void mod_network_deinit(void);
diff --git a/ports/stm32/mpconfigport.h b/ports/stm32/mpconfigport.h
index eff90cb25f4a5..3147e286810cd 100644
--- a/ports/stm32/mpconfigport.h
+++ b/ports/stm32/mpconfigport.h
@@ -323,6 +323,34 @@ extern const struct _mp_obj_module_t mp_module_onewire;
 #define ONEWIRE_BUILTIN_MODULE
 #endif
 
+#if defined(MICROPY_HW_ETH_MDC)
+extern const struct _mp_obj_type_t network_lan_type;
+#define MICROPY_HW_NIC_ETH                  { MP_ROM_QSTR(MP_QSTR_LAN), MP_ROM_PTR(&network_lan_type) },
+#else
+#define MICROPY_HW_NIC_ETH
+#endif
+
+#if MICROPY_PY_NETWORK_CYW43
+extern const struct _mp_obj_type_t mp_network_cyw43_type;
+#define MICROPY_HW_NIC_CYW43                { MP_ROM_QSTR(MP_QSTR_WLAN), MP_ROM_PTR(&mp_network_cyw43_type) },
+#else
+#define MICROPY_HW_NIC_CYW43
+#endif
+
+#if MICROPY_PY_WIZNET5K
+extern const struct _mod_network_nic_type_t mod_network_nic_type_wiznet5k;
+#define MICROPY_HW_NIC_WIZNET5K             { MP_ROM_QSTR(MP_QSTR_WIZNET5K), MP_ROM_PTR(&mod_network_nic_type_wiznet5k) },
+#else
+#define MICROPY_HW_NIC_WIZNET5K
+#endif
+
+#if MICROPY_PY_CC3K
+extern const struct _mod_network_nic_type_t mod_network_nic_type_cc3k;
+#define MICROPY_HW_NIC_CC3K                 { MP_ROM_QSTR(MP_QSTR_CC3K), MP_ROM_PTR(&mod_network_nic_type_cc3k) },
+#else
+#define MICROPY_HW_NIC_CC3K
+#endif
+
 #define MICROPY_PORT_BUILTIN_MODULES \
     MACHINE_BUILTIN_MODULE \
     PYB_BUILTIN_MODULE \
@@ -340,6 +368,12 @@ extern const struct _mp_obj_module_t mp_module_onewire;
     PYB_BUILTIN_MODULE \
     STM_BUILTIN_MODULE \
 
+#define MICROPY_PORT_NETWORK_INTERFACES \
+    MICROPY_HW_NIC_ETH  \
+    MICROPY_HW_NIC_CYW43 \
+    MICROPY_HW_NIC_WIZNET5K \
+    MICROPY_HW_NIC_CC3K \
+
 #define MP_STATE_PORT MP_STATE_VM
 
 #if MICROPY_SSL_MBEDTLS

From a34d43b2b7a0651e52eeab52298a02556ed2c23c Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 15 Sep 2021 01:36:39 +1000
Subject: [PATCH 1278/3533] extmod/network_cyw43: Make consistent use of STA
 and AP constants.

The network.STA_IF and network.AP_IF constants are now independent to the
CYW43_ITF_STA and CYW43_ITF_AP constants.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/network_cyw43.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/extmod/network_cyw43.c b/extmod/network_cyw43.c
index a5ed5d5b8e067..d2383c7187358 100644
--- a/extmod/network_cyw43.c
+++ b/extmod/network_cyw43.c
@@ -43,8 +43,8 @@ typedef struct _network_cyw43_obj_t {
     int itf;
 } network_cyw43_obj_t;
 
-STATIC const network_cyw43_obj_t network_cyw43_wl0 = { { &mp_network_cyw43_type }, &cyw43_state, 0 };
-STATIC const network_cyw43_obj_t network_cyw43_wl1 = { { &mp_network_cyw43_type }, &cyw43_state, 1 };
+STATIC const network_cyw43_obj_t network_cyw43_wl_sta = { { &mp_network_cyw43_type }, &cyw43_state, CYW43_ITF_STA };
+STATIC const network_cyw43_obj_t network_cyw43_wl_ap = { { &mp_network_cyw43_type }, &cyw43_state, CYW43_ITF_AP };
 
 STATIC void network_cyw43_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     network_cyw43_obj_t *self = MP_OBJ_TO_PTR(self_in);
@@ -65,7 +65,7 @@ STATIC void network_cyw43_print(const mp_print_t *print, mp_obj_t self_in, mp_pr
         status_str = "fail";
     }
     mp_printf(print, "<CYW43 %s %s %u.%u.%u.%u>",
-        self->itf == 0 ? "STA" : "AP",
+        self->itf == CYW43_ITF_STA ? "STA" : "AP",
         status_str,
         netif->ip_addr.addr & 0xff,
         netif->ip_addr.addr >> 8 & 0xff,
@@ -76,10 +76,10 @@ STATIC void network_cyw43_print(const mp_print_t *print, mp_obj_t self_in, mp_pr
 
 STATIC mp_obj_t network_cyw43_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
     mp_arg_check_num(n_args, n_kw, 0, 1, false);
-    if (n_args == 0 || mp_obj_get_int(args[0]) == 0) {
-        return MP_OBJ_FROM_PTR(&network_cyw43_wl0);
+    if (n_args == 0 || mp_obj_get_int(args[0]) == MOD_NETWORK_STA_IF) {
+        return MP_OBJ_FROM_PTR(&network_cyw43_wl_sta);
     } else {
-        return MP_OBJ_FROM_PTR(&network_cyw43_wl1);
+        return MP_OBJ_FROM_PTR(&network_cyw43_wl_ap);
     }
 }
 

From d451dc008680bfb27786b6f1d84ceac5da640050 Mon Sep 17 00:00:00 2001
From: Jan Hrudka <jahr@atlas.cz>
Date: Thu, 9 Sep 2021 23:39:09 +0200
Subject: [PATCH 1279/3533] stm32: Add basic support for STM32H750.

---
 ports/stm32/Makefile     | 4 ++--
 ports/stm32/adc.c        | 3 ++-
 ports/stm32/mboot/main.c | 2 ++
 ports/stm32/powerctrl.c  | 2 +-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/ports/stm32/Makefile b/ports/stm32/Makefile
index d0a4d69a6f556..1614db235878a 100644
--- a/ports/stm32/Makefile
+++ b/ports/stm32/Makefile
@@ -77,7 +77,7 @@ CFLAGS_CORTEX_M = -mthumb
 # Select hardware floating-point support
 SUPPORTS_HARDWARE_FP_SINGLE = 0
 SUPPORTS_HARDWARE_FP_DOUBLE = 0
-ifeq ($(CMSIS_MCU),$(filter $(CMSIS_MCU),STM32F765xx STM32F767xx STM32F769xx STM32H743xx))
+ifeq ($(CMSIS_MCU),$(filter $(CMSIS_MCU),STM32F765xx STM32F767xx STM32F769xx STM32H743xx STM32H750xx))
 CFLAGS_CORTEX_M += -mfpu=fpv5-d16 -mfloat-abi=hard
 SUPPORTS_HARDWARE_FP_SINGLE = 1
 SUPPORTS_HARDWARE_FP_DOUBLE = 1
@@ -424,7 +424,7 @@ HAL_SRC_C += $(addprefix $(HAL_DIR)/Src/stm32$(MCU_SERIES)xx_,\
 	)
 endif
 
-ifeq ($(CMSIS_MCU),$(filter $(CMSIS_MCU),STM32H743xx))
+ifeq ($(CMSIS_MCU),$(filter $(CMSIS_MCU),STM32H743xx STM32H750xx))
     HAL_SRC_C += $(addprefix $(HAL_DIR)/Src/stm32$(MCU_SERIES)xx_, hal_fdcan.c)
 else
 ifeq ($(MCU_SERIES),$(filter $(MCU_SERIES),f0 f4 f7 h7 l4))
diff --git a/ports/stm32/adc.c b/ports/stm32/adc.c
index 09cd3306bbf57..dd2702d6f92e7 100644
--- a/ports/stm32/adc.c
+++ b/ports/stm32/adc.c
@@ -136,7 +136,8 @@
     defined(STM32F746xx) || defined(STM32F765xx) || \
     defined(STM32F767xx) || defined(STM32F769xx)
 #define VBAT_DIV (4)
-#elif defined(STM32H743xx) || defined(STM32H747xx)
+#elif defined(STM32H743xx) || defined(STM32H747xx) || \
+    defined(STM32H750xx)
 #define VBAT_DIV (4)
 #elif defined(STM32L432xx) || \
     defined(STM32L451xx) || defined(STM32L452xx) || \
diff --git a/ports/stm32/mboot/main.c b/ports/stm32/mboot/main.c
index 6c7d2c7714a8e..278c07fb4a9d6 100644
--- a/ports/stm32/mboot/main.c
+++ b/ports/stm32/mboot/main.c
@@ -501,6 +501,8 @@ void led0_update() {
 #define FLASH_LAYOUT_STR "@Internal Flash  /0x08000000/04*032Kg,01*128Kg,07*256Kg" MBOOT_SPIFLASH_LAYOUT MBOOT_SPIFLASH2_LAYOUT
 #elif defined(STM32H743xx)
 #define FLASH_LAYOUT_STR "@Internal Flash  /0x08000000/16*128Kg" MBOOT_SPIFLASH_LAYOUT MBOOT_SPIFLASH2_LAYOUT
+#elif defined(STM32H750xx)
+#define FLASH_LAYOUT_STR "@Internal Flash  /0x08000000/01*128Kg" MBOOT_SPIFLASH_LAYOUT MBOOT_SPIFLASH2_LAYOUT
 #elif defined(STM32WB)
 #define FLASH_LAYOUT_STR "@Internal Flash  /0x08000000/256*04Kg" MBOOT_SPIFLASH_LAYOUT MBOOT_SPIFLASH2_LAYOUT
 #endif
diff --git a/ports/stm32/powerctrl.c b/ports/stm32/powerctrl.c
index 137312ade8a05..9d9cc7f51bfa8 100644
--- a/ports/stm32/powerctrl.c
+++ b/ports/stm32/powerctrl.c
@@ -32,7 +32,7 @@
 
 #if defined(STM32H7)
 #define RCC_SR          RSR
-#if defined(STM32H743xx)
+#if defined(STM32H743xx) || defined(STM32H750xx)
 #define RCC_SR_SFTRSTF  RCC_RSR_SFTRSTF
 #elif defined(STM32H747xx)
 #define RCC_SR_SFTRSTF  RCC_RSR_SFT2RSTF

From f9d573a4ace66b6b8991f304f4a895906fb4ad61 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Tue, 14 Sep 2021 20:33:53 +0200
Subject: [PATCH 1280/3533] extmod/modnetwork: Remove STM32 references.

---
 extmod/modnetwork.c | 2 --
 extmod/modnetwork.h | 6 +++---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/extmod/modnetwork.c b/extmod/modnetwork.c
index a6a37ccb7e262..1f242de86976f 100644
--- a/extmod/modnetwork.c
+++ b/extmod/modnetwork.c
@@ -32,8 +32,6 @@
 #include "py/runtime.h"
 #include "py/mphal.h"
 #include "shared/netutils/netutils.h"
-#include "systick.h"
-#include "pendsv.h"
 #include "modnetwork.h"
 
 #if MICROPY_PY_NETWORK
diff --git a/extmod/modnetwork.h b/extmod/modnetwork.h
index 0f493509805e3..39e4d06d69986 100644
--- a/extmod/modnetwork.h
+++ b/extmod/modnetwork.h
@@ -23,8 +23,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#ifndef MICROPY_INCLUDED_STM32_MODNETWORK_H
-#define MICROPY_INCLUDED_STM32_MODNETWORK_H
+#ifndef MICROPY_INCLUDED_MODNETWORK_H
+#define MICROPY_INCLUDED_MODNETWORK_H
 
 #define MOD_NETWORK_IPADDR_BUF_SIZE (4)
 
@@ -95,4 +95,4 @@ void mod_network_deinit(void);
 void mod_network_register_nic(mp_obj_t nic);
 mp_obj_t mod_network_find_nic(const uint8_t *ip);
 
-#endif // MICROPY_INCLUDED_STM32_MODNETWORK_H
+#endif // MICROPY_INCLUDED_MODNETWORK_H

From d9749f90ad6aecbebffe09a9e252a81624750ceb Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Tue, 14 Sep 2021 21:21:09 +0200
Subject: [PATCH 1281/3533] extmod/modnetwork: Remove modnetwork socket u_state
 member.

To simplify the socket state.

The CC3K driver (see drivers/cc3000/inc/socket.h and src/socket.c) has
socket() returning an INT16 so there is now enough room to store it
directly in the fileno member.
---
 extmod/modnetwork.h         | 14 ++++------
 extmod/modusocket.c         | 15 +++++-----
 ports/stm32/modnwcc3k.c     | 52 +++++++++++++++++-----------------
 ports/stm32/modnwwiznet5k.c | 56 +++++++++++++++++++------------------
 4 files changed, 68 insertions(+), 69 deletions(-)

diff --git a/extmod/modnetwork.h b/extmod/modnetwork.h
index 39e4d06d69986..bbf80bc4748b6 100644
--- a/extmod/modnetwork.h
+++ b/extmod/modnetwork.h
@@ -72,15 +72,11 @@ typedef struct _mod_network_socket_obj_t {
     mp_obj_base_t base;
     mp_obj_t nic;
     mod_network_nic_type_t *nic_type;
-    union {
-        struct {
-            uint8_t domain;
-            uint8_t type;
-            int8_t fileno;
-            uint8_t bound;
-        } u_param;
-        mp_uint_t u_state;
-    };
+    uint32_t domain : 5;
+    uint32_t type   : 5;
+    uint32_t proto  : 5;
+    uint32_t bound  : 1;
+    int32_t fileno  : 16;
     #if MICROPY_PY_USOCKET_EXTENDED_STATE
     // Extended socket state for NICs/ports that need it.
     int32_t timeout;
diff --git a/extmod/modusocket.c b/extmod/modusocket.c
index fea81077c555a..e08f8134fdde7 100644
--- a/extmod/modusocket.c
+++ b/extmod/modusocket.c
@@ -51,16 +51,17 @@ STATIC mp_obj_t socket_make_new(const mp_obj_type_t *type, size_t n_args, size_t
     s->base.type = &socket_type;
     s->nic = MP_OBJ_NULL;
     s->nic_type = NULL;
-    s->u_param.domain = MOD_NETWORK_AF_INET;
-    s->u_param.type = MOD_NETWORK_SOCK_STREAM;
-    s->u_param.fileno = -1;
-    s->u_param.bound = false;
+    s->domain = MOD_NETWORK_AF_INET;
+    s->type = MOD_NETWORK_SOCK_STREAM;
+    s->proto = 0;
+    s->bound = false;
+    s->fileno = -1;
     if (n_args >= 1) {
-        s->u_param.domain = mp_obj_get_int(args[0]);
+        s->domain = mp_obj_get_int(args[0]);
         if (n_args >= 2) {
-            s->u_param.type = mp_obj_get_int(args[1]);
+            s->type = mp_obj_get_int(args[1]);
             if (n_args >= 4) {
-                s->u_param.fileno = mp_obj_get_int(args[3]);
+                s->fileno = mp_obj_get_int(args[3]);
             }
         }
     }
diff --git a/ports/stm32/modnwcc3k.c b/ports/stm32/modnwcc3k.c
index 5dae9d6407e53..952e535c2dbc6 100644
--- a/ports/stm32/modnwcc3k.c
+++ b/ports/stm32/modnwcc3k.c
@@ -136,13 +136,13 @@ STATIC int cc3k_gethostbyname(mp_obj_t nic, const char *name, mp_uint_t len, uin
 }
 
 STATIC int cc3k_socket_socket(mod_network_socket_obj_t *socket, int *_errno) {
-    if (socket->u_param.domain != MOD_NETWORK_AF_INET) {
+    if (socket->domain != MOD_NETWORK_AF_INET) {
         *_errno = MP_EAFNOSUPPORT;
         return -1;
     }
 
     mp_uint_t type;
-    switch (socket->u_param.type) {
+    switch (socket->type) {
         case MOD_NETWORK_SOCK_STREAM:
             type = SOCK_STREAM;
             break;
@@ -168,23 +168,23 @@ STATIC int cc3k_socket_socket(mod_network_socket_obj_t *socket, int *_errno) {
     cc3k_reset_fd_closed_state(fd);
 
     // store state of this socket
-    socket->u_state = fd;
+    socket->fileno = fd;
 
     // make accept blocking by default
     int optval = SOCK_OFF;
     socklen_t optlen = sizeof(optval);
-    CC3000_EXPORT(setsockopt)(socket->u_state, SOL_SOCKET, SOCKOPT_ACCEPT_NONBLOCK, &optval, optlen);
+    CC3000_EXPORT(setsockopt)(socket->fileno, SOL_SOCKET, SOCKOPT_ACCEPT_NONBLOCK, &optval, optlen);
 
     return 0;
 }
 
 STATIC void cc3k_socket_close(mod_network_socket_obj_t *socket) {
-    CC3000_EXPORT(closesocket)(socket->u_state);
+    CC3000_EXPORT(closesocket)(socket->fileno);
 }
 
 STATIC int cc3k_socket_bind(mod_network_socket_obj_t *socket, byte *ip, mp_uint_t port, int *_errno) {
     MAKE_SOCKADDR(addr, ip, port)
-    int ret = CC3000_EXPORT(bind)(socket->u_state, &addr, sizeof(addr));
+    int ret = CC3000_EXPORT(bind)(socket->fileno, &addr, sizeof(addr));
     if (ret != 0) {
         *_errno = ret;
         return -1;
@@ -193,7 +193,7 @@ STATIC int cc3k_socket_bind(mod_network_socket_obj_t *socket, byte *ip, mp_uint_
 }
 
 STATIC int cc3k_socket_listen(mod_network_socket_obj_t *socket, mp_int_t backlog, int *_errno) {
-    int ret = CC3000_EXPORT(listen)(socket->u_state, backlog);
+    int ret = CC3000_EXPORT(listen)(socket->fileno, backlog);
     if (ret != 0) {
         *_errno = ret;
         return -1;
@@ -206,7 +206,7 @@ STATIC int cc3k_socket_accept(mod_network_socket_obj_t *socket, mod_network_sock
     int fd;
     sockaddr addr;
     socklen_t addr_len = sizeof(addr);
-    if ((fd = CC3000_EXPORT(accept)(socket->u_state, &addr, &addr_len)) < 0) {
+    if ((fd = CC3000_EXPORT(accept)(socket->fileno, &addr, &addr_len)) < 0) {
         if (fd == SOC_IN_PROGRESS) {
             *_errno = MP_EAGAIN;
         } else {
@@ -219,7 +219,7 @@ STATIC int cc3k_socket_accept(mod_network_socket_obj_t *socket, mod_network_sock
     cc3k_reset_fd_closed_state(fd);
 
     // store state in new socket object
-    socket2->u_state = fd;
+    socket2->fileno = fd;
 
     // return ip and port
     // it seems CC3000 returns little endian for accept??
@@ -235,7 +235,7 @@ STATIC int cc3k_socket_accept(mod_network_socket_obj_t *socket, mod_network_sock
 
 STATIC int cc3k_socket_connect(mod_network_socket_obj_t *socket, byte *ip, mp_uint_t port, int *_errno) {
     MAKE_SOCKADDR(addr, ip, port)
-    int ret = CC3000_EXPORT(connect)(socket->u_state, &addr, sizeof(addr));
+    int ret = CC3000_EXPORT(connect)(socket->fileno, &addr, sizeof(addr));
     if (ret != 0) {
         *_errno = CC3000_EXPORT(errno);
         return -1;
@@ -244,8 +244,8 @@ STATIC int cc3k_socket_connect(mod_network_socket_obj_t *socket, byte *ip, mp_ui
 }
 
 STATIC mp_uint_t cc3k_socket_send(mod_network_socket_obj_t *socket, const byte *buf, mp_uint_t len, int *_errno) {
-    if (cc3k_get_fd_closed_state(socket->u_state)) {
-        CC3000_EXPORT(closesocket)(socket->u_state);
+    if (cc3k_get_fd_closed_state(socket->fileno)) {
+        CC3000_EXPORT(closesocket)(socket->fileno);
         *_errno = MP_EPIPE;
         return -1;
     }
@@ -255,7 +255,7 @@ STATIC mp_uint_t cc3k_socket_send(mod_network_socket_obj_t *socket, const byte *
     mp_int_t bytes = 0;
     while (bytes < len) {
         int n = MIN((len - bytes), MAX_TX_PACKET);
-        n = CC3000_EXPORT(send)(socket->u_state, (uint8_t *)buf + bytes, n, 0);
+        n = CC3000_EXPORT(send)(socket->fileno, (uint8_t *)buf + bytes, n, 0);
         if (n <= 0) {
             *_errno = CC3000_EXPORT(errno);
             return -1;
@@ -268,18 +268,18 @@ STATIC mp_uint_t cc3k_socket_send(mod_network_socket_obj_t *socket, const byte *
 
 STATIC mp_uint_t cc3k_socket_recv(mod_network_socket_obj_t *socket, byte *buf, mp_uint_t len, int *_errno) {
     // check the socket is open
-    if (cc3k_get_fd_closed_state(socket->u_state)) {
+    if (cc3k_get_fd_closed_state(socket->fileno)) {
         // socket is closed, but CC3000 may have some data remaining in buffer, so check
         fd_set rfds;
         FD_ZERO(&rfds);
-        FD_SET(socket->u_state, &rfds);
+        FD_SET(socket->fileno, &rfds);
         cc3000_timeval tv;
         tv.tv_sec = 0;
         tv.tv_usec = 1;
-        int nfds = CC3000_EXPORT(select)(socket->u_state + 1, &rfds, NULL, NULL, &tv);
-        if (nfds == -1 || !FD_ISSET(socket->u_state, &rfds)) {
+        int nfds = CC3000_EXPORT(select)(socket->fileno + 1, &rfds, NULL, NULL, &tv);
+        if (nfds == -1 || !FD_ISSET(socket->fileno, &rfds)) {
             // no data waiting, so close socket and return 0 data
-            CC3000_EXPORT(closesocket)(socket->u_state);
+            CC3000_EXPORT(closesocket)(socket->fileno);
             return 0;
         }
     }
@@ -288,7 +288,7 @@ STATIC mp_uint_t cc3k_socket_recv(mod_network_socket_obj_t *socket, byte *buf, m
     len = MIN(len, MAX_RX_PACKET);
 
     // do the recv
-    int ret = CC3000_EXPORT(recv)(socket->u_state, buf, len, 0);
+    int ret = CC3000_EXPORT(recv)(socket->fileno, buf, len, 0);
     if (ret < 0) {
         *_errno = CC3000_EXPORT(errno);
         return -1;
@@ -299,7 +299,7 @@ STATIC mp_uint_t cc3k_socket_recv(mod_network_socket_obj_t *socket, byte *buf, m
 
 STATIC mp_uint_t cc3k_socket_sendto(mod_network_socket_obj_t *socket, const byte *buf, mp_uint_t len, byte *ip, mp_uint_t port, int *_errno) {
     MAKE_SOCKADDR(addr, ip, port)
-    int ret = CC3000_EXPORT(sendto)(socket->u_state, (byte *)buf, len, 0, (sockaddr *)&addr, sizeof(addr));
+    int ret = CC3000_EXPORT(sendto)(socket->fileno, (byte *)buf, len, 0, (sockaddr *)&addr, sizeof(addr));
     if (ret < 0) {
         *_errno = CC3000_EXPORT(errno);
         return -1;
@@ -310,7 +310,7 @@ STATIC mp_uint_t cc3k_socket_sendto(mod_network_socket_obj_t *socket, const byte
 STATIC mp_uint_t cc3k_socket_recvfrom(mod_network_socket_obj_t *socket, byte *buf, mp_uint_t len, byte *ip, mp_uint_t *port, int *_errno) {
     sockaddr addr;
     socklen_t addr_len = sizeof(addr);
-    mp_int_t ret = CC3000_EXPORT(recvfrom)(socket->u_state, buf, len, 0, &addr, &addr_len);
+    mp_int_t ret = CC3000_EXPORT(recvfrom)(socket->fileno, buf, len, 0, &addr, &addr_len);
     if (ret < 0) {
         *_errno = CC3000_EXPORT(errno);
         return -1;
@@ -320,7 +320,7 @@ STATIC mp_uint_t cc3k_socket_recvfrom(mod_network_socket_obj_t *socket, byte *bu
 }
 
 STATIC int cc3k_socket_setsockopt(mod_network_socket_obj_t *socket, mp_uint_t level, mp_uint_t opt, const void *optval, mp_uint_t optlen, int *_errno) {
-    int ret = CC3000_EXPORT(setsockopt)(socket->u_state, level, opt, optval, optlen);
+    int ret = CC3000_EXPORT(setsockopt)(socket->fileno, level, opt, optval, optlen);
     if (ret < 0) {
         *_errno = CC3000_EXPORT(errno);
         return -1;
@@ -340,14 +340,14 @@ STATIC int cc3k_socket_settimeout(mod_network_socket_obj_t *socket, mp_uint_t ti
             // set blocking mode
             optval = SOCK_OFF;
         }
-        ret = CC3000_EXPORT(setsockopt)(socket->u_state, SOL_SOCKET, SOCKOPT_RECV_NONBLOCK, &optval, optlen);
+        ret = CC3000_EXPORT(setsockopt)(socket->fileno, SOL_SOCKET, SOCKOPT_RECV_NONBLOCK, &optval, optlen);
         if (ret == 0) {
-            ret = CC3000_EXPORT(setsockopt)(socket->u_state, SOL_SOCKET, SOCKOPT_ACCEPT_NONBLOCK, &optval, optlen);
+            ret = CC3000_EXPORT(setsockopt)(socket->fileno, SOL_SOCKET, SOCKOPT_ACCEPT_NONBLOCK, &optval, optlen);
         }
     } else {
         // set timeout
         socklen_t optlen = sizeof(timeout_ms);
-        ret = CC3000_EXPORT(setsockopt)(socket->u_state, SOL_SOCKET, SOCKOPT_RECV_TIMEOUT, &timeout_ms, optlen);
+        ret = CC3000_EXPORT(setsockopt)(socket->fileno, SOL_SOCKET, SOCKOPT_RECV_TIMEOUT, &timeout_ms, optlen);
     }
 
     if (ret != 0) {
@@ -363,7 +363,7 @@ STATIC int cc3k_socket_ioctl(mod_network_socket_obj_t *socket, mp_uint_t request
     if (request == MP_STREAM_POLL) {
         mp_uint_t flags = arg;
         ret = 0;
-        int fd = socket->u_state;
+        int fd = socket->fileno;
 
         // init fds
         fd_set rfds, wfds, xfds;
diff --git a/ports/stm32/modnwwiznet5k.c b/ports/stm32/modnwwiznet5k.c
index d3c2c516c3b6e..f7adad3f317c6 100644
--- a/ports/stm32/modnwwiznet5k.c
+++ b/ports/stm32/modnwwiznet5k.c
@@ -99,33 +99,33 @@ STATIC int wiznet5k_gethostbyname(mp_obj_t nic, const char *name, mp_uint_t len,
 }
 
 STATIC int wiznet5k_socket_socket(mod_network_socket_obj_t *socket, int *_errno) {
-    if (socket->u_param.domain != MOD_NETWORK_AF_INET) {
+    if (socket->domain != MOD_NETWORK_AF_INET) {
         *_errno = MP_EAFNOSUPPORT;
         return -1;
     }
 
-    switch (socket->u_param.type) {
+    switch (socket->type) {
         case MOD_NETWORK_SOCK_STREAM:
-            socket->u_param.type = Sn_MR_TCP;
+            socket->type = Sn_MR_TCP;
             break;
         case MOD_NETWORK_SOCK_DGRAM:
-            socket->u_param.type = Sn_MR_UDP;
+            socket->type = Sn_MR_UDP;
             break;
         default:
             *_errno = MP_EINVAL;
             return -1;
     }
 
-    if (socket->u_param.fileno == -1) {
+    if (socket->fileno == -1) {
         // get first unused socket number
         for (mp_uint_t sn = 0; sn < _WIZCHIP_SOCK_NUM_; sn++) {
             if ((wiznet5k_obj.socket_used & (1 << sn)) == 0) {
                 wiznet5k_obj.socket_used |= (1 << sn);
-                socket->u_param.fileno = sn;
+                socket->fileno = sn;
                 break;
             }
         }
-        if (socket->u_param.fileno == -1) {
+        if (socket->fileno == -1) {
             // too many open sockets
             *_errno = MP_EMFILE;
             return -1;
@@ -137,13 +137,13 @@ STATIC int wiznet5k_socket_socket(mod_network_socket_obj_t *socket, int *_errno)
     // So, we defer the open until we know what kind of socket we want.
 
     // use "domain" to indicate that this socket has not yet been opened
-    socket->u_param.domain = 0;
+    socket->domain = 0;
 
     return 0;
 }
 
 STATIC void wiznet5k_socket_close(mod_network_socket_obj_t *socket) {
-    uint8_t sn = (uint8_t)socket->u_param.fileno;
+    uint8_t sn = (uint8_t)socket->fileno;
     if (sn < _WIZCHIP_SOCK_NUM_) {
         wiznet5k_obj.socket_used &= ~(1 << sn);
         WIZCHIP_EXPORT(close)(sn);
@@ -152,7 +152,7 @@ STATIC void wiznet5k_socket_close(mod_network_socket_obj_t *socket) {
 
 STATIC int wiznet5k_socket_bind(mod_network_socket_obj_t *socket, byte *ip, mp_uint_t port, int *_errno) {
     // open the socket in server mode (if port != 0)
-    mp_int_t ret = WIZCHIP_EXPORT(socket)(socket->u_param.fileno, socket->u_param.type, port, 0);
+    mp_int_t ret = WIZCHIP_EXPORT(socket)(socket->fileno, socket->type, port, 0);
     if (ret < 0) {
         wiznet5k_socket_close(socket);
         *_errno = -ret;
@@ -160,14 +160,14 @@ STATIC int wiznet5k_socket_bind(mod_network_socket_obj_t *socket, byte *ip, mp_u
     }
 
     // indicate that this socket has been opened
-    socket->u_param.domain = 1;
+    socket->domain = 1;
 
     // success
     return 0;
 }
 
 STATIC int wiznet5k_socket_listen(mod_network_socket_obj_t *socket, mp_int_t backlog, int *_errno) {
-    mp_int_t ret = WIZCHIP_EXPORT(listen)(socket->u_param.fileno);
+    mp_int_t ret = WIZCHIP_EXPORT(listen)(socket->fileno);
     if (ret < 0) {
         wiznet5k_socket_close(socket);
         *_errno = -ret;
@@ -178,17 +178,19 @@ STATIC int wiznet5k_socket_listen(mod_network_socket_obj_t *socket, mp_int_t bac
 
 STATIC int wiznet5k_socket_accept(mod_network_socket_obj_t *socket, mod_network_socket_obj_t *socket2, byte *ip, mp_uint_t *port, int *_errno) {
     for (;;) {
-        int sr = getSn_SR((uint8_t)socket->u_param.fileno);
+        int sr = getSn_SR((uint8_t)socket->fileno);
         if (sr == SOCK_ESTABLISHED) {
-            socket2->u_param = socket->u_param;
-            getSn_DIPR((uint8_t)socket2->u_param.fileno, ip);
-            *port = getSn_PORT(socket2->u_param.fileno);
+            socket2->domain = socket->domain;
+            socket2->type = socket->type;
+            socket2->fileno = socket->fileno;
+            getSn_DIPR((uint8_t)socket2->fileno, ip);
+            *port = getSn_PORT(socket2->fileno);
 
             // WIZnet turns the listening socket into the client socket, so we
             // need to re-bind and re-listen on another socket for the server.
             // TODO handle errors, especially no-more-sockets error
-            socket->u_param.domain = MOD_NETWORK_AF_INET;
-            socket->u_param.fileno = -1;
+            socket->domain = MOD_NETWORK_AF_INET;
+            socket->fileno = -1;
             int _errno2;
             if (wiznet5k_socket_socket(socket, &_errno2) != 0) {
                 // printf("(bad resocket %d)\n", _errno2);
@@ -217,7 +219,7 @@ STATIC int wiznet5k_socket_connect(mod_network_socket_obj_t *socket, byte *ip, m
 
     // now connect
     MP_THREAD_GIL_EXIT();
-    mp_int_t ret = WIZCHIP_EXPORT(connect)(socket->u_param.fileno, ip, port);
+    mp_int_t ret = WIZCHIP_EXPORT(connect)(socket->fileno, ip, port);
     MP_THREAD_GIL_ENTER();
 
     if (ret < 0) {
@@ -232,7 +234,7 @@ STATIC int wiznet5k_socket_connect(mod_network_socket_obj_t *socket, byte *ip, m
 
 STATIC mp_uint_t wiznet5k_socket_send(mod_network_socket_obj_t *socket, const byte *buf, mp_uint_t len, int *_errno) {
     MP_THREAD_GIL_EXIT();
-    mp_int_t ret = WIZCHIP_EXPORT(send)(socket->u_param.fileno, (byte *)buf, len);
+    mp_int_t ret = WIZCHIP_EXPORT(send)(socket->fileno, (byte *)buf, len);
     MP_THREAD_GIL_ENTER();
 
     // TODO convert Wiz errno's to POSIX ones
@@ -246,7 +248,7 @@ STATIC mp_uint_t wiznet5k_socket_send(mod_network_socket_obj_t *socket, const by
 
 STATIC mp_uint_t wiznet5k_socket_recv(mod_network_socket_obj_t *socket, byte *buf, mp_uint_t len, int *_errno) {
     MP_THREAD_GIL_EXIT();
-    mp_int_t ret = WIZCHIP_EXPORT(recv)(socket->u_param.fileno, buf, len);
+    mp_int_t ret = WIZCHIP_EXPORT(recv)(socket->fileno, buf, len);
     MP_THREAD_GIL_ENTER();
 
     // TODO convert Wiz errno's to POSIX ones
@@ -259,7 +261,7 @@ STATIC mp_uint_t wiznet5k_socket_recv(mod_network_socket_obj_t *socket, byte *bu
 }
 
 STATIC mp_uint_t wiznet5k_socket_sendto(mod_network_socket_obj_t *socket, const byte *buf, mp_uint_t len, byte *ip, mp_uint_t port, int *_errno) {
-    if (socket->u_param.domain == 0) {
+    if (socket->domain == 0) {
         // socket not opened; use "bind" function to open the socket in client mode
         if (wiznet5k_socket_bind(socket, ip, 0, _errno) != 0) {
             return -1;
@@ -267,7 +269,7 @@ STATIC mp_uint_t wiznet5k_socket_sendto(mod_network_socket_obj_t *socket, const
     }
 
     MP_THREAD_GIL_EXIT();
-    mp_int_t ret = WIZCHIP_EXPORT(sendto)(socket->u_param.fileno, (byte *)buf, len, ip, port);
+    mp_int_t ret = WIZCHIP_EXPORT(sendto)(socket->fileno, (byte *)buf, len, ip, port);
     MP_THREAD_GIL_ENTER();
 
     if (ret < 0) {
@@ -281,7 +283,7 @@ STATIC mp_uint_t wiznet5k_socket_sendto(mod_network_socket_obj_t *socket, const
 STATIC mp_uint_t wiznet5k_socket_recvfrom(mod_network_socket_obj_t *socket, byte *buf, mp_uint_t len, byte *ip, mp_uint_t *port, int *_errno) {
     uint16_t port2;
     MP_THREAD_GIL_EXIT();
-    mp_int_t ret = WIZCHIP_EXPORT(recvfrom)(socket->u_param.fileno, buf, len, ip, &port2);
+    mp_int_t ret = WIZCHIP_EXPORT(recvfrom)(socket->fileno, buf, len, ip, &port2);
     MP_THREAD_GIL_ENTER();
     *port = port2;
     if (ret < 0) {
@@ -307,7 +309,7 @@ STATIC int wiznet5k_socket_settimeout(mod_network_socket_obj_t *socket, mp_uint_
     if (timeout_ms == 0) {
         // set non-blocking mode
         uint8_t arg = SOCK_IO_NONBLOCK;
-        WIZCHIP_EXPORT(ctlsocket)(socket->u_param.fileno, CS_SET_IOMODE, &arg);
+        WIZCHIP_EXPORT(ctlsocket)(socket->fileno, CS_SET_IOMODE, &arg);
     }
     */
 }
@@ -315,10 +317,10 @@ STATIC int wiznet5k_socket_settimeout(mod_network_socket_obj_t *socket, mp_uint_
 STATIC int wiznet5k_socket_ioctl(mod_network_socket_obj_t *socket, mp_uint_t request, mp_uint_t arg, int *_errno) {
     if (request == MP_STREAM_POLL) {
         int ret = 0;
-        if (arg & MP_STREAM_POLL_RD && getSn_RX_RSR(socket->u_param.fileno) != 0) {
+        if (arg & MP_STREAM_POLL_RD && getSn_RX_RSR(socket->fileno) != 0) {
             ret |= MP_STREAM_POLL_RD;
         }
-        if (arg & MP_STREAM_POLL_WR && getSn_TX_FSR(socket->u_param.fileno) != 0) {
+        if (arg & MP_STREAM_POLL_WR && getSn_TX_FSR(socket->fileno) != 0) {
             ret |= MP_STREAM_POLL_WR;
         }
         return ret;

From 9e2423e730ae32cd82e5c06099e6a847a2020f6a Mon Sep 17 00:00:00 2001
From: Jan Staal <info@janstaal.com>
Date: Wed, 15 Sep 2021 15:08:16 +0200
Subject: [PATCH 1282/3533] stm32: Add support for H7A3(Q)/H7B3(Q), and
 STM32H73B3I_DK board defn.

This commit is based upon prior work of @dpgeorge and @koendv.

MCU support for the STM32H7A3 and B3 families MCUs:
- STM32H7A3xx
- STM32H7A3xxQ (SMPS)
- STM32H7B3xx
- STM32H7B3xxQ (SMPS)

Support has been added for the STM32H7B3I_DK board.

Signed-off-by: Jan Staal <info@janstaal.com>
---
 ports/stm32/Makefile                          |   4 +-
 ports/stm32/adc.c                             |  11 +-
 ports/stm32/adc.h                             |   2 +
 .../boards/STM32H7B3I_DK/mpconfigboard.h      |  86 ++++++++
 .../boards/STM32H7B3I_DK/mpconfigboard.mk     |  18 ++
 ports/stm32/boards/STM32H7B3I_DK/pins.csv     | 191 ++++++++++++++++++
 .../boards/STM32H7B3I_DK/stm32h7xx_hal_conf.h |  19 ++
 ports/stm32/boards/stm32h7b3.ld               |  30 +++
 ports/stm32/boards/stm32h7b3_af.csv           | 175 ++++++++++++++++
 ports/stm32/extint.c                          |   4 +
 ports/stm32/flash.c                           |   4 +
 ports/stm32/machine_adc.c                     |   9 +-
 ports/stm32/main.c                            |   3 +
 ports/stm32/mpconfigboard_common.h            |  11 +
 ports/stm32/powerctrl.c                       |  24 +++
 ports/stm32/rtc.c                             |  17 +-
 ports/stm32/stm32_it.c                        |   4 +
 ports/stm32/system_stm32.c                    |   6 +-
 ports/stm32/timer.c                           |   5 +
 ports/stm32/uart.c                            |  27 +++
 ports/stm32/usbd_conf.c                       |  17 +-
 21 files changed, 655 insertions(+), 12 deletions(-)
 create mode 100644 ports/stm32/boards/STM32H7B3I_DK/mpconfigboard.h
 create mode 100644 ports/stm32/boards/STM32H7B3I_DK/mpconfigboard.mk
 create mode 100644 ports/stm32/boards/STM32H7B3I_DK/pins.csv
 create mode 100644 ports/stm32/boards/STM32H7B3I_DK/stm32h7xx_hal_conf.h
 create mode 100644 ports/stm32/boards/stm32h7b3.ld
 create mode 100644 ports/stm32/boards/stm32h7b3_af.csv

diff --git a/ports/stm32/Makefile b/ports/stm32/Makefile
index 1614db235878a..7a869d3c049bf 100644
--- a/ports/stm32/Makefile
+++ b/ports/stm32/Makefile
@@ -77,7 +77,7 @@ CFLAGS_CORTEX_M = -mthumb
 # Select hardware floating-point support
 SUPPORTS_HARDWARE_FP_SINGLE = 0
 SUPPORTS_HARDWARE_FP_DOUBLE = 0
-ifeq ($(CMSIS_MCU),$(filter $(CMSIS_MCU),STM32F765xx STM32F767xx STM32F769xx STM32H743xx STM32H750xx))
+ifeq ($(CMSIS_MCU),$(filter $(CMSIS_MCU),STM32F765xx STM32F767xx STM32F769xx STM32H743xx STM32H750xx STM32H7A3xx STM32H7A3xxQ STM32H7B3xx STM32H7B3xxQ))
 CFLAGS_CORTEX_M += -mfpu=fpv5-d16 -mfloat-abi=hard
 SUPPORTS_HARDWARE_FP_SINGLE = 1
 SUPPORTS_HARDWARE_FP_DOUBLE = 1
@@ -424,7 +424,7 @@ HAL_SRC_C += $(addprefix $(HAL_DIR)/Src/stm32$(MCU_SERIES)xx_,\
 	)
 endif
 
-ifeq ($(CMSIS_MCU),$(filter $(CMSIS_MCU),STM32H743xx STM32H750xx))
+ifeq ($(CMSIS_MCU),$(filter $(CMSIS_MCU),STM32H743xx STM32H750xx STM32H7A3xx STM32H7A3xxQ STM32H7B3xx STM32H7B3xxQ))
     HAL_SRC_C += $(addprefix $(HAL_DIR)/Src/stm32$(MCU_SERIES)xx_, hal_fdcan.c)
 else
 ifeq ($(MCU_SERIES),$(filter $(MCU_SERIES),f0 f4 f7 h7 l4))
diff --git a/ports/stm32/adc.c b/ports/stm32/adc.c
index dd2702d6f92e7..ceb6584d03dc8 100644
--- a/ports/stm32/adc.c
+++ b/ports/stm32/adc.c
@@ -55,7 +55,11 @@
 #define PIN_ADC_MASK            PIN_ADC1
 #define pin_adc_table           pin_adc1
 
-#if defined(STM32H7)
+#if defined(STM32H7A3xx) || defined(STM32H7A3xxQ) || \
+    defined(STM32H7B3xx) || defined(STM32H7B3xxQ)
+#define ADCALLx                 (ADC2)
+#define pin_adcall_table        pin_adc2
+#elif defined(STM32H7)
 // On the H7 ADC3 is used for ADCAll to be able to read internal
 // channels. For all other GPIO channels, ADC12 is used instead.
 #define ADCALLx                 (ADC3)
@@ -137,6 +141,8 @@
     defined(STM32F767xx) || defined(STM32F769xx)
 #define VBAT_DIV (4)
 #elif defined(STM32H743xx) || defined(STM32H747xx) || \
+    defined(STM32H7A3xx) || defined(STM32H7A3xxQ) || \
+    defined(STM32H7B3xx) || defined(STM32H7B3xxQ) || \
     defined(STM32H750xx)
 #define VBAT_DIV (4)
 #elif defined(STM32L432xx) || \
@@ -227,6 +233,9 @@ STATIC void adc_wait_for_eoc_or_timeout(ADC_HandleTypeDef *adcHandle, int32_t ti
 STATIC void adcx_clock_enable(ADC_HandleTypeDef *adch) {
     #if defined(STM32F0) || defined(STM32F4) || defined(STM32F7)
     ADCx_CLK_ENABLE();
+    #elif defined(STM32H7A3xx) || defined(STM32H7A3xxQ) || defined(STM32H7B3xx) || defined(STM32H7B3xxQ)
+    __HAL_RCC_ADC12_CLK_ENABLE();
+    __HAL_RCC_ADC_CONFIG(RCC_ADCCLKSOURCE_CLKP);
     #elif defined(STM32H7)
     if (adch->Instance == ADC3) {
         __HAL_RCC_ADC3_CLK_ENABLE();
diff --git a/ports/stm32/adc.h b/ports/stm32/adc.h
index 64864b19675e4..5821eb9d67862 100644
--- a/ports/stm32/adc.h
+++ b/ports/stm32/adc.h
@@ -48,6 +48,8 @@ static inline void adc_deselect_vbat(ADC_TypeDef *adc, uint32_t channel) {
         adc_common = ADC_COMMON_REGISTER(0);
         #elif defined(STM32F7)
         adc_common = ADC123_COMMON;
+        #elif defined(STM32H7A3xx) || defined(STM32H7A3xxQ) || defined(STM32H7B3xx) || defined(STM32H7B3xxQ)
+        adc_common = ADC12_COMMON;
         #elif defined(STM32H7)
         adc_common = adc == ADC3 ? ADC3_COMMON : ADC12_COMMON;
         #endif
diff --git a/ports/stm32/boards/STM32H7B3I_DK/mpconfigboard.h b/ports/stm32/boards/STM32H7B3I_DK/mpconfigboard.h
new file mode 100644
index 0000000000000..02f5fcac203e8
--- /dev/null
+++ b/ports/stm32/boards/STM32H7B3I_DK/mpconfigboard.h
@@ -0,0 +1,86 @@
+#define MICROPY_HW_BOARD_NAME       "STM32H7B3I-DK"
+#define MICROPY_HW_MCU_NAME         "STM32H7B3LIH6Q"
+
+#define MICROPY_HW_ENABLE_RTC       (1)
+#define MICROPY_HW_ENABLE_RNG       (1)
+#define MICROPY_HW_ENABLE_ADC       (1)
+#define MICROPY_HW_ENABLE_DAC       (1)
+#define MICROPY_HW_ENABLE_USB       (1)
+#define MICROPY_HW_ENABLE_SDCARD    (1)
+#define MICROPY_HW_HAS_SWITCH       (1)
+#define MICROPY_HW_HAS_FLASH        (0)
+
+#define MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE (0)
+
+// The board has a 24MHz HSE, the following gives 280MHz CPU speed
+#define MICROPY_HW_CLK_PLLM (12)
+#define MICROPY_HW_CLK_PLLN (280)
+#define MICROPY_HW_CLK_PLLP (2)
+#define MICROPY_HW_CLK_PLLQ (2)
+#define MICROPY_HW_CLK_PLLR (2)
+
+// The USB clock is set using PLL3 (48Mhz usb clock)
+#define MICROPY_HW_CLK_PLL3M (12)
+#define MICROPY_HW_CLK_PLL3N (192)
+#define MICROPY_HW_CLK_PLL3P (17)
+#define MICROPY_HW_CLK_PLL3Q (8)
+#define MICROPY_HW_CLK_PLL3R (2)
+
+// 6 wait states when running at 280MHz (VOS0 range)
+#define MICROPY_HW_FLASH_LATENCY    FLASH_LATENCY_6
+
+#if 0
+// 512MBit external OSPI flash, used for either the filesystem or XIP memory mapped
+#define MICROPY_HW_OSPIFLASH_SIZE_BITS_LOG2 (29)
+#define MICROPY_HW_OSPIFLASH_CS     (pin_G6)
+#define MICROPY_HW_OSPIFLASH_CLK    (pin_B2)
+#define MICROPY_HW_OSPIFLASH_DQS    (pin_C5)
+#define MICROPY_HW_OSPIFLASH_IO0    (pin_P8)
+#define MICROPY_HW_OSPIFLASH_IO1    (pin_F9)
+#define MICROPY_HW_OSPIFLASH_IO2    (pin_F7)
+#define MICROPY_HW_OSPIFLASH_IO3    (pin_F6)
+#define MICROPY_HW_OSPIFLASH_IO4    (pin_C1)
+#define MICROPY_HW_OSPIFLASH_IO5    (pin_H3)
+#define MICROPY_HW_OSPIFLASH_IO6    (pin_D6)
+#define MICROPY_HW_OSPIFLASH_IO7    (pin_G14)
+#endif
+
+// UART buses
+#define MICROPY_HW_UART1_TX         (pin_A9)
+#define MICROPY_HW_UART1_RX         (pin_A10)
+#define MICROPY_HW_UART4_TX         (pin_H13) // Arduino Connector CN11-Pin1
+#define MICROPY_HW_UART4_RX         (pin_H14) // Arduino Connector CN11-Pin2
+#define MICROPY_HW_UART_REPL        PYB_UART_1
+#define MICROPY_HW_UART_REPL_BAUD   115200
+
+// USRSW is pulled low. Pressing the button makes the input go high.
+#define MICROPY_HW_USRSW_PIN        (pin_C13)
+#define MICROPY_HW_USRSW_PULL       (GPIO_NOPULL)
+#define MICROPY_HW_USRSW_EXTI_MODE  (GPIO_MODE_IT_RISING)
+#define MICROPY_HW_USRSW_PRESSED    (1)
+
+// LEDs
+#define MICROPY_HW_LED1             (pin_G11)   // red
+#define MICROPY_HW_LED2             (pin_G2)    // blue
+#define MICROPY_HW_LED_ON(pin)      (mp_hal_pin_low(pin))
+#define MICROPY_HW_LED_OFF(pin)     (mp_hal_pin_high(pin))
+
+// USB config
+#define MICROPY_HW_USB_FS           (0)
+#define MICROPY_HW_USB_HS           (1)
+#define MICROPY_HW_USB_HS_IN_FS     (1)
+#define MICROPY_HW_USB_MAIN_DEV     (USB_PHY_HS_ID)
+#define MICROPY_HW_USB_CDC_NUM      (2)
+#define MICROPY_HW_USB_MSC          (0)
+
+// SD card detect switch
+#define MICROPY_HW_SDCARD_DETECT_PIN        (pin_I8)
+#define MICROPY_HW_SDCARD_DETECT_PULL       (GPIO_PULLUP)
+#define MICROPY_HW_SDCARD_DETECT_PRESENT    (GPIO_PIN_RESET)
+
+#define MICROPY_HW_SDMMC_D0                 (pin_C8)
+#define MICROPY_HW_SDMMC_D1                 (pin_C9)
+#define MICROPY_HW_SDMMC_D2                 (pin_C10)
+#define MICROPY_HW_SDMMC_D3                 (pin_C11)
+#define MICROPY_HW_SDMMC_CK                 (pin_C12)
+#define MICROPY_HW_SDMMC_CMD                (pin_D2)
diff --git a/ports/stm32/boards/STM32H7B3I_DK/mpconfigboard.mk b/ports/stm32/boards/STM32H7B3I_DK/mpconfigboard.mk
new file mode 100644
index 0000000000000..380ade8d025a3
--- /dev/null
+++ b/ports/stm32/boards/STM32H7B3I_DK/mpconfigboard.mk
@@ -0,0 +1,18 @@
+USE_MBOOT ?= 0
+
+# MCU settings
+MCU_SERIES = h7
+CMSIS_MCU = STM32H7B3xxQ
+MICROPY_FLOAT_IMPL = double
+AF_FILE = boards/stm32h7b3_af.csv
+
+ifeq ($(USE_MBOOT),1)
+# When using Mboot all the text goes together after the filesystem
+LD_FILES = boards/stm32h743.ld boards/common_blifs.ld
+TEXT0_ADDR = 0x08040000
+else
+# When not using Mboot the ISR text goes first, then the rest after the filesystem
+LD_FILES = boards/stm32h7b3.ld boards/common_ifs.ld
+TEXT0_ADDR = 0x08000000
+TEXT1_ADDR = 0x08040000
+endif
diff --git a/ports/stm32/boards/STM32H7B3I_DK/pins.csv b/ports/stm32/boards/STM32H7B3I_DK/pins.csv
new file mode 100644
index 0000000000000..e005e38af70d0
--- /dev/null
+++ b/ports/stm32/boards/STM32H7B3I_DK/pins.csv
@@ -0,0 +1,191 @@
+,PA0
+,PA1
+,PA2
+,PA3
+,PA4
+,PA5
+,PA6
+,PA7
+,PA8
+,PA9
+,PA10
+,PA11
+,PA12
+,PA13
+,PA14
+,PA15
+,PB0
+,PB1
+,PB2
+,PB3
+,PB4
+,PB5
+,PB6
+,PB7
+,PB8
+,PB9
+,PB10
+,PB11
+,PB12
+,PB13
+,PB14
+,PB15
+,PC0
+,PC1
+,PC2
+,PC3
+,PC4
+,PC5
+,PC6
+,PC7
+,PC8
+,PC9
+,PC10
+,PC11
+,PC12
+,PC13
+,PC14
+,PC15
+,PD0
+,PD1
+,PD2
+,PD3
+,PD4
+,PD5
+,PD6
+,PD7
+,PD8
+,PD9
+,PD10
+,PD11
+,PD12
+,PD13
+,PD14
+,PD15
+,PE0
+,PE1
+,PE2
+,PE3
+,PE4
+,PE5
+,PE6
+,PE7
+,PE8
+,PE9
+,PE10
+,PE11
+,PE12
+,PE13
+,PE14
+,PE15
+,PF0
+,PF1
+,PF2
+,PF3
+,PF4
+,PF5
+,PF6
+,PF7
+,PF8
+,PF9
+,PF10
+,PF11
+,PF12
+,PF13
+,PF14
+,PF15
+,PG0
+,PG1
+,PG2
+,PG3
+,PG4
+,PG5
+,PG6
+,PG7
+,PG8
+,PG9
+,PG10
+,PG11
+,PG12
+,PG13
+,PG14
+,PG15
+,PH0
+,PH1
+,PH2
+,PH3
+,PH4
+,PH5
+,PH6
+,PH7
+,PH8
+,PH9
+,PH10
+,PH11
+,PH12
+,PH13
+,PH14
+,PH15
+,PI0
+,PI1
+,PI2
+,PI3
+,PI4
+,PI5
+,PI6
+,PI7
+,PI8
+,PI9
+,PI10
+,PI11
+,PI12
+,PI13
+,PI14
+,PI15
+DAC1,PA4
+DAC2,PA5
+LED1,G11
+LED2,G2
+SW,PC13
+I2C1_SDA,PB9
+I2C1_SCL,PB8
+I2C2_SDA,PF0
+I2C2_SCL,PF1
+I2C4_SCL,PF14
+I2C4_SDA,PF15
+SD_D0,PC8
+SD_D1,PC9
+SD_D2,PC10
+SD_D3,PC11
+SD_CMD,PD2
+SD_CK,PC12
+SD_SW,PG2
+OTG_FS_POWER,PG6
+OTG_FS_OVER_CURRENT,PG7
+USB_VBUS,PA9
+USB_ID,PA10
+USB_DM,PA11
+USB_DP,PA12
+UART2_TX,PD5
+UART2_RX,PD6
+UART2_RTS,PD4
+UART2_CTS,PD3
+UART3_TX,PD8
+UART3_RX,PD9
+UART5_TX,PB6
+UART5_RX,PB12
+UART6_TX,PC6
+UART6_RX,PC7
+UART7_TX,PF7
+UART7_RX,PF6
+UART8_TX,PE1
+UART8_RX,PE0
+ETH_MDC,PC1
+ETH_MDIO,PA2
+ETH_RMII_REF_CLK,PA1
+ETH_RMII_CRS_DV,PA7
+ETH_RMII_RXD0,PC4
+ETH_RMII_RXD1,PC5
+ETH_RMII_TX_EN,PG11
+ETH_RMII_TXD0,PG13
+ETH_RMII_TXD1,PB13
diff --git a/ports/stm32/boards/STM32H7B3I_DK/stm32h7xx_hal_conf.h b/ports/stm32/boards/STM32H7B3I_DK/stm32h7xx_hal_conf.h
new file mode 100644
index 0000000000000..70c3246a890e7
--- /dev/null
+++ b/ports/stm32/boards/STM32H7B3I_DK/stm32h7xx_hal_conf.h
@@ -0,0 +1,19 @@
+/* This file is part of the MicroPython project, http://micropython.org/
+ * The MIT License (MIT)
+ * Copyright (c) 2019 Damien P. George
+ */
+#ifndef MICROPY_INCLUDED_STM32H7XX_HAL_CONF_H
+#define MICROPY_INCLUDED_STM32H7XX_HAL_CONF_H
+
+#include "boards/stm32h7xx_hal_conf_base.h"
+
+// Oscillator values in Hz
+#define HSE_VALUE (24000000)
+#define LSE_VALUE (32768)
+#define EXTERNAL_CLOCK_VALUE (12288000)
+
+// Oscillator timeouts in ms
+#define HSE_STARTUP_TIMEOUT (5000)
+#define LSE_STARTUP_TIMEOUT (5000)
+
+#endif // MICROPY_INCLUDED_STM32H7XX_HAL_CONF_H
diff --git a/ports/stm32/boards/stm32h7b3.ld b/ports/stm32/boards/stm32h7b3.ld
new file mode 100644
index 0000000000000..cccea983fa89e
--- /dev/null
+++ b/ports/stm32/boards/stm32h7b3.ld
@@ -0,0 +1,30 @@
+/*
+    GNU linker script for STM32H7B3
+*/
+
+/* Specify the memory areas */
+MEMORY
+{
+    FLASH (rx)      : ORIGIN = 0x08000000, LENGTH = 2048K
+    FLASH_ISR (rx)  : ORIGIN = 0x08000000, LENGTH = 128K    /* sector 0, 128K */
+    FLASH_FS (r)    : ORIGIN = 0x08020000, LENGTH = 128K    /* sector 1, 128K */
+    FLASH_TEXT (rx) : ORIGIN = 0x08040000, LENGTH = 1792K   /* sectors 6*128 + 8*128 */
+    DTCM (xrw)      : ORIGIN = 0x20000000, LENGTH = 128K    /* Used for storage cache */
+    RAM (xrw)       : ORIGIN = 0x24000000, LENGTH = 512K    /* AXI SRAM */    
+    RAM_D2 (xrw)    : ORIGIN = 0x30000000, LENGTH = 288K
+}
+
+/* produce a link error if there is not this amount of RAM for these sections */
+_minimum_stack_size = 2K;
+_minimum_heap_size = 16K;
+
+/* Define the stack.  The stack is full descending so begins just above last byte
+   of RAM.  Note that EABI requires the stack to be 8-byte aligned for a call. */
+_estack = ORIGIN(RAM) + LENGTH(RAM) - _estack_reserve;
+_sstack = _estack - 16K; /* tunable */
+
+/* RAM extents for the garbage collector */
+_ram_start = ORIGIN(RAM);
+_ram_end = ORIGIN(RAM) + LENGTH(RAM);
+_heap_start = _ebss; /* heap starts just after statically allocated memory */
+_heap_end = _sstack;
diff --git a/ports/stm32/boards/stm32h7b3_af.csv b/ports/stm32/boards/stm32h7b3_af.csv
new file mode 100644
index 0000000000000..0e1747161f3a3
--- /dev/null
+++ b/ports/stm32/boards/stm32h7b3_af.csv
@@ -0,0 +1,175 @@
+Port,,AF0,AF1,AF2,AF3,AF4,AF5,AF6,AF7,AF8,AF9,AF10,AF11,AF12,AF13,AF14,AF15,
+,,AF0,AF1,AF2,AF3,AF4,AF5,AF6,AF7,AF8,AF9,AF10,AF11,AF12,AF13,AF14,AF15,ADC
+PortA,PA0,,TIM2_CH1/TIM2_ETR,TIM5_CH1,TIM8_ETR,TIM15_BKIN,I2S6_WS/SPI6_NSS,,USART2_CTS/USART2_NSS,UART4_TX,SDMMC2_CMD,SAI2_SD_B,,,,,EVENTOUT/EVENTOUT,ADC1_INP16,
+PortA,PA0_C,,TIM2_CH1/TIM2_ETR,TIM5_CH1,TIM8_ETR,TIM15_BKIN,I2S6_WS/SPI6_NSS,,USART2_CTS/USART2_NSS,UART4_TX,SDMMC2_CMD,SAI2_SD_B,,,,,EVENTOUT/EVENTOUT,ADC1_INP16,
+PortA,PA1,,TIM2_CH2,TIM5_CH2,LPTIM3_OUT,TIM15_CH1N,,,USART2_DE/USART2_RTS,UART4_RX,OCTOSPIM_P1_IO3,SAI2_MCLK_B,OCTOSPIM_P1_DQS,,,LTDC_R2,EVENTOUT/EVENTOUT,ADC1_INN16/ADC1_INP17,
+PortA,PA10,,TIM1_CH3,,LPUART1_RX,,,,USART1_RX,,,USB_OTG_HS_ID,MDIOS_MDIO,LTDC_B4,DCMI_D1/PSSI_D1,LTDC_B1,EVENTOUT/EVENTOUT,,
+PortA,PA11,,TIM1_CH4,,LPUART1_CTS,,I2S2_WS/SPI2_NSS,UART4_RX,USART1_CTS/USART1_NSS,,FDCAN1_RX,,,,,LTDC_R4,EVENTOUT/EVENTOUT,,
+PortA,PA12,,TIM1_ETR,,LPUART1_DE/LPUART1_RTS,,I2S2_CK/SPI2_SCK,UART4_TX,USART1_DE/USART1_RTS,SAI2_FS_B,FDCAN1_TX,,,,,LTDC_R5,EVENTOUT/EVENTOUT,,
+PortA,PA13,DEBUG_JTMS/SWDIO,,,,,,,,,,,,,,,EVENTOUT/EVENTOUT,,
+PortA,PA14,DEBUG_JTCK/SWCLK,,,,,,,,,,,,,,,EVENTOUT/EVENTOUT,,
+PortA,PA15,DEBUG_JTDI,TIM2_CH1/TIM2_ETR,,,CEC,I2S1_WS/SPI1_NSS,I2S3_WS/SPI3_NSS,I2S6_WS/SPI6_NSS,UART4_DE/UART4_RTS,LTDC_R3,,UART7_TX,,,LTDC_B6,EVENTOUT/EVENTOUT,,
+PortA,PA1_C,,TIM2_CH2,TIM5_CH2,LPTIM3_OUT,TIM15_CH1N,,,USART2_DE/USART2_RTS,UART4_RX,OCTOSPIM_P1_IO3,SAI2_MCLK_B,OCTOSPIM_P1_DQS,,,LTDC_R2,EVENTOUT/EVENTOUT,ADC1_INN16/ADC1_INP17,
+PortA,PA2,,TIM2_CH3,TIM5_CH3,,TIM15_CH1,,DFSDM2_CKIN1,USART2_TX,SAI2_SCK_B,,,,MDIOS_MDIO,,LTDC_R1,EVENTOUT/EVENTOUT,ADC1_INP14,
+PortA,PA3,,TIM2_CH4,TIM5_CH4,OCTOSPIM_P1_CLK,TIM15_CH2,I2S6_MCK,,USART2_RX,,LTDC_B2,USB_OTG_HS_ULPI_D0,,,,LTDC_B5,EVENTOUT/EVENTOUT,ADC1_INP15,
+PortA,PA4,,,TIM5_ETR,,,I2S1_WS/SPI1_NSS,I2S3_WS/SPI3_NSS,USART2_CK,I2S6_WS/SPI6_NSS,,,,,DCMI_HSYNC/PSSI_DE,LTDC_VSYNC,EVENTOUT/EVENTOUT,ADC1_INP18,
+PortA,PA5,PWR_NDSTOP2,TIM2_CH1/TIM2_ETR,,TIM8_CH1N,,I2S1_CK/SPI1_SCK,,,I2S6_CK/SPI6_SCK,,USB_OTG_HS_ULPI_CK,,,PSSI_D14,LTDC_R4,EVENTOUT/EVENTOUT,ADC1_INN18/ADC1_INP19,
+PortA,PA6,,TIM1_BKIN,TIM3_CH1,TIM8_BKIN,,I2S1_SDI/SPI1_MISO,OCTOSPIM_P1_IO3,,I2S6_SDI/SPI6_MISO,TIM13_CH1,TIM8_BKIN_COMP1/TIM8_BKIN_COMP2,MDIOS_MDC,TIM1_BKIN_COMP1/TIM1_BKIN_COMP2,DCMI_PIXCLK/PSSI_PDCK,LTDC_G2,EVENTOUT/EVENTOUT,ADC1_INP3/ADC2_INP3,
+PortA,PA7,,TIM1_CH1N,TIM3_CH2,TIM8_CH1N,DFSDM2_DATIN1,I2S1_SDO/SPI1_MOSI,,,I2S6_SDO/SPI6_MOSI,TIM14_CH1,OCTOSPIM_P1_IO2,,FMC_SDNWE,,LTDC_VSYNC,EVENTOUT/EVENTOUT,ADC1_INN3/ADC1_INP7/ADC2_INN3/ADC2_INP7,
+PortA,PA8,RCC_MCO_1,TIM1_CH1,,TIM8_BKIN2,I2C3_SCL,,,USART1_CK,,,USB_OTG_HS_SOF,UART7_RX,TIM8_BKIN2_COMP1/TIM8_BKIN2_COMP2,LTDC_B3,LTDC_R6,EVENTOUT/EVENTOUT,,
+PortA,PA9,,TIM1_CH2,,LPUART1_TX,I2C3_SMBA,I2S2_CK/SPI2_SCK,,USART1_TX,,,,,,DCMI_D0/PSSI_D0,LTDC_R5,EVENTOUT/EVENTOUT,,
+PortB,PB0,,TIM1_CH2N,TIM3_CH3,TIM8_CH2N,DFSDM2_CKOUT,,DFSDM1_CKOUT,,UART4_CTS,LTDC_R3,USB_OTG_HS_ULPI_D1,OCTOSPIM_P1_IO1,,,LTDC_G1,EVENTOUT/EVENTOUT,ADC1_INN5/ADC1_INP9/ADC2_INN5/ADC2_INP9,
+PortB,PB1,,TIM1_CH3N,TIM3_CH4,TIM8_CH3N,,,DFSDM1_DATIN1,,,LTDC_R6,USB_OTG_HS_ULPI_D2,OCTOSPIM_P1_IO0,,,LTDC_G0,EVENTOUT/EVENTOUT,ADC1_INP5/ADC2_INP5,
+PortB,PB10,,TIM2_CH3,,LPTIM2_IN1,I2C2_SCL,I2S2_CK/SPI2_SCK,DFSDM1_DATIN7,USART3_TX,,OCTOSPIM_P1_NCS,USB_OTG_HS_ULPI_D3,,,,LTDC_G4,EVENTOUT/EVENTOUT,,
+PortB,PB11,,TIM2_CH4,,LPTIM2_ETR,I2C2_SDA,,DFSDM1_CKIN7,USART3_RX,,,USB_OTG_HS_ULPI_D4,,,,LTDC_G5,EVENTOUT/EVENTOUT,,
+PortB,PB12,,TIM1_BKIN,,OCTOSPIM_P1_NCLK,I2C2_SMBA,I2S2_WS/SPI2_NSS,DFSDM1_DATIN1,USART3_CK,,FDCAN2_RX,USB_OTG_HS_ULPI_D5,DFSDM2_DATIN1,,TIM1_BKIN_COMP1/TIM1_BKIN_COMP2,UART5_RX,EVENTOUT/EVENTOUT,,
+PortB,PB13,,TIM1_CH1N,,LPTIM2_OUT,DFSDM2_CKIN1,I2S2_CK/SPI2_SCK,DFSDM1_CKIN1,USART3_CTS/USART3_NSS,,FDCAN2_TX,USB_OTG_HS_ULPI_D6,,SDMMC1_D0,DCMI_D2/PSSI_D2,UART5_TX,EVENTOUT/EVENTOUT,,
+PortB,PB14,,TIM1_CH2N,TIM12_CH1,TIM8_CH2N,USART1_TX,I2S2_SDI/SPI2_MISO,DFSDM1_DATIN2,USART3_DE/USART3_RTS,UART4_DE/UART4_RTS,SDMMC2_D0,,,,,LTDC_CLK,EVENTOUT/EVENTOUT,,
+PortB,PB15,RTC_REFIN,TIM1_CH3N,TIM12_CH2,TIM8_CH3N,USART1_RX,I2S2_SDO/SPI2_MOSI,DFSDM1_CKIN2,,UART4_CTS,SDMMC2_D1,,,,,LTDC_G7,EVENTOUT/EVENTOUT,,
+PortB,PB2,RTC_OUT_ALARM,,SAI1_D1,,DFSDM1_CKIN1,,SAI1_SD_A,I2S3_SDO/SPI3_MOSI,,OCTOSPIM_P1_CLK,OCTOSPIM_P1_DQS,,,,,EVENTOUT/EVENTOUT,,
+PortB,PB3,DEBUG_JTDO/SWO,TIM2_CH2,,,,I2S1_CK/SPI1_SCK,I2S3_CK/SPI3_SCK,,I2S6_CK/SPI6_SCK,SDMMC2_D2,CRS_SYNC,UART7_RX,,,,EVENTOUT/EVENTOUT,,
+PortB,PB4,,TIM16_BKIN,TIM3_CH1,,,I2S1_SDI/SPI1_MISO,I2S3_SDI/SPI3_MISO,I2S2_WS/SPI2_NSS,I2S6_SDI/SPI6_MISO,SDMMC2_D3,,UART7_TX,,,,EVENTOUT/EVENTOUT,,
+PortB,PB5,,TIM17_BKIN,TIM3_CH2,,I2C1_SMBA,I2S1_SDO/SPI1_MOSI,I2C4_SMBA,I2S3_SDO/SPI3_MOSI,I2S6_SDO/SPI6_MOSI,FDCAN2_RX,USB_OTG_HS_ULPI_D7,LTDC_B5,FMC_SDCKE1,DCMI_D10/PSSI_D10,UART5_RX,EVENTOUT/EVENTOUT,,
+PortB,PB6,,TIM16_CH1N,TIM4_CH1,,I2C1_SCL,CEC,I2C4_SCL,USART1_TX,LPUART1_TX,FDCAN2_TX,OCTOSPIM_P1_NCS,DFSDM1_DATIN5,FMC_SDNE1,DCMI_D5/PSSI_D5,UART5_TX,EVENTOUT/EVENTOUT,,
+PortB,PB7,,TIM17_CH1N,TIM4_CH2,,I2C1_SDA,,I2C4_SDA,USART1_RX,LPUART1_RX,,,DFSDM1_CKIN5,FMC_NL,DCMI_VSYNC/PSSI_RDY,,EVENTOUT/EVENTOUT,,
+PortB,PB8,,TIM16_CH1,TIM4_CH3,DFSDM1_CKIN7,I2C1_SCL,,I2C4_SCL,SDMMC1_CKIN,UART4_RX,FDCAN1_RX,SDMMC2_D4,,SDMMC1_D4,DCMI_D6/PSSI_D6,LTDC_B6,EVENTOUT/EVENTOUT,,
+PortB,PB9,,TIM17_CH1,TIM4_CH4,DFSDM1_DATIN7,I2C1_SDA,I2S2_WS/SPI2_NSS,I2C4_SDA,SDMMC1_CDIR,UART4_TX,FDCAN1_TX,SDMMC2_D5,I2C4_SMBA,SDMMC1_D5,DCMI_D7/PSSI_D7,LTDC_B7,EVENTOUT/EVENTOUT,,
+PortC,PC0,,,,DFSDM1_CKIN0,,,DFSDM1_DATIN4,,SAI2_FS_B,FMC_A25,USB_OTG_HS_ULPI_STP,LTDC_G2,FMC_SDNWE,,LTDC_R5,EVENTOUT/EVENTOUT,ADC1_INP10/ADC2_INP10,
+PortC,PC1,DEBUG_TRACED0,,SAI1_D1,DFSDM1_DATIN0,DFSDM1_CKIN4,I2S2_SDO/SPI2_MOSI,SAI1_SD_A,,,SDMMC2_CK,OCTOSPIM_P1_IO4,,MDIOS_MDC,,LTDC_G5,EVENTOUT/EVENTOUT,ADC1_INN10/ADC1_INP11/ADC2_INN10/ADC2_INP11,
+PortC,PC10,,,,DFSDM1_CKIN5,DFSDM2_CKIN0,,I2S3_CK/SPI3_SCK,USART3_TX,UART4_TX,OCTOSPIM_P1_IO1,LTDC_B1,SWPMI1_RX,SDMMC1_D2,DCMI_D8/PSSI_D8,LTDC_R2,EVENTOUT/EVENTOUT,,
+PortC,PC11,,,,DFSDM1_DATIN5,DFSDM2_DATIN0,,I2S3_SDI/SPI3_MISO,USART3_RX,UART4_RX,OCTOSPIM_P1_NCS,,,SDMMC1_D3,DCMI_D4/PSSI_D4,LTDC_B4,EVENTOUT/EVENTOUT,,
+PortC,PC12,DEBUG_TRACED3,,TIM15_CH1,,DFSDM2_CKOUT,I2S6_CK/SPI6_SCK,I2S3_SDO/SPI3_MOSI,USART3_CK,UART5_TX,,,,SDMMC1_CK,DCMI_D9/PSSI_D9,LTDC_R6,EVENTOUT/EVENTOUT,,
+PortC,PC13,,,,,,,,,,,,,,,,EVENTOUT/EVENTOUT,,
+PortC,PC14-OSC32_IN,,,,,,,,,,,,,,,,EVENTOUT/EVENTOUT,,
+PortC,PC15-OSC32_OUT,,,,,,,,,,,,,,,,EVENTOUT/EVENTOUT,,
+PortC,PC2,PWR_CSTOP,,,DFSDM1_CKIN1,,I2S2_SDI/SPI2_MISO,DFSDM1_CKOUT,,,OCTOSPIM_P1_IO2,USB_OTG_HS_ULPI_DIR,OCTOSPIM_P1_IO5,FMC_SDNE0,,,EVENTOUT/EVENTOUT,ADC1_INN11/ADC1_INP12/ADC2_INN11/ADC2_INP12,
+PortC,PC2_C,PWR_CSTOP,,,DFSDM1_CKIN1,,I2S2_SDI/SPI2_MISO,DFSDM1_CKOUT,,,OCTOSPIM_P1_IO2,USB_OTG_HS_ULPI_DIR,OCTOSPIM_P1_IO5,FMC_SDNE0,,,EVENTOUT/EVENTOUT,ADC1_INN11/ADC1_INP12/ADC2_INN11/ADC2_INP12,
+PortC,PC3,PWR_CSLEEP,,,DFSDM1_DATIN1,,I2S2_SDO/SPI2_MOSI,,,,OCTOSPIM_P1_IO0,USB_OTG_HS_ULPI_NXT,OCTOSPIM_P1_IO6,FMC_SDCKE0,,,EVENTOUT/EVENTOUT,ADC2_INP1,
+PortC,PC3_C,PWR_CSLEEP,,,DFSDM1_DATIN1,,I2S2_SDO/SPI2_MOSI,,,,OCTOSPIM_P1_IO0,USB_OTG_HS_ULPI_NXT,OCTOSPIM_P1_IO6,FMC_SDCKE0,,,EVENTOUT/EVENTOUT,ADC2_INP1,
+PortC,PC4,,,,DFSDM1_CKIN2,,I2S1_MCK,,,,SPDIFRX_IN3,,,FMC_SDNE0,,LTDC_R7,EVENTOUT/EVENTOUT,ADC1_INP4/ADC2_INP4,
+PortC,PC5,,,SAI1_D3,DFSDM1_DATIN2,PSSI_D15,,,,,SPDIFRX_IN4,OCTOSPIM_P1_DQS,,FMC_SDCKE0,COMP1_OUT,LTDC_DE,EVENTOUT/EVENTOUT,ADC1_INN4/ADC1_INP8/ADC2_INN4/ADC2_INP8,
+PortC,PC6,,,TIM3_CH1,TIM8_CH1,DFSDM1_CKIN3,I2S2_MCK,,USART6_TX,SDMMC1_D0DIR,FMC_NWAIT,SDMMC2_D6,,SDMMC1_D6,DCMI_D0/PSSI_D0,LTDC_HSYNC,EVENTOUT/EVENTOUT,,
+PortC,PC7,DEBUG_TRGIO,,TIM3_CH2,TIM8_CH2,DFSDM1_DATIN3,,I2S3_MCK,USART6_RX,SDMMC1_D123DIR,FMC_NE1,SDMMC2_D7,SWPMI1_TX,SDMMC1_D7,DCMI_D1/PSSI_D1,LTDC_G6,EVENTOUT/EVENTOUT,,
+PortC,PC8,DEBUG_TRACED1,,TIM3_CH3,TIM8_CH3,,,,USART6_CK,UART5_DE/UART5_RTS,FMC_NCE/FMC_NE2,FMC_INT,SWPMI1_RX,SDMMC1_D0,DCMI_D2/PSSI_D2,,EVENTOUT/EVENTOUT,,
+PortC,PC9,RCC_MCO_2,,TIM3_CH4,TIM8_CH4,I2C3_SDA,I2S_CKIN,,,UART5_CTS,OCTOSPIM_P1_IO0,LTDC_G3,SWPMI1_SUSPEND,SDMMC1_D1,DCMI_D3/PSSI_D3,LTDC_B2,EVENTOUT/EVENTOUT,,
+PortD,PD0,,,,DFSDM1_CKIN6,,,,,UART4_RX,FDCAN1_RX,,UART9_CTS,FMC_D2/FMC_DA2,,LTDC_B1,EVENTOUT/EVENTOUT,,
+PortD,PD1,,,,DFSDM1_DATIN6,,,,,UART4_TX,FDCAN1_TX,,,FMC_D3/FMC_DA3,,,EVENTOUT/EVENTOUT,,
+PortD,PD10,,,,DFSDM1_CKOUT,DFSDM2_CKOUT,,,USART3_CK,,,,,FMC_D15/FMC_DA15,,LTDC_B3,EVENTOUT/EVENTOUT,,
+PortD,PD11,,,,LPTIM2_IN2,I2C4_SMBA,,,USART3_CTS/USART3_NSS,,OCTOSPIM_P1_IO0,SAI2_SD_A,,FMC_A16/FMC_CLE,,,EVENTOUT/EVENTOUT,,
+PortD,PD12,,LPTIM1_IN1,TIM4_CH1,LPTIM2_IN1,I2C4_SCL,,,USART3_DE/USART3_RTS,,OCTOSPIM_P1_IO1,SAI2_FS_A,,FMC_A17/FMC_ALE,DCMI_D12/PSSI_D12,,EVENTOUT/EVENTOUT,,
+PortD,PD13,,LPTIM1_OUT,TIM4_CH2,,I2C4_SDA,,,,,OCTOSPIM_P1_IO3,SAI2_SCK_A,UART9_DE/UART9_RTS,FMC_A18,DCMI_D13/PSSI_D13,,EVENTOUT/EVENTOUT,,
+PortD,PD14,,,TIM4_CH3,,,,,,UART8_CTS,,,UART9_RX,FMC_D0/FMC_DA0,,,EVENTOUT/EVENTOUT,,
+PortD,PD15,,,TIM4_CH4,,,,,,UART8_DE/UART8_RTS,,,UART9_TX,FMC_D1/FMC_DA1,,,EVENTOUT/EVENTOUT,,
+PortD,PD2,DEBUG_TRACED2,,TIM3_ETR,,TIM15_BKIN,,,,UART5_RX,LTDC_B7,,,SDMMC1_CMD,DCMI_D11/PSSI_D11,LTDC_B2,EVENTOUT/EVENTOUT,,
+PortD,PD3,,,,DFSDM1_CKOUT,,I2S2_CK/SPI2_SCK,,USART2_CTS/USART2_NSS,,,,,FMC_CLK,DCMI_D5/PSSI_D5,LTDC_G7,EVENTOUT/EVENTOUT,,
+PortD,PD4,,,,,,,,USART2_DE/USART2_RTS,,,OCTOSPIM_P1_IO4,,FMC_NOE,,,EVENTOUT/EVENTOUT,,
+PortD,PD5,,,,,,,,USART2_TX,,,OCTOSPIM_P1_IO5,,FMC_NWE,,,EVENTOUT/EVENTOUT,,
+PortD,PD6,,,SAI1_D1,DFSDM1_CKIN4,DFSDM1_DATIN1,I2S3_SDO/SPI3_MOSI,SAI1_SD_A,USART2_RX,,,OCTOSPIM_P1_IO6,SDMMC2_CK,FMC_NWAIT,DCMI_D10/PSSI_D10,LTDC_B2,EVENTOUT/EVENTOUT,,
+PortD,PD7,,,,DFSDM1_DATIN4,,I2S1_SDO/SPI1_MOSI,DFSDM1_CKIN1,USART2_CK,,SPDIFRX_IN1,OCTOSPIM_P1_IO7,SDMMC2_CMD,FMC_NE1,,,EVENTOUT/EVENTOUT,,
+PortD,PD8,,,,DFSDM1_CKIN3,,,,USART3_TX,,SPDIFRX_IN2,,,FMC_D13/FMC_DA13,,,EVENTOUT/EVENTOUT,,
+PortD,PD9,,,,DFSDM1_DATIN3,,,,USART3_RX,,,,,FMC_D14/FMC_DA14,,,EVENTOUT/EVENTOUT,,
+PortD,PDR_ON,,,,,,,,,,,,,,,,EVENTOUT,,
+PortE,PE0,,LPTIM1_ETR,TIM4_ETR,,LPTIM2_ETR,,,,UART8_RX,,SAI2_MCLK_A,,FMC_NBL0,DCMI_D2/PSSI_D2,LTDC_R0,EVENTOUT/EVENTOUT,,
+PortE,PE1,,LPTIM1_IN2,,,,,,,UART8_TX,,,,FMC_NBL1,DCMI_D3/PSSI_D3,LTDC_R6,EVENTOUT/EVENTOUT,,
+PortE,PE10,,TIM1_CH2N,,DFSDM1_DATIN4,,,,UART7_CTS,,,OCTOSPIM_P1_IO7,,FMC_D7/FMC_DA7,,,EVENTOUT/EVENTOUT,,
+PortE,PE11,,TIM1_CH2,,DFSDM1_CKIN4,,SPI4_NSS,,,,,SAI2_SD_B,OCTOSPIM_P1_NCS,FMC_D8/FMC_DA8,,LTDC_G3,EVENTOUT/EVENTOUT,,
+PortE,PE12,,TIM1_CH3N,,DFSDM1_DATIN5,,SPI4_SCK,,,,,SAI2_SCK_B,,FMC_D9/FMC_DA9,COMP1_OUT,LTDC_B4,EVENTOUT/EVENTOUT,,
+PortE,PE13,,TIM1_CH3,,DFSDM1_CKIN5,,SPI4_MISO,,,,,SAI2_FS_B,,FMC_D10/FMC_DA10,COMP2_OUT,LTDC_DE,EVENTOUT/EVENTOUT,,
+PortE,PE14,,TIM1_CH4,,,,SPI4_MOSI,,,,,SAI2_MCLK_B,,FMC_D11/FMC_DA11,,LTDC_CLK,EVENTOUT/EVENTOUT,,
+PortE,PE15,,TIM1_BKIN,,,,,,,,,,USART10_CK,FMC_D12/FMC_DA12,TIM1_BKIN_COMP1/TIM1_BKIN_COMP2,LTDC_R7,EVENTOUT/EVENTOUT,,
+PortE,PE2,DEBUG_TRACECLK,,SAI1_CK1,,,SPI4_SCK,SAI1_MCLK_A,,,OCTOSPIM_P1_IO2,,USART10_RX,FMC_A23,,,EVENTOUT/EVENTOUT,,
+PortE,PE3,DEBUG_TRACED0,,,,TIM15_BKIN,,SAI1_SD_B,,,,,USART10_TX,FMC_A19,,,EVENTOUT/EVENTOUT,,
+PortE,PE4,DEBUG_TRACED1,,SAI1_D2,DFSDM1_DATIN3,TIM15_CH1N,SPI4_NSS,SAI1_FS_A,,,,,,FMC_A20,DCMI_D4/PSSI_D4,LTDC_B0,EVENTOUT/EVENTOUT,,
+PortE,PE5,DEBUG_TRACED2,,SAI1_CK2,DFSDM1_CKIN3,TIM15_CH1,SPI4_MISO,SAI1_SCK_A,,,,,,FMC_A21,DCMI_D6/PSSI_D6,LTDC_G0,EVENTOUT/EVENTOUT,,
+PortE,PE6,DEBUG_TRACED3,TIM1_BKIN2,SAI1_D1,,TIM15_CH2,SPI4_MOSI,SAI1_SD_A,,,,SAI2_MCLK_B,TIM1_BKIN2_COMP1/TIM1_BKIN2_COMP2,FMC_A22,DCMI_D7/PSSI_D7,LTDC_G1,EVENTOUT/EVENTOUT,,
+PortE,PE7,,TIM1_ETR,,DFSDM1_DATIN2,,,,UART7_RX,,,OCTOSPIM_P1_IO4,,FMC_D4/FMC_DA4,,,EVENTOUT/EVENTOUT,,
+PortE,PE8,,TIM1_CH1N,,DFSDM1_CKIN2,,,,UART7_TX,,,OCTOSPIM_P1_IO5,,FMC_D5/FMC_DA5,COMP2_OUT,,EVENTOUT/EVENTOUT,,
+PortE,PE9,,TIM1_CH1,,DFSDM1_CKOUT,,,,UART7_DE/UART7_RTS,,,OCTOSPIM_P1_IO6,,FMC_D6/FMC_DA6,,,EVENTOUT/EVENTOUT,,
+PortF,PF0,,,,,I2C2_SDA,,,,,OCTOSPIM_P2_IO0,,,FMC_A0,,,EVENTOUT/EVENTOUT,,
+PortF,PF1,,,,,I2C2_SCL,,,,,OCTOSPIM_P2_IO1,,,FMC_A1,,,EVENTOUT/EVENTOUT,,
+PortF,PF10,,TIM16_BKIN,SAI1_D3,,PSSI_D15,,,,,OCTOSPIM_P1_CLK,,,,DCMI_D11/PSSI_D11,LTDC_DE,EVENTOUT/EVENTOUT,,
+PortF,PF11,,,,,,SPI5_MOSI,,,,OCTOSPIM_P1_NCLK,SAI2_SD_B,,FMC_SDNRAS,DCMI_D12/PSSI_D12,,EVENTOUT/EVENTOUT,ADC1_INP2,
+PortF,PF12,,,,,,,,,,OCTOSPIM_P2_DQS,,,FMC_A6,,,EVENTOUT/EVENTOUT,ADC1_INN2/ADC1_INP6,
+PortF,PF13,,,,DFSDM1_DATIN6,I2C4_SMBA,,,,,,,,FMC_A7,,,EVENTOUT/EVENTOUT,ADC2_INP2,
+PortF,PF14,,,,DFSDM1_CKIN6,I2C4_SCL,,,,,,,,FMC_A8,,,EVENTOUT/EVENTOUT,ADC2_INN2/ADC2_INP6,
+PortF,PF15,,,,,I2C4_SDA,,,,,,,,FMC_A9,,,EVENTOUT/EVENTOUT,,
+PortF,PF2,,,,,I2C2_SMBA,,,,,OCTOSPIM_P2_IO2,,,FMC_A2,,,EVENTOUT/EVENTOUT,,
+PortF,PF3,,,,,,,,,,OCTOSPIM_P2_IO3,,,FMC_A3,,,EVENTOUT/EVENTOUT,,
+PortF,PF4,,,,,,,,,,OCTOSPIM_P2_CLK,,,FMC_A4,,,EVENTOUT/EVENTOUT,,
+PortF,PF5,,,,,,,,,,OCTOSPIM_P2_NCLK,,,FMC_A5,,,EVENTOUT/EVENTOUT,,
+PortF,PF6,,TIM16_CH1,,,,SPI5_NSS,SAI1_SD_B,UART7_RX,,,OCTOSPIM_P1_IO3,,,,,EVENTOUT/EVENTOUT,,
+PortF,PF7,,TIM17_CH1,,,,SPI5_SCK,SAI1_MCLK_B,UART7_TX,,,OCTOSPIM_P1_IO2,,,,,EVENTOUT/EVENTOUT,,
+PortF,PF8,,TIM16_CH1N,,,,SPI5_MISO,SAI1_SCK_B,UART7_DE/UART7_RTS,,TIM13_CH1,OCTOSPIM_P1_IO0,,,,,EVENTOUT/EVENTOUT,,
+PortF,PF9,,TIM17_CH1N,,,,SPI5_MOSI,SAI1_FS_B,UART7_CTS,,TIM14_CH1,OCTOSPIM_P1_IO1,,,,,EVENTOUT/EVENTOUT,,
+PortG,PG0,,,,,,,,,,OCTOSPIM_P2_IO4,,UART9_RX,FMC_A10,,,EVENTOUT/EVENTOUT,,
+PortG,PG1,,,,,,,,,,OCTOSPIM_P2_IO5,,UART9_TX,FMC_A11,,,EVENTOUT/EVENTOUT,,
+PortG,PG10,,,,OCTOSPIM_P2_IO6,,I2S1_WS/SPI1_NSS,,,,LTDC_G3,SAI2_SD_B,SDMMC2_D1,FMC_NE3,DCMI_D2/PSSI_D2,LTDC_B2,EVENTOUT/EVENTOUT,,
+PortG,PG11,,LPTIM1_IN2,,,,I2S1_CK/SPI1_SCK,,,SPDIFRX_IN1,OCTOSPIM_P2_IO7,SDMMC2_D2,USART10_RX,,DCMI_D3/PSSI_D3,LTDC_B3,EVENTOUT/EVENTOUT,,
+PortG,PG12,,LPTIM1_IN1,,OCTOSPIM_P2_NCS,,I2S6_SDI/SPI6_MISO,,USART6_DE/USART6_RTS,SPDIFRX_IN2,LTDC_B4,SDMMC2_D3,USART10_TX,FMC_NE4,,LTDC_B1,EVENTOUT/EVENTOUT,,
+PortG,PG13,DEBUG_TRACED0,LPTIM1_OUT,,,,I2S6_CK/SPI6_SCK,,USART6_CTS/USART6_NSS,,,SDMMC2_D6,USART10_CTS/USART10_NSS,FMC_A24,,LTDC_R0,EVENTOUT/EVENTOUT,,
+PortG,PG14,DEBUG_TRACED1,LPTIM1_ETR,,,,I2S6_SDO/SPI6_MOSI,,USART6_TX,,OCTOSPIM_P1_IO7,SDMMC2_D7,USART10_DE/USART10_RTS,FMC_A25,,LTDC_B0,EVENTOUT/EVENTOUT,,
+PortG,PG15,,,,,,,,USART6_CTS/USART6_NSS,,OCTOSPIM_P2_DQS,,USART10_CK,FMC_SDNCAS,DCMI_D13/PSSI_D13,,EVENTOUT/EVENTOUT,,
+PortG,PG2,,,,TIM8_BKIN,,,,,,,,TIM8_BKIN_COMP1/TIM8_BKIN_COMP2,FMC_A12,,,EVENTOUT/EVENTOUT,,
+PortG,PG3,,,,TIM8_BKIN2,,,,,,,,TIM8_BKIN2_COMP1/TIM8_BKIN2_COMP2,FMC_A13,,,EVENTOUT/EVENTOUT,,
+PortG,PG4,,TIM1_BKIN2,,,,,,,,,,TIM1_BKIN2_COMP1/TIM1_BKIN2_COMP2,FMC_A14/FMC_BA0,,,EVENTOUT/EVENTOUT,,
+PortG,PG5,,TIM1_ETR,,,,,,,,,,,FMC_A15/FMC_BA1,,,EVENTOUT/EVENTOUT,,
+PortG,PG6,,TIM17_BKIN,,,,,,,,,OCTOSPIM_P1_NCS,,FMC_NE3,DCMI_D12/PSSI_D12,LTDC_R7,EVENTOUT/EVENTOUT,,
+PortG,PG7,,,,,,,SAI1_MCLK_A,USART6_CK,,OCTOSPIM_P2_DQS,,,FMC_INT,DCMI_D13/PSSI_D13,LTDC_CLK,EVENTOUT/EVENTOUT,,
+PortG,PG8,,,,TIM8_ETR,,I2S6_WS/SPI6_NSS,,USART6_DE/USART6_RTS,SPDIFRX_IN3,,,,FMC_SDCLK,,LTDC_G7,EVENTOUT/EVENTOUT,,
+PortG,PG9,,,,,,I2S1_SDI/SPI1_MISO,,USART6_RX,SPDIFRX_IN4,OCTOSPIM_P1_IO6,SAI2_FS_B,SDMMC2_D0,FMC_NCE/FMC_NE2,DCMI_VSYNC/PSSI_RDY,,EVENTOUT/EVENTOUT,,
+PortH,PH0-OSC_IN,,,,,,,,,,,,,,,,EVENTOUT/EVENTOUT,,
+PortH,PH1-OSC_OUT,,,,,,,,,,,,,,,,EVENTOUT/EVENTOUT,,
+PortH,PH10,,,TIM5_CH1,,I2C4_SMBA,,,,,,,,FMC_D18,DCMI_D1/PSSI_D1,LTDC_R4,EVENTOUT/EVENTOUT,,
+PortH,PH11,,,TIM5_CH2,,I2C4_SCL,,,,,,,,FMC_D19,DCMI_D2/PSSI_D2,LTDC_R5,EVENTOUT/EVENTOUT,,
+PortH,PH12,,,TIM5_CH3,,I2C4_SDA,,,,,,,,FMC_D20,DCMI_D3/PSSI_D3,LTDC_R6,EVENTOUT/EVENTOUT,,
+PortH,PH13,,,,TIM8_CH1N,,,,,UART4_TX,FDCAN1_TX,,,FMC_D21,,LTDC_G2,EVENTOUT/EVENTOUT,,
+PortH,PH14,,,,TIM8_CH2N,,,,,UART4_RX,FDCAN1_RX,,,FMC_D22,DCMI_D4/PSSI_D4,LTDC_G3,EVENTOUT/EVENTOUT,,
+PortH,PH15,,,,TIM8_CH3N,,,,,,,,,FMC_D23,DCMI_D11/PSSI_D11,LTDC_G4,EVENTOUT/EVENTOUT,,
+PortH,PH2,,LPTIM1_IN2,,,,,,,,OCTOSPIM_P1_IO4,SAI2_SCK_B,,FMC_SDCKE0,,LTDC_R0,EVENTOUT/EVENTOUT,,
+PortH,PH3,,,,,,,,,,OCTOSPIM_P1_IO5,SAI2_MCLK_B,,FMC_SDNE0,,LTDC_R1,EVENTOUT/EVENTOUT,,
+PortH,PH4,,,,,I2C2_SCL,,,,,LTDC_G5,USB_OTG_HS_ULPI_NXT,,,PSSI_D14,LTDC_G4,EVENTOUT/EVENTOUT,,
+PortH,PH5,,,,,I2C2_SDA,SPI5_NSS,,,,,,,FMC_SDNWE,,,EVENTOUT/EVENTOUT,,
+PortH,PH6,,,TIM12_CH1,,I2C2_SMBA,SPI5_SCK,,,,,,,FMC_SDNE1,DCMI_D8/PSSI_D8,,EVENTOUT/EVENTOUT,,
+PortH,PH7,,,,,I2C3_SCL,SPI5_MISO,,,,,,,FMC_SDCKE1,DCMI_D9/PSSI_D9,,EVENTOUT/EVENTOUT,,
+PortH,PH8,,,TIM5_ETR,,I2C3_SDA,,,,,,,,FMC_D16,DCMI_HSYNC/PSSI_DE,LTDC_R2,EVENTOUT/EVENTOUT,,
+PortH,PH9,,,TIM12_CH2,,I2C3_SMBA,,,,,,,,FMC_D17,DCMI_D0/PSSI_D0,LTDC_R3,EVENTOUT/EVENTOUT,,
+PortI,PI0,,,TIM5_CH4,,,I2S2_WS/SPI2_NSS,,,,,,,FMC_D24,DCMI_D13/PSSI_D13,LTDC_G5,EVENTOUT/EVENTOUT,,
+PortI,PI1,,,,TIM8_BKIN2,,I2S2_CK/SPI2_SCK,,,,,,TIM8_BKIN2_COMP1/TIM8_BKIN2_COMP2,FMC_D25,DCMI_D8/PSSI_D8,LTDC_G6,EVENTOUT/EVENTOUT,,
+PortI,PI10,,,,OCTOSPIM_P2_IO1,,,,,,,,,FMC_D31,PSSI_D14,LTDC_HSYNC,EVENTOUT/EVENTOUT,,
+PortI,PI11,,,,OCTOSPIM_P2_IO2,,,,,,LTDC_G6,USB_OTG_HS_ULPI_DIR,,,PSSI_D15,,EVENTOUT/EVENTOUT,,
+PortI,PI12,,,,OCTOSPIM_P2_IO3,,,,,,,,,,,LTDC_HSYNC,EVENTOUT/EVENTOUT,,
+PortI,PI13,,,,OCTOSPIM_P2_CLK,,,,,,,,,,,LTDC_VSYNC,EVENTOUT/EVENTOUT,,
+PortI,PI14,,,,OCTOSPIM_P2_NCLK,,,,,,,,,,,LTDC_CLK,EVENTOUT/EVENTOUT,,
+PortI,PI15,,,,,,,,,,LTDC_G2,,,,,LTDC_R0,EVENTOUT/EVENTOUT,,
+PortI,PI2,,,,TIM8_CH4,,I2S2_SDI/SPI2_MISO,,,,,,,FMC_D26,DCMI_D9/PSSI_D9,LTDC_G7,EVENTOUT/EVENTOUT,,
+PortI,PI3,,,,TIM8_ETR,,I2S2_SDO/SPI2_MOSI,,,,,,,FMC_D27,DCMI_D10/PSSI_D10,,EVENTOUT/EVENTOUT,,
+PortI,PI4,,,,TIM8_BKIN,,,,,,,SAI2_MCLK_A,TIM8_BKIN_COMP1/TIM8_BKIN_COMP2,FMC_NBL2,DCMI_D5/PSSI_D5,LTDC_B4,EVENTOUT/EVENTOUT,,
+PortI,PI5,,,,TIM8_CH1,,,,,,,SAI2_SCK_A,,FMC_NBL3,DCMI_VSYNC/PSSI_RDY,LTDC_B5,EVENTOUT/EVENTOUT,,
+PortI,PI6,,,,TIM8_CH2,,,,,,,SAI2_SD_A,,FMC_D28,DCMI_D6/PSSI_D6,LTDC_B6,EVENTOUT/EVENTOUT,,
+PortI,PI7,,,,TIM8_CH3,,,,,,,SAI2_FS_A,,FMC_D29,DCMI_D7/PSSI_D7,LTDC_B7,EVENTOUT/EVENTOUT,,
+PortI,PI8,,,,,,,,,,,,,,,,EVENTOUT/EVENTOUT,,
+PortI,PI9,,,,OCTOSPIM_P2_IO0,,,,,UART4_RX,FDCAN1_RX,,,FMC_D30,,LTDC_VSYNC,EVENTOUT/EVENTOUT,,
+PortJ,PJ0,,,,,,,,,,LTDC_R7,,,,,LTDC_R1,EVENTOUT/EVENTOUT,,
+PortJ,PJ1,,,,OCTOSPIM_P2_IO4,,,,,,,,,,,LTDC_R2,EVENTOUT/EVENTOUT,,
+PortJ,PJ10,,TIM1_CH2N,,TIM8_CH2,,SPI5_MOSI,,,,,,,,,LTDC_G3,EVENTOUT/EVENTOUT,,
+PortJ,PJ11,,TIM1_CH2,,TIM8_CH2N,,SPI5_MISO,,,,,,,,,LTDC_G4,EVENTOUT/EVENTOUT,,
+PortJ,PJ12,DEBUG_TRGOUT,,,,,,,,,LTDC_G3,,,,,LTDC_B0,EVENTOUT/EVENTOUT,,
+PortJ,PJ13,,,,,,,,,,LTDC_B4,,,,,LTDC_B1,EVENTOUT/EVENTOUT,,
+PortJ,PJ14,,,,,,,,,,,,,,,LTDC_B2,EVENTOUT/EVENTOUT,,
+PortJ,PJ15,,,,,,,,,,,,,,,LTDC_B3,EVENTOUT/EVENTOUT,,
+PortJ,PJ2,,,,OCTOSPIM_P2_IO5,,,,,,,,,,,LTDC_R3,EVENTOUT/EVENTOUT,,
+PortJ,PJ3,,,,,,,,,,,,UART9_DE/UART9_RTS,,,LTDC_R4,EVENTOUT/EVENTOUT,,
+PortJ,PJ4,,,,,,,,,,,,UART9_CTS,,,LTDC_R5,EVENTOUT/EVENTOUT,,
+PortJ,PJ5,,,,,,,,,,,,,,,LTDC_R6,EVENTOUT/EVENTOUT,,
+PortJ,PJ6,,,,TIM8_CH2,,,,,,,,,,,LTDC_R7,EVENTOUT/EVENTOUT,,
+PortJ,PJ7,DEBUG_TRGIN,,,TIM8_CH2N,,,,,,,,,,,LTDC_G0,EVENTOUT/EVENTOUT,,
+PortJ,PJ8,,TIM1_CH3N,,TIM8_CH1,,,,,UART8_TX,,,,,,LTDC_G1,EVENTOUT/EVENTOUT,,
+PortJ,PJ9,,TIM1_CH3,,TIM8_CH1N,,,,,UART8_RX,,,,,,LTDC_G2,EVENTOUT/EVENTOUT,,
+PortK,PK0,,TIM1_CH1N,,TIM8_CH3,,SPI5_SCK,,,,,,,,,LTDC_G5,EVENTOUT/EVENTOUT,,
+PortK,PK1,,TIM1_CH1,,TIM8_CH3N,,SPI5_NSS,,,,,,,,,LTDC_G6,EVENTOUT/EVENTOUT,,
+PortK,PK2,,TIM1_BKIN,,TIM8_BKIN,,,,,,,TIM8_BKIN_COMP1/TIM8_BKIN_COMP2,TIM1_BKIN_COMP1/TIM1_BKIN_COMP2,,,LTDC_G7,EVENTOUT/EVENTOUT,,
+PortK,PK3,,,,OCTOSPIM_P2_IO6,,,,,,,,,,,LTDC_B4,EVENTOUT/EVENTOUT,,
+PortK,PK4,,,,OCTOSPIM_P2_IO7,,,,,,,,,,,LTDC_B5,EVENTOUT/EVENTOUT,,
+PortK,PK5,,,,OCTOSPIM_P2_NCS,,,,,,,,,,,LTDC_B6,EVENTOUT/EVENTOUT,,
+PortK,PK6,,,,OCTOSPIM_P2_DQS,,,,,,,,,,,LTDC_B7,EVENTOUT/EVENTOUT,,
+PortK,PK7,,,,,,,,,,,,,,,LTDC_DE,EVENTOUT/EVENTOUT,,
diff --git a/ports/stm32/extint.c b/ports/stm32/extint.c
index 695655f09f5e2..699bc600406a8 100644
--- a/ports/stm32/extint.c
+++ b/ports/stm32/extint.c
@@ -166,7 +166,11 @@ STATIC const uint8_t nvic_irq_channel[EXTI_NUM_VECTORS] = {
     #if defined(STM32H7)
     PVD_AVD_IRQn,
     RTC_Alarm_IRQn,
+    #if defined(STM32H7A3xx) || defined(STM32H7A3xxQ) || defined(STM32H7B3xx) || defined(STM32H7B3xxQ)
+    RTC_TAMP_STAMP_CSS_LSE_IRQn,
+    #else
     TAMP_STAMP_IRQn,
+    #endif
     RTC_WKUP_IRQn,
     #elif defined(STM32WB)
     PVD_PVM_IRQn,
diff --git a/ports/stm32/flash.c b/ports/stm32/flash.c
index d399ece866e99..b926679f9fe4f 100644
--- a/ports/stm32/flash.c
+++ b/ports/stm32/flash.c
@@ -253,7 +253,11 @@ int flash_erase(uint32_t flash_dest, uint32_t num_word32) {
     #endif
 
     EraseInitStruct.TypeErase = TYPEERASE_SECTORS;
+    #if defined(FLASH_CR_PSIZE)
     EraseInitStruct.VoltageRange = VOLTAGE_RANGE_3; // voltage range needs to be 2.7V to 3.6V
+    #else
+    EraseInitStruct.VoltageRange = 0; // unused parameter on STM32H7A3/B3
+    #endif
     #if defined(STM32H7)
     EraseInitStruct.Banks = get_bank(flash_dest);
     #endif
diff --git a/ports/stm32/machine_adc.c b/ports/stm32/machine_adc.c
index f28bd5b398670..a114a9ad1a89b 100644
--- a/ports/stm32/machine_adc.c
+++ b/ports/stm32/machine_adc.c
@@ -130,6 +130,8 @@ void adc_config(ADC_TypeDef *adc, uint32_t bits) {
     adc->CFGR2 = 2 << ADC_CFGR2_CKMODE_Pos; // PCLK/4 (synchronous clock mode)
     #elif defined(STM32F4) || defined(STM32F7) || defined(STM32L4)
     ADCx_COMMON->CCR = 0; // ADCPR=PCLK/2
+    #elif defined(STM32H7A3xx) || defined(STM32H7A3xxQ) || defined(STM32H7B3xx) || defined(STM32H7B3xxQ)
+    ADC12_COMMON->CCR = 3 << ADC_CCR_CKMODE_Pos;
     #elif defined(STM32H7)
     ADC12_COMMON->CCR = 3 << ADC_CCR_CKMODE_Pos;
     ADC3_COMMON->CCR = 3 << ADC_CCR_CKMODE_Pos;
@@ -290,8 +292,9 @@ STATIC void adc_config_channel(ADC_TypeDef *adc, uint32_t channel, uint32_t samp
     *smpr = (*smpr & ~(7 << (channel * 3))) | sample_time << (channel * 3); // select sample time
 
     #elif defined(STM32H7) || defined(STM32L4) || defined(STM32WB)
-
-    #if defined(STM32H7)
+    #if defined(STM32H7A3xx) || defined(STM32H7A3xxQ) || defined(STM32H7B3xx) || defined(STM32H7B3xxQ)
+    ADC_Common_TypeDef *adc_common = ADC12_COMMON;
+    #elif defined(STM32H7)
     adc->PCSEL |= 1 << channel;
     ADC_Common_TypeDef *adc_common = adc == ADC3 ? ADC3_COMMON : ADC12_COMMON;
     #elif defined(STM32L4)
@@ -413,7 +416,7 @@ STATIC mp_obj_t machine_adc_make_new(const mp_obj_type_t *type, size_t n_args, s
         } else if (pin->adc_num & PIN_ADC2) {
             adc = ADC2;
         #endif
-        #if defined(ADC2)
+        #if defined(ADC3)
         } else if (pin->adc_num & PIN_ADC3) {
             adc = ADC3;
         #endif
diff --git a/ports/stm32/main.c b/ports/stm32/main.c
index e506cc5713f74..5d1ff2dcf5aad 100644
--- a/ports/stm32/main.c
+++ b/ports/stm32/main.c
@@ -378,6 +378,9 @@ void stm32_main(uint32_t reset_mode) {
     // enable the CCM RAM
     __HAL_RCC_CCMDATARAMEN_CLK_ENABLE();
     #endif
+    #elif defined(STM32H7A3xx) || defined(STM32H7A3xxQ) || defined(STM32H7B3xx) || defined(STM32H7B3xxQ)
+    // Enable SRAM clock.
+    __HAL_RCC_SRDSRAM_CLK_ENABLE();
     #elif defined(STM32H7)
     // Enable D2 SRAM1/2/3 clocks.
     __HAL_RCC_D2SRAM1_CLK_ENABLE();
diff --git a/ports/stm32/mpconfigboard_common.h b/ports/stm32/mpconfigboard_common.h
index 0cf6adce332f7..bd00bae9c358c 100644
--- a/ports/stm32/mpconfigboard_common.h
+++ b/ports/stm32/mpconfigboard_common.h
@@ -314,6 +314,17 @@
 #define MICROPY_HW_MAX_UART (8)
 #define MICROPY_HW_MAX_LPUART (0)
 
+// Configuration for STM32H7A3/B3 series
+#elif defined(STM32H7A3xx) || defined(STM32H7A3xxQ) || \
+    defined(STM32H7B3xx) || defined(STM32H7B3xxQ)
+
+#define MP_HAL_UNIQUE_ID_ADDRESS (0x08fff800)
+#define PYB_EXTI_NUM_VECTORS (24)
+#define MICROPY_HW_MAX_I2C (4)
+#define MICROPY_HW_MAX_TIMER (17)
+#define MICROPY_HW_MAX_UART (10)
+#define MICROPY_HW_MAX_LPUART (1)
+
 // Configuration for STM32H7 series
 #elif defined(STM32H7)
 
diff --git a/ports/stm32/powerctrl.c b/ports/stm32/powerctrl.c
index 9d9cc7f51bfa8..406325581b667 100644
--- a/ports/stm32/powerctrl.c
+++ b/ports/stm32/powerctrl.c
@@ -36,14 +36,22 @@
 #define RCC_SR_SFTRSTF  RCC_RSR_SFTRSTF
 #elif defined(STM32H747xx)
 #define RCC_SR_SFTRSTF  RCC_RSR_SFT2RSTF
+#elif defined(STM32H7A3xx) || defined(STM32H7A3xxQ) || defined(STM32H7B3xx) || defined(STM32H7B3xxQ)
+#define RCC_SR_SFTRSTF  RCC_RSR_SFTRSTF
 #endif
 #define RCC_SR_RMVF     RCC_RSR_RMVF
 // This macro returns the actual voltage scaling level factoring in the power overdrive bit.
 // If the current voltage scale is VOLTAGE_SCALE1 and PWER_ODEN bit is set return VOLTAGE_SCALE0
 // otherwise the current voltage scaling (level VOS1 to VOS3) set in PWER_CSR is returned instead.
+#if defined(STM32H7A3xx) || defined(STM32H7A3xxQ) || \
+    defined(STM32H7B3xx) || defined(STM32H7B3xxQ)
+// TODO
+#define POWERCTRL_GET_VOLTAGE_SCALING() PWR_REGULATOR_VOLTAGE_SCALE0
+#else
 #define POWERCTRL_GET_VOLTAGE_SCALING()     \
     (((PWR->CSR1 & PWR_CSR1_ACTVOS) && (SYSCFG->PWRCR & SYSCFG_PWRCR_ODEN)) ? \
     PWR_REGULATOR_VOLTAGE_SCALE0 : (PWR->CSR1 & PWR_CSR1_ACTVOS))
+#endif
 #else
 #define RCC_SR          CSR
 #define RCC_SR_SFTRSTF  RCC_CSR_SFTRSTF
@@ -148,6 +156,15 @@ STATIC const sysclk_scaling_table_entry_t volt_scale_table[] = {
     { 180, PWR_REGULATOR_VOLTAGE_SCALE2 },
     // Above 180MHz uses default PWR_REGULATOR_VOLTAGE_SCALE1
 };
+#elif defined(STM32H7A3xx) || defined(STM32H7A3xxQ) || \
+    defined(STM32H7B3xx) || defined(STM32H7B3xxQ)
+STATIC const sysclk_scaling_table_entry_t volt_scale_table[] = {
+    // See table 15 "FLASH recommended number of wait states and programming delay" of RM0455.
+    {88, PWR_REGULATOR_VOLTAGE_SCALE3},
+    {160, PWR_REGULATOR_VOLTAGE_SCALE2},
+    {225, PWR_REGULATOR_VOLTAGE_SCALE1},
+    {280, PWR_REGULATOR_VOLTAGE_SCALE0},
+};
 #elif defined(STM32H7)
 STATIC const sysclk_scaling_table_entry_t volt_scale_table[] = {
     // See table 55 "Kernel clock distribution overview" of RM0433.
@@ -836,6 +853,9 @@ void powerctrl_enter_standby_mode(void) {
     #if defined(STM32F0) || defined(STM32L0)
     #define CR_BITS (RTC_CR_ALRAIE | RTC_CR_WUTIE | RTC_CR_TSIE)
     #define ISR_BITS (RTC_ISR_ALRAF | RTC_ISR_WUTF | RTC_ISR_TSF)
+    #elif defined(STM32H7A3xx) || defined(STM32H7A3xxQ) || defined(STM32H7B3xx) || defined(STM32H7B3xxQ)
+    #define CR_BITS (RTC_CR_ALRAIE | RTC_CR_ALRBIE | RTC_CR_WUTIE | RTC_CR_TSIE)
+    #define SR_BITS (RTC_SR_ALRAF | RTC_SR_ALRBF | RTC_SR_WUTF | RTC_SR_TSF)
     #else
     #define CR_BITS (RTC_CR_ALRAIE | RTC_CR_ALRBIE | RTC_CR_WUTIE | RTC_CR_TSIE)
     #define ISR_BITS (RTC_ISR_ALRAF | RTC_ISR_ALRBF | RTC_ISR_WUTF | RTC_ISR_TSF)
@@ -852,7 +872,11 @@ void powerctrl_enter_standby_mode(void) {
     RTC->CR &= ~CR_BITS;
 
     // clear RTC wake-up flags
+    #if defined(SR_BITS)
+    RTC->SR &= ~SR_BITS;
+    #else
     RTC->ISR &= ~ISR_BITS;
+    #endif
 
     #if defined(STM32F7)
     // Save EWUP state
diff --git a/ports/stm32/rtc.c b/ports/stm32/rtc.c
index ab8b49e188206..a5553b8a0a796 100644
--- a/ports/stm32/rtc.c
+++ b/ports/stm32/rtc.c
@@ -339,9 +339,15 @@ STATIC HAL_StatusTypeDef PYB_RTC_Init(RTC_HandleTypeDef *hrtc) {
         hrtc->Instance->PRER |= (uint32_t)(hrtc->Init.AsynchPrediv << 16);
 
         // Exit Initialization mode
+        #if defined(STM32H7A3xx) || defined(STM32H7A3xxQ) || defined(STM32H7B3xx) || defined(STM32H7B3xxQ)
+        hrtc->Instance->ICSR &= (uint32_t) ~RTC_ICSR_INIT;
+        #else
         hrtc->Instance->ISR &= (uint32_t) ~RTC_ISR_INIT;
+        #endif
 
-        #if defined(STM32L0) || defined(STM32L4) || defined(STM32H7) || defined(STM32WB)
+        #if defined(STM32H7A3xx) || defined(STM32H7A3xxQ) || defined(STM32H7B3xx) || defined(STM32H7B3xxQ)
+        // do nothing
+        #elif defined(STM32L0) || defined(STM32L4) || defined(STM32H7) || defined(STM32WB)
         hrtc->Instance->OR &= (uint32_t) ~RTC_OR_ALARMOUTTYPE;
         hrtc->Instance->OR |= (uint32_t)(hrtc->Init.OutPutType);
         #elif defined(STM32F7)
@@ -693,8 +699,13 @@ mp_obj_t pyb_rtc_wakeup(size_t n_args, const mp_obj_t *args) {
     RTC->CR &= ~RTC_CR_WUTE;
 
     // wait until WUTWF is set
+    #if defined(STM32H7A3xx) || defined(STM32H7A3xxQ) || defined(STM32H7B3xx) || defined(STM32H7B3xxQ)
+    while (!(RTC->ICSR & RTC_ICSR_WUTWF)) {
+    }
+    #else
     while (!(RTC->ISR & RTC_ISR_WUTWF)) {
     }
+    #endif
 
     if (enable) {
         // program WUT
@@ -721,7 +732,11 @@ mp_obj_t pyb_rtc_wakeup(size_t n_args, const mp_obj_t *args) {
         #endif
 
         // clear interrupt flags
+        #if defined(STM32H7A3xx) || defined(STM32H7A3xxQ) || defined(STM32H7B3xx) || defined(STM32H7B3xxQ)
+        RTC->SR &= ~RTC_SR_WUTF;
+        #else
         RTC->ISR &= ~RTC_ISR_WUTF;
+        #endif
         #if defined(STM32L4) || defined(STM32WB)
         EXTI->PR1 = 1 << EXTI_RTC_WAKEUP;
         #elif defined(STM32H7)
diff --git a/ports/stm32/stm32_it.c b/ports/stm32/stm32_it.c
index 4dde201a2f7f4..ed97c4fe0bec3 100644
--- a/ports/stm32/stm32_it.c
+++ b/ports/stm32/stm32_it.c
@@ -527,7 +527,11 @@ void TAMP_STAMP_IRQHandler(void) {
 
 void RTC_WKUP_IRQHandler(void) {
     IRQ_ENTER(RTC_WKUP_IRQn);
+    #if defined(STM32H7A3xx) || defined(STM32H7A3xxQ) || defined(STM32H7B3xx) || defined(STM32H7B3xxQ)
+    RTC->SR &= ~RTC_SR_WUTF; // clear wakeup interrupt flag
+    #else
     RTC->ISR &= ~RTC_ISR_WUTF; // clear wakeup interrupt flag
+    #endif
     Handle_EXTI_Irq(EXTI_RTC_WAKEUP); // clear EXTI flag and execute optional callback
     IRQ_EXIT(RTC_WKUP_IRQn);
 }
diff --git a/ports/stm32/system_stm32.c b/ports/stm32/system_stm32.c
index 4e89204bf6c21..8142fd0a5c64f 100644
--- a/ports/stm32/system_stm32.c
+++ b/ports/stm32/system_stm32.c
@@ -180,7 +180,9 @@ void SystemClock_Config(void) {
     #if defined(STM32F4) || defined(STM32F7) || defined(STM32H7)
 
     /* Enable Power Control clock */
-    #if defined(STM32H7)
+    #if defined(STM32H7A3xxQ) || defined(STM32H7B3xxQ)
+    MODIFY_REG(PWR->CR3, PWR_SUPPLY_CONFIG_MASK, PWR_CR3_SMPSEN);
+    #elif defined(STM32H7)
     MODIFY_REG(PWR->CR3, PWR_CR3_SCUEN, 0);
     #else
     __PWR_CLK_ENABLE();
@@ -197,7 +199,7 @@ void SystemClock_Config(void) {
 
     #if defined(STM32H7)
     // Wait for PWR_FLAG_VOSRDY
-    while ((PWR->D3CR & (PWR_D3CR_VOSRDY)) != PWR_D3CR_VOSRDY) {
+    while (!__HAL_PWR_GET_FLAG(PWR_FLAG_VOSRDY)) {
     }
     #endif
 
diff --git a/ports/stm32/timer.c b/ports/stm32/timer.c
index a34d2984da979..c23e7e02d4b1e 100644
--- a/ports/stm32/timer.c
+++ b/ports/stm32/timer.c
@@ -239,6 +239,9 @@ uint32_t timer_get_source_freq(uint32_t tim_id) {
         #if defined(STM32F0)
         source = HAL_RCC_GetPCLK1Freq();
         clk_div = RCC->CFGR & RCC_CFGR_PPRE;
+        #elif defined(STM32H7A3xx) || defined(STM32H7A3xxQ) || defined(STM32H7B3xx) || defined(STM32H7B3xxQ)
+        source = HAL_RCC_GetPCLK2Freq();
+        clk_div = RCC->CDCFGR2 & RCC_CDCFGR2_CDPPRE2;
         #elif defined(STM32H7)
         source = HAL_RCC_GetPCLK2Freq();
         clk_div = RCC->D2CFGR & RCC_D2CFGR_D2PPRE2;
@@ -251,6 +254,8 @@ uint32_t timer_get_source_freq(uint32_t tim_id) {
         source = HAL_RCC_GetPCLK1Freq();
         #if defined(STM32F0)
         clk_div = RCC->CFGR & RCC_CFGR_PPRE;
+        #elif defined(STM32H7A3xx) || defined(STM32H7A3xxQ) || defined(STM32H7B3xx) || defined(STM32H7B3xxQ)
+        clk_div = RCC->CDCFGR1 & RCC_CDCFGR2_CDPPRE1;
         #elif defined(STM32H7)
         clk_div = RCC->D2CFGR & RCC_D2CFGR_D2PPRE1;
         #else
diff --git a/ports/stm32/uart.c b/ports/stm32/uart.c
index d2953b2646979..627c33397db42 100644
--- a/ports/stm32/uart.c
+++ b/ports/stm32/uart.c
@@ -717,6 +717,33 @@ uint32_t uart_get_source_freq(pyb_uart_obj_t *self) {
             uart_clk = LSE_VALUE;
             break;
     }
+    #elif defined(STM32H7A3xx) || defined(STM32H7A3xxQ) || defined(STM32H7B3xx) || defined(STM32H7B3xxQ)
+    uint32_t csel;
+    if (self->uart_id == 1 || self->uart_id == 6 || self->uart_id == 9 || self->uart_id == 10) {
+        csel = RCC->CDCCIP2R >> 3;
+    } else {
+        csel = RCC->CDCCIP2R;
+    }
+    switch (csel & 3) {
+        case 0:
+            if (self->uart_id == 1 || self->uart_id == 6 || self->uart_id == 9 || self->uart_id == 10) {
+                uart_clk = HAL_RCC_GetPCLK2Freq();
+            } else {
+                uart_clk = HAL_RCC_GetPCLK1Freq();
+            }
+            break;
+        case 3:
+            uart_clk = HSI_VALUE;
+            break;
+        case 4:
+            uart_clk = CSI_VALUE;
+            break;
+        case 5:
+            uart_clk = LSE_VALUE;
+            break;
+        default:
+            break;
+    }
     #elif defined(STM32H7)
     uint32_t csel;
     if (self->uart_id == 1 || self->uart_id == 6) {
diff --git a/ports/stm32/usbd_conf.c b/ports/stm32/usbd_conf.c
index d24881d202fbf..50e10ba178bf6 100644
--- a/ports/stm32/usbd_conf.c
+++ b/ports/stm32/usbd_conf.c
@@ -59,6 +59,7 @@ PCD_HandleTypeDef pcd_hs_handle;
   * @retval None
   */
 void HAL_PCD_MspInit(PCD_HandleTypeDef *hpcd) {
+    #if MICROPY_HW_USB_FS
     if (hpcd->Instance == USB_OTG_FS) {
         #if defined(STM32H7)
         const uint32_t otg_alt = GPIO_AF10_OTG1_FS;
@@ -125,12 +126,18 @@ void HAL_PCD_MspInit(PCD_HandleTypeDef *hpcd) {
         NVIC_SetPriority(OTG_FS_IRQn, IRQ_PRI_OTG_FS);
         HAL_NVIC_EnableIRQ(OTG_FS_IRQn);
         #endif
+
+        return;
     }
+    #endif
+
     #if MICROPY_HW_USB_HS
-    else if (hpcd->Instance == USB_OTG_HS) {
+    if (hpcd->Instance == USB_OTG_HS) {
         #if MICROPY_HW_USB_HS_IN_FS
 
-        #if defined(STM32H7)
+        #if defined(STM32H7A3xx) || defined(STM32H7A3xxQ) || defined(STM32H7B3xx) || defined(STM32H7B3xxQ)
+        const uint32_t otg_alt = GPIO_AF10_OTG1_FS;
+        #elif defined(STM32H7)
         const uint32_t otg_alt = GPIO_AF12_OTG2_FS;
         #else
         const uint32_t otg_alt = GPIO_AF12_OTG_HS_FS;
@@ -204,13 +211,17 @@ void HAL_PCD_MspDeInit(PCD_HandleTypeDef *hpcd) {
     __HAL_RCC_USB_CLK_DISABLE();
     #else
 
+    #if MICROPY_HW_USB_FS
     if (hpcd->Instance == USB_OTG_FS) {
         /* Disable USB FS Clocks */
         __USB_OTG_FS_CLK_DISABLE();
         __SYSCFG_CLK_DISABLE();
+        return;
     }
+    #endif
+
     #if MICROPY_HW_USB_HS
-    else if (hpcd->Instance == USB_OTG_HS) {
+    if (hpcd->Instance == USB_OTG_HS) {
         /* Disable USB FS Clocks */
         __USB_OTG_HS_CLK_DISABLE();
         __SYSCFG_CLK_DISABLE();

From e3eebc329f06983dd1fe304e1ceddbafb814f1e6 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Wed, 15 Sep 2021 11:07:43 +1000
Subject: [PATCH 1283/3533] stm32: Suggest putting code in main.py not boot.py.

Don't want users to accidentally use boot.py (because recovering requires
knowing how to activate safe mode).

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 docs/pyboard/tutorial/usb_mouse.rst | 4 ++--
 ports/cc3200/mptask.c               | 4 ++--
 ports/stm32/factoryreset.c          | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/docs/pyboard/tutorial/usb_mouse.rst b/docs/pyboard/tutorial/usb_mouse.rst
index 8166946ecd9e1..d05b16ed5c978 100644
--- a/docs/pyboard/tutorial/usb_mouse.rst
+++ b/docs/pyboard/tutorial/usb_mouse.rst
@@ -8,8 +8,8 @@ To do this we must first edit the ``boot.py`` file to change the USB
 configuration.  If you have not yet touched your ``boot.py`` file then it
 will look something like this::
 
-    # boot.py -- run on boot-up
-    # can run arbitrary Python, but best to keep it minimal
+    # boot.py -- run on boot to configure USB and filesystem
+    # Put app code in main.py
 
     import pyb
     #pyb.main('main.py') # main script to run after this one
diff --git a/ports/cc3200/mptask.c b/ports/cc3200/mptask.c
index b764c4712c630..599211bdfbaad 100644
--- a/ports/cc3200/mptask.c
+++ b/ports/cc3200/mptask.c
@@ -99,8 +99,8 @@ OsiTaskHandle svTaskHandle;
 static fs_user_mount_t *sflash_vfs_fat;
 
 static const char fresh_main_py[] = "# main.py -- put your code here!\r\n";
-static const char fresh_boot_py[] = "# boot.py -- run on boot-up\r\n"
-    "# can run arbitrary Python, but best to keep it minimal\r\n"
+static const char fresh_boot_py[] = "# boot.py -- run on boot to configure USB and filesystem\r\n"
+    "# Put app code in main.py\r\n"
                                     #if MICROPY_STDIO_UART
     "import os, machine\r\n"
     "os.dupterm(machine.UART(0, " MP_STRINGIFY(MICROPY_STDIO_UART_BAUD) "))\r\n"
diff --git a/ports/stm32/factoryreset.c b/ports/stm32/factoryreset.c
index 725ecd12a871c..999056e7265f7 100644
--- a/ports/stm32/factoryreset.c
+++ b/ports/stm32/factoryreset.c
@@ -37,8 +37,8 @@
 #if MICROPY_VFS_FAT
 
 static const char fresh_boot_py[] =
-    "# boot.py -- run on boot-up\r\n"
-    "# can run arbitrary Python, but best to keep it minimal\r\n"
+    "# boot.py -- run on boot to configure USB and filesystem\r\n"
+    "# Put app code in main.py\r\n"
     "\r\n"
     "import machine\r\n"
     "import pyb\r\n"

From a6907c779af9c5e7c4516e1c722e61e985103ac7 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 15 Sep 2021 17:17:49 +1000
Subject: [PATCH 1284/3533] stm32/boards/make-pins.py: Allow a CPU pin to be
 hidden.

This change allows a CPU pin to be hidden from the user by prefixing it
with a "-" in the pins.csv file for a board.  It will still be available in
C code, just not exposed to Python.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/boards/make-pins.py | 64 ++++++++++++++++++++++++++++++---
 1 file changed, 59 insertions(+), 5 deletions(-)

diff --git a/ports/stm32/boards/make-pins.py b/ports/stm32/boards/make-pins.py
index d898832f09606..d3e2d0256fdb7 100755
--- a/ports/stm32/boards/make-pins.py
+++ b/ports/stm32/boards/make-pins.py
@@ -1,5 +1,49 @@
 #!/usr/bin/env python
-"""Creates the pin file for the STM32F4xx."""
+
+"""
+Generates pin source files based on an MCU alternate-function definition (eg
+stm32f405_af.csv) and a board-specific pin definition file, pins.csv.
+
+The pins.csv file must contain lines of the form:
+
+    board,cpu
+
+Where "board" is the user-facing name of the pin as specified by the particular
+board layout and markings, and "cpu" is the corresponding name of the CPU/MCU
+pin.
+
+The "board" entry may be absent if the CPU pin has no additional name, and both
+entries may start with "-" to hide them from the corresponding Python dict of
+pins, and hence hide them from the user (but they are still accessible in C).
+
+For example, take the following pins.csv file:
+
+    X1,PA0
+    -X2,PA1
+    X3,-PA2
+    -X4,-PA3
+    ,PA4
+    ,-PA5
+
+The first row here configures:
+- The CPU pin PA0 is labelled X1.
+- The Python user can access both by the names Pin("X1") and Pin("A0").
+- The Python user can access both by the members Pin.board.X1 and Pin.cpu.A0.
+- In C code they are available as pyb_pin_X1 and pin_A0.
+
+Prefixing the names with "-" hides them from the user.  The following table
+summarises the various possibilities:
+
+    pins.csv entry | board name | cpu name | C board name | C cpu name
+    ---------------+------------+----------+--------------+-----------
+    X1,PA0           "X1"         "A0"       pyb_pin_X1     pin_A0
+    -X2,PA1          -            "A1"       pyb_pin_X2     pin_A1
+    X3,-PA2          "X3"         -          pyb_pin_X3     pin_A2
+    -X4,-PA3         -            -          pyb_pin_X4     pin_A3
+    ,PA4             -            "A4"       -              pin_A4
+    ,-PA5            -            -          -              pin_A5
+
+"""
 
 from __future__ import print_function
 
@@ -273,6 +317,9 @@ def __init__(self, name, pin):
             self._name = name
         self._pin = pin
 
+    def set_hidden(self, value):
+        self._is_hidden = value
+
     def is_hidden(self):
         return self._is_hidden
 
@@ -293,7 +340,7 @@ def find_pin(self, port_num, pin_num):
         for named_pin in self.cpu_pins:
             pin = named_pin.pin()
             if pin.port == port_num and pin.pin == pin_num:
-                return pin
+                return named_pin
 
     def parse_af_file(self, filename, pinname_col, af_col):
         with open(filename, "r") as csvfile:
@@ -315,12 +362,19 @@ def parse_board_file(self, filename):
         with open(filename, "r") as csvfile:
             rows = csv.reader(csvfile)
             for row in rows:
+                cpu_pin_name = row[1]
+                cpu_pin_hidden = False
+                if cpu_pin_name.startswith("-"):
+                    cpu_pin_name = cpu_pin_name[1:]
+                    cpu_pin_hidden = True
                 try:
-                    (port_num, pin_num) = parse_port_pin(row[1])
+                    (port_num, pin_num) = parse_port_pin(cpu_pin_name)
                 except:
                     continue
-                pin = self.find_pin(port_num, pin_num)
-                if pin:
+                named_pin = self.find_pin(port_num, pin_num)
+                if named_pin:
+                    named_pin.set_hidden(cpu_pin_hidden)
+                    pin = named_pin.pin()
                     pin.set_is_board_pin()
                     if row[0]:  # Only add board pins that have a name
                         self.board_pins.append(NamedPin(row[0], pin))

From c51cc46bf82d1f90e20f96798f27e6f496ec3266 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 16 Sep 2021 12:52:23 +1000
Subject: [PATCH 1285/3533] stm32/boards/make-pins.py: Allow empty lines and
 comments in pins.csv.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/boards/make-pins.py | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/ports/stm32/boards/make-pins.py b/ports/stm32/boards/make-pins.py
index d3e2d0256fdb7..c7423cb966164 100755
--- a/ports/stm32/boards/make-pins.py
+++ b/ports/stm32/boards/make-pins.py
@@ -4,7 +4,8 @@
 Generates pin source files based on an MCU alternate-function definition (eg
 stm32f405_af.csv) and a board-specific pin definition file, pins.csv.
 
-The pins.csv file must contain lines of the form:
+The pins.csv file can contain empty lines, comments (a line beginning with "#")
+or pin definition lines.  Pin definition lines must be of the form:
 
     board,cpu
 
@@ -362,6 +363,12 @@ def parse_board_file(self, filename):
         with open(filename, "r") as csvfile:
             rows = csv.reader(csvfile)
             for row in rows:
+                if len(row) == 0 or row[0].startswith("#"):
+                    # Skip empty lines, and lines starting with "#"
+                    continue
+                if len(row) != 2:
+                    raise ValueError("Expecting two entries in a row")
+
                 cpu_pin_name = row[1]
                 cpu_pin_hidden = False
                 if cpu_pin_name.startswith("-"):

From 0c0807e08480b5bf3734648bd0f7f4405e1989f5 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 15 Sep 2021 21:12:53 +1000
Subject: [PATCH 1286/3533] stm32/dma: Add functions for external users of DMA
 to enable clock.

Any external user of DMA (eg a board with a custom DMA driver) must call
dma_external_acquire() for their DMA controller/stream to ensure that the
DMA clock is not automatically turned off while it's still being used
externally.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/dma.c | 10 ++++++++++
 ports/stm32/dma.h |  8 ++++++++
 2 files changed, 18 insertions(+)

diff --git a/ports/stm32/dma.c b/ports/stm32/dma.c
index ba09dc1707925..4b078eebb6fd6 100644
--- a/ports/stm32/dma.c
+++ b/ports/stm32/dma.c
@@ -1233,3 +1233,13 @@ void dma_nohal_start(const dma_descr_t *descr, uint32_t src_addr, uint32_t dst_a
 }
 
 #endif
+
+#define DMA_ID_FROM_CONTROLLER_STREAM(c, s) ((s) + (c) * NSTREAMS_PER_CONTROLLER)
+
+void dma_external_acquire(uint32_t controller, uint32_t stream) {
+    dma_enable_clock(DMA_ID_FROM_CONTROLLER_STREAM(controller, stream));
+}
+
+void dma_external_release(uint32_t controller, uint32_t stream) {
+    dma_disable_clock(DMA_ID_FROM_CONTROLLER_STREAM(controller, stream));
+}
diff --git a/ports/stm32/dma.h b/ports/stm32/dma.h
index 8bd101a61183f..00200bae46dee 100644
--- a/ports/stm32/dma.h
+++ b/ports/stm32/dma.h
@@ -102,13 +102,21 @@ extern const dma_descr_t dma_I2C_4_RX;
 
 #endif
 
+// API that configures the DMA via the HAL.
 void dma_init(DMA_HandleTypeDef *dma, const dma_descr_t *dma_descr, uint32_t dir, void *data);
 void dma_init_handle(DMA_HandleTypeDef *dma, const dma_descr_t *dma_descr, uint32_t dir, void *data);
 void dma_deinit(const dma_descr_t *dma_descr);
 void dma_invalidate_channel(const dma_descr_t *dma_descr);
 
+// API that configures the DMA directly and does not use the HAL.
 void dma_nohal_init(const dma_descr_t *descr, uint32_t config);
 void dma_nohal_deinit(const dma_descr_t *descr);
 void dma_nohal_start(const dma_descr_t *descr, uint32_t src_addr, uint32_t dst_addr, uint16_t len);
 
+// API to be used if DMA is controlled externally, to ensure the clock remains enabled.
+// - controller: should be 0 or 1, corresponding to DMA1 or DMA2
+// - stream: should be 0 to N, corresponding to Stream0..StreamN, or Channel1..ChannelN
+void dma_external_acquire(uint32_t controller, uint32_t stream);
+void dma_external_release(uint32_t controller, uint32_t stream);
+
 #endif // MICROPY_INCLUDED_STM32_DMA_H

From 01374d941f9d7398e35990b574769b20c6779457 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Sat, 14 Aug 2021 01:43:15 +1000
Subject: [PATCH 1287/3533] py/mpconfig.h: Define initial templates for
 "feature levels".

This is the beginning of a set of changes to simplify enabling/disabling
features.  The goals are:
- Remove redundancy from mpconfigport.h (never set a value to the default
  -- make it clear exactly what's being enabled).
- Improve consistency between ports.  All "similar" ports (i.e. approx same
  flash size) should get the same features.
- Simplify mpconfigport.h -- just get default/sensible options for the size
  of the port.
- Make it easy for defining constrained boards (e.g. STM32F0/L0), they can
  just set a lower level.

This commit makes a step towards this and defines the "core" level as the
current default feature set, and a "minimal" level to turn off everything.
And a few placeholder levels are added for where the other ports will
roughly land.

This is a no-op change for all ports.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 py/mpconfig.h | 107 +++++++++++++++++++++++++++++++++-----------------
 1 file changed, 71 insertions(+), 36 deletions(-)

diff --git a/py/mpconfig.h b/py/mpconfig.h
index 1b41b6bd0ffeb..7b98112e17930 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -62,6 +62,31 @@
 #include <mpconfigport.h>
 #endif
 
+// Disable all optional features (i.e. minimal port).
+#define MICROPY_CONFIG_ROM_LEVEL_MINIMUM (0)
+// Only enable core features (constrained flash, e.g. STM32L072)
+#define MICROPY_CONFIG_ROM_LEVEL_CORE_FEATURES (10)
+// Enable most common features (small on-device flash, e.g. STM32F411)
+#define MICROPY_CONFIG_ROM_LEVEL_BASIC_FEATURES (20)
+// Enable convenience features (medium on-device flash, e.g. STM32F405)
+#define MICROPY_CONFIG_ROM_LEVEL_EXTRA_FEATURES (30)
+// Enable all common features (large/external flash, rp2, unix)
+#define MICROPY_CONFIG_ROM_LEVEL_FULL_FEATURES (40)
+// Enable everything (e.g. coverage)
+#define MICROPY_CONFIG_ROM_LEVEL_EVERYTHING (50)
+
+// Ports/boards should set this, but default to level=core.
+#ifndef MICROPY_CONFIG_ROM_LEVEL
+#define MICROPY_CONFIG_ROM_LEVEL (MICROPY_CONFIG_ROM_LEVEL_CORE_FEATURES)
+#endif
+
+// Helper macros for "have at least this level".
+#define MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_CORE_FEATURES (MICROPY_CONFIG_ROM_LEVEL >= MICROPY_CONFIG_ROM_LEVEL_CORE_FEATURES)
+#define MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_BASIC_FEATURES (MICROPY_CONFIG_ROM_LEVEL >= MICROPY_CONFIG_ROM_LEVEL_BASIC_FEATURES)
+#define MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES (MICROPY_CONFIG_ROM_LEVEL >= MICROPY_CONFIG_ROM_LEVEL_EXTRA_FEATURES)
+#define MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_FULL_FEATURES (MICROPY_CONFIG_ROM_LEVEL >= MICROPY_CONFIG_ROM_LEVEL_FULL_FEATURES)
+#define MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EVERYTHING (MICROPY_CONFIG_ROM_LEVEL >= MICROPY_CONFIG_ROM_LEVEL_EVERYTHING)
+
 // Any options not explicitly set in mpconfigport.h will get default
 // values below.
 
@@ -156,7 +181,7 @@
 // Support automatic GC when reaching allocation threshold,
 // configurable by gc.threshold().
 #ifndef MICROPY_GC_ALLOC_THRESHOLD
-#define MICROPY_GC_ALLOC_THRESHOLD (1)
+#define MICROPY_GC_ALLOC_THRESHOLD (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_CORE_FEATURES)
 #endif
 
 // Number of bytes to allocate initially when creating new chunks to store
@@ -249,7 +274,11 @@
 
 // Number of bytes used to store qstr hash
 #ifndef MICROPY_QSTR_BYTES_IN_HASH
+#if MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_CORE_FEATURES
 #define MICROPY_QSTR_BYTES_IN_HASH (2)
+#else
+#define MICROPY_QSTR_BYTES_IN_HASH (1)
+#endif
 #endif
 
 // Avoid using C stack when making Python function calls. C stack still
@@ -383,7 +412,7 @@
 
 // Whether to include the compiler
 #ifndef MICROPY_ENABLE_COMPILER
-#define MICROPY_ENABLE_COMPILER (1)
+#define MICROPY_ENABLE_COMPILER (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_CORE_FEATURES)
 #endif
 
 // Whether the compiler is dynamically configurable (ie at runtime)
@@ -403,12 +432,12 @@
 
 // Whether to enable constant folding; eg 1+2 rewritten as 3
 #ifndef MICROPY_COMP_CONST_FOLDING
-#define MICROPY_COMP_CONST_FOLDING (1)
+#define MICROPY_COMP_CONST_FOLDING (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_CORE_FEATURES)
 #endif
 
 // Whether to enable optimisations for constant literals, eg OrderedDict
 #ifndef MICROPY_COMP_CONST_LITERAL
-#define MICROPY_COMP_CONST_LITERAL (1)
+#define MICROPY_COMP_CONST_LITERAL (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_CORE_FEATURES)
 #endif
 
 // Whether to enable lookup of constants in modules; eg module.CONST
@@ -418,13 +447,13 @@
 
 // Whether to enable constant optimisation; id = const(value)
 #ifndef MICROPY_COMP_CONST
-#define MICROPY_COMP_CONST (1)
+#define MICROPY_COMP_CONST (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_CORE_FEATURES)
 #endif
 
 // Whether to enable optimisation of: a, b = c, d
 // Costs 124 bytes (Thumb2)
 #ifndef MICROPY_COMP_DOUBLE_TUPLE_ASSIGN
-#define MICROPY_COMP_DOUBLE_TUPLE_ASSIGN (1)
+#define MICROPY_COMP_DOUBLE_TUPLE_ASSIGN (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_CORE_FEATURES)
 #endif
 
 // Whether to enable optimisation of: a, b, c = d, e, f
@@ -517,7 +546,7 @@
 // When disabled, only importing of built-in modules is supported
 // When enabled, a port must implement mp_import_stat (among other things)
 #ifndef MICROPY_ENABLE_EXTERNAL_IMPORT
-#define MICROPY_ENABLE_EXTERNAL_IMPORT (1)
+#define MICROPY_ENABLE_EXTERNAL_IMPORT (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_CORE_FEATURES)
 #endif
 
 // Whether to use the POSIX reader for importing files
@@ -684,7 +713,13 @@ typedef long long mp_longint_impl_t;
 #define MICROPY_ERROR_REPORTING_DETAILED (3)
 
 #ifndef MICROPY_ERROR_REPORTING
+#if MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_FULL_FEATURES
+#define MICROPY_ERROR_REPORTING (MICROPY_ERROR_REPORTING_DETAILED)
+#elif MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_CORE_FEATURES
 #define MICROPY_ERROR_REPORTING (MICROPY_ERROR_REPORTING_NORMAL)
+#else
+#define MICROPY_ERROR_REPORTING (MICROPY_ERROR_REPORTING_TERSE)
+#endif
 #endif
 
 // Whether issue warnings during compiling/execution
@@ -740,7 +775,7 @@ typedef double mp_float_t;
 // TODO: Originally intended as generic category to not
 // add bunch of once-off options. May need refactoring later
 #ifndef MICROPY_CPYTHON_COMPAT
-#define MICROPY_CPYTHON_COMPAT (1)
+#define MICROPY_CPYTHON_COMPAT (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_CORE_FEATURES)
 #endif
 
 // Perform full checks as done by CPython. Disabling this
@@ -749,7 +784,7 @@ typedef double mp_float_t;
 // grave issues (in other words, only user app should be,
 // affected, not system).
 #ifndef MICROPY_FULL_CHECKS
-#define MICROPY_FULL_CHECKS (1)
+#define MICROPY_FULL_CHECKS (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_CORE_FEATURES)
 #endif
 
 // Whether POSIX-semantics non-blocking streams are supported
@@ -770,7 +805,7 @@ typedef double mp_float_t;
 
 // Whether to support module-level __getattr__ (see PEP 562)
 #ifndef MICROPY_MODULE_GETATTR
-#define MICROPY_MODULE_GETATTR (1)
+#define MICROPY_MODULE_GETATTR (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_CORE_FEATURES)
 #endif
 
 // Whether module weak links are supported
@@ -804,7 +839,7 @@ typedef double mp_float_t;
 // list.append([], 1).  Without this check such calls will have undefined
 // behaviour (usually segfault) if the first argument is the wrong type.
 #ifndef MICROPY_BUILTIN_METHOD_CHECK_SELF_ARG
-#define MICROPY_BUILTIN_METHOD_CHECK_SELF_ARG (1)
+#define MICROPY_BUILTIN_METHOD_CHECK_SELF_ARG (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_CORE_FEATURES)
 #endif
 
 // Whether to use internally defined errno's (otherwise system provided ones)
@@ -849,7 +884,7 @@ typedef double mp_float_t;
 // inheritance makes some C functions inherently recursive, and adds a bit of
 // code overhead.
 #ifndef MICROPY_MULTIPLE_INHERITANCE
-#define MICROPY_MULTIPLE_INHERITANCE (1)
+#define MICROPY_MULTIPLE_INHERITANCE (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_CORE_FEATURES)
 #endif
 
 // Whether to implement attributes on functions
@@ -873,7 +908,7 @@ typedef double mp_float_t;
 
 // Support for async/await/async for/async with
 #ifndef MICROPY_PY_ASYNC_AWAIT
-#define MICROPY_PY_ASYNC_AWAIT (1)
+#define MICROPY_PY_ASYNC_AWAIT (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_CORE_FEATURES)
 #endif
 
 // Support for literal string interpolation, f-strings (see PEP 498, Python 3.6+)
@@ -883,7 +918,7 @@ typedef double mp_float_t;
 
 // Support for assignment expressions with := (see PEP 572, Python 3.8+)
 #ifndef MICROPY_PY_ASSIGN_EXPR
-#define MICROPY_PY_ASSIGN_EXPR (1)
+#define MICROPY_PY_ASSIGN_EXPR (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_CORE_FEATURES)
 #endif
 
 // Non-standard .pend_throw() method for generators, allowing for
@@ -892,7 +927,7 @@ typedef double mp_float_t;
 // to generator's .send() or .__next__(). (This is useful to implement
 // async schedulers.)
 #ifndef MICROPY_PY_GENERATOR_PEND_THROW
-#define MICROPY_PY_GENERATOR_PEND_THROW (1)
+#define MICROPY_PY_GENERATOR_PEND_THROW (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_CORE_FEATURES)
 #endif
 
 // Issue a warning when comparing str and bytes objects
@@ -917,12 +952,12 @@ typedef double mp_float_t;
 
 // Whether str.count() method provided
 #ifndef MICROPY_PY_BUILTINS_STR_COUNT
-#define MICROPY_PY_BUILTINS_STR_COUNT (1)
+#define MICROPY_PY_BUILTINS_STR_COUNT (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_CORE_FEATURES)
 #endif
 
 // Whether str % (...) formatting operator provided
 #ifndef MICROPY_PY_BUILTINS_STR_OP_MODULO
-#define MICROPY_PY_BUILTINS_STR_OP_MODULO (1)
+#define MICROPY_PY_BUILTINS_STR_OP_MODULO (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_CORE_FEATURES)
 #endif
 
 // Whether str.partition()/str.rpartition() method provided
@@ -937,12 +972,12 @@ typedef double mp_float_t;
 
 // Whether to support bytearray object
 #ifndef MICROPY_PY_BUILTINS_BYTEARRAY
-#define MICROPY_PY_BUILTINS_BYTEARRAY (1)
+#define MICROPY_PY_BUILTINS_BYTEARRAY (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_CORE_FEATURES)
 #endif
 
 // Whether to support dict.fromkeys() class method
 #ifndef MICROPY_PY_BUILTINS_DICT_FROMKEYS
-#define MICROPY_PY_BUILTINS_DICT_FROMKEYS (1)
+#define MICROPY_PY_BUILTINS_DICT_FROMKEYS (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_CORE_FEATURES)
 #endif
 
 // Whether to support memoryview object
@@ -957,12 +992,12 @@ typedef double mp_float_t;
 
 // Whether to support set object
 #ifndef MICROPY_PY_BUILTINS_SET
-#define MICROPY_PY_BUILTINS_SET (1)
+#define MICROPY_PY_BUILTINS_SET (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_CORE_FEATURES)
 #endif
 
 // Whether to support slice subscript operators and slice object
 #ifndef MICROPY_PY_BUILTINS_SLICE
-#define MICROPY_PY_BUILTINS_SLICE (1)
+#define MICROPY_PY_BUILTINS_SLICE (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_CORE_FEATURES)
 #endif
 
 // Whether to support slice attribute read access,
@@ -983,13 +1018,13 @@ typedef double mp_float_t;
 
 // Whether to support property object
 #ifndef MICROPY_PY_BUILTINS_PROPERTY
-#define MICROPY_PY_BUILTINS_PROPERTY (1)
+#define MICROPY_PY_BUILTINS_PROPERTY (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_CORE_FEATURES)
 #endif
 
 // Whether to implement the start/stop/step attributes (readback) on
 // the "range" builtin type. Rarely used, and costs ~60 bytes (x86).
 #ifndef MICROPY_PY_BUILTINS_RANGE_ATTRS
-#define MICROPY_PY_BUILTINS_RANGE_ATTRS (1)
+#define MICROPY_PY_BUILTINS_RANGE_ATTRS (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_CORE_FEATURES)
 #endif
 
 // Whether to support binary ops [only (in)equality is defined] between range
@@ -1039,7 +1074,7 @@ typedef double mp_float_t;
 
 // Whether to support enumerate function(type)
 #ifndef MICROPY_PY_BUILTINS_ENUMERATE
-#define MICROPY_PY_BUILTINS_ENUMERATE (1)
+#define MICROPY_PY_BUILTINS_ENUMERATE (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_CORE_FEATURES)
 #endif
 
 // Whether to support eval and exec functions
@@ -1055,12 +1090,12 @@ typedef double mp_float_t;
 
 // Whether to support filter function(type)
 #ifndef MICROPY_PY_BUILTINS_FILTER
-#define MICROPY_PY_BUILTINS_FILTER (1)
+#define MICROPY_PY_BUILTINS_FILTER (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_CORE_FEATURES)
 #endif
 
 // Whether to support reversed function(type)
 #ifndef MICROPY_PY_BUILTINS_REVERSED
-#define MICROPY_PY_BUILTINS_REVERSED (1)
+#define MICROPY_PY_BUILTINS_REVERSED (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_CORE_FEATURES)
 #endif
 
 // Whether to define "NotImplemented" special constant
@@ -1076,7 +1111,7 @@ typedef double mp_float_t;
 
 // Whether to support min/max functions
 #ifndef MICROPY_PY_BUILTINS_MIN_MAX
-#define MICROPY_PY_BUILTINS_MIN_MAX (1)
+#define MICROPY_PY_BUILTINS_MIN_MAX (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_CORE_FEATURES)
 #endif
 
 // Support for calls to pow() with 3 integer arguments
@@ -1102,7 +1137,7 @@ typedef double mp_float_t;
 
 // Whether to set __file__ for imported modules
 #ifndef MICROPY_PY___FILE__
-#define MICROPY_PY___FILE__ (1)
+#define MICROPY_PY___FILE__ (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_CORE_FEATURES)
 #endif
 
 // Whether to provide mem-info related functions in micropython module
@@ -1124,7 +1159,7 @@ typedef double mp_float_t;
 // underlying code is shared with "bytearray" builtin type, so to
 // get real savings, it should be disabled too.
 #ifndef MICROPY_PY_ARRAY
-#define MICROPY_PY_ARRAY (1)
+#define MICROPY_PY_ARRAY (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_CORE_FEATURES)
 #endif
 
 // Whether to support slice assignments for array (and bytearray).
@@ -1136,12 +1171,12 @@ typedef double mp_float_t;
 // Whether to support attrtuple type (MicroPython extension)
 // It provides space-efficient tuples with attribute access
 #ifndef MICROPY_PY_ATTRTUPLE
-#define MICROPY_PY_ATTRTUPLE (1)
+#define MICROPY_PY_ATTRTUPLE (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_CORE_FEATURES)
 #endif
 
 // Whether to provide "collections" module
 #ifndef MICROPY_PY_COLLECTIONS
-#define MICROPY_PY_COLLECTIONS (1)
+#define MICROPY_PY_COLLECTIONS (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_CORE_FEATURES)
 #endif
 
 // Whether to provide "ucollections.deque" type
@@ -1161,7 +1196,7 @@ typedef double mp_float_t;
 
 // Whether to provide "math" module
 #ifndef MICROPY_PY_MATH
-#define MICROPY_PY_MATH (1)
+#define MICROPY_PY_MATH (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_CORE_FEATURES)
 #endif
 
 // Whether to provide special math functions: math.{erf,erfc,gamma,lgamma}
@@ -1206,7 +1241,7 @@ typedef double mp_float_t;
 
 // Whether to provide "gc" module
 #ifndef MICROPY_PY_GC
-#define MICROPY_PY_GC (1)
+#define MICROPY_PY_GC (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_CORE_FEATURES)
 #endif
 
 // Whether to return number of collected objects from gc.collect()
@@ -1216,7 +1251,7 @@ typedef double mp_float_t;
 
 // Whether to provide "io" module
 #ifndef MICROPY_PY_IO
-#define MICROPY_PY_IO (1)
+#define MICROPY_PY_IO (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_CORE_FEATURES)
 #endif
 
 // Whether to provide "io.IOBase" class to support user streams
@@ -1252,12 +1287,12 @@ typedef double mp_float_t;
 
 // Whether to provide "struct" module
 #ifndef MICROPY_PY_STRUCT
-#define MICROPY_PY_STRUCT (1)
+#define MICROPY_PY_STRUCT (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_CORE_FEATURES)
 #endif
 
 // Whether to provide "sys" module
 #ifndef MICROPY_PY_SYS
-#define MICROPY_PY_SYS (1)
+#define MICROPY_PY_SYS (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_CORE_FEATURES)
 #endif
 
 // Whether to provide "sys.maxsize" constant

From 910e060f93c02c51a498f57ef77ccbe02566855b Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Wed, 15 Sep 2021 12:24:32 +1000
Subject: [PATCH 1288/3533] minimal/mpconfigport.h: Use
 MICROPY_CONFIG_ROM_LEVEL_MINIMUM.

Update minimal port to use the new "minimal" rom level config (this is a
no-op change, the binary is the same size and contains the exact same
symbols).

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/minimal/mpconfigport.h | 54 +++++++++++++-----------------------
 1 file changed, 19 insertions(+), 35 deletions(-)

diff --git a/ports/minimal/mpconfigport.h b/ports/minimal/mpconfigport.h
index b34217f68019a..b83e0c2704273 100644
--- a/ports/minimal/mpconfigport.h
+++ b/ports/minimal/mpconfigport.h
@@ -2,46 +2,30 @@
 
 // options to control how MicroPython is built
 
+// Use the minimal starting configuration (disables all optional features).
+#define MICROPY_CONFIG_ROM_LEVEL (MICROPY_CONFIG_ROM_LEVEL_MINIMUM)
+
 // You can disable the built-in MicroPython compiler by setting the following
 // config option to 0.  If you do this then you won't get a REPL prompt, but you
 // will still be able to execute pre-compiled scripts, compiled with mpy-cross.
 #define MICROPY_ENABLE_COMPILER     (1)
 
-#define MICROPY_QSTR_BYTES_IN_HASH  (1)
-#define MICROPY_QSTR_EXTRA_POOL     mp_qstr_frozen_const_pool
-#define MICROPY_ALLOC_PATH_MAX      (256)
-#define MICROPY_ALLOC_PARSE_CHUNK_INIT (16)
-#define MICROPY_COMP_CONST          (0)
-#define MICROPY_COMP_DOUBLE_TUPLE_ASSIGN (0)
-#define MICROPY_ENABLE_GC           (1)
-#define MICROPY_GC_ALLOC_THRESHOLD  (0)
-#define MICROPY_HELPER_REPL         (1)
-#define MICROPY_ERROR_REPORTING     (MICROPY_ERROR_REPORTING_TERSE)
-#define MICROPY_BUILTIN_METHOD_CHECK_SELF_ARG (0)
-#define MICROPY_PY_ASYNC_AWAIT      (0)
-#define MICROPY_PY_ASSIGN_EXPR      (0)
-#define MICROPY_PY_BUILTINS_BYTEARRAY (0)
-#define MICROPY_PY_BUILTINS_DICT_FROMKEYS (0)
-#define MICROPY_PY_BUILTINS_ENUMERATE (0)
-#define MICROPY_PY_BUILTINS_FILTER  (0)
-#define MICROPY_PY_BUILTINS_REVERSED (0)
-#define MICROPY_PY_BUILTINS_SET     (0)
-#define MICROPY_PY_BUILTINS_SLICE   (0)
-#define MICROPY_PY_BUILTINS_PROPERTY (0)
-#define MICROPY_PY_BUILTINS_MIN_MAX (0)
-#define MICROPY_PY_BUILTINS_STR_COUNT (0)
-#define MICROPY_PY_BUILTINS_STR_OP_MODULO (0)
-#define MICROPY_PY___FILE__         (0)
-#define MICROPY_PY_GC               (0)
-#define MICROPY_PY_ARRAY            (0)
-#define MICROPY_PY_ATTRTUPLE        (0)
-#define MICROPY_PY_COLLECTIONS      (0)
-#define MICROPY_PY_IO               (0)
-#define MICROPY_PY_STRUCT           (0)
-#define MICROPY_PY_SYS              (0)
-#define MICROPY_MODULE_FROZEN_MPY   (1)
-#define MICROPY_CPYTHON_COMPAT      (0)
-#define MICROPY_MODULE_GETATTR      (0)
+#define MICROPY_QSTR_EXTRA_POOL           mp_qstr_frozen_const_pool
+#define MICROPY_ENABLE_GC                 (1)
+#define MICROPY_HELPER_REPL               (1)
+#define MICROPY_MODULE_FROZEN_MPY         (1)
+#define MICROPY_ENABLE_EXTERNAL_IMPORT    (1)
+#define MICROPY_PY_MATH                   (1)
+
+#define MICROPY_ALLOC_PATH_MAX            (256)
+#define MICROPY_ALLOC_PARSE_CHUNK_INIT    (16)
+
+#define MICROPY_COMP_CONST_FOLDING        (1)
+#define MICROPY_COMP_CONST_LITERAL        (1)
+#define MICROPY_FULL_CHECKS               (1)
+#define MICROPY_MULTIPLE_INHERITANCE      (1)
+#define MICROPY_PY_GENERATOR_PEND_THROW   (1)
+#define MICROPY_PY_BUILTINS_RANGE_ATTRS   (1)
 
 // type definitions for the specific machine
 

From 7b89ad8dbf432ab51eea6d138e179bf51394c786 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Thu, 19 Aug 2021 22:46:40 +1000
Subject: [PATCH 1289/3533] py/vm: Add a fast path for LOAD_ATTR on instance
 types.

When the LOAD_ATTR opcode is executed there are quite a few different cases
that have to be handled, but the common case is accessing a member on an
instance type.  Typically, built-in types provide methods which is why this
is common.

Fortunately, for this specific case, if the member is found in the member
map then there's no further processing.

This optimisation does a relatively cheap check (type is instance) and then
forwards directly to the member map lookup, falling back to the regular
path if necessary.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 py/mpconfig.h |  6 ++++++
 py/objtype.c  |  1 +
 py/runtime.c  |  4 ++++
 py/vm.c       | 21 ++++++++++++++++++++-
 4 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/py/mpconfig.h b/py/mpconfig.h
index 7b98112e17930..2fbf1490d8ff4 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -527,6 +527,12 @@
 #define MICROPY_OPT_CACHE_MAP_LOOKUP_IN_BYTECODE (0)
 #endif
 
+// Optimise the fast path for loading attributes from instance types. Increases
+// Thumb2 code size by about 48 bytes.
+#ifndef MICROPY_OPT_LOAD_ATTR_FAST_PATH
+#define MICROPY_OPT_LOAD_ATTR_FAST_PATH (0)
+#endif
+
 // Whether to use fast versions of bitwise operations (and, or, xor) when the
 // arguments are both positive.  Increases Thumb2 code size by about 250 bytes.
 #ifndef MICROPY_OPT_MPZ_BITWISE
diff --git a/py/objtype.c b/py/objtype.c
index 508bab99d394a..0977a67cedc58 100644
--- a/py/objtype.c
+++ b/py/objtype.c
@@ -579,6 +579,7 @@ STATIC void mp_obj_instance_load_attr(mp_obj_t self_in, qstr attr, mp_obj_t *des
     assert(mp_obj_is_instance_type(mp_obj_get_type(self_in)));
     mp_obj_instance_t *self = MP_OBJ_TO_PTR(self_in);
 
+    // Note: This is fast-path'ed in the VM for the MP_BC_LOAD_ATTR operation.
     mp_map_elem_t *elem = mp_map_lookup(&self->members, MP_OBJ_NEW_QSTR(attr), MP_MAP_LOOKUP);
     if (elem != NULL) {
         // object member, always treated as a value
diff --git a/py/runtime.c b/py/runtime.c
index 27e5bc13eb1a8..2f7cf1fa600e4 100644
--- a/py/runtime.c
+++ b/py/runtime.c
@@ -1081,6 +1081,10 @@ void mp_load_method_maybe(mp_obj_t obj, qstr attr, mp_obj_t *dest) {
     dest[0] = MP_OBJ_NULL;
     dest[1] = MP_OBJ_NULL;
 
+    // Note: the specific case of obj being an instance type is fast-path'ed in the VM
+    // for the MP_BC_LOAD_ATTR opcode. Instance types handle type->attr and look up directly
+    // in their member's map.
+
     // get the type
     const mp_obj_type_t *type = mp_obj_get_type(obj);
 
diff --git a/py/vm.c b/py/vm.c
index bbfc9914ebe11..e5a62e4415deb 100644
--- a/py/vm.c
+++ b/py/vm.c
@@ -414,7 +414,26 @@ FRAME_SETUP();
                     FRAME_UPDATE();
                     MARK_EXC_IP_SELECTIVE();
                     DECODE_QSTR;
-                    SET_TOP(mp_load_attr(TOP(), qst));
+                    mp_obj_t top = TOP();
+                    mp_obj_t obj;
+                    #if MICROPY_OPT_LOAD_ATTR_FAST_PATH
+                    // For the specific case of an instance type, it implements .attr
+                    // and forwards to its members map. Attribute lookups on instance
+                    // types are extremely common, so avoid all the other checks and
+                    // calls that normally happen first.
+                    mp_map_elem_t *elem = NULL;
+                    if (mp_obj_is_instance_type(mp_obj_get_type(top))) {
+                        mp_obj_instance_t *self = MP_OBJ_TO_PTR(top);
+                        elem = mp_map_lookup(&self->members, MP_OBJ_NEW_QSTR(qst), MP_MAP_LOOKUP);
+                    }
+                    if (elem) {
+                        obj = elem->value;
+                    } else
+                    #endif
+                    {
+                        obj = mp_load_attr(top, qst);
+                    }
+                    SET_TOP(obj);
                     DISPATCH();
                 }
                 #else

From 11ef8f22fe7701cc75b6aaf2386670891eaacf92 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Wed, 18 Aug 2021 14:52:48 +1000
Subject: [PATCH 1290/3533] py/map: Add an optional cache of (map+index) to
 speed up map lookups.

The existing inline bytecode caching optimisation, selected by
MICROPY_OPT_CACHE_MAP_LOOKUP_IN_BYTECODE, reserves an extra byte in the
bytecode after certain opcodes, which at runtime stores a map index of the
likely location of this field when looking up the qstr.  This scheme is
incompatible with bytecode-in-ROM, and doesn't work with native generated
code.  It also stores bytecode in .mpy files which is of a different format
to when the feature is disabled, making generation of .mpy files more
complex.

This commit provides an alternative optimisation via an approach that adds
a global cache for map offsets, then all mp_map_lookup operations use it.
It's less precise than bytecode caching, but allows the cache to be
independent and external to the bytecode that is executing.  It also works
for the native emitter and adds a similar performance boost on top of the
gain already provided by the native emitter.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 py/map.c      | 35 +++++++++++++++++++++++++++++++++++
 py/mpconfig.h | 14 ++++++++++++++
 py/mpstate.h  |  5 +++++
 3 files changed, 54 insertions(+)

diff --git a/py/map.c b/py/map.c
index 54f4b0204b87f..1c436163640a0 100644
--- a/py/map.c
+++ b/py/map.c
@@ -40,6 +40,27 @@
 #define DEBUG_printf(...) (void)0
 #endif
 
+#if MICROPY_OPT_MAP_LOOKUP_CACHE
+// MP_STATE_VM(map_lookup_cache) provides a cache of index to the last known
+// position of that index in any map. On a cache hit, this allows
+// short-circuiting the full linear search in the case of an ordered map
+// (i.e. all builtin modules and objects' locals dicts), and computation of
+// the hash (and potentially some linear probing) in the case of a regular
+// map. Note the same cache is shared across all maps.
+
+// Gets the index into the cache for this index. Shift down by two to remove
+// mp_obj_t tag bits.
+#define MAP_CACHE_OFFSET(index) ((((uintptr_t)(index)) >> 2) % MICROPY_OPT_MAP_LOOKUP_CACHE_SIZE)
+// Gets the map cache entry for the corresponding index.
+#define MAP_CACHE_ENTRY(index) (MP_STATE_VM(map_lookup_cache)[MAP_CACHE_OFFSET(index)])
+// Retrieve the mp_obj_t at the location suggested by the cache.
+#define MAP_CACHE_GET(map, index) (&(map)->table[MAP_CACHE_ENTRY(index) % (map)->alloc])
+// Update the cache for this index.
+#define MAP_CACHE_SET(index, pos) MAP_CACHE_ENTRY(index) = (pos) & 0xff;
+#else
+#define MAP_CACHE_SET(index, pos)
+#endif
+
 // This table of sizes is used to control the growth of hash tables.
 // The first set of sizes are chosen so the allocation fits exactly in a
 // 4-word GC block, and it's not so important for these small values to be
@@ -136,6 +157,18 @@ mp_map_elem_t *mp_map_lookup(mp_map_t *map, mp_obj_t index, mp_map_lookup_kind_t
     // If the map is a fixed array then we must only be called for a lookup
     assert(!map->is_fixed || lookup_kind == MP_MAP_LOOKUP);
 
+    #if MICROPY_OPT_MAP_LOOKUP_CACHE
+    // Try the cache for lookup or add-if-not-found.
+    if (lookup_kind != MP_MAP_LOOKUP_REMOVE_IF_FOUND && map->alloc) {
+        mp_map_elem_t *slot = MAP_CACHE_GET(map, index);
+        // Note: Just comparing key for value equality will have false negatives, but
+        // these will be handled by the regular path below.
+        if (slot->key == index) {
+            return slot;
+        }
+    }
+    #endif
+
     // Work out if we can compare just pointers
     bool compare_only_ptrs = map->all_keys_are_qstrs;
     if (compare_only_ptrs) {
@@ -172,6 +205,7 @@ mp_map_elem_t *mp_map_lookup(mp_map_t *map, mp_obj_t index, mp_map_lookup_kind_t
                     elem->value = value;
                 }
                 #endif
+                MAP_CACHE_SET(index, elem - map->table);
                 return elem;
             }
         }
@@ -254,6 +288,7 @@ mp_map_elem_t *mp_map_lookup(mp_map_t *map, mp_obj_t index, mp_map_lookup_kind_t
                 }
                 // keep slot->value so that caller can access it if needed
             }
+            MAP_CACHE_SET(index, pos);
             return slot;
         }
 
diff --git a/py/mpconfig.h b/py/mpconfig.h
index 2fbf1490d8ff4..97fc9bb5806ee 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -533,6 +533,20 @@
 #define MICROPY_OPT_LOAD_ATTR_FAST_PATH (0)
 #endif
 
+// Use extra RAM to cache map lookups by remembering the likely location of
+// the index. Avoids the hash computation on unordered maps, and avoids the
+// linear search on ordered (especially in-ROM) maps. Can provide a +10-15%
+// performance improvement on benchmarks involving lots of attribute access
+// or dictionary lookup.
+#ifndef MICROPY_OPT_MAP_LOOKUP_CACHE
+#define MICROPY_OPT_MAP_LOOKUP_CACHE (0)
+#endif
+
+// How much RAM (in bytes) to use for the map lookup cache.
+#ifndef MICROPY_OPT_MAP_LOOKUP_CACHE_SIZE
+#define MICROPY_OPT_MAP_LOOKUP_CACHE_SIZE (128)
+#endif
+
 // Whether to use fast versions of bitwise operations (and, or, xor) when the
 // arguments are both positive.  Increases Thumb2 code size by about 250 bytes.
 #ifndef MICROPY_OPT_MPZ_BITWISE
diff --git a/py/mpstate.h b/py/mpstate.h
index 07335bae4c500..53b2906872da9 100644
--- a/py/mpstate.h
+++ b/py/mpstate.h
@@ -231,6 +231,11 @@ typedef struct _mp_state_vm_t {
     // This is a global mutex used to make the VM/runtime thread-safe.
     mp_thread_mutex_t gil_mutex;
     #endif
+
+    #if MICROPY_OPT_MAP_LOOKUP_CACHE
+    // See mp_map_lookup.
+    uint8_t map_lookup_cache[MICROPY_OPT_MAP_LOOKUP_CACHE_SIZE];
+    #endif
 } mp_state_vm_t;
 
 // This structure holds state that is specific to a given thread.

From 68219a295c75457c096ac42dbe8411b84e1e1a51 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Mon, 13 Sep 2021 10:55:23 +1000
Subject: [PATCH 1291/3533] stm32: Enable LOAD_ATTR fast path, and map lookup
 caching on >M0.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/stm32/mpconfigport.h | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/ports/stm32/mpconfigport.h b/ports/stm32/mpconfigport.h
index 3147e286810cd..47795c4e7135f 100644
--- a/ports/stm32/mpconfigport.h
+++ b/ports/stm32/mpconfigport.h
@@ -60,6 +60,12 @@
 #define MICROPY_OPT_COMPUTED_GOTO   (1)
 #endif
 #define MICROPY_OPT_CACHE_MAP_LOOKUP_IN_BYTECODE (0)
+#ifndef MICROPY_OPT_LOAD_ATTR_FAST_PATH
+#define MICROPY_OPT_LOAD_ATTR_FAST_PATH (1)
+#endif
+#ifndef MICROPY_OPT_MAP_LOOKUP_CACHE
+#define MICROPY_OPT_MAP_LOOKUP_CACHE (__CORTEX_M > 0)
+#endif
 #define MICROPY_OPT_MPZ_BITWISE     (1)
 #define MICROPY_OPT_MATH_FACTORIAL  (1)
 

From 60c6d5594f165cf3af6e66076f8dceb24e0d859f Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Mon, 13 Sep 2021 10:56:45 +1000
Subject: [PATCH 1292/3533] unix: Enable LOAD_ATTR fast path, and map lookup
 caching.

Enabled for all variants except minimal.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/unix/mpconfigport.h                     | 6 ++++++
 ports/unix/variants/minimal/mpconfigvariant.h | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/ports/unix/mpconfigport.h b/ports/unix/mpconfigport.h
index de5a65ab73f2b..de45a800d3688 100644
--- a/ports/unix/mpconfigport.h
+++ b/ports/unix/mpconfigport.h
@@ -82,6 +82,12 @@
 #ifndef MICROPY_OPT_CACHE_MAP_LOOKUP_IN_BYTECODE
 #define MICROPY_OPT_CACHE_MAP_LOOKUP_IN_BYTECODE (1)
 #endif
+#ifndef MICROPY_OPT_LOAD_ATTR_FAST_PATH
+#define MICROPY_OPT_LOAD_ATTR_FAST_PATH (1)
+#endif
+#ifndef MICROPY_OPT_MAP_LOOKUP_CACHE
+#define MICROPY_OPT_MAP_LOOKUP_CACHE (1)
+#endif
 #define MICROPY_MODULE_WEAK_LINKS   (1)
 #define MICROPY_CAN_OVERRIDE_BUILTINS (1)
 #define MICROPY_VFS_POSIX_FILE      (1)
diff --git a/ports/unix/variants/minimal/mpconfigvariant.h b/ports/unix/variants/minimal/mpconfigvariant.h
index e87b5d8ec0ff3..d5eab0954698d 100644
--- a/ports/unix/variants/minimal/mpconfigvariant.h
+++ b/ports/unix/variants/minimal/mpconfigvariant.h
@@ -56,6 +56,8 @@
 #define MICROPY_STREAMS_NON_BLOCK   (0)
 #define MICROPY_OPT_COMPUTED_GOTO   (0)
 #define MICROPY_OPT_CACHE_MAP_LOOKUP_IN_BYTECODE (0)
+#define MICROPY_OPT_LOAD_ATTR_FAST_PATH (0)
+#define MICROPY_OPT_MAP_LOOKUP_CACHE (0)
 #define MICROPY_CAN_OVERRIDE_BUILTINS (0)
 #define MICROPY_BUILTIN_METHOD_CHECK_SELF_ARG (0)
 #define MICROPY_CPYTHON_COMPAT      (0)

From b326edf68c5edb648fac4dc2a3403ee33510e179 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Mon, 6 Sep 2021 12:28:06 +1000
Subject: [PATCH 1293/3533] all: Remove
 MICROPY_OPT_CACHE_MAP_LOOKUP_IN_BYTECODE.

This commit removes all parts of code associated with the existing
MICROPY_OPT_CACHE_MAP_LOOKUP_IN_BYTECODE optimisation option, including the
-mcache-lookup-bc option to mpy-cross.

This feature originally provided a significant performance boost for Unix,
but wasn't able to be enabled for MCU targets (due to frozen bytecode), and
added significant extra complexity to generating and distributing .mpy
files.

The equivalent performance gain is now provided by the combination of
MICROPY_OPT_LOAD_ATTR_FAST_PATH and MICROPY_OPT_MAP_LOOKUP_CACHE (which has
been enabled on the unix port in the previous commit).

It's hard to provide precise performance numbers, but tests have been run
on a wide variety of architectures (x86-64, ARM Cortex, Aarch64, RISC-V,
xtensa) and they all generally agree on the qualitative improvements seen
by the combination of MICROPY_OPT_LOAD_ATTR_FAST_PATH and
MICROPY_OPT_MAP_LOOKUP_CACHE.

For example, on a "quiet" Linux x64 environment (i3-5010U @ 2.10GHz) the
change from CACHE_MAP_LOOKUP_IN_BYTECODE, to LOAD_ATTR_FAST_PATH combined
with MAP_LOOKUP_CACHE is:

diff of scores (higher is better)
N=2000 M=2000       bccache -> attrmapcache      diff      diff% (error%)
bm_chaos.py        13742.56 ->   13905.67 :   +163.11 =  +1.187% (+/-3.75%)
bm_fannkuch.py        60.13 ->      61.34 :     +1.21 =  +2.012% (+/-2.11%)
bm_fft.py         113083.20 ->  114793.68 :  +1710.48 =  +1.513% (+/-1.57%)
bm_float.py       256552.80 ->  243908.29 : -12644.51 =  -4.929% (+/-1.90%)
bm_hexiom.py         521.93 ->     625.41 :   +103.48 = +19.826% (+/-0.40%)
bm_nqueens.py     197544.25 ->  217713.12 : +20168.87 = +10.210% (+/-3.01%)
bm_pidigits.py      8072.98 ->    8198.75 :   +125.77 =  +1.558% (+/-3.22%)
misc_aes.py        17283.45 ->   16480.52 :   -802.93 =  -4.646% (+/-0.82%)
misc_mandel.py     99083.99 ->  128939.84 : +29855.85 = +30.132% (+/-5.88%)
misc_pystone.py    83860.10 ->   82592.56 :  -1267.54 =  -1.511% (+/-2.27%)
misc_raytrace.py   21490.40 ->   22227.23 :   +736.83 =  +3.429% (+/-1.88%)

This shows that the new optimisations are at least as good as the existing
inline-bytecode-caching, and are sometimes much better (because the new
ones apply caching to a wider variety of map lookups).

The new optimisations can also benefit code generated by the native
emitter, because they apply to the runtime rather than the generated code.
The improvement for the native emitter when LOAD_ATTR_FAST_PATH and
MAP_LOOKUP_CACHE are enabled is (same Linux environment as above):

diff of scores (higher is better)
N=2000 M=2000        native -> nat-attrmapcache  diff      diff% (error%)
bm_chaos.py        14130.62 ->   15464.68 :  +1334.06 =  +9.441% (+/-7.11%)
bm_fannkuch.py        74.96 ->      76.16 :     +1.20 =  +1.601% (+/-1.80%)
bm_fft.py         166682.99 ->  168221.86 :  +1538.87 =  +0.923% (+/-4.20%)
bm_float.py       233415.23 ->  265524.90 : +32109.67 = +13.756% (+/-2.57%)
bm_hexiom.py         628.59 ->     734.17 :   +105.58 = +16.796% (+/-1.39%)
bm_nqueens.py     225418.44 ->  232926.45 :  +7508.01 =  +3.331% (+/-3.10%)
bm_pidigits.py      6322.00 ->    6379.52 :    +57.52 =  +0.910% (+/-5.62%)
misc_aes.py        20670.10 ->   27223.18 :  +6553.08 = +31.703% (+/-1.56%)
misc_mandel.py    138221.11 ->  152014.01 : +13792.90 =  +9.979% (+/-2.46%)
misc_pystone.py    85032.14 ->  105681.44 : +20649.30 = +24.284% (+/-2.25%)
misc_raytrace.py   19800.01 ->   23350.73 :  +3550.72 = +17.933% (+/-2.79%)

In summary, compared to MICROPY_OPT_CACHE_MAP_LOOKUP_IN_BYTECODE, the new
MICROPY_OPT_LOAD_ATTR_FAST_PATH and MICROPY_OPT_MAP_LOOKUP_CACHE options:
- are simpler;
- take less code size;
- are faster (generally);
- work with code generated by the native emitter;
- can be used on embedded targets with a small and constant RAM overhead;
- allow the same .mpy bytecode to run on all targets.

See #7680 for further discussion.  And see also #7653 for a discussion
about simplifying mpy-cross options.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 docs/reference/mpyfiles.rst                   |   2 -
 examples/embedding/mpconfigport_minimal.h     |   1 -
 mpy-cross/README.md                           |   5 +-
 mpy-cross/main.c                              |   6 --
 mpy-cross/mpconfigport.h                      |   2 -
 ports/cc3200/mpconfigport.h                   |   1 -
 ports/nrf/mpconfigport.h                      |   1 -
 ports/stm32/mpconfigport.h                    |   1 -
 ports/unix/Makefile                           |   5 +-
 ports/unix/mpconfigport.h                     |   3 -
 ports/unix/variants/minimal/mpconfigvariant.h |   1 -
 ports/windows/Makefile                        |   1 -
 ports/windows/mpconfigport.h                  |   1 -
 ports/windows/msvc/genhdr.targets             |   2 +-
 py/bc.c                                       |  14 ---
 py/dynruntime.mk                              |   2 -
 py/emitbc.c                                   |   6 --
 py/mpconfig.h                                 |   9 --
 py/mpstate.h                                  |   1 -
 py/persistentcode.h                           |  11 +-
 py/profile.c                                  |  12 ---
 py/showbc.c                                   |  12 ---
 py/vm.c                                       | 101 ------------------
 tests/cmdline/cmd_parsetree.py.exp            |  10 +-
 tests/cmdline/cmd_showbc.py.exp               |  24 ++---
 tests/cmdline/cmd_verbose.py.exp              |  12 +--
 tests/micropython/import_mpy_native_gc.py     |   4 +-
 tests/micropython/import_mpy_native_x64.py    |   6 +-
 tests/run-tests.py                            |   4 +-
 tools/mpy-tool.py                             |  28 +----
 tools/mpy_cross_all.py                        |   5 +-
 tools/mpy_ld.py                               |   9 +-
 32 files changed, 42 insertions(+), 260 deletions(-)

diff --git a/docs/reference/mpyfiles.rst b/docs/reference/mpyfiles.rst
index 4791784ac3a2e..6ba7389cf0654 100644
--- a/docs/reference/mpyfiles.rst
+++ b/docs/reference/mpyfiles.rst
@@ -66,8 +66,6 @@ If importing an .mpy file fails then try the following:
     print('mpy flags:', end='')
     if arch:
         print(' -march=' + arch, end='')
-    if sys_mpy & 0x100:
-        print(' -mcache-lookup-bc', end='')
     if not sys_mpy & 0x200:
         print(' -mno-unicode', end='')
     print()
diff --git a/examples/embedding/mpconfigport_minimal.h b/examples/embedding/mpconfigport_minimal.h
index b5ffd376aeb22..07180a3225c18 100644
--- a/examples/embedding/mpconfigport_minimal.h
+++ b/examples/embedding/mpconfigport_minimal.h
@@ -45,7 +45,6 @@
 #define MICROPY_LONGINT_IMPL        (MICROPY_LONGINT_IMPL_NONE)
 #define MICROPY_STREAMS_NON_BLOCK   (0)
 #define MICROPY_OPT_COMPUTED_GOTO   (0)
-#define MICROPY_OPT_CACHE_MAP_LOOKUP_IN_BYTECODE (0)
 #define MICROPY_CAN_OVERRIDE_BUILTINS (0)
 #define MICROPY_BUILTIN_METHOD_CHECK_SELF_ARG (0)
 #define MICROPY_CPYTHON_COMPAT      (0)
diff --git a/mpy-cross/README.md b/mpy-cross/README.md
index bf743a903163d..83f6d6fd8d927 100644
--- a/mpy-cross/README.md
+++ b/mpy-cross/README.md
@@ -17,10 +17,7 @@ by the target MicroPython runtime (eg onto a pyboard's filesystem), and then
 imported like any other Python module using `import foo`.
 
 Different target runtimes may require a different format of the compiled
-bytecode, and such options can be passed to the cross compiler.  For example,
-the unix port of MicroPython requires the following:
-
-    $ ./mpy-cross -mcache-lookup-bc foo.py
+bytecode, and such options can be passed to the cross compiler.
 
 If the Python code contains `@native` or `@viper` annotations, then you must
 specify `-march` to match the target architecture.
diff --git a/mpy-cross/main.c b/mpy-cross/main.c
index 635e53a719cc9..c677929c3317a 100644
--- a/mpy-cross/main.c
+++ b/mpy-cross/main.c
@@ -108,7 +108,6 @@ STATIC int usage(char **argv) {
         "Target specific options:\n"
         "-msmall-int-bits=number : set the maximum bits used to encode a small-int\n"
         "-mno-unicode : don't support unicode in compiled strings\n"
-        "-mcache-lookup-bc : cache map lookups in the bytecode\n"
         "-march=<arch> : set architecture for native emitter; x86, x64, armv6, armv7m, armv7em, armv7emsp, armv7emdp, xtensa, xtensawin\n"
         "\n"
         "Implementation specific options:\n", argv[0]
@@ -205,7 +204,6 @@ MP_NOINLINE int main_(int argc, char **argv) {
 
     // set default compiler configuration
     mp_dynamic_compiler.small_int_bits = 31;
-    mp_dynamic_compiler.opt_cache_map_lookup_in_bytecode = 0;
     mp_dynamic_compiler.py_builtins_str_unicode = 1;
     #if defined(__i386__)
     mp_dynamic_compiler.native_arch = MP_NATIVE_ARCH_X86;
@@ -264,10 +262,6 @@ MP_NOINLINE int main_(int argc, char **argv) {
                     return usage(argv);
                 }
                 // TODO check that small_int_bits is within range of host's capabilities
-            } else if (strcmp(argv[a], "-mno-cache-lookup-bc") == 0) {
-                mp_dynamic_compiler.opt_cache_map_lookup_in_bytecode = 0;
-            } else if (strcmp(argv[a], "-mcache-lookup-bc") == 0) {
-                mp_dynamic_compiler.opt_cache_map_lookup_in_bytecode = 1;
             } else if (strcmp(argv[a], "-mno-unicode") == 0) {
                 mp_dynamic_compiler.py_builtins_str_unicode = 0;
             } else if (strcmp(argv[a], "-municode") == 0) {
diff --git a/mpy-cross/mpconfigport.h b/mpy-cross/mpconfigport.h
index e7c8edf13559c..8c716e958d69b 100644
--- a/mpy-cross/mpconfigport.h
+++ b/mpy-cross/mpconfigport.h
@@ -57,8 +57,6 @@
 #define MICROPY_COMP_TRIPLE_TUPLE_ASSIGN (1)
 #define MICROPY_COMP_RETURN_IF_EXPR (1)
 
-#define MICROPY_OPT_CACHE_MAP_LOOKUP_IN_BYTECODE (0)
-
 #define MICROPY_READER_POSIX        (1)
 #define MICROPY_ENABLE_RUNTIME      (0)
 #define MICROPY_ENABLE_GC           (1)
diff --git a/ports/cc3200/mpconfigport.h b/ports/cc3200/mpconfigport.h
index 87689c505efc5..345b64fe40796 100644
--- a/ports/cc3200/mpconfigport.h
+++ b/ports/cc3200/mpconfigport.h
@@ -53,7 +53,6 @@
 #define MICROPY_LONGINT_IMPL                        (MICROPY_LONGINT_IMPL_MPZ)
 #define MICROPY_FLOAT_IMPL                          (MICROPY_FLOAT_IMPL_NONE)
 #define MICROPY_OPT_COMPUTED_GOTO                   (0)
-#define MICROPY_OPT_CACHE_MAP_LOOKUP_IN_BYTECODE    (0)
 #define MICROPY_READER_VFS                          (1)
 #ifndef DEBUG // we need ram on the launchxl while debugging
 #define MICROPY_CPYTHON_COMPAT                      (1)
diff --git a/ports/nrf/mpconfigport.h b/ports/nrf/mpconfigport.h
index 6290f85e87c55..3ffb092c61b3b 100644
--- a/ports/nrf/mpconfigport.h
+++ b/ports/nrf/mpconfigport.h
@@ -66,7 +66,6 @@
 #endif
 
 #define MICROPY_OPT_COMPUTED_GOTO   (0)
-#define MICROPY_OPT_CACHE_MAP_LOOKUP_IN_BYTECODE (0)
 #define MICROPY_OPT_MPZ_BITWISE     (0)
 
 // fatfs configuration used in ffconf.h
diff --git a/ports/stm32/mpconfigport.h b/ports/stm32/mpconfigport.h
index 47795c4e7135f..92f1338d6c5c2 100644
--- a/ports/stm32/mpconfigport.h
+++ b/ports/stm32/mpconfigport.h
@@ -59,7 +59,6 @@
 #ifndef MICROPY_OPT_COMPUTED_GOTO
 #define MICROPY_OPT_COMPUTED_GOTO   (1)
 #endif
-#define MICROPY_OPT_CACHE_MAP_LOOKUP_IN_BYTECODE (0)
 #ifndef MICROPY_OPT_LOAD_ATTR_FAST_PATH
 #define MICROPY_OPT_LOAD_ATTR_FAST_PATH (1)
 #endif
diff --git a/ports/unix/Makefile b/ports/unix/Makefile
index bf9d290abfa9a..60e37ade0a737 100644
--- a/ports/unix/Makefile
+++ b/ports/unix/Makefile
@@ -269,7 +269,6 @@ ifneq ($(FROZEN_MANIFEST)$(FROZEN_MPY_DIR),)
 CFLAGS += -DMICROPY_QSTR_EXTRA_POOL=mp_qstr_frozen_const_pool
 CFLAGS += -DMICROPY_MODULE_FROZEN_MPY
 CFLAGS += -DMPZ_DIG_SIZE=16 # force 16 bits to work on both 32 and 64 bit archs
-MPY_CROSS_FLAGS += -mcache-lookup-bc
 endif
 
 ifneq ($(FROZEN_MANIFEST)$(FROZEN_DIR),)
@@ -285,9 +284,7 @@ endif
 CXXFLAGS += $(filter-out -Wmissing-prototypes -Wold-style-definition -std=gnu99,$(CFLAGS) $(CXXFLAGS_MOD))
 
 ifeq ($(MICROPY_FORCE_32BIT),1)
-RUN_TESTS_MPY_CROSS_FLAGS = --mpy-cross-flags='-mcache-lookup-bc -march=x86'
-else
-RUN_TESTS_MPY_CROSS_FLAGS = --mpy-cross-flags='-mcache-lookup-bc'
+RUN_TESTS_MPY_CROSS_FLAGS = --mpy-cross-flags='-march=x86'
 endif
 
 ifeq ($(CROSS_COMPILE),arm-linux-gnueabi-)
diff --git a/ports/unix/mpconfigport.h b/ports/unix/mpconfigport.h
index de45a800d3688..d6ab4e5ca9658 100644
--- a/ports/unix/mpconfigport.h
+++ b/ports/unix/mpconfigport.h
@@ -79,9 +79,6 @@
 #endif
 #define MICROPY_STREAMS_POSIX_API   (1)
 #define MICROPY_OPT_COMPUTED_GOTO   (1)
-#ifndef MICROPY_OPT_CACHE_MAP_LOOKUP_IN_BYTECODE
-#define MICROPY_OPT_CACHE_MAP_LOOKUP_IN_BYTECODE (1)
-#endif
 #ifndef MICROPY_OPT_LOAD_ATTR_FAST_PATH
 #define MICROPY_OPT_LOAD_ATTR_FAST_PATH (1)
 #endif
diff --git a/ports/unix/variants/minimal/mpconfigvariant.h b/ports/unix/variants/minimal/mpconfigvariant.h
index d5eab0954698d..973febd572637 100644
--- a/ports/unix/variants/minimal/mpconfigvariant.h
+++ b/ports/unix/variants/minimal/mpconfigvariant.h
@@ -55,7 +55,6 @@
 #define MICROPY_LONGINT_IMPL        (MICROPY_LONGINT_IMPL_NONE)
 #define MICROPY_STREAMS_NON_BLOCK   (0)
 #define MICROPY_OPT_COMPUTED_GOTO   (0)
-#define MICROPY_OPT_CACHE_MAP_LOOKUP_IN_BYTECODE (0)
 #define MICROPY_OPT_LOAD_ATTR_FAST_PATH (0)
 #define MICROPY_OPT_MAP_LOOKUP_CACHE (0)
 #define MICROPY_CAN_OVERRIDE_BUILTINS (0)
diff --git a/ports/windows/Makefile b/ports/windows/Makefile
index d87affa15cd32..cb2ebc22f7c51 100644
--- a/ports/windows/Makefile
+++ b/ports/windows/Makefile
@@ -60,7 +60,6 @@ SRC_QSTR_AUTO_DEPS +=
 
 ifneq ($(FROZEN_MANIFEST),)
 CFLAGS += -DMICROPY_QSTR_EXTRA_POOL=mp_qstr_frozen_const_pool -DMICROPY_MODULE_FROZEN_MPY=1 -DMPZ_DIG_SIZE=16
-MPY_CROSS_FLAGS += -mcache-lookup-bc
 endif
 
 include $(TOP)/py/mkrules.mk
diff --git a/ports/windows/mpconfigport.h b/ports/windows/mpconfigport.h
index ffcb5b105f99c..4a8a902597876 100644
--- a/ports/windows/mpconfigport.h
+++ b/ports/windows/mpconfigport.h
@@ -59,7 +59,6 @@
 #define MICROPY_STREAMS_NON_BLOCK   (1)
 #define MICROPY_STREAMS_POSIX_API   (1)
 #define MICROPY_OPT_COMPUTED_GOTO   (0)
-#define MICROPY_OPT_CACHE_MAP_LOOKUP_IN_BYTECODE (1)
 #define MICROPY_MODULE_WEAK_LINKS   (1)
 #define MICROPY_CAN_OVERRIDE_BUILTINS (1)
 #define MICROPY_VFS_POSIX_FILE      (1)
diff --git a/ports/windows/msvc/genhdr.targets b/ports/windows/msvc/genhdr.targets
index 9ea6ed28cb4b8..78e57a34ee044 100644
--- a/ports/windows/msvc/genhdr.targets
+++ b/ports/windows/msvc/genhdr.targets
@@ -123,7 +123,7 @@ using(var outFile = System.IO.File.CreateText(OutputFile)) {
         <PreprocessorDefinitions>MICROPY_MODULE_FROZEN_MPY=1;MICROPY_QSTR_EXTRA_POOL=mp_qstr_frozen_const_pool;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       </ClCompile>
     </ItemGroup>
-    <Exec Command="$(PyPython) $(PyBaseDir)tools\makemanifest.py -v MPY_DIR=$(PyBaseDir) -v MPY_LIB_DIR=$(PyBaseDir)../micropython-lib -v PORT_DIR=$(PyWinDir) -f&quot;-mcache-lookup-bc&quot; -o $(PyBuildDir)frozen_content.c -b $(PyBuildDir) $(FrozenManifest)"/>
+    <Exec Command="$(PyPython) $(PyBaseDir)tools\makemanifest.py -v MPY_DIR=$(PyBaseDir) -v MPY_LIB_DIR=$(PyBaseDir)../micropython-lib -v PORT_DIR=$(PyWinDir) -o $(PyBuildDir)frozen_content.c -b $(PyBuildDir) $(FrozenManifest)"/>
     <WriteLinesToFile File="$(TLogLocation)frozen.read.1.tlog" Lines="$(FrozenManifest)" Overwrite="True"/>
   </Target>
 
diff --git a/py/bc.c b/py/bc.c
index 58694b97dc24a..69b6739e8f864 100644
--- a/py/bc.c
+++ b/py/bc.c
@@ -304,24 +304,10 @@ void mp_setup_code_state(mp_code_state_t *code_state, size_t n_args, size_t n_kw
 
 // The following table encodes the number of bytes that a specific opcode
 // takes up.  Some opcodes have an extra byte, defined by MP_BC_MASK_EXTRA_BYTE.
-// There are 4 special opcodes that have an extra byte only when
-// MICROPY_OPT_CACHE_MAP_LOOKUP_IN_BYTECODE is enabled (and they take a qstr):
-//     MP_BC_LOAD_NAME
-//     MP_BC_LOAD_GLOBAL
-//     MP_BC_LOAD_ATTR
-//     MP_BC_STORE_ATTR
 uint mp_opcode_format(const byte *ip, size_t *opcode_size, bool count_var_uint) {
     uint f = MP_BC_FORMAT(*ip);
     const byte *ip_start = ip;
     if (f == MP_BC_FORMAT_QSTR) {
-        if (MICROPY_OPT_CACHE_MAP_LOOKUP_IN_BYTECODE_DYNAMIC) {
-            if (*ip == MP_BC_LOAD_NAME
-                || *ip == MP_BC_LOAD_GLOBAL
-                || *ip == MP_BC_LOAD_ATTR
-                || *ip == MP_BC_STORE_ATTR) {
-                ip += 1;
-            }
-        }
         ip += 3;
     } else {
         int extra_byte = (*ip & MP_BC_MASK_EXTRA_BYTE) == 0;
diff --git a/py/dynruntime.mk b/py/dynruntime.mk
index cb5ab845eb1d2..db06d41e73767 100644
--- a/py/dynruntime.mk
+++ b/py/dynruntime.mk
@@ -46,7 +46,6 @@ ifeq ($(ARCH),x86)
 # x86
 CROSS =
 CFLAGS += -m32 -fno-stack-protector
-MPY_CROSS_FLAGS += -mcache-lookup-bc
 MICROPY_FLOAT_IMPL ?= double
 
 else ifeq ($(ARCH),x64)
@@ -54,7 +53,6 @@ else ifeq ($(ARCH),x64)
 # x64
 CROSS =
 CFLAGS += -fno-stack-protector
-MPY_CROSS_FLAGS += -mcache-lookup-bc
 MICROPY_FLOAT_IMPL ?= double
 
 else ifeq ($(ARCH),armv7m)
diff --git a/py/emitbc.c b/py/emitbc.c
index d7e8e05f0fa63..ca74046033c76 100644
--- a/py/emitbc.c
+++ b/py/emitbc.c
@@ -560,9 +560,6 @@ void mp_emit_bc_load_global(emit_t *emit, qstr qst, int kind) {
     MP_STATIC_ASSERT(MP_BC_LOAD_NAME + MP_EMIT_IDOP_GLOBAL_GLOBAL == MP_BC_LOAD_GLOBAL);
     (void)qst;
     emit_write_bytecode_byte_qstr(emit, 1, MP_BC_LOAD_NAME + kind, qst);
-    if (MICROPY_OPT_CACHE_MAP_LOOKUP_IN_BYTECODE_DYNAMIC) {
-        emit_write_bytecode_raw_byte(emit, 0);
-    }
 }
 
 void mp_emit_bc_load_method(emit_t *emit, qstr qst, bool is_super) {
@@ -596,9 +593,6 @@ void mp_emit_bc_attr(emit_t *emit, qstr qst, int kind) {
         }
         emit_write_bytecode_byte_qstr(emit, -2, MP_BC_STORE_ATTR, qst);
     }
-    if (MICROPY_OPT_CACHE_MAP_LOOKUP_IN_BYTECODE_DYNAMIC) {
-        emit_write_bytecode_raw_byte(emit, 0);
-    }
 }
 
 void mp_emit_bc_store_local(emit_t *emit, qstr qst, mp_uint_t local_num, int kind) {
diff --git a/py/mpconfig.h b/py/mpconfig.h
index 97fc9bb5806ee..6a2edc7dc2deb 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -423,10 +423,8 @@
 
 // Configure dynamic compiler macros
 #if MICROPY_DYNAMIC_COMPILER
-#define MICROPY_OPT_CACHE_MAP_LOOKUP_IN_BYTECODE_DYNAMIC (mp_dynamic_compiler.opt_cache_map_lookup_in_bytecode)
 #define MICROPY_PY_BUILTINS_STR_UNICODE_DYNAMIC (mp_dynamic_compiler.py_builtins_str_unicode)
 #else
-#define MICROPY_OPT_CACHE_MAP_LOOKUP_IN_BYTECODE_DYNAMIC MICROPY_OPT_CACHE_MAP_LOOKUP_IN_BYTECODE
 #define MICROPY_PY_BUILTINS_STR_UNICODE_DYNAMIC MICROPY_PY_BUILTINS_STR_UNICODE
 #endif
 
@@ -520,13 +518,6 @@
 #define MICROPY_OPT_COMPUTED_GOTO (0)
 #endif
 
-// Whether to cache result of map lookups in LOAD_NAME, LOAD_GLOBAL, LOAD_ATTR,
-// STORE_ATTR bytecodes.  Uses 1 byte extra RAM for each of these opcodes and
-// uses a bit of extra code ROM, but greatly improves lookup speed.
-#ifndef MICROPY_OPT_CACHE_MAP_LOOKUP_IN_BYTECODE
-#define MICROPY_OPT_CACHE_MAP_LOOKUP_IN_BYTECODE (0)
-#endif
-
 // Optimise the fast path for loading attributes from instance types. Increases
 // Thumb2 code size by about 48 bytes.
 #ifndef MICROPY_OPT_LOAD_ATTR_FAST_PATH
diff --git a/py/mpstate.h b/py/mpstate.h
index 53b2906872da9..69360738c23c6 100644
--- a/py/mpstate.h
+++ b/py/mpstate.h
@@ -44,7 +44,6 @@
 #if MICROPY_DYNAMIC_COMPILER
 typedef struct mp_dynamic_compiler_t {
     uint8_t small_int_bits; // must be <= host small_int_bits
-    bool opt_cache_map_lookup_in_bytecode;
     bool py_builtins_str_unicode;
     uint8_t native_arch;
     uint8_t nlr_buf_num_regs;
diff --git a/py/persistentcode.h b/py/persistentcode.h
index 8769ef584d2d7..94fc3bf2d34b2 100644
--- a/py/persistentcode.h
+++ b/py/persistentcode.h
@@ -41,16 +41,15 @@
 #define MPY_FEATURE_ENCODE_ARCH(arch) ((arch) << 2)
 #define MPY_FEATURE_DECODE_ARCH(feat) ((feat) >> 2)
 
-// The feature flag bits encode the compile-time config options that
-// affect the generate bytecode.
+// The feature flag bits encode the compile-time config options that affect
+// the generate bytecode. Note: position 0 is now unused
+// (formerly MICROPY_OPT_CACHE_MAP_LOOKUP_IN_BYTECODE).
 #define MPY_FEATURE_FLAGS ( \
-    ((MICROPY_OPT_CACHE_MAP_LOOKUP_IN_BYTECODE) << 0) \
-    | ((MICROPY_PY_BUILTINS_STR_UNICODE) << 1) \
+    ((MICROPY_PY_BUILTINS_STR_UNICODE) << 1) \
     )
 // This is a version of the flags that can be configured at runtime.
 #define MPY_FEATURE_FLAGS_DYNAMIC ( \
-    ((MICROPY_OPT_CACHE_MAP_LOOKUP_IN_BYTECODE_DYNAMIC) << 0) \
-    | ((MICROPY_PY_BUILTINS_STR_UNICODE_DYNAMIC) << 1) \
+    ((MICROPY_PY_BUILTINS_STR_UNICODE_DYNAMIC) << 1) \
     )
 
 // Define the host architecture
diff --git a/py/profile.c b/py/profile.c
index 054a0f9e614ce..d0ac99e074aab 100644
--- a/py/profile.c
+++ b/py/profile.c
@@ -540,9 +540,6 @@ STATIC const byte *mp_prof_opcode_decode(const byte *ip, const mp_uint_t *const_
             instruction->qstr_opname = MP_QSTR_LOAD_NAME;
             instruction->arg = qst;
             instruction->argobj = MP_OBJ_NEW_QSTR(qst);
-            if (MICROPY_OPT_CACHE_MAP_LOOKUP_IN_BYTECODE) {
-                instruction->argobjex_cache = MP_OBJ_NEW_SMALL_INT(*ip++);
-            }
             break;
 
         case MP_BC_LOAD_GLOBAL:
@@ -550,9 +547,6 @@ STATIC const byte *mp_prof_opcode_decode(const byte *ip, const mp_uint_t *const_
             instruction->qstr_opname = MP_QSTR_LOAD_GLOBAL;
             instruction->arg = qst;
             instruction->argobj = MP_OBJ_NEW_QSTR(qst);
-            if (MICROPY_OPT_CACHE_MAP_LOOKUP_IN_BYTECODE) {
-                instruction->argobjex_cache = MP_OBJ_NEW_SMALL_INT(*ip++);
-            }
             break;
 
         case MP_BC_LOAD_ATTR:
@@ -560,9 +554,6 @@ STATIC const byte *mp_prof_opcode_decode(const byte *ip, const mp_uint_t *const_
             instruction->qstr_opname = MP_QSTR_LOAD_ATTR;
             instruction->arg = qst;
             instruction->argobj = MP_OBJ_NEW_QSTR(qst);
-            if (MICROPY_OPT_CACHE_MAP_LOOKUP_IN_BYTECODE) {
-                instruction->argobjex_cache = MP_OBJ_NEW_SMALL_INT(*ip++);
-            }
             break;
 
         case MP_BC_LOAD_METHOD:
@@ -618,9 +609,6 @@ STATIC const byte *mp_prof_opcode_decode(const byte *ip, const mp_uint_t *const_
             instruction->qstr_opname = MP_QSTR_STORE_ATTR;
             instruction->arg = qst;
             instruction->argobj = MP_OBJ_NEW_QSTR(qst);
-            if (MICROPY_OPT_CACHE_MAP_LOOKUP_IN_BYTECODE) {
-                instruction->argobjex_cache = MP_OBJ_NEW_SMALL_INT(*ip++);
-            }
             break;
 
         case MP_BC_STORE_SUBSCR:
diff --git a/py/showbc.c b/py/showbc.c
index cb81b883596e3..c321dfd75557a 100644
--- a/py/showbc.c
+++ b/py/showbc.c
@@ -208,25 +208,16 @@ const byte *mp_bytecode_print_str(const mp_print_t *print, const byte *ip) {
         case MP_BC_LOAD_NAME:
             DECODE_QSTR;
             mp_printf(print, "LOAD_NAME %s", qstr_str(qst));
-            if (MICROPY_OPT_CACHE_MAP_LOOKUP_IN_BYTECODE) {
-                mp_printf(print, " (cache=%u)", *ip++);
-            }
             break;
 
         case MP_BC_LOAD_GLOBAL:
             DECODE_QSTR;
             mp_printf(print, "LOAD_GLOBAL %s", qstr_str(qst));
-            if (MICROPY_OPT_CACHE_MAP_LOOKUP_IN_BYTECODE) {
-                mp_printf(print, " (cache=%u)", *ip++);
-            }
             break;
 
         case MP_BC_LOAD_ATTR:
             DECODE_QSTR;
             mp_printf(print, "LOAD_ATTR %s", qstr_str(qst));
-            if (MICROPY_OPT_CACHE_MAP_LOOKUP_IN_BYTECODE) {
-                mp_printf(print, " (cache=%u)", *ip++);
-            }
             break;
 
         case MP_BC_LOAD_METHOD:
@@ -270,9 +261,6 @@ const byte *mp_bytecode_print_str(const mp_print_t *print, const byte *ip) {
         case MP_BC_STORE_ATTR:
             DECODE_QSTR;
             mp_printf(print, "STORE_ATTR %s", qstr_str(qst));
-            if (MICROPY_OPT_CACHE_MAP_LOOKUP_IN_BYTECODE) {
-                mp_printf(print, " (cache=%u)", *ip++);
-            }
             break;
 
         case MP_BC_STORE_SUBSCR:
diff --git a/py/vm.c b/py/vm.c
index e5a62e4415deb..f55d293dc561a 100644
--- a/py/vm.c
+++ b/py/vm.c
@@ -180,23 +180,6 @@
 #define TRACE_TICK(current_ip, current_sp, is_exception)
 #endif // MICROPY_PY_SYS_SETTRACE
 
-#if MICROPY_OPT_CACHE_MAP_LOOKUP_IN_BYTECODE
-static inline mp_map_elem_t *mp_map_cached_lookup(mp_map_t *map, qstr qst, uint8_t *idx_cache) {
-    size_t idx = *idx_cache;
-    mp_obj_t key = MP_OBJ_NEW_QSTR(qst);
-    mp_map_elem_t *elem = NULL;
-    if (idx < map->alloc && map->table[idx].key == key) {
-        elem = &map->table[idx];
-    } else {
-        elem = mp_map_lookup(map, key, MP_MAP_LOOKUP);
-        if (elem != NULL) {
-            *idx_cache = (elem - &map->table[0]) & 0xff;
-        }
-    }
-    return elem;
-}
-#endif
-
 // fastn has items in reverse order (fastn[0] is local[0], fastn[-1] is local[1], etc)
 // sp points to bottom of stack which grows up
 // returns:
@@ -361,55 +344,20 @@ FRAME_SETUP();
                     goto load_check;
                 }
 
-                #if !MICROPY_OPT_CACHE_MAP_LOOKUP_IN_BYTECODE
                 ENTRY(MP_BC_LOAD_NAME): {
                     MARK_EXC_IP_SELECTIVE();
                     DECODE_QSTR;
                     PUSH(mp_load_name(qst));
                     DISPATCH();
                 }
-                #else
-                ENTRY(MP_BC_LOAD_NAME): {
-                    MARK_EXC_IP_SELECTIVE();
-                    DECODE_QSTR;
-                    mp_map_elem_t *elem = mp_map_cached_lookup(&mp_locals_get()->map, qst, (uint8_t*)ip);
-                    mp_obj_t obj;
-                    if (elem != NULL) {
-                        obj = elem->value;
-                    } else {
-                        obj = mp_load_name(qst);
-                    }
-                    PUSH(obj);
-                    ip++;
-                    DISPATCH();
-                }
-                #endif
 
-                #if !MICROPY_OPT_CACHE_MAP_LOOKUP_IN_BYTECODE
                 ENTRY(MP_BC_LOAD_GLOBAL): {
                     MARK_EXC_IP_SELECTIVE();
                     DECODE_QSTR;
                     PUSH(mp_load_global(qst));
                     DISPATCH();
                 }
-                #else
-                ENTRY(MP_BC_LOAD_GLOBAL): {
-                    MARK_EXC_IP_SELECTIVE();
-                    DECODE_QSTR;
-                    mp_map_elem_t *elem = mp_map_cached_lookup(&mp_globals_get()->map, qst, (uint8_t*)ip);
-                    mp_obj_t obj;
-                    if (elem != NULL) {
-                        obj = elem->value;
-                    } else {
-                        obj = mp_load_global(qst);
-                    }
-                    PUSH(obj);
-                    ip++;
-                    DISPATCH();
-                }
-                #endif
 
-                #if !MICROPY_OPT_CACHE_MAP_LOOKUP_IN_BYTECODE
                 ENTRY(MP_BC_LOAD_ATTR): {
                     FRAME_UPDATE();
                     MARK_EXC_IP_SELECTIVE();
@@ -436,28 +384,6 @@ FRAME_SETUP();
                     SET_TOP(obj);
                     DISPATCH();
                 }
-                #else
-                ENTRY(MP_BC_LOAD_ATTR): {
-                    FRAME_UPDATE();
-                    MARK_EXC_IP_SELECTIVE();
-                    DECODE_QSTR;
-                    mp_obj_t top = TOP();
-                    mp_map_elem_t *elem = NULL;
-                    if (mp_obj_is_instance_type(mp_obj_get_type(top))) {
-                        mp_obj_instance_t *self = MP_OBJ_TO_PTR(top);
-                        elem = mp_map_cached_lookup(&self->members, qst, (uint8_t*)ip);
-                    }
-                    mp_obj_t obj;
-                    if (elem != NULL) {
-                        obj = elem->value;
-                    } else {
-                        obj = mp_load_attr(top, qst);
-                    }
-                    SET_TOP(obj);
-                    ip++;
-                    DISPATCH();
-                }
-                #endif
 
                 ENTRY(MP_BC_LOAD_METHOD): {
                     MARK_EXC_IP_SELECTIVE();
@@ -513,7 +439,6 @@ FRAME_SETUP();
                     DISPATCH();
                 }
 
-                #if !MICROPY_OPT_CACHE_MAP_LOOKUP_IN_BYTECODE
                 ENTRY(MP_BC_STORE_ATTR): {
                     FRAME_UPDATE();
                     MARK_EXC_IP_SELECTIVE();
@@ -522,32 +447,6 @@ FRAME_SETUP();
                     sp -= 2;
                     DISPATCH();
                 }
-                #else
-                // This caching code works with MICROPY_PY_BUILTINS_PROPERTY and/or
-                // MICROPY_PY_DESCRIPTORS enabled because if the attr exists in
-                // self->members then it can't be a property or have descriptors.  A
-                // consequence of this is that we can't use MP_MAP_LOOKUP_ADD_IF_NOT_FOUND
-                // in the fast-path below, because that store could override a property.
-                ENTRY(MP_BC_STORE_ATTR): {
-                    FRAME_UPDATE();
-                    MARK_EXC_IP_SELECTIVE();
-                    DECODE_QSTR;
-                    mp_map_elem_t *elem = NULL;
-                    mp_obj_t top = TOP();
-                    if (mp_obj_is_instance_type(mp_obj_get_type(top)) && sp[-1] != MP_OBJ_NULL) {
-                        mp_obj_instance_t *self = MP_OBJ_TO_PTR(top);
-                        elem = mp_map_cached_lookup(&self->members, qst, (uint8_t*)ip);
-                    }
-                    if (elem != NULL) {
-                        elem->value = sp[-1];
-                    } else {
-                        mp_store_attr(sp[0], qst, sp[-1]);
-                    }
-                    sp -= 2;
-                    ip++;
-                    DISPATCH();
-                }
-                #endif
 
                 ENTRY(MP_BC_STORE_SUBSCR):
                     MARK_EXC_IP_SELECTIVE();
diff --git a/tests/cmdline/cmd_parsetree.py.exp b/tests/cmdline/cmd_parsetree.py.exp
index cc8ba82c05b9f..bee4fc99d1aa7 100644
--- a/tests/cmdline/cmd_parsetree.py.exp
+++ b/tests/cmdline/cmd_parsetree.py.exp
@@ -78,11 +78,11 @@ arg names:
 45 STORE_NAME g
 48 LOAD_CONST_OBJ \.\+
 50 LOAD_METHOD format
-53 LOAD_NAME b (cache=0)
-57 CALL_METHOD n=1 nkw=0
-59 STORE_NAME h
-62 LOAD_CONST_NONE
-63 RETURN_VALUE
+53 LOAD_NAME b
+56 CALL_METHOD n=1 nkw=0
+58 STORE_NAME h
+61 LOAD_CONST_NONE
+62 RETURN_VALUE
 mem: total=\\d\+, current=\\d\+, peak=\\d\+
 stack: \\d\+ out of \\d\+
 GC: total: \\d\+, used: \\d\+, free: \\d\+
diff --git a/tests/cmdline/cmd_showbc.py.exp b/tests/cmdline/cmd_showbc.py.exp
index 325efc7dbaaad..d93fd7b487ec2 100644
--- a/tests/cmdline/cmd_showbc.py.exp
+++ b/tests/cmdline/cmd_showbc.py.exp
@@ -119,11 +119,11 @@ Raw bytecode (code_info_size=\\d\+, bytecode_size=\\d\+):
 \\d\+ UNARY_OP 3
 \\d\+ STORE_FAST 10
 \\d\+ LOAD_DEREF 14
-\\d\+ LOAD_ATTR c (cache=0)
+\\d\+ LOAD_ATTR c
 \\d\+ STORE_FAST 11
 \\d\+ LOAD_FAST 11
 \\d\+ LOAD_DEREF 14
-\\d\+ STORE_ATTR c (cache=0)
+\\d\+ STORE_ATTR c
 \\d\+ LOAD_DEREF 14
 \\d\+ LOAD_CONST_SMALL_INT 0
 \\d\+ LOAD_SUBSCR
@@ -233,7 +233,7 @@ Raw bytecode (code_info_size=\\d\+, bytecode_size=\\d\+):
 \\d\+ LOAD_DEREF 16
 \\d\+ POP_TOP
 \\d\+ JUMP \\d\+
-\\d\+ LOAD_GLOBAL y (cache=0)
+\\d\+ LOAD_GLOBAL y
 \\d\+ POP_TOP
 \\d\+ JUMP \\d\+
 \\d\+ LOAD_DEREF 14
@@ -418,13 +418,13 @@ arg names:
 (N_EXC_STACK 0)
   bc=0 line=1
 ########
-  bc=13 line=150
-00 LOAD_NAME __name__ (cache=0)
-04 STORE_NAME __module__
-07 LOAD_CONST_STRING 'Class'
-10 STORE_NAME __qualname__
-13 LOAD_CONST_NONE
-14 RETURN_VALUE
+  bc=12 line=150
+00 LOAD_NAME __name__
+03 STORE_NAME __module__
+06 LOAD_CONST_STRING 'Class'
+09 STORE_NAME __qualname__
+12 LOAD_CONST_NONE
+13 RETURN_VALUE
 File cmdline/cmd_showbc.py, code block 'f' (descriptor: \.\+, bytecode @\.\+ bytes)
 Raw bytecode (code_info_size=\\d\+, bytecode_size=\\d\+):
 ########
@@ -434,8 +434,8 @@ arg names: self
 (N_EXC_STACK 0)
   bc=0 line=1
   bc=0 line=157
-00 LOAD_GLOBAL super (cache=0)
-\\d\+ LOAD_GLOBAL __class__ (cache=0)
+00 LOAD_GLOBAL super
+\\d\+ LOAD_GLOBAL __class__
 \\d\+ LOAD_FAST 0
 \\d\+ LOAD_SUPER_METHOD f
 \\d\+ CALL_METHOD n=0 nkw=0
diff --git a/tests/cmdline/cmd_verbose.py.exp b/tests/cmdline/cmd_verbose.py.exp
index a2fdf1f00deb3..0edd050c22221 100644
--- a/tests/cmdline/cmd_verbose.py.exp
+++ b/tests/cmdline/cmd_verbose.py.exp
@@ -8,12 +8,12 @@ arg names:
 (N_EXC_STACK 0)
   bc=0 line=1
   bc=0 line=3
-00 LOAD_NAME print (cache=0)
-04 LOAD_CONST_SMALL_INT 1
-05 CALL_FUNCTION n=1 nkw=0
-07 POP_TOP
-08 LOAD_CONST_NONE
-09 RETURN_VALUE
+00 LOAD_NAME print
+03 LOAD_CONST_SMALL_INT 1
+04 CALL_FUNCTION n=1 nkw=0
+06 POP_TOP
+07 LOAD_CONST_NONE
+08 RETURN_VALUE
 1
 mem: total=\\d\+, current=\\d\+, peak=\\d\+
 stack: \\d\+ out of \\d\+
diff --git a/tests/micropython/import_mpy_native_gc.py b/tests/micropython/import_mpy_native_gc.py
index e8fac8f179371..f982a4ee17546 100644
--- a/tests/micropython/import_mpy_native_gc.py
+++ b/tests/micropython/import_mpy_native_gc.py
@@ -48,8 +48,8 @@ def open(self, path, mode):
 # Pre-compiled examples/natmod/features0 example for various architectures, keyed
 # by the required value of sys.implementation.mpy.
 features0_file_contents = {
-    # -march=x64 -mcache-lookup-bc
-    0xB05: b'M\x05\x0b\x1f \x84b\xe9/\x00\x00\x00SH\x8b\x1ds\x00\x00\x00\xbe\x02\x00\x00\x00\xffS\x18\xbf\x01\x00\x00\x00H\x85\xc0u\x0cH\x8bC \xbe\x02\x00\x00\x00[\xff\xe0H\x0f\xaf\xf8H\xff\xc8\xeb\xe6ATUSH\x8b\x1dA\x00\x00\x00H\x8b\x7f\x08L\x8bc(A\xff\xd4H\x8d5\x1f\x00\x00\x00H\x89\xc5H\x8b\x05-\x00\x00\x00\x0f\xb78\xffShH\x89\xefA\xff\xd4H\x8b\x03[]A\\\xc3\x00\x00\x00\x00\x00\x00\x00\x00\x00\x05\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x90\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x84@\x12factorial\x10\x00\x00\r \x01"\x9f\x1c\x01\x1e\xff',
+    # -march=x64
+    0xA05: b'M\x05\x0a\x1f \x84b\xe9/\x00\x00\x00SH\x8b\x1ds\x00\x00\x00\xbe\x02\x00\x00\x00\xffS\x18\xbf\x01\x00\x00\x00H\x85\xc0u\x0cH\x8bC \xbe\x02\x00\x00\x00[\xff\xe0H\x0f\xaf\xf8H\xff\xc8\xeb\xe6ATUSH\x8b\x1dA\x00\x00\x00H\x8b\x7f\x08L\x8bc(A\xff\xd4H\x8d5\x1f\x00\x00\x00H\x89\xc5H\x8b\x05-\x00\x00\x00\x0f\xb78\xffShH\x89\xefA\xff\xd4H\x8b\x03[]A\\\xc3\x00\x00\x00\x00\x00\x00\x00\x00\x00\x05\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x90\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x84@\x12factorial\x10\x00\x00\r \x01"\x9f\x1c\x01\x1e\xff',
     # -march=armv7m
     0x1605: b"M\x05\x16\x1f \x84\x12\x1a\xe0\x00\x00\x13\xb5\nK\nJ{D\x9cX\x02!\xe3h\x98G\x03F\x01 3\xb9\x02!#i\x01\x93\x02\xb0\xbd\xe8\x10@\x18GXC\x01;\xf4\xe7\x00\xbfj\x00\x00\x00\x00\x00\x00\x00\xf8\xb5\tN\tK~D\xf4X@hgi\xb8G\x05F\x07K\x07I\xf2XyD\x10\x88ck\x98G(F\xb8G h\xf8\xbd6\x00\x00\x00\x00\x00\x00\x00\x04\x00\x00\x00\x1c\x00\x00\x00\x00\x00\x00\x00\x05\x00\x00\x00\x00\x00\x00\x00\x80\x00\x00\x00\x00\x00\x00\x00\x01\x84\x00\x12factorial\x10\x00\x00\r<\x01>\x9f8\x01:\xff",
 }
diff --git a/tests/micropython/import_mpy_native_x64.py b/tests/micropython/import_mpy_native_x64.py
index 3e7b2058eb812..cad59e99164c2 100644
--- a/tests/micropython/import_mpy_native_x64.py
+++ b/tests/micropython/import_mpy_native_x64.py
@@ -52,11 +52,11 @@ def open(self, path, mode):
 # fmt: off
 user_files = {
     # bad architecture
-    '/mod0.mpy': b'M\x05\xff\x00\x10',
+    '/mod0.mpy': b'M\x05\xfe\x00\x10',
 
     # test loading of viper and asm
     '/mod1.mpy': (
-        b'M\x05\x0b\x1f\x20' # header
+        b'M\x05\x0a\x1f\x20' # header
 
         b'\x20' # n bytes, bytecode
             b'\x00\x08\x02m\x02m' # prelude
@@ -78,7 +78,7 @@ def open(self, path, mode):
 
     # test loading viper with additional scope flags and relocation
     '/mod2.mpy': (
-        b'M\x05\x0b\x1f\x20' # header
+        b'M\x05\x0a\x1f\x20' # header
 
         b'\x20' # n bytes, bytecode
             b'\x00\x08\x02m\x02m' # prelude
diff --git a/tests/run-tests.py b/tests/run-tests.py
index 3e97a7c87dc7e..a8a31c0ae5c9f 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -742,9 +742,7 @@ def main():
     cmd_parser.add_argument(
         "--via-mpy", action="store_true", help="compile .py files to .mpy first"
     )
-    cmd_parser.add_argument(
-        "--mpy-cross-flags", default="-mcache-lookup-bc", help="flags to pass to mpy-cross"
-    )
+    cmd_parser.add_argument("--mpy-cross-flags", default="", help="flags to pass to mpy-cross")
     cmd_parser.add_argument(
         "--keep-path", action="store_true", help="do not clear MICROPYPATH when running tests"
     )
diff --git a/tools/mpy-tool.py b/tools/mpy-tool.py
index bfc3cf27e3f46..6868ed5d4e429 100755
--- a/tools/mpy-tool.py
+++ b/tools/mpy-tool.py
@@ -132,14 +132,6 @@ def mp_opcode_format(bytecode, ip, count_var_uint):
     ip_start = ip
     f = (0x000003A4 >> (2 * ((opcode) >> 4))) & 3
     if f == MP_BC_FORMAT_QSTR:
-        if config.MICROPY_OPT_CACHE_MAP_LOOKUP_IN_BYTECODE:
-            if (
-                opcode == MP_BC_LOAD_NAME
-                or opcode == MP_BC_LOAD_GLOBAL
-                or opcode == MP_BC_LOAD_ATTR
-                or opcode == MP_BC_STORE_ATTR
-            ):
-                ip += 1
         ip += 3
     else:
         extra_byte = (opcode & MP_BC_MASK_EXTRA_BYTE) == 0
@@ -440,10 +432,7 @@ def freeze(self, parent_name):
             "// frozen bytecode for file %s, scope %s%s"
             % (self.source_file.str, parent_name, self.simple_name.str)
         )
-        print("STATIC ", end="")
-        if not config.MICROPY_OPT_CACHE_MAP_LOOKUP_IN_BYTECODE:
-            print("const ", end="")
-        print("byte fun_data_%s[%u] = {" % (self.escaped_name, len(self.bytecode)))
+        print("STATIC const byte fun_data_%s[%u] = {" % (self.escaped_name, len(self.bytecode)))
         print("   ", end="")
         for i in range(self.ip2):
             print(" 0x%02x," % self.bytecode[i], end="")
@@ -798,7 +787,6 @@ def read_mpy(filename):
             raise Exception("incompatible .mpy version")
         feature_byte = header[2]
         qw_size = read_uint(f)
-        config.MICROPY_OPT_CACHE_MAP_LOOKUP_IN_BYTECODE = (feature_byte & 1) != 0
         config.MICROPY_PY_BUILTINS_STR_UNICODE = (feature_byte & 2) != 0
         mpy_native_arch = feature_byte >> 2
         if mpy_native_arch != MP_NATIVE_ARCH_NONE:
@@ -836,14 +824,6 @@ def freeze_mpy(base_qstrs, raw_codes):
     print('#include "py/nativeglue.h"')
     print()
 
-    print(
-        "#if MICROPY_OPT_CACHE_MAP_LOOKUP_IN_BYTECODE != %u"
-        % config.MICROPY_OPT_CACHE_MAP_LOOKUP_IN_BYTECODE
-    )
-    print('#error "incompatible MICROPY_OPT_CACHE_MAP_LOOKUP_IN_BYTECODE"')
-    print("#endif")
-    print()
-
     print("#if MICROPY_LONGINT_IMPL != %u" % config.MICROPY_LONGINT_IMPL)
     print('#error "incompatible MICROPY_LONGINT_IMPL"')
     print("#endif")
@@ -940,11 +920,7 @@ def merge_mpy(raw_codes, output_file):
         header = bytearray(5)
         header[0] = ord("M")
         header[1] = config.MPY_VERSION
-        header[2] = (
-            config.native_arch << 2
-            | config.MICROPY_PY_BUILTINS_STR_UNICODE << 1
-            | config.MICROPY_OPT_CACHE_MAP_LOOKUP_IN_BYTECODE
-        )
+        header[2] = config.native_arch << 2 | config.MICROPY_PY_BUILTINS_STR_UNICODE << 1
         header[3] = config.mp_small_int_bits
         header[4] = 32  # qstr_win_size
         merged_mpy.extend(header)
diff --git a/tools/mpy_cross_all.py b/tools/mpy_cross_all.py
index d542bde42e34c..4b1edf9d6c07e 100755
--- a/tools/mpy_cross_all.py
+++ b/tools/mpy_cross_all.py
@@ -6,14 +6,11 @@
 argparser = argparse.ArgumentParser(description="Compile all .py files to .mpy recursively")
 argparser.add_argument("-o", "--out", help="output directory (default: input dir)")
 argparser.add_argument("--target", help="select MicroPython target config")
-argparser.add_argument(
-    "-mcache-lookup-bc", action="store_true", help="cache map lookups in the bytecode"
-)
 argparser.add_argument("dir", help="input directory")
 args = argparser.parse_args()
 
 TARGET_OPTS = {
-    "unix": "-mcache-lookup-bc",
+    "unix": "",
     "baremetal": "",
 }
 
diff --git a/tools/mpy_ld.py b/tools/mpy_ld.py
index 852249943887e..6bc1dbac05f4b 100755
--- a/tools/mpy_ld.py
+++ b/tools/mpy_ld.py
@@ -48,7 +48,6 @@
 MP_SCOPE_FLAG_VIPERRELOC = 0x10
 MP_SCOPE_FLAG_VIPERRODATA = 0x20
 MP_SCOPE_FLAG_VIPERBSS = 0x40
-MICROPY_OPT_CACHE_MAP_LOOKUP_IN_BYTECODE = 1
 MICROPY_PY_BUILTINS_STR_UNICODE = 2
 MP_SMALL_INT_BITS = 31
 QSTR_WINDOW_SIZE = 32
@@ -118,9 +117,7 @@ def __init__(self, name, mpy_feature, qstr_entry_size, word_size, arch_got, asm_
 ARCH_DATA = {
     "x86": ArchData(
         "EM_386",
-        MP_NATIVE_ARCH_X86 << 2
-        | MICROPY_PY_BUILTINS_STR_UNICODE
-        | MICROPY_OPT_CACHE_MAP_LOOKUP_IN_BYTECODE,
+        MP_NATIVE_ARCH_X86 << 2 | MICROPY_PY_BUILTINS_STR_UNICODE,
         2,
         4,
         (R_386_PC32, R_386_GOT32, R_386_GOT32X),
@@ -128,9 +125,7 @@ def __init__(self, name, mpy_feature, qstr_entry_size, word_size, arch_got, asm_
     ),
     "x64": ArchData(
         "EM_X86_64",
-        MP_NATIVE_ARCH_X64 << 2
-        | MICROPY_PY_BUILTINS_STR_UNICODE
-        | MICROPY_OPT_CACHE_MAP_LOOKUP_IN_BYTECODE,
+        MP_NATIVE_ARCH_X64 << 2 | MICROPY_PY_BUILTINS_STR_UNICODE,
         2,
         8,
         (R_X86_64_GOTPCREL, R_X86_64_REX_GOTPCRELX),

From 54d33b266ca337d8fb42852422cc6bf87c813e4e Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 16 Sep 2021 22:16:36 +1000
Subject: [PATCH 1294/3533] esp32: Add support for ESP32-S3 SoCs.

Thanks to Seon Rozenblum aka @UnexpectedMaker for the work.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/machine_adc.c       | 10 ++++++++--
 ports/esp32/machine_hw_spi.c    |  2 ++
 ports/esp32/machine_i2s.c       |  5 +++++
 ports/esp32/machine_timer.c     |  4 ++++
 ports/esp32/modmachine.c        |  2 ++
 ports/esp32/partitions-8MiB.csv |  7 +++++++
 ports/esp32/uart.c              |  9 +++++++--
 7 files changed, 35 insertions(+), 4 deletions(-)
 create mode 100644 ports/esp32/partitions-8MiB.csv

diff --git a/ports/esp32/machine_adc.c b/ports/esp32/machine_adc.c
index 5ac05d56b5a86..6731978e28853 100644
--- a/ports/esp32/machine_adc.c
+++ b/ports/esp32/machine_adc.c
@@ -164,10 +164,14 @@ STATIC mp_obj_t madc_width(mp_obj_t cls_in, mp_obj_t width_in) {
         case ADC_WIDTH_12Bit:
             adc_bit_width = 12;
             break;
-        #elif CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3
+        #elif CONFIG_IDF_TARGET_ESP32S2
         case ADC_WIDTH_BIT_13:
             adc_bit_width = 13;
             break;
+        #elif CONFIG_IDF_TARGET_ESP32S3
+        case ADC_WIDTH_BIT_12:
+            adc_bit_width = 12;
+            break;
             #endif
         default:
             break;
@@ -194,8 +198,10 @@ STATIC const mp_rom_map_elem_t madc_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_WIDTH_10BIT), MP_ROM_INT(ADC_WIDTH_10Bit) },
     { MP_ROM_QSTR(MP_QSTR_WIDTH_11BIT), MP_ROM_INT(ADC_WIDTH_11Bit) },
     { MP_ROM_QSTR(MP_QSTR_WIDTH_12BIT), MP_ROM_INT(ADC_WIDTH_12Bit) },
-    #elif CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3
+    #elif CONFIG_IDF_TARGET_ESP32S2
     { MP_ROM_QSTR(MP_QSTR_WIDTH_13BIT), MP_ROM_INT(ADC_WIDTH_BIT_13) },
+    #elif CONFIG_IDF_TARGET_ESP32S3
+    { MP_ROM_QSTR(MP_QSTR_WIDTH_12BIT), MP_ROM_INT(ADC_WIDTH_BIT_12) },
     #endif
 };
 
diff --git a/ports/esp32/machine_hw_spi.c b/ports/esp32/machine_hw_spi.c
index ca530ba943f9d..4c0989b9a6f9b 100644
--- a/ports/esp32/machine_hw_spi.c
+++ b/ports/esp32/machine_hw_spi.c
@@ -55,6 +55,8 @@
 
 #if CONFIG_IDF_TARGET_ESP32C3
 #define HSPI_HOST SPI2_HOST
+#elif CONFIG_IDF_TARGET_ESP32S3
+#define HSPI_HOST SPI3_HOST
 #endif
 
 typedef struct _machine_hw_spi_default_pins_t {
diff --git a/ports/esp32/machine_i2s.c b/ports/esp32/machine_i2s.c
index c650a33befb0a..dc583e8e96d68 100644
--- a/ports/esp32/machine_i2s.c
+++ b/ports/esp32/machine_i2s.c
@@ -455,8 +455,13 @@ STATIC void machine_i2s_init_helper(machine_i2s_obj_t *self, size_t n_pos_args,
     // apply low-level workaround for bug in some ESP-IDF versions that swap
     // the left and right channels
     // https://github.com/espressif/esp-idf/issues/6625
+    #if CONFIG_IDF_TARGET_ESP32S3
+    REG_SET_BIT(I2S_TX_CONF_REG(self->port), I2S_TX_MSB_SHIFT);
+    REG_SET_BIT(I2S_TX_CONF_REG(self->port), I2S_RX_MSB_SHIFT);
+    #else
     REG_SET_BIT(I2S_CONF_REG(self->port), I2S_TX_MSB_RIGHT);
     REG_SET_BIT(I2S_CONF_REG(self->port), I2S_RX_MSB_RIGHT);
+    #endif
 
     i2s_pin_config_t pin_config;
     pin_config.bck_io_num = self->sck;
diff --git a/ports/esp32/machine_timer.c b/ports/esp32/machine_timer.c
index 803849e1be647..020ba4447d915 100644
--- a/ports/esp32/machine_timer.c
+++ b/ports/esp32/machine_timer.c
@@ -138,7 +138,11 @@ STATIC void machine_timer_isr(void *self_in) {
     device->hw_timer[self->index].update = 1;
     #else
     #if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(4, 4, 0)
+    #if CONFIG_IDF_TARGET_ESP32S3
+    device->hw_timer[self->index].update.tn_update = 1;
+    #else
     device->hw_timer[self->index].update.tx_update = 1;
+    #endif
     #else
     device->hw_timer[self->index].update.update = 1;
     #endif
diff --git a/ports/esp32/modmachine.c b/ports/esp32/modmachine.c
index 00271a37eda3a..cca2015729161 100644
--- a/ports/esp32/modmachine.c
+++ b/ports/esp32/modmachine.c
@@ -91,6 +91,8 @@ STATIC mp_obj_t machine_freq(size_t n_args, const mp_obj_t *args) {
         esp_pm_config_esp32c3_t pm;
         #elif CONFIG_IDF_TARGET_ESP32S2
         esp_pm_config_esp32s2_t pm;
+        #elif CONFIG_IDF_TARGET_ESP32S3
+        esp_pm_config_esp32s3_t pm;
         #endif
         pm.max_freq_mhz = freq;
         pm.min_freq_mhz = freq;
diff --git a/ports/esp32/partitions-8MiB.csv b/ports/esp32/partitions-8MiB.csv
new file mode 100644
index 0000000000000..582d3b50e54dc
--- /dev/null
+++ b/ports/esp32/partitions-8MiB.csv
@@ -0,0 +1,7 @@
+# Notes: the offset of the partition table itself is set in
+# $IDF_PATH/components/partition_table/Kconfig.projbuild.
+# Name,   Type, SubType, Offset,  Size, Flags
+nvs,      data, nvs,     0x9000,  0x6000,
+phy_init, data, phy,     0xf000,  0x1000,
+factory,  app,  factory, 0x10000, 0x1F0000,
+vfs,      data, fat,     0x200000, 0x600000,
diff --git a/ports/esp32/uart.c b/ports/esp32/uart.c
index 480b364a59908..58fc0c6c6168b 100644
--- a/ports/esp32/uart.c
+++ b/ports/esp32/uart.c
@@ -45,13 +45,18 @@ void uart_init(void) {
 // all code executed in ISR must be in IRAM, and any const data must be in DRAM
 STATIC void IRAM_ATTR uart_irq_handler(void *arg) {
     volatile uart_dev_t *uart = &UART0;
+    #if CONFIG_IDF_TARGET_ESP32S3
+    uart->int_clr.rxfifo_full_int_clr = 1;
+    uart->int_clr.rxfifo_tout_int_clr = 1;
+    #else
     uart->int_clr.rxfifo_full = 1;
-    uart->int_clr.frm_err = 1;
     uart->int_clr.rxfifo_tout = 1;
+    uart->int_clr.frm_err = 1;
+    #endif
     while (uart->status.rxfifo_cnt) {
         #if CONFIG_IDF_TARGET_ESP32
         uint8_t c = uart->fifo.rw_byte;
-        #elif CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32S2
+        #elif CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3
         uint8_t c = READ_PERI_REG(UART_FIFO_AHB_REG(0)); // UART0
         #endif
         if (c == mp_interrupt_char) {

From 80fe25689f424b1d7a0f892a0c111bef21181f7d Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 16 Sep 2021 22:18:32 +1000
Subject: [PATCH 1295/3533] esp32/boards: Add new GENERIC_S3 board definition.

Thanks to Seon Rozenblum aka @UnexpectedMaker for the work.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/boards/GENERIC_S3/mpconfigboard.cmake | 11 +++++++++++
 ports/esp32/boards/GENERIC_S3/mpconfigboard.h     | 13 +++++++++++++
 ports/esp32/boards/GENERIC_S3/sdkconfig.board     | 12 ++++++++++++
 3 files changed, 36 insertions(+)
 create mode 100644 ports/esp32/boards/GENERIC_S3/mpconfigboard.cmake
 create mode 100644 ports/esp32/boards/GENERIC_S3/mpconfigboard.h
 create mode 100644 ports/esp32/boards/GENERIC_S3/sdkconfig.board

diff --git a/ports/esp32/boards/GENERIC_S3/mpconfigboard.cmake b/ports/esp32/boards/GENERIC_S3/mpconfigboard.cmake
new file mode 100644
index 0000000000000..eae671d28644f
--- /dev/null
+++ b/ports/esp32/boards/GENERIC_S3/mpconfigboard.cmake
@@ -0,0 +1,11 @@
+set(IDF_TARGET esp32s3)
+
+set(SDKCONFIG_DEFAULTS
+    boards/sdkconfig.base
+    boards/sdkconfig.usb
+    boards/GENERIC_S3/sdkconfig.board
+)
+
+if(NOT MICROPY_FROZEN_MANIFEST)
+    set(MICROPY_FROZEN_MANIFEST ${MICROPY_PORT_DIR}/boards/manifest.py)
+endif()
diff --git a/ports/esp32/boards/GENERIC_S3/mpconfigboard.h b/ports/esp32/boards/GENERIC_S3/mpconfigboard.h
new file mode 100644
index 0000000000000..562521c3682ff
--- /dev/null
+++ b/ports/esp32/boards/GENERIC_S3/mpconfigboard.h
@@ -0,0 +1,13 @@
+#define MICROPY_HW_BOARD_NAME               "ESP32S3 module"
+#define MICROPY_HW_MCU_NAME                 "ESP32S3"
+
+#define MICROPY_PY_BLUETOOTH                (0)
+#define MICROPY_HW_ENABLE_SDCARD            (0)
+#define MICROPY_PY_MACHINE_DAC              (0)
+
+#define MICROPY_HW_I2C0_SCL                 (9)
+#define MICROPY_HW_I2C0_SDA                 (8)
+
+#define MICROPY_HW_SPI1_MOSI                (35)  // SDO
+#define MICROPY_HW_SPI1_MISO                (37)  // SDI
+#define MICROPY_HW_SPI1_SCK                 (36)
diff --git a/ports/esp32/boards/GENERIC_S3/sdkconfig.board b/ports/esp32/boards/GENERIC_S3/sdkconfig.board
new file mode 100644
index 0000000000000..c9726d4232ed4
--- /dev/null
+++ b/ports/esp32/boards/GENERIC_S3/sdkconfig.board
@@ -0,0 +1,12 @@
+CONFIG_FLASHMODE_QIO=y
+CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
+CONFIG_ESPTOOLPY_FLASHSIZE_DETECT=y
+CONFIG_ESPTOOLPY_AFTER_NORESET=y
+
+CONFIG_SPIRAM_MEMTEST=
+
+CONFIG_ESPTOOLPY_FLASHSIZE_4MB=
+CONFIG_ESPTOOLPY_FLASHSIZE_8MB=y
+CONFIG_ESPTOOLPY_FLASHSIZE_16MB=
+CONFIG_PARTITION_TABLE_CUSTOM=y
+CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions-8MiB.csv"

From da4593f937003e5593725bfa61f727d429a1e061 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 16 Sep 2021 22:22:40 +1000
Subject: [PATCH 1296/3533] tools/ci.sh: Use IDF v4.4 as part of esp32 CI and
 build GENERIC_S3.

IDF v4.4 does not have an official release so for now use the latest
master.  Also remove building GENERIC with no options (all the other boards
are no-option builds), to keep CI time reasonable.

Signed-off-by: Damien George <damien@micropython.org>
---
 .github/workflows/ports_esp32.yml | 4 ++--
 tools/ci.sh                       | 9 +++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/ports_esp32.yml b/.github/workflows/ports_esp32.yml
index 09817ee126546..de88de3755421 100644
--- a/.github/workflows/ports_esp32.yml
+++ b/.github/workflows/ports_esp32.yml
@@ -22,11 +22,11 @@ jobs:
     - name: Build
       run: source tools/ci.sh && ci_esp32_build
 
-  build_idf43:
+  build_idf44:
     runs-on: ubuntu-20.04
     steps:
     - uses: actions/checkout@v2
     - name: Install packages
-      run: source tools/ci.sh && ci_esp32_idf43_setup
+      run: source tools/ci.sh && ci_esp32_idf44_setup
     - name: Build
       run: source tools/ci.sh && ci_esp32_build
diff --git a/tools/ci.sh b/tools/ci.sh
index 4c216257d2fea..407ea04579193 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -106,16 +106,14 @@ function ci_esp32_idf402_setup {
     ci_esp32_setup_helper v4.0.2
 }
 
-function ci_esp32_idf43_setup {
-    ci_esp32_setup_helper v4.3
+function ci_esp32_idf44_setup {
+    ci_esp32_setup_helper master
 }
 
 function ci_esp32_build {
     source esp-idf/export.sh
     make ${MAKEOPTS} -C mpy-cross
     make ${MAKEOPTS} -C ports/esp32 submodules
-    make ${MAKEOPTS} -C ports/esp32
-    make ${MAKEOPTS} -C ports/esp32 clean
     make ${MAKEOPTS} -C ports/esp32 USER_C_MODULES=../../../examples/usercmodule/micropython.cmake FROZEN_MANIFEST=$(pwd)/ports/esp32/boards/manifest.py
     if [ -d $IDF_PATH/components/esp32c3 ]; then
         make ${MAKEOPTS} -C ports/esp32 BOARD=GENERIC_C3
@@ -123,6 +121,9 @@ function ci_esp32_build {
     if [ -d $IDF_PATH/components/esp32s2 ]; then
         make ${MAKEOPTS} -C ports/esp32 BOARD=GENERIC_S2
     fi
+    if [ -d $IDF_PATH/components/esp32s3 ]; then
+        make ${MAKEOPTS} -C ports/esp32 BOARD=GENERIC_S3
+    fi
 }
 
 ########################################################################################

From 13e6e0d7f5dc830639fd21e2b1380c6cc1996cab Mon Sep 17 00:00:00 2001
From: Seon Rozenblum <seon@unexpectedmaker.com>
Date: Fri, 17 Sep 2021 19:44:06 +1000
Subject: [PATCH 1297/3533] esp32/machine_hw_spi: Fix hardware SPI DMA channels
 for S2/S3.

---
 ports/esp32/machine_hw_spi.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/ports/esp32/machine_hw_spi.c b/ports/esp32/machine_hw_spi.c
index 4c0989b9a6f9b..467bff7ccb86c 100644
--- a/ports/esp32/machine_hw_spi.c
+++ b/ports/esp32/machine_hw_spi.c
@@ -57,6 +57,7 @@
 #define HSPI_HOST SPI2_HOST
 #elif CONFIG_IDF_TARGET_ESP32S3
 #define HSPI_HOST SPI3_HOST
+#define FSPI_HOST SPI2_HOST
 #endif
 
 typedef struct _machine_hw_spi_default_pins_t {
@@ -195,6 +196,9 @@ STATIC void machine_hw_spi_init_internal(
     }
 
     if (self->host != HSPI_HOST
+        #ifdef FSPI_HOST
+        && self->host != FSPI_HOST
+        #endif
         #ifdef VSPI_HOST
         && self->host != VSPI_HOST
         #endif
@@ -233,7 +237,15 @@ STATIC void machine_hw_spi_init_internal(
     // Select DMA channel based on the hardware SPI host
     int dma_chan = 0;
     if (self->host == HSPI_HOST) {
+        #if CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3
+        dma_chan = 3;
+        #else
+        dma_chan = 1;
+        #endif
+    #ifdef FSPI_HOST
+    } else if (self->host == FSPI_HOST) {
         dma_chan = 1;
+    #endif
     #ifdef VSPI_HOST
     } else if (self->host == VSPI_HOST) {
         dma_chan = 2;

From 4cfd85eb4a4dbab02efb1b22e87789f552e68fc0 Mon Sep 17 00:00:00 2001
From: patrick <patrick@thinktransit.com.au>
Date: Wed, 25 Aug 2021 22:17:10 +1000
Subject: [PATCH 1298/3533] esp32/boards: Add board definition for
 ESP32-S2-WROVER module.

---
 .../boards/ESP32_S2_WROVER/mpconfigboard.cmake    | 12 ++++++++++++
 .../esp32/boards/ESP32_S2_WROVER/mpconfigboard.h  | 15 +++++++++++++++
 .../esp32/boards/ESP32_S2_WROVER/sdkconfig.board  | 11 +++++++++++
 3 files changed, 38 insertions(+)
 create mode 100644 ports/esp32/boards/ESP32_S2_WROVER/mpconfigboard.cmake
 create mode 100644 ports/esp32/boards/ESP32_S2_WROVER/mpconfigboard.h
 create mode 100644 ports/esp32/boards/ESP32_S2_WROVER/sdkconfig.board

diff --git a/ports/esp32/boards/ESP32_S2_WROVER/mpconfigboard.cmake b/ports/esp32/boards/ESP32_S2_WROVER/mpconfigboard.cmake
new file mode 100644
index 0000000000000..806312e5acd0c
--- /dev/null
+++ b/ports/esp32/boards/ESP32_S2_WROVER/mpconfigboard.cmake
@@ -0,0 +1,12 @@
+set(IDF_TARGET esp32s2)
+
+set(SDKCONFIG_DEFAULTS
+    boards/sdkconfig.base
+    boards/sdkconfig.spiram_sx
+    boards/sdkconfig.usb
+    boards/ESP32_S2_WROVER/sdkconfig.board
+)
+
+if(NOT MICROPY_FROZEN_MANIFEST)
+    set(MICROPY_FROZEN_MANIFEST ${MICROPY_PORT_DIR}/boards/manifest.py)
+endif()
diff --git a/ports/esp32/boards/ESP32_S2_WROVER/mpconfigboard.h b/ports/esp32/boards/ESP32_S2_WROVER/mpconfigboard.h
new file mode 100644
index 0000000000000..f9219c87670af
--- /dev/null
+++ b/ports/esp32/boards/ESP32_S2_WROVER/mpconfigboard.h
@@ -0,0 +1,15 @@
+#define MICROPY_HW_BOARD_NAME               "ESP32-S2-WROVER"
+#define MICROPY_HW_MCU_NAME                 "ESP32-S2"
+
+#define MICROPY_PY_BLUETOOTH                (0)
+#define MICROPY_HW_ENABLE_SDCARD            (0)
+
+#define MICROPY_HW_I2C0_SCL                 (7)
+#define MICROPY_HW_I2C0_SDA                 (6)
+
+#define MICROPY_HW_SPI1_MOSI                (35)
+#define MICROPY_HW_SPI1_MISO                (37)
+#define MICROPY_HW_SPI1_SCK                 (36)
+#define MICROPY_HW_SPI2_MOSI                (11)
+#define MICROPY_HW_SPI2_MISO                (13)
+#define MICROPY_HW_SPI2_SCK                 (12)
diff --git a/ports/esp32/boards/ESP32_S2_WROVER/sdkconfig.board b/ports/esp32/boards/ESP32_S2_WROVER/sdkconfig.board
new file mode 100644
index 0000000000000..9373a522324db
--- /dev/null
+++ b/ports/esp32/boards/ESP32_S2_WROVER/sdkconfig.board
@@ -0,0 +1,11 @@
+CONFIG_FLASHMODE_QIO=y
+CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
+CONFIG_ESPTOOLPY_FLASHSIZE_DETECT=y
+CONFIG_ESPTOOLPY_AFTER_NORESET=y
+
+CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
+CONFIG_USB_AND_UART=y
+
+# LWIP
+CONFIG_LWIP_LOCAL_HOSTNAME="ESP32-S2-WROVER"
+# end of LWIP

From 6e39f2cc1ed7d4e6a6b1d3132a1b5a73b198ef38 Mon Sep 17 00:00:00 2001
From: Chris Fiege <cfi@pengutronix.de>
Date: Tue, 14 Sep 2021 11:50:53 +0200
Subject: [PATCH 1299/3533] stm32/boards: Add OLIMEX H407 board definition.

This change adds the OLIMEX H407 support to the STM32 port.  The H407
(https://www.olimex.com/Products/ARM/ST/STM32-H407/) is simliar to the
already existing E407
(https://www.olimex.com/Products/ARM/ST/STM32-E407) but does not support
Ethernet and has a full-size USB-A port instead of a Mini-USB socket.

Both boards use the STM32F407ZGT6 CPU.

This port is basically a copy of the E407 but with changed pinmux:
* Removed Ethernet pin definition
* Removed UART1 (pins are used for other functions)
* Removed UART3 flow control pins (pins are used for other functions)
* Removed SD-Card detect pin (since it is not connected on the H407)

A REPL on UART3 is connected to the U3BOOT-header, a 3-pin header with RX,
TX and GND that is intended for the serial terminal.

Tested:
* Micro-SD Card is detected when inserted on RESET
* REPL on UART3 works
* Serial port on the mini USB socket

Signed-off-by: Chris Fiege <cfi@pengutronix.de>
---
 ports/stm32/boards/OLIMEX_H407/README.md      | 18 ++++
 .../stm32/boards/OLIMEX_H407/mpconfigboard.h  | 81 +++++++++++++++++
 .../stm32/boards/OLIMEX_H407/mpconfigboard.mk |  6 ++
 ports/stm32/boards/OLIMEX_H407/pins.csv       | 89 +++++++++++++++++++
 .../boards/OLIMEX_H407/stm32f4xx_hal_conf.h   | 19 ++++
 5 files changed, 213 insertions(+)
 create mode 100644 ports/stm32/boards/OLIMEX_H407/README.md
 create mode 100644 ports/stm32/boards/OLIMEX_H407/mpconfigboard.h
 create mode 100644 ports/stm32/boards/OLIMEX_H407/mpconfigboard.mk
 create mode 100644 ports/stm32/boards/OLIMEX_H407/pins.csv
 create mode 100644 ports/stm32/boards/OLIMEX_H407/stm32f4xx_hal_conf.h

diff --git a/ports/stm32/boards/OLIMEX_H407/README.md b/ports/stm32/boards/OLIMEX_H407/README.md
new file mode 100644
index 0000000000000..458e288e7a1d4
--- /dev/null
+++ b/ports/stm32/boards/OLIMEX_H407/README.md
@@ -0,0 +1,18 @@
+OLIMEX H407 board
+=================
+
+This board definition supports the OLIMEX H407 board:
+https://www.olimex.com/Products/ARM/ST/STM32-H407/
+
+A REPL is available at the U3BOOT connector with 115200 baud and on the
+micro USB socket.
+
+What works
+----------
+
+* REPL
+* UART
+* SD-Card
+* Timer
+* GPIOs
+* USB device on the mini USB socket
diff --git a/ports/stm32/boards/OLIMEX_H407/mpconfigboard.h b/ports/stm32/boards/OLIMEX_H407/mpconfigboard.h
new file mode 100644
index 0000000000000..813fffeac34b3
--- /dev/null
+++ b/ports/stm32/boards/OLIMEX_H407/mpconfigboard.h
@@ -0,0 +1,81 @@
+#define MICROPY_HW_BOARD_NAME       "OLIMEX STM32-H407"
+#define MICROPY_HW_MCU_NAME         "STM32F407"
+
+#define MICROPY_HW_HAS_SWITCH       (1)
+#define MICROPY_HW_HAS_FLASH        (1)
+#define MICROPY_HW_ENABLE_RNG       (1)
+#define MICROPY_HW_ENABLE_RTC       (1)
+#define MICROPY_HW_ENABLE_DAC       (1)
+#define MICROPY_HW_ENABLE_USB       (1)
+#define MICROPY_HW_ENABLE_SDCARD    (1)
+
+// HSE is 12MHz
+#define MICROPY_HW_CLK_PLLM (12)
+#define MICROPY_HW_CLK_PLLN (336)
+#define MICROPY_HW_CLK_PLLP (RCC_PLLP_DIV2)
+#define MICROPY_HW_CLK_PLLQ (7)
+
+// UART config
+
+#define MICROPY_HW_UART2_TX     (pin_A2)
+#define MICROPY_HW_UART2_RX     (pin_A3)
+
+#define MICROPY_HW_UART3_TX     (pin_B10)
+#define MICROPY_HW_UART3_RX     (pin_B11)
+
+#define MICROPY_HW_UART3_RTS    (pin_D12)
+#define MICROPY_HW_UART3_CTS    (pin_D11)
+
+#if MICROPY_HW_HAS_SWITCH == 0
+// NOTE: A0 also connects to the user switch. To use UART4 you should
+//       set MICROPY_HW_HAS_SWITCH to 0, and also remove SB20 (on the back
+//       of the board near the USER switch).
+#define MICROPY_HW_UART4_TX     (pin_A0)
+#define MICROPY_HW_UART4_RX     (pin_A1)
+#endif
+
+#define MICROPY_HW_UART6_TX     (pin_C6)
+#define MICROPY_HW_UART6_RX     (pin_C7)
+
+// REPL mapping
+#define MICROPY_HW_UART_REPL PYB_UART_3
+#define MICROPY_HW_UART_REPL_BAUD 115200
+
+// I2C buses
+#define MICROPY_HW_I2C1_SCL (pin_B8)
+#define MICROPY_HW_I2C1_SDA (pin_B9)
+#define MICROPY_HW_I2C2_SCL (pin_B10)
+#define MICROPY_HW_I2C2_SDA (pin_B11)
+
+// SPI buses
+#define MICROPY_HW_SPI1_NSS  (pin_A4)
+#define MICROPY_HW_SPI1_SCK  (pin_A5)
+#define MICROPY_HW_SPI1_MISO (pin_A6)
+#define MICROPY_HW_SPI1_MOSI (pin_A7)
+#define MICROPY_HW_SPI2_NSS  (pin_B12)
+#define MICROPY_HW_SPI2_SCK  (pin_B13)
+#define MICROPY_HW_SPI2_MISO (pin_B14)
+#define MICROPY_HW_SPI2_MOSI (pin_B15)
+
+// CAN buses
+#define MICROPY_HW_CAN1_TX (pin_B9)
+#define MICROPY_HW_CAN1_RX (pin_B8)
+#define MICROPY_HW_CAN2_TX (pin_B13)
+#define MICROPY_HW_CAN2_RX (pin_B12)
+
+// USRSW is pulled low. Pressing the button makes the input go high.
+#define MICROPY_HW_USRSW_PIN        (pin_A0)
+#define MICROPY_HW_USRSW_PULL       (GPIO_NOPULL)
+#define MICROPY_HW_USRSW_EXTI_MODE  (GPIO_MODE_IT_RISING)
+#define MICROPY_HW_USRSW_PRESSED    (1)
+
+// LEDs
+#define MICROPY_HW_LED1             (pin_C13)
+#define MICROPY_HW_LED_ON(pin)      (mp_hal_pin_low(pin))
+#define MICROPY_HW_LED_OFF(pin)     (mp_hal_pin_high(pin))
+
+// USB config
+#define MICROPY_HW_USB_HS              (1)
+#define MICROPY_HW_USB_HS_IN_FS        (1)
+#define MICROPY_HW_USB_VBUS_DETECT_PIN (pin_B13)
+#define MICROPY_HW_USB_OTG_ID_PIN      (pin_B12)
diff --git a/ports/stm32/boards/OLIMEX_H407/mpconfigboard.mk b/ports/stm32/boards/OLIMEX_H407/mpconfigboard.mk
new file mode 100644
index 0000000000000..b154dcfbacdc4
--- /dev/null
+++ b/ports/stm32/boards/OLIMEX_H407/mpconfigboard.mk
@@ -0,0 +1,6 @@
+MCU_SERIES = f4
+CMSIS_MCU = STM32F407xx
+AF_FILE = boards/stm32f405_af.csv
+LD_FILES = boards/stm32f405.ld boards/common_ifs.ld
+TEXT0_ADDR = 0x08000000
+TEXT1_ADDR = 0x08020000
diff --git a/ports/stm32/boards/OLIMEX_H407/pins.csv b/ports/stm32/boards/OLIMEX_H407/pins.csv
new file mode 100644
index 0000000000000..cb0a49916e558
--- /dev/null
+++ b/ports/stm32/boards/OLIMEX_H407/pins.csv
@@ -0,0 +1,89 @@
+PC0,PC0
+PC1,PC1
+PC2,PC2
+PC3,PC3
+PA0,PA0
+PA1,PA1
+PA2,PA2
+PA3,PA3
+PA4,PA4
+PA5,PA5
+PA6,PA6
+PA7,PA7
+PC4,PC4
+PC5,PC5
+PB0,PB0
+PB1,PB1
+PB2,PB2
+PE7,PE7
+PE8,PE8
+PE9,PE9
+PE10,PE10
+PE11,PE11
+PE12,PE12
+PE13,PE13
+PE14,PE14
+PE15,PE15
+PB10,PB10
+PB11,PB11
+PB12,PB12
+PB13,PB13
+PB14,PB14
+PB15,PB15
+PD8,PD8
+PD9,PD9
+PD10,PD10
+PD11,PD11
+PD12,PD12
+PD13,PD13
+PD14,PD14
+PD15,PD15
+PC6,PC6
+PC7,PC7
+PC8,PC8
+PC9,PC9
+PA8,PA8
+PA9,PA9
+PA10,PA10
+PA13,PA13
+PA14,PA14
+PA15,PA15
+PC10,PC10
+PC11,PC11
+PC12,PC12
+PD0,PD0
+PD1,PD1
+PD2,PD2
+PD3,PD3
+PD4,PD4
+PD5,PD5
+PD6,PD6
+PD7,PD7
+PB4,PB4
+PB5,PB5
+PB6,PB6
+PB7,PB7
+PB8,PB8
+PB9,PB9
+PE0,PE0
+PE1,PE1
+PE2,PE2
+PE3,PE3
+PE4,PE4
+PE5,PE5
+PE6,PE6
+LED_GREEN,PC13
+PC14,PC14
+PC15,PC15
+PH0,PH0
+PH1,PH1
+PD12,PD12
+PD13,PD13
+PD14,PD14
+PD15,PD15
+PA0,PA0
+USB_DM,PA11
+USB_DP,PA12
+PG11,PG11
+PG13,PG13
+PG14,PG14
diff --git a/ports/stm32/boards/OLIMEX_H407/stm32f4xx_hal_conf.h b/ports/stm32/boards/OLIMEX_H407/stm32f4xx_hal_conf.h
new file mode 100644
index 0000000000000..9719157e55cdf
--- /dev/null
+++ b/ports/stm32/boards/OLIMEX_H407/stm32f4xx_hal_conf.h
@@ -0,0 +1,19 @@
+/* This file is part of the MicroPython project, http://micropython.org/
+ * The MIT License (MIT)
+ * Copyright (c) 2019 Damien P. George
+ */
+#ifndef MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H
+#define MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H
+
+#include "boards/stm32f4xx_hal_conf_base.h"
+
+// Oscillator values in Hz
+#define HSE_VALUE (12000000)
+#define LSE_VALUE (32768)
+#define EXTERNAL_CLOCK_VALUE (12288000)
+
+// Oscillator timeouts in ms
+#define HSE_STARTUP_TIMEOUT (100)
+#define LSE_STARTUP_TIMEOUT (5000)
+
+#endif // MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H

From 80f2c794e60f59179cf530d3add53a4acbe75e55 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Thu, 22 Jul 2021 14:39:44 +0200
Subject: [PATCH 1300/3533] extmod/mpbthci.h: Add mp_bluetooth_hci_uart_any
 prototype.

This allows drivers to use mpbthciport functions to read/write/poll UART.
---
 extmod/mpbthci.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/extmod/mpbthci.h b/extmod/mpbthci.h
index acb5b832bab11..699723803357b 100644
--- a/extmod/mpbthci.h
+++ b/extmod/mpbthci.h
@@ -45,6 +45,7 @@ int mp_bluetooth_hci_controller_wakeup(void);
 int mp_bluetooth_hci_uart_init(uint32_t port, uint32_t baudrate);
 int mp_bluetooth_hci_uart_deinit(void);
 int mp_bluetooth_hci_uart_set_baudrate(uint32_t baudrate);
+int mp_bluetooth_hci_uart_any(void);
 int mp_bluetooth_hci_uart_readchar(void);
 int mp_bluetooth_hci_uart_write(const uint8_t *buf, size_t len);
 

From 8064c3bf9c99d3aa63f560fab83509f39c999b51 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Thu, 22 Jul 2021 14:41:31 +0200
Subject: [PATCH 1301/3533] extmod/nimble: Add nimble CMake fragment file.

---
 extmod/nimble/nimble.cmake | 80 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 80 insertions(+)
 create mode 100644 extmod/nimble/nimble.cmake

diff --git a/extmod/nimble/nimble.cmake b/extmod/nimble/nimble.cmake
new file mode 100644
index 0000000000000..3dff1d7d0579b
--- /dev/null
+++ b/extmod/nimble/nimble.cmake
@@ -0,0 +1,80 @@
+set(NIMBLE_LIB_DIR "${MICROPY_DIR}/lib/mynewt-nimble")
+set(NIMBLE_EXTMOD_DIR "${MICROPY_DIR}/extmod/nimble")
+
+add_library(micropy_extmod_nimble INTERFACE)
+
+target_include_directories(micropy_extmod_nimble INTERFACE
+    ${MICROPY_DIR}/
+    ${MICROPY_PORT_DIR}/
+    ${NIMBLE_EXTMOD_DIR}/
+    ${NIMBLE_LIB_DIR}/
+    ${NIMBLE_LIB_DIR}/ext/tinycrypt/include
+    ${NIMBLE_LIB_DIR}/nimble/host/include
+    ${NIMBLE_LIB_DIR}/nimble/host/services/gap/include
+    ${NIMBLE_LIB_DIR}/nimble/host/services/gatt/include
+    ${NIMBLE_LIB_DIR}/nimble/host/store/ram/include
+    ${NIMBLE_LIB_DIR}/nimble/host/util/include
+    ${NIMBLE_LIB_DIR}/nimble/include
+    ${NIMBLE_LIB_DIR}/nimble/transport/uart/include
+    ${NIMBLE_LIB_DIR}/porting/nimble/include
+)
+
+target_sources(micropy_extmod_nimble INTERFACE
+    ${NIMBLE_EXTMOD_DIR}/hal/hal_uart.c
+    ${NIMBLE_EXTMOD_DIR}/nimble/nimble_npl_os.c
+    ${NIMBLE_LIB_DIR}/ext/tinycrypt/src/aes_encrypt.c
+    ${NIMBLE_LIB_DIR}/ext/tinycrypt/src/cmac_mode.c
+    ${NIMBLE_LIB_DIR}/ext/tinycrypt/src/ecc.c
+    ${NIMBLE_LIB_DIR}/ext/tinycrypt/src/ecc_dh.c
+    ${NIMBLE_LIB_DIR}/ext/tinycrypt/src/utils.c
+    ${NIMBLE_LIB_DIR}/nimble/host/services/gap/src/ble_svc_gap.c
+    ${NIMBLE_LIB_DIR}/nimble/host/services/gatt/src/ble_svc_gatt.c
+    ${NIMBLE_LIB_DIR}/nimble/host/src/ble_att.c
+    ${NIMBLE_LIB_DIR}/nimble/host/src/ble_att_clt.c
+    ${NIMBLE_LIB_DIR}/nimble/host/src/ble_att_cmd.c
+    ${NIMBLE_LIB_DIR}/nimble/host/src/ble_att_svr.c
+    ${NIMBLE_LIB_DIR}/nimble/host/src/ble_eddystone.c
+    ${NIMBLE_LIB_DIR}/nimble/host/src/ble_gap.c
+    ${NIMBLE_LIB_DIR}/nimble/host/src/ble_gattc.c
+    ${NIMBLE_LIB_DIR}/nimble/host/src/ble_gatts.c
+    ${NIMBLE_LIB_DIR}/nimble/host/src/ble_hs.c
+    ${NIMBLE_LIB_DIR}/nimble/host/src/ble_hs_adv.c
+    ${NIMBLE_LIB_DIR}/nimble/host/src/ble_hs_atomic.c
+    ${NIMBLE_LIB_DIR}/nimble/host/src/ble_hs_cfg.c
+    ${NIMBLE_LIB_DIR}/nimble/host/src/ble_hs_conn.c
+    ${NIMBLE_LIB_DIR}/nimble/host/src/ble_hs_flow.c
+    ${NIMBLE_LIB_DIR}/nimble/host/src/ble_hs_hci.c
+    ${NIMBLE_LIB_DIR}/nimble/host/src/ble_hs_hci_cmd.c
+    ${NIMBLE_LIB_DIR}/nimble/host/src/ble_hs_hci_evt.c
+    ${NIMBLE_LIB_DIR}/nimble/host/src/ble_hs_hci_util.c
+    ${NIMBLE_LIB_DIR}/nimble/host/src/ble_hs_id.c
+    ${NIMBLE_LIB_DIR}/nimble/host/src/ble_hs_log.c
+    ${NIMBLE_LIB_DIR}/nimble/host/src/ble_hs_mbuf.c
+    ${NIMBLE_LIB_DIR}/nimble/host/src/ble_hs_misc.c
+    ${NIMBLE_LIB_DIR}/nimble/host/src/ble_hs_mqueue.c
+    ${NIMBLE_LIB_DIR}/nimble/host/src/ble_hs_pvcy.c
+    ${NIMBLE_LIB_DIR}/nimble/host/src/ble_hs_startup.c
+    ${NIMBLE_LIB_DIR}/nimble/host/src/ble_hs_stop.c
+    ${NIMBLE_LIB_DIR}/nimble/host/src/ble_ibeacon.c
+    ${NIMBLE_LIB_DIR}/nimble/host/src/ble_l2cap.c
+    ${NIMBLE_LIB_DIR}/nimble/host/src/ble_l2cap_coc.c
+    ${NIMBLE_LIB_DIR}/nimble/host/src/ble_l2cap_sig.c
+    ${NIMBLE_LIB_DIR}/nimble/host/src/ble_l2cap_sig_cmd.c
+    ${NIMBLE_LIB_DIR}/nimble/host/src/ble_monitor.c
+    ${NIMBLE_LIB_DIR}/nimble/host/src/ble_sm.c
+    ${NIMBLE_LIB_DIR}/nimble/host/src/ble_sm_alg.c
+    ${NIMBLE_LIB_DIR}/nimble/host/src/ble_sm_cmd.c
+    ${NIMBLE_LIB_DIR}/nimble/host/src/ble_sm_lgcy.c
+    ${NIMBLE_LIB_DIR}/nimble/host/src/ble_sm_sc.c
+    ${NIMBLE_LIB_DIR}/nimble/host/src/ble_store.c
+    ${NIMBLE_LIB_DIR}/nimble/host/src/ble_store_util.c
+    ${NIMBLE_LIB_DIR}/nimble/host/src/ble_uuid.c
+    ${NIMBLE_LIB_DIR}/nimble/host/util/src/addr.c
+    ${NIMBLE_LIB_DIR}/nimble/transport/uart/src/ble_hci_uart.c
+    ${NIMBLE_LIB_DIR}/porting/nimble/src/endian.c
+    ${NIMBLE_LIB_DIR}/porting/nimble/src/mem.c
+    ${NIMBLE_LIB_DIR}/porting/nimble/src/nimble_port.c
+    ${NIMBLE_LIB_DIR}/porting/nimble/src/os_mbuf.c
+    ${NIMBLE_LIB_DIR}/porting/nimble/src/os_mempool.c
+    ${NIMBLE_LIB_DIR}/porting/nimble/src/os_msys_init.c
+)

From c973cfd2f33175cacefd0608853d0db1d7fa813c Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Thu, 22 Jul 2021 14:42:52 +0200
Subject: [PATCH 1302/3533] rp2: Add support for bluetooth module using NimBLE.

---
 ports/rp2/CMakeLists.txt |  26 +++++
 ports/rp2/main.c         |   9 ++
 ports/rp2/mpbthciport.c  | 200 +++++++++++++++++++++++++++++++++++++++
 ports/rp2/mpbthciport.h  |  42 ++++++++
 ports/rp2/mpconfigport.h |  16 ++++
 ports/rp2/mpnimbleport.c |  80 ++++++++++++++++
 ports/rp2/mpnimbleport.h |  29 ++++++
 7 files changed, 402 insertions(+)
 create mode 100644 ports/rp2/mpbthciport.c
 create mode 100644 ports/rp2/mpbthciport.h
 create mode 100644 ports/rp2/mpnimbleport.c
 create mode 100644 ports/rp2/mpnimbleport.h

diff --git a/ports/rp2/CMakeLists.txt b/ports/rp2/CMakeLists.txt
index 2e7347fd53055..40b10434b0146 100644
--- a/ports/rp2/CMakeLists.txt
+++ b/ports/rp2/CMakeLists.txt
@@ -159,6 +159,32 @@ set(PICO_SDK_COMPONENTS
     tinyusb_device
 )
 
+if(MICROPY_PY_BLUETOOTH)
+    list(APPEND MICROPY_SOURCE_PORT mpbthciport.c)
+    target_compile_definitions(${MICROPY_TARGET} PRIVATE
+        MICROPY_PY_BLUETOOTH=1
+        MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE=1
+        MICROPY_PY_BLUETOOTH_ENABLE_PAIRING_BONDING=1
+        MICROPY_PY_BLUETOOTH_ENABLE_L2CAP_CHANNELS=1
+    )
+endif()
+
+if(MICROPY_BLUETOOTH_NIMBLE)
+    list(APPEND MICROPY_SOURCE_PORT mpnimbleport.c)
+    target_compile_definitions(${MICROPY_TARGET} PRIVATE
+        MICROPY_BLUETOOTH_NIMBLE=1
+        MICROPY_BLUETOOTH_NIMBLE_BINDINGS_ONLY=0
+    )
+    target_compile_options(${MICROPY_TARGET} PRIVATE
+    # TODO: This flag is currently needed to make nimble build.
+    -Wno-unused-but-set-variable
+    )
+    include(${MICROPY_DIR}/extmod/nimble/nimble.cmake)
+    target_link_libraries(${MICROPY_TARGET} micropy_extmod_nimble)
+    get_target_property(NIMBLE_INCLUDE micropy_extmod_nimble INTERFACE_INCLUDE_DIRECTORIES)
+    list(APPEND MICROPY_INC_CORE ${NIMBLE_INCLUDE})
+endif()
+
 # Define mpy-cross flags and frozen manifest
 set(MICROPY_CROSS_FLAGS -march=armv7m)
 if (NOT MICROPY_FROZEN_MANIFEST)
diff --git a/ports/rp2/main.c b/ports/rp2/main.c
index d0b89c8d6dc75..807de18e638c5 100644
--- a/ports/rp2/main.c
+++ b/ports/rp2/main.c
@@ -32,6 +32,7 @@
 #include "py/mperrno.h"
 #include "py/mphal.h"
 #include "py/stackctrl.h"
+#include "extmod/modbluetooth.h"
 #include "shared/readline/readline.h"
 #include "shared/runtime/gchelper.h"
 #include "shared/runtime/pyexec.h"
@@ -39,6 +40,7 @@
 #include "uart.h"
 #include "modmachine.h"
 #include "modrp2.h"
+#include "mpbthciport.h"
 #include "genhdr/mpversion.h"
 
 #include "pico/stdlib.h"
@@ -107,6 +109,10 @@ int main(int argc, char **argv) {
         machine_pin_init();
         rp2_pio_init();
 
+        #if MICROPY_PY_BLUETOOTH
+        mp_bluetooth_hci_init();
+        #endif
+
         // Execute _boot.py to set up the filesystem.
         pyexec_frozen_module("_boot.py");
 
@@ -137,6 +143,9 @@ int main(int argc, char **argv) {
     soft_reset_exit:
         mp_printf(MP_PYTHON_PRINTER, "MPY: soft reboot\n");
         rp2_pio_deinit();
+        #if MICROPY_PY_BLUETOOTH
+        mp_bluetooth_deinit();
+        #endif
         machine_pin_deinit();
         #if MICROPY_PY_THREAD
         mp_thread_deinit();
diff --git a/ports/rp2/mpbthciport.c b/ports/rp2/mpbthciport.c
new file mode 100644
index 0000000000000..58639fd5b004b
--- /dev/null
+++ b/ports/rp2/mpbthciport.c
@@ -0,0 +1,200 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Ibrahim Abdelkader <iabdalkader@openmv.io>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "py/runtime.h"
+#include "py/stream.h"
+#include "py/mphal.h"
+#include "extmod/modbluetooth.h"
+#include "extmod/mpbthci.h"
+#include "modmachine.h"
+#include "mpbthciport.h"
+#include "pico/stdlib.h"
+
+#if MICROPY_PY_BLUETOOTH
+
+#define debug_printf(...) // mp_printf(&mp_plat_print, "mpbthciport.c: " __VA_ARGS__)
+#define error_printf(...) mp_printf(&mp_plat_print, "mpbthciport.c: " __VA_ARGS__)
+
+// Poll timer ID.
+static alarm_id_t poll_timer_id = 0;
+
+uint8_t mp_bluetooth_hci_cmd_buf[4 + 256];
+
+// Prevent double-enqueuing of the scheduled task.
+STATIC volatile bool events_task_is_scheduled;
+
+void mp_bluetooth_hci_init(void) {
+    events_task_is_scheduled = false;
+}
+
+STATIC void mp_bluetooth_hci_start_polling(void) {
+    events_task_is_scheduled = false;
+    mp_bluetooth_hci_poll_now();
+}
+
+static int64_t mp_bluetooth_hci_timer_callback(alarm_id_t id, void *user_data) {
+    poll_timer_id = 0;
+    mp_bluetooth_hci_poll_now();
+    return 0;
+}
+
+void mp_bluetooth_hci_poll_in_ms(uint32_t ms) {
+    poll_timer_id = add_alarm_in_ms(ms, mp_bluetooth_hci_timer_callback, NULL, true);
+}
+
+// For synchronous mode, we run all BLE stack code inside a scheduled task.
+// This task is scheduled periodically via a timer, or immediately after UART RX IRQ.
+STATIC mp_obj_t run_events_scheduled_task(mp_obj_t none_in) {
+    (void)none_in;
+    events_task_is_scheduled = false;
+    // This will process all buffered HCI UART data, and run any callouts or events.
+    mp_bluetooth_hci_poll();
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(run_events_scheduled_task_obj, run_events_scheduled_task);
+
+// Called periodically (systick) or directly (e.g. UART RX IRQ) in order to
+// request that processing happens ASAP in the scheduler.
+void mp_bluetooth_hci_poll_now(void) {
+    if (!events_task_is_scheduled) {
+        events_task_is_scheduled = mp_sched_schedule(MP_OBJ_FROM_PTR(&run_events_scheduled_task_obj), mp_const_none);
+        if (!events_task_is_scheduled) {
+            // The schedule queue is full, set callback to try again soon.
+            mp_bluetooth_hci_poll_in_ms(5);
+        }
+    }
+}
+
+mp_obj_t mp_bthci_uart;
+
+int mp_bluetooth_hci_uart_init(uint32_t port, uint32_t baudrate) {
+    debug_printf("mp_bluetooth_hci_uart_init\n");
+
+    mp_obj_t args[] = {
+        MP_OBJ_NEW_SMALL_INT(MICROPY_HW_BLE_UART_ID),
+        MP_OBJ_NEW_SMALL_INT(MICROPY_HW_BLE_UART_BAUDRATE),
+        MP_OBJ_NEW_QSTR(MP_QSTR_flow), MP_OBJ_NEW_SMALL_INT((1 | 2)),
+        MP_OBJ_NEW_QSTR(MP_QSTR_timeout), MP_OBJ_NEW_SMALL_INT(1000),
+    };
+
+    mp_bthci_uart = machine_uart_type.make_new((mp_obj_t)&machine_uart_type, 2, 2, args);
+    MP_STATE_PORT(mp_bthci_uart) = mp_bthci_uart;
+
+    // Start the HCI polling to process any initial events/packets.
+    mp_bluetooth_hci_start_polling();
+    return 0;
+}
+
+int mp_bluetooth_hci_uart_deinit(void) {
+    debug_printf("mp_bluetooth_hci_uart_deinit\n");
+
+    // If a poll callback is set cancel it now.
+    if (poll_timer_id > 0) {
+        cancel_alarm(poll_timer_id);
+    }
+    poll_timer_id = 0;
+    return 0;
+}
+
+int mp_bluetooth_hci_uart_set_baudrate(uint32_t baudrate) {
+    debug_printf("mp_bluetooth_hci_uart_set_baudrate(%lu)\n", baudrate);
+    return 0;
+}
+
+int mp_bluetooth_hci_uart_any(void) {
+    int errcode = 0;
+    const mp_stream_p_t *proto = (mp_stream_p_t *)machine_uart_type.protocol;
+
+    mp_uint_t ret = proto->ioctl(mp_bthci_uart, MP_STREAM_POLL, MP_STREAM_POLL_RD, &errcode);
+    if (errcode != 0) {
+        error_printf("Uart ioctl failed to poll UART %d\n", errcode);
+        return -1;
+    }
+    return ret & MP_STREAM_POLL_RD;
+}
+
+int mp_bluetooth_hci_uart_write(const uint8_t *buf, size_t len) {
+    debug_printf("mp_bluetooth_hci_uart_write\n");
+
+    int errcode = 0;
+    const mp_stream_p_t *proto = (mp_stream_p_t *)machine_uart_type.protocol;
+
+    mp_bluetooth_hci_controller_wakeup();
+
+    if (proto->write(mp_bthci_uart, (void *)buf, len, &errcode) < 0) {
+        error_printf("mp_bluetooth_hci_uart_write: failed to write to UART %d\n", errcode);
+    }
+    return 0;
+}
+
+// This function expects the controller to be in the wake state via a previous call
+// to mp_bluetooth_hci_controller_woken.
+int mp_bluetooth_hci_uart_readchar(void) {
+    debug_printf("mp_bluetooth_hci_uart_readchar\n");
+    if (mp_bluetooth_hci_uart_any()) {
+        int errcode = 0;
+        uint8_t buf = 0;
+        const mp_stream_p_t *proto = (mp_stream_p_t *)machine_uart_type.protocol;
+        if (proto->read(mp_bthci_uart, (void *)&buf, 1, &errcode) < 0) {
+            error_printf("mp_bluetooth_hci_uart_readchar: failed to read UART %d\n", errcode);
+            return -1;
+        }
+        return buf;
+    } else {
+        debug_printf("mp_bluetooth_hci_uart_readchar: not ready\n");
+        return -1;
+    }
+}
+
+// Default (weak) implementation of the HCI controller interface.
+// A driver (e.g. cywbt43.c) can override these for controller-specific
+// functionality (i.e. power management).
+MP_WEAK int mp_bluetooth_hci_controller_init(void) {
+    debug_printf("mp_bluetooth_hci_controller_init (default)\n");
+    return 0;
+}
+
+MP_WEAK int mp_bluetooth_hci_controller_deinit(void) {
+    debug_printf("mp_bluetooth_hci_controller_deinit (default)\n");
+    return 0;
+}
+
+MP_WEAK int mp_bluetooth_hci_controller_sleep_maybe(void) {
+    debug_printf("mp_bluetooth_hci_controller_sleep_maybe (default)\n");
+    return 0;
+}
+
+MP_WEAK bool mp_bluetooth_hci_controller_woken(void) {
+    debug_printf("mp_bluetooth_hci_controller_woken (default)\n");
+    return true;
+}
+
+MP_WEAK int mp_bluetooth_hci_controller_wakeup(void) {
+    debug_printf("mp_bluetooth_hci_controller_wakeup (default)\n");
+    return 0;
+}
+
+#endif // MICROPY_PY_BLUETOOTH
diff --git a/ports/rp2/mpbthciport.h b/ports/rp2/mpbthciport.h
new file mode 100644
index 0000000000000..ac5263aa11a8f
--- /dev/null
+++ b/ports/rp2/mpbthciport.h
@@ -0,0 +1,42 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+#ifndef MICROPY_INCLUDED_RP2_MPBTHCIPORT_H
+#define MICROPY_INCLUDED_RP2_MPBTHCIPORT_H
+
+// Initialise the HCI subsystem (should be called once, early on).
+void mp_bluetooth_hci_init(void);
+
+// Poll the HCI now, or after a certain timeout.
+void mp_bluetooth_hci_poll_now(void);
+void mp_bluetooth_hci_poll_in_ms(uint32_t ms);
+
+// Must be provided by the stack bindings (e.g. mpnimbleport.c or mpbtstackport.c).
+// Request new data from the uart and pass to the stack, and run pending events/callouts.
+// This is a low-level function and should not be called directly, use
+// mp_bluetooth_hci_poll_now/mp_bluetooth_hci_poll_in_ms instead.
+void mp_bluetooth_hci_poll(void);
+
+#endif // MICROPY_INCLUDED_RP2_MPBTHCIPORT_H
diff --git a/ports/rp2/mpconfigport.h b/ports/rp2/mpconfigport.h
index bb2f505b6e9d2..237c1a5d83b56 100644
--- a/ports/rp2/mpconfigport.h
+++ b/ports/rp2/mpconfigport.h
@@ -171,6 +171,20 @@ extern const struct _mp_obj_module_t mp_module_rp2;
 extern const struct _mp_obj_module_t mp_module_uos;
 extern const struct _mp_obj_module_t mp_module_utime;
 
+#if MICROPY_PY_BLUETOOTH
+#define MICROPY_PORT_ROOT_POINTER_BLUETOOTH struct _machine_uart_obj_t *mp_bthci_uart;
+#else
+#define MICROPY_PORT_ROOT_POINTER_BLUETOOTH
+#endif
+
+#if MICROPY_BLUETOOTH_NIMBLE
+struct _mp_bluetooth_nimble_root_pointers_t;
+struct _mp_bluetooth_nimble_malloc_t;
+#define MICROPY_PORT_ROOT_POINTER_BLUETOOTH_NIMBLE struct _mp_bluetooth_nimble_malloc_t *bluetooth_nimble_memory; struct _mp_bluetooth_nimble_root_pointers_t *bluetooth_nimble_root_pointers;
+#else
+#define MICROPY_PORT_ROOT_POINTER_BLUETOOTH_NIMBLE
+#endif
+
 #define MICROPY_PORT_BUILTIN_MODULES \
     { MP_OBJ_NEW_QSTR(MP_QSTR_machine), (mp_obj_t)&mp_module_machine }, \
     { MP_OBJ_NEW_QSTR(MP_QSTR__onewire), (mp_obj_t)&mp_module_onewire }, \
@@ -190,6 +204,8 @@ extern const struct _mp_obj_module_t mp_module_utime;
     void *rp2_uart_rx_buffer[2]; \
     void *rp2_uart_tx_buffer[2]; \
     MICROPY_BOARD_ROOT_POINTERS \
+    MICROPY_PORT_ROOT_POINTER_BLUETOOTH \
+        MICROPY_PORT_ROOT_POINTER_BLUETOOTH_NIMBLE \
 
 #define MP_STATE_PORT MP_STATE_VM
 
diff --git a/ports/rp2/mpnimbleport.c b/ports/rp2/mpnimbleport.c
new file mode 100644
index 0000000000000..74e9ecb02602a
--- /dev/null
+++ b/ports/rp2/mpnimbleport.c
@@ -0,0 +1,80 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2019 Jim Mussared
+ * Copyright (c) 2020 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "py/runtime.h"
+#include "py/mperrno.h"
+#include "py/mphal.h"
+#include "py/stream.h"
+
+#if MICROPY_PY_BLUETOOTH && MICROPY_BLUETOOTH_NIMBLE
+
+#define DEBUG_printf(...) // printf("mpnimbleport.c: " __VA_ARGS__)
+
+#include "host/ble_hs.h"
+#include "nimble/nimble_npl.h"
+
+#include "extmod/modbluetooth.h"
+#include "extmod/mpbthci.h"
+#include "extmod/nimble/modbluetooth_nimble.h"
+#include "extmod/nimble/hal/hal_uart.h"
+#include "mpbthciport.h"
+
+// Get any pending data from the UART and send it to NimBLE's HCI buffers.
+// Any further processing by NimBLE will be run via its event queue.
+void mp_bluetooth_hci_poll(void) {
+    if (mp_bluetooth_nimble_ble_state >= MP_BLUETOOTH_NIMBLE_BLE_STATE_WAITING_FOR_SYNC) {
+        // DEBUG_printf("mp_bluetooth_hci_poll_uart %d\n", mp_bluetooth_nimble_ble_state);
+
+        // Run any timers.
+        mp_bluetooth_nimble_os_callout_process();
+
+        // Process incoming UART data, and run events as they are generated.
+        mp_bluetooth_nimble_hci_uart_process(true);
+
+        // Run any remaining events (e.g. if there was no UART data).
+        mp_bluetooth_nimble_os_eventq_run_all();
+    }
+
+    if (mp_bluetooth_nimble_ble_state != MP_BLUETOOTH_NIMBLE_BLE_STATE_OFF) {
+        // Call this function again in 128ms to check for new events.
+        // TODO: improve this by only calling back when needed.
+        mp_bluetooth_hci_poll_in_ms(128);
+    }
+}
+
+// --- Port-specific helpers for the generic NimBLE bindings. -----------------
+
+void mp_bluetooth_nimble_hci_uart_wfi(void) {
+    #if defined(__WFI)
+    __WFI();
+    #endif
+    // This is called while NimBLE is waiting in ble_npl_sem_pend, i.e. waiting for an HCI ACK.
+    // Do not need to run events here (it must not invoke Python code), only processing incoming HCI data.
+    mp_bluetooth_nimble_hci_uart_process(false);
+}
+
+#endif // MICROPY_PY_BLUETOOTH && MICROPY_BLUETOOTH_NIMBLE
diff --git a/ports/rp2/mpnimbleport.h b/ports/rp2/mpnimbleport.h
new file mode 100644
index 0000000000000..64debea33a828
--- /dev/null
+++ b/ports/rp2/mpnimbleport.h
@@ -0,0 +1,29 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 Jim Mussared
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+#ifndef MICROPY_INCLUDED_RP2_MPNIMBLEPORT_H
+#define MICROPY_INCLUDED_RP2_MPNIMBLEPORT_H
+
+#endif // MICROPY_INCLUDED_RP2_MPNIMBLEPORT_H

From 38f8e852e04013e4616097320bf9cf75051a1b6b Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Sun, 15 Aug 2021 18:30:18 +0200
Subject: [PATCH 1303/3533] rp2: Add framework for networking.

MICROPY_PY_NETWORK and MICROPY_PY_USOCKET need to be enabled by a board to
get networking.  No NICs have yet been defined.
---
 extmod/extmod.cmake      |  2 ++
 extmod/modusocket.c      |  4 ++--
 ports/rp2/CMakeLists.txt |  1 +
 ports/rp2/main.c         |  7 +++++++
 ports/rp2/mpconfigport.h | 20 ++++++++++++++++++++
 5 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/extmod/extmod.cmake b/extmod/extmod.cmake
index 69ec39759b815..3353112ba69a4 100644
--- a/extmod/extmod.cmake
+++ b/extmod/extmod.cmake
@@ -16,6 +16,7 @@ set(MICROPY_SOURCE_EXTMOD
     ${MICROPY_EXTMOD_DIR}/modbluetooth.c
     ${MICROPY_EXTMOD_DIR}/modbtree.c
     ${MICROPY_EXTMOD_DIR}/modframebuf.c
+    ${MICROPY_EXTMOD_DIR}/modnetwork.c
     ${MICROPY_EXTMOD_DIR}/modonewire.c
     ${MICROPY_EXTMOD_DIR}/moduasyncio.c
     ${MICROPY_EXTMOD_DIR}/modubinascii.c
@@ -27,6 +28,7 @@ set(MICROPY_SOURCE_EXTMOD
     ${MICROPY_EXTMOD_DIR}/modurandom.c
     ${MICROPY_EXTMOD_DIR}/modure.c
     ${MICROPY_EXTMOD_DIR}/moduselect.c
+    ${MICROPY_EXTMOD_DIR}/modusocket.c
     ${MICROPY_EXTMOD_DIR}/modussl_axtls.c
     ${MICROPY_EXTMOD_DIR}/modussl_mbedtls.c
     ${MICROPY_EXTMOD_DIR}/modutimeq.c
diff --git a/extmod/modusocket.c b/extmod/modusocket.c
index e08f8134fdde7..9c2dc6fcadf24 100644
--- a/extmod/modusocket.c
+++ b/extmod/modusocket.c
@@ -35,7 +35,7 @@
 #include "shared/netutils/netutils.h"
 #include "modnetwork.h"
 
-#if MICROPY_PY_USOCKET && !MICROPY_PY_LWIP
+#if MICROPY_PY_NETWORK && MICROPY_PY_USOCKET && !MICROPY_PY_LWIP
 
 /******************************************************************************/
 // socket class
@@ -517,4 +517,4 @@ const mp_obj_module_t mp_module_usocket = {
     .globals = (mp_obj_dict_t *)&mp_module_usocket_globals,
 };
 
-#endif // MICROPY_PY_USOCKET && !MICROPY_PY_LWIP
+#endif // MICROPY_PY_NETWORK && MICROPY_PY_USOCKET && !MICROPY_PY_LWIP
diff --git a/ports/rp2/CMakeLists.txt b/ports/rp2/CMakeLists.txt
index 40b10434b0146..14f4e33ebe070 100644
--- a/ports/rp2/CMakeLists.txt
+++ b/ports/rp2/CMakeLists.txt
@@ -66,6 +66,7 @@ set(MICROPY_SOURCE_LIB
     ${MICROPY_DIR}/lib/littlefs/lfs2_util.c
     ${MICROPY_DIR}/lib/oofatfs/ff.c
     ${MICROPY_DIR}/lib/oofatfs/ffunicode.c
+    ${MICROPY_DIR}/shared/netutils/netutils.c
     ${MICROPY_DIR}/shared/readline/readline.c
     ${MICROPY_DIR}/shared/runtime/gchelper_m0.s
     ${MICROPY_DIR}/shared/runtime/gchelper_native.c
diff --git a/ports/rp2/main.c b/ports/rp2/main.c
index 807de18e638c5..0dac85c49d001 100644
--- a/ports/rp2/main.c
+++ b/ports/rp2/main.c
@@ -33,6 +33,7 @@
 #include "py/mphal.h"
 #include "py/stackctrl.h"
 #include "extmod/modbluetooth.h"
+#include "extmod/modnetwork.h"
 #include "shared/readline/readline.h"
 #include "shared/runtime/gchelper.h"
 #include "shared/runtime/pyexec.h"
@@ -112,6 +113,9 @@ int main(int argc, char **argv) {
         #if MICROPY_PY_BLUETOOTH
         mp_bluetooth_hci_init();
         #endif
+        #if MICROPY_PY_NETWORK
+        mod_network_init();
+        #endif
 
         // Execute _boot.py to set up the filesystem.
         pyexec_frozen_module("_boot.py");
@@ -142,6 +146,9 @@ int main(int argc, char **argv) {
 
     soft_reset_exit:
         mp_printf(MP_PYTHON_PRINTER, "MPY: soft reboot\n");
+        #if MICROPY_PY_NETWORK
+        mod_network_deinit();
+        #endif
         rp2_pio_deinit();
         #if MICROPY_PY_BLUETOOTH
         mp_bluetooth_deinit();
diff --git a/ports/rp2/mpconfigport.h b/ports/rp2/mpconfigport.h
index 237c1a5d83b56..cc979b5c30e93 100644
--- a/ports/rp2/mpconfigport.h
+++ b/ports/rp2/mpconfigport.h
@@ -166,11 +166,26 @@
     { MP_ROM_QSTR(MP_QSTR_open), MP_ROM_PTR(&mp_builtin_open_obj) },
 
 extern const struct _mp_obj_module_t mp_module_machine;
+extern const struct _mp_obj_module_t mp_module_network;
 extern const struct _mp_obj_module_t mp_module_onewire;
 extern const struct _mp_obj_module_t mp_module_rp2;
 extern const struct _mp_obj_module_t mp_module_uos;
+extern const struct _mp_obj_module_t mp_module_usocket;
 extern const struct _mp_obj_module_t mp_module_utime;
 
+#if MICROPY_PY_USOCKET
+#define SOCKET_BUILTIN_MODULE               { MP_ROM_QSTR(MP_QSTR_usocket), MP_ROM_PTR(&mp_module_usocket) },
+#else
+#define SOCKET_BUILTIN_MODULE
+#endif
+#if MICROPY_PY_NETWORK
+#define NETWORK_BUILTIN_MODULE              { MP_ROM_QSTR(MP_QSTR_network), MP_ROM_PTR(&mp_module_network) },
+#define NETWORK_ROOT_POINTERS               mp_obj_list_t mod_network_nic_list;
+#else
+#define NETWORK_BUILTIN_MODULE
+#define NETWORK_ROOT_POINTERS
+#endif
+
 #if MICROPY_PY_BLUETOOTH
 #define MICROPY_PORT_ROOT_POINTER_BLUETOOTH struct _machine_uart_obj_t *mp_bthci_uart;
 #else
@@ -191,11 +206,15 @@ struct _mp_bluetooth_nimble_malloc_t;
     { MP_OBJ_NEW_QSTR(MP_QSTR__rp2), (mp_obj_t)&mp_module_rp2 }, \
     { MP_ROM_QSTR(MP_QSTR_uos), MP_ROM_PTR(&mp_module_uos) }, \
     { MP_ROM_QSTR(MP_QSTR_utime), MP_ROM_PTR(&mp_module_utime) }, \
+    SOCKET_BUILTIN_MODULE \
+    NETWORK_BUILTIN_MODULE \
 
 #ifndef MICROPY_BOARD_ROOT_POINTERS
 #define MICROPY_BOARD_ROOT_POINTERS
 #endif
 
+#define MICROPY_PORT_NETWORK_INTERFACES \
+
 #define MICROPY_PORT_ROOT_POINTERS \
     const char *readline_hist[8]; \
     void *machine_pin_irq_obj[30]; \
@@ -203,6 +222,7 @@ struct _mp_bluetooth_nimble_malloc_t;
     void *rp2_state_machine_irq_obj[8]; \
     void *rp2_uart_rx_buffer[2]; \
     void *rp2_uart_tx_buffer[2]; \
+    NETWORK_ROOT_POINTERS \
     MICROPY_BOARD_ROOT_POINTERS \
     MICROPY_PORT_ROOT_POINTER_BLUETOOTH \
         MICROPY_PORT_ROOT_POINTER_BLUETOOTH_NIMBLE \

From 2c5e9bbdface4eb163b53f486359ca2208b7b0a5 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Sun, 29 Aug 2021 18:58:31 +0200
Subject: [PATCH 1304/3533] extmod: Add platform module.

It contains the compiler version, and underlying system HAL/SDK version.
---
 extmod/extmod.cmake   |   1 +
 extmod/moduplatform.c | 136 ++++++++++++++++++++++++++++++++++++++++++
 py/builtin.h          |   1 +
 py/objmodule.c        |   3 +
 py/py.mk              |   1 +
 5 files changed, 142 insertions(+)
 create mode 100644 extmod/moduplatform.c

diff --git a/extmod/extmod.cmake b/extmod/extmod.cmake
index 3353112ba69a4..67f7d8fd39ed3 100644
--- a/extmod/extmod.cmake
+++ b/extmod/extmod.cmake
@@ -25,6 +25,7 @@ set(MICROPY_SOURCE_EXTMOD
     ${MICROPY_EXTMOD_DIR}/moduhashlib.c
     ${MICROPY_EXTMOD_DIR}/moduheapq.c
     ${MICROPY_EXTMOD_DIR}/modujson.c
+    ${MICROPY_EXTMOD_DIR}/moduplatform.c
     ${MICROPY_EXTMOD_DIR}/modurandom.c
     ${MICROPY_EXTMOD_DIR}/modure.c
     ${MICROPY_EXTMOD_DIR}/moduselect.c
diff --git a/extmod/moduplatform.c b/extmod/moduplatform.c
new file mode 100644
index 0000000000000..06bb9d5ce8c2b
--- /dev/null
+++ b/extmod/moduplatform.c
@@ -0,0 +1,136 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013-2021 Ibrahim Abdelkader <iabdalkader@openmv.io>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ */
+
+#include "py/runtime.h"
+#include "py/objtuple.h"
+#include "py/objstr.h"
+#include "py/mphal.h"
+#include "genhdr/mpversion.h"
+
+#if MICROPY_PY_UPLATFORM
+
+// platform - Access to underlying platform's identifying data
+
+// TODO: Add more architectures, compilers and libraries.
+// See: https://sourceforge.net/p/predef/wiki/Home/
+
+#if defined(__ARM_ARCH)
+#define PLATFORM_ARCH   "arm"
+#elif defined(__x86_64__)
+#define PLATFORM_ARCH   "x86_64"
+#else
+#define PLATFORM_ARCH   ""
+#endif
+
+#if defined(__GNUC__)
+#define PLATFORM_COMPILER \
+    "GCC " \
+    MP_STRINGIFY(__GNUC__) "." \
+    MP_STRINGIFY(__GNUC_MINOR__) "." \
+    MP_STRINGIFY(__GNUC_PATCHLEVEL__)
+#elif defined(__ARMCC_VERSION)
+#define PLATFORM_COMPILER \
+    "ARMCC " \
+    MP_STRINGIFY((__ARMCC_VERSION / 1000000)) "." \
+    MP_STRINGIFY((__ARMCC_VERSION / 10000 % 100)) "." \
+    MP_STRINGIFY((__ARMCC_VERSION % 10000))
+#else
+#define PLATFORM_COMPILER       ""
+#endif
+
+#if defined(__GLIBC__)
+#define PLATFORM_LIBC_LIB       "glibc"
+#define PLATFORM_LIBC_VER \
+    MP_STRINGIFY(__GLIBC__) "." \
+    MP_STRINGIFY(__GLIBC_MINOR__)
+#elif defined(__NEWLIB__)
+#define PLATFORM_LIBC_LIB       "newlib"
+#define PLATFORM_LIBC_VER       _NEWLIB_VERSION
+#else
+#define PLATFORM_LIBC_LIB       ""
+#define PLATFORM_LIBC_VER       ""
+#endif
+
+#if defined(__linux)
+#define PLATFORM_SYSTEM     "Linux"
+#elif defined(__unix__)
+#define PLATFORM_SYSTEM     "Unix"
+#elif defined(__CYGWIN__)
+#define PLATFORM_SYSTEM     "Cygwin"
+#elif defined(__WIN32__)
+#define PLATFORM_SYSTEM     "Windows"
+#else
+#define PLATFORM_SYSTEM     "MicroPython"
+#endif
+
+#ifndef MICROPY_HW_BOARD_NAME
+#define MICROPY_HW_BOARD_NAME PLATFORM_ARCH
+#endif
+
+#ifndef MICROPY_HW_MCU_NAME
+#define MICROPY_HW_MCU_NAME     ""
+#endif
+
+STATIC const MP_DEFINE_STR_OBJ(info_platform_obj, PLATFORM_SYSTEM "-" MICROPY_VERSION_STRING "-HAL" \
+    MICROPY_HAL_VERSION "-" PLATFORM_ARCH "-with-" PLATFORM_LIBC_LIB "" PLATFORM_LIBC_VER);
+STATIC const MP_DEFINE_STR_OBJ(info_python_compiler_obj, PLATFORM_COMPILER);
+STATIC const MP_DEFINE_STR_OBJ(info_libc_lib_obj, PLATFORM_LIBC_LIB);
+STATIC const MP_DEFINE_STR_OBJ(info_libc_ver_obj, PLATFORM_LIBC_VER);
+STATIC const mp_rom_obj_tuple_t info_libc_tuple_obj = {
+    {&mp_type_tuple}, 2, {MP_ROM_PTR(&info_libc_lib_obj), MP_ROM_PTR(&info_libc_ver_obj)}
+};
+
+STATIC mp_obj_t platform_platform(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    return MP_OBJ_FROM_PTR(&info_platform_obj);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_KW(platform_platform_obj, 0, platform_platform);
+
+STATIC mp_obj_t platform_python_compiler(void) {
+    return MP_OBJ_FROM_PTR(&info_python_compiler_obj);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(platform_python_compiler_obj, platform_python_compiler);
+
+STATIC mp_obj_t platform_libc_ver(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    return MP_OBJ_FROM_PTR(&info_libc_tuple_obj);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_KW(platform_libc_ver_obj, 0, platform_libc_ver);
+
+STATIC const mp_rom_map_elem_t modplatform_globals_table[] = {
+    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_uplatform) },
+    { MP_ROM_QSTR(MP_QSTR_platform), MP_ROM_PTR(&platform_platform_obj) },
+    { MP_ROM_QSTR(MP_QSTR_python_compiler), MP_ROM_PTR(&platform_python_compiler_obj) },
+    { MP_ROM_QSTR(MP_QSTR_libc_ver), MP_ROM_PTR(&platform_libc_ver_obj) },
+};
+
+STATIC MP_DEFINE_CONST_DICT(modplatform_globals, modplatform_globals_table);
+
+const mp_obj_module_t mp_module_uplatform = {
+    .base = { &mp_type_module },
+    .globals = (mp_obj_dict_t *)&modplatform_globals,
+};
+
+#endif // MICROPY_PY_UPLATFORM
diff --git a/py/builtin.h b/py/builtin.h
index 1e4769cd69a35..8639e978ffd17 100644
--- a/py/builtin.h
+++ b/py/builtin.h
@@ -124,6 +124,7 @@ extern const mp_obj_module_t mp_module_webrepl;
 extern const mp_obj_module_t mp_module_framebuf;
 extern const mp_obj_module_t mp_module_btree;
 extern const mp_obj_module_t mp_module_ubluetooth;
+extern const mp_obj_module_t mp_module_uplatform;
 
 extern const char MICROPY_PY_BUILTINS_HELP_TEXT[];
 
diff --git a/py/objmodule.c b/py/objmodule.c
index a1f9d9d7f146a..d648f0f8cefd0 100644
--- a/py/objmodule.c
+++ b/py/objmodule.c
@@ -230,6 +230,9 @@ STATIC const mp_rom_map_elem_t mp_builtin_module_table[] = {
     #if MICROPY_PY_BLUETOOTH
     { MP_ROM_QSTR(MP_QSTR_ubluetooth), MP_ROM_PTR(&mp_module_ubluetooth) },
     #endif
+    #if MICROPY_PY_UPLATFORM
+    { MP_ROM_QSTR(MP_QSTR_uplatform), MP_ROM_PTR(&mp_module_uplatform) },
+    #endif
 
     // extra builtin modules as defined by a port
     MICROPY_PORT_BUILTIN_MODULES
diff --git a/py/py.mk b/py/py.mk
index be8296e5e8fab..8e1e23554f8ca 100644
--- a/py/py.mk
+++ b/py/py.mk
@@ -195,6 +195,7 @@ PY_EXTMOD_O_BASENAME = \
 	extmod/modbluetooth.o \
 	extmod/modussl_axtls.o \
 	extmod/modussl_mbedtls.o \
+	extmod/moduplatform.o\
 	extmod/modurandom.o \
 	extmod/moduselect.o \
 	extmod/moduwebsocket.o \

From 782d5b2e534c96f4668443efe37c0514e8fcfe91 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Fri, 10 Sep 2021 14:28:41 +0200
Subject: [PATCH 1305/3533] stm32: Enable platform module.

The HAL version is based on the stm32lib version.
---
 ports/stm32/mpconfigport.h |  3 +++
 ports/stm32/mphalport.h    | 17 +++++++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/ports/stm32/mpconfigport.h b/ports/stm32/mpconfigport.h
index 92f1338d6c5c2..6a9e8bf4144e4 100644
--- a/ports/stm32/mpconfigport.h
+++ b/ports/stm32/mpconfigport.h
@@ -228,6 +228,9 @@
 #ifndef MICROPY_PY_ONEWIRE
 #define MICROPY_PY_ONEWIRE          (1)
 #endif
+#ifndef MICROPY_PY_UPLATFORM
+#define MICROPY_PY_UPLATFORM        (1)
+#endif
 
 // fatfs configuration used in ffconf.h
 #define MICROPY_FATFS_ENABLE_LFN       (1)
diff --git a/ports/stm32/mphalport.h b/ports/stm32/mphalport.h
index a76945db5fea7..edb8d8f64b64a 100644
--- a/ports/stm32/mphalport.h
+++ b/ports/stm32/mphalport.h
@@ -2,6 +2,23 @@
 #include STM32_HAL_H
 #include "pin.h"
 
+// F0-1.9.0+F4-1.16.0+F7-1.7.0+H7-1.6.0+L0-1.11.2+L4-1.8.1+WB-1.10.0
+#if defined(STM32F0)
+#define MICROPY_HAL_VERSION "1.9.0"
+#elif defined(STM32F4)
+#define MICROPY_HAL_VERSION "1.16.0"
+#elif defined(STM32F7)
+#define MICROPY_HAL_VERSION "1.7.0"
+#elif defined(STM32H7)
+#define MICROPY_HAL_VERSION "1.6.0"
+#elif defined(STM32L0)
+#define MICROPY_HAL_VERSION "1.11.2"
+#elif defined(STM32L4)
+#define MICROPY_HAL_VERSION "1.8.1"
+#elif defined(STM32WB)
+#define MICROPY_HAL_VERSION "1.10.0"
+#endif
+
 extern const unsigned char mp_hal_status_to_errno_table[4];
 
 static inline int mp_hal_status_to_neg_errno(HAL_StatusTypeDef status) {

From 8c214ed2000fd6334c8f03589f36c6fd2286f2c8 Mon Sep 17 00:00:00 2001
From: Ned Konz <ned@bike-nomad.com>
Date: Thu, 19 Aug 2021 08:12:19 -0700
Subject: [PATCH 1306/3533] stm32: Extended flash filesystem space to 512K on
 H743 boards.

The H743 has equal sized pages of 128k, which means the filesystem doesn't
need to be near the beginning.  This commit moves the filesystem to the
very end of flash, and extends it to 512k (4 pages).

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/boards/NUCLEO_H743ZI/mpconfigboard.mk | 11 +++++------
 .../stm32/boards/VCC_GND_H743VI/mpconfigboard.mk  | 11 +++++------
 ports/stm32/boards/stm32h743.ld                   | 15 +++++++++++----
 ports/stm32/flashbdev.c                           | 15 ++++++++++-----
 4 files changed, 31 insertions(+), 21 deletions(-)

diff --git a/ports/stm32/boards/NUCLEO_H743ZI/mpconfigboard.mk b/ports/stm32/boards/NUCLEO_H743ZI/mpconfigboard.mk
index ce8f83e57d52b..be9e56e4e1a69 100644
--- a/ports/stm32/boards/NUCLEO_H743ZI/mpconfigboard.mk
+++ b/ports/stm32/boards/NUCLEO_H743ZI/mpconfigboard.mk
@@ -7,14 +7,13 @@ MICROPY_FLOAT_IMPL = double
 AF_FILE = boards/stm32h743_af.csv
 
 ifeq ($(USE_MBOOT),1)
-# When using Mboot all the text goes together after the filesystem
-LD_FILES = boards/stm32h743.ld boards/common_blifs.ld
-TEXT0_ADDR = 0x08040000
+# When using Mboot everything goes after the bootloader
+LD_FILES = boards/stm32h743.ld boards/common_bl.ld
+TEXT0_ADDR = 0x08020000
 else
-# When not using Mboot the ISR text goes first, then the rest after the filesystem
-LD_FILES = boards/stm32h743.ld boards/common_ifs.ld
+# When not using Mboot everything goes at the start of flash
+LD_FILES = boards/stm32h743.ld boards/common_basic.ld
 TEXT0_ADDR = 0x08000000
-TEXT1_ADDR = 0x08040000
 endif
 
 # MicroPython settings
diff --git a/ports/stm32/boards/VCC_GND_H743VI/mpconfigboard.mk b/ports/stm32/boards/VCC_GND_H743VI/mpconfigboard.mk
index 1f5fa32a1ba98..88608294845ed 100644
--- a/ports/stm32/boards/VCC_GND_H743VI/mpconfigboard.mk
+++ b/ports/stm32/boards/VCC_GND_H743VI/mpconfigboard.mk
@@ -7,14 +7,13 @@ MICROPY_FLOAT_IMPL = double
 AF_FILE = boards/stm32h743_af.csv
 
 ifeq ($(USE_MBOOT),1)
-# When using Mboot all the text goes together after the filesystem
-LD_FILES = boards/stm32h743.ld boards/common_blifs.ld
-TEXT0_ADDR = 0x08040000
+# When using Mboot everything goes after the bootloader
+LD_FILES = boards/stm32h743.ld boards/common_bl.ld
+TEXT0_ADDR = 0x08020000
 else
-# When not using Mboot the ISR text goes first, then the rest after the filesystem
-LD_FILES = boards/stm32h743.ld boards/common_ifs.ld
+# When not using Mboot everything goes at the start of flash
+LD_FILES = boards/stm32h743.ld boards/common_basic.ld
 TEXT0_ADDR = 0x08000000
-TEXT1_ADDR = 0x08040000
 endif
 
 # MicroPython settings
diff --git a/ports/stm32/boards/stm32h743.ld b/ports/stm32/boards/stm32h743.ld
index 72d915b2bb1d0..13fa0c52c0211 100644
--- a/ports/stm32/boards/stm32h743.ld
+++ b/ports/stm32/boards/stm32h743.ld
@@ -5,10 +5,9 @@
 /* Specify the memory areas */
 MEMORY
 {
-    FLASH (rx)      : ORIGIN = 0x08000000, LENGTH = 2048K
-    FLASH_ISR (rx)  : ORIGIN = 0x08000000, LENGTH = 128K    /* sector 0, 128K */
-    FLASH_FS (r)    : ORIGIN = 0x08020000, LENGTH = 128K    /* sector 1, 128K */
-    FLASH_TEXT (rx) : ORIGIN = 0x08040000, LENGTH = 1792K   /* sectors 6*128 + 8*128 */
+    FLASH (rx)      : ORIGIN = 0x08000000, LENGTH = 1536K   /* sectors (0-7) + (0-3) */
+    FLASH_APP  (rx) : ORIGIN = 0x08020000, LENGTH = 1408K   /* sectors (1-7) + (0-3) */
+    FLASH_FS (r)    : ORIGIN = 0x08180000, LENGTH = 512K    /* sectors         (4-7) */
     DTCM (xrw)      : ORIGIN = 0x20000000, LENGTH = 128K    /* Used for storage cache */
     RAM (xrw)       : ORIGIN = 0x24000000, LENGTH = 512K    /* AXI SRAM */
     RAM_D2 (xrw)    : ORIGIN = 0x30000000, LENGTH = 288K
@@ -29,6 +28,14 @@ _ram_end = ORIGIN(RAM) + LENGTH(RAM);
 _heap_start = _ebss; /* heap starts just after statically allocated memory */
 _heap_end = _sstack;
 
+/* Location of filesystem RAM cache */
+_ram_fs_cache_start = ORIGIN(DTCM);
+_ram_fs_cache_end = ORIGIN(DTCM) + LENGTH(DTCM);
+
+/* Location of filesystem flash storage */
+_flash_fs_start = ORIGIN(FLASH_FS);
+_flash_fs_end   = ORIGIN(FLASH_FS) + LENGTH(FLASH_FS);
+
 /* Define output sections */
 SECTIONS
 {
diff --git a/ports/stm32/flashbdev.c b/ports/stm32/flashbdev.c
index 6ed891300dc54..6be0cfee8af38 100644
--- a/ports/stm32/flashbdev.c
+++ b/ports/stm32/flashbdev.c
@@ -104,11 +104,16 @@ STATIC byte flash_cache_mem[0x4000] __attribute__((aligned(4))); // 16k
 
 #elif defined(STM32H743xx)
 
-// The STM32H743 flash sectors are 128K
-#define CACHE_MEM_START_ADDR (0x20000000) // DTCM data RAM, 128k
-#define FLASH_SECTOR_SIZE_MAX (0x20000) // 128k max
-#define FLASH_MEM_SEG1_START_ADDR (0x08020000) // sector 1
-#define FLASH_MEM_SEG1_NUM_BLOCKS (256) // Sector 1: 128k / 512b = 256 blocks
+// The STM32H743 flash sectors are 128K, with locations defined in the linker script
+extern uint8_t _flash_fs_start;
+extern uint8_t _flash_fs_end;
+extern uint8_t _ram_fs_cache_start[];
+extern uint8_t _ram_fs_cache_end[];
+
+#define CACHE_MEM_START_ADDR ((uintptr_t)&_ram_fs_cache_start[0])
+#define FLASH_SECTOR_SIZE_MAX (&_ram_fs_cache_end[0] - &_ram_fs_cache_start[0])
+#define FLASH_MEM_SEG1_START_ADDR ((long)&_flash_fs_start)
+#define FLASH_MEM_SEG1_NUM_BLOCKS ((&_flash_fs_end - &_flash_fs_start) / 512)
 
 #elif defined(STM32L432xx) || \
     defined(STM32L451xx) || defined(STM32L452xx) || defined(STM32L462xx) || \

From 99bb52047c2942182b4be4df4f8b7f9a48dd5e8c Mon Sep 17 00:00:00 2001
From: Ned Konz <ned@bike-nomad.com>
Date: Thu, 19 Aug 2021 08:12:46 -0700
Subject: [PATCH 1307/3533] stm32/boards/NUCLEO_H743ZI: Enable VfsLfs2 on
 NUCLEO_H743ZI(2) boards.

---
 ports/stm32/boards/NUCLEO_H743ZI/mpconfigboard.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/stm32/boards/NUCLEO_H743ZI/mpconfigboard.mk b/ports/stm32/boards/NUCLEO_H743ZI/mpconfigboard.mk
index be9e56e4e1a69..8a16c2f01032e 100644
--- a/ports/stm32/boards/NUCLEO_H743ZI/mpconfigboard.mk
+++ b/ports/stm32/boards/NUCLEO_H743ZI/mpconfigboard.mk
@@ -20,3 +20,4 @@ endif
 MICROPY_PY_LWIP = 1
 MICROPY_PY_USSL = 1
 MICROPY_SSL_MBEDTLS = 1
+MICROPY_VFS_LFS2 = 1

From 9eff4029ab66ed30c08d65e5ed91a20d70173bcd Mon Sep 17 00:00:00 2001
From: roland van straten <roland@van-straten.org>
Date: Sun, 19 Sep 2021 14:35:53 +0200
Subject: [PATCH 1308/3533] stm32/boards: Add PF11-BOOT0 to stm32f091_af.csv.

PF11 is added so it can be used as GPIO.
---
 ports/stm32/boards/stm32f091_af.csv | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/stm32/boards/stm32f091_af.csv b/ports/stm32/boards/stm32f091_af.csv
index 38e134f8a9b5e..8074fd22b7131 100644
--- a/ports/stm32/boards/stm32f091_af.csv
+++ b/ports/stm32/boards/stm32f091_af.csv
@@ -87,3 +87,4 @@ PortF,PF3,EVENTOUT,USART7_RX,USART6_CK/USART6_RTS,,,,,,,,,,,,,,
 PortF,PF6,,,,,,,,,,,,,,,,,
 PortF,PF9,TIM15_CH1,USART6_TX,,,,,,,,,,,,,,,
 PortF,PF10,TIM15_CH2,USART6_RX,,,,,,,,,,,,,,,
+PortF,PF11,,,,,,,,,,,,,,,,,

From 67d1dca9c2f7c04ff7078d94b4a58cdb73d0c58f Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Sat, 18 Sep 2021 16:49:50 +0200
Subject: [PATCH 1309/3533] stm32/machine_i2c: Use hardware I2C for STM32H7.

---
 ports/stm32/i2c.c         | 9 +++++++--
 ports/stm32/machine_i2c.c | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/ports/stm32/i2c.c b/ports/stm32/i2c.c
index 0b7105344cd28..c63fe216247bd 100644
--- a/ports/stm32/i2c.c
+++ b/ports/stm32/i2c.c
@@ -268,7 +268,12 @@ int i2c_write(i2c_t *i2c, const uint8_t *src, size_t len, size_t next_len) {
     return num_acks;
 }
 
-#elif defined(STM32F0) || defined(STM32F7)
+#elif defined(STM32F0) || defined(STM32F7) || defined(STM32H7)
+
+#if defined(STM32H7)
+#define APB1ENR            APB1LENR
+#define RCC_APB1ENR_I2C1EN RCC_APB1LENR_I2C1EN
+#endif
 
 STATIC uint16_t i2c_timeout_ms[MICROPY_HW_MAX_I2C];
 
@@ -468,7 +473,7 @@ int i2c_write(i2c_t *i2c, const uint8_t *src, size_t len, size_t next_len) {
 
 #endif
 
-#if defined(STM32F0) || defined(STM32F4) || defined(STM32F7)
+#if defined(STM32F0) || defined(STM32F4) || defined(STM32F7) || defined(STM32H7)
 
 int i2c_readfrom(i2c_t *i2c, uint16_t addr, uint8_t *dest, size_t len, bool stop) {
     int ret;
diff --git a/ports/stm32/machine_i2c.c b/ports/stm32/machine_i2c.c
index 41e65cf05cb37..0976c18c812ef 100644
--- a/ports/stm32/machine_i2c.c
+++ b/ports/stm32/machine_i2c.c
@@ -38,7 +38,7 @@
 
 #define I2C_POLL_DEFAULT_TIMEOUT_US (50000) // 50ms
 
-#if defined(STM32F0) || defined(STM32F4) || defined(STM32F7)
+#if defined(STM32F0) || defined(STM32F4) || defined(STM32F7) || defined(STM32H7)
 
 typedef struct _machine_hard_i2c_obj_t {
     mp_obj_base_t base;

From 0d9429f44cd23f5cfdd80d53adccbf384e23665a Mon Sep 17 00:00:00 2001
From: Stewart Bonnick <stewart.bonnick@autoclavestudios.com>
Date: Wed, 15 Sep 2021 09:09:01 -0400
Subject: [PATCH 1310/3533] esp32/boards: Add LOLIN_S2_MINI ESP32-S2 board.

To support Lolin S2 Mini ESP32-S2 Variant board.  More information about
this board can be found at https://www.wemos.cc/en/latest/s2/s2_mini.html
---
 ports/esp32/boards/LOLIN_S2_MINI/manifest.py  |  2 ++
 .../boards/LOLIN_S2_MINI/modules/s2mini.py    | 31 +++++++++++++++++++
 .../boards/LOLIN_S2_MINI/mpconfigboard.cmake  | 11 +++++++
 .../boards/LOLIN_S2_MINI/mpconfigboard.h      | 12 +++++++
 .../boards/LOLIN_S2_MINI/sdkconfig.board      |  6 ++++
 5 files changed, 62 insertions(+)
 create mode 100644 ports/esp32/boards/LOLIN_S2_MINI/manifest.py
 create mode 100644 ports/esp32/boards/LOLIN_S2_MINI/modules/s2mini.py
 create mode 100644 ports/esp32/boards/LOLIN_S2_MINI/mpconfigboard.cmake
 create mode 100644 ports/esp32/boards/LOLIN_S2_MINI/mpconfigboard.h
 create mode 100644 ports/esp32/boards/LOLIN_S2_MINI/sdkconfig.board

diff --git a/ports/esp32/boards/LOLIN_S2_MINI/manifest.py b/ports/esp32/boards/LOLIN_S2_MINI/manifest.py
new file mode 100644
index 0000000000000..f993d4fa6bd29
--- /dev/null
+++ b/ports/esp32/boards/LOLIN_S2_MINI/manifest.py
@@ -0,0 +1,2 @@
+include("$(PORT_DIR)/boards/manifest.py")
+freeze("./modules")
diff --git a/ports/esp32/boards/LOLIN_S2_MINI/modules/s2mini.py b/ports/esp32/boards/LOLIN_S2_MINI/modules/s2mini.py
new file mode 100644
index 0000000000000..4fc038c81ad86
--- /dev/null
+++ b/ports/esp32/boards/LOLIN_S2_MINI/modules/s2mini.py
@@ -0,0 +1,31 @@
+# LOLIN S2 MINI MicroPython Helper Library
+
+from micropython import const
+from machine import Pin
+
+# Pin Assignments
+
+# SPI
+SPI_MOSI = const(11)
+SPI_MISO = const(9)
+SPI_CLK = const(7)
+
+# I2C
+I2C_SDA = const(33)
+I2C_SCL = const(35)
+
+# DAC
+DAC1 = const(17)
+DAC2 = const(18)
+
+# LED
+LED = const(15)
+
+# BUTTON
+BUTTON = const(0)
+
+# Helper methods for built in sensors
+
+led = Pin(LED, Pin.OUT, value=0)
+
+button = Pin(BUTTON, Pin.IN, Pin.PULL_UP)
diff --git a/ports/esp32/boards/LOLIN_S2_MINI/mpconfigboard.cmake b/ports/esp32/boards/LOLIN_S2_MINI/mpconfigboard.cmake
new file mode 100644
index 0000000000000..5f157e7e779fb
--- /dev/null
+++ b/ports/esp32/boards/LOLIN_S2_MINI/mpconfigboard.cmake
@@ -0,0 +1,11 @@
+set(IDF_TARGET esp32s2)
+
+set(SDKCONFIG_DEFAULTS
+    boards/sdkconfig.base
+    boards/sdkconfig.spiram_sx
+    boards/sdkconfig.usb
+)
+
+if(NOT MICROPY_FROZEN_MANIFEST)
+    set(MICROPY_FROZEN_MANIFEST ${MICROPY_BOARD_DIR}/manifest.py)
+endif()
diff --git a/ports/esp32/boards/LOLIN_S2_MINI/mpconfigboard.h b/ports/esp32/boards/LOLIN_S2_MINI/mpconfigboard.h
new file mode 100644
index 0000000000000..e0ef10d1db928
--- /dev/null
+++ b/ports/esp32/boards/LOLIN_S2_MINI/mpconfigboard.h
@@ -0,0 +1,12 @@
+#define MICROPY_HW_BOARD_NAME               "LOLIN_S2_MINI"
+#define MICROPY_HW_MCU_NAME                 "ESP32-S2FN4R2"
+
+#define MICROPY_PY_BLUETOOTH                (0)
+#define MICROPY_HW_ENABLE_SDCARD            (0)
+
+#define MICROPY_HW_I2C0_SCL                 (35)
+#define MICROPY_HW_I2C0_SDA                 (33)
+
+#define MICROPY_HW_SPI1_MOSI                (11)
+#define MICROPY_HW_SPI1_MISO                (9)
+#define MICROPY_HW_SPI1_SCK                 (7)
diff --git a/ports/esp32/boards/LOLIN_S2_MINI/sdkconfig.board b/ports/esp32/boards/LOLIN_S2_MINI/sdkconfig.board
new file mode 100644
index 0000000000000..1a7ef3f8b92ad
--- /dev/null
+++ b/ports/esp32/boards/LOLIN_S2_MINI/sdkconfig.board
@@ -0,0 +1,6 @@
+CONFIG_FLASHMODE_QIO=y
+CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
+CONFIG_USB_AND_UART=y
+# LWIP
+CONFIG_LWIP_LOCAL_HOSTNAME="LOLIN_S2_MINI"
+# end of LWIP

From 52636fa69232002f3d8ebed583f8ee61a55878d4 Mon Sep 17 00:00:00 2001
From: IhorNehrutsa <Ihor.Nehrutsa@gmail.com>
Date: Sun, 19 Sep 2021 00:38:37 +0300
Subject: [PATCH 1311/3533] esp32/machine_pwm: Add support for all PWM timers
 and channels.

This commit allows using all the available PWM timers (up to 8) and
channels (up to 16), without affecting the PWM API.

If a new frequency is set, first it checks if another timer is using the
same frequency.  If yes, then it uses this timer, otherwise, it creates a
new one.  If all timers are used, the user should set an already used
frequency, or de-init a channel.

This work is based on #6276 and #3608.
---
 ports/esp32/machine_pwm.c | 419 ++++++++++++++++++++++++++++----------
 1 file changed, 314 insertions(+), 105 deletions(-)

diff --git a/ports/esp32/machine_pwm.c b/ports/esp32/machine_pwm.c
index 9fe06aa6999d3..41b8dbcbfe5b9 100644
--- a/ports/esp32/machine_pwm.c
+++ b/ports/esp32/machine_pwm.c
@@ -3,7 +3,10 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2016 Damien P. George
+ * Copyright (c) 2016-2021 Damien P. George
+ * Copyright (c) 2018 Alan Dragomirecky
+ * Copyright (c) 2020 Antoine Aubert
+ * Copyright (c) 2021 Ihor Nehrutsa
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -30,54 +33,105 @@
 #include "driver/ledc.h"
 #include "esp_err.h"
 
-// Which channel has which GPIO pin assigned?
-// (-1 if not assigned)
-STATIC int chan_gpio[LEDC_CHANNEL_MAX];
+#define PWM_DBG(...)
+// #define PWM_DBG(...) mp_printf(&mp_plat_print, __VA_ARGS__)
+
+// Total number of channels
+#define PWM_CHANNEL_MAX (LEDC_SPEED_MODE_MAX * LEDC_CHANNEL_MAX)
+typedef struct _chan_t {
+    // Which channel has which GPIO pin assigned?
+    // (-1 if not assigned)
+    gpio_num_t pin;
+    // Which channel has which timer assigned?
+    // (-1 if not assigned)
+    int timer_idx;
+} chan_t;
+// List of PWM channels
+STATIC chan_t chans[PWM_CHANNEL_MAX];
+
+// channel_idx is an index (end-to-end sequential numbering) for all channels
+// available on the chip and described in chans[]
+#define CHANNEL_IDX(mode, channel) (mode * LEDC_CHANNEL_MAX + channel)
+#define CHANNEL_IDX_TO_MODE(channel_idx) (channel_idx / LEDC_CHANNEL_MAX)
+#define CHANNEL_IDX_TO_CHANNEL(channel_idx) (channel_idx % LEDC_CHANNEL_MAX)
+
+// Total number of timers
+#define PWM_TIMER_MAX (LEDC_SPEED_MODE_MAX * LEDC_TIMER_MAX)
+// List of timer configs
+STATIC ledc_timer_config_t timers[PWM_TIMER_MAX];
+
+// timer_idx is an index (end-to-end sequential numbering) for all timers
+// available on the chip and configured in timers[]
+#define TIMER_IDX(mode, timer) (mode * LEDC_TIMER_MAX + timer)
+#define TIMER_IDX_TO_MODE(timer_idx) (timer_idx / LEDC_TIMER_MAX)
+#define TIMER_IDX_TO_TIMER(timer_idx) (timer_idx % LEDC_TIMER_MAX)
 
 // Params for PW operation
-// 5khz
+// 5khz is default frequency
 #define PWFREQ (5000)
-// High speed mode
-#if CONFIG_IDF_TARGET_ESP32
-#define PWMODE (LEDC_HIGH_SPEED_MODE)
-#else
-#define PWMODE (LEDC_LOW_SPEED_MODE)
-#endif
+
 // 10-bit resolution (compatible with esp8266 PWM)
 #define PWRES (LEDC_TIMER_10_BIT)
-// Timer 1
-#define PWTIMER (LEDC_TIMER_1)
 
 // Config of timer upon which we run all PWM'ed GPIO pins
 STATIC bool pwm_inited = false;
-STATIC ledc_timer_config_t timer_cfg = {
-    .duty_resolution = PWRES,
-    .freq_hz = PWFREQ,
-    .speed_mode = PWMODE,
-    .timer_num = PWTIMER
-};
 
-STATIC void pwm_init(void) {
+// MicroPython PWM object struct
+typedef struct _machine_pwm_obj_t {
+    mp_obj_base_t base;
+    gpio_num_t pin;
+    bool active;
+    int mode;
+    int channel;
+    int timer;
+} machine_pwm_obj_t;
 
+STATIC void pwm_init(void) {
     // Initial condition: no channels assigned
-    for (int x = 0; x < LEDC_CHANNEL_MAX; ++x) {
-        chan_gpio[x] = -1;
+    for (int i = 0; i < PWM_CHANNEL_MAX; ++i) {
+        chans[i].pin = -1;
+        chans[i].timer_idx = -1;
     }
 
-    // Init with default timer params
-    ledc_timer_config(&timer_cfg);
+    // Prepare all timers config
+    // Initial condition: no timers assigned
+    for (int i = 0; i < PWM_TIMER_MAX; ++i) {
+        timers[i].duty_resolution = PWRES;
+        // unset timer is -1
+        timers[i].freq_hz = -1;
+        timers[i].speed_mode = TIMER_IDX_TO_MODE(i);
+        timers[i].timer_num = TIMER_IDX_TO_TIMER(i);
+        timers[i].clk_cfg = LEDC_AUTO_CLK;
+    }
 }
 
-STATIC int set_freq(int newval) {
-    int ores = timer_cfg.duty_resolution;
-    int oval = timer_cfg.freq_hz;
+STATIC void configure_channel(machine_pwm_obj_t *self) {
+    ledc_channel_config_t cfg = {
+        .channel = self->channel,
+        .duty = (1 << (timers[TIMER_IDX(self->mode, self->timer)].duty_resolution)) / 2,
+        .gpio_num = self->pin,
+        .intr_type = LEDC_INTR_DISABLE,
+        .speed_mode = self->mode,
+        .timer_sel = self->timer,
+    };
+    if (ledc_channel_config(&cfg) != ESP_OK) {
+        mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("PWM not supported on Pin(%d)"), self->pin);
+    }
+}
+
+STATIC void set_freq(int newval, ledc_timer_config_t *timer) {
+    // If already set, do nothing
+    if (newval == timer->freq_hz) {
+        return;
+    }
 
     // Find the highest bit resolution for the requested frequency
     if (newval <= 0) {
         newval = 1;
     }
     unsigned int res = 0;
-    for (unsigned int i = LEDC_APB_CLK_HZ / newval; i > 1; i >>= 1, ++res) {
+    for (unsigned int i = LEDC_APB_CLK_HZ / newval; i > 1; i >>= 1) {
+        ++res;
     }
     if (res == 0) {
         res = 1;
@@ -87,32 +141,113 @@ STATIC int set_freq(int newval) {
     }
 
     // Configure the new resolution and frequency
-    timer_cfg.duty_resolution = res;
-    timer_cfg.freq_hz = newval;
-    if (ledc_timer_config(&timer_cfg) != ESP_OK) {
-        timer_cfg.duty_resolution = ores;
-        timer_cfg.freq_hz = oval;
-        return 0;
+    timer->duty_resolution = res;
+    timer->freq_hz = newval;
+
+    // set freq
+    esp_err_t err = ledc_timer_config(timer);
+    if (err != ESP_OK) {
+        if (err == ESP_FAIL) {
+            PWM_DBG("timer timer->speed_mode %d, timer->timer_num %d, timer->clk_cfg %d, timer->freq_hz  %d, timer->duty_resolution %d)", timer->speed_mode, timer->timer_num, timer->clk_cfg, timer->freq_hz, timer->duty_resolution);
+            mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("bad frequency %d"), newval);
+        } else {
+            check_esp_err(err);
+        }
     }
-    return 1;
+}
+
+STATIC int get_duty(machine_pwm_obj_t *self) {
+    uint32_t duty = ledc_get_duty(self->mode, self->channel);
+    duty <<= PWRES - timers[TIMER_IDX(self->mode, self->timer)].duty_resolution;
+    return duty;
+}
+
+STATIC void set_duty(machine_pwm_obj_t *self, int duty) {
+    if ((duty < 0) || (duty > (1 << PWRES) - 1)) {
+        mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("duty must be between 0 and %u"), (1 << PWRES) - 1);
+    }
+    duty &= (1 << PWRES) - 1;
+    duty >>= PWRES - timers[TIMER_IDX(self->mode, self->timer)].duty_resolution;
+    check_esp_err(ledc_set_duty(self->mode, self->channel, duty));
+    check_esp_err(ledc_update_duty(self->mode, self->channel));
+    // check_esp_err(ledc_set_duty_and_update(self->mode, self->channel, duty, (1 << PWRES) - 1)); // thread safe function ???
+
+    // Bug: Sometimes duty is not set right now.
+    // See https://github.com/espressif/esp-idf/issues/7288
+    /*
+    if (duty != get_duty(self)) {
+        PWM_DBG("\n duty_set %u %u %d %d \n", duty, get_duty(self), PWRES, timers[TIMER_IDX(self->mode, self->timer)].duty_resolution);
+    }
+    */
 }
 
 /******************************************************************************/
-// MicroPython bindings for PWM
+#define SAME_FREQ_ONLY (true)
+#define SAME_FREQ_OR_FREE (false)
+#define ANY_MODE (-1)
+// Return timer_idx. Use TIMER_IDX_TO_MODE(timer_idx) and TIMER_IDX_TO_TIMER(timer_idx) to get mode and timer
+STATIC int find_timer(int freq, bool same_freq_only, int mode) {
+    int free_timer_idx_found = -1;
+    // Find a free PWM Timer using the same freq
+    for (int timer_idx = 0; timer_idx < PWM_TIMER_MAX; ++timer_idx) {
+        if ((mode == ANY_MODE) || (mode == TIMER_IDX_TO_MODE(timer_idx))) {
+            if (timers[timer_idx].freq_hz == freq) {
+                // A timer already uses the same freq. Use it now.
+                return timer_idx;
+            }
+            if (!same_freq_only && (free_timer_idx_found == -1) && (timers[timer_idx].freq_hz == -1)) {
+                free_timer_idx_found = timer_idx;
+                // Continue to check if a channel with the same freq is in use.
+            }
+        }
+    }
 
-typedef struct _machine_pwm_obj_t {
-    mp_obj_base_t base;
-    gpio_num_t pin;
-    uint8_t active;
-    uint8_t channel;
-} machine_pwm_obj_t;
+    return free_timer_idx_found;
+}
+
+// Return true if the timer is in use in addition to current channel
+STATIC bool is_timer_in_use(int current_channel_idx, int timer_idx) {
+    for (int i = 0; i < PWM_CHANNEL_MAX; ++i) {
+        if ((i != current_channel_idx) && (chans[i].timer_idx == timer_idx)) {
+            return true;
+        }
+    }
+
+    return false;
+}
+
+// Find a free PWM channel, also spot if our pin is already mentioned.
+// Return channel_idx. Use CHANNEL_IDX_TO_MODE(channel_idx) and CHANNEL_IDX_TO_CHANNEL(channel_idx) to get mode and channel
+STATIC int find_channel(int pin, int mode) {
+    int avail_idx = -1;
+    int channel_idx;
+    for (channel_idx = 0; channel_idx < PWM_CHANNEL_MAX; ++channel_idx) {
+        if ((mode == ANY_MODE) || (mode == CHANNEL_IDX_TO_MODE(channel_idx))) {
+            if (chans[channel_idx].pin == pin) {
+                break;
+            }
+            if ((avail_idx == -1) && (chans[channel_idx].pin == -1)) {
+                avail_idx = channel_idx;
+            }
+        }
+    }
+    if (channel_idx >= PWM_CHANNEL_MAX) {
+        channel_idx = avail_idx;
+    }
+    return channel_idx;
+}
+
+/******************************************************************************/
+// MicroPython bindings for PWM
 
 STATIC void mp_machine_pwm_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     machine_pwm_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    mp_printf(print, "PWM(%u", self->pin);
+    mp_printf(print, "PWM(pin=%u", self->pin);
     if (self->active) {
-        mp_printf(print, ", freq=%u, duty=%u", timer_cfg.freq_hz,
-            ledc_get_duty(PWMODE, self->channel));
+        int duty = get_duty(self);
+        mp_printf(print, ", freq=%u, duty=%u", ledc_get_freq(self->mode, self->timer), duty);
+        mp_printf(print, ", resolution=%u", timers[TIMER_IDX(self->mode, self->timer)].duty_resolution);
+        mp_printf(print, ", mode=%d, channel=%d, timer=%d", self->mode, self->channel, self->timer);
     }
     mp_printf(print, ")");
 }
@@ -128,61 +263,72 @@ STATIC void mp_machine_pwm_init_helper(machine_pwm_obj_t *self,
     mp_arg_parse_all(n_args, pos_args, kw_args,
         MP_ARRAY_SIZE(allowed_args), allowed_args, args);
 
-    int channel;
-    int avail = -1;
+    int channel_idx = find_channel(self->pin, ANY_MODE);
+    if (channel_idx == -1) {
+        mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("out of PWM channels:%d"), PWM_CHANNEL_MAX); // in all modes
+    }
 
-    // Find a free PWM channel, also spot if our pin is
-    //  already mentioned.
-    for (channel = 0; channel < LEDC_CHANNEL_MAX; ++channel) {
-        if (chan_gpio[channel] == self->pin) {
-            break;
+    int freq = args[ARG_freq].u_int;
+    if ((freq < -1) || (freq > 40000000)) {
+        mp_raise_ValueError(MP_ERROR_TEXT("freqency must be between 1Hz and 40MHz"));
+    }
+    // Check if freq wasn't passed as an argument
+    if (freq == -1) {
+        // Check if already set, otherwise use the default freq.
+        // Possible case:
+        // pwm = PWM(pin, freq=1000, duty=256)
+        // pwm = PWM(pin, duty=128)
+        if (chans[channel_idx].timer_idx != -1) {
+            freq = timers[chans[channel_idx].timer_idx].freq_hz;
         }
-        if ((avail == -1) && (chan_gpio[channel] == -1)) {
-            avail = channel;
+        if (freq < 0) {
+            freq = PWFREQ;
         }
     }
-    if (channel >= LEDC_CHANNEL_MAX) {
-        if (avail == -1) {
-            mp_raise_ValueError(MP_ERROR_TEXT("out of PWM channels"));
-        }
-        channel = avail;
+
+    int timer_idx = find_timer(freq, SAME_FREQ_OR_FREE, CHANNEL_IDX_TO_MODE(channel_idx));
+    if (timer_idx == -1) {
+        timer_idx = find_timer(freq, SAME_FREQ_OR_FREE, ANY_MODE);
+    }
+    if (timer_idx == -1) {
+        mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("out of PWM timers:%d"), PWM_TIMER_MAX); // in all modes
     }
-    self->channel = channel;
 
-    // New PWM assignment
-    self->active = 1;
-    if (chan_gpio[channel] == -1) {
-        ledc_channel_config_t cfg = {
-            .channel = channel,
-            .duty = (1 << timer_cfg.duty_resolution) / 2,
-            .gpio_num = self->pin,
-            .intr_type = LEDC_INTR_DISABLE,
-            .speed_mode = PWMODE,
-            .timer_sel = PWTIMER,
-        };
-        if (ledc_channel_config(&cfg) != ESP_OK) {
-            mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("PWM not supported on pin %d"), self->pin);
+    int mode = TIMER_IDX_TO_MODE(timer_idx);
+    if (CHANNEL_IDX_TO_MODE(channel_idx) != mode) {
+        // unregister old channel
+        chans[channel_idx].pin = -1;
+        chans[channel_idx].timer_idx = -1;
+        // find new channel
+        channel_idx = find_channel(self->pin, mode);
+        if (CHANNEL_IDX_TO_MODE(channel_idx) != mode) {
+            mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("out of PWM channels:%d"), PWM_CHANNEL_MAX); // in current mode
         }
-        chan_gpio[channel] = self->pin;
     }
+    self->mode = mode;
+    self->timer = TIMER_IDX_TO_TIMER(timer_idx);
+    self->channel = CHANNEL_IDX_TO_CHANNEL(channel_idx);
 
-    // Maybe change PWM timer
-    int tval = args[ARG_freq].u_int;
-    if (tval != -1) {
-        if (tval != timer_cfg.freq_hz) {
-            if (!set_freq(tval)) {
-                mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("bad frequency %d"), tval);
-            }
-        }
+    // New PWM assignment
+    if ((chans[channel_idx].pin == -1) || (chans[channel_idx].timer_idx != timer_idx)) {
+        configure_channel(self);
+        chans[channel_idx].pin = self->pin;
     }
+    chans[channel_idx].timer_idx = timer_idx;
+    self->active = true;
+
+    // Set timer frequency
+    set_freq(freq, &timers[timer_idx]);
 
     // Set duty cycle?
-    int dval = args[ARG_duty].u_int;
-    if (dval != -1) {
-        dval &= ((1 << PWRES) - 1);
-        dval >>= PWRES - timer_cfg.duty_resolution;
-        ledc_set_duty(PWMODE, channel, dval);
-        ledc_update_duty(PWMODE, channel);
+    int duty = args[ARG_duty].u_int;
+    if (duty != -1) {
+        set_duty(self, duty);
+    }
+
+    // Reset the timer if low speed
+    if (self->mode == LEDC_LOW_SPEED_MODE) {
+        check_esp_err(ledc_timer_rst(self->mode, self->timer));
     }
 }
 
@@ -195,8 +341,10 @@ STATIC mp_obj_t mp_machine_pwm_make_new(const mp_obj_type_t *type,
     machine_pwm_obj_t *self = m_new_obj(machine_pwm_obj_t);
     self->base.type = &machine_pwm_type;
     self->pin = pin_id;
-    self->active = 0;
+    self->active = false;
+    self->mode = -1;
     self->channel = -1;
+    self->timer = -1;
 
     // start the PWM subsystem if it's not already running
     if (!pwm_inited) {
@@ -213,38 +361,99 @@ STATIC mp_obj_t mp_machine_pwm_make_new(const mp_obj_type_t *type,
 }
 
 STATIC void mp_machine_pwm_deinit(machine_pwm_obj_t *self) {
-    int chan = self->channel;
+    int chan = CHANNEL_IDX(self->mode, self->channel);
 
     // Valid channel?
-    if ((chan >= 0) && (chan < LEDC_CHANNEL_MAX)) {
+    if ((chan >= 0) && (chan < PWM_CHANNEL_MAX)) {
+        // Clean up timer if necessary
+        if (!is_timer_in_use(chan, chans[chan].timer_idx)) {
+            check_esp_err(ledc_timer_rst(self->mode, self->timer));
+            // Flag it unused
+            timers[chans[chan].timer_idx].freq_hz = -1;
+        }
+
         // Mark it unused, and tell the hardware to stop routing
-        chan_gpio[chan] = -1;
-        ledc_stop(PWMODE, chan, 0);
-        self->active = 0;
+        check_esp_err(ledc_stop(self->mode, chan, 0));
+        // Disable ledc signal for the pin
+        // gpio_matrix_out(self->pin, SIG_GPIO_OUT_IDX, false, false);
+        if (self->mode == LEDC_LOW_SPEED_MODE) {
+            gpio_matrix_out(self->pin, LEDC_LS_SIG_OUT0_IDX + self->channel, false, true);
+        } else {
+            #if LEDC_SPEED_MODE_MAX > 1
+            #if CONFIG_IDF_TARGET_ESP32
+            gpio_matrix_out(self->pin, LEDC_HS_SIG_OUT0_IDX + self->channel, false, true);
+            #else
+            #error Add supported CONFIG_IDF_TARGET_ESP32_xxx
+            #endif
+            #endif
+        }
+        chans[chan].pin = -1;
+        chans[chan].timer_idx = -1;
+        self->active = false;
+        self->mode = -1;
         self->channel = -1;
-        gpio_matrix_out(self->pin, SIG_GPIO_OUT_IDX, false, false);
+        self->timer = -1;
     }
 }
 
 STATIC mp_obj_t mp_machine_pwm_freq_get(machine_pwm_obj_t *self) {
-    return MP_OBJ_NEW_SMALL_INT(timer_cfg.freq_hz);
+    return MP_OBJ_NEW_SMALL_INT(ledc_get_freq(self->mode, self->timer));
 }
 
 STATIC void mp_machine_pwm_freq_set(machine_pwm_obj_t *self, mp_int_t freq) {
-    if (!set_freq(freq)) {
-        mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("bad frequency %d"), freq);
+    if (freq == timers[TIMER_IDX(self->mode, self->timer)].freq_hz) {
+        return;
+    }
+
+    int current_timer_idx = chans[CHANNEL_IDX(self->mode, self->channel)].timer_idx;
+    bool current_in_use = is_timer_in_use(CHANNEL_IDX(self->mode, self->channel), current_timer_idx);
+
+    // Check if an already running timer with the same freq is running
+    int new_timer_idx = find_timer(freq, SAME_FREQ_ONLY, self->mode);
+
+    // If no existing timer was found, and the current one is in use, then find a new one
+    if ((new_timer_idx == -1) && current_in_use) {
+        // Have to find a new timer
+        new_timer_idx = find_timer(freq, SAME_FREQ_OR_FREE, self->mode);
+
+        if (new_timer_idx == -1) {
+            mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("out of PWM timers:%d"), PWM_TIMER_MAX); // in current mode
+        }
+    }
+
+    if ((new_timer_idx != -1) && (new_timer_idx != current_timer_idx)) {
+        // Bind the channel to the new timer
+        chans[self->channel].timer_idx = new_timer_idx;
+
+        if (ledc_bind_channel_timer(self->mode, self->channel, TIMER_IDX_TO_TIMER(new_timer_idx)) != ESP_OK) {
+            mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("failed to bind timer to channel"));
+        }
+
+        if (!current_in_use) {
+            // Free the old timer
+            check_esp_err(ledc_timer_rst(self->mode, self->timer));
+            // Flag it unused
+            timers[current_timer_idx].freq_hz = -1;
+        }
+
+        current_timer_idx = new_timer_idx;
+    }
+    self->mode = TIMER_IDX_TO_MODE(current_timer_idx);
+    self->timer = TIMER_IDX_TO_TIMER(current_timer_idx);
+
+    // Set the freq
+    set_freq(freq, &timers[current_timer_idx]);
+
+    // Reset the timer if low speed
+    if (self->mode == LEDC_LOW_SPEED_MODE) {
+        check_esp_err(ledc_timer_rst(self->mode, self->timer));
     }
 }
 
 STATIC mp_obj_t mp_machine_pwm_duty_get(machine_pwm_obj_t *self) {
-    int duty = ledc_get_duty(PWMODE, self->channel);
-    duty <<= PWRES - timer_cfg.duty_resolution;
-    return MP_OBJ_NEW_SMALL_INT(duty);
+    return MP_OBJ_NEW_SMALL_INT(get_duty(self));
 }
 
 STATIC void mp_machine_pwm_duty_set(machine_pwm_obj_t *self, mp_int_t duty) {
-    duty &= ((1 << PWRES) - 1);
-    duty >>= PWRES - timer_cfg.duty_resolution;
-    ledc_set_duty(PWMODE, self->channel, duty);
-    ledc_update_duty(PWMODE, self->channel);
+    set_duty(self, duty);
 }

From 71111cffbaef778635e212550ff3f0521c43f592 Mon Sep 17 00:00:00 2001
From: IhorNehrutsa <Ihor.Nehrutsa@gmail.com>
Date: Sun, 19 Sep 2021 00:41:42 +0300
Subject: [PATCH 1312/3533] docs/esp32: Explain ESP32 PWM modes, timers, and
 channels.

---
 docs/esp32/quickref.rst       | 26 ++++++++++++++++---
 docs/esp32/tutorial/index.rst | 22 ++++++++++++++++
 docs/esp32/tutorial/pwm.rst   | 49 +++++++++++++++++++++++++++++++++++
 3 files changed, 93 insertions(+), 4 deletions(-)
 create mode 100644 docs/esp32/tutorial/index.rst
 create mode 100644 docs/esp32/tutorial/pwm.rst

diff --git a/docs/esp32/quickref.rst b/docs/esp32/quickref.rst
index 3153ebd57130f..7391a4aa4b546 100644
--- a/docs/esp32/quickref.rst
+++ b/docs/esp32/quickref.rst
@@ -16,7 +16,7 @@ working with this board it may be useful to get an overview of the microcontroll
    :maxdepth: 1
 
    general.rst
-   tutorial/intro.rst
+   tutorial/index.rst
 
 Installing MicroPython
 ----------------------
@@ -225,13 +225,31 @@ Use the ``machine.PWM`` class::
     from machine import Pin, PWM
 
     pwm0 = PWM(Pin(0))      # create PWM object from a pin
-    pwm0.freq()             # get current frequency
+    pwm0.freq()             # get current frequency (default 5kHz)
     pwm0.freq(1000)         # set frequency
-    pwm0.duty()             # get current duty cycle
+    pwm0.duty()             # get current duty cycle (default 512, 50%)
     pwm0.duty(200)          # set duty cycle
     pwm0.deinit()           # turn off PWM on the pin
 
-    pwm2 = PWM(Pin(2), freq=20000, duty=512) # create and configure in one go
+    pwm2 = PWM(Pin(2), freq=20000, duty=512)  # create and configure in one go
+
+ESP chips have different hardware peripherals:
+
+=====================================================  ========  ========  ========
+Hardware specification                                    ESP32  ESP32-S2  ESP32-C3
+-----------------------------------------------------  --------  --------  --------
+Number of groups (speed modes)                                2         1         1
+Number of timers per group                                    4         4         4
+Number of channels per group                                  8         8         6
+-----------------------------------------------------  --------  --------  --------
+Different of PWM frequencies (groups * timers)                8         4         4
+Total PWM channels (Pins, duties) (groups * channels)        16         8         6
+=====================================================  ========  ========  ========
+
+A maximum number of PWM channels (Pins) are available on the ESP32 - 16 channels,
+but only 8 different PWM frequencies are available, the remaining 8 channels must
+have the same frequency.  On the other hand, 16 independent PWM duty cycles are
+possible at the same frequency.
 
 ADC (analog to digital conversion)
 ----------------------------------
diff --git a/docs/esp32/tutorial/index.rst b/docs/esp32/tutorial/index.rst
new file mode 100644
index 0000000000000..e9cfd9db1075c
--- /dev/null
+++ b/docs/esp32/tutorial/index.rst
@@ -0,0 +1,22 @@
+.. _esp32_tutorial:
+
+MicroPython tutorial for ESP32
+==============================
+
+This tutorial is intended to get you started using MicroPython on the ESP32
+system-on-a-chip.  If it is your first time it is recommended to follow the
+tutorial through in the order below.  Otherwise the sections are mostly self
+contained, so feel free to skip to those that interest you.
+
+The tutorial does not assume that you know Python, but it also does not attempt
+to explain any of the details of the Python language.  Instead it provides you
+with commands that are ready to run, and hopes that you will gain a bit of
+Python knowledge along the way.  To learn more about Python itself please refer
+to `<https://www.python.org>`__.
+
+.. toctree::
+   :maxdepth: 1
+   :numbered:
+
+   intro.rst
+   pwm.rst
diff --git a/docs/esp32/tutorial/pwm.rst b/docs/esp32/tutorial/pwm.rst
new file mode 100644
index 0000000000000..0c1afb213b2df
--- /dev/null
+++ b/docs/esp32/tutorial/pwm.rst
@@ -0,0 +1,49 @@
+.. _esp32_pwm: 
+
+Pulse Width Modulation
+======================
+
+Pulse width modulation (PWM) is a way to get an artificial analog output on a
+digital pin.  It achieves this by rapidly toggling the pin from low to high.
+There are two parameters associated with this: the frequency of the toggling,
+and the duty cycle.  The duty cycle is defined to be how long the pin is high
+compared with the length of a single period (low plus high time).  Maximum
+duty cycle is when the pin is high all of the time, and minimum is when it is
+low all of the time.
+
+More comprehensive example with all 16 PWM channels and 8 timers::
+
+    from machine import Pin, PWM
+    try:
+        f = 100  # Hz
+        d = 1024 // 16  # 6.25%
+        pins = (15, 2, 4, 16, 18, 19, 22, 23, 25, 26, 27, 14 , 12, 13, 32, 33)
+        pwms = []
+        for i, pin in enumerate(pins):
+            pwms.append(PWM(Pin(pin), freq=f * (i // 2 + 1), duty= 1023 if i==15 else d * (i + 1)))
+            print(pwms[i])
+    finally:
+        for pwm in pwms:
+            try:
+                pwm.deinit()
+            except:
+                pass
+
+Output is::
+
+    PWM(pin=15, freq=100, duty=64, resolution=10, mode=0, channel=0, timer=0)
+    PWM(pin=2, freq=100, duty=128, resolution=10, mode=0, channel=1, timer=0)
+    PWM(pin=4, freq=200, duty=192, resolution=10, mode=0, channel=2, timer=1)
+    PWM(pin=16, freq=200, duty=256, resolution=10, mode=0, channel=3, timer=1)
+    PWM(pin=18, freq=300, duty=320, resolution=10, mode=0, channel=4, timer=2)
+    PWM(pin=19, freq=300, duty=384, resolution=10, mode=0, channel=5, timer=2)
+    PWM(pin=22, freq=400, duty=448, resolution=10, mode=0, channel=6, timer=3)
+    PWM(pin=23, freq=400, duty=512, resolution=10, mode=0, channel=7, timer=3)
+    PWM(pin=25, freq=500, duty=576, resolution=10, mode=1, channel=0, timer=0)
+    PWM(pin=26, freq=500, duty=640, resolution=10, mode=1, channel=1, timer=0)
+    PWM(pin=27, freq=600, duty=704, resolution=10, mode=1, channel=2, timer=1)
+    PWM(pin=14, freq=600, duty=768, resolution=10, mode=1, channel=3, timer=1)
+    PWM(pin=12, freq=700, duty=832, resolution=10, mode=1, channel=4, timer=2)
+    PWM(pin=13, freq=700, duty=896, resolution=10, mode=1, channel=5, timer=2)
+    PWM(pin=32, freq=800, duty=960, resolution=10, mode=1, channel=6, timer=3)
+    PWM(pin=33, freq=800, duty=1023, resolution=10, mode=1, channel=7, timer=3)

From 7bf466a2811fcad6518441c6a2987beb590e3326 Mon Sep 17 00:00:00 2001
From: Seon Rozenblum <seon@unexpectedmaker.com>
Date: Mon, 20 Sep 2021 11:34:52 +1000
Subject: [PATCH 1313/3533] esp32/README: Updated readme with req IDF vers for
 ESP32-S2, C3 and S3.

---
 ports/esp32/README.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/ports/esp32/README.md b/ports/esp32/README.md
index c7d40070d154c..42cd588171303 100644
--- a/ports/esp32/README.md
+++ b/ports/esp32/README.md
@@ -75,6 +75,12 @@ $ source export.sh   # (or export.bat on Windows)
 The `install.sh` step only needs to be done once. You will need to source
 `export.sh` for every new session.
 
+**Note:** If you are building MicroPython for the ESP32-S2, ESP32-C3 or ESP32-S3,
+please ensure you are using the following required IDF versions:
+- ESP32-S3 currently requires latest `master`, but eventually `v4.4` or later when
+  it's available.
+- ESP32-S2 and ESP32-C3 require `v4.3.1` or later.
+
 Building the firmware
 ---------------------
 

From 35fb90bd57e1a3259aaf67cede50628da6888485 Mon Sep 17 00:00:00 2001
From: Seon Rozenblum <seon@unexpectedmaker.com>
Date: Mon, 20 Sep 2021 14:04:08 +1000
Subject: [PATCH 1314/3533] esp32/usb: Add USB host connection detection for
 CDC serial output.

This callback allows detecting if there is a USB host connected to the CDC
or not, in which case the stdout_tx should skip CDC TX writing and
flushing or the system will block.

Fixes issue #7820.
---
 ports/esp32/usb.c | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/ports/esp32/usb.c b/ports/esp32/usb.c
index 85a7a11c9ead1..21047fa2bee84 100644
--- a/ports/esp32/usb.c
+++ b/ports/esp32/usb.c
@@ -36,6 +36,7 @@
 #define CDC_ITF TINYUSB_CDC_ACM_0
 
 static uint8_t usb_rx_buf[CONFIG_USB_CDC_RX_BUFSIZE];
+static uint8_t usb_cdc_connected;
 
 static void usb_callback_rx(int itf, cdcacm_event_t *event) {
     // TODO: what happens if more chars come in during this function, are they lost?
@@ -58,6 +59,13 @@ static void usb_callback_rx(int itf, cdcacm_event_t *event) {
     }
 }
 
+void usb_callback_line_state_changed(int itf, cdcacm_event_t *event) {
+    int dtr = event->line_state_changed_data.dtr;
+    int rts = event->line_state_changed_data.rts;
+    // If dtr && rts are both true, the CDC is connected to a HOST.
+    usb_cdc_connected = dtr && rts;
+}
+
 void usb_init(void) {
     // Initialise the USB with defaults.
     tinyusb_config_t tusb_cfg = {0};
@@ -70,13 +78,20 @@ void usb_init(void) {
         .rx_unread_buf_sz = 256,
         .callback_rx = &usb_callback_rx,
         .callback_rx_wanted_char = NULL,
-        .callback_line_state_changed = NULL,
+        .callback_line_state_changed = &usb_callback_line_state_changed,
         .callback_line_coding_changed = NULL
     };
+    usb_cdc_connected = 0;
     ESP_ERROR_CHECK(tusb_cdc_acm_init(&amc_cfg));
+
 }
 
 void usb_tx_strn(const char *str, size_t len) {
+    // If no HOST is connected, we can exit this early.
+    if (usb_cdc_connected == 0) {
+        return;
+    }
+
     while (len) {
         size_t l = len;
         if (l > CONFIG_USB_CDC_TX_BUFSIZE) {

From a39a596b791f14e277ba526f9b6bd8ce2da36550 Mon Sep 17 00:00:00 2001
From: Seon Rozenblum <seon@unexpectedmaker.com>
Date: Mon, 20 Sep 2021 11:03:38 +1000
Subject: [PATCH 1315/3533] esp32/machine_pin: Block out IO16 and IO17 when
 using SPIRAM on ESP32.

Fixes issue #7819.
---
 ports/esp32/machine_pin.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/ports/esp32/machine_pin.c b/ports/esp32/machine_pin.c
index 6c1e96879f4b1..bf61122811810 100644
--- a/ports/esp32/machine_pin.c
+++ b/ports/esp32/machine_pin.c
@@ -84,8 +84,13 @@ STATIC const machine_pin_obj_t machine_pin_obj[] = {
     {{&machine_pin_type}, GPIO_NUM_13},
     {{&machine_pin_type}, GPIO_NUM_14},
     {{&machine_pin_type}, GPIO_NUM_15},
+    #if CONFIG_ESP32_SPIRAM_SUPPORT
+    {{NULL}, -1},
+    {{NULL}, -1},
+    #else
     {{&machine_pin_type}, GPIO_NUM_16},
     {{&machine_pin_type}, GPIO_NUM_17},
+    #endif
     {{&machine_pin_type}, GPIO_NUM_18},
     {{&machine_pin_type}, GPIO_NUM_19},
     {{NULL}, -1},
@@ -518,8 +523,13 @@ STATIC const machine_pin_irq_obj_t machine_pin_irq_object[] = {
     {{&machine_pin_irq_type}, GPIO_NUM_13},
     {{&machine_pin_irq_type}, GPIO_NUM_14},
     {{&machine_pin_irq_type}, GPIO_NUM_15},
+    #if CONFIG_ESP32_SPIRAM_SUPPORT
+    {{NULL}, -1},
+    {{NULL}, -1},
+    #else
     {{&machine_pin_irq_type}, GPIO_NUM_16},
     {{&machine_pin_irq_type}, GPIO_NUM_17},
+    #endif
     {{&machine_pin_irq_type}, GPIO_NUM_18},
     {{&machine_pin_irq_type}, GPIO_NUM_19},
     {{NULL}, -1},

From 4fdf795efa4eca3a9f8166e33b991a762569ae20 Mon Sep 17 00:00:00 2001
From: leo chung <gewalalb@gmail.com>
Date: Thu, 16 Sep 2021 17:02:14 +0800
Subject: [PATCH 1316/3533] esp32/mpthreadport: Fix TCB cleanup function so
 thread_mutex is ready.

Because vPortCleanUpTCB is called by the FreeRTOS idle task, and it checks
thread, but didn't check the thread_mutex.

And if thread is not NULL, but thread_mutex not ready then it will crash
with an error when calling mp_thread_mutex_lock(&thread_mutex, 1).

As suggested by @dpgeorge, move the thread = &thread_entry0 line to the end
of mp_thread_init().

Signed-off-by: leo chung <gewalalb@gmail.com>
---
 ports/esp32/mpthreadport.c | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/ports/esp32/mpthreadport.c b/ports/esp32/mpthreadport.c
index f575d99e6ec65..9d1c4a758c523 100644
--- a/ports/esp32/mpthreadport.c
+++ b/ports/esp32/mpthreadport.c
@@ -59,14 +59,19 @@ STATIC thread_t *thread = NULL; // root pointer, handled by mp_thread_gc_others
 void mp_thread_init(void *stack, uint32_t stack_len) {
     mp_thread_set_state(&mp_state_ctx.thread);
     // create the first entry in the linked list of all threads
-    thread = &thread_entry0;
-    thread->id = xTaskGetCurrentTaskHandle();
-    thread->ready = 1;
-    thread->arg = NULL;
-    thread->stack = stack;
-    thread->stack_len = stack_len;
-    thread->next = NULL;
+    thread_entry0.id = xTaskGetCurrentTaskHandle();
+    thread_entry0.ready = 1;
+    thread_entry0.arg = NULL;
+    thread_entry0.stack = stack;
+    thread_entry0.stack_len = stack_len;
+    thread_entry0.next = NULL;
     mp_thread_mutex_init(&thread_mutex);
+
+    // memory barrier to ensure above data is committed
+    __sync_synchronize();
+
+    // vPortCleanUpTCB needs the thread ready after thread_mutex is ready
+    thread = &thread_entry0;
 }
 
 void mp_thread_gc_others(void) {

From f046b50ca591e16f78ffaae3c45a19afaeba839b Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 22 Sep 2021 00:00:26 +1000
Subject: [PATCH 1317/3533] esp32/main: Add option for a board to hook code
 into startup sequence.

To do this the board must define MICROPY_BOARD_STARTUP, set
MICROPY_SOURCE_BOARD then define the new start-up code.

For example, in mpconfigboard.h:

    #define MICROPY_BOARD_STARTUP board_startup
    void board_startup(void);

in mpconfigboard.cmake:

    set(MICROPY_SOURCE_BOARD
        ${MICROPY_BOARD_DIR}/board.c
    )

and in a new board.c file in the board directory:

    #include "py/mpconfig.h"

    void board_startup(void) {
        boardctrl_startup();
        // extra custom startup
    }

This follows stm32's boardctrl facilities.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/main.c              | 10 +++++++++-
 ports/esp32/main/CMakeLists.txt |  2 ++
 ports/esp32/mpconfigport.h      |  6 ++++++
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/ports/esp32/main.c b/ports/esp32/main.c
index 2ba613668175c..ca0ab1488a125 100644
--- a/ports/esp32/main.c
+++ b/ports/esp32/main.c
@@ -202,12 +202,20 @@ void mp_task(void *pvParameter) {
     goto soft_reset;
 }
 
-void app_main(void) {
+void boardctrl_startup(void) {
     esp_err_t ret = nvs_flash_init();
     if (ret == ESP_ERR_NVS_NO_FREE_PAGES || ret == ESP_ERR_NVS_NEW_VERSION_FOUND) {
         nvs_flash_erase();
         nvs_flash_init();
     }
+}
+
+void app_main(void) {
+    // Hook for a board to run code at start up.
+    // This defaults to initialising NVS.
+    MICROPY_BOARD_STARTUP();
+
+    // Create and transfer control to the MicroPython task.
     xTaskCreatePinnedToCore(mp_task, "mp_task", MP_TASK_STACK_SIZE / sizeof(StackType_t), NULL, MP_TASK_PRIORITY, &mp_main_task_handle, MP_TASK_COREID);
 }
 
diff --git a/ports/esp32/main/CMakeLists.txt b/ports/esp32/main/CMakeLists.txt
index 75e123f4e0459..18d7dc7fae245 100644
--- a/ports/esp32/main/CMakeLists.txt
+++ b/ports/esp32/main/CMakeLists.txt
@@ -89,6 +89,7 @@ set(MICROPY_SOURCE_QSTR
     ${MICROPY_SOURCE_SHARED}
     ${MICROPY_SOURCE_LIB}
     ${MICROPY_SOURCE_PORT}
+    ${MICROPY_SOURCE_BOARD}
 )
 
 set(IDF_COMPONENTS
@@ -156,6 +157,7 @@ idf_component_register(
         ${MICROPY_SOURCE_LIB}
         ${MICROPY_SOURCE_DRIVERS}
         ${MICROPY_SOURCE_PORT}
+        ${MICROPY_SOURCE_BOARD}
     INCLUDE_DIRS
         ${MICROPY_INC_CORE}
         ${MICROPY_INC_USERMOD}
diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h
index 6a48ce5023aea..5affbb0692903 100644
--- a/ports/esp32/mpconfigport.h
+++ b/ports/esp32/mpconfigport.h
@@ -308,3 +308,9 @@ typedef long mp_off_t;
 #ifndef MICROPY_HW_ENABLE_MDNS_RESPONDER
 #define MICROPY_HW_ENABLE_MDNS_RESPONDER    (1)
 #endif
+
+#ifndef MICROPY_BOARD_STARTUP
+#define MICROPY_BOARD_STARTUP boardctrl_startup
+#endif
+
+void boardctrl_startup(void);

From ea186de4c5d69729d1a5bb607e1a302923782bee Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 22 Sep 2021 00:35:46 +1000
Subject: [PATCH 1318/3533] esp32: Split out WLAN code from modnetwork.c to
 network_wlan.c.

To match network_lan.c and network_ppp.c, and make it clear what code is
specifically for WLAN support.

Also provide a configuration option MICROPY_PY_NETWORK_WLAN which can be
used to fully disable network.WLAN (it's enabled by default).

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/main/CMakeLists.txt |   1 +
 ports/esp32/modnetwork.c        | 596 ++------------------------------
 ports/esp32/modnetwork.h        |  25 ++
 ports/esp32/mpconfigport.h      |   3 +
 ports/esp32/network_wlan.c      | 578 +++++++++++++++++++++++++++++++
 5 files changed, 627 insertions(+), 576 deletions(-)
 create mode 100644 ports/esp32/network_wlan.c

diff --git a/ports/esp32/main/CMakeLists.txt b/ports/esp32/main/CMakeLists.txt
index 18d7dc7fae245..3294ca7c048f3 100644
--- a/ports/esp32/main/CMakeLists.txt
+++ b/ports/esp32/main/CMakeLists.txt
@@ -67,6 +67,7 @@ set(MICROPY_SOURCE_PORT
     ${PROJECT_DIR}/modnetwork.c
     ${PROJECT_DIR}/network_lan.c
     ${PROJECT_DIR}/network_ppp.c
+    ${PROJECT_DIR}/network_wlan.c
     ${PROJECT_DIR}/mpnimbleport.c
     ${PROJECT_DIR}/modsocket.c
     ${PROJECT_DIR}/modesp.c
diff --git a/ports/esp32/modnetwork.c b/ports/esp32/modnetwork.c
index 2b64105e793a1..51aaa59e87915 100644
--- a/ports/esp32/modnetwork.c
+++ b/ports/esp32/modnetwork.c
@@ -31,28 +31,16 @@
  * THE SOFTWARE.
  */
 
-#include <stdio.h>
-#include <stdint.h>
 #include <string.h>
 
-#include "py/nlr.h"
-#include "py/objlist.h"
 #include "py/runtime.h"
-#include "py/mphal.h"
 #include "py/mperrno.h"
 #include "shared/netutils/netutils.h"
-#include "esp_eth.h"
+#include "modnetwork.h"
+
 #include "esp_wifi.h"
 #include "esp_log.h"
 #include "lwip/dns.h"
-#include "mdns.h"
-
-#if !MICROPY_ESP_IDF_4
-#include "esp_wifi_types.h"
-#include "esp_event_loop.h"
-#endif
-
-#include "modnetwork.h"
 
 #if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(4, 1, 0)
 #define DNS_MAIN TCPIP_ADAPTER_DNS_MAIN
@@ -62,7 +50,7 @@
 
 #define MODNETWORK_INCLUDE_CONSTANTS (1)
 
-NORETURN void _esp_exceptions(esp_err_t e) {
+NORETURN void esp_exceptions_helper(esp_err_t e) {
     switch (e) {
         case ESP_ERR_WIFI_NOT_INIT:
             mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("Wifi Not Initialized"));
@@ -107,122 +95,16 @@ NORETURN void _esp_exceptions(esp_err_t e) {
     }
 }
 
-static inline void esp_exceptions(esp_err_t e) {
-    if (e != ESP_OK) {
-        _esp_exceptions(e);
-    }
-}
-
-#define ESP_EXCEPTIONS(x) do { esp_exceptions(x); } while (0);
-
-typedef struct _wlan_if_obj_t {
-    mp_obj_base_t base;
-    int if_id;
-} wlan_if_obj_t;
-
-const mp_obj_type_t wlan_if_type;
-STATIC const wlan_if_obj_t wlan_sta_obj = {{&wlan_if_type}, WIFI_IF_STA};
-STATIC const wlan_if_obj_t wlan_ap_obj = {{&wlan_if_type}, WIFI_IF_AP};
-
-// Set to "true" if esp_wifi_start() was called
-static bool wifi_started = false;
-
-// Set to "true" if the STA interface is requested to be connected by the
-// user, used for automatic reassociation.
-static bool wifi_sta_connect_requested = false;
-
-// Set to "true" if the STA interface is connected to wifi and has IP address.
-static bool wifi_sta_connected = false;
-
-// Store the current status. 0 means None here, safe to do so as first enum value is WIFI_REASON_UNSPECIFIED=1.
-static uint8_t wifi_sta_disconn_reason = 0;
-
-#if MICROPY_HW_ENABLE_MDNS_QUERIES || MICROPY_HW_ENABLE_MDNS_RESPONDER
-// Whether mDNS has been initialised or not
-static bool mdns_initialised = false;
-#endif
-
-static uint8_t conf_wifi_sta_reconnects = 0;
-static uint8_t wifi_sta_reconnects;
-
 // This function is called by the system-event task and so runs in a different
 // thread to the main MicroPython task.  It must not raise any Python exceptions.
 static esp_err_t event_handler(void *ctx, system_event_t *event) {
     switch (event->event_id) {
         case SYSTEM_EVENT_STA_START:
-            ESP_LOGI("wifi", "STA_START");
-            wifi_sta_reconnects = 0;
-            break;
         case SYSTEM_EVENT_STA_CONNECTED:
-            ESP_LOGI("network", "CONNECTED");
-            break;
         case SYSTEM_EVENT_STA_GOT_IP:
-            ESP_LOGI("network", "GOT_IP");
-            wifi_sta_connected = true;
-            wifi_sta_disconn_reason = 0; // Success so clear error. (in case of new error will be replaced anyway)
-            #if MICROPY_HW_ENABLE_MDNS_QUERIES || MICROPY_HW_ENABLE_MDNS_RESPONDER
-            if (!mdns_initialised) {
-                mdns_init();
-                #if MICROPY_HW_ENABLE_MDNS_RESPONDER
-                const char *hostname = NULL;
-                if (tcpip_adapter_get_hostname(WIFI_IF_STA, &hostname) != ESP_OK || hostname == NULL) {
-                    hostname = "esp32";
-                }
-                mdns_hostname_set(hostname);
-                mdns_instance_name_set(hostname);
-                #endif
-                mdns_initialised = true;
-            }
-            #endif
+        case SYSTEM_EVENT_STA_DISCONNECTED:
+            network_wlan_event_handler(event);
             break;
-        case SYSTEM_EVENT_STA_DISCONNECTED: {
-            // This is a workaround as ESP32 WiFi libs don't currently
-            // auto-reassociate.
-            system_event_sta_disconnected_t *disconn = &event->event_info.disconnected;
-            char *message = "";
-            wifi_sta_disconn_reason = disconn->reason;
-            switch (disconn->reason) {
-                case WIFI_REASON_BEACON_TIMEOUT:
-                    // AP has dropped out; try to reconnect.
-                    message = "\nbeacon timeout";
-                    break;
-                case WIFI_REASON_NO_AP_FOUND:
-                    // AP may not exist, or it may have momentarily dropped out; try to reconnect.
-                    message = "\nno AP found";
-                    break;
-                case WIFI_REASON_AUTH_FAIL:
-                    // Password may be wrong, or it just failed to connect; try to reconnect.
-                    message = "\nauthentication failed";
-                    break;
-                default:
-                    // Let other errors through and try to reconnect.
-                    break;
-            }
-            ESP_LOGI("wifi", "STA_DISCONNECTED, reason:%d%s", disconn->reason, message);
-
-            wifi_sta_connected = false;
-            if (wifi_sta_connect_requested) {
-                wifi_mode_t mode;
-                if (esp_wifi_get_mode(&mode) != ESP_OK) {
-                    break;
-                }
-                if (!(mode & WIFI_MODE_STA)) {
-                    break;
-                }
-                if (conf_wifi_sta_reconnects) {
-                    ESP_LOGI("wifi", "reconnect counter=%d, max=%d",
-                        wifi_sta_reconnects, conf_wifi_sta_reconnects);
-                    if (++wifi_sta_reconnects >= conf_wifi_sta_reconnects) {
-                        break;
-                    }
-                }
-                esp_err_t e = esp_wifi_connect();
-                if (e != ESP_OK) {
-                    ESP_LOGI("wifi", "error attempting to reconnect: 0x%04x", e);
-                }
-            }
-            break;
-        }
         case SYSTEM_EVENT_GOT_IP6:
             ESP_LOGI("network", "Got IPv6");
             break;
@@ -248,49 +130,13 @@ static esp_err_t event_handler(void *ctx, system_event_t *event) {
     return ESP_OK;
 }
 
-/*void error_check(bool status, const char *msg) {
-    if (!status) {
-        mp_raise_msg(&mp_type_OSError, msg);
-    }
-}
-*/
-
-STATIC void require_if(mp_obj_t wlan_if, int if_no) {
-    wlan_if_obj_t *self = MP_OBJ_TO_PTR(wlan_if);
-    if (self->if_id != if_no) {
-        mp_raise_msg(&mp_type_OSError, if_no == WIFI_IF_STA ? MP_ERROR_TEXT("STA required") : MP_ERROR_TEXT("AP required"));
-    }
-}
-
-STATIC mp_obj_t get_wlan(size_t n_args, const mp_obj_t *args) {
-    static int initialized = 0;
-    if (!initialized) {
-        wifi_init_config_t cfg = WIFI_INIT_CONFIG_DEFAULT();
-        ESP_LOGD("modnetwork", "Initializing WiFi");
-        ESP_EXCEPTIONS(esp_wifi_init(&cfg));
-        ESP_EXCEPTIONS(esp_wifi_set_storage(WIFI_STORAGE_RAM));
-        ESP_LOGD("modnetwork", "Initialized");
-        initialized = 1;
-    }
-
-    int idx = (n_args > 0) ? mp_obj_get_int(args[0]) : WIFI_IF_STA;
-    if (idx == WIFI_IF_STA) {
-        return MP_OBJ_FROM_PTR(&wlan_sta_obj);
-    } else if (idx == WIFI_IF_AP) {
-        return MP_OBJ_FROM_PTR(&wlan_ap_obj);
-    } else {
-        mp_raise_ValueError(MP_ERROR_TEXT("invalid WLAN interface identifier"));
-    }
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(get_wlan_obj, 0, 1, get_wlan);
-
 STATIC mp_obj_t esp_initialize() {
     static int initialized = 0;
     if (!initialized) {
         ESP_LOGD("modnetwork", "Initializing TCP/IP");
         tcpip_adapter_init();
         ESP_LOGD("modnetwork", "Initializing Event Loop");
-        ESP_EXCEPTIONS(esp_event_loop_init(event_handler, NULL));
+        esp_exceptions(esp_event_loop_init(event_handler, NULL));
         ESP_LOGD("modnetwork", "esp_event_loop_init done");
         initialized = 1;
     }
@@ -298,214 +144,6 @@ STATIC mp_obj_t esp_initialize() {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_0(esp_initialize_obj, esp_initialize);
 
-#if (WIFI_MODE_STA & WIFI_MODE_AP != WIFI_MODE_NULL || WIFI_MODE_STA | WIFI_MODE_AP != WIFI_MODE_APSTA)
-#error WIFI_MODE_STA and WIFI_MODE_AP are supposed to be bitfields!
-#endif
-
-STATIC mp_obj_t esp_active(size_t n_args, const mp_obj_t *args) {
-    wlan_if_obj_t *self = MP_OBJ_TO_PTR(args[0]);
-
-    wifi_mode_t mode;
-    if (!wifi_started) {
-        mode = WIFI_MODE_NULL;
-    } else {
-        ESP_EXCEPTIONS(esp_wifi_get_mode(&mode));
-    }
-
-    int bit = (self->if_id == WIFI_IF_STA) ? WIFI_MODE_STA : WIFI_MODE_AP;
-
-    if (n_args > 1) {
-        bool active = mp_obj_is_true(args[1]);
-        mode = active ? (mode | bit) : (mode & ~bit);
-        if (mode == WIFI_MODE_NULL) {
-            if (wifi_started) {
-                ESP_EXCEPTIONS(esp_wifi_stop());
-                wifi_started = false;
-            }
-        } else {
-            ESP_EXCEPTIONS(esp_wifi_set_mode(mode));
-            if (!wifi_started) {
-                ESP_EXCEPTIONS(esp_wifi_start());
-                wifi_started = true;
-            }
-        }
-    }
-
-    return (mode & bit) ? mp_const_true : mp_const_false;
-}
-
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(esp_active_obj, 1, 2, esp_active);
-
-STATIC mp_obj_t esp_connect(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
-    enum { ARG_ssid, ARG_password, ARG_bssid };
-    static const mp_arg_t allowed_args[] = {
-        { MP_QSTR_, MP_ARG_OBJ, {.u_obj = mp_const_none} },
-        { MP_QSTR_, MP_ARG_OBJ, {.u_obj = mp_const_none} },
-        { MP_QSTR_bssid, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = mp_const_none} },
-    };
-
-    // parse args
-    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
-    mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
-
-    wifi_config_t wifi_sta_config = {0};
-
-    // configure any parameters that are given
-    if (n_args > 1) {
-        size_t len;
-        const char *p;
-        if (args[ARG_ssid].u_obj != mp_const_none) {
-            p = mp_obj_str_get_data(args[ARG_ssid].u_obj, &len);
-            memcpy(wifi_sta_config.sta.ssid, p, MIN(len, sizeof(wifi_sta_config.sta.ssid)));
-        }
-        if (args[ARG_password].u_obj != mp_const_none) {
-            p = mp_obj_str_get_data(args[ARG_password].u_obj, &len);
-            memcpy(wifi_sta_config.sta.password, p, MIN(len, sizeof(wifi_sta_config.sta.password)));
-        }
-        if (args[ARG_bssid].u_obj != mp_const_none) {
-            p = mp_obj_str_get_data(args[ARG_bssid].u_obj, &len);
-            if (len != sizeof(wifi_sta_config.sta.bssid)) {
-                mp_raise_ValueError(NULL);
-            }
-            wifi_sta_config.sta.bssid_set = 1;
-            memcpy(wifi_sta_config.sta.bssid, p, sizeof(wifi_sta_config.sta.bssid));
-        }
-        ESP_EXCEPTIONS(esp_wifi_set_config(ESP_IF_WIFI_STA, &wifi_sta_config));
-    }
-
-    wifi_sta_reconnects = 0;
-    // connect to the WiFi AP
-    MP_THREAD_GIL_EXIT();
-    ESP_EXCEPTIONS(esp_wifi_connect());
-    MP_THREAD_GIL_ENTER();
-    wifi_sta_connect_requested = true;
-
-    return mp_const_none;
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(esp_connect_obj, 1, esp_connect);
-
-STATIC mp_obj_t esp_disconnect(mp_obj_t self_in) {
-    wifi_sta_connect_requested = false;
-    ESP_EXCEPTIONS(esp_wifi_disconnect());
-    return mp_const_none;
-}
-
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(esp_disconnect_obj, esp_disconnect);
-
-// Cases similar to ESP8266 user_interface.h
-// Error cases are referenced from wifi_err_reason_t in ESP-IDF
-enum {
-    STAT_IDLE       = 1000,
-    STAT_CONNECTING = 1001,
-    STAT_GOT_IP     = 1010,
-};
-
-STATIC mp_obj_t esp_status(size_t n_args, const mp_obj_t *args) {
-    wlan_if_obj_t *self = MP_OBJ_TO_PTR(args[0]);
-    if (n_args == 1) {
-        if (self->if_id == WIFI_IF_STA) {
-            // Case of no arg is only for the STA interface
-            if (wifi_sta_connected) {
-                // Happy path, connected with IP
-                return MP_OBJ_NEW_SMALL_INT(STAT_GOT_IP);
-            } else if (wifi_sta_connect_requested
-                       && (conf_wifi_sta_reconnects == 0
-                           || wifi_sta_reconnects < conf_wifi_sta_reconnects)) {
-                // No connection or error, but is requested = Still connecting
-                return MP_OBJ_NEW_SMALL_INT(STAT_CONNECTING);
-            } else if (wifi_sta_disconn_reason == 0) {
-                // No activity, No error = Idle
-                return MP_OBJ_NEW_SMALL_INT(STAT_IDLE);
-            } else {
-                // Simply pass the error through from ESP-identifier
-                return MP_OBJ_NEW_SMALL_INT(wifi_sta_disconn_reason);
-            }
-        }
-        return mp_const_none;
-    }
-
-    // one argument: return status based on query parameter
-    switch ((uintptr_t)args[1]) {
-        case (uintptr_t)MP_OBJ_NEW_QSTR(MP_QSTR_stations): {
-            // return list of connected stations, only if in soft-AP mode
-            require_if(args[0], WIFI_IF_AP);
-            wifi_sta_list_t station_list;
-            ESP_EXCEPTIONS(esp_wifi_ap_get_sta_list(&station_list));
-            wifi_sta_info_t *stations = (wifi_sta_info_t *)station_list.sta;
-            mp_obj_t list = mp_obj_new_list(0, NULL);
-            for (int i = 0; i < station_list.num; ++i) {
-                mp_obj_tuple_t *t = mp_obj_new_tuple(1, NULL);
-                t->items[0] = mp_obj_new_bytes(stations[i].mac, sizeof(stations[i].mac));
-                mp_obj_list_append(list, t);
-            }
-            return list;
-        }
-        case (uintptr_t)MP_OBJ_NEW_QSTR(MP_QSTR_rssi): {
-            // return signal of AP, only in STA mode
-            require_if(args[0], WIFI_IF_STA);
-
-            wifi_ap_record_t info;
-            ESP_EXCEPTIONS(esp_wifi_sta_get_ap_info(&info));
-            return MP_OBJ_NEW_SMALL_INT(info.rssi);
-        }
-        default:
-            mp_raise_ValueError(MP_ERROR_TEXT("unknown status param"));
-    }
-
-    return mp_const_none;
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(esp_status_obj, 1, 2, esp_status);
-
-STATIC mp_obj_t esp_scan(mp_obj_t self_in) {
-    // check that STA mode is active
-    wifi_mode_t mode;
-    ESP_EXCEPTIONS(esp_wifi_get_mode(&mode));
-    if ((mode & WIFI_MODE_STA) == 0) {
-        mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("STA must be active"));
-    }
-
-    mp_obj_t list = mp_obj_new_list(0, NULL);
-    wifi_scan_config_t config = { 0 };
-    config.show_hidden = true;
-    MP_THREAD_GIL_EXIT();
-    esp_err_t status = esp_wifi_scan_start(&config, 1);
-    MP_THREAD_GIL_ENTER();
-    if (status == 0) {
-        uint16_t count = 0;
-        ESP_EXCEPTIONS(esp_wifi_scan_get_ap_num(&count));
-        wifi_ap_record_t *wifi_ap_records = calloc(count, sizeof(wifi_ap_record_t));
-        ESP_EXCEPTIONS(esp_wifi_scan_get_ap_records(&count, wifi_ap_records));
-        for (uint16_t i = 0; i < count; i++) {
-            mp_obj_tuple_t *t = mp_obj_new_tuple(6, NULL);
-            uint8_t *x = memchr(wifi_ap_records[i].ssid, 0, sizeof(wifi_ap_records[i].ssid));
-            int ssid_len = x ? x - wifi_ap_records[i].ssid : sizeof(wifi_ap_records[i].ssid);
-            t->items[0] = mp_obj_new_bytes(wifi_ap_records[i].ssid, ssid_len);
-            t->items[1] = mp_obj_new_bytes(wifi_ap_records[i].bssid, sizeof(wifi_ap_records[i].bssid));
-            t->items[2] = MP_OBJ_NEW_SMALL_INT(wifi_ap_records[i].primary);
-            t->items[3] = MP_OBJ_NEW_SMALL_INT(wifi_ap_records[i].rssi);
-            t->items[4] = MP_OBJ_NEW_SMALL_INT(wifi_ap_records[i].authmode);
-            t->items[5] = mp_const_false; // XXX hidden?
-            mp_obj_list_append(list, MP_OBJ_FROM_PTR(t));
-        }
-        free(wifi_ap_records);
-    }
-    return list;
-}
-
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(esp_scan_obj, esp_scan);
-
-STATIC mp_obj_t esp_isconnected(mp_obj_t self_in) {
-    wlan_if_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    if (self->if_id == WIFI_IF_STA) {
-        return mp_obj_new_bool(wifi_sta_connected);
-    } else {
-        wifi_sta_list_t sta;
-        esp_wifi_ap_get_sta_list(&sta);
-        return mp_obj_new_bool(sta.num != 0);
-    }
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(esp_isconnected_obj, esp_isconnected);
-
 STATIC mp_obj_t esp_ifconfig(size_t n_args, const mp_obj_t *args) {
     wlan_if_obj_t *self = MP_OBJ_TO_PTR(args[0]);
     tcpip_adapter_ip_info_t info;
@@ -543,18 +181,18 @@ STATIC mp_obj_t esp_ifconfig(size_t n_args, const mp_obj_t *args) {
             if (self->if_id == WIFI_IF_STA || self->if_id == ESP_IF_ETH) {
                 esp_err_t e = tcpip_adapter_dhcpc_stop(self->if_id);
                 if (e != ESP_OK && e != ESP_ERR_TCPIP_ADAPTER_DHCP_ALREADY_STOPPED) {
-                    _esp_exceptions(e);
+                    esp_exceptions_helper(e);
                 }
-                ESP_EXCEPTIONS(tcpip_adapter_set_ip_info(self->if_id, &info));
-                ESP_EXCEPTIONS(tcpip_adapter_set_dns_info(self->if_id, DNS_MAIN, &dns_info));
+                esp_exceptions(tcpip_adapter_set_ip_info(self->if_id, &info));
+                esp_exceptions(tcpip_adapter_set_dns_info(self->if_id, DNS_MAIN, &dns_info));
             } else if (self->if_id == WIFI_IF_AP) {
                 esp_err_t e = tcpip_adapter_dhcps_stop(WIFI_IF_AP);
                 if (e != ESP_OK && e != ESP_ERR_TCPIP_ADAPTER_DHCP_ALREADY_STOPPED) {
-                    _esp_exceptions(e);
+                    esp_exceptions_helper(e);
                 }
-                ESP_EXCEPTIONS(tcpip_adapter_set_ip_info(WIFI_IF_AP, &info));
-                ESP_EXCEPTIONS(tcpip_adapter_set_dns_info(WIFI_IF_AP, DNS_MAIN, &dns_info));
-                ESP_EXCEPTIONS(tcpip_adapter_dhcps_start(WIFI_IF_AP));
+                esp_exceptions(tcpip_adapter_set_ip_info(WIFI_IF_AP, &info));
+                esp_exceptions(tcpip_adapter_set_dns_info(WIFI_IF_AP, DNS_MAIN, &dns_info));
+                esp_exceptions(tcpip_adapter_dhcps_start(WIFI_IF_AP));
             }
         } else {
             // check for the correct string
@@ -562,213 +200,13 @@ STATIC mp_obj_t esp_ifconfig(size_t n_args, const mp_obj_t *args) {
             if ((self->if_id != WIFI_IF_STA && self->if_id != ESP_IF_ETH) || strcmp("dhcp", mode)) {
                 mp_raise_ValueError(MP_ERROR_TEXT("invalid arguments"));
             }
-            ESP_EXCEPTIONS(tcpip_adapter_dhcpc_start(self->if_id));
+            esp_exceptions(tcpip_adapter_dhcpc_start(self->if_id));
         }
         return mp_const_none;
     }
 }
-
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(esp_ifconfig_obj, 1, 2, esp_ifconfig);
 
-STATIC mp_obj_t esp_config(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs) {
-    if (n_args != 1 && kwargs->used != 0) {
-        mp_raise_TypeError(MP_ERROR_TEXT("either pos or kw args are allowed"));
-    }
-
-    wlan_if_obj_t *self = MP_OBJ_TO_PTR(args[0]);
-
-    bool is_wifi = self->if_id == WIFI_IF_AP || self->if_id == WIFI_IF_STA;
-
-    wifi_config_t cfg;
-    if (is_wifi) {
-        ESP_EXCEPTIONS(esp_wifi_get_config(self->if_id, &cfg));
-    }
-
-    #define QS(x) (uintptr_t)MP_OBJ_NEW_QSTR(x)
-
-    if (kwargs->used != 0) {
-        if (!is_wifi) {
-            goto unknown;
-        }
-
-        for (size_t i = 0; i < kwargs->alloc; i++) {
-            if (mp_map_slot_is_filled(kwargs, i)) {
-                int req_if = -1;
-
-                switch ((uintptr_t)kwargs->table[i].key) {
-                    case QS(MP_QSTR_mac): {
-                        mp_buffer_info_t bufinfo;
-                        mp_get_buffer_raise(kwargs->table[i].value, &bufinfo, MP_BUFFER_READ);
-                        if (bufinfo.len != 6) {
-                            mp_raise_ValueError(MP_ERROR_TEXT("invalid buffer length"));
-                        }
-                        ESP_EXCEPTIONS(esp_wifi_set_mac(self->if_id, bufinfo.buf));
-                        break;
-                    }
-                    case QS(MP_QSTR_essid): {
-                        req_if = WIFI_IF_AP;
-                        size_t len;
-                        const char *s = mp_obj_str_get_data(kwargs->table[i].value, &len);
-                        len = MIN(len, sizeof(cfg.ap.ssid));
-                        memcpy(cfg.ap.ssid, s, len);
-                        cfg.ap.ssid_len = len;
-                        break;
-                    }
-                    case QS(MP_QSTR_hidden): {
-                        req_if = WIFI_IF_AP;
-                        cfg.ap.ssid_hidden = mp_obj_is_true(kwargs->table[i].value);
-                        break;
-                    }
-                    case QS(MP_QSTR_authmode): {
-                        req_if = WIFI_IF_AP;
-                        cfg.ap.authmode = mp_obj_get_int(kwargs->table[i].value);
-                        break;
-                    }
-                    case QS(MP_QSTR_password): {
-                        req_if = WIFI_IF_AP;
-                        size_t len;
-                        const char *s = mp_obj_str_get_data(kwargs->table[i].value, &len);
-                        len = MIN(len, sizeof(cfg.ap.password) - 1);
-                        memcpy(cfg.ap.password, s, len);
-                        cfg.ap.password[len] = 0;
-                        break;
-                    }
-                    case QS(MP_QSTR_channel): {
-                        req_if = WIFI_IF_AP;
-                        cfg.ap.channel = mp_obj_get_int(kwargs->table[i].value);
-                        break;
-                    }
-                    case QS(MP_QSTR_dhcp_hostname): {
-                        const char *s = mp_obj_str_get_str(kwargs->table[i].value);
-                        ESP_EXCEPTIONS(tcpip_adapter_set_hostname(self->if_id, s));
-                        break;
-                    }
-                    case QS(MP_QSTR_max_clients): {
-                        req_if = WIFI_IF_AP;
-                        cfg.ap.max_connection = mp_obj_get_int(kwargs->table[i].value);
-                        break;
-                    }
-                    case QS(MP_QSTR_reconnects): {
-                        int reconnects = mp_obj_get_int(kwargs->table[i].value);
-                        req_if = WIFI_IF_STA;
-                        // parameter reconnects == -1 means to retry forever.
-                        // here means conf_wifi_sta_reconnects == 0 to retry forever.
-                        conf_wifi_sta_reconnects = (reconnects == -1) ? 0 : reconnects + 1;
-                        break;
-                    }
-                    default:
-                        goto unknown;
-                }
-
-                // We post-check interface requirements to save on code size
-                if (req_if >= 0) {
-                    require_if(args[0], req_if);
-                }
-            }
-        }
-
-        ESP_EXCEPTIONS(esp_wifi_set_config(self->if_id, &cfg));
-
-        return mp_const_none;
-    }
-
-    // Get config
-
-    if (n_args != 2) {
-        mp_raise_TypeError(MP_ERROR_TEXT("can query only one param"));
-    }
-
-    int req_if = -1;
-    mp_obj_t val = mp_const_none;
-
-    switch ((uintptr_t)args[1]) {
-        case QS(MP_QSTR_mac): {
-            uint8_t mac[6];
-            switch (self->if_id) {
-                case WIFI_IF_AP: // fallthrough intentional
-                case WIFI_IF_STA:
-                    ESP_EXCEPTIONS(esp_wifi_get_mac(self->if_id, mac));
-                    return mp_obj_new_bytes(mac, sizeof(mac));
-                default:
-                    goto unknown;
-            }
-        }
-        case QS(MP_QSTR_essid):
-            switch (self->if_id) {
-                case WIFI_IF_STA:
-                    val = mp_obj_new_str((char *)cfg.sta.ssid, strlen((char *)cfg.sta.ssid));
-                    break;
-                case WIFI_IF_AP:
-                    val = mp_obj_new_str((char *)cfg.ap.ssid, cfg.ap.ssid_len);
-                    break;
-                default:
-                    req_if = WIFI_IF_AP;
-            }
-            break;
-        case QS(MP_QSTR_hidden):
-            req_if = WIFI_IF_AP;
-            val = mp_obj_new_bool(cfg.ap.ssid_hidden);
-            break;
-        case QS(MP_QSTR_authmode):
-            req_if = WIFI_IF_AP;
-            val = MP_OBJ_NEW_SMALL_INT(cfg.ap.authmode);
-            break;
-        case QS(MP_QSTR_channel):
-            req_if = WIFI_IF_AP;
-            val = MP_OBJ_NEW_SMALL_INT(cfg.ap.channel);
-            break;
-        case QS(MP_QSTR_dhcp_hostname): {
-            const char *s;
-            ESP_EXCEPTIONS(tcpip_adapter_get_hostname(self->if_id, &s));
-            val = mp_obj_new_str(s, strlen(s));
-            break;
-        }
-        case QS(MP_QSTR_max_clients): {
-            val = MP_OBJ_NEW_SMALL_INT(cfg.ap.max_connection);
-            break;
-        }
-        case QS(MP_QSTR_reconnects):
-            req_if = WIFI_IF_STA;
-            int rec = conf_wifi_sta_reconnects - 1;
-            val = MP_OBJ_NEW_SMALL_INT(rec);
-            break;
-        default:
-            goto unknown;
-    }
-
-#undef QS
-
-    // We post-check interface requirements to save on code size
-    if (req_if >= 0) {
-        require_if(args[0], req_if);
-    }
-
-    return val;
-
-unknown:
-    mp_raise_ValueError(MP_ERROR_TEXT("unknown config param"));
-}
-MP_DEFINE_CONST_FUN_OBJ_KW(esp_config_obj, 1, esp_config);
-
-STATIC const mp_rom_map_elem_t wlan_if_locals_dict_table[] = {
-    { MP_ROM_QSTR(MP_QSTR_active), MP_ROM_PTR(&esp_active_obj) },
-    { MP_ROM_QSTR(MP_QSTR_connect), MP_ROM_PTR(&esp_connect_obj) },
-    { MP_ROM_QSTR(MP_QSTR_disconnect), MP_ROM_PTR(&esp_disconnect_obj) },
-    { MP_ROM_QSTR(MP_QSTR_status), MP_ROM_PTR(&esp_status_obj) },
-    { MP_ROM_QSTR(MP_QSTR_scan), MP_ROM_PTR(&esp_scan_obj) },
-    { MP_ROM_QSTR(MP_QSTR_isconnected), MP_ROM_PTR(&esp_isconnected_obj) },
-    { MP_ROM_QSTR(MP_QSTR_config), MP_ROM_PTR(&esp_config_obj) },
-    { MP_ROM_QSTR(MP_QSTR_ifconfig), MP_ROM_PTR(&esp_ifconfig_obj) },
-};
-
-STATIC MP_DEFINE_CONST_DICT(wlan_if_locals_dict, wlan_if_locals_dict_table);
-
-const mp_obj_type_t wlan_if_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_WLAN,
-    .locals_dict = (mp_obj_t)&wlan_if_locals_dict,
-};
-
 STATIC mp_obj_t esp_phy_mode(size_t n_args, const mp_obj_t *args) {
     return mp_const_none;
 }
@@ -777,7 +215,10 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(esp_phy_mode_obj, 0, 1, esp_phy_mode)
 STATIC const mp_rom_map_elem_t mp_module_network_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_network) },
     { MP_ROM_QSTR(MP_QSTR___init__), MP_ROM_PTR(&esp_initialize_obj) },
+
+    #if MICROPY_PY_NETWORK_WLAN
     { MP_ROM_QSTR(MP_QSTR_WLAN), MP_ROM_PTR(&get_wlan_obj) },
+    #endif
 
     #if (ESP_IDF_VERSION_MAJOR == 4) && (ESP_IDF_VERSION_MINOR >= 1) && (CONFIG_IDF_TARGET_ESP32)
     { MP_ROM_QSTR(MP_QSTR_LAN), MP_ROM_PTR(&get_lan_obj) },
@@ -786,6 +227,8 @@ STATIC const mp_rom_map_elem_t mp_module_network_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_phy_mode), MP_ROM_PTR(&esp_phy_mode_obj) },
 
     #if MODNETWORK_INCLUDE_CONSTANTS
+
+    #if MICROPY_PY_NETWORK_WLAN
     { MP_ROM_QSTR(MP_QSTR_STA_IF), MP_ROM_INT(WIFI_IF_STA)},
     { MP_ROM_QSTR(MP_QSTR_AP_IF), MP_ROM_INT(WIFI_IF_AP)},
 
@@ -804,6 +247,7 @@ STATIC const mp_rom_map_elem_t mp_module_network_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_AUTH_WPA2_WPA3_PSK), MP_ROM_INT(WIFI_AUTH_WPA2_WPA3_PSK) },
     #endif
     { MP_ROM_QSTR(MP_QSTR_AUTH_MAX), MP_ROM_INT(WIFI_AUTH_MAX) },
+    #endif
 
     #if (ESP_IDF_VERSION_MAJOR == 4) && (ESP_IDF_VERSION_MINOR >= 1) && (CONFIG_IDF_TARGET_ESP32)
     { MP_ROM_QSTR(MP_QSTR_PHY_LAN8720), MP_ROM_INT(PHY_LAN8720) },
diff --git a/ports/esp32/modnetwork.h b/ports/esp32/modnetwork.h
index be6aa67068b5c..7bcfa0e6fcdb4 100644
--- a/ports/esp32/modnetwork.h
+++ b/ports/esp32/modnetwork.h
@@ -26,14 +26,39 @@
 #ifndef MICROPY_INCLUDED_ESP32_MODNETWORK_H
 #define MICROPY_INCLUDED_ESP32_MODNETWORK_H
 
+#include "esp_event.h"
+
 enum { PHY_LAN8720, PHY_IP101, PHY_RTL8201, PHY_DP83848, PHY_KSZ8041 };
 enum { ETH_INITIALIZED, ETH_STARTED, ETH_STOPPED, ETH_CONNECTED, ETH_DISCONNECTED, ETH_GOT_IP };
 
+// Cases similar to ESP8266 user_interface.h
+// Error cases are referenced from wifi_err_reason_t in ESP-IDF
+enum {
+    STAT_IDLE       = 1000,
+    STAT_CONNECTING = 1001,
+    STAT_GOT_IP     = 1010,
+};
+
+typedef struct _wlan_if_obj_t {
+    mp_obj_base_t base;
+    int if_id;
+} wlan_if_obj_t;
+
+MP_DECLARE_CONST_FUN_OBJ_VAR_BETWEEN(get_wlan_obj);
 MP_DECLARE_CONST_FUN_OBJ_KW(get_lan_obj);
 MP_DECLARE_CONST_FUN_OBJ_1(ppp_make_new_obj);
 MP_DECLARE_CONST_FUN_OBJ_VAR_BETWEEN(esp_ifconfig_obj);
 MP_DECLARE_CONST_FUN_OBJ_KW(esp_config_obj);
 
+NORETURN void esp_exceptions_helper(esp_err_t e);
+
+static inline void esp_exceptions(esp_err_t e) {
+    if (e != ESP_OK) {
+        esp_exceptions_helper(e);
+    }
+}
+
 void usocket_events_deinit(void);
+void network_wlan_event_handler(system_event_t *event);
 
 #endif
diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h
index 5affbb0692903..3d1fc10e12907 100644
--- a/ports/esp32/mpconfigport.h
+++ b/ports/esp32/mpconfigport.h
@@ -174,6 +174,9 @@
 #ifndef MICROPY_PY_MACHINE_I2S
 #define MICROPY_PY_MACHINE_I2S              (1)
 #endif
+#ifndef MICROPY_PY_NETWORK_WLAN
+#define MICROPY_PY_NETWORK_WLAN             (1)
+#endif
 #ifndef MICROPY_HW_ENABLE_SDCARD
 #define MICROPY_HW_ENABLE_SDCARD            (1)
 #endif
diff --git a/ports/esp32/network_wlan.c b/ports/esp32/network_wlan.c
new file mode 100644
index 0000000000000..3af7225440c43
--- /dev/null
+++ b/ports/esp32/network_wlan.c
@@ -0,0 +1,578 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * Development of the code in this file was sponsored by Microbric Pty Ltd
+ * and Mnemote Pty Ltd
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2016, 2017 Nick Moore @mnemote
+ * Copyright (c) 2017 "Eric Poulsen" <eric@zyxod.com>
+ *
+ * Based on esp8266/modnetwork.c which is Copyright (c) 2015 Paul Sokolovsky
+ * And the ESP IDF example code which is Public Domain / CC0
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include <string.h>
+
+#include "py/objlist.h"
+#include "py/runtime.h"
+#include "modnetwork.h"
+
+#include "esp_wifi.h"
+#include "esp_log.h"
+#include "mdns.h"
+
+#if MICROPY_PY_NETWORK_WLAN
+
+#if (WIFI_MODE_STA & WIFI_MODE_AP != WIFI_MODE_NULL || WIFI_MODE_STA | WIFI_MODE_AP != WIFI_MODE_APSTA)
+#error WIFI_MODE_STA and WIFI_MODE_AP are supposed to be bitfields!
+#endif
+
+STATIC const mp_obj_type_t wlan_if_type;
+STATIC const wlan_if_obj_t wlan_sta_obj = {{&wlan_if_type}, WIFI_IF_STA};
+STATIC const wlan_if_obj_t wlan_ap_obj = {{&wlan_if_type}, WIFI_IF_AP};
+
+// Set to "true" if esp_wifi_start() was called
+static bool wifi_started = false;
+
+// Set to "true" if the STA interface is requested to be connected by the
+// user, used for automatic reassociation.
+static bool wifi_sta_connect_requested = false;
+
+// Set to "true" if the STA interface is connected to wifi and has IP address.
+static bool wifi_sta_connected = false;
+
+// Store the current status. 0 means None here, safe to do so as first enum value is WIFI_REASON_UNSPECIFIED=1.
+static uint8_t wifi_sta_disconn_reason = 0;
+
+#if MICROPY_HW_ENABLE_MDNS_QUERIES || MICROPY_HW_ENABLE_MDNS_RESPONDER
+// Whether mDNS has been initialised or not
+static bool mdns_initialised = false;
+#endif
+
+static uint8_t conf_wifi_sta_reconnects = 0;
+static uint8_t wifi_sta_reconnects;
+
+// This function is called by the system-event task and so runs in a different
+// thread to the main MicroPython task.  It must not raise any Python exceptions.
+void network_wlan_event_handler(system_event_t *event) {
+    switch (event->event_id) {
+        case SYSTEM_EVENT_STA_START:
+            ESP_LOGI("wifi", "STA_START");
+            wifi_sta_reconnects = 0;
+            break;
+        case SYSTEM_EVENT_STA_CONNECTED:
+            ESP_LOGI("network", "CONNECTED");
+            break;
+        case SYSTEM_EVENT_STA_GOT_IP:
+            ESP_LOGI("network", "GOT_IP");
+            wifi_sta_connected = true;
+            wifi_sta_disconn_reason = 0; // Success so clear error. (in case of new error will be replaced anyway)
+            #if MICROPY_HW_ENABLE_MDNS_QUERIES || MICROPY_HW_ENABLE_MDNS_RESPONDER
+            if (!mdns_initialised) {
+                mdns_init();
+                #if MICROPY_HW_ENABLE_MDNS_RESPONDER
+                const char *hostname = NULL;
+                if (tcpip_adapter_get_hostname(WIFI_IF_STA, &hostname) != ESP_OK || hostname == NULL) {
+                    hostname = "esp32";
+                }
+                mdns_hostname_set(hostname);
+                mdns_instance_name_set(hostname);
+                #endif
+                mdns_initialised = true;
+            }
+            #endif
+            break;
+        case SYSTEM_EVENT_STA_DISCONNECTED: {
+            // This is a workaround as ESP32 WiFi libs don't currently
+            // auto-reassociate.
+            system_event_sta_disconnected_t *disconn = &event->event_info.disconnected;
+            char *message = "";
+            wifi_sta_disconn_reason = disconn->reason;
+            switch (disconn->reason) {
+                case WIFI_REASON_BEACON_TIMEOUT:
+                    // AP has dropped out; try to reconnect.
+                    message = "\nbeacon timeout";
+                    break;
+                case WIFI_REASON_NO_AP_FOUND:
+                    // AP may not exist, or it may have momentarily dropped out; try to reconnect.
+                    message = "\nno AP found";
+                    break;
+                case WIFI_REASON_AUTH_FAIL:
+                    // Password may be wrong, or it just failed to connect; try to reconnect.
+                    message = "\nauthentication failed";
+                    break;
+                default:
+                    // Let other errors through and try to reconnect.
+                    break;
+            }
+            ESP_LOGI("wifi", "STA_DISCONNECTED, reason:%d%s", disconn->reason, message);
+
+            wifi_sta_connected = false;
+            if (wifi_sta_connect_requested) {
+                wifi_mode_t mode;
+                if (esp_wifi_get_mode(&mode) != ESP_OK) {
+                    break;
+                }
+                if (!(mode & WIFI_MODE_STA)) {
+                    break;
+                }
+                if (conf_wifi_sta_reconnects) {
+                    ESP_LOGI("wifi", "reconnect counter=%d, max=%d",
+                        wifi_sta_reconnects, conf_wifi_sta_reconnects);
+                    if (++wifi_sta_reconnects >= conf_wifi_sta_reconnects) {
+                        break;
+                    }
+                }
+                esp_err_t e = esp_wifi_connect();
+                if (e != ESP_OK) {
+                    ESP_LOGI("wifi", "error attempting to reconnect: 0x%04x", e);
+                }
+            }
+            break;
+        }
+        default:
+            break;
+    }
+}
+
+STATIC void require_if(mp_obj_t wlan_if, int if_no) {
+    wlan_if_obj_t *self = MP_OBJ_TO_PTR(wlan_if);
+    if (self->if_id != if_no) {
+        mp_raise_msg(&mp_type_OSError, if_no == WIFI_IF_STA ? MP_ERROR_TEXT("STA required") : MP_ERROR_TEXT("AP required"));
+    }
+}
+
+STATIC mp_obj_t get_wlan(size_t n_args, const mp_obj_t *args) {
+    static int initialized = 0;
+    if (!initialized) {
+        wifi_init_config_t cfg = WIFI_INIT_CONFIG_DEFAULT();
+        ESP_LOGD("modnetwork", "Initializing WiFi");
+        esp_exceptions(esp_wifi_init(&cfg));
+        esp_exceptions(esp_wifi_set_storage(WIFI_STORAGE_RAM));
+        ESP_LOGD("modnetwork", "Initialized");
+        initialized = 1;
+    }
+
+    int idx = (n_args > 0) ? mp_obj_get_int(args[0]) : WIFI_IF_STA;
+    if (idx == WIFI_IF_STA) {
+        return MP_OBJ_FROM_PTR(&wlan_sta_obj);
+    } else if (idx == WIFI_IF_AP) {
+        return MP_OBJ_FROM_PTR(&wlan_ap_obj);
+    } else {
+        mp_raise_ValueError(MP_ERROR_TEXT("invalid WLAN interface identifier"));
+    }
+}
+MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(get_wlan_obj, 0, 1, get_wlan);
+
+STATIC mp_obj_t network_wlan_active(size_t n_args, const mp_obj_t *args) {
+    wlan_if_obj_t *self = MP_OBJ_TO_PTR(args[0]);
+
+    wifi_mode_t mode;
+    if (!wifi_started) {
+        mode = WIFI_MODE_NULL;
+    } else {
+        esp_exceptions(esp_wifi_get_mode(&mode));
+    }
+
+    int bit = (self->if_id == WIFI_IF_STA) ? WIFI_MODE_STA : WIFI_MODE_AP;
+
+    if (n_args > 1) {
+        bool active = mp_obj_is_true(args[1]);
+        mode = active ? (mode | bit) : (mode & ~bit);
+        if (mode == WIFI_MODE_NULL) {
+            if (wifi_started) {
+                esp_exceptions(esp_wifi_stop());
+                wifi_started = false;
+            }
+        } else {
+            esp_exceptions(esp_wifi_set_mode(mode));
+            if (!wifi_started) {
+                esp_exceptions(esp_wifi_start());
+                wifi_started = true;
+            }
+        }
+    }
+
+    return (mode & bit) ? mp_const_true : mp_const_false;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(network_wlan_active_obj, 1, 2, network_wlan_active);
+
+STATIC mp_obj_t network_wlan_connect(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    enum { ARG_ssid, ARG_password, ARG_bssid };
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_, MP_ARG_OBJ, {.u_obj = mp_const_none} },
+        { MP_QSTR_, MP_ARG_OBJ, {.u_obj = mp_const_none} },
+        { MP_QSTR_bssid, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = mp_const_none} },
+    };
+
+    // parse args
+    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
+    mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
+
+    wifi_config_t wifi_sta_config = {0};
+
+    // configure any parameters that are given
+    if (n_args > 1) {
+        size_t len;
+        const char *p;
+        if (args[ARG_ssid].u_obj != mp_const_none) {
+            p = mp_obj_str_get_data(args[ARG_ssid].u_obj, &len);
+            memcpy(wifi_sta_config.sta.ssid, p, MIN(len, sizeof(wifi_sta_config.sta.ssid)));
+        }
+        if (args[ARG_password].u_obj != mp_const_none) {
+            p = mp_obj_str_get_data(args[ARG_password].u_obj, &len);
+            memcpy(wifi_sta_config.sta.password, p, MIN(len, sizeof(wifi_sta_config.sta.password)));
+        }
+        if (args[ARG_bssid].u_obj != mp_const_none) {
+            p = mp_obj_str_get_data(args[ARG_bssid].u_obj, &len);
+            if (len != sizeof(wifi_sta_config.sta.bssid)) {
+                mp_raise_ValueError(NULL);
+            }
+            wifi_sta_config.sta.bssid_set = 1;
+            memcpy(wifi_sta_config.sta.bssid, p, sizeof(wifi_sta_config.sta.bssid));
+        }
+        esp_exceptions(esp_wifi_set_config(ESP_IF_WIFI_STA, &wifi_sta_config));
+    }
+
+    wifi_sta_reconnects = 0;
+    // connect to the WiFi AP
+    MP_THREAD_GIL_EXIT();
+    esp_exceptions(esp_wifi_connect());
+    MP_THREAD_GIL_ENTER();
+    wifi_sta_connect_requested = true;
+
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_KW(network_wlan_connect_obj, 1, network_wlan_connect);
+
+STATIC mp_obj_t network_wlan_disconnect(mp_obj_t self_in) {
+    wifi_sta_connect_requested = false;
+    esp_exceptions(esp_wifi_disconnect());
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(network_wlan_disconnect_obj, network_wlan_disconnect);
+
+STATIC mp_obj_t network_wlan_status(size_t n_args, const mp_obj_t *args) {
+    wlan_if_obj_t *self = MP_OBJ_TO_PTR(args[0]);
+    if (n_args == 1) {
+        if (self->if_id == WIFI_IF_STA) {
+            // Case of no arg is only for the STA interface
+            if (wifi_sta_connected) {
+                // Happy path, connected with IP
+                return MP_OBJ_NEW_SMALL_INT(STAT_GOT_IP);
+            } else if (wifi_sta_connect_requested
+                       && (conf_wifi_sta_reconnects == 0
+                           || wifi_sta_reconnects < conf_wifi_sta_reconnects)) {
+                // No connection or error, but is requested = Still connecting
+                return MP_OBJ_NEW_SMALL_INT(STAT_CONNECTING);
+            } else if (wifi_sta_disconn_reason == 0) {
+                // No activity, No error = Idle
+                return MP_OBJ_NEW_SMALL_INT(STAT_IDLE);
+            } else {
+                // Simply pass the error through from ESP-identifier
+                return MP_OBJ_NEW_SMALL_INT(wifi_sta_disconn_reason);
+            }
+        }
+        return mp_const_none;
+    }
+
+    // one argument: return status based on query parameter
+    switch ((uintptr_t)args[1]) {
+        case (uintptr_t)MP_OBJ_NEW_QSTR(MP_QSTR_stations): {
+            // return list of connected stations, only if in soft-AP mode
+            require_if(args[0], WIFI_IF_AP);
+            wifi_sta_list_t station_list;
+            esp_exceptions(esp_wifi_ap_get_sta_list(&station_list));
+            wifi_sta_info_t *stations = (wifi_sta_info_t *)station_list.sta;
+            mp_obj_t list = mp_obj_new_list(0, NULL);
+            for (int i = 0; i < station_list.num; ++i) {
+                mp_obj_tuple_t *t = mp_obj_new_tuple(1, NULL);
+                t->items[0] = mp_obj_new_bytes(stations[i].mac, sizeof(stations[i].mac));
+                mp_obj_list_append(list, t);
+            }
+            return list;
+        }
+        case (uintptr_t)MP_OBJ_NEW_QSTR(MP_QSTR_rssi): {
+            // return signal of AP, only in STA mode
+            require_if(args[0], WIFI_IF_STA);
+
+            wifi_ap_record_t info;
+            esp_exceptions(esp_wifi_sta_get_ap_info(&info));
+            return MP_OBJ_NEW_SMALL_INT(info.rssi);
+        }
+        default:
+            mp_raise_ValueError(MP_ERROR_TEXT("unknown status param"));
+    }
+
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(network_wlan_status_obj, 1, 2, network_wlan_status);
+
+STATIC mp_obj_t network_wlan_scan(mp_obj_t self_in) {
+    // check that STA mode is active
+    wifi_mode_t mode;
+    esp_exceptions(esp_wifi_get_mode(&mode));
+    if ((mode & WIFI_MODE_STA) == 0) {
+        mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("STA must be active"));
+    }
+
+    mp_obj_t list = mp_obj_new_list(0, NULL);
+    wifi_scan_config_t config = { 0 };
+    config.show_hidden = true;
+    MP_THREAD_GIL_EXIT();
+    esp_err_t status = esp_wifi_scan_start(&config, 1);
+    MP_THREAD_GIL_ENTER();
+    if (status == 0) {
+        uint16_t count = 0;
+        esp_exceptions(esp_wifi_scan_get_ap_num(&count));
+        wifi_ap_record_t *wifi_ap_records = calloc(count, sizeof(wifi_ap_record_t));
+        esp_exceptions(esp_wifi_scan_get_ap_records(&count, wifi_ap_records));
+        for (uint16_t i = 0; i < count; i++) {
+            mp_obj_tuple_t *t = mp_obj_new_tuple(6, NULL);
+            uint8_t *x = memchr(wifi_ap_records[i].ssid, 0, sizeof(wifi_ap_records[i].ssid));
+            int ssid_len = x ? x - wifi_ap_records[i].ssid : sizeof(wifi_ap_records[i].ssid);
+            t->items[0] = mp_obj_new_bytes(wifi_ap_records[i].ssid, ssid_len);
+            t->items[1] = mp_obj_new_bytes(wifi_ap_records[i].bssid, sizeof(wifi_ap_records[i].bssid));
+            t->items[2] = MP_OBJ_NEW_SMALL_INT(wifi_ap_records[i].primary);
+            t->items[3] = MP_OBJ_NEW_SMALL_INT(wifi_ap_records[i].rssi);
+            t->items[4] = MP_OBJ_NEW_SMALL_INT(wifi_ap_records[i].authmode);
+            t->items[5] = mp_const_false; // XXX hidden?
+            mp_obj_list_append(list, MP_OBJ_FROM_PTR(t));
+        }
+        free(wifi_ap_records);
+    }
+    return list;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(network_wlan_scan_obj, network_wlan_scan);
+
+STATIC mp_obj_t network_wlan_isconnected(mp_obj_t self_in) {
+    wlan_if_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    if (self->if_id == WIFI_IF_STA) {
+        return mp_obj_new_bool(wifi_sta_connected);
+    } else {
+        wifi_sta_list_t sta;
+        esp_wifi_ap_get_sta_list(&sta);
+        return mp_obj_new_bool(sta.num != 0);
+    }
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(network_wlan_isconnected_obj, network_wlan_isconnected);
+
+STATIC mp_obj_t network_wlan_config(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs) {
+    if (n_args != 1 && kwargs->used != 0) {
+        mp_raise_TypeError(MP_ERROR_TEXT("either pos or kw args are allowed"));
+    }
+
+    wlan_if_obj_t *self = MP_OBJ_TO_PTR(args[0]);
+
+    bool is_wifi = self->if_id == WIFI_IF_AP || self->if_id == WIFI_IF_STA;
+
+    wifi_config_t cfg;
+    if (is_wifi) {
+        esp_exceptions(esp_wifi_get_config(self->if_id, &cfg));
+    }
+
+    #define QS(x) (uintptr_t)MP_OBJ_NEW_QSTR(x)
+
+    if (kwargs->used != 0) {
+        if (!is_wifi) {
+            goto unknown;
+        }
+
+        for (size_t i = 0; i < kwargs->alloc; i++) {
+            if (mp_map_slot_is_filled(kwargs, i)) {
+                int req_if = -1;
+
+                switch ((uintptr_t)kwargs->table[i].key) {
+                    case QS(MP_QSTR_mac): {
+                        mp_buffer_info_t bufinfo;
+                        mp_get_buffer_raise(kwargs->table[i].value, &bufinfo, MP_BUFFER_READ);
+                        if (bufinfo.len != 6) {
+                            mp_raise_ValueError(MP_ERROR_TEXT("invalid buffer length"));
+                        }
+                        esp_exceptions(esp_wifi_set_mac(self->if_id, bufinfo.buf));
+                        break;
+                    }
+                    case QS(MP_QSTR_essid): {
+                        req_if = WIFI_IF_AP;
+                        size_t len;
+                        const char *s = mp_obj_str_get_data(kwargs->table[i].value, &len);
+                        len = MIN(len, sizeof(cfg.ap.ssid));
+                        memcpy(cfg.ap.ssid, s, len);
+                        cfg.ap.ssid_len = len;
+                        break;
+                    }
+                    case QS(MP_QSTR_hidden): {
+                        req_if = WIFI_IF_AP;
+                        cfg.ap.ssid_hidden = mp_obj_is_true(kwargs->table[i].value);
+                        break;
+                    }
+                    case QS(MP_QSTR_authmode): {
+                        req_if = WIFI_IF_AP;
+                        cfg.ap.authmode = mp_obj_get_int(kwargs->table[i].value);
+                        break;
+                    }
+                    case QS(MP_QSTR_password): {
+                        req_if = WIFI_IF_AP;
+                        size_t len;
+                        const char *s = mp_obj_str_get_data(kwargs->table[i].value, &len);
+                        len = MIN(len, sizeof(cfg.ap.password) - 1);
+                        memcpy(cfg.ap.password, s, len);
+                        cfg.ap.password[len] = 0;
+                        break;
+                    }
+                    case QS(MP_QSTR_channel): {
+                        req_if = WIFI_IF_AP;
+                        cfg.ap.channel = mp_obj_get_int(kwargs->table[i].value);
+                        break;
+                    }
+                    case QS(MP_QSTR_dhcp_hostname): {
+                        const char *s = mp_obj_str_get_str(kwargs->table[i].value);
+                        esp_exceptions(tcpip_adapter_set_hostname(self->if_id, s));
+                        break;
+                    }
+                    case QS(MP_QSTR_max_clients): {
+                        req_if = WIFI_IF_AP;
+                        cfg.ap.max_connection = mp_obj_get_int(kwargs->table[i].value);
+                        break;
+                    }
+                    case QS(MP_QSTR_reconnects): {
+                        int reconnects = mp_obj_get_int(kwargs->table[i].value);
+                        req_if = WIFI_IF_STA;
+                        // parameter reconnects == -1 means to retry forever.
+                        // here means conf_wifi_sta_reconnects == 0 to retry forever.
+                        conf_wifi_sta_reconnects = (reconnects == -1) ? 0 : reconnects + 1;
+                        break;
+                    }
+                    default:
+                        goto unknown;
+                }
+
+                // We post-check interface requirements to save on code size
+                if (req_if >= 0) {
+                    require_if(args[0], req_if);
+                }
+            }
+        }
+
+        esp_exceptions(esp_wifi_set_config(self->if_id, &cfg));
+
+        return mp_const_none;
+    }
+
+    // Get config
+
+    if (n_args != 2) {
+        mp_raise_TypeError(MP_ERROR_TEXT("can query only one param"));
+    }
+
+    int req_if = -1;
+    mp_obj_t val = mp_const_none;
+
+    switch ((uintptr_t)args[1]) {
+        case QS(MP_QSTR_mac): {
+            uint8_t mac[6];
+            switch (self->if_id) {
+                case WIFI_IF_AP: // fallthrough intentional
+                case WIFI_IF_STA:
+                    esp_exceptions(esp_wifi_get_mac(self->if_id, mac));
+                    return mp_obj_new_bytes(mac, sizeof(mac));
+                default:
+                    goto unknown;
+            }
+        }
+        case QS(MP_QSTR_essid):
+            switch (self->if_id) {
+                case WIFI_IF_STA:
+                    val = mp_obj_new_str((char *)cfg.sta.ssid, strlen((char *)cfg.sta.ssid));
+                    break;
+                case WIFI_IF_AP:
+                    val = mp_obj_new_str((char *)cfg.ap.ssid, cfg.ap.ssid_len);
+                    break;
+                default:
+                    req_if = WIFI_IF_AP;
+            }
+            break;
+        case QS(MP_QSTR_hidden):
+            req_if = WIFI_IF_AP;
+            val = mp_obj_new_bool(cfg.ap.ssid_hidden);
+            break;
+        case QS(MP_QSTR_authmode):
+            req_if = WIFI_IF_AP;
+            val = MP_OBJ_NEW_SMALL_INT(cfg.ap.authmode);
+            break;
+        case QS(MP_QSTR_channel):
+            req_if = WIFI_IF_AP;
+            val = MP_OBJ_NEW_SMALL_INT(cfg.ap.channel);
+            break;
+        case QS(MP_QSTR_dhcp_hostname): {
+            const char *s;
+            esp_exceptions(tcpip_adapter_get_hostname(self->if_id, &s));
+            val = mp_obj_new_str(s, strlen(s));
+            break;
+        }
+        case QS(MP_QSTR_max_clients): {
+            val = MP_OBJ_NEW_SMALL_INT(cfg.ap.max_connection);
+            break;
+        }
+        case QS(MP_QSTR_reconnects):
+            req_if = WIFI_IF_STA;
+            int rec = conf_wifi_sta_reconnects - 1;
+            val = MP_OBJ_NEW_SMALL_INT(rec);
+            break;
+        default:
+            goto unknown;
+    }
+
+#undef QS
+
+    // We post-check interface requirements to save on code size
+    if (req_if >= 0) {
+        require_if(args[0], req_if);
+    }
+
+    return val;
+
+unknown:
+    mp_raise_ValueError(MP_ERROR_TEXT("unknown config param"));
+}
+MP_DEFINE_CONST_FUN_OBJ_KW(network_wlan_config_obj, 1, network_wlan_config);
+
+STATIC const mp_rom_map_elem_t wlan_if_locals_dict_table[] = {
+    { MP_ROM_QSTR(MP_QSTR_active), MP_ROM_PTR(&network_wlan_active_obj) },
+    { MP_ROM_QSTR(MP_QSTR_connect), MP_ROM_PTR(&network_wlan_connect_obj) },
+    { MP_ROM_QSTR(MP_QSTR_disconnect), MP_ROM_PTR(&network_wlan_disconnect_obj) },
+    { MP_ROM_QSTR(MP_QSTR_status), MP_ROM_PTR(&network_wlan_status_obj) },
+    { MP_ROM_QSTR(MP_QSTR_scan), MP_ROM_PTR(&network_wlan_scan_obj) },
+    { MP_ROM_QSTR(MP_QSTR_isconnected), MP_ROM_PTR(&network_wlan_isconnected_obj) },
+    { MP_ROM_QSTR(MP_QSTR_config), MP_ROM_PTR(&network_wlan_config_obj) },
+    { MP_ROM_QSTR(MP_QSTR_ifconfig), MP_ROM_PTR(&esp_ifconfig_obj) },
+};
+STATIC MP_DEFINE_CONST_DICT(wlan_if_locals_dict, wlan_if_locals_dict_table);
+
+STATIC const mp_obj_type_t wlan_if_type = {
+    { &mp_type_type },
+    .name = MP_QSTR_WLAN,
+    .locals_dict = (mp_obj_t)&wlan_if_locals_dict,
+};
+
+#endif // MICROPY_PY_NETWORK_WLAN

From ea880d5674b987aa3d3b196d2e6baadcb69c4c06 Mon Sep 17 00:00:00 2001
From: stijn <stijn@ignitron.net>
Date: Tue, 21 Sep 2021 12:00:01 +0200
Subject: [PATCH 1319/3533] py/builtinimport: Forward all debug printing to
 MICROPY_DEBUG_PRINTER.

---
 py/builtinimport.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/py/builtinimport.c b/py/builtinimport.c
index cdee5e4070bbd..08921f873b803 100644
--- a/py/builtinimport.c
+++ b/py/builtinimport.c
@@ -248,7 +248,7 @@ mp_obj_t mp_builtin___import__(size_t n_args, const mp_obj_t *args) {
     DEBUG_printf("__import__:\n");
     for (size_t i = 0; i < n_args; i++) {
         DEBUG_printf("  ");
-        mp_obj_print(args[i], PRINT_REPR);
+        mp_obj_print_helper(MICROPY_DEBUG_PRINTER, args[i], PRINT_REPR);
         DEBUG_printf("\n");
     }
     #endif
@@ -292,7 +292,7 @@ mp_obj_t mp_builtin___import__(size_t n_args, const mp_obj_t *args) {
 
         #if DEBUG_PRINT
         DEBUG_printf("Current module/package: ");
-        mp_obj_print(this_name_q, PRINT_REPR);
+        mp_obj_print_helper(MICROPY_DEBUG_PRINTER, this_name_q, PRINT_REPR);
         DEBUG_printf(", is_package: %d", is_pkg);
         DEBUG_printf("\n");
         #endif

From d42cba0d22cac812cc5a12f4670010b45932eafa Mon Sep 17 00:00:00 2001
From: stijn <stijn@ignitron.net>
Date: Tue, 21 Sep 2021 12:42:39 +0200
Subject: [PATCH 1320/3533] extmod/moduplatform: Improve implementation for PC
 ports.

Fix identification of 32/64 bit and of the Windows platform and add a
platform string mimicking CPython for the latter.
---
 extmod/moduplatform.c | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/extmod/moduplatform.c b/extmod/moduplatform.c
index 06bb9d5ce8c2b..149df7c56ffaa 100644
--- a/extmod/moduplatform.c
+++ b/extmod/moduplatform.c
@@ -40,8 +40,10 @@
 
 #if defined(__ARM_ARCH)
 #define PLATFORM_ARCH   "arm"
-#elif defined(__x86_64__)
+#elif defined(__x86_64__) || defined(_WIN64)
 #define PLATFORM_ARCH   "x86_64"
+#elif defined(__i386__) || defined(_M_IX86)
+#define PLATFORM_ARCH   "x86"
 #else
 #define PLATFORM_ARCH   ""
 #endif
@@ -58,6 +60,16 @@
     MP_STRINGIFY((__ARMCC_VERSION / 1000000)) "." \
     MP_STRINGIFY((__ARMCC_VERSION / 10000 % 100)) "." \
     MP_STRINGIFY((__ARMCC_VERSION % 10000))
+#elif defined(_MSC_VER)
+#if defined(_WIN64)
+#define COMPILER_BITS "64 bit"
+#elif defined(_M_IX86)
+#define COMPILER_BITS "32 bit"
+#else
+#define COMPILER_BITS ""
+#endif
+#define PLATFORM_COMPILER \
+    "MSC v." MP_STRINGIFY(_MSC_VER) " " COMPILER_BITS
 #else
 #define PLATFORM_COMPILER       ""
 #endif
@@ -81,7 +93,7 @@
 #define PLATFORM_SYSTEM     "Unix"
 #elif defined(__CYGWIN__)
 #define PLATFORM_SYSTEM     "Cygwin"
-#elif defined(__WIN32__)
+#elif defined(_WIN32)
 #define PLATFORM_SYSTEM     "Windows"
 #else
 #define PLATFORM_SYSTEM     "MicroPython"
@@ -95,6 +107,10 @@
 #define MICROPY_HW_MCU_NAME     ""
 #endif
 
+#ifndef MICROPY_HAL_VERSION
+#define MICROPY_HAL_VERSION     ""
+#endif
+
 STATIC const MP_DEFINE_STR_OBJ(info_platform_obj, PLATFORM_SYSTEM "-" MICROPY_VERSION_STRING "-HAL" \
     MICROPY_HAL_VERSION "-" PLATFORM_ARCH "-with-" PLATFORM_LIBC_LIB "" PLATFORM_LIBC_VER);
 STATIC const MP_DEFINE_STR_OBJ(info_python_compiler_obj, PLATFORM_COMPILER);

From baa5a76fc09855dd0899077c09d72ba5d8681442 Mon Sep 17 00:00:00 2001
From: NitiKaur <nitikaur102@gmail.com>
Date: Wed, 7 Jul 2021 02:40:32 +0530
Subject: [PATCH 1321/3533] docs/rp2: Add reference for PIO assembly
 instructions, and PIO tutorial.

---
 docs/library/rp2.rst        | 152 ++++++++++++++++++++++++++++++++++++
 docs/rp2/tutorial/intro.rst |   5 ++
 docs/rp2/tutorial/pio.rst   | 123 +++++++++++++++++++++++++++++
 3 files changed, 280 insertions(+)
 create mode 100644 docs/rp2/tutorial/pio.rst

diff --git a/docs/library/rp2.rst b/docs/library/rp2.rst
index 5d168bce20262..43143fe08977c 100644
--- a/docs/library/rp2.rst
+++ b/docs/library/rp2.rst
@@ -72,6 +72,158 @@ For running PIO programs, see :class:`rp2.StateMachine`.
     an error assembling a PIO program.
 
 
+PIO assembly language instructions
+----------------------------------
+
+PIO state machines are programmed in a custom assembly language with nine core
+PIO-machine instructions.  In MicroPython, PIO assembly routines are written as
+a Python function with the decorator ``@rp2.asm_pio()``, and they use Python
+syntax.  Such routines support standard Python variables and arithmetic, as well
+as the following custom functions that encode PIO instructions and direct the
+assembler.  See sec 3.4 of the RP2040 datasheet for further details.
+
+wrap_target()
+    Specify the location where execution continues after program wrapping.
+    By default this is the start of the PIO routine.
+
+wrap()
+    Specify the location where the program finishes and wraps around.
+    If this directive is not used then it is added automatically at the end of
+    the PIO routine.  Wrapping does not cost any execution cycles.
+
+label(label)
+    Define a label called *label* at the current location.  *label* can be a
+    string or integer.
+
+word(instr, label=None)
+    Insert an arbitrary 16-bit word in the assembled output.
+
+    - *instr*: the 16-bit value
+    - *label*: if given, look up the label and logical-or the label's value with
+      *instr*
+
+jmp(...)
+    This instruction takes two forms:
+
+    jmp(label)
+        - *label*: label to jump to unconditionally
+
+    jmp(cond, label)
+        - *cond*: the condition to check, one of:
+
+            - ``not_x``, ``not_y``: true if register is zero
+            - ``x_dec``, ``y_dec``: true if register is non-zero, and do post
+              decrement
+            - ``x_not_y``: true if X is not equal to Y
+            - ``pin``: true if the input pin is set
+            - ``not_osre``: true if OSR is not empty (hasn't reached its
+              threshold)
+
+        - *label*: label to jump to if condition is true
+
+wait(polarity, src, index)
+    Block, waiting for high/low on a pin or IRQ line.
+
+    - *polarity*: 0 or 1, whether to wait for a low or high value
+    - *src*: one of: ``gpio`` (absolute pin), ``pin`` (pin relative to
+      StateMachine's ``in_base`` argument), ``irq``
+    - *index*: 0-31, the index for *src*
+
+in_(src, bit_count)
+    Shift data in from *src* to ISR.
+
+    - *src*: one of: ``pins``, ``x``, ``y``, ``null``, ``isr``, ``osr``
+    - *bit_count*: number of bits to shift in (1-32)
+
+out(dest, bit_count)
+    Shift data out from OSR to *dest*.
+
+    - *dest*: one of: ``pins``, ``x``, ``y``, ``pindirs``, ``pc``, ``isr``,
+      ``exec``
+    - *bit_count*: number of bits to shift out (1-32)
+
+push(...)
+    Push ISR to the RX FIFO, then clear ISR to zero.
+    This instruction takes the following forms:
+
+    - push()
+    - push(block)
+    - push(noblock)
+    - push(iffull)
+    - push(iffull, block)
+    - push(iffull, noblock)
+
+    If ``block`` is used then the instruction stalls if the RX FIFO is full.
+    The default is to block.  If ``iffull`` is used then it only pushes if the
+    input shift count has reached its threshold.
+
+pull(...)
+    Pull from the TX FIFO into OSR.
+    This instruction takes the following forms:
+
+    - pull()
+    - pull(block)
+    - pull(noblock)
+    - pull(ifempty)
+    - pull(ifempty, block)
+    - pull(ifempty, noblock)
+
+    If ``block`` is used then the instruction stalls if the TX FIFO is empty.
+    The default is to block.  If ``ifempty`` is used then it only pulls if the
+    output shift count has reached its threshold.
+
+mov(dest, src)
+    Move into *dest* the value from *src*.
+
+    - *dest*: one of: ``pins``, ``x``, ``y``, ``exec``, ``pc``, ``isr``, ``osr``
+    - *src*: one of: ``pins``, ``x``, ``y``, ``null``, ``status``, ``isr``,
+      ``osr``; this argument can be optionally modified by wrapping it in
+      ``invert()`` or ``reverse()`` (but not both together)
+
+irq(...)
+    Set or clear an IRQ flag.
+    This instruction takes two forms:
+
+    irq(index)
+        - *index*: 0-7, or ``rel(0)`` to ``rel(7)``
+
+    irq(mode, index)
+        - *mode*: one of: ``block``, ``clear``
+        - *index*: 0-7, or ``rel(0)`` to ``rel(7)``
+
+    If ``block`` is used then the instruction stalls until the flag is cleared
+    by another entity.  If ``clear`` is used then the flag is cleared instead of
+    being set.  Relative IRQ indices add the state machine ID to the IRQ index
+    with modulo-4 addition.  IRQs 0-3 are visible from to the processor, 4-7 are
+    internal to the state machines.
+
+set(dest, data)
+    Set *dest* with the value *data*.
+
+    - *dest*: ``pins``, ``x``, ``y``, ``pindirs``
+    - *data*: value (0-31)
+
+nop()
+    This is a pseudoinstruction that assembles to ``mov(y, y)`` and has no side
+    effect.
+
+.side(value)
+    This is a modifier which can be applied to any instruction, and is used to
+    control side-set pin values.
+
+    - *value*: the value (bits) to output on the side-set pins
+
+.delay(value)
+    This is a modifier which can be applied to any instruction, and specifies
+    how many cycles to delay for after the instruction executes.
+
+    - *value*: cycles to delay, 0-31 (maximum value reduced if side-set pins are
+      used)
+
+[value]
+    This is a modifier and is equivalent to ``.delay(value)``.
+
+
 Classes
 -------
 
diff --git a/docs/rp2/tutorial/intro.rst b/docs/rp2/tutorial/intro.rst
index 5609ab3798df8..69c3e6b0a54ae 100644
--- a/docs/rp2/tutorial/intro.rst
+++ b/docs/rp2/tutorial/intro.rst
@@ -4,3 +4,8 @@ Getting started with MicroPython on the RP2xxx
 ==============================================
 
 Let's get started!
+
+.. toctree::
+    :maxdepth: 1
+
+    pio.rst
diff --git a/docs/rp2/tutorial/pio.rst b/docs/rp2/tutorial/pio.rst
new file mode 100644
index 0000000000000..9981aed832e7e
--- /dev/null
+++ b/docs/rp2/tutorial/pio.rst
@@ -0,0 +1,123 @@
+Programmable IO
+===============
+
+The RP2040 has hardware support for standard communication protocols like I2C,
+SPI and UART. For protocols where there is no hardware support, or where there
+is a requirement of custom I/O behaviour, Programmable Input Output (PIO) comes
+into play.  Also, some MicroPython applications make use of a technique called
+bit banging in which pins are rapidly turned on and off to transmit data.  This
+can make the entire process slow as the processor concentrates on bit banging
+rather than executing other logic.  However, PIO allows bit banging to happen
+in the background while the CPU is executing the main work.
+
+Along with the two central Cortex-M0+ processing cores, the RP2040 has two PIO
+blocks each of which has four independent state machines.  These state machines
+can transfer data to/from other entities using First-In-First-Out (FIFO) buffers,
+which allow the state machine and main processor to work independently yet also
+synchronise their data.  Each FIFO has four words (each of 32 bits) which can be
+linked to the DMA to transfer larger amounts of data.
+
+All PIO instructions follow a common pattern::
+
+    <instruction> .side(<side_set_value>) [<delay_value>]
+
+The side-set ``.side(...)`` and delay ``[...]`` parts are both optional, and if
+specified allow the instruction to perform more than one operation.  This keeps
+PIO programs small and efficient.
+
+There are nine instructions which perform the following tasks:
+
+- ``jmp()`` transfers control to a different part of the code
+- ``wait()`` pauses until a particular action happens
+- ``in_()`` shifts the bits from a source (scratch register or set of pins) to the
+  input shift register
+- ``out()`` shifts the bits from the output shift register to a destination
+- ``push()`` sends data to the RX FIFO
+- ``pull()`` receives data from the TX FIFO
+- ``mov()`` moves data from a source to a destination
+- ``irq()`` sets or clears an IRQ flag
+- ``set()`` writes a literal value to a destination
+
+The instruction modifiers are:
+
+- ``.side()`` sets the side-set pins at the start of the instruction
+- ``[]`` delays for a certain number of cycles after execution of the instruction
+
+There are also directives:
+
+- ``wrap_target()`` specifies where the program execution will get continued from
+- ``wrap()`` specifies the instruction where the control flow of the program will
+  get wrapped from
+- ``label()`` sets a label for use with ``jmp()`` instructions
+- ``word()`` emits a raw 16-bit value which acts as an instruction in the program
+
+An example
+----------
+
+Take the ``pio_1hz.py`` example for a simple understanding of how to use the PIO
+and state machines. Below is the code for reference.
+
+.. code-block:: python3
+
+    # Example using PIO to blink an LED and raise an IRQ at 1Hz.
+
+    import time
+    from machine import Pin
+    import rp2
+
+
+    @rp2.asm_pio(set_init=rp2.PIO.OUT_LOW)
+    def blink_1hz():
+        # Cycles: 1 + 1 + 6 + 32 * (30 + 1) = 1000
+        irq(rel(0))
+        set(pins, 1)
+        set(x, 31)                  [5]
+        label("delay_high")
+        nop()                       [29]
+        jmp(x_dec, "delay_high")
+
+        # Cycles: 1 + 7 + 32 * (30 + 1) = 1000
+        set(pins, 0)
+        set(x, 31)                  [6]
+        label("delay_low")
+        nop()                       [29]
+        jmp(x_dec, "delay_low")
+
+
+    # Create the StateMachine with the blink_1hz program, outputting on Pin(25).
+    sm = rp2.StateMachine(0, blink_1hz, freq=2000, set_base=Pin(25))
+
+    # Set the IRQ handler to print the millisecond timestamp.
+    sm.irq(lambda p: print(time.ticks_ms()))
+
+    # Start the StateMachine.
+    sm.active(1)
+
+This creates an instance of class :class:`rp2.StateMachine` which runs the
+``blink_1hz`` program at 2000Hz, and connects to pin 25.  The ``blink_1hz``
+program uses the PIO to blink an LED connected to this pin at 1Hz, and also
+raises an IRQ as the LED turns on.  This IRQ then calls the ``lambda`` function
+which prints out a millisecond timestamp.
+
+The ``blink_1hz`` program is a PIO assembler routine.  It connects to a single
+pin which is configured as an output and starts out low.  The instructions do
+the following:
+
+- ``irq(rel(0))`` raises the IRQ associated with the state machine.
+- The LED is turned on via the ``set(pins, 1)`` instruction.
+- The value 31 is put into register X, and then there is a delay for 5 more
+  cycles, specified by the ``[5]``.
+- The ``nop() [29]`` instruction waits for 30 cycles.
+- The ``jmp(x_dec, "delay_high")`` will keep looping to the ``delay_high`` label
+  as long as the register X is non-zero, and will also post-decrement X.  Since
+  X starts with the value 31 this jump will happen 31 times, so the ``nop() [29]``
+  runs 32 times in total (note there is also one instruction cycle taken by the
+  ``jmp`` for each of these 32 loops).
+- ``set(pins, 0)`` will turn the LED off by setting pin 25 low.
+- Another 32 loops of ``nop() [29]`` and ``jmp(...)`` will execute.
+- Because ``wrap_target()`` and ``wrap()`` are not specified, their default will
+  be used and execution of the program will wrap around from the bottom to the
+  top.  This wrapping does not cost any execution cycles.
+
+The entire routine takes exactly 2000 cycles of the state machine.  Setting the
+frequency of the state machine to 2000Hz makes the LED blink at 1Hz.

From c42c1c8718fb20b5ce41aac9c88e77e2b4c8c9b6 Mon Sep 17 00:00:00 2001
From: NitiKaur <nitikaur102@gmail.com>
Date: Thu, 5 Aug 2021 00:38:33 +0530
Subject: [PATCH 1322/3533] docs/library/random.rst: Document the random
 module.

---
 docs/library/index.rst  |  1 +
 docs/library/random.rst | 82 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 83 insertions(+)
 create mode 100644 docs/library/random.rst

diff --git a/docs/library/index.rst b/docs/library/index.rst
index 070e9f9667ae2..2b9af5b930dc3 100644
--- a/docs/library/index.rst
+++ b/docs/library/index.rst
@@ -65,6 +65,7 @@ library.
    json.rst
    math.rst
    os.rst
+   random.rst
    re.rst
    select.rst
    socket.rst
diff --git a/docs/library/random.rst b/docs/library/random.rst
new file mode 100644
index 0000000000000..dd8b47c80f084
--- /dev/null
+++ b/docs/library/random.rst
@@ -0,0 +1,82 @@
+:mod:`random` -- generate random numbers
+========================================
+
+.. module:: random
+   :synopsis: random numbers
+
+This module implements a pseudo-random number generator (PRNG).
+
+|see_cpython_module| :mod:`python:random` .
+
+.. note::
+
+   The following notation is used for intervals:
+
+   - () are open interval brackets and do not include their endpoints.
+     For example, (0, 1) means greater than 0 and less than 1.
+     In set notation: (0, 1) = {x | 0 < x < 1}.
+
+   - [] are closed interval brackets which include all their limit points.
+     For example, [0, 1] means greater than or equal to 0 and less than
+     or equal to 1.
+     In set notation: [0, 1] = {x | 0 <= x <= 1}.
+
+.. note::
+
+   The :func:`randrange`, :func:`randint` and :func:`choice` functions are only
+   available if the ``MICROPY_PY_URANDOM_EXTRA_FUNCS`` configuration option is
+   enabled.
+
+
+Functions for integers
+----------------------
+
+.. function:: getrandbits(n)
+
+    Return an integer with *n* random bits (0 <= n <= 32).
+
+.. function:: randint(a, b)
+
+    Return a random integer in the range [*a*, *b*].
+
+.. function:: randrange(stop)
+              randrange(start, stop)
+              randrange(start, stop[, step])
+
+    The first form returns a random integer from the range [0, *stop*).
+    The second form returns a random integer from the range [*start*, *stop*).
+    The third form returns a random integer from the range [*start*, *stop*) in
+    steps of *step*.  For instance, calling ``randrange(1, 10, 2)`` will
+    return odd numbers between 1 and 9 inclusive.
+
+
+Functions for floats
+--------------------
+
+.. function:: random()
+
+    Return a random floating point number in the range [0.0, 1.0).
+
+.. function:: uniform(a, b)
+
+    Return a random floating point number N such that *a* <= N <= *b* for *a* <= *b*,
+    and *b* <= N <= *a* for *b* < *a*.
+
+
+Other Functions
+---------------
+
+.. function:: seed(n=None, /)
+
+    Initialise the random number generator module with the seed *n* which should
+    be an integer.  When no argument (or ``None``) is passed in it will (if
+    supported by the port) initialise the PRNG with a true random number
+    (usually a hardware generated random number).
+
+    The ``None`` case only works if ``MICROPY_PY_URANDOM_SEED_INIT_FUNC`` is
+    enabled by the port, otherwise it raises ``ValueError``.
+
+.. function:: choice(sequence)
+
+    Chooses and returns one item at random from *sequence* (tuple, list or
+    any object that supports the subscript operation).

From 135339ce3ab8a50ae5160d1d84062475baeb1798 Mon Sep 17 00:00:00 2001
From: NitiKaur <nitikaur102@gmail.com>
Date: Thu, 5 Aug 2021 08:57:22 +0530
Subject: [PATCH 1323/3533] docs/reference/mpremote.rst: Add docs for mpremote.

---
 docs/reference/index.rst    |   1 +
 docs/reference/mpremote.rst | 196 ++++++++++++++++++++++++++++++++++++
 2 files changed, 197 insertions(+)
 create mode 100644 docs/reference/mpremote.rst

diff --git a/docs/reference/index.rst b/docs/reference/index.rst
index 8cd5f03df48fc..853bbe7e36a6b 100644
--- a/docs/reference/index.rst
+++ b/docs/reference/index.rst
@@ -21,6 +21,7 @@ implementation and the best practices to use them.
 
    glossary.rst
    repl.rst
+   mpremote.rst
    mpyfiles.rst
    isr_rules.rst
    speed_python.rst
diff --git a/docs/reference/mpremote.rst b/docs/reference/mpremote.rst
new file mode 100644
index 0000000000000..7a7d787a5a25a
--- /dev/null
+++ b/docs/reference/mpremote.rst
@@ -0,0 +1,196 @@
+MicroPython remote control: mpremote
+====================================
+
+The ``mpremote`` command line tool provides an integrated set of utilities to
+remotely interact with and automate a MicroPython device over a serial
+connection.
+
+To use mpremote install it via ``pip``:
+
+.. code-block:: bash
+
+    $ pip install mpremote
+
+The simplest way to use this tool is just by invoking it without any arguments:
+
+.. code-block:: bash
+
+    mpremote
+
+This command automatically detects and connects to the first available serial
+device and provides an interactive REPL.  Serial ports are opened in exclusive
+mode, so running a second (or third, etc) instance of ``mpremote`` will connect
+to subsequent serial devices, if any are available.
+
+
+Commands
+--------
+
+For REPL access, running ``mpremote`` without any arguments is usually all that
+is needed.  ``mpremote`` also supports a set of commands given at the command
+line which will perform various actions on remote MicroPython devices.
+
+The full list of supported commands are:
+
+- connect to a specified device via a device-name shortcut:
+
+  .. code-block:: bash
+
+      $ mpremote <device-shortcut>
+
+- connect to specified device via name:
+
+  .. code-block:: bash
+
+      $ mpremote connect <device>
+
+  ``<device>`` may be one of:
+
+  - ``list``: list available devices
+  - ``auto``: connect to the first available device
+  - ``id:<serial>``: connect to the device with USB serial number
+    ``<serial>`` (the second entry in the output from the ``connect list``
+    command)
+  - ``port:<path>``: connect to the device with the given path
+  - any valid device name/path, to connect to that device
+
+- disconnect current device:
+
+  .. code-block:: bash
+
+      $ mpremote disconnect
+
+- enter the REPL on the connected device:
+
+   .. code-block:: bash
+
+      $ mpremote repl [options]
+
+  Options are:
+
+  - ``--capture <file>``, to capture output of the REPL session to the given
+    file
+  - ``--inject-code <string>``, to specify characters to inject at the REPL when
+    Ctrl-J is pressed
+  - ``--inject-file <file>``, to specify a file to inject at the REPL when
+    Ctrl-K is pressed
+
+- evaluate and print the result of a Python expression:
+
+  .. code-block:: bash
+
+      $ mpremote eval <string>
+
+- execute the given Python code:
+
+  .. code-block:: bash
+
+      $ mpremote exec <string>
+
+- run a script from the local filesystem:
+
+  .. code-block:: bash
+
+      $ mpremote run <file>
+
+- execute filesystem commands on the device:
+
+  .. code-block:: bash
+
+      $ mpremote fs <command>
+
+  ``<command>`` may be:
+
+  - ``cat <file..>`` to show the contents of a file or files on the device
+  - ``ls`` to list the current directory
+  - ``ls <dirs...>`` to list the given directories
+  - ``cp [-r] <src...> <dest>`` to copy files; use ":" as a prefix to specify
+    a file on the device
+  - ``rm <src...>`` to remove files on the device
+  - ``mkdir <dirs...>`` to create directories on the device
+  - ``rmdir <dirs...>`` to remove directories on the device
+
+- mount the local directory on the remote device:
+
+  .. code-block:: bash
+
+      $ mpremote mount <local-dir>
+
+Multiple commands can be specified and they will be run sequentially.
+Connection and disconnection will be done automatically at the start and end of
+the execution of the tool, if such commands are not explicitly given.  Automatic
+connection will search for the first available serial device. If no action is
+specified then the REPL will be entered.
+
+Shortcuts
+---------
+
+Shortcuts can be defined using the macro system.  Built-in shortcuts are::
+
+- ``devs``: list available devices (shortcut for ``connect list``)
+
+- ``a0``, ``a1``, ``a2``, ``a3``: connect to /dev/ttyACM?
+
+- ``u0``, ``u1``, ``u2``, ``u3``: connect to /dev/ttyUSB?
+
+- ``c0``, ``c1``, ``c2``, ``c3``: connect to COM?
+
+- ``cat``, ``ls``, ``cp``, ``rm``, ``mkdir``, ``rmdir``, ``df``: filesystem
+  commands
+
+- ``reset``: reset the device
+
+- ``bootloader``: make the device enter its bootloader
+
+Any user configuration, including user-defined shortcuts, can be placed in the file
+``.config/mpremote/config.py``. For example:
+
+.. code-block:: python3
+
+    commands = {
+        "c33": "connect id:334D335C3138",
+        "bl": "bootloader",
+        "double x=4": "eval x*2",  # x is an argument, with default 4
+        "wl_scan": ["exec", """
+    import network
+    wl = network.WLAN()
+    wl.active(1)
+    for ap in wl.scan():
+        print(ap)
+    """,],
+        "test": ["mount", ".", "exec", "import test"],
+    }
+
+
+Examples
+--------
+
+.. code-block:: bash
+
+  mpremote
+
+  mpremote a1
+
+  mpremote connect /dev/ttyUSB0 repl
+
+  mpremote ls
+
+  mpremote a1 ls
+
+  mpremote exec "import micropython; micropython.mem_info()"
+
+  mpremote eval 1/2 eval 3/4
+
+  mpremote mount .
+
+  mpremote mount . exec "import local_script"
+
+  mpremote ls
+
+  mpremote cat boot.py
+
+  mpremote cp :main.py .
+
+  mpremote cp main.py :
+
+  mpremote cp -r dir/ :

From e87b2e8bfa71a09f0fe585fc0127e9fa42b68f19 Mon Sep 17 00:00:00 2001
From: NitiKaur <nitikaur102@gmail.com>
Date: Thu, 5 Aug 2021 09:42:30 +0530
Subject: [PATCH 1324/3533] docs/reference/manifest.rst: Add docs for
 manifest.py files.

---
 docs/reference/index.rst    |   1 +
 docs/reference/manifest.rst | 145 ++++++++++++++++++++++++++++++++++++
 2 files changed, 146 insertions(+)
 create mode 100644 docs/reference/manifest.rst

diff --git a/docs/reference/index.rst b/docs/reference/index.rst
index 853bbe7e36a6b..8ac92c22ebc13 100644
--- a/docs/reference/index.rst
+++ b/docs/reference/index.rst
@@ -26,6 +26,7 @@ implementation and the best practices to use them.
    isr_rules.rst
    speed_python.rst
    constrained.rst
+   manifest.rst
    packages.rst
    asm_thumb2_index.rst
    filesystem.rst
diff --git a/docs/reference/manifest.rst b/docs/reference/manifest.rst
new file mode 100644
index 0000000000000..078c4c7cf66c0
--- /dev/null
+++ b/docs/reference/manifest.rst
@@ -0,0 +1,145 @@
+MicroPython manifest files
+==========================
+
+When building firmware for a device the following components are included in
+the compilation process:
+
+- the core MicroPython virtual machine and runtime
+- port-specific system code and drivers to interface with the
+  microcontroller/device that the firmware is targeting
+- standard built-in modules, like ``sys``
+- extended built-in modules, like ``json`` and ``machine``
+- extra modules written in C/C++
+- extra modules written in Python
+
+All the modules included in the firmware are available via ``import`` from
+Python code.  The extra modules written in Python that are included in a build
+(the last point above) are called *frozen modules*, and are specified by a
+``manifest.py`` file.  Changing this manifest requires rebuilding the firmware.
+
+It's also possible to add additional modules to the filesystem of the device
+once it is up and running.  Adding and removing modules to/from the filesystem
+does not require rebuilding the firmware so is a simpler process than rebuilding
+firmware.  The benefit of using a manifest is that frozen modules are more
+efficient: they are faster to import and take up less RAM once imported.
+
+MicroPython manifest files are Python files and can contain arbitrary Python
+code.  There are also a set of commands (predefined functions) which are used
+to specify the Python source files to include.  These commands are described
+below.
+
+Freezing source code
+--------------------
+
+.. function:: freeze(path, script=None, opt=0)
+
+    Freeze the input specified by *path*, automatically determining its type.  A
+    ``.py`` script will be compiled to a ``.mpy`` first then frozen, and a
+    ``.mpy`` file will be frozen directly.
+
+    *path* must be a directory, which is the base directory to begin searching
+    for files.  When importing the resulting frozen modules, the name of the
+    module will start after *path*, i.e. *path* is excluded from the module
+    name.
+
+    If *path* is relative, it is resolved to the current ``manifest.py``.  Use
+    ``$(MPY_DIR)``, ``$(MPY_LIB_DIR)``, ``$(PORT_DIR)``, ``$(BOARD_DIR)`` if you
+    need to access specific paths.
+
+    If *script* is None, all files in *path* will be frozen.
+
+    If *script* is an iterable then ``freeze()`` is called on all items of the
+    iterable (with the same *path* and *opt* passed through).
+
+    If *script* is a string then it specifies the file or directory to freeze,
+    and can include extra directories before the file or last directory.  The
+    file or directory will be searched for in *path*.  If *script* is a
+    directory then all files in that directory will be frozen.
+
+    *opt* is the optimisation level to pass to mpy-cross when compiling ``.py``
+    to ``.mpy``.
+
+.. function:: freeze_as_str(path)
+
+    Freeze the given *path* and all ``.py`` scripts within it as a string, which
+    will be compiled upon import.
+
+.. function:: freeze_as_mpy(path, script=None, opt=0)
+
+    Freeze the input by first compiling the ``.py`` scripts to ``.mpy`` files,
+    then freezing the resulting ``.mpy`` files.  See ``freeze()`` for further
+    details on the arguments.
+
+.. function::   freeze_mpy(path, script=None, opt=0)
+
+    Freeze the input, which must be ``.mpy`` files that are frozen directly.
+    See ``freeze()`` for further details on the arguments.
+
+
+Including other manifest files
+------------------------------
+
+.. function:: include(manifest, **kwargs)
+
+    Include another manifest.
+
+    The *manifest* argument can be a string (filename) or an iterable of
+    strings.
+
+    Relative paths are resolved with respect to the current manifest file.
+
+    Optional *kwargs* can be provided which will be available to the included
+    script via the *options* variable.
+
+    For example:
+
+    .. code-block:: python3
+
+        include("path.py", extra_features=True)
+
+    then in path.py:
+
+    .. code-block:: python3
+
+            options.defaults(standard_features=True)
+            # freeze minimal modules.
+            if options.standard_features:
+                # freeze standard modules.
+            if options.extra_features:
+                # freeze extra modules.
+
+
+Examples
+--------
+
+To freeze a single file which is available as ``import mydriver``, use:
+
+.. code-block:: python3
+
+    freeze(".", "mydriver.py")
+
+To freeze a set of files which are available as ``import test1`` and
+``import test2``, and which are compiled with optimisation level 3, use:
+
+.. code-block:: python3
+
+    freeze("/path/to/tests", ("test1.py", "test2.py"), opt=3)
+
+To freeze a module which can be imported as ``import mymodule``, use:
+
+.. code-block:: python3
+
+    freeze(
+        "../relative/path",
+        (
+            "mymodule/__init__.py",
+            "mymodule/core.py",
+            "mymodule/extra.py",
+        ),
+    )
+
+To include a manifest from the MicroPython repository, use:
+
+.. code-block:: python3
+
+    include("$(MPY_DIR)/extmod/uasyncio/manifest.py")

From 763042a28701ace91e63b263dc0d8faa6b8871a9 Mon Sep 17 00:00:00 2001
From: NitiKaur <nitikaur102@gmail.com>
Date: Thu, 12 Aug 2021 14:21:02 +0530
Subject: [PATCH 1325/3533] docs/library/stm.rst: Document the stm module.

---
 docs/library/index.rst |   1 +
 docs/library/stm.rst   | 104 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 105 insertions(+)
 create mode 100644 docs/library/stm.rst

diff --git a/docs/library/index.rst b/docs/library/index.rst
index 2b9af5b930dc3..2b1d6b9651343 100644
--- a/docs/library/index.rst
+++ b/docs/library/index.rst
@@ -120,6 +120,7 @@ The following libraries are specific to the pyboard.
   :maxdepth: 2
 
   pyb.rst
+  stm.rst
   lcd160cr.rst
 
 
diff --git a/docs/library/stm.rst b/docs/library/stm.rst
new file mode 100644
index 0000000000000..a181d6044cc16
--- /dev/null
+++ b/docs/library/stm.rst
@@ -0,0 +1,104 @@
+.. currentmodule:: stm
+
+:mod:`stm` --- functionality specific to STM32 MCUs
+===================================================
+
+.. module:: stm
+    :synopsis: functionality specific to STM32 MCUs
+
+This module provides functionality specific to STM32 microcontrollers, including
+direct access to peripheral registers.
+
+Memory access
+-------------
+
+The module exposes three objects used for raw memory access.
+
+.. data:: mem8
+
+    Read/write 8 bits of memory.
+
+.. data:: mem16
+
+    Read/write 16 bits of memory.
+
+.. data:: mem32
+
+    Read/write 32 bits of memory.
+
+Use subscript notation ``[...]`` to index these objects with the address of
+interest.
+
+These memory objects can be used in combination with the peripheral register
+constants to read and write registers of the MCU hardware peripherals, as well
+as all other areas of address space.
+
+
+Peripheral register constants
+-----------------------------
+
+The module defines constants for registers which are generated from CMSIS header
+files, and the constants available depend on the microcontroller series that is
+being compiled for.  Examples of some constants include:
+
+.. data:: GPIOA
+
+    Base address of the GPIOA peripheral.
+
+.. data:: GPIOB
+
+    Base address of the GPIOB peripheral.
+
+.. data:: GPIO_BSRR
+
+    Offset of the GPIO bit set/reset register.
+
+.. data:: GPIO_IDR
+
+    Offset of the GPIO input data register.
+
+.. data:: GPIO_ODR
+
+    Offset of the GPIO output data register.
+
+Constants that are named after a peripheral, like ``GPIOA``, are the absolute
+address of that peripheral.  Constants that have a prefix which is the name of a
+peripheral, like ``GPIO_BSRR``, are relative offsets of the register.  Accessing
+peripheral registers requires adding the absolute base address of the peripheral
+and the relative register offset.  For example ``GPIOA + GPIO_BSRR`` is the
+full, absolute address of the ``GPIOA->BSRR`` register.
+
+Example use:
+
+.. code-block:: python3
+
+    # set PA2 high
+    stm.mem32[stm.GPIOA + stm.GPIO_BSRR] = 1 << 2
+
+    # read PA3
+    value = (stm.mem32[stm.GPIOA + stm.GPIO_IDR] >> 3) & 1
+
+
+Functions specific to STM32WBxx MCUs
+------------------------------------
+
+These functions are available on STM32WBxx microcontrollers, and interact with
+the second CPU, the RF core.
+
+.. function:: rfcore_status()
+
+    Returns the status of the second CPU as an integer (the first word of device
+    info table).
+
+.. function:: rfcore_fw_version(id)
+
+    Get the version of the firmware running on the second CPU.  Pass in 0 for
+    *id* to get the FUS version, and 1 to get the WS version.
+
+    Returns a 5-tuple with the full version number.
+
+.. function:: rfcore_sys_hci(ogf, ocf, data, timeout_ms=0)
+
+    Execute a HCI command on the SYS channel.  The execution is synchronous.
+
+    Returns a bytes object with the result of the SYS command.

From 4c9e17e0a16266523e5d89640f756a1a0ad2d8e3 Mon Sep 17 00:00:00 2001
From: NitiKaur <nitikaur102@gmail.com>
Date: Thu, 26 Aug 2021 08:49:10 +0530
Subject: [PATCH 1326/3533] docs/esp32/tutorial: Add an example of peripheral
 control via regs.

---
 docs/esp32/tutorial/index.rst             |  1 +
 docs/esp32/tutorial/peripheral_access.rst | 44 +++++++++++++++++++++++
 2 files changed, 45 insertions(+)
 create mode 100644 docs/esp32/tutorial/peripheral_access.rst

diff --git a/docs/esp32/tutorial/index.rst b/docs/esp32/tutorial/index.rst
index e9cfd9db1075c..c6242d731f180 100644
--- a/docs/esp32/tutorial/index.rst
+++ b/docs/esp32/tutorial/index.rst
@@ -20,3 +20,4 @@ to `<https://www.python.org>`__.
 
    intro.rst
    pwm.rst
+   peripheral_access.rst
diff --git a/docs/esp32/tutorial/peripheral_access.rst b/docs/esp32/tutorial/peripheral_access.rst
new file mode 100644
index 0000000000000..3304c341de873
--- /dev/null
+++ b/docs/esp32/tutorial/peripheral_access.rst
@@ -0,0 +1,44 @@
+Accessing peripherals directly via registers
+============================================
+
+The ESP32's peripherals can be controlled via direct register reads and writes.
+This requires reading the datasheet to know what registers to use and what
+values to write to them.  The following example shows how to turn on and change
+the prescaler of the MCPWM0 peripheral.
+
+.. code-block:: python3
+
+    from micropython import const
+    from machine import mem32
+
+    # Define the register addresses that will be used.
+    DR_REG_DPORT_BASE = const(0x3FF00000)
+    DPORT_PERIP_CLK_EN_REG = const(DR_REG_DPORT_BASE + 0x0C0)
+    DPORT_PERIP_RST_EN_REG = const(DR_REG_DPORT_BASE + 0x0C4)
+    DPORT_PWM0_CLK_EN = const(1 << 17)
+    MCPWM0 = const(0x3FF5E000)
+    MCPWM1 = const(0x3FF6C000)
+
+    # Enable CLK and disable RST.
+    print(hex(mem32[DPORT_PERIP_CLK_EN_REG] & 0xffffffff))
+    print(hex(mem32[DPORT_PERIP_RST_EN_REG] & 0xffffffff))
+    mem32[DPORT_PERIP_CLK_EN_REG] |= DPORT_PWM0_CLK_EN
+    mem32[DPORT_PERIP_RST_EN_REG] &= ~DPORT_PWM0_CLK_EN
+    print(hex(mem32[DPORT_PERIP_CLK_EN_REG] & 0xffffffff))
+    print(hex(mem32[DPORT_PERIP_RST_EN_REG] & 0xffffffff))
+
+    # Change the MCPWM0 prescaler.
+    print(hex(mem32[MCPWM0])) # read PWM_CLK_CFG_REG (reset value = 0)
+    mem32[MCPWM0] = 0x55      # change PWM_CLK_PRESCALE
+    print(hex(mem32[MCPWM0])) # read PWM_CLK_CFG_REG
+
+Note that before a peripheral can be used its clock must be enabled and it must
+be taken out of reset.  In the above example the following registers are used
+for this:
+
+- ``DPORT_PERI_CLK_EN_REG``: used to enable a peripheral clock
+
+- ``DPORT_PERI_RST_EN_REG``: used to reset (or take out of reset) a peripheral
+
+The MCPWM0 peripheral is in bit position 17 of the above two registers, hence
+the value of ``DPORT_PWM0_CLK_EN``.

From eea6cd85b37351ceda1b4c80a804912605977997 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Thu, 30 Sep 2021 09:13:15 +1000
Subject: [PATCH 1327/3533] stm32/sdram: Enforce gcc opt, and use volatile and
 DSB in sdram_test.

Ensures consistent behaviour and resolves the D-Cache bug (the "exhaustive"
argument being lost due to cache being turned off) when O0 is used.

The changes in this commit are:

- Change -O0 to -Os because "gcc is considered broken at -O0" according to
  https://github.com/ARM-software/CMSIS_5/issues/620#issuecomment-550235656

- Use volatile for mem_base so the compiler doesn't optimise away reads or
  writes to the SDRAM, which is being tested.

- Use DSB to prevent any other compiler optimisations that would change the
  testing logic.

- Use alternating pattern/antipattern in exhaustive test to catch more
  hardware/configuration errors.

Implementation adapted by @andrewleech, taken directly from investigation
by @iabdalkader and @dpgeorge.

See #7841 and #7869 for further discussion.
---
 ports/stm32/sdram.c | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/ports/stm32/sdram.c b/ports/stm32/sdram.c
index e0e350083686c..4615c4fe1e9a7 100644
--- a/ports/stm32/sdram.c
+++ b/ports/stm32/sdram.c
@@ -283,10 +283,10 @@ void sdram_leave_low_power(void) {
 #pragma GCC diagnostic ignored "-Wstringop-overflow"
 #endif
 
-bool __attribute__((optimize("O0"))) sdram_test(bool exhaustive) {
+bool __attribute__((optimize("Os"))) sdram_test(bool exhaustive) {
     uint8_t const pattern = 0xaa;
     uint8_t const antipattern = 0x55;
-    uint8_t *const mem_base = (uint8_t *)sdram_start();
+    volatile uint8_t *const mem_base = (uint8_t *)sdram_start();
 
     #if MICROPY_HW_SDRAM_TEST_FAIL_ON_ERROR
     char error_buffer[1024];
@@ -310,12 +310,13 @@ bool __attribute__((optimize("O0"))) sdram_test(bool exhaustive) {
 
     // Test data bus
     for (uint32_t i = 0; i < MICROPY_HW_SDRAM_MEM_BUS_WIDTH; i++) {
-        *((uint32_t *)mem_base) = (1 << i);
-        if (*((uint32_t *)mem_base) != (1 << i)) {
+        *((volatile uint32_t *)mem_base) = (1 << i);
+        __DSB();
+        if (*((volatile uint32_t *)mem_base) != (1 << i)) {
             #if MICROPY_HW_SDRAM_TEST_FAIL_ON_ERROR
             snprintf(error_buffer, sizeof(error_buffer),
                 "Data bus test failed at 0x%p expected 0x%x found 0x%lx",
-                &mem_base[0], (1 << i), ((uint32_t *)mem_base)[0]);
+                &mem_base[0], (1 << i), ((volatile uint32_t *)mem_base)[0]);
             __fatal_error(error_buffer);
             #endif
             return false;
@@ -325,6 +326,7 @@ bool __attribute__((optimize("O0"))) sdram_test(bool exhaustive) {
     // Test address bus
     for (uint32_t i = 1; i < MICROPY_HW_SDRAM_SIZE; i <<= 1) {
         mem_base[i] = pattern;
+        __DSB();
         if (mem_base[i] != pattern) {
             #if MICROPY_HW_SDRAM_TEST_FAIL_ON_ERROR
             snprintf(error_buffer, sizeof(error_buffer),
@@ -338,6 +340,7 @@ bool __attribute__((optimize("O0"))) sdram_test(bool exhaustive) {
 
     // Check for aliasing (overlaping addresses)
     mem_base[0] = antipattern;
+    __DSB();
     for (uint32_t i = 1; i < MICROPY_HW_SDRAM_SIZE; i <<= 1) {
         if (mem_base[i] != pattern) {
             #if MICROPY_HW_SDRAM_TEST_FAIL_ON_ERROR
@@ -356,15 +359,15 @@ bool __attribute__((optimize("O0"))) sdram_test(bool exhaustive) {
         // is enabled, it's not just writing and reading from cache.
         // Note: This test should also detect refresh rate issues.
         for (uint32_t i = 0; i < MICROPY_HW_SDRAM_SIZE; i++) {
-            mem_base[i] = pattern;
+            mem_base[i] = ((i % 2) ? pattern : antipattern);
         }
 
         for (uint32_t i = 0; i < MICROPY_HW_SDRAM_SIZE; i++) {
-            if (mem_base[i] != pattern) {
+            if (mem_base[i] != ((i % 2) ? pattern : antipattern)) {
                 #if MICROPY_HW_SDRAM_TEST_FAIL_ON_ERROR
                 snprintf(error_buffer, sizeof(error_buffer),
                     "Address bus slow test failed at 0x%p expected 0x%x found 0x%x",
-                    &mem_base[i], pattern, mem_base[i]);
+                    &mem_base[i], ((i % 2) ? pattern : antipattern), mem_base[i]);
                 __fatal_error(error_buffer);
                 #endif
                 return false;

From 8412568e7bec1b63b686eb46a2790c6f182e7d5b Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 24 Sep 2021 12:49:51 +1000
Subject: [PATCH 1328/3533] py: Add wrapper macros so hot VM functions can go
 in fast code location.

For example, on esp32 they can go in iRAM to improve performance.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/map.c      |  2 +-
 py/mpconfig.h | 24 ++++++++++++++++++++++++
 py/obj.c      |  2 +-
 py/runtime.c  |  6 +++---
 py/vm.c       |  2 +-
 5 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/py/map.c b/py/map.c
index 1c436163640a0..b194250cb4f59 100644
--- a/py/map.c
+++ b/py/map.c
@@ -153,7 +153,7 @@ STATIC void mp_map_rehash(mp_map_t *map) {
 //  - returns slot, with key non-null and value=MP_OBJ_NULL if it was added
 // MP_MAP_LOOKUP_REMOVE_IF_FOUND behaviour:
 //  - returns NULL if not found, else the slot if was found in with key null and value non-null
-mp_map_elem_t *mp_map_lookup(mp_map_t *map, mp_obj_t index, mp_map_lookup_kind_t lookup_kind) {
+mp_map_elem_t *MICROPY_WRAP_MP_MAP_LOOKUP(mp_map_lookup)(mp_map_t * map, mp_obj_t index, mp_map_lookup_kind_t lookup_kind) {
     // If the map is a fixed array then we must only be called for a lookup
     assert(!map->is_fixed || lookup_kind == MP_MAP_LOOKUP);
 
diff --git a/py/mpconfig.h b/py/mpconfig.h
index 6a2edc7dc2deb..d20ad0448005b 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -1594,6 +1594,30 @@ typedef double mp_float_t;
 /*****************************************************************************/
 /* Hooks for a port to wrap functions with attributes                        */
 
+#ifndef MICROPY_WRAP_MP_BINARY_OP
+#define MICROPY_WRAP_MP_BINARY_OP(f) f
+#endif
+
+#ifndef MICROPY_WRAP_MP_EXECUTE_BYTECODE
+#define MICROPY_WRAP_MP_EXECUTE_BYTECODE(f) f
+#endif
+
+#ifndef MICROPY_WRAP_MP_LOAD_GLOBAL
+#define MICROPY_WRAP_MP_LOAD_GLOBAL(f) f
+#endif
+
+#ifndef MICROPY_WRAP_MP_LOAD_NAME
+#define MICROPY_WRAP_MP_LOAD_NAME(f) f
+#endif
+
+#ifndef MICROPY_WRAP_MP_MAP_LOOKUP
+#define MICROPY_WRAP_MP_MAP_LOOKUP(f) f
+#endif
+
+#ifndef MICROPY_WRAP_MP_OBJ_GET_TYPE
+#define MICROPY_WRAP_MP_OBJ_GET_TYPE(f) f
+#endif
+
 #ifndef MICROPY_WRAP_MP_SCHED_EXCEPTION
 #define MICROPY_WRAP_MP_SCHED_EXCEPTION(f) f
 #endif
diff --git a/py/obj.c b/py/obj.c
index f66a9d183c704..5255e96553343 100644
--- a/py/obj.c
+++ b/py/obj.c
@@ -37,7 +37,7 @@
 #include "py/stackctrl.h"
 #include "py/stream.h" // for mp_obj_print
 
-const mp_obj_type_t *mp_obj_get_type(mp_const_obj_t o_in) {
+const mp_obj_type_t *MICROPY_WRAP_MP_OBJ_GET_TYPE(mp_obj_get_type)(mp_const_obj_t o_in) {
     #if MICROPY_OBJ_IMMEDIATE_OBJS && MICROPY_OBJ_REPR == MICROPY_OBJ_REPR_A
 
     if (mp_obj_is_obj(o_in)) {
diff --git a/py/runtime.c b/py/runtime.c
index 2f7cf1fa600e4..0133d813f7cf8 100644
--- a/py/runtime.c
+++ b/py/runtime.c
@@ -157,7 +157,7 @@ void mp_deinit(void) {
     #endif
 }
 
-mp_obj_t mp_load_name(qstr qst) {
+mp_obj_t MICROPY_WRAP_MP_LOAD_NAME(mp_load_name)(qstr qst) {
     // logic: search locals, globals, builtins
     DEBUG_OP_printf("load name %s\n", qstr_str(qst));
     // If we're at the outer scope (locals == globals), dispatch to load_global right away
@@ -170,7 +170,7 @@ mp_obj_t mp_load_name(qstr qst) {
     return mp_load_global(qst);
 }
 
-mp_obj_t mp_load_global(qstr qst) {
+mp_obj_t MICROPY_WRAP_MP_LOAD_GLOBAL(mp_load_global)(qstr qst) {
     // logic: search globals, builtins
     DEBUG_OP_printf("load global %s\n", qstr_str(qst));
     mp_map_elem_t *elem = mp_map_lookup(&mp_globals_get()->map, MP_OBJ_NEW_QSTR(qst), MP_MAP_LOOKUP);
@@ -311,7 +311,7 @@ mp_obj_t mp_unary_op(mp_unary_op_t op, mp_obj_t arg) {
     }
 }
 
-mp_obj_t mp_binary_op(mp_binary_op_t op, mp_obj_t lhs, mp_obj_t rhs) {
+mp_obj_t MICROPY_WRAP_MP_BINARY_OP(mp_binary_op)(mp_binary_op_t op, mp_obj_t lhs, mp_obj_t rhs) {
     DEBUG_OP_printf("binary " UINT_FMT " %q %p %p\n", op, mp_binary_op_method_name[op], lhs, rhs);
 
     // TODO correctly distinguish inplace operators for mutable objects
diff --git a/py/vm.c b/py/vm.c
index f55d293dc561a..0289bcfae5278 100644
--- a/py/vm.c
+++ b/py/vm.c
@@ -186,7 +186,7 @@
 //  MP_VM_RETURN_NORMAL, sp valid, return value in *sp
 //  MP_VM_RETURN_YIELD, ip, sp valid, yielded value in *sp
 //  MP_VM_RETURN_EXCEPTION, exception in state[0]
-mp_vm_return_kind_t mp_execute_bytecode(mp_code_state_t *code_state, volatile mp_obj_t inject_exc) {
+mp_vm_return_kind_t MICROPY_WRAP_MP_EXECUTE_BYTECODE(mp_execute_bytecode)(mp_code_state_t *code_state, volatile mp_obj_t inject_exc) {
 #define SELECTIVE_EXC_IP (0)
 #if SELECTIVE_EXC_IP
 #define MARK_EXC_IP_SELECTIVE() { code_state->ip = ip; } /* stores ip 1 byte past last opcode */

From 549448e8bbc8ce0b6b5fc51c0660acdaff18c3d6 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 24 Sep 2021 12:50:59 +1000
Subject: [PATCH 1329/3533] esp32: Enable optimisations and move code to iRAM
 to boost performance.

This commit enables some significant optimisations for esp32:
- move the VM to iRAM
- move hot parts of the runtime to iRAM (map lookup, load global/name,
  mp_obj_get_type)
- enable MICROPY_OPT_LOAD_ATTR_FAST_PATH
- enable MICROPY_OPT_MAP_LOOKUP_CACHE
- disable assertions
- change from -Os to -O2 for compilation

It's hard to measure performance on esp32 due to external flash and
hardware caching.  But this set of changes improves performance compared to
master by (on a TinyPICO with the GENERIC build, using IDF 4.2.2, running
at 160MHz):

diff of scores (higher is better)
N=100 M=100    esp32-master -> esp32-perf       diff      diff% (error%)
bm_chaos.py           71.28 ->     268.08 :  +196.80 = +276.094% (+/-0.04%)
bm_fannkuch.py        44.10 ->      69.31 :   +25.21 = +57.166% (+/-0.01%)
bm_fft.py           1385.27 ->    2538.23 : +1152.96 = +83.230% (+/-0.01%)
bm_float.py         1060.94 ->    3900.62 : +2839.68 = +267.657% (+/-0.03%)
bm_hexiom.py          10.90 ->      32.79 :   +21.89 = +200.826% (+/-0.02%)
bm_nqueens.py       1000.83 ->    2372.87 : +1372.04 = +137.090% (+/-0.01%)
bm_pidigits.py       288.13 ->     664.40 :  +376.27 = +130.590% (+/-0.46%)
misc_aes.py          102.45 ->     345.69 :  +243.24 = +237.423% (+/-0.01%)
misc_mandel.py      1016.58 ->    2121.92 : +1105.34 = +108.731% (+/-0.01%)
misc_pystone.py      632.91 ->    1801.87 : +1168.96 = +184.696% (+/-0.08%)
misc_raytrace.py      76.66 ->     281.78 :  +205.12 = +267.571% (+/-0.05%)
viper_call0.py       210.63 ->     273.17 :   +62.54 = +29.692% (+/-0.01%)
viper_call1a.py      208.45 ->     269.51 :   +61.06 = +29.292% (+/-0.00%)
viper_call1b.py      185.44 ->     228.25 :   +42.81 = +23.086% (+/-0.01%)
viper_call1c.py      185.86 ->     228.90 :   +43.04 = +23.157% (+/-0.01%)
viper_call2a.py      207.10 ->     267.25 :   +60.15 = +29.044% (+/-0.00%)
viper_call2b.py      173.76 ->     209.42 :   +35.66 = +20.523% (+/-0.00%)

Five tests have more than 3x speed up (200%+).

The performance of the tests bm_fft, bm_pidigits and misc_aes now scale
with CPU frequency (eg changing frequency to 240MHz boosts the performance
of these by 50%), which means they are no longer influenced by timing of
external flash access.  (The viper_call* tests did previously scale with
CPU frequency, and they still do.)

Turning off assertions reduces code size by about 80k, and going from -Os
to -O2 costs about 100k, so the net change in code size (for the GENERIC
board) is about +20k.

If a board wants to enable assertions, or use -Os instead of -O2, that's
still possible by overriding the sdkconfig parameters.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/boards/sdkconfig.base | 6 +++---
 ports/esp32/mpconfigport.h        | 8 ++++++++
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/ports/esp32/boards/sdkconfig.base b/ports/esp32/boards/sdkconfig.base
index 5ca3f6a1a2b13..71229e8bebe4a 100644
--- a/ports/esp32/boards/sdkconfig.base
+++ b/ports/esp32/boards/sdkconfig.base
@@ -3,11 +3,11 @@
 
 CONFIG_IDF_FIRMWARE_CHIP_ID=0x0000
 
-# Compiler options: use -Os to reduce size, but keep full assertions
+# Compiler options: use -O2 and disable assertions to improve performance
 # (CONFIG_COMPILER_OPTIMIZATION_LEVEL_RELEASE is for IDF 4.0.2)
 CONFIG_COMPILER_OPTIMIZATION_LEVEL_RELEASE=y
-CONFIG_COMPILER_OPTIMIZATION_SIZE=y
-CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_ENABLE=y
+CONFIG_COMPILER_OPTIMIZATION_PERF=y
+CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_DISABLE=y
 
 # Application manager
 CONFIG_APP_EXCLUDE_PROJECT_VER_VAR=y
diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h
index 3d1fc10e12907..53d706be3fedd 100644
--- a/ports/esp32/mpconfigport.h
+++ b/ports/esp32/mpconfigport.h
@@ -30,6 +30,8 @@
 
 // optimisations
 #define MICROPY_OPT_COMPUTED_GOTO           (1)
+#define MICROPY_OPT_LOAD_ATTR_FAST_PATH     (1)
+#define MICROPY_OPT_MAP_LOOKUP_CACHE        (1)
 #define MICROPY_OPT_MPZ_BITWISE             (1)
 
 // Python internal features
@@ -289,6 +291,12 @@ void *esp_native_code_commit(void *, size_t, void *);
 #endif
 
 // Functions that should go in IRAM
+#define MICROPY_WRAP_MP_BINARY_OP(f) IRAM_ATTR f
+#define MICROPY_WRAP_MP_EXECUTE_BYTECODE(f) IRAM_ATTR f
+#define MICROPY_WRAP_MP_LOAD_GLOBAL(f) IRAM_ATTR f
+#define MICROPY_WRAP_MP_LOAD_NAME(f) IRAM_ATTR f
+#define MICROPY_WRAP_MP_MAP_LOOKUP(f) IRAM_ATTR f
+#define MICROPY_WRAP_MP_OBJ_GET_TYPE(f) IRAM_ATTR f
 #define MICROPY_WRAP_MP_SCHED_EXCEPTION(f) IRAM_ATTR f
 #define MICROPY_WRAP_MP_SCHED_KEYBOARD_INTERRUPT(f) IRAM_ATTR f
 

From ba940250a5b630018c8d9b0e21c5ed858a20450f Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 24 Sep 2021 14:11:44 +1000
Subject: [PATCH 1330/3533] esp32/usb: Improve speed of USB CDC output.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/usb.c | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/ports/esp32/usb.c b/ports/esp32/usb.c
index 21047fa2bee84..95c82772992b5 100644
--- a/ports/esp32/usb.c
+++ b/ports/esp32/usb.c
@@ -93,15 +93,28 @@ void usb_tx_strn(const char *str, size_t len) {
     }
 
     while (len) {
+        // Get amount of CDC output buffer space available, making sure
+        // there is at least one byte available.
+        size_t avail = tud_cdc_n_write_available(CDC_ITF);
+        if (avail == 0) {
+            if (tinyusb_cdcacm_write_flush(CDC_ITF, pdMS_TO_TICKS(1000)) != ESP_OK) {
+                return;
+            }
+            avail = tud_cdc_n_write_available(CDC_ITF);
+        }
+
+        // Write as much data as possible.
         size_t l = len;
-        if (l > CONFIG_USB_CDC_TX_BUFSIZE) {
-            l = CONFIG_USB_CDC_TX_BUFSIZE;
+        if (l > avail) {
+            l = avail;
         }
-        tinyusb_cdcacm_write_queue(CDC_ITF, (uint8_t *)str, l);
-        tinyusb_cdcacm_write_flush(CDC_ITF, pdMS_TO_TICKS(1000));
+        tud_cdc_n_write(CDC_ITF, (uint8_t *)str, l);
         str += l;
         len -= l;
     }
+
+    // Queue a flush to write out the data in the CDC buffer (if any).
+    tud_cdc_n_write_flush(CDC_ITF);
 }
 
 #endif // CONFIG_USB_ENABLED

From 2ceeabf1800e816345baad76214e8d6fe73b2901 Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Fri, 13 Aug 2021 16:02:41 +1000
Subject: [PATCH 1331/3533] extmod/vfs_posix_file: Support MP_STREAM_POLL in
 vfs_posix_file_ioctl.

Allows asyncio reading of sys.stdin when MICROPY_PY_USELECT is used in the
build configuration.
---
 extmod/vfs_posix_file.c | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/extmod/vfs_posix_file.c b/extmod/vfs_posix_file.c
index f3eac98ce3f9f..837c5489b0e14 100644
--- a/extmod/vfs_posix_file.c
+++ b/extmod/vfs_posix_file.c
@@ -37,6 +37,8 @@
 
 #ifdef _WIN32
 #define fsync _commit
+#else
+#include <poll.h>
 #endif
 
 typedef struct _mp_obj_vfs_posix_file_t {
@@ -206,6 +208,32 @@ STATIC mp_uint_t vfs_posix_file_ioctl(mp_obj_t o_in, mp_uint_t request, uintptr_
             return 0;
         case MP_STREAM_GET_FILENO:
             return o->fd;
+        #if MICROPY_PY_USELECT
+        case MP_STREAM_POLL: {
+            #ifdef _WIN32
+            mp_raise_NotImplementedError(MP_ERROR_TEXT("poll on file not available on win32"));
+            #else
+            mp_uint_t ret = 0;
+            uint8_t pollevents = 0;
+            if (arg & MP_STREAM_POLL_RD) {
+                pollevents |= POLLIN;
+            }
+            if (arg & MP_STREAM_POLL_WR) {
+                pollevents |= POLLOUT;
+            }
+            struct pollfd pfd = { .fd = o->fd, .events = pollevents };
+            if (poll(&pfd, 1, 0) > 0) {
+                if (pfd.revents & POLLIN) {
+                    ret |= MP_STREAM_POLL_RD;
+                }
+                if (pfd.revents & POLLOUT) {
+                    ret |= MP_STREAM_POLL_WR;
+                }
+            }
+            return ret;
+            #endif
+        }
+        #endif
         default:
             *errcode = EINVAL;
             return MP_STREAM_ERROR;

From cc42b7c88b0b2b11e1e6d389c773e36545e2aef0 Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Fri, 17 Sep 2021 11:48:37 +1000
Subject: [PATCH 1332/3533] unix/modusocket: Support MP_STREAM_POLL in unix
 socket_ioctl.

Allows asyncio reading of network sockets when MICROPY_PY_USELECT is used
in the build configuration.
---
 ports/unix/modusocket.c | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/ports/unix/modusocket.c b/ports/unix/modusocket.c
index 1c9ef336228a2..951cb7a21c68c 100644
--- a/ports/unix/modusocket.c
+++ b/ports/unix/modusocket.c
@@ -46,6 +46,7 @@
 #include "py/builtin.h"
 #include "py/mphal.h"
 #include "py/mpthread.h"
+#include <poll.h>
 
 /*
   The idea of this module is to implement reasonable minimum of
@@ -144,6 +145,29 @@ STATIC mp_uint_t socket_ioctl(mp_obj_t o_in, mp_uint_t request, uintptr_t arg, i
         case MP_STREAM_GET_FILENO:
             return self->fd;
 
+        #if MICROPY_PY_USELECT
+        case MP_STREAM_POLL: {
+            mp_uint_t ret = 0;
+            uint8_t pollevents = 0;
+            if (arg & MP_STREAM_POLL_RD) {
+                pollevents |= POLLIN;
+            }
+            if (arg & MP_STREAM_POLL_WR) {
+                pollevents |= POLLOUT;
+            }
+            struct pollfd pfd = { .fd = self->fd, .events = pollevents };
+            if (poll(&pfd, 1, 0) > 0) {
+                if (pfd.revents & POLLIN) {
+                    ret |= MP_STREAM_POLL_RD;
+                }
+                if (pfd.revents & POLLOUT) {
+                    ret |= MP_STREAM_POLL_WR;
+                }
+            }
+            return ret;
+        }
+        #endif
+
         default:
             *errcode = MP_EINVAL;
             return MP_STREAM_ERROR;

From 5f2f9044ff0fd936618931fa60b2376c43f1e25b Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 13 Oct 2021 18:29:00 +1100
Subject: [PATCH 1333/3533] stm32/usbd_cdc_interface: Allow a board to hook
 into USBD CDC RX events.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/boardctrl.h          | 6 ++++++
 ports/stm32/usbd_cdc_interface.c | 3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/ports/stm32/boardctrl.h b/ports/stm32/boardctrl.h
index 551be3453ee22..851922f41249c 100644
--- a/ports/stm32/boardctrl.h
+++ b/ports/stm32/boardctrl.h
@@ -60,6 +60,12 @@
 #define MICROPY_BOARD_END_SOFT_RESET boardctrl_end_soft_reset
 #endif
 
+// Called when USBD CDC data is available.
+// Default function defined in usbd_cdc_interface.h.
+#ifndef MICROPY_BOARD_USBD_CDC_RX_EVENT
+#define MICROPY_BOARD_USBD_CDC_RX_EVENT usbd_cdc_rx_event_callback
+#endif
+
 // Constants to return from boardctrl_run_boot_py, boardctrl_run_main_py.
 enum {
     BOARDCTRL_CONTINUE,
diff --git a/ports/stm32/usbd_cdc_interface.c b/ports/stm32/usbd_cdc_interface.c
index 61a7c824868bc..b369524ca7efe 100644
--- a/ports/stm32/usbd_cdc_interface.c
+++ b/ports/stm32/usbd_cdc_interface.c
@@ -37,6 +37,7 @@
 #include <stdbool.h>
 #include <stdint.h>
 
+#include "boardctrl.h"
 #include "usbd_cdc_msc_hid.h"
 #include "usbd_cdc_interface.h"
 #include "pendsv.h"
@@ -308,7 +309,7 @@ int8_t usbd_cdc_receive(usbd_cdc_state_t *cdc_in, size_t len) {
         }
     }
 
-    usbd_cdc_rx_event_callback(cdc);
+    MICROPY_BOARD_USBD_CDC_RX_EVENT(cdc);
 
     if ((cdc->flow & USBD_CDC_FLOWCONTROL_RTS) && (usbd_cdc_rx_buffer_full(cdc))) {
         cdc->rx_buf_full = true;

From 69522822ded80a2462d89ebee11197d3ef24499f Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 13 Oct 2021 18:37:48 +1100
Subject: [PATCH 1334/3533] stm32/mpbthciport: Allow a board to hook BT HCI
 poll functions.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/boardctrl.h   | 12 ++++++++++++
 ports/stm32/mpbthciport.c |  6 +++---
 ports/stm32/mpbthciport.h | 18 +++++++++++++++---
 3 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/ports/stm32/boardctrl.h b/ports/stm32/boardctrl.h
index 851922f41249c..c870af32a46f2 100644
--- a/ports/stm32/boardctrl.h
+++ b/ports/stm32/boardctrl.h
@@ -66,6 +66,18 @@
 #define MICROPY_BOARD_USBD_CDC_RX_EVENT usbd_cdc_rx_event_callback
 #endif
 
+// Called to poll Bluetooth HCI now.
+// Default function defined in mpbthciport.h.
+#ifndef MICROPY_BOARD_BT_HCI_POLL_NOW
+#define MICROPY_BOARD_BT_HCI_POLL_NOW mp_bluetooth_hci_poll_now_default
+#endif
+
+// Called to poll Bluetooth HCI after the given timeout.
+// Default function defined in mpbthciport.h.
+#ifndef MICROPY_BOARD_BT_HCI_POLL_IN_MS
+#define MICROPY_BOARD_BT_HCI_POLL_IN_MS mp_bluetooth_hci_poll_in_ms_default
+#endif
+
 // Constants to return from boardctrl_run_boot_py, boardctrl_run_main_py.
 enum {
     BOARDCTRL_CONTINUE,
diff --git a/ports/stm32/mpbthciport.c b/ports/stm32/mpbthciport.c
index 369c91e30386c..a1ab3258b6269 100644
--- a/ports/stm32/mpbthciport.c
+++ b/ports/stm32/mpbthciport.c
@@ -71,7 +71,7 @@ STATIC void mp_bluetooth_hci_start_polling(void) {
     mp_bluetooth_hci_poll_now();
 }
 
-void mp_bluetooth_hci_poll_in_ms(uint32_t ms) {
+void mp_bluetooth_hci_poll_in_ms_default(uint32_t ms) {
     soft_timer_reinsert(&mp_bluetooth_hci_soft_timer, ms);
 }
 
@@ -92,7 +92,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(run_events_scheduled_task_obj, run_events_sched
 
 // Called periodically (systick) or directly (e.g. UART RX IRQ) in order to
 // request that processing happens ASAP in the scheduler.
-void mp_bluetooth_hci_poll_now(void) {
+void mp_bluetooth_hci_poll_now_default(void) {
     if (!events_task_is_scheduled) {
         events_task_is_scheduled = mp_sched_schedule(MP_OBJ_FROM_PTR(&run_events_scheduled_task_obj), mp_const_none);
         if (!events_task_is_scheduled) {
@@ -104,7 +104,7 @@ void mp_bluetooth_hci_poll_now(void) {
 
 #else // !MICROPY_PY_BLUETOOTH_USE_SYNC_EVENTS
 
-void mp_bluetooth_hci_poll_now(void) {
+void mp_bluetooth_hci_poll_now_default(void) {
     pendsv_schedule_dispatch(PENDSV_DISPATCH_BLUETOOTH_HCI, mp_bluetooth_hci_poll);
 }
 
diff --git a/ports/stm32/mpbthciport.h b/ports/stm32/mpbthciport.h
index 77919ee0e6355..d510ab52ad5c7 100644
--- a/ports/stm32/mpbthciport.h
+++ b/ports/stm32/mpbthciport.h
@@ -26,12 +26,24 @@
 #ifndef MICROPY_INCLUDED_STM32_MPBTHCIPORT_H
 #define MICROPY_INCLUDED_STM32_MPBTHCIPORT_H
 
+#include "boardctrl.h"
+
 // Initialise the HCI subsystem (should be called once, early on).
 void mp_bluetooth_hci_init(void);
 
-// Poll the HCI now, or after a certain timeout.
-void mp_bluetooth_hci_poll_now(void);
-void mp_bluetooth_hci_poll_in_ms(uint32_t ms);
+// Default implementations of poll functions (a board can override them).
+void mp_bluetooth_hci_poll_now_default(void);
+void mp_bluetooth_hci_poll_in_ms_default(uint32_t ms);
+
+// Call this to poll the HCI now.
+static inline void mp_bluetooth_hci_poll_now(void) {
+    MICROPY_BOARD_BT_HCI_POLL_NOW();
+}
+
+// Call this to poll the HCI after a certain timeout.
+static inline void mp_bluetooth_hci_poll_in_ms(uint32_t ms) {
+    MICROPY_BOARD_BT_HCI_POLL_IN_MS(ms);
+}
 
 // Must be provided by the stack bindings (e.g. mpnimbleport.c or mpbtstackport.c).
 // Request new data from the uart and pass to the stack, and run pending events/callouts.

From 30268c93dc52116bc6c2041c55de486180b4eb03 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 13 Oct 2021 18:40:06 +1100
Subject: [PATCH 1335/3533] stm32/pendsv: Allow a board to add entries for
 pendsv_schedule_dispatch.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/boardctrl.h | 5 +++++
 ports/stm32/pendsv.h    | 3 +++
 2 files changed, 8 insertions(+)

diff --git a/ports/stm32/boardctrl.h b/ports/stm32/boardctrl.h
index c870af32a46f2..0878a453b3db1 100644
--- a/ports/stm32/boardctrl.h
+++ b/ports/stm32/boardctrl.h
@@ -28,6 +28,11 @@
 
 #include "py/mpconfig.h"
 
+// Additional entries for use with pendsv_schedule_dispatch.
+#ifndef MICROPY_BOARD_PENDSV_ENTRIES
+#define MICROPY_BOARD_PENDSV_ENTRIES
+#endif
+
 #ifndef MICROPY_BOARD_STARTUP
 #define MICROPY_BOARD_STARTUP powerctrl_check_enter_bootloader
 #endif
diff --git a/ports/stm32/pendsv.h b/ports/stm32/pendsv.h
index aa8f90e3e428f..0733d355d3112 100644
--- a/ports/stm32/pendsv.h
+++ b/ports/stm32/pendsv.h
@@ -26,6 +26,8 @@
 #ifndef MICROPY_INCLUDED_STM32_PENDSV_H
 #define MICROPY_INCLUDED_STM32_PENDSV_H
 
+#include "boardctrl.h"
+
 enum {
     PENDSV_DISPATCH_SOFT_TIMER,
     #if MICROPY_PY_NETWORK && MICROPY_PY_LWIP
@@ -37,6 +39,7 @@ enum {
     #if MICROPY_PY_BLUETOOTH && !MICROPY_PY_BLUETOOTH_USE_SYNC_EVENTS
     PENDSV_DISPATCH_BLUETOOTH_HCI,
     #endif
+    MICROPY_BOARD_PENDSV_ENTRIES
     PENDSV_DISPATCH_MAX
 };
 

From fe2bc92b4d20c116fbb14b6fe92db459d8ce2126 Mon Sep 17 00:00:00 2001
From: Mike Wadsten <mikewadsten@gmail.com>
Date: Mon, 13 Jan 2020 11:51:04 -0600
Subject: [PATCH 1336/3533] py/runtime: Fix crash when exc __new__ doesn't
 return an exc instance.

See CPython bug https://bugs.python.org/issue39091 for more details.
---
 py/runtime.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/py/runtime.c b/py/runtime.c
index 0133d813f7cf8..27e77fc290123 100644
--- a/py/runtime.c
+++ b/py/runtime.c
@@ -1372,8 +1372,10 @@ mp_obj_t mp_make_raise_obj(mp_obj_t o) {
         // create and return a new exception instance by calling o
         // TODO could have an option to disable traceback, then builtin exceptions (eg TypeError)
         // could have const instances in ROM which we return here instead
-        return mp_call_function_n_kw(o, 0, 0, NULL);
-    } else if (mp_obj_is_exception_instance(o)) {
+        o = mp_call_function_n_kw(o, 0, 0, NULL);
+    }
+
+    if (mp_obj_is_exception_instance(o)) {
         // o is an instance of an exception, so use it as the exception
         return o;
     } else {

From c3c2c37fbcc59f8ecd58dc294b31ad4d239fd52c Mon Sep 17 00:00:00 2001
From: Mike Wadsten <mikewadsten@gmail.com>
Date: Mon, 13 Jan 2020 11:52:36 -0600
Subject: [PATCH 1337/3533] tests/basics: Add tests for type-checking
 subclassed exc instances.

---
 tests/basics/subclass_native_exc_new.py     | 39 +++++++++++++++++++++
 tests/basics/subclass_native_exc_new.py.exp |  6 ++++
 2 files changed, 45 insertions(+)
 create mode 100644 tests/basics/subclass_native_exc_new.py
 create mode 100644 tests/basics/subclass_native_exc_new.py.exp

diff --git a/tests/basics/subclass_native_exc_new.py b/tests/basics/subclass_native_exc_new.py
new file mode 100644
index 0000000000000..c1bd89a6fa69b
--- /dev/null
+++ b/tests/basics/subclass_native_exc_new.py
@@ -0,0 +1,39 @@
+# test subclassing exceptions and providing __new__
+
+
+class Dummy(BaseException):
+    pass
+
+
+class GoodException(BaseException):
+    def __new__(cls, *args, **kwargs):
+        print("GoodException __new__")
+        return Dummy(*args, **kwargs)
+
+
+class BadException(BaseException):
+    def __new__(cls, *args, **kwargs):
+        print("BadException __new__")
+        return 1
+
+
+try:
+    raise GoodException("good message")
+except BaseException as good:
+    print(type(good), good.args[0])
+
+try:
+    raise BadException("bad message")
+except Exception as bad:
+    # Should be TypeError 'exceptions must derive from BaseException'
+    print(type(bad), bad.args[0])
+
+try:
+
+    def gen():
+        yield
+
+    gen().throw(BadException)
+except Exception as genbad:
+    # Should be TypeError 'exceptions must derive from BaseException'
+    print(type(genbad), genbad.args[0])
diff --git a/tests/basics/subclass_native_exc_new.py.exp b/tests/basics/subclass_native_exc_new.py.exp
new file mode 100644
index 0000000000000..65709b2ccf26b
--- /dev/null
+++ b/tests/basics/subclass_native_exc_new.py.exp
@@ -0,0 +1,6 @@
+GoodException __new__
+<class 'Dummy'> good message
+BadException __new__
+<class 'TypeError'> exceptions must derive from BaseException
+BadException __new__
+<class 'TypeError'> exceptions must derive from BaseException

From f4c1389fbcc21e3e4b37a7dbe5018e1a7314f6cd Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 21 Oct 2021 12:59:59 +1100
Subject: [PATCH 1338/3533] github/workflows: Use Python 3.8 for macos
 workflow.

Otherwise it gets a more recent version which fails some of the test suite.

Signed-off-by: Damien George <damien@micropython.org>
---
 .github/workflows/ports_unix.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ports_unix.yml b/.github/workflows/ports_unix.yml
index 0e6a98f6b226a..4e75172b64f46 100644
--- a/.github/workflows/ports_unix.yml
+++ b/.github/workflows/ports_unix.yml
@@ -190,7 +190,9 @@ jobs:
     runs-on: macos-11.0
     steps:
     - uses: actions/checkout@v2
-    - uses: actions/setup-python@v1
+    - uses: actions/setup-python@v2
+      with:
+        python-version: '3.8'
     - name: Build
       run: source tools/ci.sh && ci_unix_macos_build
     - name: Run tests

From 7e62c9707a72d47498ba38bdb23980eb1a3c883d Mon Sep 17 00:00:00 2001
From: Philipp Ebensberger <philipp.ebensberger@3bricks-software.de>
Date: Fri, 20 Aug 2021 21:41:58 +0200
Subject: [PATCH 1339/3533] mimxrt/sdram: Add SDRAM support.

Adds support for SDRAM via `SEMC` peripheral. SDRAM support can be
enabled in the mpconfigboard.mk file by setting `MICROPY_HW_SDRAM_AVAIL`
to `1` and poviding the size of the RAM via `MICROPY_HW_FLASH_SIZE`.

When SDRAM support is enabled the whole SDRAM is currently used used
for MicroPython heap.

Signed-off-by: Philipp Ebensberger
---
 ports/mimxrt/Makefile                         |  39 ++--
 ports/mimxrt/board_init.c                     |   6 +-
 .../boards/MIMXRT1010_EVK/mpconfigboard.mk    |   4 +-
 .../MIMXRT1010_EVK/qspi_nor_flash_config.c    |   2 +-
 ports/mimxrt/boards/MIMXRT1011.ld             |  10 +-
 .../boards/MIMXRT1020_EVK/mpconfigboard.h     |  45 +++++
 .../boards/MIMXRT1020_EVK/mpconfigboard.mk    |   7 +-
 .../MIMXRT1020_EVK/qspi_nor_flash_config.c    |   2 +-
 ports/mimxrt/boards/MIMXRT1021.ld             |  20 +-
 .../boards/MIMXRT1050_EVK/mpconfigboard.h     |  45 +++++
 .../boards/MIMXRT1050_EVK/mpconfigboard.mk    |   7 +-
 .../MIMXRT1050_EVK/qspi_hyper_flash_config.c  |   2 +-
 .../MIMXRT1050_EVK/qspi_nor_flash_config.c    |   2 +-
 ports/mimxrt/boards/MIMXRT1052.ld             |  22 ++-
 .../boards/MIMXRT1060_EVK/mpconfigboard.h     |  45 +++++
 .../boards/MIMXRT1060_EVK/mpconfigboard.mk    |   7 +-
 .../MIMXRT1060_EVK/qspi_hyper_flash_config.c  |   2 +-
 .../MIMXRT1060_EVK/qspi_nor_flash_config.c    |   2 +-
 ports/mimxrt/boards/MIMXRT1062.ld             |  22 ++-
 ports/mimxrt/boards/MIMXRT1064.ld             |  24 ++-
 .../boards/MIMXRT1064_EVK/mpconfigboard.h     |  45 +++++
 .../boards/MIMXRT1064_EVK/mpconfigboard.mk    |   7 +-
 .../MIMXRT1064_EVK/qspi_hyper_flash_config.c  |   2 +-
 .../MIMXRT1064_EVK/qspi_nor_flash_config.c    |   2 +-
 ports/mimxrt/boards/TEENSY40/mpconfigboard.mk |   6 +-
 .../boards/TEENSY40/qspi_nor_flash_config.c   |   2 +-
 ports/mimxrt/boards/TEENSY41/mpconfigboard.mk |   6 +-
 .../boards/TEENSY41/qspi_nor_flash_config.c   |   2 +-
 ports/mimxrt/boards/common.ld                 |   7 +
 ports/mimxrt/boards/make-pins.py              |   2 +-
 ports/mimxrt/mimxrt_flash.c                   |   2 -
 ports/mimxrt/mimxrt_sdram.c                   | 186 ++++++++++++++++++
 ports/mimxrt/modmachine.h                     |   1 +
 ports/mimxrt/pin.h                            |   1 +
 34 files changed, 514 insertions(+), 72 deletions(-)
 create mode 100644 ports/mimxrt/mimxrt_sdram.c

diff --git a/ports/mimxrt/Makefile b/ports/mimxrt/Makefile
index fcbd97b20cf30..1b83f36abf32c 100644
--- a/ports/mimxrt/Makefile
+++ b/ports/mimxrt/Makefile
@@ -13,15 +13,22 @@ endif
 include ../../py/mkenv.mk
 include $(BOARD_DIR)/mpconfigboard.mk
 
-# Set optional flash configuration variables
-BOARD_FLASH_RESERVED ?=
-
 LD_MEMORY_CONFIG_DEFINES += \
-	BOARD_FLASH_TYPE=$(BOARD_FLASH_TYPE) \
-	BOARD_FLASH_SIZE=$(BOARD_FLASH_SIZE)
+	MICROPY_HW_FLASH_TYPE=$(MICROPY_HW_FLASH_TYPE) \
+	MICROPY_HW_FLASH_SIZE=$(MICROPY_HW_FLASH_SIZE)
 
-ifdef $(BOARD_FLASH_RESERVED)
-LD_MEMORY_CONFIG_DEFINES += BOARD_FLASH_RESERVED=$(BOARD_FLASH_RESERVED)
+ifdef MICROPY_HW_FLASH_RESERVED
+LD_MEMORY_CONFIG_DEFINES += MICROPY_HW_FLASH_RESERVED=$(MICROPY_HW_FLASH_RESERVED)
+endif
+
+ifdef MICROPY_HW_SDRAM_AVAIL
+CFLAGS += \
+	-DMICROPY_HW_SDRAM_AVAIL=$(MICROPY_HW_SDRAM_AVAIL) \
+	-DMICROPY_HW_SDRAM_SIZE=$(MICROPY_HW_SDRAM_SIZE)
+
+LD_MEMORY_CONFIG_DEFINES += \
+	MICROPY_HW_SDRAM_AVAIL=$(MICROPY_HW_SDRAM_AVAIL) \
+	MICROPY_HW_SDRAM_SIZE=$(MICROPY_HW_SDRAM_SIZE)
 endif
 
 # Qstr definitions (must come before including py.mk)
@@ -81,12 +88,13 @@ CFLAGS += -DXIP_EXTERNAL_FLASH=1 \
 	-D__STARTUP_INITIALIZE_RAMFUNCTION \
 	-D__START=main \
 	-DCPU_HEADER_H='<$(MCU_SERIES).h>' \
-	-DBOARD_FLASH_SIZE=$(BOARD_FLASH_SIZE) \
+	-DBOARD_FLASH_SIZE=$(MICROPY_HW_FLASH_SIZE) \
+	-DMICROPY_HW_FLASH_SIZE=$(MICROPY_HW_FLASH_SIZE) \
 	-DBOARD_FLASH_CONFIG_HEADER_H=\"$(BOARD)_flexspi_nor_config.h\"
 
-ifeq ($(BOARD_FLASH_TYPE), qspi_nor)
+ifeq ($(MICROPY_HW_FLASH_TYPE), qspi_nor)
 CFLAGS += -DBOARD_FLASH_OPS_HEADER_H=\"hal/flexspi_nor_flash.h\"
-else ifeq ($(BOARD_FLASH_TYPE), hyperflash)
+else ifeq ($(MICROPY_HW_FLASH_TYPE), hyperflash)
 CFLAGS += -DBOARD_FLASH_OPS_HEADER_H=\"hal/flexspi_hyper_flash.h\"
 endif
 
@@ -163,6 +171,10 @@ SRC_HAL_IMX_C += \
 	$(MCU_DIR)/system_$(MCU_SERIES).c \
 	$(MCU_DIR)/xip/fsl_flexspi_nor_boot.c \
 
+ifeq ($(MICROPY_HW_SDRAM_AVAIL), 1)
+SRC_HAL_IMX_C += $(MCU_DIR)/drivers/fsl_semc.c
+endif
+
 ifeq ($(MICROPY_PY_MACHINE_SDCARD),1)
 SRC_HAL_IMX_C += $(MCU_DIR)/drivers/fsl_usdhc.c
 endif
@@ -186,6 +198,7 @@ SRC_C += \
 	machine_uart.c \
 	main.c \
 	mimxrt_flash.c \
+	mimxrt_sdram.c \
 	modmachine.c \
 	modmimxrt.c \
 	moduos.c \
@@ -207,16 +220,16 @@ SRC_C += \
 	$(SRC_TINYUSB_C) \
 	$(SRC_HAL_IMX_C) \
 
-ifeq ($(BOARD_FLASH_TYPE), qspi_nor)
+ifeq ($(MICROPY_HW_FLASH_TYPE), qspi_nor)
 SRC_C += \
 	hal/flexspi_nor_flash.c \
 	$(BOARD_DIR)/qspi_nor_flash_config.c
-else ifeq ($(BOARD_FLASH_TYPE), hyperflash)
+else ifeq ($(MICROPY_HW_FLASH_TYPE), hyperflash)
 SRC_C += \
 	hal/flexspi_hyper_flash.c \
 	$(BOARD_DIR)/qspi_hyper_flash_config.c
 else
-$(error Error: Unknown board flash type $(BOARD_FLASH_TYPE))
+$(error Error: Unknown board flash type $(MICROPY_HW_FLASH_TYPE))
 endif
 
 ifeq ($(MICROPY_FLOAT_IMPL),double)
diff --git a/ports/mimxrt/board_init.c b/ports/mimxrt/board_init.c
index 091e23eb5d8c9..e37ed1f149e13 100644
--- a/ports/mimxrt/board_init.c
+++ b/ports/mimxrt/board_init.c
@@ -51,8 +51,12 @@ void board_init(void) {
     // Enable IOCON clock
     CLOCK_EnableClock(kCLOCK_Iomuxc);
 
-    // ------------- USB0 ------------- //
+    // ------------- SDRAM ------------ //
+    #ifdef MICROPY_HW_SDRAM_AVAIL
+    mimxrt_sdram_init();
+    #endif
 
+    // ------------- USB0 ------------- //
     // Clock
     CLOCK_EnableUsbhs0PhyPllClock(kCLOCK_Usbphy480M, 480000000U);
     CLOCK_EnableUsbhs0Clock(kCLOCK_Usb480M, 480000000U);
diff --git a/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.mk b/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.mk
index c4c911d7dbf43..c2a50d722be1f 100644
--- a/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.mk
+++ b/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.mk
@@ -3,8 +3,8 @@ MCU_VARIANT = MIMXRT1011DAE5A
 
 MICROPY_FLOAT_IMPL = single
 MICROPY_PY_MACHINE_SDCARD = 0
-BOARD_FLASH_TYPE ?= qspi_nor
-BOARD_FLASH_SIZE ?= 0x1000000  # 16MB
+MICROPY_HW_FLASH_TYPE ?= qspi_nor
+MICROPY_HW_FLASH_SIZE ?= 0x1000000  # 16MB
 
 JLINK_PATH ?= /media/RT1010-EVK/
 JLINK_COMMANDER_SCRIPT = $(BUILD)/script.jlink
diff --git a/ports/mimxrt/boards/MIMXRT1010_EVK/qspi_nor_flash_config.c b/ports/mimxrt/boards/MIMXRT1010_EVK/qspi_nor_flash_config.c
index 83a45159c0b21..60d435433acf7 100644
--- a/ports/mimxrt/boards/MIMXRT1010_EVK/qspi_nor_flash_config.c
+++ b/ports/mimxrt/boards/MIMXRT1010_EVK/qspi_nor_flash_config.c
@@ -34,7 +34,7 @@ const flexspi_nor_config_t qspiflash_config = {
         .csSetupTime = 3u,
         .sflashPadType = kSerialFlash_4Pads,
         .serialClkFreq = kFlexSpiSerialClk_100MHz,
-        .sflashA1Size = BOARD_FLASH_SIZE,
+        .sflashA1Size = MICROPY_HW_FLASH_SIZE,
         .lookupTable =
         {
             // 0 Read LUTs 0 -> 0
diff --git a/ports/mimxrt/boards/MIMXRT1011.ld b/ports/mimxrt/boards/MIMXRT1011.ld
index 22d5da3199da9..19bbc27701657 100644
--- a/ports/mimxrt/boards/MIMXRT1011.ld
+++ b/ports/mimxrt/boards/MIMXRT1011.ld
@@ -1,14 +1,14 @@
 /* Memory configuration */
-#if BOARD_FLASH_RESERVED
-reserved_size = BOARD_FLASH_RESERVED;
+#if MICROPY_HW_FLASH_RESERVED
+reserved_size = MICROPY_HW_FLASH_RESERVED;
 #endif
 
-#if BOARD_FLASH_TYPE==qspi_nor
+#if MICROPY_HW_FLASH_TYPE==qspi_nor
 flash_start         = 0x60000000;
 #else
-#error Unknown BOARD_FLASH_TYPE
+#error Unknown MICROPY_HW_FLASH_TYPE
 #endif
-flash_size          = BOARD_FLASH_SIZE;
+flash_size          = MICROPY_HW_FLASH_SIZE;
 flash_end           = DEFINED(reserved_size) ? ((flash_start) + (flash_size - reserved_size)) : ((flash_start) + (flash_size));
 flash_config_start  = flash_start + 0x00000400;
 flash_config_size   = 0x00000C00;
diff --git a/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.h b/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.h
index 35c24b3d47c3c..4f33bb20871ac 100644
--- a/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.h
+++ b/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.h
@@ -72,3 +72,48 @@
         .data2 = { GPIO_SD_B0_00_USDHC1_DATA2 }, \
         .data3 = { GPIO_SD_B0_01_USDHC1_DATA3 }, \
     }
+
+// --- SEMC --- //
+#define MIMXRT_IOMUXC_SEMC_DATA00 IOMUXC_GPIO_EMC_00_SEMC_DATA00
+#define MIMXRT_IOMUXC_SEMC_DATA01 IOMUXC_GPIO_EMC_01_SEMC_DATA01
+#define MIMXRT_IOMUXC_SEMC_DATA02 IOMUXC_GPIO_EMC_02_SEMC_DATA02
+#define MIMXRT_IOMUXC_SEMC_DATA03 IOMUXC_GPIO_EMC_03_SEMC_DATA03
+#define MIMXRT_IOMUXC_SEMC_DATA04 IOMUXC_GPIO_EMC_04_SEMC_DATA04
+#define MIMXRT_IOMUXC_SEMC_DATA05 IOMUXC_GPIO_EMC_05_SEMC_DATA05
+#define MIMXRT_IOMUXC_SEMC_DATA06 IOMUXC_GPIO_EMC_06_SEMC_DATA06
+#define MIMXRT_IOMUXC_SEMC_DATA07 IOMUXC_GPIO_EMC_07_SEMC_DATA07
+#define MIMXRT_IOMUXC_SEMC_DATA08 IOMUXC_GPIO_EMC_32_SEMC_DATA08
+#define MIMXRT_IOMUXC_SEMC_DATA09 IOMUXC_GPIO_EMC_33_SEMC_DATA09
+#define MIMXRT_IOMUXC_SEMC_DATA10 IOMUXC_GPIO_EMC_34_SEMC_DATA10
+#define MIMXRT_IOMUXC_SEMC_DATA11 IOMUXC_GPIO_EMC_35_SEMC_DATA11
+#define MIMXRT_IOMUXC_SEMC_DATA12 IOMUXC_GPIO_EMC_36_SEMC_DATA12
+#define MIMXRT_IOMUXC_SEMC_DATA13 IOMUXC_GPIO_EMC_37_SEMC_DATA13
+#define MIMXRT_IOMUXC_SEMC_DATA14 IOMUXC_GPIO_EMC_38_SEMC_DATA14
+#define MIMXRT_IOMUXC_SEMC_DATA15 IOMUXC_GPIO_EMC_39_SEMC_DATA15
+
+#define MIMXRT_IOMUXC_SEMC_ADDR00 IOMUXC_GPIO_EMC_16_SEMC_ADDR00
+#define MIMXRT_IOMUXC_SEMC_ADDR01 IOMUXC_GPIO_EMC_17_SEMC_ADDR01
+#define MIMXRT_IOMUXC_SEMC_ADDR02 IOMUXC_GPIO_EMC_18_SEMC_ADDR02
+#define MIMXRT_IOMUXC_SEMC_ADDR03 IOMUXC_GPIO_EMC_19_SEMC_ADDR03
+#define MIMXRT_IOMUXC_SEMC_ADDR04 IOMUXC_GPIO_EMC_20_SEMC_ADDR04
+#define MIMXRT_IOMUXC_SEMC_ADDR05 IOMUXC_GPIO_EMC_21_SEMC_ADDR05
+#define MIMXRT_IOMUXC_SEMC_ADDR06 IOMUXC_GPIO_EMC_22_SEMC_ADDR06
+#define MIMXRT_IOMUXC_SEMC_ADDR07 IOMUXC_GPIO_EMC_23_SEMC_ADDR07
+#define MIMXRT_IOMUXC_SEMC_ADDR08 IOMUXC_GPIO_EMC_24_SEMC_ADDR08
+#define MIMXRT_IOMUXC_SEMC_ADDR09 IOMUXC_GPIO_EMC_25_SEMC_ADDR09
+#define MIMXRT_IOMUXC_SEMC_ADDR10 IOMUXC_GPIO_EMC_15_SEMC_ADDR10
+#define MIMXRT_IOMUXC_SEMC_ADDR11 IOMUXC_GPIO_EMC_26_SEMC_ADDR11
+#define MIMXRT_IOMUXC_SEMC_ADDR12 IOMUXC_GPIO_EMC_27_SEMC_ADDR12
+
+#define MIMXRT_IOMUXC_SEMC_BA0 IOMUXC_GPIO_EMC_13_SEMC_BA0
+#define MIMXRT_IOMUXC_SEMC_BA1 IOMUXC_GPIO_EMC_14_SEMC_BA1
+#define MIMXRT_IOMUXC_SEMC_CAS IOMUXC_GPIO_EMC_10_SEMC_CAS
+#define MIMXRT_IOMUXC_SEMC_CKE IOMUXC_GPIO_EMC_29_SEMC_CKE
+#define MIMXRT_IOMUXC_SEMC_CLK IOMUXC_GPIO_EMC_30_SEMC_CLK
+#define MIMXRT_IOMUXC_SEMC_DM00 IOMUXC_GPIO_EMC_08_SEMC_DM00
+#define MIMXRT_IOMUXC_SEMC_DM01 IOMUXC_GPIO_EMC_31_SEMC_DM01
+#define MIMXRT_IOMUXC_SEMC_DQS IOMUXC_GPIO_EMC_28_SEMC_DQS
+#define MIMXRT_IOMUXC_SEMC_RAS IOMUXC_GPIO_EMC_11_SEMC_RAS
+#define MIMXRT_IOMUXC_SEMC_WE IOMUXC_GPIO_EMC_09_SEMC_WE
+
+#define MIMXRT_IOMUXC_SEMC_CS0 IOMUXC_GPIO_EMC_12_SEMC_CS0
diff --git a/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.mk b/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.mk
index 34b714e623576..e08b3357fdf06 100644
--- a/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.mk
+++ b/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.mk
@@ -3,8 +3,11 @@ MCU_VARIANT = MIMXRT1021DAG5A
 
 MICROPY_FLOAT_IMPL = double
 MICROPY_PY_MACHINE_SDCARD = 1
-BOARD_FLASH_TYPE ?= qspi_nor
-BOARD_FLASH_SIZE ?= 0x800000  # 8MB
+MICROPY_HW_FLASH_TYPE ?= qspi_nor
+MICROPY_HW_FLASH_SIZE ?= 0x800000  # 8MB
+
+MICROPY_HW_SDRAM_AVAIL = 1
+MICROPY_HW_SDRAM_SIZE  = 0x2000000  # 32MB
 
 JLINK_PATH ?= /media/RT1020-EVK/
 JLINK_COMMANDER_SCRIPT = $(BUILD)/script.jlink
diff --git a/ports/mimxrt/boards/MIMXRT1020_EVK/qspi_nor_flash_config.c b/ports/mimxrt/boards/MIMXRT1020_EVK/qspi_nor_flash_config.c
index 7b2584d3de691..fc4d3c10c1e38 100644
--- a/ports/mimxrt/boards/MIMXRT1020_EVK/qspi_nor_flash_config.c
+++ b/ports/mimxrt/boards/MIMXRT1020_EVK/qspi_nor_flash_config.c
@@ -45,7 +45,7 @@ const flexspi_nor_config_t qspiflash_config = {
         .deviceType = kFlexSpiDeviceType_SerialNOR,
         .sflashPadType = kSerialFlash_4Pads,
         .serialClkFreq = kFlexSpiSerialClk_100MHz,
-        .sflashA1Size = BOARD_FLASH_SIZE,
+        .sflashA1Size = MICROPY_HW_FLASH_SIZE,
         .lookupTable =
         {
             // 0 Read LUTs 0 -> 0
diff --git a/ports/mimxrt/boards/MIMXRT1021.ld b/ports/mimxrt/boards/MIMXRT1021.ld
index 92cd59d668363..8d981a7c61d32 100644
--- a/ports/mimxrt/boards/MIMXRT1021.ld
+++ b/ports/mimxrt/boards/MIMXRT1021.ld
@@ -1,14 +1,14 @@
 /* Memory configuration */
-#if defined BOARD_FLASH_RESERVED
-reserved_size = BOARD_FLASH_RESERVED;
+#if defined MICROPY_HW_FLASH_RESERVED
+reserved_size = MICROPY_HW_FLASH_RESERVED;
 #endif
 
-#if BOARD_FLASH_TYPE == qspi_nor
+#if MICROPY_HW_FLASH_TYPE == qspi_nor
 flash_start         = 0x60000000;
 #else
-#error Unknown BOARD_FLASH_TYPE
+#error Unknown MICROPY_HW_FLASH_TYPE
 #endif
-flash_size          = BOARD_FLASH_SIZE;
+flash_size          = MICROPY_HW_FLASH_SIZE;
 flash_end           = DEFINED(reserved_size) ? ((flash_start) + (flash_size - reserved_size)) : ((flash_start) + (flash_size));
 flash_config_start  = flash_start;
 flash_config_size   = 0x00001000;
@@ -27,11 +27,21 @@ dtcm_size           = 0x00018000;
 ocrm_start          = 0x20200000;
 ocrm_size           = 0x00020000;
 
+#ifdef MICROPY_HW_SDRAM_AVAIL
+sdram_start         = 0x80000000;
+sdram_size          = MICROPY_HW_SDRAM_SIZE;
+#endif
+
 /* 24kiB stack. */
 __stack_size__ = 0x6000;
 _estack = __StackTop;
 _sstack = __StackLimit;
 
+#ifdef MICROPY_HW_SDRAM_AVAIL
+_gc_heap_start = ORIGIN(m_sdram);
+_gc_heap_end = ORIGIN(m_sdram) + LENGTH(m_sdram);
+#else
 /* Use second OCRAM bank for GC heap. */
 _gc_heap_start = ORIGIN(m_ocrm);
 _gc_heap_end = ORIGIN(m_ocrm) + LENGTH(m_ocrm);
+#endif
diff --git a/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.h b/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.h
index b6b70be0587cb..f6021ac788d5c 100644
--- a/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.h
+++ b/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.h
@@ -63,3 +63,48 @@
         .data2 = { GPIO_SD_B0_04_USDHC1_DATA2 }, \
         .data3 = { GPIO_SD_B0_05_USDHC1_DATA3 }, \
     }
+
+// --- SEMC --- //
+#define MIMXRT_IOMUXC_SEMC_DATA00 IOMUXC_GPIO_EMC_00_SEMC_DATA00
+#define MIMXRT_IOMUXC_SEMC_DATA01 IOMUXC_GPIO_EMC_01_SEMC_DATA01
+#define MIMXRT_IOMUXC_SEMC_DATA02 IOMUXC_GPIO_EMC_02_SEMC_DATA02
+#define MIMXRT_IOMUXC_SEMC_DATA03 IOMUXC_GPIO_EMC_03_SEMC_DATA03
+#define MIMXRT_IOMUXC_SEMC_DATA04 IOMUXC_GPIO_EMC_04_SEMC_DATA04
+#define MIMXRT_IOMUXC_SEMC_DATA05 IOMUXC_GPIO_EMC_05_SEMC_DATA05
+#define MIMXRT_IOMUXC_SEMC_DATA06 IOMUXC_GPIO_EMC_06_SEMC_DATA06
+#define MIMXRT_IOMUXC_SEMC_DATA07 IOMUXC_GPIO_EMC_07_SEMC_DATA07
+#define MIMXRT_IOMUXC_SEMC_DATA08 IOMUXC_GPIO_EMC_30_SEMC_DATA08
+#define MIMXRT_IOMUXC_SEMC_DATA09 IOMUXC_GPIO_EMC_31_SEMC_DATA09
+#define MIMXRT_IOMUXC_SEMC_DATA10 IOMUXC_GPIO_EMC_32_SEMC_DATA10
+#define MIMXRT_IOMUXC_SEMC_DATA11 IOMUXC_GPIO_EMC_33_SEMC_DATA11
+#define MIMXRT_IOMUXC_SEMC_DATA12 IOMUXC_GPIO_EMC_34_SEMC_DATA12
+#define MIMXRT_IOMUXC_SEMC_DATA13 IOMUXC_GPIO_EMC_35_SEMC_DATA13
+#define MIMXRT_IOMUXC_SEMC_DATA14 IOMUXC_GPIO_EMC_36_SEMC_DATA14
+#define MIMXRT_IOMUXC_SEMC_DATA15 IOMUXC_GPIO_EMC_37_SEMC_DATA15
+
+#define MIMXRT_IOMUXC_SEMC_ADDR00 IOMUXC_GPIO_EMC_09_SEMC_ADDR00
+#define MIMXRT_IOMUXC_SEMC_ADDR01 IOMUXC_GPIO_EMC_10_SEMC_ADDR01
+#define MIMXRT_IOMUXC_SEMC_ADDR02 IOMUXC_GPIO_EMC_11_SEMC_ADDR02
+#define MIMXRT_IOMUXC_SEMC_ADDR03 IOMUXC_GPIO_EMC_12_SEMC_ADDR03
+#define MIMXRT_IOMUXC_SEMC_ADDR04 IOMUXC_GPIO_EMC_13_SEMC_ADDR04
+#define MIMXRT_IOMUXC_SEMC_ADDR05 IOMUXC_GPIO_EMC_14_SEMC_ADDR05
+#define MIMXRT_IOMUXC_SEMC_ADDR06 IOMUXC_GPIO_EMC_15_SEMC_ADDR06
+#define MIMXRT_IOMUXC_SEMC_ADDR07 IOMUXC_GPIO_EMC_16_SEMC_ADDR07
+#define MIMXRT_IOMUXC_SEMC_ADDR08 IOMUXC_GPIO_EMC_17_SEMC_ADDR08
+#define MIMXRT_IOMUXC_SEMC_ADDR09 IOMUXC_GPIO_EMC_18_SEMC_ADDR09
+#define MIMXRT_IOMUXC_SEMC_ADDR10 IOMUXC_GPIO_EMC_23_SEMC_ADDR10
+#define MIMXRT_IOMUXC_SEMC_ADDR11 IOMUXC_GPIO_EMC_19_SEMC_ADDR11
+#define MIMXRT_IOMUXC_SEMC_ADDR12 IOMUXC_GPIO_EMC_20_SEMC_ADDR12
+
+#define MIMXRT_IOMUXC_SEMC_BA0 IOMUXC_GPIO_EMC_21_SEMC_BA0
+#define MIMXRT_IOMUXC_SEMC_BA1 IOMUXC_GPIO_EMC_22_SEMC_BA1
+#define MIMXRT_IOMUXC_SEMC_CAS IOMUXC_GPIO_EMC_24_SEMC_CAS
+#define MIMXRT_IOMUXC_SEMC_CKE IOMUXC_GPIO_EMC_27_SEMC_CKE
+#define MIMXRT_IOMUXC_SEMC_CLK IOMUXC_GPIO_EMC_26_SEMC_CLK
+#define MIMXRT_IOMUXC_SEMC_DM00 IOMUXC_GPIO_EMC_08_SEMC_DM00
+#define MIMXRT_IOMUXC_SEMC_DM01 IOMUXC_GPIO_EMC_38_SEMC_DM01
+#define MIMXRT_IOMUXC_SEMC_DQS IOMUXC_GPIO_EMC_39_SEMC_DQS
+#define MIMXRT_IOMUXC_SEMC_RAS IOMUXC_GPIO_EMC_25_SEMC_RAS
+#define MIMXRT_IOMUXC_SEMC_WE IOMUXC_GPIO_EMC_28_SEMC_WE
+
+#define MIMXRT_IOMUXC_SEMC_CS0 IOMUXC_GPIO_EMC_29_SEMC_CS0
diff --git a/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.mk b/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.mk
index 1ea85b7b4fef2..4165b72c263c7 100644
--- a/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.mk
+++ b/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.mk
@@ -3,8 +3,11 @@ MCU_VARIANT = MIMXRT1052DVL6B
 
 MICROPY_FLOAT_IMPL = double
 MICROPY_PY_MACHINE_SDCARD = 1
-BOARD_FLASH_TYPE ?= hyperflash
-BOARD_FLASH_SIZE ?= 0x4000000  # 64MB
+MICROPY_HW_FLASH_TYPE ?= hyperflash
+MICROPY_HW_FLASH_SIZE ?= 0x4000000  # 64MB
+
+MICROPY_HW_SDRAM_AVAIL = 1
+MICROPY_HW_SDRAM_SIZE  = 0x2000000  # 32MB
 
 JLINK_PATH ?= /media/RT1050-EVKB/
 
diff --git a/ports/mimxrt/boards/MIMXRT1050_EVK/qspi_hyper_flash_config.c b/ports/mimxrt/boards/MIMXRT1050_EVK/qspi_hyper_flash_config.c
index 1b3349f911a12..f5ffbe8413a7d 100644
--- a/ports/mimxrt/boards/MIMXRT1050_EVK/qspi_hyper_flash_config.c
+++ b/ports/mimxrt/boards/MIMXRT1050_EVK/qspi_hyper_flash_config.c
@@ -37,7 +37,7 @@ const flexspi_nor_config_t qspiflash_config = {
             (1u << kFlexSpiMiscOffset_SafeConfigFreqEnable) | (1u << kFlexSpiMiscOffset_DiffClkEnable),
         .sflashPadType = kSerialFlash_8Pads,
         .serialClkFreq = kFlexSpiSerialClk_133MHz,
-        .sflashA1Size = BOARD_FLASH_SIZE,
+        .sflashA1Size = MICROPY_HW_FLASH_SIZE,
         .dataValidTime = {16u, 16u},
         .lookupTable =
         {
diff --git a/ports/mimxrt/boards/MIMXRT1050_EVK/qspi_nor_flash_config.c b/ports/mimxrt/boards/MIMXRT1050_EVK/qspi_nor_flash_config.c
index 290c6bc152a9e..73525b5dfcadc 100644
--- a/ports/mimxrt/boards/MIMXRT1050_EVK/qspi_nor_flash_config.c
+++ b/ports/mimxrt/boards/MIMXRT1050_EVK/qspi_nor_flash_config.c
@@ -37,7 +37,7 @@ const flexspi_nor_config_t qspiflash_config = {
             (1u << kFlexSpiMiscOffset_SafeConfigFreqEnable) | (1u << kFlexSpiMiscOffset_DiffClkEnable),
         .sflashPadType = kSerialFlash_8Pads,
         .serialClkFreq = kFlexSpiSerialClk_133MHz,
-        .sflashA1Size = BOARD_FLASH_SIZE,
+        .sflashA1Size = MICROPY_HW_FLASH_SIZE,
         .dataValidTime = {16u, 16u},
         .lookupTable =
         {
diff --git a/ports/mimxrt/boards/MIMXRT1052.ld b/ports/mimxrt/boards/MIMXRT1052.ld
index d8c51d530a30f..78d21ef3c498c 100644
--- a/ports/mimxrt/boards/MIMXRT1052.ld
+++ b/ports/mimxrt/boards/MIMXRT1052.ld
@@ -1,16 +1,16 @@
 /* Memory configuration */
-#if BOARD_FLASH_RESERVED
-reserved_size = BOARD_FLASH_RESERVED;
+#if MICROPY_HW_FLASH_RESERVED
+reserved_size = MICROPY_HW_FLASH_RESERVED;
 #endif
 
-#if BOARD_FLASH_TYPE==qspi_nor
+#if MICROPY_HW_FLASH_TYPE==qspi_nor
 flash_start         = 0x60000000;
-#elif BOARD_FLASH_TYPE==hyperflash
+#elif MICROPY_HW_FLASH_TYPE==hyperflash
 flash_start         = 0x60000000;
 #else
-#error Unknown BOARD_FLASH_TYPE
+#error Unknown MICROPY_HW_FLASH_TYPE
 #endif
-flash_size          = BOARD_FLASH_SIZE;
+flash_size          = MICROPY_HW_FLASH_SIZE;
 flash_end           = DEFINED(reserved_size) ? ((flash_start) + (flash_size - reserved_size)) : ((flash_start) + (flash_size));
 flash_config_start  = flash_start;
 flash_config_size   = 0x00001000;
@@ -29,11 +29,21 @@ dtcm_size           = 0x00020000;
 ocrm_start          = 0x20200000;
 ocrm_size           = 0x00040000;
 
+#ifdef MICROPY_HW_SDRAM_AVAIL
+sdram_start         = 0x80000000;
+sdram_size          = MICROPY_HW_SDRAM_SIZE;
+#endif
+
 /* 24kiB stack. */
 __stack_size__ = 0x6000;
 _estack = __StackTop;
 _sstack = __StackLimit;
 
+#ifdef MICROPY_HW_SDRAM_AVAIL
+_gc_heap_start = ORIGIN(m_sdram);
+_gc_heap_end = ORIGIN(m_sdram) + LENGTH(m_sdram);
+#else
 /* Use second OCRAM bank for GC heap. */
 _gc_heap_start = ORIGIN(m_ocrm);
 _gc_heap_end = ORIGIN(m_ocrm) + LENGTH(m_ocrm);
+#endif
diff --git a/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.h b/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.h
index 5cf31aa25abd8..af44010486f03 100644
--- a/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.h
+++ b/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.h
@@ -62,3 +62,48 @@
         .data2 = { GPIO_SD_B0_04_USDHC1_DATA2 }, \
         .data3 = { GPIO_SD_B0_05_USDHC1_DATA3 }, \
     }
+
+// --- SEMC --- //
+#define MIMXRT_IOMUXC_SEMC_DATA00 IOMUXC_GPIO_EMC_00_SEMC_DATA00
+#define MIMXRT_IOMUXC_SEMC_DATA01 IOMUXC_GPIO_EMC_01_SEMC_DATA01
+#define MIMXRT_IOMUXC_SEMC_DATA02 IOMUXC_GPIO_EMC_02_SEMC_DATA02
+#define MIMXRT_IOMUXC_SEMC_DATA03 IOMUXC_GPIO_EMC_03_SEMC_DATA03
+#define MIMXRT_IOMUXC_SEMC_DATA04 IOMUXC_GPIO_EMC_04_SEMC_DATA04
+#define MIMXRT_IOMUXC_SEMC_DATA05 IOMUXC_GPIO_EMC_05_SEMC_DATA05
+#define MIMXRT_IOMUXC_SEMC_DATA06 IOMUXC_GPIO_EMC_06_SEMC_DATA06
+#define MIMXRT_IOMUXC_SEMC_DATA07 IOMUXC_GPIO_EMC_07_SEMC_DATA07
+#define MIMXRT_IOMUXC_SEMC_DATA08 IOMUXC_GPIO_EMC_30_SEMC_DATA08
+#define MIMXRT_IOMUXC_SEMC_DATA09 IOMUXC_GPIO_EMC_31_SEMC_DATA09
+#define MIMXRT_IOMUXC_SEMC_DATA10 IOMUXC_GPIO_EMC_32_SEMC_DATA10
+#define MIMXRT_IOMUXC_SEMC_DATA11 IOMUXC_GPIO_EMC_33_SEMC_DATA11
+#define MIMXRT_IOMUXC_SEMC_DATA12 IOMUXC_GPIO_EMC_34_SEMC_DATA12
+#define MIMXRT_IOMUXC_SEMC_DATA13 IOMUXC_GPIO_EMC_35_SEMC_DATA13
+#define MIMXRT_IOMUXC_SEMC_DATA14 IOMUXC_GPIO_EMC_36_SEMC_DATA14
+#define MIMXRT_IOMUXC_SEMC_DATA15 IOMUXC_GPIO_EMC_37_SEMC_DATA15
+
+#define MIMXRT_IOMUXC_SEMC_ADDR00 IOMUXC_GPIO_EMC_09_SEMC_ADDR00
+#define MIMXRT_IOMUXC_SEMC_ADDR01 IOMUXC_GPIO_EMC_10_SEMC_ADDR01
+#define MIMXRT_IOMUXC_SEMC_ADDR02 IOMUXC_GPIO_EMC_11_SEMC_ADDR02
+#define MIMXRT_IOMUXC_SEMC_ADDR03 IOMUXC_GPIO_EMC_12_SEMC_ADDR03
+#define MIMXRT_IOMUXC_SEMC_ADDR04 IOMUXC_GPIO_EMC_13_SEMC_ADDR04
+#define MIMXRT_IOMUXC_SEMC_ADDR05 IOMUXC_GPIO_EMC_14_SEMC_ADDR05
+#define MIMXRT_IOMUXC_SEMC_ADDR06 IOMUXC_GPIO_EMC_15_SEMC_ADDR06
+#define MIMXRT_IOMUXC_SEMC_ADDR07 IOMUXC_GPIO_EMC_16_SEMC_ADDR07
+#define MIMXRT_IOMUXC_SEMC_ADDR08 IOMUXC_GPIO_EMC_17_SEMC_ADDR08
+#define MIMXRT_IOMUXC_SEMC_ADDR09 IOMUXC_GPIO_EMC_18_SEMC_ADDR09
+#define MIMXRT_IOMUXC_SEMC_ADDR10 IOMUXC_GPIO_EMC_23_SEMC_ADDR10
+#define MIMXRT_IOMUXC_SEMC_ADDR11 IOMUXC_GPIO_EMC_19_SEMC_ADDR11
+#define MIMXRT_IOMUXC_SEMC_ADDR12 IOMUXC_GPIO_EMC_20_SEMC_ADDR12
+
+#define MIMXRT_IOMUXC_SEMC_BA0 IOMUXC_GPIO_EMC_21_SEMC_BA0
+#define MIMXRT_IOMUXC_SEMC_BA1 IOMUXC_GPIO_EMC_22_SEMC_BA1
+#define MIMXRT_IOMUXC_SEMC_CAS IOMUXC_GPIO_EMC_24_SEMC_CAS
+#define MIMXRT_IOMUXC_SEMC_CKE IOMUXC_GPIO_EMC_27_SEMC_CKE
+#define MIMXRT_IOMUXC_SEMC_CLK IOMUXC_GPIO_EMC_26_SEMC_CLK
+#define MIMXRT_IOMUXC_SEMC_DM00 IOMUXC_GPIO_EMC_08_SEMC_DM00
+#define MIMXRT_IOMUXC_SEMC_DM01 IOMUXC_GPIO_EMC_38_SEMC_DM01
+#define MIMXRT_IOMUXC_SEMC_DQS IOMUXC_GPIO_EMC_39_SEMC_DQS
+#define MIMXRT_IOMUXC_SEMC_RAS IOMUXC_GPIO_EMC_25_SEMC_RAS
+#define MIMXRT_IOMUXC_SEMC_WE IOMUXC_GPIO_EMC_28_SEMC_WE
+
+#define MIMXRT_IOMUXC_SEMC_CS0 IOMUXC_GPIO_EMC_29_SEMC_CS0
diff --git a/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.mk b/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.mk
index 1e041c8eb58dd..4c4a2ff980448 100644
--- a/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.mk
+++ b/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.mk
@@ -3,8 +3,11 @@ MCU_VARIANT = MIMXRT1062DVJ6A
 
 MICROPY_FLOAT_IMPL = double
 MICROPY_PY_MACHINE_SDCARD = 1
-BOARD_FLASH_TYPE ?= qspi_nor
-BOARD_FLASH_SIZE ?= 0x800000  # 8MB
+MICROPY_HW_FLASH_TYPE ?= qspi_nor
+MICROPY_HW_FLASH_SIZE ?= 0x800000  # 8MB
+
+MICROPY_HW_SDRAM_AVAIL = 1
+MICROPY_HW_SDRAM_SIZE  = 0x2000000  # 32MB
 
 JLINK_PATH ?= /media/RT1060-EVK/
 JLINK_COMMANDER_SCRIPT = $(BUILD)/script.jlink
diff --git a/ports/mimxrt/boards/MIMXRT1060_EVK/qspi_hyper_flash_config.c b/ports/mimxrt/boards/MIMXRT1060_EVK/qspi_hyper_flash_config.c
index 1b3349f911a12..f5ffbe8413a7d 100644
--- a/ports/mimxrt/boards/MIMXRT1060_EVK/qspi_hyper_flash_config.c
+++ b/ports/mimxrt/boards/MIMXRT1060_EVK/qspi_hyper_flash_config.c
@@ -37,7 +37,7 @@ const flexspi_nor_config_t qspiflash_config = {
             (1u << kFlexSpiMiscOffset_SafeConfigFreqEnable) | (1u << kFlexSpiMiscOffset_DiffClkEnable),
         .sflashPadType = kSerialFlash_8Pads,
         .serialClkFreq = kFlexSpiSerialClk_133MHz,
-        .sflashA1Size = BOARD_FLASH_SIZE,
+        .sflashA1Size = MICROPY_HW_FLASH_SIZE,
         .dataValidTime = {16u, 16u},
         .lookupTable =
         {
diff --git a/ports/mimxrt/boards/MIMXRT1060_EVK/qspi_nor_flash_config.c b/ports/mimxrt/boards/MIMXRT1060_EVK/qspi_nor_flash_config.c
index 290c6bc152a9e..73525b5dfcadc 100644
--- a/ports/mimxrt/boards/MIMXRT1060_EVK/qspi_nor_flash_config.c
+++ b/ports/mimxrt/boards/MIMXRT1060_EVK/qspi_nor_flash_config.c
@@ -37,7 +37,7 @@ const flexspi_nor_config_t qspiflash_config = {
             (1u << kFlexSpiMiscOffset_SafeConfigFreqEnable) | (1u << kFlexSpiMiscOffset_DiffClkEnable),
         .sflashPadType = kSerialFlash_8Pads,
         .serialClkFreq = kFlexSpiSerialClk_133MHz,
-        .sflashA1Size = BOARD_FLASH_SIZE,
+        .sflashA1Size = MICROPY_HW_FLASH_SIZE,
         .dataValidTime = {16u, 16u},
         .lookupTable =
         {
diff --git a/ports/mimxrt/boards/MIMXRT1062.ld b/ports/mimxrt/boards/MIMXRT1062.ld
index 03c1193344593..f588e5bd9e237 100644
--- a/ports/mimxrt/boards/MIMXRT1062.ld
+++ b/ports/mimxrt/boards/MIMXRT1062.ld
@@ -1,16 +1,16 @@
 /* Memory configuration */
-#if BOARD_FLASH_RESERVED
-reserved_size = BOARD_FLASH_RESERVED;
+#if MICROPY_HW_FLASH_RESERVED
+reserved_size = MICROPY_HW_FLASH_RESERVED;
 #endif
 
-#if BOARD_FLASH_TYPE==qspi_nor
+#if MICROPY_HW_FLASH_TYPE==qspi_nor
 flash_start         = 0x60000000;
-#elif BOARD_FLASH_TYPE==hyperflash
+#elif MICROPY_HW_FLASH_TYPE==hyperflash
 flash_start         = 0x60000000;
 #else
-#error Unknown BOARD_FLASH_TYPE
+#error Unknown MICROPY_HW_FLASH_TYPE
 #endif
-flash_size          = BOARD_FLASH_SIZE;
+flash_size          = MICROPY_HW_FLASH_SIZE;
 flash_end           = DEFINED(reserved_size) ? ((flash_start) + (flash_size - reserved_size)) : ((flash_start) + (flash_size));
 flash_config_start  = flash_start;
 flash_config_size   = 0x00001000;
@@ -29,11 +29,21 @@ dtcm_size           = 0x00020000;
 ocrm_start          = 0x20200000;
 ocrm_size           = 0x000C0000;
 
+#ifdef MICROPY_HW_SDRAM_AVAIL
+sdram_start         = 0x80000000;
+sdram_size          = MICROPY_HW_SDRAM_SIZE;
+#endif
+
 /* 32kiB stack. */
 __stack_size__ = 0x8000;
 _estack = __StackTop;
 _sstack = __StackLimit;
 
+#ifdef MICROPY_HW_SDRAM_AVAIL
+_gc_heap_start = ORIGIN(m_sdram);
+_gc_heap_end = ORIGIN(m_sdram) + LENGTH(m_sdram);
+#else
 /* Use second OCRAM bank for GC heap. */
 _gc_heap_start = ORIGIN(m_ocrm);
 _gc_heap_end = ORIGIN(m_ocrm) + LENGTH(m_ocrm);
+#endif
diff --git a/ports/mimxrt/boards/MIMXRT1064.ld b/ports/mimxrt/boards/MIMXRT1064.ld
index 88720896f4c4c..b36c52845343d 100644
--- a/ports/mimxrt/boards/MIMXRT1064.ld
+++ b/ports/mimxrt/boards/MIMXRT1064.ld
@@ -1,18 +1,18 @@
 /* Memory configuration */
-#if BOARD_FLASH_RESERVED
-reserved_size = BOARD_FLASH_RESERVED;
+#if MICROPY_HW_FLASH_RESERVED
+reserved_size = MICROPY_HW_FLASH_RESERVED;
 #endif
 
-#if BOARD_FLASH_TYPE==qspi_nor
+#if MICROPY_HW_FLASH_TYPE==qspi_nor
 flash_start         = 0x60000000;
-#elif BOARD_FLASH_TYPE==hyperflash
+#elif MICROPY_HW_FLASH_TYPE==hyperflash
 flash_start         = 0x60000000;
-#elif BOARD_FLASH_TYPE==internal
+#elif MICROPY_HW_FLASH_TYPE==internal
 flash_start         = 0x70000000;
 #else
-#error Unknown BOARD_FLASH_TYPE
+#error Unknown MICROPY_HW_FLASH_TYPE
 #endif
-flash_size          = BOARD_FLASH_SIZE;
+flash_size          = MICROPY_HW_FLASH_SIZE;
 flash_end           = DEFINED(reserved_size) ? ((flash_start) + (flash_size - reserved_size)) : ((flash_start) + (flash_size));
 flash_config_start  = flash_start;
 flash_config_size   = 0x00001000;
@@ -31,11 +31,21 @@ dtcm_size           = 0x00020000;
 ocrm_start          = 0x20200000;
 ocrm_size           = 0x000C0000;
 
+#ifdef MICROPY_HW_SDRAM_AVAIL
+sdram_start         = 0x80000000;
+sdram_size          = MICROPY_HW_SDRAM_SIZE;
+#endif
+
 /* 24kiB stack. */
 __stack_size__ = 0x6000;
 _estack = __StackTop;
 _sstack = __StackLimit;
 
+#ifdef MICROPY_HW_SDRAM_AVAIL
+_gc_heap_start = ORIGIN(m_sdram);
+_gc_heap_end = ORIGIN(m_sdram) + LENGTH(m_sdram);
+#else
 /* Use second OCRAM bank for GC heap. */
 _gc_heap_start = ORIGIN(m_ocrm);
 _gc_heap_end = ORIGIN(m_ocrm) + LENGTH(m_ocrm);
+#endif
diff --git a/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.h b/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.h
index ab8a80a3a40b3..17268b0a564cf 100644
--- a/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.h
+++ b/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.h
@@ -62,3 +62,48 @@
         .data2 = { GPIO_SD_B0_04_USDHC1_DATA2 }, \
         .data3 = { GPIO_SD_B0_05_USDHC1_DATA3 }, \
     }
+
+// --- SEMC --- //
+#define MIMXRT_IOMUXC_SEMC_DATA00 IOMUXC_GPIO_EMC_00_SEMC_DATA00
+#define MIMXRT_IOMUXC_SEMC_DATA01 IOMUXC_GPIO_EMC_01_SEMC_DATA01
+#define MIMXRT_IOMUXC_SEMC_DATA02 IOMUXC_GPIO_EMC_02_SEMC_DATA02
+#define MIMXRT_IOMUXC_SEMC_DATA03 IOMUXC_GPIO_EMC_03_SEMC_DATA03
+#define MIMXRT_IOMUXC_SEMC_DATA04 IOMUXC_GPIO_EMC_04_SEMC_DATA04
+#define MIMXRT_IOMUXC_SEMC_DATA05 IOMUXC_GPIO_EMC_05_SEMC_DATA05
+#define MIMXRT_IOMUXC_SEMC_DATA06 IOMUXC_GPIO_EMC_06_SEMC_DATA06
+#define MIMXRT_IOMUXC_SEMC_DATA07 IOMUXC_GPIO_EMC_07_SEMC_DATA07
+#define MIMXRT_IOMUXC_SEMC_DATA08 IOMUXC_GPIO_EMC_30_SEMC_DATA08
+#define MIMXRT_IOMUXC_SEMC_DATA09 IOMUXC_GPIO_EMC_31_SEMC_DATA09
+#define MIMXRT_IOMUXC_SEMC_DATA10 IOMUXC_GPIO_EMC_32_SEMC_DATA10
+#define MIMXRT_IOMUXC_SEMC_DATA11 IOMUXC_GPIO_EMC_33_SEMC_DATA11
+#define MIMXRT_IOMUXC_SEMC_DATA12 IOMUXC_GPIO_EMC_34_SEMC_DATA12
+#define MIMXRT_IOMUXC_SEMC_DATA13 IOMUXC_GPIO_EMC_35_SEMC_DATA13
+#define MIMXRT_IOMUXC_SEMC_DATA14 IOMUXC_GPIO_EMC_36_SEMC_DATA14
+#define MIMXRT_IOMUXC_SEMC_DATA15 IOMUXC_GPIO_EMC_37_SEMC_DATA15
+
+#define MIMXRT_IOMUXC_SEMC_ADDR00 IOMUXC_GPIO_EMC_09_SEMC_ADDR00
+#define MIMXRT_IOMUXC_SEMC_ADDR01 IOMUXC_GPIO_EMC_10_SEMC_ADDR01
+#define MIMXRT_IOMUXC_SEMC_ADDR02 IOMUXC_GPIO_EMC_11_SEMC_ADDR02
+#define MIMXRT_IOMUXC_SEMC_ADDR03 IOMUXC_GPIO_EMC_12_SEMC_ADDR03
+#define MIMXRT_IOMUXC_SEMC_ADDR04 IOMUXC_GPIO_EMC_13_SEMC_ADDR04
+#define MIMXRT_IOMUXC_SEMC_ADDR05 IOMUXC_GPIO_EMC_14_SEMC_ADDR05
+#define MIMXRT_IOMUXC_SEMC_ADDR06 IOMUXC_GPIO_EMC_15_SEMC_ADDR06
+#define MIMXRT_IOMUXC_SEMC_ADDR07 IOMUXC_GPIO_EMC_16_SEMC_ADDR07
+#define MIMXRT_IOMUXC_SEMC_ADDR08 IOMUXC_GPIO_EMC_17_SEMC_ADDR08
+#define MIMXRT_IOMUXC_SEMC_ADDR09 IOMUXC_GPIO_EMC_18_SEMC_ADDR09
+#define MIMXRT_IOMUXC_SEMC_ADDR10 IOMUXC_GPIO_EMC_23_SEMC_ADDR10
+#define MIMXRT_IOMUXC_SEMC_ADDR11 IOMUXC_GPIO_EMC_19_SEMC_ADDR11
+#define MIMXRT_IOMUXC_SEMC_ADDR12 IOMUXC_GPIO_EMC_20_SEMC_ADDR12
+
+#define MIMXRT_IOMUXC_SEMC_BA0 IOMUXC_GPIO_EMC_21_SEMC_BA0
+#define MIMXRT_IOMUXC_SEMC_BA1 IOMUXC_GPIO_EMC_22_SEMC_BA1
+#define MIMXRT_IOMUXC_SEMC_CAS IOMUXC_GPIO_EMC_24_SEMC_CAS
+#define MIMXRT_IOMUXC_SEMC_CKE IOMUXC_GPIO_EMC_27_SEMC_CKE
+#define MIMXRT_IOMUXC_SEMC_CLK IOMUXC_GPIO_EMC_26_SEMC_CLK
+#define MIMXRT_IOMUXC_SEMC_DM00 IOMUXC_GPIO_EMC_08_SEMC_DM00
+#define MIMXRT_IOMUXC_SEMC_DM01 IOMUXC_GPIO_EMC_38_SEMC_DM01
+#define MIMXRT_IOMUXC_SEMC_DQS IOMUXC_GPIO_EMC_39_SEMC_DQS
+#define MIMXRT_IOMUXC_SEMC_RAS IOMUXC_GPIO_EMC_25_SEMC_RAS
+#define MIMXRT_IOMUXC_SEMC_WE IOMUXC_GPIO_EMC_28_SEMC_WE
+
+#define MIMXRT_IOMUXC_SEMC_CS0 IOMUXC_GPIO_EMC_29_SEMC_CS0
diff --git a/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.mk b/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.mk
index 19655da6168fe..8bc35dd0dd142 100644
--- a/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.mk
+++ b/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.mk
@@ -3,8 +3,11 @@ MCU_VARIANT = MIMXRT1064DVL6A
 
 MICROPY_FLOAT_IMPL = double
 MICROPY_PY_MACHINE_SDCARD = 1
-BOARD_FLASH_TYPE ?= hyperflash
-BOARD_FLASH_SIZE ?= 0x4000000  # 64MB
+MICROPY_HW_FLASH_TYPE ?= hyperflash
+MICROPY_HW_FLASH_SIZE ?= 0x4000000  # 64MB
+
+MICROPY_HW_SDRAM_AVAIL = 1
+MICROPY_HW_SDRAM_SIZE  = 0x2000000  # 32MB
 
 JLINK_PATH ?= /media/RT1064-EVK/
 
diff --git a/ports/mimxrt/boards/MIMXRT1064_EVK/qspi_hyper_flash_config.c b/ports/mimxrt/boards/MIMXRT1064_EVK/qspi_hyper_flash_config.c
index 1b3349f911a12..f5ffbe8413a7d 100644
--- a/ports/mimxrt/boards/MIMXRT1064_EVK/qspi_hyper_flash_config.c
+++ b/ports/mimxrt/boards/MIMXRT1064_EVK/qspi_hyper_flash_config.c
@@ -37,7 +37,7 @@ const flexspi_nor_config_t qspiflash_config = {
             (1u << kFlexSpiMiscOffset_SafeConfigFreqEnable) | (1u << kFlexSpiMiscOffset_DiffClkEnable),
         .sflashPadType = kSerialFlash_8Pads,
         .serialClkFreq = kFlexSpiSerialClk_133MHz,
-        .sflashA1Size = BOARD_FLASH_SIZE,
+        .sflashA1Size = MICROPY_HW_FLASH_SIZE,
         .dataValidTime = {16u, 16u},
         .lookupTable =
         {
diff --git a/ports/mimxrt/boards/MIMXRT1064_EVK/qspi_nor_flash_config.c b/ports/mimxrt/boards/MIMXRT1064_EVK/qspi_nor_flash_config.c
index 290c6bc152a9e..73525b5dfcadc 100644
--- a/ports/mimxrt/boards/MIMXRT1064_EVK/qspi_nor_flash_config.c
+++ b/ports/mimxrt/boards/MIMXRT1064_EVK/qspi_nor_flash_config.c
@@ -37,7 +37,7 @@ const flexspi_nor_config_t qspiflash_config = {
             (1u << kFlexSpiMiscOffset_SafeConfigFreqEnable) | (1u << kFlexSpiMiscOffset_DiffClkEnable),
         .sflashPadType = kSerialFlash_8Pads,
         .serialClkFreq = kFlexSpiSerialClk_133MHz,
-        .sflashA1Size = BOARD_FLASH_SIZE,
+        .sflashA1Size = MICROPY_HW_FLASH_SIZE,
         .dataValidTime = {16u, 16u},
         .lookupTable =
         {
diff --git a/ports/mimxrt/boards/TEENSY40/mpconfigboard.mk b/ports/mimxrt/boards/TEENSY40/mpconfigboard.mk
index 170f93dcf88bd..94e427cc168a9 100644
--- a/ports/mimxrt/boards/TEENSY40/mpconfigboard.mk
+++ b/ports/mimxrt/boards/TEENSY40/mpconfigboard.mk
@@ -3,9 +3,9 @@ MCU_VARIANT = MIMXRT1062DVJ6A
 
 MICROPY_FLOAT_IMPL = double
 MICROPY_PY_MACHINE_SDCARD = 1
-BOARD_FLASH_TYPE ?= qspi_nor
-BOARD_FLASH_SIZE ?= 0x200000  # 2MB
-BOARD_FLASH_RESERVED ?= 0x1000  # 4KB
+MICROPY_HW_FLASH_TYPE ?= qspi_nor
+MICROPY_HW_FLASH_SIZE ?= 0x200000  # 2MB
+MICROPY_HW_FLASH_RESERVED ?= 0x1000  # 4KB
 
 deploy: $(BUILD)/firmware.hex
 	teensy_loader_cli --mcu=imxrt1062 -v -w $<
diff --git a/ports/mimxrt/boards/TEENSY40/qspi_nor_flash_config.c b/ports/mimxrt/boards/TEENSY40/qspi_nor_flash_config.c
index 71d871b7519ed..69135f6b47a43 100644
--- a/ports/mimxrt/boards/TEENSY40/qspi_nor_flash_config.c
+++ b/ports/mimxrt/boards/TEENSY40/qspi_nor_flash_config.c
@@ -53,7 +53,7 @@ const flexspi_nor_config_t qspiflash_config = {
         // Enable DDR mode, Wordaddassable, Safe configuration, Differential clock
         .sflashPadType = kSerialFlash_4Pads,
         .serialClkFreq = kFlexSpiSerialClk_60MHz,
-        .sflashA1Size = BOARD_FLASH_SIZE,
+        .sflashA1Size = MICROPY_HW_FLASH_SIZE,
         .lookupTable =
         {
             // 0 Read LUTs 0 -> 0
diff --git a/ports/mimxrt/boards/TEENSY41/mpconfigboard.mk b/ports/mimxrt/boards/TEENSY41/mpconfigboard.mk
index 9a29a9b75d571..27039648b8f7e 100755
--- a/ports/mimxrt/boards/TEENSY41/mpconfigboard.mk
+++ b/ports/mimxrt/boards/TEENSY41/mpconfigboard.mk
@@ -3,9 +3,9 @@ MCU_VARIANT = MIMXRT1062DVJ6A
 
 MICROPY_FLOAT_IMPL = double
 MICROPY_PY_MACHINE_SDCARD = 1
-BOARD_FLASH_TYPE ?= qspi_nor
-BOARD_FLASH_SIZE ?= 0x800000  # 8MB
-BOARD_FLASH_RESERVED ?= 0x1000  # 4KB
+MICROPY_HW_FLASH_TYPE ?= qspi_nor
+MICROPY_HW_FLASH_SIZE ?= 0x800000  # 8MB
+MICROPY_HW_FLASH_RESERVED ?= 0x1000  # 4KB
 
 deploy: $(BUILD)/firmware.hex
 	teensy_loader_cli --mcu=imxrt1062 -v -w $<
diff --git a/ports/mimxrt/boards/TEENSY41/qspi_nor_flash_config.c b/ports/mimxrt/boards/TEENSY41/qspi_nor_flash_config.c
index 71d871b7519ed..69135f6b47a43 100644
--- a/ports/mimxrt/boards/TEENSY41/qspi_nor_flash_config.c
+++ b/ports/mimxrt/boards/TEENSY41/qspi_nor_flash_config.c
@@ -53,7 +53,7 @@ const flexspi_nor_config_t qspiflash_config = {
         // Enable DDR mode, Wordaddassable, Safe configuration, Differential clock
         .sflashPadType = kSerialFlash_4Pads,
         .serialClkFreq = kFlexSpiSerialClk_60MHz,
-        .sflashA1Size = BOARD_FLASH_SIZE,
+        .sflashA1Size = MICROPY_HW_FLASH_SIZE,
         .lookupTable =
         {
             // 0 Read LUTs 0 -> 0
diff --git a/ports/mimxrt/boards/common.ld b/ports/mimxrt/boards/common.ld
index 6f45da24d1011..5dd7097fab968 100644
--- a/ports/mimxrt/boards/common.ld
+++ b/ports/mimxrt/boards/common.ld
@@ -45,12 +45,19 @@ MEMORY
   m_itcm         (RX) : ORIGIN = itcm_start,            LENGTH = itcm_size
   m_dtcm         (RW) : ORIGIN = dtcm_start,            LENGTH = dtcm_size
   m_ocrm         (RW) : ORIGIN = ocrm_start,            LENGTH = ocrm_size
+
+  #ifdef MICROPY_HW_SDRAM_AVAIL
+  m_sdram        (RX) : ORIGIN = sdram_start,           LENGTH = sdram_size
+  #endif
 }
 
 /* Define output sections */
 SECTIONS
 {
   __flash_start = flash_start;
+  #ifdef MICROPY_HW_SDRAM_AVAIL
+  __sdram_start = sdram_start;
+  #endif
   __vfs_start = ORIGIN(m_vfs);
   __vfs_end = __vfs_start + LENGTH(m_vfs);  
   
diff --git a/ports/mimxrt/boards/make-pins.py b/ports/mimxrt/boards/make-pins.py
index d75592124ae0a..aba517127cc3a 100644
--- a/ports/mimxrt/boards/make-pins.py
+++ b/ports/mimxrt/boards/make-pins.py
@@ -8,7 +8,7 @@
 import csv
 import re
 
-SUPPORTED_AFS = {"GPIO", "USDHC"}
+SUPPORTED_AFS = {"GPIO", "USDHC", "SEMC"}
 MAX_AF = 10  # AF0 .. AF9
 ADC_COL = 11
 
diff --git a/ports/mimxrt/mimxrt_flash.c b/ports/mimxrt/mimxrt_flash.c
index 79c4e676dc142..25a11ab7ca5aa 100644
--- a/ports/mimxrt/mimxrt_flash.c
+++ b/ports/mimxrt/mimxrt_flash.c
@@ -32,8 +32,6 @@
 #include "modmimxrt.h"
 #include BOARD_FLASH_OPS_HEADER_H
 
-// BOARD_FLASH_SIZE is defined in mpconfigport.h
-
 #define SECTOR_SIZE_BYTES (qspiflash_config.sectorSize)
 #define PAGE_SIZE_BYTES (qspiflash_config.pageSize)
 
diff --git a/ports/mimxrt/mimxrt_sdram.c b/ports/mimxrt/mimxrt_sdram.c
new file mode 100644
index 0000000000000..8c336bb607ef4
--- /dev/null
+++ b/ports/mimxrt/mimxrt_sdram.c
@@ -0,0 +1,186 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Philipp Ebensberger
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#if MICROPY_HW_SDRAM_AVAIL
+
+#include "modmachine.h"
+#include "fsl_semc.h"
+#include "fsl_iomuxc.h"
+
+// Linker symbols
+extern uint8_t __sdram_start;
+
+
+void mimxrt_sdram_init(void) {
+    // Set Clocks
+    CLOCK_InitSysPfd(kCLOCK_Pfd2, 29);   // '29' PLL2 PFD2 frequency = 528MHz * 18 / 29 = 327.72MHz (with 528MHz = PLL2 frequency)
+    CLOCK_SetMux(kCLOCK_SemcAltMux, 0);  // '0'  PLL2 PFD2 will be selected as alternative clock for SEMC root clock
+    CLOCK_SetMux(kCLOCK_SemcMux, 1);     // '1'  SEMC alternative clock will be used as SEMC clock root
+    CLOCK_SetDiv(kCLOCK_SemcDiv, 1);     // '1'  divide by 2 -> SEMC clock = 163.86 MHz
+
+    // Set Pins
+
+    // Data Pins
+    IOMUXC_SetPinMux(MIMXRT_IOMUXC_SEMC_DATA00, 0UL);
+    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_DATA00, 0xE1UL);
+    IOMUXC_SetPinMux(MIMXRT_IOMUXC_SEMC_DATA01, 0UL);
+    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_DATA01, 0xE1UL);
+    IOMUXC_SetPinMux(MIMXRT_IOMUXC_SEMC_DATA02, 0UL);
+    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_DATA02, 0xE1UL);
+    IOMUXC_SetPinMux(MIMXRT_IOMUXC_SEMC_DATA03, 0UL);
+    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_DATA03, 0xE1UL);
+    IOMUXC_SetPinMux(MIMXRT_IOMUXC_SEMC_DATA04, 0UL);
+    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_DATA04, 0xE1UL);
+    IOMUXC_SetPinMux(MIMXRT_IOMUXC_SEMC_DATA05, 0UL);
+    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_DATA05, 0xE1UL);
+    IOMUXC_SetPinMux(MIMXRT_IOMUXC_SEMC_DATA06, 0UL);
+    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_DATA06, 0xE1UL);
+    IOMUXC_SetPinMux(MIMXRT_IOMUXC_SEMC_DATA07, 0UL);
+    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_DATA07, 0xE1UL);
+    IOMUXC_SetPinMux(MIMXRT_IOMUXC_SEMC_DATA08, 0UL);
+    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_DATA08, 0xE1UL);
+    IOMUXC_SetPinMux(MIMXRT_IOMUXC_SEMC_DATA09, 0UL);
+    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_DATA09, 0xE1UL);
+    IOMUXC_SetPinMux(MIMXRT_IOMUXC_SEMC_DATA10, 0UL);
+    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_DATA10, 0xE1UL);
+    IOMUXC_SetPinMux(MIMXRT_IOMUXC_SEMC_DATA11, 0UL);
+    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_DATA11, 0xE1UL);
+    IOMUXC_SetPinMux(MIMXRT_IOMUXC_SEMC_DATA12, 0UL);
+    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_DATA12, 0xE1UL);
+    IOMUXC_SetPinMux(MIMXRT_IOMUXC_SEMC_DATA13, 0UL);
+    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_DATA13, 0xE1UL);
+    IOMUXC_SetPinMux(MIMXRT_IOMUXC_SEMC_DATA14, 0UL);
+    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_DATA14, 0xE1UL);
+    IOMUXC_SetPinMux(MIMXRT_IOMUXC_SEMC_DATA15, 0UL);
+    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_DATA15, 0xE1UL);
+
+    // Address Pins
+    IOMUXC_SetPinMux(MIMXRT_IOMUXC_SEMC_ADDR00, 0UL);
+    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_ADDR00, 0xE1UL);
+    IOMUXC_SetPinMux(MIMXRT_IOMUXC_SEMC_ADDR01, 0UL);
+    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_ADDR01, 0xE1UL);
+    IOMUXC_SetPinMux(MIMXRT_IOMUXC_SEMC_ADDR02, 0UL);
+    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_ADDR02, 0xE1UL);
+    IOMUXC_SetPinMux(MIMXRT_IOMUXC_SEMC_ADDR03, 0UL);
+    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_ADDR03, 0xE1UL);
+    IOMUXC_SetPinMux(MIMXRT_IOMUXC_SEMC_ADDR04, 0UL);
+    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_ADDR04, 0xE1UL);
+    IOMUXC_SetPinMux(MIMXRT_IOMUXC_SEMC_ADDR05, 0UL);
+    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_ADDR05, 0xE1UL);
+    IOMUXC_SetPinMux(MIMXRT_IOMUXC_SEMC_ADDR06, 0UL);
+    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_ADDR06, 0xE1UL);
+    IOMUXC_SetPinMux(MIMXRT_IOMUXC_SEMC_ADDR07, 0UL);
+    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_ADDR07, 0xE1UL);
+    IOMUXC_SetPinMux(MIMXRT_IOMUXC_SEMC_ADDR08, 0UL);
+    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_ADDR08, 0xE1UL);
+    IOMUXC_SetPinMux(MIMXRT_IOMUXC_SEMC_ADDR09, 0UL);
+    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_ADDR09, 0xE1UL);
+    IOMUXC_SetPinMux(MIMXRT_IOMUXC_SEMC_ADDR10, 0UL);
+    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_ADDR10, 0xE1UL);
+    IOMUXC_SetPinMux(MIMXRT_IOMUXC_SEMC_ADDR11, 0UL);
+    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_ADDR11, 0xE1UL);
+    IOMUXC_SetPinMux(MIMXRT_IOMUXC_SEMC_ADDR12, 0UL);
+    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_ADDR12, 0xE1UL);
+
+    IOMUXC_SetPinMux(MIMXRT_IOMUXC_SEMC_DM00, 0UL);
+    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_DM00, 0xE1UL);
+    IOMUXC_SetPinMux(MIMXRT_IOMUXC_SEMC_BA0, 0UL);
+    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_BA0, 0xE1UL);
+    IOMUXC_SetPinMux(MIMXRT_IOMUXC_SEMC_BA1, 0UL);
+    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_BA1, 0xE1UL);
+    IOMUXC_SetPinMux(MIMXRT_IOMUXC_SEMC_CAS, 0UL);
+    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_CAS, 0xE1UL);
+    IOMUXC_SetPinMux(MIMXRT_IOMUXC_SEMC_RAS, 0UL);
+    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_RAS, 0xE1UL);
+    IOMUXC_SetPinMux(MIMXRT_IOMUXC_SEMC_CLK, 0UL);
+    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_CLK, 0xE1UL);
+    IOMUXC_SetPinMux(MIMXRT_IOMUXC_SEMC_CKE, 0UL);
+    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_CKE, 0xE1UL);
+    IOMUXC_SetPinMux(MIMXRT_IOMUXC_SEMC_WE, 0UL);
+    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_WE, 0xE1UL);
+    IOMUXC_SetPinMux(MIMXRT_IOMUXC_SEMC_DM01, 0UL);
+    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_DM01, 0xE1UL);
+    IOMUXC_SetPinMux(MIMXRT_IOMUXC_SEMC_DQS, 1UL);
+    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_DQS, 0xE1UL);
+
+    // Chip Select Pins
+    #ifndef MIMXRT_IOMUXC_SEMC_CS0
+    #error No SEMC CS0 defined!
+    #endif
+    IOMUXC_SetPinMux(MIMXRT_IOMUXC_SEMC_CS0, 0UL);
+    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_CS0, 0xE1UL);
+
+    #ifdef MIMXRT_IOMUXC_SEMC_CS1
+    IOMUXC_SetPinMux(MIMXRT_IOMUXC_SEMC_CS1, 0UL);
+    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_CS1, 0xE1UL);
+    #endif
+
+    #ifdef MIMXRT_IOMUXC_SEMC_CS2
+    IOMUXC_SetPinMux(MIMXRT_IOMUXC_SEMC_CS2, 0UL);
+    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_CS2, 0xE1UL);
+    #endif
+
+    #ifdef MIMXRT_IOMUXC_SEMC_CS3
+    IOMUXC_SetPinMux(MIMXRT_IOMUXC_SEMC_CS3, 0UL);
+    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_CS3, 0xE1UL);
+    #endif
+
+    // Configure SEMC
+    semc_config_t semc_cfg;
+    SEMC_GetDefaultConfig(&semc_cfg);
+
+    semc_cfg.dqsMode = kSEMC_Loopbackdqspad;  // For more accurate timing.
+    SEMC_Init(SEMC, &semc_cfg);
+
+    uint32_t clock_freq = CLOCK_GetFreq(kCLOCK_SemcClk);
+    semc_sdram_config_t sdram_cfg = {
+        .csxPinMux = kSEMC_MUXCSX0,
+        .address = ((uint32_t)&__sdram_start),
+        .memsize_kbytes = (MICROPY_HW_SDRAM_SIZE >> 10),  // Right shift by 10 == division by 1024
+        .portSize = kSEMC_PortSize16Bit,
+        .burstLen = kSEMC_Sdram_BurstLen1,
+        .columnAddrBitNum = kSEMC_SdramColunm_9bit,
+        .casLatency = kSEMC_LatencyThree,
+        .tPrecharge2Act_Ns = 18,  // Trp 18ns
+        .tAct2ReadWrite_Ns = 18,  // Trcd 18ns
+        .tRefreshRecovery_Ns = (60 + 67),
+        .tWriteRecovery_Ns = 12,  // 12ns
+        .tCkeOff_Ns = 42,  // The minimum cycle of SDRAM CLK off state. CKE is off in self refresh at a minimum period tRAS.
+        .tAct2Prechage_Ns = 42,  // Tras 42ns
+        .tSelfRefRecovery_Ns = 67,
+        .tRefresh2Refresh_Ns = 60,
+        .tAct2Act_Ns = 60,
+        .tPrescalePeriod_Ns = 160 * (1000000000 / clock_freq),
+        .tIdleTimeout_Ns = 0UL,
+        .refreshPeriod_nsPerRow = 64 * 1000000 / 8192,  // 64ms/8192
+        .refreshUrgThreshold = 64 * 1000000 / 8192,  // 64ms/8192
+        .refreshBurstLen = 1
+    };
+
+    (status_t)SEMC_ConfigureSDRAM(SEMC, kSEMC_SDRAM_CS0, &sdram_cfg, clock_freq);
+}
+
+#endif
diff --git a/ports/mimxrt/modmachine.h b/ports/mimxrt/modmachine.h
index e1a7ce0b72f46..90d167843ac9a 100644
--- a/ports/mimxrt/modmachine.h
+++ b/ports/mimxrt/modmachine.h
@@ -41,5 +41,6 @@ void machine_adc_init(void);
 void machine_pin_irq_deinit(void);
 void machine_timer_init_PIT(void);
 void machine_sdcard_init0(void);
+void mimxrt_sdram_init(void);
 
 #endif // MICROPY_INCLUDED_MIMXRT_MODMACHINE_H
diff --git a/ports/mimxrt/pin.h b/ports/mimxrt/pin.h
index 3520ed0f4f264..22e7a7e0f5e5a 100644
--- a/ports/mimxrt/pin.h
+++ b/ports/mimxrt/pin.h
@@ -67,6 +67,7 @@ enum {
     PIN_AF_MODE_ALT6,
     PIN_AF_MODE_ALT7,
     PIN_AF_MODE_ALT8,
+    PIN_AF_MODE_ALT9,
 };
 
 enum {

From 1866ed7e2ef9a2786aa5cc93dd435ffc8dcce2a3 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sat, 3 Jul 2021 18:39:17 +0200
Subject: [PATCH 1340/3533] mimxrt/eth: Add LAN support and integrate the
 network module.

This commit implements 10/100 Mbit Ethernet support in the mimxrt port.

The following boards are configured without ETH network:
- MIMXRT1010_EVK
- Teensy 4.0

The following boards are configured with ETH network:
- MIMXRT1020_EVK
- MIMXRT1050_EVK
- MIMXRT1060_EVK
- MIMXRT1064_EVK
- Teensy 4.1

Ethernet support tested with TEENSY 4.1, MIMRTX1020_EVK and MIMXRT1050_EVK.
Build tested with Teensy 4.0 and MIMXRT1010_EVK to be still working.
Compiles and builds properly for MIMXRT1060_EVK and MIMXRT1064_EVK, but not
tested lacking suitable boards.

Tested functions are:
- ping works bothway
- simple UDP transfer works bothway
- ntptime works
- the ftp server works
- secure socker works
- telnet and webrepl works

The MAC address is 0x02 plus 5 bytes from the manifacturing info field,
which can be considered as unique per device.

Some boards do not wire the RESET and INT pin of the PHY transceiver.  For
operation, these are not required.  If they are defined, they will be used.
---
 ports/mimxrt/Makefile                         |  48 +-
 ports/mimxrt/board_init.c                     |   3 +
 .../boards/MIMXRT1020_EVK/mpconfigboard.h     |  21 +
 .../boards/MIMXRT1020_EVK/mpconfigboard.mk    |   4 +
 ports/mimxrt/boards/MIMXRT1021.ld             |   1 +
 .../boards/MIMXRT1050_EVK/mpconfigboard.h     |  23 +-
 .../boards/MIMXRT1050_EVK/mpconfigboard.mk    |   7 +-
 .../boards/MIMXRT1060_EVK/mpconfigboard.h     |  21 +
 .../boards/MIMXRT1060_EVK/mpconfigboard.mk    |   4 +
 .../boards/MIMXRT1064_EVK/mpconfigboard.h     |  21 +
 .../boards/MIMXRT1064_EVK/mpconfigboard.mk    |   4 +
 ports/mimxrt/boards/TEENSY41/mpconfigboard.h  |  21 +
 ports/mimxrt/boards/TEENSY41/mpconfigboard.mk |   4 +
 ports/mimxrt/eth.c                            | 448 ++++++++++++++++++
 ports/mimxrt/eth.h                            |  41 ++
 .../phy/device/phydp83825/fsl_phydp83825.c    | 281 +++++++++++
 .../phy/device/phydp83825/fsl_phydp83825.h    | 163 +++++++
 .../phy/device/phyksz8081/fsl_phyksz8081.c    | 284 +++++++++++
 .../phy/device/phyksz8081/fsl_phyksz8081.h    | 163 +++++++
 .../phy/device/phylan8720/fsl_phylan8720.c    | 271 +++++++++++
 .../phy/device/phylan8720/fsl_phylan8720.h    | 163 +++++++
 ports/mimxrt/hal/phy/fsl_mdio.h               | 125 +++++
 ports/mimxrt/hal/phy/fsl_phy.h                | 258 ++++++++++
 .../mimxrt/hal/phy/mdio/enet/fsl_enet_mdio.c  | 128 +++++
 .../mimxrt/hal/phy/mdio/enet/fsl_enet_mdio.h  |  21 +
 ports/mimxrt/lwip_inc/arch/cc.h               |  10 +
 ports/mimxrt/lwip_inc/arch/sys_arch.h         |   1 +
 ports/mimxrt/lwip_inc/lwipopts.h              |  59 +++
 ports/mimxrt/main.c                           |  26 +
 ports/mimxrt/mbedtls/mbedtls_config.h         |  99 ++++
 ports/mimxrt/mbedtls/mbedtls_port.c           |  93 ++++
 ports/mimxrt/moduos.c                         |  18 +
 ports/mimxrt/mpconfigport.h                   |  69 ++-
 ports/mimxrt/mphalport.c                      |  42 ++
 ports/mimxrt/mphalport.h                      |  12 +
 ports/mimxrt/mpnetworkport.c                  |  64 +++
 ports/mimxrt/network_lan.c                    | 171 +++++++
 ports/mimxrt/pendsv.c                         |  73 +++
 ports/mimxrt/pendsv.h                         |  44 ++
 ports/mimxrt/pin.c                            |  15 +
 ports/mimxrt/systick.c                        |  60 +++
 ports/mimxrt/systick.h                        |  60 +++
 42 files changed, 3436 insertions(+), 8 deletions(-)
 create mode 100644 ports/mimxrt/eth.c
 create mode 100644 ports/mimxrt/eth.h
 create mode 100644 ports/mimxrt/hal/phy/device/phydp83825/fsl_phydp83825.c
 create mode 100644 ports/mimxrt/hal/phy/device/phydp83825/fsl_phydp83825.h
 create mode 100644 ports/mimxrt/hal/phy/device/phyksz8081/fsl_phyksz8081.c
 create mode 100644 ports/mimxrt/hal/phy/device/phyksz8081/fsl_phyksz8081.h
 create mode 100644 ports/mimxrt/hal/phy/device/phylan8720/fsl_phylan8720.c
 create mode 100644 ports/mimxrt/hal/phy/device/phylan8720/fsl_phylan8720.h
 create mode 100644 ports/mimxrt/hal/phy/fsl_mdio.h
 create mode 100644 ports/mimxrt/hal/phy/fsl_phy.h
 create mode 100644 ports/mimxrt/hal/phy/mdio/enet/fsl_enet_mdio.c
 create mode 100644 ports/mimxrt/hal/phy/mdio/enet/fsl_enet_mdio.h
 create mode 100644 ports/mimxrt/lwip_inc/arch/cc.h
 create mode 100644 ports/mimxrt/lwip_inc/arch/sys_arch.h
 create mode 100644 ports/mimxrt/lwip_inc/lwipopts.h
 create mode 100644 ports/mimxrt/mbedtls/mbedtls_config.h
 create mode 100644 ports/mimxrt/mbedtls/mbedtls_port.c
 create mode 100644 ports/mimxrt/mpnetworkport.c
 create mode 100644 ports/mimxrt/network_lan.c
 create mode 100644 ports/mimxrt/pendsv.c
 create mode 100644 ports/mimxrt/pendsv.h
 create mode 100644 ports/mimxrt/systick.c
 create mode 100644 ports/mimxrt/systick.h

diff --git a/ports/mimxrt/Makefile b/ports/mimxrt/Makefile
index 1b83f36abf32c..16aac389d19cb 100644
--- a/ports/mimxrt/Makefile
+++ b/ports/mimxrt/Makefile
@@ -43,7 +43,7 @@ MICROPY_VFS_FAT ?= 1
 # Include py core make definitions
 include $(TOP)/py/py.mk
 
-GIT_SUBMODULES = lib/tinyusb lib/nxp_driver
+GIT_SUBMODULES = lib/tinyusb lib/nxp_driver lib/lwip lib/mbedtls
 
 MCU_DIR = lib/nxp_driver/sdk/devices/$(MCU_SERIES)
 LD_FILES = boards/$(MCU_SERIES).ld boards/common.ld
@@ -79,7 +79,7 @@ INC += -I$(TOP)/lib/tinyusb/src
 
 CFLAGS_MCU = -mtune=cortex-m7 -mcpu=cortex-m7 -mfloat-abi=hard -mfpu=fpv5-d16
 CFLAGS += $(INC) -Wall -Werror -Wdouble-promotion -Wfloat-conversion -std=c99 -nostdlib -mthumb $(CFLAGS_MCU)
-CFLAGS += -DCPU_$(MCU_SERIES) -DCPU_$(MCU_VARIANT)
+CFLAGS += -DCPU_$(MCU_SERIES) -DCPU_$(MCU_VARIANT) -DBOARD_$(BOARD)
 CFLAGS += -DXIP_EXTERNAL_FLASH=1 \
 	-DXIP_BOOT_HEADER_ENABLE=1 \
 	-DFSL_SDK_ENABLE_DRIVER_CACHE_CONTROL=1 \
@@ -134,6 +134,34 @@ LDFLAGS += --gc-sections
 CFLAGS += -fdata-sections -ffunction-sections
 endif
 
+# All settings for Ethernet support are controller by the value of MICROPY_PY_LWIP
+ifeq ($(MICROPY_PY_LWIP), 1)
+
+INC += -Ilwip_inc
+INC += -Ihal/phy
+
+SRC_MOD := $(filter-out %/mbedtls/library/error.c, $(SRC_MOD))
+
+SRC_ETH_C += \
+	hal/phy/mdio/enet/fsl_enet_mdio.c \
+	hal/phy/device/phydp83825/fsl_phydp83825.c \
+	hal/phy/device/phyksz8081/fsl_phyksz8081.c \
+	hal/phy/device/phylan8720/fsl_phylan8720.c \
+	lib/mbedtls_errors/mp_mbedtls_errors.c \
+	$(MCU_DIR)/drivers/fsl_enet.c \
+
+SRC_QSTR += \
+	extmod/modlwip.c \
+	extmod/modnetwork.c \
+	extmod/moduwebsocket.c \
+	extmod/modusocket.c \
+	network_lan.c \
+
+CFLAGS += -DFSL_FEATURE_PHYKSZ8081_USE_RMII50M_MODE=1 \
+	-DMBEDTLS_CONFIG_FILE='"mbedtls/mbedtls_config.h"'
+
+endif
+
 # TinyUSB Stack source
 SRC_TINYUSB_C += \
 	lib/tinyusb/src/class/cdc/cdc_device.c \
@@ -164,6 +192,7 @@ SRC_HAL_IMX_C += \
 	$(MCU_DIR)/drivers/fsl_lpspi.c \
 	$(MCU_DIR)/drivers/fsl_lpspi_edma.c \
 	$(MCU_DIR)/drivers/fsl_lpuart.c \
+	$(MCU_DIR)/drivers/fsl_ocotp.c \
 	$(MCU_DIR)/drivers/fsl_pit.c \
 	$(MCU_DIR)/drivers/fsl_snvs_lp.c \
 	$(MCU_DIR)/drivers/fsl_trng.c \
@@ -183,7 +212,11 @@ SRC_C += \
 	board_init.c \
 	dma_channel.c \
 	drivers/bus/softspi.c \
+	eth.c \
+	extmod/modnetwork.c \
 	extmod/modonewire.c \
+	extmod/modusocket.c \
+	extmod/uos_dupterm.c \
 	fatfs_port.c \
 	led.c \
 	machine_adc.c \
@@ -197,6 +230,7 @@ SRC_C += \
 	machine_timer.c \
 	machine_uart.c \
 	main.c \
+	mbedtls/mbedtls_port.c \
 	mimxrt_flash.c \
 	mimxrt_sdram.c \
 	modmachine.c \
@@ -204,10 +238,16 @@ SRC_C += \
 	moduos.c \
 	modutime.c \
 	mphalport.c \
+	mpnetworkport.c \
+	network_lan.c \
+	pendsv.c \
 	pin.c \
 	sdcard.c \
 	shared/libc/printf.c \
 	shared/libc/string0.c \
+	shared/netutils/netutils.c \
+	shared/netutils/trace.c \
+	shared/netutils/dhcpserver.c \
 	shared/readline/readline.c \
 	shared/runtime/gchelper_native.c \
 	shared/runtime/mpirq.c \
@@ -215,10 +255,13 @@ SRC_C += \
 	shared/runtime/stdout_helpers.c \
 	shared/runtime/sys_stdio_mphal.c \
 	shared/timeutils/timeutils.c \
+	systick.c \
 	ticks.c \
 	tusb_port.c \
 	$(SRC_TINYUSB_C) \
 	$(SRC_HAL_IMX_C) \
+	$(SRC_ETH_C) \
+
 
 ifeq ($(MICROPY_HW_FLASH_TYPE), qspi_nor)
 SRC_C += \
@@ -334,6 +377,7 @@ SRC_S += shared/runtime/gchelper_m3.s \
 # List of sources for qstr extraction
 SRC_QSTR += \
 	extmod/modonewire.c \
+	extmod/uos_dupterm.c \
 	machine_adc.c \
 	machine_led.c \
 	machine_pin.c \
diff --git a/ports/mimxrt/board_init.c b/ports/mimxrt/board_init.c
index e37ed1f149e13..d96645feffacb 100644
--- a/ports/mimxrt/board_init.c
+++ b/ports/mimxrt/board_init.c
@@ -56,6 +56,9 @@ void board_init(void) {
     mimxrt_sdram_init();
     #endif
 
+    // 1ms tick timer
+    SysTick_Config(SystemCoreClock / 1000);
+
     // ------------- USB0 ------------- //
     // Clock
     CLOCK_EnableUsbhs0PhyPllClock(kCLOCK_Usbphy480M, 480000000U);
diff --git a/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.h b/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.h
index 4f33bb20871ac..b546700e7a3f4 100644
--- a/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.h
+++ b/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.h
@@ -117,3 +117,24 @@
 #define MIMXRT_IOMUXC_SEMC_WE IOMUXC_GPIO_EMC_09_SEMC_WE
 
 #define MIMXRT_IOMUXC_SEMC_CS0 IOMUXC_GPIO_EMC_12_SEMC_CS0
+
+// Network definitions
+// Transceiver Phy Address
+#define ENET_PHY_ADDRESS    (2)
+#define ENET_PHY_OPS        phyksz8081_ops
+
+// Etherner PIN definitions
+#define ENET_RESET_PIN      pin_GPIO_AD_B0_04
+#define ENET_INT_PIN        pin_GPIO_AD_B1_06
+
+#define IOMUX_TABLE_ENET \
+    { IOMUXC_GPIO_AD_B0_08_ENET_REF_CLK1, 1, 0xB0E9u }, \
+    { IOMUXC_GPIO_AD_B0_09_ENET_RDATA01, 0, 0xB0E9u }, \
+    { IOMUXC_GPIO_AD_B0_10_ENET_RDATA00, 0, 0xB0E9u }, \
+    { IOMUXC_GPIO_AD_B0_11_ENET_RX_EN, 0, 0xB0E9u }, \
+    { IOMUXC_GPIO_AD_B0_12_ENET_RX_ER, 0, 0xB0E9u }, \
+    { IOMUXC_GPIO_AD_B0_13_ENET_TX_EN, 0, 0xB0E9u }, \
+    { IOMUXC_GPIO_AD_B0_14_ENET_TDATA00, 0, 0xB0E9u }, \
+    { IOMUXC_GPIO_AD_B0_15_ENET_TDATA01, 0, 0xB0E9u }, \
+    { IOMUXC_GPIO_EMC_40_ENET_MDIO, 0, 0xB0E9u }, \
+    { IOMUXC_GPIO_EMC_41_ENET_MDC, 0, 0xB0E9u },
diff --git a/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.mk b/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.mk
index e08b3357fdf06..c1e1678e59923 100644
--- a/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.mk
+++ b/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.mk
@@ -9,6 +9,10 @@ MICROPY_HW_FLASH_SIZE ?= 0x800000  # 8MB
 MICROPY_HW_SDRAM_AVAIL = 1
 MICROPY_HW_SDRAM_SIZE  = 0x2000000  # 32MB
 
+MICROPY_PY_LWIP = 1
+MICROPY_PY_USSL = 1
+MICROPY_SSL_MBEDTLS = 1
+
 JLINK_PATH ?= /media/RT1020-EVK/
 JLINK_COMMANDER_SCRIPT = $(BUILD)/script.jlink
 
diff --git a/ports/mimxrt/boards/MIMXRT1021.ld b/ports/mimxrt/boards/MIMXRT1021.ld
index 8d981a7c61d32..64f4e537e03a5 100644
--- a/ports/mimxrt/boards/MIMXRT1021.ld
+++ b/ports/mimxrt/boards/MIMXRT1021.ld
@@ -42,6 +42,7 @@ _gc_heap_start = ORIGIN(m_sdram);
 _gc_heap_end = ORIGIN(m_sdram) + LENGTH(m_sdram);
 #else
 /* Use second OCRAM bank for GC heap. */
+/* Use all OCRAM for the GC heap. */
 _gc_heap_start = ORIGIN(m_ocrm);
 _gc_heap_end = ORIGIN(m_ocrm) + LENGTH(m_ocrm);
 #endif
diff --git a/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.h b/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.h
index f6021ac788d5c..3837315f7d764 100644
--- a/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.h
+++ b/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.h
@@ -1,4 +1,4 @@
-#define MICROPY_HW_BOARD_NAME "i.MX RT1050 EVK"
+#define MICROPY_HW_BOARD_NAME "i.MX RT1050 EVKB-A1"
 #define MICROPY_HW_MCU_NAME   "MIMXRT1052DVL6B"
 
 // MIMXRT1050_EVKB has 1 user LED
@@ -108,3 +108,24 @@
 #define MIMXRT_IOMUXC_SEMC_WE IOMUXC_GPIO_EMC_28_SEMC_WE
 
 #define MIMXRT_IOMUXC_SEMC_CS0 IOMUXC_GPIO_EMC_29_SEMC_CS0
+
+// Network definitions
+// Transceiver Phy Address & Type
+#define ENET_PHY_ADDRESS    (2)
+#define ENET_PHY_OPS        phyksz8081_ops
+
+// Etherner PIN definitions
+#define ENET_RESET_PIN      pin_GPIO_AD_B0_09
+#define ENET_INT_PIN        pin_GPIO_AD_B0_10
+
+#define IOMUX_TABLE_ENET \
+    { IOMUXC_GPIO_B1_04_ENET_RX_DATA00, 0, 0xB0E9u }, \
+    { IOMUXC_GPIO_B1_05_ENET_RX_DATA01, 0, 0xB0E9u }, \
+    { IOMUXC_GPIO_B1_06_ENET_RX_EN, 0, 0xB0E9u }, \
+    { IOMUXC_GPIO_B1_07_ENET_TX_DATA00, 0, 0xB0E9u }, \
+    { IOMUXC_GPIO_B1_08_ENET_TX_DATA01, 0, 0xB0E9u }, \
+    { IOMUXC_GPIO_B1_09_ENET_TX_EN, 0, 0xB0E9u }, \
+    { IOMUXC_GPIO_B1_10_ENET_REF_CLK, 1, 0x71u }, \
+    { IOMUXC_GPIO_B1_11_ENET_RX_ER, 0, 0xB0E9u }, \
+    { IOMUXC_GPIO_EMC_41_ENET_MDIO, 0, 0xB0E9u }, \
+    { IOMUXC_GPIO_EMC_40_ENET_MDC, 0, 0xB0E9u },
diff --git a/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.mk b/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.mk
index 4165b72c263c7..65e3d30963d3e 100644
--- a/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.mk
+++ b/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.mk
@@ -9,7 +9,6 @@ MICROPY_HW_FLASH_SIZE ?= 0x4000000  # 64MB
 MICROPY_HW_SDRAM_AVAIL = 1
 MICROPY_HW_SDRAM_SIZE  = 0x2000000  # 32MB
 
-JLINK_PATH ?= /media/RT1050-EVKB/
-
-deploy: $(BUILD)/firmware.bin
-	cp $< $(JLINK_PATH)
+MICROPY_PY_LWIP = 1
+MICROPY_PY_USSL = 1
+MICROPY_SSL_MBEDTLS = 1
diff --git a/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.h b/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.h
index af44010486f03..a66fcf9ae9bab 100644
--- a/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.h
+++ b/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.h
@@ -107,3 +107,24 @@
 #define MIMXRT_IOMUXC_SEMC_WE IOMUXC_GPIO_EMC_28_SEMC_WE
 
 #define MIMXRT_IOMUXC_SEMC_CS0 IOMUXC_GPIO_EMC_29_SEMC_CS0
+
+// Network definitions
+// Transceiver Phy Address
+#define ENET_PHY_ADDRESS    (2)
+#define ENET_PHY_OPS        phyksz8081_ops
+
+// Etherner PIN definitions
+#define ENET_RESET_PIN      pin_GPIO_AD_B0_09
+#define ENET_INT_PIN        pin_GPIO_AD_B0_10
+
+#define IOMUX_TABLE_ENET \
+    { IOMUXC_GPIO_B1_04_ENET_RX_DATA00, 0, 0xB0E9u }, \
+    { IOMUXC_GPIO_B1_05_ENET_RX_DATA01, 0, 0xB0E9u }, \
+    { IOMUXC_GPIO_B1_06_ENET_RX_EN, 0, 0xB0E9u }, \
+    { IOMUXC_GPIO_B1_07_ENET_TX_DATA00, 0, 0xB0E9u }, \
+    { IOMUXC_GPIO_B1_08_ENET_TX_DATA01, 0, 0xB0E9u }, \
+    { IOMUXC_GPIO_B1_09_ENET_TX_EN, 0, 0xB0E9u }, \
+    { IOMUXC_GPIO_B1_10_ENET_REF_CLK, 1, 0x71u }, \
+    { IOMUXC_GPIO_B1_11_ENET_RX_ER, 0, 0xB0E9u }, \
+    { IOMUXC_GPIO_EMC_41_ENET_MDIO, 0, 0xB0E9u }, \
+    { IOMUXC_GPIO_EMC_40_ENET_MDC, 0, 0xB0E9u },
diff --git a/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.mk b/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.mk
index 4c4a2ff980448..56ccba6e5929c 100644
--- a/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.mk
+++ b/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.mk
@@ -9,6 +9,10 @@ MICROPY_HW_FLASH_SIZE ?= 0x800000  # 8MB
 MICROPY_HW_SDRAM_AVAIL = 1
 MICROPY_HW_SDRAM_SIZE  = 0x2000000  # 32MB
 
+MICROPY_PY_LWIP = 1
+MICROPY_PY_USSL = 1
+MICROPY_SSL_MBEDTLS = 1
+
 JLINK_PATH ?= /media/RT1060-EVK/
 JLINK_COMMANDER_SCRIPT = $(BUILD)/script.jlink
 
diff --git a/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.h b/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.h
index 17268b0a564cf..1dcdd378a25c8 100644
--- a/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.h
+++ b/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.h
@@ -107,3 +107,24 @@
 #define MIMXRT_IOMUXC_SEMC_WE IOMUXC_GPIO_EMC_28_SEMC_WE
 
 #define MIMXRT_IOMUXC_SEMC_CS0 IOMUXC_GPIO_EMC_29_SEMC_CS0
+
+// Network definitions
+// Transceiver Phy Address
+#define ENET_PHY_ADDRESS    (2)
+#define ENET_PHY_OPS        phyksz8081_ops
+
+// Etherner PIN definitions
+#define ENET_RESET_PIN      pin_GPIO_AD_B0_09
+#define ENET_INT_PIN        pin_GPIO_AD_B0_10
+
+#define IOMUX_TABLE_ENET \
+    { IOMUXC_GPIO_B1_04_ENET_RX_DATA00, 0, 0xB0E9u }, \
+    { IOMUXC_GPIO_B1_05_ENET_RX_DATA01, 0, 0xB0E9u }, \
+    { IOMUXC_GPIO_B1_06_ENET_RX_EN, 0, 0xB0E9u }, \
+    { IOMUXC_GPIO_B1_07_ENET_TX_DATA00, 0, 0xB0E9u }, \
+    { IOMUXC_GPIO_B1_08_ENET_TX_DATA01, 0, 0xB0E9u }, \
+    { IOMUXC_GPIO_B1_09_ENET_TX_EN, 0, 0xB0E9u }, \
+    { IOMUXC_GPIO_B1_10_ENET_REF_CLK, 1, 0x71u }, \
+    { IOMUXC_GPIO_B1_11_ENET_RX_ER, 0, 0xB0E9u }, \
+    { IOMUXC_GPIO_EMC_41_ENET_MDIO, 0, 0xB0E9u }, \
+    { IOMUXC_GPIO_EMC_40_ENET_MDC, 0, 0xB0E9u },
diff --git a/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.mk b/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.mk
index 8bc35dd0dd142..5cd7d49abd58a 100644
--- a/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.mk
+++ b/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.mk
@@ -9,6 +9,10 @@ MICROPY_HW_FLASH_SIZE ?= 0x4000000  # 64MB
 MICROPY_HW_SDRAM_AVAIL = 1
 MICROPY_HW_SDRAM_SIZE  = 0x2000000  # 32MB
 
+MICROPY_PY_LWIP = 1
+MICROPY_PY_USSL = 1
+MICROPY_SSL_MBEDTLS = 1
+
 JLINK_PATH ?= /media/RT1064-EVK/
 
 deploy: $(BUILD)/firmware.bin
diff --git a/ports/mimxrt/boards/TEENSY41/mpconfigboard.h b/ports/mimxrt/boards/TEENSY41/mpconfigboard.h
index 7890ba762c1c4..4ca82d4b65066 100644
--- a/ports/mimxrt/boards/TEENSY41/mpconfigboard.h
+++ b/ports/mimxrt/boards/TEENSY41/mpconfigboard.h
@@ -65,3 +65,24 @@
         .data2 = { GPIO_SD_B0_04_USDHC1_DATA2 }, \
         .data3 = { GPIO_SD_B0_05_USDHC1_DATA3 }, \
     }
+
+// Network definitions
+// Transceiver Phy Address & Type
+#define ENET_PHY_ADDRESS    (0)
+#define ENET_PHY_OPS        phydp83825_ops
+
+// Ethernet PIN definitions
+#define ENET_RESET_PIN      pin_GPIO_B0_14
+#define ENET_INT_PIN        pin_GPIO_B0_15
+
+#define IOMUX_TABLE_ENET \
+    { IOMUXC_GPIO_B1_04_ENET_RX_DATA00, 0, 0xB0E9u }, \
+    { IOMUXC_GPIO_B1_05_ENET_RX_DATA01, 0, 0xB0E9u }, \
+    { IOMUXC_GPIO_B1_06_ENET_RX_EN, 0, 0xB0E9u }, \
+    { IOMUXC_GPIO_B1_07_ENET_TX_DATA00, 0, 0xB0E9u }, \
+    { IOMUXC_GPIO_B1_08_ENET_TX_DATA01, 0, 0xB0E9u }, \
+    { IOMUXC_GPIO_B1_09_ENET_TX_EN, 0, 0xB0E9u }, \
+    { IOMUXC_GPIO_B1_10_ENET_REF_CLK, 1, 0x71u }, \
+    { IOMUXC_GPIO_B1_11_ENET_RX_ER, 0, 0xB0E9u }, \
+    { IOMUXC_GPIO_B1_15_ENET_MDIO, 0, 0xB0E9u }, \
+    { IOMUXC_GPIO_B1_14_ENET_MDC, 0, 0xB0E9u },
diff --git a/ports/mimxrt/boards/TEENSY41/mpconfigboard.mk b/ports/mimxrt/boards/TEENSY41/mpconfigboard.mk
index 27039648b8f7e..a012444caaa96 100755
--- a/ports/mimxrt/boards/TEENSY41/mpconfigboard.mk
+++ b/ports/mimxrt/boards/TEENSY41/mpconfigboard.mk
@@ -7,5 +7,9 @@ MICROPY_HW_FLASH_TYPE ?= qspi_nor
 MICROPY_HW_FLASH_SIZE ?= 0x800000  # 8MB
 MICROPY_HW_FLASH_RESERVED ?= 0x1000  # 4KB
 
+MICROPY_PY_LWIP = 1
+MICROPY_PY_USSL = 1
+MICROPY_SSL_MBEDTLS = 1
+
 deploy: $(BUILD)/firmware.hex
 	teensy_loader_cli --mcu=imxrt1062 -v -w $<
diff --git a/ports/mimxrt/eth.c b/ports/mimxrt/eth.c
new file mode 100644
index 0000000000000..414e8d51f2b43
--- /dev/null
+++ b/ports/mimxrt/eth.c
@@ -0,0 +1,448 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2019 Damien P. George
+ * Copyright (c) 2021 Robert Hammelrath
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include <string.h>
+#include "py/runtime.h"
+#include "py/mphal.h"
+#include "py/mperrno.h"
+#include "ticks.h"
+
+#if defined(MICROPY_HW_ETH_MDC)
+
+#include "eth.h"
+#include "pin.h"
+#include "shared/netutils/netutils.h"
+#include "extmod/modnetwork.h"
+
+#include "fsl_iomuxc.h"
+#include "fsl_enet.h"
+#include "fsl_phy.h"
+#include "hal/phy/mdio/enet/fsl_enet_mdio.h"
+#include "hal/phy/device/phyksz8081/fsl_phyksz8081.h"
+#include "hal/phy/device/phydp83825/fsl_phydp83825.h"
+#include "hal/phy/device/phylan8720/fsl_phylan8720.h"
+
+#include "lwip/etharp.h"
+#include "lwip/dns.h"
+#include "lwip/dhcp.h"
+#include "netif/ethernet.h"
+
+#include "ticks.h"
+
+// Configuration values
+enet_config_t enet_config;
+phy_config_t phyConfig = {0};
+
+// Prepare the buffer configuration.
+
+#define ENET_RXBD_NUM          (5)
+#define ENET_TXBD_NUM          (5)
+
+AT_NONCACHEABLE_SECTION_ALIGN(enet_rx_bd_struct_t g_rxBuffDescrip[ENET_RXBD_NUM], ENET_BUFF_ALIGNMENT);
+AT_NONCACHEABLE_SECTION_ALIGN(enet_tx_bd_struct_t g_txBuffDescrip[ENET_TXBD_NUM], ENET_BUFF_ALIGNMENT);
+SDK_ALIGN(uint8_t g_rxDataBuff[ENET_RXBD_NUM][SDK_SIZEALIGN(ENET_FRAME_MAX_FRAMELEN, ENET_BUFF_ALIGNMENT)],
+    ENET_BUFF_ALIGNMENT);
+SDK_ALIGN(uint8_t g_txDataBuff[ENET_TXBD_NUM][SDK_SIZEALIGN(ENET_FRAME_MAX_FRAMELEN, ENET_BUFF_ALIGNMENT)],
+    ENET_BUFF_ALIGNMENT);
+
+// ENET Handles & Buffers
+enet_handle_t g_handle;
+
+static mdio_handle_t mdioHandle = {.ops = &enet_ops};
+static phy_handle_t phyHandle = {.phyAddr = ENET_PHY_ADDRESS, .mdioHandle = &mdioHandle, .ops = &ENET_PHY_OPS};
+
+enet_buffer_config_t buffConfig[] = {{
+                                         ENET_RXBD_NUM,
+                                         ENET_TXBD_NUM,
+                                         SDK_SIZEALIGN(ENET_FRAME_MAX_FRAMELEN, ENET_BUFF_ALIGNMENT),
+                                         SDK_SIZEALIGN(ENET_FRAME_MAX_FRAMELEN, ENET_BUFF_ALIGNMENT),
+                                         &g_rxBuffDescrip[0],
+                                         &g_txBuffDescrip[0],
+                                         &g_rxDataBuff[0][0],
+                                         &g_txDataBuff[0][0],
+                                     }};
+
+static uint8_t hw_addr[6]; // The MAC address field
+eth_t eth_instance;
+
+#define PHY_INIT_TIMEOUT_MS (10000)
+#define PHY_AUTONEGO_TIMEOUT_US (5000000)
+
+typedef struct _eth_t {
+    uint32_t trace_flags;
+    struct netif netif;
+    struct dhcp dhcp_struct;
+} eth_t;
+
+typedef struct _iomux_table_t {
+    uint32_t muxRegister;
+    uint32_t muxMode;
+    uint32_t inputRegister;
+    uint32_t inputDaisy;
+    uint32_t configRegister;
+    uint32_t inputOnfield;
+    uint32_t configValue;
+} iomux_table_t;
+
+static const iomux_table_t iomux_table_enet[] = {
+    IOMUX_TABLE_ENET
+};
+
+#define IOTE (iomux_table_enet[i])
+#ifndef ENET_TX_CLK_OUTPUT
+#define ENET_TX_CLK_OUTPUT true
+#endif
+
+#define TRACE_ASYNC_EV (0x0001)
+#define TRACE_ETH_TX (0x0002)
+#define TRACE_ETH_RX (0x0004)
+#define TRACE_ETH_FULL (0x0008)
+
+
+STATIC void eth_trace(eth_t *self, size_t len, const void *data, unsigned int flags) {
+    if (((flags & NETUTILS_TRACE_IS_TX) && (self->trace_flags & TRACE_ETH_TX))
+        || (!(flags & NETUTILS_TRACE_IS_TX) && (self->trace_flags & TRACE_ETH_RX))) {
+        const uint8_t *buf;
+        if (len == (size_t)-1) {
+            // data is a pbuf
+            const struct pbuf *pbuf = data;
+            buf = pbuf->payload;
+            len = pbuf->len; // restricted to print only the first chunk of the pbuf
+        } else {
+            // data is actual data buffer
+            buf = data;
+        }
+        if (self->trace_flags & TRACE_ETH_FULL) {
+            flags |= NETUTILS_TRACE_PAYLOAD;
+        }
+        netutils_ethernet_trace(MP_PYTHON_PRINTER, len, buf, flags);
+    }
+}
+
+STATIC void eth_process_frame(eth_t *self, uint8_t *buf, size_t length) {
+
+    struct netif *netif = &self->netif;
+    if (netif->flags & NETIF_FLAG_LINK_UP) {
+        struct pbuf *p = pbuf_alloc(PBUF_RAW, length, PBUF_POOL);
+        if (p != NULL) {
+            // Need to create a local copy first, since ENET_ReadFrame does not
+            // provide a pointer to the buffer.
+            pbuf_take(p, buf, length);
+            if (netif->input(p, netif) != ERR_OK) {
+                pbuf_free(p);
+            }
+        }
+    }
+}
+
+void eth_irq_handler(ENET_Type *base, enet_handle_t *handle, enet_event_t event, void *userData) {
+    eth_t *self = (eth_t *)userData;
+    uint8_t g_rx_frame[ENET_FRAME_MAX_FRAMELEN + 14];
+    uint32_t length = 0;
+    status_t status;
+
+    if (event == kENET_RxEvent) {
+        do {
+            status = ENET_GetRxFrameSize(&g_handle, &length);
+            if (status == kStatus_Success) {
+                // Get the data
+                ENET_ReadFrame(ENET, &g_handle, g_rx_frame, length);
+                eth_process_frame(self, g_rx_frame, length);
+            } else if (status == kStatus_ENET_RxFrameError) {
+                ENET_ReadFrame(ENET, &g_handle, NULL, 0);
+            }
+        } while (status != kStatus_ENET_RxFrameEmpty);
+    } else {
+        ENET_ClearInterruptStatus(ENET, kENET_TxFrameInterrupt);
+    }
+}
+
+// eth_init: Set up GPIO and the transceiver
+void eth_init(eth_t *self, int mac_idx) {
+
+    CLOCK_EnableClock(kCLOCK_Iomuxc);
+
+    gpio_pin_config_t gpio_config = {kGPIO_DigitalOutput, 0, kGPIO_NoIntmode};
+    (void)gpio_config;
+
+    #ifdef ENET_RESET_PIN
+    // Configure the Reset Pin
+    const machine_pin_obj_t *reset_pin = &ENET_RESET_PIN;
+    const machine_pin_af_obj_t *af_obj = pin_find_af(reset_pin, PIN_AF_MODE_ALT5);
+
+    IOMUXC_SetPinMux(reset_pin->muxRegister, af_obj->af_mode, 0, 0, reset_pin->configRegister, 0U);
+    IOMUXC_SetPinConfig(reset_pin->muxRegister, af_obj->af_mode, 0, 0, reset_pin->configRegister, 0xB0A9U);
+    GPIO_PinInit(reset_pin->gpio, reset_pin->pin, &gpio_config);
+    #endif
+
+    #ifdef ENET_INT_PIN
+    // Configure the Int Pin
+    const machine_pin_obj_t *int_pin = &ENET_INT_PIN;
+    af_obj = pin_find_af(int_pin, PIN_AF_MODE_ALT5);
+
+    IOMUXC_SetPinMux(int_pin->muxRegister, af_obj->af_mode, 0, 0, int_pin->configRegister, 0U);
+    IOMUXC_SetPinConfig(int_pin->muxRegister, af_obj->af_mode, 0, 0, int_pin->configRegister, 0xB0A9U);
+    GPIO_PinInit(int_pin->gpio, int_pin->pin, &gpio_config);
+    #endif
+
+    // Configure the Transceiver Pins, Settings except for CLK:
+    // Slew Rate Field: Fast Slew Rate, Drive Strength, R0/5, Speed max(200MHz)
+    // Open Drain Disabled, Pull Enabled, Pull 100K Ohm Pull Up
+    // Hysteresis Disabled
+
+    for (int i = 0; i < ARRAY_SIZE(iomux_table_enet); i++) {
+        IOMUXC_SetPinMux(IOTE.muxRegister, IOTE.muxMode, IOTE.inputRegister, IOTE.inputDaisy, IOTE.configRegister, IOTE.inputOnfield);
+        IOMUXC_SetPinConfig(IOTE.muxRegister, IOTE.muxMode, IOTE.inputRegister, IOTE.inputDaisy, IOTE.configRegister, IOTE.configValue);
+    }
+
+    const clock_enet_pll_config_t config = {
+        .enableClkOutput = true, .enableClkOutput25M = false, .loopDivider = 1
+    };
+    CLOCK_InitEnetPll(&config);
+
+    IOMUXC_EnableMode(IOMUXC_GPR, kIOMUXC_GPR_ENET1RefClkMode, false); // Drive ENET_REF_CLK from PAD
+    IOMUXC_EnableMode(IOMUXC_GPR, kIOMUXC_GPR_ENET1TxClkOutputDir, ENET_TX_CLK_OUTPUT);  // Enable output driver
+
+    // Reset transceiver
+    // pull up the ENET_INT before RESET.
+    #ifdef ENET_INT_PIN
+    GPIO_WritePinOutput(int_pin->gpio, int_pin->pin, 1);
+    #endif
+
+    #ifdef ENET_RESET_PIN
+    GPIO_WritePinOutput(reset_pin->gpio, reset_pin->pin, 0);
+    mp_hal_delay_us(1000);
+    GPIO_WritePinOutput(reset_pin->gpio, reset_pin->pin, 1);
+    mp_hal_delay_us(1000);
+    #endif
+
+    mp_hal_get_mac(0, hw_addr);
+
+    phyConfig.autoNeg = true;
+    mdioHandle.resource.base = ENET;
+    mdioHandle.resource.csrClock_Hz = CLOCK_GetFreq(kCLOCK_IpgClk);
+
+    // Init the PHY interface & negotiate the speed
+    bool link = false;
+    bool autonego = false;
+    phy_speed_t speed = kENET_MiiSpeed100M;
+    phy_duplex_t duplex = kENET_MiiFullDuplex;
+
+    phyConfig.phyAddr = ENET_PHY_ADDRESS;
+
+    status_t status = PHY_Init(&phyHandle, &phyConfig);
+    if (status == kStatus_Success) {
+        if (phyConfig.autoNeg) {
+            uint64_t t = ticks_us64() + PHY_AUTONEGO_TIMEOUT_US;
+            // Wait for auto-negotiation success and link up
+            do {
+                PHY_GetAutoNegotiationStatus(&phyHandle, &autonego);
+                PHY_GetLinkStatus(&phyHandle, &link);
+                if (autonego && link) {
+                    break;
+                }
+            } while (ticks_us64() < t);
+            if (!autonego) {
+                mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("PHY Auto-negotiation failed."));
+            }
+            PHY_GetLinkSpeedDuplex(&phyHandle, &speed, &duplex);
+        } else {
+            PHY_SetLinkSpeedDuplex(&phyHandle, speed, duplex);
+        }
+    } else {
+        mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("PHY Init failed."));
+    }
+
+    ENET_GetDefaultConfig(&enet_config);
+    enet_config.miiSpeed = (enet_mii_speed_t)speed;
+    enet_config.miiDuplex = (enet_mii_duplex_t)duplex;
+    enet_config.miiMode = kENET_RmiiMode;
+    // Enable checksum generation by the ENET controller
+    // Note: Disabled due to problems with the checksum on ICMP requests
+    // Maybe caused by LWIP inserting 0xffff instead of 0x0000
+    // Keep the code for now until it may be fixed.
+    // enet_config.txAccelerConfig = kENET_TxAccelIpCheckEnabled | kENET_TxAccelProtoCheckEnabled;
+    // Set interrupt
+    enet_config.interrupt |= ENET_TX_INTERRUPT | ENET_RX_INTERRUPT;
+
+    ENET_Init(ENET, &g_handle, &enet_config, &buffConfig[0], hw_addr, CLOCK_GetFreq(kCLOCK_IpgClk));
+    ENET_SetCallback(&g_handle, eth_irq_handler, (void *)self);
+    ENET_EnableInterrupts(ENET, ENET_RX_INTERRUPT);
+    ENET_ClearInterruptStatus(ENET, ENET_TX_INTERRUPT | ENET_RX_INTERRUPT | ENET_ERR_INTERRUPT);
+    ENET_ActiveRead(ENET);
+}
+
+// Initialize the phy interface
+STATIC int eth_mac_init(eth_t *self) {
+    return 0;
+}
+
+// Deinit the interface
+STATIC void eth_mac_deinit(eth_t *self) {
+}
+
+void eth_set_trace(eth_t *self, uint32_t value) {
+    self->trace_flags = value;
+}
+
+/*******************************************************************************/
+// ETH-LwIP bindings
+
+STATIC err_t eth_netif_output(struct netif *netif, struct pbuf *p) {
+    // This function should always be called from a context where PendSV-level IRQs are disabled
+    status_t status;
+
+    LINK_STATS_INC(link.xmit);
+    eth_trace(netif->state, (size_t)-1, p, NETUTILS_TRACE_IS_TX | NETUTILS_TRACE_NEWLINE);
+
+    if (p->next == NULL) {
+        status = ENET_SendFrame(ENET, &g_handle, p->payload, p->len);
+    } else {
+        // frame consists of several parts. Copy them together and send them
+        size_t length = 0;
+        uint8_t tx_frame[ENET_FRAME_MAX_FRAMELEN + 14];
+
+        while (p) {
+            memcpy(&tx_frame[length], p->payload, p->len);
+            length += p->len;
+            p = p->next;
+        }
+        status = ENET_SendFrame(ENET, &g_handle, tx_frame, length);
+    }
+    return status == kStatus_Success ? ERR_OK : ERR_BUF;
+}
+
+STATIC err_t eth_netif_init(struct netif *netif) {
+    netif->linkoutput = eth_netif_output;
+    netif->output = etharp_output;
+    netif->mtu = 1500;
+    netif->flags = NETIF_FLAG_BROADCAST | NETIF_FLAG_ETHARP | NETIF_FLAG_ETHERNET | NETIF_FLAG_IGMP;
+    // Checksums only need to be checked on incoming frames, not computed on outgoing frames
+    NETIF_SET_CHECKSUM_CTRL(netif,
+        NETIF_CHECKSUM_CHECK_IP
+        | NETIF_CHECKSUM_CHECK_UDP
+        | NETIF_CHECKSUM_CHECK_TCP
+        | NETIF_CHECKSUM_CHECK_ICMP
+        | NETIF_CHECKSUM_CHECK_ICMP6
+        | NETIF_CHECKSUM_GEN_IP
+        | NETIF_CHECKSUM_GEN_UDP
+        | NETIF_CHECKSUM_GEN_TCP
+        | NETIF_CHECKSUM_GEN_ICMP
+        | NETIF_CHECKSUM_GEN_ICMP6
+        );
+    return ERR_OK;
+}
+
+STATIC void eth_lwip_init(eth_t *self) {
+    ip_addr_t ipconfig[4];
+    IP4_ADDR(&ipconfig[0], 192, 168, 0, 2);
+    IP4_ADDR(&ipconfig[1], 255, 255, 255, 0);
+    IP4_ADDR(&ipconfig[2], 192, 168, 0, 1);
+    IP4_ADDR(&ipconfig[3], 8, 8, 8, 8);
+
+    self->netif.hwaddr_len = 6;
+    memcpy(self->netif.hwaddr, hw_addr, 6);
+
+    MICROPY_PY_LWIP_ENTER
+
+    struct netif *n = &self->netif;
+    n->name[0] = 'e';
+    n->name[1] = '0';
+    netif_add(n, &ipconfig[0], &ipconfig[1], &ipconfig[2], self, eth_netif_init, ethernet_input);
+    netif_set_hostname(n, "MPY");
+    netif_set_default(n);
+    netif_set_up(n);
+
+    dns_setserver(0, &ipconfig[3]);
+    dhcp_set_struct(n, &self->dhcp_struct);
+    dhcp_start(n);
+
+    netif_set_link_up(n);
+
+    MICROPY_PY_LWIP_EXIT
+}
+
+STATIC void eth_lwip_deinit(eth_t *self) {
+    MICROPY_PY_LWIP_ENTER
+    for (struct netif *netif = netif_list; netif != NULL; netif = netif->next) {
+        if (netif == &self->netif) {
+            netif_remove(netif);
+            netif->ip_addr.addr = 0;
+            netif->flags = 0;
+        }
+    }
+    MICROPY_PY_LWIP_EXIT
+}
+
+struct netif *eth_netif(eth_t *self) {
+    return &self->netif;
+}
+
+int eth_link_status(eth_t *self) {
+    struct netif *netif = &self->netif;
+    if ((netif->flags & (NETIF_FLAG_UP | NETIF_FLAG_LINK_UP))
+        == (NETIF_FLAG_UP | NETIF_FLAG_LINK_UP)) {
+        if (netif->ip_addr.addr != 0) {
+            return 3; // link up
+        } else {
+            return 2; // link no-ip;
+        }
+    } else {
+        bool link;
+        PHY_GetLinkStatus(&phyHandle, &link);
+        if (link) {
+            return 1; // link up
+        } else {
+            return 0; // link down
+        }
+    }
+}
+
+int eth_start(eth_t *self) {
+    eth_lwip_deinit(self);
+
+    // Make sure Eth is Not in low power mode.
+    eth_low_power_mode(self, false);
+
+    int ret = eth_mac_init(self);
+    if (ret < 0) {
+        return ret;
+    }
+    eth_lwip_init(self);
+    return 0;
+}
+
+int eth_stop(eth_t *self) {
+    eth_lwip_deinit(self);
+    eth_mac_deinit(self);
+    return 0;
+}
+
+void eth_low_power_mode(eth_t *self, bool enable) {
+    ENET_EnableSleepMode(ENET, enable);
+}
+#endif // defined(MICROPY_HW_ETH_MDC)
diff --git a/ports/mimxrt/eth.h b/ports/mimxrt/eth.h
new file mode 100644
index 0000000000000..56327d08aef2f
--- /dev/null
+++ b/ports/mimxrt/eth.h
@@ -0,0 +1,41 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2019 Damien P. George
+ * Copyright (c) 2021 Robert Hammelrath
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+#ifndef MICROPY_INCLUDED_MIMXRT_ETH_H
+#define MICROPY_INCLUDED_MIMXRT_ETH_H
+
+typedef struct _eth_t eth_t;
+extern eth_t eth_instance;
+
+void eth_init(eth_t *self, int mac_idx);
+void eth_set_trace(eth_t *self, uint32_t value);
+struct netif *eth_netif(eth_t *self);
+int eth_link_status(eth_t *self);
+int eth_start(eth_t *self);
+int eth_stop(eth_t *self);
+void eth_low_power_mode(eth_t *self, bool enable);
+
+#endif // MICROPY_INCLUDED_MIMXRT_ETH_H
diff --git a/ports/mimxrt/hal/phy/device/phydp83825/fsl_phydp83825.c b/ports/mimxrt/hal/phy/device/phydp83825/fsl_phydp83825.c
new file mode 100644
index 0000000000000..2aca609a05725
--- /dev/null
+++ b/ports/mimxrt/hal/phy/device/phydp83825/fsl_phydp83825.c
@@ -0,0 +1,281 @@
+/*
+ * Copyright 2020 NXP
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#include "fsl_phydp83825.h"
+
+/*******************************************************************************
+ * Definitions
+ ******************************************************************************/
+
+/*! @brief Defines the PHY PD83825 vendor defined registers. */
+#define PHY_PHYSTS_REG   0x10U // Phy status register
+#define PHY_BISCR_REG    0x16U // RMII Config register.
+#define PHY_RCSR_REG     0x17U // RMII Config register.
+#define PHY_CONTROL2_REG 0x1FU /*!< The PHY control register 2. */
+
+/*! @brief Defines the PHY DP82825 ID number. */
+#define PHY_CONTROL_ID1 0x2000U /*!< The PHY ID1 */
+
+/*! @brief Defines the mask flag of operation mode in control registers */
+#define PHY_PHYSTS_100FULLDUPLEX_MASK 0x0006U /*!< The PHY 100M full duplex mask. */
+#define PHY_PHYSTS_DUPLEX_MASK        0x0004U /*!< The PHY full duplex mask. */
+#define PHY_PHYSTS_100M_MASK          0x0002U /*!< The PHY 100M mask. */
+#define PHY_PHYSTS_LINK_MASK          0x0001U /*!< The PHY link up mask. */
+
+#define PYH_RMII_CLOCK_SELECT        0x80  // Select 50MHz clock
+#define PHY_BISCR_REMOTELOOP_MASK    0x1FU // !< The PHY remote loopback mask.
+#define PHY_BISCR_REMOTELOOP_MODE    0x08U // !< The PHY remote loopback mode.
+
+/*! @brief Defines the timeout macro. */
+#define PHY_READID_TIMEOUT_COUNT 1000U
+
+/*******************************************************************************
+ * Prototypes
+ ******************************************************************************/
+
+/*******************************************************************************
+ * Variables
+ ******************************************************************************/
+const phy_operations_t phydp83825_ops = {.phyInit = PHY_DP83825_Init,
+                                         .phyWrite = PHY_DP83825_Write,
+                                         .phyRead = PHY_DP83825_Read,
+                                         .getAutoNegoStatus = PHY_DP83825_GetAutoNegotiationStatus,
+                                         .getLinkStatus = PHY_DP83825_GetLinkStatus,
+                                         .getLinkSpeedDuplex = PHY_DP83825_GetLinkSpeedDuplex,
+                                         .setLinkSpeedDuplex = PHY_DP83825_SetLinkSpeedDuplex,
+                                         .enableLoopback = PHY_DP83825_EnableLoopback};
+
+/*******************************************************************************
+ * Code
+ ******************************************************************************/
+
+status_t PHY_DP83825_Init(phy_handle_t *handle, const phy_config_t *config) {
+    uint32_t counter = PHY_READID_TIMEOUT_COUNT;
+    status_t result = kStatus_Success;
+    uint32_t regValue = 0;
+
+    /* Init MDIO interface. */
+    MDIO_Init(handle->mdioHandle);
+
+    /* Assign phy address. */
+    handle->phyAddr = config->phyAddr;
+
+    /* Check PHY ID. */
+    do
+    {
+        result = MDIO_Read(handle->mdioHandle, handle->phyAddr, PHY_ID1_REG, &regValue);
+        if (result != kStatus_Success) {
+            return result;
+        }
+        counter--;
+    } while ((regValue != PHY_CONTROL_ID1) && (counter != 0U));
+
+    if (counter == 0U) {
+        return kStatus_Fail;
+    }
+
+    /* Reset PHY. */
+    result = MDIO_Write(handle->mdioHandle, handle->phyAddr, PHY_BASICCONTROL_REG, PHY_BCTL_RESET_MASK);
+    if (result == kStatus_Success) {
+        result = MDIO_Read(handle->mdioHandle, handle->phyAddr, PHY_RCSR_REG, &regValue);
+        if (result != kStatus_Success) {
+            return result;
+        }
+        result =
+            MDIO_Write(handle->mdioHandle, handle->phyAddr, PHY_RCSR_REG, (regValue | PYH_RMII_CLOCK_SELECT));
+        if (result != kStatus_Success) {
+            return result;
+        }
+
+        if (config->autoNeg) {
+            /* Set the auto-negotiation then start it. */
+            result =
+                MDIO_Write(handle->mdioHandle, handle->phyAddr, PHY_AUTONEG_ADVERTISE_REG,
+                    (PHY_100BASETX_FULLDUPLEX_MASK | PHY_100BASETX_HALFDUPLEX_MASK |
+                        PHY_10BASETX_FULLDUPLEX_MASK | PHY_10BASETX_HALFDUPLEX_MASK | PHY_IEEE802_3_SELECTOR_MASK));
+            if (result == kStatus_Success) {
+                result = MDIO_Write(handle->mdioHandle, handle->phyAddr, PHY_BASICCONTROL_REG,
+                    (PHY_BCTL_AUTONEG_MASK | PHY_BCTL_RESTART_AUTONEG_MASK));
+            }
+        } else {
+            /* This PHY only supports 10/100M speed. */
+            assert(config->speed <= kPHY_Speed100M);
+
+            /* Disable isolate mode */
+            result = MDIO_Read(handle->mdioHandle, handle->phyAddr, PHY_BASICCONTROL_REG, &regValue);
+            if (result != kStatus_Success) {
+                return result;
+            }
+            regValue &= ~PHY_BCTL_ISOLATE_MASK;
+            result = MDIO_Write(handle->mdioHandle, handle->phyAddr, PHY_BASICCONTROL_REG, regValue);
+            if (result != kStatus_Success) {
+                return result;
+            }
+
+            /* Disable the auto-negotiation and set user-defined speed/duplex configuration. */
+            result = PHY_DP83825_SetLinkSpeedDuplex(handle, config->speed, config->duplex);
+        }
+    }
+    return result;
+}
+
+status_t PHY_DP83825_Write(phy_handle_t *handle, uint32_t phyReg, uint32_t data) {
+    return MDIO_Write(handle->mdioHandle, handle->phyAddr, phyReg, data);
+}
+
+status_t PHY_DP83825_Read(phy_handle_t *handle, uint32_t phyReg, uint32_t *dataPtr) {
+    return MDIO_Read(handle->mdioHandle, handle->phyAddr, phyReg, dataPtr);
+}
+
+status_t PHY_DP83825_GetAutoNegotiationStatus(phy_handle_t *handle, bool *status) {
+    assert(status);
+
+    status_t result;
+    uint32_t regValue;
+
+    *status = false;
+
+    /* Check auto negotiation complete. */
+    result = MDIO_Read(handle->mdioHandle, handle->phyAddr, PHY_BASICSTATUS_REG, &regValue);
+    if (result == kStatus_Success) {
+        if ((regValue & PHY_BSTATUS_AUTONEGCOMP_MASK) != 0U) {
+            *status = true;
+        }
+    }
+    return result;
+}
+
+status_t PHY_DP83825_GetLinkStatus(phy_handle_t *handle, bool *status) {
+    assert(status);
+
+    status_t result;
+    uint32_t regValue;
+
+    /* Read the basic status register. */
+    result = MDIO_Read(handle->mdioHandle, handle->phyAddr, PHY_BASICSTATUS_REG, &regValue);
+    if (result == kStatus_Success) {
+        if ((PHY_BSTATUS_LINKSTATUS_MASK & regValue) != 0U) {
+            /* Link up. */
+            *status = true;
+        } else {
+            /* Link down. */
+            *status = false;
+        }
+    }
+    return result;
+}
+
+status_t PHY_DP83825_GetLinkSpeedDuplex(phy_handle_t *handle, phy_speed_t *speed, phy_duplex_t *duplex) {
+    assert(!((speed == NULL) && (duplex == NULL)));
+
+    status_t result;
+    uint32_t regValue;
+    uint32_t flag;
+
+    /* Read the control register. */
+    result = MDIO_Read(handle->mdioHandle, handle->phyAddr, PHY_PHYSTS_REG, &regValue);
+    if (result == kStatus_Success) {
+        if (speed != NULL) {
+            flag = regValue & PHY_PHYSTS_100M_MASK;
+            if (flag) {
+                *speed = kPHY_Speed10M;
+            } else {
+                *speed = kPHY_Speed100M;
+            }
+        }
+
+        if (duplex != NULL) {
+            flag = regValue & PHY_PHYSTS_DUPLEX_MASK;
+            if (flag) {
+                *duplex = kPHY_FullDuplex;
+            } else {
+                *duplex = kPHY_HalfDuplex;
+            }
+        }
+    }
+    return result;
+}
+
+status_t PHY_DP83825_SetLinkSpeedDuplex(phy_handle_t *handle, phy_speed_t speed, phy_duplex_t duplex) {
+    /* This PHY only supports 10/100M speed. */
+    assert(speed <= kPHY_Speed100M);
+
+    status_t result;
+    uint32_t regValue;
+
+    result = MDIO_Read(handle->mdioHandle, handle->phyAddr, PHY_BASICCONTROL_REG, &regValue);
+    if (result == kStatus_Success) {
+        /* Disable the auto-negotiation and set according to user-defined configuration. */
+        regValue &= ~PHY_BCTL_AUTONEG_MASK;
+        if (speed == kPHY_Speed100M) {
+            regValue |= PHY_BCTL_SPEED0_MASK;
+        } else {
+            regValue &= ~PHY_BCTL_SPEED0_MASK;
+        }
+        if (duplex == kPHY_FullDuplex) {
+            regValue |= PHY_BCTL_DUPLEX_MASK;
+        } else {
+            regValue &= ~PHY_BCTL_DUPLEX_MASK;
+        }
+        result = MDIO_Write(handle->mdioHandle, handle->phyAddr, PHY_BASICCONTROL_REG, regValue);
+    }
+    return result;
+}
+status_t PHY_DP83825_EnableLoopback(phy_handle_t *handle, phy_loop_t mode, phy_speed_t speed, bool enable) {
+    /* This PHY only supports local/remote loopback and 10/100M speed. */
+    assert(mode <= kPHY_RemoteLoop);
+    assert(speed <= kPHY_Speed100M);
+
+    status_t result = kStatus_Success;
+    uint32_t regValue;
+
+    /* Set the loop mode. */
+    if (enable) {
+        if (mode == kPHY_LocalLoop) {
+            if (speed == kPHY_Speed100M) {
+                regValue = PHY_BCTL_SPEED0_MASK | PHY_BCTL_DUPLEX_MASK | PHY_BCTL_LOOP_MASK;
+            } else {
+                regValue = PHY_BCTL_DUPLEX_MASK | PHY_BCTL_LOOP_MASK;
+            }
+            return MDIO_Write(handle->mdioHandle, handle->phyAddr, PHY_BASICCONTROL_REG, regValue);
+        } else {
+            /* Remote loopback only supports 100M full-duplex. */
+            assert(speed == kPHY_Speed100M);
+
+            regValue = PHY_BCTL_SPEED0_MASK | PHY_BCTL_DUPLEX_MASK | PHY_BCTL_LOOP_MASK;
+            result = MDIO_Write(handle->mdioHandle, handle->phyAddr, PHY_BASICCONTROL_REG, regValue);
+            if (result != kStatus_Success) {
+                return result;
+            }
+            /* Set the remote loopback bit. */
+            result = MDIO_Read(handle->mdioHandle, handle->phyAddr, PHY_BISCR_REG, &regValue);
+            if (result == kStatus_Success) {
+                return MDIO_Write(handle->mdioHandle, handle->phyAddr, PHY_BISCR_REG,
+                    (regValue & ~PHY_BISCR_REMOTELOOP_MASK) | PHY_BISCR_REMOTELOOP_MODE);
+            }
+        }
+    } else {
+        /* Disable the loop mode. */
+        if (mode != kPHY_LocalLoop) {
+            /* First read the current status in control one register. */
+            result = MDIO_Read(handle->mdioHandle, handle->phyAddr, PHY_BISCR_REG, &regValue);
+            if (result == kStatus_Success) {
+                return MDIO_Write(handle->mdioHandle, handle->phyAddr, PHY_BISCR_REG,
+                    (regValue & ~PHY_BISCR_REMOTELOOP_MASK));
+            }
+        }
+        /* First read the current status in control register. */
+        result = MDIO_Read(handle->mdioHandle, handle->phyAddr, PHY_BASICCONTROL_REG, &regValue);
+        if (result == kStatus_Success) {
+            regValue &= ~PHY_BCTL_LOOP_MASK;
+            return MDIO_Write(handle->mdioHandle, handle->phyAddr, PHY_BASICCONTROL_REG,
+                (regValue | PHY_BCTL_RESTART_AUTONEG_MASK));
+        }
+    }
+
+    return result;
+}
diff --git a/ports/mimxrt/hal/phy/device/phydp83825/fsl_phydp83825.h b/ports/mimxrt/hal/phy/device/phydp83825/fsl_phydp83825.h
new file mode 100644
index 0000000000000..9d6b4fdf78152
--- /dev/null
+++ b/ports/mimxrt/hal/phy/device/phydp83825/fsl_phydp83825.h
@@ -0,0 +1,163 @@
+/*
+ * Copyright 2020 NXP
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+/*****************************************************************************
+ * PHY DP83825 driver change log
+ *****************************************************************************/
+
+/*!
+@page driver_log Driver Change Log
+
+@section phyksz8081 PHYDP83825
+  The current PHYDP83825 driver version is 2.0.0.
+
+  - 2.0.0
+    - Initial version.
+*/
+
+#ifndef _FSL_DP83825_H_
+#define _FSL_DP83825_H_
+
+#include "fsl_phy.h"
+
+/*!
+ * @addtogroup phy_driver
+ * @{
+ */
+
+/*******************************************************************************
+ * Definitions
+ ******************************************************************************/
+
+/*! @brief PHY driver version */
+#define FSL_PHY_DRIVER_VERSION (MAKE_VERSION(2, 0, 0))
+
+/*! @brief PHY operations structure. */
+extern const phy_operations_t phydp83825_ops;
+
+/*******************************************************************************
+ * API
+ ******************************************************************************/
+
+#if defined(__cplusplus)
+extern "C" {
+#endif
+
+/*!
+ * @name PHY Driver
+ * @{
+ */
+
+/*!
+ * @brief Initializes PHY.
+ *
+ *  This function initialize PHY.
+ *
+ * @param handle       PHY device handle.
+ * @param config       Pointer to structure of phy_config_t.
+ * @retval kStatus_Success  PHY initialization succeeds
+ * @retval kStatus_Fail  PHY initialization fails
+ * @retval kStatus_PHY_SMIVisitTimeout  PHY SMI visit time out
+ */
+status_t PHY_DP83825_Init(phy_handle_t *handle, const phy_config_t *config);
+
+/*!
+ * @brief PHY Write function. This function writes data over the SMI to
+ * the specified PHY register. This function is called by all PHY interfaces.
+ *
+ * @param handle  PHY device handle.
+ * @param phyReg  The PHY register.
+ * @param data    The data written to the PHY register.
+ * @retval kStatus_Success     PHY write success
+ * @retval kStatus_PHY_SMIVisitTimeout  PHY SMI visit time out
+ */
+status_t PHY_DP83825_Write(phy_handle_t *handle, uint32_t phyReg, uint32_t data);
+
+/*!
+ * @brief PHY Read function. This interface read data over the SMI from the
+ * specified PHY register. This function is called by all PHY interfaces.
+ *
+ * @param handle   PHY device handle.
+ * @param phyReg   The PHY register.
+ * @param dataPtr  The address to store the data read from the PHY register.
+ * @retval kStatus_Success  PHY read success
+ * @retval kStatus_PHY_SMIVisitTimeout  PHY SMI visit time out
+ */
+status_t PHY_DP83825_Read(phy_handle_t *handle, uint32_t phyReg, uint32_t *dataPtr);
+
+/*!
+ * @brief Gets the PHY auto-negotiation status.
+ *
+ * @param handle   PHY device handle.
+ * @param status   The auto-negotiation status of the PHY.
+ *         - true the auto-negotiation is over.
+ *         - false the auto-negotiation is on-going or not started.
+ * @retval kStatus_Success   PHY gets status success
+ * @retval kStatus_PHY_SMIVisitTimeout  PHY SMI visit time out
+ */
+status_t PHY_DP83825_GetAutoNegotiationStatus(phy_handle_t *handle, bool *status);
+
+/*!
+ * @brief Gets the PHY link status.
+ *
+ * @param handle   PHY device handle.
+ * @param status   The link up or down status of the PHY.
+ *         - true the link is up.
+ *         - false the link is down.
+ * @retval kStatus_Success   PHY gets link status success
+ * @retval kStatus_PHY_SMIVisitTimeout  PHY SMI visit time out
+ */
+status_t PHY_DP83825_GetLinkStatus(phy_handle_t *handle, bool *status);
+
+/*!
+ * @brief Gets the PHY link speed and duplex.
+ *
+ * @brief This function gets the speed and duplex mode of PHY. User can give one of speed
+ * and duplex address paramter and set the other as NULL if only wants to get one of them.
+ *
+ * @param handle   PHY device handle.
+ * @param speed    The address of PHY link speed.
+ * @param duplex   The link duplex of PHY.
+ * @retval kStatus_Success   PHY gets link speed and duplex success
+ * @retval kStatus_PHY_SMIVisitTimeout  PHY SMI visit time out
+ */
+status_t PHY_DP83825_GetLinkSpeedDuplex(phy_handle_t *handle, phy_speed_t *speed, phy_duplex_t *duplex);
+
+/*!
+ * @brief Sets the PHY link speed and duplex.
+ *
+ * @param handle   PHY device handle.
+ * @param speed    Specified PHY link speed.
+ * @param duplex   Specified PHY link duplex.
+ * @retval kStatus_Success   PHY gets status success
+ * @retval kStatus_PHY_SMIVisitTimeout  PHY SMI visit time out
+ */
+status_t PHY_DP83825_SetLinkSpeedDuplex(phy_handle_t *handle, phy_speed_t speed, phy_duplex_t duplex);
+
+/*!
+ * @brief Enables/disables PHY loopback.
+ *
+ * @param handle   PHY device handle.
+ * @param mode     The loopback mode to be enabled, please see "phy_loop_t".
+ * All loopback modes should not be set together, when one loopback mode is set
+ * another should be disabled.
+ * @param speed    PHY speed for loopback mode.
+ * @param enable   True to enable, false to disable.
+ * @retval kStatus_Success  PHY loopback success
+ * @retval kStatus_PHY_SMIVisitTimeout  PHY SMI visit time out
+ */
+status_t PHY_DP83825_EnableLoopback(phy_handle_t *handle, phy_loop_t mode, phy_speed_t speed, bool enable);
+
+/* @} */
+
+#if defined(__cplusplus)
+}
+#endif
+
+/*! @}*/
+
+#endif /* _FSL_DP83825_H_ */
diff --git a/ports/mimxrt/hal/phy/device/phyksz8081/fsl_phyksz8081.c b/ports/mimxrt/hal/phy/device/phyksz8081/fsl_phyksz8081.c
new file mode 100644
index 0000000000000..32cabacdb6ed9
--- /dev/null
+++ b/ports/mimxrt/hal/phy/device/phyksz8081/fsl_phyksz8081.c
@@ -0,0 +1,284 @@
+/*
+ * Copyright 2020 NXP
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#include "fsl_phyksz8081.h"
+
+/*******************************************************************************
+ * Definitions
+ ******************************************************************************/
+
+/*! @brief Defines the PHY KSZ8081 vendor defined registers. */
+#define PHY_CONTROL1_REG 0x1EU /*!< The PHY control one register. */
+#define PHY_CONTROL2_REG 0x1FU /*!< The PHY control two register. */
+
+/*! @brief Defines the PHY KSZ8081 ID number. */
+#define PHY_CONTROL_ID1 0x22U /*!< The PHY ID1 */
+
+/*! @brief Defines the mask flag of operation mode in control registers */
+#define PHY_CTL2_REMOTELOOP_MASK    0x0004U /*!< The PHY remote loopback mask. */
+#define PHY_CTL2_REFCLK_SELECT_MASK 0x0080U /*!< The PHY RMII reference clock select. */
+#define PHY_CTL1_10HALFDUPLEX_MASK  0x0001U /*!< The PHY 10M half duplex mask. */
+#define PHY_CTL1_100HALFDUPLEX_MASK 0x0002U /*!< The PHY 100M half duplex mask. */
+#define PHY_CTL1_10FULLDUPLEX_MASK  0x0005U /*!< The PHY 10M full duplex mask. */
+#define PHY_CTL1_100FULLDUPLEX_MASK 0x0006U /*!< The PHY 100M full duplex mask. */
+#define PHY_CTL1_SPEEDUPLX_MASK     0x0007U /*!< The PHY speed and duplex mask. */
+#define PHY_CTL1_ENERGYDETECT_MASK  0x10U   /*!< The PHY signal present on rx differential pair. */
+#define PHY_CTL1_LINKUP_MASK        0x100U  /*!< The PHY link up. */
+#define PHY_LINK_READY_MASK         (PHY_CTL1_ENERGYDETECT_MASK | PHY_CTL1_LINKUP_MASK)
+
+/*! @brief Defines the timeout macro. */
+#define PHY_READID_TIMEOUT_COUNT 1000U
+
+/*******************************************************************************
+ * Prototypes
+ ******************************************************************************/
+
+/*******************************************************************************
+ * Variables
+ ******************************************************************************/
+const phy_operations_t phyksz8081_ops = {.phyInit = PHY_KSZ8081_Init,
+                                         .phyWrite = PHY_KSZ8081_Write,
+                                         .phyRead = PHY_KSZ8081_Read,
+                                         .getAutoNegoStatus = PHY_KSZ8081_GetAutoNegotiationStatus,
+                                         .getLinkStatus = PHY_KSZ8081_GetLinkStatus,
+                                         .getLinkSpeedDuplex = PHY_KSZ8081_GetLinkSpeedDuplex,
+                                         .setLinkSpeedDuplex = PHY_KSZ8081_SetLinkSpeedDuplex,
+                                         .enableLoopback = PHY_KSZ8081_EnableLoopback};
+
+/*******************************************************************************
+ * Code
+ ******************************************************************************/
+
+status_t PHY_KSZ8081_Init(phy_handle_t *handle, const phy_config_t *config) {
+    uint32_t counter = PHY_READID_TIMEOUT_COUNT;
+    status_t result = kStatus_Success;
+    uint32_t regValue = 0;
+
+    /* Init MDIO interface. */
+    MDIO_Init(handle->mdioHandle);
+
+    /* Assign phy address. */
+    handle->phyAddr = config->phyAddr;
+
+    /* Check PHY ID. */
+    do
+    {
+        result = MDIO_Read(handle->mdioHandle, handle->phyAddr, PHY_ID1_REG, &regValue);
+        if (result != kStatus_Success) {
+            return result;
+        }
+        counter--;
+    } while ((regValue != PHY_CONTROL_ID1) && (counter != 0U));
+
+    if (counter == 0U) {
+        return kStatus_Fail;
+    }
+
+    /* Reset PHY. */
+    result = MDIO_Write(handle->mdioHandle, handle->phyAddr, PHY_BASICCONTROL_REG, PHY_BCTL_RESET_MASK);
+    if (result == kStatus_Success) {
+        #if defined(FSL_FEATURE_PHYKSZ8081_USE_RMII50M_MODE)
+        result = MDIO_Read(handle->mdioHandle, handle->phyAddr, PHY_CONTROL2_REG, &regValue);
+        if (result != kStatus_Success) {
+            return result;
+        }
+        result =
+            MDIO_Write(handle->mdioHandle, handle->phyAddr, PHY_CONTROL2_REG, (regValue | PHY_CTL2_REFCLK_SELECT_MASK));
+        if (result != kStatus_Success) {
+            return result;
+        }
+        #endif /* FSL_FEATURE_PHYKSZ8081_USE_RMII50M_MODE */
+
+        if (config->autoNeg) {
+            /* Set the auto-negotiation then start it. */
+            result =
+                MDIO_Write(handle->mdioHandle, handle->phyAddr, PHY_AUTONEG_ADVERTISE_REG,
+                    (PHY_100BASETX_FULLDUPLEX_MASK | PHY_100BASETX_HALFDUPLEX_MASK |
+                        PHY_10BASETX_FULLDUPLEX_MASK | PHY_10BASETX_HALFDUPLEX_MASK | PHY_IEEE802_3_SELECTOR_MASK));
+            if (result == kStatus_Success) {
+                result = MDIO_Write(handle->mdioHandle, handle->phyAddr, PHY_BASICCONTROL_REG,
+                    (PHY_BCTL_AUTONEG_MASK | PHY_BCTL_RESTART_AUTONEG_MASK));
+            }
+        } else {
+            /* This PHY only supports 10/100M speed. */
+            assert(config->speed <= kPHY_Speed100M);
+
+            /* Disable isolate mode */
+            result = MDIO_Read(handle->mdioHandle, handle->phyAddr, PHY_BASICCONTROL_REG, &regValue);
+            if (result != kStatus_Success) {
+                return result;
+            }
+            regValue &= ~PHY_BCTL_ISOLATE_MASK;
+            result = MDIO_Write(handle->mdioHandle, handle->phyAddr, PHY_BASICCONTROL_REG, regValue);
+            if (result != kStatus_Success) {
+                return result;
+            }
+
+            /* Disable the auto-negotiation and set user-defined speed/duplex configuration. */
+            result = PHY_KSZ8081_SetLinkSpeedDuplex(handle, config->speed, config->duplex);
+        }
+    }
+    return result;
+}
+
+status_t PHY_KSZ8081_Write(phy_handle_t *handle, uint32_t phyReg, uint32_t data) {
+    return MDIO_Write(handle->mdioHandle, handle->phyAddr, phyReg, data);
+}
+
+status_t PHY_KSZ8081_Read(phy_handle_t *handle, uint32_t phyReg, uint32_t *dataPtr) {
+    return MDIO_Read(handle->mdioHandle, handle->phyAddr, phyReg, dataPtr);
+}
+
+status_t PHY_KSZ8081_GetAutoNegotiationStatus(phy_handle_t *handle, bool *status) {
+    assert(status);
+
+    status_t result;
+    uint32_t regValue;
+
+    *status = false;
+
+    /* Check auto negotiation complete. */
+    result = MDIO_Read(handle->mdioHandle, handle->phyAddr, PHY_BASICSTATUS_REG, &regValue);
+    if (result == kStatus_Success) {
+        if ((regValue & PHY_BSTATUS_AUTONEGCOMP_MASK) != 0U) {
+            *status = true;
+        }
+    }
+    return result;
+}
+
+status_t PHY_KSZ8081_GetLinkStatus(phy_handle_t *handle, bool *status) {
+    assert(status);
+
+    status_t result;
+    uint32_t regValue;
+
+    /* Read the basic status register. */
+    result = MDIO_Read(handle->mdioHandle, handle->phyAddr, PHY_BASICSTATUS_REG, &regValue);
+    if (result == kStatus_Success) {
+        if ((PHY_BSTATUS_LINKSTATUS_MASK & regValue) != 0U) {
+            /* Link up. */
+            *status = true;
+        } else {
+            /* Link down. */
+            *status = false;
+        }
+    }
+    return result;
+}
+
+status_t PHY_KSZ8081_GetLinkSpeedDuplex(phy_handle_t *handle, phy_speed_t *speed, phy_duplex_t *duplex) {
+    assert(!((speed == NULL) && (duplex == NULL)));
+
+    status_t result;
+    uint32_t regValue;
+    uint32_t flag;
+
+    /* Read the control register. */
+    result = MDIO_Read(handle->mdioHandle, handle->phyAddr, PHY_CONTROL1_REG, &regValue);
+    if (result == kStatus_Success) {
+        if (speed != NULL) {
+            flag = regValue & PHY_CTL1_SPEEDUPLX_MASK;
+            if ((PHY_CTL1_100HALFDUPLEX_MASK == flag) || (PHY_CTL1_100FULLDUPLEX_MASK == flag)) {
+                *speed = kPHY_Speed100M;
+            } else {
+                *speed = kPHY_Speed10M;
+            }
+        }
+
+        if (duplex != NULL) {
+            flag = regValue & PHY_CTL1_SPEEDUPLX_MASK;
+            if ((PHY_CTL1_10FULLDUPLEX_MASK == flag) || (PHY_CTL1_100FULLDUPLEX_MASK == flag)) {
+                *duplex = kPHY_FullDuplex;
+            } else {
+                *duplex = kPHY_HalfDuplex;
+            }
+        }
+    }
+    return result;
+}
+
+status_t PHY_KSZ8081_SetLinkSpeedDuplex(phy_handle_t *handle, phy_speed_t speed, phy_duplex_t duplex) {
+    /* This PHY only supports 10/100M speed. */
+    assert(speed <= kPHY_Speed100M);
+
+    status_t result;
+    uint32_t regValue;
+
+    result = MDIO_Read(handle->mdioHandle, handle->phyAddr, PHY_BASICCONTROL_REG, &regValue);
+    if (result == kStatus_Success) {
+        /* Disable the auto-negotiation and set according to user-defined configuration. */
+        regValue &= ~PHY_BCTL_AUTONEG_MASK;
+        if (speed == kPHY_Speed100M) {
+            regValue |= PHY_BCTL_SPEED0_MASK;
+        } else {
+            regValue &= ~PHY_BCTL_SPEED0_MASK;
+        }
+        if (duplex == kPHY_FullDuplex) {
+            regValue |= PHY_BCTL_DUPLEX_MASK;
+        } else {
+            regValue &= ~PHY_BCTL_DUPLEX_MASK;
+        }
+        result = MDIO_Write(handle->mdioHandle, handle->phyAddr, PHY_BASICCONTROL_REG, regValue);
+    }
+    return result;
+}
+
+status_t PHY_KSZ8081_EnableLoopback(phy_handle_t *handle, phy_loop_t mode, phy_speed_t speed, bool enable) {
+    /* This PHY only supports local/remote loopback and 10/100M speed. */
+    assert(mode <= kPHY_RemoteLoop);
+    assert(speed <= kPHY_Speed100M);
+
+    status_t result;
+    uint32_t regValue;
+
+    /* Set the loop mode. */
+    if (enable) {
+        if (mode == kPHY_LocalLoop) {
+            if (speed == kPHY_Speed100M) {
+                regValue = PHY_BCTL_SPEED0_MASK | PHY_BCTL_DUPLEX_MASK | PHY_BCTL_LOOP_MASK;
+            } else {
+                regValue = PHY_BCTL_DUPLEX_MASK | PHY_BCTL_LOOP_MASK;
+            }
+            return MDIO_Write(handle->mdioHandle, handle->phyAddr, PHY_BASICCONTROL_REG, regValue);
+        } else {
+            /* Remote loopback only supports 100M full-duplex. */
+            assert(speed == kPHY_Speed100M);
+
+            regValue = PHY_BCTL_SPEED0_MASK | PHY_BCTL_DUPLEX_MASK | PHY_BCTL_LOOP_MASK;
+            result = MDIO_Write(handle->mdioHandle, handle->phyAddr, PHY_BASICCONTROL_REG, regValue);
+            if (result != kStatus_Success) {
+                return result;
+            }
+            /* Set the remote loopback bit. */
+            result = MDIO_Read(handle->mdioHandle, handle->phyAddr, PHY_CONTROL2_REG, &regValue);
+            if (result == kStatus_Success) {
+                return MDIO_Write(handle->mdioHandle, handle->phyAddr, PHY_CONTROL2_REG,
+                    (regValue | PHY_CTL2_REMOTELOOP_MASK));
+            }
+        }
+    } else {
+        /* Disable the loop mode. */
+        if (mode == kPHY_LocalLoop) {
+            /* First read the current status in control register. */
+            result = MDIO_Read(handle->mdioHandle, handle->phyAddr, PHY_BASICCONTROL_REG, &regValue);
+            if (result == kStatus_Success) {
+                regValue &= ~PHY_BCTL_LOOP_MASK;
+                return MDIO_Write(handle->mdioHandle, handle->phyAddr, PHY_BASICCONTROL_REG,
+                    (regValue | PHY_BCTL_RESTART_AUTONEG_MASK));
+            }
+        } else {
+            /* First read the current status in control one register. */
+            result = MDIO_Read(handle->mdioHandle, handle->phyAddr, PHY_CONTROL2_REG, &regValue);
+            if (result == kStatus_Success) {
+                return MDIO_Write(handle->mdioHandle, handle->phyAddr, PHY_CONTROL2_REG,
+                    (regValue & ~PHY_CTL2_REMOTELOOP_MASK));
+            }
+        }
+    }
+    return result;
+}
diff --git a/ports/mimxrt/hal/phy/device/phyksz8081/fsl_phyksz8081.h b/ports/mimxrt/hal/phy/device/phyksz8081/fsl_phyksz8081.h
new file mode 100644
index 0000000000000..5b93c5698a6b1
--- /dev/null
+++ b/ports/mimxrt/hal/phy/device/phyksz8081/fsl_phyksz8081.h
@@ -0,0 +1,163 @@
+/*
+ * Copyright 2020 NXP
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+/*****************************************************************************
+ * PHY KSZ8081 driver change log
+ *****************************************************************************/
+
+/*!
+@page driver_log Driver Change Log
+
+@section phyksz8081 PHYKSZ8081
+  The current PHYKSZ8081 driver version is 2.0.0.
+
+  - 2.0.0
+    - Initial version.
+*/
+
+#ifndef _FSL_PHYKSZ8081_H_
+#define _FSL_PHYKSZ8081_H_
+
+#include "fsl_phy.h"
+
+/*!
+ * @addtogroup phy_driver
+ * @{
+ */
+
+/*******************************************************************************
+ * Definitions
+ ******************************************************************************/
+
+/*! @brief PHY driver version */
+#define FSL_PHY_DRIVER_VERSION (MAKE_VERSION(2, 0, 0))
+
+/*! @brief PHY operations structure. */
+extern const phy_operations_t phyksz8081_ops;
+
+/*******************************************************************************
+ * API
+ ******************************************************************************/
+
+#if defined(__cplusplus)
+extern "C" {
+#endif
+
+/*!
+ * @name PHY Driver
+ * @{
+ */
+
+/*!
+ * @brief Initializes PHY.
+ *
+ *  This function initialize PHY.
+ *
+ * @param handle       PHY device handle.
+ * @param config       Pointer to structure of phy_config_t.
+ * @retval kStatus_Success  PHY initialization succeeds
+ * @retval kStatus_Fail  PHY initialization fails
+ * @retval kStatus_PHY_SMIVisitTimeout  PHY SMI visit time out
+ */
+status_t PHY_KSZ8081_Init(phy_handle_t *handle, const phy_config_t *config);
+
+/*!
+ * @brief PHY Write function. This function writes data over the SMI to
+ * the specified PHY register. This function is called by all PHY interfaces.
+ *
+ * @param handle  PHY device handle.
+ * @param phyReg  The PHY register.
+ * @param data    The data written to the PHY register.
+ * @retval kStatus_Success     PHY write success
+ * @retval kStatus_PHY_SMIVisitTimeout  PHY SMI visit time out
+ */
+status_t PHY_KSZ8081_Write(phy_handle_t *handle, uint32_t phyReg, uint32_t data);
+
+/*!
+ * @brief PHY Read function. This interface read data over the SMI from the
+ * specified PHY register. This function is called by all PHY interfaces.
+ *
+ * @param handle   PHY device handle.
+ * @param phyReg   The PHY register.
+ * @param dataPtr  The address to store the data read from the PHY register.
+ * @retval kStatus_Success  PHY read success
+ * @retval kStatus_PHY_SMIVisitTimeout  PHY SMI visit time out
+ */
+status_t PHY_KSZ8081_Read(phy_handle_t *handle, uint32_t phyReg, uint32_t *dataPtr);
+
+/*!
+ * @brief Gets the PHY auto-negotiation status.
+ *
+ * @param handle   PHY device handle.
+ * @param status   The auto-negotiation status of the PHY.
+ *         - true the auto-negotiation is over.
+ *         - false the auto-negotiation is on-going or not started.
+ * @retval kStatus_Success   PHY gets status success
+ * @retval kStatus_PHY_SMIVisitTimeout  PHY SMI visit time out
+ */
+status_t PHY_KSZ8081_GetAutoNegotiationStatus(phy_handle_t *handle, bool *status);
+
+/*!
+ * @brief Gets the PHY link status.
+ *
+ * @param handle   PHY device handle.
+ * @param status   The link up or down status of the PHY.
+ *         - true the link is up.
+ *         - false the link is down.
+ * @retval kStatus_Success   PHY gets link status success
+ * @retval kStatus_PHY_SMIVisitTimeout  PHY SMI visit time out
+ */
+status_t PHY_KSZ8081_GetLinkStatus(phy_handle_t *handle, bool *status);
+
+/*!
+ * @brief Gets the PHY link speed and duplex.
+ *
+ * @brief This function gets the speed and duplex mode of PHY. User can give one of speed
+ * and duplex address paramter and set the other as NULL if only wants to get one of them.
+ *
+ * @param handle   PHY device handle.
+ * @param speed    The address of PHY link speed.
+ * @param duplex   The link duplex of PHY.
+ * @retval kStatus_Success   PHY gets link speed and duplex success
+ * @retval kStatus_PHY_SMIVisitTimeout  PHY SMI visit time out
+ */
+status_t PHY_KSZ8081_GetLinkSpeedDuplex(phy_handle_t *handle, phy_speed_t *speed, phy_duplex_t *duplex);
+
+/*!
+ * @brief Sets the PHY link speed and duplex.
+ *
+ * @param handle   PHY device handle.
+ * @param speed    Specified PHY link speed.
+ * @param duplex   Specified PHY link duplex.
+ * @retval kStatus_Success   PHY gets status success
+ * @retval kStatus_PHY_SMIVisitTimeout  PHY SMI visit time out
+ */
+status_t PHY_KSZ8081_SetLinkSpeedDuplex(phy_handle_t *handle, phy_speed_t speed, phy_duplex_t duplex);
+
+/*!
+ * @brief Enables/disables PHY loopback.
+ *
+ * @param handle   PHY device handle.
+ * @param mode     The loopback mode to be enabled, please see "phy_loop_t".
+ * All loopback modes should not be set together, when one loopback mode is set
+ * another should be disabled.
+ * @param speed    PHY speed for loopback mode.
+ * @param enable   True to enable, false to disable.
+ * @retval kStatus_Success  PHY loopback success
+ * @retval kStatus_PHY_SMIVisitTimeout  PHY SMI visit time out
+ */
+status_t PHY_KSZ8081_EnableLoopback(phy_handle_t *handle, phy_loop_t mode, phy_speed_t speed, bool enable);
+
+/* @} */
+
+#if defined(__cplusplus)
+}
+#endif
+
+/*! @}*/
+
+#endif /* _FSL_PHYKSZ8081_H_ */
diff --git a/ports/mimxrt/hal/phy/device/phylan8720/fsl_phylan8720.c b/ports/mimxrt/hal/phy/device/phylan8720/fsl_phylan8720.c
new file mode 100644
index 0000000000000..b7435c2d0593b
--- /dev/null
+++ b/ports/mimxrt/hal/phy/device/phylan8720/fsl_phylan8720.c
@@ -0,0 +1,271 @@
+/*
+ * Copyright 2020 NXP
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#include "fsl_phylan8720.h"
+
+/*******************************************************************************
+ * Definitions
+ ******************************************************************************/
+
+/*! @brief Defines the PHY LAN8720 vendor defined registers. */
+#define PHY_PHYSTS_REG   0x1FU // Phy status register
+#define PHY_MCSR_REG     0x11U // Mode Control/Status Register for loopback
+
+/*! @brief Defines the PHY LAN8720 ID number. */
+#define PHY_CONTROL_ID1 0x07U /*!< The PHY ID1 */
+
+/*! @brief Defines the mask flag of operation mode in control registers */
+#define PHY_PHYSTS_MASK               0x001CU /*!< The PHY Status mask. */
+#define PHY_PHYSTS_DUPLEX_MASK        0x0010U /*!< The PHY full duplex mask. */
+#define PHY_PHYSTS_100M_MASK          0x000CU /*!< The PHY 100M mask. */
+#define PHY_PHYSTS_100M_FLAG          0x0008U /*!< The PHY 100M flag. */
+#define PHY_PHYSTS_LINK_MASK          0x0001U /*!< The PHY link up mask. */
+
+#define PHY_MCSR_REMOTELOOP_MASK     0x100U // !< The PHY remote loopback mask.
+#define PHY_MCSR_REMOTELOOP_MODE     0x100U // !< The PHY remote loopback mode.
+
+/*! @brief Defines the timeout macro. */
+#define PHY_READID_TIMEOUT_COUNT 1000U
+
+/*******************************************************************************
+ * Prototypes
+ ******************************************************************************/
+
+/*******************************************************************************
+ * Variables
+ ******************************************************************************/
+const phy_operations_t phylan8720_ops = {.phyInit = PHY_LAN8720_Init,
+                                         .phyWrite = PHY_LAN8720_Write,
+                                         .phyRead = PHY_LAN8720_Read,
+                                         .getAutoNegoStatus = PHY_LAN8720_GetAutoNegotiationStatus,
+                                         .getLinkStatus = PHY_LAN8720_GetLinkStatus,
+                                         .getLinkSpeedDuplex = PHY_LAN8720_GetLinkSpeedDuplex,
+                                         .setLinkSpeedDuplex = PHY_LAN8720_SetLinkSpeedDuplex,
+                                         .enableLoopback = PHY_LAN8720_EnableLoopback};
+
+/*******************************************************************************
+ * Code
+ ******************************************************************************/
+
+status_t PHY_LAN8720_Init(phy_handle_t *handle, const phy_config_t *config) {
+    uint32_t counter = PHY_READID_TIMEOUT_COUNT;
+    status_t result = kStatus_Success;
+    uint32_t regValue = 0;
+
+    /* Init MDIO interface. */
+    MDIO_Init(handle->mdioHandle);
+
+    /* Assign phy address. */
+    handle->phyAddr = config->phyAddr;
+
+    /* Check PHY ID. */
+    do
+    {
+        result = MDIO_Read(handle->mdioHandle, handle->phyAddr, PHY_ID1_REG, &regValue);
+        if (result != kStatus_Success) {
+            return result;
+        }
+        counter--;
+    } while ((regValue != PHY_CONTROL_ID1) && (counter != 0U));
+
+    if (counter == 0U) {
+        return kStatus_Fail;
+    }
+
+    /* Reset PHY. */
+    result = MDIO_Write(handle->mdioHandle, handle->phyAddr, PHY_BASICCONTROL_REG, PHY_BCTL_RESET_MASK);
+    if (result == kStatus_Success) {
+        if (config->autoNeg) {
+            /* Set the auto-negotiation then start it. */
+            result =
+                MDIO_Write(handle->mdioHandle, handle->phyAddr, PHY_AUTONEG_ADVERTISE_REG,
+                    (PHY_100BASETX_FULLDUPLEX_MASK | PHY_100BASETX_HALFDUPLEX_MASK |
+                        PHY_10BASETX_FULLDUPLEX_MASK | PHY_10BASETX_HALFDUPLEX_MASK | PHY_IEEE802_3_SELECTOR_MASK));
+            if (result == kStatus_Success) {
+                result = MDIO_Write(handle->mdioHandle, handle->phyAddr, PHY_BASICCONTROL_REG,
+                    (PHY_BCTL_AUTONEG_MASK | PHY_BCTL_RESTART_AUTONEG_MASK));
+            }
+        } else {
+            /* This PHY only supports 10/100M speed. */
+            assert(config->speed <= kPHY_Speed100M);
+
+            /* Disable isolate mode */
+            result = MDIO_Read(handle->mdioHandle, handle->phyAddr, PHY_BASICCONTROL_REG, &regValue);
+            if (result != kStatus_Success) {
+                return result;
+            }
+            regValue &= ~PHY_BCTL_ISOLATE_MASK;
+            result = MDIO_Write(handle->mdioHandle, handle->phyAddr, PHY_BASICCONTROL_REG, regValue);
+            if (result != kStatus_Success) {
+                return result;
+            }
+
+            /* Disable the auto-negotiation and set user-defined speed/duplex configuration. */
+            result = PHY_LAN8720_SetLinkSpeedDuplex(handle, config->speed, config->duplex);
+        }
+    }
+    return result;
+}
+
+status_t PHY_LAN8720_Write(phy_handle_t *handle, uint32_t phyReg, uint32_t data) {
+    return MDIO_Write(handle->mdioHandle, handle->phyAddr, phyReg, data);
+}
+
+status_t PHY_LAN8720_Read(phy_handle_t *handle, uint32_t phyReg, uint32_t *dataPtr) {
+    return MDIO_Read(handle->mdioHandle, handle->phyAddr, phyReg, dataPtr);
+}
+
+status_t PHY_LAN8720_GetAutoNegotiationStatus(phy_handle_t *handle, bool *status) {
+    assert(status);
+
+    status_t result;
+    uint32_t regValue;
+
+    *status = false;
+
+    /* Check auto negotiation complete. */
+    result = MDIO_Read(handle->mdioHandle, handle->phyAddr, PHY_BASICSTATUS_REG, &regValue);
+    if (result == kStatus_Success) {
+        if ((regValue & PHY_BSTATUS_AUTONEGCOMP_MASK) != 0U) {
+            *status = true;
+        }
+    }
+    return result;
+}
+
+status_t PHY_LAN8720_GetLinkStatus(phy_handle_t *handle, bool *status) {
+    assert(status);
+
+    status_t result;
+    uint32_t regValue;
+
+    /* Read the basic status register. */
+    result = MDIO_Read(handle->mdioHandle, handle->phyAddr, PHY_BASICSTATUS_REG, &regValue);
+    if (result == kStatus_Success) {
+        if ((PHY_BSTATUS_LINKSTATUS_MASK & regValue) != 0U) {
+            /* Link up. */
+            *status = true;
+        } else {
+            /* Link down. */
+            *status = false;
+        }
+    }
+    return result;
+}
+
+status_t PHY_LAN8720_GetLinkSpeedDuplex(phy_handle_t *handle, phy_speed_t *speed, phy_duplex_t *duplex) {
+    assert(!((speed == NULL) && (duplex == NULL)));
+
+    status_t result;
+    uint32_t regValue;
+    uint32_t flag;
+
+    /* Read the control register. */
+    result = MDIO_Read(handle->mdioHandle, handle->phyAddr, PHY_PHYSTS_REG, &regValue);
+    if (result == kStatus_Success) {
+        regValue &= PHY_PHYSTS_MASK;
+        if (speed != NULL) {
+            flag = regValue & PHY_PHYSTS_100M_MASK;
+            if (flag == PHY_PHYSTS_100M_FLAG) {
+                *speed = kPHY_Speed100M;
+            } else {
+                *speed = kPHY_Speed10M;
+            }
+        }
+
+        if (duplex != NULL) {
+            flag = regValue & PHY_PHYSTS_DUPLEX_MASK;
+            if (flag) {
+                *duplex = kPHY_FullDuplex;
+            } else {
+                *duplex = kPHY_HalfDuplex;
+            }
+        }
+    }
+    return result;
+}
+
+status_t PHY_LAN8720_SetLinkSpeedDuplex(phy_handle_t *handle, phy_speed_t speed, phy_duplex_t duplex) {
+    /* This PHY only supports 10/100M speed. */
+    assert(speed <= kPHY_Speed100M);
+
+    status_t result;
+    uint32_t regValue;
+
+    result = MDIO_Read(handle->mdioHandle, handle->phyAddr, PHY_BASICCONTROL_REG, &regValue);
+    if (result == kStatus_Success) {
+        /* Disable the auto-negotiation and set according to user-defined configuration. */
+        regValue &= ~PHY_BCTL_AUTONEG_MASK;
+        if (speed == kPHY_Speed100M) {
+            regValue |= PHY_BCTL_SPEED0_MASK;
+        } else {
+            regValue &= ~PHY_BCTL_SPEED0_MASK;
+        }
+        if (duplex == kPHY_FullDuplex) {
+            regValue |= PHY_BCTL_DUPLEX_MASK;
+        } else {
+            regValue &= ~PHY_BCTL_DUPLEX_MASK;
+        }
+        result = MDIO_Write(handle->mdioHandle, handle->phyAddr, PHY_BASICCONTROL_REG, regValue);
+    }
+    return result;
+}
+
+status_t PHY_LAN8720_EnableLoopback(phy_handle_t *handle, phy_loop_t mode, phy_speed_t speed, bool enable) {
+    /* This PHY only supports local/remote loopback and 10/100M speed. */
+    assert(mode <= kPHY_RemoteLoop);
+    assert(speed <= kPHY_Speed100M);
+
+    status_t result = kStatus_Success;
+    uint32_t regValue;
+
+    /* Set the loop mode. */
+    if (enable) {
+        if (mode == kPHY_LocalLoop) {
+            if (speed == kPHY_Speed100M) {
+                regValue = PHY_BCTL_SPEED0_MASK | PHY_BCTL_DUPLEX_MASK | PHY_BCTL_LOOP_MASK;
+            } else {
+                regValue = PHY_BCTL_DUPLEX_MASK | PHY_BCTL_LOOP_MASK;
+            }
+            return MDIO_Write(handle->mdioHandle, handle->phyAddr, PHY_BASICCONTROL_REG, regValue);
+        } else {
+            /* Remote loopback only supports 100M full-duplex. */
+            assert(speed == kPHY_Speed100M);
+
+            regValue = PHY_BCTL_SPEED0_MASK | PHY_BCTL_DUPLEX_MASK | PHY_BCTL_LOOP_MASK;
+            result = MDIO_Write(handle->mdioHandle, handle->phyAddr, PHY_BASICCONTROL_REG, regValue);
+            if (result != kStatus_Success) {
+                return result;
+            }
+            /* Set the remote loopback bit. */
+            result = MDIO_Read(handle->mdioHandle, handle->phyAddr, PHY_MCSR_REG, &regValue);
+            if (result == kStatus_Success) {
+                return MDIO_Write(handle->mdioHandle, handle->phyAddr, PHY_MCSR_REG,
+                    (regValue & ~PHY_MCSR_REMOTELOOP_MASK) | PHY_MCSR_REMOTELOOP_MODE);
+            }
+        }
+    } else {
+        /* Disable the loop mode. */
+        if (mode != kPHY_LocalLoop) {
+            /* First read the current status in control one register. */
+            result = MDIO_Read(handle->mdioHandle, handle->phyAddr, PHY_MCSR_REG, &regValue);
+            if (result == kStatus_Success) {
+                return MDIO_Write(handle->mdioHandle, handle->phyAddr, PHY_MCSR_REG,
+                    (regValue & ~PHY_MCSR_REMOTELOOP_MASK));
+            }
+        }
+        /* First read the current status in control register. */
+        result = MDIO_Read(handle->mdioHandle, handle->phyAddr, PHY_BASICCONTROL_REG, &regValue);
+        if (result == kStatus_Success) {
+            regValue &= ~PHY_BCTL_LOOP_MASK;
+            return MDIO_Write(handle->mdioHandle, handle->phyAddr, PHY_BASICCONTROL_REG,
+                (regValue | PHY_BCTL_RESTART_AUTONEG_MASK));
+        }
+    }
+
+    return result;
+}
diff --git a/ports/mimxrt/hal/phy/device/phylan8720/fsl_phylan8720.h b/ports/mimxrt/hal/phy/device/phylan8720/fsl_phylan8720.h
new file mode 100644
index 0000000000000..2e8b4e3631baf
--- /dev/null
+++ b/ports/mimxrt/hal/phy/device/phylan8720/fsl_phylan8720.h
@@ -0,0 +1,163 @@
+/*
+ * Copyright 2020 NXP
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+/*****************************************************************************
+ * PHY KSZ8081 driver change log
+ *****************************************************************************/
+
+/*!
+@page driver_log Driver Change Log
+
+@section phylan8720 PHYLAN8720
+  The current PHYLAN8720 driver version is 2.0.0.
+
+  - 2.0.0
+    - Initial version.
+*/
+
+#ifndef _FSL_PHYLAN8720_H_
+#define _FSL_PHYLAN8720_H_
+
+#include "fsl_phy.h"
+
+/*!
+ * @addtogroup phy_driver
+ * @{
+ */
+
+/*******************************************************************************
+ * Definitions
+ ******************************************************************************/
+
+/*! @brief PHY driver version */
+#define FSL_PHY_DRIVER_VERSION (MAKE_VERSION(2, 0, 0))
+
+/*! @brief PHY operations structure. */
+extern const phy_operations_t phylan8720_ops;
+
+/*******************************************************************************
+ * API
+ ******************************************************************************/
+
+#if defined(__cplusplus)
+extern "C" {
+#endif
+
+/*!
+ * @name PHY Driver
+ * @{
+ */
+
+/*!
+ * @brief Initializes PHY.
+ *
+ *  This function initialize PHY.
+ *
+ * @param handle       PHY device handle.
+ * @param config       Pointer to structure of phy_config_t.
+ * @retval kStatus_Success  PHY initialization succeeds
+ * @retval kStatus_Fail  PHY initialization fails
+ * @retval kStatus_PHY_SMIVisitTimeout  PHY SMI visit time out
+ */
+status_t PHY_LAN8720_Init(phy_handle_t *handle, const phy_config_t *config);
+
+/*!
+ * @brief PHY Write function. This function writes data over the SMI to
+ * the specified PHY register. This function is called by all PHY interfaces.
+ *
+ * @param handle  PHY device handle.
+ * @param phyReg  The PHY register.
+ * @param data    The data written to the PHY register.
+ * @retval kStatus_Success     PHY write success
+ * @retval kStatus_PHY_SMIVisitTimeout  PHY SMI visit time out
+ */
+status_t PHY_LAN8720_Write(phy_handle_t *handle, uint32_t phyReg, uint32_t data);
+
+/*!
+ * @brief PHY Read function. This interface read data over the SMI from the
+ * specified PHY register. This function is called by all PHY interfaces.
+ *
+ * @param handle   PHY device handle.
+ * @param phyReg   The PHY register.
+ * @param dataPtr  The address to store the data read from the PHY register.
+ * @retval kStatus_Success  PHY read success
+ * @retval kStatus_PHY_SMIVisitTimeout  PHY SMI visit time out
+ */
+status_t PHY_LAN8720_Read(phy_handle_t *handle, uint32_t phyReg, uint32_t *dataPtr);
+
+/*!
+ * @brief Gets the PHY auto-negotiation status.
+ *
+ * @param handle   PHY device handle.
+ * @param status   The auto-negotiation status of the PHY.
+ *         - true the auto-negotiation is over.
+ *         - false the auto-negotiation is on-going or not started.
+ * @retval kStatus_Success   PHY gets status success
+ * @retval kStatus_PHY_SMIVisitTimeout  PHY SMI visit time out
+ */
+status_t PHY_LAN8720_GetAutoNegotiationStatus(phy_handle_t *handle, bool *status);
+
+/*!
+ * @brief Gets the PHY link status.
+ *
+ * @param handle   PHY device handle.
+ * @param status   The link up or down status of the PHY.
+ *         - true the link is up.
+ *         - false the link is down.
+ * @retval kStatus_Success   PHY gets link status success
+ * @retval kStatus_PHY_SMIVisitTimeout  PHY SMI visit time out
+ */
+status_t PHY_LAN8720_GetLinkStatus(phy_handle_t *handle, bool *status);
+
+/*!
+ * @brief Gets the PHY link speed and duplex.
+ *
+ * @brief This function gets the speed and duplex mode of PHY. User can give one of speed
+ * and duplex address paramter and set the other as NULL if only wants to get one of them.
+ *
+ * @param handle   PHY device handle.
+ * @param speed    The address of PHY link speed.
+ * @param duplex   The link duplex of PHY.
+ * @retval kStatus_Success   PHY gets link speed and duplex success
+ * @retval kStatus_PHY_SMIVisitTimeout  PHY SMI visit time out
+ */
+status_t PHY_LAN8720_GetLinkSpeedDuplex(phy_handle_t *handle, phy_speed_t *speed, phy_duplex_t *duplex);
+
+/*!
+ * @brief Sets the PHY link speed and duplex.
+ *
+ * @param handle   PHY device handle.
+ * @param speed    Specified PHY link speed.
+ * @param duplex   Specified PHY link duplex.
+ * @retval kStatus_Success   PHY gets status success
+ * @retval kStatus_PHY_SMIVisitTimeout  PHY SMI visit time out
+ */
+status_t PHY_LAN8720_SetLinkSpeedDuplex(phy_handle_t *handle, phy_speed_t speed, phy_duplex_t duplex);
+
+/*!
+ * @brief Enables/disables PHY loopback.
+ *
+ * @param handle   PHY device handle.
+ * @param mode     The loopback mode to be enabled, please see "phy_loop_t".
+ * All loopback modes should not be set together, when one loopback mode is set
+ * another should be disabled.
+ * @param speed    PHY speed for loopback mode.
+ * @param enable   True to enable, false to disable.
+ * @retval kStatus_Success  PHY loopback success
+ * @retval kStatus_PHY_SMIVisitTimeout  PHY SMI visit time out
+ */
+status_t PHY_LAN8720_EnableLoopback(phy_handle_t *handle, phy_loop_t mode, phy_speed_t speed, bool enable);
+
+/* @} */
+
+#if defined(__cplusplus)
+}
+#endif
+
+/*! @}*/
+
+#endif /* _FSL_PHYLAN8720_H_ */
diff --git a/ports/mimxrt/hal/phy/fsl_mdio.h b/ports/mimxrt/hal/phy/fsl_mdio.h
new file mode 100644
index 0000000000000..6bfee2a24475a
--- /dev/null
+++ b/ports/mimxrt/hal/phy/fsl_mdio.h
@@ -0,0 +1,125 @@
+/*
+ * Copyright 2020 NXP
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+#ifndef _FSL_MDIO_H_
+#define _FSL_MDIO_H_
+
+#include "fsl_common.h"
+
+/*******************************************************************************
+ * Definitions
+ ******************************************************************************/
+
+/*! @brief Defines the timeout macro. */
+#if defined(MDIO_TIMEOUT_COUNT_NUMBER) && MDIO_TIMEOUT_COUNT_NUMBER
+#define MDIO_TIMEOUT_COUNT MDIO_TIMEOUT_COUNT_NUMBER
+#endif
+
+/*! @brief Defines the PHY status. */
+enum _mdio_status
+{
+    kStatus_PHY_SMIVisitTimeout = MAKE_STATUS(kStatusGroup_PHY, 0), /*!< ENET PHY SMI visit timeout. */
+};
+
+typedef struct _mdio_operations mdio_operations_t;
+
+/*! @brief MDIO resource. */
+typedef struct _mdio_resource
+{
+    void *base;           /*!< ENET Ip register base. */
+    uint32_t csrClock_Hz; /*!< ENET CSR clock. */
+} mdio_resource_t;
+
+/*! @brief MDIO handle. */
+typedef struct _mdio_handle
+{
+    mdio_resource_t resource;
+    const mdio_operations_t *ops;
+} mdio_handle_t;
+
+/*! @brief Camera receiver operations. */
+struct _mdio_operations
+{
+    void (*mdioInit)(mdio_handle_t *handle); /*!< MDIO interface init. */
+    status_t (*mdioWrite)(mdio_handle_t *handle,
+        uint32_t phyAddr,
+        uint32_t devAddr,
+        uint32_t data);                   /*!< MDIO write data. */
+    status_t (*mdioRead)(mdio_handle_t *handle,
+        uint32_t phyAddr,
+        uint32_t devAddr,
+        uint32_t *dataPtr);                  /*!< MDIO read data. */
+    status_t (*mdioWriteExt)(mdio_handle_t *handle,
+        uint32_t phyAddr,
+        uint32_t devAddr,
+        uint32_t data);                      /*!< MDIO write data. */
+    status_t (*mdioReadExt)(mdio_handle_t *handle,
+        uint32_t phyAddr,
+        uint32_t devAddr,
+        uint32_t *dataPtr);                     /*!< MDIO read data. */
+};
+
+/*******************************************************************************
+ * API
+ ******************************************************************************/
+
+#if defined(__cplusplus)
+extern "C" {
+#endif
+/*!
+ * @name MDIO Driver
+ * @{
+ */
+
+/*!
+ * @brief MDIO Write function. This function write data over the SMI to
+ * the specified MDIO register. This function is called by all MDIO interfaces.
+ *
+ * @param handle  MDIO device handle.
+ * @retval kStatus_Success     MDIO write success
+ * @retval kStatus_MDIO_SMIVisitTimeout  MDIO SMI visit time out
+ */
+static inline void MDIO_Init(mdio_handle_t *handle) {
+    handle->ops->mdioInit(handle);
+}
+
+/*!
+ * @brief MDIO Write function. This function write data over the SMI to
+ * the specified MDIO register. This function is called by all MDIO interfaces.
+ *
+ * @param handle  MDIO device handle.
+ * @param phyAddr  MDIO PHY address handle.
+ * @param devAddr  The PHY device register.
+ * @param data    The data written to the MDIO register.
+ * @retval kStatus_Success     MDIO write success
+ * @retval kStatus_MDIO_SMIVisitTimeout  MDIO SMI visit time out
+ */
+static inline status_t MDIO_Write(mdio_handle_t *handle, uint32_t phyAddr, uint32_t devAddr, uint32_t data) {
+    return handle->ops->mdioWrite(handle, phyAddr, devAddr, data);
+}
+
+/*!
+ * @brief MDIO Read function. This interface read data over the SMI from the
+ * specified MDIO register. This function is called by all MDIO interfaces.
+ *
+ * @param handle   MDIO device handle.
+ * @param phyAddr  MDIO PHY address handle.
+ * @param devAddr  The PHY device register.
+ * @param dataPtr  The address to store the data read from the MDIO register.
+ * @retval kStatus_Success  MDIO read success
+ * @retval kStatus_MDIO_SMIVisitTimeout  MDIO SMI visit time out
+ */
+static inline status_t MDIO_Read(mdio_handle_t *handle, uint32_t phyAddr, uint32_t devAddr, uint32_t *dataPtr) {
+    return handle->ops->mdioRead(handle, phyAddr, devAddr, dataPtr);
+}
+
+/* @} */
+
+#if defined(__cplusplus)
+}
+#endif
+
+#endif
diff --git a/ports/mimxrt/hal/phy/fsl_phy.h b/ports/mimxrt/hal/phy/fsl_phy.h
new file mode 100644
index 0000000000000..6a022d4eaed1e
--- /dev/null
+++ b/ports/mimxrt/hal/phy/fsl_phy.h
@@ -0,0 +1,258 @@
+/*
+ * Copyright 2020 NXP
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+#ifndef _FSL_PHY_H_
+#define _FSL_PHY_H_
+
+#include "fsl_mdio.h"
+
+/*! @note The following PHY registers are the IEEE802.3 standard definition, same register and bit field may
+          have different names in various PHYs, but the feature they represent should be same or very similar. */
+
+/*! @brief Defines the IEEE802.3 standard PHY registers. */
+#define PHY_BASICCONTROL_REG        0x00U /*!< The PHY basic control register. */
+#define PHY_BASICSTATUS_REG         0x01U /*!< The PHY basic status register. */
+#define PHY_ID1_REG                 0x02U /*!< The PHY ID one register. */
+#define PHY_ID2_REG                 0x03U /*!< The PHY ID two register. */
+#define PHY_AUTONEG_ADVERTISE_REG   0x04U /*!< The PHY auto-negotiate advertise register. */
+#define PHY_AUTONEG_LINKPARTNER_REG 0x05U /*!< The PHY auto negotiation link partner ability register. */
+#define PHY_AUTONEG_EXPANSION_REG   0x06U /*!< The PHY auto negotiation expansion register. */
+#define PHY_1000BASET_CONTROL_REG   0x09U /*!< The PHY 1000BASE-T control register. */
+#define PHY_MMD_ACCESS_CONTROL_REG  0x0DU /*!< The PHY MMD access control register. */
+#define PHY_MMD_ACCESS_DATA_REG     0x0EU /*!< The PHY MMD access data register. */
+
+/*! @brief Defines the mask flag in basic control register(Address 0x00). */
+#define PHY_BCTL_SPEED1_MASK          0x0040U /*!< The PHY speed bit mask(MSB).*/
+#define PHY_BCTL_ISOLATE_MASK         0x0400U /*!< The PHY isolate mask.*/
+#define PHY_BCTL_DUPLEX_MASK          0x0100U /*!< The PHY duplex bit mask. */
+#define PHY_BCTL_RESTART_AUTONEG_MASK 0x0200U /*!< The PHY restart auto negotiation mask. */
+#define PHY_BCTL_AUTONEG_MASK         0x1000U /*!< The PHY auto negotiation bit mask. */
+#define PHY_BCTL_SPEED0_MASK          0x2000U /*!< The PHY speed bit mask(LSB). */
+#define PHY_BCTL_LOOP_MASK            0x4000U /*!< The PHY loop bit mask. */
+#define PHY_BCTL_RESET_MASK           0x8000U /*!< The PHY reset bit mask. */
+
+/*! @brief Defines the mask flag in basic status register(Address 0x01). */
+#define PHY_BSTATUS_LINKSTATUS_MASK  0x0004U /*!< The PHY link status mask. */
+#define PHY_BSTATUS_AUTONEGABLE_MASK 0x0008U /*!< The PHY auto-negotiation ability mask. */
+#define PHY_BSTATUS_SPEEDUPLX_MASK   0x001CU /*!< The PHY speed and duplex mask. */
+#define PHY_BSTATUS_AUTONEGCOMP_MASK 0x0020U /*!< The PHY auto-negotiation complete mask. */
+
+/*! @brief Defines the mask flag in PHY auto-negotiation advertise register(Address 0x04). */
+#define PHY_100BaseT4_ABILITY_MASK    0x200U /*!< The PHY have the T4 ability. */
+#define PHY_100BASETX_FULLDUPLEX_MASK 0x100U /*!< The PHY has the 100M full duplex ability.*/
+#define PHY_100BASETX_HALFDUPLEX_MASK 0x080U /*!< The PHY has the 100M full duplex ability.*/
+#define PHY_10BASETX_FULLDUPLEX_MASK  0x040U /*!< The PHY has the 10M full duplex ability.*/
+#define PHY_10BASETX_HALFDUPLEX_MASK  0x020U /*!< The PHY has the 10M full duplex ability.*/
+#define PHY_IEEE802_3_SELECTOR_MASK   0x001U /*!< The message type being sent by Auto-Nego.*/
+
+/*! @brief Defines the mask flag in the 1000BASE-T control register(Address 0x09). */
+#define PHY_1000BASET_FULLDUPLEX_MASK 0x200U /*!< The PHY has the 1000M full duplex ability.*/
+#define PHY_1000BASET_HALFDUPLEX_MASK 0x100U /*!< The PHY has the 1000M half duplex ability.*/
+
+/*******************************************************************************
+ * Definitions
+ ******************************************************************************/
+typedef struct _phy_handle phy_handle_t;
+/*! @brief Defines the PHY link speed. */
+typedef enum _phy_speed
+{
+    kPHY_Speed10M = 0U, /*!< ENET PHY 10M speed. */
+    kPHY_Speed100M,     /*!< ENET PHY 100M speed. */
+    kPHY_Speed1000M     /*!< ENET PHY 1000M speed. */
+} phy_speed_t;
+
+/*! @brief Defines the PHY link duplex. */
+typedef enum _phy_duplex
+{
+    kPHY_HalfDuplex = 0U, /*!< ENET PHY half duplex. */
+    kPHY_FullDuplex       /*!< ENET PHY full duplex. */
+} phy_duplex_t;
+
+/*! @brief Defines the PHY loopback mode. */
+typedef enum _phy_loop
+{
+    kPHY_LocalLoop = 0U, /*!< ENET PHY local/digital loopback. */
+    kPHY_RemoteLoop,     /*!< ENET PHY remote loopback. */
+    kPHY_ExternalLoop,   /*!< ENET PHY external loopback. */
+} phy_loop_t;
+
+/*! @brief Defines the PHY MMD data access mode. */
+typedef enum _phy_mmd_access_mode
+{
+    kPHY_MMDAccessNoPostIncrement = (1U << 14), /*!< ENET PHY MMD access data with no address post increment. */
+    kPHY_MMDAccessRdWrPostIncrement =
+        (2U << 14),                             /*!< ENET PHY MMD access data with Read/Write address post increment. */
+    kPHY_MMDAccessWrPostIncrement = (3U << 14), /*!< ENET PHY MMD access data with Write address post increment. */
+} phy_mmd_access_mode_t;
+
+/*! @brief Defines PHY configuration. */
+typedef struct _phy_config
+{
+    uint32_t phyAddr;    /*!< PHY address. */
+    phy_speed_t speed;   /*!< PHY speed configuration. */
+    phy_duplex_t duplex; /*!< PHY duplex configuration. */
+    bool autoNeg;        /*!< PHY auto-negotiation, true: enable, false: disable. */
+    bool enableEEE;      /*!< PHY Energy Efficient Ethernet. */
+} phy_config_t;
+
+/*! @brief PHY device operations. */
+typedef struct _phy_operations
+{
+    status_t (*phyInit)(phy_handle_t *handle, const phy_config_t *config);
+    status_t (*phyWrite)(phy_handle_t *handle, uint32_t phyReg, uint32_t data);
+    status_t (*phyRead)(phy_handle_t *handle, uint32_t phyReg, uint32_t *dataPtr);
+    status_t (*getAutoNegoStatus)(phy_handle_t *handle, bool *status);
+    status_t (*getLinkStatus)(phy_handle_t *handle, bool *status);
+    status_t (*getLinkSpeedDuplex)(phy_handle_t *handle, phy_speed_t *speed, phy_duplex_t *duplex);
+    status_t (*setLinkSpeedDuplex)(phy_handle_t *handle, phy_speed_t speed, phy_duplex_t duplex);
+    status_t (*enableLoopback)(phy_handle_t *handle, phy_loop_t mode, phy_speed_t speed, bool enable);
+} phy_operations_t;
+
+/*! @brief PHY device handle. */
+
+struct _phy_handle
+{
+    uint32_t phyAddr;            /*!< PHY address. */
+    mdio_handle_t *mdioHandle;   /*!< The MDIO handle used by the phy device, it is specified by device. */
+    const phy_operations_t *ops; /*!< The device related operations. */
+};
+
+/*******************************************************************************
+ * API
+ ******************************************************************************/
+
+#if defined(__cplusplus)
+extern "C" {
+#endif
+
+/*!
+ * @name PHY Driver
+ * @{
+ */
+
+/*!
+ * @brief Initializes PHY.
+ *
+ *  This function initialize PHY.
+ *
+ * @param handle       PHY device handle.
+ * @param config       Pointer to structure of phy_config_t.
+ * @retval kStatus_Success  PHY initialization succeeds
+ * @retval kStatus_Fail  PHY initialization fails
+ * @retval kStatus_PHY_SMIVisitTimeout  PHY SMI visit time out
+ */
+static inline status_t PHY_Init(phy_handle_t *handle, const phy_config_t *config) {
+    return handle->ops->phyInit(handle, config);
+}
+/*!
+ * @brief PHY Write function. This function write data over the SMI to
+ * the specified PHY register. This function is called by all PHY interfaces.
+ *
+ * @param handle       PHY device handle.
+ * @param phyReg  The PHY register.
+ * @param data    The data written to the PHY register.
+ * @retval kStatus_Success     PHY write success
+ * @retval kStatus_PHY_SMIVisitTimeout  PHY SMI visit time out
+ */
+static inline status_t PHY_Write(phy_handle_t *handle, uint32_t phyReg, uint32_t data) {
+    return handle->ops->phyWrite(handle, phyReg, data);
+}
+
+/*!
+ * @brief PHY Read function. This interface read data over the SMI from the
+ * specified PHY register. This function is called by all PHY interfaces.
+ *
+ * @param handle       PHY device handle.
+ * @param phyReg   The PHY register.
+ * @param dataPtr  The address to store the data read from the PHY register.
+ * @retval kStatus_Success  PHY read success
+ * @retval kStatus_PHY_SMIVisitTimeout  PHY SMI visit time out
+ */
+static inline status_t PHY_Read(phy_handle_t *handle, uint32_t phyReg, uint32_t *dataPtr) {
+    return handle->ops->phyRead(handle, phyReg, dataPtr);
+}
+
+/*!
+ * @brief Gets the PHY auto-negotiation status.
+ *
+ * @param handle   PHY device handle.
+ * @param status   The auto-negotiation status of the PHY.
+ *         - true the auto-negotiation is over.
+ *         - false the auto-negotiation is on-going or not started.
+ * @retval kStatus_Success   PHY gets status success
+ * @retval kStatus_PHY_SMIVisitTimeout  PHY SMI visit time out
+ */
+static inline status_t PHY_GetAutoNegotiationStatus(phy_handle_t *handle, bool *status) {
+    return handle->ops->getAutoNegoStatus(handle, status);
+}
+
+/*!
+ * @brief Gets the PHY link status.
+ *
+ * @param handle       PHY device handle.
+ * @param status   The link up or down status of the PHY.
+ *         - true the link is up.
+ *         - false the link is down.
+ * @retval kStatus_Success   PHY get link status success
+ * @retval kStatus_PHY_SMIVisitTimeout  PHY SMI visit time out
+ */
+static inline status_t PHY_GetLinkStatus(phy_handle_t *handle, bool *status) {
+    return handle->ops->getLinkStatus(handle, status);
+}
+
+/*!
+ * @brief Gets the PHY link speed and duplex.
+ *
+ * @brief This function gets the speed and duplex mode of PHY. User can give one of speed
+ * and duplex address paramter and set the other as NULL if only wants to get one of them.
+ *
+ * @param handle       PHY device handle.
+ * @param speed    The address of PHY link speed.
+ * @param duplex   The link duplex of PHY.
+ * @retval kStatus_Success   PHY get link speed and duplex success
+ * @retval kStatus_PHY_SMIVisitTimeout  PHY SMI visit time out
+ */
+static inline status_t PHY_GetLinkSpeedDuplex(phy_handle_t *handle, phy_speed_t *speed, phy_duplex_t *duplex) {
+    return handle->ops->getLinkSpeedDuplex(handle, speed, duplex);
+}
+
+/*!
+ * @brief Sets the PHY link speed and duplex.
+ *
+ * @param handle   PHY device handle.
+ * @param speed    Specified PHY link speed.
+ * @param duplex   Specified PHY link duplex.
+ * @retval kStatus_Success   PHY gets status success
+ * @retval kStatus_PHY_SMIVisitTimeout  PHY SMI visit time out
+ */
+static inline status_t PHY_SetLinkSpeedDuplex(phy_handle_t *handle, phy_speed_t speed, phy_duplex_t duplex) {
+    return handle->ops->setLinkSpeedDuplex(handle, speed, duplex);
+}
+
+/*!
+ * @brief Enable PHY loopcback mode.
+ *
+ * @param handle   PHY device handle.
+ * @param mode     The loopback mode to be enabled, please see "phy_loop_t".
+ * All loopback modes should not be set together, when one loopback mode is set
+ * another should be disabled.
+ * @param speed    PHY speed for loopback mode.
+ * @param enable   True to enable, false to disable.
+ * @retval kStatus_Success   PHY get link speed and duplex success
+ * @retval kStatus_PHY_SMIVisitTimeout  PHY SMI visit time out
+ */
+static inline status_t PHY_EnableLoopback(phy_handle_t *handle, phy_loop_t mode, phy_speed_t speed, bool enable) {
+    return handle->ops->enableLoopback(handle, mode, speed, enable);
+}
+
+/* @} */
+
+#if defined(__cplusplus)
+}
+#endif
+
+/*! @}*/
+#endif
diff --git a/ports/mimxrt/hal/phy/mdio/enet/fsl_enet_mdio.c b/ports/mimxrt/hal/phy/mdio/enet/fsl_enet_mdio.c
new file mode 100644
index 0000000000000..8e679cd989a8f
--- /dev/null
+++ b/ports/mimxrt/hal/phy/mdio/enet/fsl_enet_mdio.c
@@ -0,0 +1,128 @@
+/*
+ * Copyright 2020 NXP
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#include "fsl_enet_mdio.h"
+#include "fsl_enet.h"
+
+/*******************************************************************************
+ * Definitions
+ ******************************************************************************/
+
+/*******************************************************************************
+ * Prototypes
+ ******************************************************************************/
+
+static void ENET_MDIO_Init(mdio_handle_t *handle);
+static status_t ENET_MDIO_Write(mdio_handle_t *handle, uint32_t phyAddr, uint32_t devAddr, uint32_t data);
+static status_t ENET_MDIO_Read(mdio_handle_t *handle, uint32_t phyAddr, uint32_t devAddr, uint32_t *dataPtr);
+
+uint32_t ENET_GetInstance(ENET_Type *base);
+extern clock_ip_name_t s_enetClock[];
+
+/*******************************************************************************
+ * Variables
+ ******************************************************************************/
+
+const mdio_operations_t enet_ops = {.mdioInit = ENET_MDIO_Init,
+                                    .mdioWrite = ENET_MDIO_Write,
+                                    .mdioRead = ENET_MDIO_Read,
+                                    .mdioWriteExt = NULL,
+                                    .mdioReadExt = NULL};
+
+/*******************************************************************************
+ * Code
+ ******************************************************************************/
+
+static void ENET_MDIO_Init(mdio_handle_t *handle) {
+    mdio_resource_t *resource = (mdio_resource_t *)&handle->resource;
+    ENET_Type *base = (ENET_Type *)resource->base;
+    uint32_t instance = ENET_GetInstance(base);
+
+    #if !(defined(FSL_SDK_DISABLE_DRIVER_CLOCK_CONTROL) && FSL_SDK_DISABLE_DRIVER_CLOCK_CONTROL)
+    /* Set SMI first. */
+    (void)CLOCK_EnableClock(s_enetClock[instance]);
+    #endif /* FSL_SDK_DISABLE_DRIVER_CLOCK_CONTROL */
+    ENET_SetSMI(base, resource->csrClock_Hz, false);
+}
+
+static status_t ENET_MDIO_Write(mdio_handle_t *handle, uint32_t phyAddr, uint32_t devAddr, uint32_t data) {
+    mdio_resource_t *resource = (mdio_resource_t *)&handle->resource;
+    ENET_Type *base = (ENET_Type *)resource->base;
+    status_t result = kStatus_Success;
+    #ifdef MDIO_TIMEOUT_COUNT
+    uint32_t counter;
+    #endif
+
+    /* Clear the SMI interrupt event. */
+    ENET_ClearInterruptStatus(base, ENET_EIR_MII_MASK);
+
+    /* Starts a SMI write command. */
+    ENET_StartSMIWrite(base, phyAddr, devAddr, kENET_MiiWriteValidFrame, data);
+
+    /* Wait for SMI complete. */
+    #ifdef MDIO_TIMEOUT_COUNT
+    for (counter = MDIO_TIMEOUT_COUNT; counter > 0U; counter--)
+    {
+        if (ENET_EIR_MII_MASK == (ENET_GetInterruptStatus(base) & ENET_EIR_MII_MASK)) {
+            break;
+        }
+    }
+    /* Check for timeout. */
+    if (0U == counter) {
+        result = kStatus_PHY_SMIVisitTimeout;
+    }
+    #else
+    while (ENET_EIR_MII_MASK != (ENET_GetInterruptStatus(base) & ENET_EIR_MII_MASK)) {
+    }
+    #endif
+
+    /* Clear SMI interrupt event. */
+    ENET_ClearInterruptStatus(base, ENET_EIR_MII_MASK);
+
+    return result;
+}
+
+static status_t ENET_MDIO_Read(mdio_handle_t *handle, uint32_t phyAddr, uint32_t devAddr, uint32_t *dataPtr) {
+    assert(dataPtr);
+
+    mdio_resource_t *resource = (mdio_resource_t *)&handle->resource;
+    ENET_Type *base = (ENET_Type *)resource->base;
+    #ifdef MDIO_TIMEOUT_COUNT
+    uint32_t counter;
+    #endif
+
+    /* Clear the SMI interrupt event. */
+    ENET_ClearInterruptStatus(base, ENET_EIR_MII_MASK);
+
+    /* Starts a SMI read command operation. */
+    ENET_StartSMIRead(base, phyAddr, devAddr, kENET_MiiReadValidFrame);
+
+    /* Wait for SMI complete. */
+    #ifdef MDIO_TIMEOUT_COUNT
+    for (counter = MDIO_TIMEOUT_COUNT; counter > 0U; counter--)
+    {
+        if (ENET_EIR_MII_MASK == (ENET_GetInterruptStatus(base) & ENET_EIR_MII_MASK)) {
+            break;
+        }
+    }
+    /* Check for timeout. */
+    if (0U == counter) {
+        return kStatus_PHY_SMIVisitTimeout;
+    }
+    #else
+    while (ENET_EIR_MII_MASK != (ENET_GetInterruptStatus(base) & ENET_EIR_MII_MASK)) {
+    }
+    #endif
+
+    /* Get data from SMI register. */
+    *dataPtr = ENET_ReadSMIData(base);
+
+    /* Clear SMI interrupt event. */
+    ENET_ClearInterruptStatus(base, ENET_EIR_MII_MASK);
+
+    return kStatus_Success;
+}
diff --git a/ports/mimxrt/hal/phy/mdio/enet/fsl_enet_mdio.h b/ports/mimxrt/hal/phy/mdio/enet/fsl_enet_mdio.h
new file mode 100644
index 0000000000000..500985d8fd058
--- /dev/null
+++ b/ports/mimxrt/hal/phy/mdio/enet/fsl_enet_mdio.h
@@ -0,0 +1,21 @@
+/*
+ * Copyright 2020 NXP
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#ifndef _FSL_ENET_MDIO_H_
+#define _FSL_ENET_MDIO_H_
+
+#include "fsl_enet.h"
+#include "fsl_mdio.h"
+
+/*******************************************************************************
+ * Definitions
+ ******************************************************************************/
+
+/*! @brief ENET MDIO operations structure. */
+extern const mdio_operations_t enet_ops;
+
+#endif
diff --git a/ports/mimxrt/lwip_inc/arch/cc.h b/ports/mimxrt/lwip_inc/arch/cc.h
new file mode 100644
index 0000000000000..c37e62b83938c
--- /dev/null
+++ b/ports/mimxrt/lwip_inc/arch/cc.h
@@ -0,0 +1,10 @@
+#ifndef MICROPY_INCLUDED_MIMXRT_LWIP_ARCH_CC_H
+#define MICROPY_INCLUDED_MIMXRT_LWIP_ARCH_CC_H
+
+#include <assert.h>
+#define LWIP_PLATFORM_DIAG(x)
+#define LWIP_PLATFORM_ASSERT(x)  { assert(1); }
+
+#define LWIP_NO_CTYPE_H 1
+
+#endif // MICROPY_INCLUDED_MIMXRT_LWIP_ARCH_CC_H
diff --git a/ports/mimxrt/lwip_inc/arch/sys_arch.h b/ports/mimxrt/lwip_inc/arch/sys_arch.h
new file mode 100644
index 0000000000000..8b1a393741c96
--- /dev/null
+++ b/ports/mimxrt/lwip_inc/arch/sys_arch.h
@@ -0,0 +1 @@
+// empty
diff --git a/ports/mimxrt/lwip_inc/lwipopts.h b/ports/mimxrt/lwip_inc/lwipopts.h
new file mode 100644
index 0000000000000..42dc9fc5dbd80
--- /dev/null
+++ b/ports/mimxrt/lwip_inc/lwipopts.h
@@ -0,0 +1,59 @@
+#ifndef MICROPY_INCLUDED_MIMXRT_LWIP_LWIPOPTS_H
+#define MICROPY_INCLUDED_MIMXRT_LWIP_LWIPOPTS_H
+
+#include <stdint.h>
+
+// This protection is not needed, instead we execute all lwIP code at PendSV priority
+#define SYS_ARCH_DECL_PROTECT(lev) do { } while (0)
+#define SYS_ARCH_PROTECT(lev) do { } while (0)
+#define SYS_ARCH_UNPROTECT(lev) do { } while (0)
+
+#define NO_SYS                          1
+#define SYS_LIGHTWEIGHT_PROT            1
+#define MEM_ALIGNMENT                   4
+
+#define LWIP_CHKSUM_ALGORITHM           3
+// Chksum generaration by HW fails for ICMP
+// Maybe caused by LWIP inserting ffff instead of 0000
+// The checksum flags are set in eth.c
+#define LWIP_CHECKSUM_CTRL_PER_NETIF    0
+#define LWIP_CHECKSUM_ON_COPY           0
+
+#define LWIP_ARP                        1
+#define LWIP_ETHERNET                   1
+#define LWIP_RAW                        1
+#define LWIP_NETCONN                    0
+#define LWIP_SOCKET                     0
+#define LWIP_STATS                      0
+#define LWIP_NETIF_HOSTNAME             1
+#define LWIP_NETIF_EXT_STATUS_CALLBACK  1
+
+#define LWIP_IPV6                       0
+#define LWIP_DHCP                       1
+#define LWIP_DHCP_CHECK_LINK_UP         1
+#define DHCP_DOES_ARP_CHECK             0 // to speed DHCP up
+#define LWIP_DNS                        1
+#define LWIP_DNS_SUPPORT_MDNS_QUERIES   1
+#define LWIP_MDNS_RESPONDER             1
+#define LWIP_IGMP                       1
+
+#define LWIP_NUM_NETIF_CLIENT_DATA      LWIP_MDNS_RESPONDER
+#define MEMP_NUM_UDP_PCB                (4 + LWIP_MDNS_RESPONDER)
+#define MEMP_NUM_SYS_TIMEOUT            (LWIP_NUM_SYS_TIMEOUT_INTERNAL + LWIP_MDNS_RESPONDER)
+
+#define SO_REUSE                        1
+#define TCP_LISTEN_BACKLOG              1
+
+extern uint32_t trng_random_u32(void);
+#define LWIP_RAND() trng_random_u32()
+
+// lwip takes 26700 bytes
+#define MEM_SIZE (8000)
+#define TCP_MSS (800)
+#define TCP_WND (8 * TCP_MSS)
+#define TCP_SND_BUF (8 * TCP_MSS)
+#define MEMP_NUM_TCP_SEG (32)
+
+typedef uint32_t sys_prot_t;
+
+#endif // MICROPY_INCLUDED_MIMXRT_LWIP_LWIPOPTS_H
diff --git a/ports/mimxrt/main.c b/ports/mimxrt/main.c
index e81974afaa7e2..f921f50a0c6cb 100644
--- a/ports/mimxrt/main.c
+++ b/ports/mimxrt/main.c
@@ -36,8 +36,16 @@
 #include "ticks.h"
 #include "tusb.h"
 #include "led.h"
+#include "pendsv.h"
 #include "modmachine.h"
 
+#if MICROPY_PY_LWIP
+#include "lwip/init.h"
+#include "lwip/apps/mdns.h"
+#endif
+#include "systick.h"
+#include "extmod/modnetwork.h"
+
 extern uint8_t _sstack, _estack, _gc_heap_start, _gc_heap_end;
 
 void board_init(void);
@@ -47,10 +55,22 @@ int main(void) {
     ticks_init();
     tusb_init();
     led_init();
+    pendsv_init();
 
     mp_stack_set_top(&_estack);
     mp_stack_set_limit(&_estack - &_sstack - 1024);
 
+    #if MICROPY_PY_LWIP
+    // lwIP doesn't allow to reinitialise itself by subsequent calls to this function
+    // because the system timeout list (next_timeout) is only ever reset by BSS clearing.
+    // So for now we only init the lwIP stack once on power-up.
+    lwip_init();
+    #if LWIP_MDNS_RESPONDER
+    mdns_resp_init();
+    #endif
+    systick_enable_dispatch(SYSTICK_DISPATCH_LWIP, mod_network_lwip_poll_wrapper);
+    #endif
+
     for (;;) {
         gc_init(&_gc_heap_start, &_gc_heap_end);
         mp_init();
@@ -58,6 +78,9 @@ int main(void) {
         mp_obj_list_init(MP_OBJ_TO_PTR(mp_sys_path), 0);
         mp_obj_list_append(mp_sys_path, MP_OBJ_NEW_QSTR(MP_QSTR_));
         mp_obj_list_init(MP_OBJ_TO_PTR(mp_sys_argv), 0);
+        #if MICROPY_PY_NETWORK
+        mod_network_init();
+        #endif
 
         // Initialise sub-systems.
         readline_init0();
@@ -93,6 +116,9 @@ int main(void) {
     soft_reset_exit:
         mp_printf(MP_PYTHON_PRINTER, "MPY: soft reboot\n");
         machine_pin_irq_deinit();
+        #if MICROPY_PY_NETWORK
+        mod_network_deinit();
+        #endif
         gc_sweep_all();
         mp_deinit();
     }
diff --git a/ports/mimxrt/mbedtls/mbedtls_config.h b/ports/mimxrt/mbedtls/mbedtls_config.h
new file mode 100644
index 0000000000000..1ab748d8e5a94
--- /dev/null
+++ b/ports/mimxrt/mbedtls/mbedtls_config.h
@@ -0,0 +1,99 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2018-2019 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+#ifndef MICROPY_INCLUDED_MBEDTLS_CONFIG_H
+#define MICROPY_INCLUDED_MBEDTLS_CONFIG_H
+
+// Set mbedtls configuration
+#define MBEDTLS_PLATFORM_MEMORY
+#define MBEDTLS_PLATFORM_NO_STD_FUNCTIONS
+#define MBEDTLS_DEPRECATED_REMOVED
+#define MBEDTLS_ENTROPY_HARDWARE_ALT
+#define MBEDTLS_AES_ROM_TABLES
+#define MBEDTLS_CIPHER_MODE_CBC
+#define MBEDTLS_ECP_DP_SECP192R1_ENABLED
+#define MBEDTLS_ECP_DP_SECP224R1_ENABLED
+#define MBEDTLS_ECP_DP_SECP256R1_ENABLED
+#define MBEDTLS_ECP_DP_SECP384R1_ENABLED
+#define MBEDTLS_ECP_DP_SECP521R1_ENABLED
+#define MBEDTLS_ECP_DP_SECP192K1_ENABLED
+#define MBEDTLS_ECP_DP_SECP224K1_ENABLED
+#define MBEDTLS_ECP_DP_SECP256K1_ENABLED
+#define MBEDTLS_ECP_DP_BP256R1_ENABLED
+#define MBEDTLS_ECP_DP_BP384R1_ENABLED
+#define MBEDTLS_ECP_DP_BP512R1_ENABLED
+#define MBEDTLS_ECP_DP_CURVE25519_ENABLED
+#define MBEDTLS_KEY_EXCHANGE_RSA_ENABLED
+#define MBEDTLS_NO_PLATFORM_ENTROPY
+#define MBEDTLS_PKCS1_V15
+#define MBEDTLS_SHA256_SMALLER
+#define MBEDTLS_SSL_PROTO_TLS1
+#define MBEDTLS_SSL_PROTO_TLS1_1
+#define MBEDTLS_SSL_PROTO_TLS1_2
+#define MBEDTLS_SSL_SERVER_NAME_INDICATION
+
+// Use a smaller output buffer to reduce size of SSL context
+#define MBEDTLS_SSL_MAX_CONTENT_LEN (16384)
+#define MBEDTLS_SSL_IN_CONTENT_LEN  (MBEDTLS_SSL_MAX_CONTENT_LEN)
+#define MBEDTLS_SSL_OUT_CONTENT_LEN (4096)
+
+// Enable mbedtls modules
+#define MBEDTLS_AES_C
+#define MBEDTLS_ASN1_PARSE_C
+#define MBEDTLS_BIGNUM_C
+#define MBEDTLS_CIPHER_C
+#define MBEDTLS_CTR_DRBG_C
+// #define MBEDTLS_ECP_C
+#define MBEDTLS_ENTROPY_C
+#define MBEDTLS_ERROR_C
+#define MBEDTLS_MD_C
+#define MBEDTLS_MD5_C
+#define MBEDTLS_OID_C
+#define MBEDTLS_PKCS5_C
+#define MBEDTLS_PK_C
+#define MBEDTLS_PK_PARSE_C
+#define MBEDTLS_PLATFORM_C
+#define MBEDTLS_RSA_C
+#define MBEDTLS_SHA1_C
+#define MBEDTLS_SHA256_C
+#define MBEDTLS_SHA512_C
+#define MBEDTLS_SSL_CLI_C
+#define MBEDTLS_SSL_SRV_C
+#define MBEDTLS_SSL_TLS_C
+#define MBEDTLS_X509_CRT_PARSE_C
+#define MBEDTLS_X509_USE_C
+
+// Memory allocation hooks
+#include <stdlib.h>
+#include <stdio.h>
+void *m_calloc_mbedtls(size_t nmemb, size_t size);
+void m_free_mbedtls(void *ptr);
+#define MBEDTLS_PLATFORM_STD_CALLOC m_calloc_mbedtls
+#define MBEDTLS_PLATFORM_STD_FREE m_free_mbedtls
+#define MBEDTLS_PLATFORM_SNPRINTF_MACRO snprintf
+
+#include "mbedtls/check_config.h"
+
+#endif /* MICROPY_INCLUDED_MBEDTLS_CONFIG_H */
diff --git a/ports/mimxrt/mbedtls/mbedtls_port.c b/ports/mimxrt/mbedtls/mbedtls_port.c
new file mode 100644
index 0000000000000..eb11f5141b8a2
--- /dev/null
+++ b/ports/mimxrt/mbedtls/mbedtls_port.c
@@ -0,0 +1,93 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2019 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#ifdef MICROPY_SSL_MBEDTLS
+
+#include "py/runtime.h"
+#include "py/gc.h"
+#include "fsl_trng.h"
+#include "mbedtls_config.h"
+
+#define DEBUG (0)
+
+#if DEBUG
+static size_t count_links(uint32_t *nb) {
+    void **p = MP_STATE_PORT(mbedtls_memory);
+    size_t n = 0;
+    *nb = 0;
+    while (p != NULL) {
+        ++n;
+        *nb += gc_nbytes(p);
+        p = (void **)p[1];
+    }
+    return n;
+}
+#endif
+
+void *m_calloc_mbedtls(size_t nmemb, size_t size) {
+    void **ptr = m_malloc0(nmemb * size + 2 * sizeof(uintptr_t));
+    #if DEBUG
+    uint32_t nb;
+    size_t n = count_links(&nb);
+    printf("mbed_alloc(%u, %u) -> (%u;%u) %p\n", nmemb, size, n, (uint)nb, ptr);
+    #endif
+    if (MP_STATE_PORT(mbedtls_memory) != NULL) {
+        MP_STATE_PORT(mbedtls_memory)[0] = ptr;
+    }
+    ptr[0] = NULL;
+    ptr[1] = MP_STATE_PORT(mbedtls_memory);
+    MP_STATE_PORT(mbedtls_memory) = ptr;
+    return &ptr[2];
+}
+
+void m_free_mbedtls(void *ptr_in) {
+    void **ptr = &((void **)ptr_in)[-2];
+    #if DEBUG
+    uint32_t nb;
+    size_t n = count_links(&nb);
+    printf("mbed_free(%p, [%p, %p], nbytes=%u, links=%u;%u)\n", ptr, ptr[0], ptr[1], gc_nbytes(ptr), n, (uint)nb);
+    #endif
+    if (ptr[1] != NULL) {
+        ((void **)ptr[1])[0] = ptr[0];
+    }
+    if (ptr[0] != NULL) {
+        ((void **)ptr[0])[1] = ptr[1];
+    } else {
+        MP_STATE_PORT(mbedtls_memory) = ptr[1];
+    }
+    m_free(ptr);
+}
+
+int mbedtls_hardware_poll(void *data, unsigned char *output, size_t len, size_t *olen) {
+
+    // assumes that TRNG_Init was called during startup
+    *olen = len;
+    TRNG_GetRandomData(TRNG, output, len);
+
+    return 0;
+}
+
+#endif
diff --git a/ports/mimxrt/moduos.c b/ports/mimxrt/moduos.c
index ff0f0824c4a3a..b59a5f44834b0 100644
--- a/ports/mimxrt/moduos.c
+++ b/ports/mimxrt/moduos.c
@@ -30,6 +30,8 @@
 
 #include "py/objstr.h"
 #include "py/runtime.h"
+#include "py/mphal.h"
+#include "extmod/misc.h"
 #include "extmod/vfs.h"
 #include "extmod/vfs_fat.h"
 #include "extmod/vfs_lfs.h"
@@ -96,6 +98,21 @@ STATIC mp_obj_t os_urandom(mp_obj_t num) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(os_urandom_obj, os_urandom);
 
+#if MICROPY_PY_OS_DUPTERM
+STATIC mp_obj_t os_dupterm_notify(mp_obj_t obj_in) {
+    (void)obj_in;
+    for (;;) {
+        int c = mp_uos_dupterm_rx_chr();
+        if (c < 0) {
+            break;
+        }
+        ringbuf_put(&stdin_ringbuf, c);
+    }
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(os_dupterm_notify_obj, os_dupterm_notify);
+#endif
+
 STATIC const mp_rom_map_elem_t os_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_uos) },
 
@@ -118,6 +135,7 @@ STATIC const mp_rom_map_elem_t os_module_globals_table[] = {
 
     #if MICROPY_PY_OS_DUPTERM
     { MP_ROM_QSTR(MP_QSTR_dupterm), MP_ROM_PTR(&mp_uos_dupterm_obj) },
+    { MP_ROM_QSTR(MP_QSTR_dupterm_notify), MP_ROM_PTR(&os_dupterm_notify_obj) },
     #endif
 
     #if MICROPY_VFS
diff --git a/ports/mimxrt/mpconfigport.h b/ports/mimxrt/mpconfigport.h
index 0fe6cd129154f..f1c38b1fad4f4 100644
--- a/ports/mimxrt/mpconfigport.h
+++ b/ports/mimxrt/mpconfigport.h
@@ -44,7 +44,6 @@ uint32_t trng_random_u32(void);
 #define MICROPY_EMIT_INLINE_THUMB           (1)
 
 // Compiler configuration
-#define MICROPY_COMP_CONST                  (0)
 
 // Python internal features
 #define MICROPY_READER_VFS                  (1)
@@ -118,6 +117,7 @@ uint32_t trng_random_u32(void);
 #define MICROPY_PY_UBINASCII                (1)
 #define MICROPY_PY_UBINASCII_CRC32          (1)
 #define MICROPY_PY_UTIME_MP_HAL             (1)
+#define MICROPY_PY_OS_DUPTERM               (3)
 #define MICROPY_PY_URANDOM                  (1)
 #define MICROPY_PY_URANDOM_EXTRA_FUNCS      (1)
 #define MICROPY_PY_URANDOM_SEED_INIT_FUNC   (trng_random_u32())
@@ -139,12 +139,38 @@ uint32_t trng_random_u32(void);
 #define MICROPY_FATFS_MAX_SS                (4096)
 #define MICROPY_FATFS_LFN_CODE_PAGE         437 /* 1=SFN/ANSI 437=LFN/U.S.(OEM) */
 
+// If MICROPY_PY_LWIP is defined, add network support
+#if MICROPY_PY_LWIP
+
+#define MICROPY_PY_NETWORK                  (1)
+#define MICROPY_PY_USOCKET                  (1)
+#define MICROPY_PY_UWEBSOCKET               (1)
+#define MICROPY_PY_WEBREPL                  (1)
+#define MICROPY_PY_UHASHLIB_SHA1            (1)
+#define MICROPY_PY_LWIP_SOCK_RAW            (1)
+#define MICROPY_HW_ETH_MDC                  (1)
+
+// Prevent the "LWIP task" from running.
+#define MICROPY_PY_LWIP_ENTER   MICROPY_PY_PENDSV_ENTER
+#define MICROPY_PY_LWIP_REENTER MICROPY_PY_PENDSV_REENTER
+#define MICROPY_PY_LWIP_EXIT    MICROPY_PY_PENDSV_EXIT
+
+#endif
+
+// For regular code that wants to prevent "background tasks" from running.
+// These background tasks (LWIP, Bluetooth) run in PENDSV context.
+// TODO: Check for the settings of the STM32 port in irq.h
+#define MICROPY_PY_PENDSV_ENTER   uint32_t atomic_state = disable_irq();
+#define MICROPY_PY_PENDSV_REENTER atomic_state = disable_irq();
+#define MICROPY_PY_PENDSV_EXIT    enable_irq(atomic_state);
+
 // Use VfsLfs2's types for fileio/textio
 #define mp_type_fileio mp_type_vfs_lfs2_fileio
 #define mp_type_textio mp_type_vfs_lfs2_textio
 
 // Use VFS's functions for import stat and builtin open
 #define mp_import_stat mp_vfs_import_stat
+#define mp_builtin_open mp_vfs_open
 #define mp_builtin_open_obj mp_vfs_open_obj
 
 // Hooks to add builtins
@@ -170,6 +196,38 @@ extern const struct _mp_obj_module_t mp_module_mimxrt;
 extern const struct _mp_obj_module_t mp_module_onewire;
 extern const struct _mp_obj_module_t mp_module_uos;
 extern const struct _mp_obj_module_t mp_module_utime;
+extern const struct _mp_obj_module_t mp_module_usocket;
+extern const struct _mp_obj_module_t mp_module_network;
+
+#if MICROPY_PY_NETWORK
+#define NETWORK_BUILTIN_MODULE              { MP_ROM_QSTR(MP_QSTR_network), MP_ROM_PTR(&mp_module_network) },
+#else
+#define NETWORK_BUILTIN_MODULE
+#endif
+
+#if MICROPY_PY_USOCKET && MICROPY_PY_LWIP
+// usocket implementation provided by lwIP
+#define SOCKET_BUILTIN_MODULE               { MP_ROM_QSTR(MP_QSTR_usocket), MP_ROM_PTR(&mp_module_lwip) },
+#elif MICROPY_PY_USOCKET
+// usocket implementation provided by skeleton wrapper
+#define SOCKET_BUILTIN_MODULE               { MP_ROM_QSTR(MP_QSTR_usocket), MP_ROM_PTR(&mp_module_usocket) },
+#else
+// no usocket module
+#define SOCKET_BUILTIN_MODULE
+#endif
+
+#if MICROPY_SSL_MBEDTLS
+#define MICROPY_PORT_ROOT_POINTER_MBEDTLS void **mbedtls_memory;
+#else
+#define MICROPY_PORT_ROOT_POINTER_MBEDTLS
+#endif
+
+#if defined(MICROPY_HW_ETH_MDC)
+extern const struct _mp_obj_type_t network_lan_type;
+#define MICROPY_HW_NIC_ETH                  { MP_ROM_QSTR(MP_QSTR_LAN), MP_ROM_PTR(&network_lan_type) },
+#else
+#define MICROPY_HW_NIC_ETH
+#endif
 
 #define MICROPY_PORT_BUILTIN_MODULES \
     { MP_ROM_QSTR(MP_QSTR_machine), MP_ROM_PTR(&mp_module_machine) }, \
@@ -177,6 +235,11 @@ extern const struct _mp_obj_module_t mp_module_utime;
     { MP_ROM_QSTR(MP_QSTR_uos), MP_ROM_PTR(&mp_module_uos) }, \
     { MP_ROM_QSTR(MP_QSTR_utime), MP_ROM_PTR(&mp_module_utime) }, \
     { MP_ROM_QSTR(MP_QSTR__onewire), MP_ROM_PTR(&mp_module_onewire) }, \
+    SOCKET_BUILTIN_MODULE \
+    NETWORK_BUILTIN_MODULE \
+
+#define MICROPY_PORT_NETWORK_INTERFACES \
+    MICROPY_HW_NIC_ETH  \
 
 #define MICROPY_HW_PIT_NUM_CHANNELS 3
 
@@ -184,6 +247,10 @@ extern const struct _mp_obj_module_t mp_module_utime;
     const char *readline_hist[8]; \
     struct _machine_timer_obj_t *timer_table[MICROPY_HW_PIT_NUM_CHANNELS]; \
     void *machine_pin_irq_objects[MICROPY_HW_NUM_PIN_IRQS]; \
+    /* list of registered NICs */ \
+    mp_obj_list_t mod_network_nic_list; \
+    /* root pointers for sub-systems */ \
+    MICROPY_PORT_ROOT_POINTER_MBEDTLS \
 
 #define MP_STATE_PORT MP_STATE_VM
 
diff --git a/ports/mimxrt/mphalport.c b/ports/mimxrt/mphalport.c
index ff7e988dfff86..66498d7b2771f 100644
--- a/ports/mimxrt/mphalport.c
+++ b/ports/mimxrt/mphalport.c
@@ -29,14 +29,21 @@
 #include "py/stream.h"
 #include "py/mphal.h"
 #include "shared/timeutils/timeutils.h"
+#include "extmod/misc.h"
 #include "ticks.h"
 #include "tusb.h"
 #include "fsl_snvs_lp.h"
+#include "fsl_ocotp.h"
 
 #include CPU_HEADER_H
 
+STATIC uint8_t stdin_ringbuf_array[260];
+ringbuf_t stdin_ringbuf = {stdin_ringbuf_array, sizeof(stdin_ringbuf_array), 0, 0};
+
 #if MICROPY_KBD_EXCEPTION
 
+int mp_interrupt_char = -1;
+
 void tud_cdc_rx_wanted_cb(uint8_t itf, char wanted_char) {
     (void)itf;
     (void)wanted_char;
@@ -45,6 +52,7 @@ void tud_cdc_rx_wanted_cb(uint8_t itf, char wanted_char) {
 }
 
 void mp_hal_set_interrupt_char(int c) {
+    mp_interrupt_char = c;
     tud_cdc_set_wanted_char(c);
 }
 
@@ -52,6 +60,9 @@ void mp_hal_set_interrupt_char(int c) {
 
 uintptr_t mp_hal_stdio_poll(uintptr_t poll_flags) {
     uintptr_t ret = 0;
+    if ((poll_flags & MP_STREAM_POLL_RD) && ringbuf_peek(&stdin_ringbuf) != -1) {
+        ret |= MP_STREAM_POLL_RD;
+    }
     if (tud_cdc_connected() && tud_cdc_available()) {
         ret |= MP_STREAM_POLL_RD;
     }
@@ -64,6 +75,10 @@ int mp_hal_stdin_rx_chr(void) {
         // if (USARTx->USART.INTFLAG.bit.RXC) {
         //     return USARTx->USART.DATA.bit.DATA;
         // }
+        int c = ringbuf_get(&stdin_ringbuf);
+        if (c != -1) {
+            return c;
+        }
         if (tud_cdc_connected() && tud_cdc_available()) {
             uint8_t buf[1];
             uint32_t count = tud_cdc_read(buf, sizeof(buf));
@@ -90,6 +105,7 @@ void mp_hal_stdout_tx_strn(const char *str, mp_uint_t len) {
             i += n2;
         }
     }
+    mp_uos_dupterm_tx_strn(str, len);
     // TODO
     // while (len--) {
     //     while (!(USARTx->USART.INTFLAG.bit.DRE)) { }
@@ -103,3 +119,29 @@ uint64_t mp_hal_time_ns(void) {
     uint64_t s = timeutils_seconds_since_epoch(t.year, t.month, t.day, t.hour, t.minute, t.second);
     return s * 1000000000ULL;
 }
+
+/*******************************************************************************/
+// MAC address
+
+// Generate a random locally administered MAC address (LAA)
+void mp_hal_generate_laa_mac(int idx, uint8_t buf[6]) {
+    // Take the MAC addr from the OTP's Configuration and Manufacturing Info
+    OCOTP_Init(OCOTP, CLOCK_GetFreq(kCLOCK_IpgClk));
+    buf[0] = 0x02; // Locally Administered MAC
+    *(uint32_t *)&buf[1] = OCOTP->CFG0 ^ (OCOTP->CFG0 >> 8);
+    *(uint16_t *)&buf[4] = (uint16_t)(OCOTP->CFG1 ^ (OCOTP->CFG1 >> 16));
+}
+
+// A board can override this if needed
+MP_WEAK void mp_hal_get_mac(int idx, uint8_t buf[6]) {
+    mp_hal_generate_laa_mac(idx, buf);
+}
+
+void mp_hal_get_mac_ascii(int idx, size_t chr_off, size_t chr_len, char *dest) {
+    static const char hexchr[16] = "0123456789ABCDEF";
+    uint8_t mac[6];
+    mp_hal_get_mac(idx, mac);
+    for (; chr_len; ++chr_off, --chr_len) {
+        *dest++ = hexchr[mac[chr_off >> 1] >> (4 * (1 - (chr_off & 1))) & 0xf];
+    }
+}
diff --git a/ports/mimxrt/mphalport.h b/ports/mimxrt/mphalport.h
index 3f0ae51bb663a..a98ae5ed79b1e 100644
--- a/ports/mimxrt/mphalport.h
+++ b/ports/mimxrt/mphalport.h
@@ -29,10 +29,12 @@
 
 #include <stdint.h>
 #include "ticks.h"
+#include "py/ringbuf.h"
 #include "pin.h"
 #include "fsl_clock.h"
 
 #define MP_HAL_PIN_FMT                  "%q"
+extern ringbuf_t stdin_ringbuf;
 
 #define mp_hal_pin_obj_t const machine_pin_obj_t *
 #define mp_hal_get_pin_obj(o)   pin_find(o)
@@ -85,5 +87,15 @@ static inline mp_uint_t mp_hal_get_cpu_freq(void) {
     return CLOCK_GetCpuClkFreq();
 }
 
+enum {
+    MP_HAL_MAC_WLAN0 = 0,
+    MP_HAL_MAC_WLAN1,
+    MP_HAL_MAC_BDADDR,
+    MP_HAL_MAC_ETH0,
+};
+
+void mp_hal_generate_laa_mac(int idx, uint8_t buf[6]);
+void mp_hal_get_mac(int idx, uint8_t buf[6]);
+void mp_hal_get_mac_ascii(int idx, size_t chr_off, size_t chr_len, char *dest);
 
 #endif // MICROPY_INCLUDED_MIMXRT_MPHALPORT_H
diff --git a/ports/mimxrt/mpnetworkport.c b/ports/mimxrt/mpnetworkport.c
new file mode 100644
index 0000000000000..2e6a49b90ee70
--- /dev/null
+++ b/ports/mimxrt/mpnetworkport.c
@@ -0,0 +1,64 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2014 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include <stdio.h>
+#include <stdint.h>
+#include <string.h>
+
+#include "py/objlist.h"
+#include "py/runtime.h"
+#include "py/mphal.h"
+#include "shared/netutils/netutils.h"
+#include "systick.h"
+#include "pendsv.h"
+#include "extmod/modnetwork.h"
+
+#if MICROPY_PY_LWIP
+#include "lwip/netif.h"
+#include "lwip/timeouts.h"
+#include "lwip/dns.h"
+#include "lwip/dhcp.h"
+#include "lwip/apps/mdns.h"
+
+// Poll lwIP every 128ms
+#define LWIP_TICK(tick) (((tick) & ~(SYSTICK_DISPATCH_NUM_SLOTS - 1) & 0x7f) == 0)
+
+u32_t sys_now(void) {
+    return mp_hal_ticks_ms();
+}
+
+STATIC void pyb_lwip_poll(void) {
+    // Run the lwIP internal updates
+    sys_check_timeouts();
+}
+
+void mod_network_lwip_poll_wrapper(uint32_t ticks_ms) {
+    if (LWIP_TICK(ticks_ms)) {
+        pendsv_schedule_dispatch(PENDSV_DISPATCH_LWIP, pyb_lwip_poll);
+    }
+}
+
+#endif // MICROPY_PY_LWIP
diff --git a/ports/mimxrt/network_lan.c b/ports/mimxrt/network_lan.c
new file mode 100644
index 0000000000000..c0d6e41362d2b
--- /dev/null
+++ b/ports/mimxrt/network_lan.c
@@ -0,0 +1,171 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2019 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "py/runtime.h"
+#include "py/mphal.h"
+#include "extmod/modnetwork.h"
+#include "eth.h"
+
+#if defined(MICROPY_HW_ETH_MDC)
+
+#include "lwip/netif.h"
+
+typedef struct _network_lan_obj_t {
+    mp_obj_base_t base;
+    eth_t *eth;
+} network_lan_obj_t;
+
+STATIC const network_lan_obj_t network_lan_eth0 = { { &network_lan_type }, &eth_instance };
+
+STATIC void network_lan_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+    network_lan_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    struct netif *netif = eth_netif(self->eth);
+    int status = eth_link_status(self->eth);
+    mp_printf(print, "<ETH %u %u.%u.%u.%u>",
+        status,
+        netif->ip_addr.addr & 0xff,
+        netif->ip_addr.addr >> 8 & 0xff,
+        netif->ip_addr.addr >> 16 & 0xff,
+        netif->ip_addr.addr >> 24
+        );
+}
+
+STATIC mp_obj_t network_lan_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
+    mp_arg_check_num(n_args, n_kw, 0, 0, false);
+    const network_lan_obj_t *self = &network_lan_eth0;
+    eth_init(self->eth, MP_HAL_MAC_ETH0);
+    // register with network module
+    mod_network_register_nic((mp_obj_t *)self);
+    return MP_OBJ_FROM_PTR(self);
+}
+
+STATIC mp_obj_t network_lan_active(size_t n_args, const mp_obj_t *args) {
+    network_lan_obj_t *self = MP_OBJ_TO_PTR(args[0]);
+    if (n_args == 1) {
+        return mp_obj_new_bool(eth_link_status(self->eth));
+    } else {
+        int ret;
+        if (mp_obj_is_true(args[1])) {
+            ret = eth_start(self->eth);
+        } else {
+            ret = eth_stop(self->eth);
+        }
+        if (ret < 0) {
+            mp_raise_OSError(-ret);
+        }
+        return mp_const_none;
+    }
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(network_lan_active_obj, 1, 2, network_lan_active);
+
+STATIC mp_obj_t network_lan_isconnected(mp_obj_t self_in) {
+    network_lan_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    return mp_obj_new_bool(eth_link_status(self->eth) == 3);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(network_lan_isconnected_obj, network_lan_isconnected);
+
+STATIC mp_obj_t network_lan_ifconfig(size_t n_args, const mp_obj_t *args) {
+    network_lan_obj_t *self = MP_OBJ_TO_PTR(args[0]);
+    return mod_network_nic_ifconfig(eth_netif(self->eth), n_args - 1, args + 1);
+}
+MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(network_lan_ifconfig_obj, 1, 2, network_lan_ifconfig);
+
+STATIC mp_obj_t network_lan_status(size_t n_args, const mp_obj_t *args) {
+    network_lan_obj_t *self = MP_OBJ_TO_PTR(args[0]);
+    (void)self;
+
+    if (n_args == 1) {
+        // No arguments: return link status
+        return MP_OBJ_NEW_SMALL_INT(eth_link_status(self->eth));
+    }
+
+    mp_raise_ValueError(MP_ERROR_TEXT("unknown status param"));
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(network_lan_status_obj, 1, 2, network_lan_status);
+
+STATIC mp_obj_t network_lan_config(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs) {
+    network_lan_obj_t *self = MP_OBJ_TO_PTR(args[0]);
+
+    if (kwargs->used == 0) {
+        // Get config value
+        if (n_args != 2) {
+            mp_raise_TypeError(MP_ERROR_TEXT("must query one param"));
+        }
+
+        switch (mp_obj_str_get_qstr(args[1])) {
+            case MP_QSTR_mac: {
+                return mp_obj_new_bytes(&eth_netif(self->eth)->hwaddr[0], 6);
+            }
+            default:
+                mp_raise_ValueError(MP_ERROR_TEXT("unknown config param"));
+        }
+    } else {
+        // Set config value(s)
+        if (n_args != 1) {
+            mp_raise_TypeError(MP_ERROR_TEXT("can't specify pos and kw args"));
+        }
+
+        for (size_t i = 0; i < kwargs->alloc; ++i) {
+            if (MP_MAP_SLOT_IS_FILLED(kwargs, i)) {
+                mp_map_elem_t *e = &kwargs->table[i];
+                switch (mp_obj_str_get_qstr(e->key)) {
+                    case MP_QSTR_trace: {
+                        eth_set_trace(self->eth, mp_obj_get_int(e->value));
+                        break;
+                    }
+                    case MP_QSTR_low_power: {
+                        eth_low_power_mode(self->eth, mp_obj_get_int(e->value));
+                        break;
+                    }
+                    default:
+                        mp_raise_ValueError(MP_ERROR_TEXT("unknown config param"));
+                }
+            }
+        }
+
+        return mp_const_none;
+    }
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_KW(network_lan_config_obj, 1, network_lan_config);
+
+STATIC const mp_rom_map_elem_t network_lan_locals_dict_table[] = {
+    { MP_ROM_QSTR(MP_QSTR_active), MP_ROM_PTR(&network_lan_active_obj) },
+    { MP_ROM_QSTR(MP_QSTR_isconnected), MP_ROM_PTR(&network_lan_isconnected_obj) },
+    { MP_ROM_QSTR(MP_QSTR_ifconfig), MP_ROM_PTR(&network_lan_ifconfig_obj) },
+    { MP_ROM_QSTR(MP_QSTR_status), MP_ROM_PTR(&network_lan_status_obj) },
+    { MP_ROM_QSTR(MP_QSTR_config), MP_ROM_PTR(&network_lan_config_obj) },
+};
+STATIC MP_DEFINE_CONST_DICT(network_lan_locals_dict, network_lan_locals_dict_table);
+
+const mp_obj_type_t network_lan_type = {
+    { &mp_type_type },
+    .name = MP_QSTR_LAN,
+    .print = network_lan_print,
+    .make_new = network_lan_make_new,
+    .locals_dict = (mp_obj_dict_t *)&network_lan_locals_dict,
+};
+
+#endif // defined(MICROPY_HW_ETH_MDC)
diff --git a/ports/mimxrt/pendsv.c b/ports/mimxrt/pendsv.c
new file mode 100644
index 0000000000000..7638b160d8610
--- /dev/null
+++ b/ports/mimxrt/pendsv.c
@@ -0,0 +1,73 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013, 2014 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include <stdlib.h>
+
+#include "py/runtime.h"
+#include "shared/runtime/interrupt_char.h"
+#include "pendsv.h"
+#include "lib/nxp_driver/sdk/CMSIS/Include/core_cm7.h"
+
+#define NVIC_PRIORITYGROUP_4    ((uint32_t)0x00000003)
+#define IRQ_PRI_PENDSV          NVIC_EncodePriority(NVIC_PRIORITYGROUP_4, 15, 0)
+
+#if defined(PENDSV_DISPATCH_NUM_SLOTS)
+uint32_t pendsv_dispatch_active;
+pendsv_dispatch_t pendsv_dispatch_table[PENDSV_DISPATCH_NUM_SLOTS];
+#endif
+
+void pendsv_init(void) {
+    #if defined(PENDSV_DISPATCH_NUM_SLOTS)
+    pendsv_dispatch_active = false;
+    #endif
+
+    // set PendSV interrupt at lowest priority
+    NVIC_SetPriority(PendSV_IRQn, IRQ_PRI_PENDSV);
+}
+
+#if defined(PENDSV_DISPATCH_NUM_SLOTS)
+void pendsv_schedule_dispatch(size_t slot, pendsv_dispatch_t f) {
+    pendsv_dispatch_table[slot] = f;
+    pendsv_dispatch_active = true;
+    SCB->ICSR = SCB_ICSR_PENDSVSET_Msk;
+}
+
+void pendsv_dispatch_handler(void) {
+    for (size_t i = 0; i < PENDSV_DISPATCH_NUM_SLOTS; ++i) {
+        if (pendsv_dispatch_table[i] != NULL) {
+            pendsv_dispatch_t f = pendsv_dispatch_table[i];
+            pendsv_dispatch_table[i] = NULL;
+            f();
+        }
+    }
+}
+
+void PendSV_Handler(void) {
+    if (pendsv_dispatch_active) {
+        pendsv_dispatch_handler();
+    }
+}
+#endif
diff --git a/ports/mimxrt/pendsv.h b/ports/mimxrt/pendsv.h
new file mode 100644
index 0000000000000..64883c903137f
--- /dev/null
+++ b/ports/mimxrt/pendsv.h
@@ -0,0 +1,44 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013, 2014 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+#ifndef MICROPY_INCLUDED_STM32_PENDSV_H
+#define MICROPY_INCLUDED_STM32_PENDSV_H
+
+enum {
+    PENDSV_DISPATCH_SOFT_TIMER,  // For later & for having at least one entry
+    #if MICROPY_PY_NETWORK && MICROPY_PY_LWIP
+    PENDSV_DISPATCH_LWIP,
+    #endif
+    PENDSV_DISPATCH_MAX
+};
+
+#define PENDSV_DISPATCH_NUM_SLOTS PENDSV_DISPATCH_MAX
+
+typedef void (*pendsv_dispatch_t)(void);
+
+void pendsv_init(void);
+void pendsv_schedule_dispatch(size_t slot, pendsv_dispatch_t f);
+
+#endif // MICROPY_INCLUDED_STM32_PENDSV_H
diff --git a/ports/mimxrt/pin.c b/ports/mimxrt/pin.c
index 7a437661e3865..964fb537b8c72 100644
--- a/ports/mimxrt/pin.c
+++ b/ports/mimxrt/pin.c
@@ -116,6 +116,21 @@ const machine_pin_af_obj_t *pin_find_af(const machine_pin_obj_t *pin, uint8_t fn
     return NULL;
 }
 
+const machine_pin_af_obj_t *pin_find_af_by_base(const machine_pin_obj_t *pin, void *base_ptr[], size_t base_size) {
+    const machine_pin_af_obj_t *af_obj = NULL;
+
+    for (int i = 0; i < pin->af_list_len; ++i) {
+        af_obj = &pin->af_list[i];
+        for (int j = 0; j < base_size; ++j) {
+            if (af_obj->instance == base_ptr[j]) {
+                return af_obj;
+            }
+        }
+    }
+
+    return NULL;
+}
+
 const machine_pin_af_obj_t *pin_find_af_by_index(const machine_pin_obj_t *pin, mp_uint_t af_idx) {
     // TODO: Implement pin_find_af_by_index function
     return NULL;
diff --git a/ports/mimxrt/systick.c b/ports/mimxrt/systick.c
new file mode 100644
index 0000000000000..086bf1670161f
--- /dev/null
+++ b/ports/mimxrt/systick.c
@@ -0,0 +1,60 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013, 2014 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "py/runtime.h"
+#include "py/mphal.h"
+#include "systick.h"
+
+volatile uint32_t systick_ms = 0;
+
+systick_dispatch_t systick_dispatch_table[SYSTICK_DISPATCH_NUM_SLOTS];
+
+void SysTick_Handler(void) {
+    // Instead of calling HAL_IncTick we do the increment here of the counter.
+    // This is purely for efficiency, since SysTick is called 1000 times per
+    // second at the highest interrupt priority.
+    uint32_t uw_tick = systick_ms + 1;
+    systick_ms = uw_tick;
+
+    // Dispatch to any registered handlers in a cycle
+    systick_dispatch_t f = systick_dispatch_table[uw_tick & (SYSTICK_DISPATCH_NUM_SLOTS - 1)];
+    if (f != NULL) {
+        f(uw_tick);
+    }
+}
+
+bool systick_has_passed(uint32_t start_tick, uint32_t delay_ms) {
+    return systick_ms - start_tick >= delay_ms;
+}
+
+// waits until at least delay_ms milliseconds have passed from the sampling of
+// startTick. Handles overflow properly. Assumes stc was taken from
+// HAL_GetTick() some time before calling this function.
+void systick_wait_at_least(uint32_t start_tick, uint32_t delay_ms) {
+    while (!systick_has_passed(start_tick, delay_ms)) {
+        __WFI(); // enter sleep mode, waiting for interrupt
+    }
+}
diff --git a/ports/mimxrt/systick.h b/ports/mimxrt/systick.h
new file mode 100644
index 0000000000000..2638905cd6104
--- /dev/null
+++ b/ports/mimxrt/systick.h
@@ -0,0 +1,60 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013, 2014 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+#ifndef MICROPY_INCLUDED_MIMXRT_SYSTICK_H
+#define MICROPY_INCLUDED_MIMXRT_SYSTICK_H
+
+// Works for x between 0 and 16 inclusive
+#define POW2_CEIL(x) ((((x) - 1) | ((x) - 1) >> 1 | ((x) - 1) >> 2 | ((x) - 1) >> 3) + 1)
+
+enum {
+    SYSTICK_DISPATCH_DMA = 0,
+    #if MICROPY_HW_ENABLE_STORAGE
+    SYSTICK_DISPATCH_STORAGE,
+    #endif
+    #if MICROPY_PY_NETWORK && MICROPY_PY_LWIP
+    SYSTICK_DISPATCH_LWIP,
+    #endif
+    SYSTICK_DISPATCH_MAX
+};
+
+#define SYSTICK_DISPATCH_NUM_SLOTS POW2_CEIL(SYSTICK_DISPATCH_MAX)
+
+typedef void (*systick_dispatch_t)(uint32_t);
+
+extern systick_dispatch_t systick_dispatch_table[SYSTICK_DISPATCH_NUM_SLOTS];
+
+static inline void systick_enable_dispatch(size_t slot, systick_dispatch_t f) {
+    systick_dispatch_table[slot] = f;
+}
+
+static inline void systick_disable_dispatch(size_t slot) {
+    systick_dispatch_table[slot] = NULL;
+}
+
+void systick_wait_at_least(uint32_t stc, uint32_t delay_ms);
+bool systick_has_passed(uint32_t stc, uint32_t delay_ms);
+
+#endif // MICROPY_INCLUDED_MIMXRT_SYSTICK_H

From c2e4759cfaa4080356424b2602d90085a99bfb2b Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sun, 12 Sep 2021 16:44:24 +0200
Subject: [PATCH 1341/3533] mimxrt/modmachine: Implement machine.WDT() and
 machine.reset_cause().

The API follows that of rp2, stm32, esp32, and the docs.

    wdt=machine.WDT(0, timeout)

        Timeout is given in ms. The valid range is 500 to 128000 (128
        seconds) with 500 ms granularity. Values outside of that range will
        be silently aligned.

    wdt.feed()

        Resets the watchdog timer (feeding).

    wdt.timeout_ms(value)

        Sets a new timeout and feeds the watchdog.

        This is a new, preliminary method which is not yet documented.

    reset_cause = machine.reset_cause()

        Values returned:

        1  Power On reset
        3  Watchdog reset
        5  Software reset: state after calling machine.reset()

More elaborate API functions are supported by the MCU, like an interrupt
called a certain time after feeding.  But for port cosistency that is not
implemented.
---
 ports/mimxrt/Makefile      |   3 ++
 ports/mimxrt/machine_wdt.c | 107 +++++++++++++++++++++++++++++++++++++
 ports/mimxrt/modmachine.c  |  32 ++++++++++-
 ports/mimxrt/modmachine.h  |   7 +--
 4 files changed, 145 insertions(+), 4 deletions(-)
 create mode 100644 ports/mimxrt/machine_wdt.c

diff --git a/ports/mimxrt/Makefile b/ports/mimxrt/Makefile
index 16aac389d19cb..239b7cd0c79b4 100644
--- a/ports/mimxrt/Makefile
+++ b/ports/mimxrt/Makefile
@@ -196,6 +196,7 @@ SRC_HAL_IMX_C += \
 	$(MCU_DIR)/drivers/fsl_pit.c \
 	$(MCU_DIR)/drivers/fsl_snvs_lp.c \
 	$(MCU_DIR)/drivers/fsl_trng.c \
+	$(MCU_DIR)/drivers/fsl_wdog.c \
 	$(MCU_DIR)/project_template/clock_config.c \
 	$(MCU_DIR)/system_$(MCU_SERIES).c \
 	$(MCU_DIR)/xip/fsl_flexspi_nor_boot.c \
@@ -229,6 +230,7 @@ SRC_C += \
 	machine_spi.c \
 	machine_timer.c \
 	machine_uart.c \
+	machine_wdt.c \
 	main.c \
 	mbedtls/mbedtls_port.c \
 	mimxrt_flash.c \
@@ -386,6 +388,7 @@ SRC_QSTR += \
 	machine_spi.c \
 	machine_timer.c \
 	machine_uart.c \
+	machine_wdt.c \
 	mimxrt_flash.c \
 	modmachine.c \
 	modmimxrt.c \
diff --git a/ports/mimxrt/machine_wdt.c b/ports/mimxrt/machine_wdt.c
new file mode 100644
index 0000000000000..d09c464f69a3c
--- /dev/null
+++ b/ports/mimxrt/machine_wdt.c
@@ -0,0 +1,107 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020-2021 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "py/runtime.h"
+#include "modmachine.h"
+
+#include "fsl_wdog.h"
+
+#define MIN_TIMEOUT    (500)
+#define MAX_TIMEOUT    (128000)
+
+typedef struct _machine_wdt_obj_t {
+    mp_obj_base_t base;
+} machine_wdt_obj_t;
+
+STATIC const machine_wdt_obj_t machine_wdt = {{&machine_wdt_type}};
+
+STATIC mp_obj_t machine_wdt_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
+    enum { ARG_id, ARG_timeout };
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_id, MP_ARG_INT, {.u_int = 0} },
+        { MP_QSTR_timeout, MP_ARG_INT, {.u_int = 5000} },
+    };
+
+    // Parse the arguments.
+    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
+    mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
+
+    // Verify the WDT id.
+    mp_int_t id = args[ARG_id].u_int;
+    if (id != 0) {
+        mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("WDT(%d) doesn't exist"), id);
+    }
+
+    // Start the watchdog (timeout is in milliseconds).
+    wdog_config_t config;
+    WDOG_GetDefaultConfig(&config);
+    uint32_t timeout = args[ARG_timeout].u_int;
+    // confine to the valid range
+    if (timeout < MIN_TIMEOUT) {
+        timeout = MIN_TIMEOUT;
+    } else if (timeout > MAX_TIMEOUT) {
+        timeout = MAX_TIMEOUT;
+    }
+    config.timeoutValue = (timeout / 500) - 1;
+    WDOG_Init(WDOG1, &config);
+
+    return MP_OBJ_FROM_PTR(&machine_wdt);
+}
+
+STATIC mp_obj_t machine_wdt_feed(mp_obj_t self_in) {
+    (void)self_in;
+    WDOG_Refresh(WDOG1);
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_wdt_feed_obj, machine_wdt_feed);
+
+STATIC mp_obj_t machine_wdt_timeout_ms(mp_obj_t self_in, mp_obj_t timout_in) {
+    uint32_t timeout = mp_obj_get_int(timout_in);
+    // confine to the valid range
+    if (timeout < MIN_TIMEOUT) {
+        timeout = MIN_TIMEOUT;
+    } else if (timeout > MAX_TIMEOUT) {
+        timeout = MAX_TIMEOUT;
+    }
+    timeout = (timeout / 500) - 1;
+    WDOG_SetTimeoutValue(WDOG1, (uint16_t)timeout);
+    WDOG_Refresh(WDOG1);
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(machine_wdt_timeout_ms_obj, machine_wdt_timeout_ms);
+
+STATIC const mp_rom_map_elem_t machine_wdt_locals_dict_table[] = {
+    { MP_ROM_QSTR(MP_QSTR_feed), MP_ROM_PTR(&machine_wdt_feed_obj) },
+    { MP_ROM_QSTR(MP_QSTR_timeout_ms), MP_ROM_PTR(&machine_wdt_timeout_ms_obj) },
+};
+STATIC MP_DEFINE_CONST_DICT(machine_wdt_locals_dict, machine_wdt_locals_dict_table);
+
+const mp_obj_type_t machine_wdt_type = {
+    { &mp_type_type },
+    .name = MP_QSTR_WDT,
+    .make_new = machine_wdt_make_new,
+    .locals_dict = (mp_obj_dict_t *)&machine_wdt_locals_dict,
+};
diff --git a/ports/mimxrt/modmachine.c b/ports/mimxrt/modmachine.c
index 2e8753df122bf..d4078d5660a1c 100644
--- a/ports/mimxrt/modmachine.c
+++ b/ports/mimxrt/modmachine.c
@@ -36,15 +36,38 @@
 #include "pin.h"
 #include "modmachine.h"
 #include "fsl_clock.h"
+#include "fsl_wdog.h"
 
 #include CPU_HEADER_H
 
+typedef enum {
+    MP_PWRON_RESET = 1,
+    MP_HARD_RESET,
+    MP_WDT_RESET,
+    MP_DEEPSLEEP_RESET,
+    MP_SOFT_RESET
+} reset_reason_t;
+
 STATIC mp_obj_t machine_reset(void) {
-    NVIC_SystemReset();
+    WDOG_TriggerSystemSoftwareReset(WDOG1);
     return mp_const_none;
 }
 MP_DEFINE_CONST_FUN_OBJ_0(machine_reset_obj, machine_reset);
 
+STATIC mp_obj_t machine_reset_cause(void) {
+    uint16_t reset_cause =
+        WDOG_GetStatusFlags(WDOG1) & (kWDOG_PowerOnResetFlag | kWDOG_TimeoutResetFlag | kWDOG_SoftwareResetFlag);
+    if (reset_cause == kWDOG_PowerOnResetFlag) {
+        reset_cause = MP_PWRON_RESET;
+    } else if (reset_cause == kWDOG_TimeoutResetFlag) {
+        reset_cause = MP_WDT_RESET;
+    } else {
+        reset_cause = MP_SOFT_RESET;
+    }
+    return MP_OBJ_NEW_SMALL_INT(reset_cause);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(machine_reset_cause_obj, machine_reset_cause);
+
 STATIC mp_obj_t machine_freq(void) {
     return MP_OBJ_NEW_SMALL_INT(mp_hal_get_cpu_freq());
 }
@@ -72,6 +95,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(machine_enable_irq_obj, machine_enable_irq);
 STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__),            MP_ROM_QSTR(MP_QSTR_umachine) },
     { MP_ROM_QSTR(MP_QSTR_reset),               MP_ROM_PTR(&machine_reset_obj) },
+    { MP_ROM_QSTR(MP_QSTR_reset_cause),         MP_ROM_PTR(&machine_reset_cause_obj) },
     { MP_ROM_QSTR(MP_QSTR_freq),                MP_ROM_PTR(&machine_freq_obj) },
     { MP_ROM_QSTR(MP_QSTR_mem8),                MP_ROM_PTR(&machine_mem8_obj) },
     { MP_ROM_QSTR(MP_QSTR_mem16),               MP_ROM_PTR(&machine_mem16_obj) },
@@ -92,6 +116,7 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_I2C),                 MP_ROM_PTR(&machine_i2c_type) },
     { MP_ROM_QSTR(MP_QSTR_SPI),                 MP_ROM_PTR(&machine_spi_type) },
     { MP_ROM_QSTR(MP_QSTR_UART),                MP_ROM_PTR(&machine_uart_type) },
+    { MP_ROM_QSTR(MP_QSTR_WDT),                 MP_ROM_PTR(&machine_wdt_type) },
 
     { MP_ROM_QSTR(MP_QSTR_idle),                MP_ROM_PTR(&machine_idle_obj) },
 
@@ -102,6 +127,11 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_bitstream),           MP_ROM_PTR(&machine_bitstream_obj) },
     #endif
     { MP_ROM_QSTR(MP_QSTR_time_pulse_us),       MP_ROM_PTR(&machine_time_pulse_us_obj) },
+
+    // Reset reasons
+    { MP_ROM_QSTR(MP_QSTR_PWRON_RESET),         MP_ROM_INT(MP_PWRON_RESET) },
+    { MP_ROM_QSTR(MP_QSTR_WDT_RESET),           MP_ROM_INT(MP_WDT_RESET) },
+    { MP_ROM_QSTR(MP_QSTR_SOFT_RESET),          MP_ROM_INT(MP_SOFT_RESET) },
 };
 STATIC MP_DEFINE_CONST_DICT(machine_module_globals, machine_module_globals_table);
 
diff --git a/ports/mimxrt/modmachine.h b/ports/mimxrt/modmachine.h
index 90d167843ac9a..b9949ab78461c 100644
--- a/ports/mimxrt/modmachine.h
+++ b/ports/mimxrt/modmachine.h
@@ -30,12 +30,13 @@
 #include "py/obj.h"
 
 extern const mp_obj_type_t machine_adc_type;
-extern const mp_obj_type_t machine_timer_type;
-extern const mp_obj_type_t machine_rtc_type;
 extern const mp_obj_type_t machine_i2c_type;
+extern const mp_obj_type_t machine_rtc_type;
+extern const mp_obj_type_t machine_sdcard_type;
 extern const mp_obj_type_t machine_spi_type;
+extern const mp_obj_type_t machine_timer_type;
 extern const mp_obj_type_t machine_uart_type;
-extern const mp_obj_type_t machine_sdcard_type;
+extern const mp_obj_type_t machine_wdt_type;
 
 void machine_adc_init(void);
 void machine_pin_irq_deinit(void);

From 68146aa197bbb5b62c671fbc116352a625902394 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Thu, 19 Aug 2021 09:09:43 +0200
Subject: [PATCH 1342/3533] mimxrt/boards: Fix the D14/D15 pin assignment of
 MIMXRT1050/60/64_EVK.

There are several PCB layouts in the market under the same name.
---
 ports/mimxrt/boards/MIMXRT1050_EVK/pins.csv | 4 ++--
 ports/mimxrt/boards/MIMXRT1060_EVK/pins.csv | 4 ++--
 ports/mimxrt/boards/MIMXRT1064_EVK/pins.csv | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ports/mimxrt/boards/MIMXRT1050_EVK/pins.csv b/ports/mimxrt/boards/MIMXRT1050_EVK/pins.csv
index 366a141ff8e14..463079b129378 100644
--- a/ports/mimxrt/boards/MIMXRT1050_EVK/pins.csv
+++ b/ports/mimxrt/boards/MIMXRT1050_EVK/pins.csv
@@ -12,8 +12,8 @@ D10,GPIO_SD_B0_01
 D11,GPIO_SD_B0_02
 D12,GPIO_SD_B0_03
 D13,GPIO_SD_B0_00
-D14,GPIO_AD_B1_01
-D15,GPIO_AD_B1_00
+D14,GPIO_AD_B0_01
+D15,GPIO_AD_B0_00
 A0,GPIO_AD_B1_10
 A1,GPIO_AD_B1_11
 A2,GPIO_AD_B1_04
diff --git a/ports/mimxrt/boards/MIMXRT1060_EVK/pins.csv b/ports/mimxrt/boards/MIMXRT1060_EVK/pins.csv
index 366a141ff8e14..463079b129378 100644
--- a/ports/mimxrt/boards/MIMXRT1060_EVK/pins.csv
+++ b/ports/mimxrt/boards/MIMXRT1060_EVK/pins.csv
@@ -12,8 +12,8 @@ D10,GPIO_SD_B0_01
 D11,GPIO_SD_B0_02
 D12,GPIO_SD_B0_03
 D13,GPIO_SD_B0_00
-D14,GPIO_AD_B1_01
-D15,GPIO_AD_B1_00
+D14,GPIO_AD_B0_01
+D15,GPIO_AD_B0_00
 A0,GPIO_AD_B1_10
 A1,GPIO_AD_B1_11
 A2,GPIO_AD_B1_04
diff --git a/ports/mimxrt/boards/MIMXRT1064_EVK/pins.csv b/ports/mimxrt/boards/MIMXRT1064_EVK/pins.csv
index 366a141ff8e14..463079b129378 100644
--- a/ports/mimxrt/boards/MIMXRT1064_EVK/pins.csv
+++ b/ports/mimxrt/boards/MIMXRT1064_EVK/pins.csv
@@ -12,8 +12,8 @@ D10,GPIO_SD_B0_01
 D11,GPIO_SD_B0_02
 D12,GPIO_SD_B0_03
 D13,GPIO_SD_B0_00
-D14,GPIO_AD_B1_01
-D15,GPIO_AD_B1_00
+D14,GPIO_AD_B0_01
+D15,GPIO_AD_B0_00
 A0,GPIO_AD_B1_10
 A1,GPIO_AD_B1_11
 A2,GPIO_AD_B1_04

From 101d2ddea308d532818fc456d4093941fa01e37b Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sat, 21 Aug 2021 12:24:10 +0200
Subject: [PATCH 1343/3533] mimxrt/hal: Remove duplicate definitions from
 flexspi_hyper_flash.h.

---
 ports/mimxrt/hal/flexspi_hyper_flash.h | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/ports/mimxrt/hal/flexspi_hyper_flash.h b/ports/mimxrt/hal/flexspi_hyper_flash.h
index d51ca3073da64..dbd028fd6f718 100644
--- a/ports/mimxrt/hal/flexspi_hyper_flash.h
+++ b/ports/mimxrt/hal/flexspi_hyper_flash.h
@@ -59,12 +59,4 @@ static inline uint32_t flexspi_get_frequency(void) {
     return fre;
 }
 
-#define HYPERFLASH_CMD_LUT_SEQ_IDX_READDATA    0
-#define HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEDATA   1
-#define HYPERFLASH_CMD_LUT_SEQ_IDX_READSTATUS  2
-#define HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEENABLE 4
-#define HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR 6
-#define HYPERFLASH_CMD_LUT_SEQ_IDX_PAGEPROGRAM 10
-#define HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP   12
-
 #endif // MICROPY_INCLUDED_MIMXRT_HAL_FLEXSPI_HYPER_FLASH_H

From 06d1b02014b37664b5b9ecd3841bb48841c7c44c Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sun, 3 Oct 2021 20:54:18 +0200
Subject: [PATCH 1344/3533] mimxrt/dma_channel: Fix the DMA channel management.

The MIMXRT1011 has only 16 channels, so size the channel list accordingly.
---
 ports/mimxrt/dma_channel.c | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/ports/mimxrt/dma_channel.c b/ports/mimxrt/dma_channel.c
index 3dd043a66bfe3..c6cae9da9c1aa 100644
--- a/ports/mimxrt/dma_channel.c
+++ b/ports/mimxrt/dma_channel.c
@@ -27,10 +27,17 @@
 #include "dma_channel.h"
 
 // List of channel flags: true: channel used, false: channel available
-static bool channel_list[32] = { true, true, true, true, false, false, false, false,
-                                 false, false, false, false, false, false, false, false,
-                                 false, false, false, false, false, false, false, false,
-                                 false, false, false, false, false, false, false, false };
+static bool channel_list[FSL_FEATURE_DMAMUX_MODULE_CHANNEL] = {
+    true, true, true, true, false, false, false, false,
+    false, false, false, false, false, false, false, false,
+
+    #if FSL_FEATURE_DMAMUX_MODULE_CHANNEL > 16
+
+    false, false, false, false, false, false, false, false,
+    false, false, false, false, false, false, false, false
+
+    #endif
+};
 
 // allocate_channel(): retrieve an available channel. Return the number or -1
 int allocate_dma_channel(void) {

From 99221cd1181288ffb86404e348f25e345e863a7b Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Tue, 12 Oct 2021 22:49:18 +0200
Subject: [PATCH 1345/3533] mimxrt: Fix cycle counter for time.ticks_cpu() and
 machine.bitstream().

Prior to this commit mp_hal_ticks_cpu() was not started properly.  It only
started when the code was executed with a debugger attached, except for the
Teensy (i.MXRT1062) boards.  As an additional fix, the CYYCNT timer is now
started at boot time.

Also rename mp_hal_ticks_cpu_init() to mp_hal_ticks_cpu_enable().
---
 ports/mimxrt/machine_bitstream.c | 2 +-
 ports/mimxrt/mphalport.h         | 5 ++++-
 ports/mimxrt/ticks.c             | 1 +
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/ports/mimxrt/machine_bitstream.c b/ports/mimxrt/machine_bitstream.c
index c6ff469ea69a3..cb391a38c53ac 100644
--- a/ports/mimxrt/machine_bitstream.c
+++ b/ports/mimxrt/machine_bitstream.c
@@ -48,7 +48,7 @@ void machine_bitstream_high_low(mp_hal_pin_obj_t pin, uint32_t *timing_ns, const
         }
     }
     // Enable the CPU cycle counter, which is not always enabled.
-    mp_hal_ticks_cpu_init();
+    mp_hal_ticks_cpu_enable();
 
     uint32_t irq_state = mp_hal_quiet_timing_enter();
 
diff --git a/ports/mimxrt/mphalport.h b/ports/mimxrt/mphalport.h
index a98ae5ed79b1e..40e929b23bfe5 100644
--- a/ports/mimxrt/mphalport.h
+++ b/ports/mimxrt/mphalport.h
@@ -75,7 +75,10 @@ static inline void mp_hal_delay_us(mp_uint_t us) {
 
 #define mp_hal_delay_us_fast(us) mp_hal_delay_us(us)
 
-static inline void mp_hal_ticks_cpu_init(void) {
+static inline void mp_hal_ticks_cpu_enable(void) {
+    CoreDebug->DEMCR |= CoreDebug_DEMCR_TRCENA_Msk;
+    DWT->LAR = 0xc5acce55;
+    DWT->CYCCNT = 0;
     DWT->CTRL |= DWT_CTRL_CYCCNTENA_Msk;
 }
 
diff --git a/ports/mimxrt/ticks.c b/ports/mimxrt/ticks.c
index 676f81b30eb26..a5ee102428a57 100644
--- a/ports/mimxrt/ticks.c
+++ b/ports/mimxrt/ticks.c
@@ -56,6 +56,7 @@ void ticks_init(void) {
     NVIC_EnableIRQ(GPTx_IRQn);
 
     GPT_StartTimer(GPTx);
+    mp_hal_ticks_cpu_enable();
 }
 
 void GPTx_IRQHandler(void) {

From e7572776c3ec3a245c831f3f2aaa595a4dec43a8 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sat, 19 Jun 2021 11:00:55 +0200
Subject: [PATCH 1346/3533] mimxrt: Add dht_readinto() to the mimxrt module,
 and freeze dht.py.

The change affects dht.py from the drivers directory as well to include the
logic for the mimxrt port.
---
 drivers/dht/dht.py              | 8 ++++++--
 ports/mimxrt/Makefile           | 1 +
 ports/mimxrt/boards/manifest.py | 1 +
 ports/mimxrt/modmimxrt.c        | 4 ++++
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/drivers/dht/dht.py b/drivers/dht/dht.py
index 1163b382bbc77..322608990e5fc 100644
--- a/drivers/dht/dht.py
+++ b/drivers/dht/dht.py
@@ -1,9 +1,13 @@
 # DHT11/DHT22 driver for MicroPython on ESP8266
 # MIT license; Copyright (c) 2016 Damien P. George
 
-try:
+import sys
+
+if sys.platform.startswith("esp"):
     from esp import dht_readinto
-except:
+elif sys.platform == "mimxrt":
+    from mimxrt import dht_readinto
+else:
     from pyb import dht_readinto
 
 
diff --git a/ports/mimxrt/Makefile b/ports/mimxrt/Makefile
index 239b7cd0c79b4..7cda558bdc581 100644
--- a/ports/mimxrt/Makefile
+++ b/ports/mimxrt/Makefile
@@ -213,6 +213,7 @@ SRC_C += \
 	board_init.c \
 	dma_channel.c \
 	drivers/bus/softspi.c \
+	drivers/dht/dht.c \
 	eth.c \
 	extmod/modnetwork.c \
 	extmod/modonewire.c \
diff --git a/ports/mimxrt/boards/manifest.py b/ports/mimxrt/boards/manifest.py
index 9df589f126787..ccbd33cae8a26 100644
--- a/ports/mimxrt/boards/manifest.py
+++ b/ports/mimxrt/boards/manifest.py
@@ -1,3 +1,4 @@
 freeze("$(PORT_DIR)/modules")
 freeze("$(MPY_DIR)/drivers/onewire")
+freeze("$(MPY_DIR)/drivers/dht", "dht.py")
 include("$(MPY_DIR)/extmod/uasyncio/manifest.py")
diff --git a/ports/mimxrt/modmimxrt.c b/ports/mimxrt/modmimxrt.c
index addd4ba4d2ade..041a72f7f7de4 100644
--- a/ports/mimxrt/modmimxrt.c
+++ b/ports/mimxrt/modmimxrt.c
@@ -24,12 +24,16 @@
  * THE SOFTWARE.
  */
 
+#include "py/mperrno.h"
 #include "py/runtime.h"
+#include "drivers/dht/dht.h"
 #include "modmimxrt.h"
 
 STATIC const mp_rom_map_elem_t mimxrt_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__),            MP_ROM_QSTR(MP_QSTR_mimxrt) },
     { MP_ROM_QSTR(MP_QSTR_Flash),               MP_ROM_PTR(&mimxrt_flash_type) },
+
+    { MP_ROM_QSTR(MP_QSTR_dht_readinto), MP_ROM_PTR(&dht_readinto_obj) },
 };
 STATIC MP_DEFINE_CONST_DICT(mimxrt_module_globals, mimxrt_module_globals_table);
 

From c827d4b7ab418e5299e3d8b9fc8e7520ae42493a Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Mon, 9 Aug 2021 18:41:36 +0200
Subject: [PATCH 1347/3533] mimxrt: Extend the help() message and README.md.

---
 ports/mimxrt/README.md | 26 ++++++++++++++++++++------
 ports/mimxrt/main.c    | 14 +++++++++++---
 2 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/ports/mimxrt/README.md b/ports/mimxrt/README.md
index c24939f478791..c8c5d989b9c82 100644
--- a/ports/mimxrt/README.md
+++ b/ports/mimxrt/README.md
@@ -1,17 +1,31 @@
 Port of MicroPython to NXP iMX RT 10xx
 ======================================
 
-Currently supports Teensy 4.0 and the i.MX RT1010 EVK board.
+Currently supports Teensy 4.0, Teensy 4.1, and the
+MIMXRT1010_EVK, MIMXRT1020_EVK, MIMXRT1050_EVK, MIMXRT1060_EVK and
+MIMXRT1064_EVK boards.
 
 Features:
   - REPL over USB VCP
+  - machine.ADC
+  - machine.I2C
+  - machine.LED
   - machine.Pin
+  - machine.PWM
+  - machine.RTC
+  - machine.SDCard
+  - machine.SPI
+  - machine.Signal
+  - machine.SoftI2C
+  - machine.SoftSPI
+  - machine.Timer
+  - machine.UART
+  - LFS2 file system at the internal Flash
+  - SDCard support (not on MIMXRT1010_EVK)
+  - Ethernet (not on Teensy 4.0 and MIMXRT1010_EVK)
 
 Known issues:
-  - pyboard.py doesn't work with files larger than 64 bytes
-  - machine.Pin class currently does not support GPIOMUX option of
-    i.MX RT101x variants
 
 TODO:
-  - Enable TCM
-  - Peripherals (LED, Timers, etc)
+  - More peripherals (Counter, I2S, CAN, etc)
+  - More Python options
diff --git a/ports/mimxrt/main.c b/ports/mimxrt/main.c
index f921f50a0c6cb..fa6237ca0750c 100644
--- a/ports/mimxrt/main.c
+++ b/ports/mimxrt/main.c
@@ -163,17 +163,25 @@ const char mimxrt_help_text[] =
     "    Pin pull modes are: Pin.PULL_UP, Pin.PULL_UP_47K, Pin.PULL_UP_22K, Pin.PULL_DOWN, Pin.PULL_HOLD\n"
     "  machine.ADC(pin) -- make an analog object from a pin\n"
     "    methods: read_u16()\n"
-    "  machine.UART(id, baudrate=115200) -- create an UART object (id=1 - 8)\n"
+    "  machine.UART(id, baudrate=115200) -- create an UART object (id=1 - 8, board-specific)\n"
     "    methods: init(), write(buf), any()\n"
     "             buf=read(n), readinto(buf), buf=readline()\n"
     "    The RX and TX pins are fixed and board-specific.\n"
-    "  machine.SoftI2C() -- create an Soft I2C object\n"
+    "  machine.SoftI2C() -- create a Soft I2C object\n"
+    "  machine.I2C(id) -- create a HW I2C object\n"
     "    methods: readfrom(addr, buf, stop=True), writeto(addr, buf, stop=True)\n"
     "             readfrom_mem(addr, memaddr, arg), writeto_mem(addr, memaddr, arg)\n"
-    "  machine.SoftSPI(baudrate=1000000) -- create an SPI object ()\n"
+    "    SoftI2C allows to use any pin for sda and scl, HW I2C id's and pins are fixed\n"
+    "  machine.SoftSPI(baudrate=1000000) -- create a Soft SPI object\n"
+    "  machine.SPI(id, baudrate=1000000) -- create a HW SPI object\n"
     "    methods: read(nbytes, write=0x00), write(buf), write_readinto(wr_buf, rd_buf)\n"
+    "    SoftSPI allows to use any pin for SPI, HW SPI id's and pins are fixed\n"
     "  machine.Timer(id, freq, callback) -- create a hardware timer object (id=0,1,2)\n"
     "    eg: machine.Timer(freq=1, callback=lambda t:print(t))\n"
+    "  machine.RTC() -- create a Real Time Clock object\n"
+    "    methods: init(), datetime([dateime_tuple]), now()\n"
+    "  machine.PWM(pin, freq, duty_u16[, kw_opts]) -- create a PWM object\n"
+    "    methods: init(), duty_u16([value]), duty_ns([value]), freq([value])\n"
     "\n"
     "Useful control commands:\n"
     "  CTRL-C -- interrupt a running program\n"

From dc8be7ccad67f76f35c64c028588c9457ed438a2 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Fri, 13 Aug 2021 17:15:48 +0200
Subject: [PATCH 1348/3533] tools/autobuild: Add the MIMXRT1010_EVK board to
 autobuild.

Having a board now available for testing, this binary can be provided with
good confidence.
---
 tools/autobuild/build-mimxrt-latest.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/autobuild/build-mimxrt-latest.sh b/tools/autobuild/build-mimxrt-latest.sh
index f5bc1397a55f2..fea5da81c5438 100755
--- a/tools/autobuild/build-mimxrt-latest.sh
+++ b/tools/autobuild/build-mimxrt-latest.sh
@@ -33,5 +33,6 @@ fi
 # build the boards
 do_build TEENSY40 TEENSY40 hex
 do_build TEENSY41 TEENSY41 hex
+do_build MIMXRT1010_EVK MIMXRT1010_EVK bin
 do_build MIMXRT1020_EVK MIMXRT1020_EVK bin
 do_build MIMXRT1050_EVK MIMXRT1050_EVK bin

From a12e318948cc422950751f61563b46784eb6b665 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sun, 15 Aug 2021 08:10:19 +0200
Subject: [PATCH 1349/3533] mimxrt/mpconfigport.h: Enable f-strings.

---
 ports/mimxrt/mpconfigport.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/mimxrt/mpconfigport.h b/ports/mimxrt/mpconfigport.h
index f1c38b1fad4f4..1d487fb541aa5 100644
--- a/ports/mimxrt/mpconfigport.h
+++ b/ports/mimxrt/mpconfigport.h
@@ -70,6 +70,7 @@ uint32_t trng_random_u32(void);
 #define MICROPY_PY_FUNCTION_ATTRS           (1)
 #define MICROPY_PY_DESCRIPTORS              (1)
 #define MICROPY_PY_DELATTR_SETATTR          (1)
+#define MICROPY_PY_FSTRINGS                 (1)
 #define MICROPY_PY_BUILTINS_STR_UNICODE     (1)
 #define MICROPY_PY_BUILTINS_STR_CENTER      (1)
 #define MICROPY_PY_BUILTINS_STR_PARTITION   (1)

From 6754213a9d54f7c57005794824dd6aabd71855c8 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sun, 12 Sep 2021 17:57:01 +0200
Subject: [PATCH 1350/3533] mimxrt/modmachine: Implement soft_reset() and
 unique_id() functions.

---
 ports/mimxrt/modmachine.c | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/ports/mimxrt/modmachine.c b/ports/mimxrt/modmachine.c
index d4078d5660a1c..a05c81a40a0d3 100644
--- a/ports/mimxrt/modmachine.c
+++ b/ports/mimxrt/modmachine.c
@@ -32,10 +32,12 @@
 #include "extmod/machine_pulse.h"
 #include "extmod/machine_signal.h"
 #include "extmod/machine_spi.h"
+#include "shared/runtime/pyexec.h"
 #include "led.h"
 #include "pin.h"
 #include "modmachine.h"
 #include "fsl_clock.h"
+#include "fsl_ocotp.h"
 #include "fsl_wdog.h"
 
 #include CPU_HEADER_H
@@ -48,6 +50,21 @@ typedef enum {
     MP_SOFT_RESET
 } reset_reason_t;
 
+STATIC mp_obj_t machine_unique_id(void) {
+    unsigned char id[8];
+    OCOTP_Init(OCOTP, CLOCK_GetFreq(kCLOCK_IpgClk));
+    *(uint32_t *)&id[0] = OCOTP->CFG0;
+    *(uint32_t *)&id[4] = OCOTP->CFG1;
+    return mp_obj_new_bytes(id, sizeof(id));
+}
+MP_DEFINE_CONST_FUN_OBJ_0(machine_unique_id_obj, machine_unique_id);
+
+STATIC mp_obj_t machine_soft_reset(void) {
+    pyexec_system_exit = PYEXEC_FORCED_EXIT;
+    mp_raise_type(&mp_type_SystemExit);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(machine_soft_reset_obj, machine_soft_reset);
+
 STATIC mp_obj_t machine_reset(void) {
     WDOG_TriggerSystemSoftwareReset(WDOG1);
     return mp_const_none;
@@ -94,6 +111,8 @@ MP_DEFINE_CONST_FUN_OBJ_1(machine_enable_irq_obj, machine_enable_irq);
 
 STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__),            MP_ROM_QSTR(MP_QSTR_umachine) },
+    { MP_ROM_QSTR(MP_QSTR_unique_id),           MP_ROM_PTR(&machine_unique_id_obj) },
+    { MP_ROM_QSTR(MP_QSTR_soft_reset),          MP_ROM_PTR(&machine_soft_reset_obj) },
     { MP_ROM_QSTR(MP_QSTR_reset),               MP_ROM_PTR(&machine_reset_obj) },
     { MP_ROM_QSTR(MP_QSTR_reset_cause),         MP_ROM_PTR(&machine_reset_cause_obj) },
     { MP_ROM_QSTR(MP_QSTR_freq),                MP_ROM_PTR(&machine_freq_obj) },

From 90b45efa6a7efaef80db9b6bbac48690723fb8b9 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Thu, 16 Sep 2021 08:40:01 +0200
Subject: [PATCH 1351/3533] mimxrt/boards/make-pins.py: Allow empty lines and
 comments in pins.csv.

---
 ports/mimxrt/boards/make-pins.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/ports/mimxrt/boards/make-pins.py b/ports/mimxrt/boards/make-pins.py
index aba517127cc3a..e13b9c578fd93 100644
--- a/ports/mimxrt/boards/make-pins.py
+++ b/ports/mimxrt/boards/make-pins.py
@@ -180,6 +180,12 @@ def parse_board_file(self, filename):
         with open(filename, "r") as csvfile:
             rows = csv.reader(csvfile)
             for row in rows:
+                if len(row) == 0 or row[0].startswith("#"):
+                    # Skip empty lines, and lines starting with "#"
+                    continue
+                if len(row) != 2:
+                    raise ValueError("Expecting two entries in a row")
+
                 pin = self.find_pin_by_name(row[1])
                 if pin and row[0]:  # Only add board pins that have a name
                     self.board_pins.append(NamedPin(row[0], pin.pad, pin.idx))

From 4f89c38a6a9ecdda2931e9226c847c4d279d04f6 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Fri, 17 Sep 2021 08:25:33 +0200
Subject: [PATCH 1352/3533] mimxrt: Optimize the runtime speed.

By moving code to ITCM, like vm, gc, parse, runtime.  The change affects
mostly the execution speed of MicroPython code.  The speed is increased by
up to a factor of 6, especially for MCU with small cache.
---
 ports/mimxrt/boards/common.ld | 5 +++--
 ports/mimxrt/mpconfigport.h   | 4 +++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/ports/mimxrt/boards/common.ld b/ports/mimxrt/boards/common.ld
index 5dd7097fab968..7aee66e2e8e11 100644
--- a/ports/mimxrt/boards/common.ld
+++ b/ports/mimxrt/boards/common.ld
@@ -96,7 +96,7 @@ SECTIONS
   .text :
   {
     . = ALIGN(4);
-    *(EXCLUDE_FILE(*fsl_flexspi.o) .text*) /* .text* sections (code) */
+    *(EXCLUDE_FILE(*fsl_flexspi.o *gc*.o *vm.o *parse.o *runtime*.o *mpirq.o *map.o) .text*) /* .text* sections (code) */
     *(.rodata)               /* .rodata sections (constants, strings, etc.) */
     *(.rodata*)              /* .rodata* sections (constants, strings, etc.) */
     *(.glue_7)               /* glue arm to thumb code */
@@ -200,8 +200,9 @@ SECTIONS
   {
     . = ALIGN(4);
     __ram_function_start__ = .;
-    *fsl_flexspi.o(.text*)
     *(.ram_functions*)
+    /* remaining .text and .rodata; i.e. stuff we exclude above because we want it in RAM */
+    *(.text*)
     . = ALIGN(4);
     __ram_function_end__ = .;
   } > m_itcm  
diff --git a/ports/mimxrt/mpconfigport.h b/ports/mimxrt/mpconfigport.h
index 1d487fb541aa5..35ee9eb648a4a 100644
--- a/ports/mimxrt/mpconfigport.h
+++ b/ports/mimxrt/mpconfigport.h
@@ -43,7 +43,9 @@ uint32_t trng_random_u32(void);
 #define MICROPY_EMIT_THUMB                  (1)
 #define MICROPY_EMIT_INLINE_THUMB           (1)
 
-// Compiler configuration
+// Optimisations
+#define MICROPY_OPT_LOAD_ATTR_FAST_PATH     (1)
+#define MICROPY_OPT_MAP_LOOKUP_CACHE        (1)
 
 // Python internal features
 #define MICROPY_READER_VFS                  (1)

From 9f6604eb2723c48bfe712a57801d0c7f14c6fbda Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sun, 19 Sep 2021 22:08:51 +0200
Subject: [PATCH 1353/3533] mimxrt: Enable the platform module.

---
 ports/mimxrt/mpconfigport.h | 1 +
 ports/mimxrt/mphalport.h    | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/ports/mimxrt/mpconfigport.h b/ports/mimxrt/mpconfigport.h
index 35ee9eb648a4a..64e991c7996d6 100644
--- a/ports/mimxrt/mpconfigport.h
+++ b/ports/mimxrt/mpconfigport.h
@@ -135,6 +135,7 @@ uint32_t trng_random_u32(void);
 #define MICROPY_PY_MACHINE_SOFTSPI          (1)
 #define MICROPY_PY_FRAMEBUF                 (1)
 #define MICROPY_PY_ONEWIRE                  (1)
+#define MICROPY_PY_UPLATFORM                (1)
 
 // fatfs configuration used in ffconf.h
 #define MICROPY_FATFS_ENABLE_LFN            (1)
diff --git a/ports/mimxrt/mphalport.h b/ports/mimxrt/mphalport.h
index 40e929b23bfe5..c02f561a9d60b 100644
--- a/ports/mimxrt/mphalport.h
+++ b/ports/mimxrt/mphalport.h
@@ -33,6 +33,8 @@
 #include "pin.h"
 #include "fsl_clock.h"
 
+#define MICROPY_HAL_VERSION             "2.8.0"
+
 #define MP_HAL_PIN_FMT                  "%q"
 extern ringbuf_t stdin_ringbuf;
 

From 64e4bae129263278f72a6c3494f1e67c7895fcdd Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 25 Oct 2021 16:38:25 +1100
Subject: [PATCH 1354/3533] tools/ci.sh: Use a specific ESP IDF v4.4 commit.

There is no release of IDF v4.4 yet but master is now on v5.0-dev so a
specific commit must be chosen to stick to v4.4.

Signed-off-by: Damien George <damien@micropython.org>
---
 tools/ci.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tools/ci.sh b/tools/ci.sh
index 407ea04579193..f9b90b9687654 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -107,7 +107,8 @@ function ci_esp32_idf402_setup {
 }
 
 function ci_esp32_idf44_setup {
-    ci_esp32_setup_helper master
+    # This commit is just before v5.0-dev
+    ci_esp32_setup_helper 142bb32c50fa9875b8b69fa539a2d59559460d72
 }
 
 function ci_esp32_build {

From 43467b9c719928ffaf2bc1cb314338bc402914e1 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Mon, 27 Sep 2021 16:27:42 +1000
Subject: [PATCH 1355/3533] extmod/modbluetooth: Add connection interval to
 gap_connect.

This forwards through directly to the NimBLE and BTStack connect functions.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 docs/library/bluetooth.rst            | 11 ++++++++++-
 extmod/btstack/modbluetooth_btstack.c |  6 +++---
 extmod/modbluetooth.c                 | 14 +++++++++++---
 extmod/modbluetooth.h                 |  2 +-
 extmod/nimble/modbluetooth_nimble.c   | 12 +++++++-----
 ports/zephyr/modbluetooth_zephyr.c    |  2 +-
 6 files changed, 33 insertions(+), 14 deletions(-)

diff --git a/docs/library/bluetooth.rst b/docs/library/bluetooth.rst
index 6ebceeed581d6..cfec804eafbf7 100644
--- a/docs/library/bluetooth.rst
+++ b/docs/library/bluetooth.rst
@@ -359,7 +359,7 @@ Central Role
 
 A central device can connect to peripherals that it has discovered using the observer role (see :meth:`gap_scan<BLE.gap_scan>`) or with a known address.
 
-.. method:: BLE.gap_connect(addr_type, addr, scan_duration_ms=2000, /)
+.. method:: BLE.gap_connect(addr_type, addr, scan_duration_ms=2000, min_conn_interval_us=None, max_conn_interval_us=None, /)
 
     Connect to a peripheral.
 
@@ -367,6 +367,15 @@ A central device can connect to peripherals that it has discovered using the obs
 
     On success, the ``_IRQ_PERIPHERAL_CONNECT`` event will be raised.
 
+    The device will wait up to *scan_duration_ms* to receive an advertising
+    payload from the device.
+
+    The connection interval can be configured in **micro**\ seconds using either
+    or both of *min_conn_interval_us* and *max_conn_interval_us*. Otherwise a
+    default interval will be chosen, typically between 30000 and 50000
+    microseconds. A shorter interval will increase throughput, at the expense
+    of power usage.
+
 
 Peripheral Role
 ---------------
diff --git a/extmod/btstack/modbluetooth_btstack.c b/extmod/btstack/modbluetooth_btstack.c
index 4e81e21fe2877..cd2ba83d536e7 100644
--- a/extmod/btstack/modbluetooth_btstack.c
+++ b/extmod/btstack/modbluetooth_btstack.c
@@ -1265,13 +1265,13 @@ int mp_bluetooth_gap_scan_stop(void) {
     return 0;
 }
 
-int mp_bluetooth_gap_peripheral_connect(uint8_t addr_type, const uint8_t *addr, int32_t duration_ms) {
+int mp_bluetooth_gap_peripheral_connect(uint8_t addr_type, const uint8_t *addr, int32_t duration_ms, int32_t min_conn_interval_us, int32_t max_conn_interval_us) {
     DEBUG_printf("mp_bluetooth_gap_peripheral_connect\n");
 
     uint16_t conn_scan_interval = 60000 / 625;
     uint16_t conn_scan_window = 30000 / 625;
-    uint16_t conn_interval_min = 10000 / 1250;
-    uint16_t conn_interval_max = 30000 / 1250;
+    uint16_t conn_interval_min = (min_conn_interval_us ? min_conn_interval_us : 10000) / 1250;
+    uint16_t conn_interval_max = (max_conn_interval_us ? max_conn_interval_us : 30000) / 1250;
     uint16_t conn_latency = 4;
     uint16_t supervision_timeout = duration_ms / 10; // default = 720
     uint16_t min_ce_length = 10000 / 625;
diff --git a/extmod/modbluetooth.c b/extmod/modbluetooth.c
index cb153f70e9b5c..e3d64b81f1542 100644
--- a/extmod/modbluetooth.c
+++ b/extmod/modbluetooth.c
@@ -637,14 +637,22 @@ STATIC mp_obj_t bluetooth_ble_gap_connect(size_t n_args, const mp_obj_t *args) {
         mp_raise_ValueError(MP_ERROR_TEXT("invalid addr"));
     }
     mp_int_t scan_duration_ms = MP_BLUETOOTH_CONNECT_DEFAULT_SCAN_DURATION_MS;
-    if (n_args == 4) {
+    mp_int_t min_conn_interval_us = 0;
+    mp_int_t max_conn_interval_us = 0;
+    if (n_args >= 4 && args[3] != mp_const_none) {
         scan_duration_ms = mp_obj_get_int(args[3]);
     }
+    if (n_args >= 5 && args[4] != mp_const_none) {
+        min_conn_interval_us = mp_obj_get_int(args[4]);
+    }
+    if (n_args >= 6 && args[5] != mp_const_none) {
+        max_conn_interval_us = mp_obj_get_int(args[5]);
+    }
 
-    int err = mp_bluetooth_gap_peripheral_connect(addr_type, bufinfo.buf, scan_duration_ms);
+    int err = mp_bluetooth_gap_peripheral_connect(addr_type, bufinfo.buf, scan_duration_ms, min_conn_interval_us, max_conn_interval_us);
     return bluetooth_handle_errno(err);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(bluetooth_ble_gap_connect_obj, 3, 4, bluetooth_ble_gap_connect);
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(bluetooth_ble_gap_connect_obj, 3, 6, bluetooth_ble_gap_connect);
 
 STATIC mp_obj_t bluetooth_ble_gap_scan(size_t n_args, const mp_obj_t *args) {
     // Default is indefinite scan, with the NimBLE "background scan" interval and window.
diff --git a/extmod/modbluetooth.h b/extmod/modbluetooth.h
index 43519e5941a8b..fe41fd5143910 100644
--- a/extmod/modbluetooth.h
+++ b/extmod/modbluetooth.h
@@ -370,7 +370,7 @@ int mp_bluetooth_gap_scan_start(int32_t duration_ms, int32_t interval_us, int32_
 int mp_bluetooth_gap_scan_stop(void);
 
 // Connect to a found peripheral.
-int mp_bluetooth_gap_peripheral_connect(uint8_t addr_type, const uint8_t *addr, int32_t duration_ms);
+int mp_bluetooth_gap_peripheral_connect(uint8_t addr_type, const uint8_t *addr, int32_t duration_ms, int32_t min_conn_interval_us, int32_t max_conn_interval_us);
 #endif
 
 #if MICROPY_PY_BLUETOOTH_ENABLE_GATT_CLIENT
diff --git a/extmod/nimble/modbluetooth_nimble.c b/extmod/nimble/modbluetooth_nimble.c
index e4b4cb68af1af..6ac31fd4bdeb3 100644
--- a/extmod/nimble/modbluetooth_nimble.c
+++ b/extmod/nimble/modbluetooth_nimble.c
@@ -1202,7 +1202,7 @@ STATIC int peripheral_gap_event_cb(struct ble_gap_event *event, void *arg) {
     return commmon_gap_event_cb(event, arg);
 }
 
-int mp_bluetooth_gap_peripheral_connect(uint8_t addr_type, const uint8_t *addr, int32_t duration_ms) {
+int mp_bluetooth_gap_peripheral_connect(uint8_t addr_type, const uint8_t *addr, int32_t duration_ms, int32_t min_conn_interval_us, int32_t max_conn_interval_us) {
     DEBUG_printf("mp_bluetooth_gap_peripheral_connect\n");
     if (!mp_bluetooth_is_active()) {
         return ERRNO_BLUETOOTH_NOT_ACTIVE;
@@ -1211,12 +1211,14 @@ int mp_bluetooth_gap_peripheral_connect(uint8_t addr_type, const uint8_t *addr,
         mp_bluetooth_gap_scan_stop();
     }
 
-    // TODO: This is the same as ble_gap_conn_params_dflt (i.e. passing NULL).
-    STATIC const struct ble_gap_conn_params params = {
+    uint16_t conn_interval_min = min_conn_interval_us ? min_conn_interval_us / BLE_HCI_CONN_ITVL : BLE_GAP_INITIAL_CONN_ITVL_MIN;
+    uint16_t conn_interval_max = max_conn_interval_us ? max_conn_interval_us / BLE_HCI_CONN_ITVL : BLE_GAP_INITIAL_CONN_ITVL_MAX;
+
+    const struct ble_gap_conn_params params = {
         .scan_itvl = 0x0010,
         .scan_window = 0x0010,
-        .itvl_min = BLE_GAP_INITIAL_CONN_ITVL_MIN,
-        .itvl_max = BLE_GAP_INITIAL_CONN_ITVL_MAX,
+        .itvl_min = conn_interval_min,
+        .itvl_max = conn_interval_max,
         .latency = BLE_GAP_INITIAL_CONN_LATENCY,
         .supervision_timeout = BLE_GAP_INITIAL_SUPERVISION_TIMEOUT,
         .min_ce_len = BLE_GAP_INITIAL_CONN_MIN_CE_LEN,
diff --git a/ports/zephyr/modbluetooth_zephyr.c b/ports/zephyr/modbluetooth_zephyr.c
index 5753d714760b1..f4b6f355905fe 100644
--- a/ports/zephyr/modbluetooth_zephyr.c
+++ b/ports/zephyr/modbluetooth_zephyr.c
@@ -400,7 +400,7 @@ int mp_bluetooth_gap_scan_stop(void) {
     return bt_err_to_errno(err);
 }
 
-int mp_bluetooth_gap_peripheral_connect(uint8_t addr_type, const uint8_t *addr, int32_t duration_ms) {
+int mp_bluetooth_gap_peripheral_connect(uint8_t addr_type, const uint8_t *addr, int32_t duration_ms, int32_t min_conn_interval_us, int32_t max_conn_interval_us) {
     DEBUG_printf("mp_bluetooth_gap_peripheral_connect\n");
     if (!mp_bluetooth_is_active()) {
         return ERRNO_BLUETOOTH_NOT_ACTIVE;

From 1244d7f0bdce6531085f35a36039662147341e74 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Tue, 26 Oct 2021 16:39:38 +1100
Subject: [PATCH 1356/3533] lib/mynewt-nimble: Switch to the MicroPython fork
 of NimBLE.

We will use this fork for adding further features and patches to support
MicroPython.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 .gitmodules | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitmodules b/.gitmodules
index 9fd45dfecf00d..474ae9890b0dd 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -28,7 +28,7 @@
 	url = https://github.com/hathach/tinyusb
 [submodule "lib/mynewt-nimble"]
 	path = lib/mynewt-nimble
-	url = https://github.com/apache/mynewt-nimble.git
+	url = https://github.com/micropython/mynewt-nimble.git
 [submodule "lib/btstack"]
 	path = lib/btstack
 	url = https://github.com/bluekitchen/btstack.git

From 948e3289bf3e86974f1fc399aadb130e9de26401 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Thu, 8 Jul 2021 00:43:56 +1000
Subject: [PATCH 1357/3533] extmod/nimble: Update to NimBLE v1.4.

We're using the MicroPython fork of NimBLE, which on the
`micropython_1_4_0` branch re-adds support for 64-bit targets and fixes
initialisation of g_msys_pool_list.

Also updates modbluetooth_nimble.c to suit v1.4.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 extmod/nimble/modbluetooth_nimble.c  | 49 +++++++++++++---------------
 extmod/nimble/nimble/nimble_npl_os.h |  6 +++-
 lib/mynewt-nimble                    |  2 +-
 3 files changed, 29 insertions(+), 28 deletions(-)

diff --git a/extmod/nimble/modbluetooth_nimble.c b/extmod/nimble/modbluetooth_nimble.c
index 6ac31fd4bdeb3..125e282d0de70 100644
--- a/extmod/nimble/modbluetooth_nimble.c
+++ b/extmod/nimble/modbluetooth_nimble.c
@@ -138,9 +138,9 @@ STATIC int ble_gattc_attr_write_cb(uint16_t conn_handle, const struct ble_gatt_e
 
 #if MICROPY_PY_BLUETOOTH_ENABLE_PAIRING_BONDING
 // Bonding store.
-STATIC int ble_store_ram_read(int obj_type, const union ble_store_key *key, union ble_store_value *value);
-STATIC int ble_store_ram_write(int obj_type, const union ble_store_value *val);
-STATIC int ble_store_ram_delete(int obj_type, const union ble_store_key *key);
+STATIC int ble_secret_store_read(int obj_type, const union ble_store_key *key, union ble_store_value *value);
+STATIC int ble_secret_store_write(int obj_type, const union ble_store_value *val);
+STATIC int ble_secret_store_delete(int obj_type, const union ble_store_key *key);
 #endif
 
 STATIC int ble_hs_err_to_errno(int err) {
@@ -604,6 +604,12 @@ int mp_bluetooth_init(void) {
     ble_hs_cfg.gatts_register_cb = gatts_register_cb;
     ble_hs_cfg.store_status_cb = ble_store_util_status_rr;
 
+    #if MICROPY_PY_BLUETOOTH_ENABLE_PAIRING_BONDING
+    ble_hs_cfg.store_read_cb = ble_secret_store_read;
+    ble_hs_cfg.store_write_cb = ble_secret_store_write;
+    ble_hs_cfg.store_delete_cb = ble_secret_store_delete;
+    #endif // MICROPY_PY_BLUETOOTH_ENABLE_PAIRING_BONDING
+
     MP_STATE_PORT(bluetooth_nimble_root_pointers) = m_new0(mp_bluetooth_nimble_root_pointers_t, 1);
     mp_bluetooth_gatts_db_create(&MP_STATE_PORT(bluetooth_nimble_root_pointers)->gatts_db);
 
@@ -1826,8 +1832,8 @@ int mp_bluetooth_hci_cmd(uint16_t ogf, uint16_t ocf, const uint8_t *req, size_t
 
 #if MICROPY_PY_BLUETOOTH_ENABLE_PAIRING_BONDING
 
-STATIC int ble_store_ram_read(int obj_type, const union ble_store_key *key, union ble_store_value *value) {
-    DEBUG_printf("ble_store_ram_read: %d\n", obj_type);
+STATIC int ble_secret_store_read(int obj_type, const union ble_store_key *key, union ble_store_value *value) {
+    DEBUG_printf("ble_secret_store_read: %d\n", obj_type);
     const uint8_t *key_data;
     size_t key_data_len;
 
@@ -1861,7 +1867,7 @@ STATIC int ble_store_ram_read(int obj_type, const union ble_store_key *key, unio
         }
         case BLE_STORE_OBJ_TYPE_CCCD: {
             // TODO: Implement CCCD persistence.
-            DEBUG_printf("ble_store_ram_read: CCCD not supported.\n");
+            DEBUG_printf("ble_secret_store_read: CCCD not supported.\n");
             return -1;
         }
         default:
@@ -1871,18 +1877,18 @@ STATIC int ble_store_ram_read(int obj_type, const union ble_store_key *key, unio
     const uint8_t *value_data;
     size_t value_data_len;
     if (!mp_bluetooth_gap_on_get_secret(obj_type, key->sec.idx, key_data, key_data_len, &value_data, &value_data_len)) {
-        DEBUG_printf("ble_store_ram_read: Key not found: type=%d, index=%u, key=0x%p, len=" UINT_FMT "\n", obj_type, key->sec.idx, key_data, key_data_len);
+        DEBUG_printf("ble_secret_store_read: Key not found: type=%d, index=%u, key=0x%p, len=" UINT_FMT "\n", obj_type, key->sec.idx, key_data, key_data_len);
         return BLE_HS_ENOENT;
     }
 
     if (value_data_len != sizeof(struct ble_store_value_sec)) {
-        DEBUG_printf("ble_store_ram_read: Invalid key data: actual=" UINT_FMT " expected=" UINT_FMT "\n", value_data_len, sizeof(struct ble_store_value_sec));
+        DEBUG_printf("ble_secret_store_read: Invalid key data: actual=" UINT_FMT " expected=" UINT_FMT "\n", value_data_len, sizeof(struct ble_store_value_sec));
         return BLE_HS_ENOENT;
     }
 
     memcpy((uint8_t *)&value->sec, value_data, sizeof(struct ble_store_value_sec));
 
-    DEBUG_printf("ble_store_ram_read: found secret\n");
+    DEBUG_printf("ble_secret_store_read: found secret\n");
 
     if (obj_type == BLE_STORE_OBJ_TYPE_OUR_SEC) {
         // TODO: Verify ediv_rand matches.
@@ -1891,8 +1897,8 @@ STATIC int ble_store_ram_read(int obj_type, const union ble_store_key *key, unio
     return 0;
 }
 
-STATIC int ble_store_ram_write(int obj_type, const union ble_store_value *val) {
-    DEBUG_printf("ble_store_ram_write: %d\n", obj_type);
+STATIC int ble_secret_store_write(int obj_type, const union ble_store_value *val) {
+    DEBUG_printf("ble_secret_store_write: %d\n", obj_type);
     switch (obj_type) {
         case BLE_STORE_OBJ_TYPE_PEER_SEC:
         case BLE_STORE_OBJ_TYPE_OUR_SEC: {
@@ -1910,13 +1916,13 @@ STATIC int ble_store_ram_write(int obj_type, const union ble_store_value *val) {
                 return BLE_HS_ESTORE_CAP;
             }
 
-            DEBUG_printf("ble_store_ram_write: wrote secret\n");
+            DEBUG_printf("ble_secret_store_write: wrote secret\n");
 
             return 0;
         }
         case BLE_STORE_OBJ_TYPE_CCCD: {
             // TODO: Implement CCCD persistence.
-            DEBUG_printf("ble_store_ram_write: CCCD not supported.\n");
+            DEBUG_printf("ble_secret_store_write: CCCD not supported.\n");
             // Just pretend we wrote it.
             return 0;
         }
@@ -1925,8 +1931,8 @@ STATIC int ble_store_ram_write(int obj_type, const union ble_store_value *val) {
     }
 }
 
-STATIC int ble_store_ram_delete(int obj_type, const union ble_store_key *key) {
-    DEBUG_printf("ble_store_ram_delete: %d\n", obj_type);
+STATIC int ble_secret_store_delete(int obj_type, const union ble_store_key *key) {
+    DEBUG_printf("ble_secret_store_delete: %d\n", obj_type);
     switch (obj_type) {
         case BLE_STORE_OBJ_TYPE_PEER_SEC:
         case BLE_STORE_OBJ_TYPE_OUR_SEC: {
@@ -1940,13 +1946,13 @@ STATIC int ble_store_ram_delete(int obj_type, const union ble_store_key *key) {
                 return BLE_HS_ENOENT;
             }
 
-            DEBUG_printf("ble_store_ram_delete: deleted secret\n");
+            DEBUG_printf("ble_secret_store_delete: deleted secret\n");
 
             return 0;
         }
         case BLE_STORE_OBJ_TYPE_CCCD: {
             // TODO: Implement CCCD persistence.
-            DEBUG_printf("ble_store_ram_delete: CCCD not supported.\n");
+            DEBUG_printf("ble_secret_store_delete: CCCD not supported.\n");
             // Just pretend it wasn't there.
             return BLE_HS_ENOENT;
         }
@@ -1955,15 +1961,6 @@ STATIC int ble_store_ram_delete(int obj_type, const union ble_store_key *key) {
     }
 }
 
-// nimble_port_init always calls ble_store_ram_init. We provide this alternative
-// implementation rather than the one in nimble/store/ram/src/ble_store_ram.c.
-// TODO: Consider re-implementing nimble_port_init instead.
-void ble_store_ram_init(void) {
-    ble_hs_cfg.store_read_cb = ble_store_ram_read;
-    ble_hs_cfg.store_write_cb = ble_store_ram_write;
-    ble_hs_cfg.store_delete_cb = ble_store_ram_delete;
-}
-
 #endif // MICROPY_PY_BLUETOOTH_ENABLE_PAIRING_BONDING
 
 #endif // MICROPY_PY_BLUETOOTH && MICROPY_BLUETOOTH_NIMBLE
diff --git a/extmod/nimble/nimble/nimble_npl_os.h b/extmod/nimble/nimble/nimble_npl_os.h
index d0803f7e2e81d..3205baa032da7 100644
--- a/extmod/nimble/nimble/nimble_npl_os.h
+++ b/extmod/nimble/nimble/nimble_npl_os.h
@@ -35,7 +35,11 @@
 // --- Configuration of NimBLE data structures --------------------------------
 
 // This is used at runtime to align allocations correctly.
-#define BLE_NPL_OS_ALIGNMENT (sizeof(uintptr_t))
+#if __WORDSIZE == 64
+#define BLE_NPL_OS_ALIGNMENT 8
+#else
+#define BLE_NPL_OS_ALIGNMENT 4
+#endif
 #define BLE_NPL_TIME_FOREVER (0xffffffff)
 
 // This is used at compile time to force struct member alignment. See
diff --git a/lib/mynewt-nimble b/lib/mynewt-nimble
index 97ce3eacaaa79..42849560ba790 160000
--- a/lib/mynewt-nimble
+++ b/lib/mynewt-nimble
@@ -1 +1 @@
-Subproject commit 97ce3eacaaa79e8ed6cf71717149ced4f5328ee7
+Subproject commit 42849560ba7906f023f61e5f7ff3709ba2c1dfca

From 9519484c564de8408d001ebbf45de27ef78bb60a Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Tue, 21 Sep 2021 13:36:06 +1000
Subject: [PATCH 1358/3533] extmod/nimble: Remove workaround for OS_ENOMEM.

This was fixed in NimBLE 1.4.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 extmod/nimble/modbluetooth_nimble.c | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/extmod/nimble/modbluetooth_nimble.c b/extmod/nimble/modbluetooth_nimble.c
index 125e282d0de70..919841c243643 100644
--- a/extmod/nimble/modbluetooth_nimble.c
+++ b/extmod/nimble/modbluetooth_nimble.c
@@ -1747,12 +1747,6 @@ int mp_bluetooth_l2cap_send(uint16_t conn_handle, uint16_t cid, const uint8_t *b
         *stalled = true;
     }
 
-    // Sometimes we see what looks like BLE_HS_EAGAIN (but it's actually
-    // OS_ENOMEM in disguise). Fixed in NimBLE v1.4.
-    if (err == OS_ENOMEM) {
-        err = BLE_HS_ENOMEM;
-    }
-
     // Other error codes such as BLE_HS_EBUSY (we're stalled) or BLE_HS_EBADDATA (bigger than MTU).
     return ble_hs_err_to_errno(err);
 }

From e359b077dd9b44fea17ae8fa46177ccee36f1fd2 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Thu, 2 Sep 2021 00:08:30 +1000
Subject: [PATCH 1359/3533] ports: Add board.json for all boards.

This will be used by https://micropython.org/download/ to generate the
full listing of boards and firmware files.

Optionally supports a board.md for additional customisation of the
download page, as well as deploy.md for flashing instructions.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/cc3200/boards/WIPY/board.json           | 16 ++++++++++
 ports/cc3200/boards/WIPY/deploy.md            |  2 ++
 ports/esp32/boards/ESP32_S2_WROVER/board.json | 13 ++++++++
 ports/esp32/boards/GENERIC/board.json         | 20 ++++++++++++
 ports/esp32/boards/GENERIC/board.md           |  3 ++
 ports/esp32/boards/GENERIC_C3/board.json      | 14 +++++++++
 ports/esp32/boards/GENERIC_C3_USB/board.json  | 14 +++++++++
 ports/esp32/boards/GENERIC_D2WD/board.json    | 14 +++++++++
 ports/esp32/boards/GENERIC_OTA/board.json     | 14 +++++++++
 ports/esp32/boards/GENERIC_S2/board.json      | 13 ++++++++
 ports/esp32/boards/GENERIC_S3/board.json      | 13 ++++++++
 ports/esp32/boards/GENERIC_SPIRAM/board.json  | 21 +++++++++++++
 ports/esp32/boards/GENERIC_SPIRAM/board.md    |  3 ++
 ports/esp32/boards/LOLIN_S2_MINI/board.json   | 13 ++++++++
 ports/esp32/boards/M5STACK_ATOM/board.json    | 13 ++++++++
 ports/esp32/boards/SIL_WESP32/board.json      | 14 +++++++++
 ports/esp32/boards/UM_FEATHERS2/board.json    | 23 ++++++++++++++
 ports/esp32/boards/UM_FEATHERS2NEO/board.json | 22 +++++++++++++
 ports/esp32/boards/UM_TINYPICO/board.json     | 19 ++++++++++++
 ports/esp32/boards/UM_TINYS2/board.json       | 16 ++++++++++
 ports/esp32/boards/deploy.md                  | 13 ++++++++
 ports/esp8266/boards/GENERIC/board.json       | 17 ++++++++++
 ports/esp8266/boards/GENERIC/board.md         | 19 ++++++++++++
 ports/esp8266/boards/GENERIC_1M/board.json    | 14 +++++++++
 ports/esp8266/boards/GENERIC_1M/board.md      |  5 +++
 ports/esp8266/boards/GENERIC_512K/board.json  | 14 +++++++++
 ports/esp8266/boards/GENERIC_512K/board.md    |  3 ++
 ports/esp8266/boards/deploy.md                |  1 +
 ports/mimxrt/boards/MIMXRT1010_EVK/board.json | 13 ++++++++
 ports/mimxrt/boards/MIMXRT1020_EVK/board.json | 13 ++++++++
 ports/mimxrt/boards/MIMXRT1050_EVK/board.json | 13 ++++++++
 ports/mimxrt/boards/MIMXRT1060_EVK/board.json | 13 ++++++++
 ports/mimxrt/boards/MIMXRT1064_EVK/board.json | 13 ++++++++
 ports/mimxrt/boards/TEENSY40/board.json       | 13 ++++++++
 ports/mimxrt/boards/TEENSY41/board.json       | 13 ++++++++
 ports/mimxrt/boards/deploy.md                 |  0
 ports/nrf/boards/actinius_icarus/board.json   | 13 ++++++++
 ports/nrf/boards/arduino_primo/board.json     | 13 ++++++++
 ports/nrf/boards/blueio_tag_evim/board.json   | 13 ++++++++
 ports/nrf/boards/deploy.md                    |  0
 ports/nrf/boards/dvk_bl652/board.json         | 13 ++++++++
 ports/nrf/boards/evk_nina_b1/board.json       | 13 ++++++++
 ports/nrf/boards/evk_nina_b3/board.json       | 13 ++++++++
 ports/nrf/boards/feather52/board.json         | 15 +++++++++
 ports/nrf/boards/ibk_blyst_nano/board.json    | 13 ++++++++
 ports/nrf/boards/idk_blyst_nano/board.json    | 13 ++++++++
 ports/nrf/boards/microbit/board.json          | 13 ++++++++
 .../boards/nrf52840-mdk-usb-dongle/board.json | 13 ++++++++
 ports/nrf/boards/particle_xenon/board.json    | 13 ++++++++
 ports/nrf/boards/pca10000/board.json          | 13 ++++++++
 ports/nrf/boards/pca10001/board.json          | 13 ++++++++
 ports/nrf/boards/pca10028/board.json          | 13 ++++++++
 ports/nrf/boards/pca10031/board.json          | 13 ++++++++
 ports/nrf/boards/pca10040/board.json          | 13 ++++++++
 ports/nrf/boards/pca10056/board.json          | 13 ++++++++
 ports/nrf/boards/pca10059/board.json          | 15 +++++++++
 ports/nrf/boards/pca10090/board.json          | 13 ++++++++
 ports/nrf/boards/wt51822_s4at/board.json      | 13 ++++++++
 .../boards/ADAFRUIT_FEATHER_RP2040/board.json | 15 +++++++++
 .../ADAFRUIT_ITSYBITSY_RP2040/board.json      | 15 +++++++++
 .../boards/ADAFRUIT_QTPY_RP2040/board.json    | 15 +++++++++
 ports/rp2/boards/PICO/board.json              | 16 ++++++++++
 .../boards/PIMORONI_PICOLIPO_16MB/board.json  | 15 +++++++++
 .../boards/PIMORONI_PICOLIPO_4MB/board.json   | 15 +++++++++
 ports/rp2/boards/PIMORONI_TINY2040/board.json | 15 +++++++++
 ports/rp2/boards/SPARKFUN_PROMICRO/board.json | 15 +++++++++
 .../rp2/boards/SPARKFUN_THINGPLUS/board.json  | 15 +++++++++
 ports/rp2/boards/deploy.md                    |  8 +++++
 .../ADAFRUIT_FEATHER_M0_EXPRESS/board.json    | 15 +++++++++
 .../ADAFRUIT_ITSYBITSY_M4_EXPRESS/board.json  | 15 +++++++++
 .../boards/ADAFRUIT_TRINKET_M0/board.json     | 15 +++++++++
 ports/samd/boards/MINISAM_M4/board.json       | 15 +++++++++
 .../boards/SAMD21_XPLAINED_PRO/board.json     | 13 ++++++++
 ports/samd/boards/deploy.md                   |  0
 .../boards/ADAFRUIT_F405_EXPRESS/board.json   | 13 ++++++++
 ports/stm32/boards/B_L072Z_LRWAN1/board.json  | 13 ++++++++
 ports/stm32/boards/B_L475E_IOT01A/board.json  | 13 ++++++++
 ports/stm32/boards/CERB40/board.json          | 13 ++++++++
 ports/stm32/boards/ESPRUINO_PICO/board.json   | 15 +++++++++
 ports/stm32/boards/ESPRUINO_PICO/deploy.md    |  1 +
 ports/stm32/boards/HYDRABUS/board.json        | 13 ++++++++
 ports/stm32/boards/LEGO_HUB_NO6/board.json    | 13 ++++++++
 ports/stm32/boards/LIMIFROG/board.json        | 13 ++++++++
 .../boards/MIKROE_CLICKER2_STM32/board.json   | 13 ++++++++
 ports/stm32/boards/NADHAT_PYBF405/board.json  | 13 ++++++++
 ports/stm32/boards/NETDUINO_PLUS_2/board.json | 13 ++++++++
 ports/stm32/boards/NUCLEO_F091RC/board.json   | 13 ++++++++
 ports/stm32/boards/NUCLEO_F401RE/board.json   | 13 ++++++++
 ports/stm32/boards/NUCLEO_F411RE/board.json   | 13 ++++++++
 ports/stm32/boards/NUCLEO_F412ZG/board.json   | 13 ++++++++
 ports/stm32/boards/NUCLEO_F413ZH/board.json   | 13 ++++++++
 ports/stm32/boards/NUCLEO_F429ZI/board.json   | 13 ++++++++
 ports/stm32/boards/NUCLEO_F439ZI/board.json   | 13 ++++++++
 ports/stm32/boards/NUCLEO_F446RE/board.json   | 13 ++++++++
 ports/stm32/boards/NUCLEO_F722ZE/board.json   | 13 ++++++++
 ports/stm32/boards/NUCLEO_F746ZG/board.json   | 13 ++++++++
 ports/stm32/boards/NUCLEO_F767ZI/board.json   | 13 ++++++++
 ports/stm32/boards/NUCLEO_H743ZI/board.json   | 13 ++++++++
 ports/stm32/boards/NUCLEO_H743ZI2/board.json  | 13 ++++++++
 ports/stm32/boards/NUCLEO_L073RZ/board.json   | 13 ++++++++
 ports/stm32/boards/NUCLEO_L432KC/board.json   | 13 ++++++++
 ports/stm32/boards/NUCLEO_L452RE/board.json   | 13 ++++++++
 ports/stm32/boards/NUCLEO_L476RG/board.json   | 13 ++++++++
 ports/stm32/boards/NUCLEO_WB55/board.json     | 13 ++++++++
 ports/stm32/boards/OLIMEX_E407/board.json     | 13 ++++++++
 ports/stm32/boards/OLIMEX_H407/board.json     | 13 ++++++++
 ports/stm32/boards/PYBD_SF2/board.json        | 21 +++++++++++++
 ports/stm32/boards/PYBD_SF2/board.md          |  1 +
 ports/stm32/boards/PYBD_SF2/deploy.md         |  3 ++
 ports/stm32/boards/PYBD_SF3/board.json        | 21 +++++++++++++
 ports/stm32/boards/PYBD_SF3/board.md          |  1 +
 ports/stm32/boards/PYBD_SF6/board.json        | 24 ++++++++++++++
 ports/stm32/boards/PYBD_SF6/board.md          |  1 +
 ports/stm32/boards/PYBLITEV10/board.json      | 24 ++++++++++++++
 ports/stm32/boards/PYBLITEV10/board.md        |  1 +
 ports/stm32/boards/PYBV10/board.json          | 22 +++++++++++++
 ports/stm32/boards/PYBV10/board.md            |  1 +
 ports/stm32/boards/PYBV10/deploy.md           |  6 ++++
 ports/stm32/boards/PYBV11/board.json          | 24 ++++++++++++++
 ports/stm32/boards/PYBV11/board.md            |  1 +
 .../boards/SPARKFUN_MICROMOD_STM32/board.json | 13 ++++++++
 ports/stm32/boards/STM32F411DISC/board.json   | 13 ++++++++
 ports/stm32/boards/STM32F429DISC/board.json   | 13 ++++++++
 ports/stm32/boards/STM32F439/board.json       | 13 ++++++++
 ports/stm32/boards/STM32F4DISC/board.json     | 13 ++++++++
 ports/stm32/boards/STM32F769DISC/board.json   | 13 ++++++++
 ports/stm32/boards/STM32F7DISC/board.json     | 13 ++++++++
 ports/stm32/boards/STM32H7B3I_DK/board.json   | 13 ++++++++
 ports/stm32/boards/STM32L476DISC/board.json   | 13 ++++++++
 ports/stm32/boards/STM32L496GDISC/board.json  | 13 ++++++++
 ports/stm32/boards/USBDONGLE_WB55/board.json  | 13 ++++++++
 ports/stm32/boards/VCC_GND_F407VE/board.json  | 13 ++++++++
 ports/stm32/boards/VCC_GND_F407ZG/board.json  | 13 ++++++++
 ports/stm32/boards/VCC_GND_H743VI/board.json  | 13 ++++++++
 ports/stm32/boards/deploy.md                  | 31 +++++++++++++++++++
 135 files changed, 1721 insertions(+)
 create mode 100644 ports/cc3200/boards/WIPY/board.json
 create mode 100644 ports/cc3200/boards/WIPY/deploy.md
 create mode 100644 ports/esp32/boards/ESP32_S2_WROVER/board.json
 create mode 100644 ports/esp32/boards/GENERIC/board.json
 create mode 100644 ports/esp32/boards/GENERIC/board.md
 create mode 100644 ports/esp32/boards/GENERIC_C3/board.json
 create mode 100644 ports/esp32/boards/GENERIC_C3_USB/board.json
 create mode 100644 ports/esp32/boards/GENERIC_D2WD/board.json
 create mode 100644 ports/esp32/boards/GENERIC_OTA/board.json
 create mode 100644 ports/esp32/boards/GENERIC_S2/board.json
 create mode 100644 ports/esp32/boards/GENERIC_S3/board.json
 create mode 100644 ports/esp32/boards/GENERIC_SPIRAM/board.json
 create mode 100644 ports/esp32/boards/GENERIC_SPIRAM/board.md
 create mode 100644 ports/esp32/boards/LOLIN_S2_MINI/board.json
 create mode 100644 ports/esp32/boards/M5STACK_ATOM/board.json
 create mode 100644 ports/esp32/boards/SIL_WESP32/board.json
 create mode 100644 ports/esp32/boards/UM_FEATHERS2/board.json
 create mode 100644 ports/esp32/boards/UM_FEATHERS2NEO/board.json
 create mode 100644 ports/esp32/boards/UM_TINYPICO/board.json
 create mode 100644 ports/esp32/boards/UM_TINYS2/board.json
 create mode 100644 ports/esp32/boards/deploy.md
 create mode 100644 ports/esp8266/boards/GENERIC/board.json
 create mode 100644 ports/esp8266/boards/GENERIC/board.md
 create mode 100644 ports/esp8266/boards/GENERIC_1M/board.json
 create mode 100644 ports/esp8266/boards/GENERIC_1M/board.md
 create mode 100644 ports/esp8266/boards/GENERIC_512K/board.json
 create mode 100644 ports/esp8266/boards/GENERIC_512K/board.md
 create mode 100644 ports/esp8266/boards/deploy.md
 create mode 100644 ports/mimxrt/boards/MIMXRT1010_EVK/board.json
 create mode 100644 ports/mimxrt/boards/MIMXRT1020_EVK/board.json
 create mode 100644 ports/mimxrt/boards/MIMXRT1050_EVK/board.json
 create mode 100644 ports/mimxrt/boards/MIMXRT1060_EVK/board.json
 create mode 100644 ports/mimxrt/boards/MIMXRT1064_EVK/board.json
 create mode 100644 ports/mimxrt/boards/TEENSY40/board.json
 create mode 100644 ports/mimxrt/boards/TEENSY41/board.json
 create mode 100644 ports/mimxrt/boards/deploy.md
 create mode 100644 ports/nrf/boards/actinius_icarus/board.json
 create mode 100644 ports/nrf/boards/arduino_primo/board.json
 create mode 100644 ports/nrf/boards/blueio_tag_evim/board.json
 create mode 100644 ports/nrf/boards/deploy.md
 create mode 100644 ports/nrf/boards/dvk_bl652/board.json
 create mode 100644 ports/nrf/boards/evk_nina_b1/board.json
 create mode 100644 ports/nrf/boards/evk_nina_b3/board.json
 create mode 100644 ports/nrf/boards/feather52/board.json
 create mode 100644 ports/nrf/boards/ibk_blyst_nano/board.json
 create mode 100644 ports/nrf/boards/idk_blyst_nano/board.json
 create mode 100644 ports/nrf/boards/microbit/board.json
 create mode 100644 ports/nrf/boards/nrf52840-mdk-usb-dongle/board.json
 create mode 100644 ports/nrf/boards/particle_xenon/board.json
 create mode 100644 ports/nrf/boards/pca10000/board.json
 create mode 100644 ports/nrf/boards/pca10001/board.json
 create mode 100644 ports/nrf/boards/pca10028/board.json
 create mode 100644 ports/nrf/boards/pca10031/board.json
 create mode 100644 ports/nrf/boards/pca10040/board.json
 create mode 100644 ports/nrf/boards/pca10056/board.json
 create mode 100644 ports/nrf/boards/pca10059/board.json
 create mode 100644 ports/nrf/boards/pca10090/board.json
 create mode 100644 ports/nrf/boards/wt51822_s4at/board.json
 create mode 100644 ports/rp2/boards/ADAFRUIT_FEATHER_RP2040/board.json
 create mode 100644 ports/rp2/boards/ADAFRUIT_ITSYBITSY_RP2040/board.json
 create mode 100644 ports/rp2/boards/ADAFRUIT_QTPY_RP2040/board.json
 create mode 100644 ports/rp2/boards/PICO/board.json
 create mode 100644 ports/rp2/boards/PIMORONI_PICOLIPO_16MB/board.json
 create mode 100644 ports/rp2/boards/PIMORONI_PICOLIPO_4MB/board.json
 create mode 100644 ports/rp2/boards/PIMORONI_TINY2040/board.json
 create mode 100644 ports/rp2/boards/SPARKFUN_PROMICRO/board.json
 create mode 100644 ports/rp2/boards/SPARKFUN_THINGPLUS/board.json
 create mode 100644 ports/rp2/boards/deploy.md
 create mode 100644 ports/samd/boards/ADAFRUIT_FEATHER_M0_EXPRESS/board.json
 create mode 100644 ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/board.json
 create mode 100644 ports/samd/boards/ADAFRUIT_TRINKET_M0/board.json
 create mode 100644 ports/samd/boards/MINISAM_M4/board.json
 create mode 100644 ports/samd/boards/SAMD21_XPLAINED_PRO/board.json
 create mode 100644 ports/samd/boards/deploy.md
 create mode 100644 ports/stm32/boards/ADAFRUIT_F405_EXPRESS/board.json
 create mode 100644 ports/stm32/boards/B_L072Z_LRWAN1/board.json
 create mode 100644 ports/stm32/boards/B_L475E_IOT01A/board.json
 create mode 100644 ports/stm32/boards/CERB40/board.json
 create mode 100644 ports/stm32/boards/ESPRUINO_PICO/board.json
 create mode 100644 ports/stm32/boards/ESPRUINO_PICO/deploy.md
 create mode 100644 ports/stm32/boards/HYDRABUS/board.json
 create mode 100644 ports/stm32/boards/LEGO_HUB_NO6/board.json
 create mode 100644 ports/stm32/boards/LIMIFROG/board.json
 create mode 100644 ports/stm32/boards/MIKROE_CLICKER2_STM32/board.json
 create mode 100644 ports/stm32/boards/NADHAT_PYBF405/board.json
 create mode 100644 ports/stm32/boards/NETDUINO_PLUS_2/board.json
 create mode 100644 ports/stm32/boards/NUCLEO_F091RC/board.json
 create mode 100644 ports/stm32/boards/NUCLEO_F401RE/board.json
 create mode 100644 ports/stm32/boards/NUCLEO_F411RE/board.json
 create mode 100644 ports/stm32/boards/NUCLEO_F412ZG/board.json
 create mode 100644 ports/stm32/boards/NUCLEO_F413ZH/board.json
 create mode 100644 ports/stm32/boards/NUCLEO_F429ZI/board.json
 create mode 100644 ports/stm32/boards/NUCLEO_F439ZI/board.json
 create mode 100644 ports/stm32/boards/NUCLEO_F446RE/board.json
 create mode 100644 ports/stm32/boards/NUCLEO_F722ZE/board.json
 create mode 100644 ports/stm32/boards/NUCLEO_F746ZG/board.json
 create mode 100644 ports/stm32/boards/NUCLEO_F767ZI/board.json
 create mode 100644 ports/stm32/boards/NUCLEO_H743ZI/board.json
 create mode 100644 ports/stm32/boards/NUCLEO_H743ZI2/board.json
 create mode 100644 ports/stm32/boards/NUCLEO_L073RZ/board.json
 create mode 100644 ports/stm32/boards/NUCLEO_L432KC/board.json
 create mode 100644 ports/stm32/boards/NUCLEO_L452RE/board.json
 create mode 100644 ports/stm32/boards/NUCLEO_L476RG/board.json
 create mode 100644 ports/stm32/boards/NUCLEO_WB55/board.json
 create mode 100644 ports/stm32/boards/OLIMEX_E407/board.json
 create mode 100644 ports/stm32/boards/OLIMEX_H407/board.json
 create mode 100644 ports/stm32/boards/PYBD_SF2/board.json
 create mode 100644 ports/stm32/boards/PYBD_SF2/board.md
 create mode 100644 ports/stm32/boards/PYBD_SF2/deploy.md
 create mode 100644 ports/stm32/boards/PYBD_SF3/board.json
 create mode 100644 ports/stm32/boards/PYBD_SF3/board.md
 create mode 100644 ports/stm32/boards/PYBD_SF6/board.json
 create mode 100644 ports/stm32/boards/PYBD_SF6/board.md
 create mode 100644 ports/stm32/boards/PYBLITEV10/board.json
 create mode 100644 ports/stm32/boards/PYBLITEV10/board.md
 create mode 100644 ports/stm32/boards/PYBV10/board.json
 create mode 100644 ports/stm32/boards/PYBV10/board.md
 create mode 100644 ports/stm32/boards/PYBV10/deploy.md
 create mode 100644 ports/stm32/boards/PYBV11/board.json
 create mode 100644 ports/stm32/boards/PYBV11/board.md
 create mode 100644 ports/stm32/boards/SPARKFUN_MICROMOD_STM32/board.json
 create mode 100644 ports/stm32/boards/STM32F411DISC/board.json
 create mode 100644 ports/stm32/boards/STM32F429DISC/board.json
 create mode 100644 ports/stm32/boards/STM32F439/board.json
 create mode 100644 ports/stm32/boards/STM32F4DISC/board.json
 create mode 100644 ports/stm32/boards/STM32F769DISC/board.json
 create mode 100644 ports/stm32/boards/STM32F7DISC/board.json
 create mode 100644 ports/stm32/boards/STM32H7B3I_DK/board.json
 create mode 100644 ports/stm32/boards/STM32L476DISC/board.json
 create mode 100644 ports/stm32/boards/STM32L496GDISC/board.json
 create mode 100644 ports/stm32/boards/USBDONGLE_WB55/board.json
 create mode 100644 ports/stm32/boards/VCC_GND_F407VE/board.json
 create mode 100644 ports/stm32/boards/VCC_GND_F407ZG/board.json
 create mode 100644 ports/stm32/boards/VCC_GND_H743VI/board.json
 create mode 100644 ports/stm32/boards/deploy.md

diff --git a/ports/cc3200/boards/WIPY/board.json b/ports/cc3200/boards/WIPY/board.json
new file mode 100644
index 0000000000000..fcc895b7f523b
--- /dev/null
+++ b/ports/cc3200/boards/WIPY/board.json
@@ -0,0 +1,16 @@
+{
+    "deploy": [
+        "deploy.md"
+    ],
+    "docs": "https://docs.pycom.io/datasheets/development/wipy3/",
+    "features": [],
+    "id": "wipy",
+    "images": [
+        "wipy.jpg"
+    ],
+    "mcu": "cc3200",
+    "product": "WiPy Module",
+    "thumbnail": "",
+    "url": "https://pycom.io/product/wipy-3-0/",
+    "vendor": "Pycom"
+}
diff --git a/ports/cc3200/boards/WIPY/deploy.md b/ports/cc3200/boards/WIPY/deploy.md
new file mode 100644
index 0000000000000..19dcfc158fbd3
--- /dev/null
+++ b/ports/cc3200/boards/WIPY/deploy.md
@@ -0,0 +1,2 @@
+The following files are firmware for the WiPy.  The zip file contains mcuimg.bin
+which should be copied via ftp to the /flash/sys directory on the WiPy.
diff --git a/ports/esp32/boards/ESP32_S2_WROVER/board.json b/ports/esp32/boards/ESP32_S2_WROVER/board.json
new file mode 100644
index 0000000000000..8f2aff7346d2d
--- /dev/null
+++ b/ports/esp32/boards/ESP32_S2_WROVER/board.json
@@ -0,0 +1,13 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [],
+    "images": [],
+    "mcu": "esp32s2",
+    "product": "ESP32-S2 WROVER",
+    "thumbnail": "",
+    "url": "",
+    "vendor": "Espressif"
+}
diff --git a/ports/esp32/boards/GENERIC/board.json b/ports/esp32/boards/GENERIC/board.json
new file mode 100644
index 0000000000000..eadf70dd127c9
--- /dev/null
+++ b/ports/esp32/boards/GENERIC/board.json
@@ -0,0 +1,20 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [
+        "WiFi",
+        "BLE"
+    ],
+    "id": "esp32",
+    "images": [],
+    "mcu": "esp32",
+    "product": "ESP32",
+    "thumbnail": "",
+    "url": "",
+    "variants": {
+        "idf3": "Compiled with IDF 3.x"
+    },
+    "vendor": "Espressif"
+}
diff --git a/ports/esp32/boards/GENERIC/board.md b/ports/esp32/boards/GENERIC/board.md
new file mode 100644
index 0000000000000..576ea80450f6a
--- /dev/null
+++ b/ports/esp32/boards/GENERIC/board.md
@@ -0,0 +1,3 @@
+The following files are daily firmware for ESP32-based boards without external SPIRAM.
+
+This firmware is compiled using ESP-IDF v4.x. Some older releases are also provided that are compiled with ESP-IDF v3.x.
diff --git a/ports/esp32/boards/GENERIC_C3/board.json b/ports/esp32/boards/GENERIC_C3/board.json
new file mode 100644
index 0000000000000..3c360e64c74ca
--- /dev/null
+++ b/ports/esp32/boards/GENERIC_C3/board.json
@@ -0,0 +1,14 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [],
+    "id": "esp32c3",
+    "images": [],
+    "mcu": "esp32c3",
+    "product": "ESP32-C3",
+    "thumbnail": "",
+    "url": "",
+    "vendor": "Espressif"
+}
diff --git a/ports/esp32/boards/GENERIC_C3_USB/board.json b/ports/esp32/boards/GENERIC_C3_USB/board.json
new file mode 100644
index 0000000000000..cf9f63b90c7a0
--- /dev/null
+++ b/ports/esp32/boards/GENERIC_C3_USB/board.json
@@ -0,0 +1,14 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [],
+    "id": "esp32c3-usb",
+    "images": [],
+    "mcu": "esp32c3",
+    "product": "ESP32-C3 with USB",
+    "thumbnail": "",
+    "url": "",
+    "vendor": "Espressif"
+}
diff --git a/ports/esp32/boards/GENERIC_D2WD/board.json b/ports/esp32/boards/GENERIC_D2WD/board.json
new file mode 100644
index 0000000000000..63fbbfb2f9b56
--- /dev/null
+++ b/ports/esp32/boards/GENERIC_D2WD/board.json
@@ -0,0 +1,14 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [],
+    "id": "esp32-d2wd",
+    "images": [],
+    "mcu": "esp32",
+    "product": "ESP32 D2WD",
+    "thumbnail": "",
+    "url": "",
+    "vendor": "Espressif"
+}
diff --git a/ports/esp32/boards/GENERIC_OTA/board.json b/ports/esp32/boards/GENERIC_OTA/board.json
new file mode 100644
index 0000000000000..529f0acdeea18
--- /dev/null
+++ b/ports/esp32/boards/GENERIC_OTA/board.json
@@ -0,0 +1,14 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [],
+    "id": "esp32-ota",
+    "images": [],
+    "mcu": "esp32",
+    "product": "ESP32 with OTA support",
+    "thumbnail": "",
+    "url": "",
+    "vendor": "Espressif"
+}
diff --git a/ports/esp32/boards/GENERIC_S2/board.json b/ports/esp32/boards/GENERIC_S2/board.json
new file mode 100644
index 0000000000000..4ecb90a48a0c9
--- /dev/null
+++ b/ports/esp32/boards/GENERIC_S2/board.json
@@ -0,0 +1,13 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [],
+    "images": [],
+    "mcu": "esp32s2",
+    "product": "ESP32-S2",
+    "thumbnail": "",
+    "url": "",
+    "vendor": "Espressif"
+}
diff --git a/ports/esp32/boards/GENERIC_S3/board.json b/ports/esp32/boards/GENERIC_S3/board.json
new file mode 100644
index 0000000000000..a2652ea46ace3
--- /dev/null
+++ b/ports/esp32/boards/GENERIC_S3/board.json
@@ -0,0 +1,13 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [],
+    "images": [],
+    "mcu": "esp32s3",
+    "product": "ESP32-S3",
+    "thumbnail": "",
+    "url": "",
+    "vendor": "Espressif"
+}
diff --git a/ports/esp32/boards/GENERIC_SPIRAM/board.json b/ports/esp32/boards/GENERIC_SPIRAM/board.json
new file mode 100644
index 0000000000000..307555b501d50
--- /dev/null
+++ b/ports/esp32/boards/GENERIC_SPIRAM/board.json
@@ -0,0 +1,21 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [
+        "WiFi",
+        "BLE",
+        "SPIRAM"
+    ],
+    "id": "esp32spiram",
+    "images": [],
+    "mcu": "esp32",
+    "product": "ESP32 with SPIRAM",
+    "thumbnail": "",
+    "url": "",
+    "variants": {
+        "idf3": "Compiled with IDF 3.x"
+    },
+    "vendor": "Espressif"
+}
diff --git a/ports/esp32/boards/GENERIC_SPIRAM/board.md b/ports/esp32/boards/GENERIC_SPIRAM/board.md
new file mode 100644
index 0000000000000..3b02b902cd758
--- /dev/null
+++ b/ports/esp32/boards/GENERIC_SPIRAM/board.md
@@ -0,0 +1,3 @@
+The following files are daily firmware for ESP32-based boards with external SPIRAM (also known as PSRAM).
+
+This firmware is compiled using ESP-IDF v4.x. Some older releases are also provided that are compiled with ESP-IDF v3.x.
diff --git a/ports/esp32/boards/LOLIN_S2_MINI/board.json b/ports/esp32/boards/LOLIN_S2_MINI/board.json
new file mode 100644
index 0000000000000..5e866f0e59d96
--- /dev/null
+++ b/ports/esp32/boards/LOLIN_S2_MINI/board.json
@@ -0,0 +1,13 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [],
+    "images": [],
+    "mcu": "esp32s2",
+    "product": "S2 mini",
+    "thumbnail": "",
+    "url": "https://www.wemos.cc/en/latest/s2/s2_mini.html",
+    "vendor": "Wemos"
+}
diff --git a/ports/esp32/boards/M5STACK_ATOM/board.json b/ports/esp32/boards/M5STACK_ATOM/board.json
new file mode 100644
index 0000000000000..b61d6d9e16771
--- /dev/null
+++ b/ports/esp32/boards/M5STACK_ATOM/board.json
@@ -0,0 +1,13 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [],
+    "images": [],
+    "mcu": "esp32",
+    "product": "M5 Stack Atom",
+    "thumbnail": "",
+    "url": "",
+    "vendor": ""
+}
diff --git a/ports/esp32/boards/SIL_WESP32/board.json b/ports/esp32/boards/SIL_WESP32/board.json
new file mode 100644
index 0000000000000..73382c156551a
--- /dev/null
+++ b/ports/esp32/boards/SIL_WESP32/board.json
@@ -0,0 +1,14 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [],
+    "id": "wesp32",
+    "images": [],
+    "mcu": "esp32",
+    "product": "SIL WESP32",
+    "thumbnail": "",
+    "url": "",
+    "vendor": "Espressif"
+}
diff --git a/ports/esp32/boards/UM_FEATHERS2/board.json b/ports/esp32/boards/UM_FEATHERS2/board.json
new file mode 100644
index 0000000000000..bbfd3890049e2
--- /dev/null
+++ b/ports/esp32/boards/UM_FEATHERS2/board.json
@@ -0,0 +1,23 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [
+        "BLE",
+        "WiFi",
+        "Feather",
+        "Battery Charging",
+        "STEMMA QT/QWIIC",
+        "USB-C"
+    ],
+    "id": "featherS2",
+    "images": [
+        "unexpectedmaker_feathers2.jpg"
+    ],
+    "mcu": "esp32s2",
+    "product": "Feather S2",
+    "thumbnail": "",
+    "url": "https://feathers2.io/",
+    "vendor": "Unexpected Maker"
+}
diff --git a/ports/esp32/boards/UM_FEATHERS2NEO/board.json b/ports/esp32/boards/UM_FEATHERS2NEO/board.json
new file mode 100644
index 0000000000000..1bcc2a4b227cc
--- /dev/null
+++ b/ports/esp32/boards/UM_FEATHERS2NEO/board.json
@@ -0,0 +1,22 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [
+        "BLE",
+        "WiFi",
+        "Feather",
+        "Battery Charging",
+        "STEMMA QT/QWIIC",
+        "USB-C",
+        "Neopixels"
+    ],
+    "id": "featherS2neo",
+    "images": [],
+    "mcu": "esp32s2",
+    "product": "Feather S2 Neo",
+    "thumbnail": "",
+    "url": "https://unexpectedmaker.com/feathers2-neo",
+    "vendor": "Unexpected Maker"
+}
diff --git a/ports/esp32/boards/UM_TINYPICO/board.json b/ports/esp32/boards/UM_TINYPICO/board.json
new file mode 100644
index 0000000000000..6b5a01d57f514
--- /dev/null
+++ b/ports/esp32/boards/UM_TINYPICO/board.json
@@ -0,0 +1,19 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [],
+    "id": "tinypico",
+    "images": [
+        "tinypico-v2-both.jpg"
+    ],
+    "mcu": "esp32",
+    "product": "TinyPICO",
+    "thumbnail": "",
+    "url": "https://www.tinypico.com/",
+    "variants": {
+        "idf3": "Compiled with IDF 3.x"
+    },
+    "vendor": "Unexpected Maker"
+}
diff --git a/ports/esp32/boards/UM_TINYS2/board.json b/ports/esp32/boards/UM_TINYS2/board.json
new file mode 100644
index 0000000000000..bc694c2cca318
--- /dev/null
+++ b/ports/esp32/boards/UM_TINYS2/board.json
@@ -0,0 +1,16 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [],
+    "id": "tinys2",
+    "images": [
+        "TinyS2+Product+Shot.jpg"
+    ],
+    "mcu": "esp32s2",
+    "product": "Tiny S2",
+    "thumbnail": "",
+    "url": "https://unexpectedmaker.com/tinys2",
+    "vendor": "Unexpected Maker"
+}
diff --git a/ports/esp32/boards/deploy.md b/ports/esp32/boards/deploy.md
new file mode 100644
index 0000000000000..c8740a8dd408b
--- /dev/null
+++ b/ports/esp32/boards/deploy.md
@@ -0,0 +1,13 @@
+Program your board using the esptool.py program, found [here](https://github.com/espressif/esptool).
+If you are putting MicroPython on your board for the first time then you should
+first erase the entire flash using:
+
+```bash
+esptool.py --chip esp32 --port /dev/ttyUSB0 erase_flash
+```
+
+From then on program the firmware starting at address 0x1000:
+
+```bash
+esptool.py --chip esp32 --port /dev/ttyUSB0 --baud 460800 write_flash -z 0x1000 esp32-20190125-v1.10.bin
+```
diff --git a/ports/esp8266/boards/GENERIC/board.json b/ports/esp8266/boards/GENERIC/board.json
new file mode 100644
index 0000000000000..d8f4cba083949
--- /dev/null
+++ b/ports/esp8266/boards/GENERIC/board.json
@@ -0,0 +1,17 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [],
+    "id": "esp8266",
+    "images": [],
+    "mcu": "esp8266",
+    "product": "ESP8266 with 2MiB+ flash",
+    "thumbnail": "",
+    "url": "",
+    "variants": {
+        "ota": "OTA compatible"
+    },
+    "vendor": "Espressif"
+}
diff --git a/ports/esp8266/boards/GENERIC/board.md b/ports/esp8266/boards/GENERIC/board.md
new file mode 100644
index 0000000000000..b93ca509f89c7
--- /dev/null
+++ b/ports/esp8266/boards/GENERIC/board.md
@@ -0,0 +1,19 @@
+The following are daily builds of the ESP8266 firmware for boards with at
+least 2MiB of flash.  They have the latest features and bug fixes, WebREPL is
+not automatically started, and debugging is enabled by default.
+
+Note: v1.12-334 and newer (including v1.13) require an ESP8266 module with
+2MiB of flash or more, and use littlefs as the filesystem by default.  When
+upgrading from older firmware please backup your files first, and either
+erase all flash before upgrading, or after upgrading execute
+`uos.VfsLfs2.mkfs(bdev)`.
+
+### OTA builds
+Over-The-Air (OTA) builds of the ESP8266 firmware are also provided.
+
+The first time you use this build you need to flash one of the "initial image"
+images using esptool.py as described above.  After that, you can update the
+firmware over the air using the "OTA update" file in conjunction with the
+ota-client script from yaota8266. The "OTA update" files are digitally signed
+and will only work with the provided "initial image" files, and vice versa.
+(Note: this feature is work-in-progress.)
diff --git a/ports/esp8266/boards/GENERIC_1M/board.json b/ports/esp8266/boards/GENERIC_1M/board.json
new file mode 100644
index 0000000000000..6279d3fee06d6
--- /dev/null
+++ b/ports/esp8266/boards/GENERIC_1M/board.json
@@ -0,0 +1,14 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [],
+    "id": "esp8266-1m",
+    "images": [],
+    "mcu": "esp8266",
+    "product": "ESP8266 with 1MiB flash",
+    "thumbnail": "",
+    "url": "",
+    "vendor": "Espressif"
+}
diff --git a/ports/esp8266/boards/GENERIC_1M/board.md b/ports/esp8266/boards/GENERIC_1M/board.md
new file mode 100644
index 0000000000000..4a0e677078713
--- /dev/null
+++ b/ports/esp8266/boards/GENERIC_1M/board.md
@@ -0,0 +1,5 @@
+The following are daily builds of the ESP8266 firmware tailored for modules with
+only 1MiB of flash.  This firmware uses littlefs as the filesystem.
+When upgrading from older firmware that uses a FAT filesystem please backup your files
+first, and either erase all flash before upgrading, or after upgrading execute
+`uos.VfsLfs2.mkfs(bdev)`.
diff --git a/ports/esp8266/boards/GENERIC_512K/board.json b/ports/esp8266/boards/GENERIC_512K/board.json
new file mode 100644
index 0000000000000..da15a39d510fd
--- /dev/null
+++ b/ports/esp8266/boards/GENERIC_512K/board.json
@@ -0,0 +1,14 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [],
+    "id": "esp8266-512k",
+    "images": [],
+    "mcu": "esp8266",
+    "product": "ESP8266 with 512kiB flash",
+    "thumbnail": "",
+    "url": "",
+    "vendor": "Espressif"
+}
diff --git a/ports/esp8266/boards/GENERIC_512K/board.md b/ports/esp8266/boards/GENERIC_512K/board.md
new file mode 100644
index 0000000000000..1f6e2c7907385
--- /dev/null
+++ b/ports/esp8266/boards/GENERIC_512K/board.md
@@ -0,0 +1,3 @@
+The following are daily builds of the ESP8266 firmware tailored for modules with
+only 512kiB of flash.  Certain features are disabled to get the firmware down
+to this size.
diff --git a/ports/esp8266/boards/deploy.md b/ports/esp8266/boards/deploy.md
new file mode 100644
index 0000000000000..520316367c915
--- /dev/null
+++ b/ports/esp8266/boards/deploy.md
@@ -0,0 +1 @@
+Program your board using the esptool.py program as described [the tutorial](http://docs.micropython.org/en/latest/esp8266/esp8266/tutorial/intro.html#deploying-the-firmware).
diff --git a/ports/mimxrt/boards/MIMXRT1010_EVK/board.json b/ports/mimxrt/boards/MIMXRT1010_EVK/board.json
new file mode 100644
index 0000000000000..c865e74f4a3bc
--- /dev/null
+++ b/ports/mimxrt/boards/MIMXRT1010_EVK/board.json
@@ -0,0 +1,13 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [],
+    "images": [],
+    "mcu": "mimxrt",
+    "product": "MIMXRT1010_EVK",
+    "thumbnail": "",
+    "url": "",
+    "vendor": "NXP"
+}
diff --git a/ports/mimxrt/boards/MIMXRT1020_EVK/board.json b/ports/mimxrt/boards/MIMXRT1020_EVK/board.json
new file mode 100644
index 0000000000000..7930f702b492a
--- /dev/null
+++ b/ports/mimxrt/boards/MIMXRT1020_EVK/board.json
@@ -0,0 +1,13 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [],
+    "images": [],
+    "mcu": "mimxrt",
+    "product": "MIMXRT1020_EVK",
+    "thumbnail": "",
+    "url": "",
+    "vendor": "NXP"
+}
diff --git a/ports/mimxrt/boards/MIMXRT1050_EVK/board.json b/ports/mimxrt/boards/MIMXRT1050_EVK/board.json
new file mode 100644
index 0000000000000..5f04fb29b5716
--- /dev/null
+++ b/ports/mimxrt/boards/MIMXRT1050_EVK/board.json
@@ -0,0 +1,13 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [],
+    "images": [],
+    "mcu": "mimxrt",
+    "product": "MIMXRT1050_EVK",
+    "thumbnail": "",
+    "url": "",
+    "vendor": "NXP"
+}
diff --git a/ports/mimxrt/boards/MIMXRT1060_EVK/board.json b/ports/mimxrt/boards/MIMXRT1060_EVK/board.json
new file mode 100644
index 0000000000000..602b50d7f2196
--- /dev/null
+++ b/ports/mimxrt/boards/MIMXRT1060_EVK/board.json
@@ -0,0 +1,13 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [],
+    "images": [],
+    "mcu": "mimxrt",
+    "product": "MIMXRT1060_EVK",
+    "thumbnail": "",
+    "url": "",
+    "vendor": "NXP"
+}
diff --git a/ports/mimxrt/boards/MIMXRT1064_EVK/board.json b/ports/mimxrt/boards/MIMXRT1064_EVK/board.json
new file mode 100644
index 0000000000000..5830a39f2e565
--- /dev/null
+++ b/ports/mimxrt/boards/MIMXRT1064_EVK/board.json
@@ -0,0 +1,13 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [],
+    "images": [],
+    "mcu": "mimxrt",
+    "product": "MIMXRT1064_EVK",
+    "thumbnail": "",
+    "url": "",
+    "vendor": "NXP"
+}
diff --git a/ports/mimxrt/boards/TEENSY40/board.json b/ports/mimxrt/boards/TEENSY40/board.json
new file mode 100644
index 0000000000000..25f7690fc0ea1
--- /dev/null
+++ b/ports/mimxrt/boards/TEENSY40/board.json
@@ -0,0 +1,13 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [],
+    "images": [],
+    "mcu": "mimxrt",
+    "product": "Teensy 4.0",
+    "thumbnail": "",
+    "url": "https://www.pjrc.com/store/teensy40.html",
+    "vendor": "PJRC"
+}
diff --git a/ports/mimxrt/boards/TEENSY41/board.json b/ports/mimxrt/boards/TEENSY41/board.json
new file mode 100644
index 0000000000000..9c5c4709a9d57
--- /dev/null
+++ b/ports/mimxrt/boards/TEENSY41/board.json
@@ -0,0 +1,13 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [],
+    "images": [],
+    "mcu": "mimxrt",
+    "product": "Teensy 4.1",
+    "thumbnail": "",
+    "url": "https://www.pjrc.com/store/teensy41.html",
+    "vendor": "PJRC"
+}
diff --git a/ports/mimxrt/boards/deploy.md b/ports/mimxrt/boards/deploy.md
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/ports/nrf/boards/actinius_icarus/board.json b/ports/nrf/boards/actinius_icarus/board.json
new file mode 100644
index 0000000000000..86e7bd350858c
--- /dev/null
+++ b/ports/nrf/boards/actinius_icarus/board.json
@@ -0,0 +1,13 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [],
+    "images": [],
+    "mcu": "nrf91",
+    "product": "actinius_icarus",
+    "thumbnail": "",
+    "url": "",
+    "vendor": ""
+}
diff --git a/ports/nrf/boards/arduino_primo/board.json b/ports/nrf/boards/arduino_primo/board.json
new file mode 100644
index 0000000000000..05439fdfeef39
--- /dev/null
+++ b/ports/nrf/boards/arduino_primo/board.json
@@ -0,0 +1,13 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [],
+    "images": [],
+    "mcu": "nrf52",
+    "product": "arduino_primo",
+    "thumbnail": "",
+    "url": "",
+    "vendor": ""
+}
diff --git a/ports/nrf/boards/blueio_tag_evim/board.json b/ports/nrf/boards/blueio_tag_evim/board.json
new file mode 100644
index 0000000000000..ed178d11da649
--- /dev/null
+++ b/ports/nrf/boards/blueio_tag_evim/board.json
@@ -0,0 +1,13 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [],
+    "images": [],
+    "mcu": "nrf52",
+    "product": "blueio_tag_evim",
+    "thumbnail": "",
+    "url": "",
+    "vendor": ""
+}
diff --git a/ports/nrf/boards/deploy.md b/ports/nrf/boards/deploy.md
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/ports/nrf/boards/dvk_bl652/board.json b/ports/nrf/boards/dvk_bl652/board.json
new file mode 100644
index 0000000000000..1e2491010f82a
--- /dev/null
+++ b/ports/nrf/boards/dvk_bl652/board.json
@@ -0,0 +1,13 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [],
+    "images": [],
+    "mcu": "nrf52",
+    "product": "dvk_bl652",
+    "thumbnail": "",
+    "url": "",
+    "vendor": ""
+}
diff --git a/ports/nrf/boards/evk_nina_b1/board.json b/ports/nrf/boards/evk_nina_b1/board.json
new file mode 100644
index 0000000000000..a81e961fccfb8
--- /dev/null
+++ b/ports/nrf/boards/evk_nina_b1/board.json
@@ -0,0 +1,13 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [],
+    "images": [],
+    "mcu": "nrf52",
+    "product": "evk_nina_b1",
+    "thumbnail": "",
+    "url": "",
+    "vendor": ""
+}
diff --git a/ports/nrf/boards/evk_nina_b3/board.json b/ports/nrf/boards/evk_nina_b3/board.json
new file mode 100644
index 0000000000000..f71a6eff71b3e
--- /dev/null
+++ b/ports/nrf/boards/evk_nina_b3/board.json
@@ -0,0 +1,13 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [],
+    "images": [],
+    "mcu": "nrf52",
+    "product": "evk_nina_b3",
+    "thumbnail": "",
+    "url": "",
+    "vendor": ""
+}
diff --git a/ports/nrf/boards/feather52/board.json b/ports/nrf/boards/feather52/board.json
new file mode 100644
index 0000000000000..344b880ba594e
--- /dev/null
+++ b/ports/nrf/boards/feather52/board.json
@@ -0,0 +1,15 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [],
+    "images": [
+        "4062-02.jpg"
+    ],
+    "mcu": "nrf52",
+    "product": "Feather nRF52840 Express",
+    "thumbnail": "",
+    "url": "https://www.adafruit.com/product/4062",
+    "vendor": "Adafruit"
+}
diff --git a/ports/nrf/boards/ibk_blyst_nano/board.json b/ports/nrf/boards/ibk_blyst_nano/board.json
new file mode 100644
index 0000000000000..f641f6b7d2aee
--- /dev/null
+++ b/ports/nrf/boards/ibk_blyst_nano/board.json
@@ -0,0 +1,13 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [],
+    "images": [],
+    "mcu": "nrf52",
+    "product": "ibk_blyst_nano",
+    "thumbnail": "",
+    "url": "",
+    "vendor": ""
+}
diff --git a/ports/nrf/boards/idk_blyst_nano/board.json b/ports/nrf/boards/idk_blyst_nano/board.json
new file mode 100644
index 0000000000000..07b2748a76f05
--- /dev/null
+++ b/ports/nrf/boards/idk_blyst_nano/board.json
@@ -0,0 +1,13 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [],
+    "images": [],
+    "mcu": "nrf52",
+    "product": "idk_blyst_nano",
+    "thumbnail": "",
+    "url": "",
+    "vendor": ""
+}
diff --git a/ports/nrf/boards/microbit/board.json b/ports/nrf/boards/microbit/board.json
new file mode 100644
index 0000000000000..b7a041ad4d073
--- /dev/null
+++ b/ports/nrf/boards/microbit/board.json
@@ -0,0 +1,13 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [],
+    "images": [],
+    "mcu": "nrf51",
+    "product": "micro:bit v1",
+    "thumbnail": "",
+    "url": "https://microbit.org/",
+    "vendor": "BBC"
+}
diff --git a/ports/nrf/boards/nrf52840-mdk-usb-dongle/board.json b/ports/nrf/boards/nrf52840-mdk-usb-dongle/board.json
new file mode 100644
index 0000000000000..bbe03618dabfb
--- /dev/null
+++ b/ports/nrf/boards/nrf52840-mdk-usb-dongle/board.json
@@ -0,0 +1,13 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [],
+    "images": [],
+    "mcu": "nrf52",
+    "product": "nrf52840-mdk-usb-dongle",
+    "thumbnail": "",
+    "url": "",
+    "vendor": ""
+}
diff --git a/ports/nrf/boards/particle_xenon/board.json b/ports/nrf/boards/particle_xenon/board.json
new file mode 100644
index 0000000000000..ed1522be5b41c
--- /dev/null
+++ b/ports/nrf/boards/particle_xenon/board.json
@@ -0,0 +1,13 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [],
+    "images": [],
+    "mcu": "nrf52",
+    "product": "Xenon",
+    "thumbnail": "",
+    "url": "",
+    "vendor": "Particle"
+}
diff --git a/ports/nrf/boards/pca10000/board.json b/ports/nrf/boards/pca10000/board.json
new file mode 100644
index 0000000000000..6cae711f070d0
--- /dev/null
+++ b/ports/nrf/boards/pca10000/board.json
@@ -0,0 +1,13 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [],
+    "images": [],
+    "mcu": "nrf51",
+    "product": "pca10000",
+    "thumbnail": "",
+    "url": "",
+    "vendor": "Nordic Semiconductor"
+}
diff --git a/ports/nrf/boards/pca10001/board.json b/ports/nrf/boards/pca10001/board.json
new file mode 100644
index 0000000000000..9f073b8190437
--- /dev/null
+++ b/ports/nrf/boards/pca10001/board.json
@@ -0,0 +1,13 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [],
+    "images": [],
+    "mcu": "nrf51",
+    "product": "pca10001",
+    "thumbnail": "",
+    "url": "",
+    "vendor": "Nordic Semiconductor"
+}
diff --git a/ports/nrf/boards/pca10028/board.json b/ports/nrf/boards/pca10028/board.json
new file mode 100644
index 0000000000000..bda2c4d7572ef
--- /dev/null
+++ b/ports/nrf/boards/pca10028/board.json
@@ -0,0 +1,13 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [],
+    "images": [],
+    "mcu": "nrf51",
+    "product": "pca10028",
+    "thumbnail": "",
+    "url": "",
+    "vendor": "Nordic Semiconductor"
+}
diff --git a/ports/nrf/boards/pca10031/board.json b/ports/nrf/boards/pca10031/board.json
new file mode 100644
index 0000000000000..caba44f328afa
--- /dev/null
+++ b/ports/nrf/boards/pca10031/board.json
@@ -0,0 +1,13 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [],
+    "images": [],
+    "mcu": "nrf51",
+    "product": "pca10031",
+    "thumbnail": "",
+    "url": "",
+    "vendor": "Nordic Semiconductor"
+}
diff --git a/ports/nrf/boards/pca10040/board.json b/ports/nrf/boards/pca10040/board.json
new file mode 100644
index 0000000000000..55cef41862122
--- /dev/null
+++ b/ports/nrf/boards/pca10040/board.json
@@ -0,0 +1,13 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [],
+    "images": [],
+    "mcu": "nrf52",
+    "product": "pca10040",
+    "thumbnail": "",
+    "url": "",
+    "vendor": "Nordic Semiconductor"
+}
diff --git a/ports/nrf/boards/pca10056/board.json b/ports/nrf/boards/pca10056/board.json
new file mode 100644
index 0000000000000..ed9b65baa346f
--- /dev/null
+++ b/ports/nrf/boards/pca10056/board.json
@@ -0,0 +1,13 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [],
+    "images": [],
+    "mcu": "nrf52",
+    "product": "pca10056",
+    "thumbnail": "",
+    "url": "",
+    "vendor": "Nordic Semiconductor"
+}
diff --git a/ports/nrf/boards/pca10059/board.json b/ports/nrf/boards/pca10059/board.json
new file mode 100644
index 0000000000000..7b883c007e0a4
--- /dev/null
+++ b/ports/nrf/boards/pca10059/board.json
@@ -0,0 +1,15 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [],
+    "images": [
+        "pca10059.jpg"
+    ],
+    "mcu": "nrf52",
+    "product": "pca10059",
+    "thumbnail": "",
+    "url": "",
+    "vendor": "Nordic Semiconductor"
+}
diff --git a/ports/nrf/boards/pca10090/board.json b/ports/nrf/boards/pca10090/board.json
new file mode 100644
index 0000000000000..dd2e928e4c7a4
--- /dev/null
+++ b/ports/nrf/boards/pca10090/board.json
@@ -0,0 +1,13 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [],
+    "images": [],
+    "mcu": "nrf91",
+    "product": "pca10090",
+    "thumbnail": "",
+    "url": "",
+    "vendor": "Nordic Semiconductor"
+}
diff --git a/ports/nrf/boards/wt51822_s4at/board.json b/ports/nrf/boards/wt51822_s4at/board.json
new file mode 100644
index 0000000000000..3917265a9ae19
--- /dev/null
+++ b/ports/nrf/boards/wt51822_s4at/board.json
@@ -0,0 +1,13 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [],
+    "images": [],
+    "mcu": "nrf51",
+    "product": "wt51822_s4at",
+    "thumbnail": "",
+    "url": "",
+    "vendor": ""
+}
diff --git a/ports/rp2/boards/ADAFRUIT_FEATHER_RP2040/board.json b/ports/rp2/boards/ADAFRUIT_FEATHER_RP2040/board.json
new file mode 100644
index 0000000000000..a4caba335dc83
--- /dev/null
+++ b/ports/rp2/boards/ADAFRUIT_FEATHER_RP2040/board.json
@@ -0,0 +1,15 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [],
+    "images": [
+        "4884-06.jpg"
+    ],
+    "mcu": "rp2040",
+    "product": "Feather RP2040",
+    "thumbnail": "",
+    "url": "https://www.adafruit.com/product/4884",
+    "vendor": "Adafruit"
+}
diff --git a/ports/rp2/boards/ADAFRUIT_ITSYBITSY_RP2040/board.json b/ports/rp2/boards/ADAFRUIT_ITSYBITSY_RP2040/board.json
new file mode 100644
index 0000000000000..1dcb999a8619d
--- /dev/null
+++ b/ports/rp2/boards/ADAFRUIT_ITSYBITSY_RP2040/board.json
@@ -0,0 +1,15 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [],
+    "images": [
+        "4888-05.jpg"
+    ],
+    "mcu": "rp2040",
+    "product": "ItsyBitsy RP2040",
+    "thumbnail": "",
+    "url": "https://www.adafruit.com/product/4888",
+    "vendor": "Adafruit"
+}
diff --git a/ports/rp2/boards/ADAFRUIT_QTPY_RP2040/board.json b/ports/rp2/boards/ADAFRUIT_QTPY_RP2040/board.json
new file mode 100644
index 0000000000000..d8efa83be4765
--- /dev/null
+++ b/ports/rp2/boards/ADAFRUIT_QTPY_RP2040/board.json
@@ -0,0 +1,15 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [],
+    "images": [
+        "4900-12.jpg"
+    ],
+    "mcu": "rp2040",
+    "product": "QT Py RP2040",
+    "thumbnail": "",
+    "url": "https://www.adafruit.com/product/4900",
+    "vendor": "Adafruit"
+}
diff --git a/ports/rp2/boards/PICO/board.json b/ports/rp2/boards/PICO/board.json
new file mode 100644
index 0000000000000..cc933c5a9237d
--- /dev/null
+++ b/ports/rp2/boards/PICO/board.json
@@ -0,0 +1,16 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [],
+    "id": "rp2-pico",
+    "images": [
+        "rp2-pico.jpg"
+    ],
+    "mcu": "rp2040",
+    "product": "Pico",
+    "thumbnail": "",
+    "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",
+    "vendor": "Raspberry Pi"
+}
diff --git a/ports/rp2/boards/PIMORONI_PICOLIPO_16MB/board.json b/ports/rp2/boards/PIMORONI_PICOLIPO_16MB/board.json
new file mode 100644
index 0000000000000..35e18cc8dc360
--- /dev/null
+++ b/ports/rp2/boards/PIMORONI_PICOLIPO_16MB/board.json
@@ -0,0 +1,15 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [],
+    "images": [
+        "PimoroniPicoLipo_1of3_1024x1024.jpg"
+    ],
+    "mcu": "rp2040",
+    "product": "Pico LiPo (16MiB)",
+    "thumbnail": "",
+    "url": "https://shop.pimoroni.com/products/pimoroni-pico-lipo",
+    "vendor": "Pimoroni"
+}
diff --git a/ports/rp2/boards/PIMORONI_PICOLIPO_4MB/board.json b/ports/rp2/boards/PIMORONI_PICOLIPO_4MB/board.json
new file mode 100644
index 0000000000000..5a8273cb5cf47
--- /dev/null
+++ b/ports/rp2/boards/PIMORONI_PICOLIPO_4MB/board.json
@@ -0,0 +1,15 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [],
+    "images": [
+        "PimoroniPicoLipo_1of3_1024x1024.jpg"
+    ],
+    "mcu": "rp2040",
+    "product": "Pico LiPo (4MiB)",
+    "thumbnail": "",
+    "url": "https://shop.pimoroni.com/products/pimoroni-pico-lipo",
+    "vendor": "Pimoroni"
+}
diff --git a/ports/rp2/boards/PIMORONI_TINY2040/board.json b/ports/rp2/boards/PIMORONI_TINY2040/board.json
new file mode 100644
index 0000000000000..cc7e643f41280
--- /dev/null
+++ b/ports/rp2/boards/PIMORONI_TINY2040/board.json
@@ -0,0 +1,15 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [],
+    "images": [
+        "tiny-2040-on-white-1_1024x1024.jpg"
+    ],
+    "mcu": "rp2040",
+    "product": "Tiny2040",
+    "thumbnail": "",
+    "url": "https://shop.pimoroni.com/products/tiny-2040",
+    "vendor": "Pimoroni"
+}
diff --git a/ports/rp2/boards/SPARKFUN_PROMICRO/board.json b/ports/rp2/boards/SPARKFUN_PROMICRO/board.json
new file mode 100644
index 0000000000000..28e9764fe4801
--- /dev/null
+++ b/ports/rp2/boards/SPARKFUN_PROMICRO/board.json
@@ -0,0 +1,15 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [],
+    "images": [
+        "17745-SparkFun_Thing_Plus_-_RP2040-01a.jpg"
+    ],
+    "mcu": "rp2040",
+    "product": "Pro Micro RP2040",
+    "thumbnail": "",
+    "url": "https://www.sparkfun.com/products/17717",
+    "vendor": "Sparkfun"
+}
diff --git a/ports/rp2/boards/SPARKFUN_THINGPLUS/board.json b/ports/rp2/boards/SPARKFUN_THINGPLUS/board.json
new file mode 100644
index 0000000000000..d864f67c11baa
--- /dev/null
+++ b/ports/rp2/boards/SPARKFUN_THINGPLUS/board.json
@@ -0,0 +1,15 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [],
+    "images": [
+        "17745-SparkFun_Thing_Plus_-_RP2040-01a.jpg"
+    ],
+    "mcu": "rp2040",
+    "product": "Thing Plus RP2040",
+    "thumbnail": "",
+    "url": "https://www.sparkfun.com/products/17745",
+    "vendor": "Sparkfun"
+}
diff --git a/ports/rp2/boards/deploy.md b/ports/rp2/boards/deploy.md
new file mode 100644
index 0000000000000..4e76dfa290f53
--- /dev/null
+++ b/ports/rp2/boards/deploy.md
@@ -0,0 +1,8 @@
+### Flashing via UF2 bootloader
+
+To get the board in bootloader mode ready for the firmware update, execute
+`machine.bootloader()` at the MicroPython REPL.  Alternatively, hold
+down the BOOTSEL button while plugging the board into USB.  The uf2 file below
+should then be copied to the USB mass storage device that appears.  Once
+programming of the new firmware is complete the device will automatically reset
+and be ready for use.
diff --git a/ports/samd/boards/ADAFRUIT_FEATHER_M0_EXPRESS/board.json b/ports/samd/boards/ADAFRUIT_FEATHER_M0_EXPRESS/board.json
new file mode 100644
index 0000000000000..8b91398e12dd2
--- /dev/null
+++ b/ports/samd/boards/ADAFRUIT_FEATHER_M0_EXPRESS/board.json
@@ -0,0 +1,15 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [],
+    "images": [
+        "feather_m0_express.jpg"
+    ],
+    "mcu": "samd21",
+    "product": "Feather M0 Express",
+    "thumbnail": "",
+    "url": "https://www.adafruit.com/product/3403",
+    "vendor": "Adafruit"
+}
diff --git a/ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/board.json b/ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/board.json
new file mode 100644
index 0000000000000..74b278b15b879
--- /dev/null
+++ b/ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/board.json
@@ -0,0 +1,15 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [],
+    "images": [
+        "itsybitsy_m4_express.jpg"
+    ],
+    "mcu": "samd51",
+    "product": "ItsyBitsy M4 Express",
+    "thumbnail": "",
+    "url": "https://www.adafruit.com/product/3800",
+    "vendor": "Adafruit"
+}
diff --git a/ports/samd/boards/ADAFRUIT_TRINKET_M0/board.json b/ports/samd/boards/ADAFRUIT_TRINKET_M0/board.json
new file mode 100644
index 0000000000000..6d104fac18ae7
--- /dev/null
+++ b/ports/samd/boards/ADAFRUIT_TRINKET_M0/board.json
@@ -0,0 +1,15 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [],
+    "images": [
+        "trinket_m0.jpg"
+    ],
+    "mcu": "samd21",
+    "product": "Trinket M0",
+    "thumbnail": "",
+    "url": "https://www.adafruit.com/product/3500",
+    "vendor": "Adafruit"
+}
diff --git a/ports/samd/boards/MINISAM_M4/board.json b/ports/samd/boards/MINISAM_M4/board.json
new file mode 100644
index 0000000000000..df63ec64b7b8d
--- /dev/null
+++ b/ports/samd/boards/MINISAM_M4/board.json
@@ -0,0 +1,15 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [],
+    "images": [
+        "mini_sam_m4.jpg"
+    ],
+    "mcu": "samd51",
+    "product": "Mini SAM M4",
+    "thumbnail": "",
+    "url": "https://minifigboards.com/products/mini-sam-m4",
+    "vendor": "MiniFig Boards"
+}
diff --git a/ports/samd/boards/SAMD21_XPLAINED_PRO/board.json b/ports/samd/boards/SAMD21_XPLAINED_PRO/board.json
new file mode 100644
index 0000000000000..0564e3f82ac59
--- /dev/null
+++ b/ports/samd/boards/SAMD21_XPLAINED_PRO/board.json
@@ -0,0 +1,13 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [],
+    "images": ["2033-atsamd21-xpro.jpg"],
+    "mcu": "samd21",
+    "product": "SAMD21 Xplained Pro",
+    "thumbnail": "",
+    "url": "https://www.microchip.com/en-us/development-tool/atsamd21-xpro",
+    "vendor": "Microchip"
+}
diff --git a/ports/samd/boards/deploy.md b/ports/samd/boards/deploy.md
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/ports/stm32/boards/ADAFRUIT_F405_EXPRESS/board.json b/ports/stm32/boards/ADAFRUIT_F405_EXPRESS/board.json
new file mode 100644
index 0000000000000..a2cc8b327dd5d
--- /dev/null
+++ b/ports/stm32/boards/ADAFRUIT_F405_EXPRESS/board.json
@@ -0,0 +1,13 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [],
+    "images": [],
+    "mcu": "stm32f4",
+    "product": "F405 Express",
+    "thumbnail": "",
+    "url": "https://www.adafruit.com/product/4382",
+    "vendor": "Adafruit"
+}
diff --git a/ports/stm32/boards/B_L072Z_LRWAN1/board.json b/ports/stm32/boards/B_L072Z_LRWAN1/board.json
new file mode 100644
index 0000000000000..7eb6981ff307a
--- /dev/null
+++ b/ports/stm32/boards/B_L072Z_LRWAN1/board.json
@@ -0,0 +1,13 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [],
+    "images": [],
+    "mcu": "stm32l0",
+    "product": "B_L072Z_LRWAN1",
+    "thumbnail": "",
+    "url": "",
+    "vendor": "ST Microelectronics"
+}
diff --git a/ports/stm32/boards/B_L475E_IOT01A/board.json b/ports/stm32/boards/B_L475E_IOT01A/board.json
new file mode 100644
index 0000000000000..91e76bc08e5ab
--- /dev/null
+++ b/ports/stm32/boards/B_L475E_IOT01A/board.json
@@ -0,0 +1,13 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [],
+    "images": [],
+    "mcu": "stm32l4",
+    "product": "B_L475E_IOT01A",
+    "thumbnail": "",
+    "url": "",
+    "vendor": "ST Microelectronics"
+}
diff --git a/ports/stm32/boards/CERB40/board.json b/ports/stm32/boards/CERB40/board.json
new file mode 100644
index 0000000000000..600ccdf2a44cf
--- /dev/null
+++ b/ports/stm32/boards/CERB40/board.json
@@ -0,0 +1,13 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [],
+    "images": [],
+    "mcu": "stm32f4",
+    "product": "CERB40",
+    "thumbnail": "",
+    "url": "",
+    "vendor": ""
+}
diff --git a/ports/stm32/boards/ESPRUINO_PICO/board.json b/ports/stm32/boards/ESPRUINO_PICO/board.json
new file mode 100644
index 0000000000000..554687edba1bb
--- /dev/null
+++ b/ports/stm32/boards/ESPRUINO_PICO/board.json
@@ -0,0 +1,15 @@
+{
+    "deploy": [
+        "deploy.md"
+    ],
+    "docs": "",
+    "features": [],
+    "images": [
+        "Pico_angled.jpg"
+    ],
+    "mcu": "stm32f4",
+    "product": "Pico",
+    "thumbnail": "",
+    "url": "https://www.espruino.com/Pico",
+    "vendor": "Espruino"
+}
diff --git a/ports/stm32/boards/ESPRUINO_PICO/deploy.md b/ports/stm32/boards/ESPRUINO_PICO/deploy.md
new file mode 100644
index 0000000000000..5c85668f24e75
--- /dev/null
+++ b/ports/stm32/boards/ESPRUINO_PICO/deploy.md
@@ -0,0 +1 @@
+For programming an Espruino Pico see the "Advanced Reflashing" section of [this page](http://www.espruino.com/Pico).
diff --git a/ports/stm32/boards/HYDRABUS/board.json b/ports/stm32/boards/HYDRABUS/board.json
new file mode 100644
index 0000000000000..c3f398f28e553
--- /dev/null
+++ b/ports/stm32/boards/HYDRABUS/board.json
@@ -0,0 +1,13 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [],
+    "images": [],
+    "mcu": "stm32f4",
+    "product": "HYDRABUS",
+    "thumbnail": "",
+    "url": "",
+    "vendor": ""
+}
diff --git a/ports/stm32/boards/LEGO_HUB_NO6/board.json b/ports/stm32/boards/LEGO_HUB_NO6/board.json
new file mode 100644
index 0000000000000..c11b9f1818346
--- /dev/null
+++ b/ports/stm32/boards/LEGO_HUB_NO6/board.json
@@ -0,0 +1,13 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [],
+    "images": [],
+    "mcu": "stm32f4",
+    "product": "Hub No.6",
+    "thumbnail": "",
+    "url": "",
+    "vendor": "Lego"
+}
diff --git a/ports/stm32/boards/LIMIFROG/board.json b/ports/stm32/boards/LIMIFROG/board.json
new file mode 100644
index 0000000000000..d4ce3f41cdc1a
--- /dev/null
+++ b/ports/stm32/boards/LIMIFROG/board.json
@@ -0,0 +1,13 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [],
+    "images": [],
+    "mcu": "stm32l4",
+    "product": "LIMIFROG",
+    "thumbnail": "",
+    "url": "",
+    "vendor": ""
+}
diff --git a/ports/stm32/boards/MIKROE_CLICKER2_STM32/board.json b/ports/stm32/boards/MIKROE_CLICKER2_STM32/board.json
new file mode 100644
index 0000000000000..3d7d4904fcaa0
--- /dev/null
+++ b/ports/stm32/boards/MIKROE_CLICKER2_STM32/board.json
@@ -0,0 +1,13 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [],
+    "images": [],
+    "mcu": "stm32f4",
+    "product": "MIKROE_CLICKER2_STM32",
+    "thumbnail": "",
+    "url": "",
+    "vendor": ""
+}
diff --git a/ports/stm32/boards/NADHAT_PYBF405/board.json b/ports/stm32/boards/NADHAT_PYBF405/board.json
new file mode 100644
index 0000000000000..fd4e67c61a9ea
--- /dev/null
+++ b/ports/stm32/boards/NADHAT_PYBF405/board.json
@@ -0,0 +1,13 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [],
+    "images": [],
+    "mcu": "stm32f4",
+    "product": "PYBF405",
+    "thumbnail": "",
+    "url": "",
+    "vendor": "Nadhat"
+}
diff --git a/ports/stm32/boards/NETDUINO_PLUS_2/board.json b/ports/stm32/boards/NETDUINO_PLUS_2/board.json
new file mode 100644
index 0000000000000..88b135bc089b1
--- /dev/null
+++ b/ports/stm32/boards/NETDUINO_PLUS_2/board.json
@@ -0,0 +1,13 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [],
+    "images": [],
+    "mcu": "stm32f4",
+    "product": "NETDUINO_PLUS_2",
+    "thumbnail": "",
+    "url": "",
+    "vendor": ""
+}
diff --git a/ports/stm32/boards/NUCLEO_F091RC/board.json b/ports/stm32/boards/NUCLEO_F091RC/board.json
new file mode 100644
index 0000000000000..1cabbce5c8c86
--- /dev/null
+++ b/ports/stm32/boards/NUCLEO_F091RC/board.json
@@ -0,0 +1,13 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [],
+    "images": [],
+    "mcu": "stm32f0",
+    "product": "Nucleo F091RC",
+    "thumbnail": "",
+    "url": "",
+    "vendor": "ST Microelectronics"
+}
diff --git a/ports/stm32/boards/NUCLEO_F401RE/board.json b/ports/stm32/boards/NUCLEO_F401RE/board.json
new file mode 100644
index 0000000000000..91ae8b49cf883
--- /dev/null
+++ b/ports/stm32/boards/NUCLEO_F401RE/board.json
@@ -0,0 +1,13 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [],
+    "images": [],
+    "mcu": "stm32f4",
+    "product": "Nucleo F401RE",
+    "thumbnail": "",
+    "url": "",
+    "vendor": "ST Microelectronics"
+}
diff --git a/ports/stm32/boards/NUCLEO_F411RE/board.json b/ports/stm32/boards/NUCLEO_F411RE/board.json
new file mode 100644
index 0000000000000..c2d4ad4e2f585
--- /dev/null
+++ b/ports/stm32/boards/NUCLEO_F411RE/board.json
@@ -0,0 +1,13 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [],
+    "images": [],
+    "mcu": "stm32f4",
+    "product": "Nucleo F411RE",
+    "thumbnail": "",
+    "url": "",
+    "vendor": "ST Microelectronics"
+}
diff --git a/ports/stm32/boards/NUCLEO_F412ZG/board.json b/ports/stm32/boards/NUCLEO_F412ZG/board.json
new file mode 100644
index 0000000000000..bddc1e6d67fb2
--- /dev/null
+++ b/ports/stm32/boards/NUCLEO_F412ZG/board.json
@@ -0,0 +1,13 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [],
+    "images": [],
+    "mcu": "stm32f4",
+    "product": "Nucleo F412ZG",
+    "thumbnail": "",
+    "url": "",
+    "vendor": "ST Microelectronics"
+}
diff --git a/ports/stm32/boards/NUCLEO_F413ZH/board.json b/ports/stm32/boards/NUCLEO_F413ZH/board.json
new file mode 100644
index 0000000000000..4a08c9f5e2703
--- /dev/null
+++ b/ports/stm32/boards/NUCLEO_F413ZH/board.json
@@ -0,0 +1,13 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [],
+    "images": [],
+    "mcu": "stm32f4",
+    "product": "Nucleo F413ZH",
+    "thumbnail": "",
+    "url": "",
+    "vendor": "ST Microelectronics"
+}
diff --git a/ports/stm32/boards/NUCLEO_F429ZI/board.json b/ports/stm32/boards/NUCLEO_F429ZI/board.json
new file mode 100644
index 0000000000000..7c2767da4df32
--- /dev/null
+++ b/ports/stm32/boards/NUCLEO_F429ZI/board.json
@@ -0,0 +1,13 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [],
+    "images": [],
+    "mcu": "stm32f4",
+    "product": "Nucleo F429ZI",
+    "thumbnail": "",
+    "url": "",
+    "vendor": "ST Microelectronics"
+}
diff --git a/ports/stm32/boards/NUCLEO_F439ZI/board.json b/ports/stm32/boards/NUCLEO_F439ZI/board.json
new file mode 100644
index 0000000000000..8daac091f1e44
--- /dev/null
+++ b/ports/stm32/boards/NUCLEO_F439ZI/board.json
@@ -0,0 +1,13 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [],
+    "images": [],
+    "mcu": "stm32f4",
+    "product": "Nucleo F439ZI",
+    "thumbnail": "",
+    "url": "",
+    "vendor": "ST Microelectronics"
+}
diff --git a/ports/stm32/boards/NUCLEO_F446RE/board.json b/ports/stm32/boards/NUCLEO_F446RE/board.json
new file mode 100644
index 0000000000000..3cbf34d6aa824
--- /dev/null
+++ b/ports/stm32/boards/NUCLEO_F446RE/board.json
@@ -0,0 +1,13 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [],
+    "images": [],
+    "mcu": "stm32f4",
+    "product": "Nucleo F446RE",
+    "thumbnail": "",
+    "url": "",
+    "vendor": "ST Microelectronics"
+}
diff --git a/ports/stm32/boards/NUCLEO_F722ZE/board.json b/ports/stm32/boards/NUCLEO_F722ZE/board.json
new file mode 100644
index 0000000000000..fe318edfa3e33
--- /dev/null
+++ b/ports/stm32/boards/NUCLEO_F722ZE/board.json
@@ -0,0 +1,13 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [],
+    "images": [],
+    "mcu": "stm32f7",
+    "product": "Nucleo F722ZE",
+    "thumbnail": "",
+    "url": "",
+    "vendor": "ST Microelectronics"
+}
diff --git a/ports/stm32/boards/NUCLEO_F746ZG/board.json b/ports/stm32/boards/NUCLEO_F746ZG/board.json
new file mode 100644
index 0000000000000..7aee7b05a6528
--- /dev/null
+++ b/ports/stm32/boards/NUCLEO_F746ZG/board.json
@@ -0,0 +1,13 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [],
+    "images": [],
+    "mcu": "stm32f7",
+    "product": "Nucleo F746ZG",
+    "thumbnail": "",
+    "url": "",
+    "vendor": "ST Microelectronics"
+}
diff --git a/ports/stm32/boards/NUCLEO_F767ZI/board.json b/ports/stm32/boards/NUCLEO_F767ZI/board.json
new file mode 100644
index 0000000000000..936ad53dd759e
--- /dev/null
+++ b/ports/stm32/boards/NUCLEO_F767ZI/board.json
@@ -0,0 +1,13 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [],
+    "images": [],
+    "mcu": "stm32f7",
+    "product": "Nucleo F767ZI",
+    "thumbnail": "",
+    "url": "",
+    "vendor": "ST Microelectronics"
+}
diff --git a/ports/stm32/boards/NUCLEO_H743ZI/board.json b/ports/stm32/boards/NUCLEO_H743ZI/board.json
new file mode 100644
index 0000000000000..27b8e901ce45c
--- /dev/null
+++ b/ports/stm32/boards/NUCLEO_H743ZI/board.json
@@ -0,0 +1,13 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [],
+    "images": [],
+    "mcu": "stm32h7",
+    "product": "Nucleo H743ZI",
+    "thumbnail": "",
+    "url": "",
+    "vendor": "ST Microelectronics"
+}
diff --git a/ports/stm32/boards/NUCLEO_H743ZI2/board.json b/ports/stm32/boards/NUCLEO_H743ZI2/board.json
new file mode 100644
index 0000000000000..30361e6f1594d
--- /dev/null
+++ b/ports/stm32/boards/NUCLEO_H743ZI2/board.json
@@ -0,0 +1,13 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [],
+    "images": [],
+    "mcu": "stm32",
+    "product": "Nucleo H743ZI2",
+    "thumbnail": "",
+    "url": "",
+    "vendor": "ST Microelectronics"
+}
diff --git a/ports/stm32/boards/NUCLEO_L073RZ/board.json b/ports/stm32/boards/NUCLEO_L073RZ/board.json
new file mode 100644
index 0000000000000..c11bad6d942d8
--- /dev/null
+++ b/ports/stm32/boards/NUCLEO_L073RZ/board.json
@@ -0,0 +1,13 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [],
+    "images": [],
+    "mcu": "stm32l0",
+    "product": "Nucleo L073RZ",
+    "thumbnail": "",
+    "url": "",
+    "vendor": "ST Microelectronics"
+}
diff --git a/ports/stm32/boards/NUCLEO_L432KC/board.json b/ports/stm32/boards/NUCLEO_L432KC/board.json
new file mode 100644
index 0000000000000..33006038855cb
--- /dev/null
+++ b/ports/stm32/boards/NUCLEO_L432KC/board.json
@@ -0,0 +1,13 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [],
+    "images": [],
+    "mcu": "stm32l4",
+    "product": "Nucleo L432KC",
+    "thumbnail": "",
+    "url": "",
+    "vendor": "ST Microelectronics"
+}
diff --git a/ports/stm32/boards/NUCLEO_L452RE/board.json b/ports/stm32/boards/NUCLEO_L452RE/board.json
new file mode 100644
index 0000000000000..e8c31c50235ea
--- /dev/null
+++ b/ports/stm32/boards/NUCLEO_L452RE/board.json
@@ -0,0 +1,13 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [],
+    "images": [],
+    "mcu": "stm32l4",
+    "product": "Nucleo L452RE",
+    "thumbnail": "",
+    "url": "",
+    "vendor": "ST Microelectronics"
+}
diff --git a/ports/stm32/boards/NUCLEO_L476RG/board.json b/ports/stm32/boards/NUCLEO_L476RG/board.json
new file mode 100644
index 0000000000000..d776f6615e6a6
--- /dev/null
+++ b/ports/stm32/boards/NUCLEO_L476RG/board.json
@@ -0,0 +1,13 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [],
+    "images": [],
+    "mcu": "stm32l4",
+    "product": "Nucleo L476RG",
+    "thumbnail": "",
+    "url": "",
+    "vendor": "ST Microelectronics"
+}
diff --git a/ports/stm32/boards/NUCLEO_WB55/board.json b/ports/stm32/boards/NUCLEO_WB55/board.json
new file mode 100644
index 0000000000000..2456b0b3a0ff9
--- /dev/null
+++ b/ports/stm32/boards/NUCLEO_WB55/board.json
@@ -0,0 +1,13 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [],
+    "images": [],
+    "mcu": "stm32wb",
+    "product": "Nucleo WB55",
+    "thumbnail": "",
+    "url": "",
+    "vendor": "ST Microelectronics"
+}
diff --git a/ports/stm32/boards/OLIMEX_E407/board.json b/ports/stm32/boards/OLIMEX_E407/board.json
new file mode 100644
index 0000000000000..d4e0fda98c1f0
--- /dev/null
+++ b/ports/stm32/boards/OLIMEX_E407/board.json
@@ -0,0 +1,13 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [],
+    "images": [],
+    "mcu": "stm32f4",
+    "product": "E407",
+    "thumbnail": "",
+    "url": "",
+    "vendor": "OLIMEX"
+}
diff --git a/ports/stm32/boards/OLIMEX_H407/board.json b/ports/stm32/boards/OLIMEX_H407/board.json
new file mode 100644
index 0000000000000..d4e0fda98c1f0
--- /dev/null
+++ b/ports/stm32/boards/OLIMEX_H407/board.json
@@ -0,0 +1,13 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [],
+    "images": [],
+    "mcu": "stm32f4",
+    "product": "E407",
+    "thumbnail": "",
+    "url": "",
+    "vendor": "OLIMEX"
+}
diff --git a/ports/stm32/boards/PYBD_SF2/board.json b/ports/stm32/boards/PYBD_SF2/board.json
new file mode 100644
index 0000000000000..534a048ff0058
--- /dev/null
+++ b/ports/stm32/boards/PYBD_SF2/board.json
@@ -0,0 +1,21 @@
+{
+    "deploy": [
+        "deploy.md"
+    ],
+    "docs": "",
+    "features": [],
+    "id": "PYBD-SF2",
+    "images": [
+        "PYBD_SF2_W4F2.jpg",
+        "PYBD_SF2_W4F2_top.jpg",
+        "PYBD_SF2_W4F2_bot.jpg",
+        "PYBD_SF2_W4F2_ds1.jpg",
+        "PYBD_SF2_W4F2_ds2.jpg",
+        "PYBD_SF2_W4F2_ds3.jpg"
+    ],
+    "mcu": "stm32f7",
+    "product": "Pyboard D-series SF2",
+    "thumbnail": "",
+    "url": "https://store.micropython.org/product/PYBD-SF2-W4F2",
+    "vendor": "George Robotics"
+}
diff --git a/ports/stm32/boards/PYBD_SF2/board.md b/ports/stm32/boards/PYBD_SF2/board.md
new file mode 100644
index 0000000000000..f1074df1a5e45
--- /dev/null
+++ b/ports/stm32/boards/PYBD_SF2/board.md
@@ -0,0 +1 @@
+Firmware can be found in the sections below, which is built daily from the ports/stm32/ directory of MicroPython. Check which model you have by the sticker on the top.
diff --git a/ports/stm32/boards/PYBD_SF2/deploy.md b/ports/stm32/boards/PYBD_SF2/deploy.md
new file mode 100644
index 0000000000000..afef7b148dc00
--- /dev/null
+++ b/ports/stm32/boards/PYBD_SF2/deploy.md
@@ -0,0 +1,3 @@
+### Pyboard-D via mboot
+
+For the pyboard D-series you can enter the mboot DFU bootloader by executing `machine.bootloader()` at the MicroPython REPL. Alternatively, mboot can be entered by holding down the USR button, pressing and releasing the RST button, and continuing to hold down USR until the LED is white (4th in the cycle), then let go of USR while the LED is white. The LED will then flash red once per second to indicate it is in USB DFU mode. You can then program the firmware using a DFU programmer, eg [dfu-util](http://dfu-util.sourceforge.net/) or [pydfu.py](https://github.com/micropython/micropython/blob/master/tools/pydfu.py).
diff --git a/ports/stm32/boards/PYBD_SF3/board.json b/ports/stm32/boards/PYBD_SF3/board.json
new file mode 100644
index 0000000000000..3e4731b3d2cba
--- /dev/null
+++ b/ports/stm32/boards/PYBD_SF3/board.json
@@ -0,0 +1,21 @@
+{
+    "deploy": [
+        "../PYBD_SF2/deploy.md"
+    ],
+    "docs": "",
+    "features": [],
+    "id": "PYBD-SF3",
+    "images": [
+        "PYBD_SF3_W4F2.jpg",
+        "PYBD_SF3_W4F2_top.jpg",
+        "PYBD_SF2_W4F2_bot.jpg",
+        "PYBD_SF3_W4F2_ds1.jpg",
+        "PYBD_SF3_W4F2_ds2.jpg",
+        "PYBD_SF3_W4F2_ds3.jpg"
+    ],
+    "mcu": "stm32f7",
+    "product": "Pyboard D-series SF3",
+    "thumbnail": "",
+    "url": "https://store.micropython.org/product/PYBD-SF3-W4F2",
+    "vendor": "George Robotics"
+}
diff --git a/ports/stm32/boards/PYBD_SF3/board.md b/ports/stm32/boards/PYBD_SF3/board.md
new file mode 100644
index 0000000000000..f1074df1a5e45
--- /dev/null
+++ b/ports/stm32/boards/PYBD_SF3/board.md
@@ -0,0 +1 @@
+Firmware can be found in the sections below, which is built daily from the ports/stm32/ directory of MicroPython. Check which model you have by the sticker on the top.
diff --git a/ports/stm32/boards/PYBD_SF6/board.json b/ports/stm32/boards/PYBD_SF6/board.json
new file mode 100644
index 0000000000000..3e689d69bee5c
--- /dev/null
+++ b/ports/stm32/boards/PYBD_SF6/board.json
@@ -0,0 +1,24 @@
+{
+    "deploy": [
+        "../PYBD_SF2/deploy.md"
+    ],
+    "docs": "",
+    "features": [
+        "WiFi",
+        "BLE"
+    ],
+    "id": "PYBD-SF6",
+    "images": [
+        "PYBD_SF6_W4F2.jpg",
+        "PYBD_SF6_W4F2_top.jpg",
+        "PYBD_SF2_W4F2_bot.jpg",
+        "PYBD_SF6_W4F2_ds1.jpg",
+        "PYBD_SF6_W4F2_ds2.jpg",
+        "PYBD_SF6_W4F2_ds3.jpg"
+    ],
+    "mcu": "stm32f7",
+    "product": "Pyboard D-series SF6",
+    "thumbnail": "",
+    "url": "https://store.micropython.org/product/PYBD-SF6-W4F2",
+    "vendor": "George Robotics"
+}
diff --git a/ports/stm32/boards/PYBD_SF6/board.md b/ports/stm32/boards/PYBD_SF6/board.md
new file mode 100644
index 0000000000000..f1074df1a5e45
--- /dev/null
+++ b/ports/stm32/boards/PYBD_SF6/board.md
@@ -0,0 +1 @@
+Firmware can be found in the sections below, which is built daily from the ports/stm32/ directory of MicroPython. Check which model you have by the sticker on the top.
diff --git a/ports/stm32/boards/PYBLITEV10/board.json b/ports/stm32/boards/PYBLITEV10/board.json
new file mode 100644
index 0000000000000..ce98ba7de7396
--- /dev/null
+++ b/ports/stm32/boards/PYBLITEV10/board.json
@@ -0,0 +1,24 @@
+{
+    "deploy": [
+        "../PYBV10/deploy.md"
+    ],
+    "docs": "",
+    "features": [],
+    "id": "pyblitev10",
+    "images": [
+        "PYBLITEv1_0.jpg",
+        "PYBLITEv1_0-B.jpg",
+        "PYBLITEv1_0-C.jpg"
+    ],
+    "mcu": "stm32f4",
+    "product": "Pyboard Lite v1.0",
+    "thumbnail": "",
+    "url": "https://store.micropython.org/product/PYBLITEv1.0",
+    "variants": {
+        "dp": "Double-precision float",
+        "dp-thread": "Double precision float + Threads",
+        "network": "Wiznet 5200 Driver",
+        "thread": "Threading"
+    },
+    "vendor": "George Robotics"
+}
diff --git a/ports/stm32/boards/PYBLITEV10/board.md b/ports/stm32/boards/PYBLITEV10/board.md
new file mode 100644
index 0000000000000..1511ffcf514fa
--- /dev/null
+++ b/ports/stm32/boards/PYBLITEV10/board.md
@@ -0,0 +1 @@
+The "standard" build is listed first and is the default firmware that the pyboards are shipped with. Use this firmware if you are uncertain. The "double FP" builds use double-precision floating point instead of the standard single precision. The "threading" builds contain the \_thread module and allow multithreading. The "network" builds have network drivers for CC3000 and WIZ820io included. All these different firmware are completely interchangeable and you can freely change from one to the other without losing the filesystem on your pyboard.
diff --git a/ports/stm32/boards/PYBV10/board.json b/ports/stm32/boards/PYBV10/board.json
new file mode 100644
index 0000000000000..2907b8fc45734
--- /dev/null
+++ b/ports/stm32/boards/PYBV10/board.json
@@ -0,0 +1,22 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [],
+    "id": "pybv10",
+    "images": [
+        "PYBv1_0-C.jpg"
+    ],
+    "mcu": "stm32f4",
+    "product": "Pyboard v1.0",
+    "thumbnail": "",
+    "url": "",
+    "variants": {
+        "dp": "Double-precision float",
+        "dp-thread": "Double precision float + Threads",
+        "network": "Wiznet 5200 Driver",
+        "thread": "Threading"
+    },
+    "vendor": "George Robotics"
+}
diff --git a/ports/stm32/boards/PYBV10/board.md b/ports/stm32/boards/PYBV10/board.md
new file mode 100644
index 0000000000000..1511ffcf514fa
--- /dev/null
+++ b/ports/stm32/boards/PYBV10/board.md
@@ -0,0 +1 @@
+The "standard" build is listed first and is the default firmware that the pyboards are shipped with. Use this firmware if you are uncertain. The "double FP" builds use double-precision floating point instead of the standard single precision. The "threading" builds contain the \_thread module and allow multithreading. The "network" builds have network drivers for CC3000 and WIZ820io included. All these different firmware are completely interchangeable and you can freely change from one to the other without losing the filesystem on your pyboard.
diff --git a/ports/stm32/boards/PYBV10/deploy.md b/ports/stm32/boards/PYBV10/deploy.md
new file mode 100644
index 0000000000000..d7c21999e7896
--- /dev/null
+++ b/ports/stm32/boards/PYBV10/deploy.md
@@ -0,0 +1,6 @@
+### Pyboard v1.x via DFU
+
+One you have downloaded the appropriate DFU file it can be flashed directly to your pyboard
+using a DFU programmer. You can enter the DFU bootloader on the pyboard by executing `machine.bootloader()` at the MicroPython REPL.
+
+Alternatively, connect 3V3 with BOOT0 and reset the board. For information about DFU programming on Windows see [this PDF](http://micropython.org/resources/Micro-Python-Windows-setup.pdf). For Linux and Mac see [here](https://github.com/micropython/micropython/wiki/Pyboard-Firmware-Update).
diff --git a/ports/stm32/boards/PYBV11/board.json b/ports/stm32/boards/PYBV11/board.json
new file mode 100644
index 0000000000000..fe59a7b16d77e
--- /dev/null
+++ b/ports/stm32/boards/PYBV11/board.json
@@ -0,0 +1,24 @@
+{
+    "deploy": [
+        "../PYBV10/deploy.md"
+    ],
+    "docs": "",
+    "features": [],
+    "id": "pybv11",
+    "images": [
+        "PYBv1_1.jpg",
+        "PYBv1_1-C.jpg",
+        "PYBv1_1-E.jpg"
+    ],
+    "mcu": "stm32f4",
+    "product": "Pyboard v1.1",
+    "thumbnail": "",
+    "url": "https://store.micropython.org/product/PYBv1.1",
+    "variants": {
+        "dp": "Double-precision float",
+        "dp-thread": "Double precision float + Threads",
+        "network": "Wiznet 5200 Driver",
+        "thread": "Threading"
+    },
+    "vendor": "George Robotics"
+}
diff --git a/ports/stm32/boards/PYBV11/board.md b/ports/stm32/boards/PYBV11/board.md
new file mode 100644
index 0000000000000..1511ffcf514fa
--- /dev/null
+++ b/ports/stm32/boards/PYBV11/board.md
@@ -0,0 +1 @@
+The "standard" build is listed first and is the default firmware that the pyboards are shipped with. Use this firmware if you are uncertain. The "double FP" builds use double-precision floating point instead of the standard single precision. The "threading" builds contain the \_thread module and allow multithreading. The "network" builds have network drivers for CC3000 and WIZ820io included. All these different firmware are completely interchangeable and you can freely change from one to the other without losing the filesystem on your pyboard.
diff --git a/ports/stm32/boards/SPARKFUN_MICROMOD_STM32/board.json b/ports/stm32/boards/SPARKFUN_MICROMOD_STM32/board.json
new file mode 100644
index 0000000000000..0c1bba8ee7d9d
--- /dev/null
+++ b/ports/stm32/boards/SPARKFUN_MICROMOD_STM32/board.json
@@ -0,0 +1,13 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [],
+    "images": [],
+    "mcu": "stm32f4",
+    "product": "Micromod STM32",
+    "thumbnail": "",
+    "url": "",
+    "vendor": "Sparkfun"
+}
diff --git a/ports/stm32/boards/STM32F411DISC/board.json b/ports/stm32/boards/STM32F411DISC/board.json
new file mode 100644
index 0000000000000..42516178a04f5
--- /dev/null
+++ b/ports/stm32/boards/STM32F411DISC/board.json
@@ -0,0 +1,13 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [],
+    "images": [],
+    "mcu": "stm32f4",
+    "product": "Discovery F411",
+    "thumbnail": "",
+    "url": "",
+    "vendor": "ST Microelectronics"
+}
diff --git a/ports/stm32/boards/STM32F429DISC/board.json b/ports/stm32/boards/STM32F429DISC/board.json
new file mode 100644
index 0000000000000..8842e004d183a
--- /dev/null
+++ b/ports/stm32/boards/STM32F429DISC/board.json
@@ -0,0 +1,13 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [],
+    "images": [],
+    "mcu": "stm32f4",
+    "product": "Discovery F429",
+    "thumbnail": "",
+    "url": "",
+    "vendor": "ST Microelectronics"
+}
diff --git a/ports/stm32/boards/STM32F439/board.json b/ports/stm32/boards/STM32F439/board.json
new file mode 100644
index 0000000000000..e941244e7eb6a
--- /dev/null
+++ b/ports/stm32/boards/STM32F439/board.json
@@ -0,0 +1,13 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [],
+    "images": [],
+    "mcu": "stm32f4",
+    "product": "STM32F439",
+    "thumbnail": "",
+    "url": "",
+    "vendor": ""
+}
diff --git a/ports/stm32/boards/STM32F4DISC/board.json b/ports/stm32/boards/STM32F4DISC/board.json
new file mode 100644
index 0000000000000..7c4fea38b27c3
--- /dev/null
+++ b/ports/stm32/boards/STM32F4DISC/board.json
@@ -0,0 +1,13 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [],
+    "images": [],
+    "mcu": "stm32f4",
+    "product": "Discovery F4",
+    "thumbnail": "",
+    "url": "",
+    "vendor": "ST Microelectronics"
+}
diff --git a/ports/stm32/boards/STM32F769DISC/board.json b/ports/stm32/boards/STM32F769DISC/board.json
new file mode 100644
index 0000000000000..68584e9501dc2
--- /dev/null
+++ b/ports/stm32/boards/STM32F769DISC/board.json
@@ -0,0 +1,13 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [],
+    "images": [],
+    "mcu": "stm32f7",
+    "product": "Discovery F769",
+    "thumbnail": "",
+    "url": "",
+    "vendor": "ST Microelectronics"
+}
diff --git a/ports/stm32/boards/STM32F7DISC/board.json b/ports/stm32/boards/STM32F7DISC/board.json
new file mode 100644
index 0000000000000..4b83f20f2dd85
--- /dev/null
+++ b/ports/stm32/boards/STM32F7DISC/board.json
@@ -0,0 +1,13 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [],
+    "images": [],
+    "mcu": "stm32f7",
+    "product": "Discovery F7",
+    "thumbnail": "",
+    "url": "",
+    "vendor": "ST Microelectronics"
+}
diff --git a/ports/stm32/boards/STM32H7B3I_DK/board.json b/ports/stm32/boards/STM32H7B3I_DK/board.json
new file mode 100644
index 0000000000000..4d03c72917477
--- /dev/null
+++ b/ports/stm32/boards/STM32H7B3I_DK/board.json
@@ -0,0 +1,13 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [],
+    "images": [],
+    "mcu": "stm32h7",
+    "product": "Discovery Kit H7",
+    "thumbnail": "",
+    "url": "",
+    "vendor": "ST Microelectronics"
+}
diff --git a/ports/stm32/boards/STM32L476DISC/board.json b/ports/stm32/boards/STM32L476DISC/board.json
new file mode 100644
index 0000000000000..b8a4f92efd063
--- /dev/null
+++ b/ports/stm32/boards/STM32L476DISC/board.json
@@ -0,0 +1,13 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [],
+    "images": [],
+    "mcu": "stm32l4",
+    "product": "Discovery L476",
+    "thumbnail": "",
+    "url": "",
+    "vendor": "ST Microelectronics"
+}
diff --git a/ports/stm32/boards/STM32L496GDISC/board.json b/ports/stm32/boards/STM32L496GDISC/board.json
new file mode 100644
index 0000000000000..b152948c1a861
--- /dev/null
+++ b/ports/stm32/boards/STM32L496GDISC/board.json
@@ -0,0 +1,13 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [],
+    "images": [],
+    "mcu": "stm32l4",
+    "product": "Discovery L496G",
+    "thumbnail": "",
+    "url": "",
+    "vendor": "ST Microelectronics"
+}
diff --git a/ports/stm32/boards/USBDONGLE_WB55/board.json b/ports/stm32/boards/USBDONGLE_WB55/board.json
new file mode 100644
index 0000000000000..00d9121881e0f
--- /dev/null
+++ b/ports/stm32/boards/USBDONGLE_WB55/board.json
@@ -0,0 +1,13 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [],
+    "images": [],
+    "mcu": "stm32wb",
+    "product": "USBDONGLE_WB55",
+    "thumbnail": "",
+    "url": "",
+    "vendor": ""
+}
diff --git a/ports/stm32/boards/VCC_GND_F407VE/board.json b/ports/stm32/boards/VCC_GND_F407VE/board.json
new file mode 100644
index 0000000000000..1b2d02b9f2e1a
--- /dev/null
+++ b/ports/stm32/boards/VCC_GND_F407VE/board.json
@@ -0,0 +1,13 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [],
+    "images": [],
+    "mcu": "stm32f4",
+    "product": "F407VE",
+    "thumbnail": "",
+    "url": "http://vcc-gnd.com/",
+    "vendor": "VCC-GND Studio"
+}
diff --git a/ports/stm32/boards/VCC_GND_F407ZG/board.json b/ports/stm32/boards/VCC_GND_F407ZG/board.json
new file mode 100644
index 0000000000000..0d3cbdb6e04dc
--- /dev/null
+++ b/ports/stm32/boards/VCC_GND_F407ZG/board.json
@@ -0,0 +1,13 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [],
+    "images": [],
+    "mcu": "stm32f4",
+    "product": "F407ZG",
+    "thumbnail": "",
+    "url": "http://vcc-gnd.com/",
+    "vendor": "VCC-GND Studio"
+}
diff --git a/ports/stm32/boards/VCC_GND_H743VI/board.json b/ports/stm32/boards/VCC_GND_H743VI/board.json
new file mode 100644
index 0000000000000..3dfd138ed9372
--- /dev/null
+++ b/ports/stm32/boards/VCC_GND_H743VI/board.json
@@ -0,0 +1,13 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [],
+    "images": [],
+    "mcu": "stm32h7",
+    "product": "H743VI",
+    "thumbnail": "",
+    "url": "http://vcc-gnd.com/",
+    "vendor": "VCC-GND Studio"
+}
diff --git a/ports/stm32/boards/deploy.md b/ports/stm32/boards/deploy.md
new file mode 100644
index 0000000000000..db2b4ef3ab758
--- /dev/null
+++ b/ports/stm32/boards/deploy.md
@@ -0,0 +1,31 @@
+### STM32 via ST-Link
+
+Nucleo and Discovery boards typically include a built-in ST-Link programmer.
+
+A `.bin` or `.hex` file can be flashed using [st-flash](https://github.com/stlink-org/stlink).
+
+```bash
+# Optional erase to clear existing filesystem.
+st-flash erase
+
+# Flash .bin
+st-flash write firmware.bin 0x08000000
+# or, flash .hex
+st-flash --format ihex write firmware.hex
+```
+
+A `.hex` file can be flashed using [STM32 Cube Programmer](https://www.st.com/en/development-tools/stm32cubeprog.html).
+
+```bash
+STM32_Programmer.sh -c port=SWD -d firmware.hex -hardRst
+```
+
+### STM32 via DFU
+
+Boards with USB support can also be programmed via the ST DFU bootloader, using e.g. [dfu-util](http://dfu-util.sourceforge.net/) or [pydfu.py](https://github.com/micropython/micropython/blob/master/tools/pydfu.py).
+
+To enter the bootloader the `BOOT0` pin can be connected to `VCC` during reset, or you can use `machine.bootloader()` from the MicroPython REPL.
+
+```bash
+dfu-util --alt 0 -D firmware.dfu
+```

From ab754d5924168d027bfc2eeed7881b9b2e469535 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Tue, 19 Oct 2021 16:34:09 +1100
Subject: [PATCH 1360/3533] tools/autobuild: Add script to generate website
 board metadata.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 tools/autobuild/build-downloads.py | 58 ++++++++++++++++++++++++++++++
 1 file changed, 58 insertions(+)
 create mode 100755 tools/autobuild/build-downloads.py

diff --git a/tools/autobuild/build-downloads.py b/tools/autobuild/build-downloads.py
new file mode 100755
index 0000000000000..0f532e8bf0792
--- /dev/null
+++ b/tools/autobuild/build-downloads.py
@@ -0,0 +1,58 @@
+#!/usr/bin/env python3
+
+import glob
+import json
+import os
+import sys
+
+
+def main(repo_path, output_path):
+    boards_index = []
+    board_ids = set()
+
+    for board_json in glob.glob(os.path.join(repo_path, "ports/*/boards/*/board.json")):
+        # Relative path to the board directory (e.g. "ports/stm32/boards/PYBV11").
+        board_dir = os.path.dirname(board_json)
+        # Relative path to the port (e.g. "ports/stm32")
+        port_dir = os.path.dirname(os.path.dirname(board_dir))
+
+        with open(board_json, "r") as f:
+            blob = json.load(f)
+
+            # Use "id" if specified, otherwise default to board dir (e.g. "PYBV11").
+            # We allow boards to override ID for the historical build names.
+            blob["id"] = blob.get("id", os.path.basename(board_dir))
+
+            # Check for duplicate board IDs.
+            if blob["id"] in board_ids:
+                print("Duplicate board ID: '{}'".format(blob["id"]), file=sys.stderr)
+            board_ids.add(blob["id"])
+
+            # Add in default fields.
+            blob["port"] = os.path.basename(port_dir)
+            blob["build"] = os.path.basename(board_dir)
+            boards_index.append(blob)
+
+        # Create the board markdown, which is the concatenation of the
+        # default "board.md" file (if exists), as well as any flashing
+        # instructions.
+        board_markdown = os.path.join(board_dir, "board.md")
+        with open(os.path.join(output_path, blob["id"] + ".md"), "w") as f:
+            if os.path.exists(board_markdown):
+                with open(board_markdown, "r") as fin:
+                    f.write(fin.read())
+
+            if blob["deploy"]:
+                f.write("\n\n## Installation instructions\n")
+            for deploy in blob["deploy"]:
+                with open(os.path.join(board_dir, deploy), "r") as fin:
+                    f.write(fin.read())
+
+    # Write the full index for the website to load.
+    with open(os.path.join(output_path, "index.json"), "w") as f:
+        json.dump(boards_index, f, indent=4, sort_keys=True)
+        f.write("\n")
+
+
+if __name__ == "__main__":
+    main(sys.argv[1], sys.argv[2])

From 910e9f9111606b32165b3c57eb54384d8367c4c2 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Wed, 27 Oct 2021 14:56:59 +1100
Subject: [PATCH 1361/3533] esp32: Add specific deploy_s2.md instructions for
 esp32-s2.

In particular the UM S2 boards (and update the features list).

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/esp32/boards/GENERIC_S2/board.json      |  2 +-
 ports/esp32/boards/LOLIN_S2_MINI/board.json   |  2 +-
 ports/esp32/boards/UM_FEATHERS2/board.json    |  3 +--
 ports/esp32/boards/UM_FEATHERS2NEO/board.json |  3 +--
 ports/esp32/boards/UM_TINYS2/board.json       |  7 +++++--
 ports/esp32/boards/deploy.md                  |  1 +
 ports/esp32/boards/deploy_s2.md               | 14 ++++++++++++++
 7 files changed, 24 insertions(+), 8 deletions(-)
 create mode 100644 ports/esp32/boards/deploy_s2.md

diff --git a/ports/esp32/boards/GENERIC_S2/board.json b/ports/esp32/boards/GENERIC_S2/board.json
index 4ecb90a48a0c9..5e1758b86af13 100644
--- a/ports/esp32/boards/GENERIC_S2/board.json
+++ b/ports/esp32/boards/GENERIC_S2/board.json
@@ -1,6 +1,6 @@
 {
     "deploy": [
-        "../deploy.md"
+        "../deploy_s2.md"
     ],
     "docs": "",
     "features": [],
diff --git a/ports/esp32/boards/LOLIN_S2_MINI/board.json b/ports/esp32/boards/LOLIN_S2_MINI/board.json
index 5e866f0e59d96..a84a3098bfefe 100644
--- a/ports/esp32/boards/LOLIN_S2_MINI/board.json
+++ b/ports/esp32/boards/LOLIN_S2_MINI/board.json
@@ -1,6 +1,6 @@
 {
     "deploy": [
-        "../deploy.md"
+        "../deploy_s2.md"
     ],
     "docs": "",
     "features": [],
diff --git a/ports/esp32/boards/UM_FEATHERS2/board.json b/ports/esp32/boards/UM_FEATHERS2/board.json
index bbfd3890049e2..d2da16a6ee2b9 100644
--- a/ports/esp32/boards/UM_FEATHERS2/board.json
+++ b/ports/esp32/boards/UM_FEATHERS2/board.json
@@ -1,10 +1,9 @@
 {
     "deploy": [
-        "../deploy.md"
+        "../deploy_s2.md"
     ],
     "docs": "",
     "features": [
-        "BLE",
         "WiFi",
         "Feather",
         "Battery Charging",
diff --git a/ports/esp32/boards/UM_FEATHERS2NEO/board.json b/ports/esp32/boards/UM_FEATHERS2NEO/board.json
index 1bcc2a4b227cc..1e3e2c0e3bc7e 100644
--- a/ports/esp32/boards/UM_FEATHERS2NEO/board.json
+++ b/ports/esp32/boards/UM_FEATHERS2NEO/board.json
@@ -1,10 +1,9 @@
 {
     "deploy": [
-        "../deploy.md"
+        "../deploy_s2.md"
     ],
     "docs": "",
     "features": [
-        "BLE",
         "WiFi",
         "Feather",
         "Battery Charging",
diff --git a/ports/esp32/boards/UM_TINYS2/board.json b/ports/esp32/boards/UM_TINYS2/board.json
index bc694c2cca318..d378f6b9d8c59 100644
--- a/ports/esp32/boards/UM_TINYS2/board.json
+++ b/ports/esp32/boards/UM_TINYS2/board.json
@@ -1,9 +1,12 @@
 {
     "deploy": [
-        "../deploy.md"
+        "../deploy_s2.md"
     ],
     "docs": "",
-    "features": [],
+    "features": [
+        "WiFi",
+        "USB-C"
+    ],
     "id": "tinys2",
     "images": [
         "TinyS2+Product+Shot.jpg"
diff --git a/ports/esp32/boards/deploy.md b/ports/esp32/boards/deploy.md
index c8740a8dd408b..64e683edfc6f9 100644
--- a/ports/esp32/boards/deploy.md
+++ b/ports/esp32/boards/deploy.md
@@ -1,4 +1,5 @@
 Program your board using the esptool.py program, found [here](https://github.com/espressif/esptool).
+
 If you are putting MicroPython on your board for the first time then you should
 first erase the entire flash using:
 
diff --git a/ports/esp32/boards/deploy_s2.md b/ports/esp32/boards/deploy_s2.md
new file mode 100644
index 0000000000000..5b3057087d1e2
--- /dev/null
+++ b/ports/esp32/boards/deploy_s2.md
@@ -0,0 +1,14 @@
+Program your board using the esptool.py program, found [here](https://github.com/espressif/esptool).
+
+If you are putting MicroPython on your board for the first time then you should
+first erase the entire flash using:
+
+```bash
+esptool.py --chip esp32s2 --port /dev/ttyACM0 erase_flash
+```
+
+From then on program the firmware starting at address 0x1000:
+
+```bash
+esptool.py --chip esp32s2 --port /dev/ttyACM0 write_flash -z 0x1000 board-20210902-v1.17.bin
+```

From 5bb14c4e461932230e572e6baa9aafd1eea26e91 Mon Sep 17 00:00:00 2001
From: Mike Causer <mcauser@gmail.com>
Date: Wed, 27 Oct 2021 16:19:01 +1100
Subject: [PATCH 1362/3533] esp32/boards/LOLIN_S2_MINI: Add image to
 board.json.

---
 ports/esp32/boards/LOLIN_S2_MINI/board.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ports/esp32/boards/LOLIN_S2_MINI/board.json b/ports/esp32/boards/LOLIN_S2_MINI/board.json
index a84a3098bfefe..50e24ff3f9b68 100644
--- a/ports/esp32/boards/LOLIN_S2_MINI/board.json
+++ b/ports/esp32/boards/LOLIN_S2_MINI/board.json
@@ -4,7 +4,9 @@
     ],
     "docs": "",
     "features": [],
-    "images": [],
+    "images": [
+        "lolin_s2_mini.jpg"
+    ],
     "mcu": "esp32s2",
     "product": "S2 mini",
     "thumbnail": "",

From 590ec2ca6e2404129c5b4568feeee69bd28d5bfa Mon Sep 17 00:00:00 2001
From: Mike Causer <mcauser@gmail.com>
Date: Wed, 27 Oct 2021 16:18:27 +1100
Subject: [PATCH 1363/3533] stm32/boards: Add images to board.json for Adafruit
 and VCC_GND boards.

---
 ports/stm32/boards/ADAFRUIT_F405_EXPRESS/board.json | 4 +++-
 ports/stm32/boards/VCC_GND_F407VE/board.json        | 4 +++-
 ports/stm32/boards/VCC_GND_F407ZG/board.json        | 4 +++-
 ports/stm32/boards/VCC_GND_H743VI/board.json        | 4 +++-
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/ports/stm32/boards/ADAFRUIT_F405_EXPRESS/board.json b/ports/stm32/boards/ADAFRUIT_F405_EXPRESS/board.json
index a2cc8b327dd5d..698e666f29f5b 100644
--- a/ports/stm32/boards/ADAFRUIT_F405_EXPRESS/board.json
+++ b/ports/stm32/boards/ADAFRUIT_F405_EXPRESS/board.json
@@ -4,7 +4,9 @@
     ],
     "docs": "",
     "features": [],
-    "images": [],
+    "images": [
+        "4382-09.jpg"
+    ],
     "mcu": "stm32f4",
     "product": "F405 Express",
     "thumbnail": "",
diff --git a/ports/stm32/boards/VCC_GND_F407VE/board.json b/ports/stm32/boards/VCC_GND_F407VE/board.json
index 1b2d02b9f2e1a..11e12ff97b1ce 100644
--- a/ports/stm32/boards/VCC_GND_F407VE/board.json
+++ b/ports/stm32/boards/VCC_GND_F407VE/board.json
@@ -4,7 +4,9 @@
     ],
     "docs": "",
     "features": [],
-    "images": [],
+    "images": [
+        "STM32F407VET6.jpg"
+    ],
     "mcu": "stm32f4",
     "product": "F407VE",
     "thumbnail": "",
diff --git a/ports/stm32/boards/VCC_GND_F407ZG/board.json b/ports/stm32/boards/VCC_GND_F407ZG/board.json
index 0d3cbdb6e04dc..bf0352b2d0eb1 100644
--- a/ports/stm32/boards/VCC_GND_F407ZG/board.json
+++ b/ports/stm32/boards/VCC_GND_F407ZG/board.json
@@ -4,7 +4,9 @@
     ],
     "docs": "",
     "features": [],
-    "images": [],
+    "images": [
+        "STM32F407ZGT6.jpg"
+    ],
     "mcu": "stm32f4",
     "product": "F407ZG",
     "thumbnail": "",
diff --git a/ports/stm32/boards/VCC_GND_H743VI/board.json b/ports/stm32/boards/VCC_GND_H743VI/board.json
index 3dfd138ed9372..f7539ac9f9066 100644
--- a/ports/stm32/boards/VCC_GND_H743VI/board.json
+++ b/ports/stm32/boards/VCC_GND_H743VI/board.json
@@ -4,7 +4,9 @@
     ],
     "docs": "",
     "features": [],
-    "images": [],
+    "images": [
+        "STM32H743VIT6.jpg"
+    ],
     "mcu": "stm32h7",
     "product": "H743VI",
     "thumbnail": "",

From 5b9c9cd0971fda60e7e6375c17bda32d3a3407d6 Mon Sep 17 00:00:00 2001
From: Seon Rozenblum <seon@unexpectedmaker.com>
Date: Wed, 27 Oct 2021 16:10:16 +1100
Subject: [PATCH 1364/3533] esp32/boards: Update board and deploy metadata for
 UM_xxx boards.

---
 ports/esp32/boards/UM_FEATHERS2/board.json    |  9 +++-
 ports/esp32/boards/UM_FEATHERS2/board.md      |  2 +
 ports/esp32/boards/UM_FEATHERS2/deploy.md     | 50 +++++++++++++++++++
 ports/esp32/boards/UM_FEATHERS2NEO/board.json | 12 +++--
 ports/esp32/boards/UM_FEATHERS2NEO/board.md   |  2 +
 ports/esp32/boards/UM_FEATHERS2NEO/deploy.md  | 50 +++++++++++++++++++
 ports/esp32/boards/UM_TINYPICO/board.json     | 14 +++++-
 ports/esp32/boards/UM_TINYPICO/board.md       |  3 ++
 ports/esp32/boards/UM_TINYPICO/deploy.md      | 46 +++++++++++++++++
 ports/esp32/boards/UM_TINYS2/board.json       | 10 +++-
 ports/esp32/boards/UM_TINYS2/board.md         |  2 +
 ports/esp32/boards/UM_TINYS2/deploy.md        | 50 +++++++++++++++++++
 12 files changed, 242 insertions(+), 8 deletions(-)
 create mode 100644 ports/esp32/boards/UM_FEATHERS2/board.md
 create mode 100644 ports/esp32/boards/UM_FEATHERS2/deploy.md
 create mode 100644 ports/esp32/boards/UM_FEATHERS2NEO/board.md
 create mode 100644 ports/esp32/boards/UM_FEATHERS2NEO/deploy.md
 create mode 100644 ports/esp32/boards/UM_TINYPICO/board.md
 create mode 100644 ports/esp32/boards/UM_TINYPICO/deploy.md
 create mode 100644 ports/esp32/boards/UM_TINYS2/board.md
 create mode 100644 ports/esp32/boards/UM_TINYS2/deploy.md

diff --git a/ports/esp32/boards/UM_FEATHERS2/board.json b/ports/esp32/boards/UM_FEATHERS2/board.json
index d2da16a6ee2b9..19d7219ec5249 100644
--- a/ports/esp32/boards/UM_FEATHERS2/board.json
+++ b/ports/esp32/boards/UM_FEATHERS2/board.json
@@ -1,6 +1,6 @@
 {
     "deploy": [
-        "../deploy_s2.md"
+        "deploy.md"
     ],
     "docs": "",
     "features": [
@@ -8,7 +8,12 @@
         "Feather",
         "Battery Charging",
         "STEMMA QT/QWIIC",
-        "USB-C"
+        "USB-C",
+        "RGB LED",
+        "SPIRAM"
+    ],
+    "features_non_filterable": [
+        "Second LDO"
     ],
     "id": "featherS2",
     "images": [
diff --git a/ports/esp32/boards/UM_FEATHERS2/board.md b/ports/esp32/boards/UM_FEATHERS2/board.md
new file mode 100644
index 0000000000000..e04a8936c846c
--- /dev/null
+++ b/ports/esp32/boards/UM_FEATHERS2/board.md
@@ -0,0 +1,2 @@
+The following files are daily firmware for the FeatherS2. This firmware is
+compiled using ESP-IDF v4.3 or later.
diff --git a/ports/esp32/boards/UM_FEATHERS2/deploy.md b/ports/esp32/boards/UM_FEATHERS2/deploy.md
new file mode 100644
index 0000000000000..24bced3cda9b1
--- /dev/null
+++ b/ports/esp32/boards/UM_FEATHERS2/deploy.md
@@ -0,0 +1,50 @@
+Program your board using the esptool.py program, found [here](https://github.com/espressif/esptool).
+
+To flash or erase your FeatherS2, you have to first put it into download mode.
+To do this, follow these steps:
+
+- Press and hold the [BOOT] button
+- Press and release the [RESET] button
+- Release the [BOOT] button
+
+Now the board is in download mode and the native USB will have enumerated as a serial device.
+
+If you are putting MicroPython on your board for the first time then you should
+first erase the entire flash using:
+
+### Linux
+```bash
+esptool.py --chip esp32s2 --port /dev/ttyACM0 erase_flash
+```
+
+### Mac
+```bash
+esptool.py --chip esp32s2 --port /dev/cu.usbmodem01 erase_flash
+```
+
+### Windows
+Change (X) to whatever COM port is being used by the board
+```bash
+esptool --chip esp32s2 --port COM(X) erase_flash
+```
+
+Now download the version of the firmware you would like to install from the options
+below, then use the following command to program the firmware starting at address
+0x1000, remembering to replace `feathers2-micropython-firmware-version.bin` with the
+name of the firmware you just downloaded:
+
+### Linux
+```bash
+esptool.py --chip esp32s2 --port /dev/ttyACM0 write_flash -z 0x1000 feathers2-micropython-firmware-version.bin
+```
+
+### Mac
+```bash
+esptool.py --chip esp32s2 --port /dev/cu.usbmodem01 write_flash -z 0x1000 feathers2-micropython-firmware-version.bin
+```
+
+### Windows
+Change (X) to whatever COM port is being used by the board
+```bash
+esptool --chip esp32s2 --port COM(X) write_flash -z 0x1000 feathers2-micropython-firmware-version.bin
+```
diff --git a/ports/esp32/boards/UM_FEATHERS2NEO/board.json b/ports/esp32/boards/UM_FEATHERS2NEO/board.json
index 1e3e2c0e3bc7e..be7a1371faa1b 100644
--- a/ports/esp32/boards/UM_FEATHERS2NEO/board.json
+++ b/ports/esp32/boards/UM_FEATHERS2NEO/board.json
@@ -1,6 +1,6 @@
 {
     "deploy": [
-        "../deploy_s2.md"
+        "deploy.md"
     ],
     "docs": "",
     "features": [
@@ -9,10 +9,16 @@
         "Battery Charging",
         "STEMMA QT/QWIIC",
         "USB-C",
-        "Neopixels"
+        "RGB LED",
+        "SPIRAM"
+    ],
+    "features_non_filterable": [
+        "5x5 RGB LED Matrix"
     ],
     "id": "featherS2neo",
-    "images": [],
+    "images": [
+        "FeatherS2_Neo_White_Product2.jpg"
+    ],
     "mcu": "esp32s2",
     "product": "Feather S2 Neo",
     "thumbnail": "",
diff --git a/ports/esp32/boards/UM_FEATHERS2NEO/board.md b/ports/esp32/boards/UM_FEATHERS2NEO/board.md
new file mode 100644
index 0000000000000..60ee024a1261b
--- /dev/null
+++ b/ports/esp32/boards/UM_FEATHERS2NEO/board.md
@@ -0,0 +1,2 @@
+The following files are daily firmware for the FeatherS2 Neo. This firmware is
+compiled using ESP-IDF v4.3 or later.
diff --git a/ports/esp32/boards/UM_FEATHERS2NEO/deploy.md b/ports/esp32/boards/UM_FEATHERS2NEO/deploy.md
new file mode 100644
index 0000000000000..b1a116e8074c5
--- /dev/null
+++ b/ports/esp32/boards/UM_FEATHERS2NEO/deploy.md
@@ -0,0 +1,50 @@
+Program your board using the esptool.py program, found [here](https://github.com/espressif/esptool).
+
+To flash or erase your FeatherS2 Neo, you have to first put it into download mode.
+To do this, follow these steps:
+
+- Press and hold the [BOOT] button
+- Press and release the [RESET] button
+- Release the [BOOT] button
+
+Now the board is in download mode and the native USB will have enumerated as a serial device.
+
+If you are putting MicroPython on your board for the first time then you should
+first erase the entire flash using:
+
+### Linux
+```bash
+esptool.py --chip esp32s2 --port /dev/ttyACM0 erase_flash
+```
+
+### Mac
+```bash
+esptool.py --chip esp32s2 --port /dev/cu.usbmodem01 erase_flash
+```
+
+### Windows
+Change (X) to whatever COM port is being used by the board
+```bash
+esptool --chip esp32s2 --port COM(X) erase_flash
+```
+
+Now download the version of the firmware you would like to install from the options below,
+then use the following command to program the firmware starting at address 0x1000,
+remembering to replace `feathers2neo-micropython-firmware-version.bin` with the name of
+the firmware you just downloaded:
+
+### Linux
+```bash
+esptool.py --chip esp32s2 --port /dev/ttyACM0 write_flash -z 0x1000 feathers2neo-micropython-firmware-version.bin
+```
+
+### Mac
+```bash
+esptool.py --chip esp32s2 --port /dev/cu.usbmodem01 write_flash -z 0x1000 feathers2neo-micropython-firmware-version.bin
+```
+
+### Windows
+Change (X) to whatever COM port is being used by the board
+```bash
+esptool --chip esp32s2 --port COM(X) write_flash -z 0x1000 feathers2-feathers2neo-firmware-version.bin
+```
diff --git a/ports/esp32/boards/UM_TINYPICO/board.json b/ports/esp32/boards/UM_TINYPICO/board.json
index 6b5a01d57f514..6fb7803fe2392 100644
--- a/ports/esp32/boards/UM_TINYPICO/board.json
+++ b/ports/esp32/boards/UM_TINYPICO/board.json
@@ -1,9 +1,19 @@
 {
     "deploy": [
-        "../deploy.md"
+        "deploy.md"
     ],
     "docs": "",
-    "features": [],
+    "features": [
+        "BLE",
+        "WiFi",
+        "Battery Charging",
+        "USB-C",
+        "RGB LED",
+        "SPIRAM"
+    ],
+    "features_non_filterable": [
+        "TinyPICO Compatible"
+    ],
     "id": "tinypico",
     "images": [
         "tinypico-v2-both.jpg"
diff --git a/ports/esp32/boards/UM_TINYPICO/board.md b/ports/esp32/boards/UM_TINYPICO/board.md
new file mode 100644
index 0000000000000..d0b1266d2eec1
--- /dev/null
+++ b/ports/esp32/boards/UM_TINYPICO/board.md
@@ -0,0 +1,3 @@
+The following files are daily firmware for the TinyPICO. This firmware is compiled
+using ESP-IDF v4.2 or later.  Some older releases are also provided that are
+compiled with ESP-IDF v3.x.
diff --git a/ports/esp32/boards/UM_TINYPICO/deploy.md b/ports/esp32/boards/UM_TINYPICO/deploy.md
new file mode 100644
index 0000000000000..ed29478675f44
--- /dev/null
+++ b/ports/esp32/boards/UM_TINYPICO/deploy.md
@@ -0,0 +1,46 @@
+Program your board using the esptool.py program, found [here](https://github.com/espressif/esptool).
+
+Your TinyPICO has an auto-reset circuit on it, so there is no need to put it into a
+download mode first to erase or flash it.
+
+If you are putting MicroPython on your board for the first time then you should
+first erase the entire flash using:
+
+### Linux
+```bash
+esptool.py --chip esp32 --port /dev/ttyUSB0 erase_flash
+```
+
+### Mac
+```bash
+esptool.py --chip esp32 --port /dev/tty.SLAB_USBtoUART erase_flash
+```
+
+### Windows
+Change (X) to whatever COM port is being used by the board
+```bash
+esptool --chip esp32 --port COM(X) erase_flash
+```
+
+Now download the version of the firmware you would like to install from the options below,
+then use the following command to program the firmware starting at address 0x1000,
+remembering to replace `tinypico-micropython-firmware-version.bin` with the name of the
+firmware you just downloaded:
+
+From then on program the firmware starting at address 0x1000:
+
+### Linux
+```bash
+esptool.py --chip esp32 --port /dev/ttyUSB0 --baud 912600 write_flash -z 0x1000 tinypico-micropython-firmware-version.bin
+```
+
+### Mac
+```bash
+esptool.py --chip esp32 --port /dev/tty.SLAB_USBtoUART --baud 912600 write_flash -z 0x1000 tinypico-micropython-firmware-version.bin
+```
+
+### Windows
+Change (X) to whatever COM port is being used by the board
+```bash
+esptool --chip esp32 --port COM(X) --baud 912600 write_flash -z 0x1000 tinypico-micropython-firmware-version.bin
+```
diff --git a/ports/esp32/boards/UM_TINYS2/board.json b/ports/esp32/boards/UM_TINYS2/board.json
index d378f6b9d8c59..20c1c6d847149 100644
--- a/ports/esp32/boards/UM_TINYS2/board.json
+++ b/ports/esp32/boards/UM_TINYS2/board.json
@@ -1,11 +1,19 @@
 {
     "deploy": [
-        "../deploy_s2.md"
+        "deploy.md"
     ],
     "docs": "",
     "features": [
         "WiFi",
         "USB-C"
+        "Battery Charging",
+        "STEMMA QT/QWIIC",
+        "USB-C",
+        "RGB LED",
+        "SPIRAM"
+    ],
+    "features_non_filterable": [
+        "TinyPICO Compatible"
     ],
     "id": "tinys2",
     "images": [
diff --git a/ports/esp32/boards/UM_TINYS2/board.md b/ports/esp32/boards/UM_TINYS2/board.md
new file mode 100644
index 0000000000000..9a61374edf327
--- /dev/null
+++ b/ports/esp32/boards/UM_TINYS2/board.md
@@ -0,0 +1,2 @@
+The following files are daily firmware for the TinyS2. This firmware is compiled
+using ESP-IDF v4.3 or later.
diff --git a/ports/esp32/boards/UM_TINYS2/deploy.md b/ports/esp32/boards/UM_TINYS2/deploy.md
new file mode 100644
index 0000000000000..a46bc9bd1aee9
--- /dev/null
+++ b/ports/esp32/boards/UM_TINYS2/deploy.md
@@ -0,0 +1,50 @@
+Program your board using the esptool.py program, found [here](https://github.com/espressif/esptool).
+
+To flash or erase your TinyS2, you have to first put it into download mode.
+To do this, follow these steps:
+
+- Press and hold the [BOOT] button
+- Press and release the [RESET] button
+- Release the [BOOT] button
+
+Now the board is in download mode and the native USB will have enumerated as a serial device.
+
+If you are putting MicroPython on your board for the first time then you should
+first erase the entire flash using:
+
+### Linux
+```bash
+esptool.py --chip esp32s2 --port /dev/ttyACM0 erase_flash
+```
+
+### Mac
+```bash
+esptool.py --chip esp32s2 --port /dev/cu.usbmodem01 erase_flash
+```
+
+#### Windows
+Change (X) to whatever COM port is being used by the board
+```bash
+esptool --chip esp32s2 --port COM(X) erase_flash
+```
+
+Now download the version of the firmware you would like to install from the options below,
+then use the following command to program the firmware starting at address 0x1000,
+remembering to replace `tinys2-micropython-firmware-version.bin` with the name of the
+firmware you just downloaded:
+
+#### Linux
+```bash
+esptool.py --chip esp32s2 --port /dev/ttyACM0 write_flash -z 0x1000 tinys2-micropython-firmware-version.bin
+```
+
+#### Mac
+```bash
+esptool.py --chip esp32s2 --port /dev/cu.usbmodem01 write_flash -z 0x1000 tinys2-micropython-firmware-version.bin
+```
+
+#### Windows
+Change (X) to whatever COM port is being used by the board
+```bash
+esptool --chip esp32s2 --port COM(X) write_flash -z 0x1000 tinys2-micropython-firmware-version.bin
+```

From 1e4849557d23f3b194f3a056e28f7a8c14dac050 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 27 Oct 2021 20:15:04 +1100
Subject: [PATCH 1365/3533] esp32/usb: Further improve speed of USB CDC output.

Following on from ba940250a5b630018c8d9b0e21c5ed858a20450f, the change here
makes output about 15 times faster (now up to about 550 kbytes/sec).

tinyusb_cdcacm_write_queue will return the number of bytes written, so
there's no need to use tud_cdc_n_write_available.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/usb.c | 29 ++++-------------------------
 1 file changed, 4 insertions(+), 25 deletions(-)

diff --git a/ports/esp32/usb.c b/ports/esp32/usb.c
index 95c82772992b5..5a613d24412c8 100644
--- a/ports/esp32/usb.c
+++ b/ports/esp32/usb.c
@@ -87,34 +87,13 @@ void usb_init(void) {
 }
 
 void usb_tx_strn(const char *str, size_t len) {
-    // If no HOST is connected, we can exit this early.
-    if (usb_cdc_connected == 0) {
-        return;
-    }
-
-    while (len) {
-        // Get amount of CDC output buffer space available, making sure
-        // there is at least one byte available.
-        size_t avail = tud_cdc_n_write_available(CDC_ITF);
-        if (avail == 0) {
-            if (tinyusb_cdcacm_write_flush(CDC_ITF, pdMS_TO_TICKS(1000)) != ESP_OK) {
-                return;
-            }
-            avail = tud_cdc_n_write_available(CDC_ITF);
-        }
-
-        // Write as much data as possible.
-        size_t l = len;
-        if (l > avail) {
-            l = avail;
-        }
-        tud_cdc_n_write(CDC_ITF, (uint8_t *)str, l);
+    // Write out the data to the CDC interface, but only while the USB host is connected.
+    while (usb_cdc_connected && len) {
+        size_t l = tinyusb_cdcacm_write_queue(CDC_ITF, (uint8_t *)str, len);
         str += l;
         len -= l;
+        tud_cdc_n_write_flush(CDC_ITF);
     }
-
-    // Queue a flush to write out the data in the CDC buffer (if any).
-    tud_cdc_n_write_flush(CDC_ITF);
 }
 
 #endif // CONFIG_USB_ENABLED

From 3ace779e8e353b697606712b9d25f5288a685c80 Mon Sep 17 00:00:00 2001
From: Mike Causer <mcauser@gmail.com>
Date: Wed, 27 Oct 2021 19:01:18 +1100
Subject: [PATCH 1366/3533] esp32/boards/LOLIN_S2_PICO: Add LOLIN_S2_PICO board
 definition files.

---
 ports/esp32/boards/LOLIN_S2_PICO/board.json   | 18 +++++++
 ports/esp32/boards/LOLIN_S2_PICO/manifest.py  |  4 ++
 .../boards/LOLIN_S2_PICO/modules/s2pico.py    | 38 +++++++++++++++
 .../LOLIN_S2_PICO/modules/s2pico_oled.py      | 48 +++++++++++++++++++
 .../boards/LOLIN_S2_PICO/mpconfigboard.cmake  | 11 +++++
 .../boards/LOLIN_S2_PICO/mpconfigboard.h      | 12 +++++
 .../boards/LOLIN_S2_PICO/sdkconfig.board      |  6 +++
 7 files changed, 137 insertions(+)
 create mode 100644 ports/esp32/boards/LOLIN_S2_PICO/board.json
 create mode 100644 ports/esp32/boards/LOLIN_S2_PICO/manifest.py
 create mode 100644 ports/esp32/boards/LOLIN_S2_PICO/modules/s2pico.py
 create mode 100644 ports/esp32/boards/LOLIN_S2_PICO/modules/s2pico_oled.py
 create mode 100644 ports/esp32/boards/LOLIN_S2_PICO/mpconfigboard.cmake
 create mode 100644 ports/esp32/boards/LOLIN_S2_PICO/mpconfigboard.h
 create mode 100644 ports/esp32/boards/LOLIN_S2_PICO/sdkconfig.board

diff --git a/ports/esp32/boards/LOLIN_S2_PICO/board.json b/ports/esp32/boards/LOLIN_S2_PICO/board.json
new file mode 100644
index 0000000000000..df760ace4ede1
--- /dev/null
+++ b/ports/esp32/boards/LOLIN_S2_PICO/board.json
@@ -0,0 +1,18 @@
+{
+    "deploy": [
+        "../deploy_s2.md"
+    ],
+    "docs": "",
+    "features": [
+        "WiFi",
+        "USB-C"
+    ],
+    "images": [
+        "lolin_s2_pico.jpg"
+    ],
+    "mcu": "esp32s2",
+    "product": "S2 pico",
+    "thumbnail": "",
+    "url": "https://www.wemos.cc/en/latest/s2/s2_pico.html",
+    "vendor": "Wemos"
+}
diff --git a/ports/esp32/boards/LOLIN_S2_PICO/manifest.py b/ports/esp32/boards/LOLIN_S2_PICO/manifest.py
new file mode 100644
index 0000000000000..98d4247c607a9
--- /dev/null
+++ b/ports/esp32/boards/LOLIN_S2_PICO/manifest.py
@@ -0,0 +1,4 @@
+include("$(PORT_DIR)/boards/manifest.py")
+freeze("./modules")
+
+freeze("$(MPY_DIR)/drivers/display", "ssd1306.py")
diff --git a/ports/esp32/boards/LOLIN_S2_PICO/modules/s2pico.py b/ports/esp32/boards/LOLIN_S2_PICO/modules/s2pico.py
new file mode 100644
index 0000000000000..be59db715e7e1
--- /dev/null
+++ b/ports/esp32/boards/LOLIN_S2_PICO/modules/s2pico.py
@@ -0,0 +1,38 @@
+# LOLIN S2 PICO MicroPython Helper Library
+
+from micropython import const
+from machine import Pin, I2C, Signal
+from s2pico_oled import OLED
+
+# Pin Assignments
+
+# SPI
+SPI_MOSI = const(35)
+SPI_MISO = const(36)
+SPI_CLK = const(37)
+
+# I2C
+I2C_SDA = const(8)
+I2C_SCL = const(9)
+
+# DAC
+DAC1 = const(17)
+DAC2 = const(18)
+
+# LED
+LED = const(10)
+
+# OLED
+OLED_RST = const(18)
+
+# BUTTON
+BUTTON = const(0)
+
+# Helper methods for built in sensors
+
+led = Signal(LED, Pin.OUT, value=0, invert=True)
+
+button = Pin(BUTTON, Pin.IN, Pin.PULL_UP)
+
+i2c = I2C(0)
+oled = OLED(i2c, Pin(OLED_RST))
diff --git a/ports/esp32/boards/LOLIN_S2_PICO/modules/s2pico_oled.py b/ports/esp32/boards/LOLIN_S2_PICO/modules/s2pico_oled.py
new file mode 100644
index 0000000000000..37dc5a340fe46
--- /dev/null
+++ b/ports/esp32/boards/LOLIN_S2_PICO/modules/s2pico_oled.py
@@ -0,0 +1,48 @@
+from time import sleep_ms
+from ssd1306 import SSD1306_I2C
+import network
+
+
+class OLED(SSD1306_I2C):
+    def __init__(self, i2c, reset):
+        reset.init(reset.OUT, value=1)
+        self._reset = reset
+        self.reset(False)
+        super().__init__(128, 32, i2c)
+
+    def reset(self, reinit=True):
+        self._reset(1)
+        sleep_ms(1)
+        self._reset(0)
+        sleep_ms(10)
+        self._reset(1)
+        if reinit:
+            self.init_display()
+
+    def test(self):
+        self.fill(0)
+        self.fill_rect(0, 0, 32, 32, 1)
+        self.fill_rect(2, 2, 28, 28, 0)
+        self.vline(9, 8, 22, 1)
+        self.vline(16, 2, 22, 1)
+        self.vline(23, 8, 22, 1)
+        self.fill_rect(26, 24, 2, 4, 1)
+        self.text("MicroPython", 40, 0, 1)
+        self.text("SSD1306", 40, 12, 1)
+        self.text("OLED 128x32", 40, 24, 1)
+        self.show()
+
+    def display_wifi(self):
+        self.fill(0)
+        self.text("Scan...", 0, 0, 1)
+        self.show()
+
+        sta_if = network.WLAN(network.STA_IF)
+        sta_if.active(True)
+        _wifi = sta_if.scan()
+
+        self.fill(0)
+        self.text(str(len(_wifi)) + " Networks", 0, 0, 1)
+        self.text(str(_wifi[0][3]) + " " + (_wifi[0][0]).decode("utf-8"), 0, 12, 1)
+        self.text(str(_wifi[1][3]) + " " + (_wifi[1][0]).decode("utf-8"), 0, 24, 1)
+        self.show()
diff --git a/ports/esp32/boards/LOLIN_S2_PICO/mpconfigboard.cmake b/ports/esp32/boards/LOLIN_S2_PICO/mpconfigboard.cmake
new file mode 100644
index 0000000000000..5f157e7e779fb
--- /dev/null
+++ b/ports/esp32/boards/LOLIN_S2_PICO/mpconfigboard.cmake
@@ -0,0 +1,11 @@
+set(IDF_TARGET esp32s2)
+
+set(SDKCONFIG_DEFAULTS
+    boards/sdkconfig.base
+    boards/sdkconfig.spiram_sx
+    boards/sdkconfig.usb
+)
+
+if(NOT MICROPY_FROZEN_MANIFEST)
+    set(MICROPY_FROZEN_MANIFEST ${MICROPY_BOARD_DIR}/manifest.py)
+endif()
diff --git a/ports/esp32/boards/LOLIN_S2_PICO/mpconfigboard.h b/ports/esp32/boards/LOLIN_S2_PICO/mpconfigboard.h
new file mode 100644
index 0000000000000..549dd9847c7f3
--- /dev/null
+++ b/ports/esp32/boards/LOLIN_S2_PICO/mpconfigboard.h
@@ -0,0 +1,12 @@
+#define MICROPY_HW_BOARD_NAME    "LOLIN_S2_PICO"
+#define MICROPY_HW_MCU_NAME      "ESP32-S2FN4R2"
+
+#define MICROPY_PY_BLUETOOTH     (0)
+#define MICROPY_HW_ENABLE_SDCARD (0)
+
+#define MICROPY_HW_I2C0_SCL      (9)
+#define MICROPY_HW_I2C0_SDA      (8)
+
+#define MICROPY_HW_SPI1_MOSI     (35)
+#define MICROPY_HW_SPI1_MISO     (36)
+#define MICROPY_HW_SPI1_SCK      (37)
diff --git a/ports/esp32/boards/LOLIN_S2_PICO/sdkconfig.board b/ports/esp32/boards/LOLIN_S2_PICO/sdkconfig.board
new file mode 100644
index 0000000000000..bf0f3e780e4d6
--- /dev/null
+++ b/ports/esp32/boards/LOLIN_S2_PICO/sdkconfig.board
@@ -0,0 +1,6 @@
+CONFIG_FLASHMODE_QIO=y
+CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
+CONFIG_USB_AND_UART=y
+# LWIP
+CONFIG_LWIP_LOCAL_HOSTNAME="LOLIN_S2_PICO"
+# end of LWIP

From 07ea1afe747fa4eaca15a64d8f73574abc2533e9 Mon Sep 17 00:00:00 2001
From: Mike Causer <mcauser@gmail.com>
Date: Thu, 28 Oct 2021 12:35:13 +1100
Subject: [PATCH 1367/3533] esp32/boards/ESP32_S2_WROVER: Link to specific
 deploy_s2 instructions.

---
 ports/esp32/boards/ESP32_S2_WROVER/board.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/esp32/boards/ESP32_S2_WROVER/board.json b/ports/esp32/boards/ESP32_S2_WROVER/board.json
index 8f2aff7346d2d..eb2c40aeee567 100644
--- a/ports/esp32/boards/ESP32_S2_WROVER/board.json
+++ b/ports/esp32/boards/ESP32_S2_WROVER/board.json
@@ -1,6 +1,6 @@
 {
     "deploy": [
-        "../deploy.md"
+        "../deploy_s2.md"
     ],
     "docs": "",
     "features": [],

From 83827e8e63f18f6437f0569c49cb697896fa58c7 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 28 Oct 2021 12:36:45 +1100
Subject: [PATCH 1368/3533] stm32/uart: Fix race conditions and clearing status
 in IRQ handler.

Prior to this commit IRQs on STM32F4 could be lost because SR is cleared by
reading SR then reading DR.  For example, if both RXNE and IDLE IRQs were
active upon entry to the IRQ handler, then IDLE is lost because the code
that handles RXNE comes first and accidentally clears SR (by reading SR
then DR to get the incoming character).

This commit fixes this problem by making the IRQ handler more atomic in the
following operations:
- get current IRQ status flags
- deal with RX character
- clear remaining status flags
- call user handler

On the STM32F4 it's very hard to get this right because the only way to
clear IRQ status flags is to read SR then DR, but the read of DR may read
some data which should remain in the register until the user wants to read
it.  And it won't work to cache the read because RTS/CTS flow control will
then not work.  So instead the new code disables interrupts if the DR is
full and waits for the user to read it before reenabling the interrupts.

Fixes issue mentioned in #4599 and #6082.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/uart.c | 79 +++++++++++++++++++++++++++++++---------------
 1 file changed, 53 insertions(+), 26 deletions(-)

diff --git a/ports/stm32/uart.c b/ports/stm32/uart.c
index 627c33397db42..2c08257f32682 100644
--- a/ports/stm32/uart.c
+++ b/ports/stm32/uart.c
@@ -40,11 +40,13 @@
 
 #if defined(STM32F4)
 #define UART_RXNE_IS_SET(uart) ((uart)->SR & USART_SR_RXNE)
-#elif defined(STM32H7)
-#define UART_RXNE_IS_SET(uart) ((uart)->ISR & USART_ISR_RXNE_RXFNE)
 #else
+#if defined(STM32H7)
+#define USART_ISR_RXNE USART_ISR_RXNE_RXFNE
+#endif
 #define UART_RXNE_IS_SET(uart) ((uart)->ISR & USART_ISR_RXNE)
 #endif
+
 #define UART_RXNE_IT_EN(uart) do { (uart)->CR1 |= USART_CR1_RXNEIE; } while (0)
 #define UART_RXNE_IT_DIS(uart) do { (uart)->CR1 &= ~USART_CR1_RXNEIE; } while (0)
 
@@ -877,7 +879,17 @@ int uart_rx_char(pyb_uart_obj_t *self) {
         self->uartx->ICR = USART_ICR_ORECF; // clear ORE if it was set
         return data;
         #else
-        return self->uartx->DR & self->char_mask;
+        int data = self->uartx->DR & self->char_mask;
+        // Re-enable any IRQs that were disabled in uart_irq_handler because SR couldn't
+        // be cleared there (clearing SR in uart_irq_handler required reading DR which
+        // may have lost a character).
+        if (self->mp_irq_trigger & UART_FLAG_RXNE) {
+            self->uartx->CR1 |= USART_CR1_RXNEIE;
+        }
+        if (self->mp_irq_trigger & UART_FLAG_IDLE) {
+            self->uartx->CR1 |= USART_CR1_IDLEIE;
+        }
+        return data;
         #endif
     }
 }
@@ -982,7 +994,10 @@ void uart_tx_strn(pyb_uart_obj_t *uart_obj, const char *str, uint len) {
     uart_tx_data(uart_obj, str, len, &errcode);
 }
 
-// this IRQ handler is set up to handle RXNE interrupts only
+// This IRQ handler is set up to handle RXNE, IDLE and ORE interrupts only.
+// Notes:
+// - ORE (overrun error) is tied to the RXNE IRQ line.
+// - On STM32F4 the IRQ flags are cleared by reading SR then DR.
 void uart_irq_handler(mp_uint_t uart_id) {
     // get the uart object
     pyb_uart_obj_t *self = MP_STATE_PORT(pyb_uart_obj_all)[uart_id - 1];
@@ -993,16 +1008,28 @@ void uart_irq_handler(mp_uint_t uart_id) {
         return;
     }
 
-    if (UART_RXNE_IS_SET(self->uartx)) {
+    // Capture IRQ status flags.
+    #if defined(STM32F4)
+    self->mp_irq_flags = self->uartx->SR;
+    bool rxne_is_set = self->mp_irq_flags & USART_SR_RXNE;
+    bool did_clear_sr = false;
+    #else
+    self->mp_irq_flags = self->uartx->ISR;
+    bool rxne_is_set = self->mp_irq_flags & USART_ISR_RXNE;
+    #endif
+
+    // Process RXNE flag, either read the character or disable the interrupt.
+    if (rxne_is_set) {
         if (self->read_buf_len != 0) {
             uint16_t next_head = (self->read_buf_head + 1) % self->read_buf_len;
             if (next_head != self->read_buf_tail) {
                 // only read data if room in buf
                 #if defined(STM32F0) || defined(STM32F7) || defined(STM32L0) || defined(STM32L4) || defined(STM32H7) || defined(STM32WB)
                 int data = self->uartx->RDR; // clears UART_FLAG_RXNE
-                self->uartx->ICR = USART_ICR_ORECF; // clear ORE if it was set
                 #else
+                self->mp_irq_flags = self->uartx->SR; // resample to get any new flags since next read of DR will clear SR
                 int data = self->uartx->DR; // clears UART_FLAG_RXNE
+                did_clear_sr = true;
                 #endif
                 data &= self->char_mask;
                 if (self->attached_to_repl && data == mp_interrupt_char) {
@@ -1019,32 +1046,32 @@ void uart_irq_handler(mp_uint_t uart_id) {
             } else { // No room: leave char in buf, disable interrupt
                 UART_RXNE_IT_DIS(self->uartx);
             }
+        } else {
+            // No buffering, disable interrupt.
+            UART_RXNE_IT_DIS(self->uartx);
         }
     }
-    // If RXNE is clear but ORE set then clear the ORE flag (it's tied to RXNE IRQ)
-    #if defined(STM32F4)
-    else if (self->uartx->SR & USART_SR_ORE) {
-        (void)self->uartx->DR;
-    }
-    #else
-    else if (self->uartx->ISR & USART_ISR_ORE) {
-        self->uartx->ICR = USART_ICR_ORECF;
-    }
-    #endif
 
-    // Set user IRQ flags
-    self->mp_irq_flags = 0;
+    // Clear other interrupt flags that can trigger this IRQ handler.
     #if defined(STM32F4)
-    if (self->uartx->SR & USART_SR_IDLE) {
-        (void)self->uartx->SR;
-        (void)self->uartx->DR;
-        self->mp_irq_flags |= UART_FLAG_IDLE;
+    if (did_clear_sr) {
+        // SR was cleared above.  Re-enable IDLE if it should be enabled.
+        if (self->mp_irq_trigger & UART_FLAG_IDLE) {
+            self->uartx->CR1 |= USART_CR1_IDLEIE;
+        }
+    } else {
+        // On STM32F4 the only way to clear flags is to read SR then DR, but that may
+        // lead to a loss of data in DR.  So instead the IRQs are disabled.
+        if (self->mp_irq_flags & USART_SR_IDLE) {
+            self->uartx->CR1 &= ~USART_CR1_IDLEIE;
+        }
+        if (self->mp_irq_flags & USART_SR_ORE) {
+            // ORE is tied to RXNE so that must be disabled.
+            self->uartx->CR1 &= ~USART_CR1_RXNEIE;
+        }
     }
     #else
-    if (self->uartx->ISR & USART_ISR_IDLE) {
-        self->uartx->ICR = USART_ICR_IDLECF;
-        self->mp_irq_flags |= UART_FLAG_IDLE;
-    }
+    self->uartx->ICR = self->mp_irq_flags & (USART_ICR_IDLECF | USART_ICR_ORECF);
     #endif
 
     // Check the flags to see if the user handler should be called

From 7f143444283528101d9b48e1f2e908c12648f2f1 Mon Sep 17 00:00:00 2001
From: Mike Causer <mcauser@gmail.com>
Date: Thu, 28 Oct 2021 13:53:10 +1100
Subject: [PATCH 1369/3533] ports: Add images, features and urls to board.json.

---
 ports/cc3200/boards/WIPY/board.json                 |  9 ++++++++-
 ports/esp32/boards/ESP32_S2_WROVER/board.json       | 12 +++++++++---
 ports/esp32/boards/GENERIC/board.json               |  6 +++---
 ports/esp32/boards/GENERIC_C3/board.json            |  7 +++++--
 ports/esp32/boards/GENERIC_C3_USB/board.json        |  7 +++++--
 ports/esp32/boards/GENERIC_D2WD/board.json          |  7 +++++--
 ports/esp32/boards/GENERIC_OTA/board.json           |  7 +++++--
 ports/esp32/boards/GENERIC_S2/board.json            |  7 +++++--
 ports/esp32/boards/GENERIC_S3/board.json            |  7 +++++--
 ports/esp32/boards/GENERIC_SPIRAM/board.json        |  6 +++---
 ports/esp32/boards/LOLIN_S2_MINI/board.json         |  6 +++++-
 ports/esp32/boards/LOLIN_S2_PICO/board.json         |  8 ++++++--
 ports/esp32/boards/M5STACK_ATOM/board.json          | 13 ++++++++++---
 ports/esp32/boards/SIL_WESP32/board.json            | 11 ++++++++---
 ports/esp32/boards/UM_FEATHERS2/board.json          |  8 ++++----
 ports/esp32/boards/UM_FEATHERS2NEO/board.json       |  8 ++++----
 ports/esp32/boards/UM_TINYPICO/board.json           |  8 ++++----
 ports/esp32/boards/UM_TINYS2/board.json             |  7 +++----
 ports/esp8266/boards/GENERIC/board.json             |  6 ++++--
 ports/esp8266/boards/GENERIC_1M/board.json          |  6 ++++--
 ports/esp8266/boards/GENERIC_512K/board.json        |  6 ++++--
 ports/mimxrt/boards/MIMXRT1010_EVK/board.json       |  6 ++++--
 ports/mimxrt/boards/MIMXRT1020_EVK/board.json       |  6 ++++--
 ports/mimxrt/boards/MIMXRT1050_EVK/board.json       |  6 ++++--
 ports/mimxrt/boards/MIMXRT1060_EVK/board.json       |  6 ++++--
 ports/mimxrt/boards/MIMXRT1064_EVK/board.json       |  6 ++++--
 ports/mimxrt/boards/TEENSY40/board.json             |  4 +++-
 ports/mimxrt/boards/TEENSY41/board.json             |  4 +++-
 ports/nrf/boards/actinius_icarus/board.json         |  8 +++++---
 ports/nrf/boards/blueio_tag_evim/board.json         |  8 +++++---
 ports/nrf/boards/dvk_bl652/board.json               |  8 +++++---
 ports/nrf/boards/evk_nina_b1/board.json             | 10 ++++++----
 ports/nrf/boards/evk_nina_b3/board.json             |  8 +++++---
 ports/nrf/boards/ibk_blyst_nano/board.json          |  8 +++++---
 ports/nrf/boards/idk_blyst_nano/board.json          |  8 +++++---
 ports/nrf/boards/microbit/board.json                |  4 +++-
 ports/nrf/boards/nrf52840-mdk-usb-dongle/board.json |  6 ++++--
 ports/nrf/boards/particle_xenon/board.json          |  6 ++++--
 ports/nrf/boards/pca10000/board.json                |  6 ++++--
 ports/nrf/boards/pca10001/board.json                |  6 ++++--
 ports/nrf/boards/pca10028/board.json                |  6 ++++--
 ports/nrf/boards/pca10031/board.json                |  6 ++++--
 ports/nrf/boards/pca10040/board.json                |  6 ++++--
 ports/nrf/boards/pca10056/board.json                |  6 ++++--
 ports/nrf/boards/pca10059/board.json                |  2 +-
 ports/nrf/boards/pca10090/board.json                |  6 ++++--
 ports/nrf/boards/wt51822_s4at/board.json            | 10 ++++++----
 ports/rp2/boards/ADAFRUIT_FEATHER_RP2040/board.json | 10 +++++++++-
 .../rp2/boards/ADAFRUIT_ITSYBITSY_RP2040/board.json |  7 ++++++-
 ports/rp2/boards/ADAFRUIT_QTPY_RP2040/board.json    |  9 ++++++++-
 ports/rp2/boards/PICO/board.json                    |  6 +++++-
 ports/rp2/boards/PIMORONI_PICOLIPO_16MB/board.json  |  9 ++++++++-
 ports/rp2/boards/PIMORONI_PICOLIPO_4MB/board.json   |  9 ++++++++-
 ports/rp2/boards/PIMORONI_TINY2040/board.json       |  7 ++++++-
 ports/rp2/boards/SPARKFUN_PROMICRO/board.json       | 10 ++++++++--
 ports/rp2/boards/SPARKFUN_THINGPLUS/board.json      | 11 ++++++++++-
 .../boards/ADAFRUIT_FEATHER_M0_EXPRESS/board.json   |  9 ++++++++-
 .../boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/board.json |  7 ++++++-
 ports/samd/boards/ADAFRUIT_TRINKET_M0/board.json    |  6 +++++-
 ports/samd/boards/MINISAM_M4/board.json             |  6 +++++-
 ports/samd/boards/SAMD21_XPLAINED_PRO/board.json    |  5 ++++-
 61 files changed, 313 insertions(+), 126 deletions(-)

diff --git a/ports/cc3200/boards/WIPY/board.json b/ports/cc3200/boards/WIPY/board.json
index fcc895b7f523b..d8293b248190a 100644
--- a/ports/cc3200/boards/WIPY/board.json
+++ b/ports/cc3200/boards/WIPY/board.json
@@ -3,7 +3,14 @@
         "deploy.md"
     ],
     "docs": "https://docs.pycom.io/datasheets/development/wipy3/",
-    "features": [],
+    "features": [
+        "BLE",
+        "Breadboard Friendly",
+        "MicroSD",
+        "RGB LED",
+        "SPI Flash",
+        "WiFi"
+    ],
     "id": "wipy",
     "images": [
         "wipy.jpg"
diff --git a/ports/esp32/boards/ESP32_S2_WROVER/board.json b/ports/esp32/boards/ESP32_S2_WROVER/board.json
index eb2c40aeee567..7ebc84415c16d 100644
--- a/ports/esp32/boards/ESP32_S2_WROVER/board.json
+++ b/ports/esp32/boards/ESP32_S2_WROVER/board.json
@@ -3,11 +3,17 @@
         "../deploy_s2.md"
     ],
     "docs": "",
-    "features": [],
-    "images": [],
+    "features": [
+        "BLE",
+        "SPIRAM",
+        "WiFi"
+    ],
+    "images": [
+        "ESP32-S2-WROVER_L_0.jpg"
+    ],
     "mcu": "esp32s2",
     "product": "ESP32-S2 WROVER",
     "thumbnail": "",
-    "url": "",
+    "url": "https://www.espressif.com/en/products/modules",
     "vendor": "Espressif"
 }
diff --git a/ports/esp32/boards/GENERIC/board.json b/ports/esp32/boards/GENERIC/board.json
index eadf70dd127c9..95447dd8e1f2a 100644
--- a/ports/esp32/boards/GENERIC/board.json
+++ b/ports/esp32/boards/GENERIC/board.json
@@ -4,15 +4,15 @@
     ],
     "docs": "",
     "features": [
-        "WiFi",
-        "BLE"
+        "BLE",
+        "WiFi"
     ],
     "id": "esp32",
     "images": [],
     "mcu": "esp32",
     "product": "ESP32",
     "thumbnail": "",
-    "url": "",
+    "url": "https://www.espressif.com/en/products/modules",
     "variants": {
         "idf3": "Compiled with IDF 3.x"
     },
diff --git a/ports/esp32/boards/GENERIC_C3/board.json b/ports/esp32/boards/GENERIC_C3/board.json
index 3c360e64c74ca..325843a72d428 100644
--- a/ports/esp32/boards/GENERIC_C3/board.json
+++ b/ports/esp32/boards/GENERIC_C3/board.json
@@ -3,12 +3,15 @@
         "../deploy.md"
     ],
     "docs": "",
-    "features": [],
+    "features": [
+        "BLE",
+        "WiFi"
+    ],
     "id": "esp32c3",
     "images": [],
     "mcu": "esp32c3",
     "product": "ESP32-C3",
     "thumbnail": "",
-    "url": "",
+    "url": "https://www.espressif.com/en/products/modules",
     "vendor": "Espressif"
 }
diff --git a/ports/esp32/boards/GENERIC_C3_USB/board.json b/ports/esp32/boards/GENERIC_C3_USB/board.json
index cf9f63b90c7a0..f719a2b63a3a1 100644
--- a/ports/esp32/boards/GENERIC_C3_USB/board.json
+++ b/ports/esp32/boards/GENERIC_C3_USB/board.json
@@ -3,12 +3,15 @@
         "../deploy.md"
     ],
     "docs": "",
-    "features": [],
+    "features": [
+        "BLE",
+        "WiFi"
+    ],
     "id": "esp32c3-usb",
     "images": [],
     "mcu": "esp32c3",
     "product": "ESP32-C3 with USB",
     "thumbnail": "",
-    "url": "",
+    "url": "https://www.espressif.com/en/products/modules",
     "vendor": "Espressif"
 }
diff --git a/ports/esp32/boards/GENERIC_D2WD/board.json b/ports/esp32/boards/GENERIC_D2WD/board.json
index 63fbbfb2f9b56..d20922907dc9c 100644
--- a/ports/esp32/boards/GENERIC_D2WD/board.json
+++ b/ports/esp32/boards/GENERIC_D2WD/board.json
@@ -3,12 +3,15 @@
         "../deploy.md"
     ],
     "docs": "",
-    "features": [],
+    "features": [
+        "BLE",
+        "WiFi"
+    ],
     "id": "esp32-d2wd",
     "images": [],
     "mcu": "esp32",
     "product": "ESP32 D2WD",
     "thumbnail": "",
-    "url": "",
+    "url": "https://www.espressif.com/en/products/modules",
     "vendor": "Espressif"
 }
diff --git a/ports/esp32/boards/GENERIC_OTA/board.json b/ports/esp32/boards/GENERIC_OTA/board.json
index 529f0acdeea18..e656497fc6ec5 100644
--- a/ports/esp32/boards/GENERIC_OTA/board.json
+++ b/ports/esp32/boards/GENERIC_OTA/board.json
@@ -3,12 +3,15 @@
         "../deploy.md"
     ],
     "docs": "",
-    "features": [],
+    "features": [
+        "BLE",
+        "WiFi"
+    ],
     "id": "esp32-ota",
     "images": [],
     "mcu": "esp32",
     "product": "ESP32 with OTA support",
     "thumbnail": "",
-    "url": "",
+    "url": "https://www.espressif.com/en/products/modules",
     "vendor": "Espressif"
 }
diff --git a/ports/esp32/boards/GENERIC_S2/board.json b/ports/esp32/boards/GENERIC_S2/board.json
index 5e1758b86af13..16b19ad206f10 100644
--- a/ports/esp32/boards/GENERIC_S2/board.json
+++ b/ports/esp32/boards/GENERIC_S2/board.json
@@ -3,11 +3,14 @@
         "../deploy_s2.md"
     ],
     "docs": "",
-    "features": [],
+    "features": [
+        "BLE",
+        "WiFi"
+    ],
     "images": [],
     "mcu": "esp32s2",
     "product": "ESP32-S2",
     "thumbnail": "",
-    "url": "",
+    "url": "https://www.espressif.com/en/products/modules",
     "vendor": "Espressif"
 }
diff --git a/ports/esp32/boards/GENERIC_S3/board.json b/ports/esp32/boards/GENERIC_S3/board.json
index a2652ea46ace3..f5fb8e90154d7 100644
--- a/ports/esp32/boards/GENERIC_S3/board.json
+++ b/ports/esp32/boards/GENERIC_S3/board.json
@@ -3,11 +3,14 @@
         "../deploy.md"
     ],
     "docs": "",
-    "features": [],
+    "features": [
+        "BLE",
+        "WiFi"
+    ],
     "images": [],
     "mcu": "esp32s3",
     "product": "ESP32-S3",
     "thumbnail": "",
-    "url": "",
+    "url": "https://www.espressif.com/en/products/modules",
     "vendor": "Espressif"
 }
diff --git a/ports/esp32/boards/GENERIC_SPIRAM/board.json b/ports/esp32/boards/GENERIC_SPIRAM/board.json
index 307555b501d50..c0efc22e3f61c 100644
--- a/ports/esp32/boards/GENERIC_SPIRAM/board.json
+++ b/ports/esp32/boards/GENERIC_SPIRAM/board.json
@@ -4,16 +4,16 @@
     ],
     "docs": "",
     "features": [
-        "WiFi",
         "BLE",
-        "SPIRAM"
+        "SPIRAM",
+        "WiFi"
     ],
     "id": "esp32spiram",
     "images": [],
     "mcu": "esp32",
     "product": "ESP32 with SPIRAM",
     "thumbnail": "",
-    "url": "",
+    "url": "https://www.espressif.com/en/products/modules",
     "variants": {
         "idf3": "Compiled with IDF 3.x"
     },
diff --git a/ports/esp32/boards/LOLIN_S2_MINI/board.json b/ports/esp32/boards/LOLIN_S2_MINI/board.json
index 50e24ff3f9b68..41e62a02287bb 100644
--- a/ports/esp32/boards/LOLIN_S2_MINI/board.json
+++ b/ports/esp32/boards/LOLIN_S2_MINI/board.json
@@ -3,7 +3,11 @@
         "../deploy_s2.md"
     ],
     "docs": "",
-    "features": [],
+    "features": [
+        "SPIRAM",
+        "USB-C",
+        "WiFi"
+    ],
     "images": [
         "lolin_s2_mini.jpg"
     ],
diff --git a/ports/esp32/boards/LOLIN_S2_PICO/board.json b/ports/esp32/boards/LOLIN_S2_PICO/board.json
index df760ace4ede1..43322b87b0a91 100644
--- a/ports/esp32/boards/LOLIN_S2_PICO/board.json
+++ b/ports/esp32/boards/LOLIN_S2_PICO/board.json
@@ -4,8 +4,12 @@
     ],
     "docs": "",
     "features": [
-        "WiFi",
-        "USB-C"
+        "Breadboard Friendly",
+        "OLED",
+        "SPIRAM",
+        "STEMMA QT/QWIIC",
+        "USB-C",
+        "WiFi"
     ],
     "images": [
         "lolin_s2_pico.jpg"
diff --git a/ports/esp32/boards/M5STACK_ATOM/board.json b/ports/esp32/boards/M5STACK_ATOM/board.json
index b61d6d9e16771..1d499ad4bf525 100644
--- a/ports/esp32/boards/M5STACK_ATOM/board.json
+++ b/ports/esp32/boards/M5STACK_ATOM/board.json
@@ -3,11 +3,18 @@
         "../deploy.md"
     ],
     "docs": "",
-    "features": [],
+    "features": [
+        "Grove",
+        "IMU",
+        "Infrared",
+        "RGB LED",
+        "USB-C",
+        "WiFi"
+    ],
     "images": [],
     "mcu": "esp32",
     "product": "M5 Stack Atom",
     "thumbnail": "",
-    "url": "",
-    "vendor": ""
+    "url": "https://m5stack.com/",
+    "vendor": "M5 Stack"
 }
diff --git a/ports/esp32/boards/SIL_WESP32/board.json b/ports/esp32/boards/SIL_WESP32/board.json
index 73382c156551a..65a4fde182405 100644
--- a/ports/esp32/boards/SIL_WESP32/board.json
+++ b/ports/esp32/boards/SIL_WESP32/board.json
@@ -3,12 +3,17 @@
         "../deploy.md"
     ],
     "docs": "",
-    "features": [],
+    "features": [
+        "BLE",
+        "Ethernet",
+        "PoE",
+        "WiFi"
+    ],
     "id": "wesp32",
     "images": [],
     "mcu": "esp32",
     "product": "SIL WESP32",
     "thumbnail": "",
-    "url": "",
-    "vendor": "Espressif"
+    "url": "https://wesp32.com/",
+    "vendor": "Silicognition LLC"
 }
diff --git a/ports/esp32/boards/UM_FEATHERS2/board.json b/ports/esp32/boards/UM_FEATHERS2/board.json
index 19d7219ec5249..fa5b213db0137 100644
--- a/ports/esp32/boards/UM_FEATHERS2/board.json
+++ b/ports/esp32/boards/UM_FEATHERS2/board.json
@@ -4,13 +4,13 @@
     ],
     "docs": "",
     "features": [
-        "WiFi",
-        "Feather",
         "Battery Charging",
+        "Feather",
+        "RGB LED",
+        "SPIRAM",
         "STEMMA QT/QWIIC",
         "USB-C",
-        "RGB LED",
-        "SPIRAM"
+        "WiFi"
     ],
     "features_non_filterable": [
         "Second LDO"
diff --git a/ports/esp32/boards/UM_FEATHERS2NEO/board.json b/ports/esp32/boards/UM_FEATHERS2NEO/board.json
index be7a1371faa1b..d809485e86efc 100644
--- a/ports/esp32/boards/UM_FEATHERS2NEO/board.json
+++ b/ports/esp32/boards/UM_FEATHERS2NEO/board.json
@@ -4,13 +4,13 @@
     ],
     "docs": "",
     "features": [
-        "WiFi",
-        "Feather",
         "Battery Charging",
+        "Feather",
+        "RGB LED",
+        "SPIRAM",
         "STEMMA QT/QWIIC",
         "USB-C",
-        "RGB LED",
-        "SPIRAM"
+        "WiFi"
     ],
     "features_non_filterable": [
         "5x5 RGB LED Matrix"
diff --git a/ports/esp32/boards/UM_TINYPICO/board.json b/ports/esp32/boards/UM_TINYPICO/board.json
index 6fb7803fe2392..9f1783a9f1e45 100644
--- a/ports/esp32/boards/UM_TINYPICO/board.json
+++ b/ports/esp32/boards/UM_TINYPICO/board.json
@@ -4,12 +4,12 @@
     ],
     "docs": "",
     "features": [
-        "BLE",
-        "WiFi",
         "Battery Charging",
-        "USB-C",
+        "BLE",
         "RGB LED",
-        "SPIRAM"
+        "SPIRAM",
+        "USB-C",
+        "WiFi"
     ],
     "features_non_filterable": [
         "TinyPICO Compatible"
diff --git a/ports/esp32/boards/UM_TINYS2/board.json b/ports/esp32/boards/UM_TINYS2/board.json
index 20c1c6d847149..e7068170cbcbc 100644
--- a/ports/esp32/boards/UM_TINYS2/board.json
+++ b/ports/esp32/boards/UM_TINYS2/board.json
@@ -4,13 +4,12 @@
     ],
     "docs": "",
     "features": [
-        "WiFi",
-        "USB-C"
         "Battery Charging",
+        "RGB LED",
+        "SPIRAM",
         "STEMMA QT/QWIIC",
         "USB-C",
-        "RGB LED",
-        "SPIRAM"
+        "WiFi"
     ],
     "features_non_filterable": [
         "TinyPICO Compatible"
diff --git a/ports/esp8266/boards/GENERIC/board.json b/ports/esp8266/boards/GENERIC/board.json
index d8f4cba083949..46c2659d8a7e2 100644
--- a/ports/esp8266/boards/GENERIC/board.json
+++ b/ports/esp8266/boards/GENERIC/board.json
@@ -3,13 +3,15 @@
         "../deploy.md"
     ],
     "docs": "",
-    "features": [],
+    "features": [
+        "WiFi"
+    ],
     "id": "esp8266",
     "images": [],
     "mcu": "esp8266",
     "product": "ESP8266 with 2MiB+ flash",
     "thumbnail": "",
-    "url": "",
+    "url": "https://www.espressif.com/en/products/modules",
     "variants": {
         "ota": "OTA compatible"
     },
diff --git a/ports/esp8266/boards/GENERIC_1M/board.json b/ports/esp8266/boards/GENERIC_1M/board.json
index 6279d3fee06d6..2ef4bd99fa570 100644
--- a/ports/esp8266/boards/GENERIC_1M/board.json
+++ b/ports/esp8266/boards/GENERIC_1M/board.json
@@ -3,12 +3,14 @@
         "../deploy.md"
     ],
     "docs": "",
-    "features": [],
+    "features": [
+        "WiFi"
+    ],
     "id": "esp8266-1m",
     "images": [],
     "mcu": "esp8266",
     "product": "ESP8266 with 1MiB flash",
     "thumbnail": "",
-    "url": "",
+    "url": "https://www.espressif.com/en/products/modules",
     "vendor": "Espressif"
 }
diff --git a/ports/esp8266/boards/GENERIC_512K/board.json b/ports/esp8266/boards/GENERIC_512K/board.json
index da15a39d510fd..10050592cf404 100644
--- a/ports/esp8266/boards/GENERIC_512K/board.json
+++ b/ports/esp8266/boards/GENERIC_512K/board.json
@@ -3,12 +3,14 @@
         "../deploy.md"
     ],
     "docs": "",
-    "features": [],
+    "features": [
+        "WiFi"
+    ],
     "id": "esp8266-512k",
     "images": [],
     "mcu": "esp8266",
     "product": "ESP8266 with 512kiB flash",
     "thumbnail": "",
-    "url": "",
+    "url": "https://www.espressif.com/en/products/modules",
     "vendor": "Espressif"
 }
diff --git a/ports/mimxrt/boards/MIMXRT1010_EVK/board.json b/ports/mimxrt/boards/MIMXRT1010_EVK/board.json
index c865e74f4a3bc..048430beaddbc 100644
--- a/ports/mimxrt/boards/MIMXRT1010_EVK/board.json
+++ b/ports/mimxrt/boards/MIMXRT1010_EVK/board.json
@@ -4,10 +4,12 @@
     ],
     "docs": "",
     "features": [],
-    "images": [],
+    "images": [
+        "i.MXRT1010-TOP.jpg"
+    ],
     "mcu": "mimxrt",
     "product": "MIMXRT1010_EVK",
     "thumbnail": "",
-    "url": "",
+    "url": "https://www.nxp.com/design/development-boards/i-mx-evaluation-and-development-boards/i-mx-rt1010-evaluation-kit:MIMXRT1010-EVK",
     "vendor": "NXP"
 }
diff --git a/ports/mimxrt/boards/MIMXRT1020_EVK/board.json b/ports/mimxrt/boards/MIMXRT1020_EVK/board.json
index 7930f702b492a..4dd3fed26976a 100644
--- a/ports/mimxrt/boards/MIMXRT1020_EVK/board.json
+++ b/ports/mimxrt/boards/MIMXRT1020_EVK/board.json
@@ -4,10 +4,12 @@
     ],
     "docs": "",
     "features": [],
-    "images": [],
+    "images": [
+        "MIMXRT-1020-EVKBD.jpg"
+    ],
     "mcu": "mimxrt",
     "product": "MIMXRT1020_EVK",
     "thumbnail": "",
-    "url": "",
+    "url": "https://www.nxp.com/design/development-boards/i-mx-evaluation-and-development-boards/i-mx-rt1020-evaluation-kit:MIMXRT1020-EVK",
     "vendor": "NXP"
 }
diff --git a/ports/mimxrt/boards/MIMXRT1050_EVK/board.json b/ports/mimxrt/boards/MIMXRT1050_EVK/board.json
index 5f04fb29b5716..9c0e22b373abb 100644
--- a/ports/mimxrt/boards/MIMXRT1050_EVK/board.json
+++ b/ports/mimxrt/boards/MIMXRT1050_EVK/board.json
@@ -4,10 +4,12 @@
     ],
     "docs": "",
     "features": [],
-    "images": [],
+    "images": [
+        "IMX_RT1050-EVKB_TOP-LR.jpg"
+    ],
     "mcu": "mimxrt",
     "product": "MIMXRT1050_EVK",
     "thumbnail": "",
-    "url": "",
+    "url": "https://www.nxp.com/design/development-boards/i-mx-evaluation-and-development-boards/i-mx-rt1050-evaluation-kit:MIMXRT1050-EVK",
     "vendor": "NXP"
 }
diff --git a/ports/mimxrt/boards/MIMXRT1060_EVK/board.json b/ports/mimxrt/boards/MIMXRT1060_EVK/board.json
index 602b50d7f2196..14e8942de2670 100644
--- a/ports/mimxrt/boards/MIMXRT1060_EVK/board.json
+++ b/ports/mimxrt/boards/MIMXRT1060_EVK/board.json
@@ -4,10 +4,12 @@
     ],
     "docs": "",
     "features": [],
-    "images": [],
+    "images": [
+        "X-MIMXRT1060-EVK-BOARD-BOTTOM.jpg"
+    ],
     "mcu": "mimxrt",
     "product": "MIMXRT1060_EVK",
     "thumbnail": "",
-    "url": "",
+    "url": "https://www.nxp.com/design/development-boards/i-mx-evaluation-and-development-boards/i-mx-rt1060-evaluation-kit:MIMXRT1060-EVK",
     "vendor": "NXP"
 }
diff --git a/ports/mimxrt/boards/MIMXRT1064_EVK/board.json b/ports/mimxrt/boards/MIMXRT1064_EVK/board.json
index 5830a39f2e565..ff7f3f722ee6a 100644
--- a/ports/mimxrt/boards/MIMXRT1064_EVK/board.json
+++ b/ports/mimxrt/boards/MIMXRT1064_EVK/board.json
@@ -4,10 +4,12 @@
     ],
     "docs": "",
     "features": [],
-    "images": [],
+    "images": [
+        "MIMXRT1064EVK-TOP.jpg"
+    ],
     "mcu": "mimxrt",
     "product": "MIMXRT1064_EVK",
     "thumbnail": "",
-    "url": "",
+    "url": "https://www.nxp.com/design/development-boards/i-mx-evaluation-and-development-boards/i-mx-rt1064-evaluation-kit:MIMXRT1064-EVK",
     "vendor": "NXP"
 }
diff --git a/ports/mimxrt/boards/TEENSY40/board.json b/ports/mimxrt/boards/TEENSY40/board.json
index 25f7690fc0ea1..dfc0ca96b32f2 100644
--- a/ports/mimxrt/boards/TEENSY40/board.json
+++ b/ports/mimxrt/boards/TEENSY40/board.json
@@ -4,7 +4,9 @@
     ],
     "docs": "",
     "features": [],
-    "images": [],
+    "images": [
+        "teensy40_front.jpg"
+    ],
     "mcu": "mimxrt",
     "product": "Teensy 4.0",
     "thumbnail": "",
diff --git a/ports/mimxrt/boards/TEENSY41/board.json b/ports/mimxrt/boards/TEENSY41/board.json
index 9c5c4709a9d57..cbb397c727509 100644
--- a/ports/mimxrt/boards/TEENSY41/board.json
+++ b/ports/mimxrt/boards/TEENSY41/board.json
@@ -4,7 +4,9 @@
     ],
     "docs": "",
     "features": [],
-    "images": [],
+    "images": [
+        "teensy41_4.jpg"
+    ],
     "mcu": "mimxrt",
     "product": "Teensy 4.1",
     "thumbnail": "",
diff --git a/ports/nrf/boards/actinius_icarus/board.json b/ports/nrf/boards/actinius_icarus/board.json
index 86e7bd350858c..c1d9f1c4ef637 100644
--- a/ports/nrf/boards/actinius_icarus/board.json
+++ b/ports/nrf/boards/actinius_icarus/board.json
@@ -4,10 +4,12 @@
     ],
     "docs": "",
     "features": [],
-    "images": [],
+    "images": [
+        "icarus-v1.4-front-shadow-p-800.jpg"
+    ],
     "mcu": "nrf91",
     "product": "actinius_icarus",
     "thumbnail": "",
-    "url": "",
-    "vendor": ""
+    "url": "https://www.actinius.com/icarus",
+    "vendor": "Actinius"
 }
diff --git a/ports/nrf/boards/blueio_tag_evim/board.json b/ports/nrf/boards/blueio_tag_evim/board.json
index ed178d11da649..5b6e5747d5838 100644
--- a/ports/nrf/boards/blueio_tag_evim/board.json
+++ b/ports/nrf/boards/blueio_tag_evim/board.json
@@ -4,10 +4,12 @@
     ],
     "docs": "",
     "features": [],
-    "images": [],
+    "images": [
+        "blyst-nano-mod-4_jpg_project-body.jpg"
+    ],
     "mcu": "nrf52",
     "product": "blueio_tag_evim",
     "thumbnail": "",
-    "url": "",
-    "vendor": ""
+    "url": "https://www.i-syst.com/index.php/products/blyst-nano",
+    "vendor": "I-SYST"
 }
diff --git a/ports/nrf/boards/dvk_bl652/board.json b/ports/nrf/boards/dvk_bl652/board.json
index 1e2491010f82a..5c9cfad26e6f5 100644
--- a/ports/nrf/boards/dvk_bl652/board.json
+++ b/ports/nrf/boards/dvk_bl652/board.json
@@ -4,10 +4,12 @@
     ],
     "docs": "",
     "features": [],
-    "images": [],
+    "images": [
+        "BL652-SA_JPG-500.jpg"
+    ],
     "mcu": "nrf52",
     "product": "dvk_bl652",
     "thumbnail": "",
-    "url": "",
-    "vendor": ""
+    "url": "https://www.lairdconnect.com/wireless-modules/bluetooth-modules/bluetooth-5-modules/bl652-series-bluetooth-v5-nfc-module",
+    "vendor": "Laird Connectivity"
 }
diff --git a/ports/nrf/boards/evk_nina_b1/board.json b/ports/nrf/boards/evk_nina_b1/board.json
index a81e961fccfb8..657b0fa06db54 100644
--- a/ports/nrf/boards/evk_nina_b1/board.json
+++ b/ports/nrf/boards/evk_nina_b1/board.json
@@ -2,12 +2,14 @@
     "deploy": [
         "../deploy.md"
     ],
-    "docs": "",
+    "docs": "https://www.u-blox.com/sites/default/files/EVK-NINA-B1_UserGuide_%28UBX-15028120%29.pdf",
     "features": [],
-    "images": [],
+    "images": [
+        "EVK-NINA-B1_.jpg"
+    ],
     "mcu": "nrf52",
     "product": "evk_nina_b1",
     "thumbnail": "",
-    "url": "",
-    "vendor": ""
+    "url": "https://www.u-blox.com/en/product/evk-nina-b1",
+    "vendor": "u-blox"
 }
diff --git a/ports/nrf/boards/evk_nina_b3/board.json b/ports/nrf/boards/evk_nina_b3/board.json
index f71a6eff71b3e..54e3dc3585c3f 100644
--- a/ports/nrf/boards/evk_nina_b3/board.json
+++ b/ports/nrf/boards/evk_nina_b3/board.json
@@ -4,10 +4,12 @@
     ],
     "docs": "",
     "features": [],
-    "images": [],
+    "images": [
+        "EVK-NINA-B3-top.jpg"
+    ],
     "mcu": "nrf52",
     "product": "evk_nina_b3",
     "thumbnail": "",
-    "url": "",
-    "vendor": ""
+    "url": "https://www.u-blox.com/en/product/evk-nina-b3",
+    "vendor": "u-blox"
 }
diff --git a/ports/nrf/boards/ibk_blyst_nano/board.json b/ports/nrf/boards/ibk_blyst_nano/board.json
index f641f6b7d2aee..562c33607b153 100644
--- a/ports/nrf/boards/ibk_blyst_nano/board.json
+++ b/ports/nrf/boards/ibk_blyst_nano/board.json
@@ -4,10 +4,12 @@
     ],
     "docs": "",
     "features": [],
-    "images": [],
+    "images": [
+        "blyst-nano-fingertip-close_jpg_content-body-gallery.jpg"
+    ],
     "mcu": "nrf52",
     "product": "ibk_blyst_nano",
     "thumbnail": "",
-    "url": "",
-    "vendor": ""
+    "url": "https://www.i-syst.com/products/blyst-nano",
+    "vendor": "I-SYST"
 }
diff --git a/ports/nrf/boards/idk_blyst_nano/board.json b/ports/nrf/boards/idk_blyst_nano/board.json
index 07b2748a76f05..199721698d403 100644
--- a/ports/nrf/boards/idk_blyst_nano/board.json
+++ b/ports/nrf/boards/idk_blyst_nano/board.json
@@ -4,10 +4,12 @@
     ],
     "docs": "",
     "features": [],
-    "images": [],
+    "images": [
+        "blyst-nano-fingertip-close_jpg_content-body-gallery.jpg"
+    ],
     "mcu": "nrf52",
     "product": "idk_blyst_nano",
     "thumbnail": "",
-    "url": "",
-    "vendor": ""
+    "url": "https://www.i-syst.com/products/blyst-nano",
+    "vendor": "I-SYST"
 }
diff --git a/ports/nrf/boards/microbit/board.json b/ports/nrf/boards/microbit/board.json
index b7a041ad4d073..872727bb976fe 100644
--- a/ports/nrf/boards/microbit/board.json
+++ b/ports/nrf/boards/microbit/board.json
@@ -4,7 +4,9 @@
     ],
     "docs": "",
     "features": [],
-    "images": [],
+    "images": [
+        "AF-3362-1.jpg"
+    ],
     "mcu": "nrf51",
     "product": "micro:bit v1",
     "thumbnail": "",
diff --git a/ports/nrf/boards/nrf52840-mdk-usb-dongle/board.json b/ports/nrf/boards/nrf52840-mdk-usb-dongle/board.json
index bbe03618dabfb..853c3757105cd 100644
--- a/ports/nrf/boards/nrf52840-mdk-usb-dongle/board.json
+++ b/ports/nrf/boards/nrf52840-mdk-usb-dongle/board.json
@@ -4,10 +4,12 @@
     ],
     "docs": "",
     "features": [],
-    "images": [],
+    "images": [
+        "dongle_pcba_case.jpg"
+    ],
     "mcu": "nrf52",
     "product": "nrf52840-mdk-usb-dongle",
     "thumbnail": "",
-    "url": "",
+    "url": "https://wiki.makerdiary.com/nrf52840-mdk-usb-dongle",
     "vendor": ""
 }
diff --git a/ports/nrf/boards/particle_xenon/board.json b/ports/nrf/boards/particle_xenon/board.json
index ed1522be5b41c..1f6b90b753186 100644
--- a/ports/nrf/boards/particle_xenon/board.json
+++ b/ports/nrf/boards/particle_xenon/board.json
@@ -4,10 +4,12 @@
     ],
     "docs": "",
     "features": [],
-    "images": [],
+    "images": [
+        "xenon-top.jpg"
+    ],
     "mcu": "nrf52",
     "product": "Xenon",
     "thumbnail": "",
-    "url": "",
+    "url": "https://docs.particle.io/xenon/",
     "vendor": "Particle"
 }
diff --git a/ports/nrf/boards/pca10000/board.json b/ports/nrf/boards/pca10000/board.json
index 6cae711f070d0..1f6e7386977e1 100644
--- a/ports/nrf/boards/pca10000/board.json
+++ b/ports/nrf/boards/pca10000/board.json
@@ -4,10 +4,12 @@
     ],
     "docs": "",
     "features": [],
-    "images": [],
+    "images": [
+        "nRF51-Dongle.jpg"
+    ],
     "mcu": "nrf51",
     "product": "pca10000",
     "thumbnail": "",
-    "url": "",
+    "url": "https://www.nordicsemi.com/Products/Development-hardware/nRF51-Dongle",
     "vendor": "Nordic Semiconductor"
 }
diff --git a/ports/nrf/boards/pca10001/board.json b/ports/nrf/boards/pca10001/board.json
index 9f073b8190437..ca1a42df7b1da 100644
--- a/ports/nrf/boards/pca10001/board.json
+++ b/ports/nrf/boards/pca10001/board.json
@@ -4,10 +4,12 @@
     ],
     "docs": "",
     "features": [],
-    "images": [],
+    "images": [
+        "nRF51-DK.jpg"
+    ],
     "mcu": "nrf51",
     "product": "pca10001",
     "thumbnail": "",
-    "url": "",
+    "url": "https://www.nordicsemi.com/Products/Development-hardware/nrf51-dk",
     "vendor": "Nordic Semiconductor"
 }
diff --git a/ports/nrf/boards/pca10028/board.json b/ports/nrf/boards/pca10028/board.json
index bda2c4d7572ef..f80cea4699239 100644
--- a/ports/nrf/boards/pca10028/board.json
+++ b/ports/nrf/boards/pca10028/board.json
@@ -4,10 +4,12 @@
     ],
     "docs": "",
     "features": [],
-    "images": [],
+    "images": [
+        "nRF51-DK.jpg"
+    ],
     "mcu": "nrf51",
     "product": "pca10028",
     "thumbnail": "",
-    "url": "",
+    "url": "https://www.nordicsemi.com/Products/Development-hardware/nRF51-DK",
     "vendor": "Nordic Semiconductor"
 }
diff --git a/ports/nrf/boards/pca10031/board.json b/ports/nrf/boards/pca10031/board.json
index caba44f328afa..fb7c774ca5ffd 100644
--- a/ports/nrf/boards/pca10031/board.json
+++ b/ports/nrf/boards/pca10031/board.json
@@ -4,10 +4,12 @@
     ],
     "docs": "",
     "features": [],
-    "images": [],
+    "images": [
+        "nRF51-Dongle.jpg"
+    ],
     "mcu": "nrf51",
     "product": "pca10031",
     "thumbnail": "",
-    "url": "",
+    "url": "https://www.nordicsemi.com/Products/Development-hardware/nRF51-Dongle",
     "vendor": "Nordic Semiconductor"
 }
diff --git a/ports/nrf/boards/pca10040/board.json b/ports/nrf/boards/pca10040/board.json
index 55cef41862122..d1680e53ad85b 100644
--- a/ports/nrf/boards/pca10040/board.json
+++ b/ports/nrf/boards/pca10040/board.json
@@ -4,10 +4,12 @@
     ],
     "docs": "",
     "features": [],
-    "images": [],
+    "images": [
+        "nRF52-DK-prod-page.jpg"
+    ],
     "mcu": "nrf52",
     "product": "pca10040",
     "thumbnail": "",
-    "url": "",
+    "url": "https://www.nordicsemi.com/Products/Development-hardware/nRF52-DK",
     "vendor": "Nordic Semiconductor"
 }
diff --git a/ports/nrf/boards/pca10056/board.json b/ports/nrf/boards/pca10056/board.json
index ed9b65baa346f..763d8d824b9d9 100644
--- a/ports/nrf/boards/pca10056/board.json
+++ b/ports/nrf/boards/pca10056/board.json
@@ -4,10 +4,12 @@
     ],
     "docs": "",
     "features": [],
-    "images": [],
+    "images": [
+        "nRF52840-DK-prod-page.jpg"
+    ],
     "mcu": "nrf52",
     "product": "pca10056",
     "thumbnail": "",
-    "url": "",
+    "url": "https://www.nordicsemi.com/Products/Development-hardware/nRF52840-DK",
     "vendor": "Nordic Semiconductor"
 }
diff --git a/ports/nrf/boards/pca10059/board.json b/ports/nrf/boards/pca10059/board.json
index 7b883c007e0a4..14bd8bf7e8aa2 100644
--- a/ports/nrf/boards/pca10059/board.json
+++ b/ports/nrf/boards/pca10059/board.json
@@ -10,6 +10,6 @@
     "mcu": "nrf52",
     "product": "pca10059",
     "thumbnail": "",
-    "url": "",
+    "url": "https://www.nordicsemi.com/Products/Development-hardware/nRF52840-Dongle",
     "vendor": "Nordic Semiconductor"
 }
diff --git a/ports/nrf/boards/pca10090/board.json b/ports/nrf/boards/pca10090/board.json
index dd2e928e4c7a4..56525ef3ac9ae 100644
--- a/ports/nrf/boards/pca10090/board.json
+++ b/ports/nrf/boards/pca10090/board.json
@@ -4,10 +4,12 @@
     ],
     "docs": "",
     "features": [],
-    "images": [],
+    "images": [
+        "nRF59160-DK-prod-page.jpg"
+    ],
     "mcu": "nrf91",
     "product": "pca10090",
     "thumbnail": "",
-    "url": "",
+    "url": "https://www.nordicsemi.com/Products/Development-hardware/nrf9160-dk",
     "vendor": "Nordic Semiconductor"
 }
diff --git a/ports/nrf/boards/wt51822_s4at/board.json b/ports/nrf/boards/wt51822_s4at/board.json
index 3917265a9ae19..89d008c6f5da5 100644
--- a/ports/nrf/boards/wt51822_s4at/board.json
+++ b/ports/nrf/boards/wt51822_s4at/board.json
@@ -2,12 +2,14 @@
     "deploy": [
         "../deploy.md"
     ],
-    "docs": "",
+    "docs": "https://4tronix.co.uk/picobot2/WT51822-S4AT.pdf",
     "features": [],
-    "images": [],
+    "images": [
+        "WT51822-S4AT.jpg"
+    ],
     "mcu": "nrf51",
     "product": "wt51822_s4at",
     "thumbnail": "",
-    "url": "",
-    "vendor": ""
+    "url": "http://www.wireless-tag.com/portfolio/wt51822-s4at-2/",
+    "vendor": "Wireless-Tag"
 }
diff --git a/ports/rp2/boards/ADAFRUIT_FEATHER_RP2040/board.json b/ports/rp2/boards/ADAFRUIT_FEATHER_RP2040/board.json
index a4caba335dc83..a7db469389c14 100644
--- a/ports/rp2/boards/ADAFRUIT_FEATHER_RP2040/board.json
+++ b/ports/rp2/boards/ADAFRUIT_FEATHER_RP2040/board.json
@@ -3,7 +3,15 @@
         "../deploy.md"
     ],
     "docs": "",
-    "features": [],
+    "features": [
+        "Battery Charging",
+        "Breadboard Friendly",
+        "Feather",
+        "RGB LED",
+        "SPI Flash",
+        "STEMMA QT/QWIIC",
+        "USB-C"
+    ],
     "images": [
         "4884-06.jpg"
     ],
diff --git a/ports/rp2/boards/ADAFRUIT_ITSYBITSY_RP2040/board.json b/ports/rp2/boards/ADAFRUIT_ITSYBITSY_RP2040/board.json
index 1dcb999a8619d..7ca0db06985ef 100644
--- a/ports/rp2/boards/ADAFRUIT_ITSYBITSY_RP2040/board.json
+++ b/ports/rp2/boards/ADAFRUIT_ITSYBITSY_RP2040/board.json
@@ -3,7 +3,12 @@
         "../deploy.md"
     ],
     "docs": "",
-    "features": [],
+    "features": [
+        "Breadboard Friendly",
+        "Micro USB",
+        "RGB LED",
+        "SPI Flash"
+    ],
     "images": [
         "4888-05.jpg"
     ],
diff --git a/ports/rp2/boards/ADAFRUIT_QTPY_RP2040/board.json b/ports/rp2/boards/ADAFRUIT_QTPY_RP2040/board.json
index d8efa83be4765..d63166616ff0a 100644
--- a/ports/rp2/boards/ADAFRUIT_QTPY_RP2040/board.json
+++ b/ports/rp2/boards/ADAFRUIT_QTPY_RP2040/board.json
@@ -3,7 +3,14 @@
         "../deploy.md"
     ],
     "docs": "",
-    "features": [],
+    "features": [
+        "Breadboard Friendly",
+        "Castellated Pads",
+        "RGB LED",
+        "SPI Flash",
+        "STEMMA QT/QWIIC",
+        "USB-C"
+    ],
     "images": [
         "4900-12.jpg"
     ],
diff --git a/ports/rp2/boards/PICO/board.json b/ports/rp2/boards/PICO/board.json
index cc933c5a9237d..b8ccb3ba53292 100644
--- a/ports/rp2/boards/PICO/board.json
+++ b/ports/rp2/boards/PICO/board.json
@@ -3,7 +3,11 @@
         "../deploy.md"
     ],
     "docs": "",
-    "features": [],
+    "features": [
+        "Breadboard friendly",
+        "Castellated Pads",
+        "Micro USB"
+    ],
     "id": "rp2-pico",
     "images": [
         "rp2-pico.jpg"
diff --git a/ports/rp2/boards/PIMORONI_PICOLIPO_16MB/board.json b/ports/rp2/boards/PIMORONI_PICOLIPO_16MB/board.json
index 35e18cc8dc360..9121154d81ca7 100644
--- a/ports/rp2/boards/PIMORONI_PICOLIPO_16MB/board.json
+++ b/ports/rp2/boards/PIMORONI_PICOLIPO_16MB/board.json
@@ -3,7 +3,14 @@
         "../deploy.md"
     ],
     "docs": "",
-    "features": [],
+    "features": [
+        "Battery Charging",
+        "Breadboard Friendly",
+        "Castellated Pads",
+        "SPI Flash",
+        "STEMMA QT/QWIIC",
+        "USB-C"
+    ],
     "images": [
         "PimoroniPicoLipo_1of3_1024x1024.jpg"
     ],
diff --git a/ports/rp2/boards/PIMORONI_PICOLIPO_4MB/board.json b/ports/rp2/boards/PIMORONI_PICOLIPO_4MB/board.json
index 5a8273cb5cf47..69d8532397a39 100644
--- a/ports/rp2/boards/PIMORONI_PICOLIPO_4MB/board.json
+++ b/ports/rp2/boards/PIMORONI_PICOLIPO_4MB/board.json
@@ -3,7 +3,14 @@
         "../deploy.md"
     ],
     "docs": "",
-    "features": [],
+    "features": [
+        "Battery Charging",
+        "Breadboard Friendly",
+        "Castellated Pads",
+        "SPI Flash",
+        "STEMMA QT/QWIIC",
+        "USB-C"
+    ],
     "images": [
         "PimoroniPicoLipo_1of3_1024x1024.jpg"
     ],
diff --git a/ports/rp2/boards/PIMORONI_TINY2040/board.json b/ports/rp2/boards/PIMORONI_TINY2040/board.json
index cc7e643f41280..753a25beaed31 100644
--- a/ports/rp2/boards/PIMORONI_TINY2040/board.json
+++ b/ports/rp2/boards/PIMORONI_TINY2040/board.json
@@ -3,7 +3,12 @@
         "../deploy.md"
     ],
     "docs": "",
-    "features": [],
+    "features": [
+        "Breadboard Friendly",
+        "Castellated Pads",
+        "RGB LED",
+        "USB-C"
+    ],
     "images": [
         "tiny-2040-on-white-1_1024x1024.jpg"
     ],
diff --git a/ports/rp2/boards/SPARKFUN_PROMICRO/board.json b/ports/rp2/boards/SPARKFUN_PROMICRO/board.json
index 28e9764fe4801..a0d39165affb8 100644
--- a/ports/rp2/boards/SPARKFUN_PROMICRO/board.json
+++ b/ports/rp2/boards/SPARKFUN_PROMICRO/board.json
@@ -3,13 +3,19 @@
         "../deploy.md"
     ],
     "docs": "",
-    "features": [],
+    "features": [
+        "Breadboard Friendly",
+        "Castellated Pads",
+        "RGB LED",
+        "STEMMA QT/QWIIC",
+        "USB-C"
+    ],
     "images": [
         "17745-SparkFun_Thing_Plus_-_RP2040-01a.jpg"
     ],
     "mcu": "rp2040",
     "product": "Pro Micro RP2040",
     "thumbnail": "",
-    "url": "https://www.sparkfun.com/products/17717",
+    "url": "https://www.sparkfun.com/products/18288",
     "vendor": "Sparkfun"
 }
diff --git a/ports/rp2/boards/SPARKFUN_THINGPLUS/board.json b/ports/rp2/boards/SPARKFUN_THINGPLUS/board.json
index d864f67c11baa..871a411b5b950 100644
--- a/ports/rp2/boards/SPARKFUN_THINGPLUS/board.json
+++ b/ports/rp2/boards/SPARKFUN_THINGPLUS/board.json
@@ -3,7 +3,16 @@
         "../deploy.md"
     ],
     "docs": "",
-    "features": [],
+    "features": [
+        "Battery Charging",
+        "Breadboard Friendly",
+        "Feather",
+        "MicroSD",
+        "RGB LED",
+        "SPI Flash",
+        "STEMMA QT/QWIIC",
+        "USB-C"
+    ],
     "images": [
         "17745-SparkFun_Thing_Plus_-_RP2040-01a.jpg"
     ],
diff --git a/ports/samd/boards/ADAFRUIT_FEATHER_M0_EXPRESS/board.json b/ports/samd/boards/ADAFRUIT_FEATHER_M0_EXPRESS/board.json
index 8b91398e12dd2..b0cb02cd4f037 100644
--- a/ports/samd/boards/ADAFRUIT_FEATHER_M0_EXPRESS/board.json
+++ b/ports/samd/boards/ADAFRUIT_FEATHER_M0_EXPRESS/board.json
@@ -3,7 +3,14 @@
         "../deploy.md"
     ],
     "docs": "",
-    "features": [],
+    "features": [
+        "Battery Charging",
+        "Breadboard Friendly",
+        "Feather",
+        "Micro USB",
+        "RGB LED",
+        "SPI Flash"
+    ],
     "images": [
         "feather_m0_express.jpg"
     ],
diff --git a/ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/board.json b/ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/board.json
index 74b278b15b879..83db285b4d313 100644
--- a/ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/board.json
+++ b/ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/board.json
@@ -3,7 +3,12 @@
         "../deploy.md"
     ],
     "docs": "",
-    "features": [],
+    "features": [
+        "Breadboard Friendly",
+        "Micro USB",
+        "RGB LED",
+        "SPI Flash"
+    ],
     "images": [
         "itsybitsy_m4_express.jpg"
     ],
diff --git a/ports/samd/boards/ADAFRUIT_TRINKET_M0/board.json b/ports/samd/boards/ADAFRUIT_TRINKET_M0/board.json
index 6d104fac18ae7..9112bc06efe2d 100644
--- a/ports/samd/boards/ADAFRUIT_TRINKET_M0/board.json
+++ b/ports/samd/boards/ADAFRUIT_TRINKET_M0/board.json
@@ -3,7 +3,11 @@
         "../deploy.md"
     ],
     "docs": "",
-    "features": [],
+    "features": [
+        "Breadboard Friendly",
+        "Micro USB",
+        "RGB LED"
+    ],
     "images": [
         "trinket_m0.jpg"
     ],
diff --git a/ports/samd/boards/MINISAM_M4/board.json b/ports/samd/boards/MINISAM_M4/board.json
index df63ec64b7b8d..126e0364009f3 100644
--- a/ports/samd/boards/MINISAM_M4/board.json
+++ b/ports/samd/boards/MINISAM_M4/board.json
@@ -3,7 +3,11 @@
         "../deploy.md"
     ],
     "docs": "",
-    "features": [],
+    "features": [
+        "Micro USB",
+        "RGB LED",
+        "SPI Flash"
+    ],
     "images": [
         "mini_sam_m4.jpg"
     ],
diff --git a/ports/samd/boards/SAMD21_XPLAINED_PRO/board.json b/ports/samd/boards/SAMD21_XPLAINED_PRO/board.json
index 0564e3f82ac59..4d22c42bad58f 100644
--- a/ports/samd/boards/SAMD21_XPLAINED_PRO/board.json
+++ b/ports/samd/boards/SAMD21_XPLAINED_PRO/board.json
@@ -3,7 +3,10 @@
         "../deploy.md"
     ],
     "docs": "",
-    "features": [],
+    "features": [
+        "Micro USB",
+        "SPI Flash"
+    ],
     "images": ["2033-atsamd21-xpro.jpg"],
     "mcu": "samd21",
     "product": "SAMD21 Xplained Pro",

From 3b011d5ef9f8f965ef1792e358976ba5e33b8182 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 28 Oct 2021 15:08:46 +1100
Subject: [PATCH 1370/3533] github/workflows: Add new workflow to build ports
 download metadata.

Signed-off-by: Damien George <damien@micropython.org>
---
 .github/workflows/ports.yml | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 .github/workflows/ports.yml

diff --git a/.github/workflows/ports.yml b/.github/workflows/ports.yml
new file mode 100644
index 0000000000000..e9e6de284cfae
--- /dev/null
+++ b/.github/workflows/ports.yml
@@ -0,0 +1,18 @@
+name: Build ports metadata
+
+on:
+  push:
+  pull_request:
+    paths:
+      - '.github/workflows/*.yml'
+      - 'tools/**'
+      - ports/**
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Build ports download metadata
+      run: mkdir boards && ./tools/autobuild/build-downloads.py . ./boards

From b4de39c43c85a63037422e4246c69320f50ad67f Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 1 Nov 2021 14:17:22 +1100
Subject: [PATCH 1371/3533] bare-arm/mpconfigport.h: Use
 MICROPY_CONFIG_ROM_LEVEL_MINIMUM.

To simplify the config.  This commit does not change the build.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/bare-arm/mpconfigport.h | 37 ++++++++++++-----------------------
 1 file changed, 13 insertions(+), 24 deletions(-)

diff --git a/ports/bare-arm/mpconfigport.h b/ports/bare-arm/mpconfigport.h
index 3bebc31594c27..1a6466ccf4766 100644
--- a/ports/bare-arm/mpconfigport.h
+++ b/ports/bare-arm/mpconfigport.h
@@ -28,38 +28,27 @@
 
 // Options to control how MicroPython is built
 
+// Use the minimal starting configuration (disables all optional features).
+#define MICROPY_CONFIG_ROM_LEVEL                (MICROPY_CONFIG_ROM_LEVEL_MINIMUM)
+
 // Memory allocation policy
-#define MICROPY_QSTR_BYTES_IN_HASH              (1)
+#define MICROPY_GC_ALLOC_THRESHOLD              (1)
 
 // Compiler configuration
-#define MICROPY_COMP_CONST                      (0)
-#define MICROPY_COMP_DOUBLE_TUPLE_ASSIGN        (0)
+#define MICROPY_ENABLE_COMPILER                 (1)
+#define MICROPY_COMP_CONST_FOLDING              (1)
+#define MICROPY_COMP_CONST_LITERAL              (1)
 
 // Python internal features
-#define MICROPY_ENABLE_EXTERNAL_IMPORT          (0)
 #define MICROPY_ERROR_REPORTING                 (MICROPY_ERROR_REPORTING_NONE)
-#define MICROPY_CPYTHON_COMPAT                  (0)
-#define MICROPY_MODULE_GETATTR                  (0)
-#define MICROPY_BUILTIN_METHOD_CHECK_SELF_ARG   (0)
+#define MICROPY_FULL_CHECKS                     (1)
 
 // Fine control over Python builtins, classes, modules, etc
-#define MICROPY_PY_ASYNC_AWAIT                  (0)
-#define MICROPY_PY_ASSIGN_EXPR                  (0)
-#define MICROPY_PY_BUILTINS_STR_COUNT           (0)
-#define MICROPY_PY_BUILTINS_STR_OP_MODULO       (0)
-#define MICROPY_PY_BUILTINS_BYTEARRAY           (0)
-#define MICROPY_PY_BUILTINS_DICT_FROMKEYS       (0)
-#define MICROPY_PY_BUILTINS_SET                 (0)
-#define MICROPY_PY_BUILTINS_SLICE               (0)
-#define MICROPY_PY_BUILTINS_PROPERTY            (0)
-#define MICROPY_PY_BUILTINS_ENUMERATE           (0)
-#define MICROPY_PY_BUILTINS_REVERSED            (0)
-#define MICROPY_PY___FILE__                     (0)
-#define MICROPY_PY_ARRAY                        (0)
-#define MICROPY_PY_COLLECTIONS                  (0)
-#define MICROPY_PY_IO                           (0)
-#define MICROPY_PY_STRUCT                       (0)
-#define MICROPY_PY_SYS                          (0)
+#define MICROPY_MULTIPLE_INHERITANCE            (1)
+#define MICROPY_PY_GENERATOR_PEND_THROW         (1)
+#define MICROPY_PY_BUILTINS_RANGE_ATTRS         (1)
+#define MICROPY_PY_BUILTINS_FILTER              (1)
+#define MICROPY_PY_BUILTINS_MIN_MAX             (1)
 
 // Type definitions for the specific machine
 

From ad17d9f0014bff0aab54365f6decc70bad42b138 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 1 Nov 2021 14:23:06 +1100
Subject: [PATCH 1372/3533] bare-arm/mpconfigport.h: Disable remaining optional
 features.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/bare-arm/README.md      |  2 +-
 ports/bare-arm/mpconfigport.h | 13 -------------
 2 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/ports/bare-arm/README.md b/ports/bare-arm/README.md
index dfa5534d598f9..37e373e2b6cd4 100644
--- a/ports/bare-arm/README.md
+++ b/ports/bare-arm/README.md
@@ -18,4 +18,4 @@ compiled and executed when the firmware starts.  They produce output on the
 system's stdout.
 
 The size of the firmware (the machine code that is programmed to the
-microcontroller's flash/ROM) is currently around 57900 bytes.
+microcontroller's flash/ROM) is currently around 56500 bytes.
diff --git a/ports/bare-arm/mpconfigport.h b/ports/bare-arm/mpconfigport.h
index 1a6466ccf4766..65bb67f7b9a70 100644
--- a/ports/bare-arm/mpconfigport.h
+++ b/ports/bare-arm/mpconfigport.h
@@ -31,24 +31,11 @@
 // Use the minimal starting configuration (disables all optional features).
 #define MICROPY_CONFIG_ROM_LEVEL                (MICROPY_CONFIG_ROM_LEVEL_MINIMUM)
 
-// Memory allocation policy
-#define MICROPY_GC_ALLOC_THRESHOLD              (1)
-
 // Compiler configuration
 #define MICROPY_ENABLE_COMPILER                 (1)
-#define MICROPY_COMP_CONST_FOLDING              (1)
-#define MICROPY_COMP_CONST_LITERAL              (1)
 
 // Python internal features
 #define MICROPY_ERROR_REPORTING                 (MICROPY_ERROR_REPORTING_NONE)
-#define MICROPY_FULL_CHECKS                     (1)
-
-// Fine control over Python builtins, classes, modules, etc
-#define MICROPY_MULTIPLE_INHERITANCE            (1)
-#define MICROPY_PY_GENERATOR_PEND_THROW         (1)
-#define MICROPY_PY_BUILTINS_RANGE_ATTRS         (1)
-#define MICROPY_PY_BUILTINS_FILTER              (1)
-#define MICROPY_PY_BUILTINS_MIN_MAX             (1)
 
 // Type definitions for the specific machine
 

From 0e236eef083ce36cf821a663cf0b3092055cf084 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Wed, 15 Sep 2021 23:18:23 +1000
Subject: [PATCH 1373/3533] py/mpconfig.h: Define the "extra" feature level.

Some of these will later be moved to CORE or BASIC, but EXTRA is a good
starting point based on what stm32 uses.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 py/mpconfig.h | 142 +++++++++++++++++++++++++-------------------------
 1 file changed, 71 insertions(+), 71 deletions(-)

diff --git a/py/mpconfig.h b/py/mpconfig.h
index d20ad0448005b..4aea8f7ba96b6 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -440,7 +440,7 @@
 
 // Whether to enable lookup of constants in modules; eg module.CONST
 #ifndef MICROPY_COMP_MODULE_CONST
-#define MICROPY_COMP_MODULE_CONST (0)
+#define MICROPY_COMP_MODULE_CONST (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
 #endif
 
 // Whether to enable constant optimisation; id = const(value)
@@ -457,13 +457,13 @@
 // Whether to enable optimisation of: a, b, c = d, e, f
 // Requires MICROPY_COMP_DOUBLE_TUPLE_ASSIGN and costs 68 bytes (Thumb2)
 #ifndef MICROPY_COMP_TRIPLE_TUPLE_ASSIGN
-#define MICROPY_COMP_TRIPLE_TUPLE_ASSIGN (0)
+#define MICROPY_COMP_TRIPLE_TUPLE_ASSIGN (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
 #endif
 
 // Whether to enable optimisation of: return a if b else c
 // Costs about 80 bytes (Thumb2) and saves 2 bytes of bytecode for each use
 #ifndef MICROPY_COMP_RETURN_IF_EXPR
-#define MICROPY_COMP_RETURN_IF_EXPR (0)
+#define MICROPY_COMP_RETURN_IF_EXPR (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
 #endif
 
 /*****************************************************************************/
@@ -521,7 +521,7 @@
 // Optimise the fast path for loading attributes from instance types. Increases
 // Thumb2 code size by about 48 bytes.
 #ifndef MICROPY_OPT_LOAD_ATTR_FAST_PATH
-#define MICROPY_OPT_LOAD_ATTR_FAST_PATH (0)
+#define MICROPY_OPT_LOAD_ATTR_FAST_PATH (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
 #endif
 
 // Use extra RAM to cache map lookups by remembering the likely location of
@@ -530,7 +530,7 @@
 // performance improvement on benchmarks involving lots of attribute access
 // or dictionary lookup.
 #ifndef MICROPY_OPT_MAP_LOOKUP_CACHE
-#define MICROPY_OPT_MAP_LOOKUP_CACHE (0)
+#define MICROPY_OPT_MAP_LOOKUP_CACHE (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
 #endif
 
 // How much RAM (in bytes) to use for the map lookup cache.
@@ -541,13 +541,13 @@
 // Whether to use fast versions of bitwise operations (and, or, xor) when the
 // arguments are both positive.  Increases Thumb2 code size by about 250 bytes.
 #ifndef MICROPY_OPT_MPZ_BITWISE
-#define MICROPY_OPT_MPZ_BITWISE (0)
+#define MICROPY_OPT_MPZ_BITWISE (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
 #endif
 
 
 // Whether math.factorial is large, fast and recursive (1) or small and slow (0).
 #ifndef MICROPY_OPT_MATH_FACTORIAL
-#define MICROPY_OPT_MATH_FACTORIAL (0)
+#define MICROPY_OPT_MATH_FACTORIAL (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
 #endif
 
 /*****************************************************************************/
@@ -604,7 +604,7 @@
 
 // Whether to enable finalisers in the garbage collector (ie call __del__)
 #ifndef MICROPY_ENABLE_FINALISER
-#define MICROPY_ENABLE_FINALISER (0)
+#define MICROPY_ENABLE_FINALISER (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
 #endif
 
 // Whether to enable a separate allocator for the Python stack.
@@ -621,7 +621,7 @@
 // Whether to check C stack usage. C stack used for calling Python functions,
 // etc. Not checking means segfault on overflow.
 #ifndef MICROPY_STACK_CHECK
-#define MICROPY_STACK_CHECK (0)
+#define MICROPY_STACK_CHECK (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
 #endif
 
 // Whether to have an emergency exception buffer
@@ -636,7 +636,7 @@
 
 // Whether to provide the mp_kbd_exception object, and micropython.kbd_intr function
 #ifndef MICROPY_KBD_EXCEPTION
-#define MICROPY_KBD_EXCEPTION (0)
+#define MICROPY_KBD_EXCEPTION (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
 #endif
 
 // Prefer to raise KeyboardInterrupt asynchronously (from signal or interrupt
@@ -647,17 +647,17 @@
 
 // Whether to include REPL helper function
 #ifndef MICROPY_HELPER_REPL
-#define MICROPY_HELPER_REPL (0)
+#define MICROPY_HELPER_REPL (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
 #endif
 
 // Allow enabling debug prints after each REPL line
 #ifndef MICROPY_REPL_INFO
-#define MICROPY_REPL_INFO (0)
+#define MICROPY_REPL_INFO (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
 #endif
 
 // Whether to include emacs-style readline behavior in REPL
 #ifndef MICROPY_REPL_EMACS_KEYS
-#define MICROPY_REPL_EMACS_KEYS (0)
+#define MICROPY_REPL_EMACS_KEYS (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
 #endif
 
 // Whether to include emacs-style word movement/kill readline behavior in REPL.
@@ -677,7 +677,7 @@
 
 // Whether to implement auto-indent in REPL
 #ifndef MICROPY_REPL_AUTO_INDENT
-#define MICROPY_REPL_AUTO_INDENT (0)
+#define MICROPY_REPL_AUTO_INDENT (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
 #endif
 
 // Whether port requires event-driven REPL functions
@@ -706,7 +706,7 @@ typedef long long mp_longint_impl_t;
 // Whether to include information in the byte code to determine source
 // line number (increases RAM usage, but doesn't slow byte code execution)
 #ifndef MICROPY_ENABLE_SOURCE_LINE
-#define MICROPY_ENABLE_SOURCE_LINE (0)
+#define MICROPY_ENABLE_SOURCE_LINE (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
 #endif
 
 // Whether to include doc strings (increases RAM usage)
@@ -800,7 +800,7 @@ typedef double mp_float_t;
 
 // Whether POSIX-semantics non-blocking streams are supported
 #ifndef MICROPY_STREAMS_NON_BLOCK
-#define MICROPY_STREAMS_NON_BLOCK (0)
+#define MICROPY_STREAMS_NON_BLOCK (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
 #endif
 
 // Whether to provide stream functions with POSIX-like signatures
@@ -811,7 +811,7 @@ typedef double mp_float_t;
 
 // Whether to call __init__ when importing builtin modules for the first time
 #ifndef MICROPY_MODULE_BUILTIN_INIT
-#define MICROPY_MODULE_BUILTIN_INIT (0)
+#define MICROPY_MODULE_BUILTIN_INIT (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
 #endif
 
 // Whether to support module-level __getattr__ (see PEP 562)
@@ -821,7 +821,7 @@ typedef double mp_float_t;
 
 // Whether module weak links are supported
 #ifndef MICROPY_MODULE_WEAK_LINKS
-#define MICROPY_MODULE_WEAK_LINKS (0)
+#define MICROPY_MODULE_WEAK_LINKS (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
 #endif
 
 // Whether frozen modules are supported in the form of strings
@@ -841,7 +841,7 @@ typedef double mp_float_t;
 
 // Whether you can override builtins in the builtins module
 #ifndef MICROPY_CAN_OVERRIDE_BUILTINS
-#define MICROPY_CAN_OVERRIDE_BUILTINS (0)
+#define MICROPY_CAN_OVERRIDE_BUILTINS (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
 #endif
 
 // Whether to check that the "self" argument of a builtin method has the
@@ -865,7 +865,7 @@ typedef double mp_float_t;
 
 // Support for internal scheduler
 #ifndef MICROPY_ENABLE_SCHEDULER
-#define MICROPY_ENABLE_SCHEDULER (0)
+#define MICROPY_ENABLE_SCHEDULER (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
 #endif
 
 // Maximum number of entries in the scheduler
@@ -900,21 +900,21 @@ typedef double mp_float_t;
 
 // Whether to implement attributes on functions
 #ifndef MICROPY_PY_FUNCTION_ATTRS
-#define MICROPY_PY_FUNCTION_ATTRS (0)
+#define MICROPY_PY_FUNCTION_ATTRS (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
 #endif
 
 // Whether to support the descriptors __get__, __set__, __delete__
 // This costs some code size and makes load/store/delete of instance
 // attributes slower for the classes that use this feature
 #ifndef MICROPY_PY_DESCRIPTORS
-#define MICROPY_PY_DESCRIPTORS (0)
+#define MICROPY_PY_DESCRIPTORS (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
 #endif
 
 // Whether to support class __delattr__ and __setattr__ methods
 // This costs some code size and makes store/delete of instance
 // attributes slower for the classes that use this feature
 #ifndef MICROPY_PY_DELATTR_SETATTR
-#define MICROPY_PY_DELATTR_SETATTR (0)
+#define MICROPY_PY_DELATTR_SETATTR (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
 #endif
 
 // Support for async/await/async for/async with
@@ -924,7 +924,7 @@ typedef double mp_float_t;
 
 // Support for literal string interpolation, f-strings (see PEP 498, Python 3.6+)
 #ifndef MICROPY_PY_FSTRINGS
-#define MICROPY_PY_FSTRINGS (0)
+#define MICROPY_PY_FSTRINGS (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
 #endif
 
 // Support for assignment expressions with := (see PEP 572, Python 3.8+)
@@ -948,7 +948,7 @@ typedef double mp_float_t;
 
 // Whether str object is proper unicode
 #ifndef MICROPY_PY_BUILTINS_STR_UNICODE
-#define MICROPY_PY_BUILTINS_STR_UNICODE (0)
+#define MICROPY_PY_BUILTINS_STR_UNICODE (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
 #endif
 
 // Whether to check for valid UTF-8 when converting bytes to str
@@ -958,7 +958,7 @@ typedef double mp_float_t;
 
 // Whether str.center() method provided
 #ifndef MICROPY_PY_BUILTINS_STR_CENTER
-#define MICROPY_PY_BUILTINS_STR_CENTER (0)
+#define MICROPY_PY_BUILTINS_STR_CENTER (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
 #endif
 
 // Whether str.count() method provided
@@ -973,12 +973,12 @@ typedef double mp_float_t;
 
 // Whether str.partition()/str.rpartition() method provided
 #ifndef MICROPY_PY_BUILTINS_STR_PARTITION
-#define MICROPY_PY_BUILTINS_STR_PARTITION (0)
+#define MICROPY_PY_BUILTINS_STR_PARTITION (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
 #endif
 
 // Whether str.splitlines() method provided
 #ifndef MICROPY_PY_BUILTINS_STR_SPLITLINES
-#define MICROPY_PY_BUILTINS_STR_SPLITLINES (0)
+#define MICROPY_PY_BUILTINS_STR_SPLITLINES (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
 #endif
 
 // Whether to support bytearray object
@@ -993,7 +993,7 @@ typedef double mp_float_t;
 
 // Whether to support memoryview object
 #ifndef MICROPY_PY_BUILTINS_MEMORYVIEW
-#define MICROPY_PY_BUILTINS_MEMORYVIEW (0)
+#define MICROPY_PY_BUILTINS_MEMORYVIEW (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
 #endif
 
 // Whether to support memoryview.itemsize attribute
@@ -1014,17 +1014,17 @@ typedef double mp_float_t;
 // Whether to support slice attribute read access,
 // i.e. slice.start, slice.stop, slice.step
 #ifndef MICROPY_PY_BUILTINS_SLICE_ATTRS
-#define MICROPY_PY_BUILTINS_SLICE_ATTRS (0)
+#define MICROPY_PY_BUILTINS_SLICE_ATTRS (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
 #endif
 
 // Whether to support the .indices(len) method on slice objects
 #ifndef MICROPY_PY_BUILTINS_SLICE_INDICES
-#define MICROPY_PY_BUILTINS_SLICE_INDICES (0)
+#define MICROPY_PY_BUILTINS_SLICE_INDICES (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
 #endif
 
 // Whether to support frozenset object
 #ifndef MICROPY_PY_BUILTINS_FROZENSET
-#define MICROPY_PY_BUILTINS_FROZENSET (0)
+#define MICROPY_PY_BUILTINS_FROZENSET (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
 #endif
 
 // Whether to support property object
@@ -1053,7 +1053,7 @@ typedef double mp_float_t;
 
 // Whether to support rounding of integers (incl bignum); eg round(123,-1)=120
 #ifndef MICROPY_PY_BUILTINS_ROUND_INT
-#define MICROPY_PY_BUILTINS_ROUND_INT (0)
+#define MICROPY_PY_BUILTINS_ROUND_INT (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
 #endif
 
 // Whether to support complete set of special methods for user
@@ -1062,7 +1062,7 @@ typedef double mp_float_t;
 // "Reverse" methods are controlled by
 // MICROPY_PY_REVERSE_SPECIAL_METHODS below.
 #ifndef MICROPY_PY_ALL_SPECIAL_METHODS
-#define MICROPY_PY_ALL_SPECIAL_METHODS (0)
+#define MICROPY_PY_ALL_SPECIAL_METHODS (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
 #endif
 
 // Whether to support all inplace arithmetic operarion methods
@@ -1075,12 +1075,12 @@ typedef double mp_float_t;
 // (__radd__, etc.). Additionally gated by
 // MICROPY_PY_ALL_SPECIAL_METHODS.
 #ifndef MICROPY_PY_REVERSE_SPECIAL_METHODS
-#define MICROPY_PY_REVERSE_SPECIAL_METHODS (0)
+#define MICROPY_PY_REVERSE_SPECIAL_METHODS (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
 #endif
 
 // Whether to support compile function
 #ifndef MICROPY_PY_BUILTINS_COMPILE
-#define MICROPY_PY_BUILTINS_COMPILE (0)
+#define MICROPY_PY_BUILTINS_COMPILE (MICROPY_ENABLE_COMPILER && MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
 #endif
 
 // Whether to support enumerate function(type)
@@ -1096,7 +1096,7 @@ typedef double mp_float_t;
 
 // Whether to support the Python 2 execfile function
 #ifndef MICROPY_PY_BUILTINS_EXECFILE
-#define MICROPY_PY_BUILTINS_EXECFILE (0)
+#define MICROPY_PY_BUILTINS_EXECFILE (MICROPY_ENABLE_COMPILER && MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
 #endif
 
 // Whether to support filter function(type)
@@ -1111,13 +1111,13 @@ typedef double mp_float_t;
 
 // Whether to define "NotImplemented" special constant
 #ifndef MICROPY_PY_BUILTINS_NOTIMPLEMENTED
-#define MICROPY_PY_BUILTINS_NOTIMPLEMENTED (0)
+#define MICROPY_PY_BUILTINS_NOTIMPLEMENTED (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
 #endif
 
 // Whether to provide the built-in input() function. The implementation of this
 // uses shared/readline, so can only be enabled if the port uses this readline.
 #ifndef MICROPY_PY_BUILTINS_INPUT
-#define MICROPY_PY_BUILTINS_INPUT (0)
+#define MICROPY_PY_BUILTINS_INPUT (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
 #endif
 
 // Whether to support min/max functions
@@ -1127,12 +1127,12 @@ typedef double mp_float_t;
 
 // Support for calls to pow() with 3 integer arguments
 #ifndef MICROPY_PY_BUILTINS_POW3
-#define MICROPY_PY_BUILTINS_POW3 (0)
+#define MICROPY_PY_BUILTINS_POW3 (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
 #endif
 
 // Whether to provide the help function
 #ifndef MICROPY_PY_BUILTINS_HELP
-#define MICROPY_PY_BUILTINS_HELP (0)
+#define MICROPY_PY_BUILTINS_HELP (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
 #endif
 
 // Use this to configure the help text shown for help().  It should be a
@@ -1143,7 +1143,7 @@ typedef double mp_float_t;
 
 // Add the ability to list the available modules when executing help('modules')
 #ifndef MICROPY_PY_BUILTINS_HELP_MODULES
-#define MICROPY_PY_BUILTINS_HELP_MODULES (0)
+#define MICROPY_PY_BUILTINS_HELP_MODULES (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
 #endif
 
 // Whether to set __file__ for imported modules
@@ -1153,7 +1153,7 @@ typedef double mp_float_t;
 
 // Whether to provide mem-info related functions in micropython module
 #ifndef MICROPY_PY_MICROPYTHON_MEM_INFO
-#define MICROPY_PY_MICROPYTHON_MEM_INFO (0)
+#define MICROPY_PY_MICROPYTHON_MEM_INFO (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
 #endif
 
 // Whether to provide "micropython.stack_use" function
@@ -1176,7 +1176,7 @@ typedef double mp_float_t;
 // Whether to support slice assignments for array (and bytearray).
 // This is rarely used, but adds ~0.5K of code.
 #ifndef MICROPY_PY_ARRAY_SLICE_ASSIGN
-#define MICROPY_PY_ARRAY_SLICE_ASSIGN (0)
+#define MICROPY_PY_ARRAY_SLICE_ASSIGN (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
 #endif
 
 // Whether to support attrtuple type (MicroPython extension)
@@ -1192,12 +1192,12 @@ typedef double mp_float_t;
 
 // Whether to provide "ucollections.deque" type
 #ifndef MICROPY_PY_COLLECTIONS_DEQUE
-#define MICROPY_PY_COLLECTIONS_DEQUE (0)
+#define MICROPY_PY_COLLECTIONS_DEQUE (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
 #endif
 
 // Whether to provide "collections.OrderedDict" type
 #ifndef MICROPY_PY_COLLECTIONS_ORDEREDDICT
-#define MICROPY_PY_COLLECTIONS_ORDEREDDICT (0)
+#define MICROPY_PY_COLLECTIONS_ORDEREDDICT (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
 #endif
 
 // Whether to provide the _asdict function for namedtuple
@@ -1212,17 +1212,17 @@ typedef double mp_float_t;
 
 // Whether to provide special math functions: math.{erf,erfc,gamma,lgamma}
 #ifndef MICROPY_PY_MATH_SPECIAL_FUNCTIONS
-#define MICROPY_PY_MATH_SPECIAL_FUNCTIONS (0)
+#define MICROPY_PY_MATH_SPECIAL_FUNCTIONS (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
 #endif
 
 // Whether to provide math.factorial function
 #ifndef MICROPY_PY_MATH_FACTORIAL
-#define MICROPY_PY_MATH_FACTORIAL (0)
+#define MICROPY_PY_MATH_FACTORIAL (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
 #endif
 
 // Whether to provide math.isclose function
 #ifndef MICROPY_PY_MATH_ISCLOSE
-#define MICROPY_PY_MATH_ISCLOSE (0)
+#define MICROPY_PY_MATH_ISCLOSE (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
 #endif
 
 // Whether to provide fix for atan2 Inf handling.
@@ -1247,7 +1247,7 @@ typedef double mp_float_t;
 
 // Whether to provide "cmath" module
 #ifndef MICROPY_PY_CMATH
-#define MICROPY_PY_CMATH (0)
+#define MICROPY_PY_CMATH (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
 #endif
 
 // Whether to provide "gc" module
@@ -1267,7 +1267,7 @@ typedef double mp_float_t;
 
 // Whether to provide "io.IOBase" class to support user streams
 #ifndef MICROPY_PY_IO_IOBASE
-#define MICROPY_PY_IO_IOBASE (0)
+#define MICROPY_PY_IO_IOBASE (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
 #endif
 
 // Whether to provide "uio.resource_stream()" function with
@@ -1283,7 +1283,7 @@ typedef double mp_float_t;
 
 // Whether to provide "io.FileIO" class
 #ifndef MICROPY_PY_IO_FILEIO
-#define MICROPY_PY_IO_FILEIO (0)
+#define MICROPY_PY_IO_FILEIO (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
 #endif
 
 // Whether to provide "io.BytesIO" class
@@ -1308,7 +1308,7 @@ typedef double mp_float_t;
 
 // Whether to provide "sys.maxsize" constant
 #ifndef MICROPY_PY_SYS_MAXSIZE
-#define MICROPY_PY_SYS_MAXSIZE (0)
+#define MICROPY_PY_SYS_MAXSIZE (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
 #endif
 
 // Whether to provide "sys.modules" dictionary
@@ -1344,18 +1344,18 @@ typedef double mp_float_t;
 
 // Whether to provide sys.{stdin,stdout,stderr} objects
 #ifndef MICROPY_PY_SYS_STDFILES
-#define MICROPY_PY_SYS_STDFILES (0)
+#define MICROPY_PY_SYS_STDFILES (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
 #endif
 
 // Whether to provide sys.{stdin,stdout,stderr}.buffer object
 // This is implemented per-port
 #ifndef MICROPY_PY_SYS_STDIO_BUFFER
-#define MICROPY_PY_SYS_STDIO_BUFFER (0)
+#define MICROPY_PY_SYS_STDIO_BUFFER (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
 #endif
 
 // Whether to provide "uerrno" module
 #ifndef MICROPY_PY_UERRNO
-#define MICROPY_PY_UERRNO (0)
+#define MICROPY_PY_UERRNO (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
 #endif
 
 // Whether to provide the uerrno.errorcode dict
@@ -1365,7 +1365,7 @@ typedef double mp_float_t;
 
 // Whether to provide "uselect" module (baremetal implementation)
 #ifndef MICROPY_PY_USELECT
-#define MICROPY_PY_USELECT (0)
+#define MICROPY_PY_USELECT (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
 #endif
 
 // Whether to enable the select() function in the "uselect" module (baremetal
@@ -1411,11 +1411,11 @@ typedef double mp_float_t;
 // Extended modules
 
 #ifndef MICROPY_PY_UASYNCIO
-#define MICROPY_PY_UASYNCIO (0)
+#define MICROPY_PY_UASYNCIO (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
 #endif
 
 #ifndef MICROPY_PY_UCTYPES
-#define MICROPY_PY_UCTYPES (0)
+#define MICROPY_PY_UCTYPES (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
 #endif
 
 // Whether to provide SHORT, INT, LONG, etc. types in addition to
@@ -1425,11 +1425,11 @@ typedef double mp_float_t;
 #endif
 
 #ifndef MICROPY_PY_UZLIB
-#define MICROPY_PY_UZLIB (0)
+#define MICROPY_PY_UZLIB (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
 #endif
 
 #ifndef MICROPY_PY_UJSON
-#define MICROPY_PY_UJSON (0)
+#define MICROPY_PY_UJSON (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
 #endif
 
 // Whether to support the "separators" argument to dump, dumps
@@ -1438,7 +1438,7 @@ typedef double mp_float_t;
 #endif
 
 #ifndef MICROPY_PY_URE
-#define MICROPY_PY_URE (0)
+#define MICROPY_PY_URE (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
 #endif
 
 #ifndef MICROPY_PY_URE_DEBUG
@@ -1454,20 +1454,20 @@ typedef double mp_float_t;
 #endif
 
 #ifndef MICROPY_PY_URE_SUB
-#define MICROPY_PY_URE_SUB (0)
+#define MICROPY_PY_URE_SUB (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
 #endif
 
 #ifndef MICROPY_PY_UHEAPQ
-#define MICROPY_PY_UHEAPQ (0)
+#define MICROPY_PY_UHEAPQ (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
 #endif
 
-// Optimized heap queue for relative timestamps
+// Optimized heap queue for relative timestamps (only used by uasyncio v2)
 #ifndef MICROPY_PY_UTIMEQ
 #define MICROPY_PY_UTIMEQ (0)
 #endif
 
 #ifndef MICROPY_PY_UHASHLIB
-#define MICROPY_PY_UHASHLIB (0)
+#define MICROPY_PY_UHASHLIB (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
 #endif
 
 #ifndef MICROPY_PY_UHASHLIB_MD5
@@ -1496,21 +1496,21 @@ typedef double mp_float_t;
 #endif
 
 #ifndef MICROPY_PY_UBINASCII
-#define MICROPY_PY_UBINASCII (0)
+#define MICROPY_PY_UBINASCII (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
 #endif
 
 // Depends on MICROPY_PY_UZLIB
 #ifndef MICROPY_PY_UBINASCII_CRC32
-#define MICROPY_PY_UBINASCII_CRC32 (0)
+#define MICROPY_PY_UBINASCII_CRC32 (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
 #endif
 
 #ifndef MICROPY_PY_URANDOM
-#define MICROPY_PY_URANDOM (0)
+#define MICROPY_PY_URANDOM (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
 #endif
 
 // Whether to include: randrange, randint, choice, random, uniform
 #ifndef MICROPY_PY_URANDOM_EXTRA_FUNCS
-#define MICROPY_PY_URANDOM_EXTRA_FUNCS (0)
+#define MICROPY_PY_URANDOM_EXTRA_FUNCS (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
 #endif
 
 #ifndef MICROPY_PY_MACHINE
@@ -1556,7 +1556,7 @@ typedef double mp_float_t;
 #endif
 
 #ifndef MICROPY_PY_FRAMEBUF
-#define MICROPY_PY_FRAMEBUF (0)
+#define MICROPY_PY_FRAMEBUF (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
 #endif
 
 #ifndef MICROPY_PY_BTREE

From 30418813530ee3239c7d7a649ee9fafa8af1f783 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Wed, 15 Sep 2021 23:18:35 +1000
Subject: [PATCH 1374/3533] stm32/mpconfigport.h: Use the "extra" feature
 level.

This commit is a no-op change.  Future improvements can come from making
individual boards use CORE or BASIC.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/stm32/mpconfigport.h | 122 +++++--------------------------------
 1 file changed, 14 insertions(+), 108 deletions(-)

diff --git a/ports/stm32/mpconfigport.h b/ports/stm32/mpconfigport.h
index 6a9e8bf4144e4..f96d175748fff 100644
--- a/ports/stm32/mpconfigport.h
+++ b/ports/stm32/mpconfigport.h
@@ -31,6 +31,10 @@
 #include "mpconfigboard.h"
 #include "mpconfigboard_common.h"
 
+#ifndef MICROPY_CONFIG_ROM_LEVEL
+#define MICROPY_CONFIG_ROM_LEVEL (MICROPY_CONFIG_ROM_LEVEL_EXTRA_FEATURES)
+#endif
+
 // memory allocation policies
 #ifndef MICROPY_GC_STACK_ENTRY_TYPE
 #if MICROPY_HW_SDRAM_SIZE
@@ -41,6 +45,16 @@
 #endif
 #define MICROPY_ALLOC_PATH_MAX      (128)
 
+// optimisations
+#ifndef MICROPY_OPT_COMPUTED_GOTO
+#define MICROPY_OPT_COMPUTED_GOTO   (1)
+#endif
+
+// Don't enable lookup cache on M0 (low RAM)
+#ifndef MICROPY_OPT_MAP_LOOKUP_CACHE
+#define MICROPY_OPT_MAP_LOOKUP_CACHE (__CORTEX_M > 0)
+#endif
+
 // emitters
 #define MICROPY_PERSISTENT_CODE_LOAD (1)
 #ifndef MICROPY_EMIT_THUMB
@@ -50,146 +64,41 @@
 #define MICROPY_EMIT_INLINE_THUMB   (1)
 #endif
 
-// compiler configuration
-#define MICROPY_COMP_MODULE_CONST   (1)
-#define MICROPY_COMP_TRIPLE_TUPLE_ASSIGN (1)
-#define MICROPY_COMP_RETURN_IF_EXPR (1)
-
-// optimisations
-#ifndef MICROPY_OPT_COMPUTED_GOTO
-#define MICROPY_OPT_COMPUTED_GOTO   (1)
-#endif
-#ifndef MICROPY_OPT_LOAD_ATTR_FAST_PATH
-#define MICROPY_OPT_LOAD_ATTR_FAST_PATH (1)
-#endif
-#ifndef MICROPY_OPT_MAP_LOOKUP_CACHE
-#define MICROPY_OPT_MAP_LOOKUP_CACHE (__CORTEX_M > 0)
-#endif
-#define MICROPY_OPT_MPZ_BITWISE     (1)
-#define MICROPY_OPT_MATH_FACTORIAL  (1)
-
 // Python internal features
 #define MICROPY_READER_VFS          (1)
 #define MICROPY_ENABLE_GC           (1)
-#define MICROPY_ENABLE_FINALISER    (1)
-#define MICROPY_STACK_CHECK         (1)
 #define MICROPY_ENABLE_EMERGENCY_EXCEPTION_BUF (1)
 #define MICROPY_EMERGENCY_EXCEPTION_BUF_SIZE (0)
-#define MICROPY_KBD_EXCEPTION       (1)
-#define MICROPY_HELPER_REPL         (1)
-#define MICROPY_REPL_INFO           (1)
-#define MICROPY_REPL_EMACS_KEYS     (1)
-#define MICROPY_REPL_AUTO_INDENT    (1)
 #define MICROPY_LONGINT_IMPL        (MICROPY_LONGINT_IMPL_MPZ)
-#define MICROPY_ENABLE_SOURCE_LINE  (1)
 #ifndef MICROPY_FLOAT_IMPL // can be configured by each board via mpconfigboard.mk
 #define MICROPY_FLOAT_IMPL          (MICROPY_FLOAT_IMPL_FLOAT)
 #endif
-#define MICROPY_STREAMS_NON_BLOCK   (1)
-#define MICROPY_MODULE_BUILTIN_INIT (1)
-#define MICROPY_MODULE_WEAK_LINKS   (1)
-#define MICROPY_CAN_OVERRIDE_BUILTINS (1)
 #define MICROPY_USE_INTERNAL_ERRNO  (1)
-#define MICROPY_ENABLE_SCHEDULER    (1)
 #define MICROPY_SCHEDULER_DEPTH     (8)
 #define MICROPY_VFS                 (1)
 
 // control over Python builtins
-#define MICROPY_PY_FUNCTION_ATTRS   (1)
-#define MICROPY_PY_DESCRIPTORS      (1)
-#define MICROPY_PY_DELATTR_SETATTR  (1)
-#ifndef MICROPY_PY_FSTRINGS
-#define MICROPY_PY_FSTRINGS         (1)
-#endif
-#define MICROPY_PY_BUILTINS_STR_UNICODE (1)
-#define MICROPY_PY_BUILTINS_STR_CENTER (1)
-#define MICROPY_PY_BUILTINS_STR_PARTITION (1)
-#define MICROPY_PY_BUILTINS_STR_SPLITLINES (1)
-#define MICROPY_PY_BUILTINS_MEMORYVIEW (1)
-#define MICROPY_PY_BUILTINS_FROZENSET (1)
-#define MICROPY_PY_BUILTINS_SLICE_ATTRS (1)
-#define MICROPY_PY_BUILTINS_SLICE_INDICES (1)
-#define MICROPY_PY_BUILTINS_ROUND_INT (1)
-#define MICROPY_PY_ALL_SPECIAL_METHODS (1)
-#define MICROPY_PY_REVERSE_SPECIAL_METHODS (1)
-#define MICROPY_PY_BUILTINS_COMPILE (MICROPY_ENABLE_COMPILER)
-#define MICROPY_PY_BUILTINS_EXECFILE (MICROPY_ENABLE_COMPILER)
-#define MICROPY_PY_BUILTINS_NOTIMPLEMENTED (1)
-#define MICROPY_PY_BUILTINS_INPUT   (1)
-#define MICROPY_PY_BUILTINS_POW3    (1)
-#define MICROPY_PY_BUILTINS_HELP    (1)
 #ifndef MICROPY_PY_BUILTINS_HELP_TEXT
 #define MICROPY_PY_BUILTINS_HELP_TEXT stm32_help_text
 #endif
-#define MICROPY_PY_BUILTINS_HELP_MODULES (1)
-#define MICROPY_PY_MICROPYTHON_MEM_INFO (1)
-#define MICROPY_PY_ARRAY_SLICE_ASSIGN (1)
-#define MICROPY_PY_COLLECTIONS_DEQUE (1)
-#define MICROPY_PY_COLLECTIONS_ORDEREDDICT (1)
-#define MICROPY_PY_MATH_SPECIAL_FUNCTIONS (1)
-#define MICROPY_PY_MATH_ISCLOSE     (1)
-#define MICROPY_PY_MATH_FACTORIAL   (1)
-#define MICROPY_PY_CMATH            (1)
-#define MICROPY_PY_IO               (1)
-#define MICROPY_PY_IO_IOBASE        (1)
 #define MICROPY_PY_IO_FILEIO        (MICROPY_VFS_FAT || MICROPY_VFS_LFS1 || MICROPY_VFS_LFS2)
-#define MICROPY_PY_SYS_MAXSIZE      (1)
-#define MICROPY_PY_SYS_EXIT         (1)
-#define MICROPY_PY_SYS_STDFILES     (1)
-#define MICROPY_PY_SYS_STDIO_BUFFER (1)
 #ifndef MICROPY_PY_SYS_PLATFORM     // let boards override it if they want
 #define MICROPY_PY_SYS_PLATFORM     "pyboard"
 #endif
-#define MICROPY_PY_UERRNO           (1)
 #ifndef MICROPY_PY_THREAD
 #define MICROPY_PY_THREAD           (0)
 #endif
 
 // extended modules
-#ifndef MICROPY_PY_UASYNCIO
-#define MICROPY_PY_UASYNCIO         (1)
-#endif
-#ifndef MICROPY_PY_UCTYPES
-#define MICROPY_PY_UCTYPES          (1)
-#endif
-#ifndef MICROPY_PY_UZLIB
-#define MICROPY_PY_UZLIB            (1)
-#endif
-#ifndef MICROPY_PY_UJSON
-#define MICROPY_PY_UJSON            (1)
-#endif
-#ifndef MICROPY_PY_URE
-#define MICROPY_PY_URE              (1)
-#endif
-#ifndef MICROPY_PY_URE_SUB
-#define MICROPY_PY_URE_SUB          (1)
-#endif
-#ifndef MICROPY_PY_UHEAPQ
-#define MICROPY_PY_UHEAPQ           (1)
-#endif
-#ifndef MICROPY_PY_UHASHLIB
-#define MICROPY_PY_UHASHLIB         (1)
-#endif
 #define MICROPY_PY_UHASHLIB_MD5     (MICROPY_PY_USSL)
 #define MICROPY_PY_UHASHLIB_SHA1    (MICROPY_PY_USSL)
 #define MICROPY_PY_UCRYPTOLIB       (MICROPY_PY_USSL)
-#ifndef MICROPY_PY_UBINASCII
-#define MICROPY_PY_UBINASCII        (1)
-#define MICROPY_PY_UBINASCII_CRC32  (1)
-#endif
 #ifndef MICROPY_PY_UOS
 #define MICROPY_PY_UOS              (1)
 #endif
 #define MICROPY_PY_OS_DUPTERM       (3)
 #define MICROPY_PY_UOS_DUPTERM_BUILTIN_STREAM (1)
-#ifndef MICROPY_PY_URANDOM
-#define MICROPY_PY_URANDOM          (1)
 #define MICROPY_PY_URANDOM_SEED_INIT_FUNC (rng_get())
-#endif
-#ifndef MICROPY_PY_URANDOM_EXTRA_FUNCS
-#define MICROPY_PY_URANDOM_EXTRA_FUNCS (1)
-#endif
-#define MICROPY_PY_USELECT          (1)
 #ifndef MICROPY_PY_UTIME
 #define MICROPY_PY_UTIME            (1)
 #endif
@@ -216,9 +125,6 @@
 #define MICROPY_HW_SOFTSPI_MAX_BAUDRATE (HAL_RCC_GetSysClockFreq() / 48)
 #define MICROPY_PY_UWEBSOCKET       (MICROPY_PY_LWIP)
 #define MICROPY_PY_WEBREPL          (MICROPY_PY_LWIP)
-#ifndef MICROPY_PY_FRAMEBUF
-#define MICROPY_PY_FRAMEBUF         (1)
-#endif
 #ifndef MICROPY_PY_USOCKET
 #define MICROPY_PY_USOCKET          (1)
 #endif

From b1a0ce46d10e29d8d630d70bcbeabfe36ce3b0bc Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Wed, 15 Sep 2021 23:41:40 +1000
Subject: [PATCH 1375/3533] rp2/mpconfigport.h: Use the "extra" feature level.

This commit is a no-op change to simplify existing config.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/rp2/mpconfigport.h | 78 ++++++++++------------------------------
 1 file changed, 19 insertions(+), 59 deletions(-)

diff --git a/ports/rp2/mpconfigport.h b/ports/rp2/mpconfigport.h
index cc979b5c30e93..57fedc724e654 100644
--- a/ports/rp2/mpconfigport.h
+++ b/ports/rp2/mpconfigport.h
@@ -38,6 +38,10 @@
 #define MICROPY_HW_ENABLE_UART_REPL             (0) // useful if there is no USB
 #define MICROPY_HW_ENABLE_USBDEV                (1)
 
+#ifndef MICROPY_CONFIG_ROM_LEVEL
+#define MICROPY_CONFIG_ROM_LEVEL                (MICROPY_CONFIG_ROM_LEVEL_EXTRA_FEATURES)
+#endif
+
 // Memory allocation policies
 #define MICROPY_GC_STACK_ENTRY_TYPE             uint16_t
 #define MICROPY_ALLOC_PATH_MAX                  (128)
@@ -51,84 +55,41 @@
 #define MICROPY_EMIT_INLINE_THUMB_FLOAT         (0)
 #define MICROPY_EMIT_INLINE_THUMB_ARMV7M        (0)
 
+// Features currently overriden for rp2, planned to be brought in line with
+// other ports
+#define MICROPY_COMP_MODULE_CONST               (0)
+#define MICROPY_COMP_RETURN_IF_EXPR             (0)
+#define MICROPY_COMP_TRIPLE_TUPLE_ASSIGN        (0)
+#define MICROPY_OPT_COMPUTED_GOTO               (0)
+#define MICROPY_OPT_LOAD_ATTR_FAST_PATH         (0)
+#define MICROPY_OPT_MAP_LOOKUP_CACHE            (0)
+#define MICROPY_OPT_MATH_FACTORIAL              (0)
+#define MICROPY_OPT_MPZ_BITWISE                 (0)
+#define MICROPY_PY_BUILTINS_EXECFILE            (0)
+#define MICROPY_PY_BUILTINS_NOTIMPLEMENTED      (0)
+#define MICROPY_REPL_EMACS_KEYS                 (0)
+#define MICROPY_REPL_INFO                       (0)
+
 // Python internal features
 #define MICROPY_READER_VFS                      (1)
 #define MICROPY_ENABLE_GC                       (1)
-#define MICROPY_ENABLE_FINALISER                (1)
-#define MICROPY_STACK_CHECK                     (1)
 #define MICROPY_ENABLE_EMERGENCY_EXCEPTION_BUF  (1)
-#define MICROPY_KBD_EXCEPTION                   (1)
-#define MICROPY_HELPER_REPL                     (1)
-#define MICROPY_REPL_AUTO_INDENT                (1)
 #define MICROPY_LONGINT_IMPL                    (MICROPY_LONGINT_IMPL_MPZ)
-#define MICROPY_ENABLE_SOURCE_LINE              (1)
 #define MICROPY_FLOAT_IMPL                      (MICROPY_FLOAT_IMPL_FLOAT)
-#define MICROPY_STREAMS_NON_BLOCK               (1)
-#define MICROPY_MODULE_BUILTIN_INIT             (1)
-#define MICROPY_MODULE_WEAK_LINKS               (1)
-#define MICROPY_CAN_OVERRIDE_BUILTINS           (1)
-#define MICROPY_ENABLE_SCHEDULER                (1)
 #define MICROPY_SCHEDULER_DEPTH                 (8)
 
 // Fine control over Python builtins, classes, modules, etc
-#define MICROPY_PY_FUNCTION_ATTRS               (1)
-#define MICROPY_PY_DESCRIPTORS                  (1)
-#define MICROPY_PY_DELATTR_SETATTR              (1)
-#define MICROPY_PY_FSTRINGS                     (1)
-#define MICROPY_PY_BUILTINS_STR_UNICODE         (1)
-#define MICROPY_PY_BUILTINS_STR_CENTER          (1)
-#define MICROPY_PY_BUILTINS_STR_PARTITION       (1)
-#define MICROPY_PY_BUILTINS_STR_SPLITLINES      (1)
-#define MICROPY_PY_BUILTINS_MEMORYVIEW          (1)
-#define MICROPY_PY_BUILTINS_SLICE_ATTRS         (1)
-#define MICROPY_PY_BUILTINS_SLICE_INDICES       (1)
-#define MICROPY_PY_BUILTINS_FROZENSET           (1)
-#define MICROPY_PY_BUILTINS_ROUND_INT           (1)
-#define MICROPY_PY_ALL_SPECIAL_METHODS          (1)
-#define MICROPY_PY_REVERSE_SPECIAL_METHODS      (1)
-#define MICROPY_PY_BUILTINS_COMPILE             (1)
-#define MICROPY_PY_BUILTINS_INPUT               (1)
-#define MICROPY_PY_BUILTINS_POW3                (1)
-#define MICROPY_PY_BUILTINS_HELP                (1)
 #define MICROPY_PY_BUILTINS_HELP_TEXT           rp2_help_text
-#define MICROPY_PY_BUILTINS_HELP_MODULES        (1)
-#define MICROPY_PY_MICROPYTHON_MEM_INFO         (1)
-#define MICROPY_PY_ARRAY_SLICE_ASSIGN           (1)
-#define MICROPY_PY_COLLECTIONS_DEQUE            (1)
-#define MICROPY_PY_COLLECTIONS_ORDEREDDICT      (1)
-#define MICROPY_PY_MATH_SPECIAL_FUNCTIONS       (1)
-#define MICROPY_PY_MATH_FACTORIAL               (1)
-#define MICROPY_PY_MATH_ISCLOSE                 (1)
-#define MICROPY_PY_CMATH                        (1)
-#define MICROPY_PY_IO_IOBASE                    (1)
-#define MICROPY_PY_IO_FILEIO                    (1)
-#define MICROPY_PY_SYS_MAXSIZE                  (1)
-#define MICROPY_PY_SYS_STDFILES                 (1)
-#define MICROPY_PY_SYS_STDIO_BUFFER             (1)
 #define MICROPY_PY_SYS_PLATFORM                 "rp2"
-#define MICROPY_PY_UERRNO                       (1)
 #define MICROPY_PY_THREAD                       (1)
 #define MICROPY_PY_THREAD_GIL                   (0)
 
 // Extended modules
 #define MICROPY_EPOCH_IS_1970                   (1)
-#define MICROPY_PY_UASYNCIO                     (1)
-#define MICROPY_PY_UCTYPES                      (1)
-#define MICROPY_PY_UZLIB                        (1)
-#define MICROPY_PY_UJSON                        (1)
-#define MICROPY_PY_URE                          (1)
 #define MICROPY_PY_URE_MATCH_GROUPS             (1)
 #define MICROPY_PY_URE_MATCH_SPAN_START_END     (1)
-#define MICROPY_PY_URE_SUB                      (1)
-#define MICROPY_PY_UHEAPQ                       (1)
-#define MICROPY_PY_UHASHLIB                     (1)
-#define MICROPY_PY_UBINASCII                    (1)
-#define MICROPY_PY_UBINASCII_CRC32              (1)
 #define MICROPY_PY_UTIME_MP_HAL                 (1)
-#define MICROPY_PY_URANDOM                      (1)
-#define MICROPY_PY_URANDOM_EXTRA_FUNCS          (1)
 #define MICROPY_PY_URANDOM_SEED_INIT_FUNC       (rosc_random_u32())
-#define MICROPY_PY_USELECT                      (1)
 #define MICROPY_PY_MACHINE                      (1)
 #define MICROPY_PY_MACHINE_PIN_MAKE_NEW         mp_pin_make_new
 #define MICROPY_PY_MACHINE_PULSE                (1)
@@ -141,7 +102,6 @@
 #define MICROPY_PY_MACHINE_SPI_MSB              (SPI_MSB_FIRST)
 #define MICROPY_PY_MACHINE_SPI_LSB              (SPI_LSB_FIRST)
 #define MICROPY_PY_MACHINE_SOFTSPI              (1)
-#define MICROPY_PY_FRAMEBUF                     (1)
 #define MICROPY_PY_ONEWIRE                      (1)
 #define MICROPY_VFS                             (1)
 #define MICROPY_VFS_LFS2                        (1)

From c62351fbd67e0f32e33e2066b7c07a79ac52481d Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 1 Nov 2021 15:18:22 +1100
Subject: [PATCH 1376/3533] py/mpconfig.h: Revert MICROPY_REPL_INFO to disabled
 at all levels.

This is an stm32-specific feature that's accessed via the pyb module, so
not something that will be widely enabled.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/rp2/mpconfigport.h   | 1 -
 ports/stm32/mpconfigport.h | 1 +
 py/mpconfig.h              | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/rp2/mpconfigport.h b/ports/rp2/mpconfigport.h
index 57fedc724e654..788aeb16384bc 100644
--- a/ports/rp2/mpconfigport.h
+++ b/ports/rp2/mpconfigport.h
@@ -68,7 +68,6 @@
 #define MICROPY_PY_BUILTINS_EXECFILE            (0)
 #define MICROPY_PY_BUILTINS_NOTIMPLEMENTED      (0)
 #define MICROPY_REPL_EMACS_KEYS                 (0)
-#define MICROPY_REPL_INFO                       (0)
 
 // Python internal features
 #define MICROPY_READER_VFS                      (1)
diff --git a/ports/stm32/mpconfigport.h b/ports/stm32/mpconfigport.h
index f96d175748fff..9a1b52520257f 100644
--- a/ports/stm32/mpconfigport.h
+++ b/ports/stm32/mpconfigport.h
@@ -69,6 +69,7 @@
 #define MICROPY_ENABLE_GC           (1)
 #define MICROPY_ENABLE_EMERGENCY_EXCEPTION_BUF (1)
 #define MICROPY_EMERGENCY_EXCEPTION_BUF_SIZE (0)
+#define MICROPY_REPL_INFO           (1)
 #define MICROPY_LONGINT_IMPL        (MICROPY_LONGINT_IMPL_MPZ)
 #ifndef MICROPY_FLOAT_IMPL // can be configured by each board via mpconfigboard.mk
 #define MICROPY_FLOAT_IMPL          (MICROPY_FLOAT_IMPL_FLOAT)
diff --git a/py/mpconfig.h b/py/mpconfig.h
index 4aea8f7ba96b6..596bab8d89568 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -652,7 +652,7 @@
 
 // Allow enabling debug prints after each REPL line
 #ifndef MICROPY_REPL_INFO
-#define MICROPY_REPL_INFO (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
+#define MICROPY_REPL_INFO (0)
 #endif
 
 // Whether to include emacs-style readline behavior in REPL

From 693b927687c3ac18726a5eb7b64127fc347a3c41 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Mon, 20 Sep 2021 22:43:39 +1000
Subject: [PATCH 1377/3533] rp2: Enable optimisations (comp goto, map cache,
 fast attr).

Computed goto costs 1800 bytes for 5-10% performance.

Map caching and attr fast path costs 130 bytes for up to 30%.

Net effect of those three optimisations:
bm_chaos.py         +16.059% (+/-0.09%)
bm_fannkuch.py      +11.145% (+/-0.01%)
bm_fft.py           +14.604% (+/-0.01%)
bm_float.py         +26.849% (+/-0.08%)
bm_hexiom.py        +34.039% (+/-0.03%)
bm_nqueens.py       +18.333% (+/-0.06%)
bm_pidigits.py       +4.472% (+/-0.03%)
misc_aes.py         +28.765% (+/-0.09%)
misc_mandel.py      +27.116% (+/-0.05%)
misc_pystone.py     +40.299% (+/-0.20%)
misc_raytrace.py    +22.812% (+/-0.07%)

Also enable other EXTRA-level optimisations (module const, return_if_expr,
triple_tuple_assign, factorial, mpz bitwise).

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/rp2/mpconfigport.h | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/ports/rp2/mpconfigport.h b/ports/rp2/mpconfigport.h
index 788aeb16384bc..2794fda2e16ed 100644
--- a/ports/rp2/mpconfigport.h
+++ b/ports/rp2/mpconfigport.h
@@ -55,16 +55,11 @@
 #define MICROPY_EMIT_INLINE_THUMB_FLOAT         (0)
 #define MICROPY_EMIT_INLINE_THUMB_ARMV7M        (0)
 
+// Optimisations
+#define MICROPY_OPT_COMPUTED_GOTO               (1)
+
 // Features currently overriden for rp2, planned to be brought in line with
 // other ports
-#define MICROPY_COMP_MODULE_CONST               (0)
-#define MICROPY_COMP_RETURN_IF_EXPR             (0)
-#define MICROPY_COMP_TRIPLE_TUPLE_ASSIGN        (0)
-#define MICROPY_OPT_COMPUTED_GOTO               (0)
-#define MICROPY_OPT_LOAD_ATTR_FAST_PATH         (0)
-#define MICROPY_OPT_MAP_LOOKUP_CACHE            (0)
-#define MICROPY_OPT_MATH_FACTORIAL              (0)
-#define MICROPY_OPT_MPZ_BITWISE                 (0)
 #define MICROPY_PY_BUILTINS_EXECFILE            (0)
 #define MICROPY_PY_BUILTINS_NOTIMPLEMENTED      (0)
 #define MICROPY_REPL_EMACS_KEYS                 (0)

From fe120484b67bdc114dbbc2b9bd913fab98c82778 Mon Sep 17 00:00:00 2001
From: Laurens Valk <laurens@pybricks.com>
Date: Tue, 26 Oct 2021 10:47:04 +0200
Subject: [PATCH 1378/3533] py/gc: Add hook to run code during time consuming
 GC operations.

This makes it possible for cooperative multitasking systems to keep running
event loops during garbage collector operations.

For example, this can be used to ensure that a motor control loop runs
approximately each 5 ms.  Without this hook, the loop time can jump to
about 15 ms.

Addresses #3475.

Signed-off-by: Laurens Valk <laurens@pybricks.com>
---
 py/gc.c       | 5 +++++
 py/mpconfig.h | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/py/gc.c b/py/gc.c
index 8284c435ba94c..a01d81abdcb22 100644
--- a/py/gc.c
+++ b/py/gc.c
@@ -213,6 +213,7 @@ STATIC void gc_mark_subtree(size_t block) {
     // Start with the block passed in the argument.
     size_t sp = 0;
     for (;;) {
+        MICROPY_GC_HOOK_LOOP
         // work out number of consecutive blocks in the chain starting with this one
         size_t n_blocks = 0;
         do {
@@ -222,6 +223,7 @@ STATIC void gc_mark_subtree(size_t block) {
         // check this block's children
         void **ptrs = (void **)PTR_FROM_BLOCK(block);
         for (size_t i = n_blocks * BYTES_PER_BLOCK / sizeof(void *); i > 0; i--, ptrs++) {
+            MICROPY_GC_HOOK_LOOP
             void *ptr = *ptrs;
             if (VERIFY_PTR(ptr)) {
                 // Mark and push this pointer
@@ -255,6 +257,7 @@ STATIC void gc_deal_with_stack_overflow(void) {
 
         // scan entire memory looking for blocks which have been marked but not their children
         for (size_t block = 0; block < MP_STATE_MEM(gc_alloc_table_byte_len) * BLOCKS_PER_ATB; block++) {
+            MICROPY_GC_HOOK_LOOP
             // trace (again) if mark bit set
             if (ATB_GET_KIND(block) == AT_MARK) {
                 gc_mark_subtree(block);
@@ -270,6 +273,7 @@ STATIC void gc_sweep(void) {
     // free unmarked heads and their tails
     int free_tail = 0;
     for (size_t block = 0; block < MP_STATE_MEM(gc_alloc_table_byte_len) * BLOCKS_PER_ATB; block++) {
+        MICROPY_GC_HOOK_LOOP
         switch (ATB_GET_KIND(block)) {
             case AT_HEAD:
                 #if MICROPY_ENABLE_FINALISER
@@ -354,6 +358,7 @@ static void *gc_get_ptr(void **ptrs, int i) {
 
 void gc_collect_root(void **ptrs, size_t len) {
     for (size_t i = 0; i < len; i++) {
+        MICROPY_GC_HOOK_LOOP
         void *ptr = gc_get_ptr(ptrs, i);
         if (VERIFY_PTR(ptr)) {
             size_t block = BLOCK_FROM_PTR(ptr);
diff --git a/py/mpconfig.h b/py/mpconfig.h
index 596bab8d89568..06c46b8c73107 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -602,6 +602,11 @@
 #define MICROPY_ENABLE_GC (0)
 #endif
 
+// Hook to run code during time consuming garbage collector operations
+#ifndef MICROPY_GC_HOOK_LOOP
+#define MICROPY_GC_HOOK_LOOP
+#endif
+
 // Whether to enable finalisers in the garbage collector (ie call __del__)
 #ifndef MICROPY_ENABLE_FINALISER
 #define MICROPY_ENABLE_FINALISER (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)

From 0adea4071608e6e6b266cccd0a7fce9bc190fb95 Mon Sep 17 00:00:00 2001
From: Andrew Scheller <github@loowis.durge.org>
Date: Thu, 23 Sep 2021 10:53:51 +0100
Subject: [PATCH 1379/3533] docs/rp2/general.rst: Fix typo with missing spaces.

---
 docs/rp2/general.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/rp2/general.rst b/docs/rp2/general.rst
index 7042d0d25b31b..9a31d20671b48 100644
--- a/docs/rp2/general.rst
+++ b/docs/rp2/general.rst
@@ -22,9 +22,9 @@ QFN-56 SMD package. The key features include:
   firmware from either the external flash memory or USB bus into internal SRAM)
 * QSPI bus controller, which
   supports up to 16 MB of external Flash memory
-* On-chip programmable LDO togenerate core voltage
+* On-chip programmable LDO to generate core voltage
 * 2 on-chip PLLs to generate USB and core clocks
-* 30 GPIOpins, of which 4 can optionally be used as analog inputs
+* 30 GPIO pins, of which 4 can optionally be used as analog inputs
 
 The peripherals include:
 

From cb99ca9862827f57c370555841810e98701ecfa2 Mon Sep 17 00:00:00 2001
From: Dave Hylands <dhylands@gmail.com>
Date: Mon, 25 Oct 2021 10:41:32 -0700
Subject: [PATCH 1380/3533] tools/dfu.py: Make tool work with python3 when
 parsing DFU files.

---
 tools/dfu.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/dfu.py b/tools/dfu.py
index 6591436e9e211..39d68f3b660c4 100755
--- a/tools/dfu.py
+++ b/tools/dfu.py
@@ -20,7 +20,7 @@ def consume(fmt, data, names):
 
 
 def cstring(string):
-    return string.split("\0", 1)[0]
+    return string.split(b"\0", 1)[0]
 
 
 def compute_crc(data):

From c9c55032dc29ba8dc75a211cdbb930e7eaf31844 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Thu, 4 Nov 2021 15:28:09 +1100
Subject: [PATCH 1381/3533] minimal/Makefile: Don't force a 32-bit build.

Word-size specific configuration is now done automatically, so it no longer
requires this to match the ARM configuration.

Also it's less common to have 32-bit compilation support installed, so this
will make it work "out of the box" for more people.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/minimal/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/minimal/Makefile b/ports/minimal/Makefile
index 21e3fe3f7687a..fc3730e700b02 100644
--- a/ports/minimal/Makefile
+++ b/ports/minimal/Makefile
@@ -27,8 +27,8 @@ CFLAGS = $(INC) -Wall -Werror -std=c99 -nostdlib $(CFLAGS_CORTEX_M4) $(COPT)
 LDFLAGS = -nostdlib -T stm32f405.ld -Map=$@.map --cref --gc-sections
 else
 LD = gcc
-CFLAGS = -m32 $(INC) -Wall -Werror -Wdouble-promotion -Wfloat-conversion -std=c99 $(COPT)
-LDFLAGS = -m32 -Wl,-Map=$@.map,--cref -Wl,--gc-sections
+CFLAGS = $(INC) -Wall -Werror -Wdouble-promotion -Wfloat-conversion -std=c99 $(COPT)
+LDFLAGS = -Wl,-Map=$@.map,--cref -Wl,--gc-sections
 endif
 
 CSUPEROPT = -Os # save some code space

From fa873ce67c52d04ad6ccea26c7c6366c97daa637 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 5 Nov 2021 13:12:18 +1100
Subject: [PATCH 1382/3533] minimal/mpconfigport.h: Disable features that are
 not needed.

Now that there are feature levels, and that this port uses
MICROPY_CONFIG_ROM_LEVEL_MINIMUM, it's easy to see what optional features
can be disabled.  And this commit disables them.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/minimal/mpconfigport.h | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/ports/minimal/mpconfigport.h b/ports/minimal/mpconfigport.h
index b83e0c2704273..c9f3998762e81 100644
--- a/ports/minimal/mpconfigport.h
+++ b/ports/minimal/mpconfigport.h
@@ -15,18 +15,10 @@
 #define MICROPY_HELPER_REPL               (1)
 #define MICROPY_MODULE_FROZEN_MPY         (1)
 #define MICROPY_ENABLE_EXTERNAL_IMPORT    (1)
-#define MICROPY_PY_MATH                   (1)
 
 #define MICROPY_ALLOC_PATH_MAX            (256)
 #define MICROPY_ALLOC_PARSE_CHUNK_INIT    (16)
 
-#define MICROPY_COMP_CONST_FOLDING        (1)
-#define MICROPY_COMP_CONST_LITERAL        (1)
-#define MICROPY_FULL_CHECKS               (1)
-#define MICROPY_MULTIPLE_INHERITANCE      (1)
-#define MICROPY_PY_GENERATOR_PEND_THROW   (1)
-#define MICROPY_PY_BUILTINS_RANGE_ATTRS   (1)
-
 // type definitions for the specific machine
 
 typedef intptr_t mp_int_t; // must be pointer size

From 1bd47db6881ce9fef5a787e9f4dfe74244c8d3cb Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 5 Nov 2021 11:02:30 +1100
Subject: [PATCH 1383/3533] tools/autobuild: Automatically build all mimxrt,
 rp2 and samd boards.

Any board with a board.json file will be automatically built.

Signed-off-by: Damien George <damien@micropython.org>
---
 tools/autobuild/autobuild.sh           | 12 ++++--
 tools/autobuild/build-boards.sh        | 53 ++++++++++++++++++++++++++
 tools/autobuild/build-mimxrt-latest.sh | 38 ------------------
 tools/autobuild/build-rp2-latest.sh    | 32 ----------------
 4 files changed, 62 insertions(+), 73 deletions(-)
 create mode 100755 tools/autobuild/build-boards.sh
 delete mode 100755 tools/autobuild/build-mimxrt-latest.sh
 delete mode 100755 tools/autobuild/build-rp2-latest.sh

diff --git a/tools/autobuild/autobuild.sh b/tools/autobuild/autobuild.sh
index a14c7890f7395..bb77b178b9bba 100755
--- a/tools/autobuild/autobuild.sh
+++ b/tools/autobuild/autobuild.sh
@@ -39,6 +39,9 @@ fi
 # get directory of this script for access to other build scripts
 AUTODIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 
+# source additional functions
+source ${AUTODIR}/build-boards.sh
+
 # make local directory to put firmware
 LOCAL_FIRMWARE=/tmp/autobuild-firmware-$$
 mkdir -p ${LOCAL_FIRMWARE}
@@ -71,10 +74,13 @@ ${AUTODIR}/build-esp8266-latest.sh ${FW_TAG} ${LOCAL_FIRMWARE}
 cd ../esp32
 ${AUTODIR}/build-esp32-latest.sh ${IDF_PATH_V42} ${FW_TAG} ${LOCAL_FIRMWARE}
 ${AUTODIR}/build-esp32-latest.sh ${IDF_PATH_V43} ${FW_TAG} ${LOCAL_FIRMWARE}
-cd ../rp2
-${AUTODIR}/build-rp2-latest.sh ${FW_TAG} ${LOCAL_FIRMWARE}
+
 cd ../mimxrt
-${AUTODIR}/build-mimxrt-latest.sh ${FW_TAG} ${LOCAL_FIRMWARE}
+build_mimxrt_boards ${FW_TAG} ${LOCAL_FIRMWARE}
+cd ../rp2
+build_rp2_boards ${FW_TAG} ${LOCAL_FIRMWARE}
+cd ../samd
+build_samd_boards ${FW_TAG} ${LOCAL_FIRMWARE}
 
 popd
 
diff --git a/tools/autobuild/build-boards.sh b/tools/autobuild/build-boards.sh
new file mode 100755
index 0000000000000..1ae795a7a7e14
--- /dev/null
+++ b/tools/autobuild/build-boards.sh
@@ -0,0 +1,53 @@
+#!/bin/bash
+#
+# The functions in this file can be run independently to build boards.
+# For example:
+#
+#   $ source build-boards.sh
+#   $ MICROPY_AUTOBUILD_MAKE=make build_rp2_boards -latest /tmp
+
+function build_boards {
+    # check/get parameters
+    if [ $# -lt 4 ]; then
+        echo "usage: $0 <fw-tag> <dest-dir> <check-file> <exts...>"
+        return 1
+    fi
+
+    fw_tag=$1
+    dest_dir=$2
+    check_file=$3
+    shift
+    shift
+    shift
+
+    # check we are in the correct directory
+    if [ ! -r $check_file ]; then
+        echo "must be in directory containing $check_file"
+        return 1
+    fi
+
+    for board_json in $(find boards/ -name board.json); do
+        board=$(echo $board_json | awk -F '/' '{ print $2 }')
+        descr=$(cat $board_json | python3 -c "import json,sys; print(json.load(sys.stdin).get('id', '$board'))")
+        build_dir=/tmp/micropython-build-$board
+
+        echo "building $descr $board"
+        $MICROPY_AUTOBUILD_MAKE BOARD=$board BUILD=$build_dir || return 1
+        for ext in $@; do
+            mv $build_dir/firmware.$ext $dest_dir/$descr$fw_tag.$ext
+        done
+        rm -rf $build_dir
+    done
+}
+
+function build_mimxrt_boards {
+    build_boards $1 $2 modmimxrt.c bin hex
+}
+
+function build_rp2_boards {
+    build_boards $1 $2 modrp2.c uf2
+}
+
+function build_samd_boards {
+    build_boards $1 $2 samd_soc.c uf2
+}
diff --git a/tools/autobuild/build-mimxrt-latest.sh b/tools/autobuild/build-mimxrt-latest.sh
deleted file mode 100755
index fea5da81c5438..0000000000000
--- a/tools/autobuild/build-mimxrt-latest.sh
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-
-# function for building firmware
-function do_build() {
-    descr=$1
-    board=$2
-    ext=$3
-    shift
-    shift
-    shift
-    echo "building $descr $board"
-    build_dir=/tmp/mimxrt-build-$board
-    $MICROPY_AUTOBUILD_MAKE $@ BOARD=$board BUILD=$build_dir || exit 1
-    mv $build_dir/firmware.$ext $dest_dir/$descr$fw_tag.$ext
-    rm -rf $build_dir
-}
-
-# check/get parameters
-if [ $# != 2 ]; then
-    echo "usage: $0 <fw-tag> <dest-dir>"
-    exit 1
-fi
-
-fw_tag=$1
-dest_dir=$2
-
-# check we are in the correct directory
-if [ ! -r modmimxrt.c ]; then
-    echo "must be in mimxrt directory"
-    exit 1
-fi
-
-# build the boards
-do_build TEENSY40 TEENSY40 hex
-do_build TEENSY41 TEENSY41 hex
-do_build MIMXRT1010_EVK MIMXRT1010_EVK bin
-do_build MIMXRT1020_EVK MIMXRT1020_EVK bin
-do_build MIMXRT1050_EVK MIMXRT1050_EVK bin
diff --git a/tools/autobuild/build-rp2-latest.sh b/tools/autobuild/build-rp2-latest.sh
deleted file mode 100755
index 5124686e217aa..0000000000000
--- a/tools/autobuild/build-rp2-latest.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/bash
-
-# function for building firmware
-function do_build() {
-    descr=$1
-    board=$2
-    shift
-    shift
-    echo "building $descr $board"
-    build_dir=/tmp/rp2-build-$board
-    $MICROPY_AUTOBUILD_MAKE $@ BOARD=$board BUILD=$build_dir || exit 1
-    mv $build_dir/firmware.uf2 $dest_dir/$descr$fw_tag.uf2
-    rm -rf $build_dir
-}
-
-# check/get parameters
-if [ $# != 2 ]; then
-    echo "usage: $0 <fw-tag> <dest-dir>"
-    exit 1
-fi
-
-fw_tag=$1
-dest_dir=$2
-
-# check we are in the correct directory
-if [ ! -r modrp2.c ]; then
-    echo "must be in rp2 directory"
-    exit 1
-fi
-
-# build the boards
-do_build rp2-pico PICO

From ff4f1f3ab395a6be426cc1b6ce0839bf65574f45 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 1 Nov 2021 12:47:32 +1100
Subject: [PATCH 1384/3533] esp8266/boards/GENERIC: Enable f-strings.

Costs 612 bytes of code space.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp8266/boards/GENERIC/mpconfigboard.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/esp8266/boards/GENERIC/mpconfigboard.h b/ports/esp8266/boards/GENERIC/mpconfigboard.h
index d33943df80019..e4991ba970901 100644
--- a/ports/esp8266/boards/GENERIC/mpconfigboard.h
+++ b/ports/esp8266/boards/GENERIC/mpconfigboard.h
@@ -11,6 +11,7 @@
 #define MICROPY_READER_VFS              (MICROPY_VFS)
 #define MICROPY_VFS                     (1)
 
+#define MICROPY_PY_FSTRINGS             (1)
 #define MICROPY_PY_BUILTINS_SLICE_ATTRS (1)
 #define MICROPY_PY_ALL_SPECIAL_METHODS  (1)
 #define MICROPY_PY_IO_FILEIO            (1)

From 6d9da27c21bcc687f868d77ffca42e4dfc234248 Mon Sep 17 00:00:00 2001
From: Magnus von Wachenfeldt <magnus@raketlaboratoriet.se>
Date: Thu, 4 Nov 2021 14:50:39 +0100
Subject: [PATCH 1385/3533] esp32: Support building with latest IDF v5.

The latest ESP-IDF v5.0-dev declares MAJOR_VERSION 5 and MINOR_VERSION 0.
timer_ll_set_alarm_enable() is also changed to timer_ll_set_alarm_value().
---
 ports/esp32/machine_timer.c     | 6 +++++-
 ports/esp32/main/CMakeLists.txt | 8 ++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/ports/esp32/machine_timer.c b/ports/esp32/machine_timer.c
index 020ba4447d915..ea8b5965d873a 100644
--- a/ports/esp32/machine_timer.c
+++ b/ports/esp32/machine_timer.c
@@ -134,7 +134,7 @@ STATIC void machine_timer_isr(void *self_in) {
 
     #if HAVE_TIMER_LL
 
-    #if CONFIG_IDF_TARGET_ESP32
+    #if CONFIG_IDF_TARGET_ESP32 && ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 0, 0)
     device->hw_timer[self->index].update = 1;
     #else
     #if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(4, 4, 0)
@@ -148,7 +148,11 @@ STATIC void machine_timer_isr(void *self_in) {
     #endif
     #endif
     timer_ll_clear_intr_status(device, self->index);
+    #if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 0, 0)
     timer_ll_set_alarm_enable(device, self->index, self->repeat);
+    #else
+    timer_ll_set_alarm_value(device, self->index, self->repeat);
+    #endif
 
     #else
 
diff --git a/ports/esp32/main/CMakeLists.txt b/ports/esp32/main/CMakeLists.txt
index 3294ca7c048f3..68a4815d7e525 100644
--- a/ports/esp32/main/CMakeLists.txt
+++ b/ports/esp32/main/CMakeLists.txt
@@ -121,16 +121,16 @@ set(IDF_COMPONENTS
     xtensa
 )
 
-if(IDF_VERSION_MINOR GREATER_EQUAL 1)
+if(IDF_VERSION_MINOR GREATER_EQUAL 1 OR IDF_VERSION_MAJOR GREATER_EQUAL 5)
     list(APPEND IDF_COMPONENTS esp_netif)
 endif()
 
-if(IDF_VERSION_MINOR GREATER_EQUAL 2)
+if(IDF_VERSION_MINOR GREATER_EQUAL 2 OR IDF_VERSION_MAJOR GREATER_EQUAL 5)
     list(APPEND IDF_COMPONENTS esp_system)
     list(APPEND IDF_COMPONENTS esp_timer)
 endif()
 
-if(IDF_VERSION_MINOR GREATER_EQUAL 3)
+if(IDF_VERSION_MINOR GREATER_EQUAL 3 OR IDF_VERSION_MAJOR GREATER_EQUAL 5)
     list(APPEND IDF_COMPONENTS esp_hw_support)
     list(APPEND IDF_COMPONENTS esp_pm)
     list(APPEND IDF_COMPONENTS hal)
@@ -203,7 +203,7 @@ foreach(comp ${IDF_COMPONENTS})
     micropy_gather_target_properties(__idf_${comp})
 endforeach()
 
-if(IDF_VERSION_MINOR GREATER_EQUAL 2)
+if(IDF_VERSION_MINOR GREATER_EQUAL 2 OR IDF_VERSION_MAJOR GREATER_EQUAL 5)
     # These paths cannot currently be found by the IDF_COMPONENTS search loop above,
     # so add them explicitly.
     list(APPEND MICROPY_CPP_INC_EXTRA ${IDF_PATH}/components/soc/soc/${IDF_TARGET}/include)

From 0be3b91f11e81ff18a0554c31326ac9df20a2091 Mon Sep 17 00:00:00 2001
From: MikeTeachman <mike.teachman@gmail.com>
Date: Fri, 24 Sep 2021 20:06:10 -0700
Subject: [PATCH 1386/3533] stm32,esp32: In machine_i2s, send null samples in
 underflow situations.

Eliminate noise data from being sent to the I2S peripheral when the
transmitted sample stream is stopped.

Signed-off-by: Mike Teachman <mike.teachman@gmail.com>
---
 ports/esp32/machine_i2s.c | 1 +
 ports/stm32/machine_i2s.c | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/ports/esp32/machine_i2s.c b/ports/esp32/machine_i2s.c
index dc583e8e96d68..390b01e5eb2f5 100644
--- a/ports/esp32/machine_i2s.c
+++ b/ports/esp32/machine_i2s.c
@@ -448,6 +448,7 @@ STATIC void machine_i2s_init_helper(machine_i2s_obj_t *self, size_t n_pos_args,
     i2s_config.dma_buf_count = get_dma_buf_count(mode, bits, format, self->ibuf);
     i2s_config.dma_buf_len = DMA_BUF_LEN_IN_I2S_FRAMES;
     i2s_config.use_apll = false;
+    i2s_config.tx_desc_auto_clear = true;
 
     // I2S queue size equals the number of DMA buffers
     check_esp_err(i2s_driver_install(self->port, &i2s_config, i2s_config.dma_buf_count, &self->i2s_event_queue));
diff --git a/ports/stm32/machine_i2s.c b/ports/stm32/machine_i2s.c
index 32167cf4e959f..266dd45e84f6e 100644
--- a/ports/stm32/machine_i2s.c
+++ b/ports/stm32/machine_i2s.c
@@ -509,6 +509,9 @@ STATIC void feed_dma(machine_i2s_obj_t *self, ping_pong_t dma_ping_pong) {
         if (self->bits == 32) {
             reformat_32_bit_samples((int32_t *)dma_buffer_p, SIZEOF_HALF_DMA_BUFFER_IN_BYTES / (sizeof(uint32_t)));
         }
+    } else {
+        // underflow.  clear buffer to transmit "silence" on the I2S bus
+        memset(dma_buffer_p, 0, SIZEOF_HALF_DMA_BUFFER_IN_BYTES);
     }
 
     // flush cache to RAM so DMA can read the sample data

From 6d5296e65e8eb2330dbddd21b167088abf93f57a Mon Sep 17 00:00:00 2001
From: MikeTeachman <mike.teachman@gmail.com>
Date: Tue, 9 Nov 2021 20:41:34 -0800
Subject: [PATCH 1387/3533] stm32,esp32: In machine_i2s, make object reference
 arrays root pointers.

This change eliminates the risk of the IRQ callback accessing invalid data.
Discussed here:
https://github.com/micropython/micropython/pull/7183#discussion_r660209875

Signed-off-by: Mike Teachman <mike.teachman@gmail.com>
---
 ports/esp32/machine_i2s.c                   | 10 +++----
 ports/esp32/mpconfigport.h                  |  3 +++
 ports/stm32/boards/PYBD_SF2/mpconfigboard.h |  1 -
 ports/stm32/boards/PYBV10/mpconfigboard.h   |  1 -
 ports/stm32/boards/PYBV11/mpconfigboard.h   |  1 -
 ports/stm32/machine_i2s.c                   | 30 +++++++++------------
 ports/stm32/mpconfigboard_common.h          |  9 +++++++
 ports/stm32/mpconfigport.h                  |  3 +++
 8 files changed, 32 insertions(+), 26 deletions(-)

diff --git a/ports/esp32/machine_i2s.c b/ports/esp32/machine_i2s.c
index 390b01e5eb2f5..71d3ad11639b7 100644
--- a/ports/esp32/machine_i2s.c
+++ b/ports/esp32/machine_i2s.c
@@ -147,11 +147,9 @@ STATIC const int8_t i2s_frame_map[NUM_I2S_USER_FORMATS][I2S_RX_FRAME_SIZE_IN_BYT
     { 4,  5,  6,  7,  0,  1,  2,  3 },  // Stereo, 32-bits
 };
 
-STATIC machine_i2s_obj_t *machine_i2s_obj[I2S_NUM_MAX];
-
 void machine_i2s_init0() {
     for (i2s_port_t p = 0; p < I2S_NUM_MAX; p++) {
-        machine_i2s_obj[p] = NULL;
+        MP_STATE_PORT(machine_i2s_obj)[p] = NULL;
     }
 }
 
@@ -507,13 +505,13 @@ STATIC mp_obj_t machine_i2s_make_new(const mp_obj_type_t *type, size_t n_pos_arg
     }
 
     machine_i2s_obj_t *self;
-    if (machine_i2s_obj[port] == NULL) {
+    if (MP_STATE_PORT(machine_i2s_obj)[port] == NULL) {
         self = m_new_obj(machine_i2s_obj_t);
-        machine_i2s_obj[port] = self;
+        MP_STATE_PORT(machine_i2s_obj)[port] = self;
         self->base.type = &machine_i2s_type;
         self->port = port;
     } else {
-        self = machine_i2s_obj[port];
+        self = MP_STATE_PORT(machine_i2s_obj)[port];
         machine_i2s_deinit(self);
     }
 
diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h
index 53d706be3fedd..82bef87880935 100644
--- a/ports/esp32/mpconfigport.h
+++ b/ports/esp32/mpconfigport.h
@@ -7,6 +7,8 @@
 #include <stdint.h>
 #include <alloca.h>
 #include "esp_system.h"
+#include "freertos/FreeRTOS.h"
+#include "driver/i2s.h"
 
 // object representation and NLR handling
 #define MICROPY_OBJ_REPR                    (MICROPY_OBJ_REPR_A)
@@ -249,6 +251,7 @@ struct mp_bluetooth_nimble_root_pointers_t;
     const char *readline_hist[8]; \
     mp_obj_t machine_pin_irq_handler[40]; \
     struct _machine_timer_obj_t *machine_timer_obj_head; \
+    struct _machine_i2s_obj_t *machine_i2s_obj[I2S_NUM_MAX]; \
     MICROPY_PORT_ROOT_POINTER_BLUETOOTH_NIMBLE
 
 // type definitions for the specific machine
diff --git a/ports/stm32/boards/PYBD_SF2/mpconfigboard.h b/ports/stm32/boards/PYBD_SF2/mpconfigboard.h
index ed76b3f9711fd..4afa037c4cbcb 100644
--- a/ports/stm32/boards/PYBD_SF2/mpconfigboard.h
+++ b/ports/stm32/boards/PYBD_SF2/mpconfigboard.h
@@ -40,7 +40,6 @@
 #define MICROPY_HW_ENABLE_SDCARD    (1)
 #define MICROPY_HW_ENABLE_MMCARD    (1)
 #define MICROPY_HW_ENABLE_RF_SWITCH (1)
-#define MICROPY_HW_ENABLE_I2S       (1)
 
 #define MICROPY_BOARD_EARLY_INIT    board_early_init
 #define MICROPY_BOARD_ENTER_STOP    board_sleep(1);
diff --git a/ports/stm32/boards/PYBV10/mpconfigboard.h b/ports/stm32/boards/PYBV10/mpconfigboard.h
index 50ef3ae26912c..6219862be4957 100644
--- a/ports/stm32/boards/PYBV10/mpconfigboard.h
+++ b/ports/stm32/boards/PYBV10/mpconfigboard.h
@@ -11,7 +11,6 @@
 #define MICROPY_HW_ENABLE_DAC       (1)
 #define MICROPY_HW_ENABLE_USB       (1)
 #define MICROPY_HW_ENABLE_SDCARD    (1)
-#define MICROPY_HW_ENABLE_I2S       (1)
 
 // HSE is 8MHz
 #define MICROPY_HW_CLK_PLLM (8)
diff --git a/ports/stm32/boards/PYBV11/mpconfigboard.h b/ports/stm32/boards/PYBV11/mpconfigboard.h
index aec83d1349129..c8f660c8fbb86 100644
--- a/ports/stm32/boards/PYBV11/mpconfigboard.h
+++ b/ports/stm32/boards/PYBV11/mpconfigboard.h
@@ -11,7 +11,6 @@
 #define MICROPY_HW_ENABLE_DAC       (1)
 #define MICROPY_HW_ENABLE_USB       (1)
 #define MICROPY_HW_ENABLE_SDCARD    (1)
-#define MICROPY_HW_ENABLE_I2S       (1)
 
 // HSE is 12MHz
 #define MICROPY_HW_CLK_PLLM (12)
diff --git a/ports/stm32/machine_i2s.c b/ports/stm32/machine_i2s.c
index 266dd45e84f6e..31b7d14bfd4c1 100644
--- a/ports/stm32/machine_i2s.c
+++ b/ports/stm32/machine_i2s.c
@@ -81,8 +81,6 @@
 //   32 byte address boundary.  Not all STM32 devices have a D-Cache.  Buffer alignment
 //   will still happen on these devices to keep this code simple.
 
-#define MAX_I2S_STM32 (2)
-
 // DMA ping-pong buffer size was empirically determined.  It is a tradeoff between:
 // 1. memory use (smaller buffer size desirable to reduce memory footprint)
 // 2. interrupt frequency (larger buffer size desirable to reduce interrupt frequency)
@@ -164,11 +162,9 @@ STATIC const int8_t i2s_frame_map[NUM_I2S_USER_FORMATS][I2S_RX_FRAME_SIZE_IN_BYT
     { 2,  3,  0,  1,  6,  7,  4,  5 },  // Stereo, 32-bits
 };
 
-STATIC machine_i2s_obj_t *machine_i2s_obj[MAX_I2S_STM32];
-
 void machine_i2s_init0() {
-    for (uint8_t i = 0; i < MAX_I2S_STM32; i++) {
-        machine_i2s_obj[i] = NULL;
+    for (uint8_t i = 0; i < MICROPY_HW_MAX_I2S; i++) {
+        MP_STATE_PORT(machine_i2s_obj)[i] = NULL;
     }
 }
 
@@ -601,9 +597,9 @@ void HAL_I2S_ErrorCallback(I2S_HandleTypeDef *hi2s) {
 void HAL_I2S_RxCpltCallback(I2S_HandleTypeDef *hi2s) {
     machine_i2s_obj_t *self;
     if (hi2s->Instance == I2S1) {
-        self = machine_i2s_obj[0];
+        self = MP_STATE_PORT(machine_i2s_obj)[0];
     } else {
-        self = machine_i2s_obj[1];
+        self = MP_STATE_PORT(machine_i2s_obj)[1];
     }
 
     // bottom half of buffer now filled,
@@ -620,9 +616,9 @@ void HAL_I2S_RxCpltCallback(I2S_HandleTypeDef *hi2s) {
 void HAL_I2S_RxHalfCpltCallback(I2S_HandleTypeDef *hi2s) {
     machine_i2s_obj_t *self;
     if (hi2s->Instance == I2S1) {
-        self = machine_i2s_obj[0];
+        self = MP_STATE_PORT(machine_i2s_obj)[0];
     } else {
-        self = machine_i2s_obj[1];
+        self = MP_STATE_PORT(machine_i2s_obj)[1];
     }
 
     // top half of buffer now filled,
@@ -640,9 +636,9 @@ void HAL_I2S_TxCpltCallback(I2S_HandleTypeDef *hi2s) {
     machine_i2s_obj_t *self;
 
     if (hi2s->Instance == I2S1) {
-        self = machine_i2s_obj[0];
+        self = MP_STATE_PORT(machine_i2s_obj)[0];
     } else {
-        self = machine_i2s_obj[1];
+        self = MP_STATE_PORT(machine_i2s_obj)[1];
     }
 
     // for non-blocking operation, this IRQ-based callback handles
@@ -659,9 +655,9 @@ void HAL_I2S_TxCpltCallback(I2S_HandleTypeDef *hi2s) {
 void HAL_I2S_TxHalfCpltCallback(I2S_HandleTypeDef *hi2s) {
     machine_i2s_obj_t *self;
     if (hi2s->Instance == I2S1) {
-        self = machine_i2s_obj[0];
+        self = MP_STATE_PORT(machine_i2s_obj)[0];
     } else {
-        self = machine_i2s_obj[1];
+        self = MP_STATE_PORT(machine_i2s_obj)[1];
     }
 
     // for non-blocking operation, this IRQ-based callback handles
@@ -859,13 +855,13 @@ STATIC mp_obj_t machine_i2s_make_new(const mp_obj_type_t *type, size_t n_pos_arg
     }
 
     machine_i2s_obj_t *self;
-    if (machine_i2s_obj[i2s_id_zero_base] == NULL) {
+    if (MP_STATE_PORT(machine_i2s_obj)[i2s_id_zero_base] == NULL) {
         self = m_new_obj(machine_i2s_obj_t);
-        machine_i2s_obj[i2s_id_zero_base] = self;
+        MP_STATE_PORT(machine_i2s_obj)[i2s_id_zero_base] = self;
         self->base.type = &machine_i2s_type;
         self->i2s_id = i2s_id;
     } else {
-        self = machine_i2s_obj[i2s_id_zero_base];
+        self = MP_STATE_PORT(machine_i2s_obj)[i2s_id_zero_base];
         machine_i2s_deinit(MP_OBJ_FROM_PTR(self));
     }
 
diff --git a/ports/stm32/mpconfigboard_common.h b/ports/stm32/mpconfigboard_common.h
index bd00bae9c358c..6dd51e913f21c 100644
--- a/ports/stm32/mpconfigboard_common.h
+++ b/ports/stm32/mpconfigboard_common.h
@@ -490,6 +490,15 @@
 #define MICROPY_HW_MAX_CAN (1)
 #endif
 
+// Enable I2S if there are any peripherals defined
+#if defined(MICROPY_HW_I2S1) || defined(MICROPY_HW_I2S2)
+#define MICROPY_HW_ENABLE_I2S (1)
+#define MICROPY_HW_MAX_I2S (2)
+#else
+#define MICROPY_HW_ENABLE_I2S (0)
+#define MICROPY_HW_MAX_I2S (0)
+#endif
+
 // Define MICROPY_HW_SDMMCx_CK values if that peripheral is used, so that make-pins.py
 // generates the relevant AF constants.
 #if MICROPY_HW_SDCARD_SDMMC == 1 || MICROPY_HW_SDIO_SDMMC == 1
diff --git a/ports/stm32/mpconfigport.h b/ports/stm32/mpconfigport.h
index 9a1b52520257f..6639b92413cde 100644
--- a/ports/stm32/mpconfigport.h
+++ b/ports/stm32/mpconfigport.h
@@ -342,6 +342,9 @@ struct _mp_bluetooth_btstack_root_pointers_t;
     /* pointers to all CAN objects (if they have been created) */ \
     struct _pyb_can_obj_t *pyb_can_obj_all[MICROPY_HW_MAX_CAN]; \
     \
+    /* pointers to all I2S objects (if they have been created) */ \
+    struct _machine_i2s_obj_t *machine_i2s_obj[MICROPY_HW_MAX_I2S]; \
+    \
     /* USB_VCP IRQ callbacks (if they have been set) */ \
     mp_obj_t pyb_usb_vcp_irq[MICROPY_HW_USB_CDC_NUM]; \
     \

From b6dbbbe82f7114cb5b56c54e916e304f416cd47a Mon Sep 17 00:00:00 2001
From: Mike Teachman <mike.teachman@gmail.com>
Date: Fri, 3 Sep 2021 20:34:53 -0700
Subject: [PATCH 1388/3533] rp2/machine_i2s: Add I2S protocol support.

This commit adds I2S protocol support for the rp2 port:
- I2S API is consistent with STM32 and ESP32 ports
- I2S configurations supported:
  - master transmit and master receive
  - 16-bit and 32-bit sample sizes
  - mono and stereo formats
  - sampling frequency
  - 3 modes of operation:
    - blocking
    - non-blocking with callback
    - uasyncio
  - internal ring buffer size can be tuned
- DMA IRQs are managed on an I2S object basis, allowing other
  RP2 entities to use DMA IRQs when I2S is not being used
- MicroPython documentation
- tested on Raspberry Pi Pico development board
- build metric changes for this commit: text(+4552), data(0), bss(+8)

Signed-off-by: Mike Teachman <mike.teachman@gmail.com>
---
 docs/rp2/quickref.rst    |   20 +
 ports/rp2/CMakeLists.txt |    2 +
 ports/rp2/machine_i2s.c  | 1150 ++++++++++++++++++++++++++++++++++++++
 ports/rp2/main.c         |    1 +
 ports/rp2/modmachine.c   |    1 +
 ports/rp2/modmachine.h   |    2 +
 ports/rp2/mpconfigport.h |    1 +
 7 files changed, 1177 insertions(+)
 create mode 100644 ports/rp2/machine_i2s.c

diff --git a/docs/rp2/quickref.rst b/docs/rp2/quickref.rst
index ac9cdb86cb74d..63b8928280ba0 100644
--- a/docs/rp2/quickref.rst
+++ b/docs/rp2/quickref.rst
@@ -219,6 +219,26 @@ has the same methods as software I2C above::
     i2c = I2C(0)   # default assignment: scl=Pin(9), sda=Pin(8)
     i2c = I2C(1, scl=Pin(3), sda=Pin(2), freq=400_000)
 
+I2S bus
+-------
+
+See :ref:`machine.I2S <machine.I2S>`. ::
+
+    from machine import I2S, Pin
+
+    i2s = I2S(0, sck=Pin(16), ws=Pin(17), sd=Pin(18), mode=I2S.TX, bits=16, format=I2S.STEREO, rate=44100, ibuf=40000) # create I2S object
+    i2s.write(buf)             # write buffer of audio samples to I2S device
+
+    i2s = I2S(1, sck=Pin(0), ws=Pin(1), sd=Pin(2), mode=I2S.RX, bits=16, format=I2S.MONO, rate=22050, ibuf=40000) # create I2S object
+    i2s.readinto(buf)          # fill buffer with audio samples from I2S device
+
+The ``ws`` pin number must be one greater than the ``sck`` pin number.
+
+The I2S class is currently available as a Technical Preview.  During the preview period, feedback from
+users is encouraged.  Based on this feedback, the I2S class API and implementation may be changed.
+
+Two I2S buses are supported with id=0 and id=1.
+
 Real time clock (RTC)
 ---------------------
 
diff --git a/ports/rp2/CMakeLists.txt b/ports/rp2/CMakeLists.txt
index 14f4e33ebe070..e38cd8032dba2 100644
--- a/ports/rp2/CMakeLists.txt
+++ b/ports/rp2/CMakeLists.txt
@@ -85,6 +85,7 @@ set(MICROPY_SOURCE_PORT
     fatfs_port.c
     machine_adc.c
     machine_i2c.c
+    machine_i2s.c
     machine_pin.c
     machine_rtc.c
     machine_spi.c
@@ -112,6 +113,7 @@ set(MICROPY_SOURCE_QSTR
     ${MICROPY_DIR}/shared/runtime/sys_stdio_mphal.c
     ${PROJECT_SOURCE_DIR}/machine_adc.c
     ${PROJECT_SOURCE_DIR}/machine_i2c.c
+    ${PROJECT_SOURCE_DIR}/machine_i2s.c
     ${PROJECT_SOURCE_DIR}/machine_pin.c
     ${PROJECT_SOURCE_DIR}/machine_rtc.c
     ${PROJECT_SOURCE_DIR}/machine_spi.c
diff --git a/ports/rp2/machine_i2s.c b/ports/rp2/machine_i2s.c
new file mode 100644
index 0000000000000..ec64f72ec07f4
--- /dev/null
+++ b/ports/rp2/machine_i2s.c
@@ -0,0 +1,1150 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Mike Teachman
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include <stdio.h>
+#include <stdint.h>
+#include <string.h>
+#include <stdlib.h>
+#include <stdbool.h>
+
+#include "py/obj.h"
+#include "py/runtime.h"
+#include "py/mphal.h"
+#include "py/misc.h"
+#include "py/stream.h"
+#include "py/objstr.h"
+#include "modmachine.h"
+
+#include "hardware/pio.h"
+#include "hardware/clocks.h"
+#include "hardware/gpio.h"
+#include "hardware/dma.h"
+#include "hardware/irq.h"
+
+// The I2S class has 3 modes of operation:
+//
+// Mode1:  Blocking
+// - readinto() and write() methods block until the supplied buffer is filled (read) or emptied (write)
+// - this is the default mode of operation
+//
+// Mode2:  Non-Blocking
+// - readinto() and write() methods return immediately
+// - buffer filling and emptying happens asynchronously to the main MicroPython task
+// - a callback function is called when the supplied buffer has been filled (read) or emptied (write)
+// - non-blocking mode is enabled when a callback is set with the irq() method
+// - the DMA IRQ handler is used to implement the asynchronous background operations
+//
+// Mode3: Uasyncio
+// - implements the stream protocol
+// - uasyncio mode is enabled when the ioctl() function is called
+// - the state of the internal ring buffer is used to detect that I2S samples can be read or written
+//
+// The samples contained in the app buffer supplied for the readinto() and write() methods have the following convention:
+//   Mono:  little endian format
+//   Stereo:  little endian format, left channel first
+//
+// I2S terms:
+//   "frame":  consists of two audio samples (Left audio sample + Right audio sample)
+//
+// Misc:
+// - for Mono configuration:
+//   - readinto method: samples are gathered from the L channel only
+//   - write method: every sample is output to both the L and R channels
+// - for readinto method the I2S hardware is read using 8-byte frames
+//   (this is standard for almost all I2S hardware, such as MEMS microphones)
+// - the PIO is used to drive the I2S bus signals
+// - all sample data transfers use non-blocking DMA
+// - the DMA controller is configured with 2 DMA channels in chained mode
+
+#define MAX_I2S_RP2 (2)
+
+// The DMA buffer size was empirically determined.  It is a tradeoff between:
+// 1. memory use (smaller buffer size desirable to reduce memory footprint)
+// 2. interrupt frequency (larger buffer size desirable to reduce interrupt frequency)
+#define SIZEOF_DMA_BUFFER_IN_BYTES (256)
+#define SIZEOF_HALF_DMA_BUFFER_IN_BYTES (SIZEOF_DMA_BUFFER_IN_BYTES / 2)
+#define I2S_NUM_DMA_CHANNELS (2)
+
+// For non-blocking mode, to avoid underflow/overflow, sample data is written/read to/from the ring buffer at a rate faster
+// than the DMA transfer rate
+#define NON_BLOCKING_RATE_MULTIPLIER (4)
+#define SIZEOF_NON_BLOCKING_COPY_IN_BYTES (SIZEOF_HALF_DMA_BUFFER_IN_BYTES * NON_BLOCKING_RATE_MULTIPLIER)
+
+#define NUM_I2S_USER_FORMATS (4)
+#define I2S_RX_FRAME_SIZE_IN_BYTES (8)
+
+#define SAMPLES_PER_FRAME (2)
+#define PIO_INSTRUCTIONS_PER_BIT (2)
+
+typedef enum {
+    RX,
+    TX
+} i2s_mode_t;
+
+typedef enum {
+    MONO,
+    STEREO
+} format_t;
+
+typedef enum {
+    BLOCKING,
+    NON_BLOCKING,
+    UASYNCIO
+} io_mode_t;
+
+typedef enum {
+    GP_INPUT = 0,
+    GP_OUTPUT = 1
+} gpio_dir_t;
+
+typedef struct _ring_buf_t {
+    uint8_t *buffer;
+    size_t head;
+    size_t tail;
+    size_t size;
+} ring_buf_t;
+
+typedef struct _non_blocking_descriptor_t {
+    mp_buffer_info_t appbuf;
+    uint32_t index;
+    bool copy_in_progress;
+} non_blocking_descriptor_t;
+
+typedef struct _machine_i2s_obj_t {
+    mp_obj_base_t base;
+    uint8_t i2s_id;
+    mp_hal_pin_obj_t sck;
+    mp_hal_pin_obj_t ws;
+    mp_hal_pin_obj_t sd;
+    i2s_mode_t mode;
+    int8_t bits;
+    format_t format;
+    int32_t rate;
+    int32_t ibuf;
+    mp_obj_t callback_for_non_blocking;
+    io_mode_t io_mode;
+    PIO pio;
+    uint8_t sm;
+    const pio_program_t *pio_program;
+    uint prog_offset;
+    int dma_channel[I2S_NUM_DMA_CHANNELS];
+    uint8_t dma_buffer[SIZEOF_DMA_BUFFER_IN_BYTES];
+    ring_buf_t ring_buffer;
+    uint8_t *ring_buffer_storage;
+    non_blocking_descriptor_t non_blocking_descriptor;
+} machine_i2s_obj_t;
+
+// The frame map is used with the readinto() method to transform the audio sample data coming
+// from DMA memory (32-bit stereo) to the format specified
+// in the I2S constructor.  e.g.  16-bit mono
+STATIC const int8_t i2s_frame_map[NUM_I2S_USER_FORMATS][I2S_RX_FRAME_SIZE_IN_BYTES] = {
+    {-1, -1,  0,  1, -1, -1, -1, -1 },  // Mono, 16-bits
+    { 0,  1,  2,  3, -1, -1, -1, -1 },  // Mono, 32-bits
+    {-1, -1,  0,  1, -1, -1,  2,  3 },  // Stereo, 16-bits
+    { 0,  1,  2,  3,  4,  5,  6,  7 },  // Stereo, 32-bits
+};
+
+STATIC const PIO pio_instances[NUM_PIOS] = {pio0, pio1};
+
+//  PIO program for 16-bit write
+//    set(x, 14)                  .side(0b01)
+//    label('left_channel')
+//    out(pins, 1)                .side(0b00)
+//    jmp(x_dec, "left_channel")  .side(0b01)
+//    out(pins, 1)                .side(0b10)
+//    set(x, 14)                  .side(0b11)
+//    label('right_channel')
+//    out(pins, 1)                .side(0b10)
+//    jmp(x_dec, "right_channel") .side(0b11)
+//    out(pins, 1)                .side(0b00)
+STATIC const uint16_t pio_instructions_write_16[] = {59438, 24577, 2113, 28673, 63534, 28673, 6213, 24577};
+STATIC const pio_program_t pio_write_16 = {
+    pio_instructions_write_16,
+    sizeof(pio_instructions_write_16) / sizeof(uint16_t),
+    -1
+};
+
+//  PIO program for 32-bit write
+//    set(x, 30)                  .side(0b01)
+//    label('left_channel')
+//    out(pins, 1)                .side(0b00)
+//    jmp(x_dec, "left_channel")  .side(0b01)
+//    out(pins, 1)                .side(0b10)
+//    set(x, 30)                  .side(0b11)
+//    label('right_channel')
+//    out(pins, 1)                .side(0b10)
+//    jmp(x_dec, "right_channel") .side(0b11)
+//    out(pins, 1)                .side(0b00)
+STATIC const uint16_t pio_instructions_write_32[] = {59454, 24577, 2113, 28673, 63550, 28673, 6213, 24577};
+STATIC const pio_program_t pio_write_32 = {
+    pio_instructions_write_32,
+    sizeof(pio_instructions_write_32) / sizeof(uint16_t),
+    -1
+};
+
+//  PIO program for 32-bit read
+//    set(x, 30)                  .side(0b00)
+//    label('left_channel')
+//    in_(pins, 1)                .side(0b01)
+//    jmp(x_dec, "left_channel")  .side(0b00)
+//    in_(pins, 1)                .side(0b11)
+//    set(x, 30)                  .side(0b10)
+//    label('right_channel')
+//    in_(pins, 1)                .side(0b11)
+//    jmp(x_dec, "right_channel") .side(0b10)
+//    in_(pins, 1)                .side(0b01)
+STATIC const uint16_t pio_instructions_read_32[] = {57406, 18433, 65, 22529, 61502, 22529, 4165, 18433};
+STATIC const pio_program_t pio_read_32 = {
+    pio_instructions_read_32,
+    sizeof(pio_instructions_read_32) / sizeof(uint16_t),
+    -1
+};
+
+STATIC uint8_t dma_get_bits(i2s_mode_t mode, int8_t bits);
+STATIC void dma_irq0_handler(void);
+STATIC void dma_irq1_handler(void);
+STATIC mp_obj_t machine_i2s_deinit(mp_obj_t self_in);
+
+void machine_i2s_init0(void) {
+    for (uint8_t i = 0; i < MAX_I2S_RP2; i++) {
+        MP_STATE_PORT(machine_i2s_obj[i]) = NULL;
+    }
+}
+
+// Ring Buffer
+// Thread safe when used with these constraints:
+// - Single Producer, Single Consumer
+// - Sequential atomic operations
+// One byte of capacity is used to detect buffer empty/full
+
+STATIC void ringbuf_init(ring_buf_t *rbuf, uint8_t *buffer, size_t size) {
+    rbuf->buffer = buffer;
+    rbuf->size = size;
+    rbuf->head = 0;
+    rbuf->tail = 0;
+}
+
+STATIC bool ringbuf_push(ring_buf_t *rbuf, uint8_t data) {
+    size_t next_tail = (rbuf->tail + 1) % rbuf->size;
+
+    if (next_tail != rbuf->head) {
+        rbuf->buffer[rbuf->tail] = data;
+        rbuf->tail = next_tail;
+        return true;
+    }
+
+    // full
+    return false;
+}
+
+STATIC bool ringbuf_pop(ring_buf_t *rbuf, uint8_t *data) {
+    if (rbuf->head == rbuf->tail) {
+        // empty
+        return false;
+    }
+
+    *data = rbuf->buffer[rbuf->head];
+    rbuf->head = (rbuf->head + 1) % rbuf->size;
+    return true;
+}
+
+STATIC bool ringbuf_is_empty(ring_buf_t *rbuf) {
+    return rbuf->head == rbuf->tail;
+}
+
+STATIC bool ringbuf_is_full(ring_buf_t *rbuf) {
+    return ((rbuf->tail + 1) % rbuf->size) == rbuf->head;
+}
+
+STATIC size_t ringbuf_available_data(ring_buf_t *rbuf) {
+    return (rbuf->tail - rbuf->head + rbuf->size) % rbuf->size;
+}
+
+STATIC size_t ringbuf_available_space(ring_buf_t *rbuf) {
+    return rbuf->size - ringbuf_available_data(rbuf) - 1;
+}
+
+STATIC int8_t get_frame_mapping_index(int8_t bits, format_t format) {
+    if (format == MONO) {
+        if (bits == 16) {
+            return 0;
+        } else { // 32 bits
+            return 1;
+        }
+    } else { // STEREO
+        if (bits == 16) {
+            return 2;
+        } else { // 32 bits
+            return 3;
+        }
+    }
+}
+
+STATIC uint32_t fill_appbuf_from_ringbuf(machine_i2s_obj_t *self, mp_buffer_info_t *appbuf) {
+
+    // copy audio samples from the ring buffer to the app buffer
+    // loop, copying samples until the app buffer is filled
+    // For uasyncio mode, the loop will make an early exit if the ring buffer becomes empty
+    // Example:
+    //   a MicroPython I2S object is configured for 16-bit mono (2 bytes per audio sample).
+    //   For every frame coming from the ring buffer (8 bytes), 2 bytes are "cherry picked" and
+    //   copied to the supplied app buffer.
+    //   Thus, for every 1 byte copied to the app buffer, 4 bytes are read from the ring buffer.
+    //   If a 8kB app buffer is supplied, 32kB of audio samples is read from the ring buffer.
+
+    uint32_t num_bytes_copied_to_appbuf = 0;
+    uint8_t *app_p = (uint8_t *)appbuf->buf;
+    uint8_t appbuf_sample_size_in_bytes = (self->bits == 16? 2 : 4) * (self->format == STEREO ? 2: 1);
+    uint32_t num_bytes_needed_from_ringbuf = appbuf->len * (I2S_RX_FRAME_SIZE_IN_BYTES / appbuf_sample_size_in_bytes);
+    uint8_t discard_byte;
+    while (num_bytes_needed_from_ringbuf) {
+
+        uint8_t f_index = get_frame_mapping_index(self->bits, self->format);
+
+        for (uint8_t i = 0; i < I2S_RX_FRAME_SIZE_IN_BYTES; i++) {
+            int8_t r_to_a_mapping = i2s_frame_map[f_index][i];
+            if (r_to_a_mapping != -1) {
+                if (self->io_mode == BLOCKING) {
+                    // poll the ringbuf until a sample becomes available,  copy into appbuf using the mapping transform
+                    while (ringbuf_pop(&self->ring_buffer, app_p + r_to_a_mapping) == false) {
+                        ;
+                    }
+                    num_bytes_copied_to_appbuf++;
+                } else if (self->io_mode == UASYNCIO) {
+                    if (ringbuf_pop(&self->ring_buffer, app_p + r_to_a_mapping) == false) {
+                        // ring buffer is empty, exit
+                        goto exit;
+                    } else {
+                        num_bytes_copied_to_appbuf++;
+                    }
+                } else {
+                    return 0;  // should never get here (non-blocking mode does not use this function)
+                }
+            } else { // r_a_mapping == -1
+                // discard unused byte from ring buffer
+                if (self->io_mode == BLOCKING) {
+                    // poll the ringbuf until a sample becomes available
+                    while (ringbuf_pop(&self->ring_buffer, &discard_byte) == false) {
+                        ;
+                    }
+                } else if (self->io_mode == UASYNCIO) {
+                    if (ringbuf_pop(&self->ring_buffer, &discard_byte) == false) {
+                        // ring buffer is empty, exit
+                        goto exit;
+                    }
+                } else {
+                    return 0;  // should never get here (non-blocking mode does not use this function)
+                }
+            }
+            num_bytes_needed_from_ringbuf--;
+        }
+        app_p += appbuf_sample_size_in_bytes;
+    }
+exit:
+    return num_bytes_copied_to_appbuf;
+}
+
+// function is used in IRQ context
+STATIC void fill_appbuf_from_ringbuf_non_blocking(machine_i2s_obj_t *self) {
+
+    // attempt to copy a block of audio samples from the ring buffer to the supplied app buffer.
+    // audio samples will be formatted as part of the copy operation
+
+    uint32_t num_bytes_copied_to_appbuf = 0;
+    uint8_t *app_p = &(((uint8_t *)self->non_blocking_descriptor.appbuf.buf)[self->non_blocking_descriptor.index]);
+
+    uint8_t appbuf_sample_size_in_bytes = (self->bits == 16? 2 : 4) * (self->format == STEREO ? 2: 1);
+    uint32_t num_bytes_remaining_to_copy_to_appbuf = self->non_blocking_descriptor.appbuf.len - self->non_blocking_descriptor.index;
+    uint32_t num_bytes_remaining_to_copy_from_ring_buffer = num_bytes_remaining_to_copy_to_appbuf *
+        (I2S_RX_FRAME_SIZE_IN_BYTES / appbuf_sample_size_in_bytes);
+    uint32_t num_bytes_needed_from_ringbuf = MIN(SIZEOF_NON_BLOCKING_COPY_IN_BYTES, num_bytes_remaining_to_copy_from_ring_buffer);
+    uint8_t discard_byte;
+    if (ringbuf_available_data(&self->ring_buffer) >= num_bytes_needed_from_ringbuf) {
+        while (num_bytes_needed_from_ringbuf) {
+
+            uint8_t f_index = get_frame_mapping_index(self->bits, self->format);
+
+            for (uint8_t i = 0; i < I2S_RX_FRAME_SIZE_IN_BYTES; i++) {
+                int8_t r_to_a_mapping = i2s_frame_map[f_index][i];
+                if (r_to_a_mapping != -1) {
+                    ringbuf_pop(&self->ring_buffer, app_p + r_to_a_mapping);
+                    num_bytes_copied_to_appbuf++;
+                } else { // r_a_mapping == -1
+                    // discard unused byte from ring buffer
+                    ringbuf_pop(&self->ring_buffer, &discard_byte);
+                }
+                num_bytes_needed_from_ringbuf--;
+            }
+            app_p += appbuf_sample_size_in_bytes;
+        }
+        self->non_blocking_descriptor.index += num_bytes_copied_to_appbuf;
+
+        if (self->non_blocking_descriptor.index >= self->non_blocking_descriptor.appbuf.len) {
+            self->non_blocking_descriptor.copy_in_progress = false;
+            mp_sched_schedule(self->callback_for_non_blocking, MP_OBJ_FROM_PTR(self));
+        }
+    }
+}
+
+STATIC uint32_t copy_appbuf_to_ringbuf(machine_i2s_obj_t *self, mp_buffer_info_t *appbuf) {
+
+    // copy audio samples from the app buffer to the ring buffer
+    // loop, reading samples until the app buffer is emptied
+    // for uasyncio mode, the loop will make an early exit if the ring buffer becomes full
+
+    uint32_t a_index = 0;
+
+    while (a_index < appbuf->len) {
+        if (self->io_mode == BLOCKING) {
+            // copy a byte to the ringbuf when space becomes available
+            while (ringbuf_push(&self->ring_buffer, ((uint8_t *)appbuf->buf)[a_index]) == false) {
+                ;
+            }
+            a_index++;
+        } else if (self->io_mode == UASYNCIO) {
+            if (ringbuf_push(&self->ring_buffer, ((uint8_t *)appbuf->buf)[a_index]) == false) {
+                // ring buffer is full, exit
+                break;
+            } else {
+                a_index++;
+            }
+        } else {
+            return 0;  // should never get here (non-blocking mode does not use this function)
+        }
+    }
+
+    return a_index;
+}
+
+// function is used in IRQ context
+STATIC void copy_appbuf_to_ringbuf_non_blocking(machine_i2s_obj_t *self) {
+
+    // copy audio samples from app buffer into ring buffer
+    uint32_t num_bytes_remaining_to_copy = self->non_blocking_descriptor.appbuf.len - self->non_blocking_descriptor.index;
+    uint32_t num_bytes_to_copy = MIN(SIZEOF_NON_BLOCKING_COPY_IN_BYTES, num_bytes_remaining_to_copy);
+
+    if (ringbuf_available_space(&self->ring_buffer) >= num_bytes_to_copy) {
+        for (uint32_t i = 0; i < num_bytes_to_copy; i++) {
+            ringbuf_push(&self->ring_buffer,
+                ((uint8_t *)self->non_blocking_descriptor.appbuf.buf)[self->non_blocking_descriptor.index + i]);
+        }
+
+        self->non_blocking_descriptor.index += num_bytes_to_copy;
+        if (self->non_blocking_descriptor.index >= self->non_blocking_descriptor.appbuf.len) {
+            self->non_blocking_descriptor.copy_in_progress = false;
+            mp_sched_schedule(self->callback_for_non_blocking, MP_OBJ_FROM_PTR(self));
+        }
+    }
+}
+
+// function is used in IRQ context
+STATIC void empty_dma(machine_i2s_obj_t *self, uint8_t *dma_buffer_p) {
+    // when space exists, copy samples into ring buffer
+    if (ringbuf_available_space(&self->ring_buffer) >= SIZEOF_HALF_DMA_BUFFER_IN_BYTES) {
+        for (uint32_t i = 0; i < SIZEOF_HALF_DMA_BUFFER_IN_BYTES; i++) {
+            ringbuf_push(&self->ring_buffer, dma_buffer_p[i]);
+        }
+    }
+}
+
+// function is used in IRQ context
+STATIC void feed_dma(machine_i2s_obj_t *self, uint8_t *dma_buffer_p) {
+    // when data exists, copy samples from ring buffer
+    if (ringbuf_available_data(&self->ring_buffer) >= SIZEOF_HALF_DMA_BUFFER_IN_BYTES) {
+
+        // copy a block of samples from the ring buffer to the dma buffer.
+        // STM32 HAL API has a stereo I2S implementation, but not mono
+        // mono format is implemented by duplicating each sample into both L and R channels.
+        if ((self->format == MONO) && (self->bits == 16)) {
+            for (uint32_t i = 0; i < SIZEOF_HALF_DMA_BUFFER_IN_BYTES / 4; i++) {
+                for (uint8_t b = 0; b < sizeof(uint16_t); b++) {
+                    ringbuf_pop(&self->ring_buffer, &dma_buffer_p[i * 4 + b]);
+                    dma_buffer_p[i * 4 + b + 2] = dma_buffer_p[i * 4 + b]; // duplicated mono sample
+                }
+            }
+        } else if ((self->format == MONO) && (self->bits == 32)) {
+            for (uint32_t i = 0; i < SIZEOF_HALF_DMA_BUFFER_IN_BYTES / 8; i++) {
+                for (uint8_t b = 0; b < sizeof(uint32_t); b++) {
+                    ringbuf_pop(&self->ring_buffer, &dma_buffer_p[i * 8 + b]);
+                    dma_buffer_p[i * 8 + b + 4] = dma_buffer_p[i * 8 + b]; // duplicated mono sample
+                }
+            }
+        } else { // STEREO, both 16-bit and 32-bit
+            for (uint32_t i = 0; i < SIZEOF_HALF_DMA_BUFFER_IN_BYTES; i++) {
+                ringbuf_pop(&self->ring_buffer, &dma_buffer_p[i]);
+            }
+        }
+    } else {
+        // underflow.  clear buffer to transmit "silence" on the I2S bus
+        memset(dma_buffer_p, 0, SIZEOF_HALF_DMA_BUFFER_IN_BYTES);
+    }
+}
+
+STATIC void irq_configure(machine_i2s_obj_t *self) {
+    if (self->i2s_id == 0) {
+        irq_set_exclusive_handler(DMA_IRQ_0, dma_irq0_handler);
+        irq_set_enabled(DMA_IRQ_0, true);
+    } else {
+        irq_set_exclusive_handler(DMA_IRQ_1, dma_irq1_handler);
+        irq_set_enabled(DMA_IRQ_1, true);
+    }
+}
+
+STATIC void irq_deinit(machine_i2s_obj_t *self) {
+    if (self->i2s_id == 0) {
+        irq_set_enabled(DMA_IRQ_0, false);
+        irq_remove_handler(DMA_IRQ_0, dma_irq0_handler);
+    } else {
+        irq_set_enabled(DMA_IRQ_1, false);
+        irq_remove_handler(DMA_IRQ_1, dma_irq1_handler);
+    }
+}
+
+STATIC void pio_configure(machine_i2s_obj_t *self) {
+    if (self->mode == TX) {
+        if (self->bits == 16) {
+            self->pio_program = &pio_write_16;
+        } else {
+            self->pio_program = &pio_write_32;
+        }
+    } else { // RX
+        self->pio_program = &pio_read_32;
+    }
+
+    // find a PIO with a free state machine and adequate program space
+    PIO candidate_pio;
+    bool is_free_sm;
+    bool can_add_program;
+    for (uint8_t p = 0; p < NUM_PIOS; p++) {
+        candidate_pio = pio_instances[p];
+        is_free_sm = false;
+        can_add_program = false;
+
+        for (uint8_t sm = 0; sm < NUM_PIO_STATE_MACHINES; sm++) {
+            if (!pio_sm_is_claimed(candidate_pio, sm)) {
+                is_free_sm = true;
+                break;
+            }
+        }
+
+        if (pio_can_add_program(candidate_pio,  self->pio_program)) {
+            can_add_program = true;
+        }
+
+        if (is_free_sm && can_add_program) {
+            break;
+        }
+    }
+
+    if (!is_free_sm) {
+        mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("no free state machines"));
+    }
+
+    if (!can_add_program) {
+        mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("not enough PIO program space"));
+    }
+
+    self->pio = candidate_pio;
+    self->sm = pio_claim_unused_sm(self->pio, false);
+    self->prog_offset = pio_add_program(self->pio, self->pio_program);
+    pio_sm_init(self->pio, self->sm, self->prog_offset, NULL);
+
+    pio_sm_config config = pio_get_default_sm_config();
+
+    float pio_freq = self->rate *
+        SAMPLES_PER_FRAME *
+        dma_get_bits(self->mode, self->bits) *
+        PIO_INSTRUCTIONS_PER_BIT;
+    float clkdiv = clock_get_hz(clk_sys) / pio_freq;
+    sm_config_set_clkdiv(&config, clkdiv);
+
+    if (self->mode == TX) {
+        sm_config_set_out_pins(&config, self->sd, 1);
+        sm_config_set_out_shift(&config, false, true, dma_get_bits(self->mode, self->bits));
+        sm_config_set_fifo_join(&config, PIO_FIFO_JOIN_TX);  // double TX FIFO size
+    } else { // RX
+        sm_config_set_in_pins(&config, self->sd);
+        sm_config_set_in_shift(&config, false, true, dma_get_bits(self->mode, self->bits));
+        sm_config_set_fifo_join(&config, PIO_FIFO_JOIN_RX);  // double RX FIFO size
+    }
+
+    sm_config_set_sideset(&config, 2, false, false);
+    sm_config_set_sideset_pins(&config, self->sck);
+    sm_config_set_wrap(&config, self->prog_offset, self->prog_offset + self->pio_program->length - 1);
+    pio_sm_set_config(self->pio, self->sm, &config);
+}
+
+STATIC void pio_deinit(machine_i2s_obj_t *self) {
+    if (self->pio) {
+        pio_sm_set_enabled(self->pio, self->sm, false);
+        pio_sm_unclaim(self->pio, self->sm);
+        pio_remove_program(self->pio, self->pio_program, self->prog_offset);
+    }
+}
+
+STATIC void gpio_init_i2s(PIO pio, uint8_t sm, mp_hal_pin_obj_t pin_num, uint8_t pin_val, gpio_dir_t pin_dir) {
+    uint32_t pinmask = 1 << pin_num;
+    pio_sm_set_pins_with_mask(pio, sm, pin_val << pin_num, pinmask);
+    pio_sm_set_pindirs_with_mask(pio, sm, pin_dir << pin_num, pinmask);
+    pio_gpio_init(pio, pin_num);
+}
+
+STATIC void gpio_configure(machine_i2s_obj_t *self) {
+    gpio_init_i2s(self->pio, self->sm, self->sck, 0, GP_OUTPUT);
+    gpio_init_i2s(self->pio, self->sm, self->ws, 0, GP_OUTPUT);
+    if (self->mode == TX) {
+        gpio_init_i2s(self->pio, self->sm, self->sd, 0, GP_OUTPUT);
+    } else { // RX
+        gpio_init_i2s(self->pio, self->sm, self->sd, 0, GP_INPUT);
+    }
+}
+
+STATIC uint8_t dma_get_bits(i2s_mode_t mode, int8_t bits) {
+    if (mode == TX) {
+        return bits;
+    } else { // RX
+        // always read 32 bit words for I2S e.g.  I2S MEMS microphones
+        return 32;
+    }
+}
+
+// determine which DMA channel is associated to this IRQ
+STATIC uint dma_map_irq_to_channel(uint irq_index) {
+    for (uint ch = 0; ch < NUM_DMA_CHANNELS; ch++) {
+        if ((dma_irqn_get_channel_status(irq_index, ch))) {
+            return ch;
+        }
+    }
+    // This should never happen
+    return -1;
+}
+
+// note:  first DMA channel is mapped to the top half of buffer, second is mapped to the bottom half
+STATIC uint8_t *dma_get_buffer(machine_i2s_obj_t *i2s_obj, uint channel) {
+    for (uint8_t ch = 0; ch < I2S_NUM_DMA_CHANNELS; ch++) {
+        if (i2s_obj->dma_channel[ch] == channel) {
+            return i2s_obj->dma_buffer + (SIZEOF_HALF_DMA_BUFFER_IN_BYTES * ch);
+        }
+    }
+    // This should never happen
+    return NULL;
+}
+
+STATIC void dma_configure(machine_i2s_obj_t *self) {
+    uint8_t num_free_dma_channels = 0;
+    for (uint8_t ch = 0; ch < NUM_DMA_CHANNELS; ch++) {
+        if (!dma_channel_is_claimed(ch)) {
+            num_free_dma_channels++;
+        }
+    }
+    if (num_free_dma_channels < I2S_NUM_DMA_CHANNELS) {
+        mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("cannot claim 2 DMA channels"));
+    }
+
+    for (uint8_t ch = 0; ch < I2S_NUM_DMA_CHANNELS; ch++) {
+        self->dma_channel[ch] = dma_claim_unused_channel(false);
+    }
+
+    // The DMA channels are chained together.  The first DMA channel is used to access
+    // the top half of the DMA buffer.  The second DMA channel accesses the bottom half of the DMA buffer.
+    // With chaining, when one DMA channel has completed a data transfer, the other
+    // DMA channel automatically starts a new data transfer.
+    enum dma_channel_transfer_size dma_size = (dma_get_bits(self->mode, self->bits) == 16) ? DMA_SIZE_16 : DMA_SIZE_32;
+    for (uint8_t ch = 0; ch < I2S_NUM_DMA_CHANNELS; ch++) {
+        dma_channel_config dma_config = dma_channel_get_default_config(self->dma_channel[ch]);
+        channel_config_set_transfer_data_size(&dma_config, dma_size);
+        channel_config_set_chain_to(&dma_config, self->dma_channel[(ch + 1) % I2S_NUM_DMA_CHANNELS]);
+
+        uint8_t *dma_buffer = self->dma_buffer + (SIZEOF_HALF_DMA_BUFFER_IN_BYTES * ch);
+        if (self->mode == TX) {
+            channel_config_set_dreq(&dma_config, pio_get_dreq(self->pio, self->sm, true));
+            channel_config_set_read_increment(&dma_config, true);
+            channel_config_set_write_increment(&dma_config, false);
+            dma_channel_configure(self->dma_channel[ch],
+                &dma_config,
+                (void *)&self->pio->txf[self->sm],                      // dest = PIO TX FIFO
+                dma_buffer,                                             // src = DMA buffer
+                SIZEOF_HALF_DMA_BUFFER_IN_BYTES / (dma_get_bits(self->mode, self->bits) / 8),
+                false);
+        } else { // RX
+            channel_config_set_dreq(&dma_config, pio_get_dreq(self->pio, self->sm, false));
+            channel_config_set_read_increment(&dma_config, false);
+            channel_config_set_write_increment(&dma_config, true);
+            dma_channel_configure(self->dma_channel[ch],
+                &dma_config,
+                dma_buffer,                                             // dest = DMA buffer
+                (void *)&self->pio->rxf[self->sm],                      // src = PIO RX FIFO
+                SIZEOF_HALF_DMA_BUFFER_IN_BYTES / (dma_get_bits(self->mode, self->bits) / 8),
+                false);
+        }
+    }
+
+    for (uint8_t ch = 0; ch < I2S_NUM_DMA_CHANNELS; ch++) {
+        dma_irqn_acknowledge_channel(self->i2s_id, self->dma_channel[ch]);  // clear pending.  e.g. from SPI
+        dma_irqn_set_channel_enabled(self->i2s_id, self->dma_channel[ch], true);
+    }
+}
+
+STATIC void dma_deinit(machine_i2s_obj_t *self) {
+    for (uint8_t ch = 0; ch < I2S_NUM_DMA_CHANNELS; ch++) {
+        int channel = self->dma_channel[ch];
+
+        // unchain the channel to prevent triggering a transfer in the chained-to channel
+        dma_channel_config dma_config = dma_get_channel_config(channel);
+        channel_config_set_chain_to(&dma_config, channel);
+        dma_channel_set_config(channel, &dma_config, false);
+
+        dma_irqn_set_channel_enabled(self->i2s_id, channel, false);
+        dma_channel_abort(channel);  // in case a transfer is in flight
+        dma_channel_unclaim(channel);
+    }
+}
+
+STATIC void dma_irq_handler(uint8_t irq_index) {
+    int dma_channel = dma_map_irq_to_channel(irq_index);
+    if (dma_channel == -1) {
+        // This should never happen
+        return;
+    }
+
+    machine_i2s_obj_t *self = MP_STATE_PORT(machine_i2s_obj[irq_index]);
+    if (self == NULL) {
+        // This should never happen
+        return;
+    }
+
+    uint8_t *dma_buffer = dma_get_buffer(self, dma_channel);
+    if (dma_buffer == NULL) {
+        // This should never happen
+        return;
+    }
+
+    if (self->mode == TX) {
+        // for non-blocking operation handle the write() method requests.
+        if ((self->io_mode == NON_BLOCKING) && (self->non_blocking_descriptor.copy_in_progress)) {
+            copy_appbuf_to_ringbuf_non_blocking(self);
+        }
+
+        feed_dma(self, dma_buffer);
+        dma_irqn_acknowledge_channel(irq_index, dma_channel);
+        dma_channel_set_read_addr(dma_channel, dma_buffer, false);
+    } else { // RX
+        empty_dma(self, dma_buffer);
+        dma_irqn_acknowledge_channel(irq_index, dma_channel);
+        dma_channel_set_write_addr(dma_channel, dma_buffer, false);
+
+        // for non-blocking operation handle the readinto() method requests.
+        if ((self->io_mode == NON_BLOCKING) && (self->non_blocking_descriptor.copy_in_progress)) {
+            fill_appbuf_from_ringbuf_non_blocking(self);
+        }
+    }
+}
+
+STATIC void dma_irq0_handler(void) {
+    dma_irq_handler(0);
+}
+
+STATIC void dma_irq1_handler(void) {
+    dma_irq_handler(1);
+}
+
+STATIC void machine_i2s_init_helper(machine_i2s_obj_t *self, size_t n_pos_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+
+    enum {
+        ARG_sck,
+        ARG_ws,
+        ARG_sd,
+        ARG_mode,
+        ARG_bits,
+        ARG_format,
+        ARG_rate,
+        ARG_ibuf,
+    };
+
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_sck,      MP_ARG_KW_ONLY | MP_ARG_REQUIRED | MP_ARG_OBJ,   {.u_obj = MP_OBJ_NULL} },
+        { MP_QSTR_ws,       MP_ARG_KW_ONLY | MP_ARG_REQUIRED | MP_ARG_OBJ,   {.u_obj = MP_OBJ_NULL} },
+        { MP_QSTR_sd,       MP_ARG_KW_ONLY | MP_ARG_REQUIRED | MP_ARG_OBJ,   {.u_obj = MP_OBJ_NULL} },
+        { MP_QSTR_mode,     MP_ARG_KW_ONLY | MP_ARG_REQUIRED | MP_ARG_INT,   {.u_int = -1} },
+        { MP_QSTR_bits,     MP_ARG_KW_ONLY | MP_ARG_REQUIRED | MP_ARG_INT,   {.u_int = -1} },
+        { MP_QSTR_format,   MP_ARG_KW_ONLY | MP_ARG_REQUIRED | MP_ARG_INT,   {.u_int = -1} },
+        { MP_QSTR_rate,     MP_ARG_KW_ONLY | MP_ARG_REQUIRED | MP_ARG_INT,   {.u_int = -1} },
+        { MP_QSTR_ibuf,     MP_ARG_KW_ONLY | MP_ARG_REQUIRED | MP_ARG_INT,   {.u_int = -1} },
+    };
+
+    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
+    mp_arg_parse_all(n_pos_args, pos_args, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
+
+    //
+    // ---- Check validity of arguments ----
+    //
+
+    // are Pins valid?
+    mp_hal_pin_obj_t sck = args[ARG_sck].u_obj == MP_OBJ_NULL ? -1 : mp_hal_get_pin_obj(args[ARG_sck].u_obj);
+    mp_hal_pin_obj_t ws = args[ARG_ws].u_obj == MP_OBJ_NULL ? -1 : mp_hal_get_pin_obj(args[ARG_ws].u_obj);
+    mp_hal_pin_obj_t sd = args[ARG_sd].u_obj == MP_OBJ_NULL ? -1 : mp_hal_get_pin_obj(args[ARG_sd].u_obj);
+
+    // does WS pin follow SCK pin?
+    // note:  SCK and WS are implemented as PIO sideset pins.  Sideset pins must be sequential.
+    if (ws != (sck + 1)) {
+        mp_raise_ValueError(MP_ERROR_TEXT("invalid ws (must be sck+1)"));
+    }
+
+    // is Mode valid?
+    i2s_mode_t i2s_mode = args[ARG_mode].u_int;
+    if ((i2s_mode != RX) &&
+        (i2s_mode != TX)) {
+        mp_raise_ValueError(MP_ERROR_TEXT("invalid mode"));
+    }
+
+    // is Bits valid?
+    int8_t i2s_bits = args[ARG_bits].u_int;
+    if ((i2s_bits != 16) &&
+        (i2s_bits != 32)) {
+        mp_raise_ValueError(MP_ERROR_TEXT("invalid bits"));
+    }
+
+    // is Format valid?
+    format_t i2s_format = args[ARG_format].u_int;
+    if ((i2s_format != MONO) &&
+        (i2s_format != STEREO)) {
+        mp_raise_ValueError(MP_ERROR_TEXT("invalid format"));
+    }
+
+    // is Rate valid?
+    // Not checked
+
+    // is Ibuf valid?
+    int32_t ring_buffer_len = args[ARG_ibuf].u_int;
+    if (ring_buffer_len > 0) {
+        self->ring_buffer_storage = m_new(uint8_t, ring_buffer_len);
+        ;
+        ringbuf_init(&self->ring_buffer, self->ring_buffer_storage, ring_buffer_len);
+    } else {
+        mp_raise_ValueError(MP_ERROR_TEXT("invalid ibuf"));
+    }
+
+    self->sck = sck;
+    self->ws = ws;
+    self->sd = sd;
+    self->mode = i2s_mode;
+    self->bits = i2s_bits;
+    self->format = i2s_format;
+    self->rate = args[ARG_rate].u_int;
+    self->ibuf = ring_buffer_len;
+    self->callback_for_non_blocking = MP_OBJ_NULL;
+    self->non_blocking_descriptor.copy_in_progress = false;
+    self->io_mode = BLOCKING;
+
+    irq_configure(self);
+    pio_configure(self);
+    gpio_configure(self);
+    dma_configure(self);
+
+    pio_sm_set_enabled(self->pio, self->sm, true);
+    dma_channel_start(self->dma_channel[0]);
+}
+
+STATIC void machine_i2s_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+    machine_i2s_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    mp_printf(print, "I2S(id=%u,\n"
+        "sck="MP_HAL_PIN_FMT ",\n"
+        "ws="MP_HAL_PIN_FMT ",\n"
+        "sd="MP_HAL_PIN_FMT ",\n"
+        "mode=%u,\n"
+        "bits=%u, format=%u,\n"
+        "rate=%d, ibuf=%d)",
+        self->i2s_id,
+        mp_hal_pin_name(self->sck),
+        mp_hal_pin_name(self->ws),
+        mp_hal_pin_name(self->sd),
+        self->mode,
+        self->bits, self->format,
+        self->rate, self->ibuf
+        );
+}
+
+STATIC mp_obj_t machine_i2s_make_new(const mp_obj_type_t *type, size_t n_pos_args, size_t n_kw_args, const mp_obj_t *args) {
+    mp_arg_check_num(n_pos_args, n_kw_args, 1, MP_OBJ_FUN_ARGS_MAX, true);
+    uint8_t i2s_id = mp_obj_get_int(args[0]);
+
+    if (i2s_id >= MAX_I2S_RP2) {
+        mp_raise_ValueError(MP_ERROR_TEXT("invalid id"));
+    }
+
+    machine_i2s_obj_t *self;
+    if (MP_STATE_PORT(machine_i2s_obj[i2s_id]) == NULL) {
+        self = m_new_obj(machine_i2s_obj_t);
+        MP_STATE_PORT(machine_i2s_obj[i2s_id]) = self;
+        self->base.type = &machine_i2s_type;
+        self->i2s_id = i2s_id;
+    } else {
+        self = MP_STATE_PORT(machine_i2s_obj[i2s_id]);
+        machine_i2s_deinit(MP_OBJ_FROM_PTR(self));
+    }
+
+    mp_map_t kw_args;
+    mp_map_init_fixed_table(&kw_args, n_kw_args, args + n_pos_args);
+    machine_i2s_init_helper(self, n_pos_args - 1, args + 1, &kw_args);
+    return MP_OBJ_FROM_PTR(self);
+}
+
+STATIC mp_obj_t machine_i2s_init(size_t n_pos_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    machine_i2s_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]);
+    machine_i2s_deinit(MP_OBJ_FROM_PTR(self));
+    machine_i2s_init_helper(self, n_pos_args - 1, pos_args + 1, kw_args);
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_KW(machine_i2s_init_obj, 1, machine_i2s_init);
+
+STATIC mp_obj_t machine_i2s_deinit(mp_obj_t self_in) {
+    machine_i2s_obj_t *self = MP_OBJ_TO_PTR(self_in);
+
+    // use self->pio as in indication that I2S object has already been de-initialized
+    if (self->pio != NULL) {
+        pio_deinit(self);
+        dma_deinit(self);
+        irq_deinit(self);
+        m_free(self->ring_buffer_storage);
+        self->pio = NULL;  // flag object as de-initialized
+    }
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_i2s_deinit_obj, machine_i2s_deinit);
+
+STATIC mp_obj_t machine_i2s_irq(mp_obj_t self_in, mp_obj_t handler) {
+    machine_i2s_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    if (handler != mp_const_none && !mp_obj_is_callable(handler)) {
+        mp_raise_ValueError(MP_ERROR_TEXT("invalid callback"));
+    }
+
+    if (handler != mp_const_none) {
+        self->io_mode = NON_BLOCKING;
+    } else {
+        self->io_mode = BLOCKING;
+    }
+
+    self->callback_for_non_blocking = handler;
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(machine_i2s_irq_obj, machine_i2s_irq);
+
+// Shift() is typically used as a volume control.
+// shift=1 increases volume by 6dB, shift=-1 decreases volume by 6dB
+STATIC mp_obj_t machine_i2s_shift(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    enum { ARG_buf, ARG_bits, ARG_shift};
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_buf,    MP_ARG_REQUIRED | MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
+        { MP_QSTR_bits,   MP_ARG_REQUIRED | MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} },
+        { MP_QSTR_shift, MP_ARG_REQUIRED | MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} },
+    };
+
+    // parse args
+    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
+    mp_arg_parse_all(n_args, pos_args, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
+
+    mp_buffer_info_t bufinfo;
+    mp_get_buffer_raise(args[ARG_buf].u_obj, &bufinfo, MP_BUFFER_RW);
+
+    int16_t *buf_16 = bufinfo.buf;
+    int32_t *buf_32 = bufinfo.buf;
+
+    uint8_t bits = args[ARG_bits].u_int;
+    int8_t shift = args[ARG_shift].u_int;
+
+    uint32_t num_audio_samples;
+    switch (bits) {
+        case 16:
+            num_audio_samples = bufinfo.len / sizeof(uint16_t);
+            break;
+
+        case 32:
+            num_audio_samples = bufinfo.len / sizeof(uint32_t);
+            break;
+
+        default:
+            mp_raise_ValueError(MP_ERROR_TEXT("invalid bits"));
+            break;
+    }
+
+    for (uint32_t i = 0; i < num_audio_samples; i++) {
+        switch (bits) {
+            case 16:
+                if (shift >= 0) {
+                    buf_16[i] = buf_16[i] << shift;
+                } else {
+                    buf_16[i] = buf_16[i] >> abs(shift);
+                }
+                break;
+            case 32:
+                if (shift >= 0) {
+                    buf_32[i] = buf_32[i] << shift;
+                } else {
+                    buf_32[i] = buf_32[i] >> abs(shift);
+                }
+                break;
+        }
+    }
+
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_KW(machine_i2s_shift_fun_obj, 0, machine_i2s_shift);
+STATIC MP_DEFINE_CONST_STATICMETHOD_OBJ(machine_i2s_shift_obj, MP_ROM_PTR(&machine_i2s_shift_fun_obj));
+
+STATIC const mp_rom_map_elem_t machine_i2s_locals_dict_table[] = {
+    // Methods
+    { MP_ROM_QSTR(MP_QSTR_init),            MP_ROM_PTR(&machine_i2s_init_obj) },
+    { MP_ROM_QSTR(MP_QSTR_readinto),        MP_ROM_PTR(&mp_stream_readinto_obj) },
+    { MP_ROM_QSTR(MP_QSTR_write),           MP_ROM_PTR(&mp_stream_write_obj) },
+    { MP_ROM_QSTR(MP_QSTR_deinit),          MP_ROM_PTR(&machine_i2s_deinit_obj) },
+    { MP_ROM_QSTR(MP_QSTR_irq),             MP_ROM_PTR(&machine_i2s_irq_obj) },
+
+    // Static method
+    { MP_ROM_QSTR(MP_QSTR_shift),           MP_ROM_PTR(&machine_i2s_shift_obj) },
+
+    // Constants
+    { MP_ROM_QSTR(MP_QSTR_RX),              MP_ROM_INT(RX) },
+    { MP_ROM_QSTR(MP_QSTR_TX),              MP_ROM_INT(TX) },
+    { MP_ROM_QSTR(MP_QSTR_STEREO),          MP_ROM_INT(STEREO) },
+    { MP_ROM_QSTR(MP_QSTR_MONO),            MP_ROM_INT(MONO) },
+};
+MP_DEFINE_CONST_DICT(machine_i2s_locals_dict, machine_i2s_locals_dict_table);
+
+STATIC mp_uint_t machine_i2s_stream_read(mp_obj_t self_in, void *buf_in, mp_uint_t size, int *errcode) {
+    machine_i2s_obj_t *self = MP_OBJ_TO_PTR(self_in);
+
+    if (self->mode != RX) {
+        *errcode = MP_EPERM;
+        return MP_STREAM_ERROR;
+    }
+
+    uint8_t appbuf_sample_size_in_bytes = (self->bits / 8) * (self->format == STEREO ? 2: 1);
+    if (size % appbuf_sample_size_in_bytes != 0) {
+        *errcode = MP_EINVAL;
+        return MP_STREAM_ERROR;
+    }
+
+    if (size == 0) {
+        return 0;
+    }
+
+    if (self->io_mode == NON_BLOCKING) {
+        self->non_blocking_descriptor.appbuf.buf = (void *)buf_in;
+        self->non_blocking_descriptor.appbuf.len = size;
+        self->non_blocking_descriptor.index = 0;
+        self->non_blocking_descriptor.copy_in_progress = true;
+        return size;
+    } else { // blocking or uasyncio mode
+        mp_buffer_info_t appbuf;
+        appbuf.buf = (void *)buf_in;
+        appbuf.len = size;
+        uint32_t num_bytes_read = fill_appbuf_from_ringbuf(self, &appbuf);
+        return num_bytes_read;
+    }
+}
+
+STATIC mp_uint_t machine_i2s_stream_write(mp_obj_t self_in, const void *buf_in, mp_uint_t size, int *errcode) {
+    machine_i2s_obj_t *self = MP_OBJ_TO_PTR(self_in);
+
+    if (self->mode != TX) {
+        *errcode = MP_EPERM;
+        return MP_STREAM_ERROR;
+    }
+
+    if (size == 0) {
+        return 0;
+    }
+
+    if (self->io_mode == NON_BLOCKING) {
+        self->non_blocking_descriptor.appbuf.buf = (void *)buf_in;
+        self->non_blocking_descriptor.appbuf.len = size;
+        self->non_blocking_descriptor.index = 0;
+        self->non_blocking_descriptor.copy_in_progress = true;
+        return size;
+    } else { // blocking or uasyncio mode
+        mp_buffer_info_t appbuf;
+        appbuf.buf = (void *)buf_in;
+        appbuf.len = size;
+        uint32_t num_bytes_written = copy_appbuf_to_ringbuf(self, &appbuf);
+        return num_bytes_written;
+    }
+}
+
+STATIC mp_uint_t machine_i2s_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_t arg, int *errcode) {
+    machine_i2s_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    mp_uint_t ret;
+    uintptr_t flags = arg;
+    self->io_mode = UASYNCIO; // a call to ioctl() is an indication that uasyncio is being used
+
+    if (request == MP_STREAM_POLL) {
+        ret = 0;
+
+        if (flags & MP_STREAM_POLL_RD) {
+            if (self->mode != RX) {
+                *errcode = MP_EPERM;
+                return MP_STREAM_ERROR;
+            }
+
+            if (!ringbuf_is_empty(&self->ring_buffer)) {
+                ret |= MP_STREAM_POLL_RD;
+            }
+        }
+
+        if (flags & MP_STREAM_POLL_WR) {
+            if (self->mode != TX) {
+                *errcode = MP_EPERM;
+                return MP_STREAM_ERROR;
+            }
+
+            if (!ringbuf_is_full(&self->ring_buffer)) {
+                ret |= MP_STREAM_POLL_WR;
+            }
+        }
+    } else {
+        *errcode = MP_EINVAL;
+        ret = MP_STREAM_ERROR;
+    }
+
+    return ret;
+}
+
+STATIC const mp_stream_p_t i2s_stream_p = {
+    .read = machine_i2s_stream_read,
+    .write = machine_i2s_stream_write,
+    .ioctl = machine_i2s_ioctl,
+    .is_text = false,
+};
+
+const mp_obj_type_t machine_i2s_type = {
+    { &mp_type_type },
+    .name = MP_QSTR_I2S,
+    .print = machine_i2s_print,
+    .getiter = mp_identity_getiter,
+    .iternext = mp_stream_unbuffered_iter,
+    .protocol = &i2s_stream_p,
+    .make_new = machine_i2s_make_new,
+    .locals_dict = (mp_obj_dict_t *)&machine_i2s_locals_dict,
+};
diff --git a/ports/rp2/main.c b/ports/rp2/main.c
index 0dac85c49d001..793444c9a92cf 100644
--- a/ports/rp2/main.c
+++ b/ports/rp2/main.c
@@ -109,6 +109,7 @@ int main(int argc, char **argv) {
         readline_init0();
         machine_pin_init();
         rp2_pio_init();
+        machine_i2s_init0();
 
         #if MICROPY_PY_BLUETOOTH
         mp_bluetooth_hci_init();
diff --git a/ports/rp2/modmachine.c b/ports/rp2/modmachine.c
index 32dc3d22cca97..88e4bec2e8bad 100644
--- a/ports/rp2/modmachine.c
+++ b/ports/rp2/modmachine.c
@@ -163,6 +163,7 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_ADC),                 MP_ROM_PTR(&machine_adc_type) },
     { MP_ROM_QSTR(MP_QSTR_I2C),                 MP_ROM_PTR(&machine_hw_i2c_type) },
     { MP_ROM_QSTR(MP_QSTR_SoftI2C),             MP_ROM_PTR(&mp_machine_soft_i2c_type) },
+    { MP_ROM_QSTR(MP_QSTR_I2S),                 MP_ROM_PTR(&machine_i2s_type) },
     { MP_ROM_QSTR(MP_QSTR_Pin),                 MP_ROM_PTR(&machine_pin_type) },
     { MP_ROM_QSTR(MP_QSTR_PWM),                 MP_ROM_PTR(&machine_pwm_type) },
     { MP_ROM_QSTR(MP_QSTR_RTC),                 MP_ROM_PTR(&machine_rtc_type) },
diff --git a/ports/rp2/modmachine.h b/ports/rp2/modmachine.h
index 0c48565299bfb..af02cd193dff2 100644
--- a/ports/rp2/modmachine.h
+++ b/ports/rp2/modmachine.h
@@ -5,6 +5,7 @@
 
 extern const mp_obj_type_t machine_adc_type;
 extern const mp_obj_type_t machine_hw_i2c_type;
+extern const mp_obj_type_t machine_i2s_type;
 extern const mp_obj_type_t machine_pin_type;
 extern const mp_obj_type_t machine_rtc_type;
 extern const mp_obj_type_t machine_spi_type;
@@ -14,5 +15,6 @@ extern const mp_obj_type_t machine_wdt_type;
 
 void machine_pin_init(void);
 void machine_pin_deinit(void);
+void machine_i2s_init0(void);
 
 #endif // MICROPY_INCLUDED_RP2_MODMACHINE_H
diff --git a/ports/rp2/mpconfigport.h b/ports/rp2/mpconfigport.h
index 2794fda2e16ed..b40e18d2f80cd 100644
--- a/ports/rp2/mpconfigport.h
+++ b/ports/rp2/mpconfigport.h
@@ -176,6 +176,7 @@ struct _mp_bluetooth_nimble_malloc_t;
     void *rp2_state_machine_irq_obj[8]; \
     void *rp2_uart_rx_buffer[2]; \
     void *rp2_uart_tx_buffer[2]; \
+    void *machine_i2s_obj[2]; \
     NETWORK_ROOT_POINTERS \
     MICROPY_BOARD_ROOT_POINTERS \
     MICROPY_PORT_ROOT_POINTER_BLUETOOTH \

From 43079aaf860cbc19d54cec1eca9d5897297b22ac Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Sun, 15 Aug 2021 18:51:15 +0200
Subject: [PATCH 1389/3533] drivers/ninaw10: Add ublox Nina-W10 WiFi/BT module
 driver.

- Add WiFi/BT drivers for ublox Nina-W10 (esp32 based) module.
- Add ublox Nina-W10 Python module in extmod.
---
 drivers/ninaw10/nina_bsp.h      |  39 ++
 drivers/ninaw10/nina_bt_hci.c   | 150 ++++++
 drivers/ninaw10/nina_wifi_bsp.c | 139 +++++
 drivers/ninaw10/nina_wifi_drv.c | 913 ++++++++++++++++++++++++++++++++
 drivers/ninaw10/nina_wifi_drv.h | 120 +++++
 extmod/network_ninaw10.c        | 588 ++++++++++++++++++++
 tools/codeformat.py             |   1 +
 7 files changed, 1950 insertions(+)
 create mode 100644 drivers/ninaw10/nina_bsp.h
 create mode 100644 drivers/ninaw10/nina_bt_hci.c
 create mode 100644 drivers/ninaw10/nina_wifi_bsp.c
 create mode 100644 drivers/ninaw10/nina_wifi_drv.c
 create mode 100644 drivers/ninaw10/nina_wifi_drv.h
 create mode 100644 extmod/network_ninaw10.c

diff --git a/drivers/ninaw10/nina_bsp.h b/drivers/ninaw10/nina_bsp.h
new file mode 100644
index 0000000000000..362583843fa5d
--- /dev/null
+++ b/drivers/ninaw10/nina_bsp.h
@@ -0,0 +1,39 @@
+/*
+ * This file is part of the OpenMV project, https://openmv.io.
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013-2021 Ibrahim Abdelkader <iabdalkader@openmv.io>
+ * Copyright (c) 2013-2021 Kwabena W. Agyeman <kwagyeman@openmv.io>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * NINA-W10 driver BSP.
+ */
+#ifndef MICROPY_INCLUDED_DRIVERS_NINAW10_NINA_BSP_H
+#define MICROPY_INCLUDED_DRIVERS_NINAW10_NINA_BSP_H
+
+int nina_bsp_init(void);
+int nina_bsp_deinit(void);
+int nina_bsp_read_irq(void);
+int nina_bsp_spi_slave_select(uint32_t timeout);
+int nina_bsp_spi_slave_deselect(void);
+int nina_bsp_spi_transfer(const uint8_t *tx_buf, uint8_t *rx_buf, uint32_t size);
+
+#endif // MICROPY_INCLUDED_DRIVERS_NINAW10_NINA_BSP_H
diff --git a/drivers/ninaw10/nina_bt_hci.c b/drivers/ninaw10/nina_bt_hci.c
new file mode 100644
index 0000000000000..6dc3204471b0e
--- /dev/null
+++ b/drivers/ninaw10/nina_bt_hci.c
@@ -0,0 +1,150 @@
+/*
+ * This file is part of the OpenMV project, https://openmv.io.
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013-2021 Ibrahim Abdelkader <iabdalkader@openmv.io>
+ * Copyright (c) 2013-2021 Kwabena W. Agyeman <kwagyeman@openmv.io>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * NINA-W10 Bluetooth HCI driver.
+ */
+
+#include "py/mphal.h"
+
+#if MICROPY_PY_BLUETOOTH && MICROPY_PY_NETWORK_NINAW10
+
+#include <stdio.h>
+#include <string.h>
+
+#include "py/runtime.h"
+#include "extmod/mpbthci.h"
+
+#define HCI_COMMAND_PACKET      (0x01)
+#define HCI_ACLDATA_PACKET      (0x02)
+#define HCI_EVENT_PACKET        (0x04)
+
+#define HCI_COMMAND_COMPLETE    (0x0e)
+#define HCI_COMMAND_TIMEOUT     (3000)
+
+#define OGF_LINK_CTL            (0x01)
+#define OGF_HOST_CTL            (0x03)
+
+#define OCF_SET_EVENT_MASK      (0x0001)
+#define OCF_RESET               (0x0003)
+
+#define error_printf(...)   mp_printf(&mp_plat_print, "nina_bt_hci.c: " __VA_ARGS__)
+#define debug_printf(...)   // mp_printf(&mp_plat_print, "nina_bt_hci.c: " __VA_ARGS__)
+
+// Provided by the port, and also possibly shared with the stack.
+extern uint8_t mp_bluetooth_hci_cmd_buf[4 + 256];
+
+static int nina_hci_cmd(int ogf, int ocf, size_t param_len, const uint8_t *param_buf) {
+    uint8_t *buf = mp_bluetooth_hci_cmd_buf;
+
+    buf[0] = HCI_COMMAND_PACKET;
+    buf[1] = ocf;
+    buf[2] = ogf << 2 | ocf >> 8;
+    buf[3] = param_len;
+
+    if (param_len) {
+        memcpy(buf + 4, param_buf, param_len);
+    }
+
+    debug_printf("HCI Command: %02x %02x %02x %02x\n", buf[0], buf[1], buf[2], buf[3]);
+
+    mp_bluetooth_hci_uart_write(buf, 4 + param_len);
+
+    // Receive HCI event packet, initially reading 3 bytes (HCI Event, Event code, Plen).
+    for (mp_uint_t start = mp_hal_ticks_ms(), size = 3, i = 0; i < size;) {
+        while (!mp_bluetooth_hci_uart_any()) {
+            MICROPY_EVENT_POLL_HOOK
+            // Timeout.
+            if ((mp_hal_ticks_ms() - start) > HCI_COMMAND_TIMEOUT) {
+                error_printf("timeout waiting for HCI packet\n");
+                return -1;
+            }
+        }
+
+        buf[i] = mp_bluetooth_hci_uart_readchar();
+
+        // There seems to be a sync issue with this fw/module.
+        if (i == 0 && buf[0] == 0xFF) {
+            continue;
+        }
+
+        // Check for packet type.
+        if (i == 0 && buf[0] != HCI_EVENT_PACKET) {
+            error_printf("unexpected HCI packet: %02x\n", buf[0]);
+            return -1;
+        }
+
+        // Sanity check the packet parameters length.
+        if (i == 2 && ((size += buf[2]) > sizeof(mp_bluetooth_hci_cmd_buf))) {
+            error_printf("unexpected event packet length: %d\n", size);
+            return -1;
+        }
+
+        i++;
+    }
+
+    // We're only looking for command complete events.
+    if (buf[1] != HCI_COMMAND_COMPLETE || buf[4] != ocf || buf[5] != (ogf << 2 | ocf >> 8)) {
+        error_printf("response mismatch: %02x %02x\n", buf[4], buf[5]);
+        return -1;
+    }
+
+    // Log event.
+    debug_printf("HCI Event packet: %02x %02x %02x %02x %02x %02x %02x\n",
+        buf[0], buf[1], buf[2], buf[3], buf[4], buf[5], buf[6]);
+
+    // Status code.
+    return buf[6];
+}
+
+int mp_bluetooth_hci_controller_init(void) {
+    // This is called immediately after the UART is initialised during stack initialisation.
+    mp_hal_pin_output(MICROPY_HW_NINA_GPIO1);
+    mp_hal_pin_output(MICROPY_HW_NINA_RESET);
+
+    mp_hal_pin_write(MICROPY_HW_NINA_GPIO1, 0);
+    mp_hal_pin_write(MICROPY_HW_NINA_RESET, 0);
+    mp_hal_delay_ms(100);
+
+    mp_hal_pin_write(MICROPY_HW_NINA_RESET, 1);
+    mp_hal_delay_ms(750);
+
+    // The UART must be re-initialize here because the GPIO1/RX pin is used initially
+    // to reset the module in Bluetooth mode. This will change back the pin to UART RX.
+    mp_bluetooth_hci_uart_init(0, 0);
+
+    // Send reset command
+    return nina_hci_cmd(OGF_HOST_CTL, OCF_RESET, 0, NULL);
+    // It seems that nothing else is needed for now.
+}
+
+int mp_bluetooth_hci_controller_deinit(void) {
+    // Reset module
+    mp_hal_pin_output(MICROPY_HW_NINA_RESET);
+    mp_hal_pin_write(MICROPY_HW_NINA_RESET, 0);
+    return 0;
+}
+
+#endif
diff --git a/drivers/ninaw10/nina_wifi_bsp.c b/drivers/ninaw10/nina_wifi_bsp.c
new file mode 100644
index 0000000000000..c5a9b9b10abf4
--- /dev/null
+++ b/drivers/ninaw10/nina_wifi_bsp.c
@@ -0,0 +1,139 @@
+/*
+ * This file is part of the OpenMV project, https://openmv.io.
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013-2021 Ibrahim Abdelkader <iabdalkader@openmv.io>
+ * Copyright (c) 2013-2021 Kwabena W. Agyeman <kwagyeman@openmv.io>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * NINA-W10 driver BSP implementation.
+ */
+
+#include "py/mphal.h"
+
+#if MICROPY_PY_NETWORK_NINAW10
+
+#include <stdint.h>
+#include <string.h>
+
+#include "py/runtime.h"
+#include "modmachine.h"
+#include "extmod/machine_spi.h"
+#include "mpconfigboard.h"
+
+#include "nina_bsp.h"
+#include "nina_wifi_drv.h"
+
+#if NINA_DEBUG
+#define debug_printf(...) mp_printf(&mp_plat_print, __VA_ARGS__)
+#else
+#define debug_printf(...)
+#endif
+
+int nina_bsp_init(void) {
+    mp_hal_pin_output(MICROPY_HW_NINA_GPIO1);
+    mp_hal_pin_input(MICROPY_HW_NINA_ACK);
+    mp_hal_pin_output(MICROPY_HW_NINA_RESET);
+    mp_hal_pin_output(MICROPY_HW_NINA_GPIO0);
+
+    // Reset module in WiFi mode
+    mp_hal_pin_write(MICROPY_HW_NINA_GPIO1, 1);
+    mp_hal_pin_write(MICROPY_HW_NINA_GPIO0, 1);
+
+    mp_hal_pin_write(MICROPY_HW_NINA_RESET, 0);
+    mp_hal_delay_ms(100);
+
+    mp_hal_pin_write(MICROPY_HW_NINA_RESET, 1);
+    mp_hal_delay_ms(750);
+
+    mp_hal_pin_write(MICROPY_HW_NINA_GPIO0, 0);
+    mp_hal_pin_input(MICROPY_HW_NINA_GPIO0);
+
+    // Initialize SPI.
+    mp_obj_t args[] = {
+        MP_OBJ_NEW_SMALL_INT(MICROPY_HW_WIFI_SPI_ID),
+        MP_OBJ_NEW_SMALL_INT(MICROPY_HW_WIFI_SPI_BAUDRATE),
+    };
+
+    MP_STATE_PORT(mp_wifi_spi) = machine_spi_type.make_new((mp_obj_t)&machine_spi_type, 2, 0, args);
+    return 0;
+}
+
+int nina_bsp_deinit(void) {
+    mp_hal_pin_output(MICROPY_HW_NINA_GPIO1);
+    mp_hal_pin_write(MICROPY_HW_NINA_GPIO1, 1);
+
+    mp_hal_pin_output(MICROPY_HW_NINA_RESET);
+    mp_hal_pin_write(MICROPY_HW_NINA_RESET, 0);
+    mp_hal_delay_ms(100);
+
+    mp_hal_pin_output(MICROPY_HW_NINA_GPIO0);
+    mp_hal_pin_write(MICROPY_HW_NINA_GPIO0, 1);
+    return 0;
+}
+
+int nina_bsp_read_irq(void) {
+    return mp_hal_pin_read(MICROPY_HW_NINA_GPIO0);
+}
+
+int nina_bsp_spi_slave_select(uint32_t timeout) {
+    // Wait for ACK to go low.
+    for (mp_uint_t start = mp_hal_ticks_ms(); mp_hal_pin_read(MICROPY_HW_NINA_ACK) == 1; mp_hal_delay_ms(1)) {
+        if ((mp_hal_ticks_ms() - start) >= timeout) {
+            return -1;
+        }
+    }
+
+    // Chip select.
+    mp_hal_pin_write(MICROPY_HW_NINA_GPIO1, 0);
+
+    // Wait for ACK to go high.
+    for (mp_uint_t start = mp_hal_ticks_ms(); mp_hal_pin_read(MICROPY_HW_NINA_ACK) == 0; mp_hal_delay_ms(1)) {
+        if ((mp_hal_ticks_ms() - start) >= 100) {
+            mp_hal_pin_write(MICROPY_HW_NINA_GPIO1, 1);
+            return -1;
+        }
+    }
+
+    return 0;
+}
+
+int nina_bsp_spi_slave_deselect(void) {
+    mp_hal_pin_write(MICROPY_HW_NINA_GPIO1, 1);
+    return 0;
+}
+
+int nina_bsp_spi_transfer(const uint8_t *tx_buf, uint8_t *rx_buf, uint32_t size) {
+    mp_obj_t mp_wifi_spi = MP_STATE_PORT(mp_wifi_spi);
+    ((mp_machine_spi_p_t *)machine_spi_type.protocol)->transfer(mp_wifi_spi, size, tx_buf, rx_buf);
+    #if NINA_DEBUG
+    for (int i = 0; i < size; i++) {
+        if (tx_buf) {
+            debug_printf("0x%x ", tx_buf[i]);
+        } else {
+            debug_printf("0x%x ", rx_buf[i]);
+        }
+    }
+    #endif
+    return 0;
+}
+
+#endif // MICROPY_PY_NETWORK_NINAW10
diff --git a/drivers/ninaw10/nina_wifi_drv.c b/drivers/ninaw10/nina_wifi_drv.c
new file mode 100644
index 0000000000000..70f1a4264c776
--- /dev/null
+++ b/drivers/ninaw10/nina_wifi_drv.c
@@ -0,0 +1,913 @@
+/*
+ * This file is part of the OpenMV project, https://openmv.io.
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013-2021 Ibrahim Abdelkader <iabdalkader@openmv.io>
+ * Copyright (c) 2013-2021 Kwabena W. Agyeman <kwagyeman@openmv.io>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * NINA-W10 WiFi driver.
+ */
+
+#include "py/mphal.h"
+
+#if MICROPY_PY_NETWORK_NINAW10
+
+#include <stdint.h>
+#include <string.h>
+#include <stdio.h>
+
+#include "nina_bsp.h"
+#include "nina_wifi_drv.h"
+
+#define SPI_ACK                 (1)
+#define SPI_ERR                 (0xFF)
+
+#define NO_SOCKET_AVAIL         (255)
+
+#define CMD_START               (0xE0)
+#define CMD_END                 (0xEE)
+#define CMD_ERROR               (0xEF)
+#define CMD_REPLY               (1 << 7)
+
+#define ARG_8BITS               (1)
+#define ARG_16BITS              (2)
+
+#define ARG_STR(x)              {strlen(x), (const void *)x}
+#define ARG_BYTE(x)             {1, (uint8_t  [1]) {x}}
+#define ARG_SHORT(x)            {2, (uint16_t [1]) {x}}
+#define ARG_WORD(x)             {4, (uint32_t [1]) {x}}
+
+#define NINA_ARGS(...)          (nina_args_t []) {__VA_ARGS__}
+#define NINA_VALS(...)          (nina_vals_t []) {__VA_ARGS__}
+
+#define NINA_SSELECT_TIMEOUT    (10000)
+#define NINA_RESPONSE_TIMEOUT   (1000)
+#define NINA_CONNECT_TIMEOUT    (10000)
+
+#if NINA_DEBUG
+#define debug_printf(...) mp_printf(&mp_plat_print, __VA_ARGS__)
+#else
+#define debug_printf(...)
+#endif
+
+#ifndef __REVSH
+#define __REVSH(x) ((((uint16_t)x) << 8) | (((uint16_t)x) >> 8))
+#endif
+
+typedef struct {
+    uint16_t size;
+    const void *data;
+} nina_args_t;
+
+typedef struct {
+    uint16_t *size;
+    void *data;
+} nina_vals_t;
+
+typedef enum {
+    // STA mode commands.
+    NINA_CMD_CONNECT_OPEN           = 0x10,
+    NINA_CMD_CONNECT_WEP            = 0x11,
+    NINA_CMD_CONNECT_WPA            = 0x12,
+    NINA_CMD_GET_SSID               = 0x23,
+    NINA_CMD_GET_BSSID              = 0x24,
+    NINA_CMD_GET_RSSI               = 0x25,
+    NINA_CMD_GET_ENCRYPT            = 0x26,
+
+    // AP mode commands.
+    NINA_CMD_START_AP_OPEN          = 0x18,
+    NINA_CMD_START_AP_WEP           = 0x19,
+
+    // AP mode scan commands.
+    NINA_CMD_AP_START_SCAN          = 0x36,
+    NINA_CMD_AP_SCAN_RESULT         = 0x27,
+    NINA_CMD_AP_GET_RSSI            = 0x32,
+    NINA_CMD_AP_GET_ENCRYPT         = 0x33,
+    NINA_CMD_AP_GET_BSSID           = 0x3C,
+    NINA_CMD_AP_GET_CHANNEL         = 0x3D,
+
+    // Disonnect/status commands.
+    NINA_CMD_DISCONNECT             = 0x30,
+    NINA_CMD_CONN_STATUS            = 0x20,
+
+    // Interface config commands.
+    NINA_CMD_SET_IF_CONFIG          = 0x14,
+    NINA_CMD_GET_IF_CONFIG          = 0x21,
+    NINA_CMD_SET_DNS_CONFIG         = 0x15,
+
+    // Hostname/Resolv commands.
+    NINA_CMD_SET_HOSTNAME           = 0x16,
+    NINA_CMD_HOST_BY_NAME           = 0x34,
+    NINA_CMD_GET_HOST_BY_NAME       = 0x35,
+
+    // Misc commands.
+    NINA_CMD_SET_POWER              = 0x17,
+    NINA_CMD_PING                   = 0x3E,
+    NINA_CMD_GET_TIME               = 0x3B,
+    NINA_CMD_GET_FW_VERSION         = 0x37,
+    NINA_CMD_DEBUG_MODE             = 0x1A,
+    NINA_CMD_TEMP_SENSOR            = 0x1B,
+    NINA_CMD_GET_MAC_ADDR           = 0x22,
+
+    // Sockets commands.
+    NINA_CMD_SOCKET_OPEN            = 0x3F,
+    NINA_CMD_SOCKET_CLOSE           = 0x2E,
+    NINA_CMD_SOCKET_CONNECT         = 0x2D,
+    NINA_CMD_SOCKET_ACCEPT          = 0x2B,
+    NINA_CMD_SOCKET_BIND            = 0x28,
+    NINA_CMD_SOCKET_STATE           = 0x2F,
+    NINA_CMD_SOCKET_REMOTE_ADDR     = 0x3A,
+
+    // TCP commands
+    NINA_CMD_TCP_SEND               = 0x44,
+    NINA_CMD_TCP_RECV               = 0x45,
+    NINA_CMD_TCP_ACK                = 0x2A,
+
+    // UDP commands.
+    NINA_CMD_UDP_SEND               = 0x46,
+    NINA_CMD_UDP_RECV               = 0x45,
+    NINA_CMD_UDP_ACK                = 0x39,
+
+    // Pin control commands.
+    NINA_CMD_SET_PIN_MODE           = 0x50,
+    NINA_CMD_SET_DIGITAL_WRITE      = 0x51,
+    NINA_CMD_GET_DIGITAL_READ       = 0x53,
+    NINA_CMD_SET_ANALOG_WRITE       = 0x52,
+    NINA_CMD_GET_ANALOG_READ        = 0x54,
+
+    // File send/recv commands.
+    NINA_CMD_CMD_WRITE_FILE         = 0x60,
+    NINA_CMD_CMD_READ_FILE          = 0x61,
+    NINA_CMD_CMD_DELETE_FILE        = 0x62,
+    NINA_CMD_CMD_EXISTS_FILE        = 0x63,
+    NINA_CMD_CMD_DOWNLOAD_FILE      = 0x64,
+
+    // OTA upgrade commands.
+    NINA_CMD_CMD_APPLY_OTA          = 0x65,
+    NINA_CMD_CMD_RENAME_FILE        = 0x66,
+    NINA_CMD_CMD_DOWNLOAD_OTA       = 0x67,
+} nina_cmd_t;
+
+typedef enum {
+    NINA_STATUS_IDLE      = 0,
+    NINA_STATUS_NO_SSID_AVAIL,
+    NINA_STATUS_SCAN_COMPLETED,
+    NINA_STATUS_CONNECTED,
+    NINA_STATUS_CONNECT_FAILED,
+    NINA_STATUS_CONNECTION_LOST,
+    NINA_STATUS_DISCONNECTED,
+    NINA_STATUS_AP_LISTENING,
+    NINA_STATUS_AP_CONNECTED,
+    NINA_STATUS_AP_FAILED
+} nina_status_t;
+
+typedef enum  {
+    SOCKET_STATE_CLOSED = 0,
+    SOCKET_STATE_LISTEN,
+    SOCKET_STATE_SYN_SENT,
+    SOCKET_STATE_SYN_RCVD,
+    SOCKET_STATE_ESTABLISHED,
+    SOCKET_STATE_FIN_WAIT_1,
+    SOCKET_STATE_FIN_WAIT_2,
+    SOCKET_STATE_CLOSE_WAIT,
+    SOCKET_STATE_CLOSING,
+    SOCKET_STATE_LAST_ACK,
+    SOCKET_STATE_TIME_WAIT
+} nina_sock_state_t;
+
+static uint8_t nina_bsp_spi_read_byte(void) {
+    uint8_t byte = 0;
+    nina_bsp_spi_transfer(NULL, &byte, 1);
+    return byte;
+}
+
+static int nina_wait_for_cmd(uint8_t cmd, uint32_t timeout) {
+    uint8_t buf = 0;
+    for (mp_uint_t start = mp_hal_ticks_ms(); ;) {
+        buf = nina_bsp_spi_read_byte();
+        if (buf == CMD_ERROR || buf == cmd
+            || ((mp_hal_ticks_ms() - start) >= timeout)) {
+            break;
+        }
+        mp_hal_delay_ms(1);
+    }
+
+    return (buf == cmd) ? 0 : -1;
+}
+
+static int nina_send_command(uint32_t cmd, uint32_t nargs, uint32_t width, nina_args_t *args) {
+    int ret = -1;
+    uint32_t length = 4; // 3 bytes header + 1 end byte
+
+    debug_printf("nina_send_command (cmd 0x%x nargs %d width %d): ", cmd, nargs, width);
+
+    if (nina_bsp_spi_slave_select(NINA_SSELECT_TIMEOUT) != 0) {
+        return -1;
+    }
+
+    // Send command header.
+    uint8_t cmdbuf_hdr[3] = {CMD_START, cmd, nargs};
+    if (nina_bsp_spi_transfer(cmdbuf_hdr, NULL, sizeof(cmdbuf_hdr)) != 0) {
+        goto error_out;
+    }
+
+    // Send command arg(s).
+    for (uint32_t i = 0; i < nargs; i++) {
+        // Send size MSB first if 2 bytes.
+        uint16_t size = (width == ARG_8BITS) ? args[i].size : __REVSH(args[i].size);
+
+        // Send arg length.
+        if (nina_bsp_spi_transfer((uint8_t *)&size, NULL, width) != 0) {
+            goto error_out;
+        }
+
+        // Send arg value.
+        if (nina_bsp_spi_transfer(args[i].data, NULL, args[i].size) != 0) {
+            goto error_out;
+        }
+        length += args[i].size + width;
+    }
+
+    // Send END byte + padding to multiple of 4.
+    uint8_t cmdbuf_end[4] = {CMD_END, 0xFF, 0xFF, 0xFF};
+    if (nina_bsp_spi_transfer(cmdbuf_end, NULL, 1 + (length % 4)) != 0) {
+        goto error_out;
+    }
+
+    // All good
+    ret = 0;
+
+error_out:
+    debug_printf("\n");
+    nina_bsp_spi_slave_deselect();
+    return ret;
+}
+
+static int nina_read_response(uint32_t cmd, uint32_t nvals, uint32_t width, nina_vals_t *vals) {
+    int ret = -1;
+
+    debug_printf("nina_read_response(cmd 0x%x nvals %d width %d): ", cmd, nvals, width);
+
+    // Read reply
+    if (nina_bsp_spi_slave_select(NINA_SSELECT_TIMEOUT) != 0) {
+        return -1;
+    }
+
+    // Wait for CMD_START
+    if (nina_wait_for_cmd(CMD_START, NINA_RESPONSE_TIMEOUT) != 0) {
+        goto error_out;
+    }
+
+    // Should return CMD + REPLY flag.
+    if (nina_bsp_spi_read_byte() != (cmd | CMD_REPLY)) {
+        goto error_out;
+    }
+
+    // Sanity check the number of returned values.
+    // NOTE: This is to handle the special case for the scan command.
+    uint32_t rvals = nina_bsp_spi_read_byte();
+    if (nvals > rvals) {
+        nvals = rvals;
+    }
+
+    // Read return value(s).
+    for (uint32_t i = 0; i < nvals; i++) {
+        // Read return value size.
+        uint16_t bytes = nina_bsp_spi_read_byte();
+        if (width == ARG_16BITS) {
+            bytes = (bytes << 8) | nina_bsp_spi_read_byte();
+        }
+
+        // Check the val fits the buffer.
+        if (*(vals[i].size) < bytes) {
+            goto error_out;
+        }
+
+        // Read the returned value.
+        if (nina_bsp_spi_transfer(NULL, vals[i].data, bytes) != 0) {
+            goto error_out;
+        }
+
+        // Set the size.
+        *(vals[i].size) = bytes;
+    }
+
+    if (nina_bsp_spi_read_byte() != CMD_END) {
+        goto error_out;
+    }
+
+    // All good
+    ret = 0;
+
+error_out:
+    debug_printf("\n");
+    nina_bsp_spi_slave_deselect();
+    return ret;
+}
+
+static int nina_send_command_read_ack(uint32_t cmd, uint32_t nargs, uint32_t width, nina_args_t *args) {
+    uint16_t size = 1;
+    uint8_t rval = SPI_ERR;
+    if (nina_send_command(cmd, nargs, width, args) != 0 ||
+        nina_read_response(cmd, 1, ARG_8BITS, NINA_VALS({&size, &rval})) != 0) {
+        return -1;
+    }
+    return rval;
+}
+
+static int nina_send_command_read_vals(uint32_t cmd, uint32_t nargs,
+    uint32_t argsw, nina_args_t *args, uint32_t nvals, uint32_t valsw, nina_vals_t *vals) {
+
+    if (nina_send_command(cmd, nargs, argsw, args) != 0 ||
+        nina_read_response(cmd, nvals, valsw, vals) != 0) {
+        return -1;
+    }
+    return 0;
+}
+
+int nina_init(void) {
+    // Initialize the BSP.
+    nina_bsp_init();
+    return 0;
+}
+
+int nina_deinit(void) {
+    return nina_bsp_deinit();
+}
+
+static int nina_connection_status() {
+    return nina_send_command_read_ack(NINA_CMD_CONN_STATUS, 0, ARG_8BITS, NULL);
+}
+
+static int nina_socket_status(uint8_t fd) {
+    return nina_send_command_read_ack(NINA_CMD_SOCKET_STATE,
+        1, ARG_8BITS, NINA_ARGS(ARG_BYTE(fd)));
+}
+
+static int nina_server_socket_status(uint8_t fd) {
+    return nina_send_command_read_ack(NINA_CMD_SOCKET_STATE & 0xF9,
+        1, ARG_8BITS, NINA_ARGS(ARG_BYTE(fd)));
+}
+
+int nina_connect(const char *ssid, uint8_t security, const char *key, uint16_t channel) {
+    uint8_t status = NINA_STATUS_CONNECT_FAILED;
+
+    if (key == NULL && security != NINA_SEC_OPEN) {
+        return -1;
+    }
+
+    switch (security) {
+        case NINA_SEC_OPEN:
+            if (nina_send_command_read_ack(NINA_CMD_CONNECT_OPEN,
+                1, ARG_8BITS, NINA_ARGS(ARG_STR(ssid))) != SPI_ACK) {
+                return -1;
+            }
+            break;
+        case NINA_SEC_WEP:
+            if (nina_send_command_read_ack(NINA_CMD_CONNECT_WEP,
+                2, ARG_8BITS, NINA_ARGS(ARG_STR(ssid), ARG_STR(key))) != SPI_ACK) {
+                return -1;
+            }
+            break;
+        case NINA_SEC_WPA_PSK:
+            if (nina_send_command_read_ack(NINA_CMD_CONNECT_WPA,
+                3, ARG_8BITS, NINA_ARGS(ARG_STR(ssid), ARG_BYTE(0), ARG_STR(key))) != SPI_ACK) {
+                return -1;
+            }
+            break;
+        default:
+            return -1;
+    }
+
+    for (mp_uint_t start = mp_hal_ticks_ms(); ; mp_hal_delay_ms(10)) {
+        status = nina_connection_status();
+        if ((status != NINA_STATUS_IDLE) && (status != NINA_STATUS_NO_SSID_AVAIL) && (status != NINA_STATUS_SCAN_COMPLETED)) {
+            break;
+        }
+
+        if ((mp_hal_ticks_ms() - start) >= NINA_CONNECT_TIMEOUT) {
+            break;
+        }
+    }
+
+    return (status == NINA_STATUS_CONNECTED) ? 0 : -1;
+}
+
+int nina_start_ap(const char *ssid, uint8_t security, const char *key, uint16_t channel) {
+    uint8_t status = NINA_STATUS_AP_FAILED;
+
+    if ((key == NULL && security != NINA_SEC_OPEN) ||
+        (security != NINA_SEC_OPEN && security != NINA_SEC_WEP)) {
+        return -1;
+    }
+
+    switch (security) {
+        case NINA_SEC_OPEN:
+            if (nina_send_command_read_ack(NINA_CMD_START_AP_OPEN,
+                2, ARG_8BITS, NINA_ARGS(ARG_STR(ssid), ARG_BYTE(channel))) != SPI_ACK) {
+                return -1;
+            }
+            break;
+        case NINA_SEC_WEP:
+            if (nina_send_command_read_ack(NINA_CMD_START_AP_WEP,
+                3, ARG_8BITS, NINA_ARGS(ARG_STR(ssid), ARG_STR(key), ARG_BYTE(channel))) != SPI_ACK) {
+                return -1;
+            }
+            break;
+        default:
+            return -1;
+    }
+
+    for (mp_uint_t start = mp_hal_ticks_ms(); ; mp_hal_delay_ms(10)) {
+        status = nina_connection_status();
+        if ((status != NINA_STATUS_IDLE) && (status != NINA_STATUS_NO_SSID_AVAIL) && (status != NINA_STATUS_SCAN_COMPLETED)) {
+            break;
+        }
+
+        if ((mp_hal_ticks_ms() - start) >= NINA_CONNECT_TIMEOUT) {
+            break;
+        }
+    }
+
+    return (status == NINA_STATUS_AP_LISTENING) ? 0 : -1;
+}
+
+int nina_disconnect(void) {
+    if (nina_send_command_read_ack(NINA_CMD_DISCONNECT,
+        1, ARG_8BITS, NINA_ARGS(ARG_BYTE(0xFF))) != SPI_ACK) {
+        return -1;
+    }
+    return 0;
+}
+
+int nina_isconnected(void) {
+    int status = nina_connection_status();
+    if (status == -1) {
+        return -1;
+    }
+    return status == NINA_STATUS_CONNECTED;
+}
+
+int nina_connected_sta(uint32_t *sta_ip) {
+    return -1;
+}
+
+int nina_wait_for_sta(uint32_t *sta_ip, uint32_t timeout) {
+    return NINA_ERROR_TIMEOUT;
+}
+
+int nina_ifconfig(nina_ifconfig_t *ifconfig, bool set) {
+    uint16_t ip_len = NINA_IPV4_ADDR_LEN;
+    uint16_t sub_len = NINA_IPV4_ADDR_LEN;
+    uint16_t gw_len = NINA_IPV4_ADDR_LEN;
+    uint16_t dns_len = NINA_IPV4_ADDR_LEN;
+
+    if (set) {
+        if (nina_send_command_read_ack(NINA_CMD_SET_IF_CONFIG,
+            4, ARG_8BITS,
+            NINA_ARGS(
+                ARG_BYTE(3),         // Valid number of args.
+                {ip_len,  ifconfig->ip_addr},
+                {gw_len,  ifconfig->gateway_addr},
+                {sub_len, ifconfig->subnet_addr})) != SPI_ACK) {
+            return -1;
+        }
+
+        if (nina_send_command_read_ack(NINA_CMD_SET_DNS_CONFIG,
+            3, ARG_8BITS,
+            NINA_ARGS(
+                ARG_BYTE(1),         // Valid number of args.
+                {dns_len, ifconfig->dns_addr},
+                {dns_len, ifconfig->dns_addr})) != SPI_ACK) {
+            return -1;
+        }
+
+    } else {
+        if (nina_send_command_read_vals(NINA_CMD_GET_IF_CONFIG,
+            1, ARG_8BITS, NINA_ARGS(ARG_BYTE(0xFF)),
+            3, ARG_8BITS,
+            NINA_VALS(
+                {&ip_len,  ifconfig->ip_addr},
+                {&sub_len, ifconfig->subnet_addr},
+                {&gw_len,  ifconfig->gateway_addr})) != 0) {
+            return -1;
+        }
+        // No command to get DNS ?
+        memcpy(ifconfig->dns_addr, ifconfig->gateway_addr, NINA_IPV4_ADDR_LEN);
+    }
+    return 0;
+}
+
+int nina_netinfo(nina_netinfo_t *netinfo) {
+    uint16_t rssi_len = 4;
+    uint16_t sec_len = 1;
+    uint16_t ssid_len = NINA_MAX_SSID_LEN;
+    uint16_t bssid_len = NINA_MAC_ADDR_LEN;
+
+    if (nina_send_command_read_vals(NINA_CMD_GET_RSSI,
+        1, ARG_8BITS, NINA_ARGS(ARG_BYTE(0xFF)),
+        1, ARG_8BITS, NINA_VALS({&rssi_len, &netinfo->rssi})) != 0) {
+        return -1;
+    }
+
+    if (nina_send_command_read_vals(NINA_CMD_GET_ENCRYPT,
+        1, ARG_8BITS, NINA_ARGS(ARG_BYTE(0xFF)),
+        1, ARG_8BITS, NINA_VALS({&sec_len, &netinfo->security})) != 0) {
+        return -1;
+    }
+
+    if (nina_send_command_read_vals(NINA_CMD_GET_SSID,
+        1, ARG_8BITS, NINA_ARGS(ARG_BYTE(0xFF)),
+        1, ARG_8BITS, NINA_VALS({&ssid_len, &netinfo->ssid})) != 0) {
+        return -1;
+    }
+
+    if (nina_send_command_read_vals(NINA_CMD_GET_BSSID,
+        1, ARG_8BITS, NINA_ARGS(ARG_BYTE(0xFF)),
+        1, ARG_8BITS, NINA_VALS({&bssid_len, &netinfo->bssid})) != 0) {
+        return -1;
+    }
+
+    return 0;
+}
+
+int nina_scan(nina_scan_callback_t scan_callback, void *arg, uint32_t timeout) {
+    uint16_t sizes[NINA_MAX_NETWORK_LIST];
+    char ssids[NINA_MAX_NETWORK_LIST][NINA_MAX_SSID_LEN];
+    nina_vals_t vals[NINA_MAX_NETWORK_LIST];
+
+    // Initialize the values list.
+    for (int i = 0; i < NINA_MAX_NETWORK_LIST; i++) {
+        sizes[i] = NINA_MAX_SSID_LEN - 1;
+        memset(ssids[i], 0, NINA_MAX_SSID_LEN);
+        vals[i].size = &sizes[i];
+        vals[i].data = ssids[i];
+    }
+
+    if (nina_send_command_read_ack(NINA_CMD_AP_START_SCAN,
+        0, ARG_8BITS, NULL) != SPI_ACK) {
+        return -1;
+    }
+
+    for (mp_uint_t start = mp_hal_ticks_ms(); ;) {
+        if (nina_send_command_read_vals(NINA_CMD_AP_SCAN_RESULT,
+            0, ARG_8BITS, NULL,
+            NINA_MAX_NETWORK_LIST, ARG_8BITS, vals) != 0) {
+            return -1;
+        }
+
+        if (ssids[0][0] != 0) {
+            // Found at least 1 network.
+            break;
+        }
+
+        if (timeout && (mp_hal_ticks_ms() - start) >= timeout) {
+            // Timeout, no networks.
+            return NINA_ERROR_TIMEOUT;
+        }
+
+        mp_hal_delay_ms(100);
+    }
+
+    for (int i = 0; i < NINA_MAX_NETWORK_LIST; i++) {
+        uint16_t rssi_len = 4;
+        uint16_t sec_len = 1;
+        uint16_t chan_len = 1;
+        uint16_t bssid_len = NINA_MAC_ADDR_LEN;
+        nina_scan_result_t scan_result;
+
+        if (ssids[i][0] == 0) {
+            break;
+        }
+
+        // Set AP SSID
+        strncpy(scan_result.ssid, ssids[i], NINA_MAX_SSID_LEN);
+
+        // Read AP RSSI
+        if (nina_send_command_read_vals(NINA_CMD_AP_GET_RSSI,
+            1, ARG_8BITS, NINA_ARGS(ARG_BYTE(i)),
+            1, ARG_8BITS, NINA_VALS({&rssi_len, &scan_result.rssi})) != 0) {
+            return -1;
+        }
+
+        // Read AP encryption type
+        if (nina_send_command_read_vals(NINA_CMD_AP_GET_ENCRYPT,
+            1, ARG_8BITS, NINA_ARGS(ARG_BYTE(i)),
+            1, ARG_8BITS, NINA_VALS({&sec_len, &scan_result.security})) != 0) {
+            return -1;
+        }
+
+        // Read AP channel
+        if (nina_send_command_read_vals(NINA_CMD_AP_GET_CHANNEL,
+            1, ARG_8BITS, NINA_ARGS(ARG_BYTE(i)),
+            1, ARG_8BITS, NINA_VALS({&chan_len, &scan_result.channel})) != 0) {
+            return -1;
+        }
+
+        // Read AP bssid
+        if (nina_send_command_read_vals(NINA_CMD_AP_GET_BSSID,
+            1, ARG_8BITS, NINA_ARGS(ARG_BYTE(i)),
+            1, ARG_8BITS, NINA_VALS({&bssid_len, scan_result.bssid})) != 0) {
+            return -1;
+        }
+
+        scan_callback(&scan_result, arg);
+    }
+
+    return 0;
+}
+
+int nina_get_rssi(void) {
+    uint16_t size = 4;
+    int32_t rssi = 0;
+    if (nina_send_command_read_vals(NINA_CMD_GET_RSSI,
+        1, ARG_8BITS, NINA_ARGS(ARG_BYTE(0xFF)),
+        1, ARG_8BITS, NINA_VALS({&size, &rssi})) != 0) {
+        return -1;
+    }
+
+    return rssi;
+}
+
+int nina_fw_version(uint8_t *fw_ver) {
+    uint16_t size = NINA_FW_VER_LEN;
+    if (nina_send_command_read_vals(NINA_CMD_GET_FW_VERSION,
+        0, ARG_8BITS, NULL,
+        1, ARG_8BITS, NINA_VALS({&size, fw_ver})) != 0) {
+        return -1;
+    }
+    return 0;
+}
+
+int nina_set_hostname(const char *hostname) {
+    if (nina_send_command_read_ack(NINA_CMD_SET_HOSTNAME,
+        1, ARG_8BITS, NINA_ARGS(ARG_STR(hostname))) != SPI_ACK) {
+        return -1;
+    }
+    return 0;
+}
+
+int nina_gethostbyname(const char *name, uint8_t *out_ip) {
+    uint16_t size = 4;
+
+    if (nina_send_command_read_ack(NINA_CMD_HOST_BY_NAME,
+        1, ARG_8BITS, NINA_ARGS(ARG_STR(name))) != SPI_ACK) {
+        return -1;
+    }
+
+    if (nina_send_command_read_vals(NINA_CMD_GET_HOST_BY_NAME,
+        0, ARG_8BITS, NULL,
+        1, ARG_8BITS, NINA_VALS({&size, out_ip})) != 0) {
+        return -1;
+    }
+    return 0;
+}
+
+int nina_socket_socket(uint8_t type) {
+    uint16_t size = 1;
+    uint8_t sock = 0;
+
+    if (nina_send_command_read_vals(NINA_CMD_SOCKET_OPEN,
+        0, ARG_8BITS, NULL,
+        1, ARG_8BITS, NINA_VALS({&size, &sock})) != 0) {
+        return -1;
+    }
+    return sock;
+}
+
+int nina_socket_close(int fd) {
+    if (fd > 0 && fd < 255) {
+        if (nina_send_command_read_ack(NINA_CMD_SOCKET_CLOSE,
+            1, ARG_8BITS, NINA_ARGS(ARG_BYTE(fd))) != SPI_ACK) {
+            return -1;
+        }
+        for (mp_uint_t start = mp_hal_ticks_ms(); ; mp_hal_delay_ms(10)) {
+            if (nina_socket_status(fd) == SOCKET_STATE_CLOSED) {
+                break;
+            }
+            if ((mp_hal_ticks_ms() - start) >= 5000) {
+                return NINA_ERROR_TIMEOUT;
+            }
+        }
+    }
+    return 0;
+}
+
+int nina_socket_bind(int fd, uint8_t *ip, uint16_t port, int type) {
+    if (nina_send_command_read_ack(NINA_CMD_SOCKET_BIND,
+        3, ARG_8BITS,
+        NINA_ARGS(
+            ARG_SHORT(__REVSH(port)),
+            ARG_BYTE(fd),
+            ARG_BYTE(type))) != SPI_ACK) {
+        return -1;
+    }
+
+    // Only TCP sockets' states should be checked.
+    if (type == NINA_SOCKET_TYPE_TCP &&
+        nina_server_socket_status(fd) != SOCKET_STATE_LISTEN) {
+        return -1;
+    }
+    return 0;
+}
+
+int nina_socket_listen(int fd, uint32_t backlog) {
+    return 0; // No listen ?
+}
+
+int nina_socket_accept(int fd, uint8_t *ip, uint16_t *port, int *fd_out, uint32_t timeout) {
+    uint16_t size = 2;
+    uint16_t sock = NO_SOCKET_AVAIL;
+
+    if (nina_server_socket_status(fd) != SOCKET_STATE_LISTEN) {
+        return -1;
+    }
+
+    for (mp_uint_t start = mp_hal_ticks_ms(); sock == 0 || sock == NO_SOCKET_AVAIL; mp_hal_delay_ms(10)) {
+        if (nina_send_command_read_vals(NINA_CMD_SOCKET_ACCEPT,
+            1, ARG_8BITS, NINA_ARGS(ARG_BYTE(fd)),
+            1, ARG_8BITS, NINA_VALS({&size, &sock})) != 0) {
+            return -1;
+        }
+
+        if (timeout && (mp_hal_ticks_ms() - start) >= timeout) {
+            return NINA_ERROR_TIMEOUT;
+        }
+    }
+
+    uint16_t port_len = 2;
+    uint16_t ip_len = NINA_IPV4_ADDR_LEN;
+    if (nina_send_command_read_vals(NINA_CMD_SOCKET_REMOTE_ADDR,
+        1, ARG_8BITS, NINA_ARGS(ARG_BYTE(sock)),
+        2, ARG_8BITS, NINA_VALS({&ip_len, ip}, {&port_len, port})) != 0) {
+        return -1;
+    }
+    *fd_out = sock;
+    *port = __REVSH(*port);
+    return 0;
+}
+
+int nina_socket_connect(int fd, uint8_t *ip, uint16_t port, uint32_t timeout) {
+    if (nina_send_command_read_ack(NINA_CMD_SOCKET_CONNECT,
+        4, ARG_8BITS,
+        NINA_ARGS(
+            ARG_WORD((*(uint32_t *)ip)),
+            ARG_SHORT(__REVSH(port)),
+            ARG_BYTE(fd),
+            ARG_BYTE(NINA_SOCKET_TYPE_TCP))) != SPI_ACK) {
+        return -1;
+    }
+
+    for (mp_uint_t start = mp_hal_ticks_ms(); ; mp_hal_delay_ms(10)) {
+        int state = nina_socket_status(fd);
+        if (state == -1) {
+            return -1;
+        }
+
+        if (state == SOCKET_STATE_ESTABLISHED) {
+            break;
+        }
+
+        if (timeout && (mp_hal_ticks_ms() - start) >= timeout) {
+            return NINA_ERROR_TIMEOUT;
+        }
+    }
+
+    return 0;
+}
+
+int nina_socket_send(int fd, const uint8_t *buf, uint32_t len, uint32_t timeout) {
+    uint16_t size = 2;
+    uint16_t bytes = 0;
+
+    if (nina_socket_status(fd) != SOCKET_STATE_ESTABLISHED) {
+        return -1;
+    }
+
+    if (nina_send_command_read_vals(NINA_CMD_TCP_SEND,
+        2, ARG_16BITS, NINA_ARGS(ARG_BYTE(fd), {len, buf}),
+        1, ARG_8BITS, NINA_VALS({&size, &bytes})) != 0 || bytes <= 0) {
+        return -1;
+    }
+
+    for (mp_uint_t start = mp_hal_ticks_ms(); ;) {
+        int resp = nina_send_command_read_ack(NINA_CMD_TCP_ACK,
+            1, ARG_8BITS, NINA_ARGS(ARG_BYTE(fd)));
+
+        if (resp == -1) {
+            return -1;
+        }
+
+        if (resp == SPI_ACK) {
+            break;
+        }
+
+        if (timeout && (mp_hal_ticks_ms() - start) >= timeout) {
+            return NINA_ERROR_TIMEOUT;
+        }
+        mp_hal_delay_ms(1);
+    }
+
+    return bytes;
+}
+
+int nina_socket_recv(int fd, uint8_t *buf, uint32_t len, uint32_t timeout) {
+    uint16_t bytes = 0;
+
+    if (nina_socket_status(fd) != SOCKET_STATE_ESTABLISHED) {
+        return -1;
+    }
+
+    for (mp_uint_t start = mp_hal_ticks_ms(); bytes == 0; mp_hal_delay_ms(1)) {
+        bytes = len;
+        if (nina_send_command_read_vals(NINA_CMD_TCP_RECV,
+            2, ARG_16BITS, NINA_ARGS(ARG_BYTE(fd), ARG_SHORT(bytes)),
+            1, ARG_16BITS, NINA_VALS({&bytes, buf})) != 0) {
+            return -1;
+        }
+
+        if (timeout && (mp_hal_ticks_ms() - start) >= timeout) {
+            return NINA_ERROR_TIMEOUT;
+        }
+    }
+    return bytes;
+}
+
+// Check from the upper layer if the socket is bound, if not then auto-bind it first.
+int nina_socket_sendto(int fd, const uint8_t *buf, uint32_t len, uint8_t *ip, uint16_t port, uint32_t timeout) {
+    // TODO do we need to split the packet somewhere?
+    if (nina_send_command_read_ack(NINA_CMD_SOCKET_CONNECT,
+        4, ARG_8BITS,
+        NINA_ARGS(
+            ARG_WORD((*(uint32_t *)ip)),
+            ARG_SHORT(__REVSH(port)),
+            ARG_BYTE(fd),
+            ARG_BYTE(NINA_SOCKET_TYPE_UDP))) != SPI_ACK) {
+        return -1;
+    }
+
+    // Buffer length and socket number are passed as 16bits.
+    if (nina_send_command_read_ack(NINA_CMD_UDP_SEND,
+        2, ARG_16BITS, NINA_ARGS(ARG_BYTE(fd), {len, buf})) != SPI_ACK) {
+        return -1;
+    }
+
+    if (nina_send_command_read_ack(NINA_CMD_UDP_ACK,
+        1, ARG_8BITS, NINA_ARGS(ARG_BYTE(fd))) != SPI_ACK) {
+        return -1;
+    }
+
+    return 0;
+}
+
+// Check from the upper layer if the socket is bound, if not then auto-bind it first.
+int nina_socket_recvfrom(int fd, uint8_t *buf, uint32_t len, uint8_t *ip, uint16_t *port, uint32_t timeout) {
+    uint16_t bytes = 0;
+    uint16_t port_len = 2;
+    uint16_t ip_len = NINA_IPV4_ADDR_LEN;
+
+    for (mp_uint_t start = mp_hal_ticks_ms(); bytes == 0; mp_hal_delay_ms(1)) {
+        bytes = len;
+        if (nina_send_command_read_vals(NINA_CMD_UDP_RECV,
+            2, ARG_16BITS, NINA_ARGS(ARG_BYTE(fd), ARG_SHORT(bytes)),
+            1, ARG_16BITS, NINA_VALS({&bytes, buf})) != 0) {
+            return -1;
+        }
+
+        if (timeout && (mp_hal_ticks_ms() - start) >= timeout) {
+            return NINA_ERROR_TIMEOUT;
+        }
+    }
+    if (nina_send_command_read_vals(NINA_CMD_SOCKET_REMOTE_ADDR,
+        1, ARG_8BITS, NINA_ARGS(ARG_BYTE(fd)),
+        2, ARG_8BITS, NINA_VALS({&ip_len, ip}, {&port_len, port})) != 0) {
+        return -1;
+    }
+
+    return bytes;
+}
+
+int nina_socket_setsockopt(int fd, uint32_t level, uint32_t opt, const void *optval, uint32_t optlen) {
+    return -1;
+}
+
+#endif // MICROPY_PY_NINAW10
diff --git a/drivers/ninaw10/nina_wifi_drv.h b/drivers/ninaw10/nina_wifi_drv.h
new file mode 100644
index 0000000000000..d8c55f5e674e8
--- /dev/null
+++ b/drivers/ninaw10/nina_wifi_drv.h
@@ -0,0 +1,120 @@
+/*
+ * This file is part of the OpenMV project, https://openmv.io.
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013-2021 Ibrahim Abdelkader <iabdalkader@openmv.io>
+ * Copyright (c) 2013-2021 Kwabena W. Agyeman <kwagyeman@openmv.io>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * NINA-W10 WiFi driver.
+ */
+#ifndef MICROPY_INCLUDED_DRIVERS_NINAW10_NINA_WIFI_DRV_H
+#define MICROPY_INCLUDED_DRIVERS_NINAW10_NINA_WIFI_DRV_H
+
+#define NINA_FW_VER_LEN         (6)
+#define NINA_IPV4_ADDR_LEN      (4)
+#define NINA_MAC_ADDR_LEN       (6)
+#define NINA_MAX_SSID_LEN       (32)
+#define NINA_MAX_WEP_LEN        (13)
+#define NINA_MAX_WPA_LEN        (63)
+#define NINA_MAX_NETWORK_LIST   (10)
+#define NINA_MAX_SOCKET         (10)
+
+#define NINA_FW_VER_MAJOR       (1)
+#define NINA_FW_VER_MINOR       (4)
+#define NINA_FW_VER_PATCH       (8)
+
+#define NINA_FW_VER_MAJOR_OFFS  (0)
+#define NINA_FW_VER_MINOR_OFFS  (2)
+#define NINA_FW_VER_PATCH_OFFS  (4)
+
+typedef enum {
+    NINA_SEC_INVALID = 0,
+    NINA_SEC_OPEN,
+    NINA_SEC_WPA_PSK,
+    NINA_SEC_WEP
+} nina_security_t;
+
+typedef enum {
+    NINA_SOCKET_TYPE_TCP = 0,
+    NINA_SOCKET_TYPE_UDP,
+    NINA_SOCKET_TYPE_TLS,
+    NINA_SOCKET_TYPE_UDP_MULTICAST,
+    NINA_SOCKET_TYPE_TLS_BEARSSL
+} nina_socket_type_t;
+
+typedef enum {
+    NINA_ERROR_IO       = -1,
+    NINA_ERROR_TIMEOUT  = -2,
+} nina_error_t;
+
+typedef struct {
+    uint8_t ip_addr[NINA_IPV4_ADDR_LEN];
+    uint8_t subnet_addr[NINA_IPV4_ADDR_LEN];
+    uint8_t gateway_addr[NINA_IPV4_ADDR_LEN];
+    uint8_t dns_addr[NINA_IPV4_ADDR_LEN];
+} nina_ifconfig_t;
+
+typedef struct {
+    int32_t rssi;
+    uint8_t security;
+    uint8_t channel;
+    uint8_t bssid[NINA_MAC_ADDR_LEN];
+    char ssid[NINA_MAX_SSID_LEN];
+} nina_scan_result_t;
+
+typedef struct {
+    int32_t rssi;
+    uint8_t security;
+    char ssid[NINA_MAX_SSID_LEN];
+    uint8_t bssid[NINA_MAC_ADDR_LEN];
+} nina_netinfo_t;
+
+typedef int (*nina_scan_callback_t)(nina_scan_result_t *, void *);
+
+int nina_init(void);
+int nina_deinit(void);
+int nina_connect(const char *ssid, uint8_t security, const char *key, uint16_t channel);
+int nina_start_ap(const char *ssid, uint8_t security, const char *key, uint16_t channel);
+int nina_disconnect(void);
+int nina_isconnected(void);
+int nina_connected_sta(uint32_t *sta_ip);
+int nina_wait_for_sta(uint32_t *sta_ip, uint32_t timeout);
+int nina_ifconfig(nina_ifconfig_t *ifconfig, bool set);
+int nina_netinfo(nina_netinfo_t *netinfo);
+int nina_scan(nina_scan_callback_t scan_callback, void *arg, uint32_t timeout);
+int nina_get_rssi(void);
+int nina_fw_version(uint8_t *fw_ver);
+int nina_set_hostname(const char *name);
+int nina_gethostbyname(const char *name, uint8_t *out_ip);
+int nina_socket_socket(uint8_t type);
+int nina_socket_close(int fd);
+int nina_socket_bind(int fd, uint8_t *ip, uint16_t port, int type);
+int nina_socket_listen(int fd, uint32_t backlog);
+int nina_socket_accept(int fd, uint8_t *ip, uint16_t *port, int *fd_out, uint32_t timeout);
+int nina_socket_connect(int fd, uint8_t *ip, uint16_t port, uint32_t timeout);
+int nina_socket_send(int fd, const uint8_t *buf, uint32_t len, uint32_t timeout);
+int nina_socket_recv(int fd, uint8_t *buf, uint32_t len, uint32_t timeout);
+int nina_socket_sendto(int fd, const uint8_t *buf, uint32_t len, uint8_t *ip, uint16_t port, uint32_t timeout);
+int nina_socket_recvfrom(int fd, uint8_t *buf, uint32_t len, uint8_t *ip, uint16_t *port, uint32_t timeout);
+int nina_socket_setsockopt(int fd, uint32_t level, uint32_t opt, const void *optval, uint32_t optlen);
+
+#endif // MICROPY_INCLUDED_DRIVERS_NINAW10_NINA_WIFI_DRV_H
diff --git a/extmod/network_ninaw10.c b/extmod/network_ninaw10.c
new file mode 100644
index 0000000000000..aa4b8dd0c0912
--- /dev/null
+++ b/extmod/network_ninaw10.c
@@ -0,0 +1,588 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013-2021 Ibrahim Abdelkader <iabdalkader@openmv.io>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * NINA-W10 Python module.
+ */
+
+#include "py/mphal.h"
+
+#if MICROPY_PY_NETWORK && MICROPY_PY_NETWORK_NINAW10
+
+#include <string.h>
+#include <stdio.h>
+#include <stdarg.h>
+#include <stdint.h>
+
+#include "py/objtuple.h"
+#include "py/objlist.h"
+#include "py/stream.h"
+#include "py/runtime.h"
+#include "py/misc.h"
+#include "py/mperrno.h"
+#include "shared/netutils/netutils.h"
+#include "extmod/modnetwork.h"
+
+#include "nina_wifi_drv.h"
+
+typedef struct _nina_obj_t {
+    mp_obj_base_t base;
+    bool active;
+    uint32_t itf;
+} nina_obj_t;
+
+// For auto-binding UDP sockets
+#define BIND_PORT_RANGE_MIN (65000)
+#define BIND_PORT_RANGE_MAX (65535)
+
+static uint16_t bind_port = BIND_PORT_RANGE_MIN;
+const mod_network_nic_type_t mod_network_nic_type_nina;
+static nina_obj_t nina_obj = {{(mp_obj_type_t *)&mod_network_nic_type_nina}, false, MOD_NETWORK_STA_IF};
+
+STATIC mp_obj_t network_ninaw10_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
+    mp_arg_check_num(n_args, n_kw, 0, 1, false);
+
+    nina_obj.active = false;
+    if (n_args == 0) {
+        nina_obj.itf = MOD_NETWORK_STA_IF;
+    } else {
+        nina_obj.itf = mp_obj_get_int(args[0]);
+    }
+
+    // Reset autobind port.
+    bind_port = BIND_PORT_RANGE_MIN;
+
+    // Register with network module
+    mod_network_register_nic(MP_OBJ_FROM_PTR(&nina_obj));
+
+    return MP_OBJ_FROM_PTR(&nina_obj);
+}
+
+STATIC mp_obj_t network_ninaw10_active(size_t n_args, const mp_obj_t *args) {
+    nina_obj_t *self = MP_OBJ_TO_PTR(args[0]);
+    if (n_args == 2) {
+        bool active = mp_obj_is_true(args[1]);
+        if (active) {
+            int error = 0;
+            if ((error = nina_init()) != 0) {
+                mp_raise_msg_varg(&mp_type_OSError,
+                    MP_ERROR_TEXT("Failed to initialize Nina-W10 module, error: %d\n"), error);
+            }
+            // check firmware version
+            uint8_t fw_ver[NINA_FW_VER_LEN];
+            if (nina_fw_version(fw_ver) != 0) {
+                nina_deinit();
+                mp_raise_msg_varg(&mp_type_OSError,
+                    MP_ERROR_TEXT("Failed to read firmware version, error: %d\n"), error);
+            }
+            // Check fw version matches the driver.
+            if ((fw_ver[NINA_FW_VER_MAJOR_OFFS] - 48) != NINA_FW_VER_MAJOR ||
+                (fw_ver[NINA_FW_VER_MINOR_OFFS] - 48) != NINA_FW_VER_MINOR ||
+                (fw_ver[NINA_FW_VER_PATCH_OFFS] - 48) != NINA_FW_VER_PATCH) {
+                mp_printf(&mp_plat_print,
+                    "Warning: firmware version mismatch, expected %d.%d.%d found: %d.%d.%d\n",
+                    NINA_FW_VER_MAJOR, NINA_FW_VER_MINOR, NINA_FW_VER_PATCH,
+                    fw_ver[NINA_FW_VER_MAJOR_OFFS] - 48,
+                    fw_ver[NINA_FW_VER_MINOR_OFFS] - 48,
+                    fw_ver[NINA_FW_VER_PATCH_OFFS] - 48);
+            }
+        } else {
+            nina_deinit();
+        }
+        self->active = active;
+        return mp_const_none;
+    }
+    return mp_obj_new_bool(self->active);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(network_ninaw10_active_obj, 1, 2, network_ninaw10_active);
+
+STATIC int nina_scan_callback(nina_scan_result_t *scan_result, void *arg) {
+    mp_obj_t scan_list = (mp_obj_t)arg;
+
+    // Format MAC address
+    VSTR_FIXED(bssid_vstr, 18);
+    vstr_printf(&bssid_vstr, "%02X:%02X:%02X:%02X:%02X:%02X",
+        scan_result->bssid[0], scan_result->bssid[1], scan_result->bssid[2],
+        scan_result->bssid[3], scan_result->bssid[4], scan_result->bssid[5]);
+
+    mp_obj_t ap[5] = {
+        mp_obj_new_int(scan_result->channel),
+        mp_obj_new_int(scan_result->rssi),
+        mp_obj_new_int(scan_result->security),
+        mp_obj_new_str(bssid_vstr.buf, bssid_vstr.len),
+        mp_obj_new_str(scan_result->ssid, strlen(scan_result->ssid)),
+    };
+
+    mp_obj_list_append(scan_list, mp_obj_new_tuple(MP_ARRAY_SIZE(ap), ap));
+
+    return 0;
+}
+
+STATIC mp_obj_t network_ninaw10_scan(mp_obj_t self_in) {
+    mp_obj_t scan_list;
+    scan_list = mp_obj_new_list(0, NULL);
+    nina_scan(nina_scan_callback, scan_list, 10000);
+    return scan_list;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(network_ninaw10_scan_obj, network_ninaw10_scan);
+
+STATIC mp_obj_t network_ninaw10_connect(mp_uint_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_essid, MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
+        { MP_QSTR_key, MP_ARG_OBJ, {.u_obj = mp_const_none} },
+        { MP_QSTR_security, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = NINA_SEC_WPA_PSK} },
+        { MP_QSTR_channel,  MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 1} },
+    };
+
+    // parse args
+    nina_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]);
+    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
+    mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
+
+    // get ssid
+    const char *ssid = mp_obj_str_get_str(args[0].u_obj);
+
+    if (strlen(ssid) == 0) {
+        mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("SSID can't be empty!"));
+    }
+
+    // get key and sec
+    const char *key = NULL;
+    mp_uint_t security = NINA_SEC_OPEN;
+
+    if (args[1].u_obj != mp_const_none) {
+        key = mp_obj_str_get_str(args[1].u_obj);
+        security = args[2].u_int;
+    }
+
+    if (security != NINA_SEC_OPEN && strlen(key) == 0) {
+        mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("Key can't be empty!"));
+    }
+
+    if (self->itf == MOD_NETWORK_STA_IF) {
+        // Initialize WiFi in Station mode.
+        if (nina_connect(ssid, security, key, 0) != 0) {
+            mp_raise_msg_varg(&mp_type_OSError,
+                MP_ERROR_TEXT("could not connect to ssid=%s, sec=%d, key=%s\n"), ssid, security, key);
+        }
+    } else {
+        mp_uint_t channel = args[3].u_int;
+
+        if (security != NINA_SEC_OPEN && security != NINA_SEC_WEP) {
+            mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("AP mode supports WEP security only."));
+        }
+
+        // Initialize WiFi in AP mode.
+        if (nina_start_ap(ssid, security, key, channel) != 0) {
+            mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("failed to start in AP mode"));
+        }
+    }
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_KW(network_ninaw10_connect_obj, 1, network_ninaw10_connect);
+
+STATIC mp_obj_t network_ninaw10_disconnect(mp_obj_t self_in) {
+    nina_disconnect();
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(network_ninaw10_disconnect_obj, network_ninaw10_disconnect);
+
+STATIC mp_obj_t network_ninaw10_isconnected(mp_obj_t self_in) {
+    return mp_obj_new_bool(nina_isconnected());
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(network_ninaw10_isconnected_obj, network_ninaw10_isconnected);
+
+STATIC mp_obj_t network_ninaw10_ifconfig(size_t n_args, const mp_obj_t *args) {
+    nina_ifconfig_t ifconfig;
+    if (n_args == 1) {
+        // get ifconfig info
+        nina_ifconfig(&ifconfig, false);
+        mp_obj_t tuple[4] = {
+            netutils_format_ipv4_addr(ifconfig.ip_addr, NETUTILS_BIG),
+            netutils_format_ipv4_addr(ifconfig.subnet_addr, NETUTILS_BIG),
+            netutils_format_ipv4_addr(ifconfig.gateway_addr, NETUTILS_BIG),
+            netutils_format_ipv4_addr(ifconfig.dns_addr, NETUTILS_BIG),
+        };
+        return mp_obj_new_tuple(4, tuple);
+    } else {
+        // set ifconfig info
+        mp_obj_t *items;
+        mp_obj_get_array_fixed_n(args[1], 4, &items);
+        netutils_parse_ipv4_addr(items[0], ifconfig.ip_addr, NETUTILS_BIG);
+        netutils_parse_ipv4_addr(items[1], ifconfig.subnet_addr, NETUTILS_BIG);
+        netutils_parse_ipv4_addr(items[2], ifconfig.gateway_addr, NETUTILS_BIG);
+        netutils_parse_ipv4_addr(items[3], ifconfig.dns_addr, NETUTILS_BIG);
+        nina_ifconfig(&ifconfig, true);
+        return mp_const_none;
+    }
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(network_ninaw10_ifconfig_obj, 1, 2, network_ninaw10_ifconfig);
+
+STATIC mp_obj_t network_ninaw10_config(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs) {
+    nina_obj_t *self = MP_OBJ_TO_PTR(args[0]);
+    (void)self;
+
+    if (kwargs->used == 0) {
+        // Get config value
+        if (n_args != 2) {
+            mp_raise_TypeError(MP_ERROR_TEXT("must query one param"));
+        }
+
+        switch (mp_obj_str_get_qstr(args[1])) {
+            case MP_QSTR_essid: {
+                nina_netinfo_t netinfo;
+                nina_netinfo(&netinfo);
+                return mp_obj_new_str(netinfo.ssid, strlen(netinfo.ssid));
+            }
+            case MP_QSTR_security: {
+                nina_netinfo_t netinfo;
+                nina_netinfo(&netinfo);
+                return mp_obj_new_int(netinfo.security);
+            }
+            case MP_QSTR_mac:
+            case MP_QSTR_bssid: {
+                nina_netinfo_t netinfo;
+                nina_netinfo(&netinfo);
+                return mp_obj_new_bytes(netinfo.bssid, 6);
+            }
+            case MP_QSTR_fw_version: {
+                uint8_t fwver[NINA_FW_VER_LEN];
+                nina_fw_version(fwver);
+                return mp_obj_new_tuple(3, (mp_obj_t []) {
+                    mp_obj_new_int(fwver[NINA_FW_VER_MAJOR_OFFS] - 48),
+                    mp_obj_new_int(fwver[NINA_FW_VER_MINOR_OFFS] - 48),
+                    mp_obj_new_int(fwver[NINA_FW_VER_PATCH_OFFS] - 48)
+                });
+            }
+            default:
+                mp_raise_ValueError(MP_ERROR_TEXT("unknown config param"));
+        }
+    } else {
+        // Set config value(s)
+        // Not supported.
+        mp_raise_ValueError(MP_ERROR_TEXT("setting config values is not supported"));
+    }
+
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_KW(network_ninaw10_config_obj, 1, network_ninaw10_config);
+
+STATIC mp_obj_t network_ninaw10_status(size_t n_args, const mp_obj_t *args) {
+    nina_obj_t *self = MP_OBJ_TO_PTR(args[0]);
+    (void)self;
+
+    if (n_args == 1) {
+        // no arguments: return link status
+        return mp_obj_new_bool(nina_isconnected());
+    }
+
+    // Query parameter.
+    switch (mp_obj_str_get_qstr(args[1])) {
+        case MP_QSTR_rssi: {
+            nina_netinfo_t netinfo;
+            nina_netinfo(&netinfo);
+            return mp_obj_new_int(netinfo.rssi);
+        }
+        case MP_QSTR_stations: {
+            if (self->itf != MOD_NETWORK_AP_IF) {
+                mp_raise_ValueError(MP_ERROR_TEXT("AP required"));
+            }
+            uint32_t sta_ip = 0;
+            mp_obj_t sta_list = mp_obj_new_list(0, NULL);
+            if (nina_connected_sta(&sta_ip) == 0) {
+                mp_obj_list_append(sta_list,
+                    netutils_format_inet_addr((uint8_t *)&sta_ip, 0, NETUTILS_BIG));
+            }
+            return sta_list;
+        }
+    }
+
+    mp_raise_ValueError(MP_ERROR_TEXT("unknown status param"));
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(network_ninaw10_status_obj, 1, 2, network_ninaw10_status);
+
+STATIC int network_ninaw10_gethostbyname(mp_obj_t nic, const char *name, mp_uint_t len, uint8_t *out_ip) {
+    return nina_gethostbyname(name, out_ip);
+}
+
+STATIC int network_ninaw10_socket_socket(mod_network_socket_obj_t *socket, int *_errno) {
+    uint8_t type;
+
+    if (socket->domain != MOD_NETWORK_AF_INET) {
+        *_errno = MP_EAFNOSUPPORT;
+        return -1;
+    }
+
+    switch (socket->type) {
+        case MOD_NETWORK_SOCK_STREAM:
+            type = NINA_SOCKET_TYPE_TCP;
+            break;
+
+        case MOD_NETWORK_SOCK_DGRAM:
+            type = NINA_SOCKET_TYPE_UDP;
+            break;
+
+        default:
+            *_errno = MP_EINVAL;
+            return -1;
+    }
+
+    // open socket
+    int fd = nina_socket_socket(type);
+    if (fd < 0) {
+        *_errno = fd;
+        return -1;
+    }
+
+    // store state of this socket
+    socket->fileno = fd;
+    socket->timeout = 0; // blocking
+    socket->bound = false;
+    return 0;
+}
+
+STATIC void network_ninaw10_socket_close(mod_network_socket_obj_t *socket) {
+    if (socket->fileno >= 0) {
+        nina_socket_close(socket->fileno);
+        socket->fileno = -1; // Mark socket FD as invalid
+    }
+}
+
+STATIC int network_ninaw10_socket_bind(mod_network_socket_obj_t *socket, byte *ip, mp_uint_t port, int *_errno) {
+    uint8_t type;
+    switch (socket->type) {
+        case MOD_NETWORK_SOCK_STREAM:
+            type = NINA_SOCKET_TYPE_TCP;
+            break;
+
+        case MOD_NETWORK_SOCK_DGRAM:
+            type = NINA_SOCKET_TYPE_UDP;
+            break;
+
+        default:
+            *_errno = MP_EINVAL;
+            return -1;
+    }
+
+    int ret = nina_socket_bind(socket->fileno, ip, port, type);
+    if (ret < 0) {
+        *_errno = ret;
+        network_ninaw10_socket_close(socket);
+        return -1;
+    }
+
+    // Mark socket as bound to avoid auto-binding.
+    socket->bound = true;
+    return 0;
+}
+
+STATIC int network_ninaw10_socket_listen(mod_network_socket_obj_t *socket, mp_int_t backlog, int *_errno) {
+    int ret = nina_socket_listen(socket->fileno, backlog);
+    if (ret < 0) {
+        *_errno = ret;
+        network_ninaw10_socket_close(socket);
+        return -1;
+    }
+    return 0;
+}
+
+STATIC int network_ninaw10_socket_accept(mod_network_socket_obj_t *socket,
+    mod_network_socket_obj_t *socket2, byte *ip, mp_uint_t *port, int *_errno) {
+    int fd = 0;
+    // Call accept.
+    int ret = nina_socket_accept(socket->fileno, ip, (uint16_t *)port, &fd, socket->timeout);
+    if (ret < 0) {
+        *_errno = ret;
+        network_ninaw10_socket_close(socket);
+        return -1;
+    }
+
+    // Set default socket timeout.
+    socket2->fileno = fd;
+    socket2->timeout = 0;
+    socket2->bound = false;
+    return 0;
+}
+
+STATIC int network_ninaw10_socket_connect(mod_network_socket_obj_t *socket, byte *ip, mp_uint_t port, int *_errno) {
+    int ret = nina_socket_connect(socket->fileno, ip, port, socket->timeout);
+    if (ret < 0) {
+        *_errno = ret;
+        network_ninaw10_socket_close(socket);
+        return -1;
+    }
+    return 0;
+}
+
+STATIC mp_uint_t network_ninaw10_socket_send(mod_network_socket_obj_t *socket, const byte *buf, mp_uint_t len, int *_errno) {
+    int ret = nina_socket_send(socket->fileno, buf, len, socket->timeout);
+    if (ret == NINA_ERROR_TIMEOUT) {
+        // The socket is Not closed on timeout when calling functions that accept a timeout.
+        *_errno = MP_ETIMEDOUT;
+        return 0;
+    } else if (ret < 0) {
+        // Close the socket on any other errors.
+        *_errno = ret;
+        network_ninaw10_socket_close(socket);
+        return -1;
+    }
+    return ret;
+}
+
+STATIC mp_uint_t network_ninaw10_socket_recv(mod_network_socket_obj_t *socket, byte *buf, mp_uint_t len, int *_errno) {
+    int ret = nina_socket_recv(socket->fileno, buf, len, socket->timeout);
+    if (ret == NINA_ERROR_TIMEOUT) {
+        // The socket is Not closed on timeout when calling functions that accept a timeout.
+        *_errno = MP_ETIMEDOUT;
+        return 0;
+    } else if (ret < 0) {
+        // Close the socket on any other errors.
+        *_errno = ret;
+        network_ninaw10_socket_close(socket);
+        return -1;
+    }
+    return ret;
+}
+
+STATIC mp_uint_t network_ninaw10_socket_auto_bind(mod_network_socket_obj_t *socket, int *_errno) {
+    if (socket->bound == false) {
+        if (network_ninaw10_socket_bind(socket, NULL, bind_port, _errno) != 0) {
+            return -1;
+        }
+        bind_port++;
+        bind_port = MIN(MAX(bind_port, BIND_PORT_RANGE_MIN), BIND_PORT_RANGE_MAX);
+    }
+    return 0;
+}
+
+STATIC mp_uint_t network_ninaw10_socket_sendto(mod_network_socket_obj_t *socket,
+    const byte *buf, mp_uint_t len, byte *ip, mp_uint_t port, int *_errno) {
+    // Auto-bind the socket first if the socket is unbound.
+    if (network_ninaw10_socket_auto_bind(socket, _errno) != 0) {
+        return -1;
+    }
+
+    int ret = nina_socket_sendto(socket->fileno, buf, len, ip, port, socket->timeout);
+    if (ret == NINA_ERROR_TIMEOUT) {
+        // The socket is Not closed on timeout when calling functions that accept a timeout.
+        *_errno = MP_ETIMEDOUT;
+        return 0;
+    } else if (ret < 0) {
+        *_errno = ret;
+        network_ninaw10_socket_close(socket);
+        return -1;
+    }
+    return ret;
+}
+
+STATIC mp_uint_t network_ninaw10_socket_recvfrom(mod_network_socket_obj_t *socket,
+    byte *buf, mp_uint_t len, byte *ip, mp_uint_t *port, int *_errno) {
+    // Auto-bind the socket first if the socket is unbound.
+    if (network_ninaw10_socket_auto_bind(socket, _errno) != 0) {
+        return -1;
+    }
+
+    int ret = nina_socket_recvfrom(socket->fileno, buf, len, ip, (uint16_t *)port, socket->timeout);
+    if (ret == NINA_ERROR_TIMEOUT) {
+        // The socket is Not closed on timeout when calling functions that accept a timeout.
+        *_errno = MP_ETIMEDOUT;
+        return 0;
+    } else if (ret < 0) {
+        // Close the socket on any other errors.
+        *_errno = ret;
+        network_ninaw10_socket_close(socket);
+        return -1;
+    }
+    return ret;
+}
+
+STATIC int network_ninaw10_socket_setsockopt(mod_network_socket_obj_t *socket, mp_uint_t
+    level, mp_uint_t opt, const void *optval, mp_uint_t optlen, int *_errno) {
+    int ret = nina_socket_setsockopt(socket->fileno, level, opt, optval, optlen);
+    if (ret < 0) {
+        *_errno = ret;
+        network_ninaw10_socket_close(socket);
+        return -1;
+    }
+    return 0;
+}
+
+STATIC int network_ninaw10_socket_settimeout(mod_network_socket_obj_t *socket, mp_uint_t timeout_ms, int *_errno) {
+    if (timeout_ms == UINT32_MAX) {
+        // no timeout is given, set the socket to blocking mode.
+        timeout_ms = 0;
+    }
+    socket->timeout = timeout_ms;
+    return 0;
+}
+
+STATIC int network_ninaw10_socket_ioctl(mod_network_socket_obj_t *socket, mp_uint_t request, mp_uint_t arg, int *_errno) {
+    *_errno = MP_EIO;
+    return -1;
+}
+
+static const mp_rom_map_elem_t nina_locals_dict_table[] = {
+    { MP_ROM_QSTR(MP_QSTR_active),              MP_ROM_PTR(&network_ninaw10_active_obj) },
+    { MP_ROM_QSTR(MP_QSTR_scan),                MP_ROM_PTR(&network_ninaw10_scan_obj) },
+    { MP_ROM_QSTR(MP_QSTR_connect),             MP_ROM_PTR(&network_ninaw10_connect_obj) },
+    { MP_ROM_QSTR(MP_QSTR_disconnect),          MP_ROM_PTR(&network_ninaw10_disconnect_obj) },
+    { MP_ROM_QSTR(MP_QSTR_isconnected),         MP_ROM_PTR(&network_ninaw10_isconnected_obj) },
+    { MP_ROM_QSTR(MP_QSTR_ifconfig),            MP_ROM_PTR(&network_ninaw10_ifconfig_obj) },
+    { MP_ROM_QSTR(MP_QSTR_config),              MP_ROM_PTR(&network_ninaw10_config_obj) },
+    { MP_ROM_QSTR(MP_QSTR_status),              MP_ROM_PTR(&network_ninaw10_status_obj) },
+
+    // Network is not secured.
+    { MP_ROM_QSTR(MP_QSTR_OPEN),                MP_ROM_INT(NINA_SEC_OPEN) },
+    // Security type WEP (40 or 104).
+    { MP_ROM_QSTR(MP_QSTR_WEP),                 MP_ROM_INT(NINA_SEC_WEP) },
+    // Network secured with WPA/WPA2 personal(PSK).
+    { MP_ROM_QSTR(MP_QSTR_WPA_PSK),             MP_ROM_INT(NINA_SEC_WPA_PSK) },
+};
+
+static MP_DEFINE_CONST_DICT(nina_locals_dict, nina_locals_dict_table);
+
+const mod_network_nic_type_t mod_network_nic_type_nina = {
+    .base = {
+        { &mp_type_type },
+        .name = MP_QSTR_nina,
+        .make_new = network_ninaw10_make_new,
+        .locals_dict = (mp_obj_t)&nina_locals_dict,
+    },
+    .gethostbyname = network_ninaw10_gethostbyname,
+    .socket = network_ninaw10_socket_socket,
+    .close = network_ninaw10_socket_close,
+    .bind = network_ninaw10_socket_bind,
+    .listen = network_ninaw10_socket_listen,
+    .accept = network_ninaw10_socket_accept,
+    .connect = network_ninaw10_socket_connect,
+    .send = network_ninaw10_socket_send,
+    .recv = network_ninaw10_socket_recv,
+    .sendto = network_ninaw10_socket_sendto,
+    .recvfrom = network_ninaw10_socket_recvfrom,
+    .setsockopt = network_ninaw10_socket_setsockopt,
+    .settimeout = network_ninaw10_socket_settimeout,
+    .ioctl = network_ninaw10_socket_ioctl,
+};
+
+#endif // #if MICROPY_PY_BLUETOOTH && MICROPY_PY_NETWORK_NINAW10
diff --git a/tools/codeformat.py b/tools/codeformat.py
index ab12745fa541b..04cce1d830356 100755
--- a/tools/codeformat.py
+++ b/tools/codeformat.py
@@ -35,6 +35,7 @@
 # Relative to top-level repo dir.
 PATHS = [
     # C
+    "drivers/ninaw10/*.[ch]",
     "extmod/*.[ch]",
     "extmod/btstack/*.[ch]",
     "extmod/nimble/*.[ch]",

From 3745c393c82050a64445dbdf4c34836fa8664ce0 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Tue, 14 Sep 2021 22:22:17 +0200
Subject: [PATCH 1390/3533] rp2: Add support for Nina-W10 WiFi/BT module.

This commit integrates the Nina-W10 driver as an optional component in the
rp2 port.
---
 ports/rp2/CMakeLists.txt | 26 ++++++++++++++++++++++++++
 ports/rp2/mpconfigport.h | 20 ++++++++++++++++++--
 2 files changed, 44 insertions(+), 2 deletions(-)

diff --git a/ports/rp2/CMakeLists.txt b/ports/rp2/CMakeLists.txt
index e38cd8032dba2..0b433da53c1e8 100644
--- a/ports/rp2/CMakeLists.txt
+++ b/ports/rp2/CMakeLists.txt
@@ -166,6 +166,7 @@ if(MICROPY_PY_BLUETOOTH)
     list(APPEND MICROPY_SOURCE_PORT mpbthciport.c)
     target_compile_definitions(${MICROPY_TARGET} PRIVATE
         MICROPY_PY_BLUETOOTH=1
+        MICROPY_PY_BLUETOOTH_USE_SYNC_EVENTS=1
         MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE=1
         MICROPY_PY_BLUETOOTH_ENABLE_PAIRING_BONDING=1
         MICROPY_PY_BLUETOOTH_ENABLE_L2CAP_CHANNELS=1
@@ -188,6 +189,31 @@ if(MICROPY_BLUETOOTH_NIMBLE)
     list(APPEND MICROPY_INC_CORE ${NIMBLE_INCLUDE})
 endif()
 
+if (MICROPY_PY_NETWORK_NINAW10)
+    target_compile_definitions(${MICROPY_TARGET} PRIVATE
+        MICROPY_PY_NETWORK_NINAW10=1
+    )
+
+    target_include_directories(${MICROPY_TARGET} PRIVATE
+        ${MICROPY_DIR}/drivers/ninaw10/
+    )
+
+    # Enable NINA-W10 WiFi and Bluetooth drivers.
+    list(APPEND MICROPY_SOURCE_DRIVERS
+        ${MICROPY_DIR}/drivers/ninaw10/nina_bt_hci.c
+        ${MICROPY_DIR}/drivers/ninaw10/nina_wifi_drv.c
+        ${MICROPY_DIR}/drivers/ninaw10/nina_wifi_bsp.c
+    )
+
+    list(APPEND MICROPY_SOURCE_EXTMOD
+        ${MICROPY_DIR}/extmod/network_ninaw10.c
+    )
+
+    list(APPEND MICROPY_SOURCE_QSTR
+        ${MICROPY_DIR}/extmod/network_ninaw10.c
+    )
+endif()
+
 # Define mpy-cross flags and frozen manifest
 set(MICROPY_CROSS_FLAGS -march=armv7m)
 if (NOT MICROPY_FROZEN_MANIFEST)
diff --git a/ports/rp2/mpconfigport.h b/ports/rp2/mpconfigport.h
index b40e18d2f80cd..2e8a33a7a7598 100644
--- a/ports/rp2/mpconfigport.h
+++ b/ports/rp2/mpconfigport.h
@@ -154,6 +154,20 @@ struct _mp_bluetooth_nimble_malloc_t;
 #define MICROPY_PORT_ROOT_POINTER_BLUETOOTH_NIMBLE
 #endif
 
+#if MICROPY_PY_NETWORK_NINAW10
+// This Network interface requires the extended socket state.
+#ifndef MICROPY_PY_USOCKET_EXTENDED_STATE
+#define MICROPY_PY_USOCKET_EXTENDED_STATE   (1)
+#endif
+// It also requires an additional root pointer for the SPI object.
+#define MICROPY_PORT_ROOT_POINTER_NINAW10   struct _machine_spi_obj_t *mp_wifi_spi;
+extern const struct _mod_network_nic_type_t mod_network_nic_type_nina;
+#define MICROPY_HW_NIC_NINAW10              { MP_ROM_QSTR(MP_QSTR_WLAN), MP_ROM_PTR(&mod_network_nic_type_nina) },
+#else
+#define MICROPY_HW_NIC_NINAW10
+#define MICROPY_PORT_ROOT_POINTER_NINAW10
+#endif
+
 #define MICROPY_PORT_BUILTIN_MODULES \
     { MP_OBJ_NEW_QSTR(MP_QSTR_machine), (mp_obj_t)&mp_module_machine }, \
     { MP_OBJ_NEW_QSTR(MP_QSTR__onewire), (mp_obj_t)&mp_module_onewire }, \
@@ -163,12 +177,13 @@ struct _mp_bluetooth_nimble_malloc_t;
     SOCKET_BUILTIN_MODULE \
     NETWORK_BUILTIN_MODULE \
 
+#define MICROPY_PORT_NETWORK_INTERFACES \
+    MICROPY_HW_NIC_NINAW10  \
+
 #ifndef MICROPY_BOARD_ROOT_POINTERS
 #define MICROPY_BOARD_ROOT_POINTERS
 #endif
 
-#define MICROPY_PORT_NETWORK_INTERFACES \
-
 #define MICROPY_PORT_ROOT_POINTERS \
     const char *readline_hist[8]; \
     void *machine_pin_irq_obj[30]; \
@@ -179,6 +194,7 @@ struct _mp_bluetooth_nimble_malloc_t;
     void *machine_i2s_obj[2]; \
     NETWORK_ROOT_POINTERS \
     MICROPY_BOARD_ROOT_POINTERS \
+    MICROPY_PORT_ROOT_POINTER_NINAW10 \
     MICROPY_PORT_ROOT_POINTER_BLUETOOTH \
         MICROPY_PORT_ROOT_POINTER_BLUETOOTH_NIMBLE \
 

From f082793ac44dac77517bab3361a80f062b500345 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Mon, 15 Nov 2021 16:16:19 +0200
Subject: [PATCH 1391/3533] drivers/lsm6dsox: Add LSM6DSOX driver and examples.

---
 drivers/lsm6dsox/lsm6dsox.py       | 234 +++++++++++++++++++++++++++++
 drivers/lsm6dsox/lsm6dsox_basic.py |  13 ++
 drivers/lsm6dsox/lsm6dsox_mlc.py   |  48 ++++++
 3 files changed, 295 insertions(+)
 create mode 100644 drivers/lsm6dsox/lsm6dsox.py
 create mode 100644 drivers/lsm6dsox/lsm6dsox_basic.py
 create mode 100644 drivers/lsm6dsox/lsm6dsox_mlc.py

diff --git a/drivers/lsm6dsox/lsm6dsox.py b/drivers/lsm6dsox/lsm6dsox.py
new file mode 100644
index 0000000000000..56a3abcbe4459
--- /dev/null
+++ b/drivers/lsm6dsox/lsm6dsox.py
@@ -0,0 +1,234 @@
+"""
+LSM6DSOX STMicro driver for MicroPython based on LSM9DS1:
+Source repo: https://github.com/hoihu/projects/tree/master/raspi-hat
+
+The MIT License (MIT)
+
+Copyright (c) 2021 Damien P. George
+Copyright (c) 2021 Ibrahim Abdelkader <iabdalkader@openmv.io>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+Basic example usage:
+
+import time
+from lsm6dsox import LSM6DSOX
+
+from machine import Pin, I2C
+lsm = LSM6DSOX(I2C(0, scl=Pin(13), sda=Pin(12)))
+
+while (True):
+    print('Accelerometer: x:{:>8.3f} y:{:>8.3f} z:{:>8.3f}'.format(*lsm.read_accel()))
+    print('Gyroscope:     x:{:>8.3f} y:{:>8.3f} z:{:>8.3f}'.format(*lsm.read_gyro()))
+    print("")
+    time.sleep_ms(100)
+"""
+import array
+from micropython import const
+
+
+class LSM6DSOX:
+    _CTRL3_C = const(0x12)
+    _CTRL1_XL = const(0x10)
+    _CTRL8_XL = const(0x17)
+    _CTRL9_XL = const(0x18)
+
+    _CTRL2_G = const(0x11)
+    _CTRL7_G = const(0x16)
+
+    _OUTX_L_G = const(0x22)
+    _OUTX_L_XL = const(0x28)
+    _MLC_STATUS = const(0x38)
+
+    _DEFAULT_ADDR = const(0x6A)
+    _WHO_AM_I_REG = const(0x0F)
+
+    _FUNC_CFG_ACCESS = const(0x01)
+    _FUNC_CFG_BANK_USER = const(0)
+    _FUNC_CFG_BANK_HUB = const(1)
+    _FUNC_CFG_BANK_EMBED = const(2)
+
+    _MLC0_SRC = const(0x70)
+    _MLC_INT1 = const(0x0D)
+    _TAP_CFG0 = const(0x56)
+
+    _EMB_FUNC_EN_A = const(0x04)
+    _EMB_FUNC_EN_B = const(0x05)
+
+    def __init__(
+        self,
+        i2c,
+        address=_DEFAULT_ADDR,
+        gyro_odr=104,
+        accel_odr=104,
+        gyro_scale=2000,
+        accel_scale=4,
+        ucf=None,
+    ):
+        """Initalizes Gyro and Accelerator.
+        accel_odr: (0, 1.6Hz, 3.33Hz, 6.66Hz, 12.5Hz, 26Hz, 52Hz, 104Hz, 208Hz, 416Hz, 888Hz)
+        gyro_odr:  (0, 1.6Hz, 3.33Hz, 6.66Hz, 12.5Hz, 26Hz, 52Hz, 104Hz, 208Hz, 416Hz, 888Hz)
+        gyro_scale:  (245dps, 500dps, 1000dps, 2000dps)
+        accel_scale: (+/-2g, +/-4g, +/-8g, +-16g)
+        ucf: MLC program to load.
+        """
+        self.i2c = i2c
+        self.address = address
+
+        # check the id of the Accelerometer/Gyro
+        if self.__read_reg(_WHO_AM_I_REG) != 108:
+            raise OSError("No LSM6DS device was found at address 0x%x" % (self.address))
+
+        # allocate scratch buffer for efficient conversions and memread op's
+        self.scratch_int = array.array("h", [0, 0, 0])
+
+        SCALE_GYRO = {250: 0, 500: 1, 1000: 2, 2000: 3}
+        SCALE_ACCEL = {2: 0, 4: 2, 8: 3, 16: 1}
+        # XL_HM_MODE = 0 by default. G_HM_MODE = 0 by default.
+        ODR = {
+            0: 0x00,
+            1.6: 0x08,
+            3.33: 0x09,
+            6.66: 0x0A,
+            12.5: 0x01,
+            26: 0x02,
+            52: 0x03,
+            104: 0x04,
+            208: 0x05,
+            416: 0x06,
+            888: 0x07,
+        }
+
+        gyro_odr = round(gyro_odr, 2)
+        accel_odr = round(accel_odr, 2)
+
+        # Sanity checks
+        if not gyro_odr in ODR:
+            raise ValueError("Invalid sampling rate: %d" % accel_odr)
+        if not gyro_scale in SCALE_GYRO:
+            raise ValueError("invalid gyro scaling: %d" % gyro_scale)
+        if not accel_odr in ODR:
+            raise ValueError("Invalid sampling rate: %d" % accel_odr)
+        if not accel_scale in SCALE_ACCEL:
+            raise ValueError("invalid accelerometer scaling: %d" % accel_scale)
+
+        # Soft-reset the device.
+        self.reset()
+
+        # Load and configure MLC if UCF file is provided
+        if ucf != None:
+            self.load_mlc(ucf)
+
+        # Set Gyroscope datarate and scale.
+        # Note output from LPF2 second filtering stage is selected. See Figure 18.
+        self.__write_reg(_CTRL1_XL, (ODR[accel_odr] << 4) | (SCALE_ACCEL[accel_scale] << 2) | 2)
+
+        # Enable LPF2 and HPF fast-settling mode, ODR/4
+        self.__write_reg(_CTRL8_XL, 0x09)
+
+        # Set Gyroscope datarate and scale.
+        self.__write_reg(_CTRL2_G, (ODR[gyro_odr] << 4) | (SCALE_GYRO[gyro_scale] << 2) | 0)
+
+        self.gyro_scale = 32768 / gyro_scale
+        self.accel_scale = 32768 / accel_scale
+
+    def __read_reg(self, reg, size=1):
+        buf = self.i2c.readfrom_mem(self.address, reg, size)
+        if size == 1:
+            return int(buf[0])
+        return [int(x) for x in buf]
+
+    def __write_reg(self, reg, val):
+        self.i2c.writeto_mem(self.address, reg, bytes([val]))
+
+    def reset(self):
+        self.__write_reg(_CTRL3_C, self.__read_reg(_CTRL3_C) | 0x1)
+        for i in range(0, 10):
+            if (self.__read_reg(_CTRL3_C) & 0x01) == 0:
+                return
+            time.sleep_ms(10)
+        raise OSError("Failed to reset LSM6DS device.")
+
+    def set_mem_bank(self, bank):
+        cfg = self.__read_reg(_FUNC_CFG_ACCESS) & 0x3F
+        self.__write_reg(_FUNC_CFG_ACCESS, cfg | (bank << 6))
+
+    def set_embedded_functions(self, enable, emb_ab=None):
+        self.set_mem_bank(_FUNC_CFG_BANK_EMBED)
+        if enable:
+            self.__write_reg(_EMB_FUNC_EN_A, emb_ab[0])
+            self.__write_reg(_EMB_FUNC_EN_B, emb_ab[1])
+        else:
+            emb_a = self.__read_reg(_EMB_FUNC_EN_A)
+            emb_b = self.__read_reg(_EMB_FUNC_EN_B)
+            self.__write_reg(_EMB_FUNC_EN_A, (emb_a & 0xC7))
+            self.__write_reg(_EMB_FUNC_EN_B, (emb_b & 0xE6))
+            emb_ab = (emb_a, emb_b)
+
+        self.set_mem_bank(_FUNC_CFG_BANK_USER)
+        return emb_ab
+
+    def load_mlc(self, ucf):
+        # Load MLC config from file
+        with open(ucf, "r") as ucf_file:
+            for l in ucf_file:
+                if l.startswith("Ac"):
+                    v = [int(v, 16) for v in l.strip().split(" ")[1:3]]
+                    self.__write_reg(v[0], v[1])
+
+        emb_ab = self.set_embedded_functions(False)
+
+        # Disable I3C interface
+        self.__write_reg(_CTRL9_XL, self.__read_reg(_CTRL9_XL) | 0x01)
+
+        # Enable Block Data Update
+        self.__write_reg(_CTRL3_C, self.__read_reg(_CTRL3_C) | 0x40)
+
+        # Route signals on interrupt pin 1
+        self.set_mem_bank(_FUNC_CFG_BANK_EMBED)
+        self.__write_reg(_MLC_INT1, self.__read_reg(_MLC_INT1) & 0x01)
+        self.set_mem_bank(_FUNC_CFG_BANK_USER)
+
+        # Configure interrupt pin mode
+        self.__write_reg(_TAP_CFG0, self.__read_reg(_TAP_CFG0) | 0x41)
+
+        self.set_embedded_functions(True, emb_ab)
+
+    def read_mlc_output(self):
+        buf = None
+        if self.__read_reg(_MLC_STATUS) & 0x1:
+            self.__read_reg(0x1A, size=12)
+            self.set_mem_bank(_FUNC_CFG_BANK_EMBED)
+            buf = self.__read_reg(_MLC0_SRC, 8)
+            self.set_mem_bank(_FUNC_CFG_BANK_USER)
+        return buf
+
+    def read_gyro(self):
+        """Returns gyroscope vector in degrees/sec."""
+        mv = memoryview(self.scratch_int)
+        f = self.gyro_scale
+        self.i2c.readfrom_mem_into(self.address, _OUTX_L_G, mv)
+        return (mv[0] / f, mv[1] / f, mv[2] / f)
+
+    def read_accel(self):
+        """Returns acceleration vector in gravity units (9.81m/s^2)."""
+        mv = memoryview(self.scratch_int)
+        f = self.accel_scale
+        self.i2c.readfrom_mem_into(self.address, _OUTX_L_XL, mv)
+        return (mv[0] / f, mv[1] / f, mv[2] / f)
diff --git a/drivers/lsm6dsox/lsm6dsox_basic.py b/drivers/lsm6dsox/lsm6dsox_basic.py
new file mode 100644
index 0000000000000..6c747ae55c0e6
--- /dev/null
+++ b/drivers/lsm6dsox/lsm6dsox_basic.py
@@ -0,0 +1,13 @@
+# LSM6DSOX Basic Example.
+import time
+from lsm6dsox import LSM6DSOX
+
+from machine import Pin, I2C
+
+lsm = LSM6DSOX(I2C(0, scl=Pin(13), sda=Pin(12)))
+
+while True:
+    print("Accelerometer: x:{:>8.3f} y:{:>8.3f} z:{:>8.3f}".format(*lsm.read_accel()))
+    print("Gyroscope:     x:{:>8.3f} y:{:>8.3f} z:{:>8.3f}".format(*lsm.read_gyro()))
+    print("")
+    time.sleep_ms(100)
diff --git a/drivers/lsm6dsox/lsm6dsox_mlc.py b/drivers/lsm6dsox/lsm6dsox_mlc.py
new file mode 100644
index 0000000000000..866498d0ce13e
--- /dev/null
+++ b/drivers/lsm6dsox/lsm6dsox_mlc.py
@@ -0,0 +1,48 @@
+# LSM6DSOX IMU MLC (Machine Learning Core) Example.
+# Download the raw UCF file, copy to storage and reset.
+
+# NOTE: The pre-trained models (UCF files) for the examples can be found here:
+# https://github.com/STMicroelectronics/STMems_Machine_Learning_Core/tree/master/application_examples/lsm6dsox
+
+import time
+from lsm6dsox import LSM6DSOX
+from machine import Pin, I2C
+
+INT_MODE = True  # Run in interrupt mode.
+INT_FLAG = False  # Set True on interrupt.
+
+
+def imu_int_handler(pin):
+    global INT_FLAG
+    INT_FLAG = True
+
+
+if INT_MODE == True:
+    int_pin = Pin(24)
+    int_pin.irq(handler=imu_int_handler, trigger=Pin.IRQ_RISING)
+
+i2c = I2C(0, scl=Pin(13), sda=Pin(12))
+
+# Vibration detection example
+UCF_FILE = "lsm6dsox_vibration_monitoring.ucf"
+UCF_LABELS = {0: "no vibration", 1: "low vibration", 2: "high vibration"}
+# NOTE: Selected data rate and scale must match the MLC data rate and scale.
+lsm = LSM6DSOX(i2c, gyro_odr=26, accel_odr=26, gyro_scale=2000, accel_scale=4, ucf=UCF_FILE)
+
+# Head gestures example
+# UCF_FILE = "lsm6dsox_head_gestures.ucf"
+# UCF_LABELS = {0:"Nod", 1:"Shake", 2:"Stationary", 3:"Swing", 4:"Walk"}
+# NOTE: Selected data rate and scale must match the MLC data rate and scale.
+# lsm = LSM6DSOX(i2c, gyro_odr=26, accel_odr=26, gyro_scale=250, accel_scale=2, ucf=UCF_FILE)
+
+print("MLC configured...")
+
+while True:
+    if INT_MODE:
+        if INT_FLAG:
+            INT_FLAG = False
+            print(UCF_LABELS[lsm.read_mlc_output()[0]])
+    else:
+        buf = lsm.read_mlc_output()
+        if buf != None:
+            print(UCF_LABELS[buf[0]])

From c3dceb1c3223012ae29144182d14c19678005e05 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Sun, 15 Aug 2021 20:44:36 +0200
Subject: [PATCH 1392/3533] rp2/boards: Add support for Arduino Nano RP2040.

---
 .../ARDUINO_NANO_RP2040_CONNECT/board.json    | 25 ++++++++++++
 .../ARDUINO_NANO_RP2040_CONNECT/manifest.py   |  9 +++++
 .../mpconfigboard.cmake                       |  6 +++
 .../mpconfigboard.h                           | 39 +++++++++++++++++++
 4 files changed, 79 insertions(+)
 create mode 100644 ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/board.json
 create mode 100644 ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/manifest.py
 create mode 100644 ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/mpconfigboard.cmake
 create mode 100644 ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/mpconfigboard.h

diff --git a/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/board.json b/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/board.json
new file mode 100644
index 0000000000000..ca7ba089b894e
--- /dev/null
+++ b/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/board.json
@@ -0,0 +1,25 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [
+        "Breadboard Friendly",
+        "Castellated Pads",
+        "WiFi Nina-W102",
+        "Bluetooth Nina-W102",
+        "IMU LSM6DSOXTR",
+        "Crypto IC ATECC608A-MAHDA-T",
+        "Microphone MP34DT05",
+        "SPI Flash 16MB",
+        "USB-MICRO"
+    ],
+    "images": [
+        "ABX00052_01.iso_999x750.jpg"
+    ],
+    "mcu": "RP2040",
+    "product": "Arduino Nano RP2040 Connect",
+    "thumbnail": "",
+    "url": "https://store-usa.arduino.cc/products/arduino-nano-rp2040-connect",
+    "vendor": "Arduino"
+}
diff --git a/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/manifest.py b/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/manifest.py
new file mode 100644
index 0000000000000..a9c81576dadde
--- /dev/null
+++ b/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/manifest.py
@@ -0,0 +1,9 @@
+include("$(PORT_DIR)/boards/manifest.py")
+freeze("$(MPY_DIR)/drivers/lsm6dsox/", "lsm6dsox.py")
+include(
+    "$(MPY_LIB_DIR)/micropython/bluetooth/aioble/manifest.py",
+    client=True,
+    central=True,
+    l2cap=True,
+    security=True,
+)
diff --git a/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/mpconfigboard.cmake b/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/mpconfigboard.cmake
new file mode 100644
index 0000000000000..b31109ac53aed
--- /dev/null
+++ b/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/mpconfigboard.cmake
@@ -0,0 +1,6 @@
+# cmake file for Arduino Nano RP2040 Connect.
+set(MICROPY_PY_BLUETOOTH  1)
+set(MICROPY_BLUETOOTH_NIMBLE  1)
+set(MICROPY_PY_NETWORK_NINAW10 1)
+set(MICROPY_HW_ENABLE_DOUBLE_TAP 1)
+set(MICROPY_FROZEN_MANIFEST ${MICROPY_BOARD_DIR}/manifest.py)
diff --git a/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/mpconfigboard.h b/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/mpconfigboard.h
new file mode 100644
index 0000000000000..08995212e25fc
--- /dev/null
+++ b/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/mpconfigboard.h
@@ -0,0 +1,39 @@
+//Board config for Arduino Nano RP2040 Connect.
+
+// Board and hardware specific configuration
+#define MICROPY_HW_BOARD_NAME           "Arduino Nano RP2040 Connect"
+#define MICROPY_HW_FLASH_STORAGE_BYTES  (8 * 1024 * 1024)
+
+// Enable networking and sockets.
+#define MICROPY_PY_NETWORK              (1)
+#define MICROPY_PY_USOCKET              (1)
+
+// Enable USB Mass Storage with FatFS filesystem.
+#define MICROPY_HW_USB_MSC              (1)
+#define MICROPY_HW_USB_VID              (0x2341)
+#define MICROPY_HW_USB_PID              (0x015e)
+
+// UART 1 config.
+#define MICROPY_HW_UART1_TX             (8)
+#define MICROPY_HW_UART1_RX             (9)
+#define MICROPY_HW_UART1_CTS            (10)
+#define MICROPY_HW_UART1_RTS            (11)
+
+// SPI 1 config.
+#define MICROPY_HW_SPI1_SCK             (14)
+#define MICROPY_HW_SPI1_MOSI            (11)
+#define MICROPY_HW_SPI1_MISO            (8)
+
+// Bluetooth config.
+#define MICROPY_HW_BLE_UART_ID          (1)
+#define MICROPY_HW_BLE_UART_BAUDRATE    (119600)
+
+// WiFi/NINA-W10 config.
+#define MICROPY_HW_WIFI_SPI_ID          (1)
+#define MICROPY_HW_WIFI_SPI_BAUDRATE    (8 * 1000 * 1000)
+
+// ublox Nina-W10 module config.
+#define MICROPY_HW_NINA_RESET           (3)
+#define MICROPY_HW_NINA_GPIO0           (2)
+#define MICROPY_HW_NINA_GPIO1           (9)
+#define MICROPY_HW_NINA_ACK             (10)

From d72d699dad6c75966397873d108bcc2f36222144 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Wed, 6 Oct 2021 20:30:46 +0200
Subject: [PATCH 1393/3533] mimxrt/boards: Add the Seeed ARCH MIX board.

The ARCH MIX board exposes the Ethernet Pins at it's connectors.  Therefore
the software is configured for using a LAN8720 PHY device.  Breakout boards
with the LAN8720 are easily available.
---
 .../SEEED_ARCH_MIX_flexspi_nor_config.h       | 258 ++++++++++++++++++
 ports/mimxrt/boards/SEEED_ARCH_MIX/board.json |  20 ++
 .../boards/SEEED_ARCH_MIX/clock_config.h      | 119 ++++++++
 ports/mimxrt/boards/SEEED_ARCH_MIX/deploy.md  |   6 +
 .../boards/SEEED_ARCH_MIX/mpconfigboard.h     | 142 ++++++++++
 .../boards/SEEED_ARCH_MIX/mpconfigboard.mk    |  14 +
 ports/mimxrt/boards/SEEED_ARCH_MIX/pins.csv   |  62 +++++
 .../SEEED_ARCH_MIX/qspi_nor_flash_config.c    | 136 +++++++++
 8 files changed, 757 insertions(+)
 create mode 100644 ports/mimxrt/boards/SEEED_ARCH_MIX/SEEED_ARCH_MIX_flexspi_nor_config.h
 create mode 100644 ports/mimxrt/boards/SEEED_ARCH_MIX/board.json
 create mode 100644 ports/mimxrt/boards/SEEED_ARCH_MIX/clock_config.h
 create mode 100644 ports/mimxrt/boards/SEEED_ARCH_MIX/deploy.md
 create mode 100644 ports/mimxrt/boards/SEEED_ARCH_MIX/mpconfigboard.h
 create mode 100644 ports/mimxrt/boards/SEEED_ARCH_MIX/mpconfigboard.mk
 create mode 100644 ports/mimxrt/boards/SEEED_ARCH_MIX/pins.csv
 create mode 100644 ports/mimxrt/boards/SEEED_ARCH_MIX/qspi_nor_flash_config.c

diff --git a/ports/mimxrt/boards/SEEED_ARCH_MIX/SEEED_ARCH_MIX_flexspi_nor_config.h b/ports/mimxrt/boards/SEEED_ARCH_MIX/SEEED_ARCH_MIX_flexspi_nor_config.h
new file mode 100644
index 0000000000000..33698a34d2f3b
--- /dev/null
+++ b/ports/mimxrt/boards/SEEED_ARCH_MIX/SEEED_ARCH_MIX_flexspi_nor_config.h
@@ -0,0 +1,258 @@
+/*
+ * Copyright 2019 NXP.
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+// Based on tinyusb/hw/bsp/teensy_40/evkmimxrt1020_flexspi_nor_config.h
+
+#ifndef __SEEED_ARCH_MIX_FLEXSPI_NOR_CONFIG__
+#define __SEEED_ARCH_MIX_FLEXSPI_NOR_CONFIG__
+
+#include <stdint.h>
+#include <stdbool.h>
+#include "fsl_common.h"
+
+/*! @name Driver version */
+/*@{*/
+/*! @brief XIP_BOARD driver version 2.0.0. */
+#define FSL_XIP_BOARD_DRIVER_VERSION (MAKE_VERSION(2, 0, 0))
+/*@}*/
+
+/* FLEXSPI memory config block related defintions */
+#define FLEXSPI_CFG_BLK_TAG (0x42464346UL)     // ascii "FCFB" Big Endian
+#define FLEXSPI_CFG_BLK_VERSION (0x56010400UL) // V1.4.0
+#define FLEXSPI_CFG_BLK_SIZE (512)
+
+/* FLEXSPI Feature related definitions */
+#define FLEXSPI_FEATURE_HAS_PARALLEL_MODE 1
+
+/* Lookup table related defintions */
+#define CMD_INDEX_READ 0
+#define CMD_INDEX_READSTATUS 1
+#define CMD_INDEX_WRITEENABLE 2
+#define CMD_INDEX_WRITE 4
+
+#define CMD_LUT_SEQ_IDX_READ 0
+#define CMD_LUT_SEQ_IDX_READSTATUS 1
+#define CMD_LUT_SEQ_IDX_WRITEENABLE 3
+#define CMD_LUT_SEQ_IDX_WRITE 9
+
+#define CMD_SDR 0x01
+#define CMD_DDR 0x21
+#define RADDR_SDR 0x02
+#define RADDR_DDR 0x22
+#define CADDR_SDR 0x03
+#define CADDR_DDR 0x23
+#define MODE1_SDR 0x04
+#define MODE1_DDR 0x24
+#define MODE2_SDR 0x05
+#define MODE2_DDR 0x25
+#define MODE4_SDR 0x06
+#define MODE4_DDR 0x26
+#define MODE8_SDR 0x07
+#define MODE8_DDR 0x27
+#define WRITE_SDR 0x08
+#define WRITE_DDR 0x28
+#define READ_SDR 0x09
+#define READ_DDR 0x29
+#define LEARN_SDR 0x0A
+#define LEARN_DDR 0x2A
+#define DATSZ_SDR 0x0B
+#define DATSZ_DDR 0x2B
+#define DUMMY_SDR 0x0C
+#define DUMMY_DDR 0x2C
+#define DUMMY_RWDS_SDR 0x0D
+#define DUMMY_RWDS_DDR 0x2D
+#define JMP_ON_CS 0x1F
+#define STOP 0
+
+#define FLEXSPI_1PAD 0
+#define FLEXSPI_2PAD 1
+#define FLEXSPI_4PAD 2
+#define FLEXSPI_8PAD 3
+
+#define FLEXSPI_LUT_SEQ(cmd0, pad0, op0, cmd1, pad1, op1)                                                              \
+    (FLEXSPI_LUT_OPERAND0(op0) | FLEXSPI_LUT_NUM_PADS0(pad0) | FLEXSPI_LUT_OPCODE0(cmd0) | FLEXSPI_LUT_OPERAND1(op1) | \
+    FLEXSPI_LUT_NUM_PADS1(pad1) | FLEXSPI_LUT_OPCODE1(cmd1))
+
+// !@brief Definitions for FlexSPI Serial Clock Frequency
+typedef enum _FlexSpiSerialClockFreq
+{
+    kFlexSpiSerialClk_30MHz  = 1,
+    kFlexSpiSerialClk_50MHz  = 2,
+    kFlexSpiSerialClk_60MHz  = 3,
+    kFlexSpiSerialClk_75MHz  = 4,
+    kFlexSpiSerialClk_80MHz  = 5,
+    kFlexSpiSerialClk_100MHz = 6,
+    kFlexSpiSerialClk_133MHz = 7,
+    kFlexSpiSerialClk_166MHz = 8,
+    kFlexSpiSerialClk_200MHz = 9,
+} flexspi_serial_clk_freq_t;
+
+// !@brief FlexSPI clock configuration type
+enum
+{
+    kFlexSpiClk_SDR, // !< Clock configure for SDR mode
+    kFlexSpiClk_DDR, // !< Clock configurat for DDR mode
+};
+
+// !@brief FlexSPI Read Sample Clock Source definition
+typedef enum _FlashReadSampleClkSource
+{
+    kFlexSPIReadSampleClk_LoopbackInternally      = 0,
+    kFlexSPIReadSampleClk_LoopbackFromDqsPad      = 1,
+    kFlexSPIReadSampleClk_LoopbackFromSckPad      = 2,
+    kFlexSPIReadSampleClk_ExternalInputFromDqsPad = 3,
+} flexspi_read_sample_clk_t;
+
+// !@brief Misc feature bit definitions
+enum
+{
+    kFlexSpiMiscOffset_DiffClkEnable            = 0, // !< Bit for Differential clock enable
+    kFlexSpiMiscOffset_Ck2Enable                = 1, // !< Bit for CK2 enable
+    kFlexSpiMiscOffset_ParallelEnable           = 2, // !< Bit for Parallel mode enable
+    kFlexSpiMiscOffset_WordAddressableEnable    = 3, // !< Bit for Word Addressable enable
+    kFlexSpiMiscOffset_SafeConfigFreqEnable     = 4, // !< Bit for Safe Configuration Frequency enable
+    kFlexSpiMiscOffset_PadSettingOverrideEnable = 5, // !< Bit for Pad setting override enable
+    kFlexSpiMiscOffset_DdrModeEnable            = 6, // !< Bit for DDR clock confiuration indication.
+};
+
+// !@brief Flash Type Definition
+enum
+{
+    kFlexSpiDeviceType_SerialNOR    = 1,    // !< Flash devices are Serial NOR
+    kFlexSpiDeviceType_SerialNAND   = 2,    // !< Flash devices are Serial NAND
+    kFlexSpiDeviceType_SerialRAM    = 3,    // !< Flash devices are Serial RAM/HyperFLASH
+    kFlexSpiDeviceType_MCP_NOR_NAND = 0x12, // !< Flash device is MCP device, A1 is Serial NOR, A2 is Serial NAND
+    kFlexSpiDeviceType_MCP_NOR_RAM  = 0x13, // !< Flash deivce is MCP device, A1 is Serial NOR, A2 is Serial RAMs
+};
+
+// !@brief Flash Pad Definitions
+enum
+{
+    kSerialFlash_1Pad  = 1,
+    kSerialFlash_2Pads = 2,
+    kSerialFlash_4Pads = 4,
+    kSerialFlash_8Pads = 8,
+};
+
+// !@brief FlexSPI LUT Sequence structure
+typedef struct _lut_sequence
+{
+    uint8_t seqNum; // !< Sequence Number, valid number: 1-16
+    uint8_t seqId;  // !< Sequence Index, valid number: 0-15
+    uint16_t reserved;
+} flexspi_lut_seq_t;
+
+// !@brief Flash Configuration Command Type
+enum
+{
+    kDeviceConfigCmdType_Generic,    // !< Generic command, for example: configure dummy cycles, drive strength, etc
+    kDeviceConfigCmdType_QuadEnable, // !< Quad Enable command
+    kDeviceConfigCmdType_Spi2Xpi,    // !< Switch from SPI to DPI/QPI/OPI mode
+    kDeviceConfigCmdType_Xpi2Spi,    // !< Switch from DPI/QPI/OPI to SPI mode
+    kDeviceConfigCmdType_Spi2NoCmd,  // !< Switch to 0-4-4/0-8-8 mode
+    kDeviceConfigCmdType_Reset,      // !< Reset device command
+};
+
+// !@brief FlexSPI Memory Configuration Block
+typedef struct _FlexSPIConfig
+{
+    uint32_t tag;               // !< [0x000-0x003] Tag, fixed value 0x42464346UL
+    uint32_t version;           // !< [0x004-0x007] Version,[31:24] -'V', [23:16] - Major, [15:8] - Minor, [7:0] - bugfix
+    uint32_t reserved0;         // !< [0x008-0x00b] Reserved for future use
+    uint8_t readSampleClkSrc;   // !< [0x00c-0x00c] Read Sample Clock Source, valid value: 0/1/3
+    uint8_t csHoldTime;         // !< [0x00d-0x00d] CS hold time, default value: 3
+    uint8_t csSetupTime;        // !< [0x00e-0x00e] CS setup time, default value: 3
+    uint8_t columnAddressWidth; // !< [0x00f-0x00f] Column Address with, for HyperBus protocol, it is fixed to 3, For
+    // ! Serial NAND, need to refer to datasheet
+    uint8_t deviceModeCfgEnable; // !< [0x010-0x010] Device Mode Configure enable flag, 1 - Enable, 0 - Disable
+    uint8_t deviceModeType; // !< [0x011-0x011] Specify the configuration command type:Quad Enable, DPI/QPI/OPI switch,
+    // ! Generic configuration, etc.
+    uint16_t waitTimeCfgCommands; // !< [0x012-0x013] Wait time for all configuration commands, unit: 100us, Used for
+    // ! DPI/QPI/OPI switch or reset command
+    flexspi_lut_seq_t deviceModeSeq; // !< [0x014-0x017] Device mode sequence info, [7:0] - LUT sequence id, [15:8] - LUt
+    // ! sequence number, [31:16] Reserved
+    uint32_t deviceModeArg;    // !< [0x018-0x01b] Argument/Parameter for device configuration
+    uint8_t configCmdEnable;   // !< [0x01c-0x01c] Configure command Enable Flag, 1 - Enable, 0 - Disable
+    uint8_t configModeType[3]; // !< [0x01d-0x01f] Configure Mode Type, similar as deviceModeTpe
+    flexspi_lut_seq_t
+        configCmdSeqs[3]; // !< [0x020-0x02b] Sequence info for Device Configuration command, similar as deviceModeSeq
+    uint32_t reserved1;   // !< [0x02c-0x02f] Reserved for future use
+    uint32_t configCmdArgs[3];     // !< [0x030-0x03b] Arguments/Parameters for device Configuration commands
+    uint32_t reserved2;            // !< [0x03c-0x03f] Reserved for future use
+    uint32_t controllerMiscOption; // !< [0x040-0x043] Controller Misc Options, see Misc feature bit definitions for more
+    // ! details
+    uint8_t deviceType;    // !< [0x044-0x044] Device Type:  See Flash Type Definition for more details
+    uint8_t sflashPadType; // !< [0x045-0x045] Serial Flash Pad Type: 1 - Single, 2 - Dual, 4 - Quad, 8 - Octal
+    uint8_t serialClkFreq; // !< [0x046-0x046] Serial Flash Frequencey, device specific definitions, See System Boot
+    // ! Chapter for more details
+    uint8_t lutCustomSeqEnable; // !< [0x047-0x047] LUT customization Enable, it is required if the program/erase cannot
+    // ! be done using 1 LUT sequence, currently, only applicable to HyperFLASH
+    uint32_t reserved3[2];           // !< [0x048-0x04f] Reserved for future use
+    uint32_t sflashA1Size;           // !< [0x050-0x053] Size of Flash connected to A1
+    uint32_t sflashA2Size;           // !< [0x054-0x057] Size of Flash connected to A2
+    uint32_t sflashB1Size;           // !< [0x058-0x05b] Size of Flash connected to B1
+    uint32_t sflashB2Size;           // !< [0x05c-0x05f] Size of Flash connected to B2
+    uint32_t csPadSettingOverride;   // !< [0x060-0x063] CS pad setting override value
+    uint32_t sclkPadSettingOverride; // !< [0x064-0x067] SCK pad setting override value
+    uint32_t dataPadSettingOverride; // !< [0x068-0x06b] data pad setting override value
+    uint32_t dqsPadSettingOverride;  // !< [0x06c-0x06f] DQS pad setting override value
+    uint32_t timeoutInMs;            // !< [0x070-0x073] Timeout threshold for read status command
+    uint32_t commandInterval;        // !< [0x074-0x077] CS deselect interval between two commands
+    uint16_t dataValidTime[2]; // !< [0x078-0x07b] CLK edge to data valid time for PORT A and PORT B, in terms of 0.1ns
+    uint16_t busyOffset;       // !< [0x07c-0x07d] Busy offset, valid value: 0-31
+    uint16_t busyBitPolarity;  // !< [0x07e-0x07f] Busy flag polarity, 0 - busy flag is 1 when flash device is busy, 1 -
+    // ! busy flag is 0 when flash device is busy
+    uint32_t lookupTable[64];           // !< [0x080-0x17f] Lookup table holds Flash command sequences
+    flexspi_lut_seq_t lutCustomSeq[12]; // !< [0x180-0x1af] Customizable LUT Sequences
+    uint32_t reserved4[4];              // !< [0x1b0-0x1bf] Reserved for future use
+} flexspi_mem_config_t;
+
+/*  */
+#define NOR_CMD_LUT_SEQ_IDX_READ_NORMAL 0
+#define NOR_CMD_LUT_SEQ_IDX_READSTATUSREG 1
+#define NOR_CMD_LUT_SEQ_IDX_READ_FAST_QUAD 2
+#define NOR_CMD_LUT_SEQ_IDX_WRITEENABLE 3
+#define NOR_CMD_LUT_SEQ_IDX_READSTATUS_XPI 4
+#define NOR_CMD_LUT_SEQ_IDX_ERASESECTOR 5
+#define NOR_CMD_LUT_SEQ_IDX_WRITESTATUSREG 6
+#define NOR_CMD_LUT_SEQ_IDX_PAGEPROGRAM_QUAD 7
+#define NOR_CMD_LUT_SEQ_IDX_READID 8
+#define NOR_CMD_LUT_SEQ_IDX_PAGEPROGRAM 9
+#define NOR_CMD_LUT_SEQ_IDX_ENTERQPI 10
+#define NOR_CMD_LUT_SEQ_IDX_CHIPERASE 11
+#define NOR_CMD_LUT_SEQ_IDX_EXITQPI 12
+
+/*
+ *  Serial NOR configuration block
+ */
+typedef struct _flexspi_nor_config
+{
+    flexspi_mem_config_t memConfig; // !< Common memory configuration info via FlexSPI
+    uint32_t pageSize;              // !< Page size of Serial NOR
+    uint32_t sectorSize;            // !< Sector size of Serial NOR
+    uint8_t ipcmdSerialClkFreq;     // !< Clock frequency for IP command
+    uint8_t isUniformBlockSize;     // !< Sector/Block size is the same
+    uint8_t reserved0[2];           // !< Reserved for future use
+    uint8_t serialNorType;          // !< Serial NOR Flash type: 0/1/2/3
+    uint8_t needExitNoCmdMode;      // !< Need to exit NoCmd mode before other IP command
+    uint8_t halfClkForNonReadCmd;   // !< Half the Serial Clock for non-read command: true/false
+    uint8_t needRestoreNoCmdMode;   // !< Need to Restore NoCmd mode after IP commmand execution
+    uint32_t blockSize;             // !< Block size
+    uint32_t reserve2[11];          // !< Reserved for future use
+} flexspi_nor_config_t;
+
+#define FLASH_BUSY_STATUS_POL 0
+#define FLASH_BUSY_STATUS_OFFSET 0
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* __SEEED_ARCH_MIX_FLEXSPI_NOR_CONFIG__ */
diff --git a/ports/mimxrt/boards/SEEED_ARCH_MIX/board.json b/ports/mimxrt/boards/SEEED_ARCH_MIX/board.json
new file mode 100644
index 0000000000000..3142f1a814317
--- /dev/null
+++ b/ports/mimxrt/boards/SEEED_ARCH_MIX/board.json
@@ -0,0 +1,20 @@
+{
+    "deploy": [
+        "deploy.md"
+    ],
+    "docs": "",
+    "features": [
+        "MicroSD",
+        "MicroUSB",
+        "SDRAM",
+        "RGB LED"
+    ],
+    "images": [
+        "main1.jpg"
+    ],
+    "mcu": "mimxrt",
+    "product": "Arch Mix",
+    "thumbnail": "",
+    "url": "https://wiki.seeedstudio.com/Arch_Mix/",
+    "vendor": "Seeed Technology Co.,Ltd."
+}
diff --git a/ports/mimxrt/boards/SEEED_ARCH_MIX/clock_config.h b/ports/mimxrt/boards/SEEED_ARCH_MIX/clock_config.h
new file mode 100644
index 0000000000000..f213ac7e238dd
--- /dev/null
+++ b/ports/mimxrt/boards/SEEED_ARCH_MIX/clock_config.h
@@ -0,0 +1,119 @@
+/*
+ * Copyright 2017-2019 NXP
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#ifndef _CLOCK_CONFIG_H_
+#define _CLOCK_CONFIG_H_
+
+#include "fsl_common.h"
+
+/*******************************************************************************
+ * Definitions
+ ******************************************************************************/
+#define BOARD_XTAL0_CLK_HZ 24000000U /*!< Board xtal0 frequency in Hz */
+
+#define BOARD_XTAL32K_CLK_HZ 32768U /*!< Board xtal32k frequency in Hz */
+/*******************************************************************************
+ ************************ BOARD_InitBootClocks function ************************
+ ******************************************************************************/
+
+#if defined(__cplusplus)
+extern "C" {
+#endif /* __cplusplus*/
+
+/*!
+ * @brief This function executes default configuration of clocks.
+ *
+ */
+void BOARD_InitBootClocks(void);
+
+#if defined(__cplusplus)
+}
+#endif /* __cplusplus*/
+
+/*******************************************************************************
+ ********************** Configuration BOARD_BootClockRUN ***********************
+ ******************************************************************************/
+/*******************************************************************************
+ * Definitions for BOARD_BootClockRUN configuration
+ ******************************************************************************/
+#define BOARD_BOOTCLOCKRUN_CORE_CLOCK 600000000U /*!< Core clock frequency: 600000000Hz */
+
+/* Clock outputs (values are in Hz): */
+#define BOARD_BOOTCLOCKRUN_AHB_CLK_ROOT 600000000UL
+#define BOARD_BOOTCLOCKRUN_CAN_CLK_ROOT 40000000UL
+#define BOARD_BOOTCLOCKRUN_CKIL_SYNC_CLK_ROOT 32768UL
+#define BOARD_BOOTCLOCKRUN_CLKO1_CLK 0UL
+#define BOARD_BOOTCLOCKRUN_CLKO2_CLK 0UL
+#define BOARD_BOOTCLOCKRUN_CLK_1M 1000000UL
+#define BOARD_BOOTCLOCKRUN_CLK_24M 24000000UL
+#define BOARD_BOOTCLOCKRUN_CSI_CLK_ROOT 12000000UL
+#define BOARD_BOOTCLOCKRUN_ENET1_TX_CLK 2400000UL
+#define BOARD_BOOTCLOCKRUN_ENET_125M_CLK 2400000UL
+#define BOARD_BOOTCLOCKRUN_ENET_25M_REF_CLK 1200000UL
+#define BOARD_BOOTCLOCKRUN_FLEXIO1_CLK_ROOT 30000000UL
+#define BOARD_BOOTCLOCKRUN_FLEXIO2_CLK_ROOT 30000000UL
+#define BOARD_BOOTCLOCKRUN_FLEXSPI_CLK_ROOT 160000000UL
+#define BOARD_BOOTCLOCKRUN_GPT1_IPG_CLK_HIGHFREQ 75000000UL
+#define BOARD_BOOTCLOCKRUN_GPT2_IPG_CLK_HIGHFREQ 75000000UL
+#define BOARD_BOOTCLOCKRUN_IPG_CLK_ROOT 150000000UL
+#define BOARD_BOOTCLOCKRUN_LCDIF_CLK_ROOT 9642857UL
+#define BOARD_BOOTCLOCKRUN_LPI2C_CLK_ROOT 60000000UL
+#define BOARD_BOOTCLOCKRUN_LPSPI_CLK_ROOT 105600000UL
+#define BOARD_BOOTCLOCKRUN_LVDS1_CLK 1200000000UL
+#define BOARD_BOOTCLOCKRUN_MQS_MCLK 63529411UL
+#define BOARD_BOOTCLOCKRUN_PERCLK_CLK_ROOT 75000000UL
+#define BOARD_BOOTCLOCKRUN_PLL7_MAIN_CLK 24000000UL
+#define BOARD_BOOTCLOCKRUN_SAI1_CLK_ROOT 63529411UL
+#define BOARD_BOOTCLOCKRUN_SAI1_MCLK1 63529411UL
+#define BOARD_BOOTCLOCKRUN_SAI1_MCLK2 63529411UL
+#define BOARD_BOOTCLOCKRUN_SAI1_MCLK3 30000000UL
+#define BOARD_BOOTCLOCKRUN_SAI2_CLK_ROOT 63529411UL
+#define BOARD_BOOTCLOCKRUN_SAI2_MCLK1 63529411UL
+#define BOARD_BOOTCLOCKRUN_SAI2_MCLK2 0UL
+#define BOARD_BOOTCLOCKRUN_SAI2_MCLK3 30000000UL
+#define BOARD_BOOTCLOCKRUN_SAI3_CLK_ROOT 63529411UL
+#define BOARD_BOOTCLOCKRUN_SAI3_MCLK1 63529411UL
+#define BOARD_BOOTCLOCKRUN_SAI3_MCLK2 0UL
+#define BOARD_BOOTCLOCKRUN_SAI3_MCLK3 30000000UL
+#define BOARD_BOOTCLOCKRUN_SEMC_CLK_ROOT 75000000UL
+#define BOARD_BOOTCLOCKRUN_SPDIF0_CLK_ROOT 30000000UL
+#define BOARD_BOOTCLOCKRUN_SPDIF0_EXTCLK_OUT 0UL
+#define BOARD_BOOTCLOCKRUN_TRACE_CLK_ROOT 117333333UL
+#define BOARD_BOOTCLOCKRUN_UART_CLK_ROOT 80000000UL
+#define BOARD_BOOTCLOCKRUN_USBPHY1_CLK 0UL
+#define BOARD_BOOTCLOCKRUN_USBPHY2_CLK 0UL
+#define BOARD_BOOTCLOCKRUN_USDHC1_CLK_ROOT 198000000UL
+#define BOARD_BOOTCLOCKRUN_USDHC2_CLK_ROOT 198000000UL
+
+/*! @brief Arm PLL set for BOARD_BootClockRUN configuration.
+ */
+extern const clock_arm_pll_config_t armPllConfig_BOARD_BootClockRUN;
+/*! @brief Usb1 PLL set for BOARD_BootClockRUN configuration.
+ */
+extern const clock_usb_pll_config_t usb1PllConfig_BOARD_BootClockRUN;
+/*! @brief Sys PLL for BOARD_BootClockRUN configuration.
+ */
+extern const clock_sys_pll_config_t sysPllConfig_BOARD_BootClockRUN;
+
+/*******************************************************************************
+ * API for BOARD_BootClockRUN configuration
+ ******************************************************************************/
+#if defined(__cplusplus)
+extern "C" {
+#endif /* __cplusplus*/
+
+/*!
+ * @brief This function executes configuration of clocks.
+ *
+ */
+void BOARD_BootClockRUN(void);
+
+#if defined(__cplusplus)
+}
+#endif /* __cplusplus*/
+
+#endif /* _CLOCK_CONFIG_H_ */
diff --git a/ports/mimxrt/boards/SEEED_ARCH_MIX/deploy.md b/ports/mimxrt/boards/SEEED_ARCH_MIX/deploy.md
new file mode 100644
index 0000000000000..e91c48d46cafd
--- /dev/null
+++ b/ports/mimxrt/boards/SEEED_ARCH_MIX/deploy.md
@@ -0,0 +1,6 @@
+Firmware upload to the Seed ARCH MIX board can be done using the J-Link interface
+For that, follow the instructions given by Seed in their Wiki at
+https://wiki.seeedstudio.com/Arch_Mix/#flashing-arduino-bootloader-to-arch-mix.
+You will need a J-Link debug probe and software. What has been tested was the
+Segger JLlink edu or Segger JLink edu mini. As matching loader tool you can use
+Segger JFlashLite. The target address for loading is 0x60000000.
diff --git a/ports/mimxrt/boards/SEEED_ARCH_MIX/mpconfigboard.h b/ports/mimxrt/boards/SEEED_ARCH_MIX/mpconfigboard.h
new file mode 100644
index 0000000000000..7c79063eef86e
--- /dev/null
+++ b/ports/mimxrt/boards/SEEED_ARCH_MIX/mpconfigboard.h
@@ -0,0 +1,142 @@
+#define MICROPY_HW_BOARD_NAME "Seeed ARCH MIX"
+#define MICROPY_HW_MCU_NAME   "MIMXRT1052DVL5B"
+
+// MIMXRT1050_EVKB has 1 user LED
+#define MICROPY_HW_LED1_PIN (pin_GPIO_AD_B0_09)
+#define MICROPY_HW_LED2_PIN (pin_GPIO_AD_B0_10)
+#define MICROPY_HW_LED3_PIN (pin_GPIO_AD_B0_11)
+#define MICROPY_HW_LED_ON(pin) (mp_hal_pin_low(pin))
+#define MICROPY_HW_LED_OFF(pin) (mp_hal_pin_high(pin))
+
+#define MICROPY_HW_NUM_PIN_IRQS (4 * 32 + 3)
+
+// Define mapping logical UART # to hardware UART #
+// LPUART1 on J3_19/J3_20  -> 1
+// LPUART2 on J4_16/J4_17  -> 2
+// LPUART3 on J4_06/J4_07  -> 3
+// LPUART8 on J4_10/J4_11  -> 4
+// LPUART4 on J5_08/J5_12  -> 5
+
+#define MICROPY_HW_UART_NUM     (sizeof(uart_index_table) / sizeof(uart_index_table)[0])
+#define MICROPY_HW_UART_INDEX   { 0, 1, 2, 3, 8, 4 }
+
+#define IOMUX_TABLE_UART \
+    { IOMUXC_GPIO_AD_B0_12_LPUART1_TX }, { IOMUXC_GPIO_AD_B0_13_LPUART1_RX }, \
+    { IOMUXC_GPIO_AD_B1_02_LPUART2_TX }, { IOMUXC_GPIO_AD_B1_03_LPUART2_RX }, \
+    { IOMUXC_GPIO_AD_B1_06_LPUART3_TX }, { IOMUXC_GPIO_AD_B1_07_LPUART3_RX }, \
+    { IOMUXC_GPIO_B1_00_LPUART4_TX }, { IOMUXC_GPIO_B1_01_LPUART4_RX }, \
+    { 0 }, { 0 }, \
+    { 0 }, { 0 }, \
+    { 0 }, { 0 }, \
+    { IOMUXC_GPIO_AD_B1_10_LPUART8_TX }, { IOMUXC_GPIO_AD_B1_11_LPUART8_RX },
+
+#define MICROPY_HW_SPI_INDEX { 3, 4 }
+
+#define IOMUX_TABLE_SPI \
+    { 0 }, { 0 }, \
+    { 0 }, { 0 }, \
+    { 0 }, { 0 }, \
+    { 0 }, { 0 }, \
+    { IOMUXC_GPIO_AD_B1_15_LPSPI3_SCK }, { IOMUXC_GPIO_AD_B1_12_LPSPI3_PCS0 }, \
+    { IOMUXC_GPIO_AD_B1_14_LPSPI3_SDO }, { IOMUXC_GPIO_AD_B1_13_LPSPI3_SDI },  \
+    { IOMUXC_GPIO_B1_07_LPSPI4_SCK }, { IOMUXC_GPIO_B1_04_LPSPI4_PCS0 }, \
+    { IOMUXC_GPIO_B1_06_LPSPI4_SDO }, { IOMUXC_GPIO_B1_05_LPSPI4_SDI },
+
+#define DMA_REQ_SRC_RX { 0, kDmaRequestMuxLPSPI1Rx, kDmaRequestMuxLPSPI2Rx, \
+                         kDmaRequestMuxLPSPI3Rx, kDmaRequestMuxLPSPI4Rx }
+
+#define DMA_REQ_SRC_TX { 0, kDmaRequestMuxLPSPI1Tx, kDmaRequestMuxLPSPI2Tx, \
+                         kDmaRequestMuxLPSPI3Tx, kDmaRequestMuxLPSPI4Tx }
+
+// Define the mapping hardware I2C # to logical I2C #
+// SDA/SCL      HW-I2C    Logical I2C
+// J3_17/J3_16  LPI2C1 ->    0
+// J4_06/J4_07  LPI2C3 ->    1
+// J5_05/J5_04  LPI2C2 ->    2
+
+#define MICROPY_HW_I2C_INDEX   { 1, 3, 2 }
+
+#define IOMUX_TABLE_I2C \
+    { IOMUXC_GPIO_AD_B1_00_LPI2C1_SCL }, { IOMUXC_GPIO_AD_B1_01_LPI2C1_SDA }, \
+    { IOMUXC_GPIO_B0_04_LPI2C2_SCL }, { IOMUXC_GPIO_B0_05_LPI2C2_SDA }, \
+    { IOMUXC_GPIO_AD_B1_07_LPI2C3_SCL }, { IOMUXC_GPIO_AD_B1_06_LPI2C3_SDA }
+
+#define USDHC_DUMMY_PIN NULL, 0
+
+#define MICROPY_USDHC1 \
+    { \
+        .cmd = {GPIO_SD_B0_00_USDHC1_CMD}, \
+        .clk = { GPIO_SD_B0_01_USDHC1_CLK }, \
+        .cd_b = { GPIO_B1_12_USDHC1_CD_B }, \
+        .data0 = { GPIO_SD_B0_02_USDHC1_DATA0 }, \
+        .data1 = { GPIO_SD_B0_03_USDHC1_DATA1 }, \
+        .data2 = { GPIO_SD_B0_04_USDHC1_DATA2 }, \
+        .data3 = { GPIO_SD_B0_05_USDHC1_DATA3 }, \
+    }
+
+// Network definitions
+// Transceiver Phy Address & Type
+#define ENET_PHY_ADDRESS    (1)
+#define ENET_PHY            LAN8720
+#define ENET_PHY_OPS        phylan8720_ops
+#define ENET_TX_CLK_OUTPUT  false
+
+// Etherner PIN definitions
+// No reset and interrupt pin by intention
+
+#define IOMUX_TABLE_ENET \
+    { IOMUXC_GPIO_B1_04_ENET_RX_DATA00, 0, 0xB0E9u }, \
+    { IOMUXC_GPIO_B1_05_ENET_RX_DATA01, 0, 0xB0E9u }, \
+    { IOMUXC_GPIO_B1_06_ENET_RX_EN, 0, 0xB0E9u }, \
+    { IOMUXC_GPIO_B1_07_ENET_TX_DATA00, 0, 0xB0E9u }, \
+    { IOMUXC_GPIO_B1_08_ENET_TX_DATA01, 0, 0xB0E9u }, \
+    { IOMUXC_GPIO_B1_09_ENET_TX_EN, 0, 0xB0E9u }, \
+    { IOMUXC_GPIO_B1_10_ENET_REF_CLK, 1, 0x71u }, \
+    { IOMUXC_GPIO_B1_11_ENET_RX_ER, 0, 0x30E9u }, \
+    { IOMUXC_GPIO_EMC_41_ENET_MDIO, 0, 0xB0E9u }, \
+    { IOMUXC_GPIO_EMC_40_ENET_MDC, 0, 0xB0E9u },
+
+// --- SEMC --- //
+#define MIMXRT_IOMUXC_SEMC_DATA00 IOMUXC_GPIO_EMC_00_SEMC_DATA00
+#define MIMXRT_IOMUXC_SEMC_DATA01 IOMUXC_GPIO_EMC_01_SEMC_DATA01
+#define MIMXRT_IOMUXC_SEMC_DATA02 IOMUXC_GPIO_EMC_02_SEMC_DATA02
+#define MIMXRT_IOMUXC_SEMC_DATA03 IOMUXC_GPIO_EMC_03_SEMC_DATA03
+#define MIMXRT_IOMUXC_SEMC_DATA04 IOMUXC_GPIO_EMC_04_SEMC_DATA04
+#define MIMXRT_IOMUXC_SEMC_DATA05 IOMUXC_GPIO_EMC_05_SEMC_DATA05
+#define MIMXRT_IOMUXC_SEMC_DATA06 IOMUXC_GPIO_EMC_06_SEMC_DATA06
+#define MIMXRT_IOMUXC_SEMC_DATA07 IOMUXC_GPIO_EMC_07_SEMC_DATA07
+#define MIMXRT_IOMUXC_SEMC_DATA08 IOMUXC_GPIO_EMC_30_SEMC_DATA08
+#define MIMXRT_IOMUXC_SEMC_DATA09 IOMUXC_GPIO_EMC_31_SEMC_DATA09
+#define MIMXRT_IOMUXC_SEMC_DATA10 IOMUXC_GPIO_EMC_32_SEMC_DATA10
+#define MIMXRT_IOMUXC_SEMC_DATA11 IOMUXC_GPIO_EMC_33_SEMC_DATA11
+#define MIMXRT_IOMUXC_SEMC_DATA12 IOMUXC_GPIO_EMC_34_SEMC_DATA12
+#define MIMXRT_IOMUXC_SEMC_DATA13 IOMUXC_GPIO_EMC_35_SEMC_DATA13
+#define MIMXRT_IOMUXC_SEMC_DATA14 IOMUXC_GPIO_EMC_36_SEMC_DATA14
+#define MIMXRT_IOMUXC_SEMC_DATA15 IOMUXC_GPIO_EMC_37_SEMC_DATA15
+
+#define MIMXRT_IOMUXC_SEMC_ADDR00 IOMUXC_GPIO_EMC_09_SEMC_ADDR00
+#define MIMXRT_IOMUXC_SEMC_ADDR01 IOMUXC_GPIO_EMC_10_SEMC_ADDR01
+#define MIMXRT_IOMUXC_SEMC_ADDR02 IOMUXC_GPIO_EMC_11_SEMC_ADDR02
+#define MIMXRT_IOMUXC_SEMC_ADDR03 IOMUXC_GPIO_EMC_12_SEMC_ADDR03
+#define MIMXRT_IOMUXC_SEMC_ADDR04 IOMUXC_GPIO_EMC_13_SEMC_ADDR04
+#define MIMXRT_IOMUXC_SEMC_ADDR05 IOMUXC_GPIO_EMC_14_SEMC_ADDR05
+#define MIMXRT_IOMUXC_SEMC_ADDR06 IOMUXC_GPIO_EMC_15_SEMC_ADDR06
+#define MIMXRT_IOMUXC_SEMC_ADDR07 IOMUXC_GPIO_EMC_16_SEMC_ADDR07
+#define MIMXRT_IOMUXC_SEMC_ADDR08 IOMUXC_GPIO_EMC_17_SEMC_ADDR08
+#define MIMXRT_IOMUXC_SEMC_ADDR09 IOMUXC_GPIO_EMC_18_SEMC_ADDR09
+#define MIMXRT_IOMUXC_SEMC_ADDR10 IOMUXC_GPIO_EMC_23_SEMC_ADDR10
+#define MIMXRT_IOMUXC_SEMC_ADDR11 IOMUXC_GPIO_EMC_19_SEMC_ADDR11
+#define MIMXRT_IOMUXC_SEMC_ADDR12 IOMUXC_GPIO_EMC_20_SEMC_ADDR12
+
+#define MIMXRT_IOMUXC_SEMC_BA0 IOMUXC_GPIO_EMC_21_SEMC_BA0
+#define MIMXRT_IOMUXC_SEMC_BA1 IOMUXC_GPIO_EMC_22_SEMC_BA1
+#define MIMXRT_IOMUXC_SEMC_CAS IOMUXC_GPIO_EMC_24_SEMC_CAS
+#define MIMXRT_IOMUXC_SEMC_CKE IOMUXC_GPIO_EMC_27_SEMC_CKE
+#define MIMXRT_IOMUXC_SEMC_CLK IOMUXC_GPIO_EMC_26_SEMC_CLK
+#define MIMXRT_IOMUXC_SEMC_DM00 IOMUXC_GPIO_EMC_08_SEMC_DM00
+#define MIMXRT_IOMUXC_SEMC_DM01 IOMUXC_GPIO_EMC_38_SEMC_DM01
+#define MIMXRT_IOMUXC_SEMC_DQS IOMUXC_GPIO_EMC_39_SEMC_DQS
+#define MIMXRT_IOMUXC_SEMC_RAS IOMUXC_GPIO_EMC_25_SEMC_RAS
+#define MIMXRT_IOMUXC_SEMC_WE IOMUXC_GPIO_EMC_28_SEMC_WE
+
+#define MIMXRT_IOMUXC_SEMC_CS0 IOMUXC_GPIO_EMC_29_SEMC_CS0
diff --git a/ports/mimxrt/boards/SEEED_ARCH_MIX/mpconfigboard.mk b/ports/mimxrt/boards/SEEED_ARCH_MIX/mpconfigboard.mk
new file mode 100644
index 0000000000000..90edc5d517821
--- /dev/null
+++ b/ports/mimxrt/boards/SEEED_ARCH_MIX/mpconfigboard.mk
@@ -0,0 +1,14 @@
+MCU_SERIES = MIMXRT1052
+MCU_VARIANT = MIMXRT1052DVL6B
+
+MICROPY_FLOAT_IMPL = double
+MICROPY_PY_MACHINE_SDCARD = 1
+MICROPY_HW_FLASH_TYPE ?= qspi_nor
+MICROPY_HW_FLASH_SIZE ?= 0x800000  # 8MB
+	
+MICROPY_HW_SDRAM_AVAIL = 1
+MICROPY_HW_SDRAM_SIZE  = 0x2000000  # 32MB
+
+MICROPY_PY_LWIP = 1
+MICROPY_PY_USSL = 1
+MICROPY_SSL_MBEDTLS = 1
diff --git a/ports/mimxrt/boards/SEEED_ARCH_MIX/pins.csv b/ports/mimxrt/boards/SEEED_ARCH_MIX/pins.csv
new file mode 100644
index 0000000000000..0183795cd73e1
--- /dev/null
+++ b/ports/mimxrt/boards/SEEED_ARCH_MIX/pins.csv
@@ -0,0 +1,62 @@
+J3_04,GPIO_B1_11
+J3_05,GPIO_B1_06
+J3_06,GPIO_EMC_41
+J3_07,GPIO_EMC_40
+J3_08,GPIO_B1_05
+J3_09,GPIO_B1_04
+J3_10,GPIO_B1_08
+J3_11,GPIO_B1_07
+J3_12,GPIO_B1_09
+J3_13,GPIO_B1_10
+J3_14,GPIO_AD_B0_14
+J3_15,GPO_AD_B0_15
+J3_16,GPIO_AD_B1_00
+J3_17,GPIO_AD_B1_01
+J3_19,GPIO_AD_B0_13
+J3_20,GPIO_AD_B0_12
+J4_04,GPIO_AD_B1_04
+J4_05,GPIO_AD_B1_05
+J4_06,GPIO_AD_B1_06
+J4_07,GPIO_AD_B1_07
+J4_08,GPIO_AD_B1_08
+J4_09,GPIO_AD_B1_09
+J4_10,GPIO_AD_B1_10
+J4_11,GPIO_AD_B1_11
+J4_12,GPIO_AD_B1_12
+J4_13,GPIO_AD_B1_13
+J4_14,GPIO_AD_B1_14
+J4_15,GPIO_AD_B1_15
+J4_16,GPIO_AD_B1_02
+J4_17,GPIO_AD_B1_03
+J4_19,GPIO_AD_B0_07
+J4_20,GPIO_AD_B0_06
+J5_32,GPIO_B0_00
+J5_28,GPIO_B0_01
+J5_29,GPIO_B0_02
+J5_30,GPIO_B0_03
+J5_04,GPIO_B0_04
+J5_05,GPIO_B0_05
+J5_06,GPIO_B0_06
+J5_07,GPIO_B0_07
+J5_08,GPIO_B0_08
+J5_12,GPIO_B0_09
+J5_13,GPIO_B0_10
+J5_14,GPIO_B0_11
+J5_15,GPIO_B0_12
+J5_16,GPIO_B0_13
+J5_17,GPIO_B0_14
+J5_22,GPIO_B0_15
+J5_23,GPIO_B1_00
+J5_24,GPIO_B1_01
+J5_25,GPIO_B1_02
+J5_26,GPIO_B1_03
+J5_34,GPIO_AD_B1_15
+J5_35,GPIO_AD_B1_14
+J5_36,GPIO_AD_B1_13
+J5_37,GPIO_AD_B1_12
+J5_42,GPIO_AD_B1_00
+J5_43,GPIO_AD_B1_01
+J5_50,GPIO_AD_B0_02
+LED_RED,GPIO_AD_B0_09
+LED_GREEN,GPIO_AD_B0_10
+LED_BLUE,GPIO_AD_B0_11
diff --git a/ports/mimxrt/boards/SEEED_ARCH_MIX/qspi_nor_flash_config.c b/ports/mimxrt/boards/SEEED_ARCH_MIX/qspi_nor_flash_config.c
new file mode 100644
index 0000000000000..7b2584d3de691
--- /dev/null
+++ b/ports/mimxrt/boards/SEEED_ARCH_MIX/qspi_nor_flash_config.c
@@ -0,0 +1,136 @@
+/*
+ * Copyright 2019 NXP.
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+// Based on tinyusb/hw/bsp/teensy_40/evkmimxrt1010_flexspi_nor_config.c
+
+#include BOARD_FLASH_CONFIG_HEADER_H
+
+/* Component ID definition, used by tools. */
+#ifndef FSL_COMPONENT_ID
+#define FSL_COMPONENT_ID "platform.drivers.xip_board"
+#endif
+
+/*******************************************************************************
+ * Code
+ ******************************************************************************/
+#if defined(XIP_BOOT_HEADER_ENABLE) && (XIP_BOOT_HEADER_ENABLE == 1)
+#if defined(__ARMCC_VERSION) || defined(__GNUC__)
+__attribute__((section(".boot_hdr.conf")))
+#elif defined(__ICCARM__)
+#pragma location = ".boot_hdr.conf"
+#endif
+
+const flexspi_nor_config_t qspiflash_config = {
+    .memConfig =
+    {
+        .tag = FLEXSPI_CFG_BLK_TAG,
+        .version = FLEXSPI_CFG_BLK_VERSION,
+        .readSampleClkSrc = kFlexSPIReadSampleClk_LoopbackFromDqsPad,
+        .csHoldTime = 3u,
+        .csSetupTime = 3u,
+        .busyOffset = FLASH_BUSY_STATUS_OFFSET,         // Status bit 0 indicates busy.
+        .busyBitPolarity = FLASH_BUSY_STATUS_POL,       // Busy when the bit is 1.
+        .deviceModeCfgEnable = 1u,
+        .deviceModeType = kDeviceConfigCmdType_QuadEnable,
+        .deviceModeSeq = {
+            .seqId = 4u,
+            .seqNum = 1u,
+        },
+        .deviceModeArg = 0x40,
+        // Enable DDR mode, Wordaddassable, Safe configuration, Differential clock
+        .deviceType = kFlexSpiDeviceType_SerialNOR,
+        .sflashPadType = kSerialFlash_4Pads,
+        .serialClkFreq = kFlexSpiSerialClk_100MHz,
+        .sflashA1Size = BOARD_FLASH_SIZE,
+        .lookupTable =
+        {
+            // 0 Read LUTs 0 -> 0
+            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0xEB, RADDR_SDR, FLEXSPI_4PAD, 0x18),
+            FLEXSPI_LUT_SEQ(DUMMY_SDR, FLEXSPI_4PAD, 0x06, READ_SDR, FLEXSPI_4PAD, 0x04),
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+
+            // 1 Read status register -> 1
+            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x05, READ_SDR, FLEXSPI_1PAD, 0x01),
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+
+            // 2 Fast read quad mode - SDR
+            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x6B, RADDR_SDR, FLEXSPI_1PAD, 0x18),
+            FLEXSPI_LUT_SEQ(DUMMY_SDR, FLEXSPI_4PAD, 0x08, READ_SDR, FLEXSPI_4PAD, 0x04),
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+
+            // 3 Write Enable -> 3
+            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x06, STOP, FLEXSPI_1PAD, 0),
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+
+            // 4 Read extend parameters
+            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x81, READ_SDR, FLEXSPI_1PAD, 0x04),
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+
+            // 5 Erase Sector -> 5
+            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x20, RADDR_SDR, FLEXSPI_1PAD, 24),
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+
+            // 6 Write Status Reg
+            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x01, WRITE_SDR, FLEXSPI_1PAD, 0x04),
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+
+            // 7 Page Program - quad mode (-> 9)
+            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x32, RADDR_SDR, FLEXSPI_1PAD, 0x18),
+            FLEXSPI_LUT_SEQ(WRITE_SDR, FLEXSPI_4PAD, 0x04, STOP, FLEXSPI_1PAD, 0),
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+
+            // 8 Read ID
+            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x90, DUMMY_SDR, FLEXSPI_1PAD, 24),
+            FLEXSPI_LUT_SEQ(READ_SDR, FLEXSPI_1PAD, 0x00, 0, 0, 0),
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+
+            // 9 Page Program - single mode -> 9
+            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x02, RADDR_SDR, FLEXSPI_1PAD, 24),
+            FLEXSPI_LUT_SEQ(WRITE_SDR, FLEXSPI_1PAD, 0, 0, 0, 0),
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+
+            // 10 Enter QPI mode
+            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x35, STOP, FLEXSPI_1PAD, 0),
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+
+            // 11 Erase Chip
+            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x60, STOP, FLEXSPI_1PAD, 0),
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+
+            // 12 Exit QPI mode
+            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_4PAD, 0xF5, STOP, FLEXSPI_1PAD, 0),
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
+        },
+    },
+    .pageSize = 256u,
+    .sectorSize = 4u * 1024u,
+    .blockSize = 256u * 1024u,
+    .isUniformBlockSize = false,
+    // .ipcmdSerialClkFreq = kFlexSpiSerialClk_30MHz,
+};
+#endif /* XIP_BOOT_HEADER_ENABLE */

From 7cc9b257a9af77a9a782e055252f2c196c212d49 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Fri, 5 Nov 2021 15:59:55 +0100
Subject: [PATCH 1394/3533] mimxrt/boards: Update the board.json files and add
 deploy_xx.md files.

- Add board.md files for MIMXRT1060_EVK and MIMXRT1064_EVK warning about
  their experimental state.
- Add separate deploy_teensy.md and deploy_mimxrt.md files.
---
 ports/mimxrt/boards/MIMXRT1010_EVK/board.json | 11 +++++++++--
 ports/mimxrt/boards/MIMXRT1020_EVK/board.json | 14 ++++++++++++--
 ports/mimxrt/boards/MIMXRT1050_EVK/board.json | 15 +++++++++++++--
 ports/mimxrt/boards/MIMXRT1060_EVK/board.json | 16 ++++++++++++++--
 ports/mimxrt/boards/MIMXRT1060_EVK/board.md   |  1 +
 ports/mimxrt/boards/MIMXRT1064_EVK/board.json | 16 ++++++++++++++--
 ports/mimxrt/boards/MIMXRT1064_EVK/board.md   |  1 +
 ports/mimxrt/boards/TEENSY40/board.json       |  6 ++++--
 ports/mimxrt/boards/TEENSY41/board.json       |  8 ++++++--
 ports/mimxrt/boards/deploy.md                 |  0
 ports/mimxrt/boards/deploy_mimxrt.md          | 11 +++++++++++
 ports/mimxrt/boards/deploy_teensy.md          | 14 ++++++++++++++
 12 files changed, 99 insertions(+), 14 deletions(-)
 create mode 100644 ports/mimxrt/boards/MIMXRT1060_EVK/board.md
 create mode 100644 ports/mimxrt/boards/MIMXRT1064_EVK/board.md
 delete mode 100644 ports/mimxrt/boards/deploy.md
 create mode 100644 ports/mimxrt/boards/deploy_mimxrt.md
 create mode 100644 ports/mimxrt/boards/deploy_teensy.md

diff --git a/ports/mimxrt/boards/MIMXRT1010_EVK/board.json b/ports/mimxrt/boards/MIMXRT1010_EVK/board.json
index 048430beaddbc..4bf9ce052457b 100644
--- a/ports/mimxrt/boards/MIMXRT1010_EVK/board.json
+++ b/ports/mimxrt/boards/MIMXRT1010_EVK/board.json
@@ -1,9 +1,16 @@
 {
     "deploy": [
-        "../deploy.md"
+        "../deploy_mimxrt.md"
     ],
     "docs": "",
-    "features": [],
+    "features": [
+        "MicroUSB",
+        "Microphone",
+        "AudioCodec",
+        "SPDIF",
+        "OpenSDA",
+        "JLink"
+    ],
     "images": [
         "i.MXRT1010-TOP.jpg"
     ],
diff --git a/ports/mimxrt/boards/MIMXRT1020_EVK/board.json b/ports/mimxrt/boards/MIMXRT1020_EVK/board.json
index 4dd3fed26976a..cc74c25fed433 100644
--- a/ports/mimxrt/boards/MIMXRT1020_EVK/board.json
+++ b/ports/mimxrt/boards/MIMXRT1020_EVK/board.json
@@ -1,9 +1,19 @@
 {
     "deploy": [
-        "../deploy.md"
+        "../deploy_mimxrt.md"
     ],
     "docs": "",
-    "features": [],
+    "features": [
+        "Ethernet",
+        "SDRAM",
+        "MicroSD",
+        "MicroUSB",
+        "Microphone",
+        "AudioCodec",
+        "CAN",
+        "OpenSDA",
+        "JLink"
+    ],
     "images": [
         "MIMXRT-1020-EVKBD.jpg"
     ],
diff --git a/ports/mimxrt/boards/MIMXRT1050_EVK/board.json b/ports/mimxrt/boards/MIMXRT1050_EVK/board.json
index 9c0e22b373abb..d99ad9fcfdc0e 100644
--- a/ports/mimxrt/boards/MIMXRT1050_EVK/board.json
+++ b/ports/mimxrt/boards/MIMXRT1050_EVK/board.json
@@ -1,9 +1,20 @@
 {
     "deploy": [
-        "../deploy.md"
+        "../deploy_mimxrt.md"
     ],
     "docs": "",
-    "features": [],
+    "features": [
+        "Ethernet",
+        "SDRAM",
+        "MicroSD",
+        "MicroUSB",
+        "Microphone",
+        "AudioCodec",
+        "SPDIF",
+        "CAN",
+        "OpenSDA",
+        "JLink"
+    ],
     "images": [
         "IMX_RT1050-EVKB_TOP-LR.jpg"
     ],
diff --git a/ports/mimxrt/boards/MIMXRT1060_EVK/board.json b/ports/mimxrt/boards/MIMXRT1060_EVK/board.json
index 14e8942de2670..67a3818ee27dd 100644
--- a/ports/mimxrt/boards/MIMXRT1060_EVK/board.json
+++ b/ports/mimxrt/boards/MIMXRT1060_EVK/board.json
@@ -1,9 +1,21 @@
 {
     "deploy": [
-        "../deploy.md"
+        "../deploy_mimxrt.md"
     ],
     "docs": "",
-    "features": [],
+    "features": [
+        "Ethernet",
+        "SDRAM",
+        "MicroSD",
+        "MicroUSB",
+        "Microphone",
+        "AudioCodec",
+        "SPDIF",
+        "CAN",
+        "Camera",
+        "OpenSDA",
+        "JLink"
+    ],
     "images": [
         "X-MIMXRT1060-EVK-BOARD-BOTTOM.jpg"
     ],
diff --git a/ports/mimxrt/boards/MIMXRT1060_EVK/board.md b/ports/mimxrt/boards/MIMXRT1060_EVK/board.md
new file mode 100644
index 0000000000000..5bca8d57f2888
--- /dev/null
+++ b/ports/mimxrt/boards/MIMXRT1060_EVK/board.md
@@ -0,0 +1 @@
+The port for this board is experimental. It is made based on the documentation, but was not yet tested.
\ No newline at end of file
diff --git a/ports/mimxrt/boards/MIMXRT1064_EVK/board.json b/ports/mimxrt/boards/MIMXRT1064_EVK/board.json
index ff7f3f722ee6a..ef12336c445d7 100644
--- a/ports/mimxrt/boards/MIMXRT1064_EVK/board.json
+++ b/ports/mimxrt/boards/MIMXRT1064_EVK/board.json
@@ -1,9 +1,21 @@
 {
     "deploy": [
-        "../deploy.md"
+        "../deploy_mimxrt.md"
     ],
     "docs": "",
-    "features": [],
+    "features": [
+        "Ethernet",
+        "SDRAM",
+        "MicroSD",
+        "MicroUSB",
+        "Microphone",
+        "AudioAmp",
+        "SPDIF",
+        "CAN",
+        "Camera",
+        "OpenSDA",
+        "JLink"
+    ],
     "images": [
         "MIMXRT1064EVK-TOP.jpg"
     ],
diff --git a/ports/mimxrt/boards/MIMXRT1064_EVK/board.md b/ports/mimxrt/boards/MIMXRT1064_EVK/board.md
new file mode 100644
index 0000000000000..5bca8d57f2888
--- /dev/null
+++ b/ports/mimxrt/boards/MIMXRT1064_EVK/board.md
@@ -0,0 +1 @@
+The port for this board is experimental. It is made based on the documentation, but was not yet tested.
\ No newline at end of file
diff --git a/ports/mimxrt/boards/TEENSY40/board.json b/ports/mimxrt/boards/TEENSY40/board.json
index dfc0ca96b32f2..daa6dbf99e04f 100644
--- a/ports/mimxrt/boards/TEENSY40/board.json
+++ b/ports/mimxrt/boards/TEENSY40/board.json
@@ -1,9 +1,11 @@
 {
     "deploy": [
-        "../deploy.md"
+        "../deploy_teensy.md"
     ],
     "docs": "",
-    "features": [],
+    "features": [
+        "Breadboard Friendly"
+    ],
     "images": [
         "teensy40_front.jpg"
     ],
diff --git a/ports/mimxrt/boards/TEENSY41/board.json b/ports/mimxrt/boards/TEENSY41/board.json
index cbb397c727509..1f8fe37a99962 100644
--- a/ports/mimxrt/boards/TEENSY41/board.json
+++ b/ports/mimxrt/boards/TEENSY41/board.json
@@ -1,9 +1,13 @@
 {
     "deploy": [
-        "../deploy.md"
+        "../deploy_teensy.md"
     ],
     "docs": "",
-    "features": [],
+    "features": [
+        "MicroSD",
+        "Ethernet",
+        "Breadboard Friendly"
+    ],
     "images": [
         "teensy41_4.jpg"
     ],
diff --git a/ports/mimxrt/boards/deploy.md b/ports/mimxrt/boards/deploy.md
deleted file mode 100644
index e69de29bb2d1d..0000000000000
diff --git a/ports/mimxrt/boards/deploy_mimxrt.md b/ports/mimxrt/boards/deploy_mimxrt.md
new file mode 100644
index 0000000000000..35752a8362cef
--- /dev/null
+++ b/ports/mimxrt/boards/deploy_mimxrt.md
@@ -0,0 +1,11 @@
+Firmware can be loaded to the MIMXRT development boards in various ways. The most convenient
+one is using the built-in support MCU. When a PC is connected to the debug USB port, a drive
+icon will appear. Firmware can be uploaded to the board by copying it to this drive. The copy
+and flashing will take a few moments. At the end of the upload, the drive icon will disappear
+and reappear again. Then the reset button has to be pushed, which starts the MicroPython firmware.
+
+Depending on the power jumper settings, both the debug USB and OTG USB port have to be powered
+during firmware upload.
+
+You may as well load the firmware using the JLink port or openSDA interface with the appropriate tools.
+For more options, consult the user guide of the board.
diff --git a/ports/mimxrt/boards/deploy_teensy.md b/ports/mimxrt/boards/deploy_teensy.md
new file mode 100644
index 0000000000000..f4815449009b6
--- /dev/null
+++ b/ports/mimxrt/boards/deploy_teensy.md
@@ -0,0 +1,14 @@
+For deploying the firmware use the Teensy Loader tool provided by PJRC on their web site.
+PJRC provides both a graphical and command line version for Windows, OS X and Linux.
+With the command line version, run the command:
+
+```bash
+teensy_loader_cli --mcu=imxrt1062 -v -w TEENSY40-<date_version_tag>.hex
+```
+or for Teensy 4.1:
+
+```bash
+teensy_loader_cli --mcu=imxrt1062 -v -w TEENSY41-<date_version_tag>.hex
+```
+
+When loading the firmware the PJRC boot loader will erase the content of the board file system.

From 7d7d29dbe29df909616094bbf0ec047401f8ab36 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Wed, 10 Nov 2021 13:59:09 +0100
Subject: [PATCH 1395/3533] mimxrt: Fix mp_hal_quiet_timing_enter()/exit() so
 timer still runs.

The initial code disabled IRQs, which caused the us-ticks timer to stop.
The change here changes the priotity level, such that the timer still runs.
---
 ports/mimxrt/mpconfigport.h | 17 +++++++++++++++++
 ports/mimxrt/mphalport.h    |  4 ++--
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/ports/mimxrt/mpconfigport.h b/ports/mimxrt/mpconfigport.h
index 64e991c7996d6..361b8bd089017 100644
--- a/ports/mimxrt/mpconfigport.h
+++ b/ports/mimxrt/mpconfigport.h
@@ -189,6 +189,23 @@ __attribute__((always_inline)) static inline uint32_t disable_irq(void) {
     return state;
 }
 
+static inline uint32_t raise_irq_pri(uint32_t pri) {
+    uint32_t basepri = __get_BASEPRI();
+    // If non-zero, the processor does not process any exception with a
+    // priority value greater than or equal to BASEPRI.
+    // When writing to BASEPRI_MAX the write goes to BASEPRI only if either:
+    //   - Rn is non-zero and the current BASEPRI value is 0
+    //   - Rn is non-zero and less than the current BASEPRI value
+    pri <<= (8 - __NVIC_PRIO_BITS);
+    __ASM volatile ("msr basepri_max, %0" : : "r" (pri) : "memory");
+    return basepri;
+}
+
+// "basepri" should be the value returned from raise_irq_pri
+static inline void restore_irq_pri(uint32_t basepri) {
+    __set_BASEPRI(basepri);
+}
+
 #define MICROPY_BEGIN_ATOMIC_SECTION()     disable_irq()
 #define MICROPY_END_ATOMIC_SECTION(state)  enable_irq(state)
 
diff --git a/ports/mimxrt/mphalport.h b/ports/mimxrt/mphalport.h
index c02f561a9d60b..0dc49f01a545e 100644
--- a/ports/mimxrt/mphalport.h
+++ b/ports/mimxrt/mphalport.h
@@ -53,8 +53,8 @@ extern ringbuf_t stdin_ringbuf;
 #define mp_hal_pin_od_low(p)    mp_hal_pin_low(p)
 #define mp_hal_pin_od_high(p)   mp_hal_pin_high(p)
 
-#define mp_hal_quiet_timing_enter() MICROPY_BEGIN_ATOMIC_SECTION()
-#define mp_hal_quiet_timing_exit(irq_state) MICROPY_END_ATOMIC_SECTION(irq_state)
+#define mp_hal_quiet_timing_enter() raise_irq_pri(1)
+#define mp_hal_quiet_timing_exit(irq_state) restore_irq_pri(irq_state)
 
 void mp_hal_set_interrupt_char(int c);
 

From b73d8b045a6cff582280092d5a4c9d930934c25a Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Wed, 15 Sep 2021 18:16:05 +0200
Subject: [PATCH 1396/3533] rp2/machine_bitstream: Implement the
 machine.bitstream driver.

Timing error is ~20ns at 125MHz, and ~10ns at 250MHz.
---
 ports/rp2/CMakeLists.txt      |  1 +
 ports/rp2/machine_bitstream.c | 74 +++++++++++++++++++++++++++++++++++
 ports/rp2/modmachine.c        |  6 ++-
 ports/rp2/mpconfigport.h      |  1 +
 ports/rp2/mphalport.h         | 16 ++++++++
 5 files changed, 97 insertions(+), 1 deletion(-)
 create mode 100644 ports/rp2/machine_bitstream.c

diff --git a/ports/rp2/CMakeLists.txt b/ports/rp2/CMakeLists.txt
index 0b433da53c1e8..c2f8088542668 100644
--- a/ports/rp2/CMakeLists.txt
+++ b/ports/rp2/CMakeLists.txt
@@ -84,6 +84,7 @@ set(MICROPY_SOURCE_DRIVERS
 set(MICROPY_SOURCE_PORT
     fatfs_port.c
     machine_adc.c
+    machine_bitstream.c
     machine_i2c.c
     machine_i2s.c
     machine_pin.c
diff --git a/ports/rp2/machine_bitstream.c b/ports/rp2/machine_bitstream.c
new file mode 100644
index 0000000000000..b65ec02147b40
--- /dev/null
+++ b/ports/rp2/machine_bitstream.c
@@ -0,0 +1,74 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Jim Mussared
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+// This is a translation of the cycle counter implementation in ports/stm32/machine_bitstream.c.
+
+#include "py/mpconfig.h"
+#include "py/mphal.h"
+#include "hardware/structs/systick.h"
+
+#if MICROPY_PY_MACHINE_BITSTREAM
+
+#define MP_HAL_BITSTREAM_NS_OVERHEAD  (9)
+
+void __time_critical_func(machine_bitstream_high_low)(mp_hal_pin_obj_t pin, uint32_t *timing_ns, const uint8_t *buf, size_t len) {
+    uint32_t fcpu_mhz = mp_hal_get_cpu_freq() / 1000000;
+    // Convert ns to clock ticks [high_time_0, period_0, high_time_1, period_1].
+    for (size_t i = 0; i < 4; ++i) {
+        timing_ns[i] = fcpu_mhz * timing_ns[i] / 1000;
+        if (timing_ns[i] > (2 * MP_HAL_BITSTREAM_NS_OVERHEAD)) {
+            timing_ns[i] -= MP_HAL_BITSTREAM_NS_OVERHEAD;
+        }
+        if (i % 2 == 1) {
+            // Convert low_time to period (i.e. add high_time).
+            timing_ns[i] += timing_ns[i - 1] - MP_HAL_BITSTREAM_NS_OVERHEAD;
+        }
+    }
+    mp_hal_pin_output(pin);
+    // Enable the systick counter, source CPU clock.
+    systick_hw->csr = 5;
+
+    uint32_t irq_state = mp_hal_quiet_timing_enter();
+
+    for (size_t i = 0; i < len; ++i) {
+        uint8_t b = buf[i];
+        for (size_t j = 0; j < 8; ++j) {
+            uint32_t *t = &timing_ns[b >> 6 & 2];
+            uint32_t start_ticks = systick_hw->cvr = SYSTICK_MAX;
+            mp_hal_pin_high(pin);
+            while ((start_ticks - systick_hw->cvr) < t[0]) {
+            }
+            b <<= 1;
+            mp_hal_pin_low(pin);
+            while ((start_ticks - systick_hw->cvr) < t[1]) {
+            }
+        }
+    }
+
+    mp_hal_quiet_timing_exit(irq_state);
+}
+
+#endif // MICROPY_PY_MACHINE_BITSTREAM
diff --git a/ports/rp2/modmachine.c b/ports/rp2/modmachine.c
index 88e4bec2e8bad..9d6178a0f2b64 100644
--- a/ports/rp2/modmachine.c
+++ b/ports/rp2/modmachine.c
@@ -27,6 +27,7 @@
 #include "py/runtime.h"
 #include "py/mphal.h"
 #include "shared/runtime/pyexec.h"
+#include "extmod/machine_bitstream.h"
 #include "extmod/machine_i2c.h"
 #include "extmod/machine_mem.h"
 #include "extmod/machine_pulse.h"
@@ -86,7 +87,7 @@ MP_DEFINE_CONST_FUN_OBJ_0(machine_bootloader_obj, machine_bootloader);
 
 STATIC mp_obj_t machine_freq(size_t n_args, const mp_obj_t *args) {
     if (n_args == 0) {
-        return MP_OBJ_NEW_SMALL_INT(clock_get_hz(clk_sys));
+        return MP_OBJ_NEW_SMALL_INT(mp_hal_get_cpu_freq());
     } else {
         mp_int_t freq = mp_obj_get_int(args[0]);
         if (!set_sys_clock_khz(freq / 1000, false)) {
@@ -154,6 +155,9 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_disable_irq),         MP_ROM_PTR(&machine_disable_irq_obj) },
     { MP_ROM_QSTR(MP_QSTR_enable_irq),          MP_ROM_PTR(&machine_enable_irq_obj) },
 
+    #if MICROPY_PY_MACHINE_BITSTREAM
+    { MP_ROM_QSTR(MP_QSTR_bitstream),           MP_ROM_PTR(&machine_bitstream_obj) },
+    #endif
     { MP_ROM_QSTR(MP_QSTR_time_pulse_us),       MP_ROM_PTR(&machine_time_pulse_us_obj) },
 
     { MP_ROM_QSTR(MP_QSTR_mem8),                MP_ROM_PTR(&machine_mem8_obj) },
diff --git a/ports/rp2/mpconfigport.h b/ports/rp2/mpconfigport.h
index 2e8a33a7a7598..e6a85bb68290c 100644
--- a/ports/rp2/mpconfigport.h
+++ b/ports/rp2/mpconfigport.h
@@ -86,6 +86,7 @@
 #define MICROPY_PY_URANDOM_SEED_INIT_FUNC       (rosc_random_u32())
 #define MICROPY_PY_MACHINE                      (1)
 #define MICROPY_PY_MACHINE_PIN_MAKE_NEW         mp_pin_make_new
+#define MICROPY_PY_MACHINE_BITSTREAM            (1)
 #define MICROPY_PY_MACHINE_PULSE                (1)
 #define MICROPY_PY_MACHINE_PWM                  (1)
 #define MICROPY_PY_MACHINE_PWM_DUTY_U16_NS      (1)
diff --git a/ports/rp2/mphalport.h b/ports/rp2/mphalport.h
index 40633dcf2c12f..458d9a9a16165 100644
--- a/ports/rp2/mphalport.h
+++ b/ports/rp2/mphalport.h
@@ -28,6 +28,10 @@
 #include "py/mpconfig.h"
 #include "py/ringbuf.h"
 #include "pico/time.h"
+#include "hardware/clocks.h"
+#include "hardware/structs/systick.h"
+
+#define SYSTICK_MAX (0xffffff)
 
 extern int mp_interrupt_char;
 extern ringbuf_t stdin_ringbuf;
@@ -59,6 +63,10 @@ static inline mp_uint_t mp_hal_ticks_cpu(void) {
     return time_us_32();
 }
 
+static inline mp_uint_t mp_hal_get_cpu_freq(void) {
+    return clock_get_hz(clk_sys);
+}
+
 // C-level pin HAL
 
 #include "py/obj.h"
@@ -110,4 +118,12 @@ static inline void mp_hal_pin_od_high(mp_hal_pin_obj_t pin) {
     gpio_set_dir(pin, GPIO_IN);
 }
 
+static inline void mp_hal_pin_low(mp_hal_pin_obj_t pin) {
+    gpio_clr_mask(1 << pin);
+}
+
+static inline void mp_hal_pin_high(mp_hal_pin_obj_t pin) {
+    gpio_set_mask(1 << pin);
+}
+
 #endif // MICROPY_INCLUDED_RP2_MPHALPORT_H

From 5ed7a748f0f767cdec9da95c289b934adaaecf67 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Fri, 17 Sep 2021 09:18:44 +0200
Subject: [PATCH 1397/3533] rp2/boards: Add neopixel.py to manifest.py.

Because machine.bitstream is now implemented on the rp2 port.
---
 ports/rp2/boards/manifest.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/rp2/boards/manifest.py b/ports/rp2/boards/manifest.py
index 9df589f126787..a45bbe0661c3c 100644
--- a/ports/rp2/boards/manifest.py
+++ b/ports/rp2/boards/manifest.py
@@ -1,3 +1,4 @@
 freeze("$(PORT_DIR)/modules")
 freeze("$(MPY_DIR)/drivers/onewire")
 include("$(MPY_DIR)/extmod/uasyncio/manifest.py")
+include("$(MPY_DIR)/drivers/neopixel/manifest.py")

From d11ff0499fe52cfc9443aa6c0cb1620fd3dd1e70 Mon Sep 17 00:00:00 2001
From: Henk Vergonet <henk.vergonet@gmail.com>
Date: Tue, 7 Aug 2018 13:14:00 +0200
Subject: [PATCH 1398/3533] unix/modos: Add support for uos.urandom(n).

Use getrandom function if available, otherwise read from /dev/urandom.

Signed-off-by: Henk.Vergonet@gmail.com
---
 ports/unix/modos.c | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/ports/unix/modos.c b/ports/unix/modos.c
index 5e719c5736c1c..24e5c95b1830a 100644
--- a/ports/unix/modos.c
+++ b/ports/unix/modos.c
@@ -27,6 +27,7 @@
 
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <fcntl.h>
 #include <unistd.h>
 #include <errno.h>
 #include <stdio.h>
@@ -49,6 +50,29 @@
 #define USE_STATFS 1
 #endif
 
+#if defined(__GLIBC__) && defined(__GLIBC_PREREQ)
+#if __GLIBC_PREREQ(2, 25)
+#include <sys/random.h>
+#define _HAVE_GETRANDOM
+#endif
+#endif
+
+STATIC mp_obj_t mod_os_urandom(mp_obj_t num) {
+    mp_int_t n = mp_obj_get_int(num);
+    vstr_t vstr;
+    vstr_init_len(&vstr, n);
+    #ifdef _HAVE_GETRANDOM
+    RAISE_ERRNO(getrandom(vstr.buf, n, 0), errno);
+    #else
+    int fd = open("/dev/urandom", O_RDONLY);
+    RAISE_ERRNO(fd, errno);
+    RAISE_ERRNO(read(fd, vstr.buf, n), errno);
+    close(fd);
+    #endif
+    return mp_obj_new_str_from_vstr(&mp_type_bytes, &vstr);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_os_urandom_obj, mod_os_urandom);
+
 STATIC mp_obj_t mod_os_stat(mp_obj_t path_in) {
     struct stat sb;
     const char *path = mp_obj_str_get_str(path_in);
@@ -309,6 +333,7 @@ STATIC const mp_rom_map_elem_t mp_module_os_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_uos) },
     { MP_ROM_QSTR(MP_QSTR_errno), MP_ROM_PTR(&mod_os_errno_obj) },
     { MP_ROM_QSTR(MP_QSTR_stat), MP_ROM_PTR(&mod_os_stat_obj) },
+    { MP_ROM_QSTR(MP_QSTR_urandom), MP_ROM_PTR(&mod_os_urandom_obj) },
     #if MICROPY_PY_OS_STATVFS
     { MP_ROM_QSTR(MP_QSTR_statvfs), MP_ROM_PTR(&mod_os_statvfs_obj) },
     #endif

From 5cf71b55960651fc506df0ac41490f12dd1d63fd Mon Sep 17 00:00:00 2001
From: Alexey 'alexxy' Shvetsov <alexxyum@gmail.com>
Date: Fri, 15 May 2020 23:26:08 +0300
Subject: [PATCH 1399/3533] shared/libc/string0: Don't include string.h, and
 provide __memcpy_chk.

Some toolchains will have string.h defining various macros which can lead
to compile errors for string function implementations.  Not including
string.h fixes this.

An implementation of __memcpy_chk is provided for toolchains that enable
_FORTIFY_SOURCE.

Fixes issue #6046.

Signed-off-by: Alexey 'alexxy' Shvetsov <alexxyum@gmail.com>
---
 shared/libc/string0.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/shared/libc/string0.c b/shared/libc/string0.c
index 19ad14d0f7a77..a3b268e44164c 100644
--- a/shared/libc/string0.c
+++ b/shared/libc/string0.c
@@ -25,7 +25,7 @@
  */
 
 #include <stdint.h>
-#include <string.h>
+#include <stddef.h>
 
 #define likely(x) __builtin_expect((x), 1)
 
@@ -64,6 +64,13 @@ void *memcpy(void *dst, const void *src, size_t n) {
     return dst;
 }
 
+void *__memcpy_chk(void *dest, const void *src, size_t len, size_t slen) {
+    if (len > slen) {
+        return NULL;
+    }
+    return memcpy(dest, src, len);
+}
+
 void *memmove(void *dest, const void *src, size_t n) {
     if (src < dest && (uint8_t*)dest < (const uint8_t*)src + n) {
         // need to copy backwards

From 43d08688c398184013bbfb0190e2529e4032e003 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 17 Nov 2021 13:45:42 +1100
Subject: [PATCH 1400/3533] extmod/uasyncio: Fix gather returning exceptions
 from a cancelled task.

Fixes issue #5882.
---
 extmod/uasyncio/funcs.py            |  2 +-
 tests/extmod/uasyncio_gather.py     | 10 ++++++++--
 tests/extmod/uasyncio_gather.py.exp |  3 +++
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/extmod/uasyncio/funcs.py b/extmod/uasyncio/funcs.py
index 93f4fd256cafe..0ce48b015c1bd 100644
--- a/extmod/uasyncio/funcs.py
+++ b/extmod/uasyncio/funcs.py
@@ -66,7 +66,7 @@ async def gather(*aws, return_exceptions=False):
             #        # cancel all waiting tasks
             #        raise er
             ts[i] = await ts[i]
-        except Exception as er:
+        except (core.CancelledError, Exception) as er:
             if return_exceptions:
                 ts[i] = er
             else:
diff --git a/tests/extmod/uasyncio_gather.py b/tests/extmod/uasyncio_gather.py
index 0e2948b07caa4..6053873dbc1ae 100644
--- a/tests/extmod/uasyncio_gather.py
+++ b/tests/extmod/uasyncio_gather.py
@@ -22,8 +22,9 @@ async def factorial(name, number):
 
 async def task(id):
     print("start", id)
-    await asyncio.sleep(0.2)
+    await asyncio.sleep(0.02)
     print("end", id)
+    return id
 
 
 async def gather_task():
@@ -36,12 +37,17 @@ async def main():
     # Simple gather with return values
     print(await asyncio.gather(factorial("A", 2), factorial("B", 3), factorial("C", 4)))
 
+    # Test return_exceptions, where one task is cancelled and the other finishes normally
+    tasks = [asyncio.create_task(task(1)), asyncio.create_task(task(2))]
+    tasks[0].cancel()
+    print(await asyncio.gather(*tasks, return_exceptions=True))
+
     # Cancel a multi gather
     # TODO doesn't work, Task should not forward cancellation from gather to sub-task
     # but rather CancelledError should cancel the gather directly, which will then cancel
     # all sub-tasks explicitly
     # t = asyncio.create_task(gather_task())
-    # await asyncio.sleep(0.1)
+    # await asyncio.sleep(0.01)
     # t.cancel()
     # await asyncio.sleep(0.01)
 
diff --git a/tests/extmod/uasyncio_gather.py.exp b/tests/extmod/uasyncio_gather.py.exp
index a37578d7eb3c8..95310bbe1c105 100644
--- a/tests/extmod/uasyncio_gather.py.exp
+++ b/tests/extmod/uasyncio_gather.py.exp
@@ -8,3 +8,6 @@ Task B: factorial(3) = 6
 Task C: Compute factorial(4)...
 Task C: factorial(4) = 24
 [2, 6, 24]
+start 2
+end 2
+[CancelledError(), 2]

From 19f09414a624914b29188b23f9d0da7d4b04e358 Mon Sep 17 00:00:00 2001
From: "jc_.kim" <jc_.kim@samsung.com>
Date: Mon, 13 Jul 2020 19:22:58 +0900
Subject: [PATCH 1401/3533] tests/micropython/const.py: Add comment about
 required config for test.

Expected result of const.py will be matched only when MICROPY_COMP_CONST is
enabled.  For easy understanding, added description at the first of the
test code.
---
 tests/micropython/const.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/micropython/const.py b/tests/micropython/const.py
index 1faf22be9a430..1c805a45f9bc7 100644
--- a/tests/micropython/const.py
+++ b/tests/micropython/const.py
@@ -1,4 +1,5 @@
 # test constant optimisation
+# This test will only work when MICROPY_COMP_CONST is enabled.
 
 from micropython import const
 

From 95ccd9a005c09c58d7a74af97e990c798cb5c4f7 Mon Sep 17 00:00:00 2001
From: Pooya Moradi <pvonmoradi@gmail.com>
Date: Fri, 4 Dec 2020 16:01:19 +0330
Subject: [PATCH 1402/3533] nrf/Makefile: Improve Black Magic Probe commands.

Used batch mode to get rid of the confirmation prompt on flashing.
Used 'compare-sections' to verify flash.
Removed the unnecessary `quit` at the end.
---
 ports/nrf/Makefile | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/ports/nrf/Makefile b/ports/nrf/Makefile
index a8a5228270f17..423323a9c6a2c 100644
--- a/ports/nrf/Makefile
+++ b/ports/nrf/Makefile
@@ -430,19 +430,19 @@ else ifeq ($(FLASHER), bmp)
 BMP_PORT ?= /dev/ttyACM0
 
 deploy: $(BUILD)/$(OUTPUT_FILENAME).elf
-	$(Q)$(GDB) \
+	$(Q)$(GDB) -nx --batch \
 	    -ex 'target extended-remote $(BMP_PORT)' \
 	    -ex 'monitor tpwr enable' \
 	    -ex 'monitor swdp_scan' \
 	    -ex 'attach 1' \
 	    -ex 'set mem inaccessible-by-default off' \
 	    -ex 'load' \
+	    -ex 'compare-sections' \
 	    -ex 'kill' \
-	    -ex 'quit' \
 	    $<
 
 sd: $(BUILD)/$(OUTPUT_FILENAME).elf
-	$(Q)$(GDB) \
+	$(Q)$(GDB) -nx --batch \
 	    -ex 'target extended-remote $(BMP_PORT)' \
 	    -ex 'monitor tpwr enable' \
 	    -ex 'monitor swdp_scan' \
@@ -450,10 +450,11 @@ sd: $(BUILD)/$(OUTPUT_FILENAME).elf
 	    -ex 'set mem inaccessible-by-default off' \
 	    -ex 'monitor erase_mass' \
 	    -ex 'load' \
+	    -ex 'compare-sections' \
 	    -ex 'file $(SOFTDEV_HEX)' \
 	    -ex 'load' \
+	    -ex 'compare-sections' \
 	    -ex 'kill' \
-	    -ex 'quit' \
 	    $<
 
 else ifeq ($(FLASHER), openocd)

From 8f3510799d9ad5c2c19189a7a1dd1051d0d46c30 Mon Sep 17 00:00:00 2001
From: Sebastian Wicki <gandro@gmx.net>
Date: Sat, 14 Nov 2020 20:39:26 +0100
Subject: [PATCH 1403/3533] docs/library/framebuf.rst: Adjust dimensions in
 example.

This commit swaps the dimensions of the `framebuffer.FrameBuffer` in the
docs example from 10x100 to 100x10 pixels to avoid clipping.

This is done to better fit the subsequent example code, which writes
text of size 96x8 followed by a 96x1 horizontal line.

The y coordinate of the horizontal line is also adjusted such that it is
drawn inside of the new canvas bounds.
---
 docs/library/framebuf.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/library/framebuf.rst b/docs/library/framebuf.rst
index 13502cc7aef38..098ada8153847 100644
--- a/docs/library/framebuf.rst
+++ b/docs/library/framebuf.rst
@@ -19,11 +19,11 @@ For example::
     import framebuf
 
     # FrameBuffer needs 2 bytes for every RGB565 pixel
-    fbuf = framebuf.FrameBuffer(bytearray(10 * 100 * 2), 10, 100, framebuf.RGB565)
+    fbuf = framebuf.FrameBuffer(bytearray(100 * 10 * 2), 100, 10, framebuf.RGB565)
 
     fbuf.fill(0)
     fbuf.text('MicroPython!', 0, 0, 0xffff)
-    fbuf.hline(0, 10, 96, 0xffff)
+    fbuf.hline(0, 9, 96, 0xffff)
 
 Constructors
 ------------

From a4c0f52714ed176587cb43f98ea7f3b2264c600e Mon Sep 17 00:00:00 2001
From: Matt van de Werken <matt.vandewerken@csiro.au>
Date: Thu, 2 Jul 2020 17:36:27 +1000
Subject: [PATCH 1404/3533] stm32/led: Support an extra 2 LEDs in board
 configuration.

Although the pyboard has only 4 LEDs, there are some boards that (may) have
more.  This commit adds 2 more LEDs to the led.c file that if defined in
the board-specific config file will be compiled in.
---
 ports/stm32/led.c | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/ports/stm32/led.c b/ports/stm32/led.c
index adcb240cc0cc6..078327462ae15 100644
--- a/ports/stm32/led.c
+++ b/ports/stm32/led.c
@@ -58,6 +58,12 @@ STATIC const pyb_led_obj_t pyb_led_obj[] = {
     {{&pyb_led_type}, 3, MICROPY_HW_LED3},
     #if defined(MICROPY_HW_LED4)
     {{&pyb_led_type}, 4, MICROPY_HW_LED4},
+    #if defined(MICROPY_HW_LED5)
+    {{&pyb_led_type}, 5, MICROPY_HW_LED5},
+    #if defined(MICROPY_HW_LED6)
+    {{&pyb_led_type}, 6, MICROPY_HW_LED6},
+    #endif
+    #endif
     #endif
     #endif
     #endif
@@ -77,7 +83,9 @@ void led_init(void) {
 #if defined(MICROPY_HW_LED1_PWM) \
     || defined(MICROPY_HW_LED2_PWM) \
     || defined(MICROPY_HW_LED3_PWM) \
-    || defined(MICROPY_HW_LED4_PWM)
+    || defined(MICROPY_HW_LED4_PWM) \
+    || defined(MICROPY_HW_LED5_PWM) \
+    || defined(MICROPY_HW_LED6_PWM)
 
 // The following is semi-generic code to control LEDs using PWM.
 // It currently supports TIM1, TIM2 and TIM3, channels 1-4.
@@ -98,6 +106,12 @@ void led_init(void) {
 #ifndef MICROPY_HW_LED4_PWM
 #define MICROPY_HW_LED4_PWM { NULL, 0, 0, 0 }
 #endif
+#ifndef MICROPY_HW_LED5_PWM
+#define MICROPY_HW_LED5_PWM { NULL, 0, 0, 0 }
+#endif
+#ifndef MICROPY_HW_LED6_PWM
+#define MICROPY_HW_LED6_PWM { NULL, 0, 0, 0 }
+#endif
 
 #define LED_PWM_TIM_PERIOD (10000) // TIM runs at 1MHz and fires every 10ms
 
@@ -116,6 +130,8 @@ STATIC const led_pwm_config_t led_pwm_config[] = {
     MICROPY_HW_LED2_PWM,
     MICROPY_HW_LED3_PWM,
     MICROPY_HW_LED4_PWM,
+    MICROPY_HW_LED5_PWM,
+    MICROPY_HW_LED6_PWM,
 };
 
 STATIC uint8_t led_pwm_state = 0;

From e5f9e2febc6e5f5f0a884a8036e0afb002680bc1 Mon Sep 17 00:00:00 2001
From: retsyo <lepto.python@gmail.com>
Date: Fri, 19 Feb 2021 18:53:09 +0800
Subject: [PATCH 1405/3533] windows/mpconfigport.h: Enable help and
 help("modules").

Following a similar change to the unix port in
6430cd3e02d4ec4a8fc949754b434f745b1973e6
---
 ports/windows/mpconfigport.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ports/windows/mpconfigport.h b/ports/windows/mpconfigport.h
index 4a8a902597876..8dd95e769d453 100644
--- a/ports/windows/mpconfigport.h
+++ b/ports/windows/mpconfigport.h
@@ -76,6 +76,8 @@
 #define MICROPY_PY_BUILTINS_NOTIMPLEMENTED (1)
 #define MICROPY_PY_BUILTINS_INPUT   (1)
 #define MICROPY_PY_BUILTINS_POW3    (1)
+#define MICROPY_PY_BUILTINS_HELP    (1)
+#define MICROPY_PY_BUILTINS_HELP_MODULES (1)
 #define MICROPY_PY_BUILTINS_ROUND_INT (1)
 #define MICROPY_PY_MICROPYTHON_MEM_INFO (1)
 #define MICROPY_PY_ALL_SPECIAL_METHODS (1)

From 1e5875557a8b7deeddfb96a9f9383b0d37dabee2 Mon Sep 17 00:00:00 2001
From: stijn <stijn@ignitron.net>
Date: Mon, 27 Sep 2021 11:05:07 +0200
Subject: [PATCH 1406/3533] extmod/uplatform: Remove unused definitions.

---
 extmod/moduplatform.c | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/extmod/moduplatform.c b/extmod/moduplatform.c
index 149df7c56ffaa..67be2265a7177 100644
--- a/extmod/moduplatform.c
+++ b/extmod/moduplatform.c
@@ -99,14 +99,6 @@
 #define PLATFORM_SYSTEM     "MicroPython"
 #endif
 
-#ifndef MICROPY_HW_BOARD_NAME
-#define MICROPY_HW_BOARD_NAME PLATFORM_ARCH
-#endif
-
-#ifndef MICROPY_HW_MCU_NAME
-#define MICROPY_HW_MCU_NAME     ""
-#endif
-
 #ifndef MICROPY_HAL_VERSION
 #define MICROPY_HAL_VERSION     ""
 #endif

From 5900257dd675c198f424b9078071cb21ba258a83 Mon Sep 17 00:00:00 2001
From: stijn <stijn@ignitron.net>
Date: Mon, 27 Sep 2021 11:17:15 +0200
Subject: [PATCH 1407/3533] extmod/uplatform: Use generic custom platform
 string.

Don't force the 'HAL' string to be part of the platform string because
it doesn't have a sensible meaning for all possible platforms, and
swap it with the PLATFORM_ARCH string so the strings which most platforms
have come first.
---
 extmod/moduplatform.c   |  8 ++++----
 ports/stm32/mphalport.h | 14 +++++++-------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/extmod/moduplatform.c b/extmod/moduplatform.c
index 67be2265a7177..8f678d770cad6 100644
--- a/extmod/moduplatform.c
+++ b/extmod/moduplatform.c
@@ -99,12 +99,12 @@
 #define PLATFORM_SYSTEM     "MicroPython"
 #endif
 
-#ifndef MICROPY_HAL_VERSION
-#define MICROPY_HAL_VERSION     ""
+#ifndef MICROPY_PLATFORM_VERSION
+#define MICROPY_PLATFORM_VERSION ""
 #endif
 
-STATIC const MP_DEFINE_STR_OBJ(info_platform_obj, PLATFORM_SYSTEM "-" MICROPY_VERSION_STRING "-HAL" \
-    MICROPY_HAL_VERSION "-" PLATFORM_ARCH "-with-" PLATFORM_LIBC_LIB "" PLATFORM_LIBC_VER);
+STATIC const MP_DEFINE_STR_OBJ(info_platform_obj, PLATFORM_SYSTEM "-" MICROPY_VERSION_STRING "-" \
+    PLATFORM_ARCH "-" MICROPY_PLATFORM_VERSION "-with-" PLATFORM_LIBC_LIB "" PLATFORM_LIBC_VER);
 STATIC const MP_DEFINE_STR_OBJ(info_python_compiler_obj, PLATFORM_COMPILER);
 STATIC const MP_DEFINE_STR_OBJ(info_libc_lib_obj, PLATFORM_LIBC_LIB);
 STATIC const MP_DEFINE_STR_OBJ(info_libc_ver_obj, PLATFORM_LIBC_VER);
diff --git a/ports/stm32/mphalport.h b/ports/stm32/mphalport.h
index edb8d8f64b64a..450e7098a6a59 100644
--- a/ports/stm32/mphalport.h
+++ b/ports/stm32/mphalport.h
@@ -4,19 +4,19 @@
 
 // F0-1.9.0+F4-1.16.0+F7-1.7.0+H7-1.6.0+L0-1.11.2+L4-1.8.1+WB-1.10.0
 #if defined(STM32F0)
-#define MICROPY_HAL_VERSION "1.9.0"
+#define MICROPY_PLATFORM_VERSION "HAL1.9.0"
 #elif defined(STM32F4)
-#define MICROPY_HAL_VERSION "1.16.0"
+#define MICROPY_PLATFORM_VERSION "HAL1.16.0"
 #elif defined(STM32F7)
-#define MICROPY_HAL_VERSION "1.7.0"
+#define MICROPY_PLATFORM_VERSION "HAL1.7.0"
 #elif defined(STM32H7)
-#define MICROPY_HAL_VERSION "1.6.0"
+#define MICROPY_PLATFORM_VERSION "HAL1.6.0"
 #elif defined(STM32L0)
-#define MICROPY_HAL_VERSION "1.11.2"
+#define MICROPY_PLATFORM_VERSION "HAL1.11.2"
 #elif defined(STM32L4)
-#define MICROPY_HAL_VERSION "1.8.1"
+#define MICROPY_PLATFORM_VERSION "HAL1.8.1"
 #elif defined(STM32WB)
-#define MICROPY_HAL_VERSION "1.10.0"
+#define MICROPY_PLATFORM_VERSION "HAL1.10.0"
 #endif
 
 extern const unsigned char mp_hal_status_to_errno_table[4];

From f27be2d78ab389bff4331cf60d4697c23beb57f6 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 18 Nov 2021 12:43:29 +1100
Subject: [PATCH 1408/3533] lib/asf4: Point submodule to latest commit on
 circuitpython branch.

---
 .gitmodules | 1 +
 lib/asf4    | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitmodules b/.gitmodules
index 474ae9890b0dd..a92757df2c5c3 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -23,6 +23,7 @@
 [submodule "lib/asf4"]
 	path = lib/asf4
 	url = https://github.com/adafruit/asf4
+	branch = circuitpython
 [submodule "lib/tinyusb"]
 	path = lib/tinyusb
 	url = https://github.com/hathach/tinyusb
diff --git a/lib/asf4 b/lib/asf4
index d270f79aa16dd..84f56af13292d 160000
--- a/lib/asf4
+++ b/lib/asf4
@@ -1 +1 @@
-Subproject commit d270f79aa16dd8fd4ae3b6c14544283dcb992e9c
+Subproject commit 84f56af13292d8f32c40acbd949bde698ddd4507

From cd2223b8fe5b242304016f2e160eca59a7cb81f9 Mon Sep 17 00:00:00 2001
From: Peter van der Burg <vdb_peter@hotmail.com>
Date: Thu, 20 May 2021 18:30:08 +1000
Subject: [PATCH 1409/3533] samd: Integrate latest asf4, add help, more time
 funcs and uPy features.

- Makefile: update to use new ASF4 files, support frozen manifest, and
  include source files in upcoming commits
- boards/manifest.py: add files to freeze
- boards/samd51p19a.ld: add linker script for this MCU
- help.c: add custom help text
- main.c: execute _boot.py, boot.py and main.py on start-up
- modules/_boot.py: startup file to freeze
- modutime.c: add gmtime, localtime, mktime, time functions
- mpconfigport.h: enabled more features for sys and io and modules
- mphalport.h: add mp_hal_pin_xxx macros
- mphalport.c: add mp_hal_stdio_poll
---
 ports/samd/Makefile             | 48 +++++++++++++++++++++++++--
 ports/samd/boards/manifest.py   |  1 +
 ports/samd/boards/samd51p19a.ld | 17 ++++++++++
 ports/samd/help.c               | 42 +++++++++++++++++++++++
 ports/samd/main.c               | 11 ++++++
 ports/samd/modules/_boot.py     | 17 ++++++++++
 ports/samd/modutime.c           | 54 ++++++++++++++++++++++++++++++
 ports/samd/mpconfigport.h       | 34 +++++++++++++++++++
 ports/samd/mphalport.c          |  9 +++++
 ports/samd/mphalport.h          | 59 +++++++++++++++++++++++++++++++--
 10 files changed, 287 insertions(+), 5 deletions(-)
 create mode 100644 ports/samd/boards/manifest.py
 create mode 100644 ports/samd/boards/samd51p19a.ld
 create mode 100644 ports/samd/help.c
 create mode 100644 ports/samd/modules/_boot.py

diff --git a/ports/samd/Makefile b/ports/samd/Makefile
index a84fc3b12dbe8..8476eea4b8741 100644
--- a/ports/samd/Makefile
+++ b/ports/samd/Makefile
@@ -16,6 +16,10 @@ include $(BOARD_DIR)/mpconfigboard.mk
 QSTR_DEFS = qstrdefsport.h
 QSTR_GLOBAL_DEPENDENCIES = $(BOARD_DIR)/mpconfigboard.h
 
+MCU_SERIES_LOWER = $(shell echo $(MCU_SERIES) | tr '[:upper:]' '[:lower:]')
+
+FROZEN_MANIFEST ?= boards/manifest.py
+
 # Include py core make definitions
 include $(TOP)/py/py.mk
 
@@ -26,14 +30,25 @@ INC += -I$(TOP)
 INC += -I$(BUILD)
 INC += -I$(BOARD_DIR)
 INC += -I$(TOP)/lib/cmsis/inc
-INC += -I$(TOP)/lib/asf4/$(shell echo $(MCU_SERIES) | tr '[:upper:]' '[:lower:]')/include
+INC += -I$(TOP)/lib/asf4/$(MCU_SERIES_LOWER)/hal/include
+INC += -I$(TOP)/lib/asf4/$(MCU_SERIES_LOWER)/hal/utils/include
+INC += -I$(TOP)/lib/asf4/$(MCU_SERIES_LOWER)/config
+INC += -I$(TOP)/lib/asf4/$(MCU_SERIES_LOWER)/hri
+INC += -I$(TOP)/lib/asf4/$(MCU_SERIES_LOWER)/hpl/core
+INC += -I$(TOP)/lib/asf4/$(MCU_SERIES_LOWER)/hpl/gclk
+INC += -I$(TOP)/lib/asf4/$(MCU_SERIES_LOWER)/hpl/pm
+INC += -I$(TOP)/lib/asf4/$(MCU_SERIES_LOWER)/hpl/port
+INC += -I$(TOP)/lib/asf4/$(MCU_SERIES_LOWER)/hpl/rtc
+INC += -I$(TOP)/lib/asf4/$(MCU_SERIES_LOWER)/hpl/tc
+INC += -I$(TOP)/lib/asf4/$(MCU_SERIES_LOWER)/include
+INC += -I$(TOP)/lib/asf4/$(MCU_SERIES_LOWER)/include/pio
 INC += -I$(TOP)/lib/tinyusb/src
 
 CFLAGS_MCU_SAMD21 = -mtune=cortex-m0plus -mcpu=cortex-m0plus -msoft-float
 CFLAGS_MCU_SAMD51 = -mtune=cortex-m4 -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard
 CFLAGS = $(INC) -Wall -Werror -std=c99 -nostdlib -mthumb $(CFLAGS_MCU_$(MCU_SERIES)) -fsingle-precision-constant -Wdouble-promotion
 CFLAGS += -DMCU_$(MCU_SERIES) -D__$(CMSIS_MCU)__
-CFLAGS += $(CFLAGS_MOD)
+CFLAGS += $(CFLAGS_MOD) $(CFLAGS_EXTRA)
 
 LDFLAGS = -nostdlib $(addprefix -T,$(LD_FILES)) -Map=$@.map --cref
 LDFLAGS += $(LDFLAGS_MOD)
@@ -59,12 +74,22 @@ endif
 
 SRC_C = \
 	main.c \
+	help.c \
+	moduos.c \
 	modutime.c \
 	modmachine.c \
+	$(BOARD_DIR)/pins.c \
+	machine_pin.c \
+	machine_led.c \
+	modsamd.c \
+	samd_flash.c \
 	mphalport.c \
 	samd_isr.c \
 	samd_soc.c \
 	tusb_port.c \
+	lib/asf4/$(MCU_SERIES_LOWER)/hal/src/hal_atomic.c \
+	lib/asf4/$(MCU_SERIES_LOWER)/hal/src/hal_flash.c \
+	lib/asf4/$(MCU_SERIES_LOWER)/hpl/nvmctrl/hpl_nvmctrl.c \
 	lib/libm/ef_sqrt.c \
 	lib/libm/fmodf.c \
 	lib/libm/math.c \
@@ -81,6 +106,8 @@ SRC_C = \
 	shared/runtime/gchelper_native.c \
 	shared/runtime/pyexec.c \
 	shared/runtime/stdout_helpers.c \
+	shared/runtime/sys_stdio_mphal.c \
+	shared/timeutils/timeutils.c \
 
 SRC_C += $(SRC_MOD)
 
@@ -93,12 +120,27 @@ SRC_S = shared/runtime/gchelper_m3.s
 endif
 
 # List of sources for qstr extraction
-SRC_QSTR += modutime.c modmachine.c $(SRC_MOD) $(SRC_CXX)
+SRC_QSTR += moduos.c \
+	modutime.c \
+	modmachine.c \
+	machine_pin.c \
+	machine_led.c \
+	modsamd.c \
+	samd_flash.c \
+
+SRC_QSTR += $(SRC_MOD) $(SRC_CXX)
 
 OBJ += $(PY_O)
 OBJ += $(addprefix $(BUILD)/, $(SRC_C:.c=.o))
 OBJ += $(addprefix $(BUILD)/, $(SRC_CXX:.cpp=.o))
 OBJ += $(addprefix $(BUILD)/, $(SRC_S:.s=.o))
+OBJ += $(addprefix $(BUILD)/, $(SRC_MOD:.c=.o))
+
+ifneq ($(FROZEN_MANIFEST),)
+CFLAGS += -DMICROPY_MODULE_FROZEN_MPY
+CFLAGS += -DMICROPY_MODULE_FROZEN_STR
+CFLAGS += -DMICROPY_QSTR_EXTRA_POOL=mp_qstr_frozen_const_pool
+endif
 
 # Workaround for bug in older gcc, warning on "static usbd_device_t _usbd_dev = { 0 };"
 $(BUILD)/lib/tinyusb/src/device/usbd.o: CFLAGS += -Wno-missing-braces
diff --git a/ports/samd/boards/manifest.py b/ports/samd/boards/manifest.py
new file mode 100644
index 0000000000000..c80309cf675a2
--- /dev/null
+++ b/ports/samd/boards/manifest.py
@@ -0,0 +1 @@
+freeze("$(PORT_DIR)/modules")
diff --git a/ports/samd/boards/samd51p19a.ld b/ports/samd/boards/samd51p19a.ld
new file mode 100644
index 0000000000000..e0baa9bba0281
--- /dev/null
+++ b/ports/samd/boards/samd51p19a.ld
@@ -0,0 +1,17 @@
+/*
+    GNU linker script for SAMD51
+*/
+
+/* Specify the memory areas */
+MEMORY
+{
+    FLASH (rx)  : ORIGIN = 0x00004000, LENGTH = 512K - 16K
+    RAM (xrw)   : ORIGIN = 0x20000000, LENGTH = 192K
+}
+
+/* Top end of the stack, with room for double-tap variable */
+_estack = ORIGIN(RAM) + LENGTH(RAM) - 8;
+_sstack = _estack - 16K;
+
+_sheap = _ebss;
+_eheap = _sstack;
diff --git a/ports/samd/help.c b/ports/samd/help.c
new file mode 100644
index 0000000000000..577d153b5393a
--- /dev/null
+++ b/ports/samd/help.c
@@ -0,0 +1,42 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013-2016 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "py/builtin.h"
+
+const char samd_help_text[] =
+    "Welcome to MicroPython!\n"
+    "\n"
+    "For online docs please visit http://docs.micropython.org/en/latest/samd/ .\n"
+    "\n"
+    "Control commands:\n"
+    "  CTRL-A        -- on a blank line, enter raw REPL mode\n"
+    "  CTRL-B        -- on a blank line, enter normal REPL mode\n"
+    "  CTRL-C        -- interrupt a running program\n"
+    "  CTRL-D        -- on a blank line, do a soft reset of the board\n"
+    "  CTRL-E        -- on a blank line, enter paste mode\n"
+    "\n"
+    "For further help on a specific object, type help('obj')\n"
+;
diff --git a/ports/samd/main.c b/ports/samd/main.c
index 5d84a9e882231..a08e66fda093a 100644
--- a/ports/samd/main.c
+++ b/ports/samd/main.c
@@ -45,6 +45,13 @@ void samd_main(void) {
         mp_obj_list_append(mp_sys_path, MP_OBJ_NEW_QSTR(MP_QSTR_));
         mp_obj_list_init(MP_OBJ_TO_PTR(mp_sys_argv), 0);
 
+        // Execute _boot.py to set up the filesystem.
+        pyexec_frozen_module("_boot.py");
+
+        // Execute user scripts.
+        pyexec_file_if_exists("boot.py");
+        pyexec_file_if_exists("main.py");
+
         for (;;) {
             if (pyexec_mode_kind == PYEXEC_MODE_RAW_REPL) {
                 if (pyexec_raw_repl() != 0) {
@@ -69,10 +76,13 @@ void gc_collect(void) {
     gc_collect_end();
 }
 
+/*
 mp_lexer_t *mp_lexer_new_from_file(const char *filename) {
     mp_raise_OSError(MP_ENOENT);
 }
+*/
 
+#if !MICROPY_VFS
 mp_import_stat_t mp_import_stat(const char *path) {
     return MP_IMPORT_STAT_NO_EXIST;
 }
@@ -81,6 +91,7 @@ mp_obj_t mp_builtin_open(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs)
     return mp_const_none;
 }
 MP_DEFINE_CONST_FUN_OBJ_KW(mp_builtin_open_obj, 1, mp_builtin_open);
+#endif
 
 void nlr_jump_fail(void *val) {
     for (;;) {
diff --git a/ports/samd/modules/_boot.py b/ports/samd/modules/_boot.py
new file mode 100644
index 0000000000000..84b02480b7456
--- /dev/null
+++ b/ports/samd/modules/_boot.py
@@ -0,0 +1,17 @@
+import gc
+import uos
+import samd
+
+samd.Flash.flash_init()
+bdev = samd.Flash()
+
+# Try to mount the filesystem, and format the flash if it doesn't exist.
+try:
+    vfs = uos.VfsLfs1(bdev)
+except:
+    uos.VfsLfs1.mkfs(bdev)
+    vfs = uos.VfsLfs1(bdev)
+uos.mount(vfs, "/")
+
+gc.collect()
+del uos, vfs, gc
diff --git a/ports/samd/modutime.c b/ports/samd/modutime.c
index 8d6a4059446f6..2d5ed0776d044 100644
--- a/ports/samd/modutime.c
+++ b/ports/samd/modutime.c
@@ -24,11 +24,64 @@
  * THE SOFTWARE.
  */
 
+#include "py/runtime.h"
 #include "extmod/utime_mphal.h"
+#include "shared/timeutils/timeutils.h"
+
+// localtime([secs])
+STATIC mp_obj_t time_localtime(size_t n_args, const mp_obj_t *args) {
+    timeutils_struct_time_t tm;
+    mp_int_t seconds;
+    if (n_args == 0 || args[0] == mp_const_none) {
+        // seconds = pyb_rtc_get_us_since_epoch() / 1000 / 1000;
+        seconds = mp_obj_get_int(args[0]);
+    } else {
+        seconds = mp_obj_get_int(args[0]);
+    }
+    timeutils_seconds_since_epoch_to_struct_time(seconds, &tm);
+    mp_obj_t tuple[8] = {
+        tuple[0] = mp_obj_new_int(tm.tm_year),
+        tuple[1] = mp_obj_new_int(tm.tm_mon),
+        tuple[2] = mp_obj_new_int(tm.tm_mday),
+        tuple[3] = mp_obj_new_int(tm.tm_hour),
+        tuple[4] = mp_obj_new_int(tm.tm_min),
+        tuple[5] = mp_obj_new_int(tm.tm_sec),
+        tuple[6] = mp_obj_new_int(tm.tm_wday),
+        tuple[7] = mp_obj_new_int(tm.tm_yday),
+    };
+    return mp_obj_new_tuple(8, tuple);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(time_localtime_obj, 0, 1, time_localtime);
+
+// mktime()
+STATIC mp_obj_t time_mktime(mp_obj_t tuple) {
+    size_t len;
+    mp_obj_t *elem;
+    mp_obj_get_array(tuple, &len, &elem);
+
+    // localtime generates a tuple of len 8. CPython uses 9, so we accept both.
+    if (len < 8 || len > 9) {
+        mp_raise_msg_varg(&mp_type_TypeError, MP_ERROR_TEXT("mktime needs a tuple of length 8 or 9 (%d given)"), len);
+    }
+
+    return mp_obj_new_int_from_uint(timeutils_mktime(mp_obj_get_int(elem[0]),
+        mp_obj_get_int(elem[1]), mp_obj_get_int(elem[2]), mp_obj_get_int(elem[3]),
+        mp_obj_get_int(elem[4]), mp_obj_get_int(elem[5])));
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(time_mktime_obj, time_mktime);
+
+// time()
+STATIC mp_obj_t time_time(void) {
+    mp_raise_NotImplementedError("time");
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(time_time_obj, time_time);
 
 STATIC const mp_rom_map_elem_t time_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_utime) },
 
+    { MP_ROM_QSTR(MP_QSTR_gmtime), MP_ROM_PTR(&time_localtime_obj) },
+    { MP_ROM_QSTR(MP_QSTR_localtime), MP_ROM_PTR(&time_localtime_obj) },
+    { MP_ROM_QSTR(MP_QSTR_mktime), MP_ROM_PTR(&time_mktime_obj) },
     { MP_ROM_QSTR(MP_QSTR_sleep), MP_ROM_PTR(&mp_utime_sleep_obj) },
     { MP_ROM_QSTR(MP_QSTR_sleep_ms), MP_ROM_PTR(&mp_utime_sleep_ms_obj) },
     { MP_ROM_QSTR(MP_QSTR_sleep_us), MP_ROM_PTR(&mp_utime_sleep_us_obj) },
@@ -37,6 +90,7 @@ STATIC const mp_rom_map_elem_t time_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_ticks_cpu), MP_ROM_PTR(&mp_utime_ticks_cpu_obj) },
     { MP_ROM_QSTR(MP_QSTR_ticks_add), MP_ROM_PTR(&mp_utime_ticks_add_obj) },
     { MP_ROM_QSTR(MP_QSTR_ticks_diff), MP_ROM_PTR(&mp_utime_ticks_diff_obj) },
+    { MP_ROM_QSTR(MP_QSTR_time), MP_ROM_PTR(&time_time_obj) },
 };
 
 STATIC MP_DEFINE_CONST_DICT(time_module_globals, time_module_globals_table);
diff --git a/ports/samd/mpconfigport.h b/ports/samd/mpconfigport.h
index 852d9e9ee52de..645f16b3f7d65 100644
--- a/ports/samd/mpconfigport.h
+++ b/ports/samd/mpconfigport.h
@@ -48,7 +48,12 @@
 #define MICROPY_ERROR_REPORTING             (MICROPY_ERROR_REPORTING_TERSE)
 #define MICROPY_CPYTHON_COMPAT              (0)
 #define MICROPY_CAN_OVERRIDE_BUILTINS       (1)
+#define MICROPY_PY_BUILTINS_HELP            (1)
+#define MICROPY_PY_BUILTINS_HELP_TEXT       samd_help_text
+#define MICROPY_PY_BUILTINS_HELP_MODULES    (1)
 
+// fixes sys/usys import issue
+#define MICROPY_MODULE_WEAK_LINKS           (1)
 // Control over Python builtins
 #define MICROPY_PY_ASYNC_AWAIT              (0)
 #define MICROPY_PY_BUILTINS_STR_COUNT       (0)
@@ -59,17 +64,44 @@
 #define MICROPY_PY_BUILTINS_ENUMERATE       (0)
 #define MICROPY_PY_BUILTINS_FILTER          (0)
 #define MICROPY_PY_BUILTINS_REVERSED        (0)
+#define MICROPY_PY_BUILTINS_NOTIMPLEMENTED  (1)
 #define MICROPY_PY_BUILTINS_MIN_MAX         (0)
 #define MICROPY_PY___FILE__                 (0)
 #define MICROPY_PY_MICROPYTHON_MEM_INFO     (1)
 #define MICROPY_PY_ARRAY_SLICE_ASSIGN       (1)
 #define MICROPY_PY_ATTRTUPLE                (0)
 #define MICROPY_PY_COLLECTIONS              (0)
+#define MICROPY_PY_SYS                      (1)
+#define MICROPY_PY_SYS_PLATFORM             "samd"
+#define MICROPY_PY_SYS_EXIT                 (1)
+#define MICROPY_PY_SYS_STDFILES             (1)
 #define MICROPY_PY_SYS_MAXSIZE              (1)
+#define MICROPY_PY_IO_FILEIO                (1)
+#define MICROPY_PY_IO                       (1)
+#define MICROPY_PY_IO_IOBASE                (1)
 
 // Extended modules
 #define MICROPY_PY_UTIME_MP_HAL             (1)
 #define MICROPY_PY_MACHINE                  (1)
+#define MICROPY_PY_UOS                      (1)
+#define MICROPY_READER_VFS                  (1)
+#define MICROPY_VFS                         (1)
+#define MICROPY_PY_UJSON                    (1)
+#define MICROPY_PY_URE                      (1)
+#define MICROPY_PY_UBINASCII                (1)
+#define MICROPY_PY_UCTYPES                  (1)
+#define MICROPY_PY_UHEAPQ                   (1)
+#define MICROPY_PY_URANDOM                  (1)
+#define MICROPY_PY_UZLIB                    (1)
+#define MICROPY_PY_UASYNCIO                 (1)
+
+// Use VfsLfs's types for fileio/textio
+#define mp_type_fileio mp_type_vfs_lfs1_fileio
+#define mp_type_textio mp_type_vfs_lfs1_textio
+
+// Use VFS's functions for import stat and builtin open
+#define mp_import_stat mp_vfs_import_stat
+#define mp_builtin_open_obj mp_vfs_open_obj
 
 // Hooks to add builtins
 
@@ -77,10 +109,12 @@
     { MP_ROM_QSTR(MP_QSTR_open), MP_ROM_PTR(&mp_builtin_open_obj) },
 
 extern const struct _mp_obj_module_t mp_module_machine;
+extern const struct _mp_obj_module_t mp_module_samd;
 extern const struct _mp_obj_module_t mp_module_utime;
 
 #define MICROPY_PORT_BUILTIN_MODULES \
     { MP_ROM_QSTR(MP_QSTR_machine), MP_ROM_PTR(&mp_module_machine) }, \
+    { MP_ROM_QSTR(MP_QSTR_samd), MP_ROM_PTR(&mp_module_samd) }, \
     { MP_ROM_QSTR(MP_QSTR_utime), MP_ROM_PTR(&mp_module_utime) }, \
 
 #define MICROPY_PORT_ROOT_POINTERS \
diff --git a/ports/samd/mphalport.c b/ports/samd/mphalport.c
index a87b7d2125a56..c19d542a85566 100644
--- a/ports/samd/mphalport.c
+++ b/ports/samd/mphalport.c
@@ -26,6 +26,7 @@
 
 #include "py/runtime.h"
 #include "py/mphal.h"
+#include "py/stream.h"
 #include "samd_soc.h"
 #include "tusb.h"
 
@@ -60,6 +61,14 @@ void mp_hal_delay_us(mp_uint_t us) {
     }
 }
 
+uintptr_t mp_hal_stdio_poll(uintptr_t poll_flags) {
+    uintptr_t ret = 0;
+    if (tud_cdc_connected() && tud_cdc_available()) {
+        ret |= MP_STREAM_POLL_RD;
+    }
+    return ret;
+}
+
 int mp_hal_stdin_rx_chr(void) {
     for (;;) {
         if (USARTx->USART.INTFLAG.bit.RXC) {
diff --git a/ports/samd/mphalport.h b/ports/samd/mphalport.h
index fc7dbe94cbc89..2bbde4390e333 100644
--- a/ports/samd/mphalport.h
+++ b/ports/samd/mphalport.h
@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2019 Damien P. George
+ * Copyright (c) 2019-2021 Damien P. George
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -26,8 +26,14 @@
 #ifndef MICROPY_INCLUDED_SAMD_MPHALPORT_H
 #define MICROPY_INCLUDED_SAMD_MPHALPORT_H
 
-#include <stdint.h>
+#include "py/mpconfig.h"
+#include "py/ringbuf.h"
 
+// ASF4
+#include "hal_gpio.h"
+
+extern int mp_interrupt_char;
+extern ringbuf_t stdin_ringbuf;
 extern volatile uint32_t systick_ms;
 
 void mp_hal_set_interrupt_char(int c);
@@ -42,4 +48,53 @@ static inline mp_uint_t mp_hal_ticks_cpu(void) {
     return 0;
 }
 
+// C-level pin HAL
+
+#include "py/obj.h"
+
+#define MP_HAL_PIN_FMT "%u"
+#define mp_hal_pin_obj_t uint
+
+extern uint32_t machine_pin_open_drain_mask;
+
+mp_hal_pin_obj_t mp_hal_get_pin_obj(mp_obj_t pin_in);
+
+static inline unsigned int mp_hal_pin_name(mp_hal_pin_obj_t pin) {
+    return pin;
+}
+
+static inline void mp_hal_pin_input(mp_hal_pin_obj_t pin) {
+    gpio_set_pin_direction(pin, GPIO_DIRECTION_IN);
+    machine_pin_open_drain_mask &= ~(1 << pin);
+}
+
+static inline void mp_hal_pin_output(mp_hal_pin_obj_t pin) {
+    gpio_set_pin_direction(pin, GPIO_DIRECTION_OUT);
+    machine_pin_open_drain_mask &= ~(1 << pin);
+}
+
+static inline void mp_hal_pin_open_drain(mp_hal_pin_obj_t pin) {
+    gpio_set_pin_direction(pin, GPIO_DIRECTION_IN);
+    gpio_set_pin_level(pin, 0);
+    machine_pin_open_drain_mask |= 1 << pin;
+}
+
+static inline int mp_hal_pin_read(mp_hal_pin_obj_t pin) {
+    return gpio_get_pin_level(pin);
+}
+
+static inline void mp_hal_pin_write(mp_hal_pin_obj_t pin, int v) {
+    gpio_set_pin_level(pin, v);
+}
+
+/*
+static inline void mp_hal_pin_od_low(mp_hal_pin_obj_t pin) {
+    gpio_set_pin_direction(pin, GPIO_DIRECTION_OUT);
+}
+
+static inline void mp_hal_pin_od_high(mp_hal_pin_obj_t pin) {
+    gpio_set_pin_direction(pin, GPIO_DIRECTION_IN);
+}
+*/
+
 #endif // MICROPY_INCLUDED_SAMD_MPHALPORT_H

From 4c132614e136970cbd12d927bc6c52e2a7f0f070 Mon Sep 17 00:00:00 2001
From: Peter van der Burg <vdb_peter@hotmail.com>
Date: Fri, 21 May 2021 10:02:01 +1000
Subject: [PATCH 1410/3533] samd/samd_soc: Allow a board to configure the
 low-level MCU config.

The board specific #defines will be moved to individual boards.
---
 ports/samd/samd_soc.c | 95 ++++++++++++++++++++++++-------------------
 ports/samd/samd_soc.h | 12 ------
 2 files changed, 53 insertions(+), 54 deletions(-)

diff --git a/ports/samd/samd_soc.c b/ports/samd/samd_soc.c
index a08d0de26900b..7f4df1bb1c756 100644
--- a/ports/samd/samd_soc.c
+++ b/ports/samd/samd_soc.c
@@ -1,6 +1,12 @@
 /*
  * This file is part of the MicroPython project, http://micropython.org/
  *
+ * This file initialises the USB (tinyUSB) and USART (SERCOM). Board USART settings
+ * are set in 'boards/<board>/mpconfigboard.h.
+ *
+ * IMPORTANT: Please refer to "I/O Multiplexing and Considerations" chapters
+ *            in device datasheets for I/O Pin functions and assignments.
+ *
  * The MIT License (MIT)
  *
  * Copyright (c) 2019 Damien P. George
@@ -24,56 +30,53 @@
  * THE SOFTWARE.
  */
 
+#include "py/runtime.h"
+#include "modmachine.h"
 #include "samd_soc.h"
 #include "tusb.h"
 
-static void uart0_init(void) {
-    #if defined(MCU_SAMD21)
+// "MP" macros defined in "boards/$(BOARD)/mpconfigboard.h"
+mp_obj_t machine_uart_init(void) {
+    // Firstly, assign alternate function SERCOM PADs to GPIO pins.
+    PORT->Group[MP_PIN_GRP].PINCFG[MP_TX_PIN].bit.PMUXEN = 1; // Enable
+    PORT->Group[MP_PIN_GRP].PINCFG[MP_RX_PIN].bit.PMUXEN = 1; // Enable
+    PORT->Group[MP_PIN_GRP].PMUX[MP_PERIPHERAL_MUX].reg = MP_PORT_FUNC; // Sets PMUXE & PMUXO in 1 hit.
+    uint32_t rxpo = MP_RXPO_PAD; // 1=Pad1,3=Pad3 Rx data
+    uint32_t txpo = MP_TXPO_PAD; // 0=pad0,1=Pad2 Tx data
 
-    // SERCOM0, TX=PA06=PAD2, RX=PA07=PAD3, ALT-D
-    PORT->Group[0].PMUX[3].reg = 0x33;
-    PORT->Group[0].PINCFG[6].reg = 1;
-    PORT->Group[0].PINCFG[7].reg = 1;
-
-    PM->APBCMASK.bit.SERCOM0_ = 1;
-    GCLK->CLKCTRL.reg = GCLK_CLKCTRL_CLKEN | GCLK_CLKCTRL_GEN_GCLK0 | GCLK_CLKCTRL_ID_SERCOM0_CORE;
+    // Initialise the clocks
+    #if defined(MCU_SAMD21)
+    PM->APBCMASK.bit.MP_SERCOMx = 1; // Enable synchronous clock
+    GCLK->CLKCTRL.reg = GCLK_CLKCTRL_CLKEN | GCLK_CLKCTRL_GEN_GCLK0 | MP_SERCOM_GCLK_ID_x_CORE; // Select multiplexer generic clock source and enable.
+    // Wait while it updates synchronously.
     while (GCLK->STATUS.bit.SYNCBUSY) {
     }
-
-    uint32_t rxpo = 3;
-    uint32_t txpo = 1;
-
     #elif defined(MCU_SAMD51)
-
-    // SERCOM3, TX=PA17=PAD0, RX=PA16=PAD1, ALT-D
-    PORT->Group[0].PMUX[8].reg = 0x33;
-    PORT->Group[0].PINCFG[16].reg = 1;
-    PORT->Group[0].PINCFG[17].reg = 1;
-
-    // Use Generator 0 which is already enabled and switched to DFLL @ 48MHz
-    GCLK->PCHCTRL[SERCOM3_GCLK_ID_CORE].reg = GCLK_PCHCTRL_CHEN | GCLK_PCHCTRL_GEN_GCLK0;
-    MCLK->APBBMASK.bit.SERCOM3_ = 1;
-
-    uint32_t rxpo = 1;
-    uint32_t txpo = 2;
-
+    GCLK->PCHCTRL[MP_SERCOM_GCLK_ID_x_CORE].reg = GCLK_PCHCTRL_CHEN | GCLK_PCHCTRL_GEN_GCLK0;
+    MCLK->APBBMASK.bit.MP_SERCOMx = 1;
     #endif
 
+    // Setup the Peripheral.
+    // Reset (clear) the peripheral registers.
     while (USARTx->USART.SYNCBUSY.bit.SWRST) {
     }
-    USARTx->USART.CTRLA.bit.SWRST = 1;
+    USARTx->USART.CTRLA.bit.SWRST = 1; // Reset all Registers, disable peripheral
     while (USARTx->USART.SYNCBUSY.bit.SWRST) {
     }
 
-    USARTx->USART.CTRLA.reg =
-        SERCOM_USART_CTRLA_DORD
-        | SERCOM_USART_CTRLA_RXPO(rxpo)
-        | SERCOM_USART_CTRLA_TXPO(txpo)
-        | SERCOM_USART_CTRLA_MODE(1)
+    // Set the register bits as needed
+    // (CMODE (async),CHSIZE (8),FORM (no parity),SBMODE (1 stop) already 0).
+    USARTx->USART.CTRLA.reg =   // USARTx = SERCOMx set in "boards/$(BOARD)/mpconfigboard.h"
+        SERCOM_USART_CTRLA_DORD // Data order
+        | SERCOM_USART_CTRLA_RXPO(rxpo) // Set Pad#
+        | SERCOM_USART_CTRLA_TXPO(txpo) // Set Pad#
+        | SERCOM_USART_CTRLA_MODE(1) // USART with internal clock
     ;
-    USARTx->USART.CTRLB.reg = SERCOM_USART_CTRLB_RXEN | SERCOM_USART_CTRLB_TXEN;
+    USARTx->USART.CTRLB.reg = SERCOM_USART_CTRLB_RXEN | SERCOM_USART_CTRLB_TXEN; // Enable Rx & Tx
     while (USARTx->USART.SYNCBUSY.bit.CTRLB) {
     }
+
+    // Baud rate is clock dependant.
     #if CPU_FREQ == 8000000
     uint32_t baud = 50437; // 115200 baud; 65536*(1 - 16 * 115200/8e6)
     #elif CPU_FREQ == 48000000
@@ -81,12 +84,26 @@ static void uart0_init(void) {
     #elif CPU_FREQ == 120000000
     uint32_t baud = 64529; // 115200 baud; 65536*(1 - 16 * 115200/120e6)
     #endif
-    USARTx->USART.BAUD.bit.BAUD = baud;
-    USARTx->USART.CTRLA.bit.ENABLE = 1;
+    USARTx->USART.BAUD.bit.BAUD = baud; // Set Baud
+    USARTx->USART.CTRLA.bit.ENABLE = 1; // Enable the peripheral
+    // Wait for the Registers to update.
     while (USARTx->USART.SYNCBUSY.bit.ENABLE) {
     }
+
+    return mp_const_none;
 }
 
+// Disconnect SERCOM from GPIO pins. (Can't SWRST, as that will totally kill USART).
+mp_obj_t machine_uart_deinit(void) {
+    // Reset
+    printf("Disabling the Alt-Funct, releasing the USART pins for GPIO... \n");
+    PORT->Group[MP_PIN_GRP].PINCFG[MP_TX_PIN].bit.PMUXEN = 0; // Disable
+    PORT->Group[MP_PIN_GRP].PINCFG[MP_RX_PIN].bit.PMUXEN = 0; // Disable
+
+    return mp_const_none;
+}
+
+
 static void usb_init(void) {
     // Init USB clock
     #if defined(MCU_SAMD21)
@@ -142,21 +159,15 @@ void samd_init(void) {
     while (GCLK->STATUS.bit.SYNCBUSY) {
     }
 
-    // Configure PA10 as output for LED
-    PORT->Group[0].DIRSET.reg = 1 << 10;
-
     #elif defined(MCU_SAMD51)
 
     GCLK->GENCTRL[1].reg = 1 << GCLK_GENCTRL_DIV_Pos | GCLK_GENCTRL_GENEN | GCLK_GENCTRL_SRC_DFLL;
     while (GCLK->SYNCBUSY.bit.GENCTRL1) {
     }
 
-    // Configure PA22 as output for LED
-    PORT->Group[0].DIRSET.reg = 1 << 22;
-
     #endif
 
     SysTick_Config(CPU_FREQ / 1000);
-    uart0_init();
+    machine_uart_init();
     usb_init();
 }
diff --git a/ports/samd/samd_soc.h b/ports/samd/samd_soc.h
index 5f68610e4d0a3..a07e68dbed646 100644
--- a/ports/samd/samd_soc.h
+++ b/ports/samd/samd_soc.h
@@ -29,18 +29,6 @@
 #include <stdint.h>
 #include "sam.h"
 
-#if defined(MCU_SAMD21)
-
-#define CPU_FREQ (48000000)
-#define USARTx SERCOM0
-
-#elif defined(MCU_SAMD51)
-
-#define CPU_FREQ (48000000)
-#define USARTx SERCOM3
-
-#endif
-
 void samd_init(void);
 void samd_main(void);
 

From 2121353602a5f8b5c8a2b8604e7de25a96d1b327 Mon Sep 17 00:00:00 2001
From: Peter van der Burg <vdb_peter@hotmail.com>
Date: Thu, 20 May 2021 18:05:04 +1000
Subject: [PATCH 1411/3533] samd: Add internal flash block device, filesystem
 and uos support.

---
 ports/samd/modsamd.c    |  41 +++++++++
 ports/samd/moduos.c     |  75 ++++++++++++++++
 ports/samd/samd_flash.c | 189 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 305 insertions(+)
 create mode 100644 ports/samd/modsamd.c
 create mode 100644 ports/samd/moduos.c
 create mode 100644 ports/samd/samd_flash.c

diff --git a/ports/samd/modsamd.c b/ports/samd/modsamd.c
new file mode 100644
index 0000000000000..1f914980803c3
--- /dev/null
+++ b/ports/samd/modsamd.c
@@ -0,0 +1,41 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2019 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "py/runtime.h"
+#include "samd_soc.h"
+
+extern const mp_obj_type_t samd_flash_type;
+
+STATIC const mp_rom_map_elem_t samd_module_globals_table[] = {
+    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_samd) },
+    { MP_ROM_QSTR(MP_QSTR_Flash), MP_ROM_PTR(&samd_flash_type) },
+};
+STATIC MP_DEFINE_CONST_DICT(samd_module_globals, samd_module_globals_table);
+
+const mp_obj_module_t mp_module_samd = {
+    .base = { &mp_type_module },
+    .globals = (mp_obj_dict_t *)&samd_module_globals,
+};
diff --git a/ports/samd/moduos.c b/ports/samd/moduos.c
new file mode 100644
index 0000000000000..b884d5e7b5a12
--- /dev/null
+++ b/ports/samd/moduos.c
@@ -0,0 +1,75 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2016 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "py/runtime.h"
+#include "extmod/vfs.h"
+#include "extmod/vfs_fat.h"
+#include "extmod/vfs_lfs.h"
+
+STATIC const mp_rom_map_elem_t os_module_globals_table[] = {
+    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_uos) },
+
+    #if MICROPY_VFS
+    { MP_ROM_QSTR(MP_QSTR_chdir), MP_ROM_PTR(&mp_vfs_chdir_obj) },
+    { MP_ROM_QSTR(MP_QSTR_getcwd), MP_ROM_PTR(&mp_vfs_getcwd_obj) },
+    { MP_ROM_QSTR(MP_QSTR_listdir), MP_ROM_PTR(&mp_vfs_listdir_obj) },
+    { MP_ROM_QSTR(MP_QSTR_mkdir), MP_ROM_PTR(&mp_vfs_mkdir_obj) },
+    { MP_ROM_QSTR(MP_QSTR_remove), MP_ROM_PTR(&mp_vfs_remove_obj) },
+    { MP_ROM_QSTR(MP_QSTR_rename), MP_ROM_PTR(&mp_vfs_rename_obj) },
+    { MP_ROM_QSTR(MP_QSTR_rmdir), MP_ROM_PTR(&mp_vfs_rmdir_obj) },
+    { MP_ROM_QSTR(MP_QSTR_stat), MP_ROM_PTR(&mp_vfs_stat_obj) },
+    { MP_ROM_QSTR(MP_QSTR_statvfs), MP_ROM_PTR(&mp_vfs_statvfs_obj) },
+    #endif
+
+    // The following are MicroPython extensions.
+
+    #if MICROPY_PY_OS_DUPTERM
+    { MP_ROM_QSTR(MP_QSTR_dupterm), MP_ROM_PTR(&mp_uos_dupterm_obj) },
+    #endif
+
+    #if MICROPY_VFS
+    { MP_ROM_QSTR(MP_QSTR_ilistdir), MP_ROM_PTR(&mp_vfs_ilistdir_obj) },
+    { MP_ROM_QSTR(MP_QSTR_mount), MP_ROM_PTR(&mp_vfs_mount_obj) },
+    { MP_ROM_QSTR(MP_QSTR_umount), MP_ROM_PTR(&mp_vfs_umount_obj) },
+    #if MICROPY_VFS_FAT
+    { MP_ROM_QSTR(MP_QSTR_VfsFat), MP_ROM_PTR(&mp_fat_vfs_type) },
+    #endif
+    #if MICROPY_VFS_LFS1
+    { MP_ROM_QSTR(MP_QSTR_VfsLfs1), MP_ROM_PTR(&mp_type_vfs_lfs1) },
+    #endif
+    #if MICROPY_VFS_LFS2
+    { MP_ROM_QSTR(MP_QSTR_VfsLfs2), MP_ROM_PTR(&mp_type_vfs_lfs2) },
+    #endif
+    #endif
+};
+STATIC MP_DEFINE_CONST_DICT(os_module_globals, os_module_globals_table);
+
+const mp_obj_module_t mp_module_uos = {
+    .base = { &mp_type_module },
+    .globals = (mp_obj_dict_t *)&os_module_globals,
+};
+
+MP_REGISTER_MODULE(MP_QSTR_uos, mp_module_uos, MICROPY_PY_UOS);
diff --git a/ports/samd/samd_flash.c b/ports/samd/samd_flash.c
new file mode 100644
index 0000000000000..3bccf5577e2c8
--- /dev/null
+++ b/ports/samd/samd_flash.c
@@ -0,0 +1,189 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2019 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include <stdio.h>
+
+#include "py/runtime.h"
+#include "extmod/vfs.h"
+#include "samd_soc.h"
+#include "hal_flash.h"
+
+// ASF 4
+#include "hal_flash.h"
+#include "hal_init.h"
+#include "hpl_gclk_base.h"
+
+#if defined(MCU_SAMD21)
+#include "lib/asf4/samd21/hpl/pm/hpl_pm_base.h"
+#elif defined(MCU_SAMD51)
+#include "lib/asf4/samd51/hpl/pm/hpl_pm_base.h"
+#include "lib/asf4/samd51/hri/hri_mclk_d51.h"
+#endif
+
+static struct flash_descriptor flash_desc;
+STATIC mp_int_t BLOCK_SIZE = VFS_BLOCK_SIZE_BYTES; // Board specific: mpconfigboard.h
+extern const mp_obj_type_t samd_flash_type;
+
+typedef struct _samd_flash_obj_t {
+    mp_obj_base_t base;
+    uint32_t flash_base;
+    uint32_t flash_size;
+} samd_flash_obj_t;
+
+// Build a Flash storage at top.
+STATIC samd_flash_obj_t samd_flash_obj = {
+    .base = { &samd_flash_type },
+    .flash_base = MICROPY_HW_FLASH_STORAGE_BASE, // Board specific: mpconfigboard.h
+    .flash_size = MICROPY_HW_FLASH_STORAGE_BYTES, // Board specific: mpconfigboard.h
+};
+
+// FLASH stuff
+STATIC mp_obj_t samd_flash_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
+    // No args required. bdev=Flash(). Start Addr & Size defined in samd_flash_obj.
+    mp_arg_check_num(n_args, n_kw, 0,0, false);
+
+    // Return singleton object.
+    return MP_OBJ_FROM_PTR(&samd_flash_obj);
+}
+
+// Flash init (from cctpy)
+// Method is needed for when MP starts up in _boot.py
+STATIC mp_obj_t samd_flash_init(void) {
+    #ifdef SAMD51
+    hri_mclk_set_AHBMASK_NVMCTRL_bit(MCLK);
+    #endif
+    #ifdef SAMD21
+    _pm_enable_bus_clock(PM_BUS_APBB, NVMCTRL);
+    #endif
+
+    flash_init(&flash_desc, NVMCTRL);
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(samd_flash_init_obj, samd_flash_init);
+
+// Function for ioctl.
+STATIC mp_obj_t eraseblock(uint32_t sector_in) {
+    // Destination address aligned with page start to be erased.
+    uint32_t DEST_ADDR = sector_in; // Number of pages to be erased.
+    mp_int_t PAGE_SIZE = flash_get_page_size(&flash_desc); // adf4 API call
+
+    flash_erase(&flash_desc,DEST_ADDR,(BLOCK_SIZE / PAGE_SIZE));
+
+    return mp_const_none;
+}
+
+STATIC mp_obj_t samd_flash_version(void) {
+    printf("Flash Driver Version: %lu\n", flash_get_version());
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(samd_flash_version_obj, samd_flash_version);
+STATIC MP_DEFINE_CONST_STATICMETHOD_OBJ(samd_flash_version_static_obj, MP_ROM_PTR(&samd_flash_version_obj));
+
+STATIC mp_obj_t samd_flash_size(void) {
+    // ASF4 API calls
+    mp_int_t PAGES = flash_get_total_pages(&flash_desc);
+    mp_int_t PAGE_SIZE = flash_get_page_size(&flash_desc);
+    printf("Flash Size: %u Bytes\n",  PAGES * PAGE_SIZE);
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(samd_flash_size_obj, samd_flash_size);
+STATIC MP_DEFINE_CONST_STATICMETHOD_OBJ(samd_flash_size_static_obj, MP_ROM_PTR(&samd_flash_size_obj));
+
+STATIC mp_obj_t samd_flash_readblocks(size_t n_args, const mp_obj_t *args) {
+    uint32_t offset = (mp_obj_get_int(args[1]) * BLOCK_SIZE) + samd_flash_obj.flash_base;
+    mp_buffer_info_t bufinfo;
+    mp_get_buffer_raise(args[2], &bufinfo, MP_BUFFER_WRITE);
+    if (n_args == 4) {
+        offset += mp_obj_get_int(args[3]);
+    }
+
+    // Read data to flash (adf4 API)
+    flash_read(&flash_desc,offset,bufinfo.buf,bufinfo.len);
+
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(samd_flash_readblocks_obj, 3, 4, samd_flash_readblocks);
+
+STATIC mp_obj_t samd_flash_writeblocks(size_t n_args, const mp_obj_t *args) {
+    uint32_t offset = (mp_obj_get_int(args[1]) * BLOCK_SIZE) + samd_flash_obj.flash_base;
+    mp_buffer_info_t bufinfo;
+    mp_get_buffer_raise(args[2], &bufinfo, MP_BUFFER_READ);
+    if (n_args == 3) {
+        eraseblock(offset);
+        // TODO check return value
+    } else {
+        offset += mp_obj_get_int(args[3]);
+    }
+    // Write data to flash (adf4 API)
+    flash_write(&flash_desc,offset, bufinfo.buf, bufinfo.len);
+    // TODO check return value
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(samd_flash_writeblocks_obj, 3, 4, samd_flash_writeblocks);
+
+STATIC mp_obj_t samd_flash_ioctl(mp_obj_t self_in, mp_obj_t cmd_in, mp_obj_t arg_in) {
+    samd_flash_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    mp_int_t cmd = mp_obj_get_int(cmd_in);
+
+    switch (cmd) {
+        case MP_BLOCKDEV_IOCTL_INIT:
+            samd_flash_init();
+            return MP_OBJ_NEW_SMALL_INT(0);
+        case MP_BLOCKDEV_IOCTL_DEINIT:
+            return MP_OBJ_NEW_SMALL_INT(0);
+        case MP_BLOCKDEV_IOCTL_SYNC:
+            return MP_OBJ_NEW_SMALL_INT(0);
+        case MP_BLOCKDEV_IOCTL_BLOCK_COUNT:
+            return MP_OBJ_NEW_SMALL_INT(self->flash_size / BLOCK_SIZE);
+        case MP_BLOCKDEV_IOCTL_BLOCK_SIZE:
+            return MP_OBJ_NEW_SMALL_INT(BLOCK_SIZE);
+        case MP_BLOCKDEV_IOCTL_BLOCK_ERASE: {
+            eraseblock(mp_obj_get_int(arg_in) * BLOCK_SIZE + samd_flash_obj.flash_base);
+            // TODO check return value
+            return MP_OBJ_NEW_SMALL_INT(0);
+        }
+        default:
+            return mp_const_none;
+    }
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_3(samd_flash_ioctl_obj, samd_flash_ioctl);
+
+STATIC const mp_rom_map_elem_t samd_flash_locals_dict_table[] = {
+    { MP_ROM_QSTR(MP_QSTR_flash_version), MP_ROM_PTR(&samd_flash_version_static_obj) },
+    { MP_ROM_QSTR(MP_QSTR_flash_size), MP_ROM_PTR(&samd_flash_size_static_obj) },
+    { MP_ROM_QSTR(MP_QSTR_flash_init), MP_ROM_PTR(&samd_flash_init_obj) },
+    { MP_ROM_QSTR(MP_QSTR_readblocks), MP_ROM_PTR(&samd_flash_readblocks_obj) },
+    { MP_ROM_QSTR(MP_QSTR_writeblocks), MP_ROM_PTR(&samd_flash_writeblocks_obj) },
+    { MP_ROM_QSTR(MP_QSTR_ioctl), MP_ROM_PTR(&samd_flash_ioctl_obj) },
+};
+STATIC MP_DEFINE_CONST_DICT(samd_flash_locals_dict, samd_flash_locals_dict_table);
+
+const mp_obj_type_t samd_flash_type = {
+    { &mp_type_type },
+    .name = MP_QSTR_Flash,
+    .make_new = samd_flash_make_new,
+    .locals_dict = (mp_obj_dict_t *)&samd_flash_locals_dict,
+};

From 2f65ded1a2edaff0a125f3e1a5f288baebceed64 Mon Sep 17 00:00:00 2001
From: Peter van der Burg <vdb_peter@hotmail.com>
Date: Thu, 20 May 2021 18:15:36 +1000
Subject: [PATCH 1412/3533] samd: Add Pin and LED classes, and
 machine.unique_id.

---
 ports/samd/machine_led.c | 172 ++++++++++++++++++++
 ports/samd/machine_pin.c | 334 +++++++++++++++++++++++++++++++++++++++
 ports/samd/modmachine.c  |  58 +++++++
 ports/samd/modmachine.h  |  37 +++++
 4 files changed, 601 insertions(+)
 create mode 100644 ports/samd/machine_led.c
 create mode 100644 ports/samd/machine_pin.c
 create mode 100644 ports/samd/modmachine.h

diff --git a/ports/samd/machine_led.c b/ports/samd/machine_led.c
new file mode 100644
index 0000000000000..f4dd1aeb3c65a
--- /dev/null
+++ b/ports/samd/machine_led.c
@@ -0,0 +1,172 @@
+/*
+ * This is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2016-2021 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * Uses pins.h & pins.c to create board (MCU package) specific 'machine_led_obj' array.
+ */
+
+#include "py/runtime.h"
+#include "py/mphal.h"
+#include "extmod/virtpin.h"
+#include "modmachine.h"
+#include "pins.h" // boards/<BOARD>/
+
+// ASF4 (MCU package specific pin defs in 'boards')
+#include "hal_gpio.h"
+#include "hpl_gpio.h"
+#include "hal_atomic.h"
+
+STATIC void machine_led_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+    machine_led_obj_t *self = self_in;
+    mp_printf(print, "LED(%u)", self->id);
+}
+
+// LED.init(mode, *, value=None)
+STATIC mp_obj_t machine_led_obj_init_helper(const machine_led_obj_t *self, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    enum { ARG_mode, ARG_value };
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_mode, MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
+        { MP_QSTR_value, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
+    };
+
+    // parse args
+    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
+    mp_arg_parse_all(n_args, pos_args, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
+
+    // set initial value (do this before configuring mode/pull)
+    if (args[ARG_value].u_obj != mp_const_none) {
+        gpio_set_pin_level(self->id, mp_obj_is_true(args[ARG_value].u_obj));
+    }
+
+    // configure mode
+    gpio_set_pin_direction(self->id, GPIO_DIRECTION_OUT);
+
+    return mp_const_none;
+}
+
+// constructor(id, ...)
+mp_obj_t mp_led_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
+    mp_arg_check_num(n_args, n_kw, 1, MP_OBJ_FUN_ARGS_MAX, true);
+
+    // get the wanted LED object
+    int wanted_led = mp_obj_get_int(args[0]);
+    const machine_led_obj_t *self = NULL;
+    if (0 <= wanted_led && wanted_led < MP_ARRAY_SIZE(machine_led_obj)) {
+        self = (machine_led_obj_t *)&machine_led_obj[wanted_led];
+    }
+
+    // the array could be padded with 'nulls' (see other Ports).
+    // Will also error if the asked for LED (index) is greater than the array row size.
+    if (self == NULL || self->base.type == NULL) {
+        mp_raise_ValueError(MP_ERROR_TEXT("invalid LED"));
+    }
+
+    if (n_args > 1 || n_kw > 0) {
+        // mode given, so configure this GPIO
+        mp_map_t kw_args;
+        mp_map_init_fixed_table(&kw_args, n_kw, args + n_args);
+        machine_led_obj_init_helper(self, n_args - 1, args + 1, &kw_args);
+    }
+
+    return MP_OBJ_FROM_PTR(self);
+}
+
+// fast method for getting/setting pin value
+STATIC mp_obj_t machine_led_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
+    mp_arg_check_num(n_args, n_kw, 0, 1, false);
+    machine_led_obj_t *self = self_in;
+    if (n_args == 0) {
+        // get pin
+        return MP_OBJ_NEW_SMALL_INT(gpio_get_pin_level(self->id));
+    } else {
+        // set pin
+        bool value = mp_obj_is_true(args[0]);
+        gpio_set_pin_level(self->id, value);
+
+        return mp_const_none;
+    }
+}
+
+// pin.init(mode)
+STATIC mp_obj_t machine_led_obj_init(size_t n_args, const mp_obj_t *args, mp_map_t *kw_args) {
+    return machine_led_obj_init_helper(args[0], n_args - 1, args + 1, kw_args);
+}
+MP_DEFINE_CONST_FUN_OBJ_KW(machine_led_init_obj, 1, machine_led_obj_init);
+
+// pin.value([value])
+STATIC mp_obj_t machine_led_value(size_t n_args, const mp_obj_t *args) {
+    return machine_led_call(args[0], n_args - 1, 0, args + 1);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_led_value_obj, 1, 2, machine_led_value);
+
+// pin.low()
+STATIC mp_obj_t machine_led_low(mp_obj_t self_in) {
+    machine_led_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    gpio_set_pin_direction(self->id, GPIO_DIRECTION_OUT);
+    gpio_set_pin_level(self->id, false);
+
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_led_low_obj, machine_led_low);
+
+// pin.high()
+STATIC mp_obj_t machine_led_high(mp_obj_t self_in) {
+    machine_led_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    gpio_set_pin_direction(self->id, GPIO_DIRECTION_OUT);
+    gpio_set_pin_level(self->id, true);
+
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_led_high_obj, machine_led_high);
+
+// pin.toggle()
+STATIC mp_obj_t machine_led_toggle(mp_obj_t self_in) {
+    machine_led_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    gpio_set_pin_direction(self->id, GPIO_DIRECTION_OUT);
+    gpio_toggle_pin_level(self->id);
+
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_led_toggle_obj, machine_led_toggle);
+
+STATIC const mp_rom_map_elem_t machine_led_locals_dict_table[] = {
+    // instance methods
+    { MP_ROM_QSTR(MP_QSTR_init), MP_ROM_PTR(&machine_led_init_obj) },
+    { MP_ROM_QSTR(MP_QSTR_value), MP_ROM_PTR(&machine_led_value_obj) },
+    { MP_ROM_QSTR(MP_QSTR_low), MP_ROM_PTR(&machine_led_low_obj) },
+    { MP_ROM_QSTR(MP_QSTR_high), MP_ROM_PTR(&machine_led_high_obj) },
+    { MP_ROM_QSTR(MP_QSTR_off), MP_ROM_PTR(&machine_led_low_obj) },
+    { MP_ROM_QSTR(MP_QSTR_on), MP_ROM_PTR(&machine_led_high_obj) },
+    { MP_ROM_QSTR(MP_QSTR_toggle), MP_ROM_PTR(&machine_led_toggle_obj) },
+};
+STATIC MP_DEFINE_CONST_DICT(machine_led_locals_dict, machine_led_locals_dict_table);
+
+const mp_obj_type_t machine_led_type = {
+    { &mp_type_type },
+    .name = MP_QSTR_LED,
+    .print = machine_led_print,
+    .make_new = mp_led_make_new,
+    .call = machine_led_call,
+    .locals_dict = (mp_obj_t)&machine_led_locals_dict,
+};
diff --git a/ports/samd/machine_pin.c b/ports/samd/machine_pin.c
new file mode 100644
index 0000000000000..161a3ccddd2a4
--- /dev/null
+++ b/ports/samd/machine_pin.c
@@ -0,0 +1,334 @@
+/*
+ * This is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2016-2021 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * Uses pins.h & pins.c to create board (MCU package) specific 'machine_pin_obj' array.
+ */
+
+#include "py/runtime.h"
+#include "py/mphal.h"
+#include "extmod/virtpin.h"
+#include "modmachine.h"
+#include "samd_soc.h"
+#include "pins.h" // boards/<BOARD>/
+
+// ASF4 (MCU package specific pin defs in 'boards')
+#include "hal_gpio.h"
+#include "hpl_gpio.h"
+#include "hal_atomic.h"
+
+#define GPIO_MODE_IN (0)
+#define GPIO_MODE_OUT (1)
+// #define GPIO_MODE_ALT (3)
+
+#define GPIO_STRENGTH_2MA (0)
+#define GPIO_STRENGTH_8MA (1)
+
+// asf4 hpl_gpio.h gpio_pull_mode
+
+/*
+typedef struct _machine_pin_irq_obj_t {
+    mp_irq_obj_t base;
+    uint32_t flags;
+    uint32_t trigger;
+} machine_pin_irq_obj_t;
+
+STATIC const mp_irq_methods_t machine_pin_irq_methods;
+*/
+
+STATIC void machine_pin_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+    machine_pin_obj_t *self = self_in;
+    mp_printf(print, "Pin(%u)", self->id);
+}
+
+STATIC void pin_validate_drive(bool strength) {
+    if (strength != GPIO_STRENGTH_2MA && strength != GPIO_STRENGTH_8MA) {
+        mp_raise_ValueError(MP_ERROR_TEXT("invalid argument(s) value"));
+    }
+}
+
+// Pin.init(mode, pull=None, *, value=None, drive=0). No 'alt' yet.
+STATIC mp_obj_t machine_pin_obj_init_helper(const machine_pin_obj_t *self, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    enum { ARG_mode, ARG_pull, ARG_value, ARG_drive, ARG_alt };
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_mode, MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE}},
+        { MP_QSTR_pull, MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE}},
+        { MP_QSTR_value, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE}},
+        { MP_QSTR_drive, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = GPIO_STRENGTH_2MA} },
+    };
+
+    // parse args
+    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
+    mp_arg_parse_all(n_args, pos_args, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
+
+    // set initial value (do this before configuring mode/pull)
+    if (args[ARG_value].u_obj != mp_const_none) {
+        gpio_set_pin_level(self->id, mp_obj_is_true(args[ARG_value].u_obj));
+    }
+
+    // configure mode
+    if (args[ARG_mode].u_obj != mp_const_none) {
+        mp_int_t mode = mp_obj_get_int(args[ARG_mode].u_obj);
+        if (mode == GPIO_MODE_IN) {
+            gpio_set_pin_direction(self->id, GPIO_DIRECTION_IN);
+        } else if (mode == GPIO_MODE_OUT) {
+            gpio_set_pin_direction(self->id, GPIO_DIRECTION_OUT);
+        } else {
+            gpio_set_pin_direction(self->id, GPIO_DIRECTION_IN); // If no args are given, the Pin is 'input'.
+        }
+    }
+    // configure pull. Only to be used with IN mode. The function sets the pin to INPUT.
+    uint32_t pull = 0;
+    mp_int_t mode = mp_obj_get_int(args[ARG_mode].u_obj);
+    if (mode == GPIO_MODE_OUT && args[ARG_pull].u_obj != mp_const_none) {
+        mp_raise_ValueError(MP_ERROR_TEXT("OUT incompatible with pull"));
+    } else if (args[ARG_pull].u_obj != mp_const_none) {
+        pull = mp_obj_get_int(args[ARG_pull].u_obj);
+        gpio_set_pin_pull_mode(self->id, pull); // hal_gpio.h
+    }
+
+    // get the strength
+    bool strength = args[3].u_int;
+    pin_validate_drive(strength);
+
+    return mp_const_none;
+}
+
+// constructor(id, ...)
+mp_obj_t mp_pin_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
+    mp_arg_check_num(n_args, n_kw, 1, MP_OBJ_FUN_ARGS_MAX, true);
+
+    // get the wanted pin object
+    int wanted_pin = mp_obj_get_int(args[0]);
+
+    const machine_pin_obj_t *self = NULL;
+    if (0 <= wanted_pin && wanted_pin < MP_ARRAY_SIZE(machine_pin_obj)) {
+        self = (machine_pin_obj_t *)&machine_pin_obj[wanted_pin];
+    }
+
+    if (self == NULL || self->base.type == NULL) {
+        mp_raise_ValueError(MP_ERROR_TEXT("invalid pin"));
+    }
+    self = (machine_pin_obj_t *)&machine_pin_obj[wanted_pin];
+
+    if (n_args > 1 || n_kw > 0) {
+        // pin mode given, so configure this GPIO
+        mp_map_t kw_args;
+        mp_map_init_fixed_table(&kw_args, n_kw, args + n_args);
+        machine_pin_obj_init_helper(self, n_args - 1, args + 1, &kw_args);
+    }
+
+    return MP_OBJ_FROM_PTR(self);
+}
+
+// fast method for getting/setting pin value
+STATIC mp_obj_t machine_pin_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
+    mp_arg_check_num(n_args, n_kw, 0, 1, false);
+    machine_pin_obj_t *self = self_in;
+    if (n_args == 0) {
+        // get pin
+        return MP_OBJ_NEW_SMALL_INT(gpio_get_pin_level(self->id));
+    } else {
+        // set pin
+        bool value = mp_obj_is_true(args[0]);
+        gpio_set_pin_level(self->id, value);
+
+        return mp_const_none;
+    }
+}
+
+// Pin.init(mode, pull)
+STATIC mp_obj_t machine_pin_obj_init(size_t n_args, const mp_obj_t *args, mp_map_t *kw_args) {
+    return machine_pin_obj_init_helper(args[0], n_args - 1, args + 1, kw_args);
+}
+MP_DEFINE_CONST_FUN_OBJ_KW(machine_pin_init_obj, 1, machine_pin_obj_init);
+
+// Pin.value([value])
+STATIC mp_obj_t machine_pin_value(size_t n_args, const mp_obj_t *args) {
+    return machine_pin_call(args[0], n_args - 1, 0, args + 1);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_pin_value_obj, 1, 2, machine_pin_value);
+
+// Pin.disable(pin)
+STATIC mp_obj_t machine_pin_disable(mp_obj_t self_in) {
+    machine_pin_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    gpio_set_pin_direction(self->id, GPIO_DIRECTION_OFF); // Disables the pin (low power state)
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_pin_disable_obj, machine_pin_disable);
+
+// Pin.low() Totem-pole (push-pull)
+STATIC mp_obj_t machine_pin_low(mp_obj_t self_in) {
+    machine_pin_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    gpio_set_pin_direction(self->id, GPIO_DIRECTION_OUT);
+    gpio_set_pin_level(self->id, false);
+
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_pin_low_obj, machine_pin_low);
+
+// Pin.high() Totem-pole (push-pull)
+STATIC mp_obj_t machine_pin_high(mp_obj_t self_in) {
+    machine_pin_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    gpio_set_pin_direction(self->id, GPIO_DIRECTION_OUT);
+    gpio_set_pin_level(self->id, true);
+
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_pin_high_obj, machine_pin_high);
+
+// Pin.toggle(). Only TOGGLE pins set as OUTPUT.
+STATIC mp_obj_t machine_pin_toggle(mp_obj_t self_in) {
+    machine_pin_obj_t *self = MP_OBJ_TO_PTR(self_in);
+
+    // Determine DIRECTION of PIN.
+    bool pin_dir;
+
+    pin_dir = (PORT->Group[(enum gpio_port)GPIO_PORT(self->id)].DIR.reg // Get PORT#
+        & (1 << GPIO_PIN(self->id)))      // Isolate the Pin in question
+        >> GPIO_PIN(self->id);            // Shift to LSB for binary result.
+
+    if (pin_dir) {
+        // Pin is OUTPUT
+        gpio_set_pin_direction(self->id, GPIO_DIRECTION_OUT);
+        gpio_toggle_pin_level(self->id);
+    } else {
+        mp_raise_ValueError(MP_ERROR_TEXT("Cannot TOGGLE INPUT pin!\n"));
+    }
+    return mp_const_true;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_pin_toggle_obj, machine_pin_toggle);
+
+// Pin.drive(). Normal (0) is 2mA, High (1) allows 8mA.
+STATIC mp_obj_t machine_pin_drive(size_t n_args, const mp_obj_t *args) {
+    machine_pin_obj_t *self = args[0]; // Pin
+    if (n_args == 1) {
+        return mp_const_none;
+    } else {
+        bool strength = mp_obj_get_int(args[1]); // 0 or 1
+        pin_validate_drive(strength);
+        // Set the DRVSTR bit (ASF hri/hri_port_dxx.h
+        hri_port_write_PINCFG_DRVSTR_bit(PORT,
+            (enum gpio_port)GPIO_PORT(self->id),
+            GPIO_PIN(self->id),
+            strength);
+        return mp_const_none;
+    }
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_pin_drive_obj, 1, 2, machine_pin_drive);
+
+STATIC const mp_rom_map_elem_t machine_pin_locals_dict_table[] = {
+    // instance methods
+    { MP_ROM_QSTR(MP_QSTR_init), MP_ROM_PTR(&machine_pin_init_obj) },
+    { MP_ROM_QSTR(MP_QSTR_value), MP_ROM_PTR(&machine_pin_value_obj) },
+    { MP_ROM_QSTR(MP_QSTR_low), MP_ROM_PTR(&machine_pin_low_obj) },
+    { MP_ROM_QSTR(MP_QSTR_high), MP_ROM_PTR(&machine_pin_high_obj) },
+    { MP_ROM_QSTR(MP_QSTR_off), MP_ROM_PTR(&machine_pin_low_obj) },
+    { MP_ROM_QSTR(MP_QSTR_on), MP_ROM_PTR(&machine_pin_high_obj) },
+    { MP_ROM_QSTR(MP_QSTR_toggle), MP_ROM_PTR(&machine_pin_toggle_obj) },
+    { MP_ROM_QSTR(MP_QSTR_disable), MP_ROM_PTR(&machine_pin_disable_obj) },
+    { MP_ROM_QSTR(MP_QSTR_drive), MP_ROM_PTR(&machine_pin_drive_obj) },
+
+
+    // { MP_ROM_QSTR(MP_QSTR_irq), MP_ROM_PTR(&machine_pin_irq_obj) },
+
+    // class constants
+    { MP_ROM_QSTR(MP_QSTR_IN), MP_ROM_INT(GPIO_MODE_IN) },
+    { MP_ROM_QSTR(MP_QSTR_OUT), MP_ROM_INT(GPIO_MODE_OUT) },
+    // { MP_ROM_QSTR(MP_QSTR_ALT), MP_ROM_INT(GPIO_MODE_ALT) },
+    { MP_ROM_QSTR(MP_QSTR_PULL_OFF), MP_ROM_INT(GPIO_PULL_OFF) },
+    { MP_ROM_QSTR(MP_QSTR_PULL_UP), MP_ROM_INT(GPIO_PULL_UP) },
+    { MP_ROM_QSTR(MP_QSTR_PULL_DOWN), MP_ROM_INT(GPIO_PULL_DOWN) },
+    { MP_ROM_QSTR(MP_QSTR_LOW_POWER), MP_ROM_INT(GPIO_STRENGTH_2MA) },
+    { MP_ROM_QSTR(MP_QSTR_HIGH_POWER), MP_ROM_INT(GPIO_STRENGTH_8MA) },
+    // { MP_ROM_QSTR(MP_QSTR_IRQ_RISING), MP_ROM_INT(GPIO_IRQ_EDGE_RISE) },
+    // { MP_ROM_QSTR(MP_QSTR_IRQ_FALLING), MP_ROM_INT(GPIO_IRQ_EDGE_FALL) },
+};
+STATIC MP_DEFINE_CONST_DICT(machine_pin_locals_dict, machine_pin_locals_dict_table);
+
+STATIC mp_uint_t pin_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_t arg, int *errcode) {
+    (void)errcode;
+    machine_pin_obj_t *self = self_in;
+
+    switch (request) {
+        case MP_PIN_READ: {
+            return gpio_get_pin_level(self->id);
+        }
+        case MP_PIN_WRITE: {
+            gpio_set_pin_level(self->id, arg);
+            return 0;
+        }
+    }
+    return -1;
+}
+
+STATIC const mp_pin_p_t pin_pin_p = {
+    .ioctl = pin_ioctl,
+};
+
+const mp_obj_type_t machine_pin_type = {
+    { &mp_type_type },
+    .name = MP_QSTR_Pin,
+    .print = machine_pin_print,
+    .make_new = mp_pin_make_new,
+    .call = machine_pin_call,
+    .protocol = &pin_pin_p,
+    .locals_dict = (mp_obj_t)&machine_pin_locals_dict,
+};
+
+/*
+STATIC mp_uint_t machine_pin_irq_trigger(mp_obj_t self_in, mp_uint_t new_trigger) {
+    machine_pin_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    machine_pin_irq_obj_t *irq = MP_STATE_PORT(machine_pin_irq_obj[self->id]);
+    gpio_set_irq_enabled(self->id, GPIO_IRQ_ALL, false);
+    irq->flags = 0;
+    irq->trigger = new_trigger;
+    gpio_set_irq_enabled(self->id, new_trigger, true);
+    return 0;
+}
+
+STATIC mp_uint_t machine_pin_irq_info(mp_obj_t self_in, mp_uint_t info_type) {
+    machine_pin_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    machine_pin_irq_obj_t *irq = MP_STATE_PORT(machine_pin_irq_obj[self->id]);
+    if (info_type == MP_IRQ_INFO_FLAGS) {
+        return irq->flags;
+    } else if (info_type == MP_IRQ_INFO_TRIGGERS) {
+        return irq->trigger;
+    }
+    return 0;
+}
+
+STATIC const mp_irq_methods_t machine_pin_irq_methods = {
+    .trigger = machine_pin_irq_trigger,
+    .info = machine_pin_irq_info,
+};
+*/
+
+mp_hal_pin_obj_t mp_hal_get_pin_obj(mp_obj_t obj) {
+    if (!mp_obj_is_type(obj, &machine_pin_type)) {
+        mp_raise_ValueError(MP_ERROR_TEXT("expecting a Pin"));
+    }
+    machine_pin_obj_t *pin = MP_OBJ_TO_PTR(obj);
+    return pin->id;
+}
diff --git a/ports/samd/modmachine.c b/ports/samd/modmachine.c
index 207e4c71ca1a6..0ebb5581cdd0c 100644
--- a/ports/samd/modmachine.c
+++ b/ports/samd/modmachine.c
@@ -27,6 +27,13 @@
 #include "py/runtime.h"
 #include "extmod/machine_mem.h"
 #include "samd_soc.h"
+#include "modmachine.h"
+
+// ASF 4
+#include "hal_flash.h"
+#include "hal_init.h"
+#include "hpl_gclk_base.h"
+#include "hpl_pm_base.h"
 
 #if defined(MCU_SAMD21)
 #define DBL_TAP_ADDR ((volatile uint32_t *)(0x20000000 + 32 * 1024 - 4))
@@ -36,6 +43,9 @@
 #define DBL_TAP_MAGIC_LOADER 0xf01669ef
 #define DBL_TAP_MAGIC_RESET 0xf02669ef
 
+MP_DEFINE_CONST_FUN_OBJ_0(machine_uart_init_obj, machine_uart_init);
+MP_DEFINE_CONST_FUN_OBJ_0(machine_uart_deinit_obj, machine_uart_deinit);
+
 STATIC mp_obj_t machine_reset(void) {
     *DBL_TAP_ADDR = DBL_TAP_MAGIC_RESET;
     NVIC_SystemReset();
@@ -55,6 +65,49 @@ STATIC mp_obj_t machine_freq(void) {
 }
 MP_DEFINE_CONST_FUN_OBJ_0(machine_freq_obj, machine_freq);
 
+STATIC mp_obj_t machine_unique_id(void) {
+    // Each device has a unique 128-bit serial number which is a concatenation of four 32-bit
+    // words contained at the following addresses. The uniqueness of the serial number is
+    // guaranteed only when using all 128 bits.
+    // Atmel SAM D21E / SAM D21G / SAM D21J
+    // SMART ARM-Based Microcontroller
+    // DATASHEET
+    // 9.6 (SAMD51) or 9.3.3 (or 10.3.3 depending on which manual)(SAMD21) Serial Number
+    //
+    // EXAMPLE (SAMD21)
+    // ----------------
+    // OpenOCD:
+    // Word0:
+    // > at91samd21g18.cpu mdw 0x0080A00C 1
+    // 0x0080a00c: 6e27f15f
+    // Words 1-3:
+    // > at91samd21g18.cpu mdw 0x0080A040 3
+    // 0x0080a040: 50534b54 332e3120 ff091645
+    //
+    // MicroPython (this code and same order as shown in Arduino IDE)
+    // >>> ubinascii.hexlify(machine.unique_id())
+    // b'6e27f15f50534b54332e3120ff091645'
+
+    #if defined(MCU_SAMD21)
+    uint32_t *id_addresses[4] = {(uint32_t *)0x0080A00C, (uint32_t *)0x0080A040,
+                                 (uint32_t *)0x0080A044, (uint32_t *)0x0080A048};
+    #elif defined(MCU_SAMD51)
+    uint32_t *id_addresses[4] = {(uint32_t *)0x008061FC, (uint32_t *)0x00806010,
+                                 (uint32_t *)0x00806014, (uint32_t *)0x00806018};
+    #endif
+    uint8_t raw_id[16];
+
+    for (int i = 0; i < 4; i++) {
+        for (int k = 0; k < 4; k++) {
+            // 'Reverse' the read bytes into a 32 bit word (Consistent with Arduino)
+            raw_id[4 * i + k] = (*(id_addresses[i]) >> (24 - k * 8)) & 0xff;
+        }
+    }
+
+    return mp_obj_new_bytes((byte *)&raw_id, sizeof(raw_id));
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(machine_unique_id_obj, machine_unique_id);
+
 STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__),            MP_ROM_QSTR(MP_QSTR_umachine) },
     { MP_ROM_QSTR(MP_QSTR_reset),               MP_ROM_PTR(&machine_reset_obj) },
@@ -63,6 +116,11 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_mem8),                MP_ROM_PTR(&machine_mem8_obj) },
     { MP_ROM_QSTR(MP_QSTR_mem16),               MP_ROM_PTR(&machine_mem16_obj) },
     { MP_ROM_QSTR(MP_QSTR_mem32),               MP_ROM_PTR(&machine_mem32_obj) },
+    { MP_ROM_QSTR(MP_QSTR_unique_id),           MP_ROM_PTR(&machine_unique_id_obj) },
+    { MP_ROM_QSTR(MP_QSTR_uart_init),           MP_ROM_PTR(&machine_uart_init_obj) },
+    { MP_ROM_QSTR(MP_QSTR_uart_deinit),         MP_ROM_PTR(&machine_uart_deinit_obj) },
+    { MP_ROM_QSTR(MP_QSTR_Pin),                 MP_ROM_PTR(&machine_pin_type) },
+    { MP_ROM_QSTR(MP_QSTR_LED),                 MP_ROM_PTR(&machine_led_type) },
 };
 STATIC MP_DEFINE_CONST_DICT(machine_module_globals, machine_module_globals_table);
 
diff --git a/ports/samd/modmachine.h b/ports/samd/modmachine.h
new file mode 100644
index 0000000000000..61bd2f4d29912
--- /dev/null
+++ b/ports/samd/modmachine.h
@@ -0,0 +1,37 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+#ifndef MICROPY_INCLUDED_SAMD_MODMACHINE_H
+#define MICROPY_INCLUDED_SAMD_MODMACHINE_H
+
+#include "py/obj.h"
+
+extern const mp_obj_type_t machine_pin_type;
+extern const mp_obj_type_t machine_led_type;
+
+mp_obj_t machine_uart_init(void);
+mp_obj_t machine_uart_deinit(void);
+
+#endif // MICROPY_INCLUDED_SAMD_MODMACHINE_H

From 72cb4ff596a2f6bda8c79aabfb2af646e70ad590 Mon Sep 17 00:00:00 2001
From: Peter van der Burg <vdb_peter@hotmail.com>
Date: Sat, 22 May 2021 16:52:36 +1000
Subject: [PATCH 1413/3533] samd/boards/ADAFRUIT_FEATHER_M0_EXPRESS: Update for
 flash and pins.

- mpconfigboard.h: flash and USART config
- mpconfigboard.mk: enable LFS1
- pins.c: define pins and LEDs
- pins.h: define structs and consts
---
 .../mpconfigboard.h                           | 26 +++++++++
 .../mpconfigboard.mk                          |  4 ++
 .../boards/ADAFRUIT_FEATHER_M0_EXPRESS/pins.c | 58 +++++++++++++++++++
 .../boards/ADAFRUIT_FEATHER_M0_EXPRESS/pins.h | 42 ++++++++++++++
 4 files changed, 130 insertions(+)
 create mode 100644 ports/samd/boards/ADAFRUIT_FEATHER_M0_EXPRESS/pins.c
 create mode 100644 ports/samd/boards/ADAFRUIT_FEATHER_M0_EXPRESS/pins.h

diff --git a/ports/samd/boards/ADAFRUIT_FEATHER_M0_EXPRESS/mpconfigboard.h b/ports/samd/boards/ADAFRUIT_FEATHER_M0_EXPRESS/mpconfigboard.h
index cec9e9ccdda46..ba384645dbbd8 100644
--- a/ports/samd/boards/ADAFRUIT_FEATHER_M0_EXPRESS/mpconfigboard.h
+++ b/ports/samd/boards/ADAFRUIT_FEATHER_M0_EXPRESS/mpconfigboard.h
@@ -1,2 +1,28 @@
 #define MICROPY_HW_BOARD_NAME "Feather M0 Express"
 #define MICROPY_HW_MCU_NAME   "SAMD21G18A"
+
+// MicroPython configs
+// samd_flash.c flash parameters
+// Build a 64k Flash storage at top. 256k-64k=196k
+// 256*1024=262144 minus 64*1024=65536 = 196608 = 0x30000
+#define MICROPY_HW_FLASH_STORAGE_BASE       (0x30000)
+#define MICROPY_HW_FLASH_STORAGE_BYTES      (0xFFFF)
+#define VFS_BLOCK_SIZE_BYTES                (1536) // 24x 64B flash pages;
+
+// ASF4 MCU package specific Pin definitions
+#include "samd21g18a.h"
+
+// Please consult the SAM_D21 Datasheet, I/O Multiplexing and Considerations.
+// On this board (see https://learn.adafruit.com/assets/40553) TX is D1 (PA10) and RX is D0 (PA11)
+// USART pin assignments: Tx=PA10=SERCOM0/PAD[2], Rx=PA11==SERCOM0/PAD[3]
+#define CPU_FREQ (48000000) // For selecting Baud from clock.
+#define MP_PIN_GRP 0 // A=0, B=1
+#define MP_TX_PIN 10 //'n'
+#define MP_RX_PIN 11
+#define MP_PERIPHERAL_MUX 5 // 'n'th group of 2 pins
+#define USARTx SERCOM0 // SERCOM0: tx/rx
+#define MP_PORT_FUNC 0x22 // Sets PMUXE & PMUXO to the Alternative Function.(A-H=0-7)
+#define MP_RXPO_PAD 3 // RXPO- Receive Data Pinout
+#define MP_TXPO_PAD 1 // TXPO- Transmit Data Pinout
+#define MP_SERCOMx SERCOM0_ // APBCMASK
+#define MP_SERCOM_GCLK_ID_x_CORE GCLK_CLKCTRL_ID_SERCOM0_CORE // Generic Clock Control
diff --git a/ports/samd/boards/ADAFRUIT_FEATHER_M0_EXPRESS/mpconfigboard.mk b/ports/samd/boards/ADAFRUIT_FEATHER_M0_EXPRESS/mpconfigboard.mk
index 8696c966bc321..a760cf047e629 100644
--- a/ports/samd/boards/ADAFRUIT_FEATHER_M0_EXPRESS/mpconfigboard.mk
+++ b/ports/samd/boards/ADAFRUIT_FEATHER_M0_EXPRESS/mpconfigboard.mk
@@ -2,3 +2,7 @@ MCU_SERIES = SAMD21
 CMSIS_MCU = SAMD21G18A
 LD_FILES = boards/samd21x18a.ld sections.ld
 TEXT0 = 0x2000
+
+# The ?='s allow overriding in mpconfigboard.mk.
+# MicroPython settings
+MICROPY_VFS_LFS1 ?= 1
diff --git a/ports/samd/boards/ADAFRUIT_FEATHER_M0_EXPRESS/pins.c b/ports/samd/boards/ADAFRUIT_FEATHER_M0_EXPRESS/pins.c
new file mode 100644
index 0000000000000..e0dd752ec900d
--- /dev/null
+++ b/ports/samd/boards/ADAFRUIT_FEATHER_M0_EXPRESS/pins.c
@@ -0,0 +1,58 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Peter van der Burg
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * Used by machine_pin.c. Holds Board/MCU specific Pin allocations.
+ */
+
+#include "modmachine.h"
+#include "pins.h"
+
+// Ensure Declaration in 'pins.h' reflects # of Pins defined here.
+const machine_pin_obj_t machine_pin_obj[] = {
+    {{&machine_pin_type}, PIN_PA11}, // D0
+    {{&machine_pin_type}, PIN_PA10}, // D1
+    {{&machine_pin_type}, PIN_PA14}, // D2
+    {{&machine_pin_type}, PIN_PA09}, // D3/
+    {{&machine_pin_type}, PIN_PA08}, // D4/
+    {{&machine_pin_type}, PIN_PA15}, // D5
+    {{&machine_pin_type}, PIN_PA20}, // D6
+    {{&machine_pin_type}, PIN_PA21}, // D7
+    {{&machine_pin_type}, PIN_PA06}, // D8/
+    {{&machine_pin_type}, PIN_PA07}, // D9/
+    {{&machine_pin_type}, PIN_PA18}, // D10
+    {{&machine_pin_type}, PIN_PA16}, // D11
+    {{&machine_pin_type}, PIN_PA19}, // D12
+    {{&machine_pin_type}, PIN_PA17}, // D13/
+    {{&machine_pin_type}, PIN_PA02},     // A0
+    {{&machine_pin_type}, PIN_PB08}, // A1
+    {{&machine_pin_type}, PIN_PB09}, // A2
+    {{&machine_pin_type}, PIN_PA04}, // A3/
+    {{&machine_pin_type}, PIN_PA05}, // A4/
+    {{&machine_pin_type}, PIN_PB02}, // A5
+};
+
+const machine_led_obj_t machine_led_obj[] = {
+    {{&machine_led_type}, PIN_PA17}, // D13/ user LED
+};
diff --git a/ports/samd/boards/ADAFRUIT_FEATHER_M0_EXPRESS/pins.h b/ports/samd/boards/ADAFRUIT_FEATHER_M0_EXPRESS/pins.h
new file mode 100644
index 0000000000000..45bee6167837c
--- /dev/null
+++ b/ports/samd/boards/ADAFRUIT_FEATHER_M0_EXPRESS/pins.h
@@ -0,0 +1,42 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Peter van der Burg
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * Used by machine_pin.c & board specific pins.c. Holds Board/MCU specific Pin
+ * allocations.
+ */
+
+typedef struct _machine_pin_obj_t {
+    mp_obj_base_t base;
+    uint32_t id;
+} machine_pin_obj_t;
+
+typedef struct _machine_led_obj_t {
+    mp_obj_base_t base;
+    uint32_t id;
+} machine_led_obj_t;
+
+// MUST explicitly hold array # of rows, else machine_pin.c wont compile.
+extern const machine_pin_obj_t machine_pin_obj[20];
+extern const machine_led_obj_t machine_led_obj[1];

From 199b6a8a8b46255e22b5b144fe4aab02d7ff8f03 Mon Sep 17 00:00:00 2001
From: Peter van der Burg <vdb_peter@hotmail.com>
Date: Sat, 22 May 2021 11:44:21 +1000
Subject: [PATCH 1414/3533] samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS: Update
 for flash and pins.

- mpconfigboard.h: flash and USART config
- mpconfigboard.mk: enable LFS1
- pins.c: define pins and LEDs
- pins.h: define structs and consts
---
 .../mpconfigboard.h                           | 25 ++++++++
 .../mpconfigboard.mk                          |  4 ++
 .../ADAFRUIT_ITSYBITSY_M4_EXPRESS/pins.c      | 58 +++++++++++++++++++
 .../ADAFRUIT_ITSYBITSY_M4_EXPRESS/pins.h      | 42 ++++++++++++++
 4 files changed, 129 insertions(+)
 create mode 100644 ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/pins.c
 create mode 100644 ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/pins.h

diff --git a/ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/mpconfigboard.h b/ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/mpconfigboard.h
index 490704eadb178..c1c4fd8cad4cf 100644
--- a/ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/mpconfigboard.h
+++ b/ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/mpconfigboard.h
@@ -5,3 +5,28 @@
 #define MICROPY_PY_BUILTINS_COMPLEX     (0)
 #define MICROPY_PY_MATH                 (0)
 #define MICROPY_PY_CMATH                (0)
+
+// MicroPython configs
+// samd_flash.c flash parameters
+// Build a 128k Flash storage at top. 512k-128k=384k=0x60000
+// 512*1024= 0x80000 minus 128*1024= 0x20000 =  0x60000
+#define MICROPY_HW_FLASH_STORAGE_BASE       (0x60000)
+#define MICROPY_HW_FLASH_STORAGE_BYTES      (0x1FFFF)
+#define VFS_BLOCK_SIZE_BYTES                (1536) //
+
+// ASF4 MCU package specific Pin definitions
+#include "samd51g19a.h"
+
+// Please consult the SAM_D51 Datasheet, I/O Multiplexing and Considerations.
+// USART pin assignments: Tx=TX_D1=PA17=SERCOM3/PAD[0], Rx=RX_D0=PA16=SERCOM3/PAD[1]
+#define CPU_FREQ (48000000) // For selecting Baud from clock.
+#define MP_PIN_GRP 1 // A-D=0-3
+#define MP_TX_PIN 17
+#define MP_RX_PIN 16 // 'n'
+#define MP_PERIPHERAL_MUX 8 // 'n'th group of 2 pins
+#define USARTx SERCOM3 //
+#define MP_PORT_FUNC 0x33 // Sets PMUXE & PMUXO to the Alternative Function.A-N=0-13
+#define MP_RXPO_PAD 1 // RXPO- Receive Data Pinout
+#define MP_TXPO_PAD 0 // TXPO- Tranmit Data Pinout
+#define MP_SERCOMx SERCOM3_ // APBCMASK
+#define MP_SERCOM_GCLK_ID_x_CORE SERCOM3_GCLK_ID_CORE
diff --git a/ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/mpconfigboard.mk b/ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/mpconfigboard.mk
index 2e5d7e68df7d6..6b0192c77b9ea 100644
--- a/ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/mpconfigboard.mk
+++ b/ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/mpconfigboard.mk
@@ -2,3 +2,7 @@ MCU_SERIES = SAMD51
 CMSIS_MCU = SAMD51G19A
 LD_FILES = boards/samd51g19a.ld sections.ld
 TEXT0 = 0x4000
+
+# The ?='s allow overriding in mpconfigboard.mk.
+# MicroPython settings
+MICROPY_VFS_LFS1 ?= 1
diff --git a/ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/pins.c b/ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/pins.c
new file mode 100644
index 0000000000000..82948ccbc4f18
--- /dev/null
+++ b/ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/pins.c
@@ -0,0 +1,58 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Peter van der Burg
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * Used by machine_pin.c. Holds Board/MCU specific Pin allocations.
+ */
+
+#include "modmachine.h"
+#include "pins.h"
+
+// Ensure Declaration in 'pins.h' reflects # of Pins defined here.
+const machine_pin_obj_t machine_pin_obj[] = {
+    {{&machine_pin_type}, PIN_PA16}, // RX_D0
+    {{&machine_pin_type}, PIN_PA17}, // TX_D1
+    {{&machine_pin_type}, PIN_PA07}, // D2
+    {{&machine_pin_type}, PIN_PB22}, // D3
+    {{&machine_pin_type}, PIN_PA14}, // D4
+    {{&machine_pin_type}, PIN_PA15}, // D5
+    {{NULL}, -1}, // D6- not terminated on breakout.
+    {{&machine_pin_type}, PIN_PA18}, // D7
+    {{NULL}, -1}, // D8- not terminated on breakout.
+    {{&machine_pin_type}, PIN_PA19}, // D9
+    {{&machine_pin_type}, PIN_PA20}, // D10
+    {{&machine_pin_type}, PIN_PA21}, // D11
+    {{&machine_pin_type}, PIN_PA23}, // D12
+    {{&machine_pin_type}, PIN_PA22}, // D13
+    {{&machine_pin_type}, PIN_PA02},     // A0
+    {{&machine_pin_type}, PIN_PA05}, // A1
+    {{&machine_pin_type}, PIN_PB08}, // A2
+    {{&machine_pin_type}, PIN_PB09}, // A3
+    {{&machine_pin_type}, PIN_PA04}, // A4
+    {{&machine_pin_type}, PIN_PA06}, // A5
+};
+
+const machine_led_obj_t machine_led_obj[] = {
+    {{&machine_led_type}, PIN_PA22}, // D13
+};
diff --git a/ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/pins.h b/ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/pins.h
new file mode 100644
index 0000000000000..45bee6167837c
--- /dev/null
+++ b/ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/pins.h
@@ -0,0 +1,42 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Peter van der Burg
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * Used by machine_pin.c & board specific pins.c. Holds Board/MCU specific Pin
+ * allocations.
+ */
+
+typedef struct _machine_pin_obj_t {
+    mp_obj_base_t base;
+    uint32_t id;
+} machine_pin_obj_t;
+
+typedef struct _machine_led_obj_t {
+    mp_obj_base_t base;
+    uint32_t id;
+} machine_led_obj_t;
+
+// MUST explicitly hold array # of rows, else machine_pin.c wont compile.
+extern const machine_pin_obj_t machine_pin_obj[20];
+extern const machine_led_obj_t machine_led_obj[1];

From 3d33dbedc9d9f6df19e68461dc66cdff08ed01cc Mon Sep 17 00:00:00 2001
From: Peter van der Burg <vdb_peter@hotmail.com>
Date: Sat, 22 May 2021 17:04:04 +1000
Subject: [PATCH 1415/3533] samd/boards/MINISAM_M4: Update for flash and pins.

- mpconfigboard.h: flash and USART config
- mpconfigboard.mk: enable LFS1
- pins.c: define pins and LEDs
- pins.h: define structs and consts
---
 ports/samd/boards/MINISAM_M4/mpconfigboard.h  | 25 +++++++++
 ports/samd/boards/MINISAM_M4/mpconfigboard.mk |  4 ++
 ports/samd/boards/MINISAM_M4/pins.c           | 51 +++++++++++++++++++
 ports/samd/boards/MINISAM_M4/pins.h           | 42 +++++++++++++++
 4 files changed, 122 insertions(+)
 create mode 100644 ports/samd/boards/MINISAM_M4/pins.c
 create mode 100644 ports/samd/boards/MINISAM_M4/pins.h

diff --git a/ports/samd/boards/MINISAM_M4/mpconfigboard.h b/ports/samd/boards/MINISAM_M4/mpconfigboard.h
index 0847a45bf1a4b..a65eb54b495f1 100644
--- a/ports/samd/boards/MINISAM_M4/mpconfigboard.h
+++ b/ports/samd/boards/MINISAM_M4/mpconfigboard.h
@@ -5,3 +5,28 @@
 #define MICROPY_PY_BUILTINS_COMPLEX     (0)
 #define MICROPY_PY_MATH                 (0)
 #define MICROPY_PY_CMATH                (0)
+
+// MicroPython configs
+// samd_flash.c flash parameters
+// Build a 128k Flash storage at top. 512k-128k=384k=0x60000
+// 512*1024= 0x80000 minus 128*1024= 0x20000 =  0x60000
+#define MICROPY_HW_FLASH_STORAGE_BASE       (0x60000)
+#define MICROPY_HW_FLASH_STORAGE_BYTES      (0x1FFFF)
+#define VFS_BLOCK_SIZE_BYTES                (1536) //
+
+// ASF4 MCU package specific Pin definitions
+#include "samd51g19a.h"
+
+// Please consult the SAM_D51 Datasheet, I/O Multiplexing and Considerations.
+// USART pin assignments: Tx=TX_D1=PA17=SERCOM3/PAD[0], Rx=RX_D0=PA16=SERCOM3/PAD[1]
+#define CPU_FREQ (48000000) // For selecting Baud from clock.
+#define MP_PIN_GRP 0 // A-D=0-3
+#define MP_TX_PIN 17
+#define MP_RX_PIN 16 // 'n'
+#define MP_PERIPHERAL_MUX 8 // 'n'th group of 2 pins
+#define USARTx SERCOM3 //
+#define MP_PORT_FUNC 0x33 // Sets PMUXE & PMUXO to the Alternative Function.A-N=0-13
+#define MP_RXPO_PAD 1 // RXPO- Receive Data Pinout
+#define MP_TXPO_PAD 0 // TXPO- Tranmit Data Pinout
+#define MP_SERCOMx SERCOM3_ // APBCMASK
+#define MP_SERCOM_GCLK_ID_x_CORE SERCOM3_GCLK_ID_CORE
diff --git a/ports/samd/boards/MINISAM_M4/mpconfigboard.mk b/ports/samd/boards/MINISAM_M4/mpconfigboard.mk
index 54ed3273d547e..6ed0ff552b013 100644
--- a/ports/samd/boards/MINISAM_M4/mpconfigboard.mk
+++ b/ports/samd/boards/MINISAM_M4/mpconfigboard.mk
@@ -3,3 +3,7 @@ MCU_SERIES = SAMD51
 CMSIS_MCU = SAMD51G19A
 LD_FILES = boards/samd51g19a.ld sections.ld
 TEXT0 = 0x4000
+
+# The ?='s allow overriding in mpconfigboard.mk.
+# MicroPython settings
+MICROPY_VFS_LFS1 ?= 1
diff --git a/ports/samd/boards/MINISAM_M4/pins.c b/ports/samd/boards/MINISAM_M4/pins.c
new file mode 100644
index 0000000000000..6cdd840b6bc78
--- /dev/null
+++ b/ports/samd/boards/MINISAM_M4/pins.c
@@ -0,0 +1,51 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Peter van der Burg
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * Used by machine_pin.c. Holds Board/MCU specific Pin allocations.
+ */
+
+#include "modmachine.h"
+#include "pins.h"
+
+// Ensure Declaration in 'pins.h' reflects # of Pins defined here.
+const machine_pin_obj_t machine_pin_obj[] = {
+    {{&machine_pin_type}, PIN_PA02}, // A0,D9
+    {{&machine_pin_type}, PIN_PB08}, // A1,D10
+    {{&machine_pin_type}, PIN_PB09}, // A2,D11
+    {{&machine_pin_type}, PIN_PA04}, // A3,D12
+    {{&machine_pin_type}, PIN_PA05}, // A4,D13
+    {{&machine_pin_type}, PIN_PA06}, // A5
+    {{&machine_pin_type}, PIN_PA16}, // RX_D0
+    {{&machine_pin_type}, PIN_PA17}, // TX_D1
+    {{&machine_pin_type}, PIN_PA07}, // D2,A6
+    {{&machine_pin_type}, PIN_PA19}, // D3
+    {{&machine_pin_type}, PIN_PA20}, // D4
+    {{&machine_pin_type}, PIN_PA21}, // D5
+    {{&machine_pin_type}, PIN_PA00}, // BUTTON
+};
+
+const machine_led_obj_t machine_led_obj[] = {
+    {{&machine_led_type}, PIN_PA15}, // LED
+};
diff --git a/ports/samd/boards/MINISAM_M4/pins.h b/ports/samd/boards/MINISAM_M4/pins.h
new file mode 100644
index 0000000000000..892b0e7b9763d
--- /dev/null
+++ b/ports/samd/boards/MINISAM_M4/pins.h
@@ -0,0 +1,42 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Peter van der Burg
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * Used by machine_pin.c & board specific pins.c. Holds Board/MCU specific Pin
+ * allocations.
+ */
+
+typedef struct _machine_pin_obj_t {
+    mp_obj_base_t base;
+    uint32_t id;
+} machine_pin_obj_t;
+
+typedef struct _machine_led_obj_t {
+    mp_obj_base_t base;
+    uint32_t id;
+} machine_led_obj_t;
+
+// MUST explicitly hold array # of rows, else machine_pin.c wont compile.
+extern const machine_pin_obj_t machine_pin_obj[13];
+extern const machine_led_obj_t machine_led_obj[1];

From fb79e586362227d75069e92c9965921c13c9aacf Mon Sep 17 00:00:00 2001
From: Peter van der Burg <vdb_peter@hotmail.com>
Date: Sat, 22 May 2021 16:57:53 +1000
Subject: [PATCH 1416/3533] samd/boards/ADAFRUIT_TRINKET_M0: Update for flash
 and pins.

- mpconfigboard.h: flash and USART config
- mpconfigboard.mk: enable LFS1
- pins.c: define pins and LEDs
- pins.h: define structs and consts
---
 .../ADAFRUIT_TRINKET_M0/mpconfigboard.h       | 25 +++++++++++
 .../ADAFRUIT_TRINKET_M0/mpconfigboard.mk      |  4 ++
 ports/samd/boards/ADAFRUIT_TRINKET_M0/pins.c  | 43 +++++++++++++++++++
 ports/samd/boards/ADAFRUIT_TRINKET_M0/pins.h  | 42 ++++++++++++++++++
 4 files changed, 114 insertions(+)
 create mode 100644 ports/samd/boards/ADAFRUIT_TRINKET_M0/pins.c
 create mode 100644 ports/samd/boards/ADAFRUIT_TRINKET_M0/pins.h

diff --git a/ports/samd/boards/ADAFRUIT_TRINKET_M0/mpconfigboard.h b/ports/samd/boards/ADAFRUIT_TRINKET_M0/mpconfigboard.h
index d3a6ba2d8687e..128689f4f74a7 100644
--- a/ports/samd/boards/ADAFRUIT_TRINKET_M0/mpconfigboard.h
+++ b/ports/samd/boards/ADAFRUIT_TRINKET_M0/mpconfigboard.h
@@ -1,2 +1,27 @@
 #define MICROPY_HW_BOARD_NAME "Trinket M0"
 #define MICROPY_HW_MCU_NAME   "SAMD21E18A"
+
+// MicroPython configs
+// samd_flash.c flash parameters
+// Build a 64k Flash storage at top. 256k-64k=196k
+// 256*1024=262144 minus 64*1024=65536 = 196608 = 0x30000
+#define MICROPY_HW_FLASH_STORAGE_BASE       (0x30000)
+#define MICROPY_HW_FLASH_STORAGE_BYTES      (0xFFFF)
+#define VFS_BLOCK_SIZE_BYTES                (1536) // 24x 64B flash pages;
+
+// ASF4 MCU package specific Pin definitions
+#include "samd21e18a.h"
+
+// Please consult the SAM_D21 Datasheet, I/O Multiplexing and Considerations.
+// USART pin assignments: Tx=D4=PA06=SERCOM0/PAD[2], Rx=D3=PA07=SERCOM0/PAD[3]
+#define CPU_FREQ (48000000) // For selecting Baud from clock.
+#define MP_PIN_GRP 1 // A=0, B=1
+#define MP_TX_PIN 6 // 'n'
+#define MP_RX_PIN 7
+#define MP_PERIPHERAL_MUX 3 // 'n'th group of 2 pins
+#define USARTx SERCOM0 // SERCOM0: tx/rx
+#define MP_PORT_FUNC 0x33 // Sets PMUXE & PMUXO to the Alternative Function.A-H=0-7
+#define MP_RXPO_PAD 3 // RXPO- Receive Data Pinout
+#define MP_TXPO_PAD 2 // TXPO- Tranmit Data Pinout
+#define MP_SERCOMx SERCOM0_ // APBCMASK
+#define MP_SERCOM_GCLK_ID_x_CORE GCLK_CLKCTRL_ID_SERCOM0_CORE // Generic Clock Control
diff --git a/ports/samd/boards/ADAFRUIT_TRINKET_M0/mpconfigboard.mk b/ports/samd/boards/ADAFRUIT_TRINKET_M0/mpconfigboard.mk
index 5b4d0b63e7e5a..448da296f46a8 100644
--- a/ports/samd/boards/ADAFRUIT_TRINKET_M0/mpconfigboard.mk
+++ b/ports/samd/boards/ADAFRUIT_TRINKET_M0/mpconfigboard.mk
@@ -2,3 +2,7 @@ MCU_SERIES = SAMD21
 CMSIS_MCU = SAMD21E18A
 LD_FILES = boards/samd21x18a.ld sections.ld
 TEXT0 = 0x2000
+
+# The ?='s allow overriding in mpconfigboard.mk.
+# MicroPython settings
+MICROPY_VFS_LFS1 ?= 1
diff --git a/ports/samd/boards/ADAFRUIT_TRINKET_M0/pins.c b/ports/samd/boards/ADAFRUIT_TRINKET_M0/pins.c
new file mode 100644
index 0000000000000..9fecddb6cd872
--- /dev/null
+++ b/ports/samd/boards/ADAFRUIT_TRINKET_M0/pins.c
@@ -0,0 +1,43 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Peter van der Burg
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * Used by machine_pin.c. Holds Board/MCU specific Pin allocations.
+ */
+
+#include "modmachine.h"
+#include "pins.h"
+
+// Ensure Declaration in 'pins.h' reflects # of Pins defined here.
+const machine_pin_obj_t machine_pin_obj[] = {
+    {{&machine_pin_type}, PIN_PA08}, // D0
+    {{&machine_pin_type}, PIN_PA02}, // D1
+    {{&machine_pin_type}, PIN_PA09}, // D2
+    {{&machine_pin_type}, PIN_PA07}, // D3/ RxD
+    {{&machine_pin_type}, PIN_PA06}, // D4/ TxD
+};
+
+const machine_led_obj_t machine_led_obj[] = {
+    {{&machine_led_type}, PIN_PA10}, // user LED
+};
diff --git a/ports/samd/boards/ADAFRUIT_TRINKET_M0/pins.h b/ports/samd/boards/ADAFRUIT_TRINKET_M0/pins.h
new file mode 100644
index 0000000000000..843d69addc0f2
--- /dev/null
+++ b/ports/samd/boards/ADAFRUIT_TRINKET_M0/pins.h
@@ -0,0 +1,42 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Peter van der Burg
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * Used by machine_pin.c & board specific pins.c. Holds Board/MCU specific Pin
+ * allocations.
+ */
+
+typedef struct _machine_pin_obj_t {
+    mp_obj_base_t base;
+    uint32_t id;
+} machine_pin_obj_t;
+
+typedef struct _machine_led_obj_t {
+    mp_obj_base_t base;
+    uint32_t id;
+} machine_led_obj_t;
+
+// MUST explicitly hold array # of rows, else machine_pin.c wont compile.
+extern const machine_pin_obj_t machine_pin_obj[5];
+extern const machine_led_obj_t machine_led_obj[1];

From 771d673e5cc92405e6d96d80f8367ecbf5da1505 Mon Sep 17 00:00:00 2001
From: Peter van der Burg <vdb_peter@hotmail.com>
Date: Sat, 22 May 2021 17:02:04 +1000
Subject: [PATCH 1417/3533] samd/boards/SAMD21_XPLAINED_PRO: Update for flash
 and pins.

- mpconfigboard.h: flash and USART config
- mpconfigboard.mk: enable LFS1
- pins.c: define pins and LEDs
- pins.h: define structs and consts
---
 .../SAMD21_XPLAINED_PRO/mpconfigboard.h       | 26 ++++++
 .../SAMD21_XPLAINED_PRO/mpconfigboard.mk      |  4 +
 ports/samd/boards/SAMD21_XPLAINED_PRO/pins.c  | 91 +++++++++++++++++++
 ports/samd/boards/SAMD21_XPLAINED_PRO/pins.h  | 42 +++++++++
 4 files changed, 163 insertions(+)
 create mode 100644 ports/samd/boards/SAMD21_XPLAINED_PRO/pins.c
 create mode 100644 ports/samd/boards/SAMD21_XPLAINED_PRO/pins.h

diff --git a/ports/samd/boards/SAMD21_XPLAINED_PRO/mpconfigboard.h b/ports/samd/boards/SAMD21_XPLAINED_PRO/mpconfigboard.h
index c69b5b4c149de..a7dbf76144bc7 100644
--- a/ports/samd/boards/SAMD21_XPLAINED_PRO/mpconfigboard.h
+++ b/ports/samd/boards/SAMD21_XPLAINED_PRO/mpconfigboard.h
@@ -1,2 +1,28 @@
 #define MICROPY_HW_BOARD_NAME "SAMD21-XPLAINED-PRO"
 #define MICROPY_HW_MCU_NAME   "SAMD21J18A"
+
+// MicroPython configs
+// samd_flash.c flash parameters
+// Build a 64k Flash storage at top. 256k-64k=196k
+// 256*1024=262144 minus 64*1024=65536 = 196608 = 0x30000
+#define MICROPY_HW_FLASH_STORAGE_BASE       (0x30000)
+#define MICROPY_HW_FLASH_STORAGE_BYTES      (0xFFFF)
+#define VFS_BLOCK_SIZE_BYTES                (1536) // 24x 64B flash pages;
+
+// ASF4 MCU package specific Pin definitions
+#include "samd21j18a.h"
+
+// Please consult the SAM_D21 Datasheet, I/O Multiplexing and Considerations.
+// USART pin assignments: (This board has 3 USARTS brought out to the pins. See https://docs.zephyrproject.org/1.14.1/boards/arm/atsamd21_xpro/doc/index.html#serial-port )
+// Tx=PA10=SERCOM0/PAD[2], Rx=PA11=SERCOM0/PAD[3]
+#define CPU_FREQ (48000000) // For selecting Baud from clock.
+#define MP_PIN_GRP 1 // A=0, B=1
+#define MP_TX_PIN 10 // 'n'
+#define MP_RX_PIN 11
+#define MP_PERIPHERAL_MUX 5 // 'n'th group of 2 pins
+#define USARTx SERCOM0 // SERCOM0: tx/rx
+#define MP_PORT_FUNC 0x22 // Sets PMUXE & PMUXO to the Alternative Function.(A-H=0-7)
+#define MP_RXPO_PAD 3 // RXPO- Receive Data Pinout
+#define MP_TXPO_PAD 2 // TXPO- Tranmit Data Pinout
+#define MP_SERCOMx SERCOM0_ // APBCMASK
+#define MP_SERCOM_GCLK_ID_x_CORE GCLK_CLKCTRL_ID_SERCOM0_CORE // Generic Clock Control
diff --git a/ports/samd/boards/SAMD21_XPLAINED_PRO/mpconfigboard.mk b/ports/samd/boards/SAMD21_XPLAINED_PRO/mpconfigboard.mk
index f95c6549381ba..b298c9d7fcdf5 100644
--- a/ports/samd/boards/SAMD21_XPLAINED_PRO/mpconfigboard.mk
+++ b/ports/samd/boards/SAMD21_XPLAINED_PRO/mpconfigboard.mk
@@ -2,3 +2,7 @@ MCU_SERIES = SAMD21
 CMSIS_MCU = SAMD21J18A
 LD_FILES = boards/samd21x18a.ld sections.ld
 TEXT0 = 0x2000
+
+# The ?='s allow overriding in mpconfigboard.mk.
+# MicroPython settings
+MICROPY_VFS_LFS1 ?= 1
\ No newline at end of file
diff --git a/ports/samd/boards/SAMD21_XPLAINED_PRO/pins.c b/ports/samd/boards/SAMD21_XPLAINED_PRO/pins.c
new file mode 100644
index 0000000000000..2a2d50eb48fcc
--- /dev/null
+++ b/ports/samd/boards/SAMD21_XPLAINED_PRO/pins.c
@@ -0,0 +1,91 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Peter van der Burg
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * Used by machine_pin.c. Holds Board/MCU specific Pin allocations.
+ */
+
+#include "modmachine.h"
+#include "pins.h"
+
+// Ensure Declaration in 'pins.h' reflects # of Pins defined here.
+const machine_pin_obj_t machine_pin_obj[] = {
+    // EXT1
+    {{&machine_pin_type}, PIN_PB00}, // PIN3_ADC(+)
+    {{&machine_pin_type}, PIN_PB01}, // PIN4_ADC(-)
+    {{&machine_pin_type}, PIN_PB06}, // PIN5_GPIO
+    {{&machine_pin_type}, PIN_PB07}, // PIN6_GPIO
+    {{&machine_pin_type}, PIN_PB02}, // PIN7_PWM(+)
+    {{&machine_pin_type}, PIN_PB03}, // PIN8_PWM(-)
+    {{&machine_pin_type}, PIN_PB04}, // PIN9_IRQ/GPIO
+    {{&machine_pin_type}, PIN_PB05}, // PIN10_SPI_SS_B/GPIO
+    {{&machine_pin_type}, PIN_PA08}, // PIN11_TWI_SDA
+    {{&machine_pin_type}, PIN_PA09}, // PIN12_TWI_SCL
+    {{&machine_pin_type}, PIN_PB09}, // PIN13_UART_RX
+    {{&machine_pin_type}, PIN_PB08}, // PIN14_UART_TX
+    {{&machine_pin_type}, PIN_PA05}, // PIN15_SPI_SS_A
+    {{&machine_pin_type}, PIN_PA06}, // PIN16_SPI_MOSI
+    {{&machine_pin_type}, PIN_PA04}, // PIN17_SPI_MISO
+    {{&machine_pin_type}, PIN_PA07}, // PIN18_SPI_SCK
+
+    // EXT2
+    {{&machine_pin_type}, PIN_PA10}, // PIN3_ADC(+)
+    {{&machine_pin_type}, PIN_PA11}, // PIN4_ADC(-)
+    {{&machine_pin_type}, PIN_PA20}, // PIN5_GPIO
+    {{&machine_pin_type}, PIN_PA21}, // PIN6_GPIO
+    {{&machine_pin_type}, PIN_PB12}, // PIN7_PWM(+)
+    {{&machine_pin_type}, PIN_PB13}, // PIN8_PWM(-)
+    {{&machine_pin_type}, PIN_PB14}, // PIN9_IRQ/GPIO
+    {{&machine_pin_type}, PIN_PB15}, // PIN10_SPI_SS_B/GPIO
+    {{NULL}, -1}, // PIN_PA08/ PIN11_TWI_SDA already defined
+    {{NULL}, -1}, // PIN_PA09/ PIN12_TWI_SCL already defined
+    {{&machine_pin_type}, PIN_PB11}, // PIN13_UART_RX
+    {{&machine_pin_type}, PIN_PB10}, // PIN14_UART_TX
+    {{&machine_pin_type}, PIN_PA17}, // PIN15_SPI_SS_A
+    {{&machine_pin_type}, PIN_PA18}, // PIN16_SPI_MOSI
+    {{&machine_pin_type}, PIN_PA16}, // PIN17_SPI_MISO
+    {{&machine_pin_type}, PIN_PA19}, // PIN18_SPI_SCK
+
+    // EXT3
+    {{&machine_pin_type}, PIN_PA02}, // PIN3_ADC(+)
+    {{&machine_pin_type}, PIN_PA03}, // PIN4_ADC(-)
+    {{NULL}, -1}, // PIN_PB30/ PIN5_GPIO already defined
+    {{&machine_pin_type}, PIN_PA15}, // PIN6_GPIO; USER_BUTTON
+    {{&machine_pin_type}, PIN_PA12}, // PIN7_PWM(+)
+    {{&machine_pin_type}, PIN_PA13}, // PIN8_PWM(-)
+    {{&machine_pin_type}, PIN_PA28}, // PIN9_IRQ/GPIO
+    {{&machine_pin_type}, PIN_PA27}, // PIN10_SPI_SS_B/GPIO
+    {{NULL}, -1}, // PIN_PA08/ PIN11_TWI_SDA already defined
+    {{NULL}, -1}, // PIN_PA09/ PIN12_TWI_SCL already defined
+    {{NULL}, -1}, // PIN_PB11/ PIN13_UART_RX already defined
+    {{NULL}, -1}, // PIN_PB10/ PIN14_UART_TX already defined
+    {{&machine_pin_type}, PIN_PB17}, // PIN15_SPI_SS_A
+    {{&machine_pin_type}, PIN_PB22}, // PIN16_SPI_MOSI
+    {{&machine_pin_type}, PIN_PB16}, // PIN17_SPI_MISO
+    {{&machine_pin_type}, PIN_PB23}, // PIN18_SPI_SCK
+};
+
+const machine_led_obj_t machine_led_obj[] = {
+    {{&machine_led_type}, PIN_PB30}, // USER_LED
+};
diff --git a/ports/samd/boards/SAMD21_XPLAINED_PRO/pins.h b/ports/samd/boards/SAMD21_XPLAINED_PRO/pins.h
new file mode 100644
index 0000000000000..0b0e878b43e1f
--- /dev/null
+++ b/ports/samd/boards/SAMD21_XPLAINED_PRO/pins.h
@@ -0,0 +1,42 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Peter van der Burg
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * Used by machine_pin.c & board specific pins.c. Holds Board/MCU specific Pin
+ * allocations.
+ */
+
+typedef struct _machine_pin_obj_t {
+    mp_obj_base_t base;
+    uint32_t id;
+} machine_pin_obj_t;
+
+typedef struct _machine_led_obj_t {
+    mp_obj_base_t base;
+    uint32_t id;
+} machine_led_obj_t;
+
+// MUST explicitly hold array # of rows, else machine_pin.c wont compile.
+extern const machine_pin_obj_t machine_pin_obj[48];
+extern const machine_led_obj_t machine_led_obj[1];

From ef4e63aabc15498ff4e26455c43ac535e14a7f2b Mon Sep 17 00:00:00 2001
From: Peter van der Burg <vdb_peter@hotmail.com>
Date: Thu, 20 May 2021 17:50:08 +1000
Subject: [PATCH 1418/3533] samd/boards/SEEED_WIO_TERMINAL: Add new board
 definition.

---
 .../samd/boards/SEEED_WIO_TERMINAL/board.json | 20 +++++++
 .../boards/SEEED_WIO_TERMINAL/mpconfigboard.h | 32 ++++++++++
 .../SEEED_WIO_TERMINAL/mpconfigboard.mk       |  8 +++
 ports/samd/boards/SEEED_WIO_TERMINAL/pins.c   | 60 +++++++++++++++++++
 ports/samd/boards/SEEED_WIO_TERMINAL/pins.h   | 42 +++++++++++++
 5 files changed, 162 insertions(+)
 create mode 100644 ports/samd/boards/SEEED_WIO_TERMINAL/board.json
 create mode 100644 ports/samd/boards/SEEED_WIO_TERMINAL/mpconfigboard.h
 create mode 100644 ports/samd/boards/SEEED_WIO_TERMINAL/mpconfigboard.mk
 create mode 100644 ports/samd/boards/SEEED_WIO_TERMINAL/pins.c
 create mode 100644 ports/samd/boards/SEEED_WIO_TERMINAL/pins.h

diff --git a/ports/samd/boards/SEEED_WIO_TERMINAL/board.json b/ports/samd/boards/SEEED_WIO_TERMINAL/board.json
new file mode 100644
index 0000000000000..350ada4c4a82f
--- /dev/null
+++ b/ports/samd/boards/SEEED_WIO_TERMINAL/board.json
@@ -0,0 +1,20 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [
+        "USB-C",
+        "Display",
+        "Grove",
+        "WiFi",
+        "BLE",
+        "SDCard"
+    ],
+    "images": ["wio-terminal.jpg"],
+    "mcu": "samd51",
+    "product": "Wio Terminal D51R",
+    "thumbnail": "",
+    "url": "https://www.seeedstudio.com/Wio-Terminal-p-4509.html",
+    "vendor": "Seeed Studio"
+}
diff --git a/ports/samd/boards/SEEED_WIO_TERMINAL/mpconfigboard.h b/ports/samd/boards/SEEED_WIO_TERMINAL/mpconfigboard.h
new file mode 100644
index 0000000000000..290bd802b8a0b
--- /dev/null
+++ b/ports/samd/boards/SEEED_WIO_TERMINAL/mpconfigboard.h
@@ -0,0 +1,32 @@
+#define MICROPY_HW_BOARD_NAME "Wio Terminal D51R"
+#define MICROPY_HW_MCU_NAME   "SAMD51P19A"
+
+#define MICROPY_FLOAT_IMPL              (MICROPY_FLOAT_IMPL_FLOAT)
+#define MICROPY_PY_BUILTINS_COMPLEX     (0)
+#define MICROPY_PY_MATH                 (0)
+#define MICROPY_PY_CMATH                (0)
+
+// MicroPython configs
+// samd_flash.c flash parameters
+// Build a 128k Flash storage at top. 512k-128k=384k=0x60000
+// 512*1024= 0x80000 minus 128*1024= 0x20000 =  0x60000
+#define MICROPY_HW_FLASH_STORAGE_BASE       (0x60000)
+#define MICROPY_HW_FLASH_STORAGE_BYTES      (0x1FFFF)
+#define VFS_BLOCK_SIZE_BYTES                (1536) // 24x 64B flash pages;
+
+// ASF4 MCU package specific Pin definitions
+#include "samd51p19a.h"
+
+// Please consult the SAM_D51 Datasheet, I/O Multiplexing and Considerations.
+// WIO_Terminal USART pin assignments: Tx=BCM14=PB27=SERCOM2/PAD[0], Rx=BCM15=PB26=SERCOM2/PAD[1]
+#define CPU_FREQ (48000000) // For selecting Baud from clock.
+#define MP_PIN_GRP 1 // A-D=0-3
+#define MP_TX_PIN 27
+#define MP_RX_PIN 26 // 'n'
+#define MP_PERIPHERAL_MUX 13 // 'n'th group of 2 pins
+#define USARTx SERCOM2 //
+#define MP_PORT_FUNC 0x22 // Sets PMUXE & PMUXO to the Alternative Function.A-N=0-13
+#define MP_RXPO_PAD 1 // RXPO- Receive Data Pinout
+#define MP_TXPO_PAD 0 // TXPO- Tranmit Data Pinout
+#define MP_SERCOMx SERCOM2_ // APBCMASK
+#define MP_SERCOM_GCLK_ID_x_CORE SERCOM2_GCLK_ID_CORE
diff --git a/ports/samd/boards/SEEED_WIO_TERMINAL/mpconfigboard.mk b/ports/samd/boards/SEEED_WIO_TERMINAL/mpconfigboard.mk
new file mode 100644
index 0000000000000..90fb7f2dd076a
--- /dev/null
+++ b/ports/samd/boards/SEEED_WIO_TERMINAL/mpconfigboard.mk
@@ -0,0 +1,8 @@
+MCU_SERIES = SAMD51
+CMSIS_MCU = SAMD51P19A
+LD_FILES = boards/samd51p19a.ld sections.ld
+TEXT0 = 0x4000
+
+# The ?='s allow overriding in mpconfigboard.mk.
+# MicroPython settings
+MICROPY_VFS_LFS1 ?= 1
diff --git a/ports/samd/boards/SEEED_WIO_TERMINAL/pins.c b/ports/samd/boards/SEEED_WIO_TERMINAL/pins.c
new file mode 100644
index 0000000000000..9862552fa3d85
--- /dev/null
+++ b/ports/samd/boards/SEEED_WIO_TERMINAL/pins.c
@@ -0,0 +1,60 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Peter van der Burg
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * Used by machine_pin.c. Holds Board/MCU specific Pin allocations.
+ */
+
+#include "modmachine.h"
+#include "pins.h"
+
+// Ensure Declaration in "pins.h" reflects # of Pins defined here.
+const machine_pin_obj_t machine_pin_obj[] = {
+    {{&machine_pin_type}, PIN_PB08}, // A0/D0
+    {{&machine_pin_type}, PIN_PB09}, // A1/D1
+    {{&machine_pin_type}, PIN_PA07}, // A2/D2
+    {{&machine_pin_type}, PIN_PB04}, // A3/D3
+    {{&machine_pin_type}, PIN_PB05}, // A4/D4
+    {{&machine_pin_type}, PIN_PB06}, // A5/D5
+    {{&machine_pin_type}, PIN_PA04}, // A6/D6
+    {{&machine_pin_type}, PIN_PB07}, // A7/D7
+    {{&machine_pin_type}, PIN_PA06}, // A8/D8
+    {{&machine_pin_type}, PIN_PD08}, // SWITCH_X
+    {{&machine_pin_type}, PIN_PD09}, // SWITCH_Y
+    {{&machine_pin_type}, PIN_PD10}, // SWITCH_Z
+    {{&machine_pin_type}, PIN_PD12}, // SWITCH_B
+    {{&machine_pin_type}, PIN_PD20}, // SWITCH_U
+    {{&machine_pin_type}, PIN_PC26}, // BUTTON_1
+    {{&machine_pin_type}, PIN_PC27}, // BUTTON_2
+    {{&machine_pin_type}, PIN_PC28}, // BUTTON_3
+    {{&machine_pin_type}, PIN_PD11}, // BUZZER_CTR
+    {{&machine_pin_type}, PIN_PC14}, // 5V_OUTPUT_CTR- enable 5V on hdr
+    {{&machine_pin_type}, PIN_PC15}, // 3V3_OUTPUT_CTR- enable 3V3 on hdr
+};
+
+// Ensure Declaration in 'pins.h' reflects # of Pins defined here.
+const machine_led_obj_t machine_led_obj[] = {
+    {{&machine_led_type}, PIN_PA15}, // USER_LED (Blue)
+    {{&machine_led_type}, PIN_PC05}, // LCD_BACKLIGHT_CTR
+};
diff --git a/ports/samd/boards/SEEED_WIO_TERMINAL/pins.h b/ports/samd/boards/SEEED_WIO_TERMINAL/pins.h
new file mode 100644
index 0000000000000..45ecc254f11ee
--- /dev/null
+++ b/ports/samd/boards/SEEED_WIO_TERMINAL/pins.h
@@ -0,0 +1,42 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Peter van der Burg
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * Used by machine_pin.c & board specific pins.c. Holds Board/MCU specific Pin
+ * allocations.
+ */
+
+typedef struct _machine_pin_obj_t {
+    mp_obj_base_t base;
+    uint32_t id;
+} machine_pin_obj_t;
+
+typedef struct _machine_led_obj_t {
+    mp_obj_base_t base;
+    uint32_t id;
+} machine_led_obj_t;
+
+// MUST explicitly hold array # of rows, else machine_pin.c wont compile.
+extern const machine_pin_obj_t machine_pin_obj[20];
+extern const machine_led_obj_t machine_led_obj[2];

From b991902983d21f733f8ff0009d75e5362fc46900 Mon Sep 17 00:00:00 2001
From: Peter van der Burg <vdb_peter@hotmail.com>
Date: Thu, 20 May 2021 17:52:53 +1000
Subject: [PATCH 1419/3533] samd/boards/SEEED_XIAO: Add new board definition.

---
 ports/samd/boards/SEEED_XIAO/board.json       | 15 ++++++
 ports/samd/boards/SEEED_XIAO/mpconfigboard.h  | 27 ++++++++++
 ports/samd/boards/SEEED_XIAO/mpconfigboard.mk |  9 ++++
 ports/samd/boards/SEEED_XIAO/pins.c           | 52 +++++++++++++++++++
 ports/samd/boards/SEEED_XIAO/pins.h           | 42 +++++++++++++++
 5 files changed, 145 insertions(+)
 create mode 100644 ports/samd/boards/SEEED_XIAO/board.json
 create mode 100644 ports/samd/boards/SEEED_XIAO/mpconfigboard.h
 create mode 100644 ports/samd/boards/SEEED_XIAO/mpconfigboard.mk
 create mode 100644 ports/samd/boards/SEEED_XIAO/pins.c
 create mode 100644 ports/samd/boards/SEEED_XIAO/pins.h

diff --git a/ports/samd/boards/SEEED_XIAO/board.json b/ports/samd/boards/SEEED_XIAO/board.json
new file mode 100644
index 0000000000000..f5fe27184724e
--- /dev/null
+++ b/ports/samd/boards/SEEED_XIAO/board.json
@@ -0,0 +1,15 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [
+        "USB-C"
+    ],
+    "images": ["seeeduino-xiao.jpg"],
+    "mcu": "samd21",
+    "product": "Seeeduino XIAO",
+    "thumbnail": "",
+    "url": "https://www.seeedstudio.com/Seeeduino-XIAO-Arduino-Microcontroller-SAMD21-Cortex-M0+-p-4426.html",
+    "vendor": "Seeed Studio"
+}
diff --git a/ports/samd/boards/SEEED_XIAO/mpconfigboard.h b/ports/samd/boards/SEEED_XIAO/mpconfigboard.h
new file mode 100644
index 0000000000000..6422d7ea0232e
--- /dev/null
+++ b/ports/samd/boards/SEEED_XIAO/mpconfigboard.h
@@ -0,0 +1,27 @@
+#define MICROPY_HW_BOARD_NAME "Seeed Xiao"
+#define MICROPY_HW_MCU_NAME   "SAMD21G18A"
+
+// MicroPython configs
+// samd_flash.c flash parameters
+// Build a 64k Flash storage at top. 256k-64k=196k
+// 256*1024=262144 minus 64*1024=65536 = 196608 = 0x30000
+#define MICROPY_HW_FLASH_STORAGE_BASE       (0x30000)
+#define MICROPY_HW_FLASH_STORAGE_BYTES      (0xFFFF)
+#define VFS_BLOCK_SIZE_BYTES                (1536) // 24x 64B flash pages;
+
+// ASF4 MCU package specific Pin definitions
+#include "samd21g18a.h"
+
+// Please consult the SAM_D21 Datasheet, I/O Multiplexing and Considerations.
+// XIAO_M0 USART pin assignments: Tx=A6=PB8=SERCOM4/PAD[0], Rx=PB9=A7=SERCOM4/PAD[1]
+#define CPU_FREQ (48000000) // For selecting Baud from clock.
+#define MP_PIN_GRP 1 // A=0, B=1
+#define MP_TX_PIN 8 // 'n'
+#define MP_RX_PIN 9
+#define MP_PERIPHERAL_MUX 4 // 'n'th group of 2 pins
+#define USARTx SERCOM4 // SERCOM4:XIAO_M0 tx/rx
+#define MP_PORT_FUNC 0x33 // Sets PMUXE & PMUXO to the Alternative Function.A-H=0-7
+#define MP_RXPO_PAD 1 // RXPO- Receive Data Pinout
+#define MP_TXPO_PAD 0 // TXPO- Tranmit Data Pinout
+#define MP_SERCOMx SERCOM4_ // APBCMASK
+#define MP_SERCOM_GCLK_ID_x_CORE GCLK_CLKCTRL_ID_SERCOM4_CORE // Generic Clock Control
diff --git a/ports/samd/boards/SEEED_XIAO/mpconfigboard.mk b/ports/samd/boards/SEEED_XIAO/mpconfigboard.mk
new file mode 100644
index 0000000000000..eb4d4d045e97b
--- /dev/null
+++ b/ports/samd/boards/SEEED_XIAO/mpconfigboard.mk
@@ -0,0 +1,9 @@
+MCU_SERIES = SAMD21
+CMSIS_MCU = SAMD21G18A
+LD_FILES = boards/samd21x18a.ld sections.ld
+TEXT0 = 0x2000
+
+# The ?='s allow overriding in mpconfigboard.mk.
+# MicroPython settings
+MICROPY_VFS_LFS1 ?= 1
+
diff --git a/ports/samd/boards/SEEED_XIAO/pins.c b/ports/samd/boards/SEEED_XIAO/pins.c
new file mode 100644
index 0000000000000..6043913d2badb
--- /dev/null
+++ b/ports/samd/boards/SEEED_XIAO/pins.c
@@ -0,0 +1,52 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Peter van der Burg
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * Used by machine_pin.c. Holds Board/MCU specific Pin allocations.
+ */
+
+#include "modmachine.h"
+#include "pins.h"
+
+// Ensure Declaration in 'pins.h' reflects # of Pins defined here.
+const machine_pin_obj_t machine_pin_obj[] = {
+    {{&machine_pin_type}, PIN_PA02}, // A0/D0
+    {{&machine_pin_type}, PIN_PA04}, // A1/D1
+    {{&machine_pin_type}, PIN_PA10}, // A2/D2
+    {{&machine_pin_type}, PIN_PA11}, // A3/D3
+    {{&machine_pin_type}, PIN_PA08}, // A4/D4
+    {{&machine_pin_type}, PIN_PA09}, // A5/D5
+    {{&machine_pin_type}, PIN_PB08}, // A6/D6
+    {{&machine_pin_type}, PIN_PB09}, // A7/D7
+    {{&machine_pin_type}, PIN_PA07}, // A8/D8
+    {{&machine_pin_type}, PIN_PA05}, // A9/D9
+    {{&machine_pin_type}, PIN_PA06}, // A10/D10
+};
+
+const machine_led_obj_t machine_led_obj[] = {
+// XIAO: Just the available LED Pins: User LED (PA17), Rx & Tx.
+    {{&machine_led_type}, PIN_PA17}, // W13
+    {{&machine_led_type}, PIN_PA18}, // RX_LED
+    {{&machine_led_type}, PIN_PA19}, // TX_LED
+};
diff --git a/ports/samd/boards/SEEED_XIAO/pins.h b/ports/samd/boards/SEEED_XIAO/pins.h
new file mode 100644
index 0000000000000..226b3f1d7b07a
--- /dev/null
+++ b/ports/samd/boards/SEEED_XIAO/pins.h
@@ -0,0 +1,42 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Peter van der Burg
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * Used by machine_pin.c & board specific pins.c. Holds Board/MCU specific Pin
+ * allocations.
+ */
+
+typedef struct _machine_pin_obj_t {
+    mp_obj_base_t base;
+    uint32_t id;
+} machine_pin_obj_t;
+
+typedef struct _machine_led_obj_t {
+    mp_obj_base_t base;
+    uint32_t id;
+} machine_led_obj_t;
+
+// MUST explicitly hold array # of rows, else machine_pin.c wont compile.
+extern const machine_pin_obj_t machine_pin_obj[11];
+extern const machine_led_obj_t machine_led_obj[3];

From 3dc9a42bc2a048153be742f96bd3d7f0a030ea84 Mon Sep 17 00:00:00 2001
From: Peter van der Burg <vdb_peter@hotmail.com>
Date: Mon, 24 May 2021 15:55:30 +1000
Subject: [PATCH 1420/3533] samd/README.md: Update README to reflect new
 features and boards.

---
 ports/samd/README.md | 141 ++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 140 insertions(+), 1 deletion(-)

diff --git a/ports/samd/README.md b/ports/samd/README.md
index b2ff4023ece75..4b434963d9798 100644
--- a/ports/samd/README.md
+++ b/ports/samd/README.md
@@ -3,5 +3,144 @@ Port of MicroPython to Microchip SAMD MCUs
 
 Supports SAMD21 and SAMD51.
 
-Features:
+## Features:
+
+### REPL
+
 - REPL over USB VCP
+- REPL over USART using board specified USART pins (initialised on startup).
+  - The USART Pins are board specific, defined in `boards/$(BOARD)/mpconfigboard.h`,
+    and set at compile time. See the table below. At this stage, the USART cannot be
+    moved to different pins unless `mpconfigboard.h` is edited and the port recompiled.
+  - Two USART functions are accessible through MicroPython:
+    - `uart_init()`. The 'C' function behind this function is what initialises the
+      USART on startup. Calling this function in MicroPython resets any other peripheral
+      operating on these pins and reconnects the USART SERCOM to the designated pins.
+    - `uart_deinit()`. This simply 'disconnects' the SERCOM from the pins. The USART
+      remains operating over USB VCP to maintain access to the REPL.
+
+### Boards
+
+| Board                                                        | USART                                                       | LFS1 Flash size | Tested |
+| ------------------------------------------------------------ | ----------------------------------------------------------- | --------------- | ------ |
+| ADAFRUIT_FEATHER_M0_EXPRESS                                  | Tx=PA10=SERCOM0/PAD[2], Rx=PA11=SERCOM0/PAD[3]              | 64k             | No     |
+| ADAFRUIT_ITSYBITSY_M4_EXPRESS                                | Tx=TX_D1=PA17=SERCOM3/PAD[0],  Rx=RX_D0=PA16=SERCOM3/PAD[1] | 128k            | No     |
+| ADAFRUIT_TRINKET_M0                                          | Tx=D4=PA06=SERCOM0/PAD[2], Rx=D3=PA07=SERCOM0/PAD[3]        | 64k             | No     |
+| MINISAM_M4                                                   | Tx=TX_D1=PA17=SERCOM3/PAD[0], Rx=RX_D0=PA16=SERCOM3/PAD[1]  | 128k            | No     |
+| SAMD21_XPLAINED_PRO                                          | Tx=PA10=SERCOM0/PAD[2], Rx=PA11=SERCOM0/PAD[3]              | 64k             | No     |
+| SEEED_WIO_TERMINAL                                           | Tx=BCM14=PB27=SERCOM2/PAD[0], Rx=BCM15=PB26=SERCOM2/PAD[1]  | 128k            | Yes    |
+| SEEED_XIAO                                                   | Tx=A6=PB8=SERCOM4/PAD[0], Rx=A7=PB9=SERCOM4/PAD[1]          | 64k             | Yes    |
+
+Note: all USARTs are set to: async, 8 bit, 1 stop bit, no parity, 115200 bps.
+
+### Modules
+
+- Internal modules and functions:
+
+`>>>help('modules')`
+`__main__          micropython       uheapq            ustruct`
+`_boot             samd              uio               usys`
+`_uasyncio         uarray            ujson             utime`
+`builtins          uasyncio          uos               uzlib`
+`gc                ubinascii         urandom`
+`machine           uctypes           ure`
+`Plus any modules on the filesystem`
+
+#### Flash
+
+- Internal Flash Block Device `samd.Flash()` initialised with littlefs1 in frozen module '`_boot.py`'.
+
+- **No external SPI Flash driver** (ToDo).
+
+- Block Device size is set in `ports/samd/boards/$(BOARD)/mpconfigboard.h` :
+
+  - SAMD21: (eg; SEEED_XIAO): 64k `0xFFFF`
+
+   *  SAMD51: (eg; M4's): 128k `0x1FFFF`
+
+#### Pins & LEDs
+
+##### `machine.Pin()` class.
+
+- GPIO methods & constants:
+
+    value           IN              OUT             PULL_DOWN
+    PULL_UP         high            init            low
+    off             on              toggle
+
+- Each board has its own pin numbering scheme, so please see the table below (the
+  structure is defined in`boards/$(BOARD)/pins.c`) for pin numbers referenced
+  (index) by 'Pin'. Eg; `SEEED_XIAO/pins.c`: `{{&machine_pin_type}, PIN_PA02}, // A0/D0`
+  means MicroPython `Pin(0)` is SEEED_XIAO pin "A0/D0" on SAMD21G18A PortA, Pin2.
+
+- Note: on the SEEED_XIAO, if the TX & TX pins are used by the `Pin()` class, the `Pin()`
+  initialisation disconnects the pins from the SERCOM similar to the way
+  `machine.uart_deinit()` does.
+
+| MicroPython Pin() | SAMD51 Pin#/  ItsyBitsy_M4 | SAMD21 Pin#/  Feather_M0 | SAMD21 Pin#/  Xplained Pro          | SAMD21 Pin#/  Trinket_M0 | SAMD51 Pin#/ Minisam | SAMD21 Pin#/ SEEED_XIAO | SAMD51 Pin#/  SEEED_WIO_TERMINAL      |
+| ----------------- | -------------------------- | ------------------------ | ----------------------------------- | ------------------------ | -------------------- | ----------------------- | ------------------------------------- |
+| Pin(0)            | PA16/ RX_D0                | PA11/ D0                 | PB00/ PIN3_ADC(+) (ext1)            | PA08/ D0                 | PA02/ A0,D9          | PA02 / A0/D0            | PB08 / A0/D0                          |
+| Pin(1)            | PA17/ TX_D1                | PA10/ D1                 | PB01/ PIN4_ADC(-) (ext1)            | PA02/ D1                 | PB08/ A1,D10         | PA04 / A1/D1            | PB09 / A1/D1                          |
+| Pin(2)            | PA07/ D2                   | PA14/ D2                 | PB06/ PIN5_GPIO (ext1)              | PA09/ D2                 | PB09/ A2,D11         | PA10 / A2/D2            | PA07 / A2/D2                          |
+| Pin(3)            | PB22/ D3                   | PA09/ D3/                | PB07/ PIN6_GPIO (ext1)              | PA07/ D3/ RxD            | PA04/ A3,D12         | PA11 / A3/D3            | PB04 / A3/D3                          |
+| Pin(4)            | PA14/ D4                   | PA08/ D4/                | PB02/ PIN7_PWM(+) (ext1)            | PA06/ D4/ TxD            | PA05/ A4,D13         | PA08 / A4/D4            | PB05 / A4/D4                          |
+| Pin(5)            | PA15/ D5                   | PA15/ D5                 | PB03/ PIN8_PWM(-) (ext1)            |                          | PA06/ A5             | PA09 / A5/D5            | PB06 / A5/D5                          |
+| Pin(6)            | -1/ D6                     | PA20/ D6                 | PB04/ PIN9_IRQ/GPIO (ext1)          |                          | PA16/ RX_D0          | PB08 / A6/D6/TX         | PA04 / A6/D6                          |
+| Pin(7)            | PA18/ D7                   | PA21/ D7                 | PB05/ PIN10_SPI_SS_B/GPIO (ext1)    |                          | PA17/ TX_D1          | PB09 / A7/D7/RX         | PB07 / A7/D7                          |
+| Pin(8)            | -1/ D8                     | PA06/ D8/                | PA08/ PIN11_TWI_SDA (ext1)          |                          | PA07/ D2,A6          | PA07 / A8/D8            | PA06 / A8/D8                          |
+| Pin(9)            | PA19/ D9                   | PA07/ D9/                | PA09/ PIN12_TWI_SCL (ext1)          |                          | PA19/ D3             | PA05 / A9/D9            | PD08 / SWITCH_X                       |
+| Pin(10)           | PA20/ D10                  | PA18/ D10                | PB09/ PIN13_UART_RX (ext1)          |                          | PA20/ D4             | PA06 / A10/D10          | PD09 / SWITCH_Y                       |
+| Pin(11)           | PA21/ D11                  | PA16/ D11                | PB08/ PIN14_UART_TX (ext1)          |                          | PA21/ D5             |                         | PD10 / SWITCH_Z                       |
+| Pin(12)           | PA23/ D12                  | PA19/ D12                | PA05/ PIN15_SPI_SS_A (ext1)         |                          | PA00/ BUTTON         |                         | PD12 / SWITCH_B                       |
+| Pin(13)           | PA22/ D13                  | PA17/ D13/               | PA06/ PIN16_SPI_MOSI (ext1)         |                          |                      |                         | PD20 / SWITCH_U                       |
+| Pin(14)           | PA02/ A0                   | PA02/ A0                 | PA04/ PIN17_SPI_MISO (ext1)         |                          |                      |                         | PC26 / BUTTON_1                       |
+| Pin(15)           | PA05/ A1                   | PB08/ A1                 | PA07/ PIN18_SPI_SCK (ext1)          |                          |                      |                         | PC27 / BUTTON_2                       |
+| Pin(16)           | PB08/ A2                   | PB09/ A2                 | PA10/ PIN3_ADC(+) (ext2)            |                          |                      |                         | PC28 / BUTTON_3                       |
+| Pin(17)           | PB09/ A3                   | PA04/ A3/                | PA11/ PIN4_ADC(-) (ext2)            |                          |                      |                         | PD11 / BUZZER_CTR                     |
+| Pin(18)           | PA04/ A4                   | PA05/ A4/                | PA20/ PIN5_GPIO (ext2)              |                          |                      |                         | PC14/ 5V_OUTPUT_CTR- '1'= 5V on hdr   |
+| Pin(19)           | PA06/ A5                   | PB02/ A5                 | PA21/ PIN6_GPIO (ext2)              |                          |                      |                         | PC15/ 3V3_OUTPUT_CTR- '0'= 3V3 on hdr |
+| Pin(20)           |                            |                          | PB12/ PIN7_PWM(+) (ext2)            |                          |                      |                         |                                       |
+| Pin(21)           |                            |                          | PB13/ PIN8_PWM(-) (ext2)            |                          |                      |                         |                                       |
+| Pin(22)           |                            |                          | PB14/ PIN9_IRQ/GPIO (ext2)          |                          |                      |                         |                                       |
+| Pin(23)           |                            |                          | PB15/ PIN10_SPI_SS_B/GPIO (ext2)    |                          |                      |                         |                                       |
+| Pin(24)           |                            |                          | -1 / PIN11_TWI_SDA already defined  |                          |                      |                         |                                       |
+| Pin(25)           |                            |                          | -1 / PIN12_TWI_SCL already defined  |                          |                      |                         |                                       |
+| Pin(26)           |                            |                          | PB11/ PIN13_UART_RX (ext2)          |                          |                      |                         |                                       |
+| Pin(27)           |                            |                          | PB10/ PIN14_UART_TX (ext2)          |                          |                      |                         |                                       |
+| Pin(28)           |                            |                          | PA17/ PIN15_SPI_SS_A (ext2)         |                          |                      |                         |                                       |
+| Pin(29)           |                            |                          | PA18/ PIN16_SPI_MOSI (ext2)         |                          |                      |                         |                                       |
+| Pin(30)           |                            |                          | PA16/ PIN17_SPI_MISO (ext2)         |                          |                      |                         |                                       |
+| Pin(31)           |                            |                          | PA19/ PIN18_SPI_SCK (ext2)          |                          |                      |                         |                                       |
+| Pin(32)           |                            |                          | PA02/ PIN3_ADC(+) (ext3)            |                          |                      |                         |                                       |
+| Pin(33)           |                            |                          | PA03/ PIN4_ADC(-) (ext3)            |                          |                      |                         |                                       |
+| Pin(34)           |                            |                          | -1/ PIN5_GPIO already defined       |                          |                      |                         |                                       |
+| Pin(35)           |                            |                          | PA15/ PIN6_GPIO; USER_BUTTON (ext3) |                          |                      |                         |                                       |
+| Pin(36)           |                            |                          | PA12/ PIN7_PWM(+) (ext3)            |                          |                      |                         |                                       |
+| Pin(37)           |                            |                          | PA13/ PIN8_PWM(-) (ext3)            |                          |                      |                         |                                       |
+| Pin(38)           |                            |                          | PA28/ PIN9_IRQ/GPIO (ext3)          |                          |                      |                         |                                       |
+| Pin(39)           |                            |                          | PA27/ PIN10_SPI_SS_B/GPIO (ext3)    |                          |                      |                         |                                       |
+| Pin(40)           |                            |                          | -1/ PIN11_TWI_SDA already defined   |                          |                      |                         |                                       |
+| Pin(41)           |                            |                          | -1/ PIN12_TWI_SCL already defined   |                          |                      |                         |                                       |
+| Pin(42)           |                            |                          | -1/ PIN13_UART_RX already defined   |                          |                      |                         |                                       |
+| Pin(43)           |                            |                          | -1/ PIN14_UART_TX already defined   |                          |                      |                         |                                       |
+| Pin(44)           |                            |                          | PA15/ PIN6_GPIO; USER_BUTTON (ext3) |                          |                      |                         |                                       |
+| Pin(45)           |                            |                          | PB22/ PIN16_SPI_MOSI (ext3)         |                          |                      |                         |                                       |
+| Pin(46)           |                            |                          | PB16/ PIN17_SPI_MISO (ext3)         |                          |                      |                         |                                       |
+| Pin(47)           |                            |                          | PB23/ PIN18_SPI_SCK (ext3)          |                          |                      |                         |                                       |
+
+##### `machine.LED()` class.
+
+- GPIO methods & constants:
+
+`value           OUT             high            low`
+`off             on              toggle`
+
+- As above, please see `boards/$(BOARD)/pins.c` for pin numbers referenced by 'LED'.
+Eg; `SEEED_XIAO/pins.c`: `{{&machine_led_type}, PIN_PA17}, // W13` means MicroPython
+`LED(0)` is SEEED_XIAO LED "W13" connected to SAMD21G18A PortA, Pin17.
+
+| MicroPython  LED() | SAMD51 Pin#/  ItsyBitsy_M4 | SAMD21 Pin#/  Feather_M0 | SAMD21 Pin#/  Xplained Pro | SAMD21 Pin#/  Trinket_M0 | SAMD51  Pin#/ Minisam | SAMD21  Pin#/ SEEED_XIAO | SAMD51  Pin#/ SEEED_WIO_TERMINAL |
+| ------------------ | -------------------------- | ------------------------ | -------------------------- | ------------------------ | --------------------- | ------------------------ | -------------------------------- |
+| LED(0)             | PA22/ D13/ user LED        | PA17/ D13/ user LED      | PB30/ USER_LED             | PA10/ USER_LED           | PA15/ LED             | PA17 / W13               | PA15 / USER_LED (Blue)           |
+| LED(1)             |                            |                          |                            |                          |                       | PA18 / RX_LED            | PC05 / LCD_BACKLIGHT_CTR         |
+| LED(2)             |                            |                          |                            |                          |                       | PA19 / TX_LED            |                                  |

From 0a9335ecaa2bda2de1af86be426c9ed6c8849f16 Mon Sep 17 00:00:00 2001
From: oli <oli@example.com>
Date: Sat, 9 Oct 2021 10:20:39 +0100
Subject: [PATCH 1421/3533] rp2/rp2_pio: Support exec with sideset.

The rp2.StateMachine.exec errors when supplying a sideset action.  This
commit passes the sideset_opt from the StateMachine though to the parser.
It also adds some value validation to the sideset operator.

Additionally, the "word" method is added to the exec to allow any other
unsupported opcodes.

Fixes issue #7924.
---
 ports/rp2/modules/rp2.py | 12 ++++++++----
 ports/rp2/rp2_pio.c      |  7 ++++++-
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/ports/rp2/modules/rp2.py b/ports/rp2/modules/rp2.py
index c7e4d1fdd943d..1e4bb26cf0f33 100644
--- a/ports/rp2/modules/rp2.py
+++ b/ports/rp2/modules/rp2.py
@@ -88,6 +88,10 @@ def delay(self, delay):
     def side(self, value):
         self.num_sideset += 1
         if self.pass_ > 0:
+            if self.sideset_count == 0:
+                raise PIOASMError("no sideset")
+            elif value >= (1 << self.sideset_count):
+                raise PIOASMError("sideset too large")
             set_bit = 13 - self.sideset_count
             self.prog[_PROG_DATA][-1] |= self.sideset_opt << 12 | value << set_bit
         return self
@@ -269,17 +273,17 @@ def dec(f):
 
 
 # sideset_count is inclusive of enable bit
-def asm_pio_encode(instr, sideset_count):
+def asm_pio_encode(instr, sideset_count, sideset_opt=False):
     emit = PIOASMEmit()
-    emit.delay_max = 31
     emit.sideset_count = sideset_count
-    if emit.sideset_count:
-        emit.delay_max >>= emit.sideset_count
+    emit.sideset_opt = sideset_opt != 0
+    emit.delay_max = 31 >> (emit.sideset_count + emit.sideset_opt)
     emit.pass_ = 1
     emit.num_instr = 0
     emit.num_sideset = 0
 
     gl = _pio_funcs
+    gl["word"] = emit.word
     gl["nop"] = emit.nop
     # gl["jmp"] = emit.jmp currently not supported
     gl["wait"] = emit.wait
diff --git a/ports/rp2/rp2_pio.c b/ports/rp2/rp2_pio.c
index 414fa8bd70c1e..fe09ebe249e5f 100644
--- a/ports/rp2/rp2_pio.c
+++ b/ports/rp2/rp2_pio.c
@@ -613,7 +613,12 @@ STATIC mp_obj_t rp2_state_machine_exec(mp_obj_t self_in, mp_obj_t instr_in) {
     mp_obj_t rp2_module = mp_import_name(MP_QSTR_rp2, mp_const_none, MP_OBJ_NEW_SMALL_INT(0));
     mp_obj_t asm_pio_encode = mp_load_attr(rp2_module, MP_QSTR_asm_pio_encode);
     uint32_t sideset_count = self->pio->sm[self->sm].pinctrl >> PIO_SM0_PINCTRL_SIDESET_COUNT_LSB;
-    mp_obj_t encoded_obj = mp_call_function_2(asm_pio_encode, instr_in, MP_OBJ_NEW_SMALL_INT(sideset_count));
+    uint8_t sideset_opt = !!(self->pio->sm[self->sm].execctrl & (1 << PIO_SM0_EXECCTRL_SIDE_EN_LSB));
+    mp_obj_t args[3];
+    args[0] = instr_in;
+    args[1] = MP_OBJ_NEW_SMALL_INT(sideset_count);
+    args[2] = MP_OBJ_NEW_SMALL_INT(sideset_opt);
+    mp_obj_t encoded_obj = mp_call_function_n_kw(asm_pio_encode, 3, 0, args);
     mp_int_t encoded = mp_obj_get_int(encoded_obj);
     pio_sm_exec(self->pio, self->sm, encoded);
     return mp_const_none;

From f72b49756d08d4fa8571a88663fe4c094e5ef60c Mon Sep 17 00:00:00 2001
From: oli <oli@example.com>
Date: Sat, 9 Oct 2021 11:50:50 +0100
Subject: [PATCH 1422/3533] docs/library/rp2.rst: Update function
 asm_pio_encode to add sideset_opt.

---
 docs/library/rp2.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/library/rp2.rst b/docs/library/rp2.rst
index 43143fe08977c..05d3b80f3a0f8 100644
--- a/docs/library/rp2.rst
+++ b/docs/library/rp2.rst
@@ -58,7 +58,7 @@ For running PIO programs, see :class:`rp2.StateMachine`.
       combined into a single 8-word FIFO for one direction only. The options
       are `PIO.JOIN_NONE`, `PIO.JOIN_RX` and `PIO.JOIN_TX`.
 
-.. function:: asm_pio_encode(instr, sideset_count)
+.. function:: asm_pio_encode(instr, sideset_count, sideset_opt=False)
 
     Assemble a single PIO instruction. You usually want to use `asm_pio()`
     instead.

From 1904833e0c7c650e86d8e151ea57ea1fa2ab09bd Mon Sep 17 00:00:00 2001
From: Seon Rozenblum <seon@unexpectedmaker.com>
Date: Fri, 12 Nov 2021 11:23:49 +1100
Subject: [PATCH 1423/3533] esp32: Add SDCard support for S3, and a
 GENERIC_S3_SPIRAM board.

Also add support for GPIO 47 and 48 on S3 boards.
---
 ports/esp32/boards/GENERIC_S3/mpconfigboard.h |  7 +++----
 .../esp32/boards/GENERIC_S3_SPIRAM/board.json | 16 ++++++++++++++++
 .../GENERIC_S3_SPIRAM/mpconfigboard.cmake     | 12 ++++++++++++
 .../boards/GENERIC_S3_SPIRAM/mpconfigboard.h  | 12 ++++++++++++
 .../boards/GENERIC_S3_SPIRAM/sdkconfig.board  | 12 ++++++++++++
 ports/esp32/boards/sdkconfig.spiram_sx        |  4 ++++
 ports/esp32/machine_pin.c                     | 15 +++++++++++++++
 ports/esp32/machine_sdcard.c                  | 19 +++++++++++++++++++
 ports/esp32/main.c                            |  4 ++--
 ports/esp32/mpconfigport.h                    |  5 +++++
 10 files changed, 100 insertions(+), 6 deletions(-)
 create mode 100644 ports/esp32/boards/GENERIC_S3_SPIRAM/board.json
 create mode 100644 ports/esp32/boards/GENERIC_S3_SPIRAM/mpconfigboard.cmake
 create mode 100644 ports/esp32/boards/GENERIC_S3_SPIRAM/mpconfigboard.h
 create mode 100644 ports/esp32/boards/GENERIC_S3_SPIRAM/sdkconfig.board

diff --git a/ports/esp32/boards/GENERIC_S3/mpconfigboard.h b/ports/esp32/boards/GENERIC_S3/mpconfigboard.h
index 562521c3682ff..53caa7f91d131 100644
--- a/ports/esp32/boards/GENERIC_S3/mpconfigboard.h
+++ b/ports/esp32/boards/GENERIC_S3/mpconfigboard.h
@@ -2,12 +2,11 @@
 #define MICROPY_HW_MCU_NAME                 "ESP32S3"
 
 #define MICROPY_PY_BLUETOOTH                (0)
-#define MICROPY_HW_ENABLE_SDCARD            (0)
 #define MICROPY_PY_MACHINE_DAC              (0)
 
 #define MICROPY_HW_I2C0_SCL                 (9)
 #define MICROPY_HW_I2C0_SDA                 (8)
 
-#define MICROPY_HW_SPI1_MOSI                (35)  // SDO
-#define MICROPY_HW_SPI1_MISO                (37)  // SDI
-#define MICROPY_HW_SPI1_SCK                 (36)
+#define MICROPY_HW_SPI1_MOSI                (35)
+#define MICROPY_HW_SPI1_MISO                (36)
+#define MICROPY_HW_SPI1_SCK                 (37)
diff --git a/ports/esp32/boards/GENERIC_S3_SPIRAM/board.json b/ports/esp32/boards/GENERIC_S3_SPIRAM/board.json
new file mode 100644
index 0000000000000..47bc34e392a77
--- /dev/null
+++ b/ports/esp32/boards/GENERIC_S3_SPIRAM/board.json
@@ -0,0 +1,16 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [
+        "BLE",
+        "WiFi"
+    ],
+    "images": [],
+    "mcu": "esp32s3",
+    "product": "Generic ESP32-S3 (SPIRAM)",
+    "thumbnail": "",
+    "url": "https://www.espressif.com/en/products/modules",
+    "vendor": "Espressif"
+}
diff --git a/ports/esp32/boards/GENERIC_S3_SPIRAM/mpconfigboard.cmake b/ports/esp32/boards/GENERIC_S3_SPIRAM/mpconfigboard.cmake
new file mode 100644
index 0000000000000..682c31456ffb8
--- /dev/null
+++ b/ports/esp32/boards/GENERIC_S3_SPIRAM/mpconfigboard.cmake
@@ -0,0 +1,12 @@
+set(IDF_TARGET esp32s3)
+
+set(SDKCONFIG_DEFAULTS
+    boards/sdkconfig.base
+    boards/sdkconfig.usb
+    boards/sdkconfig.spiram_sx
+    boards/GENERIC_S3_SPIRAM/sdkconfig.board
+)
+
+if(NOT MICROPY_FROZEN_MANIFEST)
+    set(MICROPY_FROZEN_MANIFEST ${MICROPY_PORT_DIR}/boards/manifest.py)
+endif()
diff --git a/ports/esp32/boards/GENERIC_S3_SPIRAM/mpconfigboard.h b/ports/esp32/boards/GENERIC_S3_SPIRAM/mpconfigboard.h
new file mode 100644
index 0000000000000..10085ae789aa4
--- /dev/null
+++ b/ports/esp32/boards/GENERIC_S3_SPIRAM/mpconfigboard.h
@@ -0,0 +1,12 @@
+#define MICROPY_HW_BOARD_NAME               "ESP32S3 module (spiram)"
+#define MICROPY_HW_MCU_NAME                 "ESP32S3"
+
+#define MICROPY_PY_BLUETOOTH                (0)
+#define MICROPY_PY_MACHINE_DAC              (0)
+
+#define MICROPY_HW_I2C0_SCL                 (9)
+#define MICROPY_HW_I2C0_SDA                 (8)
+
+#define MICROPY_HW_SPI1_MOSI                (35)
+#define MICROPY_HW_SPI1_MISO                (36)
+#define MICROPY_HW_SPI1_SCK                 (37)
diff --git a/ports/esp32/boards/GENERIC_S3_SPIRAM/sdkconfig.board b/ports/esp32/boards/GENERIC_S3_SPIRAM/sdkconfig.board
new file mode 100644
index 0000000000000..c9726d4232ed4
--- /dev/null
+++ b/ports/esp32/boards/GENERIC_S3_SPIRAM/sdkconfig.board
@@ -0,0 +1,12 @@
+CONFIG_FLASHMODE_QIO=y
+CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
+CONFIG_ESPTOOLPY_FLASHSIZE_DETECT=y
+CONFIG_ESPTOOLPY_AFTER_NORESET=y
+
+CONFIG_SPIRAM_MEMTEST=
+
+CONFIG_ESPTOOLPY_FLASHSIZE_4MB=
+CONFIG_ESPTOOLPY_FLASHSIZE_8MB=y
+CONFIG_ESPTOOLPY_FLASHSIZE_16MB=
+CONFIG_PARTITION_TABLE_CUSTOM=y
+CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions-8MiB.csv"
diff --git a/ports/esp32/boards/sdkconfig.spiram_sx b/ports/esp32/boards/sdkconfig.spiram_sx
index 18a0712cbf70f..ef24e90829e16 100644
--- a/ports/esp32/boards/sdkconfig.spiram_sx
+++ b/ports/esp32/boards/sdkconfig.spiram_sx
@@ -1,5 +1,7 @@
 # MicroPython on ESP32-S2 and ESP32-PAD1_subscript_3, ESP IDF configuration with SPIRAM support
 CONFIG_ESP32S2_SPIRAM_SUPPORT=y
+CONFIG_ESP32S3_SPIRAM_SUPPORT=y
+CONFIG_SPIRAM_MODE_QUAD=y
 CONFIG_SPIRAM_TYPE_AUTO=y
 CONFIG_DEFAULT_PSRAM_CLK_IO=30
 CONFIG_DEFAULT_PSRAM_CS_IO=26
@@ -9,3 +11,5 @@ CONFIG_SPIRAM_BOOT_INIT=y
 CONFIG_SPIRAM_IGNORE_NOTFOUND=y
 CONFIG_SPIRAM_USE_MEMMAP=y
 CONFIG_SPIRAM_MEMTEST=y
+CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=16384
+CONFIG_SPIRAM_MALLOC_RESERVE_INTERNAL=32768
diff --git a/ports/esp32/machine_pin.c b/ports/esp32/machine_pin.c
index bf61122811810..42c419426922b 100644
--- a/ports/esp32/machine_pin.c
+++ b/ports/esp32/machine_pin.c
@@ -200,6 +200,13 @@ STATIC const machine_pin_obj_t machine_pin_obj[] = {
     {{&machine_pin_type}, GPIO_NUM_46},
 
     #endif
+
+    #if CONFIG_IDF_TARGET_ESP32S3 && MICROPY_HW_ESP32S3_EXTENDED_IO
+
+    {{&machine_pin_type}, GPIO_NUM_47},
+    {{&machine_pin_type}, GPIO_NUM_48},
+
+    #endif
 };
 
 // forward declaration
@@ -631,6 +638,14 @@ STATIC const machine_pin_irq_obj_t machine_pin_irq_object[] = {
     {{&machine_pin_irq_type}, GPIO_NUM_43},
     {{&machine_pin_irq_type}, GPIO_NUM_44},
     {{&machine_pin_irq_type}, GPIO_NUM_45},
+    {{&machine_pin_irq_type}, GPIO_NUM_46},
+
+    #endif
+
+    #if CONFIG_IDF_TARGET_ESP32S3 && MICROPY_HW_ESP32S3_EXTENDED_IO
+
+    {{&machine_pin_irq_type}, GPIO_NUM_47},
+    {{&machine_pin_irq_type}, GPIO_NUM_48},
 
     #endif
 };
diff --git a/ports/esp32/machine_sdcard.c b/ports/esp32/machine_sdcard.c
index 3f70311f748d4..82c2e6cd4e320 100644
--- a/ports/esp32/machine_sdcard.c
+++ b/ports/esp32/machine_sdcard.c
@@ -188,7 +188,11 @@ STATIC mp_obj_t machine_sdcard_make_new(const mp_obj_type_t *type, size_t n_args
     }
 
     if (is_spi) {
+        #if CONFIG_IDF_TARGET_ESP32S3
+        self->host.slot = slot_num ? SPI3_HOST : SPI2_HOST;
+        #else
         self->host.slot = slot_num ? HSPI_HOST : VSPI_HOST;
+        #endif
     }
 
     DEBUG_printf("  Calling host.init()");
@@ -198,6 +202,20 @@ STATIC mp_obj_t machine_sdcard_make_new(const mp_obj_type_t *type, size_t n_args
 
     if (is_spi) {
         // SPI interface
+        #if CONFIG_IDF_TARGET_ESP32S3
+        STATIC const sdspi_slot_config_t slot_defaults[2] = {
+            {
+                .gpio_miso = GPIO_NUM_36,
+                .gpio_mosi = GPIO_NUM_35,
+                .gpio_sck = GPIO_NUM_37,
+                .gpio_cs = GPIO_NUM_34,
+                .gpio_cd = SDSPI_SLOT_NO_CD,
+                .gpio_wp = SDSPI_SLOT_NO_WP,
+                .dma_channel = 2
+            },
+            SDSPI_SLOT_CONFIG_DEFAULT()
+        };
+        #else
         STATIC const sdspi_slot_config_t slot_defaults[2] = {
             {
                 .gpio_miso = GPIO_NUM_19,
@@ -210,6 +228,7 @@ STATIC mp_obj_t machine_sdcard_make_new(const mp_obj_type_t *type, size_t n_args
             },
             SDSPI_SLOT_CONFIG_DEFAULT()
         };
+        #endif
 
         DEBUG_printf("  Setting up SPI slot configuration");
         sdspi_slot_config_t slot_config = slot_defaults[slot_num];
diff --git a/ports/esp32/main.c b/ports/esp32/main.c
index ca0ab1488a125..c1728e3182e42 100644
--- a/ports/esp32/main.c
+++ b/ports/esp32/main.c
@@ -101,7 +101,7 @@ void mp_task(void *pvParameter) {
     #if CONFIG_ESP32_SPIRAM_SUPPORT || CONFIG_SPIRAM_SUPPORT
     // Try to use the entire external SPIRAM directly for the heap
     size_t mp_task_heap_size;
-    void *mp_task_heap = (void *)0x3f800000;
+    void *mp_task_heap = (void *)SOC_EXTRAM_DATA_LOW;
     switch (esp_spiram_get_chip_size()) {
         case ESP_SPIRAM_SIZE_16MBITS:
             mp_task_heap_size = 2 * 1024 * 1024;
@@ -120,7 +120,7 @@ void mp_task(void *pvParameter) {
     // Try to use the entire external SPIRAM directly for the heap
     size_t mp_task_heap_size;
     size_t esp_spiram_size = esp_spiram_get_size();
-    void *mp_task_heap = (void *)0x3ff80000 - esp_spiram_size;
+    void *mp_task_heap = (void *)SOC_EXTRAM_DATA_HIGH - esp_spiram_size;
     if (esp_spiram_size > 0) {
         mp_task_heap_size = esp_spiram_size;
     } else {
diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h
index 82bef87880935..52949c5348be5 100644
--- a/ports/esp32/mpconfigport.h
+++ b/ports/esp32/mpconfigport.h
@@ -315,6 +315,11 @@ typedef long mp_off_t;
 // board specifics
 #define MICROPY_PY_SYS_PLATFORM "esp32"
 
+// ESP32-S3 extended IO for 47 & 48
+#ifndef MICROPY_HW_ESP32S3_EXTENDED_IO
+#define MICROPY_HW_ESP32S3_EXTENDED_IO      (1)
+#endif
+
 #ifndef MICROPY_HW_ENABLE_MDNS_QUERIES
 #define MICROPY_HW_ENABLE_MDNS_QUERIES      (1)
 #endif

From 01f1c3aac200fa33f981e0e53a20005e7ae3f6e8 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 8 Nov 2021 12:43:18 +1100
Subject: [PATCH 1424/3533] docs/reference/filesystem.rst: Add detail on how to
 use littlefs fuse.

Without the --block_count option the fuse will fail.

Signed-off-by: Damien George <damien@micropython.org>
---
 docs/reference/filesystem.rst | 30 +++++++++++++++++++++---------
 1 file changed, 21 insertions(+), 9 deletions(-)

diff --git a/docs/reference/filesystem.rst b/docs/reference/filesystem.rst
index 114e5973503f2..ca9e56344ed4c 100644
--- a/docs/reference/filesystem.rst
+++ b/docs/reference/filesystem.rst
@@ -219,15 +219,6 @@ resistant to filesystem corruption.
           situations, for details see `littlefs issue 347`_  and
           `littlefs issue 295`_.
 
-Note: It can be still be accessed over USB MSC using the `littlefs FUSE
-driver`_. Note that you must use the ``-b=4096`` option to override the block
-size.
-
-.. _littlefs FUSE driver: https://github.com/ARMmbed/littlefs-fuse/tree/master/littlefs
-.. _Littlefs: https://github.com/ARMmbed/littlefs
-.. _littlefs issue 295: https://github.com/ARMmbed/littlefs/issues/295
-.. _littlefs issue 347: https://github.com/ARMmbed/littlefs/issues/347
-
 To format the entire flash using littlefs v2::
 
     # ESP8266 and ESP32
@@ -243,6 +234,27 @@ To format the entire flash using littlefs v2::
     os.mount(pyb.Flash(start=0), '/flash')
     os.chdir('/flash')
 
+A littlefs filesystem can be still be accessed on a PC over USB MSC using the
+`littlefs FUSE driver`_.  Note that you must specify both the ``--block_size``
+and ``--block_count`` options to override the defaults.  For example (after
+building the littlefs-fuse executable)::
+
+    $ ./lfs --block_size=4096 --block_count=512 -o allow_other /dev/sdb1 mnt
+
+This will allow the board's littlefs filesystem to be accessed at the ``mnt``
+directory.  To get the correct values of ``block_size`` and ``block_count`` use::
+
+    import pyb
+    f = pyb.Flash(start=0)
+    f.ioctl(1, 1)  # initialise flash in littlefs raw-block mode
+    block_count = f.ioctl(4, 0)
+    block_size = f.ioctl(5, 0)
+
+.. _littlefs FUSE driver: https://github.com/littlefs-project/littlefs-fuse
+.. _Littlefs: https://github.com/littlefs-project/littlefs
+.. _littlefs issue 295: https://github.com/littlefs-project/littlefs/issues/295
+.. _littlefs issue 347: https://github.com/littlefs-project/littlefs/issues/347
+
 Hybrid (STM32)
 ~~~~~~~~~~~~~~
 

From e538d8a5a6d4c643b1bff41107062511b2e7f65a Mon Sep 17 00:00:00 2001
From: NitiKaur <nitikaur102@gmail.com>
Date: Fri, 5 Nov 2021 15:46:35 +0530
Subject: [PATCH 1425/3533] docs/rp2/quickref.rst: Add section on PIO.

---
 docs/rp2/quickref.rst | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/docs/rp2/quickref.rst b/docs/rp2/quickref.rst
index 63b8928280ba0..4824f390ebfbe 100644
--- a/docs/rp2/quickref.rst
+++ b/docs/rp2/quickref.rst
@@ -92,6 +92,37 @@ Use the :ref:`machine.Pin <machine.Pin>` class::
     p4 = Pin(4, Pin.IN, Pin.PULL_UP) # enable internal pull-up resistor
     p5 = Pin(5, Pin.OUT, value=1) # set pin high on creation
 
+Programmable IO (PIO)
+---------------------
+
+PIO is useful to build low-level IO interfaces from scratch.  See the :mod:`rp2` module
+for detailed explaination of the assembly instructions.
+
+Example using PIO to blink an LED at 1Hz::
+
+    from machine import Pin
+    import rp2
+
+    @rp2.asm_pio(set_init=rp2.PIO.OUT_LOW)
+    def blink_1hz():
+        # Cycles: 1 + 7 + 32 * (30 + 1) = 1000
+        set(pins, 1)
+        set(x, 31)                  [6]
+        label("delay_high")
+        nop()                       [29]
+        jmp(x_dec, "delay_high")
+
+        # Cycles: 1 + 7 + 32 * (30 + 1) = 1000
+        set(pins, 0)
+        set(x, 31)                  [6]
+        label("delay_low")
+        nop()                       [29]
+        jmp(x_dec, "delay_low")
+
+    # Create and start a StateMachine with blink_1hz, outputting on Pin(25)
+    sm = rp2.StateMachine(0, blink_1hz, freq=2000, set_base=Pin(25))
+    sm.active(1)
+
 UART (serial bus)
 -----------------
 

From b851950c26e185d46c16b993d310506992fbdb89 Mon Sep 17 00:00:00 2001
From: NitiKaur <nitikaur102@gmail.com>
Date: Fri, 12 Nov 2021 20:39:56 +0530
Subject: [PATCH 1426/3533] docs/library/sys.rst: Add docs for sys.settrace.

---
 docs/library/sys.rst | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/docs/library/sys.rst b/docs/library/sys.rst
index 24f9e353bb006..80ac1ab84c0df 100644
--- a/docs/library/sys.rst
+++ b/docs/library/sys.rst
@@ -43,6 +43,15 @@ Functions
       positional; further arguments are not supported. CPython-compatible
       ``traceback`` module can be found in `micropython-lib`.
 
+.. function:: settrace(tracefunc)
+
+   Enable tracing of bytecode execution.  For details see the `CPython
+   documentaion <https://docs.python.org/3/library/sys.html#sys.settrace>`_.
+
+   This function requires a custom MicroPython build as it is typically not
+   present in pre-built firmware (due to it affecting performance).  The relevant
+   configuration option is *MICROPY_PY_SYS_SETTRACE*.
+
 Constants
 ---------
 

From 172a031dff5b767be0accc9ae4810c1f897d3dde Mon Sep 17 00:00:00 2001
From: Mike Causer <mcauser@gmail.com>
Date: Wed, 17 Nov 2021 16:25:51 +1100
Subject: [PATCH 1427/3533] rp2/boards/PIMORONI_PICOLIPO_16MB: Fix 16MB flash
 size.

Was incorrectly added as 7MB for an 8MB SPI flash, but this board has a
16MB chip, not 8MB, so it should be 15MB leaving 1MB for MicroPython.

Thanks to @robert-hh
---
 ports/rp2/boards/PIMORONI_PICOLIPO_16MB/mpconfigboard.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/rp2/boards/PIMORONI_PICOLIPO_16MB/mpconfigboard.h b/ports/rp2/boards/PIMORONI_PICOLIPO_16MB/mpconfigboard.h
index 68478f7613c55..134c2ff784959 100644
--- a/ports/rp2/boards/PIMORONI_PICOLIPO_16MB/mpconfigboard.h
+++ b/ports/rp2/boards/PIMORONI_PICOLIPO_16MB/mpconfigboard.h
@@ -1,7 +1,7 @@
 // https://shop.pimoroni.com/products/pimoroni-pico-lipo?variant=39335427080275
 
 #define MICROPY_HW_BOARD_NAME          "Pimoroni Pico LiPo 16MB"
-#define MICROPY_HW_FLASH_STORAGE_BYTES (7 * 1024 * 1024)
+#define MICROPY_HW_FLASH_STORAGE_BYTES (15 * 1024 * 1024)
 
 #define MICROPY_HW_USB_VID (0x2E8A)
 #define MICROPY_HW_USB_PID (0x1003)

From 841eeb158e1d43ba34e4ee629143e10a2c4505ff Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Thu, 18 Nov 2021 00:10:49 +1100
Subject: [PATCH 1428/3533] drivers/neopixel: Avoid heap alloc in fill().

Previously the use of `range(start,stop,step)` caused an allocation.
Replace with while loop.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 drivers/neopixel/neopixel.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/drivers/neopixel/neopixel.py b/drivers/neopixel/neopixel.py
index 0032d36183cb8..caa12dc845361 100644
--- a/drivers/neopixel/neopixel.py
+++ b/drivers/neopixel/neopixel.py
@@ -36,10 +36,14 @@ def __getitem__(self, i):
 
     def fill(self, v):
         b = self.buf
-        for i in range(self.bpp):
+        l = len(self.buf)
+        bpp = self.bpp
+        for i in range(bpp):
             c = v[i]
-            for j in range(self.ORDER[i], len(self.buf), self.bpp):
+            j = self.ORDER[i]
+            while j < l:
                 b[j] = c
+                j += bpp
 
     def write(self):
         # BITSTREAM_TYPE_HIGH_LOW = 0

From b65d17fced77f9c6ca19d4b9df9de7f679de5019 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Wed, 17 Nov 2021 17:32:09 +0200
Subject: [PATCH 1429/3533] drivers/ninaw10: Fix BSSID byte order, and add null
 byte to ESSID.

- Fix the BSSID byte order from scan and netinfo.
- Make sure ESSID from netinfo is null terminated.
---
 drivers/ninaw10/nina_wifi_drv.c | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/drivers/ninaw10/nina_wifi_drv.c b/drivers/ninaw10/nina_wifi_drv.c
index 70f1a4264c776..48127c07630a8 100644
--- a/drivers/ninaw10/nina_wifi_drv.c
+++ b/drivers/ninaw10/nina_wifi_drv.c
@@ -344,6 +344,14 @@ static int nina_send_command_read_vals(uint32_t cmd, uint32_t nargs,
     return 0;
 }
 
+static void nina_fix_mac_addr(uint8_t *mac) {
+    for (int i = 0; i < 3; i++) {
+        uint8_t b = mac[i];
+        mac[i] = mac[5 - i];
+        mac[5 - i] = b;
+    }
+}
+
 int nina_init(void) {
     // Initialize the BSP.
     nina_bsp_init();
@@ -541,12 +549,18 @@ int nina_netinfo(nina_netinfo_t *netinfo) {
         return -1;
     }
 
+    // Null terminate SSID.
+    netinfo->ssid[MIN((NINA_MAX_SSID_LEN - 1), ssid_len)] = 0;
+
     if (nina_send_command_read_vals(NINA_CMD_GET_BSSID,
         1, ARG_8BITS, NINA_ARGS(ARG_BYTE(0xFF)),
         1, ARG_8BITS, NINA_VALS({&bssid_len, &netinfo->bssid})) != 0) {
         return -1;
     }
 
+    // The MAC address is read in reverse from the firmware.
+    nina_fix_mac_addr(netinfo->bssid);
+
     return 0;
 }
 
@@ -630,6 +644,9 @@ int nina_scan(nina_scan_callback_t scan_callback, void *arg, uint32_t timeout) {
             return -1;
         }
 
+        // The MAC address is read in reverse from the firmware.
+        nina_fix_mac_addr(scan_result.bssid);
+
         scan_callback(&scan_result, arg);
     }
 

From f7a0c98e00c226f40748acc619a4d7d089b3e31e Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Wed, 17 Nov 2021 17:33:15 +0200
Subject: [PATCH 1430/3533] extmod/network_ninaw10: Fix scan list order to
 match other NICs.

---
 extmod/network_ninaw10.c | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/extmod/network_ninaw10.c b/extmod/network_ninaw10.c
index aa4b8dd0c0912..e256188eb3a34 100644
--- a/extmod/network_ninaw10.c
+++ b/extmod/network_ninaw10.c
@@ -119,23 +119,15 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(network_ninaw10_active_obj, 1, 2, net
 
 STATIC int nina_scan_callback(nina_scan_result_t *scan_result, void *arg) {
     mp_obj_t scan_list = (mp_obj_t)arg;
-
-    // Format MAC address
-    VSTR_FIXED(bssid_vstr, 18);
-    vstr_printf(&bssid_vstr, "%02X:%02X:%02X:%02X:%02X:%02X",
-        scan_result->bssid[0], scan_result->bssid[1], scan_result->bssid[2],
-        scan_result->bssid[3], scan_result->bssid[4], scan_result->bssid[5]);
-
-    mp_obj_t ap[5] = {
+    mp_obj_t ap[6] = {
+        mp_obj_new_bytes((uint8_t *)scan_result->ssid, strlen(scan_result->ssid)),
+        mp_obj_new_bytes(scan_result->bssid, sizeof(scan_result->bssid)),
         mp_obj_new_int(scan_result->channel),
         mp_obj_new_int(scan_result->rssi),
         mp_obj_new_int(scan_result->security),
-        mp_obj_new_str(bssid_vstr.buf, bssid_vstr.len),
-        mp_obj_new_str(scan_result->ssid, strlen(scan_result->ssid)),
+        MP_OBJ_NEW_SMALL_INT(1), // N
     };
-
     mp_obj_list_append(scan_list, mp_obj_new_tuple(MP_ARRAY_SIZE(ap), ap));
-
     return 0;
 }
 

From 78425208ba0883f9b7b876a3e54ea87899f2bf99 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Thu, 18 Nov 2021 20:36:04 +0200
Subject: [PATCH 1431/3533] nrf/main: Use VFS helper function to mount fs and
 chdir.

---
 ports/nrf/main.c | 26 ++------------------------
 1 file changed, 2 insertions(+), 24 deletions(-)

diff --git a/ports/nrf/main.c b/ports/nrf/main.c
index 254d9491c086f..3768b8f404862 100644
--- a/ports/nrf/main.c
+++ b/ports/nrf/main.c
@@ -106,28 +106,6 @@ void do_str(const char *src, mp_parse_input_kind_t input_kind) {
 extern uint32_t _heap_start;
 extern uint32_t _heap_end;
 
-#if MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE
-STATIC int vfs_mount_and_chdir(mp_obj_t bdev, mp_obj_t mount_point) {
-    nlr_buf_t nlr;
-    mp_int_t ret = -MP_EIO;
-    if (nlr_push(&nlr) == 0) {
-        mp_obj_t args[] = { bdev, mount_point };
-        mp_vfs_mount(2, args, (mp_map_t *)&mp_const_empty_map);
-        mp_vfs_chdir(mount_point);
-        ret = 0; // success
-        nlr_pop();
-    } else {
-        mp_obj_base_t *exc = nlr.ret_val;
-        if (mp_obj_is_subclass_fast(MP_OBJ_FROM_PTR(exc->type), MP_OBJ_FROM_PTR(&mp_type_OSError))) {
-            mp_obj_t v = mp_obj_exception_get_value(MP_OBJ_FROM_PTR(exc));
-            mp_obj_get_int_maybe(v, &ret); // get errno value
-            ret = -ret;
-        }
-    }
-    return ret;
-}
-#endif
-
 int main(int argc, char **argv) {
 
 
@@ -203,11 +181,11 @@ int main(int argc, char **argv) {
 
     // Try to mount the flash on "/flash" and chdir to it for the boot-up directory.
     mp_obj_t mount_point = MP_OBJ_NEW_QSTR(MP_QSTR__slash_flash);
-    int ret = vfs_mount_and_chdir((mp_obj_t)&nrf_flash_obj, mount_point);
+    int ret = mp_vfs_mount_and_chdir_protected((mp_obj_t)&nrf_flash_obj, mount_point);
 
     if ((ret == -MP_ENODEV) || (ret == -MP_EIO)) {
         pyexec_frozen_module("_mkfs.py"); // Frozen script for formatting flash filesystem.
-        ret = vfs_mount_and_chdir((mp_obj_t)&nrf_flash_obj, mount_point);
+        ret = mp_vfs_mount_and_chdir_protected((mp_obj_t)&nrf_flash_obj, mount_point);
     }
 
     if (ret != 0) {

From 16c7a808742570e3c9ab1e1f8243d0a2166995a3 Mon Sep 17 00:00:00 2001
From: Lorenzo Cappelletti <lorenzo.cappelletti@gmail.com>
Date: Wed, 27 Oct 2021 22:53:58 +0200
Subject: [PATCH 1432/3533] stm32/boards/MIKROE_CLICKER2_STM32: Add more detail
 to board.json.

Signed-off-by: Lorenzo Cappelletti <lorenzo.cappelletti@gmail.com>
---
 ports/stm32/boards/MIKROE_CLICKER2_STM32/board.json | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/ports/stm32/boards/MIKROE_CLICKER2_STM32/board.json b/ports/stm32/boards/MIKROE_CLICKER2_STM32/board.json
index 3d7d4904fcaa0..8ff4dda080a33 100644
--- a/ports/stm32/boards/MIKROE_CLICKER2_STM32/board.json
+++ b/ports/stm32/boards/MIKROE_CLICKER2_STM32/board.json
@@ -3,11 +3,13 @@
         "../deploy.md"
     ],
     "docs": "",
-    "features": [],
+    "features": [
+        "mikroBUS"
+    ],
     "images": [],
     "mcu": "stm32f4",
-    "product": "MIKROE_CLICKER2_STM32",
+    "product": "MikroE Clicker 2 for STM32",
     "thumbnail": "",
-    "url": "",
-    "vendor": ""
+    "url": "https://www.mikroe.com/clicker-2-stm32f4",
+    "vendor": "MikroElektronika"
 }

From 8f0e304e65a83e1f52dfb29185159e8eb9f7f34d Mon Sep 17 00:00:00 2001
From: Lorenzo Cappelletti <lorenzo.cappelletti@gmail.com>
Date: Mon, 11 Oct 2021 23:55:06 +0200
Subject: [PATCH 1433/3533] stm32/boards: Add new board MikroElektronika Quail,
 and F427 support.

Quail (https://www.mikroe.com/quail, PID: MIKROE-1793) is based on an
STM32F427VI CPU, featuring 2048 kB of Flash memory and 192 kB of RAM.  An
on-board Cypress S25FL164K adds 8 MB of SPI Flash.

Quail has 4 mikroBUS(TM) sockets for Mikroe click(TM) board connectivity,
along with 24 screw terminals for connecting additional electronics and two
USB ports (one for programming, the other for external mass storage).

4 UARTs, 2 SPIs and 1 I2C bus are available for communication.

Signed-off-by: Lorenzo Cappelletti <lorenzo.cappelletti@gmail.com>
---
 ports/stm32/boards/MIKROE_QUAIL/bdev.c        |  28 ++++
 ports/stm32/boards/MIKROE_QUAIL/board.json    |  18 +++
 ports/stm32/boards/MIKROE_QUAIL/deploy.md     |  13 ++
 .../stm32/boards/MIKROE_QUAIL/mpconfigboard.h | 109 ++++++++++++++++
 .../boards/MIKROE_QUAIL/mpconfigboard.mk      |  10 ++
 ports/stm32/boards/MIKROE_QUAIL/pins.csv      | 120 ++++++++++++++++++
 .../boards/MIKROE_QUAIL/stm32f4xx_hal_conf.h  |  18 +++
 ports/stm32/boards/stm32f427xi.ld             |  28 ++++
 ports/stm32/flashbdev.c                       |   2 +-
 9 files changed, 345 insertions(+), 1 deletion(-)
 create mode 100644 ports/stm32/boards/MIKROE_QUAIL/bdev.c
 create mode 100644 ports/stm32/boards/MIKROE_QUAIL/board.json
 create mode 100644 ports/stm32/boards/MIKROE_QUAIL/deploy.md
 create mode 100644 ports/stm32/boards/MIKROE_QUAIL/mpconfigboard.h
 create mode 100644 ports/stm32/boards/MIKROE_QUAIL/mpconfigboard.mk
 create mode 100644 ports/stm32/boards/MIKROE_QUAIL/pins.csv
 create mode 100644 ports/stm32/boards/MIKROE_QUAIL/stm32f4xx_hal_conf.h
 create mode 100644 ports/stm32/boards/stm32f427xi.ld

diff --git a/ports/stm32/boards/MIKROE_QUAIL/bdev.c b/ports/stm32/boards/MIKROE_QUAIL/bdev.c
new file mode 100644
index 0000000000000..7095817e494cc
--- /dev/null
+++ b/ports/stm32/boards/MIKROE_QUAIL/bdev.c
@@ -0,0 +1,28 @@
+#include "py/obj.h"
+#include "storage.h"
+#include "spi.h"
+
+#if !MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE
+
+STATIC const spi_proto_cfg_t spi_bus = {
+    .spi = &spi_obj[2], // SPI3 hardware peripheral
+    .baudrate = 25000000,
+    .polarity = 0,
+    .phase = 0,
+    .bits = 8,
+    .firstbit = SPI_FIRSTBIT_MSB,
+};
+
+STATIC mp_spiflash_cache_t spi_bdev_cache;
+
+const mp_spiflash_config_t spiflash_config = {
+    .bus_kind = MP_SPIFLASH_BUS_SPI,
+    .bus.u_spi.cs = MICROPY_HW_SPIFLASH_CS,
+    .bus.u_spi.data = (void *)&spi_bus,
+    .bus.u_spi.proto = &spi_proto,
+    .cache = &spi_bdev_cache,
+};
+
+spi_bdev_t spi_bdev;
+
+#endif
diff --git a/ports/stm32/boards/MIKROE_QUAIL/board.json b/ports/stm32/boards/MIKROE_QUAIL/board.json
new file mode 100644
index 0000000000000..ccd9b4fdc0646
--- /dev/null
+++ b/ports/stm32/boards/MIKROE_QUAIL/board.json
@@ -0,0 +1,18 @@
+{
+    "deploy": [
+        "../MIKROE_QUAIL/deploy.md"
+    ],
+    "docs": "",
+    "features": [
+        "mikroBUS"
+    ],
+    "id": "MIKROE-QUAIL",
+    "images": [
+            "quail_top.jpg"
+    ],
+    "mcu": "stm32f4",
+    "product": "MikroE Quail",
+    "thumbnail": "",
+    "url": "https://www.mikroe.com/quail",
+    "vendor": "MikroElektronika"
+}
diff --git a/ports/stm32/boards/MIKROE_QUAIL/deploy.md b/ports/stm32/boards/MIKROE_QUAIL/deploy.md
new file mode 100644
index 0000000000000..5d6ea00a2ece4
--- /dev/null
+++ b/ports/stm32/boards/MIKROE_QUAIL/deploy.md
@@ -0,0 +1,13 @@
+### Quail via DFU
+
+Quail can be programmed via USB with the ST DFU bootloader, using
+e.g. [dfu-util](http://dfu-util.sourceforge.net/) or
+[pydfu.py](https://github.com/micropython/micropython/blob/master/tools/pydfu.py).
+
+To enter the bootloader press and release the Reset button while holding the
+Boot button.  Alternatively, you can use `machine.bootloader()` from the
+MicroPython REPL.
+
+```bash
+dfu-util --alt 0 -D firmware.dfu
+```
diff --git a/ports/stm32/boards/MIKROE_QUAIL/mpconfigboard.h b/ports/stm32/boards/MIKROE_QUAIL/mpconfigboard.h
new file mode 100644
index 0000000000000..6cb6b726001ab
--- /dev/null
+++ b/ports/stm32/boards/MIKROE_QUAIL/mpconfigboard.h
@@ -0,0 +1,109 @@
+#define MICROPY_HW_BOARD_NAME       "MikroE Quail"
+#define MICROPY_HW_MCU_NAME         "STM32F427VI"
+
+// 1 = use STM32 internal flash (1 MByte)
+// 0 = use onboard external SPI flash (8 MByte)
+#define MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE (0)
+
+#define MICROPY_HW_ENABLE_RNG       (1)
+#define MICROPY_HW_ENABLE_RTC       (1)
+#define MICROPY_HW_ENABLE_USB       (1)
+#define MICROPY_HW_HAS_FLASH        (1)
+
+// HSE is 12MHz
+#define MICROPY_HW_CLK_PLLM         (6)
+#define MICROPY_HW_CLK_PLLN         (336)
+#define MICROPY_HW_CLK_PLLP         (RCC_PLLP_DIV4)
+#define MICROPY_HW_CLK_PLLQ         (14)
+#define MICROPY_HW_CLK_LAST_FREQ    (1)
+
+// The board has no crystal for the RTC
+#define MICROPY_HW_RTC_USE_LSE      (0)
+#define MICROPY_HW_RTC_USE_US       (0)
+#define MICROPY_HW_RTC_USE_CALOUT   (0)  // turn on/off PC13 512Hz output
+
+// UART config
+// mikroBUS slot 1
+#define MICROPY_HW_UART3_NAME       "SLOT1"
+#define MICROPY_HW_UART3_TX         (pin_D8)
+#define MICROPY_HW_UART3_RX         (pin_D9)
+// mikroBUS slot 2
+#define MICROPY_HW_UART2_NAME       "SLOT2"
+#define MICROPY_HW_UART2_TX         (pin_D5)
+#define MICROPY_HW_UART2_RX         (pin_D6)
+// mikroBUS slot 3
+#define MICROPY_HW_UART6_NAME       "SLOT3"
+#define MICROPY_HW_UART6_TX         (pin_C6)
+#define MICROPY_HW_UART6_RX         (pin_C7)
+// mikroBUS slot 4
+#define MICROPY_HW_UART1_NAME       "SLOT4"
+#define MICROPY_HW_UART1_TX         (pin_A9)
+#define MICROPY_HW_UART1_RX         (pin_A10)
+
+// I2C buses
+// mikroBUS slot 1, 2, 3, 4, and header
+#define MICROPY_HW_I2C1_NAME        "SLOT1234H"
+#define MICROPY_HW_I2C1_SCL         (pin_B6)
+#define MICROPY_HW_I2C1_SDA         (pin_B7)
+
+// SPI buses
+// mikroBUS slot 1, 2, and header
+#define MICROPY_HW_SPI1_NAME        "SLOT12H"
+#define MICROPY_HW_SPI1_SCK         (pin_B3)
+#define MICROPY_HW_SPI1_MISO        (pin_B4)
+#define MICROPY_HW_SPI1_MOSI        (pin_B5)
+// mikroBUS slot 3, 4, and FLASH
+#define MICROPY_HW_SPI3_NAME        "SLOT34F"
+#define MICROPY_HW_SPI3_SCK         (pin_C10)
+#define MICROPY_HW_SPI3_MISO        (pin_C11)
+#define MICROPY_HW_SPI3_MOSI        (pin_C12)
+
+// LEDs
+#define MICROPY_HW_LED1             (pin_E15) // orange
+#define MICROPY_HW_LED2             (pin_E10) // green
+#define MICROPY_HW_LED3             (pin_C3)  // red
+#define MICROPY_HW_LED_ON(pin)      (mp_hal_pin_high(pin))
+#define MICROPY_HW_LED_OFF(pin)     (mp_hal_pin_low(pin))
+
+// USB config
+#define MICROPY_HW_USB_FS           (1)
+
+// External SPI Flash config (Cypress S25FL164K)
+#if !MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE
+
+#define MICROPY_HW_SPIFLASH_SIZE_BITS (64 * 1024 * 1024) // 64 Mbit (8 MByte)
+
+#define MICROPY_HW_SPIFLASH_CS (pin_A13)
+#define MICROPY_HW_SPIFLASH_SCK (MICROPY_HW_SPI3_SCK)
+#define MICROPY_HW_SPIFLASH_MISO (MICROPY_HW_SPI3_MISO)
+#define MICROPY_HW_SPIFLASH_MOSI (MICROPY_HW_SPI3_MOSI)
+
+extern const struct _mp_spiflash_config_t spiflash_config;
+extern struct _spi_bdev_t spi_bdev;
+#define MICROPY_HW_SPIFLASH_ENABLE_CACHE (1)
+#define MICROPY_HW_BDEV_IOCTL(op, arg) ( \
+    (op) == BDEV_IOCTL_NUM_BLOCKS ? (MICROPY_HW_SPIFLASH_SIZE_BITS / 8 / FLASH_BLOCK_SIZE) : \
+    (op) == BDEV_IOCTL_INIT ? spi_bdev_ioctl(&spi_bdev, (op), (uint32_t)&spiflash_config) : \
+    spi_bdev_ioctl(&spi_bdev, (op), (arg)) \
+)
+#define MICROPY_HW_BDEV_READBLOCKS(dest, bl, n) spi_bdev_readblocks(&spi_bdev, (dest), (bl), (n))
+#define MICROPY_HW_BDEV_WRITEBLOCKS(src, bl, n) spi_bdev_writeblocks(&spi_bdev, (src), (bl), (n))
+#define MICROPY_HW_BDEV_SPIFLASH_EXTENDED (&spi_bdev) // for extended block protocol
+
+#endif // !MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE
+
+// Bootloader configuration (only needed if Mboot is used)
+#define MBOOT_I2C_PERIPH_ID         1
+#define MBOOT_I2C_SCL               (pin_B6)
+#define MBOOT_I2C_SDA               (pin_B7)
+#define MBOOT_I2C_ALTFUNC           (4)
+#define MBOOT_FSLOAD                (1)
+#define MBOOT_VFS_FAT               (1)
+
+#define MBOOT_SPIFLASH_ADDR         (0x80000000)
+#define MBOOT_SPIFLASH_BYTE_SIZE    (8 * 1024 * 1024)
+#define MBOOT_SPIFLASH_LAYOUT       "/0x80000000/512*8Kg"
+#define MBOOT_SPIFLASH_ERASE_BLOCKS_PER_PAGE \
+                                    (8 / 4) // 8k page, 4k erase block
+#define MBOOT_SPIFLASH_CONFIG       (&spiflash_config)
+#define MBOOT_SPIFLASH_SPIFLASH     (&spi_bdev.spiflash)
diff --git a/ports/stm32/boards/MIKROE_QUAIL/mpconfigboard.mk b/ports/stm32/boards/MIKROE_QUAIL/mpconfigboard.mk
new file mode 100644
index 0000000000000..12f4f57988d3c
--- /dev/null
+++ b/ports/stm32/boards/MIKROE_QUAIL/mpconfigboard.mk
@@ -0,0 +1,10 @@
+MCU_SERIES = f4
+CMSIS_MCU = STM32F427xx
+LD_FILES = boards/stm32f427xi.ld boards/common_ifs.ld
+TEXT0_ADDR = 0x08000000
+TEXT1_ADDR = 0x08020000
+
+# According to the datasheet, page 75, table 12, the alternate functions
+# of STM32F427xx and STM32F429xx are exactly the same.
+# See https://www.st.com/resource/en/datasheet/stm32f427vi.pdf.
+AF_FILE = boards/stm32f429_af.csv
diff --git a/ports/stm32/boards/MIKROE_QUAIL/pins.csv b/ports/stm32/boards/MIKROE_QUAIL/pins.csv
new file mode 100644
index 0000000000000..41868cf722c0e
--- /dev/null
+++ b/ports/stm32/boards/MIKROE_QUAIL/pins.csv
@@ -0,0 +1,120 @@
+# Pin mapping for board MikroElektronika Quail, based on CPU STM32F427VIT6
+
+### mikroBUS ###########################
+
+# Slot 1 (SPI1, UART3, I2C1)
+MB1_AN,PA6
+MB1_RST,PA2
+MB1_CS,PA3
+MB1_SCK,PB3
+MB1_MISO,PB4
+MB1_MOSI,PB5
+MB1_PWM,PE9
+MB1_INT,PA1
+MB1_RX,PD9
+MB1_TX,PD8
+MB1_SCL,PB6
+MB1_SDA,PB7
+
+# Slot 2 (SPI1, UART2, I2C1)
+MB2_AN,PA4
+MB2_RST,PE1
+MB2_CS,PE0
+MB2_SCK,PB3
+MB2_MISO,PB4
+MB2_MOSI,PB5
+MB2_PWM,PD15
+MB2_INT,PB9
+MB2_RX,PD6
+MB2_TX,PD5
+MB2_SCL,PB6
+MB2_SDA,PB7
+
+# Slot 3 (SPI3, UART6, I2C1)
+MB3_AN,PA7
+MB3_RST,PD8
+MB3_CS,PD11
+MB3_SCK,PC10
+MB3_MISO,PC11
+MB3_MOSI,PC12
+MB3_PWM,PD13
+MB3_INT,PC8
+MB3_RX,PC7
+MB3_TX,PC6
+MB3_SCL,PB6
+MB3_SDA,PB7
+
+# Slot 4 (SPI3, UART1, I2C1)
+MB4_AN,PA5
+MB4_RST,PD0
+MB4_CS,PD1
+MB4_SCK,PC10
+MB4_MISO,PC11
+MB4_MOSI,PC12
+MB4_PWM,PD14
+MB4_INT,PA14
+MB4_RX,PA10
+MB4_TX,PA9
+MB4_SCL,PB6
+MB4_SDA,PB7
+
+
+### Edge Contacts ######################
+
+,PC5
+,PB0
+,PE7
+,PE8
+
+,PE11
+,PC4
+,PE13
+,PE14
+
+,PB10
+,PB11
+,PB12
+,PB13
+
+# I2C1
+,PB6
+,PB7
+
+# SPI3
+,PC10
+,PC11
+,PC12
+,PD10
+
+,PA15
+,PC13
+,PE6
+,PE5
+
+,PD2
+,PD3
+,PD4
+,PD7
+
+,PE2
+,PE3
+,PE4
+
+
+### FLASH Memory #######################
+
+# Spansion S25FL164K - SPI3
+FLASH_CS,PA13
+
+
+### LED ################################
+
+LED1,PE15
+LED2,PE10
+LED3,PC3
+
+
+### Micro USB ##########################
+
+,-PA11
+,-PA12
diff --git a/ports/stm32/boards/MIKROE_QUAIL/stm32f4xx_hal_conf.h b/ports/stm32/boards/MIKROE_QUAIL/stm32f4xx_hal_conf.h
new file mode 100644
index 0000000000000..b8b935915ff28
--- /dev/null
+++ b/ports/stm32/boards/MIKROE_QUAIL/stm32f4xx_hal_conf.h
@@ -0,0 +1,18 @@
+/* This file is part of the MicroPython project, http://micropython.org/
+ * The MIT License (MIT)
+ * Copyright (c) 2021 Lorenzo Cappelletti
+ */
+#ifndef MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H
+#define MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H
+
+#include "boards/stm32f4xx_hal_conf_base.h"
+
+// Oscillator values in Hz
+#define HSE_VALUE (12000000)
+#define EXTERNAL_CLOCK_VALUE (12288000)
+
+// Oscillator timeouts in ms
+#define HSE_STARTUP_TIMEOUT (100)
+#define LSE_STARTUP_TIMEOUT (0)
+
+#endif // MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H
diff --git a/ports/stm32/boards/stm32f427xi.ld b/ports/stm32/boards/stm32f427xi.ld
new file mode 100644
index 0000000000000..1197848af175c
--- /dev/null
+++ b/ports/stm32/boards/stm32f427xi.ld
@@ -0,0 +1,28 @@
+/*
+    GNU linker script for STM32F427xI
+*/
+
+/* Specify the memory areas */
+MEMORY
+{
+    FLASH (rx)      : ORIGIN = 0x08000000, LENGTH = 2048K /* entire flash */
+    FLASH_ISR (rx)  : ORIGIN = 0x08000000, LENGTH =   16K /* sector 0, 16 KiB */
+    FLASH_FS (rx)   : ORIGIN = 0x08004000, LENGTH =  112K /* sectors 1-4: 3*16K+64K */
+    FLASH_TEXT (rx) : ORIGIN = 0x08020000, LENGTH =  896K /* sectors 5-11 are 128K */
+    RAM (xrw)       : ORIGIN = 0x20000000, LENGTH =  192K
+}
+
+/* produce a link error if there is not this amount of RAM for these sections */
+_minimum_stack_size = 2K;
+_minimum_heap_size = 16K;
+
+/* Define the stack.  The stack is full descending so begins just above last byte
+   of RAM.  Note that EABI requires the stack to be 8-byte aligned for a call. */
+_estack = ORIGIN(RAM) + LENGTH(RAM) - _estack_reserve;
+_sstack = _estack - 16K; /* tunable */
+
+/* RAM extents for the garbage collector */
+_ram_start = ORIGIN(RAM);
+_ram_end = ORIGIN(RAM) + LENGTH(RAM);
+_heap_start = _ebss; /* heap starts just after statically allocated memory */
+_heap_end = _sstack;
diff --git a/ports/stm32/flashbdev.c b/ports/stm32/flashbdev.c
index 6be0cfee8af38..3b7609d4d2cb5 100644
--- a/ports/stm32/flashbdev.c
+++ b/ports/stm32/flashbdev.c
@@ -70,7 +70,7 @@ STATIC byte flash_cache_mem[0x4000] __attribute__((aligned(4))); // 16k
 #define FLASH_MEM_SEG2_START_ADDR (0x08040000) // sector 6
 #define FLASH_MEM_SEG2_NUM_BLOCKS (128) // sector 6: 64k(of 128k). Filesystem 176K + 64K = 240K
 
-#elif defined(STM32F429xx)
+#elif defined(STM32F427xx) || defined(STM32F429xx)
 
 #define CACHE_MEM_START_ADDR (0x10000000) // CCM data RAM, 64k
 #define FLASH_SECTOR_SIZE_MAX (0x10000) // 64k max, size of CCM

From 78ab2eeda311241fcb692336f6f8240d2c79e878 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 19 Nov 2021 17:05:40 +1100
Subject: [PATCH 1434/3533] py/showbc: Print unary-op string when dumping
 bytecode.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/showbc.c                     | 3 ++-
 tests/cmdline/cmd_showbc.py.exp | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/py/showbc.c b/py/showbc.c
index c321dfd75557a..f3bd5ea15efca 100644
--- a/py/showbc.c
+++ b/py/showbc.c
@@ -519,7 +519,8 @@ const byte *mp_bytecode_print_str(const mp_print_t *print, const byte *ip) {
             } else if (ip[-1] < MP_BC_STORE_FAST_MULTI + 16) {
                 mp_printf(print, "STORE_FAST " UINT_FMT, (mp_uint_t)ip[-1] - MP_BC_STORE_FAST_MULTI);
             } else if (ip[-1] < MP_BC_UNARY_OP_MULTI + MP_UNARY_OP_NUM_BYTECODE) {
-                mp_printf(print, "UNARY_OP " UINT_FMT, (mp_uint_t)ip[-1] - MP_BC_UNARY_OP_MULTI);
+                mp_uint_t op = ip[-1] - MP_BC_UNARY_OP_MULTI;
+                mp_printf(print, "UNARY_OP " UINT_FMT " %s", op, qstr_str(mp_unary_op_method_name[op]));
             } else if (ip[-1] < MP_BC_BINARY_OP_MULTI + MP_BINARY_OP_NUM_BYTECODE) {
                 mp_uint_t op = ip[-1] - MP_BC_BINARY_OP_MULTI;
                 mp_printf(print, "BINARY_OP " UINT_FMT " %s", op, qstr_str(mp_binary_op_method_name[op]));
diff --git a/tests/cmdline/cmd_showbc.py.exp b/tests/cmdline/cmd_showbc.py.exp
index d93fd7b487ec2..22712b79eeb2b 100644
--- a/tests/cmdline/cmd_showbc.py.exp
+++ b/tests/cmdline/cmd_showbc.py.exp
@@ -92,10 +92,10 @@ Raw bytecode (code_info_size=\\d\+, bytecode_size=\\d\+):
 58 BINARY_OP 27 __add__
 \\d\+ STORE_FAST 8
 \\d\+ LOAD_FAST 0
-\\d\+ UNARY_OP 1
+\\d\+ UNARY_OP 1 __neg__
 \\d\+ STORE_FAST 9
 \\d\+ LOAD_FAST 0
-\\d\+ UNARY_OP 3
+\\d\+ UNARY_OP 3 
 \\d\+ STORE_FAST 10
 \\d\+ LOAD_FAST 0
 \\d\+ LOAD_DEREF 14
@@ -116,7 +116,7 @@ Raw bytecode (code_info_size=\\d\+, bytecode_size=\\d\+):
 \\d\+ LOAD_DEREF 14
 \\d\+ LOAD_FAST 1
 \\d\+ BINARY_OP 2 __eq__
-\\d\+ UNARY_OP 3
+\\d\+ UNARY_OP 3 
 \\d\+ STORE_FAST 10
 \\d\+ LOAD_DEREF 14
 \\d\+ LOAD_ATTR c

From 123dcdb8e5b2f89b7dca07dae552db98feee309b Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 19 Nov 2021 17:26:04 +1100
Subject: [PATCH 1435/3533] py/modsys: Replace non-ASCII quote char with ASCII
 char.

The source code should stay 7-bit ASCII clean.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/modsys.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/py/modsys.c b/py/modsys.c
index 64349f3c306a5..43666bc00e556 100644
--- a/py/modsys.c
+++ b/py/modsys.c
@@ -175,7 +175,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_sys_atexit_obj, mp_sys_atexit);
 #endif
 
 #if MICROPY_PY_SYS_SETTRACE
-// settrace(tracefunc): Set the system’s trace function.
+// settrace(tracefunc): Set the system's trace function.
 STATIC mp_obj_t mp_sys_settrace(mp_obj_t obj) {
     return mp_prof_settrace(obj);
 }

From e83aa252f7c58db3d1a95b399c1bcdf791dcf819 Mon Sep 17 00:00:00 2001
From: Peter Boin <peter.boin@gmail.com>
Date: Wed, 8 Sep 2021 15:45:03 +1000
Subject: [PATCH 1436/3533] stm32/main: Run optional frozen module at boot.

If a board specifies a filename via MICROPY_BOARD_FROZEN_BOOT_FILE then
that will be run on start up, before the usual boot.py.
---
 ports/stm32/main.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/ports/stm32/main.c b/ports/stm32/main.c
index 5d1ff2dcf5aad..974602cb05f16 100644
--- a/ports/stm32/main.c
+++ b/ports/stm32/main.c
@@ -564,6 +564,11 @@ void stm32_main(uint32_t reset_mode) {
     // reset config variables; they should be set by boot.py
     MP_STATE_PORT(pyb_config_main) = MP_OBJ_NULL;
 
+    // Run optional frozen boot code.
+    #ifdef MICROPY_BOARD_FROZEN_BOOT_FILE
+    pyexec_frozen_module(MICROPY_BOARD_FROZEN_BOOT_FILE);
+    #endif
+
     // Run boot.py (or whatever else a board configures at this stage).
     if (MICROPY_BOARD_RUN_BOOT_PY(&state) == BOARDCTRL_GOTO_SOFT_RESET_EXIT) {
         goto soft_reset_exit;

From dfa75f33a5a2cb1737e5278f198d0dac0a5867eb Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 15 Nov 2021 14:39:32 +1100
Subject: [PATCH 1437/3533] stm32/sdio: Don't explicitly disable DMA2 on deinit
 of SDIO.

Because DMA2 may be in use by other peripherals, eg SPI1.

On PYBD-SF6 it's possible to trigger a bug in the existing code by turning
on WLAN and connecting to an AP, pinging the IP address from a PC and
running the following code on the PYBD:

    def spi_test(s):
        while 1:
            s.write('test')
            s.read(4)

    spi_test(machine.SPI(1,100000000))

This will eventually fail with `OSError: [Errno 110] ETIMEDOUT` because
DMA2 was turned off by the CYW43 driver during the SPI1 transfer.

This commit fixes the bug by removing the code that explicitly disables
DMA2.  Instead DMA2 will be automatically disabled after an inactivity
timeout, see commit a96afae90f6e5d693173382561d06e583b0b5fa5

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/sdio.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/ports/stm32/sdio.c b/ports/stm32/sdio.c
index 3fb84a4d81529..bedafcb138e95 100644
--- a/ports/stm32/sdio.c
+++ b/ports/stm32/sdio.c
@@ -134,9 +134,6 @@ void sdio_init(uint32_t irq_pri) {
 
 void sdio_deinit(void) {
     SDMMC_CLK_DISABLE();
-    #if defined(STM32F7)
-    __HAL_RCC_DMA2_CLK_DISABLE();
-    #endif
 }
 
 void sdio_reenable(void) {

From 01ceb9aca3707114dc05b7a45691074b3603a274 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 15 Nov 2021 14:39:39 +1100
Subject: [PATCH 1438/3533] stm32/dma: Make DMA2_Stream3 exclusive to SDIO when
 CYW43 enabled.

This prevents SPI4/5 from being used if SDIO and CYW43 are enabled, because
the DMA for the SDIO is used on an IRQ and must be exclusivly available for
use by the SDIO peripheral.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/dma.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/ports/stm32/dma.c b/ports/stm32/dma.c
index 4b078eebb6fd6..b376ee23b53da 100644
--- a/ports/stm32/dma.c
+++ b/ports/stm32/dma.c
@@ -42,6 +42,10 @@
 
 #define ENABLE_SDIO (MICROPY_HW_ENABLE_SDCARD || MICROPY_HW_ENABLE_MMCARD || MICROPY_PY_NETWORK_CYW43)
 
+// If the CYW43 driver is enabled then SDIO DMA can happen preemptively (on an
+// IRQ) and so the SDIO needs exclusive access to its DMA resource.
+#define SDIO_NEEDS_EXCLUSIVE_DMA_ACCESS (MICROPY_PY_NETWORK_CYW43 && MICROPY_HW_SDIO_SDMMC == 1)
+
 typedef enum {
     dma_id_not_defined=-1,
     dma_id_0,
@@ -298,11 +302,13 @@ const dma_descr_t dma_SPI_1_RX = { DMA2_Stream2, DMA_CHANNEL_3, dma_id_10,  &dma
 #if MICROPY_HW_ENABLE_I2S
 const dma_descr_t dma_I2S_1_RX = { DMA2_Stream2, DMA_CHANNEL_3, dma_id_10,  &dma_init_struct_i2s };
 #endif
-const dma_descr_t dma_SPI_5_RX = { DMA2_Stream3, DMA_CHANNEL_2, dma_id_11,  &dma_init_struct_spi_i2c };
 #if ENABLE_SDIO
 const dma_descr_t dma_SDIO_0 = { DMA2_Stream3, DMA_CHANNEL_4, dma_id_11,  &dma_init_struct_sdio };
 #endif
+#if !SDIO_NEEDS_EXCLUSIVE_DMA_ACCESS
+const dma_descr_t dma_SPI_5_RX = { DMA2_Stream3, DMA_CHANNEL_2, dma_id_11,  &dma_init_struct_spi_i2c };
 const dma_descr_t dma_SPI_4_RX = { DMA2_Stream3, DMA_CHANNEL_5, dma_id_11,  &dma_init_struct_spi_i2c };
+#endif
 const dma_descr_t dma_SPI_5_TX = { DMA2_Stream4, DMA_CHANNEL_2, dma_id_12,  &dma_init_struct_spi_i2c };
 const dma_descr_t dma_SPI_4_TX = { DMA2_Stream4, DMA_CHANNEL_5, dma_id_12,  &dma_init_struct_spi_i2c };
 const dma_descr_t dma_SPI_6_TX = { DMA2_Stream5, DMA_CHANNEL_1, dma_id_13,  &dma_init_struct_spi_i2c };

From e2ca8ab8fc2f824dc7ebaa8fe65c4d2e7891080e Mon Sep 17 00:00:00 2001
From: Laurens Valk <laurens@pybricks.com>
Date: Fri, 17 Jul 2020 22:31:09 +0200
Subject: [PATCH 1439/3533] py/runtime: Allow types to use both .attr and
 .locals_dict.

Make it possible to proceed to a regular lookup in locals_dict if the
custom type->attr fails.  This allows type->attr to extend rather than
completely replace the lookup in locals_dict.

This is useful for custom builtin classes that have mostly regular methods
but just a few special attributes/properties.  This way, type->attr needs
to deal with the special cases only and the default lookup will be used for
generic methods.

Signed-off-by: Laurens Valk <laurens@pybricks.com>
---
 py/obj.h     |  1 +
 py/runtime.c | 17 +++++++++++++----
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/py/obj.h b/py/obj.h
index 11918ba17657d..7730059e6ad11 100644
--- a/py/obj.h
+++ b/py/obj.h
@@ -551,6 +551,7 @@ struct _mp_obj_type_t {
     //
     // dest[0] = MP_OBJ_NULL means load
     //  return: for fail, do nothing
+    //          for fail but continue lookup in locals_dict, dest[1] = MP_OBJ_SENTINEL
     //          for attr, dest[0] = value
     //          for method, dest[0] = method, dest[1] = self
     //
diff --git a/py/runtime.c b/py/runtime.c
index 27e77fc290123..0120b70d74e1b 100644
--- a/py/runtime.c
+++ b/py/runtime.c
@@ -1100,12 +1100,20 @@ void mp_load_method_maybe(mp_obj_t obj, qstr attr, mp_obj_t *dest) {
     if (attr == MP_QSTR___next__ && type->iternext != NULL) {
         dest[0] = MP_OBJ_FROM_PTR(&mp_builtin_next_obj);
         dest[1] = obj;
-
-    } else if (type->attr != NULL) {
+        return;
+    }
+    if (type->attr != NULL) {
         // this type can do its own load, so call it
         type->attr(obj, attr, dest);
-
-    } else if (type->locals_dict != NULL) {
+        // If type->attr has set dest[1] = MP_OBJ_SENTINEL, we should proceed
+        // with lookups below (i.e. in locals_dict). If not, return right away.
+        if (dest[1] != MP_OBJ_SENTINEL) {
+            return;
+        }
+        // Clear the fail flag set by type->attr so it's like it never ran.
+        dest[1] = MP_OBJ_NULL;
+    }
+    if (type->locals_dict != NULL) {
         // generic method lookup
         // this is a lookup in the object (ie not class or type)
         assert(type->locals_dict->base.type == &mp_type_dict); // MicroPython restriction, for now
@@ -1114,6 +1122,7 @@ void mp_load_method_maybe(mp_obj_t obj, qstr attr, mp_obj_t *dest) {
         if (elem != NULL) {
             mp_convert_member_lookup(obj, type, elem->value, dest);
         }
+        return;
     }
 }
 

From 90554d03c0228f403df3f52ae9c4114c0bdc02b1 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sun, 21 Nov 2021 14:47:40 +1100
Subject: [PATCH 1440/3533] stm32/boards: Build NUCLEO_WB55 and STM32F769DISC
 without mboot enabled.

This is to make the builds for all nucleo/discovery boards uniform, so they
can be treated the same by the auto build scripts.

The CI script is updated to explicitly enable mboot and packing, to test
these features.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/boards/NUCLEO_WB55/mpconfigboard.mk   | 7 -------
 ports/stm32/boards/STM32F769DISC/mpconfigboard.mk | 3 ---
 tools/ci.sh                                       | 8 ++++++--
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/ports/stm32/boards/NUCLEO_WB55/mpconfigboard.mk b/ports/stm32/boards/NUCLEO_WB55/mpconfigboard.mk
index 4cb047c95e074..dcec788ed443f 100644
--- a/ports/stm32/boards/NUCLEO_WB55/mpconfigboard.mk
+++ b/ports/stm32/boards/NUCLEO_WB55/mpconfigboard.mk
@@ -1,7 +1,3 @@
-# By default this board is configured to use mboot with packing (signing and encryption)
-# enabled.  Mboot must be deployed first.
-USE_MBOOT ?= 1
-
 MCU_SERIES = wb
 CMSIS_MCU = STM32WB55xx
 AF_FILE = boards/stm32wb55_af.csv
@@ -21,6 +17,3 @@ endif
 MICROPY_PY_BLUETOOTH = 1
 MICROPY_BLUETOOTH_NIMBLE = 1
 MICROPY_VFS_LFS2 = 1
-
-# Mboot settings
-MBOOT_ENABLE_PACKING = 1
diff --git a/ports/stm32/boards/STM32F769DISC/mpconfigboard.mk b/ports/stm32/boards/STM32F769DISC/mpconfigboard.mk
index 5d3d11a7958fe..dfee1a7ac79e9 100644
--- a/ports/stm32/boards/STM32F769DISC/mpconfigboard.mk
+++ b/ports/stm32/boards/STM32F769DISC/mpconfigboard.mk
@@ -1,6 +1,3 @@
-# By default this board is configured to use mboot which must be deployed first
-USE_MBOOT ?= 1
-
 # By default the filesystem is in external QSPI flash.  But by setting the
 # following option this board puts some code into external flash set in XIP mode.
 # USE_MBOOT must be enabled; see f769_qspi.ld for code that goes in QSPI flash
diff --git a/tools/ci.sh b/tools/ci.sh
index f9b90b9687654..bf5b1fd043eea 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -282,12 +282,16 @@ function ci_stm32_nucleo_build {
     make ${MAKEOPTS} -C mpy-cross
     make ${MAKEOPTS} -C ports/stm32 submodules
     git submodule update --init lib/mynewt-nimble
+
+    # Test building various MCU families, some with additional options.
     make ${MAKEOPTS} -C ports/stm32 BOARD=NUCLEO_F091RC
     make ${MAKEOPTS} -C ports/stm32 BOARD=NUCLEO_H743ZI CFLAGS_EXTRA='-DMICROPY_PY_THREAD=1'
     make ${MAKEOPTS} -C ports/stm32 BOARD=NUCLEO_L073RZ
     make ${MAKEOPTS} -C ports/stm32 BOARD=NUCLEO_L476RG DEBUG=1
-    make ${MAKEOPTS} -C ports/stm32 BOARD=NUCLEO_WB55
-    make ${MAKEOPTS} -C ports/stm32/mboot BOARD=NUCLEO_WB55
+
+    # Test building a board with mboot packing enabled (encryption, signing, compression).
+    make ${MAKEOPTS} -C ports/stm32 BOARD=NUCLEO_WB55 USE_MBOOT=1 MBOOT_ENABLE_PACKING=1
+    make ${MAKEOPTS} -C ports/stm32/mboot BOARD=NUCLEO_WB55 USE_MBOOT=1 MBOOT_ENABLE_PACKING=1
     # Test mboot_pack_dfu.py created a valid file, and that its unpack-dfu command works.
     BOARD_WB55=ports/stm32/boards/NUCLEO_WB55
     BUILD_WB55=ports/stm32/build-NUCLEO_WB55

From bb7aae557ba639499c5bc08d4f098913a95ad027 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sun, 21 Nov 2021 14:54:55 +1100
Subject: [PATCH 1441/3533] tools/autobuild: Automatically build all stm32
 boards.

Any board with a board.json file will be built.  Additional variants for
certain pyboards will also be built by the explicit build-stm32-extra.sh
script.  Both .dfu and .hex files will be made available.

Also build boards in a sorted order, and don't stop building if a single
board fails.

Signed-off-by: Damien George <damien@micropython.org>
---
 tools/autobuild/autobuild.sh                      |  7 ++++---
 tools/autobuild/build-boards.sh                   | 15 ++++++++++-----
 ...build-stm32-latest.sh => build-stm32-extra.sh} | 13 ++-----------
 3 files changed, 16 insertions(+), 19 deletions(-)
 rename tools/autobuild/{build-stm32-latest.sh => build-stm32-extra.sh} (82%)

diff --git a/tools/autobuild/autobuild.sh b/tools/autobuild/autobuild.sh
index bb77b178b9bba..1532c9820feb8 100755
--- a/tools/autobuild/autobuild.sh
+++ b/tools/autobuild/autobuild.sh
@@ -65,9 +65,7 @@ FW_GIT="$(git describe --dirty || echo unknown)"
 FW_TAG="-$FW_DATE-unstable-$FW_GIT"
 
 # build new firmware
-cd ports/stm32
-${AUTODIR}/build-stm32-latest.sh ${FW_TAG} ${LOCAL_FIRMWARE}
-cd ../cc3200
+cd ports/cc3200
 ${AUTODIR}/build-cc3200-latest.sh ${FW_TAG} ${LOCAL_FIRMWARE}
 cd ../esp8266
 ${AUTODIR}/build-esp8266-latest.sh ${FW_TAG} ${LOCAL_FIRMWARE}
@@ -81,6 +79,9 @@ cd ../rp2
 build_rp2_boards ${FW_TAG} ${LOCAL_FIRMWARE}
 cd ../samd
 build_samd_boards ${FW_TAG} ${LOCAL_FIRMWARE}
+cd ../stm32
+build_stm32_boards ${FW_TAG} ${LOCAL_FIRMWARE}
+${AUTODIR}/build-stm32-extra.sh ${FW_TAG} ${LOCAL_FIRMWARE}
 
 popd
 
diff --git a/tools/autobuild/build-boards.sh b/tools/autobuild/build-boards.sh
index 1ae795a7a7e14..bb5d8d344e0e1 100755
--- a/tools/autobuild/build-boards.sh
+++ b/tools/autobuild/build-boards.sh
@@ -26,16 +26,17 @@ function build_boards {
         return 1
     fi
 
-    for board_json in $(find boards/ -name board.json); do
+    for board_json in $(find boards/ -name board.json | sort); do
         board=$(echo $board_json | awk -F '/' '{ print $2 }')
         descr=$(cat $board_json | python3 -c "import json,sys; print(json.load(sys.stdin).get('id', '$board'))")
         build_dir=/tmp/micropython-build-$board
 
         echo "building $descr $board"
-        $MICROPY_AUTOBUILD_MAKE BOARD=$board BUILD=$build_dir || return 1
-        for ext in $@; do
-            mv $build_dir/firmware.$ext $dest_dir/$descr$fw_tag.$ext
-        done
+        $MICROPY_AUTOBUILD_MAKE BOARD=$board BUILD=$build_dir && (
+            for ext in $@; do
+                mv $build_dir/firmware.$ext $dest_dir/$descr$fw_tag.$ext
+            done
+        )
         rm -rf $build_dir
     done
 }
@@ -51,3 +52,7 @@ function build_rp2_boards {
 function build_samd_boards {
     build_boards $1 $2 samd_soc.c uf2
 }
+
+function build_stm32_boards {
+    build_boards $1 $2 modpyb.c dfu hex
+}
diff --git a/tools/autobuild/build-stm32-latest.sh b/tools/autobuild/build-stm32-extra.sh
similarity index 82%
rename from tools/autobuild/build-stm32-latest.sh
rename to tools/autobuild/build-stm32-extra.sh
index 283c8a45b8134..43842d6c90741 100755
--- a/tools/autobuild/build-stm32-latest.sh
+++ b/tools/autobuild/build-stm32-extra.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+# Build additional variants of pyboard firmware (base variants are built by build-boards.sh).
 
 # function for building firmware
 function do_build() {
@@ -10,6 +11,7 @@ function do_build() {
     build_dir=/tmp/stm-build-$board
     $MICROPY_AUTOBUILD_MAKE $@ BOARD=$board BUILD=$build_dir || exit 1
     mv $build_dir/firmware.dfu $dest_dir/$descr$fw_tag.dfu
+    mv $build_dir/firmware.hex $dest_dir/$descr$fw_tag.hex
     rm -rf $build_dir
 }
 
@@ -31,26 +33,15 @@ fi
 # build the versions
 do_build pybv3 PYBV3
 do_build pybv3-network PYBV3 MICROPY_PY_WIZNET5K=5200 MICROPY_PY_CC3K=1
-do_build pybv10 PYBV10
 do_build pybv10-dp PYBV10 MICROPY_FLOAT_IMPL=double
 do_build pybv10-thread PYBV10 CFLAGS_EXTRA='-DMICROPY_PY_THREAD=1'
 do_build pybv10-dp-thread PYBV10 MICROPY_FLOAT_IMPL=double CFLAGS_EXTRA='-DMICROPY_PY_THREAD=1'
 do_build pybv10-network PYBV10 MICROPY_PY_WIZNET5K=5200 MICROPY_PY_CC3K=1
-do_build pybv11 PYBV11
 do_build pybv11-dp PYBV11 MICROPY_FLOAT_IMPL=double
 do_build pybv11-thread PYBV11 CFLAGS_EXTRA='-DMICROPY_PY_THREAD=1'
 do_build pybv11-dp-thread PYBV11 MICROPY_FLOAT_IMPL=double CFLAGS_EXTRA='-DMICROPY_PY_THREAD=1'
 do_build pybv11-network PYBV11 MICROPY_PY_WIZNET5K=5200 MICROPY_PY_CC3K=1
-do_build pyblitev10 PYBLITEV10
 do_build pyblitev10-dp PYBLITEV10 MICROPY_FLOAT_IMPL=double
 do_build pyblitev10-thread PYBLITEV10 CFLAGS_EXTRA='-DMICROPY_PY_THREAD=1'
 do_build pyblitev10-dp-thread PYBLITEV10 MICROPY_FLOAT_IMPL=double CFLAGS_EXTRA='-DMICROPY_PY_THREAD=1'
 do_build pyblitev10-network PYBLITEV10 MICROPY_PY_WIZNET5K=5200 MICROPY_PY_CC3K=1
-do_build PYBD-SF2 PYBD_SF2
-do_build PYBD-SF3 PYBD_SF3
-do_build PYBD-SF6 PYBD_SF6
-
-for board in boards/{NUCLEO_*,STM32F*DISC,B_L*,USBDONGLE_WB55,ESPRUINO_PICO} ; do
-    bd=$(basename $board)
-    do_build $bd $bd USE_MBOOT=0 MBOOT_ENABLE_PACKING=0
-done

From 81f706aee46d60aa8a91c524da839f743e4cc608 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Mon, 26 Jul 2021 12:48:25 +0200
Subject: [PATCH 1442/3533] mimxrt: Support PWM using the FLEXPWM and QTMR
 modules.

Frequency range 15Hz/18Hz to > 1 MHz, with decreasing resolution of the
duty cycle.  The basic API is supported as documentated, except that
keyword parameters are accepted for both the instatiaton and the
PWM.init() call.

Extensions: support PWM for channel pairs.  Channel pairs are declared by
supplying 2-element tuples for the pins.  The two channels of a pair must
be the A/B channel of a FLEXPWM module.  These form than a complementary
pair.

Additional supported keyword arguments:

- center=value Defines the center position of a pulse within the pulse
  cycle.  The align keyword is actually shortcut for center.

- sync=True|False: If set to True, the channels will be synchronized to a
  submodule 0 channel, which has already to be enabled.

- align=PWM.MIDDLE | PMW.BEGIN | PWM.END. It defines, whether synchronized
  channels are Center-Aligned or Edge-aligned.  The channels must be either
  complementary a channel pair or a group of synchronized channels.  It may
  as well be applied to a single channel, but withiout any benefit.

- invert= 0..3. Controls ouput inversion of the pins.  Bit 0 controls the
  first pin, bit 1 the second.

- deadtime=time_ns time of complementary channels for delaying the rising
  slope.

- xor=0|1|2 xor causes the output of channel A and B to be xored.  If
  applied to a X channel, it shows the value oif A ^ B.  If applied to an A
  or B channel, both channel show the xored signal for xor=1.  For xor=2,
  the xored signal is split between channels A and B.  See also the
  Reference Manual, chapter about double pulses.  The behavior of xor=2 can
  also be achieved using the center method for locating a pulse within a
  clock period.

The output is enabled for board pins only.

CPU pins may still be used for FLEXPWM, e.g. as sync source, but the signal
will not be routed to the output.  That applies only to FLEXPWM pins.  The
use of QTMR pins which are not board pins will be rejected.

As part of this commit, the _WFE() statement is removed from
ticks_delay_us64() to prevent PWM glitching during calls to sleep().
---
 ports/mimxrt/Makefile                         |   8 +
 .../boards/MIMXRT1010_EVK/mpconfigboard.h     |   4 +-
 ports/mimxrt/boards/MIMXRT1021.ld             |   4 +-
 ports/mimxrt/boards/MIMXRT1021_af.csv         |  72 +-
 ports/mimxrt/boards/make-pins.py              |  28 +-
 ports/mimxrt/hal/pwm_backport.c               | 180 +++++
 ports/mimxrt/hal/pwm_backport.h               |  51 ++
 ports/mimxrt/machine_pwm.c                    | 618 ++++++++++++++++++
 ports/mimxrt/main.c                           |   1 +
 ports/mimxrt/modmachine.c                     |   1 +
 ports/mimxrt/modmachine.h                     |   2 +
 ports/mimxrt/mpconfigport.h                   |   4 +
 ports/mimxrt/ticks.c                          |   4 +-
 13 files changed, 922 insertions(+), 55 deletions(-)
 create mode 100644 ports/mimxrt/hal/pwm_backport.c
 create mode 100644 ports/mimxrt/hal/pwm_backport.h
 create mode 100644 ports/mimxrt/machine_pwm.c

diff --git a/ports/mimxrt/Makefile b/ports/mimxrt/Makefile
index 7cda558bdc581..eeab29ddc3a87 100644
--- a/ports/mimxrt/Makefile
+++ b/ports/mimxrt/Makefile
@@ -194,6 +194,7 @@ SRC_HAL_IMX_C += \
 	$(MCU_DIR)/drivers/fsl_lpuart.c \
 	$(MCU_DIR)/drivers/fsl_ocotp.c \
 	$(MCU_DIR)/drivers/fsl_pit.c \
+	$(MCU_DIR)/drivers/fsl_pwm.c \
 	$(MCU_DIR)/drivers/fsl_snvs_lp.c \
 	$(MCU_DIR)/drivers/fsl_trng.c \
 	$(MCU_DIR)/drivers/fsl_wdog.c \
@@ -209,6 +210,11 @@ ifeq ($(MICROPY_PY_MACHINE_SDCARD),1)
 SRC_HAL_IMX_C += $(MCU_DIR)/drivers/fsl_usdhc.c
 endif
 
+ifeq ($(MCU_SERIES),$(filter $(MCU_SERIES), MIMXRT1015 MIMXRT1021 MIMXRT1052 MIMXRT1062 MIMXRT1064))
+SRC_HAL_IMX_C += \
+	$(MCU_DIR)/drivers/fsl_qtmr.c
+endif
+
 SRC_C += \
 	board_init.c \
 	dma_channel.c \
@@ -220,6 +226,7 @@ SRC_C += \
 	extmod/modusocket.c \
 	extmod/uos_dupterm.c \
 	fatfs_port.c \
+	hal/pwm_backport.c \
 	led.c \
 	machine_adc.c \
 	machine_bitstream.c \
@@ -384,6 +391,7 @@ SRC_QSTR += \
 	machine_adc.c \
 	machine_led.c \
 	machine_pin.c \
+	machine_pwm.c \
 	machine_rtc.c \
 	machine_sdcard.c \
 	machine_spi.c \
diff --git a/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.h b/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.h
index 918513b2306ef..7b2d2a8a638f2 100644
--- a/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.h
+++ b/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.h
@@ -14,12 +14,12 @@
 // LPUART4 on D6/D7 -> 2
 
 #define MICROPY_HW_UART_NUM     (sizeof(uart_index_table) / sizeof(uart_index_table)[0])
-#define MICROPY_HW_UART_INDEX   { 0, 1, 4, 3 }
+#define MICROPY_HW_UART_INDEX   { 0, 1, 4 }
 
 #define IOMUX_TABLE_UART \
     { IOMUXC_GPIO_10_LPUART1_TXD }, { IOMUXC_GPIO_09_LPUART1_RXD }, \
     { 0 }, { 0 }, \
-    { IOMUXC_GPIO_08_LPUART3_TXD }, { IOMUXC_GPIO_AD_07_LPUART3_RXD }, \
+    { 0 }, { 0 }, \
     { IOMUXC_GPIO_AD_02_LPUART4_TXD }, { IOMUXC_GPIO_AD_01_LPUART4_RXD },
 
 #define MICROPY_HW_SPI_INDEX { 1 }
diff --git a/ports/mimxrt/boards/MIMXRT1021.ld b/ports/mimxrt/boards/MIMXRT1021.ld
index 64f4e537e03a5..1263cd336c52e 100644
--- a/ports/mimxrt/boards/MIMXRT1021.ld
+++ b/ports/mimxrt/boards/MIMXRT1021.ld
@@ -21,11 +21,11 @@ vfs_start           = flash_start + 0x00100000;
 text_size           = ((vfs_start) - (text_start));
 vfs_size            = ((flash_end) - (vfs_start));
 itcm_start          = 0x00000000;
-itcm_size           = 0x00008000;
+itcm_size           = 0x00010000;
 dtcm_start          = 0x20000000;
 dtcm_size           = 0x00018000;
 ocrm_start          = 0x20200000;
-ocrm_size           = 0x00020000;
+ocrm_size           = 0x00018000;
 
 #ifdef MICROPY_HW_SDRAM_AVAIL
 sdram_start         = 0x80000000;
diff --git a/ports/mimxrt/boards/MIMXRT1021_af.csv b/ports/mimxrt/boards/MIMXRT1021_af.csv
index 668b415f0ba7a..3ce38eb0b9a46 100644
--- a/ports/mimxrt/boards/MIMXRT1021_af.csv
+++ b/ports/mimxrt/boards/MIMXRT1021_af.csv
@@ -5,30 +5,30 @@ GPIO_AD_B0_02,JTAG_MOD,,,,,GPIO1_IO02,USBPHY1_TSTI_TX_LS_MODE,GPT1_CAPTURE1,,,,,
 GPIO_AD_B0_03,JTAG_TDI,USDHC2_CD_B,WDOG1_B,SAI1_MCLK,USDHC1_WP,GPIO1_IO03,USB_OTG1_OC,CCM_PMIC_RDY,,,,,ALT0
 GPIO_AD_B0_04,JTAG_TDO,FLEXCAN1_TX,USDHC1_WP,TMR2_TIMER0,ENET_MDIO,GPIO1_IO04,USB_OTG1_PWR,EWM_OUT_B,,,,,ALT0
 GPIO_AD_B0_05,JTAG_TRSTB,FLEXCAN1_RX,USDHC1_CD_B,TMR2_TIMER1,ENET_MDC,GPIO1_IO05,USB_OTG1_ID,ARM_NMI,,,,,ALT0
-GPIO_AD_B0_06,PIT_TRIGGER0,MQS_RIGHT,LPUART1_TXD,TMR2_TIMER2,FLEXPWM2_PWMA3,GPIO1_IO06,REF_32K_OUT,,,,,,ALT5
-GPIO_AD_B0_07,PIT_TRIGGER1,MQS_LEFT,LPUART1_RXD,TMR2_TIMER3,FLEXPWM2_PWMB3,GPIO1_IO07,REF_24M_OUT,,,,,,ALT5
+GPIO_AD_B0_06,PIT_TRIGGER0,MQS_RIGHT,LPUART1_TXD,TMR2_TIMER2,FLEXPWM2_PWM3_A,GPIO1_IO06,REF_32K_OUT,,,,,,ALT5
+GPIO_AD_B0_07,PIT_TRIGGER1,MQS_LEFT,LPUART1_RXD,TMR2_TIMER3,FLEXPWM2_PWM3_B,GPIO1_IO07,REF_24M_OUT,,,,,,ALT5
 GPIO_AD_B0_08,ENET_TX_CLK,LPI2C3_SCL,LPUART1_CTS_B,KPP_COL0,ENET_REF_CLK,GPIO1_IO08,ARM_CM7_TXEV,,,,,ACMP1_IN4,ALT5
 GPIO_AD_B0_09,ENET_RX_DATA1,LPI2C3_SDA,LPUART1_RTS_B,KPP_ROW0,,GPIO1_IO09,ARM_CM7_RXEV,,,,,ACMP2_IN4,ALT5
-GPIO_AD_B0_10,ENET_RX_DATA0,LPSPI1_SCK,LPUART5_TXD,KPP_COL1,FLEXPWM2_PWMA2,GPIO1_IO10,ARM_TRACE_CLK,,,,,ACMP3_IN4,ALT5
-GPIO_AD_B0_11,ENET_RX_EN,LPSPI1_PCS0,LPUART5_RXD,KPP_ROW1,FLEXPWM2_PWMB2,GPIO1_IO11,ARM_TRACE_SWO,,,,,ACMP4_IN4,ALT5
-GPIO_AD_B0_12,ENET_RX_ER,LPSPI1_SDO,LPUART3_CTS_B,KPP_COL2,FLEXPWM2_PWMA1,GPIO1_IO12,ARM_TRACE0,SNVS_VIO_5_CTL,,,ADC1_IN0,,ALT5
-GPIO_AD_B0_13,ENET_TX_EN,LPSPI1_SDI,LPUART3_RTS_B,KPP_ROW2,FLEXPWM2_PWMB1,GPIO1_IO13,,SNVS_VIO_5_B,,,ADC2_IN0,,ALT5
-GPIO_AD_B0_14,ENET_TX_DATA0,FLEXCAN2_TX,LPUART3_TXD,KPP_COL3,FLEXPWM2_PWMA0,GPIO1_IO14,,WDOG1_ANY,,,"ADC1_IN1,ADC2_IN1","ACMP1_IN0,ACMP2_IN0,ACMP3_IN0,ACMP4_IN0",ALT5
-GPIO_AD_B0_15,ENET_TX_DATA1,FLEXCAN2_RX,LPUART3_RXD,KPP_ROW3,FLEXPWM2_PWMB0,GPIO1_IO15,,,,,"ADC1_IN2,ADC2_IN2","ACMP1_IN1,ACMP2_IN1,ACMP3_IN1,ACMP4_IN1",ALT5
+GPIO_AD_B0_10,ENET_RX_DATA0,LPSPI1_SCK,LPUART5_TXD,KPP_COL1,FLEXPWM2_PWM2_A,GPIO1_IO10,ARM_TRACE_CLK,,,,,ACMP3_IN4,ALT5
+GPIO_AD_B0_11,ENET_RX_EN,LPSPI1_PCS0,LPUART5_RXD,KPP_ROW1,FLEXPWM2_PWM2_B,GPIO1_IO11,ARM_TRACE_SWO,,,,,ACMP4_IN4,ALT5
+GPIO_AD_B0_12,ENET_RX_ER,LPSPI1_SDO,LPUART3_CTS_B,KPP_COL2,FLEXPWM2_PWM1_A,GPIO1_IO12,ARM_TRACE0,SNVS_VIO_5_CTL,,,ADC1_IN0,,ALT5
+GPIO_AD_B0_13,ENET_TX_EN,LPSPI1_SDI,LPUART3_RTS_B,KPP_ROW2,FLEXPWM2_PWM1_B,GPIO1_IO13,,SNVS_VIO_5_B,,,ADC2_IN0,,ALT5
+GPIO_AD_B0_14,ENET_TX_DATA0,FLEXCAN2_TX,LPUART3_TXD,KPP_COL3,FLEXPWM2_PWM0_A,GPIO1_IO14,,WDOG1_ANY,,,"ADC1_IN1,ADC2_IN1","ACMP1_IN0,ACMP2_IN0,ACMP3_IN0,ACMP4_IN0",ALT5
+GPIO_AD_B0_15,ENET_TX_DATA1,FLEXCAN2_RX,LPUART3_RXD,KPP_ROW3,FLEXPWM2_PWM0_B,GPIO1_IO15,,,,,"ADC1_IN2,ADC2_IN2","ACMP1_IN1,ACMP2_IN1,ACMP3_IN1,ACMP4_IN1",ALT5
 GPIO_AD_B1_00,SEMC_RDY,FLEXSPI_A_DATA3,FLEXCAN2_TX,SAI1_MCLK,FLEXIO1_D15,GPIO1_IO16,ENET_1588_EVENT2_OUT,KPP_COL4,,,,ACMP1_IN2,ALT5
 GPIO_AD_B1_01,SEMC_CSX0,FLEXSPI_A_SCLK,FLEXCAN2_RX,SAI1_TX_BCLK,FLEXIO1_D14,GPIO1_IO17,ENET_1588_EVENT2_IN,KPP_ROW4,,,ADC1_IN3,ACMP2_IN2,ALT5
 GPIO_AD_B1_02,SEMC_CSX1,FLEXSPI_A_DATA0,LPSPI4_SCK,SAI1_TX_SYNC,FLEXIO1_D13,GPIO1_IO18,ENET_1588_EVENT3_OUT,KPP_COL5,,,ADC2_IN3,ACMP3_IN2,ALT5
 GPIO_AD_B1_03,SEMC_CSX2,FLEXSPI_A_DATA2,LPSPI4_PCS0,SAI1_TX_DATA0,FLEXIO1_D12,GPIO1_IO19,ENET_1588_EVENT3_IN,KPP_ROW5,,,ADC1_IN4,ACMP4_IN2,ALT5
 GPIO_AD_B1_04,SEMC_CSX3,FLEXSPI_A_DATA1,LPSPI4_SDO,SAI1_RX_SYNC,FLEXIO1_D11,GPIO1_IO20,LPSPI1_PCS1,KPP_COL6,,,ADC2_IN4,ACMP1_IN3,ALT5
 GPIO_AD_B1_05,USDHC1_WP,FLEXSPI_A_SS0_B,LPSPI4_SDI,SAI1_RX_DATA0,FLEXIO1_D10,GPIO1_IO21,LPSPI1_PCS2,KPP_ROW6,,,"ADC1_IN5,ADC2_IN5",ACMP2_IN3,ALT5
-GPIO_AD_B1_06,USDHC1_RESET_B,FLEXPWM1_PWMA0,LPUART2_CTS_B,SAI1_RX_BCLK,FLEXIO1_D09,GPIO1_IO22,LPSPI1_PCS3,KPP_COL7,,,"ADC1_IN6,ADC2_IN6",ACMP3_IN3,ALT5
-GPIO_AD_B1_07,USDHC1_VSELECT,FLEXPWM1_PWMB0,LPUART2_RTS_B,SAI1_TX_DATA1,FLEXIO1_D08,GPIO1_IO23,LPSPI3_PCS3,KPP_ROW7,,,"ADC1_IN7,ADC2_IN7",ACMP4_IN3,ALT5
-GPIO_AD_B1_08,LPI2C2_SCL,FLEXPWM1_PWMA1,LPUART2_TXD,SAI1_TX_DATA2,FLEXIO1_D07,GPIO1_IO24,LPSPI3_PCS2,XBAR_INOUT12,,,"ADC1_IN8,ADC2_IN8",ACMP1_IN5,ALT5
-GPIO_AD_B1_09,LPI2C2_SDA,FLEXPWM1_PWMB1,LPUART2_RXD,SAI1_TX_DATA3,FLEXIO1_D06,GPIO1_IO25,LPSPI3_PCS1,XBAR_INOUT13,,,"ADC1_IN9,ADC2_IN9",ACMP2_IN5,ALT5
-GPIO_AD_B1_10,USB_OTG1_PWR,FLEXPWM1_PWMA2,LPUART4_TXD,USDHC1_CD_B,FLEXIO1_D05,GPIO1_IO26,GPT2_CAPTURE1,,,,"ADC1_IN10,ADC2_IN10",ACMP3_IN5,ALT5
-GPIO_AD_B1_11,USB_OTG1_ID,FLEXPWM1_PWMB2,LPUART4_RXD,USDHC1_WP,FLEXIO1_D04,GPIO1_IO27,GPT2_COMPARE1,,,,"ADC1_IN11,ADC2_IN11",ACMP4_IN5,ALT5
-GPIO_AD_B1_12,USB_OTG1_OC,ACMP1_OUT,LPSPI3_SCK,USDHC2_CD_B,FLEXIO1_D03,GPIO1_IO28,FLEXPWM1_PWMA3,,,,"ADC1_IN12,ADC2_IN12","ACMP1_IN6,ACMP1_OUT",ALT5
-GPIO_AD_B1_13,LPI2C1_HREQ,ACMP2_OUT,LPSPI3_PCS0,USDHC2_WP,FLEXIO1_D02,GPIO1_IO29,FLEXPWM1_PWMB3,,,,"ADC1_IN13,ADC2_IN13","ACMP2_IN6,ACMP2_OUT",ALT5
+GPIO_AD_B1_06,USDHC1_RESET_B,FLEXPWM1_PWM0_A,LPUART2_CTS_B,SAI1_RX_BCLK,FLEXIO1_D09,GPIO1_IO22,LPSPI1_PCS3,KPP_COL7,,,"ADC1_IN6,ADC2_IN6",ACMP3_IN3,ALT5
+GPIO_AD_B1_07,USDHC1_VSELECT,FLEXPWM1_PWM0_B,LPUART2_RTS_B,SAI1_TX_DATA1,FLEXIO1_D08,GPIO1_IO23,LPSPI3_PCS3,KPP_ROW7,,,"ADC1_IN7,ADC2_IN7",ACMP4_IN3,ALT5
+GPIO_AD_B1_08,LPI2C2_SCL,FLEXPWM1_PWM1_A,LPUART2_TXD,SAI1_TX_DATA2,FLEXIO1_D07,GPIO1_IO24,LPSPI3_PCS2,XBAR_INOUT12,,,"ADC1_IN8,ADC2_IN8",ACMP1_IN5,ALT5
+GPIO_AD_B1_09,LPI2C2_SDA,FLEXPWM1_PWM1_B,LPUART2_RXD,SAI1_TX_DATA3,FLEXIO1_D06,GPIO1_IO25,LPSPI3_PCS1,XBAR_INOUT13,,,"ADC1_IN9,ADC2_IN9",ACMP2_IN5,ALT5
+GPIO_AD_B1_10,USB_OTG1_PWR,FLEXPWM1_PWM2_A,LPUART4_TXD,USDHC1_CD_B,FLEXIO1_D05,GPIO1_IO26,GPT2_CAPTURE1,,,,"ADC1_IN10,ADC2_IN10",ACMP3_IN5,ALT5
+GPIO_AD_B1_11,USB_OTG1_ID,FLEXPWM1_PWM2_B,LPUART4_RXD,USDHC1_WP,FLEXIO1_D04,GPIO1_IO27,GPT2_COMPARE1,,,,"ADC1_IN11,ADC2_IN11",ACMP4_IN5,ALT5
+GPIO_AD_B1_12,USB_OTG1_OC,ACMP1_OUT,LPSPI3_SCK,USDHC2_CD_B,FLEXIO1_D03,GPIO1_IO28,FLEXPWM1_PWM3_A,,,,"ADC1_IN12,ADC2_IN12","ACMP1_IN6,ACMP1_OUT",ALT5
+GPIO_AD_B1_13,LPI2C1_HREQ,ACMP2_OUT,LPSPI3_PCS0,USDHC2_WP,FLEXIO1_D02,GPIO1_IO29,FLEXPWM1_PWM3_B,,,,"ADC1_IN13,ADC2_IN13","ACMP2_IN6,ACMP2_OUT",ALT5
 GPIO_AD_B1_14,LPI2C1_SCL,ACMP3_OUT,LPSPI3_SDO,ENET_1588_EVENT0_OUT,FLEXIO1_D01,GPIO1_IO30,,,,,"ADC1_IN14,ADC2_IN14","ACMP3_IN6,ACMP3_OUT",ALT5
 GPIO_AD_B1_15,LPI2C1_SDA,ACMP4_OUT,LPSPI3_SDI,ENET_1588_EVENT0_IN,FLEXIO1_D00,GPIO1_IO31,,,,,"ADC1_IN15,ADC2_IN15","ACMP4_IN6,ACMP4_OUT",ALT5
 GPIO_EMC_00,SEMC_DA00,TMR2_TIMER0,LPUART4_CTS_B,SPDIF_SR_CLK,LPSPI2_SCK,GPIO2_IO00,FLEXCAN1_TX,PIT_TRIGGER2,,,,,ALT5
@@ -41,36 +41,36 @@ GPIO_EMC_06,SEMC_DA06,XBAR_INOUT06,LPUART3_TXD,SAI2_TX_DATA,FLEXIO1_D18,GPIO2_IO
 GPIO_EMC_07,SEMC_DA07,XBAR_INOUT07,LPUART3_RXD,SAI2_RX_SYNC,FLEXIO1_D19,GPIO2_IO07,USBPHY1_TSTO_RX_SQUELCH,,,,,,ALT5
 GPIO_EMC_08,SEMC_DM0,XBAR_INOUT08,FLEXCAN2_TX,SAI2_RX_DATA,FLEXIO1_D20,GPIO2_IO08,USBPHY1_TSTO_RX_DISCON_DET,,,,,,ALT5
 GPIO_EMC_09,SEMC_WE,XBAR_INOUT09,FLEXCAN2_RX,SAI2_RX_BCLK,FLEXIO1_D21,GPIO2_IO09,USBPHY1_TSTO_RX_HS_RXD,,,,,,ALT5
-GPIO_EMC_10,SEMC_CAS,XBAR_INOUT10,LPI2C4_SDA,SAI1_TX_SYNC,LPSPI2_SCK,GPIO2_IO10,FLEXPWM2_PWMX0,,,,,,ALT5
-GPIO_EMC_11,SEMC_RAS,XBAR_INOUT11,LPI2C4_SCL,SAI1_TX_BCLK,LPSPI2_PCS0,GPIO2_IO11,FLEXPWM2_PWMX1,,,,,,ALT5
-GPIO_EMC_12,SEMC_CS0,XBAR_INOUT12,LPUART6_TXD,SAI1_TX_DATA0,LPSPI2_SDO,GPIO2_IO12,FLEXPWM2_PWMX2,,,,,,ALT5
-GPIO_EMC_13,SEMC_BA0,XBAR_INOUT13,LPUART6_RXD,SAI1_RX_DATA0,LPSPI2_SDI,GPIO2_IO13,FLEXPWM2_PWMX3,CCM_PMIC_RDY,,,,,ALT5
+GPIO_EMC_10,SEMC_CAS,XBAR_INOUT10,LPI2C4_SDA,SAI1_TX_SYNC,LPSPI2_SCK,GPIO2_IO10,FLEXPWM2_PWM0_X,,,,,,ALT5
+GPIO_EMC_11,SEMC_RAS,XBAR_INOUT11,LPI2C4_SCL,SAI1_TX_BCLK,LPSPI2_PCS0,GPIO2_IO11,FLEXPWM2_PWM1_X,,,,,,ALT5
+GPIO_EMC_12,SEMC_CS0,XBAR_INOUT12,LPUART6_TXD,SAI1_TX_DATA0,LPSPI2_SDO,GPIO2_IO12,FLEXPWM2_PWM2_X,,,,,,ALT5
+GPIO_EMC_13,SEMC_BA0,XBAR_INOUT13,LPUART6_RXD,SAI1_RX_DATA0,LPSPI2_SDI,GPIO2_IO13,FLEXPWM2_PWM3_X,CCM_PMIC_RDY,,,,,ALT5
 GPIO_EMC_14,SEMC_BA1,XBAR_INOUT14,LPUART6_CTS_B,SAI1_RX_BCLK,LPSPI2_PCS1,GPIO2_IO14,FLEXCAN1_TX,,,,,,ALT5
 GPIO_EMC_15,SEMC_ADDR10,XBAR_INOUT15,LPUART6_RTS_B,SAI1_RX_SYNC,WDOG1_B,GPIO2_IO15,FLEXCAN1_RX,,,,,,ALT5
 GPIO_EMC_16,SEMC_ADDR00,,MQS_RIGHT,SAI2_MCLK,,GPIO2_IO16,SRC_BOOT_MODE0,,,,,,ALT5
 GPIO_EMC_17,SEMC_ADDR01,,MQS_LEFT,SAI3_MCLK,,GPIO2_IO17,SRC_BOOT_MODE1,,,,,,ALT5
 GPIO_EMC_18,SEMC_ADDR02,XBAR_INOUT16,LPI2C2_SDA,SAI1_RX_SYNC,FLEXIO1_D22,GPIO2_IO18,SRC_BT_CFG0,,,,,,ALT5
 GPIO_EMC_19,SEMC_ADDR03,XBAR_INOUT17,LPI2C2_SCL,SAI1_RX_BCLK,FLEXIO1_D23,GPIO2_IO19,SRC_BT_CFG1,,,,,,ALT5
-GPIO_EMC_20,SEMC_ADDR04,FLEXPWM1_PWMA3,LPUART2_CTS_B,SAI1_MCLK,FLEXIO1_D24,GPIO2_IO20,SRC_BT_CFG2,,,,,,ALT5
-GPIO_EMC_21,SEMC_ADDR05,FLEXPWM1_PWMB3,LPUART2_RTS_B,SAI1_RX_DATA0,FLEXIO1_D25,GPIO2_IO21,SRC_BT_CFG3,,,,,,ALT5
-GPIO_EMC_22,SEMC_ADDR06,FLEXPWM1_PWMA2,LPUART2_TXD,SAI1_TX_DATA3,FLEXIO1_D26,GPIO2_IO22,SRC_BT_CFG4,,,,,,ALT5
-GPIO_EMC_23,SEMC_ADDR07,FLEXPWM1_PWMB2,LPUART2_RXD,SAI1_TX_DATA2,FLEXIO1_D27,GPIO2_IO23,SRC_BT_CFG5,,,,,,ALT5
-GPIO_EMC_24,SEMC_ADDR08,FLEXPWM1_PWMA1,LPUART8_CTS_B,SAI1_TX_DATA1,FLEXIO1_D28,GPIO2_IO24,SRC_BT_CFG6,,,,,,ALT5
-GPIO_EMC_25,SEMC_ADDR09,FLEXPWM1_PWMB1,LPUART8_RTS_B,SAI1_TX_DATA0,FLEXIO1_D29,GPIO2_IO25,SRC_BT_CFG7,,,,,,ALT5
-GPIO_EMC_26,SEMC_ADDR11,FLEXPWM1_PWMA0,LPUART8_TXD,SAI1_TX_BCLK,FLEXIO1_D30,GPIO2_IO26,SRC_BT_CFG8,,,,,,ALT5
-GPIO_EMC_27,SEMC_ADDR12,FLEXPWM1_PWMB0,LPUART8_RXD,SAI1_TX_SYNC,FLEXIO1_D31,GPIO2_IO27,SRC_BT_CFG9,,,,,,ALT5
-GPIO_EMC_28,SEMC_DQS,FLEXPWM2_PWMA3,XBAR_INOUT18,SAI3_MCLK,EWM_OUT_B,GPIO2_IO28,GPT2_CAPTURE2,FLEXPWM1_PWMX0,,,,,ALT5
-GPIO_EMC_29,SEMC_CKE,FLEXPWM2_PWMB3,XBAR_INOUT19,SAI3_RX_BCLK,WDOG2_RST_B_DEB,GPIO2_IO29,GPT2_COMPARE2,FLEXPWM1_PWMX1,,,,,ALT5
-GPIO_EMC_30,SEMC_CLK,FLEXPWM2_PWMA2,LPUART4_CTS_B,SAI3_RX_SYNC,WDOG1_RST_B_DEB,GPIO2_IO30,GPT2_COMPARE3,FLEXPWM1_PWMX2,,,,,ALT5
-GPIO_EMC_31,SEMC_DM1,FLEXPWM2_PWMB2,LPUART4_RTS_B,SAI3_RX_DATA,WDOG2_B,GPIO2_IO31,GPT2_CLK,FLEXPWM1_PWMX3,,,,,ALT5
+GPIO_EMC_20,SEMC_ADDR04,FLEXPWM1_PWM3_A,LPUART2_CTS_B,SAI1_MCLK,FLEXIO1_D24,GPIO2_IO20,SRC_BT_CFG2,,,,,,ALT5
+GPIO_EMC_21,SEMC_ADDR05,FLEXPWM1_PWM3_B,LPUART2_RTS_B,SAI1_RX_DATA0,FLEXIO1_D25,GPIO2_IO21,SRC_BT_CFG3,,,,,,ALT5
+GPIO_EMC_22,SEMC_ADDR06,FLEXPWM1_PWM2_A,LPUART2_TXD,SAI1_TX_DATA3,FLEXIO1_D26,GPIO2_IO22,SRC_BT_CFG4,,,,,,ALT5
+GPIO_EMC_23,SEMC_ADDR07,FLEXPWM1_PWM2_B,LPUART2_RXD,SAI1_TX_DATA2,FLEXIO1_D27,GPIO2_IO23,SRC_BT_CFG5,,,,,,ALT5
+GPIO_EMC_24,SEMC_ADDR08,FLEXPWM1_PWM1_A,LPUART8_CTS_B,SAI1_TX_DATA1,FLEXIO1_D28,GPIO2_IO24,SRC_BT_CFG6,,,,,,ALT5
+GPIO_EMC_25,SEMC_ADDR09,FLEXPWM1_PWM1_B,LPUART8_RTS_B,SAI1_TX_DATA0,FLEXIO1_D29,GPIO2_IO25,SRC_BT_CFG7,,,,,,ALT5
+GPIO_EMC_26,SEMC_ADDR11,FLEXPWM1_PWM0_A,LPUART8_TXD,SAI1_TX_BCLK,FLEXIO1_D30,GPIO2_IO26,SRC_BT_CFG8,,,,,,ALT5
+GPIO_EMC_27,SEMC_ADDR12,FLEXPWM1_PWM0_B,LPUART8_RXD,SAI1_TX_SYNC,FLEXIO1_D31,GPIO2_IO27,SRC_BT_CFG9,,,,,,ALT5
+GPIO_EMC_28,SEMC_DQS,FLEXPWM2_PWM3_A,XBAR_INOUT18,SAI3_MCLK,EWM_OUT_B,GPIO2_IO28,GPT2_CAPTURE2,FLEXPWM1_PWM0_X,,,,,ALT5
+GPIO_EMC_29,SEMC_CKE,FLEXPWM2_PWM3_B,XBAR_INOUT19,SAI3_RX_BCLK,WDOG2_RST_B_DEB,GPIO2_IO29,GPT2_COMPARE2,FLEXPWM1_PWM1_X,,,,,ALT5
+GPIO_EMC_30,SEMC_CLK,FLEXPWM2_PWM2_A,LPUART4_CTS_B,SAI3_RX_SYNC,WDOG1_RST_B_DEB,GPIO2_IO30,GPT2_COMPARE3,FLEXPWM1_PWM2_X,,,,,ALT5
+GPIO_EMC_31,SEMC_DM1,FLEXPWM2_PWM2_B,LPUART4_RTS_B,SAI3_RX_DATA,WDOG2_B,GPIO2_IO31,GPT2_CLK,FLEXPWM1_PWM3_X,,,,,ALT5
 GPIO_EMC_32,SEMC_DA08,TMR1_TIMER0,LPUART4_TXD,SAI3_TX_DATA,LPSPI4_SCK,GPIO3_IO00,USBPHY1_TSTO_RX_FS_RXD,REF_24M_OUT,,,,,ALT5
 GPIO_EMC_33,SEMC_DA09,TMR1_TIMER1,LPUART4_RXD,SAI3_TX_BCLK,LPSPI4_PCS0,GPIO3_IO01,USBPHY1_TSTI_TX_DP,SRC_TESTER_ACK,,,,,ALT5
 GPIO_EMC_34,SEMC_DA10,TMR1_TIMER2,LPUART7_TXD,SAI3_TX_SYNC,LPSPI4_SDO,GPIO3_IO02,ENET_CRS,,,,,,ALT5
 GPIO_EMC_35,SEMC_DA11,TMR1_TIMER3,LPUART7_RXD,USDHC2_WP,LPSPI4_SDI,GPIO3_IO03,ENET_COL,,,,,,ALT5
-GPIO_EMC_36,SEMC_DA12,FLEXPWM2_PWMA1,LPUART5_CTS_B,CCM_PMIC_RDY,LPSPI4_PCS1,GPIO3_IO04,ENET_RX_CLK,USDHC1_WP,,,,,ALT5
-GPIO_EMC_37,SEMC_DA13,FLEXPWM2_PWMB1,LPUART5_RTS_B,MQS_RIGHT,LPSPI4_PCS2,GPIO3_IO05,ENET_RX_DATA3,USDHC1_VSELECT,,,,,ALT5
-GPIO_EMC_38,SEMC_DA14,FLEXPWM2_PWMA0,LPUART5_TXD,MQS_LEFT,LPSPI4_PCS3,GPIO3_IO06,ENET_RX_DATA2,USDHC1_CD_B,,,,,ALT5
-GPIO_EMC_39,SEMC_DA15,FLEXPWM2_PWMB0,LPUART5_RXD,USB_OTG1_OC,WDOG1_B,GPIO3_IO07,ENET_TX_ER,GPT1_CLK,,,,,ALT5
+GPIO_EMC_36,SEMC_DA12,FLEXPWM2_PWM1_A,LPUART5_CTS_B,CCM_PMIC_RDY,LPSPI4_PCS1,GPIO3_IO04,ENET_RX_CLK,USDHC1_WP,,,,,ALT5
+GPIO_EMC_37,SEMC_DA13,FLEXPWM2_PWM1_B,LPUART5_RTS_B,MQS_RIGHT,LPSPI4_PCS2,GPIO3_IO05,ENET_RX_DATA3,USDHC1_VSELECT,,,,,ALT5
+GPIO_EMC_38,SEMC_DA14,FLEXPWM2_PWM0_A,LPUART5_TXD,MQS_LEFT,LPSPI4_PCS3,GPIO3_IO06,ENET_RX_DATA2,USDHC1_CD_B,,,,,ALT5
+GPIO_EMC_39,SEMC_DA15,FLEXPWM2_PWM0_B,LPUART5_RXD,USB_OTG1_OC,WDOG1_B,GPIO3_IO07,ENET_TX_ER,GPT1_CLK,,,,,ALT5
 GPIO_EMC_40,SEMC_CSX0,XBAR_INOUT18,SPDIF_OUT,USB_OTG1_ID,ENET_MDIO,GPIO3_IO08,ENET_TX_DATA3,GPT1_COMPARE3,,,,,ALT5
 GPIO_EMC_41,SEMC_RDY,XBAR_INOUT19,SPDIF_IN,USB_OTG1_PWR,ENET_MDC,GPIO3_IO09,ENET_TX_DATA2,GPT1_COMPARE2,,,,,ALT5
 GPIO_SD_B0_00,USDHC1_DATA2,TMR1_TIMER0,SAI1_MCLK,SAI2_MCLK,LPI2C3_SCL,GPIO3_IO13,FLEXSPI_A_SS1_B,XBAR_INOUT14,,,,,ALT5
diff --git a/ports/mimxrt/boards/make-pins.py b/ports/mimxrt/boards/make-pins.py
index e13b9c578fd93..441676adde628 100644
--- a/ports/mimxrt/boards/make-pins.py
+++ b/ports/mimxrt/boards/make-pins.py
@@ -8,7 +8,7 @@
 import csv
 import re
 
-SUPPORTED_AFS = {"GPIO", "USDHC", "SEMC"}
+SUPPORTED_AFS = {"GPIO", "USDHC", "FLEXPWM", "TMR"}
 MAX_AF = 10  # AF0 .. AF9
 ADC_COL = 11
 
@@ -282,29 +282,33 @@ def print_header(self, hdr_filename):
             hdr_file.write("extern const mp_obj_dict_t machine_pin_board_pins_locals_dict;\n")
 
             hdr_file.write("\n// Defines\n")
-            usdhc_instance_factory(self.cpu_pins, hdr_file)
+            module_instance_factory(self.cpu_pins, hdr_file, "USDHC")
+            module_instance_factory(self.cpu_pins, hdr_file, "FLEXPWM")
+            module_instance_factory(self.cpu_pins, hdr_file, "TMR")
 
 
-def usdhc_instance_factory(pins, output_file):
-    usdhc_pins = filter(lambda p: any([af for af in p.alt_fn if "USDHC" in af.af_str]), pins)
+def module_instance_factory(pins, output_file, name):
+    module_pin = filter(lambda p: any([af for af in p.alt_fn if name in af.af_str]), pins)
 
-    usdhc_instances = dict()
-    for pin in usdhc_pins:
+    module_instances = dict()
+    for pin in module_pin:
         for idx, alt_fn in enumerate(pin.alt_fn):
-            if "USDHC" in alt_fn.instance:
+            if name in alt_fn.instance:
                 format_string = "#define {0}_{1} &pin_{0}, {2}"
-                if alt_fn.instance not in usdhc_instances:
-                    usdhc_instances[alt_fn.instance] = [
+                if alt_fn.instance not in module_instances:
+                    module_instances[alt_fn.instance] = [
                         format_string.format(pin.name, alt_fn.af_str, idx)
                     ]
                 else:
-                    usdhc_instances[alt_fn.instance].append(
+                    module_instances[alt_fn.instance].append(
                         format_string.format(pin.name, alt_fn.af_str, idx)
                     )
 
-    for k, v in usdhc_instances.items():
+    for k, v in module_instances.items():
         output_file.write(f"// {k}\n")
         output_file.write(f"#define {k}_AVAIL (1)\n")
+        if name == "FLEXPWM":
+            output_file.write(f"#define {k} {k[-4:]}\n")
         for i in v:
             output_file.write(i + "\n")
 
@@ -326,7 +330,7 @@ def main():
         "-i",
         "--iomux",
         dest="iomux_filename",
-        help="Specifies the fsl_iomux.h file for the chip",
+        help="Specifies the fsl_iomuxc.h file for the chip",
         default="fsl_iomuxc.h",
     )
     parser.add_argument(
diff --git a/ports/mimxrt/hal/pwm_backport.c b/ports/mimxrt/hal/pwm_backport.c
new file mode 100644
index 0000000000000..cea6642120675
--- /dev/null
+++ b/ports/mimxrt/hal/pwm_backport.c
@@ -0,0 +1,180 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * Copyright (c) 2015, Freescale Semiconductor, Inc.
+ * Copyright 2016-2017 NXP *
+ * Copyright (c) 2021 Robert Hammelrath
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
+ */
+
+// These are a few functions taken from the NXP-Lib
+// for PWM, for
+// - dealing with an u16 duty cycle setting,
+// - setting the pulse center position, and
+// - factoring out pure duty cycle change.
+
+#include "py/runtime.h"
+#include "hal/pwm_backport.h"
+
+void PWM_UpdatePwmDutycycle_u16(
+    PWM_Type *base, pwm_submodule_t subModule, pwm_channels_t pwmSignal, uint16_t dutyCycle, uint16_t Center_u16) {
+    assert((uint16_t)pwmSignal < 2U);
+    uint16_t pulseCnt = 0, pwmHighPulse = 0;
+    uint16_t center;
+
+    // check and confine bounds for Center_u16
+    if ((Center_u16 + dutyCycle / 2) >= PWM_FULL_SCALE) {
+        Center_u16 = PWM_FULL_SCALE - dutyCycle / 2 - 1;
+    } else if (Center_u16 < (dutyCycle / 2)) {
+        Center_u16 = dutyCycle / 2;
+    }
+    pulseCnt = base->SM[subModule].VAL1 + 1;
+    // Calculate pulse width and center position
+    pwmHighPulse = (pulseCnt * dutyCycle) / PWM_FULL_SCALE;
+    center = (pulseCnt * Center_u16) / PWM_FULL_SCALE;
+
+    // Setup the PWM dutycycle of channel A or B
+    if (pwmSignal == kPWM_PwmA) {
+        base->SM[subModule].VAL2 = center - pwmHighPulse / 2;
+        base->SM[subModule].VAL3 = base->SM[subModule].VAL2 + pwmHighPulse;
+    } else {
+        base->SM[subModule].VAL4 = center - pwmHighPulse / 2;
+        base->SM[subModule].VAL5 = base->SM[subModule].VAL4 + pwmHighPulse;
+    }
+}
+
+void PWM_SetupPwm_u16(PWM_Type *base, pwm_submodule_t subModule, pwm_signal_param_u16_t *chnlParams,
+    uint32_t pwmFreq_Hz, uint32_t srcClock_Hz, bool output_enable) {
+
+    uint32_t pwmClock;
+    uint16_t pulseCnt = 0;
+    uint8_t polarityShift = 0, outputEnableShift = 0;
+
+    // Divide the clock by the prescale value
+    pwmClock = (srcClock_Hz / (1U << ((base->SM[subModule].CTRL & PWM_CTRL_PRSC_MASK) >> PWM_CTRL_PRSC_SHIFT)));
+    pulseCnt = pwmClock / pwmFreq_Hz;
+    base->SM[subModule].INIT = 0;
+    base->SM[subModule].VAL1 = pulseCnt - 1;
+
+    // Set up the Registers VAL2..VAL5 controlling the duty cycle of channel A/B
+    PWM_UpdatePwmDutycycle_u16(base, subModule, chnlParams->pwmChannel,
+        chnlParams->dutyCycle_u16, chnlParams->Center_u16);
+
+    // Setup register shift values based on the channel being configured.
+    // Also setup the deadtime value
+    if (chnlParams->pwmChannel == kPWM_PwmA) {
+        polarityShift = PWM_OCTRL_POLA_SHIFT;
+        outputEnableShift = PWM_OUTEN_PWMA_EN_SHIFT;
+        base->SM[subModule].DTCNT0 = PWM_DTCNT0_DTCNT0(chnlParams->deadtimeValue);
+    } else {
+        polarityShift = PWM_OCTRL_POLB_SHIFT;
+        outputEnableShift = PWM_OUTEN_PWMB_EN_SHIFT;
+        base->SM[subModule].DTCNT1 = PWM_DTCNT1_DTCNT1(chnlParams->deadtimeValue);
+    }
+
+    // Setup signal active level
+    if (chnlParams->level == kPWM_HighTrue) {
+        base->SM[subModule].OCTRL &= ~(1U << polarityShift);
+    } else {
+        base->SM[subModule].OCTRL |= (1U << polarityShift);
+    }
+    // Enable PWM output
+    if (output_enable) {
+        base->OUTEN |= (1U << (outputEnableShift + subModule));
+    }
+}
+
+void PWM_SetupPwmx_u16(PWM_Type *base, pwm_submodule_t subModule,
+    uint32_t pwmFreq_Hz, uint16_t duty_cycle, uint8_t invert, uint32_t srcClock_Hz) {
+
+    uint32_t pulseCnt;
+    uint32_t pwmClock;
+
+    // Divide the clock by the prescale value
+    pwmClock = (srcClock_Hz / (1U << ((base->SM[subModule].CTRL & PWM_CTRL_PRSC_MASK) >> PWM_CTRL_PRSC_SHIFT)));
+    pulseCnt = pwmClock / pwmFreq_Hz;
+    base->SM[subModule].INIT = 0;
+    base->SM[subModule].VAL0 = ((uint32_t)duty_cycle * pulseCnt) / PWM_FULL_SCALE;
+    base->SM[subModule].VAL1 = pulseCnt - 1;
+
+    base->SM[subModule].OCTRL = (base->SM[subModule].OCTRL & ~PWM_OCTRL_POLX_MASK) | PWM_OCTRL_POLX(!invert);
+
+    base->OUTEN |= (1U << subModule);
+}
+
+void PWM_SetupFaultDisableMap(PWM_Type *base, pwm_submodule_t subModule,
+    pwm_channels_t pwmChannel, pwm_fault_channels_t pwm_fault_channels, uint16_t value) {
+    uint16_t reg = base->SM[subModule].DISMAP[pwm_fault_channels];
+    switch (pwmChannel) {
+        case kPWM_PwmA:
+            reg &= ~((uint16_t)PWM_DISMAP_DIS0A_MASK);
+            reg |= (((uint16_t)(value) << (uint16_t)PWM_DISMAP_DIS0A_SHIFT) & (uint16_t)PWM_DISMAP_DIS0A_MASK);
+            break;
+        case kPWM_PwmB:
+            reg &= ~((uint16_t)PWM_DISMAP_DIS0B_MASK);
+            reg |= (((uint16_t)(value) << (uint16_t)PWM_DISMAP_DIS0B_SHIFT) & (uint16_t)PWM_DISMAP_DIS0B_MASK);
+            break;
+        case kPWM_PwmX:
+            reg &= ~((uint16_t)PWM_DISMAP_DIS0X_MASK);
+            reg |= (((uint16_t)(value) << (uint16_t)PWM_DISMAP_DIS0X_SHIFT) & (uint16_t)PWM_DISMAP_DIS0X_MASK);
+            break;
+        default:
+            assert(false);
+            break;
+    }
+    base->SM[subModule].DISMAP[pwm_fault_channels] = reg;
+}
+
+#ifdef FSL_FEATURE_SOC_TMR_COUNT
+status_t QTMR_SetupPwm_u16(TMR_Type *base, qtmr_channel_selection_t channel, uint32_t pwmFreqHz,
+    uint16_t dutyCycleU16, bool outputPolarity, uint32_t srcClock_Hz, bool is_init) {
+    uint32_t periodCount, highCount, lowCount, reg;
+
+    if (dutyCycleU16 >= PWM_FULL_SCALE) {
+        // Invalid dutycycle
+        return kStatus_Fail;
+    }
+
+    // Counter values to generate a PWM signal
+    periodCount = (srcClock_Hz / pwmFreqHz) - 1;
+    highCount = (periodCount * dutyCycleU16) / PWM_FULL_SCALE;
+    lowCount = periodCount - highCount;
+
+    // Setup the compare registers for PWM output
+    if (is_init == false) {
+        base->CHANNEL[channel].COMP1 = lowCount;
+        base->CHANNEL[channel].COMP2 = highCount;
+    }
+
+    // Setup the pre-load registers for PWM output
+    base->CHANNEL[channel].CMPLD1 = lowCount;
+    base->CHANNEL[channel].CMPLD2 = highCount;
+
+    reg = base->CHANNEL[channel].CSCTRL;
+    // Setup the compare load control for COMP1 and COMP2.
+    // Load COMP1 when CSCTRL[TCF2] is asserted, load COMP2 when CSCTRL[TCF1] is asserted
+    reg &= ~(TMR_CSCTRL_CL1_MASK | TMR_CSCTRL_CL2_MASK);
+    reg |= (TMR_CSCTRL_CL1(kQTMR_LoadOnComp2) | TMR_CSCTRL_CL2(kQTMR_LoadOnComp1));
+    base->CHANNEL[channel].CSCTRL = reg;
+
+    // Set OFLAG pin for output mode
+    base->CHANNEL[channel].SCTRL |= TMR_SCTRL_OEN_MASK;
+    if (outputPolarity) {
+        // Invert the polarity
+        base->CHANNEL[channel].SCTRL |= TMR_SCTRL_OPS_MASK;
+    } else {
+        // True polarity, no inversion
+        base->CHANNEL[channel].SCTRL &= ~TMR_SCTRL_OPS_MASK;
+    }
+
+    reg = base->CHANNEL[channel].CTRL;
+    reg &= ~(TMR_CTRL_OUTMODE_MASK);
+    // Count until compare value is  reached and re-initialize the counter, toggle OFLAG output
+    // using alternating compare register
+    reg |= (TMR_CTRL_LENGTH_MASK | TMR_CTRL_OUTMODE(kQTMR_ToggleOnAltCompareReg));
+    base->CHANNEL[channel].CTRL = reg;
+
+    return kStatus_Success;
+}
+#endif // FSL_FEATURE_SOC_TMR_COUNT
diff --git a/ports/mimxrt/hal/pwm_backport.h b/ports/mimxrt/hal/pwm_backport.h
new file mode 100644
index 0000000000000..cd4bdb1f8ef72
--- /dev/null
+++ b/ports/mimxrt/hal/pwm_backport.h
@@ -0,0 +1,51 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * Copyright (c) 2015, Freescale Semiconductor, Inc.
+ * Copyright 2016-2017 NXP *
+ * Copyright (c) 2021 Robert Hammelrath
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
+ */
+
+#ifndef PWM_BACKPORT_H
+#define PWM_BACKPORT_H
+#include "fsl_pwm.h"
+#ifdef FSL_FEATURE_SOC_TMR_COUNT
+#include "fsl_qtmr.h"
+#endif
+
+typedef struct _pwm_signal_param_u16
+{
+    pwm_channels_t pwmChannel; // PWM channel being configured; PWM A or PWM B
+    uint16_t dutyCycle_u16;    // PWM pulse width, value should be between 0 to 65536
+    uint16_t Center_u16;       // Center of the pulse, value should be between 0 to 65536
+    pwm_level_select_t level;  // PWM output active level select */
+    uint16_t deadtimeValue;    // The deadtime value; only used if channel pair is operating in complementary mode
+} pwm_signal_param_u16_t;
+
+typedef enum _pwm_fault_channels {
+    kPWM_faultchannel_0 = 0U,
+    kPWM_faultchannel_1
+} pwm_fault_channels_t;
+
+#define PWM_FULL_SCALE  (65536UL)
+
+void PWM_UpdatePwmDutycycle_u16(PWM_Type *base, pwm_submodule_t subModule,
+    pwm_channels_t pwmSignal, uint16_t dutyCycle, uint16_t center);
+
+void PWM_SetupPwm_u16(PWM_Type *base, pwm_submodule_t subModule, pwm_signal_param_u16_t *chnlParams,
+    uint32_t pwmFreq_Hz, uint32_t srcClock_Hz, bool output_enable);
+
+void PWM_SetupPwmx_u16(PWM_Type *base, pwm_submodule_t subModule,
+    uint32_t pwmFreq_Hz, uint16_t duty_cycle, uint8_t invert, uint32_t srcClock_Hz);
+
+void PWM_SetupFaultDisableMap(PWM_Type *base, pwm_submodule_t subModule,
+    pwm_channels_t pwmChannel, pwm_fault_channels_t pwm_fault_channels, uint16_t value);
+
+#ifdef FSL_FEATURE_SOC_TMR_COUNT
+status_t QTMR_SetupPwm_u16(TMR_Type *base, qtmr_channel_selection_t channel, uint32_t pwmFreqHz,
+    uint16_t dutyCycleU16, bool outputPolarity, uint32_t srcClock_Hz, bool is_init);
+#endif // FSL_FEATURE_SOC_TMR_COUNT
+
+#endif // PWM_BACKPORT_H
diff --git a/ports/mimxrt/machine_pwm.c b/ports/mimxrt/machine_pwm.c
new file mode 100644
index 0000000000000..a13af0d80f1bf
--- /dev/null
+++ b/ports/mimxrt/machine_pwm.c
@@ -0,0 +1,618 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020-2021 Damien P. George
+ * Copyright (c) 2021 Robert Hammelrath
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "py/runtime.h"
+#include "py/mphal.h"
+#include "modmachine.h"
+#include "pin.h"
+#include "fsl_clock.h"
+#include "fsl_iomuxc.h"
+#include "hal/pwm_backport.h"
+
+#define PWM_MIDDLE       (0)
+#define PWM_BEGIN        (1)
+#define PWM_END          (2)
+
+#define PWM_CHANNEL1     (1)
+#define PWM_CHANNEL2     (2)
+
+typedef struct _machine_pwm_obj_t {
+    mp_obj_base_t base;
+    PWM_Type *instance;
+    bool is_flexpwm;
+    uint8_t complementary;
+    uint8_t module;
+    uint8_t submodule;
+    uint8_t channel1;
+    uint8_t channel2;
+    uint8_t invert;
+    bool sync;
+    uint32_t freq;
+    int16_t prescale;
+    uint16_t duty_u16;
+    uint32_t duty_ns;
+    uint16_t center;
+    uint32_t deadtime;
+    bool output_enable_1;
+    bool output_enable_2;
+    uint8_t xor;
+    bool is_init;
+} machine_pwm_obj_t;
+
+static char channel_char[] = {'B', 'A', 'X' };
+static char *ERRMSG_FREQ = "PWM frequency too low";
+static char *ERRMSG_INIT = "PWM set-up failed";
+static char *ERRMSG_VALUE = "value larger than period";
+
+STATIC void machine_pwm_start(machine_pwm_obj_t *self);
+
+STATIC void mp_machine_pwm_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+    machine_pwm_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    if (self->is_flexpwm) {
+        mp_printf(print, "<FLEXPWM module=%u submodule=%u ", self->module, self->submodule);
+        if (self->complementary) {
+            mp_printf(print, "channel=%c/%c", channel_char[self->channel1], channel_char[self->channel2]);
+        } else {
+            mp_printf(print, "channel=%c", channel_char[self->channel1]);
+        }
+        if (self->duty_ns != 0) {
+            mp_printf(print, " duty_ns=%u", self->duty_ns);
+        } else {
+            mp_printf(print, " duty_u16=%u", self->duty_u16);
+        }
+        mp_printf(print, " freq=%u center=%u, deadtime=%u, sync=%u>",
+            self->freq, self->center, self->deadtime, self->sync);
+    #ifdef FSL_FEATURE_SOC_TMR_COUNT
+    } else {
+        mp_printf(print, "<QTMR_PWM module=%u channel=%u freq1=%u ",
+            self->module, self->channel1, self->freq);
+        if (self->duty_ns != 0) {
+            mp_printf(print, "duty_ns=%u>", self->duty_ns);
+        } else {
+            mp_printf(print, "duty_u16=%u>", self->duty_u16);
+        }
+    #endif
+    }
+}
+
+// Utility functions for decoding and convertings
+//
+STATIC uint32_t duty_ns_to_duty_u16(uint32_t freq, uint32_t duty_ns) {
+    uint64_t duty = (uint64_t)duty_ns * freq * PWM_FULL_SCALE / 1000000000ULL;
+    if (duty >= PWM_FULL_SCALE) {
+        mp_raise_ValueError(MP_ERROR_TEXT(ERRMSG_VALUE));
+    }
+    return (uint32_t)duty;
+}
+
+STATIC uint8_t module_decode(char channel) {
+    switch (channel) {
+        case '0':
+            return kPWM_Module_0;
+        case '1':
+            return kPWM_Module_1;
+        case '2':
+            return kPWM_Module_2;
+        case '3':
+            return kPWM_Module_3;
+        default:
+            return kPWM_Module_1;
+    }
+}
+
+STATIC uint8_t channel_decode(char channel) {
+    switch (channel) {
+        case 'A':
+            return kPWM_PwmA;
+        case 'B':
+            return kPWM_PwmB;
+        case 'X':
+            return kPWM_PwmX;
+        default:
+            return kPWM_PwmA;
+    }
+}
+
+// decode the AF objects module and Port numer. Returns NULL if it is not a FLEXPWM object
+STATIC const machine_pin_af_obj_t *af_name_decode_flexpwm(const machine_pin_af_obj_t *af_obj,
+    uint8_t *module, uint8_t *submodule, uint8_t *channel) {
+    const char *str;
+    size_t len;
+    str = (char *)qstr_data(af_obj->name, &len);
+    // test for the name starting with FLEXPWM
+    if (len < 15 || strncmp(str, "FLEXPWM", 7) != 0) {
+        return NULL;
+    }
+    // Get module, submodule and channel from the name, e.g. FLEXPWM1_PWM0_A
+    *module = str[7] - '0';
+    *submodule = module_decode(str[12]);
+    *channel = channel_decode(str[14]);
+
+    return af_obj;
+}
+
+#ifdef FSL_FEATURE_SOC_TMR_COUNT
+STATIC uint8_t qtmr_decode(char channel) {
+    switch (channel) {
+        case '0':
+            return kQTMR_Channel_0;
+        case '1':
+            return kQTMR_Channel_1;
+        case '2':
+            return kQTMR_Channel_2;
+        case '3':
+            return kQTMR_Channel_3;
+        default:
+            return kPWM_Module_1;
+    }
+}
+
+// decode the AF objects module and Port numer. Returns NULL if it is not a QTMR object
+STATIC const machine_pin_af_obj_t *af_name_decode_qtmr(const machine_pin_af_obj_t *af_obj, uint8_t *module, uint8_t *channel) {
+    const char *str;
+    size_t len;
+    str = (char *)qstr_data(af_obj->name, &len);
+    // test for the name starting with TMR
+    if (len < 11 || strncmp(str, "TMR", 3) != 0) {
+        return NULL;
+    }
+    // Get module, submodule and channel from the name, e.g. FLEXPWM1_PWM0_A
+    *module = str[3] - '0';
+    *channel = qtmr_decode(str[10]);
+
+    return af_obj;
+}
+#endif
+
+STATIC bool is_board_pin(const machine_pin_obj_t *pin) {
+    for (int i = 0; i < num_board_pins; i++) {
+        if (pin == machine_pin_board_pins[i]) {
+            return true;
+        }
+    }
+    return false;
+}
+
+// Functions for configuring the PWM Device
+//
+STATIC int calc_prescaler(uint32_t clock, uint32_t freq) {
+    float temp = (float)clock / (float)PWM_FULL_SCALE / (float)freq;
+    for (int prescale = 0; prescale < 8; prescale++, temp /= 2) {
+        if (temp <= 1) {
+            return prescale;
+        }
+    }
+    // Frequency too low, cannot scale down.
+    return -1;
+}
+
+STATIC void configure_flexpwm(machine_pwm_obj_t *self) {
+    pwm_signal_param_u16_t pwmSignal;
+
+    // Initialize PWM module.
+    uint32_t pwmSourceClockInHz = CLOCK_GetFreq(kCLOCK_IpgClk);
+
+    int prescale = calc_prescaler(pwmSourceClockInHz, self->freq);
+    if (prescale < 0) {
+        mp_raise_ValueError(MP_ERROR_TEXT(ERRMSG_FREQ));
+    }
+    if (self->prescale != prescale || self->is_init == false) {
+        pwm_config_t pwmConfig;
+        PWM_GetDefaultConfig(&pwmConfig);
+        self->prescale = prescale;
+        pwmConfig.prescale = prescale;
+        pwmConfig.reloadLogic = kPWM_ReloadPwmFullCycle;
+        if (self->complementary) {
+            pwmConfig.pairOperation = self->channel1 == kPWM_PwmA ? kPWM_ComplementaryPwmA : kPWM_ComplementaryPwmB;
+        } else {
+            pwmConfig.pairOperation = kPWM_Independent;
+        }
+        pwmConfig.clockSource = kPWM_BusClock;
+        pwmConfig.enableWait = false;
+        pwmConfig.initializationControl = self->sync ? kPWM_Initialize_MasterSync : kPWM_Initialize_LocalSync;
+
+        if (PWM_Init(self->instance, self->submodule, &pwmConfig) == kStatus_Fail) {
+            mp_raise_ValueError(MP_ERROR_TEXT(ERRMSG_INIT));
+        }
+    }
+
+    // Disable the fault detect function to avoid using the xbara
+    PWM_SetupFaultDisableMap(self->instance, self->submodule, self->channel1, kPWM_faultchannel_0, 0);
+    PWM_SetupFaultDisableMap(self->instance, self->submodule, self->channel1, kPWM_faultchannel_1, 0);
+    if (self->complementary) {
+        PWM_SetupFaultDisableMap(self->instance, self->submodule, self->channel2, kPWM_faultchannel_0, 0);
+        PWM_SetupFaultDisableMap(self->instance, self->submodule, self->channel2, kPWM_faultchannel_1, 0);
+    }
+
+    if (self->channel1 != kPWM_PwmX) {  // Only for A/B channels
+        // Initialize the channel parameters
+        pwmSignal.pwmChannel = self->channel1;
+        pwmSignal.level = (self->invert & PWM_CHANNEL1) ? kPWM_LowTrue : kPWM_HighTrue;
+        pwmSignal.dutyCycle_u16 = self->duty_u16;
+        pwmSignal.Center_u16 = self->center;
+        pwmSignal.deadtimeValue = ((uint64_t)pwmSourceClockInHz * self->deadtime) / 1000000000ULL;
+        PWM_SetupPwm_u16(self->instance, self->submodule, &pwmSignal, self->freq,
+            pwmSourceClockInHz, self->output_enable_1);
+
+        if (self->complementary) {
+            // Initialize the second channel of the pair.
+            pwmSignal.pwmChannel = self->channel2;
+            pwmSignal.level = (self->invert & PWM_CHANNEL2) ? kPWM_LowTrue : kPWM_HighTrue;
+            PWM_SetupPwm_u16(self->instance, self->submodule, &pwmSignal, self->freq,
+                pwmSourceClockInHz, self->output_enable_2);
+        }
+        if (self->xor == 1) {
+            // Set the DBLEN bit for A, B = A ^ B
+            self->instance->SM[self->submodule].CTRL &= ~PWM_CTRL_SPLIT_MASK;
+            self->instance->SM[self->submodule].CTRL |= PWM_CTRL_DBLEN_MASK;
+        } else if (self->xor == 2) {
+            // Set the DBLEN and SPLIT bits for A, B = A ^ B
+            self->instance->SM[self->submodule].CTRL |= PWM_CTRL_DBLEN_MASK | PWM_CTRL_SPLIT_MASK;
+        } else {
+            self->instance->SM[self->submodule].CTRL &= ~(PWM_CTRL_DBLEN_MASK | PWM_CTRL_SPLIT_MASK);
+        }
+    } else {
+        PWM_SetupPwmx_u16(self->instance, self->submodule, self->freq, self->duty_u16,
+            self->invert, pwmSourceClockInHz);
+        if (self->xor) {
+            // Set the DBLX bit for X = A ^ B
+            self->instance->SM[self->submodule].CTRL |= PWM_CTRL_DBLX_MASK;
+        } else {
+            self->instance->SM[self->submodule].CTRL &= ~PWM_CTRL_DBLX_MASK;
+        }
+    }
+    // Set the load okay bit for the submodules
+    PWM_SetPwmLdok(self->instance, 1 << self->submodule, true);
+
+    // Start the PWM generation from the Submodules
+    PWM_StartTimer(self->instance, 1 << self->submodule);
+}
+
+#ifdef FSL_FEATURE_SOC_TMR_COUNT
+STATIC void configure_qtmr(machine_pwm_obj_t *self) {
+    qtmr_config_t qtmrConfig;
+    int prescale;
+
+    TMR_Type *instance = (TMR_Type *)self->instance;
+
+    prescale = calc_prescaler(CLOCK_GetFreq(kCLOCK_IpgClk), self->freq);
+    if (prescale < 0) {
+        mp_raise_ValueError(MP_ERROR_TEXT(ERRMSG_FREQ));
+    }
+    if (prescale != self->prescale) {
+        QTMR_GetDefaultConfig(&qtmrConfig);
+        qtmrConfig.primarySource = prescale + kQTMR_ClockDivide_1;
+        QTMR_Init(instance, self->channel1, &qtmrConfig);
+        self->prescale = prescale;
+    }
+    // Set up the PWM channel
+    if (QTMR_SetupPwm_u16(instance, self->channel1, self->freq, self->duty_u16,
+        self->invert, CLOCK_GetFreq(kCLOCK_IpgClk) / (1 << prescale), self->is_init) == kStatus_Fail) {
+        mp_raise_ValueError(MP_ERROR_TEXT(ERRMSG_INIT));
+    }
+    // Start the output
+    QTMR_StartTimer(instance, self->channel1, kQTMR_PriSrcRiseEdge);
+}
+#endif // FSL_FEATURE_SOC_TMR_COUNT
+
+STATIC void configure_pwm(machine_pwm_obj_t *self) {
+    // Set the clock frequencies
+    // Freq range is 15Hz to ~ 3 MHz.
+    static bool set_frequency = true;
+    // set the frequency only once
+    if (set_frequency) {
+        CLOCK_SetDiv(kCLOCK_IpgDiv, 0x3); // Set IPG PODF to 3, divide by 4
+        set_frequency = false;
+    }
+
+    if (self->duty_ns != 0) {
+        self->duty_u16 = duty_ns_to_duty_u16(self->freq, self->duty_ns);
+    }
+    if (self->is_flexpwm) {
+        configure_flexpwm(self);
+    #ifdef FSL_FEATURE_SOC_TMR_COUNT
+    } else {
+        configure_qtmr(self);
+    #endif
+    }
+}
+
+// Micropython API functions
+//
+STATIC void mp_machine_pwm_init_helper(machine_pwm_obj_t *self,
+    size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    enum { ARG_freq, ARG_duty_u16, ARG_duty_ns, ARG_center, ARG_align,
+           ARG_invert, ARG_sync, ARG_xor, ARG_deadtime };
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_freq, MP_ARG_INT, {.u_int = 0} },
+        { MP_QSTR_duty_u16, MP_ARG_INT, {.u_int = 0} },
+        { MP_QSTR_duty_ns, MP_ARG_INT, {.u_int = 0} },
+        { MP_QSTR_center, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} },
+        { MP_QSTR_align, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1}},
+        { MP_QSTR_invert, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1}},
+        { MP_QSTR_sync, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1}},
+        { MP_QSTR_xor, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1}},
+        { MP_QSTR_deadtime, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1}},
+    };
+    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
+    mp_arg_parse_all(n_args, pos_args, kw_args,
+        MP_ARRAY_SIZE(allowed_args), allowed_args, args);
+
+    if ((n_args + kw_args->used) > 0 || self->is_init == false) {
+        // Maybe change PWM timer
+        if (args[ARG_freq].u_int > 0) {
+            self->freq = args[ARG_freq].u_int;
+        }
+
+        // Set duty_u16 cycle?
+        uint32_t duty = args[ARG_duty_u16].u_int;
+        if (duty != 0) {
+            if (duty >= PWM_FULL_SCALE) {
+                mp_raise_ValueError(MP_ERROR_TEXT(ERRMSG_VALUE));
+            }
+            self->duty_u16 = duty;
+            self->duty_ns = 0;
+        }
+        // Set duty_ns value?
+        duty = args[ARG_duty_ns].u_int;
+        if (duty != 0) {
+            self->duty_ns = duty;
+            self->duty_u16 = duty_ns_to_duty_u16(self->freq, self->duty_ns);
+        }
+        // Set center value?
+        int32_t center = args[ARG_center].u_int;
+        if (center >= 0) {
+            if (center >= PWM_FULL_SCALE) {
+                mp_raise_ValueError(MP_ERROR_TEXT(ERRMSG_VALUE));
+            }
+            self->center = center;
+        } else {  // Use alignment setting shortcut
+            if (args[ARG_align].u_int >= 0) {
+                uint8_t align = args[ARG_align].u_int & 3; // limit to 0..3
+                if (align == PWM_BEGIN) {
+                    self->center = self->duty_u16 / 2;
+                } else if (align == PWM_END) {
+                    self->center = PWM_FULL_SCALE - self->duty_u16 / 2;
+                } else {
+                    self->center = 32768; // Default value: mid.
+                }
+            }
+        }
+
+        if (args[ARG_invert].u_int >= 0) {
+            self->invert = args[ARG_invert].u_int & (PWM_CHANNEL1 | PWM_CHANNEL2);
+        }
+
+        if (args[ARG_sync].u_int >= 0) {
+            self->sync = args[ARG_sync].u_int != false && self->submodule != 0;
+        }
+
+        if (args[ARG_xor].u_int >= 0) {
+            self->xor = args[ARG_xor].u_int & 0x03;
+        }
+
+        if (args[ARG_deadtime].u_int >= 0) {
+            self->deadtime = args[ARG_deadtime].u_int;
+        }
+        configure_pwm(self);
+        self->is_init = true;
+    } else {
+        machine_pwm_start(self);
+    }
+
+}
+
+// PWM(pin | pin-tuple, freq, [args])
+STATIC mp_obj_t mp_machine_pwm_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
+    // Check number of arguments
+    mp_arg_check_num(n_args, n_kw, 1, MP_OBJ_FUN_ARGS_MAX, true);
+
+    mp_obj_t *pins;
+    const machine_pin_obj_t *pin1;
+    const machine_pin_obj_t *pin2;
+
+    // Get referred Pin object(s)
+    if (mp_obj_is_type(args[0], &mp_type_tuple)) {
+        mp_obj_get_array_fixed_n(args[0], 2, &pins);
+        pin1 = pin_find(pins[0]);
+        pin2 = pin_find(pins[1]);
+    } else {
+        pin1 = pin_find(args[0]);
+        pin2 = NULL;
+    }
+
+    // Check whether it supports PWM and decode submodule & channel
+    const machine_pin_af_obj_t *af_obj1 = NULL;
+    uint8_t submodule1;
+    uint8_t channel1;
+    const machine_pin_af_obj_t *af_obj2 = NULL;
+    uint8_t submodule2;
+    uint8_t channel2;
+    uint8_t module;
+    bool is_flexpwm = false;
+
+    for (int i = 0; i < pin1->af_list_len; ++i) {
+        af_obj1 = af_name_decode_flexpwm(&(pin1->af_list[i]), &module, &submodule1, &channel1);
+        if (af_obj1 != NULL) {
+            break;
+        }
+    }
+    if (pin2 != NULL) {
+        for (int i = 0; i < pin1->af_list_len; ++i) {
+            af_obj2 = af_name_decode_flexpwm(&(pin2->af_list[i]), &module, &submodule2, &channel2);
+            if (af_obj2 != NULL) {
+                break;
+            }
+        }
+    }
+    if (af_obj1 == NULL) {
+        submodule1 = 0;
+        #ifdef FSL_FEATURE_SOC_TMR_COUNT
+        // Check for QTimer support
+        if (is_board_pin(pin1)) {
+            for (int i = 0; i < pin1->af_list_len; ++i) {
+                af_obj1 = af_name_decode_qtmr(&(pin1->af_list[i]), &module, &channel1);
+                if (af_obj1 != NULL) {
+                    break;
+                }
+            }
+        }
+        #endif
+        if (af_obj1 == NULL) {
+            mp_raise_ValueError(MP_ERROR_TEXT("the requested Pin(s) does not support PWM"));
+        }
+    } else {
+        // is flexpwm, check for instance match
+        is_flexpwm = true;
+        if (pin2 != NULL && af_obj1->instance != af_obj2->instance && submodule1 != submodule2) {
+            mp_raise_ValueError(MP_ERROR_TEXT("the pins must be a A/B pair of a submodule"));
+        }
+    }
+
+    // Create and populate the PWM object.
+    machine_pwm_obj_t *self = m_new_obj(machine_pwm_obj_t);
+    self->base.type = &machine_pwm_type;
+    self->is_flexpwm = is_flexpwm;
+    self->instance = af_obj1->instance;
+    self->module = module;
+    self->submodule = submodule1;
+    self->channel1 = channel1;
+    self->invert = 0;
+    self->freq = 1000;
+    self->prescale = -1;
+    self->duty_u16 = 32768;
+    self->duty_ns = 0;
+    self->center = 32768;
+    self->output_enable_1 = is_board_pin(pin1);
+    self->sync = false;
+    self->deadtime = 0;
+    self->xor = 0;
+    self->is_init = false;
+
+    // Initialize the Pin(s).
+    CLOCK_EnableClock(kCLOCK_Iomuxc); // just in case it was not set yet
+    IOMUXC_SetPinMux(pin1->muxRegister, af_obj1->af_mode, af_obj1->input_register, af_obj1->input_daisy,
+        pin1->configRegister, 0U);
+    IOMUXC_SetPinConfig(pin1->muxRegister, af_obj1->af_mode, af_obj1->input_register, af_obj1->input_daisy,
+        pin1->configRegister, 0x10B0U);
+
+    // Settings for the second pin, if given.
+    if (pin2 != NULL && pin2 != pin1) {
+        self->complementary = 1;
+        self->channel2 = channel2;
+        self->output_enable_2 = is_board_pin(pin2);
+        // Initialize the Pin(s)
+        IOMUXC_SetPinMux(pin2->muxRegister, af_obj2->af_mode, af_obj2->input_register, af_obj2->input_daisy,
+            pin2->configRegister, 0U);
+        IOMUXC_SetPinConfig(pin2->muxRegister, af_obj2->af_mode, af_obj2->input_register, af_obj2->input_daisy,
+            pin2->configRegister, 0x10B0U);
+    } else {
+        self->complementary = 0;
+    }
+
+    // Process the remaining parameters.
+    mp_map_t kw_args;
+    mp_map_init_fixed_table(&kw_args, n_kw, args + n_args);
+    mp_machine_pwm_init_helper(self, n_args - 1, args + 1, &kw_args);
+
+    return MP_OBJ_FROM_PTR(self);
+}
+
+// Disable all PWM devices. Called on soft reset
+void machine_pwm_deinit_all(void) {
+    static PWM_Type *const pwm_bases[] = PWM_BASE_PTRS;
+
+    for (int i = 1; i < ARRAY_SIZE(pwm_bases); i++) {
+        PWM_StopTimer(pwm_bases[i], 0x0f); // Stop all submodules
+        pwm_bases[i]->OUTEN = 0; // Disable ouput on all submodules, all channels
+    }
+
+    #ifdef FSL_FEATURE_SOC_TMR_COUNT
+    static TMR_Type *const tmr_bases[] = TMR_BASE_PTRS;
+    for (int i = 1; i < ARRAY_SIZE(tmr_bases); i++) {
+        for (int j = 0; j < 4; j++) {
+            QTMR_StopTimer(tmr_bases[i], j); // Stop all timers
+        }
+    }
+    #endif
+}
+
+STATIC void machine_pwm_start(machine_pwm_obj_t *self) {
+    if (self->is_flexpwm) {
+        PWM_StartTimer(self->instance, 1 << self->submodule);
+    #ifdef FSL_FEATURE_SOC_TMR_COUNT
+    } else {
+        QTMR_StartTimer((TMR_Type *)self->instance, self->channel1, kQTMR_PriSrcRiseEdge);
+    #endif
+    }
+}
+
+STATIC void mp_machine_pwm_deinit(machine_pwm_obj_t *self) {
+    if (self->is_flexpwm) {
+        PWM_StopTimer(self->instance, 1 << self->submodule);
+    #ifdef FSL_FEATURE_SOC_TMR_COUNT
+    } else {
+        QTMR_StopTimer((TMR_Type *)self->instance, self->channel1);
+    #endif
+    }
+}
+
+mp_obj_t mp_machine_pwm_freq_get(machine_pwm_obj_t *self) {
+    return MP_OBJ_NEW_SMALL_INT(self->freq);
+}
+
+void mp_machine_pwm_freq_set(machine_pwm_obj_t *self, mp_int_t freq) {
+    self->freq = freq;
+    configure_pwm(self);
+}
+
+mp_obj_t mp_machine_pwm_duty_get_u16(machine_pwm_obj_t *self) {
+    return MP_OBJ_NEW_SMALL_INT(self->duty_u16);
+}
+
+void mp_machine_pwm_duty_set_u16(machine_pwm_obj_t *self, mp_int_t duty) {
+    if (duty >= 0) {
+        if (duty >= PWM_FULL_SCALE) {
+            mp_raise_ValueError(MP_ERROR_TEXT(ERRMSG_VALUE));
+        }
+        self->duty_u16 = duty;
+        self->duty_ns = 0;
+        configure_pwm(self);
+    }
+}
+
+mp_obj_t mp_machine_pwm_duty_get_ns(machine_pwm_obj_t *self) {
+    return MP_OBJ_NEW_SMALL_INT(1000000000ULL / self->freq * self->duty_u16 / PWM_FULL_SCALE);
+}
+
+void mp_machine_pwm_duty_set_ns(machine_pwm_obj_t *self, mp_int_t duty) {
+    if (duty >= 0) {
+        self->duty_ns = duty;
+        self->duty_u16 = duty_ns_to_duty_u16(self->freq, self->duty_ns);
+        configure_pwm(self);
+    }
+}
diff --git a/ports/mimxrt/main.c b/ports/mimxrt/main.c
index fa6237ca0750c..4d603913fdf01 100644
--- a/ports/mimxrt/main.c
+++ b/ports/mimxrt/main.c
@@ -119,6 +119,7 @@ int main(void) {
         #if MICROPY_PY_NETWORK
         mod_network_deinit();
         #endif
+        machine_pwm_deinit_all();
         gc_sweep_all();
         mp_deinit();
     }
diff --git a/ports/mimxrt/modmachine.c b/ports/mimxrt/modmachine.c
index a05c81a40a0d3..e7f096134424f 100644
--- a/ports/mimxrt/modmachine.c
+++ b/ports/mimxrt/modmachine.c
@@ -129,6 +129,7 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     #if MICROPY_PY_MACHINE_SDCARD
     { MP_ROM_QSTR(MP_QSTR_SDCard),              MP_ROM_PTR(&machine_sdcard_type) },
     #endif
+    { MP_ROM_QSTR(MP_QSTR_PWM),                 MP_ROM_PTR(&machine_pwm_type) },
     { MP_ROM_QSTR(MP_QSTR_Signal),              MP_ROM_PTR(&machine_signal_type) },
     { MP_ROM_QSTR(MP_QSTR_SoftI2C),             MP_ROM_PTR(&mp_machine_soft_i2c_type) },
     { MP_ROM_QSTR(MP_QSTR_SoftSPI),             MP_ROM_PTR(&mp_machine_soft_spi_type) },
diff --git a/ports/mimxrt/modmachine.h b/ports/mimxrt/modmachine.h
index b9949ab78461c..d18a22762483e 100644
--- a/ports/mimxrt/modmachine.h
+++ b/ports/mimxrt/modmachine.h
@@ -31,6 +31,7 @@
 
 extern const mp_obj_type_t machine_adc_type;
 extern const mp_obj_type_t machine_i2c_type;
+extern const mp_obj_type_t machine_pwm_type;
 extern const mp_obj_type_t machine_rtc_type;
 extern const mp_obj_type_t machine_sdcard_type;
 extern const mp_obj_type_t machine_spi_type;
@@ -40,6 +41,7 @@ extern const mp_obj_type_t machine_wdt_type;
 
 void machine_adc_init(void);
 void machine_pin_irq_deinit(void);
+void machine_pwm_deinit_all(void);
 void machine_timer_init_PIT(void);
 void machine_sdcard_init0(void);
 void mimxrt_sdram_init(void);
diff --git a/ports/mimxrt/mpconfigport.h b/ports/mimxrt/mpconfigport.h
index 361b8bd089017..967482dc77b07 100644
--- a/ports/mimxrt/mpconfigport.h
+++ b/ports/mimxrt/mpconfigport.h
@@ -129,6 +129,10 @@ uint32_t trng_random_u32(void);
 #define MICROPY_PY_MACHINE_PIN_MAKE_NEW     mp_pin_make_new
 #define MICROPY_PY_MACHINE_BITSTREAM        (1)
 #define MICROPY_PY_MACHINE_PULSE            (1)
+#define MICROPY_PY_MACHINE_PWM              (1)
+#define MICROPY_PY_MACHINE_PWM_INIT         (1)
+#define MICROPY_PY_MACHINE_PWM_DUTY_U16_NS  (1)
+#define MICROPY_PY_MACHINE_PWM_INCLUDEFILE  "ports/mimxrt/machine_pwm.c"
 #define MICROPY_PY_MACHINE_I2C              (1)
 #define MICROPY_PY_MACHINE_SOFTI2C          (1)
 #define MICROPY_PY_MACHINE_SPI              (1)
diff --git a/ports/mimxrt/ticks.c b/ports/mimxrt/ticks.c
index a5ee102428a57..5ae6f7f13bda3 100644
--- a/ports/mimxrt/ticks.c
+++ b/ports/mimxrt/ticks.c
@@ -129,9 +129,7 @@ void ticks_delay_us64(uint64_t us) {
             dt = 0xffffffff;
         }
         ticks_wake_after_us32((uint32_t)dt);
-        if (dt < 50) {
-            __WFE();
-        } else {
+        if (dt > 50) {
             MICROPY_EVENT_POLL_HOOK
         }
     }

From c422ca3da19767f83e038f16c62c875aebaed516 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Pierson?= <fpierson@garatronic.fr>
Date: Wed, 27 Oct 2021 10:16:55 +0200
Subject: [PATCH 1443/3533] rp2/boards: Add PYBSTICK26 RP2040 board definition.

---
 .../GARATRONIC_PYBSTICK26_RP2040/board.json   | 22 +++++++++++++++++++
 .../mpconfigboard.cmake                       |  1 +
 .../mpconfigboard.h                           |  3 +++
 3 files changed, 26 insertions(+)
 create mode 100644 ports/rp2/boards/GARATRONIC_PYBSTICK26_RP2040/board.json
 create mode 100644 ports/rp2/boards/GARATRONIC_PYBSTICK26_RP2040/mpconfigboard.cmake
 create mode 100644 ports/rp2/boards/GARATRONIC_PYBSTICK26_RP2040/mpconfigboard.h

diff --git a/ports/rp2/boards/GARATRONIC_PYBSTICK26_RP2040/board.json b/ports/rp2/boards/GARATRONIC_PYBSTICK26_RP2040/board.json
new file mode 100644
index 0000000000000..1b9e113143c3f
--- /dev/null
+++ b/ports/rp2/boards/GARATRONIC_PYBSTICK26_RP2040/board.json
@@ -0,0 +1,22 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [
+        "USB Stick form factor",
+        "Breadboard Friendly",
+        "Reset/User button",
+        "Red/green/orange/blue leds",
+        "1MB SPI Flash",
+        "USB-A"
+    ],
+    "images": [
+        "pybstick-rp2040-26-broches-micropython-c.jpg"
+    ],
+    "mcu": "rp2040",
+    "product": "PYBSTICK26 RP2040",
+    "thumbnail": "",
+    "url": "https://shop.mchobby.be/product.php?id_product=2331",
+    "vendor": "McHobby"
+}
diff --git a/ports/rp2/boards/GARATRONIC_PYBSTICK26_RP2040/mpconfigboard.cmake b/ports/rp2/boards/GARATRONIC_PYBSTICK26_RP2040/mpconfigboard.cmake
new file mode 100644
index 0000000000000..11fcb3d087ec0
--- /dev/null
+++ b/ports/rp2/boards/GARATRONIC_PYBSTICK26_RP2040/mpconfigboard.cmake
@@ -0,0 +1 @@
+# cmake file
diff --git a/ports/rp2/boards/GARATRONIC_PYBSTICK26_RP2040/mpconfigboard.h b/ports/rp2/boards/GARATRONIC_PYBSTICK26_RP2040/mpconfigboard.h
new file mode 100644
index 0000000000000..4c7153569bdf6
--- /dev/null
+++ b/ports/rp2/boards/GARATRONIC_PYBSTICK26_RP2040/mpconfigboard.h
@@ -0,0 +1,3 @@
+// Board and hardware specific configuration
+#define MICROPY_HW_BOARD_NAME                   "GARATRONIC_PYBSTICK26_RP2040"
+#define MICROPY_HW_FLASH_STORAGE_BYTES          (384 * 1024)

From fdb925c4c1fdb231dda579a17fcb23d921322edb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Pierson?= <fpierson@garatronic.fr>
Date: Thu, 28 Oct 2021 19:12:09 +0200
Subject: [PATCH 1444/3533] stm32/boards: Add PYBSTICK26 F411 board definition.

---
 .../GARATRONIC_PYBSTICK26_F411/board.json     | 13 +++
 .../GARATRONIC_PYBSTICK26_F411/manifest.py    |  2 +
 .../mpconfigboard.h                           | 84 +++++++++++++++++++
 .../mpconfigboard.mk                          |  6 ++
 .../GARATRONIC_PYBSTICK26_F411/pins.csv       | 55 ++++++++++++
 .../stm32f4xx_hal_conf.h                      | 19 +++++
 6 files changed, 179 insertions(+)
 create mode 100644 ports/stm32/boards/GARATRONIC_PYBSTICK26_F411/board.json
 create mode 100644 ports/stm32/boards/GARATRONIC_PYBSTICK26_F411/manifest.py
 create mode 100644 ports/stm32/boards/GARATRONIC_PYBSTICK26_F411/mpconfigboard.h
 create mode 100644 ports/stm32/boards/GARATRONIC_PYBSTICK26_F411/mpconfigboard.mk
 create mode 100644 ports/stm32/boards/GARATRONIC_PYBSTICK26_F411/pins.csv
 create mode 100644 ports/stm32/boards/GARATRONIC_PYBSTICK26_F411/stm32f4xx_hal_conf.h

diff --git a/ports/stm32/boards/GARATRONIC_PYBSTICK26_F411/board.json b/ports/stm32/boards/GARATRONIC_PYBSTICK26_F411/board.json
new file mode 100644
index 0000000000000..1df9b6f6586c5
--- /dev/null
+++ b/ports/stm32/boards/GARATRONIC_PYBSTICK26_F411/board.json
@@ -0,0 +1,13 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [],
+    "images": [],
+    "mcu": "stm32f4",
+    "product": "GARATRONIC_PYBSTICK26_F411",
+    "thumbnail": "",
+    "url": "https://shop.mchobby.be/product.php?id_product=1844",
+    "vendor": "McHobby"
+}
diff --git a/ports/stm32/boards/GARATRONIC_PYBSTICK26_F411/manifest.py b/ports/stm32/boards/GARATRONIC_PYBSTICK26_F411/manifest.py
new file mode 100644
index 0000000000000..b09c7ab920308
--- /dev/null
+++ b/ports/stm32/boards/GARATRONIC_PYBSTICK26_F411/manifest.py
@@ -0,0 +1,2 @@
+include("$(MPY_DIR)/extmod/uasyncio/manifest.py")
+freeze("$(MPY_DIR)/drivers/", ("display/ssd1306.py"))
diff --git a/ports/stm32/boards/GARATRONIC_PYBSTICK26_F411/mpconfigboard.h b/ports/stm32/boards/GARATRONIC_PYBSTICK26_F411/mpconfigboard.h
new file mode 100644
index 0000000000000..408bc28512bcd
--- /dev/null
+++ b/ports/stm32/boards/GARATRONIC_PYBSTICK26_F411/mpconfigboard.h
@@ -0,0 +1,84 @@
+#define MICROPY_HW_BOARD_NAME       "PYBSTICK26_STD"
+#define MICROPY_HW_MCU_NAME         "STM32F411RE"
+#define MICROPY_PY_THREAD           (1)
+
+#define MICROPY_HW_HAS_SWITCH       (1)
+#define MICROPY_HW_HAS_FLASH        (1)
+#define MICROPY_HW_HAS_KXTJ3        (0)
+#define MICROPY_HW_HAS_LCD          (0)
+#define MICROPY_HW_ENABLE_RTC       (1)
+#define MICROPY_HW_ENABLE_USB       (1)
+#define MICROPY_HW_ENABLE_SERVO     (1)
+#define MICROPY_HW_ENABLE_SDCARD    (1)
+
+// HSE is 16MHz
+#define MICROPY_HW_CLK_PLLM (16)
+#define MICROPY_HW_CLK_PLLN (192)
+#define MICROPY_HW_CLK_PLLP (RCC_PLLP_DIV2)
+#define MICROPY_HW_CLK_PLLQ (4)
+#define MICROPY_HW_CLK_LAST_FREQ (1)
+
+// Pybstick26 STD has an optional 32kHz crystal
+#define MICROPY_HW_RTC_USE_LSE      (1)
+#define MICROPY_HW_RTC_USE_US       (1)
+#define MICROPY_HW_RTC_USE_CALOUT   (0)
+
+// UART config
+#define MICROPY_HW_UART1_NAME   "XB"
+#define MICROPY_HW_UART1_TX     (pin_A15)
+#define MICROPY_HW_UART1_RX     (pin_A10)
+#define MICROPY_HW_UART2_NAME   "XA"
+#define MICROPY_HW_UART2_TX     (pin_A2)
+#define MICROPY_HW_UART2_RX     (pin_A3)
+//#define MICROPY_HW_UART2_RTS    (pin_A1)
+//#define MICROPY_HW_UART2_CTS    (pin_A0)
+#define MICROPY_HW_UART6_NAME   "YA"
+#define MICROPY_HW_UART6_TX     (pin_C6)
+#define MICROPY_HW_UART6_RX     (pin_C7)
+
+// I2C buses
+#define MICROPY_HW_I2C1_NAME "X"
+#define MICROPY_HW_I2C1_SCL (pin_B8) // S5
+#define MICROPY_HW_I2C1_SDA (pin_B9) // S3
+#define MICROPY_HW_I2C2_NAME "Y"
+#define MICROPY_HW_I2C2_SCL (pin_B10) //S13
+#define MICROPY_HW_I2C2_SDA (pin_B3) // S11
+
+// SPI buses
+#define MICROPY_HW_SPI1_NAME "X"
+#define MICROPY_HW_SPI1_NSS  (pin_A4) // S26
+#define MICROPY_HW_SPI1_SCK  (pin_A5) // S23
+#define MICROPY_HW_SPI1_MISO (pin_B4) // S21
+#define MICROPY_HW_SPI1_MOSI (pin_A7) // S19
+#define MICROPY_HW_SPI2_NAME "Y"
+#define MICROPY_HW_SPI2_NSS  (pin_B12) // S15
+#define MICROPY_HW_SPI2_SCK  (pin_B13) // S16
+#define MICROPY_HW_SPI2_MISO (pin_B14) // S18
+#define MICROPY_HW_SPI2_MOSI (pin_C3) // S13
+
+// USRSW has no pullup or pulldown, and pressing the switch makes the input go low
+#define MICROPY_HW_USRSW_PIN        (pin_C13)
+#define MICROPY_HW_USRSW_PULL       (GPIO_PULLUP)
+#define MICROPY_HW_USRSW_EXTI_MODE  (GPIO_MODE_IT_FALLING)
+#define MICROPY_HW_USRSW_PRESSED    (0)
+
+// The board has 4 LEDs
+#define MICROPY_HW_LED1             (pin_A13) // red
+#define MICROPY_HW_LED2             (pin_A14) // green
+#define MICROPY_HW_LED3             (pin_B0) // yellow
+#define MICROPY_HW_LED4             (pin_B1) // blue
+#define MICROPY_HW_LED3_PWM         { TIM3, 3, TIM_CHANNEL_3, GPIO_AF2_TIM3 }
+#define MICROPY_HW_LED4_PWM         { TIM3, 4, TIM_CHANNEL_4, GPIO_AF2_TIM3 }
+#define MICROPY_HW_LED_ON(pin)      (mp_hal_pin_high(pin))
+#define MICROPY_HW_LED_OFF(pin)     (mp_hal_pin_low(pin))
+
+// SD card with custom SDIO pins
+#define MICROPY_HW_SDCARD_D0 (pin_B7)
+#define MICROPY_HW_SDCARD_D1 (pin_A8)
+#define MICROPY_HW_SDCARD_D2 (pin_A9)
+#define MICROPY_HW_SDCARD_D3 (pin_B5)
+#define MICROPY_HW_SDCARD_CK (pin_B15)
+#define MICROPY_HW_SDCARD_CMD (pin_A6)
+
+// USB config
+#define MICROPY_HW_USB_FS              (1)
diff --git a/ports/stm32/boards/GARATRONIC_PYBSTICK26_F411/mpconfigboard.mk b/ports/stm32/boards/GARATRONIC_PYBSTICK26_F411/mpconfigboard.mk
new file mode 100644
index 0000000000000..df9506522574f
--- /dev/null
+++ b/ports/stm32/boards/GARATRONIC_PYBSTICK26_F411/mpconfigboard.mk
@@ -0,0 +1,6 @@
+MCU_SERIES = f4
+CMSIS_MCU = STM32F411xE
+AF_FILE = boards/stm32f411_af.csv
+LD_FILES = boards/stm32f411.ld boards/common_ifs.ld
+TEXT0_ADDR = 0x08000000
+TEXT1_ADDR = 0x08020000
diff --git a/ports/stm32/boards/GARATRONIC_PYBSTICK26_F411/pins.csv b/ports/stm32/boards/GARATRONIC_PYBSTICK26_F411/pins.csv
new file mode 100644
index 0000000000000..c52e65cf792c3
--- /dev/null
+++ b/ports/stm32/boards/GARATRONIC_PYBSTICK26_F411/pins.csv
@@ -0,0 +1,55 @@
+S1,3.3V
+S2,VBUS
+S3,PB9
+S4,VIN
+S5,PB8
+S6,GND
+S7,PB6
+S8,PA2
+S9,GND
+S10,PA3
+S11,PB3
+S12,PA0
+S13,PB10
+S13A,PC3
+S14,Reset
+S15,PB12
+S15A,PC5
+S16,PB13
+S16A,PC6
+S17,GND
+S18,PB14
+S18A,PC7
+S19,PA7
+S20,GND
+S21,PB4
+S22,PA10
+S23,PA5
+S24,PA15
+S25,GND
+S26,PA4
+SW,PC13
+SW2,PB6
+LED_GREEN,PA14
+LED_YELLOW,PB0
+LED_RED,PA13
+LED_BLUE,PB1
+SD_D0,PB7
+SD_D1,PA8
+SD_D2,PA9
+SD_D3,PB5
+SD_CMD,PA6
+SD_CK,PB15
+USB_DM,PA11
+USB_DP,PA12
+OSC_IN,PH0
+OSC_OUT,PH1
+OSC32_IN,PC14
+OSC32_OUT,PC15
+QSPI_BK1_IO3,PA1
+SDIO_CMD,PA6
+SDIO_D1,PA8
+SDIO_D2,PA9
+SDIO_D3,PB5
+SDIO_D0,PB7
+SDIO_CK,PB15
diff --git a/ports/stm32/boards/GARATRONIC_PYBSTICK26_F411/stm32f4xx_hal_conf.h b/ports/stm32/boards/GARATRONIC_PYBSTICK26_F411/stm32f4xx_hal_conf.h
new file mode 100644
index 0000000000000..7d6344f0a2453
--- /dev/null
+++ b/ports/stm32/boards/GARATRONIC_PYBSTICK26_F411/stm32f4xx_hal_conf.h
@@ -0,0 +1,19 @@
+/* This file is part of the MicroPython project, http://micropython.org/
+ * The MIT License (MIT)
+ * Copyright (c) 2019 Damien P. George
+ */
+#ifndef MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H
+#define MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H
+
+#include "boards/stm32f4xx_hal_conf_base.h"
+
+// Oscillator values in Hz
+#define HSE_VALUE (16000000)
+#define LSE_VALUE (32768)
+#define EXTERNAL_CLOCK_VALUE (12288000)
+
+// Oscillator timeouts in ms
+#define HSE_STARTUP_TIMEOUT (100)
+#define LSE_STARTUP_TIMEOUT (5000)
+
+#endif // MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H

From d49df423e09acb24a39927e485fd43cced129ee0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Pierson?= <fpierson@garatronic.fr>
Date: Sat, 20 Nov 2021 19:32:19 +0100
Subject: [PATCH 1445/3533] stm32/boards/NADHAT_PYBF405: Rename board to
 GARATRONIC_NADHAT_F405.

To add the manufacturer as a prefix to the board name, for consistency with
other Garatronic boards.
---
 .../{NADHAT_PYBF405 => GARATRONIC_NADHAT_F405}/board.json   | 6 +++---
 .../mpconfigboard.h                                         | 0
 .../mpconfigboard.mk                                        | 0
 .../{NADHAT_PYBF405 => GARATRONIC_NADHAT_F405}/pins.csv     | 0
 .../stm32f4xx_hal_conf.h                                    | 0
 5 files changed, 3 insertions(+), 3 deletions(-)
 rename ports/stm32/boards/{NADHAT_PYBF405 => GARATRONIC_NADHAT_F405}/board.json (52%)
 rename ports/stm32/boards/{NADHAT_PYBF405 => GARATRONIC_NADHAT_F405}/mpconfigboard.h (100%)
 rename ports/stm32/boards/{NADHAT_PYBF405 => GARATRONIC_NADHAT_F405}/mpconfigboard.mk (100%)
 rename ports/stm32/boards/{NADHAT_PYBF405 => GARATRONIC_NADHAT_F405}/pins.csv (100%)
 rename ports/stm32/boards/{NADHAT_PYBF405 => GARATRONIC_NADHAT_F405}/stm32f4xx_hal_conf.h (100%)

diff --git a/ports/stm32/boards/NADHAT_PYBF405/board.json b/ports/stm32/boards/GARATRONIC_NADHAT_F405/board.json
similarity index 52%
rename from ports/stm32/boards/NADHAT_PYBF405/board.json
rename to ports/stm32/boards/GARATRONIC_NADHAT_F405/board.json
index fd4e67c61a9ea..38873e4de8632 100644
--- a/ports/stm32/boards/NADHAT_PYBF405/board.json
+++ b/ports/stm32/boards/GARATRONIC_NADHAT_F405/board.json
@@ -6,8 +6,8 @@
     "features": [],
     "images": [],
     "mcu": "stm32f4",
-    "product": "PYBF405",
+    "product": "GARATRONIC_NADHAT_F405",
     "thumbnail": "",
-    "url": "",
-    "vendor": "Nadhat"
+    "url": "https://shop.mchobby.be/product.php?id_product=1653",
+    "vendor": "McHobby"
 }
diff --git a/ports/stm32/boards/NADHAT_PYBF405/mpconfigboard.h b/ports/stm32/boards/GARATRONIC_NADHAT_F405/mpconfigboard.h
similarity index 100%
rename from ports/stm32/boards/NADHAT_PYBF405/mpconfigboard.h
rename to ports/stm32/boards/GARATRONIC_NADHAT_F405/mpconfigboard.h
diff --git a/ports/stm32/boards/NADHAT_PYBF405/mpconfigboard.mk b/ports/stm32/boards/GARATRONIC_NADHAT_F405/mpconfigboard.mk
similarity index 100%
rename from ports/stm32/boards/NADHAT_PYBF405/mpconfigboard.mk
rename to ports/stm32/boards/GARATRONIC_NADHAT_F405/mpconfigboard.mk
diff --git a/ports/stm32/boards/NADHAT_PYBF405/pins.csv b/ports/stm32/boards/GARATRONIC_NADHAT_F405/pins.csv
similarity index 100%
rename from ports/stm32/boards/NADHAT_PYBF405/pins.csv
rename to ports/stm32/boards/GARATRONIC_NADHAT_F405/pins.csv
diff --git a/ports/stm32/boards/NADHAT_PYBF405/stm32f4xx_hal_conf.h b/ports/stm32/boards/GARATRONIC_NADHAT_F405/stm32f4xx_hal_conf.h
similarity index 100%
rename from ports/stm32/boards/NADHAT_PYBF405/stm32f4xx_hal_conf.h
rename to ports/stm32/boards/GARATRONIC_NADHAT_F405/stm32f4xx_hal_conf.h

From 196d26848a76043777e4e3ebb2455f26e6349dfc Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 24 Nov 2021 13:30:04 +1100
Subject: [PATCH 1446/3533] stm32/usb: Use a table of allowed values to
 simplify usb_mode get/set.

This reduces code size and code duplication, and fixes `pyb.usb_mode()` so
that it now returns the correct string when in multi-VCP mode (before, it
would return None when in one of these modes).

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/qstrdefsport.h |  14 ++++-
 ports/stm32/usb.c          | 125 ++++++++++++++-----------------------
 2 files changed, 61 insertions(+), 78 deletions(-)

diff --git a/ports/stm32/qstrdefsport.h b/ports/stm32/qstrdefsport.h
index bc07f2752aa85..e7d84cbec0ebb 100644
--- a/ports/stm32/qstrdefsport.h
+++ b/ports/stm32/qstrdefsport.h
@@ -38,7 +38,19 @@ Q(/)
 
 #if MICROPY_HW_ENABLE_USB
 // for usb modes
-Q(MSC+HID)
+Q(VCP)
+Q(MSC)
 Q(VCP+MSC)
 Q(VCP+HID)
+Q(VCP+MSC+HID)
+#if MICROPY_HW_USB_CDC_NUM >= 2
+Q(2xVCP)
+Q(2xVCP+MSC)
+Q(2xVCP+MSC+HID)
+#endif
+#if MICROPY_HW_USB_CDC_NUM >= 3
+Q(3xVCP)
+Q(3xVCP+MSC)
+Q(3xVCP+MSC+HID)
+#endif
 #endif
diff --git a/ports/stm32/usb.c b/ports/stm32/usb.c
index 1ed45592e9c18..9a9600f89d6c8 100644
--- a/ports/stm32/usb.c
+++ b/ports/stm32/usb.c
@@ -396,6 +396,35 @@ usbd_cdc_itf_t *usb_vcp_get(int idx) {
     pyb.usb_mode(..., port=2) # for second USB port
 */
 
+typedef struct _pyb_usb_mode_table_t {
+    uint8_t usbd_mode;
+    uint16_t qst;
+    const char *deprecated_str;
+    uint16_t default_pid;
+} pyb_usb_mode_table_t;
+
+// These are all the modes supported by USBD_SelectMode.
+// Note: there are some names (eg CDC, VCP+VCP) which are supported for backwards compatibility.
+STATIC const pyb_usb_mode_table_t pyb_usb_mode_table[] = {
+    { USBD_MODE_CDC, MP_QSTR_VCP, "CDC", MICROPY_HW_USB_PID_CDC },
+    { USBD_MODE_MSC, MP_QSTR_MSC, NULL, MICROPY_HW_USB_PID_MSC },
+    { USBD_MODE_CDC_MSC, MP_QSTR_VCP_plus_MSC, "CDC+MSC", MICROPY_HW_USB_PID_CDC_MSC },
+    { USBD_MODE_CDC_HID, MP_QSTR_VCP_plus_HID, "CDC+HID", MICROPY_HW_USB_PID_CDC_HID },
+    { USBD_MODE_CDC_MSC_HID, MP_QSTR_VCP_plus_MSC_plus_HID, NULL, MICROPY_HW_USB_PID_CDC_MSC_HID },
+
+    #if MICROPY_HW_USB_CDC_NUM >= 2
+    { USBD_MODE_CDC2, MP_QSTR_2xVCP, "VCP+VCP", MICROPY_HW_USB_PID_CDC2 },
+    { USBD_MODE_CDC2_MSC, MP_QSTR_2xVCP_plus_MSC, "VCP+VCP+MSC", MICROPY_HW_USB_PID_CDC2_MSC },
+    { USBD_MODE_CDC2_MSC_HID, MP_QSTR_2xVCP_plus_MSC_plus_HID, NULL, MICROPY_HW_USB_PID_CDC2_MSC_HID },
+    #endif
+
+    #if MICROPY_HW_USB_CDC_NUM >= 3
+    { USBD_MODE_CDC3, MP_QSTR_3xVCP, NULL, MICROPY_HW_USB_PID_CDC3 },
+    { USBD_MODE_CDC3_MSC, MP_QSTR_3xVCP_plus_MSC, NULL, MICROPY_HW_USB_PID_CDC3_MSC },
+    { USBD_MODE_CDC3_MSC_HID, MP_QSTR_3xVCP_plus_MSC_plus_HID, NULL, MICROPY_HW_USB_PID_CDC3_MSC_HID },
+    #endif
+};
+
 STATIC mp_obj_t pyb_usb_mode(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum {
         ARG_mode, ARG_port, ARG_vid, ARG_pid,
@@ -430,23 +459,14 @@ STATIC mp_obj_t pyb_usb_mode(size_t n_args, const mp_obj_t *pos_args, mp_map_t *
         #if defined(USE_HOST_MODE)
         return MP_OBJ_NEW_QSTR(MP_QSTR_host);
         #else
-        uint8_t mode = USBD_GetMode(&usb_device.usbd_cdc_msc_hid_state);
-        switch (mode & USBD_MODE_IFACE_MASK) {
-            case USBD_MODE_CDC:
-                return MP_OBJ_NEW_QSTR(MP_QSTR_VCP);
-            case USBD_MODE_MSC:
-                return MP_OBJ_NEW_QSTR(MP_QSTR_MSC);
-            case USBD_MODE_HID:
-                return MP_OBJ_NEW_QSTR(MP_QSTR_HID);
-            case USBD_MODE_CDC_MSC:
-                return MP_OBJ_NEW_QSTR(MP_QSTR_VCP_plus_MSC);
-            case USBD_MODE_CDC_HID:
-                return MP_OBJ_NEW_QSTR(MP_QSTR_VCP_plus_HID);
-            case USBD_MODE_MSC_HID:
-                return MP_OBJ_NEW_QSTR(MP_QSTR_MSC_plus_HID);
-            default:
-                return mp_const_none;
+        uint8_t mode = USBD_GetMode(&usb_device.usbd_cdc_msc_hid_state) & USBD_MODE_IFACE_MASK;
+        for (size_t i = 0; i < MP_ARRAY_SIZE(pyb_usb_mode_table); ++i) {
+            const pyb_usb_mode_table_t *m = &pyb_usb_mode_table[i];
+            if (mode == m->usbd_mode) {
+                return MP_OBJ_NEW_QSTR(m->qst);
+            }
         }
+        return mp_const_none;
         #endif
     }
 
@@ -483,70 +503,21 @@ STATIC mp_obj_t pyb_usb_mode(size_t n_args, const mp_obj_t *pos_args, mp_map_t *
 
     // get the VID, PID and USB mode
     // note: PID=-1 means select PID based on mode
-    // note: we support CDC as a synonym for VCP for backward compatibility
     uint16_t vid = args[ARG_vid].u_int;
     mp_int_t pid = args[ARG_pid].u_int;
-    uint8_t mode;
-    if (strcmp(mode_str, "CDC+MSC") == 0 || strcmp(mode_str, "VCP+MSC") == 0) {
-        if (pid == -1) {
-            pid = MICROPY_HW_USB_PID_CDC_MSC;
-        }
-        mode = USBD_MODE_CDC_MSC;
-    } else if (strcmp(mode_str, "VCP+MSC+HID") == 0) {
-        if (pid == -1) {
-            pid = MICROPY_HW_USB_PID_CDC_MSC_HID;
-        }
-        mode = USBD_MODE_CDC_MSC_HID;
-    #if MICROPY_HW_USB_CDC_NUM >= 2
-    } else if (strcmp(mode_str, "VCP+VCP") == 0) {
-        if (pid == -1) {
-            pid = MICROPY_HW_USB_PID_CDC2;
-        }
-        mode = USBD_MODE_CDC2;
-    } else if (strcmp(mode_str, "VCP+VCP+MSC") == 0) {
-        if (pid == -1) {
-            pid = MICROPY_HW_USB_PID_CDC2_MSC;
-        }
-        mode = USBD_MODE_CDC2_MSC;
-    } else if (strcmp(mode_str, "2xVCP+MSC+HID") == 0) {
-        if (pid == -1) {
-            pid = MICROPY_HW_USB_PID_CDC2_MSC_HID;
-        }
-        mode = USBD_MODE_CDC2_MSC_HID;
-    #endif
-    #if MICROPY_HW_USB_CDC_NUM >= 3
-    } else if (strcmp(mode_str, "3xVCP") == 0) {
-        if (pid == -1) {
-            pid = MICROPY_HW_USB_PID_CDC3;
-        }
-        mode = USBD_MODE_CDC3;
-    } else if (strcmp(mode_str, "3xVCP+MSC") == 0) {
-        if (pid == -1) {
-            pid = MICROPY_HW_USB_PID_CDC3_MSC;
-        }
-        mode = USBD_MODE_CDC3_MSC;
-    } else if (strcmp(mode_str, "3xVCP+MSC+HID") == 0) {
-        if (pid == -1) {
-            pid = MICROPY_HW_USB_PID_CDC3_MSC_HID;
-        }
-        mode = USBD_MODE_CDC3_MSC_HID;
-    #endif
-    } else if (strcmp(mode_str, "CDC+HID") == 0 || strcmp(mode_str, "VCP+HID") == 0) {
-        if (pid == -1) {
-            pid = MICROPY_HW_USB_PID_CDC_HID;
-        }
-        mode = USBD_MODE_CDC_HID;
-    } else if (strcmp(mode_str, "CDC") == 0 || strcmp(mode_str, "VCP") == 0) {
-        if (pid == -1) {
-            pid = MICROPY_HW_USB_PID_CDC;
-        }
-        mode = USBD_MODE_CDC;
-    } else if (strcmp(mode_str, "MSC") == 0) {
-        if (pid == -1) {
-            pid = MICROPY_HW_USB_PID_MSC;
+    uint8_t mode = 0;
+    for (size_t i = 0; i < MP_ARRAY_SIZE(pyb_usb_mode_table); ++i) {
+        const pyb_usb_mode_table_t *m = &pyb_usb_mode_table[i];
+        if (strcmp(mode_str, qstr_str(m->qst)) == 0
+            || (m->deprecated_str != NULL && strcmp(mode_str, m->deprecated_str) == 0)) {
+            if (pid == -1) {
+                pid = m->default_pid;
+            }
+            mode = m->usbd_mode;
+            break;
         }
-        mode = USBD_MODE_MSC;
-    } else {
+    }
+    if (mode == 0) {
         goto bad_mode;
     }
 

From 11ed94797d492cabdaf09396feb69a690e86f739 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 19 Nov 2021 10:36:16 +1100
Subject: [PATCH 1447/3533] py/lexer: Support nested [] and {} characters
 within f-string params.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/lexer.c                           | 11 +++++++++--
 tests/basics/string_fstring.py       |  7 +++++++
 tests/cpydiff/core_fstring_parser.py |  8 ++++----
 3 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/py/lexer.c b/py/lexer.c
index 69c7d14a77614..ac406bd46943b 100644
--- a/py/lexer.c
+++ b/py/lexer.c
@@ -363,9 +363,16 @@ STATIC void parse_string_literal(mp_lexer_t *lex, bool is_raw, bool is_fstring)
                     // (MicroPython limitation) note: this is completely unaware of
                     // Python syntax and will not handle any expression containing '}' or ':'.
                     // e.g. f'{"}"}' or f'{foo({})}'.
-                    while (!is_end(lex) && !is_char_or(lex, ':', '}')) {
+                    unsigned int nested_bracket_level = 0;
+                    while (!is_end(lex) && (nested_bracket_level != 0 || !is_char_or(lex, ':', '}'))) {
+                        unichar c = CUR_CHAR(lex);
+                        if (c == '[' || c == '{') {
+                            nested_bracket_level += 1;
+                        } else if (c == ']' || c == '}') {
+                            nested_bracket_level -= 1;
+                        }
                         // like the default case at the end of this function, stay 8-bit clean
-                        vstr_add_byte(&lex->fstring_args, CUR_CHAR(lex));
+                        vstr_add_byte(&lex->fstring_args, c);
                         next_char(lex);
                     }
                     if (lex->fstring_args.buf[lex->fstring_args.len - 1] == '=') {
diff --git a/tests/basics/string_fstring.py b/tests/basics/string_fstring.py
index 4f7225fcad8b6..7e8a97fd3048e 100644
--- a/tests/basics/string_fstring.py
+++ b/tests/basics/string_fstring.py
@@ -22,6 +22,13 @@ def foo(a, b):
     return f'{x}{y}{a}{b}'
 print(foo(7, 8))
 
+# ':' character within {...} that should not be interpreted as format specifiers.
+print(f"a{[0,1,2][0:2]}")
+print(f"a{[0,15,2][0:2][-1]:04x}")
+
+# Nested '{' and '}' characters.
+print(f"a{ {0,1,2}}")
+
 # PEP-0498 specifies that '\\' and '#' must be disallowed explicitly, whereas
 # MicroPython relies on the syntax error as a result of the substitution.
 
diff --git a/tests/cpydiff/core_fstring_parser.py b/tests/cpydiff/core_fstring_parser.py
index 6917f3cfa4d8f..22bbc5866ec3a 100644
--- a/tests/cpydiff/core_fstring_parser.py
+++ b/tests/cpydiff/core_fstring_parser.py
@@ -1,9 +1,9 @@
 """
 categories: Core
-description: f-strings cannot support expressions that require parsing to resolve nested braces
+description: f-strings cannot support expressions that require parsing to resolve unbalanced nested braces and brackets
 cause: MicroPython is optimised for code space.
-workaround: Only use simple expressions inside f-strings
+workaround: Always use balanced braces and brackets in expressions inside f-strings
 """
 
-f'{"hello {} world"}'
-f"{repr({})}"
+print(f'{"hello { world"}')
+print(f'{"hello ] world"}')

From e99f7b6d25464f36accc2f04899edfa9e982bee2 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Thu, 18 Nov 2021 23:29:48 +1100
Subject: [PATCH 1448/3533] tests/cpydiff: Clarify f-string diffs regarding
 concatenation.

Concatenation of any literals (including f-strings) should be avoided.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 tests/cpydiff/core_fstring_concat.py | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/tests/cpydiff/core_fstring_concat.py b/tests/cpydiff/core_fstring_concat.py
index fd83527b5c176..c2bdb4e666a2d 100644
--- a/tests/cpydiff/core_fstring_concat.py
+++ b/tests/cpydiff/core_fstring_concat.py
@@ -1,12 +1,13 @@
 """
 categories: Core
-description: f-strings don't support concatenation with adjacent literals if the adjacent literals contain braces
+description: f-strings don't support concatenation with adjacent literals if the adjacent literals contain braces or are f-strings
 cause: MicroPython is optimised for code space.
-workaround: Use the + operator between literal strings when either is an f-string
+workaround: Use the + operator between literal strings when either or both are f-strings
 """
 
-x = 1
-print("aa" f"{x}")
-print(f"{x}" "ab")
-print("a{}a" f"{x}")
-print(f"{x}" "a{}b")
+x, y = 1, 2
+print("aa" f"{x}")  # works
+print(f"{x}" "ab")  # works
+print("a{}a" f"{x}")  # fails
+print(f"{x}" "a{}b")  # fails
+print(f"{x}" f"{y}")  # fails

From a0890983ea25c343c510d5dad509b48bc7a96cc9 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 25 Nov 2021 23:23:34 +1100
Subject: [PATCH 1449/3533] py/objfun.h: Remove obsolete comments about entries
 in extra_args.

These two entries were removed in 049a7a81531a67e068d926ad50260578fb79f94c

Signed-off-by: Damien George <damien@micropython.org>
---
 py/objfun.h | 2 --
 1 file changed, 2 deletions(-)

diff --git a/py/objfun.h b/py/objfun.h
index 905b5dbca6d19..771bf31a95c58 100644
--- a/py/objfun.h
+++ b/py/objfun.h
@@ -39,8 +39,6 @@ typedef struct _mp_obj_fun_bc_t {
     // the following extra_args array is allocated space to take (in order):
     //  - values of positional default args (if any)
     //  - a single slot for default kw args dict (if it has them)
-    //  - a single slot for var args tuple (if it takes them)
-    //  - a single slot for kw args dict (if it takes them)
     mp_obj_t extra_args[];
 } mp_obj_fun_bc_t;
 

From 6259aa50ebdf148005ce237bbcc632f6f202227c Mon Sep 17 00:00:00 2001
From: David Michieli <dmm@planetinnovation.com.au>
Date: Tue, 12 Oct 2021 12:07:02 +1100
Subject: [PATCH 1450/3533] stm32/boards/NUCLEO_WB55: Update rfcore_firmwre for
 new WS.

Adds a fix to behavior occuring since WS 1.11 where the FUS returns
misleading statuses during WS upgrade.
---
 ports/stm32/boards/NUCLEO_WB55/rfcore_firmware.py | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/ports/stm32/boards/NUCLEO_WB55/rfcore_firmware.py b/ports/stm32/boards/NUCLEO_WB55/rfcore_firmware.py
index b5f1d0072e349..0d13d24350b21 100644
--- a/ports/stm32/boards/NUCLEO_WB55/rfcore_firmware.py
+++ b/ports/stm32/boards/NUCLEO_WB55/rfcore_firmware.py
@@ -537,9 +537,13 @@ def resume():
             elif status == 0:
                 log("WS update successful")
                 _write_state(_STATE_WAITING_FOR_WS)
-            elif result == 0:
-                # We get a error response with no payload sometimes at the end
-                # of the update (this is not in AN5185). Re-try the GET_STATE.
+            elif result in (0, 0xFE):
+                # We get an error response with no payload sometimes at the end
+                # of the update (this is not in AN5185). Additionally during
+                # WS update, newer WS reports (status, result) of (255, 254)
+                # before eventually reporting the correct state of
+                # _STATE_INSTALLING_WS once again. In these cases, re-try the
+                # GET_STATE.
                 # The same thing happens transitioning from WS to FUS mode.
                 # The actual HCI response has no payload, the result=0 comes from
                 # _parse_vendor_response above when len=7.

From de8dc4bad233e81ad3de5e7d5579cfebe045c809 Mon Sep 17 00:00:00 2001
From: gibbonsc <63733738+gibbonsc@users.noreply.github.com>
Date: Tue, 5 Oct 2021 17:18:56 -0600
Subject: [PATCH 1451/3533] docs/esp8266/tutorial: Fix comments of FrameBuffer
 examples.

The third and fourth parameters in display.rect() and display.fill_rect()
are not x,y coordinates, but are instead width,height values.  Update the
comment after the example to show the correct x,y coordinates of the bottom
right corner of each rectangle, respectively.
---
 docs/esp8266/tutorial/ssd1306.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/esp8266/tutorial/ssd1306.rst b/docs/esp8266/tutorial/ssd1306.rst
index 4dca82afc48f6..8651522e06e91 100644
--- a/docs/esp8266/tutorial/ssd1306.rst
+++ b/docs/esp8266/tutorial/ssd1306.rst
@@ -66,8 +66,8 @@ Subclassing FrameBuffer provides support for graphics primitives::
     display.hline(0, 8, 4, 1)               # draw horizontal line x=0, y=8, width=4, colour=1
     display.vline(0, 8, 4, 1)               # draw vertical line x=0, y=8, height=4, colour=1
     display.line(0, 0, 127, 63, 1)          # draw a line from 0,0 to 127,63
-    display.rect(10, 10, 107, 43, 1)        # draw a rectangle outline 10,10 to 107,43, colour=1
-    display.fill_rect(10, 10, 107, 43, 1)   # draw a solid rectangle 10,10 to 107,43, colour=1
+    display.rect(10, 10, 107, 43, 1)        # draw a rectangle outline 10,10 to 117,53, colour=1
+    display.fill_rect(10, 10, 107, 43, 1)   # draw a solid rectangle 10,10 to 117,53, colour=1
     display.text('Hello World', 0, 0, 1)    # draw some text at x=0, y=0, colour=1
     display.scroll(20, 0)                   # scroll 20 pixels to the right
 

From 678f4b959f97936f7bcca8d8d5ba5030bbb13bdc Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Tue, 16 Nov 2021 22:57:45 +1100
Subject: [PATCH 1452/3533] esp32/boards/GENERIC_S3: Enable BLE on ESP32 S3.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/esp32/boards/GENERIC_S3/mpconfigboard.cmake | 1 +
 ports/esp32/boards/GENERIC_S3/mpconfigboard.h     | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/esp32/boards/GENERIC_S3/mpconfigboard.cmake b/ports/esp32/boards/GENERIC_S3/mpconfigboard.cmake
index eae671d28644f..58b1b25bb51f9 100644
--- a/ports/esp32/boards/GENERIC_S3/mpconfigboard.cmake
+++ b/ports/esp32/boards/GENERIC_S3/mpconfigboard.cmake
@@ -3,6 +3,7 @@ set(IDF_TARGET esp32s3)
 set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.base
     boards/sdkconfig.usb
+    boards/sdkconfig.ble
     boards/GENERIC_S3/sdkconfig.board
 )
 
diff --git a/ports/esp32/boards/GENERIC_S3/mpconfigboard.h b/ports/esp32/boards/GENERIC_S3/mpconfigboard.h
index 53caa7f91d131..f41917ff070ed 100644
--- a/ports/esp32/boards/GENERIC_S3/mpconfigboard.h
+++ b/ports/esp32/boards/GENERIC_S3/mpconfigboard.h
@@ -1,7 +1,6 @@
 #define MICROPY_HW_BOARD_NAME               "ESP32S3 module"
 #define MICROPY_HW_MCU_NAME                 "ESP32S3"
 
-#define MICROPY_PY_BLUETOOTH                (0)
 #define MICROPY_PY_MACHINE_DAC              (0)
 
 #define MICROPY_HW_I2C0_SCL                 (9)

From 97a7cc243b028833bdcb8ce0bc19b2bce7545851 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Thu, 25 Nov 2021 14:27:06 +0200
Subject: [PATCH 1453/3533] lib: Update pico-sdk to 1.3.0 and tinyusb to
 0.12.0.

Fixes #8025
---
 lib/pico-sdk | 2 +-
 lib/tinyusb  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/pico-sdk b/lib/pico-sdk
index bfcbefafc5d2a..2062372d203b3 160000
--- a/lib/pico-sdk
+++ b/lib/pico-sdk
@@ -1 +1 @@
-Subproject commit bfcbefafc5d2a210551a4d9d80b4303d4ae0adf7
+Subproject commit 2062372d203b372849d573f252cf7c6dc2800c0a
diff --git a/lib/tinyusb b/lib/tinyusb
index d49938d0f5052..4bfab30c02279 160000
--- a/lib/tinyusb
+++ b/lib/tinyusb
@@ -1 +1 @@
-Subproject commit d49938d0f5052bce70e55c652b657c0a6a7e84fe
+Subproject commit 4bfab30c02279a0530e1a56f4a7c539f2d35a293

From 84969194a18ec015d2508db14be66457f123f687 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 29 Nov 2021 13:01:51 +1100
Subject: [PATCH 1454/3533] stm32/flashbdev: Support generic flash storage
 config via link symbols.

A board can now define the following linker symbols to configure its flash
storage layout:

    _micropy_hw_internal_flash_storage_start
    _micropy_hw_internal_flash_storage_end
    _micropy_hw_internal_flash_storage_ram_cache_start
    _micropy_hw_internal_flash_storage_ram_cache_end

And optionally have a second flash segment by configuring
MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE_SEGMENT2 to 1 and defining:

    _micropy_hw_internal_flash_storage2_start
    _micropy_hw_internal_flash_storage2_end

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/flashbdev.c            | 30 ++++++++++++++++++++++++++++--
 ports/stm32/mpconfigboard_common.h |  5 +++++
 2 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/ports/stm32/flashbdev.c b/ports/stm32/flashbdev.c
index 3b7609d4d2cb5..ce535d0c0060d 100644
--- a/ports/stm32/flashbdev.c
+++ b/ports/stm32/flashbdev.c
@@ -133,11 +133,35 @@ extern uint8_t _ram_fs_cache_end[];
 #define FLASH_MEM_SEG1_NUM_BLOCKS ((&_flash_fs_end - &_flash_fs_start) / 512)
 
 #else
-#error "no internal flash storage support for this MCU"
+
+// Generic configuration where the linker script specifies flash storage and RAM cache locations.
+
+extern uint8_t _micropy_hw_internal_flash_storage_start;
+extern uint8_t _micropy_hw_internal_flash_storage_end;
+extern uint8_t _micropy_hw_internal_flash_storage2_start;
+extern uint8_t _micropy_hw_internal_flash_storage2_end;
+extern uint8_t _micropy_hw_internal_flash_storage_ram_cache_start[];
+extern uint8_t _micropy_hw_internal_flash_storage_ram_cache_end[];
+
+#define CACHE_MEM_START_ADDR \
+    ((uintptr_t)&_micropy_hw_internal_flash_storage_ram_cache_start[0])
+#define FLASH_SECTOR_SIZE_MAX \
+    (&_micropy_hw_internal_flash_storage_ram_cache_end[0] - &_micropy_hw_internal_flash_storage_ram_cache_start[0])
+#define FLASH_MEM_SEG1_START_ADDR \
+    ((long)&_micropy_hw_internal_flash_storage_start)
+#define FLASH_MEM_SEG1_NUM_BLOCKS \
+    ((&_micropy_hw_internal_flash_storage_end - &_micropy_hw_internal_flash_storage_start) / 512)
+
+#if MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE_SEGMENT2
+#define FLASH_MEM_SEG2_START_ADDR \
+    ((long)&_micropy_hw_internal_flash_storage2_start)
+#define FLASH_MEM_SEG2_NUM_BLOCKS \
+    ((&_micropy_hw_internal_flash_storage2_end - &_micropy_hw_internal_flash_storage2_start) / 512)
+#endif
+
 #endif
 
 #if !defined(FLASH_MEM_SEG2_START_ADDR)
-#define FLASH_MEM_SEG2_START_ADDR (0) // no second segment
 #define FLASH_MEM_SEG2_NUM_BLOCKS (0) // no second segment
 #endif
 
@@ -220,9 +244,11 @@ static uint32_t convert_block_to_flash_addr(uint32_t block) {
     if (block < FLASH_MEM_SEG1_NUM_BLOCKS) {
         return FLASH_MEM_SEG1_START_ADDR + block * FLASH_BLOCK_SIZE;
     }
+    #ifdef FLASH_MEM_SEG2_START_ADDR
     if (block < FLASH_MEM_SEG1_NUM_BLOCKS + FLASH_MEM_SEG2_NUM_BLOCKS) {
         return FLASH_MEM_SEG2_START_ADDR + (block - FLASH_MEM_SEG1_NUM_BLOCKS) * FLASH_BLOCK_SIZE;
     }
+    #endif
     // can add more flash segments here if needed, following above pattern
 
     // bad block
diff --git a/ports/stm32/mpconfigboard_common.h b/ports/stm32/mpconfigboard_common.h
index 6dd51e913f21c..f8342f51b9b38 100644
--- a/ports/stm32/mpconfigboard_common.h
+++ b/ports/stm32/mpconfigboard_common.h
@@ -57,6 +57,11 @@
 #define MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE (1)
 #endif
 
+// If internal flash storage is enabled, whether to use a second segment of flash.
+#ifndef MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE
+#define MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE_SEGMENT2 (0)
+#endif
+
 // Whether to enable the RTC, exposed as pyb.RTC
 #ifndef MICROPY_HW_ENABLE_RTC
 #define MICROPY_HW_ENABLE_RTC (0)

From 35e70c1698047170f9fb8b1edc65a7f7125f267f Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 29 Nov 2021 13:10:36 +1100
Subject: [PATCH 1455/3533] stm32/boards: Convert F413,F439,H743,L4xx,WB55 to
 new flash FS config.

Signed-off-by: Damien George <damien@micropython.org>
---
 .../boards/NUCLEO_F413ZH/mpconfigboard.h      |  2 +
 .../boards/NUCLEO_F439ZI/mpconfigboard.h      |  2 +
 .../boards/NUCLEO_WB55/rfcore_firmware.py     |  3 +-
 ports/stm32/boards/stm32f413xg.ld             | 13 +++--
 ports/stm32/boards/stm32f413xh.ld             | 13 +++--
 ports/stm32/boards/stm32f439.ld               | 12 ++++-
 ports/stm32/boards/stm32h743.ld               |  8 ++--
 ports/stm32/boards/stm32l432.ld               | 10 ++--
 ports/stm32/boards/stm32l452xe.ld             | 10 ++--
 ports/stm32/boards/stm32l476xe.ld             | 10 ++--
 ports/stm32/boards/stm32l476xg.ld             | 10 ++--
 ports/stm32/boards/stm32l496xg.ld             | 10 ++--
 ports/stm32/boards/stm32wb55xg.ld             | 10 ++--
 ports/stm32/flashbdev.c                       | 48 -------------------
 14 files changed, 70 insertions(+), 91 deletions(-)

diff --git a/ports/stm32/boards/NUCLEO_F413ZH/mpconfigboard.h b/ports/stm32/boards/NUCLEO_F413ZH/mpconfigboard.h
index 5297ceda5c4e6..a357c99267b8e 100644
--- a/ports/stm32/boards/NUCLEO_F413ZH/mpconfigboard.h
+++ b/ports/stm32/boards/NUCLEO_F413ZH/mpconfigboard.h
@@ -3,6 +3,8 @@
 
 #define MICROPY_HW_HAS_SWITCH       (1)
 #define MICROPY_HW_HAS_FLASH        (1)
+#define MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE (1)
+#define MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE_SEGMENT2 (1)
 #define MICROPY_HW_ENABLE_RNG       (1)
 #define MICROPY_HW_ENABLE_RTC       (1)
 #define MICROPY_HW_ENABLE_DAC       (1)
diff --git a/ports/stm32/boards/NUCLEO_F439ZI/mpconfigboard.h b/ports/stm32/boards/NUCLEO_F439ZI/mpconfigboard.h
index 010e3b1f5f7d3..7763bd73ef23b 100644
--- a/ports/stm32/boards/NUCLEO_F439ZI/mpconfigboard.h
+++ b/ports/stm32/boards/NUCLEO_F439ZI/mpconfigboard.h
@@ -3,6 +3,8 @@
 
 #define MICROPY_HW_HAS_SWITCH       (1)
 #define MICROPY_HW_HAS_FLASH        (1)
+#define MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE (1)
+#define MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE_SEGMENT2 (1)
 #define MICROPY_HW_ENABLE_RNG       (1)
 #define MICROPY_HW_ENABLE_RTC       (1)
 #define MICROPY_HW_ENABLE_USB       (1)
diff --git a/ports/stm32/boards/NUCLEO_WB55/rfcore_firmware.py b/ports/stm32/boards/NUCLEO_WB55/rfcore_firmware.py
index 0d13d24350b21..4085da90fd491 100644
--- a/ports/stm32/boards/NUCLEO_WB55/rfcore_firmware.py
+++ b/ports/stm32/boards/NUCLEO_WB55/rfcore_firmware.py
@@ -89,7 +89,8 @@
 _OBFUSCATION_KEY = const(0x0573B55AA)
 
 # On boards using the internal flash filesystem, this must match the
-# `_flash_fs_end` symbol defined by the linker script (boards/stm32wb55xg.ld).
+# `_micropy_hw_internal_flash_storage_end` symbol defined by the linker script
+# (see eg boards/stm32wb55xg.ld).
 # We erase everything from here until the start of the secure area (defined by
 # SFSA) just to ensure that no other fragments of firmware files are left
 # behind. On boards with external flash, this just needs to ensure that it
diff --git a/ports/stm32/boards/stm32f413xg.ld b/ports/stm32/boards/stm32f413xg.ld
index 96d6dc5fb0d17..2df46f2b59ddb 100644
--- a/ports/stm32/boards/stm32f413xg.ld
+++ b/ports/stm32/boards/stm32f413xg.ld
@@ -3,15 +3,14 @@
 */
 
 /* Specify the memory areas */
-/* FLASH_FS2 is placed before FLASH_TEXT to support 1MB and 1.5MB FLASH with common code in flashbdev.c */
 MEMORY
 {
     FLASH (rx)      : ORIGIN = 0x08000000, LENGTH = 1024K /* entire flash */
     FLASH_ISR (rx)  : ORIGIN = 0x08000000, LENGTH = 16K /* sector 0 */
     FLASH_FS (rx)   : ORIGIN = 0x08004000, LENGTH = 176K /* sectors 1,2,3 are 16K, 4 is 64K, 5 is 128K (64K used) for filesystem */
-    FLASH_FS2 (rx)  : ORIGIN = 0x08040000, LENGTH = 128K /* sector 6 is 128K (64K used) for filesystem, Total filesystem 240K */
+    FLASH_FS2 (rx)  : ORIGIN = 0x08040000, LENGTH = 64K /* sector 6 is 128K (64K used) for filesystem, Total filesystem 240K */
     FLASH_TEXT (rx) : ORIGIN = 0x08060000, LENGTH = 640K /* sectors 7,8,9,10,11  are 128K*/
-    SRAM2 (xrw)     : ORIGIN = 0x10000000, LENGTH = 64K
+    SRAM2 (xrw)     : ORIGIN = 0x10000000, LENGTH = 64K /* used for filesystem cache */
     RAM (xrw)       : ORIGIN = 0x20000000, LENGTH = 256K
 }
 
@@ -29,3 +28,11 @@ _ram_start = ORIGIN(RAM);
 _ram_end = ORIGIN(RAM) + LENGTH(RAM);
 _heap_start = _ebss; /* heap starts just after statically allocated memory */
 _heap_end = _sstack;
+
++/* Filesystem cache in RAM, and storage in flash */
++_micropy_hw_internal_flash_storage_ram_cache_start = ORIGIN(SRAM2);
++_micropy_hw_internal_flash_storage_ram_cache_end = ORIGIN(SRAM2) + LENGTH(SRAM2);
++_micropy_hw_internal_flash_storage_start = ORIGIN(FLASH_FS);
++_micropy_hw_internal_flash_storage_end = ORIGIN(FLASH_FS) + LENGTH(FLASH_FS);
++_micropy_hw_internal_flash_storage2_start = ORIGIN(FLASH_FS2);
++_micropy_hw_internal_flash_storage2_end = ORIGIN(FLASH_FS2) + LENGTH(FLASH_FS2);
diff --git a/ports/stm32/boards/stm32f413xh.ld b/ports/stm32/boards/stm32f413xh.ld
index 0b28730de53d5..0512a3f056137 100644
--- a/ports/stm32/boards/stm32f413xh.ld
+++ b/ports/stm32/boards/stm32f413xh.ld
@@ -3,15 +3,14 @@
 */
 
 /* Specify the memory areas */
-/* FLASH_FS2 is placed before FLASH_TEXT to support 1MB and 1.5MB FLASH with common code in flashbdev.c */
 MEMORY
 {
     FLASH (rx)      : ORIGIN = 0x08000000, LENGTH = 1536K /* entire flash */
     FLASH_ISR (rx)  : ORIGIN = 0x08000000, LENGTH = 16K /* sector 0 */
     FLASH_FS (rx)   : ORIGIN = 0x08004000, LENGTH = 176K /* sectors 1,2,3 are 16K, 4 is 64K, 5 is 128K (64K used) for filesystem */
-    FLASH_FS2 (rx)  : ORIGIN = 0x08040000, LENGTH = 128K /* sector 6 is 128K (64K used) for filesystem, Total filesystem 240K */
+    FLASH_FS2 (rx)  : ORIGIN = 0x08040000, LENGTH = 64K /* sector 6 is 128K (64K used) for filesystem, Total filesystem 240K */
     FLASH_TEXT (rx) : ORIGIN = 0x08060000, LENGTH = 1152K /* sectors 7,8,9,10,11,12,13,14,15  are 128K*/
-    SRAM2 (xrw)     : ORIGIN = 0x10000000, LENGTH = 64K
+    SRAM2 (xrw)     : ORIGIN = 0x10000000, LENGTH = 64K /* used for filesystem cache */
     RAM (xrw)       : ORIGIN = 0x20000000, LENGTH = 256K
 }
 
@@ -29,3 +28,11 @@ _ram_start = ORIGIN(RAM);
 _ram_end = ORIGIN(RAM) + LENGTH(RAM);
 _heap_start = _ebss; /* heap starts just after statically allocated memory */
 _heap_end = _sstack;
+
++/* Filesystem cache in RAM, and storage in flash */
++_micropy_hw_internal_flash_storage_ram_cache_start = ORIGIN(SRAM2);
++_micropy_hw_internal_flash_storage_ram_cache_end = ORIGIN(SRAM2) + LENGTH(SRAM2);
++_micropy_hw_internal_flash_storage_start = ORIGIN(FLASH_FS);
++_micropy_hw_internal_flash_storage_end = ORIGIN(FLASH_FS) + LENGTH(FLASH_FS);
++_micropy_hw_internal_flash_storage2_start = ORIGIN(FLASH_FS2);
++_micropy_hw_internal_flash_storage2_end = ORIGIN(FLASH_FS2) + LENGTH(FLASH_FS2);
diff --git a/ports/stm32/boards/stm32f439.ld b/ports/stm32/boards/stm32f439.ld
index e847646b35ed3..64195368c1b1d 100644
--- a/ports/stm32/boards/stm32f439.ld
+++ b/ports/stm32/boards/stm32f439.ld
@@ -8,8 +8,8 @@ MEMORY
     FLASH (rx)      : ORIGIN = 0x08000000, LENGTH = 2048K /* entire flash */
     FLASH_ISR (rx)  : ORIGIN = 0x08000000, LENGTH = 16K /* sector 0 */
     FLASH_TEXT (rx) : ORIGIN = 0x08020000, LENGTH = 896K /* sectors 5-11 are 128K */
-    FLASH_FS (rx)   : ORIGIN = 0x08100000, LENGTH = 256K /* sectors 12-17 are 4*16K+64K+128K */
-    FLASH_FS2 (rx)  : ORIGIN = 0x08140000, LENGTH = 128K /* sector 18 */
+    FLASH_FS (rx)   : ORIGIN = 0x08100000, LENGTH = 192K /* sectors 12-15 are 16K, 16 is 64K, 17 is 128K (64K used) */
+    FLASH_FS2 (rx)  : ORIGIN = 0x08140000, LENGTH = 64K /* sector 18 is 128K (64K used) */
     RAM (xrw)       : ORIGIN = 0x20000000, LENGTH = 192K
     CCMRAM (xrw)    : ORIGIN = 0x10000000, LENGTH = 64K
 }
@@ -28,3 +28,11 @@ _ram_start = ORIGIN(RAM);
 _ram_end = ORIGIN(RAM) + LENGTH(RAM);
 _heap_start = _ebss; /* heap starts just after statically allocated memory */
 _heap_end = _sstack;
+
+/* Filesystem cache in RAM, and storage in flash */
+_micropy_hw_internal_flash_storage_ram_cache_start = ORIGIN(CCMRAM);
+_micropy_hw_internal_flash_storage_ram_cache_end = ORIGIN(CCMRAM) + LENGTH(CCMRAM);
+_micropy_hw_internal_flash_storage_start = ORIGIN(FLASH_FS);
+_micropy_hw_internal_flash_storage_end = ORIGIN(FLASH_FS) + LENGTH(FLASH_FS);
+_micropy_hw_internal_flash_storage2_start = ORIGIN(FLASH_FS2);
+_micropy_hw_internal_flash_storage2_end = ORIGIN(FLASH_FS2) + LENGTH(FLASH_FS2);
diff --git a/ports/stm32/boards/stm32h743.ld b/ports/stm32/boards/stm32h743.ld
index 13fa0c52c0211..ad1b1b8922709 100644
--- a/ports/stm32/boards/stm32h743.ld
+++ b/ports/stm32/boards/stm32h743.ld
@@ -29,12 +29,12 @@ _heap_start = _ebss; /* heap starts just after statically allocated memory */
 _heap_end = _sstack;
 
 /* Location of filesystem RAM cache */
-_ram_fs_cache_start = ORIGIN(DTCM);
-_ram_fs_cache_end = ORIGIN(DTCM) + LENGTH(DTCM);
+_micropy_hw_internal_flash_storage_ram_cache_start = ORIGIN(DTCM);
+_micropy_hw_internal_flash_storage_ram_cache_end = ORIGIN(DTCM) + LENGTH(DTCM);
 
 /* Location of filesystem flash storage */
-_flash_fs_start = ORIGIN(FLASH_FS);
-_flash_fs_end   = ORIGIN(FLASH_FS) + LENGTH(FLASH_FS);
+_micropy_hw_internal_flash_storage_start = ORIGIN(FLASH_FS);
+_micropy_hw_internal_flash_storage_end = ORIGIN(FLASH_FS) + LENGTH(FLASH_FS);
 
 /* Define output sections */
 SECTIONS
diff --git a/ports/stm32/boards/stm32l432.ld b/ports/stm32/boards/stm32l432.ld
index 469e834f91c1f..2006471e75a53 100644
--- a/ports/stm32/boards/stm32l432.ld
+++ b/ports/stm32/boards/stm32l432.ld
@@ -21,14 +21,14 @@ _minimum_heap_size = 16K;
 _ram_start = ORIGIN(RAM);
 _ram_end = ORIGIN(RAM) + LENGTH(RAM);
 
-_ram_fs_cache_end = _ram_end;
-_ram_fs_cache_start = _ram_fs_cache_end - 2K; /* fs cache = 2K */
+_micropy_hw_internal_flash_storage_ram_cache_end = _ram_end;
+_micropy_hw_internal_flash_storage_ram_cache_start = _micropy_hw_internal_flash_storage_ram_cache_end - 2K; /* fs cache = 2K */
 
-_estack = _ram_fs_cache_start - _estack_reserve;
+_estack = _micropy_hw_internal_flash_storage_ram_cache_start - _estack_reserve;
 _sstack = _estack - 10K; /* stack = 10K */
 
 _heap_start = _ebss; /* heap starts just after statically allocated memory */
 _heap_end = _sstack; /* bss + heap = 52K, tunable by adjusting stack size */
 
-_flash_fs_start = ORIGIN(FLASH_FS);
-_flash_fs_end   = ORIGIN(FLASH_FS) + LENGTH(FLASH_FS);
+_micropy_hw_internal_flash_storage_start = ORIGIN(FLASH_FS);
+_micropy_hw_internal_flash_storage_end   = ORIGIN(FLASH_FS) + LENGTH(FLASH_FS);
diff --git a/ports/stm32/boards/stm32l452xe.ld b/ports/stm32/boards/stm32l452xe.ld
index 7b07ee7018dd8..0cb753a1c6511 100644
--- a/ports/stm32/boards/stm32l452xe.ld
+++ b/ports/stm32/boards/stm32l452xe.ld
@@ -21,14 +21,14 @@ _minimum_heap_size = 16K;
 _ram_start = ORIGIN(RAM);
 _ram_end = ORIGIN(RAM) + LENGTH(RAM);
 
-_ram_fs_cache_end = _ram_end;
-_ram_fs_cache_start = _ram_fs_cache_end - 2K; /* fs cache = 2K */
+_micropy_hw_internal_flash_storage_ram_cache_end = _ram_end;
+_micropy_hw_internal_flash_storage_ram_cache_start = _micropy_hw_internal_flash_storage_ram_cache_end - 2K; /* fs cache = 2K */
 
-_estack = _ram_fs_cache_start - _estack_reserve;
+_estack = _micropy_hw_internal_flash_storage_ram_cache_start - _estack_reserve;
 _sstack = _estack - 16K; /* stack = 16K */
 
 _heap_start = _ebss; /* heap starts just after statically allocated memory */
 _heap_end = _sstack; /* bss + heap = 142K, tunable by adjusting stack size */
 
-_flash_fs_start = ORIGIN(FLASH_FS);
-_flash_fs_end   = ORIGIN(FLASH_FS) + LENGTH(FLASH_FS);
+_micropy_hw_internal_flash_storage_start = ORIGIN(FLASH_FS);
+_micropy_hw_internal_flash_storage_end   = ORIGIN(FLASH_FS) + LENGTH(FLASH_FS);
diff --git a/ports/stm32/boards/stm32l476xe.ld b/ports/stm32/boards/stm32l476xe.ld
index 6eaf71545d0a1..1c70a9cfdec2d 100644
--- a/ports/stm32/boards/stm32l476xe.ld
+++ b/ports/stm32/boards/stm32l476xe.ld
@@ -22,14 +22,14 @@ _minimum_heap_size = 16K;
 _ram_start = ORIGIN(RAM);
 _ram_end = ORIGIN(RAM) + LENGTH(RAM);
 
-_ram_fs_cache_end = ORIGIN(SRAM2) + LENGTH(SRAM2); /* fs_cache in SRAM2 */
-_ram_fs_cache_start = _ram_fs_cache_end - 2K; /* fs cache = 2K */
+_micropy_hw_internal_flash_storage_ram_cache_end = ORIGIN(SRAM2) + LENGTH(SRAM2); /* fs_cache in SRAM2 */
+_micropy_hw_internal_flash_storage_ram_cache_start = _micropy_hw_internal_flash_storage_ram_cache_end - 2K; /* fs cache = 2K */
 
-_estack = _ram_fs_cache_start - _estack_reserve; /* stack in SRAM2 */
+_estack = _micropy_hw_internal_flash_storage_ram_cache_start - _estack_reserve; /* stack in SRAM2 */
 _sstack = ORIGIN(SRAM2); /* stack = 30K */
 
 _heap_start = _ebss; /* heap starts just after statically allocated memory */
 _heap_end = _ram_end; /* bss + heap = 96K, tunable by adjusting stack size */
 
-_flash_fs_start = ORIGIN(FLASH_FS);
-_flash_fs_end   = ORIGIN(FLASH_FS) + LENGTH(FLASH_FS);
+_micropy_hw_internal_flash_storage_start = ORIGIN(FLASH_FS);
+_micropy_hw_internal_flash_storage_end   = ORIGIN(FLASH_FS) + LENGTH(FLASH_FS);
diff --git a/ports/stm32/boards/stm32l476xg.ld b/ports/stm32/boards/stm32l476xg.ld
index 09c3f29c54999..0185eb1b2da89 100644
--- a/ports/stm32/boards/stm32l476xg.ld
+++ b/ports/stm32/boards/stm32l476xg.ld
@@ -22,14 +22,14 @@ _minimum_heap_size = 16K;
 _ram_start = ORIGIN(RAM);
 _ram_end = ORIGIN(RAM) + LENGTH(RAM);
 
-_ram_fs_cache_end = ORIGIN(SRAM2) + LENGTH(SRAM2); /* fs_cache in SRAM2 */
-_ram_fs_cache_start = _ram_fs_cache_end - 2K; /* fs cache = 2K */
+_micropy_hw_internal_flash_storage_ram_cache_end = ORIGIN(SRAM2) + LENGTH(SRAM2); /* fs_cache in SRAM2 */
+_micropy_hw_internal_flash_storage_ram_cache_start = _micropy_hw_internal_flash_storage_ram_cache_end - 2K; /* fs cache = 2K */
 
-_estack = _ram_fs_cache_start - _estack_reserve; /* stack in SRAM2 */
+_estack = _micropy_hw_internal_flash_storage_ram_cache_start - _estack_reserve; /* stack in SRAM2 */
 _sstack = ORIGIN(SRAM2); /* stack = 30K */
 
 _heap_start = _ebss; /* heap starts just after statically allocated memory */
 _heap_end = _ram_end; /* bss + heap = 96K, tunable by adjusting stack size */
 
-_flash_fs_start = ORIGIN(FLASH_FS);
-_flash_fs_end   = ORIGIN(FLASH_FS) + LENGTH(FLASH_FS);
+_micropy_hw_internal_flash_storage_start = ORIGIN(FLASH_FS);
+_micropy_hw_internal_flash_storage_end   = ORIGIN(FLASH_FS) + LENGTH(FLASH_FS);
diff --git a/ports/stm32/boards/stm32l496xg.ld b/ports/stm32/boards/stm32l496xg.ld
index 327cb5ce13407..d7cb92b8dcf4b 100644
--- a/ports/stm32/boards/stm32l496xg.ld
+++ b/ports/stm32/boards/stm32l496xg.ld
@@ -21,14 +21,14 @@ _minimum_heap_size = 16K;
 _ram_start = ORIGIN(RAM);
 _ram_end = ORIGIN(RAM) + LENGTH(RAM);
 
-_ram_fs_cache_end = _ram_end;
-_ram_fs_cache_start = _ram_fs_cache_end - 2K; /* fs cache = 2K */
+_micropy_hw_internal_flash_storage_ram_cache_end = _ram_end;
+_micropy_hw_internal_flash_storage_ram_cache_start = _micropy_hw_internal_flash_storage_ram_cache_end - 2K; /* fs cache = 2K */
 
-_estack = _ram_fs_cache_start - _estack_reserve;
+_estack = _micropy_hw_internal_flash_storage_ram_cache_start - _estack_reserve;
 _sstack = _estack - 16K; /* stack = 16K */
 
 _heap_start = _ebss; /* heap starts just after statically allocated memory */
 _heap_end = _sstack; /* bss + heap = 302K, tunable by adjusting stack size */
 
-_flash_fs_start = ORIGIN(FLASH_FS);
-_flash_fs_end   = ORIGIN(FLASH_FS) + LENGTH(FLASH_FS);
+_micropy_hw_internal_flash_storage_start = ORIGIN(FLASH_FS);
+_micropy_hw_internal_flash_storage_end   = ORIGIN(FLASH_FS) + LENGTH(FLASH_FS);
diff --git a/ports/stm32/boards/stm32wb55xg.ld b/ports/stm32/boards/stm32wb55xg.ld
index c3dc5f5197a00..841c32b8a0fb8 100644
--- a/ports/stm32/boards/stm32wb55xg.ld
+++ b/ports/stm32/boards/stm32wb55xg.ld
@@ -21,19 +21,19 @@ _minimum_heap_size = 16K;
 _ram_start = ORIGIN(RAM);
 _ram_end = ORIGIN(RAM) + LENGTH(RAM);
 
-_ram_fs_cache_end = ORIGIN(RAM) + LENGTH(RAM);
-_ram_fs_cache_start = _ram_fs_cache_end - 4K; /* fs cache = 4K */
+_micropy_hw_internal_flash_storage_ram_cache_end = ORIGIN(RAM) + LENGTH(RAM);
+_micropy_hw_internal_flash_storage_ram_cache_start = _micropy_hw_internal_flash_storage_ram_cache_end - 4K; /* fs cache = 4K */
 
 /* Define the stack.  The stack is full descending so begins at the bottom of FS cache.
    Note that EABI requires the stack to be 8-byte aligned for a call. */
-_estack = _ram_fs_cache_start - _estack_reserve;
+_estack = _micropy_hw_internal_flash_storage_ram_cache_start - _estack_reserve;
 _sstack = _estack - 16K;
 
 _heap_start = _ebss; /* heap starts just after statically allocated memory */
 _heap_end = _sstack;
 
-_flash_fs_start = ORIGIN(FLASH_FS);
-_flash_fs_end   = ORIGIN(FLASH_FS) + LENGTH(FLASH_FS);
+_micropy_hw_internal_flash_storage_start = ORIGIN(FLASH_FS);
+_micropy_hw_internal_flash_storage_end   = ORIGIN(FLASH_FS) + LENGTH(FLASH_FS);
 
 SECTIONS
 {
diff --git a/ports/stm32/flashbdev.c b/ports/stm32/flashbdev.c
index ce535d0c0060d..946a9d8cc2f99 100644
--- a/ports/stm32/flashbdev.c
+++ b/ports/stm32/flashbdev.c
@@ -61,15 +61,6 @@ STATIC byte flash_cache_mem[0x4000] __attribute__((aligned(4))); // 16k
 #define FLASH_MEM_SEG1_START_ADDR (0x08004000) // sector 1
 #define FLASH_MEM_SEG1_NUM_BLOCKS (128) // sectors 1,2,3,4: 16k+16k+16k+16k(of 64k)=64k
 
-#elif defined(STM32F413xx)
-
-#define CACHE_MEM_START_ADDR (0x10000000) // SRAM2 data RAM, 64k
-#define FLASH_SECTOR_SIZE_MAX (0x10000) // 64k max, size of SRAM2
-#define FLASH_MEM_SEG1_START_ADDR (0x08004000) // sector 1
-#define FLASH_MEM_SEG1_NUM_BLOCKS (352) // sectors 1,2,3,4,5: 16k+16k+16k+64k+64k(of 128k)=176k
-#define FLASH_MEM_SEG2_START_ADDR (0x08040000) // sector 6
-#define FLASH_MEM_SEG2_NUM_BLOCKS (128) // sector 6: 64k(of 128k). Filesystem 176K + 64K = 240K
-
 #elif defined(STM32F427xx) || defined(STM32F429xx)
 
 #define CACHE_MEM_START_ADDR (0x10000000) // CCM data RAM, 64k
@@ -77,15 +68,6 @@ STATIC byte flash_cache_mem[0x4000] __attribute__((aligned(4))); // 16k
 #define FLASH_MEM_SEG1_START_ADDR (0x08004000) // sector 1
 #define FLASH_MEM_SEG1_NUM_BLOCKS (224) // sectors 1,2,3,4: 16k+16k+16k+64k=112k
 
-#elif defined(STM32F439xx)
-
-#define CACHE_MEM_START_ADDR (0x10000000) // CCM data RAM, 64k
-#define FLASH_SECTOR_SIZE_MAX (0x10000) // 64k max, size of CCM
-#define FLASH_MEM_SEG1_START_ADDR (0x08100000) // sector 12
-#define FLASH_MEM_SEG1_NUM_BLOCKS (384) // sectors 12,13,14,15,16,17: 16k+16k+16k+16k+64k+64k(of 128k)=192k
-#define FLASH_MEM_SEG2_START_ADDR (0x08140000) // sector 18
-#define FLASH_MEM_SEG2_NUM_BLOCKS (128) // sector 18: 64k(of 128k)
-
 #elif defined(STM32F722xx) || defined(STM32F723xx) || defined(STM32F732xx) || defined(STM32F733xx)
 
 #define CACHE_MEM_START_ADDR (0x20000000) // DTCM data RAM, 64k
@@ -102,36 +84,6 @@ STATIC byte flash_cache_mem[0x4000] __attribute__((aligned(4))); // 16k
 #define FLASH_MEM_SEG1_START_ADDR (0x08008000) // sector 1
 #define FLASH_MEM_SEG1_NUM_BLOCKS (192) // sectors 1,2,3: 32k+32k+32=96k
 
-#elif defined(STM32H743xx)
-
-// The STM32H743 flash sectors are 128K, with locations defined in the linker script
-extern uint8_t _flash_fs_start;
-extern uint8_t _flash_fs_end;
-extern uint8_t _ram_fs_cache_start[];
-extern uint8_t _ram_fs_cache_end[];
-
-#define CACHE_MEM_START_ADDR ((uintptr_t)&_ram_fs_cache_start[0])
-#define FLASH_SECTOR_SIZE_MAX (&_ram_fs_cache_end[0] - &_ram_fs_cache_start[0])
-#define FLASH_MEM_SEG1_START_ADDR ((long)&_flash_fs_start)
-#define FLASH_MEM_SEG1_NUM_BLOCKS ((&_flash_fs_end - &_flash_fs_start) / 512)
-
-#elif defined(STM32L432xx) || \
-    defined(STM32L451xx) || defined(STM32L452xx) || defined(STM32L462xx) || \
-    defined(STM32L475xx) || defined(STM32L476xx) || defined(STM32L496xx) || \
-    defined(STM32WB)
-
-// The STM32L4xx doesn't have CCRAM, so we use SRAM2 for this, although
-// actual location and size is defined by the linker script.
-extern uint8_t _flash_fs_start;
-extern uint8_t _flash_fs_end;
-extern uint8_t _ram_fs_cache_start[]; // size determined by linker file
-extern uint8_t _ram_fs_cache_end[];
-
-#define CACHE_MEM_START_ADDR ((uintptr_t)&_ram_fs_cache_start[0])
-#define FLASH_SECTOR_SIZE_MAX (&_ram_fs_cache_end[0] - &_ram_fs_cache_start[0]) // 2k max
-#define FLASH_MEM_SEG1_START_ADDR ((long)&_flash_fs_start)
-#define FLASH_MEM_SEG1_NUM_BLOCKS ((&_flash_fs_end - &_flash_fs_start) / 512)
-
 #else
 
 // Generic configuration where the linker script specifies flash storage and RAM cache locations.

From 7e61a12eb1e153bf09b93c19f491237d72de2cf6 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 29 Nov 2021 13:25:53 +1100
Subject: [PATCH 1456/3533] stm32: Add support for F479 MCUs.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/adc.c                   |   3 +-
 ports/stm32/boards/stm32f479_af.csv | 161 ++++++++++++++++++++++++++++
 2 files changed, 163 insertions(+), 1 deletion(-)
 create mode 100644 ports/stm32/boards/stm32f479_af.csv

diff --git a/ports/stm32/adc.c b/ports/stm32/adc.c
index ceb6584d03dc8..3e61abce3ca92 100644
--- a/ports/stm32/adc.c
+++ b/ports/stm32/adc.c
@@ -133,7 +133,8 @@
 #elif defined(STM32F411xE) || defined(STM32F412Zx) || \
     defined(STM32F413xx) || defined(STM32F427xx) || \
     defined(STM32F429xx) || defined(STM32F437xx) || \
-    defined(STM32F439xx) || defined(STM32F446xx)
+    defined(STM32F439xx) || defined(STM32F446xx) || \
+    defined(STM32F479xx)
 #define VBAT_DIV (4)
 #elif defined(STM32F722xx) || defined(STM32F723xx) || \
     defined(STM32F732xx) || defined(STM32F733xx) || \
diff --git a/ports/stm32/boards/stm32f479_af.csv b/ports/stm32/boards/stm32f479_af.csv
new file mode 100644
index 0000000000000..7cbb242a52ef3
--- /dev/null
+++ b/ports/stm32/boards/stm32f479_af.csv
@@ -0,0 +1,161 @@
+Port,,AF0,AF1,AF2,AF3,AF4,AF5,AF6,AF7,AF8,AF9,AF10,AF11,AF12,AF13,AF14,AF15,
+,,SYS,TIM1/2,TIM3/4/5,TIM8/9/10/11,I2C1/2/3,SPI1/2/3/4/5/6,SPI2/3/SAI1,SPI2/3/USART1/2/3,USART6/UART4/5/7/8,CAN1/2/TIM12/13/14/QUADSPI/LCD,QUADSPI/OTG2_HS/OTG1_FS,ETH,FMC/SDIO/OTG2_FS,DCMI/DSIHOST,LCD,SYS,ADC
+PortA,PA0,,TIM2_CH1/TIM2_ETR,TIM5_CH1,TIM8_ETR,,,,USART2_CTS,UART4_TX,,,ETH_MII_CRS,,,,EVENTOUT,ADC123_IN0
+PortA,PA1,,TIM2_CH2,TIM5_CH2,,,,,USART2_RTS,UART4_RX,QUADSPI_BK1_IO3,,ETH_MII_RX_CLK/ETH_RMII_REF_CLK,,,LCD_R2,EVENTOUT,ADC123_IN1
+PortA,PA2,,TIM2_CH3,TIM5_CH3,TIM9_CH1,,,,USART2_TX,,,,ETH_MDIO,,,LCD_R1,EVENTOUT,ADC123_IN2
+PortA,PA3,,TIM2_CH4,TIM5_CH4,TIM9_CH2,,,,USART2_RX,,LCD_B2,OTG_HS_ULPI_D0,ETH_MII_COL,,,LCD_B5,EVENTOUT,ADC123_IN3
+PortA,PA4,,,,,,SPI1_NSS,SPI3_NSS/I2S3_WS,USART2_CK,,,,,OTG_HS_SOF,DCMI_HSYNC,LCD_VSYNC,EVENTOUT,ADC12_IN4
+PortA,PA5,,TIM2_CH1/TIM2_ETR,,TIM8_CH1N,,SPI1_SCK,,,,,OTG_HS_ULPI_CK,,,,LCD_R4,EVENTOUT,ADC12_IN5
+PortA,PA6,,TIM1_BKIN,TIM3_CH1,TIM8_BKIN,,SPI1_MISO,,,,TIM13_CH1,,,,DCMI_PIXCLK,LCD_G2,EVENTOUT,ADC12_IN6
+PortA,PA7,,TIM1_CH1N,TIM3_CH2,TIM8_CH1N,,SPI1_MOSI,,,,TIM14_CH1,QUADSPI_CLK,ETH_MII_RX_DV/ETH_RMII_CRS_DV,FMC_SDNWE,,,EVENTOUT,ADC12_IN7
+PortA,PA8,MCO1,TIM1_CH1,,,I2C3_SCL,,,USART1_CK,,,OTG_FS_SOF,,,,LCD_R6,EVENTOUT,
+PortA,PA9,,TIM1_CH2,,,I2C3_SMBA,SPI2_SCK/I2S2_CK,,USART1_TX,,,,,,DCMI_D0,,EVENTOUT,
+PortA,PA10,,TIM1_CH3,,,,,,USART1_RX,,,OTG_FS_ID,,,DCMI_D1,,EVENTOUT,
+PortA,PA11,,TIM1_CH4,,,,,,USART1_CTS,,CAN1_RX,OTG_FS_DM,,,,LCD_R4,EVENTOUT,
+PortA,PA12,,TIM1_ETR,,,,,,USART1_RTS,,CAN1_TX,OTG_FS_DP,,,,LCD_R5,EVENTOUT,
+PortA,PA13,JTMS/SWDIO,,,,,,,,,,,,,,,EVENTOUT,
+PortA,PA14,JTCK/SWCLK,,,,,,,,,,,,,,,EVENTOUT,
+PortA,PA15,JTDI,TIM2_CH1/TIM2_ETR,,,,SPI1_NSS,SPI3_NSS/I2S3_WS,,,,,,,,,EVENTOUT,
+PortB,PB0,,TIM1_CH2N,TIM3_CH3,TIM8_CH2N,,,,,,LCD_R3,OTG_HS_ULPI_D1,ETH_MII_RXD2,,,LCD_G1,EVENTOUT,ADC12_IN8
+PortB,PB1,,TIM1_CH3N,TIM3_CH4,TIM8_CH3N,,,,,,LCD_R6,OTG_HS_ULPI_D2,ETH_MII_RXD3,,,LCD_G0,EVENTOUT,ADC12_IN9
+PortB,PB2,,,,,,,,,,,,,,,,EVENTOUT,
+PortB,PB3,JTDO/TRACESWO,TIM2_CH2,,,,SPI1_SCK,SPI3_SCK/I2S3_CK,,,,,,,,,EVENTOUT,
+PortB,PB4,NJTRST,,TIM3_CH1,,,SPI1_MISO,SPI3_MISO,I2S3_EXTSD,,,,,,,,EVENTOUT,
+PortB,PB5,,,TIM3_CH2,,I2C1_SMBA,SPI1_MOSI,SPI3_MOSI/I2S3_SD,,,CAN2_RX,OTG_HS_ULPI_D7,ETH_PPS_OUT,FMC_SDCKE1,DCMI_D10,LCD_G7,EVENTOUT,
+PortB,PB6,,,TIM4_CH1,,I2C1_SCL,,,USART1_TX,,CAN2_TX,QUADSPI_BK1_NCS,,FMC_SDNE1,DCMI_D5,,EVENTOUT,
+PortB,PB7,,,TIM4_CH2,,I2C1_SDA,,,USART1_RX,,,,,FMC_NL,DCMI_VSYNC,,EVENTOUT,
+PortB,PB8,,,TIM4_CH3,TIM10_CH1,I2C1_SCL,,,,,CAN1_RX,,ETH_MII_TXD3,SDIO_D4,DCMI_D6,LCD_B6,EVENTOUT,
+PortB,PB9,,,TIM4_CH4,TIM11_CH1,I2C1_SDA,SPI2_NSS/I2S2_WS,,,,CAN1_TX,,,SDIO_D5,DCMI_D7,LCD_B7,EVENTOUT,
+PortB,PB10,,TIM2_CH3,,,I2C2_SCL,SPI2_SCK/I2S2_CK,,USART3_TX,,QUADSPI_BK1_NCS,OTG_HS_ULPI_D3,ETH_MII_RX_ER,,,LCD_G4,EVENTOUT,
+PortB,PB11,,TIM2_CH4,,,I2C2_SDA,,,USART3_RX,,,OTG_HS_ULPI_D4,ETH_MII_TX_EN/ETH_RMII_TX_EN,,DSIHOST_TE,LCD_G5,EVENTOUT,
+PortB,PB12,,TIM1_BKIN,,,I2C2_SMBA,SPI2_NSS/I2S2_WS,,USART3_CK,,CAN2_RX,OTG_HS_ULPI_D5,ETH_MII_TXD0/ETH_RMII_TXD0,OTG_HS_ID,,,EVENTOUT,
+PortB,PB13,,TIM1_CH1N,,,,SPI2_SCK/I2S2_CK,,USART3_CTS,,CAN2_TX,OTG_HS_ULPI_D6,ETH_MII_TXD1/ETH_RMII_TXD1,,,,EVENTOUT,
+PortB,PB14,,TIM1_CH2N,,TIM8_CH2N,,SPI2_MISO,I2S2_EXTSD,USART3_RTS,,TIM12_CH1,,,OTG_HS_DM,,,EVENTOUT,
+PortB,PB15,RTC_REFIN,TIM1_CH3N,,TIM8_CH3N,,SPI2_MOSI/I2S2_SD,,,,TIM12_CH2,,,OTG_HS_DP,,,EVENTOUT,
+PortC,PC0,,,,,,,,,,,OTG_HS_ULPI_STP,,FMC_SDNWE,,LCD_R5,EVENTOUT,ADC123_IN10
+PortC,PC1,TRACED0,,,,,SPI2_MOSI/I2S2_SD,SAI1_SD_A,,,,,ETH_MDC,,,,EVENTOUT,ADC123_IN11
+PortC,PC2,,,,,,SPI2_MISO,I2S2_EXTSD,,,,OTG_HS_ULPI_DIR,ETH_MII_TXD2,FMC_SDNE0,,,EVENTOUT,ADC123_IN12
+PortC,PC3,,,,,,SPI2_MOSI/I2S2_SD,,,,,OTG_HS_ULPI_NXT,ETH_MII_TX_CLK,FMC_SDCKE0,,,EVENTOUT,ADC123_IN13
+PortC,PC4,,,,,,,,,,,,ETH_MII_RXD0/ETH_RMII_RXD0,FMC_SDNE0,,,EVENTOUT,ADC12_IN14
+PortC,PC5,,,,,,,,,,,,ETH_MII_RXD1/ETH_RMII_RXD1,FMC_SDCKE0,,,EVENTOUT,ADC12_IN15
+PortC,PC6,,,TIM3_CH1,TIM8_CH1,,I2S2_MCK,,,USART6_TX,,,,SDIO_D6,DCMI_D0,LCD_HSYNC,EVENTOUT,
+PortC,PC7,,,TIM3_CH2,TIM8_CH2,,,I2S3_MCK,,USART6_RX,,,,SDIO_D7,DCMI_D1,LCD_G6,EVENTOUT,
+PortC,PC8,TRACED1,,TIM3_CH3,TIM8_CH3,,,,,USART6_CK,,,,SDIO_D0,DCMI_D2,,EVENTOUT,
+PortC,PC9,MCO2,,TIM3_CH4,TIM8_CH4,I2C3_SDA,I2S_CKIN,,,,QUADSPI_BK1_IO0,,,SDIO_D1,DCMI_D3,,EVENTOUT,
+PortC,PC10,,,,,,,SPI3_SCK/I2S3_CK,USART3_TX,UART4_TX,QUADSPI_BK1_IO1,,,SDIO_D2,DCMI_D8,LCD_R2,EVENTOUT,
+PortC,PC11,,,,,,I2S3_EXTSD,SPI3_MISO,USART3_RX,UART4_RX,QUADSPI_BK2_NCS,,,SDIO_D3,DCMI_D4,,EVENTOUT,
+PortC,PC12,TRACED3,,,,,,SPI3_MOSI/I2S3_SD,USART3_CK,UART5_TX,,,,SDIO_CK,DCMI_D9,,EVENTOUT,
+PortC,PC13,,,,,,,,,,,,,,,,EVENTOUT,
+PortC,PC14,,,,,,,,,,,,,,,,EVENTOUT,
+PortC,PC15,,,,,,,,,,,,,,,,EVENTOUT,
+PortD,PD0,,,,,,,,,,CAN1_RX,,,FMC_D2,,,EVENTOUT,
+PortD,PD1,,,,,,,,,,CAN1_TX,,,FMC_D3,,,EVENTOUT,
+PortD,PD2,TRACED2,,TIM3_ETR,,,,,,UART5_RX,,,,SDIO_CMD,DCMI_D11,,EVENTOUT,
+PortD,PD3,,,,,,SPI2_SCK/I2S2_CK,,USART2_CTS,,,,,FMC_CLK,DCMI_D5,LCD_G7,EVENTOUT,
+PortD,PD4,,,,,,,,USART2_RTS,,,,,FMC_NOE,,,EVENTOUT,
+PortD,PD5,,,,,,,,USART2_TX,,,,,FMC_NWE,,,EVENTOUT,
+PortD,PD6,,,,,,SPI3_MOSI/I2S3_SD,SAI1_SD_A,USART2_RX,,,,,FMC_NWAIT,DCMI_D10,LCD_B2,EVENTOUT,
+PortD,PD7,,,,,,,,USART2_CK,,,,,FMC_NE1,,,EVENTOUT,
+PortD,PD8,,,,,,,,USART3_TX,,,,,FMC_D13,,,EVENTOUT,
+PortD,PD9,,,,,,,,USART3_RX,,,,,FMC_D14,,,EVENTOUT,
+PortD,PD10,,,,,,,,USART3_CK,,,,,FMC_D15,,LCD_B3,EVENTOUT,
+PortD,PD11,,,,,,,,USART3_CTS,,QUADSPI_BK1_IO0,,,FMC_A16/FMC_CLE,,,EVENTOUT,
+PortD,PD12,,,TIM4_CH1,,,,,USART3_RTS,,QUADSPI_BK1_IO1,,,FMC_A17/FMC_ALE,,,EVENTOUT,
+PortD,PD13,,,TIM4_CH2,,,,,,,QUADSPI_BK1_IO3,,,FMC_A18,,,EVENTOUT,
+PortD,PD14,,,TIM4_CH3,,,,,,,,,,FMC_D0,,,EVENTOUT,
+PortD,PD15,,,TIM4_CH4,,,,,,,,,,FMC_D1,,,EVENTOUT,
+PortE,PE0,,,TIM4_ETR,,,,,,UART8_RX,,,,FMC_NBL0,DCMI_D2,,EVENTOUT,
+PortE,PE1,,,,,,,,,UART8_TX,,,,FMC_NBL1,DCMI_D3,,EVENTOUT,
+PortE,PE2,TRACECLK,,,,,SPI4_SCK,SAI1_MCLK_A,,,QUADSPI_BK1_IO2,,ETH_MII_TXD3,FMC_A23,,,EVENTOUT,
+PortE,PE3,TRACED0,,,,,,SAI1_SD_B,,,,,,FMC_A19,,,EVENTOUT,
+PortE,PE4,TRACED1,,,,,SPI4_NSS,SAI1_FS_A,,,,,,FMC_A20,DCMI_D4,LCD_B0,EVENTOUT,
+PortE,PE5,TRACED2,,,TIM9_CH1,,SPI4_MISO,SAI1_SCK_A,,,,,,FMC_A21,DCMI_D6,LCD_G0,EVENTOUT,
+PortE,PE6,TRACED3,,,TIM9_CH2,,SPI4_MOSI,SAI1_SD_A,,,,,,FMC_A22,DCMI_D7,LCD_G1,EVENTOUT,
+PortE,PE7,,TIM1_ETR,,,,,,,UART7_RX,,QUADSPI_BK2_IO0,,FMC_D4,,,EVENTOUT,
+PortE,PE8,,TIM1_CH1N,,,,,,,UART7_TX,,QUADSPI_BK2_IO1,,FMC_D5,,,EVENTOUT,
+PortE,PE9,,TIM1_CH1,,,,,,,,,QUADSPI_BK2_IO2,,FMC_D6,,,EVENTOUT,
+PortE,PE10,,TIM1_CH2N,,,,,,,,,QUADSPI_BK2_IO3,,FMC_D7,,,EVENTOUT,
+PortE,PE11,,TIM1_CH2,,,,SPI4_NSS,,,,,,,FMC_D8,,LCD_G3,EVENTOUT,
+PortE,PE12,,TIM1_CH3N,,,,SPI4_SCK,,,,,,,FMC_D9,,LCD_B4,EVENTOUT,
+PortE,PE13,,TIM1_CH3,,,,SPI4_MISO,,,,,,,FMC_D10,,LCD_DE,EVENTOUT,
+PortE,PE14,,TIM1_CH4,,,,SPI4_MOSI,,,,,,,FMC_D11,,LCD_CLK,EVENTOUT,
+PortE,PE15,,TIM1_BKIN,,,,,,,,,,,FMC_D12,,LCD_R7,EVENTOUT,
+PortF,PF0,,,,,I2C2_SDA,,,,,,,,FMC_A0,,,EVENTOUT,
+PortF,PF1,,,,,I2C2_SCL,,,,,,,,FMC_A1,,,EVENTOUT,
+PortF,PF2,,,,,I2C2_SMBA,,,,,,,,FMC_A2,,,EVENTOUT,
+PortF,PF3,,,,,,,,,,,,,FMC_A3,,,EVENTOUT,ADC3_IN9
+PortF,PF4,,,,,,,,,,,,,FMC_A4,,,EVENTOUT,ADC3_IN14
+PortF,PF5,,,,,,,,,,,,,FMC_A5,,,EVENTOUT,ADC3_IN15
+PortF,PF6,,,,TIM10_CH1,,SPI5_NSS,SAI1_SD_B,,UART7_RX,QUADSPI_BK1_IO3,,,,,,EVENTOUT,ADC3_IN4
+PortF,PF7,,,,TIM11_CH1,,SPI5_SCK,SAI1_MCLK_B,,UART7_TX,QUADSPI_BK1_IO2,,,,,,EVENTOUT,ADC3_IN5
+PortF,PF8,,,,,,SPI5_MISO,SAI1_SCK_B,,,TIM13_CH1,QUADSPI_BK1_IO0,,,,,EVENTOUT,ADC3_IN6
+PortF,PF9,,,,,,SPI5_MOSI,SAI1_FS_B,,,TIM14_CH1,QUADSPI_BK1_IO1,,,,,EVENTOUT,ADC3_IN7
+PortF,PF10,,,,,,,,,,QUADSPI_CLK,,,,DCMI_D11,LCD_DE,EVENTOUT,ADC3_IN8
+PortF,PF11,,,,,,SPI5_MOSI,,,,,,,FMC_SDNRAS,DCMI_D12,,EVENTOUT,
+PortF,PF12,,,,,,,,,,,,,FMC_A6,,,EVENTOUT,
+PortF,PF13,,,,,,,,,,,,,FMC_A7,,,EVENTOUT,
+PortF,PF14,,,,,,,,,,,,,FMC_A8,,,EVENTOUT,
+PortF,PF15,,,,,,,,,,,,,FMC_A9,,,EVENTOUT,
+PortG,PG0,,,,,,,,,,,,,FMC_A10,,,EVENTOUT,
+PortG,PG1,,,,,,,,,,,,,FMC_A11,,,EVENTOUT,
+PortG,PG2,,,,,,,,,,,,,FMC_A12,,,EVENTOUT,
+PortG,PG3,,,,,,,,,,,,,FMC_A13,,,EVENTOUT,
+PortG,PG4,,,,,,,,,,,,,FMC_A14/FMC_BA0,,,EVENTOUT,
+PortG,PG5,,,,,,,,,,,,,FMC_A15/FMC_BA1,,,EVENTOUT,
+PortG,PG6,,,,,,,,,,,,,,DCMI_D12,LCD_R7,EVENTOUT,
+PortG,PG7,,,,,,,SAI1_MCLK_A,,USART6_CK,,,,FMC_INT,DCMI_D13,LCD_CLK,EVENTOUT,
+PortG,PG8,,,,,,SPI6_NSS,,,USART6_RTS,,,ETH_PPS_OUT,FMC_SDCLK,,LCD_G7,EVENTOUT,
+PortG,PG9,,,,,,,,,USART6_RX,QUADSPI_BK2_IO2,,,FMC_NE2/FMC_NCE,DCMI_VSYNC,,EVENTOUT,
+PortG,PG10,,,,,,,,,,LCD_G3,,,FMC_NE3,DCMI_D2,LCD_B2,EVENTOUT,
+PortG,PG11,,,,,,,,,,,,ETH_MII_TX_EN/ETH_RMII_TX_EN,,DCMI_D3,LCD_B3,EVENTOUT,
+PortG,PG12,,,,,,SPI6_MISO,,,USART6_RTS,LCD_B4,,,FMC_NE4,,LCD_B1,EVENTOUT,
+PortG,PG13,TRACED0,,,,,SPI6_SCK,,,USART6_CTS,,,ETH_MII_TXD0/ETH_RMII_TXD0,FMC_A24,,LCD_R0,EVENTOUT,
+PortG,PG14,TRACED1,,,,,SPI6_MOSI,,,USART6_TX,QUADSPI_BK2_IO3,,ETH_MII_TXD1/ETH_RMII_TXD1,FMC_A25,,LCD_B0,EVENTOUT,
+PortG,PG15,,,,,,,,,USART6_CTS,,,,FMC_SDNCAS,DCMI_D13,,EVENTOUT,
+PortH,PH0,,,,,,,,,,,,,,,,EVENTOUT,
+PortH,PH1,,,,,,,,,,,,,,,,EVENTOUT,
+PortH,PH2,,,,,,,,,,QUADSPI_BK2_IO0,,ETH_MII_CRS,FMC_SDCKE0,,LCD_R0,EVENTOUT,
+PortH,PH3,,,,,,,,,,QUADSPI_BK2_IO1,,ETH_MII_COL,FMC_SDNE0,,LCD_R1,EVENTOUT,
+PortH,PH4,,,,,I2C2_SCL,,,,,LCD_G5,OTG_HS_ULPI_NXT,,,,LCD_G4,EVENTOUT,
+PortH,PH5,,,,,I2C2_SDA,SPI5_NSS,,,,,,,FMC_SDNWE,,,EVENTOUT,
+PortH,PH6,,,,,I2C2_SMBA,SPI5_SCK,,,,TIM12_CH1,,ETH_MII_RXD2,FMC_SDNE1,,,EVENTOUT,
+PortH,PH7,,,,,I2C3_SCL,SPI5_MISO,,,,,,ETH_MII_RXD3,FMC_SDCKE1,DCMI_D9,,EVENTOUT,
+PortH,PH8,,,,,I2C3_SDA,,,,,,,,FMC_D16,DCMI_HSYNC,LCD_R2,EVENTOUT,
+PortH,PH9,,,,,I2C3_SMBA,,,,,TIM12_CH2,,,FMC_D17,DCMI_D0,LCD_R3,EVENTOUT,
+PortH,PH10,,,TIM5_CH1,,,,,,,,,,FMC_D18,DCMI_D1,LCD_R4,EVENTOUT,
+PortH,PH11,,,TIM5_CH2,,,,,,,,,,FMC_D19,DCMI_D2,LCD_R5,EVENTOUT,
+PortH,PH12,,,TIM5_CH3,,,,,,,,,,FMC_D20,DCMI_D3,LCD_R6,EVENTOUT,
+PortH,PH13,,,,TIM8_CH1N,,,,,,CAN1_TX,,,FMC_D21,,LCD_G2,EVENTOUT,
+PortH,PH14,,,,TIM8_CH2N,,,,,,,,,FMC_D22,DCMI_D4,LCD_G3,EVENTOUT,
+PortH,PH15,,,,TIM8_CH3N,,,,,,,,,FMC_D23,DCMI_D11,LCD_G4,EVENTOUT,
+PortI,PI0,,,TIM5_CH4,,,SPI2_NSS/I2S2_WS,,,,,,,FMC_D24,DCMI_D13,LCD_G5,EVENTOUT,
+PortI,PI1,,,,,,SPI2_SCK/I2S2_CK,,,,,,,FMC_D25,DCMI_D8,LCD_G6,EVENTOUT,
+PortI,PI2,,,,TIM8_CH4,,SPI2_MISO,I2S2_EXTSD,,,,,,FMC_D26,DCMI_D9,LCD_G7,EVENTOUT,
+PortI,PI3,,,,TIM8_ETR,,SPI2_MOSI/I2S2_SD,,,,,,,FMC_D27,DCMI_D10,,EVENTOUT,
+PortI,PI4,,,,TIM8_BKIN,,,,,,,,,FMC_NBL2,DCMI_D5,LCD_B4,EVENTOUT,
+PortI,PI5,,,,TIM8_CH1,,,,,,,,,FMC_NBL3,DCMI_VSYNC,LCD_B5,EVENTOUT,
+PortI,PI6,,,,TIM8_CH2,,,,,,,,,FMC_D28,DCMI_D6,LCD_B6,EVENTOUT,
+PortI,PI7,,,,TIM8_CH3,,,,,,,,,FMC_D29,DCMI_D7,LCD_B7,EVENTOUT,
+PortI,PI8,,,,,,,,,,,,,,,,EVENTOUT,
+PortI,PI9,,,,,,,,,,CAN1_RX,,,FMC_D30,,LCD_VSYNC,EVENTOUT,
+PortI,PI10,,,,,,,,,,,,ETH_MII_RX_ER,FMC_D31,,LCD_HSYNC,EVENTOUT,
+PortI,PI11,,,,,,,,,,LCD_G6,OTG_HS_ULPI_DIR,,,,,EVENTOUT,
+PortI,PI12,,,,,,,,,,,,,,,LCD_HSYNC,EVENTOUT,
+PortI,PI13,,,,,,,,,,,,,,,LCD_VSYNC,EVENTOUT,
+PortI,PI14,,,,,,,,,,,,,,,LCD_CLK,EVENTOUT,
+PortI,PI15,,,,,,,,,,LCD_G2,,,,,LCD_R0,EVENTOUT,
+PortJ,PJ0,,,,,,,,,,LCD_R7,,,,,LCD_R1,EVENTOUT,
+PortJ,PJ1,,,,,,,,,,,,,,,LCD_R2,EVENTOUT,
+PortJ,PJ2,,,,,,,,,,,,,,DSIHOST_TE,LCD_R3,EVENTOUT,
+PortJ,PJ3,,,,,,,,,,,,,,,LCD_R4,EVENTOUT,
+PortJ,PJ4,,,,,,,,,,,,,,,LCD_R5,EVENTOUT,
+PortJ,PJ5,,,,,,,,,,,,,,,LCD_R6,EVENTOUT,
+PortJ,PJ12,,,,,,,,,,LCD_G3,,,,,LCD_B0,EVENTOUT,
+PortJ,PJ13,,,,,,,,,,LCD_G4,,,,,LCD_B1,EVENTOUT,
+PortJ,PJ14,,,,,,,,,,,,,,,LCD_B2,EVENTOUT,
+PortJ,PJ15,,,,,,,,,,,,,,,LCD_B3,EVENTOUT,
+PortK,PK3,,,,,,,,,,,,,,,LCD_B4,EVENTOUT,
+PortK,PK4,,,,,,,,,,,,,,,LCD_B5,EVENTOUT,
+PortK,PK5,,,,,,,,,,,,,,,LCD_B6,EVENTOUT,
+PortK,PK6,,,,,,,,,,,,,,,LCD_B7,EVENTOUT,
+PortK,PK7,,,,,,,,,,,,,,,LCD_DE,EVENTOUT,

From 0c9f5b388eae485625b15c8f6e15f2bed9446138 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 29 Nov 2021 13:26:14 +1100
Subject: [PATCH 1457/3533] stm32: Include HAL MMC code in F4 builds.

So that the MMC driver can be used on F4 MCUs.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/Makefile                         | 5 +++++
 ports/stm32/boards/stm32f4xx_hal_conf_base.h | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/ports/stm32/Makefile b/ports/stm32/Makefile
index 7a869d3c049bf..c3b281650afd8 100644
--- a/ports/stm32/Makefile
+++ b/ports/stm32/Makefile
@@ -422,6 +422,11 @@ HAL_SRC_C += $(addprefix $(HAL_DIR)/Src/stm32$(MCU_SERIES)xx_,\
 	hal_dma_ex.c \
 	hal_dcmi.c \
 	)
+ifeq ($(MCU_SERIES),$(filter $(MCU_SERIES),f4))
+# HAL F4-1.16.0 has a bug with missing parentheses in HAL_MMC_Erase.
+# This function is unused so let the error go by as a warning.
+$(BUILD)/$(HAL_DIR)/Src/stm32$(MCU_SERIES)xx_hal_mmc.o: CFLAGS += -Wno-error=parentheses
+endif
 endif
 
 ifeq ($(CMSIS_MCU),$(filter $(CMSIS_MCU),STM32H743xx STM32H750xx STM32H7A3xx STM32H7A3xxQ STM32H7B3xx STM32H7B3xxQ))
diff --git a/ports/stm32/boards/stm32f4xx_hal_conf_base.h b/ports/stm32/boards/stm32f4xx_hal_conf_base.h
index f09990fd95e59..d42f3ba19f4f8 100644
--- a/ports/stm32/boards/stm32f4xx_hal_conf_base.h
+++ b/ports/stm32/boards/stm32f4xx_hal_conf_base.h
@@ -42,6 +42,7 @@
 #include "stm32f4xx_hal_i2c.h"
 #include "stm32f4xx_hal_i2s.h"
 #include "stm32f4xx_hal_iwdg.h"
+#include "stm32f4xx_hal_mmc.h"
 #include "stm32f4xx_hal_pcd.h"
 #include "stm32f4xx_hal_pwr.h"
 #include "stm32f4xx_hal_rcc.h"
@@ -74,6 +75,7 @@
 #define HAL_I2C_MODULE_ENABLED
 #define HAL_I2S_MODULE_ENABLED
 #define HAL_IWDG_MODULE_ENABLED
+#define HAL_MMC_MODULE_ENABLED
 #define HAL_PCD_MODULE_ENABLED
 #define HAL_PWR_MODULE_ENABLED
 #define HAL_RCC_MODULE_ENABLED

From 23a150789df1029def2a26cb757e7d6703520159 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 29 Nov 2021 13:35:43 +1100
Subject: [PATCH 1458/3533] stm32/boards/make-pins.py: Use cpu pins to define
 static alt-fun macros.

Instead of board pins, so that pins which have only the CPU specified in
pins.csv can still be used with mp_hal_pin_config_alt_static().

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/boards/make-pins.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/stm32/boards/make-pins.py b/ports/stm32/boards/make-pins.py
index c7423cb966164..b11f438aae3dd 100755
--- a/ports/stm32/boards/make-pins.py
+++ b/ports/stm32/boards/make-pins.py
@@ -504,7 +504,7 @@ def print_af_defs(self, af_defs_filename, cmp_strings):
         with open(af_defs_filename, "wt") as af_defs_file:
 
             STATIC_AF_TOKENS = {}
-            for named_pin in self.board_pins:
+            for named_pin in self.cpu_pins:
                 for af in named_pin.pin().alt_fn:
                     func = "%s%d" % (af.func, af.fn_num) if af.fn_num else af.func
                     pin_type = (af.pin_type or "NULL").split("(")[0]

From d94ac4333ff87e8a1b28ae3b10b1ef0c6de9cfb0 Mon Sep 17 00:00:00 2001
From: Peter Hinch <peterhinch@users.noreply.github.com>
Date: Sat, 11 Apr 2020 15:52:01 +0100
Subject: [PATCH 1459/3533] docs/library/uasyncio.rst: Detail exception
 behaviour in cancel/timeout.

---
 docs/library/uasyncio.rst | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/docs/library/uasyncio.rst b/docs/library/uasyncio.rst
index 11b9c6aee4136..1fc8b53db0d49 100644
--- a/docs/library/uasyncio.rst
+++ b/docs/library/uasyncio.rst
@@ -68,11 +68,13 @@ Additional functions
 .. function:: wait_for(awaitable, timeout)
 
     Wait for the *awaitable* to complete, but cancel it if it takes longer
-    that *timeout* seconds.  If *awaitable* is not a task then a task will be
+    than *timeout* seconds.  If *awaitable* is not a task then a task will be
     created from it.
 
     If a timeout occurs, it cancels the task and raises ``asyncio.TimeoutError``:
-    this should be trapped by the caller.
+    this should be trapped by the caller.  The task receives
+    ``asyncio.CancelledError`` which may be ignored or trapped using ``try...except``
+    or ``try...finally`` to run cleanup code.
 
     Returns the return value of *awaitable*.
 
@@ -106,8 +108,9 @@ class Task
 
 .. method:: Task.cancel()
 
-    Cancel the task by injecting a ``CancelledError`` into it.  The task may
-    or may not ignore this exception.
+    Cancel the task by injecting ``asyncio.CancelledError`` into it.  The task may
+    ignore this exception.  Cleanup code may be run by trapping it, or via
+    ``try ... finally``.
 
 class Event
 -----------

From e7900351bf954f5af939981d5c6c978636073950 Mon Sep 17 00:00:00 2001
From: Michael Buesch <m@bues.ch>
Date: Mon, 31 Aug 2020 17:12:38 +0200
Subject: [PATCH 1460/3533] docs/library/machine.Timer.rst: Document 'id' as
 positional-only arg.

Signed-off-by: Michael Buesch <m@bues.ch>
---
 docs/library/machine.Timer.rst | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/docs/library/machine.Timer.rst b/docs/library/machine.Timer.rst
index 77a549b40b5e9..d1709a8189f3e 100644
--- a/docs/library/machine.Timer.rst
+++ b/docs/library/machine.Timer.rst
@@ -27,11 +27,12 @@ instead of this class.
 Constructors
 ------------
 
-.. class:: Timer(id, ...)
+.. class:: Timer(id, /, ...)
 
-   Construct a new timer object of the given id. Id of -1 constructs a
+   Construct a new timer object of the given ``id``. ``id`` of -1 constructs a
    virtual timer (if supported by a board).
-   
+   ``id`` shall not be passed as a keyword argument.
+
    See ``init`` for parameters of initialisation.
 
 Methods

From 1e7c8f2b0bdc7095f28ffda7fbb3c7f23d38b397 Mon Sep 17 00:00:00 2001
From: Michael Buesch <m@bues.ch>
Date: Mon, 31 Aug 2020 17:38:20 +0200
Subject: [PATCH 1461/3533] docs/library/machine.SPI.rst: Add example SPI
 usage.

Signed-off-by: Michael Buesch <m@bues.ch>
---
 docs/library/machine.SPI.rst | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/docs/library/machine.SPI.rst b/docs/library/machine.SPI.rst
index 46ac2ec74ceba..1116f0e8a31a2 100644
--- a/docs/library/machine.SPI.rst
+++ b/docs/library/machine.SPI.rst
@@ -19,6 +19,42 @@ Software SPI is implemented by bit-banging and can be used on any pin but
 is not as efficient.  These classes have the same methods available and
 differ primarily in the way they are constructed.
 
+Example usage::
+
+    from machine import SPI, Pin
+
+    spi = SPI(0, baudrate=400000)           # Create SPI peripheral 0 at frequency of 400kHz.
+                                            # Depending on the use case, extra parameters may be required
+                                            # to select the bus characteristics and/or pins to use.
+    cs = Pin(4, mode=Pin.OUT, value=1)      # Create chip-select on pin 4.
+
+    try:
+        cs(0)                               # Select peripheral.
+        spi.write(b"12345678")              # Write 8 bytes, and don't care about received data.
+    finally:
+        cs(1)                               # Deselect peripheral.
+
+    try:
+        cs(0)                               # Select peripheral.
+        rxdata = spi.read(8, 0x42)          # Read 8 bytes while writing 0x42 for each byte.
+    finally:
+        cs(1)                               # Deselect peripheral.
+
+    rxdata = bytearray(8)
+    try:
+        cs(0)                               # Select peripheral.
+        spi.readinto(rxdata, 0x42)          # Read 8 bytes inplace while writing 0x42 for each byte.
+    finally:
+        cs(1)                               # Deselect peripheral.
+
+    txdata = b"12345678"
+    rxdata = bytearray(len(txdata))
+    try:
+        cs(0)                               # Select peripheral.
+        spi.write_readinto(txdata, rxdata)  # Simultaneously write and read bytes.
+    finally:
+        cs(1)                               # Deselect peripheral.
+
 Constructors
 ------------
 

From 68d1245f423bc98fb7accb86deab10acacd6a9d8 Mon Sep 17 00:00:00 2001
From: Michael Buesch <m@bues.ch>
Date: Mon, 31 Aug 2020 17:58:51 +0200
Subject: [PATCH 1462/3533] docs/library/machine.Timer.rst: Document `period`
 and `callback` args.

Signed-off-by: Michael Buesch <m@bues.ch>
---
 docs/library/machine.Timer.rst | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/docs/library/machine.Timer.rst b/docs/library/machine.Timer.rst
index d1709a8189f3e..424a49bcba488 100644
--- a/docs/library/machine.Timer.rst
+++ b/docs/library/machine.Timer.rst
@@ -42,8 +42,14 @@ Methods
 
    Initialise the timer. Example::
 
-       tim.init(period=100)                         # periodic with 100ms period
-       tim.init(mode=Timer.ONE_SHOT, period=1000)   # one shot firing after 1000ms
+       def mycallback(t):
+           pass
+
+       # periodic with 100ms period
+       tim.init(period=100, callback=mycallback)
+
+       # one shot firing after 1000ms
+       tim.init(mode=Timer.ONE_SHOT, period=1000, callback=mycallback)
 
    Keyword arguments:
 
@@ -54,6 +60,14 @@ Methods
        - ``Timer.PERIODIC`` - The timer runs periodically at the configured
          frequency of the channel.
 
+     - ``period`` - The timer period, in milliseconds.
+
+     - ``callback`` - The callable to call upon expiration of the timer period.
+       The callback must take one argument, which is passed the Timer object.
+       The ``callback`` argument shall be specified. Otherwise an exception
+       will occurr upon timer expiration:
+       ``TypeError: 'NoneType' object isn't callable``
+
 .. method:: Timer.deinit()
 
    Deinitialises the timer. Stops the timer, and disables the timer peripheral.

From de7e3cd792d1d4cf6c4b3895d431fc8bc516b51b Mon Sep 17 00:00:00 2001
From: Scott Armitage <accounts.github@scott.armitage.space>
Date: Thu, 3 Sep 2020 10:49:27 -0700
Subject: [PATCH 1463/3533] docs/library/machine.Pin.rst: Add Pin.ANALOG mode
 constant.

---
 docs/library/machine.Pin.rst | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docs/library/machine.Pin.rst b/docs/library/machine.Pin.rst
index f8e9e1054d65b..32fa05b49c585 100644
--- a/docs/library/machine.Pin.rst
+++ b/docs/library/machine.Pin.rst
@@ -74,6 +74,8 @@ Constructors
        - ``Pin.ALT_OPEN_DRAIN`` - The Same as ``Pin.ALT``, but the pin is configured as
          open-drain.  Not all ports implement this mode.
 
+       - ``Pin.ANALOG`` - Pin is configured for analog input, see the :class:`ADC` class.
+
      - ``pull`` specifies if the pin has a (weak) pull resistor attached, and can be
        one of:
 
@@ -247,6 +249,7 @@ not all constants are available on all ports.
           Pin.OPEN_DRAIN
           Pin.ALT
           Pin.ALT_OPEN_DRAIN
+          Pin.ANALOG
 
    Selects the pin mode.
 

From 851ecb2da178fff0b60aefdb5af502f28787a7ec Mon Sep 17 00:00:00 2001
From: Jonathan Hogg <me@jonathanhogg.com>
Date: Mon, 12 Jul 2021 08:46:29 +0100
Subject: [PATCH 1464/3533] extmod/modbluetooth: Support gap_connect(None) to
 cancel a connection.

Allow cancellation of in-progress peripheral connections.
---
 docs/library/bluetooth.rst            | 7 ++++++-
 extmod/btstack/modbluetooth_btstack.c | 5 +++++
 extmod/modbluetooth.c                 | 9 ++++++++-
 extmod/modbluetooth.h                 | 4 ++++
 extmod/nimble/modbluetooth_nimble.c   | 9 +++++++++
 5 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/docs/library/bluetooth.rst b/docs/library/bluetooth.rst
index cfec804eafbf7..7663199e916af 100644
--- a/docs/library/bluetooth.rst
+++ b/docs/library/bluetooth.rst
@@ -365,7 +365,12 @@ A central device can connect to peripherals that it has discovered using the obs
 
     See :meth:`gap_scan <BLE.gap_scan>` for details about address types.
 
-    On success, the ``_IRQ_PERIPHERAL_CONNECT`` event will be raised.
+    To cancel an outstanding connection attempt early, call
+    ``gap_connect(None)``.
+
+    On success, the ``_IRQ_PERIPHERAL_CONNECT`` event will be raised. If
+    cancelling a connection attempt, the ``_IRQ_PERIPHERAL_DISCONNECT`` event
+    will be raised.
 
     The device will wait up to *scan_duration_ms* to receive an advertising
     payload from the device.
diff --git a/extmod/btstack/modbluetooth_btstack.c b/extmod/btstack/modbluetooth_btstack.c
index cd2ba83d536e7..e56e488b1c284 100644
--- a/extmod/btstack/modbluetooth_btstack.c
+++ b/extmod/btstack/modbluetooth_btstack.c
@@ -1284,6 +1284,11 @@ int mp_bluetooth_gap_peripheral_connect(uint8_t addr_type, const uint8_t *addr,
     return btstack_error_to_errno(gap_connect(btstack_addr, addr_type));
 }
 
+int mp_bluetooth_gap_peripheral_connect_cancel(void) {
+    DEBUG_printf("mp_bluetooth_gap_peripheral_connect_cancel\n");
+    return btstack_error_to_errno(gap_connect_cancel());
+}
+
 #endif // MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE
 
 #if MICROPY_PY_BLUETOOTH_ENABLE_GATT_CLIENT
diff --git a/extmod/modbluetooth.c b/extmod/modbluetooth.c
index e3d64b81f1542..1bf2ae6addddc 100644
--- a/extmod/modbluetooth.c
+++ b/extmod/modbluetooth.c
@@ -630,6 +630,13 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(bluetooth_ble_gatts_register_services_obj, blue
 
 #if MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE
 STATIC mp_obj_t bluetooth_ble_gap_connect(size_t n_args, const mp_obj_t *args) {
+    if (n_args == 2) {
+        if (args[1] == mp_const_none) {
+            int err = mp_bluetooth_gap_peripheral_connect_cancel();
+            return bluetooth_handle_errno(err);
+        }
+        mp_raise_TypeError(MP_ERROR_TEXT("invalid addr"));
+    }
     uint8_t addr_type = mp_obj_get_int(args[1]);
     mp_buffer_info_t bufinfo = {0};
     mp_get_buffer_raise(args[2], &bufinfo, MP_BUFFER_READ);
@@ -652,7 +659,7 @@ STATIC mp_obj_t bluetooth_ble_gap_connect(size_t n_args, const mp_obj_t *args) {
     int err = mp_bluetooth_gap_peripheral_connect(addr_type, bufinfo.buf, scan_duration_ms, min_conn_interval_us, max_conn_interval_us);
     return bluetooth_handle_errno(err);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(bluetooth_ble_gap_connect_obj, 3, 6, bluetooth_ble_gap_connect);
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(bluetooth_ble_gap_connect_obj, 2, 6, bluetooth_ble_gap_connect);
 
 STATIC mp_obj_t bluetooth_ble_gap_scan(size_t n_args, const mp_obj_t *args) {
     // Default is indefinite scan, with the NimBLE "background scan" interval and window.
diff --git a/extmod/modbluetooth.h b/extmod/modbluetooth.h
index fe41fd5143910..e52232c4149f5 100644
--- a/extmod/modbluetooth.h
+++ b/extmod/modbluetooth.h
@@ -374,6 +374,10 @@ int mp_bluetooth_gap_peripheral_connect(uint8_t addr_type, const uint8_t *addr,
 #endif
 
 #if MICROPY_PY_BLUETOOTH_ENABLE_GATT_CLIENT
+
+// Cancel in-progress connection to a peripheral.
+int mp_bluetooth_gap_peripheral_connect_cancel(void);
+
 // Find all primary services on the connected peripheral.
 int mp_bluetooth_gattc_discover_primary_services(uint16_t conn_handle, const mp_obj_bluetooth_uuid_t *uuid);
 
diff --git a/extmod/nimble/modbluetooth_nimble.c b/extmod/nimble/modbluetooth_nimble.c
index 919841c243643..fce99bcdf5bf6 100644
--- a/extmod/nimble/modbluetooth_nimble.c
+++ b/extmod/nimble/modbluetooth_nimble.c
@@ -1236,6 +1236,15 @@ int mp_bluetooth_gap_peripheral_connect(uint8_t addr_type, const uint8_t *addr,
     return ble_hs_err_to_errno(err);
 }
 
+int mp_bluetooth_gap_peripheral_connect_cancel(void) {
+    DEBUG_printf("mp_bluetooth_gap_peripheral_connect_cancel\n");
+    if (!mp_bluetooth_is_active()) {
+        return ERRNO_BLUETOOTH_NOT_ACTIVE;
+    }
+    int err = ble_gap_conn_cancel();
+    return ble_hs_err_to_errno(err);
+}
+
 STATIC int ble_gattc_service_cb(uint16_t conn_handle, const struct ble_gatt_error *error, const struct ble_gatt_svc *service, void *arg) {
     DEBUG_printf("ble_gattc_service_cb: conn_handle=%d status=%d start_handle=%d\n", conn_handle, error->status, service ? service->start_handle : -1);
     if (!mp_bluetooth_is_active()) {

From a7fa18c203a241f670f12ab507aa8b349fcd45a1 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Wed, 26 Feb 2020 15:24:09 +1100
Subject: [PATCH 1465/3533] py/builtinimport: Refactor module importing.

Simplify and document/comment the handling of builtin import for:
- already-loaded modules
- built-in modules
- built-in umodules (formerly weak links)
- filesystem modules

Retains existing functionality with smaller code size but should also
facilitate potential new features (built-in packages, controlling the
frozen path).

Also makes the (unix-only) -m behavior a bit more obvious and configurable.

Code size change with this commit:

   bare-arm:    +0 +0.000%
minimal x86:   -64 -0.039%
   unix x64:   -32 -0.006%
unix nanbox:    -4 -0.001%
      stm32:  -184 -0.047% PYBV10
     cc3200:  -120 -0.065%
    esp8266:  -228 -0.033% GENERIC
      esp32:  -268 -0.018% GENERIC[incl +16(data)]
        nrf:  -152 -0.087% pca10040
        rp2:  -256 -0.052% PICO
       samd:   -80 -0.057% ADAFRUIT_ITSYBITSY_M4_EXPRESS
---
 ports/unix/mpconfigport.h    |   1 +
 ports/windows/mpconfigport.h |   1 +
 py/builtinimport.c           | 499 ++++++++++++++++++++---------------
 py/mpconfig.h                |   6 +
 py/objmodule.c               |  69 +++--
 py/objmodule.h               |  15 +-
 6 files changed, 341 insertions(+), 250 deletions(-)

diff --git a/ports/unix/mpconfigport.h b/ports/unix/mpconfigport.h
index d6ab4e5ca9658..93d790ac36f1e 100644
--- a/ports/unix/mpconfigport.h
+++ b/ports/unix/mpconfigport.h
@@ -86,6 +86,7 @@
 #define MICROPY_OPT_MAP_LOOKUP_CACHE (1)
 #endif
 #define MICROPY_MODULE_WEAK_LINKS   (1)
+#define MICROPY_MODULE_OVERRIDE_MAIN_IMPORT (1)
 #define MICROPY_CAN_OVERRIDE_BUILTINS (1)
 #define MICROPY_VFS_POSIX_FILE      (1)
 #define MICROPY_PY_FUNCTION_ATTRS   (1)
diff --git a/ports/windows/mpconfigport.h b/ports/windows/mpconfigport.h
index 8dd95e769d453..69193cb6afccf 100644
--- a/ports/windows/mpconfigport.h
+++ b/ports/windows/mpconfigport.h
@@ -60,6 +60,7 @@
 #define MICROPY_STREAMS_POSIX_API   (1)
 #define MICROPY_OPT_COMPUTED_GOTO   (0)
 #define MICROPY_MODULE_WEAK_LINKS   (1)
+#define MICROPY_MODULE_OVERRIDE_MAIN_IMPORT (1)
 #define MICROPY_CAN_OVERRIDE_BUILTINS (1)
 #define MICROPY_VFS_POSIX_FILE      (1)
 #define MICROPY_PY_FUNCTION_ATTRS   (1)
diff --git a/py/builtinimport.c b/py/builtinimport.c
index 08921f873b803..755ce779a709e 100644
--- a/py/builtinimport.c
+++ b/py/builtinimport.c
@@ -5,6 +5,7 @@
  *
  * Copyright (c) 2013-2019 Damien P. George
  * Copyright (c) 2014 Paul Sokolovsky
+ * Copyright (c) 2021 Jim Mussared
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -46,7 +47,8 @@
 
 #if MICROPY_ENABLE_EXTERNAL_IMPORT
 
-#define PATH_SEP_CHAR '/'
+// Must be a string of one byte.
+#define PATH_SEP_CHAR "/"
 
 bool mp_obj_is_package(mp_obj_t module) {
     mp_obj_t dest[2];
@@ -54,9 +56,11 @@ bool mp_obj_is_package(mp_obj_t module) {
     return dest[0] != MP_OBJ_NULL;
 }
 
-// Stat either frozen or normal module by a given path
-// (whatever is available, if at all).
-STATIC mp_import_stat_t mp_import_stat_any(const char *path) {
+// Wrapper for mp_import_stat (which is provided by the port, and typically
+// uses mp_vfs_import_stat) to also search frozen modules. Given an exact
+// path to a file or directory (e.g. "foo/bar", foo/bar.py" or "foo/bar.mpy"),
+// will return whether the path is a file, directory, or doesn't exist.
+STATIC mp_import_stat_t stat_path_or_frozen(const char *path) {
     #if MICROPY_MODULE_FROZEN
     mp_import_stat_t st = mp_frozen_stat(path);
     if (st != MP_IMPORT_STAT_NO_EXIST) {
@@ -66,15 +70,18 @@ STATIC mp_import_stat_t mp_import_stat_any(const char *path) {
     return mp_import_stat(path);
 }
 
+// Given a path to a .py file, try and find this path as either a .py or .mpy
+// in either the filesystem or frozen modules.
 STATIC mp_import_stat_t stat_file_py_or_mpy(vstr_t *path) {
-    mp_import_stat_t stat = mp_import_stat_any(vstr_null_terminated_str(path));
+    mp_import_stat_t stat = stat_path_or_frozen(vstr_null_terminated_str(path));
     if (stat == MP_IMPORT_STAT_FILE) {
         return stat;
     }
 
     #if MICROPY_PERSISTENT_CODE_LOAD
+    // Didn't find .py -- try the .mpy instead by inserting an 'm' into the '.py'.
     vstr_ins_byte(path, path->len - 2, 'm');
-    stat = mp_import_stat_any(vstr_null_terminated_str(path));
+    stat = stat_path_or_frozen(vstr_null_terminated_str(path));
     if (stat == MP_IMPORT_STAT_FILE) {
         return stat;
     }
@@ -83,8 +90,10 @@ STATIC mp_import_stat_t stat_file_py_or_mpy(vstr_t *path) {
     return MP_IMPORT_STAT_NO_EXIST;
 }
 
+// Given an import path (e.g. "foo/bar"), try and find "foo/bar" (a directory)
+// or "foo/bar.(m)py" in either the filesystem or frozen modules.
 STATIC mp_import_stat_t stat_dir_or_file(vstr_t *path) {
-    mp_import_stat_t stat = mp_import_stat_any(vstr_null_terminated_str(path));
+    mp_import_stat_t stat = stat_path_or_frozen(vstr_null_terminated_str(path));
     DEBUG_printf("stat %s: %d\n", vstr_str(path), stat);
     if (stat == MP_IMPORT_STAT_DIR) {
         return stat;
@@ -95,14 +104,16 @@ STATIC mp_import_stat_t stat_dir_or_file(vstr_t *path) {
     return stat_file_py_or_mpy(path);
 }
 
-STATIC mp_import_stat_t find_file(const char *file_str, uint file_len, vstr_t *dest) {
+// Given a top-level module, try and find it in each of the sys.path entries
+// via stat_dir_or_file.
+STATIC mp_import_stat_t stat_top_level_dir_or_file(qstr mod_name, vstr_t *dest) {
+    DEBUG_printf("stat_top_level_dir_or_file: '%s'\n", qstr_str(mod_name));
     #if MICROPY_PY_SYS
-    // extract the list of paths
     size_t path_num;
     mp_obj_t *path_items;
     mp_obj_list_get(mp_sys_path, &path_num, &path_items);
 
-    if (path_num != 0) {
+    if (path_num > 0) {
         // go through each path looking for a directory or file
         for (size_t i = 0; i < path_num; i++) {
             vstr_reset(dest);
@@ -110,9 +121,9 @@ STATIC mp_import_stat_t find_file(const char *file_str, uint file_len, vstr_t *d
             const char *p = mp_obj_str_get_data(path_items[i], &p_len);
             if (p_len > 0) {
                 vstr_add_strn(dest, p, p_len);
-                vstr_add_char(dest, PATH_SEP_CHAR);
+                vstr_add_char(dest, PATH_SEP_CHAR[0]);
             }
-            vstr_add_strn(dest, file_str, file_len);
+            vstr_add_str(dest, qstr_str(mod_name));
             mp_import_stat_t stat = stat_dir_or_file(dest);
             if (stat != MP_IMPORT_STAT_NO_EXIST) {
                 return stat;
@@ -124,8 +135,9 @@ STATIC mp_import_stat_t find_file(const char *file_str, uint file_len, vstr_t *d
     }
     #endif
 
-    // mp_sys_path is empty, so just use the given file name
-    vstr_add_strn(dest, file_str, file_len);
+    // mp_sys_path is empty (or not enabled), so just stat the given path
+    // directly.
+    vstr_add_str(dest, qstr_str(mod_name));
     return stat_dir_or_file(dest);
 }
 
@@ -189,7 +201,6 @@ STATIC void do_load(mp_obj_t module_obj, vstr_t *file) {
     #if MICROPY_MODULE_FROZEN
     void *modref;
     int frozen_type = mp_find_frozen_module(file_str, file->len, &modref);
-    #endif
 
     // If we support frozen str modules and the compiler is enabled, and we
     // found the filename in the list of frozen files, then load and execute it.
@@ -209,6 +220,8 @@ STATIC void do_load(mp_obj_t module_obj, vstr_t *file) {
     }
     #endif
 
+    #endif // MICROPY_MODULE_FROZEN
+
     // If we support loading .mpy files then check if the file extension is of
     // the correct format and, if so, load and execute the file.
     #if MICROPY_HAS_FILE_READER && MICROPY_PERSISTENT_CODE_LOAD
@@ -232,15 +245,212 @@ STATIC void do_load(mp_obj_t module_obj, vstr_t *file) {
     #endif
 }
 
-STATIC void chop_component(const char *start, const char **end) {
-    const char *p = *end;
-    while (p > start) {
+// Convert a relative (to the current module) import, going up "level" levels,
+// into an absolute import.
+STATIC void evaluate_relative_import(mp_int_t level, const char **module_name, size_t *module_name_len) {
+    // What we want to do here is to take the name of the current module,
+    // remove <level> trailing components, and concatenate the passed-in
+    // module name.
+    // For example, level=3, module_name="foo.bar", __name__="a.b.c.d" --> "a.foo.bar"
+    // "Relative imports use a module's __name__ attribute to determine that
+    // module's position in the package hierarchy."
+    // http://legacy.python.org/dev/peps/pep-0328/#relative-imports-and-name
+
+    mp_obj_t current_module_name_obj = mp_obj_dict_get(MP_OBJ_FROM_PTR(mp_globals_get()), MP_OBJ_NEW_QSTR(MP_QSTR___name__));
+    assert(current_module_name_obj != MP_OBJ_NULL);
+
+    #if MICROPY_MODULE_OVERRIDE_MAIN_IMPORT && MICROPY_CPYTHON_COMPAT
+    if (MP_OBJ_QSTR_VALUE(current_module_name_obj) == MP_QSTR___main__) {
+        // This is a module loaded by -m command-line switch (e.g. unix port),
+        // and so its __name__ has been set to "__main__". Get its real name
+        // that we stored during import in the __main__ attribute.
+        current_module_name_obj = mp_obj_dict_get(MP_OBJ_FROM_PTR(mp_globals_get()), MP_OBJ_NEW_QSTR(MP_QSTR___main__));
+    }
+    #endif
+
+    // If we have a __path__ in the globals dict, then we're a package.
+    bool is_pkg = mp_map_lookup(&mp_globals_get()->map, MP_OBJ_NEW_QSTR(MP_QSTR___path__), MP_MAP_LOOKUP);
+
+    #if DEBUG_PRINT
+    DEBUG_printf("Current module/package: ");
+    mp_obj_print_helper(MICROPY_DEBUG_PRINTER, current_module_name_obj, PRINT_REPR);
+    DEBUG_printf(", is_package: %d", is_pkg);
+    DEBUG_printf("\n");
+    #endif
+
+    size_t current_module_name_len;
+    const char *current_module_name = mp_obj_str_get_data(current_module_name_obj, &current_module_name_len);
+
+    const char *p = current_module_name + current_module_name_len;
+    if (is_pkg) {
+        // If we're evaluating relative to a package, then take off one fewer
+        // level (i.e. the relative search starts inside the package, rather
+        // than as a sibling of the package).
+        --level;
+    }
+
+    // Walk back 'level' dots (or run out of path).
+    while (level && p > current_module_name) {
         if (*--p == '.') {
-            *end = p;
-            return;
+            --level;
         }
     }
-    *end = p;
+
+    // We must have some component left over to import from.
+    if (p == current_module_name) {
+        mp_raise_msg(&mp_type_ImportError, MP_ERROR_TEXT("can't perform relative import"));
+    }
+
+    // New length is len("<chopped path>.<module_name>"). Note: might be one byte
+    // more than we need if module_name is empty (for the extra . we will
+    // append).
+    uint new_module_name_len = (size_t)(p - current_module_name) + 1 + *module_name_len;
+    char *new_mod = mp_local_alloc(new_module_name_len);
+    memcpy(new_mod, current_module_name, p - current_module_name);
+
+    // Only append ".<module_name>" if there was one).
+    if (*module_name_len != 0) {
+        new_mod[p - current_module_name] = '.';
+        memcpy(new_mod + (p - current_module_name) + 1, *module_name, *module_name_len);
+    } else {
+        --new_module_name_len;
+    }
+
+    // Copy into a QSTR.
+    qstr new_mod_q = qstr_from_strn(new_mod, new_module_name_len);
+    mp_local_free(new_mod);
+
+    DEBUG_printf("Resolved base name for relative import: '%s'\n", qstr_str(new_mod_q));
+    *module_name = qstr_str(new_mod_q);
+    *module_name_len = new_module_name_len;
+}
+
+// Load a module at the specified absolute path, possibly as a submodule of the given outer module.
+// full_mod_name:    The full absolute path to this module (e.g. "foo.bar.baz").
+// level_mod_name:   The final component of the path (e.g. "baz").
+// outer_module_obj: The parent module (we need to store this module as an
+//                   attribute on it) (or MP_OBJ_NULL for top-level).
+// path:             The filesystem path where we found the parent module
+//                   (or empty for a top level module).
+// override_main:    Whether to set the __name__ to "__main__" (and use __main__
+//                   for the actual path).
+STATIC mp_obj_t process_import_at_level(qstr full_mod_name, qstr level_mod_name, mp_obj_t outer_module_obj, vstr_t *path, bool override_main) {
+    mp_import_stat_t stat = MP_IMPORT_STAT_NO_EXIST;
+
+    // Exact-match of built-in (or already-loaded) takes priority.
+    mp_obj_t module_obj = mp_module_get_loaded_or_builtin(full_mod_name);
+
+    // Even if we find the module, go through the motions of searching for it
+    // because we may actually be in the process of importing a sub-module.
+    // So we need to (re-)find the correct path to be finding the sub-module
+    // on the next iteration of process_import_at_level.
+
+    if (outer_module_obj == MP_OBJ_NULL) {
+        DEBUG_printf("Searching for top-level module\n");
+
+        // First module in the dotted-name; search for a directory or file
+        // relative to all the locations in sys.path.
+        stat = stat_top_level_dir_or_file(full_mod_name, path);
+
+        // If the module "foo" doesn't exist on the filesystem, and it's not a
+        // builtin, try and find "ufoo" as a built-in. (This feature was
+        // formerly known as "weak links").
+        #if MICROPY_MODULE_WEAK_LINKS
+        if (stat == MP_IMPORT_STAT_NO_EXIST && module_obj == MP_OBJ_NULL) {
+            char *umodule_buf = vstr_str(path);
+            umodule_buf[0] = 'u';
+            strcpy(umodule_buf + 1, qstr_str(level_mod_name));
+            qstr umodule_name = qstr_from_str(umodule_buf);
+            module_obj = mp_module_get_builtin(umodule_name);
+        }
+        #endif
+    } else {
+        DEBUG_printf("Searching for sub-module\n");
+
+        // Add the current part of the module name to the path.
+        vstr_add_char(path, PATH_SEP_CHAR[0]);
+        vstr_add_str(path, qstr_str(level_mod_name));
+
+        // Because it's not top level, we already know which path the parent was found in.
+        stat = stat_dir_or_file(path);
+    }
+    DEBUG_printf("Current path: %.*s\n", (int)vstr_len(path), vstr_str(path));
+
+    if (module_obj == MP_OBJ_NULL) {
+        // Not a built-in and not already-loaded.
+
+        if (stat == MP_IMPORT_STAT_NO_EXIST) {
+            // And the file wasn't found -- fail.
+            #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
+            mp_raise_msg(&mp_type_ImportError, MP_ERROR_TEXT("module not found"));
+            #else
+            mp_raise_msg_varg(&mp_type_ImportError, MP_ERROR_TEXT("no module named '%q'"), full_mod_name);
+            #endif
+        }
+
+        // Not a built-in but found on the filesystem, try and load it.
+
+        DEBUG_printf("Found path: %.*s\n", (int)vstr_len(path), vstr_str(path));
+
+        // Prepare for loading from the filesystem. Create a new shell module.
+        module_obj = mp_obj_new_module(full_mod_name);
+
+        #if MICROPY_MODULE_OVERRIDE_MAIN_IMPORT
+        // If this module is being loaded via -m on unix, then
+        // override __name__ to "__main__". Do this only for *modules*
+        // however - packages never have their names replaced, instead
+        // they're -m'ed using a special __main__ submodule in them. (This all
+        // apparently is done to not touch the package name itself, which is
+        // important for future imports).
+        if (override_main && stat != MP_IMPORT_STAT_DIR) {
+            mp_obj_module_t *o = MP_OBJ_TO_PTR(module_obj);
+            mp_obj_dict_store(MP_OBJ_FROM_PTR(o->globals), MP_OBJ_NEW_QSTR(MP_QSTR___name__), MP_OBJ_NEW_QSTR(MP_QSTR___main__));
+            #if MICROPY_CPYTHON_COMPAT
+            // Store module as "__main__" in the dictionary of loaded modules (returned by sys.modules).
+            mp_obj_dict_store(MP_OBJ_FROM_PTR(&MP_STATE_VM(mp_loaded_modules_dict)), MP_OBJ_NEW_QSTR(MP_QSTR___main__), module_obj);
+            // Store real name in "__main__" attribute. Need this for
+            // resolving relative imports later. "__main__ was chosen
+            // semi-randonly, to reuse existing qstr's.
+            mp_obj_dict_store(MP_OBJ_FROM_PTR(o->globals), MP_OBJ_NEW_QSTR(MP_QSTR___main__), MP_OBJ_NEW_QSTR(full_mod_name));
+            #endif
+        }
+        #endif // MICROPY_MODULE_OVERRIDE_MAIN_IMPORT
+
+        if (stat == MP_IMPORT_STAT_DIR) {
+            // Directory -- execute "path/__init__.py".
+            DEBUG_printf("%.*s is dir\n", (int)vstr_len(path), vstr_str(path));
+            // Store the __path__ attribute onto this module.
+            // https://docs.python.org/3/reference/import.html
+            // "Specifically, any module that contains a __path__ attribute is considered a package."
+            mp_store_attr(module_obj, MP_QSTR___path__, mp_obj_new_str(vstr_str(path), vstr_len(path)));
+            size_t orig_path_len = path->len;
+            vstr_add_str(path, PATH_SEP_CHAR "__init__.py");
+            if (stat_file_py_or_mpy(path) == MP_IMPORT_STAT_FILE) {
+                do_load(module_obj, path);
+            } else {
+                // No-op. Nothing to load.
+                // mp_warning("%s is imported as namespace package", vstr_str(&path));
+            }
+            // Remove /__init__.py suffix.
+            path->len = orig_path_len;
+        } else { // MP_IMPORT_STAT_FILE
+            // File -- execute "path.(m)py".
+            do_load(module_obj, path);
+            // Note: This should be the last component in the import path.  If
+            // there are remaining components then it's an ImportError
+            // because the current path(the module that was just loaded) is
+            // not a package.  This will be caught on the next iteration
+            // because the file will not exist.
+        }
+    }
+
+    if (outer_module_obj != MP_OBJ_NULL) {
+        // If it's a sub-module (not a built-in one), then make it available on
+        // the parent module.
+        mp_store_attr(outer_module_obj, level_mod_name, module_obj);
+    }
+
+    return module_obj;
 }
 
 mp_obj_t mp_builtin___import__(size_t n_args, const mp_obj_t *args) {
@@ -253,9 +463,23 @@ mp_obj_t mp_builtin___import__(size_t n_args, const mp_obj_t *args) {
     }
     #endif
 
-    mp_obj_t module_name = args[0];
+    // This is the import path, with any leading dots stripped.
+    // "import foo.bar" --> module_name="foo.bar"
+    // "from foo.bar import baz" --> module_name="foo.bar"
+    // "from . import foo" --> module_name=""
+    // "from ...foo.bar import baz" --> module_name="foo.bar"
+    mp_obj_t module_name_obj = args[0];
+
+    // These are the imported names.
+    // i.e. "from foo.bar import baz, zap" --> fromtuple=("baz", "zap",)
+    // Note: There's a special case on the Unix port, where this is set to mp_const_false which means that it's __main__.
     mp_obj_t fromtuple = mp_const_none;
+
+    // Level is the number of leading dots in a relative import.
+    // i.e. "from . import foo" --> level=1
+    // i.e. "from ...foo.bar import baz" --> level=3
     mp_int_t level = 0;
+
     if (n_args >= 4) {
         fromtuple = args[3];
         if (n_args >= 5) {
@@ -266,211 +490,64 @@ mp_obj_t mp_builtin___import__(size_t n_args, const mp_obj_t *args) {
         }
     }
 
-    size_t mod_len;
-    const char *mod_str = mp_obj_str_get_data(module_name, &mod_len);
+    size_t module_name_len;
+    const char *module_name = mp_obj_str_get_data(module_name_obj, &module_name_len);
 
     if (level != 0) {
-        // What we want to do here is to take name of current module,
-        // chop <level> trailing components, and concatenate with passed-in
-        // module name, thus resolving relative import name into absolute.
-        // This even appears to be correct per
-        // http://legacy.python.org/dev/peps/pep-0328/#relative-imports-and-name
-        // "Relative imports use a module's __name__ attribute to determine that
-        // module's position in the package hierarchy."
-        level--;
-        mp_obj_t this_name_q = mp_obj_dict_get(MP_OBJ_FROM_PTR(mp_globals_get()), MP_OBJ_NEW_QSTR(MP_QSTR___name__));
-        assert(this_name_q != MP_OBJ_NULL);
-        #if MICROPY_CPYTHON_COMPAT
-        if (MP_OBJ_QSTR_VALUE(this_name_q) == MP_QSTR___main__) {
-            // This is a module run by -m command-line switch, get its real name from backup attribute
-            this_name_q = mp_obj_dict_get(MP_OBJ_FROM_PTR(mp_globals_get()), MP_OBJ_NEW_QSTR(MP_QSTR___main__));
-        }
-        #endif
-        mp_map_t *globals_map = &mp_globals_get()->map;
-        mp_map_elem_t *elem = mp_map_lookup(globals_map, MP_OBJ_NEW_QSTR(MP_QSTR___path__), MP_MAP_LOOKUP);
-        bool is_pkg = (elem != NULL);
-
-        #if DEBUG_PRINT
-        DEBUG_printf("Current module/package: ");
-        mp_obj_print_helper(MICROPY_DEBUG_PRINTER, this_name_q, PRINT_REPR);
-        DEBUG_printf(", is_package: %d", is_pkg);
-        DEBUG_printf("\n");
-        #endif
-
-        size_t this_name_l;
-        const char *this_name = mp_obj_str_get_data(this_name_q, &this_name_l);
-
-        const char *p = this_name + this_name_l;
-        if (!is_pkg) {
-            // We have module, but relative imports are anchored at package, so
-            // go there.
-            chop_component(this_name, &p);
-        }
-
-        while (level--) {
-            chop_component(this_name, &p);
-        }
-
-        // We must have some component left over to import from
-        if (p == this_name) {
-            mp_raise_msg(&mp_type_ImportError, MP_ERROR_TEXT("can't perform relative import"));
-        }
-
-        uint new_mod_l = (mod_len == 0 ? (size_t)(p - this_name) : (size_t)(p - this_name) + 1 + mod_len);
-        char *new_mod = mp_local_alloc(new_mod_l);
-        memcpy(new_mod, this_name, p - this_name);
-        if (mod_len != 0) {
-            new_mod[p - this_name] = '.';
-            memcpy(new_mod + (p - this_name) + 1, mod_str, mod_len);
-        }
-
-        qstr new_mod_q = qstr_from_strn(new_mod, new_mod_l);
-        mp_local_free(new_mod);
-        DEBUG_printf("Resolved base name for relative import: '%s'\n", qstr_str(new_mod_q));
-        module_name = MP_OBJ_NEW_QSTR(new_mod_q);
-        mod_str = qstr_str(new_mod_q);
-        mod_len = new_mod_l;
+        // Turn "foo.bar" into "<current module minus 3 components>.foo.bar".
+        evaluate_relative_import(level, &module_name, &module_name_len);
     }
 
-    if (mod_len == 0) {
+    if (module_name_len == 0) {
         mp_raise_ValueError(NULL);
     }
 
-    // check if module already exists
-    qstr module_name_qstr = mp_obj_str_get_qstr(module_name);
-    mp_obj_t module_obj = mp_module_get(module_name_qstr);
-    if (module_obj != MP_OBJ_NULL) {
-        DEBUG_printf("Module already loaded\n");
-        // If it's not a package, return module right away
-        char *p = strchr(mod_str, '.');
-        if (p == NULL) {
-            return module_obj;
-        }
-        // If fromlist is not empty, return leaf module
-        if (fromtuple != mp_const_none) {
-            return module_obj;
-        }
-        // Otherwise, we need to return top-level package
-        qstr pkg_name = qstr_from_strn(mod_str, p - mod_str);
-        return mp_module_get(pkg_name);
-    }
-    DEBUG_printf("Module not yet loaded\n");
+    DEBUG_printf("Starting module search for '%s'\n", module_name);
 
-    uint last = 0;
     VSTR_FIXED(path, MICROPY_ALLOC_PATH_MAX)
-    module_obj = MP_OBJ_NULL;
     mp_obj_t top_module_obj = MP_OBJ_NULL;
     mp_obj_t outer_module_obj = MP_OBJ_NULL;
-    uint i;
-    for (i = 1; i <= mod_len; i++) {
-        if (i == mod_len || mod_str[i] == '.') {
-            // create a qstr for the module name up to this depth
-            qstr mod_name = qstr_from_strn(mod_str, i);
-            DEBUG_printf("Processing module: %s\n", qstr_str(mod_name));
-            DEBUG_printf("Previous path: =%.*s=\n", vstr_len(&path), vstr_str(&path));
-
-            // find the file corresponding to the module name
-            mp_import_stat_t stat;
-            if (vstr_len(&path) == 0) {
-                // first module in the dotted-name; search for a directory or file
-                stat = find_file(mod_str, i, &path);
-            } else {
-                // latter module in the dotted-name; append to path
-                vstr_add_char(&path, PATH_SEP_CHAR);
-                vstr_add_strn(&path, mod_str + last, i - last);
-                stat = stat_dir_or_file(&path);
-            }
-            DEBUG_printf("Current path: %.*s\n", vstr_len(&path), vstr_str(&path));
-
-            if (stat == MP_IMPORT_STAT_NO_EXIST) {
-                module_obj = MP_OBJ_NULL;
-                #if MICROPY_MODULE_WEAK_LINKS
-                // check if there is a weak link to this module
-                if (i == mod_len) {
-                    module_obj = mp_module_search_umodule(mod_str);
-                    if (module_obj != MP_OBJ_NULL) {
-                        // found weak linked module
-                        mp_module_call_init(mod_name, module_obj);
-                    }
-                }
-                #endif
-                if (module_obj == MP_OBJ_NULL) {
-                    // couldn't find the file, so fail
-                    #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
-                    mp_raise_msg(&mp_type_ImportError, MP_ERROR_TEXT("module not found"));
-                    #else
-                    mp_raise_msg_varg(&mp_type_ImportError, MP_ERROR_TEXT("no module named '%q'"), mod_name);
-                    #endif
-                }
-            } else {
-                // found the file, so get the module
-                module_obj = mp_module_get(mod_name);
-            }
 
-            if (module_obj == MP_OBJ_NULL) {
-                // module not already loaded, so load it!
-
-                module_obj = mp_obj_new_module(mod_name);
-
-                // if args[3] (fromtuple) has magic value False, set up
-                // this module for command-line "-m" option (set module's
-                // name to __main__ instead of real name). Do this only
-                // for *modules* however - packages never have their names
-                // replaced, instead they're -m'ed using a special __main__
-                // submodule in them. (This all apparently is done to not
-                // touch package name itself, which is important for future
-                // imports).
-                if (i == mod_len && fromtuple == mp_const_false && stat != MP_IMPORT_STAT_DIR) {
-                    mp_obj_module_t *o = MP_OBJ_TO_PTR(module_obj);
-                    mp_obj_dict_store(MP_OBJ_FROM_PTR(o->globals), MP_OBJ_NEW_QSTR(MP_QSTR___name__), MP_OBJ_NEW_QSTR(MP_QSTR___main__));
-                    #if MICROPY_CPYTHON_COMPAT
-                    // Store module as "__main__" in the dictionary of loaded modules (returned by sys.modules).
-                    mp_obj_dict_store(MP_OBJ_FROM_PTR(&MP_STATE_VM(mp_loaded_modules_dict)), MP_OBJ_NEW_QSTR(MP_QSTR___main__), module_obj);
-                    // Store real name in "__main__" attribute. Chosen semi-randonly, to reuse existing qstr's.
-                    mp_obj_dict_store(MP_OBJ_FROM_PTR(o->globals), MP_OBJ_NEW_QSTR(MP_QSTR___main__), MP_OBJ_NEW_QSTR(mod_name));
-                    #endif
-                }
-
-                if (stat == MP_IMPORT_STAT_DIR) {
-                    DEBUG_printf("%.*s is dir\n", vstr_len(&path), vstr_str(&path));
-                    // https://docs.python.org/3/reference/import.html
-                    // "Specifically, any module that contains a __path__ attribute is considered a package."
-                    mp_store_attr(module_obj, MP_QSTR___path__, mp_obj_new_str(vstr_str(&path), vstr_len(&path)));
-                    size_t orig_path_len = path.len;
-                    vstr_add_char(&path, PATH_SEP_CHAR);
-                    vstr_add_str(&path, "__init__.py");
-                    if (stat_file_py_or_mpy(&path) != MP_IMPORT_STAT_FILE) {
-                        // mp_warning("%s is imported as namespace package", vstr_str(&path));
-                    } else {
-                        do_load(module_obj, &path);
-                    }
-                    path.len = orig_path_len;
-                } else { // MP_IMPORT_STAT_FILE
-                    do_load(module_obj, &path);
-                    // This should be the last component in the import path.  If there are
-                    // remaining components then it's an ImportError because the current path
-                    // (the module that was just loaded) is not a package.  This will be caught
-                    // on the next iteration because the file will not exist.
-                }
-            }
-            if (outer_module_obj != MP_OBJ_NULL) {
-                qstr s = qstr_from_strn(mod_str + last, i - last);
-                mp_store_attr(outer_module_obj, s, module_obj);
-            }
+    // Search for the end of each component.
+    size_t current_component_start = 0;
+    for (size_t i = 1; i <= module_name_len; i++) {
+        if (i == module_name_len || module_name[i] == '.') {
+            // The module name up to this depth (e.g. foo.bar.baz).
+            qstr full_mod_name = qstr_from_strn(module_name, i);
+            // The current level name (e.g. baz).
+            qstr level_mod_name = qstr_from_strn(module_name + current_component_start, i - current_component_start);
+
+            DEBUG_printf("Processing module: '%s' at level '%s'\n", qstr_str(full_mod_name), qstr_str(level_mod_name));
+            DEBUG_printf("Previous path: =%.*s=\n", (int)vstr_len(&path), vstr_str(&path));
+
+            #if MICROPY_MODULE_OVERRIDE_MAIN_IMPORT
+            // On unix, if this is being loaded via -m (magic mp_const_false),
+            // then handle that if it's the final component.
+            bool override_main = (i == module_name_len && fromtuple == mp_const_false);
+            #else
+            bool override_main = false;
+            #endif
+
+            // Import this module.
+            mp_obj_t module_obj = process_import_at_level(full_mod_name, level_mod_name, outer_module_obj, &path, override_main);
+
+            // Set this as the parent module, and remember the top-level module if it's the first.
             outer_module_obj = module_obj;
             if (top_module_obj == MP_OBJ_NULL) {
                 top_module_obj = module_obj;
             }
-            last = i + 1;
+
+            current_component_start = i + 1;
         }
     }
 
-    // If fromlist is not empty, return leaf module
     if (fromtuple != mp_const_none) {
-        return module_obj;
+        // If fromtuple is not empty, return leaf module
+        return outer_module_obj;
+    } else {
+        // Otherwise, we need to return top-level package
+        return top_module_obj;
     }
-    // Otherwise, we need to return top-level package
-    return top_module_obj;
 }
 
 #else // MICROPY_ENABLE_EXTERNAL_IMPORT
@@ -483,17 +560,19 @@ mp_obj_t mp_builtin___import__(size_t n_args, const mp_obj_t *args) {
 
     // Check if module already exists, and return it if it does
     qstr module_name_qstr = mp_obj_str_get_qstr(args[0]);
-    mp_obj_t module_obj = mp_module_get(module_name_qstr);
+    mp_obj_t module_obj = mp_module_get_loaded_or_builtin(module_name_qstr);
     if (module_obj != MP_OBJ_NULL) {
         return module_obj;
     }
 
     #if MICROPY_MODULE_WEAK_LINKS
     // Check if there is a weak link to this module
-    module_obj = mp_module_search_umodule(qstr_str(module_name_qstr));
+    char umodule_buf[MICROPY_ALLOC_PATH_MAX];
+    umodule_buf[0] = 'u';
+    strcpy(umodule_buf + 1, args[0]);
+    qstr umodule_name_qstr = qstr_from_str(umodule_buf);
+    module_obj = mp_module_get_loaded_or_builtin(umodule_name_qstr);
     if (module_obj != MP_OBJ_NULL) {
-        // Found weak-linked module
-        mp_module_call_init(module_name_qstr, module_obj);
         return module_obj;
     }
     #endif
diff --git a/py/mpconfig.h b/py/mpconfig.h
index 06c46b8c73107..308a77666192e 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -829,6 +829,12 @@ typedef double mp_float_t;
 #define MICROPY_MODULE_WEAK_LINKS (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
 #endif
 
+// Whether to enable importing foo.py with __name__ set to '__main__'
+// Used by the unix port for the -m flag.
+#ifndef MICROPY_MODULE_OVERRIDE_MAIN_IMPORT
+#define MICROPY_MODULE_OVERRIDE_MAIN_IMPORT (0)
+#endif
+
 // Whether frozen modules are supported in the form of strings
 #ifndef MICROPY_MODULE_FROZEN_STR
 #define MICROPY_MODULE_FROZEN_STR (0)
diff --git a/py/objmodule.c b/py/objmodule.c
index d648f0f8cefd0..6b06740e4dabd 100644
--- a/py/objmodule.c
+++ b/py/objmodule.c
@@ -35,6 +35,10 @@
 
 #include "genhdr/moduledefs.h"
 
+#if MICROPY_MODULE_BUILTIN_INIT
+STATIC void mp_module_call_init(mp_obj_t module_name, mp_obj_t module_obj);
+#endif
+
 STATIC void module_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     (void)kind;
     mp_obj_module_t *self = MP_OBJ_TO_PTR(self_in);
@@ -245,47 +249,56 @@ STATIC const mp_rom_map_elem_t mp_builtin_module_table[] = {
 
 MP_DEFINE_CONST_MAP(mp_builtin_module_map, mp_builtin_module_table);
 
-// returns MP_OBJ_NULL if not found
-mp_obj_t mp_module_get(qstr module_name) {
-    mp_map_t *mp_loaded_modules_map = &MP_STATE_VM(mp_loaded_modules_dict).map;
-    // lookup module
-    mp_map_elem_t *el = mp_map_lookup(mp_loaded_modules_map, MP_OBJ_NEW_QSTR(module_name), MP_MAP_LOOKUP);
+// Tries to find a loaded module, otherwise attempts to load a builtin, otherwise MP_OBJ_NULL.
+mp_obj_t mp_module_get_loaded_or_builtin(qstr module_name) {
+    // First try loaded modules.
+    mp_map_elem_t *elem = mp_map_lookup(&MP_STATE_VM(mp_loaded_modules_dict).map, MP_OBJ_NEW_QSTR(module_name), MP_MAP_LOOKUP);
 
-    if (el == NULL) {
-        // module not found, look for builtin module names
-        el = mp_map_lookup((mp_map_t *)&mp_builtin_module_map, MP_OBJ_NEW_QSTR(module_name), MP_MAP_LOOKUP);
-        if (el == NULL) {
+    if (!elem) {
+        #if MICROPY_MODULE_WEAK_LINKS
+        return mp_module_get_builtin(module_name);
+        #else
+        // Otherwise try builtin.
+        elem = mp_map_lookup((mp_map_t *)&mp_builtin_module_map, MP_OBJ_NEW_QSTR(module_name), MP_MAP_LOOKUP);
+        if (!elem) {
             return MP_OBJ_NULL;
         }
-        mp_module_call_init(module_name, el->value);
-    }
 
-    // module found, return it
-    return el->value;
-}
+        #if MICROPY_MODULE_BUILTIN_INIT
+        // If found, it's a newly loaded built-in, so init it.
+        mp_module_call_init(MP_OBJ_NEW_QSTR(module_name), elem->value);
+        #endif
+        #endif
+    }
 
-void mp_module_register(qstr qst, mp_obj_t module) {
-    mp_map_t *mp_loaded_modules_map = &MP_STATE_VM(mp_loaded_modules_dict).map;
-    mp_map_lookup(mp_loaded_modules_map, MP_OBJ_NEW_QSTR(qst), MP_MAP_LOOKUP_ADD_IF_NOT_FOUND)->value = module;
+    return elem->value;
 }
 
 #if MICROPY_MODULE_WEAK_LINKS
-// Search for u"foo" in built-in modules, return MP_OBJ_NULL if not found
-mp_obj_t mp_module_search_umodule(const char *module_str) {
-    for (size_t i = 0; i < MP_ARRAY_SIZE(mp_builtin_module_table); ++i) {
-        const mp_map_elem_t *entry = (const mp_map_elem_t *)&mp_builtin_module_table[i];
-        const char *key = qstr_str(MP_OBJ_QSTR_VALUE(entry->key));
-        if (key[0] == 'u' && strcmp(&key[1], module_str) == 0) {
-            return (mp_obj_t)entry->value;
-        }
-
+// Tries to find a loaded module, otherwise attempts to load a builtin, otherwise MP_OBJ_NULL.
+mp_obj_t mp_module_get_builtin(qstr module_name) {
+    // Try builtin.
+    mp_map_elem_t *elem = mp_map_lookup((mp_map_t *)&mp_builtin_module_map, MP_OBJ_NEW_QSTR(module_name), MP_MAP_LOOKUP);
+    if (!elem) {
+        return MP_OBJ_NULL;
     }
-    return MP_OBJ_NULL;
+
+    #if MICROPY_MODULE_BUILTIN_INIT
+    // If found, it's a newly loaded built-in, so init it.
+    mp_module_call_init(MP_OBJ_NEW_QSTR(module_name), elem->value);
+    #endif
+
+    return elem->value;
 }
 #endif
 
 #if MICROPY_MODULE_BUILTIN_INIT
-void mp_module_call_init(qstr module_name, mp_obj_t module_obj) {
+STATIC void mp_module_register(mp_obj_t module_name, mp_obj_t module) {
+    mp_map_t *mp_loaded_modules_map = &MP_STATE_VM(mp_loaded_modules_dict).map;
+    mp_map_lookup(mp_loaded_modules_map, module_name, MP_MAP_LOOKUP_ADD_IF_NOT_FOUND)->value = module;
+}
+
+STATIC void mp_module_call_init(mp_obj_t module_name, mp_obj_t module_obj) {
     // Look for __init__ and call it if it exists
     mp_obj_t dest[2];
     mp_load_method_maybe(module_obj, MP_QSTR___init__, dest);
diff --git a/py/objmodule.h b/py/objmodule.h
index fde4fff34e0ef..8a82d13fe5b7b 100644
--- a/py/objmodule.h
+++ b/py/objmodule.h
@@ -30,18 +30,9 @@
 
 extern const mp_map_t mp_builtin_module_map;
 
-mp_obj_t mp_module_get(qstr module_name);
-void mp_module_register(qstr qstr, mp_obj_t module);
-
-mp_obj_t mp_module_search_umodule(const char *module_str);
-
-#if MICROPY_MODULE_BUILTIN_INIT
-void mp_module_call_init(qstr module_name, mp_obj_t module_obj);
-#else
-static inline void mp_module_call_init(qstr module_name, mp_obj_t module_obj) {
-    (void)module_name;
-    (void)module_obj;
-}
+mp_obj_t mp_module_get_loaded_or_builtin(qstr module_name);
+#if MICROPY_MODULE_WEAK_LINKS
+mp_obj_t mp_module_get_builtin(qstr module_name);
 #endif
 
 #endif // MICROPY_INCLUDED_PY_OBJMODULE_H

From b491967bbd99470632b783ee3bf91914aa692047 Mon Sep 17 00:00:00 2001
From: IhorNehrutsa <Ihor.Nehrutsa@gmail.com>
Date: Fri, 15 Oct 2021 14:04:40 -0700
Subject: [PATCH 1466/3533] esp32/machine_pwm: Implement duty_u16() and
 duty_ns() PWM methods.

The methods duty_u16() and duty_ns() are implemented to match the existing
docs.  The duty will remain the same when the frequency is changed.
Standard ESP32 as well as S2, S3 and C3 are supported.

Thanks to @kdschlosser for the fix for rounding in resolution calculation.

Documentation is updated and examples expanded for esp32, including the
quickref and tutorial.  Additional notes are added to the machine.PWM docs
regarding limitations of hardware PWM.
---
 docs/esp32/quickref.rst      |  22 +-
 docs/esp32/tutorial/pwm.rst  | 106 +++++++--
 docs/library/machine.PWM.rst |  31 +++
 ports/esp32/machine_pwm.c    | 422 ++++++++++++++++++++++++++---------
 ports/esp32/main.c           |   2 +
 ports/esp32/modmachine.h     |   2 +
 ports/esp32/mpconfigport.h   |   1 +
 7 files changed, 448 insertions(+), 138 deletions(-)

diff --git a/docs/esp32/quickref.rst b/docs/esp32/quickref.rst
index 7391a4aa4b546..97b6fba38d0ef 100644
--- a/docs/esp32/quickref.rst
+++ b/docs/esp32/quickref.rst
@@ -218,20 +218,24 @@ range from 1Hz to 40MHz but there is a tradeoff; as the base frequency
 *increases* the duty resolution *decreases*. See
 `LED Control <https://docs.espressif.com/projects/esp-idf/en/latest/api-reference/peripherals/ledc.html>`_
 for more details.
-Currently the duty cycle has to be in the range of 0-1023.
 
-Use the ``machine.PWM`` class::
+Use the :ref:`machine.PWM <machine.PWM>` class::
 
     from machine import Pin, PWM
 
-    pwm0 = PWM(Pin(0))      # create PWM object from a pin
-    pwm0.freq()             # get current frequency (default 5kHz)
-    pwm0.freq(1000)         # set frequency
-    pwm0.duty()             # get current duty cycle (default 512, 50%)
-    pwm0.duty(200)          # set duty cycle
-    pwm0.deinit()           # turn off PWM on the pin
+    pwm0 = PWM(Pin(0))         # create PWM object from a pin
+    pwm0.freq()                # get current frequency (default 5kHz)
+    pwm0.freq(1000)            # set PWM frequency from 1Hz to 40MHz
+    pwm0.duty()                # get current duty cycle, range 0-1023 (default 512, 50%)
+    pwm0.duty(256)             # set duty cycle from 0 to 1023 as a ratio duty/1023, (now 25%)
+    pwm0.duty_u16(2**16*3//4)  # set duty cycle from 0 to 65535 as a ratio duty_u16/65535, (now 75%)
+    pwm0.duty_u16()            # get current duty cycle, range 0-65535
+    pwm0.duty_ns(250_000)      # set pulse width in nanoseconds from 0 to 1_000_000_000/freq, (now 25%)
+    pwm0.duty_ns()             # get current pulse width in ns
+    pwm0.deinit()              # turn off PWM on the pin
 
     pwm2 = PWM(Pin(2), freq=20000, duty=512)  # create and configure in one go
+    print(pwm2)                               # view PWM settings
 
 ESP chips have different hardware peripherals:
 
@@ -251,6 +255,8 @@ but only 8 different PWM frequencies are available, the remaining 8 channels mus
 have the same frequency.  On the other hand, 16 independent PWM duty cycles are
 possible at the same frequency.
 
+See more examples in the :ref:`esp32_pwm` tutorial.
+
 ADC (analog to digital conversion)
 ----------------------------------
 
diff --git a/docs/esp32/tutorial/pwm.rst b/docs/esp32/tutorial/pwm.rst
index 0c1afb213b2df..12d10a86b9474 100644
--- a/docs/esp32/tutorial/pwm.rst
+++ b/docs/esp32/tutorial/pwm.rst
@@ -1,4 +1,4 @@
-.. _esp32_pwm: 
+.. _esp32_pwm:
 
 Pulse Width Modulation
 ======================
@@ -11,7 +11,7 @@ compared with the length of a single period (low plus high time).  Maximum
 duty cycle is when the pin is high all of the time, and minimum is when it is
 low all of the time.
 
-More comprehensive example with all 16 PWM channels and 8 timers::
+* More comprehensive example with all 16 PWM channels and 8 timers::
 
     from machine import Pin, PWM
     try:
@@ -29,21 +29,87 @@ More comprehensive example with all 16 PWM channels and 8 timers::
             except:
                 pass
 
-Output is::
-
-    PWM(pin=15, freq=100, duty=64, resolution=10, mode=0, channel=0, timer=0)
-    PWM(pin=2, freq=100, duty=128, resolution=10, mode=0, channel=1, timer=0)
-    PWM(pin=4, freq=200, duty=192, resolution=10, mode=0, channel=2, timer=1)
-    PWM(pin=16, freq=200, duty=256, resolution=10, mode=0, channel=3, timer=1)
-    PWM(pin=18, freq=300, duty=320, resolution=10, mode=0, channel=4, timer=2)
-    PWM(pin=19, freq=300, duty=384, resolution=10, mode=0, channel=5, timer=2)
-    PWM(pin=22, freq=400, duty=448, resolution=10, mode=0, channel=6, timer=3)
-    PWM(pin=23, freq=400, duty=512, resolution=10, mode=0, channel=7, timer=3)
-    PWM(pin=25, freq=500, duty=576, resolution=10, mode=1, channel=0, timer=0)
-    PWM(pin=26, freq=500, duty=640, resolution=10, mode=1, channel=1, timer=0)
-    PWM(pin=27, freq=600, duty=704, resolution=10, mode=1, channel=2, timer=1)
-    PWM(pin=14, freq=600, duty=768, resolution=10, mode=1, channel=3, timer=1)
-    PWM(pin=12, freq=700, duty=832, resolution=10, mode=1, channel=4, timer=2)
-    PWM(pin=13, freq=700, duty=896, resolution=10, mode=1, channel=5, timer=2)
-    PWM(pin=32, freq=800, duty=960, resolution=10, mode=1, channel=6, timer=3)
-    PWM(pin=33, freq=800, duty=1023, resolution=10, mode=1, channel=7, timer=3)
+  Output is::
+
+    PWM(Pin(15), freq=100, duty=64, resolution=10, mode=0, channel=0, timer=0)
+    PWM(Pin(2), freq=100, duty=128, resolution=10, mode=0, channel=1, timer=0)
+    PWM(Pin(4), freq=200, duty=192, resolution=10, mode=0, channel=2, timer=1)
+    PWM(Pin(16), freq=200, duty=256, resolution=10, mode=0, channel=3, timer=1)
+    PWM(Pin(18), freq=300, duty=320, resolution=10, mode=0, channel=4, timer=2)
+    PWM(Pin(19), freq=300, duty=384, resolution=10, mode=0, channel=5, timer=2)
+    PWM(Pin(22), freq=400, duty=448, resolution=10, mode=0, channel=6, timer=3)
+    PWM(Pin(23), freq=400, duty=512, resolution=10, mode=0, channel=7, timer=3)
+    PWM(Pin(25), freq=500, duty=576, resolution=10, mode=1, channel=0, timer=0)
+    PWM(Pin(26), freq=500, duty=640, resolution=10, mode=1, channel=1, timer=0)
+    PWM(Pin(27), freq=600, duty=704, resolution=10, mode=1, channel=2, timer=1)
+    PWM(Pin(14), freq=600, duty=768, resolution=10, mode=1, channel=3, timer=1)
+    PWM(Pin(12), freq=700, duty=832, resolution=10, mode=1, channel=4, timer=2)
+    PWM(Pin(13), freq=700, duty=896, resolution=10, mode=1, channel=5, timer=2)
+    PWM(Pin(32), freq=800, duty=960, resolution=10, mode=1, channel=6, timer=3)
+    PWM(Pin(33), freq=800, duty=1023, resolution=10, mode=1, channel=7, timer=3)
+
+* Example of a smooth frequency change::
+
+    from utime import sleep
+    from machine import Pin, PWM
+
+    F_MIN = 500
+    F_MAX = 1000
+
+    f = F_MIN
+    delta_f = 1
+
+    p = PWM(Pin(5), f)
+    print(p)
+
+    while True:
+        p.freq(f)
+
+        sleep(10 / F_MIN)
+
+        f += delta_f
+        if f >= F_MAX or f <= F_MIN:
+            delta_f = -delta_f
+
+  See PWM wave at Pin(5) with an oscilloscope.
+
+* Example of a smooth duty change::
+
+    from utime import sleep
+    from machine import Pin, PWM
+
+    DUTY_MAX = 2**16 - 1
+
+    duty_u16 = 0
+    delta_d = 16
+
+    p = PWM(Pin(5), 1000, duty_u16=duty_u16)
+    print(p)
+
+    while True:
+        p.duty_u16(duty_u16)
+
+        sleep(1 / 1000)
+
+        duty_u16 += delta_d
+        if duty_u16 >= DUTY_MAX:
+            duty_u16 = DUTY_MAX
+            delta_d = -delta_d
+        elif duty_u16 <= 0:
+            duty_u16 = 0
+            delta_d = -delta_d
+
+  See PWM wave at Pin(5) with an oscilloscope.
+
+Note: the Pin.OUT mode does not need to be specified.  The channel is initialized
+to PWM mode internally once for each Pin that is passed to the PWM constructor.
+
+The following code is wrong::
+
+    pwm = PWM(Pin(5, Pin.OUT), freq=1000, duty=512)  # Pin(5) in PWM mode here
+    pwm = PWM(Pin(5, Pin.OUT), freq=500, duty=256)  # Pin(5) in OUT mode here, PWM is off
+
+Use this code instead::
+
+    pwm = PWM(Pin(5), freq=1000, duty=512)
+    pwm.init(freq=500, duty=256)
diff --git a/docs/library/machine.PWM.rst b/docs/library/machine.PWM.rst
index f2273d8b453da..4c72255d81709 100644
--- a/docs/library/machine.PWM.rst
+++ b/docs/library/machine.PWM.rst
@@ -77,3 +77,34 @@ Methods
    With no arguments the pulse width in nanoseconds is returned.
 
    With a single *value* argument the pulse width is set to that value.
+
+Limitations of PWM
+------------------
+
+* Not all frequencies can be generated with absolute accuracy due to
+  the discrete nature of the computing hardware.  Typically the PWM frequency
+  is obtained by dividing some integer base frequency by an integer divider.
+  For example, if the base frequency is 80MHz and the required PWM frequency is
+  300kHz the divider must be a non-integer number 80000000 / 300000 = 266.67.
+  After rounding the divider is set to 267 and the PWM frequency will be
+  80000000 / 267 = 299625.5 Hz, not 300kHz.  If the divider is set to 266 then
+  the PWM frequency will be 80000000 / 266 = 300751.9 Hz, but again not 300kHz.
+
+* The duty cycle has the same discrete nature and its absolute accuracy is not
+  achievable.  On most hardware platforms the duty will be applied at the next
+  frequency period.  Therefore, you should wait more than "1/frequency" before
+  measuring the duty.
+
+* The frequency and the duty cycle resolution are usually interdependent.
+  The higher the PWM frequency the lower the duty resolution which is available,
+  and vice versa. For example, a 300kHz PWM frequency can have a duty cycle
+  resolution of 8 bit, not 16-bit as may be expected.  In this case, the lowest
+  8 bits of *duty_u16* are insignificant. So::
+
+    pwm=PWM(Pin(13), freq=300_000, duty_u16=2**16//2)
+
+  and::
+
+    pwm=PWM(Pin(13), freq=300_000, duty_u16=2**16//2 + 255)
+
+  will generate PWM with the same 50% duty cycle.
diff --git a/ports/esp32/machine_pwm.c b/ports/esp32/machine_pwm.c
index 41b8dbcbfe5b9..1cf3bc033a4fc 100644
--- a/ports/esp32/machine_pwm.c
+++ b/ports/esp32/machine_pwm.c
@@ -27,6 +27,8 @@
  * THE SOFTWARE.
  */
 
+#include <math.h>
+
 #include "py/runtime.h"
 #include "py/mphal.h"
 
@@ -34,10 +36,11 @@
 #include "esp_err.h"
 
 #define PWM_DBG(...)
-// #define PWM_DBG(...) mp_printf(&mp_plat_print, __VA_ARGS__)
+// #define PWM_DBG(...) mp_printf(&mp_plat_print, __VA_ARGS__); mp_printf(&mp_plat_print, "\n");
 
 // Total number of channels
 #define PWM_CHANNEL_MAX (LEDC_SPEED_MODE_MAX * LEDC_CHANNEL_MAX)
+
 typedef struct _chan_t {
     // Which channel has which GPIO pin assigned?
     // (-1 if not assigned)
@@ -46,6 +49,7 @@ typedef struct _chan_t {
     // (-1 if not assigned)
     int timer_idx;
 } chan_t;
+
 // List of PWM channels
 STATIC chan_t chans[PWM_CHANNEL_MAX];
 
@@ -57,6 +61,7 @@ STATIC chan_t chans[PWM_CHANNEL_MAX];
 
 // Total number of timers
 #define PWM_TIMER_MAX (LEDC_SPEED_MODE_MAX * LEDC_TIMER_MAX)
+
 // List of timer configs
 STATIC ledc_timer_config_t timers[PWM_TIMER_MAX];
 
@@ -73,6 +78,28 @@ STATIC ledc_timer_config_t timers[PWM_TIMER_MAX];
 // 10-bit resolution (compatible with esp8266 PWM)
 #define PWRES (LEDC_TIMER_10_BIT)
 
+// Maximum duty value on 10-bit resolution
+#define MAX_DUTY_U10 ((1 << PWRES) - 1)
+// https://docs.espressif.com/projects/esp-idf/en/latest/esp32/api-reference/peripherals/ledc.html#supported-range-of-frequency-and-duty-resolutions
+// duty() uses 10-bit resolution or less
+// duty_u16() and duty_ns() use 16-bit resolution or less
+
+// Possible highest resolution in device
+#if CONFIG_IDF_TARGET_ESP32
+#define HIGHEST_PWM_RES (LEDC_TIMER_16_BIT) // 20 bit in fact, but 16 bit is used
+#else
+#define HIGHEST_PWM_RES (LEDC_TIMER_14_BIT)
+#endif
+// Duty resolution of user interface in `duty_u16()` and `duty_u16` parameter in constructor/initializer
+#define UI_RES_16_BIT (16)
+// Maximum duty value on highest user interface resolution
+#define UI_MAX_DUTY ((1 << UI_RES_16_BIT) - 1)
+// How much to shift from the HIGHEST_PWM_RES duty resolution to the user interface duty resolution UI_RES_16_BIT
+#define UI_RES_SHIFT (16 - HIGHEST_PWM_RES) // 0 for ESP32, 2 for S2, S3, C3
+
+// If the PWM frequency is less than EMPIRIC_FREQ, then LEDC_REF_CLK_HZ(1 MHz) source is used, else LEDC_APB_CLK_HZ(80 MHz) source is used
+#define EMPIRIC_FREQ (10) // Hz
+
 // Config of timer upon which we run all PWM'ed GPIO pins
 STATIC bool pwm_inited = false;
 
@@ -84,8 +111,17 @@ typedef struct _machine_pwm_obj_t {
     int mode;
     int channel;
     int timer;
+    int duty_x; // PWRES if duty(), HIGHEST_PWM_RES if duty_u16(), -HIGHEST_PWM_RES if duty_ns()
+    int duty_u10; // stored values from previous duty setters
+    int duty_u16; // - / -
+    int duty_ns; // - / -
 } machine_pwm_obj_t;
 
+STATIC bool is_timer_in_use(int current_channel_idx, int timer_idx);
+STATIC void set_duty_u16(machine_pwm_obj_t *self, int duty);
+STATIC void set_duty_u10(machine_pwm_obj_t *self, int duty);
+STATIC void set_duty_ns(machine_pwm_obj_t *self, int ns);
+
 STATIC void pwm_init(void) {
     // Initial condition: no channels assigned
     for (int i = 0; i < PWM_CHANNEL_MAX; ++i) {
@@ -96,12 +132,61 @@ STATIC void pwm_init(void) {
     // Prepare all timers config
     // Initial condition: no timers assigned
     for (int i = 0; i < PWM_TIMER_MAX; ++i) {
-        timers[i].duty_resolution = PWRES;
+        timers[i].duty_resolution = HIGHEST_PWM_RES;
         // unset timer is -1
         timers[i].freq_hz = -1;
         timers[i].speed_mode = TIMER_IDX_TO_MODE(i);
         timers[i].timer_num = TIMER_IDX_TO_TIMER(i);
-        timers[i].clk_cfg = LEDC_AUTO_CLK;
+        timers[i].clk_cfg = LEDC_AUTO_CLK; // will reinstall later according to the EMPIRIC_FREQ
+    }
+}
+
+// Deinit channel and timer if the timer is unused
+STATIC void pwm_deinit(int channel_idx) {
+    // Valid channel?
+    if ((channel_idx >= 0) && (channel_idx < PWM_CHANNEL_MAX)) {
+        // Clean up timer if necessary
+        int timer_idx = chans[channel_idx].timer_idx;
+        if (timer_idx != -1) {
+            if (!is_timer_in_use(channel_idx, timer_idx)) {
+                check_esp_err(ledc_timer_rst(TIMER_IDX_TO_MODE(timer_idx), TIMER_IDX_TO_TIMER(timer_idx)));
+                // Flag it unused
+                timers[chans[channel_idx].timer_idx].freq_hz = -1;
+            }
+        }
+
+        int pin = chans[channel_idx].pin;
+        if (pin != -1) {
+            int mode = CHANNEL_IDX_TO_MODE(channel_idx);
+            int channel = CHANNEL_IDX_TO_CHANNEL(channel_idx);
+            // Mark it unused, and tell the hardware to stop routing
+            check_esp_err(ledc_stop(mode, channel, 0));
+            // Disable ledc signal for the pin
+            // gpio_matrix_out(pin, SIG_GPIO_OUT_IDX, false, false);
+            if (mode == LEDC_LOW_SPEED_MODE) {
+                gpio_matrix_out(pin, LEDC_LS_SIG_OUT0_IDX + channel, false, true);
+            } else {
+                #if LEDC_SPEED_MODE_MAX > 1
+                #if CONFIG_IDF_TARGET_ESP32
+                gpio_matrix_out(pin, LEDC_HS_SIG_OUT0_IDX + channel, false, true);
+                #else
+                #error Add supported CONFIG_IDF_TARGET_ESP32_xxx
+                #endif
+                #endif
+            }
+        }
+        chans[channel_idx].pin = -1;
+        chans[channel_idx].timer_idx = -1;
+    }
+}
+
+// This called from Ctrl-D soft reboot
+void machine_pwm_deinit_all(void) {
+    if (pwm_inited) {
+        for (int channel_idx = 0; channel_idx < PWM_CHANNEL_MAX; ++channel_idx) {
+            pwm_deinit(channel_idx);
+        }
+        pwm_inited = false;
     }
 }
 
@@ -119,74 +204,169 @@ STATIC void configure_channel(machine_pwm_obj_t *self) {
     }
 }
 
-STATIC void set_freq(int newval, ledc_timer_config_t *timer) {
-    // If already set, do nothing
-    if (newval == timer->freq_hz) {
-        return;
-    }
+STATIC void set_freq(machine_pwm_obj_t *self, unsigned int freq, ledc_timer_config_t *timer) {
+    // Even if the timer frequency is already set,
+    // the set_duty_x() is required to reconfigure the channel duty anyway
+    if (freq != timer->freq_hz) {
+        PWM_DBG("set_freq(%d)", freq)
 
-    // Find the highest bit resolution for the requested frequency
-    if (newval <= 0) {
-        newval = 1;
-    }
-    unsigned int res = 0;
-    for (unsigned int i = LEDC_APB_CLK_HZ / newval; i > 1; i >>= 1) {
-        ++res;
-    }
-    if (res == 0) {
-        res = 1;
-    } else if (res > PWRES) {
-        // Limit resolution to PWRES to match units of our duty
-        res = PWRES;
-    }
+        // Find the highest bit resolution for the requested frequency
+        unsigned int i = LEDC_APB_CLK_HZ; // 80 MHz
+        if (freq < EMPIRIC_FREQ) {
+            i = LEDC_REF_CLK_HZ; // 1 MHz
+        }
 
-    // Configure the new resolution and frequency
-    timer->duty_resolution = res;
-    timer->freq_hz = newval;
+        #if 1
+        // original code
+        i /= freq;
+        #else
+        // See https://github.com/espressif/esp-idf/issues/7722
+        unsigned int divider = i / freq; // truncated
+        // int divider = (i + freq / 2) / freq; // rounded
+        if (divider == 0) {
+            divider = 1;
+        }
+        float f = (float)i / divider; // actual frequency
+        if (f <= 1.0) {
+            f = 1.0;
+        }
+        i = (unsigned int)roundf((float)i / f);
+        #endif
 
-    // set freq
-    esp_err_t err = ledc_timer_config(timer);
-    if (err != ESP_OK) {
-        if (err == ESP_FAIL) {
-            PWM_DBG("timer timer->speed_mode %d, timer->timer_num %d, timer->clk_cfg %d, timer->freq_hz  %d, timer->duty_resolution %d)", timer->speed_mode, timer->timer_num, timer->clk_cfg, timer->freq_hz, timer->duty_resolution);
-            mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("bad frequency %d"), newval);
-        } else {
-            check_esp_err(err);
+        unsigned int res = 0;
+        for (; i > 1; i >>= 1) {
+            ++res;
+        }
+        if (res == 0) {
+            res = 1;
+        } else if (res > HIGHEST_PWM_RES) {
+            // Limit resolution to HIGHEST_PWM_RES to match units of our duty
+            res = HIGHEST_PWM_RES;
+        }
+
+        // Configure the new resolution and frequency
+        timer->duty_resolution = res;
+        timer->freq_hz = freq;
+        timer->clk_cfg = LEDC_USE_APB_CLK;
+        if (freq < EMPIRIC_FREQ) {
+            timer->clk_cfg = LEDC_USE_REF_TICK;
+        }
+
+        // Set frequency
+        esp_err_t err = ledc_timer_config(timer);
+        if (err != ESP_OK) {
+            if (err == ESP_FAIL) {
+                PWM_DBG(" (timer timer->speed_mode %d, timer->timer_num %d, timer->clk_cfg %d, timer->freq_hz  %d, timer->duty_resolution %d) ", timer->speed_mode, timer->timer_num, timer->clk_cfg, timer->freq_hz, timer->duty_resolution);
+                mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("unreachable frequency %d"), freq);
+            } else {
+                check_esp_err(err);
+            }
+        }
+        // Reset the timer if low speed
+        if (self->mode == LEDC_LOW_SPEED_MODE) {
+            check_esp_err(ledc_timer_rst(self->mode, self->timer));
         }
     }
+
+    // Save the same duty cycle when frequency or channel are changed
+    if (self->duty_x == HIGHEST_PWM_RES) {
+        set_duty_u16(self, self->duty_u16);
+    } else if (self->duty_x == PWRES) {
+        set_duty_u10(self, self->duty_u10);
+    } else if (self->duty_x == -HIGHEST_PWM_RES) {
+        set_duty_ns(self, self->duty_ns);
+    }
 }
 
-STATIC int get_duty(machine_pwm_obj_t *self) {
-    uint32_t duty = ledc_get_duty(self->mode, self->channel);
-    duty <<= PWRES - timers[TIMER_IDX(self->mode, self->timer)].duty_resolution;
+// Calculate the duty parameters based on an ns value
+STATIC int ns_to_duty(machine_pwm_obj_t *self, int ns) {
+    ledc_timer_config_t timer = timers[TIMER_IDX(self->mode, self->timer)];
+    int64_t duty = ((int64_t)ns * UI_MAX_DUTY * timer.freq_hz + 500000000LL) / 1000000000LL;
+    if ((ns > 0) && (duty == 0)) {
+        duty = 1;
+    } else if (duty > UI_MAX_DUTY) {
+        duty = UI_MAX_DUTY;
+    }
+    // PWM_DBG(" ns_to_duty(UI_MAX_DUTY=%d freq_hz=%d duty=%d=%f <- ns=%d) ", UI_MAX_DUTY, timer.freq_hz, duty, (float)ns * UI_MAX_DUTY * timer.freq_hz / 1000000000.0, ns);
     return duty;
 }
 
-STATIC void set_duty(machine_pwm_obj_t *self, int duty) {
-    if ((duty < 0) || (duty > (1 << PWRES) - 1)) {
-        mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("duty must be between 0 and %u"), (1 << PWRES) - 1);
+STATIC int duty_to_ns(machine_pwm_obj_t *self, int duty) {
+    ledc_timer_config_t timer = timers[TIMER_IDX(self->mode, self->timer)];
+    int64_t ns = ((int64_t)duty * 1000000000LL + (int64_t)timer.freq_hz * UI_MAX_DUTY / 2) / ((int64_t)timer.freq_hz * UI_MAX_DUTY);
+    // PWM_DBG(" duty_to_ns(UI_MAX_DUTY=%d freq_hz=%d duty=%d -> ns=%f=%d) ", UI_MAX_DUTY, timer.freq_hz, duty, (float)duty * 1000000000.0 / ((float)timer.freq_hz * UI_MAX_DUTY), ns);
+    return ns;
+}
+
+#define get_duty_raw(self) ledc_get_duty(self->mode, self->channel)
+
+STATIC uint32_t get_duty_u16(machine_pwm_obj_t *self) {
+    return ledc_get_duty(self->mode, self->channel) << (HIGHEST_PWM_RES + UI_RES_SHIFT - timers[TIMER_IDX(self->mode, self->timer)].duty_resolution);
+}
+
+STATIC uint32_t get_duty_u10(machine_pwm_obj_t *self) {
+    return get_duty_u16(self) >> (HIGHEST_PWM_RES - PWRES);
+}
+
+STATIC uint32_t get_duty_ns(machine_pwm_obj_t *self) {
+    return duty_to_ns(self, get_duty_u16(self));
+}
+
+STATIC void set_duty_u16(machine_pwm_obj_t *self, int duty) {
+    if ((duty < 0) || (duty > UI_MAX_DUTY)) {
+        mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("duty_u16 must be from 0 to %d"), UI_MAX_DUTY);
+    }
+    duty >>= HIGHEST_PWM_RES + UI_RES_SHIFT - timers[TIMER_IDX(self->mode, self->timer)].duty_resolution;
+    int max_duty = (1 << timers[TIMER_IDX(self->mode, self->timer)].duty_resolution) - 1;
+    if (duty < 0) {
+        duty = 0;
+    } else if (duty > max_duty) {
+        duty = max_duty;
     }
-    duty &= (1 << PWRES) - 1;
-    duty >>= PWRES - timers[TIMER_IDX(self->mode, self->timer)].duty_resolution;
     check_esp_err(ledc_set_duty(self->mode, self->channel, duty));
     check_esp_err(ledc_update_duty(self->mode, self->channel));
-    // check_esp_err(ledc_set_duty_and_update(self->mode, self->channel, duty, (1 << PWRES) - 1)); // thread safe function ???
 
+    /*
     // Bug: Sometimes duty is not set right now.
     // See https://github.com/espressif/esp-idf/issues/7288
-    /*
-    if (duty != get_duty(self)) {
-        PWM_DBG("\n duty_set %u %u %d %d \n", duty, get_duty(self), PWRES, timers[TIMER_IDX(self->mode, self->timer)].duty_resolution);
+    if (duty != get_duty_u16(self)) {
+        ets_delay_us(100);
+        if (duty != get_duty_u16(self)) {
+            PWM_DBG(" (set_duty_u16(%u) get_duty_u16()=%u duty_resolution=%d) ", duty, get_duty_u16(self), timers[TIMER_IDX(self->mode, self->timer)].duty_resolution);
+        }
     }
     */
+
+    self->duty_x = HIGHEST_PWM_RES;
+    self->duty_u16 = duty;
+}
+
+STATIC void set_duty_u10(machine_pwm_obj_t *self, int duty) {
+    if ((duty < 0) || (duty > MAX_DUTY_U10)) {
+        mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("duty must be from 0 to %u"), MAX_DUTY_U10);
+    }
+    set_duty_u16(self, duty << (HIGHEST_PWM_RES + UI_RES_SHIFT - PWRES));
+    self->duty_x = PWRES;
+    self->duty_u10 = duty;
+}
+
+STATIC void set_duty_ns(machine_pwm_obj_t *self, int ns) {
+    if ((ns < 0) || (ns > duty_to_ns(self, UI_MAX_DUTY))) {
+        mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("duty_ns must be from 0 to %d ns"), duty_to_ns(self, UI_MAX_DUTY));
+    }
+    set_duty_u16(self, ns_to_duty(self, ns));
+    self->duty_x = -HIGHEST_PWM_RES;
+    self->duty_ns = ns;
 }
 
 /******************************************************************************/
+
 #define SAME_FREQ_ONLY (true)
 #define SAME_FREQ_OR_FREE (false)
 #define ANY_MODE (-1)
+
 // Return timer_idx. Use TIMER_IDX_TO_MODE(timer_idx) and TIMER_IDX_TO_TIMER(timer_idx) to get mode and timer
-STATIC int find_timer(int freq, bool same_freq_only, int mode) {
+STATIC int find_timer(unsigned int freq, bool same_freq_only, int mode) {
     int free_timer_idx_found = -1;
     // Find a free PWM Timer using the same freq
     for (int timer_idx = 0; timer_idx < PWM_TIMER_MAX; ++timer_idx) {
@@ -242,22 +422,36 @@ STATIC int find_channel(int pin, int mode) {
 
 STATIC void mp_machine_pwm_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     machine_pwm_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    mp_printf(print, "PWM(pin=%u", self->pin);
+    mp_printf(print, "PWM(Pin(%u)", self->pin);
     if (self->active) {
-        int duty = get_duty(self);
-        mp_printf(print, ", freq=%u, duty=%u", ledc_get_freq(self->mode, self->timer), duty);
-        mp_printf(print, ", resolution=%u", timers[TIMER_IDX(self->mode, self->timer)].duty_resolution);
+        mp_printf(print, ", freq=%u", ledc_get_freq(self->mode, self->timer));
+
+        if (self->duty_x == PWRES) {
+            mp_printf(print, ", duty=%d", get_duty_u10(self));
+        } else if (self->duty_x == -HIGHEST_PWM_RES) {
+            mp_printf(print, ", duty_ns=%d", get_duty_ns(self));
+        } else {
+            mp_printf(print, ", duty_u16=%d", get_duty_u16(self));
+        }
+        int resolution = timers[TIMER_IDX(self->mode, self->timer)].duty_resolution;
+        mp_printf(print, ", resolution=%d", resolution);
+
+        mp_printf(print, ", (duty=%.2f%%, resolution=%.3f%%)", 100.0 * get_duty_raw(self) / (1 << resolution), 100.0 * 1 / (1 << resolution)); // percents
+
         mp_printf(print, ", mode=%d, channel=%d, timer=%d", self->mode, self->channel, self->timer);
     }
     mp_printf(print, ")");
 }
 
+// This called from pwm.init() method
 STATIC void mp_machine_pwm_init_helper(machine_pwm_obj_t *self,
     size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
-    enum { ARG_freq, ARG_duty };
+    enum { ARG_freq, ARG_duty, ARG_duty_u16, ARG_duty_ns };
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_freq, MP_ARG_INT, {.u_int = -1} },
-        { MP_QSTR_duty, MP_ARG_INT, {.u_int = -1} },
+        { MP_QSTR_duty, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} },
+        { MP_QSTR_duty_u16, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} },
+        { MP_QSTR_duty_ns, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} },
     };
     mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
     mp_arg_parse_all(n_args, pos_args, kw_args,
@@ -268,25 +462,40 @@ STATIC void mp_machine_pwm_init_helper(machine_pwm_obj_t *self,
         mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("out of PWM channels:%d"), PWM_CHANNEL_MAX); // in all modes
     }
 
-    int freq = args[ARG_freq].u_int;
-    if ((freq < -1) || (freq > 40000000)) {
-        mp_raise_ValueError(MP_ERROR_TEXT("freqency must be between 1Hz and 40MHz"));
+    int duty = args[ARG_duty].u_int;
+    int duty_u16 = args[ARG_duty_u16].u_int;
+    int duty_ns = args[ARG_duty_ns].u_int;
+    if (((duty != -1) && (duty_u16 != -1)) || ((duty != -1) && (duty_ns != -1)) || ((duty_u16 != -1) && (duty_ns != -1))) {
+        mp_raise_ValueError(MP_ERROR_TEXT("only one of parameters 'duty', 'duty_u16' or 'duty_ns' is allowed"));
     }
+
+    int freq = args[ARG_freq].u_int;
     // Check if freq wasn't passed as an argument
     if (freq == -1) {
         // Check if already set, otherwise use the default freq.
-        // Possible case:
+        // It is possible in case:
         // pwm = PWM(pin, freq=1000, duty=256)
         // pwm = PWM(pin, duty=128)
         if (chans[channel_idx].timer_idx != -1) {
             freq = timers[chans[channel_idx].timer_idx].freq_hz;
         }
-        if (freq < 0) {
+        if (freq <= 0) {
             freq = PWFREQ;
         }
     }
+    if ((freq <= 0) || (freq > 40000000)) {
+        mp_raise_ValueError(MP_ERROR_TEXT("freqency must be from 1Hz to 40MHz"));
+    }
+
+    int timer_idx;
+    int current_timer_idx = chans[channel_idx].timer_idx;
+    bool current_in_use = is_timer_in_use(channel_idx, current_timer_idx);
+    if (current_in_use) {
+        timer_idx = find_timer(freq, SAME_FREQ_OR_FREE, CHANNEL_IDX_TO_MODE(channel_idx));
+    } else {
+        timer_idx = chans[channel_idx].timer_idx;
+    }
 
-    int timer_idx = find_timer(freq, SAME_FREQ_OR_FREE, CHANNEL_IDX_TO_MODE(channel_idx));
     if (timer_idx == -1) {
         timer_idx = find_timer(freq, SAME_FREQ_OR_FREE, ANY_MODE);
     }
@@ -318,23 +527,24 @@ STATIC void mp_machine_pwm_init_helper(machine_pwm_obj_t *self,
     self->active = true;
 
     // Set timer frequency
-    set_freq(freq, &timers[timer_idx]);
+    set_freq(self, freq, &timers[timer_idx]);
 
     // Set duty cycle?
-    int duty = args[ARG_duty].u_int;
-    if (duty != -1) {
-        set_duty(self, duty);
-    }
-
-    // Reset the timer if low speed
-    if (self->mode == LEDC_LOW_SPEED_MODE) {
-        check_esp_err(ledc_timer_rst(self->mode, self->timer));
+    if (duty_u16 != -1) {
+        set_duty_u16(self, duty_u16);
+    } else if (duty_ns != -1) {
+        set_duty_ns(self, duty_ns);
+    } else if (duty != -1) {
+        set_duty_u10(self, duty);
+    } else if (self->duty_x == 0) {
+        set_duty_u10(self, (1 << PWRES) / 2); // 50%
     }
 }
 
+// This called from PWM() constructor
 STATIC mp_obj_t mp_machine_pwm_make_new(const mp_obj_type_t *type,
     size_t n_args, size_t n_kw, const mp_obj_t *args) {
-    mp_arg_check_num(n_args, n_kw, 1, MP_OBJ_FUN_ARGS_MAX, true);
+    mp_arg_check_num(n_args, n_kw, 1, 2, true);
     gpio_num_t pin_id = machine_pin_get_id(args[0]);
 
     // create PWM object from the given pin
@@ -345,6 +555,7 @@ STATIC mp_obj_t mp_machine_pwm_make_new(const mp_obj_type_t *type,
     self->mode = -1;
     self->channel = -1;
     self->timer = -1;
+    self->duty_x = 0;
 
     // start the PWM subsystem if it's not already running
     if (!pwm_inited) {
@@ -360,47 +571,27 @@ STATIC mp_obj_t mp_machine_pwm_make_new(const mp_obj_type_t *type,
     return MP_OBJ_FROM_PTR(self);
 }
 
+// This called from pwm.deinit() method
 STATIC void mp_machine_pwm_deinit(machine_pwm_obj_t *self) {
-    int chan = CHANNEL_IDX(self->mode, self->channel);
-
-    // Valid channel?
-    if ((chan >= 0) && (chan < PWM_CHANNEL_MAX)) {
-        // Clean up timer if necessary
-        if (!is_timer_in_use(chan, chans[chan].timer_idx)) {
-            check_esp_err(ledc_timer_rst(self->mode, self->timer));
-            // Flag it unused
-            timers[chans[chan].timer_idx].freq_hz = -1;
-        }
-
-        // Mark it unused, and tell the hardware to stop routing
-        check_esp_err(ledc_stop(self->mode, chan, 0));
-        // Disable ledc signal for the pin
-        // gpio_matrix_out(self->pin, SIG_GPIO_OUT_IDX, false, false);
-        if (self->mode == LEDC_LOW_SPEED_MODE) {
-            gpio_matrix_out(self->pin, LEDC_LS_SIG_OUT0_IDX + self->channel, false, true);
-        } else {
-            #if LEDC_SPEED_MODE_MAX > 1
-            #if CONFIG_IDF_TARGET_ESP32
-            gpio_matrix_out(self->pin, LEDC_HS_SIG_OUT0_IDX + self->channel, false, true);
-            #else
-            #error Add supported CONFIG_IDF_TARGET_ESP32_xxx
-            #endif
-            #endif
-        }
-        chans[chan].pin = -1;
-        chans[chan].timer_idx = -1;
-        self->active = false;
-        self->mode = -1;
-        self->channel = -1;
-        self->timer = -1;
-    }
+    int channel_idx = CHANNEL_IDX(self->mode, self->channel);
+    pwm_deinit(channel_idx);
+    self->active = false;
+    self->mode = -1;
+    self->channel = -1;
+    self->timer = -1;
+    self->duty_x = 0;
 }
 
+// Set's and get's methods of PWM class
+
 STATIC mp_obj_t mp_machine_pwm_freq_get(machine_pwm_obj_t *self) {
     return MP_OBJ_NEW_SMALL_INT(ledc_get_freq(self->mode, self->timer));
 }
 
 STATIC void mp_machine_pwm_freq_set(machine_pwm_obj_t *self, mp_int_t freq) {
+    if ((freq <= 0) || (freq > 40000000)) {
+        mp_raise_ValueError(MP_ERROR_TEXT("freqency must be from 1Hz to 40MHz"));
+    }
     if (freq == timers[TIMER_IDX(self->mode, self->timer)].freq_hz) {
         return;
     }
@@ -441,19 +632,30 @@ STATIC void mp_machine_pwm_freq_set(machine_pwm_obj_t *self, mp_int_t freq) {
     self->mode = TIMER_IDX_TO_MODE(current_timer_idx);
     self->timer = TIMER_IDX_TO_TIMER(current_timer_idx);
 
-    // Set the freq
-    set_freq(freq, &timers[current_timer_idx]);
-
-    // Reset the timer if low speed
-    if (self->mode == LEDC_LOW_SPEED_MODE) {
-        check_esp_err(ledc_timer_rst(self->mode, self->timer));
-    }
+    // Set the frequency
+    set_freq(self, freq, &timers[current_timer_idx]);
 }
 
 STATIC mp_obj_t mp_machine_pwm_duty_get(machine_pwm_obj_t *self) {
-    return MP_OBJ_NEW_SMALL_INT(get_duty(self));
+    return MP_OBJ_NEW_SMALL_INT(get_duty_u10(self));
 }
 
 STATIC void mp_machine_pwm_duty_set(machine_pwm_obj_t *self, mp_int_t duty) {
-    set_duty(self, duty);
+    set_duty_u10(self, duty);
+}
+
+STATIC mp_obj_t mp_machine_pwm_duty_get_u16(machine_pwm_obj_t *self) {
+    return MP_OBJ_NEW_SMALL_INT(get_duty_u16(self));
+}
+
+STATIC void mp_machine_pwm_duty_set_u16(machine_pwm_obj_t *self, mp_int_t duty_u16) {
+    set_duty_u16(self, duty_u16);
+}
+
+STATIC mp_obj_t mp_machine_pwm_duty_get_ns(machine_pwm_obj_t *self) {
+    return MP_OBJ_NEW_SMALL_INT(get_duty_ns(self));
+}
+
+STATIC void mp_machine_pwm_duty_set_ns(machine_pwm_obj_t *self, mp_int_t duty_ns) {
+    set_duty_ns(self, duty_ns);
 }
diff --git a/ports/esp32/main.c b/ports/esp32/main.c
index c1728e3182e42..4920180b23512 100644
--- a/ports/esp32/main.c
+++ b/ports/esp32/main.c
@@ -193,6 +193,8 @@ void mp_task(void *pvParameter) {
     mp_hal_stdout_tx_str("MPY: soft reboot\r\n");
 
     // deinitialise peripherals
+    machine_pwm_deinit_all();
+    // TODO: machine_rmt_deinit_all();
     machine_pins_deinit();
     machine_deinit();
     usocket_events_deinit();
diff --git a/ports/esp32/modmachine.h b/ports/esp32/modmachine.h
index afc2ab07f4e4e..c773f8dbc9b3d 100644
--- a/ports/esp32/modmachine.h
+++ b/ports/esp32/modmachine.h
@@ -26,6 +26,8 @@ void machine_init(void);
 void machine_deinit(void);
 void machine_pins_init(void);
 void machine_pins_deinit(void);
+void machine_pwm_deinit_all(void);
+// TODO: void machine_rmt_deinit_all(void);
 void machine_timer_deinit_all(void);
 void machine_i2s_init0();
 
diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h
index 52949c5348be5..e49c97ab1d2d1 100644
--- a/ports/esp32/mpconfigport.h
+++ b/ports/esp32/mpconfigport.h
@@ -165,6 +165,7 @@
 #define MICROPY_PY_MACHINE_PWM              (1)
 #define MICROPY_PY_MACHINE_PWM_INIT         (1)
 #define MICROPY_PY_MACHINE_PWM_DUTY         (1)
+#define MICROPY_PY_MACHINE_PWM_DUTY_U16_NS  (1)
 #define MICROPY_PY_MACHINE_PWM_INCLUDEFILE  "ports/esp32/machine_pwm.c"
 #define MICROPY_PY_MACHINE_I2C              (1)
 #define MICROPY_PY_MACHINE_SOFTI2C          (1)

From 3770fab33449a5dadf8eb06edfae0767e75320a6 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Wed, 8 Dec 2021 16:40:08 +1100
Subject: [PATCH 1467/3533] all: Update Python formatting to latest Black
 version 21.12b0.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 extmod/uasyncio/event.py     | 1 -
 ports/stm32/make-stmconst.py | 1 -
 tests/extmod/utimeq1.py      | 1 -
 tools/pydfu.py               | 1 -
 4 files changed, 4 deletions(-)

diff --git a/extmod/uasyncio/event.py b/extmod/uasyncio/event.py
index c28ad1fb31687..1954c80f54aca 100644
--- a/extmod/uasyncio/event.py
+++ b/extmod/uasyncio/event.py
@@ -57,6 +57,5 @@ async def wait(self):
                 yield core._io_queue.queue_read(self)
             self._flag = 0
 
-
 except ImportError:
     pass
diff --git a/ports/stm32/make-stmconst.py b/ports/stm32/make-stmconst.py
index 602bdc6c192d7..217a801a8f658 100644
--- a/ports/stm32/make-stmconst.py
+++ b/ports/stm32/make-stmconst.py
@@ -17,7 +17,6 @@
     def convert_bytes_to_str(b):
         return b
 
-
 elif platform.python_version_tuple()[0] == "3":
 
     def convert_bytes_to_str(b):
diff --git a/tests/extmod/utimeq1.py b/tests/extmod/utimeq1.py
index 234d7a31dd4a5..ddbc969afb29c 100644
--- a/tests/extmod/utimeq1.py
+++ b/tests/extmod/utimeq1.py
@@ -17,7 +17,6 @@
     def dprint(*v):
         print(*v)
 
-
 else:
 
     def dprint(*v):
diff --git a/tools/pydfu.py b/tools/pydfu.py
index ea658d300bf38..f2d845a70b34b 100755
--- a/tools/pydfu.py
+++ b/tools/pydfu.py
@@ -84,7 +84,6 @@
     def get_string(dev, index):
         return usb.util.get_string(dev, 255, index)
 
-
 else:
     # PyUSB 1.0.0.b2 dropped the length argument
     def get_string(dev, index):

From 71168ec55c4059ecfe44b0be166248ce0b7935b5 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 9 Dec 2021 12:38:26 +1100
Subject: [PATCH 1468/3533] unix/coverage: Change remaining printf to
 mp_printf.

For consistency with all other prints in this file, so that the ordering
of output is correct.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/unix/coverage.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ports/unix/coverage.c b/ports/unix/coverage.c
index d5b5d8dd767fe..6b00cdfef2d23 100644
--- a/ports/unix/coverage.c
+++ b/ports/unix/coverage.c
@@ -153,7 +153,7 @@ STATIC void pairheap_test(size_t nops, int *ops) {
         mp_pairheap_init_node(pairheap_lt, &node[i]);
     }
     mp_pairheap_t *heap = mp_pairheap_new(pairheap_lt);
-    printf("create:");
+    mp_printf(&mp_plat_print, "create:");
     for (size_t i = 0; i < nops; ++i) {
         if (ops[i] >= 0) {
             heap = mp_pairheap_push(pairheap_lt, heap, &node[ops[i]]);
@@ -167,13 +167,13 @@ STATIC void pairheap_test(size_t nops, int *ops) {
             ;
         }
     }
-    printf("\npop all:");
+    mp_printf(&mp_plat_print, "\npop all:");
     while (!mp_pairheap_is_empty(pairheap_lt, heap)) {
         mp_printf(&mp_plat_print, " %d", mp_pairheap_peek(pairheap_lt, heap) - &node[0]);
         ;
         heap = mp_pairheap_pop(pairheap_lt, heap);
     }
-    printf("\n");
+    mp_printf(&mp_plat_print, "\n");
 }
 
 // function to run extra tests for things that can't be checked by scripts

From efde4b2c756033715919ec80084f3399e8d16921 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 9 Dec 2021 12:52:27 +1100
Subject: [PATCH 1469/3533] extmod/modure: Redirect regex debug printing to
 mp_printf.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/modure.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/extmod/modure.c b/extmod/modure.c
index 738a2b9843ee6..36c987a80dc16 100644
--- a/extmod/modure.c
+++ b/extmod/modure.c
@@ -454,11 +454,16 @@ const mp_obj_module_t mp_module_ure = {
 // only if module is enabled by config setting.
 
 #define re1_5_fatal(x) assert(!x)
+
 #include "lib/re1.5/compilecode.c"
+#include "lib/re1.5/recursiveloop.c"
+#include "lib/re1.5/charclass.c"
+
 #if MICROPY_PY_URE_DEBUG
+// Make sure the output print statements go to the same output as other Python output.
+#define printf(...) mp_printf(&mp_plat_print, __VA_ARGS__)
 #include "lib/re1.5/dumpcode.c"
+#undef printf
 #endif
-#include "lib/re1.5/recursiveloop.c"
-#include "lib/re1.5/charclass.c"
 
 #endif // MICROPY_PY_URE

From 9ffb1ad2f83b2147cc4dc6385713aab1d4242ded Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 9 Dec 2021 12:53:09 +1100
Subject: [PATCH 1470/3533] unix/Makefile: Use -Og instead of -O0 for debug
 builds.

For the coverage build this reduces the binary size to about 1/4 of its
size, and seems to help gcov/lcov coverage analysis so that it doesn't miss
lines.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/unix/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/unix/Makefile b/ports/unix/Makefile
index 60e37ade0a737..f829838ab31f7 100644
--- a/ports/unix/Makefile
+++ b/ports/unix/Makefile
@@ -44,7 +44,7 @@ CFLAGS += $(INC) $(CWARN) -std=gnu99 -DUNIX $(CFLAGS_MOD) $(COPT) -I$(VARIANT_DI
 
 # Debugging/Optimization
 ifdef DEBUG
-COPT ?= -O0
+COPT ?= -Og
 else
 COPT ?= -Os
 COPT += -DNDEBUG

From 67f66795c05f729ff1ca39f1d41461807c14c824 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sun, 5 Dec 2021 09:20:04 +1100
Subject: [PATCH 1471/3533] tools/mpremote: Implement seek and flush in ioctl
 method.

Fixes issue #8058.

Signed-off-by: Damien George <damien@micropython.org>
---
 tools/mpremote/mpremote/pyboardextended.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/tools/mpremote/mpremote/pyboardextended.py b/tools/mpremote/mpremote/pyboardextended.py
index ccd3098e3824c..70e3748ec810a 100644
--- a/tools/mpremote/mpremote/pyboardextended.py
+++ b/tools/mpremote/mpremote/pyboardextended.py
@@ -142,7 +142,13 @@ def __exit__(self, a, b, c):
         self.close()
 
     def ioctl(self, request, arg):
-        if request == 4:  # CLOSE
+        if request == 1:  # FLUSH
+            self.flush()
+        elif request == 2:  # SEEK
+            # This assumes a 32-bit bare-metal machine.
+            import machine
+            machine.mem32[arg] = self.seek(machine.mem32[arg], machine.mem32[arg + 4])
+        elif request == 4:  # CLOSE
             self.close()
         return 0
 

From 92f54fe8d9618dd5e6101ac5c5f83ffc53b1bc57 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Wed, 1 Dec 2021 19:02:22 +1100
Subject: [PATCH 1472/3533] stm32/boards/NUCLEO_WB55: Fix LED ordering.

These were commented correctly by their colour, but in the wrong order with
respect to the PCB silkscreen.

Fixes issue #8054.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/stm32/boards/NUCLEO_WB55/mpconfigboard.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/stm32/boards/NUCLEO_WB55/mpconfigboard.h b/ports/stm32/boards/NUCLEO_WB55/mpconfigboard.h
index a7473b9d6a9d4..19b911a2ea704 100644
--- a/ports/stm32/boards/NUCLEO_WB55/mpconfigboard.h
+++ b/ports/stm32/boards/NUCLEO_WB55/mpconfigboard.h
@@ -51,9 +51,9 @@
 #define MICROPY_HW_USRSW_PRESSED    (0)
 
 // LEDs
-#define MICROPY_HW_LED1             (pin_B1) // red
+#define MICROPY_HW_LED1             (pin_B5) // blue
 #define MICROPY_HW_LED2             (pin_B0) // green
-#define MICROPY_HW_LED3             (pin_B5) // blue
+#define MICROPY_HW_LED3             (pin_B1) // red
 #define MICROPY_HW_LED_ON(pin)      (mp_hal_pin_high(pin))
 #define MICROPY_HW_LED_OFF(pin)     (mp_hal_pin_low(pin))
 

From c613f5bb49bd83137c11912260c7691f4b284a90 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 9 Dec 2021 16:51:35 +1100
Subject: [PATCH 1473/3533] stm32/boards/LEGO_HUB_NO6: Set filesystem label as
 HUB_NO6.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/boards/LEGO_HUB_NO6/mpconfigboard.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/stm32/boards/LEGO_HUB_NO6/mpconfigboard.h b/ports/stm32/boards/LEGO_HUB_NO6/mpconfigboard.h
index b3e061efb72b3..188cd67af5c83 100644
--- a/ports/stm32/boards/LEGO_HUB_NO6/mpconfigboard.h
+++ b/ports/stm32/boards/LEGO_HUB_NO6/mpconfigboard.h
@@ -18,6 +18,7 @@
 #define MICROPY_HW_ENABLE_RNG                    (1)
 #define MICROPY_HW_ENABLE_DAC                    (1)
 #define MICROPY_HW_ENABLE_USB                    (1)
+#define MICROPY_HW_FLASH_FS_LABEL                "HUB_NO6"
 
 // HSE is 16MHz, CPU freq set to 100MHz, buses at maximum freq
 #define MICROPY_HW_CLK_PLLM                      (16)

From 3f589e2f39aeb6734962c2eadb3da8a2ca2f65c8 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 10 Dec 2021 21:26:08 +1100
Subject: [PATCH 1474/3533] tools/autobuild: Automatically build all esp32
 boards.

Any board with a board.json file will be built.  ESP32-based boards will be
built using the IDF at $IDF_PATH_V42, all other MCU variants (S2, S3, C3)
will be built using the IDF at $IDF_PATH_V44.

Signed-off-by: Damien George <damien@micropython.org>
---
 tools/autobuild/autobuild.sh          | 11 ++-
 tools/autobuild/build-boards.sh       | 98 +++++++++++++++++++++------
 tools/autobuild/build-esp32-latest.sh | 54 ---------------
 3 files changed, 83 insertions(+), 80 deletions(-)
 delete mode 100755 tools/autobuild/build-esp32-latest.sh

diff --git a/tools/autobuild/autobuild.sh b/tools/autobuild/autobuild.sh
index 1532c9820feb8..6ac97373f3acc 100755
--- a/tools/autobuild/autobuild.sh
+++ b/tools/autobuild/autobuild.sh
@@ -5,7 +5,7 @@
 # Requirements:
 # - All toolchains must be in path (arm-none-eabi-gcc, xtensa-lx106-elf)
 # - IDF_PATH_V42 must be set
-# - IDF_PATH_V43 must be set
+# - IDF_PATH_V44 must be set
 # - MICROPY_AUTOBUILD_MICROPYTHON_REPO must be set to location of micropython repository
 # - MICROPY_AUTOBUILD_MAKE must be set to the make command to use, eg "make -j2"
 #
@@ -18,8 +18,8 @@ if [ ! -d "$IDF_PATH_V42" ]; then
     exit 1
 fi
 
-if [ ! -d "$IDF_PATH_V43" ]; then
-    echo "must set IDF_PATH_V43"
+if [ ! -d "$IDF_PATH_V44" ]; then
+    echo "must set IDF_PATH_V44"
     exit 1
 fi
 
@@ -70,9 +70,8 @@ ${AUTODIR}/build-cc3200-latest.sh ${FW_TAG} ${LOCAL_FIRMWARE}
 cd ../esp8266
 ${AUTODIR}/build-esp8266-latest.sh ${FW_TAG} ${LOCAL_FIRMWARE}
 cd ../esp32
-${AUTODIR}/build-esp32-latest.sh ${IDF_PATH_V42} ${FW_TAG} ${LOCAL_FIRMWARE}
-${AUTODIR}/build-esp32-latest.sh ${IDF_PATH_V43} ${FW_TAG} ${LOCAL_FIRMWARE}
-
+(source ${IDF_PATH_V42}/export.sh && build_esp32_boards ${FW_TAG} ${LOCAL_FIRMWARE})
+(source ${IDF_PATH_V44}/export.sh && build_esp32_boards ${FW_TAG} ${LOCAL_FIRMWARE})
 cd ../mimxrt
 build_mimxrt_boards ${FW_TAG} ${LOCAL_FIRMWARE}
 cd ../rp2
diff --git a/tools/autobuild/build-boards.sh b/tools/autobuild/build-boards.sh
index bb5d8d344e0e1..4b5259b667ab6 100755
--- a/tools/autobuild/build-boards.sh
+++ b/tools/autobuild/build-boards.sh
@@ -6,53 +6,111 @@
 #   $ source build-boards.sh
 #   $ MICROPY_AUTOBUILD_MAKE=make build_rp2_boards -latest /tmp
 
-function build_boards {
+function build_board {
     # check/get parameters
     if [ $# -lt 4 ]; then
-        echo "usage: $0 <fw-tag> <dest-dir> <check-file> <exts...>"
+        echo "usage: $0 <board-json-file> <fw-tag> <dest-dir> <exts...>"
         return 1
     fi
 
-    fw_tag=$1
-    dest_dir=$2
-    check_file=$3
+    board_json=$1
+    fw_tag=$2
+    dest_dir=$3
     shift
     shift
     shift
 
+    board=$(echo $board_json | awk -F '/' '{ print $2 }')
+    descr=$(cat $board_json | python3 -c "import json,sys; print(json.load(sys.stdin).get('id', '$board'))")
+    build_dir=/tmp/micropython-build-$board
+
+    echo "building $descr $board"
+    $MICROPY_AUTOBUILD_MAKE BOARD=$board BUILD=$build_dir && (
+        for ext in $@; do
+            dest=$dest_dir/$descr$fw_tag.$ext
+            if [ -r $build_dir/firmware.$ext ]; then
+                mv $build_dir/firmware.$ext $dest
+            else
+                # esp32 has micropython.elf and micropython.map
+                mv $build_dir/micropython.$ext $dest
+            fi
+        done
+    )
+    rm -rf $build_dir
+}
+
+function build_boards {
+    # check/get parameters
+    if [ $# -lt 4 ]; then
+        echo "usage: $0 <check-file> <fw-tag> <dest-dir> <exts...>"
+        return 1
+    fi
+
+    check_file=$1
+    shift
+
     # check we are in the correct directory
     if [ ! -r $check_file ]; then
         echo "must be in directory containing $check_file"
         return 1
     fi
 
+    # build all boards that have a board.json file
+    for board_json in $(find boards/ -name board.json | sort); do
+        build_board $board_json $@
+    done
+}
+
+function build_esp32_boards {
+    # check/get parameters
+    if [ $# != 2 ]; then
+        echo "usage: $0 <fw-tag> <dest-dir>"
+        return 1
+    fi
+
+    fw_tag=$1
+    dest_dir=$2
+
+    # check we are in the correct directory
+    if [ ! -r modesp32.c ]; then
+        echo "must be in esp32 directory"
+        return 1
+    fi
+
+    # build the boards, based on the IDF version
     for board_json in $(find boards/ -name board.json | sort); do
-        board=$(echo $board_json | awk -F '/' '{ print $2 }')
-        descr=$(cat $board_json | python3 -c "import json,sys; print(json.load(sys.stdin).get('id', '$board'))")
-        build_dir=/tmp/micropython-build-$board
-
-        echo "building $descr $board"
-        $MICROPY_AUTOBUILD_MAKE BOARD=$board BUILD=$build_dir && (
-            for ext in $@; do
-                mv $build_dir/firmware.$ext $dest_dir/$descr$fw_tag.$ext
-            done
-        )
-        rm -rf $build_dir
+        mcu=$(cat $board_json | python3 -c "import json,sys; print(json.load(sys.stdin).get('mcu', 'unknown'))")
+        if idf.py --version | grep -q v4.2; then
+            if [ $mcu = esp32 ]; then
+                # build standard esp32-based boards with IDF v4.2
+                if echo $board_json | grep -q GENERIC; then
+                    # traditionally, GENERIC and GENERIC_SPIRAM boards used manifest_release.py
+                    MICROPY_AUTOBUILD_MAKE="$MICROPY_AUTOBUILD_MAKE FROZEN_MANIFEST=$(pwd)/boards/manifest_release.py" build_board $board_json $fw_tag $dest_dir bin elf map
+                else
+                    build_board $board_json $fw_tag $dest_dir bin elf map
+                fi
+            fi
+        else
+            if [ $mcu != esp32 ]; then
+                # build esp32-s2/s3/c3 based boards with IDF v4.4+
+                build_board $board_json $fw_tag $dest_dir bin elf map
+            fi
+        fi
     done
 }
 
 function build_mimxrt_boards {
-    build_boards $1 $2 modmimxrt.c bin hex
+    build_boards modmimxrt.c $1 $2 bin hex
 }
 
 function build_rp2_boards {
-    build_boards $1 $2 modrp2.c uf2
+    build_boards modrp2.c $1 $2 uf2
 }
 
 function build_samd_boards {
-    build_boards $1 $2 samd_soc.c uf2
+    build_boards samd_soc.c $1 $2 uf2
 }
 
 function build_stm32_boards {
-    build_boards $1 $2 modpyb.c dfu hex
+    build_boards modpyb.c $1 $2 dfu hex
 }
diff --git a/tools/autobuild/build-esp32-latest.sh b/tools/autobuild/build-esp32-latest.sh
deleted file mode 100755
index e0e932e026a95..0000000000000
--- a/tools/autobuild/build-esp32-latest.sh
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/bash
-#
-# Build esp32 port
-
-# for debugging
-#exec &> /tmp/esp-log-$$.txt
-
-# function for building firmware
-function do_build() {
-    descr=$1
-    board=$2
-    shift
-    shift
-    echo "building $descr $board"
-    build_dir=/tmp/esp32-build-$board
-    rm -rf $build_dir # be sure we don't have anything leftover from a previous build
-    make $@ BOARD=$board BUILD=$build_dir || exit 1
-    mv $build_dir/firmware.bin $dest_dir/$descr$fw_tag.bin
-    mv $build_dir/micropython.elf $dest_dir/$descr$fw_tag.elf
-    mv $build_dir/micropython.map $dest_dir/$descr$fw_tag.map
-    rm -rf $build_dir
-}
-
-# check/get parameters
-if [ $# != 3 ]; then
-    echo "usage: $0 <idf-path> <fw-tag> <dest-dir>"
-    exit 1
-fi
-
-idf_path=$1
-fw_tag=$2
-dest_dir=$3
-
-# check we are in the correct directory
-if [ ! -r modesp32.c ]; then
-    echo "must be in esp32 directory"
-    exit 1
-fi
-
-source $idf_path/export.sh
-
-# build the boards, based on the IDF version
-if idf.py --version | grep -q v4.2; then
-    do_build esp32 GENERIC FROZEN_MANIFEST=$(pwd)/boards/manifest_release.py
-    do_build esp32spiram GENERIC_SPIRAM FROZEN_MANIFEST=$(pwd)/boards/manifest_release.py
-    do_build tinypico UM_TINYPICO
-    do_build wesp32 SIL_WESP32
-else
-    do_build esp32c3 GENERIC_C3
-    do_build esp32c3usb GENERIC_C3_USB
-    do_build tinys2 UM_TINYS2
-    do_build featherS2 UM_FEATHERS2
-    do_build featherS2neo UM_FEATHERS2NEO
-fi

From 10c6f03cbef1c8af687c37c7b5e04b5f1db8b6aa Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 10 Dec 2021 23:15:25 +1100
Subject: [PATCH 1475/3533] stm32/boards: Remove stray '+' characters at start
 of lines in ld files.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/boards/stm32f413xg.ld | 14 +++++++-------
 ports/stm32/boards/stm32f413xh.ld | 14 +++++++-------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/ports/stm32/boards/stm32f413xg.ld b/ports/stm32/boards/stm32f413xg.ld
index 2df46f2b59ddb..cecfcaa881121 100644
--- a/ports/stm32/boards/stm32f413xg.ld
+++ b/ports/stm32/boards/stm32f413xg.ld
@@ -29,10 +29,10 @@ _ram_end = ORIGIN(RAM) + LENGTH(RAM);
 _heap_start = _ebss; /* heap starts just after statically allocated memory */
 _heap_end = _sstack;
 
-+/* Filesystem cache in RAM, and storage in flash */
-+_micropy_hw_internal_flash_storage_ram_cache_start = ORIGIN(SRAM2);
-+_micropy_hw_internal_flash_storage_ram_cache_end = ORIGIN(SRAM2) + LENGTH(SRAM2);
-+_micropy_hw_internal_flash_storage_start = ORIGIN(FLASH_FS);
-+_micropy_hw_internal_flash_storage_end = ORIGIN(FLASH_FS) + LENGTH(FLASH_FS);
-+_micropy_hw_internal_flash_storage2_start = ORIGIN(FLASH_FS2);
-+_micropy_hw_internal_flash_storage2_end = ORIGIN(FLASH_FS2) + LENGTH(FLASH_FS2);
+/* Filesystem cache in RAM, and storage in flash */
+_micropy_hw_internal_flash_storage_ram_cache_start = ORIGIN(SRAM2);
+_micropy_hw_internal_flash_storage_ram_cache_end = ORIGIN(SRAM2) + LENGTH(SRAM2);
+_micropy_hw_internal_flash_storage_start = ORIGIN(FLASH_FS);
+_micropy_hw_internal_flash_storage_end = ORIGIN(FLASH_FS) + LENGTH(FLASH_FS);
+_micropy_hw_internal_flash_storage2_start = ORIGIN(FLASH_FS2);
+_micropy_hw_internal_flash_storage2_end = ORIGIN(FLASH_FS2) + LENGTH(FLASH_FS2);
diff --git a/ports/stm32/boards/stm32f413xh.ld b/ports/stm32/boards/stm32f413xh.ld
index 0512a3f056137..0846b5c80fc09 100644
--- a/ports/stm32/boards/stm32f413xh.ld
+++ b/ports/stm32/boards/stm32f413xh.ld
@@ -29,10 +29,10 @@ _ram_end = ORIGIN(RAM) + LENGTH(RAM);
 _heap_start = _ebss; /* heap starts just after statically allocated memory */
 _heap_end = _sstack;
 
-+/* Filesystem cache in RAM, and storage in flash */
-+_micropy_hw_internal_flash_storage_ram_cache_start = ORIGIN(SRAM2);
-+_micropy_hw_internal_flash_storage_ram_cache_end = ORIGIN(SRAM2) + LENGTH(SRAM2);
-+_micropy_hw_internal_flash_storage_start = ORIGIN(FLASH_FS);
-+_micropy_hw_internal_flash_storage_end = ORIGIN(FLASH_FS) + LENGTH(FLASH_FS);
-+_micropy_hw_internal_flash_storage2_start = ORIGIN(FLASH_FS2);
-+_micropy_hw_internal_flash_storage2_end = ORIGIN(FLASH_FS2) + LENGTH(FLASH_FS2);
+/* Filesystem cache in RAM, and storage in flash */
+_micropy_hw_internal_flash_storage_ram_cache_start = ORIGIN(SRAM2);
+_micropy_hw_internal_flash_storage_ram_cache_end = ORIGIN(SRAM2) + LENGTH(SRAM2);
+_micropy_hw_internal_flash_storage_start = ORIGIN(FLASH_FS);
+_micropy_hw_internal_flash_storage_end = ORIGIN(FLASH_FS) + LENGTH(FLASH_FS);
+_micropy_hw_internal_flash_storage2_start = ORIGIN(FLASH_FS2);
+_micropy_hw_internal_flash_storage2_end = ORIGIN(FLASH_FS2) + LENGTH(FLASH_FS2);

From 5fc55999b2b454400c5efa8339239b19c802c9d2 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 10 Dec 2021 23:19:00 +1100
Subject: [PATCH 1476/3533] stm32/boards: Remove unused MICROPY_HW_ENABLE_TIMER
 config.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/boards/NUCLEO_F091RC/mpconfigboard.h  | 1 -
 ports/stm32/boards/NUCLEO_L432KC/mpconfigboard.h  | 1 -
 ports/stm32/boards/PYBD_SF2/mpconfigboard.h       | 1 -
 ports/stm32/boards/STM32L496GDISC/mpconfigboard.h | 1 -
 4 files changed, 4 deletions(-)

diff --git a/ports/stm32/boards/NUCLEO_F091RC/mpconfigboard.h b/ports/stm32/boards/NUCLEO_F091RC/mpconfigboard.h
index a0bff59961c18..7df86d75fd087 100644
--- a/ports/stm32/boards/NUCLEO_F091RC/mpconfigboard.h
+++ b/ports/stm32/boards/NUCLEO_F091RC/mpconfigboard.h
@@ -13,7 +13,6 @@
 #define MICROPY_HW_ENABLE_RTC       (1)
 #define MICROPY_HW_ENABLE_ADC       (1)
 #define MICROPY_HW_ENABLE_DAC       (1)
-#define MICROPY_HW_ENABLE_TIMER     (1)
 #define MICROPY_HW_HAS_SWITCH       (1)
 
 // For system clock, enable one source:
diff --git a/ports/stm32/boards/NUCLEO_L432KC/mpconfigboard.h b/ports/stm32/boards/NUCLEO_L432KC/mpconfigboard.h
index 8b3a8f38b10f4..ce9de3c4dd188 100644
--- a/ports/stm32/boards/NUCLEO_L432KC/mpconfigboard.h
+++ b/ports/stm32/boards/NUCLEO_L432KC/mpconfigboard.h
@@ -17,7 +17,6 @@
 #define MICROPY_HW_ENABLE_ADC       (1)
 #define MICROPY_HW_ENABLE_DAC       (1)
 #define MICROPY_HW_ENABLE_USB       (0) // requires a custom USB connector on PA11/PA12
-#define MICROPY_HW_ENABLE_TIMER     (1)
 #define MICROPY_HW_HAS_SWITCH       (0)
 #define MICROPY_HW_HAS_FLASH        (1)
 
diff --git a/ports/stm32/boards/PYBD_SF2/mpconfigboard.h b/ports/stm32/boards/PYBD_SF2/mpconfigboard.h
index 4afa037c4cbcb..ea0abc6ea5236 100644
--- a/ports/stm32/boards/PYBD_SF2/mpconfigboard.h
+++ b/ports/stm32/boards/PYBD_SF2/mpconfigboard.h
@@ -33,7 +33,6 @@
 #define MICROPY_HW_HAS_FLASH        (1)
 #define MICROPY_HW_ENABLE_RNG       (1)
 #define MICROPY_HW_ENABLE_RTC       (1)
-#define MICROPY_HW_ENABLE_TIMER     (1)
 #define MICROPY_HW_ENABLE_SERVO     (1)
 #define MICROPY_HW_ENABLE_DAC       (1)
 #define MICROPY_HW_ENABLE_USB       (1)
diff --git a/ports/stm32/boards/STM32L496GDISC/mpconfigboard.h b/ports/stm32/boards/STM32L496GDISC/mpconfigboard.h
index d4d78454af7ee..944d6ecd554db 100644
--- a/ports/stm32/boards/STM32L496GDISC/mpconfigboard.h
+++ b/ports/stm32/boards/STM32L496GDISC/mpconfigboard.h
@@ -4,7 +4,6 @@
 #define MICROPY_HW_HAS_SWITCH       (1)
 #define MICROPY_HW_ENABLE_RNG       (1)
 #define MICROPY_HW_ENABLE_RTC       (1)
-#define MICROPY_HW_ENABLE_TIMER     (1)
 #define MICROPY_HW_ENABLE_USB       (1)
 
 // MSI is used and is 4MHz,

From 0892ebe09105185a2e9bc97a7047187b4d141270 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 10 Dec 2021 23:19:20 +1100
Subject: [PATCH 1477/3533] stm32/boards: Enable MICROPY_HW_ENABLE_SERVO on
 various boards.

Fixes issue #8059.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/boards/NUCLEO_F401RE/mpconfigboard.h | 1 +
 ports/stm32/boards/NUCLEO_F411RE/mpconfigboard.h | 1 +
 ports/stm32/boards/NUCLEO_F412ZG/mpconfigboard.h | 1 +
 ports/stm32/boards/NUCLEO_F413ZH/mpconfigboard.h | 1 +
 ports/stm32/boards/NUCLEO_F429ZI/mpconfigboard.h | 1 +
 ports/stm32/boards/NUCLEO_F439ZI/mpconfigboard.h | 1 +
 ports/stm32/boards/NUCLEO_F446RE/mpconfigboard.h | 1 +
 ports/stm32/boards/STM32F429DISC/mpconfigboard.h | 1 +
 ports/stm32/boards/STM32F439/mpconfigboard.h     | 1 +
 ports/stm32/boards/STM32F4DISC/mpconfigboard.h   | 1 +
 ports/stm32/boards/STM32F769DISC/mpconfigboard.h | 1 +
 11 files changed, 11 insertions(+)

diff --git a/ports/stm32/boards/NUCLEO_F401RE/mpconfigboard.h b/ports/stm32/boards/NUCLEO_F401RE/mpconfigboard.h
index 6b874e298c1bb..8dda34f4a06b2 100644
--- a/ports/stm32/boards/NUCLEO_F401RE/mpconfigboard.h
+++ b/ports/stm32/boards/NUCLEO_F401RE/mpconfigboard.h
@@ -4,6 +4,7 @@
 #define MICROPY_HW_HAS_SWITCH       (1)
 #define MICROPY_HW_HAS_FLASH        (1)
 #define MICROPY_HW_ENABLE_RTC       (1)
+#define MICROPY_HW_ENABLE_SERVO     (1)
 
 // HSE is 8MHz, HSI is 16MHz CPU freq set to 84MHz
 // Default source for the clock is HSI.
diff --git a/ports/stm32/boards/NUCLEO_F411RE/mpconfigboard.h b/ports/stm32/boards/NUCLEO_F411RE/mpconfigboard.h
index e37ce889c38b0..a883ffb3e7802 100644
--- a/ports/stm32/boards/NUCLEO_F411RE/mpconfigboard.h
+++ b/ports/stm32/boards/NUCLEO_F411RE/mpconfigboard.h
@@ -4,6 +4,7 @@
 #define MICROPY_HW_HAS_SWITCH       (1)
 #define MICROPY_HW_HAS_FLASH        (1)
 #define MICROPY_HW_ENABLE_RTC       (1)
+#define MICROPY_HW_ENABLE_SERVO     (1)
 
 // HSE is 8MHz, CPU freq set to 96MHz
 #define MICROPY_HW_CLK_PLLM (8)
diff --git a/ports/stm32/boards/NUCLEO_F412ZG/mpconfigboard.h b/ports/stm32/boards/NUCLEO_F412ZG/mpconfigboard.h
index 2a557f1350885..df661985d91c2 100644
--- a/ports/stm32/boards/NUCLEO_F412ZG/mpconfigboard.h
+++ b/ports/stm32/boards/NUCLEO_F412ZG/mpconfigboard.h
@@ -6,6 +6,7 @@
 #define MICROPY_HW_ENABLE_RNG       (1)
 #define MICROPY_HW_ENABLE_RTC       (1)
 #define MICROPY_HW_ENABLE_USB       (1)
+#define MICROPY_HW_ENABLE_SERVO     (1)
 
 // HSE is 8MHz, CPU freq set to 96MHz
 #define MICROPY_HW_CLK_PLLM         (8)
diff --git a/ports/stm32/boards/NUCLEO_F413ZH/mpconfigboard.h b/ports/stm32/boards/NUCLEO_F413ZH/mpconfigboard.h
index a357c99267b8e..621132137ac63 100644
--- a/ports/stm32/boards/NUCLEO_F413ZH/mpconfigboard.h
+++ b/ports/stm32/boards/NUCLEO_F413ZH/mpconfigboard.h
@@ -9,6 +9,7 @@
 #define MICROPY_HW_ENABLE_RTC       (1)
 #define MICROPY_HW_ENABLE_DAC       (1)
 #define MICROPY_HW_ENABLE_USB       (1)
+#define MICROPY_HW_ENABLE_SERVO     (1)
 
 // HSE is 8MHz, CPU freq set to 96MHz
 #define MICROPY_HW_CLK_PLLM (8)
diff --git a/ports/stm32/boards/NUCLEO_F429ZI/mpconfigboard.h b/ports/stm32/boards/NUCLEO_F429ZI/mpconfigboard.h
index 86c02b517879a..76f075546c452 100644
--- a/ports/stm32/boards/NUCLEO_F429ZI/mpconfigboard.h
+++ b/ports/stm32/boards/NUCLEO_F429ZI/mpconfigboard.h
@@ -6,6 +6,7 @@
 #define MICROPY_HW_ENABLE_RNG       (1)
 #define MICROPY_HW_ENABLE_RTC       (1)
 #define MICROPY_HW_ENABLE_USB       (1)
+#define MICROPY_HW_ENABLE_SERVO     (1)
 
 // HSE is 8MHz
 #define MICROPY_HW_CLK_PLLM (8)
diff --git a/ports/stm32/boards/NUCLEO_F439ZI/mpconfigboard.h b/ports/stm32/boards/NUCLEO_F439ZI/mpconfigboard.h
index 7763bd73ef23b..4d5050b1bf94b 100644
--- a/ports/stm32/boards/NUCLEO_F439ZI/mpconfigboard.h
+++ b/ports/stm32/boards/NUCLEO_F439ZI/mpconfigboard.h
@@ -8,6 +8,7 @@
 #define MICROPY_HW_ENABLE_RNG       (1)
 #define MICROPY_HW_ENABLE_RTC       (1)
 #define MICROPY_HW_ENABLE_USB       (1)
+#define MICROPY_HW_ENABLE_SERVO     (1)
 
 // HSE is 8MHz from ST-LINK, in bypass mode, run SYSCLK at 168MHz
 #define MICROPY_HW_CLK_USE_BYPASS   (1)
diff --git a/ports/stm32/boards/NUCLEO_F446RE/mpconfigboard.h b/ports/stm32/boards/NUCLEO_F446RE/mpconfigboard.h
index 681231578e23d..88bfd39b41664 100644
--- a/ports/stm32/boards/NUCLEO_F446RE/mpconfigboard.h
+++ b/ports/stm32/boards/NUCLEO_F446RE/mpconfigboard.h
@@ -5,6 +5,7 @@
 #define MICROPY_HW_HAS_FLASH        (1)
 #define MICROPY_HW_ENABLE_RTC       (1)
 #define MICROPY_HW_ENABLE_DAC       (1)
+#define MICROPY_HW_ENABLE_SERVO     (1)
 
 // HSE is 8MHz, CPU freq set to 168MHz. Using PLLQ for USB this gives a nice
 // 48 MHz clock for USB. To goto 180 MHz, I think that USB would need to be
diff --git a/ports/stm32/boards/STM32F429DISC/mpconfigboard.h b/ports/stm32/boards/STM32F429DISC/mpconfigboard.h
index cfd9ef9d08ac1..bae6ae255247d 100644
--- a/ports/stm32/boards/STM32F429DISC/mpconfigboard.h
+++ b/ports/stm32/boards/STM32F429DISC/mpconfigboard.h
@@ -6,6 +6,7 @@
 #define MICROPY_HW_ENABLE_RNG       (1)
 #define MICROPY_HW_ENABLE_RTC       (1)
 #define MICROPY_HW_ENABLE_USB       (1)
+#define MICROPY_HW_ENABLE_SERVO     (1)
 
 // HSE is 8MHz
 #define MICROPY_HW_CLK_PLLM (8)
diff --git a/ports/stm32/boards/STM32F439/mpconfigboard.h b/ports/stm32/boards/STM32F439/mpconfigboard.h
index 702ef265bb323..917ea89481006 100644
--- a/ports/stm32/boards/STM32F439/mpconfigboard.h
+++ b/ports/stm32/boards/STM32F439/mpconfigboard.h
@@ -6,6 +6,7 @@
 #define MICROPY_HW_ENABLE_RTC       (1)
 #define MICROPY_HW_ENABLE_DAC       (1)
 #define MICROPY_HW_ENABLE_USB       (1)
+#define MICROPY_HW_ENABLE_SERVO     (1)
 #define MICROPY_HW_ENABLE_SDCARD    (1) // works with no SD card too
 
 // SD card detect switch
diff --git a/ports/stm32/boards/STM32F4DISC/mpconfigboard.h b/ports/stm32/boards/STM32F4DISC/mpconfigboard.h
index 3b291ad7624e6..d4ecde17d8069 100644
--- a/ports/stm32/boards/STM32F4DISC/mpconfigboard.h
+++ b/ports/stm32/boards/STM32F4DISC/mpconfigboard.h
@@ -7,6 +7,7 @@
 #define MICROPY_HW_ENABLE_RTC       (1)
 #define MICROPY_HW_ENABLE_DAC       (1)
 #define MICROPY_HW_ENABLE_USB       (1)
+#define MICROPY_HW_ENABLE_SERVO     (1)
 
 // HSE is 8MHz
 #define MICROPY_HW_CLK_PLLM (8)
diff --git a/ports/stm32/boards/STM32F769DISC/mpconfigboard.h b/ports/stm32/boards/STM32F769DISC/mpconfigboard.h
index 981f17848f17b..8728d1b37e82a 100644
--- a/ports/stm32/boards/STM32F769DISC/mpconfigboard.h
+++ b/ports/stm32/boards/STM32F769DISC/mpconfigboard.h
@@ -10,6 +10,7 @@
 #define MICROPY_HW_ENABLE_RNG       (1)
 #define MICROPY_HW_ENABLE_RTC       (1)
 #define MICROPY_HW_ENABLE_USB       (1)
+#define MICROPY_HW_ENABLE_SERVO     (1)
 #define MICROPY_HW_ENABLE_SDCARD    (1)
 
 #define MICROPY_BOARD_EARLY_INIT    board_early_init

From a0f5b3148a5c276aa1abf7b77b0964eec80cda16 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 14 Dec 2021 00:25:58 +1100
Subject: [PATCH 1478/3533] lib/stm32lib: Update library for L4 v1.17.0, new
 G4, WL, and MMC fixes.

Changes in this new library version are:
- Update L4 HAL to v1.17.0.
- Add G4 HAL at v1.3.0.
- Add WL HAL at v1.1.0.
- Fix F4 UART and DMA data loss with RX hardware flow control.
- Optimise USB to pass config struct by reference.
- Fix bug in F4 MMC HAL_MMC_Erase function.
- Fix bug setting MMC relative address in F4 and F7 HAL.

Signed-off-by: Damien George <damien@micropython.org>
---
 lib/stm32lib | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/stm32lib b/lib/stm32lib
index 302c52794d2f5..1eebcda2c95d7 160000
--- a/lib/stm32lib
+++ b/lib/stm32lib
@@ -1 +1 @@
-Subproject commit 302c52794d2f579903f4e49cbad1f5d3a7f401ad
+Subproject commit 1eebcda2c95d7593c68e1c81f042d23485baab26

From 88ac5a3116d97f4b18f10b9a5855f008cffff6db Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 14 Dec 2021 00:00:35 +1100
Subject: [PATCH 1479/3533] stm32: Update L4 code to build with latest stm32lib
 and L4 HAL 1.17.0.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/Makefile                         | 7 ++++++-
 ports/stm32/adc.h                            | 4 +++-
 ports/stm32/boards/stm32l4xx_hal_conf_base.h | 9 ++++++---
 ports/stm32/machine_adc.c                    | 4 +++-
 ports/stm32/mphalport.h                      | 8 ++++++--
 ports/stm32/stm32_it.c                       | 4 +++-
 6 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/ports/stm32/Makefile b/ports/stm32/Makefile
index c3b281650afd8..c5f159102e64f 100644
--- a/ports/stm32/Makefile
+++ b/ports/stm32/Makefile
@@ -432,8 +432,13 @@ endif
 ifeq ($(CMSIS_MCU),$(filter $(CMSIS_MCU),STM32H743xx STM32H750xx STM32H7A3xx STM32H7A3xxQ STM32H7B3xx STM32H7B3xxQ))
     HAL_SRC_C += $(addprefix $(HAL_DIR)/Src/stm32$(MCU_SERIES)xx_, hal_fdcan.c)
 else
-ifeq ($(MCU_SERIES),$(filter $(MCU_SERIES),f0 f4 f7 h7 l4))
+ifeq ($(MCU_SERIES),$(filter $(MCU_SERIES),f0 f4 f7 h7))
     HAL_SRC_C += $(addprefix $(HAL_DIR)/Src/stm32$(MCU_SERIES)xx_, hal_can.c)
+else
+ifeq ($(MCU_SERIES),$(filter $(MCU_SERIES),l4))
+HAL_SRC_C += $(addprefix $(HAL_DIR)/Src/Legacy/stm32$(MCU_SERIES)xx_, hal_can.c)
+$(BUILD)/$(HAL_DIR)/Src/Legacy/stm32$(MCU_SERIES)xx_hal_can.o: CFLAGS += -Wno-error=cpp
+endif
 endif
 endif
 
diff --git a/ports/stm32/adc.h b/ports/stm32/adc.h
index 5821eb9d67862..9101b9db83ebf 100644
--- a/ports/stm32/adc.h
+++ b/ports/stm32/adc.h
@@ -44,7 +44,7 @@ static inline void adc_deselect_vbat(ADC_TypeDef *adc, uint32_t channel) {
 
         #if defined(STM32F0) || defined(STM32WB)
         adc_common = ADC1_COMMON;
-        #elif defined(STM32F4) || defined(STM32L4)
+        #elif defined(STM32F4)
         adc_common = ADC_COMMON_REGISTER(0);
         #elif defined(STM32F7)
         adc_common = ADC123_COMMON;
@@ -52,6 +52,8 @@ static inline void adc_deselect_vbat(ADC_TypeDef *adc, uint32_t channel) {
         adc_common = ADC12_COMMON;
         #elif defined(STM32H7)
         adc_common = adc == ADC3 ? ADC3_COMMON : ADC12_COMMON;
+        #elif defined(STM32L4)
+        adc_common = __LL_ADC_COMMON_INSTANCE(0);
         #endif
 
         adc_common->CCR &= ~LL_ADC_PATH_INTERNAL_VBAT;
diff --git a/ports/stm32/boards/stm32l4xx_hal_conf_base.h b/ports/stm32/boards/stm32l4xx_hal_conf_base.h
index 4f3a78d509e9f..ce35dee28c1ec 100644
--- a/ports/stm32/boards/stm32l4xx_hal_conf_base.h
+++ b/ports/stm32/boards/stm32l4xx_hal_conf_base.h
@@ -26,10 +26,13 @@
 #ifndef MICROPY_INCLUDED_STM32L4XX_HAL_CONF_BASE_H
 #define MICROPY_INCLUDED_STM32L4XX_HAL_CONF_BASE_H
 
+// Needs to be defined before ll_usb.h is included
+#define HAL_PCD_MODULE_ENABLED
+
 // Include various HAL modules for convenience
 #include "stm32l4xx_hal_dma.h"
 #include "stm32l4xx_hal_adc.h"
-#include "stm32l4xx_hal_can.h"
+#include "Legacy/stm32l4xx_hal_can_legacy.h"
 #include "stm32l4xx_hal_cortex.h"
 #include "stm32l4xx_hal_crc.h"
 #include "stm32l4xx_hal_dac.h"
@@ -54,11 +57,12 @@
 #include "stm32l4xx_ll_lpuart.h"
 #include "stm32l4xx_ll_rtc.h"
 #include "stm32l4xx_ll_usart.h"
+#include "stm32l4xx_ll_usb.h"
 
 // Enable various HAL modules
 #define HAL_MODULE_ENABLED
 #define HAL_ADC_MODULE_ENABLED
-#define HAL_CAN_MODULE_ENABLED
+#define HAL_CAN_LEGACY_MODULE_ENABLED
 #define HAL_CORTEX_MODULE_ENABLED
 #define HAL_CRC_MODULE_ENABLED
 #define HAL_DAC_MODULE_ENABLED
@@ -70,7 +74,6 @@
 #define HAL_HCD_MODULE_ENABLED
 #define HAL_I2C_MODULE_ENABLED
 #define HAL_IWDG_MODULE_ENABLED
-#define HAL_PCD_MODULE_ENABLED
 #define HAL_PWR_MODULE_ENABLED
 #define HAL_RCC_MODULE_ENABLED
 #define HAL_RTC_MODULE_ENABLED
diff --git a/ports/stm32/machine_adc.c b/ports/stm32/machine_adc.c
index a114a9ad1a89b..8480bff53e65f 100644
--- a/ports/stm32/machine_adc.c
+++ b/ports/stm32/machine_adc.c
@@ -34,10 +34,12 @@
 #define ADC_V2 (0)
 #endif
 
-#if defined(STM32F4) || defined(STM32L4)
+#if defined(STM32F4)
 #define ADCx_COMMON ADC_COMMON_REGISTER(0)
 #elif defined(STM32F7)
 #define ADCx_COMMON ADC123_COMMON
+#elif defined(STM32L4)
+#define ADCx_COMMON __LL_ADC_COMMON_INSTANCE(0)
 #endif
 
 #if defined(STM32F0) || defined(STM32L0)
diff --git a/ports/stm32/mphalport.h b/ports/stm32/mphalport.h
index 450e7098a6a59..6cfa9b92702d3 100644
--- a/ports/stm32/mphalport.h
+++ b/ports/stm32/mphalport.h
@@ -2,21 +2,25 @@
 #include STM32_HAL_H
 #include "pin.h"
 
-// F0-1.9.0+F4-1.16.0+F7-1.7.0+H7-1.6.0+L0-1.11.2+L4-1.8.1+WB-1.10.0
+// F0-1.9.0+F4-1.16.0+F7-1.7.0+G4-1.3.0+H7-1.6.0+L0-1.11.2+L4-1.17.0+WB-1.10.0+WL-1.1.0
 #if defined(STM32F0)
 #define MICROPY_PLATFORM_VERSION "HAL1.9.0"
 #elif defined(STM32F4)
 #define MICROPY_PLATFORM_VERSION "HAL1.16.0"
 #elif defined(STM32F7)
 #define MICROPY_PLATFORM_VERSION "HAL1.7.0"
+#elif defined(STM32G4)
+#define MICROPY_PLATFORM_VERSION "HAL1.3.0"
 #elif defined(STM32H7)
 #define MICROPY_PLATFORM_VERSION "HAL1.6.0"
 #elif defined(STM32L0)
 #define MICROPY_PLATFORM_VERSION "HAL1.11.2"
 #elif defined(STM32L4)
-#define MICROPY_PLATFORM_VERSION "HAL1.8.1"
+#define MICROPY_PLATFORM_VERSION "HAL1.17.0"
 #elif defined(STM32WB)
 #define MICROPY_PLATFORM_VERSION "HAL1.10.0"
+#elif defined(STM32WL)
+#define MICROPY_PLATFORM_VERSION "HAL1.1.0"
 #endif
 
 extern const unsigned char mp_hal_status_to_errno_table[4];
diff --git a/ports/stm32/stm32_it.c b/ports/stm32/stm32_it.c
index ed97c4fe0bec3..fe9b6062258ae 100644
--- a/ports/stm32/stm32_it.c
+++ b/ports/stm32/stm32_it.c
@@ -395,7 +395,9 @@ void OTG_FS_WKUP_IRQHandler(void) {
 
     OTG_CMD_WKUP_Handler(&pcd_fs_handle);
 
-    #if !defined(STM32H7)
+    #if defined(STM32L4)
+    EXTI->PR1 = USB_OTG_FS_WAKEUP_EXTI_LINE;
+    #elif !defined(STM32H7)
     /* Clear EXTI pending Bit*/
     __HAL_USB_FS_EXTI_CLEAR_FLAG();
     #endif

From 9a1ab2286ded9a8d83f4fef3b2eaa5e857dbded0 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 14 Dec 2021 00:03:08 +1100
Subject: [PATCH 1480/3533] stm32/main: Call sdcard_init when only
 MICROPY_HW_ENABLE_MMCARD enabled.

Otherwise, if MMCARD is enabled and not SDCARD, then the GPIO will not be
configured for SDIO.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/stm32/main.c b/ports/stm32/main.c
index 974602cb05f16..7a7f80467bcc8 100644
--- a/ports/stm32/main.c
+++ b/ports/stm32/main.c
@@ -419,7 +419,7 @@ void stm32_main(uint32_t reset_mode) {
     #if MICROPY_PY_PYB_LEGACY && MICROPY_HW_ENABLE_HW_I2C
     i2c_init0();
     #endif
-    #if MICROPY_HW_ENABLE_SDCARD
+    #if MICROPY_HW_ENABLE_SDCARD || MICROPY_HW_ENABLE_MMCARD
     sdcard_init();
     #endif
     #if MICROPY_HW_ENABLE_STORAGE

From b26704aac5dbeffe54c575c29a786879e439e72a Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 14 Dec 2021 00:04:57 +1100
Subject: [PATCH 1481/3533] stm32/sdcard: Support 8-bit wide SDIO bus.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/sdcard.c | 39 ++++++++++++++++++++++++++++++++-------
 1 file changed, 32 insertions(+), 7 deletions(-)

diff --git a/ports/stm32/sdcard.c b/ports/stm32/sdcard.c
index ea69e7285b38a..4e461749acff4 100644
--- a/ports/stm32/sdcard.c
+++ b/ports/stm32/sdcard.c
@@ -60,6 +60,10 @@
 #define STATIC_AF_SDCARD_D1 STATIC_AF_SDMMC2_D1
 #define STATIC_AF_SDCARD_D2 STATIC_AF_SDMMC2_D2
 #define STATIC_AF_SDCARD_D3 STATIC_AF_SDMMC2_D3
+#define STATIC_AF_SDCARD_D4 STATIC_AF_SDMMC2_D4
+#define STATIC_AF_SDCARD_D5 STATIC_AF_SDMMC2_D5
+#define STATIC_AF_SDCARD_D6 STATIC_AF_SDMMC2_D6
+#define STATIC_AF_SDCARD_D7 STATIC_AF_SDMMC2_D7
 #else
 #define SDIO SDMMC1
 #define SDMMC_IRQHandler SDMMC1_IRQHandler
@@ -75,6 +79,10 @@
 #define STATIC_AF_SDCARD_D1 STATIC_AF_SDMMC1_D1
 #define STATIC_AF_SDCARD_D2 STATIC_AF_SDMMC1_D2
 #define STATIC_AF_SDCARD_D3 STATIC_AF_SDMMC1_D3
+#define STATIC_AF_SDCARD_D4 STATIC_AF_SDMMC1_D4
+#define STATIC_AF_SDCARD_D5 STATIC_AF_SDMMC1_D5
+#define STATIC_AF_SDCARD_D6 STATIC_AF_SDMMC1_D6
+#define STATIC_AF_SDCARD_D7 STATIC_AF_SDMMC1_D7
 #endif
 
 // The F7 & L4 series calls the peripheral SDMMC rather than SDIO, so provide some
@@ -120,6 +128,10 @@
 #define STATIC_AF_SDCARD_D1 STATIC_AF_SDIO_D1
 #define STATIC_AF_SDCARD_D2 STATIC_AF_SDIO_D2
 #define STATIC_AF_SDCARD_D3 STATIC_AF_SDIO_D3
+#define STATIC_AF_SDCARD_D4 STATIC_AF_SDIO_D4
+#define STATIC_AF_SDCARD_D5 STATIC_AF_SDIO_D5
+#define STATIC_AF_SDCARD_D6 STATIC_AF_SDIO_D6
+#define STATIC_AF_SDCARD_D7 STATIC_AF_SDIO_D7
 
 #endif
 
@@ -133,6 +145,13 @@
 #define MICROPY_HW_SDCARD_CMD (pin_D2)
 #endif
 
+// Define a constant to select the bus width.
+#if MICROPY_HW_SDCARD_BUS_WIDTH == 4
+#define SDIO_BUS_WIDE_VALUE SDIO_BUS_WIDE_4B
+#elif MICROPY_HW_SDCARD_BUS_WIDTH == 8
+#define SDIO_BUS_WIDE_VALUE SDIO_BUS_WIDE_8B
+#endif
+
 #define PYB_SDMMC_FLAG_SD       (0x01)
 #define PYB_SDMMC_FLAG_MMC      (0x02)
 #define PYB_SDMMC_FLAG_ACTIVE   (0x04)
@@ -162,10 +181,16 @@ void sdcard_init(void) {
     mp_hal_pin_config_alt_static(MICROPY_HW_SDCARD_CK, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_UP, STATIC_AF_SDCARD_CK);
     mp_hal_pin_config_alt_static(MICROPY_HW_SDCARD_CMD, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_UP, STATIC_AF_SDCARD_CMD);
     mp_hal_pin_config_alt_static(MICROPY_HW_SDCARD_D0, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_UP, STATIC_AF_SDCARD_D0);
-    #if MICROPY_HW_SDCARD_BUS_WIDTH == 4
+    #if MICROPY_HW_SDCARD_BUS_WIDTH >= 4
     mp_hal_pin_config_alt_static(MICROPY_HW_SDCARD_D1, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_UP, STATIC_AF_SDCARD_D1);
     mp_hal_pin_config_alt_static(MICROPY_HW_SDCARD_D2, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_UP, STATIC_AF_SDCARD_D2);
     mp_hal_pin_config_alt_static(MICROPY_HW_SDCARD_D3, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_UP, STATIC_AF_SDCARD_D3);
+    #if MICROPY_HW_SDCARD_BUS_WIDTH == 8
+    mp_hal_pin_config_alt_static(MICROPY_HW_SDCARD_D4, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_UP, STATIC_AF_SDCARD_D4);
+    mp_hal_pin_config_alt_static(MICROPY_HW_SDCARD_D5, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_UP, STATIC_AF_SDCARD_D5);
+    mp_hal_pin_config_alt_static(MICROPY_HW_SDCARD_D6, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_UP, STATIC_AF_SDCARD_D6);
+    mp_hal_pin_config_alt_static(MICROPY_HW_SDCARD_D7, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_UP, STATIC_AF_SDCARD_D7);
+    #endif
     #endif
 
     // configure the SD card detect pin
@@ -252,9 +277,9 @@ STATIC HAL_StatusTypeDef sdmmc_init_sd(void) {
         mp_hal_delay_ms(50);
     }
 
-    #if MICROPY_HW_SDCARD_BUS_WIDTH == 4
-    // configure the SD bus width for 4-bit wide operation
-    status = HAL_SD_ConfigWideBusOperation(&sdmmc_handle.sd, SDIO_BUS_WIDE_4B);
+    #if MICROPY_HW_SDCARD_BUS_WIDTH >= 4
+    // configure the SD bus width for 4/8-bit wide operation
+    status = HAL_SD_ConfigWideBusOperation(&sdmmc_handle.sd, SDIO_BUS_WIDE_VALUE);
     if (status != HAL_OK) {
         HAL_SD_DeInit(&sdmmc_handle.sd);
         return status;
@@ -287,12 +312,12 @@ STATIC HAL_StatusTypeDef sdmmc_init_mmc(void) {
     // As this is an eMMC card, overwrite LogBlockNbr with actual value
     sdmmc_handle.mmc.MmcCard.LogBlockNbr = 7469056 + 2048;
 
-    #if MICROPY_HW_SDCARD_BUS_WIDTH == 4
-    // Configure the SDIO bus width for 4-bit wide operation
+    #if MICROPY_HW_SDCARD_BUS_WIDTH >= 4
+    // Configure the SDIO bus width for 4/8-bit wide operation
     #ifdef STM32F7
     sdmmc_handle.mmc.Init.ClockBypass = SDIO_CLOCK_BYPASS_ENABLE;
     #endif
-    status = HAL_MMC_ConfigWideBusOperation(&sdmmc_handle.mmc, SDIO_BUS_WIDE_4B);
+    status = HAL_MMC_ConfigWideBusOperation(&sdmmc_handle.mmc, SDIO_BUS_WIDE_VALUE);
     if (status != HAL_OK) {
         HAL_MMC_DeInit(&sdmmc_handle.mmc);
         return status;

From 6995cf03dda98f490ab95ff90bf395a5667067d6 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 14 Dec 2021 00:07:34 +1100
Subject: [PATCH 1482/3533] stm32/sdcard: Add config option to force MM card
 capacity.

The current ST HAL does not support reading the extended CSD so cannot
correctly detect the capacity of high-capacity cards.  As a workaround, the
capacity can be forced via the MICROPY_HW_MMCARD_LOG_BLOCK_NBR config
option.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/boards/PYBD_SF2/mpconfigboard.h | 3 +++
 ports/stm32/sdcard.c                        | 8 ++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/ports/stm32/boards/PYBD_SF2/mpconfigboard.h b/ports/stm32/boards/PYBD_SF2/mpconfigboard.h
index ea0abc6ea5236..9ac789a83b95e 100644
--- a/ports/stm32/boards/PYBD_SF2/mpconfigboard.h
+++ b/ports/stm32/boards/PYBD_SF2/mpconfigboard.h
@@ -181,6 +181,9 @@ extern struct _spi_bdev_t spi_bdev2;
 #define MICROPY_HW_SDCARD_DETECT_PRESENT    (GPIO_PIN_RESET)
 #define MICROPY_HW_SDCARD_MOUNT_AT_BOOT     (0)
 
+// MM card: the size is hard-coded to support the WBUS-EMMC add-on
+#define MICROPY_HW_MMCARD_LOG_BLOCK_NBR     (7469056 + 2048)
+
 // USB config
 #define MICROPY_HW_USB_FS           (1)
 #define MICROPY_HW_USB_HS           (1)
diff --git a/ports/stm32/sdcard.c b/ports/stm32/sdcard.c
index 4e461749acff4..cb773f29db654 100644
--- a/ports/stm32/sdcard.c
+++ b/ports/stm32/sdcard.c
@@ -309,8 +309,12 @@ STATIC HAL_StatusTypeDef sdmmc_init_mmc(void) {
         return status;
     }
 
-    // As this is an eMMC card, overwrite LogBlockNbr with actual value
-    sdmmc_handle.mmc.MmcCard.LogBlockNbr = 7469056 + 2048;
+    #ifdef MICROPY_HW_MMCARD_LOG_BLOCK_NBR
+    // A board can override the number of logical blocks (card capacity) if needed.
+    // This is needed when a card is high capacity because the extended CSD command
+    // is not supported by the current version of the HAL.
+    sdmmc_handle.mmc.MmcCard.LogBlockNbr = MICROPY_HW_MMCARD_LOG_BLOCK_NBR;
+    #endif
 
     #if MICROPY_HW_SDCARD_BUS_WIDTH >= 4
     // Configure the SDIO bus width for 4/8-bit wide operation

From 5adb1fa40e95d938a713a3ed9a3b80615edf90fa Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 10 Dec 2021 23:28:46 +1100
Subject: [PATCH 1483/3533] esp32,esp8266: Extract qstr from object when
 comparing keys in config().

Following on from a previous fix for the same problem made in
3a431fba50c96cc47d8273a6934e200993197b14.

Fixes issue #8052.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/network_lan.c  |  9 ++++----
 ports/esp32/network_wlan.c | 42 +++++++++++++++++---------------------
 ports/esp8266/modnetwork.c | 18 ++++++++--------
 3 files changed, 31 insertions(+), 38 deletions(-)

diff --git a/ports/esp32/network_lan.c b/ports/esp32/network_lan.c
index 34e5cba258483..f302d70fec1d5 100644
--- a/ports/esp32/network_lan.c
+++ b/ports/esp32/network_lan.c
@@ -249,14 +249,13 @@ STATIC mp_obj_t lan_config(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs
         mp_raise_TypeError(MP_ERROR_TEXT("either pos or kw args are allowed"));
     }
     lan_if_obj_t *self = MP_OBJ_TO_PTR(args[0]);
-    #define QS(x) (uintptr_t)MP_OBJ_NEW_QSTR(x)
 
     if (kwargs->used != 0) {
 
         for (size_t i = 0; i < kwargs->alloc; i++) {
             if (mp_map_slot_is_filled(kwargs, i)) {
-                switch ((uintptr_t)kwargs->table[i].key) {
-                    case QS(MP_QSTR_mac): {
+                switch (mp_obj_str_get_qstr(kwargs->table[i].key)) {
+                    case MP_QSTR_mac: {
                         mp_buffer_info_t bufinfo;
                         mp_get_buffer_raise(kwargs->table[i].value, &bufinfo, MP_BUFFER_READ);
                         if (bufinfo.len != 6) {
@@ -279,8 +278,8 @@ STATIC mp_obj_t lan_config(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs
 
     mp_obj_t val = mp_const_none;
 
-    switch ((uintptr_t)args[1]) {
-        case QS(MP_QSTR_mac): {
+    switch (mp_obj_str_get_qstr(args[1])) {
+        case MP_QSTR_mac: {
             uint8_t mac[6];
             esp_eth_ioctl(self->eth_handle, ETH_CMD_G_MAC_ADDR, mac);
             return mp_obj_new_bytes(mac, sizeof(mac));
diff --git a/ports/esp32/network_wlan.c b/ports/esp32/network_wlan.c
index 3af7225440c43..8702ca7704598 100644
--- a/ports/esp32/network_wlan.c
+++ b/ports/esp32/network_wlan.c
@@ -391,8 +391,6 @@ STATIC mp_obj_t network_wlan_config(size_t n_args, const mp_obj_t *args, mp_map_
         esp_exceptions(esp_wifi_get_config(self->if_id, &cfg));
     }
 
-    #define QS(x) (uintptr_t)MP_OBJ_NEW_QSTR(x)
-
     if (kwargs->used != 0) {
         if (!is_wifi) {
             goto unknown;
@@ -402,8 +400,8 @@ STATIC mp_obj_t network_wlan_config(size_t n_args, const mp_obj_t *args, mp_map_
             if (mp_map_slot_is_filled(kwargs, i)) {
                 int req_if = -1;
 
-                switch ((uintptr_t)kwargs->table[i].key) {
-                    case QS(MP_QSTR_mac): {
+                switch (mp_obj_str_get_qstr(kwargs->table[i].key)) {
+                    case MP_QSTR_mac: {
                         mp_buffer_info_t bufinfo;
                         mp_get_buffer_raise(kwargs->table[i].value, &bufinfo, MP_BUFFER_READ);
                         if (bufinfo.len != 6) {
@@ -412,7 +410,7 @@ STATIC mp_obj_t network_wlan_config(size_t n_args, const mp_obj_t *args, mp_map_
                         esp_exceptions(esp_wifi_set_mac(self->if_id, bufinfo.buf));
                         break;
                     }
-                    case QS(MP_QSTR_essid): {
+                    case MP_QSTR_essid: {
                         req_if = WIFI_IF_AP;
                         size_t len;
                         const char *s = mp_obj_str_get_data(kwargs->table[i].value, &len);
@@ -421,17 +419,17 @@ STATIC mp_obj_t network_wlan_config(size_t n_args, const mp_obj_t *args, mp_map_
                         cfg.ap.ssid_len = len;
                         break;
                     }
-                    case QS(MP_QSTR_hidden): {
+                    case MP_QSTR_hidden: {
                         req_if = WIFI_IF_AP;
                         cfg.ap.ssid_hidden = mp_obj_is_true(kwargs->table[i].value);
                         break;
                     }
-                    case QS(MP_QSTR_authmode): {
+                    case MP_QSTR_authmode: {
                         req_if = WIFI_IF_AP;
                         cfg.ap.authmode = mp_obj_get_int(kwargs->table[i].value);
                         break;
                     }
-                    case QS(MP_QSTR_password): {
+                    case MP_QSTR_password: {
                         req_if = WIFI_IF_AP;
                         size_t len;
                         const char *s = mp_obj_str_get_data(kwargs->table[i].value, &len);
@@ -440,22 +438,22 @@ STATIC mp_obj_t network_wlan_config(size_t n_args, const mp_obj_t *args, mp_map_
                         cfg.ap.password[len] = 0;
                         break;
                     }
-                    case QS(MP_QSTR_channel): {
+                    case MP_QSTR_channel: {
                         req_if = WIFI_IF_AP;
                         cfg.ap.channel = mp_obj_get_int(kwargs->table[i].value);
                         break;
                     }
-                    case QS(MP_QSTR_dhcp_hostname): {
+                    case MP_QSTR_dhcp_hostname: {
                         const char *s = mp_obj_str_get_str(kwargs->table[i].value);
                         esp_exceptions(tcpip_adapter_set_hostname(self->if_id, s));
                         break;
                     }
-                    case QS(MP_QSTR_max_clients): {
+                    case MP_QSTR_max_clients: {
                         req_if = WIFI_IF_AP;
                         cfg.ap.max_connection = mp_obj_get_int(kwargs->table[i].value);
                         break;
                     }
-                    case QS(MP_QSTR_reconnects): {
+                    case MP_QSTR_reconnects: {
                         int reconnects = mp_obj_get_int(kwargs->table[i].value);
                         req_if = WIFI_IF_STA;
                         // parameter reconnects == -1 means to retry forever.
@@ -488,8 +486,8 @@ STATIC mp_obj_t network_wlan_config(size_t n_args, const mp_obj_t *args, mp_map_
     int req_if = -1;
     mp_obj_t val = mp_const_none;
 
-    switch ((uintptr_t)args[1]) {
-        case QS(MP_QSTR_mac): {
+    switch (mp_obj_str_get_qstr(args[1])) {
+        case MP_QSTR_mac: {
             uint8_t mac[6];
             switch (self->if_id) {
                 case WIFI_IF_AP: // fallthrough intentional
@@ -500,7 +498,7 @@ STATIC mp_obj_t network_wlan_config(size_t n_args, const mp_obj_t *args, mp_map_
                     goto unknown;
             }
         }
-        case QS(MP_QSTR_essid):
+        case MP_QSTR_essid:
             switch (self->if_id) {
                 case WIFI_IF_STA:
                     val = mp_obj_new_str((char *)cfg.sta.ssid, strlen((char *)cfg.sta.ssid));
@@ -512,29 +510,29 @@ STATIC mp_obj_t network_wlan_config(size_t n_args, const mp_obj_t *args, mp_map_
                     req_if = WIFI_IF_AP;
             }
             break;
-        case QS(MP_QSTR_hidden):
+        case MP_QSTR_hidden:
             req_if = WIFI_IF_AP;
             val = mp_obj_new_bool(cfg.ap.ssid_hidden);
             break;
-        case QS(MP_QSTR_authmode):
+        case MP_QSTR_authmode:
             req_if = WIFI_IF_AP;
             val = MP_OBJ_NEW_SMALL_INT(cfg.ap.authmode);
             break;
-        case QS(MP_QSTR_channel):
+        case MP_QSTR_channel:
             req_if = WIFI_IF_AP;
             val = MP_OBJ_NEW_SMALL_INT(cfg.ap.channel);
             break;
-        case QS(MP_QSTR_dhcp_hostname): {
+        case MP_QSTR_dhcp_hostname: {
             const char *s;
             esp_exceptions(tcpip_adapter_get_hostname(self->if_id, &s));
             val = mp_obj_new_str(s, strlen(s));
             break;
         }
-        case QS(MP_QSTR_max_clients): {
+        case MP_QSTR_max_clients: {
             val = MP_OBJ_NEW_SMALL_INT(cfg.ap.max_connection);
             break;
         }
-        case QS(MP_QSTR_reconnects):
+        case MP_QSTR_reconnects:
             req_if = WIFI_IF_STA;
             int rec = conf_wifi_sta_reconnects - 1;
             val = MP_OBJ_NEW_SMALL_INT(rec);
@@ -543,8 +541,6 @@ STATIC mp_obj_t network_wlan_config(size_t n_args, const mp_obj_t *args, mp_map_
             goto unknown;
     }
 
-#undef QS
-
     // We post-check interface requirements to save on code size
     if (req_if >= 0) {
         require_if(args[0], req_if);
diff --git a/ports/esp8266/modnetwork.c b/ports/esp8266/modnetwork.c
index f0cd83aeec357..6988e09bd12af 100644
--- a/ports/esp8266/modnetwork.c
+++ b/ports/esp8266/modnetwork.c
@@ -351,9 +351,8 @@ STATIC mp_obj_t esp_config(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs
 
         for (mp_uint_t i = 0; i < kwargs->alloc; i++) {
             if (mp_map_slot_is_filled(kwargs, i)) {
-                #define QS(x) (uintptr_t)MP_OBJ_NEW_QSTR(x)
-                switch ((uintptr_t)kwargs->table[i].key) {
-                    case QS(MP_QSTR_mac): {
+                switch (mp_obj_str_get_qstr(kwargs->table[i].key)) {
+                    case MP_QSTR_mac: {
                         mp_buffer_info_t bufinfo;
                         mp_get_buffer_raise(kwargs->table[i].value, &bufinfo, MP_BUFFER_READ);
                         if (bufinfo.len != 6) {
@@ -362,7 +361,7 @@ STATIC mp_obj_t esp_config(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs
                         wifi_set_macaddr(self->if_id, bufinfo.buf);
                         break;
                     }
-                    case QS(MP_QSTR_essid): {
+                    case MP_QSTR_essid: {
                         req_if = SOFTAP_IF;
                         size_t len;
                         const char *s = mp_obj_str_get_data(kwargs->table[i].value, &len);
@@ -371,17 +370,17 @@ STATIC mp_obj_t esp_config(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs
                         cfg.ap.ssid_len = len;
                         break;
                     }
-                    case QS(MP_QSTR_hidden): {
+                    case MP_QSTR_hidden: {
                         req_if = SOFTAP_IF;
                         cfg.ap.ssid_hidden = mp_obj_is_true(kwargs->table[i].value);
                         break;
                     }
-                    case QS(MP_QSTR_authmode): {
+                    case MP_QSTR_authmode: {
                         req_if = SOFTAP_IF;
                         cfg.ap.authmode = mp_obj_get_int(kwargs->table[i].value);
                         break;
                     }
-                    case QS(MP_QSTR_password): {
+                    case MP_QSTR_password: {
                         req_if = SOFTAP_IF;
                         size_t len;
                         const char *s = mp_obj_str_get_data(kwargs->table[i].value, &len);
@@ -390,12 +389,12 @@ STATIC mp_obj_t esp_config(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs
                         cfg.ap.password[len] = 0;
                         break;
                     }
-                    case QS(MP_QSTR_channel): {
+                    case MP_QSTR_channel: {
                         req_if = SOFTAP_IF;
                         cfg.ap.channel = mp_obj_get_int(kwargs->table[i].value);
                         break;
                     }
-                    case QS(MP_QSTR_dhcp_hostname): {
+                    case MP_QSTR_dhcp_hostname: {
                         req_if = STATION_IF;
                         if (self->if_id == STATION_IF) {
                             const char *s = mp_obj_str_get_str(kwargs->table[i].value);
@@ -406,7 +405,6 @@ STATIC mp_obj_t esp_config(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs
                     default:
                         goto unknown;
                 }
-#undef QS
             }
         }
 

From f21c5655835ba3703deeb1f0fa375d6a706b03cc Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Fri, 10 Dec 2021 01:27:45 +0200
Subject: [PATCH 1484/3533] rp2/machine_uart: Handle and clear UART RX timeout
 IRQ.

The pico-sdk 1.3.0 update in 97a7cc243b028833bdcb8ce0bc19b2bce7545851
introduced a change that broke RP2 Bluetooth UART, and possibly UART in
general, which stops working right after UART is initialized.  The commit
raspberrypi/pico-sdk@2622e9b enables the UART receive timeout (RTIM) IRQ,
which is asserted when the receive FIFO is not empty, and no more
characters are received for a period of time.

This commit makes sure the RTIM IRQ is handled and cleared in
uart_service_interrupt.
---
 ports/rp2/machine_uart.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/rp2/machine_uart.c b/ports/rp2/machine_uart.c
index a8ec149f4b1ac..887954276ef5e 100644
--- a/ports/rp2/machine_uart.c
+++ b/ports/rp2/machine_uart.c
@@ -126,7 +126,7 @@ STATIC void uart_fill_tx_fifo(machine_uart_obj_t *self) {
 }
 
 STATIC inline void uart_service_interrupt(machine_uart_obj_t *self) {
-    if (uart_get_hw(self->uart)->mis & UART_UARTMIS_RXMIS_BITS) { // rx interrupt?
+    if (uart_get_hw(self->uart)->mis & (UART_UARTMIS_RXMIS_BITS | UART_UARTMIS_RTMIS_BITS)) { // rx interrupt?
         // clear all interrupt bits but tx
         uart_get_hw(self->uart)->icr = UART_UARTICR_BITS & (~UART_UARTICR_TXIC_BITS);
         if (!self->read_lock) {

From 1b7eee24eb024ee3822db341c3447423a684b84f Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Mon, 22 Nov 2021 17:13:28 +0200
Subject: [PATCH 1485/3533] extmod/network_ninaw10: Fix config of AP mode.

* Fix missing call to connect to configure module in AP mode.
* Use enum for config/connect args indices.
---
 extmod/network_ninaw10.c | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/extmod/network_ninaw10.c b/extmod/network_ninaw10.c
index e256188eb3a34..f5f9967397668 100644
--- a/extmod/network_ninaw10.c
+++ b/extmod/network_ninaw10.c
@@ -140,9 +140,10 @@ STATIC mp_obj_t network_ninaw10_scan(mp_obj_t self_in) {
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(network_ninaw10_scan_obj, network_ninaw10_scan);
 
 STATIC mp_obj_t network_ninaw10_connect(mp_uint_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    enum { ARG_essid, ARG_key, ARG_security, ARG_channel };
     static const mp_arg_t allowed_args[] = {
-        { MP_QSTR_essid, MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
-        { MP_QSTR_key, MP_ARG_OBJ, {.u_obj = mp_const_none} },
+        { MP_QSTR_essid,    MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
+        { MP_QSTR_key,      MP_ARG_OBJ, {.u_obj = mp_const_none} },
         { MP_QSTR_security, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = NINA_SEC_WPA_PSK} },
         { MP_QSTR_channel,  MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 1} },
     };
@@ -153,7 +154,7 @@ STATIC mp_obj_t network_ninaw10_connect(mp_uint_t n_args, const mp_obj_t *pos_ar
     mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
 
     // get ssid
-    const char *ssid = mp_obj_str_get_str(args[0].u_obj);
+    const char *ssid = mp_obj_str_get_str(args[ARG_essid].u_obj);
 
     if (strlen(ssid) == 0) {
         mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("SSID can't be empty!"));
@@ -163,9 +164,9 @@ STATIC mp_obj_t network_ninaw10_connect(mp_uint_t n_args, const mp_obj_t *pos_ar
     const char *key = NULL;
     mp_uint_t security = NINA_SEC_OPEN;
 
-    if (args[1].u_obj != mp_const_none) {
-        key = mp_obj_str_get_str(args[1].u_obj);
-        security = args[2].u_int;
+    if (args[ARG_key].u_obj != mp_const_none) {
+        key = mp_obj_str_get_str(args[ARG_key].u_obj);
+        security = args[ARG_security].u_int;
     }
 
     if (security != NINA_SEC_OPEN && strlen(key) == 0) {
@@ -179,7 +180,7 @@ STATIC mp_obj_t network_ninaw10_connect(mp_uint_t n_args, const mp_obj_t *pos_ar
                 MP_ERROR_TEXT("could not connect to ssid=%s, sec=%d, key=%s\n"), ssid, security, key);
         }
     } else {
-        mp_uint_t channel = args[3].u_int;
+        mp_uint_t channel = args[ARG_channel].u_int;
 
         if (security != NINA_SEC_OPEN && security != NINA_SEC_WEP) {
             mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("AP mode supports WEP security only."));
@@ -271,9 +272,11 @@ STATIC mp_obj_t network_ninaw10_config(size_t n_args, const mp_obj_t *args, mp_m
                 mp_raise_ValueError(MP_ERROR_TEXT("unknown config param"));
         }
     } else {
-        // Set config value(s)
-        // Not supported.
-        mp_raise_ValueError(MP_ERROR_TEXT("setting config values is not supported"));
+        if (self->itf != MOD_NETWORK_AP_IF) {
+            mp_raise_ValueError(MP_ERROR_TEXT("AP required"));
+        }
+        // Call connect to set WiFi access point.
+        return network_ninaw10_connect(n_args, args, kwargs);
     }
 
     return mp_const_none;

From bc1b0fd2c1d16745ff5c353a933a51cca6d32403 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Wed, 3 Nov 2021 15:57:48 +0100
Subject: [PATCH 1486/3533] mimxrt: Define UART 0 on MIMXRT boards.

UART 0 is attached to the Debug USB port. The settings are
115200 Baud, 8N1.
For MIMXRT1010_EVK this is identical to UART1. For the other boards,
this is an additional UART.
---
 .../boards/MIMXRT1010_EVK/mpconfigboard.h       |  9 +++++----
 .../boards/MIMXRT1020_EVK/mpconfigboard.h       | 17 +++++++++--------
 .../boards/MIMXRT1050_EVK/mpconfigboard.h       | 13 +++++++------
 .../boards/MIMXRT1060_EVK/mpconfigboard.h       | 13 +++++++------
 .../boards/MIMXRT1064_EVK/mpconfigboard.h       | 13 +++++++------
 ports/mimxrt/machine_uart.c                     | 14 +++++++++-----
 6 files changed, 44 insertions(+), 35 deletions(-)

diff --git a/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.h b/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.h
index 7b2d2a8a638f2..9a74a1c9c833c 100644
--- a/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.h
+++ b/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.h
@@ -9,12 +9,13 @@
 #define MICROPY_HW_NUM_PIN_IRQS (2 * 32)
 
 // Define mapping logical UART # to hardware UART #
-// LPUART1 on D0/D1 -> 1
-// LPUART3 on A0/D4 -> 3
-// LPUART4 on D6/D7 -> 2
+// LPUART1 on USB_DBG  -> 0
+// LPUART1 on D0/D1    -> 1
+// LPUART3 on A0/D4    -> 3
+// LPUART4 on D6/D7    -> 2
 
 #define MICROPY_HW_UART_NUM     (sizeof(uart_index_table) / sizeof(uart_index_table)[0])
-#define MICROPY_HW_UART_INDEX   { 0, 1, 4 }
+#define MICROPY_HW_UART_INDEX   { 1, 1, 4, 3 }
 
 #define IOMUX_TABLE_UART \
     { IOMUXC_GPIO_10_LPUART1_TXD }, { IOMUXC_GPIO_09_LPUART1_RXD }, \
diff --git a/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.h b/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.h
index b546700e7a3f4..5f5de5a3edfa5 100644
--- a/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.h
+++ b/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.h
@@ -10,16 +10,17 @@
 #define MICROPY_HW_NUM_PIN_IRQS (3 * 32)
 
 // Define mapping logical UART # to hardware UART #
-// RX/TX   HW-UART    Logical UART
-// D3/D5   LPUART1    Not usable, Since D3 is blocked.
-// D0/D1   LPUART2 -> 1
-// D6/D9   LPUART3 -> 2
-// D10/D12 LPUART5 -> 3
-// D14/D15 LPUART8 -> 4
-// A0/A1   LPUART4 -> 5
+// RX/TX      HW-UART    Logical UART
+// DEBUG USB  LPUART1 -> 0
+// D3/D5      LPUART1    Not usable, Since D3 is blocked.
+// D0/D1      LPUART2 -> 1
+// D6/D9      LPUART3 -> 2
+// D10/D12    LPUART5 -> 3
+// D14/D15    LPUART8 -> 4
+// A0/A1      LPUART4 -> 5
 
 #define MICROPY_HW_UART_NUM     (sizeof(uart_index_table) / sizeof(uart_index_table)[0])
-#define MICROPY_HW_UART_INDEX   { 0, 2, 3, 5, 8, 4 }
+#define MICROPY_HW_UART_INDEX   { 1, 2, 3, 5, 8, 4 }
 
 #define IOMUX_TABLE_UART \
     { IOMUXC_GPIO_AD_B0_06_LPUART1_TX }, { IOMUXC_GPIO_AD_B0_07_LPUART1_RX }, \
diff --git a/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.h b/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.h
index 3837315f7d764..aa9ab8d95c727 100644
--- a/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.h
+++ b/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.h
@@ -9,16 +9,17 @@
 #define MICROPY_HW_NUM_PIN_IRQS (4 * 32 + 3)
 
 // Define mapping logical UART # to hardware UART #
-// LPUART3 on D0/D1  -> 1
-// LPUART2 on D7/D6  -> 2
-// LPUART6 on D8/D9  -> 3
-// LPUART8 on A1/A0  -> 4
+// LPUART1 on USB_DBG  -> 0
+// LPUART3 on D0/D1    -> 1
+// LPUART2 on D7/D6    -> 2
+// LPUART6 on D8/D9    -> 3
+// LPUART8 on A1/A0    -> 4
 
 #define MICROPY_HW_UART_NUM     (sizeof(uart_index_table) / sizeof(uart_index_table)[0])
-#define MICROPY_HW_UART_INDEX   { 0, 3, 2, 6, 8 }
+#define MICROPY_HW_UART_INDEX   { 1, 3, 2, 6, 8 }
 
 #define IOMUX_TABLE_UART \
-    { 0 }, { 0 }, \
+    { IOMUXC_GPIO_AD_B0_12_LPUART1_TX }, { IOMUXC_GPIO_AD_B0_13_LPUART1_RX }, \
     { IOMUXC_GPIO_AD_B1_02_LPUART2_TX }, { IOMUXC_GPIO_AD_B1_03_LPUART2_RX }, \
     { IOMUXC_GPIO_AD_B1_06_LPUART3_TX }, { IOMUXC_GPIO_AD_B1_07_LPUART3_RX }, \
     { 0 }, { 0 }, \
diff --git a/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.h b/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.h
index a66fcf9ae9bab..b108122ffc4db 100644
--- a/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.h
+++ b/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.h
@@ -9,16 +9,17 @@
 #define MICROPY_HW_NUM_PIN_IRQS (4 * 32 + 3)
 
 // Define mapping logical UART # to hardware UART #
-// LPUART3 on D0/D1  -> 1
-// LPUART2 on D7/D6  -> 2
-// LPUART6 on D8/D9  -> 3
-// LPUART8 on A1/A0  -> 4
+// LPUART1 on USB_DBG  -> 0
+// LPUART3 on D0/D1    -> 1
+// LPUART2 on D7/D6    -> 2
+// LPUART6 on D8/D9    -> 3
+// LPUART8 on A1/A0    -> 4
 
 #define MICROPY_HW_UART_NUM     (sizeof(uart_index_table) / sizeof(uart_index_table)[0])
-#define MICROPY_HW_UART_INDEX   { 0, 3, 2, 6, 8 }
+#define MICROPY_HW_UART_INDEX   { 1, 3, 2, 6, 8 }
 
 #define IOMUX_TABLE_UART \
-    { 0 }, { 0 }, \
+    { IOMUXC_GPIO_AD_B0_12_LPUART1_TX }, { IOMUXC_GPIO_AD_B0_13_LPUART1_RX }, \
     { IOMUXC_GPIO_AD_B1_02_LPUART2_TX }, { IOMUXC_GPIO_AD_B1_03_LPUART2_RX }, \
     { IOMUXC_GPIO_AD_B1_06_LPUART3_TX }, { IOMUXC_GPIO_AD_B1_07_LPUART3_RX }, \
     { 0 }, { 0 }, \
diff --git a/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.h b/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.h
index 1dcdd378a25c8..3c724868f77c8 100644
--- a/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.h
+++ b/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.h
@@ -9,16 +9,17 @@
 #define MICROPY_HW_NUM_PIN_IRQS (4 * 32 + 3)
 
 // Define mapping logical UART # to hardware UART #
-// LPUART3 on D0/D1  -> 1
-// LPUART2 on D7/D6  -> 2
-// LPUART6 on D8/D9  -> 3
-// LPUART8 on A1/A0  -> 4
+// LPUART1 on USB_DBG  -> 0
+// LPUART3 on D0/D1    -> 1
+// LPUART2 on D7/D6    -> 2
+// LPUART6 on D8/D9    -> 3
+// LPUART8 on A1/A0    -> 4
 
 #define MICROPY_HW_UART_NUM     (sizeof(uart_index_table) / sizeof(uart_index_table)[0])
-#define MICROPY_HW_UART_INDEX   { 0, 3, 2, 6, 8 }
+#define MICROPY_HW_UART_INDEX   { 1, 3, 2, 6, 8 }
 
 #define IOMUX_TABLE_UART \
-    { 0 }, { 0 }, \
+    { IOMUXC_GPIO_AD_B0_12_LPUART1_TX }, { IOMUXC_GPIO_AD_B0_13_LPUART1_RX }, \
     { IOMUXC_GPIO_AD_B1_02_LPUART2_TX }, { IOMUXC_GPIO_AD_B1_03_LPUART2_RX }, \
     { IOMUXC_GPIO_AD_B1_06_LPUART3_TX }, { IOMUXC_GPIO_AD_B1_07_LPUART3_RX }, \
     { 0 }, { 0 }, \
diff --git a/ports/mimxrt/machine_uart.c b/ports/mimxrt/machine_uart.c
index abdb7ed97eebb..9aa8a0c7423af 100644
--- a/ports/mimxrt/machine_uart.c
+++ b/ports/mimxrt/machine_uart.c
@@ -269,7 +269,7 @@ STATIC mp_obj_t machine_uart_make_new(const mp_obj_type_t *type, size_t n_args,
 
     // Get UART bus.
     int uart_id = mp_obj_get_int(args[0]);
-    if (uart_id < 1 || uart_id > MICROPY_HW_UART_NUM) {
+    if (uart_id < 0 || uart_id > MICROPY_HW_UART_NUM || uart_index_table[uart_id] == 0) {
         mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("UART(%d) doesn't exist"), uart_id);
     }
 
@@ -286,11 +286,15 @@ STATIC mp_obj_t machine_uart_make_new(const mp_obj_type_t *type, size_t n_args,
     LPUART_GetDefaultConfig(&self->config);
 
     // Configure board-specific pin MUX based on the hardware device number.
-    lpuart_set_iomux(uart_hw_id);
+    bool uart_present = lpuart_set_iomux(uart_hw_id);
 
-    mp_map_t kw_args;
-    mp_map_init_fixed_table(&kw_args, n_kw, args + n_args);
-    return machine_uart_init_helper(self, n_args - 1, args + 1, &kw_args);
+    if (uart_present) {
+        mp_map_t kw_args;
+        mp_map_init_fixed_table(&kw_args, n_kw, args + n_args);
+        return machine_uart_init_helper(self, n_args - 1, args + 1, &kw_args);
+    } else {
+        return mp_const_none;
+    }
 }
 
 // uart.init(baud, [kwargs])

From bbe25f47043e97a9539298b714be616b3815b492 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Thu, 4 Nov 2021 21:54:44 +0100
Subject: [PATCH 1487/3533] mimxrt: Support selection of PHY type and address.

Useful for boards without a PHY interface, where that has to be
attached. Like the Seed ARCH MIX board or Vision SOM. Phy drivers
supported so far are:

- KSZ8081
- DP83825
- LAN8720

More to come. Usage e.g.:
lan = LAN(phy_type=LAN.PHY_LAN8720, phy_addr=1)

The default values are those set in mpconfigboard.h.
---
 ports/mimxrt/eth.c         | 17 +++++++-----
 ports/mimxrt/eth.h         |  8 +++++-
 ports/mimxrt/mphalport.h   |  1 +
 ports/mimxrt/network_lan.c | 57 ++++++++++++++++++++++++++++++++++----
 4 files changed, 70 insertions(+), 13 deletions(-)

diff --git a/ports/mimxrt/eth.c b/ports/mimxrt/eth.c
index 414e8d51f2b43..d14c713961b97 100644
--- a/ports/mimxrt/eth.c
+++ b/ports/mimxrt/eth.c
@@ -33,7 +33,6 @@
 
 #if defined(MICROPY_HW_ETH_MDC)
 
-#include "eth.h"
 #include "pin.h"
 #include "shared/netutils/netutils.h"
 #include "extmod/modnetwork.h"
@@ -46,6 +45,7 @@
 #include "hal/phy/device/phydp83825/fsl_phydp83825.h"
 #include "hal/phy/device/phylan8720/fsl_phylan8720.h"
 
+#include "eth.h"
 #include "lwip/etharp.h"
 #include "lwip/dns.h"
 #include "lwip/dhcp.h"
@@ -167,22 +167,24 @@ void eth_irq_handler(ENET_Type *base, enet_handle_t *handle, enet_event_t event,
 
     if (event == kENET_RxEvent) {
         do {
-            status = ENET_GetRxFrameSize(&g_handle, &length);
+            status = ENET_GetRxFrameSize(handle, &length);
             if (status == kStatus_Success) {
                 // Get the data
-                ENET_ReadFrame(ENET, &g_handle, g_rx_frame, length);
+                ENET_ReadFrame(base, handle, g_rx_frame, length);
                 eth_process_frame(self, g_rx_frame, length);
             } else if (status == kStatus_ENET_RxFrameError) {
-                ENET_ReadFrame(ENET, &g_handle, NULL, 0);
+                ENET_ReadFrame(base, handle, NULL, 0);
             }
         } while (status != kStatus_ENET_RxFrameEmpty);
     } else {
-        ENET_ClearInterruptStatus(ENET, kENET_TxFrameInterrupt);
+        ENET_ClearInterruptStatus(base, kENET_TxFrameInterrupt);
     }
 }
 
 // eth_init: Set up GPIO and the transceiver
-void eth_init(eth_t *self, int mac_idx) {
+void eth_init(eth_t *self, int mac_idx, const phy_operations_t *phy_ops, int phy_addr) {
+
+    self->netif.num = mac_idx; // Set the interface number
 
     CLOCK_EnableClock(kCLOCK_Iomuxc);
 
@@ -242,6 +244,8 @@ void eth_init(eth_t *self, int mac_idx) {
 
     mp_hal_get_mac(0, hw_addr);
 
+    phyHandle.ops = phy_ops;
+    phyConfig.phyAddr = phy_addr;
     phyConfig.autoNeg = true;
     mdioHandle.resource.base = ENET;
     mdioHandle.resource.csrClock_Hz = CLOCK_GetFreq(kCLOCK_IpgClk);
@@ -252,7 +256,6 @@ void eth_init(eth_t *self, int mac_idx) {
     phy_speed_t speed = kENET_MiiSpeed100M;
     phy_duplex_t duplex = kENET_MiiFullDuplex;
 
-    phyConfig.phyAddr = ENET_PHY_ADDRESS;
 
     status_t status = PHY_Init(&phyHandle, &phyConfig);
     if (status == kStatus_Success) {
diff --git a/ports/mimxrt/eth.h b/ports/mimxrt/eth.h
index 56327d08aef2f..962b6c88cb779 100644
--- a/ports/mimxrt/eth.h
+++ b/ports/mimxrt/eth.h
@@ -30,7 +30,7 @@
 typedef struct _eth_t eth_t;
 extern eth_t eth_instance;
 
-void eth_init(eth_t *self, int mac_idx);
+void eth_init(eth_t *self, int mac_idx, const phy_operations_t *phy_ops, int phy_addr);
 void eth_set_trace(eth_t *self, uint32_t value);
 struct netif *eth_netif(eth_t *self);
 int eth_link_status(eth_t *self);
@@ -38,4 +38,10 @@ int eth_start(eth_t *self);
 int eth_stop(eth_t *self);
 void eth_low_power_mode(eth_t *self, bool enable);
 
+enum {
+    PHY_KSZ8081 = 0,
+    PHY_DP83825,
+    PHY_LAN8720,
+};
+
 #endif // MICROPY_INCLUDED_MIMXRT_ETH_H
diff --git a/ports/mimxrt/mphalport.h b/ports/mimxrt/mphalport.h
index 0dc49f01a545e..5210ff44a3fd2 100644
--- a/ports/mimxrt/mphalport.h
+++ b/ports/mimxrt/mphalport.h
@@ -97,6 +97,7 @@ enum {
     MP_HAL_MAC_WLAN1,
     MP_HAL_MAC_BDADDR,
     MP_HAL_MAC_ETH0,
+    MP_HAL_MAC_ETH1,
 };
 
 void mp_hal_generate_laa_mac(int idx, uint8_t buf[6]);
diff --git a/ports/mimxrt/network_lan.c b/ports/mimxrt/network_lan.c
index c0d6e41362d2b..7b725276a1186 100644
--- a/ports/mimxrt/network_lan.c
+++ b/ports/mimxrt/network_lan.c
@@ -27,10 +27,15 @@
 #include "py/runtime.h"
 #include "py/mphal.h"
 #include "extmod/modnetwork.h"
-#include "eth.h"
 
 #if defined(MICROPY_HW_ETH_MDC)
 
+#include "fsl_phy.h"
+#include "eth.h"
+#include "hal/phy/device/phyksz8081/fsl_phyksz8081.h"
+#include "hal/phy/device/phydp83825/fsl_phydp83825.h"
+#include "hal/phy/device/phylan8720/fsl_phylan8720.h"
+
 #include "lwip/netif.h"
 
 typedef struct _network_lan_obj_t {
@@ -53,10 +58,48 @@ STATIC void network_lan_print(const mp_print_t *print, mp_obj_t self_in, mp_prin
         );
 }
 
-STATIC mp_obj_t network_lan_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
-    mp_arg_check_num(n_args, n_kw, 0, 0, false);
-    const network_lan_obj_t *self = &network_lan_eth0;
-    eth_init(self->eth, MP_HAL_MAC_ETH0);
+STATIC mp_obj_t network_lan_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
+    enum { ARG_id, ARG_phy_type, ARG_phy_addr};
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_id, MP_ARG_INT, {.u_int = 0} },
+        { MP_QSTR_phy_type, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} },
+        { MP_QSTR_phy_addr, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = ENET_PHY_ADDRESS} },
+    };
+    // Parse args.
+    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
+    mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
+
+    const phy_operations_t *phy_ops = &ENET_PHY_OPS;
+
+    // Select PHY driver
+    int phy_type = args[ARG_phy_type].u_int;
+    if (phy_type != -1) {
+        if (phy_type == PHY_KSZ8081) {
+            phy_ops = &phyksz8081_ops;
+        } else if (phy_type == PHY_DP83825) {
+            phy_ops = &phydp83825_ops;
+        } else if (phy_type == PHY_LAN8720) {
+            phy_ops = &phylan8720_ops;
+        } else {
+            mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("Invalid value %d for phy"), phy_type);
+        }
+    }
+    int phy_addr = args[ARG_phy_addr].u_int;
+
+    // Prepare for two ETH interfaces.
+    const network_lan_obj_t *self;
+    int mac_id = args[ARG_id].u_int;
+    if (mac_id == 0) {
+        self = &network_lan_eth0;
+        mac_id = MP_HAL_MAC_ETH0;
+    } else if (mac_id == 1) {
+        self = &network_lan_eth0;
+        mac_id = MP_HAL_MAC_ETH1;
+    } else {
+        mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("Invalid LAN interface %d"), mac_id);
+    }
+
+    eth_init(self->eth, mac_id, phy_ops, phy_addr);
     // register with network module
     mod_network_register_nic((mp_obj_t *)self);
     return MP_OBJ_FROM_PTR(self);
@@ -157,6 +200,10 @@ STATIC const mp_rom_map_elem_t network_lan_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_ifconfig), MP_ROM_PTR(&network_lan_ifconfig_obj) },
     { MP_ROM_QSTR(MP_QSTR_status), MP_ROM_PTR(&network_lan_status_obj) },
     { MP_ROM_QSTR(MP_QSTR_config), MP_ROM_PTR(&network_lan_config_obj) },
+
+    { MP_ROM_QSTR(MP_QSTR_PHY_KSZ8081), MP_ROM_INT(PHY_KSZ8081) },
+    { MP_ROM_QSTR(MP_QSTR_PHY_DP83825), MP_ROM_INT(PHY_DP83825) },
+    { MP_ROM_QSTR(MP_QSTR_PHY_LAN8720), MP_ROM_INT(PHY_LAN8720) },
 };
 STATIC MP_DEFINE_CONST_DICT(network_lan_locals_dict, network_lan_locals_dict_table);
 

From ea09dccfea0503534688dd790c40d33c5399e7d8 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Tue, 9 Nov 2021 13:58:45 +0100
Subject: [PATCH 1488/3533] mimxrt: Re-Enable eth checksum creation by HW.

The initial problem with a wrong ICMP checksum was caused by
the test code setting a checksum and the HW taking that probably as
the start value and ending up with 0xffff. With a checksum field of 0
set by the test code the HW creates the proper checksum.
---
 ports/mimxrt/eth.c               | 10 +---------
 ports/mimxrt/lwip_inc/lwipopts.h |  5 +----
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/ports/mimxrt/eth.c b/ports/mimxrt/eth.c
index d14c713961b97..9c036cd0565ec 100644
--- a/ports/mimxrt/eth.c
+++ b/ports/mimxrt/eth.c
@@ -285,10 +285,7 @@ void eth_init(eth_t *self, int mac_idx, const phy_operations_t *phy_ops, int phy
     enet_config.miiDuplex = (enet_mii_duplex_t)duplex;
     enet_config.miiMode = kENET_RmiiMode;
     // Enable checksum generation by the ENET controller
-    // Note: Disabled due to problems with the checksum on ICMP requests
-    // Maybe caused by LWIP inserting 0xffff instead of 0x0000
-    // Keep the code for now until it may be fixed.
-    // enet_config.txAccelerConfig = kENET_TxAccelIpCheckEnabled | kENET_TxAccelProtoCheckEnabled;
+    enet_config.txAccelerConfig = kENET_TxAccelIpCheckEnabled | kENET_TxAccelProtoCheckEnabled;
     // Set interrupt
     enet_config.interrupt |= ENET_TX_INTERRUPT | ENET_RX_INTERRUPT;
 
@@ -351,11 +348,6 @@ STATIC err_t eth_netif_init(struct netif *netif) {
         | NETIF_CHECKSUM_CHECK_TCP
         | NETIF_CHECKSUM_CHECK_ICMP
         | NETIF_CHECKSUM_CHECK_ICMP6
-        | NETIF_CHECKSUM_GEN_IP
-        | NETIF_CHECKSUM_GEN_UDP
-        | NETIF_CHECKSUM_GEN_TCP
-        | NETIF_CHECKSUM_GEN_ICMP
-        | NETIF_CHECKSUM_GEN_ICMP6
         );
     return ERR_OK;
 }
diff --git a/ports/mimxrt/lwip_inc/lwipopts.h b/ports/mimxrt/lwip_inc/lwipopts.h
index 42dc9fc5dbd80..2401c05f95a39 100644
--- a/ports/mimxrt/lwip_inc/lwipopts.h
+++ b/ports/mimxrt/lwip_inc/lwipopts.h
@@ -13,11 +13,8 @@
 #define MEM_ALIGNMENT                   4
 
 #define LWIP_CHKSUM_ALGORITHM           3
-// Chksum generaration by HW fails for ICMP
-// Maybe caused by LWIP inserting ffff instead of 0000
 // The checksum flags are set in eth.c
-#define LWIP_CHECKSUM_CTRL_PER_NETIF    0
-#define LWIP_CHECKSUM_ON_COPY           0
+#define LWIP_CHECKSUM_CTRL_PER_NETIF    1
 
 #define LWIP_ARP                        1
 #define LWIP_ETHERNET                   1

From 5d8941ec85ba992349576957a7ef2f65b091ba7c Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Thu, 25 Nov 2021 08:39:58 +0100
Subject: [PATCH 1489/3533] mimxrt: Fix a tiny unnoticed bug in sdcard.c.

This code line will hardly ever be compiled and executed, but since
it is there, it must be correct.
---
 ports/mimxrt/sdcard.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/mimxrt/sdcard.c b/ports/mimxrt/sdcard.c
index 14a78e94a5e88..fd3c910835c5b 100644
--- a/ports/mimxrt/sdcard.c
+++ b/ports/mimxrt/sdcard.c
@@ -1013,7 +1013,7 @@ bool sdcard_detect(mimxrt_sdcard_obj_t *card) {
     #if defined MICROPY_USDHC2 && USDHC2_AVAIL
     if (card->usdhc_inst == USDHC2) {
         sdcard_usdhc2_state.inserted = detect;
-        sdcard_usdhc2_state.initialized = detect ? sdcard_usdhc1_state.initialized : false;
+        sdcard_usdhc2_state.initialized = detect ? sdcard_usdhc2_state.initialized : false;
     }
     #endif
 

From 1e9eaa7af55bb67da4aced33d527d73d8d7b7c31 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Tue, 30 Nov 2021 15:22:42 +0100
Subject: [PATCH 1490/3533] mimxrt: Add a driver for the DP83848 PHY device.

Just another choice for the PHY interface.

Added: Keyword option phy_clock=LAN.IN or LAN.OUT
to define the source of the 50MHZ clock for the PHY
interface. The RMII clock is not enabled if it
is generated by a PYH board. Constants:

LAN.IN  The clock is provided by the PHY board.
LAN.OUT The clock is provided by the MCU board.

The default is LAN.OUT or the value set in mpconfigboard.h, which
is currently set to IN only for the SEEED ARCH MIX board. Usage etc:

lan = LAN(phy_type=LAN.PHY_DP83848, phy_clock=LAN.IN)
---
 ports/mimxrt/Makefile                         |   1 +
 ports/mimxrt/eth.c                            |  11 +-
 ports/mimxrt/eth.h                            |   8 +-
 .../phy/device/phydp83825/fsl_phydp83825.c    |  12 +-
 .../phy/device/phydp83848/fsl_phydp83848.c    | 254 ++++++++++++++++++
 .../phy/device/phydp83848/fsl_phydp83848.h    | 163 +++++++++++
 .../phy/device/phylan8720/fsl_phylan8720.c    |   8 +-
 ports/mimxrt/network_lan.c                    |  17 +-
 8 files changed, 454 insertions(+), 20 deletions(-)
 create mode 100644 ports/mimxrt/hal/phy/device/phydp83848/fsl_phydp83848.c
 create mode 100644 ports/mimxrt/hal/phy/device/phydp83848/fsl_phydp83848.h

diff --git a/ports/mimxrt/Makefile b/ports/mimxrt/Makefile
index eeab29ddc3a87..574aebb4cd21e 100644
--- a/ports/mimxrt/Makefile
+++ b/ports/mimxrt/Makefile
@@ -145,6 +145,7 @@ SRC_MOD := $(filter-out %/mbedtls/library/error.c, $(SRC_MOD))
 SRC_ETH_C += \
 	hal/phy/mdio/enet/fsl_enet_mdio.c \
 	hal/phy/device/phydp83825/fsl_phydp83825.c \
+	hal/phy/device/phydp83848/fsl_phydp83848.c \
 	hal/phy/device/phyksz8081/fsl_phyksz8081.c \
 	hal/phy/device/phylan8720/fsl_phylan8720.c \
 	lib/mbedtls_errors/mp_mbedtls_errors.c \
diff --git a/ports/mimxrt/eth.c b/ports/mimxrt/eth.c
index 9c036cd0565ec..1a8210cb116b5 100644
--- a/ports/mimxrt/eth.c
+++ b/ports/mimxrt/eth.c
@@ -113,9 +113,6 @@ static const iomux_table_t iomux_table_enet[] = {
 };
 
 #define IOTE (iomux_table_enet[i])
-#ifndef ENET_TX_CLK_OUTPUT
-#define ENET_TX_CLK_OUTPUT true
-#endif
 
 #define TRACE_ASYNC_EV (0x0001)
 #define TRACE_ETH_TX (0x0002)
@@ -182,7 +179,7 @@ void eth_irq_handler(ENET_Type *base, enet_handle_t *handle, enet_event_t event,
 }
 
 // eth_init: Set up GPIO and the transceiver
-void eth_init(eth_t *self, int mac_idx, const phy_operations_t *phy_ops, int phy_addr) {
+void eth_init(eth_t *self, int mac_idx, const phy_operations_t *phy_ops, int phy_addr, bool phy_clock) {
 
     self->netif.num = mac_idx; // Set the interface number
 
@@ -222,12 +219,12 @@ void eth_init(eth_t *self, int mac_idx, const phy_operations_t *phy_ops, int phy
     }
 
     const clock_enet_pll_config_t config = {
-        .enableClkOutput = true, .enableClkOutput25M = false, .loopDivider = 1
+        .enableClkOutput = phy_clock, .enableClkOutput25M = false, .loopDivider = 1
     };
     CLOCK_InitEnetPll(&config);
 
-    IOMUXC_EnableMode(IOMUXC_GPR, kIOMUXC_GPR_ENET1RefClkMode, false); // Drive ENET_REF_CLK from PAD
-    IOMUXC_EnableMode(IOMUXC_GPR, kIOMUXC_GPR_ENET1TxClkOutputDir, ENET_TX_CLK_OUTPUT);  // Enable output driver
+    IOMUXC_EnableMode(IOMUXC_GPR, kIOMUXC_GPR_ENET1RefClkMode, false); // Do not use the 25 MHz MII clock
+    IOMUXC_EnableMode(IOMUXC_GPR, kIOMUXC_GPR_ENET1TxClkOutputDir, phy_clock);  // Set the clock pad direction
 
     // Reset transceiver
     // pull up the ENET_INT before RESET.
diff --git a/ports/mimxrt/eth.h b/ports/mimxrt/eth.h
index 962b6c88cb779..b225d00492486 100644
--- a/ports/mimxrt/eth.h
+++ b/ports/mimxrt/eth.h
@@ -30,7 +30,7 @@
 typedef struct _eth_t eth_t;
 extern eth_t eth_instance;
 
-void eth_init(eth_t *self, int mac_idx, const phy_operations_t *phy_ops, int phy_addr);
+void eth_init(eth_t *self, int mac_idx, const phy_operations_t *phy_ops, int phy_addr, bool phy_clock);
 void eth_set_trace(eth_t *self, uint32_t value);
 struct netif *eth_netif(eth_t *self);
 int eth_link_status(eth_t *self);
@@ -41,7 +41,13 @@ void eth_low_power_mode(eth_t *self, bool enable);
 enum {
     PHY_KSZ8081 = 0,
     PHY_DP83825,
+    PHY_DP83848,
     PHY_LAN8720,
 };
 
+enum {
+    PHY_TX_CLK_IN = false,
+    PHY_TX_CLK_OUT = true,
+};
+
 #endif // MICROPY_INCLUDED_MIMXRT_ETH_H
diff --git a/ports/mimxrt/hal/phy/device/phydp83825/fsl_phydp83825.c b/ports/mimxrt/hal/phy/device/phydp83825/fsl_phydp83825.c
index 2aca609a05725..309755f86024a 100644
--- a/ports/mimxrt/hal/phy/device/phydp83825/fsl_phydp83825.c
+++ b/ports/mimxrt/hal/phy/device/phydp83825/fsl_phydp83825.c
@@ -12,9 +12,9 @@
  ******************************************************************************/
 
 /*! @brief Defines the PHY PD83825 vendor defined registers. */
-#define PHY_PHYSTS_REG   0x10U // Phy status register
-#define PHY_BISCR_REG    0x16U // RMII Config register.
-#define PHY_RCSR_REG     0x17U // RMII Config register.
+#define PHY_PHYSTS_REG   0x10U /* Phy status register */
+#define PHY_BISCR_REG    0x16U /* RMII Config register. */
+#define PHY_RCSR_REG     0x17U /* RMII Config register. */
 #define PHY_CONTROL2_REG 0x1FU /*!< The PHY control register 2. */
 
 /*! @brief Defines the PHY DP82825 ID number. */
@@ -26,9 +26,9 @@
 #define PHY_PHYSTS_100M_MASK          0x0002U /*!< The PHY 100M mask. */
 #define PHY_PHYSTS_LINK_MASK          0x0001U /*!< The PHY link up mask. */
 
-#define PYH_RMII_CLOCK_SELECT        0x80  // Select 50MHz clock
-#define PHY_BISCR_REMOTELOOP_MASK    0x1FU // !< The PHY remote loopback mask.
-#define PHY_BISCR_REMOTELOOP_MODE    0x08U // !< The PHY remote loopback mode.
+#define PYH_RMII_CLOCK_SELECT        0x80  /* Select 50MHz clock */
+#define PHY_BISCR_REMOTELOOP_MASK    0x1FU /* !< The PHY remote loopback mask. */
+#define PHY_BISCR_REMOTELOOP_MODE    0x08U /* !< The PHY remote loopback mode. */
 
 /*! @brief Defines the timeout macro. */
 #define PHY_READID_TIMEOUT_COUNT 1000U
diff --git a/ports/mimxrt/hal/phy/device/phydp83848/fsl_phydp83848.c b/ports/mimxrt/hal/phy/device/phydp83848/fsl_phydp83848.c
new file mode 100644
index 0000000000000..0ef618d4210f6
--- /dev/null
+++ b/ports/mimxrt/hal/phy/device/phydp83848/fsl_phydp83848.c
@@ -0,0 +1,254 @@
+/*
+ * Copyright 2020 NXP
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#include "fsl_phydp83848.h"
+
+/*******************************************************************************
+ * Definitions
+ ******************************************************************************/
+
+/*! @brief Defines the PHY PD83848 vendor defined registers. */
+#define PHY_PHYSTS_REG   0x10U /* Phy status register */
+#define PHY_RBR_REG      0x17U /* RMII Config register. */
+
+/*! @brief Defines the PHY DP82825 ID number. */
+#define PHY_CONTROL_ID1 0x2000U /*!< The PHY ID1 */
+
+/*! @brief Defines the mask flag of operation mode in control registers */
+#define PHY_PHYSTS_100FULLDUPLEX_MASK 0x0006U /*!< The PHY 100M full duplex mask. */
+#define PHY_PHYSTS_DUPLEX_MASK        0x0004U /*!< The PHY full duplex mask. */
+#define PHY_PHYSTS_100M_MASK          0x0002U /*!< The PHY 100M mask. */
+#define PHY_PHYSTS_LINK_MASK          0x0001U /*!< The PHY link up mask. */
+
+#define PHY_RMII_MODE                 0x20
+#define PHY_RMII_REV1_0               0x10   
+
+/*! @brief Defines the timeout macro. */
+#define PHY_READID_TIMEOUT_COUNT 1000U
+
+/*******************************************************************************
+ * Prototypes
+ ******************************************************************************/
+
+/*******************************************************************************
+ * Variables
+ ******************************************************************************/
+const phy_operations_t phydp83848_ops = {.phyInit = PHY_DP83848_Init,
+                                         .phyWrite = PHY_DP83848_Write,
+                                         .phyRead = PHY_DP83848_Read,
+                                         .getAutoNegoStatus = PHY_DP83848_GetAutoNegotiationStatus,
+                                         .getLinkStatus = PHY_DP83848_GetLinkStatus,
+                                         .getLinkSpeedDuplex = PHY_DP83848_GetLinkSpeedDuplex,
+                                         .setLinkSpeedDuplex = PHY_DP83848_SetLinkSpeedDuplex,
+                                         .enableLoopback = PHY_DP83848_EnableLoopback};
+
+/*******************************************************************************
+ * Code
+ ******************************************************************************/
+
+status_t PHY_DP83848_Init(phy_handle_t *handle, const phy_config_t *config) {
+    uint32_t counter = PHY_READID_TIMEOUT_COUNT;
+    status_t result = kStatus_Success;
+    uint32_t regValue = 0;
+
+    /* Init MDIO interface. */
+    MDIO_Init(handle->mdioHandle);
+
+    /* Assign phy address. */
+    handle->phyAddr = config->phyAddr;
+
+    /* Check PHY ID. */
+    do
+    {
+        result = MDIO_Read(handle->mdioHandle, handle->phyAddr, PHY_ID1_REG, &regValue);
+        if (result != kStatus_Success) {
+            return result;
+        }
+        counter--;
+    } while ((regValue != PHY_CONTROL_ID1) && (counter != 0U));
+
+    if (counter == 0U) {
+        return kStatus_Fail;
+    }
+
+    /* Reset PHY. */
+    result = MDIO_Write(handle->mdioHandle, handle->phyAddr, PHY_BASICCONTROL_REG, PHY_BCTL_RESET_MASK);
+    if (result == kStatus_Success) {
+        result = MDIO_Read(handle->mdioHandle, handle->phyAddr, PHY_RBR_REG, &regValue);
+        if (result != kStatus_Success) {
+            return result;
+        }
+        result =
+            MDIO_Write(handle->mdioHandle, handle->phyAddr, PHY_RBR_REG, (regValue | PHY_RMII_MODE | PHY_RMII_REV1_0));
+        if (result != kStatus_Success) {
+            return result;
+        }
+
+        if (config->autoNeg) {
+            /* Set the auto-negotiation then start it. */
+            result =
+                MDIO_Write(handle->mdioHandle, handle->phyAddr, PHY_AUTONEG_ADVERTISE_REG,
+                    (PHY_100BASETX_FULLDUPLEX_MASK | PHY_100BASETX_HALFDUPLEX_MASK |
+                        PHY_10BASETX_FULLDUPLEX_MASK | PHY_10BASETX_HALFDUPLEX_MASK | PHY_IEEE802_3_SELECTOR_MASK));
+            if (result == kStatus_Success) {
+                result = MDIO_Write(handle->mdioHandle, handle->phyAddr, PHY_BASICCONTROL_REG,
+                    (PHY_BCTL_AUTONEG_MASK | PHY_BCTL_RESTART_AUTONEG_MASK));
+            }
+        } else {
+            /* This PHY only supports 10/100M speed. */
+            assert(config->speed <= kPHY_Speed100M);
+
+            /* Disable isolate mode */
+            result = MDIO_Read(handle->mdioHandle, handle->phyAddr, PHY_BASICCONTROL_REG, &regValue);
+            if (result != kStatus_Success) {
+                return result;
+            }
+            regValue &= ~PHY_BCTL_ISOLATE_MASK;
+            result = MDIO_Write(handle->mdioHandle, handle->phyAddr, PHY_BASICCONTROL_REG, regValue);
+            if (result != kStatus_Success) {
+                return result;
+            }
+
+            /* Disable the auto-negotiation and set user-defined speed/duplex configuration. */
+            result = PHY_DP83848_SetLinkSpeedDuplex(handle, config->speed, config->duplex);
+        }
+    }
+    return result;
+}
+
+status_t PHY_DP83848_Write(phy_handle_t *handle, uint32_t phyReg, uint32_t data) {
+    return MDIO_Write(handle->mdioHandle, handle->phyAddr, phyReg, data);
+}
+
+status_t PHY_DP83848_Read(phy_handle_t *handle, uint32_t phyReg, uint32_t *dataPtr) {
+    return MDIO_Read(handle->mdioHandle, handle->phyAddr, phyReg, dataPtr);
+}
+
+status_t PHY_DP83848_GetAutoNegotiationStatus(phy_handle_t *handle, bool *status) {
+    assert(status);
+
+    status_t result;
+    uint32_t regValue;
+
+    *status = false;
+
+    /* Check auto negotiation complete. */
+    result = MDIO_Read(handle->mdioHandle, handle->phyAddr, PHY_BASICSTATUS_REG, &regValue);
+    if (result == kStatus_Success) {
+        if ((regValue & PHY_BSTATUS_AUTONEGCOMP_MASK) != 0U) {
+            *status = true;
+        }
+    }
+    return result;
+}
+
+status_t PHY_DP83848_GetLinkStatus(phy_handle_t *handle, bool *status) {
+    assert(status);
+
+    status_t result;
+    uint32_t regValue;
+
+    /* Read the basic status register. */
+    result = MDIO_Read(handle->mdioHandle, handle->phyAddr, PHY_BASICSTATUS_REG, &regValue);
+    if (result == kStatus_Success) {
+        if ((PHY_BSTATUS_LINKSTATUS_MASK & regValue) != 0U) {
+            /* Link up. */
+            *status = true;
+        } else {
+            /* Link down. */
+            *status = false;
+        }
+    }
+    return result;
+}
+
+status_t PHY_DP83848_GetLinkSpeedDuplex(phy_handle_t *handle, phy_speed_t *speed, phy_duplex_t *duplex) {
+    assert(!((speed == NULL) && (duplex == NULL)));
+
+    status_t result;
+    uint32_t regValue;
+    uint32_t flag;
+
+    /* Read the control register. */
+    result = MDIO_Read(handle->mdioHandle, handle->phyAddr, PHY_PHYSTS_REG, &regValue);
+    if (result == kStatus_Success) {
+        if (speed != NULL) {
+            flag = regValue & PHY_PHYSTS_100M_MASK;
+            if (flag) {
+                *speed = kPHY_Speed10M;
+            } else {
+                *speed = kPHY_Speed100M;
+            }
+        }
+
+        if (duplex != NULL) {
+            flag = regValue & PHY_PHYSTS_DUPLEX_MASK;
+            if (flag) {
+                *duplex = kPHY_FullDuplex;
+            } else {
+                *duplex = kPHY_HalfDuplex;
+            }
+        }
+    }
+    return result;
+}
+
+status_t PHY_DP83848_SetLinkSpeedDuplex(phy_handle_t *handle, phy_speed_t speed, phy_duplex_t duplex) {
+    /* This PHY only supports 10/100M speed. */
+    assert(speed <= kPHY_Speed100M);
+
+    status_t result;
+    uint32_t regValue;
+
+    result = MDIO_Read(handle->mdioHandle, handle->phyAddr, PHY_BASICCONTROL_REG, &regValue);
+    if (result == kStatus_Success) {
+        /* Disable the auto-negotiation and set according to user-defined configuration. */
+        regValue &= ~PHY_BCTL_AUTONEG_MASK;
+        if (speed == kPHY_Speed100M) {
+            regValue |= PHY_BCTL_SPEED0_MASK;
+        } else {
+            regValue &= ~PHY_BCTL_SPEED0_MASK;
+        }
+        if (duplex == kPHY_FullDuplex) {
+            regValue |= PHY_BCTL_DUPLEX_MASK;
+        } else {
+            regValue &= ~PHY_BCTL_DUPLEX_MASK;
+        }
+        result = MDIO_Write(handle->mdioHandle, handle->phyAddr, PHY_BASICCONTROL_REG, regValue);
+    }
+    return result;
+}
+status_t PHY_DP83848_EnableLoopback(phy_handle_t *handle, phy_loop_t mode, phy_speed_t speed, bool enable) {
+    /* This PHY only supports local/remote loopback and 10/100M speed. */
+    assert(mode <= kPHY_RemoteLoop);
+    assert(speed <= kPHY_Speed100M);
+
+    status_t result = kStatus_Success;
+    uint32_t regValue;
+
+    /* Set the loop mode. */
+    if (enable) {
+        if (mode == kPHY_LocalLoop) {
+            if (speed == kPHY_Speed100M) {
+                regValue = PHY_BCTL_SPEED0_MASK | PHY_BCTL_DUPLEX_MASK | PHY_BCTL_LOOP_MASK;
+            } else {
+                regValue = PHY_BCTL_DUPLEX_MASK | PHY_BCTL_LOOP_MASK;
+            }
+            return MDIO_Write(handle->mdioHandle, handle->phyAddr, PHY_BASICCONTROL_REG, regValue);
+        }
+    } else {
+        /* First read the current status in control register. */
+        result = MDIO_Read(handle->mdioHandle, handle->phyAddr, PHY_BASICCONTROL_REG, &regValue);
+        if (result == kStatus_Success) {
+            regValue &= ~PHY_BCTL_LOOP_MASK;
+            return MDIO_Write(handle->mdioHandle, handle->phyAddr, PHY_BASICCONTROL_REG,
+                (regValue | PHY_BCTL_RESTART_AUTONEG_MASK));
+        }
+    }
+
+    return result;
+}
diff --git a/ports/mimxrt/hal/phy/device/phydp83848/fsl_phydp83848.h b/ports/mimxrt/hal/phy/device/phydp83848/fsl_phydp83848.h
new file mode 100644
index 0000000000000..7ccc260f7b032
--- /dev/null
+++ b/ports/mimxrt/hal/phy/device/phydp83848/fsl_phydp83848.h
@@ -0,0 +1,163 @@
+/*
+ * Copyright 2020 NXP
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+/*****************************************************************************
+ * PHY DP83848 driver change log
+ *****************************************************************************/
+
+/*!
+@page driver_log Driver Change Log
+
+@section phyksz8081 PHYDP83848
+  The current PHYDP83848 driver version is 2.0.0.
+
+  - 2.0.0
+    - Initial version.
+*/
+
+#ifndef _FSL_DP83848_H_
+#define _FSL_DP83848_H_
+
+#include "fsl_phy.h"
+
+/*!
+ * @addtogroup phy_driver
+ * @{
+ */
+
+/*******************************************************************************
+ * Definitions
+ ******************************************************************************/
+
+/*! @brief PHY driver version */
+#define FSL_PHY_DRIVER_VERSION (MAKE_VERSION(2, 0, 0))
+
+/*! @brief PHY operations structure. */
+extern const phy_operations_t phydp83848_ops;
+
+/*******************************************************************************
+ * API
+ ******************************************************************************/
+
+#if defined(__cplusplus)
+extern "C" {
+#endif
+
+/*!
+ * @name PHY Driver
+ * @{
+ */
+
+/*!
+ * @brief Initializes PHY.
+ *
+ *  This function initialize PHY.
+ *
+ * @param handle       PHY device handle.
+ * @param config       Pointer to structure of phy_config_t.
+ * @retval kStatus_Success  PHY initialization succeeds
+ * @retval kStatus_Fail  PHY initialization fails
+ * @retval kStatus_PHY_SMIVisitTimeout  PHY SMI visit time out
+ */
+status_t PHY_DP83848_Init(phy_handle_t *handle, const phy_config_t *config);
+
+/*!
+ * @brief PHY Write function. This function writes data over the SMI to
+ * the specified PHY register. This function is called by all PHY interfaces.
+ *
+ * @param handle  PHY device handle.
+ * @param phyReg  The PHY register.
+ * @param data    The data written to the PHY register.
+ * @retval kStatus_Success     PHY write success
+ * @retval kStatus_PHY_SMIVisitTimeout  PHY SMI visit time out
+ */
+status_t PHY_DP83848_Write(phy_handle_t *handle, uint32_t phyReg, uint32_t data);
+
+/*!
+ * @brief PHY Read function. This interface read data over the SMI from the
+ * specified PHY register. This function is called by all PHY interfaces.
+ *
+ * @param handle   PHY device handle.
+ * @param phyReg   The PHY register.
+ * @param dataPtr  The address to store the data read from the PHY register.
+ * @retval kStatus_Success  PHY read success
+ * @retval kStatus_PHY_SMIVisitTimeout  PHY SMI visit time out
+ */
+status_t PHY_DP83848_Read(phy_handle_t *handle, uint32_t phyReg, uint32_t *dataPtr);
+
+/*!
+ * @brief Gets the PHY auto-negotiation status.
+ *
+ * @param handle   PHY device handle.
+ * @param status   The auto-negotiation status of the PHY.
+ *         - true the auto-negotiation is over.
+ *         - false the auto-negotiation is on-going or not started.
+ * @retval kStatus_Success   PHY gets status success
+ * @retval kStatus_PHY_SMIVisitTimeout  PHY SMI visit time out
+ */
+status_t PHY_DP83848_GetAutoNegotiationStatus(phy_handle_t *handle, bool *status);
+
+/*!
+ * @brief Gets the PHY link status.
+ *
+ * @param handle   PHY device handle.
+ * @param status   The link up or down status of the PHY.
+ *         - true the link is up.
+ *         - false the link is down.
+ * @retval kStatus_Success   PHY gets link status success
+ * @retval kStatus_PHY_SMIVisitTimeout  PHY SMI visit time out
+ */
+status_t PHY_DP83848_GetLinkStatus(phy_handle_t *handle, bool *status);
+
+/*!
+ * @brief Gets the PHY link speed and duplex.
+ *
+ * @brief This function gets the speed and duplex mode of PHY. User can give one of speed
+ * and duplex address paramter and set the other as NULL if only wants to get one of them.
+ *
+ * @param handle   PHY device handle.
+ * @param speed    The address of PHY link speed.
+ * @param duplex   The link duplex of PHY.
+ * @retval kStatus_Success   PHY gets link speed and duplex success
+ * @retval kStatus_PHY_SMIVisitTimeout  PHY SMI visit time out
+ */
+status_t PHY_DP83848_GetLinkSpeedDuplex(phy_handle_t *handle, phy_speed_t *speed, phy_duplex_t *duplex);
+
+/*!
+ * @brief Sets the PHY link speed and duplex.
+ *
+ * @param handle   PHY device handle.
+ * @param speed    Specified PHY link speed.
+ * @param duplex   Specified PHY link duplex.
+ * @retval kStatus_Success   PHY gets status success
+ * @retval kStatus_PHY_SMIVisitTimeout  PHY SMI visit time out
+ */
+status_t PHY_DP83848_SetLinkSpeedDuplex(phy_handle_t *handle, phy_speed_t speed, phy_duplex_t duplex);
+
+/*!
+ * @brief Enables/disables PHY loopback.
+ *
+ * @param handle   PHY device handle.
+ * @param mode     The loopback mode to be enabled, please see "phy_loop_t".
+ * All loopback modes should not be set together, when one loopback mode is set
+ * another should be disabled.
+ * @param speed    PHY speed for loopback mode.
+ * @param enable   True to enable, false to disable.
+ * @retval kStatus_Success  PHY loopback success
+ * @retval kStatus_PHY_SMIVisitTimeout  PHY SMI visit time out
+ */
+status_t PHY_DP83848_EnableLoopback(phy_handle_t *handle, phy_loop_t mode, phy_speed_t speed, bool enable);
+
+/* @} */
+
+#if defined(__cplusplus)
+}
+#endif
+
+/*! @}*/
+
+#endif /* _FSL_DP83848_H_ */
diff --git a/ports/mimxrt/hal/phy/device/phylan8720/fsl_phylan8720.c b/ports/mimxrt/hal/phy/device/phylan8720/fsl_phylan8720.c
index b7435c2d0593b..e141ebd513a7b 100644
--- a/ports/mimxrt/hal/phy/device/phylan8720/fsl_phylan8720.c
+++ b/ports/mimxrt/hal/phy/device/phylan8720/fsl_phylan8720.c
@@ -12,8 +12,8 @@
  ******************************************************************************/
 
 /*! @brief Defines the PHY LAN8720 vendor defined registers. */
-#define PHY_PHYSTS_REG   0x1FU // Phy status register
-#define PHY_MCSR_REG     0x11U // Mode Control/Status Register for loopback
+#define PHY_PHYSTS_REG   0x1FU /* Phy status register */
+#define PHY_MCSR_REG     0x11U /* Mode Control/Status Register for loopback */
 
 /*! @brief Defines the PHY LAN8720 ID number. */
 #define PHY_CONTROL_ID1 0x07U /*!< The PHY ID1 */
@@ -25,8 +25,8 @@
 #define PHY_PHYSTS_100M_FLAG          0x0008U /*!< The PHY 100M flag. */
 #define PHY_PHYSTS_LINK_MASK          0x0001U /*!< The PHY link up mask. */
 
-#define PHY_MCSR_REMOTELOOP_MASK     0x100U // !< The PHY remote loopback mask.
-#define PHY_MCSR_REMOTELOOP_MODE     0x100U // !< The PHY remote loopback mode.
+#define PHY_MCSR_REMOTELOOP_MASK     0x100U /* !< The PHY remote loopback mask. */
+#define PHY_MCSR_REMOTELOOP_MODE     0x100U /* !< The PHY remote loopback mode. */
 
 /*! @brief Defines the timeout macro. */
 #define PHY_READID_TIMEOUT_COUNT 1000U
diff --git a/ports/mimxrt/network_lan.c b/ports/mimxrt/network_lan.c
index 7b725276a1186..5517b54bd02f5 100644
--- a/ports/mimxrt/network_lan.c
+++ b/ports/mimxrt/network_lan.c
@@ -34,10 +34,15 @@
 #include "eth.h"
 #include "hal/phy/device/phyksz8081/fsl_phyksz8081.h"
 #include "hal/phy/device/phydp83825/fsl_phydp83825.h"
+#include "hal/phy/device/phydp83848/fsl_phydp83848.h"
 #include "hal/phy/device/phylan8720/fsl_phylan8720.h"
 
 #include "lwip/netif.h"
 
+#ifndef ENET_TX_CLK_OUTPUT
+#define ENET_TX_CLK_OUTPUT true
+#endif
+
 typedef struct _network_lan_obj_t {
     mp_obj_base_t base;
     eth_t *eth;
@@ -59,11 +64,12 @@ STATIC void network_lan_print(const mp_print_t *print, mp_obj_t self_in, mp_prin
 }
 
 STATIC mp_obj_t network_lan_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
-    enum { ARG_id, ARG_phy_type, ARG_phy_addr};
+    enum { ARG_id, ARG_phy_type, ARG_phy_addr, ARG_phy_clock};
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_id, MP_ARG_INT, {.u_int = 0} },
         { MP_QSTR_phy_type, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} },
         { MP_QSTR_phy_addr, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = ENET_PHY_ADDRESS} },
+        { MP_QSTR_phy_clock, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = ENET_TX_CLK_OUTPUT} },
     };
     // Parse args.
     mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
@@ -78,6 +84,8 @@ STATIC mp_obj_t network_lan_make_new(const mp_obj_type_t *type, size_t n_args, s
             phy_ops = &phyksz8081_ops;
         } else if (phy_type == PHY_DP83825) {
             phy_ops = &phydp83825_ops;
+        } else if (phy_type == PHY_DP83848) {
+            phy_ops = &phydp83848_ops;
         } else if (phy_type == PHY_LAN8720) {
             phy_ops = &phylan8720_ops;
         } else {
@@ -86,6 +94,8 @@ STATIC mp_obj_t network_lan_make_new(const mp_obj_type_t *type, size_t n_args, s
     }
     int phy_addr = args[ARG_phy_addr].u_int;
 
+    bool phy_clock = args[ARG_phy_clock].u_int;
+
     // Prepare for two ETH interfaces.
     const network_lan_obj_t *self;
     int mac_id = args[ARG_id].u_int;
@@ -99,7 +109,7 @@ STATIC mp_obj_t network_lan_make_new(const mp_obj_type_t *type, size_t n_args, s
         mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("Invalid LAN interface %d"), mac_id);
     }
 
-    eth_init(self->eth, mac_id, phy_ops, phy_addr);
+    eth_init(self->eth, mac_id, phy_ops, phy_addr, phy_clock);
     // register with network module
     mod_network_register_nic((mp_obj_t *)self);
     return MP_OBJ_FROM_PTR(self);
@@ -203,7 +213,10 @@ STATIC const mp_rom_map_elem_t network_lan_locals_dict_table[] = {
 
     { MP_ROM_QSTR(MP_QSTR_PHY_KSZ8081), MP_ROM_INT(PHY_KSZ8081) },
     { MP_ROM_QSTR(MP_QSTR_PHY_DP83825), MP_ROM_INT(PHY_DP83825) },
+    { MP_ROM_QSTR(MP_QSTR_PHY_DP83848), MP_ROM_INT(PHY_DP83848) },
     { MP_ROM_QSTR(MP_QSTR_PHY_LAN8720), MP_ROM_INT(PHY_LAN8720) },
+    { MP_ROM_QSTR(MP_QSTR_IN), MP_ROM_INT(PHY_TX_CLK_IN) },
+    { MP_ROM_QSTR(MP_QSTR_OUT), MP_ROM_INT(PHY_TX_CLK_OUT) },
 };
 STATIC MP_DEFINE_CONST_DICT(network_lan_locals_dict, network_lan_locals_dict_table);
 

From 74e8db0ed15ec0dc7ed5408dfe84f2a9a675d231 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Tue, 30 Nov 2021 20:23:03 +0100
Subject: [PATCH 1491/3533] mimxrt: Refactor the reading of the machine id.

The ID is read in a single function and used for:
- machine.unique_id()
- Ethernet MAC addresses.
- ...

That facilitates use of other MCU using a different access method for
the ID (e.g. i.MX RT1176).
---
 ports/mimxrt/modmachine.c |  5 +----
 ports/mimxrt/mphalport.c  | 18 +++++++++++++++---
 ports/mimxrt/mphalport.h  |  1 +
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/ports/mimxrt/modmachine.c b/ports/mimxrt/modmachine.c
index e7f096134424f..63cec05507354 100644
--- a/ports/mimxrt/modmachine.c
+++ b/ports/mimxrt/modmachine.c
@@ -37,7 +37,6 @@
 #include "pin.h"
 #include "modmachine.h"
 #include "fsl_clock.h"
-#include "fsl_ocotp.h"
 #include "fsl_wdog.h"
 
 #include CPU_HEADER_H
@@ -52,9 +51,7 @@ typedef enum {
 
 STATIC mp_obj_t machine_unique_id(void) {
     unsigned char id[8];
-    OCOTP_Init(OCOTP, CLOCK_GetFreq(kCLOCK_IpgClk));
-    *(uint32_t *)&id[0] = OCOTP->CFG0;
-    *(uint32_t *)&id[4] = OCOTP->CFG1;
+    mp_hal_get_unique_id(id);
     return mp_obj_new_bytes(id, sizeof(id));
 }
 MP_DEFINE_CONST_FUN_OBJ_0(machine_unique_id_obj, machine_unique_id);
diff --git a/ports/mimxrt/mphalport.c b/ports/mimxrt/mphalport.c
index 66498d7b2771f..17a6898c40ad9 100644
--- a/ports/mimxrt/mphalport.c
+++ b/ports/mimxrt/mphalport.c
@@ -123,13 +123,25 @@ uint64_t mp_hal_time_ns(void) {
 /*******************************************************************************/
 // MAC address
 
+void mp_hal_get_unique_id(uint8_t id[]) {
+    OCOTP_Init(OCOTP, CLOCK_GetFreq(kCLOCK_IpgClk));
+    *(uint32_t *)&id[0] = OCOTP->CFG0;
+    *(uint32_t *)&id[4] = OCOTP->CFG1;
+}
+
 // Generate a random locally administered MAC address (LAA)
 void mp_hal_generate_laa_mac(int idx, uint8_t buf[6]) {
     // Take the MAC addr from the OTP's Configuration and Manufacturing Info
-    OCOTP_Init(OCOTP, CLOCK_GetFreq(kCLOCK_IpgClk));
+    unsigned char id[8];
+    mp_hal_get_unique_id(id);
+
+    uint32_t pt1 = *(uint32_t *)&id[0];
+    uint32_t pt2 = *(uint32_t *)&id[4];
+
     buf[0] = 0x02; // Locally Administered MAC
-    *(uint32_t *)&buf[1] = OCOTP->CFG0 ^ (OCOTP->CFG0 >> 8);
-    *(uint16_t *)&buf[4] = (uint16_t)(OCOTP->CFG1 ^ (OCOTP->CFG1 >> 16));
+    *(uint32_t *)&buf[1] = pt1 ^ (pt1 >> 8);
+    *(uint16_t *)&buf[4] = (uint16_t)(pt2 ^ pt2 >> 16);
+    buf[5] ^= (uint8_t)idx;
 }
 
 // A board can override this if needed
diff --git a/ports/mimxrt/mphalport.h b/ports/mimxrt/mphalport.h
index 5210ff44a3fd2..124b905604d0b 100644
--- a/ports/mimxrt/mphalport.h
+++ b/ports/mimxrt/mphalport.h
@@ -103,5 +103,6 @@ enum {
 void mp_hal_generate_laa_mac(int idx, uint8_t buf[6]);
 void mp_hal_get_mac(int idx, uint8_t buf[6]);
 void mp_hal_get_mac_ascii(int idx, size_t chr_off, size_t chr_len, char *dest);
+void mp_hal_get_unique_id(uint8_t id[]);
 
 #endif // MICROPY_INCLUDED_MIMXRT_MPHALPORT_H

From 64aa0bcb88cda556e77df4ab66d4005b1ec6a8e5 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Tue, 7 Dec 2021 11:38:37 +0100
Subject: [PATCH 1492/3533] mimxrt: Enable ticks_cpu at boot time for NDEBUG
 builds only.

Otherwise, it get's in trouble with a Debugger. Reason to be found.
Also: Increase code segment to 2 MB for the MIMXRT1050_EVK build.
---
 ports/mimxrt/boards/MIMXRT1052.ld | 2 +-
 ports/mimxrt/ticks.c              | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/ports/mimxrt/boards/MIMXRT1052.ld b/ports/mimxrt/boards/MIMXRT1052.ld
index 78d21ef3c498c..f7c60d24f4d19 100644
--- a/ports/mimxrt/boards/MIMXRT1052.ld
+++ b/ports/mimxrt/boards/MIMXRT1052.ld
@@ -19,7 +19,7 @@ ivt_size            = 0x00001000;
 interrupts_start    = flash_start + 0x00002000;
 interrupts_size     = 0x00000400;
 text_start          = flash_start + 0x00002400;
-vfs_start           = flash_start + 0x00100000;
+vfs_start           = flash_start + 0x00200000;
 text_size           = ((vfs_start) - (text_start));
 vfs_size            = ((flash_end) - (vfs_start));
 itcm_start          = 0x00000000;
diff --git a/ports/mimxrt/ticks.c b/ports/mimxrt/ticks.c
index 5ae6f7f13bda3..0fc9babc04b46 100644
--- a/ports/mimxrt/ticks.c
+++ b/ports/mimxrt/ticks.c
@@ -56,7 +56,9 @@ void ticks_init(void) {
     NVIC_EnableIRQ(GPTx_IRQn);
 
     GPT_StartTimer(GPTx);
+    #ifdef NDEBUG
     mp_hal_ticks_cpu_enable();
+    #endif
 }
 
 void GPTx_IRQHandler(void) {

From c5dbbf71c0021e03bf39aeedf31561be81b61978 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Thu, 9 Dec 2021 08:44:26 +0100
Subject: [PATCH 1493/3533] mimxrt: Use -Og instead of -O0 for DEBUG builds.

Thanks for the hint, Damien. The DEBUG build got very large recently.
The major difference is, that inline function are now inlined and
not included as a function. That's good and maybe bad. The good thing is,
that the code speed si now close to the final code. It could be worse
in single step debugging. I'll see.

Setting this option caused a new warning and a formatting error
to pop up at different places. Fixed as well.
---
 ports/mimxrt/Makefile                                   | 2 +-
 ports/mimxrt/hal/phy/device/phydp83848/fsl_phydp83848.c | 2 +-
 ports/mimxrt/mimxrt_flash.c                             | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ports/mimxrt/Makefile b/ports/mimxrt/Makefile
index 574aebb4cd21e..680e87cac47be 100644
--- a/ports/mimxrt/Makefile
+++ b/ports/mimxrt/Makefile
@@ -125,7 +125,7 @@ LIBS = $(shell $(CC) $(CFLAGS) -print-libgcc-file-name)
 
 # Tune for Debugging or Optimization
 ifeq ($(DEBUG),1)
-CFLAGS += -O0 -ggdb
+CFLAGS += -Og -ggdb
 LDFLAGS += --gc-sections
 CFLAGS += -fdata-sections -ffunction-sections
 else
diff --git a/ports/mimxrt/hal/phy/device/phydp83848/fsl_phydp83848.c b/ports/mimxrt/hal/phy/device/phydp83848/fsl_phydp83848.c
index 0ef618d4210f6..07ce6d1f7fde0 100644
--- a/ports/mimxrt/hal/phy/device/phydp83848/fsl_phydp83848.c
+++ b/ports/mimxrt/hal/phy/device/phydp83848/fsl_phydp83848.c
@@ -25,7 +25,7 @@
 #define PHY_PHYSTS_LINK_MASK          0x0001U /*!< The PHY link up mask. */
 
 #define PHY_RMII_MODE                 0x20
-#define PHY_RMII_REV1_0               0x10   
+#define PHY_RMII_REV1_0               0x10
 
 /*! @brief Defines the timeout macro. */
 #define PHY_READID_TIMEOUT_COUNT 1000U
diff --git a/ports/mimxrt/mimxrt_flash.c b/ports/mimxrt/mimxrt_flash.c
index 25a11ab7ca5aa..27ab987ed17f2 100644
--- a/ports/mimxrt/mimxrt_flash.c
+++ b/ports/mimxrt/mimxrt_flash.c
@@ -79,7 +79,7 @@ status_t flash_erase_block(uint32_t erase_addr) {
 // the vfs driver takes care for erasing the sector if required
 status_t flash_write_block(uint32_t dest_addr, const uint8_t *src, uint32_t length) __attribute__((section(".ram_functions")));
 status_t flash_write_block(uint32_t dest_addr, const uint8_t *src, uint32_t length) {
-    status_t status;
+    status_t status = 0;
     uint32_t size;
     uint32_t next_addr;
 

From 5ca56aaf166c3e7cda178dfe809f8caf599b1dff Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Tue, 5 Oct 2021 20:59:47 +0200
Subject: [PATCH 1494/3533] mimxrt: Tidy up the board flash related files.

- Move the qspi_xxxx_flash_config.c files to hal.
  It turned out that they are less board than flash type specific.
- Change to a common flexspi_flash_config.h header file.
---
 ports/mimxrt/Makefile                         |   5 +-
 .../MIMXRT1010_EVK_flexspi_nor_config.h       | 257 -----------------
 .../MIMXRT1010_EVK/qspi_nor_flash_config.c    | 124 --------
 .../MIMXRT1020_EVK_flexspi_nor_config.h       | 258 -----------------
 .../MIMXRT1050_EVK/qspi_hyper_flash_config.c  | 186 ------------
 .../MIMXRT1050_EVK/qspi_nor_flash_config.c    | 129 ---------
 .../MIMXRT1060_EVK_flexspi_nor_config.h       | 264 ------------------
 .../MIMXRT1060_EVK/qspi_hyper_flash_config.c  | 186 ------------
 .../MIMXRT1060_EVK/qspi_nor_flash_config.c    | 129 ---------
 .../MIMXRT1064_EVK_flexspi_nor_config.h       | 264 ------------------
 .../MIMXRT1064_EVK/qspi_nor_flash_config.c    | 129 ---------
 .../TEENSY40/TEENSY40_flexspi_nor_config.h    | 259 -----------------
 .../boards/TEENSY40/qspi_nor_flash_config.c   | 144 ----------
 .../TEENSY41/TEENSY41_flexspi_nor_config.h    | 259 -----------------
 .../boards/TEENSY41/qspi_nor_flash_config.c   | 144 ----------
 .../flexspi_flash_config.h}                   |   6 +-
 ports/mimxrt/hal/flexspi_hyper_flash.h        |   2 +-
 ports/mimxrt/hal/flexspi_nor_flash.h          |   2 +-
 .../qspi_hyper_flash_config.c                 |   2 +-
 .../qspi_nor_flash_config.c                   |   4 +-
 20 files changed, 10 insertions(+), 2743 deletions(-)
 delete mode 100644 ports/mimxrt/boards/MIMXRT1010_EVK/MIMXRT1010_EVK_flexspi_nor_config.h
 delete mode 100644 ports/mimxrt/boards/MIMXRT1010_EVK/qspi_nor_flash_config.c
 delete mode 100644 ports/mimxrt/boards/MIMXRT1020_EVK/MIMXRT1020_EVK_flexspi_nor_config.h
 delete mode 100644 ports/mimxrt/boards/MIMXRT1050_EVK/qspi_hyper_flash_config.c
 delete mode 100644 ports/mimxrt/boards/MIMXRT1050_EVK/qspi_nor_flash_config.c
 delete mode 100644 ports/mimxrt/boards/MIMXRT1060_EVK/MIMXRT1060_EVK_flexspi_nor_config.h
 delete mode 100644 ports/mimxrt/boards/MIMXRT1060_EVK/qspi_hyper_flash_config.c
 delete mode 100644 ports/mimxrt/boards/MIMXRT1060_EVK/qspi_nor_flash_config.c
 delete mode 100644 ports/mimxrt/boards/MIMXRT1064_EVK/MIMXRT1064_EVK_flexspi_nor_config.h
 delete mode 100644 ports/mimxrt/boards/MIMXRT1064_EVK/qspi_nor_flash_config.c
 delete mode 100644 ports/mimxrt/boards/TEENSY40/TEENSY40_flexspi_nor_config.h
 delete mode 100644 ports/mimxrt/boards/TEENSY40/qspi_nor_flash_config.c
 delete mode 100644 ports/mimxrt/boards/TEENSY41/TEENSY41_flexspi_nor_config.h
 delete mode 100644 ports/mimxrt/boards/TEENSY41/qspi_nor_flash_config.c
 rename ports/mimxrt/{boards/MIMXRT1050_EVK/MIMXRT1050_EVK_flexspi_nor_config.h => hal/flexspi_flash_config.h} (98%)
 rename ports/mimxrt/{boards/MIMXRT1064_EVK => hal}/qspi_hyper_flash_config.c (99%)
 rename ports/mimxrt/{boards/MIMXRT1020_EVK => hal}/qspi_nor_flash_config.c (98%)

diff --git a/ports/mimxrt/Makefile b/ports/mimxrt/Makefile
index 680e87cac47be..32b1145230738 100644
--- a/ports/mimxrt/Makefile
+++ b/ports/mimxrt/Makefile
@@ -90,7 +90,6 @@ CFLAGS += -DXIP_EXTERNAL_FLASH=1 \
 	-DCPU_HEADER_H='<$(MCU_SERIES).h>' \
 	-DBOARD_FLASH_SIZE=$(MICROPY_HW_FLASH_SIZE) \
 	-DMICROPY_HW_FLASH_SIZE=$(MICROPY_HW_FLASH_SIZE) \
-	-DBOARD_FLASH_CONFIG_HEADER_H=\"$(BOARD)_flexspi_nor_config.h\"
 
 ifeq ($(MICROPY_HW_FLASH_TYPE), qspi_nor)
 CFLAGS += -DBOARD_FLASH_OPS_HEADER_H=\"hal/flexspi_nor_flash.h\"
@@ -277,11 +276,11 @@ SRC_C += \
 ifeq ($(MICROPY_HW_FLASH_TYPE), qspi_nor)
 SRC_C += \
 	hal/flexspi_nor_flash.c \
-	$(BOARD_DIR)/qspi_nor_flash_config.c
+	hal/qspi_nor_flash_config.c
 else ifeq ($(MICROPY_HW_FLASH_TYPE), hyperflash)
 SRC_C += \
 	hal/flexspi_hyper_flash.c \
-	$(BOARD_DIR)/qspi_hyper_flash_config.c
+	hal/qspi_hyper_flash_config.c
 else
 $(error Error: Unknown board flash type $(MICROPY_HW_FLASH_TYPE))
 endif
diff --git a/ports/mimxrt/boards/MIMXRT1010_EVK/MIMXRT1010_EVK_flexspi_nor_config.h b/ports/mimxrt/boards/MIMXRT1010_EVK/MIMXRT1010_EVK_flexspi_nor_config.h
deleted file mode 100644
index aeb5f356ea926..0000000000000
--- a/ports/mimxrt/boards/MIMXRT1010_EVK/MIMXRT1010_EVK_flexspi_nor_config.h
+++ /dev/null
@@ -1,257 +0,0 @@
-/*
- * Copyright 2019 NXP
- * All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-// Based on tinyusb/hw/bsp/teensy_40/evkmimxrt1010_flexspi_nor_config.h
-
-#ifndef __EVKMIMXRT1011_FLEXSPI_NOR_CONFIG__
-#define __EVKMIMXRT1011_FLEXSPI_NOR_CONFIG__
-
-#include <stdint.h>
-#include <stdbool.h>
-#include "fsl_common.h"
-
-/*! @name Driver version */
-/*@{*/
-/*! @brief XIP_BOARD driver version 2.0.0. */
-#define FSL_XIP_BOARD_DRIVER_VERSION (MAKE_VERSION(2, 0, 0))
-/*@}*/
-
-/* FLEXSPI memory config block related defintions */
-#define FLEXSPI_CFG_BLK_TAG (0x42464346UL)     // ascii "FCFB" Big Endian
-#define FLEXSPI_CFG_BLK_VERSION (0x56010400UL) // V1.4.0
-#define FLEXSPI_CFG_BLK_SIZE (512)
-
-/* FLEXSPI Feature related definitions */
-#define FLEXSPI_FEATURE_HAS_PARALLEL_MODE 1
-
-/* Lookup table related defintions */
-#define CMD_INDEX_READ 0
-#define CMD_INDEX_READSTATUS 1
-#define CMD_INDEX_WRITEENABLE 2
-#define CMD_INDEX_WRITE 4
-
-#define CMD_LUT_SEQ_IDX_READ 0
-#define CMD_LUT_SEQ_IDX_READSTATUS 1
-#define CMD_LUT_SEQ_IDX_WRITEENABLE 3
-#define CMD_LUT_SEQ_IDX_WRITE 9
-
-#define CMD_SDR 0x01
-#define CMD_DDR 0x21
-#define RADDR_SDR 0x02
-#define RADDR_DDR 0x22
-#define CADDR_SDR 0x03
-#define CADDR_DDR 0x23
-#define MODE1_SDR 0x04
-#define MODE1_DDR 0x24
-#define MODE2_SDR 0x05
-#define MODE2_DDR 0x25
-#define MODE4_SDR 0x06
-#define MODE4_DDR 0x26
-#define MODE8_SDR 0x07
-#define MODE8_DDR 0x27
-#define WRITE_SDR 0x08
-#define WRITE_DDR 0x28
-#define READ_SDR 0x09
-#define READ_DDR 0x29
-#define LEARN_SDR 0x0A
-#define LEARN_DDR 0x2A
-#define DATSZ_SDR 0x0B
-#define DATSZ_DDR 0x2B
-#define DUMMY_SDR 0x0C
-#define DUMMY_DDR 0x2C
-#define DUMMY_RWDS_SDR 0x0D
-#define DUMMY_RWDS_DDR 0x2D
-#define JMP_ON_CS 0x1F
-#define STOP 0
-
-#define FLEXSPI_1PAD 0
-#define FLEXSPI_2PAD 1
-#define FLEXSPI_4PAD 2
-#define FLEXSPI_8PAD 3
-
-#define FLEXSPI_LUT_SEQ(cmd0, pad0, op0, cmd1, pad1, op1)                                                              \
-    (FLEXSPI_LUT_OPERAND0(op0) | FLEXSPI_LUT_NUM_PADS0(pad0) | FLEXSPI_LUT_OPCODE0(cmd0) | FLEXSPI_LUT_OPERAND1(op1) | \
-    FLEXSPI_LUT_NUM_PADS1(pad1) | FLEXSPI_LUT_OPCODE1(cmd1))
-
-// !@brief Definitions for FlexSPI Serial Clock Frequency
-typedef enum _FlexSpiSerialClockFreq
-{
-    kFlexSpiSerialClk_30MHz  = 1,
-    kFlexSpiSerialClk_50MHz  = 2,
-    kFlexSpiSerialClk_60MHz  = 3,
-    kFlexSpiSerialClk_75MHz  = 4,
-    kFlexSpiSerialClk_80MHz  = 5,
-    kFlexSpiSerialClk_100MHz = 6,
-    kFlexSpiSerialClk_120MHz = 7,
-    kFlexSpiSerialClk_133MHz = 8,
-} flexspi_serial_clk_freq_t;
-
-// !@brief FlexSPI clock configuration type
-enum
-{
-    kFlexSpiClk_SDR, // !< Clock configure for SDR mode
-    kFlexSpiClk_DDR, // !< Clock configurat for DDR mode
-};
-
-// !@brief FlexSPI Read Sample Clock Source definition
-typedef enum _FlashReadSampleClkSource
-{
-    kFlexSPIReadSampleClk_LoopbackInternally      = 0,
-    kFlexSPIReadSampleClk_LoopbackFromDqsPad      = 1,
-    kFlexSPIReadSampleClk_LoopbackFromSckPad      = 2,
-    kFlexSPIReadSampleClk_ExternalInputFromDqsPad = 3,
-} flexspi_read_sample_clk_t;
-
-// !@brief Misc feature bit definitions
-enum
-{
-    kFlexSpiMiscOffset_DiffClkEnable            = 0, // !< Bit for Differential clock enable
-    kFlexSpiMiscOffset_Ck2Enable                = 1, // !< Bit for CK2 enable
-    kFlexSpiMiscOffset_ParallelEnable           = 2, // !< Bit for Parallel mode enable
-    kFlexSpiMiscOffset_WordAddressableEnable    = 3, // !< Bit for Word Addressable enable
-    kFlexSpiMiscOffset_SafeConfigFreqEnable     = 4, // !< Bit for Safe Configuration Frequency enable
-    kFlexSpiMiscOffset_PadSettingOverrideEnable = 5, // !< Bit for Pad setting override enable
-    kFlexSpiMiscOffset_DdrModeEnable            = 6, // !< Bit for DDR clock confiuration indication.
-};
-
-// !@brief Flash Type Definition
-enum
-{
-    kFlexSpiDeviceType_SerialNOR    = 1,    // !< Flash devices are Serial NOR
-    kFlexSpiDeviceType_SerialNAND   = 2,    // !< Flash devices are Serial NAND
-    kFlexSpiDeviceType_SerialRAM    = 3,    // !< Flash devices are Serial RAM/HyperFLASH
-    kFlexSpiDeviceType_MCP_NOR_NAND = 0x12, // !< Flash device is MCP device, A1 is Serial NOR, A2 is Serial NAND
-    kFlexSpiDeviceType_MCP_NOR_RAM  = 0x13, // !< Flash deivce is MCP device, A1 is Serial NOR, A2 is Serial RAMs
-};
-
-// !@brief Flash Pad Definitions
-enum
-{
-    kSerialFlash_1Pad  = 1,
-    kSerialFlash_2Pads = 2,
-    kSerialFlash_4Pads = 4,
-    kSerialFlash_8Pads = 8,
-};
-
-// !@brief FlexSPI LUT Sequence structure
-typedef struct _lut_sequence
-{
-    uint8_t seqNum; // !< Sequence Number, valid number: 1-16
-    uint8_t seqId;  // !< Sequence Index, valid number: 0-15
-    uint16_t reserved;
-} flexspi_lut_seq_t;
-
-// !@brief Flash Configuration Command Type
-enum
-{
-    kDeviceConfigCmdType_Generic,    // !< Generic command, for example: configure dummy cycles, drive strength, etc
-    kDeviceConfigCmdType_QuadEnable, // !< Quad Enable command
-    kDeviceConfigCmdType_Spi2Xpi,    // !< Switch from SPI to DPI/QPI/OPI mode
-    kDeviceConfigCmdType_Xpi2Spi,    // !< Switch from DPI/QPI/OPI to SPI mode
-    kDeviceConfigCmdType_Spi2NoCmd,  // !< Switch to 0-4-4/0-8-8 mode
-    kDeviceConfigCmdType_Reset,      // !< Reset device command
-};
-
-// !@brief FlexSPI Memory Configuration Block
-typedef struct _FlexSPIConfig
-{
-    uint32_t tag;               // !< [0x000-0x003] Tag, fixed value 0x42464346UL
-    uint32_t version;           // !< [0x004-0x007] Version,[31:24] -'V', [23:16] - Major, [15:8] - Minor, [7:0] - bugfix
-    uint32_t reserved0;         // !< [0x008-0x00b] Reserved for future use
-    uint8_t readSampleClkSrc;   // !< [0x00c-0x00c] Read Sample Clock Source, valid value: 0/1/3
-    uint8_t csHoldTime;         // !< [0x00d-0x00d] CS hold time, default value: 3
-    uint8_t csSetupTime;        // !< [0x00e-0x00e] CS setup time, default value: 3
-    uint8_t columnAddressWidth; // !< [0x00f-0x00f] Column Address with, for HyperBus protocol, it is fixed to 3, For
-    // ! Serial NAND, need to refer to datasheet
-    uint8_t deviceModeCfgEnable; // !< [0x010-0x010] Device Mode Configure enable flag, 1 - Enable, 0 - Disable
-    uint8_t deviceModeType; // !< [0x011-0x011] Specify the configuration command type:Quad Enable, DPI/QPI/OPI switch,
-    // ! Generic configuration, etc.
-    uint16_t waitTimeCfgCommands; // !< [0x012-0x013] Wait time for all configuration commands, unit: 100us, Used for
-    // ! DPI/QPI/OPI switch or reset command
-    flexspi_lut_seq_t deviceModeSeq; // !< [0x014-0x017] Device mode sequence info, [7:0] - LUT sequence id, [15:8] - LUt
-    // ! sequence number, [31:16] Reserved
-    uint32_t deviceModeArg;    // !< [0x018-0x01b] Argument/Parameter for device configuration
-    uint8_t configCmdEnable;   // !< [0x01c-0x01c] Configure command Enable Flag, 1 - Enable, 0 - Disable
-    uint8_t configModeType[3]; // !< [0x01d-0x01f] Configure Mode Type, similar as deviceModeTpe
-    flexspi_lut_seq_t
-        configCmdSeqs[3]; // !< [0x020-0x02b] Sequence info for Device Configuration command, similar as deviceModeSeq
-    uint32_t reserved1;   // !< [0x02c-0x02f] Reserved for future use
-    uint32_t configCmdArgs[3];     // !< [0x030-0x03b] Arguments/Parameters for device Configuration commands
-    uint32_t reserved2;            // !< [0x03c-0x03f] Reserved for future use
-    uint32_t controllerMiscOption; // !< [0x040-0x043] Controller Misc Options, see Misc feature bit definitions for more
-    // ! details
-    uint8_t deviceType;    // !< [0x044-0x044] Device Type:  See Flash Type Definition for more details
-    uint8_t sflashPadType; // !< [0x045-0x045] Serial Flash Pad Type: 1 - Single, 2 - Dual, 4 - Quad, 8 - Octal
-    uint8_t serialClkFreq; // !< [0x046-0x046] Serial Flash Frequencey, device specific definitions, See System Boot
-    // ! Chapter for more details
-    uint8_t lutCustomSeqEnable; // !< [0x047-0x047] LUT customization Enable, it is required if the program/erase cannot
-    // ! be done using 1 LUT sequence, currently, only applicable to HyperFLASH
-    uint32_t reserved3[2];           // !< [0x048-0x04f] Reserved for future use
-    uint32_t sflashA1Size;           // !< [0x050-0x053] Size of Flash connected to A1
-    uint32_t sflashA2Size;           // !< [0x054-0x057] Size of Flash connected to A2
-    uint32_t sflashB1Size;           // !< [0x058-0x05b] Size of Flash connected to B1
-    uint32_t sflashB2Size;           // !< [0x05c-0x05f] Size of Flash connected to B2
-    uint32_t csPadSettingOverride;   // !< [0x060-0x063] CS pad setting override value
-    uint32_t sclkPadSettingOverride; // !< [0x064-0x067] SCK pad setting override value
-    uint32_t dataPadSettingOverride; // !< [0x068-0x06b] data pad setting override value
-    uint32_t dqsPadSettingOverride;  // !< [0x06c-0x06f] DQS pad setting override value
-    uint32_t timeoutInMs;            // !< [0x070-0x073] Timeout threshold for read status command
-    uint32_t commandInterval;        // !< [0x074-0x077] CS deselect interval between two commands
-    uint16_t dataValidTime[2]; // !< [0x078-0x07b] CLK edge to data valid time for PORT A and PORT B, in terms of 0.1ns
-    uint16_t busyOffset;       // !< [0x07c-0x07d] Busy offset, valid value: 0-31
-    uint16_t busyBitPolarity;  // !< [0x07e-0x07f] Busy flag polarity, 0 - busy flag is 1 when flash device is busy, 1 -
-    // ! busy flag is 0 when flash device is busy
-    uint32_t lookupTable[64];           // !< [0x080-0x17f] Lookup table holds Flash command sequences
-    flexspi_lut_seq_t lutCustomSeq[12]; // !< [0x180-0x1af] Customizable LUT Sequences
-    uint32_t reserved4[4];              // !< [0x1b0-0x1bf] Reserved for future use
-} flexspi_mem_config_t;
-
-/*  */
-#define NOR_CMD_LUT_SEQ_IDX_READ_NORMAL 0
-#define NOR_CMD_LUT_SEQ_IDX_READSTATUSREG 1
-#define NOR_CMD_LUT_SEQ_IDX_READ_FAST_QUAD 2
-#define NOR_CMD_LUT_SEQ_IDX_WRITEENABLE 3
-#define NOR_CMD_LUT_SEQ_IDX_READSTATUS_XPI 4
-#define NOR_CMD_LUT_SEQ_IDX_ERASESECTOR 5
-#define NOR_CMD_LUT_SEQ_IDX_WRITESTATUSREG 6
-#define NOR_CMD_LUT_SEQ_IDX_PAGEPROGRAM_QUAD 7
-#define NOR_CMD_LUT_SEQ_IDX_READID 8
-#define NOR_CMD_LUT_SEQ_IDX_PAGEPROGRAM 9
-#define NOR_CMD_LUT_SEQ_IDX_ENTERQPI 10
-#define NOR_CMD_LUT_SEQ_IDX_CHIPERASE 11
-#define NOR_CMD_LUT_SEQ_IDX_EXITQPI 12
-
-/*
- *  Serial NOR configuration block
- */
-typedef struct _flexspi_nor_config
-{
-    flexspi_mem_config_t memConfig; // !< Common memory configuration info via FlexSPI
-    uint32_t pageSize;              // !< Page size of Serial NOR
-    uint32_t sectorSize;            // !< Sector size of Serial NOR
-    uint8_t ipcmdSerialClkFreq;     // !< Clock frequency for IP command
-    uint8_t isUniformBlockSize;     // !< Sector/Block size is the same
-    uint8_t reserved0[2];           // !< Reserved for future use
-    uint8_t serialNorType;          // !< Serial NOR Flash type: 0/1/2/3
-    uint8_t needExitNoCmdMode;      // !< Need to exit NoCmd mode before other IP command
-    uint8_t halfClkForNonReadCmd;   // !< Half the Serial Clock for non-read command: true/false
-    uint8_t needRestoreNoCmdMode;   // !< Need to Restore NoCmd mode after IP commmand execution
-    uint32_t blockSize;             // !< Block size
-    uint32_t reserve2[11];          // !< Reserved for future use
-} flexspi_nor_config_t;
-
-#define FLASH_BUSY_STATUS_POL 0
-#define FLASH_BUSY_STATUS_OFFSET 0
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* __EVKMIMXRT1011_FLEXSPI_NOR_CONFIG__ */
diff --git a/ports/mimxrt/boards/MIMXRT1010_EVK/qspi_nor_flash_config.c b/ports/mimxrt/boards/MIMXRT1010_EVK/qspi_nor_flash_config.c
deleted file mode 100644
index 60d435433acf7..0000000000000
--- a/ports/mimxrt/boards/MIMXRT1010_EVK/qspi_nor_flash_config.c
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * Copyright 2019 NXP
- * All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-// Based on tinyusb/hw/bsp/teensy_40/evkmimxrt1010_flexspi_nor_config.c
-
-#include BOARD_FLASH_CONFIG_HEADER_H
-
-/* Component ID definition, used by tools. */
-#ifndef FSL_COMPONENT_ID
-#define FSL_COMPONENT_ID "platform.drivers.xip_board"
-#endif
-
-/*******************************************************************************
- * Code
- ******************************************************************************/
-#if defined(XIP_BOOT_HEADER_ENABLE) && (XIP_BOOT_HEADER_ENABLE == 1)
-#if defined(__CC_ARM) || defined(__ARMCC_VERSION) || defined(__GNUC__)
-__attribute__((section(".boot_hdr.conf")))
-#elif defined(__ICCARM__)
-#pragma location = ".boot_hdr.conf"
-#endif
-
-const flexspi_nor_config_t qspiflash_config = {
-    .memConfig =
-    {
-        .tag = FLEXSPI_CFG_BLK_TAG,
-        .version = FLEXSPI_CFG_BLK_VERSION,
-        .readSampleClkSrc = kFlexSPIReadSampleClk_LoopbackFromDqsPad,
-        .csHoldTime = 3u,
-        .csSetupTime = 3u,
-        .sflashPadType = kSerialFlash_4Pads,
-        .serialClkFreq = kFlexSpiSerialClk_100MHz,
-        .sflashA1Size = MICROPY_HW_FLASH_SIZE,
-        .lookupTable =
-        {
-            // 0 Read LUTs 0 -> 0
-            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0xEB, RADDR_SDR, FLEXSPI_4PAD, 0x18),
-            FLEXSPI_LUT_SEQ(DUMMY_SDR, FLEXSPI_4PAD, 0x06, READ_SDR, FLEXSPI_4PAD, 0x04),
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-
-            // 1 Read status register -> 1
-            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x05, READ_SDR, FLEXSPI_1PAD, 0x01),
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-
-            // 2 Fast read quad mode - SDR
-            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x6B, RADDR_SDR, FLEXSPI_1PAD, 0x18),
-            FLEXSPI_LUT_SEQ(DUMMY_SDR, FLEXSPI_4PAD, 0x08, READ_SDR, FLEXSPI_4PAD, 0x04),
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-
-            // 3 Write Enable -> 3
-            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x06, STOP, FLEXSPI_1PAD, 0),
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-
-            // 4 Read extend parameters
-            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x81, READ_SDR, FLEXSPI_1PAD, 0x04),
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-
-            // 5 Erase Sector -> 5
-            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x20, RADDR_SDR, FLEXSPI_1PAD, 24),
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-
-            // 6 Write Status Reg
-            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x01, WRITE_SDR, FLEXSPI_1PAD, 0x04),
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-
-            // 7 Page Program - quad mode (-> 9)
-            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x32, RADDR_SDR, FLEXSPI_1PAD, 0x18),
-            FLEXSPI_LUT_SEQ(WRITE_SDR, FLEXSPI_4PAD, 0x04, STOP, FLEXSPI_1PAD, 0),
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-
-            // 8 Read ID
-            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x90, DUMMY_SDR, FLEXSPI_1PAD, 24),
-            FLEXSPI_LUT_SEQ(READ_SDR, FLEXSPI_1PAD, 0x00, 0, 0, 0),
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-
-            // 9 Page Program - single mode -> 9
-            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x02, RADDR_SDR, FLEXSPI_1PAD, 24),
-            FLEXSPI_LUT_SEQ(WRITE_SDR, FLEXSPI_1PAD, 0, 0, 0, 0),
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-
-            // 10 Enter QPI mode
-            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x35, STOP, FLEXSPI_1PAD, 0),
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-
-            // 11 Erase Chip
-            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x60, STOP, FLEXSPI_1PAD, 0),
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-
-            // 12 Exit QPI mode
-            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_4PAD, 0xF5, STOP, FLEXSPI_1PAD, 0),
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-        },
-    },
-    .pageSize = 256u,
-    .sectorSize = 4u * 1024u,
-    .blockSize = 256u * 1024u,
-    .isUniformBlockSize = false,
-};
-#endif /* XIP_BOOT_HEADER_ENABLE */
diff --git a/ports/mimxrt/boards/MIMXRT1020_EVK/MIMXRT1020_EVK_flexspi_nor_config.h b/ports/mimxrt/boards/MIMXRT1020_EVK/MIMXRT1020_EVK_flexspi_nor_config.h
deleted file mode 100644
index 26ed3de36fe0b..0000000000000
--- a/ports/mimxrt/boards/MIMXRT1020_EVK/MIMXRT1020_EVK_flexspi_nor_config.h
+++ /dev/null
@@ -1,258 +0,0 @@
-/*
- * Copyright 2019 NXP.
- * All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-// Based on tinyusb/hw/bsp/teensy_40/evkmimxrt1020_flexspi_nor_config.h
-
-#ifndef __EVKMIMXRT1020_FLEXSPI_NOR_CONFIG__
-#define __EVKMIMXRT1020_FLEXSPI_NOR_CONFIG__
-
-#include <stdint.h>
-#include <stdbool.h>
-#include "fsl_common.h"
-
-/*! @name Driver version */
-/*@{*/
-/*! @brief XIP_BOARD driver version 2.0.0. */
-#define FSL_XIP_BOARD_DRIVER_VERSION (MAKE_VERSION(2, 0, 0))
-/*@}*/
-
-/* FLEXSPI memory config block related defintions */
-#define FLEXSPI_CFG_BLK_TAG (0x42464346UL)     // ascii "FCFB" Big Endian
-#define FLEXSPI_CFG_BLK_VERSION (0x56010400UL) // V1.4.0
-#define FLEXSPI_CFG_BLK_SIZE (512)
-
-/* FLEXSPI Feature related definitions */
-#define FLEXSPI_FEATURE_HAS_PARALLEL_MODE 1
-
-/* Lookup table related defintions */
-#define CMD_INDEX_READ 0
-#define CMD_INDEX_READSTATUS 1
-#define CMD_INDEX_WRITEENABLE 2
-#define CMD_INDEX_WRITE 4
-
-#define CMD_LUT_SEQ_IDX_READ 0
-#define CMD_LUT_SEQ_IDX_READSTATUS 1
-#define CMD_LUT_SEQ_IDX_WRITEENABLE 3
-#define CMD_LUT_SEQ_IDX_WRITE 9
-
-#define CMD_SDR 0x01
-#define CMD_DDR 0x21
-#define RADDR_SDR 0x02
-#define RADDR_DDR 0x22
-#define CADDR_SDR 0x03
-#define CADDR_DDR 0x23
-#define MODE1_SDR 0x04
-#define MODE1_DDR 0x24
-#define MODE2_SDR 0x05
-#define MODE2_DDR 0x25
-#define MODE4_SDR 0x06
-#define MODE4_DDR 0x26
-#define MODE8_SDR 0x07
-#define MODE8_DDR 0x27
-#define WRITE_SDR 0x08
-#define WRITE_DDR 0x28
-#define READ_SDR 0x09
-#define READ_DDR 0x29
-#define LEARN_SDR 0x0A
-#define LEARN_DDR 0x2A
-#define DATSZ_SDR 0x0B
-#define DATSZ_DDR 0x2B
-#define DUMMY_SDR 0x0C
-#define DUMMY_DDR 0x2C
-#define DUMMY_RWDS_SDR 0x0D
-#define DUMMY_RWDS_DDR 0x2D
-#define JMP_ON_CS 0x1F
-#define STOP 0
-
-#define FLEXSPI_1PAD 0
-#define FLEXSPI_2PAD 1
-#define FLEXSPI_4PAD 2
-#define FLEXSPI_8PAD 3
-
-#define FLEXSPI_LUT_SEQ(cmd0, pad0, op0, cmd1, pad1, op1)                                                              \
-    (FLEXSPI_LUT_OPERAND0(op0) | FLEXSPI_LUT_NUM_PADS0(pad0) | FLEXSPI_LUT_OPCODE0(cmd0) | FLEXSPI_LUT_OPERAND1(op1) | \
-    FLEXSPI_LUT_NUM_PADS1(pad1) | FLEXSPI_LUT_OPCODE1(cmd1))
-
-// !@brief Definitions for FlexSPI Serial Clock Frequency
-typedef enum _FlexSpiSerialClockFreq
-{
-    kFlexSpiSerialClk_30MHz  = 1,
-    kFlexSpiSerialClk_50MHz  = 2,
-    kFlexSpiSerialClk_60MHz  = 3,
-    kFlexSpiSerialClk_75MHz  = 4,
-    kFlexSpiSerialClk_80MHz  = 5,
-    kFlexSpiSerialClk_100MHz = 6,
-    kFlexSpiSerialClk_133MHz = 7,
-    kFlexSpiSerialClk_166MHz = 8,
-    kFlexSpiSerialClk_200MHz = 9,
-} flexspi_serial_clk_freq_t;
-
-// !@brief FlexSPI clock configuration type
-enum
-{
-    kFlexSpiClk_SDR, // !< Clock configure for SDR mode
-    kFlexSpiClk_DDR, // !< Clock configurat for DDR mode
-};
-
-// !@brief FlexSPI Read Sample Clock Source definition
-typedef enum _FlashReadSampleClkSource
-{
-    kFlexSPIReadSampleClk_LoopbackInternally      = 0,
-    kFlexSPIReadSampleClk_LoopbackFromDqsPad      = 1,
-    kFlexSPIReadSampleClk_LoopbackFromSckPad      = 2,
-    kFlexSPIReadSampleClk_ExternalInputFromDqsPad = 3,
-} flexspi_read_sample_clk_t;
-
-// !@brief Misc feature bit definitions
-enum
-{
-    kFlexSpiMiscOffset_DiffClkEnable            = 0, // !< Bit for Differential clock enable
-    kFlexSpiMiscOffset_Ck2Enable                = 1, // !< Bit for CK2 enable
-    kFlexSpiMiscOffset_ParallelEnable           = 2, // !< Bit for Parallel mode enable
-    kFlexSpiMiscOffset_WordAddressableEnable    = 3, // !< Bit for Word Addressable enable
-    kFlexSpiMiscOffset_SafeConfigFreqEnable     = 4, // !< Bit for Safe Configuration Frequency enable
-    kFlexSpiMiscOffset_PadSettingOverrideEnable = 5, // !< Bit for Pad setting override enable
-    kFlexSpiMiscOffset_DdrModeEnable            = 6, // !< Bit for DDR clock confiuration indication.
-};
-
-// !@brief Flash Type Definition
-enum
-{
-    kFlexSpiDeviceType_SerialNOR    = 1,    // !< Flash devices are Serial NOR
-    kFlexSpiDeviceType_SerialNAND   = 2,    // !< Flash devices are Serial NAND
-    kFlexSpiDeviceType_SerialRAM    = 3,    // !< Flash devices are Serial RAM/HyperFLASH
-    kFlexSpiDeviceType_MCP_NOR_NAND = 0x12, // !< Flash device is MCP device, A1 is Serial NOR, A2 is Serial NAND
-    kFlexSpiDeviceType_MCP_NOR_RAM  = 0x13, // !< Flash deivce is MCP device, A1 is Serial NOR, A2 is Serial RAMs
-};
-
-// !@brief Flash Pad Definitions
-enum
-{
-    kSerialFlash_1Pad  = 1,
-    kSerialFlash_2Pads = 2,
-    kSerialFlash_4Pads = 4,
-    kSerialFlash_8Pads = 8,
-};
-
-// !@brief FlexSPI LUT Sequence structure
-typedef struct _lut_sequence
-{
-    uint8_t seqNum; // !< Sequence Number, valid number: 1-16
-    uint8_t seqId;  // !< Sequence Index, valid number: 0-15
-    uint16_t reserved;
-} flexspi_lut_seq_t;
-
-// !@brief Flash Configuration Command Type
-enum
-{
-    kDeviceConfigCmdType_Generic,    // !< Generic command, for example: configure dummy cycles, drive strength, etc
-    kDeviceConfigCmdType_QuadEnable, // !< Quad Enable command
-    kDeviceConfigCmdType_Spi2Xpi,    // !< Switch from SPI to DPI/QPI/OPI mode
-    kDeviceConfigCmdType_Xpi2Spi,    // !< Switch from DPI/QPI/OPI to SPI mode
-    kDeviceConfigCmdType_Spi2NoCmd,  // !< Switch to 0-4-4/0-8-8 mode
-    kDeviceConfigCmdType_Reset,      // !< Reset device command
-};
-
-// !@brief FlexSPI Memory Configuration Block
-typedef struct _FlexSPIConfig
-{
-    uint32_t tag;               // !< [0x000-0x003] Tag, fixed value 0x42464346UL
-    uint32_t version;           // !< [0x004-0x007] Version,[31:24] -'V', [23:16] - Major, [15:8] - Minor, [7:0] - bugfix
-    uint32_t reserved0;         // !< [0x008-0x00b] Reserved for future use
-    uint8_t readSampleClkSrc;   // !< [0x00c-0x00c] Read Sample Clock Source, valid value: 0/1/3
-    uint8_t csHoldTime;         // !< [0x00d-0x00d] CS hold time, default value: 3
-    uint8_t csSetupTime;        // !< [0x00e-0x00e] CS setup time, default value: 3
-    uint8_t columnAddressWidth; // !< [0x00f-0x00f] Column Address with, for HyperBus protocol, it is fixed to 3, For
-    // ! Serial NAND, need to refer to datasheet
-    uint8_t deviceModeCfgEnable; // !< [0x010-0x010] Device Mode Configure enable flag, 1 - Enable, 0 - Disable
-    uint8_t deviceModeType; // !< [0x011-0x011] Specify the configuration command type:Quad Enable, DPI/QPI/OPI switch,
-    // ! Generic configuration, etc.
-    uint16_t waitTimeCfgCommands; // !< [0x012-0x013] Wait time for all configuration commands, unit: 100us, Used for
-    // ! DPI/QPI/OPI switch or reset command
-    flexspi_lut_seq_t deviceModeSeq; // !< [0x014-0x017] Device mode sequence info, [7:0] - LUT sequence id, [15:8] - LUt
-    // ! sequence number, [31:16] Reserved
-    uint32_t deviceModeArg;    // !< [0x018-0x01b] Argument/Parameter for device configuration
-    uint8_t configCmdEnable;   // !< [0x01c-0x01c] Configure command Enable Flag, 1 - Enable, 0 - Disable
-    uint8_t configModeType[3]; // !< [0x01d-0x01f] Configure Mode Type, similar as deviceModeTpe
-    flexspi_lut_seq_t
-        configCmdSeqs[3]; // !< [0x020-0x02b] Sequence info for Device Configuration command, similar as deviceModeSeq
-    uint32_t reserved1;   // !< [0x02c-0x02f] Reserved for future use
-    uint32_t configCmdArgs[3];     // !< [0x030-0x03b] Arguments/Parameters for device Configuration commands
-    uint32_t reserved2;            // !< [0x03c-0x03f] Reserved for future use
-    uint32_t controllerMiscOption; // !< [0x040-0x043] Controller Misc Options, see Misc feature bit definitions for more
-    // ! details
-    uint8_t deviceType;    // !< [0x044-0x044] Device Type:  See Flash Type Definition for more details
-    uint8_t sflashPadType; // !< [0x045-0x045] Serial Flash Pad Type: 1 - Single, 2 - Dual, 4 - Quad, 8 - Octal
-    uint8_t serialClkFreq; // !< [0x046-0x046] Serial Flash Frequencey, device specific definitions, See System Boot
-    // ! Chapter for more details
-    uint8_t lutCustomSeqEnable; // !< [0x047-0x047] LUT customization Enable, it is required if the program/erase cannot
-    // ! be done using 1 LUT sequence, currently, only applicable to HyperFLASH
-    uint32_t reserved3[2];           // !< [0x048-0x04f] Reserved for future use
-    uint32_t sflashA1Size;           // !< [0x050-0x053] Size of Flash connected to A1
-    uint32_t sflashA2Size;           // !< [0x054-0x057] Size of Flash connected to A2
-    uint32_t sflashB1Size;           // !< [0x058-0x05b] Size of Flash connected to B1
-    uint32_t sflashB2Size;           // !< [0x05c-0x05f] Size of Flash connected to B2
-    uint32_t csPadSettingOverride;   // !< [0x060-0x063] CS pad setting override value
-    uint32_t sclkPadSettingOverride; // !< [0x064-0x067] SCK pad setting override value
-    uint32_t dataPadSettingOverride; // !< [0x068-0x06b] data pad setting override value
-    uint32_t dqsPadSettingOverride;  // !< [0x06c-0x06f] DQS pad setting override value
-    uint32_t timeoutInMs;            // !< [0x070-0x073] Timeout threshold for read status command
-    uint32_t commandInterval;        // !< [0x074-0x077] CS deselect interval between two commands
-    uint16_t dataValidTime[2]; // !< [0x078-0x07b] CLK edge to data valid time for PORT A and PORT B, in terms of 0.1ns
-    uint16_t busyOffset;       // !< [0x07c-0x07d] Busy offset, valid value: 0-31
-    uint16_t busyBitPolarity;  // !< [0x07e-0x07f] Busy flag polarity, 0 - busy flag is 1 when flash device is busy, 1 -
-    // ! busy flag is 0 when flash device is busy
-    uint32_t lookupTable[64];           // !< [0x080-0x17f] Lookup table holds Flash command sequences
-    flexspi_lut_seq_t lutCustomSeq[12]; // !< [0x180-0x1af] Customizable LUT Sequences
-    uint32_t reserved4[4];              // !< [0x1b0-0x1bf] Reserved for future use
-} flexspi_mem_config_t;
-
-/*  */
-#define NOR_CMD_LUT_SEQ_IDX_READ_NORMAL 0
-#define NOR_CMD_LUT_SEQ_IDX_READSTATUSREG 1
-#define NOR_CMD_LUT_SEQ_IDX_READ_FAST_QUAD 2
-#define NOR_CMD_LUT_SEQ_IDX_WRITEENABLE 3
-#define NOR_CMD_LUT_SEQ_IDX_READSTATUS_XPI 4
-#define NOR_CMD_LUT_SEQ_IDX_ERASESECTOR 5
-#define NOR_CMD_LUT_SEQ_IDX_WRITESTATUSREG 6
-#define NOR_CMD_LUT_SEQ_IDX_PAGEPROGRAM_QUAD 7
-#define NOR_CMD_LUT_SEQ_IDX_READID 8
-#define NOR_CMD_LUT_SEQ_IDX_PAGEPROGRAM 9
-#define NOR_CMD_LUT_SEQ_IDX_ENTERQPI 10
-#define NOR_CMD_LUT_SEQ_IDX_CHIPERASE 11
-#define NOR_CMD_LUT_SEQ_IDX_EXITQPI 12
-
-/*
- *  Serial NOR configuration block
- */
-typedef struct _flexspi_nor_config
-{
-    flexspi_mem_config_t memConfig; // !< Common memory configuration info via FlexSPI
-    uint32_t pageSize;              // !< Page size of Serial NOR
-    uint32_t sectorSize;            // !< Sector size of Serial NOR
-    uint8_t ipcmdSerialClkFreq;     // !< Clock frequency for IP command
-    uint8_t isUniformBlockSize;     // !< Sector/Block size is the same
-    uint8_t reserved0[2];           // !< Reserved for future use
-    uint8_t serialNorType;          // !< Serial NOR Flash type: 0/1/2/3
-    uint8_t needExitNoCmdMode;      // !< Need to exit NoCmd mode before other IP command
-    uint8_t halfClkForNonReadCmd;   // !< Half the Serial Clock for non-read command: true/false
-    uint8_t needRestoreNoCmdMode;   // !< Need to Restore NoCmd mode after IP commmand execution
-    uint32_t blockSize;             // !< Block size
-    uint32_t reserve2[11];          // !< Reserved for future use
-} flexspi_nor_config_t;
-
-#define FLASH_BUSY_STATUS_POL 0
-#define FLASH_BUSY_STATUS_OFFSET 0
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* __EVKMIMXRT1020_FLEXSPI_NOR_CONFIG__ */
diff --git a/ports/mimxrt/boards/MIMXRT1050_EVK/qspi_hyper_flash_config.c b/ports/mimxrt/boards/MIMXRT1050_EVK/qspi_hyper_flash_config.c
deleted file mode 100644
index f5ffbe8413a7d..0000000000000
--- a/ports/mimxrt/boards/MIMXRT1050_EVK/qspi_hyper_flash_config.c
+++ /dev/null
@@ -1,186 +0,0 @@
-/*
- * Copyright 2018 NXP
- * All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-#include BOARD_FLASH_CONFIG_HEADER_H
-
-/* Component ID definition, used by tools. */
-#ifndef FSL_COMPONENT_ID
-#define FSL_COMPONENT_ID "platform.drivers.xip_board"
-#endif
-
-/*******************************************************************************
- * Code
- ******************************************************************************/
-#if defined(XIP_BOOT_HEADER_ENABLE) && (XIP_BOOT_HEADER_ENABLE == 1)
-#if defined(__CC_ARM) || defined(__ARMCC_VERSION) || defined(__GNUC__)
-__attribute__((section(".boot_hdr.conf")))
-#elif defined(__ICCARM__)
-#pragma location = ".boot_hdr.conf"
-#endif
-
-const flexspi_nor_config_t qspiflash_config = {
-    .memConfig =
-    {
-        .tag = FLEXSPI_CFG_BLK_TAG,
-        .version = FLEXSPI_CFG_BLK_VERSION,
-        .readSampleClkSrc = kFlexSPIReadSampleClk_ExternalInputFromDqsPad,
-        .csHoldTime = 3u,
-        .csSetupTime = 3u,
-        .columnAddressWidth = 3u,
-        // Enable DDR mode, Wordaddressable, Safe configuration, Differential clock
-        .controllerMiscOption =
-            (1u << kFlexSpiMiscOffset_DdrModeEnable) | (1u << kFlexSpiMiscOffset_WordAddressableEnable) |
-            (1u << kFlexSpiMiscOffset_SafeConfigFreqEnable) | (1u << kFlexSpiMiscOffset_DiffClkEnable),
-        .sflashPadType = kSerialFlash_8Pads,
-        .serialClkFreq = kFlexSpiSerialClk_133MHz,
-        .sflashA1Size = MICROPY_HW_FLASH_SIZE,
-        .dataValidTime = {16u, 16u},
-        .lookupTable =
-        {
-            /* 0 Read Data */
-            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_READDATA] =
-                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xA0, kFLEXSPI_Command_RADDR_DDR, kFLEXSPI_8PAD, 0x18),
-            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_READDATA + 1] = FLEXSPI_LUT_SEQ(
-                kFLEXSPI_Command_CADDR_DDR, kFLEXSPI_8PAD, 0x10, kFLEXSPI_Command_READ_DDR, kFLEXSPI_8PAD, 0x04),
-
-            /* 1 Write Data */
-            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEDATA] =
-                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x20, kFLEXSPI_Command_RADDR_DDR, kFLEXSPI_8PAD, 0x18),
-            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEDATA + 1] = FLEXSPI_LUT_SEQ(
-                kFLEXSPI_Command_CADDR_DDR, kFLEXSPI_8PAD, 0x10, kFLEXSPI_Command_WRITE_DDR, kFLEXSPI_8PAD, 0x02),
-
-            /* 2 Read Status */
-            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_READSTATUS] =
-                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00),
-            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_READSTATUS + 1] = FLEXSPI_LUT_SEQ(
-                kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xAA),         // ADDR 0x555
-            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_READSTATUS + 2] =
-                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x05),
-            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_READSTATUS + 3] = FLEXSPI_LUT_SEQ(
-                kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x70),         // DATA 0x70
-            // +1
-            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_READSTATUS + 4] =
-                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xA0, kFLEXSPI_Command_RADDR_DDR, kFLEXSPI_8PAD, 0x18),
-            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_READSTATUS + 5] = FLEXSPI_LUT_SEQ(
-                kFLEXSPI_Command_CADDR_DDR, kFLEXSPI_8PAD, 0x10, kFLEXSPI_Command_DUMMY_RWDS_DDR, kFLEXSPI_8PAD, 0x0B),
-            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_READSTATUS + 6] =
-                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_READ_DDR, kFLEXSPI_8PAD, 0x04, kFLEXSPI_Command_STOP, kFLEXSPI_1PAD, 0x0),
-
-            /* 4 Write Enable */
-            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEENABLE] =
-                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x20, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00),
-            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEENABLE + 1] = FLEXSPI_LUT_SEQ(
-                kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xAA),         // ADDR 0x555
-            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEENABLE + 2] =
-                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x05),
-            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEENABLE + 3] = FLEXSPI_LUT_SEQ(
-                kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xAA),         // DATA 0xAA
-            // +1
-            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEENABLE + 4] =
-                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x20, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00),
-            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEENABLE + 5] =
-                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x55),
-            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEENABLE + 6] =
-                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x02),
-            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEENABLE + 7] =
-                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x55),
-
-            /* 6 Erase Sector  */
-            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR] =
-                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00),
-            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 1] = FLEXSPI_LUT_SEQ(
-                kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xAA),         // ADDR 0x555
-            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 2] =
-                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x05),
-            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 3] = FLEXSPI_LUT_SEQ(
-                kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x80),         // DATA 0x80
-            // +1
-            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 4] =
-                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00),
-            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 5] =
-                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xAA),
-            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 6] =
-                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x05),
-            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 7] = FLEXSPI_LUT_SEQ(
-                kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xAA),         // ADDR 0x555
-            // +2
-            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 8] =
-                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00),
-            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 9] =
-                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x55),
-            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 10] =
-                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x02),
-            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 11] =
-                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x55),
-            // +3
-            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 12] =
-                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_RADDR_DDR, kFLEXSPI_8PAD, 0x18),
-            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 13] =
-                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_CADDR_DDR, kFLEXSPI_8PAD, 0x10, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00),
-            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 14] =
-                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x30, kFLEXSPI_Command_STOP, kFLEXSPI_1PAD, 0x00),
-
-            /* 10 program page with word program command sequence */
-            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_PAGEPROGRAM] =
-                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x20, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00),
-            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_PAGEPROGRAM + 1] = FLEXSPI_LUT_SEQ(
-                kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xAA),         // ADDR 0x555
-            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_PAGEPROGRAM + 2] =
-                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x05),
-            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_PAGEPROGRAM + 3] = FLEXSPI_LUT_SEQ(
-                kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xA0),         // DATA 0xA0
-            // +1
-            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_PAGEPROGRAM + 4] =
-                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x20, kFLEXSPI_Command_RADDR_DDR, kFLEXSPI_8PAD, 0x18),
-            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_PAGEPROGRAM + 5] = FLEXSPI_LUT_SEQ(
-                kFLEXSPI_Command_CADDR_DDR, kFLEXSPI_8PAD, 0x10, kFLEXSPI_Command_WRITE_DDR, kFLEXSPI_8PAD, 0x80),
-
-            /* 12 Erase chip */
-            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP] =
-                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00),
-            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 1] =
-                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xAA),
-            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 2] =
-                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x05),
-            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 3] =
-                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x80),
-            // +1
-            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 4] =
-                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00),
-            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 5] =
-                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xAA),
-            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 6] =
-                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x05),
-            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 7] =
-                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xAA),
-            // +2
-            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 8] =
-                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00),
-            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 9] =
-                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x55),
-            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 10] =
-                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x02),
-            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 11] =
-                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x55),
-            // +3
-            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 12] =
-                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00),
-            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 13] =
-                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xAA),
-            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 14] =
-                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x05),
-            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 15] =
-                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x10),
-        },
-    },
-    .pageSize = 512u,
-    .sectorSize = 256u * 1024u,
-    .blockSize = 256u * 1024u,
-    .isUniformBlockSize = true,
-};
-
-#endif /* XIP_BOOT_HEADER_ENABLE */
diff --git a/ports/mimxrt/boards/MIMXRT1050_EVK/qspi_nor_flash_config.c b/ports/mimxrt/boards/MIMXRT1050_EVK/qspi_nor_flash_config.c
deleted file mode 100644
index 73525b5dfcadc..0000000000000
--- a/ports/mimxrt/boards/MIMXRT1050_EVK/qspi_nor_flash_config.c
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * Copyright 2018 NXP
- * All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-#include BOARD_FLASH_CONFIG_HEADER_H
-
-/* Component ID definition, used by tools. */
-#ifndef FSL_COMPONENT_ID
-#define FSL_COMPONENT_ID "platform.drivers.xip_board"
-#endif
-
-/*******************************************************************************
- * Code
- ******************************************************************************/
-#if defined(XIP_BOOT_HEADER_ENABLE) && (XIP_BOOT_HEADER_ENABLE == 1)
-#if defined(__CC_ARM) || defined(__ARMCC_VERSION) || defined(__GNUC__)
-__attribute__((section(".boot_hdr.conf")))
-#elif defined(__ICCARM__)
-#pragma location = ".boot_hdr.conf"
-#endif
-
-const flexspi_nor_config_t qspiflash_config = {
-    .memConfig =
-    {
-        .tag = FLEXSPI_CFG_BLK_TAG,
-        .version = FLEXSPI_CFG_BLK_VERSION,
-        .readSampleClkSrc = kFlexSPIReadSampleClk_ExternalInputFromDqsPad,
-        .csHoldTime = 3u,
-        .csSetupTime = 3u,
-        .columnAddressWidth = 3u,
-        // Enable DDR mode, Wordaddassable, Safe configuration, Differential clock
-        .controllerMiscOption =
-            (1u << kFlexSpiMiscOffset_DdrModeEnable) | (1u << kFlexSpiMiscOffset_WordAddressableEnable) |
-            (1u << kFlexSpiMiscOffset_SafeConfigFreqEnable) | (1u << kFlexSpiMiscOffset_DiffClkEnable),
-        .sflashPadType = kSerialFlash_8Pads,
-        .serialClkFreq = kFlexSpiSerialClk_133MHz,
-        .sflashA1Size = MICROPY_HW_FLASH_SIZE,
-        .dataValidTime = {16u, 16u},
-        .lookupTable =
-        {
-            // 0 Read LUTs 0 -> 0
-            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0xEB, RADDR_SDR, FLEXSPI_4PAD, 0x18),
-            FLEXSPI_LUT_SEQ(DUMMY_SDR, FLEXSPI_4PAD, 0x06, READ_SDR, FLEXSPI_4PAD, 0x04),
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-
-            // 1 Read status register -> 1
-            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x05, READ_SDR, FLEXSPI_1PAD, 0x01),
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-
-            // 2 Fast read quad mode - SDR
-            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x6B, RADDR_SDR, FLEXSPI_1PAD, 0x18),
-            FLEXSPI_LUT_SEQ(DUMMY_SDR, FLEXSPI_4PAD, 0x08, READ_SDR, FLEXSPI_4PAD, 0x04),
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-
-            // 3 Write Enable -> 3
-            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x06, STOP, FLEXSPI_1PAD, 0),
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-
-            // 4 Read extend parameters
-            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x81, READ_SDR, FLEXSPI_1PAD, 0x04),
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-
-            // 5 Erase Sector -> 5
-            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x20, RADDR_SDR, FLEXSPI_1PAD, 24),
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-
-            // 6 Write Status Reg
-            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x01, WRITE_SDR, FLEXSPI_1PAD, 0x04),
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-
-            // 7 Page Program - quad mode (-> 9)
-            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x32, RADDR_SDR, FLEXSPI_1PAD, 0x18),
-            FLEXSPI_LUT_SEQ(WRITE_SDR, FLEXSPI_4PAD, 0x04, STOP, FLEXSPI_1PAD, 0),
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-
-            // 8 Read ID
-            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x90, DUMMY_SDR, FLEXSPI_1PAD, 24),
-            FLEXSPI_LUT_SEQ(READ_SDR, FLEXSPI_1PAD, 0x00, 0, 0, 0),
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-
-            // 9 Page Program - single mode -> 9
-            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x02, RADDR_SDR, FLEXSPI_1PAD, 24),
-            FLEXSPI_LUT_SEQ(WRITE_SDR, FLEXSPI_1PAD, 0, 0, 0, 0),
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-
-            // 10 Enter QPI mode
-            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x35, STOP, FLEXSPI_1PAD, 0),
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-
-            // 11 Erase Chip
-            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x60, STOP, FLEXSPI_1PAD, 0),
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-
-            // 12 Exit QPI mode
-            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_4PAD, 0xF5, STOP, FLEXSPI_1PAD, 0),
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-        },
-    },
-    .pageSize = 512u,
-    .sectorSize = 256u * 1024u,
-    .blockSize = 256u * 1024u,
-    .isUniformBlockSize = true,
-};
-
-#endif /* XIP_BOOT_HEADER_ENABLE */
diff --git a/ports/mimxrt/boards/MIMXRT1060_EVK/MIMXRT1060_EVK_flexspi_nor_config.h b/ports/mimxrt/boards/MIMXRT1060_EVK/MIMXRT1060_EVK_flexspi_nor_config.h
deleted file mode 100644
index e447733f06d91..0000000000000
--- a/ports/mimxrt/boards/MIMXRT1060_EVK/MIMXRT1060_EVK_flexspi_nor_config.h
+++ /dev/null
@@ -1,264 +0,0 @@
-/*
- * Copyright 2018 NXP
- * All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-#ifndef __EVKMIMXRT1060_FLEXSPI_NOR_CONFIG__
-#define __EVKMIMXRT1060_FLEXSPI_NOR_CONFIG__
-
-#include <stdint.h>
-#include <stdbool.h>
-#include "fsl_flexspi.h"
-
-/*! @name Driver version */
-/*@{*/
-/*! @brief XIP_BOARD driver version 2.0.0. */
-#define FSL_XIP_BOARD_DRIVER_VERSION (MAKE_VERSION(2, 0, 0))
-/*@}*/
-
-/* FLEXSPI memory config block related defintions */
-#define FLEXSPI_CFG_BLK_TAG     (0x42464346UL) // ascii "FCFB" Big Endian
-#define FLEXSPI_CFG_BLK_VERSION (0x56010400UL) // V1.4.0
-#define FLEXSPI_CFG_BLK_SIZE    (512)
-
-/* FLEXSPI Feature related definitions */
-#define FLEXSPI_FEATURE_HAS_PARALLEL_MODE 1
-
-/* Lookup table related defintions */
-#define CMD_INDEX_READ        0
-#define CMD_INDEX_READSTATUS  1
-#define CMD_INDEX_WRITEENABLE 2
-#define CMD_INDEX_WRITE       4
-
-#define CMD_LUT_SEQ_IDX_READ        0
-#define CMD_LUT_SEQ_IDX_READSTATUS  1
-#define CMD_LUT_SEQ_IDX_WRITEENABLE 3
-#define CMD_LUT_SEQ_IDX_WRITE       9
-
-#define CMD_SDR        0x01
-#define CMD_DDR        0x21
-#define RADDR_SDR      0x02
-#define RADDR_DDR      0x22
-#define CADDR_SDR      0x03
-#define CADDR_DDR      0x23
-#define MODE1_SDR      0x04
-#define MODE1_DDR      0x24
-#define MODE2_SDR      0x05
-#define MODE2_DDR      0x25
-#define MODE4_SDR      0x06
-#define MODE4_DDR      0x26
-#define MODE8_SDR      0x07
-#define MODE8_DDR      0x27
-#define WRITE_SDR      0x08
-#define WRITE_DDR      0x28
-#define READ_SDR       0x09
-#define READ_DDR       0x29
-#define LEARN_SDR      0x0A
-#define LEARN_DDR      0x2A
-#define DATSZ_SDR      0x0B
-#define DATSZ_DDR      0x2B
-#define DUMMY_SDR      0x0C
-#define DUMMY_DDR      0x2C
-#define DUMMY_RWDS_SDR 0x0D
-#define DUMMY_RWDS_DDR 0x2D
-#define JMP_ON_CS      0x1F
-#define STOP           0
-
-#define FLEXSPI_1PAD 0
-#define FLEXSPI_2PAD 1
-#define FLEXSPI_4PAD 2
-#define FLEXSPI_8PAD 3
-
-#define FLEXSPI_LUT_SEQ(cmd0, pad0, op0, cmd1, pad1, op1)                                                              \
-    (FLEXSPI_LUT_OPERAND0(op0) | FLEXSPI_LUT_NUM_PADS0(pad0) | FLEXSPI_LUT_OPCODE0(cmd0) | FLEXSPI_LUT_OPERAND1(op1) | \
-    FLEXSPI_LUT_NUM_PADS1(pad1) | FLEXSPI_LUT_OPCODE1(cmd1))
-
-// !@brief Definitions for FlexSPI Serial Clock Frequency
-typedef enum _FlexSpiSerialClockFreq
-{
-    kFlexSpiSerialClk_30MHz  = 1,
-    kFlexSpiSerialClk_50MHz  = 2,
-    kFlexSpiSerialClk_60MHz  = 3,
-    kFlexSpiSerialClk_75MHz  = 4,
-    kFlexSpiSerialClk_80MHz  = 5,
-    kFlexSpiSerialClk_100MHz = 6,
-    kFlexSpiSerialClk_120MHz = 7,
-    kFlexSpiSerialClk_133MHz = 8,
-    kFlexSpiSerialClk_166MHz = 9,
-} flexspi_serial_clk_freq_t;
-
-// !@brief FlexSPI clock configuration type
-enum
-{
-    kFlexSpiClk_SDR, // !< Clock configure for SDR mode
-    kFlexSpiClk_DDR, // !< Clock configurat for DDR mode
-};
-
-// !@brief FlexSPI Read Sample Clock Source definition
-typedef enum _FlashReadSampleClkSource
-{
-    kFlexSPIReadSampleClk_LoopbackInternally      = 0,
-    kFlexSPIReadSampleClk_LoopbackFromDqsPad      = 1,
-    kFlexSPIReadSampleClk_LoopbackFromSckPad      = 2,
-    kFlexSPIReadSampleClk_ExternalInputFromDqsPad = 3,
-} flexspi_read_sample_clk_t;
-
-// !@brief Misc feature bit definitions
-enum
-{
-    kFlexSpiMiscOffset_DiffClkEnable            = 0, // !< Bit for Differential clock enable
-    kFlexSpiMiscOffset_Ck2Enable                = 1, // !< Bit for CK2 enable
-    kFlexSpiMiscOffset_ParallelEnable           = 2, // !< Bit for Parallel mode enable
-    kFlexSpiMiscOffset_WordAddressableEnable    = 3, // !< Bit for Word Addressable enable
-    kFlexSpiMiscOffset_SafeConfigFreqEnable     = 4, // !< Bit for Safe Configuration Frequency enable
-    kFlexSpiMiscOffset_PadSettingOverrideEnable = 5, // !< Bit for Pad setting override enable
-    kFlexSpiMiscOffset_DdrModeEnable            = 6, // !< Bit for DDR clock confiuration indication.
-};
-
-// !@brief Flash Type Definition
-enum
-{
-    kFlexSpiDeviceType_SerialNOR    = 1,    // !< Flash devices are Serial NOR
-    kFlexSpiDeviceType_SerialNAND   = 2,    // !< Flash devices are Serial NAND
-    kFlexSpiDeviceType_SerialRAM    = 3,    // !< Flash devices are Serial RAM/HyperFLASH
-    kFlexSpiDeviceType_MCP_NOR_NAND = 0x12, // !< Flash device is MCP device, A1 is Serial NOR, A2 is Serial NAND
-    kFlexSpiDeviceType_MCP_NOR_RAM  = 0x13, // !< Flash deivce is MCP device, A1 is Serial NOR, A2 is Serial RAMs
-};
-
-// !@brief Flash Pad Definitions
-enum
-{
-    kSerialFlash_1Pad  = 1,
-    kSerialFlash_2Pads = 2,
-    kSerialFlash_4Pads = 4,
-    kSerialFlash_8Pads = 8,
-};
-
-// !@brief FlexSPI LUT Sequence structure
-typedef struct _lut_sequence
-{
-    uint8_t seqNum; // !< Sequence Number, valid number: 1-16
-    uint8_t seqId;  // !< Sequence Index, valid number: 0-15
-    uint16_t reserved;
-} flexspi_lut_seq_t;
-
-// !@brief Flash Configuration Command Type
-enum
-{
-    kDeviceConfigCmdType_Generic,    // !< Generic command, for example: configure dummy cycles, drive strength, etc
-    kDeviceConfigCmdType_QuadEnable, // !< Quad Enable command
-    kDeviceConfigCmdType_Spi2Xpi,    // !< Switch from SPI to DPI/QPI/OPI mode
-    kDeviceConfigCmdType_Xpi2Spi,    // !< Switch from DPI/QPI/OPI to SPI mode
-    kDeviceConfigCmdType_Spi2NoCmd,  // !< Switch to 0-4-4/0-8-8 mode
-    kDeviceConfigCmdType_Reset,      // !< Reset device command
-};
-
-// !@brief FlexSPI Memory Configuration Block
-typedef struct _FlexSPIConfig
-{
-    uint32_t tag;               // !< [0x000-0x003] Tag, fixed value 0x42464346UL
-    uint32_t version;           // !< [0x004-0x007] Version,[31:24] -'V', [23:16] - Major, [15:8] - Minor, [7:0] - bugfix
-    uint32_t reserved0;         // !< [0x008-0x00b] Reserved for future use
-    uint8_t readSampleClkSrc;   // !< [0x00c-0x00c] Read Sample Clock Source, valid value: 0/1/3
-    uint8_t csHoldTime;         // !< [0x00d-0x00d] CS hold time, default value: 3
-    uint8_t csSetupTime;        // !< [0x00e-0x00e] CS setup time, default value: 3
-    uint8_t columnAddressWidth; // !< [0x00f-0x00f] Column Address with, for HyperBus protocol, it is fixed to 3, For
-    // ! Serial NAND, need to refer to datasheet
-    uint8_t deviceModeCfgEnable; // !< [0x010-0x010] Device Mode Configure enable flag, 1 - Enable, 0 - Disable
-    uint8_t deviceModeType; // !< [0x011-0x011] Specify the configuration command type:Quad Enable, DPI/QPI/OPI switch,
-    // ! Generic configuration, etc.
-    uint16_t waitTimeCfgCommands; // !< [0x012-0x013] Wait time for all configuration commands, unit: 100us, Used for
-    // ! DPI/QPI/OPI switch or reset command
-    flexspi_lut_seq_t deviceModeSeq; // !< [0x014-0x017] Device mode sequence info, [7:0] - LUT sequence id, [15:8] - LUt
-    // ! sequence number, [31:16] Reserved
-    uint32_t deviceModeArg;    // !< [0x018-0x01b] Argument/Parameter for device configuration
-    uint8_t configCmdEnable;   // !< [0x01c-0x01c] Configure command Enable Flag, 1 - Enable, 0 - Disable
-    uint8_t configModeType[3]; // !< [0x01d-0x01f] Configure Mode Type, similar as deviceModeTpe
-    flexspi_lut_seq_t
-        configCmdSeqs[3]; // !< [0x020-0x02b] Sequence info for Device Configuration command, similar as deviceModeSeq
-    uint32_t reserved1;   // !< [0x02c-0x02f] Reserved for future use
-    uint32_t configCmdArgs[3];     // !< [0x030-0x03b] Arguments/Parameters for device Configuration commands
-    uint32_t reserved2;            // !< [0x03c-0x03f] Reserved for future use
-    uint32_t controllerMiscOption; // !< [0x040-0x043] Controller Misc Options, see Misc feature bit definitions for more
-    // ! details
-    uint8_t deviceType;    // !< [0x044-0x044] Device Type:  See Flash Type Definition for more details
-    uint8_t sflashPadType; // !< [0x045-0x045] Serial Flash Pad Type: 1 - Single, 2 - Dual, 4 - Quad, 8 - Octal
-    uint8_t serialClkFreq; // !< [0x046-0x046] Serial Flash Frequencey, device specific definitions, See System Boot
-    // ! Chapter for more details
-    uint8_t lutCustomSeqEnable; // !< [0x047-0x047] LUT customization Enable, it is required if the program/erase cannot
-    // ! be done using 1 LUT sequence, currently, only applicable to HyperFLASH
-    uint32_t reserved3[2];           // !< [0x048-0x04f] Reserved for future use
-    uint32_t sflashA1Size;           // !< [0x050-0x053] Size of Flash connected to A1
-    uint32_t sflashA2Size;           // !< [0x054-0x057] Size of Flash connected to A2
-    uint32_t sflashB1Size;           // !< [0x058-0x05b] Size of Flash connected to B1
-    uint32_t sflashB2Size;           // !< [0x05c-0x05f] Size of Flash connected to B2
-    uint32_t csPadSettingOverride;   // !< [0x060-0x063] CS pad setting override value
-    uint32_t sclkPadSettingOverride; // !< [0x064-0x067] SCK pad setting override value
-    uint32_t dataPadSettingOverride; // !< [0x068-0x06b] data pad setting override value
-    uint32_t dqsPadSettingOverride;  // !< [0x06c-0x06f] DQS pad setting override value
-    uint32_t timeoutInMs;            // !< [0x070-0x073] Timeout threshold for read status command
-    uint32_t commandInterval;        // !< [0x074-0x077] CS deselect interval between two commands
-    uint16_t dataValidTime[2]; // !< [0x078-0x07b] CLK edge to data valid time for PORT A and PORT B, in terms of 0.1ns
-    uint16_t busyOffset;       // !< [0x07c-0x07d] Busy offset, valid value: 0-31
-    uint16_t busyBitPolarity;  // !< [0x07e-0x07f] Busy flag polarity, 0 - busy flag is 1 when flash device is busy, 1 -
-    // ! busy flag is 0 when flash device is busy
-    uint32_t lookupTable[64];           // !< [0x080-0x17f] Lookup table holds Flash command sequences
-    flexspi_lut_seq_t lutCustomSeq[12]; // !< [0x180-0x1af] Customizable LUT Sequences
-    uint32_t reserved4[4];              // !< [0x1b0-0x1bf] Reserved for future use
-} flexspi_mem_config_t;
-
-/*  */
-#define NOR_CMD_LUT_SEQ_IDX_READ_NORMAL 0
-#define NOR_CMD_LUT_SEQ_IDX_READSTATUSREG 1
-#define NOR_CMD_LUT_SEQ_IDX_READ_FAST_QUAD 2
-#define NOR_CMD_LUT_SEQ_IDX_WRITEENABLE 3
-#define NOR_CMD_LUT_SEQ_IDX_READSTATUS_XPI 4
-#define NOR_CMD_LUT_SEQ_IDX_ERASESECTOR 5
-#define NOR_CMD_LUT_SEQ_IDX_WRITESTATUSREG 6
-#define NOR_CMD_LUT_SEQ_IDX_PAGEPROGRAM_QUAD 7
-#define NOR_CMD_LUT_SEQ_IDX_READID 8
-#define NOR_CMD_LUT_SEQ_IDX_PAGEPROGRAM 9
-#define NOR_CMD_LUT_SEQ_IDX_ENTERQPI 10
-#define NOR_CMD_LUT_SEQ_IDX_CHIPERASE 11
-#define NOR_CMD_LUT_SEQ_IDX_EXITQPI 12
-
-#define HYPERFLASH_CMD_LUT_SEQ_IDX_READDATA    0
-#define HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEDATA   1
-#define HYPERFLASH_CMD_LUT_SEQ_IDX_READSTATUS  2
-#define HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEENABLE 4
-#define HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR 6
-#define HYPERFLASH_CMD_LUT_SEQ_IDX_PAGEPROGRAM 10
-#define HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP   12
-
-/*
- *  Serial NOR configuration block
- */
-typedef struct _flexspi_nor_config
-{
-    flexspi_mem_config_t memConfig; // !< Common memory configuration info via FlexSPI
-    uint32_t pageSize;              // !< Page size of Serial NOR
-    uint32_t sectorSize;            // !< Sector size of Serial NOR
-    uint8_t ipcmdSerialClkFreq;     // !< Clock frequency for IP command
-    uint8_t isUniformBlockSize;     // !< Sector/Block size is the same
-    uint8_t reserved0[2];           // !< Reserved for future use
-    uint8_t serialNorType;          // !< Serial NOR Flash type: 0/1/2/3
-    uint8_t needExitNoCmdMode;      // !< Need to exit NoCmd mode before other IP command
-    uint8_t halfClkForNonReadCmd;   // !< Half the Serial Clock for non-read command: true/false
-    uint8_t needRestoreNoCmdMode;   // !< Need to Restore NoCmd mode after IP commmand execution
-    uint32_t blockSize;             // !< Block size
-    uint32_t reserve2[11];          // !< Reserved for future use
-} flexspi_nor_config_t;
-
-#define FLASH_BUSY_STATUS_POL 0
-#define FLASH_BUSY_STATUS_OFFSET 0
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* __EVKMIMXRT1060_FLEXSPI_NOR_CONFIG__ */
diff --git a/ports/mimxrt/boards/MIMXRT1060_EVK/qspi_hyper_flash_config.c b/ports/mimxrt/boards/MIMXRT1060_EVK/qspi_hyper_flash_config.c
deleted file mode 100644
index f5ffbe8413a7d..0000000000000
--- a/ports/mimxrt/boards/MIMXRT1060_EVK/qspi_hyper_flash_config.c
+++ /dev/null
@@ -1,186 +0,0 @@
-/*
- * Copyright 2018 NXP
- * All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-#include BOARD_FLASH_CONFIG_HEADER_H
-
-/* Component ID definition, used by tools. */
-#ifndef FSL_COMPONENT_ID
-#define FSL_COMPONENT_ID "platform.drivers.xip_board"
-#endif
-
-/*******************************************************************************
- * Code
- ******************************************************************************/
-#if defined(XIP_BOOT_HEADER_ENABLE) && (XIP_BOOT_HEADER_ENABLE == 1)
-#if defined(__CC_ARM) || defined(__ARMCC_VERSION) || defined(__GNUC__)
-__attribute__((section(".boot_hdr.conf")))
-#elif defined(__ICCARM__)
-#pragma location = ".boot_hdr.conf"
-#endif
-
-const flexspi_nor_config_t qspiflash_config = {
-    .memConfig =
-    {
-        .tag = FLEXSPI_CFG_BLK_TAG,
-        .version = FLEXSPI_CFG_BLK_VERSION,
-        .readSampleClkSrc = kFlexSPIReadSampleClk_ExternalInputFromDqsPad,
-        .csHoldTime = 3u,
-        .csSetupTime = 3u,
-        .columnAddressWidth = 3u,
-        // Enable DDR mode, Wordaddressable, Safe configuration, Differential clock
-        .controllerMiscOption =
-            (1u << kFlexSpiMiscOffset_DdrModeEnable) | (1u << kFlexSpiMiscOffset_WordAddressableEnable) |
-            (1u << kFlexSpiMiscOffset_SafeConfigFreqEnable) | (1u << kFlexSpiMiscOffset_DiffClkEnable),
-        .sflashPadType = kSerialFlash_8Pads,
-        .serialClkFreq = kFlexSpiSerialClk_133MHz,
-        .sflashA1Size = MICROPY_HW_FLASH_SIZE,
-        .dataValidTime = {16u, 16u},
-        .lookupTable =
-        {
-            /* 0 Read Data */
-            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_READDATA] =
-                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xA0, kFLEXSPI_Command_RADDR_DDR, kFLEXSPI_8PAD, 0x18),
-            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_READDATA + 1] = FLEXSPI_LUT_SEQ(
-                kFLEXSPI_Command_CADDR_DDR, kFLEXSPI_8PAD, 0x10, kFLEXSPI_Command_READ_DDR, kFLEXSPI_8PAD, 0x04),
-
-            /* 1 Write Data */
-            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEDATA] =
-                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x20, kFLEXSPI_Command_RADDR_DDR, kFLEXSPI_8PAD, 0x18),
-            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEDATA + 1] = FLEXSPI_LUT_SEQ(
-                kFLEXSPI_Command_CADDR_DDR, kFLEXSPI_8PAD, 0x10, kFLEXSPI_Command_WRITE_DDR, kFLEXSPI_8PAD, 0x02),
-
-            /* 2 Read Status */
-            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_READSTATUS] =
-                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00),
-            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_READSTATUS + 1] = FLEXSPI_LUT_SEQ(
-                kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xAA),         // ADDR 0x555
-            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_READSTATUS + 2] =
-                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x05),
-            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_READSTATUS + 3] = FLEXSPI_LUT_SEQ(
-                kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x70),         // DATA 0x70
-            // +1
-            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_READSTATUS + 4] =
-                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xA0, kFLEXSPI_Command_RADDR_DDR, kFLEXSPI_8PAD, 0x18),
-            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_READSTATUS + 5] = FLEXSPI_LUT_SEQ(
-                kFLEXSPI_Command_CADDR_DDR, kFLEXSPI_8PAD, 0x10, kFLEXSPI_Command_DUMMY_RWDS_DDR, kFLEXSPI_8PAD, 0x0B),
-            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_READSTATUS + 6] =
-                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_READ_DDR, kFLEXSPI_8PAD, 0x04, kFLEXSPI_Command_STOP, kFLEXSPI_1PAD, 0x0),
-
-            /* 4 Write Enable */
-            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEENABLE] =
-                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x20, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00),
-            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEENABLE + 1] = FLEXSPI_LUT_SEQ(
-                kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xAA),         // ADDR 0x555
-            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEENABLE + 2] =
-                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x05),
-            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEENABLE + 3] = FLEXSPI_LUT_SEQ(
-                kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xAA),         // DATA 0xAA
-            // +1
-            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEENABLE + 4] =
-                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x20, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00),
-            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEENABLE + 5] =
-                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x55),
-            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEENABLE + 6] =
-                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x02),
-            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEENABLE + 7] =
-                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x55),
-
-            /* 6 Erase Sector  */
-            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR] =
-                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00),
-            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 1] = FLEXSPI_LUT_SEQ(
-                kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xAA),         // ADDR 0x555
-            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 2] =
-                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x05),
-            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 3] = FLEXSPI_LUT_SEQ(
-                kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x80),         // DATA 0x80
-            // +1
-            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 4] =
-                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00),
-            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 5] =
-                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xAA),
-            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 6] =
-                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x05),
-            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 7] = FLEXSPI_LUT_SEQ(
-                kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xAA),         // ADDR 0x555
-            // +2
-            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 8] =
-                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00),
-            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 9] =
-                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x55),
-            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 10] =
-                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x02),
-            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 11] =
-                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x55),
-            // +3
-            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 12] =
-                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_RADDR_DDR, kFLEXSPI_8PAD, 0x18),
-            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 13] =
-                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_CADDR_DDR, kFLEXSPI_8PAD, 0x10, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00),
-            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR + 14] =
-                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x30, kFLEXSPI_Command_STOP, kFLEXSPI_1PAD, 0x00),
-
-            /* 10 program page with word program command sequence */
-            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_PAGEPROGRAM] =
-                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x20, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00),
-            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_PAGEPROGRAM + 1] = FLEXSPI_LUT_SEQ(
-                kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xAA),         // ADDR 0x555
-            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_PAGEPROGRAM + 2] =
-                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x05),
-            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_PAGEPROGRAM + 3] = FLEXSPI_LUT_SEQ(
-                kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xA0),         // DATA 0xA0
-            // +1
-            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_PAGEPROGRAM + 4] =
-                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x20, kFLEXSPI_Command_RADDR_DDR, kFLEXSPI_8PAD, 0x18),
-            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_PAGEPROGRAM + 5] = FLEXSPI_LUT_SEQ(
-                kFLEXSPI_Command_CADDR_DDR, kFLEXSPI_8PAD, 0x10, kFLEXSPI_Command_WRITE_DDR, kFLEXSPI_8PAD, 0x80),
-
-            /* 12 Erase chip */
-            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP] =
-                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00),
-            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 1] =
-                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xAA),
-            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 2] =
-                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x05),
-            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 3] =
-                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x80),
-            // +1
-            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 4] =
-                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00),
-            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 5] =
-                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xAA),
-            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 6] =
-                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x05),
-            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 7] =
-                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xAA),
-            // +2
-            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 8] =
-                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00),
-            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 9] =
-                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x55),
-            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 10] =
-                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x02),
-            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 11] =
-                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x55),
-            // +3
-            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 12] =
-                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00),
-            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 13] =
-                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0xAA),
-            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 14] =
-                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x05),
-            [4 * HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP + 15] =
-                FLEXSPI_LUT_SEQ(kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x00, kFLEXSPI_Command_DDR, kFLEXSPI_8PAD, 0x10),
-        },
-    },
-    .pageSize = 512u,
-    .sectorSize = 256u * 1024u,
-    .blockSize = 256u * 1024u,
-    .isUniformBlockSize = true,
-};
-
-#endif /* XIP_BOOT_HEADER_ENABLE */
diff --git a/ports/mimxrt/boards/MIMXRT1060_EVK/qspi_nor_flash_config.c b/ports/mimxrt/boards/MIMXRT1060_EVK/qspi_nor_flash_config.c
deleted file mode 100644
index 73525b5dfcadc..0000000000000
--- a/ports/mimxrt/boards/MIMXRT1060_EVK/qspi_nor_flash_config.c
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * Copyright 2018 NXP
- * All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-#include BOARD_FLASH_CONFIG_HEADER_H
-
-/* Component ID definition, used by tools. */
-#ifndef FSL_COMPONENT_ID
-#define FSL_COMPONENT_ID "platform.drivers.xip_board"
-#endif
-
-/*******************************************************************************
- * Code
- ******************************************************************************/
-#if defined(XIP_BOOT_HEADER_ENABLE) && (XIP_BOOT_HEADER_ENABLE == 1)
-#if defined(__CC_ARM) || defined(__ARMCC_VERSION) || defined(__GNUC__)
-__attribute__((section(".boot_hdr.conf")))
-#elif defined(__ICCARM__)
-#pragma location = ".boot_hdr.conf"
-#endif
-
-const flexspi_nor_config_t qspiflash_config = {
-    .memConfig =
-    {
-        .tag = FLEXSPI_CFG_BLK_TAG,
-        .version = FLEXSPI_CFG_BLK_VERSION,
-        .readSampleClkSrc = kFlexSPIReadSampleClk_ExternalInputFromDqsPad,
-        .csHoldTime = 3u,
-        .csSetupTime = 3u,
-        .columnAddressWidth = 3u,
-        // Enable DDR mode, Wordaddassable, Safe configuration, Differential clock
-        .controllerMiscOption =
-            (1u << kFlexSpiMiscOffset_DdrModeEnable) | (1u << kFlexSpiMiscOffset_WordAddressableEnable) |
-            (1u << kFlexSpiMiscOffset_SafeConfigFreqEnable) | (1u << kFlexSpiMiscOffset_DiffClkEnable),
-        .sflashPadType = kSerialFlash_8Pads,
-        .serialClkFreq = kFlexSpiSerialClk_133MHz,
-        .sflashA1Size = MICROPY_HW_FLASH_SIZE,
-        .dataValidTime = {16u, 16u},
-        .lookupTable =
-        {
-            // 0 Read LUTs 0 -> 0
-            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0xEB, RADDR_SDR, FLEXSPI_4PAD, 0x18),
-            FLEXSPI_LUT_SEQ(DUMMY_SDR, FLEXSPI_4PAD, 0x06, READ_SDR, FLEXSPI_4PAD, 0x04),
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-
-            // 1 Read status register -> 1
-            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x05, READ_SDR, FLEXSPI_1PAD, 0x01),
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-
-            // 2 Fast read quad mode - SDR
-            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x6B, RADDR_SDR, FLEXSPI_1PAD, 0x18),
-            FLEXSPI_LUT_SEQ(DUMMY_SDR, FLEXSPI_4PAD, 0x08, READ_SDR, FLEXSPI_4PAD, 0x04),
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-
-            // 3 Write Enable -> 3
-            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x06, STOP, FLEXSPI_1PAD, 0),
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-
-            // 4 Read extend parameters
-            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x81, READ_SDR, FLEXSPI_1PAD, 0x04),
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-
-            // 5 Erase Sector -> 5
-            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x20, RADDR_SDR, FLEXSPI_1PAD, 24),
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-
-            // 6 Write Status Reg
-            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x01, WRITE_SDR, FLEXSPI_1PAD, 0x04),
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-
-            // 7 Page Program - quad mode (-> 9)
-            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x32, RADDR_SDR, FLEXSPI_1PAD, 0x18),
-            FLEXSPI_LUT_SEQ(WRITE_SDR, FLEXSPI_4PAD, 0x04, STOP, FLEXSPI_1PAD, 0),
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-
-            // 8 Read ID
-            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x90, DUMMY_SDR, FLEXSPI_1PAD, 24),
-            FLEXSPI_LUT_SEQ(READ_SDR, FLEXSPI_1PAD, 0x00, 0, 0, 0),
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-
-            // 9 Page Program - single mode -> 9
-            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x02, RADDR_SDR, FLEXSPI_1PAD, 24),
-            FLEXSPI_LUT_SEQ(WRITE_SDR, FLEXSPI_1PAD, 0, 0, 0, 0),
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-
-            // 10 Enter QPI mode
-            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x35, STOP, FLEXSPI_1PAD, 0),
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-
-            // 11 Erase Chip
-            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x60, STOP, FLEXSPI_1PAD, 0),
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-
-            // 12 Exit QPI mode
-            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_4PAD, 0xF5, STOP, FLEXSPI_1PAD, 0),
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-        },
-    },
-    .pageSize = 512u,
-    .sectorSize = 256u * 1024u,
-    .blockSize = 256u * 1024u,
-    .isUniformBlockSize = true,
-};
-
-#endif /* XIP_BOOT_HEADER_ENABLE */
diff --git a/ports/mimxrt/boards/MIMXRT1064_EVK/MIMXRT1064_EVK_flexspi_nor_config.h b/ports/mimxrt/boards/MIMXRT1064_EVK/MIMXRT1064_EVK_flexspi_nor_config.h
deleted file mode 100644
index 01b3194e3146f..0000000000000
--- a/ports/mimxrt/boards/MIMXRT1064_EVK/MIMXRT1064_EVK_flexspi_nor_config.h
+++ /dev/null
@@ -1,264 +0,0 @@
-/*
- * Copyright 2018 NXP
- * All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-#ifndef __EVKMIMXRT1064_FLEXSPI_NOR_CONFIG__
-#define __EVKMIMXRT1064_FLEXSPI_NOR_CONFIG__
-
-#include <stdint.h>
-#include <stdbool.h>
-#include "fsl_flexspi.h"
-
-/*! @name Driver version */
-/*@{*/
-/*! @brief XIP_BOARD driver version 2.0.0. */
-#define FSL_XIP_BOARD_DRIVER_VERSION (MAKE_VERSION(2, 0, 0))
-/*@}*/
-
-/* FLEXSPI memory config block related defintions */
-#define FLEXSPI_CFG_BLK_TAG     (0x42464346UL) // ascii "FCFB" Big Endian
-#define FLEXSPI_CFG_BLK_VERSION (0x56010400UL) // V1.4.0
-#define FLEXSPI_CFG_BLK_SIZE    (512)
-
-/* FLEXSPI Feature related definitions */
-#define FLEXSPI_FEATURE_HAS_PARALLEL_MODE 1
-
-/* Lookup table related defintions */
-#define CMD_INDEX_READ 0
-#define CMD_INDEX_READSTATUS 1
-#define CMD_INDEX_WRITEENABLE 2
-#define CMD_INDEX_WRITE 4
-
-#define CMD_LUT_SEQ_IDX_READ 0
-#define CMD_LUT_SEQ_IDX_READSTATUS 1
-#define CMD_LUT_SEQ_IDX_WRITEENABLE 3
-#define CMD_LUT_SEQ_IDX_WRITE 9
-
-#define CMD_SDR 0x01
-#define CMD_DDR 0x21
-#define RADDR_SDR 0x02
-#define RADDR_DDR 0x22
-#define CADDR_SDR 0x03
-#define CADDR_DDR 0x23
-#define MODE1_SDR 0x04
-#define MODE1_DDR 0x24
-#define MODE2_SDR 0x05
-#define MODE2_DDR 0x25
-#define MODE4_SDR 0x06
-#define MODE4_DDR 0x26
-#define MODE8_SDR 0x07
-#define MODE8_DDR 0x27
-#define WRITE_SDR 0x08
-#define WRITE_DDR 0x28
-#define READ_SDR 0x09
-#define READ_DDR 0x29
-#define LEARN_SDR 0x0A
-#define LEARN_DDR 0x2A
-#define DATSZ_SDR 0x0B
-#define DATSZ_DDR 0x2B
-#define DUMMY_SDR 0x0C
-#define DUMMY_DDR 0x2C
-#define DUMMY_RWDS_SDR 0x0D
-#define DUMMY_RWDS_DDR 0x2D
-#define JMP_ON_CS 0x1F
-#define STOP 0
-
-#define FLEXSPI_1PAD 0
-#define FLEXSPI_2PAD 1
-#define FLEXSPI_4PAD 2
-#define FLEXSPI_8PAD 3
-
-#define FLEXSPI_LUT_SEQ(cmd0, pad0, op0, cmd1, pad1, op1)                                                              \
-    (FLEXSPI_LUT_OPERAND0(op0) | FLEXSPI_LUT_NUM_PADS0(pad0) | FLEXSPI_LUT_OPCODE0(cmd0) | FLEXSPI_LUT_OPERAND1(op1) | \
-    FLEXSPI_LUT_NUM_PADS1(pad1) | FLEXSPI_LUT_OPCODE1(cmd1))
-
-// !@brief Definitions for FlexSPI Serial Clock Frequency
-typedef enum _FlexSpiSerialClockFreq
-{
-    kFlexSpiSerialClk_30MHz  = 1,
-    kFlexSpiSerialClk_50MHz  = 2,
-    kFlexSpiSerialClk_60MHz  = 3,
-    kFlexSpiSerialClk_75MHz  = 4,
-    kFlexSpiSerialClk_80MHz  = 5,
-    kFlexSpiSerialClk_100MHz = 6,
-    kFlexSpiSerialClk_120MHz = 7,
-    kFlexSpiSerialClk_133MHz = 8,
-    kFlexSpiSerialClk_166MHz = 9,
-} flexspi_serial_clk_freq_t;
-
-// !@brief FlexSPI clock configuration type
-enum
-{
-    kFlexSpiClk_SDR, // !< Clock configure for SDR mode
-    kFlexSpiClk_DDR, // !< Clock configurat for DDR mode
-};
-
-// !@brief FlexSPI Read Sample Clock Source definition
-typedef enum _FlashReadSampleClkSource
-{
-    kFlexSPIReadSampleClk_LoopbackInternally      = 0,
-    kFlexSPIReadSampleClk_LoopbackFromDqsPad      = 1,
-    kFlexSPIReadSampleClk_LoopbackFromSckPad      = 2,
-    kFlexSPIReadSampleClk_ExternalInputFromDqsPad = 3,
-} flexspi_read_sample_clk_t;
-
-// !@brief Misc feature bit definitions
-enum
-{
-    kFlexSpiMiscOffset_DiffClkEnable            = 0, // !< Bit for Differential clock enable
-    kFlexSpiMiscOffset_Ck2Enable                = 1, // !< Bit for CK2 enable
-    kFlexSpiMiscOffset_ParallelEnable           = 2, // !< Bit for Parallel mode enable
-    kFlexSpiMiscOffset_WordAddressableEnable    = 3, // !< Bit for Word Addressable enable
-    kFlexSpiMiscOffset_SafeConfigFreqEnable     = 4, // !< Bit for Safe Configuration Frequency enable
-    kFlexSpiMiscOffset_PadSettingOverrideEnable = 5, // !< Bit for Pad setting override enable
-    kFlexSpiMiscOffset_DdrModeEnable            = 6, // !< Bit for DDR clock confiuration indication.
-};
-
-// !@brief Flash Type Definition
-enum
-{
-    kFlexSpiDeviceType_SerialNOR    = 1,    // !< Flash devices are Serial NOR
-    kFlexSpiDeviceType_SerialNAND   = 2,    // !< Flash devices are Serial NAND
-    kFlexSpiDeviceType_SerialRAM    = 3,    // !< Flash devices are Serial RAM/HyperFLASH
-    kFlexSpiDeviceType_MCP_NOR_NAND = 0x12, // !< Flash device is MCP device, A1 is Serial NOR, A2 is Serial NAND
-    kFlexSpiDeviceType_MCP_NOR_RAM  = 0x13, // !< Flash deivce is MCP device, A1 is Serial NOR, A2 is Serial RAMs
-};
-
-// !@brief Flash Pad Definitions
-enum
-{
-    kSerialFlash_1Pad  = 1,
-    kSerialFlash_2Pads = 2,
-    kSerialFlash_4Pads = 4,
-    kSerialFlash_8Pads = 8,
-};
-
-// !@brief FlexSPI LUT Sequence structure
-typedef struct _lut_sequence
-{
-    uint8_t seqNum; // !< Sequence Number, valid number: 1-16
-    uint8_t seqId;  // !< Sequence Index, valid number: 0-15
-    uint16_t reserved;
-} flexspi_lut_seq_t;
-
-// !@brief Flash Configuration Command Type
-enum
-{
-    kDeviceConfigCmdType_Generic,    // !< Generic command, for example: configure dummy cycles, drive strength, etc
-    kDeviceConfigCmdType_QuadEnable, // !< Quad Enable command
-    kDeviceConfigCmdType_Spi2Xpi,    // !< Switch from SPI to DPI/QPI/OPI mode
-    kDeviceConfigCmdType_Xpi2Spi,    // !< Switch from DPI/QPI/OPI to SPI mode
-    kDeviceConfigCmdType_Spi2NoCmd,  // !< Switch to 0-4-4/0-8-8 mode
-    kDeviceConfigCmdType_Reset,      // !< Reset device command
-};
-
-// !@brief FlexSPI Memory Configuration Block
-typedef struct _FlexSPIConfig
-{
-    uint32_t tag;               // !< [0x000-0x003] Tag, fixed value 0x42464346UL
-    uint32_t version;           // !< [0x004-0x007] Version,[31:24] -'V', [23:16] - Major, [15:8] - Minor, [7:0] - bugfix
-    uint32_t reserved0;         // !< [0x008-0x00b] Reserved for future use
-    uint8_t readSampleClkSrc;   // !< [0x00c-0x00c] Read Sample Clock Source, valid value: 0/1/3
-    uint8_t csHoldTime;         // !< [0x00d-0x00d] CS hold time, default value: 3
-    uint8_t csSetupTime;        // !< [0x00e-0x00e] CS setup time, default value: 3
-    uint8_t columnAddressWidth; // !< [0x00f-0x00f] Column Address with, for HyperBus protocol, it is fixed to 3, For
-    // ! Serial NAND, need to refer to datasheet
-    uint8_t deviceModeCfgEnable; // !< [0x010-0x010] Device Mode Configure enable flag, 1 - Enable, 0 - Disable
-    uint8_t deviceModeType; // !< [0x011-0x011] Specify the configuration command type:Quad Enable, DPI/QPI/OPI switch,
-    // ! Generic configuration, etc.
-    uint16_t waitTimeCfgCommands; // !< [0x012-0x013] Wait time for all configuration commands, unit: 100us, Used for
-    // ! DPI/QPI/OPI switch or reset command
-    flexspi_lut_seq_t deviceModeSeq; // !< [0x014-0x017] Device mode sequence info, [7:0] - LUT sequence id, [15:8] - LUt
-    // ! sequence number, [31:16] Reserved
-    uint32_t deviceModeArg;    // !< [0x018-0x01b] Argument/Parameter for device configuration
-    uint8_t configCmdEnable;   // !< [0x01c-0x01c] Configure command Enable Flag, 1 - Enable, 0 - Disable
-    uint8_t configModeType[3]; // !< [0x01d-0x01f] Configure Mode Type, similar as deviceModeTpe
-    flexspi_lut_seq_t
-        configCmdSeqs[3]; // !< [0x020-0x02b] Sequence info for Device Configuration command, similar as deviceModeSeq
-    uint32_t reserved1;   // !< [0x02c-0x02f] Reserved for future use
-    uint32_t configCmdArgs[3];     // !< [0x030-0x03b] Arguments/Parameters for device Configuration commands
-    uint32_t reserved2;            // !< [0x03c-0x03f] Reserved for future use
-    uint32_t controllerMiscOption; // !< [0x040-0x043] Controller Misc Options, see Misc feature bit definitions for more
-    // ! details
-    uint8_t deviceType;    // !< [0x044-0x044] Device Type:  See Flash Type Definition for more details
-    uint8_t sflashPadType; // !< [0x045-0x045] Serial Flash Pad Type: 1 - Single, 2 - Dual, 4 - Quad, 8 - Octal
-    uint8_t serialClkFreq; // !< [0x046-0x046] Serial Flash Frequencey, device specific definitions, See System Boot
-    // ! Chapter for more details
-    uint8_t lutCustomSeqEnable; // !< [0x047-0x047] LUT customization Enable, it is required if the program/erase cannot
-    // ! be done using 1 LUT sequence, currently, only applicable to HyperFLASH
-    uint32_t reserved3[2];           // !< [0x048-0x04f] Reserved for future use
-    uint32_t sflashA1Size;           // !< [0x050-0x053] Size of Flash connected to A1
-    uint32_t sflashA2Size;           // !< [0x054-0x057] Size of Flash connected to A2
-    uint32_t sflashB1Size;           // !< [0x058-0x05b] Size of Flash connected to B1
-    uint32_t sflashB2Size;           // !< [0x05c-0x05f] Size of Flash connected to B2
-    uint32_t csPadSettingOverride;   // !< [0x060-0x063] CS pad setting override value
-    uint32_t sclkPadSettingOverride; // !< [0x064-0x067] SCK pad setting override value
-    uint32_t dataPadSettingOverride; // !< [0x068-0x06b] data pad setting override value
-    uint32_t dqsPadSettingOverride;  // !< [0x06c-0x06f] DQS pad setting override value
-    uint32_t timeoutInMs;            // !< [0x070-0x073] Timeout threshold for read status command
-    uint32_t commandInterval;        // !< [0x074-0x077] CS deselect interval between two commands
-    uint16_t dataValidTime[2]; // !< [0x078-0x07b] CLK edge to data valid time for PORT A and PORT B, in terms of 0.1ns
-    uint16_t busyOffset;       // !< [0x07c-0x07d] Busy offset, valid value: 0-31
-    uint16_t busyBitPolarity;  // !< [0x07e-0x07f] Busy flag polarity, 0 - busy flag is 1 when flash device is busy, 1 -
-    // ! busy flag is 0 when flash device is busy
-    uint32_t lookupTable[64];           // !< [0x080-0x17f] Lookup table holds Flash command sequences
-    flexspi_lut_seq_t lutCustomSeq[12]; // !< [0x180-0x1af] Customizable LUT Sequences
-    uint32_t reserved4[4];              // !< [0x1b0-0x1bf] Reserved for future use
-} flexspi_mem_config_t;
-
-/*  */
-#define NOR_CMD_LUT_SEQ_IDX_READ_NORMAL 0
-#define NOR_CMD_LUT_SEQ_IDX_READSTATUSREG 1
-#define NOR_CMD_LUT_SEQ_IDX_READ_FAST_QUAD 2
-#define NOR_CMD_LUT_SEQ_IDX_WRITEENABLE 3
-#define NOR_CMD_LUT_SEQ_IDX_READSTATUS_XPI 4
-#define NOR_CMD_LUT_SEQ_IDX_ERASESECTOR 5
-#define NOR_CMD_LUT_SEQ_IDX_WRITESTATUSREG 6
-#define NOR_CMD_LUT_SEQ_IDX_PAGEPROGRAM_QUAD 7
-#define NOR_CMD_LUT_SEQ_IDX_READID 8
-#define NOR_CMD_LUT_SEQ_IDX_PAGEPROGRAM 9
-#define NOR_CMD_LUT_SEQ_IDX_ENTERQPI 10
-#define NOR_CMD_LUT_SEQ_IDX_CHIPERASE 11
-#define NOR_CMD_LUT_SEQ_IDX_EXITQPI 12
-
-#define HYPERFLASH_CMD_LUT_SEQ_IDX_READDATA    0
-#define HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEDATA   1
-#define HYPERFLASH_CMD_LUT_SEQ_IDX_READSTATUS  2
-#define HYPERFLASH_CMD_LUT_SEQ_IDX_WRITEENABLE 4
-#define HYPERFLASH_CMD_LUT_SEQ_IDX_ERASESECTOR 6
-#define HYPERFLASH_CMD_LUT_SEQ_IDX_PAGEPROGRAM 10
-#define HYPERFLASH_CMD_LUT_SEQ_IDX_ERASECHIP   12
-
-/*
- *  Serial NOR configuration block
- */
-typedef struct _flexspi_nor_config
-{
-    flexspi_mem_config_t memConfig; // !< Common memory configuration info via FlexSPI
-    uint32_t pageSize;              // !< Page size of Serial NOR
-    uint32_t sectorSize;            // !< Sector size of Serial NOR
-    uint8_t ipcmdSerialClkFreq;     // !< Clock frequency for IP command
-    uint8_t isUniformBlockSize;     // !< Sector/Block size is the same
-    uint8_t reserved0[2];           // !< Reserved for future use
-    uint8_t serialNorType;          // !< Serial NOR Flash type: 0/1/2/3
-    uint8_t needExitNoCmdMode;      // !< Need to exit NoCmd mode before other IP command
-    uint8_t halfClkForNonReadCmd;   // !< Half the Serial Clock for non-read command: true/false
-    uint8_t needRestoreNoCmdMode;   // !< Need to Restore NoCmd mode after IP commmand execution
-    uint32_t blockSize;             // !< Block size
-    uint32_t reserve2[11];          // !< Reserved for future use
-} flexspi_nor_config_t;
-
-#define FLASH_BUSY_STATUS_POL 0
-#define FLASH_BUSY_STATUS_OFFSET 0
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* __EVKMIMXRT1064_FLEXSPI_NOR_CONFIG__ */
diff --git a/ports/mimxrt/boards/MIMXRT1064_EVK/qspi_nor_flash_config.c b/ports/mimxrt/boards/MIMXRT1064_EVK/qspi_nor_flash_config.c
deleted file mode 100644
index 73525b5dfcadc..0000000000000
--- a/ports/mimxrt/boards/MIMXRT1064_EVK/qspi_nor_flash_config.c
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * Copyright 2018 NXP
- * All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-#include BOARD_FLASH_CONFIG_HEADER_H
-
-/* Component ID definition, used by tools. */
-#ifndef FSL_COMPONENT_ID
-#define FSL_COMPONENT_ID "platform.drivers.xip_board"
-#endif
-
-/*******************************************************************************
- * Code
- ******************************************************************************/
-#if defined(XIP_BOOT_HEADER_ENABLE) && (XIP_BOOT_HEADER_ENABLE == 1)
-#if defined(__CC_ARM) || defined(__ARMCC_VERSION) || defined(__GNUC__)
-__attribute__((section(".boot_hdr.conf")))
-#elif defined(__ICCARM__)
-#pragma location = ".boot_hdr.conf"
-#endif
-
-const flexspi_nor_config_t qspiflash_config = {
-    .memConfig =
-    {
-        .tag = FLEXSPI_CFG_BLK_TAG,
-        .version = FLEXSPI_CFG_BLK_VERSION,
-        .readSampleClkSrc = kFlexSPIReadSampleClk_ExternalInputFromDqsPad,
-        .csHoldTime = 3u,
-        .csSetupTime = 3u,
-        .columnAddressWidth = 3u,
-        // Enable DDR mode, Wordaddassable, Safe configuration, Differential clock
-        .controllerMiscOption =
-            (1u << kFlexSpiMiscOffset_DdrModeEnable) | (1u << kFlexSpiMiscOffset_WordAddressableEnable) |
-            (1u << kFlexSpiMiscOffset_SafeConfigFreqEnable) | (1u << kFlexSpiMiscOffset_DiffClkEnable),
-        .sflashPadType = kSerialFlash_8Pads,
-        .serialClkFreq = kFlexSpiSerialClk_133MHz,
-        .sflashA1Size = MICROPY_HW_FLASH_SIZE,
-        .dataValidTime = {16u, 16u},
-        .lookupTable =
-        {
-            // 0 Read LUTs 0 -> 0
-            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0xEB, RADDR_SDR, FLEXSPI_4PAD, 0x18),
-            FLEXSPI_LUT_SEQ(DUMMY_SDR, FLEXSPI_4PAD, 0x06, READ_SDR, FLEXSPI_4PAD, 0x04),
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-
-            // 1 Read status register -> 1
-            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x05, READ_SDR, FLEXSPI_1PAD, 0x01),
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-
-            // 2 Fast read quad mode - SDR
-            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x6B, RADDR_SDR, FLEXSPI_1PAD, 0x18),
-            FLEXSPI_LUT_SEQ(DUMMY_SDR, FLEXSPI_4PAD, 0x08, READ_SDR, FLEXSPI_4PAD, 0x04),
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-
-            // 3 Write Enable -> 3
-            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x06, STOP, FLEXSPI_1PAD, 0),
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-
-            // 4 Read extend parameters
-            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x81, READ_SDR, FLEXSPI_1PAD, 0x04),
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-
-            // 5 Erase Sector -> 5
-            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x20, RADDR_SDR, FLEXSPI_1PAD, 24),
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-
-            // 6 Write Status Reg
-            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x01, WRITE_SDR, FLEXSPI_1PAD, 0x04),
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-
-            // 7 Page Program - quad mode (-> 9)
-            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x32, RADDR_SDR, FLEXSPI_1PAD, 0x18),
-            FLEXSPI_LUT_SEQ(WRITE_SDR, FLEXSPI_4PAD, 0x04, STOP, FLEXSPI_1PAD, 0),
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-
-            // 8 Read ID
-            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x90, DUMMY_SDR, FLEXSPI_1PAD, 24),
-            FLEXSPI_LUT_SEQ(READ_SDR, FLEXSPI_1PAD, 0x00, 0, 0, 0),
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-
-            // 9 Page Program - single mode -> 9
-            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x02, RADDR_SDR, FLEXSPI_1PAD, 24),
-            FLEXSPI_LUT_SEQ(WRITE_SDR, FLEXSPI_1PAD, 0, 0, 0, 0),
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-
-            // 10 Enter QPI mode
-            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x35, STOP, FLEXSPI_1PAD, 0),
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-
-            // 11 Erase Chip
-            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x60, STOP, FLEXSPI_1PAD, 0),
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-
-            // 12 Exit QPI mode
-            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_4PAD, 0xF5, STOP, FLEXSPI_1PAD, 0),
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-        },
-    },
-    .pageSize = 512u,
-    .sectorSize = 256u * 1024u,
-    .blockSize = 256u * 1024u,
-    .isUniformBlockSize = true,
-};
-
-#endif /* XIP_BOOT_HEADER_ENABLE */
diff --git a/ports/mimxrt/boards/TEENSY40/TEENSY40_flexspi_nor_config.h b/ports/mimxrt/boards/TEENSY40/TEENSY40_flexspi_nor_config.h
deleted file mode 100644
index b06def76c0bb0..0000000000000
--- a/ports/mimxrt/boards/TEENSY40/TEENSY40_flexspi_nor_config.h
+++ /dev/null
@@ -1,259 +0,0 @@
-/*
- * Copyright 2018 NXP
- * All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-// Based on tinyusb/hw/bsp/teensy_40/teensy40_flexspi_nor_config.h
-
-#ifndef __TEENSY40_FLEXSPI_NOR_CONFIG__
-#define __TEENSY40_FLEXSPI_NOR_CONFIG__
-
-#include <stdint.h>
-#include <stdbool.h>
-#include "fsl_common.h"
-
-/*! @name Driver version */
-/*@{*/
-/*! @brief XIP_BOARD driver version 2.0.0. */
-#define FSL_XIP_BOARD_DRIVER_VERSION (MAKE_VERSION(2, 0, 0))
-/*@}*/
-
-/* FLEXSPI memory config block related defintions */
-#define FLEXSPI_CFG_BLK_TAG (0x42464346UL)     // ascii "FCFB" Big Endian
-#define FLEXSPI_CFG_BLK_VERSION (0x56010400UL) // V1.4.0
-#define FLEXSPI_CFG_BLK_SIZE (512)
-
-/* FLEXSPI Feature related definitions */
-#define FLEXSPI_FEATURE_HAS_PARALLEL_MODE 1
-
-/* Lookup table related definitions */
-#define CMD_INDEX_READ 0
-#define CMD_INDEX_READSTATUS 1
-#define CMD_INDEX_WRITEENABLE 2
-#define CMD_INDEX_WRITE 4
-
-#define CMD_LUT_SEQ_IDX_READ 0
-#define CMD_LUT_SEQ_IDX_READSTATUS 1
-#define CMD_LUT_SEQ_IDX_WRITEENABLE 3
-#define CMD_LUT_SEQ_IDX_ERASE 5
-#define CMD_LUT_SEQ_IDX_WRITE 9
-
-#define CMD_SDR 0x01
-#define CMD_DDR 0x21
-#define RADDR_SDR 0x02
-#define RADDR_DDR 0x22
-#define CADDR_SDR 0x03
-#define CADDR_DDR 0x23
-#define MODE1_SDR 0x04
-#define MODE1_DDR 0x24
-#define MODE2_SDR 0x05
-#define MODE2_DDR 0x25
-#define MODE4_SDR 0x06
-#define MODE4_DDR 0x26
-#define MODE8_SDR 0x07
-#define MODE8_DDR 0x27
-#define WRITE_SDR 0x08
-#define WRITE_DDR 0x28
-#define READ_SDR 0x09
-#define READ_DDR 0x29
-#define LEARN_SDR 0x0A
-#define LEARN_DDR 0x2A
-#define DATSZ_SDR 0x0B
-#define DATSZ_DDR 0x2B
-#define DUMMY_SDR 0x0C
-#define DUMMY_DDR 0x2C
-#define DUMMY_RWDS_SDR 0x0D
-#define DUMMY_RWDS_DDR 0x2D
-#define JMP_ON_CS 0x1F
-#define STOP 0
-
-#define FLEXSPI_1PAD 0
-#define FLEXSPI_2PAD 1
-#define FLEXSPI_4PAD 2
-#define FLEXSPI_8PAD 3
-
-#define FLEXSPI_LUT_SEQ(cmd0, pad0, op0, cmd1, pad1, op1)                                                              \
-    (FLEXSPI_LUT_OPERAND0(op0) | FLEXSPI_LUT_NUM_PADS0(pad0) | FLEXSPI_LUT_OPCODE0(cmd0) | FLEXSPI_LUT_OPERAND1(op1) | \
-    FLEXSPI_LUT_NUM_PADS1(pad1) | FLEXSPI_LUT_OPCODE1(cmd1))
-
-// !@brief Definitions for FlexSPI Serial Clock Frequency
-typedef enum _FlexSpiSerialClockFreq
-{
-    kFlexSpiSerialClk_30MHz  = 1,
-    kFlexSpiSerialClk_50MHz  = 2,
-    kFlexSpiSerialClk_60MHz  = 3,
-    kFlexSpiSerialClk_75MHz  = 4,
-    kFlexSpiSerialClk_80MHz  = 5,
-    kFlexSpiSerialClk_100MHz = 6,
-    kFlexSpiSerialClk_120MHz = 7,
-    kFlexSpiSerialClk_133MHz = 8,
-    kFlexSpiSerialClk_166MHz = 9,
-} flexspi_serial_clk_freq_t;
-
-// !@brief FlexSPI clock configuration type
-enum
-{
-    kFlexSpiClk_SDR, // !< Clock configure for SDR mode
-    kFlexSpiClk_DDR, // !< Clock configurat for DDR mode
-};
-
-// !@brief FlexSPI Read Sample Clock Source definition
-typedef enum _FlashReadSampleClkSource
-{
-    kFlexSPIReadSampleClk_LoopbackInternally      = 0,
-    kFlexSPIReadSampleClk_LoopbackFromDqsPad      = 1,
-    kFlexSPIReadSampleClk_LoopbackFromSckPad      = 2,
-    kFlexSPIReadSampleClk_ExternalInputFromDqsPad = 3,
-} flexspi_read_sample_clk_t;
-
-// !@brief Misc feature bit definitions
-enum
-{
-    kFlexSpiMiscOffset_DiffClkEnable            = 0, // !< Bit for Differential clock enable
-    kFlexSpiMiscOffset_Ck2Enable                = 1, // !< Bit for CK2 enable
-    kFlexSpiMiscOffset_ParallelEnable           = 2, // !< Bit for Parallel mode enable
-    kFlexSpiMiscOffset_WordAddressableEnable    = 3, // !< Bit for Word Addressable enable
-    kFlexSpiMiscOffset_SafeConfigFreqEnable     = 4, // !< Bit for Safe Configuration Frequency enable
-    kFlexSpiMiscOffset_PadSettingOverrideEnable = 5, // !< Bit for Pad setting override enable
-    kFlexSpiMiscOffset_DdrModeEnable            = 6, // !< Bit for DDR clock confiuration indication.
-};
-
-// !@brief Flash Type Definition
-enum
-{
-    kFlexSpiDeviceType_SerialNOR    = 1,    // !< Flash devices are Serial NOR
-    kFlexSpiDeviceType_SerialNAND   = 2,    // !< Flash devices are Serial NAND
-    kFlexSpiDeviceType_SerialRAM    = 3,    // !< Flash devices are Serial RAM/HyperFLASH
-    kFlexSpiDeviceType_MCP_NOR_NAND = 0x12, // !< Flash device is MCP device, A1 is Serial NOR, A2 is Serial NAND
-    kFlexSpiDeviceType_MCP_NOR_RAM  = 0x13, // !< Flash deivce is MCP device, A1 is Serial NOR, A2 is Serial RAMs
-};
-
-// !@brief Flash Pad Definitions
-enum
-{
-    kSerialFlash_1Pad  = 1,
-    kSerialFlash_2Pads = 2,
-    kSerialFlash_4Pads = 4,
-    kSerialFlash_8Pads = 8,
-};
-
-// !@brief FlexSPI LUT Sequence structure
-typedef struct _lut_sequence
-{
-    uint8_t seqNum; // !< Sequence Number, valid number: 1-16
-    uint8_t seqId;  // !< Sequence Index, valid number: 0-15
-    uint16_t reserved;
-} flexspi_lut_seq_t;
-
-// !@brief Flash Configuration Command Type
-enum
-{
-    kDeviceConfigCmdType_Generic,    // !< Generic command, for example: configure dummy cycles, drive strength, etc
-    kDeviceConfigCmdType_QuadEnable, // !< Quad Enable command
-    kDeviceConfigCmdType_Spi2Xpi,    // !< Switch from SPI to DPI/QPI/OPI mode
-    kDeviceConfigCmdType_Xpi2Spi,    // !< Switch from DPI/QPI/OPI to SPI mode
-    kDeviceConfigCmdType_Spi2NoCmd,  // !< Switch to 0-4-4/0-8-8 mode
-    kDeviceConfigCmdType_Reset,      // !< Reset device command
-};
-
-// !@brief FlexSPI Memory Configuration Block
-typedef struct _FlexSPIConfig
-{
-    uint32_t tag;               // !< [0x000-0x003] Tag, fixed value 0x42464346UL
-    uint32_t version;           // !< [0x004-0x007] Version,[31:24] -'V', [23:16] - Major, [15:8] - Minor, [7:0] - bugfix
-    uint32_t reserved0;         // !< [0x008-0x00b] Reserved for future use
-    uint8_t readSampleClkSrc;   // !< [0x00c-0x00c] Read Sample Clock Source, valid value: 0/1/3
-    uint8_t csHoldTime;         // !< [0x00d-0x00d] CS hold time, default value: 3
-    uint8_t csSetupTime;        // !< [0x00e-0x00e] CS setup time, default value: 3
-    uint8_t columnAddressWidth; // !< [0x00f-0x00f] Column Address with, for HyperBus protocol, it is fixed to 3, For
-    // ! Serial NAND, need to refer to datasheet
-    uint8_t deviceModeCfgEnable; // !< [0x010-0x010] Device Mode Configure enable flag, 1 - Enable, 0 - Disable
-    uint8_t deviceModeType; // !< [0x011-0x011] Specify the configuration command type:Quad Enable, DPI/QPI/OPI switch,
-    // ! Generic configuration, etc.
-    uint16_t waitTimeCfgCommands; // !< [0x012-0x013] Wait time for all configuration commands, unit: 100us, Used for
-    // ! DPI/QPI/OPI switch or reset command
-    flexspi_lut_seq_t deviceModeSeq; // !< [0x014-0x017] Device mode sequence info, [7:0] - LUT sequence id, [15:8] - LUt
-    // ! sequence number, [31:16] Reserved
-    uint32_t deviceModeArg;    // !< [0x018-0x01b] Argument/Parameter for device configuration
-    uint8_t configCmdEnable;   // !< [0x01c-0x01c] Configure command Enable Flag, 1 - Enable, 0 - Disable
-    uint8_t configModeType[3]; // !< [0x01d-0x01f] Configure Mode Type, similar as deviceModeTpe
-    flexspi_lut_seq_t
-        configCmdSeqs[3]; // !< [0x020-0x02b] Sequence info for Device Configuration command, similar as deviceModeSeq
-    uint32_t reserved1;   // !< [0x02c-0x02f] Reserved for future use
-    uint32_t configCmdArgs[3];     // !< [0x030-0x03b] Arguments/Parameters for device Configuration commands
-    uint32_t reserved2;            // !< [0x03c-0x03f] Reserved for future use
-    uint32_t controllerMiscOption; // !< [0x040-0x043] Controller Misc Options, see Misc feature bit definitions for more
-    // ! details
-    uint8_t deviceType;    // !< [0x044-0x044] Device Type:  See Flash Type Definition for more details
-    uint8_t sflashPadType; // !< [0x045-0x045] Serial Flash Pad Type: 1 - Single, 2 - Dual, 4 - Quad, 8 - Octal
-    uint8_t serialClkFreq; // !< [0x046-0x046] Serial Flash Frequencey, device specific definitions, See System Boot
-    // ! Chapter for more details
-    uint8_t lutCustomSeqEnable; // !< [0x047-0x047] LUT customization Enable, it is required if the program/erase cannot
-    // ! be done using 1 LUT sequence, currently, only applicable to HyperFLASH
-    uint32_t reserved3[2];           // !< [0x048-0x04f] Reserved for future use
-    uint32_t sflashA1Size;           // !< [0x050-0x053] Size of Flash connected to A1
-    uint32_t sflashA2Size;           // !< [0x054-0x057] Size of Flash connected to A2
-    uint32_t sflashB1Size;           // !< [0x058-0x05b] Size of Flash connected to B1
-    uint32_t sflashB2Size;           // !< [0x05c-0x05f] Size of Flash connected to B2
-    uint32_t csPadSettingOverride;   // !< [0x060-0x063] CS pad setting override value
-    uint32_t sclkPadSettingOverride; // !< [0x064-0x067] SCK pad setting override value
-    uint32_t dataPadSettingOverride; // !< [0x068-0x06b] data pad setting override value
-    uint32_t dqsPadSettingOverride;  // !< [0x06c-0x06f] DQS pad setting override value
-    uint32_t timeoutInMs;            // !< [0x070-0x073] Timeout threshold for read status command
-    uint32_t commandInterval;        // !< [0x074-0x077] CS deselect interval between two commands
-    uint16_t dataValidTime[2]; // !< [0x078-0x07b] CLK edge to data valid time for PORT A and PORT B, in terms of 0.1ns
-    uint16_t busyOffset;       // !< [0x07c-0x07d] Busy offset, valid value: 0-31
-    uint16_t busyBitPolarity;  // !< [0x07e-0x07f] Busy flag polarity, 0 - busy flag is 1 when flash device is busy, 1 -
-    // ! busy flag is 0 when flash device is busy
-    uint32_t lookupTable[64];           // !< [0x080-0x17f] Lookup table holds Flash command sequences
-    flexspi_lut_seq_t lutCustomSeq[12]; // !< [0x180-0x1af] Customizable LUT Sequences
-    uint32_t reserved4[4];              // !< [0x1b0-0x1bf] Reserved for future use
-} flexspi_mem_config_t;
-
-/*  */
-#define NOR_CMD_LUT_SEQ_IDX_READ_NORMAL 0
-#define NOR_CMD_LUT_SEQ_IDX_READSTATUSREG 1
-#define NOR_CMD_LUT_SEQ_IDX_READ_FAST_QUAD 2
-#define NOR_CMD_LUT_SEQ_IDX_WRITEENABLE 3
-#define NOR_CMD_LUT_SEQ_IDX_READSTATUS_XPI 4
-#define NOR_CMD_LUT_SEQ_IDX_ERASESECTOR 5
-#define NOR_CMD_LUT_SEQ_IDX_WRITESTATUSREG 6
-#define NOR_CMD_LUT_SEQ_IDX_PAGEPROGRAM_QUAD 7
-#define NOR_CMD_LUT_SEQ_IDX_READID 8
-#define NOR_CMD_LUT_SEQ_IDX_PAGEPROGRAM 9
-#define NOR_CMD_LUT_SEQ_IDX_ENTERQPI 10
-#define NOR_CMD_LUT_SEQ_IDX_CHIPERASE 11
-#define NOR_CMD_LUT_SEQ_IDX_EXITQPI 12
-
-/*
- *  Serial NOR configuration block
- */
-typedef struct _flexspi_nor_config
-{
-    flexspi_mem_config_t memConfig; // !< Common memory configuration info via FlexSPI
-    uint32_t pageSize;              // !< Page size of Serial NOR
-    uint32_t sectorSize;            // !< Sector size of Serial NOR
-    uint8_t ipcmdSerialClkFreq;     // !< Clock frequency for IP command
-    uint8_t isUniformBlockSize;     // !< Sector/Block size is the same
-    uint8_t reserved0[2];           // !< Reserved for future use
-    uint8_t serialNorType;          // !< Serial NOR Flash type: 0/1/2/3
-    uint8_t needExitNoCmdMode;      // !< Need to exit NoCmd mode before other IP command
-    uint8_t halfClkForNonReadCmd;   // !< Half the Serial Clock for non-read command: true/false
-    uint8_t needRestoreNoCmdMode;   // !< Need to Restore NoCmd mode after IP commmand execution
-    uint32_t blockSize;             // !< Block size
-    uint32_t reserve2[11];          // !< Reserved for future use
-} flexspi_nor_config_t;
-
-#define FLASH_BUSY_STATUS_POL 0
-#define FLASH_BUSY_STATUS_OFFSET 0
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* __EVKMIMXRT1060_FLEXSPI_NOR_CONFIG__ */
diff --git a/ports/mimxrt/boards/TEENSY40/qspi_nor_flash_config.c b/ports/mimxrt/boards/TEENSY40/qspi_nor_flash_config.c
deleted file mode 100644
index 69135f6b47a43..0000000000000
--- a/ports/mimxrt/boards/TEENSY40/qspi_nor_flash_config.c
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- * Copyright 2018 NXP
- * All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-// Based on tinyusb/hw/bsp/teensy_40/teensy40_flexspi_nor_config.c
-
-#include BOARD_FLASH_CONFIG_HEADER_H
-
-/* Component ID definition, used by tools. */
-#ifndef FSL_COMPONENT_ID
-#define FSL_COMPONENT_ID "platform.drivers.xip_board"
-#endif
-
-/*******************************************************************************
- * Code
- ******************************************************************************/
-#if defined(XIP_BOOT_HEADER_ENABLE) && (XIP_BOOT_HEADER_ENABLE == 1)
-#if defined(__CC_ARM) || defined(__ARMCC_VERSION) || defined(__GNUC__)
-__attribute__((section(".boot_hdr.conf")))
-#elif defined(__ICCARM__)
-#pragma location = ".boot_hdr.conf"
-#endif
-
-const flexspi_nor_config_t qspiflash_config = {
-    .memConfig =
-    {
-        .tag = FLEXSPI_CFG_BLK_TAG,
-        .version = FLEXSPI_CFG_BLK_VERSION,
-        .readSampleClkSrc = kFlexSPIReadSampleClk_LoopbackFromDqsPad,
-        .csHoldTime = 3u,
-        .csSetupTime = 3u,
-
-        .busyOffset = FLASH_BUSY_STATUS_OFFSET,         // Status bit 0 indicates busy.
-        .busyBitPolarity = FLASH_BUSY_STATUS_POL,       // Busy when the bit is 1.
-
-        .deviceModeCfgEnable = 1u,
-        .deviceModeType = kDeviceConfigCmdType_QuadEnable,
-        .deviceModeSeq = {
-            .seqId = 4u,
-            .seqNum = 1u,
-        },
-        .deviceModeArg = 0x0200,
-        .configCmdEnable = 1u,
-        .configModeType[0] = kDeviceConfigCmdType_Generic,
-        .configCmdSeqs[0] = {
-            .seqId = 2u,
-            .seqNum = 1u,
-        },
-        .deviceType = kFlexSpiDeviceType_SerialNOR,
-        // Enable DDR mode, Wordaddassable, Safe configuration, Differential clock
-        .sflashPadType = kSerialFlash_4Pads,
-        .serialClkFreq = kFlexSpiSerialClk_60MHz,
-        .sflashA1Size = MICROPY_HW_FLASH_SIZE,
-        .lookupTable =
-        {
-            // 0 Read LUTs 0 -> 0
-            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0xEB, RADDR_SDR, FLEXSPI_4PAD, 0x18),
-            FLEXSPI_LUT_SEQ(DUMMY_SDR, FLEXSPI_4PAD, 0x06, READ_SDR, FLEXSPI_4PAD, 0x04),
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-
-            // 1 Read status register -> 1
-            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x05, READ_SDR, FLEXSPI_1PAD, 0x01),
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-
-            // 2 Fast read quad mode - SDR
-            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x6B, RADDR_SDR, FLEXSPI_1PAD, 0x18),
-            FLEXSPI_LUT_SEQ(DUMMY_SDR, FLEXSPI_4PAD, 0x08, READ_SDR, FLEXSPI_4PAD, 0x04),
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-
-            // 3 Write Enable -> 3
-            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x06, STOP, FLEXSPI_1PAD, 0),
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-
-            // 4 Read extend parameters
-            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x81, READ_SDR, FLEXSPI_1PAD, 0x04),
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-
-            // 5 Erase Sector -> 5
-            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x20, RADDR_SDR, FLEXSPI_1PAD, 24),
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-
-            // 6 Write Status Reg
-            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x01, WRITE_SDR, FLEXSPI_1PAD, 0x04),
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-
-            // 7 Page Program - quad mode (-> 9)
-            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x32, RADDR_SDR, FLEXSPI_1PAD, 0x18),
-            FLEXSPI_LUT_SEQ(WRITE_SDR, FLEXSPI_4PAD, 0x04, STOP, FLEXSPI_1PAD, 0),
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-
-            // 8 Read ID
-            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x90, DUMMY_SDR, FLEXSPI_1PAD, 24),
-            FLEXSPI_LUT_SEQ(READ_SDR, FLEXSPI_1PAD, 0x00, 0, 0, 0),
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-
-            // 9 Page Program - single mode -> 9
-            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x02, RADDR_SDR, FLEXSPI_1PAD, 24),
-            FLEXSPI_LUT_SEQ(WRITE_SDR, FLEXSPI_1PAD, 0, 0, 0, 0),
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-
-            // 10 Enter QPI mode
-            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x35, STOP, FLEXSPI_1PAD, 0),
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-
-            // 11 Erase Chip
-            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x60, STOP, FLEXSPI_1PAD, 0),
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-
-            // 12 Exit QPI mode
-            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_4PAD, 0xF5, STOP, FLEXSPI_1PAD, 0),
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-        },
-    },
-    .pageSize = 256u,
-    .sectorSize = 4u * 1024u,
-    .ipcmdSerialClkFreq = kFlexSpiSerialClk_30MHz,
-    .blockSize = 0x00010000,
-    .isUniformBlockSize = false,
-};
-#endif /* XIP_BOOT_HEADER_ENABLE */
diff --git a/ports/mimxrt/boards/TEENSY41/TEENSY41_flexspi_nor_config.h b/ports/mimxrt/boards/TEENSY41/TEENSY41_flexspi_nor_config.h
deleted file mode 100644
index b06def76c0bb0..0000000000000
--- a/ports/mimxrt/boards/TEENSY41/TEENSY41_flexspi_nor_config.h
+++ /dev/null
@@ -1,259 +0,0 @@
-/*
- * Copyright 2018 NXP
- * All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-// Based on tinyusb/hw/bsp/teensy_40/teensy40_flexspi_nor_config.h
-
-#ifndef __TEENSY40_FLEXSPI_NOR_CONFIG__
-#define __TEENSY40_FLEXSPI_NOR_CONFIG__
-
-#include <stdint.h>
-#include <stdbool.h>
-#include "fsl_common.h"
-
-/*! @name Driver version */
-/*@{*/
-/*! @brief XIP_BOARD driver version 2.0.0. */
-#define FSL_XIP_BOARD_DRIVER_VERSION (MAKE_VERSION(2, 0, 0))
-/*@}*/
-
-/* FLEXSPI memory config block related defintions */
-#define FLEXSPI_CFG_BLK_TAG (0x42464346UL)     // ascii "FCFB" Big Endian
-#define FLEXSPI_CFG_BLK_VERSION (0x56010400UL) // V1.4.0
-#define FLEXSPI_CFG_BLK_SIZE (512)
-
-/* FLEXSPI Feature related definitions */
-#define FLEXSPI_FEATURE_HAS_PARALLEL_MODE 1
-
-/* Lookup table related definitions */
-#define CMD_INDEX_READ 0
-#define CMD_INDEX_READSTATUS 1
-#define CMD_INDEX_WRITEENABLE 2
-#define CMD_INDEX_WRITE 4
-
-#define CMD_LUT_SEQ_IDX_READ 0
-#define CMD_LUT_SEQ_IDX_READSTATUS 1
-#define CMD_LUT_SEQ_IDX_WRITEENABLE 3
-#define CMD_LUT_SEQ_IDX_ERASE 5
-#define CMD_LUT_SEQ_IDX_WRITE 9
-
-#define CMD_SDR 0x01
-#define CMD_DDR 0x21
-#define RADDR_SDR 0x02
-#define RADDR_DDR 0x22
-#define CADDR_SDR 0x03
-#define CADDR_DDR 0x23
-#define MODE1_SDR 0x04
-#define MODE1_DDR 0x24
-#define MODE2_SDR 0x05
-#define MODE2_DDR 0x25
-#define MODE4_SDR 0x06
-#define MODE4_DDR 0x26
-#define MODE8_SDR 0x07
-#define MODE8_DDR 0x27
-#define WRITE_SDR 0x08
-#define WRITE_DDR 0x28
-#define READ_SDR 0x09
-#define READ_DDR 0x29
-#define LEARN_SDR 0x0A
-#define LEARN_DDR 0x2A
-#define DATSZ_SDR 0x0B
-#define DATSZ_DDR 0x2B
-#define DUMMY_SDR 0x0C
-#define DUMMY_DDR 0x2C
-#define DUMMY_RWDS_SDR 0x0D
-#define DUMMY_RWDS_DDR 0x2D
-#define JMP_ON_CS 0x1F
-#define STOP 0
-
-#define FLEXSPI_1PAD 0
-#define FLEXSPI_2PAD 1
-#define FLEXSPI_4PAD 2
-#define FLEXSPI_8PAD 3
-
-#define FLEXSPI_LUT_SEQ(cmd0, pad0, op0, cmd1, pad1, op1)                                                              \
-    (FLEXSPI_LUT_OPERAND0(op0) | FLEXSPI_LUT_NUM_PADS0(pad0) | FLEXSPI_LUT_OPCODE0(cmd0) | FLEXSPI_LUT_OPERAND1(op1) | \
-    FLEXSPI_LUT_NUM_PADS1(pad1) | FLEXSPI_LUT_OPCODE1(cmd1))
-
-// !@brief Definitions for FlexSPI Serial Clock Frequency
-typedef enum _FlexSpiSerialClockFreq
-{
-    kFlexSpiSerialClk_30MHz  = 1,
-    kFlexSpiSerialClk_50MHz  = 2,
-    kFlexSpiSerialClk_60MHz  = 3,
-    kFlexSpiSerialClk_75MHz  = 4,
-    kFlexSpiSerialClk_80MHz  = 5,
-    kFlexSpiSerialClk_100MHz = 6,
-    kFlexSpiSerialClk_120MHz = 7,
-    kFlexSpiSerialClk_133MHz = 8,
-    kFlexSpiSerialClk_166MHz = 9,
-} flexspi_serial_clk_freq_t;
-
-// !@brief FlexSPI clock configuration type
-enum
-{
-    kFlexSpiClk_SDR, // !< Clock configure for SDR mode
-    kFlexSpiClk_DDR, // !< Clock configurat for DDR mode
-};
-
-// !@brief FlexSPI Read Sample Clock Source definition
-typedef enum _FlashReadSampleClkSource
-{
-    kFlexSPIReadSampleClk_LoopbackInternally      = 0,
-    kFlexSPIReadSampleClk_LoopbackFromDqsPad      = 1,
-    kFlexSPIReadSampleClk_LoopbackFromSckPad      = 2,
-    kFlexSPIReadSampleClk_ExternalInputFromDqsPad = 3,
-} flexspi_read_sample_clk_t;
-
-// !@brief Misc feature bit definitions
-enum
-{
-    kFlexSpiMiscOffset_DiffClkEnable            = 0, // !< Bit for Differential clock enable
-    kFlexSpiMiscOffset_Ck2Enable                = 1, // !< Bit for CK2 enable
-    kFlexSpiMiscOffset_ParallelEnable           = 2, // !< Bit for Parallel mode enable
-    kFlexSpiMiscOffset_WordAddressableEnable    = 3, // !< Bit for Word Addressable enable
-    kFlexSpiMiscOffset_SafeConfigFreqEnable     = 4, // !< Bit for Safe Configuration Frequency enable
-    kFlexSpiMiscOffset_PadSettingOverrideEnable = 5, // !< Bit for Pad setting override enable
-    kFlexSpiMiscOffset_DdrModeEnable            = 6, // !< Bit for DDR clock confiuration indication.
-};
-
-// !@brief Flash Type Definition
-enum
-{
-    kFlexSpiDeviceType_SerialNOR    = 1,    // !< Flash devices are Serial NOR
-    kFlexSpiDeviceType_SerialNAND   = 2,    // !< Flash devices are Serial NAND
-    kFlexSpiDeviceType_SerialRAM    = 3,    // !< Flash devices are Serial RAM/HyperFLASH
-    kFlexSpiDeviceType_MCP_NOR_NAND = 0x12, // !< Flash device is MCP device, A1 is Serial NOR, A2 is Serial NAND
-    kFlexSpiDeviceType_MCP_NOR_RAM  = 0x13, // !< Flash deivce is MCP device, A1 is Serial NOR, A2 is Serial RAMs
-};
-
-// !@brief Flash Pad Definitions
-enum
-{
-    kSerialFlash_1Pad  = 1,
-    kSerialFlash_2Pads = 2,
-    kSerialFlash_4Pads = 4,
-    kSerialFlash_8Pads = 8,
-};
-
-// !@brief FlexSPI LUT Sequence structure
-typedef struct _lut_sequence
-{
-    uint8_t seqNum; // !< Sequence Number, valid number: 1-16
-    uint8_t seqId;  // !< Sequence Index, valid number: 0-15
-    uint16_t reserved;
-} flexspi_lut_seq_t;
-
-// !@brief Flash Configuration Command Type
-enum
-{
-    kDeviceConfigCmdType_Generic,    // !< Generic command, for example: configure dummy cycles, drive strength, etc
-    kDeviceConfigCmdType_QuadEnable, // !< Quad Enable command
-    kDeviceConfigCmdType_Spi2Xpi,    // !< Switch from SPI to DPI/QPI/OPI mode
-    kDeviceConfigCmdType_Xpi2Spi,    // !< Switch from DPI/QPI/OPI to SPI mode
-    kDeviceConfigCmdType_Spi2NoCmd,  // !< Switch to 0-4-4/0-8-8 mode
-    kDeviceConfigCmdType_Reset,      // !< Reset device command
-};
-
-// !@brief FlexSPI Memory Configuration Block
-typedef struct _FlexSPIConfig
-{
-    uint32_t tag;               // !< [0x000-0x003] Tag, fixed value 0x42464346UL
-    uint32_t version;           // !< [0x004-0x007] Version,[31:24] -'V', [23:16] - Major, [15:8] - Minor, [7:0] - bugfix
-    uint32_t reserved0;         // !< [0x008-0x00b] Reserved for future use
-    uint8_t readSampleClkSrc;   // !< [0x00c-0x00c] Read Sample Clock Source, valid value: 0/1/3
-    uint8_t csHoldTime;         // !< [0x00d-0x00d] CS hold time, default value: 3
-    uint8_t csSetupTime;        // !< [0x00e-0x00e] CS setup time, default value: 3
-    uint8_t columnAddressWidth; // !< [0x00f-0x00f] Column Address with, for HyperBus protocol, it is fixed to 3, For
-    // ! Serial NAND, need to refer to datasheet
-    uint8_t deviceModeCfgEnable; // !< [0x010-0x010] Device Mode Configure enable flag, 1 - Enable, 0 - Disable
-    uint8_t deviceModeType; // !< [0x011-0x011] Specify the configuration command type:Quad Enable, DPI/QPI/OPI switch,
-    // ! Generic configuration, etc.
-    uint16_t waitTimeCfgCommands; // !< [0x012-0x013] Wait time for all configuration commands, unit: 100us, Used for
-    // ! DPI/QPI/OPI switch or reset command
-    flexspi_lut_seq_t deviceModeSeq; // !< [0x014-0x017] Device mode sequence info, [7:0] - LUT sequence id, [15:8] - LUt
-    // ! sequence number, [31:16] Reserved
-    uint32_t deviceModeArg;    // !< [0x018-0x01b] Argument/Parameter for device configuration
-    uint8_t configCmdEnable;   // !< [0x01c-0x01c] Configure command Enable Flag, 1 - Enable, 0 - Disable
-    uint8_t configModeType[3]; // !< [0x01d-0x01f] Configure Mode Type, similar as deviceModeTpe
-    flexspi_lut_seq_t
-        configCmdSeqs[3]; // !< [0x020-0x02b] Sequence info for Device Configuration command, similar as deviceModeSeq
-    uint32_t reserved1;   // !< [0x02c-0x02f] Reserved for future use
-    uint32_t configCmdArgs[3];     // !< [0x030-0x03b] Arguments/Parameters for device Configuration commands
-    uint32_t reserved2;            // !< [0x03c-0x03f] Reserved for future use
-    uint32_t controllerMiscOption; // !< [0x040-0x043] Controller Misc Options, see Misc feature bit definitions for more
-    // ! details
-    uint8_t deviceType;    // !< [0x044-0x044] Device Type:  See Flash Type Definition for more details
-    uint8_t sflashPadType; // !< [0x045-0x045] Serial Flash Pad Type: 1 - Single, 2 - Dual, 4 - Quad, 8 - Octal
-    uint8_t serialClkFreq; // !< [0x046-0x046] Serial Flash Frequencey, device specific definitions, See System Boot
-    // ! Chapter for more details
-    uint8_t lutCustomSeqEnable; // !< [0x047-0x047] LUT customization Enable, it is required if the program/erase cannot
-    // ! be done using 1 LUT sequence, currently, only applicable to HyperFLASH
-    uint32_t reserved3[2];           // !< [0x048-0x04f] Reserved for future use
-    uint32_t sflashA1Size;           // !< [0x050-0x053] Size of Flash connected to A1
-    uint32_t sflashA2Size;           // !< [0x054-0x057] Size of Flash connected to A2
-    uint32_t sflashB1Size;           // !< [0x058-0x05b] Size of Flash connected to B1
-    uint32_t sflashB2Size;           // !< [0x05c-0x05f] Size of Flash connected to B2
-    uint32_t csPadSettingOverride;   // !< [0x060-0x063] CS pad setting override value
-    uint32_t sclkPadSettingOverride; // !< [0x064-0x067] SCK pad setting override value
-    uint32_t dataPadSettingOverride; // !< [0x068-0x06b] data pad setting override value
-    uint32_t dqsPadSettingOverride;  // !< [0x06c-0x06f] DQS pad setting override value
-    uint32_t timeoutInMs;            // !< [0x070-0x073] Timeout threshold for read status command
-    uint32_t commandInterval;        // !< [0x074-0x077] CS deselect interval between two commands
-    uint16_t dataValidTime[2]; // !< [0x078-0x07b] CLK edge to data valid time for PORT A and PORT B, in terms of 0.1ns
-    uint16_t busyOffset;       // !< [0x07c-0x07d] Busy offset, valid value: 0-31
-    uint16_t busyBitPolarity;  // !< [0x07e-0x07f] Busy flag polarity, 0 - busy flag is 1 when flash device is busy, 1 -
-    // ! busy flag is 0 when flash device is busy
-    uint32_t lookupTable[64];           // !< [0x080-0x17f] Lookup table holds Flash command sequences
-    flexspi_lut_seq_t lutCustomSeq[12]; // !< [0x180-0x1af] Customizable LUT Sequences
-    uint32_t reserved4[4];              // !< [0x1b0-0x1bf] Reserved for future use
-} flexspi_mem_config_t;
-
-/*  */
-#define NOR_CMD_LUT_SEQ_IDX_READ_NORMAL 0
-#define NOR_CMD_LUT_SEQ_IDX_READSTATUSREG 1
-#define NOR_CMD_LUT_SEQ_IDX_READ_FAST_QUAD 2
-#define NOR_CMD_LUT_SEQ_IDX_WRITEENABLE 3
-#define NOR_CMD_LUT_SEQ_IDX_READSTATUS_XPI 4
-#define NOR_CMD_LUT_SEQ_IDX_ERASESECTOR 5
-#define NOR_CMD_LUT_SEQ_IDX_WRITESTATUSREG 6
-#define NOR_CMD_LUT_SEQ_IDX_PAGEPROGRAM_QUAD 7
-#define NOR_CMD_LUT_SEQ_IDX_READID 8
-#define NOR_CMD_LUT_SEQ_IDX_PAGEPROGRAM 9
-#define NOR_CMD_LUT_SEQ_IDX_ENTERQPI 10
-#define NOR_CMD_LUT_SEQ_IDX_CHIPERASE 11
-#define NOR_CMD_LUT_SEQ_IDX_EXITQPI 12
-
-/*
- *  Serial NOR configuration block
- */
-typedef struct _flexspi_nor_config
-{
-    flexspi_mem_config_t memConfig; // !< Common memory configuration info via FlexSPI
-    uint32_t pageSize;              // !< Page size of Serial NOR
-    uint32_t sectorSize;            // !< Sector size of Serial NOR
-    uint8_t ipcmdSerialClkFreq;     // !< Clock frequency for IP command
-    uint8_t isUniformBlockSize;     // !< Sector/Block size is the same
-    uint8_t reserved0[2];           // !< Reserved for future use
-    uint8_t serialNorType;          // !< Serial NOR Flash type: 0/1/2/3
-    uint8_t needExitNoCmdMode;      // !< Need to exit NoCmd mode before other IP command
-    uint8_t halfClkForNonReadCmd;   // !< Half the Serial Clock for non-read command: true/false
-    uint8_t needRestoreNoCmdMode;   // !< Need to Restore NoCmd mode after IP commmand execution
-    uint32_t blockSize;             // !< Block size
-    uint32_t reserve2[11];          // !< Reserved for future use
-} flexspi_nor_config_t;
-
-#define FLASH_BUSY_STATUS_POL 0
-#define FLASH_BUSY_STATUS_OFFSET 0
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* __EVKMIMXRT1060_FLEXSPI_NOR_CONFIG__ */
diff --git a/ports/mimxrt/boards/TEENSY41/qspi_nor_flash_config.c b/ports/mimxrt/boards/TEENSY41/qspi_nor_flash_config.c
deleted file mode 100644
index 69135f6b47a43..0000000000000
--- a/ports/mimxrt/boards/TEENSY41/qspi_nor_flash_config.c
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- * Copyright 2018 NXP
- * All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-// Based on tinyusb/hw/bsp/teensy_40/teensy40_flexspi_nor_config.c
-
-#include BOARD_FLASH_CONFIG_HEADER_H
-
-/* Component ID definition, used by tools. */
-#ifndef FSL_COMPONENT_ID
-#define FSL_COMPONENT_ID "platform.drivers.xip_board"
-#endif
-
-/*******************************************************************************
- * Code
- ******************************************************************************/
-#if defined(XIP_BOOT_HEADER_ENABLE) && (XIP_BOOT_HEADER_ENABLE == 1)
-#if defined(__CC_ARM) || defined(__ARMCC_VERSION) || defined(__GNUC__)
-__attribute__((section(".boot_hdr.conf")))
-#elif defined(__ICCARM__)
-#pragma location = ".boot_hdr.conf"
-#endif
-
-const flexspi_nor_config_t qspiflash_config = {
-    .memConfig =
-    {
-        .tag = FLEXSPI_CFG_BLK_TAG,
-        .version = FLEXSPI_CFG_BLK_VERSION,
-        .readSampleClkSrc = kFlexSPIReadSampleClk_LoopbackFromDqsPad,
-        .csHoldTime = 3u,
-        .csSetupTime = 3u,
-
-        .busyOffset = FLASH_BUSY_STATUS_OFFSET,         // Status bit 0 indicates busy.
-        .busyBitPolarity = FLASH_BUSY_STATUS_POL,       // Busy when the bit is 1.
-
-        .deviceModeCfgEnable = 1u,
-        .deviceModeType = kDeviceConfigCmdType_QuadEnable,
-        .deviceModeSeq = {
-            .seqId = 4u,
-            .seqNum = 1u,
-        },
-        .deviceModeArg = 0x0200,
-        .configCmdEnable = 1u,
-        .configModeType[0] = kDeviceConfigCmdType_Generic,
-        .configCmdSeqs[0] = {
-            .seqId = 2u,
-            .seqNum = 1u,
-        },
-        .deviceType = kFlexSpiDeviceType_SerialNOR,
-        // Enable DDR mode, Wordaddassable, Safe configuration, Differential clock
-        .sflashPadType = kSerialFlash_4Pads,
-        .serialClkFreq = kFlexSpiSerialClk_60MHz,
-        .sflashA1Size = MICROPY_HW_FLASH_SIZE,
-        .lookupTable =
-        {
-            // 0 Read LUTs 0 -> 0
-            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0xEB, RADDR_SDR, FLEXSPI_4PAD, 0x18),
-            FLEXSPI_LUT_SEQ(DUMMY_SDR, FLEXSPI_4PAD, 0x06, READ_SDR, FLEXSPI_4PAD, 0x04),
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-
-            // 1 Read status register -> 1
-            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x05, READ_SDR, FLEXSPI_1PAD, 0x01),
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-
-            // 2 Fast read quad mode - SDR
-            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x6B, RADDR_SDR, FLEXSPI_1PAD, 0x18),
-            FLEXSPI_LUT_SEQ(DUMMY_SDR, FLEXSPI_4PAD, 0x08, READ_SDR, FLEXSPI_4PAD, 0x04),
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-
-            // 3 Write Enable -> 3
-            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x06, STOP, FLEXSPI_1PAD, 0),
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-
-            // 4 Read extend parameters
-            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x81, READ_SDR, FLEXSPI_1PAD, 0x04),
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-
-            // 5 Erase Sector -> 5
-            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x20, RADDR_SDR, FLEXSPI_1PAD, 24),
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-
-            // 6 Write Status Reg
-            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x01, WRITE_SDR, FLEXSPI_1PAD, 0x04),
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-
-            // 7 Page Program - quad mode (-> 9)
-            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x32, RADDR_SDR, FLEXSPI_1PAD, 0x18),
-            FLEXSPI_LUT_SEQ(WRITE_SDR, FLEXSPI_4PAD, 0x04, STOP, FLEXSPI_1PAD, 0),
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-
-            // 8 Read ID
-            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x90, DUMMY_SDR, FLEXSPI_1PAD, 24),
-            FLEXSPI_LUT_SEQ(READ_SDR, FLEXSPI_1PAD, 0x00, 0, 0, 0),
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-
-            // 9 Page Program - single mode -> 9
-            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x02, RADDR_SDR, FLEXSPI_1PAD, 24),
-            FLEXSPI_LUT_SEQ(WRITE_SDR, FLEXSPI_1PAD, 0, 0, 0, 0),
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-
-            // 10 Enter QPI mode
-            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x35, STOP, FLEXSPI_1PAD, 0),
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-
-            // 11 Erase Chip
-            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x60, STOP, FLEXSPI_1PAD, 0),
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-
-            // 12 Exit QPI mode
-            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_4PAD, 0xF5, STOP, FLEXSPI_1PAD, 0),
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-        },
-    },
-    .pageSize = 256u,
-    .sectorSize = 4u * 1024u,
-    .ipcmdSerialClkFreq = kFlexSpiSerialClk_30MHz,
-    .blockSize = 0x00010000,
-    .isUniformBlockSize = false,
-};
-#endif /* XIP_BOOT_HEADER_ENABLE */
diff --git a/ports/mimxrt/boards/MIMXRT1050_EVK/MIMXRT1050_EVK_flexspi_nor_config.h b/ports/mimxrt/hal/flexspi_flash_config.h
similarity index 98%
rename from ports/mimxrt/boards/MIMXRT1050_EVK/MIMXRT1050_EVK_flexspi_nor_config.h
rename to ports/mimxrt/hal/flexspi_flash_config.h
index b4e9217416895..3c21eb609a77c 100644
--- a/ports/mimxrt/boards/MIMXRT1050_EVK/MIMXRT1050_EVK_flexspi_nor_config.h
+++ b/ports/mimxrt/hal/flexspi_flash_config.h
@@ -5,8 +5,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __EVKMIMXRT1050_FLEXSPI_NOR_CONFIG__
-#define __EVKMIMXRT1050_FLEXSPI_NOR_CONFIG__
+#ifndef __FLEXSPI_FLASH_CONFIG__
+#define __FLEXSPI_FLASH_CONFIG__
 
 #include <stdint.h>
 #include <stdbool.h>
@@ -260,4 +260,4 @@ extern "C" {
 #ifdef __cplusplus
 }
 #endif
-#endif /* __EVKMIMXRT1050_FLEXSPI_NOR_CONFIG__ */
+#endif /* __FLEXSPI_FLASH_CONFIG__ */
diff --git a/ports/mimxrt/hal/flexspi_hyper_flash.h b/ports/mimxrt/hal/flexspi_hyper_flash.h
index dbd028fd6f718..f340aec10a3e5 100644
--- a/ports/mimxrt/hal/flexspi_hyper_flash.h
+++ b/ports/mimxrt/hal/flexspi_hyper_flash.h
@@ -28,7 +28,7 @@
 
 #include "fsl_flexspi.h"
 #include "mpconfigboard.h"
-#include BOARD_FLASH_CONFIG_HEADER_H
+#include "flexspi_flash_config.h"
 
 // Defined in boards flash_config.c
 extern flexspi_nor_config_t qspiflash_config;
diff --git a/ports/mimxrt/hal/flexspi_nor_flash.h b/ports/mimxrt/hal/flexspi_nor_flash.h
index f8c31488a9883..c2c30876c7d77 100644
--- a/ports/mimxrt/hal/flexspi_nor_flash.h
+++ b/ports/mimxrt/hal/flexspi_nor_flash.h
@@ -28,7 +28,7 @@
 
 #include "fsl_flexspi.h"
 #include "mpconfigboard.h"
-#include BOARD_FLASH_CONFIG_HEADER_H
+#include "flexspi_flash_config.h"
 
 // Defined in boards flash_config.c
 extern flexspi_nor_config_t qspiflash_config;
diff --git a/ports/mimxrt/boards/MIMXRT1064_EVK/qspi_hyper_flash_config.c b/ports/mimxrt/hal/qspi_hyper_flash_config.c
similarity index 99%
rename from ports/mimxrt/boards/MIMXRT1064_EVK/qspi_hyper_flash_config.c
rename to ports/mimxrt/hal/qspi_hyper_flash_config.c
index f5ffbe8413a7d..17a952b68962f 100644
--- a/ports/mimxrt/boards/MIMXRT1064_EVK/qspi_hyper_flash_config.c
+++ b/ports/mimxrt/hal/qspi_hyper_flash_config.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include BOARD_FLASH_CONFIG_HEADER_H
+#include "flexspi_flash_config.h"
 
 /* Component ID definition, used by tools. */
 #ifndef FSL_COMPONENT_ID
diff --git a/ports/mimxrt/boards/MIMXRT1020_EVK/qspi_nor_flash_config.c b/ports/mimxrt/hal/qspi_nor_flash_config.c
similarity index 98%
rename from ports/mimxrt/boards/MIMXRT1020_EVK/qspi_nor_flash_config.c
rename to ports/mimxrt/hal/qspi_nor_flash_config.c
index fc4d3c10c1e38..4ae5093c829ce 100644
--- a/ports/mimxrt/boards/MIMXRT1020_EVK/qspi_nor_flash_config.c
+++ b/ports/mimxrt/hal/qspi_nor_flash_config.c
@@ -7,7 +7,7 @@
 
 // Based on tinyusb/hw/bsp/teensy_40/evkmimxrt1010_flexspi_nor_config.c
 
-#include BOARD_FLASH_CONFIG_HEADER_H
+#include "flexspi_flash_config.h"
 
 /* Component ID definition, used by tools. */
 #ifndef FSL_COMPONENT_ID
@@ -129,7 +129,7 @@ const flexspi_nor_config_t qspiflash_config = {
     },
     .pageSize = 256u,
     .sectorSize = 4u * 1024u,
-    .blockSize = 256u * 1024u,
+    .blockSize = 64u * 1024u,
     .isUniformBlockSize = false,
     // .ipcmdSerialClkFreq = kFlexSpiSerialClk_30MHz,
 };

From d9d67adef1113ab18f1bb3c0c6204ccb210a27be Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 15 Dec 2021 11:49:22 +1100
Subject: [PATCH 1495/3533] docs: Remove trailing spaces and convert tabs to
 spaces.

Signed-off-by: Damien George <damien@micropython.org>
---
 docs/develop/extendingmicropython.rst    |   1 -
 docs/develop/gettingstarted.rst          |  28 +++---
 docs/develop/index.rst                   |   3 +-
 docs/develop/qstr.rst                    |   2 +-
 docs/esp32/quickref.rst                  |   8 +-
 docs/esp32/tutorial/intro.rst            |   4 +-
 docs/esp8266/tutorial/intro.rst          |   6 +-
 docs/library/esp.rst                     |   2 +-
 docs/library/heapq.rst                   |   2 +-
 docs/library/lcd160cr.rst                |   2 +-
 docs/library/machine.ADCWiPy.rst         |  10 +--
 docs/library/machine.I2S.rst             | 104 +++++++++++------------
 docs/library/machine.SD.rst              |   2 +-
 docs/library/machine.SDCard.rst          |   2 +-
 docs/library/machine.TimerWiPy.rst       |   6 +-
 docs/library/machine.UART.rst            |   2 +-
 docs/library/machine.WDT.rst             |   2 +-
 docs/library/machine.rst                 |   2 +-
 docs/library/pyb.Pin.rst                 |   2 +-
 docs/pyboard/quickref.rst                |  16 ++--
 docs/pyboard/tutorial/accel.rst          |   6 +-
 docs/pyboard/tutorial/leds.rst           |   2 +-
 docs/pyboard/tutorial/repl.rst           |   2 +-
 docs/pyboard/tutorial/reset.rst          |   2 +-
 docs/reference/asm_thumb2_hints_tips.rst |   6 +-
 docs/reference/constrained.rst           |   2 +-
 docs/reference/speed_python.rst          |   8 +-
 docs/wipy/quickref.rst                   |   4 +-
 docs/wipy/tutorial/reset.rst             |   6 +-
 docs/wipy/tutorial/timer.rst             |   2 +-
 docs/wipy/tutorial/wlan.rst              |   6 +-
 31 files changed, 125 insertions(+), 127 deletions(-)

diff --git a/docs/develop/extendingmicropython.rst b/docs/develop/extendingmicropython.rst
index 7fb1ae47a0e4e..b4029c421c89a 100644
--- a/docs/develop/extendingmicropython.rst
+++ b/docs/develop/extendingmicropython.rst
@@ -16,4 +16,3 @@ live in the main MicroPython repository.
 
    cmodules.rst
    natmod.rst
-   
\ No newline at end of file
diff --git a/docs/develop/gettingstarted.rst b/docs/develop/gettingstarted.rst
index 30b26071ea012..36062ddc008bd 100644
--- a/docs/develop/gettingstarted.rst
+++ b/docs/develop/gettingstarted.rst
@@ -4,7 +4,7 @@ Getting Started
 ===============
 
 This guide covers a step-by-step process on setting up version control, obtaining and building
-a copy of the source code for a port, building the documentation, running tests, and a description of the 
+a copy of the source code for a port, building the documentation, running tests, and a description of the
 directory structure of the MicroPython code base.
 
 Source control with git
@@ -16,7 +16,7 @@ code is pulled and pushed to and from the main repository. Install the respectiv
 of Git for your operating system to follow through the rest of the steps.
 
 .. note::
-   For a reference on the installation instructions, please refer to 
+   For a reference on the installation instructions, please refer to
    the `Git installation instructions <https://git-scm.com/book/en/v2/Getting-Started-Installing-Git>`_.
    Learn about the basic git commands in this `Git Handbook <https://guides.github.com/introduction/git-handbook/>`_
    or any other sources on the internet.
@@ -58,12 +58,12 @@ MicroPython repository.
 After the above configuration, your setup should be similar to this:
 
 .. code-block:: bash
-   
+
    $ git remote -v
-   origin	https://github.com/<your-user-name>/micropython (fetch)
-   origin	https://github.com/<your-user-name>/micropython (push)
-   upstream	https://github.com/micropython/micropython (fetch)
-   upstream	https://github.com/micropython/micropython (push)
+   origin       https://github.com/<your-user-name>/micropython (fetch)
+   origin       https://github.com/<your-user-name>/micropython (push)
+   upstream     https://github.com/micropython/micropython (fetch)
+   upstream     https://github.com/micropython/micropython (push)
 
 You should now have a copy of the source code. By default, you are pointing
 to the master branch. To prepare for further development, it is recommended
@@ -73,7 +73,7 @@ to work on a development branch.
 
     $ git checkout -b dev-branch
 
-You can give it any name. You will have to compile MicroPython whenever you change 
+You can give it any name. You will have to compile MicroPython whenever you change
 to a different branch.
 
 Compile and build the code
@@ -140,8 +140,8 @@ If it built successfully, you should see a message similar to this:
 .. code-block:: bash
 
    LINK mpy-cross
-      text	   data	    bss	    dec	    hex	filename
-    279328	    776	    880	 280984	  44998	mpy-cross
+      text          data    bss     dec     hex filename
+    279328          776     880  280984   44998 mpy-cross
 
 .. note::
 
@@ -181,8 +181,8 @@ If MicroPython built correctly, you should see the following:
 .. code-block:: bash
 
    LINK micropython
-      text	   data	    bss	    dec	    hex	filename
-    412033	   5680	   2496	 420209	  66971	micropython
+      text         data     bss     dec     hex filename
+    412033         5680    2496  420209   66971 micropython
 
 Now run it:
 
@@ -215,7 +215,7 @@ as detailed in the :ref:`required_dependencies` section, then build:
    $ make submodules
    $ make
 
-Please refer to the `stm32 documentation <https://github.com/micropython/micropython/tree/master/ports/stm32>`_ 
+Please refer to the `stm32 documentation <https://github.com/micropython/micropython/tree/master/ports/stm32>`_
 for more details on flashing the firmware.
 
 .. note::
@@ -259,7 +259,7 @@ Build the docs:
 
    $ make html
 
-Open ``docs/build/html/index.html`` in your browser to view the docs locally. Refer to the 
+Open ``docs/build/html/index.html`` in your browser to view the docs locally. Refer to the
 documentation on `importing your documentation
 <https://docs.readthedocs.io/en/stable/intro/import-guide.html>`_ to use Read the Docs.
 
diff --git a/docs/develop/index.rst b/docs/develop/index.rst
index 7a6a6be67c5b9..327038f1978bd 100644
--- a/docs/develop/index.rst
+++ b/docs/develop/index.rst
@@ -5,7 +5,7 @@ This chapter covers a tour of MicroPython from the perspective of a developer, c
 to MicroPython. It acts as a comprehensive resource on the implementation details of MicroPython
 for both novice and expert contributors.
 
-Development around MicroPython usually involves modifying the core runtime, porting or 
+Development around MicroPython usually involves modifying the core runtime, porting or
 maintaining a new library. This guide describes at great depth, the implementation
 details of MicroPython including a getting started guide, compiler internals, porting
 MicroPython to a new platform and implementing a core MicroPython library.
@@ -24,4 +24,3 @@ MicroPython to a new platform and implementing a core MicroPython library.
    publiccapi.rst
    extendingmicropython.rst
    porting.rst
-   
\ No newline at end of file
diff --git a/docs/develop/qstr.rst b/docs/develop/qstr.rst
index cd1fc47862cf0..5d1ac5bb4a49f 100644
--- a/docs/develop/qstr.rst
+++ b/docs/develop/qstr.rst
@@ -59,7 +59,7 @@ Processing happens in the following stages:
    information.  Note that this step only uses files that have changed, which
    means that ``qstr.i.last`` will only contain data from files that have
    changed since the last compile.
-   
+
 2. ``qstr.split`` is an empty file created after running ``makeqstrdefs.py split``
    on qstr.i.last. It's just used as a dependency to indicate that the step ran.
    This script outputs one file per input C file,  ``genhdr/qstr/...file.c.qstr``,
diff --git a/docs/esp32/quickref.rst b/docs/esp32/quickref.rst
index 97b6fba38d0ef..41c2fd6c65012 100644
--- a/docs/esp32/quickref.rst
+++ b/docs/esp32/quickref.rst
@@ -415,14 +415,14 @@ I2S bus
 See :ref:`machine.I2S <machine.I2S>`. ::
 
     from machine import I2S, Pin
-    
+
     i2s = I2S(0, sck=Pin(13), ws=Pin(14), sd=Pin(34), mode=I2S.TX, bits=16, format=I2S.STEREO, rate=44100, ibuf=40000) # create I2S object
     i2s.write(buf)             # write buffer of audio samples to I2S device
-    
+
     i2s = I2S(1, sck=Pin(33), ws=Pin(25), sd=Pin(32), mode=I2S.RX, bits=16, format=I2S.MONO, rate=22050, ibuf=40000) # create I2S object
     i2s.readinto(buf)          # fill buffer with audio samples from I2S device
-    
-The I2S class is currently available as a Technical Preview.  During the preview period, feedback from 
+
+The I2S class is currently available as a Technical Preview.  During the preview period, feedback from
 users is encouraged.  Based on this feedback, the I2S class API and implementation may be changed.
 
 ESP32 has two I2S buses with id=0 and id=1
diff --git a/docs/esp32/tutorial/intro.rst b/docs/esp32/tutorial/intro.rst
index 4c567383476f9..8ed42dbd3dc95 100644
--- a/docs/esp32/tutorial/intro.rst
+++ b/docs/esp32/tutorial/intro.rst
@@ -34,8 +34,8 @@ Please refer to the documentation for your board for further details.
 Getting the firmware
 --------------------
 
-The first thing you need to do is download the most recent MicroPython firmware 
-.bin file to load onto your ESP32 device. You can download it from the  
+The first thing you need to do is download the most recent MicroPython firmware
+.bin file to load onto your ESP32 device. You can download it from the
 `MicroPython downloads page <https://micropython.org/download#esp32>`_.
 From here, you have 3 main choices:
 
diff --git a/docs/esp8266/tutorial/intro.rst b/docs/esp8266/tutorial/intro.rst
index a5deb3532f6b2..ac46e68b5a5cc 100644
--- a/docs/esp8266/tutorial/intro.rst
+++ b/docs/esp8266/tutorial/intro.rst
@@ -41,8 +41,8 @@ Please refer to the documentation for your board for further details.
 Getting the firmware
 --------------------
 
-The first thing you need to do is download the most recent MicroPython firmware 
-.bin file to load onto your ESP8266 device. You can download it from the  
+The first thing you need to do is download the most recent MicroPython firmware
+.bin file to load onto your ESP8266 device. You can download it from the
 `MicroPython downloads page <http://micropython.org/download#esp8266>`_.
 From here, you have 3 main choices
 
@@ -64,7 +64,7 @@ such, only daily builds for 512kb modules are provided.
 Deploying the firmware
 ----------------------
 
-Once you have the MicroPython firmware (compiled code), you need to load it onto 
+Once you have the MicroPython firmware (compiled code), you need to load it onto
 your ESP8266 device.  There are two main steps to do this: first you
 need to put your device in boot-loader mode, and second you need to copy across
 the firmware.  The exact procedure for these steps is highly dependent on the
diff --git a/docs/library/esp.rst b/docs/library/esp.rst
index b9ae57bd9757f..5fb370065f22e 100644
--- a/docs/library/esp.rst
+++ b/docs/library/esp.rst
@@ -4,7 +4,7 @@
 .. module:: esp
     :synopsis: functions related to the ESP8266 and ESP32
 
-The ``esp`` module contains specific functions related to both the ESP8266 and 
+The ``esp`` module contains specific functions related to both the ESP8266 and
 ESP32 modules.  Some functions are only available on one or the other of these
 ports.
 
diff --git a/docs/library/heapq.rst b/docs/library/heapq.rst
index 5e808d544aed7..673871c5fc277 100644
--- a/docs/library/heapq.rst
+++ b/docs/library/heapq.rst
@@ -23,7 +23,7 @@ Functions
 
    Pop the first item from the ``heap``, and return it.  Raise ``IndexError`` if
    ``heap`` is empty.
-   
+
    The returned item will be the smallest item in the ``heap``.
 
 .. function:: heapify(x)
diff --git a/docs/library/lcd160cr.rst b/docs/library/lcd160cr.rst
index 85e4b8f07a1f6..25903eb22bf71 100644
--- a/docs/library/lcd160cr.rst
+++ b/docs/library/lcd160cr.rst
@@ -313,7 +313,7 @@ Advanced commands
     specified by :meth:`LCD160CR.set_spi_win`, starting from the top-left corner.
 
     The `framebuf <framebuf.html>`_ module can be used to construct frame buffers
-    and provides drawing primitives. Using a frame buffer will improve 
+    and provides drawing primitives. Using a frame buffer will improve
     performance of animations when compared to drawing directly to the screen.
 
 .. method:: LCD160CR.set_scroll(on)
diff --git a/docs/library/machine.ADCWiPy.rst b/docs/library/machine.ADCWiPy.rst
index e500d00890f3a..d4ccde2056aac 100644
--- a/docs/library/machine.ADCWiPy.rst
+++ b/docs/library/machine.ADCWiPy.rst
@@ -27,13 +27,13 @@ Constructors
    Create an ADC object associated with the given pin.
    This allows you to then read analog values on that pin.
    For more info check the `pinout and alternate functions
-   table. <https://raw.githubusercontent.com/wipy/wipy/master/docs/PinOUT.png>`_ 
+   table. <https://raw.githubusercontent.com/wipy/wipy/master/docs/PinOUT.png>`_
 
-   .. warning:: 
+   .. warning::
 
-      ADC pin input range is 0-1.4V (being 1.8V the absolute maximum that it 
-      can withstand). When GP2, GP3, GP4 or GP5 are remapped to the 
-      ADC block, 1.8 V is the maximum. If these pins are used in digital mode, 
+      ADC pin input range is 0-1.4V (being 1.8V the absolute maximum that it
+      can withstand). When GP2, GP3, GP4 or GP5 are remapped to the
+      ADC block, 1.8 V is the maximum. If these pins are used in digital mode,
       then the maximum allowed input is 3.6V.
 
 Methods
diff --git a/docs/library/machine.I2S.rst b/docs/library/machine.I2S.rst
index d64fba33e4529..abfbb08780395 100644
--- a/docs/library/machine.I2S.rst
+++ b/docs/library/machine.I2S.rst
@@ -4,91 +4,91 @@
 class I2S -- Inter-IC Sound bus protocol
 ========================================
 
-I2S is a synchronous serial protocol used to connect digital audio devices. 
+I2S is a synchronous serial protocol used to connect digital audio devices.
 At the physical level, a bus consists of 3 lines: SCK, WS, SD.
 The I2S class supports controller operation.  Peripheral operation is not supported.
 
-The I2S class is currently available as a Technical Preview.  During the preview period, feedback from 
+The I2S class is currently available as a Technical Preview.  During the preview period, feedback from
 users is encouraged.  Based on this feedback, the I2S class API and implementation may be changed.
 
 I2S objects can be created and initialized using::
 
     from machine import I2S
     from machine import Pin
-    
+
     # ESP32
     sck_pin = Pin(14)   # Serial clock output
     ws_pin = Pin(13)    # Word clock output
     sd_pin = Pin(12)    # Serial data output
-    
+
     or
-    
+
     # PyBoards
     sck_pin = Pin("Y6")   # Serial clock output
     ws_pin = Pin("Y5")    # Word clock output
     sd_pin = Pin("Y8")    # Serial data output
-    
-    audio_out = I2S(2, 
+
+    audio_out = I2S(2,
                     sck=sck_pin, ws=ws_pin, sd=sd_pin,
-                    mode=I2S.TX, 
-                    bits=16,                       
+                    mode=I2S.TX,
+                    bits=16,
                     format=I2S.MONO,
-                    rate=44100, 
+                    rate=44100,
                     ibuf=20000)
-                   
-    audio_in = I2S(2, 
+
+    audio_in = I2S(2,
                    sck=sck_pin, ws=ws_pin, sd=sd_pin,
-                   mode=I2S.RX, 
-                   bits=32,                       
+                   mode=I2S.RX,
+                   bits=32,
                    format=I2S.STEREO,
-                   rate=22050, 
+                   rate=22050,
                    ibuf=20000)
-                    
+
 3 modes of operation are supported:
- - blocking 
- - non-blocking 
+ - blocking
+ - non-blocking
  - uasyncio
-  
+
 blocking::
- 
+
    num_written = audio_out.write(buf) # blocks until buf emptied
 
    num_read = audio_in.readinto(buf) # blocks until buf filled
-   
+
 non-blocking::
- 
+
    audio_out.irq(i2s_callback)         # i2s_callback is called when buf is emptied
    num_written = audio_out.write(buf)  # returns immediately
-        
+
    audio_in.irq(i2s_callback)          # i2s_callback is called when buf is filled
-   num_read = audio_in.readinto(buf)   # returns immediately    
- 
+   num_read = audio_in.readinto(buf)   # returns immediately
+
 uasyncio::
- 
+
    swriter = uasyncio.StreamWriter(audio_out)
    swriter.write(buf)
    await swriter.drain()
-   
+
    sreader = uasyncio.StreamReader(audio_in)
    num_read = await sreader.readinto(buf)
- 
+
 Constructor
 -----------
 
 .. class:: I2S(id, *, sck, ws, sd, mode, bits, format, rate, ibuf)
 
    Construct an I2S object of the given id:
-   
-   - ``id`` identifies a particular I2S bus.  
+
+   - ``id`` identifies a particular I2S bus.
 
    ``id`` is board and port specific:
- 
+
      - PYBv1.0/v1.1: has one I2S bus with id=2.
-     - PYBD-SFxW: has two I2S buses with id=1 and id=2. 
-     - ESP32: has two I2S buses with id=0 and id=1. 
-   
+     - PYBD-SFxW: has two I2S buses with id=1 and id=2.
+     - ESP32: has two I2S buses with id=0 and id=1.
+
    Keyword-only parameters that are supported on all ports:
-    
+
      - ``sck`` is a pin object for the serial clock line
      - ``ws`` is a pin object for the word select line
      - ``sd`` is a pin object for the serial data line
@@ -97,9 +97,9 @@ Constructor
      - ``format`` specifies channel format, STEREO or MONO
      - ``rate`` specifies audio sampling rate (samples/s)
      - ``ibuf`` specifies internal buffer length (bytes)
-     
-   For all ports, DMA runs continuously in the background and allows user applications to perform other operations while 
-   sample data is transfered between the internal buffer and the I2S peripheral unit. 
+
+   For all ports, DMA runs continuously in the background and allows user applications to perform other operations while
+   sample data is transfered between the internal buffer and the I2S peripheral unit.
    Increasing the size of the internal buffer has the potential to increase the time that user applications can perform non-I2S operations
    before underflow (e.g. ``write`` method) or overflow (e.g. ``readinto`` method).
 
@@ -109,37 +109,37 @@ Methods
 .. method:: I2S.init(sck, ...)
 
   see Constructor for argument descriptions
-     
+
 .. method:: I2S.deinit()
 
   Deinitialize the I2S bus
-  
+
 .. method::  I2S.readinto(buf)
 
-  Read audio samples into the buffer specified by ``buf``.  ``buf`` must support the buffer protocol, such as bytearray or array. 
-  "buf" byte ordering is little-endian.  For Stereo format, left channel sample precedes right channel sample. For Mono format, 
+  Read audio samples into the buffer specified by ``buf``.  ``buf`` must support the buffer protocol, such as bytearray or array.
+  "buf" byte ordering is little-endian.  For Stereo format, left channel sample precedes right channel sample. For Mono format,
   the left channel sample data is used.
-  Returns number of bytes read 
-  
+  Returns number of bytes read
+
 .. method::  I2S.write(buf)
 
   Write audio samples contained in ``buf``. ``buf`` must support the buffer protocol, such as bytearray or array.
-  "buf" byte ordering is little-endian.  For Stereo format, left channel sample precedes right channel sample. For Mono format, 
+  "buf" byte ordering is little-endian.  For Stereo format, left channel sample precedes right channel sample. For Mono format,
   the sample data is written to both the right and left channels.
-  Returns number of bytes written 
-  
+  Returns number of bytes written
+
 .. method::  I2S.irq(handler)
 
-  Set a callback. ``handler`` is called when ``buf`` is emptied (``write`` method) or becomes full (``readinto`` method).  
+  Set a callback. ``handler`` is called when ``buf`` is emptied (``write`` method) or becomes full (``readinto`` method).
   Setting a callback changes the ``write`` and ``readinto`` methods to non-blocking operation.
   ``handler`` is called in the context of the MicroPython scheduler.
-  
+
 .. staticmethod::  I2S.shift(*, buf, bits, shift)
 
-  bitwise shift of all samples contained in ``buf``. ``bits`` specifies sample size in bits. ``shift`` specifies the number of bits to shift each sample. 
-  Positive for left shift, negative for right shift. 
+  bitwise shift of all samples contained in ``buf``. ``bits`` specifies sample size in bits. ``shift`` specifies the number of bits to shift each sample.
+  Positive for left shift, negative for right shift.
   Typically used for volume control.  Each bit shift changes sample volume by 6dB.
-  
+
 Constants
 ---------
 
diff --git a/docs/library/machine.SD.rst b/docs/library/machine.SD.rst
index d985db231aa44..c736dc4d2836e 100644
--- a/docs/library/machine.SD.rst
+++ b/docs/library/machine.SD.rst
@@ -32,7 +32,7 @@ Constructors
 
 .. class:: SD(id,... )
 
-   Create a SD card object. See ``init()`` for parameters if initialization. 
+   Create a SD card object. See ``init()`` for parameters if initialization.
 
 Methods
 -------
diff --git a/docs/library/machine.SDCard.rst b/docs/library/machine.SDCard.rst
index 96fb5b01c8a81..b07ad37d39b94 100644
--- a/docs/library/machine.SDCard.rst
+++ b/docs/library/machine.SDCard.rst
@@ -50,7 +50,7 @@ vary from platform to platform.
      - *mosi* can be used to specify an SPI mosi pin.
 
      - *cs* can be used to specify an SPI chip select pin.
-     
+
      - *freq* selects the SD/MMC interface frequency in Hz (only supported on the ESP32).
 
 Implementation-specific details
diff --git a/docs/library/machine.TimerWiPy.rst b/docs/library/machine.TimerWiPy.rst
index 39afc23bc529e..f8c8bb29da7fb 100644
--- a/docs/library/machine.TimerWiPy.rst
+++ b/docs/library/machine.TimerWiPy.rst
@@ -50,9 +50,9 @@ Methods
 
      - ``mode`` can be one of:
 
-       - ``TimerWiPy.ONE_SHOT`` - The timer runs once until the configured 
+       - ``TimerWiPy.ONE_SHOT`` - The timer runs once until the configured
          period of the channel expires.
-       - ``TimerWiPy.PERIODIC`` - The timer runs periodically at the configured 
+       - ``TimerWiPy.PERIODIC`` - The timer runs periodically at the configured
          frequency of the channel.
        - ``TimerWiPy.PWM``      - Output a PWM signal on a pin.
 
@@ -74,7 +74,7 @@ Methods
    The operating mode is is the one configured to the Timer object that was used to
    create the channel.
 
-   - ``channel`` if the width of the timer is 16-bit, then must be either ``TIMER.A``, ``TIMER.B``. 
+   - ``channel`` if the width of the timer is 16-bit, then must be either ``TIMER.A``, ``TIMER.B``.
      If the width is 32-bit then it **must be** ``TIMER.A | TIMER.B``.
 
    Keyword only arguments:
diff --git a/docs/library/machine.UART.rst b/docs/library/machine.UART.rst
index 2eb2e20cb3200..8fb42cfe87497 100644
--- a/docs/library/machine.UART.rst
+++ b/docs/library/machine.UART.rst
@@ -64,7 +64,7 @@ Methods
      - *timeout_char* specifies the time to wait between characters (in ms).
      - *invert* specifies which lines to invert.
      - *flow* specifies which hardware flow control signals to use. The value
-       is a bitmask. 
+       is a bitmask.
 
          - ``0`` will ignore hardware flow control signals.
          - ``UART.RTS`` will enable receive flow control by using the RTS output pin to
diff --git a/docs/library/machine.WDT.rst b/docs/library/machine.WDT.rst
index 612f23ba38620..3c799583e6674 100644
--- a/docs/library/machine.WDT.rst
+++ b/docs/library/machine.WDT.rst
@@ -24,7 +24,7 @@ Constructors
 
    Create a WDT object and start it. The timeout must be given in milliseconds.
    Once it is running the timeout cannot be changed and the WDT cannot be stopped either.
-   
+
    Notes: On the esp32 the minimum timeout is 1 second. On the esp8266 a timeout
    cannot be specified, it is determined by the underlying system.
 
diff --git a/docs/library/machine.rst b/docs/library/machine.rst
index c2a6b39001626..5f45168ed6972 100644
--- a/docs/library/machine.rst
+++ b/docs/library/machine.rst
@@ -203,7 +203,7 @@ Classes
    machine.UART.rst
    machine.SPI.rst
    machine.I2C.rst
-   machine.I2S.rst   
+   machine.I2S.rst
    machine.RTC.rst
    machine.Timer.rst
    machine.WDT.rst
diff --git a/docs/library/pyb.Pin.rst b/docs/library/pyb.Pin.rst
index 6465653f74cba..97dfbffbcfb99 100644
--- a/docs/library/pyb.Pin.rst
+++ b/docs/library/pyb.Pin.rst
@@ -120,7 +120,7 @@ Methods
      - *value* if not None will set the port output value before enabling the pin.
 
      - *alt* can be used when mode is ``Pin.AF_PP`` or ``Pin.AF_OD`` to set the
-       index or name of one of the alternate functions associated with a pin. 
+       index or name of one of the alternate functions associated with a pin.
        This arg was previously called *af* which can still be used if needed.
 
    Returns: ``None``.
diff --git a/docs/pyboard/quickref.rst b/docs/pyboard/quickref.rst
index ed56811ddb462..62157bff0a472 100644
--- a/docs/pyboard/quickref.rst
+++ b/docs/pyboard/quickref.rst
@@ -225,20 +225,20 @@ I2S bus
 See :ref:`machine.I2S <machine.I2S>`. ::
 
     from machine import I2S, Pin
-    
+
     i2s = I2S(2, sck=Pin('Y6'), ws=Pin('Y5'), sd=Pin('Y8'), mode=I2S.TX, bits=16, format=I2S.STEREO, rate=44100, ibuf=40000) # create I2S object
     i2s.write(buf)             # write buffer of audio samples to I2S device
-    
+
     i2s = I2S(1, sck=Pin('X5'), ws=Pin('X6'), sd=Pin('Y4'), mode=I2S.RX, bits=16, format=I2S.MONO, rate=22050, ibuf=40000) # create I2S object
     i2s.readinto(buf)          # fill buffer with audio samples from I2S device
-    
-The I2S class is currently available as a Technical Preview.  During the preview period, feedback from 
+
+The I2S class is currently available as a Technical Preview.  During the preview period, feedback from
 users is encouraged.  Based on this feedback, the I2S class API and implementation may be changed.
 
-PYBv1.0/v1.1 has one I2S bus with id=2.  
-PYBD-SFxW has two I2S buses with id=1 and id=2.  
-I2S is shared with SPI.  
-    
+PYBv1.0/v1.1 has one I2S bus with id=2.
+PYBD-SFxW has two I2S buses with id=1 and id=2.
+I2S is shared with SPI.
+
 CAN bus (controller area network)
 ---------------------------------
 
diff --git a/docs/pyboard/tutorial/accel.rst b/docs/pyboard/tutorial/accel.rst
index 58170e74ff361..dff71f2ee506f 100644
--- a/docs/pyboard/tutorial/accel.rst
+++ b/docs/pyboard/tutorial/accel.rst
@@ -29,7 +29,7 @@ We will start by using the accelerometer to turn on a light if it is not flat. :
 
     while True:
         x = accel.x()
-        if abs(x) > SENSITIVITY: 
+        if abs(x) > SENSITIVITY:
             light.on()
         else:
             light.off()
@@ -61,7 +61,7 @@ use the ``y()`` value and more LEDs we can turn the pyboard into a spirit level.
 
     while True:
         x = accel.x()
-        if x > SENSITIVITY: 
+        if x > SENSITIVITY:
             xlights[0].on()
             xlights[1].off()
         elif x < -SENSITIVITY:
@@ -72,7 +72,7 @@ use the ``y()`` value and more LEDs we can turn the pyboard into a spirit level.
             xlights[1].off()
 
         y = accel.y()
-        if y > SENSITIVITY: 
+        if y > SENSITIVITY:
             ylights[0].on()
             ylights[1].off()
         elif y < -SENSITIVITY:
diff --git a/docs/pyboard/tutorial/leds.rst b/docs/pyboard/tutorial/leds.rst
index 05f3b619e398e..63acc63cee932 100644
--- a/docs/pyboard/tutorial/leds.rst
+++ b/docs/pyboard/tutorial/leds.rst
@@ -47,7 +47,7 @@ Here, n keeps track of the current LED and every time the loop is executed we cy
 One problem you might find is that if you stop the script and then start it again that the LEDs are stuck on from the previous run, ruining our carefully choreographed disco. We can fix this by turning all the LEDs off when we initialise the script and then using a try/finally block. When you press CTRL-C, MicroPython generates a VCPInterrupt exception. Exceptions normally mean something has gone wrong and you can use a try: command to "catch" an exception. In this case it is just the user interrupting the script, so we don't need to catch the error but just tell MicroPython what to do when we exit. The finally block does this, and we use it to make sure all the LEDs are off. The full code is::
 
     leds = [pyb.LED(i) for i in range(1,5)]
-    for l in leds: 
+    for l in leds:
         l.off()
 
     n = 0
diff --git a/docs/pyboard/tutorial/repl.rst b/docs/pyboard/tutorial/repl.rst
index 973d1846a0f0e..b28d9cd57ed73 100644
--- a/docs/pyboard/tutorial/repl.rst
+++ b/docs/pyboard/tutorial/repl.rst
@@ -73,7 +73,7 @@ indicate that you should type the text after it at the prompt.  In the end, once
 you have entered the text ``print("hello pyboard!")`` and pressed Enter, the output
 on your screen should look like it does above.
 
-If you already know some python you can now try some basic commands here. 
+If you already know some python you can now try some basic commands here.
 
 If any of this is not working you can try either a hard reset or a soft reset;
 see below.
diff --git a/docs/pyboard/tutorial/reset.rst b/docs/pyboard/tutorial/reset.rst
index 0cd5ac21c8fac..59a3cd82ae1a7 100644
--- a/docs/pyboard/tutorial/reset.rst
+++ b/docs/pyboard/tutorial/reset.rst
@@ -21,7 +21,7 @@ To enter safe mode, do the following steps:
 4. The LEDs will then cycle green to orange to green+orange and back again.
 5. Keep holding down USR until *only the orange LED is lit*, and then let
    go of the USR switch.
-6. The orange LED should flash quickly 4 times, and then turn off.  
+6. The orange LED should flash quickly 4 times, and then turn off.
 7. You are now in safe mode.
 
 In safe mode, the ``boot.py`` and ``main.py`` files are not executed, and so
diff --git a/docs/reference/asm_thumb2_hints_tips.rst b/docs/reference/asm_thumb2_hints_tips.rst
index 062a3c8448c03..361e44380b799 100644
--- a/docs/reference/asm_thumb2_hints_tips.rst
+++ b/docs/reference/asm_thumb2_hints_tips.rst
@@ -3,7 +3,7 @@ Hints and tips
 
 The following are some examples of the use of the inline assembler and some
 information on how to work around its limitations. In this document the term
-"assembler function" refers to a function declared in Python with the 
+"assembler function" refers to a function declared in Python with the
 ``@micropython.asm_thumb`` decorator, whereas "subroutine" refers to assembler
 code called from within an assembler function.
 
@@ -106,8 +106,8 @@ function can return multiple values by assigning them to array elements.
 Assembler functions have no means of determining the length of an array:
 this will need to be passed to the function.
 
-This use of arrays can be extended to enable more than three arrays to be used. 
-This is done using indirection: the ``uctypes`` module supports ``addressof()`` 
+This use of arrays can be extended to enable more than three arrays to be used.
+This is done using indirection: the ``uctypes`` module supports ``addressof()``
 which will return the address of an array passed as its argument. Thus you can
 populate an integer array with the addresses of other arrays:
 
diff --git a/docs/reference/constrained.rst b/docs/reference/constrained.rst
index 2a5f9d7fdb5a9..816a20f9da80e 100644
--- a/docs/reference/constrained.rst
+++ b/docs/reference/constrained.rst
@@ -144,7 +144,7 @@ store constant data:
 
 As in the string example, at runtime a reference to the arbitrarily large
 integer is assigned to the variable ``bar``. That reference occupies a
-single machine word. 
+single machine word.
 
 It might be expected that tuples of integers could be employed for the purpose
 of storing constant data with minimal RAM use. With the current compiler this
diff --git a/docs/reference/speed_python.rst b/docs/reference/speed_python.rst
index 85e956e8e6a0d..834a53b0a7d72 100644
--- a/docs/reference/speed_python.rst
+++ b/docs/reference/speed_python.rst
@@ -36,7 +36,7 @@ Algorithms
 ~~~~~~~~~~
 
 The most important aspect of designing any routine for performance is ensuring that
-the best algorithm is employed. This is a topic for textbooks rather than for a 
+the best algorithm is employed. This is a topic for textbooks rather than for a
 MicroPython guide but spectacular performance gains can sometimes be achieved
 by adopting algorithms known for their efficiency.
 
@@ -210,7 +210,7 @@ no adaptation (but see below). It is invoked by means of a function decorator:
         buf = self.linebuf # Cached object
         # code
 
-There are certain limitations in the current implementation of the native code emitter. 
+There are certain limitations in the current implementation of the native code emitter.
 
 * Context managers are not supported (the ``with`` statement).
 * Generators are not supported.
@@ -222,7 +222,7 @@ increase in compiled code size.
 The Viper code emitter
 ----------------------
 
-The optimisations discussed above involve standards-compliant Python code. The 
+The optimisations discussed above involve standards-compliant Python code. The
 Viper code emitter is not fully compliant. It supports special Viper native data types
 in pursuit of performance. Integer processing is non-compliant because it uses machine
 words: arithmetic on 32 bit hardware is performed modulo 2**32.
@@ -237,7 +237,7 @@ bit manipulations. It is invoked using a decorator:
     def foo(self, arg: int) -> int:
         # code
 
-As the above fragment illustrates it is beneficial to use Python type hints to assist the Viper optimiser. 
+As the above fragment illustrates it is beneficial to use Python type hints to assist the Viper optimiser.
 Type hints provide information on the data types of arguments and of the return value; these
 are a standard Python language feature formally defined here `PEP0484 <https://www.python.org/dev/peps/pep-0484/>`_.
 Viper supports its own set of types namely ``int``, ``uint`` (unsigned integer), ``ptr``, ``ptr8``,
diff --git a/docs/wipy/quickref.rst b/docs/wipy/quickref.rst
index f9ea3d501ed4a..4c3b969bd1cda 100644
--- a/docs/wipy/quickref.rst
+++ b/docs/wipy/quickref.rst
@@ -154,7 +154,7 @@ See :ref:`machine.RTC <machine.RTC>` ::
         pass
         # do some non blocking operations
         # warning printing on an irq via telnet is not
-        # possible, only via UART 
+        # possible, only via UART
 
     # create a RTC alarm that expires after 5 seconds
     rtc.alarm(time=5000, repeat=False)
@@ -179,7 +179,7 @@ See :ref:`machine.SD <machine.SD>`. ::
     sd = SD()
     os.mount(sd, '/sd')
 
-WLAN (WiFi) 
+WLAN (WiFi)
 -----------
 
 See :ref:`network.WLAN <network.WLAN>` and :mod:`machine`. ::
diff --git a/docs/wipy/tutorial/reset.rst b/docs/wipy/tutorial/reset.rst
index ece28498b8ebb..1715d3e29788d 100644
--- a/docs/wipy/tutorial/reset.rst
+++ b/docs/wipy/tutorial/reset.rst
@@ -1,10 +1,10 @@
 Reset and boot modes
 ====================
 
-There are soft resets and hard resets. 
+There are soft resets and hard resets.
 
-   - A soft reset simply clears the state of the MicroPython virtual machine, 
-     but leaves hardware peripherals unaffected. To do a soft reset, simply press 
+   - A soft reset simply clears the state of the MicroPython virtual machine,
+     but leaves hardware peripherals unaffected. To do a soft reset, simply press
      **Ctrl+D** on the REPL, or within a script do::
 
         import sys
diff --git a/docs/wipy/tutorial/timer.rst b/docs/wipy/tutorial/timer.rst
index c87ac44959cf8..7cd7d0f134dd5 100644
--- a/docs/wipy/tutorial/timer.rst
+++ b/docs/wipy/tutorial/timer.rst
@@ -5,7 +5,7 @@ Timers can be used for a great variety of tasks, calling a function periodically
 counting events, and generating a PWM signal are among the most common use cases.
 Each timer consists of two 16-bit channels and this channels can be tied together to
 form one 32-bit timer. The operating mode needs to be configured per timer, but then
-the period (or the frequency) can be independently configured on each channel. 
+the period (or the frequency) can be independently configured on each channel.
 By using the callback method, the timer event can call a Python function.
 
 Example usage to toggle an LED at a fixed frequency::
diff --git a/docs/wipy/tutorial/wlan.rst b/docs/wipy/tutorial/wlan.rst
index 434367cd93502..bdfd3e0a54737 100644
--- a/docs/wipy/tutorial/wlan.rst
+++ b/docs/wipy/tutorial/wlan.rst
@@ -13,9 +13,9 @@ You can check the current mode (which is always ``WLAN.AP`` after power up)::
 
    >>> wlan.mode()
 
-.. warning:: 
-    When you change the WLAN mode following the instructions below, your WLAN 
-    connection to the WiPy will be broken. This means you will not be able 
+.. warning::
+    When you change the WLAN mode following the instructions below, your WLAN
+    connection to the WiPy will be broken. This means you will not be able
     to run these commands interactively over the WLAN.
 
     There are two ways around this::

From e9f880482cbe21002e9568aa82893b2b98956a56 Mon Sep 17 00:00:00 2001
From: Christian Decker <christian.decker@lookslikematrix.de>
Date: Fri, 26 Nov 2021 16:18:11 +0100
Subject: [PATCH 1496/3533] tools/upip.py: Support == to specify exact package
 version.

---
 tools/upip.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/tools/upip.py b/tools/upip.py
index 728b843c94017..a6d4c93ae3bdf 100644
--- a/tools/upip.py
+++ b/tools/upip.py
@@ -192,9 +192,13 @@ def fatal(msg, exc=None):
 
 
 def install_pkg(pkg_spec, install_path):
-    data = get_pkg_metadata(pkg_spec)
+    package = pkg_spec.split("==")
+    data = get_pkg_metadata(package[0])
 
-    latest_ver = data["info"]["version"]
+    if len(package) == 1:
+        latest_ver = data["info"]["version"]
+    else:
+        latest_ver = package[1]
     packages = data["releases"][latest_ver]
     del data
     gc.collect()

From f9733705a907a9e9c3b3e6ab613cc1d7f63b51a6 Mon Sep 17 00:00:00 2001
From: Tomas Vanek <vanekt@fbl.cz>
Date: Thu, 20 May 2021 19:15:52 +0200
Subject: [PATCH 1497/3533] esp32/machine_pin: Make GPIO 26 usable for S2,S3 if
 SPIRAM not config'd.

Signed-off-by: Tomas Vanek <vanekt@fbl.cz>
---
 ports/esp32/machine_pin.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/ports/esp32/machine_pin.c b/ports/esp32/machine_pin.c
index 42c419426922b..c0c7ddb705d26 100644
--- a/ports/esp32/machine_pin.c
+++ b/ports/esp32/machine_pin.c
@@ -177,7 +177,11 @@ STATIC const machine_pin_obj_t machine_pin_obj[] = {
     {{NULL}, -1}, // 23 not a pin
     {{NULL}, -1}, // 24 not a pin
     {{NULL}, -1}, // 25 not a pin
-    {{NULL}, -1}, // 26 FLASH/PSRAM
+    #if CONFIG_SPIRAM
+    {{NULL}, -1}, // 26 PSRAM
+    #else
+    {{&machine_pin_type}, GPIO_NUM_26},
+    #endif
     {{NULL}, -1}, // 27 FLASH/PSRAM
     {{NULL}, -1}, // 28 FLASH/PSRAM
     {{NULL}, -1}, // 29 FLASH/PSRAM
@@ -618,7 +622,11 @@ STATIC const machine_pin_irq_obj_t machine_pin_irq_object[] = {
     {{NULL}, -1}, // 23 not a pin
     {{NULL}, -1}, // 24 not a pin
     {{NULL}, -1}, // 25 not a pin
-    {{NULL}, -1}, // 26 FLASH/PSRAM
+    #if CONFIG_SPIRAM
+    {{NULL}, -1}, // 26 PSRAM
+    #else
+    {{&machine_pin_irq_type}, GPIO_NUM_26},
+    #endif
     {{NULL}, -1}, // 27 FLASH/PSRAM
     {{NULL}, -1}, // 28 FLASH/PSRAM
     {{NULL}, -1}, // 29 FLASH/PSRAM

From 3305ec44a2f45f9afbae029d157d49d1270cf21d Mon Sep 17 00:00:00 2001
From: Tomas Vanek <vanekt@fbl.cz>
Date: Wed, 1 Dec 2021 18:34:39 +0100
Subject: [PATCH 1498/3533] esp32/machine_hw_spi: Fix SPI default pins
 reordering on ESP32-S2/S3.

The index of machine_hw_spi_obj and machine_hw_spi_default_pins arrays is
assigned to 0 for ARG_id==HSPI_HOST and 1 for another SPI.  On ESP32S2 and
S3 HSPI_HOST=2 so the first set (idx=0) of default pins is used for
SPI(id=2) aka HSPI/SPI3 and the second set (idx=1) for SPI(id=1) aka
FSPI/SPI2.  This makes a misleading mess in MICROPY_HW_SPIxxxx definitions
and it is also in contradiction to the comments around the definitions.

Change the test of ARG_id to fix the order of machine_hw_spi_default_pins.

This change might require adjusting MICROPY_HW_SPIxxxx definitions in
mpconfigboard.h of S2/S3 based boards.

Signed-off-by: Tomas Vanek <vanekt@fbl.cz>
---
 ports/esp32/machine_hw_spi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/esp32/machine_hw_spi.c b/ports/esp32/machine_hw_spi.c
index 467bff7ccb86c..27afa60afdac9 100644
--- a/ports/esp32/machine_hw_spi.c
+++ b/ports/esp32/machine_hw_spi.c
@@ -458,7 +458,7 @@ mp_obj_t machine_hw_spi_make_new(const mp_obj_type_t *type, size_t n_args, size_
 
     machine_hw_spi_obj_t *self;
     const machine_hw_spi_default_pins_t *default_pins;
-    if (args[ARG_id].u_int == HSPI_HOST) {
+    if (args[ARG_id].u_int == 1) { // SPI2_HOST which is FSPI_HOST on ESP32Sx, HSPI_HOST on others
         self = &machine_hw_spi_obj[0];
         default_pins = &machine_hw_spi_default_pins[0];
     } else {

From d08886558b2033c200a136620de039cd48abe86e Mon Sep 17 00:00:00 2001
From: Tomas Vanek <vanekt@fbl.cz>
Date: Mon, 29 Nov 2021 12:57:28 +0100
Subject: [PATCH 1499/3533] esp32/machine_hw_spi: Set proper default SPI(id=1)
 pins on S2,S3 and C3.

Use IO_MUX pins as defined by ESP IDF in soc/esp32*/include/soc/spi_pins.h
Alternatively use now deprecated HSPI_IOMUX_PIN_NUM_xxx
(or FSPI_IOMUX_PIN_NUM_xxx for ESP32S2) for compatibility with IDF 4.2
and older.

Signed-off-by: Tomas Vanek <vanekt@fbl.cz>
---
 ports/esp32/machine_hw_spi.c | 28 ++++++++++++++++++++++++----
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/ports/esp32/machine_hw_spi.c b/ports/esp32/machine_hw_spi.c
index 27afa60afdac9..acdabcb2a03c1 100644
--- a/ports/esp32/machine_hw_spi.c
+++ b/ports/esp32/machine_hw_spi.c
@@ -36,11 +36,31 @@
 
 #include "driver/spi_master.h"
 
-// Default pins for SPI(1), can be overridden by a board
+// SPI mappings by device, naming used by IDF old/new
+// upython   | ESP32     | ESP32S2   | ESP32S3 | ESP32C3
+// ----------+-----------+-----------+---------+---------
+// SPI(id=1) | HSPI/SPI2 | FSPI/SPI2 | SPI2    | SPI2
+// SPI(id=2) | VSPI/SPI3 | HSPI/SPI3 | SPI3    | err
+
+// Default pins for SPI(id=1) aka IDF SPI2, can be overridden by a board
 #ifndef MICROPY_HW_SPI1_SCK
-#define MICROPY_HW_SPI1_SCK (14)
-#define MICROPY_HW_SPI1_MOSI (13)
-#define MICROPY_HW_SPI1_MISO (12)
+#ifdef SPI2_IOMUX_PIN_NUM_CLK
+// Use IO_MUX pins by default.
+// If SPI lines are routed to other pins through GPIO matrix
+// routing adds some delay and lower limit applies to SPI clk freq
+#define MICROPY_HW_SPI1_SCK SPI2_IOMUX_PIN_NUM_CLK      // pin 14 on ESP32
+#define MICROPY_HW_SPI1_MOSI SPI2_IOMUX_PIN_NUM_MOSI    // pin 13 on ESP32
+#define MICROPY_HW_SPI1_MISO SPI2_IOMUX_PIN_NUM_MISO    // pin 12 on ESP32
+// Only for compatibility with IDF 4.2 and older
+#elif CONFIG_IDF_TARGET_ESP32S2
+#define MICROPY_HW_SPI1_SCK FSPI_IOMUX_PIN_NUM_CLK
+#define MICROPY_HW_SPI1_MOSI FSPI_IOMUX_PIN_NUM_MOSI
+#define MICROPY_HW_SPI1_MISO FSPI_IOMUX_PIN_NUM_MISO
+#else
+#define MICROPY_HW_SPI1_SCK HSPI_IOMUX_PIN_NUM_CLK
+#define MICROPY_HW_SPI1_MOSI HSPI_IOMUX_PIN_NUM_MOSI
+#define MICROPY_HW_SPI1_MISO HSPI_IOMUX_PIN_NUM_MISO
+#endif
 #endif
 
 // Default pins for SPI(2), can be overridden by a board

From e761152d723ccbc472ec4f29ebb60a1ff6d34827 Mon Sep 17 00:00:00 2001
From: Tomas Vanek <vanekt@fbl.cz>
Date: Mon, 29 Nov 2021 16:49:11 +0100
Subject: [PATCH 1500/3533] esp32/machine_hw_spi: Set proper default SPI(id=2)
 pins on S2 and S3.

Use IO_MUX pins as defined by ESP IDF in soc/esp32/include/soc/spi_pins.h

ESP32S2 and S3 don't have IO_MUX pins for SPI3, GPIO matrix is always used.
Choose suitable defaults for S2 and S3.

ESP32C3 does not have SPI3 at all.  Don't define pin mappings for it.

Signed-off-by: Tomas Vanek <vanekt@fbl.cz>
---
 ports/esp32/machine_hw_spi.c | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/ports/esp32/machine_hw_spi.c b/ports/esp32/machine_hw_spi.c
index acdabcb2a03c1..1515b007440f5 100644
--- a/ports/esp32/machine_hw_spi.c
+++ b/ports/esp32/machine_hw_spi.c
@@ -63,11 +63,20 @@
 #endif
 #endif
 
-// Default pins for SPI(2), can be overridden by a board
+// Default pins for SPI(id=2) aka IDF SPI3, can be overridden by a board
 #ifndef MICROPY_HW_SPI2_SCK
-#define MICROPY_HW_SPI2_SCK (18)
-#define MICROPY_HW_SPI2_MOSI (23)
-#define MICROPY_HW_SPI2_MISO (19)
+#if CONFIG_IDF_TARGET_ESP32
+// ESP32 has IO_MUX pins for VSPI/SPI3 lines, use them as defaults
+#define MICROPY_HW_SPI2_SCK VSPI_IOMUX_PIN_NUM_CLK      // pin 18
+#define MICROPY_HW_SPI2_MOSI VSPI_IOMUX_PIN_NUM_MOSI    // pin 23
+#define MICROPY_HW_SPI2_MISO VSPI_IOMUX_PIN_NUM_MISO    // pin 19
+#elif CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3
+// ESP32S2 and S3 uses GPIO matrix for SPI3 pins, no IO_MUX possible
+// Set defaults to the pins used by SPI2 in Octal mode
+#define MICROPY_HW_SPI2_SCK (36)
+#define MICROPY_HW_SPI2_MOSI (35)
+#define MICROPY_HW_SPI2_MISO (37)
+#endif
 #endif
 
 #define MP_HW_SPI_MAX_XFER_BYTES (4092)
@@ -108,7 +117,9 @@ typedef struct _machine_hw_spi_obj_t {
 // Default pin mappings for the hardware SPI instances
 STATIC const machine_hw_spi_default_pins_t machine_hw_spi_default_pins[2] = {
     { .sck = MICROPY_HW_SPI1_SCK, .mosi = MICROPY_HW_SPI1_MOSI, .miso = MICROPY_HW_SPI1_MISO },
+    #ifdef MICROPY_HW_SPI2_SCK
     { .sck = MICROPY_HW_SPI2_SCK, .mosi = MICROPY_HW_SPI2_MOSI, .miso = MICROPY_HW_SPI2_MISO },
+    #endif
 };
 
 // Static objects mapping to HSPI and VSPI hardware peripherals

From 9aa151e3f355dea6e14d77053f40691365e60d96 Mon Sep 17 00:00:00 2001
From: Tomas Vanek <vanekt@fbl.cz>
Date: Wed, 1 Dec 2021 22:09:28 +0100
Subject: [PATCH 1501/3533] esp32/boards: Remove SPI pin defaults from GENERIC
 S2/S3 boards.

Default SPI pins are now correctly assigned by machine_hw_spi.c even for S2
and S3.  mpconfigboard.h files define defaults with flipped SPI(1) and
SPI(2) to workaround a bug in machine_hw_spi.c - the bug is fixed.

Signed-off-by: Tomas Vanek <vanekt@fbl.cz>
---
 ports/esp32/boards/ESP32_S2_WROVER/mpconfigboard.h   | 7 -------
 ports/esp32/boards/GENERIC_S3/mpconfigboard.h        | 4 ----
 ports/esp32/boards/GENERIC_S3_SPIRAM/mpconfigboard.h | 4 ----
 3 files changed, 15 deletions(-)

diff --git a/ports/esp32/boards/ESP32_S2_WROVER/mpconfigboard.h b/ports/esp32/boards/ESP32_S2_WROVER/mpconfigboard.h
index f9219c87670af..a96262c6071b6 100644
--- a/ports/esp32/boards/ESP32_S2_WROVER/mpconfigboard.h
+++ b/ports/esp32/boards/ESP32_S2_WROVER/mpconfigboard.h
@@ -6,10 +6,3 @@
 
 #define MICROPY_HW_I2C0_SCL                 (7)
 #define MICROPY_HW_I2C0_SDA                 (6)
-
-#define MICROPY_HW_SPI1_MOSI                (35)
-#define MICROPY_HW_SPI1_MISO                (37)
-#define MICROPY_HW_SPI1_SCK                 (36)
-#define MICROPY_HW_SPI2_MOSI                (11)
-#define MICROPY_HW_SPI2_MISO                (13)
-#define MICROPY_HW_SPI2_SCK                 (12)
diff --git a/ports/esp32/boards/GENERIC_S3/mpconfigboard.h b/ports/esp32/boards/GENERIC_S3/mpconfigboard.h
index f41917ff070ed..3540e5a855680 100644
--- a/ports/esp32/boards/GENERIC_S3/mpconfigboard.h
+++ b/ports/esp32/boards/GENERIC_S3/mpconfigboard.h
@@ -5,7 +5,3 @@
 
 #define MICROPY_HW_I2C0_SCL                 (9)
 #define MICROPY_HW_I2C0_SDA                 (8)
-
-#define MICROPY_HW_SPI1_MOSI                (35)
-#define MICROPY_HW_SPI1_MISO                (36)
-#define MICROPY_HW_SPI1_SCK                 (37)
diff --git a/ports/esp32/boards/GENERIC_S3_SPIRAM/mpconfigboard.h b/ports/esp32/boards/GENERIC_S3_SPIRAM/mpconfigboard.h
index 10085ae789aa4..beb796dd9eed1 100644
--- a/ports/esp32/boards/GENERIC_S3_SPIRAM/mpconfigboard.h
+++ b/ports/esp32/boards/GENERIC_S3_SPIRAM/mpconfigboard.h
@@ -6,7 +6,3 @@
 
 #define MICROPY_HW_I2C0_SCL                 (9)
 #define MICROPY_HW_I2C0_SDA                 (8)
-
-#define MICROPY_HW_SPI1_MOSI                (35)
-#define MICROPY_HW_SPI1_MISO                (36)
-#define MICROPY_HW_SPI1_SCK                 (37)

From 598618e8cf46ef716596bcf97d21a989c4ac15d3 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 15 Dec 2021 16:51:08 +1100
Subject: [PATCH 1502/3533] tools/makemanifest.py: Make str conversion
 compatible with Python 2.

Signed-off-by: Damien George <damien@micropython.org>
---
 tools/makemanifest.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/makemanifest.py b/tools/makemanifest.py
index 7897a83c6ee10..fc608ed449a96 100644
--- a/tools/makemanifest.py
+++ b/tools/makemanifest.py
@@ -347,7 +347,7 @@ def main():
         )
         if res != 0:
             print("error freezing mpy {}:".format(mpy_files))
-            print(str(output_mpy, "utf8"))
+            print(output_mpy.decode())
             sys.exit(1)
     else:
         output_mpy = (

From d6dc4cb65a222bd05ec2746c37e457c56484e780 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 15 Dec 2021 16:54:47 +1100
Subject: [PATCH 1503/3533] py/showbc: Fix printing of raw bytecode header on
 nanbox builds.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/showbc.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/py/showbc.c b/py/showbc.c
index f3bd5ea15efca..da8077eccd56f 100644
--- a/py/showbc.c
+++ b/py/showbc.c
@@ -98,8 +98,8 @@ void mp_bytecode_print(const mp_print_t *print, const void *descr, const byte *i
 
     // raw bytecode dump
     size_t prelude_size = ip - mp_showbc_code_start + n_info + n_cell;
-    mp_printf(print, "Raw bytecode (code_info_size=" UINT_FMT ", bytecode_size=" UINT_FMT "):\n",
-        prelude_size, len - prelude_size);
+    mp_printf(print, "Raw bytecode (code_info_size=%u, bytecode_size=%u):\n",
+        (unsigned)prelude_size, (unsigned)(len - prelude_size));
     for (mp_uint_t i = 0; i < len; i++) {
         if (i > 0 && i % 16 == 0) {
             mp_printf(print, "\n");

From cc23e99f320e5465db93b8cc021972a634692b63 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Wed, 8 Dec 2021 14:18:39 +1100
Subject: [PATCH 1504/3533] py/modio: Remove io.resource_stream function.

This feature is not enabled on any port, it's not in CPython's io module,
and functionality is better suited to the micropython-lib implementation of
pkg_resources.
---
 .../unix/variants/coverage/mpconfigvariant.h  |  1 -
 py/modio.c                                    | 47 -------------------
 py/mpconfig.h                                 | 11 -----
 tests/io/resource_stream.py                   | 15 ------
 tests/io/resource_stream.py.exp               |  2 -
 tests/unix/extra_coverage.py                  |  6 ---
 tests/unix/extra_coverage.py.exp              |  1 -
 7 files changed, 83 deletions(-)
 delete mode 100644 tests/io/resource_stream.py
 delete mode 100644 tests/io/resource_stream.py.exp

diff --git a/ports/unix/variants/coverage/mpconfigvariant.h b/ports/unix/variants/coverage/mpconfigvariant.h
index 942117608fab1..f033dddb10550 100644
--- a/ports/unix/variants/coverage/mpconfigvariant.h
+++ b/ports/unix/variants/coverage/mpconfigvariant.h
@@ -51,7 +51,6 @@
 #define MICROPY_PY_MATH_FACTORIAL      (1)
 #define MICROPY_PY_URANDOM_EXTRA_FUNCS (1)
 #define MICROPY_PY_IO_BUFFEREDWRITER (1)
-#define MICROPY_PY_IO_RESOURCE_STREAM (1)
 #define MICROPY_PY_UASYNCIO            (1)
 #define MICROPY_PY_URE_DEBUG           (1)
 #define MICROPY_PY_URE_MATCH_GROUPS    (1)
diff --git a/py/modio.c b/py/modio.c
index 7f0d13cdfaa0b..e79d59e4e5555 100644
--- a/py/modio.c
+++ b/py/modio.c
@@ -204,50 +204,6 @@ STATIC const mp_obj_type_t mp_type_bufwriter = {
 };
 #endif // MICROPY_PY_IO_BUFFEREDWRITER
 
-#if MICROPY_PY_IO_RESOURCE_STREAM
-STATIC mp_obj_t resource_stream(mp_obj_t package_in, mp_obj_t path_in) {
-    VSTR_FIXED(path_buf, MICROPY_ALLOC_PATH_MAX);
-    size_t len;
-
-    // As an extension to pkg_resources.resource_stream(), we support
-    // package parameter being None, the path_in is interpreted as a
-    // raw path.
-    if (package_in != mp_const_none) {
-        // Pass "True" as sentinel value in fromlist to force returning of leaf module
-        mp_obj_t pkg = mp_import_name(mp_obj_str_get_qstr(package_in), mp_const_true, MP_OBJ_NEW_SMALL_INT(0));
-
-        mp_obj_t dest[2];
-        mp_load_method_maybe(pkg, MP_QSTR___path__, dest);
-        if (dest[0] == MP_OBJ_NULL) {
-            mp_raise_TypeError(NULL);
-        }
-
-        const char *path = mp_obj_str_get_data(dest[0], &len);
-        vstr_add_strn(&path_buf, path, len);
-        vstr_add_byte(&path_buf, '/');
-    }
-
-    const char *path = mp_obj_str_get_data(path_in, &len);
-    vstr_add_strn(&path_buf, path, len);
-
-    len = path_buf.len;
-    const char *data = mp_find_frozen_str(path_buf.buf, &len);
-    if (data != NULL) {
-        mp_obj_stringio_t *o = m_new_obj(mp_obj_stringio_t);
-        o->base.type = &mp_type_bytesio;
-        o->vstr = m_new_obj(vstr_t);
-        vstr_init_fixed_buf(o->vstr, len + 1, (char *)data);
-        o->vstr->len = len;
-        o->pos = 0;
-        return MP_OBJ_FROM_PTR(o);
-    }
-
-    mp_obj_t path_out = mp_obj_new_str(path_buf.buf, path_buf.len);
-    return mp_builtin_open(1, &path_out, (mp_map_t *)&mp_const_empty_map);
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(resource_stream_obj, resource_stream);
-#endif
-
 STATIC const mp_rom_map_elem_t mp_module_io_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_uio) },
     // Note: mp_builtin_open_obj should be defined by port, it's not
@@ -256,9 +212,6 @@ STATIC const mp_rom_map_elem_t mp_module_io_globals_table[] = {
     #if MICROPY_PY_IO_IOBASE
     { MP_ROM_QSTR(MP_QSTR_IOBase), MP_ROM_PTR(&mp_type_iobase) },
     #endif
-    #if MICROPY_PY_IO_RESOURCE_STREAM
-    { MP_ROM_QSTR(MP_QSTR_resource_stream), MP_ROM_PTR(&resource_stream_obj) },
-    #endif
     #if MICROPY_PY_IO_FILEIO
     { MP_ROM_QSTR(MP_QSTR_FileIO), MP_ROM_PTR(&mp_type_fileio) },
     #if MICROPY_CPYTHON_COMPAT
diff --git a/py/mpconfig.h b/py/mpconfig.h
index 308a77666192e..86e3e0f34936d 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -1281,17 +1281,6 @@ typedef double mp_float_t;
 #define MICROPY_PY_IO_IOBASE (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
 #endif
 
-// Whether to provide "uio.resource_stream()" function with
-// the semantics of CPython's pkg_resources.resource_stream()
-// (allows to access binary resources in frozen source packages).
-// Note that the same functionality can be achieved in "pure
-// Python" by prepocessing binary resources into Python source
-// and bytecode-freezing it (with a simple helper module available
-// e.g. in micropython-lib).
-#ifndef MICROPY_PY_IO_RESOURCE_STREAM
-#define MICROPY_PY_IO_RESOURCE_STREAM (0)
-#endif
-
 // Whether to provide "io.FileIO" class
 #ifndef MICROPY_PY_IO_FILEIO
 #define MICROPY_PY_IO_FILEIO (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
diff --git a/tests/io/resource_stream.py b/tests/io/resource_stream.py
deleted file mode 100644
index b589ff99bf2ba..0000000000000
--- a/tests/io/resource_stream.py
+++ /dev/null
@@ -1,15 +0,0 @@
-import uio
-import usys
-
-try:
-    uio.resource_stream
-except AttributeError:
-    print("SKIP")
-    raise SystemExit
-
-buf = uio.resource_stream("data", "file2")
-print(buf.read())
-
-# resource_stream(None, ...) look ups from current dir, hence sys.path[0] hack
-buf = uio.resource_stream(None, usys.path[0] + "/data/file2")
-print(buf.read())
diff --git a/tests/io/resource_stream.py.exp b/tests/io/resource_stream.py.exp
deleted file mode 100644
index 75404a347a485..0000000000000
--- a/tests/io/resource_stream.py.exp
+++ /dev/null
@@ -1,2 +0,0 @@
-1234
-1234
diff --git a/tests/unix/extra_coverage.py b/tests/unix/extra_coverage.py
index b4808993a760e..8ea27cbf2f801 100644
--- a/tests/unix/extra_coverage.py
+++ b/tests/unix/extra_coverage.py
@@ -89,12 +89,6 @@
 except ZeroDivisionError:
     print("ZeroDivisionError")
 
-# test loading a resource from a frozen string
-import uio
-
-buf = uio.resource_stream("frzstr_pkg2", "mod.py")
-print(buf.read(21))
-
 # test for MP_QSTR_NULL regression
 from frzqstr import returns_NULL
 
diff --git a/tests/unix/extra_coverage.py.exp b/tests/unix/extra_coverage.py.exp
index ea91813fc683f..8ee233a712b4f 100644
--- a/tests/unix/extra_coverage.py.exp
+++ b/tests/unix/extra_coverage.py.exp
@@ -174,5 +174,4 @@ frzstr_pkg2.mod
 frzmpy_pkg2.mod
 1
 ZeroDivisionError
-b'# test frozen package'
 NULL

From f241db7efe1f2a27fcd17809a22fdf7385a0f75e Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Wed, 8 Dec 2021 16:02:42 +1100
Subject: [PATCH 1505/3533] teensy: Switch to use manifest.py instead of
 FROZEN_DIR.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/teensy/Makefile    | 77 +++++++++++++++++++---------------------
 ports/teensy/manifest.py |  1 +
 2 files changed, 38 insertions(+), 40 deletions(-)
 create mode 100644 ports/teensy/manifest.py

diff --git a/ports/teensy/Makefile b/ports/teensy/Makefile
index d1ff421621568..fe46b0e061a23 100644
--- a/ports/teensy/Makefile
+++ b/ports/teensy/Makefile
@@ -6,6 +6,42 @@ QSTR_DEFS = qstrdefsport.h $(BUILD)/pins_qstr.h
 # MicroPython feature configurations
 MICROPY_ROM_TEXT_COMPRESSION ?= 1
 
+USE_FROZEN = 1
+USE_MEMZIP = 0
+
+ifeq ($(USE_MEMZIP),1)
+SRC_C += \
+	shared/memzip/import.c \
+	shared/memzip/lexermemzip.c \
+	shared/memzip/memzip.c \
+
+OBJ += $(BUILD)/memzip-files.o
+
+MAKE_MEMZIP = $(TOP)/shared/memzip/make-memzip.py
+ifeq ($(MEMZIP_DIR),)
+MEMZIP_DIR = memzip_files
+endif
+
+$(BUILD)/memzip-files.o: $(BUILD)/memzip-files.c
+	$(call compile_c)
+
+$(BUILD)/memzip-files.c: $(shell find ${MEMZIP_DIR} -type f)
+	@$(ECHO) "Creating $@"
+	$(Q)$(PYTHON) $(MAKE_MEMZIP) --zip-file $(BUILD)/memzip-files.zip --c-file $@ $(MEMZIP_DIR)
+
+endif # USE_MEMZIP
+
+ifeq ($(USE_FROZEN),1)
+
+FROZEN_MANIFEST ?= "manifest.py"
+
+CFLAGS += -DMICROPY_MODULE_FROZEN_STR
+
+SRC_C += \
+	lexerfrozen.c
+
+endif # USE_FROZEN
+
 # include py core make definitions
 include $(TOP)/py/py.mk
 
@@ -76,10 +112,7 @@ endif
 CFLAGS += -fdata-sections -ffunction-sections
 LDFLAGS += -Wl,--gc-sections
 
-USE_FROZEN = 1
-USE_MEMZIP = 0
-
-SRC_C = \
+SRC_C += \
 	hal_ftm.c \
 	hal_gpio.c \
 	help.c \
@@ -127,42 +160,6 @@ OBJ += $(BUILD)/pins_gen.o
 all: hex
 hex: $(BUILD)/micropython.hex
 
-ifeq ($(USE_MEMZIP),1)
-SRC_C += \
-	shared/memzip/import.c \
-	shared/memzip/lexermemzip.c \
-	shared/memzip/memzip.c \
-
-OBJ += $(BUILD)/memzip-files.o
-
-MAKE_MEMZIP = $(TOP)/shared/memzip/make-memzip.py
-ifeq ($(MEMZIP_DIR),)
-MEMZIP_DIR = memzip_files
-endif
-
-$(BUILD)/memzip-files.o: $(BUILD)/memzip-files.c
-	$(call compile_c)
-
-$(BUILD)/memzip-files.c: $(shell find ${MEMZIP_DIR} -type f)
-	@$(ECHO) "Creating $@"
-	$(Q)$(PYTHON) $(MAKE_MEMZIP) --zip-file $(BUILD)/memzip-files.zip --c-file $@ $(MEMZIP_DIR)
-
-endif # USE_MEMZIP
-
-ifeq ($(USE_FROZEN),1)
-
-ifeq ($(FROZEN_DIR),)
-FROZEN_DIR = memzip_files
-endif
-
-CFLAGS += -DMICROPY_MODULE_FROZEN_STR
-
-SRC_C += \
-	lexerfrozen.c \
-	$(BUILD)/frozen.c
-
-endif # USE_FROZEN
-
 ifeq ($(ARDUINO),)
 post_compile: $(BUILD)/micropython.hex
 	$(ECHO) "Please define ARDUINO (where TeensyDuino is installed)"
diff --git a/ports/teensy/manifest.py b/ports/teensy/manifest.py
new file mode 100644
index 0000000000000..1fefd686878d8
--- /dev/null
+++ b/ports/teensy/manifest.py
@@ -0,0 +1 @@
+freeze_as_str("$(PORT_DIR)/memzip_files")

From 92353c29110dba152dbf14c9f6359881866ec1de Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Wed, 8 Dec 2021 16:04:11 +1100
Subject: [PATCH 1506/3533] all: Remove support for FROZEN_DIR and
 FROZEN_MPY_DIR.

These have been deprecated for over two years in favour of FROZEN_MANIFEST
and manifest.py.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/esp8266/Makefile    |  7 +----
 ports/javascript/Makefile |  7 -----
 ports/nrf/Makefile        | 16 ++---------
 ports/nrf/README.md       | 14 ----------
 ports/stm32/Makefile      | 11 ++------
 ports/unix/Makefile       |  9 ++----
 py/mkrules.mk             | 58 ++++-----------------------------------
 py/py.mk                  | 10 -------
 8 files changed, 13 insertions(+), 119 deletions(-)

diff --git a/ports/esp8266/Makefile b/ports/esp8266/Makefile
index e771d8f7d3460..d0afe73ea8b04 100644
--- a/ports/esp8266/Makefile
+++ b/ports/esp8266/Makefile
@@ -27,8 +27,6 @@ AXTLS_DEFS_EXTRA = -Dabort=abort_ -DRT_MAX_PLAIN_LENGTH=1024 -DRT_EXTRA=4096
 BTREE_DEFS_EXTRA = -DDEFPSIZE=1024 -DMINCACHE=3
 
 FROZEN_MANIFEST ?= boards/manifest.py
-FROZEN_DIR ?=
-FROZEN_MPY_DIR ?=
 
 # include py core make definitions
 include $(TOP)/py/py.mk
@@ -196,12 +194,9 @@ $(BUILD)/uart.o: $(CONFVARS_FILE)
 
 FROZEN_EXTRA_DEPS = $(CONFVARS_FILE)
 
-ifneq ($(FROZEN_MANIFEST)$(FROZEN_MPY_DIR),)
+ifneq ($(FROZEN_MANIFEST),)
 CFLAGS += -DMICROPY_MODULE_FROZEN_MPY
 CFLAGS += -DMICROPY_QSTR_EXTRA_POOL=mp_qstr_frozen_const_pool
-endif
-
-ifneq ($(FROZEN_MANIFEST)$(FROZEN_DIR),)
 CFLAGS += -DMICROPY_MODULE_FROZEN_STR
 endif
 
diff --git a/ports/javascript/Makefile b/ports/javascript/Makefile
index 3fac114f5ed2b..ba2680b2a85aa 100644
--- a/ports/javascript/Makefile
+++ b/ports/javascript/Makefile
@@ -17,13 +17,6 @@ CFLAGS += -std=c99 -Wall -Werror -Wdouble-promotion -Wfloat-conversion
 CFLAGS += -O3 -DNDEBUG
 CFLAGS += $(INC)
 
-ifneq ($(FROZEN_MPY_DIR),)
-# To use frozen bytecode, put your .py files in a subdirectory (eg frozen/) and
-# then invoke make with FROZEN_MPY_DIR=frozen (be sure to build from scratch).
-CFLAGS += -DMICROPY_QSTR_EXTRA_POOL=mp_qstr_frozen_const_pool
-CFLAGS += -DMICROPY_MODULE_FROZEN_MPY
-endif
-
 SRC_SHARED = $(addprefix shared/,\
 	runtime/interrupt_char.c \
 	runtime/stdout_helpers.c \
diff --git a/ports/nrf/Makefile b/ports/nrf/Makefile
index 423323a9c6a2c..c32e09d2c9ce8 100644
--- a/ports/nrf/Makefile
+++ b/ports/nrf/Makefile
@@ -340,11 +340,6 @@ DRIVERS_SRC_C += $(addprefix modules/,\
 SRC_C += \
 	device/startup_$(MCU_SUB_VARIANT).c \
 
-ifneq ($(FROZEN_MPY_DIR),)
-FROZEN_MPY_PY_FILES := $(shell find -L $(FROZEN_MPY_DIR) -type f -name '*.py')
-FROZEN_MPY_MPY_FILES := $(addprefix $(BUILD)/,$(FROZEN_MPY_PY_FILES:.py=.mpy))
-endif
-
 LIBGCC_FILE_NAME = $(shell $(CC) $(CFLAGS) -print-libgcc-file-name)
 LIBS += -L $(dir $(LIBGCC_FILE_NAME)) -lgcc
 
@@ -542,17 +537,10 @@ GEN_PINS_QSTR = $(BUILD)/pins_qstr.h
 GEN_PINS_AF_CONST = $(HEADER_BUILD)/pins_af_const.h
 GEN_PINS_AF_PY = $(BUILD)/pins_af.py
 
-ifneq ($(FROZEN_MANIFEST)$(FROZEN_DIR),)
-# To use frozen source modules, put your .py files in a subdirectory (eg scripts/)
-# and then invoke make with FROZEN_DIR=scripts (be sure to build from scratch).
-CFLAGS += -DMICROPY_MODULE_FROZEN_STR
-endif
-
-ifneq ($(FROZEN_MANIFEST)$(FROZEN_MPY_DIR),)
-# To use frozen bytecode, put your .py files in a subdirectory (eg frozen/) and
-# then invoke make with FROZEN_MPY_DIR=frozen (be sure to build from scratch).
+ifneq ($(FROZEN_MANIFEST),)
 CFLAGS += -DMICROPY_QSTR_EXTRA_POOL=mp_qstr_frozen_const_pool
 CFLAGS += -DMICROPY_MODULE_FROZEN_MPY
+CFLAGS += -DMICROPY_MODULE_FROZEN_STR
 endif
 
 $(PY_BUILD)/nlr%.o: CFLAGS += -Os -fno-lto
diff --git a/ports/nrf/README.md b/ports/nrf/README.md
index aa8968ff92666..a833f0f17c42a 100644
--- a/ports/nrf/README.md
+++ b/ports/nrf/README.md
@@ -96,20 +96,6 @@ The **make sd** will trigger a flash of the bluetooth stack before that applicat
 
 Note: further tuning of features to include in bluetooth or even setting up the device to use REPL over Bluetooth can be configured in the `bluetooth_conf.h`.
 
-## Compile with frozen modules
-
-Frozen modules are Python modules compiled to bytecode and added to the firmware
-image, as part of MicroPython. They can be imported as usual, using the `import`
-statement. The advantage is that frozen modules use a lot less RAM as the
-bytecode is stored in flash, not in RAM like when importing from a filesystem.
-Also, frozen modules are available even when no filesystem is present to import
-from.
-
-To use frozen modules, put them in a directory (e.g. `freeze/`) and supply
-`make` with the given directory. For example:
-
-     make BOARD=pca10040 FROZEN_MPY_DIR=freeze
-
 ## Compile with freeze manifest
 
 Freeze manifests can be used by definining `FROZEN_MANIFEST` pointing to a
diff --git a/ports/stm32/Makefile b/ports/stm32/Makefile
index c5f159102e64f..290503937dc59 100644
--- a/ports/stm32/Makefile
+++ b/ports/stm32/Makefile
@@ -596,17 +596,10 @@ $(TOP)/lib/stm32lib/README.md:
 	$(ECHO) "stm32lib submodule not found, fetching it now..."
 	(cd $(TOP) && git submodule update --init lib/stm32lib)
 
-ifneq ($(FROZEN_MANIFEST)$(FROZEN_DIR),)
-# To use frozen source modules, put your .py files in a subdirectory (eg scripts/)
-# and then invoke make with FROZEN_DIR=scripts (be sure to build from scratch).
-CFLAGS += -DMICROPY_MODULE_FROZEN_STR
-endif
-
-ifneq ($(FROZEN_MANIFEST)$(FROZEN_MPY_DIR),)
-# To use frozen bytecode, put your .py files in a subdirectory (eg frozen/) and
-# then invoke make with FROZEN_MPY_DIR=frozen (be sure to build from scratch).
+ifneq ($(FROZEN_MANIFEST),)
 CFLAGS += -DMICROPY_QSTR_EXTRA_POOL=mp_qstr_frozen_const_pool
 CFLAGS += -DMICROPY_MODULE_FROZEN_MPY
+CFLAGS += -DMICROPY_MODULE_FROZEN_STR
 endif
 
 define RUN_DFU
diff --git a/ports/unix/Makefile b/ports/unix/Makefile
index f829838ab31f7..cd8bb379c4488 100644
--- a/ports/unix/Makefile
+++ b/ports/unix/Makefile
@@ -13,10 +13,8 @@ include ../../py/mkenv.mk
 -include mpconfigport.mk
 include $(VARIANT_DIR)/mpconfigvariant.mk
 
-# use FROZEN_MANIFEST for new projects, others are legacy
+# Use the default frozen manifest, variants may override this.
 FROZEN_MANIFEST ?= variants/manifest.py
-FROZEN_DIR =
-FROZEN_MPY_DIR =
 
 # This should be configured by the mpconfigvariant.mk
 PROG ?= micropython
@@ -263,15 +261,12 @@ SRC_QSTR += $(SRC_C) $(SRC_CXX) $(SHARED_SRC_C) $(EXTMOD_SRC_C)
 # SRC_QSTR
 SRC_QSTR_AUTO_DEPS +=
 
-ifneq ($(FROZEN_MANIFEST)$(FROZEN_MPY_DIR),)
+ifneq ($(FROZEN_MANIFEST),)
 # To use frozen code create a manifest.py file with a description of files to
 # freeze, then invoke make with FROZEN_MANIFEST=manifest.py (be sure to build from scratch).
 CFLAGS += -DMICROPY_QSTR_EXTRA_POOL=mp_qstr_frozen_const_pool
 CFLAGS += -DMICROPY_MODULE_FROZEN_MPY
 CFLAGS += -DMPZ_DIG_SIZE=16 # force 16 bits to work on both 32 and 64 bit archs
-endif
-
-ifneq ($(FROZEN_MANIFEST)$(FROZEN_DIR),)
 CFLAGS += -DMICROPY_MODULE_FROZEN_STR
 endif
 
diff --git a/py/mkrules.mk b/py/mkrules.mk
index d0c0a53c262e5..963d70c2c38b4 100644
--- a/py/mkrules.mk
+++ b/py/mkrules.mk
@@ -142,43 +142,18 @@ $(MICROPY_MPYCROSS_DEPENDENCY):
 	$(MAKE) -C $(dir $@)
 endif
 
-ifneq ($(FROZEN_MANIFEST),)
-# to build frozen_content.c from a manifest
-$(BUILD)/frozen_content.c: FORCE $(BUILD)/genhdr/qstrdefs.generated.h | $(MICROPY_MPYCROSS_DEPENDENCY)
-	$(Q)$(MAKE_MANIFEST) -o $@ -v "MPY_DIR=$(TOP)" -v "MPY_LIB_DIR=$(MPY_LIB_DIR)" -v "PORT_DIR=$(shell pwd)" -v "BOARD_DIR=$(BOARD_DIR)" -b "$(BUILD)" $(if $(MPY_CROSS_FLAGS),-f"$(MPY_CROSS_FLAGS)",) --mpy-tool-flags="$(MPY_TOOL_FLAGS)" $(FROZEN_MANIFEST)
-
 ifneq ($(FROZEN_DIR),)
-$(error FROZEN_DIR cannot be used in conjunction with FROZEN_MANIFEST)
+$(error Support for FROZEN_DIR was removed. Please use manifest.py instead, see https://docs.micropython.org/en/latest/reference/manifest.html)
 endif
 
 ifneq ($(FROZEN_MPY_DIR),)
-$(error FROZEN_MPY_DIR cannot be used in conjunction with FROZEN_MANIFEST)
-endif
-endif
-
-ifneq ($(FROZEN_DIR),)
-$(info Warning: FROZEN_DIR is deprecated in favour of FROZEN_MANIFEST)
-$(BUILD)/frozen.c: $(wildcard $(FROZEN_DIR)/*) $(HEADER_BUILD) $(FROZEN_EXTRA_DEPS)
-	$(ECHO) "GEN $@"
-	$(Q)$(MAKE_FROZEN) $(FROZEN_DIR) > $@
+$(error Support for FROZEN_MPY_DIR was removed. Please use manifest.py instead, see https://docs.micropython.org/en/latest/reference/manifest.html)
 endif
 
-ifneq ($(FROZEN_MPY_DIR),)
-$(info Warning: FROZEN_MPY_DIR is deprecated in favour of FROZEN_MANIFEST)
-# make a list of all the .py files that need compiling and freezing
-FROZEN_MPY_PY_FILES := $(shell find -L $(FROZEN_MPY_DIR) -type f -name '*.py' | $(SED) -e 's=^$(FROZEN_MPY_DIR)/==')
-FROZEN_MPY_MPY_FILES := $(addprefix $(BUILD)/frozen_mpy/,$(FROZEN_MPY_PY_FILES:.py=.mpy))
-
-# to build .mpy files from .py files
-$(BUILD)/frozen_mpy/%.mpy: $(FROZEN_MPY_DIR)/%.py | $(MICROPY_MPYCROSS_DEPENDENCY)
-	@$(ECHO) "MPY $<"
-	$(Q)$(MKDIR) -p $(dir $@)
-	$(Q)$(MICROPY_MPYCROSS) -o $@ -s $(<:$(FROZEN_MPY_DIR)/%=%) $(MPY_CROSS_FLAGS) $<
-
-# to build frozen_mpy.c from all .mpy files
-$(BUILD)/frozen_mpy.c: $(FROZEN_MPY_MPY_FILES) $(BUILD)/genhdr/qstrdefs.generated.h
-	@$(ECHO) "GEN $@"
-	$(Q)$(MPY_TOOL) -f -q $(BUILD)/genhdr/qstrdefs.preprocessed.h $(FROZEN_MPY_MPY_FILES) > $@
+ifneq ($(FROZEN_MANIFEST),)
+# to build frozen_content.c from a manifest
+$(BUILD)/frozen_content.c: FORCE $(BUILD)/genhdr/qstrdefs.generated.h | $(MICROPY_MPYCROSS_DEPENDENCY)
+	$(Q)$(MAKE_MANIFEST) -o $@ -v "MPY_DIR=$(TOP)" -v "MPY_LIB_DIR=$(MPY_LIB_DIR)" -v "PORT_DIR=$(shell pwd)" -v "BOARD_DIR=$(BOARD_DIR)" -b "$(BUILD)" $(if $(MPY_CROSS_FLAGS),-f"$(MPY_CROSS_FLAGS)",) --mpy-tool-flags="$(MPY_TOOL_FLAGS)" $(FROZEN_MANIFEST)
 endif
 
 ifneq ($(PROG),)
@@ -234,27 +209,6 @@ clean:
 	$(RM) -rf $(BUILD) $(CLEAN_EXTRA)
 .PHONY: clean
 
-# Clean every non-git file from FROZEN_DIR/FROZEN_MPY_DIR, but making a backup.
-# We run rmdir below to avoid empty backup dir (it will silently fail if backup
-# is non-empty).
-clean-frozen:
-	if [ -n "$(FROZEN_MPY_DIR)" ]; then \
-	backup_dir=$(FROZEN_MPY_DIR).$$(date +%Y%m%dT%H%M%S); mkdir $$backup_dir; \
-	cd $(FROZEN_MPY_DIR); git status --ignored -u all -s . | awk ' {print $$2}' \
-	| xargs --no-run-if-empty cp --parents -t ../$$backup_dir; \
-	rmdir ../$$backup_dir 2>/dev/null || true; \
-	git clean -d -f .; \
-	fi
-
-	if [ -n "$(FROZEN_DIR)" ]; then \
-	backup_dir=$(FROZEN_DIR).$$(date +%Y%m%dT%H%M%S); mkdir $$backup_dir; \
-	cd $(FROZEN_DIR); git status --ignored -u all -s . | awk ' {print $$2}' \
-	| xargs --no-run-if-empty cp --parents -t ../$$backup_dir; \
-	rmdir ../$$backup_dir 2>/dev/null || true; \
-	git clean -d -f .; \
-	fi
-.PHONY: clean-frozen
-
 print-cfg:
 	$(ECHO) "PY_SRC = $(PY_SRC)"
 	$(ECHO) "BUILD  = $(BUILD)"
diff --git a/py/py.mk b/py/py.mk
index 8e1e23554f8ca..122dea225affc 100644
--- a/py/py.mk
+++ b/py/py.mk
@@ -227,16 +227,6 @@ ifneq ($(FROZEN_MANIFEST),)
 PY_O += $(BUILD)/$(BUILD)/frozen_content.o
 endif
 
-# object file for frozen files
-ifneq ($(FROZEN_DIR),)
-PY_O += $(BUILD)/$(BUILD)/frozen.o
-endif
-
-# object file for frozen bytecode (frozen .mpy files)
-ifneq ($(FROZEN_MPY_DIR),)
-PY_O += $(BUILD)/$(BUILD)/frozen_mpy.o
-endif
-
 # Sources that may contain qstrings
 SRC_QSTR_IGNORE = py/nlr%
 SRC_QSTR += $(SRC_MOD) $(filter-out $(SRC_QSTR_IGNORE),$(PY_CORE_O_BASENAME:.o=.c)) $(PY_EXTMOD_O_BASENAME:.o=.c)

From f853e3e106b151ec2819df729fd68815dce693fb Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Wed, 8 Dec 2021 16:47:33 +1100
Subject: [PATCH 1507/3533] tools/makemanifest.py: Merge make-frozen.py.

Takes the functionality from tools/make-frozen.py, adds support for
multiple frozen directories, and moves it to tools/makemanifest.py.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 tools/make-frozen.py  | 85 -------------------------------------------
 tools/makemanifest.py | 74 +++++++++++++++++++++++++++++++++----
 2 files changed, 66 insertions(+), 93 deletions(-)
 delete mode 100755 tools/make-frozen.py

diff --git a/tools/make-frozen.py b/tools/make-frozen.py
deleted file mode 100755
index bc35d383429d6..0000000000000
--- a/tools/make-frozen.py
+++ /dev/null
@@ -1,85 +0,0 @@
-#!/usr/bin/env python
-#
-# Create frozen modules structure for MicroPython.
-#
-# Usage:
-#
-# Have a directory with modules to be frozen (only modules, not packages
-# supported so far):
-#
-# frozen/foo.py
-# frozen/bar.py
-#
-# Run script, passing path to the directory above:
-#
-# ./make-frozen.py frozen > frozen.c
-#
-# Include frozen.c in your build, having defined MICROPY_MODULE_FROZEN_STR in
-# config.
-#
-from __future__ import print_function
-import sys
-import os
-
-
-def module_name(f):
-    return f
-
-
-modules = []
-
-if len(sys.argv) > 1:
-    root = sys.argv[1].rstrip("/")
-    root_len = len(root)
-
-    for dirpath, dirnames, filenames in os.walk(root):
-        for f in filenames:
-            fullpath = dirpath + "/" + f
-            st = os.stat(fullpath)
-            modules.append((fullpath[root_len + 1 :], st))
-
-print("#include <stdint.h>")
-print("const char mp_frozen_str_names[] = {")
-for f, st in modules:
-    m = module_name(f)
-    print('"%s\\0"' % m)
-print('"\\0"};')
-
-print("const uint32_t mp_frozen_str_sizes[] = {")
-
-for f, st in modules:
-    print("%d," % st.st_size)
-
-print("0};")
-
-print("const char mp_frozen_str_content[] = {")
-for f, st in modules:
-    data = open(sys.argv[1] + "/" + f, "rb").read()
-
-    # We need to properly escape the script data to create a C string.
-    # When C parses hex characters of the form \x00 it keeps parsing the hex
-    # data until it encounters a non-hex character.  Thus one must create
-    # strings of the form "data\x01" "abc" to properly encode this kind of
-    # data.  We could just encode all characters as hex digits but it's nice
-    # to be able to read the resulting C code as ASCII when possible.
-
-    data = bytearray(data)  # so Python2 extracts each byte as an integer
-    esc_dict = {ord("\n"): "\\n", ord("\r"): "\\r", ord('"'): '\\"', ord("\\"): "\\\\"}
-    chrs = ['"']
-    break_str = False
-    for c in data:
-        try:
-            chrs.append(esc_dict[c])
-        except KeyError:
-            if 32 <= c <= 126:
-                if break_str:
-                    chrs.append('" "')
-                    break_str = False
-                chrs.append(chr(c))
-            else:
-                chrs.append("\\x%02x" % c)
-                break_str = True
-    chrs.append('\\0"')
-    print("".join(chrs))
-
-print('"\\0"};')
diff --git a/tools/makemanifest.py b/tools/makemanifest.py
index fc608ed449a96..e37ae74cfd00d 100644
--- a/tools/makemanifest.py
+++ b/tools/makemanifest.py
@@ -201,8 +201,6 @@ def freeze_internal(kind, path, script, opt):
     if not os.path.isdir(path):
         raise FreezeError("freeze path must be a directory: {}".format(path))
     if script is None and kind == KIND_AS_STR:
-        if any(f[0] == KIND_AS_STR for f in manifest_list):
-            raise FreezeError("can only freeze one str directory")
         manifest_list.append((KIND_AS_STR, path, script, opt))
     elif script is None or isinstance(script, str) and script.find(".") == -1:
         # Recursively search `path` for files to freeze, optionally restricted
@@ -235,6 +233,70 @@ def freeze_internal(kind, path, script, opt):
         manifest_list.append((kind, path, script, opt))
 
 
+def generate_frozen_str_content(paths):
+    def module_name(f):
+        return f
+
+    modules = []
+    output = []
+
+    for path in paths:
+        root = path.rstrip("/")
+        root_len = len(root)
+
+        for dirpath, dirnames, filenames in os.walk(root):
+            for f in filenames:
+                fullpath = dirpath + "/" + f
+                st = os.stat(fullpath)
+                modules.append((path, fullpath[root_len + 1 :], st))
+
+    output.append("#include <stdint.h>\n")
+    output.append("const char mp_frozen_str_names[] = {\n")
+    for _path, f, st in modules:
+        m = module_name(f)
+        output.append('"%s\\0"\n' % m)
+    output.append('"\\0"};\n')
+
+    output.append("const uint32_t mp_frozen_str_sizes[] = {\n")
+
+    for _path, f, st in modules:
+        output.append("%d," % st.st_size)
+
+    output.append("0};\n")
+
+    output.append("const char mp_frozen_str_content[] = {\n")
+    for path, f, st in modules:
+        data = open(path + "/" + f, "rb").read()
+
+        # We need to properly escape the script data to create a C string.
+        # When C parses hex characters of the form \x00 it keeps parsing the hex
+        # data until it encounters a non-hex character.  Thus one must create
+        # strings of the form "data\x01" "abc" to properly encode this kind of
+        # data.  We could just encode all characters as hex digits but it's nice
+        # to be able to read the resulting C code as ASCII when possible.
+
+        data = bytearray(data)  # so Python2 extracts each byte as an integer
+        esc_dict = {ord("\n"): "\\n", ord("\r"): "\\r", ord('"'): '\\"', ord("\\"): "\\\\"}
+        output.append('"')
+        break_str = False
+        for c in data:
+            try:
+                output.append(esc_dict[c])
+            except KeyError:
+                if 32 <= c <= 126:
+                    if break_str:
+                        output.append('" "')
+                        break_str = False
+                    output.append(chr(c))
+                else:
+                    output.append("\\x%02x" % c)
+                    break_str = True
+        output.append('\\0"\n')
+
+    output.append('"\\0"};\n')
+    return "".join(output)
+
+
 def main():
     # Parse arguments
     import argparse
@@ -264,7 +326,6 @@ def main():
         sys.exit(1)
 
     # Get paths to tools
-    MAKE_FROZEN = VARS["MPY_DIR"] + "/tools/make-frozen.py"
     MPY_CROSS = VARS["MPY_DIR"] + "/mpy-cross/mpy-cross"
     if sys.platform == "win32":
         MPY_CROSS += ".exe"
@@ -327,10 +388,7 @@ def main():
         return
 
     # Freeze paths as strings
-    res, output_str = system([sys.executable, MAKE_FROZEN] + str_paths)
-    if res != 0:
-        print("error freezing strings {}: {}".format(str_paths, output_str))
-        sys.exit(1)
+    output_str = generate_frozen_str_content(str_paths)
 
     # Freeze .mpy files
     if mpy_files:
@@ -365,7 +423,7 @@ def main():
     mkdir(args.output)
     with open(args.output, "wb") as f:
         f.write(b"//\n// Content for MICROPY_MODULE_FROZEN_STR\n//\n")
-        f.write(output_str)
+        f.write(output_str.encode())
         f.write(b"//\n// Content for MICROPY_MODULE_FROZEN_MPY\n//\n")
         f.write(output_mpy)
 

From e0bf4611c3a8b23b3c52e6a7804aac341ac3a87d Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Sat, 11 Dec 2021 22:40:21 +1100
Subject: [PATCH 1508/3533] py: Only search frozen modules when '.frozen' is
 found in sys.path.

This changes makemanifest.py & mpy-tool.py to merge string and mpy names
into the same list (now mp_frozen_names).

The various paths for loading a frozen module (mp_find_frozen_module) and
checking existence of a frozen module (mp_frozen_stat) use a common
function that searches this list.

In addition, the frozen lookup will now only take place if the path starts
with ".frozen", which needs to be added to sys.path.

This fixes issues #1804, #2322, #3509, #6419.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 py/builtinhelp.c        |  17 ++---
 py/builtinimport.c      |  50 ++++++------
 py/frozenmod.c          | 163 +++++++++++++++++-----------------------
 py/frozenmod.h          |   4 +-
 py/qstrdefs.h           |   4 +
 shared/runtime/pyexec.c |   5 +-
 tools/makemanifest.py   |  45 +++++------
 tools/mpy-tool.py       |   6 +-
 8 files changed, 143 insertions(+), 151 deletions(-)

diff --git a/py/builtinhelp.c b/py/builtinhelp.c
index 13735635e3c90..84d69caf35bed 100644
--- a/py/builtinhelp.c
+++ b/py/builtinhelp.c
@@ -67,10 +67,10 @@ STATIC void mp_help_add_from_map(mp_obj_t list, const mp_map_t *map) {
 #if MICROPY_MODULE_FROZEN
 STATIC void mp_help_add_from_names(mp_obj_t list, const char *name) {
     while (*name) {
-        size_t l = strlen(name);
+        size_t len = strlen(name);
         // name should end in '.py' and we strip it off
-        mp_obj_list_append(list, mp_obj_new_str(name, l - 3));
-        name += l + 1;
+        mp_obj_list_append(list, mp_obj_new_str(name, len - 3));
+        name += len + 1;
     }
 }
 #endif
@@ -80,14 +80,9 @@ STATIC void mp_help_print_modules(void) {
 
     mp_help_add_from_map(list, &mp_builtin_module_map);
 
-    #if MICROPY_MODULE_FROZEN_STR
-    extern const char mp_frozen_str_names[];
-    mp_help_add_from_names(list, mp_frozen_str_names);
-    #endif
-
-    #if MICROPY_MODULE_FROZEN_MPY
-    extern const char mp_frozen_mpy_names[];
-    mp_help_add_from_names(list, mp_frozen_mpy_names);
+    #if MICROPY_MODULE_FROZEN
+    extern const char mp_frozen_names[];
+    mp_help_add_from_names(list, mp_frozen_names);
     #endif
 
     // sort the list so it's printed in alphabetical order
diff --git a/py/builtinimport.c b/py/builtinimport.c
index 755ce779a709e..3e336633d9d08 100644
--- a/py/builtinimport.c
+++ b/py/builtinimport.c
@@ -50,6 +50,9 @@
 // Must be a string of one byte.
 #define PATH_SEP_CHAR "/"
 
+// Virtual sys.path entry that maps to the frozen modules.
+#define MP_FROZEN_PATH_PREFIX ".frozen/"
+
 bool mp_obj_is_package(mp_obj_t module) {
     mp_obj_t dest[2];
     mp_load_method_maybe(module, MP_QSTR___path__, dest);
@@ -62,9 +65,10 @@ bool mp_obj_is_package(mp_obj_t module) {
 // will return whether the path is a file, directory, or doesn't exist.
 STATIC mp_import_stat_t stat_path_or_frozen(const char *path) {
     #if MICROPY_MODULE_FROZEN
-    mp_import_stat_t st = mp_frozen_stat(path);
-    if (st != MP_IMPORT_STAT_NO_EXIST) {
-        return st;
+    // Only try and load as a frozen module if it starts with .frozen/.
+    const int frozen_path_prefix_len = strlen(MP_FROZEN_PATH_PREFIX);
+    if (strncmp(path, MP_FROZEN_PATH_PREFIX, frozen_path_prefix_len) == 0) {
+        return mp_find_frozen_module(path + frozen_path_prefix_len, NULL, NULL);
     }
     #endif
     return mp_import_stat(path);
@@ -193,32 +197,36 @@ STATIC void do_execute_raw_code(mp_obj_t module_obj, mp_raw_code_t *raw_code, co
 
 STATIC void do_load(mp_obj_t module_obj, vstr_t *file) {
     #if MICROPY_MODULE_FROZEN || MICROPY_ENABLE_COMPILER || (MICROPY_PERSISTENT_CODE_LOAD && MICROPY_HAS_FILE_READER)
-    char *file_str = vstr_null_terminated_str(file);
+    const char *file_str = vstr_null_terminated_str(file);
     #endif
 
     // If we support frozen modules (either as str or mpy) then try to find the
     // requested filename in the list of frozen module filenames.
     #if MICROPY_MODULE_FROZEN
     void *modref;
-    int frozen_type = mp_find_frozen_module(file_str, file->len, &modref);
-
-    // If we support frozen str modules and the compiler is enabled, and we
-    // found the filename in the list of frozen files, then load and execute it.
-    #if MICROPY_MODULE_FROZEN_STR
-    if (frozen_type == MP_FROZEN_STR) {
-        do_load_from_lexer(module_obj, modref);
-        return;
-    }
-    #endif
+    int frozen_type;
+    const int frozen_path_prefix_len = strlen(MP_FROZEN_PATH_PREFIX);
+    if (strncmp(file_str, MP_FROZEN_PATH_PREFIX, frozen_path_prefix_len) == 0) {
+        mp_find_frozen_module(file_str + frozen_path_prefix_len, &frozen_type, &modref);
+
+        // If we support frozen str modules and the compiler is enabled, and we
+        // found the filename in the list of frozen files, then load and execute it.
+        #if MICROPY_MODULE_FROZEN_STR
+        if (frozen_type == MP_FROZEN_STR) {
+            do_load_from_lexer(module_obj, modref);
+            return;
+        }
+        #endif
 
-    // If we support frozen mpy modules and we found a corresponding file (and
-    // its data) in the list of frozen files, execute it.
-    #if MICROPY_MODULE_FROZEN_MPY
-    if (frozen_type == MP_FROZEN_MPY) {
-        do_execute_raw_code(module_obj, modref, file_str);
-        return;
+        // If we support frozen mpy modules and we found a corresponding file (and
+        // its data) in the list of frozen files, execute it.
+        #if MICROPY_MODULE_FROZEN_MPY
+        if (frozen_type == MP_FROZEN_MPY) {
+            do_execute_raw_code(module_obj, modref, file_str + frozen_path_prefix_len);
+            return;
+        }
+        #endif
     }
-    #endif
 
     #endif // MICROPY_MODULE_FROZEN
 
diff --git a/py/frozenmod.c b/py/frozenmod.c
index a250c02151e92..6cb68d1ec0404 100644
--- a/py/frozenmod.c
+++ b/py/frozenmod.c
@@ -5,6 +5,7 @@
  *
  * Copyright (c) 2015 Paul Sokolovsky
  * Copyright (c) 2016 Damien P. George
+ * Copyright (c) 2021 Jim Mussared
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -31,6 +32,13 @@
 #include "py/lexer.h"
 #include "py/frozenmod.h"
 
+#if MICROPY_MODULE_FROZEN
+
+// Null-separated frozen file names. All string-type entries are listed first,
+// followed by mpy-type entries. Use mp_frozen_str_sizes to determine how
+// many string entries.
+extern const char mp_frozen_names[];
+
 #if MICROPY_MODULE_FROZEN_STR
 
 #ifndef MICROPY_MODULE_FROZEN_LEXER
@@ -39,118 +47,89 @@
 mp_lexer_t *MICROPY_MODULE_FROZEN_LEXER(qstr src_name, const char *str, mp_uint_t len, mp_uint_t free_len);
 #endif
 
-extern const char mp_frozen_str_names[];
+// Size in bytes of each string entry, followed by a zero (terminator).
 extern const uint32_t mp_frozen_str_sizes[];
+// Null-separated string content.
 extern const char mp_frozen_str_content[];
-
-// On input, *len contains size of name, on output - size of content
-const char *mp_find_frozen_str(const char *str, size_t *len) {
-    const char *name = mp_frozen_str_names;
-
-    size_t offset = 0;
-    for (int i = 0; *name != 0; i++) {
-        size_t l = strlen(name);
-        if (l == *len && !memcmp(str, name, l)) {
-            *len = mp_frozen_str_sizes[i];
-            return mp_frozen_str_content + offset;
-        }
-        name += l + 1;
-        offset += mp_frozen_str_sizes[i] + 1;
-    }
-    return NULL;
-}
-
-STATIC mp_lexer_t *mp_lexer_frozen_str(const char *str, size_t len) {
-    size_t name_len = len;
-    const char *content = mp_find_frozen_str(str, &len);
-
-    if (content == NULL) {
-        return NULL;
-    }
-
-    qstr source = qstr_from_strn(str, name_len);
-    mp_lexer_t *lex = MICROPY_MODULE_FROZEN_LEXER(source, content, len, 0);
-    return lex;
-}
-
-#endif
+#endif // MICROPY_MODULE_FROZEN_STR
 
 #if MICROPY_MODULE_FROZEN_MPY
 
 #include "py/emitglue.h"
 
-extern const char mp_frozen_mpy_names[];
 extern const mp_raw_code_t *const mp_frozen_mpy_content[];
 
-STATIC const mp_raw_code_t *mp_find_frozen_mpy(const char *str, size_t len) {
-    const char *name = mp_frozen_mpy_names;
-    for (size_t i = 0; *name != 0; i++) {
-        size_t l = strlen(name);
-        if (l == len && !memcmp(str, name, l)) {
-            return mp_frozen_mpy_content[i];
-        }
-        name += l + 1;
-    }
-    return NULL;
-}
+#endif // MICROPY_MODULE_FROZEN_MPY
 
-#endif
+// Search for "str" as a frozen entry, returning the stat result
+// (no-exist/file/dir), as well as the type (none/str/mpy) and data.
+// frozen_type can be NULL if its value isn't needed (and then data is assumed to be NULL).
+mp_import_stat_t mp_find_frozen_module(const char *str, int *frozen_type, void **data) {
+    size_t len = strlen(str);
+    const char *name = mp_frozen_names;
 
-#if MICROPY_MODULE_FROZEN
+    if (frozen_type != NULL) {
+        *frozen_type = MP_FROZEN_NONE;
+    }
 
-STATIC mp_import_stat_t mp_frozen_stat_helper(const char *name, const char *str) {
-    size_t len = strlen(str);
+    // Count the number of str lengths we have to find how many str entries.
+    size_t num_str = 0;
+    #if MICROPY_MODULE_FROZEN_STR && MICROPY_MODULE_FROZEN_MPY
+    for (const uint32_t *s = mp_frozen_str_sizes; *s != 0; ++s) {
+        ++num_str;
+    }
+    #endif
+
+    for (size_t i = 0; *name != 0; i++) {
+        size_t entry_len = strlen(name);
+        if (entry_len >= len && memcmp(str, name, len) == 0) {
+            // Query is a prefix of the current entry.
+            if (entry_len == len) {
+                // Exact match --> file.
+
+                if (frozen_type != NULL) {
+                    #if MICROPY_MODULE_FROZEN_STR
+                    if (i < num_str) {
+                        *frozen_type = MP_FROZEN_STR;
+                        // Use the size table to figure out where this index starts.
+                        size_t offset = 0;
+                        for (size_t j = 0; j < i; ++j) {
+                            offset += mp_frozen_str_sizes[j] + 1;
+                        }
+                        size_t content_len = mp_frozen_str_sizes[i];
+                        const char *content = &mp_frozen_str_content[offset];
+
+                        // Note: str & len have been updated by find_frozen_entry to strip
+                        // the ".frozen/" prefix (to avoid this being a distinct qstr to
+                        // the original path QSTR in frozen_content.c).
+                        qstr source = qstr_from_strn(str, len);
+                        mp_lexer_t *lex = MICROPY_MODULE_FROZEN_LEXER(source, content, content_len, 0);
+                        *data = lex;
+                    }
+                    #endif
+
+                    #if MICROPY_MODULE_FROZEN_MPY
+                    if (i >= num_str) {
+                        *frozen_type = MP_FROZEN_MPY;
+                        // Load the corresponding index as a raw_code, taking
+                        // into account any string entries to offset by.
+                        *data = (void *)mp_frozen_mpy_content[i - num_str];
+                    }
+                    #endif
+                }
 
-    for (int i = 0; *name != 0; i++) {
-        size_t l = strlen(name);
-        if (l >= len && !memcmp(str, name, len)) {
-            if (name[len] == 0) {
                 return MP_IMPORT_STAT_FILE;
             } else if (name[len] == '/') {
+                // Matches up to directory separator, this is a valid
+                // directory path.
                 return MP_IMPORT_STAT_DIR;
             }
         }
-        name += l + 1;
-    }
-    return MP_IMPORT_STAT_NO_EXIST;
-}
-
-mp_import_stat_t mp_frozen_stat(const char *str) {
-    mp_import_stat_t stat;
-
-    #if MICROPY_MODULE_FROZEN_STR
-    stat = mp_frozen_stat_helper(mp_frozen_str_names, str);
-    if (stat != MP_IMPORT_STAT_NO_EXIST) {
-        return stat;
+        // Skip null separator.
+        name += entry_len + 1;
     }
-    #endif
-
-    #if MICROPY_MODULE_FROZEN_MPY
-    stat = mp_frozen_stat_helper(mp_frozen_mpy_names, str);
-    if (stat != MP_IMPORT_STAT_NO_EXIST) {
-        return stat;
-    }
-    #endif
 
     return MP_IMPORT_STAT_NO_EXIST;
 }
 
-int mp_find_frozen_module(const char *str, size_t len, void **data) {
-    #if MICROPY_MODULE_FROZEN_STR
-    mp_lexer_t *lex = mp_lexer_frozen_str(str, len);
-    if (lex != NULL) {
-        *data = lex;
-        return MP_FROZEN_STR;
-    }
-    #endif
-    #if MICROPY_MODULE_FROZEN_MPY
-    const mp_raw_code_t *rc = mp_find_frozen_mpy(str, len);
-    if (rc != NULL) {
-        *data = (void *)rc;
-        return MP_FROZEN_MPY;
-    }
-    #endif
-    return MP_FROZEN_NONE;
-}
-
-#endif
+#endif // MICROPY_MODULE_FROZEN
diff --git a/py/frozenmod.h b/py/frozenmod.h
index 8a477d028e036..be735e85bdc3d 100644
--- a/py/frozenmod.h
+++ b/py/frozenmod.h
@@ -35,8 +35,6 @@ enum {
     MP_FROZEN_MPY,
 };
 
-int mp_find_frozen_module(const char *str, size_t len, void **data);
-const char *mp_find_frozen_str(const char *str, size_t *len);
-mp_import_stat_t mp_frozen_stat(const char *str);
+mp_import_stat_t mp_find_frozen_module(const char *str, int *frozen_type, void **data);
 
 #endif // MICROPY_INCLUDED_PY_FROZENMOD_H
diff --git a/py/qstrdefs.h b/py/qstrdefs.h
index 5b4e0dc48e053..405813941b267 100644
--- a/py/qstrdefs.h
+++ b/py/qstrdefs.h
@@ -60,6 +60,10 @@ Q(<string>)
 Q(<stdin>)
 Q(utf-8)
 
+#if MICROPY_MODULE_FROZEN
+Q(.frozen)
+#endif
+
 #if MICROPY_ENABLE_PYSTACK
 Q(pystack exhausted)
 #endif
diff --git a/shared/runtime/pyexec.c b/shared/runtime/pyexec.c
index 006ec096f7bcd..2dceb647c3b64 100644
--- a/shared/runtime/pyexec.c
+++ b/shared/runtime/pyexec.c
@@ -674,7 +674,7 @@ int pyexec_file(const char *filename) {
 
 int pyexec_file_if_exists(const char *filename) {
     #if MICROPY_MODULE_FROZEN
-    if (mp_frozen_stat(filename) == MP_IMPORT_STAT_FILE) {
+    if (mp_find_frozen_module(filename, NULL, NULL) == MP_IMPORT_STAT_FILE) {
         return pyexec_frozen_module(filename);
     }
     #endif
@@ -687,7 +687,8 @@ int pyexec_file_if_exists(const char *filename) {
 #if MICROPY_MODULE_FROZEN
 int pyexec_frozen_module(const char *name) {
     void *frozen_data;
-    int frozen_type = mp_find_frozen_module(name, strlen(name), &frozen_data);
+    int frozen_type;
+    mp_find_frozen_module(name, &frozen_type, &frozen_data);
 
     switch (frozen_type) {
         #if MICROPY_MODULE_FROZEN_STR
diff --git a/tools/makemanifest.py b/tools/makemanifest.py
index e37ae74cfd00d..8cdc3eb7741b9 100644
--- a/tools/makemanifest.py
+++ b/tools/makemanifest.py
@@ -233,12 +233,17 @@ def freeze_internal(kind, path, script, opt):
         manifest_list.append((kind, path, script, opt))
 
 
+# Formerly make-frozen.py.
+# This generates:
+# - MP_FROZEN_STR_NAMES macro
+# - mp_frozen_str_sizes
+# - mp_frozen_str_content
 def generate_frozen_str_content(paths):
     def module_name(f):
         return f
 
     modules = []
-    output = []
+    output = [b"#include <stdint.h>\n"]
 
     for path in paths:
         root = path.rstrip("/")
@@ -250,21 +255,19 @@ def module_name(f):
                 st = os.stat(fullpath)
                 modules.append((path, fullpath[root_len + 1 :], st))
 
-    output.append("#include <stdint.h>\n")
-    output.append("const char mp_frozen_str_names[] = {\n")
+    output.append(b"#define MP_FROZEN_STR_NAMES \\\n")
     for _path, f, st in modules:
         m = module_name(f)
-        output.append('"%s\\0"\n' % m)
-    output.append('"\\0"};\n')
+        output.append(b'"%s\\0" \\\n' % m.encode())
+    output.append(b"\n")
 
-    output.append("const uint32_t mp_frozen_str_sizes[] = {\n")
+    output.append(b"const uint32_t mp_frozen_str_sizes[] = { ")
 
     for _path, f, st in modules:
-        output.append("%d," % st.st_size)
+        output.append(b"%d, " % st.st_size)
+    output.append(b"0 };\n")
 
-    output.append("0};\n")
-
-    output.append("const char mp_frozen_str_content[] = {\n")
+    output.append(b"const char mp_frozen_str_content[] = {\n")
     for path, f, st in modules:
         data = open(path + "/" + f, "rb").read()
 
@@ -276,8 +279,8 @@ def module_name(f):
         # to be able to read the resulting C code as ASCII when possible.
 
         data = bytearray(data)  # so Python2 extracts each byte as an integer
-        esc_dict = {ord("\n"): "\\n", ord("\r"): "\\r", ord('"'): '\\"', ord("\\"): "\\\\"}
-        output.append('"')
+        esc_dict = {ord("\n"): b"\\n", ord("\r"): b"\\r", ord('"'): b'\\"', ord("\\"): b"\\\\"}
+        output.append(b'"')
         break_str = False
         for c in data:
             try:
@@ -285,16 +288,16 @@ def module_name(f):
             except KeyError:
                 if 32 <= c <= 126:
                     if break_str:
-                        output.append('" "')
+                        output.append(b'" "')
                         break_str = False
-                    output.append(chr(c))
+                    output.append(chr(c).encode())
                 else:
-                    output.append("\\x%02x" % c)
+                    output.append(b"\\x%02x" % c)
                     break_str = True
-        output.append('\\0"\n')
+        output.append(b'\\0"\n')
 
-    output.append('"\\0"};\n')
-    return "".join(output)
+    output.append(b'"\\0"\n};\n\n')
+    return b"".join(output)
 
 
 def main():
@@ -414,8 +417,8 @@ def main():
             b"const qstr_pool_t mp_qstr_frozen_const_pool = {\n"
             b"    (qstr_pool_t*)&mp_qstr_const_pool, MP_QSTRnumber_of, 0, 0\n"
             b"};\n"
-            b'const char mp_frozen_mpy_names[1] = {"\\0"};\n'
-            b"const mp_raw_code_t *const mp_frozen_mpy_content[1] = {NULL};\n"
+            b'const char mp_frozen_names[] = { MP_FROZEN_STR_NAMES "\\0"};\n'
+            b"const mp_raw_code_t *const mp_frozen_mpy_content[] = {NULL};\n"
         )
 
     # Generate output
@@ -423,7 +426,7 @@ def main():
     mkdir(args.output)
     with open(args.output, "wb") as f:
         f.write(b"//\n// Content for MICROPY_MODULE_FROZEN_STR\n//\n")
-        f.write(output_str.encode())
+        f.write(output_str)
         f.write(b"//\n// Content for MICROPY_MODULE_FROZEN_MPY\n//\n")
         f.write(output_mpy)
 
diff --git a/tools/mpy-tool.py b/tools/mpy-tool.py
index 6868ed5d4e429..aa0272111c406 100755
--- a/tools/mpy-tool.py
+++ b/tools/mpy-tool.py
@@ -886,7 +886,11 @@ def freeze_mpy(base_qstrs, raw_codes):
         rc.freeze(rc.source_file.str.replace("/", "_")[:-3] + "_")
 
     print()
-    print("const char mp_frozen_mpy_names[] = {")
+    print("const char mp_frozen_names[] = {")
+    print("#ifdef MP_FROZEN_STR_NAMES")
+    # makemanifest.py might also include some frozen string content.
+    print("MP_FROZEN_STR_NAMES")
+    print("#endif")
     for rc in raw_codes:
         module_name = rc.source_file.str
         print('"%s\\0"' % module_name)

From d6d4a5819b4b2f5f58dcc5776c284b6f633c94aa Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Sat, 11 Dec 2021 23:01:58 +1100
Subject: [PATCH 1509/3533] py/mkrules.cmake: Set frozen preprocessor defs
 early.

This ensures MICROPY_QSTR_EXTRA_POOL and MICROPY_MODULE_FROZEN_MPY are set
if necessary before the CFLAGS are extracted for QSTR generation.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 py/mkrules.cmake | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/py/mkrules.cmake b/py/mkrules.cmake
index 9d08017931963..cb5fdabf6b933 100644
--- a/py/mkrules.cmake
+++ b/py/mkrules.cmake
@@ -10,6 +10,15 @@ set(MICROPY_QSTRDEFS_COLLECTED "${MICROPY_GENHDR_DIR}/qstrdefs.collected.h")
 set(MICROPY_QSTRDEFS_PREPROCESSED "${MICROPY_GENHDR_DIR}/qstrdefs.preprocessed.h")
 set(MICROPY_QSTRDEFS_GENERATED "${MICROPY_GENHDR_DIR}/qstrdefs.generated.h")
 
+# Need to do this before extracting MICROPY_CPP_DEF below. Rest of frozen
+# manifest handling is at the end of this file.
+if(MICROPY_FROZEN_MANIFEST)
+    target_compile_definitions(${MICROPY_TARGET} PUBLIC
+        MICROPY_QSTR_EXTRA_POOL=mp_qstr_frozen_const_pool
+        MICROPY_MODULE_FROZEN_MPY=\(1\)
+    )
+endif()
+
 # Provide defaults for preprocessor flags if not already defined
 if(NOT MICROPY_CPP_FLAGS)
     get_target_property(MICROPY_CPP_INC ${MICROPY_TARGET} INCLUDE_DIRECTORIES)
@@ -120,10 +129,7 @@ if(MICROPY_FROZEN_MANIFEST)
         ${MICROPY_FROZEN_CONTENT}
     )
 
-    target_compile_definitions(${MICROPY_TARGET} PUBLIC
-        MICROPY_QSTR_EXTRA_POOL=mp_qstr_frozen_const_pool
-        MICROPY_MODULE_FROZEN_MPY=\(1\)
-    )
+    # Note: target_compile_definitions already added earlier.
 
     if(NOT MICROPY_LIB_DIR)
         set(MICROPY_LIB_DIR ${MICROPY_DIR}/../micropython-lib)

From 86ce4426079b1b368881c22f46d80045e2f720b0 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Sat, 11 Dec 2021 23:04:01 +1100
Subject: [PATCH 1510/3533] ports: Add '.frozen' as the first entry in
 sys.path.

Frozen modules will be searched preferentially, but gives the user the
ability to override this behavior.

This matches the previous behavior where "" was implicitly the frozen
search path, but the frozen list was checked before the filesystem.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/esp32/main.c                            |  3 +++
 ports/esp8266/main.c                          |  3 +++
 ports/mimxrt/main.c                           |  3 +++
 ports/nrf/main.c                              |  3 +++
 ports/rp2/main.c                              |  3 +++
 ports/stm32/main.c                            |  3 +++
 ports/unix/main.c                             | 15 ++++++---------
 ports/unix/mpconfigport.h                     |  3 +++
 ports/unix/variants/minimal/mpconfigvariant.h |  3 +++
 shared/upytesthelper/upytesthelper.c          |  3 +++
 10 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/ports/esp32/main.c b/ports/esp32/main.c
index 4920180b23512..e95930ed071dd 100644
--- a/ports/esp32/main.c
+++ b/ports/esp32/main.c
@@ -141,6 +141,9 @@ void mp_task(void *pvParameter) {
     gc_init(mp_task_heap, mp_task_heap + mp_task_heap_size);
     mp_init();
     mp_obj_list_init(mp_sys_path, 0);
+    #if MICROPY_MODULE_FROZEN
+    mp_obj_list_append(mp_sys_path, MP_OBJ_NEW_QSTR(MP_QSTR__dot_frozen));
+    #endif
     mp_obj_list_append(mp_sys_path, MP_OBJ_NEW_QSTR(MP_QSTR_));
     mp_obj_list_append(mp_sys_path, MP_OBJ_NEW_QSTR(MP_QSTR__slash_lib));
     mp_obj_list_init(mp_sys_argv, 0);
diff --git a/ports/esp8266/main.c b/ports/esp8266/main.c
index 404188346cc00..14863a35b0a74 100644
--- a/ports/esp8266/main.c
+++ b/ports/esp8266/main.c
@@ -53,6 +53,9 @@ STATIC void mp_reset(void) {
     gc_init(heap, heap + sizeof(heap));
     mp_init();
     mp_obj_list_init(mp_sys_path, 0);
+    #if MICROPY_MODULE_FROZEN
+    mp_obj_list_append(mp_sys_path, MP_OBJ_NEW_QSTR(MP_QSTR__dot_frozen));
+    #endif
     mp_obj_list_append(mp_sys_path, MP_OBJ_NEW_QSTR(MP_QSTR_)); // current dir (or base dir of the script)
     mp_obj_list_append(mp_sys_path, MP_OBJ_NEW_QSTR(MP_QSTR__slash_lib));
     mp_obj_list_append(mp_sys_path, MP_OBJ_NEW_QSTR(MP_QSTR__slash_));
diff --git a/ports/mimxrt/main.c b/ports/mimxrt/main.c
index 4d603913fdf01..28ee30d990b27 100644
--- a/ports/mimxrt/main.c
+++ b/ports/mimxrt/main.c
@@ -76,6 +76,9 @@ int main(void) {
         mp_init();
 
         mp_obj_list_init(MP_OBJ_TO_PTR(mp_sys_path), 0);
+        #if MICROPY_MODULE_FROZEN
+        mp_obj_list_append(mp_sys_path, MP_OBJ_NEW_QSTR(MP_QSTR__dot_frozen));
+        #endif
         mp_obj_list_append(mp_sys_path, MP_OBJ_NEW_QSTR(MP_QSTR_));
         mp_obj_list_init(MP_OBJ_TO_PTR(mp_sys_argv), 0);
         #if MICROPY_PY_NETWORK
diff --git a/ports/nrf/main.c b/ports/nrf/main.c
index 3768b8f404862..fc67bd657db6f 100644
--- a/ports/nrf/main.c
+++ b/ports/nrf/main.c
@@ -130,6 +130,9 @@ int main(int argc, char **argv) {
 
     mp_init();
     mp_obj_list_init(mp_sys_path, 0);
+    #if MICROPY_MODULE_FROZEN
+    mp_obj_list_append(mp_sys_path, MP_OBJ_NEW_QSTR(MP_QSTR__dot_frozen));
+    #endif
     mp_obj_list_append(mp_sys_path, MP_OBJ_NEW_QSTR(MP_QSTR_)); // current dir (or base dir of the script)
     mp_obj_list_init(mp_sys_argv, 0);
 
diff --git a/ports/rp2/main.c b/ports/rp2/main.c
index 793444c9a92cf..6a5bb8867dc7a 100644
--- a/ports/rp2/main.c
+++ b/ports/rp2/main.c
@@ -101,6 +101,9 @@ int main(int argc, char **argv) {
         // Initialise MicroPython runtime.
         mp_init();
         mp_obj_list_init(MP_OBJ_TO_PTR(mp_sys_path), 0);
+        #if MICROPY_MODULE_FROZEN
+        mp_obj_list_append(mp_sys_path, MP_OBJ_NEW_QSTR(MP_QSTR__dot_frozen));
+        #endif
         mp_obj_list_append(mp_sys_path, MP_OBJ_NEW_QSTR(MP_QSTR_));
         mp_obj_list_append(mp_sys_path, MP_OBJ_NEW_QSTR(MP_QSTR__slash_lib));
         mp_obj_list_init(MP_OBJ_TO_PTR(mp_sys_argv), 0);
diff --git a/ports/stm32/main.c b/ports/stm32/main.c
index 7a7f80467bcc8..51459682fd0b5 100644
--- a/ports/stm32/main.c
+++ b/ports/stm32/main.c
@@ -495,6 +495,9 @@ void stm32_main(uint32_t reset_mode) {
     // MicroPython init
     mp_init();
     mp_obj_list_init(MP_OBJ_TO_PTR(mp_sys_path), 0);
+    #if MICROPY_MODULE_FROZEN
+    mp_obj_list_append(mp_sys_path, MP_OBJ_NEW_QSTR(MP_QSTR__dot_frozen));
+    #endif
     mp_obj_list_append(mp_sys_path, MP_OBJ_NEW_QSTR(MP_QSTR_)); // current dir (or base dir of the script)
     mp_obj_list_init(MP_OBJ_TO_PTR(mp_sys_argv), 0);
 
diff --git a/ports/unix/main.c b/ports/unix/main.c
index 031bdd75d106e..cecb806283eb5 100644
--- a/ports/unix/main.c
+++ b/ports/unix/main.c
@@ -495,13 +495,9 @@ MP_NOINLINE int main_(int argc, char **argv) {
     char *home = getenv("HOME");
     char *path = getenv("MICROPYPATH");
     if (path == NULL) {
-        #ifdef MICROPY_PY_SYS_PATH_DEFAULT
         path = MICROPY_PY_SYS_PATH_DEFAULT;
-        #else
-        path = "~/.micropython/lib:/usr/lib/micropython";
-        #endif
     }
-    size_t path_num = 1; // [0] is for current dir (or base dir of the script)
+    size_t path_num = 2; // [0] is frozen, [1] is for current dir (or base dir of the script)
     if (*path == PATHLIST_SEP_CHAR) {
         path_num++;
     }
@@ -514,10 +510,11 @@ MP_NOINLINE int main_(int argc, char **argv) {
     mp_obj_list_init(MP_OBJ_TO_PTR(mp_sys_path), path_num);
     mp_obj_t *path_items;
     mp_obj_list_get(mp_sys_path, &path_num, &path_items);
-    path_items[0] = MP_OBJ_NEW_QSTR(MP_QSTR_);
+    path_items[0] = MP_OBJ_NEW_QSTR(MP_QSTR__dot_frozen);
+    path_items[1] = MP_OBJ_NEW_QSTR(MP_QSTR_);
     {
         char *p = path;
-        for (mp_uint_t i = 1; i < path_num; i++) {
+        for (mp_uint_t i = 2; i < path_num; i++) {
             char *p1 = strchr(p, PATHLIST_SEP_CHAR);
             if (p1 == NULL) {
                 p1 = p + strlen(p);
@@ -658,9 +655,9 @@ MP_NOINLINE int main_(int argc, char **argv) {
                 break;
             }
 
-            // Set base dir of the script as first entry in sys.path
+            // Set base dir of the script as second entry in sys.path.
             char *p = strrchr(basedir, '/');
-            path_items[0] = mp_obj_new_str_via_qstr(basedir, p - basedir);
+            path_items[1] = mp_obj_new_str_via_qstr(basedir, p - basedir);
             free(pathbuf);
 
             set_sys_argv(argv, argc, a);
diff --git a/ports/unix/mpconfigport.h b/ports/unix/mpconfigport.h
index 93d790ac36f1e..68d4d8d33fe5e 100644
--- a/ports/unix/mpconfigport.h
+++ b/ports/unix/mpconfigport.h
@@ -123,6 +123,9 @@
     #define MICROPY_PY_SYS_PLATFORM  "linux"
 #endif
 #endif
+#ifndef MICROPY_PY_SYS_PATH_DEFAULT
+#define MICROPY_PY_SYS_PATH_DEFAULT "~/.micropython/lib:/usr/lib/micropython"
+#endif
 #define MICROPY_PY_SYS_MAXSIZE      (1)
 #define MICROPY_PY_SYS_STDFILES     (1)
 #define MICROPY_PY_SYS_EXC_INFO     (1)
diff --git a/ports/unix/variants/minimal/mpconfigvariant.h b/ports/unix/variants/minimal/mpconfigvariant.h
index 973febd572637..4766b8e8953aa 100644
--- a/ports/unix/variants/minimal/mpconfigvariant.h
+++ b/ports/unix/variants/minimal/mpconfigvariant.h
@@ -88,6 +88,9 @@
 #define MICROPY_PY_SYS              (1)
 #define MICROPY_PY_SYS_EXIT         (0)
 #define MICROPY_PY_SYS_PLATFORM     "linux"
+#ifndef MICROPY_PY_SYS_PATH_DEFAULT
+#define MICROPY_PY_SYS_PATH_DEFAULT "~/.micropython/lib:/usr/lib/micropython"
+#endif
 #define MICROPY_PY_SYS_MAXSIZE      (0)
 #define MICROPY_PY_SYS_STDFILES     (0)
 #define MICROPY_PY_CMATH            (0)
diff --git a/shared/upytesthelper/upytesthelper.c b/shared/upytesthelper/upytesthelper.c
index 326172be658c0..ce6073242438e 100644
--- a/shared/upytesthelper/upytesthelper.c
+++ b/shared/upytesthelper/upytesthelper.c
@@ -94,6 +94,9 @@ void upytest_execute_test(const char *src) {
     gc_init(heap_start, heap_end);
     mp_init();
     mp_obj_list_init(mp_sys_path, 0);
+    #if MICROPY_MODULE_FROZEN
+    mp_obj_list_append(mp_sys_path, MP_OBJ_NEW_QSTR(MP_QSTR__dot_frozen));
+    #endif
     mp_obj_list_init(mp_sys_argv, 0);
 
     nlr_buf_t nlr;

From 86394f70fcd7b9fa66ec952711e5d64557d81a1e Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Sat, 11 Dec 2021 23:39:40 +1100
Subject: [PATCH 1511/3533] docs/library/sys.rst: Add note about '.frozen' as
 an entry in sys.path.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 docs/library/sys.rst | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/docs/library/sys.rst b/docs/library/sys.rst
index 80ac1ab84c0df..d36394c88c0de 100644
--- a/docs/library/sys.rst
+++ b/docs/library/sys.rst
@@ -115,6 +115,14 @@ Constants
 
    A mutable list of directories to search for imported modules.
 
+   .. admonition:: Difference to CPython
+      :class: attention
+
+      On MicroPython, an entry with the value ``".frozen"`` will indicate that import
+      should search :term:`frozen modules <frozen module>` at that point in the search.
+      If no frozen module is found then search will *not* look for a directory called
+      ``.frozen``, instead it will continue with the next entry in ``sys.path``.
+
 .. data:: platform
 
    The platform that MicroPython is running on. For OS/RTOS ports, this is

From de43b500bdff465539d89c5004d9e8cb3849eab1 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 17 Dec 2021 23:35:32 +1100
Subject: [PATCH 1512/3533] py/runtime: Allow initialising sys.path/argv with
 defaults.

If MICROPY_PY_SYS_PATH_ARGV_DEFAULTS is enabled (which it is by default)
then sys.path and sys.argv will be initialised and populated with default
values.  This keeps all bare-metal ports aligned.

Signed-off-by: Damien George <damien@micropython.org>
---
 docs/develop/porting.rst     | 2 --
 mpy-cross/main.c             | 2 --
 ports/cc3200/mptask.c        | 3 ---
 ports/esp32/main.c           | 6 ------
 ports/esp8266/main.c         | 6 ------
 ports/javascript/main.c      | 4 ----
 ports/mimxrt/main.c          | 6 ------
 ports/nrf/main.c             | 8 --------
 ports/rp2/main.c             | 6 ------
 ports/samd/main.c            | 3 ---
 ports/stm32/main.c           | 6 ------
 ports/teensy/main.c          | 3 ---
 ports/unix/mpconfigport.h    | 1 +
 ports/windows/mpconfigport.h | 1 +
 ports/zephyr/main.c          | 3 ---
 py/mpconfig.h                | 5 +++++
 py/mpstate.h                 | 3 ++-
 py/runtime.c                 | 9 +++++++++
 18 files changed, 18 insertions(+), 59 deletions(-)

diff --git a/docs/develop/porting.rst b/docs/develop/porting.rst
index 549227d76267c..ae0cfd8b067e6 100644
--- a/docs/develop/porting.rst
+++ b/docs/develop/porting.rst
@@ -53,8 +53,6 @@ The basic MicroPython firmware is implemented in the main port file, e.g ``main.
        mp_stack_ctrl_init();
        gc_init(heap, heap + sizeof(heap));
        mp_init();
-       mp_obj_list_init(MP_OBJ_TO_PTR(mp_sys_path), 0);
-       mp_obj_list_init(MP_OBJ_TO_PTR(mp_sys_argv), 0);
 
        // Start a normal REPL; will exit when ctrl-D is entered on a blank line.
        pyexec_friendly_repl();
diff --git a/mpy-cross/main.c b/mpy-cross/main.c
index c677929c3317a..7218921b31a82 100644
--- a/mpy-cross/main.c
+++ b/mpy-cross/main.c
@@ -192,8 +192,6 @@ MP_NOINLINE int main_(int argc, char **argv) {
     #ifdef _WIN32
     set_fmode_binary();
     #endif
-    mp_obj_list_init(mp_sys_path, 0);
-    mp_obj_list_init(mp_sys_argv, 0);
 
     #if MICROPY_EMIT_NATIVE
     // Set default emitter options
diff --git a/ports/cc3200/mptask.c b/ports/cc3200/mptask.c
index 599211bdfbaad..81f00e5384f0b 100644
--- a/ports/cc3200/mptask.c
+++ b/ports/cc3200/mptask.c
@@ -139,9 +139,6 @@ void TASK_MicroPython(void *pvParameters) {
 
     // MicroPython init
     mp_init();
-    mp_obj_list_init(mp_sys_path, 0);
-    mp_obj_list_init(mp_sys_argv, 0);
-    mp_obj_list_append(mp_sys_path, MP_OBJ_NEW_QSTR(MP_QSTR_)); // current dir (or base dir of the script)
 
     // execute all basic initializations
     mp_irq_init0();
diff --git a/ports/esp32/main.c b/ports/esp32/main.c
index e95930ed071dd..c9b033d626bd2 100644
--- a/ports/esp32/main.c
+++ b/ports/esp32/main.c
@@ -140,13 +140,7 @@ void mp_task(void *pvParameter) {
     mp_stack_set_limit(MP_TASK_STACK_SIZE - MP_TASK_STACK_LIMIT_MARGIN);
     gc_init(mp_task_heap, mp_task_heap + mp_task_heap_size);
     mp_init();
-    mp_obj_list_init(mp_sys_path, 0);
-    #if MICROPY_MODULE_FROZEN
-    mp_obj_list_append(mp_sys_path, MP_OBJ_NEW_QSTR(MP_QSTR__dot_frozen));
-    #endif
-    mp_obj_list_append(mp_sys_path, MP_OBJ_NEW_QSTR(MP_QSTR_));
     mp_obj_list_append(mp_sys_path, MP_OBJ_NEW_QSTR(MP_QSTR__slash_lib));
-    mp_obj_list_init(mp_sys_argv, 0);
     readline_init0();
 
     // initialise peripherals
diff --git a/ports/esp8266/main.c b/ports/esp8266/main.c
index 14863a35b0a74..5d7debced02b0 100644
--- a/ports/esp8266/main.c
+++ b/ports/esp8266/main.c
@@ -52,14 +52,8 @@ STATIC void mp_reset(void) {
     mp_hal_init();
     gc_init(heap, heap + sizeof(heap));
     mp_init();
-    mp_obj_list_init(mp_sys_path, 0);
-    #if MICROPY_MODULE_FROZEN
-    mp_obj_list_append(mp_sys_path, MP_OBJ_NEW_QSTR(MP_QSTR__dot_frozen));
-    #endif
-    mp_obj_list_append(mp_sys_path, MP_OBJ_NEW_QSTR(MP_QSTR_)); // current dir (or base dir of the script)
     mp_obj_list_append(mp_sys_path, MP_OBJ_NEW_QSTR(MP_QSTR__slash_lib));
     mp_obj_list_append(mp_sys_path, MP_OBJ_NEW_QSTR(MP_QSTR__slash_));
-    mp_obj_list_init(mp_sys_argv, 0);
     #if MICROPY_EMIT_XTENSA || MICROPY_EMIT_INLINE_XTENSA
     extern void esp_native_code_init(void);
     esp_native_code_init();
diff --git a/ports/javascript/main.c b/ports/javascript/main.c
index 7a04b8eea3078..04a853f66cf4c 100644
--- a/ports/javascript/main.c
+++ b/ports/javascript/main.c
@@ -91,10 +91,6 @@ void mp_js_init(int heap_size) {
     #endif
 
     mp_init();
-
-    mp_obj_list_init(mp_sys_path, 0);
-    mp_obj_list_append(mp_sys_path, MP_OBJ_NEW_QSTR(MP_QSTR_));
-    mp_obj_list_init(mp_sys_argv, 0);
 }
 
 void mp_js_init_repl() {
diff --git a/ports/mimxrt/main.c b/ports/mimxrt/main.c
index 28ee30d990b27..a6a0d2e196655 100644
--- a/ports/mimxrt/main.c
+++ b/ports/mimxrt/main.c
@@ -75,12 +75,6 @@ int main(void) {
         gc_init(&_gc_heap_start, &_gc_heap_end);
         mp_init();
 
-        mp_obj_list_init(MP_OBJ_TO_PTR(mp_sys_path), 0);
-        #if MICROPY_MODULE_FROZEN
-        mp_obj_list_append(mp_sys_path, MP_OBJ_NEW_QSTR(MP_QSTR__dot_frozen));
-        #endif
-        mp_obj_list_append(mp_sys_path, MP_OBJ_NEW_QSTR(MP_QSTR_));
-        mp_obj_list_init(MP_OBJ_TO_PTR(mp_sys_argv), 0);
         #if MICROPY_PY_NETWORK
         mod_network_init();
         #endif
diff --git a/ports/nrf/main.c b/ports/nrf/main.c
index fc67bd657db6f..2ec16194cb571 100644
--- a/ports/nrf/main.c
+++ b/ports/nrf/main.c
@@ -129,16 +129,8 @@ int main(int argc, char **argv) {
     gc_init(&_heap_start, &_heap_end);
 
     mp_init();
-    mp_obj_list_init(mp_sys_path, 0);
-    #if MICROPY_MODULE_FROZEN
-    mp_obj_list_append(mp_sys_path, MP_OBJ_NEW_QSTR(MP_QSTR__dot_frozen));
-    #endif
-    mp_obj_list_append(mp_sys_path, MP_OBJ_NEW_QSTR(MP_QSTR_)); // current dir (or base dir of the script)
-    mp_obj_list_init(mp_sys_argv, 0);
-
     readline_init0();
 
-
     #if MICROPY_PY_MACHINE_HW_SPI
     spi_init0();
     #endif
diff --git a/ports/rp2/main.c b/ports/rp2/main.c
index 6a5bb8867dc7a..84f23af23c949 100644
--- a/ports/rp2/main.c
+++ b/ports/rp2/main.c
@@ -100,13 +100,7 @@ int main(int argc, char **argv) {
 
         // Initialise MicroPython runtime.
         mp_init();
-        mp_obj_list_init(MP_OBJ_TO_PTR(mp_sys_path), 0);
-        #if MICROPY_MODULE_FROZEN
-        mp_obj_list_append(mp_sys_path, MP_OBJ_NEW_QSTR(MP_QSTR__dot_frozen));
-        #endif
-        mp_obj_list_append(mp_sys_path, MP_OBJ_NEW_QSTR(MP_QSTR_));
         mp_obj_list_append(mp_sys_path, MP_OBJ_NEW_QSTR(MP_QSTR__slash_lib));
-        mp_obj_list_init(MP_OBJ_TO_PTR(mp_sys_argv), 0);
 
         // Initialise sub-systems.
         readline_init0();
diff --git a/ports/samd/main.c b/ports/samd/main.c
index a08e66fda093a..63fe4013a443a 100644
--- a/ports/samd/main.c
+++ b/ports/samd/main.c
@@ -41,9 +41,6 @@ void samd_main(void) {
     for (;;) {
         gc_init(&_sheap, &_eheap);
         mp_init();
-        mp_obj_list_init(MP_OBJ_TO_PTR(mp_sys_path), 0);
-        mp_obj_list_append(mp_sys_path, MP_OBJ_NEW_QSTR(MP_QSTR_));
-        mp_obj_list_init(MP_OBJ_TO_PTR(mp_sys_argv), 0);
 
         // Execute _boot.py to set up the filesystem.
         pyexec_frozen_module("_boot.py");
diff --git a/ports/stm32/main.c b/ports/stm32/main.c
index 51459682fd0b5..431fa20dee55f 100644
--- a/ports/stm32/main.c
+++ b/ports/stm32/main.c
@@ -494,12 +494,6 @@ void stm32_main(uint32_t reset_mode) {
 
     // MicroPython init
     mp_init();
-    mp_obj_list_init(MP_OBJ_TO_PTR(mp_sys_path), 0);
-    #if MICROPY_MODULE_FROZEN
-    mp_obj_list_append(mp_sys_path, MP_OBJ_NEW_QSTR(MP_QSTR__dot_frozen));
-    #endif
-    mp_obj_list_append(mp_sys_path, MP_OBJ_NEW_QSTR(MP_QSTR_)); // current dir (or base dir of the script)
-    mp_obj_list_init(MP_OBJ_TO_PTR(mp_sys_argv), 0);
 
     // Initialise low-level sub-systems.  Here we need to very basic things like
     // zeroing out memory and resetting any of the sub-systems.  Following this
diff --git a/ports/teensy/main.c b/ports/teensy/main.c
index 6ebdcde21cbe7..37a04c74f8af6 100644
--- a/ports/teensy/main.c
+++ b/ports/teensy/main.c
@@ -269,9 +269,6 @@ int main(void) {
 
     // MicroPython init
     mp_init();
-    mp_obj_list_init(mp_sys_path, 0);
-    mp_obj_list_append(mp_sys_path, MP_OBJ_NEW_QSTR(MP_QSTR_)); // current dir (or base dir of the script)
-    mp_obj_list_init(mp_sys_argv, 0);
 
     readline_init0();
 
diff --git a/ports/unix/mpconfigport.h b/ports/unix/mpconfigport.h
index 68d4d8d33fe5e..a995ac52cc64a 100644
--- a/ports/unix/mpconfigport.h
+++ b/ports/unix/mpconfigport.h
@@ -110,6 +110,7 @@
 #define MICROPY_PY_ARRAY_SLICE_ASSIGN (1)
 #define MICROPY_PY_BUILTINS_SLICE_ATTRS (1)
 #define MICROPY_PY_BUILTINS_SLICE_INDICES (1)
+#define MICROPY_PY_SYS_PATH_ARGV_DEFAULTS (0)
 #define MICROPY_PY_SYS_EXIT         (1)
 #define MICROPY_PY_SYS_ATEXIT       (1)
 #if MICROPY_PY_SYS_SETTRACE
diff --git a/ports/windows/mpconfigport.h b/ports/windows/mpconfigport.h
index 69193cb6afccf..30d8e09e6d8ee 100644
--- a/ports/windows/mpconfigport.h
+++ b/ports/windows/mpconfigport.h
@@ -85,6 +85,7 @@
 #define MICROPY_PY_REVERSE_SPECIAL_METHODS (1)
 #define MICROPY_PY_ARRAY_SLICE_ASSIGN (1)
 #define MICROPY_PY_BUILTINS_SLICE_ATTRS (1)
+#define MICROPY_PY_SYS_PATH_ARGV_DEFAULTS (0)
 #define MICROPY_PY_SYS_EXIT         (1)
 #define MICROPY_PY_SYS_ATEXIT       (1)
 #define MICROPY_PY_SYS_PLATFORM     "win32"
diff --git a/ports/zephyr/main.c b/ports/zephyr/main.c
index 63190bd5edd67..f97276834078d 100644
--- a/ports/zephyr/main.c
+++ b/ports/zephyr/main.c
@@ -139,9 +139,6 @@ int real_main(void) {
     gc_init(heap, heap + sizeof(heap));
     #endif
     mp_init();
-    mp_obj_list_init(mp_sys_path, 0);
-    mp_obj_list_append(mp_sys_path, MP_OBJ_NEW_QSTR(MP_QSTR_)); // current dir (or base dir of the script)
-    mp_obj_list_init(mp_sys_argv, 0);
 
     #ifdef CONFIG_USB
     usb_enable(NULL);
diff --git a/py/mpconfig.h b/py/mpconfig.h
index 86e3e0f34936d..f0d11961d3538 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -1306,6 +1306,11 @@ typedef double mp_float_t;
 #define MICROPY_PY_SYS (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_CORE_FEATURES)
 #endif
 
+// Whether to initialise "sys.path" and "sys.argv" to their defaults in mp_init()
+#ifndef MICROPY_PY_SYS_PATH_ARGV_DEFAULTS
+#define MICROPY_PY_SYS_PATH_ARGV_DEFAULTS (1)
+#endif
+
 // Whether to provide "sys.maxsize" constant
 #ifndef MICROPY_PY_SYS_MAXSIZE
 #define MICROPY_PY_SYS_MAXSIZE (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
diff --git a/py/mpstate.h b/py/mpstate.h
index 69360738c23c6..69fee06546a7c 100644
--- a/py/mpstate.h
+++ b/py/mpstate.h
@@ -153,7 +153,8 @@ typedef struct _mp_state_vm_t {
     // dictionary for the __main__ module
     mp_obj_dict_t dict_main;
 
-    // these two lists must be initialised per port, after the call to mp_init
+    // If MICROPY_PY_SYS_PATH_ARGV_DEFAULTS is not enabled then these two lists
+    // must be initialised after the call to mp_init.
     mp_obj_list_t mp_sys_path_obj;
     mp_obj_list_t mp_sys_argv_obj;
 
diff --git a/py/runtime.c b/py/runtime.c
index 0120b70d74e1b..7607ffb191bde 100644
--- a/py/runtime.c
+++ b/py/runtime.c
@@ -122,6 +122,15 @@ void mp_init(void) {
     MP_STATE_VM(vfs_mount_table) = NULL;
     #endif
 
+    #if MICROPY_PY_SYS_PATH_ARGV_DEFAULTS
+    mp_obj_list_init(MP_OBJ_TO_PTR(mp_sys_path), 0);
+    #if MICROPY_MODULE_FROZEN
+    mp_obj_list_append(mp_sys_path, MP_OBJ_NEW_QSTR(MP_QSTR__dot_frozen));
+    #endif
+    mp_obj_list_append(mp_sys_path, MP_OBJ_NEW_QSTR(MP_QSTR_)); // current dir (or base dir of the script)
+    mp_obj_list_init(MP_OBJ_TO_PTR(mp_sys_argv), 0);
+    #endif
+
     #if MICROPY_PY_SYS_ATEXIT
     MP_STATE_VM(sys_exitfunc) = mp_const_none;
     #endif

From fe9ffff9c0374684f9e89292099d11d957ef9a3e Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sun, 19 Dec 2021 08:55:40 +1100
Subject: [PATCH 1513/3533] py/mpstate.h: Only include sys.path/argv objects in
 state when enabled.

The mp_sys_path_obj and mp_sys_argv_obj objects are only used by the
runtime and accessible from Python if MICROPY_PY_SYS is enabled.  So
exclude them from the runtime state if this option is disabled.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/mpconfig.h | 2 +-
 py/mpstate.h  | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/py/mpconfig.h b/py/mpconfig.h
index f0d11961d3538..d93100bb83c3a 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -1308,7 +1308,7 @@ typedef double mp_float_t;
 
 // Whether to initialise "sys.path" and "sys.argv" to their defaults in mp_init()
 #ifndef MICROPY_PY_SYS_PATH_ARGV_DEFAULTS
-#define MICROPY_PY_SYS_PATH_ARGV_DEFAULTS (1)
+#define MICROPY_PY_SYS_PATH_ARGV_DEFAULTS (MICROPY_PY_SYS)
 #endif
 
 // Whether to provide "sys.maxsize" constant
diff --git a/py/mpstate.h b/py/mpstate.h
index 69fee06546a7c..8ece151663088 100644
--- a/py/mpstate.h
+++ b/py/mpstate.h
@@ -153,10 +153,12 @@ typedef struct _mp_state_vm_t {
     // dictionary for the __main__ module
     mp_obj_dict_t dict_main;
 
+    #if MICROPY_PY_SYS
     // If MICROPY_PY_SYS_PATH_ARGV_DEFAULTS is not enabled then these two lists
     // must be initialised after the call to mp_init.
     mp_obj_list_t mp_sys_path_obj;
     mp_obj_list_t mp_sys_argv_obj;
+    #endif
 
     // dictionary for overridden builtins
     #if MICROPY_CAN_OVERRIDE_BUILTINS

From f9e5b0d93d0cd0eb65f23cff3ca7e827a96bd83c Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Sat, 18 Dec 2021 19:11:47 +0200
Subject: [PATCH 1514/3533] stm32/factoryreset: Init vfs flags before calling
 pyb_flash_init_vfs.

The vfs flags could have any random value from stack.  This bug was
introduced back in 7723dac3371ccf081c2490b33b69492dc42818bd
---
 ports/stm32/factoryreset.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/stm32/factoryreset.c b/ports/stm32/factoryreset.c
index 999056e7265f7..10eb3a17a7eb3 100644
--- a/ports/stm32/factoryreset.c
+++ b/ports/stm32/factoryreset.c
@@ -109,6 +109,7 @@ MP_WEAK int factory_reset_create_filesystem(void) {
     uint32_t start_tick = HAL_GetTick();
 
     fs_user_mount_t vfs;
+    vfs.blockdev.flags = 0;
     pyb_flash_init_vfs(&vfs);
     uint8_t working_buf[FF_MAX_SS];
     FRESULT res = f_mkfs(&vfs.fatfs, FM_FAT, 0, working_buf, sizeof(working_buf));

From 1dc532019b9d1bb6326856849975653d66258b24 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Sat, 18 Dec 2021 19:32:06 +0200
Subject: [PATCH 1515/3533] stm32/qspi: Fix typo in address comment.

---
 ports/stm32/qspi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/stm32/qspi.c b/ports/stm32/qspi.c
index b82d3d81c08ee..5ead66f4e40b3 100644
--- a/ports/stm32/qspi.c
+++ b/ports/stm32/qspi.c
@@ -318,7 +318,7 @@ STATIC void qspi_read_cmd_qaddr_qdata(void *self_in, uint8_t cmd, uint32_t addr,
     ;
 
     QUADSPI->ABR = 0; // alternate byte: disable continuous read mode
-    QUADSPI->AR = addr; // addres to read from
+    QUADSPI->AR = addr; // address to read from
 
     // Read in the data 4 bytes at a time if dest is aligned
     if (((uintptr_t)dest & 3) == 0) {

From bedd9c5463b5eabcf586f08e9067e10d0aa3e458 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Sat, 18 Dec 2021 22:18:33 +0200
Subject: [PATCH 1516/3533] stm32/boards/make-pins.py: Generate empty ADC table
 if needed.

If ADCx pins are hidden, print an empty table to prevent linker errors.
---
 ports/stm32/boards/make-pins.py | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/ports/stm32/boards/make-pins.py b/ports/stm32/boards/make-pins.py
index b11f438aae3dd..14c9e91097d21 100755
--- a/ports/stm32/boards/make-pins.py
+++ b/ports/stm32/boards/make-pins.py
@@ -426,16 +426,19 @@ def print_adc(self, adc_num):
                 adc_pins[pin.adc_channel] = pin
         if adc_pins:
             table_size = max(adc_pins) + 1
-            self.adc_table_size[adc_num] = table_size
-            print("")
-            print("const pin_obj_t * const pin_adc{:d}[{:d}] = {{".format(adc_num, table_size))
-            for channel in range(table_size):
-                if channel in adc_pins:
-                    obj = "&pin_{:s}_obj".format(adc_pins[channel].cpu_pin_name())
-                else:
-                    obj = "NULL"
-                print("  [{:d}] = {},".format(channel, obj))
-            print("};")
+        else:
+            # If ADCx pins are hidden, print an empty table to prevent linker errors.
+            table_size = 0
+        self.adc_table_size[adc_num] = table_size
+        print("")
+        print("const pin_obj_t * const pin_adc{:d}[{:d}] = {{".format(adc_num, table_size))
+        for channel in range(table_size):
+            if channel in adc_pins:
+                obj = "&pin_{:s}_obj".format(adc_pins[channel].cpu_pin_name())
+            else:
+                obj = "NULL"
+            print("  [{:d}] = {},".format(channel, obj))
+        print("};")
 
     def print_header(self, hdr_filename, obj_decls):
         with open(hdr_filename, "wt") as hdr_file:

From f2b5c99fde53796247921bfd016224b5edf7f8a6 Mon Sep 17 00:00:00 2001
From: Matt Trentini <matt.trentini@gmail.com>
Date: Thu, 16 Dec 2021 21:52:05 +1100
Subject: [PATCH 1517/3533] stm32/boards/OLIMEX_H407: Fix typo in OLIMEX H407
 board.json.

Appears incorrectly as E407 in the download manager.
---
 ports/stm32/boards/OLIMEX_H407/board.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/stm32/boards/OLIMEX_H407/board.json b/ports/stm32/boards/OLIMEX_H407/board.json
index d4e0fda98c1f0..c074950ab3f83 100644
--- a/ports/stm32/boards/OLIMEX_H407/board.json
+++ b/ports/stm32/boards/OLIMEX_H407/board.json
@@ -6,7 +6,7 @@
     "features": [],
     "images": [],
     "mcu": "stm32f4",
-    "product": "E407",
+    "product": "H407",
     "thumbnail": "",
     "url": "",
     "vendor": "OLIMEX"

From 05bea70979232629e059a7453fb7965545113d9f Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 20 Dec 2021 12:27:06 +1100
Subject: [PATCH 1518/3533] esp8266/etshal.h: Remove unneeded function
 declarations.

These removed ones are either unused by MicroPython or provided by osapi.h
in the SDK.  In particular ets_delay_us() has different signatures for
different versions of the SDK, so best to let it provide the declaration.

Fixes issue #8095.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp8266/etshal.h | 20 +-------------------
 1 file changed, 1 insertion(+), 19 deletions(-)

diff --git a/ports/esp8266/etshal.h b/ports/esp8266/etshal.h
index f7b34b8356686..7d0855a2ae08a 100644
--- a/ports/esp8266/etshal.h
+++ b/ports/esp8266/etshal.h
@@ -6,22 +6,10 @@
 // see http://esp8266-re.foogod.com/wiki/Random_Number_Generator
 #define WDEV_HWRNG ((volatile uint32_t *)0x3ff20e44)
 
-void ets_delay_us(uint16_t us);
-void ets_intr_lock(void);
-void ets_intr_unlock(void);
 void ets_isr_mask(uint32_t mask);
 void ets_isr_unmask(uint32_t mask);
-void ets_isr_attach(int irq_no, void (*handler)(void *), void *arg);
-void ets_install_putc1();
-void uart_div_modify(uint8_t uart, uint32_t divisor);
-void ets_set_idle_cb(void (*handler)(void *), void *arg);
 
-void ets_timer_arm_new(os_timer_t *tim, uint32_t millis, bool repeat, bool is_milli_timer);
-void ets_timer_setfn(os_timer_t *tim, ETSTimerFunc callback, void *cb_data);
-void ets_timer_disarm(os_timer_t *tim);
-
-extern void ets_wdt_disable(void);
-extern void wdt_feed(void);
+void ets_wdt_disable(void);
 
 // Opaque structure
 #ifndef MD5_CTX
@@ -32,12 +20,6 @@ void MD5Init(MD5_CTX *context);
 void MD5Update(MD5_CTX *context, const void *data, unsigned int len);
 void MD5Final(unsigned char digest[16], MD5_CTX *context);
 
-// These prototypes are for recent SDKs with "malloc tracking"
-void *pvPortMalloc(size_t sz, const char *fname, unsigned line);
-void *pvPortZalloc(size_t sz, const char *fname, unsigned line);
-void *pvPortRealloc(void *p, unsigned sz, const char *fname, unsigned line);
-void vPortFree(void *p, const char *fname, unsigned line);
-
 uint32_t SPIRead(uint32_t offset, void *buf, uint32_t len);
 uint32_t SPIWrite(uint32_t offset, const void *buf, uint32_t len);
 uint32_t SPIEraseSector(int sector);

From 2c139bbf4e5724ab253b5b034ce925e04267a9c4 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 30 Nov 2021 00:31:46 +1100
Subject: [PATCH 1519/3533] py/mpz: Fix bugs with bitwise of -0 by ensuring all
 0's are positive.

This commit makes sure that the value zero is always encoded in an mpz_t as
neg=0 and len=0 (previously it was just len=0).

This invariant is needed for some of the bitwise operations that operate on
negative numbers, because they cannot handle -0.  For example
(-((1<<100)-(1<<100)))|1 was being computed as -65535, instead of 1.

Fixes issue #8042.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/mpz.c                        | 19 ++++++++-------
 py/mpz.h                        |  3 ++-
 tests/basics/int_big_zeroone.py | 41 +++++++++++++++++++++++++++++++--
 3 files changed, 52 insertions(+), 11 deletions(-)

diff --git a/py/mpz.c b/py/mpz.c
index 75e1fb1fdb60f..b61997e2fd4ed 100644
--- a/py/mpz.c
+++ b/py/mpz.c
@@ -713,6 +713,7 @@ void mpz_set(mpz_t *dest, const mpz_t *src) {
 
 void mpz_set_from_int(mpz_t *z, mp_int_t val) {
     if (val == 0) {
+        z->neg = 0;
         z->len = 0;
         return;
     }
@@ -899,10 +900,6 @@ bool mpz_is_even(const mpz_t *z) {
 #endif
 
 int mpz_cmp(const mpz_t *z1, const mpz_t *z2) {
-    // to catch comparison of -0 with +0
-    if (z1->len == 0 && z2->len == 0) {
-        return 0;
-    }
     int cmp = (int)z2->neg - (int)z1->neg;
     if (cmp != 0) {
         return cmp;
@@ -1052,7 +1049,9 @@ void mpz_neg_inpl(mpz_t *dest, const mpz_t *z) {
     if (dest != z) {
         mpz_set(dest, z);
     }
-    dest->neg = 1 - dest->neg;
+    if (dest->len) {
+        dest->neg = 1 - dest->neg;
+    }
 }
 
 /* computes dest = ~z (= -z - 1)
@@ -1148,7 +1147,7 @@ void mpz_add_inpl(mpz_t *dest, const mpz_t *lhs, const mpz_t *rhs) {
         dest->len = mpn_sub(dest->dig, lhs->dig, lhs->len, rhs->dig, rhs->len);
     }
 
-    dest->neg = lhs->neg;
+    dest->neg = lhs->neg & !!dest->len;
 }
 
 /* computes dest = lhs - rhs
@@ -1172,7 +1171,9 @@ void mpz_sub_inpl(mpz_t *dest, const mpz_t *lhs, const mpz_t *rhs) {
         dest->len = mpn_sub(dest->dig, lhs->dig, lhs->len, rhs->dig, rhs->len);
     }
 
-    if (neg) {
+    if (dest->len == 0) {
+        dest->neg = 0;
+    } else if (neg) {
         dest->neg = 1 - lhs->neg;
     } else {
         dest->neg = lhs->neg;
@@ -1484,14 +1485,16 @@ void mpz_divmod_inpl(mpz_t *dest_quo, mpz_t *dest_rem, const mpz_t *lhs, const m
 
     mpz_need_dig(dest_quo, lhs->len + 1); // +1 necessary?
     memset(dest_quo->dig, 0, (lhs->len + 1) * sizeof(mpz_dig_t));
+    dest_quo->neg = 0;
     dest_quo->len = 0;
     mpz_need_dig(dest_rem, lhs->len + 1); // +1 necessary?
     mpz_set(dest_rem, lhs);
     mpn_div(dest_rem->dig, &dest_rem->len, rhs->dig, rhs->len, dest_quo->dig, &dest_quo->len);
+    dest_rem->neg &= !!dest_rem->len;
 
     // check signs and do Python style modulo
     if (lhs->neg != rhs->neg) {
-        dest_quo->neg = 1;
+        dest_quo->neg = !!dest_quo->len;
         if (!mpz_is_zero(dest_rem)) {
             mpz_t mpzone;
             mpz_init_from_int(&mpzone, -1);
diff --git a/py/mpz.h b/py/mpz.h
index 425587ee9b374..d27f5724047ae 100644
--- a/py/mpz.h
+++ b/py/mpz.h
@@ -91,6 +91,7 @@ typedef int8_t mpz_dbl_dig_signed_t;
 #define MPZ_NUM_DIG_FOR_LL ((sizeof(long long) * 8 + MPZ_DIG_SIZE - 1) / MPZ_DIG_SIZE)
 
 typedef struct _mpz_t {
+    // Zero has neg=0, len=0.  Negative zero is not allowed.
     size_t neg : 1;
     size_t fixed_dig : 1;
     size_t alloc : (8 * sizeof(size_t) - 2);
@@ -119,7 +120,7 @@ static inline bool mpz_is_zero(const mpz_t *z) {
     return z->len == 0;
 }
 static inline bool mpz_is_neg(const mpz_t *z) {
-    return z->len != 0 && z->neg != 0;
+    return z->neg != 0;
 }
 int mpz_cmp(const mpz_t *lhs, const mpz_t *rhs);
 
diff --git a/tests/basics/int_big_zeroone.py b/tests/basics/int_big_zeroone.py
index 7e0b7a720ec8c..81381526b9792 100644
--- a/tests/basics/int_big_zeroone.py
+++ b/tests/basics/int_big_zeroone.py
@@ -1,4 +1,4 @@
-# test [0,-0,1,-1] edge cases of bignum
+# test [0,1,-1] edge cases of bignum
 
 long_zero = (2**64) >> 65
 long_neg_zero = -long_zero
@@ -13,7 +13,7 @@
 print([c >> 1 for c in cases])
 print([c << 1 for c in cases])
 
-# comparison of 0/-0/+0
+# comparison of 0
 print(long_zero == 0)
 print(long_neg_zero == 0)
 print(long_one - 1 == 0)
@@ -26,3 +26,40 @@
 print(long_neg_zero < -1)
 print(long_neg_zero > 1)
 print(long_neg_zero > -1)
+
+# generate zeros that involve negative numbers
+large = 1 << 70
+large_plus_one = large + 1
+zeros = (
+    large - large,
+    -large + large,
+    large + -large,
+    -(large - large),
+    large - large_plus_one + 1,
+    -large & (large - large),
+    -large ^ -large,
+    -large * (large - large),
+    (large - large) // -large,
+    -large // -large_plus_one,
+    -(large + large) % large,
+    (large + large) % -large,
+    -(large + large) % -large,
+)
+print(zeros)
+
+# compute arithmetic operations that may have problems with -0
+# (this checks that -0 is never generated in the zeros tuple)
+cases = (0, 1, -1) + zeros
+for lhs in cases:
+    print("-{} = {}".format(lhs, -lhs))
+    print("~{} = {}".format(lhs, ~lhs))
+    print("{} >> 1 = {}".format(lhs, lhs >> 1))
+    print("{} << 1 = {}".format(lhs, lhs << 1))
+    for rhs in cases:
+        print("{} == {} = {}".format(lhs, rhs, lhs == rhs))
+        print("{} + {} = {}".format(lhs, rhs, lhs + rhs))
+        print("{} - {} = {}".format(lhs, rhs, lhs - rhs))
+        print("{} * {} = {}".format(lhs, rhs, lhs * rhs))
+        print("{} | {} = {}".format(lhs, rhs, lhs | rhs))
+        print("{} & {} = {}".format(lhs, rhs, lhs & rhs))
+        print("{} ^ {} = {}".format(lhs, rhs, lhs ^ rhs))

From c768704cfdcb6dcafc0c972c6818fe4dd5b39034 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 21 Dec 2021 18:00:11 +1100
Subject: [PATCH 1520/3533] tests/basics/int_big_cmp.py: Add more tests for
 big-int comparison.

To improve coverage of mpz_cmp and mpn_cmp.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/basics/int_big_cmp.py | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/tests/basics/int_big_cmp.py b/tests/basics/int_big_cmp.py
index 7cb7412bdfb19..d7394d3bc8fd7 100644
--- a/tests/basics/int_big_cmp.py
+++ b/tests/basics/int_big_cmp.py
@@ -1,10 +1,13 @@
 # test bignum comparisons
 
 i = 1 << 65
+cases = (0, 1, -1, i, -i, i + 1, -(i + 1))
 
-print(i == 0)
-print(i != 0)
-print(i < 0)
-print(i > 0)
-print(i <= 0)
-print(i >= 0)
+for lhs in cases:
+    for rhs in cases:
+        print("{} == {} = {}".format(lhs, rhs, lhs == rhs))
+        print("{} != {} = {}".format(lhs, rhs, lhs != rhs))
+        print("{} < {} = {}".format(lhs, rhs, lhs < rhs))
+        print("{} > {} = {}".format(lhs, rhs, lhs > rhs))
+        print("{} <= {} = {}".format(lhs, rhs, lhs <= rhs))
+        print("{} >= {} = {}".format(lhs, rhs, lhs >= rhs))

From 4189c64869bfe9054df7126ef33b80d718f08038 Mon Sep 17 00:00:00 2001
From: IhorNehrutsa <Ihor.Nehrutsa@gmail.com>
Date: Sun, 5 Dec 2021 04:01:24 +0200
Subject: [PATCH 1521/3533] esp32/modnetwork: Synchronize WiFi AUTH_xxx
 constants with IDF values.

---
 ports/esp32/modnetwork.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/ports/esp32/modnetwork.c b/ports/esp32/modnetwork.c
index 51aaa59e87915..a16c67eeb9ab0 100644
--- a/ports/esp32/modnetwork.c
+++ b/ports/esp32/modnetwork.c
@@ -212,6 +212,13 @@ STATIC mp_obj_t esp_phy_mode(size_t n_args, const mp_obj_t *args) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(esp_phy_mode_obj, 0, 1, esp_phy_mode);
 
+#if ESP_IDF_VERSION > ESP_IDF_VERSION_VAL(4, 3, 0)
+#define TEST_WIFI_AUTH_MAX 9
+#else
+#define TEST_WIFI_AUTH_MAX 8
+#endif
+_Static_assert(WIFI_AUTH_MAX == TEST_WIFI_AUTH_MAX, "Synchronize WIFI_AUTH_XXX constants with the ESP-IDF. Look at esp-idf/components/esp_wifi/include/esp_wifi_types.h");
+
 STATIC const mp_rom_map_elem_t mp_module_network_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_network) },
     { MP_ROM_QSTR(MP_QSTR___init__), MP_ROM_PTR(&esp_initialize_obj) },
@@ -242,9 +249,10 @@ STATIC const mp_rom_map_elem_t mp_module_network_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_AUTH_WPA2_PSK), MP_ROM_INT(WIFI_AUTH_WPA2_PSK) },
     { MP_ROM_QSTR(MP_QSTR_AUTH_WPA_WPA2_PSK), MP_ROM_INT(WIFI_AUTH_WPA_WPA2_PSK) },
     { MP_ROM_QSTR(MP_QSTR_AUTH_WPA2_ENTERPRISE), MP_ROM_INT(WIFI_AUTH_WPA2_ENTERPRISE) },
-    #if 0 // TODO: Remove this #if/#endif when lastest ISP IDF will be used
     { MP_ROM_QSTR(MP_QSTR_AUTH_WPA3_PSK), MP_ROM_INT(WIFI_AUTH_WPA3_PSK) },
     { MP_ROM_QSTR(MP_QSTR_AUTH_WPA2_WPA3_PSK), MP_ROM_INT(WIFI_AUTH_WPA2_WPA3_PSK) },
+    #if ESP_IDF_VERSION > ESP_IDF_VERSION_VAL(4, 3, 0)
+    { MP_ROM_QSTR(MP_QSTR_AUTH_WAPI_PSK), MP_ROM_INT(WIFI_AUTH_WAPI_PSK) },
     #endif
     { MP_ROM_QSTR(MP_QSTR_AUTH_MAX), MP_ROM_INT(WIFI_AUTH_MAX) },
     #endif

From 09fe80d0912b2418fb704cf8e80db1712fb7523f Mon Sep 17 00:00:00 2001
From: IhorNehrutsa <Ihor.Nehrutsa@gmail.com>
Date: Sun, 12 Dec 2021 14:16:53 +0200
Subject: [PATCH 1522/3533] esp32/machine_pwm: Keep duty constant when changing
 frequency.

Save and restore the same duty cycle when the frequency (or frequency
resolution) is changed.  This allows a smooth frequency change.

Also update the esp32 PWM quickref to be clearer.
---
 docs/esp32/quickref.rst   | 14 +++++----
 ports/esp32/machine_pwm.c | 63 +++++++++++++++++++--------------------
 2 files changed, 40 insertions(+), 37 deletions(-)

diff --git a/docs/esp32/quickref.rst b/docs/esp32/quickref.rst
index 41c2fd6c65012..e74d3d81f891a 100644
--- a/docs/esp32/quickref.rst
+++ b/docs/esp32/quickref.rst
@@ -224,14 +224,18 @@ Use the :ref:`machine.PWM <machine.PWM>` class::
     from machine import Pin, PWM
 
     pwm0 = PWM(Pin(0))         # create PWM object from a pin
-    pwm0.freq()                # get current frequency (default 5kHz)
+    freq = pwm0.freq()         # get current frequency (default 5kHz)
     pwm0.freq(1000)            # set PWM frequency from 1Hz to 40MHz
-    pwm0.duty()                # get current duty cycle, range 0-1023 (default 512, 50%)
+
+    duty = pwm0.duty()         # get current duty cycle, range 0-1023 (default 512, 50%)
     pwm0.duty(256)             # set duty cycle from 0 to 1023 as a ratio duty/1023, (now 25%)
+
+    duty_u16 = pwm0.duty_u16() # get current duty cycle, range 0-65535
     pwm0.duty_u16(2**16*3//4)  # set duty cycle from 0 to 65535 as a ratio duty_u16/65535, (now 75%)
-    pwm0.duty_u16()            # get current duty cycle, range 0-65535
+
+    duty_ns = pwm0.duty_ns()   # get current pulse width in ns
     pwm0.duty_ns(250_000)      # set pulse width in nanoseconds from 0 to 1_000_000_000/freq, (now 25%)
-    pwm0.duty_ns()             # get current pulse width in ns
+
     pwm0.deinit()              # turn off PWM on the pin
 
     pwm2 = PWM(Pin(2), freq=20000, duty=512)  # create and configure in one go
@@ -246,7 +250,7 @@ Number of groups (speed modes)                                2         1
 Number of timers per group                                    4         4         4
 Number of channels per group                                  8         8         6
 -----------------------------------------------------  --------  --------  --------
-Different of PWM frequencies (groups * timers)                8         4         4
+Different PWM frequencies (groups * timers)                   8         4         4
 Total PWM channels (Pins, duties) (groups * channels)        16         8         6
 =====================================================  ========  ========  ========
 
diff --git a/ports/esp32/machine_pwm.c b/ports/esp32/machine_pwm.c
index 1cf3bc033a4fc..43d44249dc59a 100644
--- a/ports/esp32/machine_pwm.c
+++ b/ports/esp32/machine_pwm.c
@@ -85,17 +85,17 @@ STATIC ledc_timer_config_t timers[PWM_TIMER_MAX];
 // duty_u16() and duty_ns() use 16-bit resolution or less
 
 // Possible highest resolution in device
-#if CONFIG_IDF_TARGET_ESP32
-#define HIGHEST_PWM_RES (LEDC_TIMER_16_BIT) // 20 bit in fact, but 16 bit is used
+#if (LEDC_TIMER_BIT_MAX - 1) < LEDC_TIMER_16_BIT
+#define HIGHEST_PWM_RES (LEDC_TIMER_BIT_MAX - 1)
 #else
-#define HIGHEST_PWM_RES (LEDC_TIMER_14_BIT)
+#define HIGHEST_PWM_RES (LEDC_TIMER_16_BIT) // 20 bit for ESP32, but 16 bit is used
 #endif
 // Duty resolution of user interface in `duty_u16()` and `duty_u16` parameter in constructor/initializer
 #define UI_RES_16_BIT (16)
 // Maximum duty value on highest user interface resolution
 #define UI_MAX_DUTY ((1 << UI_RES_16_BIT) - 1)
 // How much to shift from the HIGHEST_PWM_RES duty resolution to the user interface duty resolution UI_RES_16_BIT
-#define UI_RES_SHIFT (16 - HIGHEST_PWM_RES) // 0 for ESP32, 2 for S2, S3, C3
+#define UI_RES_SHIFT (UI_RES_16_BIT - HIGHEST_PWM_RES) // 0 for ESP32, 2 for S2, S3, C3
 
 // If the PWM frequency is less than EMPIRIC_FREQ, then LEDC_REF_CLK_HZ(1 MHz) source is used, else LEDC_APB_CLK_HZ(80 MHz) source is used
 #define EMPIRIC_FREQ (10) // Hz
@@ -205,24 +205,19 @@ STATIC void configure_channel(machine_pwm_obj_t *self) {
 }
 
 STATIC void set_freq(machine_pwm_obj_t *self, unsigned int freq, ledc_timer_config_t *timer) {
-    // Even if the timer frequency is already set,
-    // the set_duty_x() is required to reconfigure the channel duty anyway
     if (freq != timer->freq_hz) {
-        PWM_DBG("set_freq(%d)", freq)
-
         // Find the highest bit resolution for the requested frequency
         unsigned int i = LEDC_APB_CLK_HZ; // 80 MHz
         if (freq < EMPIRIC_FREQ) {
             i = LEDC_REF_CLK_HZ; // 1 MHz
         }
 
-        #if 1
+        #if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 0, 0)
         // original code
         i /= freq;
         #else
         // See https://github.com/espressif/esp-idf/issues/7722
-        unsigned int divider = i / freq; // truncated
-        // int divider = (i + freq / 2) / freq; // rounded
+        int divider = (i + freq / 2) / freq; // rounded
         if (divider == 0) {
             divider = 1;
         }
@@ -245,6 +240,7 @@ STATIC void set_freq(machine_pwm_obj_t *self, unsigned int freq, ledc_timer_conf
         }
 
         // Configure the new resolution and frequency
+        unsigned int save_duty_resolution = timer->duty_resolution;
         timer->duty_resolution = res;
         timer->freq_hz = freq;
         timer->clk_cfg = LEDC_USE_APB_CLK;
@@ -256,7 +252,6 @@ STATIC void set_freq(machine_pwm_obj_t *self, unsigned int freq, ledc_timer_conf
         esp_err_t err = ledc_timer_config(timer);
         if (err != ESP_OK) {
             if (err == ESP_FAIL) {
-                PWM_DBG(" (timer timer->speed_mode %d, timer->timer_num %d, timer->clk_cfg %d, timer->freq_hz  %d, timer->duty_resolution %d) ", timer->speed_mode, timer->timer_num, timer->clk_cfg, timer->freq_hz, timer->duty_resolution);
                 mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("unreachable frequency %d"), freq);
             } else {
                 check_esp_err(err);
@@ -266,15 +261,17 @@ STATIC void set_freq(machine_pwm_obj_t *self, unsigned int freq, ledc_timer_conf
         if (self->mode == LEDC_LOW_SPEED_MODE) {
             check_esp_err(ledc_timer_rst(self->mode, self->timer));
         }
-    }
 
-    // Save the same duty cycle when frequency or channel are changed
-    if (self->duty_x == HIGHEST_PWM_RES) {
-        set_duty_u16(self, self->duty_u16);
-    } else if (self->duty_x == PWRES) {
-        set_duty_u10(self, self->duty_u10);
-    } else if (self->duty_x == -HIGHEST_PWM_RES) {
-        set_duty_ns(self, self->duty_ns);
+        // Save the same duty cycle when frequency is changed
+        if (save_duty_resolution != timer->duty_resolution) {
+            if (self->duty_x == HIGHEST_PWM_RES) {
+                set_duty_u16(self, self->duty_u16);
+            } else if (self->duty_x == PWRES) {
+                set_duty_u10(self, self->duty_u10);
+            } else if (self->duty_x == -HIGHEST_PWM_RES) {
+                set_duty_ns(self, self->duty_ns);
+            }
+        }
     }
 }
 
@@ -287,14 +284,12 @@ STATIC int ns_to_duty(machine_pwm_obj_t *self, int ns) {
     } else if (duty > UI_MAX_DUTY) {
         duty = UI_MAX_DUTY;
     }
-    // PWM_DBG(" ns_to_duty(UI_MAX_DUTY=%d freq_hz=%d duty=%d=%f <- ns=%d) ", UI_MAX_DUTY, timer.freq_hz, duty, (float)ns * UI_MAX_DUTY * timer.freq_hz / 1000000000.0, ns);
     return duty;
 }
 
 STATIC int duty_to_ns(machine_pwm_obj_t *self, int duty) {
     ledc_timer_config_t timer = timers[TIMER_IDX(self->mode, self->timer)];
     int64_t ns = ((int64_t)duty * 1000000000LL + (int64_t)timer.freq_hz * UI_MAX_DUTY / 2) / ((int64_t)timer.freq_hz * UI_MAX_DUTY);
-    // PWM_DBG(" duty_to_ns(UI_MAX_DUTY=%d freq_hz=%d duty=%d -> ns=%f=%d) ", UI_MAX_DUTY, timer.freq_hz, duty, (float)duty * 1000000000.0 / ((float)timer.freq_hz * UI_MAX_DUTY), ns);
     return ns;
 }
 
@@ -316,23 +311,27 @@ STATIC void set_duty_u16(machine_pwm_obj_t *self, int duty) {
     if ((duty < 0) || (duty > UI_MAX_DUTY)) {
         mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("duty_u16 must be from 0 to %d"), UI_MAX_DUTY);
     }
-    duty >>= HIGHEST_PWM_RES + UI_RES_SHIFT - timers[TIMER_IDX(self->mode, self->timer)].duty_resolution;
-    int max_duty = (1 << timers[TIMER_IDX(self->mode, self->timer)].duty_resolution) - 1;
-    if (duty < 0) {
-        duty = 0;
-    } else if (duty > max_duty) {
-        duty = max_duty;
-    }
-    check_esp_err(ledc_set_duty(self->mode, self->channel, duty));
+    ledc_timer_config_t timer = timers[TIMER_IDX(self->mode, self->timer)];
+    int channel_duty = duty >> (HIGHEST_PWM_RES + UI_RES_SHIFT - timer.duty_resolution);
+    int max_duty = (1 << timer.duty_resolution) - 1;
+    if (channel_duty < 0) {
+        channel_duty = 0;
+    } else if (channel_duty > max_duty) {
+        channel_duty = max_duty;
+    }
+    check_esp_err(ledc_set_duty(self->mode, self->channel, channel_duty));
     check_esp_err(ledc_update_duty(self->mode, self->channel));
 
     /*
     // Bug: Sometimes duty is not set right now.
+    // Not a bug. It's a feature. The duty is applied at the beginning of the next signal period.
+    // Bug: It has been experimentally established that the duty is setted during 2 signal periods, but 1 period is expected.
     // See https://github.com/espressif/esp-idf/issues/7288
     if (duty != get_duty_u16(self)) {
-        ets_delay_us(100);
+        PWM_DBG("set_duty_u16(%u), get_duty_u16():%u, channel_duty:%d, duty_resolution:%d, freq_hz:%d", duty, get_duty_u16(self), channel_duty, timer.duty_resolution, timer.freq_hz);
+        ets_delay_us(2 * 1000000 / timer.freq_hz);
         if (duty != get_duty_u16(self)) {
-            PWM_DBG(" (set_duty_u16(%u) get_duty_u16()=%u duty_resolution=%d) ", duty, get_duty_u16(self), timers[TIMER_IDX(self->mode, self->timer)].duty_resolution);
+            PWM_DBG("set_duty_u16(%u), get_duty_u16():%u, channel_duty:%d, duty_resolution:%d, freq_hz:%d", duty, get_duty_u16(self), channel_duty, timer.duty_resolution, timer.freq_hz);
         }
     }
     */

From 599b61c08687ca077e3b0e115d5b76affcc673ca Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Thu, 11 Nov 2021 23:36:27 +1100
Subject: [PATCH 1523/3533] esp32/machine_bitstream: Replace bit-bang code with
 RMT-based driver.

This aims to solve glitching issues on long neopixel strips.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/esp32/esp32_rmt.c         |   6 ++
 ports/esp32/machine_bitstream.c | 138 ++++++++++++++++++++++----------
 ports/esp32/modesp32.h          |   3 +
 3 files changed, 104 insertions(+), 43 deletions(-)

diff --git a/ports/esp32/esp32_rmt.c b/ports/esp32/esp32_rmt.c
index 37ecef324877d..1a7e77b9d23f3 100644
--- a/ports/esp32/esp32_rmt.c
+++ b/ports/esp32/esp32_rmt.c
@@ -29,6 +29,8 @@
 #include "mphalport.h"
 #include "driver/rmt.h"
 
+#include "modesp32.h"
+
 // This exposes the ESP32's RMT module to MicroPython. RMT is provided by the Espressif ESP-IDF:
 //
 //    https://docs.espressif.com/projects/esp-idf/en/latest/api-reference/peripherals/rmt.html
@@ -73,6 +75,10 @@ STATIC mp_obj_t esp32_rmt_make_new(const mp_obj_type_t *type, size_t n_args, siz
     mp_uint_t idle_level = args[3].u_bool;
     mp_obj_t tx_carrier_obj = args[4].u_obj;
 
+    if (channel_id == MICROPY_HW_ESP32_RMT_CHANNEL_BITSTREAM) {
+        mp_raise_ValueError(MP_ERROR_TEXT("reserved channel id"));
+    }
+
     if (clock_div < 1 || clock_div > 255) {
         mp_raise_ValueError(MP_ERROR_TEXT("clock_div must be between 1 and 255"));
     }
diff --git a/ports/esp32/machine_bitstream.c b/ports/esp32/machine_bitstream.c
index 9d2bb57246157..9854b83434e4c 100644
--- a/ports/esp32/machine_bitstream.c
+++ b/ports/esp32/machine_bitstream.c
@@ -24,63 +24,115 @@
  * THE SOFTWARE.
  */
 
-// This is a translation of the cycle counter implementation in ports/stm32/machine_bitstream.c.
-
 #include "py/mpconfig.h"
 #include "py/mphal.h"
 
 #if MICROPY_PY_MACHINE_BITSTREAM
 
-#define NS_TICKS_OVERHEAD (6)
+#include "driver/rmt.h"
 
-void IRAM_ATTR machine_bitstream_high_low(mp_hal_pin_obj_t pin, uint32_t *timing_ns, const uint8_t *buf, size_t len) {
-    uint32_t pin_mask, gpio_reg_set, gpio_reg_clear;
-    #if !CONFIG_IDF_TARGET_ESP32C3
-    if (pin >= 32) {
-        pin_mask = 1 << (pin - 32);
-        gpio_reg_set = GPIO_OUT1_W1TS_REG;
-        gpio_reg_clear = GPIO_OUT1_W1TC_REG;
-    } else
-    #endif
-    {
-        pin_mask = 1 << pin;
-        gpio_reg_set = GPIO_OUT_W1TS_REG;
-        gpio_reg_clear = GPIO_OUT_W1TC_REG;
-    }
+#include "modesp32.h"
 
-    // Convert ns to cpu ticks [high_time_0, period_0, high_time_1, period_1].
-    uint32_t fcpu_mhz = ets_get_cpu_frequency();
-    for (size_t i = 0; i < 4; ++i) {
-        timing_ns[i] = fcpu_mhz * timing_ns[i] / 1000;
-        if (timing_ns[i] > NS_TICKS_OVERHEAD) {
-            timing_ns[i] -= NS_TICKS_OVERHEAD;
-        }
-        if (i % 2 == 1) {
-            // Convert low_time to period (i.e. add high_time).
-            timing_ns[i] += timing_ns[i - 1];
-        }
+#if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(4, 1, 0)
+// This convenience macro was not available in earlier IDF versions.
+#define RMT_DEFAULT_CONFIG_TX(gpio, channel_id)      \
+    {                                                \
+        .rmt_mode = RMT_MODE_TX,                     \
+        .channel = channel_id,                       \
+        .clk_div = 80,                               \
+        .gpio_num = gpio,                            \
+        .mem_block_num = 1,                          \
+        .tx_config = {                               \
+            .loop_en = false,                        \
+            .carrier_freq_hz = 38000,                \
+            .carrier_duty_percent = 33,              \
+            .carrier_level = RMT_CARRIER_LEVEL_HIGH, \
+            .carrier_en = false,                     \
+            .idle_level = RMT_IDLE_LEVEL_LOW,        \
+            .idle_output_en = true,                  \
+        }                                            \
     }
+#endif
 
-    uint32_t irq_state = mp_hal_quiet_timing_enter();
+// Logical 0 and 1 values (encoded as a rmt_item32_t).
+// The duration fields will be set later.
+STATIC rmt_item32_t bitstream_high_low_0 = {{{ 0, 1, 0, 0 }}};
+STATIC rmt_item32_t bitstream_high_low_1 = {{{ 0, 1, 0, 0 }}};
 
-    for (size_t i = 0; i < len; ++i) {
-        uint8_t b = buf[i];
-        for (size_t j = 0; j < 8; ++j) {
-            GPIO_REG_WRITE(gpio_reg_set, pin_mask);
-            uint32_t start_ticks = mp_hal_ticks_cpu();
-            uint32_t *t = &timing_ns[b >> 6 & 2];
-            while (mp_hal_ticks_cpu() - start_ticks < t[0]) {
-                ;
-            }
-            GPIO_REG_WRITE(gpio_reg_clear, pin_mask);
-            b <<= 1;
-            while (mp_hal_ticks_cpu() - start_ticks < t[1]) {
-                ;
+// See https://github.com/espressif/esp-idf/blob/master/examples/common_components/led_strip/led_strip_rmt_ws2812.c
+// This is called automatically by the IDF during rmt_write_sample in order to
+// convert the byte stream to rmt_item32_t's.
+STATIC void IRAM_ATTR bitstream_high_low_rmt_adapter(const void *src, rmt_item32_t *dest, size_t src_size, size_t wanted_num, size_t *translated_size, size_t *item_num) {
+    if (src == NULL || dest == NULL) {
+        *translated_size = 0;
+        *item_num = 0;
+        return;
+    }
+
+    size_t size = 0;
+    size_t num = 0;
+    uint8_t *psrc = (uint8_t *)src;
+    rmt_item32_t *pdest = dest;
+    while (size < src_size && num < wanted_num) {
+        for (int i = 0; i < 8; i++) {
+            // MSB first
+            if (*psrc & (1 << (7 - i))) {
+                pdest->val = bitstream_high_low_1.val;
+            } else {
+                pdest->val = bitstream_high_low_0.val;
             }
+            num++;
+            pdest++;
         }
+        size++;
+        psrc++;
     }
 
-    mp_hal_quiet_timing_exit(irq_state);
+    *translated_size = size;
+    *item_num = num;
+}
+
+// Use the reserved RMT channel to stream high/low data on the specified pin.
+void machine_bitstream_high_low(mp_hal_pin_obj_t pin, uint32_t *timing_ns, const uint8_t *buf, size_t len) {
+    rmt_config_t config = RMT_DEFAULT_CONFIG_TX(pin, MICROPY_HW_ESP32_RMT_CHANNEL_BITSTREAM);
+
+    // Use 40MHz clock (although 2MHz would probably be sufficient).
+    config.clk_div = 2;
+
+    // Install the driver on this channel & pin.
+    check_esp_err(rmt_config(&config));
+    check_esp_err(rmt_driver_install(config.channel, 0, 0));
+
+    // Get the tick rate in kHz (this will likely be 40000).
+    uint32_t counter_clk_khz = 0;
+    #if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(4, 1, 0)
+    uint8_t div_cnt;
+    check_esp_err(rmt_get_clk_div(config.channel, &div_cnt));
+    counter_clk_khz = APB_CLK_FREQ / div_cnt;
+    #else
+    check_esp_err(rmt_get_counter_clock(config.channel, &counter_clk_khz));
+    #endif
+
+    counter_clk_khz /= 1000;
+
+    // Convert nanoseconds to pulse duration.
+    bitstream_high_low_0.duration0 = (counter_clk_khz * timing_ns[0]) / 1e6;
+    bitstream_high_low_0.duration1 = (counter_clk_khz * timing_ns[1]) / 1e6;
+    bitstream_high_low_1.duration0 = (counter_clk_khz * timing_ns[2]) / 1e6;
+    bitstream_high_low_1.duration1 = (counter_clk_khz * timing_ns[3]) / 1e6;
+
+    // Install the bits->highlow translator.
+    rmt_translator_init(config.channel, bitstream_high_low_rmt_adapter);
+
+    // Stream the byte data using the translator.
+    check_esp_err(rmt_write_sample(config.channel, buf, len, true));
+
+    // Wait 50% longer than we expect (if every bit takes the maximum time).
+    uint32_t timeout_ms = (3 * len / 2) * (1 + (8 * MAX(timing_ns[0] + timing_ns[1], timing_ns[2] + timing_ns[3])) / 1000);
+    check_esp_err(rmt_wait_tx_done(config.channel, pdMS_TO_TICKS(timeout_ms)));
+
+    // Uninstall the driver.
+    check_esp_err(rmt_driver_uninstall(config.channel));
 }
 
 #endif // MICROPY_PY_MACHINE_BITSTREAM
diff --git a/ports/esp32/modesp32.h b/ports/esp32/modesp32.h
index 18bd62ee41640..86979f0b3e066 100644
--- a/ports/esp32/modesp32.h
+++ b/ports/esp32/modesp32.h
@@ -31,4 +31,7 @@ extern const mp_obj_type_t esp32_partition_type;
 extern const mp_obj_type_t esp32_rmt_type;
 extern const mp_obj_type_t esp32_ulp_type;
 
+// Reserve the last channel for machine.bitstream.
+#define MICROPY_HW_ESP32_RMT_CHANNEL_BITSTREAM (RMT_CHANNEL_MAX - 1)
+
 #endif // MICROPY_INCLUDED_ESP32_MODESP32_H

From 7566d107d5acc82a45df0dd5c5803bf5d2564043 Mon Sep 17 00:00:00 2001
From: Michael Bentley <mikebentley15@gmail.com>
Date: Sun, 3 Oct 2021 00:06:40 -0600
Subject: [PATCH 1524/3533] tools/mpremote: Add mkdir and rmdir to RemoteFS.

This allows the remote MicroPython instance to create and delete
directories from the mounted host filesystem in addition to the already
existing functionality of reading, creating, and modifying files.

Signed-off-by: Michael Bentley <mikebentley15@gmail.com>
---
 tools/mpremote/mpremote/pyboardextended.py | 44 ++++++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/tools/mpremote/mpremote/pyboardextended.py b/tools/mpremote/mpremote/pyboardextended.py
index 70e3748ec810a..41f360e5fdd4b 100644
--- a/tools/mpremote/mpremote/pyboardextended.py
+++ b/tools/mpremote/mpremote/pyboardextended.py
@@ -21,6 +21,8 @@
     "CMD_SEEK": 8,
     "CMD_REMOVE": 9,
     "CMD_RENAME": 10,
+    "CMD_MKDIR": 11,
+    "CMD_RMDIR": 12,
 }
 
 fs_hook_code = """\
@@ -265,6 +267,24 @@ def rename(self, old, new):
         if res < 0:
             raise OSError(-res)
 
+    def mkdir(self, path):
+        c = self.cmd
+        c.begin(CMD_MKDIR)
+        c.wr_str(self.path + path)
+        res = c.rd_s32()
+        c.end()
+        if res < 0:
+            raise OSError(-res)
+
+    def rmdir(self, path):
+        c = self.cmd
+        c.begin(CMD_RMDIR)
+        c.wr_str(self.path + path)
+        res = c.rd_s32()
+        c.end()
+        if res < 0:
+            raise OSError(-res)
+
     def stat(self, path):
         c = self.cmd
         c.begin(CMD_STAT)
@@ -501,6 +521,28 @@ def do_rename(self):
             ret = -abs(er.errno)
         self.wr_s32(ret)
 
+    def do_mkdir(self):
+        path = self.root + self.rd_str()
+        # self.log_cmd(f"mkdir {path}")
+        try:
+            self.path_check(path)
+            os.mkdir(path)
+            ret = 0
+        except OSError as er:
+            ret = -abs(er.errno)
+        self.wr_s32(ret)
+
+    def do_rmdir(self):
+        path = self.root + self.rd_str()
+        # self.log_cmd(f"rmdir {path}")
+        try:
+            self.path_check(path)
+            os.rmdir(path)
+            ret = 0
+        except OSError as er:
+            ret = -abs(er.errno)
+        self.wr_s32(ret)
+
     cmd_table = {
         fs_hook_cmds["CMD_STAT"]: do_stat,
         fs_hook_cmds["CMD_ILISTDIR_START"]: do_ilistdir_start,
@@ -512,6 +554,8 @@ def do_rename(self):
         fs_hook_cmds["CMD_SEEK"]: do_seek,
         fs_hook_cmds["CMD_REMOVE"]: do_remove,
         fs_hook_cmds["CMD_RENAME"]: do_rename,
+        fs_hook_cmds["CMD_MKDIR"]: do_mkdir,
+        fs_hook_cmds["CMD_RMDIR"]: do_rmdir,
     }
 
 

From 74e995dfd26c7c9304392b2073ec4558173b699c Mon Sep 17 00:00:00 2001
From: Sergei Silnov <po@kumekay.com>
Date: Sun, 5 Sep 2021 14:11:35 +0200
Subject: [PATCH 1525/3533] tools/mpremote: Add help command.

Fixes issue #7480
---
 tools/mpremote/README.md        |   6 +-
 tools/mpremote/mpremote/main.py | 126 ++++++++++++++++++++++----------
 2 files changed, 94 insertions(+), 38 deletions(-)

diff --git a/tools/mpremote/README.md b/tools/mpremote/README.md
index a6aaa1755df5e..c294b20811821 100644
--- a/tools/mpremote/README.md
+++ b/tools/mpremote/README.md
@@ -27,6 +27,7 @@ The full list of supported commands are:
                                             --capture <file>
                                             --inject-code <string>
                                             --inject-file <file>
+    mpremote help                    -- print list of commands and exit
 
 Multiple commands can be specified and they will be run sequentially.  Connection
 and disconnection will be done automatically at the start and end of the execution
@@ -50,7 +51,10 @@ Any user configuration, including user-defined shortcuts, can be placed in
     commands = {
         "c33": "connect id:334D335C3138",
         "bl": "bootloader",
-        "double x=4": "eval x*2",
+        "double x=4": {
+            "command": "eval x*2",
+            "help": "multiply by two"
+        }
     }
 
 Examples:
diff --git a/tools/mpremote/mpremote/main.py b/tools/mpremote/mpremote/main.py
index 6e2df5179d230..5655bffbf3b45 100644
--- a/tools/mpremote/mpremote/main.py
+++ b/tools/mpremote/mpremote/main.py
@@ -18,6 +18,9 @@
 """
 
 import os, sys
+from collections.abc import Mapping
+from textwrap import dedent
+
 import serial.tools.list_ports
 
 from . import pyboardextended as pyboard
@@ -25,21 +28,42 @@
 
 _PROG = "mpremote"
 
+_COMMANDS = {
+    "connect": (
+        False,
+        False,
+        1,
+        """\
+        connect to given device
+        device may be: list, auto, id:x, port:x
+        or any valid device name/path""",
+    ),
+    "disconnect": (False, False, 0, "disconnect current device"),
+    "mount": (True, False, 1, "mount local directory on device"),
+    "repl": (
+        False,
+        True,
+        0,
+        """\
+        enter REPL
+        options:
+            --capture <file>
+            --inject-code <string>
+            --inject-file <file>""",
+    ),
+    "eval": (True, True, 1, "evaluate and print the string"),
+    "exec": (True, True, 1, "execute the string"),
+    "run": (True, True, 1, "run the given local script"),
+    "fs": (True, True, 1, "execute filesystem commands on the device"),
+    "help": (False, False, 0, "print help and exit"),
+}
+
 _BUILTIN_COMMAND_EXPANSIONS = {
     # Device connection shortcuts.
-    "devs": "connect list",
-    "a0": "connect /dev/ttyACM0",
-    "a1": "connect /dev/ttyACM1",
-    "a2": "connect /dev/ttyACM2",
-    "a3": "connect /dev/ttyACM3",
-    "u0": "connect /dev/ttyUSB0",
-    "u1": "connect /dev/ttyUSB1",
-    "u2": "connect /dev/ttyUSB2",
-    "u3": "connect /dev/ttyUSB3",
-    "c0": "connect COM0",
-    "c1": "connect COM1",
-    "c2": "connect COM2",
-    "c3": "connect COM3",
+    "devs": {
+        "command": "connect list",
+        "help": "list available serial ports",
+    },
     # Filesystem shortcuts.
     "cat": "fs cat",
     "ls": "fs ls",
@@ -52,22 +76,35 @@
         "import uos\nprint('mount \\tsize \\tused \\tavail \\tuse%')\nfor _m in [''] + uos.listdir('/'):\n _s = uos.stat('/' + _m)\n if not _s[0] & 1 << 14: continue\n _s = uos.statvfs(_m)\n if _s[0]:\n  _size = _s[0] * _s[2]; _free = _s[0] * _s[3]; print(_m, _size, _size - _free, _free, int(100 * (_size - _free) / _size), sep='\\t')",
     ],
     # Other shortcuts.
-    "reset t_ms=100": [
-        "exec",
-        "--no-follow",
-        "import utime, umachine; utime.sleep_ms(t_ms); umachine.reset()",
-    ],
-    "bootloader t_ms=100": [
-        "exec",
-        "--no-follow",
-        "import utime, umachine; utime.sleep_ms(t_ms); umachine.bootloader()",
-    ],
+    "reset t_ms=100": {
+        "command": [
+            "exec",
+            "--no-follow",
+            "import utime, umachine; utime.sleep_ms(t_ms); umachine.reset()",
+        ],
+        "help": "reset the device after delay",
+    },
+    "bootloader t_ms=100": {
+        "command": [
+            "exec",
+            "--no-follow",
+            "import utime, umachine; utime.sleep_ms(t_ms); umachine.bootloader()",
+        ],
+        "help": "make the device enter its bootloader",
+    },
     "setrtc": [
         "exec",
         "import machine; machine.RTC().datetime((2020, 1, 1, 0, 10, 0, 0, 0))",
     ],
 }
 
+for port_num in range(4):
+    for prefix, port in [("a", "/dev/ttyACM"), ("u", "/dev/ttyUSB"), ("c", "COM")]:
+        _BUILTIN_COMMAND_EXPANSIONS["{}{}".format(prefix, port_num)] = {
+            "command": "connect {}{}".format(port, port_num),
+            "help": 'connect to serial port "{}{}"'.format(port, port_num),
+        }
+
 
 def load_user_config():
     # Create empty config object.
@@ -111,9 +148,14 @@ def prepare_command_expansions(config):
                 args = ()
             else:
                 args = tuple(c.split("=") for c in cmd[1:])
+
+            help_message = ""
+            if isinstance(sub, Mapping):
+                help_message = sub.get("help", "")
+                sub = sub["command"]
             if isinstance(sub, str):
                 sub = sub.split()
-            _command_expansions[cmd[0]] = (args, sub)
+            _command_expansions[cmd[0]] = (args, sub, help_message)
 
 
 def do_command_expansion(args):
@@ -126,7 +168,7 @@ def usage_error(cmd, exp_args, msg):
     pre = []
     while args and args[0] in _command_expansions:
         cmd = args.pop(0)
-        exp_args, exp_sub = _command_expansions[cmd]
+        exp_args, exp_sub, _ = _command_expansions[cmd]
         for exp_arg in exp_args:
             exp_arg_name = exp_arg[0]
             if args and "=" not in args[0]:
@@ -365,6 +407,24 @@ def execbuffer(pyb, buf, follow):
     return ret_val
 
 
+def print_help():
+    def print_commands_help(cmds, help_idx):
+        max_command_len = max(len(cmd) for cmd in cmds.keys())
+        for cmd in sorted(cmds.keys()):
+            help_message_lines = dedent(cmds[cmd][help_idx]).split("\n")
+            help_message = help_message_lines[0]
+            for line in help_message_lines[1:]:
+                help_message = "{}\n{}{}".format(help_message, " " * (max_command_len + 4), line)
+            print("  ", cmd, " " * (max_command_len - len(cmd) + 2), help_message, sep="")
+
+    print(_PROG, "-- MicroPython remote control")
+    print("\nList of commands:")
+    print_commands_help(_COMMANDS, 3)
+
+    print("\nList of shortcuts:")
+    print_commands_help(_command_expansions, 2)
+
+
 def main():
     config = load_user_config()
     prepare_command_expansions(config)
@@ -376,20 +436,9 @@ def main():
     try:
         while args:
             do_command_expansion(args)
-
-            cmds = {
-                "connect": (False, False, 1),
-                "disconnect": (False, False, 0),
-                "mount": (True, False, 1),
-                "repl": (False, True, 0),
-                "eval": (True, True, 1),
-                "exec": (True, True, 1),
-                "run": (True, True, 1),
-                "fs": (True, True, 1),
-            }
             cmd = args.pop(0)
             try:
-                need_raw_repl, is_action, num_args_min = cmds[cmd]
+                need_raw_repl, is_action, num_args_min, _ = _COMMANDS[cmd]
             except KeyError:
                 print(f"{_PROG}: '{cmd}' is not a command")
                 return 1
@@ -405,6 +454,9 @@ def main():
                 if pyb is None:
                     did_action = True
                 continue
+            elif cmd == "help":
+                print_help()
+                sys.exit(0)
 
             if pyb is None:
                 pyb = do_connect(["auto"])

From 028776d97b284d2fda053dd7daa4c72591f0115e Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 29 Dec 2021 23:35:24 +1100
Subject: [PATCH 1526/3533] tools/mpremote: Add link to mpremote docs URL in
 help message.

Signed-off-by: Damien George <damien@micropython.org>
---
 tools/mpremote/mpremote/main.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tools/mpremote/mpremote/main.py b/tools/mpremote/mpremote/main.py
index 5655bffbf3b45..99e7bcd9bcf6d 100644
--- a/tools/mpremote/mpremote/main.py
+++ b/tools/mpremote/mpremote/main.py
@@ -418,6 +418,8 @@ def print_commands_help(cmds, help_idx):
             print("  ", cmd, " " * (max_command_len - len(cmd) + 2), help_message, sep="")
 
     print(_PROG, "-- MicroPython remote control")
+    print("See https://docs.micropython.org/en/latest/reference/mpremote.html")
+
     print("\nList of commands:")
     print_commands_help(_COMMANDS, 3)
 

From aac5a97d08f9f28b7c3f170d007be0b538349937 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 21 Dec 2021 23:07:00 +1100
Subject: [PATCH 1527/3533] ports: Move '.frozen' to second entry in sys.path.

In commit 86ce4426079b1b368881c22f46d80045e2f720b0 the '.frozen' entry was
added at the start of sys.path, to allow control over when frozen modules
are searched during import, and retain existing behaviour whereby frozen
was searched before the filesystem.

But Python semantics of sys.path require sys.path[0] to be the directory of
the currently executing script, or ''.

This commit moves the '.frozen' entry to second place in sys.path, so
sys.path[0] retains its correct value (described above).

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/unix/main.c                             | 11 +++++------
 ports/unix/mpconfigport.h                     |  2 +-
 ports/unix/variants/minimal/mpconfigvariant.h |  2 +-
 ports/windows/mpconfigport.h                  |  2 +-
 py/runtime.c                                  |  2 +-
 tests/basics/sys_path.py                      | 16 ++++++++++++++++
 tests/run-tests.py                            |  2 +-
 7 files changed, 26 insertions(+), 11 deletions(-)
 create mode 100644 tests/basics/sys_path.py

diff --git a/ports/unix/main.c b/ports/unix/main.c
index cecb806283eb5..b2790791af856 100644
--- a/ports/unix/main.c
+++ b/ports/unix/main.c
@@ -497,7 +497,7 @@ MP_NOINLINE int main_(int argc, char **argv) {
     if (path == NULL) {
         path = MICROPY_PY_SYS_PATH_DEFAULT;
     }
-    size_t path_num = 2; // [0] is frozen, [1] is for current dir (or base dir of the script)
+    size_t path_num = 1; // [0] is for current dir (or base dir of the script)
     if (*path == PATHLIST_SEP_CHAR) {
         path_num++;
     }
@@ -510,11 +510,10 @@ MP_NOINLINE int main_(int argc, char **argv) {
     mp_obj_list_init(MP_OBJ_TO_PTR(mp_sys_path), path_num);
     mp_obj_t *path_items;
     mp_obj_list_get(mp_sys_path, &path_num, &path_items);
-    path_items[0] = MP_OBJ_NEW_QSTR(MP_QSTR__dot_frozen);
-    path_items[1] = MP_OBJ_NEW_QSTR(MP_QSTR_);
+    path_items[0] = MP_OBJ_NEW_QSTR(MP_QSTR_);
     {
         char *p = path;
-        for (mp_uint_t i = 2; i < path_num; i++) {
+        for (mp_uint_t i = 1; i < path_num; i++) {
             char *p1 = strchr(p, PATHLIST_SEP_CHAR);
             if (p1 == NULL) {
                 p1 = p + strlen(p);
@@ -655,9 +654,9 @@ MP_NOINLINE int main_(int argc, char **argv) {
                 break;
             }
 
-            // Set base dir of the script as second entry in sys.path.
+            // Set base dir of the script as first entry in sys.path.
             char *p = strrchr(basedir, '/');
-            path_items[1] = mp_obj_new_str_via_qstr(basedir, p - basedir);
+            path_items[0] = mp_obj_new_str_via_qstr(basedir, p - basedir);
             free(pathbuf);
 
             set_sys_argv(argv, argc, a);
diff --git a/ports/unix/mpconfigport.h b/ports/unix/mpconfigport.h
index a995ac52cc64a..658cb680f1473 100644
--- a/ports/unix/mpconfigport.h
+++ b/ports/unix/mpconfigport.h
@@ -125,7 +125,7 @@
 #endif
 #endif
 #ifndef MICROPY_PY_SYS_PATH_DEFAULT
-#define MICROPY_PY_SYS_PATH_DEFAULT "~/.micropython/lib:/usr/lib/micropython"
+#define MICROPY_PY_SYS_PATH_DEFAULT ".frozen:~/.micropython/lib:/usr/lib/micropython"
 #endif
 #define MICROPY_PY_SYS_MAXSIZE      (1)
 #define MICROPY_PY_SYS_STDFILES     (1)
diff --git a/ports/unix/variants/minimal/mpconfigvariant.h b/ports/unix/variants/minimal/mpconfigvariant.h
index 4766b8e8953aa..e0db3756ca7ac 100644
--- a/ports/unix/variants/minimal/mpconfigvariant.h
+++ b/ports/unix/variants/minimal/mpconfigvariant.h
@@ -89,7 +89,7 @@
 #define MICROPY_PY_SYS_EXIT         (0)
 #define MICROPY_PY_SYS_PLATFORM     "linux"
 #ifndef MICROPY_PY_SYS_PATH_DEFAULT
-#define MICROPY_PY_SYS_PATH_DEFAULT "~/.micropython/lib:/usr/lib/micropython"
+#define MICROPY_PY_SYS_PATH_DEFAULT ".frozen:~/.micropython/lib:/usr/lib/micropython"
 #endif
 #define MICROPY_PY_SYS_MAXSIZE      (0)
 #define MICROPY_PY_SYS_STDFILES     (0)
diff --git a/ports/windows/mpconfigport.h b/ports/windows/mpconfigport.h
index 30d8e09e6d8ee..f22af9b7fc18a 100644
--- a/ports/windows/mpconfigport.h
+++ b/ports/windows/mpconfigport.h
@@ -90,7 +90,7 @@
 #define MICROPY_PY_SYS_ATEXIT       (1)
 #define MICROPY_PY_SYS_PLATFORM     "win32"
 #ifndef MICROPY_PY_SYS_PATH_DEFAULT
-#define MICROPY_PY_SYS_PATH_DEFAULT "~/.micropython/lib"
+#define MICROPY_PY_SYS_PATH_DEFAULT ".frozen;~/.micropython/lib"
 #endif
 #define MICROPY_PY_SYS_MAXSIZE      (1)
 #define MICROPY_PY_SYS_STDFILES     (1)
diff --git a/py/runtime.c b/py/runtime.c
index 7607ffb191bde..8c93f539e04e6 100644
--- a/py/runtime.c
+++ b/py/runtime.c
@@ -124,10 +124,10 @@ void mp_init(void) {
 
     #if MICROPY_PY_SYS_PATH_ARGV_DEFAULTS
     mp_obj_list_init(MP_OBJ_TO_PTR(mp_sys_path), 0);
+    mp_obj_list_append(mp_sys_path, MP_OBJ_NEW_QSTR(MP_QSTR_)); // current dir (or base dir of the script)
     #if MICROPY_MODULE_FROZEN
     mp_obj_list_append(mp_sys_path, MP_OBJ_NEW_QSTR(MP_QSTR__dot_frozen));
     #endif
-    mp_obj_list_append(mp_sys_path, MP_OBJ_NEW_QSTR(MP_QSTR_)); // current dir (or base dir of the script)
     mp_obj_list_init(MP_OBJ_TO_PTR(mp_sys_argv), 0);
     #endif
 
diff --git a/tests/basics/sys_path.py b/tests/basics/sys_path.py
new file mode 100644
index 0000000000000..6456e24019707
--- /dev/null
+++ b/tests/basics/sys_path.py
@@ -0,0 +1,16 @@
+# test sys.path
+
+try:
+    import usys as sys
+except ImportError:
+    import sys
+
+# check that this script was executed from a file of the same name
+if "__file__" not in globals() or "sys_path.py" not in __file__:
+    print("SKIP")
+    raise SystemExit
+
+# test that sys.path[0] is the directory containing this script
+with open(sys.path[0] + "/sys_path.py") as f:
+    for _ in range(4):
+        print(f.readline())
diff --git a/tests/run-tests.py b/tests/run-tests.py
index a8a31c0ae5c9f..6f3c09d1da52d 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -852,7 +852,7 @@ def main():
 
     if not args.keep_path:
         # clear search path to make sure tests use only builtin modules and those in extmod
-        os.environ["MICROPYPATH"] = os.pathsep + base_path("../extmod")
+        os.environ["MICROPYPATH"] = ".frozen" + os.pathsep + base_path("../extmod")
 
     try:
         os.makedirs(args.result_dir, exist_ok=True)

From 959e6f7da91a8b751084c33a6ed0db807f72b0b9 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 21 Dec 2021 23:16:51 +1100
Subject: [PATCH 1528/3533] tools/upip.py: Skip '.frozen' entry in sys.path for
 install path.

Signed-off-by: Damien George <damien@micropython.org>
---
 tools/upip.py | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/tools/upip.py b/tools/upip.py
index a6d4c93ae3bdf..9fb87264201eb 100644
--- a/tools/upip.py
+++ b/tools/upip.py
@@ -262,6 +262,8 @@ def get_install_path():
     if install_path is None:
         # sys.path[0] is current module's path
         install_path = sys.path[1]
+        if install_path == ".frozen":
+            install_path = sys.path[2]
     install_path = expandhome(install_path)
     return install_path
 
@@ -281,11 +283,11 @@ def help():
 Usage: micropython -m upip install [-p <path>] <package>... | -r <requirements.txt>
 import upip; upip.install(package_or_list, [<path>])
 
-If <path> is not given, packages will be installed into sys.path[1]
-(can be set from MICROPYPATH environment variable, if current system
-supports that)."""
+If <path> isn't given, packages will be installed to sys.path[1], or
+sys.path[2] if the former is .frozen (path can be set from MICROPYPATH
+environment variable if supported)."""
     )
-    print("Current value of sys.path[1]:", sys.path[1])
+    print("Default install path:", get_install_path())
     print(
         """\
 

From 8af9dbbde1fca07371aa13a8276c8e764edac28c Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Wed, 29 Dec 2021 23:38:16 +0200
Subject: [PATCH 1529/3533] stm32/network_wiznet5k: Fix build error with
 wiznet5k and lwip enabled.

Commit 4dba04a50fea01f6f8fec83d64f958f8d14e285a refactored the network code
but the combination of MICROPY_PY_WIZNET5K=5500 and MICROPY_PY_LWIP=1
broke.
---
 ports/stm32/mpconfigport.h     | 4 ++++
 ports/stm32/mpnetworkport.c    | 4 ++++
 ports/stm32/network_wiznet5k.c | 4 ++--
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/ports/stm32/mpconfigport.h b/ports/stm32/mpconfigport.h
index 6639b92413cde..b1a38713dcc14 100644
--- a/ports/stm32/mpconfigport.h
+++ b/ports/stm32/mpconfigport.h
@@ -253,7 +253,11 @@ extern const struct _mp_obj_type_t mp_network_cyw43_type;
 #endif
 
 #if MICROPY_PY_WIZNET5K
+#if MICROPY_PY_LWIP
+extern const struct _mp_obj_type_t mod_network_nic_type_wiznet5k;
+#else
 extern const struct _mod_network_nic_type_t mod_network_nic_type_wiznet5k;
+#endif
 #define MICROPY_HW_NIC_WIZNET5K             { MP_ROM_QSTR(MP_QSTR_WIZNET5K), MP_ROM_PTR(&mod_network_nic_type_wiznet5k) },
 #else
 #define MICROPY_HW_NIC_WIZNET5K
diff --git a/ports/stm32/mpnetworkport.c b/ports/stm32/mpnetworkport.c
index a5ee15bc67df8..c879c5005546c 100644
--- a/ports/stm32/mpnetworkport.c
+++ b/ports/stm32/mpnetworkport.c
@@ -48,6 +48,10 @@
 // Poll lwIP every 128ms
 #define LWIP_TICK(tick) (((tick) & ~(SYSTICK_DISPATCH_NUM_SLOTS - 1) & 0x7f) == 0)
 
+#if MICROPY_PY_WIZNET5K
+void wiznet5k_poll(void);
+#endif
+
 u32_t sys_now(void) {
     return mp_hal_ticks_ms();
 }
diff --git a/ports/stm32/network_wiznet5k.c b/ports/stm32/network_wiznet5k.c
index b6f1498effa0d..a529191557ba9 100644
--- a/ports/stm32/network_wiznet5k.c
+++ b/ports/stm32/network_wiznet5k.c
@@ -269,7 +269,7 @@ STATIC mp_obj_t wiznet5k_make_new(const mp_obj_type_t *type, size_t n_args, size
     mp_hal_pin_obj_t rst = pin_find(args[2]);
 
     // Access the existing object, if it has been constructed with the same hardware interface
-    if (wiznet5k_obj.base.type == &mod_network_nic_type_wiznet5k) {
+    if (wiznet5k_obj.base.type == (mp_obj_type_t *)&mod_network_nic_type_wiznet5k) {
         if (!(wiznet5k_obj.spi == spi && wiznet5k_obj.cs == cs && wiznet5k_obj.rst == rst
               && wiznet5k_obj.netif.flags != 0)) {
             wiznet5k_deinit();
@@ -277,7 +277,7 @@ STATIC mp_obj_t wiznet5k_make_new(const mp_obj_type_t *type, size_t n_args, size
     }
 
     // Init the wiznet5k object
-    wiznet5k_obj.base.type = &mod_network_nic_type_wiznet5k;
+    wiznet5k_obj.base.type = (mp_obj_type_t *)&mod_network_nic_type_wiznet5k;
     wiznet5k_obj.cris_state = 0;
     wiznet5k_obj.spi = spi;
     wiznet5k_obj.cs = cs;

From a29c70c9b40b9f6cab9789805e445683418580f0 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 23 Dec 2021 17:09:05 +1100
Subject: [PATCH 1530/3533] esp8266: Allow building a board to any dest
 directory.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp8266/boards/esp8266_common.ld  |  4 ++--
 tools/autobuild/build-esp8266-latest.sh | 13 ++++---------
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/ports/esp8266/boards/esp8266_common.ld b/ports/esp8266/boards/esp8266_common.ld
index f40ff1e5fce14..ae1509faee7d7 100644
--- a/ports/esp8266/boards/esp8266_common.ld
+++ b/ports/esp8266/boards/esp8266_common.ld
@@ -144,7 +144,7 @@ SECTIONS
         *shared/timeutils/*.o*(.literal*, .text*)
         *drivers/bus/*.o(.literal* .text*)
 
-        build-*/main.o(.literal* .text*)
+        */main.o(.literal* .text*)
         *fatfs_port.o(.literal* .text*)
         *gccollect.o(.literal* .text*)
         *gchelper.o(.literal* .text*)
@@ -182,7 +182,7 @@ SECTIONS
         */frozen.o(.rodata.mp_frozen_content) /* frozen modules */
 
         /* for -mforce-l32 */
-        build-*/*.o(.rodata*)
+        */*.o(.rodata*)
 
         _irom0_text_end = ABSOLUTE(.);
     } >irom0_0_seg :irom0_0_phdr
diff --git a/tools/autobuild/build-esp8266-latest.sh b/tools/autobuild/build-esp8266-latest.sh
index fe79587fd1cb4..72c6ee98863e6 100755
--- a/tools/autobuild/build-esp8266-latest.sh
+++ b/tools/autobuild/build-esp8266-latest.sh
@@ -13,9 +13,7 @@ function do_build() {
     shift
     shift
     echo "building $descr $board"
-    #build_dir=/tmp/esp8266-build-$board
-    build_dir=build-$board # until esp8266.ld is fixed
-    rm -rf $build_dir # be sure we don't have anything leftover from a previous build
+    build_dir=/tmp/esp8266-build-$board
     $MICROPY_AUTOBUILD_MAKE $@ BOARD=$board BUILD=$build_dir || exit 1
     mv $build_dir/firmware-combined.bin $dest_dir/$descr$fw_tag.bin
     mv $build_dir/firmware.elf $dest_dir/$descr$fw_tag.elf
@@ -29,19 +27,16 @@ function do_build_ota() {
     shift
     shift
     echo "building $descr $board"
-    #build_dir=/tmp/esp8266-build-$board
-    build_dir=build-$board # until esp8266.ld is fixed
-    rm -rf $build_dir # be sure we don't have anything leftover from a previous build
+    build_dir=/tmp/esp8266-build-$board
     $MICROPY_AUTOBUILD_MAKE $@ BOARD=$board BUILD=$build_dir || exit 1
     cat $yaota8266/yaota8266.bin $build_dir/firmware-ota.bin > $dest_dir/$descr$fw_tag.bin
-    cwd=$(pwd)
     pushd $yaota8266/ota-client
-    $PYTHON3 ota_client.py sign $cwd/$build_dir/firmware-ota.bin 
+    $PYTHON3 ota_client.py sign $build_dir/firmware-ota.bin
     popd
     mv $build_dir/firmware-ota.bin.ota $dest_dir/$descr$fw_tag.ota
     mv $build_dir/firmware.elf $dest_dir/$descr$fw_tag.elf
     mv $build_dir/firmware.map $dest_dir/$descr$fw_tag.map
-    #rm -rf $build_dir
+    rm -rf $build_dir
 }
 
 # check/get parameters

From bfe9eba48440eaf0a56bfa2e19a10bc8ba8def5a Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 23 Dec 2021 17:41:28 +1100
Subject: [PATCH 1531/3533] tools/autobuild: Build esp8266 OTA image with
 GENERIC_1M board.

Because the GENERIC board won't fit in the flash defined by esp8266_ota.ld.

Signed-off-by: Damien George <damien@micropython.org>
---
 tools/autobuild/build-esp8266-latest.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/autobuild/build-esp8266-latest.sh b/tools/autobuild/build-esp8266-latest.sh
index 72c6ee98863e6..1972e85fcd922 100755
--- a/tools/autobuild/build-esp8266-latest.sh
+++ b/tools/autobuild/build-esp8266-latest.sh
@@ -58,4 +58,4 @@ fi
 do_build esp8266 GENERIC
 do_build esp8266-512k GENERIC_512K
 do_build esp8266-1m GENERIC_1M
-do_build_ota esp8266-ota GENERIC ota
+do_build_ota esp8266-ota GENERIC_1M ota

From 05ed19e73e26c4db3ec8637c3acf2a43be8c285a Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Thu, 25 Nov 2021 12:16:29 +1100
Subject: [PATCH 1532/3533] windows: Add support for build variants to windows
 port.

Following the unix port.

Support for building variants with msvc was done by @stinos.
---
 ports/windows/Makefile                        | 24 ++++++++++--
 ports/windows/README.md                       | 20 ++++++++++
 ports/windows/micropython.vcxproj             |  2 +
 ports/windows/mpconfigport.h                  | 19 ++++++++--
 ports/windows/mpconfigport.mk                 |  7 +---
 ports/windows/msvc/common.props               |  9 +++++
 ports/windows/msvc/paths.props                |  9 +++--
 ports/windows/variants/dev/manifest.py        |  1 +
 ports/windows/variants/dev/mpconfigvariant.h  | 37 +++++++++++++++++++
 ports/windows/variants/dev/mpconfigvariant.mk |  5 +++
 .../variants/dev/mpconfigvariant.props        |  5 +++
 ports/windows/variants/manifest.py            |  0
 .../variants/standard/mpconfigvariant.h       | 28 ++++++++++++++
 .../variants/standard/mpconfigvariant.mk      |  3 ++
 .../variants/standard/mpconfigvariant.props   |  5 +++
 15 files changed, 160 insertions(+), 14 deletions(-)
 create mode 100644 ports/windows/variants/dev/manifest.py
 create mode 100644 ports/windows/variants/dev/mpconfigvariant.h
 create mode 100644 ports/windows/variants/dev/mpconfigvariant.mk
 create mode 100644 ports/windows/variants/dev/mpconfigvariant.props
 create mode 100644 ports/windows/variants/manifest.py
 create mode 100644 ports/windows/variants/standard/mpconfigvariant.h
 create mode 100644 ports/windows/variants/standard/mpconfigvariant.mk
 create mode 100644 ports/windows/variants/standard/mpconfigvariant.props

diff --git a/ports/windows/Makefile b/ports/windows/Makefile
index cb2ebc22f7c51..b1d2d35c9a1a4 100644
--- a/ports/windows/Makefile
+++ b/ports/windows/Makefile
@@ -1,11 +1,27 @@
+# Select the variant to build for.
+VARIANT ?= standard
+
+# If the build directory is not given, make it reflect the variant name.
+BUILD ?= build-$(VARIANT)
+
+VARIANT_DIR ?= variants/$(VARIANT)
+ifeq ($(wildcard $(VARIANT_DIR)/.),)
+$(error Invalid VARIANT specified: $(VARIANT_DIR))
+endif
+
 include ../../py/mkenv.mk
 -include mpconfigport.mk
+include $(VARIANT_DIR)/mpconfigvariant.mk
+
+FROZEN_MANIFEST ?= variants/manifest.py
 
-# define main target
-PROG = micropython
+# Define main target
+# This should be configured by the mpconfigvariant.mk
+PROG ?= micropython
 
 # qstr definitions (must come before including py.mk)
 QSTR_DEFS = ../unix/qstrdefsport.h
+QSTR_GLOBAL_DEPENDENCIES = $(VARIANT_DIR)/mpconfigvariant.h
 
 # include py core make definitions
 include $(TOP)/py/py.mk
@@ -13,6 +29,7 @@ include $(TOP)/py/py.mk
 INC += -I.
 INC += -I$(TOP)
 INC += -I$(BUILD)
+INC += -I$(VARIANT_DIR)
 
 # compiler settings
 CFLAGS = $(INC) -Wall -Wpointer-arith -Wdouble-promotion -Werror -std=gnu99 -DUNIX -D__USE_MINGW_ANSI_STDIO=1 $(CFLAGS_MOD) $(COPT) $(CFLAGS_EXTRA)
@@ -41,7 +58,8 @@ SRC_C = \
 	init.c \
 	sleep.c \
 	fmode.c \
-	$(SRC_MOD)
+	$(SRC_MOD) \
+	$(wildcard $(VARIANT_DIR)/*.c)
 
 OBJ = $(PY_O) $(addprefix $(BUILD)/, $(SRC_C:.c=.o))
 
diff --git a/ports/windows/README.md b/ports/windows/README.md
index 55e23de7bf15a..713ea82b87a29 100644
--- a/ports/windows/README.md
+++ b/ports/windows/README.md
@@ -71,6 +71,26 @@ To build from the command line:
     msbuild ../../mpy-cross/mpy-cross.vcxproj
     msbuild micropython.vcxproj
 
+__Variants__
+
+The msvc port supports variants (like the unix and windows mingw ports) and the one which gets built is
+controlled by the `PyVariant` msbuild property. It defaults to `standard`.
+The other variants can be built like:
+
+    msbuild micropython.vcxproj /p:PyVariant=dev
+
+Or by adding a file [Directory.build.props](https://docs.microsoft.com/en-us/visualstudio/msbuild/customize-your-build#directorybuildprops-and-directorybuildtargets) in this directory or a parent directory:
+
+```xml
+<Project>
+  <PropertyGroup>
+    <PyVariant>dev</PyVariant>
+  </PropertyGroup>
+</Project>
+```
+
+See [paths.props](msvc/paths.props) for other related variables like build and variant directories.
+
 __Stack usage__
 
 The msvc compiler is quite stack-hungry which might result in a "maximum recursion depth exceeded"
diff --git a/ports/windows/micropython.vcxproj b/ports/windows/micropython.vcxproj
index 1beca9e508d42..6817d6ed13b3d 100644
--- a/ports/windows/micropython.vcxproj
+++ b/ports/windows/micropython.vcxproj
@@ -64,6 +64,7 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros">
     <CustomPropsFile Condition="'$(CustomPropsFile)'==''">msvc/user.props</CustomPropsFile>
+    <TargetName>$(PyProg)</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile />
@@ -95,6 +96,7 @@
     <ClCompile Include="$(PyBaseDir)ports\unix\modos.c"/>
     <ClCompile Include="$(PyBaseDir)ports\unix\modtime.c"/>
     <ClCompile Include="$(PyBaseDir)ports\unix\modmachine.c" />
+    <ClCompile Include="$(PyVariantDir)*.c" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="@(PyCoreInclude)" />
diff --git a/ports/windows/mpconfigport.h b/ports/windows/mpconfigport.h
index f22af9b7fc18a..96405bc5d22b2 100644
--- a/ports/windows/mpconfigport.h
+++ b/ports/windows/mpconfigport.h
@@ -26,6 +26,9 @@
 
 // options to control how MicroPython is built
 
+// Variant-specific definitions.
+#include "mpconfigvariant.h"
+
 // By default use MicroPython version of readline
 #ifndef MICROPY_USE_READLINE
 #define MICROPY_USE_READLINE        (1)
@@ -54,9 +57,13 @@
 #define MICROPY_REPL_AUTO_INDENT    (1)
 #define MICROPY_HELPER_LEXER_UNIX   (1)
 #define MICROPY_ENABLE_SOURCE_LINE  (1)
+#ifndef MICROPY_FLOAT_IMPL
 #define MICROPY_FLOAT_IMPL          (MICROPY_FLOAT_IMPL_DOUBLE)
+#endif
 #define MICROPY_LONGINT_IMPL        (MICROPY_LONGINT_IMPL_MPZ)
+#ifndef MICROPY_STREAMS_NON_BLOCK
 #define MICROPY_STREAMS_NON_BLOCK   (1)
+#endif
 #define MICROPY_STREAMS_POSIX_API   (1)
 #define MICROPY_OPT_COMPUTED_GOTO   (0)
 #define MICROPY_MODULE_WEAK_LINKS   (1)
@@ -77,8 +84,12 @@
 #define MICROPY_PY_BUILTINS_NOTIMPLEMENTED (1)
 #define MICROPY_PY_BUILTINS_INPUT   (1)
 #define MICROPY_PY_BUILTINS_POW3    (1)
+#ifndef MICROPY_PY_BUILTINS_HELP
 #define MICROPY_PY_BUILTINS_HELP    (1)
+#endif
+#ifndef MICROPY_PY_BUILTINS_HELP_MODULES
 #define MICROPY_PY_BUILTINS_HELP_MODULES (1)
+#endif
 #define MICROPY_PY_BUILTINS_ROUND_INT (1)
 #define MICROPY_PY_MICROPYTHON_MEM_INFO (1)
 #define MICROPY_PY_ALL_SPECIAL_METHODS (1)
@@ -97,16 +108,18 @@
 #define MICROPY_PY_SYS_EXC_INFO     (1)
 #define MICROPY_PY_COLLECTIONS_DEQUE (1)
 #define MICROPY_PY_COLLECTIONS_ORDEREDDICT (1)
+#ifndef MICROPY_PY_MATH_SPECIAL_FUNCTIONS
 #define MICROPY_PY_MATH_SPECIAL_FUNCTIONS (1)
-#define MICROPY_PY_MATH_ISCLOSE     (1)
+#endif
+#define MICROPY_PY_MATH_ISCLOSE     (MICROPY_PY_MATH_SPECIAL_FUNCTIONS)
 #define MICROPY_PY_CMATH            (1)
 #define MICROPY_PY_IO_IOBASE        (1)
 #define MICROPY_PY_IO_FILEIO        (1)
 #define MICROPY_PY_GC_COLLECT_RETVAL (1)
-#define MICROPY_MODULE_FROZEN_STR   (0)
-
+#ifndef MICROPY_STACKLESS
 #define MICROPY_STACKLESS           (0)
 #define MICROPY_STACKLESS_STRICT    (0)
+#endif
 
 #define MICROPY_PY_UTIME            (1)
 #define MICROPY_PY_UTIME_MP_HAL     (1)
diff --git a/ports/windows/mpconfigport.mk b/ports/windows/mpconfigport.mk
index a2c618f143c22..3b7cf2100d7c9 100644
--- a/ports/windows/mpconfigport.mk
+++ b/ports/windows/mpconfigport.mk
@@ -1,12 +1,9 @@
 # Enable/disable modules and 3rd-party libs to be included in interpreter
 
 # Build 32-bit binaries on a 64-bit host
-MICROPY_FORCE_32BIT = 0
+MICROPY_FORCE_32BIT ?= 0
 
 # This variable can take the following values:
 #  0 - no readline, just simple stdin input
 #  1 - use MicroPython version of readline
-MICROPY_USE_READLINE = 1
-
-# ffi module requires libffi (libffi-dev Debian package)
-MICROPY_PY_FFI = 0
+MICROPY_USE_READLINE ?= 1
diff --git a/ports/windows/msvc/common.props b/ports/windows/msvc/common.props
index fcad5aeb6b7ab..ab9b055deffbf 100644
--- a/ports/windows/msvc/common.props
+++ b/ports/windows/msvc/common.props
@@ -1,7 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <!-- Variant support. For compatibility with how it works for the other ports, this gets imported
+       early so variants cannot override build options like the ones specified in the rest of this file.
+       Use CustomPropsFile (see the .vcxproj file) for that. -->
+  <PropertyGroup>
+    <PyVariant Condition="'$(PyVariant)' == ''">standard</PyVariant>
+    <PyBuild Condition="'$(PyBuild)' == ''">build-$(PyVariant)</PyBuild>
+  </PropertyGroup>
   <ImportGroup Label="PropertySheets">
     <Import Project="paths.props" Condition="'$(PyPathsIncluded)' != 'True'"/>
+    <Import Project="$(PyVariantDir)mpconfigvariant.props"/>
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
@@ -31,6 +39,7 @@
       <Destination>$(PyTargetDir)%(FileName)%(Extension)</Destination>
     </PyOutputFiles>
     <PyCookieFiles Include="$(PyBuildDir)copycookie*" Exclude="$(PyFileCopyCookie)"/>
+    <QstrDependencies Include="$(PyVariantDir)mpconfigvariant.h"/>
   </ItemGroup>
 
   <!-- Copy PyOutputFiles to their target destination.
diff --git a/ports/windows/msvc/paths.props b/ports/windows/msvc/paths.props
index cfd43b708cd9f..1a41919328875 100644
--- a/ports/windows/msvc/paths.props
+++ b/ports/windows/msvc/paths.props
@@ -11,13 +11,15 @@
           |- ports/windows [PyWinDir]
                     |- ...
                     |- micropython.exe
-                    |- build [PyBuildDir]
+                    |- build-standard [PyBuildDir]
                         |- Debugx64 [PyOutDir]
                         |   |- ...
                         |   |- micropython.exe
                         |   |- micropython.map
                         |   |- obj [PyIntDir]
                         |- genhdr
+                    |- variants
+                        |- standard [PyVariantDir]
 
          Note that the micropython executable will be copied from PyOutDir
          to PyWinDir after each build. -->
@@ -25,11 +27,12 @@
     <!-- Start from project root -->
     <PyBaseDir>$([System.IO.Path]::GetFullPath(`$(MSBuildThisFileDirectory)..\..\..`))\</PyBaseDir>
     <PyWinDir>$(PyBaseDir)ports\windows\</PyWinDir>
-    <PyBuildDir Condition="'$(PyBuildDir)' == ''">$(PyWinDir)build\</PyBuildDir>
+    <PyBuildDir Condition="'$(PyBuildDir)' == ''">$(PyWinDir)$(PyBuild)\</PyBuildDir>
+    <PyVariantDir Condition="'$(PyVariantDir)' == ''">$(PyWinDir)variants\$(PyVariant)\</PyVariantDir>
     <PyTargetDir Condition="'$(PyTargetDir)' == ''">$(PyWinDir)</PyTargetDir>
 
     <!-- All include directories needed for uPy -->
-    <PyIncDirs>$(PyIncDirs);$(PyBaseDir);$(PyWinDir);$(PyBuildDir);$(PyWinDir)msvc</PyIncDirs>
+    <PyIncDirs>$(PyIncDirs);$(PyBaseDir);$(PyWinDir);$(PyBuildDir);$(PyWinDir)msvc;$(PyVariantDir)</PyIncDirs>
 
     <!-- Within PyBuildDir different subdirectories are used based on configuration and platform.
          By default these are chosen based on the Configuration and Platform properties, but
diff --git a/ports/windows/variants/dev/manifest.py b/ports/windows/variants/dev/manifest.py
new file mode 100644
index 0000000000000..08295fc678d02
--- /dev/null
+++ b/ports/windows/variants/dev/manifest.py
@@ -0,0 +1 @@
+include("$(PORT_DIR)/variants/manifest.py")
diff --git a/ports/windows/variants/dev/mpconfigvariant.h b/ports/windows/variants/dev/mpconfigvariant.h
new file mode 100644
index 0000000000000..2da0977140381
--- /dev/null
+++ b/ports/windows/variants/dev/mpconfigvariant.h
@@ -0,0 +1,37 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2019 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#define MICROPY_REPL_EMACS_WORDS_MOVE           (1)
+#define MICROPY_REPL_EMACS_EXTRA_WORDS_MOVE     (1)
+#define MICROPY_ENABLE_SCHEDULER                (1)
+
+#define MICROPY_PY_BUILTINS_HELP                (1)
+#define MICROPY_PY_BUILTINS_HELP_MODULES        (1)
+#define MICROPY_PY_SYS_SETTRACE                 (1)
+#define MICROPY_PERSISTENT_CODE_SAVE            (1)
+#define MICROPY_COMP_CONST                      (0)
+#define MICROPY_PY_URANDOM_EXTRA_FUNCS          (1)
+#define MICROPY_PY_BUILTINS_SLICE_INDICES       (1)
diff --git a/ports/windows/variants/dev/mpconfigvariant.mk b/ports/windows/variants/dev/mpconfigvariant.mk
new file mode 100644
index 0000000000000..b2a0b5bb3388f
--- /dev/null
+++ b/ports/windows/variants/dev/mpconfigvariant.mk
@@ -0,0 +1,5 @@
+PROG ?= micropython-dev
+
+FROZEN_MANIFEST ?= $(VARIANT_DIR)/manifest.py
+
+MICROPY_ROM_TEXT_COMPRESSION = 1
diff --git a/ports/windows/variants/dev/mpconfigvariant.props b/ports/windows/variants/dev/mpconfigvariant.props
new file mode 100644
index 0000000000000..d01d74b4413ff
--- /dev/null
+++ b/ports/windows/variants/dev/mpconfigvariant.props
@@ -0,0 +1,5 @@
+<Project>
+  <PropertyGroup>
+    <PyProg>micropython-dev</PyProg>
+  </PropertyGroup>
+</Project>
diff --git a/ports/windows/variants/manifest.py b/ports/windows/variants/manifest.py
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/ports/windows/variants/standard/mpconfigvariant.h b/ports/windows/variants/standard/mpconfigvariant.h
new file mode 100644
index 0000000000000..3cdcfa8e9b8c9
--- /dev/null
+++ b/ports/windows/variants/standard/mpconfigvariant.h
@@ -0,0 +1,28 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2019 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#define MICROPY_PY_BUILTINS_HELP                (1)
+#define MICROPY_PY_BUILTINS_HELP_MODULES        (1)
diff --git a/ports/windows/variants/standard/mpconfigvariant.mk b/ports/windows/variants/standard/mpconfigvariant.mk
new file mode 100644
index 0000000000000..9e1f5ae059cef
--- /dev/null
+++ b/ports/windows/variants/standard/mpconfigvariant.mk
@@ -0,0 +1,3 @@
+# This is the default variant when you `make` the Windows port.
+
+PROG ?= micropython
diff --git a/ports/windows/variants/standard/mpconfigvariant.props b/ports/windows/variants/standard/mpconfigvariant.props
new file mode 100644
index 0000000000000..0157102fdf0f0
--- /dev/null
+++ b/ports/windows/variants/standard/mpconfigvariant.props
@@ -0,0 +1,5 @@
+<Project>
+  <PropertyGroup>
+    <PyProg>micropython</PyProg>
+  </PropertyGroup>
+</Project>

From 7955734aca3a39e74b9a82017f091bdd4d236c53 Mon Sep 17 00:00:00 2001
From: stijn <stijn@ignitron.net>
Date: Thu, 25 Nov 2021 11:33:35 +0100
Subject: [PATCH 1533/3533] windows: Run tests via Makefile.

The application isn't necessarily called 'micropython' especially
not When using variants, i.e. the tests need to be ran using $(PROG).
---
 ports/windows/.appveyor.yml | 13 ++-----------
 ports/windows/Makefile      | 12 ++++++++++++
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/ports/windows/.appveyor.yml b/ports/windows/.appveyor.yml
index 40fdff2934efa..d412e0f1681f3 100644
--- a/ports/windows/.appveyor.yml
+++ b/ports/windows/.appveyor.yml
@@ -67,17 +67,8 @@ after_test:
     if ($LASTEXITCODE -ne 0) {
       throw "$env:MSYSTEM mpy_cross build exited with code $LASTEXITCODE"
     }
-    cd (Join-Path $env:APPVEYOR_BUILD_FOLDER 'tests')
-    $testArgs = @('run-tests.py')
-    foreach ($skipTest in @('math_fun', 'float2int_double', 'float_parse', 'math_domain_special')) {
-      $testArgs = $testArgs + '-e' + $skipTest
-    }
-    & $env:MICROPY_CPYTHON3 $testArgs
-    if ($LASTEXITCODE -ne 0) {
-      & $env:MICROPY_CPYTHON3 run-tests.py --print-failures
-      throw "Test failure"
-    }
-    & $env:MICROPY_CPYTHON3 ($testArgs + @('--via-mpy', '-d', 'basics', 'float', 'micropython'))
+    cd (Join-Path $env:APPVEYOR_BUILD_FOLDER 'ports/windows')
+    C:\msys64\usr\bin\bash.exe -l -c "make V=1 test_full"
     if ($LASTEXITCODE -ne 0) {
       & $env:MICROPY_CPYTHON3 run-tests.py --print-failures
       throw "Test failure"
diff --git a/ports/windows/Makefile b/ports/windows/Makefile
index b1d2d35c9a1a4..4aceeb981ce53 100644
--- a/ports/windows/Makefile
+++ b/ports/windows/Makefile
@@ -81,3 +81,15 @@ CFLAGS += -DMICROPY_QSTR_EXTRA_POOL=mp_qstr_frozen_const_pool -DMICROPY_MODULE_F
 endif
 
 include $(TOP)/py/mkrules.mk
+
+.PHONY: test test_full
+
+RUN_TESTS_SKIP += -e math_fun -e float2int_double -e float_parse -e math_domain_special
+
+test: $(PROG) $(TOP)/tests/run-tests.py
+	$(eval DIRNAME=ports/$(notdir $(CURDIR)))
+	cd $(TOP)/tests && MICROPY_MICROPYTHON=../$(DIRNAME)/$(PROG) $(PYTHON) ./run-tests.py $(RUN_TESTS_SKIP)
+
+test_full: test
+	$(eval DIRNAME=ports/$(notdir $(CURDIR)))
+	cd $(TOP)/tests && MICROPY_MICROPYTHON=../$(DIRNAME)/$(PROG) $(PYTHON) ./run-tests.py --via-mpy $(RUN_TESTS_MPY_CROSS_FLAGS) $(RUN_TESTS_SKIP) -d basics float micropython

From 19d949a866a9b2e3cfc2892f15edc92243405b1f Mon Sep 17 00:00:00 2001
From: stijn <stijn@ignitron.net>
Date: Thu, 25 Nov 2021 11:33:35 +0100
Subject: [PATCH 1534/3533] tests/extmod: Skip uselect_poll_udp when poll() is
 not available.

This is the same fix as applied in uselect_poll_basic.py.
---
 tests/extmod/uselect_poll_udp.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tests/extmod/uselect_poll_udp.py b/tests/extmod/uselect_poll_udp.py
index f6be262ee02f4..2a56a122b5f21 100644
--- a/tests/extmod/uselect_poll_udp.py
+++ b/tests/extmod/uselect_poll_udp.py
@@ -5,7 +5,9 @@
 except ImportError:
     try:
         import socket, select
-    except ImportError:
+
+        select.poll  # Raises AttributeError for CPython implementations without poll()
+    except (ImportError, AttributeError):
         print("SKIP")
         raise SystemExit
 

From 3f16719888574ee6a45bbfc0e67e8d55ef0a0696 Mon Sep 17 00:00:00 2001
From: stijn <stijn@ignitron.net>
Date: Thu, 25 Nov 2021 16:50:10 +0100
Subject: [PATCH 1535/3533] windows/appveyor: Build both standard and dev
 variants.

This makes sure changes from previous related commits actually work.
---
 ports/windows/.appveyor.yml     | 15 +++++++++++++--
 ports/windows/msvc/common.props |  5 +++++
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/ports/windows/.appveyor.yml b/ports/windows/.appveyor.yml
index d412e0f1681f3..e249aafdf8e61 100644
--- a/ports/windows/.appveyor.yml
+++ b/ports/windows/.appveyor.yml
@@ -5,6 +5,10 @@ skip_tags: true
 environment:
   # Python version used
   MICROPY_CPYTHON3: c:/python38/python.exe
+  # The variants.
+  matrix:
+    - PyVariant: dev
+    - PyVariant: standard
 
 init:
   # Set build version number to commit to be travis-like
@@ -18,6 +22,12 @@ platform:
 - x86
 - x64
 
+matrix:
+  # One debug build is enough.
+  exclude:
+    - configuration: Debug
+      PyVariant: dev
+
 before_build:
 - ps: |
     @"
@@ -36,6 +46,7 @@ build:
 
 test_script:
 - ps: |
+    $env:MICROPY_MICROPYTHON=(msbuild ports\windows\micropython.vcxproj /nologo /v:m /t:ShowTargetPath).Trim()
     cd (Join-Path $env:APPVEYOR_BUILD_FOLDER 'tests')
     & $env:MICROPY_CPYTHON3 run-tests.py
     if ($LASTEXITCODE -ne 0) {
@@ -58,7 +69,7 @@ after_test:
     $env:MSYSTEM = if ($platform -eq 'x86') {'MINGW32'} else {'MINGW64'}
     $env:CHERE_INVOKING = 'enabled_from_arguments'
     cd (Join-Path $env:APPVEYOR_BUILD_FOLDER 'ports/windows')
-    C:\msys64\usr\bin\bash.exe -l -c "make -B -j4 V=1"
+    C:\msys64\usr\bin\bash.exe -l -c "make -B -j4 V=1 VARIANT=$($env:PyVariant)"
     if ($LASTEXITCODE -ne 0) {
       throw "$env:MSYSTEM build exited with code $LASTEXITCODE"
     }
@@ -68,7 +79,7 @@ after_test:
       throw "$env:MSYSTEM mpy_cross build exited with code $LASTEXITCODE"
     }
     cd (Join-Path $env:APPVEYOR_BUILD_FOLDER 'ports/windows')
-    C:\msys64\usr\bin\bash.exe -l -c "make V=1 test_full"
+    C:\msys64\usr\bin\bash.exe -l -c "make V=1 test_full VARIANT=$($env:PyVariant)"
     if ($LASTEXITCODE -ne 0) {
       & $env:MICROPY_CPYTHON3 run-tests.py --print-failures
       throw "Test failure"
diff --git a/ports/windows/msvc/common.props b/ports/windows/msvc/common.props
index ab9b055deffbf..7d608a3798daa 100644
--- a/ports/windows/msvc/common.props
+++ b/ports/windows/msvc/common.props
@@ -42,6 +42,11 @@
     <QstrDependencies Include="$(PyVariantDir)mpconfigvariant.h"/>
   </ItemGroup>
 
+  <!-- Helper for getting resulting executable path since it depends on other properties. -->
+  <Target Name="ShowTargetPath">
+    <Message Text="$(TargetPath)" Importance="high"/>
+  </Target>
+
   <!-- Copy PyOutputFiles to their target destination.
        To force this when switching between platforms/configurations which are already up-to-date (and as such,
        for which a build wouldn't even start because all outputs are effectively newer than the inputs)

From 802ef271b8a90acf504b9750b0b4494146b7fb22 Mon Sep 17 00:00:00 2001
From: Chris Boudacoff <d3v1c3nv11@users.noreply.github.com>
Date: Thu, 16 Dec 2021 16:22:20 +0200
Subject: [PATCH 1536/3533] mimxrt/hal: Allow readSampleClkSrc to be configured
 by a board.

Via the MICROPY_HW_FLASH_DQS flag.
---
 ports/mimxrt/hal/qspi_nor_flash_config.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/ports/mimxrt/hal/qspi_nor_flash_config.c b/ports/mimxrt/hal/qspi_nor_flash_config.c
index 4ae5093c829ce..f42730ad54d5e 100644
--- a/ports/mimxrt/hal/qspi_nor_flash_config.c
+++ b/ports/mimxrt/hal/qspi_nor_flash_config.c
@@ -24,12 +24,16 @@ __attribute__((section(".boot_hdr.conf")))
 #pragma location = ".boot_hdr.conf"
 #endif
 
+#ifndef MICROPY_HW_FLASH_DQS
+#define MICROPY_HW_FLASH_DQS kFlexSPIReadSampleClk_LoopbackFromDqsPad
+#endif
+
 const flexspi_nor_config_t qspiflash_config = {
     .memConfig =
     {
         .tag = FLEXSPI_CFG_BLK_TAG,
         .version = FLEXSPI_CFG_BLK_VERSION,
-        .readSampleClkSrc = kFlexSPIReadSampleClk_LoopbackFromDqsPad,
+        .readSampleClkSrc = MICROPY_HW_FLASH_DQS,
         .csHoldTime = 3u,
         .csSetupTime = 3u,
         .busyOffset = FLASH_BUSY_STATUS_OFFSET,         // Status bit 0 indicates busy.

From 01953f2964e4e26b9bbf70d19d1e199ed2cf1a89 Mon Sep 17 00:00:00 2001
From: NitiKaur <nitikaur102@gmail.com>
Date: Wed, 13 Oct 2021 12:32:37 +0530
Subject: [PATCH 1537/3533] docs/differences: Document details of new
 PEPs/features in Python 3.5+.

And how they relate to MicroPython.  As these features are implemented (or
the decision is made to not implement them) the tables can be updated to
document the differences between MicroPython and standard Python.
---
 docs/differences/index_template.txt |  17 ++-
 docs/differences/python_35.rst      | 181 ++++++++++++++++++++++++++
 docs/differences/python_36.rst      | 191 ++++++++++++++++++++++++++++
 docs/differences/python_37.rst      |  95 ++++++++++++++
 docs/differences/python_38.rst      | 118 +++++++++++++++++
 docs/differences/python_39.rst      | 121 ++++++++++++++++++
 6 files changed, 721 insertions(+), 2 deletions(-)
 create mode 100644 docs/differences/python_35.rst
 create mode 100644 docs/differences/python_36.rst
 create mode 100644 docs/differences/python_37.rst
 create mode 100644 docs/differences/python_38.rst
 create mode 100644 docs/differences/python_39.rst

diff --git a/docs/differences/index_template.txt b/docs/differences/index_template.txt
index 41ddeb6d3e4aa..dbbd7fc099a25 100644
--- a/docs/differences/index_template.txt
+++ b/docs/differences/index_template.txt
@@ -3,8 +3,21 @@
 MicroPython differences from CPython
 ====================================
 
-The operations listed in this section produce conflicting results in MicroPython when compared to standard Python.
-MicroPython implements Python 3.4 and some select features of Python 3.5.
+MicroPython implements Python 3.4 and some select features of Python 3.5 and
+above.  The sections below describe the current status of these features.
+
+.. toctree::
+
+    ../differences/python_35.rst
+    ../differences/python_36.rst
+    ../differences/python_37.rst
+    ../differences/python_38.rst
+    ../differences/python_39.rst
+
+For the features of Python that are implemented by MicroPython, there are
+sometimes differences in their behaviour compared to standard Python.  The
+operations listed in the sections below produce conflicting results in
+MicroPython when compared to standard Python.
 
 .. toctree::
     :maxdepth: 2
diff --git a/docs/differences/python_35.rst b/docs/differences/python_35.rst
new file mode 100644
index 0000000000000..84c38c9cc1b3c
--- /dev/null
+++ b/docs/differences/python_35.rst
@@ -0,0 +1,181 @@
+.. _python_35:
+
+Python 3.5
+==========
+
+Below is a list of finalised/accepted PEPs for Python 3.5 grouped into their impact to MicroPython.
+
+   +----------------------------------------------------------------------------------------------------------+---------------+
+   | **Extensions to the syntax:**                                                                            | **Status**    |
+   +--------------------------------------------------------+-------------------------------------------------+---------------+
+   | `PEP 448 <https://www.python.org/dev/peps/pep-0448/>`_ | additional unpacking generalizations            |               |
+   +--------------------------------------------------------+-------------------------------------------------+---------------+
+   | `PEP 465 <https://www.python.org/dev/peps/pep-0465/>`_ | a new matrix multiplication operator            | Completed     |
+   +--------------------------------------------------------+-------------------------------------------------+---------------+
+   | `PEP 492 <https://www.python.org/dev/peps/pep-0492/>`_ | coroutines with async and await syntax          | Completed     |
+   +--------------------------------------------------------+-------------------------------------------------+---------------+
+   | **Extensions and changes to runtime:**                                                                                   |
+   +--------------------------------------------------------+-------------------------------------------------+---------------+
+   | `PEP 461 <https://www.python.org/dev/peps/pep-0461/>`_ | % formatting for binary strings                 | Completed     |
+   +--------------------------------------------------------+-------------------------------------------------+---------------+
+   | `PEP 475 <https://www.python.org/dev/peps/pep-0475/>`_ | retrying system calls that fail with EINTR      | Completed     |
+   +--------------------------------------------------------+-------------------------------------------------+---------------+
+   | `PEP 479 <https://www.python.org/dev/peps/pep-0479/>`_ | change StopIteration handling inside generators | Completed     |
+   +--------------------------------------------------------+-------------------------------------------------+---------------+
+   | **Standard library changes:**                                                                                            |
+   +--------------------------------------------------------+-------------------------------------------------+---------------+
+   | `PEP 471 <https://www.python.org/dev/peps/pep-0471/>`_ | os.scandir()                                    |               |
+   +--------------------------------------------------------+-------------------------------------------------+---------------+
+   | `PEP 485 <https://www.python.org/dev/peps/pep-0485/>`_ | math.isclose(), a function for testing          | Completed     |
+   |                                                        | approximate equality                            |               |
+   +--------------------------------------------------------+-------------------------------------------------+---------------+
+   | **Miscellaneous changes:**                                                                                               |
+   +--------------------------------------------------------+-------------------------------------------------+---------------+
+   | `PEP 441 <https://www.python.org/dev/peps/pep-0441/>`_ | improved Python zip application support         |               |
+   +--------------------------------------------------------+-------------------------------------------------+---------------+
+   | `PEP 486 <https://www.python.org/dev/peps/pep-0486/>`_ | make the Python Laucher aware of virtual        |               |
+   |                                                        | environments                                    |               |
+   +--------------------------------------------------------+-------------------------------------------------+---------------+
+   | `PEP 484 <https://www.python.org/dev/peps/pep-0484/>`_ | type hints (advisory only)                      | In Progress   |
+   +--------------------------------------------------------+-------------------------------------------------+---------------+
+   | `PEP 488 <https://www.python.org/dev/peps/pep-0488/>`_ | elimination of PYO files                        | Not relevant  |
+   +--------------------------------------------------------+-------------------------------------------------+---------------+
+   | `PEP 489 <https://www.python.org/dev/peps/pep-0489/>`_ | redesigning extension module loading            |               |
+   +--------------------------------------------------------+-------------------------------------------------+---------------+
+
+
+Other Language Changes:
+
+   +-----------------------------------------------------------------------------------------------------------+---------------+
+   | Added the *namereplace* error handlers. The *backslashreplace* error handlers now work with decoding and  |               |
+   | translating.                                                                                              |               |
+   +-----------------------------------------------------------------------------------------------------------+---------------+
+   | Property docstrings are now writable. This is especially useful for collections.namedtuple() docstrings   |               |
+   +-----------------------------------------------------------------------------------------------------------+---------------+
+   | Circular imports involving relative imports are now supported.                                            |               |
+   +-----------------------------------------------------------------------------------------------------------+---------------+
+
+
+New Modules:
+
+* `typing <https://docs.python.org/3/whatsnew/3.5.html#typing>`_
+
+* `zipzap <https://docs.python.org/3/whatsnew/3.5.html#zipapp>`_
+
+
+Changes to built-in modules:
+
+   +-----------------------------------------------------------------------------------------------------------+---------------+
+   | `collections <https://docs.python.org/3/whatsnew/3.5.html#collections>`_                                                  |
+   +-----------------------------------------------------------------------------------------------------------+---------------+
+   | The *OrderedDict* class is now implemented in C, which makes it 4 to 100 times faster.                    |               |
+   +-----------------------------------------------------------------------------------------------------------+---------------+
+   | *OrderedDict.items()* , *OrderedDict.keys()* , *OrderedDict.values()* views now support reversed()        |               |
+   | iteration.                                                                                                |               |
+   +-----------------------------------------------------------------------------------------------------------+---------------+
+   | The deque class now defines *index()*, *insert()*, and *copy()*, and supports the + and * operators.      |               |
+   +-----------------------------------------------------------------------------------------------------------+---------------+
+   | Docstrings produced by namedtuple() can now be updated.                                                   |               |
+   +-----------------------------------------------------------------------------------------------------------+---------------+
+   | The UserString class now implements the *__getnewargs__()*, *__rmod__()*, *casefold()*, *format_map()*,   |               |
+   | *isprintable()*, and *maketrans()* methods to match the corresponding methods of str.                     |               |
+   +-----------------------------------------------------------------------------------------------------------+---------------+
+   | `heapq <https://docs.python.org/3/whatsnew/3.5.html#heapq>`_                                                              |
+   +-----------------------------------------------------------------------------------------------------------+---------------+
+   | Element comparison in *merge()* can now be customized by passing a key function in a new optional key     |               |
+   | keyword argument, and a new optional *reverse* keyword argument can be used to reverse element comparison |               |
+   +-----------------------------------------------------------------------------------------------------------+---------------+
+   | `io <https://docs.python.org/3/whatsnew/3.5.html#io>`_                                                                    |
+   +-----------------------------------------------------------------------------------------------------------+---------------+
+   | A new *BufferedIOBase.readinto1()* method, that uses at most one call to the underlying raw stream's      |               |
+   | *RawIOBase.read()* or *RawIOBase.readinto()* methods                                                      |               |
+   +-----------------------------------------------------------------------------------------------------------+---------------+
+   | `json <https://docs.python.org/3/whatsnew/3.5.html#json>`_                                                |               |
+   +-----------------------------------------------------------------------------------------------------------+---------------+
+   | JSON decoder now raises JSONDecodeError instead of ValueError to provide better context information about |               |
+   | the error.                                                                                                |               |
+   +-----------------------------------------------------------------------------------------------------------+---------------+
+   | `math <https://docs.python.org/3/whatsnew/3.5.html#math>`_                                                                |
+   +-----------------------------------------------------------------------------------------------------------+---------------+
+   | Two new constants have been added to the math module: *inf* and *nan*.                                    |               |
+   +-----------------------------------------------------------------------------------------------------------+---------------+
+   | A new function *isclose()* provides a way to test for approximate equality.                               |               |
+   +-----------------------------------------------------------------------------------------------------------+---------------+
+   | A new *gcd()* function has been added. The *fractions.gcd()* function is now deprecated.                  |               |
+   +-----------------------------------------------------------------------------------------------------------+---------------+
+   | `os <https://docs.python.org/3/whatsnew/3.5.html#os>`_                                                                    |
+   +-----------------------------------------------------------------------------------------------------------+---------------+
+   | The new *scandir()* function returning an iterator of DirEntry objects has been added.                    |               |
+   +-----------------------------------------------------------------------------------------------------------+---------------+
+   | The *urandom()* function now uses the *getrandom()* syscall on Linux 3.17 or newer, and *getentropy()* on |               |
+   | OpenBSD 5.6 and newer, removing the need to use /dev/urandom and avoiding failures due to potential file  |               |
+   | descriptor exhaustion.                                                                                    |               |
+   +-----------------------------------------------------------------------------------------------------------+---------------+
+   | New *get_blocking()* and *set_blocking()* functions allow getting and setting a file descriptor's blocking|               |
+   | mode (O_NONBLOCK.)                                                                                        |               |
+   +-----------------------------------------------------------------------------------------------------------+---------------+
+   | There is a new *os.path.commonpath()* function returning the longest common sub-path of each passed       |               |
+   | pathname                                                                                                  |               |
+   +-----------------------------------------------------------------------------------------------------------+---------------+
+   | `re <https://docs.python.org/3/whatsnew/3.5.html#re>`_                                                    |               |
+   +-----------------------------------------------------------------------------------------------------------+---------------+
+   | References and conditional references to groups with fixed length are now allowed in lookbehind assertions|               |
+   +-----------------------------------------------------------------------------------------------------------+---------------+
+   | The number of capturing groups in regular expressions is no longer limited to 100.                        |               |
+   +-----------------------------------------------------------------------------------------------------------+---------------+
+   | The *sub()* and *subn()* functions now replace unmatched groups with empty strings instead of raising an  |               |
+   | exception.                                                                                                |               |
+   +-----------------------------------------------------------------------------------------------------------+---------------+
+   | The *re.error* exceptions have new attributes, msg, pattern, pos, lineno, and colno, that provide better  |               |
+   | context information about the error                                                                       |               |
+   +-----------------------------------------------------------------------------------------------------------+---------------+
+   | `socket <https://docs.python.org/3/whatsnew/3.5.html#socket>`_                                                            |
+   +-----------------------------------------------------------------------------------------------------------+---------------+
+   | Functions with timeouts now use a monotonic clock, instead of a system clock.                             |               |
+   +-----------------------------------------------------------------------------------------------------------+---------------+
+   | A new *socket.sendfile()* method allows sending a file over a socket by using the high-performance        |               |
+   | *os.sendfile()* function on UNIX, resulting in uploads being from 2 to 3 times faster than when using     |               |
+   | plain *socket.send()*                                                                                     |               |
+   +-----------------------------------------------------------------------------------------------------------+---------------+
+   | The *socket.sendall()* method no longer resets the socket timeout every time bytes are received or sent.  |               |
+   | The socket timeout is now the maximum total duration to send all data.                                    |               |
+   +-----------------------------------------------------------------------------------------------------------+---------------+
+   | The backlog argument of the *socket.listen()* method is now optional. By default it is set to SOMAXCONN or|               |
+   | to 128, whichever is less.                                                                                |               |
+   +-----------------------------------------------------------------------------------------------------------+---------------+
+   | `ssl <https://docs.python.org/3/whatsnew/3.5.html#ssl>`_                                                                  |
+   +-----------------------------------------------------------------------------------------------------------+---------------+
+   | Memory BIO Support                                                                                        |               |
+   +-----------------------------------------------------------------------------------------------------------+---------------+
+   | Application-Layer Protocol Negotiation Support                                                            |               |
+   +-----------------------------------------------------------------------------------------------------------+---------------+
+   | There is a new *SSLSocket.version()* method to query the actual protocol version in use.                  |               |
+   +-----------------------------------------------------------------------------------------------------------+---------------+
+   | The SSLSocket class now implements a *SSLSocket.sendfile()* method.                                       |               |
+   +-----------------------------------------------------------------------------------------------------------+---------------+
+   | The *SSLSocket.send()* method now raises either the *ssl.SSLWantReadError* or *ssl.SSLWantWriteError*     |               |
+   | exception on a non-blocking socket if the operation would block. Previously, it would return 0.           |               |
+   +-----------------------------------------------------------------------------------------------------------+---------------+
+   | The *cert_time_to_seconds()* function now interprets the input time as UTC and not as local time, per RFC |               |
+   | 5280. Additionally, the return value is always an int.                                                    |               |
+   +-----------------------------------------------------------------------------------------------------------+---------------+
+   | New *SSLObject.shared_ciphers()* and *SSLSocket.shared_ciphers()* methods return the list of ciphers sent |               |
+   | by the client during the handshake.                                                                       |               |
+   +-----------------------------------------------------------------------------------------------------------+---------------+
+   | The *SSLSocket.do_handshake()*, *SSLSocket.read()*, *SSLSocket.shutdown()*, and *SSLSocket.write()*       |               |
+   | methods of the SSLSocket class no longer reset the socket timeout every time bytes are received or sent.  |               |
+   +-----------------------------------------------------------------------------------------------------------+---------------+
+   | The *match_hostname()* function now supports matching of IP addresses.                                    |               |
+   +-----------------------------------------------------------------------------------------------------------+---------------+
+   | `sys <https://docs.python.org/3/whatsnew/3.5.html#sys>`_                                                                  |
+   +-----------------------------------------------------------------------------------------------------------+---------------+
+   | A new *set_coroutine_wrapper()* function allows setting a global hook that will be called whenever a      |               |
+   | coroutine object is created by an async def function. A corresponding *get_coroutine_wrapper()* can be    |               |
+   | used to obtain a currently set wrapper.                                                                   |               |
+   +-----------------------------------------------------------------------------------------------------------+---------------+
+   | A new *is_finalizing()* function can be used to check if the Python interpreter is shutting down.         |               |
+   +-----------------------------------------------------------------------------------------------------------+---------------+
+   | `time <https://docs.python.org/3/whatsnew/3.5.html#time>`_                                                                |
+   +-----------------------------------------------------------------------------------------------------------+---------------+
+   | The *monotonic()* function is now always available                                                        |               |
+   +-----------------------------------------------------------------------------------------------------------+---------------+
diff --git a/docs/differences/python_36.rst b/docs/differences/python_36.rst
new file mode 100644
index 0000000000000..4ea8742243612
--- /dev/null
+++ b/docs/differences/python_36.rst
@@ -0,0 +1,191 @@
+.. _python_36:
+
+Python 3.6
+==========
+
+Python 3.6 beta 1 was released on 12 Sep 2016, and a summary of the new features can be found here:
+
+  +-----------------------------------------------------------------------------------------------------------+--------------+
+  | **New Syntax Features:**                                                                                  | **Status**   |
+  +--------------------------------------------------------+--------------------------------------------------+--------------+
+  | `PEP 498 <https://www.python.org/dev/peps/pep-0498/>`_ | Literal String Formatting                        |              |
+  +--------------------------------------------------------+--------------------------------------------------+--------------+
+  | `PEP 515 <https://www.python.org/dev/peps/pep-0515/>`_ | Underscores in Numeric Literals                  |              |
+  +--------------------------------------------------------+--------------------------------------------------+--------------+
+  | `PEP 525 <https://www.python.org/dev/peps/pep-0525/>`_ | Asynchronous Generators                          |              |
+  +--------------------------------------------------------+--------------------------------------------------+--------------+
+  | `PEP 526 <https://www.python.org/dev/peps/pep-0526/>`_ | Syntax for Variable Annotations (provisional)    |              |
+  +--------------------------------------------------------+--------------------------------------------------+--------------+
+  | `PEP 530 <https://www.python.org/dev/peps/pep-0530/>`_ | Asynchronous Comprehensions                      |              |
+  +--------------------------------------------------------+--------------------------------------------------+--------------+
+  | **New Built-in Features:**                                                                                               |
+  +--------------------------------------------------------+--------------------------------------------------+--------------+
+  | `PEP 468 <https://www.python.org/dev/peps/pep-0468/>`_ | Preserving the order of *kwargs* in a function   |              |
+  +--------------------------------------------------------+--------------------------------------------------+--------------+
+  | `PEP 487 <https://www.python.org/dev/peps/pep-0487/>`_ | Simpler customization of class creation          |              |
+  +--------------------------------------------------------+--------------------------------------------------+--------------+
+  | `PEP 520 <https://www.python.org/dev/peps/pep-0520/>`_ | Preserving Class Attribute Definition Order      |              |
+  +--------------------------------------------------------+--------------------------------------------------+--------------+
+  | **Standard Library Changes:**                                                                                            |
+  +--------------------------------------------------------+--------------------------------------------------+--------------+
+  | `PEP 495 <https://www.python.org/dev/peps/pep-0495/>`_ | Local Time Disambiguation                        |              |
+  +--------------------------------------------------------+--------------------------------------------------+--------------+
+  | `PEP 506 <https://www.python.org/dev/peps/pep-0506/>`_ | Adding A Secrets Module To The Standard Library  |              |
+  +--------------------------------------------------------+--------------------------------------------------+--------------+
+  | `PEP 519 <https://www.python.org/dev/peps/pep-0519/>`_ | Adding a file system path protocol               |              |
+  +--------------------------------------------------------+--------------------------------------------------+--------------+
+  | **CPython internals:**                                                                                                   |
+  +--------------------------------------------------------+--------------------------------------------------+--------------+
+  | `PEP 509 <https://www.python.org/dev/peps/pep-0509/>`_ | Add a private version to dict                    |              |
+  +--------------------------------------------------------+--------------------------------------------------+--------------+
+  | `PEP 523 <https://www.python.org/dev/peps/pep-0523/>`_ | Adding a frame evaluation API to CPython         |              |
+  +--------------------------------------------------------+--------------------------------------------------+--------------+
+  | **Linux/Window Changes**                                                                                                 |
+  +--------------------------------------------------------+--------------------------------------------------+--------------+
+  | `PEP 524 <https://www.python.org/dev/peps/pep-0524/>`_ | Make os.urandom() blocking on Linux              |              |
+  |                                                        | (during system startup)                          |              |
+  +--------------------------------------------------------+--------------------------------------------------+--------------+
+  | `PEP 528 <https://www.python.org/dev/peps/pep-0528/>`_ | Change Windows console encoding to UTF-8         |              |
+  +--------------------------------------------------------+--------------------------------------------------+--------------+
+  | `PEP 529 <https://www.python.org/dev/peps/pep-0529/>`_ | Change Windows filesystem encoding to UTF-8      |              |
+  +--------------------------------------------------------+--------------------------------------------------+--------------+
+
+Other Language Changes:
+
+  +-------------------------------------------------------------------------------------------------------------+---------------+
+  | A *global* or *nonlocal* statement must now textually appear before the first use of the affected name in   |               |
+  | the same scope. Previously this was a SyntaxWarning.                                                        |               |
+  +-------------------------------------------------------------------------------------------------------------+---------------+
+  | It is now possible to set a special method to None to indicate that the corresponding operation is not      |               |
+  | available. For example, if a class sets *__iter__()* to *None* , the class is not iterable.                 |               |
+  +-------------------------------------------------------------------------------------------------------------+---------------+
+  | Long sequences of repeated traceback lines are now abbreviated as *[Previous line repeated {count} more     |               |
+  | times]*                                                                                                     |               |
+  +-------------------------------------------------------------------------------------------------------------+---------------+
+  | Import now raises the new exception *ModuleNotFoundError* when it cannot find a module. Code that currently |               |
+  | checks for ImportError (in try-except) will still work.                                                     |               |
+  +-------------------------------------------------------------------------------------------------------------+---------------+
+  | Class methods relying on zero-argument *super()* will now work correctly when called from metaclass methods |               |
+  | during class creation.                                                                                      |               |
+  +-------------------------------------------------------------------------------------------------------------+---------------+
+
+Changes to built-in modules:
+
+  +--------------------------------------------------------------------------------------------------------------+----------------+
+  | `array <https://docs.python.org/3.6/whatsnew/3.6.html#array>`_                                               |                |
+  +--------------------------------------------------------------------------------------------------------------+----------------+
+  | Exhausted iterators of *array.array* will now stay exhausted even if the iterated array is extended.         |                |
+  +--------------------------------------------------------------------------------------------------------------+----------------+
+  | `binascii <https://docs.python.org/3.6/whatsnew/3.6.html#binascii>`_                                         |                |
+  +--------------------------------------------------------------------------------------------------------------+----------------+
+  | The b2a_base64() function now accepts an optional newline keyword argument to control whether the newline    |                |
+  | character is appended to the return value                                                                    |                |
+  +--------------------------------------------------------------------------------------------------------------+----------------+
+  | `cmath <https://docs.python.org/3.6/whatsnew/3.6.html#cmath>`_                                               |                |
+  +--------------------------------------------------------------------------------------------------------------+----------------+
+  | The new cmath.tau (Ï„) constant has been added                                                                |                |
+  +--------------------------------------------------------------------------------------------------------------+----------------+
+  | New constants: *cmath.inf* and *cmath.nan* to match *math.inf* and *math.nan* , and also *cmath.infj* and    |                |
+  | *cmath.nanj* to match the format used by complex repr                                                        |                |
+  +--------------------------------------------------------------------------------------------------------------+----------------+
+  | `collections <https://docs.python.org/3.6/whatsnew/3.6.html#collections>`_                                                    |
+  +--------------------------------------------------------------------------------------------------------------+----------------+
+  | The new Collection abstract base class has been added to represent sized iterable container classes          |                |
+  +--------------------------------------------------------------------------------------------------------------+----------------+
+  | The new *Reversible* abstract base class represents iterable classes that also provide the *__reversed__()*  |                |
+  | method.                                                                                                      |                |
+  +--------------------------------------------------------------------------------------------------------------+----------------+
+  | The new *AsyncGenerator* abstract base class represents asynchronous generators.                             |                |
+  +--------------------------------------------------------------------------------------------------------------+----------------+
+  | The *namedtuple()* function now accepts an optional keyword argument module, which, when specified, is used  |                |
+  | for the *__module__* attribute of the returned named tuple class.                                            |                |
+  +--------------------------------------------------------------------------------------------------------------+----------------+
+  | The verbose and rename arguments for *namedtuple()* are now keyword-only.                                    |                |
+  +--------------------------------------------------------------------------------------------------------------+----------------+
+  | Recursive *collections.deque* instances can now be pickled.                                                  |                |
+  +--------------------------------------------------------------------------------------------------------------+----------------+
+  | `hashlib <https://docs.python.org/3.6/whatsnew/3.6.html#hashlib>`_                                                            |
+  +--------------------------------------------------------------------------------------------------------------+----------------+
+  | BLAKE2 hash functions were added to the module. *blake2b()* and *blake2s()* are always available and support |                |
+  | the full feature set of BLAKE2.                                                                              |                |
+  +--------------------------------------------------------------------------------------------------------------+----------------+
+  | The SHA-3 hash functions *sha3_224()*, *sha3_256()*, *sha3_384()*, *sha3_512()*, and *SHAKE* hash functions  |                |
+  | *shake_128()* and *shake_256()* were added.                                                                  |                |
+  +--------------------------------------------------------------------------------------------------------------+----------------+
+  | The password-based key derivation function *scrypt()* is now available with OpenSSL 1.1.0 and newer.         |                |
+  +--------------------------------------------------------------------------------------------------------------+----------------+
+  | `json <https://docs.python.org/3.6/whatsnew/3.6.html#json>`_                                                                  |
+  +--------------------------------------------------------------------------------------------------------------+----------------+
+  | *json.load()* and *json.loads()* now support binary input. Encoded JSON should be represented using either   |                |
+  | UTF-8, UTF-16, or UTF-32.                                                                                    |                |
+  +--------------------------------------------------------------------------------------------------------------+----------------+
+  | `math <https://docs.python.org/3.6/whatsnew/3.6.html#math>`_                                                                  |
+  +--------------------------------------------------------------------------------------------------------------+----------------+
+  | The new math.tau (Ï„) constant has been added                                                                 |                |
+  +--------------------------------------------------------------------------------------------------------------+----------------+
+  | `os <https://docs.python.org/3.6/whatsnew/3.6.html#os>`_                                                                      |
+  +--------------------------------------------------------------------------------------------------------------+----------------+
+  | A new *close()* method allows explicitly closing a *scandir()* iterator. The *scandir()* iterator now        |                |
+  | supports the context manager protocol.                                                                       |                |
+  +--------------------------------------------------------------------------------------------------------------+----------------+
+  | On Linux, *os.urandom()* now blocks until the system urandom entropy pool is initialized to increase the     |                |
+  | security.                                                                                                    |                |
+  +--------------------------------------------------------------------------------------------------------------+----------------+
+  | The Linux *getrandom()* syscall (get random bytes) is now exposed as the new *os.getrandom()* function.      |                |
+  +--------------------------------------------------------------------------------------------------------------+----------------+
+  | `re <https://docs.python.org/3.6/whatsnew/3.6.html#re>`_                                                                      |
+  +--------------------------------------------------------------------------------------------------------------+----------------+
+  | Added support of modifier spans in regular expressions. Examples: *'(?i:p)ython'* matches 'python' and       |                |
+  | 'Python', but not 'PYTHON'; *'(?i)g(?-i:v)r'* matches *'GvR'* and *'gvr'*, but not *'GVR'* .                 |                |
+  +--------------------------------------------------------------------------------------------------------------+----------------+
+  | Match object groups can be accessed by *__getitem__*, which is equivalent to *group()*. So *mo['name']* is   |                |
+  | now equivalent to *mo.group('name')*.                                                                        |                |
+  +--------------------------------------------------------------------------------------------------------------+----------------+
+  | Match objects now support index-like objects as group indices.                                               |                |
+  +--------------------------------------------------------------------------------------------------------------+----------------+
+  | `socket <https://docs.python.org/3.6/whatsnew/3.6.html#socket>`_                                                              |
+  +--------------------------------------------------------------------------------------------------------------+----------------+
+  | The *ioctl()* function now supports the *SIO_LOOPBACK_FAST_PATH* control code.                               |                |
+  +--------------------------------------------------------------------------------------------------------------+----------------+
+  | The *getsockopt()* constants *SO_DOMAIN* , *SO_PROTOCOL*, *SO_PEERSEC* , and *SO_PASSSEC* are now supported. |                |
+  +--------------------------------------------------------------------------------------------------------------+----------------+
+  | The *setsockopt()* now supports the *setsockopt(level, optname, None, optlen: int)* form.                    |                |
+  +--------------------------------------------------------------------------------------------------------------+----------------+
+  | The socket module now supports the address family *AF_ALG* to interface with Linux Kernel crypto API.        |                |
+  | *ALG_*, *SOL_ALG* and *sendmsg_afalg()* were added.                                                          |                |
+  +--------------------------------------------------------------------------------------------------------------+----------------+
+  | New Linux constants *TCP_USER_TIMEOUT* and *TCP_CONGESTION* were added.                                      |                |
+  +--------------------------------------------------------------------------------------------------------------+----------------+
+  | `ssl <https://docs.python.org/3.6/whatsnew/3.6.html#ssl>`_                                                                    |
+  +--------------------------------------------------------------------------------------------------------------+----------------+
+  | ssl supports OpenSSL 1.1.0. The minimum recommend version is 1.0.2.                                          |                |
+  +--------------------------------------------------------------------------------------------------------------+----------------+
+  | 3DES has been removed from the default cipher suites and ChaCha20 Poly1305 cipher suites have been added.    |                |
+  +--------------------------------------------------------------------------------------------------------------+----------------+
+  | *SSLContext* has better default configuration for options and ciphers.                                       |                |
+  +--------------------------------------------------------------------------------------------------------------+----------------+
+  | SSL session can be copied from one client-side connection to another with the new *SSLSession* class. TLS    |                |
+  | session resumption can speed up the initial handshake, reduce latency and improve performance.               |                |
+  +--------------------------------------------------------------------------------------------------------------+----------------+
+  | The new *get_ciphers()* method can be used to get a list of enabled ciphers in order of cipher priority.     |                |
+  +--------------------------------------------------------------------------------------------------------------+----------------+
+  | All constants and flags have been converted to *IntEnum* and *IntFlags*.                                     |                |
+  +--------------------------------------------------------------------------------------------------------------+----------------+
+  | Server and client-side specific TLS protocols for *SSLContext* were added.                                   |                |
+  +--------------------------------------------------------------------------------------------------------------+----------------+
+  | Added *SSLContext.post_handshake_auth* to enable and *ssl.SSLSocket.verify_client_post_handshake()* to       |                |
+  | initiate TLS 1.3 post-handshake authentication.                                                              |                |
+  +--------------------------------------------------------------------------------------------------------------+----------------+
+  | `struct <https://docs.python.org/3.6/whatsnew/3.6.html#struct>`_                                             |                |
+  +--------------------------------------------------------------------------------------------------------------+----------------+
+  | now supports IEEE 754 half-precision floats via the 'e' format specifier.                                    |                |
+  +--------------------------------------------------------------------------------------------------------------+----------------+
+  | `sys <https://docs.python.org/3.6/whatsnew/3.6.html#sys>`_                                                   |                |
+  +--------------------------------------------------------------------------------------------------------------+----------------+
+  | The new *getfilesystemencodeerrors()* function returns the name of the error mode used to convert between    |                |
+  | Unicode filenames and bytes filenames.                                                                       |                |
+  +--------------------------------------------------------------------------------------------------------------+----------------+
+  | `zlib <https://docs.python.org/3.6/whatsnew/3.6.html#zlib>`_                                                 |                |
+  +--------------------------------------------------------------------------------------------------------------+----------------+
+  | The *compress()* and *decompress()* functions now accept keyword arguments                                   |                |
+  +--------------------------------------------------------------------------------------------------------------+----------------+
diff --git a/docs/differences/python_37.rst b/docs/differences/python_37.rst
new file mode 100644
index 0000000000000..c46678e931dd1
--- /dev/null
+++ b/docs/differences/python_37.rst
@@ -0,0 +1,95 @@
+.. _python_37:
+
+Python 3.7
+==========
+
+New Features:
+
+  +--------------------------------------------------------+--------------------------------------------------+----------------+
+  | **Features:**                                                                                             | **Status**     |
+  +--------------------------------------------------------+--------------------------------------------------+----------------+
+  | `PEP 538 <https://www.python.org/dev/peps/pep-0538/>`_ | Coercing the legacy C locale to a UTF-8 based    |                |
+  |                                                        | locale                                           |                |
+  +--------------------------------------------------------+--------------------------------------------------+----------------+
+  | `PEP 539 <https://www.python.org/dev/peps/pep-0539/>`_ | A New C-API for Thread-Local Storage in CPython  |                |
+  +--------------------------------------------------------+--------------------------------------------------+----------------+
+  | `PEP 540 <https://www.python.org/dev/peps/pep-0540/>`_ | UTF-8 mode                                       |                |
+  +--------------------------------------------------------+--------------------------------------------------+----------------+
+  | `PEP 552 <https://www.python.org/dev/peps/pep-0552/>`_ | Deterministic pyc                                |                |
+  +--------------------------------------------------------+--------------------------------------------------+----------------+
+  | `PEP 553 <https://www.python.org/dev/peps/pep-0553/>`_ | Built-in breakpoint()                            |                |
+  +--------------------------------------------------------+--------------------------------------------------+----------------+
+  | `PEP 557 <https://www.python.org/dev/peps/pep-0557/>`_ | Data Classes                                     |                |
+  +--------------------------------------------------------+--------------------------------------------------+----------------+
+  | `PEP 560 <https://www.python.org/dev/peps/pep-0560/>`_ | Core support for typing module and generic types |                |
+  +--------------------------------------------------------+--------------------------------------------------+----------------+
+  | `PEP 562 <https://www.python.org/dev/peps/pep-0562/>`_ | Module __getattr__ and __dir__                   | Partially done |
+  +--------------------------------------------------------+--------------------------------------------------+----------------+
+  | `PEP 563 <https://www.python.org/dev/peps/pep-0563/>`_ | Postponed Evaluation of Annotations              |                |
+  +--------------------------------------------------------+--------------------------------------------------+----------------+
+  | `PEP 564 <https://www.python.org/dev/peps/pep-0564/>`_ | Time functions with nanosecond resolution        |                |
+  +--------------------------------------------------------+--------------------------------------------------+----------------+
+  | `PEP 565 <https://www.python.org/dev/peps/pep-0565/>`_ | Show DeprecationWarning in __main__              |                |
+  +--------------------------------------------------------+--------------------------------------------------+----------------+
+  | `PEP 567 <https://www.python.org/dev/peps/pep-0567/>`_ | Context Variables                                |                |
+  +--------------------------------------------------------+--------------------------------------------------+----------------+
+
+Other Language Changes:
+
+  +----------------------------------------------------------------------------------------------------------+----------------+
+  | async and await are now reserved keywords                                                                | Completed      |
+  +----------------------------------------------------------------------------------------------------------+----------------+
+  | dict objects must preserve insertion-order                                                               |                |
+  +----------------------------------------------------------------------------------------------------------+----------------+
+  | More than 255 arguments can now be passed to a function; a function can now have more than 255 parameters|                |
+  +----------------------------------------------------------------------------------------------------------+----------------+
+  | bytes.fromhex() and bytearray.fromhex() now ignore all ASCII whitespace, not only spaces                 |                |
+  +----------------------------------------------------------------------------------------------------------+----------------+
+  | str, bytes, and bytearray gained support for the new isascii() method, which can be used to test if a    |                |
+  | string or bytes contain only the ASCII characters                                                        |                |
+  +----------------------------------------------------------------------------------------------------------+----------------+
+  | ImportError now displays module name and module __file__ path whenfrom ... import ... fails              |                |
+  +----------------------------------------------------------------------------------------------------------+----------------+
+  | Circular imports involving absolute imports with binding a submodule to a name are now supported         |                |
+  +----------------------------------------------------------------------------------------------------------+----------------+
+  | object.__format__(x, '') is now equivalent to str(x) rather than format(str(self), '')                   |                |
+  +----------------------------------------------------------------------------------------------------------+----------------+
+  | In order to better support dynamic creation of stack traces, types.TracebackType can now be instantiated |                |
+  | from Python code, and the tb_next attribute on tracebacks is now writable                                |                |
+  +----------------------------------------------------------------------------------------------------------+----------------+
+  | When using the -m switch, sys.path[0] is now eagerly expanded to the full starting directory path, rather|                |
+  | than being left as the empty directory (which allows imports from the current working directory at the   |                |
+  | time when an import occurs)                                                                              |                |
+  +----------------------------------------------------------------------------------------------------------+----------------+
+  | The new -X importtime option or the PYTHONPROFILEIMPORTTIME environment variable can be used to show the |                |
+  | timing of each module import                                                                             |                |
+  +----------------------------------------------------------------------------------------------------------+----------------+
+
+Changes to built-in modules:
+
+  +------------------------------------------------------------------------------------------------------------+----------------+
+  | `asyncio <https://docs.python.org/3/whatsnew/3.7.html#asyncio>`_                                           |                |
+  +------------------------------------------------------------------------------------------------------------+----------------+
+  | asyncio (many, may need a separate ticket)                                                                 |                |
+  +------------------------------------------------------------------------------------------------------------+----------------+
+  | `gc <https://docs.python.org/3/whatsnew/3.7.html#gc>`_                                                     |                |
+  +------------------------------------------------------------------------------------------------------------+----------------+
+  | New features include *gc.freeze()*, *gc.unfreeze()*, *gc-get_freeze_count*                                 |                |
+  +------------------------------------------------------------------------------------------------------------+----------------+
+  | `math <https://docs.python.org/3/whatsnew/3.7.html#math>`_                                                 |                |
+  +------------------------------------------------------------------------------------------------------------+----------------+
+  | math.remainder() added to implement IEEE 754-style remainder                                               |                |
+  +------------------------------------------------------------------------------------------------------------+----------------+
+  | `re <https://docs.python.org/3/whatsnew/3.7.html#re>`_                                                     |                |
+  +------------------------------------------------------------------------------------------------------------+----------------+
+  | A number of tidy up features including better support for splitting on empty strings and copy support for  |                |
+  | compiled expressions and match objects                                                                     |                |
+  +------------------------------------------------------------------------------------------------------------+----------------+
+  | `sys <https://docs.python.org/3/whatsnew/3.7.html#sys>`_                                                   |                |
+  +------------------------------------------------------------------------------------------------------------+----------------+
+  | sys.breakpointhook() added. sys.get(/set)_coroutine_origin_tracking_depth() added                          |                |
+  +------------------------------------------------------------------------------------------------------------+----------------+
+  | `time <https://docs.python.org/3/whatsnew/3.7.html#time>`_                                                 |                |
+  +------------------------------------------------------------------------------------------------------------+----------------+
+  | Mostly updates to support nanosecond resolution in PEP564, see above                                       |                |
+  +------------------------------------------------------------------------------------------------------------+----------------+
diff --git a/docs/differences/python_38.rst b/docs/differences/python_38.rst
new file mode 100644
index 0000000000000..47840a8b40ec3
--- /dev/null
+++ b/docs/differences/python_38.rst
@@ -0,0 +1,118 @@
+.. _python_38:
+
+Python 3.8
+==========
+
+Python 3.8.0 (final) was released on the 14 October 2019. The Features for 3.8
+are defined in `PEP 569 <https://www.python.org/dev/peps/pep-0569/#id9>`_ and
+a detailed description of the changes can be found in What's New in `Python
+3.8. <https://docs.python.org/3/whatsnew/3.8.html>`_
+
+  +--------------------------------------------------------+---------------------------------------------------+---------------+
+  | **Features:**                                                                                              | Status        |
+  +--------------------------------------------------------+---------------------------------------------------+---------------+
+  | `PEP 570 <https://www.python.org/dev/peps/pep-0570/>`_ | Positional-only arguments                         |               |
+  +--------------------------------------------------------+---------------------------------------------------+---------------+
+  | `PEP 572 <https://www.python.org/dev/peps/pep-0572/>`_ | Assignment Expressions                            |               |
+  +--------------------------------------------------------+---------------------------------------------------+---------------+
+  | `PEP 574 <https://www.python.org/dev/peps/pep-0574/>`_ | Pickle protocol 5 with out-of-band data           |               |
+  +--------------------------------------------------------+---------------------------------------------------+---------------+
+  | `PEP 578 <https://www.python.org/dev/peps/pep-0578/>`_ | Runtime audit hooks                               |               |
+  +--------------------------------------------------------+---------------------------------------------------+---------------+
+  | `PEP 587 <https://www.python.org/dev/peps/pep-0587/>`_ | Python Initialization Configuration               |               |
+  +--------------------------------------------------------+---------------------------------------------------+---------------+
+  | `PEP 590 <https://www.python.org/dev/peps/pep-0590/>`_ | Vectorcall: a fast calling protocol for CPython   |               |
+  +--------------------------------------------------------+---------------------------------------------------+---------------+
+  | **Miscellaneous**                                                                                                          |
+  +------------------------------------------------------------------------------------------------------------+---------------+
+  |  f-strings support = for self-documenting expressions and debugging                                        | Completed     |
+  +------------------------------------------------------------------------------------------------------------+---------------+
+
+Other Language Changes:
+
+  +------------------------------------------------------------------------------------------------------------+-------------+
+  | A *continue* statement was illegal in the *finally* clause due to a problem with the implementation. In    | Completed   |
+  | Python 3.8 this restriction was lifted                                                                     |             |
+  +------------------------------------------------------------------------------------------------------------+-------------+
+  | The *bool*, *int* , and *fractions.Fraction* types now have an *as_integer_ratio()* method like that found |             |
+  | in *float* and *decimal.Decimal*                                                                           |             |
+  +------------------------------------------------------------------------------------------------------------+-------------+
+  | Constructors of *int*, *float* and *complex* will now use the *__index__()* special method, if available   |             |
+  | and the corresponding method *__int__()*, *__float__()* or *__complex__()* is not available                |             |
+  +------------------------------------------------------------------------------------------------------------+-------------+
+  | Added support of *\N{name}* escapes in regular expressions                                                 |             |
+  +------------------------------------------------------------------------------------------------------------+-------------+
+  | Dict and dictviews are now iterable in reversed insertion order using *reversed()*                         |             |
+  +------------------------------------------------------------------------------------------------------------+-------------+
+  | The syntax allowed for keyword names in function calls was further restricted. In particular,              |             |
+  | f((keyword)=arg) is no longer allowed                                                                      |             |
+  +------------------------------------------------------------------------------------------------------------+-------------+
+  | Generalized iterable unpacking in yield and return statements no longer requires enclosing parentheses     |             |
+  +------------------------------------------------------------------------------------------------------------+-------------+
+  | When a comma is missed in code such as [(10, 20) (30, 40)], the compiler displays a SyntaxWarning with a   |             |
+  | helpful suggestion                                                                                         |             |
+  +------------------------------------------------------------------------------------------------------------+-------------+
+  | Arithmetic operations between subclasses of *datetime.date* or *datetime.datetime* and *datetime.timedelta*|             |
+  | objects now return an instance of the subclass, rather than the base class                                 |             |
+  +------------------------------------------------------------------------------------------------------------+-------------+
+  | When the Python interpreter is interrupted by *Ctrl-C (SIGINT)* and the resulting *KeyboardInterrupt*      |             |
+  | exception is not caught, the Python process now exits via a SIGINT signal or with the correct exit code    |             |
+  | such that the calling process can detect that it died due to  a *Ctrl-C*                                   |             |
+  +------------------------------------------------------------------------------------------------------------+-------------+
+  | Some advanced styles of programming require updating the *types.CodeType* object for an existing function  |             |
+  +------------------------------------------------------------------------------------------------------------+-------------+
+  | For integers, the three-argument form of the pow() function now permits the exponent to be negative in the |             |
+  | case where the base is relatively prime to the modulus                                                     |             |
+  +------------------------------------------------------------------------------------------------------------+-------------+
+  | Dict comprehensions have been synced-up with dict literals so that the key is computed first and the value |             |
+  | second                                                                                                     |             |
+  +------------------------------------------------------------------------------------------------------------+-------------+
+  | The *object.__reduce__()* method can now return a tuple from two to six elements long                      |             |
+  +------------------------------------------------------------------------------------------------------------+-------------+
+
+Changes to built-in modules:
+
+  +------------------------------------------------------------------------------------------------------------+-------------+
+  | `asyncio`                                                                                                                |
+  +------------------------------------------------------------------------------------------------------------+-------------+
+  | *asyncio.run()* has graduated from the provisional to stable API                                           | Completed   |
+  +------------------------------------------------------------------------------------------------------------+-------------+
+  | Running *python -m asyncio* launches a natively async REPL                                                 |             |
+  +------------------------------------------------------------------------------------------------------------+-------------+
+  | The exception *asyncio.CancelledError* now inherits from *BaseException* rather than *Exception* and no    | Completed   |
+  | longer inherits from *concurrent.futures.CancelledError*                                                   |             |
+  +------------------------------------------------------------------------------------------------------------+-------------+
+  | Added *asyncio.Task.get_coro()* for getting the wrapped coroutine within an *asyncio.Task*                 |             |
+  +------------------------------------------------------------------------------------------------------------+-------------+
+  | Asyncio tasks can now be named, either by passing the name keyword argument to *asyncio.create_task()* or  |             |
+  | the *create_task()* event loop method, or by calling the *set_name()* method on the task object            |             |
+  +------------------------------------------------------------------------------------------------------------+-------------+
+  | Added support for Happy Eyeballs to *asyncio.loop.create_connection()*. To specify the behavior, two new   |             |
+  | parameters have been added: *happy_eyeballs_delay* and interleave.                                         |             |
+  +------------------------------------------------------------------------------------------------------------+-------------+
+  | `gc`                                                                                                                     |
+  +------------------------------------------------------------------------------------------------------------+-------------+
+  | *get_objects()* can now receive an optional generation parameter indicating a generation to get objects    |             |
+  | from. (Note, though, that while *gc* is a built-in, *get_objects()* is not implemented for MicroPython)    |             |
+  +------------------------------------------------------------------------------------------------------------+-------------+
+  | `math`                                                                                                                   |
+  +------------------------------------------------------------------------------------------------------------+-------------+
+  | Added new function *math.dist()* for computing Euclidean distance between two points                       |             |
+  +------------------------------------------------------------------------------------------------------------+-------------+
+  | Expanded the *math.hypot()* function to handle multiple dimensions                                         |             |
+  +------------------------------------------------------------------------------------------------------------+-------------+
+  | Added new function, *math.prod()*, as analogous function to *sum()* that returns the product of a "start"  |             |
+  | value (default: 1) times an iterable of numbers                                                            |             |
+  +------------------------------------------------------------------------------------------------------------+-------------+
+  | Added two new combinatoric functions *math.perm()* and *math.comb()*                                       |             |
+  +------------------------------------------------------------------------------------------------------------+-------------+
+  | Added a new function *math.isqrt()* for computing accurate integer square roots without conversion to      |             |
+  | floating point                                                                                             |             |
+  +------------------------------------------------------------------------------------------------------------+-------------+
+  | The function *math.factorial()* no longer accepts arguments that are not int-like                          | Completed   |
+  +------------------------------------------------------------------------------------------------------------+-------------+
+  | `sys`                                                                                                                    |
+  +------------------------------------------------------------------------------------------------------------+-------------+
+  | Add new *sys.unraisablehook()* function which can be overridden to control how "unraisable exceptions"     |             |
+  | are handled                                                                                                |             |
+  +------------------------------------------------------------------------------------------------------------+-------------+
diff --git a/docs/differences/python_39.rst b/docs/differences/python_39.rst
new file mode 100644
index 0000000000000..6852dd635ea82
--- /dev/null
+++ b/docs/differences/python_39.rst
@@ -0,0 +1,121 @@
+.. _python_39:
+
+Python 3.9
+==========
+
+Python 3.9.0 (final) was released on the 5th October 2020. The Features for 3.9 are
+defined in `PEP 596 <https://www.python.org/dev/peps/pep-0596/#features-for-3-9>`_
+and a detailed description of the changes can be found in
+`What's New in Python 3.9 <https://docs.python.org/3/whatsnew/3.9.html>`_
+
+  +--------------------------------------------------------+----------------------------------------------------+--------------+
+  | **Features:**                                          |                                                    | **Status**   |
+  +--------------------------------------------------------+----------------------------------------------------+--------------+
+  | `PEP 573 <https://www.python.org/dev/peps/pep-0573/>`_ | fast access to module state from methods of C      |              |
+  |                                                        | extension types                                    |              |
+  +--------------------------------------------------------+----------------------------------------------------+--------------+
+  | `PEP 584 <https://www.python.org/dev/peps/pep-0584/>`_ | union operators added to dict                      |              |
+  +--------------------------------------------------------+----------------------------------------------------+--------------+
+  | `PEP 585 <https://www.python.org/dev/peps/pep-0584/>`_ | type hinting generics in standard collections      |              |
+  +--------------------------------------------------------+----------------------------------------------------+--------------+
+  | `PEP 593 <https://www.python.org/dev/peps/pep-0593/>`_ | flexible function and variable annotations         |              |
+  +--------------------------------------------------------+----------------------------------------------------+--------------+
+  | `PEP 602 <https://www.python.org/dev/peps/pep-0602/>`_ | CPython adopts an annual release cycle. Instead of |              |
+  |                                                        | annual, aiming for two month release cycle         |              |
+  +--------------------------------------------------------+----------------------------------------------------+--------------+
+  | `PEP 614 <https://www.python.org/dev/peps/pep-0614/>`_ | relaxed grammar restrictions on decorators         |              |
+  +--------------------------------------------------------+----------------------------------------------------+--------------+
+  | `PEP 615 <https://www.python.org/dev/peps/pep-0615/>`_ | the IANA Time Zone Database is now present in the  |              |
+  |                                                        | standard library in the zoneinfo module            |              |
+  +--------------------------------------------------------+----------------------------------------------------+--------------+
+  | `PEP 616 <https://www.python.org/dev/peps/pep-0616/>`_ | string methods to remove prefixes and suffixes     |              |
+  +--------------------------------------------------------+----------------------------------------------------+--------------+
+  | `PEP 617 <https://www.python.org/dev/peps/pep-0617/>`_ | CPython now uses a new parser based on PEG         |              |
+  +--------------------------------------------------------+----------------------------------------------------+--------------+
+
+Other Language Changes:
+
+  +-------------------------------------------------------------------------------------------------------------+---------------+
+  | *__import__()* now raises *ImportError* instead of *ValueError*                                             | Completed     |
+  +-------------------------------------------------------------------------------------------------------------+---------------+
+  | Python now gets the absolute path of the script filename specified on the command line (ex: *python3*       |               |
+  | *script.py*): the *__file__* attribute of the *__main__* module became an absolute path, rather than a      |               |
+  | relative path                                                                                               |               |
+  +-------------------------------------------------------------------------------------------------------------+---------------+
+  | By default, for best performance, the errors argument is only checked at the first encoding/decoding error  |               |
+  | and the encoding argument is sometimes ignored for empty strings                                            |               |
+  +-------------------------------------------------------------------------------------------------------------+---------------+
+  | *"".replace("", s, n)* now returns *s* instead of an empty string for all non-zero n. It is now consistent  |               |
+  | with *"".replace("", s)*                                                                                    |               |
+  +-------------------------------------------------------------------------------------------------------------+---------------+
+  | Any valid expression can now be used as a decorator. Previously, the grammar was much more restrictive      |               |
+  +-------------------------------------------------------------------------------------------------------------+---------------+
+  | Parallel running of *aclose()* / *asend()* / *athrow()* is now prohibited, and *ag_running* now reflects    |               |
+  | the actual running status of the async generator                                                            |               |
+  +-------------------------------------------------------------------------------------------------------------+---------------+
+  | Unexpected errors in calling the *__iter__* method are no longer masked by TypeError in the in operator and |               |
+  | functions contains(), indexOf() and countOf() of the operator module                                        |               |
+  +-------------------------------------------------------------------------------------------------------------+---------------+
+  | Unparenthesized lambda expressions can no longer be the expression part in an if clause in comprehensions   |               |
+  | and generator expressions                                                                                   |               |
+  +-------------------------------------------------------------------------------------------------------------+---------------+
+
+Changes to built-in modules:
+
+  +---------------------------------------------------------------------------------------------------------------+---------------+
+  | `asyncio`                                                                                                                     |
+  +---------------------------------------------------------------------------------------------------------------+---------------+
+  | Due to significant security concerns, the reuse_address parameter of *asyncio.loop.create_datagram_endpoint()*|               |
+  | is no longer supported                                                                                        |               |
+  +---------------------------------------------------------------------------------------------------------------+---------------+
+  | Added a new coroutine *shutdown_default_executor()* that schedules a shutdown for the default executor that   |               |
+  | waits on the *ThreadPoolExecutor* to finish closing. Also, *asyncio.run()* has been updated to use the new    |               |
+  | coroutine.                                                                                                    |               |
+  +---------------------------------------------------------------------------------------------------------------+---------------+
+  | Added *asyncio.PidfdChildWatcher*, a Linux-specific child watcher implementation that polls process file      |               |
+  | descriptors                                                                                                   |               |
+  +---------------------------------------------------------------------------------------------------------------+---------------+
+  | added a new *coroutine asyncio.to_thread()*                                                                   |               |
+  +---------------------------------------------------------------------------------------------------------------+---------------+
+  | When cancelling the task due to a timeout, *asyncio.wait_for()* will now wait until the cancellation is       |               |
+  | complete also in the case when timeout is <= 0, like it does with positive timeouts                           |               |
+  +---------------------------------------------------------------------------------------------------------------+---------------+
+  | *asyncio* now raises *TyperError* when calling incompatible methods with an *ssl.SSLSocket* socket            |               |
+  +---------------------------------------------------------------------------------------------------------------+---------------+
+  | `gc`                                                                                                                          |
+  +---------------------------------------------------------------------------------------------------------------+---------------+
+  | Garbage collection does not block on resurrected objects                                                      |               |
+  +---------------------------------------------------------------------------------------------------------------+---------------+
+  | Added a new function *gc.is_finalized()* to check if an object has been finalized by the garbage collector    |               |
+  +---------------------------------------------------------------------------------------------------------------+---------------+
+  | `math`                                                                                                                        |
+  +---------------------------------------------------------------------------------------------------------------+---------------+
+  | Expanded the *math.gcd()* function to handle multiple arguments. Formerly, it only supported two arguments    |               |
+  +---------------------------------------------------------------------------------------------------------------+---------------+
+  | Added *math.lcm()*: return the least common multiple of specified arguments                                   |               |
+  +---------------------------------------------------------------------------------------------------------------+---------------+
+  | Added *math.nextafter()*: return the next floating-point value after x towards y                              |               |
+  +---------------------------------------------------------------------------------------------------------------+---------------+
+  | Added *math.ulp()*: return the value of the least significant bit of a float                                  |               |
+  +---------------------------------------------------------------------------------------------------------------+---------------+
+  | `os`                                                                                                                          |
+  +---------------------------------------------------------------------------------------------------------------+---------------+
+  | Exposed the Linux-specific *os.pidfd_open()* and *os.P_PIDFD*                                                 |               |
+  +---------------------------------------------------------------------------------------------------------------+---------------+
+  | The *os.unsetenv()* function is now also available on Windows                                                 | Completed     |
+  +---------------------------------------------------------------------------------------------------------------+---------------+
+  | The *os.putenv()* and *os.unsetenv()* functions are now always available                                      | Completed     |
+  +---------------------------------------------------------------------------------------------------------------+---------------+
+  |  Added *os.waitstatus_to_exitcode()* function: convert a wait status to an exit code                          |               |
+  +---------------------------------------------------------------------------------------------------------------+---------------+
+  | `random`                                                                                                                      |
+  +---------------------------------------------------------------------------------------------------------------+---------------+
+  | Added a new *random.Random.randbytes* method: generate random bytes                                           |               |
+  +---------------------------------------------------------------------------------------------------------------+---------------+
+  | `sys`                                                                                                                         |
+  +---------------------------------------------------------------------------------------------------------------+---------------+
+  | Added a new *sys.platlibdir* attribute: name of the platform-specific library directory                       |               |
+  +---------------------------------------------------------------------------------------------------------------+---------------+
+  | Previously, *sys.stderr* was block-buffered when non-interactive. Now stderr defaults to always being         |               |
+  | line-buffered                                                                                                 |               |
+  +---------------------------------------------------------------------------------------------------------------+---------------+

From 58b56b91c454f4e1c04ca1cf58e35809caf979de Mon Sep 17 00:00:00 2001
From: Emilie Feral <emilie.feral@numworks.com>
Date: Mon, 27 Dec 2021 15:39:34 +0100
Subject: [PATCH 1538/3533] py/qstr: Reset mpstate.qstr_last_chunk before
 raising an error.

The qstr_last_chunk is not collected by the garbage collector.  This relies
on the assertion that qstr_pool_t also references the qstr_last_chunk.  If
an exception is raised while allocating the qstr_pool_t, qstr_last_chunk
has to be invalidated not to become a dangling reference at the next
garbage collection.

Signed-off-by: Emilie Feral <emilie.feral@numworks.com>
---
 py/qstr.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/py/qstr.c b/py/qstr.c
index c14ec5ae0073d..e5b13b700d822 100644
--- a/py/qstr.c
+++ b/py/qstr.c
@@ -153,6 +153,12 @@ STATIC qstr qstr_add(const byte *q_ptr) {
         #endif
         qstr_pool_t *pool = m_new_obj_var_maybe(qstr_pool_t, const char *, new_alloc);
         if (pool == NULL) {
+            // Keep qstr_last_chunk consistent with qstr_pool_t: qstr_last_chunk is not scanned
+            // at garbage collection since it's reachable from a qstr_pool_t.  And the caller of
+            // this function expects q_ptr to be stored in a qstr_pool_t so it can be reached
+            // by the collector.  If qstr_pool_t allocation failed, qstr_last_chunk needs to be
+            // NULL'd.  Otherwise it may become a dangling pointer at the next garbage collection.
+            MP_STATE_VM(qstr_last_chunk) = NULL;
             QSTR_EXIT();
             m_malloc_fail(new_alloc);
         }

From 644f4dcc94ad4eb3005e652b8502192dd2494ba7 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Fri, 31 Dec 2021 17:01:03 +0200
Subject: [PATCH 1539/3533] shared/runtime/pyexec: Cleanup EXEC_FLAG flag
 constants.

- Cleanup pyexec flags definitions so it's clear they are different.
- Use mp_uint_t for exec_flags because it should be unsigned.
---
 shared/runtime/pyexec.c | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/shared/runtime/pyexec.c b/shared/runtime/pyexec.c
index 2dceb647c3b64..5f05c1da3e61e 100644
--- a/shared/runtime/pyexec.c
+++ b/shared/runtime/pyexec.c
@@ -50,20 +50,20 @@ int pyexec_system_exit = 0;
 STATIC bool repl_display_debugging_info = 0;
 #endif
 
-#define EXEC_FLAG_PRINT_EOF (1)
-#define EXEC_FLAG_ALLOW_DEBUGGING (2)
-#define EXEC_FLAG_IS_REPL (4)
-#define EXEC_FLAG_SOURCE_IS_RAW_CODE (8)
-#define EXEC_FLAG_SOURCE_IS_VSTR (16)
-#define EXEC_FLAG_SOURCE_IS_FILENAME (32)
-#define EXEC_FLAG_SOURCE_IS_READER (64)
+#define EXEC_FLAG_PRINT_EOF             (1 << 0)
+#define EXEC_FLAG_ALLOW_DEBUGGING       (1 << 1)
+#define EXEC_FLAG_IS_REPL               (1 << 2)
+#define EXEC_FLAG_SOURCE_IS_RAW_CODE    (1 << 3)
+#define EXEC_FLAG_SOURCE_IS_VSTR        (1 << 4)
+#define EXEC_FLAG_SOURCE_IS_FILENAME    (1 << 5)
+#define EXEC_FLAG_SOURCE_IS_READER      (1 << 6)
 
 // parses, compiles and executes the code in the lexer
 // frees the lexer before returning
 // EXEC_FLAG_PRINT_EOF prints 2 EOF chars: 1 after normal output, 1 after exception output
 // EXEC_FLAG_ALLOW_DEBUGGING allows debugging info to be printed after executing the code
 // EXEC_FLAG_IS_REPL is used for REPL inputs (flag passed on to mp_compile)
-STATIC int parse_compile_execute(const void *source, mp_parse_input_kind_t input_kind, int exec_flags) {
+STATIC int parse_compile_execute(const void *source, mp_parse_input_kind_t input_kind, mp_uint_t exec_flags) {
     int ret = 0;
     #if MICROPY_REPL_INFO
     uint32_t start = 0;
@@ -135,6 +135,7 @@ STATIC int parse_compile_execute(const void *source, mp_parse_input_kind_t input
         if (exec_flags & EXEC_FLAG_PRINT_EOF) {
             mp_hal_stdout_tx_strn("\x04", 1);
         }
+
         // check for SystemExit
         if (mp_obj_is_subclass_fast(MP_OBJ_FROM_PTR(((mp_obj_base_t *)nlr.ret_val)->type), MP_OBJ_FROM_PTR(&mp_type_SystemExit))) {
             // at the moment, the value of SystemExit is unused

From 49d8ae3ecc8833123609822567cbed239bbc36f2 Mon Sep 17 00:00:00 2001
From: MikeTeachman <mike.teachman@gmail.com>
Date: Thu, 23 Dec 2021 09:27:49 -0800
Subject: [PATCH 1540/3533] esp32/machine_i2s: Add support for ESP-IDF 4.4.

- Add default values for I2S features added in ESP-IDF 4.4.
- Add workaround for bug introduced in ESP-IDF 4.4
  (https://github.com/espressif/esp-idf/issues/8121).
---
 ports/esp32/machine_i2s.c | 39 +++++++++++++++++++++++++++++++++------
 1 file changed, 33 insertions(+), 6 deletions(-)

diff --git a/ports/esp32/machine_i2s.c b/ports/esp32/machine_i2s.c
index 71d3ad11639b7..108caf677b0eb 100644
--- a/ports/esp32/machine_i2s.c
+++ b/ports/esp32/machine_i2s.c
@@ -263,13 +263,22 @@ STATIC uint32_t fill_appbuf_from_dma(machine_i2s_obj_t *self, mp_buffer_info_t *
             delay = portMAX_DELAY;  // block until supplied buffer is filled
         }
 
-        // read a chunk of audio samples from DMA memory
-        check_esp_err(i2s_read(
+        esp_err_t ret = i2s_read(
             self->port,
             self->transform_buffer,
             num_bytes_requested_from_dma,
             &num_bytes_received_from_dma,
-            delay));
+            delay);
+
+        // the following is a workaround for a bug in ESP-IDF v4.4
+        // https://github.com/espressif/esp-idf/issues/8121
+        #if (ESP_IDF_VERSION_MAJOR == 4) && (ESP_IDF_VERSION_MINOR >= 4)
+        if ((delay != portMAX_DELAY) && (ret == ESP_ERR_TIMEOUT)) {
+            ret = ESP_OK;
+        }
+        #endif
+
+        check_esp_err(ret);
 
         // process the transform buffer one frame at a time.
         // copy selected bytes from the transform buffer into the user supplied appbuf.
@@ -324,7 +333,17 @@ STATIC size_t copy_appbuf_to_dma(machine_i2s_obj_t *self, mp_buffer_info_t *appb
         delay = portMAX_DELAY;  // block until supplied buffer is emptied
     }
 
-    check_esp_err(i2s_write(self->port, appbuf->buf, appbuf->len, &num_bytes_written, delay));
+    esp_err_t ret = i2s_write(self->port, appbuf->buf, appbuf->len, &num_bytes_written, delay);
+
+    // the following is a workaround for a bug in ESP-IDF v4.4
+    // https://github.com/espressif/esp-idf/issues/8121
+    #if (ESP_IDF_VERSION_MAJOR == 4) && (ESP_IDF_VERSION_MINOR >= 4)
+    if ((delay != portMAX_DELAY) && (ret == ESP_ERR_TIMEOUT)) {
+        ret = ESP_OK;
+    }
+    #endif
+
+    check_esp_err(ret);
 
     if ((self->io_mode == UASYNCIO) && (num_bytes_written < appbuf->len)) {
         // Unable to empty the entire app buffer into DMA memory.  This indicates all DMA TX buffers are full.
@@ -447,6 +466,11 @@ STATIC void machine_i2s_init_helper(machine_i2s_obj_t *self, size_t n_pos_args,
     i2s_config.dma_buf_len = DMA_BUF_LEN_IN_I2S_FRAMES;
     i2s_config.use_apll = false;
     i2s_config.tx_desc_auto_clear = true;
+    i2s_config.fixed_mclk = 0;
+    #if (ESP_IDF_VERSION_MAJOR == 4) && (ESP_IDF_VERSION_MINOR >= 4)
+    i2s_config.mclk_multiple = I2S_MCLK_MULTIPLE_DEFAULT;
+    i2s_config.bits_per_chan = 0;
+    #endif
 
     // I2S queue size equals the number of DMA buffers
     check_esp_err(i2s_driver_install(self->port, &i2s_config, i2s_config.dma_buf_count, &self->i2s_event_queue));
@@ -463,14 +487,17 @@ STATIC void machine_i2s_init_helper(machine_i2s_obj_t *self, size_t n_pos_args,
     #endif
 
     i2s_pin_config_t pin_config;
+    #if (ESP_IDF_VERSION_MAJOR == 4) && (ESP_IDF_VERSION_MINOR >= 4)
+    pin_config.mck_io_num = I2S_PIN_NO_CHANGE;
+    #endif
     pin_config.bck_io_num = self->sck;
     pin_config.ws_io_num = self->ws;
 
     if (mode == (I2S_MODE_MASTER | I2S_MODE_RX)) {
         pin_config.data_in_num = self->sd;
-        pin_config.data_out_num = -1;
+        pin_config.data_out_num = I2S_PIN_NO_CHANGE;
     } else { // TX
-        pin_config.data_in_num = -1;
+        pin_config.data_in_num = I2S_PIN_NO_CHANGE;
         pin_config.data_out_num = self->sd;
     }
 

From 79ae7098cab1eb464ef046cfcbdc9d512bd835dc Mon Sep 17 00:00:00 2001
From: Simon Baatz <gmbnomis@gmail.com>
Date: Sun, 2 Jan 2022 00:30:37 +0100
Subject: [PATCH 1541/3533] esp32/machine_bitstream: Fix signal duplication on
 output pins.

After changing the bitstream implementation to use the RMT driver in
commit 72d86158121e32bbabaeade08f449d507bf40f9a
("esp32/machine_bitstream.c: Replace with RMT-based driver."), using
multiple `Neopixel` instances shows signal duplication between the
instances (i.e. a `write()` on one instance is written to all instances).

On invocation, the rmt driver configures the GPIO matrix to route the
output signal to the respective GPIO pin.  When called for a different
`NeoPixel` instance using a different pin, the new route is established,
but the old route still exists.  Now, the RMT output signal is sent to both
pins.

Fix this by setting the standard GPIO output function for the current pin
after uninstalling the RMT driver.

Signed-off-by: Simon Baatz <gmbnomis@gmail.com>
---
 ports/esp32/machine_bitstream.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ports/esp32/machine_bitstream.c b/ports/esp32/machine_bitstream.c
index 9854b83434e4c..4ba05e889527e 100644
--- a/ports/esp32/machine_bitstream.c
+++ b/ports/esp32/machine_bitstream.c
@@ -133,6 +133,9 @@ void machine_bitstream_high_low(mp_hal_pin_obj_t pin, uint32_t *timing_ns, const
 
     // Uninstall the driver.
     check_esp_err(rmt_driver_uninstall(config.channel));
+
+    // Cancel RMT output to GPIO pin.
+    gpio_matrix_out(pin, SIG_GPIO_OUT_IDX, false, false);
 }
 
 #endif // MICROPY_PY_MACHINE_BITSTREAM

From f4487a00494563c1c59ab1a2bef53c1c220718eb Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Wed, 29 Dec 2021 19:43:22 +0200
Subject: [PATCH 1542/3533] rp2/boards/ARDUINO_NANO_RP2040_CONNECT: Set default
 I2C pins.

---
 .../boards/ARDUINO_NANO_RP2040_CONNECT/mpconfigboard.h    | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/mpconfigboard.h b/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/mpconfigboard.h
index 08995212e25fc..57c2d7879eba6 100644
--- a/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/mpconfigboard.h
+++ b/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/mpconfigboard.h
@@ -24,6 +24,14 @@
 #define MICROPY_HW_SPI1_MOSI            (11)
 #define MICROPY_HW_SPI1_MISO            (8)
 
+// I2C0 config.
+#define MICROPY_HW_I2C0_SCL             (13)
+#define MICROPY_HW_I2C0_SDA             (12)
+
+// I2C1 config.
+#define MICROPY_HW_I2C1_SCL             (27)
+#define MICROPY_HW_I2C1_SDA             (26)
+
 // Bluetooth config.
 #define MICROPY_HW_BLE_UART_ID          (1)
 #define MICROPY_HW_BLE_UART_BAUDRATE    (119600)

From 9e56e630caeec9077cd95ac33b702a7b2187300e Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Thu, 30 Dec 2021 12:08:16 +0100
Subject: [PATCH 1543/3533] rp2/machine_pwm: Fix PWM frequency setting.

The top value was off by 1: in order to count n ticks it has to be set to
n-1.

Fixes issue #8122.
---
 ports/rp2/machine_pwm.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/rp2/machine_pwm.c b/ports/rp2/machine_pwm.c
index 2952a43062a33..d2cb937952d93 100644
--- a/ports/rp2/machine_pwm.c
+++ b/ports/rp2/machine_pwm.c
@@ -91,7 +91,7 @@ STATIC mp_obj_t mp_machine_pwm_freq_get(machine_pwm_obj_t *self) {
     uint32_t source_hz = clock_get_hz(clk_sys);
     uint32_t div16 = pwm_hw->slice[self->slice].div;
     uint32_t top = pwm_hw->slice[self->slice].top;
-    uint32_t pwm_freq = 16 * source_hz / div16 / top;
+    uint32_t pwm_freq = 16 * source_hz / div16 / (top + 1);
     return MP_OBJ_NEW_SMALL_INT(pwm_freq);
 }
 
@@ -123,7 +123,7 @@ STATIC void mp_machine_pwm_freq_set(machine_pwm_obj_t *self, mp_int_t freq) {
         mp_raise_ValueError(MP_ERROR_TEXT("freq too small"));
     }
     pwm_hw->slice[self->slice].div = div16_top;
-    pwm_hw->slice[self->slice].top = top;
+    pwm_hw->slice[self->slice].top = top - 1;
 }
 
 STATIC mp_obj_t mp_machine_pwm_duty_get_u16(machine_pwm_obj_t *self) {

From 01d9b7adde0ed14002a9d47434ebb633205d45c3 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Thu, 30 Dec 2021 14:58:30 +0100
Subject: [PATCH 1544/3533] rp2/machine_pwm: Keep duty value when changing the
 frequency.

The duty is saved and set whenever the frequency is changed, unless the
duty rate was not set yet.
---
 ports/rp2/machine_pwm.c | 56 ++++++++++++++++++++++++++++-------------
 1 file changed, 39 insertions(+), 17 deletions(-)

diff --git a/ports/rp2/machine_pwm.c b/ports/rp2/machine_pwm.c
index d2cb937952d93..41dc3ab4761e5 100644
--- a/ports/rp2/machine_pwm.c
+++ b/ports/rp2/machine_pwm.c
@@ -38,27 +38,38 @@ typedef struct _machine_pwm_obj_t {
     mp_obj_base_t base;
     uint8_t slice;
     uint8_t channel;
+    uint8_t duty_type;
+    mp_int_t duty;
 } machine_pwm_obj_t;
 
+enum {
+    DUTY_NOT_SET = 0,
+    DUTY_U16,
+    DUTY_NS
+};
+
 STATIC machine_pwm_obj_t machine_pwm_obj[] = {
-    {{&machine_pwm_type}, 0, PWM_CHAN_A},
-    {{&machine_pwm_type}, 0, PWM_CHAN_B},
-    {{&machine_pwm_type}, 1, PWM_CHAN_A},
-    {{&machine_pwm_type}, 1, PWM_CHAN_B},
-    {{&machine_pwm_type}, 2, PWM_CHAN_A},
-    {{&machine_pwm_type}, 2, PWM_CHAN_B},
-    {{&machine_pwm_type}, 3, PWM_CHAN_A},
-    {{&machine_pwm_type}, 3, PWM_CHAN_B},
-    {{&machine_pwm_type}, 4, PWM_CHAN_A},
-    {{&machine_pwm_type}, 4, PWM_CHAN_B},
-    {{&machine_pwm_type}, 5, PWM_CHAN_A},
-    {{&machine_pwm_type}, 5, PWM_CHAN_B},
-    {{&machine_pwm_type}, 6, PWM_CHAN_A},
-    {{&machine_pwm_type}, 6, PWM_CHAN_B},
-    {{&machine_pwm_type}, 7, PWM_CHAN_A},
-    {{&machine_pwm_type}, 7, PWM_CHAN_B},
+    {{&machine_pwm_type}, 0, PWM_CHAN_A, DUTY_NOT_SET, 0},
+    {{&machine_pwm_type}, 0, PWM_CHAN_B, DUTY_NOT_SET, 0},
+    {{&machine_pwm_type}, 1, PWM_CHAN_A, DUTY_NOT_SET, 0},
+    {{&machine_pwm_type}, 1, PWM_CHAN_B, DUTY_NOT_SET, 0},
+    {{&machine_pwm_type}, 2, PWM_CHAN_A, DUTY_NOT_SET, 0},
+    {{&machine_pwm_type}, 2, PWM_CHAN_B, DUTY_NOT_SET, 0},
+    {{&machine_pwm_type}, 3, PWM_CHAN_A, DUTY_NOT_SET, 0},
+    {{&machine_pwm_type}, 3, PWM_CHAN_B, DUTY_NOT_SET, 0},
+    {{&machine_pwm_type}, 4, PWM_CHAN_A, DUTY_NOT_SET, 0},
+    {{&machine_pwm_type}, 4, PWM_CHAN_B, DUTY_NOT_SET, 0},
+    {{&machine_pwm_type}, 5, PWM_CHAN_A, DUTY_NOT_SET, 0},
+    {{&machine_pwm_type}, 5, PWM_CHAN_B, DUTY_NOT_SET, 0},
+    {{&machine_pwm_type}, 6, PWM_CHAN_A, DUTY_NOT_SET, 0},
+    {{&machine_pwm_type}, 6, PWM_CHAN_B, DUTY_NOT_SET, 0},
+    {{&machine_pwm_type}, 7, PWM_CHAN_A, DUTY_NOT_SET, 0},
+    {{&machine_pwm_type}, 7, PWM_CHAN_B, DUTY_NOT_SET, 0},
 };
 
+STATIC void mp_machine_pwm_duty_set_u16(machine_pwm_obj_t *self, mp_int_t duty_u16);
+STATIC void mp_machine_pwm_duty_set_ns(machine_pwm_obj_t *self, mp_int_t duty_ns);
+
 STATIC void mp_machine_pwm_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     machine_pwm_obj_t *self = MP_OBJ_TO_PTR(self_in);
     mp_printf(print, "<PWM slice=%u channel=%u>", self->slice, self->channel);
@@ -75,7 +86,8 @@ STATIC mp_obj_t mp_machine_pwm_make_new(const mp_obj_type_t *type, size_t n_args
     // Get static peripheral object.
     uint slice = pwm_gpio_to_slice_num(gpio);
     uint8_t channel = pwm_gpio_to_channel(gpio);
-    const machine_pwm_obj_t *self = &machine_pwm_obj[slice * 2 + channel];
+    machine_pwm_obj_t *self = &machine_pwm_obj[slice * 2 + channel];
+    self->duty_type = DUTY_NOT_SET;
 
     // Select PWM function for given GPIO.
     gpio_set_function(gpio, GPIO_FUNC_PWM);
@@ -84,6 +96,7 @@ STATIC mp_obj_t mp_machine_pwm_make_new(const mp_obj_type_t *type, size_t n_args
 }
 
 STATIC void mp_machine_pwm_deinit(machine_pwm_obj_t *self) {
+    self->duty_type = DUTY_NOT_SET;
     pwm_set_enabled(self->slice, false);
 }
 
@@ -124,6 +137,11 @@ STATIC void mp_machine_pwm_freq_set(machine_pwm_obj_t *self, mp_int_t freq) {
     }
     pwm_hw->slice[self->slice].div = div16_top;
     pwm_hw->slice[self->slice].top = top - 1;
+    if (self->duty_type == DUTY_U16) {
+        mp_machine_pwm_duty_set_u16(self, self->duty);
+    } else if (self->duty_type == DUTY_NS) {
+        mp_machine_pwm_duty_set_ns(self, self->duty);
+    }
 }
 
 STATIC mp_obj_t mp_machine_pwm_duty_get_u16(machine_pwm_obj_t *self) {
@@ -138,6 +156,8 @@ STATIC void mp_machine_pwm_duty_set_u16(machine_pwm_obj_t *self, mp_int_t duty_u
     uint32_t cc = duty_u16 * (top + 1) / 65535;
     pwm_set_chan_level(self->slice, self->channel, cc);
     pwm_set_enabled(self->slice, true);
+    self->duty = duty_u16;
+    self->duty_type = DUTY_U16;
 }
 
 STATIC mp_obj_t mp_machine_pwm_duty_get_ns(machine_pwm_obj_t *self) {
@@ -157,4 +177,6 @@ STATIC void mp_machine_pwm_duty_set_ns(machine_pwm_obj_t *self, mp_int_t duty_ns
     }
     pwm_set_chan_level(self->slice, self->channel, cc);
     pwm_set_enabled(self->slice, true);
+    self->duty = duty_ns;
+    self->duty_type = DUTY_NS;
 }

From 908e4cf5c3e21c73877686aa233b3dfd49d9083c Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Sun, 2 Jan 2022 15:07:33 +0200
Subject: [PATCH 1545/3533] rp2: Add support for DHT11 and DHT22 sensors.

---
 drivers/dht/dht.py           | 2 ++
 ports/rp2/CMakeLists.txt     | 1 +
 ports/rp2/boards/manifest.py | 1 +
 ports/rp2/modrp2.c           | 3 +++
 4 files changed, 7 insertions(+)

diff --git a/drivers/dht/dht.py b/drivers/dht/dht.py
index 322608990e5fc..9be23b3ae0681 100644
--- a/drivers/dht/dht.py
+++ b/drivers/dht/dht.py
@@ -7,6 +7,8 @@
     from esp import dht_readinto
 elif sys.platform == "mimxrt":
     from mimxrt import dht_readinto
+elif sys.platform == "rp2":
+    from rp2 import dht_readinto
 else:
     from pyb import dht_readinto
 
diff --git a/ports/rp2/CMakeLists.txt b/ports/rp2/CMakeLists.txt
index c2f8088542668..c87ccf0d65e22 100644
--- a/ports/rp2/CMakeLists.txt
+++ b/ports/rp2/CMakeLists.txt
@@ -79,6 +79,7 @@ set(MICROPY_SOURCE_LIB
 
 set(MICROPY_SOURCE_DRIVERS
     ${MICROPY_DIR}/drivers/bus/softspi.c
+    ${MICROPY_DIR}/drivers/dht/dht.c
 )
 
 set(MICROPY_SOURCE_PORT
diff --git a/ports/rp2/boards/manifest.py b/ports/rp2/boards/manifest.py
index a45bbe0661c3c..b0e5e315544f2 100644
--- a/ports/rp2/boards/manifest.py
+++ b/ports/rp2/boards/manifest.py
@@ -1,4 +1,5 @@
 freeze("$(PORT_DIR)/modules")
 freeze("$(MPY_DIR)/drivers/onewire")
+freeze("$(MPY_DIR)/drivers/dht", "dht.py")
 include("$(MPY_DIR)/extmod/uasyncio/manifest.py")
 include("$(MPY_DIR)/drivers/neopixel/manifest.py")
diff --git a/ports/rp2/modrp2.c b/ports/rp2/modrp2.c
index 8009fa33f8749..15c61911d3331 100644
--- a/ports/rp2/modrp2.c
+++ b/ports/rp2/modrp2.c
@@ -25,6 +25,7 @@
  */
 
 #include "py/runtime.h"
+#include "drivers/dht/dht.h"
 #include "modrp2.h"
 
 STATIC const mp_rom_map_elem_t rp2_module_globals_table[] = {
@@ -32,6 +33,8 @@ STATIC const mp_rom_map_elem_t rp2_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_Flash),               MP_ROM_PTR(&rp2_flash_type) },
     { MP_ROM_QSTR(MP_QSTR_PIO),                 MP_ROM_PTR(&rp2_pio_type) },
     { MP_ROM_QSTR(MP_QSTR_StateMachine),        MP_ROM_PTR(&rp2_state_machine_type) },
+
+    { MP_ROM_QSTR(MP_QSTR_dht_readinto),        MP_ROM_PTR(&dht_readinto_obj) },
 };
 STATIC MP_DEFINE_CONST_DICT(rp2_module_globals, rp2_module_globals_table);
 

From 1469e299053be4de4510cf7fd1d3f6924c902ad6 Mon Sep 17 00:00:00 2001
From: Maureen Helm <maureen.helm@intel.com>
Date: Mon, 3 Jan 2022 09:51:56 -0600
Subject: [PATCH 1546/3533] tools/ci.sh: Upgrade Zephyr docker image to
 v0.21.0.

As a prerequisite to upgrading to Zephyr v2.7.0, upgrade CI to use
Zephyr docker image v0.21.0. In particular, this is needed to pick up a
newer CMake version because Zephyr v2.7.0 increased the minimum CMake
version required to 3.20.0.

Signed-off-by: Maureen Helm <maureen.helm@intel.com>
---
 tools/ci.sh | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/tools/ci.sh b/tools/ci.sh
index bf5b1fd043eea..5312de8a94ecd 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -603,15 +603,18 @@ function ci_windows_build {
 ########################################################################################
 # ports/zephyr
 
+ZEPHYR_DOCKER_VERSION=v0.21.0
+ZEPHYR_SDK_VERSION=0.13.2
+
 function ci_zephyr_setup {
-    docker pull zephyrprojectrtos/ci:v0.17.3
+    docker pull zephyrprojectrtos/ci:${ZEPHYR_DOCKER_VERSION}
     docker run --name zephyr-ci -d -it \
       -v "$(pwd)":/micropython \
-      -e ZEPHYR_SDK_INSTALL_DIR=/opt/toolchains/zephyr-sdk-0.12.4 \
+      -e ZEPHYR_SDK_INSTALL_DIR=/opt/toolchains/zephyr-sdk-${ZEPHYR_SDK_VERSION} \
       -e ZEPHYR_TOOLCHAIN_VARIANT=zephyr \
       -e ZEPHYR_BASE=/zephyrproject/zephyr \
       -w /micropython/ports/zephyr \
-      zephyrprojectrtos/ci:v0.17.3
+      zephyrprojectrtos/ci:${ZEPHYR_DOCKER_VERSION}
     docker ps -a
 }
 

From ddbbfbed7548bc38f4e560d3648e00993cbaf124 Mon Sep 17 00:00:00 2001
From: Maureen Helm <maureen.helm@intel.com>
Date: Mon, 3 Jan 2022 10:10:50 -0600
Subject: [PATCH 1547/3533] zephyr: Increase minimum CMake version to 3.20.0.

As a prerequisite to upgrading to Zephyr v2.7.0, upgrade the minimum
CMake version required for the Zephyr port to 3.20.0.

Signed-off-by: Maureen Helm <maureen.helm@intel.com>
---
 ports/zephyr/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/zephyr/CMakeLists.txt b/ports/zephyr/CMakeLists.txt
index ca18f2cb91ea8..d809b7007d313 100644
--- a/ports/zephyr/CMakeLists.txt
+++ b/ports/zephyr/CMakeLists.txt
@@ -22,7 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-cmake_minimum_required(VERSION 3.13.1)
+cmake_minimum_required(VERSION 3.20.0)
 
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 project(micropython)

From 080a9e906d2ab231dad5c984d55608a340ddb68c Mon Sep 17 00:00:00 2001
From: Maureen Helm <maureen.helm@intel.com>
Date: Mon, 3 Jan 2022 10:16:44 -0600
Subject: [PATCH 1548/3533] zephyr: Update include path to reboot.h.

The reboot header was moved to a different path in Zephyr v2.6.0. The
old path was deprecated for two releases (v2.6.0 and v2.7.0) and will no
longer be supported after Zephyr v2.7.0.

Signed-off-by: Maureen Helm <maureen.helm@intel.com>
---
 ports/zephyr/modmachine.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/zephyr/modmachine.c b/ports/zephyr/modmachine.c
index adec9160be676..bc984d1b631c7 100644
--- a/ports/zephyr/modmachine.c
+++ b/ports/zephyr/modmachine.c
@@ -28,7 +28,7 @@
 
 #include <stdint.h>
 #include <stdio.h>
-#include <power/reboot.h>
+#include <sys/reboot.h>
 
 #include "py/obj.h"
 #include "py/runtime.h"

From 1e5df0982aea7adaac74ce9be3be62a638660fcd Mon Sep 17 00:00:00 2001
From: Maureen Helm <maureen.helm@intel.com>
Date: Mon, 3 Jan 2022 17:19:37 -0600
Subject: [PATCH 1549/3533] zephyr: Get UART console device from devicetree
 instead of Kconfig.

Updates the Zephyr port to get the UART console device from devicetree
instead of Kconfig. The Kconfig option CONFIG_UART_CONSOLE_ON_DEV_NAME
was removed in Zephyr v2.7.0.

Signed-off-by: Maureen Helm <maureen.helm@intel.com>
---
 ports/zephyr/uart_core.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/ports/zephyr/uart_core.c b/ports/zephyr/uart_core.c
index 44bdeb5c2784c..1313a51ae20f3 100644
--- a/ports/zephyr/uart_core.c
+++ b/ports/zephyr/uart_core.c
@@ -53,10 +53,8 @@ void mp_hal_stdout_tx_strn(const char *str, mp_uint_t len) {
         }
     }
     #else
-    static const struct device *uart_console_dev;
-    if (uart_console_dev == NULL) {
-        uart_console_dev = device_get_binding(CONFIG_UART_CONSOLE_ON_DEV_NAME);
-    }
+    static const struct device *uart_console_dev =
+        DEVICE_DT_GET(DT_CHOSEN(zephyr_console));
 
     while (len--) {
         uart_poll_out(uart_console_dev, *str++);

From 0cf03bd3b1fbaa3c025b50b1329286af448a41a6 Mon Sep 17 00:00:00 2001
From: Maureen Helm <maureen.helm@intel.com>
Date: Tue, 4 Jan 2022 16:58:42 -0600
Subject: [PATCH 1550/3533] zephyr: Use CONFIG_USB_DEVICE_STACK for conditional
 USB device support.

CONFIG_USB was removed in Zephyr v2.7.0 after some Kconfig rework that
made it sufficient to use CONFIG_USB_DEVICE_STACK only.

Signed-off-by: Maureen Helm <maureen.helm@intel.com>
---
 ports/zephyr/boards/mimxrt1050_evk.conf | 1 -
 ports/zephyr/main.c                     | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/ports/zephyr/boards/mimxrt1050_evk.conf b/ports/zephyr/boards/mimxrt1050_evk.conf
index c4abf726a450c..98981df75a005 100644
--- a/ports/zephyr/boards/mimxrt1050_evk.conf
+++ b/ports/zephyr/boards/mimxrt1050_evk.conf
@@ -1,7 +1,6 @@
 # Required for zephyr.DiskAccess block devices
 CONFIG_DISK_ACCESS=y
 
-CONFIG_USB=y
 CONFIG_USB_DEVICE_STACK=y
 CONFIG_USB_DEVICE_PRODUCT="Zephyr MicroPython"
 CONFIG_USB_MASS_STORAGE=y
diff --git a/ports/zephyr/main.c b/ports/zephyr/main.c
index f97276834078d..1275a49739e6b 100644
--- a/ports/zephyr/main.c
+++ b/ports/zephyr/main.c
@@ -34,7 +34,7 @@
 #include <net/net_context.h>
 #endif
 
-#ifdef CONFIG_USB
+#ifdef CONFIG_USB_DEVICE_STACK
 #include <usb/usb_device.h>
 #endif
 
@@ -140,7 +140,7 @@ int real_main(void) {
     #endif
     mp_init();
 
-    #ifdef CONFIG_USB
+    #ifdef CONFIG_USB_DEVICE_STACK
     usb_enable(NULL);
     #endif
 

From c6d26bc524a2025f7721a889c36276570e355b0c Mon Sep 17 00:00:00 2001
From: Maureen Helm <maureen.helm@intel.com>
Date: Mon, 3 Jan 2022 10:22:46 -0600
Subject: [PATCH 1551/3533] zephyr: Upgrade to Zephyr v2.7.0.

Updates the Zephyr port build instructions and CI to use the latest
Zephyr release tag.

Signed-off-by: Maureen Helm <maureen.helm@intel.com>
---
 docs/zephyr/tutorial/repl.rst | 4 ++--
 ports/zephyr/README.md        | 6 +++---
 tools/ci.sh                   | 3 ++-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/docs/zephyr/tutorial/repl.rst b/docs/zephyr/tutorial/repl.rst
index a7e8955d0b615..71e732e610383 100644
--- a/docs/zephyr/tutorial/repl.rst
+++ b/docs/zephyr/tutorial/repl.rst
@@ -31,8 +31,8 @@ With your serial program open (PuTTY, screen, picocom, etc) you may see a
 blank screen with a flashing cursor. Press Enter (or reset the board) and
 you should be presented with the following text::
 
-        *** Booting Zephyr OS build v2.6.0-rc1-416-g3056c5ec30ad  ***
-        MicroPython v2.6.0-rc1-416-g3056c5ec30 on 2021-06-24; zephyr-frdm_k64f with mk64f12
+        *** Booting Zephyr OS build zephyr-v2.7.0  ***
+        MicroPython v1.17-288-gb695f5a70-dirty on 2022-01-03; zephyr-frdm_k64f with mk64f12
         Type "help()" for more information.
         >>>
 
diff --git a/ports/zephyr/README.md b/ports/zephyr/README.md
index e0b02af222ac2..6b1c7ddd5f0bd 100644
--- a/ports/zephyr/README.md
+++ b/ports/zephyr/README.md
@@ -4,7 +4,7 @@ MicroPython port to Zephyr RTOS
 This is a work-in-progress port of MicroPython to Zephyr RTOS
 (http://zephyrproject.org).
 
-This port requires Zephyr version v2.6.0, and may also work on higher
+This port requires Zephyr version v2.7.0, and may also work on higher
 versions.  All boards supported
 by Zephyr (with standard level of features support, like UART console)
 should work with MicroPython (but not all were tested).
@@ -39,13 +39,13 @@ setup is correct.
 If you already have Zephyr installed but are having issues building the
 MicroPython port then try installing the correct version of Zephyr via:
 
-    $ west init zephyrproject -m https://github.com/zephyrproject-rtos/zephyr --mr v2.6.0
+    $ west init zephyrproject -m https://github.com/zephyrproject-rtos/zephyr --mr v2.7.0
 
 Alternatively, you don't have to redo the Zephyr installation to just
 switch from master to a tagged release, you can instead do:
 
     $ cd zephyrproject/zephyr
-    $ git checkout v2.6.0
+    $ git checkout v2.7.0
     $ west update
 
 With Zephyr installed you may then need to configure your environment,
diff --git a/tools/ci.sh b/tools/ci.sh
index 5312de8a94ecd..b8820950bf13d 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -605,6 +605,7 @@ function ci_windows_build {
 
 ZEPHYR_DOCKER_VERSION=v0.21.0
 ZEPHYR_SDK_VERSION=0.13.2
+ZEPHYR_VERSION=v2.7.0
 
 function ci_zephyr_setup {
     docker pull zephyrprojectrtos/ci:${ZEPHYR_DOCKER_VERSION}
@@ -619,7 +620,7 @@ function ci_zephyr_setup {
 }
 
 function ci_zephyr_install {
-    docker exec zephyr-ci west init --mr v2.6.0 /zephyrproject
+    docker exec zephyr-ci west init --mr ${ZEPHYR_VERSION} /zephyrproject
     docker exec -w /zephyrproject zephyr-ci west update
     docker exec -w /zephyrproject zephyr-ci west zephyr-export
 }

From 0f25e0387cd816df702cf48544e4f0b53509afac Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Tue, 4 Jan 2022 19:20:38 +0200
Subject: [PATCH 1552/3533] extmod/network_ninaw10: Disable active connections
 before connecting.

---
 extmod/network_ninaw10.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/extmod/network_ninaw10.c b/extmod/network_ninaw10.c
index f5f9967397668..ce7cfdd8e1b21 100644
--- a/extmod/network_ninaw10.c
+++ b/extmod/network_ninaw10.c
@@ -173,6 +173,11 @@ STATIC mp_obj_t network_ninaw10_connect(mp_uint_t n_args, const mp_obj_t *pos_ar
         mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("Key can't be empty!"));
     }
 
+    // Disconnect active connections first.
+    if (nina_isconnected()) {
+        nina_disconnect();
+    }
+
     if (self->itf == MOD_NETWORK_STA_IF) {
         // Initialize WiFi in Station mode.
         if (nina_connect(ssid, security, key, 0) != 0) {

From 544c232eb78b9ef73f0a4edc86d22edb1ad107c9 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Tue, 4 Jan 2022 19:57:21 +0200
Subject: [PATCH 1553/3533] extmod/network_ninaw10: Make NIC state persistent.

---
 extmod/network_ninaw10.c | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/extmod/network_ninaw10.c b/extmod/network_ninaw10.c
index ce7cfdd8e1b21..2c24c01f4cb11 100644
--- a/extmod/network_ninaw10.c
+++ b/extmod/network_ninaw10.c
@@ -58,25 +58,20 @@ typedef struct _nina_obj_t {
 
 static uint16_t bind_port = BIND_PORT_RANGE_MIN;
 const mod_network_nic_type_t mod_network_nic_type_nina;
-static nina_obj_t nina_obj = {{(mp_obj_type_t *)&mod_network_nic_type_nina}, false, MOD_NETWORK_STA_IF};
+static nina_obj_t network_nina_wl_sta = {{(mp_obj_type_t *)&mod_network_nic_type_nina}, false, MOD_NETWORK_STA_IF};
+static nina_obj_t network_nina_wl_ap = {{(mp_obj_type_t *)&mod_network_nic_type_nina}, false, MOD_NETWORK_AP_IF};
 
 STATIC mp_obj_t network_ninaw10_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
     mp_arg_check_num(n_args, n_kw, 0, 1, false);
-
-    nina_obj.active = false;
-    if (n_args == 0) {
-        nina_obj.itf = MOD_NETWORK_STA_IF;
+    mp_obj_t nina_obj;
+    if (n_args == 0 || mp_obj_get_int(args[0]) == MOD_NETWORK_STA_IF) {
+        nina_obj = MP_OBJ_FROM_PTR(&network_nina_wl_sta);
     } else {
-        nina_obj.itf = mp_obj_get_int(args[0]);
+        nina_obj = MP_OBJ_FROM_PTR(&network_nina_wl_ap);
     }
-
-    // Reset autobind port.
-    bind_port = BIND_PORT_RANGE_MIN;
-
     // Register with network module
-    mod_network_register_nic(MP_OBJ_FROM_PTR(&nina_obj));
-
-    return MP_OBJ_FROM_PTR(&nina_obj);
+    mod_network_register_nic(nina_obj);
+    return nina_obj;
 }
 
 STATIC mp_obj_t network_ninaw10_active(size_t n_args, const mp_obj_t *args) {

From 73a6b53dbe3c0adb5dcbb43e6f9457d32ca1d882 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Tue, 4 Jan 2022 20:06:32 +0200
Subject: [PATCH 1554/3533] extmod/network_ninaw10: Return -1 on timeout from
 recv/send.

---
 extmod/network_ninaw10.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/extmod/network_ninaw10.c b/extmod/network_ninaw10.c
index 2c24c01f4cb11..50535f7d82f1e 100644
--- a/extmod/network_ninaw10.c
+++ b/extmod/network_ninaw10.c
@@ -435,7 +435,7 @@ STATIC mp_uint_t network_ninaw10_socket_send(mod_network_socket_obj_t *socket, c
     if (ret == NINA_ERROR_TIMEOUT) {
         // The socket is Not closed on timeout when calling functions that accept a timeout.
         *_errno = MP_ETIMEDOUT;
-        return 0;
+        return -1;
     } else if (ret < 0) {
         // Close the socket on any other errors.
         *_errno = ret;
@@ -450,7 +450,7 @@ STATIC mp_uint_t network_ninaw10_socket_recv(mod_network_socket_obj_t *socket, b
     if (ret == NINA_ERROR_TIMEOUT) {
         // The socket is Not closed on timeout when calling functions that accept a timeout.
         *_errno = MP_ETIMEDOUT;
-        return 0;
+        return -1;
     } else if (ret < 0) {
         // Close the socket on any other errors.
         *_errno = ret;
@@ -482,7 +482,7 @@ STATIC mp_uint_t network_ninaw10_socket_sendto(mod_network_socket_obj_t *socket,
     if (ret == NINA_ERROR_TIMEOUT) {
         // The socket is Not closed on timeout when calling functions that accept a timeout.
         *_errno = MP_ETIMEDOUT;
-        return 0;
+        return -1;
     } else if (ret < 0) {
         *_errno = ret;
         network_ninaw10_socket_close(socket);
@@ -502,7 +502,7 @@ STATIC mp_uint_t network_ninaw10_socket_recvfrom(mod_network_socket_obj_t *socke
     if (ret == NINA_ERROR_TIMEOUT) {
         // The socket is Not closed on timeout when calling functions that accept a timeout.
         *_errno = MP_ETIMEDOUT;
-        return 0;
+        return -1;
     } else if (ret < 0) {
         // Close the socket on any other errors.
         *_errno = ret;

From 5a860312234e47764344ae294356aa2c3b88584c Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Tue, 4 Jan 2022 21:28:23 +0200
Subject: [PATCH 1555/3533] extmod/network_ninaw10: Make recv/recvfrom
 interchangeable.

---
 extmod/network_ninaw10.c | 26 ++++++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/extmod/network_ninaw10.c b/extmod/network_ninaw10.c
index 50535f7d82f1e..cbc62171db6aa 100644
--- a/extmod/network_ninaw10.c
+++ b/extmod/network_ninaw10.c
@@ -446,7 +446,15 @@ STATIC mp_uint_t network_ninaw10_socket_send(mod_network_socket_obj_t *socket, c
 }
 
 STATIC mp_uint_t network_ninaw10_socket_recv(mod_network_socket_obj_t *socket, byte *buf, mp_uint_t len, int *_errno) {
-    int ret = nina_socket_recv(socket->fileno, buf, len, socket->timeout);
+    int ret = 0;
+    if (socket->type == MOD_NETWORK_SOCK_DGRAM) {
+        byte ip[4];
+        uint16_t port;
+        ret = nina_socket_recvfrom(socket->fileno, buf, len, ip, &port, socket->timeout);
+    } else {
+        ret = nina_socket_recv(socket->fileno, buf, len, socket->timeout);
+    }
+
     if (ret == NINA_ERROR_TIMEOUT) {
         // The socket is Not closed on timeout when calling functions that accept a timeout.
         *_errno = MP_ETIMEDOUT;
@@ -493,12 +501,18 @@ STATIC mp_uint_t network_ninaw10_socket_sendto(mod_network_socket_obj_t *socket,
 
 STATIC mp_uint_t network_ninaw10_socket_recvfrom(mod_network_socket_obj_t *socket,
     byte *buf, mp_uint_t len, byte *ip, mp_uint_t *port, int *_errno) {
-    // Auto-bind the socket first if the socket is unbound.
-    if (network_ninaw10_socket_auto_bind(socket, _errno) != 0) {
-        return -1;
+    int ret = 0;
+    if (socket->type == MOD_NETWORK_SOCK_STREAM) {
+        *port = 0;
+        *((uint32_t *)ip) = 0;
+        ret = nina_socket_recv(socket->fileno, buf, len, socket->timeout);
+    } else {
+        // Auto-bind the socket first if the socket is unbound.
+        if (network_ninaw10_socket_auto_bind(socket, _errno) != 0) {
+            return -1;
+        }
+        ret = nina_socket_recvfrom(socket->fileno, buf, len, ip, (uint16_t *)port, socket->timeout);
     }
-
-    int ret = nina_socket_recvfrom(socket->fileno, buf, len, ip, (uint16_t *)port, socket->timeout);
     if (ret == NINA_ERROR_TIMEOUT) {
         // The socket is Not closed on timeout when calling functions that accept a timeout.
         *_errno = MP_ETIMEDOUT;

From 12f9f93b3919deb33c0a3d180f45efd17987ee60 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Wed, 5 Jan 2022 16:47:11 +0200
Subject: [PATCH 1556/3533] drivers/ninaw10/nina_wifi_drv: Fix DNS resolution.

- The wrong ACK is returned and checked.
- Send secondary DNS to google.
---
 drivers/ninaw10/nina_wifi_drv.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/ninaw10/nina_wifi_drv.c b/drivers/ninaw10/nina_wifi_drv.c
index 48127c07630a8..b7c016f4218bf 100644
--- a/drivers/ninaw10/nina_wifi_drv.c
+++ b/drivers/ninaw10/nina_wifi_drv.c
@@ -496,16 +496,17 @@ int nina_ifconfig(nina_ifconfig_t *ifconfig, bool set) {
                 ARG_BYTE(3),         // Valid number of args.
                 {ip_len,  ifconfig->ip_addr},
                 {gw_len,  ifconfig->gateway_addr},
-                {sub_len, ifconfig->subnet_addr})) != SPI_ACK) {
+                {sub_len, ifconfig->subnet_addr})) != 0) {
             return -1;
         }
 
+        uint8_t dns2[4] = {8, 8, 8, 8};
         if (nina_send_command_read_ack(NINA_CMD_SET_DNS_CONFIG,
             3, ARG_8BITS,
             NINA_ARGS(
                 ARG_BYTE(1),         // Valid number of args.
                 {dns_len, ifconfig->dns_addr},
-                {dns_len, ifconfig->dns_addr})) != SPI_ACK) {
+                {dns_len, dns2})) != SPI_ACK) {
             return -1;
         }
 

From 8ac561341907b5a5c3d5855aa9af099ec13ef41f Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 6 Jan 2022 15:50:14 +1100
Subject: [PATCH 1557/3533] LICENSE,docs: Update copyright year range to
 include 2022.

Signed-off-by: Damien George <damien@micropython.org>
---
 LICENSE      | 2 +-
 docs/conf.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/LICENSE b/LICENSE
index 5b5c37f7d1ead..2b9a64b89a723 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2013-2021 Damien P. George
+Copyright (c) 2013-2022 Damien P. George
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/docs/conf.py b/docs/conf.py
index 1a3c18a4f44f3..b35d03ba0eb82 100755
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -66,7 +66,7 @@
 
 # General information about the project.
 project = 'MicroPython'
-copyright = '- The MicroPython Documentation is Copyright © 2014-2021, Damien P. George, Paul Sokolovsky, and contributors'
+copyright = '- The MicroPython Documentation is Copyright © 2014-2022, Damien P. George, Paul Sokolovsky, and contributors'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the

From d4997c7b60607febf81945bd8ad0ac0b758041d8 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 6 Jan 2022 16:43:22 +1100
Subject: [PATCH 1558/3533] lib/stm32lib: Update library for fix to F7 USB HS.

Fixes build on MCUs with built-in USB HS PHY.

Signed-off-by: Damien George <damien@micropython.org>
---
 lib/stm32lib | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/stm32lib b/lib/stm32lib
index 1eebcda2c95d7..c1b7a41577824 160000
--- a/lib/stm32lib
+++ b/lib/stm32lib
@@ -1 +1 @@
-Subproject commit 1eebcda2c95d7593c68e1c81f042d23485baab26
+Subproject commit c1b7a415778247dd3881a1f3d11ea02190cbc94d

From 4693cf90811de4c891bc01084f142365f483b232 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 6 Jan 2022 16:49:57 +1100
Subject: [PATCH 1559/3533] rp2/CMakeLists.txt: Allow a board to override
 PICO_BOARD.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/rp2/CMakeLists.txt | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/ports/rp2/CMakeLists.txt b/ports/rp2/CMakeLists.txt
index c87ccf0d65e22..0009ab2cdbff9 100644
--- a/ports/rp2/CMakeLists.txt
+++ b/ports/rp2/CMakeLists.txt
@@ -25,11 +25,6 @@ if(NOT MICROPY_BOARD)
     set(MICROPY_BOARD PICO)
 endif()
 
-# Set the PICO_BOARD if it's not already set.
-if(NOT PICO_BOARD)
-    string(TOLOWER ${MICROPY_BOARD} PICO_BOARD)
-endif()
-
 # Set the board directory and check that it exists.
 if(NOT MICROPY_BOARD_DIR)
     set(MICROPY_BOARD_DIR ${MICROPY_PORT_DIR}/boards/${MICROPY_BOARD})
@@ -41,6 +36,11 @@ endif()
 # Include board config
 include(${MICROPY_BOARD_DIR}/mpconfigboard.cmake) 
 
+# Set the PICO_BOARD if it's not already set (allow a board to override it).
+if(NOT PICO_BOARD)
+    string(TOLOWER ${MICROPY_BOARD} PICO_BOARD)
+endif()
+
 # Include component cmake fragments
 include(${MICROPY_DIR}/py/py.cmake)
 include(${MICROPY_DIR}/extmod/extmod.cmake)

From 000b001fc1410cb4d0d755730f26b3e5786b76ab Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 6 Jan 2022 16:50:20 +1100
Subject: [PATCH 1560/3533] rp2/boards/GARATRONIC_PYBSTICK26_RP2040: Use
 correct pico-sdk board cfg.

Signed-off-by: Damien George <damien@micropython.org>
---
 .../rp2/boards/GARATRONIC_PYBSTICK26_RP2040/mpconfigboard.cmake | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ports/rp2/boards/GARATRONIC_PYBSTICK26_RP2040/mpconfigboard.cmake b/ports/rp2/boards/GARATRONIC_PYBSTICK26_RP2040/mpconfigboard.cmake
index 11fcb3d087ec0..9add51a78b430 100644
--- a/ports/rp2/boards/GARATRONIC_PYBSTICK26_RP2040/mpconfigboard.cmake
+++ b/ports/rp2/boards/GARATRONIC_PYBSTICK26_RP2040/mpconfigboard.cmake
@@ -1 +1,3 @@
 # cmake file
+
+set(PICO_BOARD pybstick26_rp2040)

From 3243abfda2591c9ae25187ef0bf91b7cf26d8ab4 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 6 Jan 2022 18:24:52 +1100
Subject: [PATCH 1561/3533] extmod/moduplatform: Detect xtensa arch.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/moduplatform.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/extmod/moduplatform.c b/extmod/moduplatform.c
index 8f678d770cad6..820feb312aaf3 100644
--- a/extmod/moduplatform.c
+++ b/extmod/moduplatform.c
@@ -44,6 +44,8 @@
 #define PLATFORM_ARCH   "x86_64"
 #elif defined(__i386__) || defined(_M_IX86)
 #define PLATFORM_ARCH   "x86"
+#elif defined(__xtensa__) || defined(_M_IX86)
+#define PLATFORM_ARCH   "xtensa"
 #else
 #define PLATFORM_ARCH   ""
 #endif

From b96318ab612dff4b09e0e0437a8d2bbefa25668b Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 6 Jan 2022 18:25:29 +1100
Subject: [PATCH 1562/3533] esp32: Enable platform module with IDF version.

Output looks like this:

    >>> import platform
    >>> platform.libc_ver()
    ('newlib', '3.0.0')
    >>> platform.platform()
    'MicroPython-1.17.0-xtensa-IDFv4.2.2-with-newlib3.0.0'
    >>> platform.python_compiler()
    'GCC 8.4.0'

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/mpconfigport.h | 1 +
 ports/esp32/mphalport.h    | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h
index e49c97ab1d2d1..dc6bc2e53bc7c 100644
--- a/ports/esp32/mpconfigport.h
+++ b/ports/esp32/mpconfigport.h
@@ -195,6 +195,7 @@
 #define MICROPY_PY_FRAMEBUF                 (1)
 #define MICROPY_PY_BTREE                    (1)
 #define MICROPY_PY_ONEWIRE                  (1)
+#define MICROPY_PY_UPLATFORM                (1)
 #define MICROPY_PY_USOCKET_EVENTS           (MICROPY_PY_WEBREPL)
 #define MICROPY_PY_BLUETOOTH_RANDOM_ADDR    (1)
 #define MICROPY_PY_BLUETOOTH_DEFAULT_GAP_NAME ("ESP32")
diff --git a/ports/esp32/mphalport.h b/ports/esp32/mphalport.h
index 2dad8fa924c43..01c14ad7001f9 100644
--- a/ports/esp32/mphalport.h
+++ b/ports/esp32/mphalport.h
@@ -35,6 +35,8 @@
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"
 
+#define MICROPY_PLATFORM_VERSION "IDF" IDF_VER
+
 // The core that the MicroPython task(s) are pinned to.
 // Until we move to IDF 4.2+, we need NimBLE on core 0, and for synchronisation
 // with the ringbuffer and scheduler MP needs to be on the same core.

From df3f59ca4ba66a31dcc8d225e11cf9fd404d0458 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 7 Jan 2022 11:33:28 +1100
Subject: [PATCH 1563/3533] ports: Update board.json files to link to new board
 images.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/boards/GENERIC/board.json                 | 4 +++-
 ports/esp32/boards/GENERIC_C3/board.json              | 4 +++-
 ports/esp32/boards/GENERIC_C3_USB/board.json          | 4 +++-
 ports/esp32/boards/GENERIC_D2WD/board.json            | 4 +++-
 ports/esp32/boards/GENERIC_OTA/board.json             | 4 +++-
 ports/esp32/boards/GENERIC_S2/board.json              | 4 +++-
 ports/esp32/boards/GENERIC_S3/board.json              | 4 +++-
 ports/esp32/boards/GENERIC_S3_SPIRAM/board.json       | 4 +++-
 ports/esp32/boards/GENERIC_SPIRAM/board.json          | 4 +++-
 ports/esp32/boards/M5STACK_ATOM/board.json            | 4 +++-
 ports/esp32/boards/SIL_WESP32/board.json              | 5 ++++-
 ports/nrf/boards/arduino_primo/board.json             | 4 +++-
 ports/stm32/boards/B_L072Z_LRWAN1/board.json          | 4 +++-
 ports/stm32/boards/CERB40/board.json                  | 4 +++-
 ports/stm32/boards/GARATRONIC_NADHAT_F405/board.json  | 4 +++-
 ports/stm32/boards/HYDRABUS/board.json                | 4 +++-
 ports/stm32/boards/LIMIFROG/board.json                | 4 +++-
 ports/stm32/boards/MIKROE_CLICKER2_STM32/board.json   | 4 +++-
 ports/stm32/boards/NETDUINO_PLUS_2/board.json         | 4 +++-
 ports/stm32/boards/NUCLEO_F091RC/board.json           | 4 +++-
 ports/stm32/boards/NUCLEO_F401RE/board.json           | 4 +++-
 ports/stm32/boards/NUCLEO_F411RE/board.json           | 4 +++-
 ports/stm32/boards/NUCLEO_F412ZG/board.json           | 4 +++-
 ports/stm32/boards/NUCLEO_F413ZH/board.json           | 4 +++-
 ports/stm32/boards/NUCLEO_F429ZI/board.json           | 4 +++-
 ports/stm32/boards/NUCLEO_F439ZI/board.json           | 4 +++-
 ports/stm32/boards/NUCLEO_F446RE/board.json           | 4 +++-
 ports/stm32/boards/NUCLEO_F722ZE/board.json           | 4 +++-
 ports/stm32/boards/NUCLEO_F746ZG/board.json           | 4 +++-
 ports/stm32/boards/NUCLEO_F767ZI/board.json           | 4 +++-
 ports/stm32/boards/NUCLEO_H743ZI/board.json           | 4 +++-
 ports/stm32/boards/NUCLEO_L073RZ/board.json           | 4 +++-
 ports/stm32/boards/NUCLEO_L432KC/board.json           | 4 +++-
 ports/stm32/boards/NUCLEO_L452RE/board.json           | 4 +++-
 ports/stm32/boards/NUCLEO_L476RG/board.json           | 4 +++-
 ports/stm32/boards/NUCLEO_WB55/board.json             | 4 +++-
 ports/stm32/boards/OLIMEX_E407/board.json             | 4 +++-
 ports/stm32/boards/OLIMEX_H407/board.json             | 4 +++-
 ports/stm32/boards/SPARKFUN_MICROMOD_STM32/board.json | 4 +++-
 ports/stm32/boards/STM32F411DISC/board.json           | 4 +++-
 ports/stm32/boards/STM32F429DISC/board.json           | 4 +++-
 ports/stm32/boards/STM32F439/board.json               | 4 +++-
 ports/stm32/boards/STM32F4DISC/board.json             | 4 +++-
 ports/stm32/boards/STM32F769DISC/board.json           | 4 +++-
 ports/stm32/boards/STM32F7DISC/board.json             | 4 +++-
 ports/stm32/boards/STM32H7B3I_DK/board.json           | 4 +++-
 ports/stm32/boards/STM32L476DISC/board.json           | 4 +++-
 ports/stm32/boards/USBDONGLE_WB55/board.json          | 4 +++-
 48 files changed, 145 insertions(+), 48 deletions(-)

diff --git a/ports/esp32/boards/GENERIC/board.json b/ports/esp32/boards/GENERIC/board.json
index 95447dd8e1f2a..a52d58007d0cb 100644
--- a/ports/esp32/boards/GENERIC/board.json
+++ b/ports/esp32/boards/GENERIC/board.json
@@ -8,7 +8,9 @@
         "WiFi"
     ],
     "id": "esp32",
-    "images": [],
+    "images": [
+        "esp32_devkitc.jpg"
+    ],
     "mcu": "esp32",
     "product": "ESP32",
     "thumbnail": "",
diff --git a/ports/esp32/boards/GENERIC_C3/board.json b/ports/esp32/boards/GENERIC_C3/board.json
index 325843a72d428..481e66bccdf99 100644
--- a/ports/esp32/boards/GENERIC_C3/board.json
+++ b/ports/esp32/boards/GENERIC_C3/board.json
@@ -8,7 +8,9 @@
         "WiFi"
     ],
     "id": "esp32c3",
-    "images": [],
+    "images": [
+        "esp32c3_devkitmini.jpg"
+    ],
     "mcu": "esp32c3",
     "product": "ESP32-C3",
     "thumbnail": "",
diff --git a/ports/esp32/boards/GENERIC_C3_USB/board.json b/ports/esp32/boards/GENERIC_C3_USB/board.json
index f719a2b63a3a1..94d86d4428975 100644
--- a/ports/esp32/boards/GENERIC_C3_USB/board.json
+++ b/ports/esp32/boards/GENERIC_C3_USB/board.json
@@ -8,7 +8,9 @@
         "WiFi"
     ],
     "id": "esp32c3-usb",
-    "images": [],
+    "images": [
+        "esp32c3_devkitmini.jpg"
+    ],
     "mcu": "esp32c3",
     "product": "ESP32-C3 with USB",
     "thumbnail": "",
diff --git a/ports/esp32/boards/GENERIC_D2WD/board.json b/ports/esp32/boards/GENERIC_D2WD/board.json
index d20922907dc9c..39fce46bcabcd 100644
--- a/ports/esp32/boards/GENERIC_D2WD/board.json
+++ b/ports/esp32/boards/GENERIC_D2WD/board.json
@@ -8,7 +8,9 @@
         "WiFi"
     ],
     "id": "esp32-d2wd",
-    "images": [],
+    "images": [
+        "generic_d2wd.jpg"
+    ],
     "mcu": "esp32",
     "product": "ESP32 D2WD",
     "thumbnail": "",
diff --git a/ports/esp32/boards/GENERIC_OTA/board.json b/ports/esp32/boards/GENERIC_OTA/board.json
index e656497fc6ec5..97756a9fb2c53 100644
--- a/ports/esp32/boards/GENERIC_OTA/board.json
+++ b/ports/esp32/boards/GENERIC_OTA/board.json
@@ -8,7 +8,9 @@
         "WiFi"
     ],
     "id": "esp32-ota",
-    "images": [],
+    "images": [
+        "esp32_devkitc.jpg"
+    ],
     "mcu": "esp32",
     "product": "ESP32 with OTA support",
     "thumbnail": "",
diff --git a/ports/esp32/boards/GENERIC_S2/board.json b/ports/esp32/boards/GENERIC_S2/board.json
index 16b19ad206f10..dbd3b5b015fd3 100644
--- a/ports/esp32/boards/GENERIC_S2/board.json
+++ b/ports/esp32/boards/GENERIC_S2/board.json
@@ -7,7 +7,9 @@
         "BLE",
         "WiFi"
     ],
-    "images": [],
+    "images": [
+        "generic_s2.jpg"
+    ],
     "mcu": "esp32s2",
     "product": "ESP32-S2",
     "thumbnail": "",
diff --git a/ports/esp32/boards/GENERIC_S3/board.json b/ports/esp32/boards/GENERIC_S3/board.json
index f5fb8e90154d7..058fb7dff0db0 100644
--- a/ports/esp32/boards/GENERIC_S3/board.json
+++ b/ports/esp32/boards/GENERIC_S3/board.json
@@ -7,7 +7,9 @@
         "BLE",
         "WiFi"
     ],
-    "images": [],
+    "images": [
+        "generic_s3.jpg"
+    ],
     "mcu": "esp32s3",
     "product": "ESP32-S3",
     "thumbnail": "",
diff --git a/ports/esp32/boards/GENERIC_S3_SPIRAM/board.json b/ports/esp32/boards/GENERIC_S3_SPIRAM/board.json
index 47bc34e392a77..ee2cb8d3f438d 100644
--- a/ports/esp32/boards/GENERIC_S3_SPIRAM/board.json
+++ b/ports/esp32/boards/GENERIC_S3_SPIRAM/board.json
@@ -7,7 +7,9 @@
         "BLE",
         "WiFi"
     ],
-    "images": [],
+    "images": [
+        "generic_s3.jpg"
+    ],
     "mcu": "esp32s3",
     "product": "Generic ESP32-S3 (SPIRAM)",
     "thumbnail": "",
diff --git a/ports/esp32/boards/GENERIC_SPIRAM/board.json b/ports/esp32/boards/GENERIC_SPIRAM/board.json
index c0efc22e3f61c..afb57b2ed1255 100644
--- a/ports/esp32/boards/GENERIC_SPIRAM/board.json
+++ b/ports/esp32/boards/GENERIC_SPIRAM/board.json
@@ -9,7 +9,9 @@
         "WiFi"
     ],
     "id": "esp32spiram",
-    "images": [],
+    "images": [
+        "esp32_psram.jpg"
+    ],
     "mcu": "esp32",
     "product": "ESP32 with SPIRAM",
     "thumbnail": "",
diff --git a/ports/esp32/boards/M5STACK_ATOM/board.json b/ports/esp32/boards/M5STACK_ATOM/board.json
index 1d499ad4bf525..9d1886887c679 100644
--- a/ports/esp32/boards/M5STACK_ATOM/board.json
+++ b/ports/esp32/boards/M5STACK_ATOM/board.json
@@ -11,7 +11,9 @@
         "USB-C",
         "WiFi"
     ],
-    "images": [],
+    "images": [
+        "m5stack_atom.jpg"
+    ],
     "mcu": "esp32",
     "product": "M5 Stack Atom",
     "thumbnail": "",
diff --git a/ports/esp32/boards/SIL_WESP32/board.json b/ports/esp32/boards/SIL_WESP32/board.json
index 65a4fde182405..050620d618014 100644
--- a/ports/esp32/boards/SIL_WESP32/board.json
+++ b/ports/esp32/boards/SIL_WESP32/board.json
@@ -10,7 +10,10 @@
         "WiFi"
     ],
     "id": "wesp32",
-    "images": [],
+    "images": [
+        "wesp32-iso.jpg",
+        "wesp32-top.jpg"
+    ],
     "mcu": "esp32",
     "product": "SIL WESP32",
     "thumbnail": "",
diff --git a/ports/nrf/boards/arduino_primo/board.json b/ports/nrf/boards/arduino_primo/board.json
index 05439fdfeef39..d16ce1c3460f0 100644
--- a/ports/nrf/boards/arduino_primo/board.json
+++ b/ports/nrf/boards/arduino_primo/board.json
@@ -4,7 +4,9 @@
     ],
     "docs": "",
     "features": [],
-    "images": [],
+    "images": [
+        "arduino_primo.jpg"
+    ],
     "mcu": "nrf52",
     "product": "arduino_primo",
     "thumbnail": "",
diff --git a/ports/stm32/boards/B_L072Z_LRWAN1/board.json b/ports/stm32/boards/B_L072Z_LRWAN1/board.json
index 7eb6981ff307a..e6bbe359113a6 100644
--- a/ports/stm32/boards/B_L072Z_LRWAN1/board.json
+++ b/ports/stm32/boards/B_L072Z_LRWAN1/board.json
@@ -4,7 +4,9 @@
     ],
     "docs": "",
     "features": [],
-    "images": [],
+    "images": [
+        "b_l072z_lrwan1.jpg"
+    ],
     "mcu": "stm32l0",
     "product": "B_L072Z_LRWAN1",
     "thumbnail": "",
diff --git a/ports/stm32/boards/CERB40/board.json b/ports/stm32/boards/CERB40/board.json
index 600ccdf2a44cf..f80b3f5cab249 100644
--- a/ports/stm32/boards/CERB40/board.json
+++ b/ports/stm32/boards/CERB40/board.json
@@ -4,7 +4,9 @@
     ],
     "docs": "",
     "features": [],
-    "images": [],
+    "images": [
+        "cerb40.jpg"
+    ],
     "mcu": "stm32f4",
     "product": "CERB40",
     "thumbnail": "",
diff --git a/ports/stm32/boards/GARATRONIC_NADHAT_F405/board.json b/ports/stm32/boards/GARATRONIC_NADHAT_F405/board.json
index 38873e4de8632..d02b7ece10bb3 100644
--- a/ports/stm32/boards/GARATRONIC_NADHAT_F405/board.json
+++ b/ports/stm32/boards/GARATRONIC_NADHAT_F405/board.json
@@ -4,7 +4,9 @@
     ],
     "docs": "",
     "features": [],
-    "images": [],
+    "images": [
+        "garatronic_nadhat_f405.jpg"
+    ],
     "mcu": "stm32f4",
     "product": "GARATRONIC_NADHAT_F405",
     "thumbnail": "",
diff --git a/ports/stm32/boards/HYDRABUS/board.json b/ports/stm32/boards/HYDRABUS/board.json
index c3f398f28e553..32561e6525904 100644
--- a/ports/stm32/boards/HYDRABUS/board.json
+++ b/ports/stm32/boards/HYDRABUS/board.json
@@ -4,7 +4,9 @@
     ],
     "docs": "",
     "features": [],
-    "images": [],
+    "images": [
+        "hydrabus.jpg"
+    ],
     "mcu": "stm32f4",
     "product": "HYDRABUS",
     "thumbnail": "",
diff --git a/ports/stm32/boards/LIMIFROG/board.json b/ports/stm32/boards/LIMIFROG/board.json
index d4ce3f41cdc1a..3137350074be7 100644
--- a/ports/stm32/boards/LIMIFROG/board.json
+++ b/ports/stm32/boards/LIMIFROG/board.json
@@ -4,7 +4,9 @@
     ],
     "docs": "",
     "features": [],
-    "images": [],
+    "images": [
+        "limifrog.jpg"
+    ],
     "mcu": "stm32l4",
     "product": "LIMIFROG",
     "thumbnail": "",
diff --git a/ports/stm32/boards/MIKROE_CLICKER2_STM32/board.json b/ports/stm32/boards/MIKROE_CLICKER2_STM32/board.json
index 8ff4dda080a33..a6cfc45b0c0b1 100644
--- a/ports/stm32/boards/MIKROE_CLICKER2_STM32/board.json
+++ b/ports/stm32/boards/MIKROE_CLICKER2_STM32/board.json
@@ -6,7 +6,9 @@
     "features": [
         "mikroBUS"
     ],
-    "images": [],
+    "images": [
+        "mikroe_clicker2_stm32.jpg"
+    ],
     "mcu": "stm32f4",
     "product": "MikroE Clicker 2 for STM32",
     "thumbnail": "",
diff --git a/ports/stm32/boards/NETDUINO_PLUS_2/board.json b/ports/stm32/boards/NETDUINO_PLUS_2/board.json
index 88b135bc089b1..044bc2736b1a7 100644
--- a/ports/stm32/boards/NETDUINO_PLUS_2/board.json
+++ b/ports/stm32/boards/NETDUINO_PLUS_2/board.json
@@ -4,7 +4,9 @@
     ],
     "docs": "",
     "features": [],
-    "images": [],
+    "images": [
+        "netduino_plus_2.jpg"
+    ],
     "mcu": "stm32f4",
     "product": "NETDUINO_PLUS_2",
     "thumbnail": "",
diff --git a/ports/stm32/boards/NUCLEO_F091RC/board.json b/ports/stm32/boards/NUCLEO_F091RC/board.json
index 1cabbce5c8c86..a28f9b0a66da2 100644
--- a/ports/stm32/boards/NUCLEO_F091RC/board.json
+++ b/ports/stm32/boards/NUCLEO_F091RC/board.json
@@ -4,7 +4,9 @@
     ],
     "docs": "",
     "features": [],
-    "images": [],
+    "images": [
+        "nucleo_f091rc.jpg"
+    ],
     "mcu": "stm32f0",
     "product": "Nucleo F091RC",
     "thumbnail": "",
diff --git a/ports/stm32/boards/NUCLEO_F401RE/board.json b/ports/stm32/boards/NUCLEO_F401RE/board.json
index 91ae8b49cf883..15eae0fe2f8a7 100644
--- a/ports/stm32/boards/NUCLEO_F401RE/board.json
+++ b/ports/stm32/boards/NUCLEO_F401RE/board.json
@@ -4,7 +4,9 @@
     ],
     "docs": "",
     "features": [],
-    "images": [],
+    "images": [
+        "nucleo_f401re.jpg"
+    ],
     "mcu": "stm32f4",
     "product": "Nucleo F401RE",
     "thumbnail": "",
diff --git a/ports/stm32/boards/NUCLEO_F411RE/board.json b/ports/stm32/boards/NUCLEO_F411RE/board.json
index c2d4ad4e2f585..a428b8988f5d4 100644
--- a/ports/stm32/boards/NUCLEO_F411RE/board.json
+++ b/ports/stm32/boards/NUCLEO_F411RE/board.json
@@ -4,7 +4,9 @@
     ],
     "docs": "",
     "features": [],
-    "images": [],
+    "images": [
+        "nucleo_f411re.jpg"
+    ],
     "mcu": "stm32f4",
     "product": "Nucleo F411RE",
     "thumbnail": "",
diff --git a/ports/stm32/boards/NUCLEO_F412ZG/board.json b/ports/stm32/boards/NUCLEO_F412ZG/board.json
index bddc1e6d67fb2..48a717ec0115a 100644
--- a/ports/stm32/boards/NUCLEO_F412ZG/board.json
+++ b/ports/stm32/boards/NUCLEO_F412ZG/board.json
@@ -4,7 +4,9 @@
     ],
     "docs": "",
     "features": [],
-    "images": [],
+    "images": [
+        "nucleo_f412zg.jpg"
+    ],
     "mcu": "stm32f4",
     "product": "Nucleo F412ZG",
     "thumbnail": "",
diff --git a/ports/stm32/boards/NUCLEO_F413ZH/board.json b/ports/stm32/boards/NUCLEO_F413ZH/board.json
index 4a08c9f5e2703..218998852ba52 100644
--- a/ports/stm32/boards/NUCLEO_F413ZH/board.json
+++ b/ports/stm32/boards/NUCLEO_F413ZH/board.json
@@ -4,7 +4,9 @@
     ],
     "docs": "",
     "features": [],
-    "images": [],
+    "images": [
+        "nucleo_f413zh.jpg"
+    ],
     "mcu": "stm32f4",
     "product": "Nucleo F413ZH",
     "thumbnail": "",
diff --git a/ports/stm32/boards/NUCLEO_F429ZI/board.json b/ports/stm32/boards/NUCLEO_F429ZI/board.json
index 7c2767da4df32..60a8795f4bc0d 100644
--- a/ports/stm32/boards/NUCLEO_F429ZI/board.json
+++ b/ports/stm32/boards/NUCLEO_F429ZI/board.json
@@ -4,7 +4,9 @@
     ],
     "docs": "",
     "features": [],
-    "images": [],
+    "images": [
+        "nucleo_f429zi.jpg"
+    ],
     "mcu": "stm32f4",
     "product": "Nucleo F429ZI",
     "thumbnail": "",
diff --git a/ports/stm32/boards/NUCLEO_F439ZI/board.json b/ports/stm32/boards/NUCLEO_F439ZI/board.json
index 8daac091f1e44..7ee717d021a9e 100644
--- a/ports/stm32/boards/NUCLEO_F439ZI/board.json
+++ b/ports/stm32/boards/NUCLEO_F439ZI/board.json
@@ -4,7 +4,9 @@
     ],
     "docs": "",
     "features": [],
-    "images": [],
+    "images": [
+        "nucleo_f439zi.jpg"
+    ],
     "mcu": "stm32f4",
     "product": "Nucleo F439ZI",
     "thumbnail": "",
diff --git a/ports/stm32/boards/NUCLEO_F446RE/board.json b/ports/stm32/boards/NUCLEO_F446RE/board.json
index 3cbf34d6aa824..93b65e89d23fd 100644
--- a/ports/stm32/boards/NUCLEO_F446RE/board.json
+++ b/ports/stm32/boards/NUCLEO_F446RE/board.json
@@ -4,7 +4,9 @@
     ],
     "docs": "",
     "features": [],
-    "images": [],
+    "images": [
+        "nucleo_f446re.jpg"
+    ],
     "mcu": "stm32f4",
     "product": "Nucleo F446RE",
     "thumbnail": "",
diff --git a/ports/stm32/boards/NUCLEO_F722ZE/board.json b/ports/stm32/boards/NUCLEO_F722ZE/board.json
index fe318edfa3e33..e44ef8c10a3c1 100644
--- a/ports/stm32/boards/NUCLEO_F722ZE/board.json
+++ b/ports/stm32/boards/NUCLEO_F722ZE/board.json
@@ -4,7 +4,9 @@
     ],
     "docs": "",
     "features": [],
-    "images": [],
+    "images": [
+        "nucleo_f722ze.jpg"
+    ],
     "mcu": "stm32f7",
     "product": "Nucleo F722ZE",
     "thumbnail": "",
diff --git a/ports/stm32/boards/NUCLEO_F746ZG/board.json b/ports/stm32/boards/NUCLEO_F746ZG/board.json
index 7aee7b05a6528..0459c3a136729 100644
--- a/ports/stm32/boards/NUCLEO_F746ZG/board.json
+++ b/ports/stm32/boards/NUCLEO_F746ZG/board.json
@@ -4,7 +4,9 @@
     ],
     "docs": "",
     "features": [],
-    "images": [],
+    "images": [
+        "nucleo_f746zg.jpg"
+    ],
     "mcu": "stm32f7",
     "product": "Nucleo F746ZG",
     "thumbnail": "",
diff --git a/ports/stm32/boards/NUCLEO_F767ZI/board.json b/ports/stm32/boards/NUCLEO_F767ZI/board.json
index 936ad53dd759e..c05d1a1c0ae62 100644
--- a/ports/stm32/boards/NUCLEO_F767ZI/board.json
+++ b/ports/stm32/boards/NUCLEO_F767ZI/board.json
@@ -4,7 +4,9 @@
     ],
     "docs": "",
     "features": [],
-    "images": [],
+    "images": [
+        "nucleo_f767zi.jpg"
+    ],
     "mcu": "stm32f7",
     "product": "Nucleo F767ZI",
     "thumbnail": "",
diff --git a/ports/stm32/boards/NUCLEO_H743ZI/board.json b/ports/stm32/boards/NUCLEO_H743ZI/board.json
index 27b8e901ce45c..4e92b618448ca 100644
--- a/ports/stm32/boards/NUCLEO_H743ZI/board.json
+++ b/ports/stm32/boards/NUCLEO_H743ZI/board.json
@@ -4,7 +4,9 @@
     ],
     "docs": "",
     "features": [],
-    "images": [],
+    "images": [
+        "nucleo_h743zi.jpg"
+    ],
     "mcu": "stm32h7",
     "product": "Nucleo H743ZI",
     "thumbnail": "",
diff --git a/ports/stm32/boards/NUCLEO_L073RZ/board.json b/ports/stm32/boards/NUCLEO_L073RZ/board.json
index c11bad6d942d8..949d16678fc86 100644
--- a/ports/stm32/boards/NUCLEO_L073RZ/board.json
+++ b/ports/stm32/boards/NUCLEO_L073RZ/board.json
@@ -4,7 +4,9 @@
     ],
     "docs": "",
     "features": [],
-    "images": [],
+    "images": [
+        "nucleo_l073rz.jpg"
+    ],
     "mcu": "stm32l0",
     "product": "Nucleo L073RZ",
     "thumbnail": "",
diff --git a/ports/stm32/boards/NUCLEO_L432KC/board.json b/ports/stm32/boards/NUCLEO_L432KC/board.json
index 33006038855cb..60f96f71eed90 100644
--- a/ports/stm32/boards/NUCLEO_L432KC/board.json
+++ b/ports/stm32/boards/NUCLEO_L432KC/board.json
@@ -4,7 +4,9 @@
     ],
     "docs": "",
     "features": [],
-    "images": [],
+    "images": [
+        "nucleo_l432kc.jpg"
+    ],
     "mcu": "stm32l4",
     "product": "Nucleo L432KC",
     "thumbnail": "",
diff --git a/ports/stm32/boards/NUCLEO_L452RE/board.json b/ports/stm32/boards/NUCLEO_L452RE/board.json
index e8c31c50235ea..2ca29ee46b148 100644
--- a/ports/stm32/boards/NUCLEO_L452RE/board.json
+++ b/ports/stm32/boards/NUCLEO_L452RE/board.json
@@ -4,7 +4,9 @@
     ],
     "docs": "",
     "features": [],
-    "images": [],
+    "images": [
+        "nucleo_l452re.jpg"
+    ],
     "mcu": "stm32l4",
     "product": "Nucleo L452RE",
     "thumbnail": "",
diff --git a/ports/stm32/boards/NUCLEO_L476RG/board.json b/ports/stm32/boards/NUCLEO_L476RG/board.json
index d776f6615e6a6..82cc8c090ee10 100644
--- a/ports/stm32/boards/NUCLEO_L476RG/board.json
+++ b/ports/stm32/boards/NUCLEO_L476RG/board.json
@@ -4,7 +4,9 @@
     ],
     "docs": "",
     "features": [],
-    "images": [],
+    "images": [
+        "nucleo_l476rg.jpg"
+    ],
     "mcu": "stm32l4",
     "product": "Nucleo L476RG",
     "thumbnail": "",
diff --git a/ports/stm32/boards/NUCLEO_WB55/board.json b/ports/stm32/boards/NUCLEO_WB55/board.json
index 2456b0b3a0ff9..eb33995a60a52 100644
--- a/ports/stm32/boards/NUCLEO_WB55/board.json
+++ b/ports/stm32/boards/NUCLEO_WB55/board.json
@@ -4,7 +4,9 @@
     ],
     "docs": "",
     "features": [],
-    "images": [],
+    "images": [
+        "nucleo_wb55.jpg"
+    ],
     "mcu": "stm32wb",
     "product": "Nucleo WB55",
     "thumbnail": "",
diff --git a/ports/stm32/boards/OLIMEX_E407/board.json b/ports/stm32/boards/OLIMEX_E407/board.json
index d4e0fda98c1f0..c14755c564d91 100644
--- a/ports/stm32/boards/OLIMEX_E407/board.json
+++ b/ports/stm32/boards/OLIMEX_E407/board.json
@@ -4,7 +4,9 @@
     ],
     "docs": "",
     "features": [],
-    "images": [],
+    "images": [
+        "olimex_e407.jpg"
+    ],
     "mcu": "stm32f4",
     "product": "E407",
     "thumbnail": "",
diff --git a/ports/stm32/boards/OLIMEX_H407/board.json b/ports/stm32/boards/OLIMEX_H407/board.json
index c074950ab3f83..9ecc860ddc2e3 100644
--- a/ports/stm32/boards/OLIMEX_H407/board.json
+++ b/ports/stm32/boards/OLIMEX_H407/board.json
@@ -4,7 +4,9 @@
     ],
     "docs": "",
     "features": [],
-    "images": [],
+    "images": [
+        "olimex_h407.jpg"
+    ],
     "mcu": "stm32f4",
     "product": "H407",
     "thumbnail": "",
diff --git a/ports/stm32/boards/SPARKFUN_MICROMOD_STM32/board.json b/ports/stm32/boards/SPARKFUN_MICROMOD_STM32/board.json
index 0c1bba8ee7d9d..0bd3573d6445e 100644
--- a/ports/stm32/boards/SPARKFUN_MICROMOD_STM32/board.json
+++ b/ports/stm32/boards/SPARKFUN_MICROMOD_STM32/board.json
@@ -4,7 +4,9 @@
     ],
     "docs": "",
     "features": [],
-    "images": [],
+    "images": [
+        "sparkfun_micromod_stm32.jpg"
+    ],
     "mcu": "stm32f4",
     "product": "Micromod STM32",
     "thumbnail": "",
diff --git a/ports/stm32/boards/STM32F411DISC/board.json b/ports/stm32/boards/STM32F411DISC/board.json
index 42516178a04f5..97761ddbf12a1 100644
--- a/ports/stm32/boards/STM32F411DISC/board.json
+++ b/ports/stm32/boards/STM32F411DISC/board.json
@@ -4,7 +4,9 @@
     ],
     "docs": "",
     "features": [],
-    "images": [],
+    "images": [
+        "stm32f411disc.jpg"
+    ],
     "mcu": "stm32f4",
     "product": "Discovery F411",
     "thumbnail": "",
diff --git a/ports/stm32/boards/STM32F429DISC/board.json b/ports/stm32/boards/STM32F429DISC/board.json
index 8842e004d183a..4c7ee395f2c78 100644
--- a/ports/stm32/boards/STM32F429DISC/board.json
+++ b/ports/stm32/boards/STM32F429DISC/board.json
@@ -4,7 +4,9 @@
     ],
     "docs": "",
     "features": [],
-    "images": [],
+    "images": [
+        "stm32f429disc.jpg"
+    ],
     "mcu": "stm32f4",
     "product": "Discovery F429",
     "thumbnail": "",
diff --git a/ports/stm32/boards/STM32F439/board.json b/ports/stm32/boards/STM32F439/board.json
index e941244e7eb6a..140c3474caa6f 100644
--- a/ports/stm32/boards/STM32F439/board.json
+++ b/ports/stm32/boards/STM32F439/board.json
@@ -4,7 +4,9 @@
     ],
     "docs": "",
     "features": [],
-    "images": [],
+    "images": [
+        "stm32f439.jpg"
+    ],
     "mcu": "stm32f4",
     "product": "STM32F439",
     "thumbnail": "",
diff --git a/ports/stm32/boards/STM32F4DISC/board.json b/ports/stm32/boards/STM32F4DISC/board.json
index 7c4fea38b27c3..64a8faba38fb6 100644
--- a/ports/stm32/boards/STM32F4DISC/board.json
+++ b/ports/stm32/boards/STM32F4DISC/board.json
@@ -4,7 +4,9 @@
     ],
     "docs": "",
     "features": [],
-    "images": [],
+    "images": [
+        "stm32f4disc.jpg"
+    ],
     "mcu": "stm32f4",
     "product": "Discovery F4",
     "thumbnail": "",
diff --git a/ports/stm32/boards/STM32F769DISC/board.json b/ports/stm32/boards/STM32F769DISC/board.json
index 68584e9501dc2..ce38ec7885246 100644
--- a/ports/stm32/boards/STM32F769DISC/board.json
+++ b/ports/stm32/boards/STM32F769DISC/board.json
@@ -4,7 +4,9 @@
     ],
     "docs": "",
     "features": [],
-    "images": [],
+    "images": [
+        "stm32f769disc.jpg"
+    ],
     "mcu": "stm32f7",
     "product": "Discovery F769",
     "thumbnail": "",
diff --git a/ports/stm32/boards/STM32F7DISC/board.json b/ports/stm32/boards/STM32F7DISC/board.json
index 4b83f20f2dd85..1eaae6b68b22c 100644
--- a/ports/stm32/boards/STM32F7DISC/board.json
+++ b/ports/stm32/boards/STM32F7DISC/board.json
@@ -4,7 +4,9 @@
     ],
     "docs": "",
     "features": [],
-    "images": [],
+    "images": [
+        "stm32f7disc.jpg"
+    ],
     "mcu": "stm32f7",
     "product": "Discovery F7",
     "thumbnail": "",
diff --git a/ports/stm32/boards/STM32H7B3I_DK/board.json b/ports/stm32/boards/STM32H7B3I_DK/board.json
index 4d03c72917477..a1ab50c0d7bf4 100644
--- a/ports/stm32/boards/STM32H7B3I_DK/board.json
+++ b/ports/stm32/boards/STM32H7B3I_DK/board.json
@@ -4,7 +4,9 @@
     ],
     "docs": "",
     "features": [],
-    "images": [],
+    "images": [
+        "stm32h7b3i_dk.jpg"
+    ],
     "mcu": "stm32h7",
     "product": "Discovery Kit H7",
     "thumbnail": "",
diff --git a/ports/stm32/boards/STM32L476DISC/board.json b/ports/stm32/boards/STM32L476DISC/board.json
index b8a4f92efd063..49d1060ee284c 100644
--- a/ports/stm32/boards/STM32L476DISC/board.json
+++ b/ports/stm32/boards/STM32L476DISC/board.json
@@ -4,7 +4,9 @@
     ],
     "docs": "",
     "features": [],
-    "images": [],
+    "images": [
+        "stm32l476disc.jpg"
+    ],
     "mcu": "stm32l4",
     "product": "Discovery L476",
     "thumbnail": "",
diff --git a/ports/stm32/boards/USBDONGLE_WB55/board.json b/ports/stm32/boards/USBDONGLE_WB55/board.json
index 00d9121881e0f..858e94d105166 100644
--- a/ports/stm32/boards/USBDONGLE_WB55/board.json
+++ b/ports/stm32/boards/USBDONGLE_WB55/board.json
@@ -4,7 +4,9 @@
     ],
     "docs": "",
     "features": [],
-    "images": [],
+    "images": [
+        "usbdongle_wb55.jpg"
+    ],
     "mcu": "stm32wb",
     "product": "USBDONGLE_WB55",
     "thumbnail": "",

From 22cf0940e134453dee6fd6c617b28ecd1ec50943 Mon Sep 17 00:00:00 2001
From: stijn <stijn@ignitron.net>
Date: Wed, 5 Jan 2022 16:04:58 +0100
Subject: [PATCH 1564/3533] py/modbuiltins: Add additional macro for extending
 builtins.

Mainly useful for defining additional globals in boards and variants.
---
 py/modbuiltins.c | 1 +
 py/mpconfig.h    | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/py/modbuiltins.c b/py/modbuiltins.c
index a7e49a1ed9a47..26a84f57b3d55 100644
--- a/py/modbuiltins.c
+++ b/py/modbuiltins.c
@@ -775,6 +775,7 @@ STATIC const mp_rom_map_elem_t mp_module_builtins_globals_table[] = {
 
     // Extra builtins as defined by a port
     MICROPY_PORT_BUILTINS
+    MICROPY_PORT_EXTRA_BUILTINS
 };
 
 MP_DEFINE_CONST_DICT(mp_module_builtins_globals, mp_module_builtins_globals_table);
diff --git a/py/mpconfig.h b/py/mpconfig.h
index d93100bb83c3a..2aa6f634e2bb0 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -1581,6 +1581,12 @@ typedef double mp_float_t;
 #define MICROPY_PORT_BUILTINS
 #endif
 
+// Additional builtin function definitions for extension by command-line, boards or variants.
+// See modbuiltins.c:mp_module_builtins_globals_table for format.
+#ifndef MICROPY_PORT_EXTRA_BUILTINS
+#define MICROPY_PORT_EXTRA_BUILTINS
+#endif
+
 // Additional builtin module definitions - see objmodule.c:mp_builtin_module_table for format.
 #ifndef MICROPY_PORT_BUILTIN_MODULES
 #define MICROPY_PORT_BUILTIN_MODULES

From 772058a6bd7f19866f5123f0f708440207eb5b93 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 7 Jan 2022 23:59:17 +1100
Subject: [PATCH 1565/3533] py/mpconfig.h: Define MICROPY_PY_USSL_FINALISER
 only if not defined.

So a port can define it even if MICROPY_PY_USSL is not defined.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/mpconfig.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/py/mpconfig.h b/py/mpconfig.h
index 2aa6f634e2bb0..597881d6fe328 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -1552,7 +1552,10 @@ typedef double mp_float_t;
 
 #ifndef MICROPY_PY_USSL
 #define MICROPY_PY_USSL (0)
+#endif
+
 // Whether to add finaliser code to ussl objects
+#ifndef MICROPY_PY_USSL_FINALISER
 #define MICROPY_PY_USSL_FINALISER (0)
 #endif
 

From 1892d037409a95511ce9f38782a7fafab95052c4 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sat, 8 Jan 2022 00:02:04 +1100
Subject: [PATCH 1566/3533] mimxrt,stm32: Enable MICROPY_PY_USSL_FINALISER.

This is needed because these ports allocate mbedtls data on the MicroPython
heap, and SSL socket objects must be fully cleaned up when they are garbage
collected, to free this memory allocated by mbedtls.  As part of this,
gc_sweep_all() will now ensure that the MP_STATE_PORT(mbedtls_memory)
linked-list is fully deallocated on soft reset.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/mimxrt/mpconfigport.h | 1 +
 ports/stm32/mpconfigport.h  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/ports/mimxrt/mpconfigport.h b/ports/mimxrt/mpconfigport.h
index 967482dc77b07..e650579e69dcf 100644
--- a/ports/mimxrt/mpconfigport.h
+++ b/ports/mimxrt/mpconfigport.h
@@ -116,6 +116,7 @@ uint32_t trng_random_u32(void);
 #define MICROPY_PY_URE_MATCH_GROUPS         (1)
 #define MICROPY_PY_URE_MATCH_SPAN_START_END (1)
 #define MICROPY_PY_URE_SUB                  (1)
+#define MICROPY_PY_USSL_FINALISER           (MICROPY_PY_USSL)
 #define MICROPY_PY_UHASHLIB                 (1)
 #define MICROPY_PY_UBINASCII                (1)
 #define MICROPY_PY_UBINASCII_CRC32          (1)
diff --git a/ports/stm32/mpconfigport.h b/ports/stm32/mpconfigport.h
index b1a38713dcc14..6bca5dfd92bc3 100644
--- a/ports/stm32/mpconfigport.h
+++ b/ports/stm32/mpconfigport.h
@@ -91,6 +91,7 @@
 #endif
 
 // extended modules
+#define MICROPY_PY_USSL_FINALISER   (MICROPY_PY_USSL)
 #define MICROPY_PY_UHASHLIB_MD5     (MICROPY_PY_USSL)
 #define MICROPY_PY_UHASHLIB_SHA1    (MICROPY_PY_USSL)
 #define MICROPY_PY_UCRYPTOLIB       (MICROPY_PY_USSL)

From ff0227fa0d8821eb0acdb7f45e4087b3567e4d6f Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sun, 9 Jan 2022 11:22:30 +1100
Subject: [PATCH 1567/3533] esp32/boards/GENERIC_D2WD: Build with -Os
 optimisation.

This board has only 2MiB of flash so the build needs to be reduced in size
to fit.  Commit 549448e8bbc8ce0b6b5fc51c0660acdaff18c3d6 made all boards
build with -O2 by default (for performance) so this overrides that default.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/boards/GENERIC_D2WD/sdkconfig.board | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ports/esp32/boards/GENERIC_D2WD/sdkconfig.board b/ports/esp32/boards/GENERIC_D2WD/sdkconfig.board
index 367283ded3713..07e208a09ae7b 100644
--- a/ports/esp32/boards/GENERIC_D2WD/sdkconfig.board
+++ b/ports/esp32/boards/GENERIC_D2WD/sdkconfig.board
@@ -1,3 +1,7 @@
+# Optimise using -Os to reduce size
+CONFIG_COMPILER_OPTIMIZATION_SIZE=y
+CONFIG_COMPILER_OPTIMIZATION_PERF=n
+
 CONFIG_ESPTOOLPY_FLASHMODE_DIO=y
 CONFIG_ESPTOOLPY_FLASHFREQ_40M=y
 CONFIG_ESPTOOLPY_FLASHSIZE_2MB=y

From b47b245c2eeb734f69d5445372d0947f1ea43259 Mon Sep 17 00:00:00 2001
From: stijn <stijn@ignitron.net>
Date: Mon, 10 Jan 2022 14:27:29 +0100
Subject: [PATCH 1568/3533] windows/appveyor: Build mpy-cross only once for
 mingw-w64.

The main Makefile builds the mpy-cross executable automatically if
it doesn't exist since 78718fffb1f3010c7a40bb4c29c6ddf5b8dadaa3,
so build it first to make sure it doesn't get needlessly rebuilt.
---
 ports/windows/.appveyor.yml | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/ports/windows/.appveyor.yml b/ports/windows/.appveyor.yml
index e249aafdf8e61..739484f095c73 100644
--- a/ports/windows/.appveyor.yml
+++ b/ports/windows/.appveyor.yml
@@ -68,17 +68,16 @@ after_test:
     }
     $env:MSYSTEM = if ($platform -eq 'x86') {'MINGW32'} else {'MINGW64'}
     $env:CHERE_INVOKING = 'enabled_from_arguments'
-    cd (Join-Path $env:APPVEYOR_BUILD_FOLDER 'ports/windows')
-    C:\msys64\usr\bin\bash.exe -l -c "make -B -j4 V=1 VARIANT=$($env:PyVariant)"
-    if ($LASTEXITCODE -ne 0) {
-      throw "$env:MSYSTEM build exited with code $LASTEXITCODE"
-    }
     cd (Join-Path $env:APPVEYOR_BUILD_FOLDER 'mpy-cross')
     C:\msys64\usr\bin\bash.exe -l -c "make -B -j4 V=1"
     if ($LASTEXITCODE -ne 0) {
       throw "$env:MSYSTEM mpy_cross build exited with code $LASTEXITCODE"
     }
     cd (Join-Path $env:APPVEYOR_BUILD_FOLDER 'ports/windows')
+    C:\msys64\usr\bin\bash.exe -l -c "make -B -j4 V=1 MICROPY_MPYCROSS=../../mpy-cross/mpy-cross.exe VARIANT=$($env:PyVariant)"
+    if ($LASTEXITCODE -ne 0) {
+      throw "$env:MSYSTEM build exited with code $LASTEXITCODE"
+    }
     C:\msys64\usr\bin\bash.exe -l -c "make V=1 test_full VARIANT=$($env:PyVariant)"
     if ($LASTEXITCODE -ne 0) {
       & $env:MICROPY_CPYTHON3 run-tests.py --print-failures

From 67420de4f4faa214de853dc70ef307d3571bfc28 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Fri, 7 Jan 2022 22:26:17 +0200
Subject: [PATCH 1569/3533] extmod/modusocket: Allow setting timeout on unbound
 sockets.

For an extended state socket, if settimeout() is called before a NIC is
bound, save the timeout until the NIC is bound.
---
 extmod/modusocket.c | 27 ++++++++++++++++++++-------
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/extmod/modusocket.c b/extmod/modusocket.c
index 9c2dc6fcadf24..0335f53cb4a71 100644
--- a/extmod/modusocket.c
+++ b/extmod/modusocket.c
@@ -85,6 +85,13 @@ STATIC void socket_select_nic(mod_network_socket_obj_t *self, const byte *ip) {
         if (self->nic_type->socket(self, &_errno) != 0) {
             mp_raise_OSError(_errno);
         }
+
+        #if MICROPY_PY_USOCKET_EXTENDED_STATE
+        // if a timeout was set before binding a NIC, call settimeout to reset it
+        if (self->timeout != 0 && self->nic_type->settimeout(self, self->timeout, &_errno) != 0) {
+            mp_raise_OSError(_errno);
+        }
+        #endif
     }
 }
 
@@ -317,10 +324,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(socket_setsockopt_obj, 4, 4, socket_s
 // otherwise, timeout is in seconds
 STATIC mp_obj_t socket_settimeout(mp_obj_t self_in, mp_obj_t timeout_in) {
     mod_network_socket_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    if (self->nic == MP_OBJ_NULL) {
-        // not connected
-        mp_raise_OSError(MP_ENOTCONN);
-    }
     mp_uint_t timeout;
     if (timeout_in == mp_const_none) {
         timeout = -1;
@@ -331,9 +334,19 @@ STATIC mp_obj_t socket_settimeout(mp_obj_t self_in, mp_obj_t timeout_in) {
         timeout = 1000 * mp_obj_get_int(timeout_in);
         #endif
     }
-    int _errno;
-    if (self->nic_type->settimeout(self, timeout, &_errno) != 0) {
-        mp_raise_OSError(_errno);
+    if (self->nic == MP_OBJ_NULL) {
+        #if MICROPY_PY_USOCKET_EXTENDED_STATE
+        // store the timeout in the socket state until a NIC is bound
+        self->timeout = timeout;
+        #else
+        // not connected
+        mp_raise_OSError(MP_ENOTCONN);
+        #endif
+    } else {
+        int _errno;
+        if (self->nic_type->settimeout(self, timeout, &_errno) != 0) {
+            mp_raise_OSError(_errno);
+        }
     }
     return mp_const_none;
 }

From 842da930118d7678741dd419b1433af9d6d7ac4d Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Sun, 9 Jan 2022 15:37:02 +0200
Subject: [PATCH 1570/3533] extmod/modusocket: Initialise accepted socket
 state.

---
 extmod/modusocket.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/extmod/modusocket.c b/extmod/modusocket.c
index 0335f53cb4a71..a42b3213f5a1d 100644
--- a/extmod/modusocket.c
+++ b/extmod/modusocket.c
@@ -151,6 +151,17 @@ STATIC mp_obj_t socket_accept(mp_obj_t self_in) {
     socket2->nic = MP_OBJ_NULL;
     socket2->nic_type = NULL;
 
+    // set the same address family, socket type and protocol as parent
+    socket2->domain = self->domain;
+    socket2->type = self->type;
+    socket2->proto = self->proto;
+    socket2->bound = false;
+    socket2->fileno = -1;
+    #if MICROPY_PY_USOCKET_EXTENDED_STATE
+    socket2->timeout = 0;
+    socket2->state = NULL;
+    #endif
+
     // accept incoming connection
     uint8_t ip[MOD_NETWORK_IPADDR_BUF_SIZE];
     mp_uint_t port;

From f2ccf87e0b139d7e0402e9f4a615cedfeac7a11e Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Fri, 7 Jan 2022 22:39:53 +0200
Subject: [PATCH 1571/3533] extmod/network_ninaw10: Use socket timeout preset
 in modusocket.

---
 extmod/network_ninaw10.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/extmod/network_ninaw10.c b/extmod/network_ninaw10.c
index cbc62171db6aa..cba24ea94c755 100644
--- a/extmod/network_ninaw10.c
+++ b/extmod/network_ninaw10.c
@@ -350,9 +350,8 @@ STATIC int network_ninaw10_socket_socket(mod_network_socket_obj_t *socket, int *
         return -1;
     }
 
-    // store state of this socket
+    // set socket state
     socket->fileno = fd;
-    socket->timeout = 0; // blocking
     socket->bound = false;
     return 0;
 }
@@ -413,9 +412,8 @@ STATIC int network_ninaw10_socket_accept(mod_network_socket_obj_t *socket,
         return -1;
     }
 
-    // Set default socket timeout.
+    // set socket state
     socket2->fileno = fd;
-    socket2->timeout = 0;
     socket2->bound = false;
     return 0;
 }

From 889dee8076aa1c639dbbd6ce4993872e7feb4acf Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 12 Jan 2022 16:05:33 +1100
Subject: [PATCH 1572/3533] extmod/modbluetooth: Fix conditional compilation of
 ringbuf_put_uuid.

This fixes a bug introduced in a76604afba109d990e466cdcd5a69a82077a7f56

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/modbluetooth.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/extmod/modbluetooth.c b/extmod/modbluetooth.c
index 1bf2ae6addddc..c4b9675cef530 100644
--- a/extmod/modbluetooth.c
+++ b/extmod/modbluetooth.c
@@ -215,7 +215,9 @@ STATIC mp_int_t bluetooth_uuid_get_buffer(mp_obj_t self_in, mp_buffer_info_t *bu
     return 0;
 }
 
-#if !MICROPY_PY_BLUETOOTH_USE_SYNC_EVENTS && MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE
+#if !MICROPY_PY_BLUETOOTH_USE_SYNC_EVENTS
+
+#if MICROPY_PY_BLUETOOTH_ENABLE_GATT_CLIENT
 STATIC void ringbuf_put_uuid(ringbuf_t *ringbuf, mp_obj_bluetooth_uuid_t *uuid) {
     assert(ringbuf_free(ringbuf) >= (size_t)uuid->type + 1);
     ringbuf_put(ringbuf, uuid->type);
@@ -223,7 +225,9 @@ STATIC void ringbuf_put_uuid(ringbuf_t *ringbuf, mp_obj_bluetooth_uuid_t *uuid)
         ringbuf_put(ringbuf, uuid->data[i]);
     }
 }
+#endif
 
+#if MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE
 STATIC void ringbuf_get_uuid(ringbuf_t *ringbuf, mp_obj_bluetooth_uuid_t *uuid) {
     assert(ringbuf_avail(ringbuf) >= 1);
     uuid->type = ringbuf_get(ringbuf);
@@ -232,7 +236,9 @@ STATIC void ringbuf_get_uuid(ringbuf_t *ringbuf, mp_obj_bluetooth_uuid_t *uuid)
         uuid->data[i] = ringbuf_get(ringbuf);
     }
 }
-#endif // MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE
+#endif
+
+#endif // !MICROPY_PY_BLUETOOTH_USE_SYNC_EVENTS
 
 const mp_obj_type_t mp_type_bluetooth_uuid = {
     { &mp_type_type },

From e7fff736b56e250dbc03fb9796f93789f20a17d5 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 12 Jan 2022 16:08:40 +1100
Subject: [PATCH 1573/3533] extmod/modbluetooth: Put declaration of
 connect_cancel in correct place.

This fixes a bug introduced in 851ecb2da178fff0b60aefdb5af502f28787a7ec

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/modbluetooth.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extmod/modbluetooth.h b/extmod/modbluetooth.h
index e52232c4149f5..52053045f852c 100644
--- a/extmod/modbluetooth.h
+++ b/extmod/modbluetooth.h
@@ -371,12 +371,12 @@ int mp_bluetooth_gap_scan_stop(void);
 
 // Connect to a found peripheral.
 int mp_bluetooth_gap_peripheral_connect(uint8_t addr_type, const uint8_t *addr, int32_t duration_ms, int32_t min_conn_interval_us, int32_t max_conn_interval_us);
-#endif
-
-#if MICROPY_PY_BLUETOOTH_ENABLE_GATT_CLIENT
 
 // Cancel in-progress connection to a peripheral.
 int mp_bluetooth_gap_peripheral_connect_cancel(void);
+#endif
+
+#if MICROPY_PY_BLUETOOTH_ENABLE_GATT_CLIENT
 
 // Find all primary services on the connected peripheral.
 int mp_bluetooth_gattc_discover_primary_services(uint16_t conn_handle, const mp_obj_bluetooth_uuid_t *uuid);

From a49b51b7dba25d1a87c33109cf908643c8fecb24 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 12 Jan 2022 16:10:52 +1100
Subject: [PATCH 1574/3533] zephyr/modbluetooth_zephyr: Provide dummy
 connect_cancel function.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/zephyr/modbluetooth_zephyr.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/ports/zephyr/modbluetooth_zephyr.c b/ports/zephyr/modbluetooth_zephyr.c
index f4b6f355905fe..ba13064f3348a 100644
--- a/ports/zephyr/modbluetooth_zephyr.c
+++ b/ports/zephyr/modbluetooth_zephyr.c
@@ -408,6 +408,14 @@ int mp_bluetooth_gap_peripheral_connect(uint8_t addr_type, const uint8_t *addr,
     return MP_EOPNOTSUPP;
 }
 
+int mp_bluetooth_gap_peripheral_connect_cancel(void) {
+    DEBUG_printf("mp_bluetooth_gap_peripheral_connect_cancel\n");
+    if (!mp_bluetooth_is_active()) {
+        return ERRNO_BLUETOOTH_NOT_ACTIVE;
+    }
+    return MP_EOPNOTSUPP;
+}
+
 #endif // MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE
 
 #endif // MICROPY_PY_BLUETOOTH

From 49325de4757b1a93835cbf4f2e860e79e0e94874 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 12 Jan 2022 16:12:37 +1100
Subject: [PATCH 1575/3533] tools/ci.sh: Build zephyr nucleo_wb55rg to test
 zephyr bluetooth build.

And eliminate one build to reduce CI time.

Signed-off-by: Damien George <damien@micropython.org>
---
 tools/ci.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tools/ci.sh b/tools/ci.sh
index b8820950bf13d..d0c5948a8c317 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -627,9 +627,8 @@ function ci_zephyr_install {
 
 function ci_zephyr_build {
     docker exec zephyr-ci west build -p auto -b qemu_x86 -- -DCONF_FILE=prj_minimal.conf
-    docker exec zephyr-ci west build -p auto -b frdm_k64f -- -DCONF_FILE=prj_minimal.conf
     docker exec zephyr-ci west build -p auto -b qemu_x86
     docker exec zephyr-ci west build -p auto -b frdm_k64f
     docker exec zephyr-ci west build -p auto -b mimxrt1050_evk
-    docker exec zephyr-ci west build -p auto -b reel_board
+    docker exec zephyr-ci west build -p auto -b nucleo_wb55rg # for bluetooth
 }

From 895738625044b9fada0cf32aeee2f90bc0f52886 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 13 Jan 2022 22:38:41 +1100
Subject: [PATCH 1576/3533] docs/esp32: Update RMT quickref example to match
 latest code.

The start keyword was removed in 18e48a71ee69557a5340c8652f2e73e586063be3

Signed-off-by: Damien George <damien@micropython.org>
---
 docs/esp32/quickref.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/esp32/quickref.rst b/docs/esp32/quickref.rst
index e74d3d81f891a..76a3827e36e14 100644
--- a/docs/esp32/quickref.rst
+++ b/docs/esp32/quickref.rst
@@ -509,7 +509,7 @@ The RMT is ESP32-specific and allows generation of accurate digital pulses with
     r = esp32.RMT(0, pin=Pin(18), clock_div=8)
     r   # RMT(channel=0, pin=18, source_freq=80000000, clock_div=8)
     # The channel resolution is 100ns (1/(source_freq/clock_div)).
-    r.write_pulses((1, 20, 2, 40), start=0) # Send 0 for 100ns, 1 for 2000ns, 0 for 200ns, 1 for 4000ns
+    r.write_pulses((1, 20, 2, 40), 0) # Send 0 for 100ns, 1 for 2000ns, 0 for 200ns, 1 for 4000ns
 
 OneWire driver
 --------------

From e754c2e84f1845313411a68c26821d613e66934e Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 13 Jan 2022 15:16:16 +1100
Subject: [PATCH 1577/3533] esp32/esp32_rmt: Install RMT driver on core 1.

MicroPython currently runs on core 0 of the esp32.  Calling
rmt_driver_install will mean that the RMT interrupt handler is also
serviced on core 0.  This can lead to glitches in the RMT output if
WiFi is enabled (for esp32.RMT and machine.bitstream).

This patch calls rmt_driver_install on core 1, ensuring that the RMT
interrupt handler is serviced on core 1.  This prevents glitches.

Fixes issue #8161.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/esp32_rmt.c         | 35 ++++++++++++++++++++++++++++++---
 ports/esp32/machine_bitstream.c |  2 +-
 ports/esp32/modesp32.h          |  2 ++
 3 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/ports/esp32/esp32_rmt.c b/ports/esp32/esp32_rmt.c
index 1a7e77b9d23f3..941f20818ee85 100644
--- a/ports/esp32/esp32_rmt.c
+++ b/ports/esp32/esp32_rmt.c
@@ -27,10 +27,11 @@
 #include "py/runtime.h"
 #include "modmachine.h"
 #include "mphalport.h"
-#include "driver/rmt.h"
-
 #include "modesp32.h"
 
+#include "esp_task.h"
+#include "driver/rmt.h"
+
 // This exposes the ESP32's RMT module to MicroPython. RMT is provided by the Espressif ESP-IDF:
 //
 //    https://docs.espressif.com/projects/esp-idf/en/latest/api-reference/peripherals/rmt.html
@@ -59,6 +60,34 @@ typedef struct _esp32_rmt_obj_t {
     bool loop_en;
 } esp32_rmt_obj_t;
 
+typedef struct _rmt_install_state_t {
+    SemaphoreHandle_t handle;
+    uint8_t channel_id;
+    esp_err_t ret;
+} rmt_install_state_t;
+
+STATIC void rmt_install_task(void *pvParameter) {
+    rmt_install_state_t *state = pvParameter;
+    state->ret = rmt_driver_install(state->channel_id, 0, 0);
+    xSemaphoreGive(state->handle);
+    vTaskDelete(NULL);
+    for (;;) {
+    }
+}
+
+// Call rmt_driver_install on core 1.  This ensures that the RMT interrupt handler is
+// serviced on core 1, so that WiFi (if active) does not interrupt it and cause glitches.
+esp_err_t rmt_driver_install_core1(uint8_t channel_id) {
+    TaskHandle_t th;
+    rmt_install_state_t state;
+    state.handle = xSemaphoreCreateBinary();
+    state.channel_id = channel_id;
+    xTaskCreatePinnedToCore(rmt_install_task, "rmt_install_task", 2048 / sizeof(StackType_t), &state, ESP_TASK_PRIO_MIN + 1, &th, 1);
+    xSemaphoreTake(state.handle, portMAX_DELAY);
+    vSemaphoreDelete(state.handle);
+    return state.ret;
+}
+
 STATIC mp_obj_t esp32_rmt_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_id,        MP_ARG_REQUIRED | MP_ARG_INT, {.u_int = -1} },
@@ -125,7 +154,7 @@ STATIC mp_obj_t esp32_rmt_make_new(const mp_obj_type_t *type, size_t n_args, siz
     config.clk_div = self->clock_div;
 
     check_esp_err(rmt_config(&config));
-    check_esp_err(rmt_driver_install(config.channel, 0, 0));
+    check_esp_err(rmt_driver_install_core1(config.channel));
 
     return MP_OBJ_FROM_PTR(self);
 }
diff --git a/ports/esp32/machine_bitstream.c b/ports/esp32/machine_bitstream.c
index 4ba05e889527e..5f9eb32c3f81a 100644
--- a/ports/esp32/machine_bitstream.c
+++ b/ports/esp32/machine_bitstream.c
@@ -101,7 +101,7 @@ void machine_bitstream_high_low(mp_hal_pin_obj_t pin, uint32_t *timing_ns, const
 
     // Install the driver on this channel & pin.
     check_esp_err(rmt_config(&config));
-    check_esp_err(rmt_driver_install(config.channel, 0, 0));
+    check_esp_err(rmt_driver_install_core1(config.channel));
 
     // Get the tick rate in kHz (this will likely be 40000).
     uint32_t counter_clk_khz = 0;
diff --git a/ports/esp32/modesp32.h b/ports/esp32/modesp32.h
index 86979f0b3e066..368b40db04ec7 100644
--- a/ports/esp32/modesp32.h
+++ b/ports/esp32/modesp32.h
@@ -34,4 +34,6 @@ extern const mp_obj_type_t esp32_ulp_type;
 // Reserve the last channel for machine.bitstream.
 #define MICROPY_HW_ESP32_RMT_CHANNEL_BITSTREAM (RMT_CHANNEL_MAX - 1)
 
+esp_err_t rmt_driver_install_core1(uint8_t channel_id);
+
 #endif // MICROPY_INCLUDED_ESP32_MODESP32_H

From a3bbd5332bff0a67204196d2e365ad10ff773d58 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 11 Jan 2022 17:21:14 +1100
Subject: [PATCH 1578/3533] esp32/machine_bitstream: Reinstate bitstream
 bit-bang implementation.

The bit-bang implementation was replaced with the RMT implementation in
599b61c08687ca077e3b0e115d5b76affcc673ca.  This commit brings back that
bit-bang code, and allows it to be selected via the new static method:

    esp32.RMT.bitstream_channel(None)

The bit-bang implementation may be useful if the RMT needs to be used for
something else, or if bit-banging is more stable in certain applications.

Signed-off-by: Damien George <damien@micropython.org>
---
 docs/esp32/quickref.rst         |  3 ++
 docs/library/esp32.rst          | 11 +++++
 ports/esp32/esp32_rmt.c         | 32 +++++++++++++-
 ports/esp32/machine_bitstream.c | 77 +++++++++++++++++++++++++++++++--
 ports/esp32/modesp32.h          |  5 +--
 5 files changed, 119 insertions(+), 9 deletions(-)

diff --git a/docs/esp32/quickref.rst b/docs/esp32/quickref.rst
index 76a3827e36e14..337f87b66fde6 100644
--- a/docs/esp32/quickref.rst
+++ b/docs/esp32/quickref.rst
@@ -573,6 +573,9 @@ For low-level driving of a NeoPixel::
    400kHz) devices by passing ``timing=0`` when constructing the
    ``NeoPixel`` object.
 
+The low-level driver uses an RMT channel by default.  To configure this see
+`RMT.bitstream_channel`.
+
 APA102 (DotStar) uses a different driver as it has an additional clock pin.
 
 Capacitive touch
diff --git a/docs/library/esp32.rst b/docs/library/esp32.rst
index e3c25d2653db1..ff1c99a553bd6 100644
--- a/docs/library/esp32.rst
+++ b/docs/library/esp32.rst
@@ -250,6 +250,17 @@ For more details see Espressif's `ESP-IDF RMT documentation.
     new sequence of pulses. Looping sequences longer than 126 pulses is not
     supported by the hardware.
 
+.. staticmethod:: RMT.bitstream_channel([value])
+
+    Select which RMT channel is used by the `machine.bitstream` implementation.
+    *value* can be ``None`` or a valid RMT channel number.  The default RMT
+    channel is the highest numbered one.
+
+    Passing in ``None`` disables the use of RMT and instead selects a bit-banging
+    implementation for `machine.bitstream`.
+
+    Passing in no argument will not change the channel.  This function returns
+    the current channel number.
 
 Ultra-Low-Power co-processor
 ----------------------------
diff --git a/ports/esp32/esp32_rmt.c b/ports/esp32/esp32_rmt.c
index 941f20818ee85..639e0467a86c8 100644
--- a/ports/esp32/esp32_rmt.c
+++ b/ports/esp32/esp32_rmt.c
@@ -66,6 +66,10 @@ typedef struct _rmt_install_state_t {
     esp_err_t ret;
 } rmt_install_state_t;
 
+// Current channel used for machine.bitstream, in the machine_bitstream_high_low_rmt
+// implementation.  A value of -1 means do not use RMT.
+int8_t esp32_rmt_bitstream_channel_id = RMT_CHANNEL_MAX - 1;
+
 STATIC void rmt_install_task(void *pvParameter) {
     rmt_install_state_t *state = pvParameter;
     state->ret = rmt_driver_install(state->channel_id, 0, 0);
@@ -104,8 +108,8 @@ STATIC mp_obj_t esp32_rmt_make_new(const mp_obj_type_t *type, size_t n_args, siz
     mp_uint_t idle_level = args[3].u_bool;
     mp_obj_t tx_carrier_obj = args[4].u_obj;
 
-    if (channel_id == MICROPY_HW_ESP32_RMT_CHANNEL_BITSTREAM) {
-        mp_raise_ValueError(MP_ERROR_TEXT("reserved channel id"));
+    if (esp32_rmt_bitstream_channel_id >= 0 && channel_id == esp32_rmt_bitstream_channel_id) {
+        mp_raise_ValueError(MP_ERROR_TEXT("channel used by bitstream"));
     }
 
     if (clock_div < 1 || clock_div > 255) {
@@ -314,6 +318,27 @@ STATIC mp_obj_t esp32_rmt_write_pulses(size_t n_args, const mp_obj_t *args) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(esp32_rmt_write_pulses_obj, 2, 3, esp32_rmt_write_pulses);
 
+STATIC mp_obj_t esp32_rmt_bitstream_channel(size_t n_args, const mp_obj_t *args) {
+    if (n_args > 0) {
+        if (args[0] == mp_const_none) {
+            esp32_rmt_bitstream_channel_id = -1;
+        } else {
+            mp_int_t channel_id = mp_obj_get_int(args[0]);
+            if (channel_id < 0 || channel_id >= RMT_CHANNEL_MAX) {
+                mp_raise_ValueError(MP_ERROR_TEXT("invalid channel"));
+            }
+            esp32_rmt_bitstream_channel_id = channel_id;
+        }
+    }
+    if (esp32_rmt_bitstream_channel_id < 0) {
+        return mp_const_none;
+    } else {
+        return MP_OBJ_NEW_SMALL_INT(esp32_rmt_bitstream_channel_id);
+    }
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(esp32_rmt_bitstream_channel_fun_obj, 0, 1, esp32_rmt_bitstream_channel);
+STATIC MP_DEFINE_CONST_STATICMETHOD_OBJ(esp32_rmt_bitstream_channel_obj, MP_ROM_PTR(&esp32_rmt_bitstream_channel_fun_obj));
+
 STATIC const mp_rom_map_elem_t esp32_rmt_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR___del__), MP_ROM_PTR(&esp32_rmt_deinit_obj) },
     { MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&esp32_rmt_deinit_obj) },
@@ -322,6 +347,9 @@ STATIC const mp_rom_map_elem_t esp32_rmt_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_wait_done), MP_ROM_PTR(&esp32_rmt_wait_done_obj) },
     { MP_ROM_QSTR(MP_QSTR_loop), MP_ROM_PTR(&esp32_rmt_loop_obj) },
     { MP_ROM_QSTR(MP_QSTR_write_pulses), MP_ROM_PTR(&esp32_rmt_write_pulses_obj) },
+
+    // Static methods
+    { MP_ROM_QSTR(MP_QSTR_bitstream_channel), MP_ROM_PTR(&esp32_rmt_bitstream_channel_obj) },
 };
 STATIC MP_DEFINE_CONST_DICT(esp32_rmt_locals_dict, esp32_rmt_locals_dict_table);
 
diff --git a/ports/esp32/machine_bitstream.c b/ports/esp32/machine_bitstream.c
index 5f9eb32c3f81a..4284b5f8baf77 100644
--- a/ports/esp32/machine_bitstream.c
+++ b/ports/esp32/machine_bitstream.c
@@ -26,12 +26,70 @@
 
 #include "py/mpconfig.h"
 #include "py/mphal.h"
+#include "modesp32.h"
 
 #if MICROPY_PY_MACHINE_BITSTREAM
 
-#include "driver/rmt.h"
+/******************************************************************************/
+// Bit-bang implementation
 
-#include "modesp32.h"
+#define NS_TICKS_OVERHEAD (6)
+
+// This is a translation of the cycle counter implementation in ports/stm32/machine_bitstream.c.
+STATIC void IRAM_ATTR machine_bitstream_high_low_bitbang(mp_hal_pin_obj_t pin, uint32_t *timing_ns, const uint8_t *buf, size_t len) {
+    uint32_t pin_mask, gpio_reg_set, gpio_reg_clear;
+    #if !CONFIG_IDF_TARGET_ESP32C3
+    if (pin >= 32) {
+        pin_mask = 1 << (pin - 32);
+        gpio_reg_set = GPIO_OUT1_W1TS_REG;
+        gpio_reg_clear = GPIO_OUT1_W1TC_REG;
+    } else
+    #endif
+    {
+        pin_mask = 1 << pin;
+        gpio_reg_set = GPIO_OUT_W1TS_REG;
+        gpio_reg_clear = GPIO_OUT_W1TC_REG;
+    }
+
+    // Convert ns to cpu ticks [high_time_0, period_0, high_time_1, period_1].
+    uint32_t fcpu_mhz = ets_get_cpu_frequency();
+    for (size_t i = 0; i < 4; ++i) {
+        timing_ns[i] = fcpu_mhz * timing_ns[i] / 1000;
+        if (timing_ns[i] > NS_TICKS_OVERHEAD) {
+            timing_ns[i] -= NS_TICKS_OVERHEAD;
+        }
+        if (i % 2 == 1) {
+            // Convert low_time to period (i.e. add high_time).
+            timing_ns[i] += timing_ns[i - 1];
+        }
+    }
+
+    uint32_t irq_state = mp_hal_quiet_timing_enter();
+
+    for (size_t i = 0; i < len; ++i) {
+        uint8_t b = buf[i];
+        for (size_t j = 0; j < 8; ++j) {
+            GPIO_REG_WRITE(gpio_reg_set, pin_mask);
+            uint32_t start_ticks = mp_hal_ticks_cpu();
+            uint32_t *t = &timing_ns[b >> 6 & 2];
+            while (mp_hal_ticks_cpu() - start_ticks < t[0]) {
+                ;
+            }
+            GPIO_REG_WRITE(gpio_reg_clear, pin_mask);
+            b <<= 1;
+            while (mp_hal_ticks_cpu() - start_ticks < t[1]) {
+                ;
+            }
+        }
+    }
+
+    mp_hal_quiet_timing_exit(irq_state);
+}
+
+/******************************************************************************/
+// RMT implementation
+
+#include "driver/rmt.h"
 
 #if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(4, 1, 0)
 // This convenience macro was not available in earlier IDF versions.
@@ -93,8 +151,8 @@ STATIC void IRAM_ATTR bitstream_high_low_rmt_adapter(const void *src, rmt_item32
 }
 
 // Use the reserved RMT channel to stream high/low data on the specified pin.
-void machine_bitstream_high_low(mp_hal_pin_obj_t pin, uint32_t *timing_ns, const uint8_t *buf, size_t len) {
-    rmt_config_t config = RMT_DEFAULT_CONFIG_TX(pin, MICROPY_HW_ESP32_RMT_CHANNEL_BITSTREAM);
+STATIC void machine_bitstream_high_low_rmt(mp_hal_pin_obj_t pin, uint32_t *timing_ns, const uint8_t *buf, size_t len, uint8_t channel_id) {
+    rmt_config_t config = RMT_DEFAULT_CONFIG_TX(pin, channel_id);
 
     // Use 40MHz clock (although 2MHz would probably be sufficient).
     config.clk_div = 2;
@@ -138,4 +196,15 @@ void machine_bitstream_high_low(mp_hal_pin_obj_t pin, uint32_t *timing_ns, const
     gpio_matrix_out(pin, SIG_GPIO_OUT_IDX, false, false);
 }
 
+/******************************************************************************/
+// Interface to machine.bitstream
+
+void machine_bitstream_high_low(mp_hal_pin_obj_t pin, uint32_t *timing_ns, const uint8_t *buf, size_t len) {
+    if (esp32_rmt_bitstream_channel_id < 0) {
+        machine_bitstream_high_low_bitbang(pin, timing_ns, buf, len);
+    } else {
+        machine_bitstream_high_low_rmt(pin, timing_ns, buf, len, esp32_rmt_bitstream_channel_id);
+    }
+}
+
 #endif // MICROPY_PY_MACHINE_BITSTREAM
diff --git a/ports/esp32/modesp32.h b/ports/esp32/modesp32.h
index 368b40db04ec7..d76b3a49a2991 100644
--- a/ports/esp32/modesp32.h
+++ b/ports/esp32/modesp32.h
@@ -26,14 +26,13 @@
 #define RTC_LAST_EXT_PIN 39
 #define RTC_IS_VALID_EXT_PIN(pin_id) ((1ll << (pin_id)) & RTC_VALID_EXT_PINS)
 
+extern int8_t esp32_rmt_bitstream_channel_id;
+
 extern const mp_obj_type_t esp32_nvs_type;
 extern const mp_obj_type_t esp32_partition_type;
 extern const mp_obj_type_t esp32_rmt_type;
 extern const mp_obj_type_t esp32_ulp_type;
 
-// Reserve the last channel for machine.bitstream.
-#define MICROPY_HW_ESP32_RMT_CHANNEL_BITSTREAM (RMT_CHANNEL_MAX - 1)
-
 esp_err_t rmt_driver_install_core1(uint8_t channel_id);
 
 #endif // MICROPY_INCLUDED_ESP32_MODESP32_H

From cf258c898eab664615220683d0f9e0507383b925 Mon Sep 17 00:00:00 2001
From: stijn <stijn@ignitron.net>
Date: Wed, 12 Jan 2022 13:57:41 +0100
Subject: [PATCH 1579/3533] windows/msvc: Run qstr preprocessing phase in
 parallel.

Supported from VS2017 and up, this roughly halves build time.
---
 ports/windows/msvc/genhdr.targets | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/ports/windows/msvc/genhdr.targets b/ports/windows/msvc/genhdr.targets
index 78e57a34ee044..ed97a455d38b3 100644
--- a/ports/windows/msvc/genhdr.targets
+++ b/ports/windows/msvc/genhdr.targets
@@ -18,8 +18,14 @@
     <PyPython Condition="'$(PyPython)' == ''">python</PyPython>
     <CLToolExe Condition="'$(CLToolExe)' == ''">cl.exe</CLToolExe>
     <PyClTool>$([System.IO.Path]::Combine(`$(CLToolPath)`, `$(CLToolExe)`))</PyClTool>
+    <PyPlatformToolsetNum>120</PyPlatformToolsetNum> <!--Minimum we support is VS2013.-->
+    <PyPlatformToolsetNum Condition="$(PlatformToolset.StartsWith('v'))">$(PlatformToolset.Replace('v', ''))</PyPlatformToolsetNum>
+    <PyParallelPreProc Condition="'$(PyPlatformToolsetNum)' &gt; '140'">True</PyParallelPreProc> <!--VS2017 and up.-->
   </PropertyGroup>
 
+  <UsingTask Condition="'$(PyParallelPreProc)' == 'True'"
+             TaskName="ParallelCustomBuild" AssemblyFile="$(VCTargetsPath)\Microsoft.Build.CppTasks.Common.dll"/>
+
   <Target Name="MakeDestDir">
     <MakeDir Directories="$(DestDir)"/>
   </Target>
@@ -57,6 +63,7 @@ using(var outFile = System.IO.File.CreateText(OutputFile)) {
       <PyIncDirs Include="$(PyIncDirs)"/>
       <PreProcDefs Include="%(ClCompile.PreProcessorDefinitions);NO_QSTR"/>
       <PyQstrSourceFiles Include="@(ClCompile)" Exclude="$(PyBuildDir)\frozen_content.c">
+        <Changed>False</Changed>
         <OutFile>$([System.String]::new('%(FullPath)').Replace('$(PyBaseDir)', '$(DestDir)qstr\'))</OutFile>
       </PyQstrSourceFiles>
       <PyQstrSourceFiles>
@@ -71,13 +78,21 @@ using(var outFile = System.IO.File.CreateText(OutputFile)) {
       </QstrDependencies>
     </ItemGroup>
     <PropertyGroup>
+      <PyPreProcCommand>$(PyClTool) /nologo /I@(PyIncDirs, ' /I') /D@(PreProcDefs, ' /D')</PyPreProcCommand>
       <ForceQstrRebuild>@(QstrDependencies->AnyHaveMetadataValue('Changed', 'True'))</ForceQstrRebuild>
       <RunPreProcConcat>@(PyQstrSourceFiles->AnyHaveMetadataValue('Changed', 'True'))</RunPreProcConcat>
     </PropertyGroup>
+    <ItemGroup>
+      <PyQstrSourceFilesToPreProc Include="@(PyQstrSourceFiles)" Condition="'%(Changed)' == 'True' Or '$(ForceQstrRebuild)' == 'True'">
+        <Command>$(PyPreProcCommand) /Fi%(OutFile) /P %(Identity)</Command>
+        <Outputs>%(OutFile)</Outputs>
+      </PyQstrSourceFilesToPreProc>
+    </ItemGroup>
+
+    <MakeDir Directories="@(PyQstrSourceFilesToPreProc->'%(OutDir)')"/>
+    <Exec Condition="'$(PyParallelPreProc)' != 'True'" Command="%(PyQstrSourceFilesToPreProc.Command)" />
+    <ParallelCustomBuild Condition="'$(PyParallelPreProc)' == 'True' And '@(PyQstrSourceFilesToPreProc)' != ''" Sources="@(PyQstrSourceFilesToPreProc)" />
 
-    <MakeDir Directories="@(PyQstrSourceFiles->'%(OutDir)')"/>
-    <Exec Command="$(PyClTool) /nologo /I@(PyIncDirs, ' /I') /D@(PreProcDefs, ' /D') /Fi%(PyQstrSourceFiles.OutFile) /P %(PyQstrSourceFiles.Identity)"
-          Condition="'%(PyQstrSourceFiles.Changed)' == 'True' Or '$(ForceQstrRebuild)' == 'True'"/>
     <ConcatPreProcFiles InputFiles="@(PyQstrSourceFiles->'%(OutFile)')" OutputFile="$(DestDir)qstr.i.last"
                         Condition="'$(RunPreProcConcat)' == 'True' Or '$(ForceQstrRebuild)' == 'True'"/>
     <Exec Command="$(PyPython) $(PySrcDir)makeqstrdefs.py split qstr $(DestDir)qstr.i.last $(DestDir)qstr _"/>

From 38054a57f3f405ace0d8854d58ad3b430703db3d Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 17 Jan 2022 09:39:38 +1100
Subject: [PATCH 1580/3533] tools/mpremote: Bump version to 0.1.0.

Signed-off-by: Damien George <damien@micropython.org>
---
 tools/mpremote/setup.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/mpremote/setup.cfg b/tools/mpremote/setup.cfg
index 261369384f7b8..bb2d0da52ee2f 100644
--- a/tools/mpremote/setup.cfg
+++ b/tools/mpremote/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = mpremote
-version = 0.0.6
+version = 0.1.0
 author = Damien George
 author_email = damien@micropython.org
 description = Tool for interacting remotely with MicroPython

From da4b38e7562dfa451917f9d7f344a7f26de8c7bd Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 17 Jan 2022 09:50:31 +1100
Subject: [PATCH 1581/3533] all: Bump version to 1.18.

Signed-off-by: Damien George <damien@micropython.org>
---
 docs/conf.py  | 2 +-
 py/mpconfig.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/conf.py b/docs/conf.py
index b35d03ba0eb82..741f8b34396fa 100755
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -74,7 +74,7 @@
 #
 # We don't follow "The short X.Y version" vs "The full version, including alpha/beta/rc tags"
 # breakdown, so use the same version identifier for both to avoid confusion.
-version = release = '1.17'
+version = release = '1.18'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/py/mpconfig.h b/py/mpconfig.h
index 597881d6fe328..c1a0bfc046f78 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -28,7 +28,7 @@
 
 // Current version of MicroPython
 #define MICROPY_VERSION_MAJOR 1
-#define MICROPY_VERSION_MINOR 17
+#define MICROPY_VERSION_MINOR 18
 #define MICROPY_VERSION_MICRO 0
 
 // Combined version as a 32-bit number for convenience

From 5df1d8be6c1c55292824c698761159dc29b384d6 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 17 Jan 2022 14:23:24 +1100
Subject: [PATCH 1582/3533] tests/run-multitests.py: Ignore
 lld_pdu_get_tx_flush_nb msgs from IDF.

BLE still functions correctly even though these messages are sometimes
printed by the IDF.  Ignoring them allows the multi_bluetooth tests to pass
on an esp32 board.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/run-multitests.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tests/run-multitests.py b/tests/run-multitests.py
index 34389e429206c..20ef4a7aa6696 100755
--- a/tests/run-multitests.py
+++ b/tests/run-multitests.py
@@ -76,12 +76,14 @@ def get_network_ip():
 """
 
 # The btstack implementation on Unix generates some spurious output that we
-# can't control.
+# can't control.  Also other platforms may output certain warnings/errors that
+# can be safely ignored.
 IGNORE_OUTPUT_MATCHES = (
     "libusb: error ",  # It tries to open devices that it doesn't have access to (libusb prints unconditionally).
     "hci_transport_h2_libusb.c",  # Same issue. We enable LOG_ERROR in btstack.
     "USB Path: ",  # Hardcoded in btstack's libusb transport.
     "hci_number_completed_packet",  # Warning from btstack.
+    "lld_pdu_get_tx_flush_nb HCI packet count mismatch (",  # From ESP-IDF, see https://github.com/espressif/esp-idf/issues/5105
 )
 
 

From c54717a78f8640cbf4ae6c824569df253ffb689c Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 17 Jan 2022 17:15:31 +1100
Subject: [PATCH 1583/3533] tests/run-multitests.py: Set HOST_IP so tests work
 between PC and board.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/run-multitests.py | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/tests/run-multitests.py b/tests/run-multitests.py
index 20ef4a7aa6696..f55d52b6e910f 100755
--- a/tests/run-multitests.py
+++ b/tests/run-multitests.py
@@ -66,7 +66,7 @@ def get_network_ip():
             import network
             ip = network.WLAN().ifconfig()[0]
         except:
-            ip = "127.0.0.1"
+            ip = HOST_IP
         return ip
 
 {}
@@ -87,6 +87,20 @@ def get_network_ip():
 )
 
 
+def get_host_ip(_ip_cache=[]):
+    if not _ip_cache:
+        try:
+            import socket
+
+            s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
+            s.connect(("8.8.8.8", 80))
+            _ip_cache.append(s.getsockname()[0])
+            s.close()
+        except:
+            _ip_cache.append("127.0.0.1")
+    return _ip_cache[0]
+
+
 class PyInstance:
     def __init__(self):
         pass
@@ -274,6 +288,13 @@ def run_test_on_instances(test_file, num_instances, instances):
     injected_globals = ""
     output = [[] for _ in range(num_instances)]
 
+    # If the test calls get_network_ip() then inject HOST_IP so that devices can know
+    # the IP address of the host.  Do this lazily to not require a TCP/IP connection
+    # on the host if it's not needed.
+    with open(test_file, "rb") as f:
+        if b"get_network_ip" in f.read():
+            injected_globals += "HOST_IP = '" + get_host_ip() + "'\n"
+
     if cmd_args.trace_output:
         print("TRACE {}:".format("|".join(str(i) for i in instances)))
 

From 2c9dc5742abf1f3c787f166d2cbffb4b556ff77b Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 17 Jan 2022 17:20:06 +1100
Subject: [PATCH 1584/3533] tests/multi_net: Add testing key/cert to SSL
 server/client test.

So that this tests works with mbedtls.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/multi_net/ssl_data.py | 33 +++++++++++++++++++++++++++++++--
 1 file changed, 31 insertions(+), 2 deletions(-)

diff --git a/tests/multi_net/ssl_data.py b/tests/multi_net/ssl_data.py
index 81239b454c59a..cf2f96e0f3cc5 100644
--- a/tests/multi_net/ssl_data.py
+++ b/tests/multi_net/ssl_data.py
@@ -1,10 +1,39 @@
 # Simple test creating an SSL connection and transferring some data
 # This test won't run under CPython because it requires key/cert
 
-import usocket as socket, ussl as ssl
+import ubinascii as binascii, usocket as socket, ussl as ssl
 
 PORT = 8000
 
+# This self-signed key/cert pair is randomly generated and to be used for
+# testing/demonstration only.  You should always generate your own key/cert.
+key = binascii.unhexlify(
+    b"3082013b020100024100cc20643fd3d9c21a0acba4f48f61aadd675f52175a9dcf07fbef"
+    b"610a6a6ba14abb891745cd18a1d4c056580d8ff1a639460f867013c8391cdc9f2e573b0f"
+    b"872d0203010001024100bb17a54aeb3dd7ae4edec05e775ca9632cf02d29c2a089b563b0"
+    b"d05cdf95aeca507de674553f28b4eadaca82d5549a86058f9996b07768686a5b02cb240d"
+    b"d9f1022100f4a63f5549e817547dca97b5c658038e8593cb78c5aba3c4642cc4cd031d86"
+    b"8f022100d598d870ffe4a34df8de57047a50b97b71f4d23e323f527837c9edae88c79483"
+    b"02210098560c89a70385c36eb07fd7083235c4c1184e525d838aedf7128958bedfdbb102"
+    b"2051c0dab7057a8176ca966f3feb81123d4974a733df0f958525f547dfd1c271f9022044"
+    b"6c2cafad455a671a8cf398e642e1be3b18a3d3aec2e67a9478f83c964c4f1f"
+)
+cert = binascii.unhexlify(
+    b"308201d53082017f020203e8300d06092a864886f70d01010505003075310b3009060355"
+    b"0406130258583114301206035504080c0b54686550726f76696e63653110300e06035504"
+    b"070c075468654369747931133011060355040a0c0a436f6d70616e7958595a3113301106"
+    b"0355040b0c0a436f6d70616e7958595a3114301206035504030c0b546865486f73744e61"
+    b"6d65301e170d3139313231383033333935355a170d3239313231353033333935355a3075"
+    b"310b30090603550406130258583114301206035504080c0b54686550726f76696e636531"
+    b"10300e06035504070c075468654369747931133011060355040a0c0a436f6d70616e7958"
+    b"595a31133011060355040b0c0a436f6d70616e7958595a3114301206035504030c0b5468"
+    b"65486f73744e616d65305c300d06092a864886f70d0101010500034b003048024100cc20"
+    b"643fd3d9c21a0acba4f48f61aadd675f52175a9dcf07fbef610a6a6ba14abb891745cd18"
+    b"a1d4c056580d8ff1a639460f867013c8391cdc9f2e573b0f872d0203010001300d06092a"
+    b"864886f70d0101050500034100b0513fe2829e9ecbe55b6dd14c0ede7502bde5d46153c8"
+    b"e960ae3ebc247371b525caeb41bbcf34686015a44c50d226e66aef0a97a63874ca5944ef"
+    b"979b57f0b3"
+)
 
 # Server
 def instance0():
@@ -15,7 +44,7 @@ def instance0():
     s.listen(1)
     multitest.next()
     s2, _ = s.accept()
-    s2 = ssl.wrap_socket(s2, server_side=True)
+    s2 = ssl.wrap_socket(s2, server_side=True, key=key, cert=cert)
     print(s2.read(16))
     s2.write(b"server to client")
     s.close()

From 5e506567a390db1b1d2df39ae192f39ed9f617c3 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 17 Jan 2022 17:21:48 +1100
Subject: [PATCH 1585/3533] stm32/mbedtls: Enable
 MBEDTLS_TLS_DEFAULT_ALLOW_SHA1_IN_KEY_EXCHANGE.

This adds MBEDTLS_MD_SHA1 to the list of default hashes for TLS 1.2
handshake signatures.  Although SHA-1 is weak, this option is turned on in
the default mbedtls configuration file, and allows better compatibility
with older servers.  In particular it allows an stm32-mbedtls-based client
to connect to an axtls-based client (eg default unix port and esp8266).

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/mbedtls/mbedtls_config.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/stm32/mbedtls/mbedtls_config.h b/ports/stm32/mbedtls/mbedtls_config.h
index 56fbbf3aaf086..904d08548fa4c 100644
--- a/ports/stm32/mbedtls/mbedtls_config.h
+++ b/ports/stm32/mbedtls/mbedtls_config.h
@@ -82,6 +82,7 @@
 #define MBEDTLS_SSL_CLI_C
 #define MBEDTLS_SSL_SRV_C
 #define MBEDTLS_SSL_TLS_C
+#define MBEDTLS_TLS_DEFAULT_ALLOW_SHA1_IN_KEY_EXCHANGE
 #define MBEDTLS_X509_CRT_PARSE_C
 #define MBEDTLS_X509_USE_C
 

From 037b2c72a1d5b54a5508a58ab2044628a7a39fa4 Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Mon, 10 Jan 2022 09:03:27 -0600
Subject: [PATCH 1586/3533] py/objstr: Support '{:08}'.format("Jan") like
 Python 3.10.

The new test has an .exp file, because it is not compatible with Python 3.9
and lower.

See CPython version of the issue at https://bugs.python.org/issue27772

Signed-off-by: Jeff Epler <jepler@gmail.com>
---
 py/objstr.c                             | 2 +-
 tests/basics/string_format_cp310.py     | 9 +++++++++
 tests/basics/string_format_cp310.py.exp | 4 ++++
 tests/basics/string_format_error.py     | 2 +-
 4 files changed, 15 insertions(+), 2 deletions(-)
 create mode 100644 tests/basics/string_format_cp310.py
 create mode 100644 tests/basics/string_format_cp310.py.exp

diff --git a/py/objstr.c b/py/objstr.c
index 7d7f0e1dfa452..321bb058dc09b 100644
--- a/py/objstr.c
+++ b/py/objstr.c
@@ -1163,7 +1163,7 @@ STATIC vstr_t mp_obj_str_format_helper(const char *str, const char *top, int *ar
                 s++;
             }
             if (*s == '0') {
-                if (!align) {
+                if (!align && arg_looks_numeric(arg)) {
                     align = '=';
                 }
                 if (!fill) {
diff --git a/tests/basics/string_format_cp310.py b/tests/basics/string_format_cp310.py
new file mode 100644
index 0000000000000..77295330beab4
--- /dev/null
+++ b/tests/basics/string_format_cp310.py
@@ -0,0 +1,9 @@
+# Python 3.10+ functionality test for {} format string
+
+def test(fmt, *args):
+    print('{:8s}'.format(fmt) + '>' +  fmt.format(*args) + '<')
+
+test("{:0s}", "ab")
+test("{:06s}", "ab")
+test("{:<06s}", "ab")
+test("{:>06s}", "ab")
diff --git a/tests/basics/string_format_cp310.py.exp b/tests/basics/string_format_cp310.py.exp
new file mode 100644
index 0000000000000..1c26473d83761
--- /dev/null
+++ b/tests/basics/string_format_cp310.py.exp
@@ -0,0 +1,4 @@
+{:0s}   >ab<
+{:06s}  >ab0000<
+{:<06s} >ab0000<
+{:>06s} >0000ab<
diff --git a/tests/basics/string_format_error.py b/tests/basics/string_format_error.py
index 708348d59fbf1..74dc6c52ed31e 100644
--- a/tests/basics/string_format_error.py
+++ b/tests/basics/string_format_error.py
@@ -1,7 +1,7 @@
 # tests for errors in {} format string
 
 try:
-    '{0:0}'.format('zzz')
+    '{0:=}'.format('zzz')
 except (ValueError):
     print('ValueError')
 

From 608d421752c55e466cb8c50d26ab2a172280dfd2 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 20 Jan 2022 16:08:17 +1100
Subject: [PATCH 1587/3533] stm32/mboot: Remove custom HAL_RCC_GetHCLKFreq and
 use HAL provided one.

So that a board can access other HAL_RCC functions if it needs them (this
was not possible previously by just adding hal_rcc.c to the src list for a
board because it would clash with the custom HAL_RCC_GetHCLKFreq function).

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/mboot/Makefile | 1 +
 ports/stm32/mboot/main.c   | 5 -----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/ports/stm32/mboot/Makefile b/ports/stm32/mboot/Makefile
index 553fc4ac667fe..7e1b497cef639 100755
--- a/ports/stm32/mboot/Makefile
+++ b/ports/stm32/mboot/Makefile
@@ -161,6 +161,7 @@ SRC_HAL += $(addprefix $(HAL_DIR)/Src/stm32$(MCU_SERIES)xx_,\
 	hal_flash_ex.c \
 	hal_pcd.c \
 	hal_pcd_ex.c \
+	hal_rcc.c \
 	ll_usb.c \
 	)
 
diff --git a/ports/stm32/mboot/main.c b/ports/stm32/mboot/main.c
index 278c07fb4a9d6..3c3e4a8642a9b 100644
--- a/ports/stm32/mboot/main.c
+++ b/ports/stm32/mboot/main.c
@@ -326,11 +326,6 @@ void SystemClock_Config(void) {
 
 #endif
 
-// Needed by HAL_PCD_IRQHandler
-uint32_t HAL_RCC_GetHCLKFreq(void) {
-    return SystemCoreClock;
-}
-
 /******************************************************************************/
 // GPIO
 

From ce4f8b49ceed0340cdd05d4935e3a1147d0d3d39 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 20 Jan 2022 16:35:49 +1100
Subject: [PATCH 1588/3533] tools/mpremote: Use machine instead of umachine in
 commands.

Because bare-metal boards will have machine but not always umachine.

Signed-off-by: Damien George <damien@micropython.org>
---
 tools/mpremote/mpremote/main.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/mpremote/mpremote/main.py b/tools/mpremote/mpremote/main.py
index 99e7bcd9bcf6d..13615f6dd2fbb 100644
--- a/tools/mpremote/mpremote/main.py
+++ b/tools/mpremote/mpremote/main.py
@@ -80,7 +80,7 @@
         "command": [
             "exec",
             "--no-follow",
-            "import utime, umachine; utime.sleep_ms(t_ms); umachine.reset()",
+            "import utime, machine; utime.sleep_ms(t_ms); machine.reset()",
         ],
         "help": "reset the device after delay",
     },
@@ -88,7 +88,7 @@
         "command": [
             "exec",
             "--no-follow",
-            "import utime, umachine; utime.sleep_ms(t_ms); umachine.bootloader()",
+            "import utime, machine; utime.sleep_ms(t_ms); machine.bootloader()",
         ],
         "help": "make the device enter its bootloader",
     },

From 7b0a42374e1ae6a4ab3f756090c6f3b66e82acb5 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 20 Jan 2022 16:43:55 +1100
Subject: [PATCH 1589/3533] rp2/machine_i2c: Provide more specific error codes
 from I2C transfer.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/rp2/machine_i2c.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/ports/rp2/machine_i2c.c b/ports/rp2/machine_i2c.c
index 3b895ba4d44e0..56f012a5e8848 100644
--- a/ports/rp2/machine_i2c.c
+++ b/ports/rp2/machine_i2c.c
@@ -145,11 +145,20 @@ STATIC int machine_i2c_transfer_single(mp_obj_base_t *self_in, uint16_t addr, si
             ret = mp_machine_soft_i2c_transfer(&soft_i2c.base, addr, 1, &bufs, flags);
             gpio_set_function(self->scl, GPIO_FUNC_I2C);
             gpio_set_function(self->sda, GPIO_FUNC_I2C);
+            return ret;
         } else {
             ret = i2c_write_blocking(self->i2c_inst, addr, buf, len, nostop);
         }
     }
-    return (ret < 0) ? -MP_EIO : ret;
+    if (ret < 0) {
+        if (ret == PICO_ERROR_TIMEOUT) {
+            return -MP_ETIMEDOUT;
+        } else {
+            return -MP_EIO;
+        }
+    } else {
+        return ret;
+    }
 }
 
 STATIC const mp_machine_i2c_p_t machine_i2c_p = {

From f44fb760551809d038d3fda49ffe07975e92091d Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Tue, 18 Jan 2022 22:06:02 +0200
Subject: [PATCH 1590/3533] rp2/mpconfigport.h: Use internal error numbers.

---
 ports/rp2/mpconfigport.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/rp2/mpconfigport.h b/ports/rp2/mpconfigport.h
index e6a85bb68290c..63d9818e3197f 100644
--- a/ports/rp2/mpconfigport.h
+++ b/ports/rp2/mpconfigport.h
@@ -70,6 +70,7 @@
 #define MICROPY_ENABLE_EMERGENCY_EXCEPTION_BUF  (1)
 #define MICROPY_LONGINT_IMPL                    (MICROPY_LONGINT_IMPL_MPZ)
 #define MICROPY_FLOAT_IMPL                      (MICROPY_FLOAT_IMPL_FLOAT)
+#define MICROPY_USE_INTERNAL_ERRNO              (1)
 #define MICROPY_SCHEDULER_DEPTH                 (8)
 
 // Fine control over Python builtins, classes, modules, etc

From 5db278f1dd061ea0d7d9263cc6b4a3b212b34caf Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Sat, 15 Jan 2022 04:32:01 +0200
Subject: [PATCH 1591/3533] rp2/mphalport: Add optional dupterm support.

---
 ports/rp2/moduos.c    |  1 +
 ports/rp2/mphalport.c | 14 ++++++++++++++
 2 files changed, 15 insertions(+)

diff --git a/ports/rp2/moduos.c b/ports/rp2/moduos.c
index 02f34eb960d0f..a9dc30df89303 100644
--- a/ports/rp2/moduos.c
+++ b/ports/rp2/moduos.c
@@ -26,6 +26,7 @@
 
 #include "py/objstr.h"
 #include "py/runtime.h"
+#include "extmod/misc.h"
 #include "extmod/vfs.h"
 #include "extmod/vfs_fat.h"
 #include "extmod/vfs_lfs.h"
diff --git a/ports/rp2/mphalport.c b/ports/rp2/mphalport.c
index 3385323db0c63..c4169fb66c175 100644
--- a/ports/rp2/mphalport.c
+++ b/ports/rp2/mphalport.c
@@ -27,6 +27,7 @@
 #include "py/runtime.h"
 #include "py/stream.h"
 #include "py/mphal.h"
+#include "extmod/misc.h"
 #include "shared/timeutils/timeutils.h"
 #include "tusb.h"
 #include "uart.h"
@@ -74,6 +75,9 @@ uintptr_t mp_hal_stdio_poll(uintptr_t poll_flags) {
         ret |= MP_STREAM_POLL_RD;
     }
     #endif
+    #if MICROPY_PY_OS_DUPTERM
+    ret |= mp_uos_dupterm_poll(poll_flags);
+    #endif
     return ret;
 }
 
@@ -95,6 +99,12 @@ int mp_hal_stdin_rx_chr(void) {
             }
         }
         #endif
+        #if MICROPY_PY_OS_DUPTERM
+        int dupterm_c = mp_uos_dupterm_rx_chr();
+        if (dupterm_c >= 0) {
+            return dupterm_c;
+        }
+        #endif
         MICROPY_EVENT_POLL_HOOK
     }
 }
@@ -123,6 +133,10 @@ void mp_hal_stdout_tx_strn(const char *str, mp_uint_t len) {
         }
     }
     #endif
+
+    #if MICROPY_PY_OS_DUPTERM
+    mp_uos_dupterm_tx_strn(str, len);
+    #endif
 }
 
 void mp_hal_delay_ms(mp_uint_t ms) {

From 981664fd079a379dfd9749e9068781590813b401 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Fri, 14 Jan 2022 02:16:44 +0200
Subject: [PATCH 1592/3533] drivers/ninaw10: Add function to check socket
 state/data availability.

---
 drivers/ninaw10/nina_wifi_drv.c | 30 ++++++++++++++++++++++--------
 drivers/ninaw10/nina_wifi_drv.h |  1 +
 2 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/drivers/ninaw10/nina_wifi_drv.c b/drivers/ninaw10/nina_wifi_drv.c
index b7c016f4218bf..e7eac478bedb1 100644
--- a/drivers/ninaw10/nina_wifi_drv.c
+++ b/drivers/ninaw10/nina_wifi_drv.c
@@ -132,7 +132,7 @@ typedef enum {
     NINA_CMD_SOCKET_OPEN            = 0x3F,
     NINA_CMD_SOCKET_CLOSE           = 0x2E,
     NINA_CMD_SOCKET_CONNECT         = 0x2D,
-    NINA_CMD_SOCKET_ACCEPT          = 0x2B,
+    NINA_CMD_SOCKET_AVAIL           = 0x2B,
     NINA_CMD_SOCKET_BIND            = 0x28,
     NINA_CMD_SOCKET_STATE           = 0x2F,
     NINA_CMD_SOCKET_REMOTE_ADDR     = 0x3A,
@@ -752,21 +752,35 @@ int nina_socket_listen(int fd, uint32_t backlog) {
     return 0; // No listen ?
 }
 
-int nina_socket_accept(int fd, uint8_t *ip, uint16_t *port, int *fd_out, uint32_t timeout) {
+int nina_socket_avail(int fd, int type, uint16_t *data) {
     uint16_t size = 2;
-    uint16_t sock = NO_SOCKET_AVAIL;
+
+    if (nina_send_command_read_vals(NINA_CMD_SOCKET_AVAIL,
+        1, ARG_8BITS, NINA_ARGS(ARG_BYTE(fd)),
+        1, ARG_8BITS, NINA_VALS({&size, data})) != 0) {
+        return -1;
+    }
+
+    // For TCP sockets in listen state, return 0 if there's no accepted socket.
+    if (*data == NO_SOCKET_AVAIL && type == NINA_SOCKET_TYPE_TCP
+        && nina_server_socket_status(fd) == SOCKET_STATE_LISTEN) {
+        *data = 0;
+    }
+
+    return 0;
+}
+
+int nina_socket_accept(int fd, uint8_t *ip, uint16_t *port, int *fd_out, uint32_t timeout) {
+    uint16_t sock = 0;
 
     if (nina_server_socket_status(fd) != SOCKET_STATE_LISTEN) {
         return -1;
     }
 
-    for (mp_uint_t start = mp_hal_ticks_ms(); sock == 0 || sock == NO_SOCKET_AVAIL; mp_hal_delay_ms(10)) {
-        if (nina_send_command_read_vals(NINA_CMD_SOCKET_ACCEPT,
-            1, ARG_8BITS, NINA_ARGS(ARG_BYTE(fd)),
-            1, ARG_8BITS, NINA_VALS({&size, &sock})) != 0) {
+    for (mp_uint_t start = mp_hal_ticks_ms(); !sock; mp_hal_delay_ms(10)) {
+        if (nina_socket_avail(fd, NINA_SOCKET_TYPE_TCP, &sock) != 0) {
             return -1;
         }
-
         if (timeout && (mp_hal_ticks_ms() - start) >= timeout) {
             return NINA_ERROR_TIMEOUT;
         }
diff --git a/drivers/ninaw10/nina_wifi_drv.h b/drivers/ninaw10/nina_wifi_drv.h
index d8c55f5e674e8..8b13bfc1f5457 100644
--- a/drivers/ninaw10/nina_wifi_drv.h
+++ b/drivers/ninaw10/nina_wifi_drv.h
@@ -109,6 +109,7 @@ int nina_socket_socket(uint8_t type);
 int nina_socket_close(int fd);
 int nina_socket_bind(int fd, uint8_t *ip, uint16_t port, int type);
 int nina_socket_listen(int fd, uint32_t backlog);
+int nina_socket_avail(int fd, int type, uint16_t *data);
 int nina_socket_accept(int fd, uint8_t *ip, uint16_t *port, int *fd_out, uint32_t timeout);
 int nina_socket_connect(int fd, uint8_t *ip, uint16_t port, uint32_t timeout);
 int nina_socket_send(int fd, const uint8_t *buf, uint32_t len, uint32_t timeout);

From 9a61bc3aa78058bf222dec3f01ce3b90fa79108a Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Fri, 14 Jan 2022 02:17:11 +0200
Subject: [PATCH 1593/3533] extmod/network_ninaw10: Implement MP_STREAM_POLL in
 ioctl.

There is currently no function to query if the socket is writable.
---
 extmod/network_ninaw10.c | 38 ++++++++++++++++++++++++++++++++++++--
 1 file changed, 36 insertions(+), 2 deletions(-)

diff --git a/extmod/network_ninaw10.c b/extmod/network_ninaw10.c
index cba24ea94c755..c8fd0ce317765 100644
--- a/extmod/network_ninaw10.c
+++ b/extmod/network_ninaw10.c
@@ -545,8 +545,42 @@ STATIC int network_ninaw10_socket_settimeout(mod_network_socket_obj_t *socket, m
 }
 
 STATIC int network_ninaw10_socket_ioctl(mod_network_socket_obj_t *socket, mp_uint_t request, mp_uint_t arg, int *_errno) {
-    *_errno = MP_EIO;
-    return -1;
+    mp_uint_t ret = 0;
+    uint8_t type;
+
+    switch (socket->type) {
+        case MOD_NETWORK_SOCK_STREAM:
+            type = NINA_SOCKET_TYPE_TCP;
+            break;
+
+        case MOD_NETWORK_SOCK_DGRAM:
+            type = NINA_SOCKET_TYPE_UDP;
+            break;
+
+        default:
+            *_errno = MP_EINVAL;
+            return MP_STREAM_ERROR;
+    }
+
+    if (request == MP_STREAM_POLL) {
+        if (arg & MP_STREAM_POLL_RD) {
+            uint16_t avail = 0;
+            if (nina_socket_avail(socket->fileno, type, &avail) != 0) {
+                *_errno = MP_EIO;
+                ret = MP_STREAM_ERROR;
+            } else if (avail) {
+                // Readable or accepted socket ready.
+                ret |= MP_STREAM_POLL_RD;
+            }
+        }
+        if (arg & MP_STREAM_POLL_WR) {
+            ret |= MP_STREAM_POLL_WR;
+        }
+    } else {
+        *_errno = MP_EINVAL;
+        ret = MP_STREAM_ERROR;
+    }
+    return ret;
 }
 
 static const mp_rom_map_elem_t nina_locals_dict_table[] = {

From e401ff8935fb7764adede3ee4e0d9a6cf974c6c3 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Fri, 14 Jan 2022 02:59:07 +0200
Subject: [PATCH 1594/3533] drivers/ninaw10: Fix timeout handling to match
 modusocket.

---
 drivers/ninaw10/nina_wifi_drv.c | 30 +++++++++++++++++++-----------
 drivers/ninaw10/nina_wifi_drv.h | 12 ++++++------
 extmod/network_ninaw10.c        | 16 ++++++++++------
 3 files changed, 35 insertions(+), 23 deletions(-)

diff --git a/drivers/ninaw10/nina_wifi_drv.c b/drivers/ninaw10/nina_wifi_drv.c
index e7eac478bedb1..12707fe051e1c 100644
--- a/drivers/ninaw10/nina_wifi_drv.c
+++ b/drivers/ninaw10/nina_wifi_drv.c
@@ -770,7 +770,7 @@ int nina_socket_avail(int fd, int type, uint16_t *data) {
     return 0;
 }
 
-int nina_socket_accept(int fd, uint8_t *ip, uint16_t *port, int *fd_out, uint32_t timeout) {
+int nina_socket_accept(int fd, uint8_t *ip, uint16_t *port, int *fd_out, int32_t timeout) {
     uint16_t sock = 0;
 
     if (nina_server_socket_status(fd) != SOCKET_STATE_LISTEN) {
@@ -781,7 +781,7 @@ int nina_socket_accept(int fd, uint8_t *ip, uint16_t *port, int *fd_out, uint32_
         if (nina_socket_avail(fd, NINA_SOCKET_TYPE_TCP, &sock) != 0) {
             return -1;
         }
-        if (timeout && (mp_hal_ticks_ms() - start) >= timeout) {
+        if (timeout == 0 || (timeout > 0 && (mp_hal_ticks_ms() - start) >= timeout)) {
             return NINA_ERROR_TIMEOUT;
         }
     }
@@ -798,7 +798,7 @@ int nina_socket_accept(int fd, uint8_t *ip, uint16_t *port, int *fd_out, uint32_
     return 0;
 }
 
-int nina_socket_connect(int fd, uint8_t *ip, uint16_t port, uint32_t timeout) {
+int nina_socket_connect(int fd, uint8_t *ip, uint16_t port, int32_t timeout) {
     if (nina_send_command_read_ack(NINA_CMD_SOCKET_CONNECT,
         4, ARG_8BITS,
         NINA_ARGS(
@@ -819,7 +819,7 @@ int nina_socket_connect(int fd, uint8_t *ip, uint16_t port, uint32_t timeout) {
             break;
         }
 
-        if (timeout && (mp_hal_ticks_ms() - start) >= timeout) {
+        if (timeout == 0 || (timeout > 0 && (mp_hal_ticks_ms() - start) >= timeout)) {
             return NINA_ERROR_TIMEOUT;
         }
     }
@@ -827,7 +827,7 @@ int nina_socket_connect(int fd, uint8_t *ip, uint16_t port, uint32_t timeout) {
     return 0;
 }
 
-int nina_socket_send(int fd, const uint8_t *buf, uint32_t len, uint32_t timeout) {
+int nina_socket_send(int fd, const uint8_t *buf, uint32_t len, int32_t timeout) {
     uint16_t size = 2;
     uint16_t bytes = 0;
 
@@ -853,7 +853,7 @@ int nina_socket_send(int fd, const uint8_t *buf, uint32_t len, uint32_t timeout)
             break;
         }
 
-        if (timeout && (mp_hal_ticks_ms() - start) >= timeout) {
+        if (timeout == 0 || (timeout > 0 && (mp_hal_ticks_ms() - start) >= timeout)) {
             return NINA_ERROR_TIMEOUT;
         }
         mp_hal_delay_ms(1);
@@ -862,7 +862,7 @@ int nina_socket_send(int fd, const uint8_t *buf, uint32_t len, uint32_t timeout)
     return bytes;
 }
 
-int nina_socket_recv(int fd, uint8_t *buf, uint32_t len, uint32_t timeout) {
+int nina_socket_recv(int fd, uint8_t *buf, uint32_t len, int32_t timeout) {
     uint16_t bytes = 0;
 
     if (nina_socket_status(fd) != SOCKET_STATE_ESTABLISHED) {
@@ -877,7 +877,11 @@ int nina_socket_recv(int fd, uint8_t *buf, uint32_t len, uint32_t timeout) {
             return -1;
         }
 
-        if (timeout && (mp_hal_ticks_ms() - start) >= timeout) {
+        if (bytes != 0) {
+            break;
+        }
+
+        if (timeout == 0 || (timeout > 0 && (mp_hal_ticks_ms() - start) >= timeout)) {
             return NINA_ERROR_TIMEOUT;
         }
     }
@@ -885,7 +889,7 @@ int nina_socket_recv(int fd, uint8_t *buf, uint32_t len, uint32_t timeout) {
 }
 
 // Check from the upper layer if the socket is bound, if not then auto-bind it first.
-int nina_socket_sendto(int fd, const uint8_t *buf, uint32_t len, uint8_t *ip, uint16_t port, uint32_t timeout) {
+int nina_socket_sendto(int fd, const uint8_t *buf, uint32_t len, uint8_t *ip, uint16_t port, int32_t timeout) {
     // TODO do we need to split the packet somewhere?
     if (nina_send_command_read_ack(NINA_CMD_SOCKET_CONNECT,
         4, ARG_8BITS,
@@ -912,7 +916,7 @@ int nina_socket_sendto(int fd, const uint8_t *buf, uint32_t len, uint8_t *ip, ui
 }
 
 // Check from the upper layer if the socket is bound, if not then auto-bind it first.
-int nina_socket_recvfrom(int fd, uint8_t *buf, uint32_t len, uint8_t *ip, uint16_t *port, uint32_t timeout) {
+int nina_socket_recvfrom(int fd, uint8_t *buf, uint32_t len, uint8_t *ip, uint16_t *port, int32_t timeout) {
     uint16_t bytes = 0;
     uint16_t port_len = 2;
     uint16_t ip_len = NINA_IPV4_ADDR_LEN;
@@ -925,7 +929,11 @@ int nina_socket_recvfrom(int fd, uint8_t *buf, uint32_t len, uint8_t *ip, uint16
             return -1;
         }
 
-        if (timeout && (mp_hal_ticks_ms() - start) >= timeout) {
+        if (bytes != 0) {
+            break;
+        }
+
+        if (timeout == 0 || (timeout > 0 && (mp_hal_ticks_ms() - start) >= timeout)) {
             return NINA_ERROR_TIMEOUT;
         }
     }
diff --git a/drivers/ninaw10/nina_wifi_drv.h b/drivers/ninaw10/nina_wifi_drv.h
index 8b13bfc1f5457..b8a6c4eb92760 100644
--- a/drivers/ninaw10/nina_wifi_drv.h
+++ b/drivers/ninaw10/nina_wifi_drv.h
@@ -110,12 +110,12 @@ int nina_socket_close(int fd);
 int nina_socket_bind(int fd, uint8_t *ip, uint16_t port, int type);
 int nina_socket_listen(int fd, uint32_t backlog);
 int nina_socket_avail(int fd, int type, uint16_t *data);
-int nina_socket_accept(int fd, uint8_t *ip, uint16_t *port, int *fd_out, uint32_t timeout);
-int nina_socket_connect(int fd, uint8_t *ip, uint16_t port, uint32_t timeout);
-int nina_socket_send(int fd, const uint8_t *buf, uint32_t len, uint32_t timeout);
-int nina_socket_recv(int fd, uint8_t *buf, uint32_t len, uint32_t timeout);
-int nina_socket_sendto(int fd, const uint8_t *buf, uint32_t len, uint8_t *ip, uint16_t port, uint32_t timeout);
-int nina_socket_recvfrom(int fd, uint8_t *buf, uint32_t len, uint8_t *ip, uint16_t *port, uint32_t timeout);
+int nina_socket_accept(int fd, uint8_t *ip, uint16_t *port, int *fd_out, int32_t timeout);
+int nina_socket_connect(int fd, uint8_t *ip, uint16_t port, int32_t timeout);
+int nina_socket_send(int fd, const uint8_t *buf, uint32_t len, int32_t timeout);
+int nina_socket_recv(int fd, uint8_t *buf, uint32_t len, int32_t timeout);
+int nina_socket_sendto(int fd, const uint8_t *buf, uint32_t len, uint8_t *ip, uint16_t port, int32_t timeout);
+int nina_socket_recvfrom(int fd, uint8_t *buf, uint32_t len, uint8_t *ip, uint16_t *port, int32_t timeout);
 int nina_socket_setsockopt(int fd, uint32_t level, uint32_t opt, const void *optval, uint32_t optlen);
 
 #endif // MICROPY_INCLUDED_DRIVERS_NINAW10_NINA_WIFI_DRV_H
diff --git a/extmod/network_ninaw10.c b/extmod/network_ninaw10.c
index c8fd0ce317765..26b4a811dc6c5 100644
--- a/extmod/network_ninaw10.c
+++ b/extmod/network_ninaw10.c
@@ -406,7 +406,11 @@ STATIC int network_ninaw10_socket_accept(mod_network_socket_obj_t *socket,
     int fd = 0;
     // Call accept.
     int ret = nina_socket_accept(socket->fileno, ip, (uint16_t *)port, &fd, socket->timeout);
-    if (ret < 0) {
+    if (ret == NINA_ERROR_TIMEOUT) {
+        // The socket is Not closed on timeout when calling functions that accept a timeout.
+        *_errno = MP_ETIMEDOUT;
+        return -1;
+    } else if (ret < 0) {
         *_errno = ret;
         network_ninaw10_socket_close(socket);
         return -1;
@@ -420,7 +424,11 @@ STATIC int network_ninaw10_socket_accept(mod_network_socket_obj_t *socket,
 
 STATIC int network_ninaw10_socket_connect(mod_network_socket_obj_t *socket, byte *ip, mp_uint_t port, int *_errno) {
     int ret = nina_socket_connect(socket->fileno, ip, port, socket->timeout);
-    if (ret < 0) {
+    if (ret == NINA_ERROR_TIMEOUT) {
+        // The socket is Not closed on timeout when calling functions that accept a timeout.
+        *_errno = MP_ETIMEDOUT;
+        return -1;
+    } else if (ret < 0) {
         *_errno = ret;
         network_ninaw10_socket_close(socket);
         return -1;
@@ -536,10 +544,6 @@ STATIC int network_ninaw10_socket_setsockopt(mod_network_socket_obj_t *socket, m
 }
 
 STATIC int network_ninaw10_socket_settimeout(mod_network_socket_obj_t *socket, mp_uint_t timeout_ms, int *_errno) {
-    if (timeout_ms == UINT32_MAX) {
-        // no timeout is given, set the socket to blocking mode.
-        timeout_ms = 0;
-    }
     socket->timeout = timeout_ms;
     return 0;
 }

From b23178a9c0606d933d231bb8acf4206b153957ce Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Fri, 14 Jan 2022 19:42:00 +0200
Subject: [PATCH 1595/3533] extmod/modusocket: Make setsockopt return if NIC is
 not connected.

---
 extmod/modusocket.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/extmod/modusocket.c b/extmod/modusocket.c
index a42b3213f5a1d..09a334d67e82f 100644
--- a/extmod/modusocket.c
+++ b/extmod/modusocket.c
@@ -303,6 +303,11 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(socket_recvfrom_obj, socket_recvfrom);
 STATIC mp_obj_t socket_setsockopt(size_t n_args, const mp_obj_t *args) {
     mod_network_socket_obj_t *self = MP_OBJ_TO_PTR(args[0]);
 
+    if (self->nic == MP_OBJ_NULL) {
+        // not connected
+        return mp_const_none;
+    }
+
     mp_int_t level = mp_obj_get_int(args[1]);
     mp_int_t opt = mp_obj_get_int(args[2]);
 

From 155eb1361ec18caebc0ef33c115d91209309982a Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Sat, 15 Jan 2022 21:32:53 +0200
Subject: [PATCH 1596/3533] extmod/modusocket: Add makefile() method and common
 socket options.

---
 extmod/modnetwork.h |  9 +++++++++
 extmod/modusocket.c | 13 +++++++++++++
 2 files changed, 22 insertions(+)

diff --git a/extmod/modnetwork.h b/extmod/modnetwork.h
index bbf80bc4748b6..b95760897aa10 100644
--- a/extmod/modnetwork.h
+++ b/extmod/modnetwork.h
@@ -38,6 +38,15 @@
 #define MOD_NETWORK_STA_IF (0)
 #define MOD_NETWORK_AP_IF (1)
 
+// Socket level option.
+#define MOD_NETWORK_SOL_SOCKET      (0x0FFF)
+
+// Common option flags per-socket.
+#define MOD_NETWORK_SO_REUSEADDR    (0x0004)
+#define MOD_NETWORK_SO_KEEPALIVE    (0x0008)
+#define MOD_NETWORK_SO_SNDTIMEO     (0x1005)
+#define MOD_NETWORK_SO_RCVTIMEO     (0x1006)
+
 #if MICROPY_PY_LWIP
 struct netif;
 void mod_network_lwip_poll_wrapper(uint32_t ticks_ms);
diff --git a/extmod/modusocket.c b/extmod/modusocket.c
index 09a334d67e82f..373f2c125f00f 100644
--- a/extmod/modusocket.c
+++ b/extmod/modusocket.c
@@ -334,6 +334,12 @@ STATIC mp_obj_t socket_setsockopt(size_t n_args, const mp_obj_t *args) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(socket_setsockopt_obj, 4, 4, socket_setsockopt);
 
+STATIC mp_obj_t socket_makefile(size_t n_args, const mp_obj_t *args) {
+    (void)n_args;
+    return args[0];
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(socket_makefile_obj, 1, 3, socket_makefile);
+
 // method socket.settimeout(value)
 // timeout=0 means non-blocking
 // timeout=None means blocking
@@ -390,6 +396,7 @@ STATIC const mp_rom_map_elem_t socket_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_sendto), MP_ROM_PTR(&socket_sendto_obj) },
     { MP_ROM_QSTR(MP_QSTR_recvfrom), MP_ROM_PTR(&socket_recvfrom_obj) },
     { MP_ROM_QSTR(MP_QSTR_setsockopt), MP_ROM_PTR(&socket_setsockopt_obj) },
+    { MP_ROM_QSTR(MP_QSTR_makefile), MP_ROM_PTR(&socket_makefile_obj) },
     { MP_ROM_QSTR(MP_QSTR_settimeout), MP_ROM_PTR(&socket_settimeout_obj) },
     { MP_ROM_QSTR(MP_QSTR_setblocking), MP_ROM_PTR(&socket_setblocking_obj) },
 
@@ -528,6 +535,12 @@ STATIC const mp_rom_map_elem_t mp_module_usocket_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_SOCK_DGRAM), MP_ROM_INT(MOD_NETWORK_SOCK_DGRAM) },
     { MP_ROM_QSTR(MP_QSTR_SOCK_RAW), MP_ROM_INT(MOD_NETWORK_SOCK_RAW) },
 
+    { MP_ROM_QSTR(MP_QSTR_SOL_SOCKET), MP_ROM_INT(MOD_NETWORK_SOL_SOCKET) },
+    { MP_ROM_QSTR(MP_QSTR_SO_REUSEADDR), MP_ROM_INT(MOD_NETWORK_SO_REUSEADDR) },
+    { MP_ROM_QSTR(MP_QSTR_SO_KEEPALIVE), MP_ROM_INT(MOD_NETWORK_SO_KEEPALIVE) },
+    { MP_ROM_QSTR(MP_QSTR_SO_SNDTIMEO), MP_ROM_INT(MOD_NETWORK_SO_SNDTIMEO) },
+    { MP_ROM_QSTR(MP_QSTR_SO_RCVTIMEO), MP_ROM_INT(MOD_NETWORK_SO_RCVTIMEO) },
+
     /*
     { MP_ROM_QSTR(MP_QSTR_IPPROTO_IP), MP_ROM_INT(MOD_NETWORK_IPPROTO_IP) },
     { MP_ROM_QSTR(MP_QSTR_IPPROTO_ICMP), MP_ROM_INT(MOD_NETWORK_IPPROTO_ICMP) },

From e6ddda29caa3292110c4d18625e791af47ca1e15 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Mon, 17 Jan 2022 15:15:57 +0200
Subject: [PATCH 1597/3533] tests/multi_net: Close accepted sockets when tests
 are done.

gc_sweep_all() cleans up sockets via the finaliser, but tests should
cleanly free resources they use.
---
 tests/multi_net/ssl_data.py       | 1 +
 tests/multi_net/tcp_client_rst.py | 1 +
 tests/multi_net/tcp_data.py       | 1 +
 3 files changed, 3 insertions(+)

diff --git a/tests/multi_net/ssl_data.py b/tests/multi_net/ssl_data.py
index cf2f96e0f3cc5..e5196c81ba3df 100644
--- a/tests/multi_net/ssl_data.py
+++ b/tests/multi_net/ssl_data.py
@@ -47,6 +47,7 @@ def instance0():
     s2 = ssl.wrap_socket(s2, server_side=True, key=key, cert=cert)
     print(s2.read(16))
     s2.write(b"server to client")
+    s2.close()
     s.close()
 
 
diff --git a/tests/multi_net/tcp_client_rst.py b/tests/multi_net/tcp_client_rst.py
index 14da8b1470f22..1fe994f36ceb1 100644
--- a/tests/multi_net/tcp_client_rst.py
+++ b/tests/multi_net/tcp_client_rst.py
@@ -38,6 +38,7 @@ def instance0():
     # TODO lwip raises here but apparently it shouldn't
     print(s2.recv(10))
     print(convert_poll_list(poll.poll(1000)))
+    s2.close()
     s.close()
 
 
diff --git a/tests/multi_net/tcp_data.py b/tests/multi_net/tcp_data.py
index 61224efd2c530..bba2d198c400c 100644
--- a/tests/multi_net/tcp_data.py
+++ b/tests/multi_net/tcp_data.py
@@ -15,6 +15,7 @@ def instance0():
     s2, _ = s.accept()
     print(s2.recv(16))
     s2.send(b"server to client")
+    s2.close()
     s.close()
 
 

From 6e8f4eaa5252c1a0e7b44238eb168c01abeb7a0e Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Tue, 18 Jan 2022 23:50:53 +0200
Subject: [PATCH 1598/3533] tests/multi_net/udp_data.py: Allow reusing port
 before bind.

---
 tests/multi_net/udp_data.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/multi_net/udp_data.py b/tests/multi_net/udp_data.py
index fd3e00918f532..0c0f165b74980 100644
--- a/tests/multi_net/udp_data.py
+++ b/tests/multi_net/udp_data.py
@@ -12,6 +12,7 @@ def instance0():
     multitest.next()
     for i in range(NUM_NEW_SOCKETS):
         s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
+        s.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
         s.bind(socket.getaddrinfo("0.0.0.0", PORT)[0][-1])
         multitest.broadcast("server ready")
         for j in range(NUM_TRANSFERS):

From a63875d5add278ce37a7cacb917488b4effac8a6 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Tue, 18 Jan 2022 23:56:27 +0200
Subject: [PATCH 1599/3533] extmod/modusocket: Create new sockets in blocking
 mode.

To conform with CPython and other MicroPython ports.
---
 extmod/modusocket.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extmod/modusocket.c b/extmod/modusocket.c
index 373f2c125f00f..10c818bf58721 100644
--- a/extmod/modusocket.c
+++ b/extmod/modusocket.c
@@ -67,7 +67,7 @@ STATIC mp_obj_t socket_make_new(const mp_obj_type_t *type, size_t n_args, size_t
     }
 
     #if MICROPY_PY_USOCKET_EXTENDED_STATE
-    s->timeout = 0;
+    s->timeout = -1;
     s->state = NULL;
     #endif
 
@@ -88,7 +88,7 @@ STATIC void socket_select_nic(mod_network_socket_obj_t *self, const byte *ip) {
 
         #if MICROPY_PY_USOCKET_EXTENDED_STATE
         // if a timeout was set before binding a NIC, call settimeout to reset it
-        if (self->timeout != 0 && self->nic_type->settimeout(self, self->timeout, &_errno) != 0) {
+        if (self->timeout != -1 && self->nic_type->settimeout(self, self->timeout, &_errno) != 0) {
             mp_raise_OSError(_errno);
         }
         #endif
@@ -158,7 +158,7 @@ STATIC mp_obj_t socket_accept(mp_obj_t self_in) {
     socket2->bound = false;
     socket2->fileno = -1;
     #if MICROPY_PY_USOCKET_EXTENDED_STATE
-    socket2->timeout = 0;
+    socket2->timeout = -1;
     socket2->state = NULL;
     #endif
 

From 1aac151d6894cf892c0ff7bb38e5589580d6c080 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Thu, 20 Jan 2022 17:12:36 +0200
Subject: [PATCH 1600/3533] drivers/ninaw10: Return standard error numbers.

---
 drivers/ninaw10/nina_wifi_drv.c | 26 ++++++-----
 drivers/ninaw10/nina_wifi_drv.h |  5 --
 extmod/network_ninaw10.c        | 82 +++++++++++++++------------------
 3 files changed, 51 insertions(+), 62 deletions(-)

diff --git a/drivers/ninaw10/nina_wifi_drv.c b/drivers/ninaw10/nina_wifi_drv.c
index 12707fe051e1c..cf09711690cdf 100644
--- a/drivers/ninaw10/nina_wifi_drv.c
+++ b/drivers/ninaw10/nina_wifi_drv.c
@@ -28,6 +28,7 @@
  */
 
 #include "py/mphal.h"
+#include "py/mperrno.h"
 
 #if MICROPY_PY_NETWORK_NINAW10
 
@@ -480,7 +481,7 @@ int nina_connected_sta(uint32_t *sta_ip) {
 }
 
 int nina_wait_for_sta(uint32_t *sta_ip, uint32_t timeout) {
-    return NINA_ERROR_TIMEOUT;
+    return -MP_ETIMEDOUT;
 }
 
 int nina_ifconfig(nina_ifconfig_t *ifconfig, bool set) {
@@ -597,7 +598,7 @@ int nina_scan(nina_scan_callback_t scan_callback, void *arg, uint32_t timeout) {
 
         if (timeout && (mp_hal_ticks_ms() - start) >= timeout) {
             // Timeout, no networks.
-            return NINA_ERROR_TIMEOUT;
+            return -MP_ETIMEDOUT;
         }
 
         mp_hal_delay_ms(100);
@@ -723,7 +724,7 @@ int nina_socket_close(int fd) {
                 break;
             }
             if ((mp_hal_ticks_ms() - start) >= 5000) {
-                return NINA_ERROR_TIMEOUT;
+                return -MP_ETIMEDOUT;
             }
         }
     }
@@ -777,12 +778,15 @@ int nina_socket_accept(int fd, uint8_t *ip, uint16_t *port, int *fd_out, int32_t
         return -1;
     }
 
-    for (mp_uint_t start = mp_hal_ticks_ms(); !sock; mp_hal_delay_ms(10)) {
+    for (mp_uint_t start = mp_hal_ticks_ms(); ; mp_hal_delay_ms(10)) {
         if (nina_socket_avail(fd, NINA_SOCKET_TYPE_TCP, &sock) != 0) {
             return -1;
         }
+        if (sock != 0) {
+            break;
+        }
         if (timeout == 0 || (timeout > 0 && (mp_hal_ticks_ms() - start) >= timeout)) {
-            return NINA_ERROR_TIMEOUT;
+            return -MP_ETIMEDOUT;
         }
     }
 
@@ -820,7 +824,7 @@ int nina_socket_connect(int fd, uint8_t *ip, uint16_t port, int32_t timeout) {
         }
 
         if (timeout == 0 || (timeout > 0 && (mp_hal_ticks_ms() - start) >= timeout)) {
-            return NINA_ERROR_TIMEOUT;
+            return -MP_ETIMEDOUT;
         }
     }
 
@@ -832,7 +836,7 @@ int nina_socket_send(int fd, const uint8_t *buf, uint32_t len, int32_t timeout)
     uint16_t bytes = 0;
 
     if (nina_socket_status(fd) != SOCKET_STATE_ESTABLISHED) {
-        return -1;
+        return -MP_ENOTCONN;
     }
 
     if (nina_send_command_read_vals(NINA_CMD_TCP_SEND,
@@ -854,7 +858,7 @@ int nina_socket_send(int fd, const uint8_t *buf, uint32_t len, int32_t timeout)
         }
 
         if (timeout == 0 || (timeout > 0 && (mp_hal_ticks_ms() - start) >= timeout)) {
-            return NINA_ERROR_TIMEOUT;
+            return -MP_ETIMEDOUT;
         }
         mp_hal_delay_ms(1);
     }
@@ -866,7 +870,7 @@ int nina_socket_recv(int fd, uint8_t *buf, uint32_t len, int32_t timeout) {
     uint16_t bytes = 0;
 
     if (nina_socket_status(fd) != SOCKET_STATE_ESTABLISHED) {
-        return -1;
+        return -MP_ENOTCONN;
     }
 
     for (mp_uint_t start = mp_hal_ticks_ms(); bytes == 0; mp_hal_delay_ms(1)) {
@@ -882,7 +886,7 @@ int nina_socket_recv(int fd, uint8_t *buf, uint32_t len, int32_t timeout) {
         }
 
         if (timeout == 0 || (timeout > 0 && (mp_hal_ticks_ms() - start) >= timeout)) {
-            return NINA_ERROR_TIMEOUT;
+            return -MP_ETIMEDOUT;
         }
     }
     return bytes;
@@ -934,7 +938,7 @@ int nina_socket_recvfrom(int fd, uint8_t *buf, uint32_t len, uint8_t *ip, uint16
         }
 
         if (timeout == 0 || (timeout > 0 && (mp_hal_ticks_ms() - start) >= timeout)) {
-            return NINA_ERROR_TIMEOUT;
+            return -MP_ETIMEDOUT;
         }
     }
     if (nina_send_command_read_vals(NINA_CMD_SOCKET_REMOTE_ADDR,
diff --git a/drivers/ninaw10/nina_wifi_drv.h b/drivers/ninaw10/nina_wifi_drv.h
index b8a6c4eb92760..b990476b673c9 100644
--- a/drivers/ninaw10/nina_wifi_drv.h
+++ b/drivers/ninaw10/nina_wifi_drv.h
@@ -61,11 +61,6 @@ typedef enum {
     NINA_SOCKET_TYPE_TLS_BEARSSL
 } nina_socket_type_t;
 
-typedef enum {
-    NINA_ERROR_IO       = -1,
-    NINA_ERROR_TIMEOUT  = -2,
-} nina_error_t;
-
 typedef struct {
     uint8_t ip_addr[NINA_IPV4_ADDR_LEN];
     uint8_t subnet_addr[NINA_IPV4_ADDR_LEN];
diff --git a/extmod/network_ninaw10.c b/extmod/network_ninaw10.c
index 26b4a811dc6c5..e5d322a953634 100644
--- a/extmod/network_ninaw10.c
+++ b/extmod/network_ninaw10.c
@@ -406,13 +406,12 @@ STATIC int network_ninaw10_socket_accept(mod_network_socket_obj_t *socket,
     int fd = 0;
     // Call accept.
     int ret = nina_socket_accept(socket->fileno, ip, (uint16_t *)port, &fd, socket->timeout);
-    if (ret == NINA_ERROR_TIMEOUT) {
-        // The socket is Not closed on timeout when calling functions that accept a timeout.
-        *_errno = MP_ETIMEDOUT;
-        return -1;
-    } else if (ret < 0) {
-        *_errno = ret;
-        network_ninaw10_socket_close(socket);
+    if (ret < 0) {
+        *_errno = -ret;
+        // Close socket if not a timeout error.
+        if (*_errno != MP_ETIMEDOUT) {
+            network_ninaw10_socket_close(socket);
+        }
         return -1;
     }
 
@@ -424,13 +423,12 @@ STATIC int network_ninaw10_socket_accept(mod_network_socket_obj_t *socket,
 
 STATIC int network_ninaw10_socket_connect(mod_network_socket_obj_t *socket, byte *ip, mp_uint_t port, int *_errno) {
     int ret = nina_socket_connect(socket->fileno, ip, port, socket->timeout);
-    if (ret == NINA_ERROR_TIMEOUT) {
-        // The socket is Not closed on timeout when calling functions that accept a timeout.
-        *_errno = MP_ETIMEDOUT;
-        return -1;
-    } else if (ret < 0) {
-        *_errno = ret;
-        network_ninaw10_socket_close(socket);
+    if (ret < 0) {
+        *_errno = -ret;
+        // Close socket if not a timeout error.
+        if (*_errno != MP_ETIMEDOUT) {
+            network_ninaw10_socket_close(socket);
+        }
         return -1;
     }
     return 0;
@@ -438,14 +436,12 @@ STATIC int network_ninaw10_socket_connect(mod_network_socket_obj_t *socket, byte
 
 STATIC mp_uint_t network_ninaw10_socket_send(mod_network_socket_obj_t *socket, const byte *buf, mp_uint_t len, int *_errno) {
     int ret = nina_socket_send(socket->fileno, buf, len, socket->timeout);
-    if (ret == NINA_ERROR_TIMEOUT) {
-        // The socket is Not closed on timeout when calling functions that accept a timeout.
-        *_errno = MP_ETIMEDOUT;
-        return -1;
-    } else if (ret < 0) {
-        // Close the socket on any other errors.
-        *_errno = ret;
-        network_ninaw10_socket_close(socket);
+    if (ret < 0) {
+        *_errno = -ret;
+        // Close socket if not a timeout error.
+        if (*_errno != MP_ETIMEDOUT) {
+            network_ninaw10_socket_close(socket);
+        }
         return -1;
     }
     return ret;
@@ -460,15 +456,12 @@ STATIC mp_uint_t network_ninaw10_socket_recv(mod_network_socket_obj_t *socket, b
     } else {
         ret = nina_socket_recv(socket->fileno, buf, len, socket->timeout);
     }
-
-    if (ret == NINA_ERROR_TIMEOUT) {
-        // The socket is Not closed on timeout when calling functions that accept a timeout.
-        *_errno = MP_ETIMEDOUT;
-        return -1;
-    } else if (ret < 0) {
-        // Close the socket on any other errors.
-        *_errno = ret;
-        network_ninaw10_socket_close(socket);
+    if (ret < 0) {
+        *_errno = -ret;
+        // Close socket if not a timeout error.
+        if (*_errno != MP_ETIMEDOUT) {
+            network_ninaw10_socket_close(socket);
+        }
         return -1;
     }
     return ret;
@@ -493,13 +486,12 @@ STATIC mp_uint_t network_ninaw10_socket_sendto(mod_network_socket_obj_t *socket,
     }
 
     int ret = nina_socket_sendto(socket->fileno, buf, len, ip, port, socket->timeout);
-    if (ret == NINA_ERROR_TIMEOUT) {
-        // The socket is Not closed on timeout when calling functions that accept a timeout.
-        *_errno = MP_ETIMEDOUT;
-        return -1;
-    } else if (ret < 0) {
-        *_errno = ret;
-        network_ninaw10_socket_close(socket);
+    if (ret < 0) {
+        *_errno = -ret;
+        // Close socket if not a timeout error.
+        if (*_errno != MP_ETIMEDOUT) {
+            network_ninaw10_socket_close(socket);
+        }
         return -1;
     }
     return ret;
@@ -519,14 +511,12 @@ STATIC mp_uint_t network_ninaw10_socket_recvfrom(mod_network_socket_obj_t *socke
         }
         ret = nina_socket_recvfrom(socket->fileno, buf, len, ip, (uint16_t *)port, socket->timeout);
     }
-    if (ret == NINA_ERROR_TIMEOUT) {
-        // The socket is Not closed on timeout when calling functions that accept a timeout.
-        *_errno = MP_ETIMEDOUT;
-        return -1;
-    } else if (ret < 0) {
-        // Close the socket on any other errors.
-        *_errno = ret;
-        network_ninaw10_socket_close(socket);
+    if (ret < 0) {
+        *_errno = -ret;
+        // Close socket if not a timeout error.
+        if (*_errno != MP_ETIMEDOUT) {
+            network_ninaw10_socket_close(socket);
+        }
         return -1;
     }
     return ret;

From 9438fb7321f1f0fb9faae666808e86d7f47b8619 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 21 Jan 2022 12:44:49 +1100
Subject: [PATCH 1601/3533] extmod/modusocket: Support additional args to
 getaddrinfo.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/modusocket.c | 33 ++++++++++++++++++++++++++++-----
 1 file changed, 28 insertions(+), 5 deletions(-)

diff --git a/extmod/modusocket.c b/extmod/modusocket.c
index 10c818bf58721..b6bab72e7a289 100644
--- a/extmod/modusocket.c
+++ b/extmod/modusocket.c
@@ -472,18 +472,41 @@ STATIC const mp_obj_type_t socket_type = {
 // usocket module
 
 // function usocket.getaddrinfo(host, port)
-STATIC mp_obj_t mod_usocket_getaddrinfo(mp_obj_t host_in, mp_obj_t port_in) {
+STATIC mp_obj_t mod_usocket_getaddrinfo(size_t n_args, const mp_obj_t *args) {
     size_t hlen;
-    const char *host = mp_obj_str_get_data(host_in, &hlen);
-    mp_int_t port = mp_obj_get_int(port_in);
+    const char *host = mp_obj_str_get_data(args[0], &hlen);
+    mp_int_t port = mp_obj_get_int(args[1]);
     uint8_t out_ip[MOD_NETWORK_IPADDR_BUF_SIZE];
     bool have_ip = false;
 
+    // if constraints were passed then check they are compatible with the supported params
+    if (n_args > 2) {
+        mp_int_t family = mp_obj_get_int(args[2]);
+        mp_int_t type = 0;
+        mp_int_t proto = 0;
+        mp_int_t flags = 0;
+        if (n_args > 3) {
+            type = mp_obj_get_int(args[3]);
+            if (n_args > 4) {
+                proto = mp_obj_get_int(args[4]);
+                if (n_args > 5) {
+                    flags = mp_obj_get_int(args[5]);
+                }
+            }
+        }
+        if (!((family == 0 || family == MOD_NETWORK_AF_INET)
+              && (type == 0 || type == MOD_NETWORK_SOCK_STREAM)
+              && proto == 0
+              && flags == 0)) {
+            mp_warning(MP_WARN_CAT(RuntimeWarning), "unsupported getaddrinfo constraints");
+        }
+    }
+
     if (hlen > 0) {
         // check if host is already in IP form
         nlr_buf_t nlr;
         if (nlr_push(&nlr) == 0) {
-            netutils_parse_ipv4_addr(host_in, out_ip, NETUTILS_BIG);
+            netutils_parse_ipv4_addr(args[0], out_ip, NETUTILS_BIG);
             have_ip = true;
             nlr_pop();
         } else {
@@ -519,7 +542,7 @@ STATIC mp_obj_t mod_usocket_getaddrinfo(mp_obj_t host_in, mp_obj_t port_in) {
     tuple->items[4] = netutils_format_inet_addr(out_ip, port, NETUTILS_BIG);
     return mp_obj_new_list(1, (mp_obj_t *)&tuple);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_usocket_getaddrinfo_obj, mod_usocket_getaddrinfo);
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_usocket_getaddrinfo_obj, 2, 6, mod_usocket_getaddrinfo);
 
 STATIC const mp_rom_map_elem_t mp_module_usocket_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_usocket) },

From bef26d4e3fee7f00758d6e3ae7aa187b80d7878c Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Thu, 20 Jan 2022 20:45:31 +0200
Subject: [PATCH 1602/3533] rp2/machine_uart: Add machine.UART init/deinit
 methods.

Without these methods a lot of existing "portable" scripts are broken.
This change improves portability by making rp2 machine.UART more compliant
with the documented machine UART interface.
---
 ports/rp2/machine_uart.c | 66 +++++++++++++++++++++++++++++-----------
 1 file changed, 49 insertions(+), 17 deletions(-)

diff --git a/ports/rp2/machine_uart.c b/ports/rp2/machine_uart.c
index 887954276ef5e..283c12ed54fe8 100644
--- a/ports/rp2/machine_uart.c
+++ b/ports/rp2/machine_uart.c
@@ -162,11 +162,10 @@ STATIC void machine_uart_print(const mp_print_t *print, mp_obj_t self_in, mp_pri
         self->timeout, self->timeout_char, _invert_name[self->invert]);
 }
 
-STATIC mp_obj_t machine_uart_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
-    enum { ARG_id, ARG_baudrate, ARG_bits, ARG_parity, ARG_stop, ARG_tx, ARG_rx, ARG_cts, ARG_rts,
+STATIC void machine_uart_init_helper(machine_uart_obj_t *self, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    enum { ARG_baudrate, ARG_bits, ARG_parity, ARG_stop, ARG_tx, ARG_rx, ARG_cts, ARG_rts,
            ARG_timeout, ARG_timeout_char, ARG_invert, ARG_flow, ARG_txbuf, ARG_rxbuf};
     static const mp_arg_t allowed_args[] = {
-        { MP_QSTR_id, MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
         { MP_QSTR_baudrate, MP_ARG_INT, {.u_int = -1} },
         { MP_QSTR_bits, MP_ARG_INT, {.u_int = -1} },
         { MP_QSTR_parity, MP_ARG_OBJ, {.u_rom_obj = MP_ROM_INT(-1)} },
@@ -185,16 +184,7 @@ STATIC mp_obj_t machine_uart_make_new(const mp_obj_type_t *type, size_t n_args,
 
     // Parse args.
     mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
-    mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
-
-    // Get UART bus.
-    int uart_id = mp_obj_get_int(args[ARG_id].u_obj);
-    if (uart_id < 0 || uart_id >= MP_ARRAY_SIZE(machine_uart_obj)) {
-        mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("UART(%d) doesn't exist"), uart_id);
-    }
-
-    // Get static peripheral object.
-    machine_uart_obj_t *self = (machine_uart_obj_t *)&machine_uart_obj[uart_id];
+    mp_arg_parse_all(n_args, pos_args, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
 
     // Set baudrate if configured.
     if (args[ARG_baudrate].u_int > 0) {
@@ -305,7 +295,7 @@ STATIC mp_obj_t machine_uart_make_new(const mp_obj_type_t *type, size_t n_args,
     }
 
     // Initialise the UART peripheral if any arguments given, or it was not initialised previously.
-    if (n_args > 1 || n_kw > 0 || self->baudrate == 0) {
+    if (n_args > 0 || kw_args->used > 0 || self->baudrate == 0) {
         if (self->baudrate == 0) {
             self->baudrate = DEFAULT_UART_BAUDRATE;
         }
@@ -339,10 +329,10 @@ STATIC mp_obj_t machine_uart_make_new(const mp_obj_type_t *type, size_t n_args,
 
         // Allocate the RX/TX buffers.
         ringbuf_alloc(&(self->read_buffer), rxbuf_len + 1);
-        MP_STATE_PORT(rp2_uart_rx_buffer[uart_id]) = self->read_buffer.buf;
+        MP_STATE_PORT(rp2_uart_rx_buffer[self->uart_id]) = self->read_buffer.buf;
 
         ringbuf_alloc(&(self->write_buffer), txbuf_len + 1);
-        MP_STATE_PORT(rp2_uart_tx_buffer[uart_id]) = self->write_buffer.buf;
+        MP_STATE_PORT(rp2_uart_tx_buffer[self->uart_id]) = self->write_buffer.buf;
 
         // Set the irq handler.
         if (self->uart_id == 0) {
@@ -356,10 +346,50 @@ STATIC mp_obj_t machine_uart_make_new(const mp_obj_type_t *type, size_t n_args,
         // Enable the uart irq; this macro sets the rx irq level to 4.
         uart_set_irq_enables(self->uart, true, true);
     }
+}
+
+STATIC mp_obj_t machine_uart_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
+    mp_arg_check_num(n_args, n_kw, 1, MP_OBJ_FUN_ARGS_MAX, true);
+
+    // Get UART bus.
+    int uart_id = mp_obj_get_int(args[0]);
+    if (uart_id < 0 || uart_id >= MP_ARRAY_SIZE(machine_uart_obj)) {
+        mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("UART(%d) doesn't exist"), uart_id);
+    }
+
+    // Get static peripheral object.
+    machine_uart_obj_t *self = (machine_uart_obj_t *)&machine_uart_obj[uart_id];
+
+    // Initialise the UART peripheral.
+    mp_map_t kw_args;
+    mp_map_init_fixed_table(&kw_args, n_kw, args + n_args);
+    machine_uart_init_helper(self, n_args - 1, args + 1, &kw_args);
 
     return MP_OBJ_FROM_PTR(self);
 }
 
+STATIC mp_obj_t machine_uart_init(size_t n_args, const mp_obj_t *args, mp_map_t *kw_args) {
+    // Initialise the UART peripheral.
+    machine_uart_init_helper(args[0], n_args - 1, args + 1, kw_args);
+    return mp_const_none;
+}
+MP_DEFINE_CONST_FUN_OBJ_KW(machine_uart_init_obj, 1, machine_uart_init);
+
+STATIC mp_obj_t machine_uart_deinit(mp_obj_t self_in) {
+    machine_uart_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    uart_deinit(self->uart);
+    if (self->uart_id == 0) {
+        irq_set_enabled(UART0_IRQ, false);
+    } else {
+        irq_set_enabled(UART1_IRQ, false);
+    }
+    self->baudrate = 0;
+    MP_STATE_PORT(rp2_uart_rx_buffer[self->uart_id]) = NULL;
+    MP_STATE_PORT(rp2_uart_tx_buffer[self->uart_id]) = NULL;
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_uart_deinit_obj, machine_uart_deinit);
+
 STATIC mp_obj_t machine_uart_any(mp_obj_t self_in) {
     machine_uart_obj_t *self = MP_OBJ_TO_PTR(self_in);
     // get all bytes from the fifo first
@@ -380,8 +410,10 @@ STATIC mp_obj_t machine_uart_sendbreak(mp_obj_t self_in) {
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_uart_sendbreak_obj, machine_uart_sendbreak);
 
 STATIC const mp_rom_map_elem_t machine_uart_locals_dict_table[] = {
-    { MP_ROM_QSTR(MP_QSTR_any), MP_ROM_PTR(&machine_uart_any_obj) },
+    { MP_ROM_QSTR(MP_QSTR_init), MP_ROM_PTR(&machine_uart_init_obj) },
+    { MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&machine_uart_deinit_obj) },
 
+    { MP_ROM_QSTR(MP_QSTR_any), MP_ROM_PTR(&machine_uart_any_obj) },
     { MP_ROM_QSTR(MP_QSTR_read), MP_ROM_PTR(&mp_stream_read_obj) },
     { MP_ROM_QSTR(MP_QSTR_readline), MP_ROM_PTR(&mp_stream_unbuffered_readline_obj) },
     { MP_ROM_QSTR(MP_QSTR_readinto), MP_ROM_PTR(&mp_stream_readinto_obj) },

From a707fe50b085ec83722106609f6fd219faf9f030 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 21 Jan 2022 14:52:03 +1100
Subject: [PATCH 1603/3533] rp2/machine_i2c: Use soft I2C only for len=0, and
 increase timeout.

The RP2040 I2C hardware can do writes of length 1 and 2, just not of length
0.  So only use software I2C for writes of length 0, to improve
performance.

Also increase the software I2C timeout for zero-length writes to
accommodate the behaviour of a wider range of I2C devices.

Fixes issue #8167.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/rp2/machine_i2c.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ports/rp2/machine_i2c.c b/ports/rp2/machine_i2c.c
index 56f012a5e8848..f785ad7dedf33 100644
--- a/ports/rp2/machine_i2c.c
+++ b/ports/rp2/machine_i2c.c
@@ -127,12 +127,12 @@ STATIC int machine_i2c_transfer_single(mp_obj_base_t *self_in, uint16_t addr, si
     if (flags & MP_MACHINE_I2C_FLAG_READ) {
         ret = i2c_read_blocking(self->i2c_inst, addr, buf, len, nostop);
     } else {
-        if (len <= 2) {
-            // Workaround issue with hardware I2C not accepting short writes.
+        if (len == 0) {
+            // Workaround issue with hardware I2C not accepting zero-length writes.
             mp_machine_soft_i2c_obj_t soft_i2c = {
                 .base = { &mp_machine_soft_i2c_type },
                 .us_delay = 500000 / self->freq + 1,
-                .us_timeout = 255,
+                .us_timeout = 50000,
                 .scl = self->scl,
                 .sda = self->sda,
             };

From 7d71ae25edc4b405dd03222f044bc7cf3b77f956 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 21 Jan 2022 14:59:13 +1100
Subject: [PATCH 1604/3533] extmod/machine_i2c: Increase default SoftI2C
 timeout to 50ms.

Some devices, eg BNO055, can stretch SCL for a long time, so make the
default large to accommodate them.  50ms matches the current default for
stm32 hardware I2C .

Signed-off-by: Damien George <damien@micropython.org>
---
 docs/library/machine.I2C.rst | 2 +-
 extmod/machine_i2c.c         | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/docs/library/machine.I2C.rst b/docs/library/machine.I2C.rst
index f46d64ef51d4d..82a88390c3fb3 100644
--- a/docs/library/machine.I2C.rst
+++ b/docs/library/machine.I2C.rst
@@ -57,7 +57,7 @@ Constructors
    of *scl* and *sda* that cannot be changed.
 
 .. _machine.SoftI2C:
-.. class:: SoftI2C(scl, sda, *, freq=400000, timeout=255)
+.. class:: SoftI2C(scl, sda, *, freq=400000, timeout=50000)
 
    Construct a new software I2C object.  The parameters are:
 
diff --git a/extmod/machine_i2c.c b/extmod/machine_i2c.c
index b2e39c534d8e5..2b1275e5bb724 100644
--- a/extmod/machine_i2c.c
+++ b/extmod/machine_i2c.c
@@ -33,6 +33,8 @@
 #include "py/runtime.h"
 #include "extmod/machine_i2c.h"
 
+#define SOFT_I2C_DEFAULT_TIMEOUT_US (50000) // 50ms
+
 #if MICROPY_PY_MACHINE_SOFTI2C
 
 typedef mp_machine_soft_i2c_obj_t machine_i2c_obj_t;
@@ -651,7 +653,7 @@ STATIC void mp_machine_soft_i2c_init(mp_obj_base_t *self_in, size_t n_args, cons
         { MP_QSTR_scl, MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
         { MP_QSTR_sda, MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
         { MP_QSTR_freq, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 400000} },
-        { MP_QSTR_timeout, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 255} },
+        { MP_QSTR_timeout, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = SOFT_I2C_DEFAULT_TIMEOUT_US} },
     };
 
     mp_machine_soft_i2c_obj_t *self = (mp_machine_soft_i2c_obj_t *)self_in;

From 4d2f487ee1ac93098b90c3108b071f6e855c9e7f Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 21 Jan 2022 22:29:11 +1100
Subject: [PATCH 1605/3533] docs/library: Specify additional ADC methods and
 new ADCBlock class.

The new ADC methods are: init(), read_uv() and block().

The new ADCBlock class has methods: init() and connect().

See related discussions in #3943, #4213.

Signed-off-by: Damien George <damien@micropython.org>
---
 docs/library/machine.ADC.rst      | 39 ++++++++++++++++++---
 docs/library/machine.ADCBlock.rst | 58 +++++++++++++++++++++++++++++++
 docs/library/machine.rst          |  1 +
 3 files changed, 94 insertions(+), 4 deletions(-)
 create mode 100644 docs/library/machine.ADCBlock.rst

diff --git a/docs/library/machine.ADC.rst b/docs/library/machine.ADC.rst
index 1404b454ae7f5..eb538a4424f6f 100644
--- a/docs/library/machine.ADC.rst
+++ b/docs/library/machine.ADC.rst
@@ -8,28 +8,59 @@ The ADC class provides an interface to analog-to-digital convertors, and
 represents a single endpoint that can sample a continuous voltage and
 convert it to a discretised value.
 
+For extra control over ADC sampling see :ref:`machine.ADCBlock <machine.ADCBlock>`.
+
 Example usage::
 
-   import machine
+   from machine import ADC
 
-   adc = machine.ADC(pin)   # create an ADC object acting on a pin
-   val = adc.read_u16()     # read a raw analog value in the range 0-65535
+   adc = ADC(pin)        # create an ADC object acting on a pin
+   val = adc.read_u16()  # read a raw analog value in the range 0-65535
+   val = adc.read_uv()   # read an analog value in microvolts
 
 Constructors
 ------------
 
-.. class:: ADC(id)
+.. class:: ADC(id, *, sample_ns, atten)
 
    Access the ADC associated with a source identified by *id*.  This
    *id* may be an integer (usually specifying a channel number), a
    :ref:`Pin <machine.Pin>` object, or other value supported by the
    underlying machine.
 
+   If additional keyword-arguments are given then they will configure
+   various aspects of the ADC.  If not given, these settings will take
+   previous or default values.  The settings are:
+
+     - *sample_ns* is the sampling time in nanoseconds.
+
+     - *atten* specifies the input attenuation.
+
 Methods
 -------
 
+.. method:: ADC.init(*, sample_ns, atten)
+
+   Apply the given settings to the ADC.  Only those arguments that are
+   specified will be changed.  See the ADC constructor above for what the
+   arguments are.
+
+.. method:: ADC.block()
+
+   Return the :ref:`ADCBlock <machine.ADCBlock>` instance associated with
+   this ADC object.
+
+   This method only exists if the port supports the
+   :ref:`ADCBlock <machine.ADCBlock>` class.
+
 .. method:: ADC.read_u16()
 
    Take an analog reading and return an integer in the range 0-65535.
    The return value represents the raw reading taken by the ADC, scaled
    such that the minimum value is 0 and the maximum value is 65535.
+
+.. method:: ADC.read_uv()
+
+   Take an analog reading and return an integer value with units of
+   microvolts.  It is up to the particular port whether or not this value
+   is calibrated, and how calibration is done.
diff --git a/docs/library/machine.ADCBlock.rst b/docs/library/machine.ADCBlock.rst
new file mode 100644
index 0000000000000..56a468dd621b2
--- /dev/null
+++ b/docs/library/machine.ADCBlock.rst
@@ -0,0 +1,58 @@
+.. currentmodule:: machine
+.. _machine.ADCBlock:
+
+class ADCBlock -- control ADC peripherals
+=========================================
+
+The ADCBlock class provides access to an ADC peripheral which has a
+number of channels that can be used to sample analog values.  It allows
+finer control over configuration of :ref:`machine.ADC <machine.ADC>`
+objects, which do the actual sampling.
+
+This class is not always available.
+
+Example usage::
+
+   from machine import ADCBlock
+
+   block = ADCBlock(id, bits=12)  # create an ADCBlock with 12-bit resolution
+   adc = block.connect(4, pin)    # connect channel 4 to the given pin
+   val = adc.read_uv()            # read an analog value
+
+Constructors
+------------
+
+.. class:: ADCBlock(id, *, bits)
+
+   Access the ADC peripheral identified by *id*, which may be an integer
+   or string.
+   
+   The *bits* argument, if given, sets the resolution in bits of the
+   conversion process.  If not specified then the previous or default
+   resolution is used.
+
+Methods
+-------
+
+.. method:: ADCBlock.init(*, bits)
+
+   Configure the ADC peripheral.  *bits* will set the resolution of the
+   conversion process.
+
+.. method:: ADCBlock.connect(channel)
+            ADCBlock.connect(source)
+            ADCBlock.connect(channel, source)
+
+   Connect up a channel on the ADC peripheral so it is ready for sampling,
+   and return an :ref:`ADC <machine.ADC>` object that represents that connection.
+
+   The *channel* argument must be an integer, and *source* must be an object
+   (for example a :ref:`Pin <machine.Pin>`) which can be connected up for sampling.
+
+   If only *channel* is given then it is configured for sampling.
+
+   If only *source* is given then that object is connected to a default
+   channel ready for sampling.
+
+   If both *channel* and *source* are given then they are connected together
+   and made ready for sampling.
diff --git a/docs/library/machine.rst b/docs/library/machine.rst
index 5f45168ed6972..d66423d0d4532 100644
--- a/docs/library/machine.rst
+++ b/docs/library/machine.rst
@@ -199,6 +199,7 @@ Classes
    machine.Pin.rst
    machine.Signal.rst
    machine.ADC.rst
+   machine.ADCBlock.rst
    machine.PWM.rst
    machine.UART.rst
    machine.SPI.rst

From 3300d6d3370dcd64d7212d6d977edcba42432234 Mon Sep 17 00:00:00 2001
From: Jonathan Hogg <me@jonathanhogg.com>
Date: Tue, 21 Dec 2021 13:25:55 +0000
Subject: [PATCH 1606/3533] docs/esp32: Document expanded ADC API in quickref.

Document read_u16(), read_uv() and ADCBlock(). Mark old read(), atten()
and width() methods as legacy.
---
 docs/esp32/quickref.rst | 103 +++++++++++++++++++++++++++-------------
 1 file changed, 70 insertions(+), 33 deletions(-)

diff --git a/docs/esp32/quickref.rst b/docs/esp32/quickref.rst
index 337f87b66fde6..94b5d966edd30 100644
--- a/docs/esp32/quickref.rst
+++ b/docs/esp32/quickref.rst
@@ -264,54 +264,91 @@ See more examples in the :ref:`esp32_pwm` tutorial.
 ADC (analog to digital conversion)
 ----------------------------------
 
-On the ESP32 ADC functionality is available on Pins 32-39. Note that, when
-using the default configuration, input voltages on the ADC pin must be between
-0.0v and 1.0v (anything above 1.0v will just read as 4095).  Attenuation must
-be applied in order to increase this usable voltage range.
+On the ESP32 ADC functionality is available on pins 32-39 (ADC block 1) and pins
+0, 2, 4, 12-15 and 25-27 (ADC block 2).
 
 Use the :ref:`machine.ADC <machine.ADC>` class::
 
     from machine import ADC
 
-    adc = ADC(Pin(32))          # create ADC object on ADC pin
-    adc.read()                  # read value, 0-4095 across voltage range 0.0v - 1.0v
+    adc = ADC(Pin(32))          # create ADC object for pin 32
+    adc.read_u16()              # read raw value, 0-65535
 
-    adc.atten(ADC.ATTN_11DB)    # set 11dB input attenuation (voltage range roughly 0.0v - 3.6v)
-    adc.width(ADC.WIDTH_9BIT)   # set 9 bit return values (returned range 0-511)
-    adc.read()                  # read value using the newly configured attenuation and width
+Note that the ESP32 uses an internal ADC reference voltage of 1.0v. To read
+voltages above this value, input attenuation can be applied with the optional
+``atten`` keyword argument to the constructor. Valid values are:
 
-ESP32 specific ADC class method reference:
+  - ``ADC.ATTN_0DB``: No attenuation, this is the default
+  - ``ADC.ATTN_2_5DB``: 2.5dB attenuation, gives a maximum input voltage of
+    approximately 1.33v
+  - ``ADC.ATTN_6DB``: 6dB attenuation, gives a maximum input voltage of
+    approximately 2.00v
+  - ``ADC.ATTN_11DB``: 11dB attenuation, gives a maximum input voltage of
+    approximately 3.55v
 
-.. method:: ADC.atten(attenuation)
-
-    This method allows for the setting of the amount of attenuation on the
-    input of the ADC. This allows for a wider possible input voltage range,
-    at the cost of accuracy (the same number of bits now represents a wider
-    range). The possible attenuation options are:
+E.g.::
 
-      - ``ADC.ATTN_0DB``: 0dB attenuation, gives a maximum input voltage
-        of 1.00v - this is the default configuration
-      - ``ADC.ATTN_2_5DB``: 2.5dB attenuation, gives a maximum input voltage
-        of approximately 1.34v
-      - ``ADC.ATTN_6DB``: 6dB attenuation, gives a maximum input voltage
-        of approximately 2.00v
-      - ``ADC.ATTN_11DB``: 11dB attenuation, gives a maximum input voltage
-        of approximately 3.6v
+    adc = ADC(Pin(25), atten=ADC.ATTEN_11DB)  # 0.0v - 3.55v range
 
 .. Warning::
-   Despite 11dB attenuation allowing for up to a 3.6v range, note that the
-   absolute maximum voltage rating for the input pins is 3.6v, and so going
-   near this boundary may be damaging to the IC!
+   Note that, although 11dB attenuation allows for a voltage range up to 3.55v,
+   the absolute maximum voltage rating for input pins is 3.6v, and so going
+   near this boundary risks damage to the IC!
+
+ESP32-specific ADC class method reference:
+
+.. method:: ADC.init(*, atten)
+
+    Re-initialize the ADC pin with a different input attenuation.
+
+.. method:: ADC.read_uv()
+
+    This method uses internal per-package calibration values - set during
+    manufacture - to return the ADC input voltage in microvolts, taking into
+    account any input attenuation applied. Note that the calibration curves do
+    not guarantee that an input tied to ground will read as 0, and the returned
+    values have only millivolt resolution.
+
+.. method:: ADC.block()
+
+    Return the matching ``ADCBlock`` object.
+
+.. class:: ADCBlock(id, *, bits)
+
+    Return the ADC block object with the given ``id`` (1 or 2) and initialize
+    it to the specified resolution (9 to 12-bits) or the default 12-bits.
+
+.. method:: ADCBlock.init(*, bits)
+
+    Re-initialize the ADC block with a specific resolution.
+
+.. method:: ADCBlock.connect(channel_or_pin)
+
+    Return the ``ADC`` object for the specified ADC channel number or Pin object.
+
+Legacy API methods:
+
+.. method:: ADC.read()
+
+    This method returns the raw ADC value ranged according to the resolution of
+    the ADC block, 0-4095 for the default 12-bit resolution.
+
+.. method:: ADC.atten(attenuation)
+
+    Equivalent to ``ADC.init(atten=attenuation)``.
 
 .. method:: ADC.width(width)
 
-    This method allows for the setting of the number of bits to be utilised
-    and returned during ADC reads. Possible width options are:
+    Equivalent to ``ADC.block().init(bits=width)``.
+
+For compatibility, the ``ADC`` object also provides constants matching the
+supported ADC resolutions:
+
+  - ``ADC.WIDTH_9BIT`` = 9
+  - ``ADC.WIDTH_10BIT`` = 10
+  - ``ADC.WIDTH_11BIT`` = 11
+  - ``ADC.WIDTH_12BIT`` = 12
 
-      - ``ADC.WIDTH_9BIT``: 9 bit data
-      - ``ADC.WIDTH_10BIT``: 10 bit data
-      - ``ADC.WIDTH_11BIT``: 11 bit data
-      - ``ADC.WIDTH_12BIT``: 12 bit data - this is the default configuration
 
 Software SPI bus
 ----------------

From 63438a31bb6d0c8012e338433df95700f1cbca97 Mon Sep 17 00:00:00 2001
From: Jonathan Hogg <me@jonathanhogg.com>
Date: Tue, 21 Dec 2021 15:15:24 +0000
Subject: [PATCH 1607/3533] esp32/machine_adcblock: Add new machine.ADCBlock
 class and update ADC.

Rework the ADC implementation to follow the improved ADC/ADCBlock API.
This adds support for calibrated voltage readings and the ADC2 block.  The
ADC API is backwards compatible with what it was before this change.

Resolves #6219.
---
 ports/esp32/boards/sdkconfig.base |   5 +
 ports/esp32/machine_adc.c         | 287 +++++++++++++++++-------------
 ports/esp32/machine_adc.h         |  16 ++
 ports/esp32/machine_adcblock.c    | 203 +++++++++++++++++++++
 ports/esp32/machine_adcblock.h    |  20 +++
 ports/esp32/main/CMakeLists.txt   |   2 +
 ports/esp32/modmachine.c          |   1 +
 ports/esp32/modmachine.h          |   1 +
 8 files changed, 410 insertions(+), 125 deletions(-)
 create mode 100644 ports/esp32/machine_adc.h
 create mode 100644 ports/esp32/machine_adcblock.c
 create mode 100644 ports/esp32/machine_adcblock.h

diff --git a/ports/esp32/boards/sdkconfig.base b/ports/esp32/boards/sdkconfig.base
index 71229e8bebe4a..4b29013434c78 100644
--- a/ports/esp32/boards/sdkconfig.base
+++ b/ports/esp32/boards/sdkconfig.base
@@ -58,3 +58,8 @@ CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv"
 # To reduce iRAM usage
 CONFIG_ESP32_WIFI_IRAM_OPT=n
 CONFIG_ESP32_WIFI_RX_IRAM_OPT=n
+
+# ADC calibration
+CONFIG_ADC_CAL_EFUSE_TP_ENABLE=y
+CONFIG_ADC_CAL_EFUSE_VREF_ENABLE=y
+CONFIG_ADC_CAL_LUT_ENABLE=y
diff --git a/ports/esp32/machine_adc.c b/ports/esp32/machine_adc.c
index 6731978e28853..f6bc7b96399e0 100644
--- a/ports/esp32/machine_adc.c
+++ b/ports/esp32/machine_adc.c
@@ -4,6 +4,7 @@
  * The MIT License (MIT)
  *
  * Copyright (c) 2017 Nick Moore
+ * Copyright (c) 2021 Jonathan Hogg
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -24,7 +25,6 @@
  * THE SOFTWARE.
  */
 
-
 #include <stdio.h>
 
 #include "esp_log.h"
@@ -35,176 +35,213 @@
 #include "py/runtime.h"
 #include "py/mphal.h"
 #include "modmachine.h"
+#include "machine_adc.h"
 
-typedef struct _madc_obj_t {
-    mp_obj_base_t base;
-    gpio_num_t gpio_id;
-    adc1_channel_t adc1_id;
-} madc_obj_t;
+#define ADCBLOCK1 (&madcblock_obj[0])
+#define ADCBLOCK2 (&madcblock_obj[1])
 
 STATIC const madc_obj_t madc_obj[] = {
     #if CONFIG_IDF_TARGET_ESP32
-    {{&machine_adc_type}, GPIO_NUM_36, ADC1_CHANNEL_0},
-    {{&machine_adc_type}, GPIO_NUM_37, ADC1_CHANNEL_1},
-    {{&machine_adc_type}, GPIO_NUM_38, ADC1_CHANNEL_2},
-    {{&machine_adc_type}, GPIO_NUM_39, ADC1_CHANNEL_3},
-    {{&machine_adc_type}, GPIO_NUM_32, ADC1_CHANNEL_4},
-    {{&machine_adc_type}, GPIO_NUM_33, ADC1_CHANNEL_5},
-    {{&machine_adc_type}, GPIO_NUM_34, ADC1_CHANNEL_6},
-    {{&machine_adc_type}, GPIO_NUM_35, ADC1_CHANNEL_7},
+    {{&machine_adc_type}, ADCBLOCK1, ADC_CHANNEL_0, GPIO_NUM_36},
+    {{&machine_adc_type}, ADCBLOCK1, ADC_CHANNEL_1, GPIO_NUM_37},
+    {{&machine_adc_type}, ADCBLOCK1, ADC_CHANNEL_2, GPIO_NUM_38},
+    {{&machine_adc_type}, ADCBLOCK1, ADC_CHANNEL_3, GPIO_NUM_39},
+    {{&machine_adc_type}, ADCBLOCK1, ADC_CHANNEL_4, GPIO_NUM_32},
+    {{&machine_adc_type}, ADCBLOCK1, ADC_CHANNEL_5, GPIO_NUM_33},
+    {{&machine_adc_type}, ADCBLOCK1, ADC_CHANNEL_6, GPIO_NUM_34},
+    {{&machine_adc_type}, ADCBLOCK1, ADC_CHANNEL_7, GPIO_NUM_35},
+    {{&machine_adc_type}, ADCBLOCK2, ADC_CHANNEL_0, GPIO_NUM_0},
+    {{&machine_adc_type}, ADCBLOCK2, ADC_CHANNEL_1, GPIO_NUM_2},
+    {{&machine_adc_type}, ADCBLOCK2, ADC_CHANNEL_2, GPIO_NUM_4},
+    {{&machine_adc_type}, ADCBLOCK2, ADC_CHANNEL_3, GPIO_NUM_12},
+    {{&machine_adc_type}, ADCBLOCK2, ADC_CHANNEL_4, GPIO_NUM_13},
+    {{&machine_adc_type}, ADCBLOCK2, ADC_CHANNEL_5, GPIO_NUM_14},
+    {{&machine_adc_type}, ADCBLOCK2, ADC_CHANNEL_6, GPIO_NUM_15},
+    {{&machine_adc_type}, ADCBLOCK2, ADC_CHANNEL_7, GPIO_NUM_25},
+    {{&machine_adc_type}, ADCBLOCK2, ADC_CHANNEL_8, GPIO_NUM_26},
+    {{&machine_adc_type}, ADCBLOCK2, ADC_CHANNEL_9, GPIO_NUM_27},
     #elif CONFIG_IDF_TARGET_ESP32C3
-    {{&machine_adc_type}, GPIO_NUM_0, ADC1_CHANNEL_0},
-    {{&machine_adc_type}, GPIO_NUM_1, ADC1_CHANNEL_1},
-    {{&machine_adc_type}, GPIO_NUM_2, ADC1_CHANNEL_2},
-    {{&machine_adc_type}, GPIO_NUM_3, ADC1_CHANNEL_3},
-    {{&machine_adc_type}, GPIO_NUM_4, ADC1_CHANNEL_4},
+    {{&machine_adc_type}, ADCBLOCK1, ADC_CHANNEL_0, GPIO_NUM_0},
+    {{&machine_adc_type}, ADCBLOCK1, ADC_CHANNEL_1, GPIO_NUM_1},
+    {{&machine_adc_type}, ADCBLOCK1, ADC_CHANNEL_2, GPIO_NUM_2},
+    {{&machine_adc_type}, ADCBLOCK1, ADC_CHANNEL_3, GPIO_NUM_3},
+    {{&machine_adc_type}, ADCBLOCK1, ADC_CHANNEL_4, GPIO_NUM_4},
+    {{&machine_adc_type}, ADCBLOCK2, ADC_CHANNEL_0, GPIO_NUM_5},
     #elif CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3
-    {{&machine_adc_type}, GPIO_NUM_1, ADC1_CHANNEL_0},
-    {{&machine_adc_type}, GPIO_NUM_2, ADC1_CHANNEL_1},
-    {{&machine_adc_type}, GPIO_NUM_3, ADC1_CHANNEL_2},
-    {{&machine_adc_type}, GPIO_NUM_4, ADC1_CHANNEL_3},
-    {{&machine_adc_type}, GPIO_NUM_5, ADC1_CHANNEL_4},
-    {{&machine_adc_type}, GPIO_NUM_6, ADC1_CHANNEL_5},
-    {{&machine_adc_type}, GPIO_NUM_7, ADC1_CHANNEL_6},
-    {{&machine_adc_type}, GPIO_NUM_8, ADC1_CHANNEL_7},
-    {{&machine_adc_type}, GPIO_NUM_9, ADC1_CHANNEL_8},
-    {{&machine_adc_type}, GPIO_NUM_10, ADC1_CHANNEL_9},
+    {{&machine_adc_type}, ADCBLOCK1, ADC_CHANNEL_0, GPIO_NUM_1},
+    {{&machine_adc_type}, ADCBLOCK1, ADC_CHANNEL_1, GPIO_NUM_2},
+    {{&machine_adc_type}, ADCBLOCK1, ADC_CHANNEL_2, GPIO_NUM_3},
+    {{&machine_adc_type}, ADCBLOCK1, ADC_CHANNEL_3, GPIO_NUM_4},
+    {{&machine_adc_type}, ADCBLOCK1, ADC_CHANNEL_4, GPIO_NUM_5},
+    {{&machine_adc_type}, ADCBLOCK1, ADC_CHANNEL_5, GPIO_NUM_6},
+    {{&machine_adc_type}, ADCBLOCK1, ADC_CHANNEL_6, GPIO_NUM_7},
+    {{&machine_adc_type}, ADCBLOCK1, ADC_CHANNEL_7, GPIO_NUM_8},
+    {{&machine_adc_type}, ADCBLOCK1, ADC_CHANNEL_8, GPIO_NUM_9},
+    {{&machine_adc_type}, ADCBLOCK1, ADC_CHANNEL_9, GPIO_NUM_10},
+    {{&machine_adc_type}, ADCBLOCK2, ADC_CHANNEL_0, GPIO_NUM_11},
+    {{&machine_adc_type}, ADCBLOCK2, ADC_CHANNEL_1, GPIO_NUM_12},
+    {{&machine_adc_type}, ADCBLOCK2, ADC_CHANNEL_2, GPIO_NUM_13},
+    {{&machine_adc_type}, ADCBLOCK2, ADC_CHANNEL_3, GPIO_NUM_14},
+    {{&machine_adc_type}, ADCBLOCK2, ADC_CHANNEL_4, GPIO_NUM_15},
+    {{&machine_adc_type}, ADCBLOCK2, ADC_CHANNEL_5, GPIO_NUM_16},
+    {{&machine_adc_type}, ADCBLOCK2, ADC_CHANNEL_6, GPIO_NUM_17},
+    {{&machine_adc_type}, ADCBLOCK2, ADC_CHANNEL_7, GPIO_NUM_18},
+    {{&machine_adc_type}, ADCBLOCK2, ADC_CHANNEL_8, GPIO_NUM_19},
+    {{&machine_adc_type}, ADCBLOCK2, ADC_CHANNEL_9, GPIO_NUM_20},
     #endif
 };
 
-STATIC uint8_t adc_bit_width;
+STATIC adc_atten_t madc_obj_atten[MP_ARRAY_SIZE(madc_obj)];
 
-STATIC mp_obj_t madc_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw,
-    const mp_obj_t *args) {
+const madc_obj_t *madc_search_helper(madcblock_obj_t *block, adc_channel_t channel_id, gpio_num_t gpio_id) {
+    for (int i = 0; i < MP_ARRAY_SIZE(madc_obj); i++) {
+        const madc_obj_t *adc = &madc_obj[i];
+        if ((block == NULL || block == adc->block) && (channel_id == -1 || channel_id == adc->channel_id) && (gpio_id == -1 || gpio_id == adc->gpio_id)) {
+            return adc;
+        }
+    }
+    return NULL;
+}
 
-    static int initialized = 0;
-    if (!initialized) {
-        #if CONFIG_IDF_TARGET_ESP32S2
-        adc1_config_width(ADC_WIDTH_BIT_13);
-        #else
-        adc1_config_width(ADC_WIDTH_BIT_12);
-        #endif
-        adc_bit_width = 12;
-        initialized = 1;
+STATIC void madc_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+    const madc_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    mp_printf(print, "ADC(Pin(%u), atten=%u)", self->gpio_id, madc_obj_atten[self - madc_obj]);
+}
+
+STATIC void madc_atten_helper(const madc_obj_t *self, mp_int_t atten) {
+    esp_err_t err;
+    if (self->block->unit_id == ADC_UNIT_1) {
+        err = adc1_config_channel_atten(self->channel_id, atten);
+    } else {
+        err = adc2_config_channel_atten(self->channel_id, atten);
     }
+    if (err != ESP_OK) {
+        mp_raise_ValueError(MP_ERROR_TEXT("invalid atten"));
+    }
+    madc_obj_atten[self - madc_obj] = atten;
+}
 
-    mp_arg_check_num(n_args, n_kw, 1, 1, true);
-    gpio_num_t pin_id = machine_pin_get_id(args[0]);
-    const madc_obj_t *self = NULL;
-    for (int i = 0; i < MP_ARRAY_SIZE(madc_obj); i++) {
-        if (pin_id == madc_obj[i].gpio_id) {
-            self = &madc_obj[i];
-            break;
-        }
+void madc_init_helper(const madc_obj_t *self, size_t n_pos_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    enum {
+        ARG_atten,
+    };
+
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_atten, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} },
+    };
+
+    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
+    mp_arg_parse_all(n_pos_args, pos_args, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
+
+    mp_int_t atten = args[ARG_atten].u_int;
+    if (atten != -1) {
+        madc_atten_helper(self, atten);
+    } else if (madc_obj_atten[self - madc_obj] == -1) {
+        madc_atten_helper(self, ADC_ATTEN_DB_0);
     }
+}
+
+STATIC mp_obj_t madc_make_new(const mp_obj_type_t *type, size_t n_pos_args, size_t n_kw_args, const mp_obj_t *args) {
+    mp_arg_check_num(n_pos_args, n_kw_args, 1, MP_OBJ_FUN_ARGS_MAX, true);
+    gpio_num_t gpio_id = machine_pin_get_id(args[0]);
+    const madc_obj_t *self = madc_search_helper(NULL, -1, gpio_id);
     if (!self) {
-        mp_raise_ValueError(MP_ERROR_TEXT("invalid Pin for ADC"));
+        mp_raise_ValueError(MP_ERROR_TEXT("invalid pin"));
     }
-    esp_err_t err = adc1_config_channel_atten(self->adc1_id, ADC_ATTEN_0db);
-    if (err == ESP_OK) {
-        return MP_OBJ_FROM_PTR(self);
+
+    if (self->block->width == -1) {
+        madcblock_bits_helper(self->block, self->block->bits);
     }
-    mp_raise_ValueError(MP_ERROR_TEXT("parameter error"));
+
+    mp_map_t kw_args;
+    mp_map_init_fixed_table(&kw_args, n_kw_args, args + n_pos_args);
+    madc_init_helper(self, n_pos_args - 1, args + 1, &kw_args);
+
+    return MP_OBJ_FROM_PTR(self);
 }
 
-STATIC void madc_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
-    madc_obj_t *self = self_in;
-    mp_printf(print, "ADC(Pin(%u))", self->gpio_id);
+STATIC mp_obj_t madc_init(size_t n_pos_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    const madc_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]);
+    madc_init_helper(self, n_pos_args - 1, pos_args + 1, kw_args);
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_KW(madc_init_obj, 1, madc_init);
+
+STATIC mp_obj_t madc_block(mp_obj_t self_in) {
+    const madc_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    return MP_OBJ_FROM_PTR(self->block);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(madc_block_obj, madc_block);
+
+STATIC mp_obj_t madc_read(mp_obj_t self_in) {
+    const madc_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    mp_int_t raw = madcblock_read_helper(self->block, self->channel_id);
+    return MP_OBJ_NEW_SMALL_INT(raw);
 }
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(madc_read_obj, madc_read);
 
-// read_u16()
 STATIC mp_obj_t madc_read_u16(mp_obj_t self_in) {
-    madc_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    uint32_t raw = adc1_get_raw(self->adc1_id);
+    const madc_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    mp_uint_t raw = madcblock_read_helper(self->block, self->channel_id);
     // Scale raw reading to 16 bit value using a Taylor expansion (for 8 <= bits <= 16)
-    uint32_t u16 = raw << (16 - adc_bit_width) | raw >> (2 * adc_bit_width - 16);
+    mp_int_t bits = self->block->bits;
+    mp_uint_t u16 = raw << (16 - bits) | raw >> (2 * bits - 16);
     return MP_OBJ_NEW_SMALL_INT(u16);
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(madc_read_u16_obj, madc_read_u16);
 
-// Legacy method
-STATIC mp_obj_t madc_read(mp_obj_t self_in) {
-    madc_obj_t *self = self_in;
-    int val = adc1_get_raw(self->adc1_id);
-    if (val == -1) {
-        mp_raise_ValueError(MP_ERROR_TEXT("parameter error"));
-    }
-    return MP_OBJ_NEW_SMALL_INT(val);
+STATIC mp_obj_t madc_read_uv(mp_obj_t self_in) {
+    const madc_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    adc_atten_t atten = madc_obj_atten[self - madc_obj];
+    return MP_OBJ_NEW_SMALL_INT(madcblock_read_uv_helper(self->block, self->channel_id, atten));
 }
-MP_DEFINE_CONST_FUN_OBJ_1(madc_read_obj, madc_read);
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(madc_read_uv_obj, madc_read_uv);
 
 STATIC mp_obj_t madc_atten(mp_obj_t self_in, mp_obj_t atten_in) {
-    madc_obj_t *self = self_in;
-    adc_atten_t atten = mp_obj_get_int(atten_in);
-    esp_err_t err = adc1_config_channel_atten(self->adc1_id, atten);
-    if (err == ESP_OK) {
-        return mp_const_none;
-    }
-    mp_raise_ValueError(MP_ERROR_TEXT("parameter error"));
+    const madc_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    mp_int_t atten = mp_obj_get_int(atten_in);
+    madc_atten_helper(self, atten);
+    return mp_const_none;
 }
 MP_DEFINE_CONST_FUN_OBJ_2(madc_atten_obj, madc_atten);
 
-STATIC mp_obj_t madc_width(mp_obj_t cls_in, mp_obj_t width_in) {
-    adc_bits_width_t width = mp_obj_get_int(width_in);
-    esp_err_t err = adc1_config_width(width);
-    if (err != ESP_OK) {
-        mp_raise_ValueError(MP_ERROR_TEXT("parameter error"));
-    }
-    switch (width) {
-        #if CONFIG_IDF_TARGET_ESP32
-        case ADC_WIDTH_9Bit:
-            adc_bit_width = 9;
-            break;
-        case ADC_WIDTH_10Bit:
-            adc_bit_width = 10;
-            break;
-        case ADC_WIDTH_11Bit:
-            adc_bit_width = 11;
-            break;
-        case ADC_WIDTH_12Bit:
-            adc_bit_width = 12;
-            break;
-        #elif CONFIG_IDF_TARGET_ESP32S2
-        case ADC_WIDTH_BIT_13:
-            adc_bit_width = 13;
-            break;
-        #elif CONFIG_IDF_TARGET_ESP32S3
-        case ADC_WIDTH_BIT_12:
-            adc_bit_width = 12;
-            break;
-            #endif
-        default:
-            break;
-    }
+STATIC mp_obj_t madc_width(mp_obj_t self_in, mp_obj_t bits_in) {
+    const madc_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    mp_int_t bits = mp_obj_get_int(bits_in);
+    madcblock_bits_helper(self->block, bits);
     return mp_const_none;
 }
-MP_DEFINE_CONST_FUN_OBJ_2(madc_width_fun_obj, madc_width);
-MP_DEFINE_CONST_CLASSMETHOD_OBJ(madc_width_obj, MP_ROM_PTR(&madc_width_fun_obj));
+MP_DEFINE_CONST_FUN_OBJ_2(madc_width_obj, madc_width);
 
 STATIC const mp_rom_map_elem_t madc_locals_dict_table[] = {
+    { MP_ROM_QSTR(MP_QSTR_init), MP_ROM_PTR(&madc_init_obj) },
+    { MP_ROM_QSTR(MP_QSTR_block), MP_ROM_PTR(&madc_block_obj) },
+    { MP_ROM_QSTR(MP_QSTR_read), MP_ROM_PTR(&madc_read_obj) },
     { MP_ROM_QSTR(MP_QSTR_read_u16), MP_ROM_PTR(&madc_read_u16_obj) },
+    { MP_ROM_QSTR(MP_QSTR_read_uv), MP_ROM_PTR(&madc_read_uv_obj) },
 
-    { MP_ROM_QSTR(MP_QSTR_read), MP_ROM_PTR(&madc_read_obj) },
+    // Legacy API methods:
     { MP_ROM_QSTR(MP_QSTR_atten), MP_ROM_PTR(&madc_atten_obj) },
     { MP_ROM_QSTR(MP_QSTR_width), MP_ROM_PTR(&madc_width_obj) },
 
-    { MP_ROM_QSTR(MP_QSTR_ATTN_0DB), MP_ROM_INT(ADC_ATTEN_0db) },
-    { MP_ROM_QSTR(MP_QSTR_ATTN_2_5DB), MP_ROM_INT(ADC_ATTEN_2_5db) },
-    { MP_ROM_QSTR(MP_QSTR_ATTN_6DB), MP_ROM_INT(ADC_ATTEN_6db) },
-    { MP_ROM_QSTR(MP_QSTR_ATTN_11DB), MP_ROM_INT(ADC_ATTEN_11db) },
+    { MP_ROM_QSTR(MP_QSTR_ATTN_0DB), MP_ROM_INT(ADC_ATTEN_DB_0) },
+    { MP_ROM_QSTR(MP_QSTR_ATTN_2_5DB), MP_ROM_INT(ADC_ATTEN_DB_2_5) },
+    { MP_ROM_QSTR(MP_QSTR_ATTN_6DB), MP_ROM_INT(ADC_ATTEN_DB_6) },
+    { MP_ROM_QSTR(MP_QSTR_ATTN_11DB), MP_ROM_INT(ADC_ATTEN_DB_11) },
 
     #if CONFIG_IDF_TARGET_ESP32
-    { MP_ROM_QSTR(MP_QSTR_WIDTH_9BIT), MP_ROM_INT(ADC_WIDTH_9Bit) },
-    { MP_ROM_QSTR(MP_QSTR_WIDTH_10BIT), MP_ROM_INT(ADC_WIDTH_10Bit) },
-    { MP_ROM_QSTR(MP_QSTR_WIDTH_11BIT), MP_ROM_INT(ADC_WIDTH_11Bit) },
-    { MP_ROM_QSTR(MP_QSTR_WIDTH_12BIT), MP_ROM_INT(ADC_WIDTH_12Bit) },
-    #elif CONFIG_IDF_TARGET_ESP32S2
-    { MP_ROM_QSTR(MP_QSTR_WIDTH_13BIT), MP_ROM_INT(ADC_WIDTH_BIT_13) },
-    #elif CONFIG_IDF_TARGET_ESP32S3
-    { MP_ROM_QSTR(MP_QSTR_WIDTH_12BIT), MP_ROM_INT(ADC_WIDTH_BIT_12) },
+    { MP_ROM_QSTR(MP_QSTR_WIDTH_9BIT), MP_ROM_INT(9) },
+    { MP_ROM_QSTR(MP_QSTR_WIDTH_10BIT), MP_ROM_INT(10) },
+    { MP_ROM_QSTR(MP_QSTR_WIDTH_11BIT), MP_ROM_INT(11) },
+    #endif
+    #if CONFIG_IDF_TARGET_ESP32 || CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32S3
+    { MP_ROM_QSTR(MP_QSTR_WIDTH_12BIT), MP_ROM_INT(12) },
+    #endif
+    #if CONFIG_IDF_TARGET_ESP32S2
+    { MP_ROM_QSTR(MP_QSTR_WIDTH_13BIT), MP_ROM_INT(13) },
     #endif
-};
 
+};
 STATIC MP_DEFINE_CONST_DICT(madc_locals_dict, madc_locals_dict_table);
 
 const mp_obj_type_t machine_adc_type = {
diff --git a/ports/esp32/machine_adc.h b/ports/esp32/machine_adc.h
new file mode 100644
index 0000000000000..0f229a2c5cca7
--- /dev/null
+++ b/ports/esp32/machine_adc.h
@@ -0,0 +1,16 @@
+#ifndef MICROPY_INCLUDED_MACHINE_ADC_H
+#define MICROPY_INCLUDED_MACHINE_ADC_H
+
+#include "machine_adcblock.h"
+
+typedef struct _madc_obj_t {
+    mp_obj_base_t base;
+    madcblock_obj_t *block;
+    adc_channel_t channel_id;
+    gpio_num_t gpio_id;
+} madc_obj_t;
+
+extern const madc_obj_t *madc_search_helper(madcblock_obj_t *block, adc_channel_t channel_id, gpio_num_t gpio_id);
+extern void madc_init_helper(const madc_obj_t *self, size_t n_pos_args, const mp_obj_t *pos_args, mp_map_t *kw_args);
+
+#endif // MICROPY_INCLUDED_MACHINE_ADC_H
diff --git a/ports/esp32/machine_adcblock.c b/ports/esp32/machine_adcblock.c
new file mode 100644
index 0000000000000..77e4fcecc7bea
--- /dev/null
+++ b/ports/esp32/machine_adcblock.c
@@ -0,0 +1,203 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Jonathan Hogg
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include <stdio.h>
+
+#include "esp_log.h"
+
+#include "driver/gpio.h"
+#include "driver/adc.h"
+
+#include "py/runtime.h"
+#include "py/mphal.h"
+#include "modmachine.h"
+#include "machine_adc.h"
+#include "machine_adcblock.h"
+
+#define DEFAULT_VREF 1100
+
+madcblock_obj_t madcblock_obj[] = {
+    #if CONFIG_IDF_TARGET_ESP32 || CONFIG_IDF_TARGET_ESP32C3
+    {{&machine_adcblock_type}, ADC_UNIT_1, 12, -1, {0}},
+    {{&machine_adcblock_type}, ADC_UNIT_2, 12, -1, {0}},
+    #elif CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3
+    {{&machine_adcblock_type}, ADC_UNIT_1, 13, -1, {0}},
+    {{&machine_adcblock_type}, ADC_UNIT_2, 13, -1, {0}},
+    #endif
+};
+
+STATIC void madcblock_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+    madcblock_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    mp_printf(print, "ADCBlock(%u, bits=%u)", self->unit_id, self->bits);
+}
+
+void madcblock_bits_helper(madcblock_obj_t *self, mp_int_t bits) {
+    switch (bits) {
+        #if CONFIG_IDF_TARGET_ESP32
+        case 9:
+            self->width = ADC_WIDTH_BIT_9;
+            break;
+        case 10:
+            self->width = ADC_WIDTH_BIT_10;
+            break;
+        case 11:
+            self->width = ADC_WIDTH_BIT_11;
+            break;
+        #endif
+        #if CONFIG_IDF_TARGET_ESP32 || CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32S3
+        case 12:
+            self->width = ADC_WIDTH_BIT_12;
+            break;
+        #endif
+        #if CONFIG_IDF_TARGET_ESP32S2
+        case 13:
+            self->width = ADC_WIDTH_BIT_13;
+            break;
+        #endif
+        default:
+            mp_raise_ValueError(MP_ERROR_TEXT("invalid bits"));
+    }
+    self->bits = bits;
+
+    if (self->unit_id == ADC_UNIT_1) {
+        adc1_config_width(self->width);
+    }
+    for (adc_atten_t atten = ADC_ATTEN_DB_0; atten < ADC_ATTEN_MAX; atten++) {
+        if (self->characteristics[atten] != NULL) {
+            esp_adc_cal_characterize(self->unit_id, atten, self->width, DEFAULT_VREF, self->characteristics[atten]);
+        }
+    }
+}
+
+STATIC void madcblock_init_helper(madcblock_obj_t *self, size_t n_pos_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    enum {
+        ARG_bits,
+    };
+
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_bits, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} },
+    };
+
+    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
+    mp_arg_parse_all(n_pos_args, pos_args, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
+
+    mp_int_t bits = args[ARG_bits].u_int;
+    if (bits != -1) {
+        madcblock_bits_helper(self, bits);
+    } else if (self->width == -1) {
+        madcblock_bits_helper(self, self->bits);
+    }
+}
+
+STATIC mp_obj_t madcblock_make_new(const mp_obj_type_t *type, size_t n_pos_args, size_t n_kw_args, const mp_obj_t *args) {
+    mp_arg_check_num(n_pos_args, n_kw_args, 1, MP_OBJ_FUN_ARGS_MAX, true);
+    adc_unit_t unit = mp_obj_get_int(args[0]);
+    madcblock_obj_t *self = NULL;
+    for (int i = 0; i < MP_ARRAY_SIZE(madcblock_obj); i++) {
+        if (unit == madcblock_obj[i].unit_id) {
+            self = &madcblock_obj[i];
+            break;
+        }
+    }
+    if (!self) {
+        mp_raise_ValueError(MP_ERROR_TEXT("invalid block id"));
+    }
+
+    mp_map_t kw_args;
+    mp_map_init_fixed_table(&kw_args, n_kw_args, args + n_pos_args);
+    madcblock_init_helper(self, n_pos_args - 1, args + 1, &kw_args);
+
+    return MP_OBJ_FROM_PTR(self);
+}
+
+STATIC mp_obj_t madcblock_init(size_t n_pos_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    madcblock_obj_t *self = pos_args[0];
+    madcblock_init_helper(self, n_pos_args - 1, pos_args + 1, kw_args);
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_KW(madcblock_init_obj, 1, madcblock_init);
+
+STATIC mp_obj_t madcblock_connect(size_t n_pos_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    madcblock_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]);
+    adc_channel_t channel_id = -1;
+    gpio_num_t gpio_id = -1;
+    if (n_pos_args == 2) {
+        if (mp_obj_is_int(pos_args[1])) {
+            channel_id = mp_obj_get_int(pos_args[1]);
+        } else {
+            gpio_id = machine_pin_get_id(pos_args[1]);
+        }
+    } else if (n_pos_args == 3) {
+        channel_id = mp_obj_get_int(pos_args[1]);
+        gpio_id = machine_pin_get_id(pos_args[2]);
+    } else {
+        mp_raise_TypeError(MP_ERROR_TEXT("too many positional args"));
+    }
+
+    const madc_obj_t *adc = madc_search_helper(self, channel_id, gpio_id);
+    if (adc != NULL) {
+        madc_init_helper(adc, 0, pos_args + n_pos_args, kw_args);
+        return MP_OBJ_FROM_PTR(adc);
+    }
+    mp_raise_ValueError(MP_ERROR_TEXT("no matching ADC"));
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_KW(madcblock_connect_obj, 2, madcblock_connect);
+
+mp_int_t madcblock_read_helper(madcblock_obj_t *self, adc_channel_t channel_id) {
+    int raw;
+    if (self->unit_id == ADC_UNIT_1) {
+        raw = adc1_get_raw(channel_id);
+    } else {
+        check_esp_err(adc2_get_raw(channel_id, self->width, &raw));
+    }
+    return raw;
+}
+
+mp_int_t madcblock_read_uv_helper(madcblock_obj_t *self, adc_channel_t channel_id, adc_atten_t atten) {
+    int raw = madcblock_read_helper(self, channel_id);
+    esp_adc_cal_characteristics_t *adc_chars = self->characteristics[atten];
+    if (adc_chars == NULL) {
+        adc_chars = malloc(sizeof(esp_adc_cal_characteristics_t));
+        esp_adc_cal_characterize(self->unit_id, atten, self->width, DEFAULT_VREF, adc_chars);
+        self->characteristics[atten] = adc_chars;
+    }
+    mp_int_t uv = esp_adc_cal_raw_to_voltage(raw, adc_chars) * 1000;
+    return uv;
+}
+
+STATIC const mp_rom_map_elem_t madcblock_locals_dict_table[] = {
+    { MP_ROM_QSTR(MP_QSTR_init), MP_ROM_PTR(&madcblock_init_obj) },
+    { MP_ROM_QSTR(MP_QSTR_connect), MP_ROM_PTR(&madcblock_connect_obj) },
+};
+STATIC MP_DEFINE_CONST_DICT(madcblock_locals_dict, madcblock_locals_dict_table);
+
+const mp_obj_type_t machine_adcblock_type = {
+    { &mp_type_type },
+    .name = MP_QSTR_ADCBlock,
+    .print = madcblock_print,
+    .make_new = madcblock_make_new,
+    .locals_dict = (mp_obj_t)&madcblock_locals_dict,
+};
diff --git a/ports/esp32/machine_adcblock.h b/ports/esp32/machine_adcblock.h
new file mode 100644
index 0000000000000..0500726d71791
--- /dev/null
+++ b/ports/esp32/machine_adcblock.h
@@ -0,0 +1,20 @@
+#ifndef MICROPY_INCLUDED_MACHINE_ADCBLOCK_H
+#define MICROPY_INCLUDED_MACHINE_ADCBLOCK_H
+
+#include "esp_adc_cal.h"
+
+typedef struct _madcblock_obj_t {
+    mp_obj_base_t base;
+    adc_unit_t unit_id;
+    mp_int_t bits;
+    adc_bits_width_t width;
+    esp_adc_cal_characteristics_t *characteristics[ADC_ATTEN_MAX];
+} madcblock_obj_t;
+
+extern madcblock_obj_t madcblock_obj[];
+
+extern void madcblock_bits_helper(madcblock_obj_t *self, mp_int_t bits);
+extern mp_int_t madcblock_read_helper(madcblock_obj_t *self, adc_channel_t channel_id);
+extern mp_int_t madcblock_read_uv_helper(madcblock_obj_t *self, adc_channel_t channel_id, adc_atten_t atten);
+
+#endif // MICROPY_INCLUDED_MACHINE_ADCBLOCK_H
diff --git a/ports/esp32/main/CMakeLists.txt b/ports/esp32/main/CMakeLists.txt
index 68a4815d7e525..c86ac4dadfaf0 100644
--- a/ports/esp32/main/CMakeLists.txt
+++ b/ports/esp32/main/CMakeLists.txt
@@ -59,6 +59,7 @@ set(MICROPY_SOURCE_PORT
     ${PROJECT_DIR}/machine_pin.c
     ${PROJECT_DIR}/machine_touchpad.c
     ${PROJECT_DIR}/machine_adc.c
+    ${PROJECT_DIR}/machine_adcblock.c
     ${PROJECT_DIR}/machine_dac.c
     ${PROJECT_DIR}/machine_i2c.c
     ${PROJECT_DIR}/machine_i2s.c
@@ -98,6 +99,7 @@ set(IDF_COMPONENTS
     bootloader_support
     bt
     driver
+    esp_adc_cal
     esp_common
     esp_eth
     esp_event
diff --git a/ports/esp32/modmachine.c b/ports/esp32/modmachine.c
index cca2015729161..dfe2435ec2f3e 100644
--- a/ports/esp32/modmachine.c
+++ b/ports/esp32/modmachine.c
@@ -297,6 +297,7 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_TouchPad), MP_ROM_PTR(&machine_touchpad_type) },
     #endif
     { MP_ROM_QSTR(MP_QSTR_ADC), MP_ROM_PTR(&machine_adc_type) },
+    { MP_ROM_QSTR(MP_QSTR_ADCBlock), MP_ROM_PTR(&machine_adcblock_type) },
     #if MICROPY_PY_MACHINE_DAC
     { MP_ROM_QSTR(MP_QSTR_DAC), MP_ROM_PTR(&machine_dac_type) },
     #endif
diff --git a/ports/esp32/modmachine.h b/ports/esp32/modmachine.h
index c773f8dbc9b3d..4d2ab9020d16f 100644
--- a/ports/esp32/modmachine.h
+++ b/ports/esp32/modmachine.h
@@ -14,6 +14,7 @@ extern const mp_obj_type_t machine_wdt_type;
 extern const mp_obj_type_t machine_pin_type;
 extern const mp_obj_type_t machine_touchpad_type;
 extern const mp_obj_type_t machine_adc_type;
+extern const mp_obj_type_t machine_adcblock_type;
 extern const mp_obj_type_t machine_dac_type;
 extern const mp_obj_type_t machine_hw_i2c_type;
 extern const mp_obj_type_t machine_hw_spi_type;

From 357078504d0d2c3a3f06ec4bd69e0ab3bcf9e016 Mon Sep 17 00:00:00 2001
From: jason <jason@noisybox.net>
Date: Wed, 12 May 2021 21:10:06 -0700
Subject: [PATCH 1608/3533] esp32: Pin MicroPython to core 1 again.

This follows up on #5489, where we changed the esp32 core pinning to core 0
in order to work around an issue with IDF < 4.2.0.  Now that IDF > 4.2.0 is
available, we allow pinning back to core 1, which eliminates some
problematic callback latency with WiFi enabled.

NimBLE is also pinned to core 1 - the same core as MicroPython - when using
IDF >=4.2.
---
 ports/esp32/CMakeLists.txt                | 13 +++++++++++--
 ports/esp32/boards/sdkconfig.ble          |  8 --------
 ports/esp32/boards/sdkconfig.nimble_core0 |  6 ++++++
 ports/esp32/boards/sdkconfig.nimble_core1 |  6 ++++++
 ports/esp32/mphalport.h                   | 11 ++++++++---
 5 files changed, 31 insertions(+), 13 deletions(-)
 create mode 100644 ports/esp32/boards/sdkconfig.nimble_core0
 create mode 100644 ports/esp32/boards/sdkconfig.nimble_core1

diff --git a/ports/esp32/CMakeLists.txt b/ports/esp32/CMakeLists.txt
index 29409adc7414f..8b2f09a7241b7 100644
--- a/ports/esp32/CMakeLists.txt
+++ b/ports/esp32/CMakeLists.txt
@@ -18,12 +18,22 @@ if(NOT EXISTS ${MICROPY_BOARD_DIR}/mpconfigboard.cmake)
     message(FATAL_ERROR "Invalid MICROPY_BOARD specified: ${MICROPY_BOARD}")
 endif()
 
+# Include main IDF cmake file.
+include($ENV{IDF_PATH}/tools/cmake/project.cmake)
+
 # Define the output sdkconfig so it goes in the build directory.
 set(SDKCONFIG ${CMAKE_BINARY_DIR}/sdkconfig)
 
 # Include board config; this is expected to set SDKCONFIG_DEFAULTS (among other options).
 include(${MICROPY_BOARD_DIR}/mpconfigboard.cmake)
 
+# Add sdkconfig fragments that depend on the IDF version.
+if(IDF_VERSION_MAJOR EQUAL 4 AND IDF_VERSION_MINOR LESS 2)
+    set(SDKCONFIG_DEFAULTS ${SDKCONFIG_DEFAULTS} boards/sdkconfig.nimble_core0)
+else()
+    set(SDKCONFIG_DEFAULTS ${SDKCONFIG_DEFAULTS} boards/sdkconfig.nimble_core1)
+endif()
+
 # Concatenate all sdkconfig files into a combined one for the IDF to use.
 file(WRITE ${CMAKE_BINARY_DIR}/sdkconfig.combined.in "")
 foreach(SDKCONFIG_DEFAULT ${SDKCONFIG_DEFAULTS})
@@ -33,6 +43,5 @@ endforeach()
 configure_file(${CMAKE_BINARY_DIR}/sdkconfig.combined.in ${CMAKE_BINARY_DIR}/sdkconfig.combined COPYONLY)
 set(SDKCONFIG_DEFAULTS ${CMAKE_BINARY_DIR}/sdkconfig.combined)
 
-# Include main IDF cmake file and define the project.
-include($ENV{IDF_PATH}/tools/cmake/project.cmake)
+# Define the project.
 project(micropython)
diff --git a/ports/esp32/boards/sdkconfig.ble b/ports/esp32/boards/sdkconfig.ble
index 5565fd81a8432..08d5e481f4993 100644
--- a/ports/esp32/boards/sdkconfig.ble
+++ b/ports/esp32/boards/sdkconfig.ble
@@ -7,11 +7,3 @@ CONFIG_BTDM_CTRL_MODE_BTDM=
 CONFIG_BT_NIMBLE_ENABLED=y
 
 CONFIG_BT_NIMBLE_MAX_CONNECTIONS=4
-
-# Pin to the same core as MP.
-# Until we move to IDF 4.2+, we need NimBLE on core 0, and for synchronisation
-# with the ringbuffer and scheduler MP needs to be on the same core.
-# See https://github.com/micropython/micropython/issues/5489
-CONFIG_BT_NIMBLE_PINNED_TO_CORE_0=y
-CONFIG_BT_NIMBLE_PINNED_TO_CORE_1=n
-CONFIG_BT_NIMBLE_PINNED_TO_CORE=0
diff --git a/ports/esp32/boards/sdkconfig.nimble_core0 b/ports/esp32/boards/sdkconfig.nimble_core0
new file mode 100644
index 0000000000000..cacaff1197cb3
--- /dev/null
+++ b/ports/esp32/boards/sdkconfig.nimble_core0
@@ -0,0 +1,6 @@
+# For IDF <4.2, we need NimBLE on core 0, and for synchronisation
+# with the ringbuffer and scheduler MP needs to be on the same core.
+# See https://github.com/micropython/micropython/issues/5489
+CONFIG_BT_NIMBLE_PINNED_TO_CORE_0=y
+CONFIG_BT_NIMBLE_PINNED_TO_CORE_1=n
+CONFIG_BT_NIMBLE_PINNED_TO_CORE=0
diff --git a/ports/esp32/boards/sdkconfig.nimble_core1 b/ports/esp32/boards/sdkconfig.nimble_core1
new file mode 100644
index 0000000000000..33653cc4b164c
--- /dev/null
+++ b/ports/esp32/boards/sdkconfig.nimble_core1
@@ -0,0 +1,6 @@
+# For IDF >=4.2, we are able to put NimBLE on core 1, and for synchronisation
+# with the ringbuffer and scheduler MP needs to be on the same core.
+# MP on core 1 prevents interference with WiFi for time sensitive operations.
+CONFIG_BT_NIMBLE_PINNED_TO_CORE_0=n
+CONFIG_BT_NIMBLE_PINNED_TO_CORE_1=y
+CONFIG_BT_NIMBLE_PINNED_TO_CORE=1
diff --git a/ports/esp32/mphalport.h b/ports/esp32/mphalport.h
index 01c14ad7001f9..c838bd228420d 100644
--- a/ports/esp32/mphalport.h
+++ b/ports/esp32/mphalport.h
@@ -38,10 +38,15 @@
 #define MICROPY_PLATFORM_VERSION "IDF" IDF_VER
 
 // The core that the MicroPython task(s) are pinned to.
-// Until we move to IDF 4.2+, we need NimBLE on core 0, and for synchronisation
-// with the ringbuffer and scheduler MP needs to be on the same core.
-// See https://github.com/micropython/micropython/issues/5489
+// Now that we have IDF 4.2.0+, we are once again able to pin to core 1
+// and avoid the Wifi/BLE timing problems on the same core.
+// Best effort here to remain backwards compatible in rare version edge cases...
+// See https://github.com/micropython/micropython/issues/5489 for history
+#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(4, 2, 0)
+#define MP_TASK_COREID (1)
+#else
 #define MP_TASK_COREID (0)
+#endif
 
 extern TaskHandle_t mp_main_task_handle;
 

From 648656dbbd841aae129628487a71037236aac739 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sat, 22 Jan 2022 00:02:27 +1100
Subject: [PATCH 1609/3533] esp32/esp32_rmt: Call rmt_driver_install directly
 if running on core 1.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/esp32_rmt.c | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/ports/esp32/esp32_rmt.c b/ports/esp32/esp32_rmt.c
index 639e0467a86c8..ca751d42a8cac 100644
--- a/ports/esp32/esp32_rmt.c
+++ b/ports/esp32/esp32_rmt.c
@@ -60,16 +60,18 @@ typedef struct _esp32_rmt_obj_t {
     bool loop_en;
 } esp32_rmt_obj_t;
 
+// Current channel used for machine.bitstream, in the machine_bitstream_high_low_rmt
+// implementation.  A value of -1 means do not use RMT.
+int8_t esp32_rmt_bitstream_channel_id = RMT_CHANNEL_MAX - 1;
+
+#if MP_TASK_COREID == 0
+
 typedef struct _rmt_install_state_t {
     SemaphoreHandle_t handle;
     uint8_t channel_id;
     esp_err_t ret;
 } rmt_install_state_t;
 
-// Current channel used for machine.bitstream, in the machine_bitstream_high_low_rmt
-// implementation.  A value of -1 means do not use RMT.
-int8_t esp32_rmt_bitstream_channel_id = RMT_CHANNEL_MAX - 1;
-
 STATIC void rmt_install_task(void *pvParameter) {
     rmt_install_state_t *state = pvParameter;
     state->ret = rmt_driver_install(state->channel_id, 0, 0);
@@ -92,6 +94,16 @@ esp_err_t rmt_driver_install_core1(uint8_t channel_id) {
     return state.ret;
 }
 
+#else
+
+// MicroPython runs on core 1, so we can call the RMT installer directly and its
+// interrupt handler will also run on core 1.
+esp_err_t rmt_driver_install_core1(uint8_t channel_id) {
+    return rmt_driver_install(channel_id, 0, 0);
+}
+
+#endif
+
 STATIC mp_obj_t esp32_rmt_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_id,        MP_ARG_REQUIRED | MP_ARG_INT, {.u_int = -1} },

From 23b1a4e0b6c6f538d6622359aba0740dfe14c44d Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sat, 22 Jan 2022 00:46:12 +1100
Subject: [PATCH 1610/3533] esp32/main: Allocate at most 1/2 of available IDF
 heap for MP heap.

So that there is some memory left for the OS, eg for ssl buffers.

See issue #7214.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/main.c | 33 +++++++++++++++++----------------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/ports/esp32/main.c b/ports/esp32/main.c
index c9b033d626bd2..d21dc9f753d2b 100644
--- a/ports/esp32/main.c
+++ b/ports/esp32/main.c
@@ -97,11 +97,12 @@ void mp_task(void *pvParameter) {
     #endif
     machine_init();
 
-    // TODO: CONFIG_SPIRAM_SUPPORT is for 3.3 compatibility, remove after move to 4.0.
-    #if CONFIG_ESP32_SPIRAM_SUPPORT || CONFIG_SPIRAM_SUPPORT
-    // Try to use the entire external SPIRAM directly for the heap
     size_t mp_task_heap_size;
-    void *mp_task_heap = (void *)SOC_EXTRAM_DATA_LOW;
+    void *mp_task_heap = NULL;
+
+    #if CONFIG_ESP32_SPIRAM_SUPPORT
+    // Try to use the entire external SPIRAM directly for the heap
+    mp_task_heap = (void *)SOC_EXTRAM_DATA_LOW;
     switch (esp_spiram_get_chip_size()) {
         case ESP_SPIRAM_SIZE_16MBITS:
             mp_task_heap_size = 2 * 1024 * 1024;
@@ -112,28 +113,28 @@ void mp_task(void *pvParameter) {
             break;
         default:
             // No SPIRAM, fallback to normal allocation
-            mp_task_heap_size = heap_caps_get_largest_free_block(MALLOC_CAP_8BIT);
-            mp_task_heap = malloc(mp_task_heap_size);
+            mp_task_heap = NULL;
             break;
     }
     #elif CONFIG_ESP32S2_SPIRAM_SUPPORT || CONFIG_ESP32S3_SPIRAM_SUPPORT
     // Try to use the entire external SPIRAM directly for the heap
-    size_t mp_task_heap_size;
     size_t esp_spiram_size = esp_spiram_get_size();
-    void *mp_task_heap = (void *)SOC_EXTRAM_DATA_HIGH - esp_spiram_size;
     if (esp_spiram_size > 0) {
+        mp_task_heap = (void *)SOC_EXTRAM_DATA_HIGH - esp_spiram_size;
         mp_task_heap_size = esp_spiram_size;
-    } else {
-        // No SPIRAM, fallback to normal allocation
-        mp_task_heap_size = heap_caps_get_largest_free_block(MALLOC_CAP_8BIT);
-        mp_task_heap = malloc(mp_task_heap_size);
     }
-    #else
-    // Allocate the uPy heap using malloc and get the largest available region
-    size_t mp_task_heap_size = heap_caps_get_largest_free_block(MALLOC_CAP_8BIT);
-    void *mp_task_heap = malloc(mp_task_heap_size);
     #endif
 
+    if (mp_task_heap == NULL) {
+        // Allocate the uPy heap using malloc and get the largest available region,
+        // limiting to 1/2 total available memory to leave memory for the OS.
+        mp_task_heap_size = MIN(
+            heap_caps_get_largest_free_block(MALLOC_CAP_8BIT),
+            heap_caps_get_total_size(MALLOC_CAP_8BIT) / 2
+            );
+        mp_task_heap = malloc(mp_task_heap_size);
+    }
+
 soft_reset:
     // initialise the stack pointer for the main thread
     mp_stack_set_top((void *)sp);

From 6a10d3ed99cf63a2505536862734db726008ccfd Mon Sep 17 00:00:00 2001
From: Sean Coates <sean@seancoates.com>
Date: Fri, 14 Jan 2022 17:28:29 -0500
Subject: [PATCH 1611/3533] esp32/README.md: Fix URL for esp-idf installation.

The current URL points to a pinned version of the document (v4.0.2) and is
currently not found (404).
---
 ports/esp32/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/esp32/README.md b/ports/esp32/README.md
index 42cd588171303..4524696899063 100644
--- a/ports/esp32/README.md
+++ b/ports/esp32/README.md
@@ -32,7 +32,7 @@ Currently MicroPython supports v4.0.2, v4.1.1 and v4.2,
 although other IDF v4 versions may also work.
 
 To install the ESP-IDF the full instructions can be found at the
-[Espressif Getting Started guide](https://docs.espressif.com/projects/esp-idf/en/v4.0.2/get-started/index.html#installation-step-by-step).
+[Espressif Getting Started guide](https://docs.espressif.com/projects/esp-idf/en/latest/esp32/get-started/index.html#installation-step-by-step).
 
 If you are on a Windows machine then the [Windows Subsystem for
 Linux](https://msdn.microsoft.com/en-au/commandline/wsl/install_guide) is the

From ac39960aa13d1c4d4c93f002463b1b462be015e0 Mon Sep 17 00:00:00 2001
From: marcidy <marcidy@gmail.com>
Date: Mon, 17 Jan 2022 20:41:23 -0800
Subject: [PATCH 1612/3533] esp32/modnetwork: Fix test for WIFI_AUTH_MAX for
 IDF v4.3.0.

Signed-off-by: marcidy <marcidy@gmail.com>
---
 ports/esp32/modnetwork.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/esp32/modnetwork.c b/ports/esp32/modnetwork.c
index a16c67eeb9ab0..206fecbcf9856 100644
--- a/ports/esp32/modnetwork.c
+++ b/ports/esp32/modnetwork.c
@@ -212,7 +212,7 @@ STATIC mp_obj_t esp_phy_mode(size_t n_args, const mp_obj_t *args) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(esp_phy_mode_obj, 0, 1, esp_phy_mode);
 
-#if ESP_IDF_VERSION > ESP_IDF_VERSION_VAL(4, 3, 0)
+#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(4, 3, 0)
 #define TEST_WIFI_AUTH_MAX 9
 #else
 #define TEST_WIFI_AUTH_MAX 8

From bb9d688454336591803858b769ce3ea23ab2df91 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sat, 22 Jan 2022 10:45:17 +1100
Subject: [PATCH 1613/3533] esp32/main: Use heap_caps_get_info on IDF <4.1 to
 compute total heap.

heap_caps_get_total_size() is only available in IDF 4.1 and above.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/main.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/ports/esp32/main.c b/ports/esp32/main.c
index d21dc9f753d2b..e25e6fdd1c1a8 100644
--- a/ports/esp32/main.c
+++ b/ports/esp32/main.c
@@ -128,10 +128,14 @@ void mp_task(void *pvParameter) {
     if (mp_task_heap == NULL) {
         // Allocate the uPy heap using malloc and get the largest available region,
         // limiting to 1/2 total available memory to leave memory for the OS.
-        mp_task_heap_size = MIN(
-            heap_caps_get_largest_free_block(MALLOC_CAP_8BIT),
-            heap_caps_get_total_size(MALLOC_CAP_8BIT) / 2
-            );
+        #if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(4, 1, 0)
+        size_t heap_total = heap_caps_get_total_size(MALLOC_CAP_8BIT);
+        #else
+        multi_heap_info_t info;
+        heap_caps_get_info(&info, MALLOC_CAP_8BIT);
+        size_t heap_total = info.total_free_bytes + info.total_allocated_bytes;
+        #endif
+        mp_task_heap_size = MIN(heap_caps_get_largest_free_block(MALLOC_CAP_8BIT), heap_total / 2);
         mp_task_heap = malloc(mp_task_heap_size);
     }
 

From ea5744fd8decb1161a2bd212813a275e2705fd89 Mon Sep 17 00:00:00 2001
From: ubi de feo <me@ubidefeo.com>
Date: Thu, 20 Jan 2022 07:07:06 +0100
Subject: [PATCH 1614/3533] esp32/boards: Provide custom deploy_c3.md for
 ESP32-C3 boards.

This fixes the flash address for installation on ESP32-C3.
---
 ports/esp32/boards/GENERIC_C3/board.json     |  2 +-
 ports/esp32/boards/GENERIC_C3_USB/board.json |  2 +-
 ports/esp32/boards/deploy_c3.md              | 14 ++++++++++++++
 3 files changed, 16 insertions(+), 2 deletions(-)
 create mode 100644 ports/esp32/boards/deploy_c3.md

diff --git a/ports/esp32/boards/GENERIC_C3/board.json b/ports/esp32/boards/GENERIC_C3/board.json
index 481e66bccdf99..6cc326bf1430e 100644
--- a/ports/esp32/boards/GENERIC_C3/board.json
+++ b/ports/esp32/boards/GENERIC_C3/board.json
@@ -1,6 +1,6 @@
 {
     "deploy": [
-        "../deploy.md"
+        "../deploy_c3.md"
     ],
     "docs": "",
     "features": [
diff --git a/ports/esp32/boards/GENERIC_C3_USB/board.json b/ports/esp32/boards/GENERIC_C3_USB/board.json
index 94d86d4428975..23f9a8eb2023b 100644
--- a/ports/esp32/boards/GENERIC_C3_USB/board.json
+++ b/ports/esp32/boards/GENERIC_C3_USB/board.json
@@ -1,6 +1,6 @@
 {
     "deploy": [
-        "../deploy.md"
+        "../deploy_c3.md"
     ],
     "docs": "",
     "features": [
diff --git a/ports/esp32/boards/deploy_c3.md b/ports/esp32/boards/deploy_c3.md
new file mode 100644
index 0000000000000..016ba7cabb3ad
--- /dev/null
+++ b/ports/esp32/boards/deploy_c3.md
@@ -0,0 +1,14 @@
+Program your board using the esptool.py program, found [here](https://github.com/espressif/esptool).
+
+If you are putting MicroPython on your board for the first time then you should
+first erase the entire flash using:
+
+```bash
+esptool.py --chip esp32c3 --port /dev/ttyUSB0 erase_flash
+```
+
+From then on program the firmware starting at address 0x0:
+
+```bash
+esptool.py --chip esp32c3 --port /dev/ttyUSB0 --baud 460800 write_flash -z 0x0 esp32c3-20220117-v1.18.bin
+```

From 5f8eef4521866a072e27914d597c48e44a2c16e4 Mon Sep 17 00:00:00 2001
From: Jos Verlinde <jos_verlinde@hotmail.com>
Date: Wed, 19 Jan 2022 16:33:41 +0100
Subject: [PATCH 1615/3533] windows/README.md: Fix broken mingw link.

---
 ports/windows/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/windows/README.md b/ports/windows/README.md
index 713ea82b87a29..1fa8008910c3d 100644
--- a/ports/windows/README.md
+++ b/ports/windows/README.md
@@ -3,7 +3,7 @@ It is based on Unix port, and expected to remain so.
 The port requires additional testing, debugging, and patches. Please
 consider to contribute.
 
-All gcc-based builds use the gcc compiler from [Mingw-w64](mingw-w64.org),
+All gcc-based builds use the gcc compiler from [Mingw-w64](https://www.mingw-w64.org/),
 which is the advancement of the original mingw project. The latter is
 getting obsolete and is not actively supported by MicroPython.
 

From a9448c0a86d6d1f04e190d5c093ca93d9470b99a Mon Sep 17 00:00:00 2001
From: stijn <stijn@ignitron.net>
Date: Tue, 11 Jan 2022 17:25:06 +0100
Subject: [PATCH 1616/3533] all: Fix MICROPY_OBJ_REPR_D compilation with msvc.

---
 mpy-cross/mpconfigport.h     |  2 +-
 ports/windows/mpconfigport.h |  2 +-
 py/objfun.c                  | 10 +++++-----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/mpy-cross/mpconfigport.h b/mpy-cross/mpconfigport.h
index 8c716e958d69b..4c10afe9bb1fa 100644
--- a/mpy-cross/mpconfigport.h
+++ b/mpy-cross/mpconfigport.h
@@ -139,7 +139,7 @@ typedef long mp_off_t;
 #define MP_NOINLINE                 __declspec(noinline)
 #define MP_LIKELY(x)                (x)
 #define MP_UNLIKELY(x)              (x)
-#define MICROPY_PORT_CONSTANTS      { "dummy", 0 }
+#define MICROPY_PORT_CONSTANTS      { MP_ROM_QSTR(MP_QSTR_dummy), MP_ROM_PTR(NULL) }
 #ifdef _WIN64
 #define MP_SSIZE_MAX                _I64_MAX
 #else
diff --git a/ports/windows/mpconfigport.h b/ports/windows/mpconfigport.h
index 96405bc5d22b2..1aae5a7500265 100644
--- a/ports/windows/mpconfigport.h
+++ b/ports/windows/mpconfigport.h
@@ -244,7 +244,7 @@ extern const struct _mp_obj_module_t mp_module_time;
 #define MP_NOINLINE                 __declspec(noinline)
 #define MP_LIKELY(x)                (x)
 #define MP_UNLIKELY(x)              (x)
-#define MICROPY_PORT_CONSTANTS      { "dummy", 0 } // can't have zero-sized array
+#define MICROPY_PORT_CONSTANTS      { MP_ROM_QSTR(MP_QSTR_dummy), MP_ROM_PTR(NULL) } // can't have zero-sized array
 #ifdef _WIN64
 #define MP_SSIZE_MAX                _I64_MAX
 #else
diff --git a/py/objfun.c b/py/objfun.c
index d86a4d235a24a..85f531c88b513 100644
--- a/py/objfun.c
+++ b/py/objfun.c
@@ -410,7 +410,7 @@ mp_obj_t mp_obj_new_fun_bc(mp_obj_t def_args_in, mp_obj_t def_kw_args, const byt
 
 STATIC mp_obj_t fun_native_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
     MP_STACK_CHECK();
-    mp_obj_fun_bc_t *self = self_in;
+    mp_obj_fun_bc_t *self = MP_OBJ_TO_PTR(self_in);
     mp_call_fun_t fun = MICROPY_MAKE_POINTER_CALLABLE((void *)self->bytecode);
     return fun(self_in, n_args, n_kw, args);
 }
@@ -424,9 +424,9 @@ STATIC const mp_obj_type_t mp_type_fun_native = {
 };
 
 mp_obj_t mp_obj_new_fun_native(mp_obj_t def_args_in, mp_obj_t def_kw_args, const void *fun_data, const mp_uint_t *const_table) {
-    mp_obj_fun_bc_t *o = mp_obj_new_fun_bc(def_args_in, def_kw_args, (const byte *)fun_data, const_table);
+    mp_obj_fun_bc_t *o = MP_OBJ_TO_PTR(mp_obj_new_fun_bc(def_args_in, def_kw_args, (const byte *)fun_data, const_table));
     o->base.type = &mp_type_fun_native;
-    return o;
+    return MP_OBJ_FROM_PTR(o);
 }
 
 #endif // MICROPY_EMIT_NATIVE
@@ -494,7 +494,7 @@ STATIC mp_uint_t convert_obj_for_inline_asm(mp_obj_t obj) {
 }
 
 STATIC mp_obj_t fun_asm_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
-    mp_obj_fun_asm_t *self = self_in;
+    mp_obj_fun_asm_t *self = MP_OBJ_TO_PTR(self_in);
 
     mp_arg_check_num(n_args, n_kw, self->n_args, self->n_args, false);
 
@@ -537,7 +537,7 @@ mp_obj_t mp_obj_new_fun_asm(size_t n_args, const void *fun_data, mp_uint_t type_
     o->n_args = n_args;
     o->fun_data = fun_data;
     o->type_sig = type_sig;
-    return o;
+    return MP_OBJ_FROM_PTR(o);
 }
 
 #endif // MICROPY_EMIT_INLINE_ASM

From e0b8d6982713c78169ec882770e746f2c5f4bc30 Mon Sep 17 00:00:00 2001
From: stijn <stijn@ignitron.net>
Date: Wed, 12 Jan 2022 14:35:16 +0100
Subject: [PATCH 1617/3533] github/workflows: Show context for qemu-arm test
 failures.

Make it easier to see what went wrong in CI builds.
---
 .github/workflows/ports_qemu-arm.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ports_qemu-arm.yml b/.github/workflows/ports_qemu-arm.yml
index 8d144ca3cb7aa..0489a93d5ad16 100644
--- a/.github/workflows/ports_qemu-arm.yml
+++ b/.github/workflows/ports_qemu-arm.yml
@@ -24,4 +24,4 @@ jobs:
       run: source tools/ci.sh && ci_qemu_arm_build
     - name: Print failures
       if: failure()
-      run: grep --text "FAIL" ports/qemu-arm/build/console.out
+      run: grep --before-context=100 --text "FAIL" ports/qemu-arm/build/console.out

From dd6967202a734fce569127c07da7ed1e07ce8bc4 Mon Sep 17 00:00:00 2001
From: stijn <stijn@ignitron.net>
Date: Wed, 20 Nov 2019 13:38:33 +0100
Subject: [PATCH 1618/3533] py/modmath: Add math.tau, math.nan and math.inf
 constants.

Configurable by the new MICROPY_PY_MATH_CONSTANTS option.
---
 .../unix/variants/coverage/mpconfigvariant.h  |  1 +
 ports/unix/variants/dev/mpconfigvariant.h     |  1 +
 ports/windows/variants/dev/mpconfigvariant.h  |  1 +
 py/modmath.c                                  |  5 ++++
 py/mpconfig.h                                 |  5 ++++
 py/obj.h                                      | 30 +++++++++++++++++++
 py/objfloat.c                                 |  8 +++++
 tests/float/math_constants.py                 | 11 +++++++
 tests/float/math_constants_extra.py           | 17 +++++++++++
 9 files changed, 79 insertions(+)
 create mode 100644 tests/float/math_constants.py
 create mode 100644 tests/float/math_constants_extra.py

diff --git a/ports/unix/variants/coverage/mpconfigvariant.h b/ports/unix/variants/coverage/mpconfigvariant.h
index f033dddb10550..5ce40edbb9791 100644
--- a/ports/unix/variants/coverage/mpconfigvariant.h
+++ b/ports/unix/variants/coverage/mpconfigvariant.h
@@ -48,6 +48,7 @@
 #define MICROPY_PY_BUILTINS_HELP       (1)
 #define MICROPY_PY_BUILTINS_HELP_MODULES (1)
 #define MICROPY_PY_SYS_GETSIZEOF       (1)
+#define MICROPY_PY_MATH_CONSTANTS      (1)
 #define MICROPY_PY_MATH_FACTORIAL      (1)
 #define MICROPY_PY_URANDOM_EXTRA_FUNCS (1)
 #define MICROPY_PY_IO_BUFFEREDWRITER (1)
diff --git a/ports/unix/variants/dev/mpconfigvariant.h b/ports/unix/variants/dev/mpconfigvariant.h
index 54ad99323625b..35c24c5f005ca 100644
--- a/ports/unix/variants/dev/mpconfigvariant.h
+++ b/ports/unix/variants/dev/mpconfigvariant.h
@@ -33,6 +33,7 @@
 
 #define MICROPY_PY_BUILTINS_HELP                (1)
 #define MICROPY_PY_BUILTINS_HELP_MODULES        (1)
+#define MICROPY_PY_MATH_CONSTANTS               (1)
 #define MICROPY_PY_SYS_SETTRACE                 (1)
 #define MICROPY_PY_UOS_VFS                      (1)
 #define MICROPY_PY_URANDOM_EXTRA_FUNCS          (1)
diff --git a/ports/windows/variants/dev/mpconfigvariant.h b/ports/windows/variants/dev/mpconfigvariant.h
index 2da0977140381..1f205066f0f09 100644
--- a/ports/windows/variants/dev/mpconfigvariant.h
+++ b/ports/windows/variants/dev/mpconfigvariant.h
@@ -30,6 +30,7 @@
 
 #define MICROPY_PY_BUILTINS_HELP                (1)
 #define MICROPY_PY_BUILTINS_HELP_MODULES        (1)
+#define MICROPY_PY_MATH_CONSTANTS               (1)
 #define MICROPY_PY_SYS_SETTRACE                 (1)
 #define MICROPY_PERSISTENT_CODE_SAVE            (1)
 #define MICROPY_COMP_CONST                      (0)
diff --git a/py/modmath.c b/py/modmath.c
index ac9e0bbc449c6..8fc821c9d5911 100644
--- a/py/modmath.c
+++ b/py/modmath.c
@@ -371,6 +371,11 @@ STATIC const mp_rom_map_elem_t mp_module_math_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_math) },
     { MP_ROM_QSTR(MP_QSTR_e), mp_const_float_e },
     { MP_ROM_QSTR(MP_QSTR_pi), mp_const_float_pi },
+    #if MICROPY_PY_MATH_CONSTANTS
+    { MP_ROM_QSTR(MP_QSTR_tau), mp_const_float_tau },
+    { MP_ROM_QSTR(MP_QSTR_inf), mp_const_float_inf },
+    { MP_ROM_QSTR(MP_QSTR_nan), mp_const_float_nan },
+    #endif
     { MP_ROM_QSTR(MP_QSTR_sqrt), MP_ROM_PTR(&mp_math_sqrt_obj) },
     { MP_ROM_QSTR(MP_QSTR_pow), MP_ROM_PTR(&mp_math_pow_obj) },
     { MP_ROM_QSTR(MP_QSTR_exp), MP_ROM_PTR(&mp_math_exp_obj) },
diff --git a/py/mpconfig.h b/py/mpconfig.h
index c1a0bfc046f78..47779a67deaf0 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -1221,6 +1221,11 @@ typedef double mp_float_t;
 #define MICROPY_PY_MATH (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_CORE_FEATURES)
 #endif
 
+// Whether to provide all math module constants (Python 3.5+), or just pi and e.
+#ifndef MICROPY_PY_MATH_CONSTANTS
+#define MICROPY_PY_MATH_CONSTANTS (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
+#endif
+
 // Whether to provide special math functions: math.{erf,erfc,gamma,lgamma}
 #ifndef MICROPY_PY_MATH_SPECIAL_FUNCTIONS
 #define MICROPY_PY_MATH_SPECIAL_FUNCTIONS (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
diff --git a/py/obj.h b/py/obj.h
index 7730059e6ad11..b52ee0e2f4a19 100644
--- a/py/obj.h
+++ b/py/obj.h
@@ -104,8 +104,18 @@ static inline bool mp_obj_is_immediate_obj(mp_const_obj_t o) {
 #if MICROPY_PY_BUILTINS_FLOAT
 #define mp_const_float_e MP_ROM_PTR(&mp_const_float_e_obj)
 #define mp_const_float_pi MP_ROM_PTR(&mp_const_float_pi_obj)
+#if MICROPY_PY_MATH_CONSTANTS
+#define mp_const_float_tau MP_ROM_PTR(&mp_const_float_tau_obj)
+#define mp_const_float_inf MP_ROM_PTR(&mp_const_float_inf_obj)
+#define mp_const_float_nan MP_ROM_PTR(&mp_const_float_nan_obj)
+#endif
 extern const struct _mp_obj_float_t mp_const_float_e_obj;
 extern const struct _mp_obj_float_t mp_const_float_pi_obj;
+#if MICROPY_PY_MATH_CONSTANTS
+extern const struct _mp_obj_float_t mp_const_float_tau_obj;
+extern const struct _mp_obj_float_t mp_const_float_inf_obj;
+extern const struct _mp_obj_float_t mp_const_float_nan_obj;
+#endif
 
 #define mp_obj_is_float(o) mp_obj_is_type((o), &mp_type_float)
 mp_float_t mp_obj_float_get(mp_obj_t self_in);
@@ -139,8 +149,18 @@ static inline bool mp_obj_is_immediate_obj(mp_const_obj_t o) {
 #if MICROPY_PY_BUILTINS_FLOAT
 #define mp_const_float_e MP_ROM_PTR(&mp_const_float_e_obj)
 #define mp_const_float_pi MP_ROM_PTR(&mp_const_float_pi_obj)
+#if MICROPY_PY_MATH_CONSTANTS
+#define mp_const_float_tau MP_ROM_PTR(&mp_const_float_tau_obj)
+#define mp_const_float_inf MP_ROM_PTR(&mp_const_float_inf_obj)
+#define mp_const_float_nan MP_ROM_PTR(&mp_const_float_nan_obj)
+#endif
 extern const struct _mp_obj_float_t mp_const_float_e_obj;
 extern const struct _mp_obj_float_t mp_const_float_pi_obj;
+#if MICROPY_PY_MATH_CONSTANTS
+extern const struct _mp_obj_float_t mp_const_float_tau_obj;
+extern const struct _mp_obj_float_t mp_const_float_inf_obj;
+extern const struct _mp_obj_float_t mp_const_float_nan_obj;
+#endif
 
 #define mp_obj_is_float(o) mp_obj_is_type((o), &mp_type_float)
 mp_float_t mp_obj_float_get(mp_obj_t self_in);
@@ -162,6 +182,11 @@ static inline bool mp_obj_is_small_int(mp_const_obj_t o) {
 #if MICROPY_PY_BUILTINS_FLOAT
 #define mp_const_float_e MP_ROM_PTR((mp_obj_t)(((0x402df854 & ~3) | 2) + 0x80800000))
 #define mp_const_float_pi MP_ROM_PTR((mp_obj_t)(((0x40490fdb & ~3) | 2) + 0x80800000))
+#if MICROPY_PY_MATH_CONSTANTS
+#define mp_const_float_tau MP_ROM_PTR((mp_obj_t)(((0x40c90fdb & ~3) | 2) + 0x80800000))
+#define mp_const_float_inf MP_ROM_PTR((mp_obj_t)(((0x7f800000 & ~3) | 2) + 0x80800000))
+#define mp_const_float_nan MP_ROM_PTR((mp_obj_t)(((0xffc00000 & ~3) | 2) + 0x80800000))
+#endif
 
 static inline bool mp_obj_is_float(mp_const_obj_t o) {
     return (((mp_uint_t)(o)) & 3) == 2 && (((mp_uint_t)(o)) & 0xff800007) != 0x00000006;
@@ -226,6 +251,11 @@ static inline bool mp_obj_is_immediate_obj(mp_const_obj_t o) {
 
 #define mp_const_float_e {((mp_obj_t)((uint64_t)0x4005bf0a8b145769 + 0x8004000000000000))}
 #define mp_const_float_pi {((mp_obj_t)((uint64_t)0x400921fb54442d18 + 0x8004000000000000))}
+#if MICROPY_PY_MATH_CONSTANTS
+#define mp_const_float_tau {((mp_obj_t)((uint64_t)0x401921fb54442d18 + 0x8004000000000000))}
+#define mp_const_float_inf {((mp_obj_t)((uint64_t)0x7ff0000000000000 + 0x8004000000000000))}
+#define mp_const_float_nan {((mp_obj_t)((uint64_t)0xfff8000000000000 + 0x8004000000000000))}
+#endif
 
 static inline bool mp_obj_is_float(mp_const_obj_t o) {
     return ((uint64_t)(o) & 0xfffc000000000000) != 0;
diff --git a/py/objfloat.c b/py/objfloat.c
index 5194dba51ee6d..8ff2fa16c4c70 100644
--- a/py/objfloat.c
+++ b/py/objfloat.c
@@ -54,6 +54,14 @@ typedef struct _mp_obj_float_t {
 
 const mp_obj_float_t mp_const_float_e_obj = {{&mp_type_float}, (mp_float_t)M_E};
 const mp_obj_float_t mp_const_float_pi_obj = {{&mp_type_float}, (mp_float_t)M_PI};
+#if MICROPY_PY_MATH_CONSTANTS
+#ifndef NAN
+#error NAN macro is not defined
+#endif
+const mp_obj_float_t mp_const_float_tau_obj = {{&mp_type_float}, (mp_float_t)(2.0 * M_PI)};
+const mp_obj_float_t mp_const_float_inf_obj = {{&mp_type_float}, (mp_float_t)INFINITY};
+const mp_obj_float_t mp_const_float_nan_obj = {{&mp_type_float}, (mp_float_t)NAN};
+#endif
 
 #endif
 
diff --git a/tests/float/math_constants.py b/tests/float/math_constants.py
new file mode 100644
index 0000000000000..2e4c321052625
--- /dev/null
+++ b/tests/float/math_constants.py
@@ -0,0 +1,11 @@
+# Tests various constants of the math module.
+try:
+    import math
+    from math import exp, cos
+except ImportError:
+    print("SKIP")
+    raise SystemExit
+
+print(math.e == exp(1.0))
+
+print(cos(math.pi))
diff --git a/tests/float/math_constants_extra.py b/tests/float/math_constants_extra.py
new file mode 100644
index 0000000000000..dea49aef5a732
--- /dev/null
+++ b/tests/float/math_constants_extra.py
@@ -0,0 +1,17 @@
+# Tests constants of the math module available only with MICROPY_PY_MATH_CONSTANTS.
+try:
+    import math
+    from math import isnan
+
+    math.tau
+except (ImportError, AttributeError):
+    print("SKIP")
+    raise SystemExit
+
+print(math.tau == 2.0 * math.pi)
+
+print(math.inf == float("inf"))
+print(-math.inf == -float("inf"))
+
+print(isnan(math.nan))
+print(isnan(-math.nan))

From f3229590a9ce8286627f5763884328cdc970fa1d Mon Sep 17 00:00:00 2001
From: stijn <stijn@ignitron.net>
Date: Wed, 12 Jan 2022 14:38:45 +0100
Subject: [PATCH 1619/3533] tools/ci: Test math constants with
 MICROPY_OBJ_REPR_D.

---
 tools/ci.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/ci.sh b/tools/ci.sh
index d0c5948a8c317..0506a003147ba 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -467,7 +467,7 @@ function ci_unix_coverage_32bit_run_native_mpy_tests {
 
 function ci_unix_nanbox_build {
     # Use Python 2 to check that it can run the build scripts
-    ci_unix_build_helper PYTHON=python2 VARIANT=nanbox
+    ci_unix_build_helper PYTHON=python2 VARIANT=nanbox CFLAGS_EXTRA="-DMICROPY_PY_MATH_CONSTANTS=1"
     ci_unix_build_ffi_lib_helper gcc -m32
 }
 

From aafd8859e9f0a2b5cc49e41a50530fecec79a205 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sun, 23 Jan 2022 09:33:19 +1100
Subject: [PATCH 1620/3533] docs/differences: Update differences now that
 math.tau/inf/nan exist.

Signed-off-by: Damien George <damien@micropython.org>
---
 docs/differences/python_35.rst | 2 +-
 docs/differences/python_36.rst | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/differences/python_35.rst b/docs/differences/python_35.rst
index 84c38c9cc1b3c..2a4c119a45e64 100644
--- a/docs/differences/python_35.rst
+++ b/docs/differences/python_35.rst
@@ -97,7 +97,7 @@ Changes to built-in modules:
    +-----------------------------------------------------------------------------------------------------------+---------------+
    | `math <https://docs.python.org/3/whatsnew/3.5.html#math>`_                                                                |
    +-----------------------------------------------------------------------------------------------------------+---------------+
-   | Two new constants have been added to the math module: *inf* and *nan*.                                    |               |
+   | Two new constants have been added to the math module: *inf* and *nan*.                                    | Completed     |
    +-----------------------------------------------------------------------------------------------------------+---------------+
    | A new function *isclose()* provides a way to test for approximate equality.                               |               |
    +-----------------------------------------------------------------------------------------------------------+---------------+
diff --git a/docs/differences/python_36.rst b/docs/differences/python_36.rst
index 4ea8742243612..dec8c5943fd79 100644
--- a/docs/differences/python_36.rst
+++ b/docs/differences/python_36.rst
@@ -121,7 +121,7 @@ Changes to built-in modules:
   +--------------------------------------------------------------------------------------------------------------+----------------+
   | `math <https://docs.python.org/3.6/whatsnew/3.6.html#math>`_                                                                  |
   +--------------------------------------------------------------------------------------------------------------+----------------+
-  | The new math.tau (Ï„) constant has been added                                                                 |                |
+  | The new math.tau (Ï„) constant has been added                                                                 | Completed      |
   +--------------------------------------------------------------------------------------------------------------+----------------+
   | `os <https://docs.python.org/3.6/whatsnew/3.6.html#os>`_                                                                      |
   +--------------------------------------------------------------------------------------------------------------+----------------+

From 2e3a2785cdd5c63788cac7ec8b5d62105ecfe4aa Mon Sep 17 00:00:00 2001
From: Christian Decker <christian.decker@lookslikematrix.de>
Date: Sat, 15 Jan 2022 15:19:59 +0100
Subject: [PATCH 1621/3533] extmod/modubinascii: Add newline keyword to
 b2a_base64 function.

This allows encoding things (eg a Basic-Auth header for a request) without
slicing the \n from the string, which allocates additional memory.

Co-authored-by: David Lechner <david@lechnology.com>
---
 docs/library/binascii.rst            |  4 ++--
 extmod/modubinascii.c                | 22 ++++++++++++++++------
 tests/extmod/ubinascii_b2a_base64.py |  3 +++
 3 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/docs/library/binascii.rst b/docs/library/binascii.rst
index fc621a8abee24..6c02f019aaa58 100644
--- a/docs/library/binascii.rst
+++ b/docs/library/binascii.rst
@@ -31,8 +31,8 @@ Functions
    Conforms to `RFC 2045 s.6.8 <https://tools.ietf.org/html/rfc2045#section-6.8>`_.
    Returns a bytes object.
 
-.. function:: b2a_base64(data)
+.. function:: b2a_base64(data, *, newline=True)
 
    Encode binary data in base64 format, as in `RFC 3548
    <https://tools.ietf.org/html/rfc3548.html>`_. Returns the encoded data
-   followed by a newline character, as a bytes object.
+   followed by a newline character if newline is true, as a bytes object.
diff --git a/extmod/modubinascii.c b/extmod/modubinascii.c
index fab7717c4ebb5..b34f232c62936 100644
--- a/extmod/modubinascii.c
+++ b/extmod/modubinascii.c
@@ -165,12 +165,20 @@ STATIC mp_obj_t mod_binascii_a2b_base64(mp_obj_t data) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_binascii_a2b_base64_obj, mod_binascii_a2b_base64);
 
-STATIC mp_obj_t mod_binascii_b2a_base64(mp_obj_t data) {
+STATIC mp_obj_t mod_binascii_b2a_base64(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    enum { ARG_newline };
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_newline, MP_ARG_BOOL, {.u_bool = true} },
+    };
+
+    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
+    mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
+    uint8_t newline = args[ARG_newline].u_bool;
     mp_buffer_info_t bufinfo;
-    mp_get_buffer_raise(data, &bufinfo, MP_BUFFER_READ);
+    mp_get_buffer_raise(pos_args[0], &bufinfo, MP_BUFFER_READ);
 
     vstr_t vstr;
-    vstr_init_len(&vstr, ((bufinfo.len != 0) ? (((bufinfo.len - 1) / 3) + 1) * 4 : 0) + 1);
+    vstr_init_len(&vstr, ((bufinfo.len != 0) ? (((bufinfo.len - 1) / 3) + 1) * 4 : 0) + newline);
 
     // First pass, we convert input buffer to numeric base 64 values
     byte *in = bufinfo.buf, *out = (byte *)vstr.buf;
@@ -196,7 +204,7 @@ STATIC mp_obj_t mod_binascii_b2a_base64(mp_obj_t data) {
 
     // Second pass, we convert number base 64 values to actual base64 ascii encoding
     out = (byte *)vstr.buf;
-    for (mp_uint_t j = vstr.len - 1; j--;) {
+    for (mp_uint_t j = vstr.len - newline; j--;) {
         if (*out < 26) {
             *out += 'A';
         } else if (*out < 52) {
@@ -212,10 +220,12 @@ STATIC mp_obj_t mod_binascii_b2a_base64(mp_obj_t data) {
         }
         out++;
     }
-    *out = '\n';
+    if (newline) {
+        *out = '\n';
+    }
     return mp_obj_new_str_from_vstr(&mp_type_bytes, &vstr);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_binascii_b2a_base64_obj, mod_binascii_b2a_base64);
+STATIC MP_DEFINE_CONST_FUN_OBJ_KW(mod_binascii_b2a_base64_obj, 1, mod_binascii_b2a_base64);
 
 #if MICROPY_PY_UBINASCII_CRC32
 #include "lib/uzlib/tinf.h"
diff --git a/tests/extmod/ubinascii_b2a_base64.py b/tests/extmod/ubinascii_b2a_base64.py
index 9c100f972b4b2..3f92488969e93 100644
--- a/tests/extmod/ubinascii_b2a_base64.py
+++ b/tests/extmod/ubinascii_b2a_base64.py
@@ -20,3 +20,6 @@
 print(binascii.b2a_base64(b"\x7f\x80\xff"))
 print(binascii.b2a_base64(b"1234ABCDabcd"))
 print(binascii.b2a_base64(b"\x00\x00>"))  # convert into '+'
+
+print(binascii.b2a_base64(b"foobar", newline=True))
+print(binascii.b2a_base64(b"foobar", newline=False))

From c153bfd31137a4eebb8abc4ee41d3cf4a3a7f234 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sun, 23 Jan 2022 10:23:30 +1100
Subject: [PATCH 1622/3533] docs/differences: Update python_36 now that
 b2a_base64 accepts newline.

Signed-off-by: Damien George <damien@micropython.org>
---
 docs/differences/python_36.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/differences/python_36.rst b/docs/differences/python_36.rst
index dec8c5943fd79..edf6bef02300a 100644
--- a/docs/differences/python_36.rst
+++ b/docs/differences/python_36.rst
@@ -78,7 +78,7 @@ Changes to built-in modules:
   +--------------------------------------------------------------------------------------------------------------+----------------+
   | `binascii <https://docs.python.org/3.6/whatsnew/3.6.html#binascii>`_                                         |                |
   +--------------------------------------------------------------------------------------------------------------+----------------+
-  | The b2a_base64() function now accepts an optional newline keyword argument to control whether the newline    |                |
+  | The b2a_base64() function now accepts an optional newline keyword argument to control whether the newline    | Completed      |
   | character is appended to the return value                                                                    |                |
   +--------------------------------------------------------------------------------------------------------------+----------------+
   | `cmath <https://docs.python.org/3.6/whatsnew/3.6.html#cmath>`_                                               |                |

From 30b6ce86be384ac04566d8f7bbf67d5906d6f307 Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew@alelec.net>
Date: Mon, 13 Sep 2021 10:43:42 +1000
Subject: [PATCH 1623/3533] windows: Add micropython.schedule support.

---
 ports/windows/mpconfigport.h  | 12 ++++++++++++
 ports/windows/windows_mphal.c | 12 +++++++++---
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/ports/windows/mpconfigport.h b/ports/windows/mpconfigport.h
index 1aae5a7500265..88746744aeb9a 100644
--- a/ports/windows/mpconfigport.h
+++ b/ports/windows/mpconfigport.h
@@ -69,6 +69,9 @@
 #define MICROPY_MODULE_WEAK_LINKS   (1)
 #define MICROPY_MODULE_OVERRIDE_MAIN_IMPORT (1)
 #define MICROPY_CAN_OVERRIDE_BUILTINS (1)
+#ifndef MICROPY_ENABLE_SCHEDULER
+#define MICROPY_ENABLE_SCHEDULER    (1)
+#endif
 #define MICROPY_VFS_POSIX_FILE      (1)
 #define MICROPY_PY_FUNCTION_ATTRS   (1)
 #define MICROPY_PY_DESCRIPTORS      (1)
@@ -216,6 +219,15 @@ extern const struct _mp_obj_module_t mp_module_time;
 
 #define MICROPY_MPHALPORT_H         "windows_mphal.h"
 
+#if MICROPY_ENABLE_SCHEDULER
+#define MICROPY_EVENT_POLL_HOOK \
+    do { \
+        extern void mp_handle_pending(bool); \
+        mp_handle_pending(true); \
+        mp_hal_delay_us(500); \
+    } while (0);
+#endif
+
 // We need to provide a declaration/definition of alloca()
 #include <malloc.h>
 
diff --git a/ports/windows/windows_mphal.c b/ports/windows/windows_mphal.c
index 7a3d881a34430..5398e2da51061 100644
--- a/ports/windows/windows_mphal.c
+++ b/ports/windows/windows_mphal.c
@@ -262,8 +262,14 @@ uint64_t mp_hal_time_ns(void) {
     return (uint64_t)tv.tv_sec * 1000000000ULL + (uint64_t)tv.tv_usec * 1000ULL;
 }
 
-// TODO: POSIX et al. define usleep() as guaranteedly capable only of 1s sleep:
-// "The useconds argument shall be less than one million."
 void mp_hal_delay_ms(mp_uint_t ms) {
-    usleep((ms) * 1000);
+    #ifdef MICROPY_EVENT_POLL_HOOK
+    mp_uint_t start = mp_hal_ticks_ms();
+    while (mp_hal_ticks_ms() - start < ms) {
+        // MICROPY_EVENT_POLL_HOOK does mp_hal_delay_us(500) (i.e. usleep(500)).
+        MICROPY_EVENT_POLL_HOOK
+    }
+    #else
+    SleepEx(ms, TRUE);
+    #endif
 }

From 79a3158de6dbd0b8f628fbf8cd5ffdeeea37bb6e Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 27 Jan 2022 16:36:08 +1100
Subject: [PATCH 1624/3533] stm32/pin: Change remaining uses of "af" to "alt".

The keyword "af" has been deprecated for some time and "alt" should be used
instead (but "af" still works).

Signed-off-by: Damien George <damien@micropython.org>
---
 docs/library/pyb.Pin.rst | 10 +++++-----
 ports/stm32/pin.c        | 10 +++++-----
 ports/stm32/timer.c      |  6 +++---
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/docs/library/pyb.Pin.rst b/docs/library/pyb.Pin.rst
index 97dfbffbcfb99..23ede48ed3b3c 100644
--- a/docs/library/pyb.Pin.rst
+++ b/docs/library/pyb.Pin.rst
@@ -237,17 +237,17 @@ pin X3.
 For the pyboard, x3_af would contain:
     [Pin.AF1_TIM2, Pin.AF2_TIM5, Pin.AF3_TIM9, Pin.AF7_USART2]
 
-Normally, each peripheral would configure the af automatically, but sometimes
-the same function is available on multiple pins, and having more control
-is desired.
+Normally, each peripheral would configure the alternate function automatically,
+but sometimes the same function is available on multiple pins, and having more
+control is desired.
 
 To configure X3 to expose TIM2_CH3, you could use::
 
-   pin = pyb.Pin(pyb.Pin.board.X3, mode=pyb.Pin.AF_PP, af=pyb.Pin.AF1_TIM2)
+   pin = pyb.Pin(pyb.Pin.board.X3, mode=pyb.Pin.AF_PP, alt=pyb.Pin.AF1_TIM2)
 
 or::
 
-   pin = pyb.Pin(pyb.Pin.board.X3, mode=pyb.Pin.AF_PP, af=1)
+   pin = pyb.Pin(pyb.Pin.board.X3, mode=pyb.Pin.AF_PP, alt=1)
 
 Methods
 -------
diff --git a/ports/stm32/pin.c b/ports/stm32/pin.c
index ad153311e3792..b490a09b7faa7 100644
--- a/ports/stm32/pin.c
+++ b/ports/stm32/pin.c
@@ -230,9 +230,9 @@ STATIC void pin_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t
             mp_uint_t af_idx = pin_get_af(self);
             const pin_af_obj_t *af_obj = pin_find_af_by_index(self, af_idx);
             if (af_obj == NULL) {
-                mp_printf(print, ", af=%d)", af_idx);
+                mp_printf(print, ", alt=%d)", af_idx);
             } else {
-                mp_printf(print, ", af=Pin.%q)", af_obj->name);
+                mp_printf(print, ", alt=Pin.%q)", af_obj->name);
             }
         } else {
             mp_print_str(print, ")");
@@ -328,7 +328,7 @@ STATIC mp_obj_t pin_debug(size_t n_args, const mp_obj_t *args) {
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pin_debug_fun_obj, 1, 2, pin_debug);
 STATIC MP_DEFINE_CONST_CLASSMETHOD_OBJ(pin_debug_obj, MP_ROM_PTR(&pin_debug_fun_obj));
 
-// init(mode, pull=None, af=-1, *, value, alt)
+// init(mode, pull=None, alt=-1, *, value, alt)
 STATIC mp_obj_t pin_obj_init_helper(const pin_obj_t *self, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_mode, MP_ARG_REQUIRED | MP_ARG_INT },
@@ -625,9 +625,9 @@ const mp_obj_type_t pin_type = {
 /// is desired.
 ///
 /// To configure X3 to expose TIM2_CH3, you could use:
-///    pin = pyb.Pin(pyb.Pin.board.X3, mode=pyb.Pin.AF_PP, af=pyb.Pin.AF1_TIM2)
+///    pin = pyb.Pin(pyb.Pin.board.X3, mode=pyb.Pin.AF_PP, alt=pyb.Pin.AF1_TIM2)
 /// or:
-///    pin = pyb.Pin(pyb.Pin.board.X3, mode=pyb.Pin.AF_PP, af=1)
+///    pin = pyb.Pin(pyb.Pin.board.X3, mode=pyb.Pin.AF_PP, alt=1)
 
 /// \method __str__()
 /// Return a string describing the alternate function.
diff --git a/ports/stm32/timer.c b/ports/stm32/timer.c
index c23e7e02d4b1e..5a968ec56d28c 100644
--- a/ports/stm32/timer.c
+++ b/ports/stm32/timer.c
@@ -1110,14 +1110,14 @@ STATIC mp_obj_t pyb_timer_channel(size_t n_args, const mp_obj_t *pos_args, mp_ma
         const pin_obj_t *pin = MP_OBJ_TO_PTR(pin_obj);
         const pin_af_obj_t *af = pin_find_af(pin, AF_FN_TIM, self->tim_id);
         if (af == NULL) {
-            mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("Pin(%q) doesn't have an af for Timer(%d)"), pin->name, self->tim_id);
+            mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("Pin(%q) doesn't have an alt for Timer(%d)"), pin->name, self->tim_id);
         }
-        // pin.init(mode=AF_PP, af=idx)
+        // pin.init(mode=AF_PP, alt=idx)
         const mp_obj_t args2[6] = {
             MP_OBJ_FROM_PTR(&pin_init_obj),
             pin_obj,
             MP_OBJ_NEW_QSTR(MP_QSTR_mode),  MP_OBJ_NEW_SMALL_INT(GPIO_MODE_AF_PP),
-            MP_OBJ_NEW_QSTR(MP_QSTR_af),    MP_OBJ_NEW_SMALL_INT(af->idx)
+            MP_OBJ_NEW_QSTR(MP_QSTR_alt),   MP_OBJ_NEW_SMALL_INT(af->idx)
         };
         mp_call_method_n_kw(0, 2, args2);
     }

From e1a84a0c6f7ddc0335b4a78a2ea3bcc5f2176965 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 27 Jan 2022 16:38:14 +1100
Subject: [PATCH 1625/3533] esp32/partitions: Increase size of app-part from
 0x180000 to 0x1F0000.

To fill out all of the available flash up to the start of the filesystem
partition.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/partitions-16MiB.csv | 2 +-
 ports/esp32/partitions.csv       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/esp32/partitions-16MiB.csv b/ports/esp32/partitions-16MiB.csv
index 20d06bad4773e..ee3e8c7269a46 100644
--- a/ports/esp32/partitions-16MiB.csv
+++ b/ports/esp32/partitions-16MiB.csv
@@ -3,5 +3,5 @@
 # Name,   Type, SubType, Offset,  Size, Flags
 nvs,      data, nvs,     0x9000,  0x6000,
 phy_init, data, phy,     0xf000,  0x1000,
-factory,  app,  factory, 0x10000, 0x180000,
+factory,  app,  factory, 0x10000, 0x1F0000,
 vfs,      data, fat,     0x200000, 0xD59F80,
diff --git a/ports/esp32/partitions.csv b/ports/esp32/partitions.csv
index d304dccc53ee9..53f0f167442bc 100644
--- a/ports/esp32/partitions.csv
+++ b/ports/esp32/partitions.csv
@@ -3,5 +3,5 @@
 # Name,   Type, SubType, Offset,  Size, Flags
 nvs,      data, nvs,     0x9000,  0x6000,
 phy_init, data, phy,     0xf000,  0x1000,
-factory,  app,  factory, 0x10000, 0x180000,
+factory,  app,  factory, 0x10000, 0x1F0000,
 vfs,      data, fat,     0x200000, 0x200000,

From 2dd3d88409937908da6ee05d2d391453df9a3c8a Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Thu, 16 Dec 2021 22:10:50 +0100
Subject: [PATCH 1626/3533] mimxrt: Support gaps in the SPI an I2C device
 numbers.

That allows also to use e.g. SPI1 and SPI2 instead SPI0 and SPI1.
---
 ports/mimxrt/machine_i2c.c | 2 +-
 ports/mimxrt/machine_spi.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/mimxrt/machine_i2c.c b/ports/mimxrt/machine_i2c.c
index 618d0a2581cd1..58dd824490f97 100644
--- a/ports/mimxrt/machine_i2c.c
+++ b/ports/mimxrt/machine_i2c.c
@@ -109,7 +109,7 @@ mp_obj_t machine_i2c_make_new(const mp_obj_type_t *type, size_t n_args, size_t n
 
     // Get I2C bus.
     int i2c_id = mp_obj_get_int(args[ARG_id].u_obj);
-    if (i2c_id < 0 || i2c_id >= MICROPY_HW_I2C_NUM) {
+    if (i2c_id < 0 || i2c_id >= MICROPY_HW_I2C_NUM || i2c_index_table[i2c_id] == 0) {
         mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("I2C(%d) doesn't exist"), i2c_id);
     }
 
diff --git a/ports/mimxrt/machine_spi.c b/ports/mimxrt/machine_spi.c
index 41843b06d9eae..c7ee226bfc0ef 100644
--- a/ports/mimxrt/machine_spi.c
+++ b/ports/mimxrt/machine_spi.c
@@ -137,7 +137,7 @@ mp_obj_t machine_spi_make_new(const mp_obj_type_t *type, size_t n_args, size_t n
 
     // Get the SPI bus id.
     int spi_id = mp_obj_get_int(args[ARG_id].u_obj);
-    if (spi_id < 0 || spi_id >= MP_ARRAY_SIZE(spi_index_table)) {
+    if (spi_id < 0 || spi_id >= MP_ARRAY_SIZE(spi_index_table) || spi_index_table[spi_id] == 0) {
         mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("SPI(%d) doesn't exist"), spi_id);
     }
 

From 84b76e4fbff86abb1abd340dd25d38c73d619132 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Fri, 17 Dec 2021 16:29:26 +0100
Subject: [PATCH 1627/3533] mimxrt: Allow for board-specific flash driver
 files.

If in a board's mkconfigboard.mk the following symbol is set:

MICROPY_HW_BOARD_FLASH_FILES = 1

then the files:

($BOARD)_flexspi_flash_config.h  and
qspi_nor_flash_config.c  and/or
qspi_hyper_flash_config.c

are expected in the board directory. Otherwise the common files from
the hal directory are used.
---
 ports/mimxrt/Makefile                      | 22 ++++++++++++++++++++--
 ports/mimxrt/hal/flexspi_hyper_flash.h     |  2 +-
 ports/mimxrt/hal/flexspi_nor_flash.h       |  2 +-
 ports/mimxrt/hal/qspi_hyper_flash_config.c |  2 +-
 ports/mimxrt/hal/qspi_nor_flash_config.c   |  2 +-
 5 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/ports/mimxrt/Makefile b/ports/mimxrt/Makefile
index 32b1145230738..2881c7c767012 100644
--- a/ports/mimxrt/Makefile
+++ b/ports/mimxrt/Makefile
@@ -95,6 +95,8 @@ ifeq ($(MICROPY_HW_FLASH_TYPE), qspi_nor)
 CFLAGS += -DBOARD_FLASH_OPS_HEADER_H=\"hal/flexspi_nor_flash.h\"
 else ifeq ($(MICROPY_HW_FLASH_TYPE), hyperflash)
 CFLAGS += -DBOARD_FLASH_OPS_HEADER_H=\"hal/flexspi_hyper_flash.h\"
+else
+$(error Error: Unknown board flash type $(MICROPY_HW_FLASH_TYPE))
 endif
 
 ifeq ($(MICROPY_PY_MACHINE_SDCARD),1)
@@ -272,6 +274,22 @@ SRC_C += \
 	$(SRC_HAL_IMX_C) \
 	$(SRC_ETH_C) \
 
+ifeq ($(MICROPY_HW_BOARD_FLASH_FILES), 1)
+CFLAGS += -DBOARD_FLASH_CONFIG_HEADER_H=\"$(BOARD)_flexspi_flash_config.h\"
+
+ifeq ($(MICROPY_HW_FLASH_TYPE), qspi_nor)
+SRC_C += \
+	hal/flexspi_nor_flash.c \
+	$(BOARD_DIR)/qspi_nor_flash_config.c
+else ifeq ($(MICROPY_HW_FLASH_TYPE), hyperflash)
+SRC_C += \
+	hal/flexspi_hyper_flash.c \
+	$(BOARD_DIR)/qspi_hyper_flash_config.c
+endif
+
+else
+
+CFLAGS += -DBOARD_FLASH_CONFIG_HEADER_H=\"hal/flexspi_flash_config.h\"
 
 ifeq ($(MICROPY_HW_FLASH_TYPE), qspi_nor)
 SRC_C += \
@@ -281,8 +299,8 @@ else ifeq ($(MICROPY_HW_FLASH_TYPE), hyperflash)
 SRC_C += \
 	hal/flexspi_hyper_flash.c \
 	hal/qspi_hyper_flash_config.c
-else
-$(error Error: Unknown board flash type $(MICROPY_HW_FLASH_TYPE))
+endif
+
 endif
 
 ifeq ($(MICROPY_FLOAT_IMPL),double)
diff --git a/ports/mimxrt/hal/flexspi_hyper_flash.h b/ports/mimxrt/hal/flexspi_hyper_flash.h
index f340aec10a3e5..dbd028fd6f718 100644
--- a/ports/mimxrt/hal/flexspi_hyper_flash.h
+++ b/ports/mimxrt/hal/flexspi_hyper_flash.h
@@ -28,7 +28,7 @@
 
 #include "fsl_flexspi.h"
 #include "mpconfigboard.h"
-#include "flexspi_flash_config.h"
+#include BOARD_FLASH_CONFIG_HEADER_H
 
 // Defined in boards flash_config.c
 extern flexspi_nor_config_t qspiflash_config;
diff --git a/ports/mimxrt/hal/flexspi_nor_flash.h b/ports/mimxrt/hal/flexspi_nor_flash.h
index c2c30876c7d77..f8c31488a9883 100644
--- a/ports/mimxrt/hal/flexspi_nor_flash.h
+++ b/ports/mimxrt/hal/flexspi_nor_flash.h
@@ -28,7 +28,7 @@
 
 #include "fsl_flexspi.h"
 #include "mpconfigboard.h"
-#include "flexspi_flash_config.h"
+#include BOARD_FLASH_CONFIG_HEADER_H
 
 // Defined in boards flash_config.c
 extern flexspi_nor_config_t qspiflash_config;
diff --git a/ports/mimxrt/hal/qspi_hyper_flash_config.c b/ports/mimxrt/hal/qspi_hyper_flash_config.c
index 17a952b68962f..f5ffbe8413a7d 100644
--- a/ports/mimxrt/hal/qspi_hyper_flash_config.c
+++ b/ports/mimxrt/hal/qspi_hyper_flash_config.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include "flexspi_flash_config.h"
+#include BOARD_FLASH_CONFIG_HEADER_H
 
 /* Component ID definition, used by tools. */
 #ifndef FSL_COMPONENT_ID
diff --git a/ports/mimxrt/hal/qspi_nor_flash_config.c b/ports/mimxrt/hal/qspi_nor_flash_config.c
index f42730ad54d5e..469a584b877a4 100644
--- a/ports/mimxrt/hal/qspi_nor_flash_config.c
+++ b/ports/mimxrt/hal/qspi_nor_flash_config.c
@@ -7,7 +7,7 @@
 
 // Based on tinyusb/hw/bsp/teensy_40/evkmimxrt1010_flexspi_nor_config.c
 
-#include "flexspi_flash_config.h"
+#include BOARD_FLASH_CONFIG_HEADER_H
 
 /* Component ID definition, used by tools. */
 #ifndef FSL_COMPONENT_ID

From b8a0358c34bf4786b416a18f1d25ac2ab23d1704 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Mon, 27 Dec 2021 13:46:56 +0100
Subject: [PATCH 1628/3533] mimxrt: Compensate for a bug in the fsl_lpspi.c
 file.

This library file has a bug, in that TransferBlocking returns before the
transfer has finished. That is a problem if a write follows immediately
a read.
---
 ports/mimxrt/machine_spi.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/ports/mimxrt/machine_spi.c b/ports/mimxrt/machine_spi.c
index c7ee226bfc0ef..db2fab4ee684d 100644
--- a/ports/mimxrt/machine_spi.c
+++ b/ports/mimxrt/machine_spi.c
@@ -230,7 +230,7 @@ void LPSPI_EDMAMasterCallback(LPSPI_Type *base, lpspi_master_edma_handle_t *hand
 STATIC void machine_spi_transfer(mp_obj_base_t *self_in, size_t len, const uint8_t *src, uint8_t *dest) {
     machine_spi_obj_t *self = (machine_spi_obj_t *)self_in;
     // Use DMA for large transfers if channels are available
-    const size_t dma_min_size_threshold = 16;  // That's the FIFO size
+    const size_t dma_min_size_threshold = FSL_FEATURE_LPSPI_FIFO_SIZEn(0);  // The Macro argument is ignored
 
     int chan_tx = -1;
     int chan_rx = -1;
@@ -302,6 +302,10 @@ STATIC void machine_spi_transfer(mp_obj_base_t *self_in, size_t len, const uint8
     }
 
     if (!use_dma) {
+        // Wait until a previous Transfer is finished
+        while (LPSPI_GetTxFifoCount(self->spi_inst) > 0) {
+            MICROPY_EVENT_POLL_HOOK
+        }
         // Reconfigure the TCR, required after switch between DMA vs. non-DMA
         LPSPI_Enable(self->spi_inst, false);  // Disable first before new settings are applied
         self->spi_inst->TCR = LPSPI_TCR_CPOL(self->master_config->cpol) | LPSPI_TCR_CPHA(self->master_config->cpha) |

From 5bda84aed59be8ce75308abcb9562b6d015c69ef Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Wed, 29 Dec 2021 22:03:33 +0100
Subject: [PATCH 1629/3533] mimxrt: Remove two files from the Seeed Arch Mix
 directory.

These were leftovers from a previous refactoring in the Seeed Arch Mix
directory.
---
 .../SEEED_ARCH_MIX_flexspi_nor_config.h       | 258 ------------------
 .../SEEED_ARCH_MIX/qspi_nor_flash_config.c    | 136 ---------
 2 files changed, 394 deletions(-)
 delete mode 100644 ports/mimxrt/boards/SEEED_ARCH_MIX/SEEED_ARCH_MIX_flexspi_nor_config.h
 delete mode 100644 ports/mimxrt/boards/SEEED_ARCH_MIX/qspi_nor_flash_config.c

diff --git a/ports/mimxrt/boards/SEEED_ARCH_MIX/SEEED_ARCH_MIX_flexspi_nor_config.h b/ports/mimxrt/boards/SEEED_ARCH_MIX/SEEED_ARCH_MIX_flexspi_nor_config.h
deleted file mode 100644
index 33698a34d2f3b..0000000000000
--- a/ports/mimxrt/boards/SEEED_ARCH_MIX/SEEED_ARCH_MIX_flexspi_nor_config.h
+++ /dev/null
@@ -1,258 +0,0 @@
-/*
- * Copyright 2019 NXP.
- * All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-// Based on tinyusb/hw/bsp/teensy_40/evkmimxrt1020_flexspi_nor_config.h
-
-#ifndef __SEEED_ARCH_MIX_FLEXSPI_NOR_CONFIG__
-#define __SEEED_ARCH_MIX_FLEXSPI_NOR_CONFIG__
-
-#include <stdint.h>
-#include <stdbool.h>
-#include "fsl_common.h"
-
-/*! @name Driver version */
-/*@{*/
-/*! @brief XIP_BOARD driver version 2.0.0. */
-#define FSL_XIP_BOARD_DRIVER_VERSION (MAKE_VERSION(2, 0, 0))
-/*@}*/
-
-/* FLEXSPI memory config block related defintions */
-#define FLEXSPI_CFG_BLK_TAG (0x42464346UL)     // ascii "FCFB" Big Endian
-#define FLEXSPI_CFG_BLK_VERSION (0x56010400UL) // V1.4.0
-#define FLEXSPI_CFG_BLK_SIZE (512)
-
-/* FLEXSPI Feature related definitions */
-#define FLEXSPI_FEATURE_HAS_PARALLEL_MODE 1
-
-/* Lookup table related defintions */
-#define CMD_INDEX_READ 0
-#define CMD_INDEX_READSTATUS 1
-#define CMD_INDEX_WRITEENABLE 2
-#define CMD_INDEX_WRITE 4
-
-#define CMD_LUT_SEQ_IDX_READ 0
-#define CMD_LUT_SEQ_IDX_READSTATUS 1
-#define CMD_LUT_SEQ_IDX_WRITEENABLE 3
-#define CMD_LUT_SEQ_IDX_WRITE 9
-
-#define CMD_SDR 0x01
-#define CMD_DDR 0x21
-#define RADDR_SDR 0x02
-#define RADDR_DDR 0x22
-#define CADDR_SDR 0x03
-#define CADDR_DDR 0x23
-#define MODE1_SDR 0x04
-#define MODE1_DDR 0x24
-#define MODE2_SDR 0x05
-#define MODE2_DDR 0x25
-#define MODE4_SDR 0x06
-#define MODE4_DDR 0x26
-#define MODE8_SDR 0x07
-#define MODE8_DDR 0x27
-#define WRITE_SDR 0x08
-#define WRITE_DDR 0x28
-#define READ_SDR 0x09
-#define READ_DDR 0x29
-#define LEARN_SDR 0x0A
-#define LEARN_DDR 0x2A
-#define DATSZ_SDR 0x0B
-#define DATSZ_DDR 0x2B
-#define DUMMY_SDR 0x0C
-#define DUMMY_DDR 0x2C
-#define DUMMY_RWDS_SDR 0x0D
-#define DUMMY_RWDS_DDR 0x2D
-#define JMP_ON_CS 0x1F
-#define STOP 0
-
-#define FLEXSPI_1PAD 0
-#define FLEXSPI_2PAD 1
-#define FLEXSPI_4PAD 2
-#define FLEXSPI_8PAD 3
-
-#define FLEXSPI_LUT_SEQ(cmd0, pad0, op0, cmd1, pad1, op1)                                                              \
-    (FLEXSPI_LUT_OPERAND0(op0) | FLEXSPI_LUT_NUM_PADS0(pad0) | FLEXSPI_LUT_OPCODE0(cmd0) | FLEXSPI_LUT_OPERAND1(op1) | \
-    FLEXSPI_LUT_NUM_PADS1(pad1) | FLEXSPI_LUT_OPCODE1(cmd1))
-
-// !@brief Definitions for FlexSPI Serial Clock Frequency
-typedef enum _FlexSpiSerialClockFreq
-{
-    kFlexSpiSerialClk_30MHz  = 1,
-    kFlexSpiSerialClk_50MHz  = 2,
-    kFlexSpiSerialClk_60MHz  = 3,
-    kFlexSpiSerialClk_75MHz  = 4,
-    kFlexSpiSerialClk_80MHz  = 5,
-    kFlexSpiSerialClk_100MHz = 6,
-    kFlexSpiSerialClk_133MHz = 7,
-    kFlexSpiSerialClk_166MHz = 8,
-    kFlexSpiSerialClk_200MHz = 9,
-} flexspi_serial_clk_freq_t;
-
-// !@brief FlexSPI clock configuration type
-enum
-{
-    kFlexSpiClk_SDR, // !< Clock configure for SDR mode
-    kFlexSpiClk_DDR, // !< Clock configurat for DDR mode
-};
-
-// !@brief FlexSPI Read Sample Clock Source definition
-typedef enum _FlashReadSampleClkSource
-{
-    kFlexSPIReadSampleClk_LoopbackInternally      = 0,
-    kFlexSPIReadSampleClk_LoopbackFromDqsPad      = 1,
-    kFlexSPIReadSampleClk_LoopbackFromSckPad      = 2,
-    kFlexSPIReadSampleClk_ExternalInputFromDqsPad = 3,
-} flexspi_read_sample_clk_t;
-
-// !@brief Misc feature bit definitions
-enum
-{
-    kFlexSpiMiscOffset_DiffClkEnable            = 0, // !< Bit for Differential clock enable
-    kFlexSpiMiscOffset_Ck2Enable                = 1, // !< Bit for CK2 enable
-    kFlexSpiMiscOffset_ParallelEnable           = 2, // !< Bit for Parallel mode enable
-    kFlexSpiMiscOffset_WordAddressableEnable    = 3, // !< Bit for Word Addressable enable
-    kFlexSpiMiscOffset_SafeConfigFreqEnable     = 4, // !< Bit for Safe Configuration Frequency enable
-    kFlexSpiMiscOffset_PadSettingOverrideEnable = 5, // !< Bit for Pad setting override enable
-    kFlexSpiMiscOffset_DdrModeEnable            = 6, // !< Bit for DDR clock confiuration indication.
-};
-
-// !@brief Flash Type Definition
-enum
-{
-    kFlexSpiDeviceType_SerialNOR    = 1,    // !< Flash devices are Serial NOR
-    kFlexSpiDeviceType_SerialNAND   = 2,    // !< Flash devices are Serial NAND
-    kFlexSpiDeviceType_SerialRAM    = 3,    // !< Flash devices are Serial RAM/HyperFLASH
-    kFlexSpiDeviceType_MCP_NOR_NAND = 0x12, // !< Flash device is MCP device, A1 is Serial NOR, A2 is Serial NAND
-    kFlexSpiDeviceType_MCP_NOR_RAM  = 0x13, // !< Flash deivce is MCP device, A1 is Serial NOR, A2 is Serial RAMs
-};
-
-// !@brief Flash Pad Definitions
-enum
-{
-    kSerialFlash_1Pad  = 1,
-    kSerialFlash_2Pads = 2,
-    kSerialFlash_4Pads = 4,
-    kSerialFlash_8Pads = 8,
-};
-
-// !@brief FlexSPI LUT Sequence structure
-typedef struct _lut_sequence
-{
-    uint8_t seqNum; // !< Sequence Number, valid number: 1-16
-    uint8_t seqId;  // !< Sequence Index, valid number: 0-15
-    uint16_t reserved;
-} flexspi_lut_seq_t;
-
-// !@brief Flash Configuration Command Type
-enum
-{
-    kDeviceConfigCmdType_Generic,    // !< Generic command, for example: configure dummy cycles, drive strength, etc
-    kDeviceConfigCmdType_QuadEnable, // !< Quad Enable command
-    kDeviceConfigCmdType_Spi2Xpi,    // !< Switch from SPI to DPI/QPI/OPI mode
-    kDeviceConfigCmdType_Xpi2Spi,    // !< Switch from DPI/QPI/OPI to SPI mode
-    kDeviceConfigCmdType_Spi2NoCmd,  // !< Switch to 0-4-4/0-8-8 mode
-    kDeviceConfigCmdType_Reset,      // !< Reset device command
-};
-
-// !@brief FlexSPI Memory Configuration Block
-typedef struct _FlexSPIConfig
-{
-    uint32_t tag;               // !< [0x000-0x003] Tag, fixed value 0x42464346UL
-    uint32_t version;           // !< [0x004-0x007] Version,[31:24] -'V', [23:16] - Major, [15:8] - Minor, [7:0] - bugfix
-    uint32_t reserved0;         // !< [0x008-0x00b] Reserved for future use
-    uint8_t readSampleClkSrc;   // !< [0x00c-0x00c] Read Sample Clock Source, valid value: 0/1/3
-    uint8_t csHoldTime;         // !< [0x00d-0x00d] CS hold time, default value: 3
-    uint8_t csSetupTime;        // !< [0x00e-0x00e] CS setup time, default value: 3
-    uint8_t columnAddressWidth; // !< [0x00f-0x00f] Column Address with, for HyperBus protocol, it is fixed to 3, For
-    // ! Serial NAND, need to refer to datasheet
-    uint8_t deviceModeCfgEnable; // !< [0x010-0x010] Device Mode Configure enable flag, 1 - Enable, 0 - Disable
-    uint8_t deviceModeType; // !< [0x011-0x011] Specify the configuration command type:Quad Enable, DPI/QPI/OPI switch,
-    // ! Generic configuration, etc.
-    uint16_t waitTimeCfgCommands; // !< [0x012-0x013] Wait time for all configuration commands, unit: 100us, Used for
-    // ! DPI/QPI/OPI switch or reset command
-    flexspi_lut_seq_t deviceModeSeq; // !< [0x014-0x017] Device mode sequence info, [7:0] - LUT sequence id, [15:8] - LUt
-    // ! sequence number, [31:16] Reserved
-    uint32_t deviceModeArg;    // !< [0x018-0x01b] Argument/Parameter for device configuration
-    uint8_t configCmdEnable;   // !< [0x01c-0x01c] Configure command Enable Flag, 1 - Enable, 0 - Disable
-    uint8_t configModeType[3]; // !< [0x01d-0x01f] Configure Mode Type, similar as deviceModeTpe
-    flexspi_lut_seq_t
-        configCmdSeqs[3]; // !< [0x020-0x02b] Sequence info for Device Configuration command, similar as deviceModeSeq
-    uint32_t reserved1;   // !< [0x02c-0x02f] Reserved for future use
-    uint32_t configCmdArgs[3];     // !< [0x030-0x03b] Arguments/Parameters for device Configuration commands
-    uint32_t reserved2;            // !< [0x03c-0x03f] Reserved for future use
-    uint32_t controllerMiscOption; // !< [0x040-0x043] Controller Misc Options, see Misc feature bit definitions for more
-    // ! details
-    uint8_t deviceType;    // !< [0x044-0x044] Device Type:  See Flash Type Definition for more details
-    uint8_t sflashPadType; // !< [0x045-0x045] Serial Flash Pad Type: 1 - Single, 2 - Dual, 4 - Quad, 8 - Octal
-    uint8_t serialClkFreq; // !< [0x046-0x046] Serial Flash Frequencey, device specific definitions, See System Boot
-    // ! Chapter for more details
-    uint8_t lutCustomSeqEnable; // !< [0x047-0x047] LUT customization Enable, it is required if the program/erase cannot
-    // ! be done using 1 LUT sequence, currently, only applicable to HyperFLASH
-    uint32_t reserved3[2];           // !< [0x048-0x04f] Reserved for future use
-    uint32_t sflashA1Size;           // !< [0x050-0x053] Size of Flash connected to A1
-    uint32_t sflashA2Size;           // !< [0x054-0x057] Size of Flash connected to A2
-    uint32_t sflashB1Size;           // !< [0x058-0x05b] Size of Flash connected to B1
-    uint32_t sflashB2Size;           // !< [0x05c-0x05f] Size of Flash connected to B2
-    uint32_t csPadSettingOverride;   // !< [0x060-0x063] CS pad setting override value
-    uint32_t sclkPadSettingOverride; // !< [0x064-0x067] SCK pad setting override value
-    uint32_t dataPadSettingOverride; // !< [0x068-0x06b] data pad setting override value
-    uint32_t dqsPadSettingOverride;  // !< [0x06c-0x06f] DQS pad setting override value
-    uint32_t timeoutInMs;            // !< [0x070-0x073] Timeout threshold for read status command
-    uint32_t commandInterval;        // !< [0x074-0x077] CS deselect interval between two commands
-    uint16_t dataValidTime[2]; // !< [0x078-0x07b] CLK edge to data valid time for PORT A and PORT B, in terms of 0.1ns
-    uint16_t busyOffset;       // !< [0x07c-0x07d] Busy offset, valid value: 0-31
-    uint16_t busyBitPolarity;  // !< [0x07e-0x07f] Busy flag polarity, 0 - busy flag is 1 when flash device is busy, 1 -
-    // ! busy flag is 0 when flash device is busy
-    uint32_t lookupTable[64];           // !< [0x080-0x17f] Lookup table holds Flash command sequences
-    flexspi_lut_seq_t lutCustomSeq[12]; // !< [0x180-0x1af] Customizable LUT Sequences
-    uint32_t reserved4[4];              // !< [0x1b0-0x1bf] Reserved for future use
-} flexspi_mem_config_t;
-
-/*  */
-#define NOR_CMD_LUT_SEQ_IDX_READ_NORMAL 0
-#define NOR_CMD_LUT_SEQ_IDX_READSTATUSREG 1
-#define NOR_CMD_LUT_SEQ_IDX_READ_FAST_QUAD 2
-#define NOR_CMD_LUT_SEQ_IDX_WRITEENABLE 3
-#define NOR_CMD_LUT_SEQ_IDX_READSTATUS_XPI 4
-#define NOR_CMD_LUT_SEQ_IDX_ERASESECTOR 5
-#define NOR_CMD_LUT_SEQ_IDX_WRITESTATUSREG 6
-#define NOR_CMD_LUT_SEQ_IDX_PAGEPROGRAM_QUAD 7
-#define NOR_CMD_LUT_SEQ_IDX_READID 8
-#define NOR_CMD_LUT_SEQ_IDX_PAGEPROGRAM 9
-#define NOR_CMD_LUT_SEQ_IDX_ENTERQPI 10
-#define NOR_CMD_LUT_SEQ_IDX_CHIPERASE 11
-#define NOR_CMD_LUT_SEQ_IDX_EXITQPI 12
-
-/*
- *  Serial NOR configuration block
- */
-typedef struct _flexspi_nor_config
-{
-    flexspi_mem_config_t memConfig; // !< Common memory configuration info via FlexSPI
-    uint32_t pageSize;              // !< Page size of Serial NOR
-    uint32_t sectorSize;            // !< Sector size of Serial NOR
-    uint8_t ipcmdSerialClkFreq;     // !< Clock frequency for IP command
-    uint8_t isUniformBlockSize;     // !< Sector/Block size is the same
-    uint8_t reserved0[2];           // !< Reserved for future use
-    uint8_t serialNorType;          // !< Serial NOR Flash type: 0/1/2/3
-    uint8_t needExitNoCmdMode;      // !< Need to exit NoCmd mode before other IP command
-    uint8_t halfClkForNonReadCmd;   // !< Half the Serial Clock for non-read command: true/false
-    uint8_t needRestoreNoCmdMode;   // !< Need to Restore NoCmd mode after IP commmand execution
-    uint32_t blockSize;             // !< Block size
-    uint32_t reserve2[11];          // !< Reserved for future use
-} flexspi_nor_config_t;
-
-#define FLASH_BUSY_STATUS_POL 0
-#define FLASH_BUSY_STATUS_OFFSET 0
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* __SEEED_ARCH_MIX_FLEXSPI_NOR_CONFIG__ */
diff --git a/ports/mimxrt/boards/SEEED_ARCH_MIX/qspi_nor_flash_config.c b/ports/mimxrt/boards/SEEED_ARCH_MIX/qspi_nor_flash_config.c
deleted file mode 100644
index 7b2584d3de691..0000000000000
--- a/ports/mimxrt/boards/SEEED_ARCH_MIX/qspi_nor_flash_config.c
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * Copyright 2019 NXP.
- * All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-// Based on tinyusb/hw/bsp/teensy_40/evkmimxrt1010_flexspi_nor_config.c
-
-#include BOARD_FLASH_CONFIG_HEADER_H
-
-/* Component ID definition, used by tools. */
-#ifndef FSL_COMPONENT_ID
-#define FSL_COMPONENT_ID "platform.drivers.xip_board"
-#endif
-
-/*******************************************************************************
- * Code
- ******************************************************************************/
-#if defined(XIP_BOOT_HEADER_ENABLE) && (XIP_BOOT_HEADER_ENABLE == 1)
-#if defined(__ARMCC_VERSION) || defined(__GNUC__)
-__attribute__((section(".boot_hdr.conf")))
-#elif defined(__ICCARM__)
-#pragma location = ".boot_hdr.conf"
-#endif
-
-const flexspi_nor_config_t qspiflash_config = {
-    .memConfig =
-    {
-        .tag = FLEXSPI_CFG_BLK_TAG,
-        .version = FLEXSPI_CFG_BLK_VERSION,
-        .readSampleClkSrc = kFlexSPIReadSampleClk_LoopbackFromDqsPad,
-        .csHoldTime = 3u,
-        .csSetupTime = 3u,
-        .busyOffset = FLASH_BUSY_STATUS_OFFSET,         // Status bit 0 indicates busy.
-        .busyBitPolarity = FLASH_BUSY_STATUS_POL,       // Busy when the bit is 1.
-        .deviceModeCfgEnable = 1u,
-        .deviceModeType = kDeviceConfigCmdType_QuadEnable,
-        .deviceModeSeq = {
-            .seqId = 4u,
-            .seqNum = 1u,
-        },
-        .deviceModeArg = 0x40,
-        // Enable DDR mode, Wordaddassable, Safe configuration, Differential clock
-        .deviceType = kFlexSpiDeviceType_SerialNOR,
-        .sflashPadType = kSerialFlash_4Pads,
-        .serialClkFreq = kFlexSpiSerialClk_100MHz,
-        .sflashA1Size = BOARD_FLASH_SIZE,
-        .lookupTable =
-        {
-            // 0 Read LUTs 0 -> 0
-            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0xEB, RADDR_SDR, FLEXSPI_4PAD, 0x18),
-            FLEXSPI_LUT_SEQ(DUMMY_SDR, FLEXSPI_4PAD, 0x06, READ_SDR, FLEXSPI_4PAD, 0x04),
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-
-            // 1 Read status register -> 1
-            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x05, READ_SDR, FLEXSPI_1PAD, 0x01),
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-
-            // 2 Fast read quad mode - SDR
-            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x6B, RADDR_SDR, FLEXSPI_1PAD, 0x18),
-            FLEXSPI_LUT_SEQ(DUMMY_SDR, FLEXSPI_4PAD, 0x08, READ_SDR, FLEXSPI_4PAD, 0x04),
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-
-            // 3 Write Enable -> 3
-            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x06, STOP, FLEXSPI_1PAD, 0),
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-
-            // 4 Read extend parameters
-            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x81, READ_SDR, FLEXSPI_1PAD, 0x04),
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-
-            // 5 Erase Sector -> 5
-            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x20, RADDR_SDR, FLEXSPI_1PAD, 24),
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-
-            // 6 Write Status Reg
-            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x01, WRITE_SDR, FLEXSPI_1PAD, 0x04),
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-
-            // 7 Page Program - quad mode (-> 9)
-            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x32, RADDR_SDR, FLEXSPI_1PAD, 0x18),
-            FLEXSPI_LUT_SEQ(WRITE_SDR, FLEXSPI_4PAD, 0x04, STOP, FLEXSPI_1PAD, 0),
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-
-            // 8 Read ID
-            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x90, DUMMY_SDR, FLEXSPI_1PAD, 24),
-            FLEXSPI_LUT_SEQ(READ_SDR, FLEXSPI_1PAD, 0x00, 0, 0, 0),
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-
-            // 9 Page Program - single mode -> 9
-            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x02, RADDR_SDR, FLEXSPI_1PAD, 24),
-            FLEXSPI_LUT_SEQ(WRITE_SDR, FLEXSPI_1PAD, 0, 0, 0, 0),
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-
-            // 10 Enter QPI mode
-            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x35, STOP, FLEXSPI_1PAD, 0),
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-
-            // 11 Erase Chip
-            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_1PAD, 0x60, STOP, FLEXSPI_1PAD, 0),
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-
-            // 12 Exit QPI mode
-            FLEXSPI_LUT_SEQ(CMD_SDR, FLEXSPI_4PAD, 0xF5, STOP, FLEXSPI_1PAD, 0),
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-            FLEXSPI_LUT_SEQ(0, 0, 0, 0, 0, 0),         // Filler
-        },
-    },
-    .pageSize = 256u,
-    .sectorSize = 4u * 1024u,
-    .blockSize = 256u * 1024u,
-    .isUniformBlockSize = false,
-    // .ipcmdSerialClkFreq = kFlexSpiSerialClk_30MHz,
-};
-#endif /* XIP_BOOT_HEADER_ENABLE */

From 1dc366f90194789d9be1bd44dbca2376c75421dc Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sun, 2 Jan 2022 13:21:06 +0100
Subject: [PATCH 1630/3533] mimxrt: Replace Pin-config constants by a function
 call.

The Pin config setting by IOMUXC_SetPinConfig() is supplied by a
bit pattern. That pattern is specific for a MCU family. In preparation
for supporting the MIMXRT117x family, the constant bit pattern is
replaced by a function call, such that the bit pattern is created
at a single place. The code for this functions was taken from
machine_pin.c.

Note: A working port for the MIMXRT1176 exists already.
---
 ports/mimxrt/eth.c          |  6 ++-
 ports/mimxrt/machine_i2c.c  |  7 ++--
 ports/mimxrt/machine_pin.c  | 34 +---------------
 ports/mimxrt/machine_pwm.c  |  4 +-
 ports/mimxrt/machine_spi.c  |  8 ++--
 ports/mimxrt/machine_uart.c |  6 ++-
 ports/mimxrt/pin.c          | 80 +++++++++++++++++++++++++++++++++++++
 ports/mimxrt/pin.h          |  2 +
 ports/mimxrt/sdcard.c       | 26 +++++-------
 9 files changed, 111 insertions(+), 62 deletions(-)

diff --git a/ports/mimxrt/eth.c b/ports/mimxrt/eth.c
index 1a8210cb116b5..5a5138443cf3c 100644
--- a/ports/mimxrt/eth.c
+++ b/ports/mimxrt/eth.c
@@ -194,7 +194,8 @@ void eth_init(eth_t *self, int mac_idx, const phy_operations_t *phy_ops, int phy
     const machine_pin_af_obj_t *af_obj = pin_find_af(reset_pin, PIN_AF_MODE_ALT5);
 
     IOMUXC_SetPinMux(reset_pin->muxRegister, af_obj->af_mode, 0, 0, reset_pin->configRegister, 0U);
-    IOMUXC_SetPinConfig(reset_pin->muxRegister, af_obj->af_mode, 0, 0, reset_pin->configRegister, 0xB0A9U);
+    IOMUXC_SetPinConfig(reset_pin->muxRegister, af_obj->af_mode, 0, 0, reset_pin->configRegister,
+        pin_generate_config(PIN_PULL_DISABLED, PIN_MODE_OUT, PIN_DRIVE_POWER_5, reset_pin->configRegister));
     GPIO_PinInit(reset_pin->gpio, reset_pin->pin, &gpio_config);
     #endif
 
@@ -204,7 +205,8 @@ void eth_init(eth_t *self, int mac_idx, const phy_operations_t *phy_ops, int phy
     af_obj = pin_find_af(int_pin, PIN_AF_MODE_ALT5);
 
     IOMUXC_SetPinMux(int_pin->muxRegister, af_obj->af_mode, 0, 0, int_pin->configRegister, 0U);
-    IOMUXC_SetPinConfig(int_pin->muxRegister, af_obj->af_mode, 0, 0, int_pin->configRegister, 0xB0A9U);
+    IOMUXC_SetPinConfig(int_pin->muxRegister, af_obj->af_mode, 0, 0, int_pin->configRegister,
+        pin_generate_config(PIN_PULL_UP_47K, PIN_MODE_IN, PIN_DRIVE_POWER_5, int_pin->configRegister));
     GPIO_PinInit(int_pin->gpio, int_pin->pin, &gpio_config);
     #endif
 
diff --git a/ports/mimxrt/machine_i2c.c b/ports/mimxrt/machine_i2c.c
index 58dd824490f97..c64f46ff1b496 100644
--- a/ports/mimxrt/machine_i2c.c
+++ b/ports/mimxrt/machine_i2c.c
@@ -72,15 +72,14 @@ static const iomux_table_t iomux_table[] = { IOMUX_TABLE_I2C };
 
 bool lpi2c_set_iomux(int8_t hw_i2c, uint8_t drive) {
     int index = (hw_i2c - 1) * 2;
+    uint16_t pad_config = pin_generate_config(PIN_PULL_UP_100K, PIN_MODE_OPEN_DRAIN, drive, SCL.configRegister);
 
     if (SCL.muxRegister != 0) {
         IOMUXC_SetPinMux(SCL.muxRegister, SCL.muxMode, SCL.inputRegister, SCL.inputDaisy, SCL.configRegister, 1U);
-        IOMUXC_SetPinConfig(SCL.muxRegister, SCL.muxMode, SCL.inputRegister, SCL.inputDaisy, SCL.configRegister,
-            0xF880u | drive << IOMUXC_SW_PAD_CTL_PAD_DSE_SHIFT);
+        IOMUXC_SetPinConfig(SCL.muxRegister, SCL.muxMode, SCL.inputRegister, SCL.inputDaisy, SCL.configRegister, pad_config);
 
         IOMUXC_SetPinMux(SDA.muxRegister, SDA.muxMode, SDA.inputRegister, SDA.inputDaisy, SDA.configRegister, 1U);
-        IOMUXC_SetPinConfig(SDA.muxRegister, SDA.muxMode, SDA.inputRegister, SDA.inputDaisy, SDA.configRegister,
-            0xF880u | drive << IOMUXC_SW_PAD_CTL_PAD_DSE_SHIFT);
+        IOMUXC_SetPinConfig(SDA.muxRegister, SDA.muxMode, SDA.inputRegister, SDA.inputDaisy, SDA.configRegister, pad_config);
         return true;
     } else {
         return false;
diff --git a/ports/mimxrt/machine_pin.c b/ports/mimxrt/machine_pin.c
index 12975806d6559..1f4afab97f2c8 100644
--- a/ports/mimxrt/machine_pin.c
+++ b/ports/mimxrt/machine_pin.c
@@ -213,6 +213,7 @@ STATIC mp_obj_t machine_pin_obj_init_helper(const machine_pin_obj_t *self, size_
         const machine_pin_af_obj_t *af_obj;
         uint32_t pad_config = 0UL;
         uint8_t pull = PIN_PULL_DISABLED;
+        uint32_t drive = (uint32_t)args[PIN_INIT_ARG_DRIVE].u_int;
 
         // Generate pin configuration
         if ((args[PIN_INIT_ARG_VALUE].u_obj != MP_OBJ_NULL) && (mp_obj_is_true(args[PIN_INIT_ARG_VALUE].u_obj))) {
@@ -233,38 +234,7 @@ STATIC mp_obj_t machine_pin_obj_init_helper(const machine_pin_obj_t *self, size_
             pull = (uint8_t)mp_obj_get_int(args[PIN_INIT_ARG_PULL].u_obj);
         }
 
-        pad_config |= IOMUXC_SW_PAD_CTL_PAD_SRE(0U);  // Slow Slew Rate
-        pad_config |= IOMUXC_SW_PAD_CTL_PAD_SPEED(0b01);  // medium(100MHz)
-
-        if (mode == PIN_MODE_OPEN_DRAIN) {
-            pad_config |= IOMUXC_SW_PAD_CTL_PAD_ODE(0b1);  // Open Drain Enabled
-        } else {
-            pad_config |= IOMUXC_SW_PAD_CTL_PAD_ODE(0b0);  // Open Drain Disabled
-        }
-
-        if (pull == PIN_PULL_DISABLED) {
-            pad_config |= IOMUXC_SW_PAD_CTL_PAD_PKE(0); // Pull/Keeper Disabled
-        } else if (pull == PIN_PULL_HOLD) {
-            pad_config |= IOMUXC_SW_PAD_CTL_PAD_PKE(1) | // Pull/Keeper Enabled
-                IOMUXC_SW_PAD_CTL_PAD_PUE(0);            // Keeper selected
-        } else {
-            pad_config |= IOMUXC_SW_PAD_CTL_PAD_PKE(1) |  // Pull/Keeper Enabled
-                IOMUXC_SW_PAD_CTL_PAD_PUE(1) |            // Pull selected
-                IOMUXC_SW_PAD_CTL_PAD_PUS(pull);
-        }
-
-        if (mode == PIN_MODE_IN) {
-            pad_config |= IOMUXC_SW_PAD_CTL_PAD_DSE(0b000) |  // output driver disabled
-                IOMUXC_SW_PAD_CTL_PAD_HYS(1U);  // Hysteresis enabled
-        } else {
-            uint drive = args[PIN_INIT_ARG_DRIVE].u_int;
-            if (!IS_GPIO_DRIVE(drive)) {
-                mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("invalid drive strength: %d"), drive);
-            }
-
-            pad_config |= IOMUXC_SW_PAD_CTL_PAD_DSE(drive) |
-                IOMUXC_SW_PAD_CTL_PAD_HYS(0U);  // Hysteresis disabled
-        }
+        pad_config = pin_generate_config(pull, mode, drive, self->configRegister);
 
         // Configure PAD as GPIO
         IOMUXC_SetPinMux(self->muxRegister, af_obj->af_mode, 0, 0, self->configRegister, 1U);  // Software Input On Field: Input Path is determined by functionality
diff --git a/ports/mimxrt/machine_pwm.c b/ports/mimxrt/machine_pwm.c
index a13af0d80f1bf..c21c7eb94b249 100644
--- a/ports/mimxrt/machine_pwm.c
+++ b/ports/mimxrt/machine_pwm.c
@@ -518,7 +518,7 @@ STATIC mp_obj_t mp_machine_pwm_make_new(const mp_obj_type_t *type, size_t n_args
     IOMUXC_SetPinMux(pin1->muxRegister, af_obj1->af_mode, af_obj1->input_register, af_obj1->input_daisy,
         pin1->configRegister, 0U);
     IOMUXC_SetPinConfig(pin1->muxRegister, af_obj1->af_mode, af_obj1->input_register, af_obj1->input_daisy,
-        pin1->configRegister, 0x10B0U);
+        pin1->configRegister, pin_generate_config(PIN_PULL_DISABLED, PIN_MODE_OUT, PIN_DRIVE_POWER_5, pin1->configRegister));
 
     // Settings for the second pin, if given.
     if (pin2 != NULL && pin2 != pin1) {
@@ -529,7 +529,7 @@ STATIC mp_obj_t mp_machine_pwm_make_new(const mp_obj_type_t *type, size_t n_args
         IOMUXC_SetPinMux(pin2->muxRegister, af_obj2->af_mode, af_obj2->input_register, af_obj2->input_daisy,
             pin2->configRegister, 0U);
         IOMUXC_SetPinConfig(pin2->muxRegister, af_obj2->af_mode, af_obj2->input_register, af_obj2->input_daisy,
-            pin2->configRegister, 0x10B0U);
+            pin2->configRegister, pin_generate_config(PIN_PULL_DISABLED, PIN_MODE_OUT, PIN_DRIVE_POWER_5, pin2->configRegister));
     } else {
         self->complementary = 0;
     }
diff --git a/ports/mimxrt/machine_spi.c b/ports/mimxrt/machine_spi.c
index db2fab4ee684d..06c0278fb3a26 100644
--- a/ports/mimxrt/machine_spi.c
+++ b/ports/mimxrt/machine_spi.c
@@ -87,19 +87,19 @@ bool lpspi_set_iomux(int8_t spi, uint8_t drive) {
     if (SCK.muxRegister != 0) {
         IOMUXC_SetPinMux(SCK.muxRegister, SCK.muxMode, SCK.inputRegister, SCK.inputDaisy, SCK.configRegister, 0U);
         IOMUXC_SetPinConfig(SCK.muxRegister, SCK.muxMode, SCK.inputRegister, SCK.inputDaisy, SCK.configRegister,
-            0x1080u | drive << IOMUXC_SW_PAD_CTL_PAD_DSE_SHIFT);
+            pin_generate_config(PIN_PULL_UP_100K, PIN_MODE_OUT, drive, SCK.configRegister));
 
         IOMUXC_SetPinMux(CS0.muxRegister, CS0.muxMode, CS0.inputRegister, CS0.inputDaisy, CS0.configRegister, 0U);
         IOMUXC_SetPinConfig(CS0.muxRegister, CS0.muxMode, CS0.inputRegister, CS0.inputDaisy, CS0.configRegister,
-            0x1080u | drive << IOMUXC_SW_PAD_CTL_PAD_DSE_SHIFT);
+            pin_generate_config(PIN_PULL_UP_100K, PIN_MODE_OUT, drive, CS0.configRegister));
 
         IOMUXC_SetPinMux(SDO.muxRegister, SDO.muxMode, SDO.inputRegister, SDO.inputDaisy, SDO.configRegister, 0U);
         IOMUXC_SetPinConfig(SDO.muxRegister, SDO.muxMode, SDO.inputRegister, SDO.inputDaisy, SDO.configRegister,
-            0x1080u | drive << IOMUXC_SW_PAD_CTL_PAD_DSE_SHIFT);
+            pin_generate_config(PIN_PULL_UP_100K, PIN_MODE_OUT, drive, SDO.configRegister));
 
         IOMUXC_SetPinMux(SDI.muxRegister, SDI.muxMode, SDI.inputRegister, SDI.inputDaisy, SDI.configRegister, 0U);
         IOMUXC_SetPinConfig(SDI.muxRegister, SDI.muxMode, SDI.inputRegister, SDI.inputDaisy, SDI.configRegister,
-            0x1080u | drive << IOMUXC_SW_PAD_CTL_PAD_DSE_SHIFT);
+            pin_generate_config(PIN_PULL_UP_100K, PIN_MODE_IN, drive, SDI.configRegister));
 
         return true;
     } else {
diff --git a/ports/mimxrt/machine_uart.c b/ports/mimxrt/machine_uart.c
index 9aa8a0c7423af..6807a994e1a39 100644
--- a/ports/mimxrt/machine_uart.c
+++ b/ports/mimxrt/machine_uart.c
@@ -84,10 +84,12 @@ bool lpuart_set_iomux(int8_t uart) {
 
     if (TX.muxRegister != 0) {
         IOMUXC_SetPinMux(TX.muxRegister, TX.muxMode, TX.inputRegister, TX.inputDaisy, TX.configRegister, 0U);
-        IOMUXC_SetPinConfig(TX.muxRegister, TX.muxMode, TX.inputRegister, TX.inputDaisy, TX.configRegister, 0x10B0u);
+        IOMUXC_SetPinConfig(TX.muxRegister, TX.muxMode, TX.inputRegister, TX.inputDaisy, TX.configRegister,
+            pin_generate_config(PIN_PULL_UP_100K, PIN_MODE_OUT, PIN_DRIVE_POWER_6, TX.configRegister));
 
         IOMUXC_SetPinMux(RX.muxRegister, RX.muxMode, RX.inputRegister, RX.inputDaisy, RX.configRegister, 0U);
-        IOMUXC_SetPinConfig(RX.muxRegister, RX.muxMode, RX.inputRegister, RX.inputDaisy, RX.configRegister, 0x10B0u);
+        IOMUXC_SetPinConfig(RX.muxRegister, RX.muxMode, RX.inputRegister, RX.inputDaisy, RX.configRegister,
+            pin_generate_config(PIN_PULL_UP_100K, PIN_MODE_IN, PIN_DRIVE_POWER_6, RX.configRegister));
         return true;
     } else {
         return false;
diff --git a/ports/mimxrt/pin.c b/ports/mimxrt/pin.c
index 964fb537b8c72..e4136bd1c3a1a 100644
--- a/ports/mimxrt/pin.c
+++ b/ports/mimxrt/pin.c
@@ -62,6 +62,86 @@ uint32_t pin_get_af(const machine_pin_obj_t *pin) {
     return (uint32_t)(mux_register & IOMUXC_SW_MUX_CTL_PAD_MUX_MODE_MASK) >> IOMUXC_SW_MUX_CTL_PAD_MUX_MODE_SHIFT;
 }
 
+uint32_t pin_generate_config(const uint32_t pull, const uint32_t mode, const uint32_t drive, uint32_t config_register) {
+    uint32_t pad_config = 0x0UL;
+
+    #if defined MIMXRT117x_SERIES
+
+    // Set Pull-up
+    if ((config_register >= 0x400E8350 && config_register <= 0x400E83dc) ||   // GPIO_AD_xx
+        (config_register >= 0x40C08040 && config_register <= 0x40C0807C)) {   // GPIO_LPSR_xx
+        pad_config |= IOMUXC_SW_PAD_CTL_PAD_SRE(0U); // Set slew rate; there is a discrepancy between doc and header file
+        if (pull != PIN_PULL_DISABLED) {
+            pad_config |= IOMUXC_SW_PAD_CTL_PAD_PUE(1) | // Pull Enabled
+                IOMUXC_SW_PAD_CTL_PAD_PUS(pull != PIN_PULL_DOWN_100K); // Up or DOWn
+        }
+    } else { // GPIO_SD_Bx_xx
+        if (pull == PIN_PULL_DISABLED) {
+            pad_config |= IOMUXC_SW_PAD_CTL_PAD_PULL(0b11);
+        } else if (pull == PIN_PULL_DOWN_100K) {
+            pad_config |= IOMUXC_SW_PAD_CTL_PAD_PULL(0b10);
+        } else {
+            pad_config |= IOMUXC_SW_PAD_CTL_PAD_PULL(0b01);
+        }
+    }
+    // Set open Drain; different for LPSR GPIO!
+    if (config_register >= 0x40C08040 && config_register <= 0x40C0807C) {  // GPIO_LPSR_xx
+        if (mode == PIN_MODE_OPEN_DRAIN) {
+            pad_config |= 1 << 5;  // Open Drain Enabled, no Macro provided
+        }
+    } else {
+        if (mode == PIN_MODE_OPEN_DRAIN) {
+            pad_config |= IOMUXC_SW_PAD_CTL_PAD_ODE(0b1);  // Open Drain Enabled
+        }
+    }
+    // Set drive strength
+    if (mode != PIN_MODE_IN) {
+        if (!IS_GPIO_DRIVE(drive)) {
+            mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("invalid drive strength: %d"), drive);
+        }
+        pad_config |= IOMUXC_SW_PAD_CTL_PAD_DSE(drive >= PIN_DRIVE_POWER_4);
+    }
+
+    #else
+
+    pad_config |= IOMUXC_SW_PAD_CTL_PAD_SRE(0U);      // Slow Slew Rate
+    pad_config |= IOMUXC_SW_PAD_CTL_PAD_SPEED(0b01);      // medium(100MHz)
+
+    if (mode == PIN_MODE_OPEN_DRAIN) {
+        pad_config |= IOMUXC_SW_PAD_CTL_PAD_ODE(0b1);  // Open Drain Enabled
+    } else {
+        pad_config |= IOMUXC_SW_PAD_CTL_PAD_ODE(0b0);  // Open Drain Disabled
+    }
+
+    if (pull == PIN_PULL_DISABLED) {
+        pad_config |= IOMUXC_SW_PAD_CTL_PAD_PKE(0); // Pull/Keeper Disabled
+    } else if (pull == PIN_PULL_HOLD) {
+        pad_config |= IOMUXC_SW_PAD_CTL_PAD_PKE(1) | // Pull/Keeper Enabled
+            IOMUXC_SW_PAD_CTL_PAD_PUE(0);            // Keeper selected
+    } else {
+        pad_config |= IOMUXC_SW_PAD_CTL_PAD_PKE(1) |  // Pull/Keeper Enabled
+            IOMUXC_SW_PAD_CTL_PAD_PUE(1) |            // Pull selected
+            IOMUXC_SW_PAD_CTL_PAD_PUS(pull);
+    }
+
+    if (mode == PIN_MODE_IN) {
+        pad_config |= IOMUXC_SW_PAD_CTL_PAD_DSE(0b000) |  // output driver disabled
+            IOMUXC_SW_PAD_CTL_PAD_HYS(1U);  // Hysteresis enabled
+    } else {
+
+        if (!IS_GPIO_DRIVE(drive)) {
+            mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("invalid drive strength: %d"), drive);
+        }
+
+        pad_config |= IOMUXC_SW_PAD_CTL_PAD_DSE(drive) |
+            IOMUXC_SW_PAD_CTL_PAD_HYS(0U);  // Hysteresis disabled
+    }
+
+    #endif
+
+    return pad_config;
+}
+
 const machine_pin_obj_t *pin_find(mp_obj_t user_obj) {
     const machine_pin_obj_t *pin_obj;
 
diff --git a/ports/mimxrt/pin.h b/ports/mimxrt/pin.h
index 22e7a7e0f5e5a..d1597fab9baa5 100644
--- a/ports/mimxrt/pin.h
+++ b/ports/mimxrt/pin.h
@@ -55,6 +55,7 @@ enum {
     PIN_MODE_OUT,
     PIN_MODE_OPEN_DRAIN,
     PIN_MODE_ALT,
+    PIN_MODE_SKIP,
 };
 
 enum {
@@ -159,5 +160,6 @@ const machine_pin_af_obj_t *pin_find_af(const machine_pin_obj_t *pin, uint8_t fn
 const machine_pin_af_obj_t *pin_find_af_by_index(const machine_pin_obj_t *pin, mp_uint_t af_idx);
 const machine_pin_af_obj_t *pin_find_af_by_name(const machine_pin_obj_t *pin, const char *name);
 void machine_pin_set_mode(const machine_pin_obj_t *pin, uint8_t mode);
+uint32_t pin_generate_config(const uint32_t pull, const uint32_t mode, const uint32_t drive, uint32_t config_register);
 
 #endif // MICROPY_INCLUDED_MIMXRT_PIN_H
diff --git a/ports/mimxrt/sdcard.c b/ports/mimxrt/sdcard.c
index fd3c910835c5b..5c523068ad87d 100644
--- a/ports/mimxrt/sdcard.c
+++ b/ports/mimxrt/sdcard.c
@@ -725,24 +725,18 @@ static inline void sdcard_init_pin(const machine_pin_obj_t *pin, uint8_t af_idx,
 
 void sdcard_init_pins(mimxrt_sdcard_obj_t *card) {
     // speed and strength optimized for clock frequency < 100MHz
-    uint32_t speed = 1U;
-    uint32_t strength = 7U;
     const mimxrt_sdcard_obj_pins_t *pins = card->pins;
 
-    uint32_t default_config = IOMUXC_SW_PAD_CTL_PAD_SPEED(speed) |
-        IOMUXC_SW_PAD_CTL_PAD_SRE_MASK |
-        IOMUXC_SW_PAD_CTL_PAD_PKE_MASK |
-        IOMUXC_SW_PAD_CTL_PAD_PUE_MASK |
-        IOMUXC_SW_PAD_CTL_PAD_HYS_MASK |
-        IOMUXC_SW_PAD_CTL_PAD_PUS(1) |
-        IOMUXC_SW_PAD_CTL_PAD_DSE(strength);
-    uint32_t no_cd_config = IOMUXC_SW_PAD_CTL_PAD_SPEED(speed) |
-        IOMUXC_SW_PAD_CTL_PAD_SRE_MASK |
-        IOMUXC_SW_PAD_CTL_PAD_PKE_MASK |
-        IOMUXC_SW_PAD_CTL_PAD_PUE_MASK |
-        IOMUXC_SW_PAD_CTL_PAD_HYS_MASK |
-        IOMUXC_SW_PAD_CTL_PAD_PUS(0) |
-        IOMUXC_SW_PAD_CTL_PAD_DSE(strength);
+    uint32_t default_config = pin_generate_config(
+        PIN_PULL_UP_47K, PIN_MODE_SKIP, PIN_DRIVE_POWER_6, card->pins->clk.pin->configRegister);
+    #if USDHC_DATA3_PULL_DOWN_ON_BOARD
+    // Pull down on the board -> must not enable internal PD.
+    uint32_t no_cd_config = pin_generate_config(
+        PIN_PULL_DISABLED, PIN_MODE_SKIP, PIN_DRIVE_POWER_6, card->pins->data3.pin->configRegister);
+    #else
+    uint32_t no_cd_config = pin_generate_config(
+        PIN_PULL_DOWN_100K, PIN_MODE_SKIP, PIN_DRIVE_POWER_6, card->pins->data3.pin->configRegister);
+    #endif // USDHC_DATA3_PULL_DOWN_ON_BOARD
 
     sdcard_init_pin(card->pins->clk.pin, card->pins->clk.af_idx, default_config);  // USDHC1_CLK
     sdcard_init_pin(card->pins->cmd.pin, card->pins->cmd.af_idx, default_config);  // USDHC1_CMD

From 30380962cff1a42dabbbdf172b951f21b5bffe14 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Mon, 10 Jan 2022 18:14:40 +0100
Subject: [PATCH 1631/3533] mimxrt: Allow to select cs0 or cs1 for SPI.

Using the keyword argument cs=nnn in the constructor. The cs1
pin has to be defined in mpconfigboard.h.
Note: Only a few boards have the CS1 pin exposed to the connectors.
---
 .../boards/MIMXRT1010_EVK/mpconfigboard.h     |  3 +-
 .../boards/MIMXRT1020_EVK/mpconfigboard.h     |  5 ++-
 .../boards/MIMXRT1050_EVK/mpconfigboard.h     |  3 +-
 .../boards/MIMXRT1060_EVK/mpconfigboard.h     |  3 +-
 .../boards/MIMXRT1064_EVK/mpconfigboard.h     |  3 +-
 .../boards/SEEED_ARCH_MIX/mpconfigboard.h     |  6 +++-
 ports/mimxrt/boards/TEENSY40/mpconfigboard.h  |  6 +++-
 ports/mimxrt/boards/TEENSY41/mpconfigboard.h  |  6 +++-
 ports/mimxrt/machine_spi.c                    | 32 +++++++++++++------
 9 files changed, 50 insertions(+), 17 deletions(-)

diff --git a/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.h b/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.h
index 9a74a1c9c833c..726a63904d6f5 100644
--- a/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.h
+++ b/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.h
@@ -27,7 +27,8 @@
 
 #define IOMUX_TABLE_SPI \
     { IOMUXC_GPIO_AD_06_LPSPI1_SCK }, { IOMUXC_GPIO_AD_05_LPSPI1_PCS0 }, \
-    { IOMUXC_GPIO_AD_04_LPSPI1_SDO }, { IOMUXC_GPIO_AD_03_LPSPI1_SDI },
+    { IOMUXC_GPIO_AD_04_LPSPI1_SDO }, { IOMUXC_GPIO_AD_03_LPSPI1_SDI }, \
+    { IOMUXC_GPIO_AD_02_LPSPI1_PCS1 }
 
 #define DMA_REQ_SRC_RX { 0, kDmaRequestMuxLPSPI1Rx, kDmaRequestMuxLPSPI2Rx }
 #define DMA_REQ_SRC_TX { 0, kDmaRequestMuxLPSPI1Tx, kDmaRequestMuxLPSPI2Tx }
diff --git a/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.h b/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.h
index 5f5de5a3edfa5..2e7ee34e8d3bc 100644
--- a/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.h
+++ b/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.h
@@ -37,10 +37,13 @@
 #define IOMUX_TABLE_SPI \
     { IOMUXC_GPIO_AD_B0_10_LPSPI1_SCK }, { IOMUXC_GPIO_AD_B0_11_LPSPI1_PCS0 }, \
     { IOMUXC_GPIO_AD_B0_12_LPSPI1_SDO }, { IOMUXC_GPIO_AD_B0_13_LPSPI1_SDI }, \
+    { 0 }, \
     { 0 }, { 0 }, \
     { 0 }, { 0 }, \
+    { 0 }, \
     { IOMUXC_GPIO_AD_B1_12_LPSPI3_SCK }, { IOMUXC_GPIO_AD_B1_13_LPSPI3_PCS0 }, \
-    { IOMUXC_GPIO_AD_B1_14_LPSPI3_SDO }, { IOMUXC_GPIO_AD_B1_15_LPSPI3_SDI },
+    { IOMUXC_GPIO_AD_B1_14_LPSPI3_SDO }, { IOMUXC_GPIO_AD_B1_15_LPSPI3_SDI }, \
+    { IOMUXC_GPIO_AD_B1_09_LPSPI3_PCS1 } \
 
 #define DMA_REQ_SRC_RX { 0, kDmaRequestMuxLPSPI1Rx, kDmaRequestMuxLPSPI2Rx, \
                          kDmaRequestMuxLPSPI3Rx, kDmaRequestMuxLPSPI4Rx }
diff --git a/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.h b/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.h
index aa9ab8d95c727..c2783a3e597fc 100644
--- a/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.h
+++ b/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.h
@@ -32,7 +32,8 @@
 
 #define IOMUX_TABLE_SPI \
     { IOMUXC_GPIO_SD_B0_00_LPSPI1_SCK }, { IOMUXC_GPIO_SD_B0_01_LPSPI1_PCS0 }, \
-    { IOMUXC_GPIO_SD_B0_02_LPSPI1_SDO }, { IOMUXC_GPIO_SD_B0_03_LPSPI1_SDI },
+    { IOMUXC_GPIO_SD_B0_02_LPSPI1_SDO }, { IOMUXC_GPIO_SD_B0_03_LPSPI1_SDI }, \
+    { 0 },
 
 #define DMA_REQ_SRC_RX { 0, kDmaRequestMuxLPSPI1Rx, kDmaRequestMuxLPSPI2Rx, \
                          kDmaRequestMuxLPSPI3Rx, kDmaRequestMuxLPSPI4Rx }
diff --git a/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.h b/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.h
index b108122ffc4db..475d07ddb115a 100644
--- a/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.h
+++ b/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.h
@@ -32,7 +32,8 @@
 
 #define IOMUX_TABLE_SPI \
     { IOMUXC_GPIO_SD_B0_00_LPSPI1_SCK }, { IOMUXC_GPIO_SD_B0_01_LPSPI1_PCS0 }, \
-    { IOMUXC_GPIO_SD_B0_02_LPSPI1_SDO }, { IOMUXC_GPIO_SD_B0_03_LPSPI1_SDI },
+    { IOMUXC_GPIO_SD_B0_02_LPSPI1_SDO }, { IOMUXC_GPIO_SD_B0_03_LPSPI1_SDI }, \
+    { 0 },
 
 #define DMA_REQ_SRC_RX { 0, kDmaRequestMuxLPSPI1Rx, kDmaRequestMuxLPSPI2Rx, \
                          kDmaRequestMuxLPSPI3Rx, kDmaRequestMuxLPSPI4Rx }
diff --git a/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.h b/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.h
index 3c724868f77c8..874991ac65bb2 100644
--- a/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.h
+++ b/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.h
@@ -32,7 +32,8 @@
 
 #define IOMUX_TABLE_SPI \
     { IOMUXC_GPIO_SD_B0_00_LPSPI1_SCK }, { IOMUXC_GPIO_SD_B0_01_LPSPI1_PCS0 }, \
-    { IOMUXC_GPIO_SD_B0_02_LPSPI1_SDO }, { IOMUXC_GPIO_SD_B0_03_LPSPI1_SDI },
+    { IOMUXC_GPIO_SD_B0_02_LPSPI1_SDO }, { IOMUXC_GPIO_SD_B0_03_LPSPI1_SDI }, \
+    { 0 },
 
 #define DMA_REQ_SRC_RX { 0, kDmaRequestMuxLPSPI1Rx, kDmaRequestMuxLPSPI2Rx, \
                          kDmaRequestMuxLPSPI3Rx, kDmaRequestMuxLPSPI4Rx }
diff --git a/ports/mimxrt/boards/SEEED_ARCH_MIX/mpconfigboard.h b/ports/mimxrt/boards/SEEED_ARCH_MIX/mpconfigboard.h
index 7c79063eef86e..53a3d4ed78232 100644
--- a/ports/mimxrt/boards/SEEED_ARCH_MIX/mpconfigboard.h
+++ b/ports/mimxrt/boards/SEEED_ARCH_MIX/mpconfigboard.h
@@ -35,12 +35,16 @@
 #define IOMUX_TABLE_SPI \
     { 0 }, { 0 }, \
     { 0 }, { 0 }, \
+    { 0 }, \
     { 0 }, { 0 }, \
     { 0 }, { 0 }, \
+    { 0 }, \
     { IOMUXC_GPIO_AD_B1_15_LPSPI3_SCK }, { IOMUXC_GPIO_AD_B1_12_LPSPI3_PCS0 }, \
     { IOMUXC_GPIO_AD_B1_14_LPSPI3_SDO }, { IOMUXC_GPIO_AD_B1_13_LPSPI3_SDI },  \
+    { 0 }, \
     { IOMUXC_GPIO_B1_07_LPSPI4_SCK }, { IOMUXC_GPIO_B1_04_LPSPI4_PCS0 }, \
-    { IOMUXC_GPIO_B1_06_LPSPI4_SDO }, { IOMUXC_GPIO_B1_05_LPSPI4_SDI },
+    { IOMUXC_GPIO_B1_06_LPSPI4_SDO }, { IOMUXC_GPIO_B1_05_LPSPI4_SDI }, \
+    { IOMUXC_GPIO_B1_03_LPSPI4_PCS1 }
 
 #define DMA_REQ_SRC_RX { 0, kDmaRequestMuxLPSPI1Rx, kDmaRequestMuxLPSPI2Rx, \
                          kDmaRequestMuxLPSPI3Rx, kDmaRequestMuxLPSPI4Rx }
diff --git a/ports/mimxrt/boards/TEENSY40/mpconfigboard.h b/ports/mimxrt/boards/TEENSY40/mpconfigboard.h
index ae0a234629cca..08a774d886bb4 100644
--- a/ports/mimxrt/boards/TEENSY40/mpconfigboard.h
+++ b/ports/mimxrt/boards/TEENSY40/mpconfigboard.h
@@ -27,12 +27,16 @@
 #define IOMUX_TABLE_SPI \
     { 0 }, { 0 }, \
     { 0 }, { 0 }, \
+    { 0 }, \
     { 0 }, { 0 }, \
     { 0 }, { 0 }, \
+    { 0 }, \
     { IOMUXC_GPIO_AD_B1_15_LPSPI3_SCK }, { IOMUXC_GPIO_AD_B0_03_LPSPI3_PCS0 }, \
     { IOMUXC_GPIO_AD_B1_14_LPSPI3_SDO }, { IOMUXC_GPIO_AD_B0_02_LPSPI3_SDI }, \
+    { 0 }, \
     { IOMUXC_GPIO_B0_03_LPSPI4_SCK }, { IOMUXC_GPIO_B0_00_LPSPI4_PCS0 }, \
-    { IOMUXC_GPIO_B0_02_LPSPI4_SDO }, { IOMUXC_GPIO_B0_01_LPSPI4_SDI },
+    { IOMUXC_GPIO_B0_02_LPSPI4_SDO }, { IOMUXC_GPIO_B0_01_LPSPI4_SDI }, \
+    { 0 },
 
 #define DMA_REQ_SRC_RX { 0, kDmaRequestMuxLPSPI1Rx, kDmaRequestMuxLPSPI2Rx, \
                          kDmaRequestMuxLPSPI3Rx, kDmaRequestMuxLPSPI4Rx }
diff --git a/ports/mimxrt/boards/TEENSY41/mpconfigboard.h b/ports/mimxrt/boards/TEENSY41/mpconfigboard.h
index 4ca82d4b65066..449f10babb42b 100644
--- a/ports/mimxrt/boards/TEENSY41/mpconfigboard.h
+++ b/ports/mimxrt/boards/TEENSY41/mpconfigboard.h
@@ -27,12 +27,16 @@
 #define IOMUX_TABLE_SPI \
     { IOMUXC_GPIO_SD_B0_00_LPSPI1_SCK }, { IOMUXC_GPIO_SD_B0_01_LPSPI1_PCS0 }, \
     { IOMUXC_GPIO_SD_B0_02_LPSPI1_SDO }, { IOMUXC_GPIO_SD_B0_03_LPSPI1_SDI }, \
+    { IOMUXC_GPIO_EMC_31_LPSPI1_PCS1 }, \
     { 0 }, { 0 }, \
     { 0 }, { 0 }, \
+    { 0 }, \
     { IOMUXC_GPIO_AD_B1_15_LPSPI3_SCK }, { IOMUXC_GPIO_AD_B1_12_LPSPI3_PCS0 }, \
     { IOMUXC_GPIO_AD_B1_14_LPSPI3_SDO }, { IOMUXC_GPIO_AD_B1_13_LPSPI3_SDI }, \
+    { 0 }, \
     { IOMUXC_GPIO_B0_03_LPSPI4_SCK }, { IOMUXC_GPIO_B0_00_LPSPI4_PCS0 }, \
-    { IOMUXC_GPIO_B0_02_LPSPI4_SDO }, { IOMUXC_GPIO_B0_01_LPSPI4_SDI },
+    { IOMUXC_GPIO_B0_02_LPSPI4_SDO }, { IOMUXC_GPIO_B0_01_LPSPI4_SDI }, \
+    { IOMUXC_GPIO_B1_03_LPSPI4_PCS1 }
 
 #define DMA_REQ_SRC_RX { 0, kDmaRequestMuxLPSPI1Rx, kDmaRequestMuxLPSPI2Rx, \
                          kDmaRequestMuxLPSPI3Rx, kDmaRequestMuxLPSPI4Rx }
diff --git a/ports/mimxrt/machine_spi.c b/ports/mimxrt/machine_spi.c
index 06c0278fb3a26..0332d9a9e8014 100644
--- a/ports/mimxrt/machine_spi.c
+++ b/ports/mimxrt/machine_spi.c
@@ -53,6 +53,7 @@
 #define CS0 (iomux_table[index + 1])
 #define SDO (iomux_table[index + 2])
 #define SDI (iomux_table[index + 3])
+#define CS1 (iomux_table[index + 4])
 
 typedef struct _machine_spi_obj_t {
     mp_obj_base_t base;
@@ -81,17 +82,25 @@ static const iomux_table_t iomux_table[] = {
 static uint16_t dma_req_src_rx[] = DMA_REQ_SRC_RX;
 static uint16_t dma_req_src_tx[] = DMA_REQ_SRC_TX;
 
-bool lpspi_set_iomux(int8_t spi, uint8_t drive) {
-    int index = (spi - 1) * 4;
+bool lpspi_set_iomux(int8_t spi, uint8_t drive, uint8_t cs) {
+    int index = (spi - 1) * 5;
 
     if (SCK.muxRegister != 0) {
         IOMUXC_SetPinMux(SCK.muxRegister, SCK.muxMode, SCK.inputRegister, SCK.inputDaisy, SCK.configRegister, 0U);
         IOMUXC_SetPinConfig(SCK.muxRegister, SCK.muxMode, SCK.inputRegister, SCK.inputDaisy, SCK.configRegister,
             pin_generate_config(PIN_PULL_UP_100K, PIN_MODE_OUT, drive, SCK.configRegister));
 
-        IOMUXC_SetPinMux(CS0.muxRegister, CS0.muxMode, CS0.inputRegister, CS0.inputDaisy, CS0.configRegister, 0U);
-        IOMUXC_SetPinConfig(CS0.muxRegister, CS0.muxMode, CS0.inputRegister, CS0.inputDaisy, CS0.configRegister,
-            pin_generate_config(PIN_PULL_UP_100K, PIN_MODE_OUT, drive, CS0.configRegister));
+        if (cs == 0 && CS0.muxRegister != 0) {
+            IOMUXC_SetPinMux(CS0.muxRegister, CS0.muxMode, CS0.inputRegister, CS0.inputDaisy, CS0.configRegister, 0U);
+            IOMUXC_SetPinConfig(CS0.muxRegister, CS0.muxMode, CS0.inputRegister, CS0.inputDaisy, CS0.configRegister,
+                0x1080u | drive << IOMUXC_SW_PAD_CTL_PAD_DSE_SHIFT);
+        } else if (cs == 1 && CS1.muxRegister != 0) {
+            IOMUXC_SetPinMux(CS1.muxRegister, CS1.muxMode, CS1.inputRegister, CS1.inputDaisy, CS1.configRegister, 0U);
+            IOMUXC_SetPinConfig(CS1.muxRegister, CS1.muxMode, CS1.inputRegister, CS1.inputDaisy, CS1.configRegister,
+                0x1080u | drive << IOMUXC_SW_PAD_CTL_PAD_DSE_SHIFT);
+        } else {
+            mp_raise_ValueError(MP_ERROR_TEXT("The chosen CS is not available"));
+        }
 
         IOMUXC_SetPinMux(SDO.muxRegister, SDO.muxMode, SDO.inputRegister, SDO.inputDaisy, SDO.configRegister, 0U);
         IOMUXC_SetPinConfig(SDO.muxRegister, SDO.muxMode, SDO.inputRegister, SDO.inputDaisy, SDO.configRegister,
@@ -117,7 +126,7 @@ STATIC void machine_spi_print(const mp_print_t *print, mp_obj_t self_in, mp_prin
 }
 
 mp_obj_t machine_spi_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
-    enum { ARG_id, ARG_baudrate, ARG_polarity, ARG_phase, ARG_bits, ARG_firstbit, ARG_gap_ns, ARG_drive };
+    enum { ARG_id, ARG_baudrate, ARG_polarity, ARG_phase, ARG_bits, ARG_firstbit, ARG_gap_ns, ARG_drive, ARG_cs };
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_id,       MP_ARG_REQUIRED | MP_ARG_OBJ },
         { MP_QSTR_baudrate, MP_ARG_INT, {.u_int = DEFAULT_SPI_BAUDRATE} },
@@ -127,6 +136,7 @@ mp_obj_t machine_spi_make_new(const mp_obj_type_t *type, size_t n_args, size_t n
         { MP_QSTR_firstbit, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = DEFAULT_SPI_FIRSTBIT} },
         { MP_QSTR_gap_ns,   MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} },
         { MP_QSTR_drive,    MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = DEFAULT_SPI_DRIVE} },
+        { MP_QSTR_cs,       MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 0} },
     };
 
     static bool clk_init = true;
@@ -160,7 +170,6 @@ mp_obj_t machine_spi_make_new(const mp_obj_type_t *type, size_t n_args, size_t n
         CLOCK_SetMux(kCLOCK_LpspiMux, 1);  // Clock source is kCLOCK_Usb1PllPfd1Clk
         CLOCK_SetDiv(kCLOCK_LpspiDiv, CLOCK_DIVIDER);
     }
-    lpspi_set_iomux(spi_index_table[spi_id], drive);
     LPSPI_Reset(self->spi_inst);
     LPSPI_Enable(self->spi_inst, false);  // Disable first before new settings are applies
 
@@ -176,7 +185,12 @@ mp_obj_t machine_spi_make_new(const mp_obj_type_t *type, size_t n_args, size_t n
     if (args[ARG_gap_ns].u_int != -1) {
         self->master_config->betweenTransferDelayInNanoSec = args[ARG_gap_ns].u_int;
     }
+    uint8_t cs = args[ARG_cs].u_int;
+    if (cs <= 1) {
+        self->master_config->whichPcs = cs;
+    }
     LPSPI_MasterInit(self->spi_inst, self->master_config, CLOCK_GetFreq(kCLOCK_Usb1PllPfd0Clk) / (CLOCK_DIVIDER + 1));
+    lpspi_set_iomux(spi_index_table[spi_id], drive, cs);
 
     return MP_OBJ_FROM_PTR(self);
 }
@@ -271,7 +285,7 @@ STATIC void machine_spi_transfer(mp_obj_base_t *self_in, size_t len, const uint8
         masterXfer.txData = (uint8_t *)src;
         masterXfer.rxData = (uint8_t *)dest;
         masterXfer.dataSize = len;
-        masterXfer.configFlags = kLPSPI_MasterPcs0 | kLPSPI_MasterPcsContinuous | kLPSPI_MasterByteSwap;
+        masterXfer.configFlags = (self->master_config->whichPcs << LPSPI_MASTER_PCS_SHIFT) | kLPSPI_MasterPcsContinuous | kLPSPI_MasterByteSwap;
 
         // Reconfigure the TCR, required after switch between DMA vs. non-DMA
         LPSPI_Enable(self->spi_inst, false);  // Disable first before new settings are applied
@@ -317,7 +331,7 @@ STATIC void machine_spi_transfer(mp_obj_base_t *self_in, size_t len, const uint8
         masterXfer.txData = (uint8_t *)src;
         masterXfer.rxData = (uint8_t *)dest;
         masterXfer.dataSize = len;
-        masterXfer.configFlags = kLPSPI_MasterPcs0 | kLPSPI_MasterPcsContinuous | kLPSPI_MasterByteSwap;
+        masterXfer.configFlags = (self->master_config->whichPcs << LPSPI_MASTER_PCS_SHIFT) | kLPSPI_MasterPcsContinuous | kLPSPI_MasterByteSwap;
 
         LPSPI_MasterTransferBlocking(self->spi_inst, &masterXfer);
     }

From b73073d2460f14cbe7501e99b882520e0456ec94 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Wed, 12 Jan 2022 14:24:15 +0100
Subject: [PATCH 1632/3533] mimxrt: Add USB ID elements.

- Manufacturer, set by MICROPY_HW_USB_STR_MANUF; default "MicroPython"
- Board name, as set by MICROPY_HW_BOARD_NAME
- Unique-ID, same as returned by machine.unique_id()
- USB Vendor ID, as set by MICROPY_HW_USB_VID; default 0xf055
- USB Product ID, as set by MICROPY_HW_USB_PID; default 0x9802
---
 ports/mimxrt/tusb_port.c | 33 +++++++++++++++++++++++++++------
 1 file changed, 27 insertions(+), 6 deletions(-)

diff --git a/ports/mimxrt/tusb_port.c b/ports/mimxrt/tusb_port.c
index 128861a49a0b5..55855674c6293 100644
--- a/ports/mimxrt/tusb_port.c
+++ b/ports/mimxrt/tusb_port.c
@@ -25,12 +25,20 @@
  */
 
 #include "tusb.h"
+#include "mphalport.h"
 
 #ifndef MICROPY_HW_USB_VID
 #define MICROPY_HW_USB_VID (0xf055)
+#endif
+
+#ifndef MICROPY_HW_USB_PID
 #define MICROPY_HW_USB_PID (0x9802)
 #endif
 
+#ifndef MICROPY_HW_USB_STR_MANUF
+#define MICROPY_HW_USB_STR_MANUF ("MicroPython")
+#endif
+
 #define USBD_DESC_LEN (TUD_CONFIG_DESC_LEN + TUD_CDC_DESC_LEN)
 #define USBD_MAX_POWER_MA (250)
 
@@ -77,9 +85,9 @@ static const uint8_t usbd_desc_cfg[USBD_DESC_LEN] = {
 };
 
 static const char *const usbd_desc_str[] = {
-    [USBD_STR_MANUF] = "MicroPython",
-    [USBD_STR_PRODUCT] = "Board in FS mode", // Todo: fix string to indicate that product is running in High Speed mode
-    [USBD_STR_SERIAL] = "000000000000", // TODO
+    [USBD_STR_MANUF] = MICROPY_HW_USB_STR_MANUF,
+    [USBD_STR_PRODUCT] = MICROPY_HW_BOARD_NAME,
+    [USBD_STR_SERIAL] = "00000000000000000000",
     [USBD_STR_CDC] = "Board CDC",
 };
 
@@ -95,6 +103,9 @@ const uint8_t *tud_descriptor_configuration_cb(uint8_t index) {
 const uint16_t *tud_descriptor_string_cb(uint8_t index, uint16_t langid) {
     #define DESC_STR_MAX (20)
     static uint16_t desc_str[DESC_STR_MAX];
+    static const char hexchr[16] = "0123456789ABCDEF";
+
+    memset(desc_str, 0, sizeof(desc_str));
 
     uint8_t len;
     if (index == 0) {
@@ -104,9 +115,19 @@ const uint16_t *tud_descriptor_string_cb(uint8_t index, uint16_t langid) {
         if (index >= sizeof(usbd_desc_str) / sizeof(usbd_desc_str[0])) {
             return NULL;
         }
-        const char *str = usbd_desc_str[index];
-        for (len = 0; len < DESC_STR_MAX - 1 && str[len]; ++len) {
-            desc_str[1 + len] = str[len];
+        if (index == USBD_STR_SERIAL) {
+            uint8_t uid[8];
+            mp_hal_get_unique_id(uid);
+            // store it as a hex string
+            for (len = 0; len < 16; len += 2) {
+                desc_str[1 + len] = hexchr[uid[len / 2] >> 4];
+                desc_str[1 + len + 1] = hexchr[uid[len / 2] & 0x0f];
+            }
+        } else {
+            const char *str = usbd_desc_str[index];
+            for (len = 0; len < DESC_STR_MAX - 1 && str[len]; ++len) {
+                desc_str[1 + len] = str[len];
+            }
         }
     }
 

From da9c3607a5803f207ac499049d43e42599d3dd80 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Fri, 14 Jan 2022 10:24:30 +0100
Subject: [PATCH 1633/3533] mimxrt: Add support for the Olimex RT1010 board.

The board.json file is intentionally excluded, until the board will be
sold. But including it into the mimxrt series make it easier to keep
the build up-to-date.
---
 .../boards/OLIMEX_RT1010/clock_config.h       | 104 ++++++++++++++++++
 .../boards/OLIMEX_RT1010/mpconfigboard.h      |  50 +++++++++
 .../boards/OLIMEX_RT1010/mpconfigboard.mk     |  13 +++
 ports/mimxrt/boards/OLIMEX_RT1010/pins.csv    |  36 ++++++
 4 files changed, 203 insertions(+)
 create mode 100644 ports/mimxrt/boards/OLIMEX_RT1010/clock_config.h
 create mode 100644 ports/mimxrt/boards/OLIMEX_RT1010/mpconfigboard.h
 create mode 100644 ports/mimxrt/boards/OLIMEX_RT1010/mpconfigboard.mk
 create mode 100644 ports/mimxrt/boards/OLIMEX_RT1010/pins.csv

diff --git a/ports/mimxrt/boards/OLIMEX_RT1010/clock_config.h b/ports/mimxrt/boards/OLIMEX_RT1010/clock_config.h
new file mode 100644
index 0000000000000..76f3df422f9d0
--- /dev/null
+++ b/ports/mimxrt/boards/OLIMEX_RT1010/clock_config.h
@@ -0,0 +1,104 @@
+/*
+ * Copyright 2019 NXP
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#ifndef _CLOCK_CONFIG_H_
+#define _CLOCK_CONFIG_H_
+
+#include "fsl_common.h"
+
+/*******************************************************************************
+ * Definitions
+ ******************************************************************************/
+#define BOARD_XTAL0_CLK_HZ 24000000U /*!< Board xtal0 frequency in Hz */
+
+#define BOARD_XTAL32K_CLK_HZ 32768U /*!< Board xtal32k frequency in Hz */
+/*******************************************************************************
+ ************************ BOARD_InitBootClocks function ************************
+ ******************************************************************************/
+
+#if defined(__cplusplus)
+extern "C" {
+#endif /* __cplusplus*/
+
+/*!
+ * @brief This function executes default configuration of clocks.
+ *
+ */
+void BOARD_InitBootClocks(void);
+
+#if defined(__cplusplus)
+}
+#endif /* __cplusplus*/
+
+/*******************************************************************************
+ ********************** Configuration BOARD_BootClockRUN ***********************
+ ******************************************************************************/
+/*******************************************************************************
+ * Definitions for BOARD_BootClockRUN configuration
+ ******************************************************************************/
+#define BOARD_BOOTCLOCKRUN_CORE_CLOCK 500000000U /*!< Core clock frequency: 500000000Hz */
+
+/* Clock outputs (values are in Hz): */
+#define BOARD_BOOTCLOCKRUN_ADC_ALT_CLK 40000000UL
+#define BOARD_BOOTCLOCKRUN_CKIL_SYNC_CLK_ROOT 32768UL
+#define BOARD_BOOTCLOCKRUN_CLKO1_CLK 0UL
+#define BOARD_BOOTCLOCKRUN_CLKO2_CLK 0UL
+#define BOARD_BOOTCLOCKRUN_CLK_1M 1000000UL
+#define BOARD_BOOTCLOCKRUN_CLK_24M 24000000UL
+#define BOARD_BOOTCLOCKRUN_CORE_CLK_ROOT 500000000UL
+#define BOARD_BOOTCLOCKRUN_ENET_500M_REF_CLK 500000000UL
+#define BOARD_BOOTCLOCKRUN_FLEXIO1_CLK_ROOT 30000000UL
+#define BOARD_BOOTCLOCKRUN_FLEXSPI_CLK_ROOT 132000000UL
+#define BOARD_BOOTCLOCKRUN_GPT1_IPG_CLK_HIGHFREQ 62500000UL
+#define BOARD_BOOTCLOCKRUN_GPT2_IPG_CLK_HIGHFREQ 62500000UL
+#define BOARD_BOOTCLOCKRUN_IPG_CLK_ROOT 125000000UL
+#define BOARD_BOOTCLOCKRUN_LPI2C_CLK_ROOT 60000000UL
+#define BOARD_BOOTCLOCKRUN_LPSPI_CLK_ROOT 105600000UL
+#define BOARD_BOOTCLOCKRUN_MQS_MCLK 63529411UL
+#define BOARD_BOOTCLOCKRUN_PERCLK_CLK_ROOT 62500000UL
+#define BOARD_BOOTCLOCKRUN_SAI1_CLK_ROOT 63529411UL
+#define BOARD_BOOTCLOCKRUN_SAI1_MCLK1 63529411UL
+#define BOARD_BOOTCLOCKRUN_SAI1_MCLK2 63529411UL
+#define BOARD_BOOTCLOCKRUN_SAI1_MCLK3 30000000UL
+#define BOARD_BOOTCLOCKRUN_SAI3_CLK_ROOT 63529411UL
+#define BOARD_BOOTCLOCKRUN_SAI3_MCLK1 63529411UL
+#define BOARD_BOOTCLOCKRUN_SAI3_MCLK2 0UL
+#define BOARD_BOOTCLOCKRUN_SAI3_MCLK3 30000000UL
+#define BOARD_BOOTCLOCKRUN_SPDIF0_CLK_ROOT 30000000UL
+#define BOARD_BOOTCLOCKRUN_SPDIF0_EXTCLK_OUT 0UL
+#define BOARD_BOOTCLOCKRUN_TRACE_CLK_ROOT 117333333UL
+#define BOARD_BOOTCLOCKRUN_UART_CLK_ROOT 80000000UL
+#define BOARD_BOOTCLOCKRUN_USBPHY_CLK 0UL
+
+/*! @brief Usb1 PLL set for BOARD_BootClockRUN configuration.
+ */
+extern const clock_usb_pll_config_t usb1PllConfig_BOARD_BootClockRUN;
+/*! @brief Sys PLL for BOARD_BootClockRUN configuration.
+ */
+extern const clock_sys_pll_config_t sysPllConfig_BOARD_BootClockRUN;
+/*! @brief Enet PLL set for BOARD_BootClockRUN configuration.
+ */
+extern const clock_enet_pll_config_t enetPllConfig_BOARD_BootClockRUN;
+
+/*******************************************************************************
+ * API for BOARD_BootClockRUN configuration
+ ******************************************************************************/
+#if defined(__cplusplus)
+extern "C" {
+#endif /* __cplusplus*/
+
+/*!
+ * @brief This function executes configuration of clocks.
+ *
+ */
+void BOARD_BootClockRUN(void);
+
+#if defined(__cplusplus)
+}
+#endif /* __cplusplus*/
+
+#endif /* _CLOCK_CONFIG_H_ */
diff --git a/ports/mimxrt/boards/OLIMEX_RT1010/mpconfigboard.h b/ports/mimxrt/boards/OLIMEX_RT1010/mpconfigboard.h
new file mode 100644
index 0000000000000..e004050aeeb98
--- /dev/null
+++ b/ports/mimxrt/boards/OLIMEX_RT1010/mpconfigboard.h
@@ -0,0 +1,50 @@
+#define MICROPY_HW_BOARD_NAME "RT1010-Py-DevKIT"
+#define MICROPY_HW_MCU_NAME   "MIMXRT1011DAE5A"
+#define MICROPY_HW_USB_STR_MANUF "Olimex Ltd."
+#define MICROPY_HW_USB_VID 0x15ba
+#define MICROPY_HW_USB_PID 0x0046
+#define MICROPY_PY_UOS_DUPTERM_BUILTIN_STREAM (0)
+
+// Olimex RT1010-Py has 1 board LED
+#define MICROPY_HW_LED1_PIN (pin_GPIO_11)
+#define MICROPY_HW_LED_ON(pin) (mp_hal_pin_high(pin))
+#define MICROPY_HW_LED_OFF(pin) (mp_hal_pin_low(pin))
+
+#define MICROPY_HW_NUM_PIN_IRQS (2 * 32)
+
+// Define mapping logical UART # to hardware UART #
+// LPUART1 on RX/TX    -> 1
+// LPUART4 on D5/D6    -> 2
+
+#define MICROPY_HW_UART_NUM     (sizeof(uart_index_table) / sizeof(uart_index_table)[0])
+#define MICROPY_HW_UART_INDEX   { 0, 1, 4 }
+
+#define IOMUX_TABLE_UART \
+    { IOMUXC_GPIO_10_LPUART1_TXD }, { IOMUXC_GPIO_09_LPUART1_RXD }, \
+    { 0 }, { 0 }, \
+    { 0 }, { 0 }, \
+    { IOMUXC_GPIO_06_LPUART4_TXD }, { IOMUXC_GPIO_05_LPUART4_RXD },
+
+#define MICROPY_HW_SPI_INDEX { 0, 1, 2 }
+
+#define IOMUX_TABLE_SPI \
+    { IOMUXC_GPIO_AD_06_LPSPI1_SCK }, { IOMUXC_GPIO_AD_05_LPSPI1_PCS0 }, \
+    { IOMUXC_GPIO_AD_04_LPSPI1_SDO }, { IOMUXC_GPIO_AD_03_LPSPI1_SDI }, \
+    { IOMUXC_GPIO_AD_02_LPSPI1_PCS1 }, \
+    { IOMUXC_GPIO_AD_12_LPSPI2_SCK }, { IOMUXC_GPIO_AD_11_LPSPI2_PCS0 }, \
+    { IOMUXC_GPIO_AD_10_LPSPI2_SDO }, { IOMUXC_GPIO_AD_09_LPSPI2_SDI }, \
+    { IOMUXC_GPIO_AD_01_LPSPI2_PCS1 }
+
+#define DMA_REQ_SRC_RX { 0, kDmaRequestMuxLPSPI1Rx, kDmaRequestMuxLPSPI2Rx }
+#define DMA_REQ_SRC_TX { 0, kDmaRequestMuxLPSPI1Tx, kDmaRequestMuxLPSPI2Tx }
+
+// Define mapping hardware I2C # to logical I2C #
+// SDA/SCL    HW-I2C    Logical I2C
+// SDA1/SCL1  LPI2C1 ->    0
+// SDA2/SCL2  LPI2C2 ->    1
+
+#define MICROPY_HW_I2C_INDEX   { 0, 1, 2 }
+
+#define IOMUX_TABLE_I2C \
+    { IOMUXC_GPIO_AD_14_LPI2C1_SCL }, { IOMUXC_GPIO_AD_13_LPI2C1_SDA }, \
+    { IOMUXC_GPIO_AD_08_LPI2C2_SCL }, { IOMUXC_GPIO_AD_07_LPI2C2_SDA },
diff --git a/ports/mimxrt/boards/OLIMEX_RT1010/mpconfigboard.mk b/ports/mimxrt/boards/OLIMEX_RT1010/mpconfigboard.mk
new file mode 100644
index 0000000000000..e4f904903de7d
--- /dev/null
+++ b/ports/mimxrt/boards/OLIMEX_RT1010/mpconfigboard.mk
@@ -0,0 +1,13 @@
+MCU_SERIES = MIMXRT1011
+MCU_VARIANT = MIMXRT1011DAE5A
+
+MICROPY_FLOAT_IMPL = single
+MICROPY_PY_MACHINE_SDCARD ?= 0
+MICROPY_HW_FLASH_TYPE ?= qspi_nor
+MICROPY_HW_FLASH_SIZE ?= 0x200000  # 2MB
+MICROPY_HW_FLASH_RESERVED ?= 0x1000  # 4KB
+
+CFLAGS += -DMICROPY_HW_FLASH_DQS=kFlexSPIReadSampleClk_LoopbackInternally
+
+SRC_C += \
+	hal/flexspi_nor_flash.c \
diff --git a/ports/mimxrt/boards/OLIMEX_RT1010/pins.csv b/ports/mimxrt/boards/OLIMEX_RT1010/pins.csv
new file mode 100644
index 0000000000000..d294f86b6d9e6
--- /dev/null
+++ b/ports/mimxrt/boards/OLIMEX_RT1010/pins.csv
@@ -0,0 +1,36 @@
+D0,GPIO_00
+D1,GPIO_01
+D2,GPIO_02
+D3,GPIO_03
+D4,GPIO_04
+D5,GPIO_05
+D6,GPIO_06
+D7,GPIO_07
+D8,GPIO_08
+D9,GPIO_SD_00
+D10,GPIO_SD_01
+D11,GPIO_SD_02
+D12,GPIO_SD_05
+D13,GPIO_SD_12
+D14,GPIO_SD_13
+A0,GPIO_AD_02
+A1,GPIO_AD_03
+A2,GPIO_AD_04
+A3,GPIO_AD_05
+A4,GPIO_AD_06
+LED,GPIO_11
+SDA1, GPIO_AD_13
+SCL1, GPIO_AD_14
+SDA2, GPIO_AD_07
+SCL2, GPIO_AD_08
+SDI, GPIO_AD_09
+SDO, GPIO_AD_10
+CS0, GPIO_AD_11
+SCK, GPIO_AD_12
+USB_OTG1_PWR, GPIO_AD_00
+BT0, GPIO_SD_04
+BT1, GPIO_SD_03
+RX, GPIO_09
+TX, GPIO_10
+RELAY1,GPIO_SD_12
+RELAY2,GPIO_SD_13

From c1841c2d455a99f4184487da658e88267785ebd5 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Tue, 25 Jan 2022 21:13:37 +0100
Subject: [PATCH 1634/3533] mimxrt: Simplify Makefile in selection of flash
 type.

Simplify it a little bit by combining two sections regarding the
flash type. Thanks to @alphaFred for suggesting it.
---
 ports/mimxrt/Makefile | 47 +++++++++++++++++--------------------------
 1 file changed, 19 insertions(+), 28 deletions(-)

diff --git a/ports/mimxrt/Makefile b/ports/mimxrt/Makefile
index 2881c7c767012..5b835d25b7f78 100644
--- a/ports/mimxrt/Makefile
+++ b/ports/mimxrt/Makefile
@@ -91,14 +91,6 @@ CFLAGS += -DXIP_EXTERNAL_FLASH=1 \
 	-DBOARD_FLASH_SIZE=$(MICROPY_HW_FLASH_SIZE) \
 	-DMICROPY_HW_FLASH_SIZE=$(MICROPY_HW_FLASH_SIZE) \
 
-ifeq ($(MICROPY_HW_FLASH_TYPE), qspi_nor)
-CFLAGS += -DBOARD_FLASH_OPS_HEADER_H=\"hal/flexspi_nor_flash.h\"
-else ifeq ($(MICROPY_HW_FLASH_TYPE), hyperflash)
-CFLAGS += -DBOARD_FLASH_OPS_HEADER_H=\"hal/flexspi_hyper_flash.h\"
-else
-$(error Error: Unknown board flash type $(MICROPY_HW_FLASH_TYPE))
-endif
-
 ifeq ($(MICROPY_PY_MACHINE_SDCARD),1)
 CFLAGS += -DMICROPY_PY_MACHINE_SDCARD=1
 endif
@@ -274,33 +266,32 @@ SRC_C += \
 	$(SRC_HAL_IMX_C) \
 	$(SRC_ETH_C) \
 
+ifeq ($(MICROPY_HW_FLASH_TYPE), qspi_nor)
+CFLAGS += -DBOARD_FLASH_OPS_HEADER_H=\"hal/flexspi_nor_flash.h\"
+SRC_C += hal/flexspi_nor_flash.c
+
 ifeq ($(MICROPY_HW_BOARD_FLASH_FILES), 1)
 CFLAGS += -DBOARD_FLASH_CONFIG_HEADER_H=\"$(BOARD)_flexspi_flash_config.h\"
-
-ifeq ($(MICROPY_HW_FLASH_TYPE), qspi_nor)
-SRC_C += \
-	hal/flexspi_nor_flash.c \
-	$(BOARD_DIR)/qspi_nor_flash_config.c
-else ifeq ($(MICROPY_HW_FLASH_TYPE), hyperflash)
-SRC_C += \
-	hal/flexspi_hyper_flash.c \
-	$(BOARD_DIR)/qspi_hyper_flash_config.c
+SRC_C += $(BOARD_DIR)/qspi_nor_flash_config.c
+else
+CFLAGS += -DBOARD_FLASH_CONFIG_HEADER_H=\"hal/flexspi_flash_config.h\"
+SRC_C += hal/qspi_nor_flash_config.c
 endif
+#
+else ifeq ($(MICROPY_HW_FLASH_TYPE), hyperflash)
+CFLAGS += -DBOARD_FLASH_OPS_HEADER_H=\"hal/flexspi_hyper_flash.h\"
+SRC_C += hal/flexspi_hyper_flash.c
 
+ifeq ($(MICROPY_HW_BOARD_FLASH_FILES), 1)
+CFLAGS += -DBOARD_FLASH_CONFIG_HEADER_H=\"$(BOARD)_flexspi_flash_config.h\"
+SRC_C += $(BOARD_DIR)/qspi_hyper_flash_config.c
 else
-
 CFLAGS += -DBOARD_FLASH_CONFIG_HEADER_H=\"hal/flexspi_flash_config.h\"
-
-ifeq ($(MICROPY_HW_FLASH_TYPE), qspi_nor)
-SRC_C += \
-	hal/flexspi_nor_flash.c \
-	hal/qspi_nor_flash_config.c
-else ifeq ($(MICROPY_HW_FLASH_TYPE), hyperflash)
-SRC_C += \
-	hal/flexspi_hyper_flash.c \
-	hal/qspi_hyper_flash_config.c
+SRC_C += hal/qspi_hyper_flash_config.c
 endif
-
+#
+else
+$(error Error: Unknown board flash type $(MICROPY_HW_FLASH_TYPE))
 endif
 
 ifeq ($(MICROPY_FLOAT_IMPL),double)

From a00e1e57355f850bce928a770851bc0dc01484c2 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Sun, 23 Jan 2022 03:33:43 +0200
Subject: [PATCH 1635/3533] stm32/dac: Deinit all DACs on soft reset.

DAC timed functions continue to run after a soft reset cycle, using
collected memory in the case of write_timed.
---
 ports/stm32/dac.c  | 7 +++++++
 ports/stm32/dac.h  | 2 ++
 ports/stm32/main.c | 3 +++
 3 files changed, 12 insertions(+)

diff --git a/ports/stm32/dac.c b/ports/stm32/dac.c
index fe3aecdde8747..d51312aebc91f 100644
--- a/ports/stm32/dac.c
+++ b/ports/stm32/dac.c
@@ -131,6 +131,13 @@ STATIC void dac_deinit(uint32_t dac_channel) {
     #endif
 }
 
+void dac_deinit_all(void) {
+    dac_deinit(DAC_CHANNEL_1);
+    #if !defined(STM32L452xx)
+    dac_deinit(DAC_CHANNEL_2);
+    #endif
+}
+
 STATIC void dac_config_channel(uint32_t dac_channel, uint32_t trig, uint32_t outbuf) {
     DAC->CR &= ~(DAC_CR_EN1 << dac_channel);
     uint32_t cr_off = DAC_CR_DMAEN1 | DAC_CR_MAMP1 | DAC_CR_WAVE1 | DAC_CR_TSEL1 | DAC_CR_TEN1;
diff --git a/ports/stm32/dac.h b/ports/stm32/dac.h
index fca36e019ea83..d5686725a4428 100644
--- a/ports/stm32/dac.h
+++ b/ports/stm32/dac.h
@@ -28,4 +28,6 @@
 
 extern const mp_obj_type_t pyb_dac_type;
 
+void dac_deinit_all(void);
+
 #endif // MICROPY_INCLUDED_STM32_DAC_H
diff --git a/ports/stm32/main.c b/ports/stm32/main.c
index 431fa20dee55f..3291a80184f10 100644
--- a/ports/stm32/main.c
+++ b/ports/stm32/main.c
@@ -654,6 +654,9 @@ void stm32_main(uint32_t reset_mode) {
     #if MICROPY_HW_ENABLE_CAN
     can_deinit_all();
     #endif
+    #if MICROPY_HW_ENABLE_DAC
+    dac_deinit_all();
+    #endif
     machine_deinit();
 
     #if MICROPY_PY_THREAD

From 160e4d9a6d491cf3af0843feba5f987b2dd83c60 Mon Sep 17 00:00:00 2001
From: Herwin Grobben <h.grobben@aemics.nl>
Date: Wed, 1 Dec 2021 16:37:04 +0100
Subject: [PATCH 1636/3533] stm32/fdcan: Fix FIFO1 usage and handling of error
 interrupts.

The original code used a independent state with regards to the interrupt.
During heavy bus error conditions the internal state could become
out-of-sync with the interrupts.

Further explanation: during the development of an application using CAN
communication, a interrupt-run-away was found in some situations.  It was
found that the error interrupt triggered (Warning, Passive or Bus-Off, all
triggered it) the run-away.  The only recovery was a reset.

Two problems were found:
- the error interrupt is enabled but not cleared in the interrupt routine;
- an internal variable 'State' that was used to track the message received
  state (empty, new, full, overflow) that was not directly related to
  interrupt that indicated the state.

In this commit these issues are fixed by adding more values for the
interrupt reason (warning, passive, bus off) and clearing the error
interrupts, and making the internal state directly dependent on the
interrupt state for received messages.

Furthermore, introducing the FIFO1 in the CAN receive stage, another issue
existed.  Even if the messages are received into the FIFO1 (by selecting
message filtering for FIFO0 and FIFO1), the interrupt firing was indicating
FIFO0 Rx.  The configuration of the interrupts for this is now also fixed.
The CAN peripheral has 2 interrupt lines going into the NVIC controller.
The assignment of the interrupt reasons to these 2 interrupt lines was
missing.  Now the reception of FIFO1 messages triggers the second interrupt
line.  Other interrupts (Rx FIFO0 and bus error) are assigned to the first
interrupt line.

Tested on a Nucleo-G474, and also checked the HAL function to work with the
H7 family.
---
 ports/stm32/fdcan.c          | 153 ++++++++++++++++++++++++++++-------
 ports/stm32/make-stmconst.py |   3 +-
 ports/stm32/pyb_can.c        |  41 +++++++---
 3 files changed, 160 insertions(+), 37 deletions(-)

diff --git a/ports/stm32/fdcan.c b/ports/stm32/fdcan.c
index 2892572f40a96..778902735ead6 100644
--- a/ports/stm32/fdcan.c
+++ b/ports/stm32/fdcan.c
@@ -44,6 +44,13 @@
 #define FDCAN_ELEMENT_MASK_FIDX  (0x7f000000) // Filter Index
 #define FDCAN_ELEMENT_MASK_ANMF  (0x80000000) // Accepted Non-matching Frame
 
+#define FDCAN_RX_FIFO0_MASK (FDCAN_FLAG_RX_FIFO0_MESSAGE_LOST | FDCAN_FLAG_RX_FIFO0_FULL | FDCAN_FLAG_RX_FIFO0_NEW_MESSAGE)
+#define FDCAN_RX_FIFO1_MASK (FDCAN_FLAG_RX_FIFO1_MESSAGE_LOST | FDCAN_FLAG_RX_FIFO1_FULL | FDCAN_FLAG_RX_FIFO1_NEW_MESSAGE)
+#define FDCAN_ERROR_STATUS_MASK (FDCAN_FLAG_ERROR_PASSIVE | FDCAN_FLAG_ERROR_WARNING | FDCAN_FLAG_BUS_OFF)
+
+// also defined in <PROC>_hal_fdcan.c, but not able to declare extern and reach the variable
+static const uint8_t DLCtoBytes[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 12, 16, 20, 24, 32, 48, 64};
+
 bool can_init(pyb_can_obj_t *can_obj, uint32_t mode, uint32_t prescaler, uint32_t sjw, uint32_t bs1, uint32_t bs2, bool auto_restart) {
     (void)auto_restart;
 
@@ -60,6 +67,16 @@ bool can_init(pyb_can_obj_t *can_obj, uint32_t mode, uint32_t prescaler, uint32_
     init->TransmitPause = DISABLE;
     init->ProtocolException = ENABLE;
 
+    #if defined(STM32G4)
+    init->ClockDivider = FDCAN_CLOCK_DIV1;
+    init->DataPrescaler = 1;
+    init->DataSyncJumpWidth = 1;
+    init->DataTimeSeg1 = 1;
+    init->DataTimeSeg2 = 1;
+    #endif
+
+    #if defined(STM32H7)
+    // variable used to specify RAM address in HAL, only for H7, G4 uses defined offset address in HAL
     // The Message RAM is shared between CAN1 and CAN2. Setting the offset to half
     // the Message RAM for the second CAN and using half the resources for each CAN.
     if (can_obj->can_id == PYB_CAN_1) {
@@ -67,6 +84,14 @@ bool can_init(pyb_can_obj_t *can_obj, uint32_t mode, uint32_t prescaler, uint32_
     } else {
         init->MessageRAMOffset = 2560 / 2;
     }
+    #endif
+
+    #if defined(STM32G4)
+
+    init->StdFiltersNbr = 28; // /2  ? if FDCAN2 is used !!?
+    init->ExtFiltersNbr = 0; // Not used
+
+    #elif defined(STM32H7)
 
     init->StdFiltersNbr = 64; // 128 / 2
     init->ExtFiltersNbr = 0; // Not used
@@ -83,6 +108,9 @@ bool can_init(pyb_can_obj_t *can_obj, uint32_t mode, uint32_t prescaler, uint32_
 
     init->TxFifoQueueElmtsNbr = 16; // Tx fifo elements
     init->TxElmtSize = FDCAN_DATA_BYTES_8;
+
+    #endif
+
     init->TxFifoQueueMode = FDCAN_TX_FIFO_OPERATION;
 
     FDCAN_GlobalTypeDef *CANx = NULL;
@@ -148,21 +176,27 @@ bool can_init(pyb_can_obj_t *can_obj, uint32_t mode, uint32_t prescaler, uint32_
             NVIC_SetPriority(FDCAN1_IT1_IRQn, IRQ_PRI_CAN);
             HAL_NVIC_EnableIRQ(FDCAN1_IT1_IRQn);
             break;
+        #if defined(MICROPY_HW_CAN2_TX)
         case PYB_CAN_2:
             NVIC_SetPriority(FDCAN2_IT0_IRQn, IRQ_PRI_CAN);
             HAL_NVIC_EnableIRQ(FDCAN2_IT0_IRQn);
             NVIC_SetPriority(FDCAN2_IT1_IRQn, IRQ_PRI_CAN);
             HAL_NVIC_EnableIRQ(FDCAN2_IT1_IRQn);
             break;
+        #endif
         default:
             return false;
     }
-
-    __HAL_FDCAN_ENABLE_IT(&can_obj->can, FDCAN_IT_BUS_OFF | FDCAN_IT_ERROR_WARNING | FDCAN_IT_ERROR_PASSIVE);
-    __HAL_FDCAN_ENABLE_IT(&can_obj->can, FDCAN_IT_RX_FIFO0_NEW_MESSAGE | FDCAN_IT_RX_FIFO1_NEW_MESSAGE);
-    __HAL_FDCAN_ENABLE_IT(&can_obj->can, FDCAN_IT_RX_FIFO0_MESSAGE_LOST | FDCAN_IT_RX_FIFO1_MESSAGE_LOST);
-    __HAL_FDCAN_ENABLE_IT(&can_obj->can, FDCAN_IT_RX_FIFO0_FULL | FDCAN_IT_RX_FIFO1_FULL);
-
+    // FDCAN IT 0
+    HAL_FDCAN_ConfigInterruptLines(&can_obj->can, FDCAN_IT_GROUP_RX_FIFO0 | FDCAN_IT_GROUP_BIT_LINE_ERROR | FDCAN_IT_GROUP_PROTOCOL_ERROR, FDCAN_INTERRUPT_LINE0);
+    // FDCAN IT 1
+    HAL_FDCAN_ConfigInterruptLines(&can_obj->can, FDCAN_IT_GROUP_RX_FIFO1, FDCAN_INTERRUPT_LINE1);
+
+    uint32_t ActiveITs = FDCAN_IT_BUS_OFF | FDCAN_IT_ERROR_WARNING | FDCAN_IT_ERROR_PASSIVE;
+    ActiveITs |= FDCAN_IT_RX_FIFO0_NEW_MESSAGE | FDCAN_IT_RX_FIFO1_NEW_MESSAGE;
+    ActiveITs |= FDCAN_IT_RX_FIFO0_MESSAGE_LOST | FDCAN_IT_RX_FIFO1_MESSAGE_LOST;
+    ActiveITs |= FDCAN_IT_RX_FIFO0_FULL | FDCAN_IT_RX_FIFO1_FULL;
+    HAL_FDCAN_ActivateNotification(&can_obj->can, ActiveITs, 0);
     return true;
 }
 
@@ -227,10 +261,19 @@ int can_receive(FDCAN_HandleTypeDef *can, int fifo, FDCAN_RxHeaderTypeDef *hdr,
     uint32_t index, *address;
     if (fifo == FDCAN_RX_FIFO0) {
         index = (*rxf & FDCAN_RXF0S_F0GI) >> FDCAN_RXF0S_F0GI_Pos;
+        #if defined(STM32G4)
+        address = (uint32_t *)(can->msgRam.RxFIFO0SA + (index * (18U * 4U)));  // SRAMCAN_RF0_SIZE bytes, size not configurable
+        #else
         address = (uint32_t *)(can->msgRam.RxFIFO0SA + (index * can->Init.RxFifo0ElmtSize * 4));
+        #endif
     } else {
         index = (*rxf & FDCAN_RXF1S_F1GI) >> FDCAN_RXF1S_F1GI_Pos;
+        #if defined(STM32G4)
+        // ToDo: test FIFO1, FIFO 0 is ok
+        address = (uint32_t *)(can->msgRam.RxFIFO1SA + (index * (18U * 4U)));  // SRAMCAN_RF1_SIZE bytes, size not configurable
+        #else
         address = (uint32_t *)(can->msgRam.RxFIFO1SA + (index * can->Init.RxFifo1ElmtSize * 4));
+        #endif
     }
 
     // Parse header of message
@@ -251,7 +294,7 @@ int can_receive(FDCAN_HandleTypeDef *can, int fifo, FDCAN_RxHeaderTypeDef *hdr,
 
     // Copy data
     uint8_t *pdata = (uint8_t *)address;
-    for (uint32_t i = 0; i < 8; ++i) { // TODO use DLCtoBytes[hdr->DataLength] for length > 8
+    for (uint32_t i = 0; i < DLCtoBytes[hdr->DataLength]; ++i) {
         *data++ = *pdata++;
     }
 
@@ -269,41 +312,97 @@ STATIC void can_rx_irq_handler(uint can_id, uint fifo_id) {
 
     self = MP_STATE_PORT(pyb_can_obj_all)[can_id - 1];
 
+    CAN_TypeDef *can = self->can.Instance;
+
+    uint32_t RxFifo0ITs;
+    uint32_t RxFifo1ITs;
+    // uint32_t Errors;
+    uint32_t ErrorStatusITs;
+    uint32_t Psr;
+
+    RxFifo0ITs = can->IR & FDCAN_RX_FIFO0_MASK;
+    RxFifo0ITs &= can->IE;
+    RxFifo1ITs = can->IR & FDCAN_RX_FIFO1_MASK;
+    RxFifo1ITs &= can->IE;
+    // Errors = (&self->can)->Instance->IR & FDCAN_ERROR_MASK;
+    // Errors &= (&self->can)->Instance->IE;
+    ErrorStatusITs = can->IR & FDCAN_ERROR_STATUS_MASK;
+    ErrorStatusITs &= can->IE;
+    Psr = can->PSR;
+
     if (fifo_id == FDCAN_RX_FIFO0) {
         callback = self->rxcallback0;
         state = &self->rx_state0;
+        if (RxFifo0ITs & FDCAN_FLAG_RX_FIFO0_NEW_MESSAGE) {
+            __HAL_FDCAN_DISABLE_IT(&self->can, FDCAN_IT_RX_FIFO0_NEW_MESSAGE);
+            __HAL_FDCAN_CLEAR_FLAG(&self->can, FDCAN_FLAG_RX_FIFO0_NEW_MESSAGE);
+            irq_reason = MP_OBJ_NEW_SMALL_INT(0);
+            *state = RX_STATE_MESSAGE_PENDING;
+
+        }
+        if (RxFifo0ITs & FDCAN_FLAG_RX_FIFO0_FULL) {
+            __HAL_FDCAN_DISABLE_IT(&self->can, FDCAN_IT_RX_FIFO0_FULL);
+            __HAL_FDCAN_CLEAR_FLAG(&self->can, FDCAN_FLAG_RX_FIFO0_FULL);
+            irq_reason = MP_OBJ_NEW_SMALL_INT(1);
+            *state = RX_STATE_FIFO_FULL;
+
+        }
+        if (RxFifo0ITs & FDCAN_FLAG_RX_FIFO0_MESSAGE_LOST) {
+            __HAL_FDCAN_DISABLE_IT(&self->can, FDCAN_IT_RX_FIFO0_MESSAGE_LOST);
+            __HAL_FDCAN_CLEAR_FLAG(&self->can, FDCAN_FLAG_RX_FIFO0_MESSAGE_LOST);
+            irq_reason = MP_OBJ_NEW_SMALL_INT(2);
+            *state = RX_STATE_FIFO_OVERFLOW;
+        }
+
     } else {
         callback = self->rxcallback1;
         state = &self->rx_state1;
-    }
-
-    switch (*state) {
-        case RX_STATE_FIFO_EMPTY:
-            __HAL_FDCAN_DISABLE_IT(&self->can,  (fifo_id == FDCAN_RX_FIFO0) ?
-                FDCAN_IT_RX_FIFO0_NEW_MESSAGE : FDCAN_IT_RX_FIFO1_NEW_MESSAGE);
+        if (RxFifo1ITs & FDCAN_FLAG_RX_FIFO1_NEW_MESSAGE) {
+            __HAL_FDCAN_DISABLE_IT(&self->can, FDCAN_IT_RX_FIFO1_NEW_MESSAGE);
+            __HAL_FDCAN_CLEAR_FLAG(&self->can, FDCAN_FLAG_RX_FIFO1_NEW_MESSAGE);
             irq_reason = MP_OBJ_NEW_SMALL_INT(0);
             *state = RX_STATE_MESSAGE_PENDING;
-            break;
-        case RX_STATE_MESSAGE_PENDING:
-            __HAL_FDCAN_DISABLE_IT(&self->can, (fifo_id == FDCAN_RX_FIFO0) ? FDCAN_IT_RX_FIFO0_FULL : FDCAN_IT_RX_FIFO1_FULL);
-            __HAL_FDCAN_CLEAR_FLAG(&self->can, (fifo_id == FDCAN_RX_FIFO0) ? FDCAN_FLAG_RX_FIFO0_FULL : FDCAN_FLAG_RX_FIFO1_FULL);
+
+        }
+        if (RxFifo1ITs & FDCAN_FLAG_RX_FIFO1_FULL) {
+            __HAL_FDCAN_DISABLE_IT(&self->can, FDCAN_IT_RX_FIFO1_FULL);
+            __HAL_FDCAN_CLEAR_FLAG(&self->can, FDCAN_FLAG_RX_FIFO1_FULL);
             irq_reason = MP_OBJ_NEW_SMALL_INT(1);
             *state = RX_STATE_FIFO_FULL;
-            break;
-        case RX_STATE_FIFO_FULL:
-            __HAL_FDCAN_DISABLE_IT(&self->can, (fifo_id == FDCAN_RX_FIFO0) ?
-                FDCAN_IT_RX_FIFO0_MESSAGE_LOST : FDCAN_IT_RX_FIFO1_MESSAGE_LOST);
-            __HAL_FDCAN_CLEAR_FLAG(&self->can, (fifo_id == FDCAN_RX_FIFO0) ?
-                FDCAN_FLAG_RX_FIFO0_MESSAGE_LOST : FDCAN_FLAG_RX_FIFO1_MESSAGE_LOST);
+
+        }
+        if (RxFifo1ITs & FDCAN_FLAG_RX_FIFO1_MESSAGE_LOST) {
+            __HAL_FDCAN_DISABLE_IT(&self->can, FDCAN_IT_RX_FIFO1_MESSAGE_LOST);
+            __HAL_FDCAN_CLEAR_FLAG(&self->can, FDCAN_FLAG_RX_FIFO1_MESSAGE_LOST);
             irq_reason = MP_OBJ_NEW_SMALL_INT(2);
             *state = RX_STATE_FIFO_OVERFLOW;
-            break;
-        case RX_STATE_FIFO_OVERFLOW:
-            // This should never happen
-            break;
+        }
+    }
+
+    if (ErrorStatusITs & FDCAN_FLAG_ERROR_WARNING) {
+        __HAL_FDCAN_CLEAR_FLAG(&self->can, FDCAN_FLAG_ERROR_WARNING);
+        if (Psr & FDCAN_PSR_EW) {
+            irq_reason = MP_OBJ_NEW_SMALL_INT(3);
+            // mp_printf(MICROPY_ERROR_PRINTER, "clear warning %08x\n", (can->IR & FDCAN_ERROR_STATUS_MASK));
+        }
+    }
+    if (ErrorStatusITs & FDCAN_FLAG_ERROR_PASSIVE) {
+        __HAL_FDCAN_CLEAR_FLAG(&self->can, FDCAN_FLAG_ERROR_PASSIVE);
+        if (Psr & FDCAN_PSR_EP) {
+            irq_reason = MP_OBJ_NEW_SMALL_INT(4);
+            // mp_printf(MICROPY_ERROR_PRINTER, "clear passive %08x\n", (can->IR & FDCAN_ERROR_STATUS_MASK));
+        }
+    }
+    if (ErrorStatusITs & FDCAN_FLAG_BUS_OFF) {
+        __HAL_FDCAN_CLEAR_FLAG(&self->can, FDCAN_FLAG_BUS_OFF);
+        if (Psr & FDCAN_PSR_BO) {
+            irq_reason = MP_OBJ_NEW_SMALL_INT(5);
+            // mp_printf(MICROPY_ERROR_PRINTER, "bus off %08x\n", (can->IR & FDCAN_ERROR_STATUS_MASK));
+        }
     }
 
     pyb_can_handle_callback(self, fifo_id, callback, irq_reason);
+    // mp_printf(MICROPY_ERROR_PRINTER, "Ints: %08x, %08x, %08x\n", RxFifo0ITs, RxFifo1ITs, ErrorStatusITs);
 }
 
 #if defined(MICROPY_HW_CAN1_TX)
diff --git a/ports/stm32/make-stmconst.py b/ports/stm32/make-stmconst.py
index 217a801a8f658..554d662384454 100644
--- a/ports/stm32/make-stmconst.py
+++ b/ports/stm32/make-stmconst.py
@@ -64,7 +64,7 @@ class Lexer:
         (
             "#define typedef",
             re.compile(
-                r"#define +(?P<id>[A-Z0-9_]+(ext)?) +\(\([A-Za-z0-9_]+_TypeDef \*\) (?P<id2>[A-Za-z0-9_]+)\)($| +/\*)"
+                r"#define +(?P<id>[A-Z0-9_]+(ext)?) +\(\([A-Za-z0-9_]+_(Global)?TypeDef \*\) (?P<id2>[A-Za-z0-9_]+)\)($| +/\*)"
             ),
         ),
         ("typedef struct", re.compile(r"typedef struct$")),
@@ -281,6 +281,7 @@ def main():
         #'CAN_FIFOMailBox',
         #'CAN_FilterRegister',
         #'CAN',
+        "FDCAN",
         "CRC",
         "DAC",
         "DBGMCU",
diff --git a/ports/stm32/pyb_can.c b/ports/stm32/pyb_can.c
index 3e55069ab9ac3..8007fd9e3cc94 100644
--- a/ports/stm32/pyb_can.c
+++ b/ports/stm32/pyb_can.c
@@ -47,8 +47,14 @@
 #define CAN_FIFO1                   FDCAN_RX_FIFO1
 #define CAN_FILTER_FIFO0            (0)
 
-// Default timings; 125Kbps assuming 48MHz clock
+// Default timings; 125Kbps
+#if defined(STM32G4)
+// assuming 24MHz clock
+#define CAN_DEFAULT_PRESCALER       (16)
+#else
+// assuming 48MHz clock
 #define CAN_DEFAULT_PRESCALER       (32)
+#endif
 #define CAN_DEFAULT_SJW             (1)
 #define CAN_DEFAULT_BS1             (8)
 #define CAN_DEFAULT_BS2             (3)
@@ -60,8 +66,10 @@
 
 #define CAN1_RX0_IRQn               FDCAN1_IT0_IRQn
 #define CAN1_RX1_IRQn               FDCAN1_IT1_IRQn
+#if defined(CAN2)
 #define CAN2_RX0_IRQn               FDCAN2_IT0_IRQn
 #define CAN2_RX1_IRQn               FDCAN2_IT1_IRQn
+#endif
 
 #define CAN_IT_FIFO0_FULL           FDCAN_IT_RX_FIFO0_FULL
 #define CAN_IT_FIFO1_FULL           FDCAN_IT_RX_FIFO1_FULL
@@ -326,6 +334,9 @@ STATIC mp_obj_t pyb_can_restart(mp_obj_t self_in) {
     can->CCCR |= FDCAN_CCCR_INIT;
     while ((can->CCCR & FDCAN_CCCR_INIT) == 0) {
     }
+    can->CCCR |= FDCAN_CCCR_CCE;
+    while ((can->CCCR & FDCAN_CCCR_CCE) == 0) {
+    }
     can->CCCR &= ~FDCAN_CCCR_INIT;
     while ((can->CCCR & FDCAN_CCCR_INIT)) {
     }
@@ -348,11 +359,12 @@ STATIC mp_obj_t pyb_can_state(mp_obj_t self_in) {
     if (self->is_enabled) {
         CAN_TypeDef *can = self->can.Instance;
         #if MICROPY_HW_ENABLE_FDCAN
-        if (can->PSR & FDCAN_PSR_BO) {
+        uint32_t psr = can->PSR;
+        if (psr & FDCAN_PSR_BO) {
             state = CAN_STATE_BUS_OFF;
-        } else if (can->PSR & FDCAN_PSR_EP) {
+        } else if (psr & FDCAN_PSR_EP) {
             state = CAN_STATE_ERROR_PASSIVE;
-        } else if (can->PSR & FDCAN_PSR_EW) {
+        } else if (psr & FDCAN_PSR_EW) {
             state = CAN_STATE_ERROR_WARNING;
         } else {
             state = CAN_STATE_ERROR_ACTIVE;
@@ -375,10 +387,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(pyb_can_state_obj, pyb_can_state);
 
 // Get info about error states and TX/RX buffers
 STATIC mp_obj_t pyb_can_info(size_t n_args, const mp_obj_t *args) {
-    #if MICROPY_HW_ENABLE_FDCAN
-    // TODO implement for FDCAN
-    return mp_const_none;
-    #else
     pyb_can_obj_t *self = MP_OBJ_TO_PTR(args[0]);
     mp_obj_list_t *list;
     if (n_args == 1) {
@@ -392,6 +400,20 @@ STATIC mp_obj_t pyb_can_info(size_t n_args, const mp_obj_t *args) {
             mp_raise_ValueError(NULL);
         }
     }
+
+    #if MICROPY_HW_ENABLE_FDCAN
+    FDCAN_GlobalTypeDef *can = self->can.Instance;
+    uint32_t esr = can->ECR;
+    list->items[0] = MP_OBJ_NEW_SMALL_INT((esr & FDCAN_ECR_TEC_Msk) >> FDCAN_ECR_TEC_Pos);
+    list->items[1] = MP_OBJ_NEW_SMALL_INT((esr & FDCAN_ECR_REC_Msk) >> FDCAN_ECR_REC_Pos);
+    list->items[2] = MP_OBJ_NEW_SMALL_INT(self->num_error_warning);
+    list->items[3] = MP_OBJ_NEW_SMALL_INT(self->num_error_passive);
+    list->items[4] = MP_OBJ_NEW_SMALL_INT(self->num_bus_off);
+    uint32_t TXEFS = can->TXEFS;
+    list->items[5] = MP_OBJ_NEW_SMALL_INT(TXEFS & 0x7);
+    list->items[6] = MP_OBJ_NEW_SMALL_INT((can->RXF0S & FDCAN_RXF0S_F0FL_Msk) >> FDCAN_RXF0S_F0FL_Pos);
+    list->items[7] = MP_OBJ_NEW_SMALL_INT((can->RXF1S & FDCAN_RXF1S_F1FL_Msk) >> FDCAN_RXF1S_F1FL_Pos);
+    #else
     CAN_TypeDef *can = self->can.Instance;
     uint32_t esr = can->ESR;
     list->items[0] = MP_OBJ_NEW_SMALL_INT(esr >> CAN_ESR_TEC_Pos & 0xff);
@@ -403,8 +425,9 @@ STATIC mp_obj_t pyb_can_info(size_t n_args, const mp_obj_t *args) {
     list->items[5] = MP_OBJ_NEW_SMALL_INT(n_tx_pending);
     list->items[6] = MP_OBJ_NEW_SMALL_INT(can->RF0R >> CAN_RF0R_FMP0_Pos & 3);
     list->items[7] = MP_OBJ_NEW_SMALL_INT(can->RF1R >> CAN_RF1R_FMP1_Pos & 3);
-    return MP_OBJ_FROM_PTR(list);
     #endif
+
+    return MP_OBJ_FROM_PTR(list);
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pyb_can_info_obj, 1, 2, pyb_can_info);
 

From 517e82eb6b7d93134637b5658132479f4fc260e3 Mon Sep 17 00:00:00 2001
From: Herwin Grobben <h.grobben@aemics.nl>
Date: Wed, 1 Dec 2021 17:10:22 +0100
Subject: [PATCH 1637/3533] stm32/fdcan: Fix naming with regards to G4 series.

---
 ports/stm32/fdcan.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/ports/stm32/fdcan.c b/ports/stm32/fdcan.c
index 778902735ead6..8465b806ae9cc 100644
--- a/ports/stm32/fdcan.c
+++ b/ports/stm32/fdcan.c
@@ -48,6 +48,14 @@
 #define FDCAN_RX_FIFO1_MASK (FDCAN_FLAG_RX_FIFO1_MESSAGE_LOST | FDCAN_FLAG_RX_FIFO1_FULL | FDCAN_FLAG_RX_FIFO1_NEW_MESSAGE)
 #define FDCAN_ERROR_STATUS_MASK (FDCAN_FLAG_ERROR_PASSIVE | FDCAN_FLAG_ERROR_WARNING | FDCAN_FLAG_BUS_OFF)
 
+#if defined(STM32H7)
+// adaptations for H7 to G4 naming convention in HAL
+#define FDCAN_IT_GROUP_RX_FIFO0         (FDCAN_ILS_RF0NL | FDCAN_ILS_RF0FL | FDCAN_ILS_RF0LL)
+#define FDCAN_IT_GROUP_BIT_LINE_ERROR   (FDCAN_ILS_EPE | FDCAN_ILS_ELOE)
+#define FDCAN_IT_GROUP_PROTOCOL_ERROR   (FDCAN_ILS_ARAE | FDCAN_ILS_PEDE | FDCAN_ILS_PEAE | FDCAN_ILS_WDIE | FDCAN_ILS_BOE | FDCAN_ILS_EWE)
+#define FDCAN_IT_GROUP_RX_FIFO1         (FDCAN_ILS_RF1NL | FDCAN_ILS_RF1FL | FDCAN_ILS_RF1LL)
+#endif
+
 // also defined in <PROC>_hal_fdcan.c, but not able to declare extern and reach the variable
 static const uint8_t DLCtoBytes[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 12, 16, 20, 24, 32, 48, 64};
 

From 14becd80c9587e7afed56aebab4bf347971ff6e4 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 31 Jan 2022 16:38:32 +1100
Subject: [PATCH 1638/3533] stm32/usbd_conf: Set lpm_enable and
 battery_charging_enable on all MCUs.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/usbd_conf.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/ports/stm32/usbd_conf.c b/ports/stm32/usbd_conf.c
index 50e10ba178bf6..1fb2777831301 100644
--- a/ports/stm32/usbd_conf.c
+++ b/ports/stm32/usbd_conf.c
@@ -391,10 +391,8 @@ USBD_StatusTypeDef USBD_LL_Init(USBD_HandleTypeDef *pdev, int high_speed, const
         pcd_fs_handle.Init.phy_itface = PCD_PHY_EMBEDDED;
         pcd_fs_handle.Init.Sof_enable = 0;
         pcd_fs_handle.Init.speed = PCD_SPEED_FULL;
-        #if defined(STM32L4)
         pcd_fs_handle.Init.lpm_enable = DISABLE;
         pcd_fs_handle.Init.battery_charging_enable = DISABLE;
-        #endif
         #if MICROPY_HW_USB_IS_MULTI_OTG
         pcd_fs_handle.Init.use_dedicated_ep1 = 0;
         pcd_fs_handle.Init.dma_enable = 0;

From 4a4f269a1ae0e23c0d9815c7f8b1b7ff6ba22cc1 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 31 Jan 2022 16:39:26 +1100
Subject: [PATCH 1639/3533] stm32/powerctrlboot: Set HAL uwTickPrio variable
 when needed.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/powerctrlboot.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/ports/stm32/powerctrlboot.c b/ports/stm32/powerctrlboot.c
index caa5632926e85..41b56296e0af0 100644
--- a/ports/stm32/powerctrlboot.c
+++ b/ports/stm32/powerctrlboot.c
@@ -33,6 +33,11 @@ void powerctrl_config_systick(void) {
     SysTick->CTRL |= SYSTICK_CLKSOURCE_HCLK;
     SysTick_Config(HAL_RCC_GetHCLKFreq() / 1000);
     NVIC_SetPriority(SysTick_IRQn, IRQ_PRI_SYSTICK);
+
+    #if !BUILDING_MBOOT && (defined(STM32H7) || defined(STM32L4) || defined(STM32WB))
+    // Set SysTick IRQ priority variable in case the HAL needs to use it
+    uwTickPrio = IRQ_PRI_SYSTICK;
+    #endif
 }
 
 #if defined(STM32F0)

From c99ed8d6fa9d4429bf78bcd965ce60ee747e67c3 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 31 Jan 2022 16:40:15 +1100
Subject: [PATCH 1640/3533] stm32/powerctrl: Write bootloader-state as 64-bit
 word to work on H7.

H7 MCUs have ECC and writes do not go through to SRAM until 64-bits have
been written (on another location is written).  So use 64-bit writes for
the bootloader-state variable so it is committed before the system reset.

As part of this change, the lower byte of the bootloader address in
BL_STATE must now be the magic number 0x5a5 for the state to be valid
(previously this was 0x000 which is not as robust).

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/powerctrl.c | 30 +++++++++++++++++++-----------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/ports/stm32/powerctrl.c b/ports/stm32/powerctrl.c
index 406325581b667..a3f8207e9a0d4 100644
--- a/ports/stm32/powerctrl.c
+++ b/ports/stm32/powerctrl.c
@@ -75,9 +75,19 @@
 #endif
 
 #if MICROPY_HW_ENTER_BOOTLOADER_VIA_RESET
-// Location in RAM of bootloader state (just after the top of the stack)
-extern uint32_t _estack[];
-#define BL_STATE ((uint32_t *)&_estack)
+// Location in RAM of bootloader state (just after the top of the stack).
+// STM32H7 has ECC and writes to RAM must be 64-bit so they are fully committed
+// to actual SRAM before a system reset occurs.
+#define BL_STATE_PTR                ((uint64_t *)&_estack)
+#define BL_STATE_KEY                (0x5a5)
+#define BL_STATE_KEY_MASK           (0xfff)
+#define BL_STATE_KEY_SHIFT          (32)
+#define BL_STATE_INVALID            (0)
+#define BL_STATE_VALID(reg, addr)   ((uint64_t)(reg) | ((uint64_t)((addr) | BL_STATE_KEY)) << BL_STATE_KEY_SHIFT)
+#define BL_STATE_GET_REG(s)         ((s) & 0xffffffff)
+#define BL_STATE_GET_KEY(s)         (((s) >> BL_STATE_KEY_SHIFT) & BL_STATE_KEY_MASK)
+#define BL_STATE_GET_ADDR(s)        (((s) >> BL_STATE_KEY_SHIFT) & ~BL_STATE_KEY_MASK)
+extern uint64_t _estack[];
 #endif
 
 static inline void powerctrl_disable_hsi_if_unused(void) {
@@ -89,7 +99,7 @@ static inline void powerctrl_disable_hsi_if_unused(void) {
 
 NORETURN void powerctrl_mcu_reset(void) {
     #if MICROPY_HW_ENTER_BOOTLOADER_VIA_RESET
-    BL_STATE[1] = 1; // invalidate bootloader address
+    *BL_STATE_PTR = BL_STATE_INVALID;
     #if __DCACHE_PRESENT == 1
     SCB_CleanDCache();
     #endif
@@ -112,8 +122,7 @@ NORETURN void powerctrl_enter_bootloader(uint32_t r0, uint32_t bl_addr) {
 
     // Enter the bootloader via a reset, so everything is reset (including WDT).
     // Upon reset powerctrl_check_enter_bootloader() will jump to the bootloader.
-    BL_STATE[0] = r0;
-    BL_STATE[1] = bl_addr;
+    *BL_STATE_PTR = BL_STATE_VALID(r0, bl_addr);
     #if __DCACHE_PRESENT == 1
     SCB_CleanDCache();
     #endif
@@ -129,16 +138,15 @@ NORETURN void powerctrl_enter_bootloader(uint32_t r0, uint32_t bl_addr) {
 
 void powerctrl_check_enter_bootloader(void) {
     #if MICROPY_HW_ENTER_BOOTLOADER_VIA_RESET
-    uint32_t bl_addr = BL_STATE[1];
-    BL_STATE[1] = 1; // invalidate bootloader address
-    if ((bl_addr & 0xfff) == 0 && (RCC->RCC_SR & RCC_SR_SFTRSTF)) {
+    uint64_t bl_state = *BL_STATE_PTR;
+    *BL_STATE_PTR = BL_STATE_INVALID;
+    if (BL_STATE_GET_KEY(bl_state) == BL_STATE_KEY && (RCC->RCC_SR & RCC_SR_SFTRSTF)) {
         // Reset by NVIC_SystemReset with bootloader data set -> branch to bootloader
         RCC->RCC_SR = RCC_SR_RMVF;
         #if defined(STM32F0) || defined(STM32F4) || defined(STM32L0) || defined(STM32L4) || defined(STM32WB)
         __HAL_SYSCFG_REMAPMEMORY_SYSTEMFLASH();
         #endif
-        uint32_t r0 = BL_STATE[0];
-        branch_to_bootloader(r0, bl_addr);
+        branch_to_bootloader(BL_STATE_GET_REG(bl_state), BL_STATE_GET_ADDR(bl_state));
     }
     #endif
 }

From c8c229b96c892ceb8ca1cf72e4a87096617ede64 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 31 Jan 2022 16:47:03 +1100
Subject: [PATCH 1641/3533] stm32/mboot: Use PLL3 for USB clock source on H7
 MCUs.

PLL3-Q is more reliable than PLL1-Q for the USB clock source when entering
mboot from various reset states (eg power on vs MCU reset).  (It was found
that if the main application used PLL3-Q then sometimes the USB clock
source would stay stuck on PLL3-Q and not switch to PLL1-Q after a reset.)

Other related changes:
- SystemCoreClockUpdate() should be called on H7 because the calculation
  can be involved in some cases.
- __set_PRIMASK(0) should be called because on H7 the built-in ST DFU
  bootloader exits with IRQs disabled.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/mboot/main.c | 42 +++++++++++++++++++++++++++++++---------
 1 file changed, 33 insertions(+), 9 deletions(-)

diff --git a/ports/stm32/mboot/main.c b/ports/stm32/mboot/main.c
index 3c3e4a8642a9b..ae409168b9666 100644
--- a/ports/stm32/mboot/main.c
+++ b/ports/stm32/mboot/main.c
@@ -265,27 +265,48 @@ void SystemClock_Config(void) {
     while (__HAL_RCC_GET_FLAG(RCC_FLAG_PLLRDY) != RESET) {
     }
 
-    // Configure PLL1 factors and source
-    RCC->PLLCKSELR =
-        MICROPY_HW_CLK_PLLM << RCC_PLLCKSELR_DIVM1_Pos
-        | 2 << RCC_PLLCKSELR_PLLSRC_Pos; // HSE selected as PLL source
+    // Disable PLL3
+    __HAL_RCC_PLL3_DISABLE();
+    while (__HAL_RCC_GET_FLAG(RCC_FLAG_PLL3RDY) != RESET) {
+    }
+
+    // Select HSE as PLLx source
+    RCC->PLLCKSELR = 2 << RCC_PLLCKSELR_PLLSRC_Pos;
+    RCC->PLLCFGR = 0;
+
+    // Configure PLL1 for use by SYSCLK
+    RCC->PLLCKSELR |= MICROPY_HW_CLK_PLLM << RCC_PLLCKSELR_DIVM1_Pos;
+    RCC->PLLCFGR |= RCC_PLLCFGR_DIVP1EN;
+    RCC->PLL1FRACR = 0;
     RCC->PLL1DIVR =
         (MICROPY_HW_CLK_PLLN - 1) << RCC_PLL1DIVR_N1_Pos
         | (MICROPY_HW_CLK_PLLP - 1) << RCC_PLL1DIVR_P1_Pos // only even P allowed
         | (MICROPY_HW_CLK_PLLQ - 1) << RCC_PLL1DIVR_Q1_Pos
         | (MICROPY_HW_CLK_PLLR - 1) << RCC_PLL1DIVR_R1_Pos;
 
-    // Enable PLL1 outputs for SYSCLK and USB
-    RCC->PLLCFGR = RCC_PLLCFGR_DIVP1EN | RCC_PLLCFGR_DIVQ1EN;
+    // Configure PLL3 for use by USB at Q=48MHz
+    RCC->PLLCKSELR |= MICROPY_HW_CLK_PLL3M << RCC_PLLCKSELR_DIVM3_Pos;
+    RCC->PLLCFGR |= RCC_PLLCFGR_DIVQ3EN;
+    RCC->PLL3FRACR = 0;
+    RCC->PLL3DIVR =
+        (MICROPY_HW_CLK_PLL3N - 1) << RCC_PLL3DIVR_N3_Pos
+        | (MICROPY_HW_CLK_PLL3P - 1) << RCC_PLL3DIVR_P3_Pos // only even P allowed
+        | (MICROPY_HW_CLK_PLL3Q - 1) << RCC_PLL3DIVR_Q3_Pos
+        | (MICROPY_HW_CLK_PLL3R - 1) << RCC_PLL3DIVR_R3_Pos;
 
-    // Select PLL1-Q for USB clock source
-    RCC->D2CCIP2R |= 1 << RCC_D2CCIP2R_USBSEL_Pos;
+    // Select PLL3-Q for USB clock source
+    MODIFY_REG(RCC->D2CCIP2R, RCC_D2CCIP2R_USBSEL, RCC_D2CCIP2R_USBSEL_1);
 
     // Enable PLL1
     __HAL_RCC_PLL_ENABLE();
     while(__HAL_RCC_GET_FLAG(RCC_FLAG_PLLRDY) == RESET) {
     }
 
+    // Enable PLL3
+    __HAL_RCC_PLL3_ENABLE();
+    while(__HAL_RCC_GET_FLAG(RCC_FLAG_PLL3RDY) == RESET) {
+    }
+
     // Increase latency before changing SYSCLK
     if (MICROPY_HW_FLASH_LATENCY > (FLASH->ACR & FLASH_ACR_LATENCY)) {
         __HAL_FLASH_SET_LATENCY(MICROPY_HW_FLASH_LATENCY);
@@ -320,7 +341,7 @@ void SystemClock_Config(void) {
         ;
 
     // Update clock value and reconfigure systick now that the frequency changed
-    SystemCoreClock = CORE_PLL_FREQ;
+    SystemCoreClockUpdate();
     systick_init();
 }
 
@@ -1486,6 +1507,9 @@ void stm32_main(int initial_r0) {
     // set the system clock to be HSE
     SystemClock_Config();
 
+    // Ensure IRQs are enabled (needed coming out of ST bootloader on H7)
+    __set_PRIMASK(0);
+
     #if USE_USB_POLLING
     // irqs with a priority value greater or equal to "pri" will be disabled
     // "pri" should be between 1 and 15 inclusive

From 29867a24391ae3938ae43b354297139b7a229b73 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 31 Jan 2022 16:55:07 +1100
Subject: [PATCH 1642/3533] stm32/mboot: Include hal_rcc_ex.c in source file
 list.

It's needed at least on F4 because this file overrides the weak function
HAL_RCC_DeInit() from hal_rcc.c.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/mboot/Makefile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/stm32/mboot/Makefile b/ports/stm32/mboot/Makefile
index 7e1b497cef639..20b0db9070cd4 100755
--- a/ports/stm32/mboot/Makefile
+++ b/ports/stm32/mboot/Makefile
@@ -162,6 +162,7 @@ SRC_HAL += $(addprefix $(HAL_DIR)/Src/stm32$(MCU_SERIES)xx_,\
 	hal_pcd.c \
 	hal_pcd_ex.c \
 	hal_rcc.c \
+	hal_rcc_ex.c \
 	ll_usb.c \
 	)
 

From ca1914fb474dd7a2a6e94ba835cea45b0bcd742b Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 31 Jan 2022 16:55:50 +1100
Subject: [PATCH 1643/3533] stm32/mboot: Support H7 MCUs in fwupdate.py.

And optimise the speed of flash writing.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/mboot/fwupdate.py | 153 ++++++++++++++++++++++------------
 1 file changed, 101 insertions(+), 52 deletions(-)

diff --git a/ports/stm32/mboot/fwupdate.py b/ports/stm32/mboot/fwupdate.py
index d7c8f46db4c53..8a366dae2942c 100644
--- a/ports/stm32/mboot/fwupdate.py
+++ b/ports/stm32/mboot/fwupdate.py
@@ -1,5 +1,5 @@
 # Update Mboot or MicroPython from a .dfu.gz file on the board's filesystem
-# MIT license; Copyright (c) 2019-2020 Damien P. George
+# MIT license; Copyright (c) 2019-2022 Damien P. George
 
 from micropython import const
 import struct, time
@@ -16,9 +16,6 @@
 _ELEM_TYPE_FSLOAD = const(3)
 _ELEM_TYPE_STATUS = const(4)
 
-FLASH_KEY1 = 0x45670123
-FLASH_KEY2 = 0xCDEF89AB
-
 
 def check_mem_contains(addr, buf):
     mem8 = stm.mem8
@@ -29,15 +26,6 @@ def check_mem_contains(addr, buf):
     return True
 
 
-def check_mem_erased(addr, size):
-    mem16 = stm.mem16
-    r = range(0, size, 2)
-    for off in r:
-        if mem16[addr + off] != 0xFFFF:
-            return False
-    return True
-
-
 def dfu_read(filename):
     f = open(filename, "rb")
 
@@ -85,39 +73,99 @@ def dfu_read(filename):
     return elems
 
 
-def flash_wait_not_busy():
-    while stm.mem32[stm.FLASH + stm.FLASH_SR] & 1 << 16:
-        machine.idle()
-
-
-def flash_unlock():
-    stm.mem32[stm.FLASH + stm.FLASH_KEYR] = FLASH_KEY1
-    stm.mem32[stm.FLASH + stm.FLASH_KEYR] = FLASH_KEY2
-
-
-def flash_lock():
-    stm.mem32[stm.FLASH + stm.FLASH_CR] = 1 << 31  # LOCK
-
-
-def flash_erase_sector(sector):
-    assert 0 <= sector <= 7  # for F722
-    flash_wait_not_busy()
-    cr = 2 << 8 | sector << 3 | 1 << 1  # PSIZE = 32 bits  # SNB  # SER
-    stm.mem32[stm.FLASH + stm.FLASH_CR] = cr
-    stm.mem32[stm.FLASH + stm.FLASH_CR] = cr | 1 << 16  # STRT
-    flash_wait_not_busy()
-    stm.mem32[stm.FLASH + stm.FLASH_CR] = 0
-
-
-def flash_write(addr, buf):
-    assert len(buf) % 4 == 0
-    flash_wait_not_busy()
-    cr = 2 << 8 | 1 << 0  # PSIZE = 32 bits  # PG
-    stm.mem32[stm.FLASH + stm.FLASH_CR] = cr
-    for off in range(0, len(buf), 4):
-        stm.mem32[addr + off] = struct.unpack_from("I", buf, off)[0]
-        flash_wait_not_busy()
-    stm.mem32[stm.FLASH + stm.FLASH_CR] = 0
+class Flash:
+    _FLASH_KEY1 = 0x45670123
+    _FLASH_KEY2 = 0xCDEF89AB
+
+    def __init__(self):
+        import os, uctypes
+
+        self.addressof = uctypes.addressof
+
+        # Detect MCU.
+        machine = os.uname().machine
+        if "STM32F4" in machine or "STM32F7" in machine:
+            dev_id = stm.mem32[0xE004_2000] & 0xFFF
+        elif "STM32H7" in machine:
+            dev_id = stm.mem32[0x5C00_1000] & 0xFFF
+        else:
+            dev_id = 0
+
+        # Configure flash parameters based on MCU.
+        if dev_id in (0x413, 0x419, 0x431, 0x451, 0x452):
+            # 0x413: STM32F405/407, STM32F415/417
+            # 0x419: STM32F42x/43x
+            # 0x431: STM32F411
+            # 0x451: STM32F76x/77x
+            # 0x452: STM32F72x/73x
+            self._keyr = stm.FLASH + stm.FLASH_KEYR
+            self._sr = stm.FLASH + stm.FLASH_SR
+            self._sr_busy = 1 << 16
+            self._cr = stm.FLASH + stm.FLASH_CR
+            self._cr_lock = 1 << 31
+            self._cr_init_erase = lambda s: 2 << 8 | s << 3 | 1 << 1  # PSIZE=32-bits, SNB, SER
+            self._cr_start_erase = 1 << 16  # STRT
+            self._cr_init_write = 2 << 8 | 1 << 0  # PSIZE=32-bits, PG
+            self._cr_flush = None
+            self._write_multiple = 4
+            if dev_id == 0x451 and stm.mem32[0x1FFF_0008] & 1 << 13:  # check nDBANK
+                # STM32F76x/77x in single-bank mode
+                self.sector0_size = 32 * 1024
+            else:
+                self.sector0_size = 16 * 1024
+        elif dev_id == 0x450:
+            # 0x450: STM32H742, STM32H743/753, STM32H750
+            self._keyr = stm.FLASH + stm.FLASH_KEYR1
+            self._sr = stm.FLASH + stm.FLASH_SR1
+            self._sr_busy = 1 << 2  # QW1
+            self._cr = stm.FLASH + stm.FLASH_CR1
+            self._cr_lock = 1 << 0  # LOCK1
+            self._cr_init_erase = lambda s: s << 8 | 3 << 4 | 1 << 2  # SNB1, PSIZE1=64-bits, SER1
+            self._cr_start_erase = 1 << 7  # START1
+            self._cr_init_write = 3 << 4 | 1 << 1  # PSIZE1=64-bits, PG1=1
+            self._cr_flush = 1 << 6  # FW1=1
+            self._write_multiple = 16
+            self.sector0_size = 128 * 1024
+        else:
+            raise Exception(f"unknown MCU {machine} DEV_ID=0x{dev_id:x}")
+
+    def wait_not_busy(self):
+        while stm.mem32[self._sr] & self._sr_busy:
+            machine.idle()
+
+    def unlock(self):
+        if stm.mem32[self._cr] & self._cr_lock:
+            stm.mem32[self._keyr] = self._FLASH_KEY1
+            stm.mem32[self._keyr] = self._FLASH_KEY2
+
+    def lock(self):
+        stm.mem32[self._cr] = self._cr_lock
+
+    def erase_sector(self, sector):
+        assert 0 <= sector <= 7
+        self.wait_not_busy()
+        stm.mem32[self._cr] = self._cr_init_erase(sector)
+        stm.mem32[self._cr] |= self._cr_start_erase
+        self.wait_not_busy()
+        stm.mem32[self._cr] = 0
+
+    # This method is optimised for speed, to reduce the time data is being written.
+    def write(self, addr, buf):
+        assert len(buf) % 4 == 0
+        mem32 = stm.mem32
+        buf_addr = self.addressof(buf)
+        r = range(0, len(buf), 4)
+        self.wait_not_busy()
+        mem32[self._cr] = self._cr_init_write
+        for off in r:
+            mem32[addr + off] = mem32[buf_addr + off]
+            if off % self._write_multiple == 0:
+                while mem32[self._sr] & self._sr_busy:
+                    pass
+        if self._cr_flush is not None:
+            mem32[self._cr] |= self._cr_flush
+            self.wait_not_busy()
+        mem32[self._cr] = 0
 
 
 def update_mboot(filename):
@@ -144,13 +192,14 @@ def update_mboot(filename):
     print("Programming Mboot, do not turn off!")
     time.sleep_ms(50)
 
+    flash = Flash()
     irq = machine.disable_irq()
-    flash_unlock()
-    flash_erase_sector(0)
-    if len(mboot_fw) > 16 * 1024 and not check_mem_erased(mboot_addr + 16 * 1024, 16 * 1024):
-        flash_erase_sector(1)
-    flash_write(mboot_addr, mboot_fw)
-    flash_lock()
+    flash.unlock()
+    flash.erase_sector(0)
+    if len(mboot_fw) > flash.sector0_size:
+        flash.erase_sector(1)
+    flash.write(mboot_addr, mboot_fw)
+    flash.lock()
     machine.enable_irq(irq)
 
     print("New Mboot programmed.")

From 60e05ae84ec08c06e3f9d9051339811641479a94 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 31 Jan 2022 17:26:47 +1100
Subject: [PATCH 1644/3533] stm32/mboot: Compute and check CRC32 of dfu file in
 fwupdate.py.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/mboot/fwupdate.py | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/ports/stm32/mboot/fwupdate.py b/ports/stm32/mboot/fwupdate.py
index 8a366dae2942c..3b8dc51e1c485 100644
--- a/ports/stm32/mboot/fwupdate.py
+++ b/ports/stm32/mboot/fwupdate.py
@@ -27,6 +27,8 @@ def check_mem_contains(addr, buf):
 
 
 def dfu_read(filename):
+    from binascii import crc32
+
     f = open(filename, "rb")
 
     hdr = f.read(3)
@@ -39,23 +41,28 @@ def dfu_read(filename):
         print("Invalid firmware", filename)
         return None
 
+    crc = 0
     elems = []
 
     hdr = f.read(11)
+    crc = crc32(hdr, crc)
     sig, ver, size, num_targ = struct.unpack("<5sBIB", hdr)
 
     file_offset = 11
 
     for i in range(num_targ):
         hdr = f.read(274)
+        crc = crc32(hdr, crc)
         sig, alt, has_name, name, t_size, num_elem = struct.unpack("<6sBi255sII", hdr)
 
         file_offset += 274
         file_offset_t = file_offset
         for j in range(num_elem):
             hdr = f.read(8)
+            crc = crc32(hdr, crc)
             addr, e_size = struct.unpack("<II", hdr)
             data = f.read(e_size)
+            crc = crc32(data, crc)
             elems.append((addr, data))
             file_offset += 8 + e_size
 
@@ -68,8 +75,14 @@ def dfu_read(filename):
         return None
 
     hdr = f.read(16)
+    crc = crc32(hdr[:-4], crc)
     hdr = struct.unpack("<HHHH3sBI", hdr)
 
+    crc = ~crc & 0xFFFFFFFF
+    if crc != hdr[-1]:
+        print("CRC failed", crc, hdr[-1])
+        return None
+
     return elems
 
 
@@ -180,8 +193,6 @@ def update_mboot(filename):
     if mboot_addr != 0x08000000:
         assert 0
 
-    # TODO: Validate firmware in a simple way
-
     print("Found Mboot data with size %u." % len(mboot_fw))
 
     chk = check_mem_contains(mboot_addr, mboot_fw)

From 8f68e26f79ee325669fb7dc7bbd092fccd5b038f Mon Sep 17 00:00:00 2001
From: Herwin Grobben <h.grobben@aemics.nl>
Date: Tue, 26 Jan 2021 14:49:56 +0100
Subject: [PATCH 1645/3533] stm32: Add support for G4 MCUs, and add
 NUCLEO_G474RE board defn.

This commit adds support for the STM32G4 series of MCUs, and a board
definition for NUCLEO_G474RE.  This board has the REPL on LPUART1 which is
connected to the on-board ST-link USB-UART.
---
 ports/stm32/Makefile                          |   5 +
 ports/stm32/adc.c                             |  50 +++-
 ports/stm32/adc.h                             |   2 +
 ports/stm32/boards/NUCLEO_G474RE/board.json   |  15 ++
 .../boards/NUCLEO_G474RE/mpconfigboard.h      |  95 +++++++
 .../boards/NUCLEO_G474RE/mpconfigboard.mk     |   6 +
 ports/stm32/boards/NUCLEO_G474RE/pins.csv     |  86 +++++++
 .../boards/NUCLEO_G474RE/stm32g4xx_hal_conf.h |  19 ++
 ports/stm32/boards/make-pins.py               |  25 +-
 ports/stm32/boards/stm32g474.ld               |  28 +++
 ports/stm32/boards/stm32g474_af.csv           | 109 ++++++++
 ports/stm32/boards/stm32g4xx_hal_conf_base.h  | 131 ++++++++++
 ports/stm32/dac.c                             |   8 +-
 ports/stm32/dma.c                             | 237 +++++++++++++++++-
 ports/stm32/dma.h                             |  23 ++
 ports/stm32/extint.c                          |  18 +-
 ports/stm32/extint.h                          |   2 +-
 ports/stm32/flash.c                           |  39 ++-
 ports/stm32/machine_adc.c                     |  27 +-
 ports/stm32/machine_uart.c                    |   2 +-
 ports/stm32/modmachine.c                      |   2 +-
 ports/stm32/mpconfigboard_common.h            |  17 +-
 ports/stm32/mphalport.c                       |   2 +-
 ports/stm32/pin_defs_stm32.h                  |   4 +-
 ports/stm32/powerctrl.c                       |  13 +-
 ports/stm32/pyb_i2c.c                         |  24 +-
 ports/stm32/rtc.c                             |  21 +-
 ports/stm32/stm32_it.c                        |  20 +-
 ports/stm32/system_stm32.c                    |  62 ++++-
 ports/stm32/timer.c                           |  14 +-
 ports/stm32/uart.c                            |  27 +-
 ports/stm32/usbdev/core/inc/usbd_def.h        |   8 +-
 32 files changed, 1050 insertions(+), 91 deletions(-)
 create mode 100644 ports/stm32/boards/NUCLEO_G474RE/board.json
 create mode 100644 ports/stm32/boards/NUCLEO_G474RE/mpconfigboard.h
 create mode 100644 ports/stm32/boards/NUCLEO_G474RE/mpconfigboard.mk
 create mode 100644 ports/stm32/boards/NUCLEO_G474RE/pins.csv
 create mode 100644 ports/stm32/boards/NUCLEO_G474RE/stm32g4xx_hal_conf.h
 create mode 100644 ports/stm32/boards/stm32g474.ld
 create mode 100644 ports/stm32/boards/stm32g474_af.csv
 create mode 100644 ports/stm32/boards/stm32g4xx_hal_conf_base.h

diff --git a/ports/stm32/Makefile b/ports/stm32/Makefile
index 290503937dc59..c2581c100b7ec 100644
--- a/ports/stm32/Makefile
+++ b/ports/stm32/Makefile
@@ -94,6 +94,7 @@ endif
 CFLAGS_MCU_f0 = $(CFLAGS_CORTEX_M) -mtune=cortex-m0 -mcpu=cortex-m0
 CFLAGS_MCU_f4 = $(CFLAGS_CORTEX_M) -mtune=cortex-m4 -mcpu=cortex-m4
 CFLAGS_MCU_f7 = $(CFLAGS_CORTEX_M) -mtune=cortex-m7 -mcpu=cortex-m7
+CFLAGS_MCU_g4 = $(CFLAGS_CORTEX_M) -mtune=cortex-m4 -mcpu=cortex-m4
 CFLAGS_MCU_l0 = $(CFLAGS_CORTEX_M) -mtune=cortex-m0plus -mcpu=cortex-m0plus
 CFLAGS_MCU_l4 = $(CFLAGS_CORTEX_M) -mtune=cortex-m4 -mcpu=cortex-m4
 CFLAGS_MCU_h7 = $(CFLAGS_CORTEX_M) -mtune=cortex-m7 -mcpu=cortex-m7
@@ -429,6 +430,10 @@ $(BUILD)/$(HAL_DIR)/Src/stm32$(MCU_SERIES)xx_hal_mmc.o: CFLAGS += -Wno-error=par
 endif
 endif
 
+ifeq ($(MCU_SERIES),$(filter $(MCU_SERIES),g4))
+    HAL_SRC_C += $(addprefix $(HAL_DIR)/Src/stm32$(MCU_SERIES)xx_, hal_fdcan.c)
+endif
+
 ifeq ($(CMSIS_MCU),$(filter $(CMSIS_MCU),STM32H743xx STM32H750xx STM32H7A3xx STM32H7A3xxQ STM32H7B3xx STM32H7B3xxQ))
     HAL_SRC_C += $(addprefix $(HAL_DIR)/Src/stm32$(MCU_SERIES)xx_, hal_fdcan.c)
 else
diff --git a/ports/stm32/adc.c b/ports/stm32/adc.c
index 3e61abce3ca92..2e52fb07aac19 100644
--- a/ports/stm32/adc.c
+++ b/ports/stm32/adc.c
@@ -102,6 +102,16 @@
 #define ADC_CAL2                ((uint16_t *)(ADC_CAL_ADDRESS + 4))
 #define ADC_CAL_BITS            (12)
 
+#elif defined(STM32G4)
+
+#define ADC_FIRST_GPIO_CHANNEL  (0)
+#define ADC_LAST_GPIO_CHANNEL   (18)
+#define ADC_SCALE_V             (((float)VREFINT_CAL_VREF) / 1000.0f)
+#define ADC_CAL_ADDRESS         VREFINT_CAL_ADDR
+#define ADC_CAL1                TEMPSENSOR_CAL1_ADDR
+#define ADC_CAL2                TEMPSENSOR_CAL2_ADDR
+#define ADC_CAL_BITS            (12) // UM2570, __HAL_ADC_CALC_TEMPERATURE: 'corresponds to a resolution of 12 bits'
+
 #elif defined(STM32H7)
 
 #define ADC_SCALE_V             (3.3f)
@@ -141,6 +151,8 @@
     defined(STM32F746xx) || defined(STM32F765xx) || \
     defined(STM32F767xx) || defined(STM32F769xx)
 #define VBAT_DIV (4)
+#elif defined(STM32G4)
+#define VBAT_DIV (3)
 #elif defined(STM32H743xx) || defined(STM32H747xx) || \
     defined(STM32H7A3xx) || defined(STM32H7A3xxQ) || \
     defined(STM32H7B3xx) || defined(STM32H7B3xxQ) || \
@@ -206,7 +218,7 @@ STATIC bool is_adcx_channel(int channel) {
     ADC_HandleTypeDef handle;
     handle.Instance = ADCx;
     return IS_ADC_CHANNEL(&handle, channel);
-    #elif defined(STM32WB)
+    #elif defined(STM32G4) || defined(STM32WB)
     ADC_HandleTypeDef handle;
     handle.Instance = ADCx;
     return __HAL_ADC_IS_CHANNEL_INTERNAL(channel)
@@ -220,7 +232,7 @@ STATIC void adc_wait_for_eoc_or_timeout(ADC_HandleTypeDef *adcHandle, int32_t ti
     uint32_t tickstart = HAL_GetTick();
     #if defined(STM32F4) || defined(STM32F7)
     while ((adcHandle->Instance->SR & ADC_FLAG_EOC) != ADC_FLAG_EOC) {
-    #elif defined(STM32F0) || defined(STM32H7) || defined(STM32L4) || defined(STM32WB)
+    #elif defined(STM32F0) || defined(STM32G4) || defined(STM32H7) || defined(STM32L4) || defined(STM32WB)
     while (READ_BIT(adcHandle->Instance->ISR, ADC_FLAG_EOC) != ADC_FLAG_EOC) {
     #else
     #error Unsupported processor
@@ -237,6 +249,8 @@ STATIC void adcx_clock_enable(ADC_HandleTypeDef *adch) {
     #elif defined(STM32H7A3xx) || defined(STM32H7A3xxQ) || defined(STM32H7B3xx) || defined(STM32H7B3xxQ)
     __HAL_RCC_ADC12_CLK_ENABLE();
     __HAL_RCC_ADC_CONFIG(RCC_ADCCLKSOURCE_CLKP);
+    #elif defined(STM32G4)
+    __HAL_RCC_ADC12_CLK_ENABLE();
     #elif defined(STM32H7)
     if (adch->Instance == ADC3) {
         __HAL_RCC_ADC3_CLK_ENABLE();
@@ -286,7 +300,7 @@ STATIC void adcx_init_periph(ADC_HandleTypeDef *adch, uint32_t resolution) {
     adch->Init.OversamplingMode = DISABLE;
     adch->Init.LeftBitShift = ADC_LEFTBITSHIFT_NONE;
     adch->Init.ConversionDataManagement = ADC_CONVERSIONDATA_DR;
-    #elif defined(STM32L4) || defined(STM32WB)
+    #elif defined(STM32G4) || defined(STM32L4) || defined(STM32WB)
     adch->Init.ClockPrescaler = ADC_CLOCK_ASYNC_DIV1;
     adch->Init.ScanConvMode = ADC_SCAN_DISABLE;
     adch->Init.LowPowerAutoWait = DISABLE;
@@ -303,7 +317,7 @@ STATIC void adcx_init_periph(ADC_HandleTypeDef *adch, uint32_t resolution) {
     #if defined(STM32H7)
     HAL_ADCEx_Calibration_Start(adch, ADC_CALIB_OFFSET, ADC_SINGLE_ENDED);
     #endif
-    #if defined(STM32L4) || defined(STM32WB)
+    #if defined(STM32G4) || defined(STM32L4) || defined(STM32WB)
     HAL_ADCEx_Calibration_Start(adch, ADC_SINGLE_ENDED);
     #endif
 }
@@ -312,7 +326,7 @@ STATIC void adc_init_single(pyb_obj_adc_t *adc_obj) {
     adc_obj->handle.Instance = ADCx;
     adcx_init_periph(&adc_obj->handle, ADC_RESOLUTION_12B);
 
-    #if defined(STM32L4) && defined(ADC_DUALMODE_REGSIMULT_INJECSIMULT)
+    #if (defined(STM32G4) || defined(STM32L4)) && defined(ADC_DUALMODE_REGSIMULT_INJECSIMULT)
     ADC_MultiModeTypeDef multimode;
     multimode.Mode = ADC_MODE_INDEPENDENT;
     if (HAL_ADCEx_MultiModeConfigChannel(&adc_obj->handle, &multimode) != HAL_OK) {
@@ -324,7 +338,7 @@ STATIC void adc_init_single(pyb_obj_adc_t *adc_obj) {
 STATIC void adc_config_channel(ADC_HandleTypeDef *adc_handle, uint32_t channel) {
     ADC_ChannelConfTypeDef sConfig;
 
-    #if defined(STM32H7) || defined(STM32WB)
+    #if defined(STM32G4) || defined(STM32H7) || defined(STM32WB)
     sConfig.Rank = ADC_REGULAR_RANK_1;
     if (__HAL_ADC_IS_CHANNEL_INTERNAL(channel) == 0) {
         channel = __HAL_ADC_DECIMAL_NB_TO_CHANNEL(channel);
@@ -352,7 +366,7 @@ STATIC void adc_config_channel(ADC_HandleTypeDef *adc_handle, uint32_t channel)
     sConfig.OffsetNumber = ADC_OFFSET_NONE;
     sConfig.OffsetRightShift = DISABLE;
     sConfig.OffsetSignedSaturation = DISABLE;
-    #elif defined(STM32L4) || defined(STM32WB)
+    #elif defined(STM32G4) || defined(STM32L4) || defined(STM32WB)
     if (__HAL_ADC_IS_CHANNEL_INTERNAL(channel)) {
         sConfig.SamplingTime = ADC_SAMPLETIME_247CYCLES_5;
     } else {
@@ -536,7 +550,7 @@ STATIC mp_obj_t adc_read_timed(mp_obj_t self_in, mp_obj_t buf_in, mp_obj_t freq_
             // for subsequent samples we can just set the "start sample" bit
             #if defined(STM32F4) || defined(STM32F7)
             self->handle.Instance->CR2 |= (uint32_t)ADC_CR2_SWSTART;
-            #elif defined(STM32F0) || defined(STM32H7) || defined(STM32L4) || defined(STM32WB)
+            #elif defined(STM32F0) || defined(STM32G4) || defined(STM32H7) || defined(STM32L4) || defined(STM32WB)
             SET_BIT(self->handle.Instance->CR, ADC_CR_ADSTART);
             #else
             #error Unsupported processor
@@ -646,7 +660,7 @@ STATIC mp_obj_t adc_read_timed_multi(mp_obj_t adc_array_in, mp_obj_t buf_array_i
             // ADC is started: set the "start sample" bit
             #if defined(STM32F4) || defined(STM32F7)
             adc->handle.Instance->CR2 |= (uint32_t)ADC_CR2_SWSTART;
-            #elif defined(STM32F0) || defined(STM32H7) || defined(STM32L4) || defined(STM32WB)
+            #elif defined(STM32F0) || defined(STM32G4) || defined(STM32H7) || defined(STM32L4) || defined(STM32WB)
             SET_BIT(adc->handle.Instance->CR, ADC_CR_ADSTART);
             #else
             #error Unsupported processor
@@ -766,7 +780,16 @@ STATIC uint32_t adc_config_and_read_ref(ADC_HandleTypeDef *adcHandle, uint32_t c
 }
 
 int adc_read_core_temp(ADC_HandleTypeDef *adcHandle) {
+    #if defined(STM32G4)
+    int32_t raw_value = 0;
+    if (adcHandle->Instance == ADC1) {
+        raw_value = adc_config_and_read_ref(adcHandle, ADC_CHANNEL_TEMPSENSOR_ADC1);
+    } else {
+        return 0;
+    }
+    #else
     int32_t raw_value = adc_config_and_read_ref(adcHandle, ADC_CHANNEL_TEMPSENSOR);
+    #endif
     return ((raw_value - CORE_TEMP_V25) / CORE_TEMP_AVG_SLOPE) + 25;
 }
 
@@ -775,7 +798,16 @@ int adc_read_core_temp(ADC_HandleTypeDef *adcHandle) {
 STATIC volatile float adc_refcor = 1.0f;
 
 float adc_read_core_temp_float(ADC_HandleTypeDef *adcHandle) {
+    #if defined(STM32G4)
+    int32_t raw_value = 0;
+    if (adcHandle->Instance == ADC1) {
+        raw_value = adc_config_and_read_ref(adcHandle, ADC_CHANNEL_TEMPSENSOR_ADC1);
+    } else {
+        return 0;
+    }
+    #else
     int32_t raw_value = adc_config_and_read_ref(adcHandle, ADC_CHANNEL_TEMPSENSOR);
+    #endif
     float core_temp_avg_slope = (*ADC_CAL2 - *ADC_CAL1) / 80.0f;
     return (((float)raw_value * adc_refcor - *ADC_CAL1) / core_temp_avg_slope) + 30.0f;
 }
diff --git a/ports/stm32/adc.h b/ports/stm32/adc.h
index 9101b9db83ebf..db706ea494019 100644
--- a/ports/stm32/adc.h
+++ b/ports/stm32/adc.h
@@ -48,6 +48,8 @@ static inline void adc_deselect_vbat(ADC_TypeDef *adc, uint32_t channel) {
         adc_common = ADC_COMMON_REGISTER(0);
         #elif defined(STM32F7)
         adc_common = ADC123_COMMON;
+        #elif defined(STM32G4)
+        adc_common = ADC12_COMMON;
         #elif defined(STM32H7A3xx) || defined(STM32H7A3xxQ) || defined(STM32H7B3xx) || defined(STM32H7B3xxQ)
         adc_common = ADC12_COMMON;
         #elif defined(STM32H7)
diff --git a/ports/stm32/boards/NUCLEO_G474RE/board.json b/ports/stm32/boards/NUCLEO_G474RE/board.json
new file mode 100644
index 0000000000000..3bbb749826443
--- /dev/null
+++ b/ports/stm32/boards/NUCLEO_G474RE/board.json
@@ -0,0 +1,15 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [],
+    "images": [
+        "nucleo_g474re.jpg"
+    ],
+    "mcu": "stm32g4",
+    "product": "Nucleo G474RE",
+    "thumbnail": "",
+    "url": "",
+    "vendor": "ST Microelectronics"
+}
diff --git a/ports/stm32/boards/NUCLEO_G474RE/mpconfigboard.h b/ports/stm32/boards/NUCLEO_G474RE/mpconfigboard.h
new file mode 100644
index 0000000000000..06b4e4c52a0fd
--- /dev/null
+++ b/ports/stm32/boards/NUCLEO_G474RE/mpconfigboard.h
@@ -0,0 +1,95 @@
+#define MICROPY_HW_BOARD_NAME       "NUCLEO_G474RE"
+#define MICROPY_HW_MCU_NAME         "STM32G474"
+
+#define MICROPY_HW_ENABLE_RTC       (1)
+#define MICROPY_HW_ENABLE_RNG       (1)
+#define MICROPY_HW_ENABLE_ADC       (1)
+#define MICROPY_HW_ENABLE_DAC       (1) // A4, A5
+#define MICROPY_HW_ENABLE_USB       (0) // A12 (dp), A11 (dm)
+#define MICROPY_HW_HAS_SWITCH       (1)
+#define MICROPY_HW_HAS_FLASH        (0) // QSPI extflash not mounted
+
+#define MICROPY_PY_UASYNCIO         (0)
+#define MICROPY_PY_UZLIB            (0)
+#define MICROPY_PY_UBINASCII        (0)
+#define MICROPY_PY_UHASHLIB         (0)
+#define MICROPY_PY_UJSON            (0)
+#define MICROPY_PY_URE              (0)
+#define MICROPY_PY_FRAMEBUF         (0)
+#define MICROPY_PY_USOCKET          (0)
+#define MICROPY_PY_NETWORK          (0)
+
+// The board has an 24MHz HSE, the following gives 170MHz CPU speed
+#define MICROPY_HW_CLK_PLLM         (6)
+#define MICROPY_HW_CLK_PLLN         (85)
+#define MICROPY_HW_CLK_PLLP         (2)
+#define MICROPY_HW_CLK_PLLQ         (8)
+#define MICROPY_HW_CLK_PLLR         (2)
+
+#define MICROPY_HW_CLK_USE_HSI48    (1) // for RNG
+
+// 4 wait states
+#define MICROPY_HW_FLASH_LATENCY    FLASH_LATENCY_8
+
+// UART config
+#define MICROPY_HW_LPUART1_TX       (pin_A2)  // A2 (to STLINK), B11, C1
+#define MICROPY_HW_LPUART1_RX       (pin_A3)  // A3 (to STLINK), B10, C0
+#define MICROPY_HW_UART1_TX         (pin_C4)  // A9, B6, C4, E0
+#define MICROPY_HW_UART1_RX         (pin_C5)  // A10, B7, C5, E1
+//#define MICROPY_HW_UART2_TX       (pin_A2)  // A14, B3, D5
+//#define MICROPY_HW_UART2_RX       (pin_A3)  // A15, B4, D6
+//#define MICROPY_HW_UART2_RTS      (pin_A1)  // D4
+//#define MICROPY_HW_UART2_CTS      (pin_A0)  // D3
+#define MICROPY_HW_UART3_TX         (pin_B10) // B9, B10, C10, D8
+#define MICROPY_HW_UART3_RX         (pin_B11) // B8 = boot0, B11, C11, D9, E15
+//#define MICROPY_HW_UART3_RTS      (pin_B14) // D12, F6
+//#define MICROPY_HW_UART3_CTS      (pin_B13) // A13, D11
+//#define MICROPY_HW_UART4_TX       (pin_)    // C10
+//#define MICROPY_HW_UART4_RX       (pin_)    // C11
+
+#define MICROPY_HW_UART_REPL        (PYB_LPUART_1) // default on Nucleo G474
+#define MICROPY_HW_UART_REPL_BAUD   (115200)
+
+// I2C buses
+#define MICROPY_HW_I2C1_SCL         (pin_B8) // A13, A15, B8 (=boot0)
+#define MICROPY_HW_I2C1_SDA         (pin_B9) // A14, B7, B9
+//#define MICROPY_HW_I2C2_SCL       (pin_)   // A9, C4
+//#define MICROPY_HW_I2C2_SDA       (pin_)   // A8, F0
+//#define MICROPY_HW_I2C3_SCL       (pin_)   // A8, C8
+//#define MICROPY_HW_I2C3_SDA       (pin_)   // B5, C9, C11
+
+// SPI
+#define MICROPY_HW_SPI1_NSS         (pin_A4) // A4, A15 (Nucleo64 specifies B6 as pin CS, must be done as GPIO, not as AF)
+#define MICROPY_HW_SPI1_SCK         (pin_A5) // A5 (LED), B3 (SWO)
+#define MICROPY_HW_SPI1_MISO        (pin_A6) // A6, B4
+#define MICROPY_HW_SPI1_MOSI        (pin_A7) // A7, B5
+//#define MICROPY_HW_SPI2_NSS       (pin_)   // B12, D15, F0
+//#define MICROPY_HW_SPI2_SCK       (pin_)   // B13, F1, F9, F10
+//#define MICROPY_HW_SPI2_MISO      (pin_)   // A10, B14
+//#define MICROPY_HW_SPI2_MOSI      (pin_)   // A11, B15
+//#define MICROPY_HW_SPI3_NSS       (pin_)   // A4, A15
+//#define MICROPY_HW_SPI3_SCK       (pin_)   // B3, C10
+//#define MICROPY_HW_SPI3_MISO      (pin_)   // B4, C11
+//#define MICROPY_HW_SPI3_MOSI      (pin_)   // B5, C12
+
+// USRSW is pulled low. Pressing the button makes the input go high.
+#define MICROPY_HW_USRSW_PIN        (pin_C13)
+#define MICROPY_HW_USRSW_PULL       (GPIO_NOPULL)
+#define MICROPY_HW_USRSW_EXTI_MODE  (GPIO_MODE_IT_RISING)
+#define MICROPY_HW_USRSW_PRESSED    (1)
+
+// LEDs
+#define MICROPY_HW_LED1             (pin_A5)    // green
+#define MICROPY_HW_LED_ON(pin)      (mp_hal_pin_high(pin))
+#define MICROPY_HW_LED_OFF(pin)     (mp_hal_pin_low(pin))
+
+// USB config pin A12 (dp), A11 (dm) not mounted on Nucleo
+//#define MICROPY_HW_USB_FS              (1)
+//#define MICROPY_HW_USB_VBUS_DETECT_PIN (pin_A9)
+//#define MICROPY_HW_USB_OTG_ID_PIN      (pin_A10)
+
+// FDCAN bus
+// User TODO: fit transceiver chip
+#define MICROPY_HW_CAN1_NAME        "FDCAN1"
+#define MICROPY_HW_CAN1_TX          (pin_A12) // A12, B9, D1
+#define MICROPY_HW_CAN1_RX          (pin_A11) // A11, B8, D0
diff --git a/ports/stm32/boards/NUCLEO_G474RE/mpconfigboard.mk b/ports/stm32/boards/NUCLEO_G474RE/mpconfigboard.mk
new file mode 100644
index 0000000000000..24a06e08ec436
--- /dev/null
+++ b/ports/stm32/boards/NUCLEO_G474RE/mpconfigboard.mk
@@ -0,0 +1,6 @@
+# MCU settings
+MCU_SERIES = g4
+CMSIS_MCU = STM32G474xx
+MICROPY_FLOAT_IMPL = single
+AF_FILE = boards/stm32g474_af.csv
+LD_FILES = boards/stm32g474.ld boards/common_basic.ld
diff --git a/ports/stm32/boards/NUCLEO_G474RE/pins.csv b/ports/stm32/boards/NUCLEO_G474RE/pins.csv
new file mode 100644
index 0000000000000..473a5e26bce28
--- /dev/null
+++ b/ports/stm32/boards/NUCLEO_G474RE/pins.csv
@@ -0,0 +1,86 @@
+A0,PA0
+A1,PA1
+A2,PA4
+A3,BPB0
+A4,PC1
+A5,PC0
+D0,PC5
+D1,PC4
+D2,PA10
+D3,PB3
+D4,PB5
+D5,PB4
+D6,PB10
+D7,PA8
+D8,PA9
+D9,PC7
+D10,PB6
+D11,PA7
+D12,PA6
+D13,PA5
+D14,PB9
+D15,PB8
+SW,PC13
+I2C_SDA,PB9
+I2C_SCL,PB8
+LED1,PA5
+SPI_MOSI,PA7
+SPI_MISO,PA6
+SPI_SCK,PA5
+SPI_CS,PB6
+LPUART1_TX,PA2
+LPUART1_RX,PA3
+UART1_TX,PC4
+UART1_RX,PC5
+CN7_1,PC10
+CN7_2,PC11
+CN7_3,PC12
+CN7_4,PD2
+CN7_7,PB8
+CN7_13,PA13
+CN7_15,PA14
+CN7_17,PA15
+CN7_21,PB7
+CN7_23,PC13
+CN7_25,PC14
+CN7_27,PC15
+CN7_28,PA0
+CN7_29,PF0
+CN7_30,PA1
+CN7_31,PF1
+CN7_32,PA4
+CN7_34,PB0
+CN7_35,PC2
+CN7_36,PC1
+CN7_37,PC3
+CN7_38,PC0
+CN10_1,PC9
+CN10_2,PC8
+CN10_3,PB8
+CN10_4,PC6
+CN10_5,PB9
+CN10_6,PC5
+CN10_11,PA5
+CN10_12,PA12
+CN10_13,PA6
+CN10_14,PA11
+CN10_15,PA7
+CN10_16,PB12
+CN10_17,PB6
+CN10_18,PB11
+CN10_19,PC7
+CN10_21,PA9
+CN10_22,PB2
+CN10_23,PA8
+CN10_24,PB1
+CN10_25,PB10
+CN10_26,PB15
+CN10_27,PB4
+CN10_28,PB14
+CN10_29,PB5
+CN10_30,PB13
+CN10_31,PB3
+CN10_33,PA10
+CN10_34,PC4
+CN10_35,PC4
+CN10_37,PC5
diff --git a/ports/stm32/boards/NUCLEO_G474RE/stm32g4xx_hal_conf.h b/ports/stm32/boards/NUCLEO_G474RE/stm32g4xx_hal_conf.h
new file mode 100644
index 0000000000000..5e82fb4874d25
--- /dev/null
+++ b/ports/stm32/boards/NUCLEO_G474RE/stm32g4xx_hal_conf.h
@@ -0,0 +1,19 @@
+/* This file is part of the MicroPython project, http://micropython.org/
+ * The MIT License (MIT)
+ * Copyright (c) 2019 Damien P. George
+ */
+#ifndef MICROPY_INCLUDED_STM32G4XX_HAL_CONF_H
+#define MICROPY_INCLUDED_STM32G4XX_HAL_CONF_H
+
+#include "boards/stm32g4xx_hal_conf_base.h"
+
+// Oscillator values in Hz
+#define HSE_VALUE               (24000000)
+#define LSE_VALUE               (32768)
+#define EXTERNAL_CLOCK_VALUE    (24000)
+
+// Oscillator timeouts in ms
+#define HSE_STARTUP_TIMEOUT     (100)
+#define LSE_STARTUP_TIMEOUT     (5000)
+
+#endif // MICROPY_INCLUDED_STM32G4XX_HAL_CONF_H
diff --git a/ports/stm32/boards/make-pins.py b/ports/stm32/boards/make-pins.py
index 14c9e91097d21..4e895f8f60407 100755
--- a/ports/stm32/boards/make-pins.py
+++ b/ports/stm32/boards/make-pins.py
@@ -219,23 +219,24 @@ def set_is_board_pin(self):
     def parse_adc(self, adc_str):
         if adc_str[:3] != "ADC":
             return
+        adc, channel = None, None
 
         if adc_str.find("_INP") != -1:
             # STM32H7xx, entries have the form: ADCxx_IN[PN]yy/...
-            # for now just pick the entry with the most ADC periphs
-            adc, channel = None, None
-            for ss in adc_str.split("/"):
-                if ss.find("_INP") != -1:
-                    a, c = ss.split("_")
-                    if adc is None or len(a) > len(adc):
-                        adc, channel = a, c
-            if adc is None:
-                return
-            channel = channel[3:]
+            sep = "_INP"
         else:
             # all other MCUs, entries have the form: ADCxx_INyy
-            adc, channel = adc_str.split("_")
-            channel = channel[2:]
+            sep = "_IN"
+
+        # Pick the entry with the most ADC peripherals
+        for ss in adc_str.split("/"):
+            if ss.find(sep) != -1:
+                a, c = ss.split("_")
+                if adc is None or len(a) > len(adc):
+                    adc, channel = a, c
+        if adc is None:
+            return
+        channel = channel[len(sep) - 1 :]
 
         for idx in range(3, len(adc)):
             adc_num = int(adc[idx])  # 1, 2, or 3
diff --git a/ports/stm32/boards/stm32g474.ld b/ports/stm32/boards/stm32g474.ld
new file mode 100644
index 0000000000000..4fe61a472ff71
--- /dev/null
+++ b/ports/stm32/boards/stm32g474.ld
@@ -0,0 +1,28 @@
+/* Specify the memory areas */
+MEMORY
+{
+    RAM (xrw)       : ORIGIN = 0x20000000, LENGTH = 128K
+    FLASH (rx)      : ORIGIN = 0x08000000, LENGTH = 352K
+    FLASH_FS (rx)   : ORIGIN = 0x08058000, LENGTH = 160K  /* starting @ 352K */
+}
+
+/* Generate a link error if heap and stack don't fit into RAM */
+_minimum_heap_size = 0x200; /* required amount of heap  */
+_minimum_stack_size = 0x400; /* required amount of stack */
+
+_ram_start = ORIGIN(RAM);
+_ram_end = ORIGIN(RAM) + LENGTH(RAM);
+
+_micropy_hw_internal_flash_storage_ram_cache_end = ORIGIN(RAM) + LENGTH(RAM);
+_micropy_hw_internal_flash_storage_ram_cache_start = _micropy_hw_internal_flash_storage_ram_cache_end - 2K; /* fs cache = 2K RAM */
+
+/* Define the stack.  The stack is full descending so begins just above last byte
+   of RAM.  Note that EABI requires the stack to be 8-byte aligned for a call. */
+_estack = _micropy_hw_internal_flash_storage_ram_cache_start - _estack_reserve;
+_sstack = _estack - 8K; /* tunable */
+
+_heap_start = _ebss; /* heap starts just after statically allocated memory */
+_heap_end = _sstack;
+
+_micropy_hw_internal_flash_storage_start = ORIGIN(FLASH_FS);
+_micropy_hw_internal_flash_storage_end   = ORIGIN(FLASH_FS) + LENGTH(FLASH_FS);
diff --git a/ports/stm32/boards/stm32g474_af.csv b/ports/stm32/boards/stm32g474_af.csv
new file mode 100644
index 0000000000000..0108ee90138ae
--- /dev/null
+++ b/ports/stm32/boards/stm32g474_af.csv
@@ -0,0 +1,109 @@
+Port,,AF0,AF1,AF2,AF3,AF4,AF5,AF6,AF7,AF8,AF9,AF10,AF11,AF12,AF13,AF14,AF15,
+,,I2C4/SYS_AF,LPTIM1/TIM2/5/15/16/17,I2C1/3/TIM1/2/3/4/5/8/20/15/COMP1,QUADSPI1/I2C3/4/SAI1/USB/HRTIM1/TIM8/20/15/COMP3,I2C1/2/3/4/TIM1/8/16/17,QUADSPI1/SPI1/2/3/4/I2S2/3/I2C4/UART4/5/TIM8/Infrared,QUADSPI1/SPI2/3/I2S2/3/TIM1/5/8/20/Infrared,USART1/2/3/CAN/COMP7/5/6,I2C3/4/UART4/5/LPUART1/COMP1/2/7/4/5/6/3,CAN/TIM1/8/15/CAN1/2,QUADSPI1/TIM2/3/4/8/17,LPTIM1/TIM1/8/CAN1/3,FMC/LPUART1/SAI1/HRTIM1/TIM1,SAI1SAI1/HRTIM1/OPAMP2,UART4/5/SAI1/TIM2/15/UCPD1,SYS,ADC,COMP,DAC,OPAMP
+PortA,PA0,,TIM2_CH1,TIM5_CH1,,,,,USART2_CTS,COMP1_OUT,TIM8_BKIN,TIM8_ETR,,,,TIM2_ETR,EVENTOUT,ADC12_IN1,COMP1_INM/COMP3_INP,,
+PortA,PA1,RTC_REFIN,TIM2_CH2,TIM5_CH2,,,,,USART2_RTS_DE,,TIM15_CH1N,,,,,,EVENTOUT,ADC12_IN2,COMP1_INP,,OPAMP1_VINP/OPAMP3_VINP/OPAMP6_VINM
+PortA,PA2,,TIM2_CH3,TIM5_CH3,,,,,USART2_TX,COMP2_OUT,TIM15_CH1,QUADSPI1_BK1_NCS,,LPUART1_TX,,UCPD1_FRSTX,EVENTOUT,ADC1_IN3,COMP2_INM,,OPAMP1_VOUT
+PortA,PA3,,TIM2_CH4,TIM5_CH4,SAI1_CK1,,,,USART2_RX,,TIM15_CH2,QUADSPI1_CLK,,LPUART1_RX,SAI1_MCLK_A,,EVENTOUT,ADC1_IN4,COMP2_INP,,OPAMP1_VINM/OPAMP1_VINP/OPAMP5_VINM
+PortA,PA4,,,TIM3_CH2,,,SPI1_NSS,SPI3_NSS/I2S3_WS,USART2_CK,,,,,,SAI1_FS_B,,EVENTOUT,ADC2_IN17,COMP1_INM,DAC1_OUT1,
+PortA,PA5,,TIM2_CH1,TIM2_ETR,,,SPI1_SCK,,,,,,,,,UCPD1_FRSTX,EVENTOUT,ADC2_IN13,COMP2_INM,DAC1_OUT2,OPAMP2_VINM
+PortA,PA6,,TIM16_CH1,TIM3_CH1,,TIM8_BKIN,SPI1_MISO,TIM1_BKIN,,COMP1_OUT,,QUADSPI1_BK1_IO3,,LPUART1_CTS,,,EVENTOUT,ADC2_IN3,,DAC2_OUT1,OPAMP2_VOUT
+PortA,PA7,,TIM17_CH1,TIM3_CH2,,TIM8_CH1N,SPI1_MOSI,TIM1_CH1N,,COMP2_OUT,,QUADSPI1_BK1_IO2,,,,UCPD1_FRSTX,EVENTOUT,ADC2_IN4,COMP2_INP,,OPAMP1_VINP/OPAMP2_VINP
+PortA,PA8,MCO,,I2C3_SCL,,I2C2_SDA,I2S2_MCK,TIM1_CH1,USART1_CK,COMP7_OUT,,TIM4_ETR,CAN3_RX,SAI1_CK2,HRTIM1_CHA1,SAI1_SCK_A,EVENTOUT,ADC5_IN1,,,OPAMP5_VOUT
+PortA,PA9,,,I2C3_SMBA,,I2C2_SCL,I2S3_MCK,TIM1_CH2,USART1_TX,COMP5_OUT,TIM15_BKIN,TIM2_CH3,,,HRTIM1_CHA2,SAI1_FS_A,EVENTOUT,ADC5_IN2,,,
+PortA,PA10,,TIM17_BKIN,,USB_CRS_SYNC,I2C2_SMBA,SPI2_MISO,TIM1_CH3,USART1_RX,COMP6_OUT,,TIM2_CH4,TIM8_BKIN,SAI1_D1,HRTIM1_CHB1,SAI1_SD_A,EVENTOUT,,,,
+PortA,PA11,,,,,,SPI2_MOSI/I2S2_SD,TIM1_CH1N,USART1_CTS,COMP1_OUT,CAN1_RX,TIM4_CH1,TIM1_CH4,TIM1_BKIN2,HRTIM1_CHB2,,EVENTOUT,,,,
+PortA,PA12,,TIM16_CH1,,,,I2SCKIN,TIM1_CH2N,USART1_RTS_DE,COMP2_OUT,CAN1_TX,TIM4_CH2,TIM1_ETR,,HRTIM1_FLT1,,EVENTOUT,,,,
+PortA,PA13,SWDIOJTMS,TIM16_CH1N,,I2C4_SCL,I2C1_SCL,IR_OUT,,USART3_CTS,,,TIM4_CH3,,,SAI1_SD_B,,EVENTOUT,,,,
+PortA,PA14,SWCLKJTCK,LPTIM1_OUT,,I2C4_SMBA,I2C1_SDA,TIM8_CH2,TIM1_BKIN,USART2_TX,,,,,,SAI1_FS_B,,EVENTOUT,,,,
+PortA,PA15,JTDI,TIM2_CH1,TIM8_CH1,,I2C1_SCL,SPI1_NSS,SPI3_NSS/I2S3_WS,USART2_RX,UART4_RTS_DE,TIM1_BKIN,,CAN3_TX,,HRTIM1_FLT2,TIM2_ETR,EVENTOUT,,,,
+PortB,PB0,,,TIM3_CH3,,TIM8_CH2N,,TIM1_CH2N,,,,QUADSPI1_BK1_IO1,,,HRTIM1_FLT5,UCPD1_FRSTX,EVENTOUT,ADC3_IN12/ADC1_IN15,COMP4_INP,,OPAMP2_VINP/OPAMP3_VINP
+PortB,PB1,,,TIM3_CH4,,TIM8_CH3N,,TIM1_CH3N,,COMP4_OUT,,QUADSPI1_BK1_IO0,,LPUART1_RTS_DE,HRTIM1_SCOUT,,EVENTOUT,ADC3_IN1/ADC1_IN12,COMP1_INP,,OPAMP3_VOUT/OPAMP6_VINM
+PortB,PB2,RTC_OUT2,LPTIM1_OUT,TIM5_CH1,TIM20_CH1,I2C3_SMBA,,,,,,QUADSPI1_BK2_IO1,,,HRTIM1_SCIN,,EVENTOUT,ADC2_IN12,COMP4_INM,,OPAMP3_VINM
+PortB,PB3,JTDOTRACESWO,TIM2_CH2,TIM4_ETR,USB_CRS_SYNC,TIM8_CH1N,SPI1_SCK,SPI3_SCK/I2S3_CK,USART2_TX,,,TIM3_ETR,CAN3_RX,HRTIM1_SCOUT,HRTIM1_EEV9,SAI1_SCK_B,EVENTOUT,,,,
+PortB,PB4,JTRST,TIM16_CH1,TIM3_CH1,,TIM8_CH2N,SPI1_MISO,SPI3_MISO,USART2_RX,UART5_RTS_DE,,TIM17_BKIN,CAN3_TX,,HRTIM1_EEV7,SAI1_MCLK_B,EVENTOUT,,,,
+PortB,PB5,,TIM16_BKIN,TIM3_CH2,TIM8_CH3N,I2C1_SMBA,SPI1_MOSI,SPI3_MOSI/I2S3_SD,USART2_CK,I2C3_SDA,CAN2_RX,TIM17_CH1,LPTIM1_IN1,SAI1_SD_B,HRTIM1_EEV6,UART5_CTS,EVENTOUT,,,,
+PortB,PB6,,TIM16_CH1N,TIM4_CH1,,,TIM8_CH1,TIM8_ETR,USART1_TX,COMP4_OUT,CAN2_TX,TIM8_BKIN2,LPTIM1_ETR,HRTIM1_SCIN,HRTIM1_EEV4,SAI1_FS_B,EVENTOUT,,,,
+PortB,PB7,,TIM17_CH1N,TIM4_CH2,I2C4_SDA,I2C1_SDA,TIM8_BKIN,,USART1_RX,COMP3_OUT,,TIM3_CH4,LPTIM1_IN2,FMC_NL,HRTIM1_EEV3,UART4_CTS,EVENTOUT,,,,
+PortB,PB8,,TIM16_CH1,TIM4_CH3,SAI1_CK1,I2C1_SCL,,,USART3_RX,COMP1_OUT,CAN1_RX,TIM8_CH2,,TIM1_BKIN,HRTIM1_EEV8,SAI1_MCLK_A,EVENTOUT,,,,
+PortB,PB9,,TIM17_CH1,TIM4_CH4,SAI1_D2,I2C1_SDA,,IR_OUT,USART3_TX,COMP2_OUT,CAN1_TX,TIM8_CH3,,TIM1_CH3N,HRTIM1_EEV5,SAI1_FS_A,EVENTOUT,,,,
+PortB,PB10,,TIM2_CH3,,,,,,USART3_TX,LPUART1_RX,,QUADSPI1_CLK,,TIM1_BKIN,HRTIM1_FLT3,SAI1_SCK_A,EVENTOUT,,COMP5_INM,,OPAMP3_VINM/OPAMP4_VINM
+PortB,PB11,,TIM2_CH4,,,,,,USART3_RX,LPUART1_TX,,QUADSPI1_BK1_NCS,,,HRTIM1_FLT4,,EVENTOUT,ADC12_IN14,COMP6_INP,,OPAMP4_VINP/OPAMP6_VOUT
+PortB,PB12,,,TIM5_ETR,,I2C2_SMBA,SPI2_NSS/I2S2_WS,TIM1_BKIN,USART3_CK,LPUART1_RTS_DE,CAN2_RX,,,,HRTIM1_CHC1,,EVENTOUT,ADC4_IN3/ADC1_IN11,COMP7_INM,,OPAMP4_VOUT/OPAMP6_VINP
+PortB,PB13,,,,,,SPI2_SCK/I2S2_CK,TIM1_CH1N,USART3_CTS,LPUART1_CTS,CAN2_TX,,,,HRTIM1_CHC2,,EVENTOUT,ADC3_IN5,COMP5_INP,,OPAMP3_VINP/OPAMP4_VINP/OPAMP6_VINP
+PortB,PB14,,TIM15_CH1,,,,SPI2_MISO,TIM1_CH2N,USART3_RTS_DE,COMP4_OUT,,,,,HRTIM1_CHD1,,EVENTOUT,ADC4_IN4/ADC1_IN5,COMP7_INP,,OPAMP2_VINP/OPAMP5_VINP
+PortB,PB15,RTC_REFIN,TIM15_CH2,TIM15_CH1N,COMP3_OUT,TIM1_CH3N,SPI2_MOSI/I2S2_SD,,,,,,,,HRTIM1_CHD2,,EVENTOUT,ADC4_IN5/ADC2_IN15,COMP6_INM,,OPAMP5_VINM
+PortC,PC0,,LPTIM1_IN1,TIM1_CH1,,,,,,LPUART1_RX,,,,,,,EVENTOUT,ADC12_IN6,COMP3_INM,
+PortC,PC1,,LPTIM1_OUT,TIM1_CH2,,,,,,LPUART1_TX,,QUADSPI1_BK2_IO0,,,SAI1_SD_A,,EVENTOUT,ADC12_IN7,COMP3_INP,,
+PortC,PC2,,LPTIM1_IN2,TIM1_CH3,COMP3_OUT,,,TIM20_CH2,,,,QUADSPI1_BK2_IO1,,,,,EVENTOUT,ADC12_IN8,,
+PortC,PC3,,LPTIM1_ETR,TIM1_CH4,SAI1_D1,,,TIM1_BKIN2,,,,QUADSPI1_BK2_IO2,,,SAI1_SD_A,,EVENTOUT,ADC12_IN9,,,OPAMP5_VINP
+PortC,PC4,,,TIM1_ETR,,I2C2_SCL,,,USART1_TX,,,QUADSPI1_BK2_IO3,,,,,EVENTOUT,ADC2_IN5,,,
+PortC,PC5,,,TIM15_BKIN,SAI1_D3,,,TIM1_CH4N,USART1_RX,,,,,,HRTIM1_EEV10,,EVENTOUT,ADC2_IN11,,,OPAMP1_VINM/OPAMP2_VINM
+PortC,PC6,,,TIM3_CH1,HRTIM1_EEV10,TIM8_CH1,,I2S2_MCK,COMP6_OUT,I2C4_SCL,,,,,HRTIM1_CHF1,,EVENTOUT,,,,
+PortC,PC7,,,TIM3_CH2,HRTIM1_FLT5,TIM8_CH2,,I2S3_MCK,COMP5_OUT,I2C4_SDA,,,,,HRTIM1_CHF2,,EVENTOUT,,,,
+PortC,PC8,,,TIM3_CH3,HRTIM1_CHE1,TIM8_CH3,,TIM20_CH3,COMP7_OUT,I2C3_SCL,,,,,,,EVENTOUT,,,,
+PortC,PC9,,,TIM3_CH4,HRTIM1_CHE2,TIM8_CH4,I2SCKIN,TIM8_BKIN2,,I2C3_SDA,,,,,,,EVENTOUT,,,,
+PortC,PC10,,,,,TIM8_CH1N,UART4_TX,SPI3_SCK/I2S3_CK,USART3_TX,,,,,,HRTIM1_FLT6,,EVENTOUT,,,,
+PortC,PC11,,,,HRTIM1_EEV2,TIM8_CH2N,UART4_RX,SPI3_MISO,USART3_RX,I2C3_SDA,,,,,,,EVENTOUT,,,,
+PortC,PC12,,TIM5_CH2,,HRTIM1_EEV1,TIM8_CH3N,UART5_TX,SPI3_MOSI/I2S3_SD,USART3_CK,,,,,,,UCPD1_FRSTX,EVENTOUT,,,,
+PortC,PC13,,,TIM1_BKIN,,TIM1_CH1N,,TIM8_CH4N,,,,,,,,,EVENTOUT,,,,
+PortC,PC14,,,,,,,,,,,,,,,,EVENTOUT,,,,
+PortC,PC15,,,,,,,,,,,,,,,,EVENTOUT,,,,
+PortD,PD0,,,,,,,TIM8_CH4N,,,CAN1_RX,,,FMC_D2,,,EVENTOUT,,,,
+PortD,PD1,,,,,TIM8_CH4,,TIM8_BKIN2,,,CAN1_TX,,,FMC_D3,,,EVENTOUT,,,,
+PortD,PD2,,,TIM3_ETR,,TIM8_BKIN,UART5_RX,,,,,,,,,,EVENTOUT,,,,
+PortD,PD3,,,TIM2_CH1/TIM2_ETR,,,,,USART2_CTS,,,QUADSPI1_BK2_NCS,,FMC_CLK,,,EVENTOUT,,,,
+PortD,PD4,,,TIM2_CH2,,,,,USART2_RTS_DE,,,QUADSPI1_BK2_IO0,,FMC_NOE,,,EVENTOUT,,,,
+PortD,PD5,,,,,,,,USART2_TX,,,QUADSPI1_BK2_IO1,,FMC_NWE,,,EVENTOUT,,,,
+PortD,PD6,,,TIM2_CH4,SAI1_D1,,,,USART2_RX,,,QUADSPI1_BK2_IO2,,FMC_NWAIT,SAI1_SD_A,,EVENTOUT,,,,
+PortD,PD7,,,TIM2_CH3,,,,,USART2_CK,,,QUADSPI1_BK2_IO3,,FMC_NCE/FMC_NE1,,,EVENTOUT,,,,
+PortD,PD8,,,,,,,,USART3_TX,,,,,FMC_D13,,,EVENTOUT,ADC4_IN12/ADC5_IN12,,,OPAMP4_VINM
+PortD,PD9,,,,,,,,USART3_RX,,,,,FMC_D14,,,EVENTOUT,ADC4_IN13/ADC5_IN13,,,OPAMP6_VINP
+PortD,PD10,,,,,,,,USART3_CK,,,,,FMC_D15,,,EVENTOUT,ADC345_IN7,COMP6_INM,,
+PortD,PD11,,TIM5_ETR,,,I2C4_SMBA,,,USART3_CTS,,,,,FMC_A16,,,EVENTOUT,ADC345_IN8,COMP6_INP,,OPAMP4_VINP
+PortD,PD12,,,TIM4_CH1,,,,,USART3_RTS_DE,,,,,FMC_A17,,,EVENTOUT,ADC345_IN9,COMP5_INP,,OPAMP5_VINP
+PortD,PD13,,,TIM4_CH2,,,,,,,,,,FMC_A18,,,EVENTOUT,ADC345_IN10,COMP5_INM,,
+PortD,PD14,,,TIM4_CH3,,,,,,,,,,FMC_D0,,,EVENTOUT,ADC345_IN11,COMP7_INP,,OPAMP2_VINP
+PortD,PD15,,,TIM4_CH4,,,,SPI2_NSS,,,,,,FMC_D1,,,EVENTOUT,,COMP7_INM,,
+PortE,PE0,,,TIM4_ETR,TIM20_CH4N,TIM16_CH1,,TIM20_ETR,USART1_TX,,CAN1_RXFD,,,FMC_NBL0,,,EVENTOUT,,,,
+PortE,PE1,,,,,TIM17_CH1,,TIM20_CH4,USART1_RX,,,,,FMC_NBL1,,,EVENTOUT,,,,
+PortE,PE2,TRACECK,,TIM3_CH1,SAI1_CK1,,SPI4_SCK,TIM20_CH1,,,,,,FMC_A23,SAI1_MCLK_A,,EVENTOUT,,,,
+PortE,PE3,TRACED0,,TIM3_CH2,,,SPI4_NSS,TIM20_CH2,,,,,,FMC_A19,SAI1_SD_B,,EVENTOUT,,,,
+PortE,PE4,TRACED1,,TIM3_CH3,SAI1_D2,,SPI4_NSS,TIM20_CH1N,,,,,,FMC_A20,SAI1_FS_A,,EVENTOUT,,,,
+PortE,PE5,TRACED2,,TIM3_CH4,SAI1_CK2,,SPI4_MISO,TIM20_CH2N,,,,,,FMC_A21,SAI1_SCK_A,,EVENTOUT,,,,
+PortE,PE6,TRACED3,,,SAI1_D1,,SPI4_MOSI,TIM20_CH3N,,,,,,FMC_A22,SAI1_SD_A,,EVENTOUT,,,,
+PortE,PE7,,,TIM1_ETR,,,,,,,,,,FMC_D4,SAI1_SD_B,,EVENTOUT,ADC3_IN4,COMP4_INP,,
+PortE,PE8,,TIM5_CH3,TIM1_CH1N,,,,,,,,,,FMC_D5,SAI1_SCK_B,,EVENTOUT,ADC345_IN6,COMP4_INM,,
+PortE,PE9,,TIM5_CH4,TIM1_CH1,,,,,,,,,,FMC_D6,SAI1_FS_B,,EVENTOUT,ADC3_IN2,,,
+PortE,PE10,,,TIM1_CH2N,,,,,,,,QUADSPI1_CLK,,FMC_D7,SAI1_MCLK_B,,EVENTOUT,ADC345_IN14,,,
+PortE,PE11,,,TIM1_CH2,,,SPI4_NSS,,,,,QUADSPI1_BK1_NCS,,FMC_D8,,,EVENTOUT,ADC345_IN15,,,
+PortE,PE12,,,TIM1_CH3N,,,SPI4_SCK,,,,,QUADSPI1_BK1_IO0,,FMC_D9,,,EVENTOUT,ADC345_IN16,,,
+PortE,PE13,,,TIM1_CH3,,,SPI4_MISO,,,,,QUADSPI1_BK1_IO1,,FMC_D10,,,EVENTOUT,ADC3_IN3,,,
+PortE,PE14,,,TIM1_CH4,,,SPI4_MOSI,TIM1_BKIN2,,,,QUADSPI1_BK1_IO2,,FMC_D11,,,EVENTOUT,ADC4_IN1,,,
+PortE,PE15,,,TIM1_BKIN,,,,TIM1_CH4N,USART3_RX,,,QUADSPI1_BK1_IO3,,FMC_D12,,,EVENTOUT,ADC4_IN2,,,
+PortF,PF0,,,,,I2C2_SDA,SPI2_NSS/I2S2_WS,TIM1_CH3N,,,,,,,,,EVENTOUT,ADC1_IN10,,,
+PortF,PF1,,,,,,SPI2_SCK/I2S2_CK,,,,,,,,,,EVENTOUT,ADC2_IN10,COMP3_INM,,
+PortF,PF2,,,TIM20_CH3,,I2C2_SMBA,,,,,,,,FMC_A2,,,EVENTOUT,,,,
+PortF,PF3,,,TIM20_CH4,,I2C3_SCL,,,,,,,,FMC_A3,,,EVENTOUT,,,,
+PortF,PF4,,,COMP1_OUT,TIM20_CH1N,I2C3_SDA,,,,,,,,FMC_A4,,,EVENTOUT,,,,
+PortF,PF5,,,TIM20_CH2N,,,,,,,,,,FMC_A5,,,EVENTOUT,,,,
+PortF,PF6,,TIM5_ETR,TIM4_CH4,SAI1_SD_B,I2C2_SCL,,TIM5_CH1,USART3_RTS,,,QUADSPI1_BK1_IO3,,,,,EVENTOUT,,,,
+PortF,PF7,,,TIM20_BKIN,,,,TIM5_CH2,,,,QUADSPI1_BK1_IO2,,FMC_A1,SAI1_MCLK_B,,EVENTOUT,,,,
+PortF,PF8,,,TIM20_BKIN2,,,,TIM5_CH3,,,,QUADSPI1_BK1_IO0,,FMC_A24,SAI1_SCK_B,,EVENTOUT,,,,
+PortF,PF9,,,TIM20_BKIN,TIM15_CH1,,SPI2_SCK,TIM5_CH4,,,,QUADSPI1_BK1_IO1,,FMC_A25,SAI1_FS_B,,EVENTOUT,,,,
+PortF,PF10,,,TIM20_BKIN2,TIM15_CH2,,SPI2_SCK,,,,,QUADSPI1_CLK,,FMC_A0,SAI1_D3,,EVENTOUT,,,,
+PortF,PF11,,,TIM20_ETR,,,,,,,,,,FMC_NE4,,,EVENTOUT,,,,
+PortF,PF12,,,TIM20_CH1,,,,,,,,,,FMC_A6,,,EVENTOUT,,,,
+PortF,PF13,,,TIM20_CH2,,I2C4_SMBA,,,,,,,,FMC_A7,,,EVENTOUT,,,,
+PortF,PF14,,,TIM20_CH3,,I2C4_SCL,,,,,,,,FMC_A8,,,EVENTOUT,,,,
+PortF,PF15,,,TIM20_CH4,,I2C4_SDA,,,,,,,,FMC_A9,,,EVENTOUT,,,,
+PortG,PG0,,,TIM20_CH1N,,,,,,,,,,FMC_A10,,,EVENTOUT,,,,
+PortG,PG1,,,TIM20_CH2N,,,,,,,,,,FMC_A11,,,EVENTOUT,,,,
+PortG,PG2,,,TIM20_CH3N,,,SPI1_SCK,,,,,,,FMC_A12,,,EVENTOUT,,,,
+PortG,PG3,,,TIM20_BKIN,,I2C4_SCL,SPI1_MISO,TIM20_CH4N,,,,,,FMC_A13,,,EVENTOUT,,,,
+PortG,PG4,,,TIM20_BKIN2,,I2C4_SDA,SPI1_MOSI,,,,,,,FMC_A14,,,EVENTOUT,,,,
+PortG,PG5,,,TIM20_ETR,,,SPI1_NSS,,,LPUART1_CTS,,,,FMC_A15,,,EVENTOUT,,,,
+PortG,PG6,,,TIM20_BKIN,,I2C3_SMBA,,,,LPUART1_RTS_DE,,,,FMC_INT,,,EVENTOUT,,,,
+PortG,PG7,,,,SAI1_CK1,I2C3_SCL,,,,LPUART1_TX,,,,FMC_INT,SAI1_MCLK_A,,EVENTOUT,,,,
+PortG,PG8,,,,,I2C3_SDA,,,,LPUART1_RX,,,,FMC_NE3,,,EVENTOUT,,,,
+PortG,PG9,,,,,,,SPI3_SCK,USART1_TX,,,,,FMC_NCE/FMC_NE2,,TIM15_CH1N,EVENTOUT,,,,
+PortG,PG10,MCO,,,,,,,,,,,,,,,EVENTOUT
diff --git a/ports/stm32/boards/stm32g4xx_hal_conf_base.h b/ports/stm32/boards/stm32g4xx_hal_conf_base.h
new file mode 100644
index 0000000000000..034d396539488
--- /dev/null
+++ b/ports/stm32/boards/stm32g4xx_hal_conf_base.h
@@ -0,0 +1,131 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2019 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+#ifndef MICROPY_INCLUDED_STM32G4XX_HAL_CONF_BASE_H
+#define MICROPY_INCLUDED_STM32G4XX_HAL_CONF_BASE_H
+
+// Include various HAL modules for convenience
+
+#include "stm32g4xx_hal_rcc.h"
+#include "stm32g4xx_hal_gpio.h"
+#include "stm32g4xx_hal_dma.h"
+#include "stm32g4xx_hal_cortex.h"
+#include "stm32g4xx_hal_adc.h"
+#include "stm32g4xx_hal_comp.h"
+#include "stm32g4xx_hal_cordic.h"
+#include "stm32g4xx_hal_crc.h"
+#include "stm32g4xx_hal_cryp.h"
+#include "stm32g4xx_hal_dac.h"
+#include "stm32g4xx_hal_exti.h"
+#include "stm32g4xx_hal_fdcan.h"
+#include "stm32g4xx_hal_flash.h"
+#include "stm32g4xx_hal_fmac.h"
+#include "stm32g4xx_hal_hrtim.h"
+#include "stm32g4xx_hal_irda.h"
+#include "stm32g4xx_hal_iwdg.h"
+#include "stm32g4xx_hal_i2c.h"
+#include "stm32g4xx_hal_i2s.h"
+#include "stm32g4xx_hal_lptim.h"
+#include "stm32g4xx_hal_nand.h"
+#include "stm32g4xx_hal_nor.h"
+#include "stm32g4xx_hal_opamp.h"
+#include "stm32g4xx_hal_pcd.h"
+#include "stm32g4xx_hal_pwr.h"
+#include "stm32g4xx_hal_qspi.h"
+#include "stm32g4xx_hal_rng.h"
+#include "stm32g4xx_hal_rtc.h"
+#include "stm32g4xx_hal_sai.h"
+#include "stm32g4xx_hal_smartcard.h"
+#include "stm32g4xx_hal_smbus.h"
+#include "stm32g4xx_hal_spi.h"
+#include "stm32g4xx_hal_sram.h"
+#include "stm32g4xx_hal_tim.h"
+#include "stm32g4xx_hal_uart.h"
+#include "stm32g4xx_hal_usart.h"
+#include "stm32g4xx_hal_wwdg.h"
+
+#include "stm32g4xx_ll_adc.h"
+#include "stm32g4xx_ll_rtc.h"
+#include "stm32g4xx_ll_usart.h"
+#include "stm32g4xx_ll_lpuart.h"
+
+#define HAL_MODULE_ENABLED
+#define HAL_ADC_MODULE_ENABLED
+#define HAL_COMP_MODULE_ENABLED
+#define HAL_CORDIC_MODULE_ENABLED
+#define HAL_CORTEX_MODULE_ENABLED
+#define HAL_CRC_MODULE_ENABLED
+#define HAL_CRYP_MODULE_ENABLED
+#define HAL_DAC_MODULE_ENABLED
+#define HAL_DMA_MODULE_ENABLED
+#define HAL_EXTI_MODULE_ENABLED
+#define HAL_FDCAN_MODULE_ENABLED
+#define HAL_FLASH_MODULE_ENABLED
+#define HAL_FMAC_MODULE_ENABLED
+#define HAL_GPIO_MODULE_ENABLED
+#define HAL_HRTIM_MODULE_ENABLED
+#define HAL_IRDA_MODULE_ENABLED
+#define HAL_IWDG_MODULE_ENABLED
+#define HAL_I2C_MODULE_ENABLED
+#define HAL_I2S_MODULE_ENABLED
+#define HAL_LPTIM_MODULE_ENABLED
+#define HAL_NAND_MODULE_ENABLED
+#define HAL_NOR_MODULE_ENABLED
+#define HAL_OPAMP_MODULE_ENABLED
+#define HAL_PCD_MODULE_ENABLED
+#define HAL_PWR_MODULE_ENABLED
+#define HAL_QSPI_MODULE_ENABLED
+#define HAL_RCC_MODULE_ENABLED
+#define HAL_RNG_MODULE_ENABLED
+#define HAL_RTC_MODULE_ENABLED
+#define HAL_SAI_MODULE_ENABLED
+#define HAL_SMARTCARD_MODULE_ENABLED
+#define HAL_SMBUS_MODULE_ENABLED
+#define HAL_SPI_MODULE_ENABLED
+#define HAL_SRAM_MODULE_ENABLED
+#define HAL_TIM_MODULE_ENABLED
+#define HAL_UART_MODULE_ENABLED
+#define HAL_USART_MODULE_ENABLED
+#define HAL_WWDG_MODULE_ENABLED
+
+// Oscillator values in Hz
+#define HSI_VALUE    (16000000)
+#define HSI48_VALUE  (48000000)
+#define LSI_VALUE    (32000)
+
+// SysTick priority
+#define TICK_INT_PRIORITY (0x0F)
+
+// Miscellaneous HAL settings
+#define  USE_RTOS                   0
+#define  PREFETCH_ENABLE            0
+#define  INSTRUCTION_CACHE_ENABLE   1
+#define  DATA_CACHE_ENABLE          1
+#define  USE_SPI_CRC                1
+
+// HAL parameter assertions are disabled
+#define assert_param(expr) ((void)0)
+
+#endif // MICROPY_INCLUDED_STM32G4XX_HAL_CONF_BASE_H
diff --git a/ports/stm32/dac.c b/ports/stm32/dac.c
index d51312aebc91f..b7fb0cbd708df 100644
--- a/ports/stm32/dac.c
+++ b/ports/stm32/dac.c
@@ -101,7 +101,7 @@ STATIC uint32_t TIMx_Config(mp_obj_t timer) {
     } else if (tim->Instance == TIM4) {
         return DAC_TRIGGER_T4_TRGO;
     #endif
-    #if defined(TIM5)
+    #if defined(TIM5) && defined(DAC_TRIGGER_T5_TRGO) // G474 doesn't have this
     } else if (tim->Instance == TIM5) {
         return DAC_TRIGGER_T5_TRGO;
     #endif
@@ -124,7 +124,7 @@ STATIC uint32_t TIMx_Config(mp_obj_t timer) {
 
 STATIC void dac_deinit(uint32_t dac_channel) {
     DAC->CR &= ~(DAC_CR_EN1 << dac_channel);
-    #if defined(STM32H7) || defined(STM32L4)
+    #if defined(STM32G4) || defined(STM32H7) || defined(STM32L4)
     DAC->MCR = (DAC->MCR & ~(DAC_MCR_MODE1_Msk << dac_channel)) | (DAC_OUTPUTBUFFER_DISABLE << dac_channel);
     #else
     DAC->CR |= DAC_CR_BOFF1 << dac_channel;
@@ -142,7 +142,7 @@ STATIC void dac_config_channel(uint32_t dac_channel, uint32_t trig, uint32_t out
     DAC->CR &= ~(DAC_CR_EN1 << dac_channel);
     uint32_t cr_off = DAC_CR_DMAEN1 | DAC_CR_MAMP1 | DAC_CR_WAVE1 | DAC_CR_TSEL1 | DAC_CR_TEN1;
     uint32_t cr_on = trig;
-    #if defined(STM32H7) || defined(STM32L4)
+    #if defined(STM32G4) || defined(STM32H7) || defined(STM32L4)
     DAC->MCR = (DAC->MCR & ~(DAC_MCR_MODE1_Msk << dac_channel)) | (outbuf << dac_channel);
     #else
     cr_off |= DAC_CR_BOFF1;
@@ -259,7 +259,7 @@ STATIC mp_obj_t pyb_dac_init_helper(pyb_dac_obj_t *self, size_t n_args, const mp
     __DAC_CLK_ENABLE();
     #elif defined(STM32H7)
     __HAL_RCC_DAC12_CLK_ENABLE();
-    #elif defined(STM32F0) || defined(STM32L4)
+    #elif defined(STM32F0) || defined(STM32G4) || defined(STM32L4)
     __HAL_RCC_DAC1_CLK_ENABLE();
     #else
     #error Unsupported Processor
diff --git a/ports/stm32/dma.c b/ports/stm32/dma.c
index b376ee23b53da..dc706e68aa08f 100644
--- a/ports/stm32/dma.c
+++ b/ports/stm32/dma.c
@@ -74,7 +74,7 @@ typedef union {
 struct _dma_descr_t {
     #if defined(STM32F4) || defined(STM32F7) || defined(STM32H7)
     DMA_Stream_TypeDef *instance;
-    #elif defined(STM32F0) || defined(STM32L0) || defined(STM32L4) || defined(STM32WB)
+    #elif defined(STM32F0) || defined(STM32G4) || defined(STM32L0) || defined(STM32L4) || defined(STM32WB)
     DMA_Channel_TypeDef *instance;
     #else
     #error "Unsupported Processor"
@@ -89,7 +89,7 @@ struct _dma_descr_t {
 static const DMA_InitTypeDef dma_init_struct_spi_i2c = {
     #if defined(STM32F4) || defined(STM32F7)
     .Channel = 0,
-    #elif defined(STM32H7) || defined(STM32L0) || defined(STM32L4) || defined(STM32WB)
+    #elif defined(STM32G4) || defined(STM32H7) || defined(STM32L0) || defined(STM32L4) || defined(STM32WB)
     .Request = 0,
     #endif
     .Direction = 0,
@@ -137,7 +137,7 @@ static const DMA_InitTypeDef dma_init_struct_i2s = {
 static const DMA_InitTypeDef dma_init_struct_sdio = {
     #if defined(STM32F4) || defined(STM32F7)
     .Channel = 0,
-    #elif defined(STM32L0) || defined(STM32L4) || defined(STM32WB)
+    #elif defined(STM32G4) || defined(STM32L0) || defined(STM32L4) || defined(STM32WB)
     .Request = 0,
     #endif
     .Direction = 0,
@@ -147,7 +147,7 @@ static const DMA_InitTypeDef dma_init_struct_sdio = {
     .MemDataAlignment = DMA_MDATAALIGN_WORD,
     #if defined(STM32F4) || defined(STM32F7)
     .Mode = DMA_PFCTRL,
-    #elif defined(STM32L0) || defined(STM32L4) || defined(STM32WB)
+    #elif defined(STM32G4) || defined(STM32L0) || defined(STM32L4) || defined(STM32WB)
     .Mode = DMA_NORMAL,
     #endif
     .Priority = DMA_PRIORITY_VERY_HIGH,
@@ -165,7 +165,7 @@ static const DMA_InitTypeDef dma_init_struct_sdio = {
 static const DMA_InitTypeDef dma_init_struct_dac = {
     #if defined(STM32F4) || defined(STM32F7)
     .Channel = 0,
-    #elif defined(STM32H7) || defined(STM32L0) || defined(STM32L4) || defined(STM32WB)
+    #elif defined(STM32G4) || defined(STM32H7) || defined(STM32L0) || defined(STM32L4) || defined(STM32WB)
     .Request = 0,
     #endif
     .Direction = 0,
@@ -501,6 +501,86 @@ static const uint8_t dma_irqn[NSTREAM] = {
     DMA2_Channel7_IRQn,
 };
 
+#elif defined(STM32G4)
+
+#define NCONTROLLERS            (2)
+
+#if defined(STM32G431xx) || defined(STM32G441xx)
+#define NSTREAMS_PER_CONTROLLER (6) // Cat 2 devices = 6, Cat 3 = 8
+#else
+#define NSTREAMS_PER_CONTROLLER (8) // Cat 2 devices = 6, Cat 3 = 8
+#endif
+#define NSTREAM                 (NCONTROLLERS * NSTREAMS_PER_CONTROLLER)
+
+#define DMA_SUB_INSTANCE_AS_UINT8(dma_request) (dma_request)
+#if defined(STM32G431xx) || defined(STM32G441xx)
+#define DMA1_ENABLE_MASK (0x004f) // Bits in dma_enable_mask corresponding to DMA1
+#define DMA2_ENABLE_MASK (0x0fc0) // Bits in dma_enable_mask corresponding to DMA2
+#else
+#define DMA1_ENABLE_MASK (0x00Ff) // Bits in dma_enable_mask corresponding to DMA1
+#define DMA2_ENABLE_MASK (0xff00) // Bits in dma_enable_mask corresponding to DMA2
+#endif
+
+// These descriptors are ordered by DMAx_Channel number, and within a channel by request
+// number. The duplicate streams are ok as long as they aren't used at the same time.
+
+// DMA1 streams
+const dma_descr_t dma_SPI_1_RX = { DMA1_Channel1, DMA_REQUEST_SPI1_RX, dma_id_0,   &dma_init_struct_spi_i2c };
+const dma_descr_t dma_SPI_1_TX = { DMA1_Channel2, DMA_REQUEST_SPI1_TX, dma_id_1,   &dma_init_struct_spi_i2c };
+const dma_descr_t dma_SPI_2_RX = { DMA1_Channel1, DMA_REQUEST_SPI2_RX, dma_id_0,   &dma_init_struct_spi_i2c };
+const dma_descr_t dma_SPI_2_TX = { DMA1_Channel2, DMA_REQUEST_SPI2_TX, dma_id_1,   &dma_init_struct_spi_i2c };
+
+const dma_descr_t dma_I2C_1_RX = { DMA1_Channel3, DMA_REQUEST_I2C1_RX, dma_id_2,   &dma_init_struct_spi_i2c };
+const dma_descr_t dma_I2C_1_TX = { DMA1_Channel4, DMA_REQUEST_I2C1_TX, dma_id_3,   &dma_init_struct_spi_i2c };
+const dma_descr_t dma_I2C_2_RX = { DMA1_Channel3, DMA_REQUEST_I2C2_RX, dma_id_2,   &dma_init_struct_spi_i2c };
+const dma_descr_t dma_I2C_2_TX = { DMA1_Channel4, DMA_REQUEST_I2C2_TX, dma_id_3,   &dma_init_struct_spi_i2c };
+const dma_descr_t dma_I2C_3_RX = { DMA1_Channel3, DMA_REQUEST_I2C3_RX, dma_id_2,   &dma_init_struct_spi_i2c };
+const dma_descr_t dma_I2C_3_TX = { DMA1_Channel4, DMA_REQUEST_I2C3_TX, dma_id_3,   &dma_init_struct_spi_i2c };
+const dma_descr_t dma_UART_3_RX = { DMA1_Channel3, DMA_REQUEST_USART3_RX, dma_id_2, &dma_init_struct_spi_i2c };
+const dma_descr_t dma_UART_3_TX = { DMA1_Channel4, DMA_REQUEST_USART3_TX, dma_id_3, &dma_init_struct_spi_i2c };
+
+#if MICROPY_HW_ENABLE_DAC
+const dma_descr_t dma_DAC_1_TX = { DMA1_Channel5, DMA_REQUEST_DAC1_CHANNEL1, dma_id_4,   &dma_init_struct_dac };
+const dma_descr_t dma_DAC_2_TX = { DMA1_Channel6, DMA_REQUEST_DAC1_CHANNEL2, dma_id_5,   &dma_init_struct_dac };
+#endif
+#if !defined(STM32G431xx) && !defined(STM32G441xx)
+// channel 7 & 8
+#endif
+
+// DMA2 streams
+const dma_descr_t dma_UART_1_RX = { DMA2_Channel1, DMA_REQUEST_USART1_RX,  dma_id_6,   &dma_init_struct_spi_i2c };
+const dma_descr_t dma_UART_1_TX = { DMA2_Channel2, DMA_REQUEST_USART1_TX,  dma_id_7,   &dma_init_struct_spi_i2c };
+const dma_descr_t dma_LPUART_1_RX = { DMA2_Channel3, DMA_REQUEST_LPUART1_RX, dma_id_8,   &dma_init_struct_spi_i2c };
+const dma_descr_t dma_LPUART_1_TX = { DMA2_Channel4, DMA_REQUEST_LPUART1_TX, dma_id_9,   &dma_init_struct_spi_i2c };
+const dma_descr_t dma_ADC_1 = { DMA2_Channel5, DMA_REQUEST_ADC1,       dma_id_10,  NULL };
+const dma_descr_t dma_MEM_2_MEM = { DMA2_Channel6, DMA_REQUEST_MEM2MEM,    dma_id_11,  NULL };
+#if !defined(STM32G431xx) && !defined(STM32G441xx)
+// channel 7 & 8
+#endif
+
+static const uint8_t dma_irqn[NSTREAM] = {
+    DMA1_Channel1_IRQn,
+    DMA1_Channel2_IRQn,
+    DMA1_Channel3_IRQn,
+    DMA1_Channel4_IRQn,
+    DMA1_Channel5_IRQn,
+    DMA1_Channel6_IRQn,
+    #if !defined(STM32G431xx) && !defined(STM32G441xx)
+    DMA1_Channel7_IRQn,
+    DMA1_Channel8_IRQn,
+    #endif
+    DMA2_Channel1_IRQn,
+    DMA2_Channel2_IRQn,
+    DMA2_Channel3_IRQn,
+    DMA2_Channel4_IRQn,
+    DMA2_Channel5_IRQn,
+    DMA2_Channel6_IRQn,
+    #if !defined(STM32G431xx) && !defined(STM32G441xx)
+    DMA2_Channel7_IRQn,
+    DMA2_Channel8_IRQn,
+    #endif
+};
+
 #elif defined(STM32H7)
 
 #define NCONTROLLERS            (2)
@@ -742,6 +822,125 @@ void DMA2_Stream7_IRQHandler(void) {
     IRQ_EXIT(DMA2_Stream7_IRQn);
 }
 
+#elif defined(STM32G4)
+
+void DMA1_Channel1_IRQHandler(void) {
+    IRQ_ENTER(DMA1_Channel1_IRQn);
+    if (dma_handle[dma_id_0] != NULL) {
+        HAL_DMA_IRQHandler(dma_handle[dma_id_0]);
+    }
+    IRQ_EXIT(DMA1_Channel1_IRQn);
+}
+void DMA1_Channel2_IRQHandler(void) {
+    IRQ_ENTER(DMA1_Channel2_IRQn);
+    if (dma_handle[dma_id_1] != NULL) {
+        HAL_DMA_IRQHandler(dma_handle[dma_id_1]);
+    }
+    IRQ_EXIT(DMA1_Channel2_IRQn);
+}
+void DMA1_Channel3_IRQHandler(void) {
+    IRQ_ENTER(DMA1_Channel3_IRQn);
+    if (dma_handle[dma_id_2] != NULL) {
+        HAL_DMA_IRQHandler(dma_handle[dma_id_2]);
+    }
+    IRQ_EXIT(DMA1_Channel3_IRQn);
+}
+void DMA1_Channel4_IRQHandler(void) {
+    IRQ_ENTER(DMA1_Channel4_IRQn);
+    if (dma_handle[dma_id_3] != NULL) {
+        HAL_DMA_IRQHandler(dma_handle[dma_id_3]);
+    }
+    IRQ_EXIT(DMA1_Channel4_IRQn);
+}
+void DMA1_Channel5_IRQHandler(void) {
+    IRQ_ENTER(DMA1_Channel5_IRQn);
+    if (dma_handle[dma_id_4] != NULL) {
+        HAL_DMA_IRQHandler(dma_handle[dma_id_4]);
+    }
+    IRQ_EXIT(DMA1_Channel5_IRQn);
+}
+void DMA1_Channel6_IRQHandler(void) {
+    IRQ_ENTER(DMA1_Channel6_IRQn);
+    if (dma_handle[dma_id_5] != NULL) {
+        HAL_DMA_IRQHandler(dma_handle[dma_id_5]);
+    }
+    IRQ_EXIT(DMA1_Channel6_IRQn);
+}
+#if !(defined(STM32G431xx) || defined(STM32G441xx))
+void DMA1_Channel7_IRQHandler(void) {
+    IRQ_ENTER(DMA1_Channel7_IRQn);
+    if (dma_handle[dma_id_12] != NULL) {
+        HAL_DMA_IRQHandler(dma_handle[dma_id_12]);
+    }
+    IRQ_EXIT(DMA1_Channel7_IRQn);
+}
+void DMA1_Channel8_IRQHandler(void) {
+    IRQ_ENTER(DMA1_Channel8_IRQn);
+    if (dma_handle[dma_id_13] != NULL) {
+        HAL_DMA_IRQHandler(dma_handle[dma_id_13]);
+    }
+    IRQ_EXIT(DMA1_Channel8_IRQn);
+}
+#endif
+void DMA2_Channel1_IRQHandler(void) {
+    IRQ_ENTER(DMA2_Channel1_IRQn);
+    if (dma_handle[dma_id_6] != NULL) {
+        HAL_DMA_IRQHandler(dma_handle[dma_id_6]);
+    }
+    IRQ_EXIT(DMA2_Channel1_IRQn);
+}
+void DMA2_Channel2_IRQHandler(void) {
+    IRQ_ENTER(DMA2_Channel2_IRQn);
+    if (dma_handle[dma_id_7] != NULL) {
+        HAL_DMA_IRQHandler(dma_handle[dma_id_7]);
+    }
+    IRQ_EXIT(DMA2_Channel2_IRQn);
+}
+void DMA2_Channel3_IRQHandler(void) {
+    IRQ_ENTER(DMA2_Channel3_IRQn);
+    if (dma_handle[dma_id_8] != NULL) {
+        HAL_DMA_IRQHandler(dma_handle[dma_id_8]);
+    }
+    IRQ_EXIT(DMA2_Channel3_IRQn);
+}
+void DMA2_Channel4_IRQHandler(void) {
+    IRQ_ENTER(DMA2_Channel4_IRQn);
+    if (dma_handle[dma_id_9] != NULL) {
+        HAL_DMA_IRQHandler(dma_handle[dma_id_9]);
+    }
+    IRQ_EXIT(DMA2_Channel4_IRQn);
+}
+void DMA2_Channel5_IRQHandler(void) {
+    IRQ_ENTER(DMA2_Channel5_IRQn);
+    if (dma_handle[dma_id_10] != NULL) {
+        HAL_DMA_IRQHandler(dma_handle[dma_id_10]);
+    }
+    IRQ_EXIT(DMA2_Channel5_IRQn);
+}
+void DMA2_Channel6_IRQHandler(void) {
+    IRQ_ENTER(DMA2_Channel6_IRQn);
+    if (dma_handle[dma_id_11] != NULL) {
+        HAL_DMA_IRQHandler(dma_handle[dma_id_11]);
+    }
+    IRQ_EXIT(DMA2_Channel6_IRQn);
+}
+#if !(defined(STM32G431xx) || defined(STM32G441xx))
+void DMA2_Channel7_IRQHandler(void) {
+    IRQ_ENTER(DMA2_Channel7_IRQn);
+    if (dma_handle[dma_id_14] != NULL) {
+        HAL_DMA_IRQHandler(dma_handle[dma_id_14]);
+    }
+    IRQ_EXIT(DMA2_Channel7_IRQn);
+}
+void DMA2_Channel8_IRQHandler(void) {
+    IRQ_ENTER(DMA2_Channel8_IRQn);
+    if (dma_handle[dma_id_15] != NULL) {
+        HAL_DMA_IRQHandler(dma_handle[dma_id_15]);
+    }
+    IRQ_EXIT(DMA2_Channel8_IRQn);
+}
+#endif
+
 #elif defined(STM32L0)
 
 void DMA1_Channel1_IRQHandler(void) {
@@ -909,6 +1108,9 @@ static void dma_enable_clock(dma_id_t dma_id) {
     if (dma_id < NSTREAMS_PER_CONTROLLER) {
         if (((old_enable_mask & DMA1_ENABLE_MASK) == 0) && !DMA1_IS_CLK_ENABLED()) {
             __HAL_RCC_DMA1_CLK_ENABLE();
+            #if defined(STM32G4)
+            __HAL_RCC_DMAMUX1_CLK_ENABLE();
+            #endif
 
             // We just turned on the clock. This means that anything stored
             // in dma_last_channel (for DMA1) needs to be invalidated.
@@ -923,6 +1125,9 @@ static void dma_enable_clock(dma_id_t dma_id) {
         if (((old_enable_mask & DMA2_ENABLE_MASK) == 0) && !DMA2_IS_CLK_ENABLED()) {
             __HAL_RCC_DMA2_CLK_ENABLE();
 
+            #if defined(STM32G4)
+            __HAL_RCC_DMAMUX1_CLK_ENABLE();
+            #endif
             // We just turned on the clock. This means that anything stored
             // in dma_last_channel (for DMA2) needs to be invalidated.
 
@@ -947,7 +1152,7 @@ void dma_init_handle(DMA_HandleTypeDef *dma, const dma_descr_t *dma_descr, uint3
     dma->Instance = dma_descr->instance;
     dma->Init = *dma_descr->init;
     dma->Init.Direction = dir;
-    #if defined(STM32L0) || defined(STM32L4) || defined(STM32H7) || defined(STM32WB)
+    #if defined(STM32G4) || defined(STM32H7) || defined(STM32L0) || defined(STM32L4) || defined(STM32WB)
     dma->Init.Request = dma_descr->sub_instance;
     #else
     #if !defined(STM32F0)
@@ -974,7 +1179,7 @@ void dma_init(DMA_HandleTypeDef *dma, const dma_descr_t *dma_descr, uint32_t dir
 
         dma_enable_clock(dma_id);
 
-        #if defined(STM32H7) || defined(STM32L0) || defined(STM32L4) || defined(STM32WB)
+        #if defined(STM32G4) || defined(STM32H7) || defined(STM32L0) || defined(STM32L4) || defined(STM32WB)
         // Always reset and configure the H7 and L0/L4 DMA peripheral
         // (dma->State is set to HAL_DMA_STATE_RESET by memset above)
         // TODO: understand how L0/L4 DMA works so this is not needed
@@ -1070,10 +1275,23 @@ static void dma_idle_handler(uint32_t tick) {
                 dma_idle.counter[controller] = 0;
                 if (controller == 0) {
                     __HAL_RCC_DMA1_CLK_DISABLE();
+                    #if defined(STM32G4)
+                    #if defined(DMA2)
+                    if (__HAL_RCC_DMA2_IS_CLK_DISABLED())
+                    #endif
+                    {
+                        __HAL_RCC_DMAMUX1_CLK_DISABLE();
+                    }
+                    #endif
                 }
                 #if defined(DMA2)
                 else {
                     __HAL_RCC_DMA2_CLK_DISABLE();
+                    #if defined(STM32G4)
+                    if (__HAL_RCC_DMA1_IS_CLK_DISABLED()) {
+                        __HAL_RCC_DMAMUX1_CLK_DISABLE();
+                    }
+                    #endif
                 }
                 #endif
             } else {
@@ -1085,7 +1303,7 @@ static void dma_idle_handler(uint32_t tick) {
     }
 }
 
-#if defined(STM32F0) || defined(STM32L0) || defined(STM32L4)
+#if defined(STM32F0) || defined(STM32G4) || defined(STM32L0) || defined(STM32L4)
 
 void dma_nohal_init(const dma_descr_t *descr, uint32_t config) {
     DMA_Channel_TypeDef *dma = descr->instance;
@@ -1108,6 +1326,9 @@ void dma_nohal_init(const dma_descr_t *descr, uint32_t config) {
     } else {
         __HAL_DMA2_REMAP(descr->sub_instance);
     }
+    #elif defined(STM32G4)
+    uint32_t *dmamux_ctrl = (void *)(DMAMUX1_Channel0_BASE + 0x04 * descr->id);
+    *dmamux_ctrl = (*dmamux_ctrl & ~(0x7f)) | descr->sub_instance;
     #else
     DMA_Request_TypeDef *dma_ctrl = (void *)(((uint32_t)dma & ~0xff) + (DMA1_CSELR_BASE - DMA1_BASE)); // DMA1_CSELR or DMA2_CSELR
     uint32_t channel_number = (((uint32_t)dma & 0xff) - 0x08) / 20; // 0 through 6
diff --git a/ports/stm32/dma.h b/ports/stm32/dma.h
index 00200bae46dee..29d5c3d2eb018 100644
--- a/ports/stm32/dma.h
+++ b/ports/stm32/dma.h
@@ -62,6 +62,29 @@ extern const dma_descr_t dma_I2S_1_TX;
 extern const dma_descr_t dma_I2S_2_RX;
 extern const dma_descr_t dma_I2S_2_TX;
 
+#elif defined(STM32G4)
+
+extern const dma_descr_t dma_SPI_1_RX;
+extern const dma_descr_t dma_SPI_1_TX;
+extern const dma_descr_t dma_SPI_2_RX;
+extern const dma_descr_t dma_SPI_2_TX;
+extern const dma_descr_t dma_I2C_1_RX;
+extern const dma_descr_t dma_I2C_1_TX;
+extern const dma_descr_t dma_I2C_2_RX;
+extern const dma_descr_t dma_I2C_2_TX;
+extern const dma_descr_t dma_I2C_3_RX;
+extern const dma_descr_t dma_I2C_3_TX;
+extern const dma_descr_t dma_UART_3_RX;
+extern const dma_descr_t dma_UART_3_TX;
+extern const dma_descr_t dma_DAC_1_TX;
+extern const dma_descr_t dma_DAC_2_TX;
+extern const dma_descr_t dma_UART_1_RX;
+extern const dma_descr_t dma_UART_1_TX;
+extern const dma_descr_t dma_LPUART_1_RX;
+extern const dma_descr_t dma_LPUART_1_TX;
+extern const dma_descr_t dma_ADC_1;
+extern const dma_descr_t dma_MEM_2_MEM;
+
 #elif defined(STM32L0)
 
 extern const dma_descr_t dma_SPI_1_RX;
diff --git a/ports/stm32/extint.c b/ports/stm32/extint.c
index 699bc600406a8..bb26b00dde00c 100644
--- a/ports/stm32/extint.c
+++ b/ports/stm32/extint.c
@@ -91,7 +91,7 @@
 #define EXTI_SWIER_BB(line) (*(__IO uint32_t *)(PERIPH_BB_BASE + ((EXTI_OFFSET + offsetof(EXTI_TypeDef, SWIER)) * 32) + ((line) * 4)))
 #endif
 
-#if defined(STM32L4) || defined(STM32WB)
+#if defined(STM32G4) || defined(STM32L4) || defined(STM32WB)
 // The L4 MCU supports 40 Events/IRQs lines of the type configurable and direct.
 // Here we only support configurable line types.  Details, see page 330 of RM0351, Rev 1.
 // The USB_FS_WAKUP event is a direct type and there is no support for it.
@@ -138,6 +138,10 @@ STATIC mp_obj_t pyb_extint_callback_arg[EXTI_NUM_VECTORS];
 #define OTG_FS_WKUP_IRQn 42  // Some MCUs don't have FS IRQ, but we want a value to put in our table
 #endif
 
+#if defined(STM32G4)
+#define TAMP_STAMP_IRQn RTC_TAMP_LSECSS_IRQn
+#endif
+
 STATIC const uint8_t nvic_irq_channel[EXTI_NUM_VECTORS] = {
     #if defined(STM32F0) || defined(STM32L0)
 
@@ -178,7 +182,7 @@ STATIC const uint8_t nvic_irq_channel[EXTI_NUM_VECTORS] = {
     TAMP_STAMP_LSECSS_IRQn,
     RTC_WKUP_IRQn,
     #else
-    #if defined(STM32L4)
+    #if defined(STM32G4) || defined(STM32L4)
     PVD_PVM_IRQn,
     #else
     PVD_IRQn,
@@ -381,7 +385,7 @@ void extint_enable(uint line) {
     if (pyb_extint_mode[line] == EXTI_Mode_Interrupt) {
         #if defined(STM32H7)
         EXTI_D1->IMR1 |= (1 << line);
-        #elif defined(STM32WB)
+        #elif defined(STM32G4) || defined(STM32WB)
         EXTI->IMR1 |= (1 << line);
         #else
         EXTI->IMR |= (1 << line);
@@ -389,7 +393,7 @@ void extint_enable(uint line) {
     } else {
         #if defined(STM32H7)
         EXTI_D1->EMR1 |= (1 << line);
-        #elif defined(STM32WB)
+        #elif defined(STM32G4) || defined(STM32WB)
         EXTI->EMR1 |= (1 << line);
         #else
         EXTI->EMR |= (1 << line);
@@ -415,7 +419,7 @@ void extint_disable(uint line) {
     #if defined(STM32H7)
     EXTI_D1->IMR1 &= ~(1 << line);
     EXTI_D1->EMR1 &= ~(1 << line);
-    #elif defined(STM32WB)
+    #elif defined(STM32G4) || defined(STM32WB)
     EXTI->IMR1 &= ~(1 << line);
     EXTI->EMR1 &= ~(1 << line);
     #else
@@ -437,7 +441,7 @@ void extint_swint(uint line) {
         return;
     }
     // we need 0 to 1 transition to trigger the interrupt
-    #if defined(STM32L4) || defined(STM32H7) || defined(STM32WB)
+    #if defined(STM32G4) || defined(STM32H7) || defined(STM32L4) || defined(STM32WB)
     EXTI->SWIER1 &= ~(1 << line);
     EXTI->SWIER1 |= (1 << line);
     #else
@@ -515,7 +519,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(extint_obj_swint_obj,  extint_obj_swint);
 /// \classmethod regs()
 /// Dump the values of the EXTI registers.
 STATIC mp_obj_t extint_regs(void) {
-    #if defined(STM32L4) || defined(STM32WB)
+    #if defined(STM32G4) || defined(STM32L4) || defined(STM32WB)
     printf("EXTI_IMR1   %08x\n", (unsigned int)EXTI->IMR1);
     printf("EXTI_IMR2   %08x\n", (unsigned int)EXTI->IMR2);
     printf("EXTI_EMR1   %08x\n", (unsigned int)EXTI->EMR1);
diff --git a/ports/stm32/extint.h b/ports/stm32/extint.h
index 907af53dc22b1..0cdf5024a07b5 100644
--- a/ports/stm32/extint.h
+++ b/ports/stm32/extint.h
@@ -43,7 +43,7 @@
 #endif
 #define EXTI_ETH_WAKEUP         (19)
 #define EXTI_USB_OTG_HS_WAKEUP  (20)
-#if defined(STM32F0) || defined(STM32L4)
+#if defined(STM32F0) || defined(STM32G4) || defined(STM32L4)
 #define EXTI_RTC_TIMESTAMP      (19)
 #define EXTI_RTC_WAKEUP         (20)
 #elif defined(STM32H7) || defined(STM32WB)
diff --git a/ports/stm32/flash.c b/ports/stm32/flash.c
index b926679f9fe4f..eeeab52049698 100644
--- a/ports/stm32/flash.c
+++ b/ports/stm32/flash.c
@@ -97,7 +97,7 @@ static const flash_layout_t flash_layout[] = {
 };
 #endif
 
-#elif defined(STM32L0) || defined(STM32L4) || defined(STM32WB)
+#elif defined(STM32G4) || defined(STM32L0) || defined(STM32L4) || defined(STM32WB)
 
 static const flash_layout_t flash_layout[] = {
     { (uint32_t)FLASH_BASE, (uint32_t)FLASH_PAGE_SIZE, 512 },
@@ -126,12 +126,20 @@ static uint32_t get_bank(uint32_t addr) {
         if (addr < (FLASH_BASE + FLASH_BANK_SIZE)) {
             return FLASH_BANK_1;
         } else {
+            #if defined(FLASH_OPTR_DBANK)
             return FLASH_BANK_2;
+            #else
+            return 0;
+            #endif
         }
     } else {
         // bank swap
         if (addr < (FLASH_BASE + FLASH_BANK_SIZE)) {
+            #if defined(FLASH_OPTR_DBANK)
             return FLASH_BANK_2;
+            #else
+            return 0;
+            #endif
         } else {
             return FLASH_BANK_1;
         }
@@ -157,6 +165,25 @@ static uint32_t get_page(uint32_t addr) {
     return (addr - FLASH_BASE) / FLASH_PAGE_SIZE;
 }
 
+#elif defined(STM32G4)
+
+static uint32_t get_page(uint32_t addr) {
+    return (addr - FLASH_BASE) / FLASH_PAGE_SIZE;
+}
+
+static uint32_t get_bank(uint32_t addr) {
+    // no bank swap
+    if (addr < (FLASH_BASE + FLASH_BANK_SIZE)) {
+        return FLASH_BANK_1;
+    } else {
+        #if defined(FLASH_OPTR_DBANK)
+        return FLASH_BANK_2;
+        #else
+        return 0;
+        #endif
+    }
+}
+
 #endif
 
 bool flash_is_valid_addr(uint32_t addr) {
@@ -225,6 +252,12 @@ int flash_erase(uint32_t flash_dest, uint32_t num_word32) {
     EraseInitStruct.TypeErase = FLASH_TYPEERASE_PAGES;
     EraseInitStruct.PageAddress = flash_dest;
     EraseInitStruct.NbPages = (4 * num_word32 + FLASH_PAGE_SIZE - 4) / FLASH_PAGE_SIZE;
+    #elif defined(STM32G4)
+    __HAL_FLASH_CLEAR_FLAG(FLASH_FLAG_ALL_ERRORS);
+    EraseInitStruct.TypeErase = FLASH_TYPEERASE_PAGES;
+    EraseInitStruct.Page = get_page(flash_dest);
+    EraseInitStruct.Banks = get_bank(flash_dest);
+    EraseInitStruct.NbPages = (4 * num_word32 + FLASH_PAGE_SIZE - 4) / FLASH_PAGE_SIZE;
     #elif defined(STM32L0)
     __HAL_FLASH_CLEAR_FLAG(FLASH_FLAG_EOP | FLASH_FLAG_WRPERR | FLASH_FLAG_PGAERR);
     EraseInitStruct.TypeErase = FLASH_TYPEERASE_PAGES;
@@ -258,7 +291,7 @@ int flash_erase(uint32_t flash_dest, uint32_t num_word32) {
     #else
     EraseInitStruct.VoltageRange = 0; // unused parameter on STM32H7A3/B3
     #endif
-    #if defined(STM32H7)
+    #if defined(STM32G4) || defined(STM32H7)
     EraseInitStruct.Banks = get_bank(flash_dest);
     #endif
     EraseInitStruct.Sector = flash_get_sector_info(flash_dest, NULL, NULL);
@@ -337,7 +370,7 @@ int flash_write(uint32_t flash_dest, const uint32_t *src, uint32_t num_word32) {
 
     HAL_StatusTypeDef status = HAL_OK;
 
-    #if defined(STM32L4) || defined(STM32WB)
+    #if defined(STM32G4) || defined(STM32L4) || defined(STM32WB)
 
     // program the flash uint64 by uint64
     for (int i = 0; i < num_word32 / 2; i++) {
diff --git a/ports/stm32/machine_adc.c b/ports/stm32/machine_adc.c
index 8480bff53e65f..21b35cdcdb4c4 100644
--- a/ports/stm32/machine_adc.c
+++ b/ports/stm32/machine_adc.c
@@ -28,7 +28,7 @@
 #include "py/mphal.h"
 #include "adc.h"
 
-#if defined(STM32F0) || defined(STM32H7) || defined(STM32L0) || defined(STM32L4) || defined(STM32WB)
+#if defined(STM32F0) || defined(STM32G4) || defined(STM32H7) || defined(STM32L0) || defined(STM32L4) || defined(STM32WB)
 #define ADC_V2 (1)
 #else
 #define ADC_V2 (0)
@@ -45,6 +45,8 @@
 #if defined(STM32F0) || defined(STM32L0)
 #define ADC_STAB_DELAY_US (1)
 #define ADC_TEMPSENSOR_DELAY_US (10)
+#elif defined(STM32G4)
+#define ADC_STAB_DELAY_US (1) // TODO: Check if this is enough
 #elif defined(STM32L4)
 #define ADC_STAB_DELAY_US (10)
 #elif defined(STM32WB)
@@ -57,6 +59,9 @@
 #elif defined(STM32F4) || defined(STM32F7)
 #define ADC_SAMPLETIME_DEFAULT      ADC_SAMPLETIME_15CYCLES
 #define ADC_SAMPLETIME_DEFAULT_INT  ADC_SAMPLETIME_480CYCLES
+#elif defined(STM32G4)
+#define ADC_SAMPLETIME_DEFAULT      ADC_SAMPLETIME_12CYCLES_5
+#define ADC_SAMPLETIME_DEFAULT_INT  ADC_SAMPLETIME_247CYCLES_5
 #elif defined(STM32H7)
 #define ADC_SAMPLETIME_DEFAULT      ADC_SAMPLETIME_8CYCLES_5
 #define ADC_SAMPLETIME_DEFAULT_INT  ADC_SAMPLETIME_387CYCLES_5
@@ -105,7 +110,7 @@ void adc_config(ADC_TypeDef *adc, uint32_t bits) {
     __HAL_RCC_ADC_CLK_ENABLE();
     #else
     if (adc == ADC1) {
-        #if defined(STM32H7)
+        #if defined(STM32G4) || defined(STM32H7)
         __HAL_RCC_ADC12_CLK_ENABLE();
         #else
         __HAL_RCC_ADC1_CLK_ENABLE();
@@ -113,7 +118,7 @@ void adc_config(ADC_TypeDef *adc, uint32_t bits) {
     }
     #if defined(ADC2)
     if (adc == ADC2) {
-        #if defined(STM32H7)
+        #if defined(STM32G4) || defined(STM32H7)
         __HAL_RCC_ADC12_CLK_ENABLE();
         #else
         __HAL_RCC_ADC2_CLK_ENABLE();
@@ -122,7 +127,11 @@ void adc_config(ADC_TypeDef *adc, uint32_t bits) {
     #endif
     #if defined(ADC3)
     if (adc == ADC3) {
+        #if defined(ADC345_COMMON)
+        __HAL_RCC_ADC345_CLK_ENABLE();
+        #else
         __HAL_RCC_ADC3_CLK_ENABLE();
+        #endif
     }
     #endif
     #endif
@@ -165,7 +174,7 @@ void adc_config(ADC_TypeDef *adc, uint32_t bits) {
         // ADC isn't enabled so calibrate it now
         #if defined(STM32F0) || defined(STM32L0)
         LL_ADC_StartCalibration(adc);
-        #elif defined(STM32L4) || defined(STM32WB)
+        #elif defined(STM32G4) || defined(STM32L4) || defined(STM32WB)
         LL_ADC_StartCalibration(adc, LL_ADC_SINGLE_ENDED);
         #else
         LL_ADC_StartCalibration(adc, LL_ADC_CALIB_OFFSET_LINEARITY, LL_ADC_SINGLE_ENDED);
@@ -230,7 +239,7 @@ STATIC int adc_get_bits(ADC_TypeDef *adc) {
     uint32_t res = (adc->CFGR1 & ADC_CFGR1_RES) >> ADC_CFGR1_RES_Pos;
     #elif defined(STM32F4) || defined(STM32F7)
     uint32_t res = (adc->CR1 & ADC_CR1_RES) >> ADC_CR1_RES_Pos;
-    #elif defined(STM32H7) || defined(STM32L4) || defined(STM32WB)
+    #elif defined(STM32G4) || defined(STM32H7) || defined(STM32L4) || defined(STM32WB)
     uint32_t res = (adc->CFGR & ADC_CFGR_RES) >> ADC_CFGR_RES_Pos;
     #endif
     return adc_cr_to_bits_table[res];
@@ -403,7 +412,11 @@ STATIC mp_obj_t machine_adc_make_new(const mp_obj_type_t *type, size_t n_args, s
         adc = ADC1;
         channel = mp_obj_get_int(source);
         if (channel == ADC_CHANNEL_VREFINT
+            #if defined(STM32G4)
+            || channel == ADC_CHANNEL_TEMPSENSOR_ADC1
+            #else
             || channel == ADC_CHANNEL_TEMPSENSOR
+            #endif
             #if defined(ADC_CHANNEL_VBAT)
             || channel == ADC_CHANNEL_VBAT
             #endif
@@ -455,7 +468,11 @@ STATIC const mp_rom_map_elem_t machine_adc_locals_dict_table[] = {
 
     { MP_ROM_QSTR(MP_QSTR_VREF), MP_ROM_INT(ADC_CHANNEL_VREF) },
     { MP_ROM_QSTR(MP_QSTR_CORE_VREF), MP_ROM_INT(ADC_CHANNEL_VREFINT) },
+    #if defined(STM32G4)
+    { MP_ROM_QSTR(MP_QSTR_CORE_TEMP), MP_ROM_INT(ADC_CHANNEL_TEMPSENSOR_ADC1) },
+    #else
     { MP_ROM_QSTR(MP_QSTR_CORE_TEMP), MP_ROM_INT(ADC_CHANNEL_TEMPSENSOR) },
+    #endif
     #if defined(ADC_CHANNEL_VBAT)
     { MP_ROM_QSTR(MP_QSTR_CORE_VBAT), MP_ROM_INT(ADC_CHANNEL_VBAT) },
     #endif
diff --git a/ports/stm32/machine_uart.c b/ports/stm32/machine_uart.c
index 354a1e26acd46..6a12fad324420 100644
--- a/ports/stm32/machine_uart.c
+++ b/ports/stm32/machine_uart.c
@@ -459,7 +459,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(pyb_uart_readchar_obj, pyb_uart_readchar);
 // uart.sendbreak()
 STATIC mp_obj_t pyb_uart_sendbreak(mp_obj_t self_in) {
     pyb_uart_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    #if defined(STM32F0) || defined(STM32F7) || defined(STM32L0) || defined(STM32L4) || defined(STM32H7) || defined(STM32WB)
+    #if defined(STM32F0) || defined(STM32F7) || defined(STM32G4) || defined(STM32H7) || defined(STM32L0) || defined(STM32L4) || defined(STM32WB)
     self->uartx->RQR = USART_RQR_SBKRQ; // write-only register
     #else
     self->uartx->CR1 |= USART_CR1_SBK;
diff --git a/ports/stm32/modmachine.c b/ports/stm32/modmachine.c
index 92b80b3652037..9b215c75cd986 100644
--- a/ports/stm32/modmachine.c
+++ b/ports/stm32/modmachine.c
@@ -63,7 +63,7 @@
 #define RCC_CSR_BORRSTF RCC_CSR_PORRSTF
 #endif
 
-#if defined(STM32L4) || defined(STM32WB)
+#if defined(STM32G4) || defined(STM32L4) || defined(STM32WB)
 // L4 does not have a POR, so use BOR instead
 #define RCC_CSR_PORRSTF RCC_CSR_BORRSTF
 #endif
diff --git a/ports/stm32/mpconfigboard_common.h b/ports/stm32/mpconfigboard_common.h
index f8342f51b9b38..17a4ad26e4b5c 100644
--- a/ports/stm32/mpconfigboard_common.h
+++ b/ports/stm32/mpconfigboard_common.h
@@ -319,6 +319,16 @@
 #define MICROPY_HW_MAX_UART (8)
 #define MICROPY_HW_MAX_LPUART (0)
 
+// Configuration for STM32G4 series
+#elif defined(STM32G4)
+
+#define MP_HAL_UNIQUE_ID_ADDRESS (UID_BASE)
+#define PYB_EXTI_NUM_VECTORS (42) // up to 42 event/interrupt requests: 28 configurable lines, 14 direct lines
+#define MICROPY_HW_MAX_I2C (3)
+#define MICROPY_HW_MAX_TIMER (20) // TIM1-8, 20
+#define MICROPY_HW_MAX_UART (5) // UART1-5 + LPUART1
+#define MICROPY_HW_MAX_LPUART (1)
+
 // Configuration for STM32H7A3/B3 series
 #elif defined(STM32H7A3xx) || defined(STM32H7A3xxQ) || \
     defined(STM32H7B3xx) || defined(STM32H7B3xxQ)
@@ -410,7 +420,12 @@
 #else
 // Use HSE as a clock source (bypass or oscillator)
 #define MICROPY_HW_CLK_VALUE (HSE_VALUE)
+#if defined(STM32G4)
+// enable HSI48 to run RNG on this clock
+#define MICROPY_HW_RCC_OSCILLATOR_TYPE (RCC_OSCILLATORTYPE_HSE | RCC_OSCILLATORTYPE_HSI48)
+#else
 #define MICROPY_HW_RCC_OSCILLATOR_TYPE (RCC_OSCILLATORTYPE_HSE)
+#endif
 #define MICROPY_HW_RCC_PLL_SRC (RCC_PLLSOURCE_HSE)
 #define MICROPY_HW_RCC_CR_HSxON (RCC_CR_HSEON)
 #define MICROPY_HW_RCC_HSI_STATE (RCC_HSI_OFF)
@@ -480,7 +495,7 @@
 // Enable CAN if there are any peripherals defined
 #if defined(MICROPY_HW_CAN1_TX) || defined(MICROPY_HW_CAN2_TX) || defined(MICROPY_HW_CAN3_TX)
 #define MICROPY_HW_ENABLE_CAN (1)
-#if defined(STM32H7)
+#if defined(STM32G4) || defined(STM32H7)
 #define MICROPY_HW_ENABLE_FDCAN (1) // define for MCUs with FDCAN
 #endif
 #else
diff --git a/ports/stm32/mphalport.c b/ports/stm32/mphalport.c
index 81e84ef933323..2b98a620ef2fa 100644
--- a/ports/stm32/mphalport.c
+++ b/ports/stm32/mphalport.c
@@ -99,7 +99,7 @@ void mp_hal_gpio_clock_enable(GPIO_TypeDef *gpio) {
     #elif defined(STM32L0)
     #define AHBxENR IOPENR
     #define AHBxENR_GPIOAEN_Pos RCC_IOPENR_IOPAEN_Pos
-    #elif defined(STM32L4) || defined(STM32WB)
+    #elif defined(STM32G4) || defined(STM32L4) || defined(STM32WB)
     #define AHBxENR AHB2ENR
     #define AHBxENR_GPIOAEN_Pos RCC_AHB2ENR_GPIOAEN_Pos
     #endif
diff --git a/ports/stm32/pin_defs_stm32.h b/ports/stm32/pin_defs_stm32.h
index 20faab4e03262..1f950c1179833 100644
--- a/ports/stm32/pin_defs_stm32.h
+++ b/ports/stm32/pin_defs_stm32.h
@@ -121,8 +121,8 @@ enum {
 #define I2S2  SPI2
 #define I2S3  SPI3
 
-#if defined(STM32H7)
-// Make H7 FDCAN more like CAN
+#if defined(STM32G4) || defined(STM32H7)
+// Make G4/H7 FDCAN more like CAN
 #define CAN1 FDCAN1
 #define CAN2 FDCAN2
 #define GPIO_AF9_CAN1 GPIO_AF9_FDCAN1
diff --git a/ports/stm32/powerctrl.c b/ports/stm32/powerctrl.c
index a3f8207e9a0d4..ad3a3ea4c2ff0 100644
--- a/ports/stm32/powerctrl.c
+++ b/ports/stm32/powerctrl.c
@@ -143,7 +143,7 @@ void powerctrl_check_enter_bootloader(void) {
     if (BL_STATE_GET_KEY(bl_state) == BL_STATE_KEY && (RCC->RCC_SR & RCC_SR_SFTRSTF)) {
         // Reset by NVIC_SystemReset with bootloader data set -> branch to bootloader
         RCC->RCC_SR = RCC_SR_RMVF;
-        #if defined(STM32F0) || defined(STM32F4) || defined(STM32L0) || defined(STM32L4) || defined(STM32WB)
+        #if defined(STM32F0) || defined(STM32F4) || defined(STM32G4) || defined(STM32L0) || defined(STM32L4) || defined(STM32WB)
         __HAL_SYSCFG_REMAPMEMORY_SYSTEMFLASH();
         #endif
         branch_to_bootloader(BL_STATE_GET_REG(bl_state), BL_STATE_GET_ADDR(bl_state));
@@ -378,7 +378,7 @@ STATIC uint32_t calc_apb2_div(uint32_t wanted_div) {
     #endif
 }
 
-#if defined(STM32F4) || defined(STM32F7) || defined(STM32H7)
+#if defined(STM32F4) || defined(STM32F7) || defined(STM32G4) || defined(STM32H7)
 
 int powerctrl_set_sysclk(uint32_t sysclk, uint32_t ahb, uint32_t apb1, uint32_t apb2) {
     // Return straightaway if the clocks are already at the desired frequency
@@ -686,7 +686,7 @@ void powerctrl_enter_stop_mode(void) {
     __HAL_RCC_WAKEUPSTOP_CLK_CONFIG(RCC_STOP_WAKEUPCLOCK_MSI);
     #endif
 
-    #if !defined(STM32F0) && !defined(STM32L0) && !defined(STM32L4) && !defined(STM32WB)
+    #if !defined(STM32F0) && !defined(STM32G4) && !defined(STM32L0) && !defined(STM32L4) && !defined(STM32WB)
     // takes longer to wake but reduces stop current
     HAL_PWREx_EnableFlashPowerDown();
     #endif
@@ -861,6 +861,9 @@ void powerctrl_enter_standby_mode(void) {
     #if defined(STM32F0) || defined(STM32L0)
     #define CR_BITS (RTC_CR_ALRAIE | RTC_CR_WUTIE | RTC_CR_TSIE)
     #define ISR_BITS (RTC_ISR_ALRAF | RTC_ISR_WUTF | RTC_ISR_TSF)
+    #elif defined(STM32G4)
+    #define CR_BITS (RTC_CR_ALRAIE | RTC_CR_ALRBIE | RTC_CR_WUTIE | RTC_CR_TSIE)
+    #define ISR_BITS (RTC_MISR_ALRAMF | RTC_MISR_ALRBMF | RTC_MISR_WUTMF | RTC_MISR_TSMF)
     #elif defined(STM32H7A3xx) || defined(STM32H7A3xxQ) || defined(STM32H7B3xx) || defined(STM32H7B3xxQ)
     #define CR_BITS (RTC_CR_ALRAIE | RTC_CR_ALRBIE | RTC_CR_WUTIE | RTC_CR_TSIE)
     #define SR_BITS (RTC_SR_ALRAF | RTC_SR_ALRBF | RTC_SR_WUTF | RTC_SR_TSF)
@@ -882,6 +885,8 @@ void powerctrl_enter_standby_mode(void) {
     // clear RTC wake-up flags
     #if defined(SR_BITS)
     RTC->SR &= ~SR_BITS;
+    #elif defined(STM32G4)
+    RTC->MISR &= ~ISR_BITS;
     #else
     RTC->ISR &= ~ISR_BITS;
     #endif
@@ -898,7 +903,7 @@ void powerctrl_enter_standby_mode(void) {
     #elif defined(STM32H7)
     EXTI_D1->PR1 = 0x3fffff;
     PWR->WKUPCR |= PWR_WAKEUP_FLAG1 | PWR_WAKEUP_FLAG2 | PWR_WAKEUP_FLAG3 | PWR_WAKEUP_FLAG4 | PWR_WAKEUP_FLAG5 | PWR_WAKEUP_FLAG6;
-    #elif defined(STM32L4) || defined(STM32WB)
+    #elif defined(STM32G4) || defined(STM32L4) || defined(STM32WB)
     // clear all wake-up flags
     PWR->SCR |= PWR_SCR_CWUF5 | PWR_SCR_CWUF4 | PWR_SCR_CWUF3 | PWR_SCR_CWUF2 | PWR_SCR_CWUF1;
     // TODO
diff --git a/ports/stm32/pyb_i2c.c b/ports/stm32/pyb_i2c.c
index dbcf4bcb811b9..70a8e9f0914b1 100644
--- a/ports/stm32/pyb_i2c.c
+++ b/ports/stm32/pyb_i2c.c
@@ -130,7 +130,7 @@ const pyb_i2c_obj_t pyb_i2c_obj[] = {
     #endif
 };
 
-#if defined(STM32F7) || defined(STM32L4) || defined(STM32H7)
+#if defined(STM32F7) || defined(STM32G4) || defined(STM32L4) || defined(STM32H7)
 
 // The STM32F0, F3, F7, H7 and L4 use a TIMINGR register rather than ClockSpeed and
 // DutyCycle.
@@ -163,6 +163,28 @@ const pyb_i2c_obj_t pyb_i2c_obj[] = {
 #define MICROPY_HW_I2C_BAUDRATE_DEFAULT (PYB_I2C_SPEED_FULL)
 #define MICROPY_HW_I2C_BAUDRATE_MAX (PYB_I2C_SPEED_FAST)
 
+#elif defined(STM32G4)
+// timing input depends on PLL
+// for now: 170MHz sysclock, PCLK 10.625 MHz
+// using PCLOCK
+// generated using CubeMX
+#if defined(STM32G431xx) || defined(STM32G441xx)
+#define MICROPY_HW_I2C_BAUDRATE_TIMING { \
+        {PYB_I2C_SPEED_STANDARD, 0x30A0A7FB}, \
+        {PYB_I2C_SPEED_STANDARD, 0x30A0A7FB}, \
+        {PYB_I2C_SPEED_STANDARD, 0x30A0A7FB}, \
+}
+#else
+#define MICROPY_HW_I2C_BAUDRATE_TIMING { \
+        {PYB_I2C_SPEED_STANDARD, 0x30A0A7FB}, \
+        {PYB_I2C_SPEED_STANDARD, 0x30A0A7FB}, \
+        {PYB_I2C_SPEED_STANDARD, 0x30A0A7FB}, \
+        {PYB_I2C_SPEED_STANDARD, 0x30A0A7FB}, \
+}
+#endif
+#define MICROPY_HW_I2C_BAUDRATE_DEFAULT (PYB_I2C_SPEED_STANDARD)
+#define MICROPY_HW_I2C_BAUDRATE_MAX (PYB_I2C_SPEED_STANDARD)
+
 #elif defined(STM32H7)
 
 // I2C TIMINGs obtained from the STHAL examples.
diff --git a/ports/stm32/rtc.c b/ports/stm32/rtc.c
index a5553b8a0a796..2d6459e239531 100644
--- a/ports/stm32/rtc.c
+++ b/ports/stm32/rtc.c
@@ -220,7 +220,7 @@ void rtc_init_finalise() {
 
     // fresh reset; configure RTC Calendar
     RTC_CalendarConfig();
-    #if defined(STM32L4) || defined(STM32WB)
+    #if defined(STM32G4) || defined(STM32L4) || defined(STM32WB)
     if (__HAL_RCC_GET_FLAG(RCC_FLAG_BORRST) != RESET) {
     #else
     if (__HAL_RCC_GET_FLAG(RCC_FLAG_PORRST) != RESET) {
@@ -261,7 +261,7 @@ STATIC HAL_StatusTypeDef PYB_RCC_OscConfig(RCC_OscInitTypeDef *RCC_OscInitStruct
         HAL_PWR_EnableBkUpAccess();
         uint32_t tickstart = HAL_GetTick();
 
-        #if defined(STM32F7) || defined(STM32L4) || defined(STM32H7) || defined(STM32WB)
+        #if defined(STM32F7) || defined(STM32G4) || defined(STM32L4) || defined(STM32H7) || defined(STM32WB)
         // __HAL_RCC_PWR_CLK_ENABLE();
         // Enable write access to Backup domain
         // PWR->CR1 |= PWR_CR1_DBP;
@@ -339,7 +339,7 @@ STATIC HAL_StatusTypeDef PYB_RTC_Init(RTC_HandleTypeDef *hrtc) {
         hrtc->Instance->PRER |= (uint32_t)(hrtc->Init.AsynchPrediv << 16);
 
         // Exit Initialization mode
-        #if defined(STM32H7A3xx) || defined(STM32H7A3xxQ) || defined(STM32H7B3xx) || defined(STM32H7B3xxQ)
+        #if defined(STM32G4) || defined(STM32H7A3xx) || defined(STM32H7A3xxQ) || defined(STM32H7B3xx) || defined(STM32H7B3xxQ)
         hrtc->Instance->ICSR &= (uint32_t) ~RTC_ICSR_INIT;
         #else
         hrtc->Instance->ISR &= (uint32_t) ~RTC_ISR_INIT;
@@ -353,6 +353,9 @@ STATIC HAL_StatusTypeDef PYB_RTC_Init(RTC_HandleTypeDef *hrtc) {
         #elif defined(STM32F7)
         hrtc->Instance->OR &= (uint32_t) ~RTC_OR_ALARMTYPE;
         hrtc->Instance->OR |= (uint32_t)(hrtc->Init.OutPutType);
+        #elif defined(STM32G4)
+        hrtc->Instance->CR &= (uint32_t) ~RTC_CR_TAMPALRM_TYPE_Msk;
+        hrtc->Instance->CR |= (uint32_t)(hrtc->Init.OutPutType);
         #else
         hrtc->Instance->TAFCR &= (uint32_t) ~RTC_TAFCR_ALARMOUTTYPE;
         hrtc->Instance->TAFCR |= (uint32_t)(hrtc->Init.OutPutType);
@@ -699,7 +702,7 @@ mp_obj_t pyb_rtc_wakeup(size_t n_args, const mp_obj_t *args) {
     RTC->CR &= ~RTC_CR_WUTE;
 
     // wait until WUTWF is set
-    #if defined(STM32H7A3xx) || defined(STM32H7A3xxQ) || defined(STM32H7B3xx) || defined(STM32H7B3xxQ)
+    #if defined(STM32G4) || defined(STM32H7A3xx) || defined(STM32H7A3xxQ) || defined(STM32H7B3xx) || defined(STM32H7B3xxQ)
     while (!(RTC->ICSR & RTC_ICSR_WUTWF)) {
     }
     #else
@@ -720,7 +723,7 @@ mp_obj_t pyb_rtc_wakeup(size_t n_args, const mp_obj_t *args) {
         RTC->WPR = 0xff;
 
         // enable external interrupts on line EXTI_RTC_WAKEUP
-        #if defined(STM32L4) || defined(STM32WB)
+        #if defined(STM32G4) || defined(STM32L4) || defined(STM32WB)
         EXTI->IMR1 |= 1 << EXTI_RTC_WAKEUP;
         EXTI->RTSR1 |= 1 << EXTI_RTC_WAKEUP;
         #elif defined(STM32H7)
@@ -732,12 +735,14 @@ mp_obj_t pyb_rtc_wakeup(size_t n_args, const mp_obj_t *args) {
         #endif
 
         // clear interrupt flags
-        #if defined(STM32H7A3xx) || defined(STM32H7A3xxQ) || defined(STM32H7B3xx) || defined(STM32H7B3xxQ)
+        #if defined(STM32G4)
+        RTC->ICSR &= ~RTC_ICSR_WUTWF;
+        #elif defined(STM32H7A3xx) || defined(STM32H7A3xxQ) || defined(STM32H7B3xx) || defined(STM32H7B3xxQ)
         RTC->SR &= ~RTC_SR_WUTF;
         #else
         RTC->ISR &= ~RTC_ISR_WUTF;
         #endif
-        #if defined(STM32L4) || defined(STM32WB)
+        #if defined(STM32G4) || defined(STM32L4) || defined(STM32WB)
         EXTI->PR1 = 1 << EXTI_RTC_WAKEUP;
         #elif defined(STM32H7)
         EXTI_D1->PR1 = 1 << EXTI_RTC_WAKEUP;
@@ -757,7 +762,7 @@ mp_obj_t pyb_rtc_wakeup(size_t n_args, const mp_obj_t *args) {
         RTC->WPR = 0xff;
 
         // disable external interrupts on line EXTI_RTC_WAKEUP
-        #if defined(STM32L4) || defined(STM32WB)
+        #if defined(STM32G4) || defined(STM32L4) || defined(STM32WB)
         EXTI->IMR1 &= ~(1 << EXTI_RTC_WAKEUP);
         #elif defined(STM32H7)
         EXTI_D1->IMR1 |= 1 << EXTI_RTC_WAKEUP;
diff --git a/ports/stm32/stm32_it.c b/ports/stm32/stm32_it.c
index fe9b6062258ae..84274e3c62397 100644
--- a/ports/stm32/stm32_it.c
+++ b/ports/stm32/stm32_it.c
@@ -529,7 +529,9 @@ void TAMP_STAMP_IRQHandler(void) {
 
 void RTC_WKUP_IRQHandler(void) {
     IRQ_ENTER(RTC_WKUP_IRQn);
-    #if defined(STM32H7A3xx) || defined(STM32H7A3xxQ) || defined(STM32H7B3xx) || defined(STM32H7B3xxQ)
+    #if defined(STM32G4)
+    RTC->MISR &= ~RTC_MISR_WUTMF; // clear wakeup interrupt flag
+    #elif defined(STM32H7A3xx) || defined(STM32H7A3xxQ) || defined(STM32H7B3xx) || defined(STM32H7B3xxQ)
     RTC->SR &= ~RTC_SR_WUTF; // clear wakeup interrupt flag
     #else
     RTC->ISR &= ~RTC_ISR_WUTF; // clear wakeup interrupt flag
@@ -593,7 +595,7 @@ void TIM1_BRK_TIM9_IRQHandler(void) {
     IRQ_EXIT(TIM1_BRK_TIM9_IRQn);
 }
 
-#if defined(STM32L4)
+#if defined(STM32G4) || defined(STM32L4)
 void TIM1_BRK_TIM15_IRQHandler(void) {
     IRQ_ENTER(TIM1_BRK_TIM15_IRQn);
     timer_irq_handler(15);
@@ -608,7 +610,7 @@ void TIM1_UP_TIM10_IRQHandler(void) {
     IRQ_EXIT(TIM1_UP_TIM10_IRQn);
 }
 
-#if defined(STM32L4) || defined(STM32WB)
+#if defined(STM32G4) || defined(STM32L4) || defined(STM32WB)
 void TIM1_UP_TIM16_IRQHandler(void) {
     IRQ_ENTER(TIM1_UP_TIM16_IRQn);
     timer_irq_handler(1);
@@ -631,7 +633,7 @@ void TIM1_TRG_COM_TIM11_IRQHandler(void) {
     IRQ_EXIT(TIM1_TRG_COM_TIM11_IRQn);
 }
 
-#if defined(STM32L4) || defined(STM32WB)
+#if defined(STM32G4) || defined(STM32L4) || defined(STM32WB)
 void TIM1_TRG_COM_TIM17_IRQHandler(void) {
     IRQ_ENTER(TIM1_TRG_COM_TIM17_IRQn);
     timer_irq_handler(17);
@@ -679,12 +681,20 @@ void TIM6_DAC_IRQHandler(void) {
 #endif
 
 #if defined(TIM7) // STM32F401 doesn't have TIM7
+#if defined(STM32G4)
+void TIM7_DAC_IRQHandler(void) {
+    IRQ_ENTER(TIM7_DAC_IRQn);
+    timer_irq_handler(7);
+    IRQ_EXIT(TIM7_DAC_IRQn);
+}
+#else
 void TIM7_IRQHandler(void) {
     IRQ_ENTER(TIM7_IRQn);
     timer_irq_handler(7);
     IRQ_EXIT(TIM7_IRQn);
 }
 #endif
+#endif
 
 #if defined(TIM8) // STM32F401 doesn't have TIM8
 void TIM8_BRK_TIM12_IRQHandler(void) {
@@ -700,7 +710,7 @@ void TIM8_UP_TIM13_IRQHandler(void) {
     IRQ_EXIT(TIM8_UP_TIM13_IRQn);
 }
 
-#if defined(STM32L4)
+#if defined(STM32G4) || defined(STM32L4)
 void TIM8_UP_IRQHandler(void) {
     IRQ_ENTER(TIM8_UP_IRQn);
     timer_irq_handler(8);
diff --git a/ports/stm32/system_stm32.c b/ports/stm32/system_stm32.c
index 8142fd0a5c64f..582d7a3698d24 100644
--- a/ports/stm32/system_stm32.c
+++ b/ports/stm32/system_stm32.c
@@ -78,7 +78,7 @@
 #include "py/mphal.h"
 #include "powerctrl.h"
 
-#if defined(STM32F4) || defined(STM32F7) || defined(STM32H7) || defined(STM32L4)
+#if defined(STM32F4) || defined(STM32F7) || defined(STM32G4) || defined(STM32H7) || defined(STM32L4)
 
 void __fatal_error(const char *msg);
 
@@ -171,10 +171,10 @@ void SystemClock_Config(void) {
     RCC->DCKCFGR2 = 0;
     #endif
 
-    RCC_ClkInitTypeDef RCC_ClkInitStruct;
-    RCC_OscInitTypeDef RCC_OscInitStruct;
-    #if defined(STM32H7)
-    RCC_PeriphCLKInitTypeDef PeriphClkInitStruct;
+    RCC_ClkInitTypeDef RCC_ClkInitStruct = {0};
+    RCC_OscInitTypeDef RCC_OscInitStruct = {0};
+    #if defined(STM32G4) || defined(STM32H7)
+    RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0};
     #endif
 
     #if defined(STM32F4) || defined(STM32F7) || defined(STM32H7)
@@ -192,6 +192,10 @@ void SystemClock_Config(void) {
        clocked below the maximum system frequency, to update the voltage scaling value
        regarding system frequency refer to product datasheet.  */
     __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1);
+
+    #elif defined(STM32G4)
+    // Configure the main internal regulator output voltage
+    HAL_PWREx_ControlVoltageScaling(PWR_REGULATOR_VOLTAGE_SCALE1_BOOST);
     #elif defined(STM32L4)
     // Configure LSE Drive Capability
     __HAL_RCC_LSEDRIVE_CONFIG(RCC_LSEDRIVE_LOW);
@@ -204,7 +208,7 @@ void SystemClock_Config(void) {
     #endif
 
     /* Enable HSE Oscillator and activate PLL with HSE as source */
-    #if defined(STM32F4) || defined(STM32F7) || defined(STM32H7)
+    #if defined(STM32F4) || defined(STM32F7) || defined(STM32G4) || defined(STM32H7)
     RCC_OscInitStruct.OscillatorType = MICROPY_HW_RCC_OSCILLATOR_TYPE;
     RCC_OscInitStruct.HSEState = MICROPY_HW_RCC_HSE_STATE;
     RCC_OscInitStruct.HSIState = MICROPY_HW_RCC_HSI_STATE;
@@ -240,6 +244,27 @@ void SystemClock_Config(void) {
     #endif
 
     #endif
+
+    #if defined(STM32G4)
+    RCC_OscInitStruct.HSICalibrationValue = RCC_HSICALIBRATION_DEFAULT;
+    RCC_OscInitStruct.HSI48State = RCC_HSI48_ON;
+    #if MICROPY_HW_CLK_USE_HSI && MICROPY_HW_CLK_USE_HSI48
+    RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSI | RCC_OSCILLATORTYPE_HSI48;
+    RCC_OscInitStruct.HSIState = RCC_HSI_ON;
+    RCC_OscInitStruct.PLL.PLLSource = RCC_PLLSOURCE_HSI;
+    #else
+    RCC_OscInitStruct.OscillatorType = MICROPY_HW_RCC_OSCILLATOR_TYPE;
+    RCC_OscInitStruct.HSEState = MICROPY_HW_RCC_HSE_STATE;
+    RCC_OscInitStruct.HSIState = MICROPY_HW_RCC_HSI_STATE;
+    RCC_OscInitStruct.PLL.PLLSource = RCC_PLLSOURCE_HSE;
+    #endif
+    RCC_OscInitStruct.PLL.PLLM = MICROPY_HW_CLK_PLLM;
+    RCC_OscInitStruct.PLL.PLLN = MICROPY_HW_CLK_PLLN;
+    RCC_OscInitStruct.PLL.PLLP = MICROPY_HW_CLK_PLLP;
+    RCC_OscInitStruct.PLL.PLLQ = MICROPY_HW_CLK_PLLQ;
+    RCC_OscInitStruct.PLL.PLLR = MICROPY_HW_CLK_PLLR;
+    #endif
+
     RCC_OscInitStruct.PLL.PLLState = RCC_PLL_ON;
     /* Select PLL as system clock source and configure the HCLK, PCLK1 and PCLK2
      clocks dividers */
@@ -295,7 +320,7 @@ void SystemClock_Config(void) {
     RCC_OscInitStruct.PLL.PLLN = MICROPY_HW_CLK_PLLN;
     RCC_OscInitStruct.PLL.PLLP = MICROPY_HW_CLK_PLLP;
     RCC_OscInitStruct.PLL.PLLQ = MICROPY_HW_CLK_PLLQ;
-    #if defined(STM32L4) || defined(STM32H7)
+    #if defined(STM32G4) || defined(STM32H7) || defined(STM32L4)
     RCC_OscInitStruct.PLL.PLLR = MICROPY_HW_CLK_PLLR;
     #endif
 
@@ -309,6 +334,11 @@ void SystemClock_Config(void) {
     RCC_ClkInitStruct.AHBCLKDivider = MICROPY_HW_CLK_AHB_DIV;
     RCC_ClkInitStruct.APB1CLKDivider = MICROPY_HW_CLK_APB1_DIV;
     RCC_ClkInitStruct.APB2CLKDivider = MICROPY_HW_CLK_APB2_DIV;
+    #elif defined(STM32G4)
+    RCC_ClkInitStruct.SYSCLKSource = RCC_SYSCLKSOURCE_PLLCLK;
+    RCC_ClkInitStruct.AHBCLKDivider = MICROPY_HW_CLK_AHB_DIV;
+    RCC_ClkInitStruct.APB1CLKDivider = MICROPY_HW_CLK_APB1_DIV;
+    RCC_ClkInitStruct.APB2CLKDivider = MICROPY_HW_CLK_APB2_DIV;
     #elif defined(STM32L4)
     RCC_ClkInitStruct.AHBCLKDivider = MICROPY_HW_CLK_AHB_DIV;
     RCC_ClkInitStruct.APB1CLKDivider = MICROPY_HW_CLK_APB1_DIV;
@@ -351,12 +381,30 @@ void SystemClock_Config(void) {
     }
     #endif
 
+    #if defined(STM32G4)
+    if (HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_8) != HAL_OK) {
+        __fatal_error("HAL_RCC_ClockConfig");
+    }
+    PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_RTC | RCC_PERIPHCLK_LPUART1
+        | RCC_PERIPHCLK_RNG | RCC_PERIPHCLK_ADC12
+        | RCC_PERIPHCLK_FDCAN | RCC_PERIPHCLK_USB;
+    PeriphClkInitStruct.UsbClockSelection = RCC_USBCLKSOURCE_HSI48;
+    PeriphClkInitStruct.Lpuart1ClockSelection = RCC_LPUART1CLKSOURCE_PCLK1;
+    PeriphClkInitStruct.FdcanClockSelection = RCC_FDCANCLKSOURCE_HSE;
+    PeriphClkInitStruct.RngClockSelection = RCC_RNGCLKSOURCE_HSI48;
+    PeriphClkInitStruct.Adc12ClockSelection = RCC_ADC12CLKSOURCE_SYSCLK;
+    PeriphClkInitStruct.RTCClockSelection = RCC_RTCCLKSOURCE_LSE;
+    if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) {
+        __fatal_error("HAL_RCCEx_PeriphCLKConfig");
+    }
+    #else
     uint32_t vco_out = RCC_OscInitStruct.PLL.PLLN * (MICROPY_HW_CLK_VALUE / 1000000) / RCC_OscInitStruct.PLL.PLLM;
     uint32_t sysclk_mhz = vco_out / RCC_OscInitStruct.PLL.PLLP;
     bool need_pll48 = vco_out % 48 != 0;
     if (powerctrl_rcc_clock_config_pll(&RCC_ClkInitStruct, sysclk_mhz, need_pll48) != 0) {
         __fatal_error("HAL_RCC_ClockConfig");
     }
+    #endif
 
     #if defined(STM32H7)
     /* Activate CSI clock mandatory for I/O Compensation Cell*/
diff --git a/ports/stm32/timer.c b/ports/stm32/timer.c
index 5a968ec56d28c..57c8dc6c7b9d7 100644
--- a/ports/stm32/timer.c
+++ b/ports/stm32/timer.c
@@ -482,7 +482,7 @@ STATIC void config_deadtime(pyb_timer_obj_t *self, mp_int_t ticks, mp_int_t brk)
     deadTimeConfig.DeadTime = compute_dtg_from_ticks(ticks);
     deadTimeConfig.BreakState = brk == BRK_OFF ? TIM_BREAK_DISABLE : TIM_BREAK_ENABLE;
     deadTimeConfig.BreakPolarity = brk == BRK_LOW ? TIM_BREAKPOLARITY_LOW : TIM_BREAKPOLARITY_HIGH;
-    #if defined(STM32F7) || defined(STM32H7) || defined(STM32L4) || defined(STM32WB)
+    #if defined(STM32F7) || defined(STM32G4) || defined(STM32H7) || defined(STM32L4) || defined(STM32WB)
     deadTimeConfig.BreakFilter = 0;
     deadTimeConfig.Break2State = TIM_BREAK_DISABLE;
     deadTimeConfig.Break2Polarity = TIM_BREAKPOLARITY_LOW;
@@ -810,7 +810,7 @@ STATIC const uint32_t tim_instance_table[MICROPY_HW_MAX_TIMER] = {
     TIM_ENTRY(1, TIM1_UP_TIM10_IRQn),
     #elif defined(STM32H7)
     TIM_ENTRY(1, TIM1_UP_IRQn),
-    #elif defined(STM32L4) || defined(STM32WB)
+    #elif defined(STM32G4) || defined(STM32L4) || defined(STM32WB)
     TIM_ENTRY(1, TIM1_UP_TIM16_IRQn),
     #endif
     #endif
@@ -832,12 +832,16 @@ STATIC const uint32_t tim_instance_table[MICROPY_HW_MAX_TIMER] = {
     #endif
     #endif
     #if defined(TIM7)
+    #if defined(STM32G4)
+    TIM_ENTRY(7, TIM7_DAC_IRQn),
+    #else
     TIM_ENTRY(7, TIM7_IRQn),
     #endif
+    #endif
     #if defined(TIM8)
     #if defined(STM32F4) || defined(STM32F7) || defined(STM32H7)
     TIM_ENTRY(8, TIM8_UP_TIM13_IRQn),
-    #elif defined(STM32L4)
+    #elif defined(STM32G4) || defined(STM32L4)
     TIM_ENTRY(8, TIM8_UP_IRQn),
     #endif
     #endif
@@ -882,6 +886,9 @@ STATIC const uint32_t tim_instance_table[MICROPY_HW_MAX_TIMER] = {
     TIM_ENTRY(17, TIM1_TRG_COM_TIM17_IRQn),
     #endif
     #endif
+    #if defined(TIM20)
+    TIM_ENTRY(20, TIM20_UP_IRQn),
+    #endif
 };
 #undef TIM_ENTRY
 
@@ -1401,6 +1408,7 @@ STATIC mp_obj_t pyb_timer_callback(mp_obj_t self_in, mp_obj_t callback) {
         // start timer, so that it interrupts on overflow, but clear any
         // pending interrupts which may have been set by initializing it.
         __HAL_TIM_CLEAR_FLAG(&self->tim, TIM_IT_UPDATE);
+        HAL_TIM_Base_Stop(&self->tim); // internal timer state must be released before starting again
         HAL_TIM_Base_Start_IT(&self->tim); // This will re-enable the IRQ
         HAL_NVIC_EnableIRQ(self->irqn);
     } else {
diff --git a/ports/stm32/uart.c b/ports/stm32/uart.c
index 2c08257f32682..61e72999e2687 100644
--- a/ports/stm32/uart.c
+++ b/ports/stm32/uart.c
@@ -73,6 +73,15 @@
 #define USART_CR3_IE_ALL (USART_CR3_IE_BASE)
 #endif
 
+#elif defined(STM32G4)
+#define USART_CR1_IE_ALL (USART_CR1_IE_BASE | USART_CR1_EOBIE | USART_CR1_RTOIE | USART_CR1_CMIE)
+#define USART_CR2_IE_ALL (USART_CR2_IE_BASE)
+#if defined(USART_CR3_TCBGTIE)
+#define USART_CR3_IE_ALL (USART_CR3_IE_BASE | USART_CR3_TCBGTIE | USART_CR3_WUFIE)
+#else
+#define USART_CR3_IE_ALL (USART_CR3_IE_BASE | USART_CR3_WUFIE)
+#endif
+
 #elif defined(STM32H7)
 #define USART_CR1_IE_ALL (USART_CR1_IE_BASE | USART_CR1_RXFFIE | USART_CR1_TXFEIE | USART_CR1_EOBIE | USART_CR1_RTOIE | USART_CR1_CMIE)
 #define USART_CR2_IE_ALL (USART_CR2_IE_BASE)
@@ -91,6 +100,7 @@
 #else
 #define USART_CR3_IE_ALL (USART_CR3_IE_BASE | USART_CR3_WUFIE)
 #endif
+
 #endif
 
 extern void NORETURN __fatal_error(const char *msg);
@@ -501,6 +511,11 @@ bool uart_init(pyb_uart_obj_t *uart_obj,
     huart.Init.Mode = UART_MODE_TX_RX;
     huart.Init.HwFlowCtl = flow;
     huart.Init.OverSampling = UART_OVERSAMPLING_16;
+
+    #if defined(STM32G4)  // H7 and WB also have fifo..
+    huart.FifoMode = UART_FIFOMODE_ENABLE;
+    #endif
+
     #if !defined(STM32F4)
     huart.Init.OneBitSampling = UART_ONE_BIT_SAMPLE_DISABLE;
     #endif
@@ -798,14 +813,14 @@ uint32_t uart_get_baudrate(pyb_uart_obj_t *self) {
     #if defined(LPUART1)
     if (self->uart_id == PYB_LPUART_1) {
         return LL_LPUART_GetBaudRate(self->uartx, uart_get_source_freq(self)
-            #if defined(STM32H7) || defined(STM32WB)
+            #if defined(STM32G4) || defined(STM32H7) || defined(STM32WB)
             , self->uartx->PRESC
             #endif
             );
     }
     #endif
     return LL_USART_GetBaudRate(self->uartx, uart_get_source_freq(self),
-        #if defined(STM32H7) || defined(STM32WB)
+        #if defined(STM32G4) || defined(STM32H7) || defined(STM32WB)
         self->uartx->PRESC,
         #endif
         LL_USART_OVERSAMPLING_16);
@@ -815,7 +830,7 @@ void uart_set_baudrate(pyb_uart_obj_t *self, uint32_t baudrate) {
     #if defined(LPUART1)
     if (self->uart_id == PYB_LPUART_1) {
         LL_LPUART_SetBaudRate(self->uartx, uart_get_source_freq(self),
-            #if defined(STM32H7) || defined(STM32WB)
+            #if defined(STM32G4) || defined(STM32H7) || defined(STM32WB)
             LL_LPUART_PRESCALER_DIV1,
             #endif
             baudrate);
@@ -823,7 +838,7 @@ void uart_set_baudrate(pyb_uart_obj_t *self, uint32_t baudrate) {
     }
     #endif
     LL_USART_SetBaudRate(self->uartx, uart_get_source_freq(self),
-        #if defined(STM32H7) || defined(STM32WB)
+        #if defined(STM32G4) || defined(STM32H7) || defined(STM32WB)
         LL_USART_PRESCALER_DIV1,
         #endif
         LL_USART_OVERSAMPLING_16, baudrate);
@@ -874,7 +889,7 @@ int uart_rx_char(pyb_uart_obj_t *self) {
         return data;
     } else {
         // no buffering
-        #if defined(STM32F0) || defined(STM32F7) || defined(STM32L0) || defined(STM32L4) || defined(STM32H7) || defined(STM32WB)
+        #if defined(STM32F0) || defined(STM32F7) || defined(STM32G4) || defined(STM32L0) || defined(STM32L4) || defined(STM32H7) || defined(STM32WB)
         int data = self->uartx->RDR & self->char_mask;
         self->uartx->ICR = USART_ICR_ORECF; // clear ORE if it was set
         return data;
@@ -1024,7 +1039,7 @@ void uart_irq_handler(mp_uint_t uart_id) {
             uint16_t next_head = (self->read_buf_head + 1) % self->read_buf_len;
             if (next_head != self->read_buf_tail) {
                 // only read data if room in buf
-                #if defined(STM32F0) || defined(STM32F7) || defined(STM32L0) || defined(STM32L4) || defined(STM32H7) || defined(STM32WB)
+                #if defined(STM32F0) || defined(STM32F7) || defined(STM32G4) || defined(STM32L0) || defined(STM32L4) || defined(STM32H7) || defined(STM32WB)
                 int data = self->uartx->RDR; // clears UART_FLAG_RXNE
                 #else
                 self->mp_irq_flags = self->uartx->SR; // resample to get any new flags since next read of DR will clear SR
diff --git a/ports/stm32/usbdev/core/inc/usbd_def.h b/ports/stm32/usbdev/core/inc/usbd_def.h
index e0d1c37625ca5..44c8dd8d93b2e 100644
--- a/ports/stm32/usbdev/core/inc/usbd_def.h
+++ b/ports/stm32/usbdev/core/inc/usbd_def.h
@@ -267,8 +267,12 @@ typedef struct _USBD_HandleTypeDef
    with the DMA during the transaction process should be 4-bytes aligned */
 
 #if defined   (__GNUC__)        /* GNU Compiler */
-  #define __ALIGN_END    __attribute__ ((aligned (4)))
-  #define __ALIGN_BEGIN
+  #ifndef __ALIGN_END
+    #define __ALIGN_END    __attribute__ ((aligned (4)))
+  #endif /* __ALIGN_END */
+  #ifndef __ALIGN_BEGIN
+    #define __ALIGN_BEGIN
+  #endif /* __ALIGN_BEGIN */
 #else
   #define __ALIGN_END
   #if defined   (__CC_ARM)      /* ARM Compiler */

From a5003ba40719a3da70586bb79856ec635db1076d Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 1 Feb 2022 15:45:54 +1100
Subject: [PATCH 1646/3533] gitmodules: Update branch for stm32lib submodule.

Signed-off-by: Damien George <damien@micropython.org>
---
 .gitmodules | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitmodules b/.gitmodules
index a92757df2c5c3..d0b73e2ecf8e9 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -13,7 +13,7 @@
 [submodule "lib/stm32lib"]
 	path = lib/stm32lib
 	url = https://github.com/micropython/stm32lib
-	branch = work-F4-1.13.1+F7-1.5.0+L4-1.3.0
+	branch = work-F0-1.9.0+F4-1.16.0+F7-1.7.0+G4-1.3.0+H7-1.6.0+L0-1.11.2+L4-1.17.0+WB-1.10.0+WL-1.1.0
 [submodule "lib/nrfx"]
 	path = lib/nrfx
 	url = https://github.com/NordicSemiconductor/nrfx.git

From a5e64c209f2d76cb0cc903df875d87e8ca009507 Mon Sep 17 00:00:00 2001
From: IhorNehrutsa <Ihor.Nehrutsa@gmail.com>
Date: Tue, 25 Jan 2022 17:07:24 +0200
Subject: [PATCH 1647/3533] esp32/machine_pwm: Fix PWM not allowing frequencies
 < 611 Hz.

Fixes issue #8189.
---
 ports/esp32/machine_pwm.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
 mode change 100644 => 100755 ports/esp32/machine_pwm.c

diff --git a/ports/esp32/machine_pwm.c b/ports/esp32/machine_pwm.c
old mode 100644
new mode 100755
index 43d44249dc59a..9d5d9595e16c2
--- a/ports/esp32/machine_pwm.c
+++ b/ports/esp32/machine_pwm.c
@@ -85,10 +85,10 @@ STATIC ledc_timer_config_t timers[PWM_TIMER_MAX];
 // duty_u16() and duty_ns() use 16-bit resolution or less
 
 // Possible highest resolution in device
-#if (LEDC_TIMER_BIT_MAX - 1) < LEDC_TIMER_16_BIT
-#define HIGHEST_PWM_RES (LEDC_TIMER_BIT_MAX - 1)
-#else
+#if CONFIG_IDF_TARGET_ESP32
 #define HIGHEST_PWM_RES (LEDC_TIMER_16_BIT) // 20 bit for ESP32, but 16 bit is used
+#else
+#define HIGHEST_PWM_RES (LEDC_TIMER_BIT_MAX - 1) // 14 bit is used
 #endif
 // Duty resolution of user interface in `duty_u16()` and `duty_u16` parameter in constructor/initializer
 #define UI_RES_16_BIT (16)
@@ -300,7 +300,7 @@ STATIC uint32_t get_duty_u16(machine_pwm_obj_t *self) {
 }
 
 STATIC uint32_t get_duty_u10(machine_pwm_obj_t *self) {
-    return get_duty_u16(self) >> (HIGHEST_PWM_RES - PWRES);
+    return get_duty_u16(self) >> (UI_RES_16_BIT - LEDC_TIMER_10_BIT);
 }
 
 STATIC uint32_t get_duty_ns(machine_pwm_obj_t *self) {

From 15e65b77ebfaeddc9a678d94cf1a2ced625a6d45 Mon Sep 17 00:00:00 2001
From: IhorNehrutsa <Ihor.Nehrutsa@gmail.com>
Date: Tue, 25 Jan 2022 22:57:22 +0200
Subject: [PATCH 1648/3533] esp32/machine_pwm: Clean up macro names and their
 use.

- Remove UI_RES_SHIFT macro.
- Rename PWFREQ to PWM_FREQ.
- Rename PWRES to PWM_RES_10_BIT.
- Use UI_RES_16_BIT flag instead of HIGHEST_PWM_RES.
---
 ports/esp32/machine_pwm.c | 41 ++++++++++++++++++---------------------
 1 file changed, 19 insertions(+), 22 deletions(-)

diff --git a/ports/esp32/machine_pwm.c b/ports/esp32/machine_pwm.c
index 9d5d9595e16c2..9308fcd3cbfc6 100755
--- a/ports/esp32/machine_pwm.c
+++ b/ports/esp32/machine_pwm.c
@@ -71,15 +71,14 @@ STATIC ledc_timer_config_t timers[PWM_TIMER_MAX];
 #define TIMER_IDX_TO_MODE(timer_idx) (timer_idx / LEDC_TIMER_MAX)
 #define TIMER_IDX_TO_TIMER(timer_idx) (timer_idx % LEDC_TIMER_MAX)
 
-// Params for PW operation
+// Params for PWM operation
 // 5khz is default frequency
-#define PWFREQ (5000)
-
-// 10-bit resolution (compatible with esp8266 PWM)
-#define PWRES (LEDC_TIMER_10_BIT)
+#define PWM_FREQ (5000)
+// default 10-bit resolution (compatible with esp8266 PWM)
+#define PWM_RES_10_BIT (LEDC_TIMER_10_BIT)
 
 // Maximum duty value on 10-bit resolution
-#define MAX_DUTY_U10 ((1 << PWRES) - 1)
+#define MAX_DUTY_U10 ((1 << PWM_RES_10_BIT) - 1)
 // https://docs.espressif.com/projects/esp-idf/en/latest/esp32/api-reference/peripherals/ledc.html#supported-range-of-frequency-and-duty-resolutions
 // duty() uses 10-bit resolution or less
 // duty_u16() and duty_ns() use 16-bit resolution or less
@@ -94,8 +93,6 @@ STATIC ledc_timer_config_t timers[PWM_TIMER_MAX];
 #define UI_RES_16_BIT (16)
 // Maximum duty value on highest user interface resolution
 #define UI_MAX_DUTY ((1 << UI_RES_16_BIT) - 1)
-// How much to shift from the HIGHEST_PWM_RES duty resolution to the user interface duty resolution UI_RES_16_BIT
-#define UI_RES_SHIFT (UI_RES_16_BIT - HIGHEST_PWM_RES) // 0 for ESP32, 2 for S2, S3, C3
 
 // If the PWM frequency is less than EMPIRIC_FREQ, then LEDC_REF_CLK_HZ(1 MHz) source is used, else LEDC_APB_CLK_HZ(80 MHz) source is used
 #define EMPIRIC_FREQ (10) // Hz
@@ -111,7 +108,7 @@ typedef struct _machine_pwm_obj_t {
     int mode;
     int channel;
     int timer;
-    int duty_x; // PWRES if duty(), HIGHEST_PWM_RES if duty_u16(), -HIGHEST_PWM_RES if duty_ns()
+    int duty_x; // PWM_RES_10_BIT if duty(), UI_RES_16_BIT if duty_u16(), -UI_RES_16_BIT if duty_ns()
     int duty_u10; // stored values from previous duty setters
     int duty_u16; // - / -
     int duty_ns; // - / -
@@ -264,11 +261,11 @@ STATIC void set_freq(machine_pwm_obj_t *self, unsigned int freq, ledc_timer_conf
 
         // Save the same duty cycle when frequency is changed
         if (save_duty_resolution != timer->duty_resolution) {
-            if (self->duty_x == HIGHEST_PWM_RES) {
+            if (self->duty_x == UI_RES_16_BIT) {
                 set_duty_u16(self, self->duty_u16);
-            } else if (self->duty_x == PWRES) {
+            } else if (self->duty_x == PWM_RES_10_BIT) {
                 set_duty_u10(self, self->duty_u10);
-            } else if (self->duty_x == -HIGHEST_PWM_RES) {
+            } else if (self->duty_x == -UI_RES_16_BIT) {
                 set_duty_ns(self, self->duty_ns);
             }
         }
@@ -296,7 +293,7 @@ STATIC int duty_to_ns(machine_pwm_obj_t *self, int duty) {
 #define get_duty_raw(self) ledc_get_duty(self->mode, self->channel)
 
 STATIC uint32_t get_duty_u16(machine_pwm_obj_t *self) {
-    return ledc_get_duty(self->mode, self->channel) << (HIGHEST_PWM_RES + UI_RES_SHIFT - timers[TIMER_IDX(self->mode, self->timer)].duty_resolution);
+    return ledc_get_duty(self->mode, self->channel) << (UI_RES_16_BIT - timers[TIMER_IDX(self->mode, self->timer)].duty_resolution);
 }
 
 STATIC uint32_t get_duty_u10(machine_pwm_obj_t *self) {
@@ -312,7 +309,7 @@ STATIC void set_duty_u16(machine_pwm_obj_t *self, int duty) {
         mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("duty_u16 must be from 0 to %d"), UI_MAX_DUTY);
     }
     ledc_timer_config_t timer = timers[TIMER_IDX(self->mode, self->timer)];
-    int channel_duty = duty >> (HIGHEST_PWM_RES + UI_RES_SHIFT - timer.duty_resolution);
+    int channel_duty = duty >> (UI_RES_16_BIT - timer.duty_resolution);
     int max_duty = (1 << timer.duty_resolution) - 1;
     if (channel_duty < 0) {
         channel_duty = 0;
@@ -336,7 +333,7 @@ STATIC void set_duty_u16(machine_pwm_obj_t *self, int duty) {
     }
     */
 
-    self->duty_x = HIGHEST_PWM_RES;
+    self->duty_x = UI_RES_16_BIT;
     self->duty_u16 = duty;
 }
 
@@ -344,8 +341,8 @@ STATIC void set_duty_u10(machine_pwm_obj_t *self, int duty) {
     if ((duty < 0) || (duty > MAX_DUTY_U10)) {
         mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("duty must be from 0 to %u"), MAX_DUTY_U10);
     }
-    set_duty_u16(self, duty << (HIGHEST_PWM_RES + UI_RES_SHIFT - PWRES));
-    self->duty_x = PWRES;
+    set_duty_u16(self, duty << (UI_RES_16_BIT - LEDC_TIMER_10_BIT));
+    self->duty_x = PWM_RES_10_BIT;
     self->duty_u10 = duty;
 }
 
@@ -354,7 +351,7 @@ STATIC void set_duty_ns(machine_pwm_obj_t *self, int ns) {
         mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("duty_ns must be from 0 to %d ns"), duty_to_ns(self, UI_MAX_DUTY));
     }
     set_duty_u16(self, ns_to_duty(self, ns));
-    self->duty_x = -HIGHEST_PWM_RES;
+    self->duty_x = -UI_RES_16_BIT;
     self->duty_ns = ns;
 }
 
@@ -425,9 +422,9 @@ STATIC void mp_machine_pwm_print(const mp_print_t *print, mp_obj_t self_in, mp_p
     if (self->active) {
         mp_printf(print, ", freq=%u", ledc_get_freq(self->mode, self->timer));
 
-        if (self->duty_x == PWRES) {
+        if (self->duty_x == PWM_RES_10_BIT) {
             mp_printf(print, ", duty=%d", get_duty_u10(self));
-        } else if (self->duty_x == -HIGHEST_PWM_RES) {
+        } else if (self->duty_x == -UI_RES_16_BIT) {
             mp_printf(print, ", duty_ns=%d", get_duty_ns(self));
         } else {
             mp_printf(print, ", duty_u16=%d", get_duty_u16(self));
@@ -479,7 +476,7 @@ STATIC void mp_machine_pwm_init_helper(machine_pwm_obj_t *self,
             freq = timers[chans[channel_idx].timer_idx].freq_hz;
         }
         if (freq <= 0) {
-            freq = PWFREQ;
+            freq = PWM_FREQ;
         }
     }
     if ((freq <= 0) || (freq > 40000000)) {
@@ -536,7 +533,7 @@ STATIC void mp_machine_pwm_init_helper(machine_pwm_obj_t *self,
     } else if (duty != -1) {
         set_duty_u10(self, duty);
     } else if (self->duty_x == 0) {
-        set_duty_u10(self, (1 << PWRES) / 2); // 50%
+        set_duty_u10(self, (1 << PWM_RES_10_BIT) / 2); // 50%
     }
 }
 

From 1f04a9a1fcd4172f7c721e05a4515c9c8bb0e8c9 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 1 Feb 2022 16:58:56 +1100
Subject: [PATCH 1649/3533] esp32/esp32_rmt: Select correct last RMT channel on
 S2, S3, C3 variants.

For example the ESP32-C3 has 2 TX channels and 2 RX channels in total, and
in this case channel 1 must be the default for bitstream.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/esp32_rmt.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/ports/esp32/esp32_rmt.c b/ports/esp32/esp32_rmt.c
index ca751d42a8cac..ac897e33368a3 100644
--- a/ports/esp32/esp32_rmt.c
+++ b/ports/esp32/esp32_rmt.c
@@ -47,6 +47,13 @@
 // This current MicroPython implementation lacks some major features, notably receive pulses
 // and carrier output.
 
+// Last available RMT channel that can transmit.
+#if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(4, 4, 0)
+#define RMT_LAST_TX_CHANNEL (RMT_CHANNEL_MAX - 1)
+#else
+#define RMT_LAST_TX_CHANNEL (SOC_RMT_TX_CANDIDATES_PER_GROUP - 1)
+#endif
+
 // Forward declaration
 extern const mp_obj_type_t esp32_rmt_type;
 
@@ -62,7 +69,7 @@ typedef struct _esp32_rmt_obj_t {
 
 // Current channel used for machine.bitstream, in the machine_bitstream_high_low_rmt
 // implementation.  A value of -1 means do not use RMT.
-int8_t esp32_rmt_bitstream_channel_id = RMT_CHANNEL_MAX - 1;
+int8_t esp32_rmt_bitstream_channel_id = RMT_LAST_TX_CHANNEL;
 
 #if MP_TASK_COREID == 0
 
@@ -336,7 +343,7 @@ STATIC mp_obj_t esp32_rmt_bitstream_channel(size_t n_args, const mp_obj_t *args)
             esp32_rmt_bitstream_channel_id = -1;
         } else {
             mp_int_t channel_id = mp_obj_get_int(args[0]);
-            if (channel_id < 0 || channel_id >= RMT_CHANNEL_MAX) {
+            if (channel_id < 0 || channel_id > RMT_LAST_TX_CHANNEL) {
                 mp_raise_ValueError(MP_ERROR_TEXT("invalid channel"));
             }
             esp32_rmt_bitstream_channel_id = channel_id;

From eae2e3516ca4067ca8cfeb51ac8a6505cb6324b7 Mon Sep 17 00:00:00 2001
From: Michael O'Cleirigh <michael.ocleirigh@gmail.com>
Date: Fri, 28 Jan 2022 00:35:53 -0500
Subject: [PATCH 1650/3533] esp32/main: Automatically size SPIRAM heap when
 allocated using malloc.

This change allows the same heap allocation rules to be used when using
malloc regardless if the board has SPRAM or normal RAM.

Integrating with the esp32-camera for example requires that ESP32 SPRAM be
allocatable using the esp-idf capabilities aware allocation functions.  In
the case of esp32-camera it's for the framebuffer.

Detect when CONFIG_SPIRAM_USE_MALLOC is in use and use the standard
automatic configuration of leaving 1/2 of the SPRAM available to other
FreeRTOS tasks.
---
 ports/esp32/main.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ports/esp32/main.c b/ports/esp32/main.c
index e25e6fdd1c1a8..6c5edbb35670d 100644
--- a/ports/esp32/main.c
+++ b/ports/esp32/main.c
@@ -100,7 +100,10 @@ void mp_task(void *pvParameter) {
     size_t mp_task_heap_size;
     void *mp_task_heap = NULL;
 
-    #if CONFIG_ESP32_SPIRAM_SUPPORT
+    #if CONFIG_SPIRAM_USE_MALLOC
+    // SPIRAM is issued using MALLOC, fallback to normal allocation rules
+    mp_task_heap = NULL;
+    #elif CONFIG_ESP32_SPIRAM_SUPPORT
     // Try to use the entire external SPIRAM directly for the heap
     mp_task_heap = (void *)SOC_EXTRAM_DATA_LOW;
     switch (esp_spiram_get_chip_size()) {

From b18d4392b4a4c5e6ed50dbcdb4a88828703289cb Mon Sep 17 00:00:00 2001
From: Emil Kondayan <sogunxk4u@relay.firefox.com>
Date: Thu, 27 Jan 2022 16:05:59 +0200
Subject: [PATCH 1651/3533] esp32/adc: Fix wrong mapping between ADC2 channel
 and GPIO number.

According to the IO_MUX table in the ESP32 datasheet, the ADC2 channels are
mapped to different GPIO numbers.
---
 ports/esp32/machine_adc.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/ports/esp32/machine_adc.c b/ports/esp32/machine_adc.c
index f6bc7b96399e0..515d629a7e972 100644
--- a/ports/esp32/machine_adc.c
+++ b/ports/esp32/machine_adc.c
@@ -50,16 +50,16 @@ STATIC const madc_obj_t madc_obj[] = {
     {{&machine_adc_type}, ADCBLOCK1, ADC_CHANNEL_5, GPIO_NUM_33},
     {{&machine_adc_type}, ADCBLOCK1, ADC_CHANNEL_6, GPIO_NUM_34},
     {{&machine_adc_type}, ADCBLOCK1, ADC_CHANNEL_7, GPIO_NUM_35},
-    {{&machine_adc_type}, ADCBLOCK2, ADC_CHANNEL_0, GPIO_NUM_0},
-    {{&machine_adc_type}, ADCBLOCK2, ADC_CHANNEL_1, GPIO_NUM_2},
-    {{&machine_adc_type}, ADCBLOCK2, ADC_CHANNEL_2, GPIO_NUM_4},
-    {{&machine_adc_type}, ADCBLOCK2, ADC_CHANNEL_3, GPIO_NUM_12},
+    {{&machine_adc_type}, ADCBLOCK2, ADC_CHANNEL_0, GPIO_NUM_4},
+    {{&machine_adc_type}, ADCBLOCK2, ADC_CHANNEL_1, GPIO_NUM_0},
+    {{&machine_adc_type}, ADCBLOCK2, ADC_CHANNEL_2, GPIO_NUM_2},
+    {{&machine_adc_type}, ADCBLOCK2, ADC_CHANNEL_3, GPIO_NUM_15},
     {{&machine_adc_type}, ADCBLOCK2, ADC_CHANNEL_4, GPIO_NUM_13},
-    {{&machine_adc_type}, ADCBLOCK2, ADC_CHANNEL_5, GPIO_NUM_14},
-    {{&machine_adc_type}, ADCBLOCK2, ADC_CHANNEL_6, GPIO_NUM_15},
-    {{&machine_adc_type}, ADCBLOCK2, ADC_CHANNEL_7, GPIO_NUM_25},
-    {{&machine_adc_type}, ADCBLOCK2, ADC_CHANNEL_8, GPIO_NUM_26},
-    {{&machine_adc_type}, ADCBLOCK2, ADC_CHANNEL_9, GPIO_NUM_27},
+    {{&machine_adc_type}, ADCBLOCK2, ADC_CHANNEL_5, GPIO_NUM_12},
+    {{&machine_adc_type}, ADCBLOCK2, ADC_CHANNEL_6, GPIO_NUM_14},
+    {{&machine_adc_type}, ADCBLOCK2, ADC_CHANNEL_7, GPIO_NUM_27},
+    {{&machine_adc_type}, ADCBLOCK2, ADC_CHANNEL_8, GPIO_NUM_25},
+    {{&machine_adc_type}, ADCBLOCK2, ADC_CHANNEL_9, GPIO_NUM_26},
     #elif CONFIG_IDF_TARGET_ESP32C3
     {{&machine_adc_type}, ADCBLOCK1, ADC_CHANNEL_0, GPIO_NUM_0},
     {{&machine_adc_type}, ADCBLOCK1, ADC_CHANNEL_1, GPIO_NUM_1},

From 872bab6b3c967deaeff5f0f3d0d066c3fde03802 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 2 Feb 2022 16:20:41 +1100
Subject: [PATCH 1652/3533] esp32: Remove unneeded modesp.h.

Made redundant by 71f4faac2732d932dcc03bdbc9f80434e5757edb

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/modesp.c | 1 -
 ports/esp32/modesp.h | 1 -
 2 files changed, 2 deletions(-)
 delete mode 100644 ports/esp32/modesp.h

diff --git a/ports/esp32/modesp.c b/ports/esp32/modesp.c
index 8c94e0cf417ad..b5beaf50538a7 100644
--- a/ports/esp32/modesp.c
+++ b/ports/esp32/modesp.c
@@ -36,7 +36,6 @@
 #include "py/mperrno.h"
 #include "py/mphal.h"
 #include "drivers/dht/dht.h"
-#include "modesp.h"
 
 STATIC mp_obj_t esp_osdebug(size_t n_args, const mp_obj_t *args) {
     esp_log_level_t level = LOG_LOCAL_LEVEL;
diff --git a/ports/esp32/modesp.h b/ports/esp32/modesp.h
deleted file mode 100644
index a822c02eccde1..0000000000000
--- a/ports/esp32/modesp.h
+++ /dev/null
@@ -1 +0,0 @@
-void esp_neopixel_write(uint8_t pin, uint8_t *pixels, uint32_t numBytes, uint8_t timing);

From 326b2c79dfaf472d67e5e3fee5868e78ccc6be73 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 2 Feb 2022 16:27:10 +1100
Subject: [PATCH 1653/3533] docs: Remove reference to obsolete neopixel_write
 function.

It has been replaced by machine.bitstream.

Signed-off-by: Damien George <damien@micropython.org>
---
 docs/esp32/quickref.rst   | 8 ++------
 docs/esp8266/quickref.rst | 6 +-----
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/docs/esp32/quickref.rst b/docs/esp32/quickref.rst
index 94b5d966edd30..de107ee25c0d6 100644
--- a/docs/esp32/quickref.rst
+++ b/docs/esp32/quickref.rst
@@ -599,18 +599,14 @@ The APA106 driver extends NeoPixel, but internally uses a different colour order
     ap = APA106(pin, 8)
     r, g, b = ap[0]
 
-For low-level driving of a NeoPixel::
-
-    import esp
-    esp.neopixel_write(pin, grb_buf, is800khz)
-
 .. Warning::
    By default ``NeoPixel`` is configured to control the more popular *800kHz*
    units. It is possible to use alternative timing to control other (typically
    400kHz) devices by passing ``timing=0`` when constructing the
    ``NeoPixel`` object.
 
-The low-level driver uses an RMT channel by default.  To configure this see
+For low-level driving of a NeoPixel see `machine.bitstream`.
+This low-level driver uses an RMT channel by default.  To configure this see
 `RMT.bitstream_channel`.
 
 APA102 (DotStar) uses a different driver as it has an additional clock pin.
diff --git a/docs/esp8266/quickref.rst b/docs/esp8266/quickref.rst
index 9e64723b27c74..4e00a92260c25 100644
--- a/docs/esp8266/quickref.rst
+++ b/docs/esp8266/quickref.rst
@@ -374,17 +374,13 @@ Use the ``neopixel`` module::
     np.write()              # write data to all pixels
     r, g, b = np[0]         # get first pixel colour
 
-For low-level driving of a NeoPixel::
-
-    import esp
-    esp.neopixel_write(pin, grb_buf, is800khz)
-
 .. Warning::
    By default ``NeoPixel`` is configured to control the more popular *800kHz*
    units. It is possible to use alternative timing to control other (typically
    400kHz) devices by passing ``timing=0`` when constructing the
    ``NeoPixel`` object.
 
+For low-level driving of a NeoPixel see `machine.bitstream`.
 
 APA102 driver
 -------------

From ab2923dfa1174dc177f0a90cb00a7e4ff87958d2 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 2 Feb 2022 16:11:25 +1100
Subject: [PATCH 1654/3533] all: Update Python formatting to latest Black
 version 22.1.0.

Signed-off-by: Damien George <damien@micropython.org>
---
 examples/rp2/pio_pwm.py                    |  2 +-
 tests/cpydiff/modules_random_randint.py    |  2 +-
 tests/float/complex1.py                    | 14 ++++-----
 tests/float/float1.py                      |  2 +-
 tests/float/float2int_doubleprec_intbig.py | 36 +++++++++++-----------
 tests/float/float2int_fp30_intbig.py       | 36 +++++++++++-----------
 tests/float/float2int_intbig.py            | 36 +++++++++++-----------
 tests/float/inf_nan_arith.py               |  2 +-
 tests/float/int_big_float.py               |  2 +-
 tests/float/int_divzero.py                 |  2 +-
 tests/float/int_power.py                   |  2 +-
 tests/micropython/import_mpy_native_x64.py |  2 +-
 tests/misc/rge_sm.py                       | 12 ++++----
 tests/perf_bench/bm_chaos.py               |  2 +-
 tests/perf_bench/misc_raytrace.py          |  8 ++---
 tests/run-perfbench.py                     |  6 ++--
 16 files changed, 83 insertions(+), 83 deletions(-)

diff --git a/examples/rp2/pio_pwm.py b/examples/rp2/pio_pwm.py
index 8e87448ca8029..176a238091a5f 100644
--- a/examples/rp2/pio_pwm.py
+++ b/examples/rp2/pio_pwm.py
@@ -41,5 +41,5 @@ def set(self, value):
 
 while True:
     for i in range(256):
-        pwm.set(i ** 2)
+        pwm.set(i**2)
         sleep(0.01)
diff --git a/tests/cpydiff/modules_random_randint.py b/tests/cpydiff/modules_random_randint.py
index b05908a157f99..90607400cd2ba 100644
--- a/tests/cpydiff/modules_random_randint.py
+++ b/tests/cpydiff/modules_random_randint.py
@@ -8,5 +8,5 @@
 import random
 
 
-x = random.randint(2 ** 128 - 1, 2 ** 128)
+x = random.randint(2**128 - 1, 2**128)
 print("x={}".format(x))
diff --git a/tests/float/complex1.py b/tests/float/complex1.py
index a510ffc830fc6..139bb0c50923c 100644
--- a/tests/float/complex1.py
+++ b/tests/float/complex1.py
@@ -27,15 +27,15 @@
 print(1j / 2)
 print((1j / 2j).real)
 print(1j / (1 + 2j))
-ans = 0j ** 0
+ans = 0j**0
 print("%.5g %.5g" % (ans.real, ans.imag))
-ans = 0j ** 1
+ans = 0j**1
 print("%.5g %.5g" % (ans.real, ans.imag))
-ans = 0j ** 0j
+ans = 0j**0j
 print("%.5g %.5g" % (ans.real, ans.imag))
-ans = 1j ** 2.5
+ans = 1j**2.5
 print("%.5g %.5g" % (ans.real, ans.imag))
-ans = 1j ** 2.5j
+ans = 1j**2.5j
 print("%.5g %.5g" % (ans.real, ans.imag))
 
 # comparison
@@ -116,10 +116,10 @@
 
 # zero division via power
 try:
-    0j ** -1
+    0j**-1
 except ZeroDivisionError:
     print("ZeroDivisionError")
 try:
-    0j ** 1j
+    0j**1j
 except ZeroDivisionError:
     print("ZeroDivisionError")
diff --git a/tests/float/float1.py b/tests/float/float1.py
index efde5146bed7d..37f8b3face6aa 100644
--- a/tests/float/float1.py
+++ b/tests/float/float1.py
@@ -88,7 +88,7 @@
     print("ZeroDivisionError")
 
 try:
-    0.0 ** -1
+    0.0**-1
 except ZeroDivisionError:
     print("ZeroDivisionError")
 
diff --git a/tests/float/float2int_doubleprec_intbig.py b/tests/float/float2int_doubleprec_intbig.py
index 418eddb60781a..adc76d4aeb289 100644
--- a/tests/float/float2int_doubleprec_intbig.py
+++ b/tests/float/float2int_doubleprec_intbig.py
@@ -35,8 +35,8 @@
     print(int(1418774543.0))
     print("%d" % 1418774543.0)
     if ll_type == 3:
-        print(int(2.0 ** 100))
-        print("%d" % 2.0 ** 100)
+        print(int(2.0**100))
+        print("%d" % 2.0**100)
 else:
     print(int(1073741823.0))
     print("%d" % 1073741823.0)
@@ -44,7 +44,7 @@
 testpass = True
 p2_rng = ((30, 63, 1024), (62, 63, 1024))[is_64bit][ll_type]
 for i in range(0, p2_rng):
-    bitcnt = len(bin(int(2.0 ** i))) - 3
+    bitcnt = len(bin(int(2.0**i))) - 3
     if i != bitcnt:
         print("fail: 2**%u was %u bits long" % (i, bitcnt))
         testpass = False
@@ -53,7 +53,7 @@
 testpass = True
 p10_rng = ((9, 18, 23), (18, 18, 23))[is_64bit][ll_type]
 for i in range(0, p10_rng):
-    digcnt = len(str(int(10.0 ** i))) - 1
+    digcnt = len(str(int(10.0**i))) - 1
     if i != digcnt:
         print("fail: 10**%u was %u digits long" % (i, digcnt))
         testpass = False
@@ -72,28 +72,28 @@ def fp2int_test(num, name, should_fail):
 if ll_type != 2:
     if ll_type == 0:
         if is_64bit:
-            neg_bad_fp = -1.00000005 * 2.0 ** 62.0
-            pos_bad_fp = 2.0 ** 62.0
-            neg_good_fp = -(2.0 ** 62.0)
-            pos_good_fp = 0.99999993 * 2.0 ** 62.0
+            neg_bad_fp = -1.00000005 * 2.0**62.0
+            pos_bad_fp = 2.0**62.0
+            neg_good_fp = -(2.0**62.0)
+            pos_good_fp = 0.99999993 * 2.0**62.0
         else:
-            neg_bad_fp = -1.00000005 * 2.0 ** 30.0
-            pos_bad_fp = 2.0 ** 30.0
-            neg_good_fp = -(2.0 ** 30.0)
-            pos_good_fp = 0.9999999499 * 2.0 ** 30.0
+            neg_bad_fp = -1.00000005 * 2.0**30.0
+            pos_bad_fp = 2.0**30.0
+            neg_good_fp = -(2.0**30.0)
+            pos_good_fp = 0.9999999499 * 2.0**30.0
     else:
-        neg_bad_fp = -0.51 * 2.0 ** 64.0
-        pos_bad_fp = 2.0 ** 63.0
-        neg_good_fp = -(2.0 ** 63.0)
-        pos_good_fp = 1.9999998 * 2.0 ** 62.0
+        neg_bad_fp = -0.51 * 2.0**64.0
+        pos_bad_fp = 2.0**63.0
+        neg_good_fp = -(2.0**63.0)
+        pos_good_fp = 1.9999998 * 2.0**62.0
 
     fp2int_test(neg_bad_fp, "neg bad", True)
     fp2int_test(pos_bad_fp, "pos bad", True)
     fp2int_test(neg_good_fp, "neg good", False)
     fp2int_test(pos_good_fp, "pos good", False)
 else:
-    fp2int_test(-1.9999999999999981 * 2.0 ** 1023.0, "large neg", False)
-    fp2int_test(1.9999999999999981 * 2.0 ** 1023.0, "large pos", False)
+    fp2int_test(-1.9999999999999981 * 2.0**1023.0, "large neg", False)
+    fp2int_test(1.9999999999999981 * 2.0**1023.0, "large pos", False)
 
 fp2int_test(float("inf"), "inf test", True)
 fp2int_test(float("-inf"), "inf test", True)
diff --git a/tests/float/float2int_fp30_intbig.py b/tests/float/float2int_fp30_intbig.py
index fcbe2e309f0be..4e3c1fa217b7d 100644
--- a/tests/float/float2int_fp30_intbig.py
+++ b/tests/float/float2int_fp30_intbig.py
@@ -34,13 +34,13 @@
 print(int(14187744.0))
 print("%d" % 14187744.0)
 if ll_type == 2:
-    print(int(2.0 ** 100))
-    print("%d" % 2.0 ** 100)
+    print(int(2.0**100))
+    print("%d" % 2.0**100)
 
 testpass = True
 p2_rng = ((30, 63, 127), (62, 63, 127))[is_64bit][ll_type]
 for i in range(0, p2_rng):
-    bitcnt = len(bin(int(2.0 ** i))) - 3
+    bitcnt = len(bin(int(2.0**i))) - 3
     if i != bitcnt:
         print("fail: 2.**%u was %u bits long" % (i, bitcnt))
         testpass = False
@@ -50,7 +50,7 @@
 testpass = True
 p10_rng = 9
 for i in range(0, p10_rng):
-    digcnt = len(str(int(10.0 ** i))) - 1
+    digcnt = len(str(int(10.0**i))) - 1
     if i != digcnt:
         print("fail: 10.**%u was %u digits long" % (i, digcnt))
         testpass = False
@@ -69,28 +69,28 @@ def fp2int_test(num, name, should_fail):
 if ll_type != 2:
     if ll_type == 0:
         if is_64bit:
-            neg_bad_fp = -1.00000005 * 2.0 ** 62.0
-            pos_bad_fp = 2.0 ** 62.0
-            neg_good_fp = -(2.0 ** 62.0)
-            pos_good_fp = 0.99999993 * 2.0 ** 62.0
+            neg_bad_fp = -1.00000005 * 2.0**62.0
+            pos_bad_fp = 2.0**62.0
+            neg_good_fp = -(2.0**62.0)
+            pos_good_fp = 0.99999993 * 2.0**62.0
         else:
-            neg_bad_fp = -1.00000005 * 2.0 ** 30.0
-            pos_bad_fp = 2.0 ** 30.0
-            neg_good_fp = -(2.0 ** 30.0)
-            pos_good_fp = 0.9999999499 * 2.0 ** 30.0
+            neg_bad_fp = -1.00000005 * 2.0**30.0
+            pos_bad_fp = 2.0**30.0
+            neg_good_fp = -(2.0**30.0)
+            pos_good_fp = 0.9999999499 * 2.0**30.0
     else:
-        neg_bad_fp = -0.51 * 2.0 ** 64.0
-        pos_bad_fp = 2.0 ** 63.0
-        neg_good_fp = -(2.0 ** 63.0)
-        pos_good_fp = 1.9999998 * 2.0 ** 62.0
+        neg_bad_fp = -0.51 * 2.0**64.0
+        pos_bad_fp = 2.0**63.0
+        neg_good_fp = -(2.0**63.0)
+        pos_good_fp = 1.9999998 * 2.0**62.0
 
     fp2int_test(neg_bad_fp, "neg bad", True)
     fp2int_test(pos_bad_fp, "pos bad", True)
     fp2int_test(neg_good_fp, "neg good", False)
     fp2int_test(pos_good_fp, "pos good", False)
 else:
-    fp2int_test(-1.999999879 * 2.0 ** 126.0, "large neg", False)
-    fp2int_test(1.999999879 * 2.0 ** 126.0, "large pos", False)
+    fp2int_test(-1.999999879 * 2.0**126.0, "large neg", False)
+    fp2int_test(1.999999879 * 2.0**126.0, "large pos", False)
 
 fp2int_test(float("inf"), "inf test", True)
 fp2int_test(float("-inf"), "inf test", True)
diff --git a/tests/float/float2int_intbig.py b/tests/float/float2int_intbig.py
index 865aeea7b9171..739f98f804dbf 100644
--- a/tests/float/float2int_intbig.py
+++ b/tests/float/float2int_intbig.py
@@ -37,13 +37,13 @@
 print("%d" % 14187745.)
 # fmt: on
 if ll_type == 2:
-    print(int(2.0 ** 100))
-    print("%d" % 2.0 ** 100)
+    print(int(2.0**100))
+    print("%d" % 2.0**100)
 
 testpass = True
 p2_rng = ((30, 63, 127), (62, 63, 127))[is_64bit][ll_type]
 for i in range(0, p2_rng):
-    bitcnt = len(bin(int(2.0 ** i))) - 3
+    bitcnt = len(bin(int(2.0**i))) - 3
     if i != bitcnt:
         print("fail: 2.**%u was %u bits long" % (i, bitcnt))
         testpass = False
@@ -53,7 +53,7 @@
 testpass = True
 p10_rng = 9 if (ll_type == 0 and ~is_64bit) else 11
 for i in range(0, p10_rng):
-    digcnt = len(str(int(10.0 ** i))) - 1
+    digcnt = len(str(int(10.0**i))) - 1
     if i != digcnt:
         print("fail: 10.**%u was %u digits long" % (i, digcnt))
         testpass = False
@@ -72,28 +72,28 @@ def fp2int_test(num, name, should_fail):
 if ll_type != 2:
     if ll_type == 0:
         if is_64bit:
-            neg_bad_fp = -1.00000005 * 2.0 ** 62.0
-            pos_bad_fp = 2.0 ** 62.0
-            neg_good_fp = -(2.0 ** 62.0)
-            pos_good_fp = 0.99999993 * 2.0 ** 62.0
+            neg_bad_fp = -1.00000005 * 2.0**62.0
+            pos_bad_fp = 2.0**62.0
+            neg_good_fp = -(2.0**62.0)
+            pos_good_fp = 0.99999993 * 2.0**62.0
         else:
-            neg_bad_fp = -1.00000005 * 2.0 ** 30.0
-            pos_bad_fp = 2.0 ** 30.0
-            neg_good_fp = -(2.0 ** 30.0)
-            pos_good_fp = 0.9999999499 * 2.0 ** 30.0
+            neg_bad_fp = -1.00000005 * 2.0**30.0
+            pos_bad_fp = 2.0**30.0
+            neg_good_fp = -(2.0**30.0)
+            pos_good_fp = 0.9999999499 * 2.0**30.0
     else:
-        neg_bad_fp = -0.51 * 2.0 ** 64.0
-        pos_bad_fp = 2.0 ** 63.0
-        neg_good_fp = -(2.0 ** 63.0)
-        pos_good_fp = 1.9999998 * 2.0 ** 62.0
+        neg_bad_fp = -0.51 * 2.0**64.0
+        pos_bad_fp = 2.0**63.0
+        neg_good_fp = -(2.0**63.0)
+        pos_good_fp = 1.9999998 * 2.0**62.0
 
     fp2int_test(neg_bad_fp, "neg bad", True)
     fp2int_test(pos_bad_fp, "pos bad", True)
     fp2int_test(neg_good_fp, "neg good", False)
     fp2int_test(pos_good_fp, "pos good", False)
 else:
-    fp2int_test(-1.999999879 * 2.0 ** 127.0, "large neg", False)
-    fp2int_test(1.999999879 * 2.0 ** 127.0, "large pos", False)
+    fp2int_test(-1.999999879 * 2.0**127.0, "large neg", False)
+    fp2int_test(1.999999879 * 2.0**127.0, "large pos", False)
 
 fp2int_test(float("inf"), "inf test", True)
 fp2int_test(float("nan"), "NaN test", True)
diff --git a/tests/float/inf_nan_arith.py b/tests/float/inf_nan_arith.py
index c27e38bc520be..d1a6b18872029 100644
--- a/tests/float/inf_nan_arith.py
+++ b/tests/float/inf_nan_arith.py
@@ -14,7 +14,7 @@
         except ZeroDivisionError:
             print("  / ZeroDivisionError")
         try:
-            print("  ** pow", x ** y, pow(x, y))
+            print("  ** pow", x**y, pow(x, y))
         except ZeroDivisionError:
             print("  ** pow ZeroDivisionError")
         print("  == != < <= > >=", x == y, x != y, x < y, x <= y, x > y, x >= y)
diff --git a/tests/float/int_big_float.py b/tests/float/int_big_float.py
index 0bd166218664a..dc13e8e0dd174 100644
--- a/tests/float/int_big_float.py
+++ b/tests/float/int_big_float.py
@@ -19,7 +19,7 @@
 print("%.5g" % (i * 1.2j).imag)
 
 # negative power should produce float
-print("%.5g" % (i ** -1))
+print("%.5g" % (i**-1))
 print("%.5g" % ((2 + i - i) ** -3))
 
 try:
diff --git a/tests/float/int_divzero.py b/tests/float/int_divzero.py
index b311a1dbcf6c9..ef3531bee8649 100644
--- a/tests/float/int_divzero.py
+++ b/tests/float/int_divzero.py
@@ -4,6 +4,6 @@
     print("ZeroDivisionError")
 
 try:
-    0 ** -1
+    0**-1
 except ZeroDivisionError:
     print("ZeroDivisionError")
diff --git a/tests/float/int_power.py b/tests/float/int_power.py
index ba79247a5668e..bcda0f98ed682 100644
--- a/tests/float/int_power.py
+++ b/tests/float/int_power.py
@@ -1,7 +1,7 @@
 # negative power should produce float
 
 x = 2
-print(x ** -2)
+print(x**-2)
 
 x = 3
 x **= -2
diff --git a/tests/micropython/import_mpy_native_x64.py b/tests/micropython/import_mpy_native_x64.py
index cad59e99164c2..ff0142a9cf55f 100644
--- a/tests/micropython/import_mpy_native_x64.py
+++ b/tests/micropython/import_mpy_native_x64.py
@@ -9,7 +9,7 @@
     print("SKIP")
     raise SystemExit
 
-if not (usys.platform == "linux" and usys.maxsize > 2 ** 32):
+if not (usys.platform == "linux" and usys.maxsize > 2**32):
     print("SKIP")
     raise SystemExit
 
diff --git a/tests/misc/rge_sm.py b/tests/misc/rge_sm.py
index f3bb4189f7fdf..00b0a7a021678 100644
--- a/tests/misc/rge_sm.py
+++ b/tests/misc/rge_sm.py
@@ -52,12 +52,12 @@ def series(self):
 # couplings are: g1, g2, g3 of U(1), SU(2), SU(3); yt (top Yukawa), lambda (Higgs quartic)
 # see arxiv.org/abs/0812.4950, eqs 10-15
 sysSM = (
-    lambda *a: 41.0 / 96.0 / math.pi ** 2 * a[1] ** 3,  # g1
-    lambda *a: -19.0 / 96.0 / math.pi ** 2 * a[2] ** 3,  # g2
-    lambda *a: -42.0 / 96.0 / math.pi ** 2 * a[3] ** 3,  # g3
+    lambda *a: 41.0 / 96.0 / math.pi**2 * a[1] ** 3,  # g1
+    lambda *a: -19.0 / 96.0 / math.pi**2 * a[2] ** 3,  # g2
+    lambda *a: -42.0 / 96.0 / math.pi**2 * a[3] ** 3,  # g3
     lambda *a: 1.0
     / 16.0
-    / math.pi ** 2
+    / math.pi**2
     * (
         9.0 / 2.0 * a[4] ** 3
         - 8.0 * a[3] ** 2 * a[4]
@@ -66,7 +66,7 @@ def series(self):
     ),  # yt
     lambda *a: 1.0
     / 16.0
-    / math.pi ** 2
+    / math.pi**2
     * (
         24.0 * a[5] ** 2
         + 12.0 * a[4] ** 2 * a[5]
@@ -137,5 +137,5 @@ def singleTraj(system, trajStart, h=0.02, tend=1.0):
 
 # initial conditions at M_Z
 singleTraj(
-    sysSM, [0.354, 0.654, 1.278, 0.983, 0.131], h=0.5, tend=math.log(10 ** 17)
+    sysSM, [0.354, 0.654, 1.278, 0.983, 0.131], h=0.5, tend=math.log(10**17)
 )  # true values
diff --git a/tests/perf_bench/bm_chaos.py b/tests/perf_bench/bm_chaos.py
index 55d282561f56c..d0f1337db7112 100644
--- a/tests/perf_bench/bm_chaos.py
+++ b/tests/perf_bench/bm_chaos.py
@@ -15,7 +15,7 @@ def __init__(self, x=0, y=0, z=0):
         self.z = z
 
     def Mag(self):
-        return math.sqrt(self.x ** 2 + self.y ** 2 + self.z ** 2)
+        return math.sqrt(self.x**2 + self.y**2 + self.z**2)
 
     def dist(self, other):
         return math.sqrt(
diff --git a/tests/perf_bench/misc_raytrace.py b/tests/perf_bench/misc_raytrace.py
index b51acaccac235..a729af99c2a11 100644
--- a/tests/perf_bench/misc_raytrace.py
+++ b/tests/perf_bench/misc_raytrace.py
@@ -22,7 +22,7 @@ def __mul__(self, rhs):
         return Vec(self.x * rhs, self.y * rhs, self.z * rhs)
 
     def length(self):
-        return (self.x ** 2 + self.y ** 2 + self.z ** 2) ** 0.5
+        return (self.x**2 + self.y**2 + self.z**2) ** 0.5
 
     def normalise(self):
         l = self.length()
@@ -87,12 +87,12 @@ class Sphere:
     def __init__(self, surface, centre, radius):
         self.surface = surface
         self.centre = centre
-        self.radsq = radius ** 2
+        self.radsq = radius**2
 
     def intersect(self, ray):
         v = self.centre - ray.p
         b = v.dot(ray.d)
-        det = b ** 2 - v.dot(v) + self.radsq
+        det = b**2 - v.dot(v) + self.radsq
         if det > 0:
             det **= 0.5
             t1 = b - det
@@ -180,7 +180,7 @@ def trace_ray(scene, ray, depth):
         if ndotl > 0:
             col += light_col * surf.diffuse * ndotl
         if ldotv > 0:
-            col += light_col * surf.specular * ldotv ** surf.spec_idx
+            col += light_col * surf.specular * ldotv**surf.spec_idx
 
     # Reflections
     if depth > 0 and surf.reflect > 0:
diff --git a/tests/run-perfbench.py b/tests/run-perfbench.py
index bcdbe69abbf90..5f299281fdbc7 100755
--- a/tests/run-perfbench.py
+++ b/tests/run-perfbench.py
@@ -33,8 +33,8 @@ def compute_stats(lst):
         avg += x
         var += x * x
     avg /= len(lst)
-    var = max(0, var / len(lst) - avg ** 2)
-    return avg, var ** 0.5
+    var = max(0, var / len(lst) - avg**2)
+    return avg, var**0.5
 
 
 def run_script_on_target(target, script):
@@ -201,7 +201,7 @@ def compute_diff(file1, file2, diff_score):
             sd1 *= av1 / 100  # convert from percent sd to absolute sd
             sd2 *= av2 / 100  # convert from percent sd to absolute sd
             av_diff = av2 - av1
-            sd_diff = (sd1 ** 2 + sd2 ** 2) ** 0.5
+            sd_diff = (sd1**2 + sd2**2) ** 0.5
             percent = 100 * av_diff / av1
             percent_sd = 100 * sd_diff / av1
             print(

From feeeb5ea3afe801b381eb5d4b310e83290634c46 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 2 Feb 2022 16:14:09 +1100
Subject: [PATCH 1655/3533] top: Update .git-blame-ignore-revs for latest Black
 formatting commits.

Signed-off-by: Damien George <damien@micropython.org>
---
 .git-blame-ignore-revs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index c5039f58b54dc..fbd35fd2c23aa 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -1,3 +1,9 @@
+# all: Update Python formatting to latest Black version 22.1.0.
+ab2923dfa1174dc177f0a90cb00a7e4ff87958d2
+
+# all: Update Python formatting to latest Black version 21.12b0.
+3770fab33449a5dadf8eb06edfae0767e75320a6
+
 # tools/gen-cpydiff.py: Fix formatting of doc strings for new Black.
 0f78c36c5aa458a954eed39a46942209107a553e
 

From 59b60995088ee4a9c0da400633f2096bd365971d Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 2 Feb 2022 20:14:05 +1100
Subject: [PATCH 1656/3533] tools/uf2conv.py: Update to latest version.

Signed-off-by: Damien George <damien@micropython.org>
---
 tools/uf2conv.py       | 129 ++++++++++++++++++++-------
 tools/uf2families.json | 192 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 291 insertions(+), 30 deletions(-)
 mode change 100755 => 100644 tools/uf2conv.py
 create mode 100644 tools/uf2families.json

diff --git a/tools/uf2conv.py b/tools/uf2conv.py
old mode 100755
new mode 100644
index d67a55224c904..d3b1d9a2652a0
--- a/tools/uf2conv.py
+++ b/tools/uf2conv.py
@@ -33,21 +33,13 @@
 import os
 import os.path
 import argparse
+import json
 
 
 UF2_MAGIC_START0 = 0x0A324655  # "UF2\n"
 UF2_MAGIC_START1 = 0x9E5D5157  # Randomly selected
 UF2_MAGIC_END = 0x0AB16F30  # Ditto
 
-families = {
-    "SAMD21": 0x68ED2B88,
-    "SAMD51": 0x55114460,
-    "NRF52": 0x1B57745F,
-    "STM32F1": 0x5EE21072,
-    "STM32F4": 0x57755A57,
-    "ATMEGA32": 0x16573617,
-}
-
 INFO_FILE = "/INFO_UF2.TXT"
 
 appstartaddr = 0x2000
@@ -71,9 +63,14 @@ def is_hex(buf):
 
 def convert_from_uf2(buf):
     global appstartaddr
+    global familyid
     numblocks = len(buf) // 512
     curraddr = None
-    outp = b""
+    currfamilyid = None
+    families_found = {}
+    prev_flag = None
+    all_flags_same = True
+    outp = []
     for blockno in range(numblocks):
         ptr = blockno * 512
         block = buf[ptr : ptr + 512]
@@ -88,9 +85,13 @@ def convert_from_uf2(buf):
         if datalen > 476:
             assert False, "Invalid UF2 data size at " + ptr
         newaddr = hd[3]
-        if curraddr == None:
-            appstartaddr = newaddr
+        if (hd[2] & 0x2000) and (currfamilyid == None):
+            currfamilyid = hd[7]
+        if curraddr == None or ((hd[2] & 0x2000) and hd[7] != currfamilyid):
+            currfamilyid = hd[7]
             curraddr = newaddr
+            if familyid == 0x0 or familyid == hd[7]:
+                appstartaddr = newaddr
         padding = newaddr - curraddr
         if padding < 0:
             assert False, "Block out of order at " + ptr
@@ -101,19 +102,53 @@ def convert_from_uf2(buf):
         while padding > 0:
             padding -= 4
             outp += b"\x00\x00\x00\x00"
-        outp += block[32 : 32 + datalen]
+        if familyid == 0x0 or ((hd[2] & 0x2000) and familyid == hd[7]):
+            outp.append(block[32 : 32 + datalen])
         curraddr = newaddr + datalen
-    return outp
+        if hd[2] & 0x2000:
+            if hd[7] in families_found.keys():
+                if families_found[hd[7]] > newaddr:
+                    families_found[hd[7]] = newaddr
+            else:
+                families_found[hd[7]] = newaddr
+        if prev_flag == None:
+            prev_flag = hd[2]
+        if prev_flag != hd[2]:
+            all_flags_same = False
+        if blockno == (numblocks - 1):
+            print("--- UF2 File Header Info ---")
+            families = load_families()
+            for family_hex in families_found.keys():
+                family_short_name = ""
+                for name, value in families.items():
+                    if value == family_hex:
+                        family_short_name = name
+                print(
+                    "Family ID is {:s}, hex value is 0x{:08x}".format(
+                        family_short_name, family_hex
+                    )
+                )
+                print("Target Address is 0x{:08x}".format(families_found[family_hex]))
+            if all_flags_same:
+                print("All block flag values consistent, 0x{:04x}".format(hd[2]))
+            else:
+                print("Flags were not all the same")
+            print("----------------------------")
+            if len(families_found) > 1 and familyid == 0x0:
+                outp = []
+                appstartaddr = 0x0
+    return b"".join(outp)
 
 
 def convert_to_carray(file_content):
-    outp = "const unsigned char bindata[] __attribute__((aligned(16))) = {"
+    outp = "const unsigned long bindata_len = %d;\n" % len(file_content)
+    outp += "const unsigned char bindata[] __attribute__((aligned(16))) = {"
     for i in range(len(file_content)):
         if i % 16 == 0:
             outp += "\n"
-        outp += "0x%02x, " % ord(file_content[i])
+        outp += "0x%02x, " % file_content[i]
     outp += "\n};\n"
-    return outp
+    return bytes(outp, "utf-8")
 
 
 def convert_to_uf2(file_content):
@@ -122,7 +157,7 @@ def convert_to_uf2(file_content):
     while len(datapadding) < 512 - 256 - 32 - 4:
         datapadding += b"\x00\x00\x00\x00"
     numblocks = (len(file_content) + 255) // 256
-    outp = b""
+    outp = []
     for blockno in range(numblocks):
         ptr = 256 * blockno
         chunk = file_content[ptr : ptr + 256]
@@ -144,8 +179,8 @@ def convert_to_uf2(file_content):
             chunk += b"\x00"
         block = hd + chunk + datapadding + struct.pack(b"<I", UF2_MAGIC_END)
         assert len(block) == 512
-        outp += block
-    return outp
+        outp.append(block)
+    return b"".join(outp)
 
 
 class Block:
@@ -195,11 +230,10 @@ def convert_from_hex_to_uf2(buf):
             upper = ((rec[4] << 8) | rec[5]) << 16
         elif tp == 2:
             upper = ((rec[4] << 8) | rec[5]) << 4
-            assert (upper & 0xFFFF) == 0
         elif tp == 1:
             break
         elif tp == 0:
-            addr = upper | (rec[1] << 8) | rec[2]
+            addr = upper + ((rec[1] << 8) | rec[2])
             if appstartaddr == None:
                 appstartaddr = addr
             i = 4
@@ -217,6 +251,10 @@ def convert_from_hex_to_uf2(buf):
     return resfile
 
 
+def to_str(b):
+    return b.decode("utf-8")
+
+
 def get_drives():
     drives = []
     if sys.platform == "win32":
@@ -232,7 +270,7 @@ def get_drives():
                 "DriveType",
             ]
         )
-        for line in r.split("\n"):
+        for line in to_str(r).split("\n"):
             words = re.split("\s+", line)
             if len(words) >= 3 and words[1] == "2" and words[2] == "FAT":
                 drives.append(words[0])
@@ -270,7 +308,23 @@ def list_drives():
 def write_file(name, buf):
     with open(name, "wb") as f:
         f.write(buf)
-    print("Wrote %d bytes to %s." % (len(buf), name))
+    print("Wrote %d bytes to %s" % (len(buf), name))
+
+
+def load_families():
+    # The expectation is that the `uf2families.json` file is in the same
+    # directory as this script. Make a path that works using `__file__`
+    # which contains the full path to this script.
+    filename = "uf2families.json"
+    pathname = os.path.join(os.path.dirname(os.path.abspath(__file__)), filename)
+    with open(pathname) as f:
+        raw_families = json.load(f)
+
+    families = {}
+    for family in raw_families:
+        families[family["short_name"]] = int(family["id"], 0)
+
+    return families
 
 
 def main():
@@ -303,6 +357,7 @@ def error(msg):
     parser.add_argument("-d", "--device", dest="device_path", help="select a device path to flash")
     parser.add_argument("-l", "--list", action="store_true", help="list connected devices")
     parser.add_argument("-c", "--convert", action="store_true", help="do not flash, just convert")
+    parser.add_argument("-D", "--deploy", action="store_true", help="just flash, do not convert")
     parser.add_argument(
         "-f",
         "--family",
@@ -314,9 +369,17 @@ def error(msg):
     parser.add_argument(
         "-C", "--carray", action="store_true", help="convert binary file to a C array, not UF2"
     )
+    parser.add_argument(
+        "-i",
+        "--info",
+        action="store_true",
+        help="display header information from UF2, do not convert",
+    )
     args = parser.parse_args()
     appstartaddr = int(args.base, 0)
 
+    families = load_families()
+
     if args.family.upper() in families:
         familyid = families[args.family.upper()]
     else:
@@ -334,9 +397,14 @@ def error(msg):
             inpbuf = f.read()
         from_uf2 = is_uf2(inpbuf)
         ext = "uf2"
-        if from_uf2:
+        if args.deploy:
+            outbuf = inpbuf
+        elif from_uf2 and not args.info:
             outbuf = convert_from_uf2(inpbuf)
             ext = "bin"
+        elif from_uf2 and args.info:
+            outbuf = ""
+            convert_from_uf2(inpbuf)
         elif is_hex(inpbuf):
             outbuf = convert_from_hex_to_uf2(inpbuf.decode("utf-8"))
         elif args.carray:
@@ -344,11 +412,12 @@ def error(msg):
             ext = "h"
         else:
             outbuf = convert_to_uf2(inpbuf)
-        print(
-            "Converting to %s, output size: %d, start address: 0x%x"
-            % (ext, len(outbuf), appstartaddr)
-        )
-        if args.convert:
+        if not args.deploy and not args.info:
+            print(
+                "Converted to %s, output size: %d, start address: 0x%x"
+                % (ext, len(outbuf), appstartaddr)
+            )
+        if args.convert or ext != "uf2":
             drives = []
             if args.output == None:
                 args.output = "flash." + ext
diff --git a/tools/uf2families.json b/tools/uf2families.json
new file mode 100644
index 0000000000000..fafae82a60a44
--- /dev/null
+++ b/tools/uf2families.json
@@ -0,0 +1,192 @@
+[
+    {
+        "id": "0x16573617",
+        "short_name": "ATMEGA32",
+        "description": "Microchip (Atmel) ATmega32"
+    },
+    {
+        "id": "0x1851780a",
+        "short_name": "SAML21",
+        "description": "Microchip (Atmel) SAML21"
+    },
+    {
+        "id": "0x1b57745f",
+        "short_name": "NRF52",
+        "description": "Nordic NRF52"
+    },
+    {
+        "id": "0x1c5f21b0",
+        "short_name": "ESP32",
+        "description": "ESP32"
+    },
+    {
+        "id": "0x1e1f432d",
+        "short_name": "STM32L1",
+        "description": "ST STM32L1xx"
+    },
+    {
+        "id": "0x202e3a91",
+        "short_name": "STM32L0",
+        "description": "ST STM32L0xx"
+    },
+    {
+        "id": "0x21460ff0",
+        "short_name": "STM32WL",
+        "description": "ST STM32WLxx"
+    },
+    {
+        "id": "0x2abc77ec",
+        "short_name": "LPC55",
+        "description": "NXP LPC55xx"
+    },
+    {
+        "id": "0x300f5633",
+        "short_name": "STM32G0",
+        "description": "ST STM32G0xx"
+    },
+    {
+        "id": "0x31d228c6",
+        "short_name": "GD32F350",
+        "description": "GD32F350"
+    },
+    {
+        "id": "0x04240bdf",
+        "short_name": "STM32L5",
+        "description": "ST STM32L5xx"
+    },
+    {
+        "id": "0x4c71240a",
+        "short_name": "STM32G4",
+        "description": "ST STM32G4xx"
+    },
+    {
+        "id": "0x4fb2d5bd",
+        "short_name": "MIMXRT10XX",
+        "description": "NXP i.MX RT10XX"
+    },
+    {
+        "id": "0x53b80f00",
+        "short_name": "STM32F7",
+        "description": "ST STM32F7xx"
+    },
+    {
+        "id": "0x55114460",
+        "short_name": "SAMD51",
+        "description": "Microchip (Atmel) SAMD51"
+    },
+    {
+        "id": "0x57755a57",
+        "short_name": "STM32F4",
+        "description": "ST STM32F401"
+    },
+    {
+        "id": "0x5a18069b",
+        "short_name": "FX2",
+        "description": "Cypress FX2"
+    },
+    {
+        "id": "0x5d1a0a2e",
+        "short_name": "STM32F2",
+        "description": "ST STM32F2xx"
+    },
+    {
+        "id": "0x5ee21072",
+        "short_name": "STM32F1",
+        "description": "ST STM32F103"
+    },
+    {
+        "id": "0x621e937a",
+        "short_name": "NRF52833",
+        "description": "Nordic NRF52833"
+    },
+    {
+        "id": "0x647824b6",
+        "short_name": "STM32F0",
+        "description": "ST STM32F0xx"
+    },
+    {
+        "id": "0x68ed2b88",
+        "short_name": "SAMD21",
+        "description": "Microchip (Atmel) SAMD21"
+    },
+    {
+        "id": "0x6b846188",
+        "short_name": "STM32F3",
+        "description": "ST STM32F3xx"
+    },
+    {
+        "id": "0x6d0922fa",
+        "short_name": "STM32F407",
+        "description": "ST STM32F407"
+    },
+    {
+        "id": "0x6db66082",
+        "short_name": "STM32H7",
+        "description": "ST STM32H7xx"
+    },
+    {
+        "id": "0x70d16653",
+        "short_name": "STM32WB",
+        "description": "ST STM32WBxx"
+    },
+    {
+        "id": "0x7eab61ed",
+        "short_name": "ESP8266",
+        "description": "ESP8266"
+    },
+    {
+        "id": "0x7f83e793",
+        "short_name": "KL32L2",
+        "description": "NXP KL32L2x"
+    },
+    {
+        "id": "0x8fb060fe",
+        "short_name": "STM32F407VG",
+        "description": "ST STM32F407VG"
+    },
+    {
+        "id": "0xada52840",
+        "short_name": "NRF52840",
+        "description": "Nordic NRF52840"
+    },
+    {
+        "id": "0xbfdd4eee",
+        "short_name": "ESP32S2",
+        "description": "ESP32-S2"
+    },
+    {
+        "id": "0xc47e5767",
+        "short_name": "ESP32S3",
+        "description": "ESP32-S3"
+    },
+    {
+        "id": "0xd42ba06c",
+        "short_name": "ESP32C3",
+        "description": "ESP32-C3"
+    },
+    {
+        "id": "0x2b88d29c",
+        "short_name": "ESP32C2",
+        "description": "ESP32-C2"
+    },
+    {
+        "id": "0x332726f6",
+        "short_name": "ESP32H2",
+        "description": "ESP32-H2"
+    },
+    {
+        "id": "0xe48bff56",
+        "short_name": "RP2040",
+        "description": "Raspberry Pi RP2040"
+    },
+    {
+        "id": "0x00ff6919",
+        "short_name": "STM32L4",
+        "description": "ST STM32L4xx"
+    },
+    {
+        "id": "0x9af03e33",
+        "short_name": "GD32VF103",
+        "description": "GigaDevice GD32VF103"
+    }
+]

From 71b3ce3aceb25139d3f41af9441ade9d446498bb Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 2 Feb 2022 20:14:37 +1100
Subject: [PATCH 1657/3533] esp32: Create .uf2 binaries for S2 and S3 chips.

The name of the filesystem partition is updated to support "ffat", as used
by TinyUF2.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/Makefile             |  5 +++--
 ports/esp32/makeimg.py           | 31 +++++++++++++++++++++++++++++--
 ports/esp32/modules/flashbdev.py |  3 +++
 3 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/ports/esp32/Makefile b/ports/esp32/Makefile
index 403b698a32335..c8ca9262c8f16 100644
--- a/ports/esp32/Makefile
+++ b/ports/esp32/Makefile
@@ -36,8 +36,9 @@ all:
 		$(BUILD)/sdkconfig \
 		$(BUILD)/bootloader/bootloader.bin \
 		$(BUILD)/partition_table/partition-table.bin \
-    		$(BUILD)/micropython.bin \
-    		$(BUILD)/firmware.bin
+		$(BUILD)/micropython.bin \
+		$(BUILD)/firmware.bin \
+		$(BUILD)/micropython.uf2
 
 $(BUILD)/bootloader/bootloader.bin $(BUILD)/partition_table/partition-table.bin $(BUILD)/micropython.bin: FORCE
 
diff --git a/ports/esp32/makeimg.py b/ports/esp32/makeimg.py
index 0646ce372c531..5964e91d28a6a 100644
--- a/ports/esp32/makeimg.py
+++ b/ports/esp32/makeimg.py
@@ -10,15 +10,29 @@
 OFFSET_PARTITIONS_DEFAULT = 0x8000
 
 
-def load_sdkconfig_hex_value(filename, value, default):
+def load_sdkconfig_value(filename, value, default):
     value = "CONFIG_" + value + "="
     with open(filename, "r") as f:
         for line in f:
             if line.startswith(value):
-                return int(line.split("=", 1)[1], 16)
+                return line.split("=", 1)[1]
     return default
 
 
+def load_sdkconfig_hex_value(filename, value, default):
+    value = load_sdkconfig_value(filename, value, None)
+    if value is None:
+        return default
+    return int(value, 16)
+
+
+def load_sdkconfig_str_value(filename, value, default):
+    value = load_sdkconfig_value(filename, value, None)
+    if value is None:
+        return default
+    return value.strip().strip('"')
+
+
 def load_partition_table(filename):
     with open(filename, "rb") as f:
         return gen_esp32part.PartitionTable.from_binary(f.read())
@@ -30,8 +44,10 @@ def load_partition_table(filename):
 arg_partitions_bin = sys.argv[3]
 arg_application_bin = sys.argv[4]
 arg_output_bin = sys.argv[5]
+arg_output_uf2 = sys.argv[6]
 
 # Load required sdkconfig values.
+idf_target = load_sdkconfig_str_value(arg_sdkconfig, "IDF_TARGET", "").upper()
 offset_bootloader = load_sdkconfig_hex_value(
     arg_sdkconfig, "BOOTLOADER_OFFSET_IN_FLASH", OFFSET_BOOTLOADER_DEFAULT
 )
@@ -85,3 +101,14 @@ def load_partition_table(filename):
                 )
                 sys.exit(1)
     print("%-22s% 8d" % ("total", cur_offset))
+
+# Generate .uf2 file if the SoC has native USB.
+if idf_target in ("ESP32S2", "ESP32S3"):
+    sys.path.append(os.path.join(os.path.dirname(__file__), "../../tools"))
+    import uf2conv
+
+    families = uf2conv.load_families()
+    uf2conv.appstartaddr = 0
+    uf2conv.familyid = families[idf_target]
+    with open(arg_application_bin, "rb") as fin, open(arg_output_uf2, "wb") as fout:
+        fout.write(uf2conv.convert_to_uf2(fin.read()))
diff --git a/ports/esp32/modules/flashbdev.py b/ports/esp32/modules/flashbdev.py
index bf4fec9f38343..c3f75c7a7e8e1 100644
--- a/ports/esp32/modules/flashbdev.py
+++ b/ports/esp32/modules/flashbdev.py
@@ -1,4 +1,7 @@
 from esp32 import Partition
 
+# MicroPython's partition table uses "vfs", TinyUF2 uses "ffat".
 bdev = Partition.find(Partition.TYPE_DATA, label="vfs")
+if not bdev:
+    bdev = Partition.find(Partition.TYPE_DATA, label="ffat")
 bdev = bdev[0] if bdev else None

From 102cc12dbbe10c3caf3e1e141be4ab4366dbd02f Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 2 Feb 2022 20:15:51 +1100
Subject: [PATCH 1658/3533] tools/autobuild: Provide .uf2 images for esp32
 builds when available.

Signed-off-by: Damien George <damien@micropython.org>
---
 tools/autobuild/build-boards.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/autobuild/build-boards.sh b/tools/autobuild/build-boards.sh
index 4b5259b667ab6..c6493f8fc1684 100755
--- a/tools/autobuild/build-boards.sh
+++ b/tools/autobuild/build-boards.sh
@@ -30,8 +30,8 @@ function build_board {
             dest=$dest_dir/$descr$fw_tag.$ext
             if [ -r $build_dir/firmware.$ext ]; then
                 mv $build_dir/firmware.$ext $dest
-            else
-                # esp32 has micropython.elf and micropython.map
+            elif [ -r $build_dir/micropython.$ext ]; then
+                # esp32 has micropython.elf, etc
                 mv $build_dir/micropython.$ext $dest
             fi
         done
@@ -93,7 +93,7 @@ function build_esp32_boards {
         else
             if [ $mcu != esp32 ]; then
                 # build esp32-s2/s3/c3 based boards with IDF v4.4+
-                build_board $board_json $fw_tag $dest_dir bin elf map
+                build_board $board_json $fw_tag $dest_dir bin elf map uf2
             fi
         fi
     done

From fbd47fc46cce80abfc59e680600666473a1868da Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 2 Feb 2022 16:04:00 +1100
Subject: [PATCH 1659/3533] ports: Consolidate inclusion of umachine module in
 built-ins.

The inclusion of `umachine` in the list of built-in modules is now done
centrally in py/objmodule.c.  Enabling MICROPY_PY_MACHINE will include this
module.

As part of this, all ports now have `umachine` as the core module name
(previously some had only `machine` as the name).

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/cc3200/mods/modmachine.c         | 2 +-
 ports/cc3200/mpconfigport.h            | 4 +---
 ports/esp32/mpconfigport.h             | 2 --
 ports/esp8266/mpconfigport.h           | 2 --
 ports/mimxrt/mpconfigport.h            | 2 --
 ports/nrf/modules/machine/modmachine.c | 2 +-
 ports/nrf/mpconfigport.h               | 5 +----
 ports/qemu-arm/mpconfigport.h          | 1 -
 ports/rp2/mpconfigport.h               | 2 --
 ports/samd/mpconfigport.h              | 2 --
 ports/stm32/modmachine.c               | 2 +-
 ports/stm32/mpconfigport.h             | 9 +++------
 ports/unix/mpconfigport.h              | 2 --
 ports/windows/mpconfigport.h           | 1 -
 ports/zephyr/mpconfigport.h            | 2 --
 py/objmodule.c                         | 3 +++
 16 files changed, 11 insertions(+), 32 deletions(-)

diff --git a/ports/cc3200/mods/modmachine.c b/ports/cc3200/mods/modmachine.c
index 89800810c7d1b..ee76d6e51658e 100644
--- a/ports/cc3200/mods/modmachine.c
+++ b/ports/cc3200/mods/modmachine.c
@@ -209,7 +209,7 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
 
 STATIC MP_DEFINE_CONST_DICT(machine_module_globals, machine_module_globals_table);
 
-const mp_obj_module_t machine_module = {
+const mp_obj_module_t mp_module_machine = {
     .base = { &mp_type_module },
     .globals = (mp_obj_dict_t*)&machine_module_globals,
 };
diff --git a/ports/cc3200/mpconfigport.h b/ports/cc3200/mpconfigport.h
index 345b64fe40796..28192e9b3ead9 100644
--- a/ports/cc3200/mpconfigport.h
+++ b/ports/cc3200/mpconfigport.h
@@ -145,7 +145,6 @@
     { MP_ROM_QSTR(MP_QSTR_open),  MP_ROM_PTR(&mp_builtin_open_obj) },   \
 
 // extra built in modules to add to the list of known ones
-extern const struct _mp_obj_module_t machine_module;
 extern const struct _mp_obj_module_t wipy_module;
 extern const struct _mp_obj_module_t mp_module_ure;
 extern const struct _mp_obj_module_t mp_module_ujson;
@@ -158,7 +157,6 @@ extern const struct _mp_obj_module_t mp_module_ubinascii;
 extern const struct _mp_obj_module_t mp_module_ussl;
 
 #define MICROPY_PORT_BUILTIN_MODULES \
-    { MP_ROM_QSTR(MP_QSTR_umachine),    MP_ROM_PTR(&machine_module) },      \
     { MP_ROM_QSTR(MP_QSTR_wipy),        MP_ROM_PTR(&wipy_module) },         \
     { MP_ROM_QSTR(MP_QSTR_uos),         MP_ROM_PTR(&mp_module_uos) },       \
     { MP_ROM_QSTR(MP_QSTR_utime),       MP_ROM_PTR(&mp_module_utime) },     \
@@ -170,7 +168,7 @@ extern const struct _mp_obj_module_t mp_module_ussl;
 
 // extra constants
 #define MICROPY_PORT_CONSTANTS \
-    { MP_ROM_QSTR(MP_QSTR_umachine),     MP_ROM_PTR(&machine_module) },      \
+    { MP_ROM_QSTR(MP_QSTR_umachine),     MP_ROM_PTR(&mp_module_machine) },  \
 
 // vm state and root pointers for the gc
 #define MP_STATE_PORT MP_STATE_VM
diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h
index dc6bc2e53bc7c..c457a5743bc57 100644
--- a/ports/esp32/mpconfigport.h
+++ b/ports/esp32/mpconfigport.h
@@ -224,7 +224,6 @@ extern const struct _mp_obj_module_t esp32_module;
 extern const struct _mp_obj_module_t utime_module;
 extern const struct _mp_obj_module_t uos_module;
 extern const struct _mp_obj_module_t mp_module_usocket;
-extern const struct _mp_obj_module_t mp_module_machine;
 extern const struct _mp_obj_module_t mp_module_network;
 extern const struct _mp_obj_module_t mp_module_onewire;
 
@@ -234,7 +233,6 @@ extern const struct _mp_obj_module_t mp_module_onewire;
     { MP_OBJ_NEW_QSTR(MP_QSTR_utime), (mp_obj_t)&utime_module }, \
     { MP_OBJ_NEW_QSTR(MP_QSTR_uos), (mp_obj_t)&uos_module }, \
     { MP_OBJ_NEW_QSTR(MP_QSTR_usocket), (mp_obj_t)&mp_module_usocket }, \
-    { MP_OBJ_NEW_QSTR(MP_QSTR_machine), (mp_obj_t)&mp_module_machine }, \
     { MP_OBJ_NEW_QSTR(MP_QSTR_network), (mp_obj_t)&mp_module_network }, \
     { MP_OBJ_NEW_QSTR(MP_QSTR__onewire), (mp_obj_t)&mp_module_onewire }, \
 
diff --git a/ports/esp8266/mpconfigport.h b/ports/esp8266/mpconfigport.h
index 7d6d0a34c3326..49c53a46718c4 100644
--- a/ports/esp8266/mpconfigport.h
+++ b/ports/esp8266/mpconfigport.h
@@ -174,7 +174,6 @@ extern const struct _mp_obj_module_t network_module;
 extern const struct _mp_obj_module_t utime_module;
 extern const struct _mp_obj_module_t uos_module;
 extern const struct _mp_obj_module_t mp_module_lwip;
-extern const struct _mp_obj_module_t mp_module_machine;
 extern const struct _mp_obj_module_t mp_module_onewire;
 
 #define MICROPY_PORT_BUILTIN_MODULES \
@@ -183,7 +182,6 @@ extern const struct _mp_obj_module_t mp_module_onewire;
     { MP_ROM_QSTR(MP_QSTR_network), MP_ROM_PTR(&network_module) }, \
     { MP_ROM_QSTR(MP_QSTR_utime), MP_ROM_PTR(&utime_module) }, \
     { MP_ROM_QSTR(MP_QSTR_uos), MP_ROM_PTR(&uos_module) }, \
-    { MP_ROM_QSTR(MP_QSTR_machine), MP_ROM_PTR(&mp_module_machine) }, \
     { MP_ROM_QSTR(MP_QSTR__onewire), MP_ROM_PTR(&mp_module_onewire) }, \
 
 #define MP_STATE_PORT MP_STATE_VM
diff --git a/ports/mimxrt/mpconfigport.h b/ports/mimxrt/mpconfigport.h
index e650579e69dcf..4462a18a617b4 100644
--- a/ports/mimxrt/mpconfigport.h
+++ b/ports/mimxrt/mpconfigport.h
@@ -217,7 +217,6 @@ static inline void restore_irq_pri(uint32_t basepri) {
 #define MICROPY_PORT_BUILTINS \
     { MP_ROM_QSTR(MP_QSTR_open), MP_ROM_PTR(&mp_builtin_open_obj) },
 
-extern const struct _mp_obj_module_t mp_module_machine;
 extern const struct _mp_obj_module_t mp_module_mimxrt;
 extern const struct _mp_obj_module_t mp_module_onewire;
 extern const struct _mp_obj_module_t mp_module_uos;
@@ -256,7 +255,6 @@ extern const struct _mp_obj_type_t network_lan_type;
 #endif
 
 #define MICROPY_PORT_BUILTIN_MODULES \
-    { MP_ROM_QSTR(MP_QSTR_machine), MP_ROM_PTR(&mp_module_machine) }, \
     { MP_ROM_QSTR(MP_QSTR_mimxrt), (mp_obj_t)&mp_module_mimxrt }, \
     { MP_ROM_QSTR(MP_QSTR_uos), MP_ROM_PTR(&mp_module_uos) }, \
     { MP_ROM_QSTR(MP_QSTR_utime), MP_ROM_PTR(&mp_module_utime) }, \
diff --git a/ports/nrf/modules/machine/modmachine.c b/ports/nrf/modules/machine/modmachine.c
index fb3267e0dbaf3..3d4cda8e45e72 100644
--- a/ports/nrf/modules/machine/modmachine.c
+++ b/ports/nrf/modules/machine/modmachine.c
@@ -244,7 +244,7 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
 
 STATIC MP_DEFINE_CONST_DICT(machine_module_globals, machine_module_globals_table);
 
-const mp_obj_module_t machine_module = {
+const mp_obj_module_t mp_module_machine = {
     .base = { &mp_type_module },
     .globals = (mp_obj_dict_t*)&machine_module_globals,
 };
diff --git a/ports/nrf/mpconfigport.h b/ports/nrf/mpconfigport.h
index 3ffb092c61b3b..7a6e282e86f36 100644
--- a/ports/nrf/mpconfigport.h
+++ b/ports/nrf/mpconfigport.h
@@ -220,7 +220,6 @@ typedef long mp_off_t;
 
 // extra built in modules to add to the list of known ones
 extern const struct _mp_obj_module_t board_module;
-extern const struct _mp_obj_module_t machine_module;
 extern const struct _mp_obj_module_t nrf_module;
 extern const struct _mp_obj_module_t mp_module_utime;
 extern const struct _mp_obj_module_t mp_module_uos;
@@ -263,7 +262,6 @@ extern const struct _mp_obj_module_t ble_module;
 
 #define MICROPY_PORT_BUILTIN_MODULES \
     { MP_ROM_QSTR(MP_QSTR_board), MP_ROM_PTR(&board_module) }, \
-    { MP_ROM_QSTR(MP_QSTR_machine), MP_ROM_PTR(&machine_module) }, \
     { MP_ROM_QSTR(MP_QSTR_utime), MP_ROM_PTR(&mp_module_utime) }, \
     { MP_ROM_QSTR(MP_QSTR_time), MP_ROM_PTR(&mp_module_utime) }, \
     { MP_ROM_QSTR(MP_QSTR_uos), MP_ROM_PTR(&mp_module_uos) }, \
@@ -278,7 +276,6 @@ extern const struct _mp_obj_module_t ble_module;
 extern const struct _mp_obj_module_t ble_module;
 #define MICROPY_PORT_BUILTIN_MODULES \
     { MP_ROM_QSTR(MP_QSTR_board), MP_ROM_PTR(&board_module) }, \
-    { MP_ROM_QSTR(MP_QSTR_machine), MP_ROM_PTR(&machine_module) }, \
     { MP_ROM_QSTR(MP_QSTR_utime), MP_ROM_PTR(&mp_module_utime) }, \
     { MP_ROM_QSTR(MP_QSTR_uos), MP_ROM_PTR(&mp_module_uos) }, \
     MUSIC_MODULE \
@@ -296,7 +293,7 @@ extern const struct _mp_obj_module_t ble_module;
 // extra constants
 #define MICROPY_PORT_CONSTANTS \
     { MP_ROM_QSTR(MP_QSTR_board), MP_ROM_PTR(&board_module) }, \
-    { MP_ROM_QSTR(MP_QSTR_machine), MP_ROM_PTR(&machine_module) }, \
+    { MP_ROM_QSTR(MP_QSTR_machine), MP_ROM_PTR(&mp_module_machine) }, \
     BLE_MODULE \
 
 #define MP_STATE_PORT MP_STATE_VM
diff --git a/ports/qemu-arm/mpconfigport.h b/ports/qemu-arm/mpconfigport.h
index 270995979c0a7..6bfea74ea0add 100644
--- a/ports/qemu-arm/mpconfigport.h
+++ b/ports/qemu-arm/mpconfigport.h
@@ -68,7 +68,6 @@ extern const struct _mp_obj_module_t mp_module_uos;
 
 #define MICROPY_PORT_BUILTIN_MODULES \
     { MP_ROM_QSTR(MP_QSTR_uos), MP_ROM_PTR(&mp_module_uos) }, \
-    { MP_ROM_QSTR(MP_QSTR_umachine), MP_ROM_PTR(&mp_module_machine) }, \
 
 // We need to provide a declaration/definition of alloca()
 #include <alloca.h>
diff --git a/ports/rp2/mpconfigport.h b/ports/rp2/mpconfigport.h
index 63d9818e3197f..1ff9d5b511ed1 100644
--- a/ports/rp2/mpconfigport.h
+++ b/ports/rp2/mpconfigport.h
@@ -121,7 +121,6 @@
 #define MICROPY_PORT_BUILTINS \
     { MP_ROM_QSTR(MP_QSTR_open), MP_ROM_PTR(&mp_builtin_open_obj) },
 
-extern const struct _mp_obj_module_t mp_module_machine;
 extern const struct _mp_obj_module_t mp_module_network;
 extern const struct _mp_obj_module_t mp_module_onewire;
 extern const struct _mp_obj_module_t mp_module_rp2;
@@ -171,7 +170,6 @@ extern const struct _mod_network_nic_type_t mod_network_nic_type_nina;
 #endif
 
 #define MICROPY_PORT_BUILTIN_MODULES \
-    { MP_OBJ_NEW_QSTR(MP_QSTR_machine), (mp_obj_t)&mp_module_machine }, \
     { MP_OBJ_NEW_QSTR(MP_QSTR__onewire), (mp_obj_t)&mp_module_onewire }, \
     { MP_OBJ_NEW_QSTR(MP_QSTR__rp2), (mp_obj_t)&mp_module_rp2 }, \
     { MP_ROM_QSTR(MP_QSTR_uos), MP_ROM_PTR(&mp_module_uos) }, \
diff --git a/ports/samd/mpconfigport.h b/ports/samd/mpconfigport.h
index 645f16b3f7d65..54018f111e517 100644
--- a/ports/samd/mpconfigport.h
+++ b/ports/samd/mpconfigport.h
@@ -108,12 +108,10 @@
 #define MICROPY_PORT_BUILTINS \
     { MP_ROM_QSTR(MP_QSTR_open), MP_ROM_PTR(&mp_builtin_open_obj) },
 
-extern const struct _mp_obj_module_t mp_module_machine;
 extern const struct _mp_obj_module_t mp_module_samd;
 extern const struct _mp_obj_module_t mp_module_utime;
 
 #define MICROPY_PORT_BUILTIN_MODULES \
-    { MP_ROM_QSTR(MP_QSTR_machine), MP_ROM_PTR(&mp_module_machine) }, \
     { MP_ROM_QSTR(MP_QSTR_samd), MP_ROM_PTR(&mp_module_samd) }, \
     { MP_ROM_QSTR(MP_QSTR_utime), MP_ROM_PTR(&mp_module_utime) }, \
 
diff --git a/ports/stm32/modmachine.c b/ports/stm32/modmachine.c
index 9b215c75cd986..f9026bc37009b 100644
--- a/ports/stm32/modmachine.c
+++ b/ports/stm32/modmachine.c
@@ -464,7 +464,7 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
 
 STATIC MP_DEFINE_CONST_DICT(machine_module_globals, machine_module_globals_table);
 
-const mp_obj_module_t machine_module = {
+const mp_obj_module_t mp_module_machine = {
     .base = { &mp_type_module },
     .globals = (mp_obj_dict_t *)&machine_module_globals,
 };
diff --git a/ports/stm32/mpconfigport.h b/ports/stm32/mpconfigport.h
index 6bca5dfd92bc3..3cca8f192596a 100644
--- a/ports/stm32/mpconfigport.h
+++ b/ports/stm32/mpconfigport.h
@@ -169,7 +169,6 @@
     { MP_ROM_QSTR(MP_QSTR_open), MP_ROM_PTR(&mp_builtin_open_obj) },
 
 // extra built in modules to add to the list of known ones
-extern const struct _mp_obj_module_t machine_module;
 extern const struct _mp_obj_module_t pyb_module;
 extern const struct _mp_obj_module_t stm_module;
 extern const struct _mp_obj_module_t mp_module_ubinascii;
@@ -197,10 +196,10 @@ extern const struct _mp_obj_module_t mp_module_onewire;
 #endif
 
 #if MICROPY_PY_MACHINE
-#define MACHINE_BUILTIN_MODULE              { MP_ROM_QSTR(MP_QSTR_umachine), MP_ROM_PTR(&machine_module) },
-#define MACHINE_BUILTIN_MODULE_CONSTANTS    { MP_ROM_QSTR(MP_QSTR_machine), MP_ROM_PTR(&machine_module) },
+#define MACHINE_BUILTIN_MODULE_CONSTANTS \
+    { MP_ROM_QSTR(MP_QSTR_umachine), MP_ROM_PTR(&mp_module_machine) }, \
+    { MP_ROM_QSTR(MP_QSTR_machine), MP_ROM_PTR(&mp_module_machine) },
 #else
-#define MACHINE_BUILTIN_MODULE
 #define MACHINE_BUILTIN_MODULE_CONSTANTS
 #endif
 
@@ -272,7 +271,6 @@ extern const struct _mod_network_nic_type_t mod_network_nic_type_cc3k;
 #endif
 
 #define MICROPY_PORT_BUILTIN_MODULES \
-    MACHINE_BUILTIN_MODULE \
     PYB_BUILTIN_MODULE \
     STM_BUILTIN_MODULE \
     UOS_BUILTIN_MODULE \
@@ -283,7 +281,6 @@ extern const struct _mod_network_nic_type_t mod_network_nic_type_cc3k;
 
 // extra constants
 #define MICROPY_PORT_CONSTANTS \
-    MACHINE_BUILTIN_MODULE \
     MACHINE_BUILTIN_MODULE_CONSTANTS \
     PYB_BUILTIN_MODULE \
     STM_BUILTIN_MODULE \
diff --git a/ports/unix/mpconfigport.h b/ports/unix/mpconfigport.h
index 658cb680f1473..d54d0b3ef3dd7 100644
--- a/ports/unix/mpconfigport.h
+++ b/ports/unix/mpconfigport.h
@@ -204,7 +204,6 @@ extern const struct _mp_print_t mp_stderr_print;
 #define mp_type_fileio mp_type_vfs_posix_fileio
 #define mp_type_textio mp_type_vfs_posix_textio
 
-extern const struct _mp_obj_module_t mp_module_machine;
 extern const struct _mp_obj_module_t mp_module_os;
 extern const struct _mp_obj_module_t mp_module_uos_vfs;
 extern const struct _mp_obj_module_t mp_module_uselect;
@@ -255,7 +254,6 @@ extern const struct _mp_obj_module_t mp_module_jni;
     MICROPY_PY_JNI_DEF \
     MICROPY_PY_UTIME_DEF \
     MICROPY_PY_SOCKET_DEF \
-    { MP_ROM_QSTR(MP_QSTR_umachine), MP_ROM_PTR(&mp_module_machine) }, \
     MICROPY_PY_UOS_DEF \
     MICROPY_PY_USELECT_DEF \
     MICROPY_PY_TERMIOS_DEF \
diff --git a/ports/windows/mpconfigport.h b/ports/windows/mpconfigport.h
index 88746744aeb9a..d589dac7a7388 100644
--- a/ports/windows/mpconfigport.h
+++ b/ports/windows/mpconfigport.h
@@ -207,7 +207,6 @@ extern const struct _mp_obj_module_t mp_module_os;
 extern const struct _mp_obj_module_t mp_module_time;
 #define MICROPY_PORT_BUILTIN_MODULES \
     { MP_ROM_QSTR(MP_QSTR_utime), MP_ROM_PTR(&mp_module_time) }, \
-    { MP_ROM_QSTR(MP_QSTR_umachine), MP_ROM_PTR(&mp_module_machine) }, \
     { MP_ROM_QSTR(MP_QSTR_uos), MP_ROM_PTR(&mp_module_os) }, \
 
 #if MICROPY_USE_READLINE == 1
diff --git a/ports/zephyr/mpconfigport.h b/ports/zephyr/mpconfigport.h
index 501c39a1bb12f..b8e25faefd869 100644
--- a/ports/zephyr/mpconfigport.h
+++ b/ports/zephyr/mpconfigport.h
@@ -138,7 +138,6 @@ typedef long mp_off_t;
     void *machine_pin_irq_list; /* Linked list of pin irq objects */ \
     struct _mp_bluetooth_zephyr_root_pointers_t *bluetooth_zephyr_root_pointers;
 
-extern const struct _mp_obj_module_t mp_module_machine;
 extern const struct _mp_obj_module_t mp_module_time;
 extern const struct _mp_obj_module_t mp_module_uos;
 extern const struct _mp_obj_module_t mp_module_usocket;
@@ -176,7 +175,6 @@ extern const struct _mp_obj_module_t mp_module_zsensor;
 #endif
 
 #define MICROPY_PORT_BUILTIN_MODULES \
-    { MP_ROM_QSTR(MP_QSTR_machine), MP_ROM_PTR(&mp_module_machine) }, \
     MICROPY_PY_UOS_DEF \
     MICROPY_PY_USOCKET_DEF \
     MICROPY_PY_UTIME_DEF \
diff --git a/py/objmodule.c b/py/objmodule.c
index 6b06740e4dabd..9be4bad92c05e 100644
--- a/py/objmodule.c
+++ b/py/objmodule.c
@@ -219,6 +219,9 @@ STATIC const mp_rom_map_elem_t mp_builtin_module_table[] = {
     #if MICROPY_PY_LWIP
     { MP_ROM_QSTR(MP_QSTR_lwip), MP_ROM_PTR(&mp_module_lwip) },
     #endif
+    #if MICROPY_PY_MACHINE
+    { MP_ROM_QSTR(MP_QSTR_umachine), MP_ROM_PTR(&mp_module_machine) },
+    #endif
     #if MICROPY_PY_UWEBSOCKET
     { MP_ROM_QSTR(MP_QSTR_uwebsocket), MP_ROM_PTR(&mp_module_uwebsocket) },
     #endif

From b8d55d4c52145e3ef2abf692a01a3ffce3ee78d0 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 3 Feb 2022 13:20:22 +1100
Subject: [PATCH 1660/3533] stm32/mboot: Allow HSI to be used as the main clock
 source.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/mboot/main.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/ports/stm32/mboot/main.c b/ports/stm32/mboot/main.c
index ae409168b9666..d62224b1a6d06 100644
--- a/ports/stm32/mboot/main.c
+++ b/ports/stm32/mboot/main.c
@@ -80,7 +80,7 @@
 #undef MICROPY_HW_CLK_PLLP
 #undef MICROPY_HW_CLK_PLLQ
 #undef MICROPY_HW_CLK_PLLR
-#define MICROPY_HW_CLK_PLLM (HSE_VALUE / 1000000)
+#define MICROPY_HW_CLK_PLLM (MICROPY_HW_CLK_VALUE / 1000000)
 #define MICROPY_HW_CLK_PLLN (192)
 #define MICROPY_HW_CLK_PLLP (MICROPY_HW_CLK_PLLN / (CORE_PLL_FREQ / 1000000))
 #define MICROPY_HW_CLK_PLLQ (4)
@@ -184,10 +184,12 @@ void SystemClock_Config(void) {
     // Reduce power consumption
     __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1);
 
+    #if !MICROPY_HW_CLK_USE_HSI
     // Turn HSE on
     __HAL_RCC_HSE_CONFIG(RCC_HSE_ON);
     while (__HAL_RCC_GET_FLAG(RCC_FLAG_HSERDY) == RESET) {
     }
+    #endif
 
     // Disable PLL
     __HAL_RCC_PLL_DISABLE();
@@ -196,7 +198,11 @@ void SystemClock_Config(void) {
 
     // Configure PLL factors and source
     RCC->PLLCFGR =
+        #if MICROPY_HW_CLK_USE_HSI
+        0 << RCC_PLLCFGR_PLLSRC_Pos // HSI selected as PLL source
+        #else
         1 << RCC_PLLCFGR_PLLSRC_Pos // HSE selected as PLL source
+        #endif
         | MICROPY_HW_CLK_PLLM << RCC_PLLCFGR_PLLM_Pos
         | MICROPY_HW_CLK_PLLN << RCC_PLLCFGR_PLLN_Pos
         | ((MICROPY_HW_CLK_PLLP >> 1) - 1) << RCC_PLLCFGR_PLLP_Pos

From 4f918f4b26ec2c949f6832b972cdab80506b7038 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 3 Feb 2022 13:20:51 +1100
Subject: [PATCH 1661/3533] stm32/mboot: Add MBOOT_BOARD_ENTRY_INIT for a board
 to add entry code.

Also change the signature of stm32_main to uint32_t, which is what it
should be.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/mboot/main.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/ports/stm32/mboot/main.c b/ports/stm32/mboot/main.c
index d62224b1a6d06..abde92de1b34f 100644
--- a/ports/stm32/mboot/main.c
+++ b/ports/stm32/mboot/main.c
@@ -1439,7 +1439,7 @@ static void leave_bootloader(void) {
 extern PCD_HandleTypeDef pcd_fs_handle;
 extern PCD_HandleTypeDef pcd_hs_handle;
 
-void stm32_main(int initial_r0) {
+void stm32_main(uint32_t initial_r0) {
     #if defined(STM32H7)
     // Configure write-once power options, and wait for voltage levels to be ready
     PWR->CR3 = PWR_CR3_LDOEN;
@@ -1524,6 +1524,10 @@ void stm32_main(int initial_r0) {
     __ASM volatile ("msr basepri_max, %0" : : "r" (pri) : "memory");
     #endif
 
+    #if defined(MBOOT_BOARD_ENTRY_INIT)
+    MBOOT_BOARD_ENTRY_INIT(initial_r0);
+    #endif
+
     #if defined(MBOOT_SPIFLASH_ADDR)
     MBOOT_SPIFLASH_SPIFLASH->config = MBOOT_SPIFLASH_CONFIG;
     mp_spiflash_init(MBOOT_SPIFLASH_SPIFLASH);

From 26faf74d52e3e953c9ddbcd800a2f9e117477ce7 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 3 Feb 2022 13:21:57 +1100
Subject: [PATCH 1662/3533] stm32/mboot: Add support for F469/479 MCUs in
 fwupdate.py.

And don't assert on the sector number in sector_erase, so it can support
erasing arbitrary sectors.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/mboot/fwupdate.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/stm32/mboot/fwupdate.py b/ports/stm32/mboot/fwupdate.py
index 3b8dc51e1c485..0e7ea014189d1 100644
--- a/ports/stm32/mboot/fwupdate.py
+++ b/ports/stm32/mboot/fwupdate.py
@@ -105,10 +105,11 @@ def __init__(self):
             dev_id = 0
 
         # Configure flash parameters based on MCU.
-        if dev_id in (0x413, 0x419, 0x431, 0x451, 0x452):
+        if dev_id in (0x413, 0x419, 0x431, 0x434, 0x451, 0x452):
             # 0x413: STM32F405/407, STM32F415/417
             # 0x419: STM32F42x/43x
             # 0x431: STM32F411
+            # 0x434: STM32F469/479
             # 0x451: STM32F76x/77x
             # 0x452: STM32F72x/73x
             self._keyr = stm.FLASH + stm.FLASH_KEYR
@@ -155,7 +156,6 @@ def lock(self):
         stm.mem32[self._cr] = self._cr_lock
 
     def erase_sector(self, sector):
-        assert 0 <= sector <= 7
         self.wait_not_busy()
         stm.mem32[self._cr] = self._cr_init_erase(sector)
         stm.mem32[self._cr] |= self._cr_start_erase

From e4f59a00201b31903b11a6d30dddedc1457ed2ff Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 4 Feb 2022 08:30:39 +1100
Subject: [PATCH 1663/3533] stm32/rtc: Use LL_RTC functions to simplify some
 MCU-specific code.

This also fixes a possible race condition when exiting initialisation mode:
reading then writing to ISR (via ISR &= ~RTC_ISR_INIT) will clear any flags
that were set by the hardware between the read and the write.  The correct
way to clear just the INIT bit is to just do a single write via ISR =
~RTC_ISR_INIT, which will not clear any other flags (they must be written
to 0 to clear), and that is exactly what LL_RTC_DisableInitMode does.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/rtc.c | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/ports/stm32/rtc.c b/ports/stm32/rtc.c
index 2d6459e239531..1164e71e08822 100644
--- a/ports/stm32/rtc.c
+++ b/ports/stm32/rtc.c
@@ -339,11 +339,7 @@ STATIC HAL_StatusTypeDef PYB_RTC_Init(RTC_HandleTypeDef *hrtc) {
         hrtc->Instance->PRER |= (uint32_t)(hrtc->Init.AsynchPrediv << 16);
 
         // Exit Initialization mode
-        #if defined(STM32G4) || defined(STM32H7A3xx) || defined(STM32H7A3xxQ) || defined(STM32H7B3xx) || defined(STM32H7B3xxQ)
-        hrtc->Instance->ICSR &= (uint32_t) ~RTC_ICSR_INIT;
-        #else
-        hrtc->Instance->ISR &= (uint32_t) ~RTC_ISR_INIT;
-        #endif
+        LL_RTC_DisableInitMode(hrtc->Instance);
 
         #if defined(STM32H7A3xx) || defined(STM32H7A3xxQ) || defined(STM32H7B3xx) || defined(STM32H7B3xxQ)
         // do nothing
@@ -702,13 +698,8 @@ mp_obj_t pyb_rtc_wakeup(size_t n_args, const mp_obj_t *args) {
     RTC->CR &= ~RTC_CR_WUTE;
 
     // wait until WUTWF is set
-    #if defined(STM32G4) || defined(STM32H7A3xx) || defined(STM32H7A3xxQ) || defined(STM32H7B3xx) || defined(STM32H7B3xxQ)
-    while (!(RTC->ICSR & RTC_ICSR_WUTWF)) {
+    while (!LL_RTC_IsActiveFlag_WUTW(RTC)) {
     }
-    #else
-    while (!(RTC->ISR & RTC_ISR_WUTWF)) {
-    }
-    #endif
 
     if (enable) {
         // program WUT

From 9127e6370819b32552caedd0184f206e1b9c9285 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 22 Feb 2021 11:54:31 +1100
Subject: [PATCH 1664/3533] stm32/Makefile: Make stm32lib configurable.

The default stm32lib remains lib/stm32lib, but it can now be easily
overriden at build time by specifying STM32LIB_DIR, or STM32LIB_CMSIS_DIR
and STM32LIB_HAL_DIR.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/Makefile                          | 68 +++++--------------
 .../stm32/boards/NUCLEO_WB55/mpconfigboard.mk |  2 +-
 .../boards/USBDONGLE_WB55/mpconfigboard.mk    |  2 +-
 ports/stm32/mboot/Makefile                    | 27 ++------
 ports/stm32/stm32.mk                          | 68 +++++++++++++++++++
 5 files changed, 93 insertions(+), 74 deletions(-)
 create mode 100644 ports/stm32/stm32.mk

diff --git a/ports/stm32/Makefile b/ports/stm32/Makefile
index c2581c100b7ec..4c90c6f1ef491 100644
--- a/ports/stm32/Makefile
+++ b/ports/stm32/Makefile
@@ -36,12 +36,7 @@ include $(TOP)/py/py.mk
 
 GIT_SUBMODULES += lib/libhydrogen lib/lwip lib/mbedtls lib/stm32lib
 
-MCU_SERIES_UPPER = $(shell echo $(MCU_SERIES) | tr '[:lower:]' '[:upper:]')
-CMSIS_MCU_LOWER = $(shell echo $(CMSIS_MCU) | tr '[:upper:]' '[:lower:]')
-
 LD_DIR=boards
-CMSIS_DIR=$(TOP)/lib/stm32lib/CMSIS/STM32$(MCU_SERIES_UPPER)xx/Include
-HAL_DIR=lib/stm32lib/STM32$(MCU_SERIES_UPPER)xx_HAL_Driver
 USBDEV_DIR=usbdev
 #USBHOST_DIR=usbhost
 DFU=$(TOP)/tools/dfu.py
@@ -55,8 +50,8 @@ BOOTLOADER_DFU_USB_PID ?= 0xDF11
 STFLASH ?= st-flash
 OPENOCD ?= openocd
 OPENOCD_CONFIG ?= boards/openocd_stm32f4.cfg
-STARTUP_FILE ?= lib/stm32lib/CMSIS/STM32$(MCU_SERIES_UPPER)xx/Source/Templates/gcc/startup_$(CMSIS_MCU_LOWER).o
-SYSTEM_FILE ?= lib/stm32lib/CMSIS/STM32$(MCU_SERIES_UPPER)xx/Source/Templates/system_stm32$(MCU_SERIES)xx.o
+
+include stm32.mk
 
 # Select the cross compile prefix
 CROSS_COMPILE ?= arm-none-eabi-
@@ -65,41 +60,12 @@ INC += -I.
 INC += -I$(TOP)
 INC += -I$(BUILD)
 INC += -I$(TOP)/lib/cmsis/inc
-INC += -I$(CMSIS_DIR)/
-INC += -I$(TOP)/$(HAL_DIR)/Inc
+INC += -I$(STM32LIB_CMSIS_ABS)/Include
+INC += -I$(STM32LIB_HAL_ABS)/Inc
 INC += -I$(USBDEV_DIR)/core/inc -I$(USBDEV_DIR)/class/inc
 #INC += -I$(USBHOST_DIR)
 INC += -Ilwip_inc
 
-# Basic Cortex-M flags
-CFLAGS_CORTEX_M = -mthumb
-
-# Select hardware floating-point support
-SUPPORTS_HARDWARE_FP_SINGLE = 0
-SUPPORTS_HARDWARE_FP_DOUBLE = 0
-ifeq ($(CMSIS_MCU),$(filter $(CMSIS_MCU),STM32F765xx STM32F767xx STM32F769xx STM32H743xx STM32H750xx STM32H7A3xx STM32H7A3xxQ STM32H7B3xx STM32H7B3xxQ))
-CFLAGS_CORTEX_M += -mfpu=fpv5-d16 -mfloat-abi=hard
-SUPPORTS_HARDWARE_FP_SINGLE = 1
-SUPPORTS_HARDWARE_FP_DOUBLE = 1
-else
-ifeq ($(MCU_SERIES),$(filter $(MCU_SERIES),f0 l0))
-CFLAGS_CORTEX_M += -msoft-float
-else
-CFLAGS_CORTEX_M += -mfpu=fpv4-sp-d16 -mfloat-abi=hard
-SUPPORTS_HARDWARE_FP_SINGLE = 1
-endif
-endif
-
-# Options for particular MCU series
-CFLAGS_MCU_f0 = $(CFLAGS_CORTEX_M) -mtune=cortex-m0 -mcpu=cortex-m0
-CFLAGS_MCU_f4 = $(CFLAGS_CORTEX_M) -mtune=cortex-m4 -mcpu=cortex-m4
-CFLAGS_MCU_f7 = $(CFLAGS_CORTEX_M) -mtune=cortex-m7 -mcpu=cortex-m7
-CFLAGS_MCU_g4 = $(CFLAGS_CORTEX_M) -mtune=cortex-m4 -mcpu=cortex-m4
-CFLAGS_MCU_l0 = $(CFLAGS_CORTEX_M) -mtune=cortex-m0plus -mcpu=cortex-m0plus
-CFLAGS_MCU_l4 = $(CFLAGS_CORTEX_M) -mtune=cortex-m4 -mcpu=cortex-m4
-CFLAGS_MCU_h7 = $(CFLAGS_CORTEX_M) -mtune=cortex-m7 -mcpu=cortex-m7
-CFLAGS_MCU_wb = $(CFLAGS_CORTEX_M) -mtune=cortex-m4 -mcpu=cortex-m4
-
 CFLAGS += $(INC) -Wall -Wpointer-arith -Werror -Wdouble-promotion -Wfloat-conversion -std=gnu99 -nostdlib $(CFLAGS_MOD) $(CFLAGS_EXTRA)
 CFLAGS += -D$(CMSIS_MCU) -DUSE_FULL_LL_DRIVER
 CFLAGS += $(CFLAGS_MCU_$(MCU_SERIES))
@@ -377,7 +343,7 @@ SRC_O += \
 endif
 endif
 
-HAL_SRC_C += $(addprefix $(HAL_DIR)/Src/stm32$(MCU_SERIES)xx_,\
+HAL_SRC_C += $(addprefix $(STM32LIB_HAL_BASE)/Src/stm32$(MCU_SERIES)xx_,\
 	hal.c \
 	hal_adc.c \
 	hal_adc_ex.c \
@@ -403,13 +369,13 @@ HAL_SRC_C += $(addprefix $(HAL_DIR)/Src/stm32$(MCU_SERIES)xx_,\
 	)
 
 ifeq ($(MCU_SERIES),$(filter $(MCU_SERIES),f4 f7 h7 l0 l4 wb))
-HAL_SRC_C += $(addprefix $(HAL_DIR)/Src/stm32$(MCU_SERIES)xx_,\
+HAL_SRC_C += $(addprefix $(STM32LIB_HAL_BASE)/Src/stm32$(MCU_SERIES)xx_,\
 	ll_usb.c \
 	)
 endif
 
 ifeq ($(MCU_SERIES),$(filter $(MCU_SERIES),f4 f7 h7 l4))
-HAL_SRC_C += $(addprefix $(HAL_DIR)/Src/stm32$(MCU_SERIES)xx_,\
+HAL_SRC_C += $(addprefix $(STM32LIB_HAL_BASE)/Src/stm32$(MCU_SERIES)xx_,\
 	hal_sd.c \
 	ll_sdmmc.c \
 	ll_fmc.c \
@@ -417,7 +383,7 @@ HAL_SRC_C += $(addprefix $(HAL_DIR)/Src/stm32$(MCU_SERIES)xx_,\
 endif
 
 ifeq ($(MCU_SERIES),$(filter $(MCU_SERIES),f4 f7 h7))
-HAL_SRC_C += $(addprefix $(HAL_DIR)/Src/stm32$(MCU_SERIES)xx_,\
+HAL_SRC_C += $(addprefix $(STM32LIB_HAL_BASE)/Src/stm32$(MCU_SERIES)xx_,\
 	hal_mmc.c \
 	hal_sdram.c \
 	hal_dma_ex.c \
@@ -426,35 +392,35 @@ HAL_SRC_C += $(addprefix $(HAL_DIR)/Src/stm32$(MCU_SERIES)xx_,\
 ifeq ($(MCU_SERIES),$(filter $(MCU_SERIES),f4))
 # HAL F4-1.16.0 has a bug with missing parentheses in HAL_MMC_Erase.
 # This function is unused so let the error go by as a warning.
-$(BUILD)/$(HAL_DIR)/Src/stm32$(MCU_SERIES)xx_hal_mmc.o: CFLAGS += -Wno-error=parentheses
+$(BUILD)/$(STM32LIB_HAL_BASE)/Src/stm32$(MCU_SERIES)xx_hal_mmc.o: CFLAGS += -Wno-error=parentheses
 endif
 endif
 
 ifeq ($(MCU_SERIES),$(filter $(MCU_SERIES),g4))
-    HAL_SRC_C += $(addprefix $(HAL_DIR)/Src/stm32$(MCU_SERIES)xx_, hal_fdcan.c)
+    HAL_SRC_C += $(addprefix $(STM32LIB_HAL_BASE)/Src/stm32$(MCU_SERIES)xx_, hal_fdcan.c)
 endif
 
 ifeq ($(CMSIS_MCU),$(filter $(CMSIS_MCU),STM32H743xx STM32H750xx STM32H7A3xx STM32H7A3xxQ STM32H7B3xx STM32H7B3xxQ))
-    HAL_SRC_C += $(addprefix $(HAL_DIR)/Src/stm32$(MCU_SERIES)xx_, hal_fdcan.c)
+    HAL_SRC_C += $(addprefix $(STM32LIB_HAL_BASE)/Src/stm32$(MCU_SERIES)xx_, hal_fdcan.c)
 else
 ifeq ($(MCU_SERIES),$(filter $(MCU_SERIES),f0 f4 f7 h7))
-    HAL_SRC_C += $(addprefix $(HAL_DIR)/Src/stm32$(MCU_SERIES)xx_, hal_can.c)
+    HAL_SRC_C += $(addprefix $(STM32LIB_HAL_BASE)/Src/stm32$(MCU_SERIES)xx_, hal_can.c)
 else
 ifeq ($(MCU_SERIES),$(filter $(MCU_SERIES),l4))
-HAL_SRC_C += $(addprefix $(HAL_DIR)/Src/Legacy/stm32$(MCU_SERIES)xx_, hal_can.c)
-$(BUILD)/$(HAL_DIR)/Src/Legacy/stm32$(MCU_SERIES)xx_hal_can.o: CFLAGS += -Wno-error=cpp
+HAL_SRC_C += $(addprefix $(STM32LIB_HAL_BASE)/Src/Legacy/stm32$(MCU_SERIES)xx_, hal_can.c)
+$(BUILD)/$(STM32LIB_HAL_BASE)/Src/Legacy/stm32$(MCU_SERIES)xx_hal_can.o: CFLAGS += -Wno-error=cpp
 endif
 endif
 endif
 
 ifeq ($(MCU_SERIES),$(filter $(MCU_SERIES),f0 f4 f7 l0))
-HAL_SRC_C += $(addprefix $(HAL_DIR)/Src/stm32$(MCU_SERIES)xx_,\
+HAL_SRC_C += $(addprefix $(STM32LIB_HAL_BASE)/Src/stm32$(MCU_SERIES)xx_,\
 	hal_i2s.c \
 	)
 endif
 
 ifeq ($(MCU_SERIES),$(filter $(MCU_SERIES),f4))
-HAL_SRC_C += $(addprefix $(HAL_DIR)/Src/stm32$(MCU_SERIES)xx_,\
+HAL_SRC_C += $(addprefix $(STM32LIB_HAL_BASE)/Src/stm32$(MCU_SERIES)xx_,\
 	hal_i2s_ex.c \
 	)
 endif
@@ -778,7 +744,7 @@ GEN_PLLFREQTABLE_HDR = $(HEADER_BUILD)/pllfreqtable.h
 GEN_STMCONST_HDR = $(HEADER_BUILD)/modstm_const.h
 GEN_STMCONST_QSTR = $(BUILD)/modstm_qstr.h
 GEN_STMCONST_MPZ = $(HEADER_BUILD)/modstm_mpz.h
-CMSIS_MCU_HDR = $(CMSIS_DIR)/$(CMSIS_MCU_LOWER).h
+CMSIS_MCU_HDR = $(STM32LIB_CMSIS_ABS)/Include/$(CMSIS_MCU_LOWER).h
 
 modmachine.c: $(GEN_PLLFREQTABLE_HDR)
 $(GEN_PLLFREQTABLE_HDR): $(PLLVALUES) | $(HEADER_BUILD)
diff --git a/ports/stm32/boards/NUCLEO_WB55/mpconfigboard.mk b/ports/stm32/boards/NUCLEO_WB55/mpconfigboard.mk
index dcec788ed443f..349ce46d79588 100644
--- a/ports/stm32/boards/NUCLEO_WB55/mpconfigboard.mk
+++ b/ports/stm32/boards/NUCLEO_WB55/mpconfigboard.mk
@@ -1,7 +1,7 @@
 MCU_SERIES = wb
 CMSIS_MCU = STM32WB55xx
 AF_FILE = boards/stm32wb55_af.csv
-STARTUP_FILE = lib/stm32lib/CMSIS/STM32WBxx/Source/Templates/gcc/startup_stm32wb55xx_cm4.o
+STARTUP_FILE = $(STM32LIB_CMSIS_BASE)/Source/Templates/gcc/startup_stm32wb55xx_cm4.o
 
 ifeq ($(USE_MBOOT),1)
 # When using Mboot all the text goes together after the bootloader
diff --git a/ports/stm32/boards/USBDONGLE_WB55/mpconfigboard.mk b/ports/stm32/boards/USBDONGLE_WB55/mpconfigboard.mk
index dcec788ed443f..349ce46d79588 100644
--- a/ports/stm32/boards/USBDONGLE_WB55/mpconfigboard.mk
+++ b/ports/stm32/boards/USBDONGLE_WB55/mpconfigboard.mk
@@ -1,7 +1,7 @@
 MCU_SERIES = wb
 CMSIS_MCU = STM32WB55xx
 AF_FILE = boards/stm32wb55_af.csv
-STARTUP_FILE = lib/stm32lib/CMSIS/STM32WBxx/Source/Templates/gcc/startup_stm32wb55xx_cm4.o
+STARTUP_FILE = $(STM32LIB_CMSIS_BASE)/Source/Templates/gcc/startup_stm32wb55xx_cm4.o
 
 ifeq ($(USE_MBOOT),1)
 # When using Mboot all the text goes together after the bootloader
diff --git a/ports/stm32/mboot/Makefile b/ports/stm32/mboot/Makefile
index 20b0db9070cd4..ee75fb2afea21 100755
--- a/ports/stm32/mboot/Makefile
+++ b/ports/stm32/mboot/Makefile
@@ -32,11 +32,6 @@ include $(BOARD_DIR)/mpconfigboard.mk
 # A board can set MBOOT_TEXT0_ADDR to a custom location where mboot should reside.
 MBOOT_TEXT0_ADDR ?= 0x08000000
 
-MCU_SERIES_UPPER = $(shell echo $(MCU_SERIES) | tr '[:lower:]' '[:upper:]')
-CMSIS_MCU_LOWER = $(shell echo $(CMSIS_MCU) | tr '[:upper:]' '[:lower:]')
-
-CMSIS_DIR=$(TOP)/lib/stm32lib/CMSIS/STM32$(MCU_SERIES_UPPER)xx/Include
-HAL_DIR=lib/stm32lib/STM32$(MCU_SERIES_UPPER)xx_HAL_Driver
 USBDEV_DIR=usbdev
 DFU=$(TOP)/tools/dfu.py
 PYDFU ?= $(TOP)/tools/pydfu.py
@@ -45,8 +40,8 @@ BOOTLOADER_DFU_USB_PID ?= 0xDF11
 STFLASH ?= st-flash
 OPENOCD ?= openocd
 OPENOCD_CONFIG ?= boards/openocd_stm32f4.cfg
-STARTUP_FILE ?= lib/stm32lib/CMSIS/STM32$(MCU_SERIES_UPPER)xx/Source/Templates/gcc/startup_$(CMSIS_MCU_LOWER).o
-SYSTEM_FILE ?= lib/stm32lib/CMSIS/STM32$(MCU_SERIES_UPPER)xx/Source/Templates/system_stm32$(MCU_SERIES)xx.o
+
+include ../stm32.mk
 
 CROSS_COMPILE ?= arm-none-eabi-
 
@@ -55,20 +50,10 @@ INC += -I..
 INC += -I$(TOP)
 INC += -I$(BUILD)
 INC += -I$(TOP)/lib/cmsis/inc
-INC += -I$(CMSIS_DIR)/
-INC += -I$(TOP)/$(HAL_DIR)/Inc
+INC += -I$(STM32LIB_CMSIS_ABS)/Include
+INC += -I$(STM32LIB_HAL_ABS)/Inc
 INC += -I../$(USBDEV_DIR)/core/inc -I../$(USBDEV_DIR)/class/inc
 
-# Basic Cortex-M flags
-CFLAGS_CORTEX_M = -mthumb
-
-# Options for particular MCU series
-CFLAGS_MCU_f4 = $(CFLAGS_CORTEX_M) -mtune=cortex-m4 -mcpu=cortex-m4
-CFLAGS_MCU_f7 = $(CFLAGS_CORTEX_M) -mtune=cortex-m7 -mcpu=cortex-m7
-CFLAGS_MCU_h7 = $(CFLAGS_CORTEX_M) -mtune=cortex-m7 -mcpu=cortex-m7
-CFLAGS_MCU_l4 = $(CFLAGS_CORTEX_M) -mtune=cortex-m4 -mcpu=cortex-m4
-CFLAGS_MCU_wb = $(CFLAGS_CORTEX_M) -mtune=cortex-m4 -mcpu=cortex-m4
-
 # Standard C functions like memset need to be compiled with special flags so
 # the compiler does not optimise these functions in terms of themselves.
 CFLAGS_BUILTIN ?= -ffreestanding -fno-builtin -fno-lto
@@ -154,8 +139,8 @@ CFLAGS += -DMBOOT_PACK_CHUNKSIZE=$(MBOOT_PACK_CHUNKSIZE)
 CFLAGS += -DMBOOT_PACK_KEYS_FILE=\"$(MBOOT_PACK_KEYS_FILE)\"
 endif
 
-$(BUILD)/$(HAL_DIR)/Src/stm32$(MCU_SERIES)xx_ll_usb.o: CFLAGS += -Wno-attributes
-SRC_HAL += $(addprefix $(HAL_DIR)/Src/stm32$(MCU_SERIES)xx_,\
+$(BUILD)/$(STM32LIB_HAL_BASE)/Src/stm32$(MCU_SERIES)xx_ll_usb.o: CFLAGS += -Wno-attributes
+SRC_HAL += $(addprefix $(STM32LIB_HAL_BASE)/Src/stm32$(MCU_SERIES)xx_,\
 	hal_cortex.c \
 	hal_flash.c \
 	hal_flash_ex.c \
diff --git a/ports/stm32/stm32.mk b/ports/stm32/stm32.mk
new file mode 100644
index 0000000000000..f17351cdcaae3
--- /dev/null
+++ b/ports/stm32/stm32.mk
@@ -0,0 +1,68 @@
+#
+# Makefile fragment for STM32 MCUs.
+#
+
+# Create variables for the MCU name.
+MCU_SERIES_UPPER = $(shell echo $(MCU_SERIES) | tr '[:lower:]' '[:upper:]')
+CMSIS_MCU_LOWER = $(shell echo $(CMSIS_MCU) | tr '[:upper:]' '[:lower:]')
+
+# Configure location of stm32lib.  Options are:
+# 1. default: use provided lib/stm32lib
+# 2. set STM32LIB_DIR to point to an stm32lib directory structure
+# 3. set STM32LIB_CMSIS_DIR to point to xxx/CMSIS/Device/ST/STM32<series>xx
+#    and STM32LIB_HAL_DIR to point to xxx/STM32<series>xx_HAL_Driver
+ifneq ($(STM32LIB_CMSIS_DIR),)
+# Option 3
+STM32LIB_CMSIS_BASE = $(abspath $(STM32LIB_CMSIS_DIR))
+STM32LIB_CMSIS_ABS = $(STM32LIB_CMSIS_BASE)
+STM32LIB_HAL_BASE = $(abspath $(STM32LIB_HAL_DIR))
+STM32LIB_HAL_ABS = $(STM32LIB_HAL_BASE)
+else
+ifneq ($(STM32LIB_DIR),)
+# Option 2
+STM32LIB_VPATH = $(abspath $(STM32LIB_DIR))
+STM32LIB_FROM_HERE = $(STM32LIB_VPATH)
+else
+# Option 1
+STM32LIB_VPATH = lib/stm32lib
+STM32LIB_FROM_HERE = $(TOP)/$(STM32LIB_VPATH)
+endif
+STM32LIB_CMSIS_BASE = $(STM32LIB_VPATH)/CMSIS/STM32$(MCU_SERIES_UPPER)xx
+STM32LIB_CMSIS_ABS = $(STM32LIB_FROM_HERE)/CMSIS/STM32$(MCU_SERIES_UPPER)xx
+STM32LIB_HAL_BASE = $(STM32LIB_VPATH)/STM32$(MCU_SERIES_UPPER)xx_HAL_Driver
+STM32LIB_HAL_ABS = $(STM32LIB_FROM_HERE)/STM32$(MCU_SERIES_UPPER)xx_HAL_Driver
+endif
+
+STARTUP_FILE ?= $(STM32LIB_CMSIS_BASE)/Source/Templates/gcc/startup_$(CMSIS_MCU_LOWER).o
+SYSTEM_FILE ?= $(STM32LIB_CMSIS_BASE)/Source/Templates/system_stm32$(MCU_SERIES)xx.o
+
+# Basic Cortex-M flags.
+CFLAGS_CORTEX_M = -mthumb
+
+ifneq ($(BUILDING_MBOOT),1)
+# Select hardware floating-point support.
+SUPPORTS_HARDWARE_FP_SINGLE = 0
+SUPPORTS_HARDWARE_FP_DOUBLE = 0
+ifeq ($(CMSIS_MCU),$(filter $(CMSIS_MCU),STM32F765xx STM32F767xx STM32F769xx STM32H743xx STM32H750xx STM32H7A3xx STM32H7A3xxQ STM32H7B3xx STM32H7B3xxQ))
+CFLAGS_CORTEX_M += -mfpu=fpv5-d16 -mfloat-abi=hard
+SUPPORTS_HARDWARE_FP_SINGLE = 1
+SUPPORTS_HARDWARE_FP_DOUBLE = 1
+else
+ifeq ($(MCU_SERIES),$(filter $(MCU_SERIES),f0 l0))
+CFLAGS_CORTEX_M += -msoft-float
+else
+CFLAGS_CORTEX_M += -mfpu=fpv4-sp-d16 -mfloat-abi=hard
+SUPPORTS_HARDWARE_FP_SINGLE = 1
+endif
+endif
+endif
+
+# Options for particular MCU series.
+CFLAGS_MCU_f0 = $(CFLAGS_CORTEX_M) -mtune=cortex-m0 -mcpu=cortex-m0
+CFLAGS_MCU_f4 = $(CFLAGS_CORTEX_M) -mtune=cortex-m4 -mcpu=cortex-m4
+CFLAGS_MCU_f7 = $(CFLAGS_CORTEX_M) -mtune=cortex-m7 -mcpu=cortex-m7
+CFLAGS_MCU_g4 = $(CFLAGS_CORTEX_M) -mtune=cortex-m4 -mcpu=cortex-m4
+CFLAGS_MCU_l0 = $(CFLAGS_CORTEX_M) -mtune=cortex-m0plus -mcpu=cortex-m0plus
+CFLAGS_MCU_l4 = $(CFLAGS_CORTEX_M) -mtune=cortex-m4 -mcpu=cortex-m4
+CFLAGS_MCU_h7 = $(CFLAGS_CORTEX_M) -mtune=cortex-m7 -mcpu=cortex-m7
+CFLAGS_MCU_wb = $(CFLAGS_CORTEX_M) -mtune=cortex-m4 -mcpu=cortex-m4

From e0a0719416d6a936ade8c30314b7e9c90bfbbf23 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 22 Feb 2021 11:55:12 +1100
Subject: [PATCH 1665/3533] stm32: Add initial support for STM32WL MCUs.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/Makefile                         |  6 +-
 ports/stm32/adc.h                            |  2 +
 ports/stm32/boards/stm32wl55_af.csv          | 45 +++++++++++
 ports/stm32/boards/stm32wl55xc.ld            | 34 +++++++++
 ports/stm32/boards/stm32wlxx_hal_conf_base.h | 78 ++++++++++++++++++++
 ports/stm32/dma.c                            | 12 +--
 ports/stm32/dma.h                            |  2 +-
 ports/stm32/extint.c                         | 22 ++++--
 ports/stm32/extint.h                         |  2 +-
 ports/stm32/flash.c                          |  8 +-
 ports/stm32/machine_adc.c                    | 24 ++++--
 ports/stm32/machine_uart.c                   |  2 +-
 ports/stm32/modmachine.c                     |  2 +-
 ports/stm32/mpconfigboard_common.h           | 10 +++
 ports/stm32/mphalport.c                      |  2 +-
 ports/stm32/powerctrl.c                      | 25 +++++--
 ports/stm32/powerctrlboot.c                  | 37 ++++++++++
 ports/stm32/rtc.c                            | 21 ++++--
 ports/stm32/stm32.mk                         |  3 +-
 ports/stm32/stm32_it.c                       |  2 +-
 ports/stm32/timer.c                          |  4 +-
 ports/stm32/uart.c                           | 33 +++++++--
 ports/stm32/uart.h                           |  2 +-
 23 files changed, 316 insertions(+), 62 deletions(-)
 create mode 100644 ports/stm32/boards/stm32wl55_af.csv
 create mode 100644 ports/stm32/boards/stm32wl55xc.ld
 create mode 100644 ports/stm32/boards/stm32wlxx_hal_conf_base.h

diff --git a/ports/stm32/Makefile b/ports/stm32/Makefile
index 4c90c6f1ef491..dd86f1e3f315d 100644
--- a/ports/stm32/Makefile
+++ b/ports/stm32/Makefile
@@ -353,8 +353,6 @@ HAL_SRC_C += $(addprefix $(STM32LIB_HAL_BASE)/Src/stm32$(MCU_SERIES)xx_,\
 	hal_flash_ex.c \
 	hal_gpio.c \
 	hal_i2c.c \
-	hal_pcd.c \
-	hal_pcd_ex.c \
 	hal_pwr.c \
 	hal_pwr_ex.c \
 	hal_rcc.c \
@@ -368,8 +366,10 @@ HAL_SRC_C += $(addprefix $(STM32LIB_HAL_BASE)/Src/stm32$(MCU_SERIES)xx_,\
 	ll_utils.c \
 	)
 
-ifeq ($(MCU_SERIES),$(filter $(MCU_SERIES),f4 f7 h7 l0 l4 wb))
+ifeq ($(MCU_SERIES),$(filter $(MCU_SERIES),f4 f7 g4 h7 l0 l4 wb))
 HAL_SRC_C += $(addprefix $(STM32LIB_HAL_BASE)/Src/stm32$(MCU_SERIES)xx_,\
+	hal_pcd.c \
+	hal_pcd_ex.c \
 	ll_usb.c \
 	)
 endif
diff --git a/ports/stm32/adc.h b/ports/stm32/adc.h
index db706ea494019..3b79dc01f5aea 100644
--- a/ports/stm32/adc.h
+++ b/ports/stm32/adc.h
@@ -56,6 +56,8 @@ static inline void adc_deselect_vbat(ADC_TypeDef *adc, uint32_t channel) {
         adc_common = adc == ADC3 ? ADC3_COMMON : ADC12_COMMON;
         #elif defined(STM32L4)
         adc_common = __LL_ADC_COMMON_INSTANCE(0);
+        #elif defined(STM32WL)
+        adc_common = ADC_COMMON;
         #endif
 
         adc_common->CCR &= ~LL_ADC_PATH_INTERNAL_VBAT;
diff --git a/ports/stm32/boards/stm32wl55_af.csv b/ports/stm32/boards/stm32wl55_af.csv
new file mode 100644
index 0000000000000..219b8b08b7853
--- /dev/null
+++ b/ports/stm32/boards/stm32wl55_af.csv
@@ -0,0 +1,45 @@
+Port,,AF0,AF1,AF2,AF3,AF4,AF5,AF6,AF7,AF8,AF9,AF10,AF11,AF12,AF13,AF14,AF15,
+,,SYS_AF,TIM1/TIM2/LPTIM1,TIM1/TIM2,SPI2S2/TIM1/LPTIM3,I2C1/I2C2/I2C3,SPI1/SPI2S2,RF,USART1/USART2,LPUART1,,,,COMP1/COMP2/TIM1,DEBUG,TIM2/TIM16/TIM17/LPTIM2,EVENOUT,ADC
+PortA,PA0,,TIM2_CH1,,,I2C3_SMBA,I2S_CKIN,,USART2_CTS,,,,,COMP1_OUT,DEBUG_PWR_REGLP1S,TIM2_ETR,EVENTOUT,ADC123_IN0
+PortA,PA1,,TIM2_CH2,,LPTIM3_OUT,I2C1_SMBA,SPI1_SCK,,USART2_RTS,LPUART1_RTS,,,,,DEBUG_PWR_REGLP2S,,EVENTOUT,ADC123_IN1
+PortA,PA2,LSCO,TIM2_CH3,,,,,,USART2_TX,LPUART1_TX,,,,COMP2_OUT,DEBUG_PWR_LDORDY,,EVENTOUT,ADC123_IN2
+PortA,PA3,,TIM2_CH4,,,,I2S2_MCK,,USART2_RX,LPUART1_RX,,,,,,,EVENTOUT,ADC123_IN3
+PortA,PA4,RTC_OUT2,LPTIM1_OUT,,,,SPI1_NSS,,USART2_CK,,,,,,DEBUG_SUBGHZSPI_NSSOUT,LPTIM2_OUT,EVENTOUT,ADC12_IN4
+PortA,PA5,,TIM2_CH1,TIM2_ETR,SPI2_MISO,,SPI1_SCK,,,,,,,,DEBUG_SUBGHZSPI_SCKOUT,LPTIM2_ETR,EVENTOUT,ADC12_IN5
+PortA,PA6,,TIM1_BKIN,,,I2C2_SMBA,SPI1_MISO,,,LPUART1_CTS,,,,TIM1_BKIN,DEBUG_SUBGHZSPI_MISOOUT,TIM16_CH1,EVENTOUT,ADC12_IN6
+PortA,PA7,,TIM1_CH1N,,,I2C3_SCL,SPI1_MOSI,,,,,,,COMP2_OUT,DEBUG_SUBGHZSPI_MOSIOUT,TIM17_CH1,EVENTOUT,ADC12_IN7
+PortA,PA8,MCO,TIM1_CH1,,,,SPI2_SCK/I2S2_CK,,USART1_CK,,,,,,,LPTIM2_OUT,EVENTOUT,
+PortA,PA9,,TIM1_CH2,,SPI2_NSS/I2S2_WS,I2C1_SCL,SPI2_SCK/I2S2_CK,,USART1_TX,,,,,,,,EVENTOUT,
+PortA,PA10,RTC_REFIN,TIM1_CH3,,,I2C1_SDA,SPI2_MOSI/I2S2_SD,,USART1_RX,,,,,,DEBUG_RF_HSE32RDY,TIM17_BKIN,EVENTOUT,
+PortA,PA11,,TIM1_CH4,TIM1_BKIN2,LPTIM3_ETR,I2C2_SDA,SPI1_MISO,,USART1_CTS,,,,,TIM1_BKIN2,DEBUG_RF_NRESET,,EVENTOUT,
+PortA,PA12,,TIM1_ETR,,LPTIM3_IN1,I2C2_SCL,SPI1_MOSI,RF_BUSY,USART1_RTS,,,,,,,,EVENTOUT,
+PortA,PA13,JTMS/SWDIO,,,,I2C2_SMBA,,,,IR_OUT,,,,,,,EVENTOUT,
+PortA,PA14,JTCK/SWCLK,LPTIM1_OUT,,,I2C1_SMBA,,,,,,,,,,,EVENTOUT,
+PortA,PA15,JTDI,TIM2_CH1,TIM2_ETR,,I2C2_SDA,SPI1_NSS,,,,,,,,,,EVENTOUT,
+PortB,PB0,,,,,,,,,,,,,COMP1_OUT,,,EVENTOUT,ADC12_IN8
+PortB,PB1,,,,,,,,,LPUART1_RTS_DE,,,,,,LPTIM2_IN1,EVENTOUT,ADC12_IN9
+PortB,PB2,,LPTIM1_OUT,,,I2C3_SMBA,SPI1_NSS,,,,,,,,DEBUG_RF_SMPSRDY,,EVENTOUT,
+PortB,PB3,JTDO/TRACESWO,TIM2_CH2,,,,SPI1_SCK,RF_IRQ0,USART1_RTS,,,,,,DEBUG_RF_DTB1,,EVENTOUT,
+PortB,PB4,NJTRST,,,,I2C3_SDA,SPI1_MISO,,USART1_CTS,,,,,,DEBUG_RF_LDORDY,TIM17_BKIN,EVENTOUT,
+PortB,PB5,,LPTIM1_IN1,,,I2C1_SMBA,SPI1_MOSI,RF_IRQ1,USART1_CK,,,,,COMP2_OUT,,TIM16_BKIN,EVENTOUT,
+PortB,PB6,,LPTIM1_ETR,,,I2C1_SCL,,,USART1_TX,,,,,,,TIM16_CH1N,EVENTOUT,
+PortB,PB7,,LPTIM1_IN2,,TIM1_BKIN,I2C1_SDA,,,USART1_RX,,,,,,,TIM17_CH1N,EVENTOUT,
+PortB,PB8,,TIM1_CH2N,,,I2C1_SCL,,RF_IRQ2,,,,,,,,TIM16_CH1,EVENTOUT,
+PortB,PB9,,TIM1_CH3N,,,I2C1_SDA,SPI2_NSS/I2S2_WS,,,IR_OUT,,,,,,TIM17_CH1,EVENTOUT,
+PortB,PB10,,TIM2_CH3,,,I2C3_SCL,SPI2_SCK/I2S2_CK,,,LPUART1_RX,,,,COMP1_OUT,,,EVENTOUT,
+PortB,PB11,,TIM2_CH4,,,I2C3_SDA,,,,LPUART1_TX,,,,COMP2_OUT,,,EVENTOUT,
+PortB,PB12,,TIM1_BKIN,,TIM1_BKIN,I2C3_SMBA,SPI2_NSS/I2S2_WS,,,LPUART1_RTS,,,,,,,EVENTOUT,
+PortB,PB13,,TIM1_CH1N,,,I2C3_SCL,SPI2_SCK/I2S2_CK,,,LPUART1_CTS,,,,,,,EVENTOUT,
+PortB,PB14,,TIM1_CH2N,,I2S2_MCK,I2C3_SDA,SPI2_MISO,,,,,,,,,,EVENTOUT,
+PortB,PB15,,TIM1_CH3N,,,I2C2_SCL,SPI2_MOSI/I2S2_SD,,,,,,,,,,EVENTOUT,
+PortC,PC0,,LPTIM1_IN1,,,I2C3_SCL,,,,LPUART1_RX,,,,,,LPTIM2_IN1,EVENTOUT,ADC123_IN10
+PortC,PC1,,LPTIM1_OUT,,SPI2_MOSI/I2S2_SD,I2C3_SDA,,,,LPUART1_TX,,,,,,,EVENTOUT,ADC123_IN11
+PortC,PC2,,LPTIM1_IN2,,,,SPI2_MISO,,,,,,,,,,EVENTOUT,ADC123_IN12
+PortC,PC3,,LPTIM1_ETR,,,,SPI2_MOSI/I2S2_SD,,,,,,,,,LPTIM2_ETR,EVENTOUT,ADC123_IN13
+PortC,PC4,,,,,,,,,,,,,,,,EVENTOUT,ADC12_IN14
+PortC,PC5,,,,,,,,,,,,,,,,EVENTOUT,ADC12_IN15
+PortC,PC6,,,,,,I2S2_MCK,,,,,,,,,,EVENTOUT,
+PortC,PC13,,,,,,,,,,,,,,,,EVENTOUT,
+PortC,PC14,,,,,,,,,,,,,,,,EVENTOUT,
+PortC,PC15,,,,,,,,,,,,,,,,EVENTOUT,
+PortH,PH3,,,,,,,,,,,,,,,,EVENTOUT,
diff --git a/ports/stm32/boards/stm32wl55xc.ld b/ports/stm32/boards/stm32wl55xc.ld
new file mode 100644
index 0000000000000..109675bb5ec91
--- /dev/null
+++ b/ports/stm32/boards/stm32wl55xc.ld
@@ -0,0 +1,34 @@
+/*
+    GNU linker script for STM32WL55xC
+*/
+
+/* Specify the memory areas */
+MEMORY
+{
+    FLASH (rx)      : ORIGIN = 0x08000000, LENGTH = 256K /* sectors 0-127 */
+    FLASH_APP (rx)  : ORIGIN = 0x08000000, LENGTH = 232K /* sectors 0-115 */
+    FLASH_FS (r)    : ORIGIN = 0x0803a000, LENGTH = 24K  /* sectors 116-127 */
+    RAM (xrw)       : ORIGIN = 0x20000000, LENGTH = 64K  /* SRAM1+SRAM2 */
+}
+
+/* produce a link error if there is not this amount of RAM for these sections */
+_minimum_stack_size = 2K;
+_minimum_heap_size = 16K;
+
+/* RAM extents for the garbage collector */
+_ram_start = ORIGIN(RAM);
+_ram_end = ORIGIN(RAM) + LENGTH(RAM);
+
+_micropy_hw_internal_flash_storage_ram_cache_end = ORIGIN(RAM) + LENGTH(RAM);
+_micropy_hw_internal_flash_storage_ram_cache_start = _micropy_hw_internal_flash_storage_ram_cache_end - 2K; /* fs cache = 2K */
+
+/* Define the stack.  The stack is full descending so begins at the bottom of FS cache.
+   Note that EABI requires the stack to be 8-byte aligned for a call. */
+_estack = _micropy_hw_internal_flash_storage_ram_cache_start - _estack_reserve;
+_sstack = _estack - 6K;
+
+_heap_start = _ebss; /* heap starts just after statically allocated memory */
+_heap_end = _sstack;
+
+_micropy_hw_internal_flash_storage_start = ORIGIN(FLASH_FS);
+_micropy_hw_internal_flash_storage_end   = ORIGIN(FLASH_FS) + LENGTH(FLASH_FS);
diff --git a/ports/stm32/boards/stm32wlxx_hal_conf_base.h b/ports/stm32/boards/stm32wlxx_hal_conf_base.h
new file mode 100644
index 0000000000000..e98b0525bd1be
--- /dev/null
+++ b/ports/stm32/boards/stm32wlxx_hal_conf_base.h
@@ -0,0 +1,78 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+#ifndef MICROPY_INCLUDED_STM32WLXX_HAL_CONF_BASE_H
+#define MICROPY_INCLUDED_STM32WLXX_HAL_CONF_BASE_H
+
+// Include various HAL modules for convenience
+#include "stm32wlxx_hal_dma.h"
+#include "stm32wlxx_hal_adc.h"
+#include "stm32wlxx_hal_cortex.h"
+#include "stm32wlxx_hal_flash.h"
+#include "stm32wlxx_hal_gpio.h"
+#include "stm32wlxx_hal_i2c.h"
+#include "stm32wlxx_hal_pwr.h"
+#include "stm32wlxx_hal_rcc.h"
+#include "stm32wlxx_hal_rtc.h"
+#include "stm32wlxx_hal_spi.h"
+#include "stm32wlxx_hal_tim.h"
+#include "stm32wlxx_hal_uart.h"
+#include "stm32wlxx_hal_usart.h"
+#include "stm32wlxx_ll_adc.h"
+#include "stm32wlxx_ll_lpuart.h"
+#include "stm32wlxx_ll_rtc.h"
+#include "stm32wlxx_ll_usart.h"
+
+// Enable various HAL modules
+#define HAL_MODULE_ENABLED
+#define HAL_CORTEX_MODULE_ENABLED
+#define HAL_DMA_MODULE_ENABLED
+#define HAL_FLASH_MODULE_ENABLED
+#define HAL_GPIO_MODULE_ENABLED
+#define HAL_PWR_MODULE_ENABLED
+#define HAL_RCC_MODULE_ENABLED
+#define HAL_RTC_MODULE_ENABLED
+#define HAL_SPI_MODULE_ENABLED
+#define HAL_TIM_MODULE_ENABLED
+#define HAL_UART_MODULE_ENABLED
+#define HAL_USART_MODULE_ENABLED
+
+// Oscillator values in Hz
+#define MSI_VALUE (4000000)
+
+// SysTick has the highest priority
+#define TICK_INT_PRIORITY (0x00)
+
+// Miscellaneous HAL settings
+#define DATA_CACHE_ENABLE           1
+#define INSTRUCTION_CACHE_ENABLE    1
+#define PREFETCH_ENABLE             0
+#define USE_SPI_CRC                 0
+#define USE_RTOS                    0
+
+// HAL parameter assertions are disabled
+#define assert_param(expr) ((void)0)
+
+#endif // MICROPY_INCLUDED_STM32WLXX_HAL_CONF_BASE_H
diff --git a/ports/stm32/dma.c b/ports/stm32/dma.c
index dc706e68aa08f..75c34325d7e81 100644
--- a/ports/stm32/dma.c
+++ b/ports/stm32/dma.c
@@ -74,7 +74,7 @@ typedef union {
 struct _dma_descr_t {
     #if defined(STM32F4) || defined(STM32F7) || defined(STM32H7)
     DMA_Stream_TypeDef *instance;
-    #elif defined(STM32F0) || defined(STM32G4) || defined(STM32L0) || defined(STM32L4) || defined(STM32WB)
+    #elif defined(STM32F0) || defined(STM32G4) || defined(STM32L0) || defined(STM32L4) || defined(STM32WB) || defined(STM32WL)
     DMA_Channel_TypeDef *instance;
     #else
     #error "Unsupported Processor"
@@ -89,7 +89,7 @@ struct _dma_descr_t {
 static const DMA_InitTypeDef dma_init_struct_spi_i2c = {
     #if defined(STM32F4) || defined(STM32F7)
     .Channel = 0,
-    #elif defined(STM32G4) || defined(STM32H7) || defined(STM32L0) || defined(STM32L4) || defined(STM32WB)
+    #elif defined(STM32G4) || defined(STM32H7) || defined(STM32L0) || defined(STM32L4) || defined(STM32WB) || defined(STM32WL)
     .Request = 0,
     #endif
     .Direction = 0,
@@ -467,7 +467,7 @@ static const uint8_t dma_irqn[NSTREAM] = {
     DMA2_Channel7_IRQn,
 };
 
-#elif defined(STM32WB)
+#elif defined(STM32WB) || defined(STM32WL)
 
 #define NCONTROLLERS            (2)
 #define NSTREAMS_PER_CONTROLLER (7)
@@ -1152,7 +1152,7 @@ void dma_init_handle(DMA_HandleTypeDef *dma, const dma_descr_t *dma_descr, uint3
     dma->Instance = dma_descr->instance;
     dma->Init = *dma_descr->init;
     dma->Init.Direction = dir;
-    #if defined(STM32G4) || defined(STM32H7) || defined(STM32L0) || defined(STM32L4) || defined(STM32WB)
+    #if defined(STM32G4) || defined(STM32H7) || defined(STM32L0) || defined(STM32L4) || defined(STM32WB) || defined(STM32WL)
     dma->Init.Request = dma_descr->sub_instance;
     #else
     #if !defined(STM32F0)
@@ -1179,7 +1179,7 @@ void dma_init(DMA_HandleTypeDef *dma, const dma_descr_t *dma_descr, uint32_t dir
 
         dma_enable_clock(dma_id);
 
-        #if defined(STM32G4) || defined(STM32H7) || defined(STM32L0) || defined(STM32L4) || defined(STM32WB)
+        #if defined(STM32G4) || defined(STM32H7) || defined(STM32L0) || defined(STM32L4) || defined(STM32WB) || defined(STM32WL)
         // Always reset and configure the H7 and L0/L4 DMA peripheral
         // (dma->State is set to HAL_DMA_STATE_RESET by memset above)
         // TODO: understand how L0/L4 DMA works so this is not needed
@@ -1353,7 +1353,7 @@ void dma_nohal_start(const dma_descr_t *descr, uint32_t src_addr, uint32_t dst_a
     dma->CCR |= DMA_CCR_EN;
 }
 
-#elif defined(STM32WB)
+#elif defined(STM32WB) || defined(STM32WL)
 
 // These functions are currently not implemented or needed for this MCU.
 
diff --git a/ports/stm32/dma.h b/ports/stm32/dma.h
index 29d5c3d2eb018..9b0b4c77a6621 100644
--- a/ports/stm32/dma.h
+++ b/ports/stm32/dma.h
@@ -100,7 +100,7 @@ extern const dma_descr_t dma_I2C_2_RX;
 extern const dma_descr_t dma_I2C_1_TX;
 extern const dma_descr_t dma_I2C_1_RX;
 
-#elif defined(STM32L4) || defined(STM32WB)
+#elif defined(STM32L4) || defined(STM32WB) || defined(STM32WL)
 
 extern const dma_descr_t dma_ADC_1_RX;
 extern const dma_descr_t dma_ADC_2_RX;
diff --git a/ports/stm32/extint.c b/ports/stm32/extint.c
index bb26b00dde00c..55c9095f117e2 100644
--- a/ports/stm32/extint.c
+++ b/ports/stm32/extint.c
@@ -91,7 +91,7 @@
 #define EXTI_SWIER_BB(line) (*(__IO uint32_t *)(PERIPH_BB_BASE + ((EXTI_OFFSET + offsetof(EXTI_TypeDef, SWIER)) * 32) + ((line) * 4)))
 #endif
 
-#if defined(STM32G4) || defined(STM32L4) || defined(STM32WB)
+#if defined(STM32G4) || defined(STM32L4) || defined(STM32WB) || defined(STM32WL)
 // The L4 MCU supports 40 Events/IRQs lines of the type configurable and direct.
 // Here we only support configurable line types.  Details, see page 330 of RM0351, Rev 1.
 // The USB_FS_WAKUP event is a direct type and there is no support for it.
@@ -181,6 +181,12 @@ STATIC const uint8_t nvic_irq_channel[EXTI_NUM_VECTORS] = {
     RTC_Alarm_IRQn,
     TAMP_STAMP_LSECSS_IRQn,
     RTC_WKUP_IRQn,
+    #elif defined(STM32WL)
+    PVD_PVM_IRQn,
+    RTC_Alarm_IRQn,
+    TAMP_STAMP_LSECSS_SSRU_IRQn, // SSRU
+    TAMP_STAMP_LSECSS_SSRU_IRQn, // TAMP, RTC_STAMP, LSE_CSS
+    RTC_WKUP_IRQn,
     #else
     #if defined(STM32G4) || defined(STM32L4)
     PVD_PVM_IRQn,
@@ -308,7 +314,7 @@ void extint_register_pin(const pin_obj_t *pin, uint32_t mode, bool hard_irq, mp_
         pyb_extint_callback_arg[line] = MP_OBJ_FROM_PTR(pin);
 
         // Route the GPIO to EXTI
-        #if !defined(STM32WB)
+        #if !defined(STM32WB) && !defined(STM32WL)
         __HAL_RCC_SYSCFG_CLK_ENABLE();
         #endif
         SYSCFG->EXTICR[line >> 2] =
@@ -345,7 +351,7 @@ void extint_set(const pin_obj_t *pin, uint32_t mode) {
         pyb_extint_callback_arg[line] = MP_OBJ_FROM_PTR(pin);
 
         // Route the GPIO to EXTI
-        #if !defined(STM32WB)
+        #if !defined(STM32WB) && !defined(STM32WL)
         __HAL_RCC_SYSCFG_CLK_ENABLE();
         #endif
         SYSCFG->EXTICR[line >> 2] =
@@ -385,7 +391,7 @@ void extint_enable(uint line) {
     if (pyb_extint_mode[line] == EXTI_Mode_Interrupt) {
         #if defined(STM32H7)
         EXTI_D1->IMR1 |= (1 << line);
-        #elif defined(STM32G4) || defined(STM32WB)
+        #elif defined(STM32G4) || defined(STM32WB) || defined(STM32WL)
         EXTI->IMR1 |= (1 << line);
         #else
         EXTI->IMR |= (1 << line);
@@ -393,7 +399,7 @@ void extint_enable(uint line) {
     } else {
         #if defined(STM32H7)
         EXTI_D1->EMR1 |= (1 << line);
-        #elif defined(STM32G4) || defined(STM32WB)
+        #elif defined(STM32G4) || defined(STM32WB) || defined(STM32WL)
         EXTI->EMR1 |= (1 << line);
         #else
         EXTI->EMR |= (1 << line);
@@ -419,7 +425,7 @@ void extint_disable(uint line) {
     #if defined(STM32H7)
     EXTI_D1->IMR1 &= ~(1 << line);
     EXTI_D1->EMR1 &= ~(1 << line);
-    #elif defined(STM32G4) || defined(STM32WB)
+    #elif defined(STM32G4) || defined(STM32WB) || defined(STM32WL)
     EXTI->IMR1 &= ~(1 << line);
     EXTI->EMR1 &= ~(1 << line);
     #else
@@ -441,7 +447,7 @@ void extint_swint(uint line) {
         return;
     }
     // we need 0 to 1 transition to trigger the interrupt
-    #if defined(STM32G4) || defined(STM32H7) || defined(STM32L4) || defined(STM32WB)
+    #if defined(STM32G4) || defined(STM32H7) || defined(STM32L4) || defined(STM32WB) || defined(STM32WL)
     EXTI->SWIER1 &= ~(1 << line);
     EXTI->SWIER1 |= (1 << line);
     #else
@@ -519,7 +525,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(extint_obj_swint_obj,  extint_obj_swint);
 /// \classmethod regs()
 /// Dump the values of the EXTI registers.
 STATIC mp_obj_t extint_regs(void) {
-    #if defined(STM32G4) || defined(STM32L4) || defined(STM32WB)
+    #if defined(STM32G4) || defined(STM32L4) || defined(STM32WB) || defined(STM32WL)
     printf("EXTI_IMR1   %08x\n", (unsigned int)EXTI->IMR1);
     printf("EXTI_IMR2   %08x\n", (unsigned int)EXTI->IMR2);
     printf("EXTI_EMR1   %08x\n", (unsigned int)EXTI->EMR1);
diff --git a/ports/stm32/extint.h b/ports/stm32/extint.h
index 0cdf5024a07b5..247852fa19bcb 100644
--- a/ports/stm32/extint.h
+++ b/ports/stm32/extint.h
@@ -43,7 +43,7 @@
 #endif
 #define EXTI_ETH_WAKEUP         (19)
 #define EXTI_USB_OTG_HS_WAKEUP  (20)
-#if defined(STM32F0) || defined(STM32G4) || defined(STM32L4)
+#if defined(STM32F0) || defined(STM32G4) || defined(STM32L4) || defined(STM32WL)
 #define EXTI_RTC_TIMESTAMP      (19)
 #define EXTI_RTC_WAKEUP         (20)
 #elif defined(STM32H7) || defined(STM32WB)
diff --git a/ports/stm32/flash.c b/ports/stm32/flash.c
index eeeab52049698..0c4d2cf5b9404 100644
--- a/ports/stm32/flash.c
+++ b/ports/stm32/flash.c
@@ -97,7 +97,7 @@ static const flash_layout_t flash_layout[] = {
 };
 #endif
 
-#elif defined(STM32G4) || defined(STM32L0) || defined(STM32L4) || defined(STM32WB)
+#elif defined(STM32G4) || defined(STM32L0) || defined(STM32L4) || defined(STM32WB) || defined(STM32WL)
 
 static const flash_layout_t flash_layout[] = {
     { (uint32_t)FLASH_BASE, (uint32_t)FLASH_PAGE_SIZE, 512 },
@@ -159,7 +159,7 @@ static uint32_t get_page(uint32_t addr) {
 }
 #endif
 
-#elif (defined(STM32L4) && !defined(SYSCFG_MEMRMP_FB_MODE)) || defined(STM32WB)
+#elif (defined(STM32L4) && !defined(SYSCFG_MEMRMP_FB_MODE)) || defined(STM32WB) || defined(STM32WL)
 
 static uint32_t get_page(uint32_t addr) {
     return (addr - FLASH_BASE) / FLASH_PAGE_SIZE;
@@ -263,7 +263,7 @@ int flash_erase(uint32_t flash_dest, uint32_t num_word32) {
     EraseInitStruct.TypeErase = FLASH_TYPEERASE_PAGES;
     EraseInitStruct.PageAddress = flash_dest;
     EraseInitStruct.NbPages = (4 * num_word32 + FLASH_PAGE_SIZE - 4) / FLASH_PAGE_SIZE;
-    #elif (defined(STM32L4) && !defined(SYSCFG_MEMRMP_FB_MODE)) || defined(STM32WB)
+    #elif (defined(STM32L4) && !defined(SYSCFG_MEMRMP_FB_MODE)) || defined(STM32WB) || defined(STM32WL)
     __HAL_FLASH_CLEAR_FLAG(FLASH_FLAG_ALL_ERRORS);
     EraseInitStruct.TypeErase = FLASH_TYPEERASE_PAGES;
     EraseInitStruct.Page = get_page(flash_dest);
@@ -370,7 +370,7 @@ int flash_write(uint32_t flash_dest, const uint32_t *src, uint32_t num_word32) {
 
     HAL_StatusTypeDef status = HAL_OK;
 
-    #if defined(STM32G4) || defined(STM32L4) || defined(STM32WB)
+    #if defined(STM32G4) || defined(STM32L4) || defined(STM32WB) || defined(STM32WL)
 
     // program the flash uint64 by uint64
     for (int i = 0; i < num_word32 / 2; i++) {
diff --git a/ports/stm32/machine_adc.c b/ports/stm32/machine_adc.c
index 21b35cdcdb4c4..819fd3414f68a 100644
--- a/ports/stm32/machine_adc.c
+++ b/ports/stm32/machine_adc.c
@@ -28,7 +28,7 @@
 #include "py/mphal.h"
 #include "adc.h"
 
-#if defined(STM32F0) || defined(STM32G4) || defined(STM32H7) || defined(STM32L0) || defined(STM32L4) || defined(STM32WB)
+#if defined(STM32F0) || defined(STM32G4) || defined(STM32H7) || defined(STM32L0) || defined(STM32L4) || defined(STM32WB) || defined(STM32WL)
 #define ADC_V2 (1)
 #else
 #define ADC_V2 (0)
@@ -42,7 +42,7 @@
 #define ADCx_COMMON __LL_ADC_COMMON_INSTANCE(0)
 #endif
 
-#if defined(STM32F0) || defined(STM32L0)
+#if defined(STM32F0) || defined(STM32L0) || defined(STM32WL)
 #define ADC_STAB_DELAY_US (1)
 #define ADC_TEMPSENSOR_DELAY_US (10)
 #elif defined(STM32G4)
@@ -65,7 +65,7 @@
 #elif defined(STM32H7)
 #define ADC_SAMPLETIME_DEFAULT      ADC_SAMPLETIME_8CYCLES_5
 #define ADC_SAMPLETIME_DEFAULT_INT  ADC_SAMPLETIME_387CYCLES_5
-#elif defined(STM32L0)
+#elif defined(STM32L0) || defined(STM32WL)
 #define ADC_SAMPLETIME_DEFAULT      ADC_SAMPLETIME_12CYCLES_5
 #define ADC_SAMPLETIME_DEFAULT_INT  ADC_SAMPLETIME_160CYCLES_5
 #elif defined(STM32L4) || defined(STM32WB)
@@ -105,7 +105,7 @@ STATIC const uint8_t adc_cr_to_bits_table[] = {12, 10, 8, 6};
 
 void adc_config(ADC_TypeDef *adc, uint32_t bits) {
     // Configure ADC clock source and enable ADC clock
-    #if defined(STM32L4) || defined(STM32WB)
+    #if defined(STM32L4) || defined(STM32WB) || defined(STM32WL)
     __HAL_RCC_ADC_CONFIG(RCC_ADCCLKSOURCE_SYSCLK);
     __HAL_RCC_ADC_CLK_ENABLE();
     #else
@@ -150,6 +150,8 @@ void adc_config(ADC_TypeDef *adc, uint32_t bits) {
     ADC1_COMMON->CCR = 0; // ADCPR=PCLK/2
     #elif defined(STM32WB)
     ADC1_COMMON->CCR = 0 << ADC_CCR_PRESC_Pos | 0 << ADC_CCR_CKMODE_Pos; // PRESC=1, MODE=ASYNC
+    #elif defined(STM32WL)
+    ADC_COMMON->CCR = 0 << ADC_CCR_PRESC_Pos; // PRESC=1
     #endif
 
     #if defined(STM32H7) || defined(STM32L4) || defined(STM32WB)
@@ -158,7 +160,7 @@ void adc_config(ADC_TypeDef *adc, uint32_t bits) {
     }
     #endif
 
-    #if defined(STM32H7) || defined(STM32L0) || defined(STM32L4) || defined(STM32WB)
+    #if defined(STM32H7) || defined(STM32L0) || defined(STM32L4) || defined(STM32WB) || defined(STM32WL)
     if (!(adc->CR & ADC_CR_ADVREGEN)) {
         adc->CR = ADC_CR_ADVREGEN; // enable VREG
         #if defined(STM32H7)
@@ -172,7 +174,7 @@ void adc_config(ADC_TypeDef *adc, uint32_t bits) {
     #if ADC_V2
     if (!(adc->CR & ADC_CR_ADEN)) {
         // ADC isn't enabled so calibrate it now
-        #if defined(STM32F0) || defined(STM32L0)
+        #if defined(STM32F0) || defined(STM32L0) || defined(STM32WL)
         LL_ADC_StartCalibration(adc);
         #elif defined(STM32G4) || defined(STM32L4) || defined(STM32WB)
         LL_ADC_StartCalibration(adc, LL_ADC_SINGLE_ENDED);
@@ -235,7 +237,7 @@ void adc_config(ADC_TypeDef *adc, uint32_t bits) {
 }
 
 STATIC int adc_get_bits(ADC_TypeDef *adc) {
-    #if defined(STM32F0) || defined(STM32L0)
+    #if defined(STM32F0) || defined(STM32L0) || defined(STM32WL)
     uint32_t res = (adc->CFGR1 & ADC_CFGR1_RES) >> ADC_CFGR1_RES_Pos;
     #elif defined(STM32F4) || defined(STM32F7)
     uint32_t res = (adc->CR1 & ADC_CR1_RES) >> ADC_CR1_RES_Pos;
@@ -409,7 +411,11 @@ STATIC mp_obj_t machine_adc_make_new(const mp_obj_type_t *type, size_t n_args, s
     uint32_t sample_time = ADC_SAMPLETIME_DEFAULT;
     ADC_TypeDef *adc;
     if (mp_obj_is_int(source)) {
+        #if defined(STM32WL)
+        adc = ADC;
+        #else
         adc = ADC1;
+        #endif
         channel = mp_obj_get_int(source);
         if (channel == ADC_CHANNEL_VREFINT
             #if defined(STM32G4)
@@ -426,7 +432,11 @@ STATIC mp_obj_t machine_adc_make_new(const mp_obj_type_t *type, size_t n_args, s
     } else {
         const pin_obj_t *pin = pin_find(source);
         if (pin->adc_num & PIN_ADC1) {
+            #if defined(STM32WL)
+            adc = ADC;
+            #else
             adc = ADC1;
+            #endif
         #if defined(ADC2)
         } else if (pin->adc_num & PIN_ADC2) {
             adc = ADC2;
diff --git a/ports/stm32/machine_uart.c b/ports/stm32/machine_uart.c
index 6a12fad324420..681939094b9ed 100644
--- a/ports/stm32/machine_uart.c
+++ b/ports/stm32/machine_uart.c
@@ -459,7 +459,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(pyb_uart_readchar_obj, pyb_uart_readchar);
 // uart.sendbreak()
 STATIC mp_obj_t pyb_uart_sendbreak(mp_obj_t self_in) {
     pyb_uart_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    #if defined(STM32F0) || defined(STM32F7) || defined(STM32G4) || defined(STM32H7) || defined(STM32L0) || defined(STM32L4) || defined(STM32WB)
+    #if defined(STM32F0) || defined(STM32F7) || defined(STM32G4) || defined(STM32H7) || defined(STM32L0) || defined(STM32L4) || defined(STM32WB) || defined(STM32WL)
     self->uartx->RQR = USART_RQR_SBKRQ; // write-only register
     #else
     self->uartx->CR1 |= USART_CR1_SBK;
diff --git a/ports/stm32/modmachine.c b/ports/stm32/modmachine.c
index f9026bc37009b..57b8ef5e6b1d8 100644
--- a/ports/stm32/modmachine.c
+++ b/ports/stm32/modmachine.c
@@ -63,7 +63,7 @@
 #define RCC_CSR_BORRSTF RCC_CSR_PORRSTF
 #endif
 
-#if defined(STM32G4) || defined(STM32L4) || defined(STM32WB)
+#if defined(STM32G4) || defined(STM32L4) || defined(STM32WB) || defined(STM32WL)
 // L4 does not have a POR, so use BOR instead
 #define RCC_CSR_PORRSTF RCC_CSR_BORRSTF
 #endif
diff --git a/ports/stm32/mpconfigboard_common.h b/ports/stm32/mpconfigboard_common.h
index 17a4ad26e4b5c..7c8662318dbc0 100644
--- a/ports/stm32/mpconfigboard_common.h
+++ b/ports/stm32/mpconfigboard_common.h
@@ -404,6 +404,16 @@
 #define MICROPY_HW_RFCORE_BLE_LL_ONLY                   (1) // use LL only, we provide the rest of the BLE stack
 #endif
 
+// Configuration for STM32WL series
+#elif defined(STM32WL)
+
+#define MP_HAL_UNIQUE_ID_ADDRESS (UID_BASE)
+#define PYB_EXTI_NUM_VECTORS (21) // up to RTC_WKUP
+#define MICROPY_HW_MAX_I2C (3)
+#define MICROPY_HW_MAX_TIMER (17)
+#define MICROPY_HW_MAX_UART (2)
+#define MICROPY_HW_MAX_LPUART (1)
+
 #else
 #error Unsupported MCU series
 #endif
diff --git a/ports/stm32/mphalport.c b/ports/stm32/mphalport.c
index 2b98a620ef2fa..2025388413fa6 100644
--- a/ports/stm32/mphalport.c
+++ b/ports/stm32/mphalport.c
@@ -99,7 +99,7 @@ void mp_hal_gpio_clock_enable(GPIO_TypeDef *gpio) {
     #elif defined(STM32L0)
     #define AHBxENR IOPENR
     #define AHBxENR_GPIOAEN_Pos RCC_IOPENR_IOPAEN_Pos
-    #elif defined(STM32G4) || defined(STM32L4) || defined(STM32WB)
+    #elif defined(STM32G4) || defined(STM32L4) || defined(STM32WB) || defined(STM32WL)
     #define AHBxENR AHB2ENR
     #define AHBxENR_GPIOAEN_Pos RCC_AHB2ENR_GPIOAEN_Pos
     #endif
diff --git a/ports/stm32/powerctrl.c b/ports/stm32/powerctrl.c
index ad3a3ea4c2ff0..a2e3b5c71b663 100644
--- a/ports/stm32/powerctrl.c
+++ b/ports/stm32/powerctrl.c
@@ -151,7 +151,7 @@ void powerctrl_check_enter_bootloader(void) {
     #endif
 }
 
-#if !defined(STM32F0) && !defined(STM32L0) && !defined(STM32WB)
+#if !defined(STM32F0) && !defined(STM32L0) && !defined(STM32WB) && !defined(STM32WL)
 
 typedef struct _sysclk_scaling_table_entry_t {
     uint16_t mhz;
@@ -542,9 +542,15 @@ int powerctrl_set_sysclk(uint32_t sysclk, uint32_t ahb, uint32_t apb1, uint32_t
     return 0;
 }
 
-#elif defined(STM32WB)
+#elif defined(STM32WB) || defined(STM32WL)
 
+#if defined(STM32WB)
 #include "stm32wbxx_ll_utils.h"
+#define FLASH_LATENCY_MAX LL_FLASH_LATENCY_3
+#else
+#include "stm32wlxx_ll_utils.h"
+#define FLASH_LATENCY_MAX LL_FLASH_LATENCY_2
+#endif
 
 #define LPR_THRESHOLD (2000000)
 #define VOS2_THRESHOLD (16000000)
@@ -605,8 +611,8 @@ int powerctrl_set_sysclk(uint32_t sysclk, uint32_t ahb, uint32_t apb1, uint32_t
     } else if (sysclk_mode == SYSCLK_MODE_MSI) {
         // Set flash latency to maximum to ensure the latency is large enough for
         // both the current SYSCLK and the SYSCLK that will be selected below.
-        LL_FLASH_SetLatency(LL_FLASH_LATENCY_3);
-        while (LL_FLASH_GetLatency() != LL_FLASH_LATENCY_3) {
+        LL_FLASH_SetLatency(FLASH_LATENCY_MAX);
+        while (LL_FLASH_GetLatency() != FLASH_LATENCY_MAX) {
         }
 
         // Before changing the MSIRANGE value, if MSI is on then it must also be ready.
@@ -686,7 +692,7 @@ void powerctrl_enter_stop_mode(void) {
     __HAL_RCC_WAKEUPSTOP_CLK_CONFIG(RCC_STOP_WAKEUPCLOCK_MSI);
     #endif
 
-    #if !defined(STM32F0) && !defined(STM32G4) && !defined(STM32L0) && !defined(STM32L4) && !defined(STM32WB)
+    #if !defined(STM32F0) && !defined(STM32G4) && !defined(STM32L0) && !defined(STM32L4) && !defined(STM32WB) && !defined(STM32WL)
     // takes longer to wake but reduces stop current
     HAL_PWREx_EnableFlashPowerDown();
     #endif
@@ -765,7 +771,7 @@ void powerctrl_enter_stop_mode(void) {
     #if defined(STM32H7)
     while (__HAL_RCC_GET_SYSCLK_SOURCE() != RCC_CFGR_SWS_PLL1) {
     }
-    #elif defined(STM32WB)
+    #elif defined(STM32WB) || defined(STM32WL)
     while (__HAL_RCC_GET_SYSCLK_SOURCE() != RCC_SYSCLKSOURCE_STATUS_PLLCLK) {
     }
     #else
@@ -861,7 +867,7 @@ void powerctrl_enter_standby_mode(void) {
     #if defined(STM32F0) || defined(STM32L0)
     #define CR_BITS (RTC_CR_ALRAIE | RTC_CR_WUTIE | RTC_CR_TSIE)
     #define ISR_BITS (RTC_ISR_ALRAF | RTC_ISR_WUTF | RTC_ISR_TSF)
-    #elif defined(STM32G4)
+    #elif defined(STM32G4) || defined(STM32WL)
     #define CR_BITS (RTC_CR_ALRAIE | RTC_CR_ALRBIE | RTC_CR_WUTIE | RTC_CR_TSIE)
     #define ISR_BITS (RTC_MISR_ALRAMF | RTC_MISR_ALRBMF | RTC_MISR_WUTMF | RTC_MISR_TSMF)
     #elif defined(STM32H7A3xx) || defined(STM32H7A3xxQ) || defined(STM32H7B3xx) || defined(STM32H7B3xxQ)
@@ -885,7 +891,7 @@ void powerctrl_enter_standby_mode(void) {
     // clear RTC wake-up flags
     #if defined(SR_BITS)
     RTC->SR &= ~SR_BITS;
-    #elif defined(STM32G4)
+    #elif defined(STM32G4) || defined(STM32WL)
     RTC->MISR &= ~ISR_BITS;
     #else
     RTC->ISR &= ~ISR_BITS;
@@ -907,6 +913,9 @@ void powerctrl_enter_standby_mode(void) {
     // clear all wake-up flags
     PWR->SCR |= PWR_SCR_CWUF5 | PWR_SCR_CWUF4 | PWR_SCR_CWUF3 | PWR_SCR_CWUF2 | PWR_SCR_CWUF1;
     // TODO
+    #elif defined(STM32WL)
+    // clear all wake-up flags
+    PWR->SCR |= PWR_SCR_CWUF3 | PWR_SCR_CWUF2 | PWR_SCR_CWUF1;
     #else
     // clear global wake-up flag
     PWR->CR |= PWR_CR_CWUF;
diff --git a/ports/stm32/powerctrlboot.c b/ports/stm32/powerctrlboot.c
index 41b56296e0af0..4ecd83e2c6d07 100644
--- a/ports/stm32/powerctrlboot.c
+++ b/ports/stm32/powerctrlboot.c
@@ -212,4 +212,41 @@ void SystemClock_Config(void) {
     powerctrl_config_systick();
 }
 
+#elif defined(STM32WL)
+
+#include "stm32wlxx_ll_utils.h"
+
+void SystemClock_Config(void) {
+    // Set flash latency
+    LL_FLASH_SetLatency(LL_FLASH_LATENCY_2);
+    while (LL_FLASH_GetLatency() != LL_FLASH_LATENCY_2) {
+    }
+
+    LL_PWR_SetRegulVoltageScaling(LL_PWR_REGU_VOLTAGE_SCALE1);
+
+    // Enable MSI
+    LL_RCC_MSI_Enable();
+    while (!LL_RCC_MSI_IsReady()) {
+    }
+
+    // Configure MSI
+    LL_RCC_MSI_EnableRangeSelection();
+    LL_RCC_MSI_SetRange(LL_RCC_MSIRANGE_11);
+    LL_RCC_MSI_SetCalibTrimming(0);
+
+    // Select SYSCLK source
+    LL_RCC_SetSysClkSource(LL_RCC_SYS_CLKSOURCE_MSI);
+    while (LL_RCC_GetSysClkSource() != LL_RCC_SYS_CLKSOURCE_STATUS_MSI) {
+    }
+
+    // Set bus dividers
+    LL_RCC_SetAHBPrescaler(LL_RCC_SYSCLK_DIV_1);
+    LL_RCC_SetAHB3Prescaler(LL_RCC_SYSCLK_DIV_1);
+    LL_RCC_SetAPB1Prescaler(LL_RCC_APB1_DIV_1);
+    LL_RCC_SetAPB2Prescaler(LL_RCC_APB2_DIV_1);
+
+    SystemCoreClockUpdate();
+    powerctrl_config_systick();
+}
+
 #endif
diff --git a/ports/stm32/rtc.c b/ports/stm32/rtc.c
index 1164e71e08822..e776f67bb9b09 100644
--- a/ports/stm32/rtc.c
+++ b/ports/stm32/rtc.c
@@ -94,6 +94,11 @@ STATIC bool rtc_need_init_finalise = false;
 #endif
 
 void rtc_init_start(bool force_init) {
+    #if defined(STM32WL)
+    // Enable the RTC APB bus clock, to communicate with the RTC.
+    __HAL_RCC_RTCAPB_CLK_ENABLE();
+    #endif
+
     RTCHandle.Instance = RTC;
 
     /* Configure RTC prescaler and RTC data registers */
@@ -220,7 +225,7 @@ void rtc_init_finalise() {
 
     // fresh reset; configure RTC Calendar
     RTC_CalendarConfig();
-    #if defined(STM32G4) || defined(STM32L4) || defined(STM32WB)
+    #if defined(STM32G4) || defined(STM32L4) || defined(STM32WB) || defined(STM32WL)
     if (__HAL_RCC_GET_FLAG(RCC_FLAG_BORRST) != RESET) {
     #else
     if (__HAL_RCC_GET_FLAG(RCC_FLAG_PORRST) != RESET) {
@@ -252,7 +257,7 @@ STATIC HAL_StatusTypeDef PYB_RCC_OscConfig(RCC_OscInitTypeDef *RCC_OscInitStruct
 
     /*------------------------------ LSE Configuration -------------------------*/
     if ((RCC_OscInitStruct->OscillatorType & RCC_OSCILLATORTYPE_LSE) == RCC_OSCILLATORTYPE_LSE) {
-        #if !defined(STM32H7) && !defined(STM32WB)
+        #if !defined(STM32H7) && !defined(STM32WB) && !defined(STM32WL)
         // Enable Power Clock
         __HAL_RCC_PWR_CLK_ENABLE();
         #endif
@@ -261,7 +266,7 @@ STATIC HAL_StatusTypeDef PYB_RCC_OscConfig(RCC_OscInitTypeDef *RCC_OscInitStruct
         HAL_PWR_EnableBkUpAccess();
         uint32_t tickstart = HAL_GetTick();
 
-        #if defined(STM32F7) || defined(STM32G4) || defined(STM32L4) || defined(STM32H7) || defined(STM32WB)
+        #if defined(STM32F7) || defined(STM32G4) || defined(STM32L4) || defined(STM32H7) || defined(STM32WB) || defined(STM32WL)
         // __HAL_RCC_PWR_CLK_ENABLE();
         // Enable write access to Backup domain
         // PWR->CR1 |= PWR_CR1_DBP;
@@ -349,7 +354,7 @@ STATIC HAL_StatusTypeDef PYB_RTC_Init(RTC_HandleTypeDef *hrtc) {
         #elif defined(STM32F7)
         hrtc->Instance->OR &= (uint32_t) ~RTC_OR_ALARMTYPE;
         hrtc->Instance->OR |= (uint32_t)(hrtc->Init.OutPutType);
-        #elif defined(STM32G4)
+        #elif defined(STM32G4) || defined(STM32WL)
         hrtc->Instance->CR &= (uint32_t) ~RTC_CR_TAMPALRM_TYPE_Msk;
         hrtc->Instance->CR |= (uint32_t)(hrtc->Init.OutPutType);
         #else
@@ -714,7 +719,7 @@ mp_obj_t pyb_rtc_wakeup(size_t n_args, const mp_obj_t *args) {
         RTC->WPR = 0xff;
 
         // enable external interrupts on line EXTI_RTC_WAKEUP
-        #if defined(STM32G4) || defined(STM32L4) || defined(STM32WB)
+        #if defined(STM32G4) || defined(STM32L4) || defined(STM32WB) || defined(STM32WL)
         EXTI->IMR1 |= 1 << EXTI_RTC_WAKEUP;
         EXTI->RTSR1 |= 1 << EXTI_RTC_WAKEUP;
         #elif defined(STM32H7)
@@ -726,14 +731,14 @@ mp_obj_t pyb_rtc_wakeup(size_t n_args, const mp_obj_t *args) {
         #endif
 
         // clear interrupt flags
-        #if defined(STM32G4)
+        #if defined(STM32G4) || defined(STM32WL)
         RTC->ICSR &= ~RTC_ICSR_WUTWF;
         #elif defined(STM32H7A3xx) || defined(STM32H7A3xxQ) || defined(STM32H7B3xx) || defined(STM32H7B3xxQ)
         RTC->SR &= ~RTC_SR_WUTF;
         #else
         RTC->ISR &= ~RTC_ISR_WUTF;
         #endif
-        #if defined(STM32G4) || defined(STM32L4) || defined(STM32WB)
+        #if defined(STM32G4) || defined(STM32L4) || defined(STM32WB) || defined(STM32WL)
         EXTI->PR1 = 1 << EXTI_RTC_WAKEUP;
         #elif defined(STM32H7)
         EXTI_D1->PR1 = 1 << EXTI_RTC_WAKEUP;
@@ -753,7 +758,7 @@ mp_obj_t pyb_rtc_wakeup(size_t n_args, const mp_obj_t *args) {
         RTC->WPR = 0xff;
 
         // disable external interrupts on line EXTI_RTC_WAKEUP
-        #if defined(STM32G4) || defined(STM32L4) || defined(STM32WB)
+        #if defined(STM32G4) || defined(STM32L4) || defined(STM32WB) || defined(STM32WL)
         EXTI->IMR1 &= ~(1 << EXTI_RTC_WAKEUP);
         #elif defined(STM32H7)
         EXTI_D1->IMR1 |= 1 << EXTI_RTC_WAKEUP;
diff --git a/ports/stm32/stm32.mk b/ports/stm32/stm32.mk
index f17351cdcaae3..4de101ce7a51a 100644
--- a/ports/stm32/stm32.mk
+++ b/ports/stm32/stm32.mk
@@ -48,7 +48,7 @@ CFLAGS_CORTEX_M += -mfpu=fpv5-d16 -mfloat-abi=hard
 SUPPORTS_HARDWARE_FP_SINGLE = 1
 SUPPORTS_HARDWARE_FP_DOUBLE = 1
 else
-ifeq ($(MCU_SERIES),$(filter $(MCU_SERIES),f0 l0))
+ifeq ($(MCU_SERIES),$(filter $(MCU_SERIES),f0 l0 wl))
 CFLAGS_CORTEX_M += -msoft-float
 else
 CFLAGS_CORTEX_M += -mfpu=fpv4-sp-d16 -mfloat-abi=hard
@@ -66,3 +66,4 @@ CFLAGS_MCU_l0 = $(CFLAGS_CORTEX_M) -mtune=cortex-m0plus -mcpu=cortex-m0plus
 CFLAGS_MCU_l4 = $(CFLAGS_CORTEX_M) -mtune=cortex-m4 -mcpu=cortex-m4
 CFLAGS_MCU_h7 = $(CFLAGS_CORTEX_M) -mtune=cortex-m7 -mcpu=cortex-m7
 CFLAGS_MCU_wb = $(CFLAGS_CORTEX_M) -mtune=cortex-m4 -mcpu=cortex-m4
+CFLAGS_MCU_wl = $(CFLAGS_CORTEX_M) -mtune=cortex-m4 -mcpu=cortex-m4
diff --git a/ports/stm32/stm32_it.c b/ports/stm32/stm32_it.c
index 84274e3c62397..39229a143ba3d 100644
--- a/ports/stm32/stm32_it.c
+++ b/ports/stm32/stm32_it.c
@@ -529,7 +529,7 @@ void TAMP_STAMP_IRQHandler(void) {
 
 void RTC_WKUP_IRQHandler(void) {
     IRQ_ENTER(RTC_WKUP_IRQn);
-    #if defined(STM32G4)
+    #if defined(STM32G4) || defined(STM32WL)
     RTC->MISR &= ~RTC_MISR_WUTMF; // clear wakeup interrupt flag
     #elif defined(STM32H7A3xx) || defined(STM32H7A3xxQ) || defined(STM32H7B3xx) || defined(STM32H7B3xxQ)
     RTC->SR &= ~RTC_SR_WUTF; // clear wakeup interrupt flag
diff --git a/ports/stm32/timer.c b/ports/stm32/timer.c
index 57c8dc6c7b9d7..12f0515d4e99f 100644
--- a/ports/stm32/timer.c
+++ b/ports/stm32/timer.c
@@ -873,14 +873,14 @@ STATIC const uint32_t tim_instance_table[MICROPY_HW_MAX_TIMER] = {
     #endif
     #endif
     #if defined(TIM16)
-    #if defined(STM32F0) || defined(STM32H7)
+    #if defined(STM32F0) || defined(STM32H7) || defined(STM32WL)
     TIM_ENTRY(16, TIM16_IRQn),
     #else
     TIM_ENTRY(16, TIM1_UP_TIM16_IRQn),
     #endif
     #endif
     #if defined(TIM17)
-    #if defined(STM32F0) || defined(STM32H7)
+    #if defined(STM32F0) || defined(STM32H7) || defined(STM32WL)
     TIM_ENTRY(17, TIM17_IRQn),
     #else
     TIM_ENTRY(17, TIM1_TRG_COM_TIM17_IRQn),
diff --git a/ports/stm32/uart.c b/ports/stm32/uart.c
index 61e72999e2687..13e1667d2c324 100644
--- a/ports/stm32/uart.c
+++ b/ports/stm32/uart.c
@@ -41,16 +41,25 @@
 #if defined(STM32F4)
 #define UART_RXNE_IS_SET(uart) ((uart)->SR & USART_SR_RXNE)
 #else
-#if defined(STM32H7)
+#if defined(STM32H7) || defined(STM32WL)
 #define USART_ISR_RXNE USART_ISR_RXNE_RXFNE
 #endif
 #define UART_RXNE_IS_SET(uart) ((uart)->ISR & USART_ISR_RXNE)
 #endif
 
+#if defined(STM32WL)
+#define UART_RXNE_IT_EN(uart) do { (uart)->CR1 |= USART_CR1_RXNEIE_RXFNEIE; } while (0)
+#define UART_RXNE_IT_DIS(uart) do { (uart)->CR1 &= ~USART_CR1_RXNEIE_RXFNEIE; } while (0)
+#else
 #define UART_RXNE_IT_EN(uart) do { (uart)->CR1 |= USART_CR1_RXNEIE; } while (0)
 #define UART_RXNE_IT_DIS(uart) do { (uart)->CR1 &= ~USART_CR1_RXNEIE; } while (0)
+#endif
 
+#if defined(STM32WL)
+#define USART_CR1_IE_BASE (USART_CR1_PEIE | USART_CR1_TXEIE_TXFNFIE | USART_CR1_TCIE | USART_CR1_RXNEIE_RXFNEIE | USART_CR1_IDLEIE)
+#else
 #define USART_CR1_IE_BASE (USART_CR1_PEIE | USART_CR1_TXEIE | USART_CR1_TCIE | USART_CR1_RXNEIE | USART_CR1_IDLEIE)
+#endif
 #define USART_CR2_IE_BASE (USART_CR2_LBDIE)
 #define USART_CR3_IE_BASE (USART_CR3_CTSIE | USART_CR3_EIE)
 
@@ -92,7 +101,7 @@
 #define USART_CR2_IE_ALL (USART_CR2_IE_BASE)
 #define USART_CR3_IE_ALL (USART_CR3_IE_BASE | USART_CR3_WUFIE)
 
-#elif defined(STM32L4) || defined(STM32WB)
+#elif defined(STM32L4) || defined(STM32WB) || defined(STM32WL)
 #define USART_CR1_IE_ALL (USART_CR1_IE_BASE | USART_CR1_EOBIE | USART_CR1_RTOIE | USART_CR1_CMIE)
 #define USART_CR2_IE_ALL (USART_CR2_IE_BASE)
 #if defined(USART_CR3_TCBGTIE)
@@ -113,9 +122,17 @@ typedef struct _pyb_uart_irq_map_t {
 STATIC const pyb_uart_irq_map_t mp_uart_irq_map[] = {
     { USART_CR1_IDLEIE, UART_FLAG_IDLE}, // RX idle
     { USART_CR1_PEIE,   UART_FLAG_PE},   // parity error
+    #if defined(STM32WL)
+    { USART_CR1_TXEIE_TXFNFIE, UART_FLAG_TXE}, // TX register empty
+    #else
     { USART_CR1_TXEIE,  UART_FLAG_TXE},  // TX register empty
+    #endif
     { USART_CR1_TCIE,   UART_FLAG_TC},   // TX complete
+    #if defined(STM32WL)
+    { USART_CR1_RXNEIE_RXFNEIE, UART_FLAG_RXNE}, // RX register not empty
+    #else
     { USART_CR1_RXNEIE, UART_FLAG_RXNE}, // RX register not empty
+    #endif
     #if 0
     // For now only IRQs selected by CR1 are supported
     #if defined(STM32F4)
@@ -813,14 +830,14 @@ uint32_t uart_get_baudrate(pyb_uart_obj_t *self) {
     #if defined(LPUART1)
     if (self->uart_id == PYB_LPUART_1) {
         return LL_LPUART_GetBaudRate(self->uartx, uart_get_source_freq(self)
-            #if defined(STM32G4) || defined(STM32H7) || defined(STM32WB)
+            #if defined(STM32G4) || defined(STM32H7) || defined(STM32WB) || defined(STM32WL)
             , self->uartx->PRESC
             #endif
             );
     }
     #endif
     return LL_USART_GetBaudRate(self->uartx, uart_get_source_freq(self),
-        #if defined(STM32G4) || defined(STM32H7) || defined(STM32WB)
+        #if defined(STM32G4) || defined(STM32H7) || defined(STM32WB) || defined(STM32WL)
         self->uartx->PRESC,
         #endif
         LL_USART_OVERSAMPLING_16);
@@ -830,7 +847,7 @@ void uart_set_baudrate(pyb_uart_obj_t *self, uint32_t baudrate) {
     #if defined(LPUART1)
     if (self->uart_id == PYB_LPUART_1) {
         LL_LPUART_SetBaudRate(self->uartx, uart_get_source_freq(self),
-            #if defined(STM32G4) || defined(STM32H7) || defined(STM32WB)
+            #if defined(STM32G4) || defined(STM32H7) || defined(STM32WB) || defined(STM32WL)
             LL_LPUART_PRESCALER_DIV1,
             #endif
             baudrate);
@@ -838,7 +855,7 @@ void uart_set_baudrate(pyb_uart_obj_t *self, uint32_t baudrate) {
     }
     #endif
     LL_USART_SetBaudRate(self->uartx, uart_get_source_freq(self),
-        #if defined(STM32G4) || defined(STM32H7) || defined(STM32WB)
+        #if defined(STM32G4) || defined(STM32H7) || defined(STM32WB) || defined(STM32WL)
         LL_USART_PRESCALER_DIV1,
         #endif
         LL_USART_OVERSAMPLING_16, baudrate);
@@ -889,7 +906,7 @@ int uart_rx_char(pyb_uart_obj_t *self) {
         return data;
     } else {
         // no buffering
-        #if defined(STM32F0) || defined(STM32F7) || defined(STM32G4) || defined(STM32L0) || defined(STM32L4) || defined(STM32H7) || defined(STM32WB)
+        #if defined(STM32F0) || defined(STM32F7) || defined(STM32G4) || defined(STM32L0) || defined(STM32L4) || defined(STM32H7) || defined(STM32WB) || defined(STM32WL)
         int data = self->uartx->RDR & self->char_mask;
         self->uartx->ICR = USART_ICR_ORECF; // clear ORE if it was set
         return data;
@@ -1039,7 +1056,7 @@ void uart_irq_handler(mp_uint_t uart_id) {
             uint16_t next_head = (self->read_buf_head + 1) % self->read_buf_len;
             if (next_head != self->read_buf_tail) {
                 // only read data if room in buf
-                #if defined(STM32F0) || defined(STM32F7) || defined(STM32G4) || defined(STM32L0) || defined(STM32L4) || defined(STM32H7) || defined(STM32WB)
+                #if defined(STM32F0) || defined(STM32F7) || defined(STM32G4) || defined(STM32L0) || defined(STM32L4) || defined(STM32H7) || defined(STM32WB) || defined(STM32WL)
                 int data = self->uartx->RDR; // clears UART_FLAG_RXNE
                 #else
                 self->mp_irq_flags = self->uartx->SR; // resample to get any new flags since next read of DR will clear SR
diff --git a/ports/stm32/uart.h b/ports/stm32/uart.h
index 0a268ad465d69..5fee841f8f769 100644
--- a/ports/stm32/uart.h
+++ b/ports/stm32/uart.h
@@ -102,7 +102,7 @@ void uart_tx_strn(pyb_uart_obj_t *uart_obj, const char *str, uint len);
 static inline bool uart_tx_avail(pyb_uart_obj_t *self) {
     #if defined(STM32F4)
     return self->uartx->SR & USART_SR_TXE;
-    #elif defined(STM32H7)
+    #elif defined(STM32H7) || defined(STM32WL)
     return self->uartx->ISR & USART_ISR_TXE_TXFNF;
     #else
     return self->uartx->ISR & USART_ISR_TXE;

From e306f2285ba497f4d12e4068149cb245036a99b9 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 22 Feb 2021 11:55:34 +1100
Subject: [PATCH 1666/3533] stm32/boards/NUCLEO_WL55: Add new board definition.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/boards/NUCLEO_WL55/board.json     | 15 +++++
 .../stm32/boards/NUCLEO_WL55/mpconfigboard.h  | 63 +++++++++++++++++++
 .../stm32/boards/NUCLEO_WL55/mpconfigboard.mk | 13 ++++
 ports/stm32/boards/NUCLEO_WL55/pins.csv       | 46 ++++++++++++++
 .../boards/NUCLEO_WL55/stm32wlxx_hal_conf.h   | 18 ++++++
 5 files changed, 155 insertions(+)
 create mode 100644 ports/stm32/boards/NUCLEO_WL55/board.json
 create mode 100644 ports/stm32/boards/NUCLEO_WL55/mpconfigboard.h
 create mode 100644 ports/stm32/boards/NUCLEO_WL55/mpconfigboard.mk
 create mode 100644 ports/stm32/boards/NUCLEO_WL55/pins.csv
 create mode 100644 ports/stm32/boards/NUCLEO_WL55/stm32wlxx_hal_conf.h

diff --git a/ports/stm32/boards/NUCLEO_WL55/board.json b/ports/stm32/boards/NUCLEO_WL55/board.json
new file mode 100644
index 0000000000000..d756a4cdbbddb
--- /dev/null
+++ b/ports/stm32/boards/NUCLEO_WL55/board.json
@@ -0,0 +1,15 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [],
+    "images": [
+        "nucleo_wl55.jpg"
+    ],
+    "mcu": "stm32wl",
+    "product": "Nucleo WL55",
+    "thumbnail": "",
+    "url": "",
+    "vendor": "ST Microelectronics"
+}
diff --git a/ports/stm32/boards/NUCLEO_WL55/mpconfigboard.h b/ports/stm32/boards/NUCLEO_WL55/mpconfigboard.h
new file mode 100644
index 0000000000000..baf1f023be861
--- /dev/null
+++ b/ports/stm32/boards/NUCLEO_WL55/mpconfigboard.h
@@ -0,0 +1,63 @@
+/* This file is part of the MicroPython project, https://micropython.org/
+ * MIT License; Copyright (c) 2021 Damien P. George
+ */
+
+#define MICROPY_HW_BOARD_NAME                   "NUCLEO-WL55"
+#define MICROPY_HW_MCU_NAME                     "STM32WL55JCI7"
+
+#define MICROPY_EMIT_THUMB                      (0)
+#define MICROPY_EMIT_INLINE_THUMB               (0)
+#define MICROPY_PY_BUILTINS_COMPLEX             (0)
+#define MICROPY_PY_GENERATOR_PEND_THROW         (0)
+#define MICROPY_PY_MATH                         (0)
+#define MICROPY_PY_FRAMEBUF                     (0)
+#define MICROPY_PY_USOCKET                      (0)
+#define MICROPY_PY_NETWORK                      (0)
+#define MICROPY_PY_ONEWIRE                      (0)
+#define MICROPY_PY_STM                          (0)
+#define MICROPY_PY_PYB_LEGACY                   (0)
+#define MICROPY_PY_UHEAPQ                       (0)
+#define MICROPY_PY_UTIMEQ                       (0)
+
+#define MICROPY_HW_HAS_FLASH                    (1)
+#define MICROPY_HW_ENABLE_RTC                   (1)
+#define MICROPY_HW_ENABLE_RNG                   (1)
+#define MICROPY_HW_ENABLE_ADC                   (0) // use machine.ADC instead
+#define MICROPY_HW_HAS_SWITCH                   (1)
+
+// There is an external 32kHz oscillator
+#define MICROPY_HW_RTC_USE_LSE                  (1)
+#define MICROPY_HW_RTC_USE_US                   (1)
+
+// UART buses
+#define MICROPY_HW_UART1_TX                     (pin_B6)    // Arduino D1, pin 7 on CN9
+#define MICROPY_HW_UART1_RX                     (pin_B7)    // Arduino D0, pin 8 on CN9
+#define MICROPY_HW_LPUART1_TX                   (pin_A2)    // ST-link
+#define MICROPY_HW_LPUART1_RX                   (pin_A3)    // ST-link
+#define MICROPY_HW_UART_REPL                    PYB_LPUART_1
+#define MICROPY_HW_UART_REPL_BAUD               115200
+
+// I2C buses
+#define MICROPY_HW_I2C1_SCL                     (pin_A12)   // Arduino D15, pin 10 on CN5
+#define MICROPY_HW_I2C1_SDA                     (pin_A11)   // Arduino D14, pin 9 on CN5
+#define MICROPY_HW_I2C3_SCL                     (pin_B13)   // Arduino A5, pin 6 on CN8
+#define MICROPY_HW_I2C3_SDA                     (pin_B14)   // Arduino A4, pin 5 on CN8
+
+// SPI buses
+#define MICROPY_HW_SPI1_NSS                     (pin_A4)    // Arduino D10  pin 3 on CN5
+#define MICROPY_HW_SPI1_SCK                     (pin_A5)    // Arduino D13, pin 6 on CN5
+#define MICROPY_HW_SPI1_MISO                    (pin_A6)    // Arduino D12, pin 5 on CN5
+#define MICROPY_HW_SPI1_MOSI                    (pin_A7)    // Arduino D11, pin 4 on CN5
+
+// User switch; pressing the button makes the input go low
+#define MICROPY_HW_USRSW_PIN                    (pin_A0)
+#define MICROPY_HW_USRSW_PULL                   (GPIO_PULLUP)
+#define MICROPY_HW_USRSW_EXTI_MODE              (GPIO_MODE_IT_FALLING)
+#define MICROPY_HW_USRSW_PRESSED                (0)
+
+// LEDs
+#define MICROPY_HW_LED1                         (pin_B15) // blue
+#define MICROPY_HW_LED2                         (pin_B9) // green
+#define MICROPY_HW_LED3                         (pin_B11) // red
+#define MICROPY_HW_LED_ON(pin)                  (mp_hal_pin_high(pin))
+#define MICROPY_HW_LED_OFF(pin)                 (mp_hal_pin_low(pin))
diff --git a/ports/stm32/boards/NUCLEO_WL55/mpconfigboard.mk b/ports/stm32/boards/NUCLEO_WL55/mpconfigboard.mk
new file mode 100644
index 0000000000000..210f3058c1bea
--- /dev/null
+++ b/ports/stm32/boards/NUCLEO_WL55/mpconfigboard.mk
@@ -0,0 +1,13 @@
+MCU_SERIES = wl
+CMSIS_MCU = STM32WL55xx
+AF_FILE = boards/stm32wl55_af.csv
+STARTUP_FILE = $(STM32LIB_CMSIS_BASE)/Source/Templates/gcc/startup_stm32wl55xx_cm4.o
+LD_FILES = boards/stm32wl55xc.ld boards/common_basic.ld
+TEXT0_ADDR = 0x08000000
+
+# MicroPython settings
+MICROPY_VFS_FAT = 0
+MICROPY_VFS_LFS2 = 1
+
+# Don't include default frozen modules because MCU is tight on flash space
+FROZEN_MANIFEST ?=
diff --git a/ports/stm32/boards/NUCLEO_WL55/pins.csv b/ports/stm32/boards/NUCLEO_WL55/pins.csv
new file mode 100644
index 0000000000000..afcf34df1147f
--- /dev/null
+++ b/ports/stm32/boards/NUCLEO_WL55/pins.csv
@@ -0,0 +1,46 @@
+,PA0
+,PA1
+,PA2
+,PA3
+,PA4
+,PA5
+,PA6
+,PA7
+,PA8
+,PA9
+,PA10
+,PA11
+,PA12
+,PA13
+,PA14
+,PA15
+,PB0
+,PB1
+,PB2
+,PB3
+,PB4
+,PB5
+,PB6
+,PB7
+,PB8
+,PB9
+,PB10
+,PB11
+,PB12
+,PB13
+,PB14
+,PB15
+,PC0
+,PC1
+,PC2
+,PC3
+,PC4
+,PC5
+,PC6
+SW,PA0
+SW1,PA0
+SW2,PA1
+SW3,PC6
+LED_GREEN,PB9
+LED_RED,PB11
+LED_BLUE,PB15
diff --git a/ports/stm32/boards/NUCLEO_WL55/stm32wlxx_hal_conf.h b/ports/stm32/boards/NUCLEO_WL55/stm32wlxx_hal_conf.h
new file mode 100644
index 0000000000000..2c28cc3d2a48d
--- /dev/null
+++ b/ports/stm32/boards/NUCLEO_WL55/stm32wlxx_hal_conf.h
@@ -0,0 +1,18 @@
+/* This file is part of the MicroPython project, https://micropython.org/
+ * The MIT License (MIT)
+ * Copyright (c) 2021 Damien P. George
+ */
+#ifndef MICROPY_INCLUDED_STM32WLXX_HAL_CONF_H
+#define MICROPY_INCLUDED_STM32WLXX_HAL_CONF_H
+
+// Oscillator values in Hz
+#define HSE_VALUE (32000000)
+#define LSE_VALUE (32768)
+
+// Oscillator timeouts in ms
+#define HSE_STARTUP_TIMEOUT (100)
+#define LSE_STARTUP_TIMEOUT (5000)
+
+#include "boards/stm32wlxx_hal_conf_base.h"
+
+#endif // MICROPY_INCLUDED_STM32WLXX_HAL_CONF_H

From ae5f647a2d294cf940367918fbb250f1a9c0c8c0 Mon Sep 17 00:00:00 2001
From: "Peter D. Gray" <peter@conalgo.com>
Date: Thu, 4 Jan 2018 12:10:15 -0500
Subject: [PATCH 1667/3533] stm32/system_stm32: Make SystemClock_Config() a
 weak symbol.

This allows boards to override as needed.
---
 ports/stm32/system_stm32.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/stm32/system_stm32.c b/ports/stm32/system_stm32.c
index 582d7a3698d24..2ee745a49bde0 100644
--- a/ports/stm32/system_stm32.c
+++ b/ports/stm32/system_stm32.c
@@ -163,7 +163,7 @@ void __fatal_error(const char *msg);
   *
   * Timers run from APBx if APBx_PRESC=1, else 2x APBx
   */
-void SystemClock_Config(void) {
+MP_WEAK void SystemClock_Config(void) {
     #if defined(STM32F7)
     // The DFU bootloader changes the clocksource register from its default power
     // on reset value, so we set it back here, so the clocksources are the same

From e5df4a96fa85ad4cf10d82b3cd5f8ca8b279050b Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Mon, 31 Jan 2022 19:12:48 +0200
Subject: [PATCH 1668/3533] stm32/adc: Fix L4 ADC channel numbers.

Use HAL macro to map decimal numbers to channel numbers.  This is needed
since updating L4 HAL v1.17.0 in a0f5b3148a5c276aa1abf7b77b0964eec80cda16.

Fixes issue #8233.
---
 ports/stm32/adc.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/ports/stm32/adc.c b/ports/stm32/adc.c
index 2e52fb07aac19..497bf5339f0d2 100644
--- a/ports/stm32/adc.c
+++ b/ports/stm32/adc.c
@@ -214,11 +214,7 @@ STATIC bool is_adcx_channel(int channel) {
     #elif defined(STM32H7)
     return __HAL_ADC_IS_CHANNEL_INTERNAL(channel)
            || IS_ADC_CHANNEL(__HAL_ADC_DECIMAL_NB_TO_CHANNEL(channel));
-    #elif defined(STM32L4)
-    ADC_HandleTypeDef handle;
-    handle.Instance = ADCx;
-    return IS_ADC_CHANNEL(&handle, channel);
-    #elif defined(STM32G4) || defined(STM32WB)
+    #elif defined(STM32G4) || defined(STM32L4) || defined(STM32WB)
     ADC_HandleTypeDef handle;
     handle.Instance = ADCx;
     return __HAL_ADC_IS_CHANNEL_INTERNAL(channel)
@@ -338,7 +334,7 @@ STATIC void adc_init_single(pyb_obj_adc_t *adc_obj) {
 STATIC void adc_config_channel(ADC_HandleTypeDef *adc_handle, uint32_t channel) {
     ADC_ChannelConfTypeDef sConfig;
 
-    #if defined(STM32G4) || defined(STM32H7) || defined(STM32WB)
+    #if defined(STM32G4) || defined(STM32H7) || defined(STM32L4) || defined(STM32WB)
     sConfig.Rank = ADC_REGULAR_RANK_1;
     if (__HAL_ADC_IS_CHANNEL_INTERNAL(channel) == 0) {
         channel = __HAL_ADC_DECIMAL_NB_TO_CHANNEL(channel);

From 31f2440388be597ba39679e165676e4ef1b0a98c Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Tue, 1 Feb 2022 15:34:57 +0200
Subject: [PATCH 1669/3533] stm32/adc: Remove obsolete FIRST/LAST GPIO channel
 macros.

---
 ports/stm32/adc.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/ports/stm32/adc.c b/ports/stm32/adc.c
index 497bf5339f0d2..1d4beafa45f5c 100644
--- a/ports/stm32/adc.c
+++ b/ports/stm32/adc.c
@@ -104,8 +104,6 @@
 
 #elif defined(STM32G4)
 
-#define ADC_FIRST_GPIO_CHANNEL  (0)
-#define ADC_LAST_GPIO_CHANNEL   (18)
 #define ADC_SCALE_V             (((float)VREFINT_CAL_VREF) / 1000.0f)
 #define ADC_CAL_ADDRESS         VREFINT_CAL_ADDR
 #define ADC_CAL1                TEMPSENSOR_CAL1_ADDR

From 5679fe6aee7811447ab9dfc9b4539526b23b1d84 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 3 Feb 2022 00:12:08 +1100
Subject: [PATCH 1670/3533] rp2/modutime: Fix time.localtime day-of-week value.

The correct day-of-week is stored in the RTC (0=Monday, 6=Sunday) so there
is no need to adjust it for the return value of time.localtime().

Fixes issue #7889.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/rp2/modutime.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/rp2/modutime.c b/ports/rp2/modutime.c
index 8041ae65b63cc..a5860731015c6 100644
--- a/ports/rp2/modutime.c
+++ b/ports/rp2/modutime.c
@@ -45,7 +45,7 @@ STATIC mp_obj_t time_localtime(size_t n_args, const mp_obj_t *args) {
             mp_obj_new_int(t.hour),
             mp_obj_new_int(t.min),
             mp_obj_new_int(t.sec),
-            mp_obj_new_int((t.dotw + 6) % 7), // convert 0=Sunday to 6=Sunday
+            mp_obj_new_int(t.dotw),
             mp_obj_new_int(timeutils_year_day(t.year, t.month, t.day)),
         };
         return mp_obj_new_tuple(8, tuple);

From 5943a2ec79e51df91e0bb5d57ead68c57569f5cd Mon Sep 17 00:00:00 2001
From: Cem Eliguzel <cemeliguzel@gmail.com>
Date: Thu, 6 Jan 2022 13:53:43 +0300
Subject: [PATCH 1671/3533] docs/develop/porting.rst: Fix build and import
 problems in the example.

---
 docs/develop/porting.rst | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/docs/develop/porting.rst b/docs/develop/porting.rst
index ae0cfd8b067e6..d08fd74e43156 100644
--- a/docs/develop/porting.rst
+++ b/docs/develop/porting.rst
@@ -146,6 +146,9 @@ The following is an example of an ``mpconfigport.h`` file:
    #define MICROPY_ERROR_REPORTING                 (MICROPY_ERROR_REPORTING_TERSE)
    #define MICROPY_FLOAT_IMPL                      (MICROPY_FLOAT_IMPL_FLOAT)
 
+   // Enable u-modules to be imported with their standard name, like sys.
+   #define MICROPY_MODULE_WEAK_LINKS               (1)
+
    // Fine control over Python builtins, classes, modules, etc.
    #define MICROPY_PY_ASYNC_AWAIT                  (0)
    #define MICROPY_PY_BUILTINS_SET                 (0)
@@ -296,7 +299,7 @@ like this:
        mphalport.c \
        ...
 
-   SRC_QSTR += modport.c
+   SRC_QSTR += modmyport.c
 
 If all went correctly then, after rebuilding, you should be able to import the new module:
 

From ddda959e57d704873c91be05dec95846b7949c17 Mon Sep 17 00:00:00 2001
From: Luiz Brandao <fromvega@gmail.com>
Date: Mon, 24 Jan 2022 10:16:35 -0500
Subject: [PATCH 1672/3533] docs/reference/isr_rules.rst: Fix inconsistent
 variable name in example.

Fixed to be conistent with the code example above it.
---
 docs/reference/isr_rules.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/reference/isr_rules.rst b/docs/reference/isr_rules.rst
index 7f466ab42f41c..a611f492a4e8e 100644
--- a/docs/reference/isr_rules.rst
+++ b/docs/reference/isr_rules.rst
@@ -339,8 +339,8 @@ A critical section can comprise a single line of code and a single variable. Con
 
 This example illustrates a subtle source of bugs. The line ``count += 1`` in the main loop carries a specific race
 condition hazard known as a read-modify-write. This is a classic cause of bugs in real time systems. In the main loop
-MicroPython reads the value of ``t.counter``, adds 1 to it, and writes it back. On rare occasions the  interrupt occurs
-after the read and before the write. The interrupt modifies ``t.counter`` but its change is overwritten by the main
+MicroPython reads the value of ``count``, adds 1 to it, and writes it back. On rare occasions the  interrupt occurs
+after the read and before the write. The interrupt modifies ``count`` but its change is overwritten by the main
 loop when the ISR returns. In a real system this could lead to rare, unpredictable failures.
 
 As mentioned above, care should be taken if an instance of a Python built in type is modified in the main code and

From a43764e6549957e1972ec375c330dd2a5c002d89 Mon Sep 17 00:00:00 2001
From: Jonathan Hogg <me@jonathanhogg.com>
Date: Thu, 3 Feb 2022 17:37:46 +0000
Subject: [PATCH 1673/3533] docs/esp32/quickref: Update ADC documentation.

Update ADC documentation now that the new API is described in the main
docs.
---
 docs/esp32/quickref.rst | 94 ++++++++++++++++++++++-------------------
 1 file changed, 51 insertions(+), 43 deletions(-)

diff --git a/docs/esp32/quickref.rst b/docs/esp32/quickref.rst
index de107ee25c0d6..da586819fd493 100644
--- a/docs/esp32/quickref.rst
+++ b/docs/esp32/quickref.rst
@@ -264,82 +264,90 @@ See more examples in the :ref:`esp32_pwm` tutorial.
 ADC (analog to digital conversion)
 ----------------------------------
 
-On the ESP32 ADC functionality is available on pins 32-39 (ADC block 1) and pins
-0, 2, 4, 12-15 and 25-27 (ADC block 2).
+On the ESP32, ADC functionality is available on pins 32-39 (ADC block 1) and
+pins 0, 2, 4, 12-15 and 25-27 (ADC block 2).
 
 Use the :ref:`machine.ADC <machine.ADC>` class::
 
     from machine import ADC
 
-    adc = ADC(Pin(32))          # create ADC object for pin 32
-    adc.read_u16()              # read raw value, 0-65535
+    adc = ADC(pin)        # create an ADC object acting on a pin
+    val = adc.read_u16()  # read a raw analog value in the range 0-65535
+    val = adc.read_uv()   # read an analog value in microvolts
 
-Note that the ESP32 uses an internal ADC reference voltage of 1.0v. To read
-voltages above this value, input attenuation can be applied with the optional
-``atten`` keyword argument to the constructor. Valid values are:
+ADC block 2 is also used by WiFi and so attempting to read analog values from
+block 2 pins when WiFi is active will raise an exception.
 
-  - ``ADC.ATTN_0DB``: No attenuation, this is the default
-  - ``ADC.ATTN_2_5DB``: 2.5dB attenuation, gives a maximum input voltage of
-    approximately 1.33v
-  - ``ADC.ATTN_6DB``: 6dB attenuation, gives a maximum input voltage of
-    approximately 2.00v
-  - ``ADC.ATTN_11DB``: 11dB attenuation, gives a maximum input voltage of
-    approximately 3.55v
+The internal ADC reference voltage is typically 1.1V, but varies slightly from
+package to package. The ADC is less linear close to the reference voltage
+(particularly at higher attenuations) and has a minimum measurement voltage
+around 100mV, voltages at or below this will read as 0. To read voltages
+accurately, it is recommended to use the ``read_uv()`` method (see below).
 
-E.g.::
+ESP32-specific ADC class method reference:
 
-    adc = ADC(Pin(25), atten=ADC.ATTEN_11DB)  # 0.0v - 3.55v range
+.. class:: ADC(pin, *, atten)
 
-.. Warning::
-   Note that, although 11dB attenuation allows for a voltage range up to 3.55v,
-   the absolute maximum voltage rating for input pins is 3.6v, and so going
-   near this boundary risks damage to the IC!
+    Return the ADC object for the specified pin. ESP32 does not support
+    different timings for ADC sampling and so the ``sample_ns`` keyword argument
+    is not supported.
 
-ESP32-specific ADC class method reference:
+    To read voltages above the reference voltage, apply input attenuation with
+    the ``atten`` keyword argument. Valid values (and approximate linear
+    measurement ranges) are:
 
-.. method:: ADC.init(*, atten)
+      - ``ADC.ATTN_0DB``: No attenuation (100mV - 950mV)
+      - ``ADC.ATTN_2_5DB``: 2.5dB attenuation (100mV - 1250mV)
+      - ``ADC.ATTN_6DB``: 6dB attenuation (150mV - 1750mV)
+      - ``ADC.ATTN_11DB``: 11dB attenuation (150mV - 2450mV)
 
-    Re-initialize the ADC pin with a different input attenuation.
+.. Warning::
+   Note that the absolute maximum voltage rating for input pins is 3.6V. Going
+   near to this boundary risks damage to the IC!
 
 .. method:: ADC.read_uv()
 
-    This method uses internal per-package calibration values - set during
-    manufacture - to return the ADC input voltage in microvolts, taking into
-    account any input attenuation applied. Note that the calibration curves do
-    not guarantee that an input tied to ground will read as 0, and the returned
-    values have only millivolt resolution.
+    This method uses the known characteristics of the ADC and per-package eFuse
+    values - set during manufacture - to return a calibrated input voltage
+    (before attenuation) in microvolts. The returned value has only millivolt
+    resolution (i.e., will always be a multiple of 1000 microvolts).
 
-.. method:: ADC.block()
+    The calibration is only valid across the linear range of the ADC. In
+    particular, an input tied to ground will read as a value above 0 microvolts.
+    Within the linear range, however, more accurate and consistent results will
+    be obtained than using `read_u16()` and scaling the result with a constant.
 
-    Return the matching ``ADCBlock`` object.
+The ESP32 port also supports the :ref:`machine.ADC <machine.ADCBlock>` API:
 
 .. class:: ADCBlock(id, *, bits)
 
     Return the ADC block object with the given ``id`` (1 or 2) and initialize
-    it to the specified resolution (9 to 12-bits) or the default 12-bits.
-
-.. method:: ADCBlock.init(*, bits)
-
-    Re-initialize the ADC block with a specific resolution.
+    it to the specified resolution (9 to 12-bits depending on the ESP32 series)
+    or the highest supported resolution if not specified.
 
-.. method:: ADCBlock.connect(channel_or_pin)
+.. method:: ADCBlock.connect(pin)
+            ADCBlock.connect(channel)
+            ADCBlock.connect(channel, pin)
 
-    Return the ``ADC`` object for the specified ADC channel number or Pin object.
+    Return the ``ADC`` object for the specified ADC pin or channel number.
+    Arbitrary connection of ADC channels to GPIO is not supported and so
+    specifying a pin that is not connected to this block, or specifying a
+    mismatched channel and pin, will raise an exception.
 
-Legacy API methods:
+Legacy methods:
 
 .. method:: ADC.read()
 
     This method returns the raw ADC value ranged according to the resolution of
-    the ADC block, 0-4095 for the default 12-bit resolution.
+    the block, e.g., 0-4095 for 12-bit resolution.
 
-.. method:: ADC.atten(attenuation)
+.. method:: ADC.atten(atten)
 
-    Equivalent to ``ADC.init(atten=attenuation)``.
+    Equivalent to ``ADC.init(atten=atten)``.
 
-.. method:: ADC.width(width)
+.. method:: ADC.width(bits)
 
-    Equivalent to ``ADC.block().init(bits=width)``.
+    Equivalent to ``ADC.block().init(bits=bits)``.
 
 For compatibility, the ``ADC`` object also provides constants matching the
 supported ADC resolutions:

From 80b81acea5af425b15a92d09c3cc723dd24ebfb6 Mon Sep 17 00:00:00 2001
From: Peter Hinch <peter@hinch.me.uk>
Date: Sun, 30 Jan 2022 16:37:42 +0000
Subject: [PATCH 1674/3533] docs/reference/isr_rules.rst: Describe uasyncio-IRQ
 interface.

---
 docs/reference/isr_rules.rst | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/docs/reference/isr_rules.rst b/docs/reference/isr_rules.rst
index a611f492a4e8e..bdb838c590589 100644
--- a/docs/reference/isr_rules.rst
+++ b/docs/reference/isr_rules.rst
@@ -219,6 +219,33 @@ Exceptions
 If an ISR raises an exception it will not propagate to the main loop. The interrupt will be disabled unless the
 exception is handled by the ISR code.
 
+Interfacing to uasyncio
+-----------------------
+
+When an ISR runs it can preempt the `uasyncio` scheduler. If the ISR performs a `uasyncio`
+operation the scheduler's operation can be disrupted. This applies whether the interrupt is hard
+or soft and also applies if the ISR has passed execution to another function via
+`micropython.schedule`. In particular creating or cancelling tasks is invalid in an ISR context.
+The safe way to interact with `uasyncio` is to implement a coroutine with synchronisation performed by
+`uasyncio.ThreadSafeFlag`. The following fragment illustrates the creation of a task in response
+to an interrupt:
+
+.. code:: python
+
+    tsf = uasyncio.ThreadSafeFlag()
+
+    def isr(_):  # Interrupt handler
+        tsf.set()
+
+    async def foo():
+        while True:
+            await tsf.wait()
+            uasyncio.create_task(bar())
+
+In this example there will be a variable amount of latency between the execution of the ISR and the execution
+of ``foo()``. This is inherent to cooperative scheduling. The maximum latency is application
+and platform dependent but may typically be measured in tens of ms.
+
 General issues
 --------------
 

From a7530cbc03ba3ca4a70f7d3bd6b2e27656c25173 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 4 Feb 2022 14:28:21 +1100
Subject: [PATCH 1675/3533] stm32/boards/NUCLEO_L432KC: Disable
 MICROPY_OPT_COMPUTED_GOTO.

To save space, after recent fixes to L4 ADC made it overflow flash.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/boards/NUCLEO_L432KC/mpconfigboard.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/stm32/boards/NUCLEO_L432KC/mpconfigboard.h b/ports/stm32/boards/NUCLEO_L432KC/mpconfigboard.h
index ce9de3c4dd188..5e05053cdd904 100644
--- a/ports/stm32/boards/NUCLEO_L432KC/mpconfigboard.h
+++ b/ports/stm32/boards/NUCLEO_L432KC/mpconfigboard.h
@@ -3,6 +3,7 @@
 
 #define MICROPY_EMIT_THUMB          (0)
 #define MICROPY_EMIT_INLINE_THUMB   (0)
+#define MICROPY_OPT_COMPUTED_GOTO   (0)
 #define MICROPY_PY_BUILTINS_COMPLEX (0)
 #define MICROPY_PY_GENERATOR_PEND_THROW (0)
 #define MICROPY_PY_USOCKET          (0)

From 1f84440538a017e463aaad9686831ce9527122b5 Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Tue, 1 Feb 2022 10:52:55 +1100
Subject: [PATCH 1676/3533] tools/mpremote: Fix "fs cp -r" on Windows.

A backslash in the directory name will end up being passed through to the
device and becoming a backslash in a filename, rather than being
interpreted as directories.  This makes "cp -r" problematic on Windows.
Changing to simply "/",join() fixes this.
---
 tools/mpremote/mpremote/main.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/mpremote/mpremote/main.py b/tools/mpremote/mpremote/main.py
index 13615f6dd2fbb..5c63625589313 100644
--- a/tools/mpremote/mpremote/main.py
+++ b/tools/mpremote/mpremote/main.py
@@ -268,7 +268,7 @@ def do_filesystem(pyb, args):
     def _list_recursive(files, path):
         if os.path.isdir(path):
             for entry in os.listdir(path):
-                _list_recursive(files, os.path.join(path, entry))
+                _list_recursive(files, "/".join((path, entry)))
         else:
             files.append(os.path.split(path))
 
@@ -289,7 +289,7 @@ def _list_recursive(files, path):
                 if d not in known_dirs:
                     pyb.exec_("try:\n uos.mkdir('%s')\nexcept OSError as e:\n print(e)" % d)
                     known_dirs.add(d)
-            pyboard.filesystem_command(pyb, ["cp", os.path.join(dir, file), ":" + dir + "/"])
+            pyboard.filesystem_command(pyb, ["cp", "/".join((dir, file)), ":" + dir + "/"])
     else:
         pyboard.filesystem_command(pyb, args)
     args.clear()

From d865ca53b53aca5c66028970f7321e0766a0dd58 Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew@alelec.net>
Date: Fri, 28 Jan 2022 14:43:17 +1100
Subject: [PATCH 1677/3533] tools/mpremote: Make ConsolePosix work without .raw
 attribute.

When running mpremote in the vscode terminal on OSX the sys.stdout.buffer
does not have the raw attribute.  It works fine without it.
---
 tools/mpremote/mpremote/console.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/tools/mpremote/mpremote/console.py b/tools/mpremote/mpremote/console.py
index 2652c7393b442..a0ee55dce91a1 100644
--- a/tools/mpremote/mpremote/console.py
+++ b/tools/mpremote/mpremote/console.py
@@ -11,8 +11,13 @@
 class ConsolePosix:
     def __init__(self):
         self.infd = sys.stdin.fileno()
-        self.infile = sys.stdin.buffer.raw
-        self.outfile = sys.stdout.buffer.raw
+        self.infile = sys.stdin.buffer
+        self.outfile = sys.stdout.buffer
+        if hasattr(self.infile, "raw"):
+            self.infile = self.infile.raw
+        if hasattr(self.outfile, "raw"):
+            self.outfile = self.outfile.raw
+
         self.orig_attr = termios.tcgetattr(self.infd)
 
     def enter(self):

From 5a86d8dc424b5923d5d1a7c1352378ef328847d6 Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Tue, 1 Feb 2022 12:07:40 +1100
Subject: [PATCH 1678/3533] tools/mpremote: During soft reboot wait long enough
 for 115200 data.

---
 tools/mpremote/mpremote/pyboardextended.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/mpremote/mpremote/pyboardextended.py b/tools/mpremote/mpremote/pyboardextended.py
index 41f360e5fdd4b..1b6463e853080 100644
--- a/tools/mpremote/mpremote/pyboardextended.py
+++ b/tools/mpremote/mpremote/pyboardextended.py
@@ -641,7 +641,7 @@ def soft_reset_with_mount(self, out_callback):
         while n > 0:
             buf = self.serial.read(n)
             out_callback(buf)
-            time.sleep(0.1)
+            time.sleep(0.2)
             n = self.serial.inWaiting()
         self.serial.write(b"\x01")
         self.exec_(fs_hook_code)

From b1519845f5dfd46b82fd5b3d980812d30ce0140b Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Wed, 2 Feb 2022 21:20:05 +1100
Subject: [PATCH 1679/3533] tools/mpremote: Accept both --help and help to show
 usage.

---
 tools/mpremote/mpremote/main.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/mpremote/mpremote/main.py b/tools/mpremote/mpremote/main.py
index 5c63625589313..492d2d26d4c20 100644
--- a/tools/mpremote/mpremote/main.py
+++ b/tools/mpremote/mpremote/main.py
@@ -96,6 +96,7 @@
         "exec",
         "import machine; machine.RTC().datetime((2020, 1, 1, 0, 10, 0, 0, 0))",
     ],
+    "--help": "help",
 }
 
 for port_num in range(4):

From 203ec8ca7fa5f59e20bca95c74a77e3b1e8ef394 Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Tue, 1 Feb 2022 11:59:59 +1100
Subject: [PATCH 1680/3533] tools/mpremote: Correctly manage mounted flag
 during soft-reset.

---
 tools/mpremote/mpremote/pyboardextended.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/tools/mpremote/mpremote/pyboardextended.py b/tools/mpremote/mpremote/pyboardextended.py
index 1b6463e853080..2ec1fbbee97c4 100644
--- a/tools/mpremote/mpremote/pyboardextended.py
+++ b/tools/mpremote/mpremote/pyboardextended.py
@@ -614,10 +614,10 @@ def __init__(self, dev, *args, **kwargs):
 
     def mount_local(self, path):
         fout = self.serial
-        self.mounted = True
         if self.eval('"RemoteFS" in globals()') == b"False":
             self.exec_(fs_hook_code)
         self.exec_("__mount()")
+        self.mounted = True
         self.cmd = PyboardCommand(self.serial, fout, path)
         self.serial = SerialIntercept(self.serial, self.cmd)
 
@@ -626,6 +626,9 @@ def soft_reset_with_mount(self, out_callback):
         if not self.mounted:
             return
 
+        # Clear flag while board reboots, it will be re-set once mounted.
+        self.mounted = False
+
         # Wait for a response to the soft-reset command.
         for i in range(10):
             if self.serial.inWaiting():
@@ -646,6 +649,7 @@ def soft_reset_with_mount(self, out_callback):
         self.serial.write(b"\x01")
         self.exec_(fs_hook_code)
         self.exec_("__mount()")
+        self.mounted = True
         self.exit_raw_repl()
         self.read_until(4, b">>> ")
         self.serial = SerialIntercept(self.serial, self.cmd)

From fecfd5269632e86f86c6b31a9bc2ec22876f8934 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sat, 5 Feb 2022 23:29:44 +1100
Subject: [PATCH 1681/3533] tools/mpremote: Fix special handling of ctrl-D when
 host FS is mounted.

Changes are:
- decision to remount local filesystem on remote device is made only if
  "MPY: soft reboot" is seen in the output after sending a ctrl-D
- a nice message is printed to the user when the remount occurs
- soft reset during raw REPL is now handled correctly

Fixes issue #7731.

Signed-off-by: Damien George <damien@micropython.org>
---
 tools/mpremote/mpremote/main.py            |  4 +-
 tools/mpremote/mpremote/pyboardextended.py | 65 ++++++++++++++++------
 2 files changed, 49 insertions(+), 20 deletions(-)

diff --git a/tools/mpremote/mpremote/main.py b/tools/mpremote/mpremote/main.py
index 492d2d26d4c20..1073bec7fa454 100644
--- a/tools/mpremote/mpremote/main.py
+++ b/tools/mpremote/mpremote/main.py
@@ -304,8 +304,8 @@ def do_repl_main_loop(pyb, console_in, console_out_write, *, code_to_inject, fil
             if c == b"\x1d":  # ctrl-], quit
                 break
             elif c == b"\x04":  # ctrl-D
-                # do a soft reset and reload the filesystem hook
-                pyb.soft_reset_with_mount(console_out_write)
+                # special handling needed for ctrl-D if filesystem is mounted
+                pyb.write_ctrl_d(console_out_write)
             elif c == b"\x0a" and code_to_inject is not None:  # ctrl-j, inject code
                 pyb.serial.write(code_to_inject)
             elif c == b"\x0b" and file_to_inject is not None:  # ctrl-k, inject script
diff --git a/tools/mpremote/mpremote/pyboardextended.py b/tools/mpremote/mpremote/pyboardextended.py
index 2ec1fbbee97c4..6817e7bbf49a0 100644
--- a/tools/mpremote/mpremote/pyboardextended.py
+++ b/tools/mpremote/mpremote/pyboardextended.py
@@ -621,37 +621,66 @@ def mount_local(self, path):
         self.cmd = PyboardCommand(self.serial, fout, path)
         self.serial = SerialIntercept(self.serial, self.cmd)
 
-    def soft_reset_with_mount(self, out_callback):
+    def write_ctrl_d(self, out_callback):
         self.serial.write(b"\x04")
         if not self.mounted:
             return
 
-        # Clear flag while board reboots, it will be re-set once mounted.
-        self.mounted = False
+        # Read response from the device until it is quiet (with a timeout).
+        INITIAL_TIMEOUT = 0.5
+        QUIET_TIMEOUT = 0.2
+        FULL_TIMEOUT = 5
+        t_start = t_last_activity = time.monotonic()
+        data_all = b""
+        while True:
+            t = time.monotonic()
+            n = self.serial.inWaiting()
+            if n > 0:
+                data = self.serial.read(n)
+                out_callback(data)
+                data_all += data
+                t_last_activity = t
+            else:
+                if len(data_all) == 0:
+                    if t - t_start > INITIAL_TIMEOUT:
+                        return
+                else:
+                    if t - t_start > FULL_TIMEOUT:
+                        return
+                    if t - t_last_activity > QUIET_TIMEOUT:
+                        break
 
-        # Wait for a response to the soft-reset command.
-        for i in range(10):
-            if self.serial.inWaiting():
-                break
-            time.sleep(0.05)
+        # Check if a soft reset occurred.
+        if data_all.find(b"MPY: soft reboot") == -1:
+            return
+        if data_all.endswith(b">>> "):
+            in_friendly_repl = True
+        elif data_all.endswith(b">"):
+            in_friendly_repl = False
         else:
-            # Device didn't respond so it wasn't in a state to do a soft reset.
             return
 
-        out_callback(self.serial.read(1))
+        # Clear state while board remounts, it will be re-set once mounted.
+        self.mounted = False
         self.serial = self.serial.orig_serial
-        n = self.serial.inWaiting()
-        while n > 0:
-            buf = self.serial.read(n)
-            out_callback(buf)
-            time.sleep(0.2)
-            n = self.serial.inWaiting()
+
+        # Provide a message about the remount.
+        out_callback(bytes(f"\r\nRemount local directory {self.cmd.root} at /remote\r\n", "utf8"))
+
+        # Enter raw REPL and re-mount the remote filesystem.
         self.serial.write(b"\x01")
         self.exec_(fs_hook_code)
         self.exec_("__mount()")
         self.mounted = True
-        self.exit_raw_repl()
-        self.read_until(4, b">>> ")
+
+        # Exit raw REPL if needed, and wait for the friendly REPL prompt.
+        if in_friendly_repl:
+            self.exit_raw_repl()
+            prompt = b">>> "
+        else:
+            prompt = b">"
+        self.read_until(len(prompt), prompt)
+        out_callback(prompt)
         self.serial = SerialIntercept(self.serial, self.cmd)
 
     def umount_local(self):

From 69c9a76786a584c716e26e6874cc778468d5d8c2 Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Thu, 25 Nov 2021 11:44:21 +1100
Subject: [PATCH 1682/3533] windows/mingw: Include extmod/shared/lib sources
 properly.

---
 ports/windows/Makefile | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/ports/windows/Makefile b/ports/windows/Makefile
index 4aceeb981ce53..5a22be4642b55 100644
--- a/ports/windows/Makefile
+++ b/ports/windows/Makefile
@@ -61,7 +61,18 @@ SRC_C = \
 	$(SRC_MOD) \
 	$(wildcard $(VARIANT_DIR)/*.c)
 
+SHARED_SRC_C += $(addprefix shared/,\
+	$(SHARED_SRC_C_EXTRA) \
+	)
+
+SRC_CXX += \
+	$(SRC_MOD_CXX)
+
 OBJ = $(PY_O) $(addprefix $(BUILD)/, $(SRC_C:.c=.o))
+OBJ += $(addprefix $(BUILD)/, $(SRC_CXX:.cpp=.o))
+OBJ += $(addprefix $(BUILD)/, $(SHARED_SRC_C:.c=.o))
+OBJ += $(addprefix $(BUILD)/, $(EXTMOD_SRC_C:.c=.o))
+OBJ += $(addprefix $(BUILD)/, $(LIB_SRC_C:.c=.o))
 
 ifeq ($(MICROPY_USE_READLINE),1)
 CFLAGS_MOD += -DMICROPY_USE_READLINE=1
@@ -71,7 +82,7 @@ endif
 LIB += -lws2_32
 
 # List of sources for qstr extraction
-SRC_QSTR += $(SRC_C)
+SRC_QSTR += $(SRC_C) $(SRC_CXX) $(SHARED_SRC_C) $(EXTMOD_SRC_C)
 # Append any auto-generated sources that are needed by sources listed in
 # SRC_QSTR
 SRC_QSTR_AUTO_DEPS +=

From c708262c12cdf9b465e7007cc33cca7044310fcb Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Thu, 25 Nov 2021 12:09:40 +1100
Subject: [PATCH 1683/3533] windows/uselect: Enable micropython select in dev
 variant.

---
 ports/windows/msvc/sources.props             | 1 +
 ports/windows/variants/dev/mpconfigvariant.h | 1 +
 2 files changed, 2 insertions(+)

diff --git a/ports/windows/msvc/sources.props b/ports/windows/msvc/sources.props
index 5bf0fc453dba6..228a96d81e3f0 100644
--- a/ports/windows/msvc/sources.props
+++ b/ports/windows/msvc/sources.props
@@ -14,6 +14,7 @@
     <PyExtModSource Include="$(PyBaseDir)extmod\modujson.c" />
     <PyExtModSource Include="$(PyBaseDir)extmod\modurandom.c" />
     <PyExtModSource Include="$(PyBaseDir)extmod\modure.c" />
+    <PyExtModSource Include="$(PyBaseDir)extmod\moduselect.c" />
     <PyExtModSource Include="$(PyBaseDir)extmod\modutimeq.c" />
     <PyExtModSource Include="$(PyBaseDir)extmod\moduzlib.c" />
     <PyExtModSource Include="$(PyBaseDir)extmod\utime_mphal.c" />
diff --git a/ports/windows/variants/dev/mpconfigvariant.h b/ports/windows/variants/dev/mpconfigvariant.h
index 1f205066f0f09..09ee689dafaf7 100644
--- a/ports/windows/variants/dev/mpconfigvariant.h
+++ b/ports/windows/variants/dev/mpconfigvariant.h
@@ -36,3 +36,4 @@
 #define MICROPY_COMP_CONST                      (0)
 #define MICROPY_PY_URANDOM_EXTRA_FUNCS          (1)
 #define MICROPY_PY_BUILTINS_SLICE_INDICES       (1)
+#define MICROPY_PY_USELECT                      (1)

From 6f7d6c567f8862e0893da7fd08bd828cc6d054cf Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Mon, 7 Feb 2022 14:38:53 +1100
Subject: [PATCH 1684/3533] windows/uasyncio: Add support for uasyncio to
 windows dev variant.

---
 ports/windows/msvc/sources.props             | 1 +
 ports/windows/variants/dev/manifest.py       | 1 +
 ports/windows/variants/dev/mpconfigvariant.h | 4 ++++
 3 files changed, 6 insertions(+)

diff --git a/ports/windows/msvc/sources.props b/ports/windows/msvc/sources.props
index 228a96d81e3f0..e5109eecc8c0c 100644
--- a/ports/windows/msvc/sources.props
+++ b/ports/windows/msvc/sources.props
@@ -7,6 +7,7 @@
     <PyExtModSource Include="$(PyBaseDir)extmod\machine_pinbase.c" />
     <PyExtModSource Include="$(PyBaseDir)extmod\machine_pulse.c" />
     <PyExtModSource Include="$(PyBaseDir)extmod\machine_signal.c" />
+    <PyExtModSource Include="$(PyBaseDir)extmod\moduasyncio.c" />
     <PyExtModSource Include="$(PyBaseDir)extmod\modubinascii.c" />
     <PyExtModSource Include="$(PyBaseDir)extmod\moductypes.c" />
     <PyExtModSource Include="$(PyBaseDir)extmod\moduhashlib.c" />
diff --git a/ports/windows/variants/dev/manifest.py b/ports/windows/variants/dev/manifest.py
index 08295fc678d02..88a6937b4fb36 100644
--- a/ports/windows/variants/dev/manifest.py
+++ b/ports/windows/variants/dev/manifest.py
@@ -1 +1,2 @@
 include("$(PORT_DIR)/variants/manifest.py")
+include("$(MPY_DIR)/extmod/uasyncio/manifest.py")
diff --git a/ports/windows/variants/dev/mpconfigvariant.h b/ports/windows/variants/dev/mpconfigvariant.h
index 09ee689dafaf7..abf43a0da92ac 100644
--- a/ports/windows/variants/dev/mpconfigvariant.h
+++ b/ports/windows/variants/dev/mpconfigvariant.h
@@ -37,3 +37,7 @@
 #define MICROPY_PY_URANDOM_EXTRA_FUNCS          (1)
 #define MICROPY_PY_BUILTINS_SLICE_INDICES       (1)
 #define MICROPY_PY_USELECT                      (1)
+
+#ifndef MICROPY_PY_UASYNCIO
+#define MICROPY_PY_UASYNCIO                     (1)
+#endif

From 6fe3856c4f5baeb5ef7b46dbdfd99bf34f967169 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 8 Feb 2022 12:24:15 +1100
Subject: [PATCH 1685/3533] esp32/partitions-16MiB.csv: Increase 14MiB
 filesystem to maximum size.

The original value was 14000000, it's now changed to 14 * 1024 * 1024.

Fixes issue #8266.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/partitions-16MiB.csv | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/esp32/partitions-16MiB.csv b/ports/esp32/partitions-16MiB.csv
index ee3e8c7269a46..ae926c7b94eab 100644
--- a/ports/esp32/partitions-16MiB.csv
+++ b/ports/esp32/partitions-16MiB.csv
@@ -4,4 +4,4 @@
 nvs,      data, nvs,     0x9000,  0x6000,
 phy_init, data, phy,     0xf000,  0x1000,
 factory,  app,  factory, 0x10000, 0x1F0000,
-vfs,      data, fat,     0x200000, 0xD59F80,
+vfs,      data, fat,     0x200000, 0xE00000,

From ada836b8344cac24b08cbec969b4b4cdb08eec8a Mon Sep 17 00:00:00 2001
From: Seon Rozenblum <seon@unexpectedmaker.com>
Date: Tue, 8 Feb 2022 11:14:28 +1100
Subject: [PATCH 1686/3533] esp32/machine_adcblock: Fix ADC bit width for
 ESP32-S3.

---
 ports/esp32/machine_adcblock.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/esp32/machine_adcblock.c b/ports/esp32/machine_adcblock.c
index 77e4fcecc7bea..06c215f8ae73d 100644
--- a/ports/esp32/machine_adcblock.c
+++ b/ports/esp32/machine_adcblock.c
@@ -40,10 +40,10 @@
 #define DEFAULT_VREF 1100
 
 madcblock_obj_t madcblock_obj[] = {
-    #if CONFIG_IDF_TARGET_ESP32 || CONFIG_IDF_TARGET_ESP32C3
+    #if CONFIG_IDF_TARGET_ESP32 || CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32S3
     {{&machine_adcblock_type}, ADC_UNIT_1, 12, -1, {0}},
     {{&machine_adcblock_type}, ADC_UNIT_2, 12, -1, {0}},
-    #elif CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3
+    #elif CONFIG_IDF_TARGET_ESP32S2
     {{&machine_adcblock_type}, ADC_UNIT_1, 13, -1, {0}},
     {{&machine_adcblock_type}, ADC_UNIT_2, 13, -1, {0}},
     #endif

From 468d1979baf022b9598137243007cc550ff0b306 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 8 Feb 2022 15:03:42 +1100
Subject: [PATCH 1687/3533] esp32/machine_adc: Fix configuration of default ADC
 atten value.

Prior to this fix, if the ADC atten value was not explicitly given then
adc1_config_channel_atten() would never be called.

Fixes issue #8275.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/machine_adc.c | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/ports/esp32/machine_adc.c b/ports/esp32/machine_adc.c
index 515d629a7e972..cb45aab33910c 100644
--- a/ports/esp32/machine_adc.c
+++ b/ports/esp32/machine_adc.c
@@ -91,7 +91,19 @@ STATIC const madc_obj_t madc_obj[] = {
     #endif
 };
 
-STATIC adc_atten_t madc_obj_atten[MP_ARRAY_SIZE(madc_obj)];
+// These values are initialised to 0, which means the corresponding ADC channel is not initialised.
+// The madc_atten_get/madc_atten_set functions store (atten+1) here so that the uninitialised state
+// can be distinguished from the initialised state.
+STATIC uint8_t madc_obj_atten[MP_ARRAY_SIZE(madc_obj)];
+
+static inline adc_atten_t madc_atten_get(const madc_obj_t *self) {
+    uint8_t value = madc_obj_atten[self - &madc_obj[0]];
+    return value == 0 ? ADC_ATTEN_MAX : value - 1;
+}
+
+static inline void madc_atten_set(const madc_obj_t *self, adc_atten_t atten) {
+    madc_obj_atten[self - &madc_obj[0]] = atten + 1;
+}
 
 const madc_obj_t *madc_search_helper(madcblock_obj_t *block, adc_channel_t channel_id, gpio_num_t gpio_id) {
     for (int i = 0; i < MP_ARRAY_SIZE(madc_obj); i++) {
@@ -105,7 +117,7 @@ const madc_obj_t *madc_search_helper(madcblock_obj_t *block, adc_channel_t chann
 
 STATIC void madc_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     const madc_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    mp_printf(print, "ADC(Pin(%u), atten=%u)", self->gpio_id, madc_obj_atten[self - madc_obj]);
+    mp_printf(print, "ADC(Pin(%u), atten=%u)", self->gpio_id, madc_atten_get(self));
 }
 
 STATIC void madc_atten_helper(const madc_obj_t *self, mp_int_t atten) {
@@ -118,7 +130,7 @@ STATIC void madc_atten_helper(const madc_obj_t *self, mp_int_t atten) {
     if (err != ESP_OK) {
         mp_raise_ValueError(MP_ERROR_TEXT("invalid atten"));
     }
-    madc_obj_atten[self - madc_obj] = atten;
+    madc_atten_set(self, atten);
 }
 
 void madc_init_helper(const madc_obj_t *self, size_t n_pos_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
@@ -136,7 +148,7 @@ void madc_init_helper(const madc_obj_t *self, size_t n_pos_args, const mp_obj_t
     mp_int_t atten = args[ARG_atten].u_int;
     if (atten != -1) {
         madc_atten_helper(self, atten);
-    } else if (madc_obj_atten[self - madc_obj] == -1) {
+    } else if (madc_atten_get(self) == ADC_ATTEN_MAX) {
         madc_atten_helper(self, ADC_ATTEN_DB_0);
     }
 }
@@ -192,7 +204,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(madc_read_u16_obj, madc_read_u16);
 
 STATIC mp_obj_t madc_read_uv(mp_obj_t self_in) {
     const madc_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    adc_atten_t atten = madc_obj_atten[self - madc_obj];
+    adc_atten_t atten = madc_atten_get(self);
     return MP_OBJ_NEW_SMALL_INT(madcblock_read_uv_helper(self->block, self->channel_id, atten));
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(madc_read_uv_obj, madc_read_uv);

From aca40127bf9c9a0fb791d8b82be7637fa57ca343 Mon Sep 17 00:00:00 2001
From: Seon Rozenblum <seon@unexpectedmaker.com>
Date: Sun, 30 Jan 2022 12:43:28 +1100
Subject: [PATCH 1688/3533] esp32/boards: Add three UM ESP32-S3 based boards.

---
 ports/esp32/boards/UM_FEATHERS3/board.json    | 27 ++++++
 ports/esp32/boards/UM_FEATHERS3/board.md      |  2 +
 ports/esp32/boards/UM_FEATHERS3/deploy.md     | 52 +++++++++++
 ports/esp32/boards/UM_FEATHERS3/manifest.py   |  2 +
 .../boards/UM_FEATHERS3/modules/feathers3.py  | 90 +++++++++++++++++++
 .../boards/UM_FEATHERS3/mpconfigboard.cmake   | 12 +++
 .../esp32/boards/UM_FEATHERS3/mpconfigboard.h | 11 +++
 .../esp32/boards/UM_FEATHERS3/sdkconfig.board | 23 +++++
 ports/esp32/boards/UM_PROS3/board.json        | 27 ++++++
 ports/esp32/boards/UM_PROS3/board.md          |  2 +
 ports/esp32/boards/UM_PROS3/deploy.md         | 52 +++++++++++
 ports/esp32/boards/UM_PROS3/manifest.py       |  2 +
 ports/esp32/boards/UM_PROS3/modules/pros3.py  | 66 ++++++++++++++
 .../esp32/boards/UM_PROS3/mpconfigboard.cmake | 12 +++
 ports/esp32/boards/UM_PROS3/mpconfigboard.h   | 11 +++
 ports/esp32/boards/UM_PROS3/sdkconfig.board   | 23 +++++
 ports/esp32/boards/UM_TINYS3/board.json       | 26 ++++++
 ports/esp32/boards/UM_TINYS3/board.md         |  2 +
 ports/esp32/boards/UM_TINYS3/deploy.md        | 52 +++++++++++
 ports/esp32/boards/UM_TINYS3/manifest.py      |  2 +
 .../esp32/boards/UM_TINYS3/modules/tinys3.py  | 66 ++++++++++++++
 .../boards/UM_TINYS3/mpconfigboard.cmake      | 12 +++
 ports/esp32/boards/UM_TINYS3/mpconfigboard.h  | 11 +++
 ports/esp32/boards/UM_TINYS3/sdkconfig.board  | 23 +++++
 24 files changed, 608 insertions(+)
 create mode 100644 ports/esp32/boards/UM_FEATHERS3/board.json
 create mode 100644 ports/esp32/boards/UM_FEATHERS3/board.md
 create mode 100644 ports/esp32/boards/UM_FEATHERS3/deploy.md
 create mode 100644 ports/esp32/boards/UM_FEATHERS3/manifest.py
 create mode 100644 ports/esp32/boards/UM_FEATHERS3/modules/feathers3.py
 create mode 100644 ports/esp32/boards/UM_FEATHERS3/mpconfigboard.cmake
 create mode 100644 ports/esp32/boards/UM_FEATHERS3/mpconfigboard.h
 create mode 100644 ports/esp32/boards/UM_FEATHERS3/sdkconfig.board
 create mode 100644 ports/esp32/boards/UM_PROS3/board.json
 create mode 100644 ports/esp32/boards/UM_PROS3/board.md
 create mode 100644 ports/esp32/boards/UM_PROS3/deploy.md
 create mode 100644 ports/esp32/boards/UM_PROS3/manifest.py
 create mode 100644 ports/esp32/boards/UM_PROS3/modules/pros3.py
 create mode 100644 ports/esp32/boards/UM_PROS3/mpconfigboard.cmake
 create mode 100644 ports/esp32/boards/UM_PROS3/mpconfigboard.h
 create mode 100644 ports/esp32/boards/UM_PROS3/sdkconfig.board
 create mode 100644 ports/esp32/boards/UM_TINYS3/board.json
 create mode 100644 ports/esp32/boards/UM_TINYS3/board.md
 create mode 100644 ports/esp32/boards/UM_TINYS3/deploy.md
 create mode 100644 ports/esp32/boards/UM_TINYS3/manifest.py
 create mode 100644 ports/esp32/boards/UM_TINYS3/modules/tinys3.py
 create mode 100644 ports/esp32/boards/UM_TINYS3/mpconfigboard.cmake
 create mode 100644 ports/esp32/boards/UM_TINYS3/mpconfigboard.h
 create mode 100644 ports/esp32/boards/UM_TINYS3/sdkconfig.board

diff --git a/ports/esp32/boards/UM_FEATHERS3/board.json b/ports/esp32/boards/UM_FEATHERS3/board.json
new file mode 100644
index 0000000000000..68423cca5e5de
--- /dev/null
+++ b/ports/esp32/boards/UM_FEATHERS3/board.json
@@ -0,0 +1,27 @@
+{
+    "deploy": [
+        "deploy.md"
+    ],
+    "docs": "",
+    "features": [
+        "Battery Charging",
+        "RGB LED",
+        "SPIRAM",
+        "USB-C",
+        "WiFi",
+        "BLE",
+        "STEMMA QT/QWIIC",
+        "Feather"
+    ],
+    "features_non_filterable": [
+    ],
+    "id": "feathers3",
+    "images": [
+        "unexpectedmaker_feathers3.jpg"
+    ],
+    "mcu": "esp32s3",
+    "product": "FeatherS3",
+    "thumbnail": "",
+    "url": "https://feathers3.io",
+    "vendor": "Unexpected Maker"
+}
diff --git a/ports/esp32/boards/UM_FEATHERS3/board.md b/ports/esp32/boards/UM_FEATHERS3/board.md
new file mode 100644
index 0000000000000..ca9c36ad331f3
--- /dev/null
+++ b/ports/esp32/boards/UM_FEATHERS3/board.md
@@ -0,0 +1,2 @@
+The following files are daily firmware for the FeatherS3. This firmware is
+compiled using ESP-IDF v4.4 or later.
diff --git a/ports/esp32/boards/UM_FEATHERS3/deploy.md b/ports/esp32/boards/UM_FEATHERS3/deploy.md
new file mode 100644
index 0000000000000..3a6a21a522807
--- /dev/null
+++ b/ports/esp32/boards/UM_FEATHERS3/deploy.md
@@ -0,0 +1,52 @@
+Program your board using the latest version of the esptool.py program, found [here](https://github.com/espressif/esptool).
+
+To flash or erase your FeatherS3, you have to first put it into download mode.
+To do this, follow these steps:
+
+- Press and hold the [BOOT] button
+- Press and release the [RESET] button
+- Release the [BOOT] button
+
+Now the board is in download mode and the native USB will have enumerated as a serial device.
+
+If you are putting MicroPython on your board for the first time then you should
+first erase the entire flash using:
+
+### Linux
+```bash
+esptool.py --chip esp32s3 --port /dev/ttyACM0 erase_flash
+```
+
+### Mac
+Please do a `ls /dev/cu.usbm*` to determine the port your board has enumerated as.
+```bash
+esptool.py --chip esp32s3 --port /dev/cu.usbmodem01 erase_flash
+```
+
+### Windows
+Change (X) to whatever COM port is being used by the board
+```bash
+esptool --chip esp32s3 --port COM(X) erase_flash
+```
+
+Now download the version of the firmware you would like to install from the options below,
+then use the following command to program the firmware starting at address 0x0,
+remembering to replace `feathers3-micropython-firmware-version.bin` with the name of
+the firmware you just downloaded:
+
+### Linux
+```bash
+esptool.py --chip esp32s3 --port /dev/ttyACM0 write_flash -z 0x0 feathers3-micropython-firmware-version.bin
+```
+
+### Mac
+Please do a `ls /dev/cu.usbm*` to determine the port your board has enumerated as.
+```bash
+esptool.py --chip esp32s3 --port /dev/cu.usbmodem01 write_flash -z 0x0 feathers3-micropython-firmware-version.bin
+```
+
+### Windows
+Change (X) to whatever COM port is being used by the board
+```bash
+esptool --chip esp32s3 --port COM(X) write_flash -z 0x0 feathers3-micropython-firmware-version.bin
+```
diff --git a/ports/esp32/boards/UM_FEATHERS3/manifest.py b/ports/esp32/boards/UM_FEATHERS3/manifest.py
new file mode 100644
index 0000000000000..7ae2ed15d9169
--- /dev/null
+++ b/ports/esp32/boards/UM_FEATHERS3/manifest.py
@@ -0,0 +1,2 @@
+include("$(PORT_DIR)/boards/manifest.py")
+freeze("modules")
diff --git a/ports/esp32/boards/UM_FEATHERS3/modules/feathers3.py b/ports/esp32/boards/UM_FEATHERS3/modules/feathers3.py
new file mode 100644
index 0000000000000..801f9cbf46fbf
--- /dev/null
+++ b/ports/esp32/boards/UM_FEATHERS3/modules/feathers3.py
@@ -0,0 +1,90 @@
+# FeatherS3 MicroPython Helper Library
+# MIT license; Copyright (c) 2022 Seon Rozenblum - Unexpected Maker
+#
+# Project home:
+# http://feathers3.io
+
+# Import required libraries
+from micropython import const
+from machine import Pin, ADC
+import time
+
+# FeatherS3 Hardware Pin Assignments
+
+# Sense Pins
+VBUS_SENSE = const(34)
+VBAT_SENSE = const(2)
+
+# RGB LED, LDO2 & Other Pins
+RGB_DATA = const(40)
+LDO2 = const(39)
+LED = const(13)
+AMB_LIGHT = const(4)
+
+# SPI
+SPI_MOSI = const(35)
+SPI_MISO = const(37)
+SPI_CLK = const(36)
+
+# I2C
+I2C_SDA = const(8)
+I2C_SCL = const(9)
+
+# Helper functions
+
+# LED & Ambient Light Sensor control
+def led_set(state):
+    """Set the state of the BLUE LED on IO13"""
+    l = Pin(LED, Pin.OUT)
+    l.value(state)
+
+
+def led_blink():
+    """Toggle the BLUE LED on IO13"""
+    l = Pin(LED, Pin.OUT)
+    l.value(not l.value())
+
+
+# Create ADC and set attenuation and return the ambient light value from the onboard sensor
+def get_amb_light():
+    """Get Ambient Light Sensor reading"""
+    adc = ADC(Pin(AMB_LIGHT))
+    adc.atten(ADC.ATTN_11DB)
+    return adc.read()
+
+
+def set_ldo2_power(state):
+    """Enable or Disable power to the second LDO"""
+    Pin(LDO2, Pin.OUT).value(state)
+
+
+def get_battery_voltage():
+    """
+    Returns the current battery voltage. If no battery is connected, returns 4.2V which is the charge voltage
+    This is an approximation only, but useful to detect if the charge state of the battery is getting low.
+    """
+    adc = ADC(Pin(VBAT_SENSE))  # Assign the ADC pin to read
+    measuredvbat = adc.read()
+    measuredvbat /= 4095  # divide by 4095 as we are using the default ADC attenuation of 0dB
+    measuredvbat *= 4.2  # Multiply by 4.2V, our max charge voltage for a 1S LiPo
+    return round(measuredvbat, 2)
+
+
+def get_vbus_present():
+    """Detect if VBUS (5V) power source is present"""
+    return Pin(VBUS_SENSE, Pin.IN).value() == 1
+
+
+# NeoPixel rainbow colour wheel
+def rgb_color_wheel(wheel_pos):
+    """Color wheel to allow for cycling through the rainbow of RGB colors."""
+    wheel_pos = wheel_pos % 255
+
+    if wheel_pos < 85:
+        return 255 - wheel_pos * 3, 0, wheel_pos * 3
+    elif wheel_pos < 170:
+        wheel_pos -= 85
+        return 0, wheel_pos * 3, 255 - wheel_pos * 3
+    else:
+        wheel_pos -= 170
+        return wheel_pos * 3, 255 - wheel_pos * 3, 0
diff --git a/ports/esp32/boards/UM_FEATHERS3/mpconfigboard.cmake b/ports/esp32/boards/UM_FEATHERS3/mpconfigboard.cmake
new file mode 100644
index 0000000000000..6c7f34009e432
--- /dev/null
+++ b/ports/esp32/boards/UM_FEATHERS3/mpconfigboard.cmake
@@ -0,0 +1,12 @@
+set(IDF_TARGET esp32s3)
+
+set(SDKCONFIG_DEFAULTS
+    boards/sdkconfig.base
+    boards/sdkconfig.usb
+    boards/sdkconfig.ble
+    boards/sdkconfig.240mhz
+    boards/sdkconfig.spiram_sx
+    boards/UM_TINYS3/sdkconfig.board
+)
+
+set(MICROPY_FROZEN_MANIFEST ${MICROPY_BOARD_DIR}/manifest.py)
diff --git a/ports/esp32/boards/UM_FEATHERS3/mpconfigboard.h b/ports/esp32/boards/UM_FEATHERS3/mpconfigboard.h
new file mode 100644
index 0000000000000..738b32ca1e841
--- /dev/null
+++ b/ports/esp32/boards/UM_FEATHERS3/mpconfigboard.h
@@ -0,0 +1,11 @@
+#define MICROPY_HW_BOARD_NAME               "FeatherS3"
+#define MICROPY_HW_MCU_NAME                 "ESP32-S3"
+
+#define MICROPY_PY_MACHINE_DAC              (0)
+
+#define MICROPY_HW_I2C0_SCL                 (9)
+#define MICROPY_HW_I2C0_SDA                 (8)
+
+#define MICROPY_HW_SPI1_MOSI                (35)
+#define MICROPY_HW_SPI1_MISO                (37)
+#define MICROPY_HW_SPI1_SCK                 (36)
diff --git a/ports/esp32/boards/UM_FEATHERS3/sdkconfig.board b/ports/esp32/boards/UM_FEATHERS3/sdkconfig.board
new file mode 100644
index 0000000000000..5e20045125463
--- /dev/null
+++ b/ports/esp32/boards/UM_FEATHERS3/sdkconfig.board
@@ -0,0 +1,23 @@
+CONFIG_FLASHMODE_QIO=y
+CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
+CONFIG_ESPTOOLPY_FLASHSIZE_DETECT=y
+CONFIG_ESPTOOLPY_AFTER_NORESET=y
+
+CONFIG_SPIRAM_MEMTEST=
+
+CONFIG_ESPTOOLPY_FLASHSIZE_4MB=
+CONFIG_ESPTOOLPY_FLASHSIZE_8MB=
+CONFIG_ESPTOOLPY_FLASHSIZE_16MB=y
+CONFIG_PARTITION_TABLE_CUSTOM=y
+CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions-16MiB.csv"
+
+CONFIG_LWIP_LOCAL_HOSTNAME="UMFeatherS3"
+
+# CONFIG_TINYUSB_DESC_USE_ESPRESSIF_VID is not set
+CONFIG_TINYUSB_DESC_CUSTOM_VID=0x303A
+# CONFIG_TINYUSB_DESC_USE_DEFAULT_PID is not set
+CONFIG_TINYUSB_DESC_CUSTOM_PID=0x80D7
+CONFIG_TINYUSB_DESC_BCD_DEVICE=0x0100
+CONFIG_TINYUSB_DESC_MANUFACTURER_STRING="Unexpected Maker"
+CONFIG_TINYUSB_DESC_PRODUCT_STRING="FeatherS3"
+CONFIG_TINYUSB_DESC_SERIAL_STRING="_fs3_"
\ No newline at end of file
diff --git a/ports/esp32/boards/UM_PROS3/board.json b/ports/esp32/boards/UM_PROS3/board.json
new file mode 100644
index 0000000000000..0122e4b99167a
--- /dev/null
+++ b/ports/esp32/boards/UM_PROS3/board.json
@@ -0,0 +1,27 @@
+{
+    "deploy": [
+        "deploy.md"
+    ],
+    "docs": "",
+    "features": [
+        "Battery Charging",
+        "RGB LED",
+        "SPIRAM",
+        "USB-C",
+        "WiFi",
+        "BLE",
+        "STEMMA QT/QWIIC",
+        "Feather"
+    ],
+    "features_non_filterable": [
+    ],
+    "id": "pros3",
+    "images": [
+        "unexpectedmaker_pros3.jpg"
+    ],
+    "mcu": "esp32s3",
+    "product": "ProS3",
+    "thumbnail": "",
+    "url": "https://pros3.io",
+    "vendor": "Unexpected Maker"
+}
diff --git a/ports/esp32/boards/UM_PROS3/board.md b/ports/esp32/boards/UM_PROS3/board.md
new file mode 100644
index 0000000000000..4d1c435a07d11
--- /dev/null
+++ b/ports/esp32/boards/UM_PROS3/board.md
@@ -0,0 +1,2 @@
+The following files are daily firmware for the ProS3. This firmware is
+compiled using ESP-IDF v4.4 or later.
diff --git a/ports/esp32/boards/UM_PROS3/deploy.md b/ports/esp32/boards/UM_PROS3/deploy.md
new file mode 100644
index 0000000000000..d35d7a02fe376
--- /dev/null
+++ b/ports/esp32/boards/UM_PROS3/deploy.md
@@ -0,0 +1,52 @@
+Program your board using the latest version of the esptool.py program, found [here](https://github.com/espressif/esptool).
+
+To flash or erase your ProS3, you have to first put it into download mode.
+To do this, follow these steps:
+
+- Press and hold the [BOOT] button
+- Press and release the [RESET] button
+- Release the [BOOT] button
+
+Now the board is in download mode and the native USB will have enumerated as a serial device.
+
+If you are putting MicroPython on your board for the first time then you should
+first erase the entire flash using:
+
+### Linux
+```bash
+esptool.py --chip esp32s3 --port /dev/ttyACM0 erase_flash
+```
+
+### Mac
+Please do a `ls /dev/cu.usbm*` to determine the port your board has enumerated as.
+```bash
+esptool.py --chip esp32s3 --port /dev/cu.usbmodem01 erase_flash
+```
+
+### Windows
+Change (X) to whatever COM port is being used by the board
+```bash
+esptool --chip esp32s3 --port COM(X) erase_flash
+```
+
+Now download the version of the firmware you would like to install from the options below,
+then use the following command to program the firmware starting at address 0x0,
+remembering to replace `pros3-micropython-firmware-version.bin` with the name of
+the firmware you just downloaded:
+
+### Linux
+```bash
+esptool.py --chip esp32s3 --port /dev/ttyACM0 write_flash -z 0x0 pros3-micropython-firmware-version.bin
+```
+
+### Mac
+Please do a `ls /dev/cu.usbm*` to determine the port your board has enumerated as.
+```bash
+esptool.py --chip esp32s3 --port /dev/cu.usbmodem01 write_flash -z 0x0 pros3-micropython-firmware-version.bin
+```
+
+### Windows
+Change (X) to whatever COM port is being used by the board
+```bash
+esptool --chip esp32s3 --port COM(X) write_flash -z 0x0 pros3-pros3-firmware-version.bin
+```
diff --git a/ports/esp32/boards/UM_PROS3/manifest.py b/ports/esp32/boards/UM_PROS3/manifest.py
new file mode 100644
index 0000000000000..7ae2ed15d9169
--- /dev/null
+++ b/ports/esp32/boards/UM_PROS3/manifest.py
@@ -0,0 +1,2 @@
+include("$(PORT_DIR)/boards/manifest.py")
+freeze("modules")
diff --git a/ports/esp32/boards/UM_PROS3/modules/pros3.py b/ports/esp32/boards/UM_PROS3/modules/pros3.py
new file mode 100644
index 0000000000000..2edf3e42ea58c
--- /dev/null
+++ b/ports/esp32/boards/UM_PROS3/modules/pros3.py
@@ -0,0 +1,66 @@
+# ProS3 MicroPython Helper Library
+# MIT license; Copyright (c) 2022 Seon Rozenblum - Unexpected Maker
+#
+# Project home:
+# http://pros3.io
+
+# Import required libraries
+from micropython import const
+from machine import Pin, ADC
+import time
+
+# ProS3 Hardware Pin Assignments
+
+# Sense Pins
+VBUS_SENSE = const(33)
+VBAT_SENSE = const(10)
+
+# RGB LED & LDO2 Pins
+RGB_DATA = const(18)
+LDO2 = const(17)
+
+# SPI
+SPI_MOSI = const(35)
+SPI_MISO = const(37)
+SPI_CLK = const(36)
+
+# I2C
+I2C_SDA = const(8)
+I2C_SCL = const(9)
+
+# Helper functions
+def set_ldo2_power(state):
+    """Enable or Disable power to the second LDO"""
+    Pin(LDO2, Pin.OUT).value(state)
+
+
+def get_battery_voltage():
+    """
+    Returns the current battery voltage. If no battery is connected, returns 4.2V which is the charge voltage
+    This is an approximation only, but useful to detect if the charge state of the battery is getting low.
+    """
+    adc = ADC(Pin(VBAT_SENSE))  # Assign the ADC pin to read
+    measuredvbat = adc.read()
+    measuredvbat /= 4095  # divide by 4095 as we are using the default ADC attenuation of 0dB
+    measuredvbat *= 4.2  # Multiply by 4.2V, our max charge voltage for a 1S LiPo
+    return round(measuredvbat, 2)
+
+
+def get_vbus_present():
+    """Detect if VBUS (5V) power source is present"""
+    return Pin(VBUS_SENSE, Pin.IN).value() == 1
+
+
+# NeoPixel rainbow colour wheel
+def rgb_color_wheel(wheel_pos):
+    """Color wheel to allow for cycling through the rainbow of RGB colors."""
+    wheel_pos = wheel_pos % 255
+
+    if wheel_pos < 85:
+        return 255 - wheel_pos * 3, 0, wheel_pos * 3
+    elif wheel_pos < 170:
+        wheel_pos -= 85
+        return 0, wheel_pos * 3, 255 - wheel_pos * 3
+    else:
+        wheel_pos -= 170
+        return wheel_pos * 3, 255 - wheel_pos * 3, 0
diff --git a/ports/esp32/boards/UM_PROS3/mpconfigboard.cmake b/ports/esp32/boards/UM_PROS3/mpconfigboard.cmake
new file mode 100644
index 0000000000000..41a96f26e34c4
--- /dev/null
+++ b/ports/esp32/boards/UM_PROS3/mpconfigboard.cmake
@@ -0,0 +1,12 @@
+set(IDF_TARGET esp32s3)
+
+set(SDKCONFIG_DEFAULTS
+    boards/sdkconfig.base
+    boards/sdkconfig.usb
+    boards/sdkconfig.ble
+    boards/sdkconfig.240mhz
+    boards/sdkconfig.spiram_sx
+    boards/UM_PROS3/sdkconfig.board
+)
+
+set(MICROPY_FROZEN_MANIFEST ${MICROPY_BOARD_DIR}/manifest.py)
diff --git a/ports/esp32/boards/UM_PROS3/mpconfigboard.h b/ports/esp32/boards/UM_PROS3/mpconfigboard.h
new file mode 100644
index 0000000000000..1522e2aee3adc
--- /dev/null
+++ b/ports/esp32/boards/UM_PROS3/mpconfigboard.h
@@ -0,0 +1,11 @@
+#define MICROPY_HW_BOARD_NAME               "ProS3"
+#define MICROPY_HW_MCU_NAME                 "ESP32-S3"
+
+#define MICROPY_PY_MACHINE_DAC              (0)
+
+#define MICROPY_HW_I2C0_SCL                 (9)
+#define MICROPY_HW_I2C0_SDA                 (8)
+
+#define MICROPY_HW_SPI1_MOSI                (35)
+#define MICROPY_HW_SPI1_MISO                (37)
+#define MICROPY_HW_SPI1_SCK                 (36)
diff --git a/ports/esp32/boards/UM_PROS3/sdkconfig.board b/ports/esp32/boards/UM_PROS3/sdkconfig.board
new file mode 100644
index 0000000000000..06b3a00a1c5a4
--- /dev/null
+++ b/ports/esp32/boards/UM_PROS3/sdkconfig.board
@@ -0,0 +1,23 @@
+CONFIG_FLASHMODE_QIO=y
+CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
+CONFIG_ESPTOOLPY_FLASHSIZE_DETECT=y
+CONFIG_ESPTOOLPY_AFTER_NORESET=y
+
+CONFIG_SPIRAM_MEMTEST=
+
+CONFIG_ESPTOOLPY_FLASHSIZE_4MB=
+CONFIG_ESPTOOLPY_FLASHSIZE_8MB=
+CONFIG_ESPTOOLPY_FLASHSIZE_16MB=y
+CONFIG_PARTITION_TABLE_CUSTOM=y
+CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions-16MiB.csv"
+
+CONFIG_LWIP_LOCAL_HOSTNAME="UMProS3"
+
+# CONFIG_TINYUSB_DESC_USE_ESPRESSIF_VID is not set
+CONFIG_TINYUSB_DESC_CUSTOM_VID=0x303A
+# CONFIG_TINYUSB_DESC_USE_DEFAULT_PID is not set
+CONFIG_TINYUSB_DESC_CUSTOM_PID=0x80D4
+CONFIG_TINYUSB_DESC_BCD_DEVICE=0x0100
+CONFIG_TINYUSB_DESC_MANUFACTURER_STRING="Unexpected Maker"
+CONFIG_TINYUSB_DESC_PRODUCT_STRING="ProS3"
+CONFIG_TINYUSB_DESC_SERIAL_STRING="_ps3_"
diff --git a/ports/esp32/boards/UM_TINYS3/board.json b/ports/esp32/boards/UM_TINYS3/board.json
new file mode 100644
index 0000000000000..73482a6284f6f
--- /dev/null
+++ b/ports/esp32/boards/UM_TINYS3/board.json
@@ -0,0 +1,26 @@
+{
+    "deploy": [
+        "deploy.md"
+    ],
+    "docs": "",
+    "features": [
+        "Battery Charging",
+        "RGB LED",
+        "SPIRAM",
+        "USB-C",
+        "WiFi",
+        "BLE"
+    ],
+    "features_non_filterable": [
+        "TinyPICO Compatible"
+    ],
+    "id": "tinys3",
+    "images": [
+        "unexpectedmaker_tinys3.jpg"
+    ],
+    "mcu": "esp32s3",
+    "product": "TinyS3",
+    "thumbnail": "",
+    "url": "https://tinys3.io",
+    "vendor": "Unexpected Maker"
+}
diff --git a/ports/esp32/boards/UM_TINYS3/board.md b/ports/esp32/boards/UM_TINYS3/board.md
new file mode 100644
index 0000000000000..da06e191f28cc
--- /dev/null
+++ b/ports/esp32/boards/UM_TINYS3/board.md
@@ -0,0 +1,2 @@
+The following files are daily firmware for the TinyS3. This firmware is
+compiled using ESP-IDF v4.4 or later.
diff --git a/ports/esp32/boards/UM_TINYS3/deploy.md b/ports/esp32/boards/UM_TINYS3/deploy.md
new file mode 100644
index 0000000000000..d65014e012480
--- /dev/null
+++ b/ports/esp32/boards/UM_TINYS3/deploy.md
@@ -0,0 +1,52 @@
+Program your board using the latest version of the esptool.py program, found [here](https://github.com/espressif/esptool).
+
+To flash or erase your TinyS3, you have to first put it into download mode.
+To do this, follow these steps:
+
+- Press and hold the [BOOT] button
+- Press and release the [RESET] button
+- Release the [BOOT] button
+
+Now the board is in download mode and the native USB will have enumerated as a serial device.
+
+If you are putting MicroPython on your board for the first time then you should
+first erase the entire flash using:
+
+### Linux
+```bash
+esptool.py --chip esp32s3 --port /dev/ttyACM0 erase_flash
+```
+
+### Mac
+Please do a `ls /dev/cu.usbm*` to determine the port your board has enumerated as.
+```bash
+esptool.py --chip esp32s3 --port /dev/cu.usbmodem01 erase_flash
+```
+
+### Windows
+Change (X) to whatever COM port is being used by the board
+```bash
+esptool --chip esp32s3 --port COM(X) erase_flash
+```
+
+Now download the version of the firmware you would like to install from the options below,
+then use the following command to program the firmware starting at address 0x0,
+remembering to replace `tinys3-micropython-firmware-version.bin` with the name of
+the firmware you just downloaded:
+
+### Linux
+```bash
+esptool.py --chip esp32s3 --port /dev/ttyACM0 write_flash -z 0x0 tinys3-micropython-firmware-version.bin
+```
+
+### Mac
+Please do a `ls /dev/cu.usbm*` to determine the port your board has enumerated as.
+```bash
+esptool.py --chip esp32s3 --port /dev/cu.usbmodem01 write_flash -z 0x0 tinys3-micropython-firmware-version.bin
+```
+
+### Windows
+Change (X) to whatever COM port is being used by the board
+```bash
+esptool --chip esp32s3 --port COM(X) write_flash -z 0x0 tinys3-micropython-firmware-version.bin
+```
diff --git a/ports/esp32/boards/UM_TINYS3/manifest.py b/ports/esp32/boards/UM_TINYS3/manifest.py
new file mode 100644
index 0000000000000..7ae2ed15d9169
--- /dev/null
+++ b/ports/esp32/boards/UM_TINYS3/manifest.py
@@ -0,0 +1,2 @@
+include("$(PORT_DIR)/boards/manifest.py")
+freeze("modules")
diff --git a/ports/esp32/boards/UM_TINYS3/modules/tinys3.py b/ports/esp32/boards/UM_TINYS3/modules/tinys3.py
new file mode 100644
index 0000000000000..4efcfe4b52995
--- /dev/null
+++ b/ports/esp32/boards/UM_TINYS3/modules/tinys3.py
@@ -0,0 +1,66 @@
+# TinyS3 Helper Library
+# MIT license; Copyright (c) 2022 Seon Rozenblum - Unexpected Maker
+#
+# Project home:
+#   https://tinys3.io
+
+# Import required libraries
+from micropython import const
+from machine import Pin, ADC
+import time
+
+# TinyS3 Hardware Pin Assignments
+
+# Sense Pins
+VBUS_SENSE = const(33)
+VBAT_SENSE = const(10)
+
+# RGB LED Pins
+RGB_DATA = const(18)
+RGB_PWR = const(17)
+
+# SPI
+SPI_MOSI = const(35)
+SPI_MISO = const(37)
+SPI_CLK = const(36)
+
+# I2C
+I2C_SDA = const(8)
+I2C_SCL = const(9)
+
+# Helper functions
+def set_pixel_power(state):
+    """Enable or Disable power to the onboard NeoPixel to either show colour, or to reduce power for deep sleep."""
+    Pin(RGB_PWR, Pin.OUT).value(state)
+
+
+def get_battery_voltage():
+    """
+    Returns the current battery voltage. If no battery is connected, returns 4.2V which is the charge voltage
+    This is an approximation only, but useful to detect if the charge state of the battery is getting low.
+    """
+    adc = ADC(Pin(VBAT_SENSE))  # Assign the ADC pin to read
+    measuredvbat = adc.read()
+    measuredvbat /= 4095  # divide by 4095 as we are using the default ADC attenuation of 0dB
+    measuredvbat *= 4.2  # Multiply by 4.2V, our max charge voltage for a 1S LiPo
+    return round(measuredvbat, 2)
+
+
+def get_vbus_present():
+    """Detect if VBUS (5V) power source is present"""
+    return Pin(VBUS_SENSE, Pin.IN).value() == 1
+
+
+# NeoPixel rainbow colour wheel
+def rgb_color_wheel(wheel_pos):
+    """Color wheel to allow for cycling through the rainbow of RGB colors."""
+    wheel_pos = wheel_pos % 255
+
+    if wheel_pos < 85:
+        return 255 - wheel_pos * 3, 0, wheel_pos * 3
+    elif wheel_pos < 170:
+        wheel_pos -= 85
+        return 0, wheel_pos * 3, 255 - wheel_pos * 3
+    else:
+        wheel_pos -= 170
+        return wheel_pos * 3, 255 - wheel_pos * 3, 0
diff --git a/ports/esp32/boards/UM_TINYS3/mpconfigboard.cmake b/ports/esp32/boards/UM_TINYS3/mpconfigboard.cmake
new file mode 100644
index 0000000000000..6c7f34009e432
--- /dev/null
+++ b/ports/esp32/boards/UM_TINYS3/mpconfigboard.cmake
@@ -0,0 +1,12 @@
+set(IDF_TARGET esp32s3)
+
+set(SDKCONFIG_DEFAULTS
+    boards/sdkconfig.base
+    boards/sdkconfig.usb
+    boards/sdkconfig.ble
+    boards/sdkconfig.240mhz
+    boards/sdkconfig.spiram_sx
+    boards/UM_TINYS3/sdkconfig.board
+)
+
+set(MICROPY_FROZEN_MANIFEST ${MICROPY_BOARD_DIR}/manifest.py)
diff --git a/ports/esp32/boards/UM_TINYS3/mpconfigboard.h b/ports/esp32/boards/UM_TINYS3/mpconfigboard.h
new file mode 100644
index 0000000000000..b2638a9847882
--- /dev/null
+++ b/ports/esp32/boards/UM_TINYS3/mpconfigboard.h
@@ -0,0 +1,11 @@
+#define MICROPY_HW_BOARD_NAME               "TinyS3"
+#define MICROPY_HW_MCU_NAME                 "ESP32-S3-FN8"
+
+#define MICROPY_PY_MACHINE_DAC              (0)
+
+#define MICROPY_HW_I2C0_SCL                 (9)
+#define MICROPY_HW_I2C0_SDA                 (8)
+
+#define MICROPY_HW_SPI1_MOSI                (35)
+#define MICROPY_HW_SPI1_MISO                (37)
+#define MICROPY_HW_SPI1_SCK                 (36)
diff --git a/ports/esp32/boards/UM_TINYS3/sdkconfig.board b/ports/esp32/boards/UM_TINYS3/sdkconfig.board
new file mode 100644
index 0000000000000..2b9ddbebe7b5d
--- /dev/null
+++ b/ports/esp32/boards/UM_TINYS3/sdkconfig.board
@@ -0,0 +1,23 @@
+CONFIG_FLASHMODE_QIO=y
+CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
+CONFIG_ESPTOOLPY_FLASHSIZE_DETECT=y
+CONFIG_ESPTOOLPY_AFTER_NORESET=y
+
+CONFIG_SPIRAM_MEMTEST=
+
+CONFIG_ESPTOOLPY_FLASHSIZE_4MB=
+CONFIG_ESPTOOLPY_FLASHSIZE_8MB=y
+CONFIG_ESPTOOLPY_FLASHSIZE_16MB=
+CONFIG_PARTITION_TABLE_CUSTOM=y
+CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions-8MiB.csv"
+
+CONFIG_LWIP_LOCAL_HOSTNAME="UMTinyS3"
+
+# CONFIG_TINYUSB_DESC_USE_ESPRESSIF_VID is not set
+CONFIG_TINYUSB_DESC_CUSTOM_VID=0x303A
+# CONFIG_TINYUSB_DESC_USE_DEFAULT_PID is not set
+CONFIG_TINYUSB_DESC_CUSTOM_PID=0x80D1
+CONFIG_TINYUSB_DESC_BCD_DEVICE=0x0100
+CONFIG_TINYUSB_DESC_MANUFACTURER_STRING="Unexpected Maker"
+CONFIG_TINYUSB_DESC_PRODUCT_STRING="TinyS3"
+CONFIG_TINYUSB_DESC_SERIAL_STRING="_ts3_"

From 30a022548fcd20bf956789185e1481edb0f0acfc Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Sat, 22 Jan 2022 20:37:50 +0200
Subject: [PATCH 1689/3533] tests/multi_net/udp_data.py: Make UDP test more
 reliable.

The current test depends on a specific number and order of packets to pass,
which can't be reproduced every run due to the unreliable UDP protocol.
This patch adds simple packets sequencing, retransmits with timeouts, and a
packet loss threshold, to make the test more tolerant to UDP protocol
packet drops and reordering.
---
 tests/multi_net/udp_data.py | 52 ++++++++++++++++++++++++++++++-------
 1 file changed, 43 insertions(+), 9 deletions(-)

diff --git a/tests/multi_net/udp_data.py b/tests/multi_net/udp_data.py
index 0c0f165b74980..8934d7df74aeb 100644
--- a/tests/multi_net/udp_data.py
+++ b/tests/multi_net/udp_data.py
@@ -3,34 +3,68 @@
 import socket
 
 NUM_NEW_SOCKETS = 4
-NUM_TRANSFERS = 4
+NUM_TRANSFERS = 10
+TOTAL_PACKETS = NUM_NEW_SOCKETS * NUM_TRANSFERS
+# If more than 75% of packets are lost, the test fails.
+PACKET_LOSS_THRESH = 0.75 * TOTAL_PACKETS
 PORT = 8000
 
+
+def print_stats(seq):
+    if (TOTAL_PACKETS - seq) > PACKET_LOSS_THRESH:
+        print(
+            "packet loss %.1f%% %d/%d"
+            % (((TOTAL_PACKETS - seq) / TOTAL_PACKETS * 100), seq, TOTAL_PACKETS)
+        )
+    else:
+        print("pass")
+
+
 # Server
 def instance0():
+    seq = 0
     multitest.globals(IP=multitest.get_network_ip())
     multitest.next()
     for i in range(NUM_NEW_SOCKETS):
         s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
         s.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
-        s.bind(socket.getaddrinfo("0.0.0.0", PORT)[0][-1])
+        s.bind(socket.getaddrinfo("0.0.0.0", PORT + i)[0][-1])
+        s.settimeout(0.250)
         multitest.broadcast("server ready")
         for j in range(NUM_TRANSFERS):
-            data, addr = s.recvfrom(1000)
-            print(data)
-            s.sendto(b"server to client %d %d" % (i, j), addr)
+            try:
+                data, addr = s.recvfrom(1000)
+            except:
+                continue
+            if int(data) == seq:
+                if seq < (TOTAL_PACKETS - PACKET_LOSS_THRESH):
+                    print(seq)
+                seq += 1
+                s.sendto(b"%d" % (seq), addr)
         s.close()
 
+    print_stats(seq)
+
 
 # Client
 def instance1():
+    seq = 0
     multitest.next()
-    ai = socket.getaddrinfo(IP, PORT)[0][-1]
     for i in range(NUM_NEW_SOCKETS):
+        ai = socket.getaddrinfo(IP, PORT + i)[0][-1]
         s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
+        s.settimeout(0.250)
         multitest.wait("server ready")
         for j in range(NUM_TRANSFERS):
-            s.sendto(b"client to server %d %d" % (i, j), ai)
-            data, addr = s.recvfrom(1000)
-            print(data)
+            s.sendto(b"%d" % (seq), ai)
+            try:
+                data, addr = s.recvfrom(1000)
+            except:
+                continue
+            if int(data) == seq + 1:
+                if seq < (TOTAL_PACKETS - PACKET_LOSS_THRESH):
+                    print(seq)
+                seq += 1
         s.close()
+
+    print_stats(seq)

From a41abd94dcbb5c36cd3a66ae000fa02634472a6c Mon Sep 17 00:00:00 2001
From: Jos Verlinde <josverl@microsoft.com>
Date: Mon, 12 Jul 2021 17:47:49 +0200
Subject: [PATCH 1690/3533] docs/library/collections.rst: Use class for deque
 and OrderedDict.

---
 docs/library/collections.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/library/collections.rst b/docs/library/collections.rst
index 21f06fded71cd..6cf2c096ffc62 100644
--- a/docs/library/collections.rst
+++ b/docs/library/collections.rst
@@ -12,7 +12,7 @@ hold/accumulate various objects.
 Classes
 -------
 
-.. function:: deque(iterable, maxlen[, flags])
+.. class:: deque(iterable, maxlen[, flags])
 
     Deques (double-ended queues) are a list-like container that support O(1)
     appends and pops from either side of the deque.  New deques are created
@@ -57,7 +57,7 @@ Classes
         print(t1.name)
         assert t2.name == t2[1]
 
-.. function:: OrderedDict(...)
+.. class:: OrderedDict(...)
 
     ``dict`` type subclass which remembers and preserves the order of keys
     added. When ordered dict is iterated over, keys/items are returned in

From cd0531c533c9e3bb6e96ec8d994ae272b58503c6 Mon Sep 17 00:00:00 2001
From: Jos Verlinde <josverl@microsoft.com>
Date: Mon, 12 Jul 2021 18:04:56 +0200
Subject: [PATCH 1691/3533] docs: Use the correct * keyword-only notation.

---
 docs/library/machine.PWM.rst | 4 ++--
 docs/library/pyb.Pin.rst     | 2 +-
 docs/wipy/general.rst        | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/library/machine.PWM.rst b/docs/library/machine.PWM.rst
index 4c72255d81709..793c074a361cb 100644
--- a/docs/library/machine.PWM.rst
+++ b/docs/library/machine.PWM.rst
@@ -23,7 +23,7 @@ Example usage::
 Constructors
 ------------
 
-.. class:: PWM(dest, \*, freq, duty_u16, duty_ns)
+.. class:: PWM(dest, *, freq, duty_u16, duty_ns)
 
    Construct and return a new PWM object using the following parameters:
 
@@ -42,7 +42,7 @@ Constructors
 Methods
 -------
 
-.. method:: PWM.init(\*, freq, duty_u16, duty_ns)
+.. method:: PWM.init(*, freq, duty_u16, duty_ns)
 
    Modify settings for the PWM object.  See the above constructor for details
    about the parameters.
diff --git a/docs/library/pyb.Pin.rst b/docs/library/pyb.Pin.rst
index 23ede48ed3b3c..33b994e390dc2 100644
--- a/docs/library/pyb.Pin.rst
+++ b/docs/library/pyb.Pin.rst
@@ -98,7 +98,7 @@ Class methods
 Methods
 -------
 
-.. method:: Pin.init(mode, pull=Pin.PULL_NONE, \*, value=None, alt=-1)
+.. method:: Pin.init(mode, pull=Pin.PULL_NONE, *, value=None, alt=-1)
 
    Initialise the pin:
 
diff --git a/docs/wipy/general.rst b/docs/wipy/general.rst
index 7f24435db3b65..a1c8df8ef46ae 100644
--- a/docs/wipy/general.rst
+++ b/docs/wipy/general.rst
@@ -345,7 +345,7 @@ Example::
 
    Create a server instance, see ``init`` for parameters of initialization.
 
-.. method:: server.init(\*, login=('micro', 'python'), timeout=300)
+.. method:: server.init(*, login=('micro', 'python'), timeout=300)
 
    Init (and effectively start the server). Optionally a new ``user``, ``password``
    and ``timeout`` (in seconds) can be passed.
@@ -368,7 +368,7 @@ Adhoc VFS-like support
 WiPy doesn't implement full MicroPython VFS support, instead following
 functions are defined in ``os`` module:
 
-.. function:: mount(block_device, mount_point, \*, readonly=False)
+.. function:: mount(block_device, mount_point, *, readonly=False)
 
    Mounts a block device (like an ``SD`` object) in the specified mount
    point. Example::

From 2c30ac7aeb0694ea0b4721706639ca7781de34f5 Mon Sep 17 00:00:00 2001
From: Jos Verlinde <josverl@microsoft.com>
Date: Tue, 27 Jul 2021 00:11:11 +0200
Subject: [PATCH 1692/3533] docs/library/socket.rst: Document socket as a
 class.

Following CPython: https://bugs.python.org/issue45772
---
 docs/library/socket.rst | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/docs/library/socket.rst b/docs/library/socket.rst
index 704b614ab1c50..1d1c23abd1976 100644
--- a/docs/library/socket.rst
+++ b/docs/library/socket.rst
@@ -66,19 +66,6 @@ Tuple address format for ``socket`` module:
 Functions
 ---------
 
-.. function:: socket(af=AF_INET, type=SOCK_STREAM, proto=IPPROTO_TCP, /)
-
-   Create a new socket using the given address family, socket type and
-   protocol number. Note that specifying *proto* in most cases is not
-   required (and not recommended, as some MicroPython ports may omit
-   ``IPPROTO_*`` constants). Instead, *type* argument will select needed
-   protocol automatically::
-
-        # Create STREAM TCP socket
-        socket(AF_INET, SOCK_STREAM)
-        # Create DGRAM UDP socket
-        socket(AF_INET, SOCK_DGRAM)
-
 .. function:: getaddrinfo(host, port, af=0, type=0, proto=0, flags=0, /)
 
    Translate the host/port argument into a sequence of 5-tuples that contain all the
@@ -176,6 +163,19 @@ Constants specific to WiPy:
 class socket
 ============
 
+.. class:: socket(af=AF_INET, type=SOCK_STREAM, proto=IPPROTO_TCP, /)
+
+   Create a new socket using the given address family, socket type and
+   protocol number. Note that specifying *proto* in most cases is not
+   required (and not recommended, as some MicroPython ports may omit
+   ``IPPROTO_*`` constants). Instead, *type* argument will select needed
+   protocol automatically::
+
+        # Create STREAM TCP socket
+        socket(AF_INET, SOCK_STREAM)
+        # Create DGRAM UDP socket
+        socket(AF_INET, SOCK_DGRAM)
+
 Methods
 -------
 

From 50b172023f27e571ffdc250a7e90916b46b8feca Mon Sep 17 00:00:00 2001
From: Jos Verlinde <josverl@microsoft.com>
Date: Tue, 21 Sep 2021 18:26:39 +0200
Subject: [PATCH 1693/3533] docs/library/pyb.Timer.rst: Add pyb.Timer class
 constants.

---
 docs/library/pyb.Timer.rst | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/docs/library/pyb.Timer.rst b/docs/library/pyb.Timer.rst
index 34fe71155fc15..cc7a01f580a87 100644
--- a/docs/library/pyb.Timer.rst
+++ b/docs/library/pyb.Timer.rst
@@ -262,3 +262,12 @@ Methods
    for which the pulse is active.  The value can be an integer or
    floating-point number for more accuracy.  For example, a value of 25 gives
    a duty cycle of 25%.
+
+Constants
+---------
+
+.. data:: Timer.UP
+          Timer.DOWN
+          Timer.CENTER
+
+   Configures the timer to count Up, Down, or from 0 to ARR and then back down to 0.

From ba4f6f5fdf949924b44bf54291f6a860d6e36bff Mon Sep 17 00:00:00 2001
From: Jos Verlinde <josverl@microsoft.com>
Date: Tue, 21 Sep 2021 18:37:01 +0200
Subject: [PATCH 1694/3533] docs/library/pyb.rst: Add pyb.hid_mouse and
 pyb.hid_keyboard constants.

---
 docs/library/pyb.rst | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/docs/library/pyb.rst b/docs/library/pyb.rst
index 880d68c531f88..c8ef2c531542f 100644
--- a/docs/library/pyb.rst
+++ b/docs/library/pyb.rst
@@ -298,6 +298,15 @@ Miscellaneous functions
    The *high_speed* parameter, when set to ``True``, enables USB HS mode if
    it is supported by the hardware.
 
+Constants
+---------
+
+.. data:: pyb.hid_mouse
+          pyb.hid_keyboard
+
+   A tuple of (subclass, protocol, max packet length, polling interval, report
+   descriptor) to set appropriate values for a USB mouse or keyboard.
+
 Classes
 -------
 

From 8715ad9ccfc45c25883fb1a7587c9f81da8133ab Mon Sep 17 00:00:00 2001
From: Jos Verlinde <josverl@microsoft.com>
Date: Tue, 21 Sep 2021 21:58:19 +0200
Subject: [PATCH 1695/3533] docs/library/pyb.DAC.rst: Add DAC class constants.

---
 docs/library/pyb.DAC.rst | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/docs/library/pyb.DAC.rst b/docs/library/pyb.DAC.rst
index bf07119ada166..0eb469bef4129 100644
--- a/docs/library/pyb.DAC.rst
+++ b/docs/library/pyb.DAC.rst
@@ -122,3 +122,15 @@ Methods
      dac2 = DAC(2)
      dac1.write_timed(buf1, pyb.Timer(6, freq=100), mode=DAC.CIRCULAR)
      dac2.write_timed(buf2, pyb.Timer(7, freq=200), mode=DAC.CIRCULAR)
+
+Constants
+---------
+
+.. data:: DAC.NORMAL
+
+   NORMAL mode does a single transmission of the waveform in the data buffer,
+
+.. data:: DAC.CIRCULAR
+
+   CIRCULAR mode does a transmission of the waveform in the data buffer, and wraps around
+   to the start of the data buffer every time it reaches the end of the table.

From 7621b176365c8b2b6187861dbb1f20ffe4c68335 Mon Sep 17 00:00:00 2001
From: Jos Verlinde <josverl@microsoft.com>
Date: Wed, 22 Sep 2021 15:47:27 +0200
Subject: [PATCH 1696/3533] docs/library/machine.SPI.rst: Add class constant
 SoftSPI.MSB and .LSB.

---
 docs/library/machine.SPI.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/library/machine.SPI.rst b/docs/library/machine.SPI.rst
index 1116f0e8a31a2..7b0e8cf40689f 100644
--- a/docs/library/machine.SPI.rst
+++ b/docs/library/machine.SPI.rst
@@ -143,9 +143,11 @@ Constants
    for initialising the SPI bus to controller; this is only used for the WiPy
 
 .. data:: SPI.MSB
+          SoftSPI.MSB
 
    set the first bit to be the most significant bit
 
 .. data:: SPI.LSB
+          SoftSPI.LSB
 
    set the first bit to be the least significant bit

From f99b6799167a6cce97a7a683825f6ea27a892e6e Mon Sep 17 00:00:00 2001
From: Jos Verlinde <josverl@microsoft.com>
Date: Sun, 26 Sep 2021 23:14:56 +0200
Subject: [PATCH 1697/3533] docs/library/machine.WDT.rst: Use correct case for
 WDT.feed.

---
 docs/library/machine.WDT.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/library/machine.WDT.rst b/docs/library/machine.WDT.rst
index 3c799583e6674..8c81e10ea5817 100644
--- a/docs/library/machine.WDT.rst
+++ b/docs/library/machine.WDT.rst
@@ -31,7 +31,7 @@ Constructors
 Methods
 -------
 
-.. method:: wdt.feed()
+.. method:: WDT.feed()
 
    Feed the WDT to prevent it from resetting the system. The application
    should place this call in a sensible place ensuring that the WDT is

From 58cd2a8b0a16ba65b7390e425d37a825141735d3 Mon Sep 17 00:00:00 2001
From: Jos Verlinde <jos.verlinde@microsoft.com>
Date: Mon, 7 Feb 2022 18:34:57 +0100
Subject: [PATCH 1698/3533] docs/library/esp.rst: Document the osdebug
 function.

---
 docs/library/esp.rst | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/docs/library/esp.rst b/docs/library/esp.rst
index 5fb370065f22e..8920c8241ea0c 100644
--- a/docs/library/esp.rst
+++ b/docs/library/esp.rst
@@ -62,6 +62,21 @@ Functions
 
 .. function:: flash_erase(sector_no)
 
+.. function:: osdebug(level)
+
+    Turn esp os debugging messages on or off.
+
+    The *level* parameter sets the threshold for the log messages for all esp components.
+    The log levels are defined as constants:
+
+        * ``LOG_NONE`` -- No log output
+        * ``LOG_ERROR`` -- Critical errors, software module can not recover on its own
+        * ``LOG_WARN`` -- Error conditions from which recovery measures have been taken
+        * ``LOG_INFO`` -- Information messages which describe normal flow of events
+        * ``LOG_DEBUG`` -- Extra information which is not necessary for normal use (values, pointers, sizes, etc)
+        * ``LOG_VERBOSE`` -- Bigger chunks of debugging information, or frequent messages
+          which can potentially flood the output
+
 .. function:: set_native_code_location(start, length)
 
     **Note**: ESP8266 only

From 7f67524031a04d972ba59a50e5e320adadbcb893 Mon Sep 17 00:00:00 2001
From: Jos Verlinde <jos.verlinde@microsoft.com>
Date: Mon, 7 Feb 2022 19:11:47 +0100
Subject: [PATCH 1699/3533] docs/library/pyb.SPI.rst: Document default for
 prescaler argument.

To prevent "non-default argument follows default argument" errors.
---
 docs/library/pyb.SPI.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/library/pyb.SPI.rst b/docs/library/pyb.SPI.rst
index 1bdb73a5dd170..14b90a2240f7e 100644
--- a/docs/library/pyb.SPI.rst
+++ b/docs/library/pyb.SPI.rst
@@ -51,7 +51,7 @@ Methods
 
    Turn off the SPI bus.
 
-.. method:: SPI.init(mode, baudrate=328125, *, prescaler, polarity=1, phase=0, bits=8, firstbit=SPI.MSB, ti=False, crc=None)
+.. method:: SPI.init(mode, baudrate=328125, *, prescaler=-1, polarity=1, phase=0, bits=8, firstbit=SPI.MSB, ti=False, crc=None)
 
    Initialise the SPI bus with the given parameters:
 

From 6653856b87a76adc5584bb72b32924719effa970 Mon Sep 17 00:00:00 2001
From: Jos Verlinde <jos.verlinde@microsoft.com>
Date: Mon, 7 Feb 2022 22:13:26 +0100
Subject: [PATCH 1700/3533] docs/library/machine.Pin.rst: Document defaults for
 Pin.init.

---
 docs/library/machine.Pin.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/library/machine.Pin.rst b/docs/library/machine.Pin.rst
index 32fa05b49c585..f80de1178470a 100644
--- a/docs/library/machine.Pin.rst
+++ b/docs/library/machine.Pin.rst
@@ -42,7 +42,7 @@ Usage Model::
 Constructors
 ------------
 
-.. class:: Pin(id, mode=-1, pull=-1, *, value, drive, alt)
+.. class:: Pin(id, mode=-1, pull=-1, *, value=None, drive=0, alt=-1)
 
    Access the pin peripheral (GPIO pin) associated with the given ``id``.  If
    additional arguments are given in the constructor then they are used to initialise
@@ -108,7 +108,7 @@ Constructors
 Methods
 -------
 
-.. method:: Pin.init(mode=-1, pull=-1, *, value, drive, alt)
+.. method:: Pin.init(mode=-1, pull=-1, *, value=None, drive=0, alt=-1)
 
    Re-initialise the pin using the given parameters.  Only those arguments that
    are specified will be set.  The rest of the pin peripheral state will remain

From 8f6924c9fb061742039554a3b5840f6e92aff7f2 Mon Sep 17 00:00:00 2001
From: Lars Kellogg-Stedman <lars@oddbit.com>
Date: Thu, 3 Feb 2022 23:03:23 -0500
Subject: [PATCH 1701/3533] docs/library/uasyncio.rst: Fix description of
 ThreadSafeFlag.wait.

When a task waits on a ThreadSafeFlag (and the wait method returns), the
flag is immediately reset.  This was not clear in the documentation, which
appeared to copy the description of the wait method from the Event class.

Signed-off-by: Lars Kellogg-Stedman <lars@oddbit.com>
---
 docs/library/uasyncio.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/library/uasyncio.rst b/docs/library/uasyncio.rst
index 1fc8b53db0d49..a842cc64d403b 100644
--- a/docs/library/uasyncio.rst
+++ b/docs/library/uasyncio.rst
@@ -159,7 +159,7 @@ class ThreadSafeFlag
 .. method:: ThreadSafeFlag.wait()
 
     Wait for the flag to be set.  If the flag is already set then it returns
-    immediately.
+    immediately.  The flag is automatically reset upon return from ``wait``.
 
     A flag may only be waited on by a single task at a time.
 

From d8a7bf83ccf28d0e8acf9790a1fc38aa5d13a2e5 Mon Sep 17 00:00:00 2001
From: YoungJoon Chun <yjchun@mac.com>
Date: Thu, 3 Feb 2022 22:41:45 +0900
Subject: [PATCH 1702/3533] rp2/machine_uart: Fix UART RTS behaviour so RTS is
 deasserted.

The UART hardware flow control was not working correctly, the receive FIFO
was always fetched and RTS was never deasserted.  This is not a problem
when hardware flow control is not used: normally, if the receive FIFO is
full, the UART receiver won't receive data into the FIFO anymore, but the
current implementation fetches from the FIFO and discards it instead.
The problem is that data is discarded even when RTS is enabled.

This commit fixes the issue by only taking from the FIFO if there is room
in the ring buffer to put the character.

Signed-off-by: YoungJoon Chun <yjchun@mac.com>
---
 ports/rp2/machine_uart.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ports/rp2/machine_uart.c b/ports/rp2/machine_uart.c
index 283c12ed54fe8..0642f704f7e61 100644
--- a/ports/rp2/machine_uart.c
+++ b/ports/rp2/machine_uart.c
@@ -109,10 +109,10 @@ STATIC const char *_invert_name[] = {"None", "INV_TX", "INV_RX", "INV_TX|INV_RX"
 /******************************************************************************/
 // IRQ and buffer handling
 
-// take all bytes from the fifo and store them, if possible, in the buffer
+// take all bytes from the fifo and store them in the buffer
 STATIC void uart_drain_rx_fifo(machine_uart_obj_t *self) {
-    while (uart_is_readable(self->uart)) {
-        // try to write the data, ignore the fail
+    while (uart_is_readable(self->uart) && ringbuf_free(&self->read_buffer) > 0) {
+        // get a byte from uart and put into the buffer
         ringbuf_put(&(self->read_buffer), uart_get_hw(self->uart)->dr);
     }
 }

From b33fdbe5357ae224d668b827958fbbd04b507540 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 10 Feb 2022 14:52:51 +1100
Subject: [PATCH 1703/3533] tests/run-perfbench.py: Allow a test to SKIP, and
 to have a .exp file.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/run-perfbench.py | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/tests/run-perfbench.py b/tests/run-perfbench.py
index 5f299281fdbc7..fccb7a7684aed 100755
--- a/tests/run-perfbench.py
+++ b/tests/run-perfbench.py
@@ -74,6 +74,8 @@ def run_feature_test(target, test):
 def run_benchmark_on_target(target, script):
     output, err = run_script_on_target(target, script)
     if err is None:
+        if output == "SKIP":
+            return -1, -1, "SKIP"
         time, norm, result = output.split(None, 2)
         try:
             return int(time), int(norm), result
@@ -133,7 +135,14 @@ def run_benchmarks(target, param_n, param_m, n_average, test_list):
 
         # Check result against truth if needed
         if error is None and result_out != "None":
-            _, _, result_exp = run_benchmark_on_target(PYTHON_TRUTH, test_script)
+            test_file_expected = test_file + ".exp"
+            if os.path.isfile(test_file_expected):
+                # Expected result is given by a file, so read that in
+                with open(test_file_expected) as f:
+                    result_exp = f.read().strip()
+            else:
+                # Run CPython to work out the expected result
+                _, _, result_exp = run_benchmark_on_target(PYTHON_TRUTH, test_script)
             if result_out != result_exp:
                 error = "FAIL truth"
 

From 75da124cf856d020efb17efbcba97543c5e7435c Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 10 Feb 2022 14:53:29 +1100
Subject: [PATCH 1704/3533] tests/perf_bench: Add perf tests for qstr interning
 and importing .mpy.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/perf_bench/core_import_mpy_multi.py     |  85 +++++++++++
 tests/perf_bench/core_import_mpy_multi.py.exp |   1 +
 tests/perf_bench/core_import_mpy_single.py    | 135 ++++++++++++++++++
 .../perf_bench/core_import_mpy_single.py.exp  |   1 +
 tests/perf_bench/core_qstr.py                 |  21 +++
 5 files changed, 243 insertions(+)
 create mode 100644 tests/perf_bench/core_import_mpy_multi.py
 create mode 100644 tests/perf_bench/core_import_mpy_multi.py.exp
 create mode 100644 tests/perf_bench/core_import_mpy_single.py
 create mode 100644 tests/perf_bench/core_import_mpy_single.py.exp
 create mode 100644 tests/perf_bench/core_qstr.py

diff --git a/tests/perf_bench/core_import_mpy_multi.py b/tests/perf_bench/core_import_mpy_multi.py
new file mode 100644
index 0000000000000..0da466206b1ac
--- /dev/null
+++ b/tests/perf_bench/core_import_mpy_multi.py
@@ -0,0 +1,85 @@
+# Test performance of importing an .mpy file many times.
+
+import usys, uio, uos
+
+if not (hasattr(uio, "IOBase") and hasattr(uos, "mount")):
+    print("SKIP")
+    raise SystemExit
+
+# This is the test.py file that is compiled to test.mpy below.
+"""
+class A:
+    def __init__(self, arg):
+        self.arg = arg
+    def write(self):
+        pass
+    def read(self):
+        pass
+def f():
+    print, str, bytes, dict
+    Exception, ValueError, TypeError
+    x = "this will be a string object"
+    x = b"this will be a bytes object"
+    x = ("const tuple", None, False, True, 1, 2, 3)
+result = 123
+"""
+file_data = b'M\x05\x02\x1f \x81\x0c\x10\x12\x00\x07\x0etest.py\x8b\x07e`\x00T2\x00\x10\x02A4\x02\x16\x012\x01\x16\x02f"\x80{\x16\x0cresultQc\x00\x02\x81\x1c\x00\x10\x05\x07,EE\x00\x11\x00\x17\x16\x00\x16\x10\x03\x16\x00\x1a2\x00\x16\x00\x112\x01\x16\x00\xa42\x02\x16\x00}Qc\x00\x03<\x1a\x0c\x00\x11\x03@\x00\xb1\xb0\x18\x06argQc\x00\x00\x00\x89\x01,\t\x0e\x00\xa4\x03` \x00Qc\x00\x00\x00\x89,\t\x0e\x00}\x01``\x00Qc\x00\x00\x00\x89\x81l8\x16\t\x03\x80\x08/,##\x00\x12\x00{\x12\x00\x97\x12\x00B\x12\x00K*\x04Y\x12\x00$\x12\x007\x12\x006*\x03Y#\x00\xc0#\x01\xc0#\x02QPR\x81\x82\x83*\x07\xc0Qc\x03\x00s\x1cthis will be a string objectb\x1bthis will be a bytes objects\x0bconst tuple'
+
+
+class File(uio.IOBase):
+    def __init__(self):
+        self.off = 0
+
+    def ioctl(self, request, arg):
+        return 0
+
+    def readinto(self, buf):
+        buf[:] = memoryview(file_data)[self.off : self.off + len(buf)]
+        self.off += len(buf)
+        return len(buf)
+
+
+class FS:
+    def mount(self, readonly, mkfs):
+        pass
+
+    def chdir(self, path):
+        pass
+
+    def stat(self, path):
+        if path == "__injected.mpy":
+            return tuple(0 for _ in range(10))
+        else:
+            raise OSError(-2)  # ENOENT
+
+    def open(self, path, mode):
+        return File()
+
+
+def mount():
+    uos.mount(FS(), "/__remote")
+    uos.chdir("/__remote")
+
+
+def test(r):
+    global result
+    for _ in r:
+        usys.modules.clear()
+        module = __import__("__injected")
+    result = module.result
+
+
+###########################################################################
+# Benchmark interface
+
+bm_params = {
+    (100, 10): (50,),
+    (1000, 10): (500,),
+    (5000, 10): (5000,),
+}
+
+
+def bm_setup(params):
+    (nloop,) = params
+    mount()
+    return lambda: test(range(nloop)), lambda: (nloop, result)
diff --git a/tests/perf_bench/core_import_mpy_multi.py.exp b/tests/perf_bench/core_import_mpy_multi.py.exp
new file mode 100644
index 0000000000000..190a18037c64c
--- /dev/null
+++ b/tests/perf_bench/core_import_mpy_multi.py.exp
@@ -0,0 +1 @@
+123
diff --git a/tests/perf_bench/core_import_mpy_single.py b/tests/perf_bench/core_import_mpy_single.py
new file mode 100644
index 0000000000000..5ca3584959112
--- /dev/null
+++ b/tests/perf_bench/core_import_mpy_single.py
@@ -0,0 +1,135 @@
+# Test performance of importing an .mpy file just once.
+# The first import of a module will intern strings that don't already exist, and
+# this test should be representative of what happens in a real application.
+
+import uio, uos
+
+if not (hasattr(uio, "IOBase") and hasattr(uos, "mount")):
+    print("SKIP")
+    raise SystemExit
+
+# This is the test.py file that is compiled to test.mpy below.
+# Many known and unknown names/strings are included to test the linking process.
+"""
+class A0:
+    def a0(self): pass
+    def a1(self): pass
+    def a2(self): pass
+    def a3(self): pass
+class A1:
+    def a0(self): pass
+    def a1(self): pass
+    def a2(self): pass
+    def a3(self): pass
+def f0():
+    __call__, __class__, __delitem__, __enter__, __exit__, __getattr__, __getitem__,
+    __hash__, __init__, __int__, __iter__, __len__, __main__, __module__, __name__,
+    __new__, __next__, __qualname__, __repr__, __setitem__, __str__,
+    ArithmeticError, AssertionError, AttributeError, BaseException, EOFError, Ellipsis,
+    Exception, GeneratorExit, ImportError, IndentationError, IndexError, KeyError,
+    KeyboardInterrupt, LookupError, MemoryError, NameError, NoneType,
+    NotImplementedError, OSError, OverflowError, RuntimeError, StopIteration,
+    SyntaxError, SystemExit, TypeError, ValueError, ZeroDivisionError,
+    abs, all, any, append, args, bool, builtins, bytearray, bytecode, bytes, callable,
+    chr, classmethod, clear, close, const, copy, count, dict, dir, divmod, end,
+    endswith, eval, exec, extend, find, format, from_bytes, get, getattr, globals,
+    hasattr, hash, id, index, insert, int, isalpha, isdigit, isinstance, islower,
+    isspace, issubclass, isupper, items, iter, join, key, keys, len, list, little,
+    locals, lower, lstrip, main, map, micropython, next, object, open, ord, pop,
+    popitem, pow, print, range, read, readinto, readline, remove, replace, repr,
+    reverse, rfind, rindex, round, rsplit, rstrip, self, send, sep, set, setattr,
+    setdefault, sort, sorted, split, start, startswith, staticmethod, step, stop, str,
+    strip, sum, super, throw, to_bytes, tuple, type, update, upper, value, values,
+    write, zip,
+    name0, name1, name2, name3, name4, name5, name6, name7, name8, name9,
+    quite_a_long_name0, quite_a_long_name1, quite_a_long_name2, quite_a_long_name3,
+    quite_a_long_name4, quite_a_long_name5, quite_a_long_name6, quite_a_long_name7,
+    quite_a_long_name8, quite_a_long_name9, quite_a_long_name10, quite_a_long_name11,
+def f1():
+    x = "this will be a string object 0"
+    x = "this will be a string object 1"
+    x = "this will be a string object 2"
+    x = "this will be a string object 3"
+    x = "this will be a string object 4"
+    x = "this will be a string object 5"
+    x = "this will be a string object 6"
+    x = "this will be a string object 7"
+    x = "this will be a string object 8"
+    x = "this will be a string object 9"
+    x = b"this will be a bytes object 0"
+    x = b"this will be a bytes object 1"
+    x = b"this will be a bytes object 2"
+    x = b"this will be a bytes object 3"
+    x = b"this will be a bytes object 4"
+    x = b"this will be a bytes object 5"
+    x = b"this will be a bytes object 6"
+    x = b"this will be a bytes object 7"
+    x = b"this will be a bytes object 8"
+    x = b"this will be a bytes object 9"
+    x = ("const tuple 0", None, False, True, 1, 2, 3)
+    x = ("const tuple 1", None, False, True, 1, 2, 3)
+    x = ("const tuple 2", None, False, True, 1, 2, 3)
+    x = ("const tuple 3", None, False, True, 1, 2, 3)
+    x = ("const tuple 4", None, False, True, 1, 2, 3)
+    x = ("const tuple 5", None, False, True, 1, 2, 3)
+    x = ("const tuple 6", None, False, True, 1, 2, 3)
+    x = ("const tuple 7", None, False, True, 1, 2, 3)
+    x = ("const tuple 8", None, False, True, 1, 2, 3)
+    x = ("const tuple 9", None, False, True, 1, 2, 3)
+result = 123
+"""
+file_data = b'M\x05\x02\x1f \x81\\\x10\x1a\x00\x07\x0etest.pyk@k@\x85\x18\x85\x1f\x00T2\x00\x10\x04A04\x02\x16\x01T2\x01\x10\x04A14\x02\x16\x012\x02\x16\x04f02\x03\x16\x04f1"\x80{\x16\x0cresultQc\x00\x04\x814\x00\x12\t\x0b,%%%\x00\x11\x00\x17\x16\x00\x16\x10\x03\x16\x00\x1a2\x00\x16\x04a02\x01\x16\x04a12\x02\x16\x04a22\x03\x16\x04a3Qc\x00\x04(\t\x0c\x07\x0b \x00Qc\x00\x00\x00\x89(\t\x0c\t\x03@\x00Qc\x00\x00\x00\x89(\t\x0c\t\x03`\x00Qc\x00\x00\x00\x89,\t\x0e\t\x03` \x00Qc\x00\x00\x00\x89\x818\x00\x14\x13\x03l`%%%\x00\x11\x00\x17\x16\x00\x16\x10\x03\x16\x00\x1a2\x00\x16\x0b2\x01\x16\x0b2\x02\x16\x0b2\x03\x16\x0bQc\x00\x04,\t\x0e\x07\x0b``\x00Qc\x00\x00\x00\x89,\t\x0e\t\x03\x80\x07\x00Qc\x00\x00\x00\x89,\t\x0e\t\x03\x80\x08\x00Qc\x00\x00\x00\x89,\t\x0e\t\x03\x80\t\x00Qc\x00\x00\x00\x89\x94\x1cPP\x13\x03\x80\x0b8;555222\x1f%\x1f%\x1f"\x1f"\x1f%\x1f%\x1f"\x1f%\x1f"\x1f%)\x1f"//\x00\x12\x00\t\x12\x00\n\x12\x00\x0b\x12\x00\x0c\x12\x00\r\x12\x00\x0e\x12\x00\x0f*\x07Y\x12\x00\x10\x12\x00\x11\x12\x00\x12\x12\x00\x13\x12\x00\x14\x12\x00\x15\x12\x00\x16\x12\x00\x17*\x08Y\x12\x00\x18\x12\x00\x19\x12\x00\x1a\x12\x00\x1b\x12\x00\x1c\x12\x00\x1d*\x06Y\x12\x00\x1e\x12\x00\x1f\x12\x00 \x12\x00!\x12\x00"\x12\x00#*\x06Y\x12\x00$\x12\x00%\x12\x00&\x12\x00\'\x12\x00(\x12\x00)*\x06Y\x12\x00*\x12\x00+\x12\x00,\x12\x00-\x12\x00.*\x05Y\x12\x00/\x12\x000\x12\x001\x12\x002\x12\x003*\x05Y\x12\x004\x12\x005\x12\x006\x12\x007\x12\x008*\x05Y\x12\x009\x12\x00:\x12\x00;\x12\x00<\x12\x00=\x12\x00>\x12\x00?\x12\x00@\x12\x00A\x12\x00B\x12\x00C*\x0bY\x12\x00D\x12\x00E\x12\x00F\x12\x00G\x12\x00H\x12\x00I\x12\x00J\x12\x00K\x12\x00L\x12\x00M\x12\x00N*\x0bY\x12\x00O\x12\x00P\x12\x00Q\x12\x00R\x12\x00S\x12\x00T\x12\x00U\x12\x00V\x12\x00W\x12\x00X*\nY\x12\x00Y\x12\x00Z\x12\x00[\x12\x00\\\x12\x00]\x12\x00^\x12\x00_\x12\x00`\x12\x00a\x12\x00b*\nY\x12\x00c\x12\x00d\x12\x00e\x12\x00f\x12\x00g\x12\x00h\x12\x00i\x12\x00j\x12\x00k\x12\x00l\x12\x00m*\x0bY\x12\x00n\x12\x00o\x12\x00p\x12\x00q\x12\x00r\x12\x00s\x12\x00t\x12\x00u\x12\x00v\x12\x00w\x12\x00x*\x0bY\x12\x00y\x12\x00z\x12\x00{\x12\x00|\x12\x00}\x12\x00~\x12\x00\x7f\x12\x00\x80\x12\x00\x81\x12\x00\x82*\nY\x12\x00\x83\x12\x00\x84\x12\x00\x85\x12\x00\x86\x12\x00\x87\x12\x00\x88\x12\x00\x89\x12\x00\x8a\x12\x00\x8b\x12\x00\x8c\x12\x00\x8d*\x0bY\x12\x00\x8e\x12\x00\x8f\x12\x00\x90\x12\x00\x91\x12\x00\x92\x12\x00\x93\x12\x00\x94\x12\x00\x95\x12\x00\x96\x12\x00\x97*\nY\x12\x00\x98\x12\x00\x99\x12\x00\x9a\x12\x00\x9b\x12\x00\x9c\x12\x00\x9d\x12\x00\x9e\x12\x00\x9f\x12\x00\xa0\x12\x00\xa2\x12\x00\xa3*\x0bY\x12\x00\xa4\x12\x00\xa5*\x02Y\x12\nname0\x12\nname1\x12\nname2\x12\nname3\x12\nname4\x12\nname5\x12\nname6\x12\nname7\x12\nname8\x12\nname9*\nY\x12$quite_a_long_name0\x12$quite_a_long_name1\x12$quite_a_long_name2\x12$quite_a_long_name3*\x04Y\x12$quite_a_long_name4\x12$quite_a_long_name5\x12$quite_a_long_name6\x12$quite_a_long_name7*\x04Y\x12$quite_a_long_name8\x12$quite_a_long_name9\x12&quite_a_long_name10\x12&quite_a_long_name11*\x04YQc\x00\x00\x86H8H?/\x80#####################+++++++++\x00#\x00\xc0#\x01\xc0#\x02\xc0#\x03\xc0#\x04\xc0#\x05\xc0#\x06\xc0#\x07\xc0#\x08\xc0#\t\xc0#\n\xc0#\x0b\xc0#\x0c\xc0#\r\xc0#\x0e\xc0#\x0f\xc0#\x10\xc0#\x11\xc0#\x12\xc0#\x13\xc0#\x14QPR\x81\x82\x83*\x07\xc0#\x15QPR\x81\x82\x83*\x07\xc0#\x16QPR\x81\x82\x83*\x07\xc0#\x17QPR\x81\x82\x83*\x07\xc0#\x18QPR\x81\x82\x83*\x07\xc0#\x19QPR\x81\x82\x83*\x07\xc0#\x1aQPR\x81\x82\x83*\x07\xc0#\x1bQPR\x81\x82\x83*\x07\xc0#\x1cQPR\x81\x82\x83*\x07\xc0#\x1dQPR\x81\x82\x83*\x07\xc0Qc\x1e\x00s\x1ethis will be a string object 0s\x1ethis will be a string object 1s\x1ethis will be a string object 2s\x1ethis will be a string object 3s\x1ethis will be a string object 4s\x1ethis will be a string object 5s\x1ethis will be a string object 6s\x1ethis will be a string object 7s\x1ethis will be a string object 8s\x1ethis will be a string object 9b\x1dthis will be a bytes object 0b\x1dthis will be a bytes object 1b\x1dthis will be a bytes object 2b\x1dthis will be a bytes object 3b\x1dthis will be a bytes object 4b\x1dthis will be a bytes object 5b\x1dthis will be a bytes object 6b\x1dthis will be a bytes object 7b\x1dthis will be a bytes object 8b\x1dthis will be a bytes object 9s\rconst tuple 0s\rconst tuple 1s\rconst tuple 2s\rconst tuple 3s\rconst tuple 4s\rconst tuple 5s\rconst tuple 6s\rconst tuple 7s\rconst tuple 8s\rconst tuple 9'
+
+
+class File(uio.IOBase):
+    def __init__(self):
+        self.off = 0
+
+    def ioctl(self, request, arg):
+        return 0
+
+    def readinto(self, buf):
+        buf[:] = memoryview(file_data)[self.off : self.off + len(buf)]
+        self.off += len(buf)
+        return len(buf)
+
+
+class FS:
+    def mount(self, readonly, mkfs):
+        pass
+
+    def chdir(self, path):
+        pass
+
+    def stat(self, path):
+        if path == "__injected.mpy":
+            return tuple(0 for _ in range(10))
+        else:
+            raise OSError(-2)  # ENOENT
+
+    def open(self, path, mode):
+        return File()
+
+
+def mount():
+    uos.mount(FS(), "/__remote")
+    uos.chdir("/__remote")
+
+
+def test():
+    global result
+    module = __import__("__injected")
+    result = module.result
+
+
+###########################################################################
+# Benchmark interface
+
+bm_params = {
+    (1, 1): (),
+}
+
+
+def bm_setup(params):
+    mount()
+    return lambda: test(), lambda: (1, result)
diff --git a/tests/perf_bench/core_import_mpy_single.py.exp b/tests/perf_bench/core_import_mpy_single.py.exp
new file mode 100644
index 0000000000000..190a18037c64c
--- /dev/null
+++ b/tests/perf_bench/core_import_mpy_single.py.exp
@@ -0,0 +1 @@
+123
diff --git a/tests/perf_bench/core_qstr.py b/tests/perf_bench/core_qstr.py
new file mode 100644
index 0000000000000..b87e2c065855a
--- /dev/null
+++ b/tests/perf_bench/core_qstr.py
@@ -0,0 +1,21 @@
+# This tests qstr_find_strn() speed when the string being searched for is not found.
+
+
+def test(r):
+    for _ in r:
+        str("a string that shouldn't be interned")
+
+
+###########################################################################
+# Benchmark interface
+
+bm_params = {
+    (100, 10): (400,),
+    (1000, 10): (4000,),
+    (5000, 10): (40000,),
+}
+
+
+def bm_setup(params):
+    (nloop,) = params
+    return lambda: test(range(nloop)), lambda: (nloop // 100, None)

From a434705700c18544edbbcabc714a5bf507847eb4 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 11 Feb 2022 13:42:00 +1100
Subject: [PATCH 1705/3533] tests/perf_bench: Add perf test for yield-from
 execution.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/perf_bench/core_yield_from.py | 31 +++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 tests/perf_bench/core_yield_from.py

diff --git a/tests/perf_bench/core_yield_from.py b/tests/perf_bench/core_yield_from.py
new file mode 100644
index 0000000000000..2f6930e2b8a5b
--- /dev/null
+++ b/tests/perf_bench/core_yield_from.py
@@ -0,0 +1,31 @@
+# Test a deep set of "yield from" statements.
+
+
+def recursive_yield_from(depth, iter_):
+    if depth <= 0:
+        for i in iter_:
+            yield i
+    else:
+        yield from recursive_yield_from(depth - 1, iter_)
+
+
+def test(n):
+    global result
+    result = 0
+    for i in recursive_yield_from(10, range(n)):
+        result += i
+
+
+###########################################################################
+# Benchmark interface
+
+bm_params = {
+    (100, 10): (2000,),
+    (1000, 10): (20000,),
+    (5000, 10): (100000,),
+}
+
+
+def bm_setup(params):
+    (nloop,) = params
+    return lambda: test(nloop), lambda: (nloop // 100, result)

From e8bc4a3a5be12ad639b811852337c63e8f1d6277 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 11 Feb 2022 22:19:38 +1100
Subject: [PATCH 1706/3533] tests/run-perfbench.py: Use SKIP consistently, and
 increase print width.

A script will print "SKIP" if it wants to be skipped, so the test runner
must also use uppercase SKIP.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/run-perfbench.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/run-perfbench.py b/tests/run-perfbench.py
index fccb7a7684aed..c143ae32f9e55 100755
--- a/tests/run-perfbench.py
+++ b/tests/run-perfbench.py
@@ -100,7 +100,7 @@ def run_benchmarks(target, param_n, param_m, n_average, test_list):
             and test_file.find("viper_") != -1
         )
         if skip:
-            print("skip")
+            print("SKIP")
             continue
 
         # Create test script
@@ -171,7 +171,7 @@ def parse_output(filename):
         m = int(m.split("=")[1])
         data = []
         for l in f:
-            if l.find(": ") != -1 and l.find(": skip") == -1 and l.find("CRASH: ") == -1:
+            if l.find(": ") != -1 and l.find(": SKIP") == -1 and l.find("CRASH: ") == -1:
                 name, values = l.strip().split(": ")
                 values = tuple(float(v) for v in values.split())
                 data.append((name,) + values)
@@ -193,7 +193,7 @@ def compute_diff(file1, file2, diff_score):
     else:
         hdr = "N={} M={} vs N={} M={}".format(n1, m1, n2, m2)
     print(
-        "{:24} {:>10} -> {:>10}   {:>10}   {:>7}% (error%)".format(
+        "{:26} {:>10} -> {:>10}   {:>10}   {:>7}% (error%)".format(
             hdr, file1, file2, "diff", "diff"
         )
     )
@@ -214,7 +214,7 @@ def compute_diff(file1, file2, diff_score):
             percent = 100 * av_diff / av1
             percent_sd = 100 * sd_diff / av1
             print(
-                "{:24} {:10.2f} -> {:10.2f} : {:+10.2f} = {:+7.3f}% (+/-{:.2f}%)".format(
+                "{:26} {:10.2f} -> {:10.2f} : {:+10.2f} = {:+7.3f}% (+/-{:.2f}%)".format(
                     name, av1, av2, av_diff, percent, percent_sd
                 )
             )

From 18b1ba086c0e5547ca81030bf13b026961f80720 Mon Sep 17 00:00:00 2001
From: Artyom Skrobov <tyomitch@gmail.com>
Date: Mon, 3 May 2021 14:17:36 -0400
Subject: [PATCH 1707/3533] py/qstr: Separate hash and len from string data.

This allows the compiler to merge strings: e.g. "update",
"difference_update" and "symmetric_difference_update" will all point to the
same memory.

No functional change.

The size reduction depends on the number of qstrs in the build.  The change
this commit brings is:

   bare-arm:    -4 -0.007%
minimal x86:  +150 +0.092% [incl +48(data)]
   unix x64:  -608 -0.118%
unix nanbox:  -572 -0.126% [incl +32(data)]
      stm32: -1392 -0.352% PYBV10
     cc3200:  -448 -0.244%
    esp8266: -1208 -0.173% GENERIC
      esp32: -1028 -0.068% GENERIC[incl -1020(data)]
        nrf:  -440 -0.252% pca10040
        rp2: -1072 -0.217% PICO
       samd:  -368 -0.264% ADAFRUIT_ITSYBITSY_M4_EXPRESS

Performance is also improved (on bare metal at least) for the
core_import_mpy_multi.py, core_import_mpy_single.py and core_qstr.py
performance benchmarks.

Originally at adafruit#4583

Signed-off-by: Artyom Skrobov <tyomitch@gmail.com>
---
 py/makeqstrdata.py |  29 ++++------
 py/mpstate.h       |   2 +-
 py/qstr.c          | 134 +++++++++++++++++++++++----------------------
 py/qstr.h          |  22 +++++++-
 tools/mpy-tool.py  |  29 +++++++---
 5 files changed, 122 insertions(+), 94 deletions(-)

diff --git a/py/makeqstrdata.py b/py/makeqstrdata.py
index 403c4068889c5..e332ab94ed565 100644
--- a/py/makeqstrdata.py
+++ b/py/makeqstrdata.py
@@ -317,26 +317,24 @@ def parse_input_headers(infiles):
     return qcfgs, qstrs
 
 
-def make_bytes(cfg_bytes_len, cfg_bytes_hash, qstr):
-    qbytes = bytes_cons(qstr, "utf8")
-    qlen = len(qbytes)
-    qhash = compute_hash(qbytes, cfg_bytes_hash)
+def escape_bytes(qstr, qbytes):
     if all(32 <= ord(c) <= 126 and c != "\\" and c != '"' for c in qstr):
         # qstr is all printable ASCII so render it as-is (for easier debugging)
-        qdata = qstr
+        return qstr
     else:
         # qstr contains non-printable codes so render entire thing as hex pairs
-        qdata = "".join(("\\x%02x" % b) for b in qbytes)
+        return "".join(("\\x%02x" % b) for b in qbytes)
+
+
+def make_bytes(cfg_bytes_len, cfg_bytes_hash, qstr):
+    qbytes = bytes_cons(qstr, "utf8")
+    qlen = len(qbytes)
+    qhash = compute_hash(qbytes, cfg_bytes_hash)
     if qlen >= (1 << (8 * cfg_bytes_len)):
         print("qstr is too long:", qstr)
         assert False
-    qlen_str = ("\\x%02x" * cfg_bytes_len) % tuple(
-        ((qlen >> (8 * i)) & 0xFF) for i in range(cfg_bytes_len)
-    )
-    qhash_str = ("\\x%02x" * cfg_bytes_hash) % tuple(
-        ((qhash >> (8 * i)) & 0xFF) for i in range(cfg_bytes_hash)
-    )
-    return '(const byte*)"%s%s" "%s"' % (qhash_str, qlen_str, qdata)
+    qdata = escape_bytes(qstr, qbytes)
+    return '%d, %d, "%s"' % (qhash, qlen, qdata)
 
 
 def print_qstr_data(qcfgs, qstrs):
@@ -349,10 +347,7 @@ def print_qstr_data(qcfgs, qstrs):
     print("")
 
     # add NULL qstr with no hash or data
-    print(
-        'QDEF(MP_QSTRnull, (const byte*)"%s%s" "")'
-        % ("\\x00" * cfg_bytes_hash, "\\x00" * cfg_bytes_len)
-    )
+    print('QDEF(MP_QSTRnull, 0, 0, "")')
 
     # go through each qstr and print it out
     for order, ident, qstr in sorted(qstrs.values(), key=lambda x: x[0]):
diff --git a/py/mpstate.h b/py/mpstate.h
index 8ece151663088..7f86399f572a7 100644
--- a/py/mpstate.h
+++ b/py/mpstate.h
@@ -202,7 +202,7 @@ typedef struct _mp_state_vm_t {
 
     // pointer and sizes to store interned string data
     // (qstr_last_chunk can be root pointer but is also stored in qstr pool)
-    byte *qstr_last_chunk;
+    char *qstr_last_chunk;
     size_t qstr_last_alloc;
     size_t qstr_last_used;
 
diff --git a/py/qstr.c b/py/qstr.c
index e5b13b700d822..848a5833044e2 100644
--- a/py/qstr.c
+++ b/py/qstr.c
@@ -35,7 +35,6 @@
 
 // NOTE: we are using linear arrays to store and search for qstr's (unique strings, interned strings)
 // ultimately we will replace this with a static hash table of some kind
-// also probably need to include the length in the string data, to allow null bytes in the string
 
 #if MICROPY_DEBUG_VERBOSE // print debugging info
 #define DEBUG_printf DEBUG_printf
@@ -44,34 +43,9 @@
 #endif
 
 // A qstr is an index into the qstr pool.
-// The data for a qstr contains (hash, length, data):
-//  - hash (configurable number of bytes)
-//  - length (configurable number of bytes)
-//  - data ("length" number of bytes)
-//  - \0 terminated (so they can be printed using printf)
-
-#if MICROPY_QSTR_BYTES_IN_HASH == 1
-    #define Q_HASH_MASK (0xff)
-    #define Q_GET_HASH(q) ((mp_uint_t)(q)[0])
-    #define Q_SET_HASH(q, hash) do { (q)[0] = (hash); } while (0)
-#elif MICROPY_QSTR_BYTES_IN_HASH == 2
-    #define Q_HASH_MASK (0xffff)
-    #define Q_GET_HASH(q) ((mp_uint_t)(q)[0] | ((mp_uint_t)(q)[1] << 8))
-    #define Q_SET_HASH(q, hash) do { (q)[0] = (hash); (q)[1] = (hash) >> 8; } while (0)
-#else
-    #error unimplemented qstr hash decoding
-#endif
-#define Q_GET_ALLOC(q)  (MICROPY_QSTR_BYTES_IN_HASH + MICROPY_QSTR_BYTES_IN_LEN + Q_GET_LENGTH(q) + 1)
-#define Q_GET_DATA(q)   ((q) + MICROPY_QSTR_BYTES_IN_HASH + MICROPY_QSTR_BYTES_IN_LEN)
-#if MICROPY_QSTR_BYTES_IN_LEN == 1
-    #define Q_GET_LENGTH(q) ((q)[MICROPY_QSTR_BYTES_IN_HASH])
-    #define Q_SET_LENGTH(q, len) do { (q)[MICROPY_QSTR_BYTES_IN_HASH] = (len); } while (0)
-#elif MICROPY_QSTR_BYTES_IN_LEN == 2
-    #define Q_GET_LENGTH(q) ((q)[MICROPY_QSTR_BYTES_IN_HASH] | ((q)[MICROPY_QSTR_BYTES_IN_HASH + 1] << 8))
-    #define Q_SET_LENGTH(q, len) do { (q)[MICROPY_QSTR_BYTES_IN_HASH] = (len); (q)[MICROPY_QSTR_BYTES_IN_HASH + 1] = (len) >> 8; } while (0)
-#else
-    #error unimplemented qstr length decoding
-#endif
+// The data for a qstr is \0 terminated (so they can be printed using printf)
+
+#define Q_HASH_MASK ((1 << (8 * MICROPY_QSTR_BYTES_IN_HASH)) - 1)
 
 #if MICROPY_PY_THREAD && !MICROPY_PY_THREAD_GIL
 #define QSTR_ENTER() mp_thread_mutex_lock(&MP_STATE_VM(qstr_mutex), 1)
@@ -100,14 +74,32 @@ mp_uint_t qstr_compute_hash(const byte *data, size_t len) {
     return hash;
 }
 
+const qstr_hash_t mp_qstr_const_hashes[] = {
+    #ifndef NO_QSTR
+#define QDEF(id, hash, len, str) hash,
+    #include "genhdr/qstrdefs.generated.h"
+#undef QDEF
+    #endif
+};
+
+const qstr_len_t mp_qstr_const_lengths[] = {
+    #ifndef NO_QSTR
+#define QDEF(id, hash, len, str) len,
+    #include "genhdr/qstrdefs.generated.h"
+#undef QDEF
+    #endif
+};
+
 const qstr_pool_t mp_qstr_const_pool = {
     NULL,               // no previous pool
     0,                  // no previous pool
     MICROPY_ALLOC_QSTR_ENTRIES_INIT,
     MP_QSTRnumber_of,   // corresponds to number of strings in array just below
+    (qstr_hash_t *)mp_qstr_const_hashes,
+    (qstr_len_t *)mp_qstr_const_lengths,
     {
         #ifndef NO_QSTR
-#define QDEF(id, str) str,
+#define QDEF(id, hash, len, str) str,
         #include "genhdr/qstrdefs.generated.h"
 #undef QDEF
         #endif
@@ -130,19 +122,21 @@ void qstr_init(void) {
     #endif
 }
 
-STATIC const byte *find_qstr(qstr q) {
+STATIC qstr_pool_t *find_qstr(qstr *q) {
     // search pool for this qstr
     // total_prev_len==0 in the final pool, so the loop will always terminate
     qstr_pool_t *pool = MP_STATE_VM(last_pool);
-    while (q < pool->total_prev_len) {
+    while (*q < pool->total_prev_len) {
         pool = pool->prev;
     }
-    return pool->qstrs[q - pool->total_prev_len];
+    *q -= pool->total_prev_len;
+    assert(*q < pool->len);
+    return pool;
 }
 
 // qstr_mutex must be taken while in this function
-STATIC qstr qstr_add(const byte *q_ptr) {
-    DEBUG_printf("QSTR: add hash=%d len=%d data=%.*s\n", Q_GET_HASH(q_ptr), Q_GET_LENGTH(q_ptr), Q_GET_LENGTH(q_ptr), Q_GET_DATA(q_ptr));
+STATIC qstr qstr_add(mp_uint_t hash, mp_uint_t len, const char *q_ptr) {
+    DEBUG_printf("QSTR: add hash=%d len=%d data=%.*s\n", hash, len, len, q_ptr);
 
     // make sure we have room in the pool for a new qstr
     if (MP_STATE_VM(last_pool)->len >= MP_STATE_VM(last_pool)->alloc) {
@@ -151,7 +145,9 @@ STATIC qstr qstr_add(const byte *q_ptr) {
         // Put a lower bound on the allocation size in case the extra qstr pool has few entries
         new_alloc = MAX(MICROPY_ALLOC_QSTR_ENTRIES_INIT, new_alloc);
         #endif
-        qstr_pool_t *pool = m_new_obj_var_maybe(qstr_pool_t, const char *, new_alloc);
+        mp_uint_t pool_size = sizeof(qstr_pool_t)
+            + (sizeof(const char *) + sizeof(qstr_hash_t) + sizeof(qstr_len_t)) * new_alloc;
+        qstr_pool_t *pool = (qstr_pool_t *)m_malloc_maybe(pool_size);
         if (pool == NULL) {
             // Keep qstr_last_chunk consistent with qstr_pool_t: qstr_last_chunk is not scanned
             // at garbage collection since it's reachable from a qstr_pool_t.  And the caller of
@@ -162,6 +158,8 @@ STATIC qstr qstr_add(const byte *q_ptr) {
             QSTR_EXIT();
             m_malloc_fail(new_alloc);
         }
+        pool->hashes = (qstr_hash_t *)(pool->qstrs + new_alloc);
+        pool->lengths = (qstr_len_t *)(pool->hashes + new_alloc);
         pool->prev = MP_STATE_VM(last_pool);
         pool->total_prev_len = MP_STATE_VM(last_pool)->total_prev_len + MP_STATE_VM(last_pool)->len;
         pool->alloc = new_alloc;
@@ -171,10 +169,14 @@ STATIC qstr qstr_add(const byte *q_ptr) {
     }
 
     // add the new qstr
-    MP_STATE_VM(last_pool)->qstrs[MP_STATE_VM(last_pool)->len++] = q_ptr;
+    mp_uint_t at = MP_STATE_VM(last_pool)->len;
+    MP_STATE_VM(last_pool)->hashes[at] = hash;
+    MP_STATE_VM(last_pool)->lengths[at] = len;
+    MP_STATE_VM(last_pool)->qstrs[at] = q_ptr;
+    MP_STATE_VM(last_pool)->len++;
 
     // return id for the newly-added qstr
-    return MP_STATE_VM(last_pool)->total_prev_len + MP_STATE_VM(last_pool)->len - 1;
+    return MP_STATE_VM(last_pool)->total_prev_len + at;
 }
 
 qstr qstr_find_strn(const char *str, size_t str_len) {
@@ -183,9 +185,10 @@ qstr qstr_find_strn(const char *str, size_t str_len) {
 
     // search pools for the data
     for (qstr_pool_t *pool = MP_STATE_VM(last_pool); pool != NULL; pool = pool->prev) {
-        for (const byte **q = pool->qstrs, **q_top = pool->qstrs + pool->len; q < q_top; q++) {
-            if (Q_GET_HASH(*q) == str_hash && Q_GET_LENGTH(*q) == str_len && memcmp(Q_GET_DATA(*q), str, str_len) == 0) {
-                return pool->total_prev_len + (q - pool->qstrs);
+        for (mp_uint_t at = 0, top = pool->len; at < top; at++) {
+            if (pool->hashes[at] == str_hash && pool->lengths[at] == str_len
+                && memcmp(pool->qstrs[at], str, str_len) == 0) {
+                return pool->total_prev_len + at;
             }
         }
     }
@@ -211,14 +214,14 @@ qstr qstr_from_strn(const char *str, size_t len) {
         }
 
         // compute number of bytes needed to intern this string
-        size_t n_bytes = MICROPY_QSTR_BYTES_IN_HASH + MICROPY_QSTR_BYTES_IN_LEN + len + 1;
+        size_t n_bytes = len + 1;
 
         if (MP_STATE_VM(qstr_last_chunk) != NULL && MP_STATE_VM(qstr_last_used) + n_bytes > MP_STATE_VM(qstr_last_alloc)) {
             // not enough room at end of previously interned string so try to grow
-            byte *new_p = m_renew_maybe(byte, MP_STATE_VM(qstr_last_chunk), MP_STATE_VM(qstr_last_alloc), MP_STATE_VM(qstr_last_alloc) + n_bytes, false);
+            char *new_p = m_renew_maybe(char, MP_STATE_VM(qstr_last_chunk), MP_STATE_VM(qstr_last_alloc), MP_STATE_VM(qstr_last_alloc) + n_bytes, false);
             if (new_p == NULL) {
                 // could not grow existing memory; shrink it to fit previous
-                (void)m_renew_maybe(byte, MP_STATE_VM(qstr_last_chunk), MP_STATE_VM(qstr_last_alloc), MP_STATE_VM(qstr_last_used), false);
+                (void)m_renew_maybe(char, MP_STATE_VM(qstr_last_chunk), MP_STATE_VM(qstr_last_alloc), MP_STATE_VM(qstr_last_used), false);
                 MP_STATE_VM(qstr_last_chunk) = NULL;
             } else {
                 // could grow existing memory
@@ -232,10 +235,10 @@ qstr qstr_from_strn(const char *str, size_t len) {
             if (al < MICROPY_ALLOC_QSTR_CHUNK_INIT) {
                 al = MICROPY_ALLOC_QSTR_CHUNK_INIT;
             }
-            MP_STATE_VM(qstr_last_chunk) = m_new_maybe(byte, al);
+            MP_STATE_VM(qstr_last_chunk) = m_new_maybe(char, al);
             if (MP_STATE_VM(qstr_last_chunk) == NULL) {
                 // failed to allocate a large chunk so try with exact size
-                MP_STATE_VM(qstr_last_chunk) = m_new_maybe(byte, n_bytes);
+                MP_STATE_VM(qstr_last_chunk) = m_new_maybe(char, n_bytes);
                 if (MP_STATE_VM(qstr_last_chunk) == NULL) {
                     QSTR_EXIT();
                     m_malloc_fail(n_bytes);
@@ -247,40 +250,38 @@ qstr qstr_from_strn(const char *str, size_t len) {
         }
 
         // allocate memory from the chunk for this new interned string's data
-        byte *q_ptr = MP_STATE_VM(qstr_last_chunk) + MP_STATE_VM(qstr_last_used);
+        char *q_ptr = MP_STATE_VM(qstr_last_chunk) + MP_STATE_VM(qstr_last_used);
         MP_STATE_VM(qstr_last_used) += n_bytes;
 
         // store the interned strings' data
         mp_uint_t hash = qstr_compute_hash((const byte *)str, len);
-        Q_SET_HASH(q_ptr, hash);
-        Q_SET_LENGTH(q_ptr, len);
-        memcpy(q_ptr + MICROPY_QSTR_BYTES_IN_HASH + MICROPY_QSTR_BYTES_IN_LEN, str, len);
-        q_ptr[MICROPY_QSTR_BYTES_IN_HASH + MICROPY_QSTR_BYTES_IN_LEN + len] = '\0';
-        q = qstr_add(q_ptr);
+        memcpy(q_ptr, str, len);
+        q_ptr[len] = '\0';
+        q = qstr_add(hash, len, q_ptr);
     }
     QSTR_EXIT();
     return q;
 }
 
 mp_uint_t qstr_hash(qstr q) {
-    const byte *qd = find_qstr(q);
-    return Q_GET_HASH(qd);
+    qstr_pool_t *pool = find_qstr(&q);
+    return pool->hashes[q];
 }
 
 size_t qstr_len(qstr q) {
-    const byte *qd = find_qstr(q);
-    return Q_GET_LENGTH(qd);
+    qstr_pool_t *pool = find_qstr(&q);
+    return pool->lengths[q];
 }
 
 const char *qstr_str(qstr q) {
-    const byte *qd = find_qstr(q);
-    return (const char *)Q_GET_DATA(qd);
+    qstr_pool_t *pool = find_qstr(&q);
+    return pool->qstrs[q];
 }
 
 const byte *qstr_data(qstr q, size_t *len) {
-    const byte *qd = find_qstr(q);
-    *len = Q_GET_LENGTH(qd);
-    return Q_GET_DATA(qd);
+    qstr_pool_t *pool = find_qstr(&q);
+    *len = pool->lengths[q];
+    return (byte *)pool->qstrs[q];
 }
 
 void qstr_pool_info(size_t *n_pool, size_t *n_qstr, size_t *n_str_data_bytes, size_t *n_total_bytes) {
@@ -292,13 +293,14 @@ void qstr_pool_info(size_t *n_pool, size_t *n_qstr, size_t *n_str_data_bytes, si
     for (qstr_pool_t *pool = MP_STATE_VM(last_pool); pool != NULL && pool != &CONST_POOL; pool = pool->prev) {
         *n_pool += 1;
         *n_qstr += pool->len;
-        for (const byte **q = pool->qstrs, **q_top = pool->qstrs + pool->len; q < q_top; q++) {
-            *n_str_data_bytes += Q_GET_ALLOC(*q);
+        for (qstr_len_t *l = pool->lengths, *l_top = pool->lengths + pool->len; l < l_top; l++) {
+            *n_str_data_bytes += *l + 1;
         }
         #if MICROPY_ENABLE_GC
         *n_total_bytes += gc_nbytes(pool); // this counts actual bytes used in heap
         #else
-        *n_total_bytes += sizeof(qstr_pool_t) + sizeof(qstr) * pool->alloc;
+        *n_total_bytes += sizeof(qstr_pool_t)
+            + (sizeof(const char *) + sizeof(qstr_hash_t) + sizeof(qstr_len_t)) * pool->alloc;
         #endif
     }
     *n_total_bytes += *n_str_data_bytes;
@@ -309,8 +311,8 @@ void qstr_pool_info(size_t *n_pool, size_t *n_qstr, size_t *n_str_data_bytes, si
 void qstr_dump_data(void) {
     QSTR_ENTER();
     for (qstr_pool_t *pool = MP_STATE_VM(last_pool); pool != NULL && pool != &CONST_POOL; pool = pool->prev) {
-        for (const byte **q = pool->qstrs, **q_top = pool->qstrs + pool->len; q < q_top; q++) {
-            mp_printf(&mp_plat_print, "Q(%s)\n", Q_GET_DATA(*q));
+        for (const char **q = pool->qstrs, **q_top = pool->qstrs + pool->len; q < q_top; q++) {
+            mp_printf(&mp_plat_print, "Q(%s)\n", *q);
         }
     }
     QSTR_EXIT();
diff --git a/py/qstr.h b/py/qstr.h
index 0b6fb12b084a0..19672afc0d2cd 100644
--- a/py/qstr.h
+++ b/py/qstr.h
@@ -38,7 +38,7 @@
 // first entry in enum will be MP_QSTRnull=0, which indicates invalid/no qstr
 enum {
     #ifndef NO_QSTR
-#define QDEF(id, str) id,
+#define QDEF(id, hash, len, str) id,
     #include "genhdr/qstrdefs.generated.h"
 #undef QDEF
     #endif
@@ -47,12 +47,30 @@ enum {
 
 typedef size_t qstr;
 
+#if MICROPY_QSTR_BYTES_IN_HASH == 1
+typedef uint8_t qstr_hash_t;
+#elif MICROPY_QSTR_BYTES_IN_HASH == 2
+typedef uint16_t qstr_hash_t;
+#else
+#error unimplemented qstr hash decoding
+#endif
+
+#if MICROPY_QSTR_BYTES_IN_LEN == 1
+typedef uint8_t qstr_len_t;
+#elif MICROPY_QSTR_BYTES_IN_LEN == 2
+typedef uint16_t qstr_len_t;
+#else
+#error unimplemented qstr length decoding
+#endif
+
 typedef struct _qstr_pool_t {
     struct _qstr_pool_t *prev;
     size_t total_prev_len;
     size_t alloc;
     size_t len;
-    const byte *qstrs[];
+    qstr_hash_t *hashes;
+    qstr_len_t *lengths;
+    const char *qstrs[];
 } qstr_pool_t;
 
 #define QSTR_TOTAL() (MP_STATE_VM(last_pool)->total_prev_len + MP_STATE_VM(last_pool)->len)
diff --git a/tools/mpy-tool.py b/tools/mpy-tool.py
index aa0272111c406..337f580b6e5b0 100755
--- a/tools/mpy-tool.py
+++ b/tools/mpy-tool.py
@@ -814,7 +814,7 @@ def freeze_mpy(base_qstrs, raw_codes):
         # don't add duplicates
         if q is None or q.qstr_esc in base_qstrs or q.qstr_esc in new:
             continue
-        new[q.qstr_esc] = (len(new), q.qstr_esc, q.str)
+        new[q.qstr_esc] = (len(new), q.qstr_esc, q.str, bytes_cons(q.str, "utf8"))
     new = sorted(new.values(), key=lambda x: x[0])
 
     print('#include "py/mpconfig.h"')
@@ -864,6 +864,22 @@ def freeze_mpy(base_qstrs, raw_codes):
     # As in qstr.c, set so that the first dynamically allocated pool is twice this size; must be <= the len
     qstr_pool_alloc = min(len(new), 10)
 
+    print()
+    print("const qstr_hash_t mp_qstr_frozen_const_hashes[] = {")
+    qstr_size = {"metadata": 0, "data": 0}
+    for _, _, _, qbytes in new:
+        qhash = qstrutil.compute_hash(qbytes, config.MICROPY_QSTR_BYTES_IN_HASH)
+        print("    %d," % qhash)
+    print("};")
+    print()
+    print("const qstr_len_t mp_qstr_frozen_const_lengths[] = {")
+    for _, _, _, qbytes in new:
+        print("    %d," % len(qbytes))
+        qstr_size["metadata"] += (
+            config.MICROPY_QSTR_BYTES_IN_LEN + config.MICROPY_QSTR_BYTES_IN_HASH
+        )
+        qstr_size["data"] += len(qbytes)
+    print("};")
     print()
     print("extern const qstr_pool_t mp_qstr_const_pool;")
     print("const qstr_pool_t mp_qstr_frozen_const_pool = {")
@@ -871,14 +887,11 @@ def freeze_mpy(base_qstrs, raw_codes):
     print("    MP_QSTRnumber_of, // previous pool size")
     print("    %u, // allocated entries" % qstr_pool_alloc)
     print("    %u, // used entries" % len(new))
+    print("    (qstr_hash_t *)mp_qstr_frozen_const_hashes,")
+    print("    (qstr_len_t *)mp_qstr_frozen_const_lengths,")
     print("    {")
-    for _, _, qstr in new:
-        print(
-            "        %s,"
-            % qstrutil.make_bytes(
-                config.MICROPY_QSTR_BYTES_IN_LEN, config.MICROPY_QSTR_BYTES_IN_HASH, qstr
-            )
-        )
+    for _, _, qstr, qbytes in new:
+        print('        "%s",' % qstrutil.escape_bytes(qstr, qbytes))
     print("    },")
     print("};")
 

From f46a7140f55a8f6d80f9c2d5f8db7af3de116794 Mon Sep 17 00:00:00 2001
From: Artyom Skrobov <tyomitch@gmail.com>
Date: Tue, 4 May 2021 03:35:45 -0400
Subject: [PATCH 1708/3533] py/qstr: Use `const` consistently to avoid a cast.

Originally at adafruit#4707

Signed-off-by: Artyom Skrobov <tyomitch@gmail.com>
---
 py/qstr.c         | 20 ++++++++++----------
 py/qstr.h         |  2 +-
 tools/mpy-tool.py |  2 +-
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/py/qstr.c b/py/qstr.c
index 848a5833044e2..f9ca106837490 100644
--- a/py/qstr.c
+++ b/py/qstr.c
@@ -122,10 +122,10 @@ void qstr_init(void) {
     #endif
 }
 
-STATIC qstr_pool_t *find_qstr(qstr *q) {
+STATIC const qstr_pool_t *find_qstr(qstr *q) {
     // search pool for this qstr
     // total_prev_len==0 in the final pool, so the loop will always terminate
-    qstr_pool_t *pool = MP_STATE_VM(last_pool);
+    const qstr_pool_t *pool = MP_STATE_VM(last_pool);
     while (*q < pool->total_prev_len) {
         pool = pool->prev;
     }
@@ -184,7 +184,7 @@ qstr qstr_find_strn(const char *str, size_t str_len) {
     mp_uint_t str_hash = qstr_compute_hash((const byte *)str, str_len);
 
     // search pools for the data
-    for (qstr_pool_t *pool = MP_STATE_VM(last_pool); pool != NULL; pool = pool->prev) {
+    for (const qstr_pool_t *pool = MP_STATE_VM(last_pool); pool != NULL; pool = pool->prev) {
         for (mp_uint_t at = 0, top = pool->len; at < top; at++) {
             if (pool->hashes[at] == str_hash && pool->lengths[at] == str_len
                 && memcmp(pool->qstrs[at], str, str_len) == 0) {
@@ -264,22 +264,22 @@ qstr qstr_from_strn(const char *str, size_t len) {
 }
 
 mp_uint_t qstr_hash(qstr q) {
-    qstr_pool_t *pool = find_qstr(&q);
+    const qstr_pool_t *pool = find_qstr(&q);
     return pool->hashes[q];
 }
 
 size_t qstr_len(qstr q) {
-    qstr_pool_t *pool = find_qstr(&q);
+    const qstr_pool_t *pool = find_qstr(&q);
     return pool->lengths[q];
 }
 
 const char *qstr_str(qstr q) {
-    qstr_pool_t *pool = find_qstr(&q);
+    const qstr_pool_t *pool = find_qstr(&q);
     return pool->qstrs[q];
 }
 
 const byte *qstr_data(qstr q, size_t *len) {
-    qstr_pool_t *pool = find_qstr(&q);
+    const qstr_pool_t *pool = find_qstr(&q);
     *len = pool->lengths[q];
     return (byte *)pool->qstrs[q];
 }
@@ -290,7 +290,7 @@ void qstr_pool_info(size_t *n_pool, size_t *n_qstr, size_t *n_str_data_bytes, si
     *n_qstr = 0;
     *n_str_data_bytes = 0;
     *n_total_bytes = 0;
-    for (qstr_pool_t *pool = MP_STATE_VM(last_pool); pool != NULL && pool != &CONST_POOL; pool = pool->prev) {
+    for (const qstr_pool_t *pool = MP_STATE_VM(last_pool); pool != NULL && pool != &CONST_POOL; pool = pool->prev) {
         *n_pool += 1;
         *n_qstr += pool->len;
         for (qstr_len_t *l = pool->lengths, *l_top = pool->lengths + pool->len; l < l_top; l++) {
@@ -310,8 +310,8 @@ void qstr_pool_info(size_t *n_pool, size_t *n_qstr, size_t *n_str_data_bytes, si
 #if MICROPY_PY_MICROPYTHON_MEM_INFO
 void qstr_dump_data(void) {
     QSTR_ENTER();
-    for (qstr_pool_t *pool = MP_STATE_VM(last_pool); pool != NULL && pool != &CONST_POOL; pool = pool->prev) {
-        for (const char **q = pool->qstrs, **q_top = pool->qstrs + pool->len; q < q_top; q++) {
+    for (const qstr_pool_t *pool = MP_STATE_VM(last_pool); pool != NULL && pool != &CONST_POOL; pool = pool->prev) {
+        for (const char *const *q = pool->qstrs, *const *q_top = pool->qstrs + pool->len; q < q_top; q++) {
             mp_printf(&mp_plat_print, "Q(%s)\n", *q);
         }
     }
diff --git a/py/qstr.h b/py/qstr.h
index 19672afc0d2cd..ded105760c421 100644
--- a/py/qstr.h
+++ b/py/qstr.h
@@ -64,7 +64,7 @@ typedef uint16_t qstr_len_t;
 #endif
 
 typedef struct _qstr_pool_t {
-    struct _qstr_pool_t *prev;
+    const struct _qstr_pool_t *prev;
     size_t total_prev_len;
     size_t alloc;
     size_t len;
diff --git a/tools/mpy-tool.py b/tools/mpy-tool.py
index 337f580b6e5b0..58a4a75c91ecb 100755
--- a/tools/mpy-tool.py
+++ b/tools/mpy-tool.py
@@ -883,7 +883,7 @@ def freeze_mpy(base_qstrs, raw_codes):
     print()
     print("extern const qstr_pool_t mp_qstr_const_pool;")
     print("const qstr_pool_t mp_qstr_frozen_const_pool = {")
-    print("    (qstr_pool_t*)&mp_qstr_const_pool, // previous pool")
+    print("    &mp_qstr_const_pool, // previous pool")
     print("    MP_QSTRnumber_of, // previous pool size")
     print("    %u, // allocated entries" % qstr_pool_alloc)
     print("    %u, // used entries" % len(new))

From 2ea21abae0358a46c0144f014f2e5891afe03dfd Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sat, 12 Feb 2022 01:03:39 +1100
Subject: [PATCH 1709/3533] tests/extmod/vfs_fat_finaliser.py: Make
 finalisation more robust.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/extmod/vfs_fat_finaliser.py | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/tests/extmod/vfs_fat_finaliser.py b/tests/extmod/vfs_fat_finaliser.py
index b67afc2d94641..b38e640c73daf 100644
--- a/tests/extmod/vfs_fat_finaliser.py
+++ b/tests/extmod/vfs_fat_finaliser.py
@@ -56,6 +56,12 @@ def ioctl(self, op, arg):
 # Here we test that the finaliser is actually called during a garbage collection.
 import gc
 
+# Preallocate global variables, and list of filenames for the test (which may
+# in turn allocate new qstrs and/or a new qstr pool).
+f = None
+n = None
+names = ["x%d" % i for i in range(4)]
+
 # Do a large number of single-block allocations to move the GC head forwards,
 # ensuring that the files are allocated from never-before-used blocks and
 # therefore couldn't possibly have any references to them left behind on
@@ -63,14 +69,13 @@ def ioctl(self, op, arg):
 for i in range(1024):
     []
 
-N = 4
-for i in range(N):
-    n = "x%d" % i
+# Run the test: create files without closing them, run GC, then read back files.
+for n in names:
     f = vfs.open(n, "w")
     f.write(n)
     f = None  # release f without closing
-    [0, 1, 2, 3]  # use up Python stack so f is really gone
+    sorted([0, 1, 2, 3], key=lambda x: x)  # use up Python and C stack so f is really gone
 gc.collect()  # should finalise all N files by closing them
-for i in range(N):
-    with vfs.open("x%d" % i, "r") as f:
+for n in names:
+    with vfs.open(n, "r") as f:
         print(f.read())

From 18acd0318f927930dd7f9efd77f08d8e05a43ce8 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 17 Feb 2022 11:17:21 +1100
Subject: [PATCH 1710/3533] py/gc: Update debug code to compile with changes to
 qstr pool types.

Following on from 18b1ba086c0e5547ca81030bf13b026961f80720 and
f46a7140f55a8f6d80f9c2d5f8db7af3de116794.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/gc.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/py/gc.c b/py/gc.c
index a01d81abdcb22..0c1f3961df3b4 100644
--- a/py/gc.c
+++ b/py/gc.c
@@ -920,13 +920,13 @@ void gc_dump_alloc_table(void) {
                     // This code prints "Q" for qstr-pool data, and "q" for qstr-str
                     // data.  It can be useful to see how qstrs are being allocated,
                     // but is disabled by default because it is very slow.
-                    for (qstr_pool_t *pool = MP_STATE_VM(last_pool); c == 'h' && pool != NULL; pool = pool->prev) {
-                        if ((qstr_pool_t *)ptr == pool) {
+                    for (const qstr_pool_t *pool = MP_STATE_VM(last_pool); c == 'h' && pool != NULL; pool = pool->prev) {
+                        if ((const qstr_pool_t *)ptr == pool) {
                             c = 'Q';
                             break;
                         }
-                        for (const byte **q = pool->qstrs, **q_top = pool->qstrs + pool->len; q < q_top; q++) {
-                            if ((const byte *)ptr == *q) {
+                        for (const char *const *q = pool->qstrs, *const *q_top = pool->qstrs + pool->len; q < q_top; q++) {
+                            if ((const char *)ptr == *q) {
                                 c = 'q';
                                 break;
                             }

From 767058f3282bf4836e7b9f137bada3c0d8b717af Mon Sep 17 00:00:00 2001
From: YoungJoon Chun <yjchun@mac.com>
Date: Wed, 9 Feb 2022 20:58:56 +0900
Subject: [PATCH 1711/3533] rp2/Makefile: Add FROZEN_MANIFEST Makefile option,
 to override default.

---
 ports/rp2/Makefile | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ports/rp2/Makefile b/ports/rp2/Makefile
index 2af13bfbbfb2e..2d1e6d6f5cebc 100644
--- a/ports/rp2/Makefile
+++ b/ports/rp2/Makefile
@@ -14,6 +14,10 @@ ifdef USER_C_MODULES
 CMAKE_ARGS += -DUSER_C_MODULES=${USER_C_MODULES}
 endif
 
+ifneq ($(FROZEN_MANIFEST),)
+CMAKE_ARGS += -DMICROPY_FROZEN_MANIFEST=${FROZEN_MANIFEST}
+endif
+
 all:
 	[ -d $(BUILD) ] || cmake -S . -B $(BUILD) -DPICO_BUILD_DOCS=0 ${CMAKE_ARGS}
 	$(MAKE) $(MAKESILENT) -C $(BUILD)

From 0dfd0447fa6f24bb8ed62b35dbaf91695a255f43 Mon Sep 17 00:00:00 2001
From: Bradley Wogsland <bradley@wogsland.org>
Date: Wed, 9 Feb 2022 10:52:02 +0100
Subject: [PATCH 1712/3533] README: Update link for ARM embedded toolchain to
 developer.arm.com.

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index d197924f0e759..920f10a5035b8 100644
--- a/README.md
+++ b/README.md
@@ -156,7 +156,7 @@ The STM32 version
 The "stm32" port requires an ARM compiler, arm-none-eabi-gcc, and associated
 bin-utils.  For those using Arch Linux, you need arm-none-eabi-binutils,
 arm-none-eabi-gcc and arm-none-eabi-newlib packages.  Otherwise, try here:
-https://launchpad.net/gcc-arm-embedded
+https://developer.arm.com/tools-and-software/open-source-software/developer-tools/gnu-toolchain/gnu-rm
 
 To build:
 

From 28cb573b89f3d1edfff786f8ee757a93579c41bd Mon Sep 17 00:00:00 2001
From: David Lechner <david@pybricks.com>
Date: Wed, 9 Feb 2022 10:26:35 -0600
Subject: [PATCH 1713/3533] windows/appveyor: Fix printing of test failures.

In the `after_test` section, the current directory is `ports/windows` when
tests are run, so running `run-tests.py` without changing the directory or
specifying a path causes a file not found error.

This commit fixes the problem by changing the directory before calling
`run-tests.py`.

Signed-off-by: David Lechner <david@pybricks.com>
---
 ports/windows/.appveyor.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/windows/.appveyor.yml b/ports/windows/.appveyor.yml
index 739484f095c73..d7192236dfbd4 100644
--- a/ports/windows/.appveyor.yml
+++ b/ports/windows/.appveyor.yml
@@ -80,6 +80,7 @@ after_test:
     }
     C:\msys64\usr\bin\bash.exe -l -c "make V=1 test_full VARIANT=$($env:PyVariant)"
     if ($LASTEXITCODE -ne 0) {
+      cd (Join-Path $env:APPVEYOR_BUILD_FOLDER 'tests')
       & $env:MICROPY_CPYTHON3 run-tests.py --print-failures
       throw "Test failure"
     }

From 5d6408f8f914f46f3c067fc59f5f31001b988fbc Mon Sep 17 00:00:00 2001
From: David Lechner <david@pybricks.com>
Date: Wed, 9 Feb 2022 11:02:12 -0600
Subject: [PATCH 1714/3533] tools/verifygitlog.py: Ignore line length in body
 if it's a URL.

This changes the git commit message line length check to ignore lines that
contain URLs, since these cannot be wrapped without breaking tools that
detect URLs and create a link.

Signed-off-by: David Lechner <david@pybricks.com>
---
 tools/verifygitlog.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tools/verifygitlog.py b/tools/verifygitlog.py
index cc4b80f4a97a8..ce3679125617f 100755
--- a/tools/verifygitlog.py
+++ b/tools/verifygitlog.py
@@ -69,7 +69,8 @@ def warning(err):
 
     # Message body lines.
     for line in raw_body[2:]:
-        if len(line) >= 76:
+        # Long lines with URLs are exempt from the line length rule.
+        if len(line) >= 76 and "://" not in line:
             error("Message lines should be 75 or less characters: " + line)
 
     if not raw_body[-1].startswith("Signed-off-by: ") or "@" not in raw_body[-1]:

From 465b74e78daf50f5bd92625ba57bf2f5597cb712 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Thu, 10 Feb 2022 22:30:01 +0200
Subject: [PATCH 1715/3533] drivers/ninaw10: Add NIC-level ioctl function.

This commit adds support in the driver for irregular commands.  It
currently supports setting GPIO pin mode, and GPIO pin read/write value.
---
 drivers/ninaw10/nina_wifi_drv.c | 27 +++++++++++++++++++++++++++
 drivers/ninaw10/nina_wifi_drv.h |  1 +
 extmod/network_ninaw10.c        | 10 ++++++++++
 3 files changed, 38 insertions(+)

diff --git a/drivers/ninaw10/nina_wifi_drv.c b/drivers/ninaw10/nina_wifi_drv.c
index cf09711690cdf..1ad77218b6505 100644
--- a/drivers/ninaw10/nina_wifi_drv.c
+++ b/drivers/ninaw10/nina_wifi_drv.c
@@ -701,6 +701,33 @@ int nina_gethostbyname(const char *name, uint8_t *out_ip) {
     return 0;
 }
 
+int nina_ioctl(uint32_t cmd, size_t len, uint8_t *buf, uint32_t iface) {
+    switch (cmd) {
+        case NINA_CMD_SET_PIN_MODE:
+            if (len != 2 || nina_send_command_read_ack(NINA_CMD_SET_PIN_MODE,
+                2, ARG_8BITS, NINA_ARGS(ARG_BYTE(buf[0]), ARG_BYTE(buf[1]))) != SPI_ACK) {
+                return -1;
+            }
+            break;
+        case NINA_CMD_SET_DIGITAL_WRITE:
+            if (len != 2 || nina_send_command_read_ack(NINA_CMD_SET_DIGITAL_WRITE,
+                2, ARG_8BITS, NINA_ARGS(ARG_BYTE(buf[0]), ARG_BYTE(buf[1]))) != SPI_ACK) {
+                return -1;
+            }
+            break;
+        case NINA_CMD_GET_DIGITAL_READ:
+            if (len != 1 || nina_send_command_read_vals(NINA_CMD_GET_DIGITAL_READ,
+                1, ARG_8BITS, NINA_ARGS(ARG_BYTE(buf[0])),
+                1, ARG_8BITS, NINA_VALS({(uint16_t *)&len, buf})) != 0) {
+                return -1;
+            }
+            break;
+        default:
+            return 0;
+    }
+    return 0;
+}
+
 int nina_socket_socket(uint8_t type) {
     uint16_t size = 1;
     uint8_t sock = 0;
diff --git a/drivers/ninaw10/nina_wifi_drv.h b/drivers/ninaw10/nina_wifi_drv.h
index b990476b673c9..4fe701eba1dc4 100644
--- a/drivers/ninaw10/nina_wifi_drv.h
+++ b/drivers/ninaw10/nina_wifi_drv.h
@@ -100,6 +100,7 @@ int nina_get_rssi(void);
 int nina_fw_version(uint8_t *fw_ver);
 int nina_set_hostname(const char *name);
 int nina_gethostbyname(const char *name, uint8_t *out_ip);
+int nina_ioctl(uint32_t cmd, size_t len, uint8_t *buf, uint32_t iface);
 int nina_socket_socket(uint8_t type);
 int nina_socket_close(int fd);
 int nina_socket_bind(int fd, uint8_t *ip, uint16_t port, int type);
diff --git a/extmod/network_ninaw10.c b/extmod/network_ninaw10.c
index e5d322a953634..034076307384e 100644
--- a/extmod/network_ninaw10.c
+++ b/extmod/network_ninaw10.c
@@ -317,6 +317,15 @@ STATIC mp_obj_t network_ninaw10_status(size_t n_args, const mp_obj_t *args) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(network_ninaw10_status_obj, 1, 2, network_ninaw10_status);
 
+STATIC mp_obj_t network_ninaw10_ioctl(mp_obj_t self_in, mp_obj_t cmd_in, mp_obj_t buf_in) {
+    nina_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    mp_buffer_info_t buf;
+    mp_get_buffer_raise(buf_in, &buf, MP_BUFFER_READ | MP_BUFFER_WRITE);
+    nina_ioctl(mp_obj_get_int(cmd_in), buf.len, buf.buf, self->itf);
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_3(network_ninaw10_ioctl_obj, network_ninaw10_ioctl);
+
 STATIC int network_ninaw10_gethostbyname(mp_obj_t nic, const char *name, mp_uint_t len, uint8_t *out_ip) {
     return nina_gethostbyname(name, out_ip);
 }
@@ -586,6 +595,7 @@ static const mp_rom_map_elem_t nina_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_ifconfig),            MP_ROM_PTR(&network_ninaw10_ifconfig_obj) },
     { MP_ROM_QSTR(MP_QSTR_config),              MP_ROM_PTR(&network_ninaw10_config_obj) },
     { MP_ROM_QSTR(MP_QSTR_status),              MP_ROM_PTR(&network_ninaw10_status_obj) },
+    { MP_ROM_QSTR(MP_QSTR_ioctl),               MP_ROM_PTR(&network_ninaw10_ioctl_obj) },
 
     // Network is not secured.
     { MP_ROM_QSTR(MP_QSTR_OPEN),                MP_ROM_INT(NINA_SEC_OPEN) },

From 9c05f3aa1d201ba943c7852bee975f8b7d48e235 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Tue, 15 Feb 2022 18:02:09 +0100
Subject: [PATCH 1716/3533] drivers/sdcard: Allow setting the final SPI
 baudrate.

This baudrate is supplied in the constructor. The default is 1320000 as
before.

Example:

    sd = sdcard.SDCard(spi, cs, baudrate=20_000_000)
---
 drivers/sdcard/sdcard.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/drivers/sdcard/sdcard.py b/drivers/sdcard/sdcard.py
index 0ba3076a3d369..2c3e99d3c06d6 100644
--- a/drivers/sdcard/sdcard.py
+++ b/drivers/sdcard/sdcard.py
@@ -39,7 +39,7 @@
 
 
 class SDCard:
-    def __init__(self, spi, cs):
+    def __init__(self, spi, cs, baudrate=1320000):
         self.spi = spi
         self.cs = cs
 
@@ -51,7 +51,7 @@ def __init__(self, spi, cs):
         self.dummybuf_memoryview = memoryview(self.dummybuf)
 
         # initialise the card
-        self.init_card()
+        self.init_card(baudrate)
 
     def init_spi(self, baudrate):
         try:
@@ -63,7 +63,8 @@ def init_spi(self, baudrate):
             # on pyboard
             self.spi.init(master, baudrate=baudrate, phase=0, polarity=0)
 
-    def init_card(self):
+    def init_card(self, baudrate):
+
         # init CS pin
         self.cs.init(self.cs.OUT, value=1)
 
@@ -111,7 +112,7 @@ def init_card(self):
             raise OSError("can't set 512 block size")
 
         # set to high data rate now that it's initialised
-        self.init_spi(1320000)
+        self.init_spi(baudrate)
 
     def init_card_v1(self):
         for i in range(_CMD_TIMEOUT):

From 8bb50c6301f5b3df143fff7a425f284e88a0b64d Mon Sep 17 00:00:00 2001
From: stijn <stijn@ignitron.net>
Date: Tue, 15 Feb 2022 10:16:46 +0100
Subject: [PATCH 1717/3533] unix/Makefile: Remove explicit addition of -std=c++
 flag.

This was added merely for building the C++ user module example, so it's a
better fit to add it in the corresponding micropython.mk.
---
 examples/usercmodule/cppexample/micropython.mk | 2 +-
 ports/unix/Makefile                            | 6 ------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/examples/usercmodule/cppexample/micropython.mk b/examples/usercmodule/cppexample/micropython.mk
index e10d965a0011e..0071d4fcc72b6 100644
--- a/examples/usercmodule/cppexample/micropython.mk
+++ b/examples/usercmodule/cppexample/micropython.mk
@@ -6,7 +6,7 @@ SRC_USERMOD_CXX += $(CPPEXAMPLE_MOD_DIR)/example.cpp
 
 # Add our module directory to the include path.
 CFLAGS_USERMOD += -I$(CPPEXAMPLE_MOD_DIR)
-CXXFLAGS_USERMOD += -I$(CPPEXAMPLE_MOD_DIR)
+CXXFLAGS_USERMOD += -I$(CPPEXAMPLE_MOD_DIR) -std=c++11
 
 # We use C++ features so have to link against the standard library.
 LDFLAGS_USERMOD += -lstdc++
diff --git a/ports/unix/Makefile b/ports/unix/Makefile
index cd8bb379c4488..7732211e2da28 100644
--- a/ports/unix/Makefile
+++ b/ports/unix/Makefile
@@ -270,12 +270,6 @@ CFLAGS += -DMPZ_DIG_SIZE=16 # force 16 bits to work on both 32 and 64 bit archs
 CFLAGS += -DMICROPY_MODULE_FROZEN_STR
 endif
 
-HASCPP17 = $(shell expr `$(CC) -dumpversion | cut -f1 -d.` \>= 7)
-ifeq ($(HASCPP17), 1)
-	CXXFLAGS += -std=c++17
-else
-	CXXFLAGS += -std=c++11
-endif
 CXXFLAGS += $(filter-out -Wmissing-prototypes -Wold-style-definition -std=gnu99,$(CFLAGS) $(CXXFLAGS_MOD))
 
 ifeq ($(MICROPY_FORCE_32BIT),1)

From c14f47faa329ea3655aae3068956c138f7e9c178 Mon Sep 17 00:00:00 2001
From: stijn <stijn@ignitron.net>
Date: Thu, 17 Feb 2022 12:44:42 +0100
Subject: [PATCH 1718/3533] windows/Makefile: Specify CXXFLAGS in the Makefile.

Enables building user modules which use C++ code, like the unix port.
---
 ports/windows/Makefile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ports/windows/Makefile b/ports/windows/Makefile
index 5a22be4642b55..91744b7a5e1e2 100644
--- a/ports/windows/Makefile
+++ b/ports/windows/Makefile
@@ -91,6 +91,8 @@ ifneq ($(FROZEN_MANIFEST),)
 CFLAGS += -DMICROPY_QSTR_EXTRA_POOL=mp_qstr_frozen_const_pool -DMICROPY_MODULE_FROZEN_MPY=1 -DMPZ_DIG_SIZE=16
 endif
 
+CXXFLAGS += $(filter-out -std=gnu99,$(CFLAGS) $(CXXFLAGS_MOD))
+
 include $(TOP)/py/mkrules.mk
 
 .PHONY: test test_full

From 130f7db1fc2a881647d727bc76a0ef40bd179e5c Mon Sep 17 00:00:00 2001
From: Christophe Priouzeau <christophe.priouzeau@foss.st.com>
Date: Thu, 11 Feb 2021 12:00:26 +0100
Subject: [PATCH 1719/3533] stm32/boards/NUCLEO_WB55: Add Arduino pin alias
 definitions.

Fixes issue #8295.

Signed-off-by: Christophe Priouzeau <christophe.priouzeau@foss.st.com>
---
 ports/stm32/boards/NUCLEO_WB55/pins.csv | 52 +++++++++++--------------
 1 file changed, 22 insertions(+), 30 deletions(-)

diff --git a/ports/stm32/boards/NUCLEO_WB55/pins.csv b/ports/stm32/boards/NUCLEO_WB55/pins.csv
index d7e0babf36d25..cc03a3f1f1c83 100644
--- a/ports/stm32/boards/NUCLEO_WB55/pins.csv
+++ b/ports/stm32/boards/NUCLEO_WB55/pins.csv
@@ -1,49 +1,41 @@
-,PA0
-,PA1
-,PA2
-,PA3
-,PA4
-,PA5
-,PA6
-,PA7
-,PA8
-,PA9
-,PA10
-,PA11
-,PA12
 ,PA13
 ,PA14
-,PA15
-,PB0
-,PB1
 ,PB2
 ,PB3
 ,PB4
-,PB5
 ,PB6
 ,PB7
-,PB8
-,PB9
 ,PB10
 ,PB11
 ,PB12
 ,PB13
 ,PB14
 ,PB15
-,PC0
-,PC1
-,PC2
-,PC3
-,PC4
 ,PC5
-,PC6
-,PC10
 ,PC11
-,PC12
-,PC13
-,PD0
-,PD1
 ,PE4
+A0,PC0
+A1,PC1
+A2,PA1
+A3,PA0
+A4,PC3
+A5,PC2
+D0,PA3
+D1,PA2
+D2,PC6
+D3,PA10
+D4,PC10
+D5,PA15
+D6,PA8
+D7,PC13
+D8,PC12
+D9,PA9
+D10,PA4
+D11,PA7
+D12,PA6
+D13,PA5
+D14,PB9
+D15,PB8
 SW,PC4
 SW1,PC4
 SW2,PD0

From 2b62f1210392f405f6b8d3510c24c25c26a457a1 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 16 Feb 2022 22:18:39 +1100
Subject: [PATCH 1720/3533] stm32/mboot: Allow a board to fully configure
 system clocks.

If a board wants to customise the clocks it can define the following:

    MBOOT_CLK_PLLM
    MBOOT_CLK_PLLN
    MBOOT_CLK_PLLP
    MBOOT_CLK_PLLQ
    MBOOT_CLK_PLLR (only needed on STM32H7)
    MBOOT_FLASH_LATENCY
    MBOOT_CLK_AHB_DIV
    MBOOT_CLK_APB1_DIV
    MBOOT_CLK_APB2_DIV
    MBOOT_CLK_APB3_DIV (only needed on STM32H7)
    MBOOT_CLK_APB4_DIV (only needed on STM32H7)

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/mboot/main.c | 106 +++++++++++++++++++--------------------
 1 file changed, 53 insertions(+), 53 deletions(-)

diff --git a/ports/stm32/mboot/main.c b/ports/stm32/mboot/main.c
index abde92de1b34f..aec31cbc204a7 100644
--- a/ports/stm32/mboot/main.c
+++ b/ports/stm32/mboot/main.c
@@ -60,31 +60,38 @@
 // Most values are defined in irq.h.
 #define IRQ_PRI_I2C (NVIC_EncodePriority(NVIC_PRIORITYGROUP_4, 1, 0))
 
-// Configure PLL to give the desired CPU freq
-#undef MICROPY_HW_FLASH_LATENCY
-#if defined(STM32F4) || defined(STM32F7)
-  #if MBOOT_ENABLE_PACKING
-    // With encryption/signing/compression, a faster CPU makes processing much faster.
+#if defined(MBOOT_CLK_PLLM)
+  // The board specified the PLL values, flash latency and bus dividers
+  #define CORE_PLL_FREQ (1000000 * MBOOT_CLK_PLLN / MBOOT_CLK_PLLP)
+#else
+  // The board did not specify the clock values, so configure defaults
+  #if defined(STM32F4) || defined(STM32F7)
+    #if MBOOT_ENABLE_PACKING
+      // With encryption/signing/compression, a faster CPU makes processing much faster.
+      #define CORE_PLL_FREQ (96000000)
+      #define MBOOT_FLASH_LATENCY FLASH_LATENCY_3
+    #else
+      #define CORE_PLL_FREQ (48000000)
+      #define MBOOT_FLASH_LATENCY FLASH_LATENCY_1
+    #endif
+    #define MBOOT_CLK_AHB_DIV (RCC_SYSCLK_DIV1)
+    #define MBOOT_CLK_APB1_DIV (RCC_HCLK_DIV4)
+    #define MBOOT_CLK_APB2_DIV (RCC_HCLK_DIV2)
+  #elif defined(STM32H7)
     #define CORE_PLL_FREQ (96000000)
-    #define MICROPY_HW_FLASH_LATENCY FLASH_LATENCY_3
-  #else
-    #define CORE_PLL_FREQ (48000000)
-    #define MICROPY_HW_FLASH_LATENCY FLASH_LATENCY_1
+    #define MBOOT_FLASH_LATENCY FLASH_LATENCY_2
+    #define MBOOT_CLK_AHB_DIV (RCC_HCLK_DIV2)
+    #define MBOOT_CLK_APB1_DIV (RCC_APB1_DIV2)
+    #define MBOOT_CLK_APB2_DIV (RCC_APB2_DIV2)
+    #define MBOOT_CLK_APB3_DIV (RCC_APB3_DIV2)
+    #define MBOOT_CLK_APB4_DIV (RCC_APB4_DIV2)
   #endif
-#elif defined(STM32H7)
-  #define CORE_PLL_FREQ (96000000)
-  #define MICROPY_HW_FLASH_LATENCY FLASH_LATENCY_2
+  #define MBOOT_CLK_PLLM (MICROPY_HW_CLK_VALUE / 1000000)
+  #define MBOOT_CLK_PLLN (192)
+  #define MBOOT_CLK_PLLP (MBOOT_CLK_PLLN / (CORE_PLL_FREQ / 1000000))
+  #define MBOOT_CLK_PLLQ (4)
+  #define MBOOT_CLK_PLLR (2)
 #endif
-#undef MICROPY_HW_CLK_PLLM
-#undef MICROPY_HW_CLK_PLLN
-#undef MICROPY_HW_CLK_PLLP
-#undef MICROPY_HW_CLK_PLLQ
-#undef MICROPY_HW_CLK_PLLR
-#define MICROPY_HW_CLK_PLLM (MICROPY_HW_CLK_VALUE / 1000000)
-#define MICROPY_HW_CLK_PLLN (192)
-#define MICROPY_HW_CLK_PLLP (MICROPY_HW_CLK_PLLN / (CORE_PLL_FREQ / 1000000))
-#define MICROPY_HW_CLK_PLLQ (4)
-#define MICROPY_HW_CLK_PLLR (2)
 
 // Work out which USB device to use for the USB DFU interface
 #if !defined(MICROPY_HW_USB_MAIN_DEV)
@@ -203,10 +210,10 @@ void SystemClock_Config(void) {
         #else
         1 << RCC_PLLCFGR_PLLSRC_Pos // HSE selected as PLL source
         #endif
-        | MICROPY_HW_CLK_PLLM << RCC_PLLCFGR_PLLM_Pos
-        | MICROPY_HW_CLK_PLLN << RCC_PLLCFGR_PLLN_Pos
-        | ((MICROPY_HW_CLK_PLLP >> 1) - 1) << RCC_PLLCFGR_PLLP_Pos
-        | MICROPY_HW_CLK_PLLQ << RCC_PLLCFGR_PLLQ_Pos
+        | MBOOT_CLK_PLLM << RCC_PLLCFGR_PLLM_Pos
+        | MBOOT_CLK_PLLN << RCC_PLLCFGR_PLLN_Pos
+        | ((MBOOT_CLK_PLLP >> 1) - 1) << RCC_PLLCFGR_PLLP_Pos
+        | MBOOT_CLK_PLLQ << RCC_PLLCFGR_PLLQ_Pos
         #ifdef RCC_PLLCFGR_PLLR
         | 2 << RCC_PLLCFGR_PLLR_Pos // default PLLR value of 2
         #endif
@@ -218,12 +225,12 @@ void SystemClock_Config(void) {
     }
 
     // Increase latency before changing clock
-    if (MICROPY_HW_FLASH_LATENCY > (FLASH->ACR & FLASH_ACR_LATENCY)) {
-        __HAL_FLASH_SET_LATENCY(MICROPY_HW_FLASH_LATENCY);
+    if (MBOOT_FLASH_LATENCY > (FLASH->ACR & FLASH_ACR_LATENCY)) {
+        __HAL_FLASH_SET_LATENCY(MBOOT_FLASH_LATENCY);
     }
 
     // Configure AHB divider
-    MODIFY_REG(RCC->CFGR, RCC_CFGR_HPRE, RCC_SYSCLK_DIV1);
+    MODIFY_REG(RCC->CFGR, RCC_CFGR_HPRE, MBOOT_CLK_AHB_DIV);
 
     // Configure SYSCLK source from PLL
     __HAL_RCC_SYSCLK_CONFIG(RCC_SYSCLKSOURCE_PLLCLK);
@@ -231,13 +238,13 @@ void SystemClock_Config(void) {
     }
 
     // Decrease latency after changing clock
-    if (MICROPY_HW_FLASH_LATENCY < (FLASH->ACR & FLASH_ACR_LATENCY)) {
-        __HAL_FLASH_SET_LATENCY(MICROPY_HW_FLASH_LATENCY);
+    if (MBOOT_FLASH_LATENCY < (FLASH->ACR & FLASH_ACR_LATENCY)) {
+        __HAL_FLASH_SET_LATENCY(MBOOT_FLASH_LATENCY);
     }
 
     // Set APB clock dividers
-    MODIFY_REG(RCC->CFGR, RCC_CFGR_PPRE1, RCC_HCLK_DIV4);
-    MODIFY_REG(RCC->CFGR, RCC_CFGR_PPRE2, RCC_HCLK_DIV2 << 3);
+    MODIFY_REG(RCC->CFGR, RCC_CFGR_PPRE1, MBOOT_CLK_APB1_DIV);
+    MODIFY_REG(RCC->CFGR, RCC_CFGR_PPRE2, MBOOT_CLK_APB2_DIV << 3);
 
     // Update clock value and reconfigure systick now that the frequency changed
     SystemCoreClock = CORE_PLL_FREQ;
@@ -281,14 +288,14 @@ void SystemClock_Config(void) {
     RCC->PLLCFGR = 0;
 
     // Configure PLL1 for use by SYSCLK
-    RCC->PLLCKSELR |= MICROPY_HW_CLK_PLLM << RCC_PLLCKSELR_DIVM1_Pos;
+    RCC->PLLCKSELR |= MBOOT_CLK_PLLM << RCC_PLLCKSELR_DIVM1_Pos;
     RCC->PLLCFGR |= RCC_PLLCFGR_DIVP1EN;
     RCC->PLL1FRACR = 0;
     RCC->PLL1DIVR =
-        (MICROPY_HW_CLK_PLLN - 1) << RCC_PLL1DIVR_N1_Pos
-        | (MICROPY_HW_CLK_PLLP - 1) << RCC_PLL1DIVR_P1_Pos // only even P allowed
-        | (MICROPY_HW_CLK_PLLQ - 1) << RCC_PLL1DIVR_Q1_Pos
-        | (MICROPY_HW_CLK_PLLR - 1) << RCC_PLL1DIVR_R1_Pos;
+        (MBOOT_CLK_PLLN - 1) << RCC_PLL1DIVR_N1_Pos
+        | (MBOOT_CLK_PLLP - 1) << RCC_PLL1DIVR_P1_Pos // only even P allowed
+        | (MBOOT_CLK_PLLQ - 1) << RCC_PLL1DIVR_Q1_Pos
+        | (MBOOT_CLK_PLLR - 1) << RCC_PLL1DIVR_R1_Pos;
 
     // Configure PLL3 for use by USB at Q=48MHz
     RCC->PLLCKSELR |= MICROPY_HW_CLK_PLL3M << RCC_PLLCKSELR_DIVM3_Pos;
@@ -314,14 +321,14 @@ void SystemClock_Config(void) {
     }
 
     // Increase latency before changing SYSCLK
-    if (MICROPY_HW_FLASH_LATENCY > (FLASH->ACR & FLASH_ACR_LATENCY)) {
-        __HAL_FLASH_SET_LATENCY(MICROPY_HW_FLASH_LATENCY);
+    if (MBOOT_FLASH_LATENCY > (FLASH->ACR & FLASH_ACR_LATENCY)) {
+        __HAL_FLASH_SET_LATENCY(MBOOT_FLASH_LATENCY);
     }
 
     // Configure AHB divider
     RCC->D1CFGR =
         0 << RCC_D1CFGR_D1CPRE_Pos // SYSCLK prescaler of 1
-        | 8 << RCC_D1CFGR_HPRE_Pos // AHB prescaler of 2
+        | MBOOT_CLK_AHB_DIV
         ;
 
     // Configure SYSCLK source from PLL
@@ -330,21 +337,14 @@ void SystemClock_Config(void) {
     }
 
     // Decrease latency after changing clock
-    if (MICROPY_HW_FLASH_LATENCY < (FLASH->ACR & FLASH_ACR_LATENCY)) {
-        __HAL_FLASH_SET_LATENCY(MICROPY_HW_FLASH_LATENCY);
+    if (MBOOT_FLASH_LATENCY < (FLASH->ACR & FLASH_ACR_LATENCY)) {
+        __HAL_FLASH_SET_LATENCY(MBOOT_FLASH_LATENCY);
     }
 
     // Set APB clock dividers
-    RCC->D1CFGR |=
-        4 << RCC_D1CFGR_D1PPRE_Pos // APB3 prescaler of 2
-        ;
-    RCC->D2CFGR =
-        4 << RCC_D2CFGR_D2PPRE2_Pos // APB2 prescaler of 2
-        | 4 << RCC_D2CFGR_D2PPRE1_Pos // APB1 prescaler of 2
-        ;
-    RCC->D3CFGR =
-        4 << RCC_D3CFGR_D3PPRE_Pos // APB4 prescaler of 2
-        ;
+    RCC->D1CFGR |= MBOOT_CLK_APB3_DIV;
+    RCC->D2CFGR = MBOOT_CLK_APB2_DIV | MBOOT_CLK_APB1_DIV;
+    RCC->D3CFGR = MBOOT_CLK_APB4_DIV;
 
     // Update clock value and reconfigure systick now that the frequency changed
     SystemCoreClockUpdate();

From 5995fb526158ae224dddacef212c1d553d6a6306 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 16 Feb 2022 22:22:04 +1100
Subject: [PATCH 1721/3533] stm32/mboot: Allow a board more control over entry
 initialisation.

If MBOOT_BOARD_ENTRY_INIT is defined by a board then that function must now
make sure system clocks are configured, eg by calling mboot_entry_init().

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/mboot/main.c  | 13 +------------
 ports/stm32/mboot/mboot.h | 22 ++++++++++++++++++++--
 2 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/ports/stm32/mboot/main.c b/ports/stm32/mboot/main.c
index aec31cbc204a7..8d6e28f1899d2 100644
--- a/ports/stm32/mboot/main.c
+++ b/ports/stm32/mboot/main.c
@@ -1507,14 +1507,7 @@ void stm32_main(uint32_t initial_r0) {
 
 enter_bootloader:
 
-    // Init subsystems (mboot_get_reset_mode() may call these, calling them again is ok)
-    led_init();
-
-    // set the system clock to be HSE
-    SystemClock_Config();
-
-    // Ensure IRQs are enabled (needed coming out of ST bootloader on H7)
-    __set_PRIMASK(0);
+    MBOOT_BOARD_ENTRY_INIT(&initial_r0);
 
     #if USE_USB_POLLING
     // irqs with a priority value greater or equal to "pri" will be disabled
@@ -1524,10 +1517,6 @@ void stm32_main(uint32_t initial_r0) {
     __ASM volatile ("msr basepri_max, %0" : : "r" (pri) : "memory");
     #endif
 
-    #if defined(MBOOT_BOARD_ENTRY_INIT)
-    MBOOT_BOARD_ENTRY_INIT(initial_r0);
-    #endif
-
     #if defined(MBOOT_SPIFLASH_ADDR)
     MBOOT_SPIFLASH_SPIFLASH->config = MBOOT_SPIFLASH_CONFIG;
     mp_spiflash_init(MBOOT_SPIFLASH_SPIFLASH);
diff --git a/ports/stm32/mboot/mboot.h b/ports/stm32/mboot/mboot.h
index 3a27ce08efaf6..254c842653179 100644
--- a/ports/stm32/mboot/mboot.h
+++ b/ports/stm32/mboot/mboot.h
@@ -26,8 +26,7 @@
 #ifndef MICROPY_INCLUDED_STM32_MBOOT_MBOOT_H
 #define MICROPY_INCLUDED_STM32_MBOOT_MBOOT_H
 
-#include <stdint.h>
-#include <stddef.h>
+#include "py/mphal.h"
 
 // Use this to tag global static data in RAM that doesn't need to be zeroed on startup
 #define SECTION_NOZERO_BSS __attribute__((section(".nozero_bss")))
@@ -39,6 +38,10 @@
 #define NORETURN __attribute__((noreturn))
 #define MP_ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0]))
 
+#ifndef MBOOT_BOARD_ENTRY_INIT
+#define MBOOT_BOARD_ENTRY_INIT mboot_entry_init
+#endif
+
 enum {
     MBOOT_ERRNO_FLASH_ERASE_DISALLOWED = 200,
     MBOOT_ERRNO_FLASH_ERASE_FAILED,
@@ -86,6 +89,8 @@ enum {
 extern uint8_t _estack[ELEM_DATA_SIZE];
 
 void systick_init(void);
+void led_init(void);
+void SystemClock_Config(void);
 
 uint32_t get_le32(const uint8_t *b);
 void led_state_all(unsigned int mask);
@@ -101,4 +106,17 @@ int do_write(uint32_t addr, const uint8_t *src8, size_t len);
 const uint8_t *elem_search(const uint8_t *elem, uint8_t elem_id);
 int fsload_process(void);
 
+static inline void mboot_entry_init(uint32_t *initial_r0) {
+    // Init subsystems (mboot_get_reset_mode() may call these, calling them again is ok)
+    led_init();
+
+    // set the system clock to be HSE
+    SystemClock_Config();
+
+    #if defined(STM32H7)
+    // Ensure IRQs are enabled (needed coming out of ST bootloader on H7)
+    __set_PRIMASK(0);
+    #endif
+}
+
 #endif // MICROPY_INCLUDED_STM32_MBOOT_MBOOT_H

From ff9c7085077a9aa4e715b3952d24ada7b096d744 Mon Sep 17 00:00:00 2001
From: stijn <stijn@ignitron.net>
Date: Thu, 17 Feb 2022 10:51:17 +0100
Subject: [PATCH 1722/3533] tests/run-tests.py: Skip repl tests when running
 windows underneath.

Some versions of Python (for instance: the mingw-w64 version which can be
installed on MSYS2) do include a pty module and claim to be posix-like
(os.name == 'posix'), yet the select.select call used in run-tests.py hangs
forever.  To be on the safe side just exclude anything which might be
running on windows.
---
 tests/run-tests.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tests/run-tests.py b/tests/run-tests.py
index 6f3c09d1da52d..f9a16283bc9d2 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -109,6 +109,10 @@ def run_micropython(pyb, args, test_file, is_special=False):
                         return b"SKIP\n"
                     import select
 
+                    # Even though these might have the pty module, it's unlikely to function.
+                    if sys.platform in ["win32", "msys", "cygwin"]:
+                        return b"SKIP\n"
+
                     def get(required=False):
                         rv = b""
                         while True:

From c8cd5a9960e7cda0da064dcddd748808aa95ffea Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 18 Feb 2022 15:50:01 +1100
Subject: [PATCH 1723/3533] esp32/mpconfigport.h: Use the "extra" feature
 level.

This commit is a no-op change to simplify existing config.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/mpconfigport.h | 96 ++++----------------------------------
 1 file changed, 8 insertions(+), 88 deletions(-)

diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h
index c457a5743bc57..2ef90dea525e0 100644
--- a/ports/esp32/mpconfigport.h
+++ b/ports/esp32/mpconfigport.h
@@ -10,6 +10,10 @@
 #include "freertos/FreeRTOS.h"
 #include "driver/i2s.h"
 
+#ifndef MICROPY_CONFIG_ROM_LEVEL
+#define MICROPY_CONFIG_ROM_LEVEL            (MICROPY_CONFIG_ROM_LEVEL_EXTRA_FEATURES)
+#endif
+
 // object representation and NLR handling
 #define MICROPY_OBJ_REPR                    (MICROPY_OBJ_REPR_A)
 #define MICROPY_NLR_SETJMP                  (1)
@@ -27,107 +31,36 @@
 #endif
 
 // compiler configuration
-#define MICROPY_COMP_MODULE_CONST           (1)
-#define MICROPY_COMP_TRIPLE_TUPLE_ASSIGN    (1)
+#define MICROPY_COMP_RETURN_IF_EXPR         (0)
 
 // optimisations
 #define MICROPY_OPT_COMPUTED_GOTO           (1)
-#define MICROPY_OPT_LOAD_ATTR_FAST_PATH     (1)
-#define MICROPY_OPT_MAP_LOOKUP_CACHE        (1)
-#define MICROPY_OPT_MPZ_BITWISE             (1)
+#define MICROPY_OPT_MATH_FACTORIAL          (0)
 
 // Python internal features
 #define MICROPY_READER_VFS                  (1)
 #define MICROPY_ENABLE_GC                   (1)
-#define MICROPY_ENABLE_FINALISER            (1)
-#define MICROPY_STACK_CHECK                 (1)
 #define MICROPY_ENABLE_EMERGENCY_EXCEPTION_BUF (1)
-#define MICROPY_KBD_EXCEPTION               (1)
-#define MICROPY_HELPER_REPL                 (1)
-#define MICROPY_REPL_EMACS_KEYS             (1)
-#define MICROPY_REPL_AUTO_INDENT            (1)
 #define MICROPY_LONGINT_IMPL                (MICROPY_LONGINT_IMPL_MPZ)
-#define MICROPY_ENABLE_SOURCE_LINE          (1)
 #define MICROPY_ERROR_REPORTING             (MICROPY_ERROR_REPORTING_NORMAL)
 #define MICROPY_WARNINGS                    (1)
 #define MICROPY_FLOAT_IMPL                  (MICROPY_FLOAT_IMPL_FLOAT)
-#define MICROPY_CPYTHON_COMPAT              (1)
-#define MICROPY_STREAMS_NON_BLOCK           (1)
 #define MICROPY_STREAMS_POSIX_API           (1)
-#define MICROPY_MODULE_BUILTIN_INIT         (1)
-#define MICROPY_MODULE_WEAK_LINKS           (1)
 #define MICROPY_MODULE_FROZEN_STR           (0)
 #define MICROPY_MODULE_FROZEN_MPY           (1)
 #define MICROPY_QSTR_EXTRA_POOL             mp_qstr_frozen_const_pool
-#define MICROPY_CAN_OVERRIDE_BUILTINS       (1)
 #define MICROPY_USE_INTERNAL_ERRNO          (0) // errno.h from xtensa-esp32-elf/sys-include/sys
 #define MICROPY_USE_INTERNAL_PRINTF         (0) // ESP32 SDK requires its own printf
-#define MICROPY_ENABLE_SCHEDULER            (1)
 #define MICROPY_SCHEDULER_DEPTH             (8)
 #define MICROPY_VFS                         (1)
 
 // control over Python builtins
-#define MICROPY_PY_FUNCTION_ATTRS           (1)
-#define MICROPY_PY_DESCRIPTORS              (1)
-#define MICROPY_PY_DELATTR_SETATTR          (1)
-#define MICROPY_PY_FSTRINGS                 (1)
 #define MICROPY_PY_STR_BYTES_CMP_WARN       (1)
-#define MICROPY_PY_BUILTINS_STR_UNICODE     (1)
-#define MICROPY_PY_BUILTINS_STR_CENTER      (1)
-#define MICROPY_PY_BUILTINS_STR_PARTITION   (1)
-#define MICROPY_PY_BUILTINS_STR_SPLITLINES  (1)
-#define MICROPY_PY_BUILTINS_BYTEARRAY       (1)
-#define MICROPY_PY_BUILTINS_MEMORYVIEW      (1)
-#define MICROPY_PY_BUILTINS_SET             (1)
-#define MICROPY_PY_BUILTINS_SLICE           (1)
-#define MICROPY_PY_BUILTINS_SLICE_ATTRS     (1)
-#define MICROPY_PY_BUILTINS_SLICE_INDICES   (1)
-#define MICROPY_PY_BUILTINS_FROZENSET       (1)
-#define MICROPY_PY_BUILTINS_PROPERTY        (1)
-#define MICROPY_PY_BUILTINS_RANGE_ATTRS     (1)
-#define MICROPY_PY_BUILTINS_ROUND_INT       (1)
-#define MICROPY_PY_ALL_SPECIAL_METHODS      (1)
 #define MICROPY_PY_ALL_INPLACE_SPECIAL_METHODS (1)
-#define MICROPY_PY_REVERSE_SPECIAL_METHODS  (1)
-#define MICROPY_PY_BUILTINS_COMPILE         (1)
-#define MICROPY_PY_BUILTINS_ENUMERATE       (1)
-#define MICROPY_PY_BUILTINS_EXECFILE        (1)
-#define MICROPY_PY_BUILTINS_FILTER          (1)
-#define MICROPY_PY_BUILTINS_REVERSED        (1)
-#define MICROPY_PY_BUILTINS_NOTIMPLEMENTED  (1)
-#define MICROPY_PY_BUILTINS_INPUT           (1)
-#define MICROPY_PY_BUILTINS_MIN_MAX         (1)
-#define MICROPY_PY_BUILTINS_POW3            (1)
-#define MICROPY_PY_BUILTINS_HELP            (1)
 #define MICROPY_PY_BUILTINS_HELP_TEXT       esp32_help_text
-#define MICROPY_PY_BUILTINS_HELP_MODULES    (1)
-#define MICROPY_PY___FILE__                 (1)
-#define MICROPY_PY_MICROPYTHON_MEM_INFO     (1)
-#define MICROPY_PY_ARRAY                    (1)
-#define MICROPY_PY_ARRAY_SLICE_ASSIGN       (1)
-#define MICROPY_PY_ATTRTUPLE                (1)
-#define MICROPY_PY_COLLECTIONS              (1)
-#define MICROPY_PY_COLLECTIONS_DEQUE        (1)
-#define MICROPY_PY_COLLECTIONS_ORDEREDDICT  (1)
-#define MICROPY_PY_MATH                     (1)
-#define MICROPY_PY_MATH_SPECIAL_FUNCTIONS   (1)
-#define MICROPY_PY_MATH_ISCLOSE             (1)
-#define MICROPY_PY_CMATH                    (1)
-#define MICROPY_PY_GC                       (1)
-#define MICROPY_PY_IO                       (1)
-#define MICROPY_PY_IO_IOBASE                (1)
-#define MICROPY_PY_IO_FILEIO                (1)
-#define MICROPY_PY_IO_BYTESIO               (1)
+#define MICROPY_PY_MATH_CONSTANTS           (0)
+#define MICROPY_PY_MATH_FACTORIAL           (0)
 #define MICROPY_PY_IO_BUFFEREDWRITER        (1)
-#define MICROPY_PY_STRUCT                   (1)
-#define MICROPY_PY_SYS                      (1)
-#define MICROPY_PY_SYS_MAXSIZE              (1)
-#define MICROPY_PY_SYS_MODULES              (1)
-#define MICROPY_PY_SYS_EXIT                 (1)
-#define MICROPY_PY_SYS_STDFILES             (1)
-#define MICROPY_PY_SYS_STDIO_BUFFER         (1)
-#define MICROPY_PY_UERRNO                   (1)
-#define MICROPY_PY_USELECT                  (1)
 #define MICROPY_PY_UTIME_MP_HAL             (1)
 #define MICROPY_PY_THREAD                   (1)
 #define MICROPY_PY_THREAD_GIL               (1)
@@ -140,22 +73,10 @@
 #define MICROPY_BLUETOOTH_NIMBLE            (1)
 #define MICROPY_BLUETOOTH_NIMBLE_BINDINGS_ONLY (1)
 #endif
-#define MICROPY_PY_UASYNCIO                 (1)
-#define MICROPY_PY_UCTYPES                  (1)
-#define MICROPY_PY_UZLIB                    (1)
-#define MICROPY_PY_UJSON                    (1)
-#define MICROPY_PY_URE                      (1)
-#define MICROPY_PY_URE_SUB                  (1)
-#define MICROPY_PY_UHEAPQ                   (1)
 #define MICROPY_PY_UTIMEQ                   (1)
-#define MICROPY_PY_UHASHLIB                 (1)
 #define MICROPY_PY_UHASHLIB_SHA1            (1)
 #define MICROPY_PY_UHASHLIB_SHA256          (1)
 #define MICROPY_PY_UCRYPTOLIB               (1)
-#define MICROPY_PY_UBINASCII                (1)
-#define MICROPY_PY_UBINASCII_CRC32          (1)
-#define MICROPY_PY_URANDOM                  (1)
-#define MICROPY_PY_URANDOM_EXTRA_FUNCS      (1)
 #define MICROPY_PY_URANDOM_SEED_INIT_FUNC   (esp_random())
 #define MICROPY_PY_OS_DUPTERM               (1)
 #define MICROPY_PY_MACHINE                  (1)
@@ -192,7 +113,6 @@
 #define MICROPY_PY_USSL_FINALISER           (1)
 #define MICROPY_PY_UWEBSOCKET               (1)
 #define MICROPY_PY_WEBREPL                  (1)
-#define MICROPY_PY_FRAMEBUF                 (1)
 #define MICROPY_PY_BTREE                    (1)
 #define MICROPY_PY_ONEWIRE                  (1)
 #define MICROPY_PY_UPLATFORM                (1)

From 5935fa229c94e53c4b23d0a491cb16d9adb9dada Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 18 Feb 2022 16:01:18 +1100
Subject: [PATCH 1724/3533] esp32/mpconfigport.h: Enable remaining features to
 get to "extra" level.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/mpconfigport.h | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h
index 2ef90dea525e0..1ea19ada01515 100644
--- a/ports/esp32/mpconfigport.h
+++ b/ports/esp32/mpconfigport.h
@@ -30,12 +30,8 @@
 #define MICROPY_EMIT_XTENSAWIN              (1)
 #endif
 
-// compiler configuration
-#define MICROPY_COMP_RETURN_IF_EXPR         (0)
-
 // optimisations
 #define MICROPY_OPT_COMPUTED_GOTO           (1)
-#define MICROPY_OPT_MATH_FACTORIAL          (0)
 
 // Python internal features
 #define MICROPY_READER_VFS                  (1)
@@ -58,8 +54,6 @@
 #define MICROPY_PY_STR_BYTES_CMP_WARN       (1)
 #define MICROPY_PY_ALL_INPLACE_SPECIAL_METHODS (1)
 #define MICROPY_PY_BUILTINS_HELP_TEXT       esp32_help_text
-#define MICROPY_PY_MATH_CONSTANTS           (0)
-#define MICROPY_PY_MATH_FACTORIAL           (0)
 #define MICROPY_PY_IO_BUFFEREDWRITER        (1)
 #define MICROPY_PY_UTIME_MP_HAL             (1)
 #define MICROPY_PY_THREAD                   (1)

From 106a83de222a7c9ceb3f70ca214677c996916489 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 7 Feb 2022 21:05:48 +1100
Subject: [PATCH 1725/3533] esp32/esp32_partition: Add support for specifying
 block_size.

To support filesystems that use a block size different from the native
erase-page size.

Signed-off-by: Damien George <damien@micropython.org>
---
 docs/library/esp32.rst        |  8 +++-
 ports/esp32/esp32_partition.c | 80 ++++++++++++++++++++++++++++-------
 2 files changed, 70 insertions(+), 18 deletions(-)

diff --git a/docs/library/esp32.rst b/docs/library/esp32.rst
index ff1c99a553bd6..82e69e49646c4 100644
--- a/docs/library/esp32.rst
+++ b/docs/library/esp32.rst
@@ -68,17 +68,21 @@ Flash partitions
 This class gives access to the partitions in the device's flash memory and includes
 methods to enable over-the-air (OTA) updates.
 
-.. class:: Partition(id)
+.. class:: Partition(id, block_size=4096)
 
     Create an object representing a partition.  *id* can be a string which is the label
     of the partition to retrieve, or one of the constants: ``BOOT`` or ``RUNNING``.
+    *block_size* specifies the byte size of an individual block.
 
-.. classmethod:: Partition.find(type=TYPE_APP, subtype=0xff, label=None)
+.. classmethod:: Partition.find(type=TYPE_APP, subtype=0xff, label=None, block_size=4096)
 
     Find a partition specified by *type*, *subtype* and *label*.  Returns a
     (possibly empty) list of Partition objects. Note: ``subtype=0xff`` matches any subtype
     and ``label=None`` matches any label.
 
+    *block_size* specifies the byte size of an individual block used by the returned
+    objects.
+
 .. method:: Partition.info()
 
     Returns a 6-tuple ``(type, subtype, addr, size, label, encrypted)``.
diff --git a/ports/esp32/esp32_partition.c b/ports/esp32/esp32_partition.c
index dc2bdd7120ed3..b779cb18c6129 100644
--- a/ports/esp32/esp32_partition.c
+++ b/ports/esp32/esp32_partition.c
@@ -34,9 +34,12 @@
 #include "esp_ota_ops.h"
 
 // esp_partition_read and esp_partition_write can operate on arbitrary bytes
-// but esp_partition_erase_range operates on 4k blocks.  But to make a partition
-// implement the standard block protocol all operations are done on 4k blocks.
-#define BLOCK_SIZE_BYTES (4096)
+// but esp_partition_erase_range operates on 4k blocks.  The default block size
+// for a Partition object is therefore 4k, to make writes efficient, and also
+// make it work well with filesystems like littlefs.  The Partition object also
+// supports smaller block sizes, in which case a cache is used and writes may
+// be less efficient.
+#define NATIVE_BLOCK_SIZE_BYTES (4096)
 
 enum {
     ESP32_PARTITION_BOOT,
@@ -46,15 +49,23 @@ enum {
 typedef struct _esp32_partition_obj_t {
     mp_obj_base_t base;
     const esp_partition_t *part;
+    uint8_t *cache;
+    uint16_t block_size;
 } esp32_partition_obj_t;
 
-STATIC esp32_partition_obj_t *esp32_partition_new(const esp_partition_t *part) {
+STATIC esp32_partition_obj_t *esp32_partition_new(const esp_partition_t *part, uint16_t block_size) {
     if (part == NULL) {
         mp_raise_OSError(MP_ENOENT);
     }
     esp32_partition_obj_t *self = m_new_obj(esp32_partition_obj_t);
     self->base.type = &esp32_partition_type;
     self->part = part;
+    self->block_size = block_size;
+    if (self->block_size < NATIVE_BLOCK_SIZE_BYTES) {
+        self->cache = m_new(uint8_t, NATIVE_BLOCK_SIZE_BYTES);
+    } else {
+        self->cache = NULL;
+    }
     return self;
 }
 
@@ -69,7 +80,7 @@ STATIC void esp32_partition_print(const mp_print_t *print, mp_obj_t self_in, mp_
 
 STATIC mp_obj_t esp32_partition_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
     // Check args
-    mp_arg_check_num(n_args, n_kw, 1, 1, false);
+    mp_arg_check_num(n_args, n_kw, 1, 2, false);
 
     // Get requested partition
     const esp_partition_t *part;
@@ -94,17 +105,24 @@ STATIC mp_obj_t esp32_partition_make_new(const mp_obj_type_t *type, size_t n_arg
         }
     }
 
+    // Get block size if given
+    uint16_t block_size = NATIVE_BLOCK_SIZE_BYTES;
+    if (n_args == 2) {
+        block_size = mp_obj_get_int(all_args[1]);
+    }
+
     // Return new object
-    return MP_OBJ_FROM_PTR(esp32_partition_new(part));
+    return MP_OBJ_FROM_PTR(esp32_partition_new(part, block_size));
 }
 
 STATIC mp_obj_t esp32_partition_find(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     // Parse args
-    enum { ARG_type, ARG_subtype, ARG_label };
+    enum { ARG_type, ARG_subtype, ARG_label, ARG_block_size };
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_type, MP_ARG_INT, {.u_int = ESP_PARTITION_TYPE_APP} },
         { MP_QSTR_subtype, MP_ARG_INT, {.u_int = ESP_PARTITION_SUBTYPE_ANY} },
         { MP_QSTR_label, MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
+        { MP_QSTR_block_size, MP_ARG_INT, {.u_int = NATIVE_BLOCK_SIZE_BYTES} },
     };
     mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
     mp_arg_parse_all(n_args, pos_args, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
@@ -115,11 +133,14 @@ STATIC mp_obj_t esp32_partition_find(size_t n_args, const mp_obj_t *pos_args, mp
         label = mp_obj_str_get_str(args[ARG_label].u_obj);
     }
 
+    // Get block size
+    uint16_t block_size = args[ARG_block_size].u_int;
+
     // Build list of matching partitions
     mp_obj_t list = mp_obj_new_list(0, NULL);
     esp_partition_iterator_t iter = esp_partition_find(args[ARG_type].u_int, args[ARG_subtype].u_int, label);
     while (iter != NULL) {
-        mp_obj_list_append(list, MP_OBJ_FROM_PTR(esp32_partition_new(esp_partition_get(iter))));
+        mp_obj_list_append(list, MP_OBJ_FROM_PTR(esp32_partition_new(esp_partition_get(iter), block_size)));
         iter = esp_partition_next(iter);
     }
     esp_partition_iterator_release(iter);
@@ -145,7 +166,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(esp32_partition_info_obj, esp32_partition_info)
 
 STATIC mp_obj_t esp32_partition_readblocks(size_t n_args, const mp_obj_t *args) {
     esp32_partition_obj_t *self = MP_OBJ_TO_PTR(args[0]);
-    uint32_t offset = mp_obj_get_int(args[1]) * BLOCK_SIZE_BYTES;
+    uint32_t offset = mp_obj_get_int(args[1]) * self->block_size;
     mp_buffer_info_t bufinfo;
     mp_get_buffer_raise(args[2], &bufinfo, MP_BUFFER_WRITE);
     if (n_args == 4) {
@@ -158,12 +179,36 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(esp32_partition_readblocks_obj, 3, 4,
 
 STATIC mp_obj_t esp32_partition_writeblocks(size_t n_args, const mp_obj_t *args) {
     esp32_partition_obj_t *self = MP_OBJ_TO_PTR(args[0]);
-    uint32_t offset = mp_obj_get_int(args[1]) * BLOCK_SIZE_BYTES;
+    uint32_t offset = mp_obj_get_int(args[1]) * self->block_size;
     mp_buffer_info_t bufinfo;
     mp_get_buffer_raise(args[2], &bufinfo, MP_BUFFER_READ);
     if (n_args == 3) {
-        check_esp_err(esp_partition_erase_range(self->part, offset, bufinfo.len));
+        // A simple write, which requires erasing first.
+        if (self->block_size >= NATIVE_BLOCK_SIZE_BYTES) {
+            // Block size is at least native erase-page size, so do an efficient erase.
+            check_esp_err(esp_partition_erase_range(self->part, offset, bufinfo.len));
+        } else {
+            // Block size is less than native erase-page size, so do erase in sections.
+            uint32_t addr = (offset / NATIVE_BLOCK_SIZE_BYTES) * NATIVE_BLOCK_SIZE_BYTES;
+            uint32_t o = offset % NATIVE_BLOCK_SIZE_BYTES;
+            uint32_t top_addr = offset + bufinfo.len;
+            while (addr < top_addr) {
+                if (o > 0 || top_addr < addr + NATIVE_BLOCK_SIZE_BYTES) {
+                    check_esp_err(esp_partition_read(self->part, addr, self->cache, NATIVE_BLOCK_SIZE_BYTES));
+                }
+                check_esp_err(esp_partition_erase_range(self->part, addr, NATIVE_BLOCK_SIZE_BYTES));
+                if (o > 0) {
+                    check_esp_err(esp_partition_write(self->part, addr, self->cache, o));
+                }
+                if (top_addr < addr + NATIVE_BLOCK_SIZE_BYTES) {
+                    check_esp_err(esp_partition_write(self->part, top_addr, self->cache, addr + NATIVE_BLOCK_SIZE_BYTES - top_addr));
+                }
+                o = 0;
+                addr += NATIVE_BLOCK_SIZE_BYTES;
+            }
+        }
     } else {
+        // An extended write, erasing must have been done explicitly before this write.
         offset += mp_obj_get_int(args[3]);
     }
     check_esp_err(esp_partition_write(self->part, offset, bufinfo.buf, bufinfo.len));
@@ -182,12 +227,15 @@ STATIC mp_obj_t esp32_partition_ioctl(mp_obj_t self_in, mp_obj_t cmd_in, mp_obj_
         case MP_BLOCKDEV_IOCTL_SYNC:
             return MP_OBJ_NEW_SMALL_INT(0);
         case MP_BLOCKDEV_IOCTL_BLOCK_COUNT:
-            return MP_OBJ_NEW_SMALL_INT(self->part->size / BLOCK_SIZE_BYTES);
+            return MP_OBJ_NEW_SMALL_INT(self->part->size / self->block_size);
         case MP_BLOCKDEV_IOCTL_BLOCK_SIZE:
-            return MP_OBJ_NEW_SMALL_INT(BLOCK_SIZE_BYTES);
+            return MP_OBJ_NEW_SMALL_INT(self->block_size);
         case MP_BLOCKDEV_IOCTL_BLOCK_ERASE: {
-            uint32_t offset = mp_obj_get_int(arg_in) * BLOCK_SIZE_BYTES;
-            check_esp_err(esp_partition_erase_range(self->part, offset, BLOCK_SIZE_BYTES));
+            if (self->block_size != NATIVE_BLOCK_SIZE_BYTES) {
+                return MP_OBJ_NEW_SMALL_INT(-MP_EINVAL);
+            }
+            uint32_t offset = mp_obj_get_int(arg_in) * NATIVE_BLOCK_SIZE_BYTES;
+            check_esp_err(esp_partition_erase_range(self->part, offset, NATIVE_BLOCK_SIZE_BYTES));
             return MP_OBJ_NEW_SMALL_INT(0);
         }
         default:
@@ -205,7 +253,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(esp32_partition_set_boot_obj, esp32_partition_s
 
 STATIC mp_obj_t esp32_partition_get_next_update(mp_obj_t self_in) {
     esp32_partition_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    return MP_OBJ_FROM_PTR(esp32_partition_new(esp_ota_get_next_update_partition(self->part)));
+    return MP_OBJ_FROM_PTR(esp32_partition_new(esp_ota_get_next_update_partition(self->part), NATIVE_BLOCK_SIZE_BYTES));
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(esp32_partition_get_next_update_obj, esp32_partition_get_next_update);
 

From f30b32e084ec49cdb2bf6011963dd1fa98945706 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 7 Feb 2022 21:06:05 +1100
Subject: [PATCH 1726/3533] esp32/modules: Create ffat partition object with
 block_size=512.

Because these are formatted with a 512 sector size.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/modules/flashbdev.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/esp32/modules/flashbdev.py b/ports/esp32/modules/flashbdev.py
index c3f75c7a7e8e1..1ee6ff779b76b 100644
--- a/ports/esp32/modules/flashbdev.py
+++ b/ports/esp32/modules/flashbdev.py
@@ -3,5 +3,5 @@
 # MicroPython's partition table uses "vfs", TinyUF2 uses "ffat".
 bdev = Partition.find(Partition.TYPE_DATA, label="vfs")
 if not bdev:
-    bdev = Partition.find(Partition.TYPE_DATA, label="ffat")
+    bdev = Partition.find(Partition.TYPE_DATA, label="ffat", block_size=512)
 bdev = bdev[0] if bdev else None

From 49934fcf8b0b2bd906a96e1ff57b724d8dd6d93e Mon Sep 17 00:00:00 2001
From: stijn <stijn@ignitron.net>
Date: Fri, 18 Feb 2022 19:36:40 +0100
Subject: [PATCH 1727/3533] extmod/moduplatform: Move platform PP definitions
 into a header.

These are more generally useful than just for the module so make them
globally available, prefixed consistently with MICROPY_PLATFORM_.
---
 extmod/moduplatform.c |  82 +++------------------------------
 extmod/moduplatform.h | 105 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 112 insertions(+), 75 deletions(-)
 create mode 100644 extmod/moduplatform.h

diff --git a/extmod/moduplatform.c b/extmod/moduplatform.c
index 820feb312aaf3..fa59c9227d088 100644
--- a/extmod/moduplatform.c
+++ b/extmod/moduplatform.c
@@ -29,87 +29,19 @@
 #include "py/objtuple.h"
 #include "py/objstr.h"
 #include "py/mphal.h"
+#include "extmod/moduplatform.h"
 #include "genhdr/mpversion.h"
 
 #if MICROPY_PY_UPLATFORM
 
 // platform - Access to underlying platform's identifying data
 
-// TODO: Add more architectures, compilers and libraries.
-// See: https://sourceforge.net/p/predef/wiki/Home/
-
-#if defined(__ARM_ARCH)
-#define PLATFORM_ARCH   "arm"
-#elif defined(__x86_64__) || defined(_WIN64)
-#define PLATFORM_ARCH   "x86_64"
-#elif defined(__i386__) || defined(_M_IX86)
-#define PLATFORM_ARCH   "x86"
-#elif defined(__xtensa__) || defined(_M_IX86)
-#define PLATFORM_ARCH   "xtensa"
-#else
-#define PLATFORM_ARCH   ""
-#endif
-
-#if defined(__GNUC__)
-#define PLATFORM_COMPILER \
-    "GCC " \
-    MP_STRINGIFY(__GNUC__) "." \
-    MP_STRINGIFY(__GNUC_MINOR__) "." \
-    MP_STRINGIFY(__GNUC_PATCHLEVEL__)
-#elif defined(__ARMCC_VERSION)
-#define PLATFORM_COMPILER \
-    "ARMCC " \
-    MP_STRINGIFY((__ARMCC_VERSION / 1000000)) "." \
-    MP_STRINGIFY((__ARMCC_VERSION / 10000 % 100)) "." \
-    MP_STRINGIFY((__ARMCC_VERSION % 10000))
-#elif defined(_MSC_VER)
-#if defined(_WIN64)
-#define COMPILER_BITS "64 bit"
-#elif defined(_M_IX86)
-#define COMPILER_BITS "32 bit"
-#else
-#define COMPILER_BITS ""
-#endif
-#define PLATFORM_COMPILER \
-    "MSC v." MP_STRINGIFY(_MSC_VER) " " COMPILER_BITS
-#else
-#define PLATFORM_COMPILER       ""
-#endif
-
-#if defined(__GLIBC__)
-#define PLATFORM_LIBC_LIB       "glibc"
-#define PLATFORM_LIBC_VER \
-    MP_STRINGIFY(__GLIBC__) "." \
-    MP_STRINGIFY(__GLIBC_MINOR__)
-#elif defined(__NEWLIB__)
-#define PLATFORM_LIBC_LIB       "newlib"
-#define PLATFORM_LIBC_VER       _NEWLIB_VERSION
-#else
-#define PLATFORM_LIBC_LIB       ""
-#define PLATFORM_LIBC_VER       ""
-#endif
-
-#if defined(__linux)
-#define PLATFORM_SYSTEM     "Linux"
-#elif defined(__unix__)
-#define PLATFORM_SYSTEM     "Unix"
-#elif defined(__CYGWIN__)
-#define PLATFORM_SYSTEM     "Cygwin"
-#elif defined(_WIN32)
-#define PLATFORM_SYSTEM     "Windows"
-#else
-#define PLATFORM_SYSTEM     "MicroPython"
-#endif
-
-#ifndef MICROPY_PLATFORM_VERSION
-#define MICROPY_PLATFORM_VERSION ""
-#endif
-
-STATIC const MP_DEFINE_STR_OBJ(info_platform_obj, PLATFORM_SYSTEM "-" MICROPY_VERSION_STRING "-" \
-    PLATFORM_ARCH "-" MICROPY_PLATFORM_VERSION "-with-" PLATFORM_LIBC_LIB "" PLATFORM_LIBC_VER);
-STATIC const MP_DEFINE_STR_OBJ(info_python_compiler_obj, PLATFORM_COMPILER);
-STATIC const MP_DEFINE_STR_OBJ(info_libc_lib_obj, PLATFORM_LIBC_LIB);
-STATIC const MP_DEFINE_STR_OBJ(info_libc_ver_obj, PLATFORM_LIBC_VER);
+STATIC const MP_DEFINE_STR_OBJ(info_platform_obj, MICROPY_PLATFORM_SYSTEM "-" \
+    MICROPY_VERSION_STRING "-" MICROPY_PLATFORM_ARCH "-" MICROPY_PLATFORM_VERSION "-with-" \
+    MICROPY_PLATFORM_LIBC_LIB "" MICROPY_PLATFORM_LIBC_VER);
+STATIC const MP_DEFINE_STR_OBJ(info_python_compiler_obj, MICROPY_PLATFORM_COMPILER);
+STATIC const MP_DEFINE_STR_OBJ(info_libc_lib_obj, MICROPY_PLATFORM_LIBC_LIB);
+STATIC const MP_DEFINE_STR_OBJ(info_libc_ver_obj, MICROPY_PLATFORM_LIBC_VER);
 STATIC const mp_rom_obj_tuple_t info_libc_tuple_obj = {
     {&mp_type_tuple}, 2, {MP_ROM_PTR(&info_libc_lib_obj), MP_ROM_PTR(&info_libc_ver_obj)}
 };
diff --git a/extmod/moduplatform.h b/extmod/moduplatform.h
new file mode 100644
index 0000000000000..2b9ad3ae49b73
--- /dev/null
+++ b/extmod/moduplatform.h
@@ -0,0 +1,105 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013-2021 Ibrahim Abdelkader <iabdalkader@openmv.io>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+#ifndef MICROPY_INCLUDED_MODUPLATFORM_H
+#define MICROPY_INCLUDED_MODUPLATFORM_H
+
+#include "py/misc.h"  // For MP_STRINGIFY.
+#include "py/mpconfig.h"
+
+// Preprocessor directives indentifying the platform.
+// The (u)platform module itself is guarded by MICROPY_PY_UPLATFORM, see the
+// .c file, but these are made available because they're generally usable.
+// TODO: Add more architectures, compilers and libraries.
+// See: https://sourceforge.net/p/predef/wiki/Home/
+
+#if defined(__ARM_ARCH)
+#define MICROPY_PLATFORM_ARCH   "arm"
+#elif defined(__x86_64__) || defined(_WIN64)
+#define MICROPY_PLATFORM_ARCH   "x86_64"
+#elif defined(__i386__) || defined(_M_IX86)
+#define MICROPY_PLATFORM_ARCH   "x86"
+#elif defined(__xtensa__) || defined(_M_IX86)
+#define MICROPY_PLATFORM_ARCH   "xtensa"
+#else
+#define MICROPY_PLATFORM_ARCH   ""
+#endif
+
+#if defined(__GNUC__)
+#define MICROPY_PLATFORM_COMPILER \
+    "GCC " \
+    MP_STRINGIFY(__GNUC__) "." \
+    MP_STRINGIFY(__GNUC_MINOR__) "." \
+    MP_STRINGIFY(__GNUC_PATCHLEVEL__)
+#elif defined(__ARMCC_VERSION)
+#define MICROPY_PLATFORM_COMPILER \
+    "ARMCC " \
+    MP_STRINGIFY((__ARMCC_VERSION / 1000000)) "." \
+    MP_STRINGIFY((__ARMCC_VERSION / 10000 % 100)) "." \
+    MP_STRINGIFY((__ARMCC_VERSION % 10000))
+#elif defined(_MSC_VER)
+#if defined(_WIN64)
+#define MICROPY_PLATFORM_COMPILER_BITS  "64 bit"
+#elif defined(_M_IX86)
+#define MICROPY_PLATFORM_COMPILER_BITS  "32 bit"
+#else
+#define MICROPY_PLATFORM_COMPILER_BITS  ""
+#endif
+#define MICROPY_PLATFORM_COMPILER \
+    "MSC v." MP_STRINGIFY(_MSC_VER) " " MICROPY_PLATFORM_COMPILER_BITS
+#else
+#define MICROPY_PLATFORM_COMPILER       ""
+#endif
+
+#if defined(__GLIBC__)
+#define MICROPY_PLATFORM_LIBC_LIB       "glibc"
+#define MICROPY_PLATFORM_LIBC_VER \
+    MP_STRINGIFY(__GLIBC__) "." \
+    MP_STRINGIFY(__GLIBC_MINOR__)
+#elif defined(__NEWLIB__)
+#define MICROPY_PLATFORM_LIBC_LIB       "newlib"
+#define MICROPY_PLATFORM_LIBC_VER       _NEWLIB_VERSION
+#else
+#define MICROPY_PLATFORM_LIBC_LIB       ""
+#define MICROPY_PLATFORM_LIBC_VER       ""
+#endif
+
+#if defined(__linux)
+#define MICROPY_PLATFORM_SYSTEM         "Linux"
+#elif defined(__unix__)
+#define MICROPY_PLATFORM_SYSTEM         "Unix"
+#elif defined(__CYGWIN__)
+#define MICROPY_PLATFORM_SYSTEM         "Cygwin"
+#elif defined(_WIN32)
+#define MICROPY_PLATFORM_SYSTEM         "Windows"
+#else
+#define MICROPY_PLATFORM_SYSTEM         "MicroPython"
+#endif
+
+#ifndef MICROPY_PLATFORM_VERSION
+#define MICROPY_PLATFORM_VERSION ""
+#endif
+
+#endif // MICROPY_INCLUDED_MODUPLATFORM_H

From 5f50f4a130e60c4bc5f4fbf58ac849dcaf764e72 Mon Sep 17 00:00:00 2001
From: stijn <stijn@ignitron.net>
Date: Fri, 18 Feb 2022 19:38:55 +0100
Subject: [PATCH 1728/3533] unix: Show compiler info in REPL banner.

The unix port's main.c gets used by unix and windows ports, and with a
variety of compilers, so it's convenient to see which version is actually
being used immediately when starting micropython.  This is similar to what
CPython does.
---
 ports/unix/main.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ports/unix/main.c b/ports/unix/main.c
index b2790791af856..2769f33191368 100644
--- a/ports/unix/main.c
+++ b/ports/unix/main.c
@@ -47,6 +47,7 @@
 #include "py/mphal.h"
 #include "py/mpthread.h"
 #include "extmod/misc.h"
+#include "extmod/moduplatform.h"
 #include "extmod/vfs.h"
 #include "extmod/vfs_posix.h"
 #include "genhdr/mpversion.h"
@@ -178,7 +179,8 @@ STATIC char *strjoin(const char *s1, int sep_char, const char *s2) {
 
 STATIC int do_repl(void) {
     mp_hal_stdout_tx_str("MicroPython " MICROPY_GIT_TAG " on " MICROPY_BUILD_DATE "; "
-        MICROPY_PY_SYS_PLATFORM " version\nUse Ctrl-D to exit, Ctrl-E for paste mode\n");
+        MICROPY_PY_SYS_PLATFORM " [" MICROPY_PLATFORM_COMPILER "] version\n"
+        "Use Ctrl-D to exit, Ctrl-E for paste mode\n");
 
     #if MICROPY_USE_READLINE == 1
 

From b1afbe3336a3daca170f54c471f84d28622293e4 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 24 Feb 2022 15:23:32 +1100
Subject: [PATCH 1729/3533] tools/ci.sh: Update IDF v4.4 build to use v4.4 tag.

Signed-off-by: Damien George <damien@micropython.org>
---
 tools/ci.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tools/ci.sh b/tools/ci.sh
index 0506a003147ba..3e78ae4a05a86 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -107,8 +107,7 @@ function ci_esp32_idf402_setup {
 }
 
 function ci_esp32_idf44_setup {
-    # This commit is just before v5.0-dev
-    ci_esp32_setup_helper 142bb32c50fa9875b8b69fa539a2d59559460d72
+    ci_esp32_setup_helper v4.4
 }
 
 function ci_esp32_build {

From 64bfaae7ab33e628f28ca3b53b10893fb047b48e Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 24 Feb 2022 15:23:50 +1100
Subject: [PATCH 1730/3533] esp32/README.md: Update list of supported IDF
 versions.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/README.md | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/ports/esp32/README.md b/ports/esp32/README.md
index 4524696899063..c37213b303109 100644
--- a/ports/esp32/README.md
+++ b/ports/esp32/README.md
@@ -28,7 +28,7 @@ manage the ESP32 microcontroller, as well as a way to manage the required
 build environment and toolchains needed to build the firmware.
 
 The ESP-IDF changes quickly and MicroPython only supports certain versions.
-Currently MicroPython supports v4.0.2, v4.1.1 and v4.2,
+Currently MicroPython supports v4.0.2, v4.1.1, v4.2.2, v4.3.2 and v4.4,
 although other IDF v4 versions may also work.
 
 To install the ESP-IDF the full instructions can be found at the
@@ -50,7 +50,7 @@ To check out a copy of the IDF use git clone:
 $ git clone -b v4.0.2 --recursive https://github.com/espressif/esp-idf.git
 ```
 
-You can replace `v4.0.2` with `v4.1.1` or `v4.2` or any other supported version.
+You can replace `v4.0.2` with `v4.2.2` or `v4.4` or any other supported version.
 (You don't need a full recursive clone; see the `ci_esp32_setup` function in
 `tools/ci.sh` in this repository for more detailed set-up commands.)
 
@@ -77,8 +77,7 @@ The `install.sh` step only needs to be done once. You will need to source
 
 **Note:** If you are building MicroPython for the ESP32-S2, ESP32-C3 or ESP32-S3,
 please ensure you are using the following required IDF versions:
-- ESP32-S3 currently requires latest `master`, but eventually `v4.4` or later when
-  it's available.
+- ESP32-S3 currently requires `v4.4` or later.
 - ESP32-S2 and ESP32-C3 require `v4.3.1` or later.
 
 Building the firmware

From f2040bfc7ee033e48acef9f289790f3b4e6b74e5 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 22 Oct 2021 22:22:47 +1100
Subject: [PATCH 1731/3533] py: Rework bytecode and .mpy file format to be
 mostly static data.

Background: .mpy files are precompiled .py files, built using mpy-cross,
that contain compiled bytecode functions (and can also contain machine
code). The benefit of using an .mpy file over a .py file is that they are
faster to import and take less memory when importing.  They are also
smaller on disk.

But the real benefit of .mpy files comes when they are frozen into the
firmware.  This is done by loading the .mpy file during compilation of the
firmware and turning it into a set of big C data structures (the job of
mpy-tool.py), which are then compiled and downloaded into the ROM of a
device.  These C data structures can be executed in-place, ie directly from
ROM.  This makes importing even faster because there is very little to do,
and also means such frozen modules take up much less RAM (because their
bytecode stays in ROM).

The downside of frozen code is that it requires recompiling and reflashing
the entire firmware.  This can be a big barrier to entry, slows down
development time, and makes it harder to do OTA updates of frozen code
(because the whole firmware must be updated).

This commit attempts to solve this problem by providing a solution that
sits between loading .mpy files into RAM and freezing them into the
firmware.  The .mpy file format has been reworked so that it consists of
data and bytecode which is mostly static and ready to run in-place.  If
these new .mpy files are located in flash/ROM which is memory addressable,
the .mpy file can be executed (mostly) in-place.

With this approach there is still a small amount of unpacking and linking
of the .mpy file that needs to be done when it's imported, but it's still
much better than loading an .mpy from disk into RAM (although not as good
as freezing .mpy files into the firmware).

The main trick to make static .mpy files is to adjust the bytecode so any
qstrs that it references now go through a lookup table to convert from
local qstr number in the module to global qstr number in the firmware.
That means the bytecode does not need linking/rewriting of qstrs when it's
loaded.  Instead only a small qstr table needs to be built (and put in RAM)
at import time.  This means the bytecode itself is static/constant and can
be used directly if it's in addressable memory.  Also the qstr string data
in the .mpy file, and some constant object data, can be used directly.
Note that the qstr table is global to the module (ie not per function).

In more detail, in the VM what used to be (schematically):

    qst = DECODE_QSTR_VALUE;

is now (schematically):

    idx = DECODE_QSTR_INDEX;
    qst = qstr_table[idx];

That allows the bytecode to be fixed at compile time and not need
relinking/rewriting of the qstr values.  Only qstr_table needs to be linked
when the .mpy is loaded.

Incidentally, this helps to reduce the size of bytecode because what used
to be 2-byte qstr values in the bytecode are now (mostly) 1-byte indices.
If the module uses the same qstr more than two times then the bytecode is
smaller than before.

The following changes are measured for this commit compared to the
previous (the baseline):
- average 7%-9% reduction in size of .mpy files
- frozen code size is reduced by about 5%-7%
- importing .py files uses about 5% less RAM in total
- importing .mpy files uses about 4% less RAM in total
- importing .py and .mpy files takes about the same time as before

The qstr indirection in the bytecode has only a small impact on VM
performance.  For stm32 on PYBv1.0 the performance change of this commit
is:

diff of scores (higher is better)
N=100 M=100             baseline -> this-commit  diff      diff% (error%)
bm_chaos.py               371.07 ->  357.39 :  -13.68 =  -3.687% (+/-0.02%)
bm_fannkuch.py             78.72 ->   77.49 :   -1.23 =  -1.563% (+/-0.01%)
bm_fft.py                2591.73 -> 2539.28 :  -52.45 =  -2.024% (+/-0.00%)
bm_float.py              6034.93 -> 5908.30 : -126.63 =  -2.098% (+/-0.01%)
bm_hexiom.py               48.96 ->   47.93 :   -1.03 =  -2.104% (+/-0.00%)
bm_nqueens.py            4510.63 -> 4459.94 :  -50.69 =  -1.124% (+/-0.00%)
bm_pidigits.py            650.28 ->  644.96 :   -5.32 =  -0.818% (+/-0.23%)
core_import_mpy_multi.py  564.77 ->  581.49 :  +16.72 =  +2.960% (+/-0.01%)
core_import_mpy_single.py  68.67 ->   67.16 :   -1.51 =  -2.199% (+/-0.01%)
core_qstr.py               64.16 ->   64.12 :   -0.04 =  -0.062% (+/-0.00%)
core_yield_from.py        362.58 ->  354.50 :   -8.08 =  -2.228% (+/-0.00%)
misc_aes.py               429.69 ->  405.59 :  -24.10 =  -5.609% (+/-0.01%)
misc_mandel.py           3485.13 -> 3416.51 :  -68.62 =  -1.969% (+/-0.00%)
misc_pystone.py          2496.53 -> 2405.56 :  -90.97 =  -3.644% (+/-0.01%)
misc_raytrace.py          381.47 ->  374.01 :   -7.46 =  -1.956% (+/-0.01%)
viper_call0.py            576.73 ->  572.49 :   -4.24 =  -0.735% (+/-0.04%)
viper_call1a.py           550.37 ->  546.21 :   -4.16 =  -0.756% (+/-0.09%)
viper_call1b.py           438.23 ->  435.68 :   -2.55 =  -0.582% (+/-0.06%)
viper_call1c.py           442.84 ->  440.04 :   -2.80 =  -0.632% (+/-0.08%)
viper_call2a.py           536.31 ->  532.35 :   -3.96 =  -0.738% (+/-0.06%)
viper_call2b.py           382.34 ->  377.07 :   -5.27 =  -1.378% (+/-0.03%)

And for unix on x64:

diff of scores (higher is better)
N=2000 M=2000        baseline -> this-commit     diff      diff% (error%)
bm_chaos.py          13594.20 ->  13073.84 :  -520.36 =  -3.828% (+/-5.44%)
bm_fannkuch.py          60.63 ->     59.58 :    -1.05 =  -1.732% (+/-3.01%)
bm_fft.py           112009.15 -> 111603.32 :  -405.83 =  -0.362% (+/-4.03%)
bm_float.py         246202.55 -> 247923.81 : +1721.26 =  +0.699% (+/-2.79%)
bm_hexiom.py           615.65 ->    617.21 :    +1.56 =  +0.253% (+/-1.64%)
bm_nqueens.py       215807.95 -> 215600.96 :  -206.99 =  -0.096% (+/-3.52%)
bm_pidigits.py        8246.74 ->   8422.82 :  +176.08 =  +2.135% (+/-3.64%)
misc_aes.py          16133.00 ->  16452.74 :  +319.74 =  +1.982% (+/-1.50%)
misc_mandel.py      128146.69 -> 130796.43 : +2649.74 =  +2.068% (+/-3.18%)
misc_pystone.py      83811.49 ->  83124.85 :  -686.64 =  -0.819% (+/-1.03%)
misc_raytrace.py     21688.02 ->  21385.10 :  -302.92 =  -1.397% (+/-3.20%)

The code size change is (firmware with a lot of frozen code benefits the
most):

       bare-arm:  +396 +0.697%
    minimal x86: +1595 +0.979% [incl +32(data)]
       unix x64: +2408 +0.470% [incl +800(data)]
    unix nanbox: +1396 +0.309% [incl -96(data)]
          stm32: -1256 -0.318% PYBV10
         cc3200:  +288 +0.157%
        esp8266:  -260 -0.037% GENERIC
          esp32:  -216 -0.014% GENERIC[incl -1072(data)]
            nrf:  +116 +0.067% pca10040
            rp2:  -664 -0.135% PICO
           samd:  +844 +0.607% ADAFRUIT_ITSYBITSY_M4_EXPRESS

As part of this change the .mpy file format version is bumped to version 6.
And mpy-tool.py has been improved to provide a good visualisation of the
contents of .mpy files.

In summary: this commit changes the bytecode to use qstr indirection, and
reworks the .mpy file format to be simpler and allow .mpy files to be
executed in-place.  Performance is not impacted too much.  Eventually it
will be possible to store such .mpy files in a linear, read-only, memory-
mappable filesystem so they can be executed from flash/ROM.  This will
essentially be able to replace frozen code for most applications.

Signed-off-by: Damien George <damien@micropython.org>
---
 mpy-cross/main.c                            |    5 +-
 ports/unix/coverage.c                       |    4 +
 py/asmbase.c                                |    3 +-
 py/asmbase.h                                |    2 +-
 py/bc.c                                     |   69 +-
 py/bc.h                                     |   84 +-
 py/builtinevex.c                            |    2 +-
 py/builtinimport.c                          |   28 +-
 py/compile.c                                |  171 ++-
 py/compile.h                                |    3 +-
 py/dynruntime.h                             |   10 +-
 py/emit.h                                   |   50 +-
 py/emitbc.c                                 |  156 +--
 py/emitcommon.c                             |   11 +
 py/emitglue.c                               |   61 +-
 py/emitglue.h                               |   26 +-
 py/emitnative.c                             |  265 ++--
 py/emitnx86.c                               |    2 +-
 py/frozenmod.c                              |    2 +-
 py/mpconfig.h                               |    8 +
 py/nativeglue.c                             |    6 +-
 py/nativeglue.h                             |   12 +-
 py/obj.h                                    |    4 -
 py/objfun.c                                 |   50 +-
 py/objfun.h                                 |   10 +-
 py/objgenerator.c                           |   18 +-
 py/objmodule.c                              |    9 +-
 py/persistentcode.c                         |  554 +++-----
 py/persistentcode.h                         |   12 +-
 py/profile.c                                |   47 +-
 py/profile.h                                |    4 +-
 py/qstr.h                                   |    1 +
 py/scope.c                                  |    3 +-
 py/scope.h                                  |    3 +-
 py/showbc.c                                 |   73 +-
 py/vm.c                                     |   73 +-
 shared/runtime/pyexec.c                     |    6 +-
 tests/cmdline/cmd_parsetree.py.exp          |   74 +-
 tests/cmdline/cmd_showbc.py.exp             |  762 ++++++-----
 tests/cmdline/cmd_verbose.py.exp            |   18 +-
 tests/micropython/import_mpy_invalid.py     |    1 -
 tests/micropython/import_mpy_invalid.py.exp |    1 -
 tests/micropython/import_mpy_native_gc.py   |    8 +-
 tests/micropython/import_mpy_native_x64.py  |   63 +-
 tests/perf_bench/core_import_mpy_multi.py   |    2 +-
 tests/perf_bench/core_import_mpy_single.py  |    2 +-
 tools/mpy-tool.py                           | 1308 +++++++++++++------
 tools/mpy_ld.py                             |   35 +-
 48 files changed, 2378 insertions(+), 1743 deletions(-)

diff --git a/mpy-cross/main.c b/mpy-cross/main.c
index 7218921b31a82..a2daf7b22fd69 100644
--- a/mpy-cross/main.c
+++ b/mpy-cross/main.c
@@ -72,7 +72,8 @@ STATIC int compile_and_save(const char *file, const char *output_file, const cha
         #endif
 
         mp_parse_tree_t parse_tree = mp_parse(lex, MP_PARSE_FILE_INPUT);
-        mp_raw_code_t *rc = mp_compile_to_raw_code(&parse_tree, source_name, false);
+        mp_module_context_t *ctx = m_new_obj(mp_module_context_t);
+        mp_compiled_module_t cm = mp_compile_to_raw_code(&parse_tree, source_name, false, ctx);
 
         vstr_t vstr;
         vstr_init(&vstr, 16);
@@ -83,7 +84,7 @@ STATIC int compile_and_save(const char *file, const char *output_file, const cha
         } else {
             vstr_add_str(&vstr, output_file);
         }
-        mp_raw_code_save_file(rc, vstr_null_terminated_str(&vstr));
+        mp_raw_code_save_file(&cm, vstr_null_terminated_str(&vstr));
         vstr_clear(&vstr);
 
         nlr_pop();
diff --git a/ports/unix/coverage.c b/ports/unix/coverage.c
index 6b00cdfef2d23..a855237200128 100644
--- a/ports/unix/coverage.c
+++ b/ports/unix/coverage.c
@@ -2,6 +2,7 @@
 #include <string.h>
 
 #include "py/obj.h"
+#include "py/objfun.h"
 #include "py/objstr.h"
 #include "py/runtime.h"
 #include "py/gc.h"
@@ -449,7 +450,10 @@ STATIC mp_obj_t extra_coverage(void) {
         mp_printf(&mp_plat_print, "# VM\n");
 
         // call mp_execute_bytecode with invalide bytecode (should raise NotImplementedError)
+        mp_module_context_t context;
         mp_obj_fun_bc_t fun_bc;
+        fun_bc.context = &context;
+        fun_bc.child_table = NULL;
         fun_bc.bytecode = (const byte *)"\x01"; // just needed for n_state
         mp_code_state_t *code_state = m_new_obj_var(mp_code_state_t, mp_obj_t, 1);
         code_state->fun_bc = &fun_bc;
diff --git a/py/asmbase.c b/py/asmbase.c
index 344e03e7a7ad7..4a3fd089cb241 100644
--- a/py/asmbase.c
+++ b/py/asmbase.c
@@ -61,7 +61,8 @@ void mp_asm_base_start_pass(mp_asm_base_t *as, int pass) {
 // all functions must go through this one to emit bytes
 // if as->pass < MP_ASM_PASS_EMIT, then this function just counts the number
 // of bytes needed and returns NULL, and callers should not store any data
-uint8_t *mp_asm_base_get_cur_to_write_bytes(mp_asm_base_t *as, size_t num_bytes_to_write) {
+uint8_t *mp_asm_base_get_cur_to_write_bytes(void *as_in, size_t num_bytes_to_write) {
+    mp_asm_base_t *as = as_in;
     uint8_t *c = NULL;
     if (as->pass == MP_ASM_PASS_EMIT) {
         assert(as->code_offset + num_bytes_to_write <= as->code_size);
diff --git a/py/asmbase.h b/py/asmbase.h
index 24c3af8679c08..960be7685f5d4 100644
--- a/py/asmbase.h
+++ b/py/asmbase.h
@@ -45,7 +45,7 @@ typedef struct _mp_asm_base_t {
 void mp_asm_base_init(mp_asm_base_t *as, size_t max_num_labels);
 void mp_asm_base_deinit(mp_asm_base_t *as, bool free_code);
 void mp_asm_base_start_pass(mp_asm_base_t *as, int pass);
-uint8_t *mp_asm_base_get_cur_to_write_bytes(mp_asm_base_t *as, size_t num_bytes_to_write);
+uint8_t *mp_asm_base_get_cur_to_write_bytes(void *as, size_t num_bytes_to_write);
 void mp_asm_base_label_assign(mp_asm_base_t *as, size_t label);
 void mp_asm_base_align(mp_asm_base_t *as, unsigned int align);
 void mp_asm_base_data(mp_asm_base_t *as, unsigned int bytesize, uintptr_t val);
diff --git a/py/bc.c b/py/bc.c
index 69b6739e8f864..b98df39e28cd3 100644
--- a/py/bc.c
+++ b/py/bc.c
@@ -29,9 +29,9 @@
 #include <string.h>
 #include <assert.h>
 
-#include "py/runtime.h"
 #include "py/bc0.h"
 #include "py/bc.h"
+#include "py/objfun.h"
 
 #if MICROPY_DEBUG_VERBOSE // print debugging info
 #define DEBUG_PRINT (1)
@@ -40,7 +40,23 @@
 #define DEBUG_printf(...) (void)0
 #endif
 
-#if !MICROPY_PERSISTENT_CODE
+void mp_encode_uint(void *env, mp_encode_uint_allocator_t allocator, mp_uint_t val) {
+    // We store each 7 bits in a separate byte, and that's how many bytes needed
+    byte buf[MP_ENCODE_UINT_MAX_BYTES];
+    byte *p = buf + sizeof(buf);
+    // We encode in little-ending order, but store in big-endian, to help decoding
+    do {
+        *--p = val & 0x7f;
+        val >>= 7;
+    } while (val != 0);
+    byte *c = allocator(env, buf + sizeof(buf) - p);
+    if (c != NULL) {
+        while (p != buf + sizeof(buf) - 1) {
+            *c++ = *p++ | 0x80;
+        }
+        *c = *p;
+    }
+}
 
 mp_uint_t mp_decode_uint(const byte **ptr) {
     mp_uint_t unum = 0;
@@ -72,8 +88,6 @@ const byte *mp_decode_uint_skip(const byte *ptr) {
     return ptr;
 }
 
-#endif
-
 STATIC NORETURN void fun_pos_args_mismatch(mp_obj_fun_bc_t *f, size_t expected, size_t given) {
     #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
     // generic message, used also for other argument issues
@@ -107,8 +121,8 @@ STATIC void dump_args(const mp_obj_t *a, size_t sz) {
 // On entry code_state should be allocated somewhere (stack/heap) and
 // contain the following valid entries:
 //    - code_state->fun_bc should contain a pointer to the function object
-//    - code_state->ip should contain the offset in bytes from the pointer
-//      code_state->fun_bc->bytecode to the entry n_state (0 for bytecode, non-zero for native)
+//    - code_state->ip should contain a pointer to the beginning of the prelude
+//    - code_state->n_state should be the number of objects in the local state
 void mp_setup_code_state(mp_code_state_t *code_state, size_t n_args, size_t n_kw, const mp_obj_t *args) {
     // This function is pretty complicated.  It's main aim is to be efficient in speed and RAM
     // usage for the common case of positional only args.
@@ -116,9 +130,6 @@ void mp_setup_code_state(mp_code_state_t *code_state, size_t n_args, size_t n_kw
     // get the function object that we want to set up (could be bytecode or native code)
     mp_obj_fun_bc_t *self = code_state->fun_bc;
 
-    // ip comes in as an offset into bytecode, so turn it into a true pointer
-    code_state->ip = self->bytecode + (size_t)code_state->ip;
-
     #if MICROPY_STACKLESS
     code_state->prev = NULL;
     #endif
@@ -134,6 +145,7 @@ void mp_setup_code_state(mp_code_state_t *code_state, size_t n_args, size_t n_kw
     // Decode prelude
     size_t n_state_unused, n_exc_stack_unused, scope_flags, n_pos_args, n_kwonly_args, n_def_pos_args;
     MP_BC_PRELUDE_SIG_DECODE_INTO(code_state->ip, n_state_unused, n_exc_stack_unused, scope_flags, n_pos_args, n_kwonly_args, n_def_pos_args);
+    MP_BC_PRELUDE_SIZE_DECODE(code_state->ip);
     (void)n_state_unused;
     (void)n_exc_stack_unused;
 
@@ -194,14 +206,20 @@ void mp_setup_code_state(mp_code_state_t *code_state, size_t n_args, size_t n_kw
             *var_pos_kw_args = dict;
         }
 
-        // get pointer to arg_names array
-        const mp_obj_t *arg_names = (const mp_obj_t *)self->const_table;
-
         for (size_t i = 0; i < n_kw; i++) {
             // the keys in kwargs are expected to be qstr objects
             mp_obj_t wanted_arg_name = kwargs[2 * i];
+
+            // get pointer to arg_names array
+            const uint8_t *arg_names = code_state->ip;
+            arg_names = mp_decode_uint_skip(arg_names);
+
             for (size_t j = 0; j < n_pos_args + n_kwonly_args; j++) {
-                if (wanted_arg_name == arg_names[j]) {
+                qstr arg_qstr = mp_decode_uint(&arg_names);
+                #if MICROPY_EMIT_BYTECODE_USES_QSTR_TABLE
+                arg_qstr = self->context->constants.qstr_table[arg_qstr];
+                #endif
+                if (wanted_arg_name == MP_OBJ_NEW_QSTR(arg_qstr)) {
                     if (code_state->state[n_state - 1 - j] != MP_OBJ_NULL) {
                         mp_raise_msg_varg(&mp_type_TypeError,
                             MP_ERROR_TEXT("function got multiple values for argument '%q'"), MP_OBJ_QSTR_VALUE(wanted_arg_name));
@@ -248,17 +266,25 @@ void mp_setup_code_state(mp_code_state_t *code_state, size_t n_args, size_t n_kw
 
         // Check that all mandatory keyword args are specified
         // Fill in default kw args if we have them
+        const uint8_t *arg_names = mp_decode_uint_skip(code_state->ip);
+        for (size_t i = 0; i < n_pos_args; i++) {
+            arg_names = mp_decode_uint_skip(arg_names);
+        }
         for (size_t i = 0; i < n_kwonly_args; i++) {
+            qstr arg_qstr = mp_decode_uint(&arg_names);
+            #if MICROPY_EMIT_BYTECODE_USES_QSTR_TABLE
+            arg_qstr = self->context->constants.qstr_table[arg_qstr];
+            #endif
             if (code_state->state[n_state - 1 - n_pos_args - i] == MP_OBJ_NULL) {
                 mp_map_elem_t *elem = NULL;
                 if ((scope_flags & MP_SCOPE_FLAG_DEFKWARGS) != 0) {
-                    elem = mp_map_lookup(&((mp_obj_dict_t *)MP_OBJ_TO_PTR(self->extra_args[n_def_pos_args]))->map, arg_names[n_pos_args + i], MP_MAP_LOOKUP);
+                    elem = mp_map_lookup(&((mp_obj_dict_t *)MP_OBJ_TO_PTR(self->extra_args[n_def_pos_args]))->map, MP_OBJ_NEW_QSTR(arg_qstr), MP_MAP_LOOKUP);
                 }
                 if (elem != NULL) {
                     code_state->state[n_state - 1 - n_pos_args - i] = elem->value;
                 } else {
                     mp_raise_msg_varg(&mp_type_TypeError,
-                        MP_ERROR_TEXT("function missing required keyword argument '%q'"), MP_OBJ_QSTR_VALUE(arg_names[n_pos_args + i]));
+                        MP_ERROR_TEXT("function missing required keyword argument '%q'"), arg_qstr);
                 }
             }
         }
@@ -273,12 +299,8 @@ void mp_setup_code_state(mp_code_state_t *code_state, size_t n_args, size_t n_kw
         }
     }
 
-    // read the size part of the prelude
-    const byte *ip = code_state->ip;
-    MP_BC_PRELUDE_SIZE_DECODE(ip);
-
-    // jump over code info (source file and line-number mapping)
-    ip += n_info;
+    // jump over code info (source file, argument names and line-number mapping)
+    const uint8_t *ip = code_state->ip + n_info;
 
     // bytecode prelude: initialise closed over variables
     for (; n_cell; --n_cell) {
@@ -287,11 +309,6 @@ void mp_setup_code_state(mp_code_state_t *code_state, size_t n_args, size_t n_kw
             mp_obj_new_cell(code_state->state[n_state - 1 - local_num]);
     }
 
-    #if !MICROPY_PERSISTENT_CODE
-    // so bytecode is aligned
-    ip = MP_ALIGN(ip, sizeof(mp_uint_t));
-    #endif
-
     // now that we skipped over the prelude, set the ip for the VM
     code_state->ip = ip;
 
diff --git a/py/bc.h b/py/bc.h
index ef5afeae16577..7d761e30e68b8 100644
--- a/py/bc.h
+++ b/py/bc.h
@@ -28,7 +28,6 @@
 #define MICROPY_INCLUDED_PY_BC_H
 
 #include "py/runtime.h"
-#include "py/objfun.h"
 
 // bytecode layout:
 //
@@ -50,7 +49,9 @@
 //
 //  source info section:
 //      simple_name : var qstr
-//      source_file : var qstr
+//      argname0    : var qstr
+//      ...         : var qstr
+//      argnameN    : var qstr      N = num_pos_args + num_kwonly_args - 1
 //      <line number info>
 //
 //  closure section:
@@ -58,19 +59,16 @@
 //      ...         : byte
 //      local_numN  : byte          N = n_cells-1
 //
-//  <word alignment padding>        only needed if bytecode contains pointers
-//
 //  <bytecode>
 //
 //
 // constant table layout:
 //
-//  argname0        : obj (qstr)
-//  ...             : obj (qstr)
-//  argnameN        : obj (qstr)    N = num_pos_args + num_kwonly_args
 //  const0          : obj
 //  constN          : obj
 
+#define MP_ENCODE_UINT_MAX_BYTES ((MP_BYTES_PER_OBJ_WORD * 8 + 6) / 7)
+
 #define MP_BC_PRELUDE_SIG_ENCODE(S, E, scope, out_byte, out_env) \
     do {                                                            \
         /*// Get values to store in prelude */                      \
@@ -182,9 +180,9 @@ typedef struct _mp_bytecode_prelude_t {
     uint n_pos_args;
     uint n_kwonly_args;
     uint n_def_pos_args;
-    qstr qstr_block_name;
-    qstr qstr_source_file;
+    qstr qstr_block_name_idx;
     const byte *line_info;
+    const byte *line_info_top;
     const byte *opcodes;
 } mp_bytecode_prelude_t;
 
@@ -198,12 +196,46 @@ typedef struct _mp_exc_stack_t {
     mp_obj_base_t *prev_exc;
 } mp_exc_stack_t;
 
+// Constants associated with a module, to interface bytecode with runtime.
+typedef struct _mp_module_constants_t {
+    #if MICROPY_EMIT_BYTECODE_USES_QSTR_TABLE
+    qstr_short_t *qstr_table;
+    #else
+    qstr source_file;
+    #endif
+    mp_obj_t *obj_table;
+} mp_module_constants_t;
+
+// State associated with a module.
+typedef struct _mp_module_context_t {
+    mp_obj_module_t module;
+    mp_module_constants_t constants;
+} mp_module_context_t;
+
+// Outer level struct defining a compiled module.
+typedef struct _mp_compiled_module_t {
+    const mp_module_context_t *context;
+    const struct _mp_raw_code_t *rc;
+    #if MICROPY_PERSISTENT_CODE_SAVE
+    bool has_native;
+    size_t n_qstr;
+    size_t n_obj;
+    #endif
+} mp_compiled_module_t;
+
+// Outer level struct defining a frozen module.
+typedef struct _mp_frozen_module_t {
+    const mp_module_constants_t constants;
+    const struct _mp_raw_code_t *rc;
+} mp_frozen_module_t;
+
+// State for an executing function.
 typedef struct _mp_code_state_t {
     // The fun_bc entry points to the underlying function object that is being executed.
     // It is needed to access the start of bytecode and the const_table.
     // It is also needed to prevent the GC from reclaiming the bytecode during execution,
     // because the ip pointer below will always point to the interior of the bytecode.
-    mp_obj_fun_bc_t *fun_bc;
+    struct _mp_obj_fun_bc_t *fun_bc;
     const byte *ip;
     mp_obj_t *sp;
     uint16_t n_state;
@@ -222,6 +254,10 @@ typedef struct _mp_code_state_t {
     // mp_exc_stack_t exc_state[0];
 } mp_code_state_t;
 
+// Allocator may return NULL, in which case data is not stored (can be used to compute size).
+typedef uint8_t *(*mp_encode_uint_allocator_t)(void *env, size_t nbytes);
+
+void mp_encode_uint(void *env, mp_encode_uint_allocator_t allocator, mp_uint_t val);
 mp_uint_t mp_decode_uint(const byte **ptr);
 mp_uint_t mp_decode_uint_value(const byte *ptr);
 const byte *mp_decode_uint_skip(const byte *ptr);
@@ -229,10 +265,10 @@ const byte *mp_decode_uint_skip(const byte *ptr);
 mp_vm_return_kind_t mp_execute_bytecode(mp_code_state_t *code_state, volatile mp_obj_t inject_exc);
 mp_code_state_t *mp_obj_fun_bc_prepare_codestate(mp_obj_t func, size_t n_args, size_t n_kw, const mp_obj_t *args);
 void mp_setup_code_state(mp_code_state_t *code_state, size_t n_args, size_t n_kw, const mp_obj_t *args);
-void mp_bytecode_print(const mp_print_t *print, const void *descr, const byte *code, mp_uint_t len, const mp_uint_t *const_table);
-void mp_bytecode_print2(const mp_print_t *print, const byte *code, size_t len, const mp_uint_t *const_table);
+void mp_bytecode_print(const mp_print_t *print, const void *descr, const byte *code, mp_uint_t len, const mp_module_constants_t *cm);
+void mp_bytecode_print2(const mp_print_t *print, const byte *code, size_t len, const mp_module_constants_t *cm);
 const byte *mp_bytecode_print_str(const mp_print_t *print, const byte *ip);
-#define mp_bytecode_print_inst(print, code, const_table) mp_bytecode_print2(print, code, 1, const_table)
+#define mp_bytecode_print_inst(print, code, x_table) mp_bytecode_print2(print, code, 1, x_table)
 
 // Helper macros to access pointer with least significant bits holding flags
 #define MP_TAGPTR_PTR(x) ((void *)((uintptr_t)(x) & ~((uintptr_t)3)))
@@ -246,10 +282,26 @@ uint mp_opcode_format(const byte *ip, size_t *opcode_size, bool count_var_uint);
 
 #endif
 
-static inline size_t mp_bytecode_get_source_line(const byte *line_info, size_t bc_offset) {
+static inline void mp_module_context_alloc_tables(mp_module_context_t *context, size_t n_qstr, size_t n_obj) {
+    #if MICROPY_EMIT_BYTECODE_USES_QSTR_TABLE
+    size_t nq = (n_qstr * sizeof(qstr_short_t) + sizeof(mp_uint_t) - 1) / sizeof(mp_uint_t);
+    size_t no = n_obj;
+    mp_uint_t *mem = m_new(mp_uint_t, nq + no);
+    context->constants.qstr_table = (void *)(mem);
+    context->constants.obj_table = (void *)(mem + nq);
+    #else
+    if (n_obj == 0) {
+        context->constants.obj_table = NULL;
+    } else {
+        context->constants.obj_table = m_new(mp_obj_t, n_obj);
+    }
+    #endif
+}
+
+static inline size_t mp_bytecode_get_source_line(const byte *line_info, const byte *line_info_top, size_t bc_offset) {
     size_t source_line = 1;
-    size_t c;
-    while ((c = *line_info)) {
+    while (line_info < line_info_top) {
+        size_t c = *line_info;
         size_t b, l;
         if ((c & 0x80) == 0) {
             // 0b0LLBBBBB encoding
diff --git a/py/builtinevex.c b/py/builtinevex.c
index 800a20223aada..4e1c6a66d188f 100644
--- a/py/builtinevex.c
+++ b/py/builtinevex.c
@@ -54,7 +54,7 @@ STATIC mp_obj_t code_execute(mp_obj_code_t *self, mp_obj_dict_t *globals, mp_obj
     // the correct one
     if (mp_obj_is_type(self->module_fun, &mp_type_fun_bc)) {
         mp_obj_fun_bc_t *fun_bc = MP_OBJ_TO_PTR(self->module_fun);
-        fun_bc->globals = globals;
+        ((mp_module_context_t *)fun_bc->context)->module.globals = globals;
     }
 
     // execute code
diff --git a/py/builtinimport.c b/py/builtinimport.c
index 3e336633d9d08..094959f97d381 100644
--- a/py/builtinimport.c
+++ b/py/builtinimport.c
@@ -146,28 +146,28 @@ STATIC mp_import_stat_t stat_top_level_dir_or_file(qstr mod_name, vstr_t *dest)
 }
 
 #if MICROPY_MODULE_FROZEN_STR || MICROPY_ENABLE_COMPILER
-STATIC void do_load_from_lexer(mp_obj_t module_obj, mp_lexer_t *lex) {
+STATIC void do_load_from_lexer(mp_module_context_t *context, mp_lexer_t *lex) {
     #if MICROPY_PY___FILE__
     qstr source_name = lex->source_name;
-    mp_store_attr(module_obj, MP_QSTR___file__, MP_OBJ_NEW_QSTR(source_name));
+    mp_store_attr(MP_OBJ_FROM_PTR(&context->module), MP_QSTR___file__, MP_OBJ_NEW_QSTR(source_name));
     #endif
 
     // parse, compile and execute the module in its context
-    mp_obj_dict_t *mod_globals = mp_obj_module_get_globals(module_obj);
+    mp_obj_dict_t *mod_globals = context->module.globals;
     mp_parse_compile_execute(lex, MP_PARSE_FILE_INPUT, mod_globals, mod_globals);
 }
 #endif
 
 #if (MICROPY_HAS_FILE_READER && MICROPY_PERSISTENT_CODE_LOAD) || MICROPY_MODULE_FROZEN_MPY
-STATIC void do_execute_raw_code(mp_obj_t module_obj, mp_raw_code_t *raw_code, const char *source_name) {
+STATIC void do_execute_raw_code(mp_module_context_t *context, const mp_raw_code_t *rc, const mp_module_context_t *mc, const char *source_name) {
     (void)source_name;
 
     #if MICROPY_PY___FILE__
-    mp_store_attr(module_obj, MP_QSTR___file__, MP_OBJ_NEW_QSTR(qstr_from_str(source_name)));
+    mp_store_attr(MP_OBJ_FROM_PTR(&context->module), MP_QSTR___file__, MP_OBJ_NEW_QSTR(qstr_from_str(source_name)));
     #endif
 
     // execute the module in its context
-    mp_obj_dict_t *mod_globals = mp_obj_module_get_globals(module_obj);
+    mp_obj_dict_t *mod_globals = context->module.globals;
 
     // save context
     mp_obj_dict_t *volatile old_globals = mp_globals_get();
@@ -179,7 +179,7 @@ STATIC void do_execute_raw_code(mp_obj_t module_obj, mp_raw_code_t *raw_code, co
 
     nlr_buf_t nlr;
     if (nlr_push(&nlr) == 0) {
-        mp_obj_t module_fun = mp_make_function_from_raw_code(raw_code, MP_OBJ_NULL, MP_OBJ_NULL);
+        mp_obj_t module_fun = mp_make_function_from_raw_code(rc, mc, NULL);
         mp_call_function_0(module_fun);
 
         // finish nlr block, restore context
@@ -195,7 +195,7 @@ STATIC void do_execute_raw_code(mp_obj_t module_obj, mp_raw_code_t *raw_code, co
 }
 #endif
 
-STATIC void do_load(mp_obj_t module_obj, vstr_t *file) {
+STATIC void do_load(mp_module_context_t *module_obj, vstr_t *file) {
     #if MICROPY_MODULE_FROZEN || MICROPY_ENABLE_COMPILER || (MICROPY_PERSISTENT_CODE_LOAD && MICROPY_HAS_FILE_READER)
     const char *file_str = vstr_null_terminated_str(file);
     #endif
@@ -222,7 +222,9 @@ STATIC void do_load(mp_obj_t module_obj, vstr_t *file) {
         // its data) in the list of frozen files, execute it.
         #if MICROPY_MODULE_FROZEN_MPY
         if (frozen_type == MP_FROZEN_MPY) {
-            do_execute_raw_code(module_obj, modref, file_str + frozen_path_prefix_len);
+            const mp_frozen_module_t *frozen = modref;
+            module_obj->constants = frozen->constants;
+            do_execute_raw_code(module_obj, frozen->rc, module_obj, file_str + frozen_path_prefix_len);
             return;
         }
         #endif
@@ -234,8 +236,8 @@ STATIC void do_load(mp_obj_t module_obj, vstr_t *file) {
     // the correct format and, if so, load and execute the file.
     #if MICROPY_HAS_FILE_READER && MICROPY_PERSISTENT_CODE_LOAD
     if (file_str[file->len - 3] == 'm') {
-        mp_raw_code_t *raw_code = mp_raw_code_load_file(file_str);
-        do_execute_raw_code(module_obj, raw_code, file_str);
+        mp_compiled_module_t cm = mp_raw_code_load_file(file_str, module_obj);
+        do_execute_raw_code(module_obj, cm.rc, cm.context, file_str);
         return;
     }
     #endif
@@ -434,7 +436,7 @@ STATIC mp_obj_t process_import_at_level(qstr full_mod_name, qstr level_mod_name,
             size_t orig_path_len = path->len;
             vstr_add_str(path, PATH_SEP_CHAR "__init__.py");
             if (stat_file_py_or_mpy(path) == MP_IMPORT_STAT_FILE) {
-                do_load(module_obj, path);
+                do_load(MP_OBJ_TO_PTR(module_obj), path);
             } else {
                 // No-op. Nothing to load.
                 // mp_warning("%s is imported as namespace package", vstr_str(&path));
@@ -443,7 +445,7 @@ STATIC mp_obj_t process_import_at_level(qstr full_mod_name, qstr level_mod_name,
             path->len = orig_path_len;
         } else { // MP_IMPORT_STAT_FILE
             // File -- execute "path.(m)py".
-            do_load(module_obj, path);
+            do_load(MP_OBJ_TO_PTR(module_obj), path);
             // Note: This should be the last component in the import path.  If
             // there are remaining components then it's an ImportError
             // because the current path(the module that was just loaded) is
diff --git a/py/compile.c b/py/compile.c
index 8ebcc2289fe63..92736e22e5612 100644
--- a/py/compile.c
+++ b/py/compile.c
@@ -35,6 +35,7 @@
 #include "py/compile.h"
 #include "py/runtime.h"
 #include "py/asmbase.h"
+#include "py/nativeglue.h"
 #include "py/persistentcode.h"
 
 #if MICROPY_ENABLE_COMPILER
@@ -88,7 +89,7 @@ typedef enum {
 #if MICROPY_EMIT_NATIVE && MICROPY_DYNAMIC_COMPILER
 
 #define NATIVE_EMITTER(f) emit_native_table[mp_dynamic_compiler.native_arch]->emit_##f
-#define NATIVE_EMITTER_TABLE emit_native_table[mp_dynamic_compiler.native_arch]
+#define NATIVE_EMITTER_TABLE (emit_native_table[mp_dynamic_compiler.native_arch])
 
 STATIC const emit_method_table_t *emit_native_table[] = {
     NULL,
@@ -121,7 +122,7 @@ STATIC const emit_method_table_t *emit_native_table[] = {
 #else
 #error "unknown native emitter"
 #endif
-#define NATIVE_EMITTER_TABLE &NATIVE_EMITTER(method_table)
+#define NATIVE_EMITTER_TABLE (&NATIVE_EMITTER(method_table))
 #endif
 
 #if MICROPY_EMIT_INLINE_ASM && MICROPY_DYNAMIC_COMPILER
@@ -162,8 +163,6 @@ STATIC const emit_inline_asm_method_table_t *emit_asm_table[] = {
 
 // elements in this struct are ordered to make it compact
 typedef struct _compiler_t {
-    qstr source_file;
-
     uint8_t is_repl;
     uint8_t pass; // holds enum type pass_kind_t
     uint8_t have_star;
@@ -185,7 +184,10 @@ typedef struct _compiler_t {
     scope_t *scope_head;
     scope_t *scope_cur;
 
+    mp_emit_common_t emit_common;
+
     emit_t *emit;                                   // current emitter
+    emit_t *emit_bc;
     #if NEED_METHOD_TABLE
     const emit_method_table_t *emit_method_table;   // current emit method table
     #endif
@@ -196,6 +198,72 @@ typedef struct _compiler_t {
     #endif
 } compiler_t;
 
+/******************************************************************************/
+// mp_emit_common_t helper functions
+// These are defined here so they can be inlined, to reduce code size.
+
+STATIC void mp_emit_common_init(mp_emit_common_t *emit, qstr source_file) {
+    #if MICROPY_EMIT_BYTECODE_USES_QSTR_TABLE
+    mp_map_init(&emit->qstr_map, 1);
+
+    // add the source file as the first entry in the qstr table
+    mp_map_elem_t *elem = mp_map_lookup(&emit->qstr_map, MP_OBJ_NEW_QSTR(source_file), MP_MAP_LOOKUP_ADD_IF_NOT_FOUND);
+    elem->value = MP_OBJ_NEW_SMALL_INT(0);
+    #endif
+}
+
+STATIC void mp_emit_common_start_pass(mp_emit_common_t *emit, pass_kind_t pass) {
+    emit->pass = pass;
+    if (pass == MP_PASS_STACK_SIZE) {
+        emit->ct_cur_obj_base = emit->ct_cur_obj;
+    } else if (pass > MP_PASS_STACK_SIZE) {
+        emit->ct_cur_obj = emit->ct_cur_obj_base;
+    }
+    if (pass == MP_PASS_EMIT) {
+        if (emit->ct_cur_child == 0) {
+            emit->children = NULL;
+        } else {
+            emit->children = m_new0(mp_raw_code_t *, emit->ct_cur_child);
+        }
+    }
+    emit->ct_cur_child = 0;
+}
+
+STATIC void mp_emit_common_finalise(mp_emit_common_t *emit, bool has_native_code) {
+    emit->ct_cur_obj += has_native_code; // allocate an additional slot for &mp_fun_table
+    emit->const_table = m_new0(mp_uint_t, emit->ct_cur_obj);
+    emit->ct_cur_obj = has_native_code; // reserve slot 0 for &mp_fun_table
+    #if MICROPY_EMIT_NATIVE
+    if (has_native_code) {
+        // store mp_fun_table pointer at the start of the constant table
+        emit->const_table[0] = (mp_uint_t)(uintptr_t)&mp_fun_table;
+    }
+    #endif
+}
+
+STATIC void mp_emit_common_populate_module_context(mp_emit_common_t *emit, qstr source_file, mp_module_context_t *context) {
+    #if MICROPY_EMIT_BYTECODE_USES_QSTR_TABLE
+    size_t qstr_map_used = emit->qstr_map.used;
+    mp_module_context_alloc_tables(context, qstr_map_used, emit->ct_cur_obj);
+    for (size_t i = 0; i < emit->qstr_map.alloc; ++i) {
+        if (mp_map_slot_is_filled(&emit->qstr_map, i)) {
+            size_t idx = MP_OBJ_SMALL_INT_VALUE(emit->qstr_map.table[i].value);
+            qstr qst = MP_OBJ_QSTR_VALUE(emit->qstr_map.table[i].key);
+            context->constants.qstr_table[idx] = qst;
+        }
+    }
+    #else
+    mp_module_context_alloc_tables(context, 0, emit->ct_cur_obj);
+    context->constants.source_file = source_file;
+    #endif
+
+    if (emit->ct_cur_obj > 0) {
+        memcpy(context->constants.obj_table, emit->const_table, emit->ct_cur_obj * sizeof(mp_uint_t));
+    }
+}
+
+/******************************************************************************/
+
 STATIC void compile_error_set_line(compiler_t *comp, mp_parse_node_t pn) {
     // if the line of the error is unknown then try to update it from the pn
     if (comp->compile_error_line == 0 && MP_PARSE_NODE_IS_STRUCT(pn)) {
@@ -246,7 +314,7 @@ STATIC void compile_decrease_except_level(compiler_t *comp) {
 }
 
 STATIC scope_t *scope_new_and_link(compiler_t *comp, scope_kind_t kind, mp_parse_node_t pn, uint emit_options) {
-    scope_t *scope = scope_new(kind, pn, comp->source_file, emit_options);
+    scope_t *scope = scope_new(kind, pn, emit_options);
     scope->parent = comp->scope_cur;
     scope->next = NULL;
     if (comp->scope_head == NULL) {
@@ -290,7 +358,8 @@ STATIC void compile_generic_all_nodes(compiler_t *comp, mp_parse_node_struct_t *
 STATIC void compile_load_id(compiler_t *comp, qstr qst) {
     if (comp->pass == MP_PASS_SCOPE) {
         mp_emit_common_get_id_for_load(comp->scope_cur, qst);
-    } else {
+    }
+    {
         #if NEED_METHOD_TABLE
         mp_emit_common_id_op(comp->emit, &comp->emit_method_table->load_id, comp->scope_cur, qst);
         #else
@@ -302,7 +371,8 @@ STATIC void compile_load_id(compiler_t *comp, qstr qst) {
 STATIC void compile_store_id(compiler_t *comp, qstr qst) {
     if (comp->pass == MP_PASS_SCOPE) {
         mp_emit_common_get_id_for_modification(comp->scope_cur, qst);
-    } else {
+    }
+    {
         #if NEED_METHOD_TABLE
         mp_emit_common_id_op(comp->emit, &comp->emit_method_table->store_id, comp->scope_cur, qst);
         #else
@@ -314,7 +384,8 @@ STATIC void compile_store_id(compiler_t *comp, qstr qst) {
 STATIC void compile_delete_id(compiler_t *comp, qstr qst) {
     if (comp->pass == MP_PASS_SCOPE) {
         mp_emit_common_get_id_for_modification(comp->scope_cur, qst);
-    } else {
+    }
+    {
         #if NEED_METHOD_TABLE
         mp_emit_common_id_op(comp->emit, &comp->emit_method_table->delete_id, comp->scope_cur, qst);
         #else
@@ -819,7 +890,7 @@ STATIC bool compile_built_in_decorator(compiler_t *comp, size_t name_len, mp_par
         compile_syntax_error(comp, name_nodes[1], MP_ERROR_TEXT("invalid micropython decorator"));
     }
 
-    #if MICROPY_DYNAMIC_COMPILER
+    #if MICROPY_EMIT_NATIVE && MICROPY_DYNAMIC_COMPILER
     if (*emit_options == MP_EMIT_OPT_NATIVE_PYTHON || *emit_options == MP_EMIT_OPT_VIPER) {
         if (emit_native_table[mp_dynamic_compiler.native_arch] == NULL) {
             compile_syntax_error(comp, name_nodes[1], MP_ERROR_TEXT("invalid arch"));
@@ -2082,6 +2153,7 @@ STATIC void compile_lambdef(compiler_t *comp, mp_parse_node_struct_t *pns) {
 STATIC void compile_namedexpr_helper(compiler_t *comp, mp_parse_node_t pn_name, mp_parse_node_t pn_expr) {
     if (!MP_PARSE_NODE_IS_ID(pn_name)) {
         compile_syntax_error(comp, (mp_parse_node_t)pn_name, MP_ERROR_TEXT("can't assign to expression"));
+        return; // because pn_name is not a valid qstr (in compile_store_id below)
     }
     compile_node(comp, pn_expr);
     EMIT(dup_top);
@@ -2814,6 +2886,7 @@ STATIC void compile_scope_func_lambda_param(compiler_t *comp, mp_parse_node_t pn
             // comes before a star, so counts as a positional parameter
             comp->scope_cur->num_pos_args += 1;
         }
+        mp_emit_common_use_qstr(&comp->emit_common, param_name);
     } else {
         assert(MP_PARSE_NODE_IS_STRUCT(pn));
         pns = (mp_parse_node_struct_t *)pn;
@@ -2827,6 +2900,7 @@ STATIC void compile_scope_func_lambda_param(compiler_t *comp, mp_parse_node_t pn
                 // comes before a star, so counts as a positional parameter
                 comp->scope_cur->num_pos_args += 1;
             }
+            mp_emit_common_use_qstr(&comp->emit_common, param_name);
         } else if (MP_PARSE_NODE_STRUCT_KIND(pns) == pn_star) {
             if (comp->have_star) {
                 // more than one star
@@ -2976,6 +3050,7 @@ STATIC void compile_scope(compiler_t *comp, scope_t *scope, pass_kind_t pass) {
     comp->pass = pass;
     comp->scope_cur = scope;
     comp->next_label = 0;
+    mp_emit_common_start_pass(&comp->emit_common, pass);
     EMIT_ARG(start_pass, pass, scope);
     reserve_labels_for_native(comp, 6); // used by native's start_pass
 
@@ -2984,6 +3059,14 @@ STATIC void compile_scope(compiler_t *comp, scope_t *scope, pass_kind_t pass) {
         // they will be computed in this first pass
         scope->stack_size = 0;
         scope->exc_stack_size = 0;
+
+        #if MICROPY_EMIT_NATIVE
+        if (scope->emit_options == MP_EMIT_OPT_NATIVE_PYTHON || scope->emit_options == MP_EMIT_OPT_VIPER) {
+            // allow native code to perfom basic tasks during the pass scope
+            // note: the first argument passed here is mp_emit_common_t, not the native emitter context
+            NATIVE_EMITTER_TABLE->start_pass((void *)&comp->emit_common, comp->pass, scope);
+        }
+        #endif
     }
 
     // compile
@@ -3064,6 +3147,7 @@ STATIC void compile_scope(compiler_t *comp, scope_t *scope, pass_kind_t pass) {
         if (comp->pass == MP_PASS_SCOPE) {
             scope_find_or_add_id(comp->scope_cur, qstr_arg, ID_INFO_KIND_LOCAL);
             scope->num_pos_args = 1;
+            mp_emit_common_use_qstr(&comp->emit_common, MP_QSTR__star_);
         }
 
         // Set the source line number for the start of the comprehension
@@ -3296,9 +3380,10 @@ STATIC void compile_scope_inline_asm(compiler_t *comp, scope_t *scope, pass_kind
                 f, mp_asm_base_get_code_size((mp_asm_base_t *)comp->emit_inline_asm),
                 NULL,
                 #if MICROPY_PERSISTENT_CODE_SAVE
-                0, 0, 0, 0, NULL,
+                0,
+                0, 0, NULL,
                 #endif
-                comp->scope_cur->num_pos_args, 0, type_sig);
+                0, comp->scope_cur->num_pos_args, type_sig);
         }
     }
 
@@ -3310,7 +3395,7 @@ STATIC void compile_scope_inline_asm(compiler_t *comp, scope_t *scope, pass_kind
 }
 #endif
 
-STATIC void scope_compute_things(scope_t *scope) {
+STATIC void scope_compute_things(scope_t *scope, mp_emit_common_t *emit_common) {
     // in MicroPython we put the *x parameter after all other parameters (except **y)
     if (scope->scope_flags & MP_SCOPE_FLAG_VARARGS) {
         id_info_t *id_param = NULL;
@@ -3399,6 +3484,7 @@ STATIC void scope_compute_things(scope_t *scope) {
             }
             scope->num_pos_args += num_free; // free vars are counted as params for passing them into the function
             scope->num_locals += num_free;
+            mp_emit_common_use_qstr(emit_common, MP_QSTR__star_);
         }
     }
 }
@@ -3406,15 +3492,15 @@ STATIC void scope_compute_things(scope_t *scope) {
 #if !MICROPY_PERSISTENT_CODE_SAVE
 STATIC
 #endif
-mp_raw_code_t *mp_compile_to_raw_code(mp_parse_tree_t *parse_tree, qstr source_file, bool is_repl) {
+mp_compiled_module_t mp_compile_to_raw_code(mp_parse_tree_t *parse_tree, qstr source_file, bool is_repl, mp_module_context_t *context) {
     // put compiler state on the stack, it's relatively small
     compiler_t comp_state = {0};
     compiler_t *comp = &comp_state;
 
-    comp->source_file = source_file;
     comp->is_repl = is_repl;
     comp->break_label = INVALID_LABEL;
     comp->continue_label = INVALID_LABEL;
+    mp_emit_common_init(&comp->emit_common, source_file);
 
     // create the module scope
     #if MICROPY_EMIT_NATIVE
@@ -3425,10 +3511,11 @@ mp_raw_code_t *mp_compile_to_raw_code(mp_parse_tree_t *parse_tree, qstr source_f
     scope_t *module_scope = scope_new_and_link(comp, SCOPE_MODULE, parse_tree->root, emit_opt);
 
     // create standard emitter; it's used at least for MP_PASS_SCOPE
-    emit_t *emit_bc = emit_bc_new();
+    emit_t *emit_bc = emit_bc_new(&comp->emit_common);
 
-    // compile pass 1
+    // compile MP_PASS_SCOPE
     comp->emit = emit_bc;
+    comp->emit_bc = emit_bc;
     #if MICROPY_EMIT_NATIVE
     comp->emit_method_table = &emit_bc_method_table;
     #endif
@@ -3458,14 +3545,24 @@ mp_raw_code_t *mp_compile_to_raw_code(mp_parse_tree_t *parse_tree, qstr source_f
     }
 
     // compute some things related to scope and identifiers
+    bool has_native_code = false;
     for (scope_t *s = comp->scope_head; s != NULL && comp->compile_error == MP_OBJ_NULL; s = s->next) {
-        scope_compute_things(s);
+        #if MICROPY_EMIT_NATIVE
+        if (s->emit_options == MP_EMIT_OPT_NATIVE_PYTHON || s->emit_options == MP_EMIT_OPT_VIPER) {
+            has_native_code = true;
+        }
+        #endif
+
+        scope_compute_things(s, &comp->emit_common);
     }
 
     // set max number of labels now that it's calculated
     emit_bc_set_max_num_labels(emit_bc, max_num_labels);
 
-    // compile pass 2 and 3
+    // finalise and allocate the constant table
+    mp_emit_common_finalise(&comp->emit_common, has_native_code);
+
+    // compile MP_PASS_STACK_SIZE, MP_PASS_CODE_SIZE, MP_PASS_EMIT
     #if MICROPY_EMIT_NATIVE
     emit_t *emit_native = NULL;
     #endif
@@ -3505,7 +3602,7 @@ mp_raw_code_t *mp_compile_to_raw_code(mp_parse_tree_t *parse_tree, qstr source_f
                 case MP_EMIT_OPT_NATIVE_PYTHON:
                 case MP_EMIT_OPT_VIPER:
                     if (emit_native == NULL) {
-                        emit_native = NATIVE_EMITTER(new)(&comp->compile_error, &comp->next_label, max_num_labels);
+                        emit_native = NATIVE_EMITTER(new)(&comp->emit_common, &comp->compile_error, &comp->next_label, max_num_labels);
                     }
                     comp->emit_method_table = NATIVE_EMITTER_TABLE;
                     comp->emit = emit_native;
@@ -3540,10 +3637,33 @@ mp_raw_code_t *mp_compile_to_raw_code(mp_parse_tree_t *parse_tree, qstr source_f
         // number for the start of this scope
         compile_error_set_line(comp, comp->scope_cur->pn);
         // add a traceback to the exception using relevant source info
-        mp_obj_exception_add_traceback(comp->compile_error, comp->source_file,
+        mp_obj_exception_add_traceback(comp->compile_error, source_file,
             comp->compile_error_line, comp->scope_cur->simple_name);
     }
 
+    // construct the global qstr/const table for this module
+    mp_compiled_module_t cm;
+    cm.rc = module_scope->raw_code;
+    cm.context = context;
+    #if MICROPY_PERSISTENT_CODE_SAVE
+    cm.has_native = has_native_code;
+    cm.n_qstr = comp->emit_common.qstr_map.used;
+    cm.n_obj = comp->emit_common.ct_cur_obj;
+    #endif
+    if (comp->compile_error == MP_OBJ_NULL) {
+        mp_emit_common_populate_module_context(&comp->emit_common, source_file, context);
+
+        #if MICROPY_DEBUG_PRINTERS
+        // now that the module context is valid, the raw codes can be printed
+        if (mp_verbose_flag >= 2) {
+            for (scope_t *s = comp->scope_head; s != NULL; s = s->next) {
+                mp_raw_code_t *rc = s->raw_code;
+                mp_bytecode_print(&mp_plat_print, rc, rc->fun_data, rc->fun_data_len, &cm.context->constants);
+            }
+        }
+        #endif
+    }
+
     // free the emitters
 
     emit_bc_free(emit_bc);
@@ -3562,7 +3682,6 @@ mp_raw_code_t *mp_compile_to_raw_code(mp_parse_tree_t *parse_tree, qstr source_f
     mp_parse_tree_clear(parse_tree);
 
     // free the scopes
-    mp_raw_code_t *outer_raw_code = module_scope->raw_code;
     for (scope_t *s = module_scope; s;) {
         scope_t *next = s->next;
         scope_free(s);
@@ -3571,15 +3690,17 @@ mp_raw_code_t *mp_compile_to_raw_code(mp_parse_tree_t *parse_tree, qstr source_f
 
     if (comp->compile_error != MP_OBJ_NULL) {
         nlr_raise(comp->compile_error);
-    } else {
-        return outer_raw_code;
     }
+
+    return cm;
 }
 
 mp_obj_t mp_compile(mp_parse_tree_t *parse_tree, qstr source_file, bool is_repl) {
-    mp_raw_code_t *rc = mp_compile_to_raw_code(parse_tree, source_file, is_repl);
+    mp_module_context_t *context = m_new_obj(mp_module_context_t);
+    context->module.globals = mp_globals_get();
+    mp_compiled_module_t cm = mp_compile_to_raw_code(parse_tree, source_file, is_repl, context);
     // return function that executes the outer module
-    return mp_make_function_from_raw_code(rc, MP_OBJ_NULL, MP_OBJ_NULL);
+    return mp_make_function_from_raw_code(cm.rc, cm.context, NULL);
 }
 
 #endif // MICROPY_ENABLE_COMPILER
diff --git a/py/compile.h b/py/compile.h
index 1ad1f5e9cd3fc..ae87bf2a04cba 100644
--- a/py/compile.h
+++ b/py/compile.h
@@ -32,11 +32,12 @@
 
 // the compiler will raise an exception if an error occurred
 // the compiler will clear the parse tree before it returns
+// mp_globals_get() will be used for the context
 mp_obj_t mp_compile(mp_parse_tree_t *parse_tree, qstr source_file, bool is_repl);
 
 #if MICROPY_PERSISTENT_CODE_SAVE
 // this has the same semantics as mp_compile
-mp_raw_code_t *mp_compile_to_raw_code(mp_parse_tree_t *parse_tree, qstr source_file, bool is_repl);
+mp_compiled_module_t mp_compile_to_raw_code(mp_parse_tree_t *parse_tree, qstr source_file, bool is_repl, mp_module_context_t *globals);
 #endif
 
 // this is implemented in runtime.c
diff --git a/py/dynruntime.h b/py/dynruntime.h
index fdb91ed37e98c..b9dca60d1389d 100644
--- a/py/dynruntime.h
+++ b/py/dynruntime.h
@@ -30,6 +30,7 @@
 // MicroPython runtime API defined in py/obj.h and py/runtime.h.
 
 #include "py/nativeglue.h"
+#include "py/objfun.h"
 #include "py/objstr.h"
 #include "py/objtype.h"
 
@@ -177,8 +178,8 @@ static inline mp_obj_t mp_obj_len_dyn(mp_obj_t o) {
 #define mp_unary_op(op, obj)        (mp_fun_table.unary_op((op), (obj)))
 #define mp_binary_op(op, lhs, rhs)  (mp_fun_table.binary_op((op), (lhs), (rhs)))
 
-#define mp_make_function_from_raw_code(rc, def_args, def_kw_args) \
-    (mp_fun_table.make_function_from_raw_code((rc), (def_args), (def_kw_args)))
+#define mp_make_function_from_raw_code(rc, context, def_args) \
+    (mp_fun_table.make_function_from_raw_code((rc), (context), (def_args)))
 
 #define mp_call_function_n_kw(fun, n_args, n_kw, args) \
     (mp_fun_table.call_function_n_kw((fun), (n_args) | ((n_kw) << 8), args))
@@ -187,11 +188,10 @@ static inline mp_obj_t mp_obj_len_dyn(mp_obj_t o) {
     (mp_fun_table.arg_check_num_sig((n_args), (n_kw), MP_OBJ_FUN_MAKE_SIG((n_args_min), (n_args_max), (takes_kw))))
 
 #define MP_DYNRUNTIME_INIT_ENTRY \
-    mp_obj_t old_globals = mp_fun_table.swap_globals(self->globals); \
+    mp_obj_t old_globals = mp_fun_table.swap_globals(self->context->module.globals); \
     mp_raw_code_t rc; \
     rc.kind = MP_CODE_NATIVE_VIPER; \
     rc.scope_flags = 0; \
-    rc.const_table = (void *)self->const_table; \
     (void)rc;
 
 #define MP_DYNRUNTIME_INIT_EXIT \
@@ -199,7 +199,7 @@ static inline mp_obj_t mp_obj_len_dyn(mp_obj_t o) {
     return mp_const_none;
 
 #define MP_DYNRUNTIME_MAKE_FUNCTION(f) \
-    (mp_make_function_from_raw_code((rc.fun_data = (f), &rc), MP_OBJ_NULL, MP_OBJ_NULL))
+    (mp_make_function_from_raw_code((rc.fun_data = (f), &rc), self->context, NULL))
 
 #define mp_import_name(name, fromlist, level) \
     (mp_fun_table.import_name((name), (fromlist), (level)))
diff --git a/py/emit.h b/py/emit.h
index 13bd3e9b2eb3f..6f3593a0e8215 100644
--- a/py/emit.h
+++ b/py/emit.h
@@ -92,6 +92,18 @@ typedef enum {
 
 typedef struct _emit_t emit_t;
 
+typedef struct _mp_emit_common_t {
+    pass_kind_t pass;
+    uint16_t ct_cur_obj_base;
+    uint16_t ct_cur_obj;
+    uint16_t ct_cur_child;
+    mp_uint_t *const_table;
+    mp_raw_code_t **children;
+    #if MICROPY_EMIT_BYTECODE_USES_QSTR_TABLE
+    mp_map_t qstr_map;
+    #endif
+} mp_emit_common_t;
+
 typedef struct _mp_emit_method_table_id_ops_t {
     void (*local)(emit_t *emit, qstr qst, mp_uint_t local_num, int kind);
     void (*global)(emit_t *emit, qstr qst, int kind);
@@ -99,7 +111,7 @@ typedef struct _mp_emit_method_table_id_ops_t {
 
 typedef struct _emit_method_table_t {
     #if MICROPY_DYNAMIC_COMPILER
-    emit_t *(*emit_new)(mp_obj_t * error_slot, uint *label_slot, mp_uint_t max_num_labels);
+    emit_t *(*emit_new)(mp_emit_common_t * emit_common, mp_obj_t *error_slot, uint *label_slot, mp_uint_t max_num_labels);
     void (*emit_free)(emit_t *emit);
     #endif
 
@@ -161,6 +173,28 @@ typedef struct _emit_method_table_t {
     void (*end_except_handler)(emit_t *emit);
 } emit_method_table_t;
 
+#if MICROPY_EMIT_BYTECODE_USES_QSTR_TABLE
+qstr_short_t mp_emit_common_use_qstr(mp_emit_common_t *emit, qstr qst);
+#else
+static inline qstr_short_t mp_emit_common_use_qstr(mp_emit_common_t *emit, qstr qst) {
+    return qst;
+}
+#endif
+
+static inline size_t mp_emit_common_alloc_const_obj(mp_emit_common_t *emit, mp_obj_t obj) {
+    if (emit->pass == MP_PASS_EMIT) {
+        emit->const_table[emit->ct_cur_obj] = (mp_uint_t)obj;
+    }
+    return emit->ct_cur_obj++;
+}
+
+static inline size_t mp_emit_common_alloc_const_child(mp_emit_common_t *emit, mp_raw_code_t *rc) {
+    if (emit->pass == MP_PASS_EMIT) {
+        emit->children[emit->ct_cur_child] = rc;
+    }
+    return emit->ct_cur_child++;
+}
+
 static inline void mp_emit_common_get_id_for_load(scope_t *scope, qstr qst) {
     scope_find_or_add_id(scope, qst, ID_INFO_KIND_GLOBAL_IMPLICIT);
 }
@@ -180,13 +214,13 @@ extern const mp_emit_method_table_id_ops_t mp_emit_bc_method_table_load_id_ops;
 extern const mp_emit_method_table_id_ops_t mp_emit_bc_method_table_store_id_ops;
 extern const mp_emit_method_table_id_ops_t mp_emit_bc_method_table_delete_id_ops;
 
-emit_t *emit_bc_new(void);
-emit_t *emit_native_x64_new(mp_obj_t *error_slot, uint *label_slot, mp_uint_t max_num_labels);
-emit_t *emit_native_x86_new(mp_obj_t *error_slot, uint *label_slot, mp_uint_t max_num_labels);
-emit_t *emit_native_thumb_new(mp_obj_t *error_slot, uint *label_slot, mp_uint_t max_num_labels);
-emit_t *emit_native_arm_new(mp_obj_t *error_slot, uint *label_slot, mp_uint_t max_num_labels);
-emit_t *emit_native_xtensa_new(mp_obj_t *error_slot, uint *label_slot, mp_uint_t max_num_labels);
-emit_t *emit_native_xtensawin_new(mp_obj_t *error_slot, uint *label_slot, mp_uint_t max_num_labels);
+emit_t *emit_bc_new(mp_emit_common_t *emit_common);
+emit_t *emit_native_x64_new(mp_emit_common_t *emit_common, mp_obj_t *error_slot, uint *label_slot, mp_uint_t max_num_labels);
+emit_t *emit_native_x86_new(mp_emit_common_t *emit_common, mp_obj_t *error_slot, uint *label_slot, mp_uint_t max_num_labels);
+emit_t *emit_native_thumb_new(mp_emit_common_t *emit_common, mp_obj_t *error_slot, uint *label_slot, mp_uint_t max_num_labels);
+emit_t *emit_native_arm_new(mp_emit_common_t *emit_common, mp_obj_t *error_slot, uint *label_slot, mp_uint_t max_num_labels);
+emit_t *emit_native_xtensa_new(mp_emit_common_t *emit_common, mp_obj_t *error_slot, uint *label_slot, mp_uint_t max_num_labels);
+emit_t *emit_native_xtensawin_new(mp_emit_common_t *emit_common, mp_obj_t *error_slot, uint *label_slot, mp_uint_t max_num_labels);
 
 void emit_bc_set_max_num_labels(emit_t *emit, mp_uint_t max_num_labels);
 
diff --git a/py/emitbc.c b/py/emitbc.c
index ca74046033c76..c04701ca7841c 100644
--- a/py/emitbc.c
+++ b/py/emitbc.c
@@ -36,8 +36,7 @@
 
 #if MICROPY_ENABLE_COMPILER
 
-#define BYTES_FOR_INT ((MP_BYTES_PER_OBJ_WORD * 8 + 6) / 7)
-#define DUMMY_DATA_SIZE (BYTES_FOR_INT)
+#define DUMMY_DATA_SIZE (MP_ENCODE_UINT_MAX_BYTES)
 
 struct _emit_t {
     // Accessed as mp_obj_t, so must be aligned as such, and we rely on the
@@ -50,6 +49,7 @@ struct _emit_t {
 
     int stack_size;
 
+    mp_emit_common_t *emit_common;
     scope_t *scope;
 
     mp_uint_t last_source_line_offset;
@@ -66,17 +66,11 @@ struct _emit_t {
 
     size_t n_info;
     size_t n_cell;
-
-    #if MICROPY_PERSISTENT_CODE
-    uint16_t ct_cur_obj;
-    uint16_t ct_num_obj;
-    uint16_t ct_cur_raw_code;
-    #endif
-    mp_uint_t *const_table;
 };
 
-emit_t *emit_bc_new(void) {
+emit_t *emit_bc_new(mp_emit_common_t *emit_common) {
     emit_t *emit = m_new0(emit_t, 1);
+    emit->emit_common = emit_common;
     return emit;
 }
 
@@ -90,26 +84,9 @@ void emit_bc_free(emit_t *emit) {
     m_del_obj(emit_t, emit);
 }
 
-typedef byte *(*emit_allocator_t)(emit_t *emit, int nbytes);
-
-STATIC void emit_write_uint(emit_t *emit, emit_allocator_t allocator, mp_uint_t val) {
-    // We store each 7 bits in a separate byte, and that's how many bytes needed
-    byte buf[BYTES_FOR_INT];
-    byte *p = buf + sizeof(buf);
-    // We encode in little-ending order, but store in big-endian, to help decoding
-    do {
-        *--p = val & 0x7f;
-        val >>= 7;
-    } while (val != 0);
-    byte *c = allocator(emit, buf + sizeof(buf) - p);
-    while (p != buf + sizeof(buf) - 1) {
-        *c++ = *p++ | 0x80;
-    }
-    *c = *p;
-}
-
 // all functions must go through this one to emit code info
-STATIC byte *emit_get_cur_to_write_code_info(emit_t *emit, int num_bytes_to_write) {
+STATIC uint8_t *emit_get_cur_to_write_code_info(void *emit_in, size_t num_bytes_to_write) {
+    emit_t *emit = emit_in;
     if (emit->pass < MP_PASS_EMIT) {
         emit->code_info_offset += num_bytes_to_write;
         return emit->dummy_data;
@@ -126,14 +103,7 @@ STATIC void emit_write_code_info_byte(emit_t *emit, byte val) {
 }
 
 STATIC void emit_write_code_info_qstr(emit_t *emit, qstr qst) {
-    #if MICROPY_PERSISTENT_CODE
-    assert((qst >> 16) == 0);
-    byte *c = emit_get_cur_to_write_code_info(emit, 2);
-    c[0] = qst;
-    c[1] = qst >> 8;
-    #else
-    emit_write_uint(emit, emit_get_cur_to_write_code_info, qst);
-    #endif
+    mp_encode_uint(emit, emit_get_cur_to_write_code_info, mp_emit_common_use_qstr(emit->emit_common, qst));
 }
 
 #if MICROPY_ENABLE_SOURCE_LINE
@@ -166,7 +136,8 @@ STATIC void emit_write_code_info_bytes_lines(emit_t *emit, mp_uint_t bytes_to_sk
 #endif
 
 // all functions must go through this one to emit byte code
-STATIC byte *emit_get_cur_to_write_bytecode(emit_t *emit, int num_bytes_to_write) {
+STATIC uint8_t *emit_get_cur_to_write_bytecode(void *emit_in, size_t num_bytes_to_write) {
+    emit_t *emit = emit_in;
     if (emit->pass < MP_PASS_EMIT) {
         emit->bytecode_offset += num_bytes_to_write;
         return emit->dummy_data;
@@ -189,12 +160,12 @@ STATIC void emit_write_bytecode_byte(emit_t *emit, int stack_adj, byte b1) {
     c[0] = b1;
 }
 
-// Similar to emit_write_bytecode_uint(), just some extra handling to encode sign
+// Similar to mp_encode_uint(), just some extra handling to encode sign
 STATIC void emit_write_bytecode_byte_int(emit_t *emit, int stack_adj, byte b1, mp_int_t num) {
     emit_write_bytecode_byte(emit, stack_adj, b1);
 
     // We store each 7 bits in a separate byte, and that's how many bytes needed
-    byte buf[BYTES_FOR_INT];
+    byte buf[MP_ENCODE_UINT_MAX_BYTES];
     byte *p = buf + sizeof(buf);
     // We encode in little-ending order, but store in big-endian, to help decoding
     do {
@@ -218,61 +189,25 @@ STATIC void emit_write_bytecode_byte_int(emit_t *emit, int stack_adj, byte b1, m
 
 STATIC void emit_write_bytecode_byte_uint(emit_t *emit, int stack_adj, byte b, mp_uint_t val) {
     emit_write_bytecode_byte(emit, stack_adj, b);
-    emit_write_uint(emit, emit_get_cur_to_write_bytecode, val);
+    mp_encode_uint(emit, emit_get_cur_to_write_bytecode, val);
 }
 
-#if MICROPY_PERSISTENT_CODE
-STATIC void emit_write_bytecode_byte_const(emit_t *emit, int stack_adj, byte b, mp_uint_t n, mp_uint_t c) {
-    if (emit->pass == MP_PASS_EMIT) {
-        emit->const_table[n] = c;
-    }
+STATIC void emit_write_bytecode_byte_const(emit_t *emit, int stack_adj, byte b, mp_uint_t n) {
     emit_write_bytecode_byte_uint(emit, stack_adj, b, n);
 }
-#endif
 
 STATIC void emit_write_bytecode_byte_qstr(emit_t *emit, int stack_adj, byte b, qstr qst) {
-    #if MICROPY_PERSISTENT_CODE
-    assert((qst >> 16) == 0);
-    mp_emit_bc_adjust_stack_size(emit, stack_adj);
-    byte *c = emit_get_cur_to_write_bytecode(emit, 3);
-    c[0] = b;
-    c[1] = qst;
-    c[2] = qst >> 8;
-    #else
-    emit_write_bytecode_byte_uint(emit, stack_adj, b, qst);
-    #endif
+    emit_write_bytecode_byte_uint(emit, stack_adj, b, mp_emit_common_use_qstr(emit->emit_common, qst));
 }
 
 STATIC void emit_write_bytecode_byte_obj(emit_t *emit, int stack_adj, byte b, mp_obj_t obj) {
-    #if MICROPY_PERSISTENT_CODE
     emit_write_bytecode_byte_const(emit, stack_adj, b,
-        emit->scope->num_pos_args + emit->scope->num_kwonly_args
-        + emit->ct_cur_obj++, (mp_uint_t)obj);
-    #else
-    // aligns the pointer so it is friendly to GC
-    emit_write_bytecode_byte(emit, stack_adj, b);
-    emit->bytecode_offset = (size_t)MP_ALIGN(emit->bytecode_offset, sizeof(mp_obj_t));
-    mp_obj_t *c = (mp_obj_t *)emit_get_cur_to_write_bytecode(emit, sizeof(mp_obj_t));
-    // Verify thar c is already uint-aligned
-    assert(c == MP_ALIGN(c, sizeof(mp_obj_t)));
-    *c = obj;
-    #endif
+        mp_emit_common_alloc_const_obj(emit->emit_common, obj));
 }
 
-STATIC void emit_write_bytecode_byte_raw_code(emit_t *emit, int stack_adj, byte b, mp_raw_code_t *rc) {
-    #if MICROPY_PERSISTENT_CODE
+STATIC void emit_write_bytecode_byte_child(emit_t *emit, int stack_adj, byte b, mp_raw_code_t *rc) {
     emit_write_bytecode_byte_const(emit, stack_adj, b,
-        emit->scope->num_pos_args + emit->scope->num_kwonly_args
-        + emit->ct_num_obj + emit->ct_cur_raw_code++, (mp_uint_t)(uintptr_t)rc);
-    #else
-    // aligns the pointer so it is friendly to GC
-    emit_write_bytecode_byte(emit, stack_adj, b);
-    emit->bytecode_offset = (size_t)MP_ALIGN(emit->bytecode_offset, sizeof(void *));
-    void **c = (void **)emit_get_cur_to_write_bytecode(emit, sizeof(void *));
-    // Verify thar c is already uint-aligned
-    assert(c == MP_ALIGN(c, sizeof(void *)));
-    *c = rc;
-    #endif
+        mp_emit_common_alloc_const_child(emit->emit_common, rc));
     #if MICROPY_PY_SYS_SETTRACE
     rc->line_of_definition = emit->last_source_line;
     #endif
@@ -343,27 +278,19 @@ void mp_emit_bc_start_pass(emit_t *emit, pass_kind_t pass, scope_t *scope) {
     }
 
     // Write number of cells and size of the source code info
-    if (pass >= MP_PASS_CODE_SIZE) {
-        MP_BC_PRELUDE_SIZE_ENCODE(emit->n_info, emit->n_cell, emit_write_code_info_byte, emit);
+    if (emit->pass >= MP_PASS_CODE_SIZE) {
+        size_t n_info = emit->n_info;
+        size_t n_cell = emit->n_cell;
+        MP_BC_PRELUDE_SIZE_ENCODE(n_info, n_cell, emit_write_code_info_byte, emit);
     }
 
     emit->n_info = emit->code_info_offset;
 
-    // Write the name and source file of this function.
+    // Write the name of this function.
     emit_write_code_info_qstr(emit, scope->simple_name);
-    emit_write_code_info_qstr(emit, scope->source_file);
-
-    #if MICROPY_PERSISTENT_CODE
-    emit->ct_cur_obj = 0;
-    emit->ct_cur_raw_code = 0;
-    #endif
-
-    if (pass == MP_PASS_EMIT) {
-        // Write argument names (needed to resolve positional args passed as
-        // keywords).  We store them as full word-sized objects for efficient access
-        // in mp_setup_code_state this is the start of the prelude and is guaranteed
-        // to be aligned on a word boundary.
 
+    // Write argument names, needed to resolve positional args passed as keywords.
+    {
         // For a given argument position (indexed by i) we need to find the
         // corresponding id_info which is a parameter, as it has the correct
         // qstr name to use as the argument name.  Note that it's not a simple
@@ -383,7 +310,7 @@ void mp_emit_bc_start_pass(emit_t *emit, pass_kind_t pass, scope_t *scope) {
                     break;
                 }
             }
-            emit->const_table[i] = (mp_uint_t)MP_OBJ_NEW_QSTR(qst);
+            emit_write_code_info_qstr(emit, qst);
         }
     }
 }
@@ -396,8 +323,6 @@ void mp_emit_bc_end_pass(emit_t *emit) {
     // check stack is back to zero size
     assert(emit->stack_size == 0);
 
-    emit_write_code_info_byte(emit, 0); // end of line number info
-
     // Calculate size of source code info section
     emit->n_info = emit->code_info_offset - emit->n_info;
 
@@ -412,39 +337,20 @@ void mp_emit_bc_end_pass(emit_t *emit) {
         }
     }
 
-    #if MICROPY_PERSISTENT_CODE
-    assert(emit->pass <= MP_PASS_STACK_SIZE || (emit->ct_num_obj == emit->ct_cur_obj));
-    emit->ct_num_obj = emit->ct_cur_obj;
-    #endif
-
     if (emit->pass == MP_PASS_CODE_SIZE) {
-        #if !MICROPY_PERSISTENT_CODE
-        // so bytecode is aligned
-        emit->code_info_offset = (size_t)MP_ALIGN(emit->code_info_offset, sizeof(mp_uint_t));
-        #endif
-
         // calculate size of total code-info + bytecode, in bytes
         emit->code_info_size = emit->code_info_offset;
         emit->bytecode_size = emit->bytecode_offset;
         emit->code_base = m_new0(byte, emit->code_info_size + emit->bytecode_size);
 
-        #if MICROPY_PERSISTENT_CODE
-        emit->const_table = m_new0(mp_uint_t,
-            emit->scope->num_pos_args + emit->scope->num_kwonly_args
-            + emit->ct_cur_obj + emit->ct_cur_raw_code);
-        #else
-        emit->const_table = m_new0(mp_uint_t,
-            emit->scope->num_pos_args + emit->scope->num_kwonly_args);
-        #endif
-
     } else if (emit->pass == MP_PASS_EMIT) {
         mp_emit_glue_assign_bytecode(emit->scope->raw_code, emit->code_base,
             #if MICROPY_PERSISTENT_CODE_SAVE || MICROPY_DEBUG_PRINTERS
             emit->code_info_size + emit->bytecode_size,
             #endif
-            emit->const_table,
+            emit->emit_common->children,
             #if MICROPY_PERSISTENT_CODE_SAVE
-            emit->ct_cur_obj, emit->ct_cur_raw_code,
+            emit->emit_common->ct_cur_child,
             #endif
             emit->scope->scope_flags);
     }
@@ -783,21 +689,21 @@ void mp_emit_bc_unpack_ex(emit_t *emit, mp_uint_t n_left, mp_uint_t n_right) {
 
 void mp_emit_bc_make_function(emit_t *emit, scope_t *scope, mp_uint_t n_pos_defaults, mp_uint_t n_kw_defaults) {
     if (n_pos_defaults == 0 && n_kw_defaults == 0) {
-        emit_write_bytecode_byte_raw_code(emit, 1, MP_BC_MAKE_FUNCTION, scope->raw_code);
+        emit_write_bytecode_byte_child(emit, 1, MP_BC_MAKE_FUNCTION, scope->raw_code);
     } else {
-        emit_write_bytecode_byte_raw_code(emit, -1, MP_BC_MAKE_FUNCTION_DEFARGS, scope->raw_code);
+        emit_write_bytecode_byte_child(emit, -1, MP_BC_MAKE_FUNCTION_DEFARGS, scope->raw_code);
     }
 }
 
 void mp_emit_bc_make_closure(emit_t *emit, scope_t *scope, mp_uint_t n_closed_over, mp_uint_t n_pos_defaults, mp_uint_t n_kw_defaults) {
     if (n_pos_defaults == 0 && n_kw_defaults == 0) {
         int stack_adj = -n_closed_over + 1;
-        emit_write_bytecode_byte_raw_code(emit, stack_adj, MP_BC_MAKE_CLOSURE, scope->raw_code);
+        emit_write_bytecode_byte_child(emit, stack_adj, MP_BC_MAKE_CLOSURE, scope->raw_code);
         emit_write_bytecode_raw_byte(emit, n_closed_over);
     } else {
         assert(n_closed_over <= 255);
         int stack_adj = -2 - (mp_int_t)n_closed_over + 1;
-        emit_write_bytecode_byte_raw_code(emit, stack_adj, MP_BC_MAKE_CLOSURE_DEFARGS, scope->raw_code);
+        emit_write_bytecode_byte_child(emit, stack_adj, MP_BC_MAKE_CLOSURE_DEFARGS, scope->raw_code);
         emit_write_bytecode_raw_byte(emit, n_closed_over);
     }
 }
diff --git a/py/emitcommon.c b/py/emitcommon.c
index 791bf398ab906..c1780d2db9afc 100644
--- a/py/emitcommon.c
+++ b/py/emitcommon.c
@@ -30,6 +30,17 @@
 
 #if MICROPY_ENABLE_COMPILER
 
+#if MICROPY_EMIT_BYTECODE_USES_QSTR_TABLE
+qstr_short_t mp_emit_common_use_qstr(mp_emit_common_t *emit, qstr qst) {
+    mp_map_elem_t *elem = mp_map_lookup(&emit->qstr_map, MP_OBJ_NEW_QSTR(qst), MP_MAP_LOOKUP_ADD_IF_NOT_FOUND);
+    if (elem->value == MP_OBJ_NULL) {
+        assert(emit->pass == MP_PASS_SCOPE);
+        elem->value = MP_OBJ_NEW_SMALL_INT(emit->qstr_map.used - 1);
+    }
+    return MP_OBJ_SMALL_INT_VALUE(elem->value);
+}
+#endif
+
 void mp_emit_common_get_id_for_modification(scope_t *scope, qstr qst) {
     // name adding/lookup
     id_info_t *id = scope_find_or_add_id(scope, qst, ID_INFO_KIND_GLOBAL_IMPLICIT);
diff --git a/py/emitglue.c b/py/emitglue.c
index 09b48682ffbd1..cd902838af7af 100644
--- a/py/emitglue.c
+++ b/py/emitglue.c
@@ -34,6 +34,7 @@
 #include "py/emitglue.h"
 #include "py/runtime0.h"
 #include "py/bc.h"
+#include "py/objfun.h"
 #include "py/profile.h"
 
 #if MICROPY_DEBUG_VERBOSE // print debugging info
@@ -63,20 +64,22 @@ void mp_emit_glue_assign_bytecode(mp_raw_code_t *rc, const byte *code,
     #if MICROPY_PERSISTENT_CODE_SAVE || MICROPY_DEBUG_PRINTERS
     size_t len,
     #endif
-    const mp_uint_t *const_table,
+    mp_raw_code_t **children,
     #if MICROPY_PERSISTENT_CODE_SAVE
-    uint16_t n_obj, uint16_t n_raw_code,
+    size_t n_children,
     #endif
     mp_uint_t scope_flags) {
 
     rc->kind = MP_CODE_BYTECODE;
     rc->scope_flags = scope_flags;
     rc->fun_data = code;
-    rc->const_table = const_table;
-    #if MICROPY_PERSISTENT_CODE_SAVE
+    #if MICROPY_PERSISTENT_CODE_SAVE || MICROPY_DEBUG_PRINTERS
     rc->fun_data_len = len;
-    rc->n_obj = n_obj;
-    rc->n_raw_code = n_raw_code;
+    #endif
+    rc->children = children;
+
+    #if MICROPY_PERSISTENT_CODE_SAVE
+    rc->n_children = n_children;
     #endif
 
     #if MICROPY_PY_SYS_SETTRACE
@@ -85,26 +88,22 @@ void mp_emit_glue_assign_bytecode(mp_raw_code_t *rc, const byte *code,
     #endif
 
     #ifdef DEBUG_PRINT
-    #if !MICROPY_DEBUG_PRINTERS
+    #if !(MICROPY_PERSISTENT_CODE_SAVE || MICROPY_DEBUG_PRINTERS)
     const size_t len = 0;
     #endif
     DEBUG_printf("assign byte code: code=%p len=" UINT_FMT " flags=%x\n", code, len, (uint)scope_flags);
     #endif
-    #if MICROPY_DEBUG_PRINTERS
-    if (mp_verbose_flag >= 2) {
-        mp_bytecode_print(&mp_plat_print, rc, code, len, const_table);
-    }
-    #endif
 }
 
 #if MICROPY_EMIT_MACHINE_CODE
-void mp_emit_glue_assign_native(mp_raw_code_t *rc, mp_raw_code_kind_t kind, void *fun_data, mp_uint_t fun_len, const mp_uint_t *const_table,
+void mp_emit_glue_assign_native(mp_raw_code_t *rc, mp_raw_code_kind_t kind, void *fun_data, mp_uint_t fun_len,
+    mp_raw_code_t **children,
     #if MICROPY_PERSISTENT_CODE_SAVE
+    size_t n_children,
     uint16_t prelude_offset,
-    uint16_t n_obj, uint16_t n_raw_code,
     uint16_t n_qstr, mp_qstr_link_entry_t *qstr_link,
     #endif
-    mp_uint_t n_pos_args, mp_uint_t scope_flags, mp_uint_t type_sig) {
+    mp_uint_t scope_flags, mp_uint_t n_pos_args, mp_uint_t type_sig) {
 
     assert(kind == MP_CODE_NATIVE_PY || kind == MP_CODE_NATIVE_VIPER || kind == MP_CODE_NATIVE_ASM);
 
@@ -135,20 +134,24 @@ void mp_emit_glue_assign_native(mp_raw_code_t *rc, mp_raw_code_kind_t kind, void
 
     rc->kind = kind;
     rc->scope_flags = scope_flags;
-    rc->n_pos_args = n_pos_args;
     rc->fun_data = fun_data;
-    rc->const_table = const_table;
-    rc->type_sig = type_sig;
 
-    #if MICROPY_PERSISTENT_CODE_SAVE
+    #if MICROPY_PERSISTENT_CODE_SAVE || MICROPY_DEBUG_PRINTERS
     rc->fun_data_len = fun_len;
+    #endif
+    rc->children = children;
+
+    #if MICROPY_PERSISTENT_CODE_SAVE
+    rc->n_children = n_children;
     rc->prelude_offset = prelude_offset;
-    rc->n_obj = n_obj;
-    rc->n_raw_code = n_raw_code;
     rc->n_qstr = n_qstr;
     rc->qstr_link = qstr_link;
     #endif
 
+    // These two entries are only needed for MP_CODE_NATIVE_ASM.
+    rc->n_pos_args = n_pos_args;
+    rc->type_sig = type_sig;
+
     #ifdef DEBUG_PRINT
     DEBUG_printf("assign native: kind=%d fun=%p len=" UINT_FMT " n_pos_args=" UINT_FMT " flags=%x\n", kind, fun_data, fun_len, n_pos_args, (uint)scope_flags);
     for (mp_uint_t i = 0; i < fun_len; i++) {
@@ -170,15 +173,15 @@ void mp_emit_glue_assign_native(mp_raw_code_t *rc, mp_raw_code_kind_t kind, void
 }
 #endif
 
-mp_obj_t mp_make_function_from_raw_code(const mp_raw_code_t *rc, mp_obj_t def_args, mp_obj_t def_kw_args) {
+mp_obj_t mp_make_function_from_raw_code(const mp_raw_code_t *rc, const mp_module_context_t *context, const mp_obj_t *def_args) {
     DEBUG_OP_printf("make_function_from_raw_code %p\n", rc);
     assert(rc != NULL);
 
     // def_args must be MP_OBJ_NULL or a tuple
-    assert(def_args == MP_OBJ_NULL || mp_obj_is_type(def_args, &mp_type_tuple));
+    assert(def_args == NULL || def_args[0] == MP_OBJ_NULL || mp_obj_is_type(def_args[0], &mp_type_tuple));
 
     // def_kw_args must be MP_OBJ_NULL or a dict
-    assert(def_kw_args == MP_OBJ_NULL || mp_obj_is_type(def_kw_args, &mp_type_dict));
+    assert(def_args == NULL || def_args[1] == MP_OBJ_NULL || mp_obj_is_type(def_args[1], &mp_type_dict));
 
     // make the function, depending on the raw code kind
     mp_obj_t fun;
@@ -186,7 +189,7 @@ mp_obj_t mp_make_function_from_raw_code(const mp_raw_code_t *rc, mp_obj_t def_ar
         #if MICROPY_EMIT_NATIVE
         case MP_CODE_NATIVE_PY:
         case MP_CODE_NATIVE_VIPER:
-            fun = mp_obj_new_fun_native(def_args, def_kw_args, rc->fun_data, rc->const_table);
+            fun = mp_obj_new_fun_native(def_args, rc->fun_data, context, rc->children);
             // Check for a generator function, and if so change the type of the object
             if ((rc->scope_flags & MP_SCOPE_FLAG_GENERATOR) != 0) {
                 ((mp_obj_base_t *)MP_OBJ_TO_PTR(fun))->type = &mp_type_native_gen_wrap;
@@ -201,7 +204,7 @@ mp_obj_t mp_make_function_from_raw_code(const mp_raw_code_t *rc, mp_obj_t def_ar
         default:
             // rc->kind should always be set and BYTECODE is the only remaining case
             assert(rc->kind == MP_CODE_BYTECODE);
-            fun = mp_obj_new_fun_bc(def_args, def_kw_args, rc->fun_data, rc->const_table);
+            fun = mp_obj_new_fun_bc(def_args, rc->fun_data, context, rc->children);
             // check for generator functions and if so change the type of the object
             if ((rc->scope_flags & MP_SCOPE_FLAG_GENERATOR) != 0) {
                 ((mp_obj_base_t *)MP_OBJ_TO_PTR(fun))->type = &mp_type_gen_wrap;
@@ -218,16 +221,16 @@ mp_obj_t mp_make_function_from_raw_code(const mp_raw_code_t *rc, mp_obj_t def_ar
     return fun;
 }
 
-mp_obj_t mp_make_closure_from_raw_code(const mp_raw_code_t *rc, mp_uint_t n_closed_over, const mp_obj_t *args) {
+mp_obj_t mp_make_closure_from_raw_code(const mp_raw_code_t *rc, const mp_module_context_t *context, mp_uint_t n_closed_over, const mp_obj_t *args) {
     DEBUG_OP_printf("make_closure_from_raw_code %p " UINT_FMT " %p\n", rc, n_closed_over, args);
     // make function object
     mp_obj_t ffun;
     if (n_closed_over & 0x100) {
         // default positional and keyword args given
-        ffun = mp_make_function_from_raw_code(rc, args[0], args[1]);
+        ffun = mp_make_function_from_raw_code(rc, context, args);
     } else {
         // default positional and keyword args not given
-        ffun = mp_make_function_from_raw_code(rc, MP_OBJ_NULL, MP_OBJ_NULL);
+        ffun = mp_make_function_from_raw_code(rc, context, NULL);
     }
     // wrap function in closure object
     return mp_obj_new_closure(ffun, n_closed_over & 0xff, args + ((n_closed_over >> 7) & 2));
diff --git a/py/emitglue.h b/py/emitglue.h
index a5411dc2e205f..9a22a9321874d 100644
--- a/py/emitglue.h
+++ b/py/emitglue.h
@@ -54,16 +54,20 @@ typedef struct _mp_qstr_link_entry_t {
     uint16_t qst;
 } mp_qstr_link_entry_t;
 
+// compiled bytecode: instance in RAM, referenced by outer scope, usually freed after first (and only) use
+// mpy file: instance in RAM, created when .mpy file is loaded (same comments as above)
+// frozen: instance in ROM
 typedef struct _mp_raw_code_t {
     mp_uint_t kind : 3; // of type mp_raw_code_kind_t
     mp_uint_t scope_flags : 7;
     mp_uint_t n_pos_args : 11;
     const void *fun_data;
-    const mp_uint_t *const_table;
+    #if MICROPY_PERSISTENT_CODE_SAVE || MICROPY_DEBUG_PRINTERS
+    size_t fun_data_len; // so mp_raw_code_save and mp_bytecode_print work
+    #endif
+    struct _mp_raw_code_t **children;
     #if MICROPY_PERSISTENT_CODE_SAVE
-    size_t fun_data_len;
-    uint16_t n_obj;
-    uint16_t n_raw_code;
+    size_t n_children;
     #if MICROPY_PY_SYS_SETTRACE
     mp_bytecode_prelude_t prelude;
     // line_of_definition is a Python source line where the raw_code was
@@ -89,22 +93,22 @@ void mp_emit_glue_assign_bytecode(mp_raw_code_t *rc, const byte *code,
     #if MICROPY_PERSISTENT_CODE_SAVE || MICROPY_DEBUG_PRINTERS
     size_t len,
     #endif
-    const mp_uint_t *const_table,
+    mp_raw_code_t **children,
     #if MICROPY_PERSISTENT_CODE_SAVE
-    uint16_t n_obj, uint16_t n_raw_code,
+    size_t n_children,
     #endif
     mp_uint_t scope_flags);
 
 void mp_emit_glue_assign_native(mp_raw_code_t *rc, mp_raw_code_kind_t kind, void *fun_data, mp_uint_t fun_len,
-    const mp_uint_t *const_table,
+    mp_raw_code_t **children,
     #if MICROPY_PERSISTENT_CODE_SAVE
+    size_t n_children,
     uint16_t prelude_offset,
-    uint16_t n_obj, uint16_t n_raw_code,
     uint16_t n_qstr, mp_qstr_link_entry_t *qstr_link,
     #endif
-    mp_uint_t n_pos_args, mp_uint_t scope_flags, mp_uint_t type_sig);
+    mp_uint_t scope_flags, mp_uint_t n_pos_args, mp_uint_t type_sig);
 
-mp_obj_t mp_make_function_from_raw_code(const mp_raw_code_t *rc, mp_obj_t def_args, mp_obj_t def_kw_args);
-mp_obj_t mp_make_closure_from_raw_code(const mp_raw_code_t *rc, mp_uint_t n_closed_over, const mp_obj_t *args);
+mp_obj_t mp_make_function_from_raw_code(const mp_raw_code_t *rc, const mp_module_context_t *context, const mp_obj_t *def_args);
+mp_obj_t mp_make_closure_from_raw_code(const mp_raw_code_t *rc, const mp_module_context_t *context, mp_uint_t n_closed_over, const mp_obj_t *args);
 
 #endif // MICROPY_INCLUDED_PY_EMITGLUE_H
diff --git a/py/emitnative.c b/py/emitnative.c
index 6504f377659d0..ca34e89f64480 100644
--- a/py/emitnative.c
+++ b/py/emitnative.c
@@ -48,6 +48,7 @@
 
 #include "py/emit.h"
 #include "py/nativeglue.h"
+#include "py/objfun.h"
 #include "py/objstr.h"
 
 #if MICROPY_DEBUG_VERBOSE // print debugging info
@@ -92,9 +93,13 @@
 #define OFFSETOF_CODE_STATE_FUN_BC (offsetof(mp_code_state_t, fun_bc) / sizeof(uintptr_t))
 #define OFFSETOF_CODE_STATE_IP (offsetof(mp_code_state_t, ip) / sizeof(uintptr_t))
 #define OFFSETOF_CODE_STATE_SP (offsetof(mp_code_state_t, sp) / sizeof(uintptr_t))
-#define OFFSETOF_OBJ_FUN_BC_GLOBALS (offsetof(mp_obj_fun_bc_t, globals) / sizeof(uintptr_t))
+#define OFFSETOF_CODE_STATE_N_STATE (offsetof(mp_code_state_t, n_state) / sizeof(uintptr_t))
+#define OFFSETOF_OBJ_FUN_BC_CONTEXT (offsetof(mp_obj_fun_bc_t, context) / sizeof(uintptr_t))
+#define OFFSETOF_OBJ_FUN_BC_CHILD_TABLE (offsetof(mp_obj_fun_bc_t, child_table) / sizeof(uintptr_t))
 #define OFFSETOF_OBJ_FUN_BC_BYTECODE (offsetof(mp_obj_fun_bc_t, bytecode) / sizeof(uintptr_t))
-#define OFFSETOF_OBJ_FUN_BC_CONST_TABLE (offsetof(mp_obj_fun_bc_t, const_table) / sizeof(uintptr_t))
+#define OFFSETOF_MODULE_CONTEXT_OBJ_TABLE (offsetof(mp_module_context_t, constants.obj_table) / sizeof(uintptr_t))
+#define OFFSETOF_MODULE_CONTEXT_GLOBALS (offsetof(mp_module_context_t, module.globals) / sizeof(uintptr_t))
+#define INDEX_OF_MP_FUN_TABLE_IN_CONST_TABLE (0)
 
 // If not already defined, set parent args to same as child call registers
 #ifndef REG_PARENT_RET
@@ -205,6 +210,7 @@ typedef struct _exc_stack_entry_t {
 } exc_stack_entry_t;
 
 struct _emit_t {
+    mp_emit_common_t *emit_common;
     mp_obj_t *error_slot;
     uint *label_slot;
     uint exit_label;
@@ -225,18 +231,17 @@ struct _emit_t {
     exc_stack_entry_t *exc_stack;
 
     int prelude_offset;
+    #if N_PRELUDE_AS_BYTES_OBJ
+    size_t prelude_const_table_offset;
+    #endif
     int start_offset;
     int n_state;
     uint16_t code_state_start;
     uint16_t stack_start;
     int stack_size;
+    uint16_t n_info;
     uint16_t n_cell;
 
-    uint16_t const_table_cur_obj;
-    uint16_t const_table_num_obj;
-    uint16_t const_table_cur_raw_code;
-    mp_uint_t *const_table;
-
     #if MICROPY_PERSISTENT_CODE_SAVE
     uint16_t qstr_link_cur;
     mp_qstr_link_entry_t *qstr_link;
@@ -255,8 +260,9 @@ STATIC void emit_native_global_exc_entry(emit_t *emit);
 STATIC void emit_native_global_exc_exit(emit_t *emit);
 STATIC void emit_native_load_const_obj(emit_t *emit, mp_obj_t obj);
 
-emit_t *EXPORT_FUN(new)(mp_obj_t * error_slot, uint *label_slot, mp_uint_t max_num_labels) {
+emit_t *EXPORT_FUN(new)(mp_emit_common_t * emit_common, mp_obj_t *error_slot, uint *label_slot, mp_uint_t max_num_labels) {
     emit_t *emit = m_new0(emit_t, 1);
+    emit->emit_common = emit_common;
     emit->error_slot = error_slot;
     emit->label_slot = label_slot;
     emit->stack_info_alloc = 8;
@@ -340,30 +346,22 @@ STATIC void emit_native_mov_reg_qstr_obj(emit_t *emit, int reg_dest, qstr qst) {
         emit_native_mov_state_reg((emit), (local_num), (reg_temp)); \
     } while (false)
 
-#define emit_native_mov_state_imm_fix_u16_via(emit, local_num, imm, reg_temp) \
-    do { \
-        ASM_MOV_REG_IMM_FIX_U16((emit)->as, (reg_temp), (imm)); \
-        emit_native_mov_state_reg((emit), (local_num), (reg_temp)); \
-    } while (false)
-
-#define emit_native_mov_state_imm_fix_word_via(emit, local_num, imm, reg_temp) \
-    do { \
-        ASM_MOV_REG_IMM_FIX_WORD((emit)->as, (reg_temp), (imm)); \
-        emit_native_mov_state_reg((emit), (local_num), (reg_temp)); \
-    } while (false)
-
 STATIC void emit_native_start_pass(emit_t *emit, pass_kind_t pass, scope_t *scope) {
     DEBUG_printf("start_pass(pass=%u, scope=%p)\n", pass, scope);
 
+    if (pass == MP_PASS_SCOPE) {
+        // Note: the first argument passed here is mp_emit_common_t, not the native emitter context
+        #if N_PRELUDE_AS_BYTES_OBJ
+        if (scope->emit_options == MP_EMIT_OPT_NATIVE_PYTHON) {
+            mp_emit_common_alloc_const_obj((mp_emit_common_t *)emit, mp_const_none);
+        }
+        #endif
+        return;
+    }
+
     emit->pass = pass;
     emit->do_viper_types = scope->emit_options == MP_EMIT_OPT_VIPER;
     emit->stack_size = 0;
-    #if N_PRELUDE_AS_BYTES_OBJ
-    emit->const_table_cur_obj = emit->do_viper_types ? 0 : 1; // reserve first obj for prelude bytes obj
-    #else
-    emit->const_table_cur_obj = 0;
-    #endif
-    emit->const_table_cur_raw_code = 0;
     #if MICROPY_PERSISTENT_CODE_SAVE
     emit->qstr_link_cur = 0;
     #endif
@@ -455,8 +453,9 @@ STATIC void emit_native_start_pass(emit_t *emit, pass_kind_t pass, scope_t *scop
         #endif
 
         // Load REG_FUN_TABLE with a pointer to mp_fun_table, found in the const_table
-        ASM_LOAD_REG_REG_OFFSET(emit->as, REG_LOCAL_3, REG_PARENT_ARG_1, OFFSETOF_OBJ_FUN_BC_CONST_TABLE);
-        ASM_LOAD_REG_REG_OFFSET(emit->as, REG_FUN_TABLE, REG_LOCAL_3, 0);
+        ASM_LOAD_REG_REG_OFFSET(emit->as, REG_FUN_TABLE, REG_PARENT_ARG_1, OFFSETOF_OBJ_FUN_BC_CONTEXT);
+        ASM_LOAD_REG_REG_OFFSET(emit->as, REG_FUN_TABLE, REG_FUN_TABLE, OFFSETOF_MODULE_CONTEXT_OBJ_TABLE);
+        ASM_LOAD_REG_REG_OFFSET(emit->as, REG_FUN_TABLE, REG_FUN_TABLE, INDEX_OF_MP_FUN_TABLE_IN_CONST_TABLE);
 
         // Store function object (passed as first arg) to stack if needed
         if (NEED_FUN_OBJ(emit)) {
@@ -514,7 +513,7 @@ STATIC void emit_native_start_pass(emit_t *emit, pass_kind_t pass, scope_t *scop
             emit->stack_start = SIZEOF_CODE_STATE;
             #if N_PRELUDE_AS_BYTES_OBJ
             // Load index of prelude bytes object in const_table
-            mp_asm_base_data(&emit->as->base, ASM_WORD_SIZE, (uintptr_t)(emit->scope->num_pos_args + emit->scope->num_kwonly_args + 1));
+            mp_asm_base_data(&emit->as->base, ASM_WORD_SIZE, (uintptr_t)emit->prelude_const_table_offset);
             #else
             mp_asm_base_data(&emit->as->base, ASM_WORD_SIZE, (uintptr_t)emit->prelude_offset);
             #endif
@@ -536,8 +535,9 @@ STATIC void emit_native_start_pass(emit_t *emit, pass_kind_t pass, scope_t *scop
 
             // Load REG_FUN_TABLE with a pointer to mp_fun_table, found in the const_table
             ASM_LOAD_REG_REG_OFFSET(emit->as, REG_TEMP0, REG_GENERATOR_STATE, LOCAL_IDX_FUN_OBJ(emit));
-            ASM_LOAD_REG_REG_OFFSET(emit->as, REG_TEMP0, REG_TEMP0, OFFSETOF_OBJ_FUN_BC_CONST_TABLE);
-            ASM_LOAD_REG_REG_OFFSET(emit->as, REG_FUN_TABLE, REG_TEMP0, emit->scope->num_pos_args + emit->scope->num_kwonly_args);
+            ASM_LOAD_REG_REG_OFFSET(emit->as, REG_TEMP0, REG_TEMP0, OFFSETOF_OBJ_FUN_BC_CONTEXT);
+            ASM_LOAD_REG_REG_OFFSET(emit->as, REG_TEMP0, REG_TEMP0, OFFSETOF_MODULE_CONTEXT_OBJ_TABLE);
+            ASM_LOAD_REG_REG_OFFSET(emit->as, REG_FUN_TABLE, REG_TEMP0, INDEX_OF_MP_FUN_TABLE_IN_CONST_TABLE);
         } else {
             // The locals and stack start after the code_state structure
             emit->stack_start = emit->code_state_start + SIZEOF_CODE_STATE;
@@ -555,22 +555,33 @@ STATIC void emit_native_start_pass(emit_t *emit, pass_kind_t pass, scope_t *scop
             #endif
 
             // Load REG_FUN_TABLE with a pointer to mp_fun_table, found in the const_table
-            ASM_LOAD_REG_REG_OFFSET(emit->as, REG_LOCAL_3, REG_PARENT_ARG_1, OFFSETOF_OBJ_FUN_BC_CONST_TABLE);
-            ASM_LOAD_REG_REG_OFFSET(emit->as, REG_FUN_TABLE, REG_LOCAL_3, emit->scope->num_pos_args + emit->scope->num_kwonly_args);
+            ASM_LOAD_REG_REG_OFFSET(emit->as, REG_FUN_TABLE, REG_PARENT_ARG_1, OFFSETOF_OBJ_FUN_BC_CONTEXT);
+            ASM_LOAD_REG_REG_OFFSET(emit->as, REG_FUN_TABLE, REG_FUN_TABLE, OFFSETOF_MODULE_CONTEXT_OBJ_TABLE);
+            ASM_LOAD_REG_REG_OFFSET(emit->as, REG_FUN_TABLE, REG_FUN_TABLE, INDEX_OF_MP_FUN_TABLE_IN_CONST_TABLE);
 
             // Set code_state.fun_bc
             ASM_MOV_LOCAL_REG(emit->as, LOCAL_IDX_FUN_OBJ(emit), REG_PARENT_ARG_1);
 
-            // Set code_state.ip (offset from start of this function to prelude info)
+            // Set code_state.ip, a pointer to the beginning of the prelude
+            // Need to use some locals for this, so assert that they are available for use
+            MP_STATIC_ASSERT(REG_LOCAL_3 != REG_PARENT_ARG_1);
+            MP_STATIC_ASSERT(REG_LOCAL_3 != REG_PARENT_ARG_2);
+            MP_STATIC_ASSERT(REG_LOCAL_3 != REG_PARENT_ARG_3);
+            MP_STATIC_ASSERT(REG_LOCAL_3 != REG_PARENT_ARG_4);
             int code_state_ip_local = emit->code_state_start + OFFSETOF_CODE_STATE_IP;
             #if N_PRELUDE_AS_BYTES_OBJ
-            // Prelude is a bytes object in const_table; store ip = prelude->data - fun_bc->bytecode
-            ASM_LOAD_REG_REG_OFFSET(emit->as, REG_LOCAL_3, REG_LOCAL_3, emit->scope->num_pos_args + emit->scope->num_kwonly_args + 1);
+            // Prelude is a bytes object in const_table[prelude_const_table_offset].
+            ASM_LOAD_REG_REG_OFFSET(emit->as, REG_LOCAL_3, REG_PARENT_ARG_1, OFFSETOF_OBJ_FUN_BC_CONTEXT);
+            ASM_LOAD_REG_REG_OFFSET(emit->as, REG_LOCAL_3, REG_LOCAL_3, OFFSETOF_MODULE_CONTEXT_OBJ_TABLE);
+            ASM_LOAD_REG_REG_OFFSET(emit->as, REG_LOCAL_3, REG_LOCAL_3, emit->prelude_const_table_offset);
             ASM_LOAD_REG_REG_OFFSET(emit->as, REG_LOCAL_3, REG_LOCAL_3, offsetof(mp_obj_str_t, data) / sizeof(uintptr_t));
-            ASM_LOAD_REG_REG_OFFSET(emit->as, REG_PARENT_ARG_1, REG_PARENT_ARG_1, OFFSETOF_OBJ_FUN_BC_BYTECODE);
-            ASM_SUB_REG_REG(emit->as, REG_LOCAL_3, REG_PARENT_ARG_1);
-            emit_native_mov_state_reg(emit, code_state_ip_local, REG_LOCAL_3);
             #else
+            MP_STATIC_ASSERT(REG_LOCAL_2 != REG_PARENT_ARG_1);
+            MP_STATIC_ASSERT(REG_LOCAL_2 != REG_PARENT_ARG_2);
+            MP_STATIC_ASSERT(REG_LOCAL_2 != REG_PARENT_ARG_3);
+            MP_STATIC_ASSERT(REG_LOCAL_2 != REG_PARENT_ARG_4);
+            // Prelude is at the end of the machine code
+            ASM_LOAD_REG_REG_OFFSET(emit->as, REG_LOCAL_3, REG_PARENT_ARG_1, OFFSETOF_OBJ_FUN_BC_BYTECODE);
             if (emit->pass == MP_PASS_CODE_SIZE) {
                 // Commit to the encoding size based on the value of prelude_offset in this pass.
                 // By using 32768 as the cut-off it is highly unlikely that prelude_offset will
@@ -579,14 +590,16 @@ STATIC void emit_native_start_pass(emit_t *emit, pass_kind_t pass, scope_t *scop
             }
             if (emit->prelude_offset_uses_u16_encoding) {
                 assert(emit->prelude_offset <= 65535);
-                emit_native_mov_state_imm_fix_u16_via(emit, code_state_ip_local, emit->prelude_offset, REG_PARENT_ARG_1);
+                ASM_MOV_REG_IMM_FIX_U16((emit)->as, REG_LOCAL_2, emit->prelude_offset);
             } else {
-                emit_native_mov_state_imm_fix_word_via(emit, code_state_ip_local, emit->prelude_offset, REG_PARENT_ARG_1);
+                ASM_MOV_REG_IMM_FIX_WORD((emit)->as, REG_LOCAL_2, emit->prelude_offset);
             }
+            ASM_ADD_REG_REG(emit->as, REG_LOCAL_3, REG_LOCAL_2);
             #endif
+            emit_native_mov_state_reg(emit, code_state_ip_local, REG_LOCAL_3);
 
             // Set code_state.n_state (only works on little endian targets due to n_state being uint16_t)
-            emit_native_mov_state_imm_via(emit, emit->code_state_start + offsetof(mp_code_state_t, n_state) / sizeof(uintptr_t), emit->n_state, REG_ARG_1);
+            emit_native_mov_state_imm_via(emit, emit->code_state_start + OFFSETOF_CODE_STATE_N_STATE, emit->n_state, REG_ARG_1);
 
             // Put address of code_state into first arg
             ASM_MOV_REG_LOCAL_ADDR(emit->as, REG_ARG_1, emit->code_state_start);
@@ -628,30 +641,17 @@ STATIC void emit_native_start_pass(emit_t *emit, pass_kind_t pass, scope_t *scop
                 emit->local_vtype[id->local_num] = VTYPE_PYOBJ;
             }
         }
-
-        if (pass == MP_PASS_EMIT) {
-            // write argument names as qstr objects
-            // see comment in corresponding part of emitbc.c about the logic here
-            for (int i = 0; i < scope->num_pos_args + scope->num_kwonly_args; i++) {
-                qstr qst = MP_QSTR__star_;
-                for (int j = 0; j < scope->id_info_len; ++j) {
-                    id_info_t *id = &scope->id_info[j];
-                    if ((id->flags & ID_FLAG_IS_PARAM) && id->local_num == i) {
-                        qst = id->qst;
-                        break;
-                    }
-                }
-                emit->const_table[i] = (mp_uint_t)MP_OBJ_NEW_QSTR(qst);
-            }
-        }
     }
-
 }
 
 static inline void emit_native_write_code_info_byte(emit_t *emit, byte val) {
     mp_asm_base_data(&emit->as->base, 1, val);
 }
 
+static inline void emit_native_write_code_info_qstr(emit_t *emit, qstr qst) {
+    mp_encode_uint(&emit->as->base, mp_asm_base_get_cur_to_write_bytes, mp_emit_common_use_qstr(emit->emit_common, qst));
+}
+
 STATIC void emit_native_end_pass(emit_t *emit) {
     emit_native_global_exc_exit(emit);
 
@@ -662,21 +662,25 @@ STATIC void emit_native_end_pass(emit_t *emit) {
         size_t n_exc_stack = 0; // exc-stack not needed for native code
         MP_BC_PRELUDE_SIG_ENCODE(n_state, n_exc_stack, emit->scope, emit_native_write_code_info_byte, emit);
 
-        #if MICROPY_PERSISTENT_CODE
-        size_t n_info = 4;
-        #else
-        size_t n_info = 1;
-        #endif
-        MP_BC_PRELUDE_SIZE_ENCODE(n_info, emit->n_cell, emit_native_write_code_info_byte, emit);
-
-        #if MICROPY_PERSISTENT_CODE
-        mp_asm_base_data(&emit->as->base, 1, emit->scope->simple_name);
-        mp_asm_base_data(&emit->as->base, 1, emit->scope->simple_name >> 8);
-        mp_asm_base_data(&emit->as->base, 1, emit->scope->source_file);
-        mp_asm_base_data(&emit->as->base, 1, emit->scope->source_file >> 8);
-        #else
-        mp_asm_base_data(&emit->as->base, 1, 1);
-        #endif
+        size_t n_info = emit->n_info;
+        size_t n_cell = emit->n_cell;
+        MP_BC_PRELUDE_SIZE_ENCODE(n_info, n_cell, emit_native_write_code_info_byte, emit);
+
+        // bytecode prelude: source info (function and argument qstrs)
+        size_t info_start = mp_asm_base_get_code_pos(&emit->as->base);
+        emit_native_write_code_info_qstr(emit, emit->scope->simple_name);
+        for (int i = 0; i < emit->scope->num_pos_args + emit->scope->num_kwonly_args; i++) {
+            qstr qst = MP_QSTR__star_;
+            for (int j = 0; j < emit->scope->id_info_len; ++j) {
+                id_info_t *id = &emit->scope->id_info[j];
+                if ((id->flags & ID_FLAG_IS_PARAM) && id->local_num == i) {
+                    qst = id->qst;
+                    break;
+                }
+            }
+            emit_native_write_code_info_qstr(emit, qst);
+        }
+        emit->n_info = mp_asm_base_get_code_pos(&emit->as->base) - info_start;
 
         // bytecode prelude: initialise closed over variables
         size_t cell_start = mp_asm_base_get_code_pos(&emit->as->base);
@@ -690,13 +694,14 @@ STATIC void emit_native_end_pass(emit_t *emit) {
         emit->n_cell = mp_asm_base_get_code_pos(&emit->as->base) - cell_start;
 
         #if N_PRELUDE_AS_BYTES_OBJ
-        // Prelude bytes object is after qstr arg names and mp_fun_table
-        size_t table_off = emit->scope->num_pos_args + emit->scope->num_kwonly_args + 1;
+        // Create the prelude as a bytes object, and store it in the constant table
+        mp_obj_t prelude = mp_const_none;
         if (emit->pass == MP_PASS_EMIT) {
             void *buf = emit->as->base.code_base + emit->prelude_offset;
             size_t n = emit->as->base.code_offset - emit->prelude_offset;
-            emit->const_table[table_off] = (uintptr_t)mp_obj_new_bytes(buf, n);
+            prelude = mp_obj_new_bytes(buf, n);
         }
+        emit->prelude_const_table_offset = mp_emit_common_alloc_const_obj(emit->emit_common, prelude);
         #endif
     }
 
@@ -706,31 +711,15 @@ STATIC void emit_native_end_pass(emit_t *emit) {
     assert(emit->stack_size == 0);
     assert(emit->exc_stack_size == 0);
 
-    // Deal with const table accounting
-    assert(emit->pass <= MP_PASS_STACK_SIZE || (emit->const_table_num_obj == emit->const_table_cur_obj));
-    emit->const_table_num_obj = emit->const_table_cur_obj;
+    #if MICROPY_PERSISTENT_CODE_SAVE
+    // Allocate qstr_link table if needed
     if (emit->pass == MP_PASS_CODE_SIZE) {
-        size_t const_table_alloc = 1 + emit->const_table_num_obj + emit->const_table_cur_raw_code;
-        size_t nqstr = 0;
-        if (!emit->do_viper_types) {
-            // Add room for qstr names of arguments
-            nqstr = emit->scope->num_pos_args + emit->scope->num_kwonly_args;
-            const_table_alloc += nqstr;
-        }
-        emit->const_table = m_new(mp_uint_t, const_table_alloc);
-        #if !MICROPY_DYNAMIC_COMPILER
-        // Store mp_fun_table pointer just after qstrs
-        // (but in dynamic-compiler mode eliminate dependency on mp_fun_table)
-        emit->const_table[nqstr] = (mp_uint_t)(uintptr_t)&mp_fun_table;
-        #endif
-
-        #if MICROPY_PERSISTENT_CODE_SAVE
         size_t qstr_link_alloc = emit->qstr_link_cur;
         if (qstr_link_alloc > 0) {
             emit->qstr_link = m_new(mp_qstr_link_entry_t, qstr_link_alloc);
         }
-        #endif
     }
+    #endif
 
     if (emit->pass == MP_PASS_EMIT) {
         void *f = mp_asm_base_get_code(&emit->as->base);
@@ -738,13 +727,14 @@ STATIC void emit_native_end_pass(emit_t *emit) {
 
         mp_emit_glue_assign_native(emit->scope->raw_code,
             emit->do_viper_types ? MP_CODE_NATIVE_VIPER : MP_CODE_NATIVE_PY,
-            f, f_len, emit->const_table,
+            f, f_len,
+            emit->emit_common->children,
             #if MICROPY_PERSISTENT_CODE_SAVE
+            emit->emit_common->ct_cur_child,
             emit->prelude_offset,
-            emit->const_table_cur_obj, emit->const_table_cur_raw_code,
             emit->qstr_link_cur, emit->qstr_link,
             #endif
-            emit->scope->num_pos_args, emit->scope->scope_flags, 0);
+            emit->scope->scope_flags, 0, 0);
     }
 }
 
@@ -1137,29 +1127,19 @@ STATIC exc_stack_entry_t *emit_native_pop_exc_stack(emit_t *emit) {
     return e;
 }
 
-STATIC void emit_load_reg_with_ptr(emit_t *emit, int reg, mp_uint_t ptr, size_t table_off) {
-    if (!emit->do_viper_types) {
-        // Skip qstr names of arguments
-        table_off += emit->scope->num_pos_args + emit->scope->num_kwonly_args;
-    }
-    if (emit->pass == MP_PASS_EMIT) {
-        emit->const_table[table_off] = ptr;
-    }
+STATIC void emit_load_reg_with_object(emit_t *emit, int reg, mp_obj_t obj) {
+    size_t table_off = mp_emit_common_alloc_const_obj(emit->emit_common, obj);
     emit_native_mov_reg_state(emit, REG_TEMP0, LOCAL_IDX_FUN_OBJ(emit));
-    ASM_LOAD_REG_REG_OFFSET(emit->as, REG_TEMP0, REG_TEMP0, OFFSETOF_OBJ_FUN_BC_CONST_TABLE);
+    ASM_LOAD_REG_REG_OFFSET(emit->as, REG_TEMP0, REG_TEMP0, OFFSETOF_OBJ_FUN_BC_CONTEXT);
+    ASM_LOAD_REG_REG_OFFSET(emit->as, REG_TEMP0, REG_TEMP0, OFFSETOF_MODULE_CONTEXT_OBJ_TABLE);
     ASM_LOAD_REG_REG_OFFSET(emit->as, reg, REG_TEMP0, table_off);
 }
 
-STATIC void emit_load_reg_with_object(emit_t *emit, int reg, mp_obj_t obj) {
-    // First entry is for mp_fun_table
-    size_t table_off = 1 + emit->const_table_cur_obj++;
-    emit_load_reg_with_ptr(emit, reg, (mp_uint_t)obj, table_off);
-}
-
-STATIC void emit_load_reg_with_raw_code(emit_t *emit, int reg, mp_raw_code_t *rc) {
-    // First entry is for mp_fun_table, then constant objects
-    size_t table_off = 1 + emit->const_table_num_obj + emit->const_table_cur_raw_code++;
-    emit_load_reg_with_ptr(emit, reg, (mp_uint_t)rc, table_off);
+STATIC void emit_load_reg_with_child(emit_t *emit, int reg, mp_raw_code_t *rc) {
+    size_t table_off = mp_emit_common_alloc_const_child(emit->emit_common, rc);
+    emit_native_mov_reg_state(emit, REG_TEMP0, LOCAL_IDX_FUN_OBJ(emit));
+    ASM_LOAD_REG_REG_OFFSET(emit->as, REG_TEMP0, REG_TEMP0, OFFSETOF_OBJ_FUN_BC_CHILD_TABLE);
+    ASM_LOAD_REG_REG_OFFSET(emit->as, reg, REG_TEMP0, table_off);
 }
 
 STATIC void emit_native_label_assign(emit_t *emit, mp_uint_t l) {
@@ -1203,7 +1183,8 @@ STATIC void emit_native_global_exc_entry(emit_t *emit) {
         if (!(emit->scope->scope_flags & MP_SCOPE_FLAG_GENERATOR)) {
             // Set new globals
             emit_native_mov_reg_state(emit, REG_ARG_1, LOCAL_IDX_FUN_OBJ(emit));
-            ASM_LOAD_REG_REG_OFFSET(emit->as, REG_ARG_1, REG_ARG_1, OFFSETOF_OBJ_FUN_BC_GLOBALS);
+            ASM_LOAD_REG_REG_OFFSET(emit->as, REG_ARG_1, REG_ARG_1, OFFSETOF_OBJ_FUN_BC_CONTEXT);
+            ASM_LOAD_REG_REG_OFFSET(emit->as, REG_ARG_1, REG_ARG_1, OFFSETOF_MODULE_CONTEXT_GLOBALS);
             emit_call(emit, MP_F_NATIVE_SWAP_GLOBALS);
 
             // Save old globals (or NULL if globals didn't change)
@@ -1254,7 +1235,8 @@ STATIC void emit_native_global_exc_entry(emit_t *emit) {
             #if N_NLR_SETJMP
             // Reload REG_FUN_TABLE, since it may be clobbered by longjmp
             emit_native_mov_reg_state(emit, REG_LOCAL_1, LOCAL_IDX_FUN_OBJ(emit));
-            ASM_LOAD_REG_REG_OFFSET(emit->as, REG_LOCAL_1, REG_LOCAL_1, offsetof(mp_obj_fun_bc_t, const_table) / sizeof(uintptr_t));
+            ASM_LOAD_REG_REG_OFFSET(emit->as, REG_LOCAL_1, REG_LOCAL_1, OFFSETOF_OBJ_FUN_BC_CONTEXT);
+            ASM_LOAD_REG_REG_OFFSET(emit->as, REG_LOCAL_1, REG_LOCAL_1, OFFSETOF_MODULE_CONTEXT_OBJ_TABLE);
             ASM_LOAD_REG_REG_OFFSET(emit->as, REG_FUN_TABLE, REG_LOCAL_1, emit->scope->num_pos_args + emit->scope->num_kwonly_args);
             #endif
             ASM_MOV_REG_LOCAL(emit->as, REG_LOCAL_1, LOCAL_IDX_EXC_HANDLER_PC(emit));
@@ -1385,11 +1367,7 @@ STATIC void emit_native_import(emit_t *emit, qstr qst, int kind) {
 STATIC void emit_native_load_const_tok(emit_t *emit, mp_token_kind_t tok) {
     DEBUG_printf("load_const_tok(tok=%u)\n", tok);
     if (tok == MP_TOKEN_ELLIPSIS) {
-        #if MICROPY_PERSISTENT_CODE_SAVE
         emit_native_load_const_obj(emit, MP_OBJ_FROM_PTR(&mp_const_ellipsis_obj));
-        #else
-        emit_post_push_imm(emit, VTYPE_PYOBJ, (mp_uint_t)MP_OBJ_FROM_PTR(&mp_const_ellipsis_obj));
-        #endif
     } else {
         emit_native_pre(emit);
         if (tok == MP_TOKEN_KW_NONE) {
@@ -2682,33 +2660,46 @@ STATIC void emit_native_unpack_ex(emit_t *emit, mp_uint_t n_left, mp_uint_t n_ri
 STATIC void emit_native_make_function(emit_t *emit, scope_t *scope, mp_uint_t n_pos_defaults, mp_uint_t n_kw_defaults) {
     // call runtime, with type info for args, or don't support dict/default params, or only support Python objects for them
     emit_native_pre(emit);
+    emit_native_mov_reg_state(emit, REG_ARG_2, LOCAL_IDX_FUN_OBJ(emit));
+    ASM_LOAD_REG_REG_OFFSET(emit->as, REG_ARG_2, REG_ARG_2, OFFSETOF_OBJ_FUN_BC_CONTEXT);
     if (n_pos_defaults == 0 && n_kw_defaults == 0) {
         need_reg_all(emit);
-        ASM_MOV_REG_IMM(emit->as, REG_ARG_2, (mp_uint_t)MP_OBJ_NULL);
-        ASM_MOV_REG_IMM(emit->as, REG_ARG_3, (mp_uint_t)MP_OBJ_NULL);
+        ASM_MOV_REG_IMM(emit->as, REG_ARG_3, 0);
     } else {
-        vtype_kind_t vtype_def_tuple, vtype_def_dict;
-        emit_pre_pop_reg_reg(emit, &vtype_def_dict, REG_ARG_3, &vtype_def_tuple, REG_ARG_2);
-        assert(vtype_def_tuple == VTYPE_PYOBJ);
-        assert(vtype_def_dict == VTYPE_PYOBJ);
+        emit_get_stack_pointer_to_reg_for_pop(emit, REG_ARG_3, 2);
         need_reg_all(emit);
     }
-    emit_load_reg_with_raw_code(emit, REG_ARG_1, scope->raw_code);
+    emit_load_reg_with_child(emit, REG_ARG_1, scope->raw_code);
     ASM_CALL_IND(emit->as, MP_F_MAKE_FUNCTION_FROM_RAW_CODE);
     emit_post_push_reg(emit, VTYPE_PYOBJ, REG_RET);
 }
 
 STATIC void emit_native_make_closure(emit_t *emit, scope_t *scope, mp_uint_t n_closed_over, mp_uint_t n_pos_defaults, mp_uint_t n_kw_defaults) {
+    // make function
     emit_native_pre(emit);
+    emit_native_mov_reg_state(emit, REG_ARG_2, LOCAL_IDX_FUN_OBJ(emit));
+    ASM_LOAD_REG_REG_OFFSET(emit->as, REG_ARG_2, REG_ARG_2, OFFSETOF_OBJ_FUN_BC_CONTEXT);
     if (n_pos_defaults == 0 && n_kw_defaults == 0) {
-        emit_get_stack_pointer_to_reg_for_pop(emit, REG_ARG_3, n_closed_over);
-        ASM_MOV_REG_IMM(emit->as, REG_ARG_2, n_closed_over);
+        need_reg_all(emit);
+        ASM_MOV_REG_IMM(emit->as, REG_ARG_3, 0);
     } else {
-        emit_get_stack_pointer_to_reg_for_pop(emit, REG_ARG_3, n_closed_over + 2);
-        ASM_MOV_REG_IMM(emit->as, REG_ARG_2, 0x100 | n_closed_over);
+        emit_get_stack_pointer_to_reg_for_pop(emit, REG_ARG_3, 2 + n_closed_over);
+        adjust_stack(emit, 2 + n_closed_over);
+        need_reg_all(emit);
+    }
+    emit_load_reg_with_child(emit, REG_ARG_1, scope->raw_code);
+    ASM_CALL_IND(emit->as, MP_F_MAKE_FUNCTION_FROM_RAW_CODE);
+
+    // make closure
+    #if REG_ARG_1 != REG_RET
+    ASM_MOV_REG_REG(emit->as, REG_ARG_1, REG_RET);
+    #endif
+    ASM_MOV_REG_IMM(emit->as, REG_ARG_2, n_closed_over);
+    emit_get_stack_pointer_to_reg_for_pop(emit, REG_ARG_3, n_closed_over);
+    if (n_pos_defaults != 0 || n_kw_defaults != 0) {
+        adjust_stack(emit, -2);
     }
-    emit_load_reg_with_raw_code(emit, REG_ARG_1, scope->raw_code);
-    ASM_CALL_IND(emit->as, MP_F_MAKE_CLOSURE_FROM_RAW_CODE);
+    ASM_CALL_IND(emit->as, MP_F_NEW_CLOSURE);
     emit_post_push_reg(emit, VTYPE_PYOBJ, REG_RET);
 }
 
diff --git a/py/emitnx86.c b/py/emitnx86.c
index f0553f0682bb9..d990ef5a9ea66 100644
--- a/py/emitnx86.c
+++ b/py/emitnx86.c
@@ -56,7 +56,7 @@ STATIC byte mp_f_n_args[MP_F_NUMBER_OF] = {
     [MP_F_UNPACK_EX] = 3,
     [MP_F_DELETE_NAME] = 1,
     [MP_F_DELETE_GLOBAL] = 1,
-    [MP_F_MAKE_CLOSURE_FROM_RAW_CODE] = 3,
+    [MP_F_NEW_CLOSURE] = 3,
     [MP_F_ARG_CHECK_NUM_SIG] = 3,
     [MP_F_SETUP_CODE_STATE] = 4,
     [MP_F_SMALL_INT_FLOOR_DIVIDE] = 2,
diff --git a/py/frozenmod.c b/py/frozenmod.c
index 6cb68d1ec0404..61c2f20aa1de3 100644
--- a/py/frozenmod.c
+++ b/py/frozenmod.c
@@ -57,7 +57,7 @@ extern const char mp_frozen_str_content[];
 
 #include "py/emitglue.h"
 
-extern const mp_raw_code_t *const mp_frozen_mpy_content[];
+extern const mp_frozen_module_t *const mp_frozen_mpy_content[];
 
 #endif // MICROPY_MODULE_FROZEN_MPY
 
diff --git a/py/mpconfig.h b/py/mpconfig.h
index 47779a67deaf0..5edff69dfda24 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -328,6 +328,14 @@
 #define MICROPY_PERSISTENT_CODE (MICROPY_PERSISTENT_CODE_LOAD || MICROPY_PERSISTENT_CODE_SAVE || MICROPY_MODULE_FROZEN_MPY)
 #endif
 
+// Whether bytecode uses a qstr_table to map internal qstr indices in the bytecode
+// to global qstr values in the runtime (behaviour when feature is enabled), or
+// just stores global qstr values directly in the bytecode.  This must be enabled
+// if MICROPY_PERSISTENT_CODE is enabled.
+#ifndef MICROPY_EMIT_BYTECODE_USES_QSTR_TABLE
+#define MICROPY_EMIT_BYTECODE_USES_QSTR_TABLE (MICROPY_PERSISTENT_CODE)
+#endif
+
 // Whether to emit x64 native code
 #ifndef MICROPY_EMIT_X64
 #define MICROPY_EMIT_X64 (0)
diff --git a/py/nativeglue.c b/py/nativeglue.c
index 30e5b40061beb..aed6fecddf38e 100644
--- a/py/nativeglue.c
+++ b/py/nativeglue.c
@@ -300,7 +300,7 @@ const mp_fun_table_t mp_fun_table = {
     mp_unpack_ex,
     mp_delete_name,
     mp_delete_global,
-    mp_make_closure_from_raw_code,
+    mp_obj_new_closure,
     mp_arg_check_num_sig,
     mp_setup_code_state,
     mp_small_int_floor_divide,
@@ -344,4 +344,8 @@ const mp_fun_table_t mp_fun_table = {
     &mp_stream_write_obj,
 };
 
+#elif MICROPY_EMIT_NATIVE && MICROPY_DYNAMIC_COMPILER
+
+const int mp_fun_table;
+
 #endif // MICROPY_EMIT_NATIVE
diff --git a/py/nativeglue.h b/py/nativeglue.h
index 9d9a97b9e790e..49ce665f2d0d8 100644
--- a/py/nativeglue.h
+++ b/py/nativeglue.h
@@ -75,7 +75,7 @@ typedef enum {
     MP_F_UNPACK_EX,
     MP_F_DELETE_NAME,
     MP_F_DELETE_GLOBAL,
-    MP_F_MAKE_CLOSURE_FROM_RAW_CODE,
+    MP_F_NEW_CLOSURE,
     MP_F_ARG_CHECK_NUM_SIG,
     MP_F_SETUP_CODE_STATE,
     MP_F_SMALL_INT_FLOOR_DIVIDE,
@@ -112,7 +112,7 @@ typedef struct _mp_fun_table_t {
     void (*set_store)(mp_obj_t self_in, mp_obj_t item);
     mp_obj_t (*list_append)(mp_obj_t self_in, mp_obj_t arg);
     mp_obj_t (*dict_store)(mp_obj_t self_in, mp_obj_t key, mp_obj_t value);
-    mp_obj_t (*make_function_from_raw_code)(const mp_raw_code_t *rc, mp_obj_t def_args, mp_obj_t def_kw_args);
+    mp_obj_t (*make_function_from_raw_code)(const mp_raw_code_t *rc, const mp_module_context_t *cm, const mp_obj_t *def_args);
     mp_obj_t (*call_function_n_kw)(mp_obj_t fun_in, size_t n_args_kw, const mp_obj_t *args);
     mp_obj_t (*call_method_n_kw)(size_t n_args, size_t n_kw, const mp_obj_t *args);
     mp_obj_t (*call_method_n_kw_var)(bool have_self, size_t n_args_n_kw, const mp_obj_t *args);
@@ -129,7 +129,7 @@ typedef struct _mp_fun_table_t {
     void (*unpack_ex)(mp_obj_t seq, size_t num, mp_obj_t *items);
     void (*delete_name)(qstr qst);
     void (*delete_global)(qstr qst);
-    mp_obj_t (*make_closure_from_raw_code)(const mp_raw_code_t *rc, mp_uint_t n_closed_over, const mp_obj_t *args);
+    mp_obj_t (*new_closure)(mp_obj_t fun, size_t n_closed_over, const mp_obj_t *closed);
     void (*arg_check_num_sig)(size_t n_args, size_t n_kw, uint32_t sig);
     void (*setup_code_state)(mp_code_state_t *code_state, size_t n_args, size_t n_kw, const mp_obj_t *args);
     mp_int_t (*small_int_floor_divide)(mp_int_t num, mp_int_t denom);
@@ -172,6 +172,12 @@ typedef struct _mp_fun_table_t {
     const mp_obj_fun_builtin_var_t *stream_write_obj;
 } mp_fun_table_t;
 
+#if (MICROPY_EMIT_NATIVE && !MICROPY_DYNAMIC_COMPILER) || MICROPY_ENABLE_DYNRUNTIME
 extern const mp_fun_table_t mp_fun_table;
+#elif MICROPY_EMIT_NATIVE && MICROPY_DYNAMIC_COMPILER
+// In dynamic-compiler mode eliminate dependency on entries in mp_fun_table.
+// This only needs to be an independent pointer, content doesn't matter.
+extern const int mp_fun_table;
+#endif
 
 #endif // MICROPY_INCLUDED_PY_NATIVEGLUE_H
diff --git a/py/obj.h b/py/obj.h
index b52ee0e2f4a19..08a35ee6f874b 100644
--- a/py/obj.h
+++ b/py/obj.h
@@ -781,9 +781,6 @@ mp_obj_t mp_obj_new_exception_msg_varg(const mp_obj_type_t *exc_type, mp_rom_err
 #ifdef va_start
 mp_obj_t mp_obj_new_exception_msg_vlist(const mp_obj_type_t *exc_type, mp_rom_error_text_t fmt, va_list arg); // same fmt restrictions as above
 #endif
-mp_obj_t mp_obj_new_fun_bc(mp_obj_t def_args, mp_obj_t def_kw_args, const byte *code, const mp_uint_t *const_table);
-mp_obj_t mp_obj_new_fun_native(mp_obj_t def_args_in, mp_obj_t def_kw_args, const void *fun_data, const mp_uint_t *const_table);
-mp_obj_t mp_obj_new_fun_asm(size_t n_args, const void *fun_data, mp_uint_t type_sig);
 mp_obj_t mp_obj_new_gen_wrap(mp_obj_t fun);
 mp_obj_t mp_obj_new_closure(mp_obj_t fun, size_t n_closed, const mp_obj_t *closed);
 mp_obj_t mp_obj_new_tuple(size_t n, const mp_obj_t *items);
@@ -992,7 +989,6 @@ typedef struct _mp_obj_fun_builtin_var_t {
 } mp_obj_fun_builtin_var_t;
 
 qstr mp_obj_fun_get_name(mp_const_obj_t fun);
-qstr mp_obj_code_get_name(const byte *code_info);
 
 mp_obj_t mp_identity(mp_obj_t self);
 MP_DECLARE_CONST_FUN_OBJ_1(mp_identity_obj);
diff --git a/py/objfun.c b/py/objfun.c
index 85f531c88b513..3542cc0e3f0b8 100644
--- a/py/objfun.c
+++ b/py/objfun.c
@@ -143,13 +143,13 @@ const mp_obj_type_t mp_type_fun_builtin_var = {
 /******************************************************************************/
 /* byte code functions                                                        */
 
-qstr mp_obj_code_get_name(const byte *code_info) {
+STATIC qstr mp_obj_code_get_name(const mp_obj_fun_bc_t *fun, const byte *code_info) {
     MP_BC_PRELUDE_SIZE_DECODE(code_info);
-    #if MICROPY_PERSISTENT_CODE
-    return code_info[0] | (code_info[1] << 8);
-    #else
-    return mp_decode_uint_value(code_info);
+    mp_uint_t name = mp_decode_uint_value(code_info);
+    #if MICROPY_EMIT_BYTECODE_USES_QSTR_TABLE
+    name = fun->context->constants.qstr_table[name];
     #endif
+    return name;
 }
 
 #if MICROPY_EMIT_NATIVE
@@ -167,7 +167,7 @@ qstr mp_obj_fun_get_name(mp_const_obj_t fun_in) {
 
     const byte *bc = fun->bytecode;
     MP_BC_PRELUDE_SIG_DECODE(bc);
-    return mp_obj_code_get_name(bc);
+    return mp_obj_code_get_name(fun, bc);
 }
 
 #if MICROPY_CPYTHON_COMPAT
@@ -209,7 +209,7 @@ STATIC void dump_args(const mp_obj_t *a, size_t sz) {
 
 #define INIT_CODESTATE(code_state, _fun_bc, _n_state, n_args, n_kw, args) \
     code_state->fun_bc = _fun_bc; \
-    code_state->ip = 0; \
+    code_state->ip = _fun_bc->bytecode; \
     code_state->n_state = _n_state; \
     mp_setup_code_state(code_state, n_args, n_kw, args); \
     code_state->old_globals = mp_globals_get();
@@ -240,7 +240,7 @@ mp_code_state_t *mp_obj_fun_bc_prepare_codestate(mp_obj_t self_in, size_t n_args
     INIT_CODESTATE(code_state, self, n_state, n_args, n_kw, args);
 
     // execute the byte code with the correct globals context
-    mp_globals_set(self->globals);
+    mp_globals_set(self->context->module.globals);
 
     return code_state;
 }
@@ -285,7 +285,7 @@ STATIC mp_obj_t fun_bc_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const
     INIT_CODESTATE(code_state, self, n_state, n_args, n_kw, args);
 
     // execute the byte code with the correct globals context
-    mp_globals_set(self->globals);
+    mp_globals_set(self->context->module.globals);
     mp_vm_return_kind_t vm_return_kind = mp_execute_bytecode(code_state, MP_OBJ_NULL);
     mp_globals_set(code_state->old_globals);
 
@@ -358,7 +358,7 @@ void mp_obj_fun_bc_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
     }
     if (attr == MP_QSTR___globals__) {
         mp_obj_fun_bc_t *self = MP_OBJ_TO_PTR(self_in);
-        dest[0] = MP_OBJ_FROM_PTR(self->globals);
+        dest[0] = MP_OBJ_FROM_PTR(self->context->module.globals);
     }
 }
 #endif
@@ -377,25 +377,29 @@ const mp_obj_type_t mp_type_fun_bc = {
     #endif
 };
 
-mp_obj_t mp_obj_new_fun_bc(mp_obj_t def_args_in, mp_obj_t def_kw_args, const byte *code, const mp_uint_t *const_table) {
+mp_obj_t mp_obj_new_fun_bc(const mp_obj_t *def_args, const byte *code, const mp_module_context_t *context, struct _mp_raw_code_t *const *child_table) {
     size_t n_def_args = 0;
     size_t n_extra_args = 0;
-    mp_obj_tuple_t *def_args = MP_OBJ_TO_PTR(def_args_in);
-    if (def_args_in != MP_OBJ_NULL) {
-        assert(mp_obj_is_type(def_args_in, &mp_type_tuple));
-        n_def_args = def_args->len;
-        n_extra_args = def_args->len;
+    mp_obj_tuple_t *def_pos_args = NULL;
+    mp_obj_t def_kw_args = MP_OBJ_NULL;
+    if (def_args != NULL && def_args[0] != MP_OBJ_NULL) {
+        assert(mp_obj_is_type(def_args[0], &mp_type_tuple));
+        def_pos_args = MP_OBJ_TO_PTR(def_args[0]);
+        n_def_args = def_pos_args->len;
+        n_extra_args = def_pos_args->len;
     }
-    if (def_kw_args != MP_OBJ_NULL) {
+    if (def_args != NULL && def_args[1] != MP_OBJ_NULL) {
+        assert(mp_obj_is_type(def_args[1], &mp_type_dict));
+        def_kw_args = def_args[1];
         n_extra_args += 1;
     }
     mp_obj_fun_bc_t *o = m_new_obj_var(mp_obj_fun_bc_t, mp_obj_t, n_extra_args);
     o->base.type = &mp_type_fun_bc;
-    o->globals = mp_globals_get();
     o->bytecode = code;
-    o->const_table = const_table;
-    if (def_args != NULL) {
-        memcpy(o->extra_args, def_args->items, n_def_args * sizeof(mp_obj_t));
+    o->context = context;
+    o->child_table = child_table;
+    if (def_pos_args != NULL) {
+        memcpy(o->extra_args, def_pos_args->items, n_def_args * sizeof(mp_obj_t));
     }
     if (def_kw_args != MP_OBJ_NULL) {
         o->extra_args[n_def_args] = def_kw_args;
@@ -423,8 +427,8 @@ STATIC const mp_obj_type_t mp_type_fun_native = {
     .unary_op = mp_generic_unary_op,
 };
 
-mp_obj_t mp_obj_new_fun_native(mp_obj_t def_args_in, mp_obj_t def_kw_args, const void *fun_data, const mp_uint_t *const_table) {
-    mp_obj_fun_bc_t *o = MP_OBJ_TO_PTR(mp_obj_new_fun_bc(def_args_in, def_kw_args, (const byte *)fun_data, const_table));
+mp_obj_t mp_obj_new_fun_native(const mp_obj_t *def_args, const void *fun_data, const mp_module_context_t *mc, struct _mp_raw_code_t *const *child_table) {
+    mp_obj_fun_bc_t *o = MP_OBJ_TO_PTR(mp_obj_new_fun_bc(def_args, (const byte *)fun_data, mc, child_table));
     o->base.type = &mp_type_fun_native;
     return MP_OBJ_FROM_PTR(o);
 }
diff --git a/py/objfun.h b/py/objfun.h
index 771bf31a95c58..9de15b8841553 100644
--- a/py/objfun.h
+++ b/py/objfun.h
@@ -26,13 +26,14 @@
 #ifndef MICROPY_INCLUDED_PY_OBJFUN_H
 #define MICROPY_INCLUDED_PY_OBJFUN_H
 
+#include "py/bc.h"
 #include "py/obj.h"
 
 typedef struct _mp_obj_fun_bc_t {
     mp_obj_base_t base;
-    mp_obj_dict_t *globals;         // the context within which this function was defined
-    const byte *bytecode;           // bytecode for the function
-    const mp_uint_t *const_table;   // constant table
+    const mp_module_context_t *context;         // context within which this function was defined
+    struct _mp_raw_code_t *const *child_table;  // table of children
+    const byte *bytecode;                       // bytecode for the function
     #if MICROPY_PY_SYS_SETTRACE
     const struct _mp_raw_code_t *rc;
     #endif
@@ -42,6 +43,9 @@ typedef struct _mp_obj_fun_bc_t {
     mp_obj_t extra_args[];
 } mp_obj_fun_bc_t;
 
+mp_obj_t mp_obj_new_fun_bc(const mp_obj_t *def_args, const byte *code, const mp_module_context_t *cm, struct _mp_raw_code_t *const *raw_code_table);
+mp_obj_t mp_obj_new_fun_native(const mp_obj_t *def_args, const void *fun_data, const mp_module_context_t *cm, struct _mp_raw_code_t *const *raw_code_table);
+mp_obj_t mp_obj_new_fun_asm(size_t n_args, const void *fun_data, mp_uint_t type_sig);
 void mp_obj_fun_bc_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest);
 
 #endif // MICROPY_INCLUDED_PY_OBJFUN_H
diff --git a/py/objgenerator.c b/py/objgenerator.c
index 784310092ea11..cbe79e66a5c62 100644
--- a/py/objgenerator.c
+++ b/py/objgenerator.c
@@ -65,7 +65,7 @@ STATIC mp_obj_t gen_wrap_call(mp_obj_t self_in, size_t n_args, size_t n_kw, cons
 
     o->pend_exc = mp_const_none;
     o->code_state.fun_bc = self_fun;
-    o->code_state.ip = 0;
+    o->code_state.ip = self_fun->bytecode;
     o->code_state.n_state = n_state;
     mp_setup_code_state(&o->code_state, n_args, n_kw, args);
     return MP_OBJ_FROM_PTR(o);
@@ -91,14 +91,18 @@ STATIC mp_obj_t native_gen_wrap_call(mp_obj_t self_in, size_t n_args, size_t n_k
     // The state for a native generating function is held in the same struct as a bytecode function
     mp_obj_fun_bc_t *self_fun = MP_OBJ_TO_PTR(self_in);
 
-    // Determine start of prelude, and extract n_state from it
+    // Determine start of prelude.
     uintptr_t prelude_offset = ((uintptr_t *)self_fun->bytecode)[0];
     #if MICROPY_EMIT_NATIVE_PRELUDE_AS_BYTES_OBJ
     // Prelude is in bytes object in const_table, at index prelude_offset
-    mp_obj_str_t *prelude_bytes = MP_OBJ_TO_PTR(self_fun->const_table[prelude_offset]);
-    prelude_offset = (const byte *)prelude_bytes->data - self_fun->bytecode;
+    mp_obj_str_t *prelude_bytes = MP_OBJ_TO_PTR(self_fun->context->constants.obj_table[prelude_offset]);
+    const uint8_t *prelude_ptr = prelude_bytes->data;
+    #else
+    const uint8_t *prelude_ptr = self_fun->bytecode + prelude_offset;
     #endif
-    const uint8_t *ip = self_fun->bytecode + prelude_offset;
+
+    // Extract n_state from the prelude.
+    const uint8_t *ip = prelude_ptr;
     size_t n_state, n_exc_stack_unused, scope_flags, n_pos_args, n_kwonly_args, n_def_args;
     MP_BC_PRELUDE_SIG_DECODE_INTO(ip, n_state, n_exc_stack_unused, scope_flags, n_pos_args, n_kwonly_args, n_def_args);
     size_t n_exc_stack = 0;
@@ -111,7 +115,7 @@ STATIC mp_obj_t native_gen_wrap_call(mp_obj_t self_in, size_t n_args, size_t n_k
     // Parse the input arguments and set up the code state
     o->pend_exc = mp_const_none;
     o->code_state.fun_bc = self_fun;
-    o->code_state.ip = (const byte *)prelude_offset;
+    o->code_state.ip = prelude_ptr;
     o->code_state.n_state = n_state;
     mp_setup_code_state(&o->code_state, n_args, n_kw, args);
 
@@ -184,7 +188,7 @@ mp_vm_return_kind_t mp_obj_gen_resume(mp_obj_t self_in, mp_obj_t send_value, mp_
 
     // Set up the correct globals context for the generator and execute it
     self->code_state.old_globals = mp_globals_get();
-    mp_globals_set(self->code_state.fun_bc->globals);
+    mp_globals_set(self->code_state.fun_bc->context->module.globals);
 
     mp_vm_return_kind_t ret_kind;
 
diff --git a/py/objmodule.c b/py/objmodule.c
index 9be4bad92c05e..4b04f7ca9cfd7 100644
--- a/py/objmodule.c
+++ b/py/objmodule.c
@@ -112,6 +112,7 @@ const mp_obj_type_t mp_type_module = {
     .attr = module_attr,
 };
 
+#include "py/bc.h"
 mp_obj_t mp_obj_new_module(qstr module_name) {
     mp_map_t *mp_loaded_modules_map = &MP_STATE_VM(mp_loaded_modules_dict).map;
     mp_map_elem_t *el = mp_map_lookup(mp_loaded_modules_map, MP_OBJ_NEW_QSTR(module_name), MP_MAP_LOOKUP_ADD_IF_NOT_FOUND);
@@ -122,12 +123,12 @@ mp_obj_t mp_obj_new_module(qstr module_name) {
     }
 
     // create new module object
-    mp_obj_module_t *o = m_new_obj(mp_obj_module_t);
-    o->base.type = &mp_type_module;
-    o->globals = MP_OBJ_TO_PTR(mp_obj_new_dict(MICROPY_MODULE_DICT_SIZE));
+    mp_module_context_t *o = m_new_obj(mp_module_context_t);
+    o->module.base.type = &mp_type_module;
+    o->module.globals = MP_OBJ_TO_PTR(mp_obj_new_dict(MICROPY_MODULE_DICT_SIZE));
 
     // store __name__ entry in the module
-    mp_obj_dict_store(MP_OBJ_FROM_PTR(o->globals), MP_OBJ_NEW_QSTR(MP_QSTR___name__), MP_OBJ_NEW_QSTR(module_name));
+    mp_obj_dict_store(MP_OBJ_FROM_PTR(o->module.globals), MP_OBJ_NEW_QSTR(MP_QSTR___name__), MP_OBJ_NEW_QSTR(module_name));
 
     // store the new module into the slot in the global dict holding all modules
     el->value = MP_OBJ_FROM_PTR(o);
diff --git a/py/persistentcode.c b/py/persistentcode.c
index ac523990c1bcd..b473f1830824e 100644
--- a/py/persistentcode.c
+++ b/py/persistentcode.c
@@ -63,57 +63,6 @@ STATIC int mp_small_int_bits(void) {
 }
 #endif
 
-#define QSTR_WINDOW_SIZE (32)
-
-typedef struct _qstr_window_t {
-    uint16_t idx; // indexes the head of the window
-    uint16_t window[QSTR_WINDOW_SIZE];
-} qstr_window_t;
-
-// Push a qstr to the head of the window, and the tail qstr is overwritten
-STATIC void qstr_window_push(qstr_window_t *qw, qstr qst) {
-    qw->idx = (qw->idx + 1) % QSTR_WINDOW_SIZE;
-    qw->window[qw->idx] = qst;
-}
-
-// Pull an existing qstr from within the window to the head of the window
-STATIC qstr qstr_window_pull(qstr_window_t *qw, size_t idx) {
-    qstr qst = qw->window[idx];
-    if (idx > qw->idx) {
-        memmove(&qw->window[idx], &qw->window[idx + 1], (QSTR_WINDOW_SIZE - idx - 1) * sizeof(uint16_t));
-        qw->window[QSTR_WINDOW_SIZE - 1] = qw->window[0];
-        idx = 0;
-    }
-    memmove(&qw->window[idx], &qw->window[idx + 1], (qw->idx - idx) * sizeof(uint16_t));
-    qw->window[qw->idx] = qst;
-    return qst;
-}
-
-#if MICROPY_PERSISTENT_CODE_LOAD
-
-// Access a qstr at the given index, relative to the head of the window (0=head)
-STATIC qstr qstr_window_access(qstr_window_t *qw, size_t idx) {
-    return qstr_window_pull(qw, (qw->idx + QSTR_WINDOW_SIZE - idx) % QSTR_WINDOW_SIZE);
-}
-
-#endif
-
-#if MICROPY_PERSISTENT_CODE_SAVE
-
-// Insert a qstr at the head of the window, either by pulling an existing one or pushing a new one
-STATIC size_t qstr_window_insert(qstr_window_t *qw, qstr qst) {
-    for (size_t idx = 0; idx < QSTR_WINDOW_SIZE; ++idx) {
-        if (qw->window[idx] == qst) {
-            qstr_window_pull(qw, idx);
-            return (qw->idx + QSTR_WINDOW_SIZE - idx) % QSTR_WINDOW_SIZE;
-        }
-    }
-    qstr_window_push(qw, qst);
-    return QSTR_WINDOW_SIZE;
-}
-
-#endif
-
 typedef struct _bytecode_prelude_t {
     uint n_state;
     uint n_exc_stack;
@@ -124,23 +73,6 @@ typedef struct _bytecode_prelude_t {
     uint code_info_size;
 } bytecode_prelude_t;
 
-// ip will point to start of opcodes
-// return value will point to simple_name, source_file qstrs
-STATIC byte *extract_prelude(const byte **ip, bytecode_prelude_t *prelude) {
-    MP_BC_PRELUDE_SIG_DECODE(*ip);
-    prelude->n_state = n_state;
-    prelude->n_exc_stack = n_exc_stack;
-    prelude->scope_flags = scope_flags;
-    prelude->n_pos_args = n_pos_args;
-    prelude->n_kwonly_args = n_kwonly_args;
-    prelude->n_def_pos_args = n_def_pos_args;
-    MP_BC_PRELUDE_SIZE_DECODE(*ip);
-    byte *ip_info = (byte *)*ip;
-    *ip += n_info;
-    *ip += n_cell;
-    return ip_info;
-}
-
 #endif // MICROPY_PERSISTENT_CODE_LOAD || MICROPY_PERSISTENT_CODE_SAVE
 
 #if MICROPY_PERSISTENT_CODE_LOAD
@@ -148,13 +80,14 @@ STATIC byte *extract_prelude(const byte **ip, bytecode_prelude_t *prelude) {
 #include "py/parsenum.h"
 
 STATIC int read_byte(mp_reader_t *reader);
-STATIC size_t read_uint(mp_reader_t *reader, byte **out);
+STATIC size_t read_uint(mp_reader_t *reader);
 
 #if MICROPY_EMIT_MACHINE_CODE
 
 typedef struct _reloc_info_t {
     mp_reader_t *reader;
-    mp_uint_t *const_table;
+    uint8_t *rodata;
+    uint8_t *bss;
 } reloc_info_t;
 
 #if MICROPY_EMIT_THUMB
@@ -197,13 +130,13 @@ void mp_native_relocate(void *ri_in, uint8_t *text, uintptr_t reloc_text) {
     while ((op = read_byte(ri->reader)) != 0xff) {
         if (op & 1) {
             // Point to new location to make adjustments
-            size_t addr = read_uint(ri->reader, NULL);
+            size_t addr = read_uint(ri->reader);
             if ((addr & 1) == 0) {
                 // Point to somewhere in text
                 addr_to_adjust = &((uintptr_t *)text)[addr >> 1];
             } else {
                 // Point to somewhere in rodata
-                addr_to_adjust = &((uintptr_t *)ri->const_table[1])[addr >> 1];
+                addr_to_adjust = &((uintptr_t *)ri->rodata)[addr >> 1];
             }
         }
         op >>= 1;
@@ -212,15 +145,18 @@ void mp_native_relocate(void *ri_in, uint8_t *text, uintptr_t reloc_text) {
         if (op <= 5) {
             if (op & 1) {
                 // Read in number of adjustments to make
-                n = read_uint(ri->reader, NULL);
+                n = read_uint(ri->reader);
             }
             op >>= 1;
             if (op == 0) {
                 // Destination is text
                 dest = reloc_text;
+            } else if (op == 1) {
+                // Destination is rodata
+                dest = (uintptr_t)ri->rodata;
             } else {
-                // Destination is rodata (op=1) or bss (op=1 if no rodata, else op=2)
-                dest = ri->const_table[op];
+                // Destination is bss
+                dest = (uintptr_t)ri->bss;
             }
         } else if (op == 6) {
             // Destination is mp_fun_table itself
@@ -247,14 +183,10 @@ STATIC void read_bytes(mp_reader_t *reader, byte *buf, size_t len) {
     }
 }
 
-STATIC size_t read_uint(mp_reader_t *reader, byte **out) {
+STATIC size_t read_uint(mp_reader_t *reader) {
     size_t unum = 0;
     for (;;) {
         byte b = reader->readbyte(reader->data);
-        if (out != NULL) {
-            **out = b;
-            ++*out;
-        }
         unum = (unum << 7) | (b & 0x7f);
         if ((b & 0x80) == 0) {
             break;
@@ -263,35 +195,41 @@ STATIC size_t read_uint(mp_reader_t *reader, byte **out) {
     return unum;
 }
 
-STATIC qstr load_qstr(mp_reader_t *reader, qstr_window_t *qw) {
-    size_t len = read_uint(reader, NULL);
-    if (len == 0) {
-        // static qstr
-        return read_byte(reader);
-    }
+STATIC qstr load_qstr(mp_reader_t *reader) {
+    size_t len = read_uint(reader);
     if (len & 1) {
-        // qstr in window
-        return qstr_window_access(qw, len >> 1);
+        // static qstr
+        return len >> 1;
     }
     len >>= 1;
     char *str = m_new(char, len);
     read_bytes(reader, (byte *)str, len);
+    read_byte(reader); // read and discard null terminator
     qstr qst = qstr_from_strn(str, len);
     m_del(char, str, len);
-    qstr_window_push(qw, qst);
     return qst;
 }
 
 STATIC mp_obj_t load_obj(mp_reader_t *reader) {
     byte obj_type = read_byte(reader);
+    #if MICROPY_EMIT_MACHINE_CODE
+    if (obj_type == 't') {
+        return MP_OBJ_FROM_PTR(&mp_fun_table);
+    } else
+    #endif
     if (obj_type == 'e') {
         return MP_OBJ_FROM_PTR(&mp_const_ellipsis_obj);
     } else {
-        size_t len = read_uint(reader, NULL);
+        size_t len = read_uint(reader);
+        if (len == 0 && obj_type == 'b') {
+            read_byte(reader); // skip null terminator
+            return mp_const_empty_bytes;
+        }
         vstr_t vstr;
         vstr_init_len(&vstr, len);
         read_bytes(reader, (byte *)vstr.buf, len);
         if (obj_type == 's' || obj_type == 'b') {
+            read_byte(reader); // skip null terminator
             return mp_obj_new_str_from_vstr(obj_type == 's' ? &mp_type_str : &mp_type_bytes, &vstr);
         } else if (obj_type == 'i') {
             return mp_parse_num_integer(vstr.buf, vstr.len, 10, NULL);
@@ -302,58 +240,12 @@ STATIC mp_obj_t load_obj(mp_reader_t *reader) {
     }
 }
 
-STATIC void load_prelude_qstrs(mp_reader_t *reader, qstr_window_t *qw, byte *ip) {
-    qstr simple_name = load_qstr(reader, qw);
-    ip[0] = simple_name;
-    ip[1] = simple_name >> 8;
-    qstr source_file = load_qstr(reader, qw);
-    ip[2] = source_file;
-    ip[3] = source_file >> 8;
-}
-
-STATIC void load_prelude(mp_reader_t *reader, qstr_window_t *qw, byte **ip, bytecode_prelude_t *prelude) {
-    // Read in the prelude header
-    byte *ip_read = *ip;
-    read_uint(reader, &ip_read);                    // read in n_state/etc (is effectively a var-uint)
-    read_uint(reader, &ip_read);                    // read in n_info/n_cell (is effectively a var-uint)
-
-    // Prelude header has been read into *ip, now decode and extract values from it
-    extract_prelude((const byte **)ip, prelude);
-
-    // Load qstrs in prelude
-    load_prelude_qstrs(reader, qw, ip_read);
-    ip_read += 4;
-
-    // Read remaining code info
-    read_bytes(reader, ip_read, *ip - ip_read);
-}
-
-STATIC void load_bytecode(mp_reader_t *reader, qstr_window_t *qw, byte *ip, byte *ip_top) {
-    while (ip < ip_top) {
-        *ip = read_byte(reader);
-        size_t sz;
-        uint f = mp_opcode_format(ip, &sz, false);
-        ++ip;
-        --sz;
-        if (f == MP_BC_FORMAT_QSTR) {
-            qstr qst = load_qstr(reader, qw);
-            *ip++ = qst;
-            *ip++ = qst >> 8;
-            sz -= 2;
-        } else if (f == MP_BC_FORMAT_VAR_UINT) {
-            while ((*ip++ = read_byte(reader)) & 0x80) {
-            }
-        }
-        read_bytes(reader, ip, sz);
-        ip += sz;
-    }
-}
-
-STATIC mp_raw_code_t *load_raw_code(mp_reader_t *reader, qstr_window_t *qw) {
+STATIC mp_raw_code_t *load_raw_code(mp_reader_t *reader) {
     // Load function kind and data length
-    size_t kind_len = read_uint(reader, NULL);
+    size_t kind_len = read_uint(reader);
     int kind = (kind_len & 3) + MP_CODE_BYTECODE;
-    size_t fun_data_len = kind_len >> 2;
+    bool has_children = !!(kind_len & 4);
+    size_t fun_data_len = kind_len >> 3;
 
     #if !MICROPY_EMIT_MACHINE_CODE
     if (kind != MP_CODE_BYTECODE) {
@@ -362,23 +254,18 @@ STATIC mp_raw_code_t *load_raw_code(mp_reader_t *reader, qstr_window_t *qw) {
     #endif
 
     uint8_t *fun_data = NULL;
-    bytecode_prelude_t prelude = {0};
     #if MICROPY_EMIT_MACHINE_CODE
     size_t prelude_offset = 0;
-    mp_uint_t type_sig = 0;
-    size_t n_qstr_link = 0;
+    mp_uint_t native_scope_flags = 0;
+    mp_uint_t native_n_pos_args = 0;
+    mp_uint_t native_type_sig = 0;
     #endif
 
     if (kind == MP_CODE_BYTECODE) {
         // Allocate memory for the bytecode
         fun_data = m_new(uint8_t, fun_data_len);
-
-        // Load prelude
-        byte *ip = fun_data;
-        load_prelude(reader, qw, &ip, &prelude);
-
         // Load bytecode
-        load_bytecode(reader, qw, ip, fun_data + fun_data_len);
+        read_bytes(reader, fun_data, fun_data_len);
 
     #if MICROPY_EMIT_MACHINE_CODE
     } else {
@@ -389,10 +276,10 @@ STATIC mp_raw_code_t *load_raw_code(mp_reader_t *reader, qstr_window_t *qw) {
 
         if (kind == MP_CODE_NATIVE_PY || kind == MP_CODE_NATIVE_VIPER) {
             // Parse qstr link table and link native code
-            n_qstr_link = read_uint(reader, NULL);
+            size_t n_qstr_link = read_uint(reader);
             for (size_t i = 0; i < n_qstr_link; ++i) {
-                size_t off = read_uint(reader, NULL);
-                qstr qst = load_qstr(reader, qw);
+                size_t off = read_uint(reader);
+                qstr qst = load_qstr(reader);
                 uint8_t *dest = fun_data + (off >> 2);
                 if ((off & 3) == 0) {
                     // Generic 16-bit link
@@ -409,113 +296,92 @@ STATIC mp_raw_code_t *load_raw_code(mp_reader_t *reader, qstr_window_t *qw) {
         }
 
         if (kind == MP_CODE_NATIVE_PY) {
-            // Extract prelude for later use
-            prelude_offset = read_uint(reader, NULL);
+            // Read prelude offset within fun_data, and extract scope flags.
+            prelude_offset = read_uint(reader);
             const byte *ip = fun_data + prelude_offset;
-            byte *ip_info = extract_prelude(&ip, &prelude);
-            // Load qstrs in prelude
-            load_prelude_qstrs(reader, qw, ip_info);
+            MP_BC_PRELUDE_SIG_DECODE(ip);
+            native_scope_flags = scope_flags;
         } else {
-            // Load basic scope info for viper and asm
-            prelude.scope_flags = read_uint(reader, NULL);
-            prelude.n_pos_args = 0;
-            prelude.n_kwonly_args = 0;
+            // Load basic scope info for viper and asm.
+            native_scope_flags = read_uint(reader);
             if (kind == MP_CODE_NATIVE_ASM) {
-                prelude.n_pos_args = read_uint(reader, NULL);
-                type_sig = read_uint(reader, NULL);
+                native_n_pos_args = read_uint(reader);
+                native_type_sig = read_uint(reader);
             }
         }
     #endif
     }
 
-    size_t n_obj = 0;
-    size_t n_raw_code = 0;
-    mp_uint_t *const_table = NULL;
+    size_t n_children = 0;
+    mp_raw_code_t **children = NULL;
 
-    if (kind != MP_CODE_NATIVE_ASM) {
-        // Load constant table for bytecode, native and viper
-
-        // Number of entries in constant table
-        n_obj = read_uint(reader, NULL);
-        n_raw_code = read_uint(reader, NULL);
-
-        // Allocate constant table
-        size_t n_alloc = prelude.n_pos_args + prelude.n_kwonly_args + n_obj + n_raw_code;
-        #if MICROPY_EMIT_MACHINE_CODE
-        if (kind != MP_CODE_BYTECODE) {
-            ++n_alloc; // additional entry for mp_fun_table
-            if (prelude.scope_flags & MP_SCOPE_FLAG_VIPERRODATA) {
-                ++n_alloc; // additional entry for rodata
-            }
-            if (prelude.scope_flags & MP_SCOPE_FLAG_VIPERBSS) {
-                ++n_alloc; // additional entry for BSS
-            }
+    #if MICROPY_EMIT_MACHINE_CODE
+    // Load optional BSS/rodata for viper.
+    uint8_t *rodata = NULL;
+    uint8_t *bss = NULL;
+    if (kind == MP_CODE_NATIVE_VIPER) {
+        size_t rodata_size = 0;
+        if (native_scope_flags & MP_SCOPE_FLAG_VIPERRODATA) {
+            rodata_size = read_uint(reader);
         }
-        #endif
 
-        const_table = m_new(mp_uint_t, n_alloc);
-        mp_uint_t *ct = const_table;
-
-        // Load function argument names (initial entries in const_table)
-        // (viper has n_pos_args=n_kwonly_args=0 so doesn't load any qstrs here)
-        for (size_t i = 0; i < prelude.n_pos_args + prelude.n_kwonly_args; ++i) {
-            *ct++ = (mp_uint_t)MP_OBJ_NEW_QSTR(load_qstr(reader, qw));
+        size_t bss_size = 0;
+        if (native_scope_flags & MP_SCOPE_FLAG_VIPERBSS) {
+            bss_size = read_uint(reader);
         }
 
-        #if MICROPY_EMIT_MACHINE_CODE
-        if (kind != MP_CODE_BYTECODE) {
-            // Populate mp_fun_table entry
-            *ct++ = (mp_uint_t)(uintptr_t)&mp_fun_table;
-
-            // Allocate and load rodata if needed
-            if (prelude.scope_flags & MP_SCOPE_FLAG_VIPERRODATA) {
-                size_t size = read_uint(reader, NULL);
-                uint8_t *rodata = m_new(uint8_t, size);
-                read_bytes(reader, rodata, size);
-                *ct++ = (uintptr_t)rodata;
+        if (rodata_size + bss_size != 0) {
+            bss_size = (uintptr_t)MP_ALIGN(bss_size, sizeof(uintptr_t));
+            uint8_t *data = m_new0(uint8_t, bss_size + rodata_size);
+            bss = data;
+            rodata = bss + bss_size;
+            if (native_scope_flags & MP_SCOPE_FLAG_VIPERRODATA) {
+                read_bytes(reader, rodata, rodata_size);
             }
 
-            // Allocate BSS if needed
-            if (prelude.scope_flags & MP_SCOPE_FLAG_VIPERBSS) {
-                size_t size = read_uint(reader, NULL);
-                uint8_t *bss = m_new0(uint8_t, size);
-                *ct++ = (uintptr_t)bss;
-            }
+            // Viper code with BSS/rodata should not have any children.
+            // Reuse the children pointer to reference the BSS/rodata
+            // memory so that it is not reclaimed by the GC.
+            assert(!has_children);
+            children = (void *)data;
         }
-        #endif
+    }
+    #endif
 
-        // Load constant objects and raw code children
-        for (size_t i = 0; i < n_obj; ++i) {
-            *ct++ = (mp_uint_t)load_obj(reader);
-        }
-        for (size_t i = 0; i < n_raw_code; ++i) {
-            *ct++ = (mp_uint_t)(uintptr_t)load_raw_code(reader, qw);
+    // Load children if any.
+    if (has_children) {
+        n_children = read_uint(reader);
+        children = m_new(mp_raw_code_t *, n_children);
+        for (size_t i = 0; i < n_children; ++i) {
+            children[i] = load_raw_code(reader);
         }
     }
 
     // Create raw_code and return it
     mp_raw_code_t *rc = mp_emit_glue_new_raw_code();
     if (kind == MP_CODE_BYTECODE) {
+        const byte *ip = fun_data;
+        MP_BC_PRELUDE_SIG_DECODE(ip);
         // Assign bytecode to raw code object
         mp_emit_glue_assign_bytecode(rc, fun_data,
             #if MICROPY_PERSISTENT_CODE_SAVE || MICROPY_DEBUG_PRINTERS
             fun_data_len,
             #endif
-            const_table,
+            children,
             #if MICROPY_PERSISTENT_CODE_SAVE
-            n_obj, n_raw_code,
+            n_children,
             #endif
-            prelude.scope_flags);
+            scope_flags);
 
     #if MICROPY_EMIT_MACHINE_CODE
     } else {
         // Relocate and commit code to executable address space
-        reloc_info_t ri = {reader, const_table};
+        reloc_info_t ri = {reader, rodata, bss};
         #if defined(MP_PLAT_COMMIT_EXEC)
-        void *opt_ri = (prelude.scope_flags & MP_SCOPE_FLAG_VIPERRELOC) ? &ri : NULL;
+        void *opt_ri = (native_scope_flags & MP_SCOPE_FLAG_VIPERRELOC) ? &ri : NULL;
         fun_data = MP_PLAT_COMMIT_EXEC(fun_data, fun_data_len, opt_ri);
         #else
-        if (prelude.scope_flags & MP_SCOPE_FLAG_VIPERRELOC) {
+        if (native_scope_flags & MP_SCOPE_FLAG_VIPERRELOC) {
             #if MICROPY_PERSISTENT_CODE_TRACK_RELOC_CODE
             // If native code needs relocations then it's not guaranteed that a pointer to
             // the head of `buf` (containing the machine code) will be retained for the GC
@@ -534,26 +400,27 @@ STATIC mp_raw_code_t *load_raw_code(mp_reader_t *reader, qstr_window_t *qw) {
 
         // Assign native code to raw code object
         mp_emit_glue_assign_native(rc, kind,
-            fun_data, fun_data_len, const_table,
+            fun_data, fun_data_len,
+            children,
             #if MICROPY_PERSISTENT_CODE_SAVE
+            n_children,
             prelude_offset,
-            n_obj, n_raw_code,
-            n_qstr_link, NULL,
+            0, NULL,
             #endif
-            prelude.n_pos_args, prelude.scope_flags, type_sig);
+            native_scope_flags, native_n_pos_args, native_type_sig
+            );
     #endif
     }
     return rc;
 }
 
-mp_raw_code_t *mp_raw_code_load(mp_reader_t *reader) {
+mp_compiled_module_t mp_raw_code_load(mp_reader_t *reader, mp_module_context_t *context) {
     byte header[4];
     read_bytes(reader, header, sizeof(header));
     if (header[0] != 'M'
         || header[1] != MPY_VERSION
         || MPY_FEATURE_DECODE_FLAGS(header[2]) != MPY_FEATURE_FLAGS
-        || header[3] > mp_small_int_bits()
-        || read_uint(reader, NULL) > QSTR_WINDOW_SIZE) {
+        || header[3] > mp_small_int_bits()) {
         mp_raise_ValueError(MP_ERROR_TEXT("incompatible .mpy file"));
     }
     if (MPY_FEATURE_DECODE_ARCH(header[2]) != MP_NATIVE_ARCH_NONE) {
@@ -562,25 +429,49 @@ mp_raw_code_t *mp_raw_code_load(mp_reader_t *reader) {
             mp_raise_ValueError(MP_ERROR_TEXT("incompatible .mpy arch"));
         }
     }
-    qstr_window_t qw;
-    qw.idx = 0;
-    mp_raw_code_t *rc = load_raw_code(reader, &qw);
+
+    size_t n_qstr = read_uint(reader);
+    size_t n_obj = read_uint(reader);
+    mp_module_context_alloc_tables(context, n_qstr, n_obj);
+
+    // Load qstrs.
+    for (size_t i = 0; i < n_qstr; ++i) {
+        context->constants.qstr_table[i] = load_qstr(reader);
+    }
+
+    // Load constant objects.
+    for (size_t i = 0; i < n_obj; ++i) {
+        context->constants.obj_table[i] = load_obj(reader);
+    }
+
+    // Load top-level module.
+    mp_compiled_module_t cm2;
+    cm2.rc = load_raw_code(reader);
+    cm2.context = context;
+
+    #if MICROPY_PERSISTENT_CODE_SAVE
+    cm2.has_native = MPY_FEATURE_DECODE_ARCH(header[2]) != MP_NATIVE_ARCH_NONE;
+    cm2.n_qstr = n_qstr;
+    cm2.n_obj = n_obj;
+    #endif
+
     reader->close(reader->data);
-    return rc;
+
+    return cm2;
 }
 
-mp_raw_code_t *mp_raw_code_load_mem(const byte *buf, size_t len) {
+mp_compiled_module_t mp_raw_code_load_mem(const byte *buf, size_t len, mp_module_context_t *context) {
     mp_reader_t reader;
     mp_reader_new_mem(&reader, buf, len, 0);
-    return mp_raw_code_load(&reader);
+    return mp_raw_code_load(&reader, context);
 }
 
 #if MICROPY_HAS_FILE_READER
 
-mp_raw_code_t *mp_raw_code_load_file(const char *filename) {
+mp_compiled_module_t mp_raw_code_load_file(const char *filename, mp_module_context_t *context) {
     mp_reader_t reader;
     mp_reader_new_file(&reader, filename);
-    return mp_raw_code_load(&reader);
+    return mp_raw_code_load(&reader, context);
 }
 
 #endif // MICROPY_HAS_FILE_READER
@@ -607,26 +498,25 @@ STATIC void mp_print_uint(mp_print_t *print, size_t n) {
     print->print_strn(print->data, (char *)p, buf + sizeof(buf) - p);
 }
 
-STATIC void save_qstr(mp_print_t *print, qstr_window_t *qw, qstr qst) {
+STATIC void save_qstr(mp_print_t *print, qstr qst) {
     if (qst <= QSTR_LAST_STATIC) {
         // encode static qstr
-        byte buf[2] = {0, qst & 0xff};
-        mp_print_bytes(print, buf, 2);
-        return;
-    }
-    size_t idx = qstr_window_insert(qw, qst);
-    if (idx < QSTR_WINDOW_SIZE) {
-        // qstr found in window, encode index to it
-        mp_print_uint(print, idx << 1 | 1);
+        mp_print_uint(print, qst << 1 | 1);
         return;
     }
     size_t len;
     const byte *str = qstr_data(qst, &len);
     mp_print_uint(print, len << 1);
-    mp_print_bytes(print, str, len);
+    mp_print_bytes(print, str, len + 1); // +1 to store null terminator
 }
 
 STATIC void save_obj(mp_print_t *print, mp_obj_t o) {
+    #if MICROPY_EMIT_MACHINE_CODE
+    if (o == MP_OBJ_FROM_PTR(&mp_fun_table)) {
+        byte obj_type = 't';
+        mp_print_bytes(print, &obj_type, 1);
+    } else
+    #endif
     if (mp_obj_is_str_or_bytes(o)) {
         byte obj_type;
         if (mp_obj_is_str(o)) {
@@ -638,7 +528,7 @@ STATIC void save_obj(mp_print_t *print, mp_obj_t o) {
         const char *str = mp_obj_str_get_data(o, &len);
         mp_print_bytes(print, &obj_type, 1);
         mp_print_uint(print, len);
-        mp_print_bytes(print, (const byte *)str, len);
+        mp_print_bytes(print, (const byte *)str, len + 1); // +1 to store null terminator
     } else if (MP_OBJ_TO_PTR(o) == &mp_const_ellipsis_obj) {
         byte obj_type = 'e';
         mp_print_bytes(print, &obj_type, 1);
@@ -667,136 +557,45 @@ STATIC void save_obj(mp_print_t *print, mp_obj_t o) {
     }
 }
 
-STATIC void save_prelude_qstrs(mp_print_t *print, qstr_window_t *qw, const byte *ip) {
-    save_qstr(print, qw, ip[0] | (ip[1] << 8)); // simple_name
-    save_qstr(print, qw, ip[2] | (ip[3] << 8)); // source_file
-}
-
-STATIC void save_bytecode(mp_print_t *print, qstr_window_t *qw, const byte *ip, const byte *ip_top) {
-    while (ip < ip_top) {
-        size_t sz;
-        uint f = mp_opcode_format(ip, &sz, true);
-        if (f == MP_BC_FORMAT_QSTR) {
-            mp_print_bytes(print, ip, 1);
-            qstr qst = ip[1] | (ip[2] << 8);
-            save_qstr(print, qw, qst);
-            ip += 3;
-            sz -= 3;
-        }
-        mp_print_bytes(print, ip, sz);
-        ip += sz;
-    }
-}
-
-STATIC void save_raw_code(mp_print_t *print, mp_raw_code_t *rc, qstr_window_t *qstr_window) {
+STATIC void save_raw_code(mp_print_t *print, const mp_raw_code_t *rc) {
     // Save function kind and data length
-    mp_print_uint(print, (rc->fun_data_len << 2) | (rc->kind - MP_CODE_BYTECODE));
+    mp_print_uint(print, (rc->fun_data_len << 3) | ((rc->n_children != 0) << 2) | (rc->kind - MP_CODE_BYTECODE));
 
-    bytecode_prelude_t prelude;
+    // Save function code.
+    mp_print_bytes(print, rc->fun_data, rc->fun_data_len);
 
-    if (rc->kind == MP_CODE_BYTECODE) {
-        // Extract prelude
-        const byte *ip = rc->fun_data;
-        const byte *ip_info = extract_prelude(&ip, &prelude);
-
-        // Save prelude
-        mp_print_bytes(print, rc->fun_data, ip_info - (const byte *)rc->fun_data);
-        save_prelude_qstrs(print, qstr_window, ip_info);
-        ip_info += 4;
-        mp_print_bytes(print, ip_info, ip - ip_info);
-
-        // Save bytecode
-        const byte *ip_top = (const byte *)rc->fun_data + rc->fun_data_len;
-        save_bytecode(print, qstr_window, ip, ip_top);
     #if MICROPY_EMIT_MACHINE_CODE
-    } else {
-        // Save native code
-        mp_print_bytes(print, rc->fun_data, rc->fun_data_len);
-
-        if (rc->kind == MP_CODE_NATIVE_PY || rc->kind == MP_CODE_NATIVE_VIPER) {
-            // Save qstr link table for native code
-            mp_print_uint(print, rc->n_qstr);
-            for (size_t i = 0; i < rc->n_qstr; ++i) {
-                mp_print_uint(print, rc->qstr_link[i].off);
-                save_qstr(print, qstr_window, rc->qstr_link[i].qst);
-            }
+    if (rc->kind == MP_CODE_NATIVE_PY || rc->kind == MP_CODE_NATIVE_VIPER) {
+        // Save qstr link table for native code
+        mp_print_uint(print, rc->n_qstr);
+        for (size_t i = 0; i < rc->n_qstr; ++i) {
+            mp_print_uint(print, rc->qstr_link[i].off);
+            save_qstr(print, rc->qstr_link[i].qst);
         }
-
-        if (rc->kind == MP_CODE_NATIVE_PY) {
-            // Save prelude size
-            mp_print_uint(print, rc->prelude_offset);
-
-            // Extract prelude and save qstrs in prelude
-            const byte *ip = (const byte *)rc->fun_data + rc->prelude_offset;
-            const byte *ip_info = extract_prelude(&ip, &prelude);
-            save_prelude_qstrs(print, qstr_window, ip_info);
-        } else {
-            // Save basic scope info for viper and asm
-            mp_print_uint(print, rc->scope_flags & MP_SCOPE_FLAG_ALL_SIG);
-            prelude.n_pos_args = 0;
-            prelude.n_kwonly_args = 0;
-            if (rc->kind == MP_CODE_NATIVE_ASM) {
-                mp_print_uint(print, rc->n_pos_args);
-                mp_print_uint(print, rc->type_sig);
-            }
-        }
-    #endif
     }
 
-    if (rc->kind != MP_CODE_NATIVE_ASM) {
-        // Save constant table for bytecode, native and viper
-
-        // Number of entries in constant table
-        mp_print_uint(print, rc->n_obj);
-        mp_print_uint(print, rc->n_raw_code);
-
-        const mp_uint_t *const_table = rc->const_table;
-
-        // Save function argument names (initial entries in const_table)
-        // (viper has n_pos_args=n_kwonly_args=0 so doesn't save any qstrs here)
-        for (size_t i = 0; i < prelude.n_pos_args + prelude.n_kwonly_args; ++i) {
-            mp_obj_t o = (mp_obj_t)*const_table++;
-            save_qstr(print, qstr_window, MP_OBJ_QSTR_VALUE(o));
-        }
-
-        if (rc->kind != MP_CODE_BYTECODE) {
-            // Skip saving mp_fun_table entry
-            ++const_table;
-        }
-
-        // Save constant objects and raw code children
-        for (size_t i = 0; i < rc->n_obj; ++i) {
-            save_obj(print, (mp_obj_t)*const_table++);
+    if (rc->kind == MP_CODE_NATIVE_PY) {
+        // Save prelude size
+        mp_print_uint(print, rc->prelude_offset);
+    } else if (rc->kind == MP_CODE_NATIVE_VIPER || rc->kind == MP_CODE_NATIVE_ASM) {
+        // Save basic scope info for viper and asm
+        mp_print_uint(print, rc->scope_flags & MP_SCOPE_FLAG_ALL_SIG);
+        if (rc->kind == MP_CODE_NATIVE_ASM) {
+            mp_print_uint(print, rc->n_pos_args);
+            mp_print_uint(print, rc->type_sig);
         }
-        for (size_t i = 0; i < rc->n_raw_code; ++i) {
-            save_raw_code(print, (mp_raw_code_t *)(uintptr_t)*const_table++, qstr_window);
-        }
-    }
-}
-
-STATIC bool mp_raw_code_has_native(mp_raw_code_t *rc) {
-    if (rc->kind != MP_CODE_BYTECODE) {
-        return true;
     }
+    #endif
 
-    const byte *ip = rc->fun_data;
-    bytecode_prelude_t prelude;
-    extract_prelude(&ip, &prelude);
-
-    const mp_uint_t *const_table = rc->const_table
-        + prelude.n_pos_args + prelude.n_kwonly_args
-        + rc->n_obj;
-
-    for (size_t i = 0; i < rc->n_raw_code; ++i) {
-        if (mp_raw_code_has_native((mp_raw_code_t *)(uintptr_t)*const_table++)) {
-            return true;
+    if (rc->n_children) {
+        mp_print_uint(print, rc->n_children);
+        for (size_t i = 0; i < rc->n_children; ++i) {
+            save_raw_code(print, rc->children[i]);
         }
     }
-
-    return false;
 }
 
-void mp_raw_code_save(mp_raw_code_t *rc, mp_print_t *print) {
+void mp_raw_code_save(mp_compiled_module_t *cm, mp_print_t *print) {
     // header contains:
     //  byte  'M'
     //  byte  version
@@ -813,16 +612,27 @@ void mp_raw_code_save(mp_raw_code_t *rc, mp_print_t *print) {
         mp_small_int_bits(),
         #endif
     };
-    if (mp_raw_code_has_native(rc)) {
+    if (cm->has_native) {
         header[2] |= MPY_FEATURE_ENCODE_ARCH(MPY_FEATURE_ARCH_DYNAMIC);
     }
     mp_print_bytes(print, header, sizeof(header));
-    mp_print_uint(print, QSTR_WINDOW_SIZE);
 
-    qstr_window_t qw;
-    qw.idx = 0;
-    memset(qw.window, 0, sizeof(qw.window));
-    save_raw_code(print, rc, &qw);
+    // Number of entries in constant table.
+    mp_print_uint(print, cm->n_qstr);
+    mp_print_uint(print, cm->n_obj);
+
+    // Save qstrs.
+    for (size_t i = 0; i < cm->n_qstr; ++i) {
+        save_qstr(print, cm->context->constants.qstr_table[i]);
+    }
+
+    // Save constant objects.
+    for (size_t i = 0; i < cm->n_obj; ++i) {
+        save_obj(print, (mp_obj_t)cm->context->constants.obj_table[i]);
+    }
+
+    // Save outer raw code, which will save all its child raw codes.
+    save_raw_code(print, cm->rc);
 }
 
 #if MICROPY_PERSISTENT_CODE_SAVE_FILE
@@ -839,12 +649,12 @@ STATIC void fd_print_strn(void *env, const char *str, size_t len) {
     (void)ret;
 }
 
-void mp_raw_code_save_file(mp_raw_code_t *rc, const char *filename) {
+void mp_raw_code_save_file(mp_compiled_module_t *cm, const char *filename) {
     MP_THREAD_GIL_EXIT();
     int fd = open(filename, O_WRONLY | O_CREAT | O_TRUNC, 0644);
     MP_THREAD_GIL_ENTER();
     mp_print_t fd_print = {(void *)(intptr_t)fd, fd_print_strn};
-    mp_raw_code_save(rc, &fd_print);
+    mp_raw_code_save(cm, &fd_print);
     MP_THREAD_GIL_EXIT();
     close(fd);
     MP_THREAD_GIL_ENTER();
diff --git a/py/persistentcode.h b/py/persistentcode.h
index 94fc3bf2d34b2..1991ba26fff43 100644
--- a/py/persistentcode.h
+++ b/py/persistentcode.h
@@ -31,7 +31,7 @@
 #include "py/emitglue.h"
 
 // The current version of .mpy files
-#define MPY_VERSION 5
+#define MPY_VERSION 6
 
 // Macros to encode/decode flags to/from the feature byte
 #define MPY_FEATURE_ENCODE_FLAGS(flags) (flags)
@@ -102,12 +102,12 @@ enum {
     MP_NATIVE_ARCH_XTENSAWIN,
 };
 
-mp_raw_code_t *mp_raw_code_load(mp_reader_t *reader);
-mp_raw_code_t *mp_raw_code_load_mem(const byte *buf, size_t len);
-mp_raw_code_t *mp_raw_code_load_file(const char *filename);
+mp_compiled_module_t mp_raw_code_load(mp_reader_t *reader, mp_module_context_t *ctx);
+mp_compiled_module_t mp_raw_code_load_mem(const byte *buf, size_t len, mp_module_context_t *ctx);
+mp_compiled_module_t mp_raw_code_load_file(const char *filename, mp_module_context_t *ctx);
 
-void mp_raw_code_save(mp_raw_code_t *rc, mp_print_t *print);
-void mp_raw_code_save_file(mp_raw_code_t *rc, const char *filename);
+void mp_raw_code_save(mp_compiled_module_t *cm, mp_print_t *print);
+void mp_raw_code_save_file(mp_compiled_module_t *cm, const char *filename);
 
 void mp_native_relocate(void *reloc, uint8_t *text, uintptr_t reloc_text);
 
diff --git a/py/profile.c b/py/profile.c
index d0ac99e074aab..4e23e9eac43b5 100644
--- a/py/profile.c
+++ b/py/profile.c
@@ -27,14 +27,16 @@
 #include "py/profile.h"
 #include "py/bc0.h"
 #include "py/gc.h"
+#include "py/objfun.h"
 
 #if MICROPY_PY_SYS_SETTRACE
 
 #define prof_trace_cb MP_STATE_THREAD(prof_trace_callback)
+#define QSTR_MAP(context, idx) (context->constants.qstr_table[idx])
 
 STATIC uint mp_prof_bytecode_lineno(const mp_raw_code_t *rc, size_t bc) {
     const mp_bytecode_prelude_t *prelude = &rc->prelude;
-    return mp_bytecode_get_source_line(prelude->line_info, bc);
+    return mp_bytecode_get_source_line(prelude->line_info, prelude->line_info_top, bc);
 }
 
 void mp_prof_extract_prelude(const byte *bytecode, mp_bytecode_prelude_t *prelude) {
@@ -50,13 +52,14 @@ void mp_prof_extract_prelude(const byte *bytecode, mp_bytecode_prelude_t *prelud
 
     MP_BC_PRELUDE_SIZE_DECODE(ip);
 
-    prelude->line_info = ip + 4;
+    prelude->line_info_top = ip + n_info;
     prelude->opcodes = ip + n_info + n_cell;
 
-    qstr block_name = ip[0] | (ip[1] << 8);
-    qstr source_file = ip[2] | (ip[3] << 8);
-    prelude->qstr_block_name = block_name;
-    prelude->qstr_source_file = source_file;
+    prelude->qstr_block_name_idx = mp_decode_uint_value(ip);
+    for (size_t i = 0; i < 1 + n_pos_args + n_kwonly_args; ++i) {
+        ip = mp_decode_uint_skip(ip);
+    }
+    prelude->line_info = ip;
 }
 
 /******************************************************************************/
@@ -69,22 +72,19 @@ STATIC void code_print(const mp_print_t *print, mp_obj_t o_in, mp_print_kind_t k
     const mp_bytecode_prelude_t *prelude = &rc->prelude;
     mp_printf(print,
         "<code object %q at 0x%p, file \"%q\", line %d>",
-        prelude->qstr_block_name,
+        QSTR_MAP(o->context, prelude->qstr_block_name_idx),
         o,
-        prelude->qstr_source_file,
+        QSTR_MAP(o->context, 0),
         rc->line_of_definition
         );
 }
 
-STATIC mp_obj_tuple_t *code_consts(const mp_raw_code_t *rc) {
-    const mp_bytecode_prelude_t *prelude = &rc->prelude;
-    int start = prelude->n_pos_args + prelude->n_kwonly_args + rc->n_obj;
-    int stop = prelude->n_pos_args + prelude->n_kwonly_args + rc->n_obj + rc->n_raw_code;
-    mp_obj_tuple_t *consts = MP_OBJ_TO_PTR(mp_obj_new_tuple(stop - start + 1, NULL));
+STATIC mp_obj_tuple_t *code_consts(const mp_module_context_t *context, const mp_raw_code_t *rc) {
+    mp_obj_tuple_t *consts = MP_OBJ_TO_PTR(mp_obj_new_tuple(rc->n_children + 1, NULL));
 
     size_t const_no = 0;
-    for (int i = start; i < stop; ++i) {
-        mp_obj_t code = mp_obj_new_code((const mp_raw_code_t *)MP_OBJ_TO_PTR(rc->const_table[i]));
+    for (size_t i = 0; i < rc->n_children; ++i) {
+        mp_obj_t code = mp_obj_new_code(context, rc->children[i]);
         if (code == MP_OBJ_NULL) {
             m_malloc_fail(sizeof(mp_obj_code_t));
         }
@@ -149,16 +149,16 @@ STATIC void code_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
                 );
             break;
         case MP_QSTR_co_consts:
-            dest[0] = MP_OBJ_FROM_PTR(code_consts(rc));
+            dest[0] = MP_OBJ_FROM_PTR(code_consts(o->context, rc));
             break;
         case MP_QSTR_co_filename:
-            dest[0] = MP_OBJ_NEW_QSTR(prelude->qstr_source_file);
+            dest[0] = MP_OBJ_NEW_QSTR(QSTR_MAP(o->context, 0));
             break;
         case MP_QSTR_co_firstlineno:
             dest[0] = MP_OBJ_NEW_SMALL_INT(mp_prof_bytecode_lineno(rc, 0));
             break;
         case MP_QSTR_co_name:
-            dest[0] = MP_OBJ_NEW_QSTR(prelude->qstr_block_name);
+            dest[0] = MP_OBJ_NEW_QSTR(QSTR_MAP(o->context, prelude->qstr_block_name_idx));
             break;
         case MP_QSTR_co_names:
             dest[0] = MP_OBJ_FROM_PTR(o->dict_locals);
@@ -180,12 +180,13 @@ const mp_obj_type_t mp_type_settrace_codeobj = {
     .attr = code_attr,
 };
 
-mp_obj_t mp_obj_new_code(const mp_raw_code_t *rc) {
+mp_obj_t mp_obj_new_code(const mp_module_context_t *context, const mp_raw_code_t *rc) {
     mp_obj_code_t *o = m_new_obj_maybe(mp_obj_code_t);
     if (o == NULL) {
         return MP_OBJ_NULL;
     }
     o->base.type = &mp_type_settrace_codeobj;
+    o->context = context;
     o->rc = rc;
     o->dict_locals = mp_locals_get(); // this is a wrong! how to do this properly?
     o->lnotab = MP_OBJ_NULL;
@@ -204,9 +205,9 @@ STATIC void frame_print(const mp_print_t *print, mp_obj_t o_in, mp_print_kind_t
     mp_printf(print,
         "<frame at 0x%p, file '%q', line %d, code %q>",
         frame,
-        prelude->qstr_source_file,
+        QSTR_MAP(code->context, 0),
         frame->lineno,
-        prelude->qstr_block_name
+        QSTR_MAP(code->context, prelude->qstr_block_name_idx)
         );
 }
 
@@ -229,7 +230,7 @@ STATIC void frame_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
             dest[0] = MP_OBJ_FROM_PTR(o->code);
             break;
         case MP_QSTR_f_globals:
-            dest[0] = MP_OBJ_FROM_PTR(o->code_state->fun_bc->globals);
+            dest[0] = MP_OBJ_FROM_PTR(o->code_state->fun_bc->context->module.globals);
             break;
         case MP_QSTR_f_lasti:
             dest[0] = MP_OBJ_NEW_SMALL_INT(o->lasti);
@@ -258,7 +259,7 @@ mp_obj_t mp_obj_new_frame(const mp_code_state_t *code_state) {
         return MP_OBJ_NULL;
     }
 
-    mp_obj_code_t *code = o->code = MP_OBJ_TO_PTR(mp_obj_new_code(code_state->fun_bc->rc));
+    mp_obj_code_t *code = o->code = MP_OBJ_TO_PTR(mp_obj_new_code(code_state->fun_bc->context, code_state->fun_bc->rc));
     if (code == NULL) {
         return MP_OBJ_NULL;
     }
diff --git a/py/profile.h b/py/profile.h
index 64e207d04fbf3..7f3f914034623 100644
--- a/py/profile.h
+++ b/py/profile.h
@@ -34,7 +34,9 @@
 #define mp_prof_is_executing MP_STATE_THREAD(prof_callback_is_executing)
 
 typedef struct _mp_obj_code_t {
+    // TODO this was 4 words
     mp_obj_base_t base;
+    const mp_module_context_t *context;
     const mp_raw_code_t *rc;
     mp_obj_dict_t *dict_locals;
     mp_obj_t lnotab;
@@ -53,7 +55,7 @@ typedef struct _mp_obj_frame_t {
 
 void mp_prof_extract_prelude(const byte *bytecode, mp_bytecode_prelude_t *prelude);
 
-mp_obj_t mp_obj_new_code(const mp_raw_code_t *rc);
+mp_obj_t mp_obj_new_code(const mp_module_context_t *mc, const mp_raw_code_t *rc);
 mp_obj_t mp_obj_new_frame(const mp_code_state_t *code_state);
 
 // This is the implementation for the sys.settrace
diff --git a/py/qstr.h b/py/qstr.h
index ded105760c421..fa634f90b0ebb 100644
--- a/py/qstr.h
+++ b/py/qstr.h
@@ -46,6 +46,7 @@ enum {
 };
 
 typedef size_t qstr;
+typedef uint16_t qstr_short_t;
 
 #if MICROPY_QSTR_BYTES_IN_HASH == 1
 typedef uint8_t qstr_hash_t;
diff --git a/py/scope.c b/py/scope.c
index 98e02fb53fe31..8fc0943289b4f 100644
--- a/py/scope.c
+++ b/py/scope.c
@@ -40,7 +40,7 @@ STATIC const uint8_t scope_simple_name_table[] = {
     [SCOPE_GEN_EXPR] = MP_QSTR__lt_genexpr_gt_,
 };
 
-scope_t *scope_new(scope_kind_t kind, mp_parse_node_t pn, qstr source_file, mp_uint_t emit_options) {
+scope_t *scope_new(scope_kind_t kind, mp_parse_node_t pn, mp_uint_t emit_options) {
     // Make sure those qstrs indeed fit in an uint8_t.
     MP_STATIC_ASSERT(MP_QSTR__lt_module_gt_ <= UINT8_MAX);
     MP_STATIC_ASSERT(MP_QSTR__lt_lambda_gt_ <= UINT8_MAX);
@@ -52,7 +52,6 @@ scope_t *scope_new(scope_kind_t kind, mp_parse_node_t pn, qstr source_file, mp_u
     scope_t *scope = m_new0(scope_t, 1);
     scope->kind = kind;
     scope->pn = pn;
-    scope->source_file = source_file;
     if (kind == SCOPE_FUNCTION || kind == SCOPE_CLASS) {
         assert(MP_PARSE_NODE_IS_STRUCT(pn));
         scope->simple_name = MP_PARSE_NODE_LEAF_ARG(((mp_parse_node_struct_t *)pn)->nodes[0]);
diff --git a/py/scope.h b/py/scope.h
index edf164c4adace..5006deadea830 100644
--- a/py/scope.h
+++ b/py/scope.h
@@ -75,7 +75,6 @@ typedef struct _scope_t {
     struct _scope_t *next;
     mp_parse_node_t pn;
     mp_raw_code_t *raw_code;
-    uint16_t source_file; // a qstr
     uint16_t simple_name; // a qstr
     uint16_t scope_flags;  // see runtime0.h
     uint16_t emit_options; // see emitglue.h
@@ -90,7 +89,7 @@ typedef struct _scope_t {
     id_info_t *id_info;
 } scope_t;
 
-scope_t *scope_new(scope_kind_t kind, mp_parse_node_t pn, qstr source_file, mp_uint_t emit_options);
+scope_t *scope_new(scope_kind_t kind, mp_parse_node_t pn, mp_uint_t emit_options);
 void scope_free(scope_t *scope);
 id_info_t *scope_find_or_add_id(scope_t *scope, qstr qstr, id_info_kind_t kind);
 id_info_t *scope_find(scope_t *scope, qstr qstr);
diff --git a/py/showbc.c b/py/showbc.c
index da8077eccd56f..1300ac1fa3a04 100644
--- a/py/showbc.c
+++ b/py/showbc.c
@@ -41,43 +41,32 @@
 #define DECODE_ULABEL do { unum = (ip[0] | (ip[1] << 8)); ip += 2; } while (0)
 #define DECODE_SLABEL do { unum = (ip[0] | (ip[1] << 8)) - 0x8000; ip += 2; } while (0)
 
-#if MICROPY_PERSISTENT_CODE
+#if MICROPY_EMIT_BYTECODE_USES_QSTR_TABLE
 
 #define DECODE_QSTR \
-    qst = ip[0] | ip[1] << 8; \
-    ip += 2;
-#define DECODE_PTR \
-    DECODE_UINT; \
-    unum = mp_showbc_const_table[unum]
-#define DECODE_OBJ \
     DECODE_UINT; \
-    unum = mp_showbc_const_table[unum]
+    qst = mp_showbc_constants->qstr_table[unum]
 
 #else
 
-#define DECODE_QSTR { \
-        qst = 0; \
-        do { \
-            qst = (qst << 7) + (*ip & 0x7f); \
-        } while ((*ip++ & 0x80) != 0); \
-}
-#define DECODE_PTR do { \
-        ip = (byte *)MP_ALIGN(ip, sizeof(void *)); \
-        unum = (uintptr_t)*(void **)ip; \
-        ip += sizeof(void *); \
-} while (0)
-#define DECODE_OBJ do { \
-        ip = (byte *)MP_ALIGN(ip, sizeof(mp_obj_t)); \
-        unum = (mp_uint_t)*(mp_obj_t *)ip; \
-        ip += sizeof(mp_obj_t); \
-} while (0)
+#define DECODE_QSTR \
+    DECODE_UINT; \
+    qst = unum;
 
 #endif
 
-const byte *mp_showbc_code_start;
-const mp_uint_t *mp_showbc_const_table;
+#define DECODE_PTR \
+    DECODE_UINT;
+
+#define DECODE_OBJ \
+    DECODE_UINT; \
+    unum = (mp_uint_t)mp_showbc_constants->obj_table[unum]
 
-void mp_bytecode_print(const mp_print_t *print, const void *descr, const byte *ip, mp_uint_t len, const mp_uint_t *const_table) {
+const byte * mp_showbc_code_start;
+const mp_module_constants_t *mp_showbc_constants;
+
+#include "py/emitglue.h"
+void mp_bytecode_print(const mp_print_t *print, const void *descr, const byte *ip, mp_uint_t len, const mp_module_constants_t *cm) {
     mp_showbc_code_start = ip;
 
     // Decode prelude
@@ -85,16 +74,15 @@ void mp_bytecode_print(const mp_print_t *print, const void *descr, const byte *i
     MP_BC_PRELUDE_SIZE_DECODE(ip);
     const byte *code_info = ip;
 
-    #if MICROPY_PERSISTENT_CODE
-    qstr block_name = code_info[0] | (code_info[1] << 8);
-    qstr source_file = code_info[2] | (code_info[3] << 8);
-    code_info += 4;
-    #else
     qstr block_name = mp_decode_uint(&code_info);
-    qstr source_file = mp_decode_uint(&code_info);
+    #if MICROPY_EMIT_BYTECODE_USES_QSTR_TABLE
+    block_name = cm->qstr_table[block_name];
+    qstr source_file = cm->qstr_table[0];
+    #else
+    qstr source_file = cm->source_file;
     #endif
-    mp_printf(print, "File %s, code block '%s' (descriptor: %p, bytecode @%p " UINT_FMT " bytes)\n",
-        qstr_str(source_file), qstr_str(block_name), descr, mp_showbc_code_start, len);
+    mp_printf(print, "File %s, code block '%s' (descriptor: %p, bytecode @%p " UINT_FMT " bytes)\n",// rct=%p\n",
+        qstr_str(source_file), qstr_str(block_name), descr, mp_showbc_code_start, len);// , ((mp_raw_code_t*)descr)->children);
 
     // raw bytecode dump
     size_t prelude_size = ip - mp_showbc_code_start + n_info + n_cell;
@@ -111,7 +99,11 @@ void mp_bytecode_print(const mp_print_t *print, const void *descr, const byte *i
     // bytecode prelude: arg names (as qstr objects)
     mp_printf(print, "arg names:");
     for (mp_uint_t i = 0; i < n_pos_args + n_kwonly_args; i++) {
-        mp_printf(print, " %s", qstr_str(MP_OBJ_QSTR_VALUE(const_table[i])));
+        qstr qst = mp_decode_uint(&code_info);
+        #if MICROPY_EMIT_BYTECODE_USES_QSTR_TABLE
+        qst = cm->qstr_table[qst];
+        #endif
+        mp_printf(print, " %s", qstr_str(qst));
     }
     mp_printf(print, "\n");
 
@@ -120,6 +112,7 @@ void mp_bytecode_print(const mp_print_t *print, const void *descr, const byte *i
 
     // skip over code_info
     ip += n_info;
+    const byte *line_info_top = ip;
 
     // bytecode prelude: initialise closed over variables
     for (size_t i = 0; i < n_cell; ++i) {
@@ -132,7 +125,7 @@ void mp_bytecode_print(const mp_print_t *print, const void *descr, const byte *i
         mp_int_t bc = 0;
         mp_uint_t source_line = 1;
         mp_printf(print, "  bc=" INT_FMT " line=" UINT_FMT "\n", bc, source_line);
-        for (const byte *ci = code_info; *ci;) {
+        for (const byte *ci = code_info; ci < line_info_top;) {
             if ((ci[0] & 0x80) == 0) {
                 // 0b0LLBBBBB encoding
                 bc += ci[0] & 0x1f;
@@ -147,7 +140,7 @@ void mp_bytecode_print(const mp_print_t *print, const void *descr, const byte *i
             mp_printf(print, "  bc=" INT_FMT " line=" UINT_FMT "\n", bc, source_line);
         }
     }
-    mp_bytecode_print2(print, ip, len - prelude_size, const_table);
+    mp_bytecode_print2(print, ip, len - prelude_size, cm);
 }
 
 const byte *mp_bytecode_print_str(const mp_print_t *print, const byte *ip) {
@@ -535,9 +528,9 @@ const byte *mp_bytecode_print_str(const mp_print_t *print, const byte *ip) {
     return ip;
 }
 
-void mp_bytecode_print2(const mp_print_t *print, const byte *ip, size_t len, const mp_uint_t *const_table) {
+void mp_bytecode_print2(const mp_print_t *print, const byte *ip, size_t len, const mp_module_constants_t *cm) {
     mp_showbc_code_start = ip;
-    mp_showbc_const_table = const_table;
+    mp_showbc_constants = cm;
     while (ip < len + mp_showbc_code_start) {
         mp_printf(print, "%02u ", (uint)(ip - mp_showbc_code_start));
         ip = mp_bytecode_print_str(print, ip);
diff --git a/py/vm.c b/py/vm.c
index 0289bcfae5278..b762c92bf2d57 100644
--- a/py/vm.c
+++ b/py/vm.c
@@ -31,9 +31,9 @@
 
 #include "py/emitglue.h"
 #include "py/objtype.h"
+#include "py/objfun.h"
 #include "py/runtime.h"
 #include "py/bc0.h"
-#include "py/bc.h"
 #include "py/profile.h"
 
 // *FORMAT-OFF*
@@ -44,7 +44,7 @@
 #else
 #define TRACE_PREFIX mp_printf(&mp_plat_print, "sp=%d ", (int)(sp - &code_state->state[0] + 1))
 #endif
-#define TRACE(ip) TRACE_PREFIX; mp_bytecode_print2(&mp_plat_print, ip, 1, code_state->fun_bc->const_table);
+#define TRACE(ip) TRACE_PREFIX; mp_bytecode_print2(&mp_plat_print, ip, 1, &code_state->fun_bc->context->constants);
 #else
 #define TRACE(ip)
 #endif
@@ -64,35 +64,28 @@
 #define DECODE_ULABEL size_t ulab = (ip[0] | (ip[1] << 8)); ip += 2
 #define DECODE_SLABEL size_t slab = (ip[0] | (ip[1] << 8)) - 0x8000; ip += 2
 
-#if MICROPY_PERSISTENT_CODE
+#if MICROPY_EMIT_BYTECODE_USES_QSTR_TABLE
 
 #define DECODE_QSTR \
-    qstr qst = ip[0] | ip[1] << 8; \
-    ip += 2;
-#define DECODE_PTR \
-    DECODE_UINT; \
-    void *ptr = (void*)(uintptr_t)code_state->fun_bc->const_table[unum]
-#define DECODE_OBJ \
     DECODE_UINT; \
-    mp_obj_t obj = (mp_obj_t)code_state->fun_bc->const_table[unum]
+    qstr qst = qstr_table[unum]
 
 #else
 
-#define DECODE_QSTR qstr qst = 0; \
-    do { \
-        qst = (qst << 7) + (*ip & 0x7f); \
-    } while ((*ip++ & 0x80) != 0)
-#define DECODE_PTR \
-    ip = (byte*)MP_ALIGN(ip, sizeof(void*)); \
-    void *ptr = *(void**)ip; \
-    ip += sizeof(void*)
-#define DECODE_OBJ \
-    ip = (byte*)MP_ALIGN(ip, sizeof(mp_obj_t)); \
-    mp_obj_t obj = *(mp_obj_t*)ip; \
-    ip += sizeof(mp_obj_t)
+#define DECODE_QSTR \
+    DECODE_UINT; \
+    qstr qst = unum;
 
 #endif
 
+#define DECODE_PTR \
+    DECODE_UINT; \
+    void *ptr = (void *)(uintptr_t)code_state->fun_bc->child_table[unum]
+
+#define DECODE_OBJ \
+    DECODE_UINT; \
+    mp_obj_t obj = (mp_obj_t)code_state->fun_bc->context->constants.obj_table[unum]
+
 #define PUSH(val) *++sp = (val)
 #define POP() (*sp--)
 #define TOP() (*sp)
@@ -255,6 +248,9 @@ FRAME_SETUP();
             // local variables that are not visible to the exception handler
             const byte *ip = code_state->ip;
             mp_obj_t *sp = code_state->sp;
+            #if MICROPY_EMIT_BYTECODE_USES_QSTR_TABLE
+            const qstr_short_t *qstr_table = code_state->fun_bc->context->constants.qstr_table;
+            #endif
             mp_obj_t obj_shared;
             MICROPY_VM_HOOK_INIT
 
@@ -859,15 +855,15 @@ unwind_jump:;
 
                 ENTRY(MP_BC_MAKE_FUNCTION): {
                     DECODE_PTR;
-                    PUSH(mp_make_function_from_raw_code(ptr, MP_OBJ_NULL, MP_OBJ_NULL));
+                    PUSH(mp_make_function_from_raw_code(ptr, code_state->fun_bc->context, NULL));
                     DISPATCH();
                 }
 
                 ENTRY(MP_BC_MAKE_FUNCTION_DEFARGS): {
                     DECODE_PTR;
                     // Stack layout: def_tuple def_dict <- TOS
-                    mp_obj_t def_dict = POP();
-                    SET_TOP(mp_make_function_from_raw_code(ptr, TOP(), def_dict));
+                    sp -= 1;
+                    SET_TOP(mp_make_function_from_raw_code(ptr, code_state->fun_bc->context, sp));
                     DISPATCH();
                 }
 
@@ -876,7 +872,7 @@ unwind_jump:;
                     size_t n_closed_over = *ip++;
                     // Stack layout: closed_overs <- TOS
                     sp -= n_closed_over - 1;
-                    SET_TOP(mp_make_closure_from_raw_code(ptr, n_closed_over, sp));
+                    SET_TOP(mp_make_closure_from_raw_code(ptr, code_state->fun_bc->context, n_closed_over, sp));
                     DISPATCH();
                 }
 
@@ -885,7 +881,7 @@ unwind_jump:;
                     size_t n_closed_over = *ip++;
                     // Stack layout: def_tuple def_dict closed_overs <- TOS
                     sp -= 2 + n_closed_over - 1;
-                    SET_TOP(mp_make_closure_from_raw_code(ptr, 0x100 | n_closed_over, sp));
+                    SET_TOP(mp_make_closure_from_raw_code(ptr, code_state->fun_bc->context, 0x100 | n_closed_over, sp));
                     DISPATCH();
                 }
 
@@ -1384,23 +1380,20 @@ unwind_jump:;
                 const byte *ip = code_state->fun_bc->bytecode;
                 MP_BC_PRELUDE_SIG_DECODE(ip);
                 MP_BC_PRELUDE_SIZE_DECODE(ip);
+                const byte *line_info_top = ip + n_info;
                 const byte *bytecode_start = ip + n_info + n_cell;
-                #if !MICROPY_PERSISTENT_CODE
-                // so bytecode is aligned
-                bytecode_start = MP_ALIGN(bytecode_start, sizeof(mp_uint_t));
-                #endif
                 size_t bc = code_state->ip - bytecode_start;
-                #if MICROPY_PERSISTENT_CODE
-                qstr block_name = ip[0] | (ip[1] << 8);
-                qstr source_file = ip[2] | (ip[3] << 8);
-                ip += 4;
-                #else
                 qstr block_name = mp_decode_uint_value(ip);
-                ip = mp_decode_uint_skip(ip);
-                qstr source_file = mp_decode_uint_value(ip);
-                ip = mp_decode_uint_skip(ip);
+                for (size_t i = 0; i < 1 + n_pos_args + n_kwonly_args; ++i) {
+                    ip = mp_decode_uint_skip(ip);
+                }
+                #if MICROPY_EMIT_BYTECODE_USES_QSTR_TABLE
+                block_name = code_state->fun_bc->context->constants.qstr_table[block_name];
+                qstr source_file = code_state->fun_bc->context->constants.qstr_table[0];
+                #else
+                qstr source_file = code_state->fun_bc->context->constants.source_file;
                 #endif
-                size_t source_line = mp_bytecode_get_source_line(ip, bc);
+                size_t source_line = mp_bytecode_get_source_line(ip, line_info_top, bc);
                 mp_obj_exception_add_traceback(MP_OBJ_FROM_PTR(nlr.ret_val), source_file, source_line, block_name);
             }
 
diff --git a/shared/runtime/pyexec.c b/shared/runtime/pyexec.c
index 5f05c1da3e61e..ae6dd770b1769 100644
--- a/shared/runtime/pyexec.c
+++ b/shared/runtime/pyexec.c
@@ -83,7 +83,11 @@ STATIC int parse_compile_execute(const void *source, mp_parse_input_kind_t input
         #if MICROPY_MODULE_FROZEN_MPY
         if (exec_flags & EXEC_FLAG_SOURCE_IS_RAW_CODE) {
             // source is a raw_code object, create the function
-            module_fun = mp_make_function_from_raw_code(source, MP_OBJ_NULL, MP_OBJ_NULL);
+            const mp_frozen_module_t *frozen = source;
+            mp_module_context_t *ctx = m_new_obj(mp_module_context_t);
+            ctx->module.globals = mp_globals_get();
+            ctx->constants = frozen->constants;
+            module_fun = mp_make_function_from_raw_code(frozen->rc, ctx, NULL);
         } else
         #endif
         {
diff --git a/tests/cmdline/cmd_parsetree.py.exp b/tests/cmdline/cmd_parsetree.py.exp
index bee4fc99d1aa7..ac16f6d88d9a3 100644
--- a/tests/cmdline/cmd_parsetree.py.exp
+++ b/tests/cmdline/cmd_parsetree.py.exp
@@ -39,50 +39,52 @@
 [  13]           \(rule\|arglist\)(164) (n=1)
                    id(b)
 ----------------
-File cmdline/cmd_parsetree.py, code block '<module>' (descriptor: \.\+, bytecode @\.\+ bytes)
-Raw bytecode (code_info_size=\\d\+, bytecode_size=\\d\+):
-########
-\.\+63
+File cmdline/cmd_parsetree.py, code block '<module>' (descriptor: \.\+, bytecode @\.\+ 64 bytes)
+Raw bytecode (code_info_size=13, bytecode_size=51):
+ 20 16 01 60 28 23 23 24 24 24 24 24 25 2a 00 5f
+ 4b 05 00 16 02 42 f8 7f 51 16 03 10 04 16 05 23
+ 00 16 06 23 01 16 07 23 02 16 08 23 03 16 09 22
+ 80 7b 16 0a 23 04 14 0b 11 05 36 01 16 0c 51 63
 arg names:
 (N_STATE 5)
 (N_EXC_STACK 0)
   bc=0 line=1
   bc=0 line=4
-  bc=9 line=5
-  bc=12 line=6
-  bc=16 line=7
-  bc=22 line=8
-  bc=27 line=9
-  bc=32 line=10
-  bc=37 line=11
-  bc=42 line=12
-  bc=48 line=13
+  bc=8 line=5
+  bc=11 line=6
+  bc=14 line=7
+  bc=18 line=8
+  bc=22 line=9
+  bc=26 line=10
+  bc=30 line=11
+  bc=34 line=12
+  bc=39 line=13
 00 BUILD_TUPLE 0
 02 GET_ITER_STACK
-03 FOR_ITER 12
+03 FOR_ITER 11
 06 STORE_NAME i
-09 JUMP 3
-12 LOAD_CONST_NONE
-13 STORE_NAME a
-16 LOAD_CONST_STRING 'str'
-19 STORE_NAME b
-22 LOAD_CONST_OBJ \.\+
-24 STORE_NAME c
-27 LOAD_CONST_OBJ \.\+
-29 STORE_NAME d
-32 LOAD_CONST_OBJ \.\+
-34 STORE_NAME e
-37 LOAD_CONST_OBJ \.\+
-39 STORE_NAME f
-42 LOAD_CONST_SMALL_INT 123
-45 STORE_NAME g
-48 LOAD_CONST_OBJ \.\+
-50 LOAD_METHOD format
-53 LOAD_NAME b
-56 CALL_METHOD n=1 nkw=0
-58 STORE_NAME h
-61 LOAD_CONST_NONE
-62 RETURN_VALUE
+08 JUMP 3
+11 LOAD_CONST_NONE
+12 STORE_NAME a
+14 LOAD_CONST_STRING 'str'
+16 STORE_NAME b
+18 LOAD_CONST_OBJ \.\+='a very long str that will not be interned'
+20 STORE_NAME c
+22 LOAD_CONST_OBJ \.\+=b'bytes'
+24 STORE_NAME d
+26 LOAD_CONST_OBJ \.\+=b'a very long bytes that will not be interned'
+28 STORE_NAME e
+30 LOAD_CONST_OBJ \.\+=123456789012345678901234567890
+32 STORE_NAME f
+34 LOAD_CONST_SMALL_INT 123
+37 STORE_NAME g
+39 LOAD_CONST_OBJ \.\+="fstring: '{}'"
+41 LOAD_METHOD format
+43 LOAD_NAME b
+45 CALL_METHOD n=1 nkw=0
+47 STORE_NAME h
+49 LOAD_CONST_NONE
+50 RETURN_VALUE
 mem: total=\\d\+, current=\\d\+, peak=\\d\+
 stack: \\d\+ out of \\d\+
 GC: total: \\d\+, used: \\d\+, free: \\d\+
diff --git a/tests/cmdline/cmd_showbc.py.exp b/tests/cmdline/cmd_showbc.py.exp
index 22712b79eeb2b..031820fcd90ea 100644
--- a/tests/cmdline/cmd_showbc.py.exp
+++ b/tests/cmdline/cmd_showbc.py.exp
@@ -1,51 +1,144 @@
-File cmdline/cmd_showbc.py, code block '<module>' (descriptor: \.\+, bytecode @\.\+ bytes)
-Raw bytecode (code_info_size=\\d\+, bytecode_size=\\d\+):
-########
-\.\+63
+File cmdline/cmd_showbc.py, code block '<module>' (descriptor: \.\+, bytecode @\.\+ 63 bytes)
+Raw bytecode (code_info_size=18, bytecode_size=45):
+ 10 20 01 60 20 84 7d 64 60 88 07 64 60 69 20 62
+ 64 20 32 00 16 02 32 01 16 02 81 2a 01 53 33 02
+ 16 02 32 03 16 02 54 32 04 10 03 34 02 16 03 19
+ 03 32 05 16 02 80 10 04 2a 01 1b 05 69 51 63
 arg names:
 (N_STATE 3)
 (N_EXC_STACK 0)
   bc=0 line=1
-########
-  bc=\\d\+ line=160
+  bc=0 line=4
+  bc=0 line=5
+  bc=4 line=130
+  bc=8 line=133
+  bc=8 line=136
+  bc=16 line=143
+  bc=20 line=146
+  bc=20 line=149
+  bc=29 line=152
+  bc=29 line=153
+  bc=31 line=156
+  bc=35 line=159
+  bc=35 line=160
 00 MAKE_FUNCTION \.\+
-\\d\+ STORE_NAME f
-\\d\+ MAKE_FUNCTION \.\+
-\\d\+ STORE_NAME f
-\\d\+ LOAD_CONST_SMALL_INT 1
-\\d\+ BUILD_TUPLE 1
-\\d\+ LOAD_NULL
-\\d\+ MAKE_FUNCTION_DEFARGS \.\+
-\\d\+ STORE_NAME f
-\\d\+ MAKE_FUNCTION \.\+
-\\d\+ STORE_NAME f
-\\d\+ LOAD_BUILD_CLASS
-\\d\+ MAKE_FUNCTION \.\+
-\\d\+ LOAD_CONST_STRING 'Class'
-\\d\+ CALL_FUNCTION n=2 nkw=0
-\\d\+ STORE_NAME Class
-\\d\+ DELETE_NAME Class
-\\d\+ MAKE_FUNCTION \.\+
-\\d\+ STORE_NAME f
-\\d\+ LOAD_CONST_SMALL_INT 0
-\\d\+ LOAD_CONST_STRING '*'
-\\d\+ BUILD_TUPLE 1
-\\d\+ IMPORT_NAME 'sys'
-\\d\+ IMPORT_STAR
-\\d\+ LOAD_CONST_NONE
-\\d\+ RETURN_VALUE
-File cmdline/cmd_showbc.py, code block 'f' (descriptor: \.\+, bytecode @\.\+ bytes)
-Raw bytecode (code_info_size=\\d\+, bytecode_size=\\d\+):
+02 STORE_NAME f
+04 MAKE_FUNCTION \.\+
+06 STORE_NAME f
+08 LOAD_CONST_SMALL_INT 1
+09 BUILD_TUPLE 1
+11 LOAD_NULL
+12 MAKE_FUNCTION_DEFARGS \.\+
+14 STORE_NAME f
+16 MAKE_FUNCTION \.\+
+18 STORE_NAME f
+20 LOAD_BUILD_CLASS
+21 MAKE_FUNCTION \.\+
+23 LOAD_CONST_STRING 'Class'
+25 CALL_FUNCTION n=2 nkw=0
+27 STORE_NAME Class
+29 DELETE_NAME Class
+31 MAKE_FUNCTION \.\+
+33 STORE_NAME f
+35 LOAD_CONST_SMALL_INT 0
+36 LOAD_CONST_STRING '*'
+38 BUILD_TUPLE 1
+40 IMPORT_NAME 'sys'
+42 IMPORT_STAR
+43 LOAD_CONST_NONE
+44 RETURN_VALUE
+File cmdline/cmd_showbc.py, code block 'f' (descriptor: \.\+, bytecode @\.\+ 48\[24\] bytes)
+Raw bytecode (code_info_size=8\[46\], bytecode_size=398):
+ a8 12 9\[bf\] 03 02 60 60 26 22 24 64 22 26 25 25 24
+ 26 23 63 22 22 25 23 23 31 6d 25 65 25 25 69 68
+ 26 65 27 6a 62 20 23 62 2a 29 69 24 25 28 67 26
 ########
-\.\+rg names:
+\.\+81 63
+arg names:
 (N_STATE 22)
 (N_EXC_STACK 2)
 (INIT_CELL 14)
 (INIT_CELL 15)
 (INIT_CELL 16)
   bc=0 line=1
+  bc=0 line=4
+  bc=0 line=7
+  bc=6 line=8
+  bc=8 line=9
+  bc=12 line=10
+  bc=16 line=13
+  bc=18 line=14
+  bc=24 line=15
+  bc=29 line=16
+  bc=34 line=17
+  bc=38 line=18
+  bc=44 line=19
+  bc=47 line=20
+  bc=50 line=23
+  bc=52 line=24
+  bc=54 line=25
+  bc=59 line=26
+  bc=62 line=27
+  bc=65 line=28
+  bc=82 line=29
+  bc=95 line=32
+  bc=100 line=33
+  bc=105 line=36
+  bc=110 line=37
+  bc=115 line=38
+  bc=124 line=41
+  bc=132 line=44
+  bc=138 line=45
+  bc=143 line=48
+  bc=150 line=49
+  bc=160 line=52
+  bc=162 line=55
+  bc=162 line=56
+  bc=165 line=57
+  bc=167 line=60
+  bc=177 line=61
+  bc=186 line=62
+  bc=195 line=65
+  bc=199 line=66
+  bc=204 line=67
+  bc=212 line=68
+  bc=219 line=71
+  bc=225 line=72
+  bc=232 line=73
+  bc=242 line=74
+  bc=250 line=77
+  bc=254 line=78
+  bc=260 line=80
+  bc=263 line=81
+  bc=266 line=82
+  bc=273 line=83
+  bc=276 line=84
+  bc=283 line=85
+  bc=289 line=88
+  bc=296 line=89
+  bc=301 line=92
+  bc=307 line=93
+  bc=310 line=94
+########
+  bc=321 line=96
+  bc=329 line=98
+  bc=332 line=99
+  bc=335 line=100
+  bc=338 line=101
 ########
-  bc=\\d\+ line=127
+  bc=346 line=103
+  bc=354 line=106
+  bc=359 line=107
+  bc=365 line=110
+  bc=368 line=111
+  bc=374 line=114
+  bc=374 line=117
+  bc=379 line=118
+  bc=391 line=121
+  bc=391 line=122
+  bc=392 line=123
+  bc=394 line=126
+  bc=396 line=127
 00 LOAD_CONST_NONE
 01 LOAD_CONST_FALSE
 02 BINARY_OP 27 __add__
@@ -80,247 +173,251 @@ Raw bytecode (code_info_size=\\d\+, bytecode_size=\\d\+):
 42 STORE_MAP
 43 STORE_FAST 3
 44 LOAD_CONST_STRING 'a'
-47 STORE_FAST 4
-48 LOAD_CONST_OBJ \.\+
-\\d\+ STORE_FAST 5
-\\d\+ LOAD_CONST_SMALL_INT 1
-\\d\+ STORE_FAST 6
-\\d\+ LOAD_CONST_SMALL_INT 2
-\\d\+ STORE_FAST 7
-\\d\+ LOAD_FAST 0
-\\d\+ LOAD_DEREF 14
-58 BINARY_OP 27 __add__
-\\d\+ STORE_FAST 8
-\\d\+ LOAD_FAST 0
-\\d\+ UNARY_OP 1 __neg__
-\\d\+ STORE_FAST 9
-\\d\+ LOAD_FAST 0
-\\d\+ UNARY_OP 3 
-\\d\+ STORE_FAST 10
-\\d\+ LOAD_FAST 0
-\\d\+ LOAD_DEREF 14
-\\d\+ DUP_TOP
-\\d\+ ROT_THREE
-\\d\+ BINARY_OP 2 __eq__
-\\d\+ JUMP_IF_FALSE_OR_POP \\d\+
-\\d\+ LOAD_FAST 1
-\\d\+ BINARY_OP 2 __eq__
-\\d\+ JUMP \\d\+
-\\d\+ ROT_TWO
-\\d\+ POP_TOP
-\\d\+ STORE_FAST 10
-\\d\+ LOAD_FAST 0
-\\d\+ LOAD_DEREF 14
-\\d\+ BINARY_OP 2 __eq__
-\\d\+ JUMP_IF_FALSE_OR_POP \\d\+
-\\d\+ LOAD_DEREF 14
-\\d\+ LOAD_FAST 1
-\\d\+ BINARY_OP 2 __eq__
-\\d\+ UNARY_OP 3 
-\\d\+ STORE_FAST 10
-\\d\+ LOAD_DEREF 14
-\\d\+ LOAD_ATTR c
-\\d\+ STORE_FAST 11
-\\d\+ LOAD_FAST 11
-\\d\+ LOAD_DEREF 14
-\\d\+ STORE_ATTR c
-\\d\+ LOAD_DEREF 14
-\\d\+ LOAD_CONST_SMALL_INT 0
-\\d\+ LOAD_SUBSCR
-\\d\+ STORE_FAST 12
-\\d\+ LOAD_FAST 12
-\\d\+ LOAD_DEREF 14
-\\d\+ LOAD_CONST_SMALL_INT 0
-\\d\+ STORE_SUBSCR
-\\d\+ LOAD_DEREF 14
-\\d\+ LOAD_CONST_SMALL_INT 0
-\\d\+ DUP_TOP_TWO
-\\d\+ LOAD_SUBSCR
-\\d\+ LOAD_FAST 12
-\\d\+ BINARY_OP 14 __iadd__
-\\d\+ ROT_THREE
-\\d\+ STORE_SUBSCR
-\\d\+ LOAD_DEREF 14
-\\d\+ LOAD_CONST_NONE
-\\d\+ LOAD_CONST_NONE
-\\d\+ BUILD_SLICE 2
-\\d\+ LOAD_SUBSCR
-\\d\+ STORE_FAST 0
-\\d\+ LOAD_FAST 1
-\\d\+ UNPACK_SEQUENCE 2
-\\d\+ STORE_FAST 0
-\\d\+ STORE_DEREF 14
-\\d\+ LOAD_FAST 0
-\\d\+ UNPACK_EX 1
-\\d\+ STORE_FAST 0
-\\d\+ STORE_FAST 0
-\\d\+ LOAD_DEREF 14
-\\d\+ LOAD_FAST 0
-\\d\+ ROT_TWO
-\\d\+ STORE_FAST 0
-\\d\+ STORE_DEREF 14
-\\d\+ LOAD_FAST 1
-\\d\+ LOAD_DEREF 14
-\\d\+ LOAD_FAST 0
-\\d\+ ROT_THREE
-\\d\+ ROT_TWO
-\\d\+ STORE_FAST 0
-\\d\+ STORE_DEREF 14
-\\d\+ STORE_FAST 1
-\\d\+ DELETE_FAST 0
-\\d\+ LOAD_FAST 0
-\\d\+ STORE_GLOBAL gl
-\\d\+ DELETE_GLOBAL gl
-\\d\+ LOAD_FAST 14
-\\d\+ LOAD_FAST 15
-\\d\+ MAKE_CLOSURE \.\+ 2
-\\d\+ LOAD_FAST 2
-\\d\+ GET_ITER
-\\d\+ CALL_FUNCTION n=1 nkw=0
-\\d\+ STORE_FAST 0
-\\d\+ LOAD_FAST 14
-\\d\+ LOAD_FAST 15
-\\d\+ MAKE_CLOSURE \.\+ 2
-\\d\+ LOAD_FAST 2
-\\d\+ CALL_FUNCTION n=1 nkw=0
-\\d\+ STORE_FAST 0
-\\d\+ LOAD_FAST 14
-\\d\+ LOAD_FAST 15
-\\d\+ MAKE_CLOSURE \.\+ 2
-\\d\+ LOAD_FAST 2
-\\d\+ CALL_FUNCTION n=1 nkw=0
-\\d\+ STORE_FAST 0
-\\d\+ LOAD_FAST 0
-\\d\+ CALL_FUNCTION n=0 nkw=0
-\\d\+ POP_TOP
-\\d\+ LOAD_FAST 0
-\\d\+ LOAD_CONST_SMALL_INT 1
-\\d\+ CALL_FUNCTION n=1 nkw=0
-\\d\+ POP_TOP
-\\d\+ LOAD_FAST 0
-\\d\+ LOAD_CONST_STRING 'b'
-\\d\+ LOAD_CONST_SMALL_INT 1
-\\d\+ CALL_FUNCTION n=0 nkw=1
-\\d\+ POP_TOP
-\\d\+ LOAD_FAST 0
-\\d\+ LOAD_DEREF 14
-\\d\+ LOAD_NULL
-\\d\+ CALL_FUNCTION_VAR_KW n=0 nkw=0
-\\d\+ POP_TOP
-\\d\+ LOAD_FAST 0
-\\d\+ LOAD_METHOD b
-\\d\+ CALL_METHOD n=0 nkw=0
-\\d\+ POP_TOP
-\\d\+ LOAD_FAST 0
-\\d\+ LOAD_METHOD b
-\\d\+ LOAD_CONST_SMALL_INT 1
-\\d\+ CALL_METHOD n=1 nkw=0
-\\d\+ POP_TOP
-\\d\+ LOAD_FAST 0
-\\d\+ LOAD_METHOD b
-\\d\+ LOAD_CONST_STRING 'c'
-\\d\+ LOAD_CONST_SMALL_INT 1
-\\d\+ CALL_METHOD n=0 nkw=1
-\\d\+ POP_TOP
-\\d\+ LOAD_FAST 0
-\\d\+ LOAD_METHOD b
-\\d\+ LOAD_FAST 1
-\\d\+ LOAD_NULL
-\\d\+ CALL_METHOD_VAR_KW n=0 nkw=0
-\\d\+ POP_TOP
-\\d\+ LOAD_FAST 0
-\\d\+ POP_JUMP_IF_FALSE \\d\+
-\\d\+ LOAD_DEREF 16
-\\d\+ POP_TOP
-\\d\+ JUMP \\d\+
-\\d\+ LOAD_GLOBAL y
-\\d\+ POP_TOP
-\\d\+ JUMP \\d\+
-\\d\+ LOAD_DEREF 14
-\\d\+ POP_TOP
-\\d\+ LOAD_FAST 0
-\\d\+ POP_JUMP_IF_TRUE \\d\+
-\\d\+ JUMP \\d\+
-\\d\+ LOAD_DEREF 14
-\\d\+ POP_TOP
-\\d\+ LOAD_FAST 0
-\\d\+ POP_JUMP_IF_FALSE \\d\+
-\\d\+ LOAD_FAST 0
-\\d\+ JUMP_IF_TRUE_OR_POP \\d\+
-\\d\+ LOAD_FAST 0
-\\d\+ STORE_FAST 0
-\\d\+ LOAD_DEREF 14
-\\d\+ GET_ITER_STACK
-\\d\+ FOR_ITER \\d\+
-\\d\+ STORE_FAST 0
-\\d\+ LOAD_FAST 1
-\\d\+ POP_TOP
-\\d\+ JUMP \\d\+
-\\d\+ SETUP_FINALLY \\d\+
-\\d\+ SETUP_EXCEPT \\d\+
-\\d\+ JUMP \\d\+
-\\d\+ JUMP \\d\+
-\\d\+ LOAD_FAST 0
-\\d\+ POP_JUMP_IF_TRUE \\d\+
-\\d\+ POP_EXCEPT_JUMP \\d\+
-\\d\+ POP_TOP
-\\d\+ LOAD_DEREF 14
-\\d\+ POP_TOP
-\\d\+ POP_EXCEPT_JUMP \\d\+
-\\d\+ END_FINALLY
-\\d\+ LOAD_CONST_NONE
-\\d\+ LOAD_FAST 1
-\\d\+ POP_TOP
-\\d\+ END_FINALLY
-\\d\+ JUMP \\d\+
-\\d\+ SETUP_EXCEPT \\d\+
-\\d\+ UNWIND_JUMP \\d\+ 1
-\\d\+ POP_EXCEPT_JUMP \\d\+
-\\d\+ POP_TOP
-\\d\+ POP_EXCEPT_JUMP \\d\+
-\\d\+ END_FINALLY
-\\d\+ LOAD_FAST 0
-\\d\+ POP_JUMP_IF_TRUE \\d\+
-\\d\+ LOAD_FAST 0
-\\d\+ SETUP_WITH \\d\+
-\\d\+ POP_TOP
-\\d\+ LOAD_DEREF 14
-\\d\+ POP_TOP
-\\d\+ LOAD_CONST_NONE
-\\d\+ WITH_CLEANUP
-\\d\+ END_FINALLY
-\\d\+ LOAD_CONST_SMALL_INT 1
-\\d\+ STORE_DEREF 16
-\\d\+ LOAD_FAST_N 16
-\\d\+ MAKE_CLOSURE \.\+ 1
-\\d\+ STORE_FAST 13
-\\d\+ LOAD_CONST_SMALL_INT 0
-\\d\+ LOAD_CONST_NONE
-\\d\+ IMPORT_NAME 'a'
-\\d\+ STORE_FAST 0
-\\d\+ LOAD_CONST_SMALL_INT 0
-\\d\+ LOAD_CONST_STRING 'b'
-\\d\+ BUILD_TUPLE 1
-\\d\+ IMPORT_NAME 'a'
-\\d\+ IMPORT_FROM 'b'
-\\d\+ STORE_DEREF 14
-\\d\+ POP_TOP
-\\d\+ RAISE_LAST
-\\d\+ LOAD_CONST_SMALL_INT 1
-\\d\+ RAISE_OBJ
-\\d\+ LOAD_CONST_NONE
-\\d\+ RETURN_VALUE
-\\d\+ LOAD_CONST_SMALL_INT 1
-\\d\+ RETURN_VALUE
-File cmdline/cmd_showbc.py, code block 'f' (descriptor: \.\+, bytecode @\.\+ bytes)
-Raw bytecode (code_info_size=\\d\+, bytecode_size=\\d\+):
-########
-\.\+rg names:
+46 STORE_FAST 4
+47 LOAD_CONST_OBJ \.\+=b'a'
+49 STORE_FAST 5
+50 LOAD_CONST_SMALL_INT 1
+51 STORE_FAST 6
+52 LOAD_CONST_SMALL_INT 2
+53 STORE_FAST 7
+54 LOAD_FAST 0
+55 LOAD_DEREF 14
+57 BINARY_OP 27 __add__
+58 STORE_FAST 8
+59 LOAD_FAST 0
+60 UNARY_OP 1 __neg__
+61 STORE_FAST 9
+62 LOAD_FAST 0
+63 UNARY_OP 3 
+64 STORE_FAST 10
+65 LOAD_FAST 0
+66 LOAD_DEREF 14
+68 DUP_TOP
+69 ROT_THREE
+70 BINARY_OP 2 __eq__
+71 JUMP_IF_FALSE_OR_POP 79
+74 LOAD_FAST 1
+75 BINARY_OP 2 __eq__
+76 JUMP 81
+79 ROT_TWO
+80 POP_TOP
+81 STORE_FAST 10
+82 LOAD_FAST 0
+83 LOAD_DEREF 14
+85 BINARY_OP 2 __eq__
+86 JUMP_IF_FALSE_OR_POP 93
+89 LOAD_DEREF 14
+91 LOAD_FAST 1
+92 BINARY_OP 2 __eq__
+93 UNARY_OP 3 
+94 STORE_FAST 10
+95 LOAD_DEREF 14
+97 LOAD_ATTR c
+99 STORE_FAST 11
+100 LOAD_FAST 11
+101 LOAD_DEREF 14
+103 STORE_ATTR c
+105 LOAD_DEREF 14
+107 LOAD_CONST_SMALL_INT 0
+108 LOAD_SUBSCR
+109 STORE_FAST 12
+110 LOAD_FAST 12
+111 LOAD_DEREF 14
+113 LOAD_CONST_SMALL_INT 0
+114 STORE_SUBSCR
+115 LOAD_DEREF 14
+117 LOAD_CONST_SMALL_INT 0
+118 DUP_TOP_TWO
+119 LOAD_SUBSCR
+120 LOAD_FAST 12
+121 BINARY_OP 14 __iadd__
+122 ROT_THREE
+123 STORE_SUBSCR
+124 LOAD_DEREF 14
+126 LOAD_CONST_NONE
+127 LOAD_CONST_NONE
+128 BUILD_SLICE 2
+130 LOAD_SUBSCR
+131 STORE_FAST 0
+132 LOAD_FAST 1
+133 UNPACK_SEQUENCE 2
+135 STORE_FAST 0
+136 STORE_DEREF 14
+138 LOAD_FAST 0
+139 UNPACK_EX 1
+141 STORE_FAST 0
+142 STORE_FAST 0
+143 LOAD_DEREF 14
+145 LOAD_FAST 0
+146 ROT_TWO
+147 STORE_FAST 0
+148 STORE_DEREF 14
+150 LOAD_FAST 1
+151 LOAD_DEREF 14
+153 LOAD_FAST 0
+154 ROT_THREE
+155 ROT_TWO
+156 STORE_FAST 0
+157 STORE_DEREF 14
+159 STORE_FAST 1
+160 DELETE_FAST 0
+162 LOAD_FAST 0
+163 STORE_GLOBAL gl
+165 DELETE_GLOBAL gl
+167 LOAD_FAST 14
+168 LOAD_FAST 15
+169 MAKE_CLOSURE \.\+ 2
+172 LOAD_FAST 2
+173 GET_ITER
+174 CALL_FUNCTION n=1 nkw=0
+176 STORE_FAST 0
+177 LOAD_FAST 14
+178 LOAD_FAST 15
+179 MAKE_CLOSURE \.\+ 2
+182 LOAD_FAST 2
+183 CALL_FUNCTION n=1 nkw=0
+185 STORE_FAST 0
+186 LOAD_FAST 14
+187 LOAD_FAST 15
+188 MAKE_CLOSURE \.\+ 2
+191 LOAD_FAST 2
+192 CALL_FUNCTION n=1 nkw=0
+194 STORE_FAST 0
+195 LOAD_FAST 0
+196 CALL_FUNCTION n=0 nkw=0
+198 POP_TOP
+199 LOAD_FAST 0
+200 LOAD_CONST_SMALL_INT 1
+201 CALL_FUNCTION n=1 nkw=0
+203 POP_TOP
+204 LOAD_FAST 0
+205 LOAD_CONST_STRING 'b'
+207 LOAD_CONST_SMALL_INT 1
+208 CALL_FUNCTION n=0 nkw=1
+211 POP_TOP
+212 LOAD_FAST 0
+213 LOAD_DEREF 14
+215 LOAD_NULL
+216 CALL_FUNCTION_VAR_KW n=0 nkw=0
+218 POP_TOP
+219 LOAD_FAST 0
+220 LOAD_METHOD b
+222 CALL_METHOD n=0 nkw=0
+224 POP_TOP
+225 LOAD_FAST 0
+226 LOAD_METHOD b
+228 LOAD_CONST_SMALL_INT 1
+229 CALL_METHOD n=1 nkw=0
+231 POP_TOP
+232 LOAD_FAST 0
+233 LOAD_METHOD b
+235 LOAD_CONST_STRING 'c'
+237 LOAD_CONST_SMALL_INT 1
+238 CALL_METHOD n=0 nkw=1
+241 POP_TOP
+242 LOAD_FAST 0
+243 LOAD_METHOD b
+245 LOAD_FAST 1
+246 LOAD_NULL
+247 CALL_METHOD_VAR_KW n=0 nkw=0
+249 POP_TOP
+250 LOAD_FAST 0
+251 POP_JUMP_IF_FALSE 260
+254 LOAD_DEREF 16
+256 POP_TOP
+257 JUMP 263
+260 LOAD_GLOBAL y
+262 POP_TOP
+263 JUMP 269
+266 LOAD_DEREF 14
+268 POP_TOP
+269 LOAD_FAST 0
+270 POP_JUMP_IF_TRUE 266
+273 JUMP 279
+276 LOAD_DEREF 14
+278 POP_TOP
+279 LOAD_FAST 0
+280 POP_JUMP_IF_FALSE 276
+283 LOAD_FAST 0
+284 JUMP_IF_TRUE_OR_POP 288
+287 LOAD_FAST 0
+288 STORE_FAST 0
+289 LOAD_DEREF 14
+291 GET_ITER_STACK
+292 FOR_ITER 301
+295 STORE_FAST 0
+296 LOAD_FAST 1
+297 POP_TOP
+298 JUMP 292
+301 SETUP_FINALLY 329
+304 SETUP_EXCEPT 320
+307 JUMP 313
+310 JUMP 317
+313 LOAD_FAST 0
+314 POP_JUMP_IF_TRUE 310
+317 POP_EXCEPT_JUMP 328
+320 POP_TOP
+321 LOAD_DEREF 14
+323 POP_TOP
+324 POP_EXCEPT_JUMP 328
+327 END_FINALLY
+328 LOAD_CONST_NONE
+329 LOAD_FAST 1
+330 POP_TOP
+331 END_FINALLY
+332 JUMP 350
+335 SETUP_EXCEPT 345
+338 UNWIND_JUMP 354 1
+342 POP_EXCEPT_JUMP 350
+345 POP_TOP
+346 POP_EXCEPT_JUMP 350
+349 END_FINALLY
+350 LOAD_FAST 0
+351 POP_JUMP_IF_TRUE 335
+354 LOAD_FAST 0
+355 SETUP_WITH 363
+358 POP_TOP
+359 LOAD_DEREF 14
+361 POP_TOP
+362 LOAD_CONST_NONE
+363 WITH_CLEANUP
+364 END_FINALLY
+365 LOAD_CONST_SMALL_INT 1
+366 STORE_DEREF 16
+368 LOAD_FAST_N 16
+370 MAKE_CLOSURE \.\+ 1
+373 STORE_FAST 13
+374 LOAD_CONST_SMALL_INT 0
+375 LOAD_CONST_NONE
+376 IMPORT_NAME 'a'
+378 STORE_FAST 0
+379 LOAD_CONST_SMALL_INT 0
+380 LOAD_CONST_STRING 'b'
+382 BUILD_TUPLE 1
+384 IMPORT_NAME 'a'
+386 IMPORT_FROM 'b'
+388 STORE_DEREF 14
+390 POP_TOP
+391 RAISE_LAST
+392 LOAD_CONST_SMALL_INT 1
+393 RAISE_OBJ
+394 LOAD_CONST_NONE
+395 RETURN_VALUE
+396 LOAD_CONST_SMALL_INT 1
+397 RETURN_VALUE
+File cmdline/cmd_showbc.py, code block 'f' (descriptor: \.\+, bytecode @\.\+ 59 bytes)
+Raw bytecode (code_info_size=8, bytecode_size=51):
+ a8 10 0a 02 80 82 34 38 81 57 c0 57 c1 57 c2 57
+ c3 57 c4 57 c5 57 c6 57 c7 57 c8 c9 82 57 ca 57
+ cb 57 cc 57 cd 57 ce 57 cf 57 26 10 57 26 11 57
+ 26 12 26 13 b9 24 13 f2 59 51 63
+arg names:
 (N_STATE 22)
 (N_EXC_STACK 0)
   bc=0 line=1
-########
-  bc=\\d\+ line=133
+  bc=0 line=131
+  bc=20 line=132
+  bc=44 line=133
 00 LOAD_CONST_SMALL_INT 1
 01 DUP_TOP
 02 STORE_FAST 0
@@ -367,28 +464,29 @@ Raw bytecode (code_info_size=\\d\+, bytecode_size=\\d\+):
 48 POP_TOP
 49 LOAD_CONST_NONE
 50 RETURN_VALUE
-File cmdline/cmd_showbc.py, code block 'f' (descriptor: \.\+, bytecode @\.\+ bytes)
-Raw bytecode (code_info_size=\\d\+, bytecode_size=\\d\+):
-########
-\.\+63
+File cmdline/cmd_showbc.py, code block 'f' (descriptor: \.\+, bytecode @\.\+ 20 bytes)
+Raw bytecode (code_info_size=9, bytecode_size=11):
+ a1 01 0b 02 06 80 88 40 00 82 2a 01 53 b0 21 00
+ 01 c1 51 63
 arg names: a
 (N_STATE 5)
 (N_EXC_STACK 0)
 (INIT_CELL 0)
-########
-  bc=\\d\+ line=139
+  bc=0 line=1
+  bc=0 line=137
+  bc=0 line=139
 00 LOAD_CONST_SMALL_INT 2
 01 BUILD_TUPLE 1
 03 LOAD_NULL
 04 LOAD_FAST 0
 05 MAKE_CLOSURE_DEFARGS \.\+ 1
-\\d\+ STORE_FAST 1
-\\d\+ LOAD_CONST_NONE
-\\d\+ RETURN_VALUE
-File cmdline/cmd_showbc.py, code block 'f' (descriptor: \.\+, bytecode @\.\+ bytes)
-Raw bytecode (code_info_size=\\d\+, bytecode_size=\\d\+):
-########
-\.\+63
+08 STORE_FAST 1
+09 LOAD_CONST_NONE
+10 RETURN_VALUE
+File cmdline/cmd_showbc.py, code block 'f' (descriptor: \.\+, bytecode @\.\+ 21 bytes)
+Raw bytecode (code_info_size=8, bytecode_size=13):
+ 88 40 0a 02 80 8f 23 23 51 67 59 81 67 59 81 5e
+ 51 68 59 51 63
 arg names:
 (N_STATE 2)
 (N_EXC_STACK 0)
@@ -409,49 +507,47 @@ arg names:
 10 POP_TOP
 11 LOAD_CONST_NONE
 12 RETURN_VALUE
-File cmdline/cmd_showbc.py, code block 'Class' (descriptor: \.\+, bytecode @\.\+ bytes)
-Raw bytecode (code_info_size=\\d\+, bytecode_size=\\d\+):
-########
-\.\+63
+File cmdline/cmd_showbc.py, code block 'Class' (descriptor: \.\+, bytecode @\.\+ 1\[56\] bytes)
+Raw bytecode (code_info_size=\[56\], bytecode_size=10):
+ 00 \.\+ 11 0c 16 0d 10 03 16 0e 51 63
 arg names:
 (N_STATE 1)
 (N_EXC_STACK 0)
   bc=0 line=1
 ########
-  bc=12 line=150
+  bc=8 line=150
 00 LOAD_NAME __name__
-03 STORE_NAME __module__
-06 LOAD_CONST_STRING 'Class'
-09 STORE_NAME __qualname__
-12 LOAD_CONST_NONE
-13 RETURN_VALUE
-File cmdline/cmd_showbc.py, code block 'f' (descriptor: \.\+, bytecode @\.\+ bytes)
-Raw bytecode (code_info_size=\\d\+, bytecode_size=\\d\+):
-########
-\.\+63
+02 STORE_NAME __module__
+04 LOAD_CONST_STRING 'Class'
+06 STORE_NAME __qualname__
+08 LOAD_CONST_NONE
+09 RETURN_VALUE
+File cmdline/cmd_showbc.py, code block 'f' (descriptor: \.\+, bytecode @\.\+ 18 bytes)
+Raw bytecode (code_info_size=6, bytecode_size=12):
+ 19 08 02 0f 80 9c 12 10 12 11 b0 15 02 36 00 59
+ 51 63
 arg names: self
 (N_STATE 4)
 (N_EXC_STACK 0)
   bc=0 line=1
   bc=0 line=157
 00 LOAD_GLOBAL super
-\\d\+ LOAD_GLOBAL __class__
-\\d\+ LOAD_FAST 0
-\\d\+ LOAD_SUPER_METHOD f
-\\d\+ CALL_METHOD n=0 nkw=0
-\\d\+ POP_TOP
-\\d\+ LOAD_CONST_NONE
-\\d\+ RETURN_VALUE
-File cmdline/cmd_showbc.py, code block '<genexpr>' (descriptor: \.\+, bytecode @\.\+ bytes)
-Raw bytecode (code_info_size=\\d\+, bytecode_size=\\d\+):
-########
-\.\+63
+02 LOAD_GLOBAL __class__
+04 LOAD_FAST 0
+05 LOAD_SUPER_METHOD f
+07 CALL_METHOD n=0 nkw=0
+09 POP_TOP
+10 LOAD_CONST_NONE
+11 RETURN_VALUE
+File cmdline/cmd_showbc.py, code block '<genexpr>' (descriptor: \.\+, bytecode @\.\+ 31 bytes)
+Raw bytecode (code_info_size=9, bytecode_size=22):
+ c3 40 0c 12 04 04 04 80 3b 53 b2 53 53 4b 0d 00
+ c3 25 01 44 f7 7f 25 00 67 59 42 f0 7f 51 63
 arg names: * * *
 (N_STATE 9)
 (N_EXC_STACK 0)
   bc=0 line=1
   bc=0 line=60
-########
 00 LOAD_NULL
 01 LOAD_FAST 2
 02 LOAD_NULL
@@ -466,16 +562,15 @@ arg names: * * *
 17 JUMP 4
 20 LOAD_CONST_NONE
 21 RETURN_VALUE
-File cmdline/cmd_showbc.py, code block '<listcomp>' (descriptor: \.\+, bytecode @\.\+ bytes)
-Raw bytecode (code_info_size=\\d\+, bytecode_size=\\d\+):
-########
-\.\+63
+File cmdline/cmd_showbc.py, code block '<listcomp>' (descriptor: \.\+, bytecode @\.\+ 29 bytes)
+Raw bytecode (code_info_size=8, bytecode_size=21):
+ 4b 0c 14 04 04 04 80 3c 2b 00 b2 5f 4b 0d 00 c3
+ 25 01 44 f7 7f 25 00 2f 14 42 f0 7f 63
 arg names: * * *
 (N_STATE 10)
 (N_EXC_STACK 0)
   bc=0 line=1
   bc=0 line=61
-########
 00 BUILD_LIST 0
 02 LOAD_FAST 2
 03 GET_ITER_STACK
@@ -487,15 +582,15 @@ arg names: * * *
 15 STORE_COMP 20
 17 JUMP 4
 20 RETURN_VALUE
-File cmdline/cmd_showbc.py, code block '<dictcomp>' (descriptor: \.\+, bytecode @\.\+ bytes)
-Raw bytecode (code_info_size=\\d\+, bytecode_size=\\d\+):
-########
-\.\+63
+File cmdline/cmd_showbc.py, code block '<dictcomp>' (descriptor: \.\+, bytecode @\.\+ 31 bytes)
+Raw bytecode (code_info_size=8, bytecode_size=23):
+ 53 0c 15 04 04 04 80 3d 2c 00 b2 5f 4b 0f 00 c3
+ 25 01 44 f7 7f 25 00 25 00 2f 19 42 ee 7f 63
 arg names: * * *
 (N_STATE 11)
 (N_EXC_STACK 0)
   bc=0 line=1
-########
+  bc=0 line=62
 00 BUILD_MAP 0
 02 LOAD_FAST 2
 03 GET_ITER_STACK
@@ -508,16 +603,17 @@ arg names: * * *
 17 STORE_COMP 25
 19 JUMP 4
 22 RETURN_VALUE
-File cmdline/cmd_showbc.py, code block 'closure' (descriptor: \.\+, bytecode @\.\+ bytes)
-Raw bytecode (code_info_size=\\d\+, bytecode_size=\\d\+):
-########
-\.\+63
+File cmdline/cmd_showbc.py, code block 'closure' (descriptor: \.\+, bytecode @\.\+ 20 bytes)
+Raw bytecode (code_info_size=8, bytecode_size=12):
+ 19 0c 16 04 80 6f 25 23 25 00 81 f2 c1 81 27 00
+ 29 00 51 63
 arg names: *
 (N_STATE 4)
 (N_EXC_STACK 0)
   bc=0 line=1
-########
-  bc=\\d\+ line=114
+  bc=0 line=112
+  bc=5 line=113
+  bc=8 line=114
 00 LOAD_DEREF 0
 02 LOAD_CONST_SMALL_INT 1
 03 BINARY_OP 27 __add__
@@ -527,16 +623,14 @@ arg names: *
 08 DELETE_DEREF 0
 10 LOAD_CONST_NONE
 11 RETURN_VALUE
-File cmdline/cmd_showbc.py, code block 'f' (descriptor: \.\+, bytecode @\.\+ bytes)
-Raw bytecode (code_info_size=\\d\+, bytecode_size=\\d\+):
-########
-\.\+63
+File cmdline/cmd_showbc.py, code block 'f' (descriptor: \.\+, bytecode @\.\+ 13 bytes)
+Raw bytecode (code_info_size=8, bytecode_size=5):
+ 9a 01 0a 02 04 09 80 8b b1 25 00 f2 63
 arg names: * b
 (N_STATE 4)
 (N_EXC_STACK 0)
   bc=0 line=1
-########
-  bc=\\d\+ line=140
+  bc=0 line=140
 00 LOAD_FAST 1
 01 LOAD_DEREF 0
 03 BINARY_OP 27 __add__
diff --git a/tests/cmdline/cmd_verbose.py.exp b/tests/cmdline/cmd_verbose.py.exp
index 0edd050c22221..ae833dbec8d3e 100644
--- a/tests/cmdline/cmd_verbose.py.exp
+++ b/tests/cmdline/cmd_verbose.py.exp
@@ -1,19 +1,17 @@
-File cmdline/cmd_verbose.py, code block '<module>' (descriptor: \.\+, bytecode \.\+ bytes)
-Raw bytecode (code_info_size=\\d\+, bytecode_size=\\d\+):
- 08 \.\+
-########
-\.\+63
+File cmdline/cmd_verbose.py, code block '<module>' (descriptor: \.\+, bytecode @\.\+ 12 bytes)
+Raw bytecode (code_info_size=4, bytecode_size=8):
+ 08 04 01 40 11 02 81 34 01 59 51 63
 arg names:
 (N_STATE 2)
 (N_EXC_STACK 0)
   bc=0 line=1
   bc=0 line=3
 00 LOAD_NAME print
-03 LOAD_CONST_SMALL_INT 1
-04 CALL_FUNCTION n=1 nkw=0
-06 POP_TOP
-07 LOAD_CONST_NONE
-08 RETURN_VALUE
+02 LOAD_CONST_SMALL_INT 1
+03 CALL_FUNCTION n=1 nkw=0
+05 POP_TOP
+06 LOAD_CONST_NONE
+07 RETURN_VALUE
 1
 mem: total=\\d\+, current=\\d\+, peak=\\d\+
 stack: \\d\+ out of \\d\+
diff --git a/tests/micropython/import_mpy_invalid.py b/tests/micropython/import_mpy_invalid.py
index 02fd4b1254971..b02312a7a8d53 100644
--- a/tests/micropython/import_mpy_invalid.py
+++ b/tests/micropython/import_mpy_invalid.py
@@ -49,7 +49,6 @@ def open(self, path, mode):
     "/mod0.mpy": b"",  # empty file
     "/mod1.mpy": b"M",  # too short header
     "/mod2.mpy": b"M\x00\x00\x00",  # bad version
-    "/mod3.mpy": b"M\x00\x00\x00\x7f",  # qstr window too large
 }
 
 # create and mount a user filesystem
diff --git a/tests/micropython/import_mpy_invalid.py.exp b/tests/micropython/import_mpy_invalid.py.exp
index ea748ff6c1d43..1727ea1cea56b 100644
--- a/tests/micropython/import_mpy_invalid.py.exp
+++ b/tests/micropython/import_mpy_invalid.py.exp
@@ -1,4 +1,3 @@
 mod0 ValueError incompatible .mpy file
 mod1 ValueError incompatible .mpy file
 mod2 ValueError incompatible .mpy file
-mod3 ValueError incompatible .mpy file
diff --git a/tests/micropython/import_mpy_native_gc.py b/tests/micropython/import_mpy_native_gc.py
index f982a4ee17546..6f37b15ab7e2f 100644
--- a/tests/micropython/import_mpy_native_gc.py
+++ b/tests/micropython/import_mpy_native_gc.py
@@ -49,14 +49,14 @@ def open(self, path, mode):
 # by the required value of sys.implementation.mpy.
 features0_file_contents = {
     # -march=x64
-    0xA05: b'M\x05\x0a\x1f \x84b\xe9/\x00\x00\x00SH\x8b\x1ds\x00\x00\x00\xbe\x02\x00\x00\x00\xffS\x18\xbf\x01\x00\x00\x00H\x85\xc0u\x0cH\x8bC \xbe\x02\x00\x00\x00[\xff\xe0H\x0f\xaf\xf8H\xff\xc8\xeb\xe6ATUSH\x8b\x1dA\x00\x00\x00H\x8b\x7f\x08L\x8bc(A\xff\xd4H\x8d5\x1f\x00\x00\x00H\x89\xc5H\x8b\x05-\x00\x00\x00\x0f\xb78\xffShH\x89\xefA\xff\xd4H\x8b\x03[]A\\\xc3\x00\x00\x00\x00\x00\x00\x00\x00\x00\x05\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x90\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x84@\x12factorial\x10\x00\x00\r \x01"\x9f\x1c\x01\x1e\xff',
+    0xA06: b'M\x06\n\x1f\x01\x004build/features0.native.mpy\x00\x8aB\xe9/\x00\x00\x00SH\x8b\x1d\x83\x00\x00\x00\xbe\x02\x00\x00\x00\xffS\x18\xbf\x01\x00\x00\x00H\x85\xc0u\x0cH\x8bC \xbe\x02\x00\x00\x00[\xff\xe0H\x0f\xaf\xf8H\xff\xc8\xeb\xe6ATUSH\x8b\x1dQ\x00\x00\x00H\x8bG\x08L\x8bc(H\x8bx\x08A\xff\xd4H\x8d5+\x00\x00\x00H\x89\xc5H\x8b\x059\x00\x00\x00\x0f\xb78\xffShH\x89\xefA\xff\xd4H\x8b\x03[]A\\\xc3\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x05\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xa0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x85\x00\x12factorial\x00\x10\r$\x01&\x9f \x01"\xff',
     # -march=armv7m
-    0x1605: b"M\x05\x16\x1f \x84\x12\x1a\xe0\x00\x00\x13\xb5\nK\nJ{D\x9cX\x02!\xe3h\x98G\x03F\x01 3\xb9\x02!#i\x01\x93\x02\xb0\xbd\xe8\x10@\x18GXC\x01;\xf4\xe7\x00\xbfj\x00\x00\x00\x00\x00\x00\x00\xf8\xb5\tN\tK~D\xf4X@hgi\xb8G\x05F\x07K\x07I\xf2XyD\x10\x88ck\x98G(F\xb8G h\xf8\xbd6\x00\x00\x00\x00\x00\x00\x00\x04\x00\x00\x00\x1c\x00\x00\x00\x00\x00\x00\x00\x05\x00\x00\x00\x00\x00\x00\x00\x80\x00\x00\x00\x00\x00\x00\x00\x01\x84\x00\x12factorial\x10\x00\x00\r<\x01>\x9f8\x01:\xff",
+    0x1606: b"M\x06\x16\x1f\x01\x004build/features0.native.mpy\x00\x88B\x1a\xe0\x00\x00\x13\xb5\nK\nJ{D\x9cX\x02!\xe3h\x98G\x03F\x01 3\xb9\x02!#i\x01\x93\x02\xb0\xbd\xe8\x10@\x18GXC\x01;\xf4\xe7\x00\xbfn\x00\x00\x00\x00\x00\x00\x00\xf8\xb5\nN\nK~D\xf4XChgiXh\xb8G\x05F\x07K\x08I\xf2XyD\x10\x88ck\x98G(F\xb8G h\xf8\xbd\x00\xbf:\x00\x00\x00\x00\x00\x00\x00\x04\x00\x00\x00\x1e\x00\x00\x00\x00\x00\x00\x00\x05\x00\x00\x00\x00\x00\x00\x00\x84\x00\x00\x00\x00\x00\x00\x00\x01\x84\x10\x12factorial\x00\x10\r>\x01@\x9f:\x01<\xff",
 }
 
 # Populate other armv7m-derived archs based on armv7m.
-for arch in (0x1A05, 0x1E05, 0x2205):
-    features0_file_contents[arch] = features0_file_contents[0x1605]
+for arch in (0x1A06, 0x1E06, 0x2206):
+    features0_file_contents[arch] = features0_file_contents[0x1606]
 
 if sys.implementation.mpy not in features0_file_contents:
     print("SKIP")
diff --git a/tests/micropython/import_mpy_native_x64.py b/tests/micropython/import_mpy_native_x64.py
index ff0142a9cf55f..3a25df1866708 100644
--- a/tests/micropython/import_mpy_native_x64.py
+++ b/tests/micropython/import_mpy_native_x64.py
@@ -52,49 +52,62 @@ def open(self, path, mode):
 # fmt: off
 user_files = {
     # bad architecture
-    '/mod0.mpy': b'M\x05\xfe\x00\x10',
+    '/mod0.mpy': b'M\x06\xfe\x00\x10',
 
     # test loading of viper and asm
     '/mod1.mpy': (
-        b'M\x05\x0a\x1f\x20' # header
+        b'M\x06\x0a\x1f' # header
 
-        b'\x20' # n bytes, bytecode
-            b'\x00\x08\x02m\x02m' # prelude
+        b'\x02' # n_qstr
+        b'\x00' # n_obj
+
+        b'\x0emod1.py\x00' # qstr0 = "mod1.py"
+        b'\x0aouter\x00' # qstr1 = "outer"
+
+        b'\x2c' # 5 bytes, have children, bytecode
+            b'\x00\x02' # prelude
+            b'\x01' # simple name (qstr index)
             b'\x51' # LOAD_CONST_NONE
             b'\x63' # RETURN_VALUE
 
-            b'\x00\x02' # n_obj, n_raw_code
+        b'\x02' # 2 children
 
-        b'\x22' # n bytes, viper code
-            b'\x00\x00\x00\x00\x00\x00' # dummy machine code
-            b'\x00\x00' # qstr0
-            b'\x01\x0c\x0aprint' # n_qstr, qstr0
-            b'\x00\x00\x00' # scope_flags, n_obj, n_raw_code
+            b'\x42' # 8 bytes, no children, viper code
+                b'\x00\x00\x00\x00\x00\x00' # dummy machine code
+                b'\x00\x00' # slot for qstr0
+                b'\x01\x0c\x0aprint\x00' # n_qstr=1, qstr0
+                b'\x00' # scope_flags
 
-        b'\x23' # n bytes, asm code
-            b'\x00\x00\x00\x00\x00\x00\x00\x00' # dummy machine code
-            b'\x00\x00\x00' # scope_flags, n_pos_args, type_sig
+            b'\x43' # 8 bytes, no children, asm code
+                b'\x00\x00\x00\x00\x00\x00\x00\x00' # dummy machine code
+                b'\x00\x00\x00' # scope_flags, n_pos_args, type_sig
     ),
 
     # test loading viper with additional scope flags and relocation
     '/mod2.mpy': (
-        b'M\x05\x0a\x1f\x20' # header
+        b'M\x06\x0a\x1f' # header
+
+        b'\x02' # n_qstr
+        b'\x00' # n_obj
+
+        b'\x0emod2.py\x00' # qstr0 = "mod2.py"
+        b'\x0aouter\x00' # qstr1 = "outer"
 
-        b'\x20' # n bytes, bytecode
-            b'\x00\x08\x02m\x02m' # prelude
+        b'\x2c' # 5 bytes, have children, bytecode
+            b'\x00\x02' # prelude
+            b'\x01' # simple name (qstr index)
             b'\x51' # LOAD_CONST_NONE
             b'\x63' # RETURN_VALUE
 
-            b'\x00\x01' # n_obj, n_raw_code
+        b'\x01' # 1 child
 
-        b'\x12' # n bytes(=4), viper code
-            b'\x00\x00\x00\x00' # dummy machine code
-            b'\x00' # n_qstr
-            b'\x70' # scope_flags: VIPERBSS | VIPERRODATA | VIPERRELOC
-            b'\x00\x00' # n_obj, n_raw_code
-            b'\x06rodata' # rodata, 6 bytes
-            b'\x04' # bss, 4 bytes
-            b'\x03\x01\x00' # dummy relocation of rodata
+            b'\x22' # 4 bytes, no children, viper code
+                b'\x00\x00\x00\x00' # dummy machine code
+                b'\x00' # n_qstr=0
+                b'\x70' # scope_flags: VIPERBSS | VIPERRODATA | VIPERRELOC
+                b'\x06\x04' # rodata=6 bytes, bss=4 bytes
+                b'rodata' # rodata content
+                b'\x03\x01\x00' # dummy relocation of rodata
     ),
 }
 # fmt: on
diff --git a/tests/perf_bench/core_import_mpy_multi.py b/tests/perf_bench/core_import_mpy_multi.py
index 0da466206b1ac..74caf20a38dca 100644
--- a/tests/perf_bench/core_import_mpy_multi.py
+++ b/tests/perf_bench/core_import_mpy_multi.py
@@ -23,7 +23,7 @@ def f():
     x = ("const tuple", None, False, True, 1, 2, 3)
 result = 123
 """
-file_data = b'M\x05\x02\x1f \x81\x0c\x10\x12\x00\x07\x0etest.py\x8b\x07e`\x00T2\x00\x10\x02A4\x02\x16\x012\x01\x16\x02f"\x80{\x16\x0cresultQc\x00\x02\x81\x1c\x00\x10\x05\x07,EE\x00\x11\x00\x17\x16\x00\x16\x10\x03\x16\x00\x1a2\x00\x16\x00\x112\x01\x16\x00\xa42\x02\x16\x00}Qc\x00\x03<\x1a\x0c\x00\x11\x03@\x00\xb1\xb0\x18\x06argQc\x00\x00\x00\x89\x01,\t\x0e\x00\xa4\x03` \x00Qc\x00\x00\x00\x89,\t\x0e\x00}\x01``\x00Qc\x00\x00\x00\x89\x81l8\x16\t\x03\x80\x08/,##\x00\x12\x00{\x12\x00\x97\x12\x00B\x12\x00K*\x04Y\x12\x00$\x12\x007\x12\x006*\x03Y#\x00\xc0#\x01\xc0#\x02QPR\x81\x82\x83*\x07\xc0Qc\x03\x00s\x1cthis will be a string objectb\x1bthis will be a bytes objects\x0bconst tuple'
+file_data = b'M\x06\x02\x1f\x14\x03\x0etest.py\x00\x0f\x02A\x00\x02f\x00\x0cresult\x00/-5#\x82I\x81{\x81w\x82/\x81\x05\x81\x17Iom\x82\x13\x06arg\x00s\x1cthis will be a string object\x00b\x1bthis will be a bytes object\x00s\x0bconst tuple\x00\x81\\\x10\n\x01\x89\x07d`T2\x00\x10\x024\x02\x16\x022\x01\x16\x03"\x80{\x16\x04Qc\x02\x81d\x00\x08\x02(DD\x11\x05\x16\x06\x10\x02\x16\x072\x00\x16\x082\x01\x16\t2\x02\x16\nQc\x03`\x1a\x08\x08\x12\x13@\xb1\xb0\x18\x13Qc@\t\x08\t\x12` Qc@\t\x08\n\x12``Qc\x83\x008\x0e\x03\x80\x08+)##\x12\x0b\x12\x0c\x12\r\x12\x0e*\x04Y\x12\x0f\x12\x10\x12\x11*\x03Y#\x00\xc0#\x01\xc0#\x02QPR\x81\x82\x83*\x07\xc0Qc'
 
 
 class File(uio.IOBase):
diff --git a/tests/perf_bench/core_import_mpy_single.py b/tests/perf_bench/core_import_mpy_single.py
index 5ca3584959112..1e8a4f531e3d3 100644
--- a/tests/perf_bench/core_import_mpy_single.py
+++ b/tests/perf_bench/core_import_mpy_single.py
@@ -78,7 +78,7 @@ def f1():
     x = ("const tuple 9", None, False, True, 1, 2, 3)
 result = 123
 """
-file_data = b'M\x05\x02\x1f \x81\\\x10\x1a\x00\x07\x0etest.pyk@k@\x85\x18\x85\x1f\x00T2\x00\x10\x04A04\x02\x16\x01T2\x01\x10\x04A14\x02\x16\x012\x02\x16\x04f02\x03\x16\x04f1"\x80{\x16\x0cresultQc\x00\x04\x814\x00\x12\t\x0b,%%%\x00\x11\x00\x17\x16\x00\x16\x10\x03\x16\x00\x1a2\x00\x16\x04a02\x01\x16\x04a12\x02\x16\x04a22\x03\x16\x04a3Qc\x00\x04(\t\x0c\x07\x0b \x00Qc\x00\x00\x00\x89(\t\x0c\t\x03@\x00Qc\x00\x00\x00\x89(\t\x0c\t\x03`\x00Qc\x00\x00\x00\x89,\t\x0e\t\x03` \x00Qc\x00\x00\x00\x89\x818\x00\x14\x13\x03l`%%%\x00\x11\x00\x17\x16\x00\x16\x10\x03\x16\x00\x1a2\x00\x16\x0b2\x01\x16\x0b2\x02\x16\x0b2\x03\x16\x0bQc\x00\x04,\t\x0e\x07\x0b``\x00Qc\x00\x00\x00\x89,\t\x0e\t\x03\x80\x07\x00Qc\x00\x00\x00\x89,\t\x0e\t\x03\x80\x08\x00Qc\x00\x00\x00\x89,\t\x0e\t\x03\x80\t\x00Qc\x00\x00\x00\x89\x94\x1cPP\x13\x03\x80\x0b8;555222\x1f%\x1f%\x1f"\x1f"\x1f%\x1f%\x1f"\x1f%\x1f"\x1f%)\x1f"//\x00\x12\x00\t\x12\x00\n\x12\x00\x0b\x12\x00\x0c\x12\x00\r\x12\x00\x0e\x12\x00\x0f*\x07Y\x12\x00\x10\x12\x00\x11\x12\x00\x12\x12\x00\x13\x12\x00\x14\x12\x00\x15\x12\x00\x16\x12\x00\x17*\x08Y\x12\x00\x18\x12\x00\x19\x12\x00\x1a\x12\x00\x1b\x12\x00\x1c\x12\x00\x1d*\x06Y\x12\x00\x1e\x12\x00\x1f\x12\x00 \x12\x00!\x12\x00"\x12\x00#*\x06Y\x12\x00$\x12\x00%\x12\x00&\x12\x00\'\x12\x00(\x12\x00)*\x06Y\x12\x00*\x12\x00+\x12\x00,\x12\x00-\x12\x00.*\x05Y\x12\x00/\x12\x000\x12\x001\x12\x002\x12\x003*\x05Y\x12\x004\x12\x005\x12\x006\x12\x007\x12\x008*\x05Y\x12\x009\x12\x00:\x12\x00;\x12\x00<\x12\x00=\x12\x00>\x12\x00?\x12\x00@\x12\x00A\x12\x00B\x12\x00C*\x0bY\x12\x00D\x12\x00E\x12\x00F\x12\x00G\x12\x00H\x12\x00I\x12\x00J\x12\x00K\x12\x00L\x12\x00M\x12\x00N*\x0bY\x12\x00O\x12\x00P\x12\x00Q\x12\x00R\x12\x00S\x12\x00T\x12\x00U\x12\x00V\x12\x00W\x12\x00X*\nY\x12\x00Y\x12\x00Z\x12\x00[\x12\x00\\\x12\x00]\x12\x00^\x12\x00_\x12\x00`\x12\x00a\x12\x00b*\nY\x12\x00c\x12\x00d\x12\x00e\x12\x00f\x12\x00g\x12\x00h\x12\x00i\x12\x00j\x12\x00k\x12\x00l\x12\x00m*\x0bY\x12\x00n\x12\x00o\x12\x00p\x12\x00q\x12\x00r\x12\x00s\x12\x00t\x12\x00u\x12\x00v\x12\x00w\x12\x00x*\x0bY\x12\x00y\x12\x00z\x12\x00{\x12\x00|\x12\x00}\x12\x00~\x12\x00\x7f\x12\x00\x80\x12\x00\x81\x12\x00\x82*\nY\x12\x00\x83\x12\x00\x84\x12\x00\x85\x12\x00\x86\x12\x00\x87\x12\x00\x88\x12\x00\x89\x12\x00\x8a\x12\x00\x8b\x12\x00\x8c\x12\x00\x8d*\x0bY\x12\x00\x8e\x12\x00\x8f\x12\x00\x90\x12\x00\x91\x12\x00\x92\x12\x00\x93\x12\x00\x94\x12\x00\x95\x12\x00\x96\x12\x00\x97*\nY\x12\x00\x98\x12\x00\x99\x12\x00\x9a\x12\x00\x9b\x12\x00\x9c\x12\x00\x9d\x12\x00\x9e\x12\x00\x9f\x12\x00\xa0\x12\x00\xa2\x12\x00\xa3*\x0bY\x12\x00\xa4\x12\x00\xa5*\x02Y\x12\nname0\x12\nname1\x12\nname2\x12\nname3\x12\nname4\x12\nname5\x12\nname6\x12\nname7\x12\nname8\x12\nname9*\nY\x12$quite_a_long_name0\x12$quite_a_long_name1\x12$quite_a_long_name2\x12$quite_a_long_name3*\x04Y\x12$quite_a_long_name4\x12$quite_a_long_name5\x12$quite_a_long_name6\x12$quite_a_long_name7*\x04Y\x12$quite_a_long_name8\x12$quite_a_long_name9\x12&quite_a_long_name10\x12&quite_a_long_name11*\x04YQc\x00\x00\x86H8H?/\x80#####################+++++++++\x00#\x00\xc0#\x01\xc0#\x02\xc0#\x03\xc0#\x04\xc0#\x05\xc0#\x06\xc0#\x07\xc0#\x08\xc0#\t\xc0#\n\xc0#\x0b\xc0#\x0c\xc0#\r\xc0#\x0e\xc0#\x0f\xc0#\x10\xc0#\x11\xc0#\x12\xc0#\x13\xc0#\x14QPR\x81\x82\x83*\x07\xc0#\x15QPR\x81\x82\x83*\x07\xc0#\x16QPR\x81\x82\x83*\x07\xc0#\x17QPR\x81\x82\x83*\x07\xc0#\x18QPR\x81\x82\x83*\x07\xc0#\x19QPR\x81\x82\x83*\x07\xc0#\x1aQPR\x81\x82\x83*\x07\xc0#\x1bQPR\x81\x82\x83*\x07\xc0#\x1cQPR\x81\x82\x83*\x07\xc0#\x1dQPR\x81\x82\x83*\x07\xc0Qc\x1e\x00s\x1ethis will be a string object 0s\x1ethis will be a string object 1s\x1ethis will be a string object 2s\x1ethis will be a string object 3s\x1ethis will be a string object 4s\x1ethis will be a string object 5s\x1ethis will be a string object 6s\x1ethis will be a string object 7s\x1ethis will be a string object 8s\x1ethis will be a string object 9b\x1dthis will be a bytes object 0b\x1dthis will be a bytes object 1b\x1dthis will be a bytes object 2b\x1dthis will be a bytes object 3b\x1dthis will be a bytes object 4b\x1dthis will be a bytes object 5b\x1dthis will be a bytes object 6b\x1dthis will be a bytes object 7b\x1dthis will be a bytes object 8b\x1dthis will be a bytes object 9s\rconst tuple 0s\rconst tuple 1s\rconst tuple 2s\rconst tuple 3s\rconst tuple 4s\rconst tuple 5s\rconst tuple 6s\rconst tuple 7s\rconst tuple 8s\rconst tuple 9'
+file_data = b"M\x06\x02\x1f\x81=\x1e\x0etest.py\x00\x0f\x04A0\x00\x04A1\x00\x04f0\x00\x04f1\x00\x0cresult\x00/-5\x04a0\x00\x04a1\x00\x04a2\x00\x04a3\x00\x13\x15\x17\x19\x1b\x1d\x1f!#%')+1379;=?ACEGIKMOQSUWY[]_acegikmoqsuwy{}\x7f\x81\x01\x81\x03\x81\x05\x81\x07\x81\t\x81\x0b\x81\r\x81\x0f\x81\x11\x81\x13\x81\x15\x81\x17\x81\x19\x81\x1b\x81\x1d\x81\x1f\x81!\x81#\x81%\x81'\x81)\x81+\x81-\x81/\x811\x813\x815\x817\x819\x81;\x81=\x81?\x81A\x81C\x81E\x81G\x81I\x81K\x81M\x81O\x81Q\x81S\x81U\x81W\x81Y\x81[\x81]\x81_\x81a\x81c\x81e\x81g\x81i\x81k\x81m\x81o\x81q\x81s\x81u\x81w\x81y\x81{\x81}\x81\x7f\x82\x01\x82\x03\x82\x05\x82\x07\x82\t\x82\x0b\x82\r\x82\x0f\x82\x11\x82\x13\x82\x15\x82\x17\x82\x19\x82\x1b\x82\x1d\x82\x1f\x82!\x82#\x82%\x82'\x82)\x82+\x82-\x82/\x821\x823\x825\x827\x829\x82;\x82=\x82?\x82A\x82E\x82G\x82I\x82K\nname0\x00\nname1\x00\nname2\x00\nname3\x00\nname4\x00\nname5\x00\nname6\x00\nname7\x00\nname8\x00\nname9\x00$quite_a_long_name0\x00$quite_a_long_name1\x00$quite_a_long_name2\x00$quite_a_long_name3\x00$quite_a_long_name4\x00$quite_a_long_name5\x00$quite_a_long_name6\x00$quite_a_long_name7\x00$quite_a_long_name8\x00$quite_a_long_name9\x00&quite_a_long_name10\x00&quite_a_long_name11\x00s\x1ethis will be a string object 0\x00s\x1ethis will be a string object 1\x00s\x1ethis will be a string object 2\x00s\x1ethis will be a string object 3\x00s\x1ethis will be a string object 4\x00s\x1ethis will be a string object 5\x00s\x1ethis will be a string object 6\x00s\x1ethis will be a string object 7\x00s\x1ethis will be a string object 8\x00s\x1ethis will be a string object 9\x00b\x1dthis will be a bytes object 0\x00b\x1dthis will be a bytes object 1\x00b\x1dthis will be a bytes object 2\x00b\x1dthis will be a bytes object 3\x00b\x1dthis will be a bytes object 4\x00b\x1dthis will be a bytes object 5\x00b\x1dthis will be a bytes object 6\x00b\x1dthis will be a bytes object 7\x00b\x1dthis will be a bytes object 8\x00b\x1dthis will be a bytes object 9\x00s\rconst tuple 0\x00s\rconst tuple 1\x00s\rconst tuple 2\x00s\rconst tuple 3\x00s\rconst tuple 4\x00s\rconst tuple 5\x00s\rconst tuple 6\x00s\rconst tuple 7\x00s\rconst tuple 8\x00s\rconst tuple 9\x00\x82d\x10\x12\x01i@i@\x84\x18\x84\x1fT2\x00\x10\x024\x02\x16\x02T2\x01\x10\x034\x02\x16\x032\x02\x16\x042\x03\x16\x05\"\x80{\x16\x06Qc\x04\x82\x0c\x00\n\x02($$$\x11\x07\x16\x08\x10\x02\x16\t2\x00\x16\n2\x01\x16\x0b2\x02\x16\x0c2\x03\x16\rQc\x04@\t\x08\n\x81\x0b Qc@\t\x08\x0b\x81\x0b@Qc@\t\x08\x0c\x81\x0b`QcH\t\n\r\x81\x0b` Qc\x82\x14\x00\x0c\x03h`$$$\x11\x07\x16\x08\x10\x03\x16\t2\x00\x16\n2\x01\x16\x0b2\x02\x16\x0c2\x03\x16\rQc\x04H\t\n\n\x81\x0b``QcH\t\n\x0b\x81\x0b\x80\x07QcH\t\n\x0c\x81\x0b\x80\x08QcH\t\n\r\x81\x0b\x80\tQc\xa08P:\x04\x80\x0b13///---997799<\x1f%\x1f\"\x1f%)\x1f\"//\x12\x0e\x12\x0f\x12\x10\x12\x11\x12\x12\x12\x13\x12\x14*\x07Y\x12\x15\x12\x16\x12\x17\x12\x18\x12\x19\x12\x1a\x12\x08\x12\x07*\x08Y\x12\x1b\x12\x1c\x12\t\x12\x1d\x12\x1e\x12\x1f*\x06Y\x12 \x12!\x12\"\x12#\x12$\x12%*\x06Y\x12&\x12'\x12(\x12)\x12*\x12+*\x06Y\x12,\x12-\x12.\x12/\x120*\x05Y\x121\x122\x123\x124\x125*\x05Y\x126\x127\x128\x129\x12:*\x05Y\x12;\x12<\x12=\x12>\x12?\x12@\x12A\x12B\x12C\x12D\x12E*\x0bY\x12F\x12G\x12H\x12I\x12J\x12K\x12L\x12M\x12N\x12O\x12P*\x0bY\x12Q\x12R\x12S\x12T\x12U\x12V\x12W\x12X\x12Y\x12Z*\nY\x12[\x12\\\x12]\x12^\x12_\x12`\x12a\x12b\x12c\x12d*\nY\x12e\x12f\x12g\x12h\x12i\x12j\x12k\x12l\x12m\x12n\x12o*\x0bY\x12p\x12q\x12r\x12s\x12t\x12u\x12v\x12w\x12x\x12y\x12z*\x0bY\x12{\x12|\x12}\x12~\x12\x7f\x12\x81\x00\x12\x81\x01\x12\x81\x02\x12\x81\x03\x12\x81\x04*\nY\x12\x81\x05\x12\x81\x06\x12\x81\x07\x12\x81\x08\x12\x81\t\x12\x81\n\x12\x81\x0b\x12\x81\x0c\x12\x81\r\x12\x81\x0e\x12\x81\x0f*\x0bY\x12\x81\x10\x12\x81\x11\x12\x81\x12\x12\x81\x13\x12\x81\x14\x12\x81\x15\x12\x81\x16\x12\x81\x17\x12\x81\x18\x12\x81\x19*\nY\x12\x81\x1a\x12\x81\x1b\x12\x81\x1c\x12\x81\x1d\x12\x81\x1e\x12\x81\x1f\x12\x81 \x12\x81!\x12\x81\"\x12\x81#\x12\x81$*\x0bY\x12\x81%\x12\x81&*\x02Y\x12\x81'\x12\x81(\x12\x81)\x12\x81*\x12\x81+\x12\x81,\x12\x81-\x12\x81.\x12\x81/\x12\x810*\nY\x12\x811\x12\x812\x12\x813\x12\x814*\x04Y\x12\x815\x12\x816\x12\x817\x12\x818*\x04Y\x12\x819\x12\x81:\x12\x81;\x12\x81<*\x04YQc\x8cp8@\x05\x80#####################+++++++++#\x00\xc0#\x01\xc0#\x02\xc0#\x03\xc0#\x04\xc0#\x05\xc0#\x06\xc0#\x07\xc0#\x08\xc0#\t\xc0#\n\xc0#\x0b\xc0#\x0c\xc0#\r\xc0#\x0e\xc0#\x0f\xc0#\x10\xc0#\x11\xc0#\x12\xc0#\x13\xc0#\x14QPR\x81\x82\x83*\x07\xc0#\x15QPR\x81\x82\x83*\x07\xc0#\x16QPR\x81\x82\x83*\x07\xc0#\x17QPR\x81\x82\x83*\x07\xc0#\x18QPR\x81\x82\x83*\x07\xc0#\x19QPR\x81\x82\x83*\x07\xc0#\x1aQPR\x81\x82\x83*\x07\xc0#\x1bQPR\x81\x82\x83*\x07\xc0#\x1cQPR\x81\x82\x83*\x07\xc0#\x1dQPR\x81\x82\x83*\x07\xc0Qc"
 
 
 class File(uio.IOBase):
diff --git a/tools/mpy-tool.py b/tools/mpy-tool.py
index 58a4a75c91ecb..da6352dab716d 100755
--- a/tools/mpy-tool.py
+++ b/tools/mpy-tool.py
@@ -29,27 +29,49 @@
 import platform
 
 if platform.python_version_tuple()[0] == "2":
-    str_cons = lambda val, enc=None: val
+    from binascii import hexlify as hexlify_py2
+
+    str_cons = lambda val, enc=None: str(val)
     bytes_cons = lambda val, enc=None: bytearray(val)
     is_str_type = lambda o: type(o) is str
     is_bytes_type = lambda o: type(o) is bytearray
     is_int_type = lambda o: type(o) is int or type(o) is long
+
+    def hexlify_to_str(b):
+        x = hexlify_py2(b)
+        return ":".join(x[i : i + 2] for i in range(0, len(x), 2))
+
 else:
+    from binascii import hexlify
+
     str_cons = str
     bytes_cons = bytes
     is_str_type = lambda o: type(o) is str
     is_bytes_type = lambda o: type(o) is bytes
     is_int_type = lambda o: type(o) is int
+
+    def hexlify_to_str(b):
+        return str(hexlify(b, ":"), "ascii")
+
+
 # end compatibility code
 
 import sys
 import struct
-from collections import namedtuple
 
 sys.path.append(sys.path[0] + "/../py")
 import makeqstrdata as qstrutil
 
 
+class MPYReadError(Exception):
+    def __init__(self, filename, msg):
+        self.filename = filename
+        self.msg = msg
+
+    def __str__(self):
+        return "%s: %s" % (self.filename, self.msg)
+
+
 class FreezeError(Exception):
     def __init__(self, rawcode, msg):
         self.rawcode = rawcode
@@ -60,7 +82,7 @@ def __str__(self):
 
 
 class Config:
-    MPY_VERSION = 5
+    MPY_VERSION = 6
     MICROPY_LONGINT_IMPL_NONE = 0
     MICROPY_LONGINT_IMPL_LONGLONG = 1
     MICROPY_LONGINT_IMPL_MPZ = 2
@@ -82,20 +104,6 @@ def __init__(self, str):
     global_qstrs.append(QStrType(n))
 
 
-class QStrWindow:
-    def __init__(self, size):
-        self.window = []
-        self.size = size
-
-    def push(self, val):
-        self.window = [val] + self.window[: self.size - 1]
-
-    def access(self, idx):
-        val = self.window[idx]
-        self.window = [val] + self.window[:idx] + self.window[idx + 1 :]
-        return val
-
-
 MP_CODE_BYTECODE = 2
 MP_CODE_NATIVE_PY = 3
 MP_CODE_NATIVE_VIPER = 4
@@ -113,6 +121,10 @@ def access(self, idx):
 MP_NATIVE_ARCH_XTENSA = 9
 MP_NATIVE_ARCH_XTENSAWIN = 10
 
+MP_SCOPE_FLAG_VIPERRELOC = 0x10
+MP_SCOPE_FLAG_VIPERRODATA = 0x20
+MP_SCOPE_FLAG_VIPERBSS = 0x40
+
 MP_BC_MASK_EXTRA_BYTE = 0x9E
 
 MP_BC_FORMAT_BYTE = 0
@@ -120,11 +132,180 @@ def access(self, idx):
 MP_BC_FORMAT_VAR_UINT = 2
 MP_BC_FORMAT_OFFSET = 3
 
-# extra byte if caching enabled:
-MP_BC_LOAD_NAME = 0x11
-MP_BC_LOAD_GLOBAL = 0x12
-MP_BC_LOAD_ATTR = 0x13
-MP_BC_STORE_ATTR = 0x18
+mp_unary_op_method_name = (
+    "__pos__",
+    "__neg__",
+    "__invert__",
+    "<not>",
+)
+
+mp_binary_op_method_name = (
+    "__lt__",
+    "__gt__",
+    "__eq__",
+    "__le__",
+    "__ge__",
+    "__ne__",
+    "<in>",
+    "<is>",
+    "<exception match>",
+    "__ior__",
+    "__ixor__",
+    "__iand__",
+    "__ilshift__",
+    "__irshift__",
+    "__iadd__",
+    "__isub__",
+    "__imul__",
+    "__imatmul__",
+    "__ifloordiv__",
+    "__itruediv__",
+    "__imod__",
+    "__ipow__",
+    "__or__",
+    "__xor__",
+    "__and__",
+    "__lshift__",
+    "__rshift__",
+    "__add__",
+    "__sub__",
+    "__mul__",
+    "__matmul__",
+    "__floordiv__",
+    "__truediv__",
+    "__mod__",
+    "__pow__",
+)
+
+
+class Opcodes:
+    # fmt: off
+    # Load, Store, Delete, Import, Make, Build, Unpack, Call, Jump, Exception, For, sTack, Return, Yield, Op
+    MP_BC_BASE_RESERVED               = (0x00) # ----------------
+    MP_BC_BASE_QSTR_O                 = (0x10) # LLLLLLSSSDDII---
+    MP_BC_BASE_VINT_E                 = (0x20) # MMLLLLSSDDBBBBBB
+    MP_BC_BASE_VINT_O                 = (0x30) # UUMMCCCC--------
+    MP_BC_BASE_JUMP_E                 = (0x40) # J-JJJJJEEEEF----
+    MP_BC_BASE_BYTE_O                 = (0x50) # LLLLSSDTTTTTEEFF
+    MP_BC_BASE_BYTE_E                 = (0x60) # --BREEEYYI------
+    MP_BC_LOAD_CONST_SMALL_INT_MULTI  = (0x70) # LLLLLLLLLLLLLLLL
+    #                                 = (0x80) # LLLLLLLLLLLLLLLL
+    #                                 = (0x90) # LLLLLLLLLLLLLLLL
+    #                                 = (0xa0) # LLLLLLLLLLLLLLLL
+    MP_BC_LOAD_FAST_MULTI             = (0xb0) # LLLLLLLLLLLLLLLL
+    MP_BC_STORE_FAST_MULTI            = (0xc0) # SSSSSSSSSSSSSSSS
+    MP_BC_UNARY_OP_MULTI              = (0xd0) # OOOOOOO
+    MP_BC_BINARY_OP_MULTI             = (0xd7) #        OOOOOOOOO
+    #                                 = (0xe0) # OOOOOOOOOOOOOOOO
+    #                                 = (0xf0) # OOOOOOOOOO------
+
+    MP_BC_LOAD_CONST_SMALL_INT_MULTI_NUM = 64
+    MP_BC_LOAD_CONST_SMALL_INT_MULTI_EXCESS = 16
+    MP_BC_LOAD_FAST_MULTI_NUM         = 16
+    MP_BC_STORE_FAST_MULTI_NUM        = 16
+    MP_BC_UNARY_OP_MULTI_NUM          = 4  # MP_UNARY_OP_NUM_BYTECODE
+    MP_BC_BINARY_OP_MULTI_NUM         = 35  # MP_BINARY_OP_NUM_BYTECODE
+
+    MP_BC_LOAD_CONST_FALSE            = (MP_BC_BASE_BYTE_O + 0x00)
+    MP_BC_LOAD_CONST_NONE             = (MP_BC_BASE_BYTE_O + 0x01)
+    MP_BC_LOAD_CONST_TRUE             = (MP_BC_BASE_BYTE_O + 0x02)
+    MP_BC_LOAD_CONST_SMALL_INT        = (MP_BC_BASE_VINT_E + 0x02) # signed var-int
+    MP_BC_LOAD_CONST_STRING           = (MP_BC_BASE_QSTR_O + 0x00) # qstr
+    MP_BC_LOAD_CONST_OBJ              = (MP_BC_BASE_VINT_E + 0x03) # ptr
+    MP_BC_LOAD_NULL                   = (MP_BC_BASE_BYTE_O + 0x03)
+
+    MP_BC_LOAD_FAST_N                 = (MP_BC_BASE_VINT_E + 0x04) # uint
+    MP_BC_LOAD_DEREF                  = (MP_BC_BASE_VINT_E + 0x05) # uint
+    MP_BC_LOAD_NAME                   = (MP_BC_BASE_QSTR_O + 0x01) # qstr
+    MP_BC_LOAD_GLOBAL                 = (MP_BC_BASE_QSTR_O + 0x02) # qstr
+    MP_BC_LOAD_ATTR                   = (MP_BC_BASE_QSTR_O + 0x03) # qstr
+    MP_BC_LOAD_METHOD                 = (MP_BC_BASE_QSTR_O + 0x04) # qstr
+    MP_BC_LOAD_SUPER_METHOD           = (MP_BC_BASE_QSTR_O + 0x05) # qstr
+    MP_BC_LOAD_BUILD_CLASS            = (MP_BC_BASE_BYTE_O + 0x04)
+    MP_BC_LOAD_SUBSCR                 = (MP_BC_BASE_BYTE_O + 0x05)
+
+    MP_BC_STORE_FAST_N                = (MP_BC_BASE_VINT_E + 0x06) # uint
+    MP_BC_STORE_DEREF                 = (MP_BC_BASE_VINT_E + 0x07) # uint
+    MP_BC_STORE_NAME                  = (MP_BC_BASE_QSTR_O + 0x06) # qstr
+    MP_BC_STORE_GLOBAL                = (MP_BC_BASE_QSTR_O + 0x07) # qstr
+    MP_BC_STORE_ATTR                  = (MP_BC_BASE_QSTR_O + 0x08) # qstr
+    MP_BC_STORE_SUBSCR                = (MP_BC_BASE_BYTE_O + 0x06)
+
+    MP_BC_DELETE_FAST                 = (MP_BC_BASE_VINT_E + 0x08) # uint
+    MP_BC_DELETE_DEREF                = (MP_BC_BASE_VINT_E + 0x09) # uint
+    MP_BC_DELETE_NAME                 = (MP_BC_BASE_QSTR_O + 0x09) # qstr
+    MP_BC_DELETE_GLOBAL               = (MP_BC_BASE_QSTR_O + 0x0a) # qstr
+
+    MP_BC_DUP_TOP                     = (MP_BC_BASE_BYTE_O + 0x07)
+    MP_BC_DUP_TOP_TWO                 = (MP_BC_BASE_BYTE_O + 0x08)
+    MP_BC_POP_TOP                     = (MP_BC_BASE_BYTE_O + 0x09)
+    MP_BC_ROT_TWO                     = (MP_BC_BASE_BYTE_O + 0x0a)
+    MP_BC_ROT_THREE                   = (MP_BC_BASE_BYTE_O + 0x0b)
+
+    MP_BC_JUMP                        = (MP_BC_BASE_JUMP_E + 0x02) # rel byte code offset, 16-bit signed, in excess
+    MP_BC_POP_JUMP_IF_TRUE            = (MP_BC_BASE_JUMP_E + 0x03) # rel byte code offset, 16-bit signed, in excess
+    MP_BC_POP_JUMP_IF_FALSE           = (MP_BC_BASE_JUMP_E + 0x04) # rel byte code offset, 16-bit signed, in excess
+    MP_BC_JUMP_IF_TRUE_OR_POP         = (MP_BC_BASE_JUMP_E + 0x05) # rel byte code offset, 16-bit signed, in excess
+    MP_BC_JUMP_IF_FALSE_OR_POP        = (MP_BC_BASE_JUMP_E + 0x06) # rel byte code offset, 16-bit signed, in excess
+    MP_BC_UNWIND_JUMP                 = (MP_BC_BASE_JUMP_E + 0x00) # rel byte code offset, 16-bit signed, in excess; then a byte
+    MP_BC_SETUP_WITH                  = (MP_BC_BASE_JUMP_E + 0x07) # rel byte code offset, 16-bit unsigned
+    MP_BC_SETUP_EXCEPT                = (MP_BC_BASE_JUMP_E + 0x08) # rel byte code offset, 16-bit unsigned
+    MP_BC_SETUP_FINALLY               = (MP_BC_BASE_JUMP_E + 0x09) # rel byte code offset, 16-bit unsigned
+    MP_BC_POP_EXCEPT_JUMP             = (MP_BC_BASE_JUMP_E + 0x0a) # rel byte code offset, 16-bit unsigned
+    MP_BC_FOR_ITER                    = (MP_BC_BASE_JUMP_E + 0x0b) # rel byte code offset, 16-bit unsigned
+    MP_BC_WITH_CLEANUP                = (MP_BC_BASE_BYTE_O + 0x0c)
+    MP_BC_END_FINALLY                 = (MP_BC_BASE_BYTE_O + 0x0d)
+    MP_BC_GET_ITER                    = (MP_BC_BASE_BYTE_O + 0x0e)
+    MP_BC_GET_ITER_STACK              = (MP_BC_BASE_BYTE_O + 0x0f)
+
+    MP_BC_BUILD_TUPLE                 = (MP_BC_BASE_VINT_E + 0x0a) # uint
+    MP_BC_BUILD_LIST                  = (MP_BC_BASE_VINT_E + 0x0b) # uint
+    MP_BC_BUILD_MAP                   = (MP_BC_BASE_VINT_E + 0x0c) # uint
+    MP_BC_STORE_MAP                   = (MP_BC_BASE_BYTE_E + 0x02)
+    MP_BC_BUILD_SET                   = (MP_BC_BASE_VINT_E + 0x0d) # uint
+    MP_BC_BUILD_SLICE                 = (MP_BC_BASE_VINT_E + 0x0e) # uint
+    MP_BC_STORE_COMP                  = (MP_BC_BASE_VINT_E + 0x0f) # uint
+    MP_BC_UNPACK_SEQUENCE             = (MP_BC_BASE_VINT_O + 0x00) # uint
+    MP_BC_UNPACK_EX                   = (MP_BC_BASE_VINT_O + 0x01) # uint
+
+    MP_BC_RETURN_VALUE                = (MP_BC_BASE_BYTE_E + 0x03)
+    MP_BC_RAISE_LAST                  = (MP_BC_BASE_BYTE_E + 0x04)
+    MP_BC_RAISE_OBJ                   = (MP_BC_BASE_BYTE_E + 0x05)
+    MP_BC_RAISE_FROM                  = (MP_BC_BASE_BYTE_E + 0x06)
+    MP_BC_YIELD_VALUE                 = (MP_BC_BASE_BYTE_E + 0x07)
+    MP_BC_YIELD_FROM                  = (MP_BC_BASE_BYTE_E + 0x08)
+
+    MP_BC_MAKE_FUNCTION               = (MP_BC_BASE_VINT_O + 0x02) # uint
+    MP_BC_MAKE_FUNCTION_DEFARGS       = (MP_BC_BASE_VINT_O + 0x03) # uint
+    MP_BC_MAKE_CLOSURE                = (MP_BC_BASE_VINT_E + 0x00) # uint; extra byte
+    MP_BC_MAKE_CLOSURE_DEFARGS        = (MP_BC_BASE_VINT_E + 0x01) # uint; extra byte
+    MP_BC_CALL_FUNCTION               = (MP_BC_BASE_VINT_O + 0x04) # uint
+    MP_BC_CALL_FUNCTION_VAR_KW        = (MP_BC_BASE_VINT_O + 0x05) # uint
+    MP_BC_CALL_METHOD                 = (MP_BC_BASE_VINT_O + 0x06) # uint
+    MP_BC_CALL_METHOD_VAR_KW          = (MP_BC_BASE_VINT_O + 0x07) # uint
+
+    MP_BC_IMPORT_NAME                 = (MP_BC_BASE_QSTR_O + 0x0b) # qstr
+    MP_BC_IMPORT_FROM                 = (MP_BC_BASE_QSTR_O + 0x0c) # qstr
+    MP_BC_IMPORT_STAR                 = (MP_BC_BASE_BYTE_E + 0x09)
+    # fmt: on
+
+    # Create a dict mapping opcode value to opcode name.
+    mapping = ["unknown" for _ in range(256)]
+    for op_name in list(locals()):
+        if op_name.startswith("MP_BC_"):
+            mapping[locals()[op_name]] = op_name[len("MP_BC_") :]
+    for i in range(MP_BC_LOAD_CONST_SMALL_INT_MULTI_NUM):
+        name = "LOAD_CONST_SMALL_INT %d" % (i - MP_BC_LOAD_CONST_SMALL_INT_MULTI_EXCESS)
+        mapping[MP_BC_LOAD_CONST_SMALL_INT_MULTI + i] = name
+    for i in range(MP_BC_LOAD_FAST_MULTI_NUM):
+        mapping[MP_BC_LOAD_FAST_MULTI + i] = "LOAD_FAST %d" % i
+    for i in range(MP_BC_STORE_FAST_MULTI_NUM):
+        mapping[MP_BC_STORE_FAST_MULTI + i] = "STORE_FAST %d" % i
+    for i in range(MP_BC_UNARY_OP_MULTI_NUM):
+        mapping[MP_BC_UNARY_OP_MULTI + i] = "UNARY_OP %d %s" % (i, mp_unary_op_method_name[i])
+    for i in range(MP_BC_BINARY_OP_MULTI_NUM):
+        mapping[MP_BC_BINARY_OP_MULTI + i] = "BINARY_OP %d %s" % (i, mp_binary_op_method_name[i])
+
 
 # this function mirrors that in py/bc.c
 def mp_opcode_format(bytecode, ip, count_var_uint):
@@ -147,6 +328,26 @@ def mp_opcode_format(bytecode, ip, count_var_uint):
     return f, ip - ip_start
 
 
+def mp_opcode_decode(bytecode, ip):
+    opcode = bytecode[ip]
+    ip_start = ip
+    f = (0x000003A4 >> (2 * ((opcode) >> 4))) & 3
+    extra_byte = (opcode & MP_BC_MASK_EXTRA_BYTE) == 0
+    ip += 1
+    arg = 0
+    if f in (MP_BC_FORMAT_QSTR, MP_BC_FORMAT_VAR_UINT):
+        arg = bytecode[ip] & 0x7F
+        while bytecode[ip] & 0x80 != 0:
+            ip += 1
+            arg = arg << 7 | bytecode[ip] & 0x7F
+        ip += 1
+    elif f == MP_BC_FORMAT_OFFSET:
+        arg = bytecode[ip] | bytecode[ip + 1] << 8
+        ip += 2
+    ip += extra_byte
+    return f, ip - ip_start, arg
+
+
 def read_prelude_sig(read_byte):
     z = read_byte()
     # xSSSSEAA
@@ -201,6 +402,7 @@ def local_read_byte():
         n_kwonly_args,
         n_def_pos_args,
     ) = read_prelude_sig(local_read_byte)
+
     n_info, n_cell = read_prelude_size(local_read_byte)
     ip = ip_ref[0]
 
@@ -208,74 +410,186 @@ def local_read_byte():
     ip = ip2 + n_info + n_cell
     # ip now points to first opcode
     # ip2 points to simple_name qstr
-    return ip, ip2, (n_state, n_exc_stack, scope_flags, n_pos_args, n_kwonly_args, n_def_pos_args)
-
 
-class MPFunTable:
-    pass
+    # Extract simple_name and argument qstrs (var uints).
+    args = []
+    for arg_num in range(1 + n_pos_args + n_kwonly_args):
+        value = 0
+        while True:
+            b = local_read_byte()
+            value = (value << 7) | (b & 0x7F)
+            if b & 0x80 == 0:
+                break
+        args.append(value)
+
+    return (
+        ip2,
+        ip,
+        ip_ref[0],
+        (n_state, n_exc_stack, scope_flags, n_pos_args, n_kwonly_args, n_def_pos_args),
+        args,
+    )
 
 
-class RawCode(object):
-    # a set of all escaped names, to make sure they are unique
-    escaped_names = set()
+class MPFunTable:
+    def __repr__(self):
+        return "mp_fun_table"
 
-    # convert code kind number to string
-    code_kind_str = {
-        MP_CODE_BYTECODE: "MP_CODE_BYTECODE",
-        MP_CODE_NATIVE_PY: "MP_CODE_NATIVE_PY",
-        MP_CODE_NATIVE_VIPER: "MP_CODE_NATIVE_VIPER",
-        MP_CODE_NATIVE_ASM: "MP_CODE_NATIVE_ASM",
-    }
 
-    def __init__(self, code_kind, bytecode, prelude_offset, qstrs, objs, raw_codes):
-        # set core variables
-        self.code_kind = code_kind
-        self.bytecode = bytecode
-        self.prelude_offset = prelude_offset
-        self.qstrs = qstrs
-        self.objs = objs
-        self.raw_codes = raw_codes
-
-        if self.prelude_offset is None:
-            # no prelude, assign a dummy simple_name
-            self.prelude_offset = 0
-            self.simple_name = global_qstrs[1]
-        else:
-            # extract prelude
-            self.ip, self.ip2, self.prelude = extract_prelude(self.bytecode, self.prelude_offset)
-            self.simple_name = self._unpack_qstr(self.ip2)
-            self.source_file = self._unpack_qstr(self.ip2 + 2)
-            self.line_info_offset = self.ip2 + 4
+class CompiledModule:
+    def __init__(
+        self,
+        mpy_source_file,
+        mpy_segments,
+        header,
+        qstr_table,
+        obj_table,
+        raw_code,
+        raw_code_file_offset,
+        escaped_name,
+    ):
+        self.mpy_source_file = mpy_source_file
+        self.mpy_segments = mpy_segments
+        self.source_file = qstr_table[0]
+        self.header = header
+        self.qstr_table = qstr_table
+        self.obj_table = obj_table
+        self.raw_code_file_offset = raw_code_file_offset
+        self.raw_code = raw_code
+        self.escaped_name = escaped_name
 
     def _unpack_qstr(self, ip):
         qst = self.bytecode[ip] | self.bytecode[ip + 1] << 8
         return global_qstrs[qst]
 
-    def dump(self):
-        # dump children first
-        for rc in self.raw_codes:
-            rc.freeze("")
-        # TODO
+    def hexdump(self):
+        with open(self.mpy_source_file, "rb") as f:
+            WIDTH = 16
+            COL_OFF = "\033[0m"
+            COL_TABLE = (
+                ("", ""),  # META
+                ("\033[0;31m", "\033[0;91m"),  # QSTR
+                ("\033[0;32m", "\033[0;92m"),  # OBJ
+                ("\033[0;34m", "\033[0;94m"),  # CODE
+            )
+            cur_col = ""
+            cur_col_index = 0
+            offset = 0
+            segment_index = 0
+            while True:
+                data = bytes_cons(f.read(WIDTH))
+                if not data:
+                    break
+
+                # Print out the hex dump of this line of data.
+                line_hex = cur_col
+                line_chr = cur_col
+                line_comment = ""
+                for i in range(len(data)):
+                    # Determine the colour of the data, if any, and the line comment.
+                    while segment_index < len(self.mpy_segments):
+                        if offset + i == self.mpy_segments[segment_index].start:
+                            cur_col = COL_TABLE[self.mpy_segments[segment_index].kind][
+                                cur_col_index
+                            ]
+                            cur_col_index = 1 - cur_col_index
+                            line_hex += cur_col
+                            line_chr += cur_col
+                            line_comment += " %s%s%s" % (
+                                cur_col,
+                                self.mpy_segments[segment_index].name,
+                                COL_OFF,
+                            )
+                        if offset + i == self.mpy_segments[segment_index].end:
+                            cur_col = ""
+                            line_hex += COL_OFF
+                            line_chr += COL_OFF
+                            segment_index += 1
+                        else:
+                            break
+
+                    # Add to the hex part of the line.
+                    if i % 2 == 0:
+                        line_hex += " "
+                    line_hex += "%02x" % data[i]
+
+                    # Add to the characters part of the line.
+                    if 0x20 <= data[i] <= 0x7E:
+                        line_chr += "%s" % chr(data[i])
+                    else:
+                        line_chr += "."
+
+                # Print out this line.
+                if cur_col:
+                    line_hex += COL_OFF
+                    line_chr += COL_OFF
+                pad = " " * ((WIDTH - len(data)) * 5 // 2)
+                print("%08x:%s%s  %s %s" % (offset, line_hex, pad, line_chr, line_comment))
+                offset += WIDTH
+
+    def disassemble(self):
+        print("mpy_source_file:", self.mpy_source_file)
+        print("source_file:", self.source_file.str)
+        print("header:", hexlify_to_str(self.header))
+        print("qstr_table[%u]:" % len(self.qstr_table))
+        for q in self.qstr_table:
+            print("    %s" % q.str)
+        print("obj_table:", self.obj_table)
+        self.raw_code.disassemble()
+
+    def freeze(self, compiled_module_index):
+        print()
+        print("/" * 80)
+        print("// frozen module %s" % self.escaped_name)
+        print("// - original source file: %s" % self.mpy_source_file)
+        print("// - frozen file name: %s" % self.source_file.str)
+        print("// - .mpy header: %s" % ":".join("%02x" % b for b in self.header))
+        print()
 
-    def freeze_children(self, parent_name):
-        self.escaped_name = parent_name + self.simple_name.qstr_esc
+        self.raw_code.freeze()
+        print()
 
-        # make sure the escaped name is unique
-        i = 2
-        while self.escaped_name in RawCode.escaped_names:
-            self.escaped_name = parent_name + self.simple_name.qstr_esc + str(i)
-            i += 1
-        RawCode.escaped_names.add(self.escaped_name)
+        self.freeze_constants()
 
-        # emit children first
-        for rc in self.raw_codes:
-            rc.freeze(self.escaped_name + "_")
+        print()
+        print("static const mp_frozen_module_t frozen_module_%s = {" % self.escaped_name)
+        print("    .constants = {")
+        if len(self.qstr_table):
+            print(
+                "        .qstr_table = (qstr_short_t *)&const_qstr_table_data_%s,"
+                % self.escaped_name
+            )
+        else:
+            print("        .qstr_table = NULL,")
+        if len(self.obj_table):
+            print("        .obj_table = (mp_obj_t *)&const_obj_table_data_%s," % self.escaped_name)
+        else:
+            print("        .obj_table = NULL,")
+        print("    },")
+        print("    .rc = &raw_code_%s," % self.raw_code.escaped_name)
+        print("};")
 
     def freeze_constants(self):
+        global const_str_content, const_int_content, const_obj_content
+
+        if len(self.qstr_table):
+            print(
+                "static const qstr_short_t const_qstr_table_data_%s[%u] = {"
+                % (self.escaped_name, len(self.qstr_table))
+            )
+            for q in self.qstr_table:
+                print("    %s," % q.qstr_id)
+            print("};")
+
+        if not len(self.obj_table):
+            return
+
         # generate constant objects
-        for i, obj in enumerate(self.objs):
+        print()
+        print("// constants")
+        for i, obj in enumerate(self.obj_table):
             obj_name = "const_obj_%s_%u" % (self.escaped_name, i)
-            if obj is MPFunTable:
+            if isinstance(obj, MPFunTable):
                 pass
             elif obj is Ellipsis:
                 print("#define %s mp_const_ellipsis_obj" % obj_name)
@@ -286,7 +600,7 @@ def freeze_constants(self):
                 else:
                     obj_type = "mp_type_bytes"
                 print(
-                    'STATIC const mp_obj_str_t %s = {{&%s}, %u, %u, (const byte*)"%s"};'
+                    'static const mp_obj_str_t %s = {{&%s}, %u, %u, (const byte*)"%s"};'
                     % (
                         obj_name,
                         obj_type,
@@ -295,6 +609,8 @@ def freeze_constants(self):
                         "".join(("\\x%02x" % b) for b in obj),
                     )
                 )
+                const_str_content += len(obj)
+                const_obj_content += 4 * 4
             elif is_int_type(obj):
                 if config.MICROPY_LONGINT_IMPL == config.MICROPY_LONGINT_IMPL_NONE:
                     # TODO check if we can actually fit this long-int into a small-int
@@ -316,76 +632,139 @@ def freeze_constants(self):
                     ndigs = len(digs)
                     digs = ",".join(("%#x" % d) for d in digs)
                     print(
-                        "STATIC const mp_obj_int_t %s = {{&mp_type_int}, "
+                        "static const mp_obj_int_t %s = {{&mp_type_int}, "
                         "{.neg=%u, .fixed_dig=1, .alloc=%u, .len=%u, .dig=(uint%u_t*)(const uint%u_t[]){%s}}};"
                         % (obj_name, neg, ndigs, ndigs, bits_per_dig, bits_per_dig, digs)
                     )
+                    const_int_content += (digs.count(",") + 1) * bits_per_dig // 8
+                    const_obj_content += 4 * 4
             elif type(obj) is float:
                 print(
                     "#if MICROPY_OBJ_REPR == MICROPY_OBJ_REPR_A || MICROPY_OBJ_REPR == MICROPY_OBJ_REPR_B"
                 )
                 print(
-                    "STATIC const mp_obj_float_t %s = {{&mp_type_float}, (mp_float_t)%.16g};"
+                    "static const mp_obj_float_t %s = {{&mp_type_float}, (mp_float_t)%.16g};"
                     % (obj_name, obj)
                 )
                 print("#endif")
+                const_obj_content += 3 * 4
             elif type(obj) is complex:
                 print(
-                    "STATIC const mp_obj_complex_t %s = {{&mp_type_complex}, (mp_float_t)%.16g, (mp_float_t)%.16g};"
+                    "static const mp_obj_complex_t %s = {{&mp_type_complex}, (mp_float_t)%.16g, (mp_float_t)%.16g};"
                     % (obj_name, obj.real, obj.imag)
                 )
             else:
                 raise FreezeError(self, "freezing of object %r is not implemented" % (obj,))
 
-        # generate constant table, if it has any entries
-        const_table_len = len(self.qstrs) + len(self.objs) + len(self.raw_codes)
-        if const_table_len:
-            print(
-                "STATIC const mp_rom_obj_t const_table_data_%s[%u] = {"
-                % (self.escaped_name, const_table_len)
-            )
-            for qst in self.qstrs:
-                print("    MP_ROM_QSTR(%s)," % global_qstrs[qst].qstr_id)
-            for i in range(len(self.objs)):
-                if self.objs[i] is MPFunTable:
-                    print("    &mp_fun_table,")
-                elif type(self.objs[i]) is float:
-                    print(
-                        "#if MICROPY_OBJ_REPR == MICROPY_OBJ_REPR_A || MICROPY_OBJ_REPR == MICROPY_OBJ_REPR_B"
-                    )
-                    print("    MP_ROM_PTR(&const_obj_%s_%u)," % (self.escaped_name, i))
-                    print("#elif MICROPY_OBJ_REPR == MICROPY_OBJ_REPR_C")
-                    n = struct.unpack("<I", struct.pack("<f", self.objs[i]))[0]
-                    n = ((n & ~0x3) | 2) + 0x80800000
-                    print("    (mp_rom_obj_t)(0x%08x)," % (n,))
-                    print("#elif MICROPY_OBJ_REPR == MICROPY_OBJ_REPR_D")
-                    n = struct.unpack("<Q", struct.pack("<d", self.objs[i]))[0]
-                    n += 0x8004000000000000
-                    print("    (mp_rom_obj_t)(0x%016x)," % (n,))
-                    print("#endif")
-                else:
-                    print("    MP_ROM_PTR(&const_obj_%s_%u)," % (self.escaped_name, i))
-            for rc in self.raw_codes:
-                print("    MP_ROM_PTR(&raw_code_%s)," % rc.escaped_name)
+        # generate constant table
+        print()
+        print("// constant table")
+        print(
+            "static const mp_rom_obj_t const_obj_table_data_%s[%u] = {"
+            % (self.escaped_name, len(self.obj_table))
+        )
+        for i in range(len(self.obj_table)):
+            if isinstance(self.obj_table[i], MPFunTable):
+                print("    &mp_fun_table,")
+            elif type(self.obj_table[i]) is float:
+                print(
+                    "#if MICROPY_OBJ_REPR == MICROPY_OBJ_REPR_A || MICROPY_OBJ_REPR == MICROPY_OBJ_REPR_B"
+                )
+                print("    MP_ROM_PTR(&const_obj_%s_%u)," % (self.escaped_name, i))
+                print("#elif MICROPY_OBJ_REPR == MICROPY_OBJ_REPR_C")
+                n = struct.unpack("<I", struct.pack("<f", self.obj_table[i]))[0]
+                n = ((n & ~0x3) | 2) + 0x80800000
+                print("    (mp_rom_obj_t)(0x%08x)," % (n,))
+                print("#elif MICROPY_OBJ_REPR == MICROPY_OBJ_REPR_D")
+                n = struct.unpack("<Q", struct.pack("<d", self.obj_table[i]))[0]
+                n += 0x8004000000000000
+                print("    (mp_rom_obj_t)(0x%016x)," % (n,))
+                print("#endif")
+            else:
+                print("    MP_ROM_PTR(&const_obj_%s_%u)," % (self.escaped_name, i))
+        print("};")
+
+        global const_table_ptr_content
+        const_table_ptr_content += len(self.obj_table)
+
+
+class RawCode(object):
+    # a set of all escaped names, to make sure they are unique
+    escaped_names = set()
+
+    # convert code kind number to string
+    code_kind_str = {
+        MP_CODE_BYTECODE: "MP_CODE_BYTECODE",
+        MP_CODE_NATIVE_PY: "MP_CODE_NATIVE_PY",
+        MP_CODE_NATIVE_VIPER: "MP_CODE_NATIVE_VIPER",
+        MP_CODE_NATIVE_ASM: "MP_CODE_NATIVE_ASM",
+    }
+
+    def __init__(self, cm_escaped_name, qstr_table, fun_data, prelude_offset, code_kind):
+        self.qstr_table = qstr_table
+        self.fun_data = fun_data
+        self.prelude_offset = prelude_offset
+        self.code_kind = code_kind
+
+        if code_kind in (MP_CODE_BYTECODE, MP_CODE_NATIVE_PY):
+            (
+                self.offset_names,
+                self.offset_opcodes,
+                self.offset_line_info,
+                self.prelude,
+                self.names,
+            ) = extract_prelude(self.fun_data, prelude_offset)
+            self.scope_flags = self.prelude[2]
+            self.n_pos_args = self.prelude[3]
+            self.simple_name = self.qstr_table[self.names[0]]
+        else:
+            self.simple_name = self.qstr_table[0]
+
+        escaped_name = cm_escaped_name + "_" + self.simple_name.qstr_esc
+
+        # make sure the escaped name is unique
+        i = 2
+        unique_escaped_name = escaped_name
+        while unique_escaped_name in self.escaped_names:
+            unique_escaped_name = escaped_name + str(i)
+            i += 1
+        self.escaped_names.add(unique_escaped_name)
+        self.escaped_name = unique_escaped_name
+
+    def disassemble_children(self):
+        print("  children:", [rc.simple_name.str for rc in self.children])
+        for rc in self.children:
+            rc.disassemble()
+
+    def freeze_children(self):
+        # Freeze children and generate table of children.
+        if len(self.children):
+            for rc in self.children:
+                print("// child of %s" % self.escaped_name)
+                rc.freeze()
+                print()
+            print("static const mp_raw_code_t *const children_%s[] = {" % self.escaped_name)
+            for rc in self.children:
+                print("    &raw_code_%s," % rc.escaped_name)
             print("};")
+            print()
 
-    def freeze_module(self, qstr_links=(), type_sig=0):
-        # generate module
-        if self.simple_name.str != "<module>":
-            print("STATIC ", end="")
-        print("const mp_raw_code_t raw_code_%s = {" % self.escaped_name)
+    def freeze_raw_code(self, qstr_links=(), type_sig=0):
+        # Generate mp_raw_code_t.
+        print("static const mp_raw_code_t raw_code_%s = {" % self.escaped_name)
         print("    .kind = %s," % RawCode.code_kind_str[self.code_kind])
-        print("    .scope_flags = 0x%02x," % self.prelude[2])
-        print("    .n_pos_args = %u," % self.prelude[3])
+        print("    .scope_flags = 0x%02x," % self.scope_flags)
+        print("    .n_pos_args = %u," % self.n_pos_args)
         print("    .fun_data = fun_data_%s," % self.escaped_name)
-        if len(self.qstrs) + len(self.objs) + len(self.raw_codes):
-            print("    .const_table = (mp_uint_t*)const_table_data_%s," % self.escaped_name)
+        print("    #if MICROPY_PERSISTENT_CODE_SAVE || MICROPY_DEBUG_PRINTERS")
+        print("    .fun_data_len = %u," % len(self.fun_data))
+        print("    #endif")
+        if len(self.children):
+            print("    .children = (void *)&children_%s," % self.escaped_name)
         else:
-            print("    .const_table = NULL,")
+            print("    .children = NULL,")
         print("    #if MICROPY_PERSISTENT_CODE_SAVE")
-        print("    .fun_data_len = %u," % len(self.bytecode))
-        print("    .n_obj = %u," % len(self.objs))
-        print("    .n_raw_code = %u," % len(self.raw_codes))
+        print("    .n_children = %u," % len(self.children))
         if self.code_kind == MP_CODE_BYTECODE:
             print("    #if MICROPY_PY_SYS_SETTRACE")
             print("    .prelude = {")
@@ -395,13 +774,14 @@ def freeze_module(self, qstr_links=(), type_sig=0):
             print("        .n_pos_args = %u," % self.prelude[3])
             print("        .n_kwonly_args = %u," % self.prelude[4])
             print("        .n_def_pos_args = %u," % self.prelude[5])
-            print("        .qstr_block_name = %s," % self.simple_name.qstr_id)
-            print("        .qstr_source_file = %s," % self.source_file.qstr_id)
+            print("        .qstr_block_name_idx = %u," % self.names[0])
             print(
                 "        .line_info = fun_data_%s + %u,"
-                % (self.escaped_name, self.line_info_offset)
+                % (self.escaped_name, self.offset_line_info)
+            )
+            print(
+                "        .opcodes = fun_data_%s + %u," % (self.escaped_name, self.offset_opcodes)
             )
-            print("        .opcodes = fun_data_%s + %u," % (self.escaped_name, self.ip))
             print("    },")
             print("    .line_of_definition = %u," % 0)  # TODO
             print("    #endif")
@@ -416,66 +796,109 @@ def freeze_module(self, qstr_links=(), type_sig=0):
         print("    #endif")
         print("};")
 
+        global raw_code_count, raw_code_content
+        raw_code_count += 1
+        raw_code_content += 4 * 4
+
 
 class RawCodeBytecode(RawCode):
-    def __init__(self, bytecode, qstrs, objs, raw_codes):
+    def __init__(self, cm_escaped_name, qstr_table, obj_table, fun_data):
+        self.obj_table = obj_table
         super(RawCodeBytecode, self).__init__(
-            MP_CODE_BYTECODE, bytecode, 0, qstrs, objs, raw_codes
+            cm_escaped_name, qstr_table, fun_data, 0, MP_CODE_BYTECODE
         )
 
-    def freeze(self, parent_name):
-        self.freeze_children(parent_name)
+    def disassemble(self):
+        bc = self.fun_data
+        print("simple_name:", self.simple_name.str)
+        print("  raw bytecode:", len(bc), hexlify_to_str(bc))
+        print("  prelude:", self.prelude)
+        print("  args:", [self.qstr_table[i].str for i in self.names[1:]])
+        print("  line info:", hexlify_to_str(bc[self.offset_line_info : self.offset_opcodes]))
+        ip = self.offset_opcodes
+        while ip < len(bc):
+            fmt, sz, arg = mp_opcode_decode(bc, ip)
+            if bc[ip] == Opcodes.MP_BC_LOAD_CONST_OBJ:
+                arg = "%r" % self.obj_table[arg]
+            if fmt == MP_BC_FORMAT_QSTR:
+                arg = self.qstr_table[arg].str
+            elif fmt in (MP_BC_FORMAT_VAR_UINT, MP_BC_FORMAT_OFFSET):
+                pass
+            else:
+                arg = ""
+            print(
+                "  %-11s %s %s" % (hexlify_to_str(bc[ip : ip + sz]), Opcodes.mapping[bc[ip]], arg)
+            )
+            ip += sz
+        self.disassemble_children()
 
+    def freeze(self):
         # generate bytecode data
-        print()
+        bc = self.fun_data
         print(
-            "// frozen bytecode for file %s, scope %s%s"
-            % (self.source_file.str, parent_name, self.simple_name.str)
+            "// frozen bytecode for file %s, scope %s"
+            % (self.qstr_table[0].str, self.escaped_name)
         )
-        print("STATIC const byte fun_data_%s[%u] = {" % (self.escaped_name, len(self.bytecode)))
-        print("   ", end="")
-        for i in range(self.ip2):
-            print(" 0x%02x," % self.bytecode[i], end="")
-        print()
-        print("   ", self.simple_name.qstr_id, "& 0xff,", self.simple_name.qstr_id, ">> 8,")
-        print("   ", self.source_file.qstr_id, "& 0xff,", self.source_file.qstr_id, ">> 8,")
-        print("   ", end="")
-        for i in range(self.ip2 + 4, self.ip):
-            print(" 0x%02x," % self.bytecode[i], end="")
-        print()
-        ip = self.ip
-        while ip < len(self.bytecode):
-            f, sz = mp_opcode_format(self.bytecode, ip, True)
-            if f == 1:
-                qst = self._unpack_qstr(ip + 1).qstr_id
-                extra = "" if sz == 3 else " 0x%02x," % self.bytecode[ip + 3]
-                print("   ", "0x%02x," % self.bytecode[ip], qst, "& 0xff,", qst, ">> 8,", extra)
-            else:
-                print("   ", "".join("0x%02x, " % self.bytecode[ip + i] for i in range(sz)))
+        print("static const byte fun_data_%s[%u] = {" % (self.escaped_name, len(bc)))
+
+        print("    ", end="")
+        for b in bc[: self.offset_names]:
+            print("0x%02x," % b, end="")
+        print(" // prelude")
+
+        print("    ", end="")
+        for b in bc[self.offset_names : self.offset_line_info]:
+            print("0x%02x," % b, end="")
+        print(" // names: %s" % ", ".join(self.qstr_table[i].str for i in self.names))
+
+        print("    ", end="")
+        for b in bc[self.offset_line_info : self.offset_opcodes]:
+            print("0x%02x," % b, end="")
+        print(" // code info")
+
+        ip = self.offset_opcodes
+        while ip < len(bc):
+            fmt, sz, arg = mp_opcode_decode(bc, ip)
+            opcode_name = Opcodes.mapping[bc[ip]]
+            if fmt == MP_BC_FORMAT_QSTR:
+                opcode_name += " " + self.qstr_table[arg].str
+            elif fmt in (MP_BC_FORMAT_VAR_UINT, MP_BC_FORMAT_OFFSET):
+                opcode_name += " %u" % arg
+            print(
+                "    %s, // %s" % (",".join("0x%02x" % b for b in bc[ip : ip + sz]), opcode_name)
+            )
             ip += sz
+
         print("};")
 
-        self.freeze_constants()
-        self.freeze_module()
+        self.freeze_children()
+        self.freeze_raw_code()
+
+        global bc_content
+        bc_content += len(bc)
 
 
 class RawCodeNative(RawCode):
     def __init__(
         self,
-        code_kind,
+        cm_escaped_name,
+        qstr_table,
+        kind,
         fun_data,
         prelude_offset,
-        prelude,
         qstr_links,
-        qstrs,
-        objs,
-        raw_codes,
+        scope_flags,
+        n_pos_args,
         type_sig,
     ):
         super(RawCodeNative, self).__init__(
-            code_kind, fun_data, prelude_offset, qstrs, objs, raw_codes
+            cm_escaped_name, qstr_table, fun_data, prelude_offset, kind
         )
-        self.prelude = prelude
+
+        if kind in (MP_CODE_NATIVE_VIPER, MP_CODE_NATIVE_ASM):
+            self.scope_flags = scope_flags
+            self.n_pos_args = n_pos_args
+
         self.qstr_links = qstr_links
         self.type_sig = type_sig
         if config.native_arch in (
@@ -502,11 +925,32 @@ def __init__(
             # ARMVxxM -- two byte align.
             self.fun_data_attributes += " __attribute__ ((aligned (2)))"
 
+    def disassemble(self):
+        fun_data = self.fun_data
+        print("simple_name:", self.simple_name.str)
+        print(
+            "  raw data:",
+            len(fun_data),
+            hexlify_to_str(fun_data[:32]),
+            "..." if len(fun_data) > 32 else "",
+        )
+        if self.code_kind != MP_CODE_NATIVE_PY:
+            return
+        print("  prelude:", self.prelude)
+        print("  args:", [self.qstr_table[i].str for i in self.names[1:]])
+        print("  line info:", fun_data[self.offset_line_info : self.offset_opcodes])
+        ip = 0
+        while ip < self.prelude_offset:
+            sz = 16
+            print(" ", hexlify_to_str(fun_data[ip : min(ip + sz, self.prelude_offset)]))
+            ip += sz
+        self.disassemble_children()
+
     def _asm_thumb_rewrite_mov(self, pc, val):
-        print("    (%u & 0xf0) | (%s >> 12)," % (self.bytecode[pc], val), end="")
-        print(" (%u & 0xfb) | (%s >> 9 & 0x04)," % (self.bytecode[pc + 1], val), end="")
+        print("    (%u & 0xf0) | (%s >> 12)," % (self.fun_data[pc], val), end="")
+        print(" (%u & 0xfb) | (%s >> 9 & 0x04)," % (self.fun_data[pc + 1], val), end="")
         print(" (%s & 0xff)," % (val,), end="")
-        print(" (%u & 0x07) | (%s >> 4 & 0x70)," % (self.bytecode[pc + 3], val))
+        print(" (%u & 0x07) | (%s >> 4 & 0x70)," % (self.fun_data[pc + 3], val))
 
     def _link_qstr(self, pc, kind, qst):
         if kind == 0:
@@ -543,32 +987,22 @@ def _link_qstr(self, pc, kind, qst):
             else:
                 assert 0
 
-    def freeze(self, parent_name):
-        if self.prelude[2] & ~0x0F:
+    def freeze(self):
+        if self.scope_flags & ~0x0F:
             raise FreezeError("unable to freeze code with relocations")
 
-        self.freeze_children(parent_name)
-
         # generate native code data
         print()
-        if self.code_kind == MP_CODE_NATIVE_PY:
-            print(
-                "// frozen native code for file %s, scope %s%s"
-                % (self.source_file.str, parent_name, self.simple_name.str)
-            )
-        elif self.code_kind == MP_CODE_NATIVE_VIPER:
-            print("// frozen viper code for scope %s" % (parent_name,))
-        else:
-            print("// frozen assembler code for scope %s" % (parent_name,))
         print(
-            "STATIC const byte fun_data_%s[%u] %s = {"
-            % (self.escaped_name, len(self.bytecode), self.fun_data_attributes)
+            "// frozen native code for file %s, scope %s"
+            % (self.qstr_table[0].str, self.escaped_name)
+        )
+        print(
+            "static const byte fun_data_%s[%u] %s = {"
+            % (self.escaped_name, len(self.fun_data), self.fun_data_attributes)
         )
 
-        if self.code_kind == MP_CODE_NATIVE_PY:
-            i_top = self.prelude_offset
-        else:
-            i_top = len(self.bytecode)
+        i_top = len(self.fun_data)
         i = 0
         qi = 0
         while i < i_top:
@@ -585,229 +1019,253 @@ def freeze(self, parent_name):
                     i16 = min(i16, self.qstr_links[qi][0])
                 print("   ", end="")
                 for ii in range(i, i16):
-                    print(" 0x%02x," % self.bytecode[ii], end="")
+                    print(" 0x%02x," % self.fun_data[ii], end="")
                 print()
                 i = i16
 
-        if self.code_kind == MP_CODE_NATIVE_PY:
-            print("   ", end="")
-            for i in range(self.prelude_offset, self.ip2):
-                print(" 0x%02x," % self.bytecode[i], end="")
-            print()
-
-            print("   ", self.simple_name.qstr_id, "& 0xff,", self.simple_name.qstr_id, ">> 8,")
-            print("   ", self.source_file.qstr_id, "& 0xff,", self.source_file.qstr_id, ">> 8,")
-
-            print("   ", end="")
-            for i in range(self.ip2 + 4, self.ip):
-                print(" 0x%02x," % self.bytecode[i], end="")
-            print()
-
         print("};")
 
-        self.freeze_constants()
-        self.freeze_module(self.qstr_links, self.type_sig)
+        self.freeze_children()
+        self.freeze_raw_code(self.qstr_links, self.type_sig)
 
 
-class BytecodeBuffer:
-    def __init__(self, size):
-        self.buf = bytearray(size)
-        self.idx = 0
+class MPYSegment:
+    META = 0
+    QSTR = 1
+    OBJ = 2
+    CODE = 3
 
-    def is_full(self):
-        return self.idx == len(self.buf)
+    def __init__(self, kind, name, start, end):
+        self.kind = kind
+        self.name = name
+        self.start = start
+        self.end = end
 
-    def append(self, b):
-        self.buf[self.idx] = b
-        self.idx += 1
 
+class MPYReader:
+    def __init__(self, filename, fileobj):
+        self.filename = filename
+        self.fileobj = fileobj
 
-def read_byte(f, out=None):
-    b = bytes_cons(f.read(1))[0]
-    if out is not None:
-        out.append(b)
-    return b
+    def tell(self):
+        return self.fileobj.tell()
 
+    def read_byte(self):
+        return bytes_cons(self.fileobj.read(1))[0]
 
-def read_uint(f, out=None):
-    i = 0
-    while True:
-        b = read_byte(f, out)
-        i = (i << 7) | (b & 0x7F)
-        if b & 0x80 == 0:
-            break
-    return i
+    def read_bytes(self, n):
+        return bytes_cons(self.fileobj.read(n))
 
+    def read_uint(self):
+        i = 0
+        while True:
+            b = self.read_byte()
+            i = (i << 7) | (b & 0x7F)
+            if b & 0x80 == 0:
+                break
+        return i
 
-def read_qstr(f, qstr_win):
-    ln = read_uint(f)
-    if ln == 0:
-        # static qstr
-        return bytes_cons(f.read(1))[0]
+
+def read_qstr(reader, segments):
+    start_pos = reader.tell()
+    ln = reader.read_uint()
     if ln & 1:
-        # qstr in table
-        return qstr_win.access(ln >> 1)
+        # static qstr
+        segments.append(
+            MPYSegment(MPYSegment.META, global_qstrs[ln >> 1].str, start_pos, start_pos)
+        )
+        return ln >> 1
     ln >>= 1
-    data = str_cons(f.read(ln), "utf8")
+    start_pos = reader.tell()
+    data = str_cons(reader.read_bytes(ln), "utf8")
+    reader.read_byte()  # read and discard null terminator
+    segments.append(MPYSegment(MPYSegment.QSTR, data, start_pos, reader.tell()))
     global_qstrs.append(QStrType(data))
-    qstr_win.push(len(global_qstrs) - 1)
     return len(global_qstrs) - 1
 
 
-def read_obj(f):
-    obj_type = f.read(1)
-    if obj_type == b"e":
+def read_obj(reader, segments):
+    obj_type = reader.read_bytes(1)
+    if obj_type == b"t":
+        return MPFunTable()
+    elif obj_type == b"e":
         return Ellipsis
     else:
-        buf = f.read(read_uint(f))
+        ln = reader.read_uint()
+        start_pos = reader.tell()
+        buf = reader.read_bytes(ln)
+        if obj_type in (b"s", b"b"):
+            reader.read_byte()  # read and discard null terminator
         if obj_type == b"s":
-            return str_cons(buf, "utf8")
+            obj = str_cons(buf, "utf8")
         elif obj_type == b"b":
-            return bytes_cons(buf)
+            obj = buf
         elif obj_type == b"i":
-            return int(str_cons(buf, "ascii"), 10)
+            obj = int(str_cons(buf, "ascii"), 10)
         elif obj_type == b"f":
-            return float(str_cons(buf, "ascii"))
+            obj = float(str_cons(buf, "ascii"))
         elif obj_type == b"c":
-            return complex(str_cons(buf, "ascii"))
+            obj = complex(str_cons(buf, "ascii"))
         else:
-            assert 0
+            raise MPYReadError(reader.filename, "corrupt .mpy file")
+        segments.append(MPYSegment(MPYSegment.OBJ, obj, start_pos, reader.tell()))
+        return obj
 
 
-def read_prelude(f, bytecode, qstr_win):
-    (
-        n_state,
-        n_exc_stack,
-        scope_flags,
-        n_pos_args,
-        n_kwonly_args,
-        n_def_pos_args,
-    ) = read_prelude_sig(lambda: read_byte(f, bytecode))
-    n_info, n_cell = read_prelude_size(lambda: read_byte(f, bytecode))
-    read_qstr_and_pack(f, bytecode, qstr_win)  # simple_name
-    read_qstr_and_pack(f, bytecode, qstr_win)  # source_file
-    for _ in range(n_info - 4 + n_cell):
-        read_byte(f, bytecode)
-    return n_state, n_exc_stack, scope_flags, n_pos_args, n_kwonly_args, n_def_pos_args
-
-
-def read_qstr_and_pack(f, bytecode, qstr_win):
-    qst = read_qstr(f, qstr_win)
-    bytecode.append(qst & 0xFF)
-    bytecode.append(qst >> 8)
-
-
-def read_bytecode(file, bytecode, qstr_win):
-    while not bytecode.is_full():
-        op = read_byte(file, bytecode)
-        f, sz = mp_opcode_format(bytecode.buf, bytecode.idx - 1, False)
-        sz -= 1
-        if f == MP_BC_FORMAT_QSTR:
-            read_qstr_and_pack(file, bytecode, qstr_win)
-            sz -= 2
-        elif f == MP_BC_FORMAT_VAR_UINT:
-            while read_byte(file, bytecode) & 0x80:
-                pass
-        for _ in range(sz):
-            read_byte(file, bytecode)
-
-
-def read_raw_code(f, qstr_win):
-    kind_len = read_uint(f)
+def read_raw_code(reader, cm_escaped_name, qstr_table, obj_table, segments):
+    # Read raw code header.
+    kind_len = reader.read_uint()
     kind = (kind_len & 3) + MP_CODE_BYTECODE
-    fun_data_len = kind_len >> 2
-    fun_data = BytecodeBuffer(fun_data_len)
+    has_children = (kind_len >> 2) & 1
+    fun_data_len = kind_len >> 3
+
+    # Read the body of the raw code.
+    file_offset = reader.tell()
+    fun_data = reader.read_bytes(fun_data_len)
+    segments_len = len(segments)
 
     if kind == MP_CODE_BYTECODE:
-        prelude = read_prelude(f, fun_data, qstr_win)
-        read_bytecode(f, fun_data, qstr_win)
+        # Create bytecode raw code.
+        rc = RawCodeBytecode(cm_escaped_name, qstr_table, obj_table, fun_data)
     else:
-        fun_data.buf[:] = f.read(fun_data_len)
-
+        # Create native raw code.
         qstr_links = []
         if kind in (MP_CODE_NATIVE_PY, MP_CODE_NATIVE_VIPER):
-            # load qstr link table
-            n_qstr_link = read_uint(f)
+            # Read qstr link table.
+            n_qstr_link = reader.read_uint()
             for _ in range(n_qstr_link):
-                off = read_uint(f)
-                qst = read_qstr(f, qstr_win)
+                off = reader.read_uint()
+                qst = read_qstr(reader, segments)
                 qstr_links.append((off >> 2, off & 3, qst))
 
-        type_sig = 0
+        native_scope_flags = 0
+        native_n_pos_args = 0
+        native_type_sig = 0
         if kind == MP_CODE_NATIVE_PY:
-            prelude_offset = read_uint(f)
-            _, name_idx, prelude = extract_prelude(fun_data.buf, prelude_offset)
-            fun_data.idx = name_idx  # rewind to where qstrs are in prelude
-            read_qstr_and_pack(f, fun_data, qstr_win)  # simple_name
-            read_qstr_and_pack(f, fun_data, qstr_win)  # source_file
+            prelude_offset = reader.read_uint()
         else:
-            prelude_offset = None
-            scope_flags = read_uint(f)
-            n_pos_args = 0
-            if kind == MP_CODE_NATIVE_ASM:
-                n_pos_args = read_uint(f)
-                type_sig = read_uint(f)
-            prelude = (None, None, scope_flags, n_pos_args, 0)
-
-    qstrs = []
-    objs = []
-    raw_codes = []
-    if kind != MP_CODE_NATIVE_ASM:
-        # load constant table
-        n_obj = read_uint(f)
-        n_raw_code = read_uint(f)
-        qstrs = [read_qstr(f, qstr_win) for _ in range(prelude[3] + prelude[4])]
-        if kind != MP_CODE_BYTECODE:
-            objs.append(MPFunTable)
-        objs.extend([read_obj(f) for _ in range(n_obj)])
-        raw_codes = [read_raw_code(f, qstr_win) for _ in range(n_raw_code)]
+            prelude_offset = 0
+            native_scope_flags = reader.read_uint()
+            if kind == MP_CODE_NATIVE_VIPER:
+                # Read any additional sections for native viper.
+                if native_scope_flags & MP_SCOPE_FLAG_VIPERRODATA:
+                    rodata_size = reader.read_uint()
+                if native_scope_flags & MP_SCOPE_FLAG_VIPERBSS:
+                    bss_size = reader.read_uint()
+                if native_scope_flags & MP_SCOPE_FLAG_VIPERRODATA:
+                    reader.read_bytes(rodata_size)
+                if native_scope_flags & MP_SCOPE_FLAG_VIPERRELOC:
+                    while True:
+                        op = reader.read_byte()
+                        if op == 0xFF:
+                            break
+                        if op & 1:
+                            addr = reader.read_uint()
+                        op >>= 1
+                        if op <= 5 and op & 1:
+                            n = reader.read_uint()
+            else:
+                assert kind == MP_CODE_NATIVE_ASM
+                native_n_pos_args = reader.read_uint()
+                native_type_sig = reader.read_uint()
 
-    if kind == MP_CODE_BYTECODE:
-        return RawCodeBytecode(fun_data.buf, qstrs, objs, raw_codes)
-    else:
-        return RawCodeNative(
+        rc = RawCodeNative(
+            cm_escaped_name,
+            qstr_table,
             kind,
-            fun_data.buf,
+            fun_data,
             prelude_offset,
-            prelude,
             qstr_links,
-            qstrs,
-            objs,
-            raw_codes,
-            type_sig,
+            native_scope_flags,
+            native_n_pos_args,
+            native_type_sig,
         )
 
+    # Add a segment for the raw code data.
+    segments.insert(
+        segments_len,
+        MPYSegment(MPYSegment.CODE, rc.simple_name.str, file_offset, file_offset + fun_data_len),
+    )
+
+    # Read children, if there are any.
+    rc.children = []
+    if has_children:
+        n_children = reader.read_uint()
+        for _ in range(n_children):
+            rc.children.append(
+                read_raw_code(reader, cm_escaped_name, qstr_table, obj_table, segments)
+            )
+
+    return rc
+
 
 def read_mpy(filename):
-    with open(filename, "rb") as f:
-        header = bytes_cons(f.read(4))
+    with open(filename, "rb") as fileobj:
+        reader = MPYReader(filename, fileobj)
+        segments = []
+
+        # Read and verify the header.
+        header = reader.read_bytes(4)
         if header[0] != ord("M"):
-            raise Exception("not a valid .mpy file")
+            raise MPYReadError(filename, "not a valid .mpy file")
         if header[1] != config.MPY_VERSION:
-            raise Exception("incompatible .mpy version")
+            raise MPYReadError(filename, "incompatible .mpy version")
         feature_byte = header[2]
-        qw_size = read_uint(f)
         config.MICROPY_PY_BUILTINS_STR_UNICODE = (feature_byte & 2) != 0
         mpy_native_arch = feature_byte >> 2
         if mpy_native_arch != MP_NATIVE_ARCH_NONE:
             if config.native_arch == MP_NATIVE_ARCH_NONE:
                 config.native_arch = mpy_native_arch
             elif config.native_arch != mpy_native_arch:
-                raise Exception("native architecture mismatch")
+                raise MPYReadError(filename, "native architecture mismatch")
         config.mp_small_int_bits = header[3]
-        qstr_win = QStrWindow(qw_size)
-        rc = read_raw_code(f, qstr_win)
-        rc.mpy_source_file = filename
-        rc.qstr_win_size = qw_size
-        return rc
+
+        # Read number of qstrs, and number of objects.
+        n_qstr = reader.read_uint()
+        n_obj = reader.read_uint()
+
+        # Read qstrs and construct qstr table.
+        qstr_table = []
+        for i in range(n_qstr):
+            q = read_qstr(reader, segments)
+            qstr_table.append(global_qstrs[q])
+
+        # Read objects and construct object table.
+        obj_table = []
+        for i in range(n_obj):
+            obj_table.append(read_obj(reader, segments))
+
+        # Compute the compiled-module escaped name.
+        cm_escaped_name = qstr_table[0].str.replace("/", "_")[:-3]
+
+        # Read the outer raw code, which will in turn read all its children.
+        raw_code_file_offset = reader.tell()
+        raw_code = read_raw_code(reader, cm_escaped_name, qstr_table, obj_table, segments)
+
+    # Create the outer-level compiled module representing the whole .mpy file.
+    return CompiledModule(
+        filename,
+        segments,
+        header,
+        qstr_table,
+        obj_table,
+        raw_code,
+        raw_code_file_offset,
+        cm_escaped_name,
+    )
 
 
-def dump_mpy(raw_codes):
-    for rc in raw_codes:
-        rc.dump()
+def hexdump_mpy(compiled_modules):
+    for cm in compiled_modules:
+        cm.hexdump()
 
 
-def freeze_mpy(base_qstrs, raw_codes):
+def disassemble_mpy(compiled_modules):
+    for cm in compiled_modules:
+        cm.disassemble()
+
+
+def freeze_mpy(base_qstrs, compiled_modules):
     # add to qstrs
     new = {}
     for q in global_qstrs:
@@ -864,6 +1322,17 @@ def freeze_mpy(base_qstrs, raw_codes):
     # As in qstr.c, set so that the first dynamically allocated pool is twice this size; must be <= the len
     qstr_pool_alloc = min(len(new), 10)
 
+    global bc_content, const_str_content, const_int_content, const_obj_content, const_table_qstr_content, const_table_ptr_content, raw_code_count, raw_code_content
+    qstr_content = 0
+    bc_content = 0
+    const_str_content = 0
+    const_int_content = 0
+    const_obj_content = 0
+    const_table_qstr_content = 0
+    const_table_ptr_content = 0
+    raw_code_count = 0
+    raw_code_content = 0
+
     print()
     print("const qstr_hash_t mp_qstr_frozen_const_hashes[] = {")
     qstr_size = {"metadata": 0, "data": 0}
@@ -892,32 +1361,49 @@ def freeze_mpy(base_qstrs, raw_codes):
     print("    {")
     for _, _, qstr, qbytes in new:
         print('        "%s",' % qstrutil.escape_bytes(qstr, qbytes))
+        qstr_content += (
+            config.MICROPY_QSTR_BYTES_IN_LEN + config.MICROPY_QSTR_BYTES_IN_HASH + len(qbytes) + 1
+        )
     print("    },")
     print("};")
 
-    for rc in raw_codes:
-        rc.freeze(rc.source_file.str.replace("/", "_")[:-3] + "_")
+    # Freeze all modules.
+    for idx, cm in enumerate(compiled_modules):
+        cm.freeze(idx)
+
+    # Print separator, separating individual modules from global data structures.
+    print()
+    print("/" * 80)
+    print("// collection of all frozen modules")
 
+    # Define the string of frozen module names.
     print()
     print("const char mp_frozen_names[] = {")
-    print("#ifdef MP_FROZEN_STR_NAMES")
+    print("    #ifdef MP_FROZEN_STR_NAMES")
     # makemanifest.py might also include some frozen string content.
-    print("MP_FROZEN_STR_NAMES")
-    print("#endif")
-    for rc in raw_codes:
-        module_name = rc.source_file.str
-        print('"%s\\0"' % module_name)
-    print('"\\0"};')
-
-    print("const mp_raw_code_t *const mp_frozen_mpy_content[] = {")
-    for rc in raw_codes:
-        print("    &raw_code_%s," % rc.escaped_name)
+    print("    MP_FROZEN_STR_NAMES")
+    print("    #endif")
+    mp_frozen_mpy_names_content = 1
+    for cm in compiled_modules:
+        module_name = cm.source_file.str
+        print('    "%s\\0"' % module_name)
+        mp_frozen_mpy_names_content += len(cm.source_file.str) + 1
+    print('    "\\0"')
+    print("};")
+
+    # Define the array of pointers to frozen module content.
+    print()
+    print("const mp_frozen_module_t *const mp_frozen_mpy_content[] = {")
+    for cm in compiled_modules:
+        print("    &frozen_module_%s," % cm.escaped_name)
     print("};")
+    mp_frozen_mpy_content_size = len(compiled_modules * 4)
 
     # If a port defines MICROPY_FROZEN_LIST_ITEM then list all modules wrapped in that macro.
+    print()
     print("#ifdef MICROPY_FROZEN_LIST_ITEM")
-    for rc in raw_codes:
-        module_name = rc.source_file.str
+    for cm in compiled_modules:
+        module_name = cm.source_file.str
         if module_name.endswith("/__init__.py"):
             short_name = module_name[: -len("/__init__.py")]
         else:
@@ -925,45 +1411,94 @@ def freeze_mpy(base_qstrs, raw_codes):
         print('MICROPY_FROZEN_LIST_ITEM("%s", "%s")' % (short_name, module_name))
     print("#endif")
 
+    print()
+    print("/*")
+    print("byte sizes:")
+    print("qstr content: %d unique, %d bytes" % (len(new), qstr_content))
+    print("bc content: %d" % bc_content)
+    print("const str content: %d" % const_str_content)
+    print("const int content: %d" % const_int_content)
+    print("const obj content: %d" % const_obj_content)
+    print(
+        "const table qstr content: %d entries, %d bytes"
+        % (const_table_qstr_content, const_table_qstr_content * 4)
+    )
+    print(
+        "const table ptr content: %d entries, %d bytes"
+        % (const_table_ptr_content, const_table_ptr_content * 4)
+    )
+    print("raw code content: %d * 4 = %d" % (raw_code_count, raw_code_content))
+    print("mp_frozen_mpy_names_content: %d" % mp_frozen_mpy_names_content)
+    print("mp_frozen_mpy_content_size: %d" % mp_frozen_mpy_content_size)
+    print(
+        "total: %d"
+        % (
+            qstr_content
+            + bc_content
+            + const_str_content
+            + const_int_content
+            + const_obj_content
+            + const_table_qstr_content * 4
+            + const_table_ptr_content * 4
+            + raw_code_content
+            + mp_frozen_mpy_names_content
+            + mp_frozen_mpy_content_size
+        )
+    )
+    print("*/")
+
 
 def merge_mpy(raw_codes, output_file):
-    assert len(raw_codes) <= 31  # so var-uints all fit in 1 byte
+    assert len(raw_codes) <= 2  # so var-uints all fit in 1 byte
     merged_mpy = bytearray()
 
     if len(raw_codes) == 1:
         with open(raw_codes[0].mpy_source_file, "rb") as f:
             merged_mpy.extend(f.read())
     else:
-        header = bytearray(5)
+        main_rc = None
+        for rc in raw_codes:
+            if len(rc.qstr_table) > 1 or len(rc.obj_table) > 0:
+                # Must use qstr_table and obj_table from this raw_code
+                if main_rc is not None:
+                    raise Exception(
+                        "can't merge files when more than one has a populated qstr or obj table"
+                    )
+                main_rc = rc
+        if main_rc is None:
+            main_rc = raw_codes[0]
+
+        header = bytearray(4)
         header[0] = ord("M")
         header[1] = config.MPY_VERSION
         header[2] = config.native_arch << 2 | config.MICROPY_PY_BUILTINS_STR_UNICODE << 1
         header[3] = config.mp_small_int_bits
-        header[4] = 32  # qstr_win_size
         merged_mpy.extend(header)
 
+        # Copy n_qstr, n_obj, qstr_table, obj_table from main_rc.
+        with open(main_rc.mpy_source_file, "rb") as f:
+            data = f.read(main_rc.raw_code_file_offset)
+            merged_mpy.extend(data[4:])
+
         bytecode = bytearray()
-        bytecode_len = 6 + len(raw_codes) * 5 + 2
-        bytecode.append(bytecode_len << 2)  # kind and length
+        bytecode_len = 3 + len(raw_codes) * 5 + 2
+        bytecode.append(bytecode_len << 3 | 1 << 2)  # kind, has_children and length
         bytecode.append(0b00000000)  # signature prelude
-        bytecode.append(0b00001000)  # size prelude
-        bytecode.extend(b"\x00\x01")  # MP_QSTR_
-        bytecode.extend(b"\x00\x01")  # MP_QSTR_
+        bytecode.append(0b00000010)  # size prelude; n_info=1
+        bytecode.extend(b"\x00")  # simple_name: qstr index 0 (will use source filename)
         for idx in range(len(raw_codes)):
             bytecode.append(0x32)  # MP_BC_MAKE_FUNCTION
             bytecode.append(idx)  # index raw code
             bytecode.extend(b"\x34\x00\x59")  # MP_BC_CALL_FUNCTION, 0 args, MP_BC_POP_TOP
         bytecode.extend(b"\x51\x63")  # MP_BC_LOAD_NONE, MP_BC_RETURN_VALUE
 
-        bytecode.append(0)  # n_obj
-        bytecode.append(len(raw_codes))  # n_raw_code
-
         merged_mpy.extend(bytecode)
 
+        merged_mpy.append(len(raw_codes))  # n_children
+
         for rc in raw_codes:
             with open(rc.mpy_source_file, "rb") as f:
-                f.read(4)  # skip header
-                read_uint(f)  # skip qstr_win_size
+                f.seek(rc.raw_code_file_offset)
                 data = f.read()  # read rest of mpy file
                 merged_mpy.extend(data)
 
@@ -978,7 +1513,12 @@ def main():
     import argparse
 
     cmd_parser = argparse.ArgumentParser(description="A tool to work with MicroPython .mpy files.")
-    cmd_parser.add_argument("-d", "--dump", action="store_true", help="dump contents of files")
+    cmd_parser.add_argument(
+        "-x", "--hexdump", action="store_true", help="output an annotated hex dump of files"
+    )
+    cmd_parser.add_argument(
+        "-d", "--disassemble", action="store_true", help="output disassembled contents of files"
+    )
     cmd_parser.add_argument("-f", "--freeze", action="store_true", help="freeze files")
     cmd_parser.add_argument(
         "--merge", action="store_true", help="merge multiple .mpy files into one"
@@ -1018,20 +1558,32 @@ def main():
     else:
         config.MICROPY_QSTR_BYTES_IN_LEN = 1
         config.MICROPY_QSTR_BYTES_IN_HASH = 1
-        base_qstrs = {}
+        base_qstrs = list(qstrutil.static_qstr_list)
+
+    # Load all .mpy files.
+    try:
+        compiled_modules = [read_mpy(file) for file in args.files]
+    except MPYReadError as er:
+        print(er, file=sys.stderr)
+        sys.exit(1)
 
-    raw_codes = [read_mpy(file) for file in args.files]
+    if args.hexdump:
+        hexdump_mpy(compiled_modules)
 
-    if args.dump:
-        dump_mpy(raw_codes)
-    elif args.freeze:
+    if args.disassemble:
+        if args.hexdump:
+            print()
+        disassemble_mpy(compiled_modules)
+
+    if args.freeze:
         try:
-            freeze_mpy(base_qstrs, raw_codes)
+            freeze_mpy(base_qstrs, compiled_modules)
         except FreezeError as er:
             print(er, file=sys.stderr)
             sys.exit(1)
-    elif args.merge:
-        merged_mpy = merge_mpy(raw_codes, args.output)
+
+    if args.merge:
+        merge_mpy(compiled_modules, args.output)
 
 
 if __name__ == "__main__":
diff --git a/tools/mpy_ld.py b/tools/mpy_ld.py
index 6bc1dbac05f4b..0dac69e20834f 100755
--- a/tools/mpy_ld.py
+++ b/tools/mpy_ld.py
@@ -35,7 +35,7 @@
 import makeqstrdata as qstrutil
 
 # MicroPython constants
-MPY_VERSION = 5
+MPY_VERSION = 6
 MP_NATIVE_ARCH_X86 = 1
 MP_NATIVE_ARCH_X64 = 2
 MP_NATIVE_ARCH_ARMV7M = 5
@@ -860,11 +860,12 @@ def write_uint(self, val):
 
     def write_qstr(self, s):
         if s in qstrutil.static_qstr_list:
-            self.write_bytes(bytes([0, qstrutil.static_qstr_list.index(s) + 1]))
+            self.write_uint((qstrutil.static_qstr_list.index(s) + 1) << 1 | 1)
         else:
             s = bytes(s, "ascii")
             self.write_uint(len(s) << 1)
             self.write_bytes(s)
+            self.write_bytes(b"\x00")
 
     def write_reloc(self, base, offset, dest, n):
         need_offset = not (base == self.prev_base and offset == self.prev_offset + 1)
@@ -905,14 +906,19 @@ def build_mpy(env, entry_offset, fmpy, native_qstr_vals, native_qstr_objs):
     out.open(fmpy)
 
     # MPY: header
-    out.write_bytes(
-        bytearray(
-            [ord("M"), MPY_VERSION, env.arch.mpy_feature, MP_SMALL_INT_BITS, QSTR_WINDOW_SIZE]
-        )
-    )
+    out.write_bytes(bytearray([ord("M"), MPY_VERSION, env.arch.mpy_feature, MP_SMALL_INT_BITS]))
+
+    # MPY: n_qstr
+    out.write_uint(1)
+
+    # MPY: n_obj
+    out.write_uint(0)
+
+    # MPY: qstr table
+    out.write_qstr(fmpy)  # filename
 
     # MPY: kind/len
-    out.write_uint(len(env.full_text) << 2 | (MP_CODE_NATIVE_VIPER - MP_CODE_BYTECODE))
+    out.write_uint(len(env.full_text) << 3 | (MP_CODE_NATIVE_VIPER - MP_CODE_BYTECODE))
 
     # MPY: machine code
     out.write_bytes(env.full_text)
@@ -936,20 +942,15 @@ def build_mpy(env, entry_offset, fmpy, native_qstr_vals, native_qstr_objs):
         scope_flags |= MP_SCOPE_FLAG_VIPERBSS
     out.write_uint(scope_flags)
 
-    # MPY: n_obj
-    out.write_uint(0)
-
-    # MPY: n_raw_code
-    out.write_uint(0)
-
-    # MPY: rodata and/or bss
+    # MPY: bss and/or rodata
     if len(env.full_rodata):
         rodata_const_table_idx = 1
         out.write_uint(len(env.full_rodata))
-        out.write_bytes(env.full_rodata)
     if len(env.full_bss):
-        bss_const_table_idx = bool(env.full_rodata) + 1
+        bss_const_table_idx = 2
         out.write_uint(len(env.full_bss))
+    if len(env.full_rodata):
+        out.write_bytes(env.full_rodata)
 
     # MPY: relocation information
     prev_kind = None

From c0f2af4e862a9bb80e401894bad30378dbeac85e Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 18 Nov 2021 11:56:17 +1100
Subject: [PATCH 1732/3533] ports: Recompile bytecode tests now that .mpy
 format changed.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/minimal/frozentest.mpy | Bin 196 -> 198 bytes
 ports/powerpc/frozentest.mpy | Bin 196 -> 198 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/ports/minimal/frozentest.mpy b/ports/minimal/frozentest.mpy
index 8a89194a1048700453ca5b682c972e131a878610..cd75d65a8bad195029d131cc42f18437ffeb7523 100644
GIT binary patch
delta 134
zcmX@Yc#KirmyJoDm02pSD8DK-uOzj&M6aNdfxoewtu&yLfhluhmMSB|#D0xPh9vH!
zN}#-gp^>o(BSVXW03V||5NN3jG6^u7Fh&Y8DKkJQMhL|Orj&NQpCt-pH8}A!gp08V
VG6}K(d5urQTdq65tB(v!1^}XBAlv`|

delta 131
zcmX@cc!V*_mz7Cgp(#W_jDcM$tth`LHLoPKxJ0j@Qd2`iLtBGEkfB<Dtu&z0gfSAx
zRAzwEj8K{hLM!chKT8zIY;fXl2p40@1S%B-DQSEf-g4dfb$w)DGV?@v)rqbeyh+?i
Nl|U;L42_IU7y*1#B1-@O

diff --git a/ports/powerpc/frozentest.mpy b/ports/powerpc/frozentest.mpy
index 8a89194a1048700453ca5b682c972e131a878610..cd75d65a8bad195029d131cc42f18437ffeb7523 100644
GIT binary patch
delta 134
zcmX@Yc#KirmyJoDm02pSD8DK-uOzj&M6aNdfxoewtu&yLfhluhmMSB|#D0xPh9vH!
zN}#-gp^>o(BSVXW03V||5NN3jG6^u7Fh&Y8DKkJQMhL|Orj&NQpCt-pH8}A!gp08V
VG6}K(d5urQTdq65tB(v!1^}XBAlv`|

delta 131
zcmX@cc!V*_mz7Cgp(#W_jDcM$tth`LHLoPKxJ0j@Qd2`iLtBGEkfB<Dtu&z0gfSAx
zRAzwEj8K{hLM!chKT8zIY;fXl2p40@1S%B-DQSEf-g4dfb$w)DGV?@v)rqbeyh+?i
Nl|U;L42_IU7y*1#B1-@O


From 73a1927fce29f461945708675b82bd3d29f9f568 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 17 Feb 2022 12:01:49 +1100
Subject: [PATCH 1733/3533] github/workflows: Add new workflow to test .mpy
 file format and tools.

Signed-off-by: Damien George <damien@micropython.org>
---
 .github/workflows/mpy_format.yml | 18 ++++++++++++++++++
 tools/ci.sh                      | 17 +++++++++++++++++
 2 files changed, 35 insertions(+)
 create mode 100644 .github/workflows/mpy_format.yml

diff --git a/.github/workflows/mpy_format.yml b/.github/workflows/mpy_format.yml
new file mode 100644
index 0000000000000..ab90bb339aa1b
--- /dev/null
+++ b/.github/workflows/mpy_format.yml
@@ -0,0 +1,18 @@
+name: .mpy file format and tools
+
+on:
+  push:
+  pull_request:
+    paths:
+      - '.github/workflows/*.yml'
+      - 'tools/**'
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Install packages
+      run: source tools/ci.sh && ci_mpy_format_setup
+    - name: Test mpy-tool.py
+      run: source tools/ci.sh && ci_mpy_format_test
diff --git a/tools/ci.sh b/tools/ci.sh
index 3e78ae4a05a86..075e5e423a9ca 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -67,6 +67,23 @@ function ci_code_size_build {
     tools/metrics.py build bm | tee ~/size1
 }
 
+########################################################################################
+# .mpy file format
+
+function ci_mpy_format_setup {
+    sudo pip3 install pyelftools
+}
+
+function ci_mpy_format_test {
+    # Test mpy-tool.py dump feature on bytecode
+    python2 ./tools/mpy-tool.py -xd ports/minimal/frozentest.mpy
+    python3 ./tools/mpy-tool.py -xd ports/minimal/frozentest.mpy
+
+    # Test mpy-tool.py dump feature on native code
+    make -C examples/natmod/features1
+    ./tools/mpy-tool.py -xd examples/natmod/features1/features1.mpy
+}
+
 ########################################################################################
 # ports/cc3200
 

From 66fc0f45c17c8f3af68d688a432bb51318bc434e Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 17 Feb 2022 12:02:35 +1100
Subject: [PATCH 1734/3533] tools/ci.sh: Run urandom test scripts as part of
 native module tests.

Signed-off-by: Damien George <damien@micropython.org>
---
 tools/ci.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/ci.sh b/tools/ci.sh
index 075e5e423a9ca..4ae21859db264 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -454,7 +454,7 @@ function ci_unix_coverage_run_tests {
 
 function ci_unix_coverage_run_native_mpy_tests {
     MICROPYPATH=examples/natmod/features2 ./ports/unix/micropython-coverage -m features2
-    (cd tests && ./run-natmodtests.py "$@" extmod/{btree*,framebuf*,uheapq*,ure*,uzlib*}.py)
+    (cd tests && ./run-natmodtests.py "$@" extmod/{btree*,framebuf*,uheapq*,urandom*,ure*,uzlib*}.py)
 }
 
 function ci_unix_32bit_setup {

From 0a2895b0998bc7ab66b8339acf64fda0339d1e53 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 18 Feb 2022 16:30:24 +1100
Subject: [PATCH 1735/3533] tests/perf_bench: Skip bm_chaos test if
 random.randrange is unavailable.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/perf_bench/bm_chaos.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tests/perf_bench/bm_chaos.py b/tests/perf_bench/bm_chaos.py
index d0f1337db7112..e0e9269ebd367 100644
--- a/tests/perf_bench/bm_chaos.py
+++ b/tests/perf_bench/bm_chaos.py
@@ -218,6 +218,10 @@ def create_image_chaos(self, w, h, iterations, rng_seed):
 ###########################################################################
 # Benchmark interface
 
+if not hasattr(random, "randrange"):
+    print("SKIP")
+    raise SystemExit
+
 bm_params = {
     (100, 50): (0.25, 100, 50, 50, 50, 1234),
     (1000, 1000): (0.25, 200, 400, 400, 1000, 1234),

From 414b59d39c9f37c0da5ee00d270aa630c392c2fd Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 21 Feb 2022 10:36:04 +1100
Subject: [PATCH 1736/3533] qemu-arm: Add tests for freezing viper and
 asm_thumb code.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/qemu-arm/test-frzmpy/frozen_asm.py   | 29 ++++++++++++++++++++++
 ports/qemu-arm/test-frzmpy/frozen_viper.py |  8 ++++++
 tests/qemu-arm/asm_test.py                 |  7 ++++++
 tests/qemu-arm/asm_test.py.exp             |  5 ++++
 tests/qemu-arm/viper_test.py               |  3 +++
 tests/qemu-arm/viper_test.py.exp           |  1 +
 6 files changed, 53 insertions(+)
 create mode 100644 ports/qemu-arm/test-frzmpy/frozen_asm.py
 create mode 100644 ports/qemu-arm/test-frzmpy/frozen_viper.py
 create mode 100644 tests/qemu-arm/asm_test.py
 create mode 100644 tests/qemu-arm/asm_test.py.exp
 create mode 100644 tests/qemu-arm/viper_test.py
 create mode 100644 tests/qemu-arm/viper_test.py.exp

diff --git a/ports/qemu-arm/test-frzmpy/frozen_asm.py b/ports/qemu-arm/test-frzmpy/frozen_asm.py
new file mode 100644
index 0000000000000..2c7f5c92cd376
--- /dev/null
+++ b/ports/qemu-arm/test-frzmpy/frozen_asm.py
@@ -0,0 +1,29 @@
+# Test freezing inline-asm code.
+
+import micropython
+
+
+@micropython.asm_thumb
+def asm_add(r0, r1):
+    add(r0, r0, r1)
+
+
+@micropython.asm_thumb
+def asm_add1(r0) -> object:
+    lsl(r0, r0, 1)
+    add(r0, r0, 3)
+
+
+@micropython.asm_thumb
+def asm_cast_bool(r0) -> bool:
+    pass
+
+
+@micropython.asm_thumb
+def asm_shift_int(r0) -> int:
+    lsl(r0, r0, 29)
+
+
+@micropython.asm_thumb
+def asm_shift_uint(r0) -> uint:
+    lsl(r0, r0, 29)
diff --git a/ports/qemu-arm/test-frzmpy/frozen_viper.py b/ports/qemu-arm/test-frzmpy/frozen_viper.py
new file mode 100644
index 0000000000000..71dfe7c3b6ce4
--- /dev/null
+++ b/ports/qemu-arm/test-frzmpy/frozen_viper.py
@@ -0,0 +1,8 @@
+# Test freezing viper code.
+
+import micropython
+
+
+@micropython.viper
+def viper_add(x, y):
+    print(x + y)
diff --git a/tests/qemu-arm/asm_test.py b/tests/qemu-arm/asm_test.py
new file mode 100644
index 0000000000000..26c7efe4273d5
--- /dev/null
+++ b/tests/qemu-arm/asm_test.py
@@ -0,0 +1,7 @@
+import frozen_asm
+
+print(frozen_asm.asm_add(1, 2))
+print(frozen_asm.asm_add1(3))
+print(frozen_asm.asm_cast_bool(0), frozen_asm.asm_cast_bool(3))
+print(frozen_asm.asm_shift_int(4))
+print(frozen_asm.asm_shift_uint(4))
diff --git a/tests/qemu-arm/asm_test.py.exp b/tests/qemu-arm/asm_test.py.exp
new file mode 100644
index 0000000000000..b4be8b40e23ab
--- /dev/null
+++ b/tests/qemu-arm/asm_test.py.exp
@@ -0,0 +1,5 @@
+3
+4
+False True
+-2147483648
+2147483648
diff --git a/tests/qemu-arm/viper_test.py b/tests/qemu-arm/viper_test.py
new file mode 100644
index 0000000000000..8e38a2b92892b
--- /dev/null
+++ b/tests/qemu-arm/viper_test.py
@@ -0,0 +1,3 @@
+import frozen_viper
+
+frozen_viper.viper_add(1, 2)
diff --git a/tests/qemu-arm/viper_test.py.exp b/tests/qemu-arm/viper_test.py.exp
new file mode 100644
index 0000000000000..00750edc07d64
--- /dev/null
+++ b/tests/qemu-arm/viper_test.py.exp
@@ -0,0 +1 @@
+3

From ad1f523e7ebae5f260e9c586b28e0d75d715cf65 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 24 Feb 2022 14:05:51 +1100
Subject: [PATCH 1737/3533] tools/mpremote: Add "resume" and "soft-reset"
 commands.

This makes the auto soft-reset behaviour of mpremote more logical, and now
configurable via these new commands.

Signed-off-by: Damien George <damien@micropython.org>
---
 docs/reference/mpremote.rst     | 36 +++++++++++++++++++++++++++++++++
 tools/mpremote/mpremote/main.py | 15 +++++++++++++-
 2 files changed, 50 insertions(+), 1 deletion(-)

diff --git a/docs/reference/mpremote.rst b/docs/reference/mpremote.rst
index 7a7d787a5a25a..8e3cf9aa5a27a 100644
--- a/docs/reference/mpremote.rst
+++ b/docs/reference/mpremote.rst
@@ -60,6 +60,25 @@ The full list of supported commands are:
 
       $ mpremote disconnect
 
+  After a disconnect, auto soft-reset is enabled.
+
+- resume a previous ``mpremote`` session:
+
+  .. code-block:: bash
+
+      $ mpremote resume
+
+  This disables auto soft-reset.
+
+- perform a soft-reset of the device:
+
+  .. code-block:: bash
+
+      $ mpremote soft-reset
+
+  This will clear out the Python heap and restart the interpreter.  It also
+  disables auto soft-reset.
+
 - enter the REPL on the connected device:
 
    .. code-block:: bash
@@ -117,11 +136,28 @@ The full list of supported commands are:
       $ mpremote mount <local-dir>
 
 Multiple commands can be specified and they will be run sequentially.
+
+
+Auto connection and soft-reset
+------------------------------
+
 Connection and disconnection will be done automatically at the start and end of
 the execution of the tool, if such commands are not explicitly given.  Automatic
 connection will search for the first available serial device. If no action is
 specified then the REPL will be entered.
 
+Once connected to a device, ``mpremote`` will automatically soft-reset the
+device if needed.  This clears the Python heap and restarts the interpreter,
+making sure that subsequent Python code executes in a fresh environment.  Auto
+soft-reset is performed the first time one of the following commands are
+executed: ``mount``, ``eval``, ``exec``, ``run``, ``fs``.  After doing a
+soft-reset for the first time, it will not be done again automatically, until a
+``disconnect`` command is issued.
+
+Auto soft-reset behaviour can be controlled by the ``resume`` command.  And the
+``soft-reset`` command can be used to perform an explicit soft reset.
+
+
 Shortcuts
 ---------
 
diff --git a/tools/mpremote/mpremote/main.py b/tools/mpremote/mpremote/main.py
index 1073bec7fa454..a53ea66f39714 100644
--- a/tools/mpremote/mpremote/main.py
+++ b/tools/mpremote/mpremote/main.py
@@ -39,6 +39,8 @@
         or any valid device name/path""",
     ),
     "disconnect": (False, False, 0, "disconnect current device"),
+    "resume": (False, False, 0, "resume a previous mpremote session (will not auto soft-reset)"),
+    "soft-reset": (False, True, 0, "perform a soft-reset of the device"),
     "mount": (True, False, 1, "mount local directory on device"),
     "repl": (
         False,
@@ -434,6 +436,7 @@ def main():
 
     args = sys.argv[1:]
     pyb = None
+    auto_soft_reset = True
     did_action = False
 
     try:
@@ -460,13 +463,19 @@ def main():
             elif cmd == "help":
                 print_help()
                 sys.exit(0)
+            elif cmd == "resume":
+                auto_soft_reset = False
+                continue
+
+            # The following commands need a connection, and either a raw or friendly REPL.
 
             if pyb is None:
                 pyb = do_connect(["auto"])
 
             if need_raw_repl:
                 if not pyb.in_raw_repl:
-                    pyb.enter_raw_repl()
+                    pyb.enter_raw_repl(soft_reset=auto_soft_reset)
+                    auto_soft_reset = False
             else:
                 if pyb.in_raw_repl:
                     pyb.exit_raw_repl()
@@ -476,6 +485,10 @@ def main():
             if cmd == "disconnect":
                 do_disconnect(pyb)
                 pyb = None
+                auto_soft_reset = True
+            elif cmd == "soft-reset":
+                pyb.enter_raw_repl(soft_reset=True)
+                auto_soft_reset = False
             elif cmd == "mount":
                 path = args.pop(0)
                 pyb.mount_local(path)

From d6564a315967f80aafaa4c117892d0b21b0cb2bc Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 25 Feb 2022 13:10:45 +1100
Subject: [PATCH 1738/3533] tools/mpremote: Add "umount" command.

Signed-off-by: Damien George <damien@micropython.org>
---
 docs/reference/mpremote.rst                | 6 ++++++
 tools/mpremote/mpremote/main.py            | 3 +++
 tools/mpremote/mpremote/pyboardextended.py | 1 +
 3 files changed, 10 insertions(+)

diff --git a/docs/reference/mpremote.rst b/docs/reference/mpremote.rst
index 8e3cf9aa5a27a..345927ef7f9fd 100644
--- a/docs/reference/mpremote.rst
+++ b/docs/reference/mpremote.rst
@@ -135,6 +135,12 @@ The full list of supported commands are:
 
       $ mpremote mount <local-dir>
 
+- unmount the local directory from the remote device:
+
+  .. code-block:: bash
+
+      $ mpremote umount
+
 Multiple commands can be specified and they will be run sequentially.
 
 
diff --git a/tools/mpremote/mpremote/main.py b/tools/mpremote/mpremote/main.py
index a53ea66f39714..524b2ec80a8c6 100644
--- a/tools/mpremote/mpremote/main.py
+++ b/tools/mpremote/mpremote/main.py
@@ -42,6 +42,7 @@
     "resume": (False, False, 0, "resume a previous mpremote session (will not auto soft-reset)"),
     "soft-reset": (False, True, 0, "perform a soft-reset of the device"),
     "mount": (True, False, 1, "mount local directory on device"),
+    "umount": (True, False, 0, "unmount the local directory"),
     "repl": (
         False,
         True,
@@ -493,6 +494,8 @@ def main():
                 path = args.pop(0)
                 pyb.mount_local(path)
                 print(f"Local directory {path} is mounted at /remote")
+            elif cmd == "umount":
+                pyb.umount_local()
             elif cmd in ("exec", "eval", "run"):
                 follow = True
                 if args[0] == "--no-follow":
diff --git a/tools/mpremote/mpremote/pyboardextended.py b/tools/mpremote/mpremote/pyboardextended.py
index 6817e7bbf49a0..69cbf02eddac6 100644
--- a/tools/mpremote/mpremote/pyboardextended.py
+++ b/tools/mpremote/mpremote/pyboardextended.py
@@ -687,3 +687,4 @@ def umount_local(self):
         if self.mounted:
             self.exec_('uos.umount("/remote")')
             self.mounted = False
+            self.serial = self.serial.orig_serial

From c2e8a5acd267e55a11a709d44f0385d0a40f3ec9 Mon Sep 17 00:00:00 2001
From: stijn <stijn@ignitron.net>
Date: Tue, 22 Feb 2022 15:42:50 +0100
Subject: [PATCH 1739/3533] windows: Unify project file headers.

The xmlns attribute is required for older msbuild version (e.g. for
VS2015).  Add it where needed, and reorder the attributes so all
files look the same.
---
 mpy-cross/mpy-cross.vcxproj                           | 2 +-
 ports/windows/micropython.vcxproj                     | 2 +-
 ports/windows/msvc/genhdr.targets                     | 2 +-
 ports/windows/msvc/sources.props                      | 2 +-
 ports/windows/variants/dev/mpconfigvariant.props      | 3 ++-
 ports/windows/variants/standard/mpconfigvariant.props | 3 ++-
 6 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/mpy-cross/mpy-cross.vcxproj b/mpy-cross/mpy-cross.vcxproj
index e70b29ae14d7b..53cb0fa1fec71 100644
--- a/mpy-cross/mpy-cross.vcxproj
+++ b/mpy-cross/mpy-cross.vcxproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="14.0" DefaultTargets="Build">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
diff --git a/ports/windows/micropython.vcxproj b/ports/windows/micropython.vcxproj
index 6817d6ed13b3d..d5e3f57d8bc23 100644
--- a/ports/windows/micropython.vcxproj
+++ b/ports/windows/micropython.vcxproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="14.0" DefaultTargets="Build">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
diff --git a/ports/windows/msvc/genhdr.targets b/ports/windows/msvc/genhdr.targets
index ed97a455d38b3..b53894f21dbbf 100644
--- a/ports/windows/msvc/genhdr.targets
+++ b/ports/windows/msvc/genhdr.targets
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="GenerateHeaders">
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="14.0" DefaultTargets="GenerateHeaders">
 
   <Import Project="paths.props" Condition="'$(PyPathsIncluded)' != 'True'"/>
 
diff --git a/ports/windows/msvc/sources.props b/ports/windows/msvc/sources.props
index e5109eecc8c0c..a6dfd48aa6f74 100644
--- a/ports/windows/msvc/sources.props
+++ b/ports/windows/msvc/sources.props
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="14.0">
   <Import Project="paths.props" Condition="'$(PyPathsIncluded)' != 'True'"/>
   <ItemGroup>
     <PyCoreSource Include="$(PyBaseDir)py\*.c" />
diff --git a/ports/windows/variants/dev/mpconfigvariant.props b/ports/windows/variants/dev/mpconfigvariant.props
index d01d74b4413ff..5f78d6e62a154 100644
--- a/ports/windows/variants/dev/mpconfigvariant.props
+++ b/ports/windows/variants/dev/mpconfigvariant.props
@@ -1,4 +1,5 @@
-<Project>
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="14.0">
   <PropertyGroup>
     <PyProg>micropython-dev</PyProg>
   </PropertyGroup>
diff --git a/ports/windows/variants/standard/mpconfigvariant.props b/ports/windows/variants/standard/mpconfigvariant.props
index 0157102fdf0f0..3cbb1821f497e 100644
--- a/ports/windows/variants/standard/mpconfigvariant.props
+++ b/ports/windows/variants/standard/mpconfigvariant.props
@@ -1,4 +1,5 @@
-<Project>
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="14.0">
   <PropertyGroup>
     <PyProg>micropython</PyProg>
   </PropertyGroup>

From 546e213265872cc6393af83a94bb2af5092d4348 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 25 Feb 2022 16:52:58 +1100
Subject: [PATCH 1740/3533] esp32/boards: Add specific deploy instructions for
 S3 variant.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/boards/GENERIC_S3/board.json        |  2 +-
 ports/esp32/boards/GENERIC_S3_SPIRAM/board.json |  2 +-
 ports/esp32/boards/deploy_s3.md                 | 14 ++++++++++++++
 3 files changed, 16 insertions(+), 2 deletions(-)
 create mode 100644 ports/esp32/boards/deploy_s3.md

diff --git a/ports/esp32/boards/GENERIC_S3/board.json b/ports/esp32/boards/GENERIC_S3/board.json
index 058fb7dff0db0..0db9b3250330c 100644
--- a/ports/esp32/boards/GENERIC_S3/board.json
+++ b/ports/esp32/boards/GENERIC_S3/board.json
@@ -1,6 +1,6 @@
 {
     "deploy": [
-        "../deploy.md"
+        "../deploy_s3.md"
     ],
     "docs": "",
     "features": [
diff --git a/ports/esp32/boards/GENERIC_S3_SPIRAM/board.json b/ports/esp32/boards/GENERIC_S3_SPIRAM/board.json
index ee2cb8d3f438d..3b405d4a122ca 100644
--- a/ports/esp32/boards/GENERIC_S3_SPIRAM/board.json
+++ b/ports/esp32/boards/GENERIC_S3_SPIRAM/board.json
@@ -1,6 +1,6 @@
 {
     "deploy": [
-        "../deploy.md"
+        "../deploy_s3.md"
     ],
     "docs": "",
     "features": [
diff --git a/ports/esp32/boards/deploy_s3.md b/ports/esp32/boards/deploy_s3.md
new file mode 100644
index 0000000000000..7f564a95e310a
--- /dev/null
+++ b/ports/esp32/boards/deploy_s3.md
@@ -0,0 +1,14 @@
+Program your board using the esptool.py program, found [here](https://github.com/espressif/esptool).
+
+If you are putting MicroPython on your board for the first time then you should
+first erase the entire flash using:
+
+```bash
+esptool.py --chip esp32s3 --port /dev/ttyACM0 erase_flash
+```
+
+From then on program the firmware starting at address 0:
+
+```bash
+esptool.py --chip esp32s3 --port /dev/ttyACM0 write_flash -z 0 board-20210902-v1.17.bin
+```

From 0a217624e1d26899986d3e79eb604652da540b00 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 25 Feb 2022 18:24:03 +1100
Subject: [PATCH 1741/3533] tools/upip.py: Remove unused op_basename()
 function.

It seems this was never used, at least not since its inclusion in this
repository.

Signed-off-by: Damien George <damien@micropython.org>
---
 tools/upip.py | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/tools/upip.py b/tools/upip.py
index 9fb87264201eb..2932cca50cc9d 100644
--- a/tools/upip.py
+++ b/tools/upip.py
@@ -41,10 +41,6 @@ def op_split(path):
     return (head, r[1])
 
 
-def op_basename(path):
-    return op_split(path)[1]
-
-
 # Expects *file* name
 def _makedirs(name, mode=0o777):
     ret = False
@@ -205,7 +201,6 @@ def install_pkg(pkg_spec, install_path):
     assert len(packages) == 1
     package_url = packages[0]["url"]
     print("Installing %s %s from %s" % (pkg_spec, latest_ver, package_url))
-    package_fname = op_basename(package_url)
     f1 = url_open(package_url)
     try:
         f2 = uzlib.DecompIO(f1, gzdict_sz)

From 5c46721a1cc32bdb8f700955f9b441a08056f7b0 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sat, 26 Feb 2022 07:55:53 +0100
Subject: [PATCH 1742/3533] tools/mpy-tool.py: Fix frozen comment generation to
 escape chars.

That caused the compile of frozen_content.c to fail if characters like
backslash were in a short string.  Thanks to @hippy for identifying the
spot to change.
---
 tools/mpy-tool.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/mpy-tool.py b/tools/mpy-tool.py
index da6352dab716d..73753094ecfeb 100755
--- a/tools/mpy-tool.py
+++ b/tools/mpy-tool.py
@@ -861,7 +861,7 @@ def freeze(self):
             fmt, sz, arg = mp_opcode_decode(bc, ip)
             opcode_name = Opcodes.mapping[bc[ip]]
             if fmt == MP_BC_FORMAT_QSTR:
-                opcode_name += " " + self.qstr_table[arg].str
+                opcode_name += " " + repr(self.qstr_table[arg].str)
             elif fmt in (MP_BC_FORMAT_VAR_UINT, MP_BC_FORMAT_OFFSET):
                 opcode_name += " %u" % arg
             print(

From c4b8dae4387b3a01cf4139c75f0852c5a6ffc108 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 28 Feb 2022 18:51:45 +1100
Subject: [PATCH 1743/3533] tests/unix: Add coverage test for freezing various
 objects.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/unix/variants/coverage/frzmpy/frzmpy3.py | 6 ++++++
 tests/unix/extra_coverage.py                   | 3 +++
 tests/unix/extra_coverage.py.exp               | 5 +++++
 3 files changed, 14 insertions(+)
 create mode 100644 ports/unix/variants/coverage/frzmpy/frzmpy3.py

diff --git a/ports/unix/variants/coverage/frzmpy/frzmpy3.py b/ports/unix/variants/coverage/frzmpy/frzmpy3.py
new file mode 100644
index 0000000000000..617fac5523b64
--- /dev/null
+++ b/ports/unix/variants/coverage/frzmpy/frzmpy3.py
@@ -0,0 +1,6 @@
+# Test freezing objects that may not be handled well by the build process.
+
+print("\\")
+print("\nX")
+print(repr("\x1b"))
+print(b"\x00\xff")
diff --git a/tests/unix/extra_coverage.py b/tests/unix/extra_coverage.py
index 8ea27cbf2f801..bb22485026e89 100644
--- a/tests/unix/extra_coverage.py
+++ b/tests/unix/extra_coverage.py
@@ -89,6 +89,9 @@
 except ZeroDivisionError:
     print("ZeroDivisionError")
 
+# test importing various objects
+import frzmpy3
+
 # test for MP_QSTR_NULL regression
 from frzqstr import returns_NULL
 
diff --git a/tests/unix/extra_coverage.py.exp b/tests/unix/extra_coverage.py.exp
index 8ee233a712b4f..1a5a2cde85983 100644
--- a/tests/unix/extra_coverage.py.exp
+++ b/tests/unix/extra_coverage.py.exp
@@ -174,4 +174,9 @@ frzstr_pkg2.mod
 frzmpy_pkg2.mod
 1
 ZeroDivisionError
+\
+
+X
+'\x1b'
+b'\x00\xff'
 NULL

From 8626dcd6238e6a85a366f64dccf33724142653b6 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 28 Feb 2022 18:54:10 +1100
Subject: [PATCH 1744/3533] tools/ci.sh: Run performance benchmark as part of
 all unix test runs.

This tests that the performance benchmarks run without error.

Signed-off-by: Damien George <damien@micropython.org>
---
 .github/workflows/ports_unix.yml | 2 --
 tools/ci.sh                      | 5 +----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/.github/workflows/ports_unix.yml b/.github/workflows/ports_unix.yml
index 4e75172b64f46..dbd213cdff82f 100644
--- a/.github/workflows/ports_unix.yml
+++ b/.github/workflows/ports_unix.yml
@@ -45,8 +45,6 @@ jobs:
       run: source tools/ci.sh && ci_unix_standard_build
     - name: Run main test suite
       run: source tools/ci.sh && ci_unix_standard_run_tests
-    - name: Run performance benchmarks
-      run: source tools/ci.sh && ci_unix_standard_run_perfbench
     - name: Print failures
       if: failure()
       run: tests/run-tests.py --print-failures
diff --git a/tools/ci.sh b/tools/ci.sh
index 4ae21859db264..dee4b387bf4ac 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -385,6 +385,7 @@ function ci_unix_run_tests_full_helper {
     fi
     make -C ports/unix VARIANT=$variant "$@" test_full
     (cd tests && MICROPY_CPYTHON3=python3 MICROPY_MICROPYTHON=../ports/unix/$micropython ./run-multitests.py multi_net/*.py)
+    (cd tests && MICROPY_CPYTHON3=python3 MICROPY_MICROPYTHON=../ports/unix/$micropython ./run-perfbench.py 1000 1000)
 }
 
 function ci_native_mpy_modules_build {
@@ -424,10 +425,6 @@ function ci_unix_standard_run_tests {
     ci_unix_run_tests_full_helper standard
 }
 
-function ci_unix_standard_run_perfbench {
-    (cd tests && MICROPY_CPYTHON3=python3 MICROPY_MICROPYTHON=../ports/unix/micropython ./run-perfbench.py 1000 1000)
-}
-
 function ci_unix_dev_build {
     ci_unix_build_helper VARIANT=dev
 }

From 3c2aa5ff93a3b12723c7ca794aa9c583891c349b Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 28 Feb 2022 18:58:54 +1100
Subject: [PATCH 1745/3533] unix/.gitignore: Remove *.py from ignore list.

.py files are valid source files and shouldn't be ignored.  This line was
from the early days when .py files in the unix directory were used for
testing.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/unix/.gitignore | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ports/unix/.gitignore b/ports/unix/.gitignore
index 6745218688c20..3ca8f6cb27460 100644
--- a/ports/unix/.gitignore
+++ b/ports/unix/.gitignore
@@ -1,4 +1,3 @@
 micropython
 micropython-*
-*.py
 *.gcov

From 795370ca23ac8b0f3589ec1d4b34d3d7f3b175eb Mon Sep 17 00:00:00 2001
From: stijn <stijn@ignitron.net>
Date: Mon, 28 Feb 2022 10:20:47 +0100
Subject: [PATCH 1746/3533] py/bc.h: Fix C++ compilation of public API.

Casts between unrelated types must be explicit.  Regression in
f2040bfc7ee033e48acef9f289790f3b4e6b74e5
---
 py/bc.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/py/bc.h b/py/bc.h
index 7d761e30e68b8..5710f4d2431fe 100644
--- a/py/bc.h
+++ b/py/bc.h
@@ -287,8 +287,8 @@ static inline void mp_module_context_alloc_tables(mp_module_context_t *context,
     size_t nq = (n_qstr * sizeof(qstr_short_t) + sizeof(mp_uint_t) - 1) / sizeof(mp_uint_t);
     size_t no = n_obj;
     mp_uint_t *mem = m_new(mp_uint_t, nq + no);
-    context->constants.qstr_table = (void *)(mem);
-    context->constants.obj_table = (void *)(mem + nq);
+    context->constants.qstr_table = (qstr_short_t *)mem;
+    context->constants.obj_table = (mp_obj_t *)(mem + nq);
     #else
     if (n_obj == 0) {
         context->constants.obj_table = NULL;

From 2d47020e15b82b7f021e0b52dabe75baf5cb4c4d Mon Sep 17 00:00:00 2001
From: YoungJoon Chun <yjchun@mac.com>
Date: Wed, 16 Feb 2022 18:47:05 +0900
Subject: [PATCH 1747/3533] rp2/mpthreadport: Fix memory corruption when thread
 is created in core1.

The stack (and arg) of core1 is itself a root pointer, not just the entries
in it.  Without this fix the GC could reclaim the entire stack (and
argument object).

Fixes issues #7124 and #7981.
---
 ports/rp2/mpthreadport.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/ports/rp2/mpthreadport.c b/ports/rp2/mpthreadport.c
index 8a36cfca75a34..cdb5945d2198f 100644
--- a/ports/rp2/mpthreadport.c
+++ b/ports/rp2/mpthreadport.c
@@ -52,12 +52,12 @@ void mp_thread_deinit(void) {
 }
 
 void mp_thread_gc_others(void) {
-    if (get_core_num() == 0) {
-        // GC running on core0, trace core1's stack, if it's running.
-        if (core1_entry != NULL) {
-            gc_collect_root((void **)core1_stack, core1_stack_num_words);
-        }
-    } else {
+    if (core1_entry != NULL) {
+        // Collect core1's stack if it is active.
+        gc_collect_root((void **)&core1_stack, 1);
+        gc_collect_root((void **)&core1_arg, 1);
+    }
+    if (get_core_num() == 1) {
         // GC running on core1, trace core0's stack.
         gc_collect_root((void **)&__StackBottom, (&__StackTop - &__StackBottom) / sizeof(uintptr_t));
     }

From 2cc9232781d818b8a317dc7b173ecd5b752867e7 Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Thu, 24 Feb 2022 14:20:56 +1100
Subject: [PATCH 1748/3533] esp32/uart: Correctly init low-level UART driver
 for REPL.

uart_driver_install() needs to be called to set up the UART correctly.
---
 ports/esp32/main.c      |  2 +-
 ports/esp32/mphalport.c | 15 ++-----------
 ports/esp32/uart.c      | 49 ++++++++++++++++++++++++++++++++++++++---
 ports/esp32/uart.h      |  3 ++-
 4 files changed, 51 insertions(+), 18 deletions(-)

diff --git a/ports/esp32/main.c b/ports/esp32/main.c
index 6c5edbb35670d..a1c27c0a26d4b 100644
--- a/ports/esp32/main.c
+++ b/ports/esp32/main.c
@@ -93,7 +93,7 @@ void mp_task(void *pvParameter) {
     #elif CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG
     usb_serial_jtag_init();
     #else
-    uart_init();
+    uart_stdout_init();
     #endif
     machine_init();
 
diff --git a/ports/esp32/mphalport.c b/ports/esp32/mphalport.c
index de1b173ac409a..15a8dce1f34e0 100644
--- a/ports/esp32/mphalport.c
+++ b/ports/esp32/mphalport.c
@@ -33,16 +33,6 @@
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"
 
-#if CONFIG_IDF_TARGET_ESP32
-#include "esp32/rom/uart.h"
-#elif CONFIG_IDF_TARGET_ESP32C3
-#include "esp32c3/rom/uart.h"
-#elif CONFIG_IDF_TARGET_ESP32S2
-#include "esp32s2/rom/uart.h"
-#elif CONFIG_IDF_TARGET_ESP32S3
-#include "esp32s3/rom/uart.h"
-#endif
-
 #include "py/obj.h"
 #include "py/objstr.h"
 #include "py/stream.h"
@@ -54,6 +44,7 @@
 #include "mphalport.h"
 #include "usb.h"
 #include "usb_serial_jtag.h"
+#include "uart.h"
 
 TaskHandle_t mp_main_task_handle;
 
@@ -122,9 +113,7 @@ void mp_hal_stdout_tx_strn(const char *str, size_t len) {
     #elif CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG
     usb_serial_jtag_tx_strn(str, len);
     #else
-    for (uint32_t i = 0; i < len; ++i) {
-        uart_tx_one_char(str[i]);
-    }
+    uart_stdout_tx_strn(str, len);
     #endif
     if (release_gil) {
         MP_THREAD_GIL_ENTER();
diff --git a/ports/esp32/uart.c b/ports/esp32/uart.c
index 58fc0c6c6168b..ca4ac67cde57b 100644
--- a/ports/esp32/uart.c
+++ b/ports/esp32/uart.c
@@ -33,13 +33,56 @@
 
 #include "py/runtime.h"
 #include "py/mphal.h"
+#include "uart.h"
+
+#ifndef MICROPY_HW_UART_REPL
+#define MICROPY_HW_UART_REPL (UART_NUM_0)
+#endif
+
+#ifndef MICROPY_HW_UART_REPL_BAUD
+#define MICROPY_HW_UART_REPL_BAUD (115200)
+#endif
 
 STATIC void uart_irq_handler(void *arg);
 
-void uart_init(void) {
+void uart_stdout_init(void) {
+    uart_config_t uartcfg = {
+        .baud_rate = MICROPY_HW_UART_REPL_BAUD,
+        .data_bits = UART_DATA_8_BITS,
+        .parity = UART_PARITY_DISABLE,
+        .stop_bits = UART_STOP_BITS_1,
+        .flow_ctrl = UART_HW_FLOWCTRL_DISABLE,
+        .rx_flow_ctrl_thresh = 0
+    };
+    uart_param_config(MICROPY_HW_UART_REPL, &uartcfg);
+
+    const uint32_t rxbuf = 129; // IDF requires > 128 min
+    const uint32_t txbuf = 0;
+
+    uart_driver_install(MICROPY_HW_UART_REPL, rxbuf, txbuf, 0, NULL, 0);
+
     uart_isr_handle_t handle;
-    uart_isr_register(UART_NUM_0, uart_irq_handler, NULL, ESP_INTR_FLAG_LOWMED | ESP_INTR_FLAG_IRAM, &handle);
-    uart_enable_rx_intr(UART_NUM_0);
+    uart_isr_free(MICROPY_HW_UART_REPL);
+    uart_isr_register(MICROPY_HW_UART_REPL, uart_irq_handler, NULL, ESP_INTR_FLAG_LOWMED | ESP_INTR_FLAG_IRAM, &handle);
+    uart_enable_rx_intr(MICROPY_HW_UART_REPL);
+}
+
+int uart_stdout_tx_strn(const char *str, size_t len) {
+    size_t remaining = len;
+    // TODO add a timeout
+    for (;;) {
+        int ret = uart_tx_chars(MICROPY_HW_UART_REPL, str, remaining);
+        if (ret == -1) {
+            return -1;
+        }
+        remaining -= ret;
+        if (remaining <= 0) {
+            break;
+        }
+        str += ret;
+        ulTaskNotifyTake(pdFALSE, 1);
+    }
+    return len - remaining;
 }
 
 // all code executed in ISR must be in IRAM, and any const data must be in DRAM
diff --git a/ports/esp32/uart.h b/ports/esp32/uart.h
index 264c8b8949509..439be521c4ba3 100644
--- a/ports/esp32/uart.h
+++ b/ports/esp32/uart.h
@@ -28,6 +28,7 @@
 #ifndef MICROPY_INCLUDED_ESP32_UART_H
 #define MICROPY_INCLUDED_ESP32_UART_H
 
-void uart_init(void);
+void uart_stdout_init(void);
+int uart_stdout_tx_strn(const char *str, size_t len);
 
 #endif // MICROPY_INCLUDED_ESP32_UART_H

From 919e586e46af67e7eaa819b0f187b600a3165526 Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Thu, 24 Feb 2022 14:30:50 +1100
Subject: [PATCH 1749/3533] esp32/machine_uart: Allow limited configuration of
 REPL UART.

Some applications may want to adjust the hard coded 115200 REPL buadrate,
and this commit allows it to be changed dynamically via machine.UART(0).
---
 ports/esp32/machine_uart.c | 26 ++++++++++++++------------
 ports/esp32/uart.c         |  8 --------
 ports/esp32/uart.h         |  8 ++++++++
 3 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/ports/esp32/machine_uart.c b/ports/esp32/machine_uart.c
index 3c90a721508ac..aa8d494ec8c4f 100644
--- a/ports/esp32/machine_uart.c
+++ b/ports/esp32/machine_uart.c
@@ -35,6 +35,7 @@
 #include "py/stream.h"
 #include "py/mperrno.h"
 #include "modmachine.h"
+#include "uart.h"
 
 #if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(4, 1, 0)
 #define UART_INV_TX UART_INVERSE_TXD
@@ -151,6 +152,10 @@ STATIC void machine_uart_init_helper(machine_uart_obj_t *self, size_t n_args, co
 
     if (args[ARG_txbuf].u_int >= 0 || args[ARG_rxbuf].u_int >= 0) {
         // must reinitialise driver to change the tx/rx buffer size
+        if (self->uart_num == MICROPY_HW_UART_REPL) {
+            mp_raise_ValueError(MP_ERROR_TEXT("UART buffer size is fixed"));
+        }
+
         if (args[ARG_txbuf].u_int >= 0) {
             self->txbuf = args[ARG_txbuf].u_int;
         }
@@ -291,12 +296,6 @@ STATIC mp_obj_t machine_uart_make_new(const mp_obj_type_t *type, size_t n_args,
         mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("UART(%d) does not exist"), uart_num);
     }
 
-    // Attempts to use UART0 from Python has resulted in all sorts of fun errors.
-    // FIXME: UART0 is disabled for now.
-    if (uart_num == UART_NUM_0) {
-        mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("UART(%d) is disabled (dedicated to REPL)"), uart_num);
-    }
-
     // Defaults
     uart_config_t uartcfg = {
         .baud_rate = 115200,
@@ -338,14 +337,17 @@ STATIC mp_obj_t machine_uart_make_new(const mp_obj_type_t *type, size_t n_args,
         #endif
     }
 
-    // Remove any existing configuration
-    uart_driver_delete(self->uart_num);
+    // Only reset the driver if it's not the REPL UART.
+    if (uart_num != MICROPY_HW_UART_REPL) {
+        // Remove any existing configuration
+        uart_driver_delete(self->uart_num);
 
-    // init the peripheral
-    // Setup
-    uart_param_config(self->uart_num, &uartcfg);
+        // init the peripheral
+        // Setup
+        uart_param_config(self->uart_num, &uartcfg);
 
-    uart_driver_install(uart_num, self->rxbuf, self->txbuf, 0, NULL, 0);
+        uart_driver_install(uart_num, self->rxbuf, self->txbuf, 0, NULL, 0);
+    }
 
     mp_map_t kw_args;
     mp_map_init_fixed_table(&kw_args, n_kw, args + n_args);
diff --git a/ports/esp32/uart.c b/ports/esp32/uart.c
index ca4ac67cde57b..f6493dc796797 100644
--- a/ports/esp32/uart.c
+++ b/ports/esp32/uart.c
@@ -35,14 +35,6 @@
 #include "py/mphal.h"
 #include "uart.h"
 
-#ifndef MICROPY_HW_UART_REPL
-#define MICROPY_HW_UART_REPL (UART_NUM_0)
-#endif
-
-#ifndef MICROPY_HW_UART_REPL_BAUD
-#define MICROPY_HW_UART_REPL_BAUD (115200)
-#endif
-
 STATIC void uart_irq_handler(void *arg);
 
 void uart_stdout_init(void) {
diff --git a/ports/esp32/uart.h b/ports/esp32/uart.h
index 439be521c4ba3..f32d5cf342162 100644
--- a/ports/esp32/uart.h
+++ b/ports/esp32/uart.h
@@ -28,6 +28,14 @@
 #ifndef MICROPY_INCLUDED_ESP32_UART_H
 #define MICROPY_INCLUDED_ESP32_UART_H
 
+#ifndef MICROPY_HW_UART_REPL
+#define MICROPY_HW_UART_REPL (UART_NUM_0)
+#endif
+
+#ifndef MICROPY_HW_UART_REPL_BAUD
+#define MICROPY_HW_UART_REPL_BAUD (115200)
+#endif
+
 void uart_stdout_init(void);
 int uart_stdout_tx_strn(const char *str, size_t len);
 

From 665f0e2a68dfa4944f60e85a00d0543bb3d7fee8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20van=20de=20Giessen?= <daniel@dvdgiessen.nl>
Date: Wed, 23 Feb 2022 17:28:32 +0100
Subject: [PATCH 1750/3533] esp32: Sleep one tick in MICROPY_EVENT_POLL_HOOK.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

If MicroPython threads are enabled, loops waiting for an incoming event
should release the GIL and suspend, allowing other tasks to run while they
wait.

Prior to this commit, the problem can easily be observed by running a
thread that is both busy and regularly releases the GIL (for example a loop
doing something then sleeping a few ms after each iteration).  When the
main task is at the REPL, the thread is significantly stalled.  If the main
task is manually made to release the GIL (for example, by calling
utime.sleep_ms(500)) the other thread can be seen immediately working at
the expected speed again.

Additionally, there are various instances in where blocking functions run
MICROPY_EVENT_POLL_HOOK in a loop while they wait for a certain event/
condition.  For example the uselect methods poll objects to determine
whether data is available, but uses 100% of CPU while it does, constantly
calling MICROPY_EVENT_POLL_HOOK in the process.

The MICROPY_EVENT_POLL_HOOK macro is only ever used in waiting loops, where
(if threads are enabled) it makes sense to yield for a single tick so that
these loops do not consume all CPU cycles but instead other threads may
execute.  (In fact, the thing these loops wait for may even indirectly or
directly depend on another task being able to run.)

This change moves the sleep that was inside the REPL input function to
inside the MICROPY_EVENT_POLL_HOOK macro, where the GIL is already being
released, solving both the blocking REPL issue and the 100% CPU use issue
at the same time.

Signed-off-by: Daniël van de Giessen <daniel@dvdgiessen.nl>
---
 ports/esp32/mpconfigport.h | 1 +
 ports/esp32/mphalport.c    | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h
index 1ea19ada01515..d4f542f668922 100644
--- a/ports/esp32/mpconfigport.h
+++ b/ports/esp32/mpconfigport.h
@@ -195,6 +195,7 @@ void *esp_native_code_commit(void *, size_t, void *);
         mp_handle_pending(true); \
         MICROPY_PY_USOCKET_EVENTS_HANDLER \
         MP_THREAD_GIL_EXIT(); \
+        ulTaskNotifyTake(pdFALSE, 1); \
         MP_THREAD_GIL_ENTER(); \
     } while (0);
 #else
diff --git a/ports/esp32/mphalport.c b/ports/esp32/mphalport.c
index 15a8dce1f34e0..41e6e6ec00a46 100644
--- a/ports/esp32/mphalport.c
+++ b/ports/esp32/mphalport.c
@@ -98,7 +98,6 @@ int mp_hal_stdin_rx_chr(void) {
             return c;
         }
         MICROPY_EVENT_POLL_HOOK
-        ulTaskNotifyTake(pdFALSE, 1);
     }
 }
 

From 55a0125a154a9c13363d900e0caccd218bce0a54 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sun, 27 Feb 2022 15:22:21 +0100
Subject: [PATCH 1751/3533] esp32/machine_pwm: Always set the duty cycle when
 setting the frequency.

If setting the frequency to a value used already by an existing timer, this
timer will be used.  But still, the duty cycle for that channel may have to
be changed.

Fixes issues #8306 and #8345.
---
 ports/esp32/machine_pwm.c | 58 +++++++++++++++++++++++----------------
 1 file changed, 35 insertions(+), 23 deletions(-)
 mode change 100755 => 100644 ports/esp32/machine_pwm.c

diff --git a/ports/esp32/machine_pwm.c b/ports/esp32/machine_pwm.c
old mode 100755
new mode 100644
index 9308fcd3cbfc6..5baaa693c6d61
--- a/ports/esp32/machine_pwm.c
+++ b/ports/esp32/machine_pwm.c
@@ -74,7 +74,8 @@ STATIC ledc_timer_config_t timers[PWM_TIMER_MAX];
 // Params for PWM operation
 // 5khz is default frequency
 #define PWM_FREQ (5000)
-// default 10-bit resolution (compatible with esp8266 PWM)
+
+// 10-bit resolution (compatible with esp8266 PWM)
 #define PWM_RES_10_BIT (LEDC_TIMER_10_BIT)
 
 // Maximum duty value on 10-bit resolution
@@ -84,15 +85,17 @@ STATIC ledc_timer_config_t timers[PWM_TIMER_MAX];
 // duty_u16() and duty_ns() use 16-bit resolution or less
 
 // Possible highest resolution in device
-#if CONFIG_IDF_TARGET_ESP32
-#define HIGHEST_PWM_RES (LEDC_TIMER_16_BIT) // 20 bit for ESP32, but 16 bit is used
+#if (LEDC_TIMER_BIT_MAX - 1) < LEDC_TIMER_16_BIT
+#define HIGHEST_PWM_RES (LEDC_TIMER_BIT_MAX - 1)
 #else
-#define HIGHEST_PWM_RES (LEDC_TIMER_BIT_MAX - 1) // 14 bit is used
+#define HIGHEST_PWM_RES (LEDC_TIMER_16_BIT) // 20 bit for ESP32, but 16 bit is used
 #endif
 // Duty resolution of user interface in `duty_u16()` and `duty_u16` parameter in constructor/initializer
 #define UI_RES_16_BIT (16)
 // Maximum duty value on highest user interface resolution
 #define UI_MAX_DUTY ((1 << UI_RES_16_BIT) - 1)
+// How much to shift from the HIGHEST_PWM_RES duty resolution to the user interface duty resolution UI_RES_16_BIT
+#define UI_RES_SHIFT (UI_RES_16_BIT - HIGHEST_PWM_RES) // 0 for ESP32, 2 for S2, S3, C3
 
 // If the PWM frequency is less than EMPIRIC_FREQ, then LEDC_REF_CLK_HZ(1 MHz) source is used, else LEDC_APB_CLK_HZ(80 MHz) source is used
 #define EMPIRIC_FREQ (10) // Hz
@@ -108,7 +111,7 @@ typedef struct _machine_pwm_obj_t {
     int mode;
     int channel;
     int timer;
-    int duty_x; // PWM_RES_10_BIT if duty(), UI_RES_16_BIT if duty_u16(), -UI_RES_16_BIT if duty_ns()
+    int duty_x; // PWM_RES_10_BIT if duty(), HIGHEST_PWM_RES if duty_u16(), -HIGHEST_PWM_RES if duty_ns()
     int duty_u10; // stored values from previous duty setters
     int duty_u16; // - / -
     int duty_ns; // - / -
@@ -237,7 +240,6 @@ STATIC void set_freq(machine_pwm_obj_t *self, unsigned int freq, ledc_timer_conf
         }
 
         // Configure the new resolution and frequency
-        unsigned int save_duty_resolution = timer->duty_resolution;
         timer->duty_resolution = res;
         timer->freq_hz = freq;
         timer->clk_cfg = LEDC_USE_APB_CLK;
@@ -258,17 +260,15 @@ STATIC void set_freq(machine_pwm_obj_t *self, unsigned int freq, ledc_timer_conf
         if (self->mode == LEDC_LOW_SPEED_MODE) {
             check_esp_err(ledc_timer_rst(self->mode, self->timer));
         }
+    }
 
-        // Save the same duty cycle when frequency is changed
-        if (save_duty_resolution != timer->duty_resolution) {
-            if (self->duty_x == UI_RES_16_BIT) {
-                set_duty_u16(self, self->duty_u16);
-            } else if (self->duty_x == PWM_RES_10_BIT) {
-                set_duty_u10(self, self->duty_u10);
-            } else if (self->duty_x == -UI_RES_16_BIT) {
-                set_duty_ns(self, self->duty_ns);
-            }
-        }
+    // Save the same duty cycle when frequency is changed
+    if (self->duty_x == HIGHEST_PWM_RES) {
+        set_duty_u16(self, self->duty_u16);
+    } else if (self->duty_x == PWM_RES_10_BIT) {
+        set_duty_u10(self, self->duty_u10);
+    } else if (self->duty_x == -HIGHEST_PWM_RES) {
+        set_duty_ns(self, self->duty_ns);
     }
 }
 
@@ -293,11 +293,18 @@ STATIC int duty_to_ns(machine_pwm_obj_t *self, int duty) {
 #define get_duty_raw(self) ledc_get_duty(self->mode, self->channel)
 
 STATIC uint32_t get_duty_u16(machine_pwm_obj_t *self) {
-    return ledc_get_duty(self->mode, self->channel) << (UI_RES_16_BIT - timers[TIMER_IDX(self->mode, self->timer)].duty_resolution);
+    int resolution = timers[TIMER_IDX(self->mode, self->timer)].duty_resolution;
+    int duty = ledc_get_duty(self->mode, self->channel);
+    if (resolution <= UI_RES_16_BIT) {
+        duty <<= (UI_RES_16_BIT - resolution);
+    } else {
+        duty >>= (resolution - UI_RES_16_BIT);
+    }
+    return duty;
 }
 
 STATIC uint32_t get_duty_u10(machine_pwm_obj_t *self) {
-    return get_duty_u16(self) >> (UI_RES_16_BIT - LEDC_TIMER_10_BIT);
+    return get_duty_u16(self) >> 6; // Scale down from 16 bit to 10 bit resolution
 }
 
 STATIC uint32_t get_duty_ns(machine_pwm_obj_t *self) {
@@ -309,7 +316,12 @@ STATIC void set_duty_u16(machine_pwm_obj_t *self, int duty) {
         mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("duty_u16 must be from 0 to %d"), UI_MAX_DUTY);
     }
     ledc_timer_config_t timer = timers[TIMER_IDX(self->mode, self->timer)];
-    int channel_duty = duty >> (UI_RES_16_BIT - timer.duty_resolution);
+    int channel_duty;
+    if (timer.duty_resolution <= UI_RES_16_BIT) {
+        channel_duty = duty >> (UI_RES_16_BIT - timer.duty_resolution);
+    } else {
+        channel_duty = duty << (timer.duty_resolution - UI_RES_16_BIT);
+    }
     int max_duty = (1 << timer.duty_resolution) - 1;
     if (channel_duty < 0) {
         channel_duty = 0;
@@ -333,7 +345,7 @@ STATIC void set_duty_u16(machine_pwm_obj_t *self, int duty) {
     }
     */
 
-    self->duty_x = UI_RES_16_BIT;
+    self->duty_x = HIGHEST_PWM_RES;
     self->duty_u16 = duty;
 }
 
@@ -341,7 +353,7 @@ STATIC void set_duty_u10(machine_pwm_obj_t *self, int duty) {
     if ((duty < 0) || (duty > MAX_DUTY_U10)) {
         mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("duty must be from 0 to %u"), MAX_DUTY_U10);
     }
-    set_duty_u16(self, duty << (UI_RES_16_BIT - LEDC_TIMER_10_BIT));
+    set_duty_u16(self, duty << (UI_RES_16_BIT - PWM_RES_10_BIT));
     self->duty_x = PWM_RES_10_BIT;
     self->duty_u10 = duty;
 }
@@ -351,7 +363,7 @@ STATIC void set_duty_ns(machine_pwm_obj_t *self, int ns) {
         mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("duty_ns must be from 0 to %d ns"), duty_to_ns(self, UI_MAX_DUTY));
     }
     set_duty_u16(self, ns_to_duty(self, ns));
-    self->duty_x = -UI_RES_16_BIT;
+    self->duty_x = -HIGHEST_PWM_RES;
     self->duty_ns = ns;
 }
 
@@ -424,7 +436,7 @@ STATIC void mp_machine_pwm_print(const mp_print_t *print, mp_obj_t self_in, mp_p
 
         if (self->duty_x == PWM_RES_10_BIT) {
             mp_printf(print, ", duty=%d", get_duty_u10(self));
-        } else if (self->duty_x == -UI_RES_16_BIT) {
+        } else if (self->duty_x == -HIGHEST_PWM_RES) {
             mp_printf(print, ", duty_ns=%d", get_duty_ns(self));
         } else {
             mp_printf(print, ", duty_u16=%d", get_duty_u16(self));

From d696d9141e29da524fc78a1044f90a6e9107892f Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sun, 27 Feb 2022 18:09:41 +0100
Subject: [PATCH 1752/3533] esp32/machine_uart: Make UART.init preserve
 unspecified parameters.

Most of the settings behaved that way, except for baudate, timeout,
timout_char, invert and flow.
---
 ports/esp32/machine_uart.c | 42 +++++++++++++++++++++++---------------
 1 file changed, 26 insertions(+), 16 deletions(-)

diff --git a/ports/esp32/machine_uart.c b/ports/esp32/machine_uart.c
index aa8d494ec8c4f..396455666f621 100644
--- a/ports/esp32/machine_uart.c
+++ b/ports/esp32/machine_uart.c
@@ -139,10 +139,10 @@ STATIC void machine_uart_init_helper(machine_uart_obj_t *self, size_t n_args, co
         { MP_QSTR_cts, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = UART_PIN_NO_CHANGE} },
         { MP_QSTR_txbuf, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} },
         { MP_QSTR_rxbuf, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} },
-        { MP_QSTR_timeout, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 0} },
-        { MP_QSTR_timeout_char, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 0} },
-        { MP_QSTR_invert, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 0} },
-        { MP_QSTR_flow, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 0} },
+        { MP_QSTR_timeout, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} },
+        { MP_QSTR_timeout_char, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} },
+        { MP_QSTR_invert, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} },
+        { MP_QSTR_flow, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} },
     };
     mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
     mp_arg_parse_all(n_args, pos_args, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
@@ -181,8 +181,8 @@ STATIC void machine_uart_init_helper(machine_uart_obj_t *self, size_t n_args, co
     uint32_t baudrate = 115200;
     if (args[ARG_baudrate].u_int > 0) {
         uart_set_baudrate(self->uart_num, args[ARG_baudrate].u_int);
-        uart_get_baudrate(self->uart_num, &baudrate);
     }
+    uart_get_baudrate(self->uart_num, &baudrate);
 
     uart_set_pin(self->uart_num, args[ARG_tx].u_int, args[ARG_rx].u_int, args[ARG_rts].u_int, args[ARG_cts].u_int);
     if (args[ARG_tx].u_int != UART_PIN_NO_CHANGE) {
@@ -262,28 +262,36 @@ STATIC void machine_uart_init_helper(machine_uart_obj_t *self, size_t n_args, co
     }
 
     // set timeout
-    self->timeout = args[ARG_timeout].u_int;
+    if (args[ARG_timeout].u_int != -1) {
+        self->timeout = args[ARG_timeout].u_int;
+    }
 
     // set timeout_char
     // make sure it is at least as long as a whole character (13 bits to be safe)
-    self->timeout_char = args[ARG_timeout_char].u_int;
-    uint32_t min_timeout_char = 13000 / baudrate + 1;
-    if (self->timeout_char < min_timeout_char) {
-        self->timeout_char = min_timeout_char;
+    if (args[ARG_timeout_char].u_int != -1) {
+        self->timeout_char = args[ARG_timeout_char].u_int;
+        uint32_t min_timeout_char = 13000 / baudrate + 1;
+        if (self->timeout_char < min_timeout_char) {
+            self->timeout_char = min_timeout_char;
+        }
     }
 
     // set line inversion
-    if (args[ARG_invert].u_int & ~UART_INV_MASK) {
-        mp_raise_ValueError(MP_ERROR_TEXT("invalid inversion mask"));
+    if (args[ARG_invert].u_int != -1) {
+        if (args[ARG_invert].u_int & ~UART_INV_MASK) {
+            mp_raise_ValueError(MP_ERROR_TEXT("invalid inversion mask"));
+        }
+        self->invert = args[ARG_invert].u_int;
     }
-    self->invert = args[ARG_invert].u_int;
     uart_set_line_inverse(self->uart_num, self->invert);
 
     // set hardware flow control
-    if (args[ARG_flow].u_int & ~UART_HW_FLOWCTRL_CTS_RTS) {
-        mp_raise_ValueError(MP_ERROR_TEXT("invalid flow control mask"));
+    if (args[ARG_flow].u_int != -1) {
+        if (args[ARG_flow].u_int & ~UART_HW_FLOWCTRL_CTS_RTS) {
+            mp_raise_ValueError(MP_ERROR_TEXT("invalid flow control mask"));
+        }
+        self->flowcontrol = args[ARG_flow].u_int;
     }
-    self->flowcontrol = args[ARG_flow].u_int;
     uart_set_hw_flow_ctrl(self->uart_num, self->flowcontrol, UART_FIFO_LEN - UART_FIFO_LEN / 4);
 }
 
@@ -319,6 +327,8 @@ STATIC mp_obj_t machine_uart_make_new(const mp_obj_type_t *type, size_t n_args,
     self->rxbuf = 256; // IDF minimum
     self->timeout = 0;
     self->timeout_char = 0;
+    self->invert = 0;
+    self->flowcontrol = 0;
 
     switch (uart_num) {
         case UART_NUM_0:

From 5d9171b5ccf154a4c7c5f8e152ea4fd75a5f33a5 Mon Sep 17 00:00:00 2001
From: Jan <climblinne@users.noreply.github.com>
Date: Thu, 3 Mar 2022 13:49:06 +0100
Subject: [PATCH 1753/3533] docs/library/machine.UART.rst: Add details for
 `invert` parameter.

---
 docs/library/machine.UART.rst | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/docs/library/machine.UART.rst b/docs/library/machine.UART.rst
index 8fb42cfe87497..e239525736983 100644
--- a/docs/library/machine.UART.rst
+++ b/docs/library/machine.UART.rst
@@ -63,6 +63,12 @@ Methods
      - *timeout* specifies the time to wait for the first character (in ms).
      - *timeout_char* specifies the time to wait between characters (in ms).
      - *invert* specifies which lines to invert.
+
+         - ``0`` will not invert lines (idle state of both lines is logic high).
+         - ``UART.INV_TX`` will invert TX line (idle state of TX line now logic low).
+         - ``UART.INV_RX`` will invert RX line (idle state of RX line now logic low).
+         - ``UART.INV_TX | UART.INV_RX`` will invert both lines (idle state at logic low).
+
      - *flow* specifies which hardware flow control signals to use. The value
        is a bitmask.
 

From eadc927baff938a7f561fe69e09a27f11514f96e Mon Sep 17 00:00:00 2001
From: David Lechner <david@lechnology.com>
Date: Sat, 5 Mar 2022 09:51:34 -0600
Subject: [PATCH 1754/3533] docs/differences/python_35: Mark PEP 486 as not
 applicable.

This adds the "Not relevant" designation to PEP 486 since it has to do with
the Python Launcher for Windows and not the Python language itself.

Also fix a typo while we are touching this line.

Signed-off-by: David Lechner <david@pybricks.com>
---
 docs/differences/python_35.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/differences/python_35.rst b/docs/differences/python_35.rst
index 2a4c119a45e64..e88df25f95e07 100644
--- a/docs/differences/python_35.rst
+++ b/docs/differences/python_35.rst
@@ -33,7 +33,7 @@ Below is a list of finalised/accepted PEPs for Python 3.5 grouped into their imp
    +--------------------------------------------------------+-------------------------------------------------+---------------+
    | `PEP 441 <https://www.python.org/dev/peps/pep-0441/>`_ | improved Python zip application support         |               |
    +--------------------------------------------------------+-------------------------------------------------+---------------+
-   | `PEP 486 <https://www.python.org/dev/peps/pep-0486/>`_ | make the Python Laucher aware of virtual        |               |
+   | `PEP 486 <https://www.python.org/dev/peps/pep-0486/>`_ | make the Python Launcher aware of virtual       | Not relevant  |
    |                                                        | environments                                    |               |
    +--------------------------------------------------------+-------------------------------------------------+---------------+
    | `PEP 484 <https://www.python.org/dev/peps/pep-0484/>`_ | type hints (advisory only)                      | In Progress   |

From bb2bd071f74c04237618958521e58d48d2dc35d4 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 7 Mar 2022 15:15:45 +1100
Subject: [PATCH 1755/3533] docs/library/esp32.rst: Mark esp32.Partition as not
 taking kw args.

Fixes issue #8380.

Signed-off-by: Damien George <damien@micropython.org>
---
 docs/library/esp32.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/library/esp32.rst b/docs/library/esp32.rst
index 82e69e49646c4..da5fa8c3cbed7 100644
--- a/docs/library/esp32.rst
+++ b/docs/library/esp32.rst
@@ -68,7 +68,7 @@ Flash partitions
 This class gives access to the partitions in the device's flash memory and includes
 methods to enable over-the-air (OTA) updates.
 
-.. class:: Partition(id, block_size=4096)
+.. class:: Partition(id, block_size=4096, /)
 
     Create an object representing a partition.  *id* can be a string which is the label
     of the partition to retrieve, or one of the constants: ``BOOT`` or ``RUNNING``.

From 7cd166ff9244a720a6e72e651215db891dc1f85e Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 7 Mar 2022 12:29:17 +1100
Subject: [PATCH 1756/3533] tests/basics: Add test for creating small-ints in
 nan-box builds.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/basics/nanbox_smallint.py     | 42 +++++++++++++++++++++++++++++
 tests/basics/nanbox_smallint.py.exp |  5 ++++
 2 files changed, 47 insertions(+)
 create mode 100644 tests/basics/nanbox_smallint.py
 create mode 100644 tests/basics/nanbox_smallint.py.exp

diff --git a/tests/basics/nanbox_smallint.py b/tests/basics/nanbox_smallint.py
new file mode 100644
index 0000000000000..642ca77b375ef
--- /dev/null
+++ b/tests/basics/nanbox_smallint.py
@@ -0,0 +1,42 @@
+# Test creating small integers without heap allocation in nan-boxing mode.
+
+import micropython
+
+try:
+    # Test for nan-box build by allocating a float while heap is locked.
+    # This should pass on nan-box builds.
+    micropython.heap_lock()
+    float(123)
+    micropython.heap_unlock()
+except:
+    print("SKIP")
+    raise SystemExit
+
+# Check that nan-boxing uses 64-bit floats (eg it's not object representation C).
+if float("1e100") == float("inf"):
+    print("SKIP")
+    raise SystemExit
+
+micropython.heap_lock()
+print(int("0x80000000"))
+micropython.heap_unlock()
+
+# This is the most positive small integer.
+micropython.heap_lock()
+print(int("0x3fffffffffff"))
+micropython.heap_unlock()
+
+# This is the most negative small integer.
+micropython.heap_lock()
+print(int("-0x3fffffffffff") - 1)
+micropython.heap_unlock()
+
+x = 1
+micropython.heap_lock()
+print((x << 31) + 1)
+micropython.heap_unlock()
+
+x = 1
+micropython.heap_lock()
+print((x << 45) + 1)
+micropython.heap_unlock()
diff --git a/tests/basics/nanbox_smallint.py.exp b/tests/basics/nanbox_smallint.py.exp
new file mode 100644
index 0000000000000..aad1f7b8b63c1
--- /dev/null
+++ b/tests/basics/nanbox_smallint.py.exp
@@ -0,0 +1,5 @@
+2147483648
+70368744177663
+-70368744177664
+2147483649
+35184372088833

From bf01671a96b454340a176d27696d575e2a93ad7c Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 7 Mar 2022 16:02:55 +1100
Subject: [PATCH 1757/3533] tools/mpremote: Bump version to 0.2.0.

Signed-off-by: Damien George <damien@micropython.org>
---
 tools/mpremote/setup.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/mpremote/setup.cfg b/tools/mpremote/setup.cfg
index bb2d0da52ee2f..2bde6a8ebcf6b 100644
--- a/tools/mpremote/setup.cfg
+++ b/tools/mpremote/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = mpremote
-version = 0.1.0
+version = 0.2.0
 author = Damien George
 author_email = damien@micropython.org
 description = Tool for interacting remotely with MicroPython

From 86a4a526700ad40b2e37e33c7ae08826cff2a6ac Mon Sep 17 00:00:00 2001
From: Maureen Helm <maureen.helm@intel.com>
Date: Fri, 4 Mar 2022 08:32:50 -0600
Subject: [PATCH 1758/3533] zephyr: Update include path to disk_access.h.

The disk_access header was moved to a different path in Zephyr v2.6.0.
The old path was deprecated for two releases (v2.6.0 and v2.7.0) and
will no longer be supported after Zephyr v2.7.0.

Signed-off-by: Maureen Helm <maureen.helm@intel.com>
---
 ports/zephyr/zephyr_storage.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/zephyr/zephyr_storage.c b/ports/zephyr/zephyr_storage.c
index 1c25b32771e66..5934f22813e62 100644
--- a/ports/zephyr/zephyr_storage.c
+++ b/ports/zephyr/zephyr_storage.c
@@ -32,7 +32,7 @@
 #endif
 
 #ifdef CONFIG_DISK_ACCESS
-#include <disk/disk_access.h>
+#include <storage/disk_access.h>
 #endif
 
 #ifdef CONFIG_FLASH_MAP

From 474d288e55503e135a0d86e6eaa733354583a5f2 Mon Sep 17 00:00:00 2001
From: Maureen Helm <maureen.helm@intel.com>
Date: Wed, 2 Mar 2022 20:45:20 -0600
Subject: [PATCH 1759/3533] zephyr: Upgrade to Zephyr v3.0.0.

Updates the Zephyr port build instructions and CI to use the latest
Zephyr release tag.

Signed-off-by: Maureen Helm <maureen.helm@intel.com>
---
 docs/zephyr/tutorial/repl.rst | 4 ++--
 ports/zephyr/README.md        | 6 +++---
 tools/ci.sh                   | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/docs/zephyr/tutorial/repl.rst b/docs/zephyr/tutorial/repl.rst
index 71e732e610383..6e11c04cb3a0a 100644
--- a/docs/zephyr/tutorial/repl.rst
+++ b/docs/zephyr/tutorial/repl.rst
@@ -31,8 +31,8 @@ With your serial program open (PuTTY, screen, picocom, etc) you may see a
 blank screen with a flashing cursor. Press Enter (or reset the board) and
 you should be presented with the following text::
 
-        *** Booting Zephyr OS build zephyr-v2.7.0  ***
-        MicroPython v1.17-288-gb695f5a70-dirty on 2022-01-03; zephyr-frdm_k64f with mk64f12
+        *** Booting Zephyr OS build zephyr-v3.0.0  ***
+        MicroPython v1.18-169-g665f0e2a6-dirty on 2022-03-02; zephyr-frdm_k64f with mk64f12
         Type "help()" for more information.
         >>>
 
diff --git a/ports/zephyr/README.md b/ports/zephyr/README.md
index 6b1c7ddd5f0bd..6b2b54fa29ca7 100644
--- a/ports/zephyr/README.md
+++ b/ports/zephyr/README.md
@@ -4,7 +4,7 @@ MicroPython port to Zephyr RTOS
 This is a work-in-progress port of MicroPython to Zephyr RTOS
 (http://zephyrproject.org).
 
-This port requires Zephyr version v2.7.0, and may also work on higher
+This port requires Zephyr version v3.0.0, and may also work on higher
 versions.  All boards supported
 by Zephyr (with standard level of features support, like UART console)
 should work with MicroPython (but not all were tested).
@@ -39,13 +39,13 @@ setup is correct.
 If you already have Zephyr installed but are having issues building the
 MicroPython port then try installing the correct version of Zephyr via:
 
-    $ west init zephyrproject -m https://github.com/zephyrproject-rtos/zephyr --mr v2.7.0
+    $ west init zephyrproject -m https://github.com/zephyrproject-rtos/zephyr --mr v3.0.0
 
 Alternatively, you don't have to redo the Zephyr installation to just
 switch from master to a tagged release, you can instead do:
 
     $ cd zephyrproject/zephyr
-    $ git checkout v2.7.0
+    $ git checkout v3.0.0
     $ west update
 
 With Zephyr installed you may then need to configure your environment,
diff --git a/tools/ci.sh b/tools/ci.sh
index dee4b387bf4ac..4f6717fe936ec 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -618,7 +618,7 @@ function ci_windows_build {
 
 ZEPHYR_DOCKER_VERSION=v0.21.0
 ZEPHYR_SDK_VERSION=0.13.2
-ZEPHYR_VERSION=v2.7.0
+ZEPHYR_VERSION=v3.0.0
 
 function ci_zephyr_setup {
     docker pull zephyrprojectrtos/ci:${ZEPHYR_DOCKER_VERSION}

From cced9a0128a5fba99868b6fa091b26fec3119f54 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 7 Mar 2022 16:43:29 +1100
Subject: [PATCH 1760/3533] zephyr/prj.conf: Enable CONFIG_BUILD_OUTPUT_HEX to
 generate .hex output.

The .hex file contains more information than .bin, useful for flashing.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/zephyr/prj.conf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/zephyr/prj.conf b/ports/zephyr/prj.conf
index b6559e4f730ac..90211e3657900 100644
--- a/ports/zephyr/prj.conf
+++ b/ports/zephyr/prj.conf
@@ -1,4 +1,5 @@
 CONFIG_BUILD_OUTPUT_BIN=y
+CONFIG_BUILD_OUTPUT_HEX=y
 CONFIG_REBOOT=y
 
 CONFIG_STDOUT_CONSOLE=y

From 9a8ee6a5df8d59d0c88a14d81fe40ad95a31c1e4 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 7 Mar 2022 16:45:40 +1100
Subject: [PATCH 1761/3533] tests/run-tests.py: Include test files ending in
 _set as set tests.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/run-tests.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/run-tests.py b/tests/run-tests.py
index f9a16283bc9d2..edd20b9bd5526 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -548,7 +548,7 @@ def run_one_test(test_file):
         is_endian = test_name.endswith("_endian")
         is_int_big = test_name.startswith("int_big") or test_name.endswith("_intbig")
         is_bytearray = test_name.startswith("bytearray") or test_name.endswith("_bytearray")
-        is_set_type = test_name.startswith("set_") or test_name.startswith("frozenset")
+        is_set_type = test_name.startswith(("set_", "frozenset")) or test_name.endswith("_set")
         is_slice = test_name.find("slice") != -1 or test_name in misc_slice_tests
         is_async = test_name.startswith(("async_", "uasyncio_"))
         is_const = test_name.startswith("const")

From 3440201e2e6861be77aecb1d5069a6cfe4ccc328 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 7 Mar 2022 16:47:33 +1100
Subject: [PATCH 1762/3533] tests/micropython: Switch from set.pop to raise-0
 to test exc strings.

To not rely on sets, which are an optional feature.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/micropython/heapalloc_exc_compressed.py    | 16 +++++++---------
 .../micropython/heapalloc_exc_compressed.py.exp  |  6 +++---
 .../heapalloc_exc_compressed_emg_exc.py          | 10 ++++------
 .../heapalloc_exc_compressed_emg_exc.py.exp      |  4 ++--
 4 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/tests/micropython/heapalloc_exc_compressed.py b/tests/micropython/heapalloc_exc_compressed.py
index 79e423ca0f565..aa071d641c21c 100644
--- a/tests/micropython/heapalloc_exc_compressed.py
+++ b/tests/micropython/heapalloc_exc_compressed.py
@@ -5,12 +5,10 @@
 # mp_obj_new_exception_msg (decompression can be deferred)
 
 # NameError uses mp_obj_new_exception_msg_varg for NameError("name '%q' isn't defined")
-# set.pop uses mp_obj_new_exception_msg for KeyError("pop from an empty set")
+# `raise 0` uses mp_obj_new_exception_msg for TypeError("exceptions must derive from BaseException")
 
 # Tests that deferred decompression works both via print(e) and accessing the message directly via e.args.
 
-a = set()
-
 # First test the regular case (can use heap for allocating the decompression buffer).
 try:
     name()
@@ -18,8 +16,8 @@
     print(type(e).__name__, e)
 
 try:
-    a.pop()
-except KeyError as e:
+    raise 0
+except TypeError as e:
     print(type(e).__name__, e)
 
 try:
@@ -28,8 +26,8 @@
     print(e.args[0])
 
 try:
-    a.pop()
-except KeyError as e:
+    raise 0
+except TypeError as e:
     print(e.args[0])
 
 # Then test that it still works when the heap is locked (i.e. in ISR context).
@@ -41,8 +39,8 @@
     print(type(e).__name__)
 
 try:
-    a.pop()
-except KeyError as e:
+    raise 0
+except TypeError as e:
     print(type(e).__name__)
 
 micropython.heap_unlock()
diff --git a/tests/micropython/heapalloc_exc_compressed.py.exp b/tests/micropython/heapalloc_exc_compressed.py.exp
index 32d1642f8661e..c3e6e5dd9f749 100644
--- a/tests/micropython/heapalloc_exc_compressed.py.exp
+++ b/tests/micropython/heapalloc_exc_compressed.py.exp
@@ -1,6 +1,6 @@
 NameError name 'name' isn't defined
-KeyError pop from an empty set
+TypeError exceptions must derive from BaseException
 name 'name' isn't defined
-pop from an empty set
+exceptions must derive from BaseException
 NameError
-KeyError
+TypeError
diff --git a/tests/micropython/heapalloc_exc_compressed_emg_exc.py b/tests/micropython/heapalloc_exc_compressed_emg_exc.py
index 86ade07862a1c..48ce9dd69e6e2 100644
--- a/tests/micropython/heapalloc_exc_compressed_emg_exc.py
+++ b/tests/micropython/heapalloc_exc_compressed_emg_exc.py
@@ -9,8 +9,6 @@
 except AttributeError:
     pass
 
-a = set()
-
 
 def test():
     micropython.heap_lock()
@@ -21,8 +19,8 @@ def test():
         print(type(e).__name__, e)
 
     try:
-        a.pop()
-    except KeyError as e:
+        raise 0
+    except TypeError as e:
         print(type(e).__name__, e)
 
     try:
@@ -31,8 +29,8 @@ def test():
         print(e.args[0])
 
     try:
-        a.pop()
-    except KeyError as e:
+        raise 0
+    except TypeError as e:
         print(e.args[0])
 
     micropython.heap_unlock()
diff --git a/tests/micropython/heapalloc_exc_compressed_emg_exc.py.exp b/tests/micropython/heapalloc_exc_compressed_emg_exc.py.exp
index 7c368712a285a..1fc81093392a2 100644
--- a/tests/micropython/heapalloc_exc_compressed_emg_exc.py.exp
+++ b/tests/micropython/heapalloc_exc_compressed_emg_exc.py.exp
@@ -1,4 +1,4 @@
 NameError name 'name' isn't defined
-KeyError pop from an empty set
+TypeError exceptions must derive from BaseException
 name 'name' isn't defined
-pop from an empty set
+exceptions must derive from BaseException

From 33083bf52730fa1c238a154685a895b2775cc355 Mon Sep 17 00:00:00 2001
From: Jonathan Hogg <me@jonathanhogg.com>
Date: Mon, 7 Mar 2022 08:55:48 +0000
Subject: [PATCH 1763/3533] esp32/machine_pin: Add support for pin drive
 strength.

Add support for configuring drive strength of output pins with `drive`
keyword argument and `DRIVE_*` constants.
---
 ports/esp32/machine_pin.c | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/ports/esp32/machine_pin.c b/ports/esp32/machine_pin.c
index c0c7ddb705d26..1dad398524aef 100644
--- a/ports/esp32/machine_pin.c
+++ b/ports/esp32/machine_pin.c
@@ -253,13 +253,14 @@ STATIC void machine_pin_print(const mp_print_t *print, mp_obj_t self_in, mp_prin
     mp_printf(print, "Pin(%u)", self->id);
 }
 
-// pin.init(mode, pull=None, *, value)
+// pin.init(mode=None, pull=-1, *, value, drive)
 STATIC mp_obj_t machine_pin_obj_init_helper(const machine_pin_obj_t *self, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
-    enum { ARG_mode, ARG_pull, ARG_value };
+    enum { ARG_mode, ARG_pull, ARG_value, ARG_drive };
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_mode, MP_ARG_OBJ, {.u_obj = mp_const_none}},
         { MP_QSTR_pull, MP_ARG_OBJ, {.u_obj = MP_OBJ_NEW_SMALL_INT(-1)}},
         { MP_QSTR_value, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL}},
+        { MP_QSTR_drive, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL}},
     };
 
     // parse args
@@ -289,6 +290,14 @@ STATIC mp_obj_t machine_pin_obj_init_helper(const machine_pin_obj_t *self, size_
         gpio_set_level(self->id, mp_obj_is_true(args[ARG_value].u_obj));
     }
 
+    // set drive capability (do this before configuring mode)
+    if (args[ARG_drive].u_obj != MP_OBJ_NULL && GPIO_IS_VALID_OUTPUT_GPIO(self->id)) {
+        mp_int_t strength = mp_obj_get_int(args[ARG_drive].u_obj);
+        if (0 <= strength && strength < GPIO_DRIVE_CAP_MAX) {
+            gpio_set_drive_capability(self->id, strength);
+        }
+    }
+
     // configure mode
     if (args[ARG_mode].u_obj != mp_const_none) {
         mp_int_t pin_io_mode = mp_obj_get_int(args[ARG_mode].u_obj);
@@ -476,6 +485,10 @@ STATIC const mp_rom_map_elem_t machine_pin_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_IRQ_FALLING), MP_ROM_INT(GPIO_PIN_INTR_NEGEDGE) },
     { MP_ROM_QSTR(MP_QSTR_WAKE_LOW), MP_ROM_INT(GPIO_PIN_INTR_LOLEVEL) },
     { MP_ROM_QSTR(MP_QSTR_WAKE_HIGH), MP_ROM_INT(GPIO_PIN_INTR_HILEVEL) },
+    { MP_ROM_QSTR(MP_QSTR_DRIVE_0), MP_ROM_INT(GPIO_DRIVE_CAP_0) },
+    { MP_ROM_QSTR(MP_QSTR_DRIVE_1), MP_ROM_INT(GPIO_DRIVE_CAP_1) },
+    { MP_ROM_QSTR(MP_QSTR_DRIVE_2), MP_ROM_INT(GPIO_DRIVE_CAP_2) },
+    { MP_ROM_QSTR(MP_QSTR_DRIVE_3), MP_ROM_INT(GPIO_DRIVE_CAP_3) },
 };
 
 STATIC mp_uint_t pin_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_t arg, int *errcode) {

From 4c7c80d6266c6362253755c92bf649dc85c47dae Mon Sep 17 00:00:00 2001
From: Jonathan Hogg <me@jonathanhogg.com>
Date: Mon, 7 Mar 2022 09:03:49 +0000
Subject: [PATCH 1764/3533] docs/esp32/quickref: Document GPIO drive strength.

Add brief documentation of the new `drive` keyword argument.
---
 docs/esp32/quickref.rst | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/docs/esp32/quickref.rst b/docs/esp32/quickref.rst
index da586819fd493..56e765536ef1e 100644
--- a/docs/esp32/quickref.rst
+++ b/docs/esp32/quickref.rst
@@ -160,6 +160,7 @@ Use the :ref:`machine.Pin <machine.Pin>` class::
 
     p4 = Pin(4, Pin.IN, Pin.PULL_UP) # enable internal pull-up resistor
     p5 = Pin(5, Pin.OUT, value=1) # set pin high on creation
+    p6 = Pin(6, Pin.OUT, drive=Pin.DRIVE_3) # set maximum drive strength
 
 Available Pins are from the following ranges (inclusive): 0-19, 21-23, 25-27, 32-39.
 These correspond to the actual GPIO pin numbers of ESP32 chip.  Note that many
@@ -167,6 +168,15 @@ end-user boards use their own adhoc pin numbering (marked e.g. D0, D1, ...).
 For mapping between board logical pins and physical chip pins consult your board
 documentation.
 
+Four drive strengths are supported, using the ``drive`` keyword argument to the
+``Pin()`` constructor or ``Pin.init()`` method, with different corresponding
+safe maximum source/sink currents and approximate internal driver resistances:
+
+ - ``Pin.DRIVE_0``: 5mA / 130 ohm
+ - ``Pin.DRIVE_1``: 10mA / 60 ohm
+ - ``Pin.DRIVE_2``: 20mA / 30 ohm (default strength if not configured)
+ - ``Pin.DRIVE_3``: 40mA / 15 ohm
+
 Notes:
 
 * Pins 1 and 3 are REPL UART TX and RX respectively

From 3ebc370344ce5583b8615881a80749f855622aa5 Mon Sep 17 00:00:00 2001
From: Jonathan Hogg <me@jonathanhogg.com>
Date: Mon, 7 Mar 2022 09:03:54 +0000
Subject: [PATCH 1765/3533] docs/library/machine.Pin: Update to use preferred
 DRIVE_x constants.

Update documents with new common names for the drive strength constants.
---
 docs/library/machine.Pin.rst | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/docs/library/machine.Pin.rst b/docs/library/machine.Pin.rst
index f80de1178470a..49fb66beb38ea 100644
--- a/docs/library/machine.Pin.rst
+++ b/docs/library/machine.Pin.rst
@@ -87,9 +87,9 @@ Constructors
        output pin value if given, otherwise the state of the pin peripheral remains
        unchanged.
 
-     - ``drive`` specifies the output power of the pin and can be one of: ``Pin.LOW_POWER``,
-       ``Pin.MED_POWER`` or ``Pin.HIGH_POWER``.  The actual current driving capabilities
-       are port dependent.  Not all ports implement this argument.
+     - ``drive`` specifies the output power of the pin and can be one of: ``Pin.DRIVE_0``,
+       ``Pin.DRIVE_1``, etc., increasing in drive strength.  The actual current driving
+       capabilities are port dependent.  Not all ports implement this argument.
 
      - ``alt`` specifies an alternate function for the pin and the values it can take are
        port dependent.  This argument is valid only for ``Pin.ALT`` and ``Pin.ALT_OPEN_DRAIN``
@@ -260,11 +260,13 @@ not all constants are available on all ports.
    Selects whether there is a pull up/down resistor.  Use the value
    ``None`` for no pull.
 
-.. data:: Pin.LOW_POWER
-          Pin.MED_POWER
-          Pin.HIGH_POWER
+.. data:: Pin.DRIVE_0
+          Pin.DRIVE_1
+          Pin.DRIVE_2
 
-   Selects the pin drive strength.
+   Selects the pin drive strength.  A port may define additional drive
+   constants with increasing number corresponding to increasing drive
+   strength.
 
 .. data:: Pin.IRQ_FALLING
           Pin.IRQ_RISING

From 62cb2069bb107f32efedcd59481de6373c854db1 Mon Sep 17 00:00:00 2001
From: Philipp Ebensberger <philipp.ebensberger@3bricks-software.de>
Date: Mon, 7 Mar 2022 16:56:14 +0100
Subject: [PATCH 1766/3533] mimxrt/machine_pin: Change pin drive constants to
 DRIVE_x naming.

Updated DRIVE_x constants representing pin drive strength.

Signed-off-by: Philipp Ebensberger
---
 ports/mimxrt/eth.c          |  4 ++--
 ports/mimxrt/machine_pin.c  | 18 +++++++++---------
 ports/mimxrt/machine_pwm.c  |  4 ++--
 ports/mimxrt/machine_uart.c |  4 ++--
 ports/mimxrt/pin.c          |  2 +-
 ports/mimxrt/pin.h          | 28 ++++++++++++++--------------
 ports/mimxrt/sdcard.c       |  6 +++---
 7 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/ports/mimxrt/eth.c b/ports/mimxrt/eth.c
index 5a5138443cf3c..af0264d085dfe 100644
--- a/ports/mimxrt/eth.c
+++ b/ports/mimxrt/eth.c
@@ -195,7 +195,7 @@ void eth_init(eth_t *self, int mac_idx, const phy_operations_t *phy_ops, int phy
 
     IOMUXC_SetPinMux(reset_pin->muxRegister, af_obj->af_mode, 0, 0, reset_pin->configRegister, 0U);
     IOMUXC_SetPinConfig(reset_pin->muxRegister, af_obj->af_mode, 0, 0, reset_pin->configRegister,
-        pin_generate_config(PIN_PULL_DISABLED, PIN_MODE_OUT, PIN_DRIVE_POWER_5, reset_pin->configRegister));
+        pin_generate_config(PIN_PULL_DISABLED, PIN_MODE_OUT, PIN_DRIVE_5, reset_pin->configRegister));
     GPIO_PinInit(reset_pin->gpio, reset_pin->pin, &gpio_config);
     #endif
 
@@ -206,7 +206,7 @@ void eth_init(eth_t *self, int mac_idx, const phy_operations_t *phy_ops, int phy
 
     IOMUXC_SetPinMux(int_pin->muxRegister, af_obj->af_mode, 0, 0, int_pin->configRegister, 0U);
     IOMUXC_SetPinConfig(int_pin->muxRegister, af_obj->af_mode, 0, 0, int_pin->configRegister,
-        pin_generate_config(PIN_PULL_UP_47K, PIN_MODE_IN, PIN_DRIVE_POWER_5, int_pin->configRegister));
+        pin_generate_config(PIN_PULL_UP_47K, PIN_MODE_IN, PIN_DRIVE_5, int_pin->configRegister));
     GPIO_PinInit(int_pin->gpio, int_pin->pin, &gpio_config);
     #endif
 
diff --git a/ports/mimxrt/machine_pin.c b/ports/mimxrt/machine_pin.c
index 1f4afab97f2c8..2424088f02efb 100644
--- a/ports/mimxrt/machine_pin.c
+++ b/ports/mimxrt/machine_pin.c
@@ -190,7 +190,7 @@ STATIC mp_obj_t machine_pin_obj_init_helper(const machine_pin_obj_t *self, size_
         [PIN_INIT_ARG_MODE] { MP_QSTR_mode, MP_ARG_REQUIRED | MP_ARG_INT },
         [PIN_INIT_ARG_PULL] { MP_QSTR_pull, MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE}},
         [PIN_INIT_ARG_VALUE] { MP_QSTR_value, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL}},
-        [PIN_INIT_ARG_DRIVE] { MP_QSTR_drive, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = PIN_DRIVE_POWER_3}},
+        [PIN_INIT_ARG_DRIVE] { MP_QSTR_drive, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = PIN_DRIVE_3}},
         // TODO: Implement additional arguments
         /*
         { MP_QSTR_af, MP_ARG_INT, {.u_int = -1}}, // legacy
@@ -381,14 +381,14 @@ STATIC const mp_rom_map_elem_t machine_pin_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_PULL_DOWN), MP_ROM_INT(PIN_PULL_DOWN_100K) },
     { MP_ROM_QSTR(MP_QSTR_PULL_HOLD), MP_ROM_INT(PIN_PULL_HOLD) },
 
-    { MP_ROM_QSTR(MP_QSTR_DRIVER_OFF), MP_ROM_INT(PIN_DRIVE_OFF) },
-    { MP_ROM_QSTR(MP_QSTR_POWER_0),    MP_ROM_INT(PIN_DRIVE_POWER_0) }, // R0 (150 Ohm @3.3V / 260 Ohm @ 1.8V)
-    { MP_ROM_QSTR(MP_QSTR_POWER_1),    MP_ROM_INT(PIN_DRIVE_POWER_1) }, // R0/2
-    { MP_ROM_QSTR(MP_QSTR_POWER_2),    MP_ROM_INT(PIN_DRIVE_POWER_2) }, // R0/3
-    { MP_ROM_QSTR(MP_QSTR_POWER_3),    MP_ROM_INT(PIN_DRIVE_POWER_3) }, // R0/4
-    { MP_ROM_QSTR(MP_QSTR_POWER_4),    MP_ROM_INT(PIN_DRIVE_POWER_4) }, // R0/5
-    { MP_ROM_QSTR(MP_QSTR_POWER_5),    MP_ROM_INT(PIN_DRIVE_POWER_5) }, // R0/6
-    { MP_ROM_QSTR(MP_QSTR_POWER_6),    MP_ROM_INT(PIN_DRIVE_POWER_6) }, // R0/7
+    { MP_ROM_QSTR(MP_QSTR_DRIVE_OFF),  MP_ROM_INT(PIN_DRIVE_OFF) },
+    { MP_ROM_QSTR(MP_QSTR_DRIVE_0),    MP_ROM_INT(PIN_DRIVE_0) }, // R0 (150 Ohm @3.3V / 260 Ohm @ 1.8V)
+    { MP_ROM_QSTR(MP_QSTR_DRIVE_1),    MP_ROM_INT(PIN_DRIVE_1) }, // R0/2
+    { MP_ROM_QSTR(MP_QSTR_DRIVE_2),    MP_ROM_INT(PIN_DRIVE_2) }, // R0/3
+    { MP_ROM_QSTR(MP_QSTR_DRIVE_3),    MP_ROM_INT(PIN_DRIVE_3) }, // R0/4
+    { MP_ROM_QSTR(MP_QSTR_DRIVE_4),    MP_ROM_INT(PIN_DRIVE_4) }, // R0/5
+    { MP_ROM_QSTR(MP_QSTR_DRIVE_5),    MP_ROM_INT(PIN_DRIVE_5) }, // R0/6
+    { MP_ROM_QSTR(MP_QSTR_DRIVE_6),    MP_ROM_INT(PIN_DRIVE_6) }, // R0/7
 
     { MP_ROM_QSTR(MP_QSTR_IRQ_RISING), MP_ROM_INT(1) },
     { MP_ROM_QSTR(MP_QSTR_IRQ_FALLING), MP_ROM_INT(2) },
diff --git a/ports/mimxrt/machine_pwm.c b/ports/mimxrt/machine_pwm.c
index c21c7eb94b249..9a498fbab8679 100644
--- a/ports/mimxrt/machine_pwm.c
+++ b/ports/mimxrt/machine_pwm.c
@@ -518,7 +518,7 @@ STATIC mp_obj_t mp_machine_pwm_make_new(const mp_obj_type_t *type, size_t n_args
     IOMUXC_SetPinMux(pin1->muxRegister, af_obj1->af_mode, af_obj1->input_register, af_obj1->input_daisy,
         pin1->configRegister, 0U);
     IOMUXC_SetPinConfig(pin1->muxRegister, af_obj1->af_mode, af_obj1->input_register, af_obj1->input_daisy,
-        pin1->configRegister, pin_generate_config(PIN_PULL_DISABLED, PIN_MODE_OUT, PIN_DRIVE_POWER_5, pin1->configRegister));
+        pin1->configRegister, pin_generate_config(PIN_PULL_DISABLED, PIN_MODE_OUT, PIN_DRIVE_5, pin1->configRegister));
 
     // Settings for the second pin, if given.
     if (pin2 != NULL && pin2 != pin1) {
@@ -529,7 +529,7 @@ STATIC mp_obj_t mp_machine_pwm_make_new(const mp_obj_type_t *type, size_t n_args
         IOMUXC_SetPinMux(pin2->muxRegister, af_obj2->af_mode, af_obj2->input_register, af_obj2->input_daisy,
             pin2->configRegister, 0U);
         IOMUXC_SetPinConfig(pin2->muxRegister, af_obj2->af_mode, af_obj2->input_register, af_obj2->input_daisy,
-            pin2->configRegister, pin_generate_config(PIN_PULL_DISABLED, PIN_MODE_OUT, PIN_DRIVE_POWER_5, pin2->configRegister));
+            pin2->configRegister, pin_generate_config(PIN_PULL_DISABLED, PIN_MODE_OUT, PIN_DRIVE_5, pin2->configRegister));
     } else {
         self->complementary = 0;
     }
diff --git a/ports/mimxrt/machine_uart.c b/ports/mimxrt/machine_uart.c
index 6807a994e1a39..d413778c8c03f 100644
--- a/ports/mimxrt/machine_uart.c
+++ b/ports/mimxrt/machine_uart.c
@@ -85,11 +85,11 @@ bool lpuart_set_iomux(int8_t uart) {
     if (TX.muxRegister != 0) {
         IOMUXC_SetPinMux(TX.muxRegister, TX.muxMode, TX.inputRegister, TX.inputDaisy, TX.configRegister, 0U);
         IOMUXC_SetPinConfig(TX.muxRegister, TX.muxMode, TX.inputRegister, TX.inputDaisy, TX.configRegister,
-            pin_generate_config(PIN_PULL_UP_100K, PIN_MODE_OUT, PIN_DRIVE_POWER_6, TX.configRegister));
+            pin_generate_config(PIN_PULL_UP_100K, PIN_MODE_OUT, PIN_DRIVE_6, TX.configRegister));
 
         IOMUXC_SetPinMux(RX.muxRegister, RX.muxMode, RX.inputRegister, RX.inputDaisy, RX.configRegister, 0U);
         IOMUXC_SetPinConfig(RX.muxRegister, RX.muxMode, RX.inputRegister, RX.inputDaisy, RX.configRegister,
-            pin_generate_config(PIN_PULL_UP_100K, PIN_MODE_IN, PIN_DRIVE_POWER_6, RX.configRegister));
+            pin_generate_config(PIN_PULL_UP_100K, PIN_MODE_IN, PIN_DRIVE_6, RX.configRegister));
         return true;
     } else {
         return false;
diff --git a/ports/mimxrt/pin.c b/ports/mimxrt/pin.c
index e4136bd1c3a1a..fcc986328636a 100644
--- a/ports/mimxrt/pin.c
+++ b/ports/mimxrt/pin.c
@@ -99,7 +99,7 @@ uint32_t pin_generate_config(const uint32_t pull, const uint32_t mode, const uin
         if (!IS_GPIO_DRIVE(drive)) {
             mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("invalid drive strength: %d"), drive);
         }
-        pad_config |= IOMUXC_SW_PAD_CTL_PAD_DSE(drive >= PIN_DRIVE_POWER_4);
+        pad_config |= IOMUXC_SW_PAD_CTL_PAD_DSE(drive >= PIN_DRIVE_4);
     }
 
     #else
diff --git a/ports/mimxrt/pin.h b/ports/mimxrt/pin.h
index d1597fab9baa5..583d1c30231c9 100644
--- a/ports/mimxrt/pin.h
+++ b/ports/mimxrt/pin.h
@@ -40,13 +40,13 @@
     ((MODE) == PIN_MODE_ALT))
 
 #define IS_GPIO_DRIVE(DRIVE) (((DRIVE) == PIN_DRIVE_OFF) || \
-    ((DRIVE) == PIN_DRIVE_POWER_0) || \
-    ((DRIVE) == PIN_DRIVE_POWER_1) || \
-    ((DRIVE) == PIN_DRIVE_POWER_2) || \
-    ((DRIVE) == PIN_DRIVE_POWER_3) || \
-    ((DRIVE) == PIN_DRIVE_POWER_4) || \
-    ((DRIVE) == PIN_DRIVE_POWER_5) || \
-    ((DRIVE) == PIN_DRIVE_POWER_6))
+    ((DRIVE) == PIN_DRIVE_0) || \
+    ((DRIVE) == PIN_DRIVE_1) || \
+    ((DRIVE) == PIN_DRIVE_2) || \
+    ((DRIVE) == PIN_DRIVE_3) || \
+    ((DRIVE) == PIN_DRIVE_4) || \
+    ((DRIVE) == PIN_DRIVE_5) || \
+    ((DRIVE) == PIN_DRIVE_6))
 
 // ------------------------------------------------------------------------------------------------------------------ //
 
@@ -82,13 +82,13 @@ enum {
 
 enum {
     PIN_DRIVE_OFF = 0b000,
-    PIN_DRIVE_POWER_0, // R0 (150 Ohm @3.3V / 260 Ohm @ 1.8V)
-    PIN_DRIVE_POWER_1, // R0/2
-    PIN_DRIVE_POWER_2, // R0/3
-    PIN_DRIVE_POWER_3, // R0/4
-    PIN_DRIVE_POWER_4, // R0/5
-    PIN_DRIVE_POWER_5, // R0/6
-    PIN_DRIVE_POWER_6, // R0/7
+    PIN_DRIVE_0, // R0 (150 Ohm @3.3V / 260 Ohm @ 1.8V)
+    PIN_DRIVE_1, // R0/2
+    PIN_DRIVE_2, // R0/3
+    PIN_DRIVE_3, // R0/4
+    PIN_DRIVE_4, // R0/5
+    PIN_DRIVE_5, // R0/6
+    PIN_DRIVE_6, // R0/7
 };
 
 
diff --git a/ports/mimxrt/sdcard.c b/ports/mimxrt/sdcard.c
index 5c523068ad87d..1a9a97b68187b 100644
--- a/ports/mimxrt/sdcard.c
+++ b/ports/mimxrt/sdcard.c
@@ -728,14 +728,14 @@ void sdcard_init_pins(mimxrt_sdcard_obj_t *card) {
     const mimxrt_sdcard_obj_pins_t *pins = card->pins;
 
     uint32_t default_config = pin_generate_config(
-        PIN_PULL_UP_47K, PIN_MODE_SKIP, PIN_DRIVE_POWER_6, card->pins->clk.pin->configRegister);
+        PIN_PULL_UP_47K, PIN_MODE_SKIP, PIN_DRIVE_6, card->pins->clk.pin->configRegister);
     #if USDHC_DATA3_PULL_DOWN_ON_BOARD
     // Pull down on the board -> must not enable internal PD.
     uint32_t no_cd_config = pin_generate_config(
-        PIN_PULL_DISABLED, PIN_MODE_SKIP, PIN_DRIVE_POWER_6, card->pins->data3.pin->configRegister);
+        PIN_PULL_DISABLED, PIN_MODE_SKIP, PIN_DRIVE_6, card->pins->data3.pin->configRegister);
     #else
     uint32_t no_cd_config = pin_generate_config(
-        PIN_PULL_DOWN_100K, PIN_MODE_SKIP, PIN_DRIVE_POWER_6, card->pins->data3.pin->configRegister);
+        PIN_PULL_DOWN_100K, PIN_MODE_SKIP, PIN_DRIVE_6, card->pins->data3.pin->configRegister);
     #endif // USDHC_DATA3_PULL_DOWN_ON_BOARD
 
     sdcard_init_pin(card->pins->clk.pin, card->pins->clk.af_idx, default_config);  // USDHC1_CLK

From 5cc50b9f1cdc2991008bedec6e012c3ec877999a Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Wed, 2 Feb 2022 08:52:37 +0100
Subject: [PATCH 1767/3533] mimxrt/machine_spi: Add omitted GPIO config.

The method was changed, but not for the CSx pins.  No functional change.
---
 ports/mimxrt/machine_spi.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/mimxrt/machine_spi.c b/ports/mimxrt/machine_spi.c
index 0332d9a9e8014..e25e219c79d12 100644
--- a/ports/mimxrt/machine_spi.c
+++ b/ports/mimxrt/machine_spi.c
@@ -93,11 +93,11 @@ bool lpspi_set_iomux(int8_t spi, uint8_t drive, uint8_t cs) {
         if (cs == 0 && CS0.muxRegister != 0) {
             IOMUXC_SetPinMux(CS0.muxRegister, CS0.muxMode, CS0.inputRegister, CS0.inputDaisy, CS0.configRegister, 0U);
             IOMUXC_SetPinConfig(CS0.muxRegister, CS0.muxMode, CS0.inputRegister, CS0.inputDaisy, CS0.configRegister,
-                0x1080u | drive << IOMUXC_SW_PAD_CTL_PAD_DSE_SHIFT);
+                pin_generate_config(PIN_PULL_UP_100K, PIN_MODE_OUT, drive, CS0.configRegister));
         } else if (cs == 1 && CS1.muxRegister != 0) {
             IOMUXC_SetPinMux(CS1.muxRegister, CS1.muxMode, CS1.inputRegister, CS1.inputDaisy, CS1.configRegister, 0U);
             IOMUXC_SetPinConfig(CS1.muxRegister, CS1.muxMode, CS1.inputRegister, CS1.inputDaisy, CS1.configRegister,
-                0x1080u | drive << IOMUXC_SW_PAD_CTL_PAD_DSE_SHIFT);
+                pin_generate_config(PIN_PULL_UP_100K, PIN_MODE_OUT, drive, CS1.configRegister));
         } else {
             mp_raise_ValueError(MP_ERROR_TEXT("The chosen CS is not available"));
         }

From 5ea85b7a852046783074be8a59534bd7f55d2553 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sat, 18 Dec 2021 21:16:07 +0100
Subject: [PATCH 1768/3533] mimxrt/boards: Add board files for MIMXRT1015 and
 MIMXRT1015_EVK.

OCOTP_Init() has been removed from mphalport.c.  The library files are
missing for the MIMXRT1015, and for just reading the OCOTP the Init is not
required.
---
 ports/mimxrt/Makefile                         |   1 -
 ports/mimxrt/boards/MIMXRT1015.ld             |  38 +++++++
 ports/mimxrt/boards/MIMXRT1015_EVK/board.json |  23 ++++
 .../boards/MIMXRT1015_EVK/clock_config.h      | 107 ++++++++++++++++++
 .../boards/MIMXRT1015_EVK/mpconfigboard.h     |  84 ++++++++++++++
 .../boards/MIMXRT1015_EVK/mpconfigboard.mk    |   9 ++
 ports/mimxrt/boards/MIMXRT1015_EVK/pins.csv   |  41 +++++++
 ports/mimxrt/boards/MIMXRT1015_af.csv         |  57 ++++++++++
 ports/mimxrt/boards/make-flexram-config.py    |   1 +
 ports/mimxrt/mphalport.c                      |   6 +-
 10 files changed, 365 insertions(+), 2 deletions(-)
 create mode 100644 ports/mimxrt/boards/MIMXRT1015.ld
 create mode 100644 ports/mimxrt/boards/MIMXRT1015_EVK/board.json
 create mode 100644 ports/mimxrt/boards/MIMXRT1015_EVK/clock_config.h
 create mode 100644 ports/mimxrt/boards/MIMXRT1015_EVK/mpconfigboard.h
 create mode 100644 ports/mimxrt/boards/MIMXRT1015_EVK/mpconfigboard.mk
 create mode 100644 ports/mimxrt/boards/MIMXRT1015_EVK/pins.csv
 create mode 100644 ports/mimxrt/boards/MIMXRT1015_af.csv

diff --git a/ports/mimxrt/Makefile b/ports/mimxrt/Makefile
index 5b835d25b7f78..55e32433f503e 100644
--- a/ports/mimxrt/Makefile
+++ b/ports/mimxrt/Makefile
@@ -186,7 +186,6 @@ SRC_HAL_IMX_C += \
 	$(MCU_DIR)/drivers/fsl_lpspi.c \
 	$(MCU_DIR)/drivers/fsl_lpspi_edma.c \
 	$(MCU_DIR)/drivers/fsl_lpuart.c \
-	$(MCU_DIR)/drivers/fsl_ocotp.c \
 	$(MCU_DIR)/drivers/fsl_pit.c \
 	$(MCU_DIR)/drivers/fsl_pwm.c \
 	$(MCU_DIR)/drivers/fsl_snvs_lp.c \
diff --git a/ports/mimxrt/boards/MIMXRT1015.ld b/ports/mimxrt/boards/MIMXRT1015.ld
new file mode 100644
index 0000000000000..6d34200a9f78c
--- /dev/null
+++ b/ports/mimxrt/boards/MIMXRT1015.ld
@@ -0,0 +1,38 @@
+/* Memory configuration */
+#if defined MICROPY_HW_FLASH_RESERVED
+reserved_size = MICROPY_HW_FLASH_RESERVED;
+#endif
+
+#if MICROPY_HW_FLASH_TYPE == qspi_nor
+flash_start         = 0x60000000;
+#else
+#error Unknown MICROPY_HW_FLASH_TYPE
+#endif
+flash_size          = MICROPY_HW_FLASH_SIZE;
+flash_end           = DEFINED(reserved_size) ? ((flash_start) + (flash_size - reserved_size)) : ((flash_start) + (flash_size));
+flash_config_start  = flash_start;
+flash_config_size   = 0x00001000;
+ivt_start           = flash_start + 0x00001000;
+ivt_size            = 0x00001000;
+interrupts_start    = flash_start + 0x00002000;
+interrupts_size     = 0x00000400;
+text_start          = flash_start + 0x00002400;
+vfs_start           = flash_start + 0x00100000;
+text_size           = ((vfs_start) - (text_start));
+vfs_size            = ((flash_end) - (vfs_start));
+itcm_start          = 0x00000000;
+itcm_size           = 0x00008000;
+dtcm_start          = 0x20000000;
+dtcm_size           = 0x00008000;
+ocrm_start          = 0x20200000;
+ocrm_size           = 0x00010000;
+
+/* 24kiB stack. */
+__stack_size__ = 0x5000;
+_estack = __StackTop;
+_sstack = __StackLimit;
+
+/* Use second OCRAM bank for GC heap. */
+/* Use all OCRAM for the GC heap. */
+_gc_heap_start = ORIGIN(m_ocrm);
+_gc_heap_end = ORIGIN(m_ocrm) + LENGTH(m_ocrm);
diff --git a/ports/mimxrt/boards/MIMXRT1015_EVK/board.json b/ports/mimxrt/boards/MIMXRT1015_EVK/board.json
new file mode 100644
index 0000000000000..78044c134e53f
--- /dev/null
+++ b/ports/mimxrt/boards/MIMXRT1015_EVK/board.json
@@ -0,0 +1,23 @@
+{
+    "deploy": [
+        "../deploy_mimxrt.md"
+    ],
+    "docs": "",
+    "features": [
+        "MicroSD",
+        "MicroUSB",
+        "Microphone",
+        "AudioCodec",
+        "CAN",
+        "OpenSDA",
+        "JLink"
+    ],
+    "images": [
+        "MIMXRT1015-EVK-TOP.jpg"
+    ],
+    "mcu": "mimxrt",
+    "product": "MIMXRT1015_EVK",
+    "thumbnail": "",
+    "url": "https://www.nxp.com/design/development-boards/i-mx-evaluation-and-development-boards/i-mx-rt1015-evaluation-kit:MIMXRT1015-EVK",
+    "vendor": "NXP"
+}
diff --git a/ports/mimxrt/boards/MIMXRT1015_EVK/clock_config.h b/ports/mimxrt/boards/MIMXRT1015_EVK/clock_config.h
new file mode 100644
index 0000000000000..65944077e5ca8
--- /dev/null
+++ b/ports/mimxrt/boards/MIMXRT1015_EVK/clock_config.h
@@ -0,0 +1,107 @@
+/*
+ * Copyright 2018-2019 NXP
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#ifndef _CLOCK_CONFIG_H_
+#define _CLOCK_CONFIG_H_
+
+#include "fsl_common.h"
+
+/*******************************************************************************
+ * Definitions
+ ******************************************************************************/
+#define BOARD_XTAL0_CLK_HZ                         24000000U  /*!< Board xtal0 frequency in Hz */
+
+#define BOARD_XTAL32K_CLK_HZ                          32768U  /*!< Board xtal32k frequency in Hz */
+/*******************************************************************************
+ ************************ BOARD_InitBootClocks function ************************
+ ******************************************************************************/
+
+#if defined(__cplusplus)
+extern "C" {
+#endif /* __cplusplus*/
+
+/*!
+ * @brief This function executes default configuration of clocks.
+ *
+ */
+void BOARD_InitBootClocks(void);
+
+#if defined(__cplusplus)
+}
+#endif /* __cplusplus*/
+
+/*******************************************************************************
+ ********************** Configuration BOARD_BootClockRUN ***********************
+ ******************************************************************************/
+/*******************************************************************************
+ * Definitions for BOARD_BootClockRUN configuration
+ ******************************************************************************/
+#define BOARD_BOOTCLOCKRUN_CORE_CLOCK             500000000U  /*!< Core clock frequency: 500000000Hz */
+
+/* Clock outputs (values are in Hz): */
+#define BOARD_BOOTCLOCKRUN_AHB_CLK_ROOT               500000000UL
+#define BOARD_BOOTCLOCKRUN_CKIL_SYNC_CLK_ROOT         32768UL
+#define BOARD_BOOTCLOCKRUN_CLKO1_CLK                  0UL
+#define BOARD_BOOTCLOCKRUN_CLKO2_CLK                  0UL
+#define BOARD_BOOTCLOCKRUN_CLK_1M                     1000000UL
+#define BOARD_BOOTCLOCKRUN_CLK_24M                    24000000UL
+#define BOARD_BOOTCLOCKRUN_ENET_500M_REF_CLK          500000000UL
+#define BOARD_BOOTCLOCKRUN_FLEXIO1_CLK_ROOT           30000000UL
+#define BOARD_BOOTCLOCKRUN_FLEXSPI_CLK_ROOT           125000000UL
+#define BOARD_BOOTCLOCKRUN_GPT1_IPG_CLK_HIGHFREQ      62500000UL
+#define BOARD_BOOTCLOCKRUN_GPT2_IPG_CLK_HIGHFREQ      62500000UL
+#define BOARD_BOOTCLOCKRUN_IPG_CLK_ROOT               125000000UL
+#define BOARD_BOOTCLOCKRUN_LPI2C_CLK_ROOT             60000000UL
+#define BOARD_BOOTCLOCKRUN_LPSPI_CLK_ROOT             105600000UL
+#define BOARD_BOOTCLOCKRUN_MQS_MCLK                   63529411UL
+#define BOARD_BOOTCLOCKRUN_PERCLK_CLK_ROOT            62500000UL
+#define BOARD_BOOTCLOCKRUN_SAI1_CLK_ROOT              63529411UL
+#define BOARD_BOOTCLOCKRUN_SAI1_MCLK1                 63529411UL
+#define BOARD_BOOTCLOCKRUN_SAI1_MCLK2                 63529411UL
+#define BOARD_BOOTCLOCKRUN_SAI1_MCLK3                 30000000UL
+#define BOARD_BOOTCLOCKRUN_SAI2_CLK_ROOT              63529411UL
+#define BOARD_BOOTCLOCKRUN_SAI2_MCLK1                 63529411UL
+#define BOARD_BOOTCLOCKRUN_SAI2_MCLK2                 0UL
+#define BOARD_BOOTCLOCKRUN_SAI2_MCLK3                 30000000UL
+#define BOARD_BOOTCLOCKRUN_SAI3_CLK_ROOT              63529411UL
+#define BOARD_BOOTCLOCKRUN_SAI3_MCLK1                 63529411UL
+#define BOARD_BOOTCLOCKRUN_SAI3_MCLK2                 0UL
+#define BOARD_BOOTCLOCKRUN_SAI3_MCLK3                 30000000UL
+#define BOARD_BOOTCLOCKRUN_SPDIF0_CLK_ROOT            30000000UL
+#define BOARD_BOOTCLOCKRUN_SPDIF0_EXTCLK_OUT          0UL
+#define BOARD_BOOTCLOCKRUN_TRACE_CLK_ROOT             117333333UL
+#define BOARD_BOOTCLOCKRUN_UART_CLK_ROOT              80000000UL
+#define BOARD_BOOTCLOCKRUN_USBPHY1_CLK                0UL
+
+/*! @brief Usb1 PLL set for BOARD_BootClockRUN configuration.
+ */
+extern const clock_usb_pll_config_t usb1PllConfig_BOARD_BootClockRUN;
+/*! @brief Sys PLL for BOARD_BootClockRUN configuration.
+ */
+extern const clock_sys_pll_config_t sysPllConfig_BOARD_BootClockRUN;
+/*! @brief Enet PLL set for BOARD_BootClockRUN configuration.
+ */
+extern const clock_enet_pll_config_t enetPllConfig_BOARD_BootClockRUN;
+
+/*******************************************************************************
+ * API for BOARD_BootClockRUN configuration
+ ******************************************************************************/
+#if defined(__cplusplus)
+extern "C" {
+#endif /* __cplusplus*/
+
+/*!
+ * @brief This function executes configuration of clocks.
+ *
+ */
+void BOARD_BootClockRUN(void);
+
+#if defined(__cplusplus)
+}
+#endif /* __cplusplus*/
+
+#endif /* _CLOCK_CONFIG_H_ */
diff --git a/ports/mimxrt/boards/MIMXRT1015_EVK/mpconfigboard.h b/ports/mimxrt/boards/MIMXRT1015_EVK/mpconfigboard.h
new file mode 100644
index 0000000000000..17326cb4853dc
--- /dev/null
+++ b/ports/mimxrt/boards/MIMXRT1015_EVK/mpconfigboard.h
@@ -0,0 +1,84 @@
+#define MICROPY_HW_BOARD_NAME "i.MX RT1015 EVK"
+#define MICROPY_HW_MCU_NAME   "MIMXRT1015DAF5A"
+
+// i.MX RT1015 EVK has 3 board LED
+// Todo: think about replacing the define with searching in the generated pins?
+#define MICROPY_HW_LED1_PIN (pin_GPIO_SD_B1_00)
+#define MICROPY_HW_LED2_PIN (pin_GPIO_SD_B1_01)
+#define MICROPY_HW_LED3_PIN (pin_GPIO_SD_B1_02)
+#define MICROPY_HW_LED_ON(pin) (mp_hal_pin_low(pin))
+#define MICROPY_HW_LED_OFF(pin) (mp_hal_pin_high(pin))
+
+#define MICROPY_HW_NUM_PIN_IRQS (3 * 32)
+
+// Define mapping logical UART # to hardware UART #
+// RX/TX      HW-UART    Logical UART
+// DEBUG USB  LPUART1 -> 0
+// D3/D5      LPUART1
+// D0/D1      LPUART2 -> 1
+// D6/D9      LPUART3 -> 2
+// A0/A1      LPUART4 -> 5
+
+#define MICROPY_HW_UART_NUM     (sizeof(uart_index_table) / sizeof(uart_index_table)[0])
+#define MICROPY_HW_UART_INDEX   { 1, 4, 3 }
+
+#define IOMUX_TABLE_UART \
+    { IOMUXC_GPIO_AD_B0_06_LPUART1_TX }, { IOMUXC_GPIO_AD_B0_07_LPUART1_RX }, \
+    { 0 }, { 0 }, \
+    { IOMUXC_GPIO_AD_B0_14_LPUART3_TX }, { IOMUXC_GPIO_AD_B0_15_LPUART3_RX }, \
+    { IOMUXC_GPIO_EMC_32_LPUART4_TX },   { IOMUXC_GPIO_EMC_33_LPUART4_RX }, \
+
+#define MICROPY_HW_SPI_INDEX { 1 }
+
+#define IOMUX_TABLE_SPI \
+    { IOMUXC_GPIO_AD_B0_10_LPSPI1_SCK }, { IOMUXC_GPIO_AD_B0_11_LPSPI1_PCS0 }, \
+    { IOMUXC_GPIO_AD_B0_12_LPSPI1_SDO }, { IOMUXC_GPIO_AD_B0_13_LPSPI1_SDI }, \
+    { 0 }
+
+#define DMA_REQ_SRC_RX { 0, kDmaRequestMuxLPSPI1Rx, kDmaRequestMuxLPSPI2Rx }
+
+#define DMA_REQ_SRC_TX { 0, kDmaRequestMuxLPSPI1Tx, kDmaRequestMuxLPSPI2Tx }
+
+// Define mapping hardware I2C # to logical I2C #
+// SDA/SCL  HW-I2C    Logical I2C
+// D14/D15  LPI2C4 ->    0
+// A4/A5    LPI2C1 ->    1
+// D0/D1    LPI2C2 ->    2
+
+#define MICROPY_HW_I2C_INDEX   { 1, 2 }
+
+#define IOMUX_TABLE_I2C \
+    { IOMUXC_GPIO_AD_B1_14_LPI2C1_SCL }, { IOMUXC_GPIO_AD_B1_15_LPI2C1_SDA }, \
+    { IOMUXC_GPIO_EMC_19_LPI2C2_SCL },   { IOMUXC_GPIO_EMC_18_LPI2C2_SDA },
+
+#define MICROPY_PY_MACHINE_I2S (1)
+#define MICROPY_HW_I2S_NUM (1)
+#define I2S_CLOCK_MUX { 0, kCLOCK_Sai1Mux, kCLOCK_Sai2Mux }
+#define I2S_CLOCK_PRE_DIV { 0, kCLOCK_Sai1PreDiv, kCLOCK_Sai2PreDiv }
+#define I2S_CLOCK_DIV { 0, kCLOCK_Sai1Div, kCLOCK_Sai2Div }
+#define I2S_IOMUXC_GPR_MODE { 0, kIOMUXC_GPR_SAI1MClkOutputDir, kIOMUXC_GPR_SAI2MClkOutputDir }
+#define I2S_DMA_REQ_SRC_RX { 0, kDmaRequestMuxSai1Rx, kDmaRequestMuxSai2Rx }
+#define I2S_DMA_REQ_SRC_TX { 0, kDmaRequestMuxSai1Tx, kDmaRequestMuxSai2Tx }
+
+#define I2S_GPIO(_hwid, _fn, _mode, _pin, _iomux) \
+    { \
+        .hw_id = _hwid, \
+        .fn = _fn, \
+        .mode = _mode, \
+        .name = MP_QSTR_##_pin, \
+        .iomux = {_iomux}, \
+    }
+
+#define I2S_GPIO_MAP \
+    { \
+        I2S_GPIO(1, MCK, TX, GPIO_EMC_20, IOMUXC_GPIO_EMC_20_SAI1_MCLK), \
+        I2S_GPIO(1, SCK, RX, GPIO_EMC_19, IOMUXC_GPIO_EMC_19_SAI1_RX_BCLK), \
+        I2S_GPIO(1, WS, RX, GPIO_EMC_18, IOMUXC_GPIO_EMC_18_SAI1_RX_SYNC), \
+        I2S_GPIO(1, SD, RX, GPIO_EMC_21, IOMUXC_GPIO_EMC_21_SAI1_RX_DATA00),  \
+        I2S_GPIO(1, SCK, TX, GPIO_EMC_26, IOMUXC_GPIO_EMC_26_SAI1_TX_BCLK), \
+        I2S_GPIO(1, WS, TX, GPIO_EMC_27, IOMUXC_GPIO_EMC_27_SAI1_TX_SYNC),  \
+        I2S_GPIO(1, SD, TX, GPIO_EMC_25, IOMUXC_GPIO_EMC_25_SAI1_TX_DATA00), \
+    }
+
+#define MICROPY_BOARD_ROOT_POINTERS \
+    struct _machine_i2s_obj_t *machine_i2s_obj[MICROPY_HW_I2S_NUM];
diff --git a/ports/mimxrt/boards/MIMXRT1015_EVK/mpconfigboard.mk b/ports/mimxrt/boards/MIMXRT1015_EVK/mpconfigboard.mk
new file mode 100644
index 0000000000000..5d959b31d4546
--- /dev/null
+++ b/ports/mimxrt/boards/MIMXRT1015_EVK/mpconfigboard.mk
@@ -0,0 +1,9 @@
+MCU_SERIES = MIMXRT1015
+MCU_VARIANT = MIMXRT1015DAF5A
+
+MICROPY_FLOAT_IMPL = single
+MICROPY_PY_MACHINE_SDCARD = 0
+MICROPY_HW_FLASH_TYPE ?= qspi_nor
+MICROPY_HW_FLASH_SIZE ?= 0x1000000  # 16MB
+
+MICROPY_BOOT_BUFFER_SIZE = (32 * 1024)
diff --git a/ports/mimxrt/boards/MIMXRT1015_EVK/pins.csv b/ports/mimxrt/boards/MIMXRT1015_EVK/pins.csv
new file mode 100644
index 0000000000000..2b50c7ca7682f
--- /dev/null
+++ b/ports/mimxrt/boards/MIMXRT1015_EVK/pins.csv
@@ -0,0 +1,41 @@
+D0,GPIO_EMC_33
+D1,GPIO_EMC_32
+D2,GPIO_EMC_20
+D3,GPIO_EMC_26
+D4,GPIO_EMC_34
+D5,GPIO_EMC_27
+D6,GPIO_AD_B1_11
+D7,GPIO_AD_B0_15
+D8,GPIO_EMC_21
+D9,GPIO_EMC_22
+D10,GPIO_AD_B0_11
+D11,GPIO_AD_B0_12
+D12,GPIO_AD_B0_13
+D13,GPIO_AD_B0_10
+D14,GPIO_AD_B1_15
+D15,GPIO_AD_B1_14
+A0,GPIO_AD_B1_13
+A1,GPIO_AD_B0_14
+A2,GPIO_AD_B1_12
+A3,GPIO_AD_B1_10
+A4,GPIO_AD_B1_15
+A5,GPIO_AD_B1_14
+RX,GPIO_EMC_33
+TX,GPIO_EMC_32
+SDA,GPIO_AD_B1_15
+SCL,GPIO_AD_B1_14
+SCK,GPIO_AD_B0_10
+SDI,GPIO_AD_B0_13
+SDO,GPIO_AD_B0_12
+CS,GPIO_AD_B0_11
+LED1,GPIO_SD_B1_00
+LED2,GPIO_SD_B1_01
+LED3,GPIO_SD_B1_02
+BUTTON,GPIO_EMC_09
+MCK,GPIO_EMC_20
+SCK_RX,GPIO_EMC_19
+WS_RX,GPIO_EMC_18
+SD_RX,GPIO_EMC_21
+SCK_TX,GPIO_EMC_26
+WS_TX,GPIO_EMC_27
+SD_TX,GPIO_EMC_25
\ No newline at end of file
diff --git a/ports/mimxrt/boards/MIMXRT1015_af.csv b/ports/mimxrt/boards/MIMXRT1015_af.csv
new file mode 100644
index 0000000000000..d9886625830a2
--- /dev/null
+++ b/ports/mimxrt/boards/MIMXRT1015_af.csv
@@ -0,0 +1,57 @@
+Pad,ALT0,ALT1,ALT2,ALT3,ALT4,ALT5,ALT6,ALT7,ALT8,ALT9,ADC,ACMP,Default
+GPIO_AD_B0_00,JTAG_TMS,,,,,GPIO1_IO00,,GPT1_COMPARE1,,,,,ALT0
+GPIO_AD_B0_01,JTAG_TCK,,,,,GPIO1_IO01,,GPT1_CAPTURE2,,,,,ALT0
+GPIO_AD_B0_02,JTAG_MOD,,,,,GPIO1_IO02,,GPT1_CAPTURE1,,,,,ALT0
+GPIO_AD_B0_03,JTAG_TDI,,WDOG1_B,SAI1_MCLK,,GPIO1_IO03,USB_OTG1_OC,CCM_PMIC_RDY,,,,,ALT0
+GPIO_AD_B0_04,JTAG_TDO,,,,,GPIO1_IO04,USB_OTG1_PWR,EWM_OUT_B,,,,,ALT0
+GPIO_AD_B0_05,JTAG_TRSTB,,,,,GPIO1_IO05,USB_OTG1_ID,ARM_NMI,,,,,ALT0
+GPIO_AD_B0_06,PIT_TRIGGER0,MQS_RIGHT,LPUART1_TXD,,,GPIO1_IO06,REF_32K_OUT,,,,,,ALT5
+GPIO_AD_B0_07,PIT_TRIGGER1,MQS_LEFT,LPUART1_RXD,,,GPIO1_IO07,REF_24M_OUT,,,,,,ALT5
+GPIO_AD_B0_08,,,LPUART1_CTS_B,KPP_COL0,,GPIO1_IO08,ARM_CM7_TXEV,,,,,,ALT5
+GPIO_AD_B0_09,,,LPUART1_RTS_B,KPP_ROW0,CSU_CSU_INT_DEB,GPIO1_IO09,ARM_CM7_RXEV,,,,,,ALT5
+GPIO_AD_B0_10,,LPSPI1_SCK,,KPP_COL1,,GPIO1_IO10,ARM_TRACE_CLK,,,,,,ALT5
+GPIO_AD_B0_11,,LPSPI1_PCS0,,KPP_ROW1,,GPIO1_IO11,ARM_TRACE_SWO,,,,,,ALT5
+GPIO_AD_B0_12,,LPSPI1_SDO,LPUART3_CTS_B,KPP_COL2,,GPIO1_IO12,ARM_TRACE0,SNVS_VIO_5_CTL,,,ADC1_IN0,,ALT5
+GPIO_AD_B0_13,,LPSPI1_SDI,LPUART3_RTS_B,KPP_ROW2,,GPIO1_IO13,ARM_CM7_TRACE01,SNVS_VIO_5_B,,,,,ALT5
+GPIO_AD_B0_14,,,LPUART3_TXD,KPP_COL3,,GPIO1_IO14,ARM_CM7_TRACE02,WDOG1_ANY,,,ADC1_IN1,,ALT5
+GPIO_AD_B0_15,,,LPUART3_RXD,KPP_ROW3,,GPIO1_IO15,ARM_CM7_TRACE03,,,,ADC1_IN2,,ALT5
+GPIO_AD_B1_10,USB_OTG1_PWR,FLEXPWM1_PWM2_A,LPUART4_TXD,,FLEXIO1_D05,GPIO1_IO26,GPT2_CAPTURE1,,,,ADC1_IN10,,ALT5
+GPIO_AD_B1_11,USB_OTG1_ID,FLEXPWM1_PWM2_B,LPUART4_RXD,,FLEXIO1_D04,GPIO1_IO27,GPT2_COMPARE1,,,,ADC1_IN11,,ALT5
+GPIO_AD_B1_12,USB_OTG1_OC,ACMP1_OUT,,,FLEXIO1_D03,GPIO1_IO28,FLEXPWM1_PWM3_A,,,,ADC1_IN12,ACMP1_OUT,ALT5
+GPIO_AD_B1_13,LPI2C1_HREQ,ACMP2_OUT,,,FLEXIO1_D02,GPIO1_IO29,FLEXPWM1_PWM3_B,,,,ADC1_IN13,ACMP2_OUT,ALT5
+GPIO_AD_B1_14,LPI2C1_SCL,ACMP3_OUT,,,FLEXIO1_D01,GPIO1_IO30,,,,,ADC1_IN14,ACMP3_OUT,ALT5
+GPIO_AD_B1_15,LPI2C1_SDA,ACMP4_OUT,,,FLEXIO1_D00,GPIO1_IO31,,,,,ADC1_IN15,ACMP4_OUT,ALT5
+GPIO_EMC_04,,XBAR_INOUT04,SPDIF_OUT,SAI2_TX_BCLK,FLEXIO1_D16,GPIO2_IO04,,SJC_JTAG_ACT,,,,,ALT5
+GPIO_EMC_05,,XBAR_INOUT05,SPDIF_IN,SAI2_TX_SYNC,FLEXIO1_D17,GPIO2_IO05,,SJC_DE_B,,,,,ALT5
+GPIO_EMC_06,,XBAR_INOUT06,LPUART3_TXD,SAI2_TX_DATA,FLEXIO1_D18,GPIO2_IO06,,,,,,,ALT5
+GPIO_EMC_07,,XBAR_INOUT07,LPUART3_RXD,SAI2_RX_SYNC,FLEXIO1_D19,GPIO2_IO07,,,,,,,ALT5
+GPIO_EMC_08,,XBAR_INOUT08,,SAI2_RX_DATA,FLEXIO1_D20,GPIO2_IO08,,,,,,,ALT5
+GPIO_EMC_09,,XBAR_INOUT09,,SAI2_RX_BCLK,FLEXIO1_D21,GPIO2_IO09,,,,,,,ALT5
+GPIO_EMC_16,,,MQS_RIGHT,SAI2_MCLK,,GPIO2_IO16,SRC_BOOT_MODE0,,,,,,ALT5
+GPIO_EMC_17,,,MQS_LEFT,SAI3_MCLK,,GPIO2_IO17,SRC_BOOT_MODE1,,,,,,ALT5
+GPIO_EMC_18,,XBAR_INOUT16,LPI2C2_SDA,SAI1_RX_SYNC,FLEXIO1_D22,GPIO2_IO18,SRC_BT_CFG0,,,,,,ALT5
+GPIO_EMC_19,,XBAR_INOUT17,LPI2C2_SCL,SAI1_RX_BCLK,FLEXIO1_D23,GPIO2_IO19,SRC_BT_CFG1,,,,,,ALT5
+GPIO_EMC_20,,FLEXPWM1_PWM3_A,LPUART2_CTS_B,SAI1_MCLK,FLEXIO1_D24,GPIO2_IO20,SRC_BT_CFG2,,,,,,ALT5
+GPIO_EMC_21,,FLEXPWM1_PWM3_B,LPUART2_RTS_B,SAI1_RX_DATA0,FLEXIO1_D25,GPIO2_IO21,SRC_BT_CFG3,,,,,,ALT5
+GPIO_EMC_22,,FLEXPWM1_PWM2_A,LPUART2_TXD,SAI1_TX_DATA3,FLEXIO1_D26,GPIO2_IO22,SRC_BT_CFG4,,,,,,ALT5
+GPIO_EMC_23,,FLEXPWM1_PWM2_B,LPUART2_RXD,SAI1_TX_DATA2,FLEXIO1_D27,GPIO2_IO23,SRC_BT_CFG5,,,,,,ALT5
+GPIO_EMC_24,,FLEXPWM1_PWM1_A,,SAI1_TX_DATA1,FLEXIO1_D28,GPIO2_IO24,SRC_BT_CFG6,,,,,,ALT5
+GPIO_EMC_25,,FLEXPWM1_PWM1_B,,SAI1_TX_DATA0,FLEXIO1_D29,GPIO2_IO25,SRC_BT_CFG7,,,,,,ALT5
+GPIO_EMC_26,,FLEXPWM1_PWM0_A,,SAI1_TX_BCLK,FLEXIO1_D30,GPIO2_IO26,SRC_BT_CFG8,,,,,,ALT5
+GPIO_EMC_27,,FLEXPWM1_PWM0_B,,SAI1_TX_SYNC,FLEXIO1_D31,GPIO2_IO27,SRC_BT_CFG9,,,,,,ALT5
+GPIO_EMC_32,,TMR1_TIMER0,LPUART4_TXD,SAI3_TX_DATA,,GPIO3_IO00,,REF_24M_OUT,,,,,ALT5
+GPIO_EMC_33,,TMR1_TIMER1,LPUART4_RXD,SAI3_TX_BCLK,,GPIO3_IO01,,,,,,,ALT5
+GPIO_EMC_34,,TMR1_TIMER2,,SAI3_TX_SYNC,,GPIO3_IO02,,,,,,,ALT5
+GPIO_EMC_35,,TMR1_TIMER3,,,,GPIO3_IO03,,,,,,,ALT5
+GPIO_SD_B1_00,,FLEXSPI_B_DATA3,,XBAR_INOUT10,,GPIO3_IO20,,,,,,,ALT5
+GPIO_SD_B1_01,,FLEXSPI_B_SCLK,,FLEXSPI_A_SS1_B,,GPIO3_IO21,,,,,,,ALT5
+GPIO_SD_B1_02,,FLEXSPI_B_DATA0,,,,GPIO3_IO22,CCM_CLKO1,,,,,,ALT5
+GPIO_SD_B1_03,,FLEXSPI_B_DATA2,,,,GPIO3_IO23,CCM_CLKO2,,,,,,ALT5
+GPIO_SD_B1_04,,FLEXSPI_B_DATA1,,,EWM_OUT_B,GPIO3_IO24,CCM_WAIT,,,,,,ALT5
+GPIO_SD_B1_05,,FLEXSPI_A_DQS,,SAI3_MCLK,FLEXSPI_B_SS0_B,GPIO3_IO25,CCM_PMIC_RDY,,,,,,ALT5
+GPIO_SD_B1_06,,FLEXSPI_A_DATA3,,SAI3_TX_BCLK,LPSPI2_PCS0,GPIO3_IO26,CCM_STOP,,,,,,ALT5
+GPIO_SD_B1_07,,FLEXSPI_A_SCLK,,SAI3_TX_SYNC,LPSPI2_SCK,GPIO3_IO27,,,,,,,ALT5
+GPIO_SD_B1_08,,FLEXSPI_A_DATA0,,SAI3_TX_DATA,LPSPI2_SDO,GPIO3_IO28,,,,,,,ALT5
+GPIO_SD_B1_09,,FLEXSPI_A_DATA2,,SAI3_RX_BCLK,LPSPI2_SDI,GPIO3_IO29,CCM_REF_EN_B,,,,,,ALT5
+GPIO_SD_B1_10,,FLEXSPI_A_DATA1,,SAI3_RX_SYNC,LPSPI2_PCS2,GPIO3_IO30,SRC_SYSTEM_RESET,,,,,,ALT5
+GPIO_SD_B1_11,,FLEXSPI_A_SS0_B,,SAI3_RX_DATA,LPSPI2_PCS3,GPIO3_IO31,SRC_EARLY_RESET,,,,,,ALT5
diff --git a/ports/mimxrt/boards/make-flexram-config.py b/ports/mimxrt/boards/make-flexram-config.py
index 0a667ff5b7857..5d9c1a8c7c025 100644
--- a/ports/mimxrt/boards/make-flexram-config.py
+++ b/ports/mimxrt/boards/make-flexram-config.py
@@ -172,6 +172,7 @@ def mimxrt_106x_gen_code(extract_dict):
 def main(defines_file, features_file, ld_script, controller):
     dispatcher = {
         "MIMXRT1011": (mimxrt_default_parser, mimxrt_default_gen_code),
+        "MIMXRT1015": (mimxrt_default_parser, mimxrt_default_gen_code),
         "MIMXRT1021": (mimxrt_default_parser, mimxrt_default_gen_code),
         "MIMXRT1052": (mimxrt_default_parser, mimxrt_default_gen_code),
         "MIMXRT1062": (mimxrt_default_parser, mimxrt_106x_gen_code),
diff --git a/ports/mimxrt/mphalport.c b/ports/mimxrt/mphalport.c
index 17a6898c40ad9..673b58b23f878 100644
--- a/ports/mimxrt/mphalport.c
+++ b/ports/mimxrt/mphalport.c
@@ -33,7 +33,12 @@
 #include "ticks.h"
 #include "tusb.h"
 #include "fsl_snvs_lp.h"
+
+#if FSL_COMMON_DRIVER_VERSION != 0x020001
 #include "fsl_ocotp.h"
+#else
+void OCOTP_Init(OCOTP_Type *base, uint32_t srcClock_Hz);
+#endif
 
 #include CPU_HEADER_H
 
@@ -124,7 +129,6 @@ uint64_t mp_hal_time_ns(void) {
 // MAC address
 
 void mp_hal_get_unique_id(uint8_t id[]) {
-    OCOTP_Init(OCOTP, CLOCK_GetFreq(kCLOCK_IpgClk));
     *(uint32_t *)&id[0] = OCOTP->CFG0;
     *(uint32_t *)&id[4] = OCOTP->CFG1;
 }

From b0d460cd7deb6f1cc3393f56c378943aca8d954b Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Thu, 3 Feb 2022 15:41:56 +0100
Subject: [PATCH 1769/3533] mimxrt/eth: Fix an Ethernet transmit error.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Sometimes frames could not be sent immediately because the controller was
still busy with previous frames.  Then, an error was returned to lwip.
This fix adds a limited number of retries for this busy state, waiting
100µs before the next attempt.  Typically the transmit succeeds now at the
second attempt.

Second change: Reset the controller for a clean state after soft reset.
---
 ports/mimxrt/eth.c | 25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/ports/mimxrt/eth.c b/ports/mimxrt/eth.c
index af0264d085dfe..08e4dcc09d4fd 100644
--- a/ports/mimxrt/eth.c
+++ b/ports/mimxrt/eth.c
@@ -174,7 +174,7 @@ void eth_irq_handler(ENET_Type *base, enet_handle_t *handle, enet_event_t event,
             }
         } while (status != kStatus_ENET_RxFrameEmpty);
     } else {
-        ENET_ClearInterruptStatus(base, kENET_TxFrameInterrupt);
+        ENET_ClearInterruptStatus(base, ENET_TX_INTERRUPT | ENET_ERR_INTERRUPT);
     }
 }
 
@@ -279,6 +279,7 @@ void eth_init(eth_t *self, int mac_idx, const phy_operations_t *phy_ops, int phy
         mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("PHY Init failed."));
     }
 
+    ENET_Reset(ENET);
     ENET_GetDefaultConfig(&enet_config);
     enet_config.miiSpeed = (enet_mii_speed_t)speed;
     enet_config.miiDuplex = (enet_mii_duplex_t)duplex;
@@ -311,6 +312,22 @@ void eth_set_trace(eth_t *self, uint32_t value) {
 /*******************************************************************************/
 // ETH-LwIP bindings
 
+STATIC err_t eth_send_frame_blocking(ENET_Type *base, enet_handle_t *handle, uint8_t *buffer, int len) {
+    status_t status;
+    int i;
+    #define XMIT_LOOP 10
+
+    // Try a few times to send the frame
+    for (i = XMIT_LOOP; i > 0; i--) {
+        status = ENET_SendFrame(base, handle, buffer, len);
+        if (status != kStatus_ENET_TxFrameBusy) {
+            break;
+        }
+        ticks_delay_us64(100);
+    }
+    return status;
+}
+
 STATIC err_t eth_netif_output(struct netif *netif, struct pbuf *p) {
     // This function should always be called from a context where PendSV-level IRQs are disabled
     status_t status;
@@ -319,7 +336,7 @@ STATIC err_t eth_netif_output(struct netif *netif, struct pbuf *p) {
     eth_trace(netif->state, (size_t)-1, p, NETUTILS_TRACE_IS_TX | NETUTILS_TRACE_NEWLINE);
 
     if (p->next == NULL) {
-        status = ENET_SendFrame(ENET, &g_handle, p->payload, p->len);
+        status = eth_send_frame_blocking(ENET, &g_handle, p->payload, p->len);
     } else {
         // frame consists of several parts. Copy them together and send them
         size_t length = 0;
@@ -330,8 +347,8 @@ STATIC err_t eth_netif_output(struct netif *netif, struct pbuf *p) {
             length += p->len;
             p = p->next;
         }
-        status = ENET_SendFrame(ENET, &g_handle, tx_frame, length);
-    }
+        status = eth_send_frame_blocking(ENET, &g_handle, tx_frame, length);
+     }
     return status == kStatus_Success ? ERR_OK : ERR_BUF;
 }
 

From c72dfbcef96ef137c8faf72f0ccdb2ce6aab514c Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Thu, 3 Feb 2022 18:37:54 +0100
Subject: [PATCH 1770/3533] mimxrt/boards/TEENSY41: Use the same SPI1 pins for
 Teensy 4.0 and 4.1.

Teensy 4.1 used different pins for SPI1 than Teensy 4.0, which made the
boards unnecessarily different.
---
 ports/mimxrt/boards/TEENSY41/mpconfigboard.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/mimxrt/boards/TEENSY41/mpconfigboard.h b/ports/mimxrt/boards/TEENSY41/mpconfigboard.h
index 449f10babb42b..3b8d497c3f792 100644
--- a/ports/mimxrt/boards/TEENSY41/mpconfigboard.h
+++ b/ports/mimxrt/boards/TEENSY41/mpconfigboard.h
@@ -31,8 +31,8 @@
     { 0 }, { 0 }, \
     { 0 }, { 0 }, \
     { 0 }, \
-    { IOMUXC_GPIO_AD_B1_15_LPSPI3_SCK }, { IOMUXC_GPIO_AD_B1_12_LPSPI3_PCS0 }, \
-    { IOMUXC_GPIO_AD_B1_14_LPSPI3_SDO }, { IOMUXC_GPIO_AD_B1_13_LPSPI3_SDI }, \
+    { IOMUXC_GPIO_AD_B1_15_LPSPI3_SCK }, { IOMUXC_GPIO_AD_B0_03_LPSPI3_PCS0 }, \
+    { IOMUXC_GPIO_AD_B1_14_LPSPI3_SDO }, { IOMUXC_GPIO_AD_B0_02_LPSPI3_SDI }, \
     { 0 }, \
     { IOMUXC_GPIO_B0_03_LPSPI4_SCK }, { IOMUXC_GPIO_B0_00_LPSPI4_PCS0 }, \
     { IOMUXC_GPIO_B0_02_LPSPI4_SDO }, { IOMUXC_GPIO_B0_01_LPSPI4_SDI }, \

From 04f92a28251058756d776e90c044441e8f876f3f Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sun, 6 Feb 2022 17:33:24 +0100
Subject: [PATCH 1771/3533] mimxrt/boards: Support using an optional
 board-specific manifest.py.

If the board directory contains a manifest.py file, it will be included.
File not found errors will be ignored.
---
 ports/mimxrt/boards/manifest.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ports/mimxrt/boards/manifest.py b/ports/mimxrt/boards/manifest.py
index ccbd33cae8a26..2e1a1d63d4e79 100644
--- a/ports/mimxrt/boards/manifest.py
+++ b/ports/mimxrt/boards/manifest.py
@@ -2,3 +2,7 @@
 freeze("$(MPY_DIR)/drivers/onewire")
 freeze("$(MPY_DIR)/drivers/dht", "dht.py")
 include("$(MPY_DIR)/extmod/uasyncio/manifest.py")
+try:
+    include("$(BOARD_DIR)/manifest.py")
+except FileNotFoundError:
+    pass

From 4774501cab372b75ca263be91d5eb0fa3ba9d60d Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Wed, 23 Feb 2022 14:15:27 +0100
Subject: [PATCH 1772/3533] mimxrt/eth: Avoid a race condition for Ethernet.

That caused Ethernet to lock up at high data rates after ~200MByte data
average in a row.  Tested now with data bursts up to 10 GByte and overall
data rates of ~8MByte/s at the Eth100 port.
---
 ports/mimxrt/eth.c          | 3 ++-
 ports/mimxrt/mpconfigport.h | 8 +++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/ports/mimxrt/eth.c b/ports/mimxrt/eth.c
index 08e4dcc09d4fd..288aafb6b3d96 100644
--- a/ports/mimxrt/eth.c
+++ b/ports/mimxrt/eth.c
@@ -291,6 +291,7 @@ void eth_init(eth_t *self, int mac_idx, const phy_operations_t *phy_ops, int phy
 
     ENET_Init(ENET, &g_handle, &enet_config, &buffConfig[0], hw_addr, CLOCK_GetFreq(kCLOCK_IpgClk));
     ENET_SetCallback(&g_handle, eth_irq_handler, (void *)self);
+    NVIC_SetPriority(ENET_IRQn, IRQ_PRI_PENDSV);
     ENET_EnableInterrupts(ENET, ENET_RX_INTERRUPT);
     ENET_ClearInterruptStatus(ENET, ENET_TX_INTERRUPT | ENET_RX_INTERRUPT | ENET_ERR_INTERRUPT);
     ENET_ActiveRead(ENET);
@@ -348,7 +349,7 @@ STATIC err_t eth_netif_output(struct netif *netif, struct pbuf *p) {
             p = p->next;
         }
         status = eth_send_frame_blocking(ENET, &g_handle, tx_frame, length);
-     }
+    }
     return status == kStatus_Success ? ERR_OK : ERR_BUF;
 }
 
diff --git a/ports/mimxrt/mpconfigport.h b/ports/mimxrt/mpconfigport.h
index 4462a18a617b4..795887444750f 100644
--- a/ports/mimxrt/mpconfigport.h
+++ b/ports/mimxrt/mpconfigport.h
@@ -169,9 +169,11 @@ uint32_t trng_random_u32(void);
 // For regular code that wants to prevent "background tasks" from running.
 // These background tasks (LWIP, Bluetooth) run in PENDSV context.
 // TODO: Check for the settings of the STM32 port in irq.h
-#define MICROPY_PY_PENDSV_ENTER   uint32_t atomic_state = disable_irq();
-#define MICROPY_PY_PENDSV_REENTER atomic_state = disable_irq();
-#define MICROPY_PY_PENDSV_EXIT    enable_irq(atomic_state);
+#define NVIC_PRIORITYGROUP_4    ((uint32_t)0x00000003)
+#define IRQ_PRI_PENDSV          NVIC_EncodePriority(NVIC_PRIORITYGROUP_4, 15, 0)
+#define MICROPY_PY_PENDSV_ENTER   uint32_t atomic_state = raise_irq_pri(IRQ_PRI_PENDSV);
+#define MICROPY_PY_PENDSV_REENTER atomic_state = raise_irq_pri(IRQ_PRI_PENDSV);
+#define MICROPY_PY_PENDSV_EXIT    restore_irq_pri(atomic_state);
 
 // Use VfsLfs2's types for fileio/textio
 #define mp_type_fileio mp_type_vfs_lfs2_fileio

From e0b97013d0730a70d94922aca168f49b9f456e46 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Fri, 25 Feb 2022 20:18:24 +0100
Subject: [PATCH 1773/3533] mimxrt/hal/pwm_backport: Make PWM symmetric, and
 round division calcs.

Ensure the symmetry of PWM: the duty rate of X and Q channels was not 50%,
when it should have been.  That is evident at high frequencies, like 15Mhz
or 37.5 MHz.  At low frequencies the deviation mattered less.  The A/B
channels were fine.

Also round up or down non-integer division factors. Before, always the
floor value was used.
---
 ports/mimxrt/hal/pwm_backport.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ports/mimxrt/hal/pwm_backport.c b/ports/mimxrt/hal/pwm_backport.c
index cea6642120675..a4663df4f1a3d 100644
--- a/ports/mimxrt/hal/pwm_backport.c
+++ b/ports/mimxrt/hal/pwm_backport.c
@@ -53,7 +53,7 @@ void PWM_SetupPwm_u16(PWM_Type *base, pwm_submodule_t subModule, pwm_signal_para
 
     // Divide the clock by the prescale value
     pwmClock = (srcClock_Hz / (1U << ((base->SM[subModule].CTRL & PWM_CTRL_PRSC_MASK) >> PWM_CTRL_PRSC_SHIFT)));
-    pulseCnt = pwmClock / pwmFreq_Hz;
+    pulseCnt = (pwmClock + (pwmFreq_Hz - 1) / 2) / pwmFreq_Hz;
     base->SM[subModule].INIT = 0;
     base->SM[subModule].VAL1 = pulseCnt - 1;
 
@@ -93,9 +93,9 @@ void PWM_SetupPwmx_u16(PWM_Type *base, pwm_submodule_t subModule,
 
     // Divide the clock by the prescale value
     pwmClock = (srcClock_Hz / (1U << ((base->SM[subModule].CTRL & PWM_CTRL_PRSC_MASK) >> PWM_CTRL_PRSC_SHIFT)));
-    pulseCnt = pwmClock / pwmFreq_Hz;
+    pulseCnt = (pwmClock + (pwmFreq_Hz - 1) / 2) / pwmFreq_Hz;
     base->SM[subModule].INIT = 0;
-    base->SM[subModule].VAL0 = ((uint32_t)duty_cycle * pulseCnt) / PWM_FULL_SCALE;
+    base->SM[subModule].VAL0 = ((uint32_t)duty_cycle * pulseCnt) / PWM_FULL_SCALE - 1;
     base->SM[subModule].VAL1 = pulseCnt - 1;
 
     base->SM[subModule].OCTRL = (base->SM[subModule].OCTRL & ~PWM_OCTRL_POLX_MASK) | PWM_OCTRL_POLX(!invert);
@@ -137,7 +137,7 @@ status_t QTMR_SetupPwm_u16(TMR_Type *base, qtmr_channel_selection_t channel, uin
     }
 
     // Counter values to generate a PWM signal
-    periodCount = (srcClock_Hz / pwmFreqHz) - 1;
+    periodCount = ((srcClock_Hz + (pwmFreqHz - 1) / 2) / pwmFreqHz) - 2;
     highCount = (periodCount * dutyCycleU16) / PWM_FULL_SCALE;
     lowCount = periodCount - highCount;
 

From e2513bfe8db91055e443e1804e3abb90c9998d86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20van=20de=20Giessen?= <daniel@dvdgiessen.nl>
Date: Thu, 27 Aug 2020 14:16:48 +0200
Subject: [PATCH 1774/3533] extmod/moduzlib: Fix parsing zlib header dict size.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

From RFC 1950 section 2.2: "CINFO is the base-2 logarithm of the LZ77
window size, minus eight (CINFO=7 indicates a 32K window size)"

Signed-off-by: Daniël van de Giessen <daniel@dvdgiessen.nl>
---
 extmod/moduzlib.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/extmod/moduzlib.c b/extmod/moduzlib.c
index f78c349085f76..a6874fb4e3e59 100644
--- a/extmod/moduzlib.c
+++ b/extmod/moduzlib.c
@@ -77,7 +77,7 @@ STATIC mp_obj_t decompio_make_new(const mp_obj_type_t *type, size_t n_args, size
     o->eof = false;
 
     mp_int_t dict_opt = 0;
-    int dict_sz;
+    uint dict_sz;
     if (n_args > 1) {
         dict_opt = mp_obj_get_int(args[1]);
     }
@@ -94,7 +94,10 @@ STATIC mp_obj_t decompio_make_new(const mp_obj_type_t *type, size_t n_args, size
         header_error:
             mp_raise_ValueError(MP_ERROR_TEXT("compression header"));
         }
-        dict_sz = 1 << dict_opt;
+        // RFC 1950 section 2.2:
+        // CINFO is the base-2 logarithm of the LZ77 window size,
+        // minus eight (CINFO=7 indicates a 32K window size)
+        dict_sz = 1 << (dict_opt + 8);
     } else {
         dict_sz = 1 << -dict_opt;
     }
@@ -116,6 +119,7 @@ STATIC mp_uint_t decompio_read(mp_obj_t o_in, void *buf, mp_uint_t size, int *er
         o->eof = true;
     }
     if (st < 0) {
+        DEBUG_printf("uncompress error=" INT_FMT "\n", st);
         *errcode = MP_EINVAL;
         return MP_STREAM_ERROR;
     }

From 507ad03329983551635831c0b5ba76319eaca165 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Wed, 16 Jun 2021 00:55:09 +0200
Subject: [PATCH 1775/3533] rp2: Add USB MSC support.

It is currently not enabled by default on any board.
---
 ports/rp2/CMakeLists.txt              |   1 +
 ports/rp2/boards/PICO/mpconfigboard.h |   3 +
 ports/rp2/main.c                      |   4 +
 ports/rp2/modules/_boot_fat.py        |  15 +++
 ports/rp2/mpconfigport.h              |  16 +++-
 ports/rp2/msc_disk.c                  | 127 ++++++++++++++++++++++++++
 ports/rp2/tusb_config.h               |   9 ++
 ports/rp2/tusb_port.c                 |  19 ++++
 8 files changed, 193 insertions(+), 1 deletion(-)
 create mode 100644 ports/rp2/modules/_boot_fat.py
 create mode 100644 ports/rp2/msc_disk.c

diff --git a/ports/rp2/CMakeLists.txt b/ports/rp2/CMakeLists.txt
index 0009ab2cdbff9..a428b0c39b76e 100644
--- a/ports/rp2/CMakeLists.txt
+++ b/ports/rp2/CMakeLists.txt
@@ -105,6 +105,7 @@ set(MICROPY_SOURCE_PORT
     rp2_pio.c
     tusb_port.c
     uart.c
+    msc_disk.c
 )
 
 set(MICROPY_SOURCE_QSTR
diff --git a/ports/rp2/boards/PICO/mpconfigboard.h b/ports/rp2/boards/PICO/mpconfigboard.h
index e6623374d0b44..0bab214e208af 100644
--- a/ports/rp2/boards/PICO/mpconfigboard.h
+++ b/ports/rp2/boards/PICO/mpconfigboard.h
@@ -1,3 +1,6 @@
 // Board and hardware specific configuration
 #define MICROPY_HW_BOARD_NAME                   "Raspberry Pi Pico"
 #define MICROPY_HW_FLASH_STORAGE_BYTES          (1408 * 1024) 
+
+// Enable USB Mass Storage with FatFS filesystem.
+//#define MICROPY_HW_USB_MSC  (1)
diff --git a/ports/rp2/main.c b/ports/rp2/main.c
index 84f23af23c949..02bfb6dae25de 100644
--- a/ports/rp2/main.c
+++ b/ports/rp2/main.c
@@ -116,7 +116,11 @@ int main(int argc, char **argv) {
         #endif
 
         // Execute _boot.py to set up the filesystem.
+        #if MICROPY_VFS_FAT && MICROPY_HW_USB_MSC
+        pyexec_frozen_module("_boot_fat.py");
+        #else
         pyexec_frozen_module("_boot.py");
+        #endif
 
         // Execute user scripts.
         int ret = pyexec_file_if_exists("boot.py");
diff --git a/ports/rp2/modules/_boot_fat.py b/ports/rp2/modules/_boot_fat.py
new file mode 100644
index 0000000000000..02a2df9babee5
--- /dev/null
+++ b/ports/rp2/modules/_boot_fat.py
@@ -0,0 +1,15 @@
+import os
+import machine, rp2
+
+
+# Try to mount the filesystem, and format the flash if it doesn't exist.
+bdev = rp2.Flash()
+try:
+    vfs = os.VfsFat(bdev)
+    os.mount(vfs, "/")
+except:
+    os.VfsFat.mkfs(bdev)
+    vfs = os.VfsFat(bdev)
+os.mount(vfs, "/")
+
+del os, bdev, vfs
diff --git a/ports/rp2/mpconfigport.h b/ports/rp2/mpconfigport.h
index 1ff9d5b511ed1..9e839766ebe6d 100644
--- a/ports/rp2/mpconfigport.h
+++ b/ports/rp2/mpconfigport.h
@@ -30,8 +30,10 @@
 #include "hardware/spi.h"
 #include "hardware/sync.h"
 #include "pico/binary_info.h"
-
 #include "mpconfigboard.h"
+#if MICROPY_HW_USB_MSC
+#include "hardware/flash.h"
+#endif
 
 // Board and hardware specific configuration
 #define MICROPY_HW_MCU_NAME                     "RP2040"
@@ -107,10 +109,22 @@
 #define MICROPY_FATFS_ENABLE_LFN                (1)
 #define MICROPY_FATFS_LFN_CODE_PAGE             437 /* 1=SFN/ANSI 437=LFN/U.S.(OEM) */
 #define MICROPY_FATFS_RPATH                     (2)
+#if MICROPY_HW_USB_MSC
+#define MICROPY_FATFS_USE_LABEL                 (1)
+#define MICROPY_FATFS_MULTI_PARTITION           (1)
+// Set FatFS block size to flash sector size to avoid caching
+// the flash sector in memory to support smaller block sizes.
+#define MICROPY_FATFS_MAX_SS                    (FLASH_SECTOR_SIZE)
+#endif
 
+#if MICROPY_VFS_FAT && MICROPY_HW_USB_MSC
+#define mp_type_fileio mp_type_vfs_fat_fileio
+#define mp_type_textio mp_type_vfs_fat_textio
+#elif MICROPY_VFS_LFS2
 // Use VfsLfs2's types for fileio/textio
 #define mp_type_fileio mp_type_vfs_lfs2_fileio
 #define mp_type_textio mp_type_vfs_lfs2_textio
+#endif
 
 // Use VFS's functions for import stat and builtin open
 #define mp_import_stat mp_vfs_import_stat
diff --git a/ports/rp2/msc_disk.c b/ports/rp2/msc_disk.c
new file mode 100644
index 0000000000000..24bd51cec3f33
--- /dev/null
+++ b/ports/rp2/msc_disk.c
@@ -0,0 +1,127 @@
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020-2021 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ */
+#include "tusb.h"
+#if CFG_TUD_MSC
+#include "mpconfigboard.h"
+#include "hardware/flash.h"
+#include "hardware/sync.h"
+#include "pico/stdlib.h"
+
+// This implementation does Not support Flash sector caching.
+#if MICROPY_FATFS_MAX_SS != FLASH_SECTOR_SIZE
+#error MICROPY_FATFS_MAX_SS must be the same size as FLASH_SECTOR_SIZE
+#endif
+
+#define BLOCK_SIZE          (FLASH_SECTOR_SIZE)
+#define BLOCK_COUNT         (MICROPY_HW_FLASH_STORAGE_BYTES / BLOCK_SIZE)
+#define FLASH_BASE_ADDR     (PICO_FLASH_SIZE_BYTES - MICROPY_HW_FLASH_STORAGE_BYTES)
+#define FLASH_MMAP_ADDR     (XIP_BASE + FLASH_BASE_ADDR)
+
+static bool ejected = false;
+
+// Invoked when received SCSI_CMD_INQUIRY
+// Application fill vendor id, product id and revision with string up to 8, 16, 4 characters respectively
+void tud_msc_inquiry_cb(uint8_t lun, uint8_t vendor_id[8], uint8_t product_id[16], uint8_t product_rev[4]) {
+    const char vid[] = "Micropy";
+    const char pid[] = "Mass Storage";
+    const char rev[] = "1.0";
+
+    strncpy((char *)vendor_id,   vid, 8);
+    strncpy((char *)product_id,  pid, 16);
+    strncpy((char *)product_rev, rev, 4);
+}
+
+// Invoked when received Test Unit Ready command.
+// return true allowing host to read/write this LUN e.g SD card inserted
+bool tud_msc_test_unit_ready_cb(uint8_t lun) {
+    if (ejected) {
+        tud_msc_set_sense(lun, SCSI_SENSE_NOT_READY, 0x3a, 0x00);
+        return false;
+    }
+    return true;
+}
+
+// Invoked when received SCSI_CMD_READ_CAPACITY_10 and SCSI_CMD_READ_FORMAT_CAPACITY to determine the disk size
+// Application update block count and block size
+void tud_msc_capacity_cb(uint8_t lun, uint32_t *block_count, uint16_t *block_size) {
+    *block_size = BLOCK_SIZE;
+    *block_count = BLOCK_COUNT;
+}
+
+// Invoked when received Start Stop Unit command
+// - Start = 0 : stopped power mode, if load_eject = 1 : unload disk storage
+// - Start = 1 : active mode, if load_eject = 1 : load disk storage
+bool tud_msc_start_stop_cb(uint8_t lun, uint8_t power_condition, bool start, bool load_eject) {
+    if (load_eject) {
+        if (start) {
+            // load disk storage
+            ejected = false;
+        } else {
+            // unload disk storage
+            ejected = true;
+        }
+    }
+    return true;
+}
+
+// Callback invoked when received READ10 command.
+// Copy disk's data to buffer (up to bufsize) and return number of copied bytes.
+int32_t tud_msc_read10_cb(uint8_t lun, uint32_t lba, uint32_t offset, void *buffer, uint32_t bufsize) {
+    uint32_t count = bufsize / BLOCK_SIZE;
+    memcpy(buffer, (void *)(FLASH_MMAP_ADDR + lba * BLOCK_SIZE), count * BLOCK_SIZE);
+    return count * BLOCK_SIZE;
+}
+
+// Callback invoked when received WRITE10 command.
+// Process data in buffer to disk's storage and return number of written bytes
+int32_t tud_msc_write10_cb(uint8_t lun, uint32_t lba, uint32_t offset, uint8_t *buffer, uint32_t bufsize) {
+    uint32_t count = bufsize / BLOCK_SIZE;
+    uint32_t ints = save_and_disable_interrupts();
+    flash_range_erase(FLASH_BASE_ADDR + lba * BLOCK_SIZE, count * BLOCK_SIZE);
+    flash_range_program(FLASH_BASE_ADDR + lba * BLOCK_SIZE, buffer, count * BLOCK_SIZE);
+    restore_interrupts(ints);
+    return count * BLOCK_SIZE;
+}
+
+// Callback invoked when received an SCSI command not in built-in list below
+// - READ_CAPACITY10, READ_FORMAT_CAPACITY, INQUIRY, MODE_SENSE6, REQUEST_SENSE
+// - READ10 and WRITE10 has their own callbacks
+int32_t tud_msc_scsi_cb(uint8_t lun, uint8_t const scsi_cmd[16], void *buffer, uint16_t bufsize) {
+    int32_t resplen = 0;
+    switch (scsi_cmd[0]) {
+        case SCSI_CMD_PREVENT_ALLOW_MEDIUM_REMOVAL:
+            // Sync the logical unit if needed.
+            break;
+
+        default:
+            // Set Sense = Invalid Command Operation
+            tud_msc_set_sense(lun, SCSI_SENSE_ILLEGAL_REQUEST, 0x20, 0x00);
+            // negative means error -> tinyusb could stall and/or response with failed status
+            resplen = -1;
+            break;
+    }
+    return resplen;
+}
+#endif
diff --git a/ports/rp2/tusb_config.h b/ports/rp2/tusb_config.h
index 8c2a9f75601e2..ce321616a6bc3 100644
--- a/ports/rp2/tusb_config.h
+++ b/ports/rp2/tusb_config.h
@@ -25,6 +25,8 @@
 #ifndef MICROPY_INCLUDED_RP2_TUSB_CONFIG_H
 #define MICROPY_INCLUDED_RP2_TUSB_CONFIG_H
 
+#include "mpconfigport.h"
+
 #define CFG_TUSB_RHPORT0_MODE   (OPT_MODE_DEVICE)
 
 #define CFG_TUD_CDC             (1)
@@ -32,4 +34,11 @@
 #define CFG_TUD_CDC_RX_BUFSIZE  (256)
 #define CFG_TUD_CDC_TX_BUFSIZE  (256)
 
+#if MICROPY_HW_USB_MSC
+// Board and hardware specific configuration
+#define CFG_TUD_MSC             (1)
+// Set MSC EP buffer size to FatFS block size to avoid partial read/writes (offset arg).
+#define CFG_TUD_MSC_BUFSIZE     (MICROPY_FATFS_MAX_SS)
+#endif
+
 #endif // MICROPY_INCLUDED_RP2_TUSB_CONFIG_H
diff --git a/ports/rp2/tusb_port.c b/ports/rp2/tusb_port.c
index 8896be90774df..4aac08791e94e 100644
--- a/ports/rp2/tusb_port.c
+++ b/ports/rp2/tusb_port.c
@@ -34,11 +34,20 @@
 #define MICROPY_HW_USB_PID (0x0005) // RP2 MicroPython
 #endif
 
+#if CFG_TUD_MSC
+#define USBD_DESC_LEN (TUD_CONFIG_DESC_LEN + TUD_CDC_DESC_LEN + TUD_MSC_DESC_LEN)
+#else
 #define USBD_DESC_LEN (TUD_CONFIG_DESC_LEN + TUD_CDC_DESC_LEN)
+#endif
 #define USBD_MAX_POWER_MA (250)
 
 #define USBD_ITF_CDC (0) // needs 2 interfaces
+#define USBD_ITF_MSC (2)
+#if CFG_TUD_MSC
+#define USBD_ITF_MAX (3)
+#else
 #define USBD_ITF_MAX (2)
+#endif
 
 #define USBD_CDC_EP_CMD (0x81)
 #define USBD_CDC_EP_OUT (0x02)
@@ -46,11 +55,15 @@
 #define USBD_CDC_CMD_MAX_SIZE (8)
 #define USBD_CDC_IN_OUT_MAX_SIZE (64)
 
+#define EPNUM_MSC_OUT    (0x03)
+#define EPNUM_MSC_IN     (0x83)
+
 #define USBD_STR_0 (0x00)
 #define USBD_STR_MANUF (0x01)
 #define USBD_STR_PRODUCT (0x02)
 #define USBD_STR_SERIAL (0x03)
 #define USBD_STR_CDC (0x04)
+#define USBD_STR_MSC (0x05)
 
 // Note: descriptors returned from callbacks must exist long enough for transfer to complete
 
@@ -77,6 +90,9 @@ static const uint8_t usbd_desc_cfg[USBD_DESC_LEN] = {
 
     TUD_CDC_DESCRIPTOR(USBD_ITF_CDC, USBD_STR_CDC, USBD_CDC_EP_CMD,
         USBD_CDC_CMD_MAX_SIZE, USBD_CDC_EP_OUT, USBD_CDC_EP_IN, USBD_CDC_IN_OUT_MAX_SIZE),
+    #if CFG_TUD_MSC
+    TUD_MSC_DESCRIPTOR(USBD_ITF_MSC, 5, EPNUM_MSC_OUT, EPNUM_MSC_IN, 64),
+    #endif
 };
 
 static const char *const usbd_desc_str[] = {
@@ -84,6 +100,9 @@ static const char *const usbd_desc_str[] = {
     [USBD_STR_PRODUCT] = "Board in FS mode",
     [USBD_STR_SERIAL] = NULL, // generated dynamically
     [USBD_STR_CDC] = "Board CDC",
+    #if CFG_TUD_MSC
+    [USBD_STR_MSC] = "Board MSC",
+    #endif
 };
 
 const uint8_t *tud_descriptor_device_cb(void) {

From 926b554dafffa1e9bd80aa12fea5c621221c9d79 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 3 Mar 2022 17:59:30 +1100
Subject: [PATCH 1776/3533] extmod/moduos: Create general uos module to be used
 by all ports.

Based on the rp2 port version, with the rp2 port converted to use this
module.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/extmod.cmake         |   1 +
 extmod/moduos.c             | 134 ++++++++++++++++++++++++++++++++++++
 ports/esp32/mpconfigport.h  |   1 +
 ports/rp2/CMakeLists.txt    |   1 -
 ports/rp2/moduos.c          |  82 +---------------------
 ports/rp2/mpconfigport.h    |   4 +-
 ports/zephyr/moduos.c       |   4 +-
 ports/zephyr/mpconfigport.h |   4 +-
 py/builtin.h                |   1 +
 py/mpconfig.h               |   4 ++
 py/objmodule.c              |   3 +
 11 files changed, 152 insertions(+), 87 deletions(-)
 create mode 100644 extmod/moduos.c

diff --git a/extmod/extmod.cmake b/extmod/extmod.cmake
index 67f7d8fd39ed3..9c05237774b47 100644
--- a/extmod/extmod.cmake
+++ b/extmod/extmod.cmake
@@ -25,6 +25,7 @@ set(MICROPY_SOURCE_EXTMOD
     ${MICROPY_EXTMOD_DIR}/moduhashlib.c
     ${MICROPY_EXTMOD_DIR}/moduheapq.c
     ${MICROPY_EXTMOD_DIR}/modujson.c
+    ${MICROPY_EXTMOD_DIR}/moduos.c
     ${MICROPY_EXTMOD_DIR}/moduplatform.c
     ${MICROPY_EXTMOD_DIR}/modurandom.c
     ${MICROPY_EXTMOD_DIR}/modure.c
diff --git a/extmod/moduos.c b/extmod/moduos.c
new file mode 100644
index 0000000000000..6dcead0fc4160
--- /dev/null
+++ b/extmod/moduos.c
@@ -0,0 +1,134 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2016-2022 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "py/objstr.h"
+#include "py/runtime.h"
+
+#if MICROPY_PY_UOS
+
+#include "extmod/misc.h"
+#include "extmod/vfs.h"
+
+#if MICROPY_VFS_FAT
+#include "extmod/vfs_fat.h"
+#endif
+
+#if MICROPY_VFS_LFS1 || MICROPY_VFS_LFS2
+#include "extmod/vfs_lfs.h"
+#endif
+
+#if MICROPY_PY_UOS_UNAME
+#include "genhdr/mpversion.h"
+#endif
+
+#ifdef MICROPY_PY_UOS_INCLUDEFILE
+#include MICROPY_PY_UOS_INCLUDEFILE
+#endif
+
+#ifdef MICROPY_BUILD_TYPE
+#define MICROPY_BUILD_TYPE_PAREN " (" MICROPY_BUILD_TYPE ")"
+#else
+#define MICROPY_BUILD_TYPE_PAREN
+#endif
+
+STATIC const qstr mp_uos_uname_info_fields[] = {
+    MP_QSTR_sysname,
+    MP_QSTR_nodename,
+    MP_QSTR_release,
+    MP_QSTR_version,
+    MP_QSTR_machine
+};
+STATIC const MP_DEFINE_STR_OBJ(mp_uos_uname_info_sysname_obj, MICROPY_PY_SYS_PLATFORM);
+STATIC const MP_DEFINE_STR_OBJ(mp_uos_uname_info_nodename_obj, MICROPY_PY_SYS_PLATFORM);
+STATIC const MP_DEFINE_STR_OBJ(mp_uos_uname_info_release_obj, MICROPY_VERSION_STRING);
+STATIC const MP_DEFINE_STR_OBJ(mp_uos_uname_info_version_obj, MICROPY_GIT_TAG " on " MICROPY_BUILD_DATE MICROPY_BUILD_TYPE_PAREN);
+STATIC const MP_DEFINE_STR_OBJ(mp_uos_uname_info_machine_obj, MICROPY_HW_BOARD_NAME " with " MICROPY_HW_MCU_NAME);
+
+STATIC MP_DEFINE_ATTRTUPLE(
+    mp_uos_uname_info_obj,
+    mp_uos_uname_info_fields,
+    5,
+    MP_ROM_PTR(&mp_uos_uname_info_sysname_obj),
+    MP_ROM_PTR(&mp_uos_uname_info_nodename_obj),
+    MP_ROM_PTR(&mp_uos_uname_info_release_obj),
+    MP_ROM_PTR(&mp_uos_uname_info_version_obj),
+    MP_ROM_PTR(&mp_uos_uname_info_machine_obj)
+    );
+
+STATIC mp_obj_t mp_uos_uname(void) {
+    return MP_OBJ_FROM_PTR(&mp_uos_uname_info_obj);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(mp_uos_uname_obj, mp_uos_uname);
+
+STATIC const mp_rom_map_elem_t os_module_globals_table[] = {
+    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_uos) },
+
+    { MP_ROM_QSTR(MP_QSTR_uname), MP_ROM_PTR(&mp_uos_uname_obj) },
+    #if MICROPY_PY_UOS_URANDOM
+    { MP_ROM_QSTR(MP_QSTR_urandom), MP_ROM_PTR(&mp_uos_urandom_obj) },
+    #endif
+
+    #if MICROPY_VFS
+    { MP_ROM_QSTR(MP_QSTR_chdir), MP_ROM_PTR(&mp_vfs_chdir_obj) },
+    { MP_ROM_QSTR(MP_QSTR_getcwd), MP_ROM_PTR(&mp_vfs_getcwd_obj) },
+    { MP_ROM_QSTR(MP_QSTR_listdir), MP_ROM_PTR(&mp_vfs_listdir_obj) },
+    { MP_ROM_QSTR(MP_QSTR_mkdir), MP_ROM_PTR(&mp_vfs_mkdir_obj) },
+    { MP_ROM_QSTR(MP_QSTR_remove), MP_ROM_PTR(&mp_vfs_remove_obj) },
+    { MP_ROM_QSTR(MP_QSTR_rename), MP_ROM_PTR(&mp_vfs_rename_obj) },
+    { MP_ROM_QSTR(MP_QSTR_rmdir), MP_ROM_PTR(&mp_vfs_rmdir_obj) },
+    { MP_ROM_QSTR(MP_QSTR_stat), MP_ROM_PTR(&mp_vfs_stat_obj) },
+    { MP_ROM_QSTR(MP_QSTR_statvfs), MP_ROM_PTR(&mp_vfs_statvfs_obj) },
+    #endif
+
+    // The following are MicroPython extensions.
+
+    #if MICROPY_PY_OS_DUPTERM
+    { MP_ROM_QSTR(MP_QSTR_dupterm), MP_ROM_PTR(&mp_uos_dupterm_obj) },
+    #endif
+
+    #if MICROPY_VFS
+    { MP_ROM_QSTR(MP_QSTR_ilistdir), MP_ROM_PTR(&mp_vfs_ilistdir_obj) },
+    { MP_ROM_QSTR(MP_QSTR_mount), MP_ROM_PTR(&mp_vfs_mount_obj) },
+    { MP_ROM_QSTR(MP_QSTR_umount), MP_ROM_PTR(&mp_vfs_umount_obj) },
+    #if MICROPY_VFS_FAT
+    { MP_ROM_QSTR(MP_QSTR_VfsFat), MP_ROM_PTR(&mp_fat_vfs_type) },
+    #endif
+    #if MICROPY_VFS_LFS1
+    { MP_ROM_QSTR(MP_QSTR_VfsLfs1), MP_ROM_PTR(&mp_type_vfs_lfs1) },
+    #endif
+    #if MICROPY_VFS_LFS2
+    { MP_ROM_QSTR(MP_QSTR_VfsLfs2), MP_ROM_PTR(&mp_type_vfs_lfs2) },
+    #endif
+    #endif
+};
+STATIC MP_DEFINE_CONST_DICT(os_module_globals, os_module_globals_table);
+
+const mp_obj_module_t mp_module_uos = {
+    .base = { &mp_type_module },
+    .globals = (mp_obj_dict_t *)&os_module_globals,
+};
+
+#endif // MICROPY_PY_UOS
diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h
index d4f542f668922..c820e526a28c2 100644
--- a/ports/esp32/mpconfigport.h
+++ b/ports/esp32/mpconfigport.h
@@ -72,6 +72,7 @@
 #define MICROPY_PY_UHASHLIB_SHA256          (1)
 #define MICROPY_PY_UCRYPTOLIB               (1)
 #define MICROPY_PY_URANDOM_SEED_INIT_FUNC   (esp_random())
+#define MICROPY_PY_UOS                      (0)
 #define MICROPY_PY_OS_DUPTERM               (1)
 #define MICROPY_PY_MACHINE                  (1)
 #define MICROPY_PY_MACHINE_PIN_MAKE_NEW     mp_pin_make_new
diff --git a/ports/rp2/CMakeLists.txt b/ports/rp2/CMakeLists.txt
index a428b0c39b76e..0ceb03967516e 100644
--- a/ports/rp2/CMakeLists.txt
+++ b/ports/rp2/CMakeLists.txt
@@ -97,7 +97,6 @@ set(MICROPY_SOURCE_PORT
     main.c
     modmachine.c
     modrp2.c
-    moduos.c
     modutime.c
     mphalport.c
     mpthreadport.c
diff --git a/ports/rp2/moduos.c b/ports/rp2/moduos.c
index a9dc30df89303..6288ff5696e4f 100644
--- a/ports/rp2/moduos.c
+++ b/ports/rp2/moduos.c
@@ -24,43 +24,11 @@
  * THE SOFTWARE.
  */
 
-#include "py/objstr.h"
 #include "py/runtime.h"
-#include "extmod/misc.h"
-#include "extmod/vfs.h"
-#include "extmod/vfs_fat.h"
-#include "extmod/vfs_lfs.h"
-#include "genhdr/mpversion.h"
 
 uint8_t rosc_random_u8(size_t cycles);
 
-STATIC const qstr os_uname_info_fields[] = {
-    MP_QSTR_sysname, MP_QSTR_nodename,
-    MP_QSTR_release, MP_QSTR_version, MP_QSTR_machine
-};
-STATIC const MP_DEFINE_STR_OBJ(os_uname_info_sysname_obj, MICROPY_PY_SYS_PLATFORM);
-STATIC const MP_DEFINE_STR_OBJ(os_uname_info_nodename_obj, MICROPY_PY_SYS_PLATFORM);
-STATIC const MP_DEFINE_STR_OBJ(os_uname_info_release_obj, MICROPY_VERSION_STRING);
-STATIC const MP_DEFINE_STR_OBJ(os_uname_info_version_obj, MICROPY_GIT_TAG " on " MICROPY_BUILD_DATE " (" MICROPY_BUILD_TYPE ")");
-STATIC const MP_DEFINE_STR_OBJ(os_uname_info_machine_obj, MICROPY_HW_BOARD_NAME " with " MICROPY_HW_MCU_NAME);
-
-STATIC MP_DEFINE_ATTRTUPLE(
-    os_uname_info_obj,
-    os_uname_info_fields,
-    5,
-    (mp_obj_t)&os_uname_info_sysname_obj,
-    (mp_obj_t)&os_uname_info_nodename_obj,
-    (mp_obj_t)&os_uname_info_release_obj,
-    (mp_obj_t)&os_uname_info_version_obj,
-    (mp_obj_t)&os_uname_info_machine_obj
-    );
-
-STATIC mp_obj_t os_uname(void) {
-    return (mp_obj_t)&os_uname_info_obj;
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(os_uname_obj, os_uname);
-
-STATIC mp_obj_t os_urandom(mp_obj_t num) {
+STATIC mp_obj_t mp_uos_urandom(mp_obj_t num) {
     mp_int_t n = mp_obj_get_int(num);
     vstr_t vstr;
     vstr_init_len(&vstr, n);
@@ -69,50 +37,4 @@ STATIC mp_obj_t os_urandom(mp_obj_t num) {
     }
     return mp_obj_new_str_from_vstr(&mp_type_bytes, &vstr);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(os_urandom_obj, os_urandom);
-
-STATIC const mp_rom_map_elem_t os_module_globals_table[] = {
-    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_uos) },
-
-    { MP_ROM_QSTR(MP_QSTR_uname), MP_ROM_PTR(&os_uname_obj) },
-    { MP_ROM_QSTR(MP_QSTR_urandom), MP_ROM_PTR(&os_urandom_obj) },
-
-    #if MICROPY_VFS
-    { MP_ROM_QSTR(MP_QSTR_chdir), MP_ROM_PTR(&mp_vfs_chdir_obj) },
-    { MP_ROM_QSTR(MP_QSTR_getcwd), MP_ROM_PTR(&mp_vfs_getcwd_obj) },
-    { MP_ROM_QSTR(MP_QSTR_listdir), MP_ROM_PTR(&mp_vfs_listdir_obj) },
-    { MP_ROM_QSTR(MP_QSTR_mkdir), MP_ROM_PTR(&mp_vfs_mkdir_obj) },
-    { MP_ROM_QSTR(MP_QSTR_remove), MP_ROM_PTR(&mp_vfs_remove_obj) },
-    { MP_ROM_QSTR(MP_QSTR_rename), MP_ROM_PTR(&mp_vfs_rename_obj) },
-    { MP_ROM_QSTR(MP_QSTR_rmdir), MP_ROM_PTR(&mp_vfs_rmdir_obj) },
-    { MP_ROM_QSTR(MP_QSTR_stat), MP_ROM_PTR(&mp_vfs_stat_obj) },
-    { MP_ROM_QSTR(MP_QSTR_statvfs), MP_ROM_PTR(&mp_vfs_statvfs_obj) },
-    #endif
-
-    // The following are MicroPython extensions.
-
-    #if MICROPY_PY_OS_DUPTERM
-    { MP_ROM_QSTR(MP_QSTR_dupterm), MP_ROM_PTR(&mp_uos_dupterm_obj) },
-    #endif
-
-    #if MICROPY_VFS
-    { MP_ROM_QSTR(MP_QSTR_ilistdir), MP_ROM_PTR(&mp_vfs_ilistdir_obj) },
-    { MP_ROM_QSTR(MP_QSTR_mount), MP_ROM_PTR(&mp_vfs_mount_obj) },
-    { MP_ROM_QSTR(MP_QSTR_umount), MP_ROM_PTR(&mp_vfs_umount_obj) },
-    #if MICROPY_VFS_FAT
-    { MP_ROM_QSTR(MP_QSTR_VfsFat), MP_ROM_PTR(&mp_fat_vfs_type) },
-    #endif
-    #if MICROPY_VFS_LFS1
-    { MP_ROM_QSTR(MP_QSTR_VfsLfs1), MP_ROM_PTR(&mp_type_vfs_lfs1) },
-    #endif
-    #if MICROPY_VFS_LFS2
-    { MP_ROM_QSTR(MP_QSTR_VfsLfs2), MP_ROM_PTR(&mp_type_vfs_lfs2) },
-    #endif
-    #endif
-};
-STATIC MP_DEFINE_CONST_DICT(os_module_globals, os_module_globals_table);
-
-const mp_obj_module_t mp_module_uos = {
-    .base = { &mp_type_module },
-    .globals = (mp_obj_dict_t *)&os_module_globals,
-};
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_uos_urandom_obj, mp_uos_urandom);
diff --git a/ports/rp2/mpconfigport.h b/ports/rp2/mpconfigport.h
index 9e839766ebe6d..5e78018ea3f82 100644
--- a/ports/rp2/mpconfigport.h
+++ b/ports/rp2/mpconfigport.h
@@ -83,6 +83,8 @@
 
 // Extended modules
 #define MICROPY_EPOCH_IS_1970                   (1)
+#define MICROPY_PY_UOS_INCLUDEFILE              "ports/rp2/moduos.c"
+#define MICROPY_PY_UOS_URANDOM                  (1)
 #define MICROPY_PY_URE_MATCH_GROUPS             (1)
 #define MICROPY_PY_URE_MATCH_SPAN_START_END     (1)
 #define MICROPY_PY_UTIME_MP_HAL                 (1)
@@ -138,7 +140,6 @@
 extern const struct _mp_obj_module_t mp_module_network;
 extern const struct _mp_obj_module_t mp_module_onewire;
 extern const struct _mp_obj_module_t mp_module_rp2;
-extern const struct _mp_obj_module_t mp_module_uos;
 extern const struct _mp_obj_module_t mp_module_usocket;
 extern const struct _mp_obj_module_t mp_module_utime;
 
@@ -186,7 +187,6 @@ extern const struct _mod_network_nic_type_t mod_network_nic_type_nina;
 #define MICROPY_PORT_BUILTIN_MODULES \
     { MP_OBJ_NEW_QSTR(MP_QSTR__onewire), (mp_obj_t)&mp_module_onewire }, \
     { MP_OBJ_NEW_QSTR(MP_QSTR__rp2), (mp_obj_t)&mp_module_rp2 }, \
-    { MP_ROM_QSTR(MP_QSTR_uos), MP_ROM_PTR(&mp_module_uos) }, \
     { MP_ROM_QSTR(MP_QSTR_utime), MP_ROM_PTR(&mp_module_utime) }, \
     SOCKET_BUILTIN_MODULE \
     NETWORK_BUILTIN_MODULE \
diff --git a/ports/zephyr/moduos.c b/ports/zephyr/moduos.c
index 49d5744af4285..4d1eeb667efee 100644
--- a/ports/zephyr/moduos.c
+++ b/ports/zephyr/moduos.c
@@ -36,7 +36,7 @@
 #include "extmod/vfs_lfs.h"
 #endif
 
-#if MICROPY_PY_UOS
+#if MICROPY_PY_UOS_ZEPHYR
 
 STATIC const mp_rom_map_elem_t uos_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_uos) },
@@ -72,4 +72,4 @@ const mp_obj_module_t mp_module_uos = {
     .globals = (mp_obj_dict_t *)&uos_module_globals,
 };
 
-#endif // MICROPY_PY_UOS
+#endif // MICROPY_PY_UOS_ZEPHYR
diff --git a/ports/zephyr/mpconfigport.h b/ports/zephyr/mpconfigport.h
index b8e25faefd869..fe124bace0d15 100644
--- a/ports/zephyr/mpconfigport.h
+++ b/ports/zephyr/mpconfigport.h
@@ -83,7 +83,7 @@
 #endif
 #define MICROPY_PY_UBINASCII        (1)
 #define MICROPY_PY_UHASHLIB         (1)
-#define MICROPY_PY_UOS              (1)
+#define MICROPY_PY_UOS_ZEPHYR       (1)
 #define MICROPY_PY_UTIME            (1)
 #define MICROPY_PY_UTIME_MP_HAL     (1)
 #define MICROPY_PY_ZEPHYR           (1)
@@ -144,7 +144,7 @@ extern const struct _mp_obj_module_t mp_module_usocket;
 extern const struct _mp_obj_module_t mp_module_zephyr;
 extern const struct _mp_obj_module_t mp_module_zsensor;
 
-#if MICROPY_PY_UOS
+#if MICROPY_PY_UOS_ZEPHYR
 #define MICROPY_PY_UOS_DEF { MP_ROM_QSTR(MP_QSTR_uos), MP_ROM_PTR(&mp_module_uos) },
 #else
 #define MICROPY_PY_UOS_DEF
diff --git a/py/builtin.h b/py/builtin.h
index 8639e978ffd17..162fed77cc0e7 100644
--- a/py/builtin.h
+++ b/py/builtin.h
@@ -108,6 +108,7 @@ extern const mp_obj_module_t mp_module_uerrno;
 extern const mp_obj_module_t mp_module_uctypes;
 extern const mp_obj_module_t mp_module_uzlib;
 extern const mp_obj_module_t mp_module_ujson;
+extern const mp_obj_module_t mp_module_uos;
 extern const mp_obj_module_t mp_module_ure;
 extern const mp_obj_module_t mp_module_uheapq;
 extern const mp_obj_module_t mp_module_uhashlib;
diff --git a/py/mpconfig.h b/py/mpconfig.h
index 5edff69dfda24..8f9f0f02fb420 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -1455,6 +1455,10 @@ typedef double mp_float_t;
 #define MICROPY_PY_UJSON_SEPARATORS (1)
 #endif
 
+#ifndef MICROPY_PY_UOS
+#define MICROPY_PY_UOS (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
+#endif
+
 #ifndef MICROPY_PY_URE
 #define MICROPY_PY_URE (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
 #endif
diff --git a/py/objmodule.c b/py/objmodule.c
index 4b04f7ca9cfd7..f7cd437bacf9d 100644
--- a/py/objmodule.c
+++ b/py/objmodule.c
@@ -190,6 +190,9 @@ STATIC const mp_rom_map_elem_t mp_builtin_module_table[] = {
     #if MICROPY_PY_UJSON
     { MP_ROM_QSTR(MP_QSTR_ujson), MP_ROM_PTR(&mp_module_ujson) },
     #endif
+    #if MICROPY_PY_UOS
+    { MP_ROM_QSTR(MP_QSTR_uos), MP_ROM_PTR(&mp_module_uos) },
+    #endif
     #if MICROPY_PY_URE
     { MP_ROM_QSTR(MP_QSTR_ure), MP_ROM_PTR(&mp_module_ure) },
     #endif

From 1c53d85162007750d0708cf665a8bb7c062053be Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 3 Mar 2022 19:09:01 +1100
Subject: [PATCH 1777/3533] esp32/moduos: Convert module to use extmod version.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/moduos.c                 |  3 ++
 ports/esp32/main/CMakeLists.txt |  1 -
 ports/esp32/moduos.c            | 86 ++-------------------------------
 ports/esp32/mpconfigport.h      |  6 +--
 4 files changed, 11 insertions(+), 85 deletions(-)

diff --git a/extmod/moduos.c b/extmod/moduos.c
index 6dcead0fc4160..87e2fcc703196 100644
--- a/extmod/moduos.c
+++ b/extmod/moduos.c
@@ -108,6 +108,9 @@ STATIC const mp_rom_map_elem_t os_module_globals_table[] = {
     #if MICROPY_PY_OS_DUPTERM
     { MP_ROM_QSTR(MP_QSTR_dupterm), MP_ROM_PTR(&mp_uos_dupterm_obj) },
     #endif
+    #if MICROPY_PY_UOS_DUPTERM_NOTIFY
+    { MP_ROM_QSTR(MP_QSTR_dupterm_notify), MP_ROM_PTR(&mp_uos_dupterm_notify_obj) },
+    #endif
 
     #if MICROPY_VFS
     { MP_ROM_QSTR(MP_QSTR_ilistdir), MP_ROM_PTR(&mp_vfs_ilistdir_obj) },
diff --git a/ports/esp32/main/CMakeLists.txt b/ports/esp32/main/CMakeLists.txt
index c86ac4dadfaf0..ab333c329024c 100644
--- a/ports/esp32/main/CMakeLists.txt
+++ b/ports/esp32/main/CMakeLists.txt
@@ -53,7 +53,6 @@ set(MICROPY_SOURCE_PORT
     ${PROJECT_DIR}/fatfs_port.c
     ${PROJECT_DIR}/help.c
     ${PROJECT_DIR}/modutime.c
-    ${PROJECT_DIR}/moduos.c
     ${PROJECT_DIR}/machine_bitstream.c
     ${PROJECT_DIR}/machine_timer.c
     ${PROJECT_DIR}/machine_pin.c
diff --git a/ports/esp32/moduos.c b/ports/esp32/moduos.c
index 50c0d7ea5c716..f307a9ffe05b1 100644
--- a/ports/esp32/moduos.c
+++ b/ports/esp32/moduos.c
@@ -27,49 +27,13 @@
  * THE SOFTWARE.
  */
 
-#include <string.h>
-
 #include "esp_system.h"
 
-#include "py/objstr.h"
 #include "py/runtime.h"
-#include "py/mperrno.h"
 #include "py/mphal.h"
 #include "extmod/misc.h"
-#include "extmod/vfs.h"
-#include "extmod/vfs_fat.h"
-#include "extmod/vfs_lfs.h"
-#include "genhdr/mpversion.h"
-
-extern const mp_obj_type_t mp_fat_vfs_type;
-
-STATIC const qstr os_uname_info_fields[] = {
-    MP_QSTR_sysname, MP_QSTR_nodename,
-    MP_QSTR_release, MP_QSTR_version, MP_QSTR_machine
-};
-STATIC const MP_DEFINE_STR_OBJ(os_uname_info_sysname_obj, MICROPY_PY_SYS_PLATFORM);
-STATIC const MP_DEFINE_STR_OBJ(os_uname_info_nodename_obj, MICROPY_PY_SYS_PLATFORM);
-STATIC const MP_DEFINE_STR_OBJ(os_uname_info_release_obj, MICROPY_VERSION_STRING);
-STATIC const MP_DEFINE_STR_OBJ(os_uname_info_version_obj, MICROPY_GIT_TAG " on " MICROPY_BUILD_DATE);
-STATIC const MP_DEFINE_STR_OBJ(os_uname_info_machine_obj, MICROPY_HW_BOARD_NAME " with " MICROPY_HW_MCU_NAME);
 
-STATIC MP_DEFINE_ATTRTUPLE(
-    os_uname_info_obj,
-    os_uname_info_fields,
-    5,
-    (mp_obj_t)&os_uname_info_sysname_obj,
-    (mp_obj_t)&os_uname_info_nodename_obj,
-    (mp_obj_t)&os_uname_info_release_obj,
-    (mp_obj_t)&os_uname_info_version_obj,
-    (mp_obj_t)&os_uname_info_machine_obj
-    );
-
-STATIC mp_obj_t os_uname(void) {
-    return (mp_obj_t)&os_uname_info_obj;
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(os_uname_obj, os_uname);
-
-STATIC mp_obj_t os_urandom(mp_obj_t num) {
+STATIC mp_obj_t mp_uos_urandom(mp_obj_t num) {
     mp_int_t n = mp_obj_get_int(num);
     vstr_t vstr;
     vstr_init_len(&vstr, n);
@@ -83,10 +47,10 @@ STATIC mp_obj_t os_urandom(mp_obj_t num) {
     }
     return mp_obj_new_str_from_vstr(&mp_type_bytes, &vstr);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(os_urandom_obj, os_urandom);
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_uos_urandom_obj, mp_uos_urandom);
 
-#if MICROPY_PY_OS_DUPTERM
-STATIC mp_obj_t os_dupterm_notify(mp_obj_t obj_in) {
+#if MICROPY_PY_UOS_DUPTERM_NOTIFY
+STATIC mp_obj_t mp_uos_dupterm_notify(mp_obj_t obj_in) {
     (void)obj_in;
     for (;;) {
         int c = mp_uos_dupterm_rx_chr();
@@ -97,45 +61,5 @@ STATIC mp_obj_t os_dupterm_notify(mp_obj_t obj_in) {
     }
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(os_dupterm_notify_obj, os_dupterm_notify);
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_uos_dupterm_notify_obj, mp_uos_dupterm_notify);
 #endif
-
-STATIC const mp_rom_map_elem_t os_module_globals_table[] = {
-    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_uos) },
-    { MP_ROM_QSTR(MP_QSTR_uname), MP_ROM_PTR(&os_uname_obj) },
-    { MP_ROM_QSTR(MP_QSTR_urandom), MP_ROM_PTR(&os_urandom_obj) },
-    #if MICROPY_PY_OS_DUPTERM
-    { MP_ROM_QSTR(MP_QSTR_dupterm), MP_ROM_PTR(&mp_uos_dupterm_obj) },
-    { MP_ROM_QSTR(MP_QSTR_dupterm_notify), MP_ROM_PTR(&os_dupterm_notify_obj) },
-    #endif
-    #if MICROPY_VFS
-    { MP_ROM_QSTR(MP_QSTR_ilistdir), MP_ROM_PTR(&mp_vfs_ilistdir_obj) },
-    { MP_ROM_QSTR(MP_QSTR_listdir), MP_ROM_PTR(&mp_vfs_listdir_obj) },
-    { MP_ROM_QSTR(MP_QSTR_mkdir), MP_ROM_PTR(&mp_vfs_mkdir_obj) },
-    { MP_ROM_QSTR(MP_QSTR_rmdir), MP_ROM_PTR(&mp_vfs_rmdir_obj) },
-    { MP_ROM_QSTR(MP_QSTR_chdir), MP_ROM_PTR(&mp_vfs_chdir_obj) },
-    { MP_ROM_QSTR(MP_QSTR_getcwd), MP_ROM_PTR(&mp_vfs_getcwd_obj) },
-    { MP_ROM_QSTR(MP_QSTR_remove), MP_ROM_PTR(&mp_vfs_remove_obj) },
-    { MP_ROM_QSTR(MP_QSTR_rename), MP_ROM_PTR(&mp_vfs_rename_obj) },
-    { MP_ROM_QSTR(MP_QSTR_stat), MP_ROM_PTR(&mp_vfs_stat_obj) },
-    { MP_ROM_QSTR(MP_QSTR_statvfs), MP_ROM_PTR(&mp_vfs_statvfs_obj) },
-    { MP_ROM_QSTR(MP_QSTR_mount), MP_ROM_PTR(&mp_vfs_mount_obj) },
-    { MP_ROM_QSTR(MP_QSTR_umount), MP_ROM_PTR(&mp_vfs_umount_obj) },
-    #if MICROPY_VFS_FAT
-    { MP_ROM_QSTR(MP_QSTR_VfsFat), MP_ROM_PTR(&mp_fat_vfs_type) },
-    #endif
-    #if MICROPY_VFS_LFS1
-    { MP_ROM_QSTR(MP_QSTR_VfsLfs1), MP_ROM_PTR(&mp_type_vfs_lfs1) },
-    #endif
-    #if MICROPY_VFS_LFS2
-    { MP_ROM_QSTR(MP_QSTR_VfsLfs2), MP_ROM_PTR(&mp_type_vfs_lfs2) },
-    #endif
-    #endif
-};
-
-STATIC MP_DEFINE_CONST_DICT(os_module_globals, os_module_globals_table);
-
-const mp_obj_module_t uos_module = {
-    .base = { &mp_type_module },
-    .globals = (mp_obj_dict_t *)&os_module_globals,
-};
diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h
index c820e526a28c2..e06ee94d524cf 100644
--- a/ports/esp32/mpconfigport.h
+++ b/ports/esp32/mpconfigport.h
@@ -72,8 +72,10 @@
 #define MICROPY_PY_UHASHLIB_SHA256          (1)
 #define MICROPY_PY_UCRYPTOLIB               (1)
 #define MICROPY_PY_URANDOM_SEED_INIT_FUNC   (esp_random())
-#define MICROPY_PY_UOS                      (0)
+#define MICROPY_PY_UOS_INCLUDEFILE          "ports/esp32/moduos.c"
 #define MICROPY_PY_OS_DUPTERM               (1)
+#define MICROPY_PY_UOS_DUPTERM_NOTIFY       (1)
+#define MICROPY_PY_UOS_URANDOM              (1)
 #define MICROPY_PY_MACHINE                  (1)
 #define MICROPY_PY_MACHINE_PIN_MAKE_NEW     mp_pin_make_new
 #define MICROPY_PY_MACHINE_BITSTREAM        (1)
@@ -137,7 +139,6 @@
 extern const struct _mp_obj_module_t esp_module;
 extern const struct _mp_obj_module_t esp32_module;
 extern const struct _mp_obj_module_t utime_module;
-extern const struct _mp_obj_module_t uos_module;
 extern const struct _mp_obj_module_t mp_module_usocket;
 extern const struct _mp_obj_module_t mp_module_network;
 extern const struct _mp_obj_module_t mp_module_onewire;
@@ -146,7 +147,6 @@ extern const struct _mp_obj_module_t mp_module_onewire;
     { MP_OBJ_NEW_QSTR(MP_QSTR_esp), (mp_obj_t)&esp_module }, \
     { MP_OBJ_NEW_QSTR(MP_QSTR_esp32), (mp_obj_t)&esp32_module }, \
     { MP_OBJ_NEW_QSTR(MP_QSTR_utime), (mp_obj_t)&utime_module }, \
-    { MP_OBJ_NEW_QSTR(MP_QSTR_uos), (mp_obj_t)&uos_module }, \
     { MP_OBJ_NEW_QSTR(MP_QSTR_usocket), (mp_obj_t)&mp_module_usocket }, \
     { MP_OBJ_NEW_QSTR(MP_QSTR_network), (mp_obj_t)&mp_module_network }, \
     { MP_OBJ_NEW_QSTR(MP_QSTR__onewire), (mp_obj_t)&mp_module_onewire }, \

From 818be10bb557b6a8b975b414dd26d09dd50a7760 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 3 Mar 2022 19:17:12 +1100
Subject: [PATCH 1778/3533] zephyr/moduos: Convert module to use extmod
 version.

This also adds uos.unlink(), for all ports that use extmod/moduos.c.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/moduos.c             |  5 +++
 ports/esp32/mpconfigport.h  |  1 +
 ports/rp2/mpconfigport.h    |  1 +
 ports/zephyr/CMakeLists.txt |  1 -
 ports/zephyr/moduos.c       | 75 -------------------------------------
 ports/zephyr/mpconfigport.h | 10 +----
 6 files changed, 8 insertions(+), 85 deletions(-)
 delete mode 100644 ports/zephyr/moduos.c

diff --git a/extmod/moduos.c b/extmod/moduos.c
index 87e2fcc703196..0378d50302d51 100644
--- a/extmod/moduos.c
+++ b/extmod/moduos.c
@@ -54,6 +54,7 @@
 #define MICROPY_BUILD_TYPE_PAREN
 #endif
 
+#if MICROPY_PY_UOS_UNAME
 STATIC const qstr mp_uos_uname_info_fields[] = {
     MP_QSTR_sysname,
     MP_QSTR_nodename,
@@ -82,11 +83,14 @@ STATIC mp_obj_t mp_uos_uname(void) {
     return MP_OBJ_FROM_PTR(&mp_uos_uname_info_obj);
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_0(mp_uos_uname_obj, mp_uos_uname);
+#endif
 
 STATIC const mp_rom_map_elem_t os_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_uos) },
 
+    #if MICROPY_PY_UOS_UNAME
     { MP_ROM_QSTR(MP_QSTR_uname), MP_ROM_PTR(&mp_uos_uname_obj) },
+    #endif
     #if MICROPY_PY_UOS_URANDOM
     { MP_ROM_QSTR(MP_QSTR_urandom), MP_ROM_PTR(&mp_uos_urandom_obj) },
     #endif
@@ -101,6 +105,7 @@ STATIC const mp_rom_map_elem_t os_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_rmdir), MP_ROM_PTR(&mp_vfs_rmdir_obj) },
     { MP_ROM_QSTR(MP_QSTR_stat), MP_ROM_PTR(&mp_vfs_stat_obj) },
     { MP_ROM_QSTR(MP_QSTR_statvfs), MP_ROM_PTR(&mp_vfs_statvfs_obj) },
+    { MP_ROM_QSTR(MP_QSTR_unlink), MP_ROM_PTR(&mp_vfs_remove_obj) }, // unlink aliases to remove
     #endif
 
     // The following are MicroPython extensions.
diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h
index e06ee94d524cf..ffc155360a847 100644
--- a/ports/esp32/mpconfigport.h
+++ b/ports/esp32/mpconfigport.h
@@ -75,6 +75,7 @@
 #define MICROPY_PY_UOS_INCLUDEFILE          "ports/esp32/moduos.c"
 #define MICROPY_PY_OS_DUPTERM               (1)
 #define MICROPY_PY_UOS_DUPTERM_NOTIFY       (1)
+#define MICROPY_PY_UOS_UNAME                (1)
 #define MICROPY_PY_UOS_URANDOM              (1)
 #define MICROPY_PY_MACHINE                  (1)
 #define MICROPY_PY_MACHINE_PIN_MAKE_NEW     mp_pin_make_new
diff --git a/ports/rp2/mpconfigport.h b/ports/rp2/mpconfigport.h
index 5e78018ea3f82..1fb0211e888c4 100644
--- a/ports/rp2/mpconfigport.h
+++ b/ports/rp2/mpconfigport.h
@@ -84,6 +84,7 @@
 // Extended modules
 #define MICROPY_EPOCH_IS_1970                   (1)
 #define MICROPY_PY_UOS_INCLUDEFILE              "ports/rp2/moduos.c"
+#define MICROPY_PY_UOS_UNAME                    (1)
 #define MICROPY_PY_UOS_URANDOM                  (1)
 #define MICROPY_PY_URE_MATCH_GROUPS             (1)
 #define MICROPY_PY_URE_MATCH_SPAN_START_END     (1)
diff --git a/ports/zephyr/CMakeLists.txt b/ports/zephyr/CMakeLists.txt
index d809b7007d313..bd5068faf3bef 100644
--- a/ports/zephyr/CMakeLists.txt
+++ b/ports/zephyr/CMakeLists.txt
@@ -43,7 +43,6 @@ set(MICROPY_SOURCE_PORT
     machine_uart.c
     modbluetooth_zephyr.c
     modmachine.c
-    moduos.c
     modusocket.c
     modutime.c
     modzephyr.c
diff --git a/ports/zephyr/moduos.c b/ports/zephyr/moduos.c
deleted file mode 100644
index 4d1eeb667efee..0000000000000
--- a/ports/zephyr/moduos.c
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2019 NXP
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#include "py/obj.h"
-
-#include "extmod/vfs.h"
-
-#if MICROPY_VFS_FAT
-#include "extmod/vfs_fat.h"
-#endif
-
-#if MICROPY_VFS_LFS1 || MICROPY_VFS_LFS2
-#include "extmod/vfs_lfs.h"
-#endif
-
-#if MICROPY_PY_UOS_ZEPHYR
-
-STATIC const mp_rom_map_elem_t uos_module_globals_table[] = {
-    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_uos) },
-    #if MICROPY_VFS
-    { MP_ROM_QSTR(MP_QSTR_chdir), MP_ROM_PTR(&mp_vfs_chdir_obj) },
-    { MP_ROM_QSTR(MP_QSTR_getcwd), MP_ROM_PTR(&mp_vfs_getcwd_obj) },
-    { MP_ROM_QSTR(MP_QSTR_ilistdir), MP_ROM_PTR(&mp_vfs_ilistdir_obj) },
-    { MP_ROM_QSTR(MP_QSTR_listdir), MP_ROM_PTR(&mp_vfs_listdir_obj) },
-    { MP_ROM_QSTR(MP_QSTR_mkdir), MP_ROM_PTR(&mp_vfs_mkdir_obj) },
-    { MP_ROM_QSTR(MP_QSTR_remove), MP_ROM_PTR(&mp_vfs_remove_obj) },
-    { MP_ROM_QSTR(MP_QSTR_rename),MP_ROM_PTR(&mp_vfs_rename_obj)},
-    { MP_ROM_QSTR(MP_QSTR_rmdir), MP_ROM_PTR(&mp_vfs_rmdir_obj) },
-    { MP_ROM_QSTR(MP_QSTR_stat), MP_ROM_PTR(&mp_vfs_stat_obj) },
-    { MP_ROM_QSTR(MP_QSTR_statvfs), MP_ROM_PTR(&mp_vfs_statvfs_obj) },
-    { MP_ROM_QSTR(MP_QSTR_unlink), MP_ROM_PTR(&mp_vfs_remove_obj) },
-    { MP_ROM_QSTR(MP_QSTR_mount), MP_ROM_PTR(&mp_vfs_mount_obj) },
-    { MP_ROM_QSTR(MP_QSTR_umount), MP_ROM_PTR(&mp_vfs_umount_obj) },
-    #endif
-    #if MICROPY_VFS_FAT
-    { MP_ROM_QSTR(MP_QSTR_VfsFat), MP_ROM_PTR(&mp_fat_vfs_type) },
-    #endif
-    #if MICROPY_VFS_LFS1
-    { MP_ROM_QSTR(MP_QSTR_VfsLfs1), MP_ROM_PTR(&mp_type_vfs_lfs1) },
-    #endif
-    #if MICROPY_VFS_LFS2
-    { MP_ROM_QSTR(MP_QSTR_VfsLfs2), MP_ROM_PTR(&mp_type_vfs_lfs2) },
-    #endif
-};
-STATIC MP_DEFINE_CONST_DICT(uos_module_globals, uos_module_globals_table);
-
-const mp_obj_module_t mp_module_uos = {
-    .base = { &mp_type_module },
-    .globals = (mp_obj_dict_t *)&uos_module_globals,
-};
-
-#endif // MICROPY_PY_UOS_ZEPHYR
diff --git a/ports/zephyr/mpconfigport.h b/ports/zephyr/mpconfigport.h
index fe124bace0d15..fa1cb56ae6da8 100644
--- a/ports/zephyr/mpconfigport.h
+++ b/ports/zephyr/mpconfigport.h
@@ -83,7 +83,7 @@
 #endif
 #define MICROPY_PY_UBINASCII        (1)
 #define MICROPY_PY_UHASHLIB         (1)
-#define MICROPY_PY_UOS_ZEPHYR       (1)
+#define MICROPY_PY_UOS              (1)
 #define MICROPY_PY_UTIME            (1)
 #define MICROPY_PY_UTIME_MP_HAL     (1)
 #define MICROPY_PY_ZEPHYR           (1)
@@ -139,17 +139,10 @@ typedef long mp_off_t;
     struct _mp_bluetooth_zephyr_root_pointers_t *bluetooth_zephyr_root_pointers;
 
 extern const struct _mp_obj_module_t mp_module_time;
-extern const struct _mp_obj_module_t mp_module_uos;
 extern const struct _mp_obj_module_t mp_module_usocket;
 extern const struct _mp_obj_module_t mp_module_zephyr;
 extern const struct _mp_obj_module_t mp_module_zsensor;
 
-#if MICROPY_PY_UOS_ZEPHYR
-#define MICROPY_PY_UOS_DEF { MP_ROM_QSTR(MP_QSTR_uos), MP_ROM_PTR(&mp_module_uos) },
-#else
-#define MICROPY_PY_UOS_DEF
-#endif
-
 #if MICROPY_PY_USOCKET
 #define MICROPY_PY_USOCKET_DEF { MP_ROM_QSTR(MP_QSTR_usocket), MP_ROM_PTR(&mp_module_usocket) },
 #else
@@ -175,7 +168,6 @@ extern const struct _mp_obj_module_t mp_module_zsensor;
 #endif
 
 #define MICROPY_PORT_BUILTIN_MODULES \
-    MICROPY_PY_UOS_DEF \
     MICROPY_PY_USOCKET_DEF \
     MICROPY_PY_UTIME_DEF \
     MICROPY_PY_ZEPHYR_DEF \

From 94077c6402f6fc1cbd70abcbb3a1960c94495ca7 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 3 Mar 2022 19:30:58 +1100
Subject: [PATCH 1779/3533] samd/moduos: Convert module to use extmod version.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/samd/Makefile        |  3 +-
 ports/samd/moduos.c        | 75 --------------------------------------
 ports/stm32/mpconfigport.h |  7 ++--
 py/py.mk                   |  1 +
 4 files changed, 6 insertions(+), 80 deletions(-)
 delete mode 100644 ports/samd/moduos.c

diff --git a/ports/samd/Makefile b/ports/samd/Makefile
index 8476eea4b8741..ab74b80c161f5 100644
--- a/ports/samd/Makefile
+++ b/ports/samd/Makefile
@@ -75,7 +75,6 @@ endif
 SRC_C = \
 	main.c \
 	help.c \
-	moduos.c \
 	modutime.c \
 	modmachine.c \
 	$(BOARD_DIR)/pins.c \
@@ -120,7 +119,7 @@ SRC_S = shared/runtime/gchelper_m3.s
 endif
 
 # List of sources for qstr extraction
-SRC_QSTR += moduos.c \
+SRC_QSTR += \
 	modutime.c \
 	modmachine.c \
 	machine_pin.c \
diff --git a/ports/samd/moduos.c b/ports/samd/moduos.c
deleted file mode 100644
index b884d5e7b5a12..0000000000000
--- a/ports/samd/moduos.c
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2016 Damien P. George
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#include "py/runtime.h"
-#include "extmod/vfs.h"
-#include "extmod/vfs_fat.h"
-#include "extmod/vfs_lfs.h"
-
-STATIC const mp_rom_map_elem_t os_module_globals_table[] = {
-    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_uos) },
-
-    #if MICROPY_VFS
-    { MP_ROM_QSTR(MP_QSTR_chdir), MP_ROM_PTR(&mp_vfs_chdir_obj) },
-    { MP_ROM_QSTR(MP_QSTR_getcwd), MP_ROM_PTR(&mp_vfs_getcwd_obj) },
-    { MP_ROM_QSTR(MP_QSTR_listdir), MP_ROM_PTR(&mp_vfs_listdir_obj) },
-    { MP_ROM_QSTR(MP_QSTR_mkdir), MP_ROM_PTR(&mp_vfs_mkdir_obj) },
-    { MP_ROM_QSTR(MP_QSTR_remove), MP_ROM_PTR(&mp_vfs_remove_obj) },
-    { MP_ROM_QSTR(MP_QSTR_rename), MP_ROM_PTR(&mp_vfs_rename_obj) },
-    { MP_ROM_QSTR(MP_QSTR_rmdir), MP_ROM_PTR(&mp_vfs_rmdir_obj) },
-    { MP_ROM_QSTR(MP_QSTR_stat), MP_ROM_PTR(&mp_vfs_stat_obj) },
-    { MP_ROM_QSTR(MP_QSTR_statvfs), MP_ROM_PTR(&mp_vfs_statvfs_obj) },
-    #endif
-
-    // The following are MicroPython extensions.
-
-    #if MICROPY_PY_OS_DUPTERM
-    { MP_ROM_QSTR(MP_QSTR_dupterm), MP_ROM_PTR(&mp_uos_dupterm_obj) },
-    #endif
-
-    #if MICROPY_VFS
-    { MP_ROM_QSTR(MP_QSTR_ilistdir), MP_ROM_PTR(&mp_vfs_ilistdir_obj) },
-    { MP_ROM_QSTR(MP_QSTR_mount), MP_ROM_PTR(&mp_vfs_mount_obj) },
-    { MP_ROM_QSTR(MP_QSTR_umount), MP_ROM_PTR(&mp_vfs_umount_obj) },
-    #if MICROPY_VFS_FAT
-    { MP_ROM_QSTR(MP_QSTR_VfsFat), MP_ROM_PTR(&mp_fat_vfs_type) },
-    #endif
-    #if MICROPY_VFS_LFS1
-    { MP_ROM_QSTR(MP_QSTR_VfsLfs1), MP_ROM_PTR(&mp_type_vfs_lfs1) },
-    #endif
-    #if MICROPY_VFS_LFS2
-    { MP_ROM_QSTR(MP_QSTR_VfsLfs2), MP_ROM_PTR(&mp_type_vfs_lfs2) },
-    #endif
-    #endif
-};
-STATIC MP_DEFINE_CONST_DICT(os_module_globals, os_module_globals_table);
-
-const mp_obj_module_t mp_module_uos = {
-    .base = { &mp_type_module },
-    .globals = (mp_obj_dict_t *)&os_module_globals,
-};
-
-MP_REGISTER_MODULE(MP_QSTR_uos, mp_module_uos, MICROPY_PY_UOS);
diff --git a/ports/stm32/mpconfigport.h b/ports/stm32/mpconfigport.h
index 3cca8f192596a..98e5f2f36baa5 100644
--- a/ports/stm32/mpconfigport.h
+++ b/ports/stm32/mpconfigport.h
@@ -95,8 +95,9 @@
 #define MICROPY_PY_UHASHLIB_MD5     (MICROPY_PY_USSL)
 #define MICROPY_PY_UHASHLIB_SHA1    (MICROPY_PY_USSL)
 #define MICROPY_PY_UCRYPTOLIB       (MICROPY_PY_USSL)
-#ifndef MICROPY_PY_UOS
-#define MICROPY_PY_UOS              (1)
+#define MICROPY_PY_UOS              (0)
+#ifndef MICROPY_PY_UOS_STM32
+#define MICROPY_PY_UOS_STM32        (1)
 #endif
 #define MICROPY_PY_OS_DUPTERM       (3)
 #define MICROPY_PY_UOS_DUPTERM_BUILTIN_STREAM (1)
@@ -203,7 +204,7 @@ extern const struct _mp_obj_module_t mp_module_onewire;
 #define MACHINE_BUILTIN_MODULE_CONSTANTS
 #endif
 
-#if MICROPY_PY_UOS
+#if MICROPY_PY_UOS_STM32
 #define UOS_BUILTIN_MODULE                  { MP_ROM_QSTR(MP_QSTR_uos), MP_ROM_PTR(&mp_module_uos) },
 #else
 #define UOS_BUILTIN_MODULE
diff --git a/py/py.mk b/py/py.mk
index 122dea225affc..518cd0a2256b4 100644
--- a/py/py.mk
+++ b/py/py.mk
@@ -176,6 +176,7 @@ PY_EXTMOD_O_BASENAME = \
 	extmod/moduasyncio.o \
 	extmod/moductypes.o \
 	extmod/modujson.o \
+	extmod/moduos.o \
 	extmod/modure.o \
 	extmod/moduzlib.o \
 	extmod/moduheapq.o \

From 20bfae1471fe86e153360dbf28d0292274f3978b Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 3 Mar 2022 19:34:15 +1100
Subject: [PATCH 1780/3533] qemu-arm/moduos: Convert module to use extmod
 version.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/qemu-arm/Makefile       |  1 -
 ports/qemu-arm/moduos.c       | 53 -----------------------------------
 ports/qemu-arm/mpconfigport.h |  7 +----
 3 files changed, 1 insertion(+), 60 deletions(-)
 delete mode 100644 ports/qemu-arm/moduos.c

diff --git a/ports/qemu-arm/Makefile b/ports/qemu-arm/Makefile
index 4a6d63a0148a7..08c2d82498f23 100644
--- a/ports/qemu-arm/Makefile
+++ b/ports/qemu-arm/Makefile
@@ -77,7 +77,6 @@ LIBS = $(shell $(CC) $(CFLAGS) -print-libgcc-file-name)
 SRC_COMMON_C = \
 	startup.c \
 	uart.c \
-	moduos.c \
 	modmachine.c \
 	shared/libc/string0.c \
 	shared/runtime/sys_stdio_mphal.c \
diff --git a/ports/qemu-arm/moduos.c b/ports/qemu-arm/moduos.c
deleted file mode 100644
index 23a1241869f54..0000000000000
--- a/ports/qemu-arm/moduos.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2017 Damien P. George
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#include "extmod/vfs.h"
-
-STATIC const mp_rom_map_elem_t os_module_globals_table[] = {
-    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_uos) },
-
-    { MP_ROM_QSTR(MP_QSTR_chdir), MP_ROM_PTR(&mp_vfs_chdir_obj) },
-    { MP_ROM_QSTR(MP_QSTR_getcwd), MP_ROM_PTR(&mp_vfs_getcwd_obj) },
-    { MP_ROM_QSTR(MP_QSTR_ilistdir), MP_ROM_PTR(&mp_vfs_ilistdir_obj) },
-    { MP_ROM_QSTR(MP_QSTR_listdir), MP_ROM_PTR(&mp_vfs_listdir_obj) },
-    { MP_ROM_QSTR(MP_QSTR_mkdir), MP_ROM_PTR(&mp_vfs_mkdir_obj) },
-    { MP_ROM_QSTR(MP_QSTR_remove), MP_ROM_PTR(&mp_vfs_remove_obj) },
-    { MP_ROM_QSTR(MP_QSTR_rename), MP_ROM_PTR(&mp_vfs_rename_obj) },
-    { MP_ROM_QSTR(MP_QSTR_rmdir), MP_ROM_PTR(&mp_vfs_rmdir_obj) },
-    { MP_ROM_QSTR(MP_QSTR_stat), MP_ROM_PTR(&mp_vfs_stat_obj) },
-    { MP_ROM_QSTR(MP_QSTR_statvfs), MP_ROM_PTR(&mp_vfs_statvfs_obj) },
-
-    // MicroPython extensions
-    { MP_ROM_QSTR(MP_QSTR_mount), MP_ROM_PTR(&mp_vfs_mount_obj) },
-    { MP_ROM_QSTR(MP_QSTR_umount), MP_ROM_PTR(&mp_vfs_umount_obj) },
-};
-
-STATIC MP_DEFINE_CONST_DICT(os_module_globals, os_module_globals_table);
-
-const mp_obj_module_t mp_module_uos = {
-    .base = { &mp_type_module },
-    .globals = (mp_obj_dict_t *)&os_module_globals,
-};
diff --git a/ports/qemu-arm/mpconfigport.h b/ports/qemu-arm/mpconfigport.h
index 6bfea74ea0add..cccfa1e180d73 100644
--- a/ports/qemu-arm/mpconfigport.h
+++ b/ports/qemu-arm/mpconfigport.h
@@ -40,6 +40,7 @@
 #define MICROPY_PY_UCTYPES          (1)
 #define MICROPY_PY_UZLIB            (1)
 #define MICROPY_PY_UJSON            (1)
+#define MICROPY_PY_UOS              (1)
 #define MICROPY_PY_URE              (1)
 #define MICROPY_PY_UHEAPQ           (1)
 #define MICROPY_PY_UHASHLIB         (1)
@@ -63,12 +64,6 @@ typedef long mp_off_t;
 #define MICROPY_PORT_BUILTINS \
     { MP_ROM_QSTR(MP_QSTR_open), MP_ROM_PTR(&mp_builtin_open_obj) },
 
-// extra built-in modules to add to the list of known ones
-extern const struct _mp_obj_module_t mp_module_uos;
-
-#define MICROPY_PORT_BUILTIN_MODULES \
-    { MP_ROM_QSTR(MP_QSTR_uos), MP_ROM_PTR(&mp_module_uos) }, \
-
 // We need to provide a declaration/definition of alloca()
 #include <alloca.h>
 

From 9a3e1a18081c8c6a08e2a2efcfefcc4d96e9a8da Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 3 Mar 2022 22:50:40 +1100
Subject: [PATCH 1781/3533] mimxrt/moduos: Convert module to use extmod
 version.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/mimxrt/Makefile       |  2 -
 ports/mimxrt/moduos.c       | 91 +++----------------------------------
 ports/mimxrt/mpconfigport.h |  7 ++-
 3 files changed, 12 insertions(+), 88 deletions(-)

diff --git a/ports/mimxrt/Makefile b/ports/mimxrt/Makefile
index 55e32433f503e..be5083965f4a7 100644
--- a/ports/mimxrt/Makefile
+++ b/ports/mimxrt/Makefile
@@ -238,7 +238,6 @@ SRC_C += \
 	mimxrt_sdram.c \
 	modmachine.c \
 	modmimxrt.c \
-	moduos.c \
 	modutime.c \
 	mphalport.c \
 	mpnetworkport.c \
@@ -409,7 +408,6 @@ SRC_QSTR += \
 	mimxrt_flash.c \
 	modmachine.c \
 	modmimxrt.c \
-	moduos.c \
 	modutime.c \
 	pin.c \
 	shared/runtime/mpirq.c \
diff --git a/ports/mimxrt/moduos.c b/ports/mimxrt/moduos.c
index b59a5f44834b0..34bd2b4248769 100644
--- a/ports/mimxrt/moduos.c
+++ b/ports/mimxrt/moduos.c
@@ -28,42 +28,10 @@
  * THE SOFTWARE.
  */
 
-#include "py/objstr.h"
 #include "py/runtime.h"
 #include "py/mphal.h"
-#include "extmod/misc.h"
-#include "extmod/vfs.h"
-#include "extmod/vfs_fat.h"
-#include "extmod/vfs_lfs.h"
-#include "genhdr/mpversion.h"
 #include "fsl_trng.h"
 
-STATIC const qstr os_uname_info_fields[] = {
-    MP_QSTR_sysname, MP_QSTR_nodename,
-    MP_QSTR_release, MP_QSTR_version, MP_QSTR_machine
-};
-STATIC const MP_DEFINE_STR_OBJ(os_uname_info_sysname_obj, MICROPY_PY_SYS_PLATFORM);
-STATIC const MP_DEFINE_STR_OBJ(os_uname_info_nodename_obj, MICROPY_PY_SYS_PLATFORM);
-STATIC const MP_DEFINE_STR_OBJ(os_uname_info_release_obj, MICROPY_VERSION_STRING);
-STATIC const MP_DEFINE_STR_OBJ(os_uname_info_version_obj, MICROPY_GIT_TAG " on " MICROPY_BUILD_DATE);
-STATIC const MP_DEFINE_STR_OBJ(os_uname_info_machine_obj, MICROPY_HW_BOARD_NAME " with " MICROPY_HW_MCU_NAME);
-
-STATIC MP_DEFINE_ATTRTUPLE(
-    os_uname_info_obj,
-    os_uname_info_fields,
-    5,
-    (mp_obj_t)&os_uname_info_sysname_obj,
-    (mp_obj_t)&os_uname_info_nodename_obj,
-    (mp_obj_t)&os_uname_info_release_obj,
-    (mp_obj_t)&os_uname_info_version_obj,
-    (mp_obj_t)&os_uname_info_machine_obj
-    );
-
-STATIC mp_obj_t os_uname(void) {
-    return (mp_obj_t)&os_uname_info_obj;
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(os_uname_obj, os_uname);
-
 static bool initialized = false;
 
 STATIC void trng_start(void) {
@@ -86,7 +54,8 @@ uint32_t trng_random_u32(void) {
     return rngval;
 }
 
-STATIC mp_obj_t os_urandom(mp_obj_t num) {
+#if MICROPY_PY_UOS_URANDOM
+STATIC mp_obj_t mp_uos_urandom(mp_obj_t num) {
     mp_int_t n = mp_obj_get_int(num);
     vstr_t vstr;
     vstr_init_len(&vstr, n);
@@ -96,10 +65,11 @@ STATIC mp_obj_t os_urandom(mp_obj_t num) {
 
     return mp_obj_new_str_from_vstr(&mp_type_bytes, &vstr);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(os_urandom_obj, os_urandom);
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_uos_urandom_obj, mp_uos_urandom);
+#endif
 
-#if MICROPY_PY_OS_DUPTERM
-STATIC mp_obj_t os_dupterm_notify(mp_obj_t obj_in) {
+#if MICROPY_PY_UOS_DUPTERM_NOTIFY
+STATIC mp_obj_t mp_uos_dupterm_notify(mp_obj_t obj_in) {
     (void)obj_in;
     for (;;) {
         int c = mp_uos_dupterm_rx_chr();
@@ -110,52 +80,5 @@ STATIC mp_obj_t os_dupterm_notify(mp_obj_t obj_in) {
     }
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(os_dupterm_notify_obj, os_dupterm_notify);
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_uos_dupterm_notify_obj, mp_uos_dupterm_notify);
 #endif
-
-STATIC const mp_rom_map_elem_t os_module_globals_table[] = {
-    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_uos) },
-
-    { MP_ROM_QSTR(MP_QSTR_uname), MP_ROM_PTR(&os_uname_obj) },
-    { MP_ROM_QSTR(MP_QSTR_urandom), MP_ROM_PTR(&os_urandom_obj) },
-
-    #if MICROPY_VFS
-    { MP_ROM_QSTR(MP_QSTR_chdir), MP_ROM_PTR(&mp_vfs_chdir_obj) },
-    { MP_ROM_QSTR(MP_QSTR_getcwd), MP_ROM_PTR(&mp_vfs_getcwd_obj) },
-    { MP_ROM_QSTR(MP_QSTR_listdir), MP_ROM_PTR(&mp_vfs_listdir_obj) },
-    { MP_ROM_QSTR(MP_QSTR_mkdir), MP_ROM_PTR(&mp_vfs_mkdir_obj) },
-    { MP_ROM_QSTR(MP_QSTR_remove), MP_ROM_PTR(&mp_vfs_remove_obj) },
-    { MP_ROM_QSTR(MP_QSTR_rename), MP_ROM_PTR(&mp_vfs_rename_obj) },
-    { MP_ROM_QSTR(MP_QSTR_rmdir), MP_ROM_PTR(&mp_vfs_rmdir_obj) },
-    { MP_ROM_QSTR(MP_QSTR_stat), MP_ROM_PTR(&mp_vfs_stat_obj) },
-    { MP_ROM_QSTR(MP_QSTR_statvfs), MP_ROM_PTR(&mp_vfs_statvfs_obj) },
-    #endif
-
-    // The following are MicroPython extensions.
-
-    #if MICROPY_PY_OS_DUPTERM
-    { MP_ROM_QSTR(MP_QSTR_dupterm), MP_ROM_PTR(&mp_uos_dupterm_obj) },
-    { MP_ROM_QSTR(MP_QSTR_dupterm_notify), MP_ROM_PTR(&os_dupterm_notify_obj) },
-    #endif
-
-    #if MICROPY_VFS
-    { MP_ROM_QSTR(MP_QSTR_ilistdir), MP_ROM_PTR(&mp_vfs_ilistdir_obj) },
-    { MP_ROM_QSTR(MP_QSTR_mount), MP_ROM_PTR(&mp_vfs_mount_obj) },
-    { MP_ROM_QSTR(MP_QSTR_umount), MP_ROM_PTR(&mp_vfs_umount_obj) },
-    #if MICROPY_VFS_FAT
-    { MP_ROM_QSTR(MP_QSTR_VfsFat), MP_ROM_PTR(&mp_fat_vfs_type) },
-    #endif
-    #if MICROPY_VFS_LFS1
-    { MP_ROM_QSTR(MP_QSTR_VfsLfs1), MP_ROM_PTR(&mp_type_vfs_lfs1) },
-    #endif
-    #if MICROPY_VFS_LFS2
-    { MP_ROM_QSTR(MP_QSTR_VfsLfs2), MP_ROM_PTR(&mp_type_vfs_lfs2) },
-    #endif
-    #endif
-};
-STATIC MP_DEFINE_CONST_DICT(os_module_globals, os_module_globals_table);
-
-const mp_obj_module_t mp_module_uos = {
-    .base = { &mp_type_module },
-    .globals = (mp_obj_dict_t *)&os_module_globals,
-};
diff --git a/ports/mimxrt/mpconfigport.h b/ports/mimxrt/mpconfigport.h
index 795887444750f..ca8be01f78e78 100644
--- a/ports/mimxrt/mpconfigport.h
+++ b/ports/mimxrt/mpconfigport.h
@@ -121,7 +121,12 @@ uint32_t trng_random_u32(void);
 #define MICROPY_PY_UBINASCII                (1)
 #define MICROPY_PY_UBINASCII_CRC32          (1)
 #define MICROPY_PY_UTIME_MP_HAL             (1)
+#define MICROPY_PY_UOS                      (1)
+#define MICROPY_PY_UOS_INCLUDEFILE          "ports/mimxrt/moduos.c"
 #define MICROPY_PY_OS_DUPTERM               (3)
+#define MICROPY_PY_UOS_DUPTERM_NOTIFY       (1)
+#define MICROPY_PY_UOS_UNAME                (1)
+#define MICROPY_PY_UOS_URANDOM              (1)
 #define MICROPY_PY_URANDOM                  (1)
 #define MICROPY_PY_URANDOM_EXTRA_FUNCS      (1)
 #define MICROPY_PY_URANDOM_SEED_INIT_FUNC   (trng_random_u32())
@@ -221,7 +226,6 @@ static inline void restore_irq_pri(uint32_t basepri) {
 
 extern const struct _mp_obj_module_t mp_module_mimxrt;
 extern const struct _mp_obj_module_t mp_module_onewire;
-extern const struct _mp_obj_module_t mp_module_uos;
 extern const struct _mp_obj_module_t mp_module_utime;
 extern const struct _mp_obj_module_t mp_module_usocket;
 extern const struct _mp_obj_module_t mp_module_network;
@@ -258,7 +262,6 @@ extern const struct _mp_obj_type_t network_lan_type;
 
 #define MICROPY_PORT_BUILTIN_MODULES \
     { MP_ROM_QSTR(MP_QSTR_mimxrt), (mp_obj_t)&mp_module_mimxrt }, \
-    { MP_ROM_QSTR(MP_QSTR_uos), MP_ROM_PTR(&mp_module_uos) }, \
     { MP_ROM_QSTR(MP_QSTR_utime), MP_ROM_PTR(&mp_module_utime) }, \
     { MP_ROM_QSTR(MP_QSTR__onewire), MP_ROM_PTR(&mp_module_onewire) }, \
     SOCKET_BUILTIN_MODULE \

From 11b77263ef9e8f897c7186f10f4ef579adde9195 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 3 Mar 2022 23:15:59 +1100
Subject: [PATCH 1782/3533] stm32/moduos: Convert module to use extmod version.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/misc.h              |   1 +
 extmod/moduos.c            |   6 ++
 extmod/uos_dupterm.c       |   4 ++
 ports/stm32/Makefile       |   1 -
 ports/stm32/modpyb.c       |   2 +-
 ports/stm32/moduos.c       | 144 ++++++-------------------------------
 ports/stm32/mpconfigport.h |  18 ++---
 ports/stm32/portmodules.h  |   4 +-
 8 files changed, 42 insertions(+), 138 deletions(-)

diff --git a/extmod/misc.h b/extmod/misc.h
index 40b091e5f73d5..a9392aa10b7b3 100644
--- a/extmod/misc.h
+++ b/extmod/misc.h
@@ -36,6 +36,7 @@ MP_DECLARE_CONST_FUN_OBJ_VAR_BETWEEN(mp_uos_dupterm_obj);
 
 #if MICROPY_PY_OS_DUPTERM
 bool mp_uos_dupterm_is_builtin_stream(mp_const_obj_t stream);
+void mp_uos_dupterm_stream_detached_attached(mp_obj_t stream_detached, mp_obj_t stream_attached);
 uintptr_t mp_uos_dupterm_poll(uintptr_t poll_flags);
 int mp_uos_dupterm_rx_chr(void);
 void mp_uos_dupterm_tx_strn(const char *str, size_t len);
diff --git a/extmod/moduos.c b/extmod/moduos.c
index 0378d50302d51..28c482dd9168b 100644
--- a/extmod/moduos.c
+++ b/extmod/moduos.c
@@ -88,6 +88,12 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_0(mp_uos_uname_obj, mp_uos_uname);
 STATIC const mp_rom_map_elem_t os_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_uos) },
 
+    #if MICROPY_PY_UOS_SEP
+    { MP_ROM_QSTR(MP_QSTR_sep), MP_ROM_QSTR(MP_QSTR__slash_) },
+    #endif
+    #if MICROPY_PY_UOS_SYNC
+    { MP_ROM_QSTR(MP_QSTR_sync), MP_ROM_PTR(&mp_uos_sync_obj) },
+    #endif
     #if MICROPY_PY_UOS_UNAME
     { MP_ROM_QSTR(MP_QSTR_uname), MP_ROM_PTR(&mp_uos_uname_obj) },
     #endif
diff --git a/extmod/uos_dupterm.c b/extmod/uos_dupterm.c
index d55767de21255..e18d133b913a2 100644
--- a/extmod/uos_dupterm.c
+++ b/extmod/uos_dupterm.c
@@ -193,6 +193,10 @@ STATIC mp_obj_t mp_uos_dupterm(size_t n_args, const mp_obj_t *args) {
         MP_STATE_VM(dupterm_objs[idx]) = args[0];
     }
 
+    #if MICROPY_PY_UOS_DUPTERM_STREAM_DETACHED_ATTACHED
+    mp_uos_dupterm_stream_detached_attached(previous_obj, args[0]);
+    #endif
+
     return previous_obj;
 }
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_uos_dupterm_obj, 1, 2, mp_uos_dupterm);
diff --git a/ports/stm32/Makefile b/ports/stm32/Makefile
index dd86f1e3f315d..3083c99570e9c 100644
--- a/ports/stm32/Makefile
+++ b/ports/stm32/Makefile
@@ -297,7 +297,6 @@ SRC_C += \
 	modmachine.c \
 	modpyb.c \
 	modstm.c \
-	moduos.c \
 	modutime.c \
 	network_lan.c \
 	extint.c \
diff --git a/ports/stm32/modpyb.c b/ports/stm32/modpyb.c
index b9e2bac03f195..a44465488848f 100644
--- a/ports/stm32/modpyb.c
+++ b/ports/stm32/modpyb.c
@@ -185,7 +185,7 @@ STATIC const mp_rom_map_elem_t pyb_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_elapsed_micros), MP_ROM_PTR(&pyb_elapsed_micros_obj) },
     { MP_ROM_QSTR(MP_QSTR_delay), MP_ROM_PTR(&mp_utime_sleep_ms_obj) },
     { MP_ROM_QSTR(MP_QSTR_udelay), MP_ROM_PTR(&mp_utime_sleep_us_obj) },
-    { MP_ROM_QSTR(MP_QSTR_sync), MP_ROM_PTR(&mod_os_sync_obj) },
+    { MP_ROM_QSTR(MP_QSTR_sync), MP_ROM_PTR(&mp_uos_sync_obj) },
     { MP_ROM_QSTR(MP_QSTR_mount), MP_ROM_PTR(&mp_vfs_mount_obj) },
     #endif
 
diff --git a/ports/stm32/moduos.c b/ports/stm32/moduos.c
index 5b2335272fd64..1862564b611cd 100644
--- a/ports/stm32/moduos.c
+++ b/ports/stm32/moduos.c
@@ -24,66 +24,19 @@
  * THE SOFTWARE.
  */
 
-#include <stdint.h>
-#include <string.h>
-
 #include "py/runtime.h"
-#include "py/objtuple.h"
-#include "py/objstr.h"
-#include "shared/timeutils/timeutils.h"
-#include "lib/oofatfs/ff.h"
-#include "lib/oofatfs/diskio.h"
-#include "extmod/misc.h"
-#include "extmod/vfs.h"
-#include "extmod/vfs_fat.h"
-#include "extmod/vfs_lfs.h"
-#include "genhdr/mpversion.h"
 #include "rng.h"
 #include "usb.h"
 #include "uart.h"
-#include "portmodules.h"
 
-/// \module os - basic "operating system" services
-///
-/// The `os` module contains functions for filesystem access and `urandom`.
-///
-/// The filesystem has `/` as the root directory, and the available physical
-/// drives are accessible from here.  They are currently:
-///
-///     /flash      -- the internal flash filesystem
-///     /sd         -- the SD card (if it exists)
-///
-/// On boot up, the current directory is `/flash` if no SD card is inserted,
-/// otherwise it is `/sd`.
-
-STATIC const qstr os_uname_info_fields[] = {
-    MP_QSTR_sysname, MP_QSTR_nodename,
-    MP_QSTR_release, MP_QSTR_version, MP_QSTR_machine
-};
-STATIC const MP_DEFINE_STR_OBJ(os_uname_info_sysname_obj, "pyboard");
-STATIC const MP_DEFINE_STR_OBJ(os_uname_info_nodename_obj, "pyboard");
-STATIC const MP_DEFINE_STR_OBJ(os_uname_info_release_obj, MICROPY_VERSION_STRING);
-STATIC const MP_DEFINE_STR_OBJ(os_uname_info_version_obj, MICROPY_GIT_TAG " on " MICROPY_BUILD_DATE);
-STATIC const MP_DEFINE_STR_OBJ(os_uname_info_machine_obj, MICROPY_HW_BOARD_NAME " with " MICROPY_HW_MCU_NAME);
-STATIC MP_DEFINE_ATTRTUPLE(
-    os_uname_info_obj,
-    os_uname_info_fields,
-    5,
-    MP_ROM_PTR(&os_uname_info_sysname_obj),
-    MP_ROM_PTR(&os_uname_info_nodename_obj),
-    MP_ROM_PTR(&os_uname_info_release_obj),
-    MP_ROM_PTR(&os_uname_info_version_obj),
-    MP_ROM_PTR(&os_uname_info_machine_obj)
-    );
-
-STATIC mp_obj_t os_uname(void) {
-    return MP_OBJ_FROM_PTR(&os_uname_info_obj);
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(os_uname_obj, os_uname);
+#if MICROPY_VFS_FAT
+#include "lib/oofatfs/ff.h"
+#include "lib/oofatfs/diskio.h"
+#endif
 
-/// \function sync()
-/// Sync all filesystems.
-STATIC mp_obj_t os_sync(void) {
+// sync()
+// Sync all filesystems.
+STATIC mp_obj_t mp_uos_sync(void) {
     #if MICROPY_VFS_FAT
     for (mp_vfs_mount_t *vfs = MP_STATE_VM(vfs_mount_table); vfs != NULL; vfs = vfs->next) {
         // this assumes that vfs->obj is fs_user_mount_t with block device functions
@@ -92,13 +45,13 @@ STATIC mp_obj_t os_sync(void) {
     #endif
     return mp_const_none;
 }
-MP_DEFINE_CONST_FUN_OBJ_0(mod_os_sync_obj, os_sync);
+MP_DEFINE_CONST_FUN_OBJ_0(mp_uos_sync_obj, mp_uos_sync);
 
-#if MICROPY_HW_ENABLE_RNG
-/// \function urandom(n)
-/// Return a bytes object with n random bytes, generated by the hardware
-/// random number generator.
-STATIC mp_obj_t os_urandom(mp_obj_t num) {
+#if MICROPY_PY_UOS_URANDOM
+// urandom(n)
+// Return a bytes object with n random bytes, generated by the hardware
+// random number generator.
+STATIC mp_obj_t mp_uos_urandom(mp_obj_t num) {
     mp_int_t n = mp_obj_get_int(num);
     vstr_t vstr;
     vstr_init_len(&vstr, n);
@@ -107,7 +60,7 @@ STATIC mp_obj_t os_urandom(mp_obj_t num) {
     }
     return mp_obj_new_str_from_vstr(&mp_type_bytes, &vstr);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(os_urandom_obj, os_urandom);
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_uos_urandom_obj, mp_uos_urandom);
 #endif
 
 bool mp_uos_dupterm_is_builtin_stream(mp_const_obj_t stream) {
@@ -119,73 +72,22 @@ bool mp_uos_dupterm_is_builtin_stream(mp_const_obj_t stream) {
     ;
 }
 
-STATIC mp_obj_t uos_dupterm(size_t n_args, const mp_obj_t *args) {
-    mp_obj_t prev_obj = mp_uos_dupterm_obj.fun.var(n_args, args);
-    if (mp_obj_get_type(prev_obj) == &pyb_uart_type) {
-        uart_attach_to_repl(MP_OBJ_TO_PTR(prev_obj), false);
+void mp_uos_dupterm_stream_detached_attached(mp_obj_t stream_detached, mp_obj_t stream_attached) {
+    if (mp_obj_get_type(stream_detached) == &pyb_uart_type) {
+        uart_attach_to_repl(MP_OBJ_TO_PTR(stream_detached), false);
     }
     #if MICROPY_HW_ENABLE_USB
-    if (mp_obj_get_type(prev_obj) == &pyb_usb_vcp_type) {
-        usb_vcp_attach_to_repl(MP_OBJ_TO_PTR(prev_obj), false);
+    if (mp_obj_get_type(stream_detached) == &pyb_usb_vcp_type) {
+        usb_vcp_attach_to_repl(MP_OBJ_TO_PTR(stream_detached), false);
     }
     #endif
 
-    if (mp_obj_get_type(args[0]) == &pyb_uart_type) {
-        uart_attach_to_repl(MP_OBJ_TO_PTR(args[0]), true);
+    if (mp_obj_get_type(stream_attached) == &pyb_uart_type) {
+        uart_attach_to_repl(MP_OBJ_TO_PTR(stream_attached), true);
     }
     #if MICROPY_HW_ENABLE_USB
-    if (mp_obj_get_type(args[0]) == &pyb_usb_vcp_type) {
-        usb_vcp_attach_to_repl(MP_OBJ_TO_PTR(args[0]), true);
+    if (mp_obj_get_type(stream_attached) == &pyb_usb_vcp_type) {
+        usb_vcp_attach_to_repl(MP_OBJ_TO_PTR(stream_attached), true);
     }
     #endif
-    return prev_obj;
 }
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(uos_dupterm_obj, 1, 2, uos_dupterm);
-
-STATIC const mp_rom_map_elem_t os_module_globals_table[] = {
-    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_uos) },
-
-    { MP_ROM_QSTR(MP_QSTR_uname), MP_ROM_PTR(&os_uname_obj) },
-
-    { MP_ROM_QSTR(MP_QSTR_chdir), MP_ROM_PTR(&mp_vfs_chdir_obj) },
-    { MP_ROM_QSTR(MP_QSTR_getcwd), MP_ROM_PTR(&mp_vfs_getcwd_obj) },
-    { MP_ROM_QSTR(MP_QSTR_ilistdir), MP_ROM_PTR(&mp_vfs_ilistdir_obj) },
-    { MP_ROM_QSTR(MP_QSTR_listdir), MP_ROM_PTR(&mp_vfs_listdir_obj) },
-    { MP_ROM_QSTR(MP_QSTR_mkdir), MP_ROM_PTR(&mp_vfs_mkdir_obj) },
-    { MP_ROM_QSTR(MP_QSTR_remove), MP_ROM_PTR(&mp_vfs_remove_obj) },
-    { MP_ROM_QSTR(MP_QSTR_rename),MP_ROM_PTR(&mp_vfs_rename_obj)},
-    { MP_ROM_QSTR(MP_QSTR_rmdir), MP_ROM_PTR(&mp_vfs_rmdir_obj) },
-    { MP_ROM_QSTR(MP_QSTR_stat), MP_ROM_PTR(&mp_vfs_stat_obj) },
-    { MP_ROM_QSTR(MP_QSTR_statvfs), MP_ROM_PTR(&mp_vfs_statvfs_obj) },
-    { MP_ROM_QSTR(MP_QSTR_unlink), MP_ROM_PTR(&mp_vfs_remove_obj) }, // unlink aliases to remove
-
-    { MP_ROM_QSTR(MP_QSTR_sync), MP_ROM_PTR(&mod_os_sync_obj) },
-
-    /// \constant sep - separation character used in paths
-    { MP_ROM_QSTR(MP_QSTR_sep), MP_ROM_QSTR(MP_QSTR__slash_) },
-
-    #if MICROPY_HW_ENABLE_RNG
-    { MP_ROM_QSTR(MP_QSTR_urandom), MP_ROM_PTR(&os_urandom_obj) },
-    #endif
-
-    // these are MicroPython extensions
-    { MP_ROM_QSTR(MP_QSTR_dupterm), MP_ROM_PTR(&uos_dupterm_obj) },
-    { MP_ROM_QSTR(MP_QSTR_mount), MP_ROM_PTR(&mp_vfs_mount_obj) },
-    { MP_ROM_QSTR(MP_QSTR_umount), MP_ROM_PTR(&mp_vfs_umount_obj) },
-    #if MICROPY_VFS_FAT
-    { MP_ROM_QSTR(MP_QSTR_VfsFat), MP_ROM_PTR(&mp_fat_vfs_type) },
-    #endif
-    #if MICROPY_VFS_LFS1
-    { MP_ROM_QSTR(MP_QSTR_VfsLfs1), MP_ROM_PTR(&mp_type_vfs_lfs1) },
-    #endif
-    #if MICROPY_VFS_LFS2
-    { MP_ROM_QSTR(MP_QSTR_VfsLfs2), MP_ROM_PTR(&mp_type_vfs_lfs2) },
-    #endif
-};
-
-STATIC MP_DEFINE_CONST_DICT(os_module_globals, os_module_globals_table);
-
-const mp_obj_module_t mp_module_uos = {
-    .base = { &mp_type_module },
-    .globals = (mp_obj_dict_t *)&os_module_globals,
-};
diff --git a/ports/stm32/mpconfigport.h b/ports/stm32/mpconfigport.h
index 98e5f2f36baa5..60f6d45fc48c6 100644
--- a/ports/stm32/mpconfigport.h
+++ b/ports/stm32/mpconfigport.h
@@ -95,12 +95,14 @@
 #define MICROPY_PY_UHASHLIB_MD5     (MICROPY_PY_USSL)
 #define MICROPY_PY_UHASHLIB_SHA1    (MICROPY_PY_USSL)
 #define MICROPY_PY_UCRYPTOLIB       (MICROPY_PY_USSL)
-#define MICROPY_PY_UOS              (0)
-#ifndef MICROPY_PY_UOS_STM32
-#define MICROPY_PY_UOS_STM32        (1)
-#endif
+#define MICROPY_PY_UOS_INCLUDEFILE  "ports/stm32/moduos.c"
 #define MICROPY_PY_OS_DUPTERM       (3)
 #define MICROPY_PY_UOS_DUPTERM_BUILTIN_STREAM (1)
+#define MICROPY_PY_UOS_DUPTERM_STREAM_DETACHED_ATTACHED (1)
+#define MICROPY_PY_UOS_SEP          (1)
+#define MICROPY_PY_UOS_SYNC         (1)
+#define MICROPY_PY_UOS_UNAME        (1)
+#define MICROPY_PY_UOS_URANDOM      (MICROPY_HW_ENABLE_RNG)
 #define MICROPY_PY_URANDOM_SEED_INIT_FUNC (rng_get())
 #ifndef MICROPY_PY_UTIME
 #define MICROPY_PY_UTIME            (1)
@@ -178,7 +180,6 @@ extern const struct _mp_obj_module_t mp_module_uzlib;
 extern const struct _mp_obj_module_t mp_module_ujson;
 extern const struct _mp_obj_module_t mp_module_uheapq;
 extern const struct _mp_obj_module_t mp_module_uhashlib;
-extern const struct _mp_obj_module_t mp_module_uos;
 extern const struct _mp_obj_module_t mp_module_utime;
 extern const struct _mp_obj_module_t mp_module_usocket;
 extern const struct _mp_obj_module_t mp_module_network;
@@ -204,12 +205,6 @@ extern const struct _mp_obj_module_t mp_module_onewire;
 #define MACHINE_BUILTIN_MODULE_CONSTANTS
 #endif
 
-#if MICROPY_PY_UOS_STM32
-#define UOS_BUILTIN_MODULE                  { MP_ROM_QSTR(MP_QSTR_uos), MP_ROM_PTR(&mp_module_uos) },
-#else
-#define UOS_BUILTIN_MODULE
-#endif
-
 #if MICROPY_PY_UTIME
 #define UTIME_BUILTIN_MODULE                { MP_ROM_QSTR(MP_QSTR_utime), MP_ROM_PTR(&mp_module_utime) },
 #else
@@ -274,7 +269,6 @@ extern const struct _mod_network_nic_type_t mod_network_nic_type_cc3k;
 #define MICROPY_PORT_BUILTIN_MODULES \
     PYB_BUILTIN_MODULE \
     STM_BUILTIN_MODULE \
-    UOS_BUILTIN_MODULE \
     UTIME_BUILTIN_MODULE \
     SOCKET_BUILTIN_MODULE \
     NETWORK_BUILTIN_MODULE \
diff --git a/ports/stm32/portmodules.h b/ports/stm32/portmodules.h
index 81cb7fd04af0d..f80b4fdf8270f 100644
--- a/ports/stm32/portmodules.h
+++ b/ports/stm32/portmodules.h
@@ -28,7 +28,6 @@
 
 extern const mp_obj_module_t pyb_module;
 extern const mp_obj_module_t stm_module;
-extern const mp_obj_module_t mp_module_uos;
 extern const mp_obj_module_t mp_module_utime;
 extern const mp_obj_module_t mp_module_usocket;
 
@@ -37,7 +36,6 @@ extern const mp_obj_module_t mp_module_usocket;
 MP_DECLARE_CONST_FUN_OBJ_1(time_sleep_ms_obj);
 MP_DECLARE_CONST_FUN_OBJ_1(time_sleep_us_obj);
 
-MP_DECLARE_CONST_FUN_OBJ_0(mod_os_sync_obj);
-MP_DECLARE_CONST_FUN_OBJ_VAR_BETWEEN(mod_os_dupterm_obj);
+MP_DECLARE_CONST_FUN_OBJ_0(mp_uos_sync_obj);
 
 #endif // MICROPY_INCLUDED_STM32_PORTMODULES_H

From ade2720e55e5960f6667d952c4482a369747e3a4 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 3 Mar 2022 23:46:16 +1100
Subject: [PATCH 1783/3533] esp8266/moduos: Convert module to use extmod
 version.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/moduos.c              | 15 +++++-
 ports/esp8266/Makefile       |  1 -
 ports/esp8266/main.c         |  3 +-
 ports/esp8266/moduos.c       | 88 ++++--------------------------------
 ports/esp8266/mpconfigport.h |  9 +++-
 5 files changed, 31 insertions(+), 85 deletions(-)

diff --git a/extmod/moduos.c b/extmod/moduos.c
index 28c482dd9168b..0ec38bff8a3dc 100644
--- a/extmod/moduos.c
+++ b/extmod/moduos.c
@@ -55,6 +55,13 @@
 #endif
 
 #if MICROPY_PY_UOS_UNAME
+
+#if MICROPY_PY_UOS_UNAME_RELEASE_DYNAMIC
+#define CONST_RELEASE
+#else
+#define CONST_RELEASE const
+#endif
+
 STATIC const qstr mp_uos_uname_info_fields[] = {
     MP_QSTR_sysname,
     MP_QSTR_nodename,
@@ -64,7 +71,7 @@ STATIC const qstr mp_uos_uname_info_fields[] = {
 };
 STATIC const MP_DEFINE_STR_OBJ(mp_uos_uname_info_sysname_obj, MICROPY_PY_SYS_PLATFORM);
 STATIC const MP_DEFINE_STR_OBJ(mp_uos_uname_info_nodename_obj, MICROPY_PY_SYS_PLATFORM);
-STATIC const MP_DEFINE_STR_OBJ(mp_uos_uname_info_release_obj, MICROPY_VERSION_STRING);
+STATIC CONST_RELEASE MP_DEFINE_STR_OBJ(mp_uos_uname_info_release_obj, MICROPY_VERSION_STRING);
 STATIC const MP_DEFINE_STR_OBJ(mp_uos_uname_info_version_obj, MICROPY_GIT_TAG " on " MICROPY_BUILD_DATE MICROPY_BUILD_TYPE_PAREN);
 STATIC const MP_DEFINE_STR_OBJ(mp_uos_uname_info_machine_obj, MICROPY_HW_BOARD_NAME " with " MICROPY_HW_MCU_NAME);
 
@@ -80,9 +87,15 @@ STATIC MP_DEFINE_ATTRTUPLE(
     );
 
 STATIC mp_obj_t mp_uos_uname(void) {
+    #if MICROPY_PY_UOS_UNAME_RELEASE_DYNAMIC
+    const char *release = mp_uos_uname_release();
+    mp_uos_uname_info_release_obj.len = strlen(release);
+    mp_uos_uname_info_release_obj.data = (const byte *)release;
+    #endif
     return MP_OBJ_FROM_PTR(&mp_uos_uname_info_obj);
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_0(mp_uos_uname_obj, mp_uos_uname);
+
 #endif
 
 STATIC const mp_rom_map_elem_t os_module_globals_table[] = {
diff --git a/ports/esp8266/Makefile b/ports/esp8266/Makefile
index d0afe73ea8b04..fd2346d515f58 100644
--- a/ports/esp8266/Makefile
+++ b/ports/esp8266/Makefile
@@ -102,7 +102,6 @@ SRC_C = \
 	modesp.c \
 	modnetwork.c \
 	modutime.c \
-	moduos.c \
 	ets_alt_task.c \
 	fatfs_port.c \
 	posix_helpers.c \
diff --git a/ports/esp8266/main.c b/ports/esp8266/main.c
index 5d7debced02b0..1ae3f85bff8fa 100644
--- a/ports/esp8266/main.c
+++ b/ports/esp8266/main.c
@@ -69,8 +69,7 @@ STATIC void mp_reset(void) {
         args[1] = MP_OBJ_NEW_SMALL_INT(115200);
         args[0] = pyb_uart_type.make_new(&pyb_uart_type, 2, 0, args);
         args[1] = MP_OBJ_NEW_SMALL_INT(1);
-        extern mp_obj_t os_dupterm(size_t n_args, const mp_obj_t *args);
-        os_dupterm(2, args);
+        mp_uos_dupterm_obj.fun.var(2, args);
     }
 
     #if MICROPY_MODULE_FROZEN
diff --git a/ports/esp8266/moduos.c b/ports/esp8266/moduos.c
index f04094fbed907..9a235e61b9b9f 100644
--- a/ports/esp8266/moduos.c
+++ b/ports/esp8266/moduos.c
@@ -37,37 +37,11 @@
 #include "esp_mphal.h"
 #include "user_interface.h"
 
-STATIC const qstr os_uname_info_fields[] = {
-    MP_QSTR_sysname, MP_QSTR_nodename,
-    MP_QSTR_release, MP_QSTR_version, MP_QSTR_machine
-};
-STATIC const MP_DEFINE_STR_OBJ(os_uname_info_sysname_obj, MICROPY_PY_SYS_PLATFORM);
-STATIC const MP_DEFINE_STR_OBJ(os_uname_info_nodename_obj, MICROPY_PY_SYS_PLATFORM);
-STATIC const MP_DEFINE_STR_OBJ(os_uname_info_version_obj, MICROPY_GIT_TAG " on " MICROPY_BUILD_DATE);
-STATIC const MP_DEFINE_STR_OBJ(os_uname_info_machine_obj, MICROPY_HW_BOARD_NAME " with " MICROPY_HW_MCU_NAME);
-
-STATIC mp_obj_tuple_t os_uname_info_obj = {
-    .base = {&mp_type_attrtuple},
-    .len = 5,
-    .items = {
-        (mp_obj_t)&os_uname_info_sysname_obj,
-        (mp_obj_t)&os_uname_info_nodename_obj,
-        NULL,
-        (mp_obj_t)&os_uname_info_version_obj,
-        (mp_obj_t)&os_uname_info_machine_obj,
-        (void *)os_uname_info_fields,
-    }
-};
-
-STATIC mp_obj_t os_uname(void) {
-    // We must populate the "release" field each time in case it was GC'd since the last call.
-    const char *ver = system_get_sdk_version();
-    os_uname_info_obj.items[2] = mp_obj_new_str(ver, strlen(ver));
-    return (mp_obj_t)&os_uname_info_obj;
+STATIC const char *mp_uos_uname_release(void) {
+    return system_get_sdk_version();
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(os_uname_obj, os_uname);
 
-STATIC mp_obj_t os_urandom(mp_obj_t num) {
+STATIC mp_obj_t mp_uos_urandom(mp_obj_t num) {
     mp_int_t n = mp_obj_get_int(num);
     vstr_t vstr;
     vstr_init_len(&vstr, n);
@@ -76,64 +50,20 @@ STATIC mp_obj_t os_urandom(mp_obj_t num) {
     }
     return mp_obj_new_str_from_vstr(&mp_type_bytes, &vstr);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(os_urandom_obj, os_urandom);
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_uos_urandom_obj, mp_uos_urandom);
 
-// We wrap the mp_uos_dupterm function to detect if a UART is attached or not
-mp_obj_t os_dupterm(size_t n_args, const mp_obj_t *args) {
-    mp_obj_t prev_obj = mp_uos_dupterm_obj.fun.var(n_args, args);
-    if (mp_obj_get_type(args[0]) == &pyb_uart_type) {
+void mp_uos_dupterm_stream_detached_attached(mp_obj_t stream_detached, mp_obj_t stream_attached) {
+    if (mp_obj_get_type(stream_attached) == &pyb_uart_type) {
         ++uart_attached_to_dupterm;
     }
-    if (mp_obj_get_type(prev_obj) == &pyb_uart_type) {
+    if (mp_obj_get_type(stream_detached) == &pyb_uart_type) {
         --uart_attached_to_dupterm;
     }
-    return prev_obj;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(os_dupterm_obj, 1, 2, os_dupterm);
 
-STATIC mp_obj_t os_dupterm_notify(mp_obj_t obj_in) {
+STATIC mp_obj_t mp_uos_dupterm_notify(mp_obj_t obj_in) {
     (void)obj_in;
     mp_hal_signal_dupterm_input();
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(os_dupterm_notify_obj, os_dupterm_notify);
-
-STATIC const mp_rom_map_elem_t os_module_globals_table[] = {
-    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_uos) },
-    { MP_ROM_QSTR(MP_QSTR_uname), MP_ROM_PTR(&os_uname_obj) },
-    { MP_ROM_QSTR(MP_QSTR_urandom), MP_ROM_PTR(&os_urandom_obj) },
-    #if MICROPY_PY_OS_DUPTERM
-    { MP_ROM_QSTR(MP_QSTR_dupterm), MP_ROM_PTR(&os_dupterm_obj) },
-    { MP_ROM_QSTR(MP_QSTR_dupterm_notify), MP_ROM_PTR(&os_dupterm_notify_obj) },
-    #endif
-    #if MICROPY_VFS
-    { MP_ROM_QSTR(MP_QSTR_ilistdir), MP_ROM_PTR(&mp_vfs_ilistdir_obj) },
-    { MP_ROM_QSTR(MP_QSTR_listdir), MP_ROM_PTR(&mp_vfs_listdir_obj) },
-    { MP_ROM_QSTR(MP_QSTR_mkdir), MP_ROM_PTR(&mp_vfs_mkdir_obj) },
-    { MP_ROM_QSTR(MP_QSTR_rmdir), MP_ROM_PTR(&mp_vfs_rmdir_obj) },
-    { MP_ROM_QSTR(MP_QSTR_chdir), MP_ROM_PTR(&mp_vfs_chdir_obj) },
-    { MP_ROM_QSTR(MP_QSTR_getcwd), MP_ROM_PTR(&mp_vfs_getcwd_obj) },
-    { MP_ROM_QSTR(MP_QSTR_remove), MP_ROM_PTR(&mp_vfs_remove_obj) },
-    { MP_ROM_QSTR(MP_QSTR_rename), MP_ROM_PTR(&mp_vfs_rename_obj) },
-    { MP_ROM_QSTR(MP_QSTR_stat), MP_ROM_PTR(&mp_vfs_stat_obj) },
-    { MP_ROM_QSTR(MP_QSTR_statvfs), MP_ROM_PTR(&mp_vfs_statvfs_obj) },
-    { MP_ROM_QSTR(MP_QSTR_mount), MP_ROM_PTR(&mp_vfs_mount_obj) },
-    { MP_ROM_QSTR(MP_QSTR_umount), MP_ROM_PTR(&mp_vfs_umount_obj) },
-    #if MICROPY_VFS_FAT
-    { MP_ROM_QSTR(MP_QSTR_VfsFat), MP_ROM_PTR(&mp_fat_vfs_type) },
-    #endif
-    #if MICROPY_VFS_LFS1
-    { MP_ROM_QSTR(MP_QSTR_VfsLfs1), MP_ROM_PTR(&mp_type_vfs_lfs1) },
-    #endif
-    #if MICROPY_VFS_LFS2
-    { MP_ROM_QSTR(MP_QSTR_VfsLfs2), MP_ROM_PTR(&mp_type_vfs_lfs2) },
-    #endif
-    #endif
-};
-
-STATIC MP_DEFINE_CONST_DICT(os_module_globals, os_module_globals_table);
-
-const mp_obj_module_t uos_module = {
-    .base = { &mp_type_module },
-    .globals = (mp_obj_dict_t *)&os_module_globals,
-};
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_uos_dupterm_notify_obj, mp_uos_dupterm_notify);
diff --git a/ports/esp8266/mpconfigport.h b/ports/esp8266/mpconfigport.h
index 49c53a46718c4..ad73f465a3081 100644
--- a/ports/esp8266/mpconfigport.h
+++ b/ports/esp8266/mpconfigport.h
@@ -95,7 +95,14 @@
 #define MICROPY_PY_WEBREPL_DELAY    (20)
 #define MICROPY_PY_WEBREPL_STATIC_FILEBUF (1)
 #define MICROPY_PY_MICROPYTHON_MEM_INFO (1)
+#define MICROPY_PY_UOS              (1)
+#define MICROPY_PY_UOS_INCLUDEFILE  "ports/esp8266/moduos.c"
 #define MICROPY_PY_OS_DUPTERM       (2)
+#define MICROPY_PY_UOS_DUPTERM_NOTIFY (1)
+#define MICROPY_PY_UOS_DUPTERM_STREAM_DETACHED_ATTACHED (1)
+#define MICROPY_PY_UOS_UNAME        (1)
+#define MICROPY_PY_UOS_UNAME_RELEASE_DYNAMIC (1)
+#define MICROPY_PY_UOS_URANDOM      (1)
 #define MICROPY_CPYTHON_COMPAT      (1)
 #define MICROPY_LONGINT_IMPL        (MICROPY_LONGINT_IMPL_MPZ)
 #define MICROPY_FLOAT_IMPL          (MICROPY_FLOAT_IMPL_FLOAT)
@@ -172,7 +179,6 @@ extern const struct _mp_print_t mp_debug_print;
 extern const struct _mp_obj_module_t esp_module;
 extern const struct _mp_obj_module_t network_module;
 extern const struct _mp_obj_module_t utime_module;
-extern const struct _mp_obj_module_t uos_module;
 extern const struct _mp_obj_module_t mp_module_lwip;
 extern const struct _mp_obj_module_t mp_module_onewire;
 
@@ -181,7 +187,6 @@ extern const struct _mp_obj_module_t mp_module_onewire;
     { MP_ROM_QSTR(MP_QSTR_usocket), MP_ROM_PTR(&mp_module_lwip) }, \
     { MP_ROM_QSTR(MP_QSTR_network), MP_ROM_PTR(&network_module) }, \
     { MP_ROM_QSTR(MP_QSTR_utime), MP_ROM_PTR(&utime_module) }, \
-    { MP_ROM_QSTR(MP_QSTR_uos), MP_ROM_PTR(&uos_module) }, \
     { MP_ROM_QSTR(MP_QSTR__onewire), MP_ROM_PTR(&mp_module_onewire) }, \
 
 #define MP_STATE_PORT MP_STATE_VM

From 2b409ef8a46015f8f3bd20bc44e644637dbe9bd3 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 9 Mar 2022 12:32:44 +1100
Subject: [PATCH 1784/3533] unix/moduos: Convert module to use extmod version.

All variants now use extmod/moduos.c as their uos module implementation.
In particular this means they all have MICROPY_VFS enabled and use VfsPosix
for their filesystem.

As part of this, the available functions in uos become more consistent with
other ports:
- coverage variant gets uos.urandom
- minimal and standard variant get: unlink, chdir, getcwd, listdir

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/moduos.c                               |  18 +
 ports/unix/Makefile                           |   2 -
 ports/unix/main.c                             |  32 --
 ports/unix/modos.c                            | 359 ------------------
 ports/unix/moduos.c                           | 123 ++++++
 ports/unix/moduos_vfs.c                       |  94 -----
 ports/unix/modusocket.c                       |   3 +-
 ports/unix/mpconfigport.h                     |  22 +-
 .../unix/variants/coverage/mpconfigvariant.h  |  10 -
 ports/unix/variants/dev/mpconfigvariant.h     |   9 -
 ports/unix/variants/minimal/mpconfigvariant.h |  13 +-
 11 files changed, 163 insertions(+), 522 deletions(-)
 delete mode 100644 ports/unix/modos.c
 create mode 100644 ports/unix/moduos.c
 delete mode 100644 ports/unix/moduos_vfs.c

diff --git a/extmod/moduos.c b/extmod/moduos.c
index 0ec38bff8a3dc..ed278dd545820 100644
--- a/extmod/moduos.c
+++ b/extmod/moduos.c
@@ -40,6 +40,10 @@
 #include "extmod/vfs_lfs.h"
 #endif
 
+#if MICROPY_VFS_POSIX
+#include "extmod/vfs_posix.h"
+#endif
+
 #if MICROPY_PY_UOS_UNAME
 #include "genhdr/mpversion.h"
 #endif
@@ -101,12 +105,20 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_0(mp_uos_uname_obj, mp_uos_uname);
 STATIC const mp_rom_map_elem_t os_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_uos) },
 
+    #if MICROPY_PY_UOS_GETENV_PUTENV_UNSETENV
+    { MP_ROM_QSTR(MP_QSTR_getenv), MP_ROM_PTR(&mp_uos_getenv_obj) },
+    { MP_ROM_QSTR(MP_QSTR_putenv), MP_ROM_PTR(&mp_uos_putenv_obj) },
+    { MP_ROM_QSTR(MP_QSTR_unsetenv), MP_ROM_PTR(&mp_uos_unsetenv_obj) },
+    #endif
     #if MICROPY_PY_UOS_SEP
     { MP_ROM_QSTR(MP_QSTR_sep), MP_ROM_QSTR(MP_QSTR__slash_) },
     #endif
     #if MICROPY_PY_UOS_SYNC
     { MP_ROM_QSTR(MP_QSTR_sync), MP_ROM_PTR(&mp_uos_sync_obj) },
     #endif
+    #if MICROPY_PY_UOS_SYSTEM
+    { MP_ROM_QSTR(MP_QSTR_system), MP_ROM_PTR(&mp_uos_system_obj) },
+    #endif
     #if MICROPY_PY_UOS_UNAME
     { MP_ROM_QSTR(MP_QSTR_uname), MP_ROM_PTR(&mp_uos_uname_obj) },
     #endif
@@ -135,6 +147,9 @@ STATIC const mp_rom_map_elem_t os_module_globals_table[] = {
     #if MICROPY_PY_UOS_DUPTERM_NOTIFY
     { MP_ROM_QSTR(MP_QSTR_dupterm_notify), MP_ROM_PTR(&mp_uos_dupterm_notify_obj) },
     #endif
+    #if MICROPY_PY_UOS_ERRNO
+    { MP_ROM_QSTR(MP_QSTR_errno), MP_ROM_PTR(&mp_uos_errno_obj) },
+    #endif
 
     #if MICROPY_VFS
     { MP_ROM_QSTR(MP_QSTR_ilistdir), MP_ROM_PTR(&mp_vfs_ilistdir_obj) },
@@ -149,6 +164,9 @@ STATIC const mp_rom_map_elem_t os_module_globals_table[] = {
     #if MICROPY_VFS_LFS2
     { MP_ROM_QSTR(MP_QSTR_VfsLfs2), MP_ROM_PTR(&mp_type_vfs_lfs2) },
     #endif
+    #if MICROPY_VFS_POSIX
+    { MP_ROM_QSTR(MP_QSTR_VfsPosix), MP_ROM_PTR(&mp_type_vfs_posix) },
+    #endif
     #endif
 };
 STATIC MP_DEFINE_CONST_DICT(os_module_globals, os_module_globals_table);
diff --git a/ports/unix/Makefile b/ports/unix/Makefile
index 7732211e2da28..d93cdf5d7f574 100644
--- a/ports/unix/Makefile
+++ b/ports/unix/Makefile
@@ -225,8 +225,6 @@ SRC_C += \
 	mpthreadport.c \
 	input.c \
 	modmachine.c \
-	modos.c \
-	moduos_vfs.c \
 	modtime.c \
 	moduselect.c \
 	alloc.c \
diff --git a/ports/unix/main.c b/ports/unix/main.c
index 2769f33191368..bde867f8c8cb1 100644
--- a/ports/unix/main.c
+++ b/ports/unix/main.c
@@ -723,38 +723,6 @@ MP_NOINLINE int main_(int argc, char **argv) {
     return ret & 0xff;
 }
 
-#if !MICROPY_VFS
-uint mp_import_stat(const char *path) {
-    struct stat st;
-    if (stat(path, &st) == 0) {
-        if (S_ISDIR(st.st_mode)) {
-            return MP_IMPORT_STAT_DIR;
-        } else if (S_ISREG(st.st_mode)) {
-            return MP_IMPORT_STAT_FILE;
-        }
-    }
-    return MP_IMPORT_STAT_NO_EXIST;
-}
-
-#if MICROPY_PY_IO
-// Factory function for I/O stream classes, only needed if generic VFS subsystem isn't used.
-// Note: buffering and encoding are currently ignored.
-mp_obj_t mp_builtin_open(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kwargs) {
-    enum { ARG_file, ARG_mode };
-    STATIC const mp_arg_t allowed_args[] = {
-        { MP_QSTR_file, MP_ARG_OBJ | MP_ARG_REQUIRED, {.u_rom_obj = MP_ROM_NONE} },
-        { MP_QSTR_mode, MP_ARG_OBJ, {.u_obj = MP_OBJ_NEW_QSTR(MP_QSTR_r)} },
-        { MP_QSTR_buffering, MP_ARG_INT, {.u_int = -1} },
-        { MP_QSTR_encoding, MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
-    };
-    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
-    mp_arg_parse_all(n_args, pos_args, kwargs, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
-    return mp_vfs_posix_file_open(&mp_type_textio, args[ARG_file].u_obj, args[ARG_mode].u_obj);
-}
-MP_DEFINE_CONST_FUN_OBJ_KW(mp_builtin_open_obj, 1, mp_builtin_open);
-#endif
-#endif
-
 void nlr_jump_fail(void *val) {
     fprintf(stderr, "FATAL: uncaught NLR %p\n", val);
     exit(1);
diff --git a/ports/unix/modos.c b/ports/unix/modos.c
deleted file mode 100644
index 24e5c95b1830a..0000000000000
--- a/ports/unix/modos.c
+++ /dev/null
@@ -1,359 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2014-2018 Paul Sokolovsky
- * Copyright (c) 2014-2018 Damien P. George
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <dirent.h>
-#ifdef _MSC_VER
-#include <direct.h> // For mkdir
-#endif
-#include "py/mpconfig.h"
-
-#include "py/runtime.h"
-#include "py/objtuple.h"
-#include "py/mphal.h"
-#include "py/mpthread.h"
-#include "extmod/vfs.h"
-#include "extmod/misc.h"
-
-#ifdef __ANDROID__
-#define USE_STATFS 1
-#endif
-
-#if defined(__GLIBC__) && defined(__GLIBC_PREREQ)
-#if __GLIBC_PREREQ(2, 25)
-#include <sys/random.h>
-#define _HAVE_GETRANDOM
-#endif
-#endif
-
-STATIC mp_obj_t mod_os_urandom(mp_obj_t num) {
-    mp_int_t n = mp_obj_get_int(num);
-    vstr_t vstr;
-    vstr_init_len(&vstr, n);
-    #ifdef _HAVE_GETRANDOM
-    RAISE_ERRNO(getrandom(vstr.buf, n, 0), errno);
-    #else
-    int fd = open("/dev/urandom", O_RDONLY);
-    RAISE_ERRNO(fd, errno);
-    RAISE_ERRNO(read(fd, vstr.buf, n), errno);
-    close(fd);
-    #endif
-    return mp_obj_new_str_from_vstr(&mp_type_bytes, &vstr);
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_os_urandom_obj, mod_os_urandom);
-
-STATIC mp_obj_t mod_os_stat(mp_obj_t path_in) {
-    struct stat sb;
-    const char *path = mp_obj_str_get_str(path_in);
-
-    int res;
-    MP_HAL_RETRY_SYSCALL(res, stat(path, &sb), mp_raise_OSError(err));
-
-    mp_obj_tuple_t *t = MP_OBJ_TO_PTR(mp_obj_new_tuple(10, NULL));
-    t->items[0] = MP_OBJ_NEW_SMALL_INT(sb.st_mode);
-    t->items[1] = mp_obj_new_int_from_uint(sb.st_ino);
-    t->items[2] = mp_obj_new_int_from_uint(sb.st_dev);
-    t->items[3] = mp_obj_new_int_from_uint(sb.st_nlink);
-    t->items[4] = mp_obj_new_int_from_uint(sb.st_uid);
-    t->items[5] = mp_obj_new_int_from_uint(sb.st_gid);
-    t->items[6] = mp_obj_new_int_from_uint(sb.st_size);
-    t->items[7] = mp_obj_new_int_from_uint(sb.st_atime);
-    t->items[8] = mp_obj_new_int_from_uint(sb.st_mtime);
-    t->items[9] = mp_obj_new_int_from_uint(sb.st_ctime);
-    return MP_OBJ_FROM_PTR(t);
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_os_stat_obj, mod_os_stat);
-
-#if MICROPY_PY_OS_STATVFS
-
-#if USE_STATFS
-#include <sys/vfs.h>
-#define STRUCT_STATVFS struct statfs
-#define STATVFS statfs
-#define F_FAVAIL sb.f_ffree
-#define F_NAMEMAX sb.f_namelen
-#define F_FLAG sb.f_flags
-#else
-#include <sys/statvfs.h>
-#define STRUCT_STATVFS struct statvfs
-#define STATVFS statvfs
-#define F_FAVAIL sb.f_favail
-#define F_NAMEMAX sb.f_namemax
-#define F_FLAG sb.f_flag
-#endif
-
-STATIC mp_obj_t mod_os_statvfs(mp_obj_t path_in) {
-    STRUCT_STATVFS sb;
-    const char *path = mp_obj_str_get_str(path_in);
-
-    int res;
-    MP_HAL_RETRY_SYSCALL(res, STATVFS(path, &sb), mp_raise_OSError(err));
-
-    mp_obj_tuple_t *t = MP_OBJ_TO_PTR(mp_obj_new_tuple(10, NULL));
-    t->items[0] = MP_OBJ_NEW_SMALL_INT(sb.f_bsize);
-    t->items[1] = MP_OBJ_NEW_SMALL_INT(sb.f_frsize);
-    t->items[2] = MP_OBJ_NEW_SMALL_INT(sb.f_blocks);
-    t->items[3] = MP_OBJ_NEW_SMALL_INT(sb.f_bfree);
-    t->items[4] = MP_OBJ_NEW_SMALL_INT(sb.f_bavail);
-    t->items[5] = MP_OBJ_NEW_SMALL_INT(sb.f_files);
-    t->items[6] = MP_OBJ_NEW_SMALL_INT(sb.f_ffree);
-    t->items[7] = MP_OBJ_NEW_SMALL_INT(F_FAVAIL);
-    t->items[8] = MP_OBJ_NEW_SMALL_INT(F_FLAG);
-    t->items[9] = MP_OBJ_NEW_SMALL_INT(F_NAMEMAX);
-    return MP_OBJ_FROM_PTR(t);
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_os_statvfs_obj, mod_os_statvfs);
-#endif
-
-STATIC mp_obj_t mod_os_remove(mp_obj_t path_in) {
-    const char *path = mp_obj_str_get_str(path_in);
-
-    // Note that POSIX requires remove() to be able to delete a directory
-    // too (act as rmdir()). This is POSIX extenstion to ANSI C semantics
-    // of that function. But Python remove() follows ANSI C, and explicitly
-    // required to raise exception on attempt to remove a directory. Thus,
-    // call POSIX unlink() here.
-    MP_THREAD_GIL_EXIT();
-    int r = unlink(path);
-    MP_THREAD_GIL_ENTER();
-
-    RAISE_ERRNO(r, errno);
-
-    return mp_const_none;
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_os_remove_obj, mod_os_remove);
-
-STATIC mp_obj_t mod_os_rename(mp_obj_t old_path_in, mp_obj_t new_path_in) {
-    const char *old_path = mp_obj_str_get_str(old_path_in);
-    const char *new_path = mp_obj_str_get_str(new_path_in);
-
-    MP_THREAD_GIL_EXIT();
-    int r = rename(old_path, new_path);
-    MP_THREAD_GIL_ENTER();
-
-    RAISE_ERRNO(r, errno);
-
-    return mp_const_none;
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_os_rename_obj, mod_os_rename);
-
-STATIC mp_obj_t mod_os_rmdir(mp_obj_t path_in) {
-    const char *path = mp_obj_str_get_str(path_in);
-
-    MP_THREAD_GIL_EXIT();
-    int r = rmdir(path);
-    MP_THREAD_GIL_ENTER();
-
-    RAISE_ERRNO(r, errno);
-
-    return mp_const_none;
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_os_rmdir_obj, mod_os_rmdir);
-
-STATIC mp_obj_t mod_os_system(mp_obj_t cmd_in) {
-    const char *cmd = mp_obj_str_get_str(cmd_in);
-
-    MP_THREAD_GIL_EXIT();
-    int r = system(cmd);
-    MP_THREAD_GIL_ENTER();
-
-    RAISE_ERRNO(r, errno);
-
-    return MP_OBJ_NEW_SMALL_INT(r);
-}
-MP_DEFINE_CONST_FUN_OBJ_1(mod_os_system_obj, mod_os_system);
-
-STATIC mp_obj_t mod_os_getenv(mp_obj_t var_in) {
-    const char *s = getenv(mp_obj_str_get_str(var_in));
-    if (s == NULL) {
-        return mp_const_none;
-    }
-    return mp_obj_new_str(s, strlen(s));
-}
-MP_DEFINE_CONST_FUN_OBJ_1(mod_os_getenv_obj, mod_os_getenv);
-
-STATIC mp_obj_t mod_os_putenv(mp_obj_t key_in, mp_obj_t value_in) {
-    const char *key = mp_obj_str_get_str(key_in);
-    const char *value = mp_obj_str_get_str(value_in);
-    int ret;
-
-    #if _WIN32
-    ret = _putenv_s(key, value);
-    #else
-    ret = setenv(key, value, 1);
-    #endif
-
-    if (ret == -1) {
-        mp_raise_OSError(errno);
-    }
-    return mp_const_none;
-}
-MP_DEFINE_CONST_FUN_OBJ_2(mod_os_putenv_obj, mod_os_putenv);
-
-STATIC mp_obj_t mod_os_unsetenv(mp_obj_t key_in) {
-    const char *key = mp_obj_str_get_str(key_in);
-    int ret;
-
-    #if _WIN32
-    ret = _putenv_s(key, "");
-    #else
-    ret = unsetenv(key);
-    #endif
-
-    if (ret == -1) {
-        mp_raise_OSError(errno);
-    }
-    return mp_const_none;
-}
-MP_DEFINE_CONST_FUN_OBJ_1(mod_os_unsetenv_obj, mod_os_unsetenv);
-
-STATIC mp_obj_t mod_os_mkdir(mp_obj_t path_in) {
-    // TODO: Accept mode param
-    const char *path = mp_obj_str_get_str(path_in);
-    MP_THREAD_GIL_EXIT();
-    #ifdef _WIN32
-    int r = mkdir(path);
-    #else
-    int r = mkdir(path, 0777);
-    #endif
-    MP_THREAD_GIL_ENTER();
-    RAISE_ERRNO(r, errno);
-    return mp_const_none;
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_os_mkdir_obj, mod_os_mkdir);
-
-typedef struct _mp_obj_listdir_t {
-    mp_obj_base_t base;
-    mp_fun_1_t iternext;
-    DIR *dir;
-} mp_obj_listdir_t;
-
-STATIC mp_obj_t listdir_next(mp_obj_t self_in) {
-    mp_obj_listdir_t *self = MP_OBJ_TO_PTR(self_in);
-
-    if (self->dir == NULL) {
-        goto done;
-    }
-    MP_THREAD_GIL_EXIT();
-    struct dirent *dirent = readdir(self->dir);
-    if (dirent == NULL) {
-        closedir(self->dir);
-        MP_THREAD_GIL_ENTER();
-        self->dir = NULL;
-    done:
-        return MP_OBJ_STOP_ITERATION;
-    }
-    MP_THREAD_GIL_ENTER();
-
-    mp_obj_tuple_t *t = MP_OBJ_TO_PTR(mp_obj_new_tuple(3, NULL));
-    t->items[0] = mp_obj_new_str(dirent->d_name, strlen(dirent->d_name));
-
-    #ifdef _DIRENT_HAVE_D_TYPE
-    #ifdef DTTOIF
-    t->items[1] = MP_OBJ_NEW_SMALL_INT(DTTOIF(dirent->d_type));
-    #else
-    if (dirent->d_type == DT_DIR) {
-        t->items[1] = MP_OBJ_NEW_SMALL_INT(MP_S_IFDIR);
-    } else if (dirent->d_type == DT_REG) {
-        t->items[1] = MP_OBJ_NEW_SMALL_INT(MP_S_IFREG);
-    } else {
-        t->items[1] = MP_OBJ_NEW_SMALL_INT(dirent->d_type);
-    }
-    #endif
-    #else
-    // DT_UNKNOWN should have 0 value on any reasonable system
-    t->items[1] = MP_OBJ_NEW_SMALL_INT(0);
-    #endif
-
-    #ifdef _DIRENT_HAVE_D_INO
-    t->items[2] = MP_OBJ_NEW_SMALL_INT(dirent->d_ino);
-    #else
-    t->items[2] = MP_OBJ_NEW_SMALL_INT(0);
-    #endif
-    return MP_OBJ_FROM_PTR(t);
-}
-
-STATIC mp_obj_t mod_os_ilistdir(size_t n_args, const mp_obj_t *args) {
-    const char *path = ".";
-    if (n_args > 0) {
-        path = mp_obj_str_get_str(args[0]);
-    }
-    mp_obj_listdir_t *o = m_new_obj(mp_obj_listdir_t);
-    o->base.type = &mp_type_polymorph_iter;
-    MP_THREAD_GIL_EXIT();
-    o->dir = opendir(path);
-    MP_THREAD_GIL_ENTER();
-    o->iternext = listdir_next;
-    return MP_OBJ_FROM_PTR(o);
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_os_ilistdir_obj, 0, 1, mod_os_ilistdir);
-
-STATIC mp_obj_t mod_os_errno(size_t n_args, const mp_obj_t *args) {
-    if (n_args == 0) {
-        return MP_OBJ_NEW_SMALL_INT(errno);
-    }
-
-    errno = mp_obj_get_int(args[0]);
-    return mp_const_none;
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_os_errno_obj, 0, 1, mod_os_errno);
-
-STATIC const mp_rom_map_elem_t mp_module_os_globals_table[] = {
-    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_uos) },
-    { MP_ROM_QSTR(MP_QSTR_errno), MP_ROM_PTR(&mod_os_errno_obj) },
-    { MP_ROM_QSTR(MP_QSTR_stat), MP_ROM_PTR(&mod_os_stat_obj) },
-    { MP_ROM_QSTR(MP_QSTR_urandom), MP_ROM_PTR(&mod_os_urandom_obj) },
-    #if MICROPY_PY_OS_STATVFS
-    { MP_ROM_QSTR(MP_QSTR_statvfs), MP_ROM_PTR(&mod_os_statvfs_obj) },
-    #endif
-    { MP_ROM_QSTR(MP_QSTR_system), MP_ROM_PTR(&mod_os_system_obj) },
-    { MP_ROM_QSTR(MP_QSTR_remove), MP_ROM_PTR(&mod_os_remove_obj) },
-    { MP_ROM_QSTR(MP_QSTR_rename), MP_ROM_PTR(&mod_os_rename_obj) },
-    { MP_ROM_QSTR(MP_QSTR_rmdir), MP_ROM_PTR(&mod_os_rmdir_obj) },
-    { MP_ROM_QSTR(MP_QSTR_getenv), MP_ROM_PTR(&mod_os_getenv_obj) },
-    { MP_ROM_QSTR(MP_QSTR_putenv), MP_ROM_PTR(&mod_os_putenv_obj) },
-    { MP_ROM_QSTR(MP_QSTR_unsetenv), MP_ROM_PTR(&mod_os_unsetenv_obj) },
-    { MP_ROM_QSTR(MP_QSTR_mkdir), MP_ROM_PTR(&mod_os_mkdir_obj) },
-    { MP_ROM_QSTR(MP_QSTR_ilistdir), MP_ROM_PTR(&mod_os_ilistdir_obj) },
-    #if MICROPY_PY_OS_DUPTERM
-    { MP_ROM_QSTR(MP_QSTR_dupterm), MP_ROM_PTR(&mp_uos_dupterm_obj) },
-    #endif
-};
-
-STATIC MP_DEFINE_CONST_DICT(mp_module_os_globals, mp_module_os_globals_table);
-
-const mp_obj_module_t mp_module_os = {
-    .base = { &mp_type_module },
-    .globals = (mp_obj_dict_t *)&mp_module_os_globals,
-};
diff --git a/ports/unix/moduos.c b/ports/unix/moduos.c
new file mode 100644
index 0000000000000..1262cd2e29ac8
--- /dev/null
+++ b/ports/unix/moduos.c
@@ -0,0 +1,123 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2014-2018 Paul Sokolovsky
+ * Copyright (c) 2017-2022 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include <fcntl.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "py/runtime.h"
+#include "py/mphal.h"
+
+#if defined(__GLIBC__) && defined(__GLIBC_PREREQ)
+#if __GLIBC_PREREQ(2, 25)
+#include <sys/random.h>
+#define _HAVE_GETRANDOM
+#endif
+#endif
+
+STATIC mp_obj_t mp_uos_getenv(mp_obj_t var_in) {
+    const char *s = getenv(mp_obj_str_get_str(var_in));
+    if (s == NULL) {
+        return mp_const_none;
+    }
+    return mp_obj_new_str(s, strlen(s));
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_uos_getenv_obj, mp_uos_getenv);
+
+STATIC mp_obj_t mp_uos_putenv(mp_obj_t key_in, mp_obj_t value_in) {
+    const char *key = mp_obj_str_get_str(key_in);
+    const char *value = mp_obj_str_get_str(value_in);
+    int ret;
+
+    #if _WIN32
+    ret = _putenv_s(key, value);
+    #else
+    ret = setenv(key, value, 1);
+    #endif
+
+    if (ret == -1) {
+        mp_raise_OSError(errno);
+    }
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(mp_uos_putenv_obj, mp_uos_putenv);
+
+STATIC mp_obj_t mp_uos_unsetenv(mp_obj_t key_in) {
+    const char *key = mp_obj_str_get_str(key_in);
+    int ret;
+
+    #if _WIN32
+    ret = _putenv_s(key, "");
+    #else
+    ret = unsetenv(key);
+    #endif
+
+    if (ret == -1) {
+        mp_raise_OSError(errno);
+    }
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_uos_unsetenv_obj, mp_uos_unsetenv);
+
+STATIC mp_obj_t mp_uos_system(mp_obj_t cmd_in) {
+    const char *cmd = mp_obj_str_get_str(cmd_in);
+
+    MP_THREAD_GIL_EXIT();
+    int r = system(cmd);
+    MP_THREAD_GIL_ENTER();
+
+    RAISE_ERRNO(r, errno);
+
+    return MP_OBJ_NEW_SMALL_INT(r);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_uos_system_obj, mp_uos_system);
+
+STATIC mp_obj_t mp_uos_urandom(mp_obj_t num) {
+    mp_int_t n = mp_obj_get_int(num);
+    vstr_t vstr;
+    vstr_init_len(&vstr, n);
+    #ifdef _HAVE_GETRANDOM
+    RAISE_ERRNO(getrandom(vstr.buf, n, 0), errno);
+    #else
+    int fd = open("/dev/urandom", O_RDONLY);
+    RAISE_ERRNO(fd, errno);
+    RAISE_ERRNO(read(fd, vstr.buf, n), errno);
+    close(fd);
+    #endif
+    return mp_obj_new_str_from_vstr(&mp_type_bytes, &vstr);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_uos_urandom_obj, mp_uos_urandom);
+
+STATIC mp_obj_t mp_uos_errno(size_t n_args, const mp_obj_t *args) {
+    if (n_args == 0) {
+        return MP_OBJ_NEW_SMALL_INT(errno);
+    }
+
+    errno = mp_obj_get_int(args[0]);
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_uos_errno_obj, 0, 1, mp_uos_errno);
diff --git a/ports/unix/moduos_vfs.c b/ports/unix/moduos_vfs.c
deleted file mode 100644
index 6e4f352aad0f4..0000000000000
--- a/ports/unix/moduos_vfs.c
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2017 Damien P. George
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#include <stdint.h>
-#include <string.h>
-
-#include "extmod/vfs.h"
-#include "extmod/vfs_posix.h"
-#include "extmod/vfs_fat.h"
-#include "extmod/vfs_lfs.h"
-
-#if MICROPY_VFS
-
-// These are defined in modos.c
-MP_DECLARE_CONST_FUN_OBJ_VAR_BETWEEN(mod_os_errno_obj);
-MP_DECLARE_CONST_FUN_OBJ_1(mod_os_getenv_obj);
-MP_DECLARE_CONST_FUN_OBJ_1(mod_os_putenv_obj);
-MP_DECLARE_CONST_FUN_OBJ_1(mod_os_unsetenv_obj);
-MP_DECLARE_CONST_FUN_OBJ_1(mod_os_system_obj);
-
-STATIC const mp_rom_map_elem_t uos_vfs_module_globals_table[] = {
-    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_uos_vfs) },
-    { MP_ROM_QSTR(MP_QSTR_sep), MP_ROM_QSTR(MP_QSTR__slash_) },
-
-    { MP_ROM_QSTR(MP_QSTR_errno), MP_ROM_PTR(&mod_os_errno_obj) },
-    { MP_ROM_QSTR(MP_QSTR_getenv), MP_ROM_PTR(&mod_os_getenv_obj) },
-    { MP_ROM_QSTR(MP_QSTR_putenv), MP_ROM_PTR(&mod_os_putenv_obj) },
-    { MP_ROM_QSTR(MP_QSTR_unsetenv), MP_ROM_PTR(&mod_os_unsetenv_obj) },
-    { MP_ROM_QSTR(MP_QSTR_system), MP_ROM_PTR(&mod_os_system_obj) },
-
-    { MP_ROM_QSTR(MP_QSTR_mount), MP_ROM_PTR(&mp_vfs_mount_obj) },
-    { MP_ROM_QSTR(MP_QSTR_umount), MP_ROM_PTR(&mp_vfs_umount_obj) },
-
-    { MP_ROM_QSTR(MP_QSTR_chdir), MP_ROM_PTR(&mp_vfs_chdir_obj) },
-    { MP_ROM_QSTR(MP_QSTR_getcwd), MP_ROM_PTR(&mp_vfs_getcwd_obj) },
-    { MP_ROM_QSTR(MP_QSTR_ilistdir), MP_ROM_PTR(&mp_vfs_ilistdir_obj) },
-    { MP_ROM_QSTR(MP_QSTR_listdir), MP_ROM_PTR(&mp_vfs_listdir_obj) },
-    { MP_ROM_QSTR(MP_QSTR_mkdir), MP_ROM_PTR(&mp_vfs_mkdir_obj) },
-    { MP_ROM_QSTR(MP_QSTR_remove), MP_ROM_PTR(&mp_vfs_remove_obj) },
-    { MP_ROM_QSTR(MP_QSTR_rename),MP_ROM_PTR(&mp_vfs_rename_obj) },
-    { MP_ROM_QSTR(MP_QSTR_rmdir), MP_ROM_PTR(&mp_vfs_rmdir_obj) },
-    { MP_ROM_QSTR(MP_QSTR_stat), MP_ROM_PTR(&mp_vfs_stat_obj) },
-    { MP_ROM_QSTR(MP_QSTR_statvfs), MP_ROM_PTR(&mp_vfs_statvfs_obj) },
-    { MP_ROM_QSTR(MP_QSTR_unlink), MP_ROM_PTR(&mp_vfs_remove_obj) }, // unlink aliases to remove
-
-    #if MICROPY_PY_OS_DUPTERM
-    { MP_ROM_QSTR(MP_QSTR_dupterm), MP_ROM_PTR(&mp_uos_dupterm_obj) },
-    #endif
-
-    #if MICROPY_VFS_POSIX
-    { MP_ROM_QSTR(MP_QSTR_VfsPosix), MP_ROM_PTR(&mp_type_vfs_posix) },
-    #endif
-    #if MICROPY_VFS_FAT
-    { MP_ROM_QSTR(MP_QSTR_VfsFat), MP_ROM_PTR(&mp_fat_vfs_type) },
-    #endif
-    #if MICROPY_VFS_LFS1
-    { MP_ROM_QSTR(MP_QSTR_VfsLfs1), MP_ROM_PTR(&mp_type_vfs_lfs1) },
-    #endif
-    #if MICROPY_VFS_LFS2
-    { MP_ROM_QSTR(MP_QSTR_VfsLfs2), MP_ROM_PTR(&mp_type_vfs_lfs2) },
-    #endif
-};
-
-STATIC MP_DEFINE_CONST_DICT(uos_vfs_module_globals, uos_vfs_module_globals_table);
-
-const mp_obj_module_t mp_module_uos_vfs = {
-    .base = { &mp_type_module },
-    .globals = (mp_obj_dict_t *)&uos_vfs_module_globals,
-};
-
-#endif // MICROPY_VFS
diff --git a/ports/unix/modusocket.c b/ports/unix/modusocket.c
index 951cb7a21c68c..efa182e393731 100644
--- a/ports/unix/modusocket.c
+++ b/ports/unix/modusocket.c
@@ -46,6 +46,7 @@
 #include "py/builtin.h"
 #include "py/mphal.h"
 #include "py/mpthread.h"
+#include "extmod/vfs.h"
 #include <poll.h>
 
 /*
@@ -445,7 +446,7 @@ STATIC mp_obj_t socket_makefile(size_t n_args, const mp_obj_t *args) {
     mp_obj_t *new_args = alloca(n_args * sizeof(mp_obj_t));
     memcpy(new_args + 1, args + 1, (n_args - 1) * sizeof(mp_obj_t));
     new_args[0] = MP_OBJ_NEW_SMALL_INT(self->fd);
-    return mp_builtin_open(n_args, new_args, (mp_map_t *)&mp_const_empty_map);
+    return mp_vfs_open(n_args, new_args, (mp_map_t *)&mp_const_empty_map);
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(socket_makefile_obj, 1, 3, socket_makefile);
 
diff --git a/ports/unix/mpconfigport.h b/ports/unix/mpconfigport.h
index d54d0b3ef3dd7..f96abb9420818 100644
--- a/ports/unix/mpconfigport.h
+++ b/ports/unix/mpconfigport.h
@@ -64,6 +64,7 @@
 // check stdout a chance to pass, etc.
 #define MICROPY_DEBUG_PRINTER       (&mp_stderr_print)
 #define MICROPY_READER_POSIX        (1)
+#define MICROPY_READER_VFS          (1)
 #define MICROPY_USE_READLINE_HISTORY (1)
 #define MICROPY_HELPER_REPL         (1)
 #define MICROPY_REPL_EMACS_KEYS     (1)
@@ -88,7 +89,8 @@
 #define MICROPY_MODULE_WEAK_LINKS   (1)
 #define MICROPY_MODULE_OVERRIDE_MAIN_IMPORT (1)
 #define MICROPY_CAN_OVERRIDE_BUILTINS (1)
-#define MICROPY_VFS_POSIX_FILE      (1)
+#define MICROPY_VFS                 (1)
+#define MICROPY_VFS_POSIX           (1)
 #define MICROPY_PY_FUNCTION_ATTRS   (1)
 #define MICROPY_PY_DESCRIPTORS      (1)
 #define MICROPY_PY_DELATTR_SETATTR  (1)
@@ -146,7 +148,13 @@
 #define MICROPY_STACKLESS_STRICT    (0)
 #endif
 
-#define MICROPY_PY_OS_STATVFS       (1)
+#define MICROPY_PY_UOS              (1)
+#define MICROPY_PY_UOS_INCLUDEFILE  "ports/unix/moduos.c"
+#define MICROPY_PY_UOS_ERRNO        (1)
+#define MICROPY_PY_UOS_GETENV_PUTENV_UNSETENV (1)
+#define MICROPY_PY_UOS_SEP          (1)
+#define MICROPY_PY_UOS_SYSTEM       (1)
+#define MICROPY_PY_UOS_URANDOM      (1)
 #define MICROPY_PY_UTIME            (1)
 #define MICROPY_PY_UTIME_MP_HAL     (1)
 #define MICROPY_PY_UERRNO           (1)
@@ -201,11 +209,11 @@ extern const struct _mp_print_t mp_stderr_print;
 #define MICROPY_KBD_EXCEPTION       (1)
 #define MICROPY_ASYNC_KBD_INTR      (1)
 
+#define mp_import_stat mp_vfs_import_stat
+#define mp_builtin_open_obj mp_vfs_open_obj
 #define mp_type_fileio mp_type_vfs_posix_fileio
 #define mp_type_textio mp_type_vfs_posix_textio
 
-extern const struct _mp_obj_module_t mp_module_os;
-extern const struct _mp_obj_module_t mp_module_uos_vfs;
 extern const struct _mp_obj_module_t mp_module_uselect;
 extern const struct _mp_obj_module_t mp_module_time;
 extern const struct _mp_obj_module_t mp_module_termios;
@@ -213,11 +221,6 @@ extern const struct _mp_obj_module_t mp_module_socket;
 extern const struct _mp_obj_module_t mp_module_ffi;
 extern const struct _mp_obj_module_t mp_module_jni;
 
-#if MICROPY_PY_UOS_VFS
-#define MICROPY_PY_UOS_DEF { MP_ROM_QSTR(MP_QSTR_uos), MP_ROM_PTR(&mp_module_uos_vfs) },
-#else
-#define MICROPY_PY_UOS_DEF { MP_ROM_QSTR(MP_QSTR_uos), MP_ROM_PTR(&mp_module_os) },
-#endif
 #if MICROPY_PY_FFI
 #define MICROPY_PY_FFI_DEF { MP_ROM_QSTR(MP_QSTR_ffi), MP_ROM_PTR(&mp_module_ffi) },
 #else
@@ -254,7 +257,6 @@ extern const struct _mp_obj_module_t mp_module_jni;
     MICROPY_PY_JNI_DEF \
     MICROPY_PY_UTIME_DEF \
     MICROPY_PY_SOCKET_DEF \
-    MICROPY_PY_UOS_DEF \
     MICROPY_PY_USELECT_DEF \
     MICROPY_PY_TERMIOS_DEF \
 
diff --git a/ports/unix/variants/coverage/mpconfigvariant.h b/ports/unix/variants/coverage/mpconfigvariant.h
index 5ce40edbb9791..db01c4bcd5f03 100644
--- a/ports/unix/variants/coverage/mpconfigvariant.h
+++ b/ports/unix/variants/coverage/mpconfigvariant.h
@@ -27,14 +27,10 @@
 // This config enables almost all possible features such that it can be used
 // for coverage testing.
 
-#define MICROPY_VFS                    (1)
-#define MICROPY_PY_UOS_VFS             (1)
-
 #define MICROPY_DEBUG_PARSE_RULE_NAME  (1)
 #define MICROPY_OPT_MATH_FACTORIAL     (1)
 #define MICROPY_FLOAT_HIGH_QUALITY_HASH (1)
 #define MICROPY_ENABLE_SCHEDULER       (1)
-#define MICROPY_READER_VFS             (1)
 #define MICROPY_REPL_EMACS_WORDS_MOVE  (1)
 #define MICROPY_REPL_EMACS_EXTRA_WORDS_MOVE (1)
 #define MICROPY_WARNINGS_CATEGORY      (1)
@@ -57,14 +53,8 @@
 #define MICROPY_PY_URE_MATCH_GROUPS    (1)
 #define MICROPY_PY_URE_MATCH_SPAN_START_END (1)
 #define MICROPY_PY_URE_SUB             (1)
-#define MICROPY_VFS_POSIX              (1)
 #define MICROPY_PY_FRAMEBUF            (1)
 #define MICROPY_PY_COLLECTIONS_NAMEDTUPLE__ASDICT (1)
 #define MICROPY_PY_UCRYPTOLIB          (1)
 #define MICROPY_PY_UCRYPTOLIB_CTR      (1)
 #define MICROPY_PY_MICROPYTHON_HEAP_LOCKED (1)
-
-// use vfs's functions for import stat and builtin open
-#define mp_import_stat mp_vfs_import_stat
-#define mp_builtin_open mp_vfs_open
-#define mp_builtin_open_obj mp_vfs_open_obj
diff --git a/ports/unix/variants/dev/mpconfigvariant.h b/ports/unix/variants/dev/mpconfigvariant.h
index 35c24c5f005ca..280243e34439c 100644
--- a/ports/unix/variants/dev/mpconfigvariant.h
+++ b/ports/unix/variants/dev/mpconfigvariant.h
@@ -24,25 +24,16 @@
  * THE SOFTWARE.
  */
 
-#define MICROPY_READER_VFS                      (1)
 #define MICROPY_REPL_EMACS_WORDS_MOVE           (1)
 #define MICROPY_REPL_EMACS_EXTRA_WORDS_MOVE     (1)
 #define MICROPY_ENABLE_SCHEDULER                (1)
-#define MICROPY_VFS                             (1)
-#define MICROPY_VFS_POSIX                       (1)
 
 #define MICROPY_PY_BUILTINS_HELP                (1)
 #define MICROPY_PY_BUILTINS_HELP_MODULES        (1)
 #define MICROPY_PY_MATH_CONSTANTS               (1)
 #define MICROPY_PY_SYS_SETTRACE                 (1)
-#define MICROPY_PY_UOS_VFS                      (1)
 #define MICROPY_PY_URANDOM_EXTRA_FUNCS          (1)
 
 #ifndef MICROPY_PY_UASYNCIO
 #define MICROPY_PY_UASYNCIO                     (1)
 #endif
-
-// Use vfs's functions for import stat and builtin open.
-#define mp_import_stat mp_vfs_import_stat
-#define mp_builtin_open mp_vfs_open
-#define mp_builtin_open_obj mp_vfs_open_obj
diff --git a/ports/unix/variants/minimal/mpconfigvariant.h b/ports/unix/variants/minimal/mpconfigvariant.h
index e0db3756ca7ac..f6be44692051c 100644
--- a/ports/unix/variants/minimal/mpconfigvariant.h
+++ b/ports/unix/variants/minimal/mpconfigvariant.h
@@ -44,6 +44,7 @@
 #define MICROPY_MEM_STATS           (0)
 #define MICROPY_DEBUG_PRINTERS      (0)
 #define MICROPY_READER_POSIX        (1)
+#define MICROPY_READER_VFS          (1)
 #define MICROPY_HELPER_REPL         (1)
 #define MICROPY_HELPER_LEXER_UNIX   (1)
 #define MICROPY_ENABLE_SOURCE_LINE  (0)
@@ -59,6 +60,8 @@
 #define MICROPY_OPT_MAP_LOOKUP_CACHE (0)
 #define MICROPY_CAN_OVERRIDE_BUILTINS (0)
 #define MICROPY_BUILTIN_METHOD_CHECK_SELF_ARG (0)
+#define MICROPY_VFS                 (1)
+#define MICROPY_VFS_POSIX           (1)
 #define MICROPY_CPYTHON_COMPAT      (0)
 #define MICROPY_PY_BUILTINS_BYTEARRAY (0)
 #define MICROPY_PY_BUILTINS_MEMORYVIEW (0)
@@ -98,18 +101,18 @@
 #define MICROPY_PY_UTIME            (0)
 #define MICROPY_PY_UZLIB            (0)
 #define MICROPY_PY_UJSON            (0)
+#define MICROPY_PY_UOS              (1)
 #define MICROPY_PY_URE              (0)
 #define MICROPY_PY_UHEAPQ           (0)
 #define MICROPY_PY_UHASHLIB         (0)
 #define MICROPY_PY_UBINASCII        (0)
 
-extern const struct _mp_obj_module_t mp_module_os;
-
-#define MICROPY_PORT_BUILTIN_MODULES \
-    { MP_ROM_QSTR(MP_QSTR_uos), MP_ROM_PTR(&mp_module_os) }, \
-
 #define MICROPY_PORT_ROOT_POINTERS \
 
+#define mp_import_stat mp_vfs_import_stat
+#define mp_type_fileio mp_type_vfs_posix_fileio
+#define mp_type_textio mp_type_vfs_posix_textio
+
 //////////////////////////////////////////
 // Do not change anything beyond this line
 //////////////////////////////////////////

From 0149cd6b8b255907b49ec105146a2f238b07dbb8 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 9 Mar 2022 12:45:06 +1100
Subject: [PATCH 1785/3533] windows: Switch to VFS subsystem and use VfsPosix.

Following the unix port.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/vfs_posix.c                | 13 +++++++++++++
 ports/windows/Makefile            |  1 -
 ports/windows/micropython.vcxproj |  1 -
 ports/windows/mpconfigport.h      | 16 +++++++++++++---
 ports/windows/msvc/sources.props  |  4 ++++
 py/mpconfig.h                     |  4 ++++
 6 files changed, 34 insertions(+), 5 deletions(-)

diff --git a/extmod/vfs_posix.c b/extmod/vfs_posix.c
index 719afe28fe87f..5dcc9c03ec826 100644
--- a/extmod/vfs_posix.c
+++ b/extmod/vfs_posix.c
@@ -37,6 +37,9 @@
 #include <string.h>
 #include <sys/stat.h>
 #include <dirent.h>
+#ifdef _MSC_VER
+#include <direct.h> // For mkdir etc.
+#endif
 
 typedef struct _mp_obj_vfs_posix_t {
     mp_obj_base_t base;
@@ -254,7 +257,11 @@ STATIC mp_obj_t vfs_posix_mkdir(mp_obj_t self_in, mp_obj_t path_in) {
     mp_obj_vfs_posix_t *self = MP_OBJ_TO_PTR(self_in);
     const char *path = vfs_posix_get_path_str(self, path_in);
     MP_THREAD_GIL_EXIT();
+    #ifdef _WIN32
+    int ret = mkdir(path);
+    #else
     int ret = mkdir(path, 0777);
+    #endif
     MP_THREAD_GIL_ENTER();
     if (ret != 0) {
         mp_raise_OSError(errno);
@@ -308,6 +315,8 @@ STATIC mp_obj_t vfs_posix_stat(mp_obj_t self_in, mp_obj_t path_in) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_2(vfs_posix_stat_obj, vfs_posix_stat);
 
+#if MICROPY_PY_UOS_STATVFS
+
 #ifdef __ANDROID__
 #define USE_STATFS 1
 #endif
@@ -349,6 +358,8 @@ STATIC mp_obj_t vfs_posix_statvfs(mp_obj_t self_in, mp_obj_t path_in) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_2(vfs_posix_statvfs_obj, vfs_posix_statvfs);
 
+#endif
+
 STATIC const mp_rom_map_elem_t vfs_posix_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_mount), MP_ROM_PTR(&vfs_posix_mount_obj) },
     { MP_ROM_QSTR(MP_QSTR_umount), MP_ROM_PTR(&vfs_posix_umount_obj) },
@@ -362,7 +373,9 @@ STATIC const mp_rom_map_elem_t vfs_posix_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_rename), MP_ROM_PTR(&vfs_posix_rename_obj) },
     { MP_ROM_QSTR(MP_QSTR_rmdir), MP_ROM_PTR(&vfs_posix_rmdir_obj) },
     { MP_ROM_QSTR(MP_QSTR_stat), MP_ROM_PTR(&vfs_posix_stat_obj) },
+    #if MICROPY_PY_UOS_STATVFS
     { MP_ROM_QSTR(MP_QSTR_statvfs), MP_ROM_PTR(&vfs_posix_statvfs_obj) },
+    #endif
 };
 STATIC MP_DEFINE_CONST_DICT(vfs_posix_locals_dict, vfs_posix_locals_dict_table);
 
diff --git a/ports/windows/Makefile b/ports/windows/Makefile
index 91744b7a5e1e2..c9efc2353cd2f 100644
--- a/ports/windows/Makefile
+++ b/ports/windows/Makefile
@@ -49,7 +49,6 @@ SRC_C = \
 	shared/runtime/gchelper_generic.c \
 	ports/unix/main.c \
 	ports/unix/input.c \
-	ports/unix/modos.c \
 	ports/unix/modmachine.c \
 	ports/unix/modtime.c \
 	ports/unix/gccollect.c \
diff --git a/ports/windows/micropython.vcxproj b/ports/windows/micropython.vcxproj
index d5e3f57d8bc23..4fa0c47df8424 100644
--- a/ports/windows/micropython.vcxproj
+++ b/ports/windows/micropython.vcxproj
@@ -93,7 +93,6 @@
     <ClCompile Include="$(PyBaseDir)ports\unix\gccollect.c"/>
     <ClCompile Include="$(PyBaseDir)ports\unix\input.c"/>
     <ClCompile Include="$(PyBaseDir)ports\unix\main.c"/>
-    <ClCompile Include="$(PyBaseDir)ports\unix\modos.c"/>
     <ClCompile Include="$(PyBaseDir)ports\unix\modtime.c"/>
     <ClCompile Include="$(PyBaseDir)ports\unix\modmachine.c" />
     <ClCompile Include="$(PyVariantDir)*.c" />
diff --git a/ports/windows/mpconfigport.h b/ports/windows/mpconfigport.h
index d589dac7a7388..4679d135655b6 100644
--- a/ports/windows/mpconfigport.h
+++ b/ports/windows/mpconfigport.h
@@ -51,6 +51,7 @@
 #define MICROPY_DEBUG_PRINTER       (&mp_stderr_print)
 #define MICROPY_DEBUG_PRINTERS      (1)
 #define MICROPY_READER_POSIX        (1)
+#define MICROPY_READER_VFS          (1)
 #define MICROPY_USE_READLINE_HISTORY (1)
 #define MICROPY_HELPER_REPL         (1)
 #define MICROPY_REPL_EMACS_KEYS     (1)
@@ -72,7 +73,8 @@
 #ifndef MICROPY_ENABLE_SCHEDULER
 #define MICROPY_ENABLE_SCHEDULER    (1)
 #endif
-#define MICROPY_VFS_POSIX_FILE      (1)
+#define MICROPY_VFS                 (1)
+#define MICROPY_VFS_POSIX           (1)
 #define MICROPY_PY_FUNCTION_ATTRS   (1)
 #define MICROPY_PY_DESCRIPTORS      (1)
 #define MICROPY_PY_DELATTR_SETATTR  (1)
@@ -124,6 +126,14 @@
 #define MICROPY_STACKLESS_STRICT    (0)
 #endif
 
+#define MICROPY_PY_UOS              (1)
+#define MICROPY_PY_UOS_INCLUDEFILE  "ports/unix/moduos.c"
+#define MICROPY_PY_UOS_ERRNO        (1)
+#define MICROPY_PY_UOS_GETENV_PUTENV_UNSETENV (1)
+#define MICROPY_PY_UOS_SEP          (1)
+#define MICROPY_PY_UOS_STATVFS      (0)
+#define MICROPY_PY_UOS_SYSTEM       (1)
+#define MICROPY_PY_UOS_URANDOM      (1)
 #define MICROPY_PY_UTIME            (1)
 #define MICROPY_PY_UTIME_MP_HAL     (1)
 #define MICROPY_PY_UERRNO           (1)
@@ -161,6 +171,8 @@ extern const struct _mp_print_t mp_stderr_print;
 #define MICROPY_EMERGENCY_EXCEPTION_BUF_SIZE     (256)
 #define MICROPY_KBD_EXCEPTION       (1)
 
+#define mp_import_stat mp_vfs_import_stat
+#define mp_builtin_open_obj mp_vfs_open_obj
 #define mp_type_fileio mp_type_vfs_posix_fileio
 #define mp_type_textio mp_type_vfs_posix_textio
 
@@ -203,11 +215,9 @@ typedef long mp_off_t;
 #define MICROPY_PORT_BUILTINS \
     { MP_ROM_QSTR(MP_QSTR_open), MP_ROM_PTR(&mp_builtin_open_obj) },
 
-extern const struct _mp_obj_module_t mp_module_os;
 extern const struct _mp_obj_module_t mp_module_time;
 #define MICROPY_PORT_BUILTIN_MODULES \
     { MP_ROM_QSTR(MP_QSTR_utime), MP_ROM_PTR(&mp_module_time) }, \
-    { MP_ROM_QSTR(MP_QSTR_uos), MP_ROM_PTR(&mp_module_os) }, \
 
 #if MICROPY_USE_READLINE == 1
 #define MICROPY_PORT_ROOT_POINTERS \
diff --git a/ports/windows/msvc/sources.props b/ports/windows/msvc/sources.props
index a6dfd48aa6f74..b755049db0868 100644
--- a/ports/windows/msvc/sources.props
+++ b/ports/windows/msvc/sources.props
@@ -13,6 +13,7 @@
     <PyExtModSource Include="$(PyBaseDir)extmod\moduhashlib.c" />
     <PyExtModSource Include="$(PyBaseDir)extmod\moduheapq.c" />
     <PyExtModSource Include="$(PyBaseDir)extmod\modujson.c" />
+    <PyExtModSource Include="$(PyBaseDir)extmod\moduos.c" />
     <PyExtModSource Include="$(PyBaseDir)extmod\modurandom.c" />
     <PyExtModSource Include="$(PyBaseDir)extmod\modure.c" />
     <PyExtModSource Include="$(PyBaseDir)extmod\moduselect.c" />
@@ -20,7 +21,10 @@
     <PyExtModSource Include="$(PyBaseDir)extmod\moduzlib.c" />
     <PyExtModSource Include="$(PyBaseDir)extmod\utime_mphal.c" />
     <PyExtModSource Include="$(PyBaseDir)extmod\virtpin.c" />
+    <PyExtModSource Include="$(PyBaseDir)extmod\vfs.c" />
+    <PyExtModSource Include="$(PyBaseDir)extmod\vfs_posix.c" />
     <PyExtModSource Include="$(PyBaseDir)extmod\vfs_posix_file.c" />
+    <PyExtModSource Include="$(PyBaseDir)extmod\vfs_reader.c" />
   </ItemGroup>
   <ItemGroup>
     <PyCoreInclude Include="$(PyBaseDir)py\*.h" />
diff --git a/py/mpconfig.h b/py/mpconfig.h
index 8f9f0f02fb420..a41e99b4c1c5b 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -1459,6 +1459,10 @@ typedef double mp_float_t;
 #define MICROPY_PY_UOS (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
 #endif
 
+#ifndef MICROPY_PY_UOS_STATVFS
+#define MICROPY_PY_UOS_STATVFS (MICROPY_PY_UOS)
+#endif
+
 #ifndef MICROPY_PY_URE
 #define MICROPY_PY_URE (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
 #endif

From d470c5a5baa8660461b76585a57f2de28b30f5dc Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 10 Mar 2022 00:41:03 +1100
Subject: [PATCH 1786/3533] tests/extmod/vfs_posix.py: Only test statvfs if it
 exists.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/extmod/vfs_posix.py     | 5 +++--
 tests/extmod/vfs_posix.py.exp | 1 -
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/extmod/vfs_posix.py b/tests/extmod/vfs_posix.py
index f8c4aae40633f..2a14fc20767be 100644
--- a/tests/extmod/vfs_posix.py
+++ b/tests/extmod/vfs_posix.py
@@ -59,9 +59,10 @@
 vfs = uos.VfsPosix(temp_dir)
 print(list(i[0] for i in vfs.ilistdir(".")))
 
-# stat, statvfs
+# stat, statvfs (statvfs may not exist)
 print(type(vfs.stat(".")))
-print(type(vfs.statvfs(".")))
+if hasattr(vfs, "statvfs"):
+    assert type(vfs.statvfs(".")) is tuple
 
 # check types of ilistdir with str/bytes arguments
 print(type(list(vfs.ilistdir("."))[0][0]))
diff --git a/tests/extmod/vfs_posix.py.exp b/tests/extmod/vfs_posix.py.exp
index e7d68f38ec7ca..eb9ab43106e1d 100644
--- a/tests/extmod/vfs_posix.py.exp
+++ b/tests/extmod/vfs_posix.py.exp
@@ -7,7 +7,6 @@ hello
 ['test2']
 ['test2']
 <class 'tuple'>
-<class 'tuple'>
 <class 'str'>
 <class 'bytes'>
 []

From 3356b5ef8d1b232a1df493f70f0ba434f293fe11 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 27 Jul 2021 00:38:21 +1000
Subject: [PATCH 1787/3533] py/objmodule: Support delegating failed attr
 lookups.

This commit adds generic support for mutable module attributes on built in
modules, by adding support for an optional hook function for module
attribute lookup.  If a module wants to support additional attribute load/
store/delete (beyond what is in the constant, globals dict) then it should
add at the very end of its globals dict MP_MODULE_ATTR_DELEGATION_ENTRY().
This should point to a custom function which will handle any additional
attributes.

The mp_module_generic_attr() function is provided as a helper function for
additional attributes: it requires an array of qstrs (terminated in
MP_QSTRnull) and a corresponding array of objects (with a 1-1 mapping
between qstrs and objects).  If the qstr is found in the array then the
corresponding object is loaded/stored/deleted.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/mpconfig.h  |  6 ++++++
 py/objmodule.c | 36 ++++++++++++++++++++++++++++++++++++
 py/objmodule.h |  5 +++++
 3 files changed, 47 insertions(+)

diff --git a/py/mpconfig.h b/py/mpconfig.h
index a41e99b4c1c5b..2b03b93f4ec4e 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -822,6 +822,12 @@ typedef double mp_float_t;
 #define MICROPY_STREAMS_POSIX_API (0)
 #endif
 
+// Whether modules can use MP_MODULE_ATTR_DELEGATION_ENTRY() to delegate failed
+// attribute lookups.
+#ifndef MICROPY_MODULE_ATTR_DELEGATION
+#define MICROPY_MODULE_ATTR_DELEGATION (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
+#endif
+
 // Whether to call __init__ when importing builtin modules for the first time
 #ifndef MICROPY_MODULE_BUILTIN_INIT
 #define MICROPY_MODULE_BUILTIN_INIT (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
diff --git a/py/objmodule.c b/py/objmodule.c
index f7cd437bacf9d..0cd10e61f08e8 100644
--- a/py/objmodule.c
+++ b/py/objmodule.c
@@ -62,6 +62,21 @@ STATIC void module_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kin
     mp_printf(print, "<module '%s'>", module_name);
 }
 
+STATIC void module_attr_try_delegation(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
+    #if MICROPY_MODULE_ATTR_DELEGATION
+    // Delegate lookup to a module's custom attr method (found in last lot of globals dict).
+    mp_obj_module_t *self = MP_OBJ_TO_PTR(self_in);
+    mp_map_t *map = &self->globals->map;
+    if (map->table[map->alloc - 1].key == MP_OBJ_NEW_QSTR(MP_QSTRnull)) {
+        ((mp_attr_fun_t)MP_OBJ_TO_PTR(map->table[map->alloc - 1].value))(self_in, attr, dest);
+    }
+    #else
+    (void)self_in;
+    (void)attr;
+    (void)dest;
+    #endif
+}
+
 STATIC void module_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
     mp_obj_module_t *self = MP_OBJ_TO_PTR(self_in);
     if (dest[0] == MP_OBJ_NULL) {
@@ -74,8 +89,12 @@ STATIC void module_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
             elem = mp_map_lookup(&self->globals->map, MP_OBJ_NEW_QSTR(MP_QSTR___getattr__), MP_MAP_LOOKUP);
             if (elem != NULL) {
                 dest[0] = mp_call_function_1(elem->value, MP_OBJ_NEW_QSTR(attr));
+            } else {
+                module_attr_try_delegation(self_in, attr, dest);
             }
         #endif
+        } else {
+            module_attr_try_delegation(self_in, attr, dest);
         }
     } else {
         // delete/store attribute
@@ -91,6 +110,7 @@ STATIC void module_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
             #endif
             {
                 // can't delete or store to fixed map
+                module_attr_try_delegation(self_in, attr, dest);
                 return;
             }
         }
@@ -319,3 +339,19 @@ STATIC void mp_module_call_init(mp_obj_t module_name, mp_obj_t module_obj) {
     }
 }
 #endif
+
+void mp_module_generic_attr(qstr attr, mp_obj_t *dest, const uint16_t *keys, mp_obj_t *values) {
+    for (size_t i = 0; keys[i] != MP_QSTRnull; ++i) {
+        if (attr == keys[i]) {
+            if (dest[0] == MP_OBJ_NULL) {
+                // load attribute (MP_OBJ_NULL returned for deleted items)
+                dest[0] = values[i];
+            } else {
+                // delete or store (delete stores MP_OBJ_NULL)
+                values[i] = dest[1];
+                dest[0] = MP_OBJ_NULL; // indicate success
+            }
+            return;
+        }
+    }
+}
diff --git a/py/objmodule.h b/py/objmodule.h
index 8a82d13fe5b7b..d11d5bcd746bd 100644
--- a/py/objmodule.h
+++ b/py/objmodule.h
@@ -28,6 +28,9 @@
 
 #include "py/obj.h"
 
+// Place at the very end of a module's globals_table.
+#define MP_MODULE_ATTR_DELEGATION_ENTRY(ptr) { MP_ROM_QSTR(MP_QSTRnull), MP_ROM_PTR(ptr) }
+
 extern const mp_map_t mp_builtin_module_map;
 
 mp_obj_t mp_module_get_loaded_or_builtin(qstr module_name);
@@ -35,4 +38,6 @@ mp_obj_t mp_module_get_loaded_or_builtin(qstr module_name);
 mp_obj_t mp_module_get_builtin(qstr module_name);
 #endif
 
+void mp_module_generic_attr(qstr attr, mp_obj_t *dest, const uint16_t *keys, mp_obj_t *values);
+
 #endif // MICROPY_INCLUDED_PY_OBJMODULE_H

From bc181550a4790f4dcfaf10e7e61ecfcdf346d5a8 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 27 Jul 2021 00:39:04 +1000
Subject: [PATCH 1788/3533] py/modsys: Add optional attribute delegation.

To be enabled when needed by specific sys attributes.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/modsys.c   | 18 ++++++++++++++++++
 py/mpconfig.h |  6 ++++++
 py/mpstate.h  |  9 +++++++++
 3 files changed, 33 insertions(+)

diff --git a/py/modsys.c b/py/modsys.c
index 43666bc00e556..a05709f8e66c1 100644
--- a/py/modsys.c
+++ b/py/modsys.c
@@ -27,6 +27,7 @@
 
 #include "py/builtin.h"
 #include "py/objlist.h"
+#include "py/objmodule.h"
 #include "py/objtuple.h"
 #include "py/objstr.h"
 #include "py/objint.h"
@@ -182,6 +183,18 @@ STATIC mp_obj_t mp_sys_settrace(mp_obj_t obj) {
 MP_DEFINE_CONST_FUN_OBJ_1(mp_sys_settrace_obj, mp_sys_settrace);
 #endif // MICROPY_PY_SYS_SETTRACE
 
+#if MICROPY_PY_SYS_ATTR_DELEGATION
+STATIC const uint16_t sys_mutable_keys[] = {
+    MP_QSTRnull,
+};
+
+STATIC void mp_module_sys_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
+    MP_STATIC_ASSERT(MP_ARRAY_SIZE(sys_mutable_keys) == MP_SYS_MUTABLE_NUM + 1);
+    MP_STATIC_ASSERT(MP_ARRAY_SIZE(MP_STATE_VM(sys_mutable)) == MP_SYS_MUTABLE_NUM);
+    mp_module_generic_attr(attr, dest, sys_mutable_keys, MP_STATE_VM(sys_mutable));
+}
+#endif
+
 STATIC const mp_rom_map_elem_t mp_module_sys_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_sys) },
 
@@ -244,6 +257,11 @@ STATIC const mp_rom_map_elem_t mp_module_sys_globals_table[] = {
     #if MICROPY_PY_SYS_ATEXIT
     { MP_ROM_QSTR(MP_QSTR_atexit), MP_ROM_PTR(&mp_sys_atexit_obj) },
     #endif
+
+    #if MICROPY_PY_SYS_ATTR_DELEGATION
+    // Delegation of attr lookup.
+    MP_MODULE_ATTR_DELEGATION_ENTRY(&mp_module_sys_attr),
+    #endif
 };
 
 STATIC MP_DEFINE_CONST_DICT(mp_module_sys_globals, mp_module_sys_globals_table);
diff --git a/py/mpconfig.h b/py/mpconfig.h
index 2b03b93f4ec4e..617e897080f95 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -1377,6 +1377,12 @@ typedef double mp_float_t;
 #define MICROPY_PY_SYS_STDIO_BUFFER (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
 #endif
 
+// Whether the sys module supports attribute delegation
+// This is enabled automatically when needed by other features
+#ifndef MICROPY_PY_SYS_ATTR_DELEGATION
+#define MICROPY_PY_SYS_ATTR_DELEGATION (0)
+#endif
+
 // Whether to provide "uerrno" module
 #ifndef MICROPY_PY_UERRNO
 #define MICROPY_PY_UERRNO (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
diff --git a/py/mpstate.h b/py/mpstate.h
index 7f86399f572a7..f29e6be502e0f 100644
--- a/py/mpstate.h
+++ b/py/mpstate.h
@@ -40,6 +40,10 @@
 // memory system, runtime and virtual machine.  The state is a global
 // variable, but in the future it is hoped that the state can become local.
 
+enum {
+    MP_SYS_MUTABLE_NUM,
+};
+
 // This structure contains dynamic configuration for the compiler.
 #if MICROPY_DYNAMIC_COMPILER
 typedef struct mp_dynamic_compiler_t {
@@ -158,6 +162,11 @@ typedef struct _mp_state_vm_t {
     // must be initialised after the call to mp_init.
     mp_obj_list_t mp_sys_path_obj;
     mp_obj_list_t mp_sys_argv_obj;
+
+    #if MICROPY_PY_SYS_ATTR_DELEGATION
+    // Contains mutable sys attributes.
+    mp_obj_t sys_mutable[MP_SYS_MUTABLE_NUM];
+    #endif
     #endif
 
     // dictionary for overridden builtins

From cac939ddc3625da7e6cf1cf0309daba25fc1cedb Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 27 Jul 2021 00:41:27 +1000
Subject: [PATCH 1789/3533] py/modsys: Add optional sys.tracebacklimit
 attribute.

With behaviour as per CPython.

Signed-off-by: Damien George <damien@micropython.org>
---
 docs/library/sys.rst                          |  8 ++
 .../unix/variants/coverage/mpconfigvariant.h  |  2 +
 py/modsys.c                                   |  3 +
 py/mpconfig.h                                 |  7 +-
 py/mpstate.h                                  |  3 +
 py/objexcept.c                                | 10 +++
 py/runtime.c                                  |  4 +
 tests/basics/sys_tracebacklimit.py            | 78 +++++++++++++++++++
 tests/run-tests.py                            |  1 +
 tests/unix/extra_coverage.py.exp              |  4 +-
 10 files changed, 117 insertions(+), 3 deletions(-)
 create mode 100644 tests/basics/sys_tracebacklimit.py

diff --git a/docs/library/sys.rst b/docs/library/sys.rst
index d36394c88c0de..f4ff8786a244a 100644
--- a/docs/library/sys.rst
+++ b/docs/library/sys.rst
@@ -144,6 +144,14 @@ Constants
 
    Standard output `stream`.
 
+.. data:: tracebacklimit
+
+   A mutable attribute holding an integer value which is the maximum number of traceback
+   entries to store in an exception.  Set to 0 to disable adding tracebacks.  Defaults
+   to 1000.
+
+   Note: this is not available on all ports.
+
 .. data:: version
 
    Python language version that this implementation conforms to, as a string.
diff --git a/ports/unix/variants/coverage/mpconfigvariant.h b/ports/unix/variants/coverage/mpconfigvariant.h
index db01c4bcd5f03..9b6b4077542d6 100644
--- a/ports/unix/variants/coverage/mpconfigvariant.h
+++ b/ports/unix/variants/coverage/mpconfigvariant.h
@@ -34,6 +34,7 @@
 #define MICROPY_REPL_EMACS_WORDS_MOVE  (1)
 #define MICROPY_REPL_EMACS_EXTRA_WORDS_MOVE (1)
 #define MICROPY_WARNINGS_CATEGORY      (1)
+#define MICROPY_MODULE_ATTR_DELEGATION (1)
 #define MICROPY_MODULE_GETATTR         (1)
 #define MICROPY_PY_DELATTR_SETATTR     (1)
 #define MICROPY_PY_ALL_INPLACE_SPECIAL_METHODS (1)
@@ -44,6 +45,7 @@
 #define MICROPY_PY_BUILTINS_HELP       (1)
 #define MICROPY_PY_BUILTINS_HELP_MODULES (1)
 #define MICROPY_PY_SYS_GETSIZEOF       (1)
+#define MICROPY_PY_SYS_TRACEBACKLIMIT  (1)
 #define MICROPY_PY_MATH_CONSTANTS      (1)
 #define MICROPY_PY_MATH_FACTORIAL      (1)
 #define MICROPY_PY_URANDOM_EXTRA_FUNCS (1)
diff --git a/py/modsys.c b/py/modsys.c
index a05709f8e66c1..c44c7ed450c7f 100644
--- a/py/modsys.c
+++ b/py/modsys.c
@@ -185,6 +185,9 @@ MP_DEFINE_CONST_FUN_OBJ_1(mp_sys_settrace_obj, mp_sys_settrace);
 
 #if MICROPY_PY_SYS_ATTR_DELEGATION
 STATIC const uint16_t sys_mutable_keys[] = {
+    #if MICROPY_PY_SYS_TRACEBACKLIMIT
+    MP_QSTR_tracebacklimit,
+    #endif
     MP_QSTRnull,
 };
 
diff --git a/py/mpconfig.h b/py/mpconfig.h
index 617e897080f95..be967e69804b9 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -1377,10 +1377,15 @@ typedef double mp_float_t;
 #define MICROPY_PY_SYS_STDIO_BUFFER (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
 #endif
 
+// Whether to provide sys.tracebacklimit mutable attribute
+#ifndef MICROPY_PY_SYS_TRACEBACKLIMIT
+#define MICROPY_PY_SYS_TRACEBACKLIMIT (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EVERYTHING)
+#endif
+
 // Whether the sys module supports attribute delegation
 // This is enabled automatically when needed by other features
 #ifndef MICROPY_PY_SYS_ATTR_DELEGATION
-#define MICROPY_PY_SYS_ATTR_DELEGATION (0)
+#define MICROPY_PY_SYS_ATTR_DELEGATION (MICROPY_PY_SYS_TRACEBACKLIMIT)
 #endif
 
 // Whether to provide "uerrno" module
diff --git a/py/mpstate.h b/py/mpstate.h
index f29e6be502e0f..499d863512fc5 100644
--- a/py/mpstate.h
+++ b/py/mpstate.h
@@ -41,6 +41,9 @@
 // variable, but in the future it is hoped that the state can become local.
 
 enum {
+    #if MICROPY_PY_SYS_TRACEBACKLIMIT
+    MP_SYS_MUTABLE_TRACEBACKLIMIT,
+    #endif
     MP_SYS_MUTABLE_NUM,
 };
 
diff --git a/py/objexcept.c b/py/objexcept.c
index 7a86c36471b62..dca287bb6ed12 100644
--- a/py/objexcept.c
+++ b/py/objexcept.c
@@ -575,6 +575,16 @@ void mp_obj_exception_add_traceback(mp_obj_t self_in, qstr file, size_t line, qs
     // append this traceback info to traceback data
     // if memory allocation fails (eg because gc is locked), just return
 
+    #if MICROPY_PY_SYS_TRACEBACKLIMIT
+    mp_int_t max_traceback = MP_OBJ_SMALL_INT_VALUE(MP_STATE_VM(sys_mutable[MP_SYS_MUTABLE_TRACEBACKLIMIT]));
+    if (max_traceback <= 0) {
+        return;
+    } else if (self->traceback_data != NULL && self->traceback_len >= max_traceback * TRACEBACK_ENTRY_LEN) {
+        self->traceback_len -= TRACEBACK_ENTRY_LEN;
+        memmove(self->traceback_data, self->traceback_data + TRACEBACK_ENTRY_LEN, self->traceback_len * sizeof(self->traceback_data[0]));
+    }
+    #endif
+
     if (self->traceback_data == NULL) {
         self->traceback_data = m_new_maybe(size_t, TRACEBACK_ENTRY_LEN);
         if (self->traceback_data == NULL) {
diff --git a/py/runtime.c b/py/runtime.c
index 8c93f539e04e6..665c9f22069d1 100644
--- a/py/runtime.c
+++ b/py/runtime.c
@@ -141,6 +141,10 @@ void mp_init(void) {
     MP_STATE_THREAD(current_code_state) = NULL;
     #endif
 
+    #if MICROPY_PY_SYS_TRACEBACKLIMIT
+    MP_STATE_VM(sys_mutable[MP_SYS_MUTABLE_TRACEBACKLIMIT]) = MP_OBJ_NEW_SMALL_INT(1000);
+    #endif
+
     #if MICROPY_PY_BLUETOOTH
     MP_STATE_VM(bluetooth) = MP_OBJ_NULL;
     #endif
diff --git a/tests/basics/sys_tracebacklimit.py b/tests/basics/sys_tracebacklimit.py
new file mode 100644
index 0000000000000..1ee638967f129
--- /dev/null
+++ b/tests/basics/sys_tracebacklimit.py
@@ -0,0 +1,78 @@
+# test sys.tracebacklimit
+
+try:
+    try:
+        import usys as sys
+        import uio as io
+    except ImportError:
+        import sys
+        import io
+except ImportError:
+    print("SKIP")
+    raise SystemExit
+
+try:
+    sys.tracebacklimit = 1000
+except AttributeError:
+    print("SKIP")
+    raise SystemExit
+
+if hasattr(sys, "print_exception"):
+    print_exception = sys.print_exception
+else:
+    import traceback
+
+    print_exception = lambda e, f: traceback.print_exception(None, e, sys.exc_info()[2], file=f)
+
+
+def print_exc(e):
+    buf = io.StringIO()
+    print_exception(e, buf)
+    s = buf.getvalue()
+    for l in s.split("\n"):
+        # Remove filename.
+        if l.startswith("  File "):
+            l = l.split('"')
+            print(l[0], l[2])
+        # uPy and CPy tracebacks differ in that CPy prints a source line for
+        # each traceback entry.  In this case, we know that offending line
+        # has 4-space indent, so filter it out.
+        elif not l.startswith("    "):
+            print(l)
+
+
+def f0():
+    raise ValueError("value")
+
+
+def f1():
+    f0()
+
+
+def f2():
+    f1()
+
+
+def f3():
+    f2()
+
+
+def ftop():
+    try:
+        f3()
+    except ValueError as er:
+        print_exc(er)
+
+
+ftop()
+
+for limit in range(4, -2, -1):
+    print("limit", limit)
+    sys.tracebacklimit = limit
+    ftop()
+
+
+# test deleting the attribute
+print(hasattr(sys, "tracebacklimit"))
+del sys.tracebacklimit
+print(hasattr(sys, "tracebacklimit"))
diff --git a/tests/run-tests.py b/tests/run-tests.py
index edd20b9bd5526..dfe0a8e55fdc8 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -504,6 +504,7 @@ def run_tests(pyb, tests, args, result_dir, num_threads=1):
         skip_tests.add("basics/del_local.py")  # requires checking for unbound local
         skip_tests.add("basics/exception_chain.py")  # raise from is not supported
         skip_tests.add("basics/scope_implicit.py")  # requires checking for unbound local
+        skip_tests.add("basics/sys_tracebacklimit.py")  # requires traceback info
         skip_tests.add("basics/try_finally_return2.py")  # requires raise_varargs
         skip_tests.add("basics/unboundlocal.py")  # requires checking for unbound local
         skip_tests.add("extmod/uasyncio_event.py")  # unknown issue
diff --git a/tests/unix/extra_coverage.py.exp b/tests/unix/extra_coverage.py.exp
index 1a5a2cde85983..67d299bca13ac 100644
--- a/tests/unix/extra_coverage.py.exp
+++ b/tests/unix/extra_coverage.py.exp
@@ -45,8 +45,8 @@ utime           utimeq
 argv            atexit          byteorder       exc_info
 exit            getsizeof       implementation  maxsize
 modules         path            platform        print_exception
-stderr          stdin           stdout          version
-version_info
+stderr          stdin           stdout          tracebacklimit
+version         version_info
 ementation
 # attrtuple
 (start=1, stop=2, step=3)

From ac2293161e98e73d39434628f995e85bd97e52c2 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 27 Jul 2021 00:43:35 +1000
Subject: [PATCH 1790/3533] py/modsys: Add optional mutable attributes
 sys.ps1/ps2 and use them.

This allows customising the REPL prompt strings.

Signed-off-by: Damien George <damien@micropython.org>
---
 docs/library/sys.rst                          |  6 +++++
 ports/unix/main.c                             |  8 +++---
 .../unix/variants/coverage/mpconfigvariant.h  |  1 +
 py/modsys.c                                   |  4 +++
 py/mpconfig.h                                 |  7 ++++-
 py/mpstate.h                                  |  4 +++
 py/qstrdefs.h                                 |  4 +++
 py/repl.c                                     | 10 +++++++
 py/repl.h                                     | 26 +++++++++++++++++++
 py/runtime.c                                  |  5 ++++
 shared/runtime/pyexec.c                       | 10 +++----
 tests/cmdline/repl_sys_ps1_ps2.py             |  6 +++++
 tests/cmdline/repl_sys_ps1_ps2.py.exp         | 10 +++++++
 tests/run-tests.py                            |  1 +
 tests/unix/extra_coverage.py.exp              |  4 +--
 15 files changed, 94 insertions(+), 12 deletions(-)
 create mode 100644 tests/cmdline/repl_sys_ps1_ps2.py
 create mode 100644 tests/cmdline/repl_sys_ps1_ps2.py.exp

diff --git a/docs/library/sys.rst b/docs/library/sys.rst
index f4ff8786a244a..a2d55fecbb033 100644
--- a/docs/library/sys.rst
+++ b/docs/library/sys.rst
@@ -132,6 +132,12 @@ Constants
    If you need to check whether your program runs on MicroPython (vs other
    Python implementation), use `sys.implementation` instead.
 
+.. data:: ps1
+          ps2
+
+   Mutable attributes holding strings, which are used for the REPL prompt.  The defaults
+   give the standard Python prompt of ``>>>`` and ``...``.
+
 .. data:: stderr
 
    Standard error `stream`.
diff --git a/ports/unix/main.c b/ports/unix/main.c
index bde867f8c8cb1..c2a6c8c6b90e6 100644
--- a/ports/unix/main.c
+++ b/ports/unix/main.c
@@ -193,7 +193,7 @@ STATIC int do_repl(void) {
 
     input_restart:
         vstr_reset(&line);
-        int ret = readline(&line, ">>> ");
+        int ret = readline(&line, mp_repl_get_ps1());
         mp_parse_input_kind_t parse_input_kind = MP_PARSE_SINGLE_INPUT;
 
         if (ret == CHAR_CTRL_C) {
@@ -240,7 +240,7 @@ STATIC int do_repl(void) {
             // got a line with non-zero length, see if it needs continuing
             while (mp_repl_continue_with_input(vstr_null_terminated_str(&line))) {
                 vstr_add_byte(&line, '\n');
-                ret = readline(&line, "... ");
+                ret = readline(&line, mp_repl_get_ps2());
                 if (ret == CHAR_CTRL_C) {
                     // cancel everything
                     printf("\n");
@@ -265,13 +265,13 @@ STATIC int do_repl(void) {
     // use simple readline
 
     for (;;) {
-        char *line = prompt(">>> ");
+        char *line = prompt((char *)mp_repl_get_ps1());
         if (line == NULL) {
             // EOF
             return 0;
         }
         while (mp_repl_continue_with_input(line)) {
-            char *line2 = prompt("... ");
+            char *line2 = prompt((char *)mp_repl_get_ps2());
             if (line2 == NULL) {
                 break;
             }
diff --git a/ports/unix/variants/coverage/mpconfigvariant.h b/ports/unix/variants/coverage/mpconfigvariant.h
index 9b6b4077542d6..e2640f71f7621 100644
--- a/ports/unix/variants/coverage/mpconfigvariant.h
+++ b/ports/unix/variants/coverage/mpconfigvariant.h
@@ -45,6 +45,7 @@
 #define MICROPY_PY_BUILTINS_HELP       (1)
 #define MICROPY_PY_BUILTINS_HELP_MODULES (1)
 #define MICROPY_PY_SYS_GETSIZEOF       (1)
+#define MICROPY_PY_SYS_PS1_PS2         (1)
 #define MICROPY_PY_SYS_TRACEBACKLIMIT  (1)
 #define MICROPY_PY_MATH_CONSTANTS      (1)
 #define MICROPY_PY_MATH_FACTORIAL      (1)
diff --git a/py/modsys.c b/py/modsys.c
index c44c7ed450c7f..ac90776226165 100644
--- a/py/modsys.c
+++ b/py/modsys.c
@@ -185,6 +185,10 @@ MP_DEFINE_CONST_FUN_OBJ_1(mp_sys_settrace_obj, mp_sys_settrace);
 
 #if MICROPY_PY_SYS_ATTR_DELEGATION
 STATIC const uint16_t sys_mutable_keys[] = {
+    #if MICROPY_PY_SYS_PS1_PS2
+    MP_QSTR_ps1,
+    MP_QSTR_ps2,
+    #endif
     #if MICROPY_PY_SYS_TRACEBACKLIMIT
     MP_QSTR_tracebacklimit,
     #endif
diff --git a/py/mpconfig.h b/py/mpconfig.h
index be967e69804b9..47c16ed9670e7 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -1356,6 +1356,11 @@ typedef double mp_float_t;
 #define MICROPY_PY_SYS_ATEXIT (0)
 #endif
 
+// Whether to provide sys.{ps1,ps2} mutable attributes, to control REPL prompts
+#ifndef MICROPY_PY_SYS_PS1_PS2
+#define MICROPY_PY_SYS_PS1_PS2 (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
+#endif
+
 // Whether to provide "sys.settrace" function
 #ifndef MICROPY_PY_SYS_SETTRACE
 #define MICROPY_PY_SYS_SETTRACE (0)
@@ -1385,7 +1390,7 @@ typedef double mp_float_t;
 // Whether the sys module supports attribute delegation
 // This is enabled automatically when needed by other features
 #ifndef MICROPY_PY_SYS_ATTR_DELEGATION
-#define MICROPY_PY_SYS_ATTR_DELEGATION (MICROPY_PY_SYS_TRACEBACKLIMIT)
+#define MICROPY_PY_SYS_ATTR_DELEGATION (MICROPY_PY_SYS_PS1_PS2 || MICROPY_PY_SYS_TRACEBACKLIMIT)
 #endif
 
 // Whether to provide "uerrno" module
diff --git a/py/mpstate.h b/py/mpstate.h
index 499d863512fc5..a493b780abd30 100644
--- a/py/mpstate.h
+++ b/py/mpstate.h
@@ -41,6 +41,10 @@
 // variable, but in the future it is hoped that the state can become local.
 
 enum {
+    #if MICROPY_PY_SYS_PS1_PS2
+    MP_SYS_MUTABLE_PS1,
+    MP_SYS_MUTABLE_PS2,
+    #endif
     #if MICROPY_PY_SYS_TRACEBACKLIMIT
     MP_SYS_MUTABLE_TRACEBACKLIMIT,
     #endif
diff --git a/py/qstrdefs.h b/py/qstrdefs.h
index 405813941b267..5003636df3d4b 100644
--- a/py/qstrdefs.h
+++ b/py/qstrdefs.h
@@ -39,6 +39,10 @@ Q()
 Q(*)
 Q(_)
 Q(/)
+#if MICROPY_PY_SYS_PS1_PS2
+Q(>>> )
+Q(... )
+#endif
 #if MICROPY_PY_BUILTINS_STR_OP_MODULO
 Q(%#o)
 Q(%#x)
diff --git a/py/repl.c b/py/repl.c
index 822e385abd241..4e47cf784c344 100644
--- a/py/repl.c
+++ b/py/repl.c
@@ -33,6 +33,16 @@
 
 #if MICROPY_HELPER_REPL
 
+#if MICROPY_PY_SYS_PS1_PS2
+const char *mp_repl_get_psx(unsigned int entry) {
+    if (mp_obj_is_str(MP_STATE_VM(sys_mutable)[entry])) {
+        return mp_obj_str_get_str(MP_STATE_VM(sys_mutable)[entry]);
+    } else {
+        return "";
+    }
+}
+#endif
+
 STATIC bool str_startswith_word(const char *str, const char *head) {
     size_t i;
     for (i = 0; str[i] && head[i]; i++) {
diff --git a/py/repl.h b/py/repl.h
index a7a4136cad188..9e8f7f1ddaeb4 100644
--- a/py/repl.h
+++ b/py/repl.h
@@ -31,8 +31,34 @@
 #include "py/mpprint.h"
 
 #if MICROPY_HELPER_REPL
+
+#if MICROPY_PY_SYS_PS1_PS2
+
+const char *mp_repl_get_psx(unsigned int entry);
+
+static inline const char *mp_repl_get_ps1(void) {
+    return mp_repl_get_psx(MP_SYS_MUTABLE_PS1);
+}
+
+static inline const char *mp_repl_get_ps2(void) {
+    return mp_repl_get_psx(MP_SYS_MUTABLE_PS2);
+}
+
+#else
+
+static inline const char *mp_repl_get_ps1(void) {
+    return ">>> ";
+}
+
+static inline const char *mp_repl_get_ps2(void) {
+    return "... ";
+}
+
+#endif
+
 bool mp_repl_continue_with_input(const char *input);
 size_t mp_repl_autocomplete(const char *str, size_t len, const mp_print_t *print, const char **compl_str);
+
 #endif
 
 #endif // MICROPY_INCLUDED_PY_REPL_H
diff --git a/py/runtime.c b/py/runtime.c
index 665c9f22069d1..ba3fbe7fa5cc8 100644
--- a/py/runtime.c
+++ b/py/runtime.c
@@ -135,6 +135,11 @@ void mp_init(void) {
     MP_STATE_VM(sys_exitfunc) = mp_const_none;
     #endif
 
+    #if MICROPY_PY_SYS_PS1_PS2
+    MP_STATE_VM(sys_mutable[MP_SYS_MUTABLE_PS1]) = MP_OBJ_NEW_QSTR(MP_QSTR__gt__gt__gt__space_);
+    MP_STATE_VM(sys_mutable[MP_SYS_MUTABLE_PS2]) = MP_OBJ_NEW_QSTR(MP_QSTR__dot__dot__dot__space_);
+    #endif
+
     #if MICROPY_PY_SYS_SETTRACE
     MP_STATE_THREAD(prof_trace_callback) = MP_OBJ_NULL;
     MP_STATE_THREAD(prof_callback_is_executing) = false;
diff --git a/shared/runtime/pyexec.c b/shared/runtime/pyexec.c
index ae6dd770b1769..9fde987a4b5cf 100644
--- a/shared/runtime/pyexec.c
+++ b/shared/runtime/pyexec.c
@@ -433,7 +433,7 @@ STATIC int pyexec_friendly_repl_process_char(int c) {
 
         vstr_add_byte(MP_STATE_VM(repl_line), '\n');
         repl.cont_line = true;
-        readline_note_newline("... ");
+        readline_note_newline(mp_repl_get_ps2());
         return 0;
 
     } else {
@@ -454,7 +454,7 @@ STATIC int pyexec_friendly_repl_process_char(int c) {
 
         if (mp_repl_continue_with_input(vstr_null_terminated_str(MP_STATE_VM(repl_line)))) {
             vstr_add_byte(MP_STATE_VM(repl_line), '\n');
-            readline_note_newline("... ");
+            readline_note_newline(mp_repl_get_ps2());
             return 0;
         }
 
@@ -468,7 +468,7 @@ STATIC int pyexec_friendly_repl_process_char(int c) {
         vstr_reset(MP_STATE_VM(repl_line));
         repl.cont_line = false;
         repl.paste_mode = false;
-        readline_init(MP_STATE_VM(repl_line), ">>> ");
+        readline_init(MP_STATE_VM(repl_line), mp_repl_get_ps1());
         return 0;
     }
 }
@@ -598,7 +598,7 @@ int pyexec_friendly_repl(void) {
         }
 
         vstr_reset(&line);
-        int ret = readline(&line, ">>> ");
+        int ret = readline(&line, mp_repl_get_ps1());
         mp_parse_input_kind_t parse_input_kind = MP_PARSE_SINGLE_INPUT;
 
         if (ret == CHAR_CTRL_A) {
@@ -651,7 +651,7 @@ int pyexec_friendly_repl(void) {
             // got a line with non-zero length, see if it needs continuing
             while (mp_repl_continue_with_input(vstr_null_terminated_str(&line))) {
                 vstr_add_byte(&line, '\n');
-                ret = readline(&line, "... ");
+                ret = readline(&line, mp_repl_get_ps2());
                 if (ret == CHAR_CTRL_C) {
                     // cancel everything
                     mp_hal_stdout_tx_str("\r\n");
diff --git a/tests/cmdline/repl_sys_ps1_ps2.py b/tests/cmdline/repl_sys_ps1_ps2.py
new file mode 100644
index 0000000000000..4f96057c49b6d
--- /dev/null
+++ b/tests/cmdline/repl_sys_ps1_ps2.py
@@ -0,0 +1,6 @@
+# test changing ps1/ps2
+import usys
+usys.ps1 = "PS1"
+usys.ps2 = "PS2"
+(1 +
+2)
diff --git a/tests/cmdline/repl_sys_ps1_ps2.py.exp b/tests/cmdline/repl_sys_ps1_ps2.py.exp
new file mode 100644
index 0000000000000..e4a802d34d75e
--- /dev/null
+++ b/tests/cmdline/repl_sys_ps1_ps2.py.exp
@@ -0,0 +1,10 @@
+MicroPython \.\+ version
+Use \.\+
+>>> # test changing ps1/ps2
+>>> import usys
+>>> usys.ps1 = "PS1"
+PS1usys.ps2 = "PS2"
+PS1(1 +
+PS22)
+3
+PS1
diff --git a/tests/run-tests.py b/tests/run-tests.py
index dfe0a8e55fdc8..9c298dae31a08 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -433,6 +433,7 @@ def run_tests(pyb, tests, args, result_dir, num_threads=1):
 
     if not has_coverage:
         skip_tests.add("cmdline/cmd_parsetree.py")
+        skip_tests.add("cmdline/repl_sys_ps1_ps2.py")
 
     # Some tests shouldn't be run on a PC
     if args.target == "unix":
diff --git a/tests/unix/extra_coverage.py.exp b/tests/unix/extra_coverage.py.exp
index 67d299bca13ac..f6681f4ac1916 100644
--- a/tests/unix/extra_coverage.py.exp
+++ b/tests/unix/extra_coverage.py.exp
@@ -45,8 +45,8 @@ utime           utimeq
 argv            atexit          byteorder       exc_info
 exit            getsizeof       implementation  maxsize
 modules         path            platform        print_exception
-stderr          stdin           stdout          tracebacklimit
-version         version_info
+ps1             ps2             stderr          stdin
+stdout          tracebacklimit  version         version_info
 ementation
 # attrtuple
 (start=1, stop=2, step=3)

From 0ac3191d8c3be9d043af3d75fd5264f8b2f995a1 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 10 Mar 2022 13:20:50 +1100
Subject: [PATCH 1791/3533] unix/mpconfigport.h: Collect together config
 options from extra level.

This change is a no-op in terms of functionality.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/unix/mpconfigport.h | 132 ++++++++++++++++++++------------------
 1 file changed, 68 insertions(+), 64 deletions(-)

diff --git a/ports/unix/mpconfigport.h b/ports/unix/mpconfigport.h
index f96abb9420818..99876303827d5 100644
--- a/ports/unix/mpconfigport.h
+++ b/ports/unix/mpconfigport.h
@@ -34,6 +34,74 @@
 // If we're building the minimal variant, ignore the rest of this file.
 #ifndef MICROPY_UNIX_MINIMAL
 
+// If the variant did not set a feature level then configure a set of features.
+#ifndef MICROPY_CONFIG_ROM_LEVEL
+#define MICROPY_COMP_MODULE_CONST               (1)
+#define MICROPY_COMP_TRIPLE_TUPLE_ASSIGN        (1)
+#define MICROPY_COMP_RETURN_IF_EXPR             (1)
+#ifndef MICROPY_OPT_LOAD_ATTR_FAST_PATH
+#define MICROPY_OPT_LOAD_ATTR_FAST_PATH         (1)
+#endif
+#ifndef MICROPY_OPT_MAP_LOOKUP_CACHE
+#define MICROPY_OPT_MAP_LOOKUP_CACHE            (1)
+#endif
+#define MICROPY_ENABLE_FINALISER                (1)
+#define MICROPY_STACK_CHECK                     (1)
+#define MICROPY_KBD_EXCEPTION                   (1)
+#define MICROPY_HELPER_REPL                     (1)
+#define MICROPY_REPL_EMACS_KEYS                 (1)
+#define MICROPY_REPL_AUTO_INDENT                (1)
+#define MICROPY_ENABLE_SOURCE_LINE              (1)
+#ifndef MICROPY_STREAMS_NON_BLOCK
+#define MICROPY_STREAMS_NON_BLOCK               (1)
+#endif
+#define MICROPY_MODULE_WEAK_LINKS               (1)
+#define MICROPY_CAN_OVERRIDE_BUILTINS           (1)
+#define MICROPY_PY_FUNCTION_ATTRS               (1)
+#define MICROPY_PY_DESCRIPTORS                  (1)
+#define MICROPY_PY_DELATTR_SETATTR              (1)
+#define MICROPY_PY_FSTRINGS                     (1)
+#define MICROPY_PY_BUILTINS_STR_UNICODE         (1)
+#define MICROPY_PY_BUILTINS_STR_CENTER          (1)
+#define MICROPY_PY_BUILTINS_STR_PARTITION       (1)
+#define MICROPY_PY_BUILTINS_STR_SPLITLINES      (1)
+#define MICROPY_PY_BUILTINS_MEMORYVIEW          (1)
+#define MICROPY_PY_BUILTINS_SLICE_ATTRS         (1)
+#define MICROPY_PY_BUILTINS_SLICE_INDICES       (1)
+#define MICROPY_PY_BUILTINS_FROZENSET           (1)
+#define MICROPY_PY_BUILTINS_ROUND_INT           (1)
+#define MICROPY_PY_ALL_SPECIAL_METHODS          (1)
+#define MICROPY_PY_REVERSE_SPECIAL_METHODS      (1)
+#define MICROPY_PY_BUILTINS_COMPILE             (1)
+#define MICROPY_PY_BUILTINS_NOTIMPLEMENTED      (1)
+#define MICROPY_PY_BUILTINS_INPUT               (1)
+#define MICROPY_PY_BUILTINS_POW3                (1)
+#define MICROPY_PY_MICROPYTHON_MEM_INFO         (1)
+#define MICROPY_PY_ARRAY_SLICE_ASSIGN           (1)
+#define MICROPY_PY_COLLECTIONS_DEQUE            (1)
+#define MICROPY_PY_COLLECTIONS_ORDEREDDICT      (1)
+#ifndef MICROPY_PY_MATH_SPECIAL_FUNCTIONS
+#define MICROPY_PY_MATH_SPECIAL_FUNCTIONS       (1)
+#endif
+#define MICROPY_PY_MATH_ISCLOSE                 (MICROPY_PY_MATH_SPECIAL_FUNCTIONS)
+#define MICROPY_PY_CMATH                        (1)
+#define MICROPY_PY_IO_IOBASE                    (1)
+#define MICROPY_PY_IO_FILEIO                    (1)
+#define MICROPY_PY_SYS_MAXSIZE                  (1)
+#define MICROPY_PY_SYS_STDFILES                 (1)
+#define MICROPY_PY_UERRNO                       (1)
+#define MICROPY_PY_UCTYPES                      (1)
+#define MICROPY_PY_UZLIB                        (1)
+#define MICROPY_PY_UJSON                        (1)
+#define MICROPY_PY_UOS                          (1)
+#define MICROPY_PY_URE                          (1)
+#define MICROPY_PY_UHEAPQ                       (1)
+#define MICROPY_PY_UHASHLIB                     (1)
+#define MICROPY_PY_UBINASCII                    (1)
+#define MICROPY_PY_UBINASCII_CRC32              (1)
+#define MICROPY_PY_URANDOM                      (1)
+#endif
+
 #define MICROPY_ALLOC_PATH_MAX      (PATH_MAX)
 #define MICROPY_PERSISTENT_CODE_LOAD (1)
 #if !defined(MICROPY_EMIT_X64) && defined(__x86_64__)
@@ -51,12 +119,7 @@
 #if !defined(MICROPY_EMIT_ARM) && defined(__arm__) && !defined(__thumb2__)
     #define MICROPY_EMIT_ARM        (1)
 #endif
-#define MICROPY_COMP_MODULE_CONST   (1)
-#define MICROPY_COMP_TRIPLE_TUPLE_ASSIGN (1)
-#define MICROPY_COMP_RETURN_IF_EXPR (1)
 #define MICROPY_ENABLE_GC           (1)
-#define MICROPY_ENABLE_FINALISER    (1)
-#define MICROPY_STACK_CHECK         (1)
 #define MICROPY_MALLOC_USES_ALLOCATED_SIZE (1)
 #define MICROPY_MEM_STATS           (1)
 #define MICROPY_DEBUG_PRINTERS      (1)
@@ -66,52 +129,16 @@
 #define MICROPY_READER_POSIX        (1)
 #define MICROPY_READER_VFS          (1)
 #define MICROPY_USE_READLINE_HISTORY (1)
-#define MICROPY_HELPER_REPL         (1)
-#define MICROPY_REPL_EMACS_KEYS     (1)
-#define MICROPY_REPL_AUTO_INDENT    (1)
 #define MICROPY_HELPER_LEXER_UNIX   (1)
-#define MICROPY_ENABLE_SOURCE_LINE  (1)
 #ifndef MICROPY_FLOAT_IMPL
 #define MICROPY_FLOAT_IMPL          (MICROPY_FLOAT_IMPL_DOUBLE)
 #endif
 #define MICROPY_LONGINT_IMPL        (MICROPY_LONGINT_IMPL_MPZ)
-#ifndef MICROPY_STREAMS_NON_BLOCK
-#define MICROPY_STREAMS_NON_BLOCK   (1)
-#endif
 #define MICROPY_STREAMS_POSIX_API   (1)
 #define MICROPY_OPT_COMPUTED_GOTO   (1)
-#ifndef MICROPY_OPT_LOAD_ATTR_FAST_PATH
-#define MICROPY_OPT_LOAD_ATTR_FAST_PATH (1)
-#endif
-#ifndef MICROPY_OPT_MAP_LOOKUP_CACHE
-#define MICROPY_OPT_MAP_LOOKUP_CACHE (1)
-#endif
-#define MICROPY_MODULE_WEAK_LINKS   (1)
 #define MICROPY_MODULE_OVERRIDE_MAIN_IMPORT (1)
-#define MICROPY_CAN_OVERRIDE_BUILTINS (1)
 #define MICROPY_VFS                 (1)
 #define MICROPY_VFS_POSIX           (1)
-#define MICROPY_PY_FUNCTION_ATTRS   (1)
-#define MICROPY_PY_DESCRIPTORS      (1)
-#define MICROPY_PY_DELATTR_SETATTR  (1)
-#define MICROPY_PY_FSTRINGS         (1)
-#define MICROPY_PY_BUILTINS_STR_UNICODE (1)
-#define MICROPY_PY_BUILTINS_STR_CENTER (1)
-#define MICROPY_PY_BUILTINS_STR_PARTITION (1)
-#define MICROPY_PY_BUILTINS_STR_SPLITLINES (1)
-#define MICROPY_PY_BUILTINS_MEMORYVIEW (1)
-#define MICROPY_PY_BUILTINS_FROZENSET (1)
-#define MICROPY_PY_BUILTINS_COMPILE (1)
-#define MICROPY_PY_BUILTINS_NOTIMPLEMENTED (1)
-#define MICROPY_PY_BUILTINS_INPUT   (1)
-#define MICROPY_PY_BUILTINS_POW3    (1)
-#define MICROPY_PY_BUILTINS_ROUND_INT    (1)
-#define MICROPY_PY_MICROPYTHON_MEM_INFO (1)
-#define MICROPY_PY_ALL_SPECIAL_METHODS (1)
-#define MICROPY_PY_REVERSE_SPECIAL_METHODS (1)
-#define MICROPY_PY_ARRAY_SLICE_ASSIGN (1)
-#define MICROPY_PY_BUILTINS_SLICE_ATTRS (1)
-#define MICROPY_PY_BUILTINS_SLICE_INDICES (1)
 #define MICROPY_PY_SYS_PATH_ARGV_DEFAULTS (0)
 #define MICROPY_PY_SYS_EXIT         (1)
 #define MICROPY_PY_SYS_ATEXIT       (1)
@@ -129,18 +156,7 @@
 #ifndef MICROPY_PY_SYS_PATH_DEFAULT
 #define MICROPY_PY_SYS_PATH_DEFAULT ".frozen:~/.micropython/lib:/usr/lib/micropython"
 #endif
-#define MICROPY_PY_SYS_MAXSIZE      (1)
-#define MICROPY_PY_SYS_STDFILES     (1)
 #define MICROPY_PY_SYS_EXC_INFO     (1)
-#define MICROPY_PY_COLLECTIONS_DEQUE (1)
-#define MICROPY_PY_COLLECTIONS_ORDEREDDICT (1)
-#ifndef MICROPY_PY_MATH_SPECIAL_FUNCTIONS
-#define MICROPY_PY_MATH_SPECIAL_FUNCTIONS (1)
-#endif
-#define MICROPY_PY_MATH_ISCLOSE     (MICROPY_PY_MATH_SPECIAL_FUNCTIONS)
-#define MICROPY_PY_CMATH            (1)
-#define MICROPY_PY_IO_IOBASE        (1)
-#define MICROPY_PY_IO_FILEIO        (1)
 #define MICROPY_PY_GC_COLLECT_RETVAL (1)
 
 #ifndef MICROPY_STACKLESS
@@ -148,7 +164,6 @@
 #define MICROPY_STACKLESS_STRICT    (0)
 #endif
 
-#define MICROPY_PY_UOS              (1)
 #define MICROPY_PY_UOS_INCLUDEFILE  "ports/unix/moduos.c"
 #define MICROPY_PY_UOS_ERRNO        (1)
 #define MICROPY_PY_UOS_GETENV_PUTENV_UNSETENV (1)
@@ -157,22 +172,12 @@
 #define MICROPY_PY_UOS_URANDOM      (1)
 #define MICROPY_PY_UTIME            (1)
 #define MICROPY_PY_UTIME_MP_HAL     (1)
-#define MICROPY_PY_UERRNO           (1)
-#define MICROPY_PY_UCTYPES          (1)
-#define MICROPY_PY_UZLIB            (1)
-#define MICROPY_PY_UJSON            (1)
-#define MICROPY_PY_URE              (1)
-#define MICROPY_PY_UHEAPQ           (1)
 #define MICROPY_PY_UTIMEQ           (1)
-#define MICROPY_PY_UHASHLIB         (1)
 #if MICROPY_PY_USSL
 #define MICROPY_PY_UHASHLIB_MD5     (1)
 #define MICROPY_PY_UHASHLIB_SHA1    (1)
 #define MICROPY_PY_UCRYPTOLIB       (1)
 #endif
-#define MICROPY_PY_UBINASCII        (1)
-#define MICROPY_PY_UBINASCII_CRC32  (1)
-#define MICROPY_PY_URANDOM          (1)
 #ifndef MICROPY_PY_USELECT_POSIX
 #define MICROPY_PY_USELECT_POSIX    (1)
 #endif
@@ -206,7 +211,6 @@ extern const struct _mp_print_t mp_stderr_print;
 
 #define MICROPY_ENABLE_EMERGENCY_EXCEPTION_BUF   (1)
 #define MICROPY_EMERGENCY_EXCEPTION_BUF_SIZE  (256)
-#define MICROPY_KBD_EXCEPTION       (1)
 #define MICROPY_ASYNC_KBD_INTR      (1)
 
 #define mp_import_stat mp_vfs_import_stat

From 3c20ddb41adc177442b68a8fdff221c80e0b0b5e Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 10 Mar 2022 13:21:11 +1100
Subject: [PATCH 1792/3533] unix/variants: Use rom feature config for standard,
 dev, coverage.

This change is a no-op in terms of functionality.

Signed-off-by: Damien George <damien@micropython.org>
---
 .../unix/variants/coverage/mpconfigvariant.h  | 26 ++++++++----------
 ports/unix/variants/dev/mpconfigvariant.h     | 27 ++++++++++++-------
 .../unix/variants/standard/mpconfigvariant.h  | 21 +++++++++++++--
 3 files changed, 47 insertions(+), 27 deletions(-)

diff --git a/ports/unix/variants/coverage/mpconfigvariant.h b/ports/unix/variants/coverage/mpconfigvariant.h
index e2640f71f7621..14f6b8331e836 100644
--- a/ports/unix/variants/coverage/mpconfigvariant.h
+++ b/ports/unix/variants/coverage/mpconfigvariant.h
@@ -27,36 +27,32 @@
 // This config enables almost all possible features such that it can be used
 // for coverage testing.
 
+// Set base feature level.
+#define MICROPY_CONFIG_ROM_LEVEL (MICROPY_CONFIG_ROM_LEVEL_EXTRA_FEATURES)
+
+// Disable some features that come enabled by default with the feature level.
+#define MICROPY_OPT_MPZ_BITWISE                 (0)
+#define MICROPY_MODULE_BUILTIN_INIT             (0)
+#define MICROPY_PY_BUILTINS_EXECFILE            (0)
+#define MICROPY_PY_SYS_STDIO_BUFFER             (0)
+#define MICROPY_PY_USELECT                      (0)
+
+// Enable additional features.
 #define MICROPY_DEBUG_PARSE_RULE_NAME  (1)
-#define MICROPY_OPT_MATH_FACTORIAL     (1)
 #define MICROPY_FLOAT_HIGH_QUALITY_HASH (1)
-#define MICROPY_ENABLE_SCHEDULER       (1)
 #define MICROPY_REPL_EMACS_WORDS_MOVE  (1)
 #define MICROPY_REPL_EMACS_EXTRA_WORDS_MOVE (1)
 #define MICROPY_WARNINGS_CATEGORY      (1)
-#define MICROPY_MODULE_ATTR_DELEGATION (1)
-#define MICROPY_MODULE_GETATTR         (1)
-#define MICROPY_PY_DELATTR_SETATTR     (1)
 #define MICROPY_PY_ALL_INPLACE_SPECIAL_METHODS (1)
-#define MICROPY_PY_REVERSE_SPECIAL_METHODS (1)
 #define MICROPY_PY_BUILTINS_MEMORYVIEW_ITEMSIZE (1)
 #define MICROPY_PY_BUILTINS_NEXT2      (1)
 #define MICROPY_PY_BUILTINS_RANGE_BINOP (1)
-#define MICROPY_PY_BUILTINS_HELP       (1)
-#define MICROPY_PY_BUILTINS_HELP_MODULES (1)
 #define MICROPY_PY_SYS_GETSIZEOF       (1)
-#define MICROPY_PY_SYS_PS1_PS2         (1)
 #define MICROPY_PY_SYS_TRACEBACKLIMIT  (1)
-#define MICROPY_PY_MATH_CONSTANTS      (1)
-#define MICROPY_PY_MATH_FACTORIAL      (1)
-#define MICROPY_PY_URANDOM_EXTRA_FUNCS (1)
 #define MICROPY_PY_IO_BUFFEREDWRITER (1)
-#define MICROPY_PY_UASYNCIO            (1)
 #define MICROPY_PY_URE_DEBUG           (1)
 #define MICROPY_PY_URE_MATCH_GROUPS    (1)
 #define MICROPY_PY_URE_MATCH_SPAN_START_END (1)
-#define MICROPY_PY_URE_SUB             (1)
-#define MICROPY_PY_FRAMEBUF            (1)
 #define MICROPY_PY_COLLECTIONS_NAMEDTUPLE__ASDICT (1)
 #define MICROPY_PY_UCRYPTOLIB          (1)
 #define MICROPY_PY_UCRYPTOLIB_CTR      (1)
diff --git a/ports/unix/variants/dev/mpconfigvariant.h b/ports/unix/variants/dev/mpconfigvariant.h
index 280243e34439c..16799322ff85b 100644
--- a/ports/unix/variants/dev/mpconfigvariant.h
+++ b/ports/unix/variants/dev/mpconfigvariant.h
@@ -24,16 +24,23 @@
  * THE SOFTWARE.
  */
 
+// Set base feature level.
+#define MICROPY_CONFIG_ROM_LEVEL (MICROPY_CONFIG_ROM_LEVEL_EXTRA_FEATURES)
+
+// Disable some features that come enabled by default with the feature level.
+#define MICROPY_OPT_MPZ_BITWISE                 (0)
+#define MICROPY_OPT_MATH_FACTORIAL              (0)
+#define MICROPY_MODULE_ATTR_DELEGATION          (0)
+#define MICROPY_MODULE_BUILTIN_INIT             (0)
+#define MICROPY_PY_BUILTINS_EXECFILE            (0)
+#define MICROPY_PY_MATH_FACTORIAL               (0)
+#define MICROPY_PY_SYS_PS1_PS2                  (0)
+#define MICROPY_PY_SYS_STDIO_BUFFER             (0)
+#define MICROPY_PY_USELECT                      (0)
+#define MICROPY_PY_URE_SUB                      (0)
+#define MICROPY_PY_FRAMEBUF                     (0)
+
+// Enable some additional features.
 #define MICROPY_REPL_EMACS_WORDS_MOVE           (1)
 #define MICROPY_REPL_EMACS_EXTRA_WORDS_MOVE     (1)
-#define MICROPY_ENABLE_SCHEDULER                (1)
-
-#define MICROPY_PY_BUILTINS_HELP                (1)
-#define MICROPY_PY_BUILTINS_HELP_MODULES        (1)
-#define MICROPY_PY_MATH_CONSTANTS               (1)
 #define MICROPY_PY_SYS_SETTRACE                 (1)
-#define MICROPY_PY_URANDOM_EXTRA_FUNCS          (1)
-
-#ifndef MICROPY_PY_UASYNCIO
-#define MICROPY_PY_UASYNCIO                     (1)
-#endif
diff --git a/ports/unix/variants/standard/mpconfigvariant.h b/ports/unix/variants/standard/mpconfigvariant.h
index 3cdcfa8e9b8c9..1ec46ef92d352 100644
--- a/ports/unix/variants/standard/mpconfigvariant.h
+++ b/ports/unix/variants/standard/mpconfigvariant.h
@@ -24,5 +24,22 @@
  * THE SOFTWARE.
  */
 
-#define MICROPY_PY_BUILTINS_HELP                (1)
-#define MICROPY_PY_BUILTINS_HELP_MODULES        (1)
+// Set base feature level.
+#define MICROPY_CONFIG_ROM_LEVEL (MICROPY_CONFIG_ROM_LEVEL_EXTRA_FEATURES)
+
+// Disable some features that come enabled by default with the feature level.
+#define MICROPY_OPT_MPZ_BITWISE                 (0)
+#define MICROPY_OPT_MATH_FACTORIAL              (0)
+#define MICROPY_MODULE_ATTR_DELEGATION          (0)
+#define MICROPY_MODULE_BUILTIN_INIT             (0)
+#define MICROPY_ENABLE_SCHEDULER                (0)
+#define MICROPY_PY_BUILTINS_EXECFILE            (0)
+#define MICROPY_PY_MATH_CONSTANTS               (0)
+#define MICROPY_PY_MATH_FACTORIAL               (0)
+#define MICROPY_PY_SYS_PS1_PS2                  (0)
+#define MICROPY_PY_SYS_STDIO_BUFFER             (0)
+#define MICROPY_PY_USELECT                      (0)
+#define MICROPY_PY_UASYNCIO                     (0)
+#define MICROPY_PY_URE_SUB                      (0)
+#define MICROPY_PY_URANDOM_EXTRA_FUNCS          (0)
+#define MICROPY_PY_FRAMEBUF                     (0)

From eec07332b127587a62f6555644f069620afa6091 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 10 Mar 2022 13:34:43 +1100
Subject: [PATCH 1793/3533] unix/variants: Enable a few optimisations and
 features on dev, coverage.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/unix/variants/coverage/mpconfigvariant.h | 1 -
 ports/unix/variants/dev/mpconfigvariant.h      | 7 -------
 2 files changed, 8 deletions(-)

diff --git a/ports/unix/variants/coverage/mpconfigvariant.h b/ports/unix/variants/coverage/mpconfigvariant.h
index 14f6b8331e836..2e36355ca6522 100644
--- a/ports/unix/variants/coverage/mpconfigvariant.h
+++ b/ports/unix/variants/coverage/mpconfigvariant.h
@@ -31,7 +31,6 @@
 #define MICROPY_CONFIG_ROM_LEVEL (MICROPY_CONFIG_ROM_LEVEL_EXTRA_FEATURES)
 
 // Disable some features that come enabled by default with the feature level.
-#define MICROPY_OPT_MPZ_BITWISE                 (0)
 #define MICROPY_MODULE_BUILTIN_INIT             (0)
 #define MICROPY_PY_BUILTINS_EXECFILE            (0)
 #define MICROPY_PY_SYS_STDIO_BUFFER             (0)
diff --git a/ports/unix/variants/dev/mpconfigvariant.h b/ports/unix/variants/dev/mpconfigvariant.h
index 16799322ff85b..87e89dc2a19b0 100644
--- a/ports/unix/variants/dev/mpconfigvariant.h
+++ b/ports/unix/variants/dev/mpconfigvariant.h
@@ -28,17 +28,10 @@
 #define MICROPY_CONFIG_ROM_LEVEL (MICROPY_CONFIG_ROM_LEVEL_EXTRA_FEATURES)
 
 // Disable some features that come enabled by default with the feature level.
-#define MICROPY_OPT_MPZ_BITWISE                 (0)
-#define MICROPY_OPT_MATH_FACTORIAL              (0)
-#define MICROPY_MODULE_ATTR_DELEGATION          (0)
 #define MICROPY_MODULE_BUILTIN_INIT             (0)
 #define MICROPY_PY_BUILTINS_EXECFILE            (0)
-#define MICROPY_PY_MATH_FACTORIAL               (0)
-#define MICROPY_PY_SYS_PS1_PS2                  (0)
 #define MICROPY_PY_SYS_STDIO_BUFFER             (0)
 #define MICROPY_PY_USELECT                      (0)
-#define MICROPY_PY_URE_SUB                      (0)
-#define MICROPY_PY_FRAMEBUF                     (0)
 
 // Enable some additional features.
 #define MICROPY_REPL_EMACS_WORDS_MOVE           (1)

From 65851ebb5126d4940e91c9f2c1d13b4e10753579 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 16 Mar 2022 00:00:25 +1100
Subject: [PATCH 1794/3533] py/parse: Simplify handling of const int parse
 nodes.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/parse.c | 42 +++++++++++++++++-------------------------
 1 file changed, 17 insertions(+), 25 deletions(-)

diff --git a/py/parse.c b/py/parse.c
index 68c761734a9a1..ff639122cba4f 100644
--- a/py/parse.c
+++ b/py/parse.c
@@ -463,16 +463,21 @@ STATIC mp_parse_node_t make_node_const_object(parser_t *parser, size_t src_line,
     return (mp_parse_node_t)pn;
 }
 
-STATIC mp_parse_node_t mp_parse_node_new_small_int_checked(parser_t *parser, mp_obj_t o_val) {
-    (void)parser;
-    mp_int_t val = MP_OBJ_SMALL_INT_VALUE(o_val);
-    #if MICROPY_OBJ_REPR == MICROPY_OBJ_REPR_D
-    // A parse node is only 32-bits and the small-int value must fit in 31-bits
-    if (((val ^ (val << 1)) & 0xffffffff80000000) != 0) {
-        return make_node_const_object(parser, 0, o_val);
+// Create a parse node represeting a constant integer value, possibly optimising
+// it by putting the (small) integer value directly in the parse node itself.
+STATIC mp_parse_node_t make_node_const_int(parser_t *parser, size_t src_line, mp_obj_t obj) {
+    if (mp_obj_is_small_int(obj)) {
+        mp_int_t val = MP_OBJ_SMALL_INT_VALUE(obj);
+        #if MICROPY_OBJ_REPR == MICROPY_OBJ_REPR_D
+        // A parse node is only 32-bits and the small-int value must fit in 31-bits
+        if (((val ^ (val << 1)) & 0xffffffff80000000) != 0) {
+            return make_node_const_object(parser, src_line, obj);
+        }
+        #endif
+        return mp_parse_node_new_small_int(val);
+    } else {
+        return make_node_const_object(parser, src_line, obj);
     }
-    #endif
-    return mp_parse_node_new_small_int(val);
 }
 
 STATIC void push_result_token(parser_t *parser, uint8_t rule_id) {
@@ -485,11 +490,7 @@ STATIC void push_result_token(parser_t *parser, uint8_t rule_id) {
         mp_map_elem_t *elem;
         if (rule_id == RULE_atom
             && (elem = mp_map_lookup(&parser->consts, MP_OBJ_NEW_QSTR(id), MP_MAP_LOOKUP)) != NULL) {
-            if (mp_obj_is_small_int(elem->value)) {
-                pn = mp_parse_node_new_small_int_checked(parser, elem->value);
-            } else {
-                pn = make_node_const_object(parser, lex->tok_line, elem->value);
-            }
+            pn = make_node_const_int(parser, lex->tok_line, elem->value);
         } else {
             pn = mp_parse_node_new_leaf(MP_PARSE_NODE_ID, id);
         }
@@ -499,11 +500,7 @@ STATIC void push_result_token(parser_t *parser, uint8_t rule_id) {
         #endif
     } else if (lex->tok_kind == MP_TOKEN_INTEGER) {
         mp_obj_t o = mp_parse_num_integer(lex->vstr.buf, lex->vstr.len, 0, lex);
-        if (mp_obj_is_small_int(o)) {
-            pn = mp_parse_node_new_small_int_checked(parser, o);
-        } else {
-            pn = make_node_const_object(parser, lex->tok_line, o);
-        }
+        pn = make_node_const_int(parser, lex->tok_line, o);
     } else if (lex->tok_kind == MP_TOKEN_FLOAT_OR_IMAG) {
         mp_obj_t o = mp_parse_num_decimal(lex->vstr.buf, lex->vstr.len, true, false, lex);
         pn = make_node_const_object(parser, lex->tok_line, o);
@@ -784,12 +781,7 @@ STATIC bool fold_constants(parser_t *parser, uint8_t rule_id, size_t num_args) {
     for (size_t i = num_args; i > 0; i--) {
         pop_result(parser);
     }
-    if (mp_obj_is_small_int(arg0)) {
-        push_result_node(parser, mp_parse_node_new_small_int_checked(parser, arg0));
-    } else {
-        // TODO reuse memory for parse node struct?
-        push_result_node(parser, make_node_const_object(parser, 0, arg0));
-    }
+    push_result_node(parser, make_node_const_int(parser, 0, arg0));
 
     return true;
 }

From 3c7cab4e98a31649ed1bc2e728d610856382d6f5 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 16 Mar 2022 00:22:58 +1100
Subject: [PATCH 1795/3533] py/parse: Put const bytes objects in parse tree as
 const object.

Instead of as an intermediate qstr, which may unnecessarily intern the data
of the bytes object.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/compile.c                       | 10 ----------
 py/parse.c                         | 19 +++++++++----------
 py/parse.h                         |  6 ++----
 tests/cmdline/cmd_parsetree.py.exp |  2 +-
 4 files changed, 12 insertions(+), 25 deletions(-)

diff --git a/py/compile.c b/py/compile.c
index 92736e22e5612..f9e8de4573b8e 100644
--- a/py/compile.c
+++ b/py/compile.c
@@ -2816,16 +2816,6 @@ STATIC void compile_node(compiler_t *comp, mp_parse_node_t pn) {
             case MP_PARSE_NODE_STRING:
                 EMIT_ARG(load_const_str, arg);
                 break;
-            case MP_PARSE_NODE_BYTES:
-                // only create and load the actual bytes object on the last pass
-                if (comp->pass != MP_PASS_EMIT) {
-                    EMIT_ARG(load_const_obj, mp_const_none);
-                } else {
-                    size_t len;
-                    const byte *data = qstr_data(arg, &len);
-                    EMIT_ARG(load_const_obj, mp_obj_new_bytes(data, len));
-                }
-                break;
             case MP_PARSE_NODE_TOKEN:
             default:
                 if (arg == MP_TOKEN_NEWLINE) {
diff --git a/py/parse.c b/py/parse.c
index ff639122cba4f..f18f03b3f1a93 100644
--- a/py/parse.c
+++ b/py/parse.c
@@ -388,9 +388,6 @@ void mp_parse_node_print(const mp_print_t *print, mp_parse_node_t pn, size_t ind
             case MP_PARSE_NODE_STRING:
                 mp_printf(print, "str(%s)\n", qstr_str(arg));
                 break;
-            case MP_PARSE_NODE_BYTES:
-                mp_printf(print, "bytes(%s)\n", qstr_str(arg));
-                break;
             default:
                 assert(MP_PARSE_NODE_LEAF_KIND(pn) == MP_PARSE_NODE_TOKEN);
                 mp_printf(print, "tok(%u)\n", (uint)arg);
@@ -504,8 +501,8 @@ STATIC void push_result_token(parser_t *parser, uint8_t rule_id) {
     } else if (lex->tok_kind == MP_TOKEN_FLOAT_OR_IMAG) {
         mp_obj_t o = mp_parse_num_decimal(lex->vstr.buf, lex->vstr.len, true, false, lex);
         pn = make_node_const_object(parser, lex->tok_line, o);
-    } else if (lex->tok_kind == MP_TOKEN_STRING || lex->tok_kind == MP_TOKEN_BYTES) {
-        // Don't automatically intern all strings/bytes.  doc strings (which are usually large)
+    } else if (lex->tok_kind == MP_TOKEN_STRING) {
+        // Don't automatically intern all strings.  Doc strings (which are usually large)
         // will be discarded by the compiler, and so we shouldn't intern them.
         qstr qst = MP_QSTRnull;
         if (lex->vstr.len <= MICROPY_ALLOC_PARSE_INTERN_STRING_LEN) {
@@ -517,14 +514,16 @@ STATIC void push_result_token(parser_t *parser, uint8_t rule_id) {
         }
         if (qst != MP_QSTRnull) {
             // qstr exists, make a leaf node
-            pn = mp_parse_node_new_leaf(lex->tok_kind == MP_TOKEN_STRING ? MP_PARSE_NODE_STRING : MP_PARSE_NODE_BYTES, qst);
+            pn = mp_parse_node_new_leaf(MP_PARSE_NODE_STRING, qst);
         } else {
-            // not interned, make a node holding a pointer to the string/bytes object
-            mp_obj_t o = mp_obj_new_str_copy(
-                lex->tok_kind == MP_TOKEN_STRING ? &mp_type_str : &mp_type_bytes,
-                (const byte *)lex->vstr.buf, lex->vstr.len);
+            // not interned, make a node holding a pointer to the string object
+            mp_obj_t o = mp_obj_new_str_copy(&mp_type_str, (const byte *)lex->vstr.buf, lex->vstr.len);
             pn = make_node_const_object(parser, lex->tok_line, o);
         }
+    } else if (lex->tok_kind == MP_TOKEN_BYTES) {
+        // make a node holding a pointer to the bytes object
+        mp_obj_t o = mp_obj_new_bytes((const byte *)lex->vstr.buf, lex->vstr.len);
+        pn = make_node_const_object(parser, lex->tok_line, o);
     } else {
         pn = mp_parse_node_new_leaf(MP_PARSE_NODE_TOKEN, lex->tok_kind);
     }
diff --git a/py/parse.h b/py/parse.h
index a6eb380047dc3..9c327c28b6c77 100644
--- a/py/parse.h
+++ b/py/parse.h
@@ -39,15 +39,13 @@ struct _mp_lexer_t;
 //  - xxxx...xx00: pointer to mp_parse_node_struct_t
 //  - xx...xx0010: an identifier; bits 4 and above are the qstr
 //  - xx...xx0110: a string; bits 4 and above are the qstr holding the value
-//  - xx...xx1010: a string of bytes; bits 4 and above are the qstr holding the value
-//  - xx...xx1110: a token; bits 4 and above are mp_token_kind_t
+//  - xx...xx1010: a token; bits 4 and above are mp_token_kind_t
 
 #define MP_PARSE_NODE_NULL      (0)
 #define MP_PARSE_NODE_SMALL_INT (0x1)
 #define MP_PARSE_NODE_ID        (0x02)
 #define MP_PARSE_NODE_STRING    (0x06)
-#define MP_PARSE_NODE_BYTES     (0x0a)
-#define MP_PARSE_NODE_TOKEN     (0x0e)
+#define MP_PARSE_NODE_TOKEN     (0x0a)
 
 typedef uintptr_t mp_parse_node_t; // must be pointer size
 
diff --git a/tests/cmdline/cmd_parsetree.py.exp b/tests/cmdline/cmd_parsetree.py.exp
index ac16f6d88d9a3..53d62a5dbd029 100644
--- a/tests/cmdline/cmd_parsetree.py.exp
+++ b/tests/cmdline/cmd_parsetree.py.exp
@@ -18,7 +18,7 @@
 [   8]     literal \.\+
 [   9]   \(rule\|expr_stmt\)(5) (n=2)
            id(d)
-           bytes(bytes)
+[   9]     literal \.\+
 [  10]   \(rule\|expr_stmt\)(5) (n=2)
            id(e)
 [  10]     literal \.\+

From 962ad8622e4c732f76ecbf8d5191ba8216d244d3 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 16 Mar 2022 00:33:44 +1100
Subject: [PATCH 1796/3533] py/parse: Handle check for target small-int size in
 parser.

This means that all constants for EMIT_ARG(load_const_obj, obj) are created
in the parser (rather than some in the compiler).

Signed-off-by: Damien George <damien@micropython.org>
---
 py/compile.c        | 16 ----------------
 py/parse.c          |  7 +++++++
 py/persistentcode.c |  2 +-
 3 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/py/compile.c b/py/compile.c
index f9e8de4573b8e..2e719206ff512 100644
--- a/py/compile.c
+++ b/py/compile.c
@@ -2790,23 +2790,7 @@ STATIC void compile_node(compiler_t *comp, mp_parse_node_t pn) {
         // pass
     } else if (MP_PARSE_NODE_IS_SMALL_INT(pn)) {
         mp_int_t arg = MP_PARSE_NODE_LEAF_SMALL_INT(pn);
-        #if MICROPY_DYNAMIC_COMPILER
-        mp_uint_t sign_mask = -((mp_uint_t)1 << (mp_dynamic_compiler.small_int_bits - 1));
-        if ((arg & sign_mask) == 0 || (arg & sign_mask) == sign_mask) {
-            // integer fits in target runtime's small-int
-            EMIT_ARG(load_const_small_int, arg);
-        } else {
-            // integer doesn't fit, so create a multi-precision int object
-            // (but only create the actual object on the last pass)
-            if (comp->pass != MP_PASS_EMIT) {
-                EMIT_ARG(load_const_obj, mp_const_none);
-            } else {
-                EMIT_ARG(load_const_obj, mp_obj_new_int_from_ll(arg));
-            }
-        }
-        #else
         EMIT_ARG(load_const_small_int, arg);
-        #endif
     } else if (MP_PARSE_NODE_IS_LEAF(pn)) {
         uintptr_t arg = MP_PARSE_NODE_LEAF_ARG(pn);
         switch (MP_PARSE_NODE_LEAF_KIND(pn)) {
diff --git a/py/parse.c b/py/parse.c
index f18f03b3f1a93..233cba11b46ca 100644
--- a/py/parse.c
+++ b/py/parse.c
@@ -471,6 +471,13 @@ STATIC mp_parse_node_t make_node_const_int(parser_t *parser, size_t src_line, mp
             return make_node_const_object(parser, src_line, obj);
         }
         #endif
+        #if MICROPY_DYNAMIC_COMPILER
+        // Check that the integer value fits in target runtime's small-int
+        mp_uint_t sign_mask = -((mp_uint_t)1 << (mp_dynamic_compiler.small_int_bits - 1));
+        if (!((val & sign_mask) == 0 || (val & sign_mask) == sign_mask)) {
+            return make_node_const_object(parser, src_line, obj);
+        }
+        #endif
         return mp_parse_node_new_small_int(val);
     } else {
         return make_node_const_object(parser, src_line, obj);
diff --git a/py/persistentcode.c b/py/persistentcode.c
index b473f1830824e..6110ae97f007a 100644
--- a/py/persistentcode.c
+++ b/py/persistentcode.c
@@ -536,7 +536,7 @@ STATIC void save_obj(mp_print_t *print, mp_obj_t o) {
         // we save numbers using a simplistic text representation
         // TODO could be improved
         byte obj_type;
-        if (mp_obj_is_type(o, &mp_type_int)) {
+        if (mp_obj_is_int(o)) {
             obj_type = 'i';
         #if MICROPY_PY_BUILTINS_COMPLEX
         } else if (mp_obj_is_type(o, &mp_type_complex)) {

From 1692cad6733b82b1cb7631ce10c1ddb54e66058e Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 16 Mar 2022 11:39:27 +1100
Subject: [PATCH 1797/3533] py/showbc: Remove global variables and make
 DECODE_PTR work correctly.

The bytecode state variables mp_showbc_code_start and mp_showbc_constants
have been removed and made local variables passed into the various
functions.

As part of this, the DECODE_PTR macro is fixed so it extracts the relevant
pointer from the child_table (a regression introduced in
f2040bfc7ee033e48acef9f289790f3b4e6b74e5).

Signed-off-by: Damien George <damien@micropython.org>
---
 py/bc.h      |  6 ++---
 py/compile.c |  2 +-
 py/showbc.c  | 71 ++++++++++++++++++++++++++--------------------------
 py/vm.c      |  2 +-
 4 files changed, 41 insertions(+), 40 deletions(-)

diff --git a/py/bc.h b/py/bc.h
index 5710f4d2431fe..8709b42389032 100644
--- a/py/bc.h
+++ b/py/bc.h
@@ -265,9 +265,9 @@ const byte *mp_decode_uint_skip(const byte *ptr);
 mp_vm_return_kind_t mp_execute_bytecode(mp_code_state_t *code_state, volatile mp_obj_t inject_exc);
 mp_code_state_t *mp_obj_fun_bc_prepare_codestate(mp_obj_t func, size_t n_args, size_t n_kw, const mp_obj_t *args);
 void mp_setup_code_state(mp_code_state_t *code_state, size_t n_args, size_t n_kw, const mp_obj_t *args);
-void mp_bytecode_print(const mp_print_t *print, const void *descr, const byte *code, mp_uint_t len, const mp_module_constants_t *cm);
-void mp_bytecode_print2(const mp_print_t *print, const byte *code, size_t len, const mp_module_constants_t *cm);
-const byte *mp_bytecode_print_str(const mp_print_t *print, const byte *ip);
+void mp_bytecode_print(const mp_print_t *print, const struct _mp_raw_code_t *rc, const mp_module_constants_t *cm);
+void mp_bytecode_print2(const mp_print_t *print, const byte *ip, size_t len, struct _mp_raw_code_t *const *child_table, const mp_module_constants_t *cm);
+const byte *mp_bytecode_print_str(const mp_print_t *print, const byte *ip_start, const byte *ip, struct _mp_raw_code_t *const *child_table, const mp_module_constants_t *cm);
 #define mp_bytecode_print_inst(print, code, x_table) mp_bytecode_print2(print, code, 1, x_table)
 
 // Helper macros to access pointer with least significant bits holding flags
diff --git a/py/compile.c b/py/compile.c
index 2e719206ff512..eb7389ec5fbaf 100644
--- a/py/compile.c
+++ b/py/compile.c
@@ -3632,7 +3632,7 @@ mp_compiled_module_t mp_compile_to_raw_code(mp_parse_tree_t *parse_tree, qstr so
         if (mp_verbose_flag >= 2) {
             for (scope_t *s = comp->scope_head; s != NULL; s = s->next) {
                 mp_raw_code_t *rc = s->raw_code;
-                mp_bytecode_print(&mp_plat_print, rc, rc->fun_data, rc->fun_data_len, &cm.context->constants);
+                mp_bytecode_print(&mp_plat_print, rc, &cm.context->constants);
             }
         }
         #endif
diff --git a/py/showbc.c b/py/showbc.c
index 1300ac1fa3a04..8430739d8e483 100644
--- a/py/showbc.c
+++ b/py/showbc.c
@@ -28,7 +28,7 @@
 #include <assert.h>
 
 #include "py/bc0.h"
-#include "py/bc.h"
+#include "py/emitglue.h"
 
 #if MICROPY_DEBUG_PRINTERS
 
@@ -45,7 +45,7 @@
 
 #define DECODE_QSTR \
     DECODE_UINT; \
-    qst = mp_showbc_constants->qstr_table[unum]
+    qst = qstr_table[unum]
 
 #else
 
@@ -56,18 +56,16 @@
 #endif
 
 #define DECODE_PTR \
-    DECODE_UINT;
+    DECODE_UINT; \
+    unum = (mp_uint_t)(uintptr_t)child_table[unum]
 
 #define DECODE_OBJ \
     DECODE_UINT; \
-    unum = (mp_uint_t)mp_showbc_constants->obj_table[unum]
-
-const byte * mp_showbc_code_start;
-const mp_module_constants_t *mp_showbc_constants;
+    unum = (mp_uint_t)obj_table[unum]
 
-#include "py/emitglue.h"
-void mp_bytecode_print(const mp_print_t *print, const void *descr, const byte *ip, mp_uint_t len, const mp_module_constants_t *cm) {
-    mp_showbc_code_start = ip;
+void mp_bytecode_print(const mp_print_t *print, const mp_raw_code_t *rc, const mp_module_constants_t *cm) {
+    const byte *ip_start = rc->fun_data;
+    const byte *ip = rc->fun_data;
 
     // Decode prelude
     MP_BC_PRELUDE_SIG_DECODE(ip);
@@ -81,18 +79,18 @@ void mp_bytecode_print(const mp_print_t *print, const void *descr, const byte *i
     #else
     qstr source_file = cm->source_file;
     #endif
-    mp_printf(print, "File %s, code block '%s' (descriptor: %p, bytecode @%p " UINT_FMT " bytes)\n",// rct=%p\n",
-        qstr_str(source_file), qstr_str(block_name), descr, mp_showbc_code_start, len);// , ((mp_raw_code_t*)descr)->children);
+    mp_printf(print, "File %s, code block '%s' (descriptor: %p, bytecode @%p %u bytes)\n",
+        qstr_str(source_file), qstr_str(block_name), rc, ip_start, (unsigned)rc->fun_data_len);
 
     // raw bytecode dump
-    size_t prelude_size = ip - mp_showbc_code_start + n_info + n_cell;
+    size_t prelude_size = ip - ip_start + n_info + n_cell;
     mp_printf(print, "Raw bytecode (code_info_size=%u, bytecode_size=%u):\n",
-        (unsigned)prelude_size, (unsigned)(len - prelude_size));
-    for (mp_uint_t i = 0; i < len; i++) {
+        (unsigned)prelude_size, (unsigned)(rc->fun_data_len - prelude_size));
+    for (size_t i = 0; i < rc->fun_data_len; i++) {
         if (i > 0 && i % 16 == 0) {
             mp_printf(print, "\n");
         }
-        mp_printf(print, " %02x", mp_showbc_code_start[i]);
+        mp_printf(print, " %02x", ip_start[i]);
     }
     mp_printf(print, "\n");
 
@@ -140,10 +138,14 @@ void mp_bytecode_print(const mp_print_t *print, const void *descr, const byte *i
             mp_printf(print, "  bc=" INT_FMT " line=" UINT_FMT "\n", bc, source_line);
         }
     }
-    mp_bytecode_print2(print, ip, len - prelude_size, cm);
+    mp_bytecode_print2(print, ip, rc->fun_data_len - prelude_size, rc->children, cm);
 }
 
-const byte *mp_bytecode_print_str(const mp_print_t *print, const byte *ip) {
+const byte *mp_bytecode_print_str(const mp_print_t *print, const byte *ip_start, const byte *ip, mp_raw_code_t *const *child_table, const mp_module_constants_t *cm) {
+    #if MICROPY_EMIT_BYTECODE_USES_QSTR_TABLE
+    const qstr_short_t *qstr_table = cm->qstr_table;
+    #endif
+    const mp_obj_t *obj_table = cm->obj_table;
     mp_uint_t unum;
     qstr qst;
 
@@ -302,32 +304,32 @@ const byte *mp_bytecode_print_str(const mp_print_t *print, const byte *ip) {
 
         case MP_BC_JUMP:
             DECODE_SLABEL;
-            mp_printf(print, "JUMP " UINT_FMT, (mp_uint_t)(ip + unum - mp_showbc_code_start));
+            mp_printf(print, "JUMP " UINT_FMT, (mp_uint_t)(ip + unum - ip_start));
             break;
 
         case MP_BC_POP_JUMP_IF_TRUE:
             DECODE_SLABEL;
-            mp_printf(print, "POP_JUMP_IF_TRUE " UINT_FMT, (mp_uint_t)(ip + unum - mp_showbc_code_start));
+            mp_printf(print, "POP_JUMP_IF_TRUE " UINT_FMT, (mp_uint_t)(ip + unum - ip_start));
             break;
 
         case MP_BC_POP_JUMP_IF_FALSE:
             DECODE_SLABEL;
-            mp_printf(print, "POP_JUMP_IF_FALSE " UINT_FMT, (mp_uint_t)(ip + unum - mp_showbc_code_start));
+            mp_printf(print, "POP_JUMP_IF_FALSE " UINT_FMT, (mp_uint_t)(ip + unum - ip_start));
             break;
 
         case MP_BC_JUMP_IF_TRUE_OR_POP:
             DECODE_SLABEL;
-            mp_printf(print, "JUMP_IF_TRUE_OR_POP " UINT_FMT, (mp_uint_t)(ip + unum - mp_showbc_code_start));
+            mp_printf(print, "JUMP_IF_TRUE_OR_POP " UINT_FMT, (mp_uint_t)(ip + unum - ip_start));
             break;
 
         case MP_BC_JUMP_IF_FALSE_OR_POP:
             DECODE_SLABEL;
-            mp_printf(print, "JUMP_IF_FALSE_OR_POP " UINT_FMT, (mp_uint_t)(ip + unum - mp_showbc_code_start));
+            mp_printf(print, "JUMP_IF_FALSE_OR_POP " UINT_FMT, (mp_uint_t)(ip + unum - ip_start));
             break;
 
         case MP_BC_SETUP_WITH:
             DECODE_ULABEL; // loop-like labels are always forward
-            mp_printf(print, "SETUP_WITH " UINT_FMT, (mp_uint_t)(ip + unum - mp_showbc_code_start));
+            mp_printf(print, "SETUP_WITH " UINT_FMT, (mp_uint_t)(ip + unum - ip_start));
             break;
 
         case MP_BC_WITH_CLEANUP:
@@ -336,18 +338,18 @@ const byte *mp_bytecode_print_str(const mp_print_t *print, const byte *ip) {
 
         case MP_BC_UNWIND_JUMP:
             DECODE_SLABEL;
-            mp_printf(print, "UNWIND_JUMP " UINT_FMT " %d", (mp_uint_t)(ip + unum - mp_showbc_code_start), *ip);
+            mp_printf(print, "UNWIND_JUMP " UINT_FMT " %d", (mp_uint_t)(ip + unum - ip_start), *ip);
             ip += 1;
             break;
 
         case MP_BC_SETUP_EXCEPT:
             DECODE_ULABEL; // except labels are always forward
-            mp_printf(print, "SETUP_EXCEPT " UINT_FMT, (mp_uint_t)(ip + unum - mp_showbc_code_start));
+            mp_printf(print, "SETUP_EXCEPT " UINT_FMT, (mp_uint_t)(ip + unum - ip_start));
             break;
 
         case MP_BC_SETUP_FINALLY:
             DECODE_ULABEL; // except labels are always forward
-            mp_printf(print, "SETUP_FINALLY " UINT_FMT, (mp_uint_t)(ip + unum - mp_showbc_code_start));
+            mp_printf(print, "SETUP_FINALLY " UINT_FMT, (mp_uint_t)(ip + unum - ip_start));
             break;
 
         case MP_BC_END_FINALLY:
@@ -368,12 +370,12 @@ const byte *mp_bytecode_print_str(const mp_print_t *print, const byte *ip) {
 
         case MP_BC_FOR_ITER:
             DECODE_ULABEL; // the jump offset if iteration finishes; for labels are always forward
-            mp_printf(print, "FOR_ITER " UINT_FMT, (mp_uint_t)(ip + unum - mp_showbc_code_start));
+            mp_printf(print, "FOR_ITER " UINT_FMT, (mp_uint_t)(ip + unum - ip_start));
             break;
 
         case MP_BC_POP_EXCEPT_JUMP:
             DECODE_ULABEL; // these labels are always forward
-            mp_printf(print, "POP_EXCEPT_JUMP " UINT_FMT, (mp_uint_t)(ip + unum - mp_showbc_code_start));
+            mp_printf(print, "POP_EXCEPT_JUMP " UINT_FMT, (mp_uint_t)(ip + unum - ip_start));
             break;
 
         case MP_BC_BUILD_TUPLE:
@@ -528,12 +530,11 @@ const byte *mp_bytecode_print_str(const mp_print_t *print, const byte *ip) {
     return ip;
 }
 
-void mp_bytecode_print2(const mp_print_t *print, const byte *ip, size_t len, const mp_module_constants_t *cm) {
-    mp_showbc_code_start = ip;
-    mp_showbc_constants = cm;
-    while (ip < len + mp_showbc_code_start) {
-        mp_printf(print, "%02u ", (uint)(ip - mp_showbc_code_start));
-        ip = mp_bytecode_print_str(print, ip);
+void mp_bytecode_print2(const mp_print_t *print, const byte *ip, size_t len, mp_raw_code_t *const *child_table, const mp_module_constants_t *cm) {
+    const byte *ip_start = ip;
+    while (ip < ip_start + len) {
+        mp_printf(print, "%02u ", (uint)(ip - ip_start));
+        ip = mp_bytecode_print_str(print, ip_start, ip, child_table, cm);
         mp_printf(print, "\n");
     }
 }
diff --git a/py/vm.c b/py/vm.c
index b762c92bf2d57..497a56962287d 100644
--- a/py/vm.c
+++ b/py/vm.c
@@ -44,7 +44,7 @@
 #else
 #define TRACE_PREFIX mp_printf(&mp_plat_print, "sp=%d ", (int)(sp - &code_state->state[0] + 1))
 #endif
-#define TRACE(ip) TRACE_PREFIX; mp_bytecode_print2(&mp_plat_print, ip, 1, &code_state->fun_bc->context->constants);
+#define TRACE(ip) TRACE_PREFIX; mp_bytecode_print2(&mp_plat_print, ip, 1, code_state->fun_bc->child_table, &code_state->fun_bc->context->constants);
 #else
 #define TRACE(ip)
 #endif

From adfd57c5fedec4e64c2e34cbea89aa6ecdb40a50 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 10 Mar 2022 11:49:01 +1100
Subject: [PATCH 1798/3533] lib/re1.5: Distinguish between subject
 start-of-line and start-of-srch.

Otherwise a repeated sub/split will continue to match ^ to the start of
that search.

Signed-off-by: Damien George <damien@micropython.org>
---
 lib/re1.5/re1.5.h         | 1 +
 lib/re1.5/recursiveloop.c | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/re1.5/re1.5.h b/lib/re1.5/re1.5.h
index ba6f97b7434dd..81f43ed7f5fda 100644
--- a/lib/re1.5/re1.5.h
+++ b/lib/re1.5/re1.5.h
@@ -130,6 +130,7 @@ Sub *update(Sub*, int, const char*);
 void decref(Sub*);
 
 struct Subject {
+	const char *begin_line;
 	const char *begin;
 	const char *end;
 };
diff --git a/lib/re1.5/recursiveloop.c b/lib/re1.5/recursiveloop.c
index f8cb92629200a..17ecea3378ef4 100644
--- a/lib/re1.5/recursiveloop.c
+++ b/lib/re1.5/recursiveloop.c
@@ -68,7 +68,7 @@ recursiveloop(char *pc, const char *sp, Subject *input, const char **subp, int n
 			subp[off] = old;
 			return 0;
 		case Bol:
-			if(sp != input->begin)
+			if(sp != input->begin_line)
 				return 0;
 			continue;
 		case Eol:

From 63f0e700f4e8927854ec1f70eeb114fa079632a3 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 10 Mar 2022 11:51:42 +1100
Subject: [PATCH 1799/3533] extmod/modure: Set subject begin_line so ^ doesn't
 match interior.

Fixes issue #8402.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/modure.c           |  6 +++---
 tests/extmod/ure_split.py | 10 ++++++++++
 tests/extmod/ure_sub.py   |  4 ++++
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/extmod/modure.c b/extmod/modure.c
index 36c987a80dc16..d9e5451eb58ba 100644
--- a/extmod/modure.c
+++ b/extmod/modure.c
@@ -187,7 +187,7 @@ STATIC mp_obj_t ure_exec(bool is_anchored, uint n_args, const mp_obj_t *args) {
     }
     Subject subj;
     size_t len;
-    subj.begin = mp_obj_str_get_data(args[1], &len);
+    subj.begin_line = subj.begin = mp_obj_str_get_data(args[1], &len);
     subj.end = subj.begin + len;
     int caps_num = (self->re.sub + 1) * 2;
     mp_obj_match_t *match = m_new_obj_var(mp_obj_match_t, char *, caps_num);
@@ -220,7 +220,7 @@ STATIC mp_obj_t re_split(size_t n_args, const mp_obj_t *args) {
     Subject subj;
     size_t len;
     const mp_obj_type_t *str_type = mp_obj_get_type(args[1]);
-    subj.begin = mp_obj_str_get_data(args[1], &len);
+    subj.begin_line = subj.begin = mp_obj_str_get_data(args[1], &len);
     subj.end = subj.begin + len;
     int caps_num = (self->re.sub + 1) * 2;
 
@@ -280,7 +280,7 @@ STATIC mp_obj_t re_sub_helper(size_t n_args, const mp_obj_t *args) {
     size_t where_len;
     const char *where_str = mp_obj_str_get_data(where, &where_len);
     Subject subj;
-    subj.begin = where_str;
+    subj.begin_line = subj.begin = where_str;
     subj.end = subj.begin + where_len;
     int caps_num = (self->re.sub + 1) * 2;
 
diff --git a/tests/extmod/ure_split.py b/tests/extmod/ure_split.py
index a8b9c1686c658..7e6ef3990f4cd 100644
--- a/tests/extmod/ure_split.py
+++ b/tests/extmod/ure_split.py
@@ -31,3 +31,13 @@
 r = re.compile(b"x")
 s = r.split(b"fooxbar")
 print(s)
+
+# using ^
+r = re.compile("^ab")
+s = r.split("abababcabab")
+print(s)
+
+# using ^ with |
+r = re.compile("^ab|cab")
+s = r.split("abababcabab")
+print(s)
diff --git a/tests/extmod/ure_sub.py b/tests/extmod/ure_sub.py
index ae6ad28d621f4..806c38957627e 100644
--- a/tests/extmod/ure_sub.py
+++ b/tests/extmod/ure_sub.py
@@ -75,3 +75,7 @@ def A():
 
 # Include \ in the sub replacement
 print(re.sub("b", "\\\\b", "abc"))
+
+# Using ^, make sure it doesn't repeatedly match
+print(re.sub("^ab", "*", "abababcabab"))
+print(re.sub("^ab|cab", "*", "abababcabab"))

From a16dcc8136c8af47d69e7a4b3a55270db0e4c637 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Sun, 13 Mar 2022 20:03:38 +0200
Subject: [PATCH 1800/3533] stm32/boards: Convert F4xx and F7xx to new flash FS
 config.

Following on from 35e70c1698047170f9fb8b1edc65a7f7125f267f.

Fixes issue #8390.
---
 ports/stm32/boards/stm32f401xd.ld | 11 +++++--
 ports/stm32/boards/stm32f401xe.ld | 11 +++++--
 ports/stm32/boards/stm32f405.ld   |  6 ++++
 ports/stm32/boards/stm32f411.ld   | 11 +++++--
 ports/stm32/boards/stm32f412zx.ld | 11 +++++--
 ports/stm32/boards/stm32f427xi.ld |  7 ++++
 ports/stm32/boards/stm32f429.ld   |  7 ++++
 ports/stm32/boards/stm32f722.ld   |  6 ++++
 ports/stm32/boards/stm32f746.ld   |  6 ++++
 ports/stm32/boards/stm32f767.ld   |  6 ++++
 ports/stm32/boards/stm32f769.ld   |  6 ++++
 ports/stm32/flashbdev.c           | 55 +------------------------------
 12 files changed, 81 insertions(+), 62 deletions(-)

diff --git a/ports/stm32/boards/stm32f401xd.ld b/ports/stm32/boards/stm32f401xd.ld
index f4146abc6d728..33b2912acef72 100644
--- a/ports/stm32/boards/stm32f401xd.ld
+++ b/ports/stm32/boards/stm32f401xd.ld
@@ -7,9 +7,10 @@ MEMORY
 {
     FLASH (rx)      : ORIGIN = 0x08000000, LENGTH = 384K /* entire flash */
     FLASH_ISR (rx)  : ORIGIN = 0x08000000, LENGTH = 16K /* sector 0 */
-    FLASH_FS (rx)   : ORIGIN = 0x08004000, LENGTH = 112K /* sectors 1,2,3 are 16K, 4 is 64K */
+    FLASH_FS (rx)   : ORIGIN = 0x08004000, LENGTH = 64K /* sectors 1,2,3,4: 16k+16k+16k+16k(of 64k)=64k */
     FLASH_TEXT (rx) : ORIGIN = 0x08020000, LENGTH = 256K /* sectors 5,6 are 128K */
-    RAM (xrw)       : ORIGIN = 0x20000000, LENGTH = 96K
+    RAM (xrw)       : ORIGIN = 0x20000000, LENGTH = 80K
+    FS_CACHE (xrw)  : ORIGIN = 0x20014000, LENGTH = 16K
 }
 
 /* produce a link error if there is not this amount of RAM for these sections */
@@ -26,3 +27,9 @@ _ram_start = ORIGIN(RAM);
 _ram_end = ORIGIN(RAM) + LENGTH(RAM);
 _heap_start = _ebss; /* heap starts just after statically allocated memory */
 _heap_end = _sstack;
+
+/* Filesystem cache in RAM, and storage in flash */
+_micropy_hw_internal_flash_storage_ram_cache_start = ORIGIN(FS_CACHE);
+_micropy_hw_internal_flash_storage_ram_cache_end = ORIGIN(FS_CACHE) + LENGTH(FS_CACHE);
+_micropy_hw_internal_flash_storage_start = ORIGIN(FLASH_FS);
+_micropy_hw_internal_flash_storage_end = ORIGIN(FLASH_FS) + LENGTH(FLASH_FS);
diff --git a/ports/stm32/boards/stm32f401xe.ld b/ports/stm32/boards/stm32f401xe.ld
index e7bd8edfed1fb..d783cd187542c 100644
--- a/ports/stm32/boards/stm32f401xe.ld
+++ b/ports/stm32/boards/stm32f401xe.ld
@@ -7,9 +7,10 @@ MEMORY
 {
     FLASH (rx)      : ORIGIN = 0x08000000, LENGTH = 512K /* entire flash */
     FLASH_ISR (rx)  : ORIGIN = 0x08000000, LENGTH = 16K /* sector 0 */
-    FLASH_FS (rx)   : ORIGIN = 0x08004000, LENGTH = 112K /* sectors 1,2,3 are 16K, 4 is 64K */
+    FLASH_FS (rx)   : ORIGIN = 0x08004000, LENGTH = 64K /* sectors 1,2,3,4: 16k+16k+16k+16k(of 64k)=64k */
     FLASH_TEXT (rx) : ORIGIN = 0x08020000, LENGTH = 384K /* sectors 5,6,7 are 128K */
-    RAM (xrw)       : ORIGIN = 0x20000000, LENGTH = 96K
+    RAM (xrw)       : ORIGIN = 0x20000000, LENGTH = 80K
+    FS_CACHE (xrw)  : ORIGIN = 0x20014000, LENGTH = 16K
 }
 
 /* produce a link error if there is not this amount of RAM for these sections */
@@ -26,3 +27,9 @@ _ram_start = ORIGIN(RAM);
 _ram_end = ORIGIN(RAM) + LENGTH(RAM);
 _heap_start = _ebss; /* heap starts just after statically allocated memory */
 _heap_end = _sstack;
+
+/* Filesystem cache in RAM, and storage in flash */
+_micropy_hw_internal_flash_storage_ram_cache_start = ORIGIN(FS_CACHE);
+_micropy_hw_internal_flash_storage_ram_cache_end = ORIGIN(FS_CACHE) + LENGTH(FS_CACHE);
+_micropy_hw_internal_flash_storage_start = ORIGIN(FLASH_FS);
+_micropy_hw_internal_flash_storage_end = ORIGIN(FLASH_FS) + LENGTH(FLASH_FS);
diff --git a/ports/stm32/boards/stm32f405.ld b/ports/stm32/boards/stm32f405.ld
index b6f5d3057847a..6658c1e99124d 100644
--- a/ports/stm32/boards/stm32f405.ld
+++ b/ports/stm32/boards/stm32f405.ld
@@ -27,3 +27,9 @@ _ram_start = ORIGIN(RAM);
 _ram_end = ORIGIN(RAM) + LENGTH(RAM);
 _heap_start = _ebss; /* heap starts just after statically allocated memory */
 _heap_end = _sstack;
+
+/* Filesystem cache in RAM, and storage in flash */
+_micropy_hw_internal_flash_storage_ram_cache_start = ORIGIN(CCMRAM);
+_micropy_hw_internal_flash_storage_ram_cache_end = ORIGIN(CCMRAM) + LENGTH(CCMRAM);
+_micropy_hw_internal_flash_storage_start = ORIGIN(FLASH_FS);
+_micropy_hw_internal_flash_storage_end = ORIGIN(FLASH_FS) + LENGTH(FLASH_FS);
diff --git a/ports/stm32/boards/stm32f411.ld b/ports/stm32/boards/stm32f411.ld
index 50633118eb240..6e874f66c8cb6 100644
--- a/ports/stm32/boards/stm32f411.ld
+++ b/ports/stm32/boards/stm32f411.ld
@@ -7,9 +7,10 @@ MEMORY
 {
     FLASH (rx)      : ORIGIN = 0x08000000, LENGTH = 512K /* entire flash */
     FLASH_ISR (rx)  : ORIGIN = 0x08000000, LENGTH = 16K /* sector 0 */
-    FLASH_FS (rx)   : ORIGIN = 0x08004000, LENGTH = 112K /* sectors 1,2,3 are 16K, 4 is 64K */
+    FLASH_FS (rx)   : ORIGIN = 0x08004000, LENGTH = 64K /* sectors 1,2,3,4: 16k+16k+16k+16k(of 64k)=64k */
     FLASH_TEXT (rx) : ORIGIN = 0x08020000, LENGTH = 384K /* sectors 5,6,7 are 128K */
-    RAM (xrw)       : ORIGIN = 0x20000000, LENGTH = 128K
+    RAM (xrw)       : ORIGIN = 0x20000000, LENGTH = 112K
+    FS_CACHE (xrw)  : ORIGIN = 0x2001c000, LENGTH = 16K
 }
 
 /* produce a link error if there is not this amount of RAM for these sections */
@@ -26,3 +27,9 @@ _ram_start = ORIGIN(RAM);
 _ram_end = ORIGIN(RAM) + LENGTH(RAM);
 _heap_start = _ebss; /* heap starts just after statically allocated memory */
 _heap_end = _sstack;
+
+/* Filesystem cache in RAM, and storage in flash */
+_micropy_hw_internal_flash_storage_ram_cache_start = ORIGIN(FS_CACHE);
+_micropy_hw_internal_flash_storage_ram_cache_end = ORIGIN(FS_CACHE) + LENGTH(FS_CACHE);
+_micropy_hw_internal_flash_storage_start = ORIGIN(FLASH_FS);
+_micropy_hw_internal_flash_storage_end = ORIGIN(FLASH_FS) + LENGTH(FLASH_FS);
diff --git a/ports/stm32/boards/stm32f412zx.ld b/ports/stm32/boards/stm32f412zx.ld
index 55aa608657383..c949d827a6c59 100644
--- a/ports/stm32/boards/stm32f412zx.ld
+++ b/ports/stm32/boards/stm32f412zx.ld
@@ -7,9 +7,10 @@ MEMORY
 {
     FLASH (rx)      : ORIGIN = 0x08000000, LENGTH = 1024K /* entire flash */
     FLASH_ISR (rx)  : ORIGIN = 0x08000000, LENGTH = 16K /* sector 0 */
-    FLASH_FS (rx)   : ORIGIN = 0x08004000, LENGTH = 112K /* sectors 1,2,3 are 16K, 4 is 64K */
+    FLASH_FS (rx)   : ORIGIN = 0x08004000, LENGTH = 64K /* sectors 1,2,3,4: 16k+16k+16k+16k(of 64k)=64k */
     FLASH_TEXT (rx) : ORIGIN = 0x08020000, LENGTH = 896K /* sectors 5,6,7,8,9,10,11 are 128K */
-    RAM (xrw)       : ORIGIN = 0x20000000, LENGTH = 256K
+    RAM (xrw)       : ORIGIN = 0x20000000, LENGTH = 240K
+    FS_CACHE (xrw)  : ORIGIN = 0x2003c000, LENGTH = 16K
 }
 
 /* produce a link error if there is not this amount of RAM for these sections */
@@ -26,3 +27,9 @@ _ram_start = ORIGIN(RAM);
 _ram_end = ORIGIN(RAM) + LENGTH(RAM);
 _heap_start = _ebss; /* heap starts just after statically allocated memory */
 _heap_end = _sstack;
+
+/* Filesystem cache in RAM, and storage in flash */
+_micropy_hw_internal_flash_storage_ram_cache_start = ORIGIN(FS_CACHE);
+_micropy_hw_internal_flash_storage_ram_cache_end = ORIGIN(FS_CACHE) + LENGTH(FS_CACHE);
+_micropy_hw_internal_flash_storage_start = ORIGIN(FLASH_FS);
+_micropy_hw_internal_flash_storage_end = ORIGIN(FLASH_FS) + LENGTH(FLASH_FS);
diff --git a/ports/stm32/boards/stm32f427xi.ld b/ports/stm32/boards/stm32f427xi.ld
index 1197848af175c..b405841609f81 100644
--- a/ports/stm32/boards/stm32f427xi.ld
+++ b/ports/stm32/boards/stm32f427xi.ld
@@ -9,6 +9,7 @@ MEMORY
     FLASH_ISR (rx)  : ORIGIN = 0x08000000, LENGTH =   16K /* sector 0, 16 KiB */
     FLASH_FS (rx)   : ORIGIN = 0x08004000, LENGTH =  112K /* sectors 1-4: 3*16K+64K */
     FLASH_TEXT (rx) : ORIGIN = 0x08020000, LENGTH =  896K /* sectors 5-11 are 128K */
+    CCMRAM (xrw)    : ORIGIN = 0x10000000, LENGTH =   64K
     RAM (xrw)       : ORIGIN = 0x20000000, LENGTH =  192K
 }
 
@@ -26,3 +27,9 @@ _ram_start = ORIGIN(RAM);
 _ram_end = ORIGIN(RAM) + LENGTH(RAM);
 _heap_start = _ebss; /* heap starts just after statically allocated memory */
 _heap_end = _sstack;
+
+/* Filesystem cache in RAM, and storage in flash */
+_micropy_hw_internal_flash_storage_ram_cache_start = ORIGIN(CCMRAM);
+_micropy_hw_internal_flash_storage_ram_cache_end = ORIGIN(CCMRAM) + LENGTH(CCMRAM);
+_micropy_hw_internal_flash_storage_start = ORIGIN(FLASH_FS);
+_micropy_hw_internal_flash_storage_end = ORIGIN(FLASH_FS) + LENGTH(FLASH_FS);
diff --git a/ports/stm32/boards/stm32f429.ld b/ports/stm32/boards/stm32f429.ld
index beeaa4df21237..d081c190d318d 100644
--- a/ports/stm32/boards/stm32f429.ld
+++ b/ports/stm32/boards/stm32f429.ld
@@ -9,6 +9,7 @@ MEMORY
     FLASH_ISR (rx)  : ORIGIN = 0x08000000, LENGTH = 16K /* sector 0, 16 KiB */
     FLASH_FS (rx)   : ORIGIN = 0x08004000, LENGTH = 112K /* sectors 1-4: 3*16K+64K */
     FLASH_TEXT (rx) : ORIGIN = 0x08020000, LENGTH = 896K /* sectors 5-11 are 128K */
+    CCMRAM (xrw)    : ORIGIN = 0x10000000, LENGTH = 64K
     RAM (xrw)       : ORIGIN = 0x20000000, LENGTH = 192K
     SDRAM(xrw)      : ORIGIN = 0xC0000000, LENGTH = 8192K
 }
@@ -27,3 +28,9 @@ _ram_start = ORIGIN(RAM);
 _ram_end = ORIGIN(RAM) + LENGTH(RAM);
 _heap_start = _ebss; /* heap starts just after statically allocated memory */
 _heap_end = _sstack;
+
+/* Filesystem cache in RAM, and storage in flash */
+_micropy_hw_internal_flash_storage_ram_cache_start = ORIGIN(CCMRAM);
+_micropy_hw_internal_flash_storage_ram_cache_end = ORIGIN(CCMRAM) + LENGTH(CCMRAM);
+_micropy_hw_internal_flash_storage_start = ORIGIN(FLASH_FS);
+_micropy_hw_internal_flash_storage_end = ORIGIN(FLASH_FS) + LENGTH(FLASH_FS);
diff --git a/ports/stm32/boards/stm32f722.ld b/ports/stm32/boards/stm32f722.ld
index fe84a49637e51..0520f2e95fb27 100644
--- a/ports/stm32/boards/stm32f722.ld
+++ b/ports/stm32/boards/stm32f722.ld
@@ -27,3 +27,9 @@ _ram_start = ORIGIN(RAM);
 _ram_end = ORIGIN(RAM) + LENGTH(RAM);
 _heap_start = _ebss; /* heap starts just after statically allocated memory */
 _heap_end = _sstack;
+
+/* Filesystem cache in RAM, and storage in flash */
+_micropy_hw_internal_flash_storage_ram_cache_start = ORIGIN(DTCM);
+_micropy_hw_internal_flash_storage_ram_cache_end = ORIGIN(DTCM) + LENGTH(DTCM);
+_micropy_hw_internal_flash_storage_start = ORIGIN(FLASH_FS);
+_micropy_hw_internal_flash_storage_end = ORIGIN(FLASH_FS) + LENGTH(FLASH_FS);
diff --git a/ports/stm32/boards/stm32f746.ld b/ports/stm32/boards/stm32f746.ld
index 0f1de2696456f..854b95463aa89 100644
--- a/ports/stm32/boards/stm32f746.ld
+++ b/ports/stm32/boards/stm32f746.ld
@@ -27,3 +27,9 @@ _ram_start = ORIGIN(RAM);
 _ram_end = ORIGIN(RAM) + LENGTH(RAM);
 _heap_start = _ebss; /* heap starts just after statically allocated memory */
 _heap_end = _sstack;
+
+/* Filesystem cache in RAM, and storage in flash */
+_micropy_hw_internal_flash_storage_ram_cache_start = ORIGIN(DTCM);
+_micropy_hw_internal_flash_storage_ram_cache_end = ORIGIN(DTCM) + LENGTH(DTCM);
+_micropy_hw_internal_flash_storage_start = ORIGIN(FLASH_FS);
+_micropy_hw_internal_flash_storage_end = ORIGIN(FLASH_FS) + LENGTH(FLASH_FS);
diff --git a/ports/stm32/boards/stm32f767.ld b/ports/stm32/boards/stm32f767.ld
index d07f2ecbef085..580be50dc9b42 100644
--- a/ports/stm32/boards/stm32f767.ld
+++ b/ports/stm32/boards/stm32f767.ld
@@ -28,3 +28,9 @@ _ram_start = ORIGIN(RAM);
 _ram_end = ORIGIN(RAM) + LENGTH(RAM);
 _heap_start = _ebss; /* heap starts just after statically allocated memory */
 _heap_end = _sstack;
+
+/* Filesystem cache in RAM, and storage in flash */
+_micropy_hw_internal_flash_storage_ram_cache_start = ORIGIN(DTCM);
+_micropy_hw_internal_flash_storage_ram_cache_end = ORIGIN(DTCM) + LENGTH(DTCM);
+_micropy_hw_internal_flash_storage_start = ORIGIN(FLASH_FS);
+_micropy_hw_internal_flash_storage_end = ORIGIN(FLASH_FS) + LENGTH(FLASH_FS);
diff --git a/ports/stm32/boards/stm32f769.ld b/ports/stm32/boards/stm32f769.ld
index ebc6d033d9bb6..9fc73c85969c9 100644
--- a/ports/stm32/boards/stm32f769.ld
+++ b/ports/stm32/boards/stm32f769.ld
@@ -27,3 +27,9 @@ _ram_start = ORIGIN(RAM);
 _ram_end = ORIGIN(RAM) + LENGTH(RAM);
 _heap_start = _ebss; /* heap starts just after statically allocated memory */
 _heap_end = _sstack;
+
+/* Filesystem cache in RAM, and storage in flash */
+_micropy_hw_internal_flash_storage_ram_cache_start = ORIGIN(DTCM);
+_micropy_hw_internal_flash_storage_ram_cache_end = ORIGIN(DTCM) + LENGTH(DTCM);
+_micropy_hw_internal_flash_storage_start = ORIGIN(FLASH_FS);
+_micropy_hw_internal_flash_storage_end = ORIGIN(FLASH_FS) + LENGTH(FLASH_FS);
diff --git a/ports/stm32/flashbdev.c b/ports/stm32/flashbdev.c
index 946a9d8cc2f99..bcff94b15d4e9 100644
--- a/ports/stm32/flashbdev.c
+++ b/ports/stm32/flashbdev.c
@@ -36,58 +36,7 @@
 
 #if MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE
 
-// Here we try to automatically configure the location and size of the flash
-// pages to use for the internal storage.  We also configure the location of the
-// cache used for writing.
-
-#if defined(STM32F405xx) || defined(STM32F415xx) || defined(STM32F407xx)
-
-#define CACHE_MEM_START_ADDR (0x10000000) // CCM data RAM, 64k
-#define FLASH_SECTOR_SIZE_MAX (0x10000) // 64k max, size of CCM
-#define FLASH_MEM_SEG1_START_ADDR (0x08004000) // sector 1
-#define FLASH_MEM_SEG1_NUM_BLOCKS (224) // sectors 1,2,3,4: 16k+16k+16k+64k=112k
-
-// enable this to get an extra 64k of storage (uses the last sector of the flash)
-#if 0
-#define FLASH_MEM_SEG2_START_ADDR (0x080e0000) // sector 11
-#define FLASH_MEM_SEG2_NUM_BLOCKS (128) // sector 11: 128k
-#endif
-
-#elif defined(STM32F401xE) || defined(STM32F411xE) || defined(STM32F412Zx) || defined(STM32F446xx)
-
-STATIC byte flash_cache_mem[0x4000] __attribute__((aligned(4))); // 16k
-#define CACHE_MEM_START_ADDR (&flash_cache_mem[0])
-#define FLASH_SECTOR_SIZE_MAX (0x4000) // 16k max due to size of cache buffer
-#define FLASH_MEM_SEG1_START_ADDR (0x08004000) // sector 1
-#define FLASH_MEM_SEG1_NUM_BLOCKS (128) // sectors 1,2,3,4: 16k+16k+16k+16k(of 64k)=64k
-
-#elif defined(STM32F427xx) || defined(STM32F429xx)
-
-#define CACHE_MEM_START_ADDR (0x10000000) // CCM data RAM, 64k
-#define FLASH_SECTOR_SIZE_MAX (0x10000) // 64k max, size of CCM
-#define FLASH_MEM_SEG1_START_ADDR (0x08004000) // sector 1
-#define FLASH_MEM_SEG1_NUM_BLOCKS (224) // sectors 1,2,3,4: 16k+16k+16k+64k=112k
-
-#elif defined(STM32F722xx) || defined(STM32F723xx) || defined(STM32F732xx) || defined(STM32F733xx)
-
-#define CACHE_MEM_START_ADDR (0x20000000) // DTCM data RAM, 64k
-#define FLASH_SECTOR_SIZE_MAX (0x10000) // 64k max
-#define FLASH_MEM_SEG1_START_ADDR (0x08004000) // sector 1
-#define FLASH_MEM_SEG1_NUM_BLOCKS (224) // sectors 1,2,3,4: 16k+16k+16k+64k=112k
-
-#elif defined(STM32F746xx) || defined(STM32F765xx) || defined(STM32F767xx) || defined(STM32F769xx)
-
-// The STM32F746 doesn't really have CCRAM, so we use the 64K DTCM for this.
-
-#define CACHE_MEM_START_ADDR (0x20000000) // DTCM data RAM, 64k
-#define FLASH_SECTOR_SIZE_MAX (0x08000) // 32k max
-#define FLASH_MEM_SEG1_START_ADDR (0x08008000) // sector 1
-#define FLASH_MEM_SEG1_NUM_BLOCKS (192) // sectors 1,2,3: 32k+32k+32=96k
-
-#else
-
-// Generic configuration where the linker script specifies flash storage and RAM cache locations.
-
+// The linker script specifies flash storage and RAM cache locations.
 extern uint8_t _micropy_hw_internal_flash_storage_start;
 extern uint8_t _micropy_hw_internal_flash_storage_end;
 extern uint8_t _micropy_hw_internal_flash_storage2_start;
@@ -111,8 +60,6 @@ extern uint8_t _micropy_hw_internal_flash_storage_ram_cache_end[];
     ((&_micropy_hw_internal_flash_storage2_end - &_micropy_hw_internal_flash_storage2_start) / 512)
 #endif
 
-#endif
-
 #if !defined(FLASH_MEM_SEG2_START_ADDR)
 #define FLASH_MEM_SEG2_NUM_BLOCKS (0) // no second segment
 #endif

From 95ee29f4f4e0f76fcca7567d26f3335957762d66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Peter=20Z=C3=BCger?= <zueger.peter@icloud.com>
Date: Wed, 16 Mar 2022 15:45:03 +0100
Subject: [PATCH 1801/3533] stm32/mbedtls: Add NULL pointer check in
 m_free_mbedtls.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

According to the C standard the free(void *ptr) function: if ptr is a null
pointer, no action occurs.

Signed-off-by: Peter Züger <zueger.peter@icloud.com>
---
 ports/stm32/mbedtls/mbedtls_port.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ports/stm32/mbedtls/mbedtls_port.c b/ports/stm32/mbedtls/mbedtls_port.c
index c31eb744aea3a..44e23a3b904b2 100644
--- a/ports/stm32/mbedtls/mbedtls_port.c
+++ b/ports/stm32/mbedtls/mbedtls_port.c
@@ -62,6 +62,9 @@ void *m_calloc_mbedtls(size_t nmemb, size_t size) {
 }
 
 void m_free_mbedtls(void *ptr_in) {
+    if (ptr_in == NULL) {
+        return;
+    }
     void **ptr = &((void**)ptr_in)[-2];
     #if DEBUG
     uint32_t nb;

From 94a9b5066827d7dc5b1844ae28fad79778314185 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Peter=20Z=C3=BCger?= <zueger.peter@icloud.com>
Date: Wed, 16 Mar 2022 16:41:23 +0100
Subject: [PATCH 1802/3533] mimxrt/mbedtls: Add NULL pointer check in
 m_free_mbedtls.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Peter Züger <zueger.peter@icloud.com>
---
 ports/mimxrt/mbedtls/mbedtls_port.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ports/mimxrt/mbedtls/mbedtls_port.c b/ports/mimxrt/mbedtls/mbedtls_port.c
index eb11f5141b8a2..928f12f3f1292 100644
--- a/ports/mimxrt/mbedtls/mbedtls_port.c
+++ b/ports/mimxrt/mbedtls/mbedtls_port.c
@@ -64,6 +64,9 @@ void *m_calloc_mbedtls(size_t nmemb, size_t size) {
 }
 
 void m_free_mbedtls(void *ptr_in) {
+    if (ptr_in == NULL) {
+        return;
+    }
     void **ptr = &((void **)ptr_in)[-2];
     #if DEBUG
     uint32_t nb;

From 5887dfeea6a4899e8f30ac1435159d760a985642 Mon Sep 17 00:00:00 2001
From: Jonathan Hogg <me@jonathanhogg.com>
Date: Mon, 7 Mar 2022 09:15:05 +0000
Subject: [PATCH 1803/3533] docs/esp32/quickref: Refine deep-sleep power-saving
 notes.

This attempts to better explain how pull-ups and pull-downs operate in
deep-sleep mode.
---
 docs/esp32/quickref.rst | 30 ++++++++++++++++++++++--------
 1 file changed, 22 insertions(+), 8 deletions(-)

diff --git a/docs/esp32/quickref.rst b/docs/esp32/quickref.rst
index 56e765536ef1e..0778425f2fe96 100644
--- a/docs/esp32/quickref.rst
+++ b/docs/esp32/quickref.rst
@@ -186,8 +186,7 @@ Notes:
 
 * Pins 34-39 are input only, and also do not have internal pull-up resistors
 
-* The pull value of some pins can be set to ``Pin.PULL_HOLD`` to reduce power
-  consumption during deepsleep.
+* See :ref:`Deep_sleep_Mode` for a discussion of pin behaviour during sleep
 
 There's a higher-level abstraction :ref:`machine.Signal <machine.Signal>`
 which can be used to invert a pin. Useful for illuminating active-low LEDs
@@ -508,6 +507,8 @@ See :ref:`machine.WDT <machine.WDT>`. ::
     wdt = WDT(timeout=5000)
     wdt.feed()
 
+.. _Deep_sleep_mode:
+
 Deep-sleep mode
 ---------------
 
@@ -527,15 +528,28 @@ Notes:
 * Calling ``deepsleep()`` without an argument will put the device to sleep
   indefinitely
 * A software reset does not change the reset cause
-* There may be some leakage current flowing through enabled internal pullups.
-  To further reduce power consumption it is possible to disable the internal pullups::
 
-    p1 = Pin(4, Pin.IN, Pin.PULL_HOLD)
+Some ESP32 pins (0, 2, 4, 12-15, 25-27, 32-39) are connected to the RTC during
+deep-sleep and can be used to wake the device with the ``wake_on_`` functions in
+the :mod:`esp32` module. The output-capable RTC pins (all except 34-39) will
+also retain their pull-up or pull-down resistor configuration when entering
+deep-sleep.
+
+If the pull resistors are not actively required during deep-sleep and are likely
+to cause current leakage (for example a pull-up resistor is connected to ground
+through a switch), then they should be disabled to save power before entering
+deep-sleep mode::
+
+    from machine import Pin, deepsleep
 
-  After leaving deepsleep it may be necessary to un-hold the pin explicitly (e.g. if
-  it is an output pin) via::
+    # configure input RTC pin with pull-up on boot
+    pin = Pin(2, Pin.IN, Pin.PULL_UP)
+
+    # disable pull-up and put the device to sleep for 10 seconds
+    pin.init(pull=None)
+    machine.deepsleep(10000)
 
-    p1 = Pin(4, Pin.OUT, None)
+Non-RTC GPIO pins will be disconnected by default on entering deep-sleep.
 
 SD card
 -------

From 7684c996bc2b2521fa4bd023e4fa24622092cd5f Mon Sep 17 00:00:00 2001
From: Jonathan Hogg <me@jonathanhogg.com>
Date: Mon, 7 Mar 2022 09:21:11 +0000
Subject: [PATCH 1804/3533] esp32/machine_pin: Add new hold keyword argument
 and remove PULL_HOLD.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The current pull=Pin.PULL_HOLD argument doesn't make a lot of sense in the
context of what it actually does vs what the ESP32 quickref document says
it does.

This commit removes PULL_HOLD and adds a new hold=True|False keyword
argument to Pin()/Pin.init().  Setting this to True will cause the ESP32 to
lock the configuration of the pin – including direction, output value,
drive strength, pull-up/-down – such that it can't be accidentally changed
and will be retained through a watchdog or internal reset.

Fixes issue #8283, and see also #8284.
---
 docs/esp32/quickref.rst   | 12 ++++++++++++
 ports/esp32/machine_pin.c | 18 +++++++++++-------
 2 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/docs/esp32/quickref.rst b/docs/esp32/quickref.rst
index 0778425f2fe96..dd7e515f1b226 100644
--- a/docs/esp32/quickref.rst
+++ b/docs/esp32/quickref.rst
@@ -177,6 +177,14 @@ safe maximum source/sink currents and approximate internal driver resistances:
  - ``Pin.DRIVE_2``: 20mA / 30 ohm (default strength if not configured)
  - ``Pin.DRIVE_3``: 40mA / 15 ohm
 
+The ``hold=`` keyword argument to ``Pin()`` and ``Pin.init()`` will enable the
+ESP32 "pad hold" feature. When set to ``True``, the pin configuration
+(direction, pull resistors and output value) will be held and any further
+changes (including changing the output level) will not be applied. Setting
+``hold=False`` will immediately apply any outstanding pin configuration changes
+and release the pin. Using ``hold=True`` while a pin is already held will apply
+any configuration changes and then immediately reapply the hold.
+
 Notes:
 
 * Pins 1 and 3 are REPL UART TX and RX respectively
@@ -549,6 +557,10 @@ deep-sleep mode::
     pin.init(pull=None)
     machine.deepsleep(10000)
 
+Output-configured RTC pins will also retain their output direction and level in
+deep-sleep if pad hold is enabled with the ``hold=True`` argument to
+``Pin.init()``.
+
 Non-RTC GPIO pins will be disconnected by default on entering deep-sleep.
 
 SD card
diff --git a/ports/esp32/machine_pin.c b/ports/esp32/machine_pin.c
index 1dad398524aef..90dc03e69aa47 100644
--- a/ports/esp32/machine_pin.c
+++ b/ports/esp32/machine_pin.c
@@ -47,7 +47,6 @@
 // Used to implement a range of pull capabilities
 #define GPIO_PULL_DOWN (1)
 #define GPIO_PULL_UP   (2)
-#define GPIO_PULL_HOLD (4)
 
 #if CONFIG_IDF_TARGET_ESP32
 #define GPIO_FIRST_NON_OUTPUT (34)
@@ -253,14 +252,15 @@ STATIC void machine_pin_print(const mp_print_t *print, mp_obj_t self_in, mp_prin
     mp_printf(print, "Pin(%u)", self->id);
 }
 
-// pin.init(mode=None, pull=-1, *, value, drive)
+// pin.init(mode=None, pull=-1, *, value, drive, hold)
 STATIC mp_obj_t machine_pin_obj_init_helper(const machine_pin_obj_t *self, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
-    enum { ARG_mode, ARG_pull, ARG_value, ARG_drive };
+    enum { ARG_mode, ARG_pull, ARG_value, ARG_drive, ARG_hold };
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_mode, MP_ARG_OBJ, {.u_obj = mp_const_none}},
         { MP_QSTR_pull, MP_ARG_OBJ, {.u_obj = MP_OBJ_NEW_SMALL_INT(-1)}},
         { MP_QSTR_value, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL}},
         { MP_QSTR_drive, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL}},
+        { MP_QSTR_hold, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL}},
     };
 
     // parse args
@@ -325,10 +325,15 @@ STATIC mp_obj_t machine_pin_obj_init_helper(const machine_pin_obj_t *self, size_
         } else {
             gpio_pullup_dis(self->id);
         }
-        if (mode & GPIO_PULL_HOLD) {
+    }
+
+    // configure pad hold
+    if (args[ARG_hold].u_obj != MP_OBJ_NULL && GPIO_IS_VALID_OUTPUT_GPIO(self->id)) {
+        // always disable pad hold to apply outstanding config changes
+        gpio_hold_dis(self->id);
+        // (re-)enable pad hold if requested
+        if (mp_obj_is_true(args[ARG_hold].u_obj)) {
             gpio_hold_en(self->id);
-        } else if (GPIO_IS_VALID_OUTPUT_GPIO(self->id)) {
-            gpio_hold_dis(self->id);
         }
     }
 
@@ -480,7 +485,6 @@ STATIC const mp_rom_map_elem_t machine_pin_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_OPEN_DRAIN), MP_ROM_INT(GPIO_MODE_INPUT_OUTPUT_OD) },
     { MP_ROM_QSTR(MP_QSTR_PULL_UP), MP_ROM_INT(GPIO_PULL_UP) },
     { MP_ROM_QSTR(MP_QSTR_PULL_DOWN), MP_ROM_INT(GPIO_PULL_DOWN) },
-    { MP_ROM_QSTR(MP_QSTR_PULL_HOLD), MP_ROM_INT(GPIO_PULL_HOLD) },
     { MP_ROM_QSTR(MP_QSTR_IRQ_RISING), MP_ROM_INT(GPIO_PIN_INTR_POSEDGE) },
     { MP_ROM_QSTR(MP_QSTR_IRQ_FALLING), MP_ROM_INT(GPIO_PIN_INTR_NEGEDGE) },
     { MP_ROM_QSTR(MP_QSTR_WAKE_LOW), MP_ROM_INT(GPIO_PIN_INTR_LOLEVEL) },

From 21d0599bd10aa567e3fdee5e39da1fe9a9f816e6 Mon Sep 17 00:00:00 2001
From: Jonathan Hogg <me@jonathanhogg.com>
Date: Mon, 7 Mar 2022 09:22:00 +0000
Subject: [PATCH 1805/3533] esp32/modesp32: Add new gpio_deep_sleep_hold
 function.

Add a new function to control whether held pins will retain their function
through deep-sleep.

Also document this function and explain how to use this in quickref to
retain pin configuration during deep-sleep.
---
 docs/esp32/quickref.rst | 17 +++++++++++++++++
 docs/library/esp32.rst  |  5 +++++
 ports/esp32/modesp32.c  | 11 +++++++++++
 3 files changed, 33 insertions(+)

diff --git a/docs/esp32/quickref.rst b/docs/esp32/quickref.rst
index dd7e515f1b226..894508f4c200e 100644
--- a/docs/esp32/quickref.rst
+++ b/docs/esp32/quickref.rst
@@ -562,6 +562,23 @@ deep-sleep if pad hold is enabled with the ``hold=True`` argument to
 ``Pin.init()``.
 
 Non-RTC GPIO pins will be disconnected by default on entering deep-sleep.
+Configuration of non-RTC pins - including output level - can be retained by
+enabling pad hold on the pin and enabling GPIO pad hold during deep-sleep::
+
+    from machine import Pin, deepsleep
+    import esp32
+
+    opin = Pin(19, Pin.OUT, value=1, hold=True) # hold output level
+    ipin = Pin(21, Pin.IN, Pin.PULL_UP, hold=True) # hold pull-up
+
+    # enable pad hold in deep-sleep for non-RTC GPIO
+    esp32.gpio_deep_sleep_hold(True)
+
+    # put the device to sleep for 10 seconds
+    deepsleep(10000)
+
+The pin configuration - including the pad hold - will be retained on wake from
+sleep. See :ref:`Pins_and_GPIO` above for a further discussion of pad holding.
 
 SD card
 -------
diff --git a/docs/library/esp32.rst b/docs/library/esp32.rst
index da5fa8c3cbed7..3348003499787 100644
--- a/docs/library/esp32.rst
+++ b/docs/library/esp32.rst
@@ -30,6 +30,11 @@ Functions
     or a tuple/list of valid Pin objects.  *level* should be ``esp32.WAKEUP_ALL_LOW``
     or ``esp32.WAKEUP_ANY_HIGH``.
 
+.. function:: gpio_deep_sleep_hold(enable)
+
+    Configure whether non-RTC GPIO pin configuration is retained during
+    deep-sleep mode for held pads. *enable* should be a boolean value.
+
 .. function:: raw_temperature()
 
     Read the raw value of the internal temperature sensor, returning an integer.
diff --git a/ports/esp32/modesp32.c b/ports/esp32/modesp32.c
index 75e5b3ed8b5a3..4579c5de11582 100644
--- a/ports/esp32/modesp32.c
+++ b/ports/esp32/modesp32.c
@@ -131,6 +131,16 @@ STATIC mp_obj_t esp32_wake_on_ext1(size_t n_args, const mp_obj_t *pos_args, mp_m
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_KW(esp32_wake_on_ext1_obj, 0, esp32_wake_on_ext1);
 
+STATIC mp_obj_t esp32_gpio_deep_sleep_hold(const mp_obj_t enable) {
+    if (mp_obj_is_true(enable)) {
+        gpio_deep_sleep_hold_en();
+    } else {
+        gpio_deep_sleep_hold_dis();
+    }
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(esp32_gpio_deep_sleep_hold_obj, esp32_gpio_deep_sleep_hold);
+
 #if CONFIG_IDF_TARGET_ESP32
 
 #include "soc/sens_reg.h"
@@ -187,6 +197,7 @@ STATIC const mp_rom_map_elem_t esp32_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_wake_on_touch), MP_ROM_PTR(&esp32_wake_on_touch_obj) },
     { MP_ROM_QSTR(MP_QSTR_wake_on_ext0), MP_ROM_PTR(&esp32_wake_on_ext0_obj) },
     { MP_ROM_QSTR(MP_QSTR_wake_on_ext1), MP_ROM_PTR(&esp32_wake_on_ext1_obj) },
+    { MP_ROM_QSTR(MP_QSTR_gpio_deep_sleep_hold), MP_ROM_PTR(&esp32_gpio_deep_sleep_hold_obj) },
     #if CONFIG_IDF_TARGET_ESP32
     { MP_ROM_QSTR(MP_QSTR_raw_temperature), MP_ROM_PTR(&esp32_raw_temperature_obj) },
     { MP_ROM_QSTR(MP_QSTR_hall_sensor), MP_ROM_PTR(&esp32_hall_sensor_obj) },

From 3b9de192be8177abd07c18cf58468939c4c5fd5d Mon Sep 17 00:00:00 2001
From: Jonathan Hogg <me@jonathanhogg.com>
Date: Thu, 10 Mar 2022 13:00:30 +0000
Subject: [PATCH 1806/3533] esp32/boards/UM_TINYPICO: Remove use of PULL_HOLD.

Change APA102 power handling to not use the (now removed) PULL_HOLD
constant.
---
 ports/esp32/boards/UM_TINYPICO/modules/tinypico.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/ports/esp32/boards/UM_TINYPICO/modules/tinypico.py b/ports/esp32/boards/UM_TINYPICO/modules/tinypico.py
index 04b274bb53b15..95450788426ad 100644
--- a/ports/esp32/boards/UM_TINYPICO/modules/tinypico.py
+++ b/ports/esp32/boards/UM_TINYPICO/modules/tinypico.py
@@ -83,10 +83,9 @@ def set_dotstar_power(state):
     """Set the power for the on-board Dotstar to allow no current draw when not needed."""
     # Set the power pin to the inverse of state
     if state:
-        Pin(DOTSTAR_PWR, Pin.OUT, None)  # Break the PULL_HOLD on the pin
-        Pin(DOTSTAR_PWR).value(False)  # Set the pin to LOW to enable the Transistor
+        Pin(DOTSTAR_PWR, Pin.OUT, None, value=0)  # Drive output to LOW to enable transistor
     else:
-        Pin(13, Pin.IN, Pin.PULL_HOLD)  # Set PULL_HOLD on the pin to allow the 3V3 pull-up to work
+        Pin(DOTSTAR_PWR, Pin.IN, None)  # Disable output, external pull-up will disable transistor
 
     Pin(
         DOTSTAR_CLK, Pin.OUT if state else Pin.IN

From 1a0bd352d3bfb6674d470c4b07862ebaace0ca88 Mon Sep 17 00:00:00 2001
From: wemos <support@wemos.cc>
Date: Wed, 9 Mar 2022 19:22:49 +0800
Subject: [PATCH 1807/3533] esp32/boards: Add LOLIN C3 MINI ESP32-C3 based
 board.

---
 ports/esp32/boards/LOLIN_C3_MINI/board.json   | 19 ++++++++++++++
 ports/esp32/boards/LOLIN_C3_MINI/manifest.py  |  2 ++
 .../boards/LOLIN_C3_MINI/modules/c3mini.py    | 26 +++++++++++++++++++
 .../boards/LOLIN_C3_MINI/mpconfigboard.cmake  | 11 ++++++++
 .../boards/LOLIN_C3_MINI/mpconfigboard.h      | 13 ++++++++++
 .../boards/LOLIN_C3_MINI/sdkconfig.board      |  9 +++++++
 6 files changed, 80 insertions(+)
 create mode 100644 ports/esp32/boards/LOLIN_C3_MINI/board.json
 create mode 100644 ports/esp32/boards/LOLIN_C3_MINI/manifest.py
 create mode 100644 ports/esp32/boards/LOLIN_C3_MINI/modules/c3mini.py
 create mode 100644 ports/esp32/boards/LOLIN_C3_MINI/mpconfigboard.cmake
 create mode 100644 ports/esp32/boards/LOLIN_C3_MINI/mpconfigboard.h
 create mode 100644 ports/esp32/boards/LOLIN_C3_MINI/sdkconfig.board

diff --git a/ports/esp32/boards/LOLIN_C3_MINI/board.json b/ports/esp32/boards/LOLIN_C3_MINI/board.json
new file mode 100644
index 0000000000000..f47c672fa49ad
--- /dev/null
+++ b/ports/esp32/boards/LOLIN_C3_MINI/board.json
@@ -0,0 +1,19 @@
+{
+    "deploy": [
+        "../deploy_c3.md"
+    ],
+    "docs": "",
+    "features": [
+        "BLE",
+        "USB-C",
+        "WiFi"
+    ],
+    "images": [
+        "lolin_c3_mini.jpg"
+    ],
+    "mcu": "esp32c3",
+    "product": "C3 mini",
+    "thumbnail": "",
+    "url": "https://www.wemos.cc/en/latest/c3/c3_mini.html",
+    "vendor": "Wemos"
+}
diff --git a/ports/esp32/boards/LOLIN_C3_MINI/manifest.py b/ports/esp32/boards/LOLIN_C3_MINI/manifest.py
new file mode 100644
index 0000000000000..f993d4fa6bd29
--- /dev/null
+++ b/ports/esp32/boards/LOLIN_C3_MINI/manifest.py
@@ -0,0 +1,2 @@
+include("$(PORT_DIR)/boards/manifest.py")
+freeze("./modules")
diff --git a/ports/esp32/boards/LOLIN_C3_MINI/modules/c3mini.py b/ports/esp32/boards/LOLIN_C3_MINI/modules/c3mini.py
new file mode 100644
index 0000000000000..ce167303ee23c
--- /dev/null
+++ b/ports/esp32/boards/LOLIN_C3_MINI/modules/c3mini.py
@@ -0,0 +1,26 @@
+# LOLIN C3 MINI MicroPython Helper Library
+
+from micropython import const
+from machine import Pin
+
+# Pin Assignments
+
+# SPI
+SPI_MOSI = const(4)
+SPI_MISO = const(3)
+SPI_CLK = const(2)
+
+# I2C
+I2C_SDA = const(8)
+I2C_SCL = const(10)
+
+# LED
+LED = const(7)
+
+# BUTTON
+BUTTON = const(0)
+
+# Built-in peripherals
+
+led = Pin(LED, Pin.OUT, value=0)
+button = Pin(BUTTON, Pin.IN, Pin.PULL_UP)
diff --git a/ports/esp32/boards/LOLIN_C3_MINI/mpconfigboard.cmake b/ports/esp32/boards/LOLIN_C3_MINI/mpconfigboard.cmake
new file mode 100644
index 0000000000000..9fe3b6411d13d
--- /dev/null
+++ b/ports/esp32/boards/LOLIN_C3_MINI/mpconfigboard.cmake
@@ -0,0 +1,11 @@
+set(IDF_TARGET esp32c3)
+
+set(SDKCONFIG_DEFAULTS
+    boards/sdkconfig.base
+    boards/sdkconfig.ble
+    boards/LOLIN_C3_MINI/sdkconfig.board
+)
+
+if(NOT MICROPY_FROZEN_MANIFEST)
+    set(MICROPY_FROZEN_MANIFEST ${MICROPY_BOARD_DIR}/manifest.py)
+endif()
diff --git a/ports/esp32/boards/LOLIN_C3_MINI/mpconfigboard.h b/ports/esp32/boards/LOLIN_C3_MINI/mpconfigboard.h
new file mode 100644
index 0000000000000..5872bdc8ae5ef
--- /dev/null
+++ b/ports/esp32/boards/LOLIN_C3_MINI/mpconfigboard.h
@@ -0,0 +1,13 @@
+#define MICROPY_HW_BOARD_NAME               "LOLIN_C3_MINI"
+#define MICROPY_HW_MCU_NAME                 "ESP32-C3FH4"
+
+#define MICROPY_HW_ENABLE_SDCARD            (0)
+#define MICROPY_PY_MACHINE_DAC              (0)
+#define MICROPY_PY_MACHINE_I2S              (0)
+
+#define MICROPY_HW_I2C0_SCL                 (10)
+#define MICROPY_HW_I2C0_SDA                 (8)
+
+#define MICROPY_HW_SPI1_MOSI                (4)
+#define MICROPY_HW_SPI1_MISO                (3)
+#define MICROPY_HW_SPI1_SCK                 (2)
diff --git a/ports/esp32/boards/LOLIN_C3_MINI/sdkconfig.board b/ports/esp32/boards/LOLIN_C3_MINI/sdkconfig.board
new file mode 100644
index 0000000000000..f0cbad00e4617
--- /dev/null
+++ b/ports/esp32/boards/LOLIN_C3_MINI/sdkconfig.board
@@ -0,0 +1,9 @@
+CONFIG_ESP32C3_REV_MIN_3=y
+CONFIG_ESP32C3_REV_MIN=3
+CONFIG_ESP32C3_BROWNOUT_DET=y
+CONFIG_ESP32C3_BROWNOUT_DET_LVL_SEL_7=
+CONFIG_ESP32C3_BROWNOUT_DET_LVL_SEL_4=y
+CONFIG_ESP32C3_BROWNOUT_DET_LVL=4
+CONFIG_ESP_CONSOLE_UART_DEFAULT=
+CONFIG_ESP_CONSOLE_USB_CDC=
+CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG=y

From 09b55dc297da2b4dc3915f2a4cc0e3b53ea07359 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Tue, 8 Mar 2022 11:40:26 +0100
Subject: [PATCH 1808/3533] esp32/machine_hw_spi: Use automatic DMA channel
 selection for SPI on C3.

Addresses issue #8204.
---
 ports/esp32/machine_hw_spi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/esp32/machine_hw_spi.c b/ports/esp32/machine_hw_spi.c
index 1515b007440f5..3e720adb1a5e2 100644
--- a/ports/esp32/machine_hw_spi.c
+++ b/ports/esp32/machine_hw_spi.c
@@ -268,7 +268,7 @@ STATIC void machine_hw_spi_init_internal(
     // Select DMA channel based on the hardware SPI host
     int dma_chan = 0;
     if (self->host == HSPI_HOST) {
-        #if CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3
+        #if CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3 || CONFIG_IDF_TARGET_ESP32C3
         dma_chan = 3;
         #else
         dma_chan = 1;

From afceb56ee2fe7c1741c6437b5d0d3fb7dbb54340 Mon Sep 17 00:00:00 2001
From: Algy Tynan <algy@tynan.io>
Date: Tue, 15 Mar 2022 18:18:42 +1100
Subject: [PATCH 1809/3533] esp32/boards: Add support for LilyGO LoRa32 boards.

Boards use ESP32-PICO-D4.

Added pins for hardware versions v1.0, v1.2, v1.6 and v2.0.

Signed-off-by: Algy Tynan <algy@tynan.io>
---
 .../boards/LILYGO_TTGO_LORA32/board.json      | 23 ++++++
 .../esp32/boards/LILYGO_TTGO_LORA32/board.md  |  3 +
 .../boards/LILYGO_TTGO_LORA32/manifest.py     |  4 +
 .../LILYGO_TTGO_LORA32/modules/lilygo_oled.py | 36 +++++++++
 .../LILYGO_TTGO_LORA32/modules/lora32.py      | 79 +++++++++++++++++++
 .../LILYGO_TTGO_LORA32/mpconfigboard.cmake    |  7 ++
 .../boards/LILYGO_TTGO_LORA32/mpconfigboard.h |  2 +
 7 files changed, 154 insertions(+)
 create mode 100644 ports/esp32/boards/LILYGO_TTGO_LORA32/board.json
 create mode 100644 ports/esp32/boards/LILYGO_TTGO_LORA32/board.md
 create mode 100644 ports/esp32/boards/LILYGO_TTGO_LORA32/manifest.py
 create mode 100644 ports/esp32/boards/LILYGO_TTGO_LORA32/modules/lilygo_oled.py
 create mode 100644 ports/esp32/boards/LILYGO_TTGO_LORA32/modules/lora32.py
 create mode 100644 ports/esp32/boards/LILYGO_TTGO_LORA32/mpconfigboard.cmake
 create mode 100644 ports/esp32/boards/LILYGO_TTGO_LORA32/mpconfigboard.h

diff --git a/ports/esp32/boards/LILYGO_TTGO_LORA32/board.json b/ports/esp32/boards/LILYGO_TTGO_LORA32/board.json
new file mode 100644
index 0000000000000..7f4b227abfc1b
--- /dev/null
+++ b/ports/esp32/boards/LILYGO_TTGO_LORA32/board.json
@@ -0,0 +1,23 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [
+        "BLE",
+        "LoRa",
+        "OLED",
+        "SDCard",
+        "USB-MICRO",
+        "WiFi"
+    ],
+    "id": "esp32",
+    "images": [
+        "lilygo-ttgo-lora-32-v1-6.jpg"
+    ],
+    "mcu": "esp32",
+    "product": "LILYGO TTGO LoRa32",
+    "thumbnail": "",
+    "url": "http://www.lilygo.cn/prod_view.aspx?TypeId=50060&Id=1270&FId=t3:50060:3",
+    "vendor": "LILYGO"
+}
diff --git a/ports/esp32/boards/LILYGO_TTGO_LORA32/board.md b/ports/esp32/boards/LILYGO_TTGO_LORA32/board.md
new file mode 100644
index 0000000000000..b7f5c21fecbe4
--- /dev/null
+++ b/ports/esp32/boards/LILYGO_TTGO_LORA32/board.md
@@ -0,0 +1,3 @@
+The following files are daily firmware for the LILYGO TTGO LoRa32.
+
+Support for hardware versions v1.0, v1.2, v1.6 and v2.0.
diff --git a/ports/esp32/boards/LILYGO_TTGO_LORA32/manifest.py b/ports/esp32/boards/LILYGO_TTGO_LORA32/manifest.py
new file mode 100644
index 0000000000000..0709f8597c07c
--- /dev/null
+++ b/ports/esp32/boards/LILYGO_TTGO_LORA32/manifest.py
@@ -0,0 +1,4 @@
+include("$(PORT_DIR)/boards/manifest.py")
+freeze("modules")
+
+freeze("$(MPY_DIR)/drivers/display", "ssd1306.py")
diff --git a/ports/esp32/boards/LILYGO_TTGO_LORA32/modules/lilygo_oled.py b/ports/esp32/boards/LILYGO_TTGO_LORA32/modules/lilygo_oled.py
new file mode 100644
index 0000000000000..58072ee1b51f0
--- /dev/null
+++ b/ports/esp32/boards/LILYGO_TTGO_LORA32/modules/lilygo_oled.py
@@ -0,0 +1,36 @@
+from time import sleep_ms
+from ssd1306 import SSD1306_I2C
+import network
+
+
+class OLED(SSD1306_I2C):
+    def __init__(self, i2c):
+        super().__init__(128, 32, i2c)
+
+    def test(self):
+        self.fill(0)
+        self.fill_rect(0, 0, 32, 32, 1)
+        self.fill_rect(2, 2, 28, 28, 0)
+        self.vline(9, 8, 22, 1)
+        self.vline(16, 2, 22, 1)
+        self.vline(23, 8, 22, 1)
+        self.fill_rect(26, 24, 2, 4, 1)
+        self.text("MicroPython", 40, 0, 1)
+        self.text("SSD1306", 40, 12, 1)
+        self.text("OLED 128x32", 40, 24, 1)
+        self.show()
+
+    def display_wifi(self):
+        self.fill(0)
+        self.text("Scan...", 0, 0, 1)
+        self.show()
+
+        sta_if = network.WLAN(network.STA_IF)
+        sta_if.active(True)
+        _wifi = sta_if.scan()
+
+        self.fill(0)
+        self.text(str(len(_wifi)) + " Networks", 0, 0, 1)
+        self.text(str(_wifi[0][3]) + " " + (_wifi[0][0]).decode("utf-8"), 0, 12, 1)
+        self.text(str(_wifi[1][3]) + " " + (_wifi[1][0]).decode("utf-8"), 0, 24, 1)
+        self.show()
diff --git a/ports/esp32/boards/LILYGO_TTGO_LORA32/modules/lora32.py b/ports/esp32/boards/LILYGO_TTGO_LORA32/modules/lora32.py
new file mode 100644
index 0000000000000..067982a228592
--- /dev/null
+++ b/ports/esp32/boards/LILYGO_TTGO_LORA32/modules/lora32.py
@@ -0,0 +1,79 @@
+"""LILYGO TTGO LoRa32 MicroPython Helper Library."""
+
+from machine import Pin, SoftI2C, Signal
+
+from lilygo_oled import OLED
+
+from micropython import const
+
+
+class Lora32Base:
+    """Base class defining common pins."""
+
+    def __init__(self, define_helpers=True):
+        # LORA
+        self.LORA_MOSI = const(27)
+        self.LORA_MISO = const(19)
+        self.LORA_SCLK = const(5)
+        self.LORA_CS = const(18)
+        self.LORA_DIO = const(26)
+        self.LORA_RST = const(23)
+
+        # DAC
+        self.DAC1 = const(26)
+
+        # LED
+        self.LED = const(25)
+
+        # OLED
+        self.OLED_SDA = const(21)
+        self.OLED_SCL = const(22)
+
+        if define_helpers:
+            self.create_helpers()
+
+    def create_helpers(self):
+        self.led = Pin(self.LED, Pin.OUT)
+        self.i2c = SoftI2C(scl=Pin(self.OLED_SCL), sda=Pin(self.OLED_SDA))
+        self.oled = OLED(self.i2c)
+
+
+class Lora32v1_0(Lora32Base):
+    """Device Support for LILYGO TTGO LoRa32 v1.0."""
+
+    def __init__(self):
+        super().__init__(define_helpers=False)
+
+        # v1.0 has different pins for the following
+        self.LORA_RST = const(14)
+        self.OLED_SDA = const(4)
+        self.OLED_SCL = const(15)
+
+        # Also has a reset for the OLED that the others don't have
+        self.OLED_RST = const(16)
+
+        super().create_helpers()
+
+
+class Lora32v1_2(Lora32Base):
+    """Device Support for LILYGO TTGO LoRa32 v1.2 (T-Fox)."""
+
+    def __init__(self):
+        super().__init__()
+
+        # v1.2 Has a DS3231 RTC
+        self.DS3231_SDA = const(21)
+        self.DS3231_SCL = const(22)
+
+
+class Lora32(Lora32Base):
+    """Device Support for LILYGO TTGO LoRa32 v1.6 and v2.0."""
+
+    def __init__(self):
+        super().__init__()
+
+        # v1.6 and v2.0 support an SDCard
+        self.SD_CS = const(13)
+        self.SD_MOSI = const(15)
+        self.SD_MISO = const(2)
+        self.SD_SCLK = const(14)
diff --git a/ports/esp32/boards/LILYGO_TTGO_LORA32/mpconfigboard.cmake b/ports/esp32/boards/LILYGO_TTGO_LORA32/mpconfigboard.cmake
new file mode 100644
index 0000000000000..c35e4e0743b2d
--- /dev/null
+++ b/ports/esp32/boards/LILYGO_TTGO_LORA32/mpconfigboard.cmake
@@ -0,0 +1,7 @@
+set(SDKCONFIG_DEFAULTS
+    boards/sdkconfig.base
+    boards/sdkconfig.ble
+)
+if(NOT MICROPY_FROZEN_MANIFEST)
+    set(MICROPY_FROZEN_MANIFEST ${MICROPY_BOARD_DIR}/manifest.py)
+endif()
diff --git a/ports/esp32/boards/LILYGO_TTGO_LORA32/mpconfigboard.h b/ports/esp32/boards/LILYGO_TTGO_LORA32/mpconfigboard.h
new file mode 100644
index 0000000000000..1c7b6fd557672
--- /dev/null
+++ b/ports/esp32/boards/LILYGO_TTGO_LORA32/mpconfigboard.h
@@ -0,0 +1,2 @@
+#define MICROPY_HW_BOARD_NAME "LILYGO TTGO LoRa32"
+#define MICROPY_HW_MCU_NAME "ESP32"

From 61c02e6500be7b174bb1c257f4798969fadab206 Mon Sep 17 00:00:00 2001
From: Kattni Rembor <kattni@adafruit.com>
Date: Thu, 10 Mar 2022 13:15:49 -0500
Subject: [PATCH 1810/3533] esp32/machine_pin: Expose pin 20 for ESP32.

This pin is available on some ESP32 packages.

Signed-off-by: Kattni Rembor <kattni@adafruit.com>
---
 ports/esp32/machine_pin.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/ports/esp32/machine_pin.c b/ports/esp32/machine_pin.c
index 90dc03e69aa47..c22eb5d847096 100644
--- a/ports/esp32/machine_pin.c
+++ b/ports/esp32/machine_pin.c
@@ -92,7 +92,11 @@ STATIC const machine_pin_obj_t machine_pin_obj[] = {
     #endif
     {{&machine_pin_type}, GPIO_NUM_18},
     {{&machine_pin_type}, GPIO_NUM_19},
+    #if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(4, 1, 0)
+    {{&machine_pin_type}, GPIO_NUM_20},
+    #else
     {{NULL}, -1},
+    #endif
     {{&machine_pin_type}, GPIO_NUM_21},
     {{&machine_pin_type}, GPIO_NUM_22},
     {{&machine_pin_type}, GPIO_NUM_23},
@@ -560,7 +564,11 @@ STATIC const machine_pin_irq_obj_t machine_pin_irq_object[] = {
     #endif
     {{&machine_pin_irq_type}, GPIO_NUM_18},
     {{&machine_pin_irq_type}, GPIO_NUM_19},
+    #if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(4, 1, 0)
+    {{&machine_pin_irq_type}, GPIO_NUM_20},
+    #else
     {{NULL}, -1},
+    #endif
     {{&machine_pin_irq_type}, GPIO_NUM_21},
     {{&machine_pin_irq_type}, GPIO_NUM_22},
     {{&machine_pin_irq_type}, GPIO_NUM_23},

From 65be5e072fbce4529b0def95e5aa39c8cf630c95 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 22 Mar 2022 10:45:15 +1100
Subject: [PATCH 1811/3533] esp8266/mpconfigport.h: Remove config values that
 are the defaults.

This commit is a no-op in terms of functionality.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp8266/mpconfigport.h | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/ports/esp8266/mpconfigport.h b/ports/esp8266/mpconfigport.h
index ad73f465a3081..0f1da51671a6b 100644
--- a/ports/esp8266/mpconfigport.h
+++ b/ports/esp8266/mpconfigport.h
@@ -14,7 +14,6 @@
 #define MICROPY_ALLOC_PARSE_RULE_INC    (8)
 #define MICROPY_ALLOC_PARSE_RESULT_INC  (8)
 #define MICROPY_ALLOC_PARSE_CHUNK_INIT  (64)
-#define MICROPY_MEM_STATS           (0)
 #define MICROPY_DEBUG_PRINTER       (&mp_debug_print)
 #define MICROPY_ENABLE_GC           (1)
 #define MICROPY_ENABLE_FINALISER    (1)
@@ -24,7 +23,6 @@
 #define MICROPY_REPL_EVENT_DRIVEN   (0)
 #define MICROPY_REPL_AUTO_INDENT    (1)
 #define MICROPY_HELPER_REPL         (1)
-#define MICROPY_HELPER_LEXER_UNIX   (0)
 #define MICROPY_ENABLE_SOURCE_LINE  (1)
 #define MICROPY_MODULE_BUILTIN_INIT (1)
 #define MICROPY_MODULE_WEAK_LINKS   (1)
@@ -34,32 +32,19 @@
 #define MICROPY_PY_DESCRIPTORS      (1)
 #define MICROPY_PY_BUILTINS_COMPLEX (0)
 #define MICROPY_PY_BUILTINS_STR_UNICODE (1)
-#define MICROPY_PY_BUILTINS_BYTEARRAY (1)
 #define MICROPY_PY_BUILTINS_MEMORYVIEW (1)
 #define MICROPY_PY_BUILTINS_FROZENSET (1)
-#define MICROPY_PY_BUILTINS_SET     (1)
-#define MICROPY_PY_BUILTINS_SLICE   (1)
-#define MICROPY_PY_BUILTINS_PROPERTY (1)
 #define MICROPY_PY_BUILTINS_ROUND_INT (1)
 #define MICROPY_PY_BUILTINS_INPUT   (1)
 #define MICROPY_PY_BUILTINS_HELP    (1)
 #define MICROPY_PY_BUILTINS_HELP_TEXT esp_help_text
 #define MICROPY_PY_BUILTINS_HELP_MODULES (1)
 #define MICROPY_PY___FILE__         (0)
-#define MICROPY_PY_GC               (1)
-#define MICROPY_PY_ARRAY            (1)
 #define MICROPY_PY_ARRAY_SLICE_ASSIGN (1)
-#define MICROPY_PY_COLLECTIONS      (1)
 #define MICROPY_PY_COLLECTIONS_DEQUE (1)
 #define MICROPY_PY_COLLECTIONS_ORDEREDDICT (1)
-#define MICROPY_PY_MATH             (1)
-#define MICROPY_PY_CMATH            (0)
-#define MICROPY_PY_IO               (1)
 #define MICROPY_PY_IO_IOBASE        (1)
-#define MICROPY_PY_STRUCT           (1)
-#define MICROPY_PY_SYS              (1)
 #define MICROPY_PY_SYS_MAXSIZE      (1)
-#define MICROPY_PY_SYS_EXIT         (1)
 #define MICROPY_PY_SYS_STDFILES     (1)
 #define MICROPY_PY_UERRNO           (1)
 #define MICROPY_PY_UBINASCII        (1)
@@ -103,7 +88,6 @@
 #define MICROPY_PY_UOS_UNAME        (1)
 #define MICROPY_PY_UOS_UNAME_RELEASE_DYNAMIC (1)
 #define MICROPY_PY_UOS_URANDOM      (1)
-#define MICROPY_CPYTHON_COMPAT      (1)
 #define MICROPY_LONGINT_IMPL        (MICROPY_LONGINT_IMPL_MPZ)
 #define MICROPY_FLOAT_IMPL          (MICROPY_FLOAT_IMPL_FLOAT)
 #define MICROPY_WARNINGS            (1)

From eef7eae6b299f5a6469b977aae6425e33ee895af Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 22 Mar 2022 11:01:02 +1100
Subject: [PATCH 1812/3533] esp8266/modesp: Remove esp.info() function.

The main functionality of this info function is available via the existing
micropython.mem_info() and micropython.qstr_info() functions.  The printing
of the address space layout doesn't add much and removing esp.info() saves
about 600 bytes.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp8266/Makefile                 |  1 -
 ports/esp8266/boards/esp8266_common.ld |  1 -
 ports/esp8266/modesp.c                 |  1 -
 ports/esp8266/modpyb.c                 | 79 --------------------------
 4 files changed, 82 deletions(-)
 delete mode 100644 ports/esp8266/modpyb.c

diff --git a/ports/esp8266/Makefile b/ports/esp8266/Makefile
index fd2346d515f58..705f4f1eeb710 100644
--- a/ports/esp8266/Makefile
+++ b/ports/esp8266/Makefile
@@ -90,7 +90,6 @@ SRC_C = \
 	uart.c \
 	esppwm.c \
 	espapa102.c \
-	modpyb.c \
 	modmachine.c \
 	machine_bitstream.c \
 	machine_pin.c \
diff --git a/ports/esp8266/boards/esp8266_common.ld b/ports/esp8266/boards/esp8266_common.ld
index ae1509faee7d7..c2d62e9dd4ce6 100644
--- a/ports/esp8266/boards/esp8266_common.ld
+++ b/ports/esp8266/boards/esp8266_common.ld
@@ -151,7 +151,6 @@ SECTIONS
         *help.o(.literal* .text*)
         *lexerstr32.o(.literal* .text*)
         *utils.o(.literal* .text*)
-        *modpyb.o(.literal*, .text*)
         *machine_pin.o(.literal*, .text*)
         *machine_pwm.o(.literal*, .text*)
         *machine_rtc.o(.literal*, .text*)
diff --git a/ports/esp8266/modesp.c b/ports/esp8266/modesp.c
index eb79d20bc5897..0e2acaf5ffd48 100644
--- a/ports/esp8266/modesp.c
+++ b/ports/esp8266/modesp.c
@@ -359,7 +359,6 @@ STATIC const mp_rom_map_elem_t esp_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_freemem), MP_ROM_PTR(&esp_freemem_obj) },
     { MP_ROM_QSTR(MP_QSTR_meminfo), MP_ROM_PTR(&esp_meminfo_obj) },
     { MP_ROM_QSTR(MP_QSTR_check_fw), MP_ROM_PTR(&esp_check_fw_obj) },
-    { MP_ROM_QSTR(MP_QSTR_info), MP_ROM_PTR(&pyb_info_obj) }, // TODO delete/rename/move elsewhere
     { MP_ROM_QSTR(MP_QSTR_malloc), MP_ROM_PTR(&esp_malloc_obj) },
     { MP_ROM_QSTR(MP_QSTR_free), MP_ROM_PTR(&esp_free_obj) },
     { MP_ROM_QSTR(MP_QSTR_esf_free_bufs), MP_ROM_PTR(&esp_esf_free_bufs_obj) },
diff --git a/ports/esp8266/modpyb.c b/ports/esp8266/modpyb.c
deleted file mode 100644
index 0a23f6f9da115..0000000000000
--- a/ports/esp8266/modpyb.c
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2014 Damien P. George
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#include <stdio.h>
-
-#include "py/gc.h"
-#include "gccollect.h"
-#include "modmachine.h"
-
-// The pyb module no longer exists since all functionality now appears
-// elsewhere, in more standard places (eg time, machine modules).  The
-// only remaining function is pyb.info() which has been moved to the
-// esp module, pending deletion/renaming/moving elsewhere.
-
-STATIC mp_obj_t pyb_info(size_t n_args, const mp_obj_t *args) {
-    // print info about memory
-    {
-        printf("_text_start=%p\n", &_text_start);
-        printf("_text_end=%p\n", &_text_end);
-        printf("_irom0_text_start=%p\n", &_irom0_text_start);
-        printf("_irom0_text_end=%p\n", &_irom0_text_end);
-        printf("_data_start=%p\n", &_data_start);
-        printf("_data_end=%p\n", &_data_end);
-        printf("_rodata_start=%p\n", &_rodata_start);
-        printf("_rodata_end=%p\n", &_rodata_end);
-        printf("_bss_start=%p\n", &_bss_start);
-        printf("_bss_end=%p\n", &_bss_end);
-        printf("_heap_start=%p\n", &_heap_start);
-        printf("_heap_end=%p\n", &_heap_end);
-    }
-
-    // qstr info
-    {
-        mp_uint_t n_pool, n_qstr, n_str_data_bytes, n_total_bytes;
-        qstr_pool_info(&n_pool, &n_qstr, &n_str_data_bytes, &n_total_bytes);
-        printf("qstr:\n  n_pool=" UINT_FMT "\n  n_qstr=" UINT_FMT "\n  n_str_data_bytes=" UINT_FMT "\n  n_total_bytes=" UINT_FMT "\n", n_pool, n_qstr, n_str_data_bytes, n_total_bytes);
-    }
-
-    // GC info
-    {
-        gc_info_t info;
-        gc_info(&info);
-        printf("GC:\n");
-        printf("  " UINT_FMT " total\n", info.total);
-        printf("  " UINT_FMT " : " UINT_FMT "\n", info.used, info.free);
-        printf("  1=" UINT_FMT " 2=" UINT_FMT " m=" UINT_FMT "\n", info.num_1block, info.num_2block, info.max_block);
-    }
-
-    if (n_args == 1) {
-        // arg given means dump gc allocation table
-        gc_dump_alloc_table();
-    }
-
-    return mp_const_none;
-}
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pyb_info_obj, 0, 1, pyb_info);

From 7a9cf1f0fb7c43de766e18465a15d451dda6ef58 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 17 Mar 2022 17:07:49 +1100
Subject: [PATCH 1813/3533] stm32/sdcard: Use mp_hal_pin_input instead of HAL
 function.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/sdcard.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/stm32/sdcard.c b/ports/stm32/sdcard.c
index cb773f29db654..cdec576dc2edd 100644
--- a/ports/stm32/sdcard.c
+++ b/ports/stm32/sdcard.c
@@ -249,7 +249,7 @@ bool sdcard_is_present(void) {
     }
     #endif
     #if defined(MICROPY_HW_SDCARD_DETECT_PIN)
-    return HAL_GPIO_ReadPin(MICROPY_HW_SDCARD_DETECT_PIN->gpio, MICROPY_HW_SDCARD_DETECT_PIN->pin_mask) == MICROPY_HW_SDCARD_DETECT_PRESENT;
+    return mp_hal_pin_read(MICROPY_HW_SDCARD_DETECT_PIN) == MICROPY_HW_SDCARD_DETECT_PRESENT;
     #else
     return true;
     #endif

From 75d2bfcccf04e2740c51c345bc8a3145c2c2c7c7 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 17 Mar 2022 17:08:14 +1100
Subject: [PATCH 1814/3533] stm32/sdcard: Add sdcard_select_sd/mmc functions.

So that C code can select which of SD or MMC to use.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/sdcard.c | 8 ++++++++
 ports/stm32/sdcard.h | 2 ++
 2 files changed, 10 insertions(+)

diff --git a/ports/stm32/sdcard.c b/ports/stm32/sdcard.c
index cdec576dc2edd..12c9eb4446613 100644
--- a/ports/stm32/sdcard.c
+++ b/ports/stm32/sdcard.c
@@ -200,6 +200,14 @@ void sdcard_init(void) {
     #endif
 }
 
+void sdcard_select_sd(void) {
+    pyb_sdmmc_flags |= PYB_SDMMC_FLAG_SD;
+}
+
+void sdcard_select_mmc(void) {
+    pyb_sdmmc_flags |= PYB_SDMMC_FLAG_MMC;
+}
+
 STATIC void sdmmc_msp_init(void) {
     // enable SDIO clock
     SDMMC_CLK_ENABLE();
diff --git a/ports/stm32/sdcard.h b/ports/stm32/sdcard.h
index e436ffffe1b95..a2e4e4517cf16 100644
--- a/ports/stm32/sdcard.h
+++ b/ports/stm32/sdcard.h
@@ -30,6 +30,8 @@
 #define SDCARD_BLOCK_SIZE (512)
 
 void sdcard_init(void);
+void sdcard_select_sd(void);
+void sdcard_select_mmc(void);
 bool sdcard_is_present(void);
 bool sdcard_power_on(void);
 void sdcard_power_off(void);

From 63c7593df66533fc0c529d2ed2a5da38042c8970 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 17 Mar 2022 17:09:01 +1100
Subject: [PATCH 1815/3533] stm32/main: Support SD cards without a partition
 table.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/main.c | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/ports/stm32/main.c b/ports/stm32/main.c
index 3291a80184f10..875584be8a24b 100644
--- a/ports/stm32/main.c
+++ b/ports/stm32/main.c
@@ -233,7 +233,7 @@ MP_NOINLINE STATIC bool init_flash_fs(uint reset_mode) {
 #if MICROPY_HW_SDCARD_MOUNT_AT_BOOT
 STATIC bool init_sdcard_fs(void) {
     bool first_part = true;
-    for (int part_num = 1; part_num <= 4; ++part_num) {
+    for (int part_num = 1; part_num <= 5; ++part_num) {
         // create vfs object
         fs_user_mount_t *vfs_fat = m_new_obj_maybe(fs_user_mount_t);
         mp_vfs_mount_t *vfs = m_new_obj_maybe(mp_vfs_mount_t);
@@ -241,7 +241,16 @@ STATIC bool init_sdcard_fs(void) {
             break;
         }
         vfs_fat->blockdev.flags = MP_BLOCKDEV_FLAG_FREE_OBJ;
-        sdcard_init_vfs(vfs_fat, part_num);
+        if (part_num == 5) {
+            if (!first_part) {
+                break;
+            }
+            // partitions 1-4 couldn't be mounted, so try FATFS auto-detect mode
+            // which will work if there is no partition table, just a filesystem
+            sdcard_init_vfs(vfs_fat, 0);
+        } else {
+            sdcard_init_vfs(vfs_fat, part_num);
+        }
 
         // try to mount the partition
         FRESULT res = f_mount(&vfs_fat->fatfs);

From f0be0de34185e77141205499f5f7563c6450df5f Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 17 Mar 2022 17:09:28 +1100
Subject: [PATCH 1816/3533] stm32/dma: Add option to disable auto-DMA-turn-off.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/dma.c | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/ports/stm32/dma.c b/ports/stm32/dma.c
index 75c34325d7e81..cb8e555df4b95 100644
--- a/ports/stm32/dma.c
+++ b/ports/stm32/dma.c
@@ -34,6 +34,12 @@
 #include "dma.h"
 #include "irq.h"
 
+// When this option is enabled, the DMA will turn off automatically after
+// a period of inactivity.
+#ifndef MICROPY_HW_DMA_ENABLE_AUTO_TURN_OFF
+#define MICROPY_HW_DMA_ENABLE_AUTO_TURN_OFF (1)
+#endif
+
 #define DMA_IDLE_ENABLED()  (dma_idle.enabled != 0)
 #define DMA_SYSTICK_LOG2    (3)
 #define DMA_SYSTICK_MASK    ((1 << DMA_SYSTICK_LOG2) - 1)
@@ -653,7 +659,9 @@ static const uint8_t dma_irqn[NSTREAM] = {
 static DMA_HandleTypeDef *dma_handle[NSTREAM] = {NULL};
 static uint8_t dma_last_sub_instance[NSTREAM];
 static volatile uint32_t dma_enable_mask = 0;
+#if MICROPY_HW_DMA_ENABLE_AUTO_TURN_OFF
 volatile dma_idle_count_t dma_idle;
+#endif
 
 #define DMA_INVALID_CHANNEL 0xff    // Value stored in dma_last_channel which means invalid
 
@@ -1082,6 +1090,7 @@ void DMA2_Channel7_IRQHandler(void) {
 
 #endif
 
+#if MICROPY_HW_DMA_ENABLE_AUTO_TURN_OFF
 static void dma_idle_handler(uint32_t tick);
 
 // Resets the idle counter for the DMA controller associated with dma_id.
@@ -1089,6 +1098,7 @@ static void dma_tickle(dma_id_t dma_id) {
     dma_idle.counter[(dma_id < NSTREAMS_PER_CONTROLLER) ? 0 : 1] = 1;
     systick_enable_dispatch(SYSTICK_DISPATCH_DMA, dma_idle_handler);
 }
+#endif
 
 static void dma_enable_clock(dma_id_t dma_id) {
     // We don't want dma_tick_handler() to turn off the clock right after we
@@ -1143,7 +1153,9 @@ static void dma_disable_clock(dma_id_t dma_id) {
     // We just mark the clock as disabled here, but we don't actually disable it.
     // We wait for the timer to expire first, which means that back-to-back
     // transfers don't have to initialize as much.
+    #if MICROPY_HW_DMA_ENABLE_AUTO_TURN_OFF
     dma_tickle(dma_id);
+    #endif
     dma_enable_mask &= ~(1 << dma_id);
 }
 
@@ -1250,6 +1262,7 @@ void dma_invalidate_channel(const dma_descr_t *dma_descr) {
     }
 }
 
+#if MICROPY_HW_DMA_ENABLE_AUTO_TURN_OFF
 // Called from the SysTick handler
 // We use LSB of tick to select which controller to process
 static void dma_idle_handler(uint32_t tick) {
@@ -1302,6 +1315,7 @@ static void dma_idle_handler(uint32_t tick) {
         }
     }
 }
+#endif
 
 #if defined(STM32F0) || defined(STM32G4) || defined(STM32L0) || defined(STM32L4)
 

From dc91024a7312894997020e57502cccf0ebbca4ff Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 17 Mar 2022 17:10:45 +1100
Subject: [PATCH 1817/3533] stm32/mboot: Add pragma for GCC to ignore array
 bounds warning.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/mboot/main.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/ports/stm32/mboot/main.c b/ports/stm32/mboot/main.c
index 8d6e28f1899d2..ac564d1d06c6f 100644
--- a/ports/stm32/mboot/main.c
+++ b/ports/stm32/mboot/main.c
@@ -788,7 +788,15 @@ void i2c_slave_process_rx_end(i2c_slave_t *i2c) {
     if (buf[0] == I2C_CMD_ECHO) {
         ++len;
     } else if (buf[0] == I2C_CMD_GETID && len == 0) {
+        #if __GNUC__ >= 11
+        #pragma GCC diagnostic push
+        #pragma GCC diagnostic ignored "-Warray-bounds"
+        #pragma GCC diagnostic ignored "-Wstringop-overread"
+        #endif
         memcpy(buf, (uint8_t*)MP_HAL_UNIQUE_ID_ADDRESS, 12);
+        #if __GNUC__ >= 11
+        #pragma GCC diagnostic pop
+        #endif
         memcpy(buf + 12, MICROPY_HW_MCU_NAME, sizeof(MICROPY_HW_MCU_NAME));
         memcpy(buf + 12 + sizeof(MICROPY_HW_MCU_NAME), MICROPY_HW_BOARD_NAME, sizeof(MICROPY_HW_BOARD_NAME) - 1);
         len = 12 + sizeof(MICROPY_HW_MCU_NAME) + sizeof(MICROPY_HW_BOARD_NAME) - 1;

From a92d45c3df893c845571506afe6fbbfb3e7a85aa Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 17 Mar 2022 17:11:03 +1100
Subject: [PATCH 1818/3533] stm32/mboot: Always check the magic number to enter
 filesystem loading.

Even if MBOOT_FSLOAD is disabled, mboot should still check for 0x70ad0080
so it can immediately return to the application if this feature is not
enabled.  Otherwise mboot will get stuck in DFU mode.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/mboot/main.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/stm32/mboot/main.c b/ports/stm32/mboot/main.c
index ac564d1d06c6f..341cf181797da 100644
--- a/ports/stm32/mboot/main.c
+++ b/ports/stm32/mboot/main.c
@@ -1539,8 +1539,8 @@ void stm32_main(uint32_t initial_r0) {
     mboot_pack_init();
     #endif
 
-    #if MBOOT_FSLOAD
     if ((initial_r0 & 0xffffff80) == 0x70ad0080) {
+        #if MBOOT_FSLOAD
         // Application passed through elements, validate then process them
         const uint8_t *elem_end = elem_search(ELEM_DATA_START, ELEM_TYPE_END);
         if (elem_end != NULL && elem_end[-1] == 0) {
@@ -1553,11 +1553,11 @@ void stm32_main(uint32_t initial_r0) {
                 *status_ptr = ret;
             }
         }
+        #endif
         // Always reset because the application is expecting to resume
         led_state_all(0);
         leave_bootloader();
     }
-    #endif
 
     dfu_init();
 

From 9b07d38c7e5919c8f26ee12b7bba71214ac43289 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 18 Mar 2022 16:22:26 +1100
Subject: [PATCH 1819/3533] stm32/mboot: Add support for 64-bit mboot address
 space for reads.

If enabled via MBOOT_ADDRESS_SPACE_64BIT (it's disabled by default) then
read addresses will be 64-bit.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/mboot/README.md   |  6 +++++-
 ports/stm32/mboot/fsload.c    | 27 ++++++++++++++++++---------
 ports/stm32/mboot/fwupdate.py |  7 +++++--
 ports/stm32/mboot/main.c      | 11 ++++++++---
 ports/stm32/mboot/mboot.h     | 16 ++++++++++++++--
 ports/stm32/mboot/vfs.h       | 14 +++++++-------
 ports/stm32/mboot/vfs_fat.c   | 11 ++++++-----
 ports/stm32/mboot/vfs_lfs.c   |  5 +++--
 8 files changed, 66 insertions(+), 31 deletions(-)

diff --git a/ports/stm32/mboot/README.md b/ports/stm32/mboot/README.md
index b85bc3e2eedbd..49385047a4337 100644
--- a/ports/stm32/mboot/README.md
+++ b/ports/stm32/mboot/README.md
@@ -137,9 +137,13 @@ are located and what filename to program.  The elements to use are:
 
 * MOUNT: type=2, len=10, payload=(<mount-point:u8> <fs-type:u8> <base-addr:u32> <byte-len:u32>)
 
+* MOUNT: type=2, len=14, payload=(<mount-point:u8> <fs-type:u8> <base-addr:u32> <byte-len:u32> <block-size:u32>)
+
+* MOUNT: type=2, len=22, payload=(<mount-point:u8> <fs-type:u8> <base-addr:u64> <byte-len:u64> <block-size:u32>)
+
 * FSLOAD: type=3, len=1+n, payload=(<mount-point:u8> <filename...>)
 
-`u32` means unsigned 32-bit little-endian integer.
+`u32`/`u64` mean unsigned 32-bit/64-bit little-endian integers.
 
 The firmware to load must be a gzip'd DfuSe file (.dfu.gz) and stored within a
 FAT or littlefs formatted partition.
diff --git a/ports/stm32/mboot/fsload.c b/ports/stm32/mboot/fsload.c
index 9ecc25b0be925..14864bb8956b1 100644
--- a/ports/stm32/mboot/fsload.c
+++ b/ports/stm32/mboot/fsload.c
@@ -222,20 +222,29 @@ int fsload_process(void) {
             // End of elements.
             return -MBOOT_ERRNO_FSLOAD_NO_MOUNT;
         }
-        uint32_t block_size;
-        if (elem[-1] == 10) {
-            // No block size given, use default.
-            block_size = MBOOT_FSLOAD_DEFAULT_BLOCK_SIZE;
-        } else if (elem[-1] == 14) {
-            // Block size given, extract it.
-            block_size = get_le32(&elem[10]);
+        mboot_addr_t base_addr;
+        mboot_addr_t byte_len;
+        uint32_t block_size = MBOOT_FSLOAD_DEFAULT_BLOCK_SIZE;
+        if (elem[-1] == 10 || elem[-1] == 14) {
+            // 32-bit base and length given, extract them.
+            base_addr = get_le32(&elem[2]);
+            byte_len = get_le32(&elem[6]);
+            if (elem[-1] == 14) {
+                // Block size given, extract it.
+                block_size = get_le32(&elem[10]);
+            }
+        #if MBOOT_ADDRESS_SPACE_64BIT
+        } else if (elem[-1] == 22) {
+            // 64-bit base and length given, and block size, so extract them.
+            base_addr = get_le64(&elem[2]);
+            byte_len = get_le64(&elem[10]);
+            block_size = get_le32(&elem[18]);
+        #endif
         } else {
             // Invalid MOUNT element.
             return -MBOOT_ERRNO_FSLOAD_INVALID_MOUNT;
         }
         if (elem[0] == mount_point) {
-            uint32_t base_addr = get_le32(&elem[2]);
-            uint32_t byte_len = get_le32(&elem[6]);
             int ret;
             union {
                 #if MBOOT_VFS_FAT
diff --git a/ports/stm32/mboot/fwupdate.py b/ports/stm32/mboot/fwupdate.py
index 0e7ea014189d1..df1ff62846274 100644
--- a/ports/stm32/mboot/fwupdate.py
+++ b/ports/stm32/mboot/fwupdate.py
@@ -227,7 +227,9 @@ def _create_element(kind, body):
     return bytes([kind, len(body)]) + body
 
 
-def update_mpy(filename, fs_base, fs_len, fs_type=VFS_FAT, fs_blocksize=0, status_addr=None):
+def update_mpy(
+    filename, fs_base, fs_len, fs_type=VFS_FAT, fs_blocksize=0, status_addr=None, addr_64bit=False
+):
     # Check firmware is of .dfu or .dfu.gz type
     try:
         with open(filename, "rb") as f:
@@ -243,9 +245,10 @@ def update_mpy(filename, fs_base, fs_len, fs_type=VFS_FAT, fs_blocksize=0, statu
         raise Exception("littlefs requires fs_blocksize parameter")
 
     mount_point = 1
+    mount_encoding = "<BBQQL" if addr_64bit else "<BBLLL"
     elems = _create_element(
         _ELEM_TYPE_MOUNT,
-        struct.pack("<BBLLL", mount_point, fs_type, fs_base, fs_len, fs_blocksize),
+        struct.pack(mount_encoding, mount_point, fs_type, fs_base, fs_len, fs_blocksize),
     )
     elems += _create_element(
         _ELEM_TYPE_FSLOAD, struct.pack("<B", mount_point) + bytes(filename, "ascii")
diff --git a/ports/stm32/mboot/main.c b/ports/stm32/mboot/main.c
index 341cf181797da..714b20ff09913 100644
--- a/ports/stm32/mboot/main.c
+++ b/ports/stm32/mboot/main.c
@@ -117,6 +117,11 @@ uint32_t get_le32(const uint8_t *b) {
     return b[0] | b[1] << 8 | b[2] << 16 | b[3] << 24;
 }
 
+uint64_t get_le64(const uint8_t *b) {
+    return (uint64_t)b[0] | (uint64_t)b[1] << 8 | (uint64_t)b[2] << 16 | (uint64_t)b[3] << 24
+        | (uint64_t)b[4] << 32 | (uint64_t)b[5] << 40 | (uint64_t)b[6] << 48 | (uint64_t)b[7] << 56;
+}
+
 mp_uint_t mp_hal_ticks_ms(void) {
     return systick_ms;
 }
@@ -636,7 +641,7 @@ int hw_page_erase(uint32_t addr, uint32_t *next_addr) {
     return ret;
 }
 
-void hw_read(uint32_t addr, int len, uint8_t *buf) {
+void hw_read(mboot_addr_t addr, size_t len, uint8_t *buf) {
     led0_state(LED0_STATE_FAST_FLASH);
     #if defined(MBOOT_SPIFLASH_ADDR)
     if (MBOOT_SPIFLASH_ADDR <= addr && addr < MBOOT_SPIFLASH_ADDR + MBOOT_SPIFLASH_BYTE_SIZE) {
@@ -650,7 +655,7 @@ void hw_read(uint32_t addr, int len, uint8_t *buf) {
     #endif
     {
         // Other addresses, just read directly from memory
-        memcpy(buf, (void*)addr, len);
+        memcpy(buf, (void *)(uintptr_t)addr, len);
     }
     led0_state(LED0_STATE_SLOW_FLASH);
 }
@@ -688,7 +693,7 @@ int do_page_erase(uint32_t addr, uint32_t *next_addr) {
     #endif
 }
 
-void do_read(uint32_t addr, int len, uint8_t *buf) {
+void do_read(mboot_addr_t addr, size_t len, uint8_t *buf) {
     #if MBOOT_ENABLE_PACKING
     // Read disabled on packed (encrypted) mode.
     dfu_context.status = DFU_STATUS_ERROR_FILE;
diff --git a/ports/stm32/mboot/mboot.h b/ports/stm32/mboot/mboot.h
index 254c842653179..36acb313b6bf4 100644
--- a/ports/stm32/mboot/mboot.h
+++ b/ports/stm32/mboot/mboot.h
@@ -42,6 +42,10 @@
 #define MBOOT_BOARD_ENTRY_INIT mboot_entry_init
 #endif
 
+#ifndef MBOOT_ADDRESS_SPACE_64BIT
+#define MBOOT_ADDRESS_SPACE_64BIT (0)
+#endif
+
 enum {
     MBOOT_ERRNO_FLASH_ERASE_DISALLOWED = 200,
     MBOOT_ERRNO_FLASH_ERASE_FAILED,
@@ -86,6 +90,13 @@ enum {
     ELEM_MOUNT_LFS2,
 };
 
+// Configure the type used to hold an address in the mboot address space.
+#if MBOOT_ADDRESS_SPACE_64BIT
+typedef uint64_t mboot_addr_t;
+#else
+typedef uint32_t mboot_addr_t;
+#endif
+
 extern uint8_t _estack[ELEM_DATA_SIZE];
 
 void systick_init(void);
@@ -93,14 +104,15 @@ void led_init(void);
 void SystemClock_Config(void);
 
 uint32_t get_le32(const uint8_t *b);
+uint64_t get_le64(const uint8_t *b);
 void led_state_all(unsigned int mask);
 
 int hw_page_erase(uint32_t addr, uint32_t *next_addr);
-void hw_read(uint32_t addr, int len, uint8_t *buf);
+void hw_read(mboot_addr_t addr, size_t len, uint8_t *buf);
 int hw_write(uint32_t addr, const uint8_t *src8, size_t len);
 
 int do_page_erase(uint32_t addr, uint32_t *next_addr);
-void do_read(uint32_t addr, int len, uint8_t *buf);
+void do_read(mboot_addr_t addr, size_t len, uint8_t *buf);
 int do_write(uint32_t addr, const uint8_t *src8, size_t len);
 
 const uint8_t *elem_search(const uint8_t *elem, uint8_t elem_id);
diff --git a/ports/stm32/mboot/vfs.h b/ports/stm32/mboot/vfs.h
index 22bb98936790e..53dac88009bf6 100644
--- a/ports/stm32/mboot/vfs.h
+++ b/ports/stm32/mboot/vfs.h
@@ -34,15 +34,15 @@
 #include "lib/oofatfs/ff.h"
 
 typedef struct _vfs_fat_context_t {
-    uint32_t bdev_base_addr;
-    uint32_t bdev_byte_len;
+    mboot_addr_t bdev_base_addr;
+    uint32_t bdev_num_blocks;
     FATFS fatfs;
     FIL fp;
 } vfs_fat_context_t;
 
 extern const stream_methods_t vfs_fat_stream_methods;
 
-int vfs_fat_mount(vfs_fat_context_t *ctx, uint32_t base_addr, uint32_t byte_len);
+int vfs_fat_mount(vfs_fat_context_t *ctx, mboot_addr_t base_addr, mboot_addr_t byte_len);
 
 #endif
 
@@ -55,7 +55,7 @@ int vfs_fat_mount(vfs_fat_context_t *ctx, uint32_t base_addr, uint32_t byte_len)
 #define LFS_LOOKAHEAD_SIZE (32)
 
 typedef struct _vfs_lfs1_context_t {
-    uint32_t bdev_base_addr;
+    mboot_addr_t bdev_base_addr;
     struct lfs1_config config;
     lfs1_t lfs;
     struct lfs1_file_config filecfg;
@@ -65,7 +65,7 @@ typedef struct _vfs_lfs1_context_t {
 
 extern const stream_methods_t vfs_lfs1_stream_methods;
 
-int vfs_lfs1_mount(vfs_lfs1_context_t *ctx, uint32_t base_addr, uint32_t byte_len, uint32_t block_size);
+int vfs_lfs1_mount(vfs_lfs1_context_t *ctx, mboot_addr_t base_addr, mboot_addr_t byte_len, uint32_t block_size);
 
 #endif
 
@@ -79,7 +79,7 @@ int vfs_lfs1_mount(vfs_lfs1_context_t *ctx, uint32_t base_addr, uint32_t byte_le
 #define LFS_LOOKAHEAD_SIZE (32)
 
 typedef struct _vfs_lfs2_context_t {
-    uint32_t bdev_base_addr;
+    mboot_addr_t bdev_base_addr;
     struct lfs2_config config;
     lfs2_t lfs;
     struct lfs2_file_config filecfg;
@@ -89,7 +89,7 @@ typedef struct _vfs_lfs2_context_t {
 
 extern const stream_methods_t vfs_lfs2_stream_methods;
 
-int vfs_lfs2_mount(vfs_lfs2_context_t *ctx, uint32_t base_addr, uint32_t byte_len, uint32_t block_size);
+int vfs_lfs2_mount(vfs_lfs2_context_t *ctx, mboot_addr_t base_addr, mboot_addr_t byte_len, uint32_t block_size);
 
 #endif
 
diff --git a/ports/stm32/mboot/vfs_fat.c b/ports/stm32/mboot/vfs_fat.c
index cfa30fb12cc27..e316910466cbb 100644
--- a/ports/stm32/mboot/vfs_fat.c
+++ b/ports/stm32/mboot/vfs_fat.c
@@ -41,8 +41,9 @@
 DRESULT disk_read(void *pdrv, BYTE *buf, DWORD sector, UINT count) {
     vfs_fat_context_t *ctx = pdrv;
 
-    if (0 <= sector && sector < ctx->bdev_byte_len / 512) {
-        hw_read(ctx->bdev_base_addr + sector * SECSIZE, count * SECSIZE, buf);
+    if (0 <= sector && sector < ctx->bdev_num_blocks) {
+        mboot_addr_t addr = ctx->bdev_base_addr + (mboot_addr_t)sector * (mboot_addr_t)SECSIZE;
+        hw_read(addr, count * SECSIZE, buf);
         return RES_OK;
     }
 
@@ -57,7 +58,7 @@ DRESULT disk_ioctl(void *pdrv, BYTE cmd, void *buf) {
             return RES_OK;
 
         case GET_SECTOR_COUNT:
-            *((DWORD*)buf) = ctx->bdev_byte_len / SECSIZE;
+            *((DWORD*)buf) = ctx->bdev_num_blocks;
             return RES_OK;
 
         case GET_SECTOR_SIZE:
@@ -78,9 +79,9 @@ DRESULT disk_ioctl(void *pdrv, BYTE cmd, void *buf) {
     }
 }
 
-int vfs_fat_mount(vfs_fat_context_t *ctx, uint32_t base_addr, uint32_t byte_len) {
+int vfs_fat_mount(vfs_fat_context_t *ctx, mboot_addr_t base_addr, mboot_addr_t byte_len) {
     ctx->bdev_base_addr = base_addr;
-    ctx->bdev_byte_len = byte_len;
+    ctx->bdev_num_blocks = byte_len / SECSIZE;
     ctx->fatfs.drv = ctx;
     FRESULT res = f_mount(&ctx->fatfs);
     if (res != FR_OK) {
diff --git a/ports/stm32/mboot/vfs_lfs.c b/ports/stm32/mboot/vfs_lfs.c
index e7fd8ce63c07e..5aa400df40500 100644
--- a/ports/stm32/mboot/vfs_lfs.c
+++ b/ports/stm32/mboot/vfs_lfs.c
@@ -70,7 +70,8 @@ static uint8_t lfs_lookahead_buffer[LFS_LOOKAHEAD_SIZE];
 static int dev_read(const struct LFSx_API (config) * c, LFSx_API(block_t) block, LFSx_API(off_t) off, void *buffer, LFSx_API(size_t) size) {
     VFS_LFSx_CONTEXT_T *ctx = c->context;
     if (0 <= block && block < ctx->config.block_count) {
-        hw_read(ctx->bdev_base_addr + block * ctx->config.block_size + off, size, buffer);
+        mboot_addr_t addr = ctx->bdev_base_addr + (mboot_addr_t)block * (mboot_addr_t)ctx->config.block_size + (mboot_addr_t)off;
+        hw_read(addr, size, buffer);
         return LFSx_MACRO(_ERR_OK);
     }
     return LFSx_MACRO(_ERR_IO);
@@ -88,7 +89,7 @@ static int dev_sync(const struct LFSx_API (config) * c) {
     return LFSx_MACRO(_ERR_OK);
 }
 
-int VFS_LFSx_MOUNT(VFS_LFSx_CONTEXT_T *ctx, uint32_t base_addr, uint32_t byte_len, uint32_t block_size) {
+int VFS_LFSx_MOUNT(VFS_LFSx_CONTEXT_T *ctx, mboot_addr_t base_addr, mboot_addr_t byte_len, uint32_t block_size) {
     ctx->bdev_base_addr = base_addr;
 
     struct LFSx_API (config) *config = &ctx->config;

From e316306546c9a0f76512692eaacfee9fe38892c5 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 17 Mar 2022 17:11:44 +1100
Subject: [PATCH 1820/3533] stm32/mboot: Add support for reading from SD card.

Tested on PYBV10 and PYBD_SF6, with MBOOT_FSLOAD enabled and programming
new firmware from a .dfu.gz file stored on the SD card.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/mboot/Makefile  | 10 ++++++++++
 ports/stm32/mboot/README.md | 12 ++++++++++++
 ports/stm32/mboot/main.c    | 17 +++++++++++++++++
 ports/stm32/mboot/sdcard.c  | 13 +++++++++++++
 ports/stm32/sdcard.c        |  4 ++++
 tools/ci.sh                 |  1 +
 6 files changed, 57 insertions(+)
 create mode 100644 ports/stm32/mboot/sdcard.c

diff --git a/ports/stm32/mboot/Makefile b/ports/stm32/mboot/Makefile
index ee75fb2afea21..61a102d02d6d5 100755
--- a/ports/stm32/mboot/Makefile
+++ b/ports/stm32/mboot/Makefile
@@ -110,6 +110,7 @@ SRC_C += \
 	fsload.c \
 	gzstream.c \
 	pack.c \
+	sdcard.c \
 	vfs_fat.c \
 	vfs_lfs.c \
 	drivers/bus/softspi.c \
@@ -142,6 +143,7 @@ endif
 $(BUILD)/$(STM32LIB_HAL_BASE)/Src/stm32$(MCU_SERIES)xx_ll_usb.o: CFLAGS += -Wno-attributes
 SRC_HAL += $(addprefix $(STM32LIB_HAL_BASE)/Src/stm32$(MCU_SERIES)xx_,\
 	hal_cortex.c \
+	hal_dma.c \
 	hal_flash.c \
 	hal_flash_ex.c \
 	hal_pcd.c \
@@ -151,6 +153,14 @@ SRC_HAL += $(addprefix $(STM32LIB_HAL_BASE)/Src/stm32$(MCU_SERIES)xx_,\
 	ll_usb.c \
 	)
 
+ifeq ($(MCU_SERIES),$(filter $(MCU_SERIES),f4 f7 h7))
+SRC_HAL += $(addprefix $(STM32LIB_HAL_BASE)/Src/stm32$(MCU_SERIES)xx_,\
+	hal_mmc.c \
+	hal_sd.c \
+	ll_sdmmc.c \
+	)
+endif
+
 SRC_USBDEV += $(addprefix ports/stm32/$(USBDEV_DIR)/,\
 	core/src/usbd_core.c \
 	core/src/usbd_ctlreq.c \
diff --git a/ports/stm32/mboot/README.md b/ports/stm32/mboot/README.md
index 49385047a4337..936b58760871f 100644
--- a/ports/stm32/mboot/README.md
+++ b/ports/stm32/mboot/README.md
@@ -59,6 +59,13 @@ How to use
    second one use the same configuration names as above but with
    `SPIFLASH2`, ie `MBOOT_SPIFLASH2_ADDR` etc.
 
+   SD card support (read-only, useful in combination with `MBOOT_FSLOAD`)
+   can be enabled with the following options:
+
+    #define MBOOT_ADDRESS_SPACE_64BIT   (1)
+    #define MBOOT_SDCARD_ADDR           (0x100000000ULL)
+    #define MBOOT_SDCARD_BYTE_SIZE      (0x400000000ULL)
+
    To enable loading firmware from a filesystem use:
 
     #define MBOOT_FSLOAD (1)
@@ -159,6 +166,11 @@ firmware.dfu.gz stored on the default FAT filesystem:
 The 0x80000000 value is the address understood by Mboot as the location of
 the external SPI flash, configured via `MBOOT_SPIFLASH_ADDR`.
 
+To load a file from the SD card (see `MBOOT_SDCARD_ADDR`), assuming it is a
+16GiB card, use:
+
+    fwupdate.update_mpy('firmware.dfu.gz', 0x1_00000000, 0x4_00000000, addr_64bit=True)
+
 Signed and encrypted DFU support
 --------------------------------
 
diff --git a/ports/stm32/mboot/main.c b/ports/stm32/mboot/main.c
index 714b20ff09913..976f0e54d27a6 100644
--- a/ports/stm32/mboot/main.c
+++ b/ports/stm32/mboot/main.c
@@ -37,6 +37,7 @@
 #include "irq.h"
 #include "mboot.h"
 #include "powerctrl.h"
+#include "sdcard.h"
 #include "dfu.h"
 #include "pack.h"
 
@@ -653,6 +654,16 @@ void hw_read(mboot_addr_t addr, size_t len, uint8_t *buf) {
         mp_spiflash_read(MBOOT_SPIFLASH2_SPIFLASH, addr - MBOOT_SPIFLASH2_ADDR, len, buf);
     } else
     #endif
+    #if defined(MBOOT_SDCARD_ADDR)
+    if (MBOOT_SDCARD_ADDR <= addr && addr < MBOOT_SDCARD_ADDR + MBOOT_SDCARD_BYTE_SIZE) {
+        // Read address and length must be aligned.
+        if (addr % SDCARD_BLOCK_SIZE == 0 && len % SDCARD_BLOCK_SIZE == 0) {
+            sdcard_read_blocks(buf, (addr - MBOOT_SDCARD_ADDR) / SDCARD_BLOCK_SIZE, len / SDCARD_BLOCK_SIZE);
+        } else {
+            memset(buf, 0xff, len);
+        }
+    } else
+    #endif
     {
         // Other addresses, just read directly from memory
         memcpy(buf, (void *)(uintptr_t)addr, len);
@@ -1540,6 +1551,12 @@ void stm32_main(uint32_t initial_r0) {
     mp_spiflash_init(MBOOT_SPIFLASH2_SPIFLASH);
     #endif
 
+    #if defined(MBOOT_SDCARD_ADDR)
+    sdcard_init();
+    sdcard_select_sd();
+    sdcard_power_on();
+    #endif
+
     #if MBOOT_ENABLE_PACKING
     mboot_pack_init();
     #endif
diff --git a/ports/stm32/mboot/sdcard.c b/ports/stm32/mboot/sdcard.c
new file mode 100644
index 0000000000000..caf3dbf3c007e
--- /dev/null
+++ b/ports/stm32/mboot/sdcard.c
@@ -0,0 +1,13 @@
+// Include relevant source files for SD card only when it's needed and
+// configured at the C level (in mpconfigboard.h).
+
+#include "py/mpconfig.h"
+
+#if defined(MBOOT_SDCARD_ADDR)
+
+#define MICROPY_HW_DMA_ENABLE_AUTO_TURN_OFF (0)
+
+#include "ports/stm32/dma.c"
+#include "ports/stm32/sdcard.c"
+
+#endif
diff --git a/ports/stm32/sdcard.c b/ports/stm32/sdcard.c
index 12c9eb4446613..6f5892570baf2 100644
--- a/ports/stm32/sdcard.c
+++ b/ports/stm32/sdcard.c
@@ -688,6 +688,8 @@ mp_uint_t sdcard_write_blocks(const uint8_t *src, uint32_t block_num, uint32_t n
 //
 // Expose the SD card or MMC as an object with the block protocol.
 
+#if !BUILDING_MBOOT
+
 // There are singleton SDCard/MMCard objects
 #if MICROPY_HW_ENABLE_SDCARD
 const mp_obj_base_t pyb_sdcard_obj = {&pyb_sdcard_type};
@@ -905,4 +907,6 @@ void sdcard_init_vfs(fs_user_mount_t *vfs, int part) {
     vfs->blockdev.u.ioctl[1] = MP_OBJ_FROM_PTR(&pyb_sdcard_obj);
 }
 
+#endif // !BUILDING_MBOOT
+
 #endif // MICROPY_HW_ENABLE_SDCARD || MICROPY_HW_ENABLE_MMCARD
diff --git a/tools/ci.sh b/tools/ci.sh
index 4f6717fe936ec..5aed8a7dff1a6 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -292,6 +292,7 @@ function ci_stm32_pyb_build {
     make ${MAKEOPTS} -C ports/stm32 BOARD=PYBD_SF6 NANBOX=1 MICROPY_BLUETOOTH_NIMBLE=0 MICROPY_BLUETOOTH_BTSTACK=1
     make ${MAKEOPTS} -C ports/stm32/mboot BOARD=PYBV10 CFLAGS_EXTRA='-DMBOOT_FSLOAD=1 -DMBOOT_VFS_LFS2=1'
     make ${MAKEOPTS} -C ports/stm32/mboot BOARD=PYBD_SF6
+    make ${MAKEOPTS} -C ports/stm32/mboot BOARD=STM32F769DISC CFLAGS_EXTRA='-DMBOOT_ADDRESS_SPACE_64BIT=1 -DMBOOT_SDCARD_ADDR=0x100000000ULL -DMBOOT_SDCARD_BYTE_SIZE=0x400000000ULL -DMBOOT_FSLOAD=1 -DMBOOT_VFS_FAT=1'
 }
 
 function ci_stm32_nucleo_build {

From bf89e336b9e0b195eacfe26f3a72989a8a9c06f2 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 22 Mar 2022 12:14:34 +1100
Subject: [PATCH 1821/3533] stm32/boards/PYBD_SF2: Turn on SD card in mboot
 init if SD enabled.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/boards/PYBD_SF2/board_init.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/ports/stm32/boards/PYBD_SF2/board_init.c b/ports/stm32/boards/PYBD_SF2/board_init.c
index c3b54fa2f101a..ab15783a7ee4b 100644
--- a/ports/stm32/boards/PYBD_SF2/board_init.c
+++ b/ports/stm32/boards/PYBD_SF2/board_init.c
@@ -44,6 +44,11 @@ typedef struct _pyb_otp_t {
 void mboot_board_early_init(void) {
     // Enable 500mA on WBUS-DIP28
     mp_hal_pin_config(pyb_pin_W23, MP_HAL_PIN_MODE_INPUT, MP_HAL_PIN_PULL_UP, 0);
+
+    #if defined(MBOOT_SDCARD_ADDR)
+    // Configure EN_3V3 as an output pin so that SD card can be used
+    mp_hal_pin_config(pyb_pin_EN_3V3, MP_HAL_PIN_MODE_OUTPUT, MP_HAL_PIN_PULL_NONE, 0);
+    #endif
 }
 
 void board_early_init(void) {

From 80055c2cdc1a5376c609e50f3ae0710f27146b15 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 22 Mar 2022 11:42:52 +1100
Subject: [PATCH 1822/3533] stm32/mboot/fwupdate.py: Simplify calculation of
 CRC32.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/mboot/fwupdate.py | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/ports/stm32/mboot/fwupdate.py b/ports/stm32/mboot/fwupdate.py
index df1ff62846274..3e2535137044d 100644
--- a/ports/stm32/mboot/fwupdate.py
+++ b/ports/stm32/mboot/fwupdate.py
@@ -75,12 +75,10 @@ def dfu_read(filename):
         return None
 
     hdr = f.read(16)
-    crc = crc32(hdr[:-4], crc)
-    hdr = struct.unpack("<HHHH3sBI", hdr)
-
+    crc = crc32(hdr, crc)
     crc = ~crc & 0xFFFFFFFF
-    if crc != hdr[-1]:
-        print("CRC failed", crc, hdr[-1])
+    if crc != 0:
+        print("CRC failed", crc)
         return None
 
     return elems

From bc856a1e292a287962d629a074260a4cebcb000d Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Thu, 17 Jun 2021 12:51:37 +1000
Subject: [PATCH 1823/3533] stm32/mboot: Verify signature of fsload packed DFU
 files before writing.

When verifying the DFU contents, the signature of signed/encrypted files is
also now checked in this initial, dry-run stage.
---
 ports/stm32/mboot/fsload.c | 10 ++++------
 ports/stm32/mboot/main.c   | 16 ++++++++++------
 ports/stm32/mboot/mboot.h  |  2 +-
 ports/stm32/mboot/pack.c   |  5 ++++-
 ports/stm32/mboot/pack.h   |  2 +-
 5 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/ports/stm32/mboot/fsload.c b/ports/stm32/mboot/fsload.c
index 14864bb8956b1..a54cfe4c73d30 100644
--- a/ports/stm32/mboot/fsload.c
+++ b/ports/stm32/mboot/fsload.c
@@ -151,13 +151,11 @@ static int fsload_program_file(bool write_to_flash) {
             if (res != l) {
                 return -MBOOT_ERRNO_DFU_READ_ERROR;
             }
-            if (write_to_flash) {
-                res = do_write(elem_addr, buf, l);
-                if (res != 0) {
-                    return res;
-                }
-                elem_addr += l;
+            res = do_write(elem_addr, buf, l, !write_to_flash);
+            if (res != 0) {
+                return res;
             }
+            elem_addr += l;
             s -= l;
         }
 
diff --git a/ports/stm32/mboot/main.c b/ports/stm32/mboot/main.c
index 976f0e54d27a6..10a09fe3e15b6 100644
--- a/ports/stm32/mboot/main.c
+++ b/ports/stm32/mboot/main.c
@@ -715,11 +715,15 @@ void do_read(mboot_addr_t addr, size_t len, uint8_t *buf) {
     #endif
 }
 
-int do_write(uint32_t addr, const uint8_t *src8, size_t len) {
+int do_write(uint32_t addr, const uint8_t *src8, size_t len, bool dry_run) {
     #if MBOOT_ENABLE_PACKING
-    return mboot_pack_write(addr, src8, len);
+    return mboot_pack_write(addr, src8, len, dry_run);
     #else
-    return hw_write(addr, src8, len);
+    if (dry_run) {
+        return 0;
+    } else {
+        return hw_write(addr, src8, len);
+    }
     #endif
 }
 
@@ -844,7 +848,7 @@ void i2c_slave_process_rx_end(i2c_slave_t *i2c) {
             // Mark the 2 lower bits to indicate invalid app firmware
             buf[1] |= APP_VALIDITY_BITS;
         }
-        int ret = do_write(i2c_obj.cmd_wraddr, buf + 1, len);
+        int ret = do_write(i2c_obj.cmd_wraddr, buf + 1, len, false);
         if (ret < 0) {
             len = ret;
         } else {
@@ -866,7 +870,7 @@ void i2c_slave_process_rx_end(i2c_slave_t *i2c) {
             len = -1;
         } else {
             buf &= ~APP_VALIDITY_BITS;
-            int ret = do_write(APPLICATION_ADDR, (void*)&buf, 4);
+            int ret = do_write(APPLICATION_ADDR, (void*)&buf, 4, false);
             if (ret < 0) {
                 len = ret;
             } else {
@@ -940,7 +944,7 @@ static int dfu_process_dnload(void) {
     } else if (dfu_context.wBlockNum > 1) {
         // write data to memory
         uint32_t addr = (dfu_context.wBlockNum - 2) * DFU_XFER_SIZE + dfu_context.addr;
-        ret = do_write(addr, dfu_context.buf, dfu_context.wLength);
+        ret = do_write(addr, dfu_context.buf, dfu_context.wLength, false);
     }
     if (ret == 0) {
         return DFU_STATE_DNLOAD_IDLE;
diff --git a/ports/stm32/mboot/mboot.h b/ports/stm32/mboot/mboot.h
index 36acb313b6bf4..e64835bb44cdd 100644
--- a/ports/stm32/mboot/mboot.h
+++ b/ports/stm32/mboot/mboot.h
@@ -113,7 +113,7 @@ int hw_write(uint32_t addr, const uint8_t *src8, size_t len);
 
 int do_page_erase(uint32_t addr, uint32_t *next_addr);
 void do_read(mboot_addr_t addr, size_t len, uint8_t *buf);
-int do_write(uint32_t addr, const uint8_t *src8, size_t len);
+int do_write(uint32_t addr, const uint8_t *src8, size_t len, bool dry_run);
 
 const uint8_t *elem_search(const uint8_t *elem, uint8_t elem_id);
 int fsload_process(void);
diff --git a/ports/stm32/mboot/pack.c b/ports/stm32/mboot/pack.c
index 88529ec50a5e9..03ac6a4dc55ab 100644
--- a/ports/stm32/mboot/pack.c
+++ b/ports/stm32/mboot/pack.c
@@ -206,7 +206,7 @@ static int mboot_pack_handle_firmware(void) {
     }
 }
 
-int mboot_pack_write(uint32_t addr, const uint8_t *src8, size_t len) {
+int mboot_pack_write(uint32_t addr, const uint8_t *src8, size_t len, bool dry_run) {
     if (addr == APPLICATION_ADDR) {
         // Base address of main firmware, reset any previous state
         firmware_chunk_base_addr = 0;
@@ -274,6 +274,9 @@ int mboot_pack_write(uint32_t addr, const uint8_t *src8, size_t len) {
     }
 
     // Signature passed, we have valid chunk.
+    if (dry_run) {
+        return 0;
+    }
 
     if (firmware_chunk_buf.header.format == MBOOT_PACK_CHUNK_META) {
         // Ignore META chunks.
diff --git a/ports/stm32/mboot/pack.h b/ports/stm32/mboot/pack.h
index 195f297ca177d..3578d9d12784c 100644
--- a/ports/stm32/mboot/pack.h
+++ b/ports/stm32/mboot/pack.h
@@ -75,7 +75,7 @@ extern const uint8_t mboot_pack_secretbox_key[hydro_secretbox_KEYBYTES];
 // Implementation
 
 void mboot_pack_init(void);
-int mboot_pack_write(uint32_t addr, const uint8_t *src8, size_t len);
+int mboot_pack_write(uint32_t addr, const uint8_t *src8, size_t len, bool dry_run);
 
 #endif // MBOOT_ENABLE_PACKING
 

From bb0ca00b77b3ccb77bad857373df39556612444a Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Thu, 17 Jun 2021 12:55:18 +1000
Subject: [PATCH 1824/3533] stm32/mboot: Verify CRC32 of fsload DFU files
 before writing.

---
 ports/stm32/mboot/fsload.c | 13 ++++++++++++-
 ports/stm32/mboot/mboot.h  |  1 +
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/ports/stm32/mboot/fsload.c b/ports/stm32/mboot/fsload.c
index a54cfe4c73d30..2b674369f0814 100644
--- a/ports/stm32/mboot/fsload.c
+++ b/ports/stm32/mboot/fsload.c
@@ -27,6 +27,7 @@
 #include <string.h>
 
 #include "py/mphal.h"
+#include "lib/uzlib/tinf.h"
 #include "mboot.h"
 #include "pack.h"
 #include "vfs.h"
@@ -74,6 +75,7 @@ static inline int input_stream_read(size_t len, uint8_t *buf) {
 
 static int fsload_program_file(bool write_to_flash) {
     // Parse DFU
+    uint32_t crc = 0xffffffff;
     uint8_t buf[512];
     size_t file_offset;
 
@@ -83,6 +85,7 @@ static int fsload_program_file(bool write_to_flash) {
         return -MBOOT_ERRNO_DFU_READ_ERROR;
     }
     file_offset = 11;
+    crc = uzlib_crc32(buf, 11, crc);
 
     // Validate header, version 1
     if (memcmp(buf, "DfuSe\x01", 6) != 0) {
@@ -103,6 +106,7 @@ static int fsload_program_file(bool write_to_flash) {
         return -MBOOT_ERRNO_DFU_READ_ERROR;
     }
     file_offset += 274;
+    crc = uzlib_crc32(buf, 274, crc);
 
     // Validate target header, with alt being 0
     if (memcmp(buf, "Target\x00", 7) != 0) {
@@ -123,6 +127,7 @@ static int fsload_program_file(bool write_to_flash) {
             return -MBOOT_ERRNO_DFU_READ_ERROR;
         }
         file_offset += 8;
+        crc = uzlib_crc32(buf, 8, crc);
 
         // Get element destination address and size
         uint32_t elem_addr = get_le32(buf);
@@ -151,6 +156,7 @@ static int fsload_program_file(bool write_to_flash) {
             if (res != l) {
                 return -MBOOT_ERRNO_DFU_READ_ERROR;
             }
+            crc = uzlib_crc32(buf, l, crc);
             res = do_write(elem_addr, buf, l, !write_to_flash);
             if (res != 0) {
                 return res;
@@ -176,7 +182,12 @@ static int fsload_program_file(bool write_to_flash) {
         return -MBOOT_ERRNO_DFU_READ_ERROR;
     }
 
-    // TODO validate CRC32
+    // The final 4 bytes of the file are the expected CRC32, so including these
+    // bytes in the CRC calculation should yield a final CRC32 of 0.
+    crc = uzlib_crc32(buf, 16, crc);
+    if (crc != 0) {
+        return -MBOOT_ERRNO_DFU_INVALID_CRC;
+    }
 
     return 0;
 }
diff --git a/ports/stm32/mboot/mboot.h b/ports/stm32/mboot/mboot.h
index e64835bb44cdd..0e04f67f4a8e3 100644
--- a/ports/stm32/mboot/mboot.h
+++ b/ports/stm32/mboot/mboot.h
@@ -56,6 +56,7 @@ enum {
     MBOOT_ERRNO_DFU_INVALID_SIZE,
     MBOOT_ERRNO_DFU_TOO_MANY_TARGETS,
     MBOOT_ERRNO_DFU_READ_ERROR,
+    MBOOT_ERRNO_DFU_INVALID_CRC,
 
     MBOOT_ERRNO_FSLOAD_NO_FSLOAD = 220,
     MBOOT_ERRNO_FSLOAD_NO_MOUNT,

From 66fe3d5cb5b42a48c0b72480bc1fc54994a91af1 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 22 Mar 2022 16:01:09 +1100
Subject: [PATCH 1825/3533] stm32: Support building for STM32F745.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/adc.c     | 1 +
 ports/stm32/pyb_i2c.c | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/ports/stm32/adc.c b/ports/stm32/adc.c
index 1d4beafa45f5c..c5ca6306e4088 100644
--- a/ports/stm32/adc.c
+++ b/ports/stm32/adc.c
@@ -146,6 +146,7 @@
 #define VBAT_DIV (4)
 #elif defined(STM32F722xx) || defined(STM32F723xx) || \
     defined(STM32F732xx) || defined(STM32F733xx) || \
+    defined(STM32F745xx) || \
     defined(STM32F746xx) || defined(STM32F765xx) || \
     defined(STM32F767xx) || defined(STM32F769xx)
 #define VBAT_DIV (4)
diff --git a/ports/stm32/pyb_i2c.c b/ports/stm32/pyb_i2c.c
index 70a8e9f0914b1..5cd7c0c8b06d0 100644
--- a/ports/stm32/pyb_i2c.c
+++ b/ports/stm32/pyb_i2c.c
@@ -137,7 +137,7 @@ const pyb_i2c_obj_t pyb_i2c_obj[] = {
 
 #define PYB_I2C_TIMINGR (1)
 
-#if defined(STM32F746xx)
+#if defined(STM32F745xx) || defined(STM32F746xx)
 
 // The value 0x40912732 was obtained from the DISCOVERY_I2Cx_TIMING constant
 // defined in the STM32F7Cube file Drivers/BSP/STM32F746G-Discovery/stm32f7456g_discovery.h

From fe8b47e29fb40566fa35e97e02ab06cfab19bf6e Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Thu, 10 Mar 2022 00:54:44 +0200
Subject: [PATCH 1826/3533] ports: Allow boards to define additional network
 interfaces.

---
 ports/mimxrt/mpconfigport.h | 5 +++++
 ports/rp2/mpconfigport.h    | 5 +++++
 ports/stm32/mpconfigport.h  | 5 +++++
 3 files changed, 15 insertions(+)

diff --git a/ports/mimxrt/mpconfigport.h b/ports/mimxrt/mpconfigport.h
index ca8be01f78e78..b4df533f4ad57 100644
--- a/ports/mimxrt/mpconfigport.h
+++ b/ports/mimxrt/mpconfigport.h
@@ -267,8 +267,13 @@ extern const struct _mp_obj_type_t network_lan_type;
     SOCKET_BUILTIN_MODULE \
     NETWORK_BUILTIN_MODULE \
 
+#ifndef MICROPY_BOARD_NETWORK_INTERFACES
+#define MICROPY_BOARD_NETWORK_INTERFACES
+#endif
+
 #define MICROPY_PORT_NETWORK_INTERFACES \
     MICROPY_HW_NIC_ETH  \
+    MICROPY_BOARD_NETWORK_INTERFACES \
 
 #define MICROPY_HW_PIT_NUM_CHANNELS 3
 
diff --git a/ports/rp2/mpconfigport.h b/ports/rp2/mpconfigport.h
index 1fb0211e888c4..2919ed0181f35 100644
--- a/ports/rp2/mpconfigport.h
+++ b/ports/rp2/mpconfigport.h
@@ -192,8 +192,13 @@ extern const struct _mod_network_nic_type_t mod_network_nic_type_nina;
     SOCKET_BUILTIN_MODULE \
     NETWORK_BUILTIN_MODULE \
 
+#ifndef MICROPY_BOARD_NETWORK_INTERFACES
+#define MICROPY_BOARD_NETWORK_INTERFACES
+#endif
+
 #define MICROPY_PORT_NETWORK_INTERFACES \
     MICROPY_HW_NIC_NINAW10  \
+    MICROPY_BOARD_NETWORK_INTERFACES \
 
 #ifndef MICROPY_BOARD_ROOT_POINTERS
 #define MICROPY_BOARD_ROOT_POINTERS
diff --git a/ports/stm32/mpconfigport.h b/ports/stm32/mpconfigport.h
index 60f6d45fc48c6..18a2edc426eac 100644
--- a/ports/stm32/mpconfigport.h
+++ b/ports/stm32/mpconfigport.h
@@ -280,11 +280,16 @@ extern const struct _mod_network_nic_type_t mod_network_nic_type_cc3k;
     PYB_BUILTIN_MODULE \
     STM_BUILTIN_MODULE \
 
+#ifndef MICROPY_BOARD_NETWORK_INTERFACES
+#define MICROPY_BOARD_NETWORK_INTERFACES
+#endif
+
 #define MICROPY_PORT_NETWORK_INTERFACES \
     MICROPY_HW_NIC_ETH  \
     MICROPY_HW_NIC_CYW43 \
     MICROPY_HW_NIC_WIZNET5K \
     MICROPY_HW_NIC_CC3K \
+    MICROPY_BOARD_NETWORK_INTERFACES \
 
 #define MP_STATE_PORT MP_STATE_VM
 

From df86cef59ac3f92fcdc433e4679c8243a8c3159d Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Wed, 9 Mar 2022 23:28:52 +0200
Subject: [PATCH 1827/3533] rp2: Allow Overriding cmake frozen manifest from
 the command line.

If MICROPY_FROZEN_MANIFEST is set from the cmake command line, then it will
override the default and any manifest set by the board.
---
 ports/rp2/CMakeLists.txt | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/ports/rp2/CMakeLists.txt b/ports/rp2/CMakeLists.txt
index 0ceb03967516e..bf3a51be99993 100644
--- a/ports/rp2/CMakeLists.txt
+++ b/ports/rp2/CMakeLists.txt
@@ -33,7 +33,9 @@ if(NOT EXISTS ${MICROPY_BOARD_DIR}/mpconfigboard.cmake)
     message(FATAL_ERROR "Invalid MICROPY_BOARD specified: ${MICROPY_BOARD}")
 endif()
 
-# Include board config
+set(MICROPY_USER_FROZEN_MANIFEST ${MICROPY_FROZEN_MANIFEST})
+
+# Include board config, it may override MICROPY_FROZEN_MANIFEST
 include(${MICROPY_BOARD_DIR}/mpconfigboard.cmake) 
 
 # Set the PICO_BOARD if it's not already set (allow a board to override it).
@@ -216,9 +218,13 @@ if (MICROPY_PY_NETWORK_NINAW10)
     )
 endif()
 
-# Define mpy-cross flags and frozen manifest
+# Define mpy-cross flags
 set(MICROPY_CROSS_FLAGS -march=armv7m)
-if (NOT MICROPY_FROZEN_MANIFEST)
+
+# Set the frozen manifest file
+if (MICROPY_USER_FROZEN_MANIFEST)
+    set(MICROPY_FROZEN_MANIFEST ${MICROPY_USER_FROZEN_MANIFEST})
+elseif (NOT MICROPY_FROZEN_MANIFEST)
     set(MICROPY_FROZEN_MANIFEST ${PROJECT_SOURCE_DIR}/boards/manifest.py)
 endif()
 

From 73623d04d586d90a53836ba2e46cba271dc846c8 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 25 Mar 2022 11:38:19 +1100
Subject: [PATCH 1828/3533] github/workflows: Add new workflow to test
 embedding example.

Signed-off-by: Damien George <damien@micropython.org>
---
 .github/workflows/examples.yml | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 .github/workflows/examples.yml

diff --git a/.github/workflows/examples.yml b/.github/workflows/examples.yml
new file mode 100644
index 0000000000000..53a817af2b313
--- /dev/null
+++ b/.github/workflows/examples.yml
@@ -0,0 +1,21 @@
+name: Check examples
+
+on:
+  push:
+  pull_request:
+    paths:
+      - '.github/workflows/*.yml'
+      - 'examples/**'
+      - 'ports/unix/**'
+      - 'py/**'
+      - 'shared/**'
+
+jobs:
+  embedding:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Build
+      run: make -C examples/embedding
+    - name: Run
+      run: test "$(./examples/embedding/hello-embed)" = "Hello world of easy embedding!"

From b083cdba2b59e7ad68a718cec9d015ab7aede4c8 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 25 Mar 2022 11:47:30 +1100
Subject: [PATCH 1829/3533] examples/embedding: Fix build with updated sys and
 os modules.

Signed-off-by: Damien George <damien@micropython.org>
---
 examples/embedding/Makefile.upylib        | 1 -
 examples/embedding/mpconfigport_minimal.h | 7 ++-----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/examples/embedding/Makefile.upylib b/examples/embedding/Makefile.upylib
index 14260a719ff30..80f7eed159bcc 100644
--- a/examples/embedding/Makefile.upylib
+++ b/examples/embedding/Makefile.upylib
@@ -137,7 +137,6 @@ SRC_C = $(addprefix ports/unix/,\
 	unix_mphal.c \
 	input.c \
 	modmachine.c \
-	modos.c \
 	moduselect.c \
 	alloc.c \
 	coverage.c \
diff --git a/examples/embedding/mpconfigport_minimal.h b/examples/embedding/mpconfigport_minimal.h
index 07180a3225c18..6cc84dcbc1e41 100644
--- a/examples/embedding/mpconfigport_minimal.h
+++ b/examples/embedding/mpconfigport_minimal.h
@@ -75,21 +75,18 @@
 #define MICROPY_PY_SYS_EXIT         (0)
 #define MICROPY_PY_SYS_PLATFORM     "linux"
 #define MICROPY_PY_SYS_MAXSIZE      (0)
+#define MICROPY_PY_SYS_PATH_DEFAULT ".frozen"
 #define MICROPY_PY_SYS_STDFILES     (0)
 #define MICROPY_PY_CMATH            (0)
 #define MICROPY_PY_UCTYPES          (0)
 #define MICROPY_PY_UZLIB            (0)
 #define MICROPY_PY_UJSON            (0)
+#define MICROPY_PY_UOS              (1)
 #define MICROPY_PY_URE              (0)
 #define MICROPY_PY_UHEAPQ           (0)
 #define MICROPY_PY_UHASHLIB         (0)
 #define MICROPY_PY_UBINASCII        (0)
 
-extern const struct _mp_obj_module_t mp_module_os;
-
-#define MICROPY_PORT_BUILTIN_MODULES \
-    { MP_ROM_QSTR(MP_QSTR_uos), MP_ROM_PTR(&mp_module_os) }, \
-
 #define MICROPY_PORT_ROOT_POINTERS \
 
 //////////////////////////////////////////

From e7a92c0e699a7c95ea322e3105f587ae1a71bedf Mon Sep 17 00:00:00 2001
From: David Lechner <david@pybricks.com>
Date: Wed, 23 Mar 2022 20:39:00 -0500
Subject: [PATCH 1830/3533] tests/cmdline/cmd_showbc: Fix spelling of sequence.

---
 tests/cmdline/cmd_showbc.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/cmdline/cmd_showbc.py b/tests/cmdline/cmd_showbc.py
index a960c15c4a973..e5874f990ab90 100644
--- a/tests/cmdline/cmd_showbc.py
+++ b/tests/cmdline/cmd_showbc.py
@@ -40,7 +40,7 @@ def f():
     # slice
     a = b[::]
 
-    # sequenc unpacking
+    # sequence unpacking
     a, b = c
     a, *a = a
 

From e7f6b9f4f76142ecd554106984a8520a0ada9d03 Mon Sep 17 00:00:00 2001
From: David Lechner <david@pybricks.com>
Date: Wed, 23 Mar 2022 14:18:23 -0500
Subject: [PATCH 1831/3533] tools/gen-cpydiff: Skip Black fmt comments.

Since cpydiff is code used as documentation, there are cases where we may
want to use Black's `fmt: on/off/skip` comments to avoid automatic
formatting.  However, we don't want these comments to be distracting in the
generated documentation.

This rewrites the code to omit these comments when generating the docs.

Signed-off-by: David Lechner <david@pybricks.com>
---
 tools/gen-cpydiff.py | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/tools/gen-cpydiff.py b/tools/gen-cpydiff.py
index 1d458d3dcd279..d4c8a5736d9ed 100644
--- a/tools/gen-cpydiff.py
+++ b/tools/gen-cpydiff.py
@@ -85,6 +85,16 @@ def readfiles():
             class_, desc, cause, workaround, code = [
                 x.rstrip() for x in list(filter(None, re.split(SPLIT, text)))
             ]
+
+            # remove black `fmt: on/off/skip` comments
+            code = "".join(
+                # skip comments are inline, so we replace just the comment
+                re.sub(r"\s*# fmt: skip", "", x)
+                for x in code.splitlines(keepends=True)
+                # on/off comments are on their own line, so we omit the entire line
+                if not re.match(r"\s*# fmt: (on|off)\s*", x)
+            )
+
             output = Output(test, class_, desc, cause, workaround, code, "", "", "")
             files.append(output)
         except IndexError:

From 768879f999f4739e8507ae6013b5e9271618656e Mon Sep 17 00:00:00 2001
From: David Lechner <david@pybricks.com>
Date: Wed, 23 Mar 2022 14:29:52 -0500
Subject: [PATCH 1832/3533] py/smallint: Introduce MP_SMALL_INT_BITS macro.

This adds a new MP_SMALL_INT_BITS macro that is a compile-time constant
that contains the number of bits available in an MP_SMALL_INT.

We can use this in place of the runtime function mp_small_int_bits().

Signed-off-by: David Lechner <david@pybricks.com>
---
 py/persistentcode.c | 19 ++-----------------
 py/smallint.h       |  7 +++++++
 2 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/py/persistentcode.c b/py/persistentcode.c
index 6110ae97f007a..f64e383a61690 100644
--- a/py/persistentcode.c
+++ b/py/persistentcode.c
@@ -48,21 +48,6 @@
 #define MPY_FEATURE_ARCH_DYNAMIC MPY_FEATURE_ARCH
 #endif
 
-#if MICROPY_PERSISTENT_CODE_LOAD || (MICROPY_PERSISTENT_CODE_SAVE && !MICROPY_DYNAMIC_COMPILER)
-// The bytecode will depend on the number of bits in a small-int, and
-// this function computes that (could make it a fixed constant, but it
-// would need to be defined in mpconfigport.h).
-STATIC int mp_small_int_bits(void) {
-    mp_int_t i = MP_SMALL_INT_MAX;
-    int n = 1;
-    while (i != 0) {
-        i >>= 1;
-        ++n;
-    }
-    return n;
-}
-#endif
-
 typedef struct _bytecode_prelude_t {
     uint n_state;
     uint n_exc_stack;
@@ -420,7 +405,7 @@ mp_compiled_module_t mp_raw_code_load(mp_reader_t *reader, mp_module_context_t *
     if (header[0] != 'M'
         || header[1] != MPY_VERSION
         || MPY_FEATURE_DECODE_FLAGS(header[2]) != MPY_FEATURE_FLAGS
-        || header[3] > mp_small_int_bits()) {
+        || header[3] > MP_SMALL_INT_BITS) {
         mp_raise_ValueError(MP_ERROR_TEXT("incompatible .mpy file"));
     }
     if (MPY_FEATURE_DECODE_ARCH(header[2]) != MP_NATIVE_ARCH_NONE) {
@@ -609,7 +594,7 @@ void mp_raw_code_save(mp_compiled_module_t *cm, mp_print_t *print) {
         #if MICROPY_DYNAMIC_COMPILER
         mp_dynamic_compiler.small_int_bits,
         #else
-        mp_small_int_bits(),
+        MP_SMALL_INT_BITS,
         #endif
     };
     if (cm->has_native) {
diff --git a/py/smallint.h b/py/smallint.h
index 67daf9b9fa11f..584e0018d1ba3 100644
--- a/py/smallint.h
+++ b/py/smallint.h
@@ -61,6 +61,13 @@
 
 #define MP_SMALL_INT_MAX ((mp_int_t)(~(MP_SMALL_INT_MIN)))
 
+// https://stackoverflow.com/a/4589384/1976323
+// Number of bits in inttype_MAX, or in any (1<<k)-1 where 0 <= k < 2040
+#define MP_IMAX_BITS(m) ((m) / ((m) % 255 + 1) / 255 % 255 * 8 + 7 - 86 / ((m) % 255 + 12))
+
+// The number of bits in a MP_SMALL_INT including the sign bit.
+#define MP_SMALL_INT_BITS (MP_IMAX_BITS(MP_SMALL_INT_MAX) + 1)
+
 bool mp_small_int_mul_overflow(mp_int_t x, mp_int_t y);
 mp_int_t mp_small_int_modulo(mp_int_t dividend, mp_int_t divisor);
 mp_int_t mp_small_int_floor_divide(mp_int_t num, mp_int_t denom);

From 9e3e67b1d8bf0fd5ee612b3c828ae549f76d1407 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 25 Mar 2022 12:35:49 +1100
Subject: [PATCH 1833/3533] py/objgenerator: Fix unused variables when native
 gen extracts prelude.

Some compilers will warn about unused variables like scope_flags.  So use
MP_BC_PRELUDE_SIG_DECODE() which will silence these warnings.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/objgenerator.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/py/objgenerator.c b/py/objgenerator.c
index cbe79e66a5c62..850de3fb68e5a 100644
--- a/py/objgenerator.c
+++ b/py/objgenerator.c
@@ -103,13 +103,10 @@ STATIC mp_obj_t native_gen_wrap_call(mp_obj_t self_in, size_t n_args, size_t n_k
 
     // Extract n_state from the prelude.
     const uint8_t *ip = prelude_ptr;
-    size_t n_state, n_exc_stack_unused, scope_flags, n_pos_args, n_kwonly_args, n_def_args;
-    MP_BC_PRELUDE_SIG_DECODE_INTO(ip, n_state, n_exc_stack_unused, scope_flags, n_pos_args, n_kwonly_args, n_def_args);
-    size_t n_exc_stack = 0;
+    MP_BC_PRELUDE_SIG_DECODE(ip);
 
-    // Allocate the generator object, with room for local stack and exception stack
-    mp_obj_gen_instance_t *o = m_new_obj_var(mp_obj_gen_instance_t, byte,
-        n_state * sizeof(mp_obj_t) + n_exc_stack * sizeof(mp_exc_stack_t));
+    // Allocate the generator object, with room for local stack (exception stack not needed).
+    mp_obj_gen_instance_t *o = m_new_obj_var(mp_obj_gen_instance_t, byte, n_state * sizeof(mp_obj_t));
     o->base.type = &mp_type_gen_instance;
 
     // Parse the input arguments and set up the code state

From 538c3c0a5540b4018cedd442b585666130fc8def Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 16 Mar 2022 09:37:58 +1100
Subject: [PATCH 1834/3533] py: Change jump opcodes to emit 1-byte jump offset
 when possible.

This commit introduces changes:

- All jump opcodes are changed to have variable length arguments, of either
  1 or 2 bytes (previously they were fixed at 2 bytes).  In most cases only
  1 byte is needed to encode the short jump offset, saving bytecode size.

- The bytecode emitter now selects 1 byte jump arguments when the jump
  offset is guaranteed to fit in 1 byte.  This is achieved by checking if
  the code size changed during the last pass and, if it did (if it shrank),
  then requesting that the compiler make another pass to get the correct
  offsets of the now-smaller code.  This can continue multiple times until
  the code stabilises.  The code can only ever shrink so this iteration is
  guaranteed to complete.  In most cases no extra passes are needed, the
  original 4 passes are enough to get it right by the 4th pass (because the
  2nd pass computes roughly the correct labels and the 3rd pass computes
  the correct size for the jump argument).

This change to the jump opcode encoding reduces .mpy files and RAM usage
(when bytecode is in RAM) by about 2% on average.

The performance of the VM is not impacted, at least within measurment of
the performance benchmark suite.

Code size is reduced for builds that include a decent amount of frozen
bytecode.  ARM Cortex-M builds without any frozen code increase by about
350 bytes.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/bc.c                            |   6 +-
 py/bc0.h                           |  34 +-
 py/compile.c                       |  12 +-
 py/emit.h                          |   6 +-
 py/emitbc.c                        | 139 ++++---
 py/emitnative.c                    |   4 +-
 py/showbc.c                        |  24 +-
 py/vm.c                            |  26 +-
 tests/cmdline/cmd_parsetree.py.exp |  78 ++--
 tests/cmdline/cmd_showbc.py.exp    | 614 ++++++++++++++---------------
 tests/run-tests.py                 |   1 +
 tests/stress/bytecode_limit.py     |  26 ++
 tests/stress/bytecode_limit.py.exp |   1 +
 tools/mpy-tool.py                  |  49 ++-
 14 files changed, 583 insertions(+), 437 deletions(-)
 create mode 100644 tests/stress/bytecode_limit.py
 create mode 100644 tests/stress/bytecode_limit.py.exp

diff --git a/py/bc.c b/py/bc.c
index b98df39e28cd3..2a21ffd4b7749 100644
--- a/py/bc.c
+++ b/py/bc.c
@@ -335,7 +335,11 @@ uint mp_opcode_format(const byte *ip, size_t *opcode_size, bool count_var_uint)
                 }
             }
         } else if (f == MP_BC_FORMAT_OFFSET) {
-            ip += 2;
+            if ((*ip & 0x80) == 0) {
+                ip += 1;
+            } else {
+                ip += 2;
+            }
         }
         ip += extra_byte;
     }
diff --git a/py/bc0.h b/py/bc0.h
index 842034ebfb6e9..50c4954b08d85 100644
--- a/py/bc0.h
+++ b/py/bc0.h
@@ -28,6 +28,18 @@
 
 // MicroPython bytecode opcodes, grouped based on the format of the opcode
 
+// All opcodes are encoded as a byte with an optional argument.  Arguments are
+// variable-length encoded so they can be as small as possible.  The possible
+// encodings for arguments are (ip[0] is the opcode):
+//
+//  - unsigned relative bytecode offset:
+//      - if ip[1] high bit is clear then: arg = ip[1]
+//      - if ip[1] high bit is set then:   arg = ip[1] & 0x7f | ip[2] << 7
+//
+//  - signed relative bytecode offset:
+//      - if ip[1] high bit is clear then: arg = ip[1] - 0x40
+//      - if ip[1] high bit is set then:   arg = (ip[1] & 0x7f | ip[2] << 7) - 0x4000
+
 #define MP_BC_MASK_FORMAT                   (0xf0)
 #define MP_BC_MASK_EXTRA_BYTE               (0x9e)
 
@@ -101,17 +113,17 @@
 #define MP_BC_ROT_TWO                       (MP_BC_BASE_BYTE_O + 0x0a)
 #define MP_BC_ROT_THREE                     (MP_BC_BASE_BYTE_O + 0x0b)
 
-#define MP_BC_JUMP                          (MP_BC_BASE_JUMP_E + 0x02) // rel byte code offset, 16-bit signed, in excess
-#define MP_BC_POP_JUMP_IF_TRUE              (MP_BC_BASE_JUMP_E + 0x03) // rel byte code offset, 16-bit signed, in excess
-#define MP_BC_POP_JUMP_IF_FALSE             (MP_BC_BASE_JUMP_E + 0x04) // rel byte code offset, 16-bit signed, in excess
-#define MP_BC_JUMP_IF_TRUE_OR_POP           (MP_BC_BASE_JUMP_E + 0x05) // rel byte code offset, 16-bit signed, in excess
-#define MP_BC_JUMP_IF_FALSE_OR_POP          (MP_BC_BASE_JUMP_E + 0x06) // rel byte code offset, 16-bit signed, in excess
-#define MP_BC_UNWIND_JUMP                   (MP_BC_BASE_JUMP_E + 0x00) // rel byte code offset, 16-bit signed, in excess; then a byte
-#define MP_BC_SETUP_WITH                    (MP_BC_BASE_JUMP_E + 0x07) // rel byte code offset, 16-bit unsigned
-#define MP_BC_SETUP_EXCEPT                  (MP_BC_BASE_JUMP_E + 0x08) // rel byte code offset, 16-bit unsigned
-#define MP_BC_SETUP_FINALLY                 (MP_BC_BASE_JUMP_E + 0x09) // rel byte code offset, 16-bit unsigned
-#define MP_BC_POP_EXCEPT_JUMP               (MP_BC_BASE_JUMP_E + 0x0a) // rel byte code offset, 16-bit unsigned
-#define MP_BC_FOR_ITER                      (MP_BC_BASE_JUMP_E + 0x0b) // rel byte code offset, 16-bit unsigned
+#define MP_BC_UNWIND_JUMP                   (MP_BC_BASE_JUMP_E + 0x00) // signed relative bytecode offset; then a byte
+#define MP_BC_JUMP                          (MP_BC_BASE_JUMP_E + 0x02) // signed relative bytecode offset
+#define MP_BC_POP_JUMP_IF_TRUE              (MP_BC_BASE_JUMP_E + 0x03) // signed relative bytecode offset
+#define MP_BC_POP_JUMP_IF_FALSE             (MP_BC_BASE_JUMP_E + 0x04) // signed relative bytecode offset
+#define MP_BC_JUMP_IF_TRUE_OR_POP           (MP_BC_BASE_JUMP_E + 0x05) // signed relative bytecode offset
+#define MP_BC_JUMP_IF_FALSE_OR_POP          (MP_BC_BASE_JUMP_E + 0x06) // signed relative bytecode offset
+#define MP_BC_SETUP_WITH                    (MP_BC_BASE_JUMP_E + 0x07) // unsigned relative bytecode offset
+#define MP_BC_SETUP_EXCEPT                  (MP_BC_BASE_JUMP_E + 0x08) // unsigned relative bytecode offset
+#define MP_BC_SETUP_FINALLY                 (MP_BC_BASE_JUMP_E + 0x09) // unsigned relative bytecode offset
+#define MP_BC_POP_EXCEPT_JUMP               (MP_BC_BASE_JUMP_E + 0x0a) // unsigned relative bytecode offset
+#define MP_BC_FOR_ITER                      (MP_BC_BASE_JUMP_E + 0x0b) // unsigned relative bytecode offset
 #define MP_BC_WITH_CLEANUP                  (MP_BC_BASE_BYTE_O + 0x0c)
 #define MP_BC_END_FINALLY                   (MP_BC_BASE_BYTE_O + 0x0d)
 #define MP_BC_GET_ITER                      (MP_BC_BASE_BYTE_O + 0x0e)
diff --git a/py/compile.c b/py/compile.c
index eb7389ec5fbaf..d61dabb9a5ac0 100644
--- a/py/compile.c
+++ b/py/compile.c
@@ -219,7 +219,7 @@ STATIC void mp_emit_common_start_pass(mp_emit_common_t *emit, pass_kind_t pass)
     } else if (pass > MP_PASS_STACK_SIZE) {
         emit->ct_cur_obj = emit->ct_cur_obj_base;
     }
-    if (pass == MP_PASS_EMIT) {
+    if (pass == MP_PASS_CODE_SIZE) {
         if (emit->ct_cur_child == 0) {
             emit->children = NULL;
         } else {
@@ -3020,7 +3020,7 @@ STATIC void check_for_doc_string(compiler_t *comp, mp_parse_node_t pn) {
     #endif
 }
 
-STATIC void compile_scope(compiler_t *comp, scope_t *scope, pass_kind_t pass) {
+STATIC bool compile_scope(compiler_t *comp, scope_t *scope, pass_kind_t pass) {
     comp->pass = pass;
     comp->scope_cur = scope;
     comp->next_label = 0;
@@ -3187,10 +3187,12 @@ STATIC void compile_scope(compiler_t *comp, scope_t *scope, pass_kind_t pass) {
         EMIT(return_value);
     }
 
-    EMIT(end_pass);
+    bool pass_complete = EMIT(end_pass);
 
     // make sure we match all the exception levels
     assert(comp->cur_except_level == 0);
+
+    return pass_complete;
 }
 
 #if MICROPY_EMIT_INLINE_ASM
@@ -3600,8 +3602,10 @@ mp_compiled_module_t mp_compile_to_raw_code(mp_parse_tree_t *parse_tree, qstr so
             }
 
             // final pass: emit code
+            // the emitter can request multiple of these passes
             if (comp->compile_error == MP_OBJ_NULL) {
-                compile_scope(comp, s, MP_PASS_EMIT);
+                while (!compile_scope(comp, s, MP_PASS_EMIT)) {
+                }
             }
         }
     }
diff --git a/py/emit.h b/py/emit.h
index 6f3593a0e8215..d4aea2e4db433 100644
--- a/py/emit.h
+++ b/py/emit.h
@@ -43,7 +43,7 @@ typedef enum {
     MP_PASS_SCOPE = 1,      // work out id's and their kind, and number of labels
     MP_PASS_STACK_SIZE = 2, // work out maximum stack size
     MP_PASS_CODE_SIZE = 3,  // work out code size and label offsets
-    MP_PASS_EMIT = 4,       // emit code
+    MP_PASS_EMIT = 4,       // emit code (may be run multiple times if the emitter requests it)
 } pass_kind_t;
 
 #define MP_EMIT_STAR_FLAG_SINGLE (0x01)
@@ -116,7 +116,7 @@ typedef struct _emit_method_table_t {
     #endif
 
     void (*start_pass)(emit_t *emit, pass_kind_t pass, scope_t *scope);
-    void (*end_pass)(emit_t *emit);
+    bool (*end_pass)(emit_t *emit);
     bool (*last_emit_was_return_value)(emit_t *emit);
     void (*adjust_stack_size)(emit_t *emit, mp_int_t delta);
     void (*set_source_line)(emit_t *emit, mp_uint_t line);
@@ -233,7 +233,7 @@ void emit_native_xtensa_free(emit_t *emit);
 void emit_native_xtensawin_free(emit_t *emit);
 
 void mp_emit_bc_start_pass(emit_t *emit, pass_kind_t pass, scope_t *scope);
-void mp_emit_bc_end_pass(emit_t *emit);
+bool mp_emit_bc_end_pass(emit_t *emit);
 bool mp_emit_bc_last_emit_was_return_value(emit_t *emit);
 void mp_emit_bc_adjust_stack_size(emit_t *emit, mp_int_t delta);
 void mp_emit_bc_set_source_line(emit_t *emit, mp_uint_t line);
diff --git a/py/emitbc.c b/py/emitbc.c
index c04701ca7841c..14a72e2765f59 100644
--- a/py/emitbc.c
+++ b/py/emitbc.c
@@ -28,6 +28,7 @@
 #include <stdint.h>
 #include <stdio.h>
 #include <string.h>
+#include <unistd.h>
 #include <assert.h>
 
 #include "py/mpstate.h"
@@ -55,8 +56,8 @@ struct _emit_t {
     mp_uint_t last_source_line_offset;
     mp_uint_t last_source_line;
 
-    mp_uint_t max_num_labels;
-    mp_uint_t *label_offsets;
+    size_t max_num_labels;
+    size_t *label_offsets;
 
     size_t code_info_offset;
     size_t code_info_size;
@@ -76,11 +77,11 @@ emit_t *emit_bc_new(mp_emit_common_t *emit_common) {
 
 void emit_bc_set_max_num_labels(emit_t *emit, mp_uint_t max_num_labels) {
     emit->max_num_labels = max_num_labels;
-    emit->label_offsets = m_new(mp_uint_t, emit->max_num_labels);
+    emit->label_offsets = m_new(size_t, emit->max_num_labels);
 }
 
 void emit_bc_free(emit_t *emit) {
-    m_del(mp_uint_t, emit->label_offsets, emit->max_num_labels);
+    m_del(size_t, emit->label_offsets, emit->max_num_labels);
     m_del_obj(emit_t, emit);
 }
 
@@ -213,34 +214,55 @@ STATIC void emit_write_bytecode_byte_child(emit_t *emit, int stack_adj, byte b,
     #endif
 }
 
-// unsigned labels are relative to ip following this instruction, stored as 16 bits
-STATIC void emit_write_bytecode_byte_unsigned_label(emit_t *emit, int stack_adj, byte b1, mp_uint_t label) {
+// Emit a jump opcode to a destination label.
+// The offset to the label is relative to the ip following this instruction.
+// The offset is encoded as either 1 or 2 bytes, depending on how big it is.
+// The encoding of this jump opcode can change size from one pass to the next,
+// but it must only ever decrease in size on successive passes.
+STATIC void emit_write_bytecode_byte_label(emit_t *emit, int stack_adj, byte b1, mp_uint_t label) {
     mp_emit_bc_adjust_stack_size(emit, stack_adj);
-    mp_uint_t bytecode_offset;
-    if (emit->pass < MP_PASS_EMIT) {
-        bytecode_offset = 0;
-    } else {
-        bytecode_offset = emit->label_offsets[label] - emit->bytecode_offset - 3;
+
+    // Determine if the jump offset is signed or unsigned, based on the opcode.
+    const bool is_signed = b1 <= MP_BC_JUMP_IF_FALSE_OR_POP;
+
+    // Default to a 2-byte encoding (the largest) with an unknown jump offset.
+    unsigned int jump_encoding_size = 1;
+    ssize_t bytecode_offset = 0;
+
+    // Compute the jump size and offset only when code size is known.
+    if (emit->pass >= MP_PASS_CODE_SIZE) {
+        // The -2 accounts for this jump opcode taking 2 bytes (at least).
+        bytecode_offset = emit->label_offsets[label] - emit->bytecode_offset - 2;
+
+        // Check if the bytecode_offset is small enough to use a 1-byte encoding.
+        if ((is_signed && -64 <= bytecode_offset && bytecode_offset <= 63)
+            || (!is_signed && (size_t)bytecode_offset <= 127)) {
+            // Use a 1-byte jump offset.
+            jump_encoding_size = 0;
+        }
+
+        // Adjust the offset depending on the size of the encoding of the offset.
+        bytecode_offset -= jump_encoding_size;
+
+        assert(is_signed || bytecode_offset >= 0);
     }
-    byte *c = emit_get_cur_to_write_bytecode(emit, 3);
-    c[0] = b1;
-    c[1] = bytecode_offset;
-    c[2] = bytecode_offset >> 8;
-}
 
-// signed labels are relative to ip following this instruction, stored as 16 bits, in excess
-STATIC void emit_write_bytecode_byte_signed_label(emit_t *emit, int stack_adj, byte b1, mp_uint_t label) {
-    mp_emit_bc_adjust_stack_size(emit, stack_adj);
-    int bytecode_offset;
-    if (emit->pass < MP_PASS_EMIT) {
-        bytecode_offset = 0;
+    // Emit the opcode.
+    byte *c = emit_get_cur_to_write_bytecode(emit, 2 + jump_encoding_size);
+    c[0] = b1;
+    if (jump_encoding_size == 0) {
+        if (is_signed) {
+            bytecode_offset += 0x40;
+        }
+        assert(0 <= bytecode_offset && bytecode_offset <= 0x7f);
+        c[1] = bytecode_offset;
     } else {
-        bytecode_offset = emit->label_offsets[label] - emit->bytecode_offset - 3 + 0x8000;
+        if (is_signed) {
+            bytecode_offset += 0x4000;
+        }
+        c[1] = 0x80 | (bytecode_offset & 0x7f);
+        c[2] = bytecode_offset >> 7;
     }
-    byte *c = emit_get_cur_to_write_bytecode(emit, 3);
-    c[0] = b1;
-    c[1] = bytecode_offset;
-    c[2] = bytecode_offset >> 8;
 }
 
 void mp_emit_bc_start_pass(emit_t *emit, pass_kind_t pass, scope_t *scope) {
@@ -250,12 +272,6 @@ void mp_emit_bc_start_pass(emit_t *emit, pass_kind_t pass, scope_t *scope) {
     emit->scope = scope;
     emit->last_source_line_offset = 0;
     emit->last_source_line = 1;
-    #ifndef NDEBUG
-    // With debugging enabled labels are checked for unique assignment
-    if (pass < MP_PASS_EMIT && emit->label_offsets != NULL) {
-        memset(emit->label_offsets, -1, emit->max_num_labels * sizeof(mp_uint_t));
-    }
-    #endif
     emit->bytecode_offset = 0;
     emit->code_info_offset = 0;
 
@@ -315,9 +331,9 @@ void mp_emit_bc_start_pass(emit_t *emit, pass_kind_t pass, scope_t *scope) {
     }
 }
 
-void mp_emit_bc_end_pass(emit_t *emit) {
+bool mp_emit_bc_end_pass(emit_t *emit) {
     if (emit->pass == MP_PASS_SCOPE) {
-        return;
+        return true;
     }
 
     // check stack is back to zero size
@@ -344,6 +360,20 @@ void mp_emit_bc_end_pass(emit_t *emit) {
         emit->code_base = m_new0(byte, emit->code_info_size + emit->bytecode_size);
 
     } else if (emit->pass == MP_PASS_EMIT) {
+        // Code info and/or bytecode can shrink during this pass.
+        assert(emit->code_info_offset <= emit->code_info_size);
+        assert(emit->bytecode_offset <= emit->bytecode_size);
+
+        if (emit->code_info_offset != emit->code_info_size
+            || emit->bytecode_offset != emit->bytecode_size) {
+            // Code info and/or bytecode changed size in this pass, so request the
+            // compiler to do another pass with these updated sizes.
+            emit->code_info_size = emit->code_info_offset;
+            emit->bytecode_size = emit->bytecode_offset;
+            return false;
+        }
+
+        // Bytecode is finalised, assign it to the raw code object.
         mp_emit_glue_assign_bytecode(emit->scope->raw_code, emit->code_base,
             #if MICROPY_PERSISTENT_CODE_SAVE || MICROPY_DEBUG_PRINTERS
             emit->code_info_size + emit->bytecode_size,
@@ -354,6 +384,8 @@ void mp_emit_bc_end_pass(emit_t *emit) {
             #endif
             emit->scope->scope_flags);
     }
+
+    return true;
 }
 
 bool mp_emit_bc_last_emit_was_return_value(emit_t *emit) {
@@ -396,15 +428,16 @@ void mp_emit_bc_label_assign(emit_t *emit, mp_uint_t l) {
     if (emit->pass == MP_PASS_SCOPE) {
         return;
     }
+
+    // Label offsets can change from one pass to the next, but they must only
+    // decrease (ie code can only shrink).  There will be multiple MP_PASS_EMIT
+    // stages until the labels no longer change, which is when the code size
+    // stays constant after a MP_PASS_EMIT.
     assert(l < emit->max_num_labels);
-    if (emit->pass < MP_PASS_EMIT) {
-        // assign label offset
-        assert(emit->label_offsets[l] == (mp_uint_t)-1);
-        emit->label_offsets[l] = emit->bytecode_offset;
-    } else {
-        // ensure label offset has not changed from MP_PASS_CODE_SIZE to MP_PASS_EMIT
-        assert(emit->label_offsets[l] == emit->bytecode_offset);
-    }
+    assert(emit->pass == MP_PASS_STACK_SIZE || emit->bytecode_offset <= emit->label_offsets[l]);
+
+    // Assign label offset.
+    emit->label_offsets[l] = emit->bytecode_offset;
 }
 
 void mp_emit_bc_import(emit_t *emit, qstr qst, int kind) {
@@ -552,22 +585,22 @@ void mp_emit_bc_rot_three(emit_t *emit) {
 }
 
 void mp_emit_bc_jump(emit_t *emit, mp_uint_t label) {
-    emit_write_bytecode_byte_signed_label(emit, 0, MP_BC_JUMP, label);
+    emit_write_bytecode_byte_label(emit, 0, MP_BC_JUMP, label);
 }
 
 void mp_emit_bc_pop_jump_if(emit_t *emit, bool cond, mp_uint_t label) {
     if (cond) {
-        emit_write_bytecode_byte_signed_label(emit, -1, MP_BC_POP_JUMP_IF_TRUE, label);
+        emit_write_bytecode_byte_label(emit, -1, MP_BC_POP_JUMP_IF_TRUE, label);
     } else {
-        emit_write_bytecode_byte_signed_label(emit, -1, MP_BC_POP_JUMP_IF_FALSE, label);
+        emit_write_bytecode_byte_label(emit, -1, MP_BC_POP_JUMP_IF_FALSE, label);
     }
 }
 
 void mp_emit_bc_jump_if_or_pop(emit_t *emit, bool cond, mp_uint_t label) {
     if (cond) {
-        emit_write_bytecode_byte_signed_label(emit, -1, MP_BC_JUMP_IF_TRUE_OR_POP, label);
+        emit_write_bytecode_byte_label(emit, -1, MP_BC_JUMP_IF_TRUE_OR_POP, label);
     } else {
-        emit_write_bytecode_byte_signed_label(emit, -1, MP_BC_JUMP_IF_FALSE_OR_POP, label);
+        emit_write_bytecode_byte_label(emit, -1, MP_BC_JUMP_IF_FALSE_OR_POP, label);
     }
 }
 
@@ -581,9 +614,9 @@ void mp_emit_bc_unwind_jump(emit_t *emit, mp_uint_t label, mp_uint_t except_dept
                 emit_write_bytecode_raw_byte(emit, MP_BC_POP_TOP);
             }
         }
-        emit_write_bytecode_byte_signed_label(emit, 0, MP_BC_JUMP, label & ~MP_EMIT_BREAK_FROM_FOR);
+        emit_write_bytecode_byte_label(emit, 0, MP_BC_JUMP, label & ~MP_EMIT_BREAK_FROM_FOR);
     } else {
-        emit_write_bytecode_byte_signed_label(emit, 0, MP_BC_UNWIND_JUMP, label & ~MP_EMIT_BREAK_FROM_FOR);
+        emit_write_bytecode_byte_label(emit, 0, MP_BC_UNWIND_JUMP, label & ~MP_EMIT_BREAK_FROM_FOR);
         emit_write_bytecode_raw_byte(emit, ((label & MP_EMIT_BREAK_FROM_FOR) ? 0x80 : 0) | except_depth);
     }
 }
@@ -595,7 +628,7 @@ void mp_emit_bc_setup_block(emit_t *emit, mp_uint_t label, int kind) {
     // The SETUP_WITH opcode pops ctx_mgr from the top of the stack
     // and then pushes 3 entries: __exit__, ctx_mgr, as_value.
     int stack_adj = kind == MP_EMIT_SETUP_BLOCK_WITH ? 2 : 0;
-    emit_write_bytecode_byte_unsigned_label(emit, stack_adj, MP_BC_SETUP_WITH + kind, label);
+    emit_write_bytecode_byte_label(emit, stack_adj, MP_BC_SETUP_WITH + kind, label);
 }
 
 void mp_emit_bc_with_cleanup(emit_t *emit, mp_uint_t label) {
@@ -617,7 +650,7 @@ void mp_emit_bc_get_iter(emit_t *emit, bool use_stack) {
 }
 
 void mp_emit_bc_for_iter(emit_t *emit, mp_uint_t label) {
-    emit_write_bytecode_byte_unsigned_label(emit, 1, MP_BC_FOR_ITER, label);
+    emit_write_bytecode_byte_label(emit, 1, MP_BC_FOR_ITER, label);
 }
 
 void mp_emit_bc_for_iter_end(emit_t *emit) {
@@ -626,7 +659,7 @@ void mp_emit_bc_for_iter_end(emit_t *emit) {
 
 void mp_emit_bc_pop_except_jump(emit_t *emit, mp_uint_t label, bool within_exc_handler) {
     (void)within_exc_handler;
-    emit_write_bytecode_byte_unsigned_label(emit, 0, MP_BC_POP_EXCEPT_JUMP, label);
+    emit_write_bytecode_byte_label(emit, 0, MP_BC_POP_EXCEPT_JUMP, label);
 }
 
 void mp_emit_bc_unary_op(emit_t *emit, mp_unary_op_t op) {
diff --git a/py/emitnative.c b/py/emitnative.c
index ca34e89f64480..bddd661428471 100644
--- a/py/emitnative.c
+++ b/py/emitnative.c
@@ -652,7 +652,7 @@ static inline void emit_native_write_code_info_qstr(emit_t *emit, qstr qst) {
     mp_encode_uint(&emit->as->base, mp_asm_base_get_cur_to_write_bytes, mp_emit_common_use_qstr(emit->emit_common, qst));
 }
 
-STATIC void emit_native_end_pass(emit_t *emit) {
+STATIC bool emit_native_end_pass(emit_t *emit) {
     emit_native_global_exc_exit(emit);
 
     if (!emit->do_viper_types) {
@@ -736,6 +736,8 @@ STATIC void emit_native_end_pass(emit_t *emit) {
             #endif
             emit->scope->scope_flags, 0, 0);
     }
+
+    return true;
 }
 
 STATIC bool emit_native_last_emit_was_return_value(emit_t *emit) {
diff --git a/py/showbc.c b/py/showbc.c
index 8430739d8e483..178fa451a2e24 100644
--- a/py/showbc.c
+++ b/py/showbc.c
@@ -38,8 +38,28 @@
             unum = (unum << 7) + (*ip & 0x7f); \
         } while ((*ip++ & 0x80) != 0); \
 }
-#define DECODE_ULABEL do { unum = (ip[0] | (ip[1] << 8)); ip += 2; } while (0)
-#define DECODE_SLABEL do { unum = (ip[0] | (ip[1] << 8)) - 0x8000; ip += 2; } while (0)
+
+#define DECODE_ULABEL \
+    do { \
+        if (ip[0] & 0x80) { \
+            unum = ((ip[0] & 0x7f) | (ip[1] << 7)); \
+            ip += 2; \
+        } else { \
+            unum = ip[0]; \
+            ip += 1; \
+        } \
+    } while (0)
+
+#define DECODE_SLABEL \
+    do { \
+        if (ip[0] & 0x80) { \
+            unum = ((ip[0] & 0x7f) | (ip[1] << 7)) - 0x4000; \
+            ip += 2; \
+        } else { \
+            unum = ip[0] - 0x40; \
+            ip += 1; \
+        } \
+    } while (0)
 
 #if MICROPY_EMIT_BYTECODE_USES_QSTR_TABLE
 
diff --git a/py/vm.c b/py/vm.c
index 497a56962287d..990009c00c506 100644
--- a/py/vm.c
+++ b/py/vm.c
@@ -61,8 +61,30 @@
     do { \
         unum = (unum << 7) + (*ip & 0x7f); \
     } while ((*ip++ & 0x80) != 0)
-#define DECODE_ULABEL size_t ulab = (ip[0] | (ip[1] << 8)); ip += 2
-#define DECODE_SLABEL size_t slab = (ip[0] | (ip[1] << 8)) - 0x8000; ip += 2
+
+#define DECODE_ULABEL \
+    size_t ulab; \
+    do { \
+        if (ip[0] & 0x80) { \
+            ulab = ((ip[0] & 0x7f) | (ip[1] << 7)); \
+            ip += 2; \
+        } else { \
+            ulab = ip[0]; \
+            ip += 1; \
+        } \
+    } while (0)
+
+#define DECODE_SLABEL \
+    size_t slab; \
+    do { \
+        if (ip[0] & 0x80) { \
+            slab = ((ip[0] & 0x7f) | (ip[1] << 7)) - 0x4000; \
+            ip += 2; \
+        } else { \
+            slab = ip[0] - 0x40; \
+            ip += 1; \
+        } \
+    } while (0)
 
 #if MICROPY_EMIT_BYTECODE_USES_QSTR_TABLE
 
diff --git a/tests/cmdline/cmd_parsetree.py.exp b/tests/cmdline/cmd_parsetree.py.exp
index 53d62a5dbd029..6ee96b7caf293 100644
--- a/tests/cmdline/cmd_parsetree.py.exp
+++ b/tests/cmdline/cmd_parsetree.py.exp
@@ -39,52 +39,52 @@
 [  13]           \(rule\|arglist\)(164) (n=1)
                    id(b)
 ----------------
-File cmdline/cmd_parsetree.py, code block '<module>' (descriptor: \.\+, bytecode @\.\+ 64 bytes)
-Raw bytecode (code_info_size=13, bytecode_size=51):
- 20 16 01 60 28 23 23 24 24 24 24 24 25 2a 00 5f
- 4b 05 00 16 02 42 f8 7f 51 16 03 10 04 16 05 23
- 00 16 06 23 01 16 07 23 02 16 08 23 03 16 09 22
- 80 7b 16 0a 23 04 14 0b 11 05 36 01 16 0c 51 63
+File cmdline/cmd_parsetree.py, code block '<module>' (descriptor: \.\+, bytecode @\.\+ 62 bytes)
+Raw bytecode (code_info_size=13, bytecode_size=49):
+ 20 16 01 60 27 22 23 24 24 24 24 24 25 2a 00 5f
+ 4b 04 16 02 42 3a 51 16 03 10 04 16 05 23 00 16
+ 06 23 01 16 07 23 02 16 08 23 03 16 09 22 80 7b
+ 16 0a 23 04 14 0b 11 05 36 01 16 0c 51 63
 arg names:
 (N_STATE 5)
 (N_EXC_STACK 0)
   bc=0 line=1
   bc=0 line=4
-  bc=8 line=5
-  bc=11 line=6
-  bc=14 line=7
-  bc=18 line=8
-  bc=22 line=9
-  bc=26 line=10
-  bc=30 line=11
-  bc=34 line=12
-  bc=39 line=13
+  bc=7 line=5
+  bc=9 line=6
+  bc=12 line=7
+  bc=16 line=8
+  bc=20 line=9
+  bc=24 line=10
+  bc=28 line=11
+  bc=32 line=12
+  bc=37 line=13
 00 BUILD_TUPLE 0
 02 GET_ITER_STACK
-03 FOR_ITER 11
-06 STORE_NAME i
-08 JUMP 3
-11 LOAD_CONST_NONE
-12 STORE_NAME a
-14 LOAD_CONST_STRING 'str'
-16 STORE_NAME b
-18 LOAD_CONST_OBJ \.\+='a very long str that will not be interned'
-20 STORE_NAME c
-22 LOAD_CONST_OBJ \.\+=b'bytes'
-24 STORE_NAME d
-26 LOAD_CONST_OBJ \.\+=b'a very long bytes that will not be interned'
-28 STORE_NAME e
-30 LOAD_CONST_OBJ \.\+=123456789012345678901234567890
-32 STORE_NAME f
-34 LOAD_CONST_SMALL_INT 123
-37 STORE_NAME g
-39 LOAD_CONST_OBJ \.\+="fstring: '{}'"
-41 LOAD_METHOD format
-43 LOAD_NAME b
-45 CALL_METHOD n=1 nkw=0
-47 STORE_NAME h
-49 LOAD_CONST_NONE
-50 RETURN_VALUE
+03 FOR_ITER 9
+05 STORE_NAME i
+07 JUMP 3
+09 LOAD_CONST_NONE
+10 STORE_NAME a
+12 LOAD_CONST_STRING 'str'
+14 STORE_NAME b
+16 LOAD_CONST_OBJ \.\+='a very long str that will not be interned'
+18 STORE_NAME c
+20 LOAD_CONST_OBJ \.\+=b'bytes'
+22 STORE_NAME d
+24 LOAD_CONST_OBJ \.\+=b'a very long bytes that will not be interned'
+26 STORE_NAME e
+28 LOAD_CONST_OBJ \.\+=123456789012345678901234567890
+30 STORE_NAME f
+32 LOAD_CONST_SMALL_INT 123
+35 STORE_NAME g
+37 LOAD_CONST_OBJ \.\+="fstring: '{}'"
+39 LOAD_METHOD format
+41 LOAD_NAME b
+43 CALL_METHOD n=1 nkw=0
+45 STORE_NAME h
+47 LOAD_CONST_NONE
+48 RETURN_VALUE
 mem: total=\\d\+, current=\\d\+, peak=\\d\+
 stack: \\d\+ out of \\d\+
 GC: total: \\d\+, used: \\d\+, free: \\d\+
diff --git a/tests/cmdline/cmd_showbc.py.exp b/tests/cmdline/cmd_showbc.py.exp
index 031820fcd90ea..92501e1248015 100644
--- a/tests/cmdline/cmd_showbc.py.exp
+++ b/tests/cmdline/cmd_showbc.py.exp
@@ -47,10 +47,10 @@ arg names:
 42 IMPORT_STAR
 43 LOAD_CONST_NONE
 44 RETURN_VALUE
-File cmdline/cmd_showbc.py, code block 'f' (descriptor: \.\+, bytecode @\.\+ 48\[24\] bytes)
-Raw bytecode (code_info_size=8\[46\], bytecode_size=398):
+File cmdline/cmd_showbc.py, code block 'f' (descriptor: \.\+, bytecode @\.\+ 45\[68\] bytes)
+Raw bytecode (code_info_size=8\[46\], bytecode_size=372):
  a8 12 9\[bf\] 03 02 60 60 26 22 24 64 22 26 25 25 24
- 26 23 63 22 22 25 23 23 31 6d 25 65 25 25 69 68
+ 26 23 63 22 22 25 23 23 2f 6c 25 65 25 25 69 68
  26 65 27 6a 62 20 23 62 2a 29 69 24 25 28 67 26
 ########
 \.\+81 63
@@ -80,65 +80,65 @@ arg names:
   bc=59 line=26
   bc=62 line=27
   bc=65 line=28
-  bc=82 line=29
-  bc=95 line=32
-  bc=100 line=33
-  bc=105 line=36
-  bc=110 line=37
-  bc=115 line=38
-  bc=124 line=41
-  bc=132 line=44
-  bc=138 line=45
-  bc=143 line=48
-  bc=150 line=49
-  bc=160 line=52
-  bc=162 line=55
-  bc=162 line=56
-  bc=165 line=57
-  bc=167 line=60
-  bc=177 line=61
-  bc=186 line=62
-  bc=195 line=65
-  bc=199 line=66
-  bc=204 line=67
-  bc=212 line=68
-  bc=219 line=71
-  bc=225 line=72
-  bc=232 line=73
-  bc=242 line=74
-  bc=250 line=77
-  bc=254 line=78
-  bc=260 line=80
-  bc=263 line=81
-  bc=266 line=82
-  bc=273 line=83
-  bc=276 line=84
-  bc=283 line=85
-  bc=289 line=88
-  bc=296 line=89
-  bc=301 line=92
-  bc=307 line=93
-  bc=310 line=94
+  bc=80 line=29
+  bc=92 line=32
+  bc=97 line=33
+  bc=102 line=36
+  bc=107 line=37
+  bc=112 line=38
+  bc=121 line=41
+  bc=129 line=44
+  bc=135 line=45
+  bc=140 line=48
+  bc=147 line=49
+  bc=157 line=52
+  bc=159 line=55
+  bc=159 line=56
+  bc=162 line=57
+  bc=164 line=60
+  bc=174 line=61
+  bc=183 line=62
+  bc=192 line=65
+  bc=196 line=66
+  bc=201 line=67
+  bc=209 line=68
+  bc=216 line=71
+  bc=222 line=72
+  bc=229 line=73
+  bc=239 line=74
+  bc=247 line=77
+  bc=250 line=78
+  bc=255 line=80
+  bc=258 line=81
+  bc=260 line=82
+  bc=266 line=83
+  bc=268 line=84
+  bc=274 line=85
+  bc=279 line=88
+  bc=285 line=89
+  bc=289 line=92
+  bc=293 line=93
+  bc=295 line=94
 ########
-  bc=321 line=96
-  bc=329 line=98
-  bc=332 line=99
-  bc=335 line=100
-  bc=338 line=101
+  bc=303 line=96
+  bc=310 line=98
+  bc=313 line=99
+  bc=315 line=100
+  bc=317 line=101
 ########
-  bc=346 line=103
-  bc=354 line=106
-  bc=359 line=107
-  bc=365 line=110
-  bc=368 line=111
-  bc=374 line=114
-  bc=374 line=117
-  bc=379 line=118
-  bc=391 line=121
-  bc=391 line=122
-  bc=392 line=123
-  bc=394 line=126
-  bc=396 line=127
+  bc=323 line=103
+  bc=329 line=106
+  bc=333 line=107
+  bc=339 line=110
+  bc=342 line=111
+  bc=348 line=114
+  bc=348 line=117
+  bc=353 line=118
+  bc=365 line=121
+  bc=365 line=122
+  bc=366 line=123
+  bc=368 line=126
+  bc=370 line=127
 00 LOAD_CONST_NONE
 01 LOAD_CONST_FALSE
 02 BINARY_OP 27 __add__
@@ -195,216 +195,216 @@ arg names:
 68 DUP_TOP
 69 ROT_THREE
 70 BINARY_OP 2 __eq__
-71 JUMP_IF_FALSE_OR_POP 79
-74 LOAD_FAST 1
-75 BINARY_OP 2 __eq__
-76 JUMP 81
-79 ROT_TWO
-80 POP_TOP
-81 STORE_FAST 10
-82 LOAD_FAST 0
-83 LOAD_DEREF 14
-85 BINARY_OP 2 __eq__
-86 JUMP_IF_FALSE_OR_POP 93
-89 LOAD_DEREF 14
-91 LOAD_FAST 1
-92 BINARY_OP 2 __eq__
-93 UNARY_OP 3 
-94 STORE_FAST 10
-95 LOAD_DEREF 14
-97 LOAD_ATTR c
-99 STORE_FAST 11
-100 LOAD_FAST 11
-101 LOAD_DEREF 14
-103 STORE_ATTR c
-105 LOAD_DEREF 14
-107 LOAD_CONST_SMALL_INT 0
-108 LOAD_SUBSCR
-109 STORE_FAST 12
-110 LOAD_FAST 12
-111 LOAD_DEREF 14
-113 LOAD_CONST_SMALL_INT 0
-114 STORE_SUBSCR
-115 LOAD_DEREF 14
-117 LOAD_CONST_SMALL_INT 0
-118 DUP_TOP_TWO
-119 LOAD_SUBSCR
-120 LOAD_FAST 12
-121 BINARY_OP 14 __iadd__
-122 ROT_THREE
-123 STORE_SUBSCR
-124 LOAD_DEREF 14
-126 LOAD_CONST_NONE
-127 LOAD_CONST_NONE
-128 BUILD_SLICE 2
-130 LOAD_SUBSCR
-131 STORE_FAST 0
-132 LOAD_FAST 1
-133 UNPACK_SEQUENCE 2
-135 STORE_FAST 0
-136 STORE_DEREF 14
-138 LOAD_FAST 0
-139 UNPACK_EX 1
-141 STORE_FAST 0
-142 STORE_FAST 0
-143 LOAD_DEREF 14
-145 LOAD_FAST 0
-146 ROT_TWO
-147 STORE_FAST 0
-148 STORE_DEREF 14
-150 LOAD_FAST 1
-151 LOAD_DEREF 14
-153 LOAD_FAST 0
-154 ROT_THREE
-155 ROT_TWO
-156 STORE_FAST 0
-157 STORE_DEREF 14
-159 STORE_FAST 1
-160 DELETE_FAST 0
-162 LOAD_FAST 0
-163 STORE_GLOBAL gl
-165 DELETE_GLOBAL gl
-167 LOAD_FAST 14
-168 LOAD_FAST 15
-169 MAKE_CLOSURE \.\+ 2
-172 LOAD_FAST 2
-173 GET_ITER
-174 CALL_FUNCTION n=1 nkw=0
-176 STORE_FAST 0
-177 LOAD_FAST 14
-178 LOAD_FAST 15
-179 MAKE_CLOSURE \.\+ 2
-182 LOAD_FAST 2
-183 CALL_FUNCTION n=1 nkw=0
-185 STORE_FAST 0
-186 LOAD_FAST 14
-187 LOAD_FAST 15
-188 MAKE_CLOSURE \.\+ 2
-191 LOAD_FAST 2
-192 CALL_FUNCTION n=1 nkw=0
-194 STORE_FAST 0
-195 LOAD_FAST 0
-196 CALL_FUNCTION n=0 nkw=0
-198 POP_TOP
-199 LOAD_FAST 0
-200 LOAD_CONST_SMALL_INT 1
-201 CALL_FUNCTION n=1 nkw=0
-203 POP_TOP
-204 LOAD_FAST 0
-205 LOAD_CONST_STRING 'b'
-207 LOAD_CONST_SMALL_INT 1
-208 CALL_FUNCTION n=0 nkw=1
-211 POP_TOP
-212 LOAD_FAST 0
-213 LOAD_DEREF 14
-215 LOAD_NULL
-216 CALL_FUNCTION_VAR_KW n=0 nkw=0
-218 POP_TOP
-219 LOAD_FAST 0
-220 LOAD_METHOD b
-222 CALL_METHOD n=0 nkw=0
-224 POP_TOP
-225 LOAD_FAST 0
-226 LOAD_METHOD b
-228 LOAD_CONST_SMALL_INT 1
-229 CALL_METHOD n=1 nkw=0
-231 POP_TOP
-232 LOAD_FAST 0
-233 LOAD_METHOD b
-235 LOAD_CONST_STRING 'c'
-237 LOAD_CONST_SMALL_INT 1
-238 CALL_METHOD n=0 nkw=1
-241 POP_TOP
-242 LOAD_FAST 0
-243 LOAD_METHOD b
-245 LOAD_FAST 1
-246 LOAD_NULL
-247 CALL_METHOD_VAR_KW n=0 nkw=0
-249 POP_TOP
-250 LOAD_FAST 0
-251 POP_JUMP_IF_FALSE 260
-254 LOAD_DEREF 16
-256 POP_TOP
-257 JUMP 263
-260 LOAD_GLOBAL y
+71 JUMP_IF_FALSE_OR_POP 77
+73 LOAD_FAST 1
+74 BINARY_OP 2 __eq__
+75 JUMP 79
+77 ROT_TWO
+78 POP_TOP
+79 STORE_FAST 10
+80 LOAD_FAST 0
+81 LOAD_DEREF 14
+83 BINARY_OP 2 __eq__
+84 JUMP_IF_FALSE_OR_POP 90
+86 LOAD_DEREF 14
+88 LOAD_FAST 1
+89 BINARY_OP 2 __eq__
+90 UNARY_OP 3 
+91 STORE_FAST 10
+92 LOAD_DEREF 14
+94 LOAD_ATTR c
+96 STORE_FAST 11
+97 LOAD_FAST 11
+98 LOAD_DEREF 14
+100 STORE_ATTR c
+102 LOAD_DEREF 14
+104 LOAD_CONST_SMALL_INT 0
+105 LOAD_SUBSCR
+106 STORE_FAST 12
+107 LOAD_FAST 12
+108 LOAD_DEREF 14
+110 LOAD_CONST_SMALL_INT 0
+111 STORE_SUBSCR
+112 LOAD_DEREF 14
+114 LOAD_CONST_SMALL_INT 0
+115 DUP_TOP_TWO
+116 LOAD_SUBSCR
+117 LOAD_FAST 12
+118 BINARY_OP 14 __iadd__
+119 ROT_THREE
+120 STORE_SUBSCR
+121 LOAD_DEREF 14
+123 LOAD_CONST_NONE
+124 LOAD_CONST_NONE
+125 BUILD_SLICE 2
+127 LOAD_SUBSCR
+128 STORE_FAST 0
+129 LOAD_FAST 1
+130 UNPACK_SEQUENCE 2
+132 STORE_FAST 0
+133 STORE_DEREF 14
+135 LOAD_FAST 0
+136 UNPACK_EX 1
+138 STORE_FAST 0
+139 STORE_FAST 0
+140 LOAD_DEREF 14
+142 LOAD_FAST 0
+143 ROT_TWO
+144 STORE_FAST 0
+145 STORE_DEREF 14
+147 LOAD_FAST 1
+148 LOAD_DEREF 14
+150 LOAD_FAST 0
+151 ROT_THREE
+152 ROT_TWO
+153 STORE_FAST 0
+154 STORE_DEREF 14
+156 STORE_FAST 1
+157 DELETE_FAST 0
+159 LOAD_FAST 0
+160 STORE_GLOBAL gl
+162 DELETE_GLOBAL gl
+164 LOAD_FAST 14
+165 LOAD_FAST 15
+166 MAKE_CLOSURE \.\+ 2
+169 LOAD_FAST 2
+170 GET_ITER
+171 CALL_FUNCTION n=1 nkw=0
+173 STORE_FAST 0
+174 LOAD_FAST 14
+175 LOAD_FAST 15
+176 MAKE_CLOSURE \.\+ 2
+179 LOAD_FAST 2
+180 CALL_FUNCTION n=1 nkw=0
+182 STORE_FAST 0
+183 LOAD_FAST 14
+184 LOAD_FAST 15
+185 MAKE_CLOSURE \.\+ 2
+188 LOAD_FAST 2
+189 CALL_FUNCTION n=1 nkw=0
+191 STORE_FAST 0
+192 LOAD_FAST 0
+193 CALL_FUNCTION n=0 nkw=0
+195 POP_TOP
+196 LOAD_FAST 0
+197 LOAD_CONST_SMALL_INT 1
+198 CALL_FUNCTION n=1 nkw=0
+200 POP_TOP
+201 LOAD_FAST 0
+202 LOAD_CONST_STRING 'b'
+204 LOAD_CONST_SMALL_INT 1
+205 CALL_FUNCTION n=0 nkw=1
+208 POP_TOP
+209 LOAD_FAST 0
+210 LOAD_DEREF 14
+212 LOAD_NULL
+213 CALL_FUNCTION_VAR_KW n=0 nkw=0
+215 POP_TOP
+216 LOAD_FAST 0
+217 LOAD_METHOD b
+219 CALL_METHOD n=0 nkw=0
+221 POP_TOP
+222 LOAD_FAST 0
+223 LOAD_METHOD b
+225 LOAD_CONST_SMALL_INT 1
+226 CALL_METHOD n=1 nkw=0
+228 POP_TOP
+229 LOAD_FAST 0
+230 LOAD_METHOD b
+232 LOAD_CONST_STRING 'c'
+234 LOAD_CONST_SMALL_INT 1
+235 CALL_METHOD n=0 nkw=1
+238 POP_TOP
+239 LOAD_FAST 0
+240 LOAD_METHOD b
+242 LOAD_FAST 1
+243 LOAD_NULL
+244 CALL_METHOD_VAR_KW n=0 nkw=0
+246 POP_TOP
+247 LOAD_FAST 0
+248 POP_JUMP_IF_FALSE 255
+250 LOAD_DEREF 16
+252 POP_TOP
+253 JUMP 258
+255 LOAD_GLOBAL y
+257 POP_TOP
+258 JUMP 263
+260 LOAD_DEREF 14
 262 POP_TOP
-263 JUMP 269
-266 LOAD_DEREF 14
-268 POP_TOP
-269 LOAD_FAST 0
-270 POP_JUMP_IF_TRUE 266
-273 JUMP 279
-276 LOAD_DEREF 14
-278 POP_TOP
-279 LOAD_FAST 0
-280 POP_JUMP_IF_FALSE 276
-283 LOAD_FAST 0
-284 JUMP_IF_TRUE_OR_POP 288
-287 LOAD_FAST 0
-288 STORE_FAST 0
-289 LOAD_DEREF 14
-291 GET_ITER_STACK
-292 FOR_ITER 301
-295 STORE_FAST 0
-296 LOAD_FAST 1
-297 POP_TOP
-298 JUMP 292
-301 SETUP_FINALLY 329
-304 SETUP_EXCEPT 320
-307 JUMP 313
-310 JUMP 317
-313 LOAD_FAST 0
-314 POP_JUMP_IF_TRUE 310
-317 POP_EXCEPT_JUMP 328
-320 POP_TOP
-321 LOAD_DEREF 14
-323 POP_TOP
-324 POP_EXCEPT_JUMP 328
-327 END_FINALLY
-328 LOAD_CONST_NONE
-329 LOAD_FAST 1
-330 POP_TOP
-331 END_FINALLY
-332 JUMP 350
-335 SETUP_EXCEPT 345
-338 UNWIND_JUMP 354 1
-342 POP_EXCEPT_JUMP 350
-345 POP_TOP
-346 POP_EXCEPT_JUMP 350
-349 END_FINALLY
-350 LOAD_FAST 0
-351 POP_JUMP_IF_TRUE 335
-354 LOAD_FAST 0
-355 SETUP_WITH 363
-358 POP_TOP
-359 LOAD_DEREF 14
-361 POP_TOP
-362 LOAD_CONST_NONE
-363 WITH_CLEANUP
-364 END_FINALLY
-365 LOAD_CONST_SMALL_INT 1
-366 STORE_DEREF 16
-368 LOAD_FAST_N 16
-370 MAKE_CLOSURE \.\+ 1
-373 STORE_FAST 13
-374 LOAD_CONST_SMALL_INT 0
-375 LOAD_CONST_NONE
-376 IMPORT_NAME 'a'
-378 STORE_FAST 0
-379 LOAD_CONST_SMALL_INT 0
-380 LOAD_CONST_STRING 'b'
-382 BUILD_TUPLE 1
-384 IMPORT_NAME 'a'
-386 IMPORT_FROM 'b'
-388 STORE_DEREF 14
-390 POP_TOP
-391 RAISE_LAST
-392 LOAD_CONST_SMALL_INT 1
-393 RAISE_OBJ
-394 LOAD_CONST_NONE
-395 RETURN_VALUE
-396 LOAD_CONST_SMALL_INT 1
-397 RETURN_VALUE
+263 LOAD_FAST 0
+264 POP_JUMP_IF_TRUE 260
+266 JUMP 271
+268 LOAD_DEREF 14
+270 POP_TOP
+271 LOAD_FAST 0
+272 POP_JUMP_IF_FALSE 268
+274 LOAD_FAST 0
+275 JUMP_IF_TRUE_OR_POP 278
+277 LOAD_FAST 0
+278 STORE_FAST 0
+279 LOAD_DEREF 14
+281 GET_ITER_STACK
+282 FOR_ITER 289
+284 STORE_FAST 0
+285 LOAD_FAST 1
+286 POP_TOP
+287 JUMP 282
+289 SETUP_FINALLY 310
+291 SETUP_EXCEPT 302
+293 JUMP 297
+295 JUMP 300
+297 LOAD_FAST 0
+298 POP_JUMP_IF_TRUE 295
+300 POP_EXCEPT_JUMP 309
+302 POP_TOP
+303 LOAD_DEREF 14
+305 POP_TOP
+306 POP_EXCEPT_JUMP 309
+308 END_FINALLY
+309 LOAD_CONST_NONE
+310 LOAD_FAST 1
+311 POP_TOP
+312 END_FINALLY
+313 JUMP 326
+315 SETUP_EXCEPT 322
+317 UNWIND_JUMP 329 1
+320 POP_EXCEPT_JUMP 326
+322 POP_TOP
+323 POP_EXCEPT_JUMP 326
+325 END_FINALLY
+326 LOAD_FAST 0
+327 POP_JUMP_IF_TRUE 315
+329 LOAD_FAST 0
+330 SETUP_WITH 337
+332 POP_TOP
+333 LOAD_DEREF 14
+335 POP_TOP
+336 LOAD_CONST_NONE
+337 WITH_CLEANUP
+338 END_FINALLY
+339 LOAD_CONST_SMALL_INT 1
+340 STORE_DEREF 16
+342 LOAD_FAST_N 16
+344 MAKE_CLOSURE \.\+ 1
+347 STORE_FAST 13
+348 LOAD_CONST_SMALL_INT 0
+349 LOAD_CONST_NONE
+350 IMPORT_NAME 'a'
+352 STORE_FAST 0
+353 LOAD_CONST_SMALL_INT 0
+354 LOAD_CONST_STRING 'b'
+356 BUILD_TUPLE 1
+358 IMPORT_NAME 'a'
+360 IMPORT_FROM 'b'
+362 STORE_DEREF 14
+364 POP_TOP
+365 RAISE_LAST
+366 LOAD_CONST_SMALL_INT 1
+367 RAISE_OBJ
+368 LOAD_CONST_NONE
+369 RETURN_VALUE
+370 LOAD_CONST_SMALL_INT 1
+371 RETURN_VALUE
 File cmdline/cmd_showbc.py, code block 'f' (descriptor: \.\+, bytecode @\.\+ 59 bytes)
 Raw bytecode (code_info_size=8, bytecode_size=51):
  a8 10 0a 02 80 82 34 38 81 57 c0 57 c1 57 c2 57
@@ -539,10 +539,10 @@ arg names: self
 09 POP_TOP
 10 LOAD_CONST_NONE
 11 RETURN_VALUE
-File cmdline/cmd_showbc.py, code block '<genexpr>' (descriptor: \.\+, bytecode @\.\+ 31 bytes)
-Raw bytecode (code_info_size=9, bytecode_size=22):
- c3 40 0c 12 04 04 04 80 3b 53 b2 53 53 4b 0d 00
- c3 25 01 44 f7 7f 25 00 67 59 42 f0 7f 51 63
+File cmdline/cmd_showbc.py, code block '<genexpr>' (descriptor: \.\+, bytecode @\.\+ 28 bytes)
+Raw bytecode (code_info_size=9, bytecode_size=19):
+ c3 40 0c 12 04 04 04 80 3b 53 b2 53 53 4b 0b c3
+ 25 01 44 39 25 00 67 59 42 33 51 63
 arg names: * * *
 (N_STATE 9)
 (N_EXC_STACK 0)
@@ -552,20 +552,20 @@ arg names: * * *
 01 LOAD_FAST 2
 02 LOAD_NULL
 03 LOAD_NULL
-04 FOR_ITER 20
-07 STORE_FAST 3
-08 LOAD_DEREF 1
-10 POP_JUMP_IF_FALSE 4
-13 LOAD_DEREF 0
-15 YIELD_VALUE
-16 POP_TOP
-17 JUMP 4
-20 LOAD_CONST_NONE
-21 RETURN_VALUE
-File cmdline/cmd_showbc.py, code block '<listcomp>' (descriptor: \.\+, bytecode @\.\+ 29 bytes)
-Raw bytecode (code_info_size=8, bytecode_size=21):
- 4b 0c 14 04 04 04 80 3c 2b 00 b2 5f 4b 0d 00 c3
- 25 01 44 f7 7f 25 00 2f 14 42 f0 7f 63
+04 FOR_ITER 17
+06 STORE_FAST 3
+07 LOAD_DEREF 1
+09 POP_JUMP_IF_FALSE 4
+11 LOAD_DEREF 0
+13 YIELD_VALUE
+14 POP_TOP
+15 JUMP 4
+17 LOAD_CONST_NONE
+18 RETURN_VALUE
+File cmdline/cmd_showbc.py, code block '<listcomp>' (descriptor: \.\+, bytecode @\.\+ 26 bytes)
+Raw bytecode (code_info_size=8, bytecode_size=18):
+ 4b 0c 14 04 04 04 80 3c 2b 00 b2 5f 4b 0b c3 25
+ 01 44 39 25 00 2f 14 42 33 63
 arg names: * * *
 (N_STATE 10)
 (N_EXC_STACK 0)
@@ -574,18 +574,18 @@ arg names: * * *
 00 BUILD_LIST 0
 02 LOAD_FAST 2
 03 GET_ITER_STACK
-04 FOR_ITER 20
-07 STORE_FAST 3
-08 LOAD_DEREF 1
-10 POP_JUMP_IF_FALSE 4
-13 LOAD_DEREF 0
-15 STORE_COMP 20
-17 JUMP 4
-20 RETURN_VALUE
-File cmdline/cmd_showbc.py, code block '<dictcomp>' (descriptor: \.\+, bytecode @\.\+ 31 bytes)
-Raw bytecode (code_info_size=8, bytecode_size=23):
- 53 0c 15 04 04 04 80 3d 2c 00 b2 5f 4b 0f 00 c3
- 25 01 44 f7 7f 25 00 25 00 2f 19 42 ee 7f 63
+04 FOR_ITER 17
+06 STORE_FAST 3
+07 LOAD_DEREF 1
+09 POP_JUMP_IF_FALSE 4
+11 LOAD_DEREF 0
+13 STORE_COMP 20
+15 JUMP 4
+17 RETURN_VALUE
+File cmdline/cmd_showbc.py, code block '<dictcomp>' (descriptor: \.\+, bytecode @\.\+ 28 bytes)
+Raw bytecode (code_info_size=8, bytecode_size=20):
+ 53 0c 15 04 04 04 80 3d 2c 00 b2 5f 4b 0d c3 25
+ 01 44 39 25 00 25 00 2f 19 42 31 63
 arg names: * * *
 (N_STATE 11)
 (N_EXC_STACK 0)
@@ -594,15 +594,15 @@ arg names: * * *
 00 BUILD_MAP 0
 02 LOAD_FAST 2
 03 GET_ITER_STACK
-04 FOR_ITER 22
-07 STORE_FAST 3
-08 LOAD_DEREF 1
-10 POP_JUMP_IF_FALSE 4
+04 FOR_ITER 19
+06 STORE_FAST 3
+07 LOAD_DEREF 1
+09 POP_JUMP_IF_FALSE 4
+11 LOAD_DEREF 0
 13 LOAD_DEREF 0
-15 LOAD_DEREF 0
-17 STORE_COMP 25
-19 JUMP 4
-22 RETURN_VALUE
+15 STORE_COMP 25
+17 JUMP 4
+19 RETURN_VALUE
 File cmdline/cmd_showbc.py, code block 'closure' (descriptor: \.\+, bytecode @\.\+ 20 bytes)
 Raw bytecode (code_info_size=8, bytecode_size=12):
  19 0c 16 04 80 6f 25 23 25 00 81 f2 c1 81 27 00
diff --git a/tests/run-tests.py b/tests/run-tests.py
index 9c298dae31a08..d0ecc74a9a735 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -527,6 +527,7 @@ def run_tests(pyb, tests, args, result_dir, num_threads=1):
             "micropython/opt_level_lineno.py"
         )  # native doesn't have proper traceback info
         skip_tests.add("micropython/schedule.py")  # native code doesn't check pending events
+        skip_tests.add("stress/bytecode_limit.py")  # bytecode specific test
 
     def run_one_test(test_file):
         test_file = test_file.replace("\\", "/")
diff --git a/tests/stress/bytecode_limit.py b/tests/stress/bytecode_limit.py
new file mode 100644
index 0000000000000..0cb0c21e40635
--- /dev/null
+++ b/tests/stress/bytecode_limit.py
@@ -0,0 +1,26 @@
+# Test the limits of bytecode generation.
+
+body = " with f()()() as a:\n  try:\n   f()()()\n  except Exception:\n   pass\n"
+
+# Test changing size of code info (source line/bytecode mapping) due to changing
+# bytecode size in the final passes.  This test is very specific to how the
+# code info is encoded, and how jump offsets shrink in the final passes.  This
+# test should fail if the bytecode emitter doesn't correctly handle shrinking of
+# the code info section.
+exec(
+    """
+x = 0
+if x:
+"""
+    + body * 13
+    + """
+x = [1 if x else 123]
+
+
+
+
+
+
+print(x)
+"""
+)
diff --git a/tests/stress/bytecode_limit.py.exp b/tests/stress/bytecode_limit.py.exp
new file mode 100644
index 0000000000000..3214bfe58c92f
--- /dev/null
+++ b/tests/stress/bytecode_limit.py.exp
@@ -0,0 +1 @@
+[123]
diff --git a/tools/mpy-tool.py b/tools/mpy-tool.py
index 73753094ecfeb..1ce301ab94cbe 100755
--- a/tools/mpy-tool.py
+++ b/tools/mpy-tool.py
@@ -242,17 +242,17 @@ class Opcodes:
     MP_BC_ROT_TWO                     = (MP_BC_BASE_BYTE_O + 0x0a)
     MP_BC_ROT_THREE                   = (MP_BC_BASE_BYTE_O + 0x0b)
 
-    MP_BC_JUMP                        = (MP_BC_BASE_JUMP_E + 0x02) # rel byte code offset, 16-bit signed, in excess
-    MP_BC_POP_JUMP_IF_TRUE            = (MP_BC_BASE_JUMP_E + 0x03) # rel byte code offset, 16-bit signed, in excess
-    MP_BC_POP_JUMP_IF_FALSE           = (MP_BC_BASE_JUMP_E + 0x04) # rel byte code offset, 16-bit signed, in excess
-    MP_BC_JUMP_IF_TRUE_OR_POP         = (MP_BC_BASE_JUMP_E + 0x05) # rel byte code offset, 16-bit signed, in excess
-    MP_BC_JUMP_IF_FALSE_OR_POP        = (MP_BC_BASE_JUMP_E + 0x06) # rel byte code offset, 16-bit signed, in excess
-    MP_BC_UNWIND_JUMP                 = (MP_BC_BASE_JUMP_E + 0x00) # rel byte code offset, 16-bit signed, in excess; then a byte
-    MP_BC_SETUP_WITH                  = (MP_BC_BASE_JUMP_E + 0x07) # rel byte code offset, 16-bit unsigned
-    MP_BC_SETUP_EXCEPT                = (MP_BC_BASE_JUMP_E + 0x08) # rel byte code offset, 16-bit unsigned
-    MP_BC_SETUP_FINALLY               = (MP_BC_BASE_JUMP_E + 0x09) # rel byte code offset, 16-bit unsigned
-    MP_BC_POP_EXCEPT_JUMP             = (MP_BC_BASE_JUMP_E + 0x0a) # rel byte code offset, 16-bit unsigned
-    MP_BC_FOR_ITER                    = (MP_BC_BASE_JUMP_E + 0x0b) # rel byte code offset, 16-bit unsigned
+    MP_BC_UNWIND_JUMP                 = (MP_BC_BASE_JUMP_E + 0x00) # signed relative bytecode offset; then a byte
+    MP_BC_JUMP                        = (MP_BC_BASE_JUMP_E + 0x02) # signed relative bytecode offset
+    MP_BC_POP_JUMP_IF_TRUE            = (MP_BC_BASE_JUMP_E + 0x03) # signed relative bytecode offset
+    MP_BC_POP_JUMP_IF_FALSE           = (MP_BC_BASE_JUMP_E + 0x04) # signed relative bytecode offset
+    MP_BC_JUMP_IF_TRUE_OR_POP         = (MP_BC_BASE_JUMP_E + 0x05) # signed relative bytecode offset
+    MP_BC_JUMP_IF_FALSE_OR_POP        = (MP_BC_BASE_JUMP_E + 0x06) # signed relative bytecode offset
+    MP_BC_SETUP_WITH                  = (MP_BC_BASE_JUMP_E + 0x07) # unsigned relative bytecode offset
+    MP_BC_SETUP_EXCEPT                = (MP_BC_BASE_JUMP_E + 0x08) # unsigned relative bytecode offset
+    MP_BC_SETUP_FINALLY               = (MP_BC_BASE_JUMP_E + 0x09) # unsigned relative bytecode offset
+    MP_BC_POP_EXCEPT_JUMP             = (MP_BC_BASE_JUMP_E + 0x0a) # unsigned relative bytecode offset
+    MP_BC_FOR_ITER                    = (MP_BC_BASE_JUMP_E + 0x0b) # unsigned relative bytecode offset
     MP_BC_WITH_CLEANUP                = (MP_BC_BASE_BYTE_O + 0x0c)
     MP_BC_END_FINALLY                 = (MP_BC_BASE_BYTE_O + 0x0d)
     MP_BC_GET_ITER                    = (MP_BC_BASE_BYTE_O + 0x0e)
@@ -289,6 +289,16 @@ class Opcodes:
     MP_BC_IMPORT_STAR                 = (MP_BC_BASE_BYTE_E + 0x09)
     # fmt: on
 
+    # Create sets of related opcodes.
+    ALL_OFFSET_SIGNED = (
+        MP_BC_UNWIND_JUMP,
+        MP_BC_JUMP,
+        MP_BC_POP_JUMP_IF_TRUE,
+        MP_BC_POP_JUMP_IF_FALSE,
+        MP_BC_JUMP_IF_TRUE_OR_POP,
+        MP_BC_JUMP_IF_FALSE_OR_POP,
+    )
+
     # Create a dict mapping opcode value to opcode name.
     mapping = ["unknown" for _ in range(256)]
     for op_name in list(locals()):
@@ -323,7 +333,10 @@ def mp_opcode_format(bytecode, ip, count_var_uint):
                     ip += 1
                 ip += 1
         elif f == MP_BC_FORMAT_OFFSET:
-            ip += 2
+            if bytecode[ip] & 0x80 == 0:
+                ip += 1
+            else:
+                ip += 2
         ip += extra_byte
     return f, ip - ip_start
 
@@ -342,8 +355,16 @@ def mp_opcode_decode(bytecode, ip):
             arg = arg << 7 | bytecode[ip] & 0x7F
         ip += 1
     elif f == MP_BC_FORMAT_OFFSET:
-        arg = bytecode[ip] | bytecode[ip + 1] << 8
-        ip += 2
+        if bytecode[ip] & 0x80 == 0:
+            arg = bytecode[ip]
+            ip += 1
+            if opcode in Opcodes.ALL_OFFSET_SIGNED:
+                arg -= 0x40
+        else:
+            arg = bytecode[ip] & 0x7F | bytecode[ip + 1] << 7
+            ip += 2
+            if opcode in Opcodes.ALL_OFFSET_SIGNED:
+                arg -= 0x4000
     ip += extra_byte
     return f, ip - ip_start, arg
 

From acd2c5c8349a4cd713b1b36c0e6ec6f39791ca19 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 18 Mar 2022 13:18:59 +1100
Subject: [PATCH 1835/3533] py/emitbc: Add check for bytecode jump offset
 overflow.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/emitbc.c                        | 9 +++++++++
 tests/stress/bytecode_limit.py     | 7 +++++++
 tests/stress/bytecode_limit.py.exp | 4 ++++
 3 files changed, 20 insertions(+)

diff --git a/py/emitbc.c b/py/emitbc.c
index 14a72e2765f59..90ab6c0a92ad0 100644
--- a/py/emitbc.c
+++ b/py/emitbc.c
@@ -64,6 +64,7 @@ struct _emit_t {
     size_t bytecode_offset;
     size_t bytecode_size;
     byte *code_base; // stores both byte code and code info
+    bool overflow;
 
     size_t n_info;
     size_t n_cell;
@@ -260,6 +261,9 @@ STATIC void emit_write_bytecode_byte_label(emit_t *emit, int stack_adj, byte b1,
         if (is_signed) {
             bytecode_offset += 0x4000;
         }
+        if (emit->pass == MP_PASS_EMIT && !(0 <= bytecode_offset && bytecode_offset <= 0x7fff)) {
+            emit->overflow = true;
+        }
         c[1] = 0x80 | (bytecode_offset & 0x7f);
         c[2] = bytecode_offset >> 7;
     }
@@ -274,6 +278,7 @@ void mp_emit_bc_start_pass(emit_t *emit, pass_kind_t pass, scope_t *scope) {
     emit->last_source_line = 1;
     emit->bytecode_offset = 0;
     emit->code_info_offset = 0;
+    emit->overflow = false;
 
     // Write local state size, exception stack size, scope flags and number of arguments
     {
@@ -373,6 +378,10 @@ bool mp_emit_bc_end_pass(emit_t *emit) {
             return false;
         }
 
+        if (emit->overflow) {
+            mp_raise_msg(&mp_type_RuntimeError, MP_ERROR_TEXT("bytecode overflow"));
+        }
+
         // Bytecode is finalised, assign it to the raw code object.
         mp_emit_glue_assign_bytecode(emit->scope->raw_code, emit->code_base,
             #if MICROPY_PERSISTENT_CODE_SAVE || MICROPY_DEBUG_PRINTERS
diff --git a/tests/stress/bytecode_limit.py b/tests/stress/bytecode_limit.py
index 0cb0c21e40635..49f7cd2caf37c 100644
--- a/tests/stress/bytecode_limit.py
+++ b/tests/stress/bytecode_limit.py
@@ -24,3 +24,10 @@
 print(x)
 """
 )
+
+# Test overflow of jump offset.
+for n in (430, 431, 432, 433):
+    try:
+        exec("cond = 0\nif cond:\n" + body * n + "else:\n print('cond false')\n")
+    except RuntimeError:
+        print("RuntimeError")
diff --git a/tests/stress/bytecode_limit.py.exp b/tests/stress/bytecode_limit.py.exp
index 3214bfe58c92f..b2d9737d803ec 100644
--- a/tests/stress/bytecode_limit.py.exp
+++ b/tests/stress/bytecode_limit.py.exp
@@ -1 +1,5 @@
 [123]
+cond false
+cond false
+RuntimeError
+RuntimeError

From 6d11c69983f8084459e5bb037d931d5e2d283c78 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 21 Mar 2022 16:36:13 +1100
Subject: [PATCH 1836/3533] py: Change jump-if-x-or-pop opcodes to have
 unsigned offset argument.

These jumps are always forwards, and it's more efficient in the VM to
decode an unsigned argument.  These opcodes are already optimised versions
of the sequence "dup-top pop-jump-if-x pop" so it doesn't hurt generality
to optimise them further.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/bc0.h          | 4 ++--
 py/emitbc.c       | 2 +-
 py/showbc.c       | 4 ++--
 py/vm.c           | 8 ++++----
 tools/mpy-tool.py | 6 ++----
 5 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/py/bc0.h b/py/bc0.h
index 50c4954b08d85..a4a0acf9377ae 100644
--- a/py/bc0.h
+++ b/py/bc0.h
@@ -117,8 +117,8 @@
 #define MP_BC_JUMP                          (MP_BC_BASE_JUMP_E + 0x02) // signed relative bytecode offset
 #define MP_BC_POP_JUMP_IF_TRUE              (MP_BC_BASE_JUMP_E + 0x03) // signed relative bytecode offset
 #define MP_BC_POP_JUMP_IF_FALSE             (MP_BC_BASE_JUMP_E + 0x04) // signed relative bytecode offset
-#define MP_BC_JUMP_IF_TRUE_OR_POP           (MP_BC_BASE_JUMP_E + 0x05) // signed relative bytecode offset
-#define MP_BC_JUMP_IF_FALSE_OR_POP          (MP_BC_BASE_JUMP_E + 0x06) // signed relative bytecode offset
+#define MP_BC_JUMP_IF_TRUE_OR_POP           (MP_BC_BASE_JUMP_E + 0x05) // unsigned relative bytecode offset
+#define MP_BC_JUMP_IF_FALSE_OR_POP          (MP_BC_BASE_JUMP_E + 0x06) // unsigned relative bytecode offset
 #define MP_BC_SETUP_WITH                    (MP_BC_BASE_JUMP_E + 0x07) // unsigned relative bytecode offset
 #define MP_BC_SETUP_EXCEPT                  (MP_BC_BASE_JUMP_E + 0x08) // unsigned relative bytecode offset
 #define MP_BC_SETUP_FINALLY                 (MP_BC_BASE_JUMP_E + 0x09) // unsigned relative bytecode offset
diff --git a/py/emitbc.c b/py/emitbc.c
index 90ab6c0a92ad0..1f5cd9d322d47 100644
--- a/py/emitbc.c
+++ b/py/emitbc.c
@@ -224,7 +224,7 @@ STATIC void emit_write_bytecode_byte_label(emit_t *emit, int stack_adj, byte b1,
     mp_emit_bc_adjust_stack_size(emit, stack_adj);
 
     // Determine if the jump offset is signed or unsigned, based on the opcode.
-    const bool is_signed = b1 <= MP_BC_JUMP_IF_FALSE_OR_POP;
+    const bool is_signed = b1 <= MP_BC_POP_JUMP_IF_FALSE;
 
     // Default to a 2-byte encoding (the largest) with an unknown jump offset.
     unsigned int jump_encoding_size = 1;
diff --git a/py/showbc.c b/py/showbc.c
index 178fa451a2e24..f9c334b93bbbb 100644
--- a/py/showbc.c
+++ b/py/showbc.c
@@ -338,12 +338,12 @@ const byte *mp_bytecode_print_str(const mp_print_t *print, const byte *ip_start,
             break;
 
         case MP_BC_JUMP_IF_TRUE_OR_POP:
-            DECODE_SLABEL;
+            DECODE_ULABEL;
             mp_printf(print, "JUMP_IF_TRUE_OR_POP " UINT_FMT, (mp_uint_t)(ip + unum - ip_start));
             break;
 
         case MP_BC_JUMP_IF_FALSE_OR_POP:
-            DECODE_SLABEL;
+            DECODE_ULABEL;
             mp_printf(print, "JUMP_IF_FALSE_OR_POP " UINT_FMT, (mp_uint_t)(ip + unum - ip_start));
             break;
 
diff --git a/py/vm.c b/py/vm.c
index 990009c00c506..50da90e7d2500 100644
--- a/py/vm.c
+++ b/py/vm.c
@@ -560,9 +560,9 @@ FRAME_SETUP();
                 }
 
                 ENTRY(MP_BC_JUMP_IF_TRUE_OR_POP): {
-                    DECODE_SLABEL;
+                    DECODE_ULABEL;
                     if (mp_obj_is_true(TOP())) {
-                        ip += slab;
+                        ip += ulab;
                     } else {
                         sp--;
                     }
@@ -570,11 +570,11 @@ FRAME_SETUP();
                 }
 
                 ENTRY(MP_BC_JUMP_IF_FALSE_OR_POP): {
-                    DECODE_SLABEL;
+                    DECODE_ULABEL;
                     if (mp_obj_is_true(TOP())) {
                         sp--;
                     } else {
-                        ip += slab;
+                        ip += ulab;
                     }
                     DISPATCH_WITH_PEND_EXC_CHECK();
                 }
diff --git a/tools/mpy-tool.py b/tools/mpy-tool.py
index 1ce301ab94cbe..84c09a0c688d2 100755
--- a/tools/mpy-tool.py
+++ b/tools/mpy-tool.py
@@ -246,8 +246,8 @@ class Opcodes:
     MP_BC_JUMP                        = (MP_BC_BASE_JUMP_E + 0x02) # signed relative bytecode offset
     MP_BC_POP_JUMP_IF_TRUE            = (MP_BC_BASE_JUMP_E + 0x03) # signed relative bytecode offset
     MP_BC_POP_JUMP_IF_FALSE           = (MP_BC_BASE_JUMP_E + 0x04) # signed relative bytecode offset
-    MP_BC_JUMP_IF_TRUE_OR_POP         = (MP_BC_BASE_JUMP_E + 0x05) # signed relative bytecode offset
-    MP_BC_JUMP_IF_FALSE_OR_POP        = (MP_BC_BASE_JUMP_E + 0x06) # signed relative bytecode offset
+    MP_BC_JUMP_IF_TRUE_OR_POP         = (MP_BC_BASE_JUMP_E + 0x05) # unsigned relative bytecode offset
+    MP_BC_JUMP_IF_FALSE_OR_POP        = (MP_BC_BASE_JUMP_E + 0x06) # unsigned relative bytecode offset
     MP_BC_SETUP_WITH                  = (MP_BC_BASE_JUMP_E + 0x07) # unsigned relative bytecode offset
     MP_BC_SETUP_EXCEPT                = (MP_BC_BASE_JUMP_E + 0x08) # unsigned relative bytecode offset
     MP_BC_SETUP_FINALLY               = (MP_BC_BASE_JUMP_E + 0x09) # unsigned relative bytecode offset
@@ -295,8 +295,6 @@ class Opcodes:
         MP_BC_JUMP,
         MP_BC_POP_JUMP_IF_TRUE,
         MP_BC_POP_JUMP_IF_FALSE,
-        MP_BC_JUMP_IF_TRUE_OR_POP,
-        MP_BC_JUMP_IF_FALSE_OR_POP,
     )
 
     # Create a dict mapping opcode value to opcode name.

From b312a7abf5504d0e68846d5728c09899119f2621 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 25 Mar 2022 11:57:59 +1100
Subject: [PATCH 1837/3533] py/builtinimport: Alias sys to usys if import weak
 links aren't enabled.

The sys module should always be available (if it's compiled in), eg to
change sys.path for importing.  So provide an explicit alias from "sys" to
"usys" so that "import sys" can always work.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/builtinimport.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/py/builtinimport.c b/py/builtinimport.c
index 094959f97d381..cd9636ccdc2d4 100644
--- a/py/builtinimport.c
+++ b/py/builtinimport.c
@@ -373,6 +373,10 @@ STATIC mp_obj_t process_import_at_level(qstr full_mod_name, qstr level_mod_name,
             qstr umodule_name = qstr_from_str(umodule_buf);
             module_obj = mp_module_get_builtin(umodule_name);
         }
+        #elif MICROPY_PY_SYS
+        if (stat == MP_IMPORT_STAT_NO_EXIST && module_obj == MP_OBJ_NULL && level_mod_name == MP_QSTR_sys) {
+            module_obj = MP_OBJ_FROM_PTR(&mp_module_sys);
+        }
         #endif
     } else {
         DEBUG_printf("Searching for sub-module\n");

From 35dbde163a8a253679c09b4646a9177cde5345f2 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 25 Mar 2022 12:39:12 +1100
Subject: [PATCH 1838/3533] tools/mpremote: Support any prompt string when
 detecting soft reset.

The prompt may be changed by sys.ps1.

Signed-off-by: Damien George <damien@micropython.org>
---
 tools/mpremote/mpremote/pyboardextended.py | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/tools/mpremote/mpremote/pyboardextended.py b/tools/mpremote/mpremote/pyboardextended.py
index 69cbf02eddac6..95619b0eb66d3 100644
--- a/tools/mpremote/mpremote/pyboardextended.py
+++ b/tools/mpremote/mpremote/pyboardextended.py
@@ -653,12 +653,12 @@ def write_ctrl_d(self, out_callback):
         # Check if a soft reset occurred.
         if data_all.find(b"MPY: soft reboot") == -1:
             return
-        if data_all.endswith(b">>> "):
-            in_friendly_repl = True
-        elif data_all.endswith(b">"):
+        if data_all.endswith(b">"):
             in_friendly_repl = False
+            prompt = b">"
         else:
-            return
+            in_friendly_repl = True
+            prompt = data_all.rsplit(b"\r\n", 1)[-1]
 
         # Clear state while board remounts, it will be re-set once mounted.
         self.mounted = False
@@ -676,9 +676,6 @@ def write_ctrl_d(self, out_callback):
         # Exit raw REPL if needed, and wait for the friendly REPL prompt.
         if in_friendly_repl:
             self.exit_raw_repl()
-            prompt = b">>> "
-        else:
-            prompt = b">"
         self.read_until(len(prompt), prompt)
         out_callback(prompt)
         self.serial = SerialIntercept(self.serial, self.cmd)

From c90dfba04ca8d6e3eb12732dea2344f393f77531 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 23 Mar 2022 15:21:03 +1100
Subject: [PATCH 1839/3533] stm32/machine_i2s: Set FullDuplexMode to disabled
 on F4.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/machine_i2s.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ports/stm32/machine_i2s.c b/ports/stm32/machine_i2s.c
index 31b7d14bfd4c1..0bb0f3e8f55aa 100644
--- a/ports/stm32/machine_i2s.c
+++ b/ports/stm32/machine_i2s.c
@@ -791,6 +791,9 @@ STATIC void machine_i2s_init_helper(machine_i2s_obj_t *self, size_t n_pos_args,
     init->AudioFreq = args[ARG_rate].u_int;
     init->CPOL = I2S_CPOL_LOW;
     init->ClockSource = I2S_CLOCK_PLL;
+    #if defined(STM32F4)
+    init->FullDuplexMode = I2S_FULLDUPLEXMODE_DISABLE;
+    #endif
 
     // init the I2S bus
     if (!i2s_init(self)) {

From 2a91c8a888bc56b61876e6d01a2f144aee5686b4 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 25 Mar 2022 14:29:48 +1100
Subject: [PATCH 1840/3533] stm32/machine_i2s: Allow I2S.deinit to be called
 multiple times.

In particular, it is called by the constructor if the instance already
exists.  So if the previous instance was deinit'd then it will be deinit'd
a second time.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/machine_i2s.c | 32 +++++++++++++++++---------------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/ports/stm32/machine_i2s.c b/ports/stm32/machine_i2s.c
index 0bb0f3e8f55aa..2120554c3abc4 100644
--- a/ports/stm32/machine_i2s.c
+++ b/ports/stm32/machine_i2s.c
@@ -887,24 +887,26 @@ STATIC mp_obj_t machine_i2s_init(size_t n_pos_args, const mp_obj_t *pos_args, mp
 STATIC MP_DEFINE_CONST_FUN_OBJ_KW(machine_i2s_init_obj, 1, machine_i2s_init);
 
 STATIC mp_obj_t machine_i2s_deinit(mp_obj_t self_in) {
-
     machine_i2s_obj_t *self = MP_OBJ_TO_PTR(self_in);
 
-    dma_deinit(self->dma_descr_tx);
-    dma_deinit(self->dma_descr_rx);
-    HAL_I2S_DeInit(&self->hi2s);
-
-    if (self->hi2s.Instance == I2S1) {
-        __SPI1_FORCE_RESET();
-        __SPI1_RELEASE_RESET();
-        __SPI1_CLK_DISABLE();
-    } else if (self->hi2s.Instance == I2S2) {
-        __SPI2_FORCE_RESET();
-        __SPI2_RELEASE_RESET();
-        __SPI2_CLK_DISABLE();
-    }
+    if (self->ring_buffer_storage != NULL) {
+        dma_deinit(self->dma_descr_tx);
+        dma_deinit(self->dma_descr_rx);
+        HAL_I2S_DeInit(&self->hi2s);
+
+        if (self->hi2s.Instance == I2S1) {
+            __SPI1_FORCE_RESET();
+            __SPI1_RELEASE_RESET();
+            __SPI1_CLK_DISABLE();
+        } else if (self->hi2s.Instance == I2S2) {
+            __SPI2_FORCE_RESET();
+            __SPI2_RELEASE_RESET();
+            __SPI2_CLK_DISABLE();
+        }
 
-    m_free(self->ring_buffer_storage);
+        m_free(self->ring_buffer_storage);
+        self->ring_buffer_storage = NULL;
+    }
 
     return mp_const_none;
 }

From 6804a8a891d61d7b4c2b613997021d12f960763c Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sat, 26 Mar 2022 00:07:19 +1100
Subject: [PATCH 1841/3533] stm32/machine_i2s: Fix 16-bit stereo i2s_frame_map.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/machine_i2s.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/stm32/machine_i2s.c b/ports/stm32/machine_i2s.c
index 2120554c3abc4..2bb60a6a8664d 100644
--- a/ports/stm32/machine_i2s.c
+++ b/ports/stm32/machine_i2s.c
@@ -158,7 +158,7 @@ STATIC mp_obj_t machine_i2s_deinit(mp_obj_t self_in);
 STATIC const int8_t i2s_frame_map[NUM_I2S_USER_FORMATS][I2S_RX_FRAME_SIZE_IN_BYTES] = {
     { 0,  1, -1, -1, -1, -1, -1, -1 },  // Mono, 16-bits
     { 2,  3,  0,  1, -1, -1, -1, -1 },  // Mono, 32-bits
-    { 0,  1,  4,  5, -1, -1, -1, -1 },  // Stereo, 16-bits
+    { 0,  1, -1, -1,  2,  3, -1, -1 },  // Stereo, 16-bits
     { 2,  3,  0,  1,  6,  7,  4,  5 },  // Stereo, 32-bits
 };
 

From 726628584507d1b043fa28e9adf122acb4b40781 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 28 Mar 2022 16:53:03 +1100
Subject: [PATCH 1842/3533] tests/extmod: Add test for machine.I2S data rate.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/extmod/machine_i2s_rate.py     | 80 ++++++++++++++++++++++++++++
 tests/extmod/machine_i2s_rate.py.exp |  8 +++
 2 files changed, 88 insertions(+)
 create mode 100644 tests/extmod/machine_i2s_rate.py
 create mode 100644 tests/extmod/machine_i2s_rate.py.exp

diff --git a/tests/extmod/machine_i2s_rate.py b/tests/extmod/machine_i2s_rate.py
new file mode 100644
index 0000000000000..46e94585b71d6
--- /dev/null
+++ b/tests/extmod/machine_i2s_rate.py
@@ -0,0 +1,80 @@
+# Test machine.I2S data transfer rate, for both TX and RX.
+
+try:
+    from machine import Pin, I2S
+except ImportError:
+    print("SKIP")
+    raise SystemExit
+
+import time, sys
+
+# Configure pins based on the board.
+if "pyboard" in sys.platform:
+    i2s_id = 2
+    sck_pin = Pin("Y6")
+    ws_pin = Pin("Y5")
+    sd_pin = Pin("Y8")
+elif "rp2" in sys.platform:
+    i2s_id = 1
+    sck_pin = Pin(0)
+    ws_pin = Pin(1)
+    sd_pin = Pin(2)
+
+TEST_BYTES = b"01234567"
+RATE = 11025  # frames/sec
+
+
+def test(mode, bits_per_sample, frame_format):
+    i2s = I2S(
+        i2s_id,
+        sck=sck_pin,
+        ws=ws_pin,
+        sd=sd_pin,
+        mode=mode,
+        bits=bits_per_sample,
+        format=frame_format,
+        rate=RATE,
+        ibuf=200,
+    )
+
+    if frame_format == I2S.MONO:
+        channels = 1
+    else:
+        channels = 2
+    bits_per_frame = bits_per_sample * channels
+    buf_len_250ms = bits_per_frame // 8 * RATE // 4
+
+    # Create test data and preload I2S buffers.
+    if mode == I2S.TX:
+        mode_str = "TX"
+        data = TEST_BYTES * (buf_len_250ms // len(TEST_BYTES))
+        i2s.write(data)
+    else:
+        mode_str = "RX"
+        data = bytearray(len(TEST_BYTES) * (buf_len_250ms // len(TEST_BYTES)))
+        i2s.readinto(data)
+
+    # Time how long it takes to read/write 2 lots of data.
+    t0 = time.ticks_ms()
+    for i in range(2):
+        if mode == I2S.TX:
+            i2s.write(data)
+        else:
+            i2s.readinto(data)
+    t1 = time.ticks_ms()
+    dt = time.ticks_diff(t1, t0)
+
+    i2s.deinit()
+
+    # Print out test result, time should be in range of 500ms.
+    print(mode_str, bits_per_sample, channels, abs(dt - 500) <= 4)
+
+
+test(I2S.TX, 16, I2S.MONO)
+test(I2S.TX, 16, I2S.STEREO)
+test(I2S.TX, 32, I2S.MONO)
+test(I2S.TX, 32, I2S.STEREO)
+test(I2S.RX, 16, I2S.MONO)
+test(I2S.RX, 16, I2S.STEREO)
+test(I2S.RX, 32, I2S.MONO)
+test(I2S.RX, 32, I2S.STEREO)
diff --git a/tests/extmod/machine_i2s_rate.py.exp b/tests/extmod/machine_i2s_rate.py.exp
new file mode 100644
index 0000000000000..e160d92f6b03a
--- /dev/null
+++ b/tests/extmod/machine_i2s_rate.py.exp
@@ -0,0 +1,8 @@
+TX 16 1 True
+TX 16 2 True
+TX 32 1 True
+TX 32 2 True
+RX 16 1 True
+RX 16 2 True
+RX 32 1 True
+RX 32 2 True

From 5e685a9c6faeb764c0b689bc736ed00736bfd6b6 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 28 Mar 2022 17:10:33 +1100
Subject: [PATCH 1843/3533] docs/library/machine.I2S: Clarify what rate refers
 to.

Signed-off-by: Damien George <damien@micropython.org>
---
 docs/library/machine.I2S.rst | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/library/machine.I2S.rst b/docs/library/machine.I2S.rst
index abfbb08780395..d4e5ac94334c7 100644
--- a/docs/library/machine.I2S.rst
+++ b/docs/library/machine.I2S.rst
@@ -95,7 +95,8 @@ Constructor
      - ``mode`` specifies receive or transmit
      - ``bits`` specifies sample size (bits), 16 or 32
      - ``format`` specifies channel format, STEREO or MONO
-     - ``rate`` specifies audio sampling rate (samples/s)
+     - ``rate`` specifies audio sampling rate (Hz);
+       this is the frequency of the ``ws`` signal
      - ``ibuf`` specifies internal buffer length (bytes)
 
    For all ports, DMA runs continuously in the background and allows user applications to perform other operations while

From 1f6cb8f0476e699c1910ed59f1bb027fbef72ad7 Mon Sep 17 00:00:00 2001
From: MikeTeachman <mike.teachman@gmail.com>
Date: Mon, 29 Nov 2021 09:50:34 -0800
Subject: [PATCH 1844/3533] mixmrt/machine_i2s: Add I2S protocol support.

This commit adds support for machine.I2S on the mimxrt port.  The I2S API
is consistent with the existing stm32, esp32, and rp2 implementations.

I2S features:
- controller transmit and controller receive
- 16-bit and 32-bit sample sizes
- mono and stereo formats
- sampling frequencies from 8kHz to 48kHz
- 3 modes of operation:
  - blocking
  - non-blocking with callback
  - uasyncio
- configurable internal buffer
- optional MCK

Tested with the following development boards:
- MIMXRT1010_EVK, MIMXRT1015_EVK, MIMXRT1020_EVK, MIMXRT1050_EVK
- Teensy 4.0, Teensy 4.1
- Olimex RT1010
- Seeed ARCH MIX

Tested with the following I2S hardware peripherals:
- UDA1334
- GY-SPH0645LM4H
- WM8960 codec on board the MIMXRT boards and separate breakout board
- INMP441
- PCM5102
- SGTL5000 on the Teensy audio shield

Signed-off-by: Mike Teachman <mike.teachman@gmail.com>
---
 docs/library/machine.I2S.rst                  |   12 +-
 ports/mimxrt/Makefile                         |    9 +-
 ports/mimxrt/board_init.c                     |    4 +
 .../boards/MIMXRT1010_EVK/mpconfigboard.h     |   33 +
 ports/mimxrt/boards/MIMXRT1010_EVK/pins.csv   |    7 +
 .../boards/MIMXRT1020_EVK/mpconfigboard.h     |   33 +
 ports/mimxrt/boards/MIMXRT1020_EVK/pins.csv   |    9 +-
 .../boards/MIMXRT1050_EVK/mpconfigboard.h     |   34 +
 ports/mimxrt/boards/MIMXRT1050_EVK/pins.csv   |    7 +
 .../boards/MIMXRT1060_EVK/mpconfigboard.h     |   33 +
 ports/mimxrt/boards/MIMXRT1060_EVK/pins.csv   |    7 +
 .../boards/MIMXRT1064_EVK/mpconfigboard.h     |   33 +
 ports/mimxrt/boards/MIMXRT1064_EVK/pins.csv   |    7 +
 .../boards/OLIMEX_RT1010/mpconfigboard.h      |   36 +
 ports/mimxrt/boards/OLIMEX_RT1010/pins.csv    |    7 +
 .../boards/SEEED_ARCH_MIX/mpconfigboard.h     |   32 +
 ports/mimxrt/boards/SEEED_ARCH_MIX/pins.csv   |    7 +
 ports/mimxrt/boards/TEENSY40/mpconfigboard.h  |   38 +
 ports/mimxrt/boards/TEENSY40/pins.csv         |    9 +-
 ports/mimxrt/boards/TEENSY41/mpconfigboard.h  |   40 +
 ports/mimxrt/boards/TEENSY41/pins.csv         |    9 +-
 ports/mimxrt/{dma_channel.c => dma_manager.c} |   16 +-
 ports/mimxrt/{dma_channel.h => dma_manager.h} |    1 +
 ports/mimxrt/machine_i2s.c                    | 1228 +++++++++++++++++
 ports/mimxrt/machine_spi.c                    |    7 +-
 ports/mimxrt/main.c                           |    3 +
 ports/mimxrt/modmachine.c                     |    3 +
 ports/mimxrt/modmachine.h                     |    3 +
 ports/mimxrt/mpconfigport.h                   |   13 +
 ports/mimxrt/sdcard.c                         |    2 +-
 30 files changed, 1662 insertions(+), 20 deletions(-)
 rename ports/mimxrt/{dma_channel.c => dma_manager.c} (86%)
 rename ports/mimxrt/{dma_channel.h => dma_manager.h} (98%)
 create mode 100644 ports/mimxrt/machine_i2s.c

diff --git a/docs/library/machine.I2S.rst b/docs/library/machine.I2S.rst
index d4e5ac94334c7..e68a863d7c6b0 100644
--- a/docs/library/machine.I2S.rst
+++ b/docs/library/machine.I2S.rst
@@ -75,23 +75,19 @@ uasyncio::
 Constructor
 -----------
 
-.. class:: I2S(id, *, sck, ws, sd, mode, bits, format, rate, ibuf)
+.. class:: I2S(id, *, sck, ws, sd, mck=None, mode, bits, format, rate, ibuf)
 
    Construct an I2S object of the given id:
 
-   - ``id`` identifies a particular I2S bus.
-
-   ``id`` is board and port specific:
-
-     - PYBv1.0/v1.1: has one I2S bus with id=2.
-     - PYBD-SFxW: has two I2S buses with id=1 and id=2.
-     - ESP32: has two I2S buses with id=0 and id=1.
+   - ``id`` identifies a particular I2S bus; it is board and port specific
 
    Keyword-only parameters that are supported on all ports:
 
      - ``sck`` is a pin object for the serial clock line
      - ``ws`` is a pin object for the word select line
      - ``sd`` is a pin object for the serial data line
+     - ``mck`` is a pin object for the master clock line;
+       master clock frequency is sampling rate * 256
      - ``mode`` specifies receive or transmit
      - ``bits`` specifies sample size (bits), 16 or 32
      - ``format`` specifies channel format, STEREO or MONO
diff --git a/ports/mimxrt/Makefile b/ports/mimxrt/Makefile
index be5083965f4a7..f9c5bf402a08f 100644
--- a/ports/mimxrt/Makefile
+++ b/ports/mimxrt/Makefile
@@ -77,7 +77,7 @@ INC += -I$(TOP)/lib/tinyusb/hw
 INC += -I$(TOP)/lib/tinyusb/hw/bsp/teensy_40
 INC += -I$(TOP)/lib/tinyusb/src
 
-CFLAGS_MCU = -mtune=cortex-m7 -mcpu=cortex-m7 -mfloat-abi=hard -mfpu=fpv5-d16
+CFLAGS_MCU = -mtune=cortex-m7 -mcpu=cortex-m7
 CFLAGS += $(INC) -Wall -Werror -Wdouble-promotion -Wfloat-conversion -std=c99 -nostdlib -mthumb $(CFLAGS_MCU)
 CFLAGS += -DCPU_$(MCU_SERIES) -DCPU_$(MCU_VARIANT) -DBOARD_$(BOARD)
 CFLAGS += -DXIP_EXTERNAL_FLASH=1 \
@@ -100,12 +100,14 @@ CFLAGS += $(CFLAGS_MOD) $(CFLAGS_EXTRA)
 # Configure floating point support
 ifeq ($(MICROPY_FLOAT_IMPL),double)
 CFLAGS += -DMICROPY_FLOAT_IMPL=MICROPY_FLOAT_IMPL_DOUBLE
+CFLAGS_MCU += -mfloat-abi=hard  -mfpu=fpv5-d16
 else
 ifeq ($(MICROPY_FLOAT_IMPL),none)
 CFLAGS += -DMICROPY_FLOAT_IMPL=MICROPY_FLOAT_IMPL_NONE
 else
 CFLAGS += -DMICROPY_FLOAT_IMPL=MICROPY_FLOAT_IMPL_FLOAT
 CFLAGS += -fsingle-precision-constant
+CFLAGS_MCU += -mfloat-abi=softfp -mfpu=fpv5-sp-d16
 endif
 endif
 
@@ -188,6 +190,7 @@ SRC_HAL_IMX_C += \
 	$(MCU_DIR)/drivers/fsl_lpuart.c \
 	$(MCU_DIR)/drivers/fsl_pit.c \
 	$(MCU_DIR)/drivers/fsl_pwm.c \
+	$(MCU_DIR)/drivers/fsl_sai.c \
 	$(MCU_DIR)/drivers/fsl_snvs_lp.c \
 	$(MCU_DIR)/drivers/fsl_trng.c \
 	$(MCU_DIR)/drivers/fsl_wdog.c \
@@ -210,7 +213,7 @@ endif
 
 SRC_C += \
 	board_init.c \
-	dma_channel.c \
+	dma_manager.c \
 	drivers/bus/softspi.c \
 	drivers/dht/dht.c \
 	eth.c \
@@ -224,6 +227,7 @@ SRC_C += \
 	machine_adc.c \
 	machine_bitstream.c \
 	machine_i2c.c \
+	machine_i2s.c \
 	machine_led.c \
 	machine_pin.c \
 	machine_rtc.c \
@@ -396,6 +400,7 @@ SRC_QSTR += \
 	extmod/modonewire.c \
 	extmod/uos_dupterm.c \
 	machine_adc.c \
+	machine_i2s.c \
 	machine_led.c \
 	machine_pin.c \
 	machine_pwm.c \
diff --git a/ports/mimxrt/board_init.c b/ports/mimxrt/board_init.c
index d96645feffacb..82af620a8d9ba 100644
--- a/ports/mimxrt/board_init.c
+++ b/ports/mimxrt/board_init.c
@@ -96,6 +96,10 @@ void board_init(void) {
     #if MICROPY_PY_MACHINE_SDCARD
     machine_sdcard_init0();
     #endif
+
+    #if MICROPY_PY_MACHINE_I2S
+    machine_i2s_init0();
+    #endif
 }
 
 void USB_OTG1_IRQHandler(void) {
diff --git a/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.h b/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.h
index 726a63904d6f5..75fda0cad1f54 100644
--- a/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.h
+++ b/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.h
@@ -44,3 +44,36 @@
 #define IOMUX_TABLE_I2C \
     { IOMUXC_GPIO_02_LPI2C1_SCL }, { IOMUXC_GPIO_01_LPI2C1_SDA }, \
     { IOMUXC_GPIO_10_LPI2C2_SCL }, { IOMUXC_GPIO_09_LPI2C2_SDA },
+
+#define MICROPY_PY_MACHINE_I2S (1)
+#define MICROPY_HW_I2S_NUM (1)
+#define I2S_CLOCK_MUX { 0, kCLOCK_Sai1Mux }
+#define I2S_CLOCK_PRE_DIV { 0, kCLOCK_Sai1PreDiv }
+#define I2S_CLOCK_DIV { 0, kCLOCK_Sai1Div }
+#define I2S_IOMUXC_GPR_MODE { 0, kIOMUXC_GPR_SAI1MClkOutputDir }
+#define I2S_DMA_REQ_SRC_RX { 0, kDmaRequestMuxSai1Rx }
+#define I2S_DMA_REQ_SRC_TX { 0, kDmaRequestMuxSai1Tx }
+#define I2S_WM8960_RX_MODE  (1)
+
+#define I2S_GPIO(_hwid, _fn, _mode, _pin, _iomux) \
+    { \
+        .hw_id = _hwid, \
+        .fn = _fn, \
+        .mode = _mode, \
+        .name = MP_QSTR_##_pin, \
+        .iomux = {_iomux}, \
+    }
+
+#define I2S_GPIO_MAP \
+    { \
+        I2S_GPIO(1, MCK, TX, GPIO_08, IOMUXC_GPIO_08_SAI1_MCLK),  \
+        I2S_GPIO(1, SCK, RX, GPIO_01, IOMUXC_GPIO_01_SAI1_RX_BCLK),  \
+        I2S_GPIO(1, WS, RX, GPIO_02, IOMUXC_GPIO_02_SAI1_RX_SYNC),  \
+        I2S_GPIO(1, SD, RX, GPIO_03, IOMUXC_GPIO_03_SAI1_RX_DATA00),  \
+        I2S_GPIO(1, SCK, TX, GPIO_06, IOMUXC_GPIO_06_SAI1_TX_BCLK),  \
+        I2S_GPIO(1, WS, TX, GPIO_07, IOMUXC_GPIO_07_SAI1_TX_SYNC),  \
+        I2S_GPIO(1, SD, TX, GPIO_04, IOMUXC_GPIO_04_SAI1_TX_DATA00),  \
+    }
+
+#define MICROPY_BOARD_ROOT_POINTERS \
+    struct _machine_i2s_obj_t *machine_i2s_obj[MICROPY_HW_I2S_NUM];
diff --git a/ports/mimxrt/boards/MIMXRT1010_EVK/pins.csv b/ports/mimxrt/boards/MIMXRT1010_EVK/pins.csv
index 1f01215ddd947..d8710f8ce5fd8 100644
--- a/ports/mimxrt/boards/MIMXRT1010_EVK/pins.csv
+++ b/ports/mimxrt/boards/MIMXRT1010_EVK/pins.csv
@@ -34,3 +34,10 @@ PWM_CB,GPIO_05
 ENC_A,GPIO_AD_05
 ENC_B,GPIO_AD_06
 LED_GREEN,GPIO_11
+MCK,GPIO_08
+SCK_RX,GPIO_01
+WS_RX,GPIO_02
+SD_RX,GPIO_03
+SCK_TX,GPIO_06
+WS_TX,GPIO_07
+SD_TX,GPIO_04
diff --git a/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.h b/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.h
index 2e7ee34e8d3bc..1dfe02b651f89 100644
--- a/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.h
+++ b/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.h
@@ -65,6 +65,36 @@
     { 0 }, { 0 }, \
     { IOMUXC_GPIO_SD_B1_02_LPI2C4_SCL }, { IOMUXC_GPIO_SD_B1_03_LPI2C4_SDA },
 
+#define MICROPY_PY_MACHINE_I2S (1)
+#define MICROPY_HW_I2S_NUM (1)
+#define I2S_CLOCK_MUX { 0, kCLOCK_Sai1Mux, kCLOCK_Sai2Mux }
+#define I2S_CLOCK_PRE_DIV { 0, kCLOCK_Sai1PreDiv, kCLOCK_Sai2PreDiv }
+#define I2S_CLOCK_DIV { 0, kCLOCK_Sai1Div, kCLOCK_Sai2Div }
+#define I2S_IOMUXC_GPR_MODE { 0, kIOMUXC_GPR_SAI1MClkOutputDir, kIOMUXC_GPR_SAI2MClkOutputDir }
+#define I2S_DMA_REQ_SRC_RX { 0, kDmaRequestMuxSai1Rx, kDmaRequestMuxSai2Rx }
+#define I2S_DMA_REQ_SRC_TX { 0, kDmaRequestMuxSai1Tx, kDmaRequestMuxSai2Tx }
+
+#define I2S_GPIO(_hwid, _fn, _mode, _pin, _iomux) \
+    { \
+        .hw_id = _hwid, \
+        .fn = _fn, \
+        .mode = _mode, \
+        .name = MP_QSTR_##_pin, \
+        .iomux = {_iomux}, \
+    }
+
+#define I2S_GPIO_MAP \
+    { \
+        I2S_GPIO(1, MCK, TX, GPIO_AD_B1_00, IOMUXC_GPIO_AD_B1_00_SAI1_MCLK), \
+        I2S_GPIO(1, SCK, RX, GPIO_AD_B1_06, IOMUXC_GPIO_AD_B1_06_SAI1_RX_BCLK), \
+        I2S_GPIO(1, WS, RX, GPIO_AD_B1_04, IOMUXC_GPIO_AD_B1_04_SAI1_RX_SYNC), \
+        I2S_GPIO(1, SD, RX, GPIO_AD_B1_05, IOMUXC_GPIO_AD_B1_05_SAI1_RX_DATA00),  \
+        I2S_GPIO(1, SCK, TX, GPIO_AD_B1_01, IOMUXC_GPIO_AD_B1_01_SAI1_TX_BCLK), \
+        I2S_GPIO(1, WS, TX, GPIO_AD_B1_02, IOMUXC_GPIO_AD_B1_02_SAI1_TX_SYNC),  \
+        I2S_GPIO(1, SD, TX, GPIO_AD_B1_03, IOMUXC_GPIO_AD_B1_03_SAI1_TX_DATA00), \
+    }
+
+
 #define USDHC_DUMMY_PIN NULL, 0
 #define MICROPY_USDHC1 \
     { \
@@ -142,3 +172,6 @@
     { IOMUXC_GPIO_AD_B0_15_ENET_TDATA01, 0, 0xB0E9u }, \
     { IOMUXC_GPIO_EMC_40_ENET_MDIO, 0, 0xB0E9u }, \
     { IOMUXC_GPIO_EMC_41_ENET_MDC, 0, 0xB0E9u },
+
+#define MICROPY_BOARD_ROOT_POINTERS \
+    struct _machine_i2s_obj_t *machine_i2s_obj[MICROPY_HW_I2S_NUM];
diff --git a/ports/mimxrt/boards/MIMXRT1020_EVK/pins.csv b/ports/mimxrt/boards/MIMXRT1020_EVK/pins.csv
index 8420bbd82156b..e1f2669b08ece 100644
--- a/ports/mimxrt/boards/MIMXRT1020_EVK/pins.csv
+++ b/ports/mimxrt/boards/MIMXRT1020_EVK/pins.csv
@@ -30,4 +30,11 @@ SCK,GPIO_AD_B0_10
 SDI,GPIO_AD_B0_13
 SDO,GPIO_AD_B0_12
 CS,GPIO_AD_B0_11
-LED_GREEN,GPIO_AD_B0_05
\ No newline at end of file
+LED_GREEN,GPIO_AD_B0_05
+MCK,GPIO_AD_B1_00
+SCK_RX,GPIO_AD_B1_06
+WS_RX,GPIO_AD_B1_04
+SD_RX,GPIO_AD_B1_05
+SCK_TX,GPIO_AD_B1_01
+WS_TX,GPIO_AD_B1_02
+SD_TX,GPIO_AD_B1_03
diff --git a/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.h b/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.h
index c2783a3e597fc..613095e67fca3 100644
--- a/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.h
+++ b/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.h
@@ -53,6 +53,37 @@
     { 0 }, { 0 }, \
     { IOMUXC_GPIO_AD_B1_07_LPI2C3_SCL }, { IOMUXC_GPIO_AD_B1_06_LPI2C3_SDA },
 
+#define MICROPY_PY_MACHINE_I2S (1)
+#define MICROPY_HW_I2S_NUM (1)
+#define I2S_CLOCK_MUX { 0, kCLOCK_Sai1Mux, kCLOCK_Sai2Mux }
+#define I2S_CLOCK_PRE_DIV { 0, kCLOCK_Sai1PreDiv, kCLOCK_Sai2PreDiv }
+#define I2S_CLOCK_DIV { 0, kCLOCK_Sai1Div, kCLOCK_Sai2Div }
+#define I2S_IOMUXC_GPR_MODE { 0, kIOMUXC_GPR_SAI1MClkOutputDir, kIOMUXC_GPR_SAI2MClkOutputDir }
+#define I2S_DMA_REQ_SRC_RX { 0, kDmaRequestMuxSai1Rx, kDmaRequestMuxSai2Rx }
+#define I2S_DMA_REQ_SRC_TX { 0, kDmaRequestMuxSai1Tx, kDmaRequestMuxSai2Tx }
+#define I2S_WM8960_RX_MODE  (1)
+
+#define I2S_GPIO(_hwid, _fn, _mode, _pin, _iomux) \
+    { \
+        .hw_id = _hwid, \
+        .fn = _fn, \
+        .mode = _mode, \
+        .name = MP_QSTR_##_pin, \
+        .iomux = {_iomux}, \
+    }
+
+#define I2S_GPIO_MAP \
+    { \
+        I2S_GPIO(1, MCK, TX, GPIO_AD_B1_09, IOMUXC_GPIO_AD_B1_09_SAI1_MCLK), \
+        I2S_GPIO(1, SCK, RX, GPIO_AD_B1_11, IOMUXC_GPIO_AD_B1_11_SAI1_RX_BCLK), \
+        I2S_GPIO(1, WS, RX, GPIO_AD_B1_10, IOMUXC_GPIO_AD_B1_10_SAI1_RX_SYNC), \
+        I2S_GPIO(1, SD, RX, GPIO_AD_B1_12, IOMUXC_GPIO_AD_B1_12_SAI1_RX_DATA00),  \
+        I2S_GPIO(1, SCK, TX, GPIO_AD_B1_14, IOMUXC_GPIO_AD_B1_14_SAI1_TX_BCLK), \
+        I2S_GPIO(1, WS, TX, GPIO_AD_B1_15, IOMUXC_GPIO_AD_B1_15_SAI1_TX_SYNC),  \
+        I2S_GPIO(1, SD, TX, GPIO_AD_B1_13, IOMUXC_GPIO_AD_B1_13_SAI1_TX_DATA00), \
+    }
+
+
 #define USDHC_DUMMY_PIN NULL, 0
 
 #define MICROPY_USDHC1 \
@@ -131,3 +162,6 @@
     { IOMUXC_GPIO_B1_11_ENET_RX_ER, 0, 0xB0E9u }, \
     { IOMUXC_GPIO_EMC_41_ENET_MDIO, 0, 0xB0E9u }, \
     { IOMUXC_GPIO_EMC_40_ENET_MDC, 0, 0xB0E9u },
+
+#define MICROPY_BOARD_ROOT_POINTERS \
+    struct _machine_i2s_obj_t *machine_i2s_obj[MICROPY_HW_I2S_NUM];
diff --git a/ports/mimxrt/boards/MIMXRT1050_EVK/pins.csv b/ports/mimxrt/boards/MIMXRT1050_EVK/pins.csv
index 463079b129378..4bdd9e4f033cf 100644
--- a/ports/mimxrt/boards/MIMXRT1050_EVK/pins.csv
+++ b/ports/mimxrt/boards/MIMXRT1050_EVK/pins.csv
@@ -29,3 +29,10 @@ SDI,GPIO_SD_B0_03
 SDO,GPIO_SD_B0_02
 CS,GPIO_SD_B0_01
 LED_GREEN,GPIO_AD_B0_09
+MCK,GPIO_AD_B1_09
+SCK_RX,GPIO_AD_B1_11
+WS_RX,GPIO_AD_B1_10
+SD_RX,GPIO_AD_B1_12
+SCK_TX,GPIO_AD_B1_14
+WS_TX,GPIO_AD_B1_15
+SD_TX,GPIO_AD_B1_13
diff --git a/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.h b/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.h
index 475d07ddb115a..a3f0062389ddf 100644
--- a/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.h
+++ b/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.h
@@ -53,6 +53,36 @@
     { 0 }, { 0 }, \
     { IOMUXC_GPIO_AD_B1_07_LPI2C3_SCL }, { IOMUXC_GPIO_AD_B1_06_LPI2C3_SDA },
 
+#define MICROPY_PY_MACHINE_I2S (1)
+#define MICROPY_HW_I2S_NUM (1)
+#define I2S_CLOCK_MUX { 0, kCLOCK_Sai1Mux, kCLOCK_Sai2Mux }
+#define I2S_CLOCK_PRE_DIV { 0, kCLOCK_Sai1PreDiv, kCLOCK_Sai2PreDiv }
+#define I2S_CLOCK_DIV { 0, kCLOCK_Sai1Div, kCLOCK_Sai2Div }
+#define I2S_IOMUXC_GPR_MODE { 0, kIOMUXC_GPR_SAI1MClkOutputDir, kIOMUXC_GPR_SAI2MClkOutputDir }
+#define I2S_DMA_REQ_SRC_RX { 0, kDmaRequestMuxSai1Rx, kDmaRequestMuxSai2Rx }
+#define I2S_DMA_REQ_SRC_TX { 0, kDmaRequestMuxSai1Tx, kDmaRequestMuxSai2Tx }
+#define I2S_WM8960_RX_MODE  (1)
+
+#define I2S_GPIO(_hwid, _fn, _mode, _pin, _iomux) \
+    { \
+        .hw_id = _hwid, \
+        .fn = _fn, \
+        .mode = _mode, \
+        .name = MP_QSTR_##_pin, \
+        .iomux = {_iomux}, \
+    }
+
+#define I2S_GPIO_MAP \
+    { \
+        I2S_GPIO(1, MCK, TX, GPIO_AD_B1_09, IOMUXC_GPIO_AD_B1_09_SAI1_MCLK), \
+        I2S_GPIO(1, SCK, RX, GPIO_AD_B1_11, IOMUXC_GPIO_AD_B1_11_SAI1_RX_BCLK), \
+        I2S_GPIO(1, WS, RX, GPIO_AD_B1_10, IOMUXC_GPIO_AD_B1_10_SAI1_RX_SYNC), \
+        I2S_GPIO(1, SD, RX, GPIO_AD_B1_12, IOMUXC_GPIO_AD_B1_12_SAI1_RX_DATA00),  \
+        I2S_GPIO(1, SCK, TX, GPIO_AD_B1_14, IOMUXC_GPIO_AD_B1_14_SAI1_TX_BCLK), \
+        I2S_GPIO(1, WS, TX, GPIO_AD_B1_15, IOMUXC_GPIO_AD_B1_15_SAI1_TX_SYNC),  \
+        I2S_GPIO(1, SD, TX, GPIO_AD_B1_13, IOMUXC_GPIO_AD_B1_13_SAI1_TX_DATA00), \
+    }
+
 #define USDHC_DUMMY_PIN NULL, 0
 #define MICROPY_USDHC1 \
     { \
@@ -130,3 +160,6 @@
     { IOMUXC_GPIO_B1_11_ENET_RX_ER, 0, 0xB0E9u }, \
     { IOMUXC_GPIO_EMC_41_ENET_MDIO, 0, 0xB0E9u }, \
     { IOMUXC_GPIO_EMC_40_ENET_MDC, 0, 0xB0E9u },
+
+#define MICROPY_BOARD_ROOT_POINTERS \
+    struct _machine_i2s_obj_t *machine_i2s_obj[MICROPY_HW_I2S_NUM];
diff --git a/ports/mimxrt/boards/MIMXRT1060_EVK/pins.csv b/ports/mimxrt/boards/MIMXRT1060_EVK/pins.csv
index 463079b129378..4bdd9e4f033cf 100644
--- a/ports/mimxrt/boards/MIMXRT1060_EVK/pins.csv
+++ b/ports/mimxrt/boards/MIMXRT1060_EVK/pins.csv
@@ -29,3 +29,10 @@ SDI,GPIO_SD_B0_03
 SDO,GPIO_SD_B0_02
 CS,GPIO_SD_B0_01
 LED_GREEN,GPIO_AD_B0_09
+MCK,GPIO_AD_B1_09
+SCK_RX,GPIO_AD_B1_11
+WS_RX,GPIO_AD_B1_10
+SD_RX,GPIO_AD_B1_12
+SCK_TX,GPIO_AD_B1_14
+WS_TX,GPIO_AD_B1_15
+SD_TX,GPIO_AD_B1_13
diff --git a/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.h b/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.h
index 874991ac65bb2..fe1fb532b8c27 100644
--- a/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.h
+++ b/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.h
@@ -53,6 +53,36 @@
     { 0 }, { 0 }, \
     { IOMUXC_GPIO_AD_B1_07_LPI2C3_SCL }, { IOMUXC_GPIO_AD_B1_06_LPI2C3_SDA },
 
+#define MICROPY_PY_MACHINE_I2S (1)
+#define MICROPY_HW_I2S_NUM (1)
+#define I2S_CLOCK_MUX { 0, kCLOCK_Sai1Mux, kCLOCK_Sai2Mux }
+#define I2S_CLOCK_PRE_DIV { 0, kCLOCK_Sai1PreDiv, kCLOCK_Sai2PreDiv }
+#define I2S_CLOCK_DIV { 0, kCLOCK_Sai1Div, kCLOCK_Sai2Div }
+#define I2S_IOMUXC_GPR_MODE { 0, kIOMUXC_GPR_SAI1MClkOutputDir, kIOMUXC_GPR_SAI2MClkOutputDir }
+#define I2S_DMA_REQ_SRC_RX { 0, kDmaRequestMuxSai1Rx, kDmaRequestMuxSai2Rx }
+#define I2S_DMA_REQ_SRC_TX { 0, kDmaRequestMuxSai1Tx, kDmaRequestMuxSai2Tx }
+#define I2S_WM8960_RX_MODE  (1)
+
+#define I2S_GPIO(_hwid, _fn, _mode, _pin, _iomux) \
+    { \
+        .hw_id = _hwid, \
+        .fn = _fn, \
+        .mode = _mode, \
+        .name = MP_QSTR_##_pin, \
+        .iomux = {_iomux}, \
+    }
+
+#define I2S_GPIO_MAP \
+    { \
+        I2S_GPIO(1, MCK, TX, GPIO_AD_B1_09, IOMUXC_GPIO_AD_B1_09_SAI1_MCLK), \
+        I2S_GPIO(1, SCK, RX, GPIO_AD_B1_11, IOMUXC_GPIO_AD_B1_11_SAI1_RX_BCLK), \
+        I2S_GPIO(1, WS, RX, GPIO_AD_B1_10, IOMUXC_GPIO_AD_B1_10_SAI1_RX_SYNC), \
+        I2S_GPIO(1, SD, RX, GPIO_AD_B1_12, IOMUXC_GPIO_AD_B1_12_SAI1_RX_DATA00),  \
+        I2S_GPIO(1, SCK, TX, GPIO_AD_B1_14, IOMUXC_GPIO_AD_B1_14_SAI1_TX_BCLK), \
+        I2S_GPIO(1, WS, TX, GPIO_AD_B1_15, IOMUXC_GPIO_AD_B1_15_SAI1_TX_SYNC),  \
+        I2S_GPIO(1, SD, TX, GPIO_AD_B1_13, IOMUXC_GPIO_AD_B1_13_SAI1_TX_DATA00), \
+    }
+
 #define USDHC_DUMMY_PIN NULL, 0
 #define MICROPY_USDHC1 \
     { \
@@ -130,3 +160,6 @@
     { IOMUXC_GPIO_B1_11_ENET_RX_ER, 0, 0xB0E9u }, \
     { IOMUXC_GPIO_EMC_41_ENET_MDIO, 0, 0xB0E9u }, \
     { IOMUXC_GPIO_EMC_40_ENET_MDC, 0, 0xB0E9u },
+
+#define MICROPY_BOARD_ROOT_POINTERS \
+    struct _machine_i2s_obj_t *machine_i2s_obj[MICROPY_HW_I2S_NUM];
diff --git a/ports/mimxrt/boards/MIMXRT1064_EVK/pins.csv b/ports/mimxrt/boards/MIMXRT1064_EVK/pins.csv
index 463079b129378..4bdd9e4f033cf 100644
--- a/ports/mimxrt/boards/MIMXRT1064_EVK/pins.csv
+++ b/ports/mimxrt/boards/MIMXRT1064_EVK/pins.csv
@@ -29,3 +29,10 @@ SDI,GPIO_SD_B0_03
 SDO,GPIO_SD_B0_02
 CS,GPIO_SD_B0_01
 LED_GREEN,GPIO_AD_B0_09
+MCK,GPIO_AD_B1_09
+SCK_RX,GPIO_AD_B1_11
+WS_RX,GPIO_AD_B1_10
+SD_RX,GPIO_AD_B1_12
+SCK_TX,GPIO_AD_B1_14
+WS_TX,GPIO_AD_B1_15
+SD_TX,GPIO_AD_B1_13
diff --git a/ports/mimxrt/boards/OLIMEX_RT1010/mpconfigboard.h b/ports/mimxrt/boards/OLIMEX_RT1010/mpconfigboard.h
index e004050aeeb98..c30caa0470754 100644
--- a/ports/mimxrt/boards/OLIMEX_RT1010/mpconfigboard.h
+++ b/ports/mimxrt/boards/OLIMEX_RT1010/mpconfigboard.h
@@ -48,3 +48,39 @@
 #define IOMUX_TABLE_I2C \
     { IOMUXC_GPIO_AD_14_LPI2C1_SCL }, { IOMUXC_GPIO_AD_13_LPI2C1_SDA }, \
     { IOMUXC_GPIO_AD_08_LPI2C2_SCL }, { IOMUXC_GPIO_AD_07_LPI2C2_SDA },
+
+#define MICROPY_PY_MACHINE_I2S (1)
+#define MICROPY_HW_I2S_NUM (3)
+#define I2S_CLOCK_MUX { 0, kCLOCK_Sai1Mux, 0, kCLOCK_Sai3Mux }
+#define I2S_CLOCK_PRE_DIV { 0, kCLOCK_Sai1PreDiv, 0, kCLOCK_Sai3PreDiv }
+#define I2S_CLOCK_DIV { 0, kCLOCK_Sai1Div, 0, kCLOCK_Sai3Div }
+#define I2S_IOMUXC_GPR_MODE { 0, kIOMUXC_GPR_SAI1MClkOutputDir, 0, kIOMUXC_GPR_SAI3MClkOutputDir }
+#define I2S_DMA_REQ_SRC_RX { 0, kDmaRequestMuxSai1Rx, 0, kDmaRequestMuxSai3Rx }
+#define I2S_DMA_REQ_SRC_TX { 0, kDmaRequestMuxSai1Tx, 0, kDmaRequestMuxSai3Tx }
+
+#define I2S_GPIO(_hwid, _fn, _mode, _pin, _iomux) \
+    { \
+        .hw_id = _hwid, \
+        .fn = _fn, \
+        .mode = _mode, \
+        .name = MP_QSTR_##_pin, \
+        .iomux = {_iomux}, \
+    }
+
+#define I2S_GPIO_MAP \
+    { \
+        I2S_GPIO(1, MCK, TX, GPIO_08, IOMUXC_GPIO_08_SAI1_MCLK), /* pin D8 */ \
+        I2S_GPIO(1, SCK, RX, GPIO_01, IOMUXC_GPIO_01_SAI1_RX_BCLK), /* pin D1 */ \
+        I2S_GPIO(1, WS, RX, GPIO_02, IOMUXC_GPIO_02_SAI1_RX_SYNC), /* pin D2 */ \
+        I2S_GPIO(1, SD, RX, GPIO_03, IOMUXC_GPIO_03_SAI1_RX_DATA00), /* pin D3 */ \
+        I2S_GPIO(1, SCK, TX, GPIO_06, IOMUXC_GPIO_06_SAI1_TX_BCLK), /* pin D6 */ \
+        I2S_GPIO(1, WS, TX, GPIO_07, IOMUXC_GPIO_07_SAI1_TX_SYNC), /* pin D7 */ \
+        I2S_GPIO(1, SD, TX, GPIO_04, IOMUXC_GPIO_04_SAI1_TX_DATA00), /* pin D4 */ \
+        I2S_GPIO(3, SCK, TX, GPIO_SD_01, IOMUXC_GPIO_SD_01_SAI3_TX_BCLK), /* pin D10 */ \
+        I2S_GPIO(3, WS, TX, GPIO_SD_00, IOMUXC_GPIO_SD_00_SAI3_TX_SYNC), /* pin D9 */ \
+        I2S_GPIO(3, SD, TX, GPIO_SD_02, IOMUXC_GPIO_SD_02_SAI3_TX_DATA) /* pin D11 */ \
+    }
+
+
+#define MICROPY_BOARD_ROOT_POINTERS \
+    struct _machine_i2s_obj_t *machine_i2s_obj[MICROPY_HW_I2S_NUM];
diff --git a/ports/mimxrt/boards/OLIMEX_RT1010/pins.csv b/ports/mimxrt/boards/OLIMEX_RT1010/pins.csv
index d294f86b6d9e6..d3c68aba2d4a0 100644
--- a/ports/mimxrt/boards/OLIMEX_RT1010/pins.csv
+++ b/ports/mimxrt/boards/OLIMEX_RT1010/pins.csv
@@ -34,3 +34,10 @@ RX, GPIO_09
 TX, GPIO_10
 RELAY1,GPIO_SD_12
 RELAY2,GPIO_SD_13
+MCK,GPIO_08
+SCK_RX,GPIO_01
+WS_RX,GPIO_02
+SD_RX,GPIO_03
+SCK_TX,GPIO_06
+WS_TX,GPIO_07
+SD_TX,GPIO_04
diff --git a/ports/mimxrt/boards/SEEED_ARCH_MIX/mpconfigboard.h b/ports/mimxrt/boards/SEEED_ARCH_MIX/mpconfigboard.h
index 53a3d4ed78232..a6502d3353d8b 100644
--- a/ports/mimxrt/boards/SEEED_ARCH_MIX/mpconfigboard.h
+++ b/ports/mimxrt/boards/SEEED_ARCH_MIX/mpconfigboard.h
@@ -65,6 +65,35 @@
     { IOMUXC_GPIO_B0_04_LPI2C2_SCL }, { IOMUXC_GPIO_B0_05_LPI2C2_SDA }, \
     { IOMUXC_GPIO_AD_B1_07_LPI2C3_SCL }, { IOMUXC_GPIO_AD_B1_06_LPI2C3_SDA }
 
+#define MICROPY_PY_MACHINE_I2S (1)
+#define MICROPY_HW_I2S_NUM (1)
+#define I2S_CLOCK_MUX { 0, kCLOCK_Sai1Mux }
+#define I2S_CLOCK_PRE_DIV { 0, kCLOCK_Sai1PreDiv }
+#define I2S_CLOCK_DIV { 0, kCLOCK_Sai1Div }
+#define I2S_IOMUXC_GPR_MODE { 0, kIOMUXC_GPR_SAI1MClkOutputDir }
+#define I2S_DMA_REQ_SRC_RX { 0, kDmaRequestMuxSai1Rx }
+#define I2S_DMA_REQ_SRC_TX { 0, kDmaRequestMuxSai1Tx }
+
+#define I2S_GPIO(_hwid, _fn, _mode, _pin, _iomux) \
+    { \
+        .hw_id = _hwid, \
+        .fn = _fn, \
+        .mode = _mode, \
+        .name = MP_QSTR_##_pin, \
+        .iomux = {_iomux}, \
+    }
+
+#define I2S_GPIO_MAP \
+    { \
+        I2S_GPIO(1, MCK, TX, GPIO_AD_B1_09, IOMUXC_GPIO_AD_B1_09_SAI1_MCLK), /* pin J4 09 */ \
+        I2S_GPIO(1, SCK, RX, GPIO_AD_B1_11, IOMUXC_GPIO_AD_B1_11_SAI1_RX_BCLK), /* pin J4 11 */ \
+        I2S_GPIO(1, WS, RX, GPIO_AD_B1_10, IOMUXC_GPIO_AD_B1_10_SAI1_RX_SYNC), /* pin J4 10 */ \
+        I2S_GPIO(1, SD, RX, GPIO_AD_B1_12, IOMUXC_GPIO_AD_B1_12_SAI1_RX_DATA00), /* pin J4 12 */ \
+        I2S_GPIO(1, SCK, TX, GPIO_AD_B1_14, IOMUXC_GPIO_AD_B1_14_SAI1_TX_BCLK), /* pin J4 14 */ \
+        I2S_GPIO(1, WS, TX, GPIO_AD_B1_15, IOMUXC_GPIO_AD_B1_15_SAI1_TX_SYNC), /* pin J4 15 */ \
+        I2S_GPIO(1, SD, TX, GPIO_AD_B1_13, IOMUXC_GPIO_AD_B1_13_SAI1_TX_DATA00) /* pin J4 13 */ \
+    }
+
 #define USDHC_DUMMY_PIN NULL, 0
 
 #define MICROPY_USDHC1 \
@@ -144,3 +173,6 @@
 #define MIMXRT_IOMUXC_SEMC_WE IOMUXC_GPIO_EMC_28_SEMC_WE
 
 #define MIMXRT_IOMUXC_SEMC_CS0 IOMUXC_GPIO_EMC_29_SEMC_CS0
+
+#define MICROPY_BOARD_ROOT_POINTERS \
+    struct _machine_i2s_obj_t *machine_i2s_obj[MICROPY_HW_I2S_NUM];
diff --git a/ports/mimxrt/boards/SEEED_ARCH_MIX/pins.csv b/ports/mimxrt/boards/SEEED_ARCH_MIX/pins.csv
index 0183795cd73e1..6b757fae4b07c 100644
--- a/ports/mimxrt/boards/SEEED_ARCH_MIX/pins.csv
+++ b/ports/mimxrt/boards/SEEED_ARCH_MIX/pins.csv
@@ -60,3 +60,10 @@ J5_50,GPIO_AD_B0_02
 LED_RED,GPIO_AD_B0_09
 LED_GREEN,GPIO_AD_B0_10
 LED_BLUE,GPIO_AD_B0_11
+MCK,GPIO_AD_B1_09
+SCK_RX,GPIO_AD_B1_11
+WS_RX,GPIO_AD_B1_10
+SD_RX,GPIO_AD_B1_12
+SCK_TX,GPIO_AD_B1_14
+WS_TX,GPIO_AD_B1_15
+SD_TX,GPIO_AD_B1_13
diff --git a/ports/mimxrt/boards/TEENSY40/mpconfigboard.h b/ports/mimxrt/boards/TEENSY40/mpconfigboard.h
index 08a774d886bb4..f2ea86bd0ec66 100644
--- a/ports/mimxrt/boards/TEENSY40/mpconfigboard.h
+++ b/ports/mimxrt/boards/TEENSY40/mpconfigboard.h
@@ -58,6 +58,41 @@
     { IOMUXC_GPIO_AD_B1_07_LPI2C3_SCL }, { IOMUXC_GPIO_AD_B1_06_LPI2C3_SDA }, \
     { IOMUXC_GPIO_AD_B0_12_LPI2C4_SCL }, { IOMUXC_GPIO_AD_B0_13_LPI2C4_SDA },
 
+#define MICROPY_PY_MACHINE_I2S (1)
+#define MICROPY_HW_I2S_NUM (2)
+#define I2S_CLOCK_MUX { 0, kCLOCK_Sai1Mux, kCLOCK_Sai2Mux }
+#define I2S_CLOCK_PRE_DIV { 0, kCLOCK_Sai1PreDiv, kCLOCK_Sai2PreDiv }
+#define I2S_CLOCK_DIV { 0, kCLOCK_Sai1Div, kCLOCK_Sai2Div }
+#define I2S_IOMUXC_GPR_MODE { 0, kIOMUXC_GPR_SAI1MClkOutputDir, kIOMUXC_GPR_SAI2MClkOutputDir }
+#define I2S_DMA_REQ_SRC_RX { 0, kDmaRequestMuxSai1Rx, kDmaRequestMuxSai2Rx }
+#define I2S_DMA_REQ_SRC_TX { 0, kDmaRequestMuxSai1Tx, kDmaRequestMuxSai2Tx }
+
+#define I2S_GPIO(_hwid, _fn, _mode, _pin, _iomux) \
+    { \
+        .hw_id = _hwid, \
+        .fn = _fn, \
+        .mode = _mode, \
+        .name = MP_QSTR_##_pin, \
+        .iomux = {_iomux}, \
+    }
+
+#define I2S_GPIO_MAP \
+    { \
+        I2S_GPIO(1, SCK, RX, GPIO_AD_B1_11, IOMUXC_GPIO_AD_B1_11_SAI1_RX_BCLK), /* pin 21 */ \
+        I2S_GPIO(1, WS, RX, GPIO_AD_B1_10, IOMUXC_GPIO_AD_B1_10_SAI1_RX_SYNC), /* pin 20 */ \
+        I2S_GPIO(1, SD, RX, GPIO_B1_00, IOMUXC_GPIO_B1_00_SAI1_RX_DATA00), /* pin 8 */ \
+        I2S_GPIO(1, SCK, TX, GPIO_AD_B1_14, IOMUXC_GPIO_AD_B1_14_SAI1_TX_BCLK), /* pin 26 */ \
+        I2S_GPIO(1, SCK, TX, GPIO_B1_02, IOMUXC_GPIO_B1_02_SAI1_TX_BCLK), /* pin 36 */ \
+        I2S_GPIO(1, WS, TX, GPIO_AD_B1_15, IOMUXC_GPIO_AD_B1_15_SAI1_TX_SYNC), /* pin 27 */ \
+        I2S_GPIO(1, WS, TX, GPIO_B1_03, IOMUXC_GPIO_B1_03_SAI1_TX_SYNC), /* pin 37 */ \
+        I2S_GPIO(1, SD, TX, GPIO_B1_01, IOMUXC_GPIO_B1_01_SAI1_TX_DATA00), /* pin 7 */ \
+        I2S_GPIO(1, MCK, TX, GPIO_AD_B1_09, IOMUXC_GPIO_AD_B1_09_SAI1_MCLK), /* pin 23 */ \
+        I2S_GPIO(2, SCK, TX, GPIO_EMC_06, IOMUXC_GPIO_EMC_06_SAI2_TX_BCLK), /* pin 4 */ \
+        I2S_GPIO(2, WS, TX, GPIO_EMC_05, IOMUXC_GPIO_EMC_05_SAI2_TX_SYNC), /* pin 3 */ \
+        I2S_GPIO(2, SD, TX, GPIO_EMC_04, IOMUXC_GPIO_EMC_04_SAI2_TX_DATA), /* pin 2 */ \
+        I2S_GPIO(2, MCK, TX, GPIO_EMC_07, IOMUXC_GPIO_EMC_07_SAI2_MCLK) /* pin 33 */ \
+    }
+
 #define USDHC_DUMMY_PIN NULL, 0
 #define MICROPY_USDHC1 \
     { \
@@ -69,3 +104,6 @@
         .data2 = { GPIO_SD_B0_04_USDHC1_DATA2 }, \
         .data3 = { GPIO_SD_B0_05_USDHC1_DATA3 }, \
     }
+
+#define MICROPY_BOARD_ROOT_POINTERS \
+    struct _machine_i2s_obj_t *machine_i2s_obj[MICROPY_HW_I2S_NUM];
diff --git a/ports/mimxrt/boards/TEENSY40/pins.csv b/ports/mimxrt/boards/TEENSY40/pins.csv
index 0ea4f1373152c..b4509e5848cfd 100644
--- a/ports/mimxrt/boards/TEENSY40/pins.csv
+++ b/ports/mimxrt/boards/TEENSY40/pins.csv
@@ -52,4 +52,11 @@ A10,GPIO_AD_B0_12
 A11,GPIO_AD_B0_13
 A12,GPIO_AD_B1_14
 A13,GPIO_AD_B1_15
-LED,GPIO_B0_03
\ No newline at end of file
+LED,GPIO_B0_03
+MCK,GPIO_AD_B1_09
+SCK_RX,GPIO_AD_B1_11
+WS_RX,GPIO_AD_B1_10
+SD_RX,GPIO_B1_00
+SCK_TX,GPIO_EMC_06
+WS_TX,GPIO_EMC_05
+SD_TX,GPIO_EMC_04
diff --git a/ports/mimxrt/boards/TEENSY41/mpconfigboard.h b/ports/mimxrt/boards/TEENSY41/mpconfigboard.h
index 3b8d497c3f792..7d75f62f36cf9 100644
--- a/ports/mimxrt/boards/TEENSY41/mpconfigboard.h
+++ b/ports/mimxrt/boards/TEENSY41/mpconfigboard.h
@@ -58,6 +58,43 @@
     { IOMUXC_GPIO_AD_B1_07_LPI2C3_SCL }, { IOMUXC_GPIO_AD_B1_06_LPI2C3_SDA }, \
     { IOMUXC_GPIO_AD_B0_12_LPI2C4_SCL }, { IOMUXC_GPIO_AD_B0_13_LPI2C4_SDA },
 
+#define MICROPY_PY_MACHINE_I2S (1)
+#define MICROPY_HW_I2S_NUM (2)
+#define I2S_CLOCK_MUX { 0, kCLOCK_Sai1Mux, kCLOCK_Sai2Mux }
+#define I2S_CLOCK_PRE_DIV { 0, kCLOCK_Sai1PreDiv, kCLOCK_Sai2PreDiv }
+#define I2S_CLOCK_DIV { 0, kCLOCK_Sai1Div, kCLOCK_Sai2Div }
+#define I2S_IOMUXC_GPR_MODE { 0, kIOMUXC_GPR_SAI1MClkOutputDir, kIOMUXC_GPR_SAI2MClkOutputDir }
+#define I2S_DMA_REQ_SRC_RX { 0, kDmaRequestMuxSai1Rx, kDmaRequestMuxSai2Rx }
+#define I2S_DMA_REQ_SRC_TX { 0, kDmaRequestMuxSai1Tx, kDmaRequestMuxSai2Tx }
+
+#define I2S_GPIO(_hwid, _fn, _mode, _pin, _iomux) \
+    { \
+        .hw_id = _hwid, \
+        .fn = _fn, \
+        .mode = _mode, \
+        .name = MP_QSTR_##_pin, \
+        .iomux = {_iomux}, \
+    }
+
+#define I2S_GPIO_MAP \
+    { \
+        I2S_GPIO(1, SCK, RX, GPIO_AD_B1_11, IOMUXC_GPIO_AD_B1_11_SAI1_RX_BCLK), /* pin 21 */ \
+        I2S_GPIO(1, WS, RX, GPIO_AD_B1_10, IOMUXC_GPIO_AD_B1_10_SAI1_RX_SYNC), /* pin 20 */ \
+        I2S_GPIO(1, SD, RX, GPIO_AD_B1_12, IOMUXC_GPIO_AD_B1_12_SAI1_RX_DATA00), /* pin 38 */ \
+        I2S_GPIO(1, SD, RX, GPIO_B1_00, IOMUXC_GPIO_B1_00_SAI1_RX_DATA00), /* pin 8 */ \
+        I2S_GPIO(1, SCK, TX, GPIO_AD_B1_14, IOMUXC_GPIO_AD_B1_14_SAI1_TX_BCLK), /* pin 26 */ \
+        I2S_GPIO(1, SCK, TX, GPIO_B1_02, IOMUXC_GPIO_B1_02_SAI1_TX_BCLK), /* pin 36 */ \
+        I2S_GPIO(1, WS, TX, GPIO_AD_B1_15, IOMUXC_GPIO_AD_B1_15_SAI1_TX_SYNC), /* pin 27 */ \
+        I2S_GPIO(1, WS, TX, GPIO_B1_03, IOMUXC_GPIO_B1_03_SAI1_TX_SYNC), /* pin 37 */ \
+        I2S_GPIO(1, SD, TX, GPIO_AD_B1_13, IOMUXC_GPIO_AD_B1_13_SAI1_TX_DATA00), /* pin 39 */ \
+        I2S_GPIO(1, SD, TX, GPIO_B1_01, IOMUXC_GPIO_B1_01_SAI1_TX_DATA00), /* pin 7 */ \
+        I2S_GPIO(1, MCK, TX, GPIO_AD_B1_09, IOMUXC_GPIO_AD_B1_09_SAI1_MCLK), /* pin 23 */ \
+        I2S_GPIO(2, SCK, TX, GPIO_EMC_06, IOMUXC_GPIO_EMC_06_SAI2_TX_BCLK), /* pin 4 */ \
+        I2S_GPIO(2, WS, TX, GPIO_EMC_05, IOMUXC_GPIO_EMC_05_SAI2_TX_SYNC), /* pin 3 */ \
+        I2S_GPIO(2, SD, TX, GPIO_EMC_04, IOMUXC_GPIO_EMC_04_SAI2_TX_DATA), /* pin 2 */ \
+        I2S_GPIO(2, MCK, TX, GPIO_EMC_07, IOMUXC_GPIO_EMC_07_SAI2_MCLK) /* pin 33 */ \
+    }
+
 #define USDHC_DUMMY_PIN NULL, 0
 #define MICROPY_USDHC1 \
     { \
@@ -90,3 +127,6 @@
     { IOMUXC_GPIO_B1_11_ENET_RX_ER, 0, 0xB0E9u }, \
     { IOMUXC_GPIO_B1_15_ENET_MDIO, 0, 0xB0E9u }, \
     { IOMUXC_GPIO_B1_14_ENET_MDC, 0, 0xB0E9u },
+
+#define MICROPY_BOARD_ROOT_POINTERS \
+    struct _machine_i2s_obj_t *machine_i2s_obj[MICROPY_HW_I2S_NUM];
diff --git a/ports/mimxrt/boards/TEENSY41/pins.csv b/ports/mimxrt/boards/TEENSY41/pins.csv
index 88b91f25403ec..b28a22312c707 100755
--- a/ports/mimxrt/boards/TEENSY41/pins.csv
+++ b/ports/mimxrt/boards/TEENSY41/pins.csv
@@ -80,4 +80,11 @@ A10,GPIO_AD_B0_12
 A11,GPIO_AD_B0_13
 A12,GPIO_AD_B1_14
 A13,GPIO_AD_B1_15
-LED,GPIO_B0_03
\ No newline at end of file
+LED,GPIO_B0_03
+MCK,GPIO_AD_B1_09
+SCK_RX,GPIO_AD_B1_11
+WS_RX,GPIO_AD_B1_10
+SD_RX,GPIO_B1_00
+SCK_TX,GPIO_EMC_06
+WS_TX,GPIO_EMC_05
+SD_TX,GPIO_EMC_04
diff --git a/ports/mimxrt/dma_channel.c b/ports/mimxrt/dma_manager.c
similarity index 86%
rename from ports/mimxrt/dma_channel.c
rename to ports/mimxrt/dma_manager.c
index c6cae9da9c1aa..2890a155864ff 100644
--- a/ports/mimxrt/dma_channel.c
+++ b/ports/mimxrt/dma_manager.c
@@ -24,7 +24,10 @@
  * THE SOFTWARE.
  */
 
-#include "dma_channel.h"
+#include <stdbool.h>
+#include "py/mpconfig.h"
+#include "fsl_edma.h"
+#include "dma_manager.h"
 
 // List of channel flags: true: channel used, false: channel available
 static bool channel_list[FSL_FEATURE_DMAMUX_MODULE_CHANNEL] = {
@@ -39,6 +42,8 @@ static bool channel_list[FSL_FEATURE_DMAMUX_MODULE_CHANNEL] = {
     #endif
 };
 
+STATIC bool dma_initialized = false;
+
 // allocate_channel(): retrieve an available channel. Return the number or -1
 int allocate_dma_channel(void) {
     for (int i = 0; i < ARRAY_SIZE(channel_list); i++) {
@@ -56,3 +61,12 @@ void free_dma_channel(int n) {
         channel_list[n] = false;
     }
 }
+
+void dma_init(void) {
+    if (!dma_initialized) {
+        edma_config_t dmaConfig;
+        EDMA_GetDefaultConfig(&dmaConfig);
+        EDMA_Init(DMA0, &dmaConfig);
+        dma_initialized = true;
+    }
+}
diff --git a/ports/mimxrt/dma_channel.h b/ports/mimxrt/dma_manager.h
similarity index 98%
rename from ports/mimxrt/dma_channel.h
rename to ports/mimxrt/dma_manager.h
index 3fe66a3dbb4fd..77e9689b225ab 100644
--- a/ports/mimxrt/dma_channel.h
+++ b/ports/mimxrt/dma_manager.h
@@ -30,5 +30,6 @@
 
 int allocate_dma_channel(void);
 void free_dma_channel(int n);
+void dma_init(void);
 
 #endif // MICROPY_INCLUDED_MIMXRT_DMACHANNEL_H
diff --git a/ports/mimxrt/machine_i2s.c b/ports/mimxrt/machine_i2s.c
new file mode 100644
index 0000000000000..a41dfe94f13f1
--- /dev/null
+++ b/ports/mimxrt/machine_i2s.c
@@ -0,0 +1,1228 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2022 Mike Teachman
+ * Copyright (c) 2022 Robert Hammelrath
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include <stdio.h>
+#include <stdint.h>
+#include <string.h>
+#include <stdlib.h>
+#include <stdbool.h>
+
+#include "py/obj.h"
+#include "py/runtime.h"
+#include "py/mphal.h"
+#include "py/misc.h"
+#include "py/stream.h"
+#include "py/objstr.h"
+#include "modmachine.h"
+#include "dma_manager.h"
+
+#include "clock_config.h"
+#include "fsl_iomuxc.h"
+#include "fsl_dmamux.h"
+#include "fsl_edma.h"
+#include "fsl_sai.h"
+
+#if MICROPY_PY_MACHINE_I2S
+// The I2S module has 3 modes of operation:
+//
+// Mode1:  Blocking
+// - readinto() and write() methods block until the supplied buffer is filled (read) or emptied (write)
+// - this is the default mode of operation
+//
+// Mode2:  Non-Blocking
+// - readinto() and write() methods return immediately
+// - buffer filling and emptying happens asynchronously to the main MicroPython task
+// - a callback function is called when the supplied buffer has been filled (read) or emptied (write)
+// - non-blocking mode is enabled when a callback is set with the irq() method
+// - the DMA callback is used to implement the asynchronous background operations
+//
+// Mode3: Uasyncio
+// - implements the stream protocol
+// - uasyncio mode is enabled when the ioctl() function is called
+// - the state of the internal ring buffer is used to detect that I2S samples can be read or written
+//
+// The samples contained in the app buffer supplied for the readinto() and write() methods have the following convention:
+//   Mono:  little endian format
+//   Stereo:  little endian format, left channel first
+//
+// I2S terms:
+//   "frame":  consists of two audio samples (Left audio sample + Right audio sample)
+//
+// Misc:
+// - for Mono configuration:
+//   - readinto method: samples are gathered from the L channel only
+//   - write method: every sample is output to both the L and R channels
+// - for readinto method the I2S hardware is read using 8-byte frames
+//   (this is standard for almost all I2S hardware, such as MEMS microphones)
+// - all 3 Modes of operation are implemented using the peripheral drivers in the NXP MCUXpresso SDK
+// - all sample data transfers use DMA
+// - the DMA ping-pong buffer needs to be aligned to a cache line size of 32 bytes.  32 byte
+//   alignment is needed to use the routines that clean and invalidate D-Cache which work on a
+//   32 byte address boundary.
+// - master clock frequency is sampling frequency * 256
+
+// DMA ping-pong buffer size was empirically determined.  It is a tradeoff between:
+// 1. memory use (smaller buffer size desirable to reduce memory footprint)
+// 2. interrupt frequency (larger buffer size desirable to reduce interrupt frequency)
+// The sizeof 1/2 of the DMA buffer must be evenly divisible by the cache line size of 32 bytes.
+#define SIZEOF_DMA_BUFFER_IN_BYTES (256)
+#define SIZEOF_HALF_DMA_BUFFER_IN_BYTES (SIZEOF_DMA_BUFFER_IN_BYTES / 2)
+
+// For non-blocking mode, to avoid underflow/overflow, sample data is written/read to/from the ring buffer at a rate faster
+// than the DMA transfer rate
+#define NON_BLOCKING_RATE_MULTIPLIER (4)
+#define SIZEOF_NON_BLOCKING_COPY_IN_BYTES (SIZEOF_HALF_DMA_BUFFER_IN_BYTES * NON_BLOCKING_RATE_MULTIPLIER)
+
+#define NUM_I2S_USER_FORMATS (4)
+#define I2S_RX_FRAME_SIZE_IN_BYTES (8)
+#define AUDIO_PLL_CLOCK (2U)
+#define SAI_CHANNEL_0 (0)
+#define SAI_NUM_AUDIO_CHANNELS (2U)
+
+typedef enum {
+    SCK,
+    WS,
+    SD,
+    MCK
+} i2s_pin_function_t;
+
+typedef enum {
+    RX,
+    TX,
+} i2s_mode_t;
+
+typedef enum {
+    MONO,
+    STEREO
+} format_t;
+
+typedef enum {
+    BLOCKING,
+    NON_BLOCKING,
+    UASYNCIO
+} io_mode_t;
+
+typedef enum {
+    TOP_HALF,
+    BOTTOM_HALF
+} ping_pong_t;
+
+typedef struct _ring_buf_t {
+    uint8_t *buffer;
+    size_t head;
+    size_t tail;
+    size_t size;
+} ring_buf_t;
+
+typedef struct _non_blocking_descriptor_t {
+    mp_buffer_info_t appbuf;
+    uint32_t index;
+    bool copy_in_progress;
+} non_blocking_descriptor_t;
+
+typedef struct _machine_i2s_obj_t {
+    mp_obj_base_t base;
+    uint8_t i2s_id;
+    mp_hal_pin_obj_t sck;
+    mp_hal_pin_obj_t ws;
+    mp_hal_pin_obj_t sd;
+    mp_hal_pin_obj_t mck;
+    i2s_mode_t mode;
+    int8_t bits;
+    format_t format;
+    int32_t rate;
+    int32_t ibuf;
+    mp_obj_t callback_for_non_blocking;
+    uint8_t dma_buffer[SIZEOF_DMA_BUFFER_IN_BYTES + 0x1f]; // 0x1f related to D-Cache alignment
+    uint8_t *dma_buffer_dcache_aligned;
+    ring_buf_t ring_buffer;
+    uint8_t *ring_buffer_storage;
+    non_blocking_descriptor_t non_blocking_descriptor;
+    io_mode_t io_mode;
+    I2S_Type *i2s_inst;
+    int dma_channel;
+    edma_handle_t edmaHandle;
+    edma_tcd_t *edmaTcd;
+} machine_i2s_obj_t;
+
+typedef struct _iomux_table_t {
+    uint32_t muxRegister;
+    uint32_t muxMode;
+    uint32_t inputRegister;
+    uint32_t inputDaisy;
+    uint32_t configRegister;
+} iomux_table_t;
+
+typedef struct _gpio_map_t {
+    uint8_t hw_id;
+    i2s_pin_function_t fn;
+    i2s_mode_t mode;
+    qstr name;
+    iomux_table_t iomux;
+} gpio_map_t;
+
+typedef struct _i2s_clock_config_t {
+    sai_sample_rate_t rate;
+    const clock_audio_pll_config_t *pll_config;
+    uint32_t clock_pre_divider;
+    uint32_t clock_divider;
+} i2s_clock_config_t;
+
+STATIC mp_obj_t machine_i2s_deinit(mp_obj_t self_in);
+
+// The frame map is used with the readinto() method to transform the audio sample data coming
+// from DMA memory (32-bit stereo) to the format specified
+// in the I2S constructor.  e.g.  16-bit mono
+STATIC const int8_t i2s_frame_map[NUM_I2S_USER_FORMATS][I2S_RX_FRAME_SIZE_IN_BYTES] = {
+    {-1, -1,  0,  1, -1, -1, -1, -1 },  // Mono, 16-bits
+    { 0,  1,  2,  3, -1, -1, -1, -1 },  // Mono, 32-bits
+    {-1, -1,  0,  1, -1, -1,  2,  3 },  // Stereo, 16-bits
+    { 0,  1,  2,  3,  4,  5,  6,  7 },  // Stereo, 32-bits
+};
+
+// 2 PLL configurations
+// PLL output frequency = 24MHz * (.loopDivider + .numerator/.denominator)
+
+// Configuration 1: for sampling frequencies [Hz]:  8000, 12000, 16000, 24000, 32000, 48000
+// Clock frequency = 786,432,480 Hz
+STATIC const clock_audio_pll_config_t audioPllConfig_8000_48000 = {
+    .loopDivider = 32,          // PLL loop divider. Valid range for DIV_SELECT divider value: 27~54
+    .postDivider = 1,           // Divider after the PLL, should only be 1, 2, 4, 8, 16
+    .numerator = 76802,         // 30 bit numerator of fractional loop divider
+    .denominator = 100000,      // 30 bit denominator of fractional loop divider
+    .src = kCLOCK_PllClkSrc24M  // Pll clock source
+};
+
+// Configuration 2: for sampling frequencies [Hz]:  11025, 22050, 44100
+// Clock frequency = 722,534,880
+STATIC const clock_audio_pll_config_t audioPllConfig_11025_44100 = {
+    .loopDivider = 30,          // PLL loop divider. Valid range for DIV_SELECT divider value: 27~54
+    .postDivider = 1,           // Divider after the PLL, should only be 1, 2, 4, 8, 16
+    .numerator = 10562,         // 30 bit numerator of fractional loop divider
+    .denominator = 100000,      // 30 bit denominator of fractional loop divider
+    .src = kCLOCK_PllClkSrc24M  // Pll clock source
+};
+
+STATIC const i2s_clock_config_t clock_config_map[] = {
+    {kSAI_SampleRate8KHz, &audioPllConfig_8000_48000, 5, 63},
+    {kSAI_SampleRate11025Hz, &audioPllConfig_11025_44100, 3, 63},
+    {kSAI_SampleRate12KHz, &audioPllConfig_8000_48000, 3, 63},
+    {kSAI_SampleRate16KHz, &audioPllConfig_8000_48000, 2, 63},
+    {kSAI_SampleRate22050Hz, &audioPllConfig_11025_44100, 1, 63},
+    {kSAI_SampleRate24KHz, &audioPllConfig_8000_48000, 1, 63},
+    {kSAI_SampleRate32KHz, &audioPllConfig_8000_48000, 1, 47},
+    {kSAI_SampleRate44100Hz, &audioPllConfig_11025_44100, 0, 63},
+    {kSAI_SampleRate48KHz, &audioPllConfig_8000_48000, 0, 63}
+};
+
+STATIC const I2S_Type *i2s_base_ptr[] = I2S_BASE_PTRS;
+STATIC const clock_mux_t i2s_clock_mux[] = I2S_CLOCK_MUX;
+STATIC const clock_div_t i2s_clock_pre_div[] = I2S_CLOCK_PRE_DIV;
+STATIC const clock_div_t i2s_clock_div[] = I2S_CLOCK_DIV;
+STATIC const iomuxc_gpr_mode_t i2s_iomuxc_gpr_mode[] = I2S_IOMUXC_GPR_MODE;
+STATIC const dma_request_source_t i2s_dma_req_src_tx[] = I2S_DMA_REQ_SRC_TX;
+STATIC const dma_request_source_t i2s_dma_req_src_rx[] = I2S_DMA_REQ_SRC_RX;
+STATIC const gpio_map_t i2s_gpio_map[] = I2S_GPIO_MAP;
+AT_NONCACHEABLE_SECTION_ALIGN(STATIC edma_tcd_t edmaTcd[MICROPY_HW_I2S_NUM], 32);
+
+// called on processor reset
+void machine_i2s_init0() {
+    for (uint8_t i = 0; i < MICROPY_HW_I2S_NUM; i++) {
+        MP_STATE_PORT(machine_i2s_obj)[i] = NULL;
+    }
+}
+
+// called on soft reboot
+void machine_i2s_deinit_all(void) {
+    for (uint8_t i = 0; i < MICROPY_HW_I2S_NUM; i++) {
+        machine_i2s_obj_t *i2s_obj = MP_STATE_PORT(machine_i2s_obj)[i];
+        if (i2s_obj != NULL) {
+            machine_i2s_deinit(i2s_obj);
+            MP_STATE_PORT(machine_i2s_obj)[i] = NULL;
+        }
+    }
+}
+
+// Ring Buffer
+// Thread safe when used with these constraints:
+// - Single Producer, Single Consumer
+// - Sequential atomic operations
+// One byte of capacity is used to detect buffer empty/full
+
+STATIC void ringbuf_init(ring_buf_t *rbuf, uint8_t *buffer, size_t size) {
+    rbuf->buffer = buffer;
+    rbuf->size = size;
+    rbuf->head = 0;
+    rbuf->tail = 0;
+}
+
+STATIC bool ringbuf_push(ring_buf_t *rbuf, uint8_t data) {
+    size_t next_tail = (rbuf->tail + 1) % rbuf->size;
+
+    if (next_tail != rbuf->head) {
+        rbuf->buffer[rbuf->tail] = data;
+        rbuf->tail = next_tail;
+        return true;
+    }
+
+    // full
+    return false;
+}
+
+STATIC bool ringbuf_pop(ring_buf_t *rbuf, uint8_t *data) {
+    if (rbuf->head == rbuf->tail) {
+        // empty
+        return false;
+    }
+
+    *data = rbuf->buffer[rbuf->head];
+    rbuf->head = (rbuf->head + 1) % rbuf->size;
+    return true;
+}
+
+STATIC bool ringbuf_is_empty(ring_buf_t *rbuf) {
+    return rbuf->head == rbuf->tail;
+}
+
+STATIC bool ringbuf_is_full(ring_buf_t *rbuf) {
+    return ((rbuf->tail + 1) % rbuf->size) == rbuf->head;
+}
+
+STATIC size_t ringbuf_available_data(ring_buf_t *rbuf) {
+    return (rbuf->tail - rbuf->head + rbuf->size) % rbuf->size;
+}
+
+STATIC size_t ringbuf_available_space(ring_buf_t *rbuf) {
+    return rbuf->size - ringbuf_available_data(rbuf) - 1;
+}
+
+STATIC int8_t get_frame_mapping_index(int8_t bits, format_t format) {
+    if (format == MONO) {
+        if (bits == 16) {
+            return 0;
+        } else { // 32 bits
+            return 1;
+        }
+    } else { // STEREO
+        if (bits == 16) {
+            return 2;
+        } else { // 32 bits
+            return 3;
+        }
+    }
+}
+
+STATIC int8_t get_dma_bits(uint16_t mode, int8_t bits) {
+    if (mode == TX) {
+        if (bits == 16) {
+            return 16;
+        } else {
+            return 32;
+        }
+        return bits;
+    } else { // RX
+        // always read 32 bit words for I2S e.g.  I2S MEMS microphones
+        return 32;
+    }
+}
+
+STATIC bool lookup_gpio(const machine_pin_obj_t *pin, i2s_pin_function_t fn, uint8_t hw_id, uint16_t *index) {
+    for (uint16_t i = 0; i < ARRAY_SIZE(i2s_gpio_map); i++) {
+        if ((pin->name == i2s_gpio_map[i].name) &&
+            (i2s_gpio_map[i].fn == fn) &&
+            (i2s_gpio_map[i].hw_id == hw_id)) {
+            *index = i;
+            return true;
+        }
+    }
+    return false;
+}
+
+STATIC bool set_iomux(const machine_pin_obj_t *pin, i2s_pin_function_t fn, uint8_t hw_id) {
+    uint16_t mapping_index;
+    if (lookup_gpio(pin, fn, hw_id, &mapping_index)) {
+        iomux_table_t iom = i2s_gpio_map[mapping_index].iomux;
+        IOMUXC_SetPinMux(iom.muxRegister, iom.muxMode, iom.inputRegister, iom.inputDaisy, iom.configRegister, 1U);
+        IOMUXC_SetPinConfig(iom.muxRegister, iom.muxMode, iom.inputRegister, iom.inputDaisy, iom.configRegister,
+            pin_generate_config(PIN_PULL_DISABLED, PIN_MODE_OUT, 2, iom.configRegister));
+        return true;
+    } else {
+        return false;
+    }
+}
+
+STATIC bool is_rate_supported(int32_t rate) {
+    for (uint16_t i = 0; i < ARRAY_SIZE(clock_config_map); i++) {
+        if (clock_config_map[i].rate == rate) {
+            return true;
+        }
+    }
+    return false;
+}
+
+STATIC const clock_audio_pll_config_t *get_pll_config(int32_t rate) {
+    for (uint16_t i = 0; i < ARRAY_SIZE(clock_config_map); i++) {
+        if (clock_config_map[i].rate == rate) {
+            return clock_config_map[i].pll_config;
+        }
+    }
+    return 0;
+}
+
+STATIC const uint32_t get_clock_pre_divider(int32_t rate) {
+    for (uint16_t i = 0; i < ARRAY_SIZE(clock_config_map); i++) {
+        if (clock_config_map[i].rate == rate) {
+            return clock_config_map[i].clock_pre_divider;
+        }
+    }
+    return 0;
+}
+
+STATIC const uint32_t get_clock_divider(int32_t rate) {
+    for (uint16_t i = 0; i < ARRAY_SIZE(clock_config_map); i++) {
+        if (clock_config_map[i].rate == rate) {
+            return clock_config_map[i].clock_divider;
+        }
+    }
+    return 0;
+}
+
+STATIC uint32_t fill_appbuf_from_ringbuf(machine_i2s_obj_t *self, mp_buffer_info_t *appbuf) {
+
+    // copy audio samples from the ring buffer to the app buffer
+    // loop, copying samples until the app buffer is filled
+    // For uasyncio mode, the loop will make an early exit if the ring buffer becomes empty
+    // Example:
+    //   a MicroPython I2S object is configured for 16-bit mono (2 bytes per audio sample).
+    //   For every frame coming from the ring buffer (8 bytes), 2 bytes are "cherry picked" and
+    //   copied to the supplied app buffer.
+    //   Thus, for every 1 byte copied to the app buffer, 4 bytes are read from the ring buffer.
+    //   If a 8kB app buffer is supplied, 32kB of audio samples is read from the ring buffer.
+
+    uint32_t num_bytes_copied_to_appbuf = 0;
+    uint8_t *app_p = (uint8_t *)appbuf->buf;
+    uint8_t appbuf_sample_size_in_bytes = (self->bits == 16? 2 : 4) * (self->format == STEREO ? 2: 1);
+    uint32_t num_bytes_needed_from_ringbuf = appbuf->len * (I2S_RX_FRAME_SIZE_IN_BYTES / appbuf_sample_size_in_bytes);
+    uint8_t discard_byte;
+    while (num_bytes_needed_from_ringbuf) {
+
+        uint8_t f_index = get_frame_mapping_index(self->bits, self->format);
+
+        for (uint8_t i = 0; i < I2S_RX_FRAME_SIZE_IN_BYTES; i++) {
+            int8_t r_to_a_mapping = i2s_frame_map[f_index][i];
+            if (r_to_a_mapping != -1) {
+                if (self->io_mode == BLOCKING) {
+                    // poll the ringbuf until a sample becomes available,  copy into appbuf using the mapping transform
+                    while (ringbuf_pop(&self->ring_buffer, app_p + r_to_a_mapping) == false) {
+                        ;
+                    }
+                    num_bytes_copied_to_appbuf++;
+                } else if (self->io_mode == UASYNCIO) {
+                    if (ringbuf_pop(&self->ring_buffer, app_p + r_to_a_mapping) == false) {
+                        // ring buffer is empty, exit
+                        goto exit;
+                    } else {
+                        num_bytes_copied_to_appbuf++;
+                    }
+                } else {
+                    return 0;  // should never get here (non-blocking mode does not use this function)
+                }
+            } else { // r_a_mapping == -1
+                // discard unused byte from ring buffer
+                if (self->io_mode == BLOCKING) {
+                    // poll the ringbuf until a sample becomes available
+                    while (ringbuf_pop(&self->ring_buffer, &discard_byte) == false) {
+                        ;
+                    }
+                } else if (self->io_mode == UASYNCIO) {
+                    if (ringbuf_pop(&self->ring_buffer, &discard_byte) == false) {
+                        // ring buffer is empty, exit
+                        goto exit;
+                    }
+                } else {
+                    return 0;  // should never get here (non-blocking mode does not use this function)
+                }
+            }
+            num_bytes_needed_from_ringbuf--;
+        }
+        app_p += appbuf_sample_size_in_bytes;
+    }
+exit:
+    return num_bytes_copied_to_appbuf;
+}
+
+// function is used in IRQ context
+STATIC void fill_appbuf_from_ringbuf_non_blocking(machine_i2s_obj_t *self) {
+
+    // attempt to copy a block of audio samples from the ring buffer to the supplied app buffer.
+    // audio samples will be formatted as part of the copy operation
+
+    uint32_t num_bytes_copied_to_appbuf = 0;
+    uint8_t *app_p = &(((uint8_t *)self->non_blocking_descriptor.appbuf.buf)[self->non_blocking_descriptor.index]);
+
+    uint8_t appbuf_sample_size_in_bytes = (self->bits == 16? 2 : 4) * (self->format == STEREO ? 2: 1);
+    uint32_t num_bytes_remaining_to_copy_to_appbuf = self->non_blocking_descriptor.appbuf.len - self->non_blocking_descriptor.index;
+    uint32_t num_bytes_remaining_to_copy_from_ring_buffer = num_bytes_remaining_to_copy_to_appbuf *
+        (I2S_RX_FRAME_SIZE_IN_BYTES / appbuf_sample_size_in_bytes);
+    uint32_t num_bytes_needed_from_ringbuf = MIN(SIZEOF_NON_BLOCKING_COPY_IN_BYTES, num_bytes_remaining_to_copy_from_ring_buffer);
+    uint8_t discard_byte;
+    if (ringbuf_available_data(&self->ring_buffer) >= num_bytes_needed_from_ringbuf) {
+        while (num_bytes_needed_from_ringbuf) {
+
+            uint8_t f_index = get_frame_mapping_index(self->bits, self->format);
+
+            for (uint8_t i = 0; i < I2S_RX_FRAME_SIZE_IN_BYTES; i++) {
+                int8_t r_to_a_mapping = i2s_frame_map[f_index][i];
+                if (r_to_a_mapping != -1) {
+                    ringbuf_pop(&self->ring_buffer, app_p + r_to_a_mapping);
+                    num_bytes_copied_to_appbuf++;
+                } else { // r_a_mapping == -1
+                    // discard unused byte from ring buffer
+                    ringbuf_pop(&self->ring_buffer, &discard_byte);
+                }
+                num_bytes_needed_from_ringbuf--;
+            }
+            app_p += appbuf_sample_size_in_bytes;
+        }
+        self->non_blocking_descriptor.index += num_bytes_copied_to_appbuf;
+
+        if (self->non_blocking_descriptor.index >= self->non_blocking_descriptor.appbuf.len) {
+            self->non_blocking_descriptor.copy_in_progress = false;
+            mp_sched_schedule(self->callback_for_non_blocking, MP_OBJ_FROM_PTR(self));
+        }
+    }
+}
+
+STATIC uint32_t copy_appbuf_to_ringbuf(machine_i2s_obj_t *self, mp_buffer_info_t *appbuf) {
+
+    // copy audio samples from the app buffer to the ring buffer
+    // loop, reading samples until the app buffer is emptied
+    // for uasyncio mode, the loop will make an early exit if the ring buffer becomes full
+
+    uint32_t a_index = 0;
+
+    while (a_index < appbuf->len) {
+        if (self->io_mode == BLOCKING) {
+            // copy a byte to the ringbuf when space becomes available
+            while (ringbuf_push(&self->ring_buffer, ((uint8_t *)appbuf->buf)[a_index]) == false) {
+                ;
+            }
+            a_index++;
+        } else if (self->io_mode == UASYNCIO) {
+            if (ringbuf_push(&self->ring_buffer, ((uint8_t *)appbuf->buf)[a_index]) == false) {
+                // ring buffer is full, exit
+                break;
+            } else {
+                a_index++;
+            }
+        } else {
+            return 0;  // should never get here (non-blocking mode does not use this function)
+        }
+    }
+
+    return a_index;
+}
+
+// function is used in IRQ context
+STATIC void copy_appbuf_to_ringbuf_non_blocking(machine_i2s_obj_t *self) {
+
+    // copy audio samples from app buffer into ring buffer
+    uint32_t num_bytes_remaining_to_copy = self->non_blocking_descriptor.appbuf.len - self->non_blocking_descriptor.index;
+    uint32_t num_bytes_to_copy = MIN(SIZEOF_NON_BLOCKING_COPY_IN_BYTES, num_bytes_remaining_to_copy);
+
+    if (ringbuf_available_space(&self->ring_buffer) >= num_bytes_to_copy) {
+        for (uint32_t i = 0; i < num_bytes_to_copy; i++) {
+            ringbuf_push(&self->ring_buffer,
+                ((uint8_t *)self->non_blocking_descriptor.appbuf.buf)[self->non_blocking_descriptor.index + i]);
+        }
+
+        self->non_blocking_descriptor.index += num_bytes_to_copy;
+        if (self->non_blocking_descriptor.index >= self->non_blocking_descriptor.appbuf.len) {
+            self->non_blocking_descriptor.copy_in_progress = false;
+            mp_sched_schedule(self->callback_for_non_blocking, MP_OBJ_FROM_PTR(self));
+        }
+    }
+}
+
+// function is used in IRQ context
+STATIC void empty_dma(machine_i2s_obj_t *self, ping_pong_t dma_ping_pong) {
+    uint16_t dma_buffer_offset = 0;
+
+    if (dma_ping_pong == TOP_HALF) {
+        dma_buffer_offset = 0;
+    } else { // BOTTOM_HALF
+        dma_buffer_offset = SIZEOF_HALF_DMA_BUFFER_IN_BYTES;
+    }
+
+    uint8_t *dma_buffer_p = &self->dma_buffer_dcache_aligned[dma_buffer_offset];
+
+    // flush and invalidate cache so the CPU reads data placed into RAM by DMA
+    MP_HAL_CLEANINVALIDATE_DCACHE(dma_buffer_p, SIZEOF_HALF_DMA_BUFFER_IN_BYTES);
+
+    // when space exists, copy samples into ring buffer
+    if (ringbuf_available_space(&self->ring_buffer) >= SIZEOF_HALF_DMA_BUFFER_IN_BYTES) {
+        for (uint32_t i = 0; i < SIZEOF_HALF_DMA_BUFFER_IN_BYTES; i++) {
+            ringbuf_push(&self->ring_buffer, dma_buffer_p[i]);
+        }
+    }
+}
+
+// function is used in IRQ context
+STATIC void feed_dma(machine_i2s_obj_t *self, ping_pong_t dma_ping_pong) {
+    uint16_t dma_buffer_offset = 0;
+
+    if (dma_ping_pong == TOP_HALF) {
+        dma_buffer_offset = 0;
+    } else { // BOTTOM_HALF
+        dma_buffer_offset = SIZEOF_HALF_DMA_BUFFER_IN_BYTES;
+    }
+
+    uint8_t *dma_buffer_p = &self->dma_buffer_dcache_aligned[dma_buffer_offset];
+
+    // when data exists, copy samples from ring buffer
+    if (ringbuf_available_data(&self->ring_buffer) >= SIZEOF_HALF_DMA_BUFFER_IN_BYTES) {
+
+        // copy a block of samples from the ring buffer to the dma buffer.
+        // mono format is implemented by duplicating each sample into both L and R channels.
+        if ((self->format == MONO) && (self->bits == 16)) {
+            for (uint32_t i = 0; i < SIZEOF_HALF_DMA_BUFFER_IN_BYTES / 4; i++) {
+                for (uint8_t b = 0; b < sizeof(uint16_t); b++) {
+                    ringbuf_pop(&self->ring_buffer, &dma_buffer_p[i * 4 + b]);
+                    dma_buffer_p[i * 4 + b + 2] = dma_buffer_p[i * 4 + b]; // duplicated mono sample
+                }
+            }
+        } else if ((self->format == MONO) && (self->bits == 32)) {
+            for (uint32_t i = 0; i < SIZEOF_HALF_DMA_BUFFER_IN_BYTES / 8; i++) {
+                for (uint8_t b = 0; b < sizeof(uint32_t); b++) {
+                    ringbuf_pop(&self->ring_buffer, &dma_buffer_p[i * 8 + b]);
+                    dma_buffer_p[i * 8 + b + 4] = dma_buffer_p[i * 8 + b]; // duplicated mono sample
+                }
+            }
+        } else { // STEREO, both 16-bit and 32-bit
+            for (uint32_t i = 0; i < SIZEOF_HALF_DMA_BUFFER_IN_BYTES; i++) {
+                ringbuf_pop(&self->ring_buffer, &dma_buffer_p[i]);
+            }
+        }
+    } else {
+        // underflow.  clear buffer to transmit "silence" on the I2S bus
+        memset(dma_buffer_p, 0, SIZEOF_HALF_DMA_BUFFER_IN_BYTES);
+    }
+
+    // flush cache to RAM so DMA can read the sample data
+    MP_HAL_CLEAN_DCACHE(dma_buffer_p, SIZEOF_HALF_DMA_BUFFER_IN_BYTES);
+}
+
+STATIC void edma_i2s_callback(edma_handle_t *handle, void *userData, bool transferDone, uint32_t tcds) {
+    machine_i2s_obj_t *self = userData;
+
+    if (self->mode == TX) {
+        // for non-blocking mode, sample copying (appbuf->ibuf) is initiated in this callback routine
+        if ((self->io_mode == NON_BLOCKING) && (self->non_blocking_descriptor.copy_in_progress)) {
+            copy_appbuf_to_ringbuf_non_blocking(self);
+        }
+
+        if (transferDone) {
+            // bottom half of buffer now emptied,
+            // safe to fill the bottom half while the top half of buffer is being emptied
+            feed_dma(self, BOTTOM_HALF);
+        } else {
+            // top half of buffer now emptied,
+            // safe to fill the top half while the bottom half of buffer is being emptied
+            feed_dma(self, TOP_HALF);
+        }
+    } else { // RX
+        if (transferDone) {
+            // bottom half of buffer now filled,
+            // safe to empty the bottom half while the top half of buffer is being filled
+            empty_dma(self, BOTTOM_HALF);
+        } else {
+            // top half of buffer now filled,
+            // safe to empty the top half while the bottom half of buffer is being filled
+            empty_dma(self, TOP_HALF);
+        }
+
+        // for non-blocking mode, sample copying (ibuf->appbuf) is initiated in this callback routine
+        if ((self->io_mode == NON_BLOCKING) && (self->non_blocking_descriptor.copy_in_progress)) {
+            fill_appbuf_from_ringbuf_non_blocking(self);
+        }
+    }
+}
+
+STATIC bool i2s_init(machine_i2s_obj_t *self) {
+
+    CLOCK_InitAudioPll(get_pll_config(self->rate));
+    CLOCK_SetMux(i2s_clock_mux[self->i2s_id], AUDIO_PLL_CLOCK);
+    CLOCK_SetDiv(i2s_clock_pre_div[self->i2s_id], get_clock_pre_divider(self->rate));
+    CLOCK_SetDiv(i2s_clock_div[self->i2s_id], get_clock_divider(self->rate));
+
+    if (!set_iomux(self->sck, SCK, self->i2s_id)) {
+        return false;
+    }
+
+    if (!set_iomux(self->ws, WS, self->i2s_id)) {
+        return false;
+    }
+
+    if (!set_iomux(self->sd, SD, self->i2s_id)) {
+        return false;
+    }
+
+    if (self->mck) {
+        if (!set_iomux(self->mck, MCK, self->i2s_id)) {
+            return false;
+        }
+        IOMUXC_EnableMode(IOMUXC_GPR, i2s_iomuxc_gpr_mode[self->i2s_id], true);
+    }
+
+    self->dma_channel = allocate_dma_channel();
+
+    DMAMUX_Init(DMAMUX);
+    if (self->mode == TX) {
+        DMAMUX_SetSource(DMAMUX, self->dma_channel, i2s_dma_req_src_tx[self->i2s_id]);
+    } else { // RX
+        DMAMUX_SetSource(DMAMUX, self->dma_channel, i2s_dma_req_src_rx[self->i2s_id]);
+    }
+    DMAMUX_EnableChannel(DMAMUX, self->dma_channel);
+
+    dma_init();
+    EDMA_CreateHandle(&self->edmaHandle, DMA0, self->dma_channel);
+    EDMA_SetCallback(&self->edmaHandle, edma_i2s_callback, self);
+    EDMA_ResetChannel(DMA0, self->dma_channel);
+
+    SAI_Init(self->i2s_inst);
+
+    sai_transceiver_t saiConfig;
+    SAI_GetClassicI2SConfig(&saiConfig, get_dma_bits(self->mode, self->bits), kSAI_Stereo, kSAI_Channel0Mask);
+    saiConfig.masterSlave = kSAI_Master;
+
+    uint16_t sck_index;
+    lookup_gpio(self->sck, SCK, self->i2s_id, &sck_index);
+
+    if ((self->mode == TX) && (i2s_gpio_map[sck_index].mode == TX)) {
+        saiConfig.syncMode = kSAI_ModeAsync;
+        SAI_TxSetConfig(self->i2s_inst, &saiConfig);
+    } else if ((self->mode == RX) && (i2s_gpio_map[sck_index].mode == RX)) {
+        saiConfig.syncMode = kSAI_ModeAsync;
+        SAI_RxSetConfig(self->i2s_inst, &saiConfig);
+    } else if ((self->mode == TX) && (i2s_gpio_map[sck_index].mode == RX)) {
+        saiConfig.syncMode = kSAI_ModeAsync;
+        SAI_RxSetConfig(self->i2s_inst, &saiConfig);
+        saiConfig.bitClock.bclkSrcSwap = true;
+        saiConfig.syncMode = kSAI_ModeSync;
+        SAI_TxSetConfig(self->i2s_inst, &saiConfig);
+    } else if ((self->mode == RX) && (i2s_gpio_map[sck_index].mode == TX)) {
+        saiConfig.syncMode = kSAI_ModeAsync;
+        SAI_TxSetConfig(self->i2s_inst, &saiConfig);
+        saiConfig.syncMode = kSAI_ModeSync;
+        SAI_RxSetConfig(self->i2s_inst, &saiConfig);
+    } else {
+        return false; // should never happen
+    }
+
+    uint32_t clock_freq =
+        (CLOCK_GetFreq(kCLOCK_AudioPllClk) / (get_clock_divider(self->rate) + 1U) /
+            (get_clock_pre_divider(self->rate) + 1U));
+
+    SAI_TxSetBitClockRate(self->i2s_inst, clock_freq, self->rate, get_dma_bits(self->mode, self->bits),
+        SAI_NUM_AUDIO_CHANNELS);
+    SAI_RxSetBitClockRate(self->i2s_inst, clock_freq, self->rate, get_dma_bits(self->mode, self->bits),
+        SAI_NUM_AUDIO_CHANNELS);
+
+    edma_transfer_config_t transferConfig;
+    uint8_t bytes_per_sample = get_dma_bits(self->mode, self->bits) / 8;
+
+    if (self->mode == TX) {
+        uint32_t destAddr = SAI_TxGetDataRegisterAddress(self->i2s_inst, SAI_CHANNEL_0);
+        EDMA_PrepareTransfer(&transferConfig,
+            self->dma_buffer_dcache_aligned, bytes_per_sample,
+            (void *)destAddr, bytes_per_sample,
+            (FSL_FEATURE_SAI_FIFO_COUNT - saiConfig.fifo.fifoWatermark) * bytes_per_sample,
+            SIZEOF_DMA_BUFFER_IN_BYTES, kEDMA_MemoryToPeripheral);
+    } else { // RX
+        uint32_t srcAddr = SAI_RxGetDataRegisterAddress(self->i2s_inst, SAI_CHANNEL_0);
+        EDMA_PrepareTransfer(&transferConfig,
+            (void *)srcAddr, bytes_per_sample,
+            self->dma_buffer_dcache_aligned, bytes_per_sample,
+            (FSL_FEATURE_SAI_FIFO_COUNT - saiConfig.fifo.fifoWatermark) * bytes_per_sample,
+            SIZEOF_DMA_BUFFER_IN_BYTES, kEDMA_PeripheralToMemory);
+    }
+
+    memset(self->edmaTcd, 0, sizeof(edma_tcd_t));
+
+    // continuous DMA operation is acheived using the scatter/gather feature, with one TCD linked back to itself
+    EDMA_TcdSetTransferConfig(self->edmaTcd, &transferConfig, self->edmaTcd);
+    EDMA_TcdEnableInterrupts(self->edmaTcd, kEDMA_MajorInterruptEnable | kEDMA_HalfInterruptEnable);
+    EDMA_InstallTCD(DMA0, self->dma_channel, self->edmaTcd);
+    EDMA_StartTransfer(&self->edmaHandle);
+
+    if (self->mode == TX) {
+        SAI_TxEnableDMA(self->i2s_inst, kSAI_FIFORequestDMAEnable, true);
+        SAI_TxEnable(self->i2s_inst, true);
+        SAI_TxSetChannelFIFOMask(self->i2s_inst, kSAI_Channel0Mask);
+    } else { // RX
+        SAI_RxEnableDMA(self->i2s_inst, kSAI_FIFORequestDMAEnable, true);
+        SAI_RxEnable(self->i2s_inst, true);
+        SAI_RxSetChannelFIFOMask(self->i2s_inst, kSAI_Channel0Mask);
+    }
+
+    return true;
+}
+
+STATIC void machine_i2s_init_helper(machine_i2s_obj_t *self, size_t n_pos_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+
+    enum {
+        ARG_sck,
+        ARG_ws,
+        ARG_sd,
+        ARG_mck,
+        ARG_mode,
+        ARG_bits,
+        ARG_format,
+        ARG_rate,
+        ARG_ibuf,
+    };
+
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_sck,      MP_ARG_KW_ONLY | MP_ARG_REQUIRED | MP_ARG_OBJ,   {.u_obj = MP_OBJ_NULL} },
+        { MP_QSTR_ws,       MP_ARG_KW_ONLY | MP_ARG_REQUIRED | MP_ARG_OBJ,   {.u_obj = MP_OBJ_NULL} },
+        { MP_QSTR_sd,       MP_ARG_KW_ONLY | MP_ARG_REQUIRED | MP_ARG_OBJ,   {.u_obj = MP_OBJ_NULL} },
+        { MP_QSTR_mck,      MP_ARG_KW_ONLY | MP_ARG_OBJ,   {.u_obj = mp_const_none} },
+        { MP_QSTR_mode,     MP_ARG_KW_ONLY | MP_ARG_REQUIRED | MP_ARG_INT,   {.u_int = -1} },
+        { MP_QSTR_bits,     MP_ARG_KW_ONLY | MP_ARG_REQUIRED | MP_ARG_INT,   {.u_int = -1} },
+        { MP_QSTR_format,   MP_ARG_KW_ONLY | MP_ARG_REQUIRED | MP_ARG_INT,   {.u_int = -1} },
+        { MP_QSTR_rate,     MP_ARG_KW_ONLY | MP_ARG_REQUIRED | MP_ARG_INT,   {.u_int = -1} },
+        { MP_QSTR_ibuf,     MP_ARG_KW_ONLY | MP_ARG_REQUIRED | MP_ARG_INT,   {.u_int = -1} },
+    };
+
+    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
+    mp_arg_parse_all(n_pos_args, pos_args, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
+
+    //
+    // ---- Check validity of arguments ----
+    //
+
+    // is Mode valid?
+    uint16_t i2s_mode = args[ARG_mode].u_int;
+    if ((i2s_mode != (RX)) &&
+        (i2s_mode != (TX))) {
+        mp_raise_ValueError(MP_ERROR_TEXT("invalid mode"));
+    }
+
+    // are I2S pin assignments valid?
+    uint16_t not_used;
+
+    // is SCK valid?
+    const machine_pin_obj_t *pin_sck = pin_find(args[ARG_sck].u_obj);
+    if (!lookup_gpio(pin_sck, SCK, self->i2s_id, &not_used)) {
+        mp_raise_ValueError(MP_ERROR_TEXT("invalid SCK pin"));
+    }
+
+    // is WS valid?
+    const machine_pin_obj_t *pin_ws = pin_find(args[ARG_ws].u_obj);
+    if (!lookup_gpio(pin_ws, WS, self->i2s_id, &not_used)) {
+        mp_raise_ValueError(MP_ERROR_TEXT("invalid WS pin"));
+    }
+
+    // is SD valid?
+    const machine_pin_obj_t *pin_sd = pin_find(args[ARG_sd].u_obj);
+    uint16_t mapping_index;
+    bool invalid_sd = true;
+    if (lookup_gpio(pin_sd, SD, self->i2s_id, &mapping_index)) {
+        if (i2s_mode == i2s_gpio_map[mapping_index].mode) {
+            invalid_sd = false;
+        }
+    }
+
+    if (invalid_sd) {
+        mp_raise_ValueError(MP_ERROR_TEXT("invalid SD pin"));
+    }
+
+    // is MCK defined and valid?
+    const machine_pin_obj_t *pin_mck = NULL;
+    if (args[ARG_mck].u_obj != mp_const_none) {
+        pin_mck = pin_find(args[ARG_mck].u_obj);
+        if (!lookup_gpio(pin_mck, MCK, self->i2s_id, &not_used)) {
+            mp_raise_ValueError(MP_ERROR_TEXT("invalid MCK pin"));
+        }
+    }
+
+    // is Bits valid?
+    int8_t i2s_bits = args[ARG_bits].u_int;
+    if ((i2s_bits != 16) &&
+        (i2s_bits != 32)) {
+        mp_raise_ValueError(MP_ERROR_TEXT("invalid bits"));
+    }
+
+    // is Format valid?
+    format_t i2s_format = args[ARG_format].u_int;
+    if ((i2s_format != MONO) &&
+        (i2s_format != STEREO)) {
+        mp_raise_ValueError(MP_ERROR_TEXT("invalid format"));
+    }
+
+    // is Rate valid?
+    int32_t i2s_rate = args[ARG_rate].u_int;
+    if (!is_rate_supported(i2s_rate)) {
+        mp_raise_ValueError(MP_ERROR_TEXT("invalid rate"));
+    }
+
+    // is Ibuf valid?
+    int32_t ring_buffer_len = args[ARG_ibuf].u_int;
+    if (ring_buffer_len > 0) {
+        uint8_t *buffer = m_new(uint8_t, ring_buffer_len);
+        self->ring_buffer_storage = buffer;
+        ringbuf_init(&self->ring_buffer, buffer, ring_buffer_len);
+    } else {
+        mp_raise_ValueError(MP_ERROR_TEXT("invalid ibuf"));
+    }
+
+    self->sck = pin_sck;
+    self->ws = pin_ws;
+    self->sd = pin_sd;
+    self->mck = pin_mck;
+    self->mode = i2s_mode;
+    self->bits = i2s_bits;
+    self->format = i2s_format;
+    self->rate = i2s_rate;
+    self->ibuf = ring_buffer_len;
+    self->callback_for_non_blocking = MP_OBJ_NULL;
+    self->non_blocking_descriptor.copy_in_progress = false;
+    self->io_mode = BLOCKING;
+    self->i2s_inst = (I2S_Type *)i2s_base_ptr[self->i2s_id];
+
+    // init the I2S bus
+    if (!i2s_init(self)) {
+        mp_raise_msg_varg(&mp_type_OSError, MP_ERROR_TEXT("I2S init failed"));
+    }
+}
+
+STATIC void machine_i2s_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+    machine_i2s_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    mp_printf(print, "I2S(id=%u,\n"
+        "sck="MP_HAL_PIN_FMT ",\n"
+        "ws="MP_HAL_PIN_FMT ",\n"
+        "sd="MP_HAL_PIN_FMT ",\n"
+        "mck="MP_HAL_PIN_FMT ",\n"
+        "mode=%u,\n"
+        "bits=%u, format=%u,\n"
+        "rate=%d, ibuf=%d)",
+        self->i2s_id,
+        mp_hal_pin_name(self->sck),
+        mp_hal_pin_name(self->ws),
+        mp_hal_pin_name(self->sd),
+        mp_hal_pin_name(self->mck),
+        self->mode,
+        self->bits, self->format,
+        self->rate, self->ibuf
+        );
+}
+
+STATIC mp_obj_t machine_i2s_make_new(const mp_obj_type_t *type, size_t n_pos_args, size_t n_kw_args, const mp_obj_t *args) {
+    mp_arg_check_num(n_pos_args, n_kw_args, 1, MP_OBJ_FUN_ARGS_MAX, true);
+    uint8_t i2s_id = mp_obj_get_int(args[0]);
+
+    if (i2s_id < 1 || i2s_id > MICROPY_HW_I2S_NUM) {
+        mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("I2S(%d) does not exist"), i2s_id);
+    }
+
+    uint8_t i2s_id_zero_base = i2s_id - 1;
+
+    machine_i2s_obj_t *self;
+    if (MP_STATE_PORT(machine_i2s_obj)[i2s_id_zero_base] == NULL) {
+        self = m_new_obj(machine_i2s_obj_t);
+        MP_STATE_PORT(machine_i2s_obj)[i2s_id_zero_base] = self;
+        self->base.type = &machine_i2s_type;
+        self->i2s_id = i2s_id;
+        self->edmaTcd = &edmaTcd[i2s_id_zero_base];
+    } else {
+        self = MP_STATE_PORT(machine_i2s_obj)[i2s_id_zero_base];
+        machine_i2s_deinit(MP_OBJ_FROM_PTR(self));
+    }
+
+    // align DMA buffer to the cache line size (32 bytes)
+    self->dma_buffer_dcache_aligned = (uint8_t *)((uint32_t)(self->dma_buffer + 0x1f) & ~0x1f);
+
+    // fill the DMA buffer with NULLs
+    memset(self->dma_buffer_dcache_aligned, 0, SIZEOF_DMA_BUFFER_IN_BYTES);
+
+    mp_map_t kw_args;
+    mp_map_init_fixed_table(&kw_args, n_kw_args, args + n_pos_args);
+    machine_i2s_init_helper(self, n_pos_args - 1, args + 1, &kw_args);
+    return MP_OBJ_FROM_PTR(self);
+}
+
+STATIC mp_obj_t machine_i2s_init(size_t n_pos_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    machine_i2s_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]);
+    machine_i2s_deinit(MP_OBJ_FROM_PTR(self));
+    machine_i2s_init_helper(self, n_pos_args - 1, pos_args + 1, kw_args);
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_KW(machine_i2s_init_obj, 1, machine_i2s_init);
+
+STATIC mp_obj_t machine_i2s_deinit(mp_obj_t self_in) {
+    machine_i2s_obj_t *self = MP_OBJ_TO_PTR(self_in);
+
+    // use self->i2s_inst as in indication that I2S object has already been de-initialized
+    if (self->i2s_inst != NULL) {
+        EDMA_AbortTransfer(&self->edmaHandle);
+
+        if (self->mode == TX) {
+            SAI_TxSetChannelFIFOMask(self->i2s_inst, 0);
+            SAI_TxEnableDMA(self->i2s_inst, kSAI_FIFORequestDMAEnable, false);
+            SAI_TxEnable(self->i2s_inst, false);
+            SAI_TxReset(self->i2s_inst);
+        } else { // RX
+            SAI_RxSetChannelFIFOMask(self->i2s_inst, 0);
+            SAI_RxEnableDMA(self->i2s_inst, kSAI_FIFORequestDMAEnable, false);
+            SAI_RxEnable(self->i2s_inst, false);
+            SAI_RxReset(self->i2s_inst);
+        }
+
+        SAI_Deinit(self->i2s_inst);
+        free_dma_channel(self->dma_channel);
+        m_free(self->ring_buffer_storage);
+        self->i2s_inst = NULL;  // flag object as de-initialized
+    }
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_i2s_deinit_obj, machine_i2s_deinit);
+
+STATIC mp_obj_t machine_i2s_irq(mp_obj_t self_in, mp_obj_t handler) {
+    machine_i2s_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    if (handler != mp_const_none && !mp_obj_is_callable(handler)) {
+        mp_raise_ValueError(MP_ERROR_TEXT("invalid callback"));
+    }
+
+    if (handler != mp_const_none) {
+        self->io_mode = NON_BLOCKING;
+    } else {
+        self->io_mode = BLOCKING;
+    }
+
+    self->callback_for_non_blocking = handler;
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(machine_i2s_irq_obj, machine_i2s_irq);
+
+// Shift() is typically used as a volume control.
+// shift=1 increases volume by 6dB, shift=-1 decreases volume by 6dB
+STATIC mp_obj_t machine_i2s_shift(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    enum { ARG_buf, ARG_bits, ARG_shift};
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_buf,    MP_ARG_REQUIRED | MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
+        { MP_QSTR_bits,   MP_ARG_REQUIRED | MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} },
+        { MP_QSTR_shift,  MP_ARG_REQUIRED | MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} },
+    };
+
+    // parse args
+    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
+    mp_arg_parse_all(n_args, pos_args, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
+
+    mp_buffer_info_t bufinfo;
+    mp_get_buffer_raise(args[ARG_buf].u_obj, &bufinfo, MP_BUFFER_RW);
+
+    int16_t *buf_16 = bufinfo.buf;
+    int32_t *buf_32 = bufinfo.buf;
+
+    uint8_t bits = args[ARG_bits].u_int;
+    int8_t shift = args[ARG_shift].u_int;
+
+    uint32_t num_audio_samples;
+    switch (bits) {
+        case 16:
+            num_audio_samples = bufinfo.len / sizeof(uint16_t);
+            break;
+
+        case 32:
+            num_audio_samples = bufinfo.len / sizeof(uint32_t);
+            break;
+
+        default:
+            mp_raise_ValueError(MP_ERROR_TEXT("invalid bits"));
+            break;
+    }
+
+    for (uint32_t i = 0; i < num_audio_samples; i++) {
+        switch (bits) {
+            case 16:
+                if (shift >= 0) {
+                    buf_16[i] = buf_16[i] << shift;
+                } else {
+                    buf_16[i] = buf_16[i] >> abs(shift);
+                }
+                break;
+            case 32:
+                if (shift >= 0) {
+                    buf_32[i] = buf_32[i] << shift;
+                } else {
+                    buf_32[i] = buf_32[i] >> abs(shift);
+                }
+                break;
+        }
+    }
+
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_KW(machine_i2s_shift_fun_obj, 0, machine_i2s_shift);
+STATIC MP_DEFINE_CONST_STATICMETHOD_OBJ(machine_i2s_shift_obj, MP_ROM_PTR(&machine_i2s_shift_fun_obj));
+
+STATIC const mp_rom_map_elem_t machine_i2s_locals_dict_table[] = {
+    // Methods
+    { MP_ROM_QSTR(MP_QSTR_init),            MP_ROM_PTR(&machine_i2s_init_obj) },
+    { MP_ROM_QSTR(MP_QSTR_readinto),        MP_ROM_PTR(&mp_stream_readinto_obj) },
+    { MP_ROM_QSTR(MP_QSTR_write),           MP_ROM_PTR(&mp_stream_write_obj) },
+    { MP_ROM_QSTR(MP_QSTR_deinit),          MP_ROM_PTR(&machine_i2s_deinit_obj) },
+    { MP_ROM_QSTR(MP_QSTR_irq),             MP_ROM_PTR(&machine_i2s_irq_obj) },
+
+    // Static method
+    { MP_ROM_QSTR(MP_QSTR_shift),           MP_ROM_PTR(&machine_i2s_shift_obj) },
+
+    // Constants
+    { MP_ROM_QSTR(MP_QSTR_RX),              MP_ROM_INT(RX) },
+    { MP_ROM_QSTR(MP_QSTR_TX),              MP_ROM_INT(TX) },
+    { MP_ROM_QSTR(MP_QSTR_STEREO),          MP_ROM_INT(STEREO) },
+    { MP_ROM_QSTR(MP_QSTR_MONO),            MP_ROM_INT(MONO) },
+};
+MP_DEFINE_CONST_DICT(machine_i2s_locals_dict, machine_i2s_locals_dict_table);
+
+STATIC mp_uint_t machine_i2s_stream_read(mp_obj_t self_in, void *buf_in, mp_uint_t size, int *errcode) {
+    machine_i2s_obj_t *self = MP_OBJ_TO_PTR(self_in);
+
+    if (self->mode != RX) {
+        *errcode = MP_EPERM;
+        return MP_STREAM_ERROR;
+    }
+
+    uint8_t appbuf_sample_size_in_bytes = (self->bits / 8) * (self->format == STEREO ? 2: 1);
+    if (size % appbuf_sample_size_in_bytes != 0) {
+        *errcode = MP_EINVAL;
+        return MP_STREAM_ERROR;
+    }
+
+    if (size == 0) {
+        return 0;
+    }
+
+    if (self->io_mode == NON_BLOCKING) {
+        self->non_blocking_descriptor.appbuf.buf = (void *)buf_in;
+        self->non_blocking_descriptor.appbuf.len = size;
+        self->non_blocking_descriptor.index = 0;
+        self->non_blocking_descriptor.copy_in_progress = true;
+        return size;
+    } else { // blocking or uasyncio mode
+        mp_buffer_info_t appbuf;
+        appbuf.buf = (void *)buf_in;
+        appbuf.len = size;
+        uint32_t num_bytes_read = fill_appbuf_from_ringbuf(self, &appbuf);
+        return num_bytes_read;
+    }
+}
+
+STATIC mp_uint_t machine_i2s_stream_write(mp_obj_t self_in, const void *buf_in, mp_uint_t size, int *errcode) {
+    machine_i2s_obj_t *self = MP_OBJ_TO_PTR(self_in);
+
+    if (self->mode != TX) {
+        *errcode = MP_EPERM;
+        return MP_STREAM_ERROR;
+    }
+
+    if (size == 0) {
+        return 0;
+    }
+
+    if (self->io_mode == NON_BLOCKING) {
+        self->non_blocking_descriptor.appbuf.buf = (void *)buf_in;
+        self->non_blocking_descriptor.appbuf.len = size;
+        self->non_blocking_descriptor.index = 0;
+        self->non_blocking_descriptor.copy_in_progress = true;
+        return size;
+    } else { // blocking or uasyncio mode
+        mp_buffer_info_t appbuf;
+        appbuf.buf = (void *)buf_in;
+        appbuf.len = size;
+        uint32_t num_bytes_written = copy_appbuf_to_ringbuf(self, &appbuf);
+        return num_bytes_written;
+    }
+}
+
+STATIC mp_uint_t machine_i2s_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_t arg, int *errcode) {
+    machine_i2s_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    mp_uint_t ret;
+    uintptr_t flags = arg;
+    self->io_mode = UASYNCIO; // a call to ioctl() is an indication that uasyncio is being used
+
+    if (request == MP_STREAM_POLL) {
+        ret = 0;
+
+        if (flags & MP_STREAM_POLL_RD) {
+            if (self->mode != RX) {
+                *errcode = MP_EPERM;
+                return MP_STREAM_ERROR;
+            }
+
+            if (!ringbuf_is_empty(&self->ring_buffer)) {
+                ret |= MP_STREAM_POLL_RD;
+            }
+        }
+
+        if (flags & MP_STREAM_POLL_WR) {
+            if (self->mode != TX) {
+                *errcode = MP_EPERM;
+                return MP_STREAM_ERROR;
+            }
+
+            if (!ringbuf_is_full(&self->ring_buffer)) {
+                ret |= MP_STREAM_POLL_WR;
+            }
+        }
+    } else {
+        *errcode = MP_EINVAL;
+        ret = MP_STREAM_ERROR;
+    }
+
+    return ret;
+}
+
+STATIC const mp_stream_p_t i2s_stream_p = {
+    .read = machine_i2s_stream_read,
+    .write = machine_i2s_stream_write,
+    .ioctl = machine_i2s_ioctl,
+    .is_text = false,
+};
+
+const mp_obj_type_t machine_i2s_type = {
+    { &mp_type_type },
+    .name = MP_QSTR_I2S,
+    .print = machine_i2s_print,
+    .getiter = mp_identity_getiter,
+    .iternext = mp_stream_unbuffered_iter,
+    .protocol = &i2s_stream_p,
+    .make_new = machine_i2s_make_new,
+    .locals_dict = (mp_obj_dict_t *)&machine_i2s_locals_dict,
+};
+
+#endif // MICROPY_PY_MACHINE_I2S
diff --git a/ports/mimxrt/machine_spi.c b/ports/mimxrt/machine_spi.c
index e25e219c79d12..b8b5a4d5b5b0f 100644
--- a/ports/mimxrt/machine_spi.c
+++ b/ports/mimxrt/machine_spi.c
@@ -30,7 +30,7 @@
 #include "py/mperrno.h"
 #include "extmod/machine_spi.h"
 #include "modmachine.h"
-#include "dma_channel.h"
+#include "dma_manager.h"
 
 #include "fsl_cache.h"
 #include "fsl_dmamux.h"
@@ -256,8 +256,6 @@ STATIC void machine_spi_transfer(mp_obj_base_t *self_in, size_t len, const uint8
     bool use_dma = chan_rx >= 0 && chan_tx >= 0;
 
     if (use_dma) {
-        edma_config_t userConfig;
-
         /* DMA MUX init*/
         DMAMUX_Init(DMAMUX);
 
@@ -267,8 +265,7 @@ STATIC void machine_spi_transfer(mp_obj_base_t *self_in, size_t len, const uint8
         DMAMUX_SetSource(DMAMUX, chan_tx, dma_req_src_tx[self->spi_hw_id]);
         DMAMUX_EnableChannel(DMAMUX, chan_tx);
 
-        EDMA_GetDefaultConfig(&userConfig);
-        EDMA_Init(DMA0, &userConfig);
+        dma_init();
 
         lpspi_master_edma_handle_t g_master_edma_handle;
         edma_handle_t lpspiEdmaMasterRxRegToRxDataHandle;
diff --git a/ports/mimxrt/main.c b/ports/mimxrt/main.c
index a6a0d2e196655..82e07868a1d41 100644
--- a/ports/mimxrt/main.c
+++ b/ports/mimxrt/main.c
@@ -113,6 +113,9 @@ int main(void) {
     soft_reset_exit:
         mp_printf(MP_PYTHON_PRINTER, "MPY: soft reboot\n");
         machine_pin_irq_deinit();
+        #if MICROPY_PY_MACHINE_I2S
+        machine_i2s_deinit_all();
+        #endif
         #if MICROPY_PY_NETWORK
         mod_network_deinit();
         #endif
diff --git a/ports/mimxrt/modmachine.c b/ports/mimxrt/modmachine.c
index 63cec05507354..d2358c5069d25 100644
--- a/ports/mimxrt/modmachine.c
+++ b/ports/mimxrt/modmachine.c
@@ -131,6 +131,9 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_SoftI2C),             MP_ROM_PTR(&mp_machine_soft_i2c_type) },
     { MP_ROM_QSTR(MP_QSTR_SoftSPI),             MP_ROM_PTR(&mp_machine_soft_spi_type) },
     { MP_ROM_QSTR(MP_QSTR_I2C),                 MP_ROM_PTR(&machine_i2c_type) },
+    #if MICROPY_PY_MACHINE_I2S
+    { MP_ROM_QSTR(MP_QSTR_I2S),                 MP_ROM_PTR(&machine_i2s_type) },
+    #endif
     { MP_ROM_QSTR(MP_QSTR_SPI),                 MP_ROM_PTR(&machine_spi_type) },
     { MP_ROM_QSTR(MP_QSTR_UART),                MP_ROM_PTR(&machine_uart_type) },
     { MP_ROM_QSTR(MP_QSTR_WDT),                 MP_ROM_PTR(&machine_wdt_type) },
diff --git a/ports/mimxrt/modmachine.h b/ports/mimxrt/modmachine.h
index d18a22762483e..6502eea09f349 100644
--- a/ports/mimxrt/modmachine.h
+++ b/ports/mimxrt/modmachine.h
@@ -31,6 +31,7 @@
 
 extern const mp_obj_type_t machine_adc_type;
 extern const mp_obj_type_t machine_i2c_type;
+extern const mp_obj_type_t machine_i2s_type;
 extern const mp_obj_type_t machine_pwm_type;
 extern const mp_obj_type_t machine_rtc_type;
 extern const mp_obj_type_t machine_sdcard_type;
@@ -45,5 +46,7 @@ void machine_pwm_deinit_all(void);
 void machine_timer_init_PIT(void);
 void machine_sdcard_init0(void);
 void mimxrt_sdram_init(void);
+void machine_i2s_init0();
+void machine_i2s_deinit_all(void);
 
 #endif // MICROPY_INCLUDED_MIMXRT_MODMACHINE_H
diff --git a/ports/mimxrt/mpconfigport.h b/ports/mimxrt/mpconfigport.h
index b4df533f4ad57..8572f69354842 100644
--- a/ports/mimxrt/mpconfigport.h
+++ b/ports/mimxrt/mpconfigport.h
@@ -140,6 +140,9 @@ uint32_t trng_random_u32(void);
 #define MICROPY_PY_MACHINE_PWM_DUTY_U16_NS  (1)
 #define MICROPY_PY_MACHINE_PWM_INCLUDEFILE  "ports/mimxrt/machine_pwm.c"
 #define MICROPY_PY_MACHINE_I2C              (1)
+#ifndef MICROPY_PY_MACHINE_I2S
+#define MICROPY_PY_MACHINE_I2S              (0)
+#endif
 #define MICROPY_PY_MACHINE_SOFTI2C          (1)
 #define MICROPY_PY_MACHINE_SPI              (1)
 #define MICROPY_PY_MACHINE_SOFTSPI          (1)
@@ -277,6 +280,10 @@ extern const struct _mp_obj_type_t network_lan_type;
 
 #define MICROPY_HW_PIT_NUM_CHANNELS 3
 
+#ifndef MICROPY_BOARD_ROOT_POINTERS
+#define MICROPY_BOARD_ROOT_POINTERS
+#endif
+
 #define MICROPY_PORT_ROOT_POINTERS \
     const char *readline_hist[8]; \
     struct _machine_timer_obj_t *timer_table[MICROPY_HW_PIT_NUM_CHANNELS]; \
@@ -285,6 +292,8 @@ extern const struct _mp_obj_type_t network_lan_type;
     mp_obj_list_t mod_network_nic_list; \
     /* root pointers for sub-systems */ \
     MICROPY_PORT_ROOT_POINTER_MBEDTLS \
+    /* root pointers defined by a board */ \
+        MICROPY_BOARD_ROOT_POINTERS \
 
 #define MP_STATE_PORT MP_STATE_VM
 
@@ -298,6 +307,10 @@ extern const struct _mp_obj_type_t network_lan_type;
 
 #define MICROPY_MAKE_POINTER_CALLABLE(p) ((void *)((mp_uint_t)(p) | 1))
 
+#define MP_HAL_CLEANINVALIDATE_DCACHE(addr, size) \
+    (SCB_CleanInvalidateDCache_by_Addr((uint32_t *)((uint32_t)addr & ~0x1f), \
+    ((uint32_t)((uint8_t *)addr + size + 0x1f) & ~0x1f) - ((uint32_t)addr & ~0x1f)))
+
 #define MP_HAL_CLEAN_DCACHE(addr, size) \
     (SCB_CleanDCache_by_Addr((uint32_t *)((uint32_t)addr & ~0x1f), \
     ((uint32_t)((uint8_t *)addr + size + 0x1f) & ~0x1f) - ((uint32_t)addr & ~0x1f)))
diff --git a/ports/mimxrt/sdcard.c b/ports/mimxrt/sdcard.c
index 1a9a97b68187b..31853b400ebe7 100644
--- a/ports/mimxrt/sdcard.c
+++ b/ports/mimxrt/sdcard.c
@@ -822,7 +822,7 @@ bool sdcard_write(mimxrt_sdcard_obj_t *card, uint8_t *buffer, uint32_t block_num
         .command = &command,
     };
 
-    status_t status = sdcard_transfer_blocking(card->usdhc_inst, &card->handle, &transfer, 500);
+    status_t status = sdcard_transfer_blocking(card->usdhc_inst, &card->handle, &transfer, 3000);
 
     if (status == kStatus_Success) {
         card->status = command.response[0];

From 3e70be8ee9973cffb6b9e8b721bf13b42510b739 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 30 Mar 2022 14:10:31 +1100
Subject: [PATCH 1845/3533] tests/extmod: Update I2S rate test to work on
 mimxrt.

Tested on Teensy 4.0.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/extmod/machine_i2s_rate.py | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/tests/extmod/machine_i2s_rate.py b/tests/extmod/machine_i2s_rate.py
index 46e94585b71d6..d2cd1ae105f8f 100644
--- a/tests/extmod/machine_i2s_rate.py
+++ b/tests/extmod/machine_i2s_rate.py
@@ -13,18 +13,24 @@
     i2s_id = 2
     sck_pin = Pin("Y6")
     ws_pin = Pin("Y5")
-    sd_pin = Pin("Y8")
+    sd_tx_pin = sd_rx_pin = Pin("Y8")
 elif "rp2" in sys.platform:
     i2s_id = 1
     sck_pin = Pin(0)
     ws_pin = Pin(1)
-    sd_pin = Pin(2)
+    sd_tx_pin = sd_rx_pin = Pin(2)
+elif "mimxrt" in sys.platform:
+    i2s_id = 1
+    sck_pin = Pin(26)
+    ws_pin = Pin(27)
+    sd_tx_pin = Pin(7)
+    sd_rx_pin = Pin(8)
 
 TEST_BYTES = b"01234567"
 RATE = 11025  # frames/sec
 
 
-def test(mode, bits_per_sample, frame_format):
+def test(mode, sd_pin, bits_per_sample, frame_format):
     i2s = I2S(
         i2s_id,
         sck=sck_pin,
@@ -70,11 +76,11 @@ def test(mode, bits_per_sample, frame_format):
     print(mode_str, bits_per_sample, channels, abs(dt - 500) <= 4)
 
 
-test(I2S.TX, 16, I2S.MONO)
-test(I2S.TX, 16, I2S.STEREO)
-test(I2S.TX, 32, I2S.MONO)
-test(I2S.TX, 32, I2S.STEREO)
-test(I2S.RX, 16, I2S.MONO)
-test(I2S.RX, 16, I2S.STEREO)
-test(I2S.RX, 32, I2S.MONO)
-test(I2S.RX, 32, I2S.STEREO)
+test(I2S.TX, sd_tx_pin, 16, I2S.MONO)
+test(I2S.TX, sd_tx_pin, 16, I2S.STEREO)
+test(I2S.TX, sd_tx_pin, 32, I2S.MONO)
+test(I2S.TX, sd_tx_pin, 32, I2S.STEREO)
+test(I2S.RX, sd_rx_pin, 16, I2S.MONO)
+test(I2S.RX, sd_rx_pin, 16, I2S.STEREO)
+test(I2S.RX, sd_rx_pin, 32, I2S.MONO)
+test(I2S.RX, sd_rx_pin, 32, I2S.STEREO)

From 4c252ae067a4798fe11c2ce56a9734c1e64846a8 Mon Sep 17 00:00:00 2001
From: Waterlens <waterlens@waterlens.moe>
Date: Fri, 18 Mar 2022 17:47:24 +0800
Subject: [PATCH 1846/3533] tools/mpremote: Allow running mpremote with `python
 -m`.

This is helpful because some scripts are likely to use mpremote with a
specific python path.
---
 tools/mpremote/mpremote/__main__.py | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 tools/mpremote/mpremote/__main__.py

diff --git a/tools/mpremote/mpremote/__main__.py b/tools/mpremote/mpremote/__main__.py
new file mode 100644
index 0000000000000..a91ff67b15da6
--- /dev/null
+++ b/tools/mpremote/mpremote/__main__.py
@@ -0,0 +1,6 @@
+#!/usr/bin/env python3
+
+import sys
+from mpremote import main
+
+sys.exit(main.main())

From dc8b43adc721a253b9b4de655ef3c4b85937862a Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Thu, 17 Feb 2022 11:45:45 +1100
Subject: [PATCH 1847/3533] nrf/drivers/usb: Fix background events/scheduling
 while at USB REPL.

---
 ports/nrf/drivers/usb/usb_cdc.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/nrf/drivers/usb/usb_cdc.c b/ports/nrf/drivers/usb/usb_cdc.c
index 9d7c832e20d32..fa098c98b8593 100644
--- a/ports/nrf/drivers/usb/usb_cdc.c
+++ b/ports/nrf/drivers/usb/usb_cdc.c
@@ -198,6 +198,7 @@ int mp_hal_stdin_rx_chr(void) {
         if (cdc_rx_any()) {
             return cdc_rx_char();
         }
+        MICROPY_EVENT_POLL_HOOK
     }
 
     return 0;

From f92da1adc41f8a354c1ca2b7c9b53f0c45d02e87 Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Tue, 1 Mar 2022 21:34:05 +1100
Subject: [PATCH 1848/3533] nrf/drivers/usb: Fix MP_STREAM_POLL_RD support on
 USB CDC.

This gets ipoll working on USB CDC stdin.
---
 ports/nrf/drivers/usb/usb_cdc.c | 12 ++++++++++++
 ports/nrf/mphalport.c           |  4 +---
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/ports/nrf/drivers/usb/usb_cdc.c b/ports/nrf/drivers/usb/usb_cdc.c
index fa098c98b8593..a1d411a256f1c 100644
--- a/ports/nrf/drivers/usb/usb_cdc.c
+++ b/ports/nrf/drivers/usb/usb_cdc.c
@@ -34,6 +34,7 @@
 #include "nrfx_power.h"
 #include "nrfx_uart.h"
 #include "py/ringbuf.h"
+#include "py/stream.h"
 
 #ifdef BLUETOOTH_SD
 #include "nrf_sdm.h"
@@ -192,6 +193,17 @@ void usb_cdc_sd_event_handler(uint32_t soc_evt) {
 }
 #endif
 
+uintptr_t mp_hal_stdio_poll(uintptr_t poll_flags) {
+    uintptr_t ret = 0;
+    if (poll_flags & MP_STREAM_POLL_RD) {
+        usb_cdc_loop();
+        if (cdc_rx_any()) {
+            ret |= MP_STREAM_POLL_RD;
+        }
+    }
+    return ret;
+}
+
 int mp_hal_stdin_rx_chr(void) {
     for (;;) {
         usb_cdc_loop();
diff --git a/ports/nrf/mphalport.c b/ports/nrf/mphalport.c
index 8ffb256018226..1b31ad5accdf4 100644
--- a/ports/nrf/mphalport.c
+++ b/ports/nrf/mphalport.c
@@ -172,7 +172,7 @@ void mp_hal_set_interrupt_char(int c) {
 }
 #endif
 
-#if !MICROPY_PY_BLE_NUS
+#if !MICROPY_PY_BLE_NUS && !MICROPY_HW_USB_CDC
 uintptr_t mp_hal_stdio_poll(uintptr_t poll_flags) {
     uintptr_t ret = 0;
     if ((poll_flags & MP_STREAM_POLL_RD) && MP_STATE_PORT(board_stdio_uart) != NULL
@@ -181,9 +181,7 @@ uintptr_t mp_hal_stdio_poll(uintptr_t poll_flags) {
     }
     return ret;
 }
-#endif
 
-#if !MICROPY_PY_BLE_NUS && !MICROPY_HW_USB_CDC
 int mp_hal_stdin_rx_chr(void) {
     for (;;) {
         if (MP_STATE_PORT(board_stdio_uart) != NULL && uart_rx_any(MP_STATE_PORT(board_stdio_uart))) {

From 303e222f70501664b7f8b1118ae8682064387cd6 Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Tue, 1 Mar 2022 21:34:57 +1100
Subject: [PATCH 1849/3533] nrf/modules: Include uasyncio in default board
 manifest.

---
 ports/nrf/modules/manifest.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/nrf/modules/manifest.py b/ports/nrf/modules/manifest.py
index 4e8482226baaf..b27d4648b7ea2 100644
--- a/ports/nrf/modules/manifest.py
+++ b/ports/nrf/modules/manifest.py
@@ -1 +1,2 @@
 freeze("$(PORT_DIR)/modules/scripts", "_mkfs.py")
+include("$(MPY_DIR)/extmod/uasyncio/manifest.py")

From 6b23f7d3011ce89aeb00bc510eba97e5e36cd180 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Meri=C3=A7=20SARII=C5=9EIK?= <msariisik@gmail.com>
Date: Mon, 7 Feb 2022 15:41:17 +0100
Subject: [PATCH 1850/3533] stm32/sdio: Use runtime calculation for clock
 divider of sdio on H7.

STM32H7 family has a different calculation compared to the current one for
the SDMMC clock divider configuration.
---
 ports/stm32/sdio.c | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/ports/stm32/sdio.c b/ports/stm32/sdio.c
index bedafcb138e95..99d05a51555ec 100644
--- a/ports/stm32/sdio.c
+++ b/ports/stm32/sdio.c
@@ -96,6 +96,19 @@ static volatile uint8_t *sdmmc_buf_top;
 #define MICROPY_HW_SDIO_CMD     (pin_D2)
 #endif
 
+#if defined(STM32H7)
+static uint32_t safe_divide(uint32_t denom) {
+    uint32_t num = HAL_RCCEx_GetPeriphCLKFreq(RCC_PERIPHCLK_SDMMC);
+    uint32_t divres;
+
+    divres = num / (2U * denom);
+    if ((num % (2U * denom)) > denom) {
+        divres++;
+    }
+    return divres;
+}
+#endif
+
 void sdio_init(uint32_t irq_pri) {
     // configure IO pins
     mp_hal_pin_config_alt_static(MICROPY_HW_SDIO_D0, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_UP, STATIC_AF_SDMMC_D0);
@@ -110,6 +123,8 @@ void sdio_init(uint32_t irq_pri) {
     SDMMC_TypeDef *SDIO = SDMMC;
     #if defined(STM32F7)
     SDIO->CLKCR = SDMMC_CLKCR_HWFC_EN | SDMMC_CLKCR_PWRSAV | (120 - 2); // 1-bit, 400kHz
+    #elif defined(STM32H7)
+    SDIO->CLKCR = SDMMC_CLKCR_HWFC_EN | SDMMC_CLKCR_PWRSAV | safe_divide(400000U); // 1-bit, 400kHz
     #else
     SDIO->CLKCR = SDMMC_CLKCR_HWFC_EN | SDMMC_CLKCR_PWRSAV | (120 / 2); // 1-bit, 400kHz
     #endif
@@ -157,6 +172,8 @@ void sdio_enable_high_speed_4bit(void) {
     mp_hal_delay_us(10);
     #if defined(STM32F7)
     SDIO->CLKCR = SDMMC_CLKCR_HWFC_EN | SDMMC_CLKCR_WIDBUS_0 | SDMMC_CLKCR_BYPASS /*| SDMMC_CLKCR_PWRSAV*/; // 4-bit, 48MHz
+    #elif defined(STM32H7)
+    SDIO->CLKCR = SDMMC_CLKCR_HWFC_EN | SDMMC_CLKCR_WIDBUS_0 | safe_divide(48000000U); // 4-bit, 48MHz
     #else
     SDIO->CLKCR = SDMMC_CLKCR_HWFC_EN | SDMMC_CLKCR_WIDBUS_0; // 4-bit, 48MHz
     #endif

From a41bc5a7cadb5bea9b7800286b2f4ea4f9b26e1a Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Wed, 23 Feb 2022 09:37:48 +1100
Subject: [PATCH 1851/3533] stm32/modmachine: Add deepsleep support to
 reset_cause() for WB55.

---
 ports/stm32/modmachine.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/ports/stm32/modmachine.c b/ports/stm32/modmachine.c
index 57b8ef5e6b1d8..0239ea64cac10 100644
--- a/ports/stm32/modmachine.c
+++ b/ports/stm32/modmachine.c
@@ -119,6 +119,12 @@ void machine_init(void) {
         reset_cause = PYB_RESET_DEEPSLEEP;
         PWR->SCR |= PWR_SCR_CSBF;
     } else
+    #elif defined(STM32WB)
+    if (PWR->EXTSCR & PWR_EXTSCR_C1SBF) {
+        // came out of standby
+        reset_cause = PYB_RESET_DEEPSLEEP;
+        PWR->EXTSCR |= PWR_EXTSCR_C1CSSF;
+    } else
     #endif
     {
         // get reset cause from RCC flags

From 335002a4c020850591122d763324599e5edbe045 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 29 Mar 2022 12:27:56 +1100
Subject: [PATCH 1852/3533] extmod/uasyncio: Allow task state to be a callable.

This implements a form of CPython's "add_done_callback()", but at this
stage it is a hidden feature and only intended to be used internally.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/moduasyncio.c    | 3 +++
 extmod/uasyncio/core.py | 5 +++++
 extmod/uasyncio/task.py | 5 ++++-
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/extmod/moduasyncio.c b/extmod/moduasyncio.c
index dd2d1e747557c..b0921b6eb13fe 100644
--- a/extmod/moduasyncio.c
+++ b/extmod/moduasyncio.c
@@ -265,6 +265,9 @@ STATIC mp_obj_t task_getiter(mp_obj_t self_in, mp_obj_iter_buf_t *iter_buf) {
     } else if (self->state == TASK_STATE_RUNNING_NOT_WAITED_ON) {
         // Allocate the waiting queue.
         self->state = task_queue_make_new(&task_queue_type, 0, 0, NULL);
+    } else if (mp_obj_get_type(self->state) != &task_queue_type) {
+        // Task has state used for another purpose, so can't also wait on it.
+        mp_raise_msg(&mp_type_RuntimeError, MP_ERROR_TEXT("can't wait"));
     }
     return self_in;
 }
diff --git a/extmod/uasyncio/core.py b/extmod/uasyncio/core.py
index 12833cf0cdf9c..28b5e960acc8f 100644
--- a/extmod/uasyncio/core.py
+++ b/extmod/uasyncio/core.py
@@ -195,6 +195,11 @@ def run_until_complete(main_task=None):
                 if t.state is True:
                     # "None" indicates that the task is complete and not await'ed on (yet).
                     t.state = None
+                elif callable(t.state):
+                    # The task has a callback registered to be called on completion.
+                    t.state(t, er)
+                    t.state = False
+                    waiting = True
                 else:
                     # Schedule any other tasks waiting on the completion of this task.
                     while t.state.peek():
diff --git a/extmod/uasyncio/task.py b/extmod/uasyncio/task.py
index 26df7b1725be8..d775164909492 100644
--- a/extmod/uasyncio/task.py
+++ b/extmod/uasyncio/task.py
@@ -123,7 +123,7 @@ class Task:
     def __init__(self, coro, globals=None):
         self.coro = coro  # Coroutine of this Task
         self.data = None  # General data for queue it is waiting on
-        self.state = True  # None, False, True or a TaskQueue instance
+        self.state = True  # None, False, True, a callable, or a TaskQueue instance
         self.ph_key = 0  # Pairing heap
         self.ph_child = None  # Paring heap
         self.ph_child_last = None  # Paring heap
@@ -137,6 +137,9 @@ def __iter__(self):
         elif self.state is True:
             # Allocated head of linked list of Tasks waiting on completion of this task.
             self.state = TaskQueue()
+        elif type(self.state) is not TaskQueue:
+            # Task has state used for another purpose, so can't also wait on it.
+            raise RuntimeError("can't wait")
         return self
 
     def __next__(self):

From 90aaf2dbef657e5afb8855a42d26093c3ef2a38d Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 29 Mar 2022 12:57:04 +1100
Subject: [PATCH 1853/3533] extmod/uasyncio: Fix gather cancelling and handling
 of exceptions.

The following fixes are made:
- cancelling a gather now cancels all sub-tasks of the gather (previously
  it would only cancel the first)
- if any sub-task of a gather raises an exception then the gather finishes
  (previously it would only finish if the first sub-task raised)

Fixes issues #5798, #7807, #7901.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/uasyncio/funcs.py                    | 76 +++++++++++++++++----
 tests/extmod/uasyncio_gather.py             | 63 ++++++++++++++---
 tests/extmod/uasyncio_gather.py.exp         | 21 ++++++
 tests/extmod/uasyncio_gather_notimpl.py     | 53 ++++++++++++++
 tests/extmod/uasyncio_gather_notimpl.py.exp | 14 ++++
 5 files changed, 202 insertions(+), 25 deletions(-)
 create mode 100644 tests/extmod/uasyncio_gather_notimpl.py
 create mode 100644 tests/extmod/uasyncio_gather_notimpl.py.exp

diff --git a/extmod/uasyncio/funcs.py b/extmod/uasyncio/funcs.py
index 0ce48b015c1bd..b19edeb6ef258 100644
--- a/extmod/uasyncio/funcs.py
+++ b/extmod/uasyncio/funcs.py
@@ -53,22 +53,68 @@ def wait_for_ms(aw, timeout):
     return wait_for(aw, timeout, core.sleep_ms)
 
 
+class _Remove:
+    @staticmethod
+    def remove(t):
+        pass
+
+
 async def gather(*aws, return_exceptions=False):
+    def done(t, er):
+        nonlocal state
+        if type(state) is not int:
+            # A sub-task already raised an exception, so do nothing.
+            return
+        elif not return_exceptions and not isinstance(er, StopIteration):
+            # A sub-task raised an exception, indicate that to the gather task.
+            state = er
+        else:
+            state -= 1
+            if state:
+                # Still some sub-tasks running.
+                return
+        # Gather waiting is done, schedule the main gather task.
+        core._task_queue.push_head(gather_task)
+
     ts = [core._promote_to_task(aw) for aw in aws]
     for i in range(len(ts)):
-        try:
-            # TODO handle cancel of gather itself
-            # if ts[i].coro:
-            #    iter(ts[i]).waiting.push_head(cur_task)
-            #    try:
-            #        yield
-            #    except CancelledError as er:
-            #        # cancel all waiting tasks
-            #        raise er
-            ts[i] = await ts[i]
-        except (core.CancelledError, Exception) as er:
-            if return_exceptions:
-                ts[i] = er
-            else:
-                raise er
+        if ts[i].state is not True:
+            # Task is not running, gather not currently supported for this case.
+            raise RuntimeError("can't gather")
+        # Register the callback to call when the task is done.
+        ts[i].state = done
+
+    # Set the state for execution of the gather.
+    gather_task = core.cur_task
+    state = len(ts)
+    cancel_all = False
+
+    # Wait for the a sub-task to need attention.
+    gather_task.data = _Remove
+    try:
+        yield
+    except core.CancelledError as er:
+        cancel_all = True
+        state = er
+
+    # Clean up tasks.
+    for i in range(len(ts)):
+        if ts[i].state is done:
+            # Sub-task is still running, deregister the callback and cancel if needed.
+            ts[i].state = True
+            if cancel_all:
+                ts[i].cancel()
+        elif isinstance(ts[i].data, StopIteration):
+            # Sub-task ran to completion, get its return value.
+            ts[i] = ts[i].data.value
+        else:
+            # Sub-task had an exception with return_exceptions==True, so get its exception.
+            ts[i] = ts[i].data
+
+    # Either this gather was cancelled, or one of the sub-tasks raised an exception with
+    # return_exceptions==False, so reraise the exception here.
+    if state is not 0:
+        raise state
+
+    # Return the list of return values of each sub-task.
     return ts
diff --git a/tests/extmod/uasyncio_gather.py b/tests/extmod/uasyncio_gather.py
index 6053873dbc1ae..718e702be6be9 100644
--- a/tests/extmod/uasyncio_gather.py
+++ b/tests/extmod/uasyncio_gather.py
@@ -27,9 +27,22 @@ async def task(id):
     return id
 
 
-async def gather_task():
+async def task_loop(id):
+    print("task_loop start", id)
+    while True:
+        await asyncio.sleep(0.02)
+        print("task_loop loop", id)
+
+
+async def task_raise(id):
+    print("task_raise start", id)
+    await asyncio.sleep(0.02)
+    raise ValueError(id)
+
+
+async def gather_task(t0, t1):
     print("gather_task")
-    await asyncio.gather(task(1), task(2))
+    await asyncio.gather(t0, t1)
     print("gather_task2")
 
 
@@ -37,19 +50,49 @@ async def main():
     # Simple gather with return values
     print(await asyncio.gather(factorial("A", 2), factorial("B", 3), factorial("C", 4)))
 
+    print("====")
+
     # Test return_exceptions, where one task is cancelled and the other finishes normally
     tasks = [asyncio.create_task(task(1)), asyncio.create_task(task(2))]
     tasks[0].cancel()
     print(await asyncio.gather(*tasks, return_exceptions=True))
 
-    # Cancel a multi gather
-    # TODO doesn't work, Task should not forward cancellation from gather to sub-task
-    # but rather CancelledError should cancel the gather directly, which will then cancel
-    # all sub-tasks explicitly
-    # t = asyncio.create_task(gather_task())
-    # await asyncio.sleep(0.01)
-    # t.cancel()
-    # await asyncio.sleep(0.01)
+    print("====")
+
+    # Test return_exceptions, where one task raises an exception and the other finishes normally.
+    tasks = [asyncio.create_task(task(1)), asyncio.create_task(task_raise(2))]
+    print(await asyncio.gather(*tasks, return_exceptions=True))
+
+    print("====")
+
+    # Test case where one task raises an exception and other task keeps running.
+    tasks = [asyncio.create_task(task_loop(1)), asyncio.create_task(task_raise(2))]
+    try:
+        await asyncio.gather(*tasks)
+    except ValueError as er:
+        print(repr(er))
+    print(tasks[0].done(), tasks[1].done())
+    for t in tasks:
+        t.cancel()
+    await asyncio.sleep(0.04)
+
+    print("====")
+
+    # Test case where both tasks raise an exception.
+    tasks = [asyncio.create_task(task_raise(1)), asyncio.create_task(task_raise(2))]
+    try:
+        await asyncio.gather(*tasks)
+    except ValueError as er:
+        print(repr(er))
+    print(tasks[0].done(), tasks[1].done())
+
+    print("====")
+
+    # Cancel a multi gather.
+    t = asyncio.create_task(gather_task(task(1), task(2)))
+    await asyncio.sleep(0.01)
+    t.cancel()
+    await asyncio.sleep(0.04)
 
 
 asyncio.run(main())
diff --git a/tests/extmod/uasyncio_gather.py.exp b/tests/extmod/uasyncio_gather.py.exp
index 95310bbe1c105..9b30c36b67a47 100644
--- a/tests/extmod/uasyncio_gather.py.exp
+++ b/tests/extmod/uasyncio_gather.py.exp
@@ -8,6 +8,27 @@ Task B: factorial(3) = 6
 Task C: Compute factorial(4)...
 Task C: factorial(4) = 24
 [2, 6, 24]
+====
 start 2
 end 2
 [CancelledError(), 2]
+====
+start 1
+task_raise start 2
+end 1
+[1, ValueError(2,)]
+====
+task_loop start 1
+task_raise start 2
+task_loop loop 1
+ValueError(2,)
+False True
+====
+task_raise start 1
+task_raise start 2
+ValueError(1,)
+True True
+====
+gather_task
+start 1
+start 2
diff --git a/tests/extmod/uasyncio_gather_notimpl.py b/tests/extmod/uasyncio_gather_notimpl.py
new file mode 100644
index 0000000000000..3ebab9bad6388
--- /dev/null
+++ b/tests/extmod/uasyncio_gather_notimpl.py
@@ -0,0 +1,53 @@
+# Test uasyncio.gather() function, features that are not implemented.
+
+try:
+    import uasyncio as asyncio
+except ImportError:
+    try:
+        import asyncio
+    except ImportError:
+        print("SKIP")
+        raise SystemExit
+
+
+def custom_handler(loop, context):
+    print(repr(context["exception"]))
+
+
+async def task(id):
+    print("task start", id)
+    await asyncio.sleep(0.01)
+    print("task end", id)
+    return id
+
+
+async def gather_task(t0, t1):
+    print("gather_task start")
+    await asyncio.gather(t0, t1)
+    print("gather_task end")
+
+
+async def main():
+    loop = asyncio.get_event_loop()
+    loop.set_exception_handler(custom_handler)
+
+    # Test case where can't wait on a task being gathered.
+    tasks = [asyncio.create_task(task(1)), asyncio.create_task(task(2))]
+    gt = asyncio.create_task(gather_task(tasks[0], tasks[1]))
+    await asyncio.sleep(0)  # let the gather start
+    try:
+        await tasks[0]  # can't await because this task is part of the gather
+    except RuntimeError as er:
+        print(repr(er))
+    await gt
+
+    print("====")
+
+    # Test case where can't gather on a task being waited.
+    tasks = [asyncio.create_task(task(1)), asyncio.create_task(task(2))]
+    asyncio.create_task(gather_task(tasks[0], tasks[1]))
+    await tasks[0]  # wait on this task before the gather starts
+    await tasks[1]
+
+
+asyncio.run(main())
diff --git a/tests/extmod/uasyncio_gather_notimpl.py.exp b/tests/extmod/uasyncio_gather_notimpl.py.exp
new file mode 100644
index 0000000000000..f21614ffbe671
--- /dev/null
+++ b/tests/extmod/uasyncio_gather_notimpl.py.exp
@@ -0,0 +1,14 @@
+task start 1
+task start 2
+gather_task start
+RuntimeError("can't wait",)
+task end 1
+task end 2
+gather_task end
+====
+task start 1
+task start 2
+gather_task start
+RuntimeError("can't gather",)
+task end 1
+task end 2

From 594c753c27c07df2a1b36e4eb772a6a2165eee9c Mon Sep 17 00:00:00 2001
From: stijn <stijn@ignitron.net>
Date: Thu, 17 Mar 2022 12:49:38 +0100
Subject: [PATCH 1854/3533] py/bc.h: Fix C++20 compilation with "volatile".

C++20 is deprecating several usages of the volatile keyword so remove this
one affected case in the codebase which causes such warning.
---
 py/bc.h | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/py/bc.h b/py/bc.h
index 8709b42389032..3b7b625fecfdb 100644
--- a/py/bc.h
+++ b/py/bc.h
@@ -262,7 +262,11 @@ mp_uint_t mp_decode_uint(const byte **ptr);
 mp_uint_t mp_decode_uint_value(const byte *ptr);
 const byte *mp_decode_uint_skip(const byte *ptr);
 
-mp_vm_return_kind_t mp_execute_bytecode(mp_code_state_t *code_state, volatile mp_obj_t inject_exc);
+mp_vm_return_kind_t mp_execute_bytecode(mp_code_state_t *code_state,
+#ifndef __cplusplus
+    volatile
+#endif
+    mp_obj_t inject_exc);
 mp_code_state_t *mp_obj_fun_bc_prepare_codestate(mp_obj_t func, size_t n_args, size_t n_kw, const mp_obj_t *args);
 void mp_setup_code_state(mp_code_state_t *code_state, size_t n_args, size_t n_kw, const mp_obj_t *args);
 void mp_bytecode_print(const mp_print_t *print, const struct _mp_raw_code_t *rc, const mp_module_constants_t *cm);

From df9a4122062ff706ad4b6a76cb5bc16d1a23d384 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 29 Mar 2022 22:37:58 +1100
Subject: [PATCH 1855/3533] py/compile: Only show raw code that is bytecode.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/compile.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/py/compile.c b/py/compile.c
index d61dabb9a5ac0..36f33f97f78ea 100644
--- a/py/compile.c
+++ b/py/compile.c
@@ -3636,7 +3636,9 @@ mp_compiled_module_t mp_compile_to_raw_code(mp_parse_tree_t *parse_tree, qstr so
         if (mp_verbose_flag >= 2) {
             for (scope_t *s = comp->scope_head; s != NULL; s = s->next) {
                 mp_raw_code_t *rc = s->raw_code;
-                mp_bytecode_print(&mp_plat_print, rc, &cm.context->constants);
+                if (rc->kind == MP_CODE_BYTECODE) {
+                    mp_bytecode_print(&mp_plat_print, rc, &cm.context->constants);
+                }
             }
         }
         #endif

From bf3585b33c4fcd47edcf39494b7bc464a018b4fc Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 29 Mar 2022 22:38:19 +1100
Subject: [PATCH 1856/3533] py/asmxtensa: Fix use of l32i/s32i when offset
 won't fit in encoding.

This commit adds optimised l32i/s32i functions that select the best load/
store encoding based on the size of the offset, and uses the function when
necessary in code generation.

Without this, ASM_LOAD_REG_REG_OFFSET() could overflow the word offset
(using a narrow encoding), for example when loading the prelude from the
constant table when there are many (>16) constants.

Fixes issue #8458.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/asmxtensa.c | 32 ++++++++++++++++++++++----------
 py/asmxtensa.h |  6 ++++--
 2 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/py/asmxtensa.c b/py/asmxtensa.c
index 0956d50f3ef15..8ac914ec412a4 100644
--- a/py/asmxtensa.c
+++ b/py/asmxtensa.c
@@ -27,7 +27,7 @@
 #include <stdio.h>
 #include <assert.h>
 
-#include "py/mpconfig.h"
+#include "py/runtime.h"
 
 // wrapper around everything in this file
 #if MICROPY_EMIT_XTENSA || MICROPY_EMIT_INLINE_XTENSA || MICROPY_EMIT_XTENSAWIN
@@ -232,21 +232,33 @@ void asm_xtensa_mov_reg_pcrel(asm_xtensa_t *as, uint reg_dest, uint label) {
     asm_xtensa_op_add_n(as, reg_dest, reg_dest, ASM_XTENSA_REG_A0);
 }
 
-void asm_xtensa_call_ind(asm_xtensa_t *as, uint idx) {
-    if (idx < 16) {
-        asm_xtensa_op_l32i_n(as, ASM_XTENSA_REG_A0, ASM_XTENSA_REG_FUN_TABLE, idx);
+void asm_xtensa_l32i_optimised(asm_xtensa_t *as, uint reg_dest, uint reg_base, uint word_offset) {
+    if (word_offset < 16) {
+        asm_xtensa_op_l32i_n(as, reg_dest, reg_base, word_offset);
+    } else if (word_offset < 256) {
+        asm_xtensa_op_l32i(as, reg_dest, reg_base, word_offset);
     } else {
-        asm_xtensa_op_l32i(as, ASM_XTENSA_REG_A0, ASM_XTENSA_REG_FUN_TABLE, idx);
+        mp_raise_msg(&mp_type_RuntimeError, MP_ERROR_TEXT("asm overflow"));
     }
-    asm_xtensa_op_callx0(as, ASM_XTENSA_REG_A0);
 }
 
-void asm_xtensa_call_ind_win(asm_xtensa_t *as, uint idx) {
-    if (idx < 16) {
-        asm_xtensa_op_l32i_n(as, ASM_XTENSA_REG_A8, ASM_XTENSA_REG_FUN_TABLE_WIN, idx);
+void asm_xtensa_s32i_optimised(asm_xtensa_t *as, uint reg_src, uint reg_base, uint word_offset) {
+    if (word_offset < 16) {
+        asm_xtensa_op_s32i_n(as, reg_src, reg_base, word_offset);
+    } else if (word_offset < 256) {
+        asm_xtensa_op_s32i(as, reg_src, reg_base, word_offset);
     } else {
-        asm_xtensa_op_l32i(as, ASM_XTENSA_REG_A8, ASM_XTENSA_REG_FUN_TABLE_WIN, idx);
+        mp_raise_msg(&mp_type_RuntimeError, MP_ERROR_TEXT("asm overflow"));
     }
+}
+
+void asm_xtensa_call_ind(asm_xtensa_t *as, uint idx) {
+    asm_xtensa_l32i_optimised(as, ASM_XTENSA_REG_A0, ASM_XTENSA_REG_FUN_TABLE, idx);
+    asm_xtensa_op_callx0(as, ASM_XTENSA_REG_A0);
+}
+
+void asm_xtensa_call_ind_win(asm_xtensa_t *as, uint idx) {
+    asm_xtensa_l32i_optimised(as, ASM_XTENSA_REG_A8, ASM_XTENSA_REG_FUN_TABLE_WIN, idx);
     asm_xtensa_op_callx8(as, ASM_XTENSA_REG_A8);
 }
 
diff --git a/py/asmxtensa.h b/py/asmxtensa.h
index 43f1b608edd1c..16a59c0ee0244 100644
--- a/py/asmxtensa.h
+++ b/py/asmxtensa.h
@@ -278,6 +278,8 @@ void asm_xtensa_mov_local_reg(asm_xtensa_t *as, int local_num, uint reg_src);
 void asm_xtensa_mov_reg_local(asm_xtensa_t *as, uint reg_dest, int local_num);
 void asm_xtensa_mov_reg_local_addr(asm_xtensa_t *as, uint reg_dest, int local_num);
 void asm_xtensa_mov_reg_pcrel(asm_xtensa_t *as, uint reg_dest, uint label);
+void asm_xtensa_l32i_optimised(asm_xtensa_t *as, uint reg_dest, uint reg_base, uint word_offset);
+void asm_xtensa_s32i_optimised(asm_xtensa_t *as, uint reg_src, uint reg_base, uint word_offset);
 void asm_xtensa_call_ind(asm_xtensa_t *as, uint idx);
 void asm_xtensa_call_ind_win(asm_xtensa_t *as, uint idx);
 
@@ -393,12 +395,12 @@ void asm_xtensa_call_ind_win(asm_xtensa_t *as, uint idx);
 #define ASM_SUB_REG_REG(as, reg_dest, reg_src) asm_xtensa_op_sub((as), (reg_dest), (reg_dest), (reg_src))
 #define ASM_MUL_REG_REG(as, reg_dest, reg_src) asm_xtensa_op_mull((as), (reg_dest), (reg_dest), (reg_src))
 
-#define ASM_LOAD_REG_REG_OFFSET(as, reg_dest, reg_base, word_offset) asm_xtensa_op_l32i_n((as), (reg_dest), (reg_base), (word_offset))
+#define ASM_LOAD_REG_REG_OFFSET(as, reg_dest, reg_base, word_offset) asm_xtensa_l32i_optimised((as), (reg_dest), (reg_base), (word_offset))
 #define ASM_LOAD8_REG_REG(as, reg_dest, reg_base) asm_xtensa_op_l8ui((as), (reg_dest), (reg_base), 0)
 #define ASM_LOAD16_REG_REG(as, reg_dest, reg_base) asm_xtensa_op_l16ui((as), (reg_dest), (reg_base), 0)
 #define ASM_LOAD32_REG_REG(as, reg_dest, reg_base) asm_xtensa_op_l32i_n((as), (reg_dest), (reg_base), 0)
 
-#define ASM_STORE_REG_REG_OFFSET(as, reg_dest, reg_base, word_offset) asm_xtensa_op_s32i_n((as), (reg_dest), (reg_base), (word_offset))
+#define ASM_STORE_REG_REG_OFFSET(as, reg_dest, reg_base, word_offset) asm_xtensa_s32i_optimised((as), (reg_dest), (reg_base), (word_offset))
 #define ASM_STORE8_REG_REG(as, reg_src, reg_base) asm_xtensa_op_s8i((as), (reg_src), (reg_base), 0)
 #define ASM_STORE16_REG_REG(as, reg_src, reg_base) asm_xtensa_op_s16i((as), (reg_src), (reg_base), 0)
 #define ASM_STORE32_REG_REG(as, reg_src, reg_base) asm_xtensa_op_s32i_n((as), (reg_src), (reg_base), 0)

From 7e8222ae063d78ae8f901bb0f9fef663edd2edb6 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 29 Mar 2022 22:40:02 +1100
Subject: [PATCH 1857/3533] py/emitnative: Don't store prelude at end of
 machine code if not needed.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/emitnative.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/py/emitnative.c b/py/emitnative.c
index bddd661428471..a207dd30f7387 100644
--- a/py/emitnative.c
+++ b/py/emitnative.c
@@ -723,7 +723,13 @@ STATIC bool emit_native_end_pass(emit_t *emit) {
 
     if (emit->pass == MP_PASS_EMIT) {
         void *f = mp_asm_base_get_code(&emit->as->base);
+        #if N_PRELUDE_AS_BYTES_OBJ
+        // Keep only the machine code, not the prelude, which is in a separate bytes object.
+        mp_uint_t f_len = emit->prelude_offset;
+        #else
+        // Keep both the machine code and the prelude.
         mp_uint_t f_len = mp_asm_base_get_code_size(&emit->as->base);
+        #endif
 
         mp_emit_glue_assign_native(emit->scope->raw_code,
             emit->do_viper_types ? MP_CODE_NATIVE_VIPER : MP_CODE_NATIVE_PY,

From bb70874111dbb246624a68c013e8f1c3245ca0d8 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 31 Mar 2022 10:57:34 +1100
Subject: [PATCH 1858/3533] py/vm: Prevent array bound warning when using
 -MP_OBJ_ITER_BUF_NSLOTS.

This warning can happen on clang 13.0.1 building mpy-cross:

../py/vm.c:748:25: error: array index -3 refers past the last possible
  element for an array in 64-bit address space containing 64-bit (8-byte)
  elements (max possible 2305843009213693952 elements)
  [-Werror,-Warray-bounds]
                        sp[-MP_OBJ_ITER_BUF_NSLOTS + 1] = MP_OBJ_NULL;
                        ^  ~~~~~~~~~~~~~~~~~~~~~~~~~~~

Using pointer access instead of array access works around this warning.

Fixes issue #8467.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/vm.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/py/vm.c b/py/vm.c
index 50da90e7d2500..fa163423ad40b 100644
--- a/py/vm.c
+++ b/py/vm.c
@@ -745,8 +745,8 @@ unwind_jump:;
                     obj = mp_getiter(obj, iter_buf);
                     if (obj != MP_OBJ_FROM_PTR(iter_buf)) {
                         // Iterator didn't use the stack so indicate that with MP_OBJ_NULL.
-                        sp[-MP_OBJ_ITER_BUF_NSLOTS + 1] = MP_OBJ_NULL;
-                        sp[-MP_OBJ_ITER_BUF_NSLOTS + 2] = obj;
+                        *(sp - MP_OBJ_ITER_BUF_NSLOTS + 1) = MP_OBJ_NULL;
+                        *(sp - MP_OBJ_ITER_BUF_NSLOTS + 2) = obj;
                     }
                     DISPATCH();
                 }
@@ -757,8 +757,8 @@ unwind_jump:;
                     DECODE_ULABEL; // the jump offset if iteration finishes; for labels are always forward
                     code_state->sp = sp;
                     mp_obj_t obj;
-                    if (sp[-MP_OBJ_ITER_BUF_NSLOTS + 1] == MP_OBJ_NULL) {
-                        obj = sp[-MP_OBJ_ITER_BUF_NSLOTS + 2];
+                    if (*(sp - MP_OBJ_ITER_BUF_NSLOTS + 1) == MP_OBJ_NULL) {
+                        obj = *(sp - MP_OBJ_ITER_BUF_NSLOTS + 2);
                     } else {
                         obj = MP_OBJ_FROM_PTR(&sp[-MP_OBJ_ITER_BUF_NSLOTS + 1]);
                     }

From 1e99d29f362f8cccc60a36fcbd8590404c719f40 Mon Sep 17 00:00:00 2001
From: David Lechner <david@lechnology.com>
Date: Tue, 24 Mar 2020 21:39:46 -0500
Subject: [PATCH 1859/3533] py/runtime: Allow multiple **args in a function
 call.

This is a partial implementation of PEP 448 to allow multiple ** unpackings
when calling a function or method.

The compiler is modified to encode the argument as a None: obj key-value
pair (similar to how regular keyword arguments are encoded as str: obj
pairs).  The extra object that was pushed on the stack to hold a single **
unpacking object is no longer used and is removed.

The runtime is modified to decode this new format.

Signed-off-by: David Lechner <david@pybricks.com>
---
 py/compile.c                     |  18 ++---
 py/emitbc.c                      |   4 +-
 py/emitnative.c                  |   4 +-
 py/runtime.c                     | 128 +++++++++++++++++--------------
 py/vm.c                          |   8 +-
 tests/basics/fun_calldblstar4.py |  33 ++++++++
 tests/basics/python34.py         |   1 -
 tests/basics/python34.py.exp     |   1 -
 tests/cmdline/cmd_showbc.py.exp  |   8 +-
 9 files changed, 122 insertions(+), 83 deletions(-)
 create mode 100644 tests/basics/fun_calldblstar4.py

diff --git a/py/compile.c b/py/compile.c
index 36f33f97f78ea..1636bd157d195 100644
--- a/py/compile.c
+++ b/py/compile.c
@@ -2397,7 +2397,7 @@ STATIC void compile_trailer_paren_helper(compiler_t *comp, mp_parse_node_t pn_ar
     int n_positional = n_positional_extra;
     uint n_keyword = 0;
     uint star_flags = 0;
-    mp_parse_node_struct_t *star_args_node = NULL, *dblstar_args_node = NULL;
+    mp_parse_node_struct_t *star_args_node = NULL;
     for (size_t i = 0; i < n_args; i++) {
         if (MP_PARSE_NODE_IS_STRUCT(args[i])) {
             mp_parse_node_struct_t *pns_arg = (mp_parse_node_struct_t *)args[i];
@@ -2409,12 +2409,11 @@ STATIC void compile_trailer_paren_helper(compiler_t *comp, mp_parse_node_t pn_ar
                 star_flags |= MP_EMIT_STAR_FLAG_SINGLE;
                 star_args_node = pns_arg;
             } else if (MP_PARSE_NODE_STRUCT_KIND(pns_arg) == PN_arglist_dbl_star) {
-                if (star_flags & MP_EMIT_STAR_FLAG_DOUBLE) {
-                    compile_syntax_error(comp, (mp_parse_node_t)pns_arg, MP_ERROR_TEXT("can't have multiple **x"));
-                    return;
-                }
                 star_flags |= MP_EMIT_STAR_FLAG_DOUBLE;
-                dblstar_args_node = pns_arg;
+                // double-star args are stored as kw arg with key of None
+                EMIT(load_null);
+                compile_node(comp, pns_arg->nodes[0]);
+                n_keyword++;
             } else if (MP_PARSE_NODE_STRUCT_KIND(pns_arg) == PN_argument) {
                 #if MICROPY_PY_ASSIGN_EXPR
                 if (MP_PARSE_NODE_IS_STRUCT_KIND(pns_arg->nodes[1], PN_argument_3)) {
@@ -2429,7 +2428,7 @@ STATIC void compile_trailer_paren_helper(compiler_t *comp, mp_parse_node_t pn_ar
                     }
                     EMIT_ARG(load_const_str, MP_PARSE_NODE_LEAF_ARG(pns_arg->nodes[0]));
                     compile_node(comp, pns_arg->nodes[1]);
-                    n_keyword += 1;
+                    n_keyword++;
                 } else {
                     compile_comprehension(comp, pns_arg, SCOPE_GEN_EXPR);
                     n_positional++;
@@ -2460,11 +2459,6 @@ STATIC void compile_trailer_paren_helper(compiler_t *comp, mp_parse_node_t pn_ar
         } else {
             compile_node(comp, star_args_node->nodes[0]);
         }
-        if (dblstar_args_node == NULL) {
-            EMIT(load_null);
-        } else {
-            compile_node(comp, dblstar_args_node->nodes[0]);
-        }
     }
 
     // emit the function/method call
diff --git a/py/emitbc.c b/py/emitbc.c
index 1f5cd9d322d47..21ec121911e69 100644
--- a/py/emitbc.c
+++ b/py/emitbc.c
@@ -752,7 +752,9 @@ void mp_emit_bc_make_closure(emit_t *emit, scope_t *scope, mp_uint_t n_closed_ov
 
 STATIC void emit_bc_call_function_method_helper(emit_t *emit, int stack_adj, mp_uint_t bytecode_base, mp_uint_t n_positional, mp_uint_t n_keyword, mp_uint_t star_flags) {
     if (star_flags) {
-        stack_adj -= (int)n_positional + 2 * (int)n_keyword + 2;
+        // each positional arg is one object, each kwarg is two objects, the key
+        // and the value and one extra object for the star args bitmap.
+        stack_adj -= (int)n_positional + 2 * (int)n_keyword + 1;
         emit_write_bytecode_byte_uint(emit, stack_adj, bytecode_base + 1, (n_keyword << 8) | n_positional); // TODO make it 2 separate uints?
     } else {
         stack_adj -= (int)n_positional + 2 * (int)n_keyword;
diff --git a/py/emitnative.c b/py/emitnative.c
index a207dd30f7387..2863984047a15 100644
--- a/py/emitnative.c
+++ b/py/emitnative.c
@@ -2752,7 +2752,7 @@ STATIC void emit_native_call_function(emit_t *emit, mp_uint_t n_positional, mp_u
     } else {
         assert(vtype_fun == VTYPE_PYOBJ);
         if (star_flags) {
-            emit_get_stack_pointer_to_reg_for_pop(emit, REG_ARG_3, n_positional + 2 * n_keyword + 3); // pointer to args
+            emit_get_stack_pointer_to_reg_for_pop(emit, REG_ARG_3, n_positional + 2 * n_keyword + 2); // pointer to args
             emit_call_with_2_imm_args(emit, MP_F_CALL_METHOD_N_KW_VAR, 0, REG_ARG_1, n_positional | (n_keyword << 8), REG_ARG_2);
             emit_post_push_reg(emit, VTYPE_PYOBJ, REG_RET);
         } else {
@@ -2768,7 +2768,7 @@ STATIC void emit_native_call_function(emit_t *emit, mp_uint_t n_positional, mp_u
 
 STATIC void emit_native_call_method(emit_t *emit, mp_uint_t n_positional, mp_uint_t n_keyword, mp_uint_t star_flags) {
     if (star_flags) {
-        emit_get_stack_pointer_to_reg_for_pop(emit, REG_ARG_3, n_positional + 2 * n_keyword + 4); // pointer to args
+        emit_get_stack_pointer_to_reg_for_pop(emit, REG_ARG_3, n_positional + 2 * n_keyword + 3); // pointer to args
         emit_call_with_2_imm_args(emit, MP_F_CALL_METHOD_N_KW_VAR, 1, REG_ARG_1, n_positional | (n_keyword << 8), REG_ARG_2);
         emit_post_push_reg(emit, VTYPE_PYOBJ, REG_RET);
     } else {
diff --git a/py/runtime.c b/py/runtime.c
index ba3fbe7fa5cc8..e6bfbda58d4df 100644
--- a/py/runtime.c
+++ b/py/runtime.c
@@ -702,9 +702,8 @@ void mp_call_prepare_args_n_kw_var(bool have_self, size_t n_args_n_kw, const mp_
     uint n_args = n_args_n_kw & 0xff;
     uint n_kw = (n_args_n_kw >> 8) & 0xff;
     mp_obj_t pos_seq = args[n_args + 2 * n_kw]; // may be MP_OBJ_NULL
-    mp_obj_t kw_dict = args[n_args + 2 * n_kw + 1]; // may be MP_OBJ_NULL
 
-    DEBUG_OP_printf("call method var (fun=%p, self=%p, n_args=%u, n_kw=%u, args=%p, seq=%p, dict=%p)\n", fun, self, n_args, n_kw, args, pos_seq, kw_dict);
+    DEBUG_OP_printf("call method var (fun=%p, self=%p, n_args=%u, n_kw=%u, args=%p, seq=%p)\n", fun, self, n_args, n_kw, args, pos_seq);
 
     // We need to create the following array of objects:
     //     args[0 .. n_args]  unpacked(pos_seq)  args[n_args .. n_args + 2 * n_kw]  unpacked(kw_dict)
@@ -717,8 +716,13 @@ void mp_call_prepare_args_n_kw_var(bool have_self, size_t n_args_n_kw, const mp_
 
     // Try to get a hint for the size of the kw_dict
     uint kw_dict_len = 0;
-    if (kw_dict != MP_OBJ_NULL && mp_obj_is_type(kw_dict, &mp_type_dict)) {
-        kw_dict_len = mp_obj_dict_len(kw_dict);
+
+    for (uint i = 0; i < n_kw; i++) {
+        mp_obj_t key = args[n_args + i * 2];
+        mp_obj_t value = args[n_args + i * 2 + 1];
+        if (key == MP_OBJ_NULL && value != MP_OBJ_NULL && mp_obj_is_type(value, &mp_type_dict)) {
+            kw_dict_len += mp_obj_dict_len(value);
+        }
     }
 
     // Extract the pos_seq sequence to the new args array.
@@ -792,64 +796,72 @@ void mp_call_prepare_args_n_kw_var(bool have_self, size_t n_args_n_kw, const mp_
     // The size of the args2 array now is the number of positional args.
     uint pos_args_len = args2_len;
 
-    // Copy the fixed kw args.
-    mp_seq_copy(args2 + args2_len, args + n_args, 2 * n_kw, mp_obj_t);
-    args2_len += 2 * n_kw;
-
-    // Extract (key,value) pairs from kw_dict dictionary and append to args2.
-    // Note that it can be arbitrary iterator.
-    if (kw_dict == MP_OBJ_NULL) {
-        // pass
-    } else if (mp_obj_is_type(kw_dict, &mp_type_dict)) {
-        // dictionary
-        mp_map_t *map = mp_obj_dict_get_map(kw_dict);
-        assert(args2_len + 2 * map->used <= args2_alloc); // should have enough, since kw_dict_len is in this case hinted correctly above
-        for (size_t i = 0; i < map->alloc; i++) {
-            if (mp_map_slot_is_filled(map, i)) {
-                // the key must be a qstr, so intern it if it's a string
-                mp_obj_t key = map->table[i].key;
-                if (!mp_obj_is_qstr(key)) {
-                    key = mp_obj_str_intern_checked(key);
-                }
-                args2[args2_len++] = key;
-                args2[args2_len++] = map->table[i].value;
-            }
-        }
-    } else {
-        // generic mapping:
-        // - call keys() to get an iterable of all keys in the mapping
-        // - call __getitem__ for each key to get the corresponding value
-
-        // get the keys iterable
-        mp_obj_t dest[3];
-        mp_load_method(kw_dict, MP_QSTR_keys, dest);
-        mp_obj_t iterable = mp_getiter(mp_call_method_n_kw(0, 0, dest), NULL);
-
-        mp_obj_t key;
-        while ((key = mp_iternext(iterable)) != MP_OBJ_STOP_ITERATION) {
-            // expand size of args array if needed
-            if (args2_len + 1 >= args2_alloc) {
-                uint new_alloc = args2_alloc * 2;
-                if (new_alloc < 4) {
-                    new_alloc = 4;
+    // Copy the kw args.
+    for (uint i = 0; i < n_kw; i++) {
+        mp_obj_t kw_key = args[n_args + i * 2];
+        mp_obj_t kw_value = args[n_args + i * 2 + 1];
+        if (kw_key == MP_OBJ_NULL) {
+            // double-star args
+            if (kw_value == MP_OBJ_NULL) {
+                // pass
+            } else if (mp_obj_is_type(kw_value, &mp_type_dict)) {
+                // dictionary
+                mp_map_t *map = mp_obj_dict_get_map(kw_value);
+                // should have enough, since kw_dict_len is in this case hinted correctly above
+                assert(args2_len + 2 * map->used <= args2_alloc);
+                for (size_t j = 0; j < map->alloc; j++) {
+                    if (mp_map_slot_is_filled(map, j)) {
+                        // the key must be a qstr, so intern it if it's a string
+                        mp_obj_t key = map->table[j].key;
+                        if (!mp_obj_is_qstr(key)) {
+                            key = mp_obj_str_intern_checked(key);
+                        }
+                        args2[args2_len++] = key;
+                        args2[args2_len++] = map->table[j].value;
+                    }
                 }
-                args2 = mp_nonlocal_realloc(args2, args2_alloc * sizeof(mp_obj_t), new_alloc * sizeof(mp_obj_t));
-                args2_alloc = new_alloc;
-            }
+            } else {
+                // generic mapping:
+                // - call keys() to get an iterable of all keys in the mapping
+                // - call __getitem__ for each key to get the corresponding value
+
+                // get the keys iterable
+                mp_obj_t dest[3];
+                mp_load_method(kw_value, MP_QSTR_keys, dest);
+                mp_obj_t iterable = mp_getiter(mp_call_method_n_kw(0, 0, dest), NULL);
+
+                mp_obj_t key;
+                while ((key = mp_iternext(iterable)) != MP_OBJ_STOP_ITERATION) {
+                    // expand size of args array if needed
+                    if (args2_len + 1 >= args2_alloc) {
+                        uint new_alloc = args2_alloc * 2;
+                        if (new_alloc < 4) {
+                            new_alloc = 4;
+                        }
+                        args2 = mp_nonlocal_realloc(args2, args2_alloc * sizeof(mp_obj_t), new_alloc * sizeof(mp_obj_t));
+                        args2_alloc = new_alloc;
+                    }
 
-            // the key must be a qstr, so intern it if it's a string
-            if (!mp_obj_is_qstr(key)) {
-                key = mp_obj_str_intern_checked(key);
-            }
+                    // the key must be a qstr, so intern it if it's a string
+                    if (!mp_obj_is_qstr(key)) {
+                        key = mp_obj_str_intern_checked(key);
+                    }
 
-            // get the value corresponding to the key
-            mp_load_method(kw_dict, MP_QSTR___getitem__, dest);
-            dest[2] = key;
-            mp_obj_t value = mp_call_method_n_kw(1, 0, dest);
+                    // get the value corresponding to the key
+                    mp_load_method(kw_value, MP_QSTR___getitem__, dest);
+                    dest[2] = key;
+                    mp_obj_t value = mp_call_method_n_kw(1, 0, dest);
 
-            // store the key/value pair in the argument array
-            args2[args2_len++] = key;
-            args2[args2_len++] = value;
+                    // store the key/value pair in the argument array
+                    args2[args2_len++] = key;
+                    args2[args2_len++] = value;
+                }
+            }
+        } else {
+            // normal kwarg
+            assert(args2_len + 2 <= args2_alloc);
+            args2[args2_len++] = kw_key;
+            args2[args2_len++] = kw_value;
         }
     }
 
diff --git a/py/vm.c b/py/vm.c
index fa163423ad40b..145000483844a 100644
--- a/py/vm.c
+++ b/py/vm.c
@@ -949,8 +949,8 @@ unwind_jump:;
                     // unum & 0xff == n_positional
                     // (unum >> 8) & 0xff == n_keyword
                     // We have following stack layout here:
-                    // fun arg0 arg1 ... kw0 val0 kw1 val1 ... seq dict <- TOS
-                    sp -= (unum & 0xff) + ((unum >> 7) & 0x1fe) + 2;
+                    // fun arg0 arg1 ... kw0 val0 kw1 val1 ... seq <- TOS
+                    sp -= (unum & 0xff) + ((unum >> 7) & 0x1fe) + 1;
                     #if MICROPY_STACKLESS
                     if (mp_obj_get_type(*sp) == &mp_type_fun_bc) {
                         code_state->ip = ip;
@@ -1034,8 +1034,8 @@ unwind_jump:;
                     // unum & 0xff == n_positional
                     // (unum >> 8) & 0xff == n_keyword
                     // We have following stack layout here:
-                    // fun self arg0 arg1 ... kw0 val0 kw1 val1 ... seq dict <- TOS
-                    sp -= (unum & 0xff) + ((unum >> 7) & 0x1fe) + 3;
+                    // fun self arg0 arg1 ... kw0 val0 kw1 val1 ... seq <- TOS
+                    sp -= (unum & 0xff) + ((unum >> 7) & 0x1fe) + 2;
                     #if MICROPY_STACKLESS
                     if (mp_obj_get_type(*sp) == &mp_type_fun_bc) {
                         code_state->ip = ip;
diff --git a/tests/basics/fun_calldblstar4.py b/tests/basics/fun_calldblstar4.py
new file mode 100644
index 0000000000000..acb332a8c23bb
--- /dev/null
+++ b/tests/basics/fun_calldblstar4.py
@@ -0,0 +1,33 @@
+# test calling a function with multiple **args
+
+
+def f(a, b=None, c=None):
+    print(a, b, c)
+
+
+f(**{"a": 1}, **{"b": 2})
+f(**{"a": 1}, **{"b": 2}, c=3)
+f(**{"a": 1}, b=2, **{"c": 3})
+
+try:
+    f(1, **{"b": 2}, **{"b": 3})
+except TypeError:
+    print("TypeError")
+
+# test calling a method with multiple **args
+
+
+class A:
+    def f(self, a, b=None, c=None):
+        print(a, b, c)
+
+
+a = A()
+a.f(**{"a": 1}, **{"b": 2})
+a.f(**{"a": 1}, **{"b": 2}, c=3)
+a.f(**{"a": 1}, b=2, **{"c": 3})
+
+try:
+    a.f(1, **{"b": 2}, **{"b": 3})
+except TypeError:
+    print("TypeError")
diff --git a/tests/basics/python34.py b/tests/basics/python34.py
index 0f6e4bafd0b9e..609a8b6b84e9e 100644
--- a/tests/basics/python34.py
+++ b/tests/basics/python34.py
@@ -25,7 +25,6 @@ def test_syntax(code):
     except SyntaxError:
         print("SyntaxError")
 test_syntax("f(*a, *b)") # can't have multiple * (in 3.5 we can)
-test_syntax("f(**a, **b)") # can't have multiple ** (in 3.5 we can)
 test_syntax("f(*a, b)") # can't have positional after *
 test_syntax("f(**a, b)") # can't have positional after **
 test_syntax("() = []") # can't assign to empty tuple (in 3.6 we can)
diff --git a/tests/basics/python34.py.exp b/tests/basics/python34.py.exp
index 8480171307d14..75f1c2c056626 100644
--- a/tests/basics/python34.py.exp
+++ b/tests/basics/python34.py.exp
@@ -8,7 +8,6 @@ SyntaxError
 SyntaxError
 SyntaxError
 SyntaxError
-SyntaxError
 3.4
 3 4
 IndexError('foo',)
diff --git a/tests/cmdline/cmd_showbc.py.exp b/tests/cmdline/cmd_showbc.py.exp
index 92501e1248015..663bacda0159d 100644
--- a/tests/cmdline/cmd_showbc.py.exp
+++ b/tests/cmdline/cmd_showbc.py.exp
@@ -297,8 +297,8 @@ arg names:
 208 POP_TOP
 209 LOAD_FAST 0
 210 LOAD_DEREF 14
-212 LOAD_NULL
-213 CALL_FUNCTION_VAR_KW n=0 nkw=0
+212 LOAD_CONST_SMALL_INT 1
+213 CALL_FUNCTION_VAR_KW n=1 nkw=0
 215 POP_TOP
 216 LOAD_FAST 0
 217 LOAD_METHOD b
@@ -318,8 +318,8 @@ arg names:
 239 LOAD_FAST 0
 240 LOAD_METHOD b
 242 LOAD_FAST 1
-243 LOAD_NULL
-244 CALL_METHOD_VAR_KW n=0 nkw=0
+243 LOAD_CONST_SMALL_INT 1
+244 CALL_METHOD_VAR_KW n=1 nkw=0
 246 POP_TOP
 247 LOAD_FAST 0
 248 POP_JUMP_IF_FALSE 255

From 783b1a868fb0f3c1fd6cf7231311c24801c33505 Mon Sep 17 00:00:00 2001
From: David Lechner <david@lechnology.com>
Date: Tue, 24 Mar 2020 23:54:45 -0500
Subject: [PATCH 1860/3533] py/runtime: Allow multiple *args in a function
 call.

This is a partial implementation of PEP 448 to allow unpacking multiple
star args in a function or method call.

This is implemented by changing the emitted bytecodes so that both
positional args and star args are stored as positional args.  A bitmap is
added to indicate if an argument at a given position is a positional
argument or a star arg.

In the generated code, this new bitmap takes the place of the old star arg.
It is stored as a small int, so this means only the first N arguments can
be star args where N is the number of bits in a small int.

The runtime is modified to interpret this new bytecode format while still
trying to perform as few memory reallocations as possible.

Signed-off-by: David Lechner <david@pybricks.com>
---
 docs/differences/python_35.rst        |   2 +-
 py/compile.c                          |  37 +++++----
 py/runtime.c                          | 105 ++++++++++++++++----------
 py/vm.c                               |   4 +-
 tests/basics/fun_callstar.py          |  12 +++
 tests/basics/fun_callstardblstar.py   |  10 +++
 tests/basics/fun_kwvarargs.py         |  13 ++++
 tests/basics/python34.py              |  11 +--
 tests/basics/python34.py.exp          |   5 --
 tests/cpydiff/syntax_arg_unpacking.py |  23 ++++++
 10 files changed, 152 insertions(+), 70 deletions(-)
 create mode 100644 tests/cpydiff/syntax_arg_unpacking.py

diff --git a/docs/differences/python_35.rst b/docs/differences/python_35.rst
index e88df25f95e07..06cfbfc03cfa1 100644
--- a/docs/differences/python_35.rst
+++ b/docs/differences/python_35.rst
@@ -8,7 +8,7 @@ Below is a list of finalised/accepted PEPs for Python 3.5 grouped into their imp
    +----------------------------------------------------------------------------------------------------------+---------------+
    | **Extensions to the syntax:**                                                                            | **Status**    |
    +--------------------------------------------------------+-------------------------------------------------+---------------+
-   | `PEP 448 <https://www.python.org/dev/peps/pep-0448/>`_ | additional unpacking generalizations            |               |
+   | `PEP 448 <https://www.python.org/dev/peps/pep-0448/>`_ | additional unpacking generalizations            | Partial       |
    +--------------------------------------------------------+-------------------------------------------------+---------------+
    | `PEP 465 <https://www.python.org/dev/peps/pep-0465/>`_ | a new matrix multiplication operator            | Completed     |
    +--------------------------------------------------------+-------------------------------------------------+---------------+
diff --git a/py/compile.c b/py/compile.c
index 1636bd157d195..fc11062705a90 100644
--- a/py/compile.c
+++ b/py/compile.c
@@ -37,6 +37,7 @@
 #include "py/asmbase.h"
 #include "py/nativeglue.h"
 #include "py/persistentcode.h"
+#include "py/smallint.h"
 
 #if MICROPY_ENABLE_COMPILER
 
@@ -2397,17 +2398,30 @@ STATIC void compile_trailer_paren_helper(compiler_t *comp, mp_parse_node_t pn_ar
     int n_positional = n_positional_extra;
     uint n_keyword = 0;
     uint star_flags = 0;
-    mp_parse_node_struct_t *star_args_node = NULL;
+    mp_uint_t star_args = 0;
     for (size_t i = 0; i < n_args; i++) {
         if (MP_PARSE_NODE_IS_STRUCT(args[i])) {
             mp_parse_node_struct_t *pns_arg = (mp_parse_node_struct_t *)args[i];
             if (MP_PARSE_NODE_STRUCT_KIND(pns_arg) == PN_arglist_star) {
-                if (star_flags & MP_EMIT_STAR_FLAG_SINGLE) {
-                    compile_syntax_error(comp, (mp_parse_node_t)pns_arg, MP_ERROR_TEXT("can't have multiple *x"));
+                if (star_flags & MP_EMIT_STAR_FLAG_DOUBLE) {
+                    compile_syntax_error(comp, (mp_parse_node_t)pns_arg, MP_ERROR_TEXT("* arg after **"));
+                    return;
+                }
+                #if MICROPY_DYNAMIC_COMPILER
+                if (i > mp_dynamic_compiler.small_int_bits)
+                #else
+                if (i > MP_SMALL_INT_BITS)
+                #endif
+                {
+                    // If there are not enough bits in a small int to fit the flag, then we consider
+                    // it a syntax error. It should be unlikely to have this many args in practice.
+                    compile_syntax_error(comp, (mp_parse_node_t)pns_arg, MP_ERROR_TEXT("too many args"));
                     return;
                 }
                 star_flags |= MP_EMIT_STAR_FLAG_SINGLE;
-                star_args_node = pns_arg;
+                star_args |= 1 << i;
+                compile_node(comp, pns_arg->nodes[0]);
+                n_positional++;
             } else if (MP_PARSE_NODE_STRUCT_KIND(pns_arg) == PN_arglist_dbl_star) {
                 star_flags |= MP_EMIT_STAR_FLAG_DOUBLE;
                 // double-star args are stored as kw arg with key of None
@@ -2438,12 +2452,12 @@ STATIC void compile_trailer_paren_helper(compiler_t *comp, mp_parse_node_t pn_ar
             }
         } else {
         normal_argument:
-            if (star_flags) {
-                compile_syntax_error(comp, args[i], MP_ERROR_TEXT("non-keyword arg after */**"));
+            if (star_flags & MP_EMIT_STAR_FLAG_DOUBLE) {
+                compile_syntax_error(comp, args[i], MP_ERROR_TEXT("positional arg after **"));
                 return;
             }
             if (n_keyword > 0) {
-                compile_syntax_error(comp, args[i], MP_ERROR_TEXT("non-keyword arg after keyword arg"));
+                compile_syntax_error(comp, args[i], MP_ERROR_TEXT("positional arg after keyword arg"));
                 return;
             }
             compile_node(comp, args[i]);
@@ -2451,14 +2465,9 @@ STATIC void compile_trailer_paren_helper(compiler_t *comp, mp_parse_node_t pn_ar
         }
     }
 
-    // compile the star/double-star arguments if we had them
-    // if we had one but not the other then we load "null" as a place holder
     if (star_flags != 0) {
-        if (star_args_node == NULL) {
-            EMIT(load_null);
-        } else {
-            compile_node(comp, star_args_node->nodes[0]);
-        }
+        // one extra object that contains the star_args map
+        EMIT_ARG(load_const_small_int, star_args);
     }
 
     // emit the function/method call
diff --git a/py/runtime.c b/py/runtime.c
index e6bfbda58d4df..90722ee18a55b 100644
--- a/py/runtime.c
+++ b/py/runtime.c
@@ -701,9 +701,9 @@ void mp_call_prepare_args_n_kw_var(bool have_self, size_t n_args_n_kw, const mp_
     }
     uint n_args = n_args_n_kw & 0xff;
     uint n_kw = (n_args_n_kw >> 8) & 0xff;
-    mp_obj_t pos_seq = args[n_args + 2 * n_kw]; // may be MP_OBJ_NULL
+    mp_uint_t star_args = mp_obj_get_int_truncated(args[n_args + 2 * n_kw]);
 
-    DEBUG_OP_printf("call method var (fun=%p, self=%p, n_args=%u, n_kw=%u, args=%p, seq=%p)\n", fun, self, n_args, n_kw, args, pos_seq);
+    DEBUG_OP_printf("call method var (fun=%p, self=%p, n_args=%u, n_kw=%u, args=%p, map=%u)\n", fun, self, n_args, n_kw, args, star_args);
 
     // We need to create the following array of objects:
     //     args[0 .. n_args]  unpacked(pos_seq)  args[n_args .. n_args + 2 * n_kw]  unpacked(kw_dict)
@@ -714,6 +714,20 @@ void mp_call_prepare_args_n_kw_var(bool have_self, size_t n_args_n_kw, const mp_
     uint args2_alloc;
     uint args2_len = 0;
 
+    // Try to get a hint for unpacked * args length
+    uint list_len = 0;
+
+    if (star_args != 0) {
+        for (uint i = 0; i < n_args; i++) {
+            if (star_args & (1 << i)) {
+                mp_obj_t len = mp_obj_len_maybe(args[i]);
+                if (len != MP_OBJ_NULL) {
+                    list_len += mp_obj_get_int(len);
+                }
+            }
+        }
+    }
+
     // Try to get a hint for the size of the kw_dict
     uint kw_dict_len = 0;
 
@@ -727,8 +741,8 @@ void mp_call_prepare_args_n_kw_var(bool have_self, size_t n_args_n_kw, const mp_
 
     // Extract the pos_seq sequence to the new args array.
     // Note that it can be arbitrary iterator.
-    if (pos_seq == MP_OBJ_NULL) {
-        // no sequence
+    if (star_args == 0) {
+        // no star args to unpack
 
         // allocate memory for the new array of args
         args2_alloc = 1 + n_args + 2 * (n_kw + kw_dict_len);
@@ -742,33 +756,11 @@ void mp_call_prepare_args_n_kw_var(bool have_self, size_t n_args_n_kw, const mp_
         // copy the fixed pos args
         mp_seq_copy(args2 + args2_len, args, n_args, mp_obj_t);
         args2_len += n_args;
-
-    } else if (mp_obj_is_type(pos_seq, &mp_type_tuple) || mp_obj_is_type(pos_seq, &mp_type_list)) {
-        // optimise the case of a tuple and list
-
-        // get the items
-        size_t len;
-        mp_obj_t *items;
-        mp_obj_get_array(pos_seq, &len, &items);
-
-        // allocate memory for the new array of args
-        args2_alloc = 1 + n_args + len + 2 * (n_kw + kw_dict_len);
-        args2 = mp_nonlocal_alloc(args2_alloc * sizeof(mp_obj_t));
-
-        // copy the self
-        if (self != MP_OBJ_NULL) {
-            args2[args2_len++] = self;
-        }
-
-        // copy the fixed and variable position args
-        mp_seq_cat(args2 + args2_len, args, n_args, items, len, mp_obj_t);
-        args2_len += n_args + len;
-
     } else {
-        // generic iterator
+        // at least one star arg to unpack
 
         // allocate memory for the new array of args
-        args2_alloc = 1 + n_args + 2 * (n_kw + kw_dict_len) + 3;
+        args2_alloc = 1 + n_args + list_len + 2 * (n_kw + kw_dict_len);
         args2 = mp_nonlocal_alloc(args2_alloc * sizeof(mp_obj_t));
 
         // copy the self
@@ -776,26 +768,57 @@ void mp_call_prepare_args_n_kw_var(bool have_self, size_t n_args_n_kw, const mp_
             args2[args2_len++] = self;
         }
 
-        // copy the fixed position args
-        mp_seq_copy(args2 + args2_len, args, n_args, mp_obj_t);
-        args2_len += n_args;
-
-        // extract the variable position args from the iterator
-        mp_obj_iter_buf_t iter_buf;
-        mp_obj_t iterable = mp_getiter(pos_seq, &iter_buf);
-        mp_obj_t item;
-        while ((item = mp_iternext(iterable)) != MP_OBJ_STOP_ITERATION) {
-            if (args2_len >= args2_alloc) {
-                args2 = mp_nonlocal_realloc(args2, args2_alloc * sizeof(mp_obj_t), args2_alloc * 2 * sizeof(mp_obj_t));
-                args2_alloc *= 2;
+        for (uint i = 0; i < n_args; i++) {
+            mp_obj_t arg = args[i];
+            if (star_args & (1 << i)) {
+                // star arg
+                if (mp_obj_is_type(arg, &mp_type_tuple) || mp_obj_is_type(arg, &mp_type_list)) {
+                    // optimise the case of a tuple and list
+
+                    // get the items
+                    size_t len;
+                    mp_obj_t *items;
+                    mp_obj_get_array(arg, &len, &items);
+
+                    // copy the items
+                    assert(args2_len + len <= args2_alloc);
+                    mp_seq_copy(args2 + args2_len, items, len, mp_obj_t);
+                    args2_len += len;
+                } else {
+                    // generic iterator
+
+                    // extract the variable position args from the iterator
+                    mp_obj_iter_buf_t iter_buf;
+                    mp_obj_t iterable = mp_getiter(arg, &iter_buf);
+                    mp_obj_t item;
+                    while ((item = mp_iternext(iterable)) != MP_OBJ_STOP_ITERATION) {
+                        if (args2_len >= args2_alloc) {
+                            args2 = mp_nonlocal_realloc(args2, args2_alloc * sizeof(mp_obj_t),
+                                args2_alloc * 2 * sizeof(mp_obj_t));
+                            args2_alloc *= 2;
+                        }
+                        args2[args2_len++] = item;
+                    }
+                }
+            } else {
+                // normal argument
+                assert(args2_len < args2_alloc);
+                args2[args2_len++] = arg;
             }
-            args2[args2_len++] = item;
         }
     }
 
     // The size of the args2 array now is the number of positional args.
     uint pos_args_len = args2_len;
 
+    // ensure there is still enough room for kw args
+    if (args2_len + 2 * (n_kw + kw_dict_len) > args2_alloc) {
+        uint new_alloc = args2_len + 2 * (n_kw + kw_dict_len);
+        args2 = mp_nonlocal_realloc(args2, args2_alloc * sizeof(mp_obj_t),
+            new_alloc * sizeof(mp_obj_t));
+        args2_alloc = new_alloc;
+    }
+
     // Copy the kw args.
     for (uint i = 0; i < n_kw; i++) {
         mp_obj_t kw_key = args[n_args + i * 2];
diff --git a/py/vm.c b/py/vm.c
index 145000483844a..02f8bc88c953e 100644
--- a/py/vm.c
+++ b/py/vm.c
@@ -949,7 +949,7 @@ unwind_jump:;
                     // unum & 0xff == n_positional
                     // (unum >> 8) & 0xff == n_keyword
                     // We have following stack layout here:
-                    // fun arg0 arg1 ... kw0 val0 kw1 val1 ... seq <- TOS
+                    // fun arg0 arg1 ... kw0 val0 kw1 val1 ... bitmap <- TOS
                     sp -= (unum & 0xff) + ((unum >> 7) & 0x1fe) + 1;
                     #if MICROPY_STACKLESS
                     if (mp_obj_get_type(*sp) == &mp_type_fun_bc) {
@@ -1034,7 +1034,7 @@ unwind_jump:;
                     // unum & 0xff == n_positional
                     // (unum >> 8) & 0xff == n_keyword
                     // We have following stack layout here:
-                    // fun self arg0 arg1 ... kw0 val0 kw1 val1 ... seq <- TOS
+                    // fun self arg0 arg1 ... kw0 val0 kw1 val1 ... bitmap <- TOS
                     sp -= (unum & 0xff) + ((unum >> 7) & 0x1fe) + 2;
                     #if MICROPY_STACKLESS
                     if (mp_obj_get_type(*sp) == &mp_type_fun_bc) {
diff --git a/tests/basics/fun_callstar.py b/tests/basics/fun_callstar.py
index a27a288a3c2be..53d2ece3e138e 100644
--- a/tests/basics/fun_callstar.py
+++ b/tests/basics/fun_callstar.py
@@ -3,10 +3,16 @@
 def foo(a, b, c):
     print(a, b, c)
 
+foo(*(), 1, 2, 3)
+foo(*(1,), 2, 3)
+foo(*(1, 2), 3)
 foo(*(1, 2, 3))
 foo(1, *(2, 3))
 foo(1, 2, *(3,))
 foo(1, 2, 3, *())
+foo(*(1,), 2, *(3,))
+foo(*(1, 2), *(3,))
+foo(*(1,), *(2, 3))
 
 # Another sequence type
 foo(1, 2, *[100])
@@ -29,10 +35,16 @@ def foo(self, a, b, c):
         print(a, b, c)
 
 a = A()
+a.foo(*(), 1, 2, 3)
+a.foo(*(1,), 2, 3)
+a.foo(*(1, 2), 3)
 a.foo(*(1, 2, 3))
 a.foo(1, *(2, 3))
 a.foo(1, 2, *(3,))
 a.foo(1, 2, 3, *())
+a.foo(*(1,), 2, *(3,))
+a.foo(*(1, 2), *(3,))
+a.foo(*(1,), *(2, 3))
 
 # Another sequence type
 a.foo(1, 2, *[100])
diff --git a/tests/basics/fun_callstardblstar.py b/tests/basics/fun_callstardblstar.py
index f2fd29107e270..aceb04a843322 100644
--- a/tests/basics/fun_callstardblstar.py
+++ b/tests/basics/fun_callstardblstar.py
@@ -6,6 +6,11 @@ def f(a, b, c, d):
 f(*(1, 2), **{'c':3, 'd':4})
 f(*(1, 2), **{['c', 'd'][i]:(3 + i) for i in range(2)})
 
+try:
+    eval("f(**{'a': 1}, *(2, 3, 4))")
+except SyntaxError:
+    print("SyntaxError")
+
 # test calling a method with *tuple and **dict
 
 class A:
@@ -15,3 +20,8 @@ def f(self, a, b, c, d):
 a = A()
 a.f(*(1, 2), **{'c':3, 'd':4})
 a.f(*(1, 2), **{['c', 'd'][i]:(3 + i) for i in range(2)})
+
+try:
+    eval("a.f(**{'a': 1}, *(2, 3, 4))")
+except SyntaxError:
+    print("SyntaxError")
diff --git a/tests/basics/fun_kwvarargs.py b/tests/basics/fun_kwvarargs.py
index bdc10fcf14d8c..e9fd0720e94ff 100644
--- a/tests/basics/fun_kwvarargs.py
+++ b/tests/basics/fun_kwvarargs.py
@@ -23,3 +23,16 @@ def f4(*vargs, **kwargs):
 f4(*(1, 2))
 f4(kw_arg=3)
 f4(*(1, 2), kw_arg=3)
+
+
+# test evaluation order of arguments
+def f5(*vargs, **kwargs):
+    print(vargs, kwargs)
+
+
+def print_ret(x):
+    print(x)
+    return x
+
+
+f5(*print_ret(["a", "b"]), kw_arg=print_ret(None))
diff --git a/tests/basics/python34.py b/tests/basics/python34.py
index 609a8b6b84e9e..36e25e20dd5f9 100644
--- a/tests/basics/python34.py
+++ b/tests/basics/python34.py
@@ -6,26 +6,23 @@
     print("SKIP")
     raise SystemExit
 
-# from basics/fun_kwvarargs.py
-# test evaluation order of arguments (in 3.4 it's backwards, 3.5 it's fixed)
-def f4(*vargs, **kwargs):
-    print(vargs, kwargs)
+
 def print_ret(x):
     print(x)
     return x
-f4(*print_ret(['a', 'b']), kw_arg=print_ret(None))
 
 # test evaluation order of dictionary key/value pair (in 3.4 it's backwards)
 {print_ret(1):print_ret(2)}
 
+
 # from basics/syntaxerror.py
 def test_syntax(code):
     try:
         exec(code)
     except SyntaxError:
         print("SyntaxError")
-test_syntax("f(*a, *b)") # can't have multiple * (in 3.5 we can)
-test_syntax("f(*a, b)") # can't have positional after *
+
+
 test_syntax("f(**a, b)") # can't have positional after **
 test_syntax("() = []") # can't assign to empty tuple (in 3.6 we can)
 test_syntax("del ()") # can't delete empty tuple (in 3.6 we can)
diff --git a/tests/basics/python34.py.exp b/tests/basics/python34.py.exp
index 75f1c2c056626..a56c1a50b6996 100644
--- a/tests/basics/python34.py.exp
+++ b/tests/basics/python34.py.exp
@@ -1,13 +1,8 @@
-None
-['a', 'b']
-('a', 'b') {'kw_arg': None}
 2
 1
 SyntaxError
 SyntaxError
 SyntaxError
-SyntaxError
-SyntaxError
 3.4
 3 4
 IndexError('foo',)
diff --git a/tests/cpydiff/syntax_arg_unpacking.py b/tests/cpydiff/syntax_arg_unpacking.py
new file mode 100644
index 0000000000000..e54832ddb9165
--- /dev/null
+++ b/tests/cpydiff/syntax_arg_unpacking.py
@@ -0,0 +1,23 @@
+"""
+categories: Syntax
+description: Argument unpacking does not work if the argument being unpacked is the nth or greater argument where n is the number of bits in an MP_SMALL_INT.
+cause: The implementation uses an MP_SMALL_INT to flag args that need to be unpacked.
+workaround: Use fewer arguments.
+"""
+
+
+def example(*args):
+    print(len(args))
+
+
+MORE = ["a", "b", "c"]
+
+# fmt: off
+example(
+    0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+    16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+    32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+    48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
+    *MORE,
+)
+# fmt: on

From 3679a47eb064850406f473bc435c36d95017c16e Mon Sep 17 00:00:00 2001
From: David Lechner <david@pybricks.com>
Date: Tue, 29 Mar 2022 12:11:42 -0500
Subject: [PATCH 1861/3533] py/runtime: Do not overallocate when len is known.

This fixes overallocating an extra mp_obj_t when the length of *args and
**args is known. Previously we were allocating 1 mp_obj_t for each
n_args and n_kw plus the length of each *arg and **arg (if they are
known). Since n_args includes *args and n_kw includes **args, this was
allocating an extra mp_obj_t in addition to the length of these args
when unpacked.

To fix this, we just subtract 1 from the length to account for the 1
already implicitly allocated by n_args and n_kw.

Signed-off-by: David Lechner <david@pybricks.com>
---
 py/runtime.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/py/runtime.c b/py/runtime.c
index 90722ee18a55b..95990197d090d 100644
--- a/py/runtime.c
+++ b/py/runtime.c
@@ -715,27 +715,29 @@ void mp_call_prepare_args_n_kw_var(bool have_self, size_t n_args_n_kw, const mp_
     uint args2_len = 0;
 
     // Try to get a hint for unpacked * args length
-    uint list_len = 0;
+    int list_len = 0;
 
     if (star_args != 0) {
         for (uint i = 0; i < n_args; i++) {
             if (star_args & (1 << i)) {
                 mp_obj_t len = mp_obj_len_maybe(args[i]);
                 if (len != MP_OBJ_NULL) {
-                    list_len += mp_obj_get_int(len);
+                    // -1 accounts for 1 of n_args occupied by this arg
+                    list_len += mp_obj_get_int(len) - 1;
                 }
             }
         }
     }
 
     // Try to get a hint for the size of the kw_dict
-    uint kw_dict_len = 0;
+    int kw_dict_len = 0;
 
     for (uint i = 0; i < n_kw; i++) {
         mp_obj_t key = args[n_args + i * 2];
         mp_obj_t value = args[n_args + i * 2 + 1];
         if (key == MP_OBJ_NULL && value != MP_OBJ_NULL && mp_obj_is_type(value, &mp_type_dict)) {
-            kw_dict_len += mp_obj_dict_len(value);
+            // -1 accounts for 1 of n_kw occupied by this arg
+            kw_dict_len += mp_obj_dict_len(value) - 1;
         }
     }
 

From 9b74d71aa74d368e0679616173edb4be49e03684 Mon Sep 17 00:00:00 2001
From: David Lechner <david@pybricks.com>
Date: Tue, 29 Mar 2022 12:44:58 -0500
Subject: [PATCH 1862/3533] py/runtime: Drop new_alloc < 4 check.

To reach this check, n_kw has to be >= 1 and therefore args2_alloc has
to be >= 2. Therefore new_alloc will always be >= 4. So this check will
never be true and can be removed.

Signed-off-by: David Lechner <david@pybricks.com>
---
 py/runtime.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/py/runtime.c b/py/runtime.c
index 95990197d090d..7355817b6948b 100644
--- a/py/runtime.c
+++ b/py/runtime.c
@@ -860,9 +860,6 @@ void mp_call_prepare_args_n_kw_var(bool have_self, size_t n_args_n_kw, const mp_
                     // expand size of args array if needed
                     if (args2_len + 1 >= args2_alloc) {
                         uint new_alloc = args2_alloc * 2;
-                        if (new_alloc < 4) {
-                            new_alloc = 4;
-                        }
                         args2 = mp_nonlocal_realloc(args2, args2_alloc * sizeof(mp_obj_t), new_alloc * sizeof(mp_obj_t));
                         args2_alloc = new_alloc;
                     }

From 47685180f02254a9d2dfd2eb9dafc24888daeb33 Mon Sep 17 00:00:00 2001
From: David Lechner <david@pybricks.com>
Date: Tue, 29 Mar 2022 13:15:15 -0500
Subject: [PATCH 1863/3533] tests/basics/fun_callstardblstar: Add coverage
 test.

This fixes code coverage for the case where a *arg without __len__ is
unpacked and uses exactly the amount of memory that was allocated for
kw args. This triggers the code branch where the memory for the kw args
gets reallocated since it was used already by the *arg unpacking.

Signed-off-by: David Lechner <david@pybricks.com>
---
 tests/basics/fun_callstardblstar.py | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/tests/basics/fun_callstardblstar.py b/tests/basics/fun_callstardblstar.py
index aceb04a843322..7db458b561b5f 100644
--- a/tests/basics/fun_callstardblstar.py
+++ b/tests/basics/fun_callstardblstar.py
@@ -25,3 +25,12 @@ def f(self, a, b, c, d):
     eval("a.f(**{'a': 1}, *(2, 3, 4))")
 except SyntaxError:
     print("SyntaxError")
+
+
+# coverage test for arg allocation corner case
+
+def f2(*args, **kwargs):
+    print(len(args), len(kwargs))
+
+
+f2(*iter(range(4)), **{'a': 1})

From 2e3f2045f9a7511987e69a8be0d3d117502e4bb1 Mon Sep 17 00:00:00 2001
From: David Lechner <david@pybricks.com>
Date: Wed, 30 Mar 2022 10:47:06 -0500
Subject: [PATCH 1864/3533] py/runtime: Use size_t/ssize_t instead of uint/int.

This replaces instances of uint with size_t and int with ssize_t in
the mp_call_prepare_args_n_kw_var() function since all of the variables
are used as array offsets.

Also sort headers while we are touching this.

Signed-off-by: David Lechner <david@pybricks.com>
---
 py/runtime.c | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/py/runtime.c b/py/runtime.c
index 7355817b6948b..594e63082be4e 100644
--- a/py/runtime.c
+++ b/py/runtime.c
@@ -25,10 +25,11 @@
  * THE SOFTWARE.
  */
 
+#include <assert.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <string.h>
-#include <assert.h>
+#include <unistd.h>
 
 #include "py/parsenum.h"
 #include "py/compile.h"
@@ -699,8 +700,8 @@ void mp_call_prepare_args_n_kw_var(bool have_self, size_t n_args_n_kw, const mp_
     if (have_self) {
         self = *args++; // may be MP_OBJ_NULL
     }
-    uint n_args = n_args_n_kw & 0xff;
-    uint n_kw = (n_args_n_kw >> 8) & 0xff;
+    size_t n_args = n_args_n_kw & 0xff;
+    size_t n_kw = (n_args_n_kw >> 8) & 0xff;
     mp_uint_t star_args = mp_obj_get_int_truncated(args[n_args + 2 * n_kw]);
 
     DEBUG_OP_printf("call method var (fun=%p, self=%p, n_args=%u, n_kw=%u, args=%p, map=%u)\n", fun, self, n_args, n_kw, args, star_args);
@@ -711,14 +712,14 @@ void mp_call_prepare_args_n_kw_var(bool have_self, size_t n_args_n_kw, const mp_
 
     // The new args array
     mp_obj_t *args2;
-    uint args2_alloc;
-    uint args2_len = 0;
+    size_t args2_alloc;
+    size_t args2_len = 0;
 
     // Try to get a hint for unpacked * args length
-    int list_len = 0;
+    ssize_t list_len = 0;
 
     if (star_args != 0) {
-        for (uint i = 0; i < n_args; i++) {
+        for (size_t i = 0; i < n_args; i++) {
             if (star_args & (1 << i)) {
                 mp_obj_t len = mp_obj_len_maybe(args[i]);
                 if (len != MP_OBJ_NULL) {
@@ -730,9 +731,9 @@ void mp_call_prepare_args_n_kw_var(bool have_self, size_t n_args_n_kw, const mp_
     }
 
     // Try to get a hint for the size of the kw_dict
-    int kw_dict_len = 0;
+    ssize_t kw_dict_len = 0;
 
-    for (uint i = 0; i < n_kw; i++) {
+    for (size_t i = 0; i < n_kw; i++) {
         mp_obj_t key = args[n_args + i * 2];
         mp_obj_t value = args[n_args + i * 2 + 1];
         if (key == MP_OBJ_NULL && value != MP_OBJ_NULL && mp_obj_is_type(value, &mp_type_dict)) {
@@ -770,7 +771,7 @@ void mp_call_prepare_args_n_kw_var(bool have_self, size_t n_args_n_kw, const mp_
             args2[args2_len++] = self;
         }
 
-        for (uint i = 0; i < n_args; i++) {
+        for (size_t i = 0; i < n_args; i++) {
             mp_obj_t arg = args[i];
             if (star_args & (1 << i)) {
                 // star arg
@@ -811,18 +812,18 @@ void mp_call_prepare_args_n_kw_var(bool have_self, size_t n_args_n_kw, const mp_
     }
 
     // The size of the args2 array now is the number of positional args.
-    uint pos_args_len = args2_len;
+    size_t pos_args_len = args2_len;
 
     // ensure there is still enough room for kw args
     if (args2_len + 2 * (n_kw + kw_dict_len) > args2_alloc) {
-        uint new_alloc = args2_len + 2 * (n_kw + kw_dict_len);
+        size_t new_alloc = args2_len + 2 * (n_kw + kw_dict_len);
         args2 = mp_nonlocal_realloc(args2, args2_alloc * sizeof(mp_obj_t),
             new_alloc * sizeof(mp_obj_t));
         args2_alloc = new_alloc;
     }
 
     // Copy the kw args.
-    for (uint i = 0; i < n_kw; i++) {
+    for (size_t i = 0; i < n_kw; i++) {
         mp_obj_t kw_key = args[n_args + i * 2];
         mp_obj_t kw_value = args[n_args + i * 2 + 1];
         if (kw_key == MP_OBJ_NULL) {
@@ -859,7 +860,7 @@ void mp_call_prepare_args_n_kw_var(bool have_self, size_t n_args_n_kw, const mp_
                 while ((key = mp_iternext(iterable)) != MP_OBJ_STOP_ITERATION) {
                     // expand size of args array if needed
                     if (args2_len + 1 >= args2_alloc) {
-                        uint new_alloc = args2_alloc * 2;
+                        size_t new_alloc = args2_alloc * 2;
                         args2 = mp_nonlocal_realloc(args2, args2_alloc * sizeof(mp_obj_t), new_alloc * sizeof(mp_obj_t));
                         args2_alloc = new_alloc;
                     }

From e3de723e2d955ca89c8b06bb2c4ae86724aad77b Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 31 Mar 2022 23:59:10 +1100
Subject: [PATCH 1865/3533] py/emitbc: Assert that a small int fits its
 encoding when emitting one.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/emitbc.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/py/emitbc.c b/py/emitbc.c
index 21ec121911e69..a9d5b3799e63e 100644
--- a/py/emitbc.c
+++ b/py/emitbc.c
@@ -32,6 +32,7 @@
 #include <assert.h>
 
 #include "py/mpstate.h"
+#include "py/smallint.h"
 #include "py/emit.h"
 #include "py/bc0.h"
 
@@ -471,6 +472,7 @@ void mp_emit_bc_load_const_tok(emit_t *emit, mp_token_kind_t tok) {
 }
 
 void mp_emit_bc_load_const_small_int(emit_t *emit, mp_int_t arg) {
+    assert(MP_SMALL_INT_FITS(arg));
     if (-MP_BC_LOAD_CONST_SMALL_INT_MULTI_EXCESS <= arg
         && arg < MP_BC_LOAD_CONST_SMALL_INT_MULTI_NUM - MP_BC_LOAD_CONST_SMALL_INT_MULTI_EXCESS) {
         emit_write_bytecode_byte(emit, 1,

From bd556b69960cafc97353e736f825eca5c00b0c29 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 1 Apr 2022 00:00:58 +1100
Subject: [PATCH 1866/3533] py: Fix compiling and decoding of *args at large
 arg positions.

There were two issues with the existing code:

1. "1 << i" is computed as a 32-bit number so would overflow when
   executed on 64-bit machines (when mp_uint_t is 64-bit).  This meant that
   *args beyond 32 positions would not be handled correctly.

2. star_args must fit as a positive small int so that it is encoded
   correctly in the emitted code.  MP_SMALL_INT_BITS is too big because it
   overflows a small int by 1 bit.  MP_SMALL_INT_BITS - 1 does not work
   because it produces a signed small int which is then sign extended when
   extracted (even by mp_obj_get_int_truncated), and this sign extension
   means that any position arg after *args is also treated as a star-arg.
   So the maximum bit position is MP_SMALL_INT_BITS - 2.  This means that
   MP_OBJ_SMALL_INT_VALUE() can be used instead of
   mp_obj_get_int_truncated() to get the value of star_args.

These issues are fixed by this commit, and a test added.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/compile.c                       |  6 ++---
 py/runtime.c                       |  6 ++---
 tests/stress/fun_call_limit.py     | 36 ++++++++++++++++++++++++++++++
 tests/stress/fun_call_limit.py.exp |  2 ++
 4 files changed, 44 insertions(+), 6 deletions(-)
 create mode 100644 tests/stress/fun_call_limit.py
 create mode 100644 tests/stress/fun_call_limit.py.exp

diff --git a/py/compile.c b/py/compile.c
index fc11062705a90..e4ead7f1ac2ac 100644
--- a/py/compile.c
+++ b/py/compile.c
@@ -2408,9 +2408,9 @@ STATIC void compile_trailer_paren_helper(compiler_t *comp, mp_parse_node_t pn_ar
                     return;
                 }
                 #if MICROPY_DYNAMIC_COMPILER
-                if (i > mp_dynamic_compiler.small_int_bits)
+                if (i >= (size_t)mp_dynamic_compiler.small_int_bits - 1)
                 #else
-                if (i > MP_SMALL_INT_BITS)
+                if (i >= MP_SMALL_INT_BITS - 1)
                 #endif
                 {
                     // If there are not enough bits in a small int to fit the flag, then we consider
@@ -2419,7 +2419,7 @@ STATIC void compile_trailer_paren_helper(compiler_t *comp, mp_parse_node_t pn_ar
                     return;
                 }
                 star_flags |= MP_EMIT_STAR_FLAG_SINGLE;
-                star_args |= 1 << i;
+                star_args |= (mp_uint_t)1 << i;
                 compile_node(comp, pns_arg->nodes[0]);
                 n_positional++;
             } else if (MP_PARSE_NODE_STRUCT_KIND(pns_arg) == PN_arglist_dbl_star) {
diff --git a/py/runtime.c b/py/runtime.c
index 594e63082be4e..ad066acb16085 100644
--- a/py/runtime.c
+++ b/py/runtime.c
@@ -702,7 +702,7 @@ void mp_call_prepare_args_n_kw_var(bool have_self, size_t n_args_n_kw, const mp_
     }
     size_t n_args = n_args_n_kw & 0xff;
     size_t n_kw = (n_args_n_kw >> 8) & 0xff;
-    mp_uint_t star_args = mp_obj_get_int_truncated(args[n_args + 2 * n_kw]);
+    mp_uint_t star_args = MP_OBJ_SMALL_INT_VALUE(args[n_args + 2 * n_kw]);
 
     DEBUG_OP_printf("call method var (fun=%p, self=%p, n_args=%u, n_kw=%u, args=%p, map=%u)\n", fun, self, n_args, n_kw, args, star_args);
 
@@ -720,7 +720,7 @@ void mp_call_prepare_args_n_kw_var(bool have_self, size_t n_args_n_kw, const mp_
 
     if (star_args != 0) {
         for (size_t i = 0; i < n_args; i++) {
-            if (star_args & (1 << i)) {
+            if ((star_args >> i) & 1) {
                 mp_obj_t len = mp_obj_len_maybe(args[i]);
                 if (len != MP_OBJ_NULL) {
                     // -1 accounts for 1 of n_args occupied by this arg
@@ -773,7 +773,7 @@ void mp_call_prepare_args_n_kw_var(bool have_self, size_t n_args_n_kw, const mp_
 
         for (size_t i = 0; i < n_args; i++) {
             mp_obj_t arg = args[i];
-            if (star_args & (1 << i)) {
+            if ((star_args >> i) & 1) {
                 // star arg
                 if (mp_obj_is_type(arg, &mp_type_tuple) || mp_obj_is_type(arg, &mp_type_list)) {
                     // optimise the case of a tuple and list
diff --git a/tests/stress/fun_call_limit.py b/tests/stress/fun_call_limit.py
new file mode 100644
index 0000000000000..b802aadd558c0
--- /dev/null
+++ b/tests/stress/fun_call_limit.py
@@ -0,0 +1,36 @@
+# Test the limit of the number of arguments to a function call.
+# This currently tests the case of *args after many positional args.
+
+
+def f(*args):
+    return len(args)
+
+
+def test(n):
+    pos_args = ",".join(str(i) for i in range(n))
+    s = "f({}, *(100, 101), 102, 103)".format(pos_args)
+    try:
+        return eval(s)
+    except SyntaxError:
+        return "SyntaxError"
+
+
+# If the port has at least 32-bits then this test should pass.
+print(test(29))
+
+# This test should fail on all ports (overflows a small int).
+print(test(70))
+
+# Check that there is a correct transition to the limit of too many args before *args.
+reached_limit = False
+for i in range(30, 70):
+    result = test(i)
+    if reached_limit:
+        if result != "SyntaxError":
+            print("FAIL")
+    else:
+        if result == "SyntaxError":
+            reached_limit = True
+        else:
+            if result != i + 4:
+                print("FAIL")
diff --git a/tests/stress/fun_call_limit.py.exp b/tests/stress/fun_call_limit.py.exp
new file mode 100644
index 0000000000000..53d2b28043015
--- /dev/null
+++ b/tests/stress/fun_call_limit.py.exp
@@ -0,0 +1,2 @@
+33
+SyntaxError

From 40f5c743db7f16a0b898fe1697c626e53aa6500d Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 1 Apr 2022 00:21:03 +1100
Subject: [PATCH 1867/3533] py/runtime: Remove unnecessary check for kw_value
 == MP_OBJ_NULL.

The values are always real objects, only the key can be MP_OBJ_NULL to
indicate a **kwargs entry.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/runtime.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/py/runtime.c b/py/runtime.c
index ad066acb16085..2a07df6642d79 100644
--- a/py/runtime.c
+++ b/py/runtime.c
@@ -828,9 +828,7 @@ void mp_call_prepare_args_n_kw_var(bool have_self, size_t n_args_n_kw, const mp_
         mp_obj_t kw_value = args[n_args + i * 2 + 1];
         if (kw_key == MP_OBJ_NULL) {
             // double-star args
-            if (kw_value == MP_OBJ_NULL) {
-                // pass
-            } else if (mp_obj_is_type(kw_value, &mp_type_dict)) {
+            if (mp_obj_is_type(kw_value, &mp_type_dict)) {
                 // dictionary
                 mp_map_t *map = mp_obj_dict_get_map(kw_value);
                 // should have enough, since kw_dict_len is in this case hinted correctly above

From 1dbf393962428bdab1362c77f59745f28d2cdd53 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 1 Apr 2022 00:21:58 +1100
Subject: [PATCH 1868/3533] tests/basics/fun_callstardblstar: Add test for
 large arg allocation.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/basics/fun_callstardblstar.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tests/basics/fun_callstardblstar.py b/tests/basics/fun_callstardblstar.py
index 7db458b561b5f..f395df3333ded 100644
--- a/tests/basics/fun_callstardblstar.py
+++ b/tests/basics/fun_callstardblstar.py
@@ -34,3 +34,6 @@ def f2(*args, **kwargs):
 
 
 f2(*iter(range(4)), **{'a': 1})
+
+# case where *args is not a tuple/list and takes up most of the memory allocated for **kwargs
+f2(*iter(range(100)), **{str(i): i for i in range(100)})

From 8baf05af8c8011d586ce767da70b4c6f47f55d6c Mon Sep 17 00:00:00 2001
From: Daniel Jour <musteresel@gmail.com>
Date: Tue, 29 Mar 2022 13:42:19 +0200
Subject: [PATCH 1869/3533] py/makeqstrdefs: Cleanup and extend source file
 classification.

- The classification of source files in makeqstrdefs.py has been moved into
  functions to consolidate the logic for that classification into a single
  place.
- Classification of source files (into C or C++ or "other" files) is based
  on the filename extension.
- For C++ there are many more common filename extensions than just ".cpp";
  see "Options Controlling the Kind of Output" in man gcc for example.  All
  common extensions for C++ source files which need preprocessing have been
  added.
---
 py/makeqstrdefs.py | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/py/makeqstrdefs.py b/py/makeqstrdefs.py
index 187a9aeeaa48a..1a63bd39a942a 100644
--- a/py/makeqstrdefs.py
+++ b/py/makeqstrdefs.py
@@ -22,6 +22,14 @@
 _MODE_COMPRESS = "compress"
 
 
+def is_c_source(fname):
+    return os.path.splitext(fname)[1] in [".c"]
+
+
+def is_cxx_source(fname):
+    return os.path.splitext(fname)[1] in [".cc", ".cp", ".cxx", ".cpp", ".CPP", ".c++", ".C"]
+
+
 def preprocess():
     if any(src in args.dependencies for src in args.changed_sources):
         sources = args.sources
@@ -32,9 +40,9 @@ def preprocess():
     csources = []
     cxxsources = []
     for source in sources:
-        if source.endswith(".cpp"):
+        if is_cxx_source(source):
             cxxsources.append(source)
-        elif source.endswith(".c"):
+        elif is_c_source(source):
             csources.append(source)
     try:
         os.makedirs(os.path.dirname(args.output[0]))
@@ -87,7 +95,7 @@ def process_file(f):
             m = re_line.match(line)
             assert m is not None
             fname = m.group(1)
-            if os.path.splitext(fname)[1] not in [".c", ".cpp"]:
+            if not is_c_source(fname) and not is_cxx_source(fname):
                 continue
             if fname != last_fname:
                 write_out(last_fname, output)

From ff287d085f95ab0ca3fdf67ee9d8cce6f046b01e Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Mon, 17 Jan 2022 00:12:01 +0200
Subject: [PATCH 1870/3533] stm32/pyb_can: Enable CAN FD frame support and BRS.

- Enable CAN FD frame support and BRS.
- Optimize the message RAM usage per FDCAN instance.
- Document the usage and different sections of the Message RAM.
---
 ports/stm32/fdcan.c   |  98 +++++++++++++++++++------------
 ports/stm32/pyb_can.c | 133 +++++++++++++++++++++++++++++-------------
 2 files changed, 151 insertions(+), 80 deletions(-)

diff --git a/ports/stm32/fdcan.c b/ports/stm32/fdcan.c
index 8465b806ae9cc..63c6c31238216 100644
--- a/ports/stm32/fdcan.c
+++ b/ports/stm32/fdcan.c
@@ -56,14 +56,19 @@
 #define FDCAN_IT_GROUP_RX_FIFO1         (FDCAN_ILS_RF1NL | FDCAN_ILS_RF1FL | FDCAN_ILS_RF1LL)
 #endif
 
+// The dedicated Message RAM should be 2560 words, but the way it's defined in stm32h7xx_hal_fdcan.c
+// as (SRAMCAN_BASE + FDCAN_MESSAGE_RAM_SIZE - 0x4U) limits the usable number of words to 2559 words.
+#define FDCAN_MESSAGE_RAM_SIZE  (2560 - 1)
+
 // also defined in <PROC>_hal_fdcan.c, but not able to declare extern and reach the variable
-static const uint8_t DLCtoBytes[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 12, 16, 20, 24, 32, 48, 64};
+const uint8_t DLCtoBytes[16] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 12, 16, 20, 24, 32, 48, 64};
 
 bool can_init(pyb_can_obj_t *can_obj, uint32_t mode, uint32_t prescaler, uint32_t sjw, uint32_t bs1, uint32_t bs2, bool auto_restart) {
     (void)auto_restart;
 
     FDCAN_InitTypeDef *init = &can_obj->can.Init;
-    init->FrameFormat = FDCAN_FRAME_CLASSIC;
+    // Configure FDCAN with FD frame and BRS support.
+    init->FrameFormat = FDCAN_FRAME_FD_BRS;
     init->Mode = mode;
 
     init->NominalPrescaler = prescaler; // tq = NominalPrescaler x (1/fdcan_ker_ck)
@@ -81,46 +86,58 @@ bool can_init(pyb_can_obj_t *can_obj, uint32_t mode, uint32_t prescaler, uint32_
     init->DataSyncJumpWidth = 1;
     init->DataTimeSeg1 = 1;
     init->DataTimeSeg2 = 1;
-    #endif
-
-    #if defined(STM32H7)
-    // variable used to specify RAM address in HAL, only for H7, G4 uses defined offset address in HAL
-    // The Message RAM is shared between CAN1 and CAN2. Setting the offset to half
-    // the Message RAM for the second CAN and using half the resources for each CAN.
+    init->StdFiltersNbr = 28; // /2  ? if FDCAN2 is used !!?
+    init->ExtFiltersNbr = 0; // Not used
+    init->TxFifoQueueMode = FDCAN_TX_FIFO_OPERATION;
+    #elif defined(STM32H7)
+    // The dedicated FDCAN RAM is 2560 32-bit words and shared between the FDCAN instances.
+    // To support 2 FDCAN instances simultaneously, the Message RAM is divided in half by
+    // setting the second FDCAN memory offset to half the RAM size. With this configuration,
+    // the maximum words per FDCAN instance is 1280 32-bit words.
     if (can_obj->can_id == PYB_CAN_1) {
         init->MessageRAMOffset = 0;
     } else {
-        init->MessageRAMOffset = 2560 / 2;
+        init->MessageRAMOffset = FDCAN_MESSAGE_RAM_SIZE / 2;
     }
-    #endif
-
-    #if defined(STM32G4)
-
-    init->StdFiltersNbr = 28; // /2  ? if FDCAN2 is used !!?
-    init->ExtFiltersNbr = 0; // Not used
-
-    #elif defined(STM32H7)
-
-    init->StdFiltersNbr = 64; // 128 / 2
-    init->ExtFiltersNbr = 0; // Not used
-
-    init->TxEventsNbr = 16;  // 32 / 2
-    init->RxBuffersNbr = 32; // 64 / 2
-    init->TxBuffersNbr = 16; // 32 / 2
-
-    init->RxFifo0ElmtsNbr = 64; // 128 / 2
-    init->RxFifo0ElmtSize = FDCAN_DATA_BYTES_8;
-
-    init->RxFifo1ElmtsNbr = 64; // 128 / 2
-    init->RxFifo1ElmtSize = FDCAN_DATA_BYTES_8;
-
-    init->TxFifoQueueElmtsNbr = 16; // Tx fifo elements
-    init->TxElmtSize = FDCAN_DATA_BYTES_8;
+    // An element stored in the Message RAM contains an identifier, DLC, control bits, the
+    // data field and the specific transmission or reception bits field for control.
+    // The following code configures the different Message RAM sections per FDCAN instance.
+
+    // The RAM filtering section is configured for 64 x 1 word elements for 11-bit standard
+    // identifiers, and 31 x 2 words elements for 29-bit extended identifiers.
+    // The total number of words reserved for the filtering per FDCAN instance is 126 words.
+    init->StdFiltersNbr = 64;
+    // Note extended identifiers are Not used in pyb_can.c and Not handled correctly.
+    // Disable the extended identifiers filters for now until this is fixed properly.
+    init->ExtFiltersNbr = 0 /*31*/;
+
+    // The Tx event FIFO is used to store the message ID and the timestamp of successfully
+    // transmitted elements. The Tx event FIFO can store a maximum of 32 (2 words) elements.
+    // NOTE: Events are stored in Tx event FIFO only if tx_msg.TxEventFifoControl is enabled.
+    init->TxEventsNbr = 0;
+
+    // Transmission section is configured in FIFO mode operation, with no dedicated Tx buffers.
+    // The Tx FIFO can store a maximum of 32 elements (or 576 words), each element is 18 words
+    // long (to support a maximum of 64 bytes data field):
+    //  2 words header + 16 words data field (to support up to 64 bytes of data).
+    // The total number of words reserved for the Tx FIFO per FDCAN instance is 288 words.
+    init->TxBuffersNbr = 0;
+    init->TxFifoQueueElmtsNbr = 16;
+    init->TxElmtSize = FDCAN_DATA_BYTES_64;
+    init->TxFifoQueueMode = FDCAN_TX_FIFO_OPERATION;
 
+    // Reception section is configured to use Rx FIFO 0 and Rx FIFO1, with no dedicated Rx buffers.
+    // Each Rx FIFO can store a maximum of 64 elements (1152 words), each element is 18 words
+    // long (to support a maximum of 64 bytes data field):
+    //  2 words header + 16 words data field (to support up to 64 bytes of data).
+    // The total number of words reserved for the Rx FIFOs per FDCAN instance is 864 words.
+    init->RxBuffersNbr = 0;
+    init->RxFifo0ElmtsNbr = 24;
+    init->RxFifo0ElmtSize = FDCAN_DATA_BYTES_64;
+    init->RxFifo1ElmtsNbr = 24;
+    init->RxFifo1ElmtSize = FDCAN_DATA_BYTES_64;
     #endif
 
-    init->TxFifoQueueMode = FDCAN_TX_FIFO_OPERATION;
-
     FDCAN_GlobalTypeDef *CANx = NULL;
     const pin_obj_t *pins[2];
 
@@ -159,7 +176,10 @@ bool can_init(pyb_can_obj_t *can_obj, uint32_t mode, uint32_t prescaler, uint32_
 
     // init CANx
     can_obj->can.Instance = CANx;
-    HAL_FDCAN_Init(&can_obj->can);
+    // catch bad configuration errors.
+    if (HAL_FDCAN_Init(&can_obj->can) != HAL_OK) {
+        return false;
+    }
 
     // Disable acceptance of non-matching frames (enabled by default)
     HAL_FDCAN_ConfigGlobalFilter(&can_obj->can, FDCAN_REJECT, FDCAN_REJECT, DISABLE, DISABLE);
@@ -168,7 +188,7 @@ bool can_init(pyb_can_obj_t *can_obj, uint32_t mode, uint32_t prescaler, uint32_
     HAL_FDCAN_Start(&can_obj->can);
 
     // Reset all filters
-    for (int f = 0; f < 64; ++f) {
+    for (int f = 0; f < init->StdFiltersNbr; ++f) {
         can_clearfilter(can_obj, f, 0);
     }
 
@@ -299,10 +319,12 @@ int can_receive(FDCAN_HandleTypeDef *can, int fifo, FDCAN_RxHeaderTypeDef *hdr,
     hdr->FDFormat = *address & FDCAN_ELEMENT_MASK_FDF;
     hdr->FilterIndex = (*address & FDCAN_ELEMENT_MASK_FIDX) >> 24;
     hdr->IsFilterMatchingFrame = (*address++ & FDCAN_ELEMENT_MASK_ANMF) >> 31;
+    // Convert DLC to Bytes.
+    hdr->DataLength = DLCtoBytes[hdr->DataLength];
 
     // Copy data
     uint8_t *pdata = (uint8_t *)address;
-    for (uint32_t i = 0; i < DLCtoBytes[hdr->DataLength]; ++i) {
+    for (uint32_t i = 0; i < hdr->DataLength; ++i) {
         *data++ = *pdata++;
     }
 
diff --git a/ports/stm32/pyb_can.c b/ports/stm32/pyb_can.c
index 8007fd9e3cc94..0c5c60255d1c1 100644
--- a/ports/stm32/pyb_can.c
+++ b/ports/stm32/pyb_can.c
@@ -42,6 +42,7 @@
 #if MICROPY_HW_ENABLE_FDCAN
 
 #define CAN_MAX_FILTER              (64)
+#define CAN_MAX_DATA_FRAME          (64)
 
 #define CAN_FIFO0                   FDCAN_RX_FIFO0
 #define CAN_FIFO1                   FDCAN_RX_FIFO1
@@ -89,10 +90,11 @@
 
 // Both banks start at 0
 STATIC uint8_t can2_start_bank = 0;
-
+extern const uint8_t DLCtoBytes[16];
 #else
 
 #define CAN_MAX_FILTER              (28)
+#define CAN_MAX_DATA_FRAME          (8)
 
 #define CAN_DEFAULT_PRESCALER       (100)
 #define CAN_DEFAULT_SJW             (1)
@@ -180,19 +182,50 @@ STATIC uint32_t pyb_can_get_source_freq() {
     return can_kern_clk;
 }
 
+STATIC void pyb_can_get_bit_timing(mp_uint_t baudrate, mp_uint_t sample_point,
+    mp_int_t *bs1_out, mp_int_t *bs2_out, mp_int_t *prescaler_out) {
+    uint32_t can_kern_clk = pyb_can_get_source_freq();
+
+    // The following max values work on all MCUs for classical CAN.
+    for (int brp = 1; brp < 512; brp++) {
+        for (int bs1 = 1; bs1 < 16; bs1++) {
+            for (int bs2 = 1; bs2 < 8; bs2++) {
+                if ((baudrate == (can_kern_clk / (brp * (1 + bs1 + bs2)))) &&
+                    ((sample_point * 10) == (((1 + bs1) * 1000) / (1 + bs1 + bs2)))) {
+                    *bs1_out = bs1;
+                    *bs2_out = bs2;
+                    *prescaler_out = brp;
+                    return;
+                }
+            }
+        }
+    }
+
+    mp_raise_msg(&mp_type_ValueError, MP_ERROR_TEXT("couldn't match baudrate and sample point"));
+}
+
 // init(mode, extframe=False, prescaler=100, *, sjw=1, bs1=6, bs2=8)
 STATIC mp_obj_t pyb_can_init_helper(pyb_can_obj_t *self, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
-    enum { ARG_mode, ARG_extframe, ARG_prescaler, ARG_sjw, ARG_bs1, ARG_bs2, ARG_auto_restart, ARG_baudrate, ARG_sample_point };
+    enum { ARG_mode, ARG_extframe, ARG_prescaler, ARG_sjw, ARG_bs1, ARG_bs2, ARG_auto_restart, ARG_baudrate, ARG_sample_point,
+           ARG_brs_prescaler, ARG_brs_sjw, ARG_brs_bs1, ARG_brs_bs2, ARG_brs_baudrate, ARG_brs_sample_point };
     static const mp_arg_t allowed_args[] = {
-        { MP_QSTR_mode,         MP_ARG_REQUIRED | MP_ARG_INT,   {.u_int = CAN_MODE_NORMAL} },
-        { MP_QSTR_extframe,     MP_ARG_BOOL,                    {.u_bool = false} },
-        { MP_QSTR_prescaler,    MP_ARG_INT,                     {.u_int = CAN_DEFAULT_PRESCALER} },
-        { MP_QSTR_sjw,          MP_ARG_KW_ONLY | MP_ARG_INT,    {.u_int = CAN_DEFAULT_SJW} },
-        { MP_QSTR_bs1,          MP_ARG_KW_ONLY | MP_ARG_INT,    {.u_int = CAN_DEFAULT_BS1} },
-        { MP_QSTR_bs2,          MP_ARG_KW_ONLY | MP_ARG_INT,    {.u_int = CAN_DEFAULT_BS2} },
-        { MP_QSTR_auto_restart, MP_ARG_KW_ONLY | MP_ARG_BOOL,   {.u_bool = false} },
-        { MP_QSTR_baudrate,     MP_ARG_KW_ONLY | MP_ARG_INT,    {.u_int = 0} },
-        { MP_QSTR_sample_point, MP_ARG_KW_ONLY | MP_ARG_INT,    {.u_int = 75} }, // 75% sampling point
+        { MP_QSTR_mode,             MP_ARG_REQUIRED | MP_ARG_INT,   {.u_int = CAN_MODE_NORMAL} },
+        { MP_QSTR_extframe,         MP_ARG_BOOL,                    {.u_bool = false} },
+        { MP_QSTR_prescaler,        MP_ARG_INT,                     {.u_int = CAN_DEFAULT_PRESCALER} },
+        { MP_QSTR_sjw,              MP_ARG_KW_ONLY | MP_ARG_INT,    {.u_int = CAN_DEFAULT_SJW} },
+        { MP_QSTR_bs1,              MP_ARG_KW_ONLY | MP_ARG_INT,    {.u_int = CAN_DEFAULT_BS1} },
+        { MP_QSTR_bs2,              MP_ARG_KW_ONLY | MP_ARG_INT,    {.u_int = CAN_DEFAULT_BS2} },
+        { MP_QSTR_auto_restart,     MP_ARG_KW_ONLY | MP_ARG_BOOL,   {.u_bool = false} },
+        { MP_QSTR_baudrate,         MP_ARG_KW_ONLY | MP_ARG_INT,    {.u_int = 0} },
+        { MP_QSTR_sample_point,     MP_ARG_KW_ONLY | MP_ARG_INT,    {.u_int = 75} }, // 75% sampling point
+        #if MICROPY_HW_ENABLE_FDCAN
+        { MP_QSTR_brs_prescaler,    MP_ARG_INT,                     {.u_int = CAN_DEFAULT_PRESCALER} },
+        { MP_QSTR_brs_sjw,          MP_ARG_KW_ONLY | MP_ARG_INT,    {.u_int = CAN_DEFAULT_SJW} },
+        { MP_QSTR_brs_bs1,          MP_ARG_KW_ONLY | MP_ARG_INT,    {.u_int = CAN_DEFAULT_BS1} },
+        { MP_QSTR_brs_bs2,          MP_ARG_KW_ONLY | MP_ARG_INT,    {.u_int = CAN_DEFAULT_BS2} },
+        { MP_QSTR_brs_baudrate,     MP_ARG_KW_ONLY | MP_ARG_INT,    {.u_int = 0} },
+        { MP_QSTR_brs_sample_point, MP_ARG_KW_ONLY | MP_ARG_INT,    {.u_int = 0} }
+        #endif
     };
 
     // parse args
@@ -206,34 +239,30 @@ STATIC mp_obj_t pyb_can_init_helper(pyb_can_obj_t *self, size_t n_args, const mp
 
     // Calculate CAN bit timing from baudrate if provided
     if (args[ARG_baudrate].u_int != 0) {
-        uint32_t baudrate = args[ARG_baudrate].u_int;
-        uint32_t sampoint = args[ARG_sample_point].u_int;
-        uint32_t can_kern_clk = pyb_can_get_source_freq();
-        bool timing_found = false;
-
-        // The following max values work on all MCUs for classical CAN.
-        for (int brp = 1; brp < 512 && !timing_found; brp++) {
-            for (int bs1 = 1; bs1 < 16 && !timing_found; bs1++) {
-                for (int bs2 = 1; bs2 < 8 && !timing_found; bs2++) {
-                    if ((baudrate == (can_kern_clk / (brp * (1 + bs1 + bs2)))) &&
-                        ((sampoint * 10) == (((1 + bs1) * 1000) / (1 + bs1 + bs2)))) {
-                        args[ARG_bs1].u_int = bs1;
-                        args[ARG_bs2].u_int = bs2;
-                        args[ARG_prescaler].u_int = brp;
-                        timing_found = true;
-                    }
-                }
-            }
-        }
-        if (!timing_found) {
-            mp_raise_msg(&mp_type_ValueError, MP_ERROR_TEXT("couldn't match baudrate and sample point"));
-        }
+        pyb_can_get_bit_timing(args[ARG_baudrate].u_int, args[ARG_sample_point].u_int,
+            &args[ARG_bs1].u_int, &args[ARG_bs2].u_int, &args[ARG_prescaler].u_int);
     }
 
-    // init CAN (if it fails, it's because the port doesn't exist)
+    #if MICROPY_HW_ENABLE_FDCAN
+    // If no sample point is provided for data bit timing, use the nominal sample point.
+    if (args[ARG_brs_sample_point].u_int == 0) {
+        args[ARG_brs_sample_point].u_int = args[ARG_sample_point].u_int;
+    }
+    // Calculate BRS CAN bit timing from baudrate if provided
+    if (args[ARG_brs_baudrate].u_int != 0) {
+        pyb_can_get_bit_timing(args[ARG_brs_baudrate].u_int, args[ARG_brs_sample_point].u_int,
+            &args[ARG_brs_bs1].u_int, &args[ARG_brs_bs2].u_int, &args[ARG_brs_prescaler].u_int);
+    }
+    // Set BRS bit timings.
+    self->can.Init.DataPrescaler = args[ARG_brs_prescaler].u_int;
+    self->can.Init.DataSyncJumpWidth = args[ARG_brs_sjw].u_int;
+    self->can.Init.DataTimeSeg1 = args[ARG_bs1].u_int; // DataTimeSeg1 = Propagation_segment + Phase_segment_1
+    self->can.Init.DataTimeSeg2 = args[ARG_bs2].u_int;
+    #endif
+
     if (!can_init(self, args[ARG_mode].u_int, args[ARG_prescaler].u_int, args[ARG_sjw].u_int,
         args[ARG_bs1].u_int, args[ARG_bs2].u_int, args[ARG_auto_restart].u_bool)) {
-        mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("CAN(%d) doesn't exist"), self->can_id);
+        mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("CAN(%d) init failure"), self->can_id);
     }
 
     return mp_const_none;
@@ -450,12 +479,16 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(pyb_can_any_obj, pyb_can_any);
 
 // send(send, addr, *, timeout=5000)
 STATIC mp_obj_t pyb_can_send(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
-    enum { ARG_data, ARG_id, ARG_timeout, ARG_rtr };
+    enum { ARG_data, ARG_id, ARG_timeout, ARG_rtr, ARG_fdf, ARG_brs };
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_data,    MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
         { MP_QSTR_id,      MP_ARG_REQUIRED | MP_ARG_INT, {.u_int = 0} },
         { MP_QSTR_timeout, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 0} },
         { MP_QSTR_rtr,     MP_ARG_KW_ONLY | MP_ARG_BOOL, {.u_bool = false} },
+        #if MICROPY_HW_ENABLE_FDCAN
+        { MP_QSTR_fdf,     MP_ARG_KW_ONLY | MP_ARG_BOOL, {.u_bool = false} },
+        { MP_QSTR_brs,     MP_ARG_KW_ONLY | MP_ARG_BOOL, {.u_bool = false} },
+        #endif
     };
 
     // parse args
@@ -468,7 +501,7 @@ STATIC mp_obj_t pyb_can_send(size_t n_args, const mp_obj_t *pos_args, mp_map_t *
     uint8_t data[1];
     pyb_buf_get_for_send(args[ARG_data].u_obj, &bufinfo, data);
 
-    if (bufinfo.len > 8) {
+    if (bufinfo.len > CAN_MAX_DATA_FRAME) {
         mp_raise_ValueError(MP_ERROR_TEXT("CAN data field too long"));
     }
 
@@ -476,13 +509,12 @@ STATIC mp_obj_t pyb_can_send(size_t n_args, const mp_obj_t *pos_args, mp_map_t *
     CanTxMsgTypeDef tx_msg;
 
     #if MICROPY_HW_ENABLE_FDCAN
-    uint8_t tx_data[8];
+    uint8_t tx_data[CAN_MAX_DATA_FRAME];
+    memset(tx_data, 0, sizeof(tx_data));
+
     tx_msg.MessageMarker = 0;
     tx_msg.ErrorStateIndicator = FDCAN_ESI_ACTIVE;
-    tx_msg.BitRateSwitch = FDCAN_BRS_OFF;
-    tx_msg.FDFormat = FDCAN_CLASSIC_CAN;
     tx_msg.TxEventFifoControl = FDCAN_NO_TX_EVENTS;
-    tx_msg.DataLength = (bufinfo.len << 16); // TODO DLC for len > 8
 
     if (self->extframe) {
         tx_msg.Identifier = args[ARG_id].u_int & 0x1FFFFFFF;
@@ -496,6 +528,23 @@ STATIC mp_obj_t pyb_can_send(size_t n_args, const mp_obj_t *pos_args, mp_map_t *
     } else {
         tx_msg.TxFrameType = FDCAN_REMOTE_FRAME;
     }
+    if (args[ARG_fdf].u_bool == false) {
+        tx_msg.FDFormat = FDCAN_CLASSIC_CAN;
+    } else {
+        tx_msg.FDFormat = FDCAN_FD_CAN;
+    }
+    if (args[ARG_brs].u_bool == false) {
+        tx_msg.BitRateSwitch = FDCAN_BRS_OFF;
+    } else {
+        tx_msg.BitRateSwitch = FDCAN_BRS_ON;
+    }
+    // Roundup DataLength to next DLC size and encode to DLC.
+    for (mp_uint_t i = 0; i < MP_ARRAY_SIZE(DLCtoBytes); i++) {
+        if (bufinfo.len <= DLCtoBytes[i]) {
+            tx_msg.DataLength = (i << 16);
+            break;
+        }
+    }
     #else
     tx_msg.DLC = bufinfo.len;
     uint8_t *tx_data = tx_msg.Data; // Data is uint32_t but holds only 1 byte
@@ -565,7 +614,7 @@ STATIC mp_obj_t pyb_can_recv(size_t n_args, const mp_obj_t *pos_args, mp_map_t *
     // receive the data
     CanRxMsgTypeDef rx_msg;
     #if MICROPY_HW_ENABLE_FDCAN
-    uint8_t rx_data[8];
+    uint8_t rx_data[CAN_MAX_DATA_FRAME];
     #else
     uint8_t *rx_data = rx_msg.Data;
     #endif

From 3320ec44ed7d1ba36e59a065f6941cd46608acc4 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Mon, 17 Jan 2022 20:51:31 +0200
Subject: [PATCH 1871/3533] stm32/pyb_can: Add support for CAN FD extended
 frame ID.

---
 ports/stm32/fdcan.c   | 18 ++++++++++++------
 ports/stm32/pyb_can.c | 44 ++++++++++++++++++++++++++++++++-----------
 2 files changed, 45 insertions(+), 17 deletions(-)

diff --git a/ports/stm32/fdcan.c b/ports/stm32/fdcan.c
index 63c6c31238216..bcf3e8d6a31d9 100644
--- a/ports/stm32/fdcan.c
+++ b/ports/stm32/fdcan.c
@@ -107,9 +107,7 @@ bool can_init(pyb_can_obj_t *can_obj, uint32_t mode, uint32_t prescaler, uint32_
     // identifiers, and 31 x 2 words elements for 29-bit extended identifiers.
     // The total number of words reserved for the filtering per FDCAN instance is 126 words.
     init->StdFiltersNbr = 64;
-    // Note extended identifiers are Not used in pyb_can.c and Not handled correctly.
-    // Disable the extended identifiers filters for now until this is fixed properly.
-    init->ExtFiltersNbr = 0 /*31*/;
+    init->ExtFiltersNbr = 31;
 
     // The Tx event FIFO is used to store the message ID and the timestamp of successfully
     // transmitted elements. The Tx event FIFO can store a maximum of 32 (2 words) elements.
@@ -189,7 +187,11 @@ bool can_init(pyb_can_obj_t *can_obj, uint32_t mode, uint32_t prescaler, uint32_
 
     // Reset all filters
     for (int f = 0; f < init->StdFiltersNbr; ++f) {
-        can_clearfilter(can_obj, f, 0);
+        can_clearfilter(can_obj, f, false);
+    }
+
+    for (int f = 0; f < init->ExtFiltersNbr; ++f) {
+        can_clearfilter(can_obj, f, true);
     }
 
     can_obj->is_enabled = true;
@@ -250,10 +252,14 @@ void can_deinit(pyb_can_obj_t *self) {
     }
 }
 
-void can_clearfilter(pyb_can_obj_t *self, uint32_t f, uint8_t bank) {
+void can_clearfilter(pyb_can_obj_t *self, uint32_t f, uint8_t extid) {
     if (self && self->can.Instance) {
         FDCAN_FilterTypeDef filter = {0};
-        filter.IdType = FDCAN_STANDARD_ID;
+        if (extid == 1) {
+            filter.IdType = FDCAN_EXTENDED_ID;
+        } else {
+            filter.IdType = FDCAN_STANDARD_ID;
+        }
         filter.FilterIndex = f;
         filter.FilterConfig = FDCAN_FILTER_DISABLE;
         HAL_FDCAN_ConfigFilter(&self->can, &filter);
diff --git a/ports/stm32/pyb_can.c b/ports/stm32/pyb_can.c
index 0c5c60255d1c1..323b04d6925c8 100644
--- a/ports/stm32/pyb_can.c
+++ b/ports/stm32/pyb_can.c
@@ -41,7 +41,6 @@
 
 #if MICROPY_HW_ENABLE_FDCAN
 
-#define CAN_MAX_FILTER              (64)
 #define CAN_MAX_DATA_FRAME          (64)
 
 #define CAN_FIFO0                   FDCAN_RX_FIFO0
@@ -87,9 +86,6 @@
 #define __HAL_CAN_DISABLE_IT        __HAL_FDCAN_DISABLE_IT
 #define __HAL_CAN_CLEAR_FLAG        __HAL_FDCAN_CLEAR_FLAG
 #define __HAL_CAN_MSG_PENDING       HAL_FDCAN_GetRxFifoFillLevel
-
-// Both banks start at 0
-STATIC uint8_t can2_start_bank = 0;
 extern const uint8_t DLCtoBytes[16];
 #else
 
@@ -715,16 +711,29 @@ STATIC mp_obj_t pyb_can_recv(size_t n_args, const mp_obj_t *pos_args, mp_map_t *
 STATIC MP_DEFINE_CONST_FUN_OBJ_KW(pyb_can_recv_obj, 1, pyb_can_recv);
 
 // initfilterbanks(n)
-STATIC mp_obj_t pyb_can_initfilterbanks(mp_obj_t self, mp_obj_t bank_in) {
+STATIC mp_obj_t pyb_can_initfilterbanks(mp_obj_t self_in, mp_obj_t bank_in) {
+    pyb_can_obj_t *self = MP_OBJ_TO_PTR(self_in);
     #if MICROPY_HW_ENABLE_FDCAN
-    can2_start_bank = 0;
+    (void)self;
+    #if 0
+    FDCAN_InitTypeDef *init = &self->can.Init;
+    // Clear standard ID filters.
+    for (int f = 0; f < init->StdFiltersNbr; ++f) {
+        can_clearfilter(self, f, false);
+    }
+    // Clear extended ID filters.
+    for (int f = 0; f < init->ExtFiltersNbr; ++f) {
+        can_clearfilter(self, f, true);
+    }
+    #endif
     #else
+    // NOTE: For classic CAN, this function calls HAL_CAN_ConfigFilter(NULL, &filter);
+    // if CAN3 is defined, ConfigFilter() will dereference a NULL pointer.
     can2_start_bank = mp_obj_get_int(bank_in);
-    #endif
-
     for (int f = 0; f < CAN_MAX_FILTER; f++) {
-        can_clearfilter(MP_OBJ_TO_PTR(self), f, can2_start_bank);
+        can_clearfilter(self, f, can2_start_bank);
     }
+    #endif
     return mp_const_none;
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_2(pyb_can_initfilterbanks_fun_obj, pyb_can_initfilterbanks);
@@ -733,10 +742,14 @@ STATIC MP_DEFINE_CONST_CLASSMETHOD_OBJ(pyb_can_initfilterbanks_obj, MP_ROM_PTR(&
 STATIC mp_obj_t pyb_can_clearfilter(mp_obj_t self_in, mp_obj_t bank_in) {
     pyb_can_obj_t *self = MP_OBJ_TO_PTR(self_in);
     mp_int_t f = mp_obj_get_int(bank_in);
+    #if MICROPY_HW_ENABLE_FDCAN
+    can_clearfilter(self, f, self->extframe);
+    #else
     if (self->can_id == 2) {
         f += can2_start_bank;
     }
     can_clearfilter(self, f, can2_start_bank);
+    #endif
     return mp_const_none;
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_2(pyb_can_clearfilter_obj, pyb_can_clearfilter);
@@ -760,9 +773,18 @@ STATIC mp_obj_t pyb_can_setfilter(size_t n_args, const mp_obj_t *pos_args, mp_ma
 
     #if MICROPY_HW_ENABLE_FDCAN
     FDCAN_FilterTypeDef filter = {0};
-    filter.IdType = FDCAN_STANDARD_ID;
-    // TODO check filter index
+    if (self->extframe) {
+        filter.IdType = FDCAN_EXTENDED_ID;
+    } else {
+        filter.IdType = FDCAN_STANDARD_ID;
+    }
+
     filter.FilterIndex = args[ARG_bank].u_int;
+    // Check filter index.
+    if ((filter.IdType == FDCAN_STANDARD_ID && filter.FilterIndex >= self->can.Init.StdFiltersNbr) ||
+        (filter.IdType == FDCAN_EXTENDED_ID && filter.FilterIndex >= self->can.Init.ExtFiltersNbr)) {
+        goto error;
+    }
 
     // Check filter mode
     if (((args[ARG_mode].u_int != FDCAN_FILTER_RANGE) &&

From e7264e9532549560304be33ce7971609baba5bec Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Sat, 29 Jan 2022 03:16:26 +0200
Subject: [PATCH 1872/3533] stm32/pyb_can: Add support for bus with mixed
 Classic/FD nodes.

A CAN bus can have mixed classic/FD nodes.  Prior to this patch the CAN API
could be configured for either standard or extended ID, but not both/mixed
operation.

This patch allows extended IDs to be filtered and enabled on a per-message
basis, in send(), setfilter() and clearfilter().

This is a breaking change to the API: init() no longer accepts the extframe
keyword argument.
---
 ports/stm32/can.h     |  1 -
 ports/stm32/pyb_can.c | 55 ++++++++++++++++++++++++-------------------
 2 files changed, 31 insertions(+), 25 deletions(-)

diff --git a/ports/stm32/can.h b/ports/stm32/can.h
index bb26c0b7e2ec7..45ac7187e0040 100644
--- a/ports/stm32/can.h
+++ b/ports/stm32/can.h
@@ -67,7 +67,6 @@ typedef struct _pyb_can_obj_t {
     mp_obj_t rxcallback1;
     mp_uint_t can_id : 8;
     bool is_enabled : 1;
-    bool extframe : 1;
     byte rx_state0;
     byte rx_state1;
     uint16_t num_error_warning;
diff --git a/ports/stm32/pyb_can.c b/ports/stm32/pyb_can.c
index 323b04d6925c8..4d97e21f5723a 100644
--- a/ports/stm32/pyb_can.c
+++ b/ports/stm32/pyb_can.c
@@ -133,10 +133,9 @@ STATIC void pyb_can_print(const mp_print_t *print, mp_obj_t self_in, mp_print_ki
                 mode = MP_QSTR_SILENT_LOOPBACK;
                 break;
         }
-        mp_printf(print, "CAN(%u, CAN.%q, extframe=%q, auto_restart=%q)",
+        mp_printf(print, "CAN(%u, CAN.%q, auto_restart=%q)",
             self->can_id,
             mode,
-            self->extframe ? MP_QSTR_True : MP_QSTR_False,
             #if MICROPY_HW_ENABLE_FDCAN
             (self->can.Instance->CCCR & FDCAN_CCCR_DAR) ? MP_QSTR_True : MP_QSTR_False
             #else
@@ -200,13 +199,12 @@ STATIC void pyb_can_get_bit_timing(mp_uint_t baudrate, mp_uint_t sample_point,
     mp_raise_msg(&mp_type_ValueError, MP_ERROR_TEXT("couldn't match baudrate and sample point"));
 }
 
-// init(mode, extframe=False, prescaler=100, *, sjw=1, bs1=6, bs2=8)
+// init(mode, prescaler=100, *, sjw=1, bs1=6, bs2=8)
 STATIC mp_obj_t pyb_can_init_helper(pyb_can_obj_t *self, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
-    enum { ARG_mode, ARG_extframe, ARG_prescaler, ARG_sjw, ARG_bs1, ARG_bs2, ARG_auto_restart, ARG_baudrate, ARG_sample_point,
+    enum { ARG_mode, ARG_prescaler, ARG_sjw, ARG_bs1, ARG_bs2, ARG_auto_restart, ARG_baudrate, ARG_sample_point,
            ARG_brs_prescaler, ARG_brs_sjw, ARG_brs_bs1, ARG_brs_bs2, ARG_brs_baudrate, ARG_brs_sample_point };
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_mode,             MP_ARG_REQUIRED | MP_ARG_INT,   {.u_int = CAN_MODE_NORMAL} },
-        { MP_QSTR_extframe,         MP_ARG_BOOL,                    {.u_bool = false} },
         { MP_QSTR_prescaler,        MP_ARG_INT,                     {.u_int = CAN_DEFAULT_PRESCALER} },
         { MP_QSTR_sjw,              MP_ARG_KW_ONLY | MP_ARG_INT,    {.u_int = CAN_DEFAULT_SJW} },
         { MP_QSTR_bs1,              MP_ARG_KW_ONLY | MP_ARG_INT,    {.u_int = CAN_DEFAULT_BS1} },
@@ -228,8 +226,6 @@ STATIC mp_obj_t pyb_can_init_helper(pyb_can_obj_t *self, size_t n_args, const mp
     mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
     mp_arg_parse_all(n_args, pos_args, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
 
-    self->extframe = args[ARG_extframe].u_bool;
-
     // set the CAN configuration values
     memset(&self->can, 0, sizeof(self->can));
 
@@ -475,15 +471,16 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(pyb_can_any_obj, pyb_can_any);
 
 // send(send, addr, *, timeout=5000)
 STATIC mp_obj_t pyb_can_send(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
-    enum { ARG_data, ARG_id, ARG_timeout, ARG_rtr, ARG_fdf, ARG_brs };
+    enum { ARG_data, ARG_id, ARG_timeout, ARG_rtr, ARG_extframe, ARG_fdf, ARG_brs };
     static const mp_arg_t allowed_args[] = {
-        { MP_QSTR_data,    MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
-        { MP_QSTR_id,      MP_ARG_REQUIRED | MP_ARG_INT, {.u_int = 0} },
-        { MP_QSTR_timeout, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 0} },
-        { MP_QSTR_rtr,     MP_ARG_KW_ONLY | MP_ARG_BOOL, {.u_bool = false} },
+        { MP_QSTR_data,     MP_ARG_REQUIRED | MP_ARG_OBJ,   {.u_obj = MP_OBJ_NULL} },
+        { MP_QSTR_id,       MP_ARG_REQUIRED | MP_ARG_INT,   {.u_int = 0} },
+        { MP_QSTR_timeout,  MP_ARG_KW_ONLY | MP_ARG_INT,   {.u_int = 0} },
+        { MP_QSTR_rtr,      MP_ARG_KW_ONLY | MP_ARG_BOOL,  {.u_bool = false} },
+        { MP_QSTR_extframe, MP_ARG_BOOL,                    {.u_bool = false} },
         #if MICROPY_HW_ENABLE_FDCAN
-        { MP_QSTR_fdf,     MP_ARG_KW_ONLY | MP_ARG_BOOL, {.u_bool = false} },
-        { MP_QSTR_brs,     MP_ARG_KW_ONLY | MP_ARG_BOOL, {.u_bool = false} },
+        { MP_QSTR_fdf,      MP_ARG_KW_ONLY | MP_ARG_BOOL,  {.u_bool = false} },
+        { MP_QSTR_brs,      MP_ARG_KW_ONLY | MP_ARG_BOOL,  {.u_bool = false} },
         #endif
     };
 
@@ -512,7 +509,7 @@ STATIC mp_obj_t pyb_can_send(size_t n_args, const mp_obj_t *pos_args, mp_map_t *
     tx_msg.ErrorStateIndicator = FDCAN_ESI_ACTIVE;
     tx_msg.TxEventFifoControl = FDCAN_NO_TX_EVENTS;
 
-    if (self->extframe) {
+    if (args[ARG_extframe].u_bool == true) {
         tx_msg.Identifier = args[ARG_id].u_int & 0x1FFFFFFF;
         tx_msg.IdType = FDCAN_EXTENDED_ID;
     } else {
@@ -545,7 +542,7 @@ STATIC mp_obj_t pyb_can_send(size_t n_args, const mp_obj_t *pos_args, mp_map_t *
     tx_msg.DLC = bufinfo.len;
     uint8_t *tx_data = tx_msg.Data; // Data is uint32_t but holds only 1 byte
 
-    if (self->extframe) {
+    if (args[ARG_extframe].u_bool == true) {
         tx_msg.ExtId = args[ARG_id].u_int & 0x1FFFFFFF;
         tx_msg.IDE = CAN_ID_EXT;
     } else {
@@ -739,11 +736,20 @@ STATIC mp_obj_t pyb_can_initfilterbanks(mp_obj_t self_in, mp_obj_t bank_in) {
 STATIC MP_DEFINE_CONST_FUN_OBJ_2(pyb_can_initfilterbanks_fun_obj, pyb_can_initfilterbanks);
 STATIC MP_DEFINE_CONST_CLASSMETHOD_OBJ(pyb_can_initfilterbanks_obj, MP_ROM_PTR(&pyb_can_initfilterbanks_fun_obj));
 
-STATIC mp_obj_t pyb_can_clearfilter(mp_obj_t self_in, mp_obj_t bank_in) {
-    pyb_can_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    mp_int_t f = mp_obj_get_int(bank_in);
+STATIC mp_obj_t pyb_can_clearfilter(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    enum { ARG_extframe };
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_extframe, MP_ARG_BOOL, {.u_bool = false} },
+    };
+
+    // parse args
+    pyb_can_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]);
+    mp_int_t f = mp_obj_get_int(pos_args[1]);
+    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
+    mp_arg_parse_all(n_args - 2, pos_args + 2, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
+
     #if MICROPY_HW_ENABLE_FDCAN
-    can_clearfilter(self, f, self->extframe);
+    can_clearfilter(self, f, args[ARG_extframe].u_bool);
     #else
     if (self->can_id == 2) {
         f += can2_start_bank;
@@ -752,18 +758,19 @@ STATIC mp_obj_t pyb_can_clearfilter(mp_obj_t self_in, mp_obj_t bank_in) {
     #endif
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(pyb_can_clearfilter_obj, pyb_can_clearfilter);
+STATIC MP_DEFINE_CONST_FUN_OBJ_KW(pyb_can_clearfilter_obj, 2, pyb_can_clearfilter);
 
 // setfilter(bank, mode, fifo, params, *, rtr)
 #define EXTENDED_ID_TO_16BIT_FILTER(id) (((id & 0xC00000) >> 13) | ((id & 0x38000) >> 15)) | 8
 STATIC mp_obj_t pyb_can_setfilter(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
-    enum { ARG_bank, ARG_mode, ARG_fifo, ARG_params, ARG_rtr };
+    enum { ARG_bank, ARG_mode, ARG_fifo, ARG_params, ARG_rtr, ARG_extframe };
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_bank,     MP_ARG_REQUIRED | MP_ARG_INT, {.u_int = 0} },
         { MP_QSTR_mode,     MP_ARG_REQUIRED | MP_ARG_INT, {.u_int = 0} },
         { MP_QSTR_fifo,     MP_ARG_REQUIRED | MP_ARG_INT, {.u_int = CAN_FILTER_FIFO0} },
         { MP_QSTR_params,   MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
         { MP_QSTR_rtr,      MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
+        { MP_QSTR_extframe, MP_ARG_BOOL,                  {.u_bool = false} },
     };
 
     // parse args
@@ -773,7 +780,7 @@ STATIC mp_obj_t pyb_can_setfilter(size_t n_args, const mp_obj_t *pos_args, mp_ma
 
     #if MICROPY_HW_ENABLE_FDCAN
     FDCAN_FilterTypeDef filter = {0};
-    if (self->extframe) {
+    if (args[ARG_extframe].u_bool == true) {
         filter.IdType = FDCAN_EXTENDED_ID;
     } else {
         filter.IdType = FDCAN_STANDARD_ID;
@@ -831,7 +838,7 @@ STATIC mp_obj_t pyb_can_setfilter(size_t n_args, const mp_obj_t *pos_args, mp_ma
             goto error;
         }
         filter.FilterScale = CAN_FILTERSCALE_16BIT;
-        if (self->extframe) {
+        if (args[ARG_extframe].u_bool == true) {
             if (args[ARG_rtr].u_obj != MP_OBJ_NULL) {
                 if (args[ARG_mode].u_int == MASK16) {
                     rtr_masks[0] = mp_obj_get_int(rtr_flags[0]) ? 0x02 : 0;

From 95104c9f6e8a3dac884e803103e38163d5caf2aa Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Sat, 29 Jan 2022 03:47:47 +0200
Subject: [PATCH 1873/3533] stm32/pyb_can: Return the filter ID and type of
 received messages.

CAN.recv() now returns a 5-tuple, with the new element in the second
position being a boolean, True if the ID is extended.

This is a breaking change of the API for CAN.recv().
---
 ports/stm32/pyb_can.c | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/ports/stm32/pyb_can.c b/ports/stm32/pyb_can.c
index 4d97e21f5723a..bdb0e9034b086 100644
--- a/ports/stm32/pyb_can.c
+++ b/ports/stm32/pyb_can.c
@@ -660,29 +660,29 @@ STATIC mp_obj_t pyb_can_recv(size_t n_args, const mp_obj_t *pos_args, mp_map_t *
     }
 
     // Create the tuple, or get the list, that will hold the return values
-    // Also populate the fourth element, either a new bytes or reuse existing memoryview
+    // Also populate the fifth element, either a new bytes or reuse existing memoryview
     mp_obj_t ret_obj = args[ARG_list].u_obj;
     mp_obj_t *items;
     if (ret_obj == mp_const_none) {
-        ret_obj = mp_obj_new_tuple(4, NULL);
+        ret_obj = mp_obj_new_tuple(5, NULL);
         items = ((mp_obj_tuple_t *)MP_OBJ_TO_PTR(ret_obj))->items;
-        items[3] = mp_obj_new_bytes(rx_data, rx_dlc);
+        items[4] = mp_obj_new_bytes(rx_data, rx_dlc);
     } else {
-        // User should provide a list of length at least 4 to hold the values
+        // User should provide a list of length at least 5 to hold the values
         if (!mp_obj_is_type(ret_obj, &mp_type_list)) {
             mp_raise_TypeError(NULL);
         }
         mp_obj_list_t *list = MP_OBJ_TO_PTR(ret_obj);
-        if (list->len < 4) {
+        if (list->len < 5) {
             mp_raise_ValueError(NULL);
         }
         items = list->items;
-        // Fourth element must be a memoryview which we assume points to a
+        // Fifth element must be a memoryview which we assume points to a
         // byte-like array which is large enough, and then we resize it inplace
-        if (!mp_obj_is_type(items[3], &mp_type_memoryview)) {
+        if (!mp_obj_is_type(items[4], &mp_type_memoryview)) {
             mp_raise_TypeError(NULL);
         }
-        mp_obj_array_t *mv = MP_OBJ_TO_PTR(items[3]);
+        mp_obj_array_t *mv = MP_OBJ_TO_PTR(items[4]);
         if (!(mv->typecode == (MP_OBJ_ARRAY_TYPECODE_FLAG_RW | BYTEARRAY_TYPECODE)
               || (mv->typecode | 0x20) == (MP_OBJ_ARRAY_TYPECODE_FLAG_RW | 'b'))) {
             mp_raise_ValueError(NULL);
@@ -691,15 +691,17 @@ STATIC mp_obj_t pyb_can_recv(size_t n_args, const mp_obj_t *pos_args, mp_map_t *
         memcpy(mv->items, rx_data, rx_dlc);
     }
 
-    // Populate the first 3 values of the tuple/list
+    // Populate the first 4 values of the tuple/list
     #if MICROPY_HW_ENABLE_FDCAN
     items[0] = MP_OBJ_NEW_SMALL_INT(rx_msg.Identifier);
-    items[1] = rx_msg.RxFrameType == FDCAN_REMOTE_FRAME ? mp_const_true : mp_const_false;
-    items[2] = MP_OBJ_NEW_SMALL_INT(rx_msg.FilterIndex);
+    items[1] = mp_obj_new_bool(rx_msg.IdType == FDCAN_EXTENDED_ID);
+    items[2] = rx_msg.RxFrameType == FDCAN_REMOTE_FRAME ? mp_const_true : mp_const_false;
+    items[3] = MP_OBJ_NEW_SMALL_INT(rx_msg.FilterIndex);
     #else
     items[0] = MP_OBJ_NEW_SMALL_INT((rx_msg.IDE == CAN_ID_STD ? rx_msg.StdId : rx_msg.ExtId));
-    items[1] = rx_msg.RTR == CAN_RTR_REMOTE ? mp_const_true : mp_const_false;
-    items[2] = MP_OBJ_NEW_SMALL_INT(rx_msg.FMI);
+    items[1] = mp_obj_new_bool(rx_msg.IDE == CAN_ID_EXT);
+    items[2] = rx_msg.RTR == CAN_RTR_REMOTE ? mp_const_true : mp_const_false;
+    items[3] = MP_OBJ_NEW_SMALL_INT(rx_msg.FMI);
     #endif
 
     // Return the result

From a79706fb397b5763eff9fa0a2c1b3f1dbc906fff Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Sun, 30 Jan 2022 19:16:17 +0200
Subject: [PATCH 1874/3533] stm32/pyb_can: Define the maximum bit timing
 parameters.

Define the maximum parameters for CAN/FDCAN nominal bit timing, and for
FDCAN data bit timing, for bit timing calculations.
---
 ports/stm32/pyb_can.c | 31 ++++++++++++++++++++++++-------
 1 file changed, 24 insertions(+), 7 deletions(-)

diff --git a/ports/stm32/pyb_can.c b/ports/stm32/pyb_can.c
index bdb0e9034b086..aa33129325539 100644
--- a/ports/stm32/pyb_can.c
+++ b/ports/stm32/pyb_can.c
@@ -59,6 +59,16 @@
 #define CAN_DEFAULT_BS1             (8)
 #define CAN_DEFAULT_BS2             (3)
 
+#define CAN_MAXIMUM_NBRP            (512)
+#define CAN_MAXIMUM_NBS1            (256)
+#define CAN_MAXIMUM_NBS2            (128)
+// Minimum Nominal time segment for FDCAN is 2.
+#define CAN_MINIMUM_TSEG            (2)
+
+#define CAN_MAXIMUM_DBRP            (32)
+#define CAN_MAXIMUM_DBS1            (32)
+#define CAN_MAXIMUM_DBS2            (16)
+
 #define CAN_MODE_NORMAL             FDCAN_MODE_NORMAL
 #define CAN_MODE_LOOPBACK           FDCAN_MODE_EXTERNAL_LOOPBACK
 #define CAN_MODE_SILENT             FDCAN_MODE_BUS_MONITORING
@@ -97,6 +107,11 @@ extern const uint8_t DLCtoBytes[16];
 #define CAN_DEFAULT_BS1             (6)
 #define CAN_DEFAULT_BS2             (8)
 
+#define CAN_MAXIMUM_NBRP            (1024)
+#define CAN_MAXIMUM_NBS1            (16)
+#define CAN_MAXIMUM_NBS2            (8)
+#define CAN_MINIMUM_TSEG            (1)
+
 #define CAN_IT_FIFO0_FULL           CAN_IT_FF0
 #define CAN_IT_FIFO1_FULL           CAN_IT_FF1
 #define CAN_IT_FIFO0_OVRF           CAN_IT_FOV0
@@ -178,13 +193,13 @@ STATIC uint32_t pyb_can_get_source_freq() {
 }
 
 STATIC void pyb_can_get_bit_timing(mp_uint_t baudrate, mp_uint_t sample_point,
+    uint32_t max_brp, uint32_t max_bs1, uint32_t max_bs2, uint32_t min_tseg,
     mp_int_t *bs1_out, mp_int_t *bs2_out, mp_int_t *prescaler_out) {
     uint32_t can_kern_clk = pyb_can_get_source_freq();
-
-    // The following max values work on all MCUs for classical CAN.
-    for (int brp = 1; brp < 512; brp++) {
-        for (int bs1 = 1; bs1 < 16; bs1++) {
-            for (int bs2 = 1; bs2 < 8; bs2++) {
+    // Calculate CAN bit timing.
+    for (uint32_t brp = 1; brp < max_brp; brp++) {
+        for (uint32_t bs1 = min_tseg; bs1 < max_bs1; bs1++) {
+            for (uint32_t bs2 = min_tseg; bs2 < max_bs2; bs2++) {
                 if ((baudrate == (can_kern_clk / (brp * (1 + bs1 + bs2)))) &&
                     ((sample_point * 10) == (((1 + bs1) * 1000) / (1 + bs1 + bs2)))) {
                     *bs1_out = bs1;
@@ -229,9 +244,10 @@ STATIC mp_obj_t pyb_can_init_helper(pyb_can_obj_t *self, size_t n_args, const mp
     // set the CAN configuration values
     memset(&self->can, 0, sizeof(self->can));
 
-    // Calculate CAN bit timing from baudrate if provided
+    // Calculate CAN nominal bit timing from baudrate if provided
     if (args[ARG_baudrate].u_int != 0) {
         pyb_can_get_bit_timing(args[ARG_baudrate].u_int, args[ARG_sample_point].u_int,
+            CAN_MAXIMUM_NBRP, CAN_MAXIMUM_NBS1, CAN_MAXIMUM_NBS2, CAN_MINIMUM_TSEG,
             &args[ARG_bs1].u_int, &args[ARG_bs2].u_int, &args[ARG_prescaler].u_int);
     }
 
@@ -240,9 +256,10 @@ STATIC mp_obj_t pyb_can_init_helper(pyb_can_obj_t *self, size_t n_args, const mp
     if (args[ARG_brs_sample_point].u_int == 0) {
         args[ARG_brs_sample_point].u_int = args[ARG_sample_point].u_int;
     }
-    // Calculate BRS CAN bit timing from baudrate if provided
+    // Calculate CAN data bit timing from baudrate if provided
     if (args[ARG_brs_baudrate].u_int != 0) {
         pyb_can_get_bit_timing(args[ARG_brs_baudrate].u_int, args[ARG_brs_sample_point].u_int,
+            CAN_MAXIMUM_DBRP, CAN_MAXIMUM_DBS1, CAN_MAXIMUM_DBS2, 1,
             &args[ARG_brs_bs1].u_int, &args[ARG_brs_bs2].u_int, &args[ARG_brs_prescaler].u_int);
     }
     // Set BRS bit timings.

From 5562ed3f43f1a9327bf8634f16e2592774eb7907 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Wed, 30 Mar 2022 17:40:44 +0200
Subject: [PATCH 1875/3533] stm32/pyb_can: Replace CAN.initfilterbanks with
 CAN.init keyword arg.

The CAN.initfilterbanks() class method is removed, and its functionality is
replaced with the "num_filter_banks" keyword argument to the CAN
constructor and CAN.init().  This configures the filter bank split.

This new approach provides more flexibility configuring the resources used
by a given CAN instance, allowing other MCUs like H7 to fit the API.  It
also brings CAN closer to how other machine peripherals are configured,
where everything is done in the constructor/init method.

This is a breaking change to the CAN API.
---
 ports/stm32/pyb_can.c | 39 ++++++++-------------------------------
 1 file changed, 8 insertions(+), 31 deletions(-)

diff --git a/ports/stm32/pyb_can.c b/ports/stm32/pyb_can.c
index aa33129325539..aa2d83a64e582 100644
--- a/ports/stm32/pyb_can.c
+++ b/ports/stm32/pyb_can.c
@@ -217,7 +217,7 @@ STATIC void pyb_can_get_bit_timing(mp_uint_t baudrate, mp_uint_t sample_point,
 // init(mode, prescaler=100, *, sjw=1, bs1=6, bs2=8)
 STATIC mp_obj_t pyb_can_init_helper(pyb_can_obj_t *self, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_mode, ARG_prescaler, ARG_sjw, ARG_bs1, ARG_bs2, ARG_auto_restart, ARG_baudrate, ARG_sample_point,
-           ARG_brs_prescaler, ARG_brs_sjw, ARG_brs_bs1, ARG_brs_bs2, ARG_brs_baudrate, ARG_brs_sample_point };
+           ARG_num_filter_banks, ARG_brs_prescaler, ARG_brs_sjw, ARG_brs_bs1, ARG_brs_bs2, ARG_brs_baudrate, ARG_brs_sample_point };
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_mode,             MP_ARG_REQUIRED | MP_ARG_INT,   {.u_int = CAN_MODE_NORMAL} },
         { MP_QSTR_prescaler,        MP_ARG_INT,                     {.u_int = CAN_DEFAULT_PRESCALER} },
@@ -227,6 +227,7 @@ STATIC mp_obj_t pyb_can_init_helper(pyb_can_obj_t *self, size_t n_args, const mp
         { MP_QSTR_auto_restart,     MP_ARG_KW_ONLY | MP_ARG_BOOL,   {.u_bool = false} },
         { MP_QSTR_baudrate,         MP_ARG_KW_ONLY | MP_ARG_INT,    {.u_int = 0} },
         { MP_QSTR_sample_point,     MP_ARG_KW_ONLY | MP_ARG_INT,    {.u_int = 75} }, // 75% sampling point
+        { MP_QSTR_num_filter_banks, MP_ARG_KW_ONLY | MP_ARG_INT,    {.u_int = 14} },
         #if MICROPY_HW_ENABLE_FDCAN
         { MP_QSTR_brs_prescaler,    MP_ARG_INT,                     {.u_int = CAN_DEFAULT_PRESCALER} },
         { MP_QSTR_brs_sjw,          MP_ARG_KW_ONLY | MP_ARG_INT,    {.u_int = CAN_DEFAULT_SJW} },
@@ -267,6 +268,12 @@ STATIC mp_obj_t pyb_can_init_helper(pyb_can_obj_t *self, size_t n_args, const mp
     self->can.Init.DataSyncJumpWidth = args[ARG_brs_sjw].u_int;
     self->can.Init.DataTimeSeg1 = args[ARG_bs1].u_int; // DataTimeSeg1 = Propagation_segment + Phase_segment_1
     self->can.Init.DataTimeSeg2 = args[ARG_bs2].u_int;
+    #else
+    // Init filter banks for classic CAN.
+    can2_start_bank = args[ARG_num_filter_banks].u_int;
+    for (int f = 0; f < CAN_MAX_FILTER; f++) {
+        can_clearfilter(self, f, can2_start_bank);
+    }
     #endif
 
     if (!can_init(self, args[ARG_mode].u_int, args[ARG_prescaler].u_int, args[ARG_sjw].u_int,
@@ -726,35 +733,6 @@ STATIC mp_obj_t pyb_can_recv(size_t n_args, const mp_obj_t *pos_args, mp_map_t *
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_KW(pyb_can_recv_obj, 1, pyb_can_recv);
 
-// initfilterbanks(n)
-STATIC mp_obj_t pyb_can_initfilterbanks(mp_obj_t self_in, mp_obj_t bank_in) {
-    pyb_can_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    #if MICROPY_HW_ENABLE_FDCAN
-    (void)self;
-    #if 0
-    FDCAN_InitTypeDef *init = &self->can.Init;
-    // Clear standard ID filters.
-    for (int f = 0; f < init->StdFiltersNbr; ++f) {
-        can_clearfilter(self, f, false);
-    }
-    // Clear extended ID filters.
-    for (int f = 0; f < init->ExtFiltersNbr; ++f) {
-        can_clearfilter(self, f, true);
-    }
-    #endif
-    #else
-    // NOTE: For classic CAN, this function calls HAL_CAN_ConfigFilter(NULL, &filter);
-    // if CAN3 is defined, ConfigFilter() will dereference a NULL pointer.
-    can2_start_bank = mp_obj_get_int(bank_in);
-    for (int f = 0; f < CAN_MAX_FILTER; f++) {
-        can_clearfilter(self, f, can2_start_bank);
-    }
-    #endif
-    return mp_const_none;
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(pyb_can_initfilterbanks_fun_obj, pyb_can_initfilterbanks);
-STATIC MP_DEFINE_CONST_CLASSMETHOD_OBJ(pyb_can_initfilterbanks_obj, MP_ROM_PTR(&pyb_can_initfilterbanks_fun_obj));
-
 STATIC mp_obj_t pyb_can_clearfilter(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_extframe };
     static const mp_arg_t allowed_args[] = {
@@ -1006,7 +984,6 @@ STATIC const mp_rom_map_elem_t pyb_can_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_any), MP_ROM_PTR(&pyb_can_any_obj) },
     { MP_ROM_QSTR(MP_QSTR_send), MP_ROM_PTR(&pyb_can_send_obj) },
     { MP_ROM_QSTR(MP_QSTR_recv), MP_ROM_PTR(&pyb_can_recv_obj) },
-    { MP_ROM_QSTR(MP_QSTR_initfilterbanks), MP_ROM_PTR(&pyb_can_initfilterbanks_obj) },
     { MP_ROM_QSTR(MP_QSTR_setfilter), MP_ROM_PTR(&pyb_can_setfilter_obj) },
     { MP_ROM_QSTR(MP_QSTR_clearfilter), MP_ROM_PTR(&pyb_can_clearfilter_obj) },
     { MP_ROM_QSTR(MP_QSTR_rxcallback), MP_ROM_PTR(&pyb_can_rxcallback_obj) },

From 5cdf9645711cc12b45e602ef5795c33895116fc4 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Sun, 20 Feb 2022 20:29:32 +0200
Subject: [PATCH 1876/3533] docs/library/pyb.CAN: Update CAN docs to match
 revised API.

---
 docs/library/pyb.CAN.rst | 140 +++++++++++++++++++++++++--------------
 1 file changed, 92 insertions(+), 48 deletions(-)

diff --git a/docs/library/pyb.CAN.rst b/docs/library/pyb.CAN.rst
index bcaeeba9df955..69704d09b2579 100644
--- a/docs/library/pyb.CAN.rst
+++ b/docs/library/pyb.CAN.rst
@@ -4,13 +4,12 @@
 class CAN -- controller area network communication bus
 ======================================================
 
-CAN implements the standard CAN communications protocol.  At
-the physical level it consists of 2 lines: RX and TX.  Note that
-to connect the pyboard to a CAN bus you must use a CAN transceiver
-to convert the CAN logic signals from the pyboard to the correct
+CAN implements support for classic CAN (available on F4, F7 MCUs) and CAN FD (H7 series) controllers.
+At the physical level CAN bus consists of 2 lines: RX and TX.  Note that to connect the pyboard to a
+CAN bus you must use a CAN transceiver to convert the CAN logic signals from the pyboard to the correct
 voltage levels on the bus.
 
-Example usage (works without anything connected)::
+Example usage for classic CAN controller in Loopback (transceiver-less) mode::
 
     from pyb import CAN
     can = CAN(1, CAN.LOOPBACK)
@@ -18,6 +17,16 @@ Example usage (works without anything connected)::
     can.send('message!', 123)   # send a message with id 123
     can.recv(0)                 # receive message on FIFO 0
 
+Example usage for CAN FD controller with all of the possible options enabled::
+
+    # FD frame + BRS mode + Extended frame ID. 500 Kbit/s for arbitration phase, 1Mbit/s for data phase.
+    can = CAN(1, CAN.NORMAL, baudrate=500_000, brs_baudrate=1_000_000, sample_point=80)
+    can.setfilter(0, CAN.RANGE, 0, (0xFFF0, 0xFFFF))
+    can.send('a'*64, 0xFFFF, fdf=True, brs=True, extframe=True)
+    can.recv(0)
+
+The following CAN module functions and their arguments are available
+for both classic and FD CAN controllers, unless otherwise stated.
 
 Constructors
 ------------
@@ -35,43 +44,48 @@ Constructors
      - ``CAN(1)`` is on ``YA``: ``(RX, TX) = (Y3, Y4) = (PB8, PB9)``
      - ``CAN(2)`` is on ``YB``: ``(RX, TX) = (Y5, Y6) = (PB12, PB13)``
 
-Class Methods
--------------
-.. classmethod:: CAN.initfilterbanks(nr)
-
-   Reset and disable all filter banks and assign how many banks should be available for CAN(1).
-
-   STM32F405 has 28 filter banks that are shared between the two available CAN bus controllers.
-   This function configures how many filter banks should be assigned to each. *nr* is the number of banks
-   that will be assigned to CAN(1), the rest of the 28 are assigned to CAN(2).
-   At boot, 14 banks are assigned to each controller.
-
 Methods
 -------
 
-.. method:: CAN.init(mode, extframe=False, prescaler=100, *, sjw=1, bs1=6, bs2=8, auto_restart=False, baudrate=0, sample_point=75)
+.. method:: CAN.init(mode, prescaler=100, *, sjw=1, bs1=6, bs2=8, auto_restart=False, baudrate=0, sample_point=75,
+        num_filter_banks=14, brs_sjw=1, brs_bs1=8, brs_bs2=3, brs_baudrate=0, brs_sample_point=75)
 
    Initialise the CAN bus with the given parameters:
 
      - *mode* is one of:  NORMAL, LOOPBACK, SILENT, SILENT_LOOPBACK
-     - if *extframe* is True then the bus uses extended identifiers in the frames
-       (29 bits); otherwise it uses standard 11 bit identifiers
-     - *prescaler* is used to set the duration of 1 time quanta; the time quanta
-       will be the input clock (PCLK1, see :meth:`pyb.freq()`) divided by the prescaler
-     - *sjw* is the resynchronisation jump width in units of the time quanta;
-       it can be 1, 2, 3, 4
-     - *bs1* defines the location of the sample point in units of the time quanta;
-       it can be between 1 and 1024 inclusive
-     - *bs2* defines the location of the transmit point in units of the time quanta;
-       it can be between 1 and 16 inclusive
+     - *prescaler* is the value by which the CAN input clock is divided to generate the
+       nominal bit time quanta. The prescaler can be a value between 1 and 1024 inclusive
+       for classic CAN, and between 1 and 512 inclusive for CAN FD.
+     - *sjw* is the resynchronisation jump width in units of time quanta for nominal bits;
+       it can be a value between 1 and 4 inclusive for classic CAN, and between 1 and 128 inclusive for CAN FD.
+     - *bs1* defines the location of the sample point in units of the time quanta for nominal bits;
+       it can be a value between 1 and 16 inclusive for classic CAN, and between 2 and 256 inclusive for CAN FD.
+     - *bs2* defines the location of the transmit point in units of the time quanta for nominal bits;
+       it can be a value between 1 and 8 inclusive for classic CAN, and between 2 and 128 inclusive for CAN FD.
      - *auto_restart* sets whether the controller will automatically try and restart
        communications after entering the bus-off state; if this is disabled then
        :meth:`~CAN.restart()` can be used to leave the bus-off state
      - *baudrate* if a baudrate other than 0 is provided, this function will try to automatically
-       calculate a CAN bit-timing (overriding *prescaler*, *bs1* and *bs2*) that satisfies both
-       the baudrate and the desired *sample_point*.
-     - *sample_point* given in a percentage of the bit time, the *sample_point* specifies the position
-       of the last bit sample with respect to the whole bit time. The default *sample_point* is 75%.
+       calculate the CAN nominal bit time (overriding *prescaler*, *bs1* and *bs2*) that satisfies
+       both the baudrate and the desired *sample_point*.
+     - *sample_point* given in a percentage of the nominal bit time, the *sample_point* specifies the position
+       of the bit sample with respect to the whole nominal bit time. The default *sample_point* is 75%.
+     - *num_filter_banks* for classic CAN, this is the number of banks that will be assigned to CAN(1),
+       the rest of the 28 are assigned to CAN(2).
+     - *brs_prescaler* is the value by which the CAN FD input clock is divided to generate the
+       data bit time quanta. The prescaler can be a value between 1 and 32 inclusive.
+     - *brs_sjw* is the resynchronisation jump width in units of time quanta for data bits;
+       it can be a value between 1 and 16 inclusive
+     - *brs_bs1* defines the location of the sample point in units of the time quanta for data bits;
+       it can be a value between 1 and 32 inclusive
+     - *brs_bs2* defines the location of the transmit point in units of the time quanta for data bits;
+       it can be a value between 1 and 16 inclusive
+     - *brs_baudrate* if a baudrate other than 0 is provided, this function will try to automatically
+       calculate the CAN data bit time (overriding *brs_prescaler*, *brs_bs1* and *brs_bs2*) that satisfies
+       both the baudrate and the desired *brs_sample_point*.
+     - *brs_sample_point* given in a percentage of the data bit time, the *brs_sample_point* specifies the position
+       of the bit sample with respect to the whole data bit time. The default *brs_sample_point* is 75%.
+
 
    The time quanta tq is the basic unit of time for the CAN bus.  tq is the CAN
    prescaler value divided by PCLK1 (the frequency of internal peripheral bus 1);
@@ -140,17 +154,17 @@ Methods
    - number of pending RX messages on fifo 0
    - number of pending RX messages on fifo 1
 
-.. method:: CAN.setfilter(bank, mode, fifo, params, *, rtr)
+.. method:: CAN.setfilter(bank, mode, fifo, params, *, rtr, extframe=False)
 
    Configure a filter bank:
 
-   - *bank* is the filter bank that is to be configured.
-   - *mode* is the mode the filter should operate in.
+   - *bank* is the classic CAN controller filter bank, or CAN FD filter index, to configure.
+   - *mode* is the mode the filter should operate in, see the tables below.
    - *fifo* is which fifo (0 or 1) a message should be stored in, if it is accepted by this filter.
    - *params* is an array of values the defines the filter. The contents of the array depends on the *mode* argument.
 
    +-----------+---------------------------------------------------------+
-   |*mode*     |contents of *params* array                               |
+   |*mode*     |Contents of *params* array for classic CAN controller    |
    +===========+=========================================================+
    |CAN.LIST16 |Four 16 bit ids that will be accepted                    |
    +-----------+---------------------------------------------------------+
@@ -165,10 +179,20 @@ Methods
    |CAN.MASK32 |As with CAN.MASK16 but with only one 32 bit id/mask pair.|
    +-----------+---------------------------------------------------------+
 
-   - *rtr* is an array of booleans that states if a filter should accept a
-     remote transmission request message.  If this argument is not given
-     then it defaults to ``False`` for all entries.  The length of the array
-     depends on the *mode* argument.
+   +-----------+---------------------------------------------------------+
+   |*mode*     |Contents of *params* array for CAN FD controller         |
+   +===========+=========================================================+
+   |CAN.RANGE  |Two ids that represent a range of accepted ids.          |
+   +-----------+---------------------------------------------------------+
+   |CAN.DUAL   |Two ids that will be accepted. For example (1, 2)        |
+   +-----------+---------------------------------------------------------+
+   |CAN.MASK   |One filter ID and a mask. For example (0x111, 0x7FF)     |
+   +-----------+---------------------------------------------------------+
+
+   - *rtr* For classic CAN controllers, this is an array of booleans that states if
+     a filter should accept a remote transmission request message. If this argument
+     is not given then it defaults to ``False`` for all entries. The length of the
+     array depends on the *mode* argument. For CAN FD, this argument is ignored.
 
    +-----------+----------------------+
    |*mode*     |length of *rtr* array |
@@ -182,11 +206,17 @@ Methods
    |CAN.MASK32 |1                     |
    +-----------+----------------------+
 
-.. method:: CAN.clearfilter(bank)
+   - *extframe* If True the frame will have an extended identifier (29 bits),
+     otherwise a standard identifier (11 bits) is used.
+
+
+.. method:: CAN.clearfilter(bank, extframe=False)
 
    Clear and disables a filter bank:
 
-   - *bank* is the filter bank that is to be cleared.
+   - *bank* is the classic CAN controller filter bank, or CAN FD filter index, to clear.
+   - *extframe* For CAN FD controllers, if True, clear an extended filter (configured with extframe=True),
+     otherwise the clear a standard identifier (configured with extframe=False).
 
 .. method:: CAN.any(fifo)
 
@@ -200,21 +230,22 @@ Methods
      - *list* is an optional list object to be used as the return value
      - *timeout* is the timeout in milliseconds to wait for the receive.
 
-   Return value: A tuple containing four values.
+   Return value: A tuple containing five values.
 
      - The id of the message.
+     - A boolean that indicates if the message ID is standard or extended.
      - A boolean that indicates if the message is an RTR message.
      - The FMI (Filter Match Index) value.
      - An array containing the data.
 
    If *list* is ``None`` then a new tuple will be allocated, as well as a new
-   bytes object to contain the data (as the fourth element in the tuple).
+   bytes object to contain the data (as the fifth element in the tuple).
 
-   If *list* is not ``None`` then it should be a list object with a least four
-   elements.  The fourth element should be a memoryview object which is created
+   If *list* is not ``None`` then it should be a list object with a least five
+   elements.  The fifth element should be a memoryview object which is created
    from either a bytearray or an array of type 'B' or 'b', and this array must
    have enough room for at least 8 bytes.  The list object will then be
-   populated with the first three return values above, and the memoryview object
+   populated with the first four return values above, and the memoryview object
    will be resized inplace to the size of the data and filled in with that data.
    The same list and memoryview objects can be reused in subsequent calls to
    this method, providing a way of receiving data without using the heap.
@@ -225,7 +256,7 @@ Methods
         # No heap memory is allocated in the following call
         can.recv(0, lst)
 
-.. method:: CAN.send(data, id, *, timeout=0, rtr=False)
+.. method:: CAN.send(data, id, *, timeout=0, rtr=False, extframe=False, fdf=False, brs=False)
 
    Send a message on the bus:
 
@@ -236,6 +267,13 @@ Methods
        a remote transmission request.  If *rtr* is True then only the length
        of *data* is used to fill in the DLC slot of the frame; the actual
        bytes in *data* are unused.
+     - *extframe* if True the frame will have an extended identifier (29 bits),
+       otherwise a standard identifier (11 bits) is used.
+     - *fdf* for CAN FD controllers, if set to True, the frame will have an FD
+       frame format, which supports data payloads up to 64 bytes.
+     - *brs* for CAN FD controllers, if set to True, the bitrate switching mode
+       is enabled, in which the data phase is transmitted at a differet bitrate.
+       See :meth:`CAN.init` for the data bit timing configuration parameters.
 
      If timeout is 0 the message is placed in a buffer in one of three hardware
      buffers and the method returns immediately. If all three buffers are in use
@@ -302,4 +340,10 @@ Constants
           CAN.LIST32
           CAN.MASK32
 
-   The operation mode of a filter used in :meth:`~CAN.setfilter()`.
+   The operation mode of a filter used in :meth:`~CAN.setfilter()` for classic CAN.
+
+.. data:: CAN.DUAL
+          CAN.RANGE
+          CAN.MASK
+
+   The operation mode of a filter used in :meth:`~CAN.setfilter()` for CAN FD.

From 71344c15f4ef6efc62fbaeef830fa357ee30dce0 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sat, 2 Apr 2022 22:14:33 +1100
Subject: [PATCH 1877/3533] tests/pyb: Update CAN tests to match revised CAN
 API.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/pyb/can.py      | 51 ++++++++++++++++++++---------------
 tests/pyb/can.py.exp  | 63 +++++++++++++++++++++++--------------------
 tests/pyb/can2.py     | 18 ++++++-------
 tests/pyb/can2.py.exp |  6 ++---
 4 files changed, 76 insertions(+), 62 deletions(-)

diff --git a/tests/pyb/can.py b/tests/pyb/can.py
index 4ea29b0f63a40..020efae0531ac 100644
--- a/tests/pyb/can.py
+++ b/tests/pyb/can.py
@@ -17,14 +17,13 @@
         print("ValueError", bus)
 CAN(1).deinit()
 
-CAN.initfilterbanks(14)
 can = CAN(1)
 print(can)
 
 # Test state when de-init'd
 print(can.state() == can.STOPPED)
 
-can.init(CAN.LOOPBACK)
+can.init(CAN.LOOPBACK, num_filter_banks=14)
 print(can)
 print(can.any(0))
 
@@ -61,7 +60,7 @@
 # Test that recv can work without allocating memory on the heap
 
 buf = bytearray(10)
-l = [0, 0, 0, memoryview(buf)]
+l = [0, 0, 0, 0, memoryview(buf)]
 l2 = None
 
 micropython.heap_lock()
@@ -69,30 +68,30 @@
 can.send("", 42)
 l2 = can.recv(0, l)
 assert l is l2
-print(l, len(l[3]), buf)
+print(l, len(l[4]), buf)
 
 can.send("1234", 42)
 l2 = can.recv(0, l)
 assert l is l2
-print(l, len(l[3]), buf)
+print(l, len(l[4]), buf)
 
 can.send("01234567", 42)
 l2 = can.recv(0, l)
 assert l is l2
-print(l, len(l[3]), buf)
+print(l, len(l[4]), buf)
 
 can.send("abc", 42)
 l2 = can.recv(0, l)
 assert l is l2
-print(l, len(l[3]), buf)
+print(l, len(l[4]), buf)
 
 micropython.heap_unlock()
 
 # Test that recv can work with different arrays behind the memoryview
 can.send("abc", 1)
-print(bytes(can.recv(0, [0, 0, 0, memoryview(array("B", range(8)))])[3]))
+print(bytes(can.recv(0, [0, 0, 0, 0, memoryview(array("B", range(8)))])[4]))
 can.send("def", 1)
-print(bytes(can.recv(0, [0, 0, 0, memoryview(array("b", range(8)))])[3]))
+print(bytes(can.recv(0, [0, 0, 0, 0, memoryview(array("b", range(8)))])[4]))
 
 # Test for non-list passed as second arg to recv
 can.send("abc", 1)
@@ -111,7 +110,7 @@
 # Test for non-memoryview passed as 4th element to recv
 can.send("abc", 1)
 try:
-    can.recv(0, [0, 0, 0, 0])
+    can.recv(0, [0, 0, 0, 0, 0])
 except TypeError:
     print("TypeError")
 
@@ -132,19 +131,21 @@
 del can
 
 # Testing extended IDs
-can = CAN(1, CAN.LOOPBACK, extframe=True)
-# Catch all filter
-can.setfilter(0, CAN.MASK32, 0, (0, 0))
+print("==== TEST extframe=True ====")
+
+can = CAN(1, CAN.LOOPBACK)
+# Catch all filter, but only for extframe's
+can.setfilter(0, CAN.MASK32, 0, (0, 0), extframe=True)
 
 print(can)
 
 try:
-    can.send("abcde", 0x7FF + 1, timeout=5000)
+    can.send("abcde", 0x7FF + 1, timeout=5000, extframe=True)
 except ValueError:
     print("failed")
 else:
     r = can.recv(0)
-    if r[0] == 0x7FF + 1 and r[3] == b"abcde":
+    if r[0] == 0x7FF + 1 and r[4] == b"abcde":
         print("passed")
     else:
         print("failed, wrong data received")
@@ -156,22 +157,24 @@
     id_ok = 0b00001010 << n
     id_fail = 0b00011010 << n
 
-    can.clearfilter(0)
-    can.setfilter(0, pyb.CAN.MASK32, 0, (filter_id, filter_mask))
+    can.clearfilter(0, extframe=True)
+    can.setfilter(0, pyb.CAN.MASK32, 0, (filter_id, filter_mask), extframe=True)
 
-    can.send("ok", id_ok, timeout=3)
+    can.send("ok", id_ok, timeout=3, extframe=True)
     if can.any(0):
         msg = can.recv(0)
-        print((hex(filter_id), hex(filter_mask), hex(msg[0]), msg[3]))
+        print((hex(filter_id), hex(filter_mask), hex(msg[0]), msg[1], msg[4]))
 
-    can.send("fail", id_fail, timeout=3)
+    can.send("fail", id_fail, timeout=3, extframe=True)
     if can.any(0):
         msg = can.recv(0)
-        print((hex(filter_id), hex(filter_mask), hex(msg[0]), msg[3]))
+        print((hex(filter_id), hex(filter_mask), hex(msg[0]), msg[1], msg[4]))
 
 del can
 
 # Test RxCallbacks
+print("==== TEST rx callbacks ====")
+
 can = CAN(1, CAN.LOOPBACK)
 can.setfilter(0, CAN.LIST16, 0, (1, 2, 3, 4))
 can.setfilter(1, CAN.LIST16, 1, (5, 6, 7, 8))
@@ -248,6 +251,8 @@ def cb1a(bus, reason):
 del can
 
 # Testing asynchronous send
+print("==== TEST async send ====")
+
 can = CAN(1, CAN.LOOPBACK)
 can.setfilter(0, CAN.MASK16, 0, (0, 0, 0, 0))
 
@@ -277,6 +282,8 @@ def cb1a(bus, reason):
     print(can.recv(0))
 
 # Testing rtr messages
+print("==== TEST rtr messages ====")
+
 bus1 = CAN(1, CAN.LOOPBACK)
 while bus1.any(0):
     bus1.recv(0)
@@ -298,6 +305,8 @@ def cb1a(bus, reason):
 print(bus1.recv(0))
 
 # test HAL error, timeout
+print("==== TEST errors ====")
+
 can = pyb.CAN(1, pyb.CAN.NORMAL)
 try:
     can.send("1", 1, timeout=50)
diff --git a/tests/pyb/can.py.exp b/tests/pyb/can.py.exp
index a27907cc52389..bd8f6d60b609e 100644
--- a/tests/pyb/can.py.exp
+++ b/tests/pyb/can.py.exp
@@ -4,19 +4,19 @@ CAN 1
 ValueError 3
 CAN(1)
 True
-CAN(1, CAN.LOOPBACK, extframe=False, auto_restart=False)
+CAN(1, CAN.LOOPBACK, auto_restart=False)
 False
 True
 [0, 0, 0, 0, 0, 0, 0, 0]
 True [0, 0, 0, 0, 0, 0, 1, 0]
-(123, False, 0, b'abcd')
-(2047, False, 0, b'abcd')
-(0, False, 0, b'abcd')
+(123, False, False, 0, b'abcd')
+(2047, False, False, 0, b'abcd')
+(0, False, False, 0, b'abcd')
 passed
-[42, False, 0, <memoryview>] 0 bytearray(b'\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00')
-[42, False, 0, <memoryview>] 4 bytearray(b'1234\x00\x00\x00\x00\x00\x00')
-[42, False, 0, <memoryview>] 8 bytearray(b'01234567\x00\x00')
-[42, False, 0, <memoryview>] 3 bytearray(b'abc34567\x00\x00')
+[42, False, False, 0, <memoryview>] 0 bytearray(b'\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00')
+[42, False, False, 0, <memoryview>] 4 bytearray(b'1234\x00\x00\x00\x00\x00\x00')
+[42, False, False, 0, <memoryview>] 8 bytearray(b'01234567\x00\x00')
+[42, False, False, 0, <memoryview>] 3 bytearray(b'abc34567\x00\x00')
 b'abc'
 b'def'
 TypeError
@@ -24,12 +24,14 @@ ValueError
 TypeError
 ValueError
 ValueError
-CAN(1, CAN.LOOPBACK, extframe=True, auto_restart=False)
+==== TEST extframe=True ====
+CAN(1, CAN.LOOPBACK, auto_restart=False)
 passed
-('0x8', '0x1c', '0xa', b'ok')
-('0x800', '0x1c00', '0xa00', b'ok')
-('0x80000', '0x1c0000', '0xa0000', b'ok')
-('0x8000000', '0x1c000000', '0xa000000', b'ok')
+('0x8', '0x1c', '0xa', True, b'ok')
+('0x800', '0x1c00', '0xa00', True, b'ok')
+('0x80000', '0x1c0000', '0xa0000', True, b'ok')
+('0x8000000', '0x1c000000', '0xa000000', True, b'ok')
+==== TEST rx callbacks ====
 cb0
 pending
 cb0
@@ -42,28 +44,31 @@ cb1
 full
 cb1a
 overflow
-(1, False, 0, b'11111111')
-(2, False, 1, b'22222222')
-(4, False, 3, b'44444444')
-(5, False, 0, b'55555555')
-(6, False, 1, b'66666666')
-(8, False, 3, b'88888888')
+(1, False, False, 0, b'11111111')
+(2, False, False, 1, b'22222222')
+(4, False, False, 3, b'44444444')
+(5, False, False, 0, b'55555555')
+(6, False, False, 1, b'66666666')
+(8, False, False, 3, b'88888888')
 cb0a
 pending
 cb1a
 pending
-(1, False, 0, b'11111111')
-(5, False, 0, b'55555555')
+(1, False, False, 0, b'11111111')
+(5, False, False, 0, b'55555555')
+==== TEST async send ====
 False
-(1, False, 0, b'abcde')
+(1, False, False, 0, b'abcde')
 passed
-(2, False, 0, b'abcde')
-(3, False, 0, b'abcde')
-(4, False, 0, b'abcde')
+(2, False, False, 0, b'abcde')
+(3, False, False, 0, b'abcde')
+(4, False, False, 0, b'abcde')
+==== TEST rtr messages ====
 False
-(5, True, 4, b'')
-(6, True, 5, b'')
-(7, True, 6, b'')
+(5, False, True, 4, b'')
+(6, False, True, 5, b'')
+(7, False, True, 6, b'')
 False
-(32, True, 9, b'')
+(32, False, True, 9, b'')
+==== TEST errors ====
 OSError(110,)
diff --git a/tests/pyb/can2.py b/tests/pyb/can2.py
index 46237ad84f78a..2ce438f1af971 100644
--- a/tests/pyb/can2.py
+++ b/tests/pyb/can2.py
@@ -7,19 +7,19 @@
     raise SystemExit
 
 # Testing rtr messages
-bus2 = CAN(2, CAN.LOOPBACK, extframe=True)
+bus2 = CAN(2, CAN.LOOPBACK)
 while bus2.any(0):
     bus2.recv(0)
-bus2.setfilter(0, CAN.LIST32, 0, (1, 2), rtr=(True, True))
-bus2.setfilter(1, CAN.LIST32, 0, (3, 4), rtr=(True, False))
-bus2.setfilter(2, CAN.MASK32, 0, (16, 16), rtr=(False,))
-bus2.setfilter(2, CAN.MASK32, 0, (32, 32), rtr=(True,))
+bus2.setfilter(0, CAN.LIST32, 0, (1, 2), rtr=(True, True), extframe=True)
+bus2.setfilter(1, CAN.LIST32, 0, (3, 4), rtr=(True, False), extframe=True)
+bus2.setfilter(2, CAN.MASK32, 0, (16, 16), rtr=(False,), extframe=True)
+bus2.setfilter(2, CAN.MASK32, 0, (32, 32), rtr=(True,), extframe=True)
 
-bus2.send("", 1, rtr=True)
+bus2.send("", 1, rtr=True, extframe=True)
 print(bus2.recv(0))
-bus2.send("", 2, rtr=True)
+bus2.send("", 2, rtr=True, extframe=True)
 print(bus2.recv(0))
-bus2.send("", 3, rtr=True)
+bus2.send("", 3, rtr=True, extframe=True)
 print(bus2.recv(0))
-bus2.send("", 4, rtr=True)
+bus2.send("", 4, rtr=True, extframe=True)
 print(bus2.any(0))
diff --git a/tests/pyb/can2.py.exp b/tests/pyb/can2.py.exp
index 371ad2bdc435b..3339e5cbecaaf 100644
--- a/tests/pyb/can2.py.exp
+++ b/tests/pyb/can2.py.exp
@@ -1,4 +1,4 @@
-(1, True, 0, b'')
-(2, True, 1, b'')
-(3, True, 2, b'')
+(1, True, True, 0, b'')
+(2, True, True, 1, b'')
+(3, True, True, 2, b'')
 False

From 7a447e08b23f47fac6ebcbe5d60c4e1d0fe0d157 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Fri, 18 Jun 2021 17:12:44 +0200
Subject: [PATCH 1878/3533] docs: Add quickref and docs for mimxrt, including
 network.LAN docs.

---
 docs/index.rst                  |   1 +
 docs/library/machine.PWM.rst    |  12 +
 docs/library/machine.SDCard.rst |  43 ++
 docs/library/network.LAN.rst    |  93 ++++
 docs/library/network.rst        |   1 +
 docs/mimxrt/general.rst         |  92 ++++
 docs/mimxrt/img/teensy_4.1.jpg  | Bin 0 -> 127829 bytes
 docs/mimxrt/quickref.rst        | 864 ++++++++++++++++++++++++++++++++
 docs/mimxrt/tutorial/intro.rst  | 125 +++++
 docs/templates/topindex.html    |   4 +
 10 files changed, 1235 insertions(+)
 create mode 100644 docs/library/network.LAN.rst
 create mode 100644 docs/mimxrt/general.rst
 create mode 100644 docs/mimxrt/img/teensy_4.1.jpg
 create mode 100644 docs/mimxrt/quickref.rst
 create mode 100644 docs/mimxrt/tutorial/intro.rst

diff --git a/docs/index.rst b/docs/index.rst
index a97bff1c8408b..3bc78e9023500 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -12,6 +12,7 @@ MicroPython documentation and references
     esp8266/quickref.rst
     esp32/quickref.rst
     rp2/quickref.rst
+    mimxrt/quickref.rst
     wipy/quickref.rst
     unix/quickref.rst
     zephyr/quickref.rst
diff --git a/docs/library/machine.PWM.rst b/docs/library/machine.PWM.rst
index 793c074a361cb..4b74355775602 100644
--- a/docs/library/machine.PWM.rst
+++ b/docs/library/machine.PWM.rst
@@ -78,6 +78,13 @@ Methods
 
    With a single *value* argument the pulse width is set to that value.
 
+Specific PWM class implementations
+----------------------------------
+
+The following concrete class(es) implement enhancements to the PWM class.
+
+   | :ref:`pyb.Timer for PyBoard <pyb.Timer>`  
+
 Limitations of PWM
 ------------------
 
@@ -90,6 +97,11 @@ Limitations of PWM
   80000000 / 267 = 299625.5 Hz, not 300kHz.  If the divider is set to 266 then
   the PWM frequency will be 80000000 / 266 = 300751.9 Hz, but again not 300kHz.
 
+  Some ports like the RP2040 one use a fractional divider, which allow a finer
+  granularity of the frequency at higher frequencies by switching the PWM
+  pulse duration between two adjacent values, such that the resulting average
+  frequency is more close to the intended one, at the cost of spectral purity. 
+
 * The duty cycle has the same discrete nature and its absolute accuracy is not
   achievable.  On most hardware platforms the duty will be applied at the next
   frequency period.  Therefore, you should wait more than "1/frequency" before
diff --git a/docs/library/machine.SDCard.rst b/docs/library/machine.SDCard.rst
index b07ad37d39b94..cde0bd1d145d9 100644
--- a/docs/library/machine.SDCard.rst
+++ b/docs/library/machine.SDCard.rst
@@ -122,3 +122,46 @@ You can set the pins used for SPI access by passing a tuple as the
 
 *Note:* The current cc3200 SD card implementation names the this class
 :class:`machine.SD` rather than :class:`machine.SDCard` .
+
+mimxrt
+``````
+
+The SDCard module for the mimxrt port only supports access via dedicated SD/MMC
+peripheral (USDHC) in 4-bit mode with 50MHz clock frequency exclusively.
+Unfortunately the MIMXRT1011 controller does not support the USDHC peripheral.
+Hence this controller does not feature the ``machine.SDCard`` module.
+
+Due to the decision to only support 4-bit mode with 50MHz clock frequency the
+interface has been simplified, and the constructor signature is:
+
+.. class:: SDCard(slot=1)
+  :noindex:
+
+The pins used for the USDHC peripheral have to be configured in ``mpconfigboard.h``.
+Most of the controllers supported by the mimxrt port provide up to two USDHC
+peripherals.  Therefore the pin configuration is performed using the macro
+``MICROPY_USDHCx`` with x being 1 or 2 respectively.
+
+The following shows an example configuration for USDHC1::
+
+  #define MICROPY_USDHC1 \
+    { \
+          .cmd   = { GPIO_SD_B0_02_USDHC1_CMD}, \
+          .clk   = { GPIO_SD_B0_03_USDHC1_CLK }, \
+          .cd_b  = { GPIO_SD_B0_06_USDHC1_CD_B },\
+          .data0 = { GPIO_SD_B0_04_USDHC1_DATA0 },\
+          .data1 = { GPIO_SD_B0_05_USDHC1_DATA1 },\
+          .data2 = { GPIO_SD_B0_00_USDHC1_DATA2 },\
+          .data3 = { GPIO_SD_B0_01_USDHC1_DATA3 },\
+    }
+
+If the card detect pin is not used (cb_b pin) then the respective entry has to be
+filled with the following dummy value::
+
+  #define USDHC_DUMMY_PIN NULL , 0
+
+Based on the definition of macro ``MICROPY_USDHC1`` and/or ``MICROPY_USDHC2``
+the ``machine.SDCard`` module either supports one or two slots.  If only one of
+the defines is provided, calling ``machine.SDCard()`` or ``machine.SDCard(1)``
+will return an instance using the respective USDHC peripheral.  When both macros
+are defined, calling ``machine.SDCard(2)`` returns an instance using USDHC2.
diff --git a/docs/library/network.LAN.rst b/docs/library/network.LAN.rst
new file mode 100644
index 0000000000000..58bd61ebbd873
--- /dev/null
+++ b/docs/library/network.LAN.rst
@@ -0,0 +1,93 @@
+.. currentmodule:: network
+.. _network.LAN:
+
+class LAN -- control an Ethernet module
+=======================================
+
+This class allows you to control the Ethernet interface. The PHY hardware type is board-specific.
+
+Example usage::
+
+    import network
+    nic = network.LAN(0)
+    print(nic.ifconfig())
+
+    # now use socket as usual
+    ...
+
+
+Constructors
+------------
+
+.. class:: LAN(id, *, phy_type=<board_default>, phy_addr=<board_default>, phy_clock=<board_default>)
+
+   Create a LAN driver object, initialise the LAN module using the given
+   PHY driver name, and return the LAN object.
+
+   Arguments are:
+
+     - *id* is the number of the Ethernet port, either 0 or 1.
+     - *phy_type* is the name of the PHY driver. For most board the on-board PHY has to be used and
+       is the default. Suitable values are port specific.
+     - *phy_addr* specifies the address of the PHY interface. As with *phy_type*, the hardwired value has
+       to be used for most boards and that value is the default.
+     - *phy_clock* specifies, whether the data clock is provided by the Ethernet controller or the PYH interface.
+       The default value is the one that matches the board. If set to ``True``, the clock is driven by the
+       Ethernet controller, otherwise by the PHY interface.
+
+   For example, with the Seeed Arch Mix board you can  use::
+
+     nic = LAN(0, phy_type=LAN.PHY_LAN8720, phy_addr=2, phy_clock=False)
+
+Methods
+-------
+
+.. method:: LAN.active([state])
+
+   With a parameter, it sets the interface active if *state* is true, otherwise it
+   sets it inactive.
+   Without a parameter, it returns the state.
+
+.. method:: LAN.isconnected()
+
+   Returns ``True`` if the physical Ethernet link is connected and up.
+   Returns ``False`` otherwise.
+
+.. method:: LAN.status()
+
+   Returns the LAN status.
+
+.. method:: LAN.ifconfig([(ip, subnet, gateway, dns)])
+
+   Get/set IP address, subnet mask, gateway and DNS.
+
+   When called with no arguments, this method returns a 4-tuple with the above information.
+
+   To set the above values, pass a 4-tuple with the required information.  For example::
+
+    nic.ifconfig(('192.168.0.4', '255.255.255.0', '192.168.0.1', '8.8.8.8'))
+
+.. method:: LAN.config(config_parameters)
+
+   Sets or gets parameters of the LAN interface. The only parameter that can be
+   retrieved is the MAC address, using::
+
+      mac = LAN.config("mac")
+
+   The parameters that can be set are:
+
+    - ``trace=n`` sets trace levels; suitable values are:
+
+        - 2: trace TX
+        - 4: trace RX
+        - 8: full trace
+
+    - ``low_power=bool`` sets or clears low power mode, valid values being ``False``
+      or ``True``.
+
+
+Specific LAN class implementations
+----------------------------------
+
+On the mimxrt port, suitable values for the *phy_type* constructor argument are:
+``PHY_KSZ8081``, ``PHY_DP83825``, ``PHY_DP83848``, ``PHY_LAN8720``, ``PHY_RTL8211F``.
diff --git a/docs/library/network.rst b/docs/library/network.rst
index 1bd7e303bb636..361e664b548cb 100644
--- a/docs/library/network.rst
+++ b/docs/library/network.rst
@@ -152,6 +152,7 @@ provide a way to control networking interfaces of various kinds.
    network.WLANWiPy.rst
    network.CC3K.rst
    network.WIZNET5K.rst
+   network.LAN.rst
 
 Network functions
 =================
diff --git a/docs/mimxrt/general.rst b/docs/mimxrt/general.rst
new file mode 100644
index 0000000000000..d08e180e7ffe5
--- /dev/null
+++ b/docs/mimxrt/general.rst
@@ -0,0 +1,92 @@
+.. _mimxrt_general:
+
+General information about the MIMXRT port
+=========================================
+
+The i.MXRT MCU family is a high performance family of devices made by NXP.
+Based on an ARM7 core, they provide many on-chip I/O units for building
+small to medium sized devices.
+
+Multitude of boards
+-------------------
+
+There is a multitude of modules and boards from different sources which carry
+an i.MXRT chip.  MicroPython aims to provide a generic port which runs on
+as many boards/modules as possible, but there may be limitations.  The
+NXP IMXRT1020-EVK and the Teensy 4.0 and Teensy 4.1 development boards are taken
+as reference for the port (for example, testing is performed on them).
+For any board you are using please make sure you have a data sheet, schematics
+and other reference materials so you can look up any board-specific functions.
+
+The following boards are supported by the port:
+
+- MIMXRT1010-EVK
+- MIMXRT1020-EVK
+- MIMXRT1050-EVK
+- MIMXRT1060-EVK
+- MIMXRT1064-EVK
+- Teensy 4.0
+- Teensy 4.1
+
+Supported MCUs
+--------------
+
++-------------+--------------------+-------------------------+
+| Product     | CPU                | Memory                  |
++=============+====================+=========================+
+| i.MX RT1064 | Cortex-M7 @600 MHz | 1 MB SRAM, 4 MB Flash   |
++-------------+--------------------+-------------------------+
+| i.MX RT1061 | Cortex-M7 @600 MHz | 1 MB SRAM               |
++-------------+--------------------+-------------------------+
+| i.MX RT1062 | Cortex-M7 @600 MHz | 1 MB SRAM               |
++-------------+--------------------+-------------------------+
+| i.MX RT1050 | Cortex-M7 @600 MHz | 512 kB SRAM             |
++-------------+--------------------+-------------------------+
+| i.MX RT1020 | Cortex-M7 @500 MHz | 256 kB SRAM             |
++-------------+--------------------+-------------------------+
+| i.MX RT1010 | Cortex-M7 @500 MHz | 128 kB SRAM             |
++-------------+--------------------+-------------------------+
+
+Note: Most of the controllers do not have internal flash memory. Therefore
+their flash capacity is dependent on an external flash chip.
+
+To make a generic MIMXRT port and support as many boards as possible the
+following design and implementation decision were made:
+
+* GPIO pin numbering is based on the board numbering as well as on the
+  MCU numbering.  Please have the manual/pin diagram of your board at hand
+  to find correspondence between your board pins and actual i.MXRT pins.
+* All MCU pins are supported by MicroPython but not all are usable on any given board.
+
+Technical specifications and SoC datasheets
+-------------------------------------------
+
+The data sheets and other reference material for i.MXRT chip are available
+from the vendor site: https://www.nxp.com/products/processors-and-microcontrollers/arm-microcontrollers/i-mx-rt-crossover-mcus:IMX-RT-SERIES .
+They are the primary reference for the chip technical specifications, capabilities,
+operating modes, internal functioning, etc.
+
+For your convenience, a few technical specifications are provided below:
+
+* Architecture: ARM Cortex M7
+* CPU frequency: up to 600MHz
+* Total RAM available: up to 1 MByte (see table)
+* BootROM: 96KB
+* External FlashROM: code and data, via SPI Flash; usual size 2 - 8 MB
+  Some boards provide additional external RAM and SPI flash.
+* GPIO: up to 124 (GPIOs are multiplexed with other functions, including
+  external FlashROM, UART, etc.)
+* UART: 4 or 8 RX/TX UART. Hardware handshaking is supported by the MCU,
+  but the boards used for testing do not expose the signals.
+* SPI: 2 or 4 low power SPI interfaces (software implementation available on every pin)
+* I2C: 2 or 4 low power I2C interfaces (software implementation available on every pin)
+* I2S: 3 I2S interfaces
+* ADC: one or two 12-bit SAR ADC converters
+* Ethernet controller
+* Programming: using BootROM bootloader from USB - due to external FlashROM
+  and always-available BootROM bootloader, the MIMXRT is not brickable
+
+The lower numbers for UART, SPI and I2C apply to the i.MXRT 101x MCU.
+
+For more information see the i.MXRT data sheets or reference manuals.
+NXP provides software support through it's SDK packages.
diff --git a/docs/mimxrt/img/teensy_4.1.jpg b/docs/mimxrt/img/teensy_4.1.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..0a09f68ea4f3e201fd606a10fe8bda30e6bf7b31
GIT binary patch
literal 127829
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

literal 0
HcmV?d00001

diff --git a/docs/mimxrt/quickref.rst b/docs/mimxrt/quickref.rst
new file mode 100644
index 0000000000000..b87a343bd8d98
--- /dev/null
+++ b/docs/mimxrt/quickref.rst
@@ -0,0 +1,864 @@
+.. _mimxrt_quickref:
+
+Quick reference for the i.MXRT family
+=====================================
+
+.. image:: img/teensy_4.1.jpg
+    :alt: Teensy 4.1 board
+    :width: 640px
+
+The Teensy 4.1 board.
+
+Below is a quick reference for i.MXRT-based boards.  If it is your first time
+working with this board it may be useful to get an overview of the microcontroller:
+
+.. toctree::
+   :maxdepth: 1
+
+   general.rst
+   tutorial/intro.rst
+
+
+Installing MicroPython
+----------------------
+
+See the corresponding section of tutorial: :ref:`mimxrt_intro`. It also includes
+a troubleshooting subsection.
+
+General board control
+---------------------
+
+The MicroPython REPL is on the USB port, configured in VCP mode.
+Tab-completion is useful to find out what methods an object has.
+Paste mode (ctrl-E) is useful to paste a large slab of Python code into
+the REPL.
+
+The :mod:`machine` module::
+
+    import machine
+
+    machine.freq()          # get the current frequency of the CPU
+
+Delay and timing
+----------------
+
+Use the :mod:`time <time>` module::
+
+    import time
+
+    time.sleep(1)           # sleep for 1 second
+    time.sleep_ms(500)      # sleep for 500 milliseconds
+    time.sleep_us(10)       # sleep for 10 microseconds
+    start = time.ticks_ms() # get millisecond counter
+    delta = time.ticks_diff(time.ticks_ms(), start) # compute time difference
+
+Timers
+------
+
+The i.MXRT port has three hardware timers. Use the :ref:`machine.Timer <machine.Timer>` class
+with a timer ID from 0 to 2 (inclusive)::
+
+    from machine import Timer
+
+    tim0 = Timer(0)
+    tim0.init(period=5000, mode=Timer.ONE_SHOT, callback=lambda t:print(0))
+
+    tim1 = Timer(1)
+    tim1.init(period=2000, mode=Timer.PERIODIC, callback=lambda t:print(1))
+
+The period is in milliseconds.
+
+Virtual timers are not currently supported on this port.
+
+.. _mimxrt_Pins_and_GPIO:
+
+Pins and GPIO
+-------------
+
+Use the :ref:`machine.Pin <machine.Pin>` class::
+
+    from machine import Pin
+
+    p0 = Pin('D0', Pin.OUT) # create output pin on GPIO0
+    p0.on()                 # set pin to "on" (high) level
+    p0.off()                # set pin to "off" (low) level
+    p0.value(1)             # set pin to on/high
+
+    p2 = Pin('D2', Pin.IN)  # create input pin on GPIO2
+    print(p2.value())       # get value, 0 or 1
+
+    p4 = Pin('D4', Pin.IN, Pin.PULL_UP) # enable internal pull-up resistor
+    p5 = Pin('D5', Pin.OUT, value=1) # set pin high on creation
+
+    p6 = Pin(pin.cpu.GPIO_B1_15, Pin.OUT) # Use the cpu pin name.
+
+Available Pins follow the ranges and labelling of the respective board, like:
+
+- 0-33 for Teensy 4.0,
+- 0-21 for the MIMXRT10xx-EVK board, or 'D0-Dxx', or 'A0-Ann',
+- 0-14 for the Olimex RT1010Py board, or 'D0'-'Dxx' and 'A0'-'Ann'
+- 'J3_xx', 'J4_xx', 'J5_xx' for the Seeed ARCH MIX board,
+
+or the pin names of the Pin.board or Pin.cpu classes.
+
+Notes:
+
+* The MIMXRT1xxx-EVK boards may have other on-board devices connected to these
+  pins, limiting it's use for input or output.
+* At the MIMXRT1010_EVK, pins D4, D5 and D9 of the Arduino connector are by
+  default not connected to the MCU. For details refer to the schematics.
+* At the MIMXRT1170_EVK board, the inner rows of the Arduino connectors are assigned as follows:
+    - D16 - D23: J9, odd pin numbers; D17 is by default not connected.
+    - D24 - D27: J26, odd pin numbers; J63-J66 have to be closed to enable these pins.
+    - D29 - D36: J25, odd pin numbers; D29 and D30 are by default not connected.
+
+There's a higher-level abstraction :ref:`machine.Signal <machine.Signal>`
+which can be used to invert a pin.  Useful for illuminating active-low LEDs
+using ``on()`` or ``value(1)``.
+
+UART (serial bus)
+-----------------
+
+See :ref:`machine.UART <machine.UART>`. ::
+
+    from machine import UART
+
+    uart1 = UART(1, baudrate=115200)
+    uart1.write('hello')  # write 5 bytes
+    uart1.read(5)         # read up to 5 bytes
+
+The i.MXRT has up to eight hardware UARTs, but not every board exposes all
+TX and RX pins for users.  The pin assignment of UARTs to pins is fixed.
+The UARTs are numbered 1..8.  The rx/tx pins are assigned according to the
+tables below:
+
+================  ===========  ===========  ===========  ===========
+Board / Pin           UART0        UART1        UART2        UART3
+================  ===========  ===========  ===========  ===========
+Teensy 4.0             -            0/1          7/8         14/15
+Teensy 4.1             -            0/1          7/8         14/15
+MIMXRT1010-EVK     Debug USB      D0/D1        D7/D6           -
+MIMXRT1015-EVK     Debug USB      D0/D1        D7/A1           -
+MIMXRT1020-EVK     Debug USB      D0/D1        D9/D6       D10/D13
+MIMXRT1050-EVK     Debug USB      D0/D1        D7/D6        D8/D9
+MIMXRT1050-EVKB    Debug USB      D0/D1        D7/D6        D8/D9
+MIMXRT1060-EVK     Debug USB      D0/D1        D7/D6        D8/D9
+MIMXRT1064-EVK     Debug USB      D0/D1        D7/D6        D8/D9
+MIMXRT1170-EVK     Debug USB      D0/D1       D12/D11      D10/D13
+Olimex RT1010Py       -          RxD/TxD       D5/D6           -
+Seeed ARCH MIX        -        J3_19/J3_20  J4_16/J4_17  J4_06/J4_07
+================  ===========  ===========  ===========  ===========
+
+================  ===========  ===========  =======  =======  =====
+Board / Pin           UART4        UART5      UART6    UART7   UART8
+================  ===========  ===========  =======  =======  =====
+Teensy 4.0            16/17        21/20     25/24    28/29      -
+Teensy 4.1            16/17        21/20     25/24    28/29    34/35
+MIMXRT1010-EVK         -            -         -        -        -
+MIMXRT1015-EVK         -            -         -        -        -
+MIMXRT1020-EVK      D15/D14       A1/A0       -        -        -
+MIMXRT1050-EVK       A1/A0          -         -        -        -
+MIMXRT1050-EVKB      A1/A0          -         -        -        -
+MIMXRT1060-EVK       A1/A0          -         -        -        -
+MIMXRT1064-EVK       A1/A0          -         -        -        -
+MIMXRT1170-EVK      D15/D14      D25/D26    D33/D34  D35/D36    -
+Olimex RT1010Py        -            -         -        -        -
+Seeed ARCH MIX    J4_10/J4_11  J5_08/J5_12    -        -        -
+================  ===========  ===========  =======  =======  =====
+
+PWM (pulse width modulation)
+----------------------------
+
+The i.MXRT has up to four dedicated PWM modules with four FLEXPWM submodules each
+and up to four QTMR modules with four channels, which can be used to generate
+a PWM signal or signal pair.
+
+The PWM functions are provided by the :ref:`machine.PWM <machine.PWM>` class.
+It supports all basic methods listed for that class and a few additional methods for
+handling signal groups. ::
+
+    # Samples for Teensy
+    #
+
+    from machine import Pin, PWM
+
+    pwm2 = PWM(Pin(2))      # create PWM object from a pin
+    pwm2.freq()             # get current frequency
+    pwm2.freq(1000)         # set frequency
+    pwm2.duty_u16()         # get current duty cycle, range 0-65535
+    pwm2.duty_u16(200)      # set duty cycle, range 0-65535
+    pwm2.deinit()           # turn off PWM on the pin
+    # create a complementary signal pair on Pin 2 and 3
+    pwm2 = PWM((2, 3), freq=2000, duty_ns=20000)
+
+    # Create a group of four synchronized signals.
+    # Start with Pin(4) at submodule 0, which creates the sync pulse.
+    pwm4 = PWM(Pin(4), freq=1000, align=PWM.HEAD)
+    # Pins 5, 6, and 9 are pins at the same module
+    pwm5 = PWM(Pin(5), freq=1000, duty_u16=10000, align=PWM.HEAD, sync=True)
+    pwm6 = PWM(Pin(6), freq=1000, duty_u16=20000, align=PWM.HEAD, sync=True)
+    pwm9 = PWM(Pin(9), freq=1000, duty_u16=30000, align=PWM.HEAD, sync=True)
+
+    pwm3                    # show the PWM objects properties
+
+
+PWM Constructor
+```````````````
+
+.. class:: PWM(dest, freq, duty_u16, duty_ns, *, center, align, invert, sync, xor, deadtime)
+  :noindex:
+
+    Construct and return a new PWM object using the following parameters:
+
+      - *dest* is the entity on which the PWM is output, which is usually a
+        :ref:`machine.Pin <machine.Pin>` object, but a port may allow other values,
+        like integers or strings, which designate a Pin in the machine.PIN class.
+        *dest* is either a single object or a two element object tuple.
+        If the object tuple is specified, the two pins act in complementary
+        mode. These two pins must be the A/B channels of the same submodule.
+
+    PWM objects are either provided by a FLEXPWM module or a QTMR module.
+    The i.MXRT devices have either two or four FLEXPWM and QTMR modules.
+    Each FLEXPWM module has four submodules with three channels, each,
+    called A, B and X.  Each QTMR module has four channels.
+    Each FLEXPWM submodule or QTMR channel may be set to different parameters.
+    Not every channel is routed to a board pin.  Details are listed below.
+
+    Setting *freq* affects the three channels of the same FLEXPWM submodule.
+    Only one of *duty_u16* and *duty_ns* should be specified at a time.
+
+    Keyword arguments:
+
+      - *freq* should be an integer which sets the frequency in Hz for the
+        PWM cycle. The valid frequency range is 15 Hz resp. 18Hz resp. 24Hz up to > 1 MHz.
+      - *duty_u16* sets the duty cycle as a ratio ``duty_u16 / 65536``.
+        The duty cycle of a X channel can only be changed, if the A and B channel
+        of the respective submodule is not used. Otherwise the duty_16 value of the
+        X channel is 32768 (50%).
+      - *duty_ns* sets the pulse width in nanoseconds. The limitation for X channels
+        apply as well.
+      - *center*\=value. An integer sets the center of the pulse within the pulse period.
+        The range is 0-65535. The resulting pulse will last from center - duty_u16/2 to
+        center + duty_u16/2.
+      - *align*\=value. Shortcuts for the pulse center setting, causing the pulse either at
+        the center of the frame (value=0), the leading edge at the begin (value=1) or the
+        trailing edge at the end of a pulse period (value=2).
+      - *invert*\=True|False channel_mask. Setting a bit in the mask inverts the respective channel.
+        Bit 0 inverts the first specified channel, bit 2 the second. The default is 0.
+      - *sync*\=True|False. If a channel of a module's submodule 0 is already active, other
+        submodules of the same module can be forced to be synchronous to submodule 0. Their
+        pulse period start then at at same clock cycle. The default is False.
+      - *xor*\=0|1|2. If set to 1 or 2, the channel will output the XOR'd signal from channels
+        A or B. If set to 1 on channel A or B, both A and B will show the same signal. If set
+        to 2, A and B will show alternating signals. For details and an illustration, please
+        refer to the MCU's reference manual, chapter "Double Switching PWMs".
+      - *deadtime*\=time_ns. This setting affects complementary channels and defines a deadtime
+        between an edge of a first channel and the edge of the next channel, in which both
+        channels are set to low. That allows connected H-bridges to switch off one side
+        of a push-pull driver before switching on the other side.
+
+PWM Methods
+```````````
+
+The methods are identical to the generic :ref:`machine.PWM <machine.PWM>` class,
+with additional keyword arguments to the init() method, matchings those of the constructor.
+
+Each FLEX submodule or QTMR module may run at different frequencies.  The PWM signal
+is created by dividing the pwm_clk signal by an integral factor, according to the formula::
+
+    f = pwm_clk / (2**n * m)
+
+with n being in the range of 0..7, and m in the range of 2..65536. pmw_clk is 125Mhz
+for MIMXRT1010/1015/1020, 150 MHz for MIMXRT1050/1060/1064 and 160MHz for MIMXRT1170.
+The lowest frequency is pwm_clk/2**23 (15, 18, 20Hz). The highest frequency with
+U16 resolution is pwm_clk/2**16 (1907, 2288, 2441 Hz), the highest frequency
+with 1 percent resolution is pwm_clk/100 (1.25, 1.5, 1.6 MHz). The highest achievable
+frequency is pwm_clk/3 for the A/B channels, and pwm_clk/2 for the X channels and QTMR
+signal.
+
+PWM Pin Assignment
+``````````````````
+
+Pins are specified in the same way as for the Pin class.  The following tables show
+the assignment of the board Pins to PWM modules:
+
+===========   ==========   ==========   ======    ==============   ======
+Pin/ MIMXRT   1010         1015         1020      1050/1060/1064   1170
+===========   ==========   ==========   ======    ==============   ======
+D0            -            Q1/1         F1/1/B    -                -
+D1            -            Q1/0         F1/1/A    -                -
+D2            F1/3/B       F1/3/A       -         F1/3/B           -
+D3            F1/3/A       F1/0/A       F2/3/B    F4/0/A           F1/2/A
+D4            F1/3/A (*)   Q1/2         Q2/1      F2/3/A           Q4/2
+D5            F1/0/B (*)   F1/0/B       F2/3/A    F1/3/A           F1/2/B
+D6            -            F1/2/B       F2/0/A    Q3/2             F1/0/A
+D7            -            -            F1/0/A    Q3/3             -
+D8            F1/0/A       F1/1/B       F1/0/B    F1/1/X           Q4/3
+D9            F1/1/B (*)   F1/2/A       F2/0/B    F1/0/X           F1/0/B
+D10           F1/3/B       -            F2/2/B    F1/0/B (*)       F2/2/B
+D11           F1/2/A       -            F2/1/A    F1/1/A (*)       -
+D12           F1/2/B       -            F2/1/B    F1/1/B (*)       -
+D13           F1/3/A       -            F2/2/A    F1/0/A (*)       F2/2/A
+D14           F1/0/B       -            -         F2/3/B           -
+D15           F1/0/A       -            -         F2/3/A           -
+A0            -            -            F1/2/A    -                -
+A1            F1/3/X       F1/3/B       F1/2/B    -                -
+A2            F1/2/X       F1/3/A       F1/3/A    -                -
+A3            -            F1/2/A       F1/3/B    -                -
+A4            -            -            -         Q3/1             -
+A5            -            -            -         Q3/0             -
+D31           -            -            -         -                F1/2/B
+D32           -            -            -         -                F1/2/A
+D33           -            -            -         -                F1/1/B
+D34           -            -            -         -                F1/1/A
+D35           -            -            -         -                F1/0/B
+D36           -            -            -         -                F1/0/A
+===========   ==========   ==========   ======    ==============   ======
+
+Pins denoted with (*) are by default not wired at the board.
+
+====   ==========  ====   ==========
+Pin    Teensy 4.0  Pin    Teensy 4.1
+====   ==========  ====   ==========
+0      F1/1/X      0      F1/1/X
+1      F1/0/X      1      F1/0/X
+2      F4/2/A      2      F4/2/A
+3      F4/2/B      3      F4/2/B
+4      F2/0/A      4      F2/0/A
+5      F2/1/A      5      F2/1/A
+6      F2/2/A      6      F2/2/A
+7      F1/3/B      7      F1/3/B
+8      F1/3/A      8      F1/3/A
+9      F2/2/B      9      F2/2/B
+10     Q1/0        10     Q1/0
+11     Q1/2        11     Q1/2
+12     Q1/1        12     Q1/1
+13     Q2/0        13     Q2/0
+14     Q3/2        14     Q3/2
+15     Q3/3        15     Q3/3
+18     Q3/1        18     Q3/1
+19     Q3/0        19     Q3/0
+22     F4/0/A      22     F4/0/A
+23     F4/1/A      23     F4/1/A
+24     F1/2/X      24     F1/2/X
+25     F1/3/X      25     F1/3/X
+28     F3/1/B      28     F3/1/B
+29     F3/1/A      29     F3/1/A
+33     F2/0/B      33     F2/0/B
+-      -           36     F2/3/A
+-      -           37     F2/3/B
+DAT1   F1/1/B      42     F1/1/B
+DAT0   F1/1/A      43     F1/1/A
+CLK    F1/0/B      44     F1/0/B
+CMD    F1/0/A      45     F1/0/A
+DAT2   F1/2/A      46     F1/2/A
+DAT3   F1/2/B      47     F1/2/B
+-      -           48     F1/0/B
+-      -           49     F1/2/A
+-      -           50     F1/2/B
+-      -           51     F3/3/B
+-      -           52     F1/1/B
+-      -           53     F1/1/A
+-      -           54     F3/0/A
+====   ==========  ====   ==========
+
+=========  ==============
+Pin        Seeed ARCH MIX
+=========  ==============
+J3_04      Q4/3
+J3_10      Q1/3
+J3_12      Q2/3
+J3_13      Q3/3
+J3_16      Q3/0
+J3_17      Q3/1
+J3_19      F1/3/X
+J3_20      F1/2/X
+J4_08      F4/0/A
+J4_09      F4/1/A
+J4_16      Q3/2
+J4_17      Q3/3
+J5_32      Q1/0
+J5_28      Q1/1
+J5_29      Q1/2
+J5_30      Q2/0
+J5_04      Q2/1
+J5_05      Q2/3
+J5_06      F2/0/A
+J5_07      F2/0/B
+J5_08      F2/1/A
+J5_12      F2/1/B
+J5_13      F2/2/A
+J5_14      F2/2/B
+J5_23      F1/3/A
+J5_24      F1/3/B
+J5_25      F2/3/A
+J5_26      F2/3/B
+J5_42      Q3/0
+J5_43      Q3/1
+J5_50      F1/0/X
+LED_RED    F2/3/A
+LED_GREEN  F1/3/A
+LED_BLUE   F1/3/B
+=========  ==============
+
+=========  ===============
+Pin        Olimex RT1010PY
+=========  ===============
+D0           -
+D1         F1/0/B
+D2         F1/0/A
+D3         F1/1/B
+D4         F1/1/A
+D5         F1/2/B
+D6         F1/2/A
+D7         F1/3/B
+D8         F1/3/A
+D9            -
+D10        F1/0/B
+D11        F1/0/A
+D12        F1/1/B
+D13        F1/1/A
+D14           -
+A0            -
+A1         F1/2/B
+A2         F1/2/A
+A3         F1/3/B
+A4         F1/3/A
+SDI        F1/3/X
+SDO        F1/2/X
+CS0        F1/1/X
+SCK        F1/0/X
+=========  ===============
+
+Legend:
+
+* Qm/n:    QTMR module m, channel n
+* Fm/n/l:  FLEXPWM module m, submodule n, channel l. The pulse at a X channel
+  is always aligned to the period start.
+
+Pins without a PWM signal are not listed.  A signal may be available at more
+than one Pin.  FlexPWM pins may also be pure CPU pin, not assigned to a board
+signal.  In that case the PWM output is disabled.  The PWM channel of a submodule
+0 may still be used as synchronization source for other channels of the same
+module, unless used by another peripheral.
+
+Submodule 0 pins for i.MX RT1011:
+
+==================  =======
+Pin                 Channel
+==================  =======
+Pin.cpu.GPIO_01     B
+Pin.cpu.GPIO_02     A
+Pin.cpu.GPIO_AD_12  X
+Pin.cpu.GPIO_SD_01  B
+Pin.cpu.GPIO_SD_02  A
+==================  =======
+
+Submodule 0 pins for i.MX RT1021:
+
+=====================  ==================
+Pin                    Module & Channel
+=====================  ==================
+Pin.cpu.GPIO_AD_B1_06  FLEXPWM1 Channel A
+Pin.cpu.GPIO_AD_B1_07  FLEXPWM1 Channel B
+Pin.cpu.GPIO_EMC_26    FLEXPWM1 Channel A
+Pin.cpu.GPIO_EMC_27    FLEXPWM1 Channel B
+Pin.cpu.GPIO_AD_B0_14  FLEXPWM2 Channel A
+Pin.cpu.GPIO_AD_B0_15  FLEXPWM2 Channel B
+Pin.cpu.GPIO_EMC_10    FLEXPWM2 Channel X
+Pin.cpu.GPIO_EMC_38    FLEXPWM2 Channel A
+Pin.cpu.GPIO_EMC_39    FLEXPWM2 Channel B
+=====================  ==================
+
+Submodule 0 pins for i.MX RT1052, i.MX RT1062 and i.MX RT1064:
+
+=====================  ==================
+Pin                    Module & Channel
+=====================  ==================
+Pin.cpu.GPIO_AD_B0_02  FLEXPWM1 Channel X
+Pin.cpu.GPIO_EMC_23    FLEXPWM1 Channel A
+Pin.cpu.GPIO_EMC_24    FLEXPWM1 Channel B
+Pin.cpu.GPIO_SD_B0_00  FLEXPWM1 Channel A
+Pin.cpu.GPIO_SD_B0_01  FLEXPWM1 Channel B
+Pin.cpu.GPIO_B0_06     FLEXPWM2 Channel A
+Pin.cpu.GPIO_B0_07     FLEXPWM2 Channel B
+Pin.cpu.GPIO_EMC_06    FLEXPWM2 Channel A
+Pin.cpu.GPIO_EMC_07    FLEXPWM2 Channel B
+Pin.cpu.GPIO_EMC_29    FLEXPWM3 Channel A
+Pin.cpu.GPIO_EMC_30    FLEXPWM3 Channel B
+Pin.cpu.GPIO_AD_B1_08  FLEXPWM4 Channel A
+Pin.cpu.GPIO_EMC_00    FLEXPWM4 Channel A
+Pin.cpu.GPIO_EMC_01    FLEXPWM4 Channel B
+=====================  ==================
+
+Submodule 0 pins for i.MX RT1176
+
+======================  ======================
+Pin                     Module & Channel
+======================  ======================
+Pin.cpu.GPIO_EMC_B1_00  FLEXPWM4 Channel A (*)
+Pin.cpu.GPIO_EMC_B1_01  FLEXPWM4 Channel B (*)
+Pin.cpu.GPIO_EMC_B1_06  FLEXPWM2 Channel A (*)
+Pin.cpu.GPIO_EMC_B1_07  FLEXPWM2 Channel B (*)
+Pin.cpu.GPIO_EMC_B1_23  FLEXPWM1 Channel A (*)
+Pin.cpu.GPIO_EMC_B1_24  FLEXPWM1 Channel B (*)
+Pin.cpu.GPIO_EMC_B1_29  FLEXPWM3 Channel A (*)
+Pin.cpu.GPIO_EMC_B1_30  FLEXPWM3 Channel B (*)
+Pin.cpu.GPIO_AD_00      FLEXPWM1 Channel A
+Pin.cpu.GPIO_AD_01      FLEXPWM1 Channel B
+Pin.cpu.GPIO_AD_24      FLEXPWM2 Channel A
+Pin.cpu.GPIO_AD_25      FLEXPWM2 Channel B
+======================  ======================
+
+(*) Pin used for SDRAM
+
+ADC (analog to digital conversion)
+----------------------------------
+
+On the i.MXRT ADC functionality is available on Pins labeled 'Ann'.
+
+Use the :ref:`machine.ADC <machine.ADC>` class::
+
+    from machine import ADC
+
+    adc = ADC(Pin(32))          # create ADC object on ADC pin
+    adc.read_u16()              # read value, 0-65536 across voltage range 0.0v - 3.3v
+
+The resolution of the ADC is 12 bit with 10 to 11 bit accuracy, irrespective of the
+value returned by read_u16(). If you need a higher resolution or better accuracy, use
+an external ADC.
+
+Software SPI bus
+----------------
+
+Software SPI (using bit-banging) works on all pins, and is accessed via the
+:ref:`machine.SoftSPI <machine.SoftSPI>` class. ::
+
+    from machine import Pin, SoftSPI
+
+    # construct a SoftSPI bus on the given pins
+    # polarity is the idle state of SCK
+    # phase=0 means sample on the first edge of SCK, phase=1 means the second
+    spi = SoftSPI(baudrate=100000, polarity=1, phase=0, sck=Pin(0), mosi=Pin(2), miso=Pin(4))
+
+    spi.init(baudrate=200000) # set the baudrate
+
+    spi.read(10)            # read 10 bytes on MISO
+    spi.read(10, 0xff)      # read 10 bytes while outputting 0xff on MOSI
+
+    buf = bytearray(50)     # create a buffer
+    spi.readinto(buf)       # read into the given buffer (reads 50 bytes in this case)
+    spi.readinto(buf, 0xff) # read into the given buffer and output 0xff on MOSI
+
+    spi.write(b'12345')     # write 5 bytes on MOSI
+
+    buf = bytearray(4)      # create a buffer
+    spi.write_readinto(b'1234', buf) # write to MOSI and read from MISO into the buffer
+    spi.write_readinto(buf, buf) # write buf to MOSI and read MISO back into buf
+
+The highest supported baud rate is 500000.
+
+Hardware SPI bus
+----------------
+
+There are up to four hardware SPI channels that allow faster transmission
+rates (up to 90Mhz).  The SPI signals have fixed assignments to GPIO pins.
+It depends on the board design, which SPI's signals are exposed to the user, as
+detailed in the table below.  The signal order in the table is: CS0, CS1, MOSI, MISO, CLK.
+
+=================  =========================  =======================  ===============
+Board / Pin        SPI0                       SPI1                     SPI2
+=================  =========================  =======================  ===============
+Teensy 4.0         10/-/11/12/13              0/-/26/1/27                    -
+Teensy 4.1         10/37/11/12/13             0/-/26/1/27              -/29/50/54/49
+MIXMXRT1010-EVK    D10/D7/D11/D12/D13                -                       -
+MIXMXRT1015-EVK    D10/-/D11/D12/D13                 -                       -
+MIXMXRT1020-EVK    D10/-/D11/D12/D13          A3/D0/A5/A4/A0                 -
+MIXMXRT1050-EVK    D10/-/D11/D12/D13 (*)            -                        -
+MIXMXRT1050-EVKB   D10/-/D11/D12/D13 (*)            -                        -
+MIXMXRT1060-EVK    D10/-/D11/D12/D13 (*)            -                        -
+MIXMXRT1064-EVK    D10/-/D11/D12/D13 (*)            -                        -
+MIXMXRT1170-EVK    D10/-/D11/D12/D13          D28/-/D25/D24/D26        -/-/D14/D15/D24
+Olimex RT1010Py             -                 CS0/-/SDO/SDI/SCK        SDCARD with CS1
+Seeed ARCH MIX     J4_12/-/J4_14/J4_13/J4_15  J3_09/J3_05/J3_08_J3_11
+=================  =========================  =======================  ===============
+
+Pins denoted with (*) are by default not wired at the board.
+
+Hardware SPI is accessed via the :ref:`machine.SPI <machine.SPI>` class and
+has the same methods as software SPI above::
+
+    from machine import SPI
+
+    spi = SPI(0, 10000000)
+    spi.write('Hello World')
+
+Notes:
+
+1. Even if the highest supported baud rate at the moment is 90 Mhz,
+   setting a baud rate will not always result in exactly that
+   frequency, especially at high baud rates.
+
+2. Sending at 90 MHz is possible, but in the tests receiving
+   only worked up to 60 MHz.
+
+Software I2C bus
+----------------
+
+Software I2C (using bit-banging) works on all output-capable pins, and is
+accessed via the :ref:`machine.SoftI2C <machine.SoftI2C>` class::
+
+    from machine import Pin, SoftI2C
+
+    i2c = SoftI2C(scl=Pin(5), sda=Pin(4), freq=100000)
+
+    i2c.scan()              # scan for devices
+
+    i2c.readfrom(0x3a, 4)   # read 4 bytes from device with address 0x3a
+    i2c.writeto(0x3a, '12') # write '12' to device with address 0x3a
+
+    buf = bytearray(10)     # create a buffer with 10 bytes
+    i2c.writeto(0x3a, buf)  # write the given buffer to the slave
+
+The highest supported freq is 400000.
+
+Hardware I2C bus
+----------------
+
+There are up to four hardware I2C channels that allow faster transmission rates
+and support the full I2C protocol.  The I2C signals have fixed assignments to GPIO pins.
+It depends on the board design, which I2C's signals are exposed to the user, as
+detailed in the table below.  The signal order in the table is: SDA, SCL.
+
+=================  ===========  ===========  ===========  =======  =======
+Board / Pin        I2C 0        I2C 1        I2C 2        I2C 3    I2C 4
+=================  ===========  ===========  ===========  =======  =======
+Teensy 4.0         18/19        17/16        25/24         -        -
+Teensy 4.1         18/19        17/16        25/24         -        -
+MIXMXRT1010-EVK    D14/D15      D0/D1         -            -        -
+MIXMXRT1015-EVK    D14/D15       -            -            -        -
+MIXMXRT1020-EVK    D14/D15      A4/A5        D0/D1         -        -
+MIXMXRT1050-EVK    A4/A5        D1/D0         -            -        -
+MIXMXRT1050-EVKB   A4/A5        D1/D0         -            -        -
+MIXMXRT1060-EVK    A4/A5        D1/D0         -            -        -
+MIXMXRT1064-EVK    A4/A5        D1/D0         -            -        -
+MIXMXRT1170-EVK    D14/D15      D1/D0        A4/A5        D26/D25  D19/D18
+Olimex RT1010Py      -          SDA1/SCL1    SDA2/SCL2     -        -
+Seeed ARCH MIX     J3_17/J3_16  J4_06/J4_07  J5_05/J5_04   -        -
+=================  ===========  ===========  ===========  =======  =======
+
+Hardware I2C is accessed via the :ref:`machine.I2C <machine.I2C>` class and
+has the same methods as software SPI above::
+
+    from machine import I2C
+
+    i2c = I2C(0, 400_000)
+    i2c.writeto(0x76, b"Hello World")
+
+I2S bus
+-------
+
+See :ref:`machine.I2S <machine.I2S>`. Example using a Teensy 4.1 board with a simple
+external Codec like UDA1334.::
+
+    from machine import I2S, Pin
+    i2s = I2S(2, sck=Pin(26), ws=Pin(27), sd=Pin(7),
+        mode=I2S.TX, bts=16,format=I2S.STEREO,
+        rate=44100,ibuf=40000)
+    i2s.write(buf)             # write buffer of audio samples to I2S device
+
+
+Example for using I2S with a MIMXRT10xx_DEV board::
+
+    from machine import I2S, I2C, Pin
+    import wm8960
+
+    i2c=I2C(0)
+
+    wm=wm8960.WM8960(i2c, sample_rate=SAMPLE_RATE_IN_HZ,
+        adc_sync=wm8960.sync_dac,
+        swap=wm8960.swap_input)
+
+    i2s = I2S(1, sck=Pin("SCK_TX"), ws=Pin("WS_TX"), sd=Pin("SD_RX"),
+        mck=Pin("MCK),mode=I2S.RX, bts=16,format=I2S.MONO,
+        rate=32000,ibuf=10000)
+    i2s.readinto(buf)          # fill buffer with audio samples from I2S device
+
+In this example, the input channels are swapped in the WM8960 driver, since the
+on-board microphone is connected to the right channel, but mono audio is taken
+from the left channel.  Note, that the sck and ws pins are connected to the TX
+signals of the I2S bus.  That is intentional, since at the MW8960 codec these
+signals are shared for RX and TX.
+
+Example using the Teensy audio shield::
+
+    from machine import I2C, I2S, Pin
+    from sgtl5000 import CODEC
+    i2s = I2S(1, sck=Pin(21), ws=Pin(20), sd=Pin(7), mck=Pin(23),
+        mode=I2S.TX, bits=16,rate=44100,format=I2S.STEREO,
+        ibuf=40000,
+    )
+
+    # configure the SGTL5000 codec
+    i2c = I2C(0, freq=400000)
+    codec = CODEC(0x0A, i2c)
+    codec.mute_dac(False)
+    codec.dac_volume(0.9, 0.9)
+    codec.headphone_select(0)
+    codec.mute_headphone(False)
+    codec.volume(0.7, 0.7)
+
+    i2s.write(buf)             # write buffer of audio samples to I2S device
+
+The SGTL5000 codec used by the Teensy Audio shield uses the RX signals for both
+RX and TX.  Note that the codec is initialized after the I2S device.  That is
+essential since MCK is needed for its I2C operation and is provided by the I2S
+controller.
+
+MIMXRT boards may have 1 or 2 I2S buses available at the board connectors.
+On MIMXRT1010 devices the bus numbers are 1 and 3.
+
+Pin assignments for a few MIMXRT boards:
+
+===============  ==  =====  ======== ======= ======= ======== ======= =======
+Board            ID  MCK    SCK_TX   WS_TX   SD_TX   SCK_RX   WS_RX   SD_RX
+===============  ==  =====  ======== ======= ======= ======== ======= =======
+Teensy 4.0       1   23     26       27      7       21       20      8
+Teensy 4.0       2   33     4        3       2       -        -       5
+Teensy 4.1       1   23     26       27      7       21       20      8
+Teensy 4.1       2   33     4        3       2       -        -       5
+Seeed Arch MIX   1   J4_09  J4_14    J4_15   J14_13  J4_11    J4_10   J4_10
+Olimex RT1010Py  1   D8     D6       D7      D4      D1       D2      D3
+Olimex RT1010Py  3   -      D10      D9      D11     -        -       -
+MIMXRT_DEV       1   "MCK"  "SCK_TX" "WS_TX" "SD_TX" "SCK_RX" "WS_RX" "SD_RX"
+===============  ==  =====  ======== ======= ======= ======== ======= =======
+
+Symbolic pin names are provided for the MIMXRT_10xx_DEV boards.
+These are provided for the other boards as well.
+
+Real time clock (RTC)
+---------------------
+
+See :ref:`machine.RTC <machine.RTC>`::
+
+    from machine import RTC
+
+    rtc = RTC()
+    rtc.datetime((2017, 8, 23, 1, 12, 48, 0, 0)) # set a specific date and time
+    rtc.datetime() # get date and time
+    rtc.now() # return date and time in CPython format.
+
+The i.MXRT MCU supports battery backup of the RTC.  By connecting a battery of
+1.5-3.6V, time and date are maintained in the absence of the main power.  The
+current drawn from the battery is ~20µA, which is rather high.  A CR2032 coin
+cell will last for about one year.
+
+SD card
+-------
+
+See :ref:`machine.SDCard <machine.SDCard>`::
+
+    import machine, os
+
+    sd = machine.SDCard()
+    fs = os.VfsFat(sd)
+    os.mount(fs, "/sd")  # mount
+    os.listdir('/sd')    # list directory contents
+    os.umount('/sd')     # eject
+
+Note: The i.mx-rt 1011 and 1015 based boards do not support the ``machine.SDCard``
+class.  For these, the SPI based driver ``sdcard.py`` from the MicroPython drivers
+can be used.  When using it, you have to overdrive the CS pin of the SPI hardware
+module.  Example::
+
+    import os, sdcard, machine
+
+    cs_pin = "D10"
+    spi = machine.SPI(0) # SPI0 with cs at Pin "D10" used for SDCARD
+    cs = machine.Pin(cs_pin, machine.Pin.OUT, value=1)
+    sd = sdcard.SDCard(spi, cs)
+    vfs = os.VfsFat(sd)
+    os.mount(vfs, "/sdcard")
+
+OneWire driver
+--------------
+
+The OneWire driver is implemented in software and works on all pins::
+
+    from machine import Pin
+    import onewire
+
+    ow = onewire.OneWire(Pin(12)) # create a OneWire bus on GPIO12
+    ow.scan()                     # return a list of devices on the bus
+    ow.reset()                    # reset the bus
+    ow.readbyte()                 # read a byte
+    ow.writebyte(0x12)            # write a byte on the bus
+    ow.write('123')               # write bytes on the bus
+    ow.select_rom(b'12345678')    # select a specific device by its ROM code
+
+There is a specific driver for DS18S20 and DS18B20 devices::
+
+    import time, ds18x20
+    ds = ds18x20.DS18X20(ow)
+    roms = ds.scan()
+    ds.convert_temp()
+    time.sleep_ms(750)
+    for rom in roms:
+        print(ds.read_temp(rom))
+
+Be sure to put a 4.7k pull-up resistor on the data line.  Note that
+the ``convert_temp()`` method must be called each time you want to
+sample the temperature.
+
+DHT driver
+----------
+
+The DHT driver is implemented in software and works on all pins::
+
+    import dht
+    import machine
+
+    d = dht.DHT11(machine.Pin(4))
+    d.measure()
+    d.temperature() # eg. 23 (°C)
+    d.humidity()    # eg. 41 (% RH)
+
+    d = dht.DHT22(machine.Pin(4))
+    d.measure()
+    d.temperature() # eg. 23.6 (°C)
+    d.humidity()    # eg. 41.3 (% RH)
+
+Be sure to have a 4.7k pull-up resistor on the data line.  Some
+DHT modules may already have one.
+
+Ethernet driver
+---------------
+
+All MIMXRT boards except the MIMXRT1011 based boards and Teensy 4.0 support
+Ethernet.  Example usage::
+
+    import network
+
+    lan = network.LAN(0)
+    lan.active(True)
+
+If there is a DHCP server in the LAN, the IP address is supplied by that server.
+Otherwise, the IP address can be set with lan.ifconfig().  The default address
+is 192.168.0.1.
+
+Teensy 4.1 does not have an Ethernet jack on the board, but PJRC offers an
+adapter for self-assembly.  The Seeed ARCH MIX board has no PHY hardware on the
+board, however you can attach external PHY interfaces.  By default, the firmware
+for Seeed Arch Mix uses the driver for a LAN8720 PHY.  The MIMXRT1170_EVK is
+equipped with two Ethernet ports, which are addressed as LAN(0) for the 100M
+port and LAN(1) for the 1G port.
+
+For details of the network interface refer to the class :ref:`network.LAN <network.LAN>`.
+
+Transferring files
+------------------
+
+Files can be transferred to the i.MXRT devices for instance with the ``mpremote``
+tool or using an SD card.  If Ethernet is available, you can also use ftp.
+See the MicroPython forum for the FTP server or other community-supported
+alternatives to transfer files to an i.MXRT board, like rshell or Thonny.
diff --git a/docs/mimxrt/tutorial/intro.rst b/docs/mimxrt/tutorial/intro.rst
new file mode 100644
index 0000000000000..fb2ed1a71605e
--- /dev/null
+++ b/docs/mimxrt/tutorial/intro.rst
@@ -0,0 +1,125 @@
+.. _mimxrt_intro:
+
+Getting started with MicroPython on the i.MXRT
+==============================================
+
+Using MicroPython is a great way to get the most of your i.MXRT board.  And
+vice versa, the i.MXRT chip is a great platform for using MicroPython.  This
+tutorial will guide you through setting up MicroPython, getting a prompt, using
+the hardware peripherals, and controlling some external components.
+
+Let's get started!
+
+Requirements
+------------
+
+The first thing you need is a board with an i.MXRT chip.  The MicroPython
+software supports the i.MXRT chip itself and any board should work.  The main
+characteristic of a board is how the GPIO pins are connected to the outside
+world, and whether it includes a built-in USB-serial converter to make the
+UART available to your PC.
+
+Names of pins will be given in this tutorial using the chip names (eg GPIO2)
+and it should be straightforward to find which pin this corresponds to on your
+particular board.
+
+Powering the board
+------------------
+
+If your board has a USB connector on it then most likely it is powered through
+this when connected to your PC.  Otherwise you will need to power it directly.
+Please refer to the documentation for your board for further details.
+
+Getting the firmware
+--------------------
+
+Firmware versions are provided at the
+`MicroPython download page <https://micropython.org/download/?port=mimxrt>`_.
+You can download the most recent MicroPython firmware .hex or .bin file to load
+onto your i.MXRT device.  From that download page you have two main choices:
+
+* stable firmware builds
+* daily firmware builds
+
+If you are just starting with MicroPython, the best bet is to go for the stable
+firmware builds. If you are an advanced, experienced MicroPython i.MXRT user
+who would like to follow development closely and help with testing new
+features, there are daily builds.
+
+Deploying the firmware
+----------------------
+
+Once you have the MicroPython firmware you need to load it onto your
+i.MXRT device.  The exact procedure for these steps is highly dependent
+on the particular board and you will need to refer to its documentation
+for details.
+
+Teensy 4.0 and 4.1
+~~~~~~~~~~~~~~~~~~
+
+For Teensy 4.0 and 4.1 you have to use the built-in loader together with the PC
+loader provided by PJRC. The built-in loader will be activated by pushing the
+button on the board. Then you can upload the firmware with the command::
+
+    teensy_loader_cli --mcu=imxrt1062 -v -w firmware.hex
+
+IMXRT10xx-EVK boards
+~~~~~~~~~~~~~~~~~~~~
+
+The IMXRT10xx-EVK boards have a second USB port connected to a support MCU.
+Connecting that USB port to your PC will register a disk drive with the name of
+the board.  Just copy the firmware.bin file to this drive, and that will start
+the flashing procedure.  You will know that the flash was complete, if that
+drive disappears and reappears.  If you decided to install the very useful
+Segger open-SDA firmware on that sidekick MCU, then you have to use the debugger
+software to upload the i.MXRT firmware.
+
+Seed ARCH MIX board
+~~~~~~~~~~~~~~~~~~~
+
+Firmware upload to the Seed ARCH MIX board is less convenient.  The vendor
+suggests using J-Link as a method and tool.  For that, follow the instructions
+given by Seed in their Wiki at
+https://wiki.seeedstudio.com/Arch_Mix/#flashing-arduino-bootloader-to-arch-mix.
+You will need a J-Link debug probe and software.  You may find Segger JLink edu
+or Segger JLink edu mini convenient.  As a matching loader you can use
+JFlashLite.  The target address for loading is 0x60000000.
+
+The MIMXRT family also support a serial upload method.  The software for serial
+upload is provided by NXP.  The steps to use it are:
+
+- Connect J3, Pin 19 to 3.3V (GPIO_AD_B0_05).
+- Change the DIP-Switch settings from off-off-on-off to off-off-off-on
+- Push Reset
+- Run the upload with: ./FLASH.sh <firmware_image_file name>
+- Once the upload has finished, set the DIP-switch back to off-off-on-off.
+- Remove the Jumper to J3, Pin19 and push reset
+
+To avoid running the Flash loader as superuser, you can copy the provided udev-rules
+script to /etc/udev/rules.d/.  FLASH.sh calls two binaries, blhost and sdphost,
+which are provided by NXP under the BSD-3-Clause License.  A version of these
+binaries and the script can be downloaded at
+https://github.com/robert-hh/Shared-Stuff/blob/master/mimxrt_serial_downloader.zip.
+
+Serial downloading can be used for the NXP MIMXRT boards as well. But the built-in loader
+is much more convenient to use.
+
+Serial prompt
+-------------
+
+Once you have the firmware on the device you can access the REPL (Python prompt)
+over USB.
+
+From there you can follow the i.MXRT tutorial.
+
+Troubleshooting installation problems
+-------------------------------------
+
+If you experience problems during flashing or with running firmware immediately
+after it, here are some troubleshooting recommendations:
+
+* Be aware of and try to exclude hardware problems.  There are two common
+  problems: bad power source quality, and worn-out/defective Flash ROM.
+  Speaking of power source, not just raw amperage is important, but also low
+  ripple and noise/EMI in general.  The most reliable and convenient power
+  source is a USB port.
diff --git a/docs/templates/topindex.html b/docs/templates/topindex.html
index c14f840cebd86..4f78b9613109f 100644
--- a/docs/templates/topindex.html
+++ b/docs/templates/topindex.html
@@ -62,6 +62,10 @@ <h1>MicroPython documentation</h1>
         <a class="biglink" href="{{ pathto("rp2/quickref") }}">Quick reference for the Raspberry Pi RP2xxx</a><br/>
         <span class="linkdescr">pinout for rp2xxx-based boards, snippets of useful code, and a tutorial</span>
       </p>
+      <p class="biglink">
+        <a class="biglink" href="{{ pathto("mimxrt/quickref") }}">Quick reference for the NXP i.MXRT 10xx</a><br/>
+        <span class="linkdescr">general introduction, snippets of useful code, and a tutorial</span>
+      </p>
       <p class="biglink">
         <a class="biglink" href="{{ pathto("wipy/quickref") }}">Quick reference for the WiPy/CC3200</a><br/>
         <span class="linkdescr">pinout for the WiPy/CC3200, snippets of useful code, and a tutorial</span>

From 56b331ace6b7f01bacdb8b5c66f0f517670abfdc Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Thu, 10 Feb 2022 13:51:48 +0100
Subject: [PATCH 1879/3533] drivers/codec: Add driver for the WM8960 codec.

This codec is assembled for the MIMXRT1xxx_DEV boards and available for
WM8960 breakout boards as well.

The driver itself has been tested as working with the MIMXRT boards and a
Sparkfun WM6890 breakout board.  It implements the initialization, basic
methods and some enhanced methods like 3D, ALC, soft-mute and deemphasis.
---
 docs/library/index.rst       |   7 +
 docs/library/machine.I2S.rst |   7 +
 docs/library/wm8960.rst      | 397 ++++++++++++++++++
 drivers/codec/wm8960.py      | 753 +++++++++++++++++++++++++++++++++++
 4 files changed, 1164 insertions(+)
 create mode 100644 docs/library/wm8960.rst
 create mode 100644 drivers/codec/wm8960.py

diff --git a/docs/library/index.rst b/docs/library/index.rst
index 2b1d6b9651343..ffd373a4df25b 100644
--- a/docs/library/index.rst
+++ b/docs/library/index.rst
@@ -97,6 +97,13 @@ the following libraries.
    network.rst
    uctypes.rst
 
+The following libraries provide drivers for hardware components.
+
+.. toctree::
+  :maxdepth: 1
+
+  wm8960.rst
+
 
 Port-specific libraries
 -----------------------
diff --git a/docs/library/machine.I2S.rst b/docs/library/machine.I2S.rst
index e68a863d7c6b0..b602ac6504d3c 100644
--- a/docs/library/machine.I2S.rst
+++ b/docs/library/machine.I2S.rst
@@ -72,6 +72,13 @@ uasyncio::
    sreader = uasyncio.StreamReader(audio_in)
    num_read = await sreader.readinto(buf)
 
+Some codec devices like the WM8960 or SGTL5000 require separate initialization
+before they can operate with the I2S class.  For these, separate drivers are
+supplied, which also offer methods for controlling volume, audio processing and
+other things.  For these drivers see:
+
+- :ref:`wm8960`
+
 Constructor
 -----------
 
diff --git a/docs/library/wm8960.rst b/docs/library/wm8960.rst
new file mode 100644
index 0000000000000..add003630eb8c
--- /dev/null
+++ b/docs/library/wm8960.rst
@@ -0,0 +1,397 @@
+.. _wm8960:
+
+:mod:`WM8960` -- Driver for the WM8960 codec
+============================================
+
+This driver is used to control a WM8960 codec chip.  It is a Python
+translation of the C-Code provided by NXP/Freescale for their i.MX RT series of
+MCUs.  Very little has been added, and just a few API related names were changed
+or added to cope with the naming style of MicroPython.
+
+The primary purpose of the driver is initialization and setting operation modes
+of the codec.  It does not do the audio data processing for the codec.  That is
+the task of a separate driver.
+
+The WM8960 supports an I2C interface, in addition to the audio interface.  The
+connection depends on the interface used and the number of devices in the
+system. For the I2C interface, SCL and SDA have to be connected, and of course
+GND and Vcc.  The I2C default address is ``0x1A``.
+
+Constructor
+-----------
+
+.. class:: WM8960(i2c, sample_rate, *, bits=16, swap=SWAP_NONE, route=ROUTE_PLAYBACK_RECORD, left_input=INPUT_MIC3, right_input=INPUT_MIC2, sysclk_source=SYSCLK_MCLK, mclk_freq=None, primary=False, adc_sync=SYNC_DAC, protocol=BUS_I2S, i2c_address=WM8960_I2C_ADDR)
+
+    Create a WM8960 driver object, initialize the device with default settings and return the
+    WM8960 object.
+
+    Only the first two arguments are mandatory. All others are optional. The arguments are:
+
+        - *i2c* is the I2C bus object.
+        - *sample_rate* is the audio sample rate. Acceptable values are 8000,
+          11025, 12000, 16000, 22050, 24000, 32000, 44100, 48000, 96000, 192000
+          and 384000.  Note that not every I2S hardware will support all values.
+        - *bits* is the number of bits per audio word. Acceptable value are 16,
+          20, 24, and 32.
+        - *swap* swaps the left & right channel, if set; see below for options.
+        - *route* Setting the audio path in the codec; see below for options.
+        - *left_input* sets the audio source for the left input channel;
+          see below for options.
+        - *right_input* sets the audio source for the right input channel;
+          see below for options.
+        - *play_source* sets the audio target for the output audio;
+          see below for options.
+        - *sysclk_source* controls whether the internal master clock called
+          "sysclk" is directly taken from the MCLK input or derived from it
+          using an internal PLL. It is usually not required to change this.
+        - *mclk_freq* sets the mclk frequency applied to the MCLK pin of the
+          codec. If not set, default values are used.
+        - *primary* lets the WM8960 act as primary or secondary device. The
+          default setting is ``False``.  When set to ``False``,
+          *sample_rate* and *bits* are controlled by the MCU.
+        - *adc_sync* sets which input is used for the ADC sync signal.
+          The default is using the DACLRC pin.
+        - *protocol* sets the communication protocol. The default is I2S.
+          See below for all options.
+        - *i2c_address* sets the I2C address of the WM8960, with default ``0x1A``.
+
+    If *mclk_freq* is not set the following default values are used:
+
+        - sysclk_source == SYSCLK_PLL: 11.2896 MHz for sample rates of 44100,
+          22050 and 11015 Hz, and 12.288 Mhz for sample rates < 48000, otherwise
+          sample_rate * 256.
+        - sysclk_source == SYSCLK_MCLK: sample_rate * 256.
+
+    If the MCLK signal is applied using, for example,. a separate oscillator,
+    it must be specified for proper operation.
+
+Tables of parameter constants
+-----------------------------
+
+.. table:: **Swap Parameter**
+   :widths: auto
+   :align: left
+
+   ===== ====
+   Value Name
+   ===== ====
+   0     SWAP_NONE
+   1     SWAP_INPUT
+   2     SWAP_OUTPUT
+   ===== ====
+
+.. table:: **Protocol Parameter**
+   :widths: auto
+   :align: left
+
+   ===== ====
+   Value Name
+   ===== ====
+   2     BUS_I2S
+   1     BUS_LEFT_JUSTIFIED
+   0     BUS_RIGHT_JUSTIFIED
+   3     BUS_PCMA
+   19    BUS_PCMB
+   ===== ====
+
+.. table:: **Input Source Parameter**
+   :widths: auto
+   :align: left
+
+   ===== ============ ====
+   Value Name         Type
+   ===== ============ ====
+   0     INPUT_CLOSED
+   1     INPUT_MIC1   Single ended
+   2     INPUT_MIC2   Differential
+   3     INPUT_MIC3   Differential
+   4     INPUT_LINE2
+   5     INPUT_LINE3
+   ===== ============ ====
+
+.. table:: **Route Parameter**
+   :widths: auto
+   :align: left
+
+   ===== ====
+   Value Name
+   ===== ====
+   0     ROUTE_BYPASS
+   1     ROUTE_PLAYBACK
+   2     ROUTE_PLAYBACK_RECORD
+   5     ROUTE_RECORD
+   ===== ====
+
+.. table:: **Master Clock Source Parameter**
+   :widths: auto
+   :align: left
+
+   ===== ====
+   Value Name
+   ===== ====
+   0     SYSCLK_MCLK
+   1     SYSCLK_PLL
+   ===== ====
+
+.. table:: **Module Names**
+   :widths: auto
+   :align: left
+
+   ===== ====
+   Value Name
+   ===== ====
+   0     MODULE_ADC
+   1     MODULE_DAC
+   2     MODULE_VREF
+   3     MODULE_HEADPHONE
+   4     MODULE_MIC_BIAS
+   5     MODULE_MIC
+   6     MODULE_LINE_IN
+   7     MODULE_LINE_OUT
+   8     MODULE_SPEAKER
+   9     MODULE_OMIX
+   10    MODULE_MONO_OUT
+   ===== ====
+
+.. table:: **Play Channel Names**
+   :widths: auto
+   :align: left
+
+   ===== ====
+   Value Name
+   ===== ====
+   1     PLAY_HEADPHONE_LEFT
+   2     PLAY_HEADPHONE_RIGHT
+   4     PLAY_SPEAKER_LEFT
+   8     PLAY_SPEAKER_RIGHT
+   ===== ====
+
+.. table:: **adc_sync Parameters**
+   :widths: auto
+   :align: left
+
+   ===== ====
+   Value Name
+   ===== ====
+   0     SYNC_ADC
+   1     SYNC_DAC
+   ===== ====
+
+
+Methods
+-------
+
+In addition to initialization, the driver provides some useful methods for
+controlling its operation:
+
+.. method:: WM8960.set_left_input(input_source)
+
+    Specify the source for the left input.  The input source names are listed above.
+
+.. method:: WM8960.set_right_input(input_source)
+
+    Specify the source for the right input.  The input source names are listed above.
+
+.. method:: WM8960.volume(module, volume_l=None, volume_r=None)
+
+    Sets or gets the volume of a certain module.
+
+    If no volume values are supplied, the actual volume tuple is returned.
+
+    If one or two values are supplied, it sets the volume of a certain module.
+    If two values are provided, the first one is used for the left channel,
+    the second for the right channel.  If only one value is supplied, it is used
+    for both channels.  The value range is normalized to 0.0-100.0 with a
+    logarithmic scale.
+
+    For a list of suitable modules and db/step, see the table below.
+
+.. table:: **Module Names and dB steps**
+   :widths: auto
+   :align: center
+
+   ======= ====
+   dB/Step Name
+   ======= ====
+   1.28    MODULE_ADC
+   1.28    MODULE_DAC
+   0.8     MODULE_HEADPHONE
+   0.475   MODULE_LINE_IN
+   0.8     MODULE_SPEAKER
+   ======= ====
+
+.. method:: WM8960.mute(module, mute, soft=True, ramp=wm8960.MUTE_FAST)
+
+    Mute or unmute the output. If *mute* is True, the output is muted, if ``False``
+    it is unmuted.
+
+    If *soft* is set as True, muting will happen as a soft transition.  The time for
+    the transition is defined by *ramp*, which is either ``MUTE_FAST`` or ``MUTE_SLOW``.
+
+.. method:: WM8960.set_data_route(route)
+
+    Set the audio data route.  For the parameter value/names, see the table above.
+
+.. method:: WM8960.set_module(module, active)
+
+    Enable or disable a module, with *active* being ``False`` or ``True``.  For
+    the list of module names, see the table above.
+
+    Note that enabling ``MODULE_MONO_OUT`` is different from the `WM8960.mono`
+    method.  The first enables output 3, while the `WM8960.mono` method sends a
+    mono mix to the left and right output.
+
+.. method:: WM8960.enable_module(module)
+
+    Enable a module.  For the list of module names, see the table above.
+
+.. method:: WM8960.disable_module(module)
+
+    Disable a module.  For the list of module names, see the table above.
+
+.. method:: WM8960.expand_3d(level)
+
+    Enable Stereo 3D exansion.  *level* is a number between 0 and 15.
+    A value of 0 disables the expansion.
+
+.. method:: WM8960.mono(active)
+
+    If *active* is ``True``, a Mono mix is sent to the left and right output
+    channel.  This is different from enabling the ``MODULE_MONO_MIX``, which
+    enables output 3.
+
+.. method:: WM8960.alc_mode(channel, mode=ALC_MODE)
+
+    Enables or disables ALC mode.  Parameters are:
+
+    - *channel* enables and sets the channel for ALC. The parameter values are:
+
+        - ALC_OFF:   Switch ALC off
+        - ALS_RIGHT:  Use the right input channel
+        - ALC_LEFT:   Use the left input channel
+        - ALC_STEREO: Use both input channels.
+
+    - *mode* sets the ALC mode. Input values are:
+
+        - ALC_MODE:   act as ALC
+        - ALC_LIMITER: act as limiter.
+
+.. method:: WM8960.alc_gain(target=-12, max_gain=30, min_gain=-17.25, noise_gate=-78)
+
+    Set the target level, highest and lowest gain levels and the noise gate as dB level.
+    Permitted ranges are:
+
+    - *target*: -22.5 to -1.5 dB
+    - *max_gain*: -12 to 30 dB
+    - *min_gain*: -17 to 25 dB
+    - *noise_gate*: -78 to -30 dB
+
+    Excess values are limited to the permitted ranges.  A value of -78 or less
+    for *noise_gate* disables the noise gate function.
+
+.. method:: WM8960.alc_time(attack=24, decay=192, hold=0)
+
+    Set the dynamic characteristic of ALC.  The times are given as millisecond
+    values.  Permitted ranges are:
+
+    - *attack*: 6 to 6140
+    - *decay*: 24 to 24580
+    - *hold*: 0 to 43000
+
+    Excess values are limited within the permitted ranges.
+
+.. method:: WM8960.deemphasis(active)
+
+    Enables or disables a deemphasis filter for playback, with *active* being
+    ``False`` or ``True``.  This filter is applied only for sample rates of
+    32000, 44100 and 48000.  For other sample rates, the filter setting
+    is silently ignored.
+
+.. method:: WM8960.deinit()
+
+    Disable all modules.
+
+
+Examples
+--------
+
+Run WM8960 in secondary mode (default)::
+
+    # Micro_python WM8960 Codec driver
+    #
+    # Setting the driver to Slave mode using the default settings
+    #
+    from machine import Pin, I2C
+    import wm8960
+    i2c = I2C(0)
+    wm=wm8960.WM8960(i2c, 32000, left_input=wm8960.INPUT_MIC1)
+    wm.set_volume(wm8960.MODULE_HEADPHONE, 100)
+
+
+Run WM8960 in primary mode::
+
+    # Micro_python WM8960 Codec driver
+    #
+    # Setting the driver to Master mode using specific audio format settings
+    #
+    from machine import Pin, I2C
+    import wm8960
+
+    i2c = I2C(0)
+    wm=wm8960.WM8960(i2c, 44100, primary=True, bits=16)
+
+
+Run WM8960 on a MIMXRT10xx_DEV board in secondary mode (default)::
+
+    # Micro_python WM8960 Codec driver
+    #
+    # Setting the driver to Slave mode using the default settings
+    # swap the input channels such that a MIMXRT Dev board mic, which
+    # is connected to the right input, is assigned to the left audio channel.
+    #
+    from machine import Pin, I2C
+    import wm8960
+    i2c = I2C(0)
+    wm=wm8960.WM8960(i2c, sample_rate=16_000,
+        adc_sync=wm8960.SYNC_DAC,
+        swap=wm8960.SWAP_INPUT,
+        sysclk_source=wm8960.SYSCLK_MCLK)
+
+
+Record with a Sparkfun WM8960 breakout board with Teensy in secondary mode (default)::
+
+    # Micro_python WM8960 Codec driver
+    #
+    # The breakout board uses a fixed 24MHz MCLK. Therefore the internal
+    # PLL must be used as sysclk, which is the master audio clock.
+    # The Sparkfun board has the WS pins for RX and TX connected on the
+    # board. Therefore adc_sync must be set to sync_adc, to configure
+    # it's ADCLRC pin as input.
+    #
+    from machine import Pin, I2C
+    import wm8960
+    i2c = I2C(0)
+    wm=wm8960.WM8960(i2c, sample_rate=16_000,
+        adc_sync=wm8960.SYNC_ADC,
+        sysclk_source=wm8960.SYSCLK_PLL,
+        mclk_freq=24_000_000,
+        left_input=wm8960.INPUT_MIC1,
+        right_input=wm8960.INPUT_CLOSED)
+
+
+Play with a Sparkfun WM8960 breakout board with Teensy in secondary mode (default)::
+
+    # The breakout board uses a fixed 24MHz MCLK. Therefore the internal
+    # PLL must be used as sysclk, which is the master audio clock.
+    # The Sparkfun board has the WS pins for RX and TX connected on the
+    # board. Therefore adc_sync must be set to sync_adc, to configure
+    # it's ADCLRC pin as input.
+
+    from machine import I2C
+    i2c=I2C(0)
+    import wm8960
+    wm=wm8960.WM8960(i2c, sample_rate=44_100,
+        adc_sync=wm8960.SYNC_ADC,
+        sysclk_source=wm8960.SYSCLK_PLL,
+        mclk_freq=24_000_000)
+    wm.set_volume(wm8960.MODULE_HEADPHONE, 100)
diff --git a/drivers/codec/wm8960.py b/drivers/codec/wm8960.py
new file mode 100644
index 0000000000000..ad1cb1cbf872b
--- /dev/null
+++ b/drivers/codec/wm8960.py
@@ -0,0 +1,753 @@
+#
+# Driver class for the WM8960 Codec to be used e.g. with MIMXRT_1xxx Boards.
+# Derived from the NXP SDK drivers.
+#
+# Copyright (c) 2015, Freescale Semiconductor, Inc., (C-Code)
+# Copyright 2016-2021 NXP, (C-Code)
+# All rights reserved.
+#
+# Translated to MicroPython by Robert Hammelrath, 2022
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
+import array
+from micropython import const
+
+# Define the register addresses of WM8960.
+_LINVOL = const(0x0)
+_RINVOL = const(0x1)
+_LOUT1 = const(0x2)
+_ROUT1 = const(0x3)
+_CLOCK1 = const(0x4)
+_DACCTL1 = const(0x5)
+_DACCTL2 = const(0x6)
+_IFACE1 = const(0x7)
+_CLOCK2 = const(0x8)
+_IFACE2 = const(0x9)
+_LDAC = const(0xA)
+_RDAC = const(0xB)
+_RESET = const(0xF)
+_3D = const(0x10)
+_ALC1 = const(0x11)
+_ALC2 = const(0x12)
+_ALC3 = const(0x13)
+_NOISEG = const(0x14)
+_LADC = const(0x15)
+_RADC = const(0x16)
+_ADDCTL1 = const(0x17)
+# Register _ADDCTL2 = const(0x18)
+_POWER1 = const(0x19)
+_POWER2 = const(0x1A)
+_ADDCTL3 = const(0x1B)
+# Register _APOP1 = const(0x1C)
+# Register _APOP2 = const(0x1D)
+_LINPATH = const(0x20)
+_RINPATH = const(0x21)
+_LOUTMIX = const(0x22)
+_ROUTMIX = const(0x25)
+_MONOMIX1 = const(0x26)
+_MONOMIX2 = const(0x27)
+_LOUT2 = const(0x28)
+_ROUT2 = const(0x29)
+_MONO = const(0x2A)
+_INBMIX1 = const(0x2B)
+_INBMIX2 = const(0x2C)
+_BYPASS1 = const(0x2D)
+_BYPASS2 = const(0x2E)
+_POWER3 = const(0x2F)
+_ADDCTL4 = const(0x30)
+_CLASSD1 = const(0x31)
+# Register _CLASSD3 = const(0x33)
+_PLL1 = const(0x34)
+_PLL2 = const(0x35)
+_PLL3 = const(0x36)
+_PLL4 = const(0x37)
+
+# WM8960 PLLN range */
+_PLL_N_MIN_VALUE = const(6)
+_PLL_N_MAX_VALUE = const(12)
+
+# WM8960 CLOCK2 bits
+_CLOCK2_BCLK_DIV_MASK = const(0x0F)
+_CLOCK2_DCLK_DIV_MASK = const(0x1C0)
+_CLOCK2_DCLK_DIV_SHIFT = const(0x06)
+
+# Register _IFACE1
+_IFACE1_FORMAT_MASK = const(0x03)
+_IFACE1_WL_MASK = const(0x0C)
+_IFACE1_WL_SHIFT = const(0x02)
+_IFACE1_LRP_MASK = const(0x10)
+_IFACE1_MS_MASK = const(0x40)
+_IFACE1_DLRSWAP_MASK = const(0x20)
+_IFACE1_ALRSWAP_MASK = const(0x100)
+
+# Register _POWER1
+_POWER1_VREF_MASK = const(0x40)
+_POWER1_VREF_SHIFT = const(0x06)
+_POWER1_AINL_MASK = const(0x20)
+_POWER1_AINR_MASK = const(0x10)
+_POWER1_ADCL_MASK = const(0x08)
+_POWER1_ADCR_MASK = const(0x0)
+_POWER1_MICB_MASK = const(0x02)
+_POWER1_MICB_SHIFT = const(0x01)
+
+# Register _POWER2
+_POWER2_DACL_MASK = const(0x100)
+_POWER2_DACR_MASK = const(0x80)
+_POWER2_LOUT1_MASK = const(0x40)
+_POWER2_ROUT1_MASK = const(0x20)
+_POWER2_SPKL_MASK = const(0x10)
+_POWER2_SPKR_MASK = const(0x08)
+_POWER3_LMIC_MASK = const(0x20)
+_POWER3_RMIC_MASK = const(0x10)
+_POWER3_LOMIX_MASK = const(0x08)
+_POWER3_ROMIX_MASK = const(0x04)
+
+# Register _DACCTL1 .. 3
+_DACCTL1_MONOMIX_MASK = const(0x10)
+_DACCTL1_MONOMIX_SHIFT = const(0x4)
+_DACCTL1_DACMU_MASK = const(0x08)
+_DACCTL1_DEEM_MASK = const(0x06)
+_DACCTL1_DEEM_SHIFT = const(0x01)
+_DACCTL2_DACSMM_MASK = const(0x08)
+_DACCTL2_DACMR_MASK = const(0x04)
+_DACCTL3_ALCSR_MASK = const(0x07)
+
+# _WM8060_ALC1 .. 3
+_ALC_CHANNEL_MASK = const(0x180)
+_ALC_CHANNEL_SHIFT = const(0x7)
+_ALC_MODE_MASK = const(0x100)
+_ALC_MODE_SHIFT = const(0x8)
+_ALC_GAIN_MASK = const(0x70)
+_ALC_GAIN_SHIFT = const(0x4)
+_ALC_TARGET_MASK = const(0x0F)
+_ALC_ATTACK_MASK = const(0x0F)
+_ALC_DECAY_MASK = const(0xF0)
+_ALC_DECAY_SHIFT = const(4)
+_ALC_HOLD_MASK = const(0xF)
+
+# Register _NOISEG
+_NOISEG_LEVEL_SHIFT = const(3)
+
+_I2C_ADDR = const(0x1A)
+
+# WM8960 maximum volume values
+_MAX_VOLUME_ADC = const(0xFF)
+_MAX_VOLUME_DAC = const(0xFF)
+_MAX_VOLUME_HEADPHONE = const(0x7F)
+_MAX_VOLUME_LINEIN = const(0x3F)
+_MAX_VOLUME_SPEAKER = const(0x7F)
+
+# Config symbol names
+# Modules
+MODULE_ADC = const(0)  # ADC module in WM8960
+MODULE_DAC = const(1)  # DAC module in WM8960
+MODULE_VREF = const(2)  # VREF module
+MODULE_HEADPHONE = const(3)  # Headphone
+MODULE_MIC_BIAS = const(4)  # Mic bias
+MODULE_MIC = const(5)  # Input Mic
+MODULE_LINE_IN = const(6)  # Analog in PGA
+MODULE_LINE_OUT = const(7)  # Line out module
+MODULE_SPEAKER = const(8)  # Speaker module
+MODULE_OMIX = const(9)  # Output mixer
+MODULE_MONO_OUT = const(10)  # Mono mix
+
+# Route
+ROUTE_BYPASS = const(0)  # LINEIN->Headphone.
+ROUTE_PLAYBACK = const(1)  #  I2SIN->DAC->Headphone.
+ROUTE_PLAYBACK_RECORD = const(2)  # I2SIN->DAC->Headphone, LINEIN->ADC->I2SOUT.
+ROUTE_RECORD = const(5)  # LINEIN->ADC->I2SOUT.
+
+# Input
+INPUT_CLOSED = const(0)  # Input device is closed
+INPUT_MIC1 = const(1)  # Input as single ended mic, only use L/RINPUT1
+INPUT_MIC2 = const(2)  # Input as diff. mic, use L/RINPUT1 and L/RINPUT2
+INPUT_MIC3 = const(3)  # Input as diff. mic, use L/RINPUT1 and L/RINPUT3
+INPUT_LINE2 = const(4)  # Input as line input, only use L/RINPUT2
+INPUT_LINE3 = const(5)  # Input as line input, only use L/RINPUT3
+
+# ADC sync input
+SYNC_ADC = const(0)  # Use ADCLRC pin for ADC sync
+SYNC_DAC = const(1)  # used DACLRC pin for ADC sync
+
+# Protocol type
+BUS_I2S = const(2)  # I2S type
+BUS_LEFT_JUSTIFIED = const(1)  # Left justified mode
+BUS_RIGHT_JUSTIFIED = const(0)  # Right justified mode
+BUS_PCMA = const(3)  # PCM A mode
+BUS_PCMB = const(3 | (1 << 4))  # PCM B mode
+
+# Channel swap
+SWAP_NONE = const(0)
+SWAP_INPUT = const(1)
+SWAP_OUTPUT = const(2)
+
+# Mute settings
+MUTE_FAST = const(0)
+MUTE_SLOW = const(1)
+
+# ALC settings
+ALC_OFF = const(0)
+ALC_RIGHT = const(1)
+ALC_LEFT = const(2)
+ALC_STEREO = const(3)
+ALC_MODE = const(0)  # ALC mode
+ALC_LIMITER = const(1)  # Limiter mode
+
+# Clock Source
+SYSCLK_MCLK = const(0)  # sysclk source from external MCLK
+SYSCLK_PLL = const(1)  # sysclk source from internal PLL
+
+
+class Regs:
+    # register cache of 56 register. Since registers cannot be read back, they are
+    # kept in the table for modification
+    # fmt: off
+    cache = array.array("H", (
+        0x0097, 0x0097, 0x0000, 0x0000, 0x0000, 0x0008, 0x0000,
+        0x000a, 0x01c0, 0x0000, 0x00ff, 0x00ff, 0x0000, 0x0000,
+        0x0000, 0x0000, 0x0000, 0x007b, 0x0100, 0x0032, 0x0000,
+        0x00c3, 0x00c3, 0x01c0, 0x0000, 0x0000, 0x0000, 0x0000,
+        0x0000, 0x0000, 0x0000, 0x0000, 0x0100, 0x0100, 0x0050,
+        0x0050, 0x0050, 0x0050, 0x0000, 0x0000, 0x0000, 0x0000,
+        0x0040, 0x0000, 0x0000, 0x0050, 0x0050, 0x0000, 0x0002,
+        0x0037, 0x004d, 0x0080, 0x0008, 0x0031, 0x0026, 0x00e9
+    ))
+    # fmt: on
+
+    def __init__(self, i2c, i2c_address=_I2C_ADDR):
+        self.value_buffer = bytearray(2)
+        self.i2c = i2c
+        self.i2c_address = i2c_address
+
+    def __getitem__(self, reg):
+        return self.cache[reg]
+
+    def __setitem__(self, reg, value):
+        if type(reg) is tuple:
+            if type(value) is tuple:
+                self[reg[0]] = value[0]
+                self[reg[1]] = value[1]
+            else:
+                self[reg[0]] = value
+                self[reg[1]] = value
+        else:
+            if type(value) is tuple:
+                val = (self.cache[reg] & (~value[0] & 0xFFFF)) | value[1]
+            else:
+                val = value
+            self.cache[reg] = val
+            self.value_buffer[0] = (reg << 1) | ((val >> 8) & 0x01)
+            self.value_buffer[1] = val & 0xFF
+            self.i2c.writeto(self.i2c_address, self.value_buffer)
+
+
+class WM8960:
+
+    _bit_clock_divider_table = {
+        2: 0,
+        3: 1,
+        4: 2,
+        6: 3,
+        8: 4,
+        11: 5,
+        12: 6,
+        16: 7,
+        22: 8,
+        24: 9,
+        32: 10,
+        44: 11,
+        48: 12,
+    }
+
+    _dac_divider_table = {
+        1.0 * 256: 0b000,
+        1.5 * 256: 0b001,
+        2 * 256: 0b010,
+        3 * 256: 0b011,
+        4 * 256: 0b100,
+        5.5 * 256: 0b101,
+        6 * 256: 0b110,
+    }
+
+    _audio_word_length_table = {
+        16: 0b00,
+        20: 0b01,
+        24: 0b10,
+        32: 0b11,
+    }
+
+    _alc_sample_rate_table = {
+        48000: 0,
+        44100: 0,
+        32000: 1,
+        24000: 2,
+        22050: 2,
+        16000: 3,
+        12000: 4,
+        11025: 4,
+        8000: 5,
+    }
+
+    _volume_config_table = {
+        MODULE_ADC: (_MAX_VOLUME_ADC, _LADC, 0x100),
+        MODULE_DAC: (_MAX_VOLUME_DAC, _LDAC, 0x100),
+        MODULE_HEADPHONE: (_MAX_VOLUME_HEADPHONE, _LOUT1, 0x180),
+        MODULE_LINE_IN: (_MAX_VOLUME_LINEIN, _LINVOL, 0x140),
+        MODULE_SPEAKER: (_MAX_VOLUME_SPEAKER, _LOUT2, 0x180),
+    }
+
+    _input_config_table = {
+        INPUT_CLOSED: None,
+        INPUT_MIC1: (0x138, 0x117),
+        INPUT_MIC2: (0x178, 0x117),
+        INPUT_MIC3: (0x1B8, 0x117),
+        INPUT_LINE2: (0, 0xE),
+        INPUT_LINE3: (0, 0x70),
+    }
+
+    def __init__(
+        self,
+        i2c,
+        sample_rate=16000,
+        bits=16,
+        swap=SWAP_NONE,
+        route=ROUTE_PLAYBACK_RECORD,
+        left_input=INPUT_MIC3,
+        right_input=INPUT_MIC2,
+        sysclk_source=SYSCLK_MCLK,
+        mclk_freq=None,
+        primary=False,
+        adc_sync=SYNC_DAC,
+        protocol=BUS_I2S,
+        i2c_address=_I2C_ADDR,
+    ):
+        self.regs = regs = Regs(i2c, i2c_address)
+        self.sample_rate = sample_rate
+
+        # check parameter consistency and set the sysclk value
+        if sysclk_source == SYSCLK_PLL:
+            if sample_rate in (11025, 22050, 44100):
+                sysclk = 11289600
+            else:
+                sysclk = 12288000
+            if sysclk < sample_rate * 256:
+                sysclk = sample_rate * 256
+            if mclk_freq is None:
+                mclk_freq = sysclk
+        else:  # sysclk_source == SYSCLK_MCLK
+            if mclk_freq is None:
+                mclk_freq = sample_rate * 256
+            sysclk = mclk_freq
+
+        regs[_RESET] = 0x00
+        # VMID=50K, Enable VREF, AINL, AINR, ADCL and ADCR
+        # I2S_IN (bit 0), I2S_OUT (bit 1), DAP (bit 4), DAC (bit 5), ADC (bit 6) are powered on
+        regs[_POWER1] = 0xFE
+        # Enable DACL, DACR, LOUT1, ROUT1, PLL down, SPKL, SPKR
+        regs[_POWER2] = 0x1F8
+        # Enable left and right channel input PGA, left and right output mixer
+        regs[_POWER3] = 0x3C
+
+        if adc_sync == SYNC_ADC:
+            # ADC and DAC use different Frame Clock Pins
+            regs[_IFACE2] = 0x00  # ADCLRC 0x00:Input 0x40:output.
+        else:
+            # ADC and DAC use the same Frame Clock Pin
+            regs[_IFACE2] = 0x40  # ADCLRC 0x00:Input 0x40:output.
+        self.set_data_route(route)
+        self.set_protocol(protocol)
+
+        if sysclk_source == SYSCLK_PLL:
+            self.set_internal_pll_config(mclk_freq, sysclk)
+        if primary:
+            self.set_master_clock(sysclk, sample_rate, bits)
+            # set master bit.
+            self.regs[_IFACE1] = (0, _IFACE1_MS_MASK)
+
+        self.set_speaker_clock(sysclk)
+
+        # swap channels
+        if swap & SWAP_INPUT:
+            regs[_IFACE1] = (0, _IFACE1_ALRSWAP_MASK)
+        if swap & SWAP_OUTPUT:
+            regs[_IFACE1] = (0, _IFACE1_DLRSWAP_MASK)
+
+        self.set_left_input(left_input)
+        self.set_right_input(right_input)
+
+        regs[_ADDCTL1] = 0x0C0
+        regs[_ADDCTL4] = 0x60  # Set GPIO1 to 0.
+
+        regs[_BYPASS1] = regs[_BYPASS2] = 0x0
+        # ADC volume, 0dB
+        regs[_LADC, _RADC] = 0x1C3
+        # Digital DAC volume, 0dB
+        regs[_LDAC, _RDAC] = 0x1FF
+        # Headphone volume, LOUT1 and ROUT1, 0dB
+        regs[_LOUT1, _ROUT1] = 0x16F
+        # speaker volume 6dB
+        regs[_LOUT2, _ROUT2] = 0x1FF
+        # enable class D output
+        regs[_CLASSD1] = 0xF7
+        # Unmute DAC.
+        regs[_DACCTL1] = 0x0000
+        # Input PGA volume 0 dB
+        regs[_LINVOL, _RINVOL] = 0x117
+
+        self.config_data_format(sysclk, sample_rate, bits)
+
+    def deinit(self):
+
+        self.set_module(MODULE_ADC, False)
+        self.set_module(MODULE_DAC, False)
+        self.set_module(MODULE_VREF, False)
+        self.set_module(MODULE_LINE_IN, False)
+        self.set_module(MODULE_LINE_OUT, False)
+        self.set_module(MODULE_SPEAKER, False)
+
+    def set_internal_pll_config(self, input_mclk, output_clk):
+        regs = self.regs
+        pllF2 = output_clk * 4
+        pll_prescale = 0
+        sysclk_div = 1
+        frac_mode = 0
+
+        # disable PLL power
+        regs[_POWER2] = (1, 0)
+        regs[_CLOCK1] = (7, 0)
+
+        pllN = pllF2 // input_mclk
+        if pllN < _PLL_N_MIN_VALUE:
+            input_mclk //= 2
+            pll_prescale = 1
+            pllN = pllF2 // input_mclk
+            if pllN < _PLL_N_MIN_VALUE:
+                sysclk_div = 2
+                pllF2 *= 2
+                pllN = pllF2 // input_mclk
+
+        if (pllN < _PLL_N_MIN_VALUE) or (pllN > _PLL_N_MAX_VALUE):
+            raise ValueError("Invalid MCLK vs. sysclk ratio")
+
+        pllK = ((pllF2 % input_mclk) * (1 << 24)) // input_mclk
+        if pllK != 0:
+            frac_mode = 1
+
+        regs[_PLL1] = (frac_mode << 5) | (pll_prescale << 4) | (pllN & 0x0F)
+        regs[_PLL2] = (pllK >> 16) & 0xFF
+        regs[_PLL3] = (pllK >> 8) & 0xFF
+        regs[_PLL4] = pllK & 0xFF
+        # enable PLL power
+        regs[_POWER2] = (1, 1)
+        regs[_CLOCK1] = (7, ((0 if sysclk_div == 1 else sysclk_div) << 1) | 1)
+
+    def set_master_clock(self, sysclk, sample_rate, bit_width):
+        bit_clock_divider = (sysclk * 2) // (sample_rate * bit_width * 2)
+        try:
+            reg_divider = self._bit_clock_divider_table[bit_clock_divider]
+        except:
+            raise ValueError("Invalid ratio of sysclk sample rate and bits")
+        # configure the master bit clock divider
+        self.regs[_CLOCK2] = (_CLOCK2_BCLK_DIV_MASK, reg_divider)
+
+    def set_speaker_clock(self, sysclk):
+        speaker_divider_table = (1.5, 2, 3, 4, 6, 8, 12, 16)
+        for val in range(8):
+            divider = speaker_divider_table[val]
+            f = sysclk / divider
+            if 500_000 < f < 1_000_000:
+                break
+        else:
+            val = 7
+        self.regs[_CLOCK2] = (
+            _CLOCK2_DCLK_DIV_MASK,
+            val << _CLOCK2_DCLK_DIV_SHIFT,
+        )
+
+    def set_module(self, module, is_enabled):
+
+        is_enabled = 1 if is_enabled else 0
+        regs = self.regs
+
+        if module == MODULE_ADC:
+
+            regs[_POWER1] = (
+                _POWER1_ADCL_MASK | _POWER1_ADCR_MASK,
+                (_POWER1_ADCL_MASK | _POWER1_ADCR_MASK) * is_enabled,
+            )
+
+        elif module == MODULE_DAC:
+
+            regs[_POWER2] = (
+                _POWER2_DACL_MASK | _POWER2_DACR_MASK,
+                (_POWER2_DACL_MASK | _POWER2_DACR_MASK) * is_enabled,
+            )
+
+        elif module == MODULE_VREF:
+
+            regs[_POWER1] = (
+                _POWER1_VREF_MASK,
+                (is_enabled << _POWER1_VREF_SHIFT),
+            )
+
+        elif module == MODULE_LINE_IN:
+
+            regs[_POWER1] = (
+                _POWER1_AINL_MASK | _POWER1_AINR_MASK,
+                (_POWER1_AINL_MASK | _POWER1_AINR_MASK) * is_enabled,
+            )
+            regs[_POWER3] = (
+                _POWER3_LMIC_MASK | _POWER3_RMIC_MASK,
+                (_POWER3_LMIC_MASK | _POWER3_RMIC_MASK) * is_enabled,
+            )
+
+        elif module == MODULE_LINE_OUT:
+
+            regs[_POWER2] = (
+                _POWER2_LOUT1_MASK | _POWER2_ROUT1_MASK,
+                (_POWER2_LOUT1_MASK | _POWER2_ROUT1_MASK) * is_enabled,
+            )
+
+        elif module == MODULE_MIC_BIAS:
+
+            regs[_POWER1] = (
+                _POWER1_MICB_MASK,
+                (is_enabled << _POWER1_MICB_SHIFT),
+            )
+
+        elif module == MODULE_SPEAKER:
+
+            regs[_POWER2] = (
+                _POWER2_SPKL_MASK | _POWER2_SPKR_MASK,
+                (_POWER2_SPKL_MASK | _POWER2_SPKR_MASK) * is_enabled,
+            )
+            regs[_CLASSD1] = 0xF7
+
+        elif module == MODULE_OMIX:
+
+            regs[_POWER3] = (
+                _POWER3_LOMIX_MASK | _POWER3_ROMIX_MASK,
+                (_POWER3_LOMIX_MASK | _POWER3_ROMIX_MASK) * is_enabled,
+            )
+
+        elif module == MODULE_MONO_OUT:
+
+            regs[_MONOMIX1] = regs[_MONOMIX2] = is_enabled << 7
+            regs[_MONO] = is_enabled << 6
+
+        else:
+            raise ValueError("Invalid module")
+
+    def enable_module(self, module):
+        self.set_module(module, True)
+
+    def disable_module(self, module):
+        self.set_module(module, False)
+
+    def set_data_route(self, route):
+        regs = self.regs
+        if route == ROUTE_BYPASS:
+            # Bypass means from line-in to HP
+            # Left LINPUT3 to left output mixer, LINPUT3 left output mixer volume = 0dB
+            # Right RINPUT3 to right output mixer, RINPUT3 right output mixer volume = 0dB
+            regs[_LOUTMIX, _ROUTMIX] = 0x80
+
+        elif route == ROUTE_PLAYBACK:
+            # Data route I2S_IN-> DAC-> HP
+            #
+            # Left DAC to left output mixer, LINPUT3 left output mixer volume = 0dB
+            # Right DAC to right output mixer, RINPUT3 right output mixer volume = 0dB
+            regs[_LOUTMIX, _ROUTMIX] = 0x100
+            regs[_POWER3] = 0x0C
+            # Set power for DAC
+            self.set_module(MODULE_DAC, True)
+            self.set_module(MODULE_OMIX, True)
+            self.set_module(MODULE_LINE_OUT, True)
+
+        elif route == ROUTE_PLAYBACK_RECORD:
+            #
+            # Left DAC to left output mixer, LINPUT3 left output mixer volume = 0dB
+            # Right DAC to right output mixer, RINPUT3 right output mixer volume = 0dB
+            regs[_LOUTMIX, _ROUTMIX] = 0x100
+            regs[_POWER3] = 0x3C
+            self.set_module(MODULE_DAC, True)
+            self.set_module(MODULE_ADC, True)
+            self.set_module(MODULE_LINE_IN, True)
+            self.set_module(MODULE_OMIX, True)
+            self.set_module(MODULE_LINE_OUT, True)
+
+        elif route == ROUTE_RECORD:
+            # LINE_IN->ADC->I2S_OUT
+            # Left and right input boost, LIN3BOOST and RIN3BOOST = 0dB
+            regs[_POWER3] = 0x30
+            # Power up ADC and AIN
+            self.set_module(MODULE_LINE_IN, True)
+            self.set_module(MODULE_ADC, True)
+
+        else:
+            raise ValueError("Invalid route")
+
+    def set_left_input(self, input):
+        if not input in self._input_config_table.keys():
+            raise ValueError("Invalid input")
+
+        input = self._input_config_table[input]
+
+        regs = self.regs
+        if input is None:
+            regs[_POWER1] = (_POWER1_AINL_MASK | _POWER1_ADCL_MASK, 0)
+        elif input[0] == 0:
+            regs[_POWER1] = (0, _POWER1_AINL_MASK | _POWER1_ADCL_MASK)
+            regs[_INBMIX1] = input
+        else:
+            regs[_POWER1] = (0, _POWER1_AINL_MASK | _POWER1_ADCL_MASK | _POWER1_MICB_MASK)
+            regs[_LINPATH] = input[0]
+            regs[_LINVOL] = input[1]
+
+    def set_right_input(self, input):
+        if not input in self._input_config_table.keys():
+            raise ValueError("Invalid input name")
+
+        input = self._input_config_table[input]
+
+        regs = self.regs
+        if input is None:
+            regs[_POWER1] = (_POWER1_AINR_MASK | _POWER1_ADCR_MASK, 0)
+        elif input[0] == 0:
+            regs[_POWER1] = (0, _POWER1_AINL_MASK | _POWER1_ADCR_MASK)
+            regs[_INBMIX2] = input
+        else:
+            regs[_POWER1] = (0, _POWER1_AINR_MASK | _POWER1_ADCR_MASK | _POWER1_MICB_MASK)
+            regs[_RINPATH] = input[0]
+            regs[_RINVOL] = input[1]
+
+    def set_protocol(self, protocol):
+        self.regs[_IFACE1] = (
+            _IFACE1_FORMAT_MASK | _IFACE1_LRP_MASK,
+            protocol,
+        )
+
+    def config_data_format(self, sysclk, sample_rate, bits):
+        #  Compute sample rate divider, dac and adc are the same sample rate
+        try:
+            divider = self._dac_divider_table[sysclk // sample_rate]
+            wl = self._audio_word_length_table[bits]
+        except:
+            raise ValueError("Invalid ratio sysclk/sample_rate or invalid bit length")
+
+        self.regs[_CLOCK1] = (0x1F8, divider << 6 | divider << 3)
+        self.regs[_IFACE1] = (_IFACE1_WL_MASK, wl << _IFACE1_WL_SHIFT)
+
+    def volume(self, module, volume_l=None, volume_r=None):
+        if not module in self._volume_config_table.keys():
+            raise ValueError("Invalid module")
+
+        if volume_l is None:  # get volume
+            vol_max, regnum, _ = self._volume_config_table[module]
+            return (
+                int((self.regs[regnum] & vol_max) * 100 / vol_max + 0.5),
+                int((self.regs[regnum + 1] & vol_max) * 100 / vol_max + 0.5),
+            )
+        else:  # set volume
+            if volume_r is None:
+                volume_r = volume_l
+
+            if not ((0 <= volume_l <= 100) and (0 <= volume_r <= 100)):
+                raise ValueError("Invalid value for volume")
+            elif not module in self._volume_config_table.keys():
+                raise ValueError("Invalid module")
+
+            vol_max, regnum, flags = self._volume_config_table[module]
+            self.regs[regnum] = int(volume_l * vol_max / 100 + 0.5) | flags
+            self.regs[regnum + 1] = int(volume_r * vol_max / 100 + 0.5) | flags
+
+    def mute(self, enable, soft=True, ramp=MUTE_FAST):
+        enable = _DACCTL1_DACMU_MASK if enable else 0
+        soft = _DACCTL2_DACSMM_MASK if soft else 0
+        ramp = _DACCTL2_DACMR_MASK if ramp == MUTE_SLOW else 0
+        self.regs[_DACCTL1] = (_DACCTL1_DACMU_MASK, enable)
+        self.regs[_DACCTL2] = (
+            _DACCTL2_DACSMM_MASK | _DACCTL2_DACMR_MASK,
+            soft | ramp,
+        )
+
+    def expand_3d(self, depth=0):
+        depth &= 0x0F
+        cutoff = 0 if self.sample_rate >= 32000 else 0b1100000
+        self.regs[_3D] = cutoff | depth << 1 | (1 if depth > 0 else 0)
+
+    def mono(self, enable):
+        enable = 1 if enable else 0
+        self.regs[_DACCTL1] = (
+            _DACCTL1_MONOMIX_MASK,
+            enable << _DACCTL1_MONOMIX_SHIFT,
+        )
+
+    def alc_mode(self, channel, mode=ALC_MODE):
+        if mode != ALC_MODE:
+            mode = ALC_LIMITER
+        channel &= 3
+        self.regs[_ALC1] = (
+            _ALC_CHANNEL_MASK,
+            channel << _ALC_CHANNEL_SHIFT,
+        )
+        self.regs[_ALC3] = (_ALC_MODE_MASK, mode << _ALC_MODE_SHIFT)
+        try:
+            rate = _alc_sample_rate_table[self.sample_rate]
+        except:
+            rate = 0
+        self.regs[_ADDCTL3] = (_DACCTL3_ALCSR_MASK, rate)
+
+    def alc_gain(self, target=-12, max_gain=30, min_gain=-17.25, noise_gate=-78):
+        def limit(value, minval, maxval):
+            value = int(value)
+            if value < minval:
+                value = minval
+            if value > maxval:
+                value = maxval
+            return value
+
+        target = limit((16 + (target * 2) // 3), 0, 15)
+        max_gain = limit((max_gain + 12) // 6, 0, 7)
+        min_gain = limit((min_gain * 4 + 69) // 24, 0, 7)
+        noise_gate = limit((noise_gate * 2 + 153) // 3, -1, 31)
+        self.regs[_ALC1] = (
+            _ALC_GAIN_MASK | _ALC_TARGET_MASK,
+            (max_gain << _ALC_GAIN_SHIFT) | target,
+        )
+        self.regs[_ALC2] = (_ALC_GAIN_MASK, (min_gain << _ALC_GAIN_SHIFT))
+        if noise_gate >= 0:
+            self.regs[_NOISEG] = noise_gate << _NOISEG_LEVEL_SHIFT | 1
+        else:
+            self.regs[_NOISEG] = 0
+
+    def alc_time(self, attack=24, decay=192, hold=0):
+        def logb(value, limit):
+            value = int(value)
+            lb = 0
+            while value > 1:
+                value >>= 1
+                lb += 1
+            if lb > limit:
+                lb = limit
+            return lb
+
+        attack = logb(attack / 6, 7)
+        decay = logb(decay / 24, 7)
+        hold = logb((hold * 3) / 8, 15)
+        self.regs[_ALC2] = (_ALC_HOLD_MASK, hold)
+        self.regs[_ALC3] = (
+            _ALC_DECAY_MASK | _ALC_ATTACK_MASK,
+            (decay << _ALC_DECAY_SHIFT) | attack,
+        )
+
+    def deemphasis(self, enable):
+        deem_table = (32000, 44100, 48000)
+        enable = not not enable
+        if enable and self.sample_rate in deem_table:
+            val = deem_table.index(self.sample_rate) + 1
+        else:
+            val = 0
+        self.regs[_DACCTL1] = (_DACCTL1_DEEM_MASK, val << _DACCTL1_DEEM_SHIFT)

From 79c05bd522addf14ddf188af712307ee76012d4a Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Tue, 1 Mar 2022 08:55:39 +1100
Subject: [PATCH 1880/3533] tools/mpremote: Improve reliability of mount after
 soft reboot.

With the existing code problems can occur with remounting, the "if t -
t_last_activity > QUIET_TIMEOUT:" check can be triggered early before the
REPL string comes through, meaning that the remount doesn't happen.

On certain boards the "MPY: soft reboot" line comes through immediately
(getting the routine past initial timeout) but then there's a slightly
longer delay while the board restarts before it prints out the startup
header and the REPL prompt.

This commit adds some extra pattern monitoring during the timeout loop to
track the state if a soft restart is actually started.
---
 tools/mpremote/mpremote/pyboardextended.py | 34 +++++++++++++++++++---
 1 file changed, 30 insertions(+), 4 deletions(-)

diff --git a/tools/mpremote/mpremote/pyboardextended.py b/tools/mpremote/mpremote/pyboardextended.py
index 95619b0eb66d3..ccdb37a0ce546 100644
--- a/tools/mpremote/mpremote/pyboardextended.py
+++ b/tools/mpremote/mpremote/pyboardextended.py
@@ -628,10 +628,13 @@ def write_ctrl_d(self, out_callback):
 
         # Read response from the device until it is quiet (with a timeout).
         INITIAL_TIMEOUT = 0.5
-        QUIET_TIMEOUT = 0.2
+        BANNER_TIMEOUT = 2
+        QUIET_TIMEOUT = 0.1
         FULL_TIMEOUT = 5
         t_start = t_last_activity = time.monotonic()
         data_all = b""
+        soft_reboot_started = False
+        soft_reboot_banner = False
         while True:
             t = time.monotonic()
             n = self.serial.inWaiting()
@@ -646,13 +649,36 @@ def write_ctrl_d(self, out_callback):
                         return
                 else:
                     if t - t_start > FULL_TIMEOUT:
+                        if soft_reboot_started:
+                            break
                         return
-                    if t - t_last_activity > QUIET_TIMEOUT:
+
+                    next_data_timeout = QUIET_TIMEOUT
+
+                    if not soft_reboot_started and data_all.find(b"MPY: soft reboot") != -1:
+                        soft_reboot_started = True
+
+                    if soft_reboot_started and not soft_reboot_banner:
+                        # Once soft reboot has been initiated, give some more time for the startup
+                        # banner to be shown
+                        if data_all.find(b"\nMicroPython ") != -1:
+                            soft_reboot_banner = True
+                        elif data_all.find(b"\nraw REPL; CTRL-B to exit\r\n") != -1:
+                            soft_reboot_banner = True
+                        else:
+                            next_data_timeout = BANNER_TIMEOUT
+
+                    if t - t_last_activity > next_data_timeout:
                         break
 
-        # Check if a soft reset occurred.
-        if data_all.find(b"MPY: soft reboot") == -1:
+        if not soft_reboot_started:
             return
+
+        if not soft_reboot_banner:
+            out_callback(b"Warning: Could not remount local filesystem\r\n")
+            return
+
+        # Determine type of prompt
         if data_all.endswith(b">"):
             in_friendly_repl = False
             prompt = b">"

From 3b99b4d675f10a1679ee11e03410e2b50539bce2 Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Mon, 4 Apr 2022 12:51:49 +1000
Subject: [PATCH 1881/3533] docs/reference/mpremote: Add details about mount
 usage over soft reboot.

---
 docs/reference/mpremote.rst | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/docs/reference/mpremote.rst b/docs/reference/mpremote.rst
index 345927ef7f9fd..727431fcffb90 100644
--- a/docs/reference/mpremote.rst
+++ b/docs/reference/mpremote.rst
@@ -135,6 +135,11 @@ The full list of supported commands are:
 
       $ mpremote mount <local-dir>
 
+  During usage, Ctrl-D will soft-reboot and normally reconnect the mount automatically.
+  If the unit has a main.py running at startup however the remount cannot occur.
+  In this case a raw mode soft reboot can be used: Ctrl-A Ctrl-D to reboot,
+  then Ctrl-B to get back to normal repl at which point the mount will be ready.
+
 - unmount the local directory from the remote device:
 
   .. code-block:: bash

From 8db93dc0164ba980317e553a162d6c262d067474 Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Wed, 30 Mar 2022 16:18:23 +1100
Subject: [PATCH 1882/3533] stm32/Makefile: Allow overriding COPT in Makefile.

It can now be set in mpconfigboard.mk (as well as the make command line).
---
 ports/stm32/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/stm32/Makefile b/ports/stm32/Makefile
index 3083c99570e9c..fd5688056ce6d 100644
--- a/ports/stm32/Makefile
+++ b/ports/stm32/Makefile
@@ -106,11 +106,11 @@ LDFLAGS += --gc-sections
 # Debugging/Optimization
 ifeq ($(DEBUG), 1)
 CFLAGS += -g -DPENDSV_DEBUG
-COPT = -Og
+COPT ?= -Og
 # Disable text compression in debug builds
 MICROPY_ROM_TEXT_COMPRESSION = 0
 else
-COPT += -Os -DNDEBUG
+COPT ?= -Os -DNDEBUG
 endif
 
 # Flags for optional C++ source code

From 11ab90391de9b4271db60219bd12064b768ec29c Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 1 Apr 2022 10:21:47 +1100
Subject: [PATCH 1883/3533] extmod/extmod.cmake: Add micropy_lib_mbedtls
 component.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/extmod.cmake | 94 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 94 insertions(+)

diff --git a/extmod/extmod.cmake b/extmod/extmod.cmake
index 9c05237774b47..adaa04f131909 100644
--- a/extmod/extmod.cmake
+++ b/extmod/extmod.cmake
@@ -97,3 +97,97 @@ if(EXISTS "${MICROPY_LIB_BERKELEY_DIR}/btree/bt_close.c")
         "virt_fd_t=void*"
     )
 endif()
+
+# Library for mbedtls
+
+set(MICROPY_LIB_MBEDTLS_DIR "${MICROPY_DIR}/lib/mbedtls")
+
+if(EXISTS "${MICROPY_LIB_MBEDTLS_DIR}/library/aes.c")
+    add_library(micropy_lib_mbedtls INTERFACE)
+
+    target_include_directories(micropy_lib_mbedtls INTERFACE
+        ${MICROPY_LIB_MBEDTLS_DIR}/include
+    )
+
+    target_sources(micropy_lib_mbedtls INTERFACE
+        ${MICROPY_LIB_MBEDTLS_DIR}/library/aes.c
+        ${MICROPY_LIB_MBEDTLS_DIR}/library/aesni.c
+        ${MICROPY_LIB_MBEDTLS_DIR}/library/arc4.c
+        ${MICROPY_LIB_MBEDTLS_DIR}/library/asn1parse.c
+        ${MICROPY_LIB_MBEDTLS_DIR}/library/asn1write.c
+        ${MICROPY_LIB_MBEDTLS_DIR}/library/base64.c
+        ${MICROPY_LIB_MBEDTLS_DIR}/library/bignum.c
+        ${MICROPY_LIB_MBEDTLS_DIR}/library/blowfish.c
+        ${MICROPY_LIB_MBEDTLS_DIR}/library/camellia.c
+        ${MICROPY_LIB_MBEDTLS_DIR}/library/ccm.c
+        ${MICROPY_LIB_MBEDTLS_DIR}/library/certs.c
+        ${MICROPY_LIB_MBEDTLS_DIR}/library/chacha20.c
+        ${MICROPY_LIB_MBEDTLS_DIR}/library/chachapoly.c
+        ${MICROPY_LIB_MBEDTLS_DIR}/library/cipher.c
+        ${MICROPY_LIB_MBEDTLS_DIR}/library/cipher_wrap.c
+        ${MICROPY_LIB_MBEDTLS_DIR}/library/cmac.c
+        ${MICROPY_LIB_MBEDTLS_DIR}/library/ctr_drbg.c
+        ${MICROPY_LIB_MBEDTLS_DIR}/library/debug.c
+        ${MICROPY_LIB_MBEDTLS_DIR}/library/des.c
+        ${MICROPY_LIB_MBEDTLS_DIR}/library/dhm.c
+        ${MICROPY_LIB_MBEDTLS_DIR}/library/ecdh.c
+        ${MICROPY_LIB_MBEDTLS_DIR}/library/ecdsa.c
+        ${MICROPY_LIB_MBEDTLS_DIR}/library/ecjpake.c
+        ${MICROPY_LIB_MBEDTLS_DIR}/library/ecp.c
+        ${MICROPY_LIB_MBEDTLS_DIR}/library/ecp_curves.c
+        ${MICROPY_LIB_MBEDTLS_DIR}/library/entropy.c
+        ${MICROPY_LIB_MBEDTLS_DIR}/library/entropy_poll.c
+        ${MICROPY_LIB_MBEDTLS_DIR}/library/error.c
+        ${MICROPY_LIB_MBEDTLS_DIR}/library/gcm.c
+        ${MICROPY_LIB_MBEDTLS_DIR}/library/havege.c
+        ${MICROPY_LIB_MBEDTLS_DIR}/library/hmac_drbg.c
+        ${MICROPY_LIB_MBEDTLS_DIR}/library/md2.c
+        ${MICROPY_LIB_MBEDTLS_DIR}/library/md4.c
+        ${MICROPY_LIB_MBEDTLS_DIR}/library/md5.c
+        ${MICROPY_LIB_MBEDTLS_DIR}/library/md.c
+        ${MICROPY_LIB_MBEDTLS_DIR}/library/md_wrap.c
+        ${MICROPY_LIB_MBEDTLS_DIR}/library/oid.c
+        ${MICROPY_LIB_MBEDTLS_DIR}/library/padlock.c
+        ${MICROPY_LIB_MBEDTLS_DIR}/library/pem.c
+        ${MICROPY_LIB_MBEDTLS_DIR}/library/pk.c
+        ${MICROPY_LIB_MBEDTLS_DIR}/library/pkcs11.c
+        ${MICROPY_LIB_MBEDTLS_DIR}/library/pkcs12.c
+        ${MICROPY_LIB_MBEDTLS_DIR}/library/pkcs5.c
+        ${MICROPY_LIB_MBEDTLS_DIR}/library/pkparse.c
+        ${MICROPY_LIB_MBEDTLS_DIR}/library/pk_wrap.c
+        ${MICROPY_LIB_MBEDTLS_DIR}/library/pkwrite.c
+        ${MICROPY_LIB_MBEDTLS_DIR}/library/platform.c
+        ${MICROPY_LIB_MBEDTLS_DIR}/library/platform_util.c
+        ${MICROPY_LIB_MBEDTLS_DIR}/library/poly1305.c
+        ${MICROPY_LIB_MBEDTLS_DIR}/library/ripemd160.c
+        ${MICROPY_LIB_MBEDTLS_DIR}/library/rsa.c
+        ${MICROPY_LIB_MBEDTLS_DIR}/library/rsa_internal.c
+        ${MICROPY_LIB_MBEDTLS_DIR}/library/sha1.c
+        ${MICROPY_LIB_MBEDTLS_DIR}/library/sha256.c
+        ${MICROPY_LIB_MBEDTLS_DIR}/library/sha512.c
+        ${MICROPY_LIB_MBEDTLS_DIR}/library/ssl_cache.c
+        ${MICROPY_LIB_MBEDTLS_DIR}/library/ssl_ciphersuites.c
+        ${MICROPY_LIB_MBEDTLS_DIR}/library/ssl_cli.c
+        ${MICROPY_LIB_MBEDTLS_DIR}/library/ssl_cookie.c
+        ${MICROPY_LIB_MBEDTLS_DIR}/library/ssl_srv.c
+        ${MICROPY_LIB_MBEDTLS_DIR}/library/ssl_ticket.c
+        ${MICROPY_LIB_MBEDTLS_DIR}/library/ssl_tls.c
+        ${MICROPY_LIB_MBEDTLS_DIR}/library/timing.c
+        ${MICROPY_LIB_MBEDTLS_DIR}/library/x509.c
+        ${MICROPY_LIB_MBEDTLS_DIR}/library/x509_create.c
+        ${MICROPY_LIB_MBEDTLS_DIR}/library/x509_crl.c
+        ${MICROPY_LIB_MBEDTLS_DIR}/library/x509_crt.c
+        ${MICROPY_LIB_MBEDTLS_DIR}/library/x509_csr.c
+        ${MICROPY_LIB_MBEDTLS_DIR}/library/x509write_crt.c
+        ${MICROPY_LIB_MBEDTLS_DIR}/library/x509write_csr.c
+        ${MICROPY_LIB_MBEDTLS_DIR}/library/xtea.c
+    )
+
+    target_compile_definitions(micropy_lib_mbedtls INTERFACE
+        MBEDTLS_CONFIG_FILE="ports/stm32/mbedtls/mbedtls_config.h"
+    )
+
+    list(APPEND MICROPY_INC_CORE
+        "${MICROPY_LIB_MBEDTLS_DIR}/include"
+    )
+endif()

From 86e6744ff59ed5b882436d14359cfd6e0b055157 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 1 Apr 2022 10:22:00 +1100
Subject: [PATCH 1884/3533] rp2: Enable ucryptolib, using mbedtls for backend
 functions.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/rp2/CMakeLists.txt | 1 +
 ports/rp2/mpconfigport.h | 2 ++
 tools/ci.sh              | 2 +-
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/ports/rp2/CMakeLists.txt b/ports/rp2/CMakeLists.txt
index bf3a51be99993..d58fb56877820 100644
--- a/ports/rp2/CMakeLists.txt
+++ b/ports/rp2/CMakeLists.txt
@@ -236,6 +236,7 @@ target_sources(${MICROPY_TARGET} PRIVATE
     ${MICROPY_SOURCE_PORT}
 )
 
+target_link_libraries(${MICROPY_TARGET} micropy_lib_mbedtls)
 target_link_libraries(${MICROPY_TARGET} usermod)
 
 target_include_directories(${MICROPY_TARGET} PRIVATE
diff --git a/ports/rp2/mpconfigport.h b/ports/rp2/mpconfigport.h
index 2919ed0181f35..98e58dee9d7ce 100644
--- a/ports/rp2/mpconfigport.h
+++ b/ports/rp2/mpconfigport.h
@@ -88,6 +88,7 @@
 #define MICROPY_PY_UOS_URANDOM                  (1)
 #define MICROPY_PY_URE_MATCH_GROUPS             (1)
 #define MICROPY_PY_URE_MATCH_SPAN_START_END     (1)
+#define MICROPY_PY_UCRYPTOLIB                   (1)
 #define MICROPY_PY_UTIME_MP_HAL                 (1)
 #define MICROPY_PY_URANDOM_SEED_INIT_FUNC       (rosc_random_u32())
 #define MICROPY_PY_MACHINE                      (1)
@@ -107,6 +108,7 @@
 #define MICROPY_VFS                             (1)
 #define MICROPY_VFS_LFS2                        (1)
 #define MICROPY_VFS_FAT                         (1)
+#define MICROPY_SSL_MBEDTLS                     (1)
 
 // fatfs configuration
 #define MICROPY_FATFS_ENABLE_LFN                (1)
diff --git a/tools/ci.sh b/tools/ci.sh
index 5aed8a7dff1a6..98c95465c04ad 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -256,7 +256,7 @@ function ci_rp2_setup {
 
 function ci_rp2_build {
     make ${MAKEOPTS} -C mpy-cross
-    git submodule update --init lib/pico-sdk lib/tinyusb
+    git submodule update --init lib/mbedtls lib/pico-sdk lib/tinyusb
     make ${MAKEOPTS} -C ports/rp2
     make ${MAKEOPTS} -C ports/rp2 clean
     make ${MAKEOPTS} -C ports/rp2 USER_C_MODULES=../../examples/usercmodule/micropython.cmake

From 5682595d75c1dc1d48f4a474155a301bcb9e28b3 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Sun, 3 Apr 2022 18:22:17 +0200
Subject: [PATCH 1885/3533] esp32: Allow overriding cmake frozen manifest from
 the command line.

If MICROPY_FROZEN_MANIFEST is set from the cmake command line, then it will
override the default and any manifest set by the board.
---
 ports/esp32/CMakeLists.txt                            | 11 +++++++++++
 .../esp32/boards/ESP32_S2_WROVER/mpconfigboard.cmake  |  4 ----
 ports/esp32/boards/GENERIC/mpconfigboard.cmake        |  3 ---
 ports/esp32/boards/GENERIC_C3/mpconfigboard.cmake     |  4 ----
 ports/esp32/boards/GENERIC_C3_USB/mpconfigboard.cmake |  4 ----
 ports/esp32/boards/GENERIC_D2WD/mpconfigboard.cmake   |  4 ----
 ports/esp32/boards/GENERIC_OTA/mpconfigboard.cmake    |  4 ----
 ports/esp32/boards/GENERIC_S2/mpconfigboard.cmake     |  4 ----
 ports/esp32/boards/GENERIC_S3/mpconfigboard.cmake     |  4 ----
 .../boards/GENERIC_S3_SPIRAM/mpconfigboard.cmake      |  4 ----
 ports/esp32/boards/GENERIC_SPIRAM/mpconfigboard.cmake |  4 ----
 .../boards/LILYGO_TTGO_LORA32/mpconfigboard.cmake     |  5 ++---
 ports/esp32/boards/LOLIN_C3_MINI/mpconfigboard.cmake  |  4 +---
 ports/esp32/boards/LOLIN_S2_MINI/mpconfigboard.cmake  |  4 +---
 ports/esp32/boards/LOLIN_S2_PICO/mpconfigboard.cmake  |  4 +---
 ports/esp32/boards/M5STACK_ATOM/mpconfigboard.cmake   |  4 +---
 ports/esp32/boards/SIL_WESP32/mpconfigboard.cmake     |  4 ----
 ports/esp32/boards/UM_TINYPICO/mpconfigboard.cmake    |  4 +---
 ports/esp32/boards/UM_TINYS2/mpconfigboard.cmake      |  2 --
 19 files changed, 18 insertions(+), 63 deletions(-)

diff --git a/ports/esp32/CMakeLists.txt b/ports/esp32/CMakeLists.txt
index 8b2f09a7241b7..7209dd96da4ae 100644
--- a/ports/esp32/CMakeLists.txt
+++ b/ports/esp32/CMakeLists.txt
@@ -24,9 +24,20 @@ include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 # Define the output sdkconfig so it goes in the build directory.
 set(SDKCONFIG ${CMAKE_BINARY_DIR}/sdkconfig)
 
+# Save the manifest file set from the cmake command line.
+set(MICROPY_USER_FROZEN_MANIFEST ${MICROPY_FROZEN_MANIFEST})
+
 # Include board config; this is expected to set SDKCONFIG_DEFAULTS (among other options).
 include(${MICROPY_BOARD_DIR}/mpconfigboard.cmake)
 
+# Set the frozen manifest file. Note if MICROPY_FROZEN_MANIFEST is set from the cmake
+# command line, then it will override the default and any manifest set by the board.
+if (MICROPY_USER_FROZEN_MANIFEST)
+    set(MICROPY_FROZEN_MANIFEST ${MICROPY_USER_FROZEN_MANIFEST})
+elseif (NOT MICROPY_FROZEN_MANIFEST)
+    set(MICROPY_FROZEN_MANIFEST ${MICROPY_PORT_DIR}/boards/manifest.py)
+endif()
+
 # Add sdkconfig fragments that depend on the IDF version.
 if(IDF_VERSION_MAJOR EQUAL 4 AND IDF_VERSION_MINOR LESS 2)
     set(SDKCONFIG_DEFAULTS ${SDKCONFIG_DEFAULTS} boards/sdkconfig.nimble_core0)
diff --git a/ports/esp32/boards/ESP32_S2_WROVER/mpconfigboard.cmake b/ports/esp32/boards/ESP32_S2_WROVER/mpconfigboard.cmake
index 806312e5acd0c..056c9ab4a6a67 100644
--- a/ports/esp32/boards/ESP32_S2_WROVER/mpconfigboard.cmake
+++ b/ports/esp32/boards/ESP32_S2_WROVER/mpconfigboard.cmake
@@ -6,7 +6,3 @@ set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.usb
     boards/ESP32_S2_WROVER/sdkconfig.board
 )
-
-if(NOT MICROPY_FROZEN_MANIFEST)
-    set(MICROPY_FROZEN_MANIFEST ${MICROPY_PORT_DIR}/boards/manifest.py)
-endif()
diff --git a/ports/esp32/boards/GENERIC/mpconfigboard.cmake b/ports/esp32/boards/GENERIC/mpconfigboard.cmake
index 4aaa0420d97b0..ac60dc8630929 100644
--- a/ports/esp32/boards/GENERIC/mpconfigboard.cmake
+++ b/ports/esp32/boards/GENERIC/mpconfigboard.cmake
@@ -2,6 +2,3 @@ set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.base
     boards/sdkconfig.ble
 )
-if(NOT MICROPY_FROZEN_MANIFEST)
-    set(MICROPY_FROZEN_MANIFEST ${MICROPY_PORT_DIR}/boards/manifest.py)
-endif()
diff --git a/ports/esp32/boards/GENERIC_C3/mpconfigboard.cmake b/ports/esp32/boards/GENERIC_C3/mpconfigboard.cmake
index 4f31884231b15..38bf7388faf12 100644
--- a/ports/esp32/boards/GENERIC_C3/mpconfigboard.cmake
+++ b/ports/esp32/boards/GENERIC_C3/mpconfigboard.cmake
@@ -4,7 +4,3 @@ set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.base
     boards/sdkconfig.ble
 )
-
-if(NOT MICROPY_FROZEN_MANIFEST)
-    set(MICROPY_FROZEN_MANIFEST ${MICROPY_PORT_DIR}/boards/manifest.py)
-endif()
diff --git a/ports/esp32/boards/GENERIC_C3_USB/mpconfigboard.cmake b/ports/esp32/boards/GENERIC_C3_USB/mpconfigboard.cmake
index 2b65121b96cee..7436eead8783b 100644
--- a/ports/esp32/boards/GENERIC_C3_USB/mpconfigboard.cmake
+++ b/ports/esp32/boards/GENERIC_C3_USB/mpconfigboard.cmake
@@ -5,7 +5,3 @@ set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.ble
     boards/GENERIC_C3_USB/sdkconfig.board
 )
-
-if(NOT MICROPY_FROZEN_MANIFEST)
-    set(MICROPY_FROZEN_MANIFEST ${MICROPY_PORT_DIR}/boards/manifest.py)
-endif()
diff --git a/ports/esp32/boards/GENERIC_D2WD/mpconfigboard.cmake b/ports/esp32/boards/GENERIC_D2WD/mpconfigboard.cmake
index 729377a5b4234..88cc7a730e61e 100644
--- a/ports/esp32/boards/GENERIC_D2WD/mpconfigboard.cmake
+++ b/ports/esp32/boards/GENERIC_D2WD/mpconfigboard.cmake
@@ -3,7 +3,3 @@ set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.ble
     boards/GENERIC_D2WD/sdkconfig.board
 )
-
-if(NOT MICROPY_FROZEN_MANIFEST)
-    set(MICROPY_FROZEN_MANIFEST ${MICROPY_PORT_DIR}/boards/manifest.py)
-endif()
diff --git a/ports/esp32/boards/GENERIC_OTA/mpconfigboard.cmake b/ports/esp32/boards/GENERIC_OTA/mpconfigboard.cmake
index 88c0efa218ae7..8bc9d507af122 100644
--- a/ports/esp32/boards/GENERIC_OTA/mpconfigboard.cmake
+++ b/ports/esp32/boards/GENERIC_OTA/mpconfigboard.cmake
@@ -3,7 +3,3 @@ set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.ble
     boards/GENERIC_OTA/sdkconfig.board
 )
-
-if(NOT MICROPY_FROZEN_MANIFEST)
-    set(MICROPY_FROZEN_MANIFEST ${MICROPY_PORT_DIR}/boards/manifest.py)
-endif()
diff --git a/ports/esp32/boards/GENERIC_S2/mpconfigboard.cmake b/ports/esp32/boards/GENERIC_S2/mpconfigboard.cmake
index 73f2b24e66423..59ca906f4d47d 100644
--- a/ports/esp32/boards/GENERIC_S2/mpconfigboard.cmake
+++ b/ports/esp32/boards/GENERIC_S2/mpconfigboard.cmake
@@ -4,7 +4,3 @@ set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.base
     boards/sdkconfig.usb
 )
-
-if(NOT MICROPY_FROZEN_MANIFEST)
-    set(MICROPY_FROZEN_MANIFEST ${MICROPY_PORT_DIR}/boards/manifest.py)
-endif()
diff --git a/ports/esp32/boards/GENERIC_S3/mpconfigboard.cmake b/ports/esp32/boards/GENERIC_S3/mpconfigboard.cmake
index 58b1b25bb51f9..3d83f89044642 100644
--- a/ports/esp32/boards/GENERIC_S3/mpconfigboard.cmake
+++ b/ports/esp32/boards/GENERIC_S3/mpconfigboard.cmake
@@ -6,7 +6,3 @@ set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.ble
     boards/GENERIC_S3/sdkconfig.board
 )
-
-if(NOT MICROPY_FROZEN_MANIFEST)
-    set(MICROPY_FROZEN_MANIFEST ${MICROPY_PORT_DIR}/boards/manifest.py)
-endif()
diff --git a/ports/esp32/boards/GENERIC_S3_SPIRAM/mpconfigboard.cmake b/ports/esp32/boards/GENERIC_S3_SPIRAM/mpconfigboard.cmake
index 682c31456ffb8..b7351b90fe8e4 100644
--- a/ports/esp32/boards/GENERIC_S3_SPIRAM/mpconfigboard.cmake
+++ b/ports/esp32/boards/GENERIC_S3_SPIRAM/mpconfigboard.cmake
@@ -6,7 +6,3 @@ set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.spiram_sx
     boards/GENERIC_S3_SPIRAM/sdkconfig.board
 )
-
-if(NOT MICROPY_FROZEN_MANIFEST)
-    set(MICROPY_FROZEN_MANIFEST ${MICROPY_PORT_DIR}/boards/manifest.py)
-endif()
diff --git a/ports/esp32/boards/GENERIC_SPIRAM/mpconfigboard.cmake b/ports/esp32/boards/GENERIC_SPIRAM/mpconfigboard.cmake
index bb38f7df2b324..2e1d799b93b1c 100644
--- a/ports/esp32/boards/GENERIC_SPIRAM/mpconfigboard.cmake
+++ b/ports/esp32/boards/GENERIC_SPIRAM/mpconfigboard.cmake
@@ -3,7 +3,3 @@ set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.ble
     boards/sdkconfig.spiram
 )
-
-if(NOT MICROPY_FROZEN_MANIFEST)
-    set(MICROPY_FROZEN_MANIFEST ${MICROPY_PORT_DIR}/boards/manifest.py)
-endif()
diff --git a/ports/esp32/boards/LILYGO_TTGO_LORA32/mpconfigboard.cmake b/ports/esp32/boards/LILYGO_TTGO_LORA32/mpconfigboard.cmake
index c35e4e0743b2d..5bbac10e22f10 100644
--- a/ports/esp32/boards/LILYGO_TTGO_LORA32/mpconfigboard.cmake
+++ b/ports/esp32/boards/LILYGO_TTGO_LORA32/mpconfigboard.cmake
@@ -2,6 +2,5 @@ set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.base
     boards/sdkconfig.ble
 )
-if(NOT MICROPY_FROZEN_MANIFEST)
-    set(MICROPY_FROZEN_MANIFEST ${MICROPY_BOARD_DIR}/manifest.py)
-endif()
+
+set(MICROPY_FROZEN_MANIFEST ${MICROPY_BOARD_DIR}/manifest.py)
diff --git a/ports/esp32/boards/LOLIN_C3_MINI/mpconfigboard.cmake b/ports/esp32/boards/LOLIN_C3_MINI/mpconfigboard.cmake
index 9fe3b6411d13d..0ce7f85e5d580 100644
--- a/ports/esp32/boards/LOLIN_C3_MINI/mpconfigboard.cmake
+++ b/ports/esp32/boards/LOLIN_C3_MINI/mpconfigboard.cmake
@@ -6,6 +6,4 @@ set(SDKCONFIG_DEFAULTS
     boards/LOLIN_C3_MINI/sdkconfig.board
 )
 
-if(NOT MICROPY_FROZEN_MANIFEST)
-    set(MICROPY_FROZEN_MANIFEST ${MICROPY_BOARD_DIR}/manifest.py)
-endif()
+set(MICROPY_FROZEN_MANIFEST ${MICROPY_BOARD_DIR}/manifest.py)
diff --git a/ports/esp32/boards/LOLIN_S2_MINI/mpconfigboard.cmake b/ports/esp32/boards/LOLIN_S2_MINI/mpconfigboard.cmake
index 5f157e7e779fb..dc9abd7478bca 100644
--- a/ports/esp32/boards/LOLIN_S2_MINI/mpconfigboard.cmake
+++ b/ports/esp32/boards/LOLIN_S2_MINI/mpconfigboard.cmake
@@ -6,6 +6,4 @@ set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.usb
 )
 
-if(NOT MICROPY_FROZEN_MANIFEST)
-    set(MICROPY_FROZEN_MANIFEST ${MICROPY_BOARD_DIR}/manifest.py)
-endif()
+set(MICROPY_FROZEN_MANIFEST ${MICROPY_BOARD_DIR}/manifest.py)
diff --git a/ports/esp32/boards/LOLIN_S2_PICO/mpconfigboard.cmake b/ports/esp32/boards/LOLIN_S2_PICO/mpconfigboard.cmake
index 5f157e7e779fb..dc9abd7478bca 100644
--- a/ports/esp32/boards/LOLIN_S2_PICO/mpconfigboard.cmake
+++ b/ports/esp32/boards/LOLIN_S2_PICO/mpconfigboard.cmake
@@ -6,6 +6,4 @@ set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.usb
 )
 
-if(NOT MICROPY_FROZEN_MANIFEST)
-    set(MICROPY_FROZEN_MANIFEST ${MICROPY_BOARD_DIR}/manifest.py)
-endif()
+set(MICROPY_FROZEN_MANIFEST ${MICROPY_BOARD_DIR}/manifest.py)
diff --git a/ports/esp32/boards/M5STACK_ATOM/mpconfigboard.cmake b/ports/esp32/boards/M5STACK_ATOM/mpconfigboard.cmake
index 548337a479dad..f0355e2b0388b 100644
--- a/ports/esp32/boards/M5STACK_ATOM/mpconfigboard.cmake
+++ b/ports/esp32/boards/M5STACK_ATOM/mpconfigboard.cmake
@@ -5,6 +5,4 @@ set(SDKCONFIG_DEFAULTS
     boards/M5STACK_ATOM/sdkconfig.board
 )
 
-if(NOT MICROPY_FROZEN_MANIFEST)
-    set(MICROPY_FROZEN_MANIFEST ${MICROPY_BOARD_DIR}/manifest.py)
-endif()
+set(MICROPY_FROZEN_MANIFEST ${MICROPY_BOARD_DIR}/manifest.py)
diff --git a/ports/esp32/boards/SIL_WESP32/mpconfigboard.cmake b/ports/esp32/boards/SIL_WESP32/mpconfigboard.cmake
index 885d4eaa26c0c..a1460397b818b 100644
--- a/ports/esp32/boards/SIL_WESP32/mpconfigboard.cmake
+++ b/ports/esp32/boards/SIL_WESP32/mpconfigboard.cmake
@@ -4,7 +4,3 @@ set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.240mhz
     boards/SIL_WESP32/sdkconfig.board
 )
-
-if(NOT MICROPY_FROZEN_MANIFEST)
-    set(MICROPY_FROZEN_MANIFEST ${MICROPY_PORT_DIR}/boards/manifest.py)
-endif()
diff --git a/ports/esp32/boards/UM_TINYPICO/mpconfigboard.cmake b/ports/esp32/boards/UM_TINYPICO/mpconfigboard.cmake
index bc2541c69969d..58b42b55eb7fb 100644
--- a/ports/esp32/boards/UM_TINYPICO/mpconfigboard.cmake
+++ b/ports/esp32/boards/UM_TINYPICO/mpconfigboard.cmake
@@ -6,6 +6,4 @@ set(SDKCONFIG_DEFAULTS
     boards/UM_TINYPICO/sdkconfig.board
 )
 
-if(NOT MICROPY_FROZEN_MANIFEST)
-    set(MICROPY_FROZEN_MANIFEST ${MICROPY_BOARD_DIR}/manifest.py)
-endif()
+set(MICROPY_FROZEN_MANIFEST ${MICROPY_BOARD_DIR}/manifest.py)
diff --git a/ports/esp32/boards/UM_TINYS2/mpconfigboard.cmake b/ports/esp32/boards/UM_TINYS2/mpconfigboard.cmake
index 928f9f8fc35d2..e4b7b4a915c94 100644
--- a/ports/esp32/boards/UM_TINYS2/mpconfigboard.cmake
+++ b/ports/esp32/boards/UM_TINYS2/mpconfigboard.cmake
@@ -4,5 +4,3 @@ set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.spiram_sx
     boards/sdkconfig.usb
 )
-
-set(MICROPY_FROZEN_MANIFEST ${MICROPY_PORT_DIR}/boards/manifest.py)

From 587339022689187a1acbccc1d0e2425a67385ff7 Mon Sep 17 00:00:00 2001
From: Martin Fischer <fischer.carlito@gmail.com>
Date: Wed, 30 Mar 2022 23:00:46 +0200
Subject: [PATCH 1886/3533] rp2/mphalport: Fix USB CDC RX handling to not block
 when unprocessed.

Prior to this commit, the USB CDC OUT endpoint got NACK'd if a character
was received but not consumed by the application, e.g. via
sys.stdin.read().  This meant that USB CDC was blocked and no additional
characters could be sent from the host.  In particular a ctrl-C could not
interrupt the application if another character was pending.

To fix the issue, the approach in this commit uses a callback tud_cdc_rx_cb
which is called by the TinyUSB stack on reception of new CDC data.  By
consuming the data immediately, the endpoint does not stall anymore.  The
previous handler tud_cdc_rx_wanted_cb was made obsolete and removed.

In addition some cleanup was done along the way: by adding interrupt_char.c
and removing the existing code mp_hal_set_interrupt_char().  Also, there is
now only one (stdin) ringbuffer.

Fixes issue #7996.
---
 ports/rp2/CMakeLists.txt |  1 +
 ports/rp2/mphalport.c    | 80 ++++++++++++++++++++++------------------
 2 files changed, 46 insertions(+), 35 deletions(-)

diff --git a/ports/rp2/CMakeLists.txt b/ports/rp2/CMakeLists.txt
index d58fb56877820..a5e421734736f 100644
--- a/ports/rp2/CMakeLists.txt
+++ b/ports/rp2/CMakeLists.txt
@@ -72,6 +72,7 @@ set(MICROPY_SOURCE_LIB
     ${MICROPY_DIR}/shared/readline/readline.c
     ${MICROPY_DIR}/shared/runtime/gchelper_m0.s
     ${MICROPY_DIR}/shared/runtime/gchelper_native.c
+    ${MICROPY_DIR}/shared/runtime/interrupt_char.c
     ${MICROPY_DIR}/shared/runtime/mpirq.c
     ${MICROPY_DIR}/shared/runtime/pyexec.c
     ${MICROPY_DIR}/shared/runtime/stdout_helpers.c
diff --git a/ports/rp2/mphalport.c b/ports/rp2/mphalport.c
index c4169fb66c175..4a5221caec99d 100644
--- a/ports/rp2/mphalport.c
+++ b/ports/rp2/mphalport.c
@@ -28,50 +28,69 @@
 #include "py/stream.h"
 #include "py/mphal.h"
 #include "extmod/misc.h"
+#include "shared/runtime/interrupt_char.h"
 #include "shared/timeutils/timeutils.h"
 #include "tusb.h"
 #include "uart.h"
 #include "hardware/rtc.h"
 
-#if MICROPY_HW_ENABLE_UART_REPL
+#if MICROPY_HW_ENABLE_UART_REPL || MICROPY_HW_ENABLE_USBDEV
 
-#ifndef UART_BUFFER_LEN
-// reasonably big so we can paste
-#define UART_BUFFER_LEN 256
+#ifndef MICROPY_HW_STDIN_BUFFER_LEN
+#define MICROPY_HW_STDIN_BUFFER_LEN 512
 #endif
 
-STATIC uint8_t stdin_ringbuf_array[UART_BUFFER_LEN];
+STATIC uint8_t stdin_ringbuf_array[MICROPY_HW_STDIN_BUFFER_LEN];
 ringbuf_t stdin_ringbuf = { stdin_ringbuf_array, sizeof(stdin_ringbuf_array) };
 
 #endif
 
-#if MICROPY_KBD_EXCEPTION
+#if MICROPY_HW_ENABLE_USBDEV
 
-int mp_interrupt_char = -1;
+uint8_t cdc_itf_pending; // keep track of cdc interfaces which need attention to poll
 
-void tud_cdc_rx_wanted_cb(uint8_t itf, char wanted_char) {
-    (void)itf;
-    (void)wanted_char;
-    tud_cdc_read_char(); // discard interrupt char
-    mp_sched_keyboard_interrupt();
+void poll_cdc_interfaces(void) {
+    // any CDC interfaces left to poll?
+    if (cdc_itf_pending && ringbuf_free(&stdin_ringbuf)) {
+        for (uint8_t itf = 0; itf < 8; ++itf) {
+            if (cdc_itf_pending & (1 << itf)) {
+                tud_cdc_rx_cb(itf);
+                if (!cdc_itf_pending) {
+                    break;
+                }
+            }
+        }
+    }
 }
 
-void mp_hal_set_interrupt_char(int c) {
-    mp_interrupt_char = c;
-    tud_cdc_set_wanted_char(c);
+void tud_cdc_rx_cb(uint8_t itf) {
+    // consume pending USB data immediately to free usb buffer and keep the endpoint from stalling.
+    // in case the ringbuffer is full, mark the CDC interface that need attention later on for polling
+    cdc_itf_pending &= ~(1 << itf);
+    for (uint32_t bytes_avail = tud_cdc_n_available(itf); bytes_avail > 0; --bytes_avail) {
+        if (ringbuf_free(&stdin_ringbuf)) {
+            int data_char = tud_cdc_read_char();
+            if (data_char == mp_interrupt_char) {
+                mp_sched_keyboard_interrupt();
+            } else {
+                ringbuf_put(&stdin_ringbuf, data_char);
+            }
+        } else {
+            cdc_itf_pending |= (1 << itf);
+            return;
+        }
+    }
 }
 
 #endif
 
 uintptr_t mp_hal_stdio_poll(uintptr_t poll_flags) {
     uintptr_t ret = 0;
-    #if MICROPY_HW_ENABLE_UART_REPL
-    if ((poll_flags & MP_STREAM_POLL_RD) && ringbuf_peek(&stdin_ringbuf) != -1) {
-        ret |= MP_STREAM_POLL_RD;
-    }
-    #endif
     #if MICROPY_HW_ENABLE_USBDEV
-    if (tud_cdc_connected() && tud_cdc_available()) {
+    poll_cdc_interfaces();
+    #endif
+    #if MICROPY_HW_ENABLE_UART_REPL || MICROPY_HW_ENABLE_USBDEV
+    if ((poll_flags & MP_STREAM_POLL_RD) && ringbuf_peek(&stdin_ringbuf) != -1) {
         ret |= MP_STREAM_POLL_RD;
     }
     #endif
@@ -84,21 +103,14 @@ uintptr_t mp_hal_stdio_poll(uintptr_t poll_flags) {
 // Receive single character
 int mp_hal_stdin_rx_chr(void) {
     for (;;) {
-        #if MICROPY_HW_ENABLE_UART_REPL
+        #if MICROPY_HW_ENABLE_USBDEV
+        poll_cdc_interfaces();
+        #endif
+
         int c = ringbuf_get(&stdin_ringbuf);
         if (c != -1) {
             return c;
         }
-        #endif
-        #if MICROPY_HW_ENABLE_USBDEV
-        if (tud_cdc_connected() && tud_cdc_available()) {
-            uint8_t buf[1];
-            uint32_t count = tud_cdc_read(buf, sizeof(buf));
-            if (count) {
-                return buf[0];
-            }
-        }
-        #endif
         #if MICROPY_PY_OS_DUPTERM
         int dupterm_c = mp_uos_dupterm_rx_chr();
         if (dupterm_c >= 0) {
@@ -123,11 +135,9 @@ void mp_hal_stdout_tx_strn(const char *str, mp_uint_t len) {
                 n = CFG_TUD_CDC_EP_BUFSIZE;
             }
             while (n > tud_cdc_write_available()) {
-                tud_task();
-                tud_cdc_write_flush();
+                MICROPY_EVENT_POLL_HOOK
             }
             uint32_t n2 = tud_cdc_write(str + i, n);
-            tud_task();
             tud_cdc_write_flush();
             i += n2;
         }

From 43d50f006d60e40f5c716e095a98477b3e9b154d Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 7 Apr 2022 12:36:32 +1000
Subject: [PATCH 1887/3533] stm32/mpconfigport.h: Let MICROPY_PY_IO_FILEIO take
 its default value.

This is enabled at MICROPY_CONFIG_ROM_LEVEL_EXTRA_FEATURES, which is the
default for stm32.  Not setting the value in mpconfigboard.h allows boards
to optionally configure it.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/boards/B_L072Z_LRWAN1/mpconfigboard.h | 1 +
 ports/stm32/boards/NUCLEO_F091RC/mpconfigboard.h  | 1 +
 ports/stm32/boards/NUCLEO_L073RZ/mpconfigboard.h  | 1 +
 ports/stm32/mpconfigport.h                        | 1 -
 4 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/ports/stm32/boards/B_L072Z_LRWAN1/mpconfigboard.h b/ports/stm32/boards/B_L072Z_LRWAN1/mpconfigboard.h
index dfcca72afb55c..d4996e6c74d65 100644
--- a/ports/stm32/boards/B_L072Z_LRWAN1/mpconfigboard.h
+++ b/ports/stm32/boards/B_L072Z_LRWAN1/mpconfigboard.h
@@ -11,6 +11,7 @@
 #define MICROPY_PY_BUILTINS_COMPLEX (0)
 #define MICROPY_PY_GENERATOR_PEND_THROW (0)
 #define MICROPY_PY_MATH             (0)
+#define MICROPY_PY_IO_FILEIO        (0)
 #define MICROPY_PY_FRAMEBUF         (0)
 #define MICROPY_PY_USOCKET          (0)
 #define MICROPY_PY_NETWORK          (0)
diff --git a/ports/stm32/boards/NUCLEO_F091RC/mpconfigboard.h b/ports/stm32/boards/NUCLEO_F091RC/mpconfigboard.h
index 7df86d75fd087..9f65477edebae 100644
--- a/ports/stm32/boards/NUCLEO_F091RC/mpconfigboard.h
+++ b/ports/stm32/boards/NUCLEO_F091RC/mpconfigboard.h
@@ -4,6 +4,7 @@
 #define MICROPY_EMIT_THUMB          (0)
 #define MICROPY_EMIT_INLINE_THUMB   (0)
 #define MICROPY_OPT_COMPUTED_GOTO   (0)
+#define MICROPY_PY_IO_FILEIO        (0)
 #define MICROPY_PY_USOCKET          (0)
 #define MICROPY_PY_NETWORK          (0)
 #define MICROPY_PY_STM              (0)
diff --git a/ports/stm32/boards/NUCLEO_L073RZ/mpconfigboard.h b/ports/stm32/boards/NUCLEO_L073RZ/mpconfigboard.h
index c8c809eb4899e..9af925d45196c 100644
--- a/ports/stm32/boards/NUCLEO_L073RZ/mpconfigboard.h
+++ b/ports/stm32/boards/NUCLEO_L073RZ/mpconfigboard.h
@@ -11,6 +11,7 @@
 #define MICROPY_PY_BUILTINS_COMPLEX (0)
 #define MICROPY_PY_GENERATOR_PEND_THROW (0)
 #define MICROPY_PY_MATH             (0)
+#define MICROPY_PY_IO_FILEIO        (0)
 #define MICROPY_PY_FRAMEBUF         (0)
 #define MICROPY_PY_USOCKET          (0)
 #define MICROPY_PY_NETWORK          (0)
diff --git a/ports/stm32/mpconfigport.h b/ports/stm32/mpconfigport.h
index 18a2edc426eac..a52b2cc50508a 100644
--- a/ports/stm32/mpconfigport.h
+++ b/ports/stm32/mpconfigport.h
@@ -82,7 +82,6 @@
 #ifndef MICROPY_PY_BUILTINS_HELP_TEXT
 #define MICROPY_PY_BUILTINS_HELP_TEXT stm32_help_text
 #endif
-#define MICROPY_PY_IO_FILEIO        (MICROPY_VFS_FAT || MICROPY_VFS_LFS1 || MICROPY_VFS_LFS2)
 #ifndef MICROPY_PY_SYS_PLATFORM     // let boards override it if they want
 #define MICROPY_PY_SYS_PLATFORM     "pyboard"
 #endif

From 66b5c4c770b0d7a9f07cdb31fce94edda2fe3c13 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 7 Apr 2022 21:17:51 +1000
Subject: [PATCH 1888/3533] stm32/machine_bitstream: Include all clobbered regs
 in Cortex-M0 impl.

These additional registers are used by the assembly code.

Thanks to Jim Mussared for the fix.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/machine_bitstream.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/stm32/machine_bitstream.c b/ports/stm32/machine_bitstream.c
index 6cc3679375e8a..3e1a7d6f1b929 100644
--- a/ports/stm32/machine_bitstream.c
+++ b/ports/stm32/machine_bitstream.c
@@ -146,7 +146,7 @@ void machine_bitstream_high_low(mp_hal_pin_obj_t pin, uint32_t *timing_ns, const
         ".done:\n"
         :
         : "m" (len), "m" (buf), "m" (timing_ns), "m" (bsrr), "m" (high_mask), "m" (low_mask)
-        : "r0", "r1", "r2", "r3", "r7", "r8"
+        : "r0", "r1", "r2", "r3", "r4", "r5", "r6", "r7", "r8"
         );
 
     MICROPY_END_ATOMIC_SECTION(atomic_state);

From 798a29f62901d1c790f834bc8e3b03743ca02b8d Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Wed, 9 Mar 2022 20:21:03 +0100
Subject: [PATCH 1889/3533] mimxrt/boards: Add board.json file for OLIMEX
 RT1010Py.

---
 ports/mimxrt/boards/OLIMEX_RT1010/board.json | 21 ++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 ports/mimxrt/boards/OLIMEX_RT1010/board.json

diff --git a/ports/mimxrt/boards/OLIMEX_RT1010/board.json b/ports/mimxrt/boards/OLIMEX_RT1010/board.json
new file mode 100644
index 0000000000000..648114db5cf89
--- /dev/null
+++ b/ports/mimxrt/boards/OLIMEX_RT1010/board.json
@@ -0,0 +1,21 @@
+{
+    "deploy": [
+        "../deploy_mimxrt.md"
+    ],
+    "docs": "",
+    "features": [
+        "MicroUSB",
+        "MicroSD",
+        "AudioCodec",
+        "SPDIF",
+        "JLink"
+    ],
+    "images": [
+        "OLIMEX_RT1010Py.jpg"
+    ],
+    "mcu": "mimxrt",
+    "product": "Olimex_RT1010Py",
+    "thumbnail": "",
+    "url": "https://www.olimex.com/Products/ARM/NXP",
+    "vendor": "OLIMEX"
+}

From e3030f74361c5e930107aaf973963447ad36575a Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Fri, 11 Mar 2022 20:22:07 +0100
Subject: [PATCH 1890/3533] mimxrt/modules: Append /flash/lib to the default
 sys.path.

---
 ports/mimxrt/modules/_boot.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/mimxrt/modules/_boot.py b/ports/mimxrt/modules/_boot.py
index bc8d72224a933..56f12a4ce1590 100644
--- a/ports/mimxrt/modules/_boot.py
+++ b/ports/mimxrt/modules/_boot.py
@@ -16,6 +16,7 @@
 os.mount(vfs, "/flash")
 os.chdir("/flash")
 sys.path.append("/flash")
+sys.path.append("/flash/lib")
 
 # do not mount the SD card if SKIPSD exists.
 try:

From b70b8ce3e4f213e297b4438dbfca7412525a3785 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Mon, 14 Mar 2022 20:38:46 +0100
Subject: [PATCH 1891/3533] mimxrt/machine_rtc: Start RTC at boot and set
 datetime if not set.

Changes in this commit:
- Start the RTC Timer at system boot.  Otherwise time.time() will advance
  only if an RTC() object was created.
- Set the time to a more recent date than Jan 1, 1970, if not set.  That is
  2013/10/14, 19:53:11, MicroPython's first commit.
- Compensate an underflow in in timeutils_seconds_since_2000(), called by
  time.time(), if the time is set to a pre-2000 date.
---
 ports/mimxrt/board_init.c    |  2 ++
 ports/mimxrt/machine_rtc.c   | 24 +++++++++++++++++++++---
 ports/mimxrt/modmachine.h    |  1 +
 ports/mimxrt/modutime.c      | 11 ++++++++++-
 shared/timeutils/timeutils.h |  1 +
 5 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/ports/mimxrt/board_init.c b/ports/mimxrt/board_init.c
index 82af620a8d9ba..398fafc6c3772 100644
--- a/ports/mimxrt/board_init.c
+++ b/ports/mimxrt/board_init.c
@@ -100,6 +100,8 @@ void board_init(void) {
     #if MICROPY_PY_MACHINE_I2S
     machine_i2s_init0();
     #endif
+    // RTC
+    machine_rtc_start();
 }
 
 void USB_OTG1_IRQHandler(void) {
diff --git a/ports/mimxrt/machine_rtc.c b/ports/mimxrt/machine_rtc.c
index f08e73fa550e0..e0d33554b5594 100644
--- a/ports/mimxrt/machine_rtc.c
+++ b/ports/mimxrt/machine_rtc.c
@@ -40,13 +40,31 @@ typedef struct _machine_rtc_obj_t {
 STATIC const machine_rtc_obj_t machine_rtc_obj = {{&machine_rtc_type}};
 uint32_t us_offset = 0;
 
+// Start the RTC Timer.
+void machine_rtc_start(void) {
+
+    SNVS_LP_SRTC_StartTimer(SNVS);
+    // If the date is not set, set it to a more recent start date,
+    // MicroPython's first commit.
+    snvs_lp_srtc_datetime_t srtc_date;
+    SNVS_LP_SRTC_GetDatetime(SNVS, &srtc_date);
+    if (srtc_date.year <= 1970) {
+        srtc_date = (snvs_lp_srtc_datetime_t) {
+            .year = 2013,
+            .month = 10,
+            .day = 14,
+            .hour = 19,
+            .minute = 53,
+            .second = 11,
+        };
+        SNVS_LP_SRTC_SetDatetime(SNVS, &srtc_date);
+    }
+}
+
 STATIC mp_obj_t machine_rtc_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
     // Check arguments.
     mp_arg_check_num(n_args, n_kw, 0, 0, false);
 
-    // Start up the RTC if needed.
-    SNVS_LP_SRTC_StartTimer(SNVS);
-
     // Return constant object.
     return (mp_obj_t)&machine_rtc_obj;
 }
diff --git a/ports/mimxrt/modmachine.h b/ports/mimxrt/modmachine.h
index 6502eea09f349..ed1c4e34a07c9 100644
--- a/ports/mimxrt/modmachine.h
+++ b/ports/mimxrt/modmachine.h
@@ -48,5 +48,6 @@ void machine_sdcard_init0(void);
 void mimxrt_sdram_init(void);
 void machine_i2s_init0();
 void machine_i2s_deinit_all(void);
+void machine_rtc_start(void);
 
 #endif // MICROPY_INCLUDED_MIMXRT_MODMACHINE_H
diff --git a/ports/mimxrt/modutime.c b/ports/mimxrt/modutime.c
index d3be7c2ea6d96..822e2771d25aa 100644
--- a/ports/mimxrt/modutime.c
+++ b/ports/mimxrt/modutime.c
@@ -95,7 +95,16 @@ MP_DEFINE_CONST_FUN_OBJ_1(time_mktime_obj, time_mktime);
 STATIC mp_obj_t time_time(void) {
     snvs_lp_srtc_datetime_t t;
     SNVS_LP_SRTC_GetDatetime(SNVS, &t);
-    return mp_obj_new_int_from_ull(timeutils_seconds_since_epoch(t.year, t.month, t.day, t.hour, t.minute, t.second));
+    // EPOCH is 1970 for this port, which leads to the following trouble:
+    // timeutils_seconds_since_epoch() calls timeutils_seconds_since_2000(), and
+    // timeutils_seconds_since_2000() subtracts 2000 from year, but uses
+    // an unsigned number for seconds, That causes an underrun, which is not
+    // fixed by adding the TIMEUTILS_SECONDS_1970_TO_2000.
+    // Masking it to 32 bit for year < 2000 fixes it.
+    return mp_obj_new_int_from_ull(
+        timeutils_seconds_since_epoch(t.year, t.month, t.day, t.hour, t.minute, t.second)
+        & (t.year < 2000 ? 0xffffffff : 0xffffffffffff)
+        );
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_0(time_time_obj, time_time);
 
diff --git a/shared/timeutils/timeutils.h b/shared/timeutils/timeutils.h
index 66e2a77f139ed..9f4b500caa7b6 100644
--- a/shared/timeutils/timeutils.h
+++ b/shared/timeutils/timeutils.h
@@ -69,6 +69,7 @@ static inline uint64_t timeutils_mktime(mp_uint_t year, mp_int_t month, mp_int_t
 
 static inline uint64_t timeutils_seconds_since_epoch(mp_uint_t year, mp_uint_t month,
     mp_uint_t date, mp_uint_t hour, mp_uint_t minute, mp_uint_t second) {
+    // TODO this will give incorrect results for dates before 2000/1/1
     return timeutils_seconds_since_2000(year, month, date, hour, minute, second) + TIMEUTILS_SECONDS_1970_TO_2000;
 }
 

From 752fe759104172af2e8cbd7a3713b29134bd5a7f Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sun, 20 Mar 2022 13:20:10 +0100
Subject: [PATCH 1892/3533] mimxrt/machine_spi: Improve handling of busy SPI
 peripheral.

This commit changes the method of waiting for SPI being not busy.  Instead
of the FIFO size, the TransferBusyFlag is probed.

Also, raise an error if the transfer failed.
---
 ports/mimxrt/machine_spi.c | 28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/ports/mimxrt/machine_spi.c b/ports/mimxrt/machine_spi.c
index b8b5a4d5b5b0f..2235732790888 100644
--- a/ports/mimxrt/machine_spi.c
+++ b/ports/mimxrt/machine_spi.c
@@ -277,6 +277,10 @@ STATIC void machine_spi_transfer(mp_obj_base_t *self_in, size_t len, const uint8
         LPSPI_MasterTransferCreateHandleEDMA(self->spi_inst, &g_master_edma_handle, LPSPI_EDMAMasterCallback, self,
             &lpspiEdmaMasterRxRegToRxDataHandle,
             &lpspiEdmaMasterTxDataToTxRegHandle);
+
+        // Wait a short while for a previous transfer to finish, but not forever
+        for (volatile int j = 0; (j < 5000) && ((LPSPI_GetStatusFlags(self->spi_inst) & kLPSPI_ModuleBusyFlag) != 0); j++) {}
+
         // Start master transfer
         lpspi_transfer_t masterXfer;
         masterXfer.txData = (uint8_t *)src;
@@ -297,12 +301,15 @@ STATIC void machine_spi_transfer(mp_obj_base_t *self_in, size_t len, const uint8
         } else if (src) {
             DCACHE_CleanByRange((uint32_t)src, len);
         }
-        LPSPI_MasterTransferEDMA(self->spi_inst, &g_master_edma_handle, &masterXfer);
-
-        while (self->transfer_busy) {
-            MICROPY_EVENT_POLL_HOOK
+        if (LPSPI_MasterTransferEDMA(self->spi_inst, &g_master_edma_handle, &masterXfer) != kStatus_Success) {
+            L1CACHE_EnableDCache();
+            mp_raise_OSError(EIO);
+        } else {
+            while (self->transfer_busy) {
+                MICROPY_EVENT_POLL_HOOK
+            }
+            L1CACHE_EnableDCache();
         }
-        L1CACHE_EnableDCache();
     }
     // Release DMA channels, even if never allocated.
     if (chan_rx >= 0) {
@@ -313,10 +320,9 @@ STATIC void machine_spi_transfer(mp_obj_base_t *self_in, size_t len, const uint8
     }
 
     if (!use_dma) {
-        // Wait until a previous Transfer is finished
-        while (LPSPI_GetTxFifoCount(self->spi_inst) > 0) {
-            MICROPY_EVENT_POLL_HOOK
-        }
+        // Wait a short while for a previous transfer to finish, but not forever
+        for (volatile int j = 0; (j < 5000) && ((LPSPI_GetStatusFlags(self->spi_inst) & kLPSPI_ModuleBusyFlag) != 0); j++) {}
+
         // Reconfigure the TCR, required after switch between DMA vs. non-DMA
         LPSPI_Enable(self->spi_inst, false);  // Disable first before new settings are applied
         self->spi_inst->TCR = LPSPI_TCR_CPOL(self->master_config->cpol) | LPSPI_TCR_CPHA(self->master_config->cpha) |
@@ -330,7 +336,9 @@ STATIC void machine_spi_transfer(mp_obj_base_t *self_in, size_t len, const uint8
         masterXfer.dataSize = len;
         masterXfer.configFlags = (self->master_config->whichPcs << LPSPI_MASTER_PCS_SHIFT) | kLPSPI_MasterPcsContinuous | kLPSPI_MasterByteSwap;
 
-        LPSPI_MasterTransferBlocking(self->spi_inst, &masterXfer);
+        if (LPSPI_MasterTransferBlocking(self->spi_inst, &masterXfer) != kStatus_Success) {
+            mp_raise_OSError(EIO);
+        }
     }
 }
 

From ca41eda281052ecf64374f35dcf282a96e68661a Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sun, 27 Mar 2022 08:50:34 +0200
Subject: [PATCH 1893/3533] mimxrt/mphalport: Fix USB CDC RX handling to not
 block when unprocessed.

Changes in this commit:
- Fix USB CDC RX handling to not block when unprocessed.  The fix follows
  587339022689187a1acbccc1d0e2425a67385ff7.
- Fix dupterm rx.
- Remove some obsolete lines.
---
 ports/mimxrt/Makefile    |  1 +
 ports/mimxrt/mphalport.c | 85 +++++++++++++++++++++++-----------------
 2 files changed, 49 insertions(+), 37 deletions(-)

diff --git a/ports/mimxrt/Makefile b/ports/mimxrt/Makefile
index f9c5bf402a08f..985ece0845df1 100644
--- a/ports/mimxrt/Makefile
+++ b/ports/mimxrt/Makefile
@@ -256,6 +256,7 @@ SRC_C += \
 	shared/netutils/dhcpserver.c \
 	shared/readline/readline.c \
 	shared/runtime/gchelper_native.c \
+	shared/runtime/interrupt_char.c \
 	shared/runtime/mpirq.c \
 	shared/runtime/pyexec.c \
 	shared/runtime/stdout_helpers.c \
diff --git a/ports/mimxrt/mphalport.c b/ports/mimxrt/mphalport.c
index 673b58b23f878..46349d3a37f63 100644
--- a/ports/mimxrt/mphalport.c
+++ b/ports/mimxrt/mphalport.c
@@ -29,68 +29,82 @@
 #include "py/stream.h"
 #include "py/mphal.h"
 #include "shared/timeutils/timeutils.h"
+#include "shared/runtime/interrupt_char.h"
 #include "extmod/misc.h"
 #include "ticks.h"
 #include "tusb.h"
 #include "fsl_snvs_lp.h"
 
-#if FSL_COMMON_DRIVER_VERSION != 0x020001
-#include "fsl_ocotp.h"
-#else
-void OCOTP_Init(OCOTP_Type *base, uint32_t srcClock_Hz);
+#ifndef MICROPY_HW_STDIN_BUFFER_LEN
+#define MICROPY_HW_STDIN_BUFFER_LEN 512
 #endif
 
 #include CPU_HEADER_H
 
-STATIC uint8_t stdin_ringbuf_array[260];
+STATIC uint8_t stdin_ringbuf_array[MICROPY_HW_STDIN_BUFFER_LEN];
 ringbuf_t stdin_ringbuf = {stdin_ringbuf_array, sizeof(stdin_ringbuf_array), 0, 0};
 
-#if MICROPY_KBD_EXCEPTION
-
-int mp_interrupt_char = -1;
-
-void tud_cdc_rx_wanted_cb(uint8_t itf, char wanted_char) {
-    (void)itf;
-    (void)wanted_char;
-    tud_cdc_read_char(); // discard interrupt char
-    mp_sched_keyboard_interrupt();
+uint8_t cdc_itf_pending; // keep track of cdc interfaces which need attention to poll
+
+void poll_cdc_interfaces(void) {
+    // any CDC interfaces left to poll?
+    if (cdc_itf_pending && ringbuf_free(&stdin_ringbuf)) {
+        for (uint8_t itf = 0; itf < 8; ++itf) {
+            if (cdc_itf_pending & (1 << itf)) {
+                tud_cdc_rx_cb(itf);
+                if (!cdc_itf_pending) {
+                    break;
+                }
+            }
+        }
+    }
 }
 
-void mp_hal_set_interrupt_char(int c) {
-    mp_interrupt_char = c;
-    tud_cdc_set_wanted_char(c);
-}
 
-#endif
+void tud_cdc_rx_cb(uint8_t itf) {
+    // consume pending USB data immediately to free usb buffer and keep the endpoint from stalling.
+    // in case the ringbuffer is full, mark the CDC interface that need attention later on for polling
+    cdc_itf_pending &= ~(1 << itf);
+    for (uint32_t bytes_avail = tud_cdc_n_available(itf); bytes_avail > 0; --bytes_avail) {
+        if (ringbuf_free(&stdin_ringbuf)) {
+            int data_char = tud_cdc_read_char();
+            if (data_char == mp_interrupt_char) {
+                mp_sched_keyboard_interrupt();
+            } else {
+                ringbuf_put(&stdin_ringbuf, data_char);
+            }
+        } else {
+            cdc_itf_pending |= (1 << itf);
+            return;
+        }
+    }
+}
 
 uintptr_t mp_hal_stdio_poll(uintptr_t poll_flags) {
     uintptr_t ret = 0;
+    poll_cdc_interfaces();
     if ((poll_flags & MP_STREAM_POLL_RD) && ringbuf_peek(&stdin_ringbuf) != -1) {
         ret |= MP_STREAM_POLL_RD;
     }
-    if (tud_cdc_connected() && tud_cdc_available()) {
-        ret |= MP_STREAM_POLL_RD;
-    }
+    #if MICROPY_PY_OS_DUPTERM
+    ret |= mp_uos_dupterm_poll(poll_flags);
+    #endif
     return ret;
 }
 
 int mp_hal_stdin_rx_chr(void) {
     for (;;) {
-        // TODO
-        // if (USARTx->USART.INTFLAG.bit.RXC) {
-        //     return USARTx->USART.DATA.bit.DATA;
-        // }
+        poll_cdc_interfaces();
         int c = ringbuf_get(&stdin_ringbuf);
         if (c != -1) {
             return c;
         }
-        if (tud_cdc_connected() && tud_cdc_available()) {
-            uint8_t buf[1];
-            uint32_t count = tud_cdc_read(buf, sizeof(buf));
-            if (count) {
-                return buf[0];
-            }
+        #if MICROPY_PY_OS_DUPTERM
+        int dupterm_c = mp_uos_dupterm_rx_chr();
+        if (dupterm_c >= 0) {
+            return dupterm_c;
         }
+        #endif
         MICROPY_EVENT_POLL_HOOK
     }
 }
@@ -110,12 +124,9 @@ void mp_hal_stdout_tx_strn(const char *str, mp_uint_t len) {
             i += n2;
         }
     }
+    #if MICROPY_PY_OS_DUPTERM
     mp_uos_dupterm_tx_strn(str, len);
-    // TODO
-    // while (len--) {
-    //     while (!(USARTx->USART.INTFLAG.bit.DRE)) { }
-    //     USARTx->USART.DATA.bit.DATA = *str++;
-    // }
+    #endif
 }
 
 uint64_t mp_hal_time_ns(void) {

From b59989f40edeca1a7c239eb017c353010e1837d7 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 11 Apr 2022 13:04:31 +1000
Subject: [PATCH 1894/3533] rp2/Makefile: Add mbedtls to GIT_SUBMODULES list
 and use it in CI func.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/rp2/Makefile | 2 +-
 tools/ci.sh        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/rp2/Makefile b/ports/rp2/Makefile
index 2d1e6d6f5cebc..461a27acad890 100644
--- a/ports/rp2/Makefile
+++ b/ports/rp2/Makefile
@@ -25,7 +25,7 @@ all:
 clean:
 	$(RM) -rf $(BUILD)
 
-GIT_SUBMODULES += lib/pico-sdk lib/tinyusb
+GIT_SUBMODULES += lib/mbedtls lib/pico-sdk lib/tinyusb
 
 submodules:
 	$(MAKE) -f ../../py/mkrules.mk GIT_SUBMODULES="$(GIT_SUBMODULES)" submodules
diff --git a/tools/ci.sh b/tools/ci.sh
index 98c95465c04ad..bf60d788a5ef4 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -256,7 +256,7 @@ function ci_rp2_setup {
 
 function ci_rp2_build {
     make ${MAKEOPTS} -C mpy-cross
-    git submodule update --init lib/mbedtls lib/pico-sdk lib/tinyusb
+    make ${MAKEOPTS} -C ports/rp2 submodules
     make ${MAKEOPTS} -C ports/rp2
     make ${MAKEOPTS} -C ports/rp2 clean
     make ${MAKEOPTS} -C ports/rp2 USER_C_MODULES=../../examples/usercmodule/micropython.cmake

From 56978c3dde3440367438a89353ba73b32c8cdbc2 Mon Sep 17 00:00:00 2001
From: Rob Knegjens <rob@knegjens.net>
Date: Tue, 5 Apr 2022 16:05:28 -0700
Subject: [PATCH 1895/3533] tools/mpremote: Show progress indicator when
 copying large files.

When copying large files (> 2048 bytes) to or from a device with
`mpremote cp` a progress bar and percentage counter are temporarily shown.
---
 tools/mpremote/mpremote/main.py | 29 +++++++++++++++++++++++++++--
 tools/pyboard.py                | 20 ++++++++++++++++----
 2 files changed, 43 insertions(+), 6 deletions(-)

diff --git a/tools/mpremote/mpremote/main.py b/tools/mpremote/mpremote/main.py
index 524b2ec80a8c6..50ad73cc177d9 100644
--- a/tools/mpremote/mpremote/main.py
+++ b/tools/mpremote/mpremote/main.py
@@ -268,6 +268,27 @@ def do_disconnect(pyb):
     pyb.close()
 
 
+def show_progress_bar(size, total_size):
+    if not sys.stdout.isatty():
+        return
+    verbose_size = 2048
+    bar_length = 20
+    if total_size < verbose_size:
+        return
+    elif size >= total_size:
+        # Clear progress bar when copy completes
+        print("\r" + " " * (20 + bar_length) + "\r", end="")
+    else:
+        progress = size / total_size
+        bar = round(progress * bar_length)
+        print(
+            "\r ... copying {:3.0f}% [{}{}]".format(
+                progress * 100, "#" * bar, "-" * (bar_length - bar)
+            ),
+            end="",
+        )
+
+
 def do_filesystem(pyb, args):
     def _list_recursive(files, path):
         if os.path.isdir(path):
@@ -293,9 +314,13 @@ def _list_recursive(files, path):
                 if d not in known_dirs:
                     pyb.exec_("try:\n uos.mkdir('%s')\nexcept OSError as e:\n print(e)" % d)
                     known_dirs.add(d)
-            pyboard.filesystem_command(pyb, ["cp", "/".join((dir, file)), ":" + dir + "/"])
+            pyboard.filesystem_command(
+                pyb,
+                ["cp", "/".join((dir, file)), ":" + dir + "/"],
+                progress_callback=show_progress_bar,
+            )
     else:
-        pyboard.filesystem_command(pyb, args)
+        pyboard.filesystem_command(pyb, args, progress_callback=show_progress_bar)
     args.clear()
 
 
diff --git a/tools/pyboard.py b/tools/pyboard.py
index 15ddfd745d589..a9a4cbff87155 100755
--- a/tools/pyboard.py
+++ b/tools/pyboard.py
@@ -491,7 +491,10 @@ def fs_cat(self, src, chunk_size=256):
         )
         self.exec_(cmd, data_consumer=stdout_write_bytes)
 
-    def fs_get(self, src, dest, chunk_size=256):
+    def fs_get(self, src, dest, chunk_size=256, progress_callback=None):
+        if progress_callback:
+            src_size = int(self.exec_("import os\nprint(os.stat('%s')[6])" % src))
+            written = 0
         self.exec_("f=open('%s','rb')\nr=f.read" % src)
         with open(dest, "wb") as f:
             while True:
@@ -507,9 +510,15 @@ def fs_get(self, src, dest, chunk_size=256):
                 if not data:
                     break
                 f.write(data)
+                if progress_callback:
+                    written += len(data)
+                    progress_callback(written, src_size)
         self.exec_("f.close()")
 
-    def fs_put(self, src, dest, chunk_size=256):
+    def fs_put(self, src, dest, chunk_size=256, progress_callback=None):
+        if progress_callback:
+            src_size = os.path.getsize(src)
+            written = 0
         self.exec_("f=open('%s','wb')\nw=f.write" % dest)
         with open(src, "rb") as f:
             while True:
@@ -520,6 +529,9 @@ def fs_put(self, src, dest, chunk_size=256):
                     self.exec_("w(b" + repr(data) + ")")
                 else:
                     self.exec_("w(" + repr(data) + ")")
+                if progress_callback:
+                    written += len(data)
+                    progress_callback(written, src_size)
         self.exec_("f.close()")
 
     def fs_mkdir(self, dir):
@@ -546,7 +558,7 @@ def execfile(filename, device="/dev/ttyACM0", baudrate=115200, user="micro", pas
     pyb.close()
 
 
-def filesystem_command(pyb, args):
+def filesystem_command(pyb, args, progress_callback=None):
     def fname_remote(src):
         if src.startswith(":"):
             src = src[1:]
@@ -579,7 +591,7 @@ def fname_cp_dest(src, dest):
                 src = fname_remote(src)
                 dest2 = fname_cp_dest(src, dest)
                 print(fmt % (src, dest2))
-                op(src, dest2)
+                op(src, dest2, progress_callback=progress_callback)
         else:
             op = {
                 "ls": pyb.fs_ls,

From d3d862769ad9f1317702b921dda1912d9a673948 Mon Sep 17 00:00:00 2001
From: Rob Knegjens <rob@knegjens.net>
Date: Wed, 6 Apr 2022 10:56:28 -0700
Subject: [PATCH 1896/3533] tools/mpremote: Add option to mount cmd to allow
 "unsafe" symlinks.

Specifying the option `--unsafe-links` (or `-l`) to `mpremote mount` will
allow symlinks to be followed in the local directory that point outside of
the base directory path.

For the unsafe case the `path_check()` method of `PyboardCommand` still
checks for a common path but without expanding symlinks.  While this check
is currently redundant, it makes the purpose of the method clearer for
possible future uses or extensions.
---
 docs/reference/mpremote.rst                |  9 ++++++++-
 tools/mpremote/mpremote/main.py            | 17 +++++++++++++++--
 tools/mpremote/mpremote/pyboardextended.py | 15 ++++++++++-----
 3 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/docs/reference/mpremote.rst b/docs/reference/mpremote.rst
index 727431fcffb90..2bbed56b89144 100644
--- a/docs/reference/mpremote.rst
+++ b/docs/reference/mpremote.rst
@@ -133,13 +133,20 @@ The full list of supported commands are:
 
   .. code-block:: bash
 
-      $ mpremote mount <local-dir>
+      $ mpremote mount [options] <local-dir>
 
   During usage, Ctrl-D will soft-reboot and normally reconnect the mount automatically.
   If the unit has a main.py running at startup however the remount cannot occur.
   In this case a raw mode soft reboot can be used: Ctrl-A Ctrl-D to reboot,
   then Ctrl-B to get back to normal repl at which point the mount will be ready.
 
+  Options are:
+
+  - ``-l``, ``--unsafe-links``: By default an error will be raised if the device
+    accesses a file or directory which is outside (up one or more directory levels) the
+    local directory that is mounted.  This option disables this check for symbolic
+    links, allowing the device to follow symbolic links outside of the local directory.
+
 - unmount the local directory from the remote device:
 
   .. code-block:: bash
diff --git a/tools/mpremote/mpremote/main.py b/tools/mpremote/mpremote/main.py
index 50ad73cc177d9..ccf174bb5b327 100644
--- a/tools/mpremote/mpremote/main.py
+++ b/tools/mpremote/mpremote/main.py
@@ -41,7 +41,16 @@
     "disconnect": (False, False, 0, "disconnect current device"),
     "resume": (False, False, 0, "resume a previous mpremote session (will not auto soft-reset)"),
     "soft-reset": (False, True, 0, "perform a soft-reset of the device"),
-    "mount": (True, False, 1, "mount local directory on device"),
+    "mount": (
+        True,
+        False,
+        1,
+        """\
+        mount local directory on device
+        options:
+            --unsafe-links, -l
+                follow symbolic links pointing outside of local directory""",
+    ),
     "umount": (True, False, 0, "unmount the local directory"),
     "repl": (
         False,
@@ -516,8 +525,12 @@ def main():
                 pyb.enter_raw_repl(soft_reset=True)
                 auto_soft_reset = False
             elif cmd == "mount":
+                unsafe_links = False
+                if args[0] == "--unsafe-links" or args[0] == "-l":
+                    args.pop(0)
+                    unsafe_links = True
                 path = args.pop(0)
-                pyb.mount_local(path)
+                pyb.mount_local(path, unsafe_links=unsafe_links)
                 print(f"Local directory {path} is mounted at /remote")
             elif cmd == "umount":
                 pyb.umount_local()
diff --git a/tools/mpremote/mpremote/pyboardextended.py b/tools/mpremote/mpremote/pyboardextended.py
index ccdb37a0ce546..d3b4cb6d8c72a 100644
--- a/tools/mpremote/mpremote/pyboardextended.py
+++ b/tools/mpremote/mpremote/pyboardextended.py
@@ -351,12 +351,13 @@ def __mount():
 
 
 class PyboardCommand:
-    def __init__(self, fin, fout, path):
+    def __init__(self, fin, fout, path, unsafe_links=False):
         self.fin = fin
         self.fout = fout
         self.root = path + "/"
         self.data_ilistdir = ["", []]
         self.data_files = []
+        self.unsafe_links = unsafe_links
 
     def rd_s8(self):
         return struct.unpack("<b", self.fin.read(1))[0]
@@ -397,8 +398,12 @@ def log_cmd(self, msg):
         print(f"[{msg}]", end="\r\n")
 
     def path_check(self, path):
-        parent = os.path.realpath(self.root)
-        child = os.path.realpath(path)
+        if not self.unsafe_links:
+            parent = os.path.realpath(self.root)
+            child = os.path.realpath(path)
+        else:
+            parent = os.path.abspath(self.root)
+            child = os.path.abspath(path)
         if parent != os.path.commonpath([parent, child]):
             raise OSError(EPERM, "")  # File is outside mounted dir
 
@@ -612,13 +617,13 @@ def __init__(self, dev, *args, **kwargs):
         self.device_name = dev
         self.mounted = False
 
-    def mount_local(self, path):
+    def mount_local(self, path, unsafe_links=False):
         fout = self.serial
         if self.eval('"RemoteFS" in globals()') == b"False":
             self.exec_(fs_hook_code)
         self.exec_("__mount()")
         self.mounted = True
-        self.cmd = PyboardCommand(self.serial, fout, path)
+        self.cmd = PyboardCommand(self.serial, fout, path, unsafe_links=unsafe_links)
         self.serial = SerialIntercept(self.serial, self.cmd)
 
     def write_ctrl_d(self, out_callback):

From 919f696ad254bcc39effe7ce7fddae8cf406c954 Mon Sep 17 00:00:00 2001
From: Jon Bjarni Bjarnason <jbbjarnason@gmail.com>
Date: Wed, 16 Feb 2022 11:44:17 -0500
Subject: [PATCH 1897/3533] extmod/modusocket: Implement optional socket.listen
 backlog argument.

This follows the CPython change: https://bugs.python.org/issue21455

Socket listen backlog defaults to 2 if not given, based on most bare metal
targets not having many resources for a large backlog.  On UNIX it defaults
to SOMAXCONN or 128, whichever is less.
---
 extmod/modlwip.c               | 13 +++++++++----
 extmod/modusocket.c            | 16 +++++++++++-----
 ports/cc3200/mods/modusocket.c |  2 +-
 ports/esp32/modsocket.c        | 15 +++++++++++----
 ports/unix/modusocket.c        | 16 ++++++++++++----
 ports/zephyr/modusocket.c      | 12 +++++++++---
 tests/multi_net/tcp_data.py    |  2 +-
 7 files changed, 54 insertions(+), 22 deletions(-)

diff --git a/extmod/modlwip.c b/extmod/modlwip.c
index 8811742d6e440..e62d4e7e4da71 100644
--- a/extmod/modlwip.c
+++ b/extmod/modlwip.c
@@ -911,9 +911,14 @@ STATIC mp_obj_t lwip_socket_bind(mp_obj_t self_in, mp_obj_t addr_in) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_2(lwip_socket_bind_obj, lwip_socket_bind);
 
-STATIC mp_obj_t lwip_socket_listen(mp_obj_t self_in, mp_obj_t backlog_in) {
-    lwip_socket_obj_t *socket = MP_OBJ_TO_PTR(self_in);
-    mp_int_t backlog = mp_obj_get_int(backlog_in);
+STATIC mp_obj_t lwip_socket_listen(size_t n_args, const mp_obj_t *args) {
+    lwip_socket_obj_t *socket = MP_OBJ_TO_PTR(args[0]);
+
+    mp_int_t backlog = 2;
+    if (n_args > 1) {
+        backlog = mp_obj_get_int(args[1]);
+        backlog = (backlog < 0) ? 0 : backlog;
+    }
 
     if (socket->pcb.tcp == NULL) {
         mp_raise_OSError(MP_EBADF);
@@ -946,7 +951,7 @@ STATIC mp_obj_t lwip_socket_listen(mp_obj_t self_in, mp_obj_t backlog_in) {
 
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(lwip_socket_listen_obj, lwip_socket_listen);
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(lwip_socket_listen_obj, 1, 2, lwip_socket_listen);
 
 STATIC mp_obj_t lwip_socket_accept(mp_obj_t self_in) {
     lwip_socket_obj_t *socket = MP_OBJ_TO_PTR(self_in);
diff --git a/extmod/modusocket.c b/extmod/modusocket.c
index b6bab72e7a289..955ff4fc071a1 100644
--- a/extmod/modusocket.c
+++ b/extmod/modusocket.c
@@ -116,9 +116,9 @@ STATIC mp_obj_t socket_bind(mp_obj_t self_in, mp_obj_t addr_in) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_2(socket_bind_obj, socket_bind);
 
-// method socket.listen(backlog)
-STATIC mp_obj_t socket_listen(mp_obj_t self_in, mp_obj_t backlog) {
-    mod_network_socket_obj_t *self = MP_OBJ_TO_PTR(self_in);
+// method socket.listen([backlog])
+STATIC mp_obj_t socket_listen(size_t n_args, const mp_obj_t *args) {
+    mod_network_socket_obj_t *self = MP_OBJ_TO_PTR(args[0]);
 
     if (self->nic == MP_OBJ_NULL) {
         // not connected
@@ -126,14 +126,20 @@ STATIC mp_obj_t socket_listen(mp_obj_t self_in, mp_obj_t backlog) {
         mp_raise_OSError(MP_ENOTCONN);
     }
 
+    mp_int_t backlog = 2;
+    if (n_args > 1) {
+        backlog = mp_obj_get_int(args[1]);
+        backlog = (backlog < 0) ? 0 : backlog;
+    }
+
     int _errno;
-    if (self->nic_type->listen(self, mp_obj_get_int(backlog), &_errno) != 0) {
+    if (self->nic_type->listen(self, backlog, &_errno) != 0) {
         mp_raise_OSError(_errno);
     }
 
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(socket_listen_obj, socket_listen);
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(socket_listen_obj, 1, 2, socket_listen);
 
 // method socket.accept()
 STATIC mp_obj_t socket_accept(mp_obj_t self_in) {
diff --git a/ports/cc3200/mods/modusocket.c b/ports/cc3200/mods/modusocket.c
index 51815a31f9ff8..91b5e312e601a 100644
--- a/ports/cc3200/mods/modusocket.c
+++ b/ports/cc3200/mods/modusocket.c
@@ -489,7 +489,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(socket_bind_obj, socket_bind);
 STATIC mp_obj_t socket_listen(size_t n_args, const mp_obj_t *args) {
     mod_network_socket_obj_t *self = args[0];
 
-    int32_t backlog = 0;
+    int32_t backlog = 2;
     if (n_args > 1) {
         backlog = mp_obj_get_int(args[1]);
         backlog = (backlog < 0) ? 0 : backlog;
diff --git a/ports/esp32/modsocket.c b/ports/esp32/modsocket.c
index be950ac1f65c7..d1abe3fbc2e27 100644
--- a/ports/esp32/modsocket.c
+++ b/ports/esp32/modsocket.c
@@ -295,9 +295,16 @@ STATIC mp_obj_t socket_bind(const mp_obj_t arg0, const mp_obj_t arg1) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_2(socket_bind_obj, socket_bind);
 
-STATIC mp_obj_t socket_listen(const mp_obj_t arg0, const mp_obj_t arg1) {
-    socket_obj_t *self = MP_OBJ_TO_PTR(arg0);
-    int backlog = mp_obj_get_int(arg1);
+// method socket.listen([backlog])
+STATIC mp_obj_t socket_listen(size_t n_args, const mp_obj_t *args) {
+    socket_obj_t *self = MP_OBJ_TO_PTR(args[0]);
+
+    int backlog = 2;
+    if (n_args > 1) {
+        backlog = mp_obj_get_int(args[1]);
+        backlog = (backlog < 0) ? 0 : backlog;
+    }
+
     self->state = SOCKET_STATE_CONNECTED;
     int r = lwip_listen(self->fd, backlog);
     if (r < 0) {
@@ -305,7 +312,7 @@ STATIC mp_obj_t socket_listen(const mp_obj_t arg0, const mp_obj_t arg1) {
     }
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(socket_listen_obj, socket_listen);
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(socket_listen_obj, 1, 2, socket_listen);
 
 STATIC mp_obj_t socket_accept(const mp_obj_t arg0) {
     socket_obj_t *self = MP_OBJ_TO_PTR(arg0);
diff --git a/ports/unix/modusocket.c b/ports/unix/modusocket.c
index efa182e393731..65b8fd4fa11ae 100644
--- a/ports/unix/modusocket.c
+++ b/ports/unix/modusocket.c
@@ -223,15 +223,23 @@ STATIC mp_obj_t socket_bind(mp_obj_t self_in, mp_obj_t addr_in) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_2(socket_bind_obj, socket_bind);
 
-STATIC mp_obj_t socket_listen(mp_obj_t self_in, mp_obj_t backlog_in) {
-    mp_obj_socket_t *self = MP_OBJ_TO_PTR(self_in);
+// method socket.listen([backlog])
+STATIC mp_obj_t socket_listen(size_t n_args, const mp_obj_t *args) {
+    mp_obj_socket_t *self = MP_OBJ_TO_PTR(args[0]);
+
+    int backlog = SOMAXCONN < 128 ? SOMAXCONN : 128;
+    if (n_args > 1) {
+        backlog = (int)mp_obj_get_int(args[1]);
+        backlog = (backlog < 0) ? 0 : backlog;
+    }
+
     MP_THREAD_GIL_EXIT();
-    int r = listen(self->fd, MP_OBJ_SMALL_INT_VALUE(backlog_in));
+    int r = listen(self->fd, backlog);
     MP_THREAD_GIL_ENTER();
     RAISE_ERRNO(r, errno);
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(socket_listen_obj, socket_listen);
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(socket_listen_obj, 1, 2, socket_listen);
 
 STATIC mp_obj_t socket_accept(mp_obj_t self_in) {
     mp_obj_socket_t *self = MP_OBJ_TO_PTR(self_in);
diff --git a/ports/zephyr/modusocket.c b/ports/zephyr/modusocket.c
index f9fc96a2b1d5b..19a62f6dc1d78 100644
--- a/ports/zephyr/modusocket.c
+++ b/ports/zephyr/modusocket.c
@@ -185,11 +185,17 @@ STATIC mp_obj_t socket_connect(mp_obj_t self_in, mp_obj_t addr_in) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_2(socket_connect_obj, socket_connect);
 
-STATIC mp_obj_t socket_listen(mp_obj_t self_in, mp_obj_t backlog_in) {
-    socket_obj_t *socket = self_in;
+// method socket.listen([backlog])
+STATIC mp_obj_t socket_listen(size_t n_args, const mp_obj_t *args) {
+    socket_obj_t *socket = args[0];
     socket_check_closed(socket);
 
-    mp_int_t backlog = mp_obj_get_int(backlog_in);
+    mp_int_t backlog = 2;
+    if (n_args > 1) {
+        backlog = mp_obj_get_int(args[1]);
+        backlog = (backlog < 0) ? 0 : backlog;
+    }
+
     int res = zsock_listen(socket->ctx, backlog);
     RAISE_SOCK_ERRNO(res);
 
diff --git a/tests/multi_net/tcp_data.py b/tests/multi_net/tcp_data.py
index bba2d198c400c..b73dac636a2ea 100644
--- a/tests/multi_net/tcp_data.py
+++ b/tests/multi_net/tcp_data.py
@@ -10,7 +10,7 @@ def instance0():
     s = socket.socket()
     s.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
     s.bind(socket.getaddrinfo("0.0.0.0", PORT)[0][-1])
-    s.listen(1)
+    s.listen()
     multitest.next()
     s2, _ = s.accept()
     print(s2.recv(16))

From aab005c75b7d8b1f06a3294ce7a5d86edea24594 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 4 Apr 2022 23:07:35 +1000
Subject: [PATCH 1898/3533] extmod/modusocket: Provide config macro for
 socket.listen backlog deflt.

To make it possible to change this value for any given port or board.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/modlwip.c               | 2 +-
 extmod/modusocket.c            | 2 +-
 ports/cc3200/mods/modusocket.c | 2 +-
 ports/esp32/modsocket.c        | 2 +-
 ports/unix/modusocket.c        | 2 +-
 ports/unix/mpconfigport.h      | 1 +
 ports/zephyr/modusocket.c      | 2 +-
 py/mpconfig.h                  | 5 +++++
 8 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/extmod/modlwip.c b/extmod/modlwip.c
index e62d4e7e4da71..4d4ffc1e0787d 100644
--- a/extmod/modlwip.c
+++ b/extmod/modlwip.c
@@ -914,7 +914,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(lwip_socket_bind_obj, lwip_socket_bind);
 STATIC mp_obj_t lwip_socket_listen(size_t n_args, const mp_obj_t *args) {
     lwip_socket_obj_t *socket = MP_OBJ_TO_PTR(args[0]);
 
-    mp_int_t backlog = 2;
+    mp_int_t backlog = MICROPY_PY_USOCKET_LISTEN_BACKLOG_DEFAULT;
     if (n_args > 1) {
         backlog = mp_obj_get_int(args[1]);
         backlog = (backlog < 0) ? 0 : backlog;
diff --git a/extmod/modusocket.c b/extmod/modusocket.c
index 955ff4fc071a1..bd11e70c1e9aa 100644
--- a/extmod/modusocket.c
+++ b/extmod/modusocket.c
@@ -126,7 +126,7 @@ STATIC mp_obj_t socket_listen(size_t n_args, const mp_obj_t *args) {
         mp_raise_OSError(MP_ENOTCONN);
     }
 
-    mp_int_t backlog = 2;
+    mp_int_t backlog = MICROPY_PY_USOCKET_LISTEN_BACKLOG_DEFAULT;
     if (n_args > 1) {
         backlog = mp_obj_get_int(args[1]);
         backlog = (backlog < 0) ? 0 : backlog;
diff --git a/ports/cc3200/mods/modusocket.c b/ports/cc3200/mods/modusocket.c
index 91b5e312e601a..99b78c88372d3 100644
--- a/ports/cc3200/mods/modusocket.c
+++ b/ports/cc3200/mods/modusocket.c
@@ -489,7 +489,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(socket_bind_obj, socket_bind);
 STATIC mp_obj_t socket_listen(size_t n_args, const mp_obj_t *args) {
     mod_network_socket_obj_t *self = args[0];
 
-    int32_t backlog = 2;
+    int32_t backlog = MICROPY_PY_USOCKET_LISTEN_BACKLOG_DEFAULT;
     if (n_args > 1) {
         backlog = mp_obj_get_int(args[1]);
         backlog = (backlog < 0) ? 0 : backlog;
diff --git a/ports/esp32/modsocket.c b/ports/esp32/modsocket.c
index d1abe3fbc2e27..9d4bfb37c45ab 100644
--- a/ports/esp32/modsocket.c
+++ b/ports/esp32/modsocket.c
@@ -299,7 +299,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(socket_bind_obj, socket_bind);
 STATIC mp_obj_t socket_listen(size_t n_args, const mp_obj_t *args) {
     socket_obj_t *self = MP_OBJ_TO_PTR(args[0]);
 
-    int backlog = 2;
+    int backlog = MICROPY_PY_USOCKET_LISTEN_BACKLOG_DEFAULT;
     if (n_args > 1) {
         backlog = mp_obj_get_int(args[1]);
         backlog = (backlog < 0) ? 0 : backlog;
diff --git a/ports/unix/modusocket.c b/ports/unix/modusocket.c
index 65b8fd4fa11ae..a516ed9c24ef6 100644
--- a/ports/unix/modusocket.c
+++ b/ports/unix/modusocket.c
@@ -227,7 +227,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(socket_bind_obj, socket_bind);
 STATIC mp_obj_t socket_listen(size_t n_args, const mp_obj_t *args) {
     mp_obj_socket_t *self = MP_OBJ_TO_PTR(args[0]);
 
-    int backlog = SOMAXCONN < 128 ? SOMAXCONN : 128;
+    int backlog = MICROPY_PY_USOCKET_LISTEN_BACKLOG_DEFAULT;
     if (n_args > 1) {
         backlog = (int)mp_obj_get_int(args[1]);
         backlog = (backlog < 0) ? 0 : backlog;
diff --git a/ports/unix/mpconfigport.h b/ports/unix/mpconfigport.h
index 99876303827d5..ef7c820e7e1b3 100644
--- a/ports/unix/mpconfigport.h
+++ b/ports/unix/mpconfigport.h
@@ -173,6 +173,7 @@
 #define MICROPY_PY_UTIME            (1)
 #define MICROPY_PY_UTIME_MP_HAL     (1)
 #define MICROPY_PY_UTIMEQ           (1)
+#define MICROPY_PY_USOCKET_LISTEN_BACKLOG_DEFAULT (SOMAXCONN < 128 ? SOMAXCONN : 128)
 #if MICROPY_PY_USSL
 #define MICROPY_PY_UHASHLIB_MD5     (1)
 #define MICROPY_PY_UHASHLIB_SHA1    (1)
diff --git a/ports/zephyr/modusocket.c b/ports/zephyr/modusocket.c
index 19a62f6dc1d78..8f39347e37522 100644
--- a/ports/zephyr/modusocket.c
+++ b/ports/zephyr/modusocket.c
@@ -190,7 +190,7 @@ STATIC mp_obj_t socket_listen(size_t n_args, const mp_obj_t *args) {
     socket_obj_t *socket = args[0];
     socket_check_closed(socket);
 
-    mp_int_t backlog = 2;
+    mp_int_t backlog = MICROPY_PY_USOCKET_LISTEN_BACKLOG_DEFAULT;
     if (n_args > 1) {
         backlog = mp_obj_get_int(args[1]);
         backlog = (backlog < 0) ? 0 : backlog;
diff --git a/py/mpconfig.h b/py/mpconfig.h
index 47c16ed9670e7..754daa7bd5a0b 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -1593,6 +1593,11 @@ typedef double mp_float_t;
 #define MICROPY_PY_MACHINE_SOFTSPI (0)
 #endif
 
+// The default backlog value for socket.listen(backlog)
+#ifndef MICROPY_PY_USOCKET_LISTEN_BACKLOG_DEFAULT
+#define MICROPY_PY_USOCKET_LISTEN_BACKLOG_DEFAULT (2)
+#endif
+
 #ifndef MICROPY_PY_USSL
 #define MICROPY_PY_USSL (0)
 #endif

From 1daeeb2430c4a4e436ef59d881e5d877d140048a Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 4 Apr 2022 23:08:59 +1000
Subject: [PATCH 1899/3533] docs/differences: Update Python 3.5 diff, with
 optional listen backlog.

Signed-off-by: Damien George <damien@micropython.org>
---
 docs/differences/python_35.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/differences/python_35.rst b/docs/differences/python_35.rst
index 06cfbfc03cfa1..94b10b5837374 100644
--- a/docs/differences/python_35.rst
+++ b/docs/differences/python_35.rst
@@ -140,7 +140,7 @@ Changes to built-in modules:
    | The *socket.sendall()* method no longer resets the socket timeout every time bytes are received or sent.  |               |
    | The socket timeout is now the maximum total duration to send all data.                                    |               |
    +-----------------------------------------------------------------------------------------------------------+---------------+
-   | The backlog argument of the *socket.listen()* method is now optional. By default it is set to SOMAXCONN or|               |
+   | The backlog argument of the *socket.listen()* method is now optional. By default it is set to SOMAXCONN or| Completed     |
    | to 128, whichever is less.                                                                                |               |
    +-----------------------------------------------------------------------------------------------------------+---------------+
    | `ssl <https://docs.python.org/3/whatsnew/3.5.html#ssl>`_                                                                  |

From b0bcb3862b95d54b0457d61d779826641e5784fd Mon Sep 17 00:00:00 2001
From: Christian Zietz <czietz@gmx.net>
Date: Sun, 3 Apr 2022 13:12:43 +0200
Subject: [PATCH 1900/3533] py/emitinlinethumb: Use 16 bit encodings for PUSH
 LR and POP PC.

The Thumb instruction set has special 16 bit encodings for PUSH involving
LR and POP involving PC, which are commonly used in nested functions.

Using this encoding is particularly important for ARMv6-M, where the more
general 32 bit encoding of PUSH and POP is unavailable.
---
 py/emitinlinethumb.c | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/py/emitinlinethumb.c b/py/emitinlinethumb.c
index 1a35e25ad35b4..1a9c06a2adbc8 100644
--- a/py/emitinlinethumb.c
+++ b/py/emitinlinethumb.c
@@ -621,8 +621,13 @@ STATIC void emit_inline_thumb_op(emit_inline_asm_t *emit, qstr op, mp_uint_t n_a
             asm_thumb_op16(&emit->as, ASM_THUMB_OP_CPSIE_I);
         } else if (op == MP_QSTR_push) {
             mp_uint_t reglist = get_arg_reglist(emit, op_str, pn_args[0]);
-            if ((reglist & 0xff00) == 0) {
-                asm_thumb_op16(&emit->as, 0xb400 | reglist);
+            if ((reglist & 0xbf00) == 0) {
+                if ((reglist & (1 << 14)) == 0) {
+                    asm_thumb_op16(&emit->as, 0xb400 | reglist);
+                } else {
+                    // 16-bit encoding for pushing low registers and LR
+                    asm_thumb_op16(&emit->as, 0xb500 | (reglist & 0xff));
+                }
             } else {
                 if (!ARMV7M) {
                     goto unknown_op;
@@ -631,8 +636,13 @@ STATIC void emit_inline_thumb_op(emit_inline_asm_t *emit, qstr op, mp_uint_t n_a
             }
         } else if (op == MP_QSTR_pop) {
             mp_uint_t reglist = get_arg_reglist(emit, op_str, pn_args[0]);
-            if ((reglist & 0xff00) == 0) {
-                asm_thumb_op16(&emit->as, 0xbc00 | reglist);
+            if ((reglist & 0x7f00) == 0) {
+                if ((reglist & (1 << 15)) == 0) {
+                    asm_thumb_op16(&emit->as, 0xbc00 | reglist);
+                } else {
+                    // 16-bit encoding for popping low registers and PC, i.e., returning
+                    asm_thumb_op16(&emit->as, 0xbd00 | (reglist & 0xff));
+                }
             } else {
                 if (!ARMV7M) {
                     goto unknown_op;

From d6c59c9d728854ecef4c284cc7cb2428021ea5d4 Mon Sep 17 00:00:00 2001
From: Christian Zietz <czietz@gmx.net>
Date: Mon, 4 Apr 2022 10:32:36 +0200
Subject: [PATCH 1901/3533] tests/inlineasm: Add test for PUSH LR and POP PC.

---
 tests/inlineasm/asmpushpop.py     | 12 ++++++++++++
 tests/inlineasm/asmpushpop.py.exp |  1 +
 2 files changed, 13 insertions(+)

diff --git a/tests/inlineasm/asmpushpop.py b/tests/inlineasm/asmpushpop.py
index 74e729dfa2534..99566a7558fa4 100644
--- a/tests/inlineasm/asmpushpop.py
+++ b/tests/inlineasm/asmpushpop.py
@@ -6,4 +6,16 @@ def f(r0, r1, r2):
     pop({r1, r2})
 
 
+@micropython.asm_thumb
+def g():
+    b(START)
+    label(SUBROUTINE)
+    push({lr})  # push return address
+    mov(r0, 7)
+    pop({pc})  # return
+    label(START)
+    bl(SUBROUTINE)
+
+
 print(f(0, 1, 2))
+print(g())
diff --git a/tests/inlineasm/asmpushpop.py.exp b/tests/inlineasm/asmpushpop.py.exp
index d00491fd7e5bb..fea32e7d83893 100644
--- a/tests/inlineasm/asmpushpop.py.exp
+++ b/tests/inlineasm/asmpushpop.py.exp
@@ -1 +1,2 @@
 1
+7

From b2deea67628b7069ed4e5d0cde84005738463514 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 23 Mar 2022 22:28:58 +1100
Subject: [PATCH 1902/3533] stm32/mboot: Consolidate all UI and add general
 state change hooks.

All user interface (LED, button) code has been moved to ui.c, and the
interface to this code with the rest of the system now goes through calls
to mboot_state_change().  This state-change function can be overridden by a
board to fully customise the user interface behaviour.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/mboot/Makefile |   1 +
 ports/stm32/mboot/fsload.c |  14 +-
 ports/stm32/mboot/main.c   | 206 ++++--------------------------
 ports/stm32/mboot/mboot.h  |  40 ++++++
 ports/stm32/mboot/ui.c     | 255 +++++++++++++++++++++++++++++++++++++
 5 files changed, 321 insertions(+), 195 deletions(-)
 create mode 100644 ports/stm32/mboot/ui.c

diff --git a/ports/stm32/mboot/Makefile b/ports/stm32/mboot/Makefile
index 61a102d02d6d5..db39daf8820d8 100755
--- a/ports/stm32/mboot/Makefile
+++ b/ports/stm32/mboot/Makefile
@@ -111,6 +111,7 @@ SRC_C += \
 	gzstream.c \
 	pack.c \
 	sdcard.c \
+	ui.c \
 	vfs_fat.c \
 	vfs_lfs.c \
 	drivers/bus/softspi.c \
diff --git a/ports/stm32/mboot/fsload.c b/ports/stm32/mboot/fsload.c
index 2b674369f0814..231b07afa5bc4 100644
--- a/ports/stm32/mboot/fsload.c
+++ b/ports/stm32/mboot/fsload.c
@@ -118,6 +118,7 @@ static int fsload_program_file(bool write_to_flash) {
     uint32_t num_elems = get_le32(buf + 270);
 
     size_t file_offset_target = file_offset;
+    size_t bytes_processed = 0;
 
     // Parse each element
     for (size_t elem = 0; elem < num_elems; ++elem) {
@@ -163,6 +164,8 @@ static int fsload_program_file(bool write_to_flash) {
             }
             elem_addr += l;
             s -= l;
+            bytes_processed += l;
+            mboot_state_change(MBOOT_STATE_FSLOAD_PROGRESS, write_to_flash << 31 | bytes_processed);
         }
 
         file_offset += elem_size;
@@ -295,17 +298,6 @@ int fsload_process(void) {
                 ret = fsload_validate_and_program_file(&ctx, methods, fname);
             }
 
-            // Flash LEDs based on success/failure of update
-            for (int i = 0; i < 4; ++i) {
-                if (ret == 0) {
-                    led_state_all(7);
-                } else {
-                    led_state_all(1);
-                }
-                mp_hal_delay_ms(100);
-                led_state_all(0);
-                mp_hal_delay_ms(100);
-            }
             return ret;
         }
         elem += elem[-1];
diff --git a/ports/stm32/mboot/main.c b/ports/stm32/mboot/main.c
index 10a09fe3e15b6..37c7c0cf5d79d 100644
--- a/ports/stm32/mboot/main.c
+++ b/ports/stm32/mboot/main.c
@@ -109,7 +109,7 @@
 #define APP_VALIDITY_BITS (0x00000003)
 
 // For 1ms system ticker.
-static volatile uint32_t systick_ms;
+volatile uint32_t systick_ms;
 
 // Global dfu state
 dfu_context_t dfu_context SECTION_NOZERO_BSS;
@@ -397,112 +397,6 @@ void mp_hal_pin_config_speed(uint32_t port_pin, uint32_t speed) {
     gpio->OSPEEDR = (gpio->OSPEEDR & ~(3 << (2 * pin))) | (speed << (2 * pin));
 }
 
-/******************************************************************************/
-// LED
-
-#if defined(MBOOT_LED1)
-#define LED0 MBOOT_LED1
-#elif defined(MICROPY_HW_LED1)
-#define LED0 MICROPY_HW_LED1
-#endif
-
-#if defined(MBOOT_LED2)
-#define LED1 MBOOT_LED2
-#elif defined(MICROPY_HW_LED2)
-#define LED1 MICROPY_HW_LED2
-#endif
-
-#if defined(MBOOT_LED3)
-#define LED2 MBOOT_LED3
-#elif defined(MICROPY_HW_LED3)
-#define LED2 MICROPY_HW_LED3
-#endif
-
-#if defined(MBOOT_LED4)
-#define LED3 MBOOT_LED4
-#elif defined(MICROPY_HW_LED4)
-#define LED3 MICROPY_HW_LED4
-#endif
-
-// For flashing states: bit 0 is "active", bit 1 is "inactive", bits 2-6 are flash rate.
-typedef enum {
-    LED0_STATE_OFF = 0,
-    LED0_STATE_ON = 1,
-    LED0_STATE_SLOW_FLASH = (20 << 2) | 1,
-    LED0_STATE_FAST_FLASH = (2 << 2) | 1,
-    LED0_STATE_SLOW_INVERTED_FLASH = (20 << 2) | 2,
-} led0_state_t;
-
-static led0_state_t led0_cur_state = LED0_STATE_OFF;
-static uint32_t led0_ms_interval = 0;
-static int led0_toggle_count = 0;
-
-MP_WEAK void led_init(void) {
-    #if defined(MBOOT_BOARD_LED_INIT)
-    // Custom LED init function provided by the board.
-    MBOOT_BOARD_LED_INIT();
-    #else
-    // Init LEDs using GPIO calls.
-    mp_hal_pin_output(LED0);
-    #ifdef LED1
-    mp_hal_pin_output(LED1);
-    #endif
-    #ifdef LED2
-    mp_hal_pin_output(LED2);
-    #endif
-    #ifdef LED3
-    mp_hal_pin_output(LED3);
-    #endif
-    #endif
-
-    led0_cur_state = LED0_STATE_OFF;
-}
-
-MP_WEAK void led_state(uint32_t led, int val) {
-    #if defined(MBOOT_BOARD_LED_STATE)
-    // Custom LED state function provided by the board.
-    return MBOOT_BOARD_LED_STATE(led, val);
-    #else
-    // Set LEDs using GPIO calls.
-    if (val) {
-        MICROPY_HW_LED_ON(led);
-    } else {
-        MICROPY_HW_LED_OFF(led);
-    }
-    #endif
-}
-
-void led_state_all(unsigned int mask) {
-    led_state(LED0, mask & 1);
-    #ifdef LED1
-    led_state(LED1, mask & 2);
-    #endif
-    #ifdef LED2
-    led_state(LED2, mask & 4);
-    #endif
-    #ifdef LED3
-    led_state(LED3, mask & 8);
-    #endif
-}
-
-void led0_state(led0_state_t state) {
-    led0_cur_state = state;
-    if (state == LED0_STATE_OFF || state == LED0_STATE_ON) {
-        led_state(LED0, state);
-    }
-}
-
-void led0_update() {
-    if (led0_cur_state != LED0_STATE_OFF && systick_ms - led0_ms_interval > 50) {
-        uint8_t rate = (led0_cur_state >> 2) & 0x1f;
-        led0_ms_interval += 50;
-        if (++led0_toggle_count >= rate) {
-            led0_toggle_count = 0;
-        }
-        led_state(LED0, (led0_cur_state & (led0_toggle_count == 0 ? 1 : 2)));
-    }
-}
-
 /******************************************************************************/
 // FLASH
 
@@ -617,8 +511,9 @@ static int spiflash_page_erase(mp_spiflash_t *spif, uint32_t addr, uint32_t n_bl
 #endif
 
 int hw_page_erase(uint32_t addr, uint32_t *next_addr) {
+    mboot_state_change(MBOOT_STATE_ERASE_START, addr);
+
     int ret = -1;
-    led0_state(LED0_STATE_ON);
 
     #if defined(MBOOT_SPIFLASH_ADDR)
     if (MBOOT_SPIFLASH_ADDR <= addr && addr < MBOOT_SPIFLASH_ADDR + MBOOT_SPIFLASH_BYTE_SIZE) {
@@ -638,12 +533,14 @@ int hw_page_erase(uint32_t addr, uint32_t *next_addr) {
         ret = mboot_flash_page_erase(addr, next_addr);
     }
 
-    led0_state((ret == 0) ? LED0_STATE_SLOW_FLASH : LED0_STATE_SLOW_INVERTED_FLASH);
+    mboot_state_change(MBOOT_STATE_ERASE_END, ret);
+
     return ret;
 }
 
 void hw_read(mboot_addr_t addr, size_t len, uint8_t *buf) {
-    led0_state(LED0_STATE_FAST_FLASH);
+    mboot_state_change(MBOOT_STATE_READ_START, addr);
+
     #if defined(MBOOT_SPIFLASH_ADDR)
     if (MBOOT_SPIFLASH_ADDR <= addr && addr < MBOOT_SPIFLASH_ADDR + MBOOT_SPIFLASH_BYTE_SIZE) {
         mp_spiflash_read(MBOOT_SPIFLASH_SPIFLASH, addr - MBOOT_SPIFLASH_ADDR, len, buf);
@@ -668,12 +565,14 @@ void hw_read(mboot_addr_t addr, size_t len, uint8_t *buf) {
         // Other addresses, just read directly from memory
         memcpy(buf, (void *)(uintptr_t)addr, len);
     }
-    led0_state(LED0_STATE_SLOW_FLASH);
+
+    mboot_state_change(MBOOT_STATE_READ_END, 0);
 }
 
 int hw_write(uint32_t addr, const uint8_t *src8, size_t len) {
+    mboot_state_change(MBOOT_STATE_WRITE_START, addr);
+
     int ret = -1;
-    led0_state(LED0_STATE_FAST_FLASH);
     #if defined(MBOOT_SPIFLASH_ADDR)
     if (MBOOT_SPIFLASH_ADDR <= addr && addr < MBOOT_SPIFLASH_ADDR + MBOOT_SPIFLASH_BYTE_SIZE) {
         ret = mp_spiflash_write(MBOOT_SPIFLASH_SPIFLASH, addr - MBOOT_SPIFLASH_ADDR, len, src8);
@@ -691,7 +590,8 @@ int hw_write(uint32_t addr, const uint8_t *src8, size_t len) {
         dfu_context.error = MBOOT_ERROR_STR_INVALID_ADDRESS_IDX;
     }
 
-    led0_state((ret == 0) ? LED0_STATE_SLOW_FLASH : LED0_STATE_SLOW_INVERTED_FLASH);
+    mboot_state_change(MBOOT_STATE_WRITE_END, ret);
+
     return ret;
 }
 
@@ -707,9 +607,10 @@ int do_page_erase(uint32_t addr, uint32_t *next_addr) {
 void do_read(mboot_addr_t addr, size_t len, uint8_t *buf) {
     #if MBOOT_ENABLE_PACKING
     // Read disabled on packed (encrypted) mode.
+    mboot_state_change(MBOOT_STATE_READ_START, addr);
     dfu_context.status = DFU_STATUS_ERROR_FILE;
     dfu_context.error = MBOOT_ERROR_STR_INVALID_READ_IDX;
-    led0_state(LED0_STATE_SLOW_INVERTED_FLASH);
+    mboot_state_change(MBOOT_STATE_READ_END, -MBOOT_ERRNO_FLASH_READ_DISALLOWED);
     #else
     hw_read(addr, len, buf);
     #endif
@@ -1360,71 +1261,6 @@ static int pyb_usbdd_shutdown(void) {
 /******************************************************************************/
 // main
 
-#if defined(MBOOT_BOARD_GET_RESET_MODE)
-
-static inline int mboot_get_reset_mode(void) {
-    return MBOOT_BOARD_GET_RESET_MODE();
-}
-
-#else
-
-#define RESET_MODE_NUM_STATES (4)
-#define RESET_MODE_TIMEOUT_CYCLES (8)
-#ifdef LED2
-#ifdef LED3
-#define RESET_MODE_LED_STATES 0x8421
-#else
-#define RESET_MODE_LED_STATES 0x7421
-#endif
-#else
-#define RESET_MODE_LED_STATES 0x3210
-#endif
-
-static void usrbtn_init(void) {
-    mp_hal_pin_config(MICROPY_HW_USRSW_PIN, MP_HAL_PIN_MODE_INPUT, MICROPY_HW_USRSW_PULL, 0);
-}
-
-static int usrbtn_state(void) {
-    return mp_hal_pin_read(MICROPY_HW_USRSW_PIN) == MICROPY_HW_USRSW_PRESSED;
-}
-
-static int mboot_get_reset_mode(void) {
-    usrbtn_init();
-    int reset_mode = BOARDCTRL_RESET_MODE_NORMAL;
-    if (usrbtn_state()) {
-        // Cycle through reset modes while USR is held
-        // Timeout is roughly 20s, where reset_mode=1
-        systick_init();
-        led_init();
-        reset_mode = 0;
-        for (int i = 0; i < (RESET_MODE_NUM_STATES * RESET_MODE_TIMEOUT_CYCLES + 1) * 32; i++) {
-            if (i % 32 == 0) {
-                if (++reset_mode > RESET_MODE_NUM_STATES) {
-                    reset_mode = BOARDCTRL_RESET_MODE_NORMAL;
-                }
-                uint8_t l = RESET_MODE_LED_STATES >> ((reset_mode - 1) * 4);
-                led_state_all(l);
-            }
-            if (!usrbtn_state()) {
-                break;
-            }
-            mp_hal_delay_ms(19);
-        }
-        // Flash the selected reset mode
-        for (int i = 0; i < 6; i++) {
-            led_state_all(0);
-            mp_hal_delay_ms(50);
-            uint8_t l = RESET_MODE_LED_STATES >> ((reset_mode - 1) * 4);
-            led_state_all(l);
-            mp_hal_delay_ms(50);
-        }
-        mp_hal_delay_ms(300);
-    }
-    return reset_mode;
-}
-
-#endif
-
 NORETURN static __attribute__((naked)) void branch_to_application(uint32_t r0, uint32_t bl_addr) {
     __asm volatile (
         "ldr r2, [r1, #0]\n"    // get address of stack pointer
@@ -1566,11 +1402,13 @@ void stm32_main(uint32_t initial_r0) {
     #endif
 
     if ((initial_r0 & 0xffffff80) == 0x70ad0080) {
+        mboot_state_change(MBOOT_STATE_FSLOAD_START, 0);
+        int ret = -1;
         #if MBOOT_FSLOAD
         // Application passed through elements, validate then process them
         const uint8_t *elem_end = elem_search(ELEM_DATA_START, ELEM_TYPE_END);
         if (elem_end != NULL && elem_end[-1] == 0) {
-            int ret = fsload_process();
+            ret = fsload_process();
             // If there is a valid ELEM_TYPE_STATUS element then store the status in the given location.
             const uint8_t *elem_status = elem_search(ELEM_DATA_START, ELEM_TYPE_STATUS);
             if (elem_status != NULL && elem_status[-1] == 4) {
@@ -1580,8 +1418,8 @@ void stm32_main(uint32_t initial_r0) {
             }
         }
         #endif
+        mboot_state_change(MBOOT_STATE_FSLOAD_END, ret);
         // Always reset because the application is expecting to resume
-        led_state_all(0);
         leave_bootloader();
     }
 
@@ -1598,8 +1436,7 @@ void stm32_main(uint32_t initial_r0) {
     i2c_init(initial_r0);
     #endif
 
-    led_state_all(0);
-    led0_state(LED0_STATE_SLOW_FLASH);
+    mboot_state_change(MBOOT_STATE_DFU_START, 0);
 
     #if MBOOT_USB_RESET_ON_DISCONNECT
     bool has_connected = false;
@@ -1633,8 +1470,9 @@ void stm32_main(uint32_t initial_r0) {
         #endif
     }
 
+    mboot_state_change(MBOOT_STATE_DFU_END, 0);
+
     // Shutdown and leave the bootloader.
-    led_state_all(0);
     mp_hal_delay_ms(50);
     pyb_usbdd_shutdown();
     #if defined(MBOOT_I2C_SCL)
diff --git a/ports/stm32/mboot/mboot.h b/ports/stm32/mboot/mboot.h
index 0e04f67f4a8e3..0984fd9ac5f67 100644
--- a/ports/stm32/mboot/mboot.h
+++ b/ports/stm32/mboot/mboot.h
@@ -46,9 +46,31 @@
 #define MBOOT_ADDRESS_SPACE_64BIT (0)
 #endif
 
+// These enum values are passed as the first argument to mboot_state_change() to
+// notify of a change in state of the bootloader activity.  This function has a
+// default implementation in ui.c but can be overridden by a board.  Some states
+// have an argument passed along as the second argument to mboot_state_change().
+// If this argument is unused then 0 is passed in.  A result of an operation is
+// 0 for success and <0 for failure, with a failure being either an MP_Exxx code
+// or MBOOT_ERRNO_xxx code.
+typedef enum {
+    MBOOT_STATE_DFU_START,          // arg: unused
+    MBOOT_STATE_DFU_END,            // arg: unused
+    MBOOT_STATE_FSLOAD_START,       // arg: unused
+    MBOOT_STATE_FSLOAD_END,         // arg: result of fsload operation
+    MBOOT_STATE_FSLOAD_PROGRESS,    // arg: total bytes processed so far, high bit set when doing write pass
+    MBOOT_STATE_ERASE_START,        // arg: address of erase
+    MBOOT_STATE_ERASE_END,          // arg: result of erase
+    MBOOT_STATE_READ_START,         // arg: address of read
+    MBOOT_STATE_READ_END,           // arg: result of read
+    MBOOT_STATE_WRITE_START,        // arg: address of write
+    MBOOT_STATE_WRITE_END,          // arg: result of write
+} mboot_state_t;
+
 enum {
     MBOOT_ERRNO_FLASH_ERASE_DISALLOWED = 200,
     MBOOT_ERRNO_FLASH_ERASE_FAILED,
+    MBOOT_ERRNO_FLASH_READ_DISALLOWED,
     MBOOT_ERRNO_FLASH_WRITE_DISALLOWED,
 
     MBOOT_ERRNO_DFU_INVALID_HEADER = 210,
@@ -98,10 +120,12 @@ typedef uint64_t mboot_addr_t;
 typedef uint32_t mboot_addr_t;
 #endif
 
+extern volatile uint32_t systick_ms;
 extern uint8_t _estack[ELEM_DATA_SIZE];
 
 void systick_init(void);
 void led_init(void);
+void led0_update(void);
 void SystemClock_Config(void);
 
 uint32_t get_le32(const uint8_t *b);
@@ -132,4 +156,20 @@ static inline void mboot_entry_init(uint32_t *initial_r0) {
     #endif
 }
 
+#if defined(MBOOT_BOARD_GET_RESET_MODE)
+static inline int mboot_get_reset_mode(void) {
+    return MBOOT_BOARD_GET_RESET_MODE();
+}
+#else
+int mboot_get_reset_mode(void);
+#endif
+
+#if defined(MBOOT_BOARD_STATE_CHANGE)
+static inline void mboot_state_change(mboot_state_t state, uint32_t arg) {
+    return MBOOT_BOARD_STATE_CHANGE(state, arg);
+}
+#else
+void mboot_state_change(mboot_state_t state, uint32_t arg);
+#endif
+
 #endif // MICROPY_INCLUDED_STM32_MBOOT_MBOOT_H
diff --git a/ports/stm32/mboot/ui.c b/ports/stm32/mboot/ui.c
new file mode 100644
index 0000000000000..36cba1cf50f04
--- /dev/null
+++ b/ports/stm32/mboot/ui.c
@@ -0,0 +1,255 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2017-2022 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "mboot.h"
+#include "ports/stm32/boardctrl.h"
+
+/******************************************************************************/
+// LED
+
+#if defined(MBOOT_LED1)
+#define LED0 MBOOT_LED1
+#elif defined(MICROPY_HW_LED1)
+#define LED0 MICROPY_HW_LED1
+#endif
+
+#if defined(MBOOT_LED2)
+#define LED1 MBOOT_LED2
+#elif defined(MICROPY_HW_LED2)
+#define LED1 MICROPY_HW_LED2
+#endif
+
+#if defined(MBOOT_LED3)
+#define LED2 MBOOT_LED3
+#elif defined(MICROPY_HW_LED3)
+#define LED2 MICROPY_HW_LED3
+#endif
+
+#if defined(MBOOT_LED4)
+#define LED3 MBOOT_LED4
+#elif defined(MICROPY_HW_LED4)
+#define LED3 MICROPY_HW_LED4
+#endif
+
+// For flashing states: bit 0 is "active", bit 1 is "inactive", bits 2-6 are flash rate.
+typedef enum {
+    LED0_STATE_OFF = 0,
+    LED0_STATE_ON = 1,
+    LED0_STATE_SLOW_FLASH = (20 << 2) | 1,
+    LED0_STATE_FAST_FLASH = (2 << 2) | 1,
+    LED0_STATE_SLOW_INVERTED_FLASH = (20 << 2) | 2,
+} led0_state_t;
+
+static led0_state_t led0_cur_state = LED0_STATE_OFF;
+static uint32_t led0_ms_interval = 0;
+static int led0_toggle_count = 0;
+
+MP_WEAK void led_init(void) {
+    #if defined(MBOOT_BOARD_LED_INIT)
+    // Custom LED init function provided by the board.
+    MBOOT_BOARD_LED_INIT();
+    #else
+    // Init LEDs using GPIO calls.
+    mp_hal_pin_output(LED0);
+    #ifdef LED1
+    mp_hal_pin_output(LED1);
+    #endif
+    #ifdef LED2
+    mp_hal_pin_output(LED2);
+    #endif
+    #ifdef LED3
+    mp_hal_pin_output(LED3);
+    #endif
+    #endif
+
+    led0_cur_state = LED0_STATE_OFF;
+}
+
+MP_WEAK void led_state(uint32_t led, int val) {
+    #if defined(MBOOT_BOARD_LED_STATE)
+    // Custom LED state function provided by the board.
+    return MBOOT_BOARD_LED_STATE(led, val);
+    #else
+    // Set LEDs using GPIO calls.
+    if (val) {
+        MICROPY_HW_LED_ON(led);
+    } else {
+        MICROPY_HW_LED_OFF(led);
+    }
+    #endif
+}
+
+void led_state_all(unsigned int mask) {
+    led_state(LED0, mask & 1);
+    #ifdef LED1
+    led_state(LED1, mask & 2);
+    #endif
+    #ifdef LED2
+    led_state(LED2, mask & 4);
+    #endif
+    #ifdef LED3
+    led_state(LED3, mask & 8);
+    #endif
+}
+
+void led0_state(led0_state_t state) {
+    led0_cur_state = state;
+    if (state == LED0_STATE_OFF || state == LED0_STATE_ON) {
+        led_state(LED0, state);
+    }
+}
+
+void led0_update(void) {
+    if (led0_cur_state != LED0_STATE_OFF && systick_ms - led0_ms_interval > 50) {
+        uint8_t rate = (led0_cur_state >> 2) & 0x1f;
+        led0_ms_interval += 50;
+        if (++led0_toggle_count >= rate) {
+            led0_toggle_count = 0;
+        }
+        led_state(LED0, (led0_cur_state & (led0_toggle_count == 0 ? 1 : 2)));
+    }
+}
+
+/******************************************************************************/
+// User button
+
+#if !defined(MBOOT_BOARD_GET_RESET_MODE)
+
+#define RESET_MODE_NUM_STATES (4)
+#define RESET_MODE_TIMEOUT_CYCLES (8)
+#ifdef LED2
+#ifdef LED3
+#define RESET_MODE_LED_STATES 0x8421
+#else
+#define RESET_MODE_LED_STATES 0x7421
+#endif
+#else
+#define RESET_MODE_LED_STATES 0x3210
+#endif
+
+static void usrbtn_init(void) {
+    mp_hal_pin_config(MICROPY_HW_USRSW_PIN, MP_HAL_PIN_MODE_INPUT, MICROPY_HW_USRSW_PULL, 0);
+}
+
+static int usrbtn_state(void) {
+    return mp_hal_pin_read(MICROPY_HW_USRSW_PIN) == MICROPY_HW_USRSW_PRESSED;
+}
+
+int mboot_get_reset_mode(void) {
+    usrbtn_init();
+    int reset_mode = BOARDCTRL_RESET_MODE_NORMAL;
+    if (usrbtn_state()) {
+        // Cycle through reset modes while USR is held
+        // Timeout is roughly 20s, where reset_mode=1
+        systick_init();
+        led_init();
+        reset_mode = 0;
+        for (int i = 0; i < (RESET_MODE_NUM_STATES * RESET_MODE_TIMEOUT_CYCLES + 1) * 32; i++) {
+            if (i % 32 == 0) {
+                if (++reset_mode > RESET_MODE_NUM_STATES) {
+                    reset_mode = BOARDCTRL_RESET_MODE_NORMAL;
+                }
+                uint8_t l = RESET_MODE_LED_STATES >> ((reset_mode - 1) * 4);
+                led_state_all(l);
+            }
+            if (!usrbtn_state()) {
+                break;
+            }
+            mp_hal_delay_ms(19);
+        }
+        // Flash the selected reset mode
+        for (int i = 0; i < 6; i++) {
+            led_state_all(0);
+            mp_hal_delay_ms(50);
+            uint8_t l = RESET_MODE_LED_STATES >> ((reset_mode - 1) * 4);
+            led_state_all(l);
+            mp_hal_delay_ms(50);
+        }
+        mp_hal_delay_ms(300);
+    }
+    return reset_mode;
+}
+
+#endif
+
+/******************************************************************************/
+// State change
+
+#if !defined(MBOOT_BOARD_STATE_CHANGE)
+
+void mboot_state_change(mboot_state_t state, uint32_t arg) {
+    switch (state) {
+        case MBOOT_STATE_DFU_START:
+            led_state_all(0);
+            led0_state(LED0_STATE_SLOW_FLASH);
+            break;
+
+        case MBOOT_STATE_DFU_END:
+            led_state_all(0);
+            break;
+
+        case MBOOT_STATE_FSLOAD_START:
+            break;
+
+        case MBOOT_STATE_FSLOAD_END:
+            // Flash LEDs based on success/failure of update
+            for (int i = 0; i < 4; ++i) {
+                if (arg == 0) {
+                    led_state_all(7);
+                } else {
+                    led_state_all(1);
+                }
+                mp_hal_delay_ms(100);
+                led_state_all(0);
+                mp_hal_delay_ms(100);
+            }
+            break;
+
+        case MBOOT_STATE_FSLOAD_PROGRESS:
+            break;
+
+        case MBOOT_STATE_ERASE_START:
+            led0_state(LED0_STATE_ON);
+            break;
+
+        case MBOOT_STATE_READ_START:
+        case MBOOT_STATE_WRITE_START:
+            led0_state(LED0_STATE_FAST_FLASH);
+            break;
+
+        case MBOOT_STATE_ERASE_END:
+        case MBOOT_STATE_READ_END:
+        case MBOOT_STATE_WRITE_END:
+            if (arg == 0) {
+                led0_state(LED0_STATE_SLOW_FLASH);
+            } else {
+                led0_state(LED0_STATE_SLOW_INVERTED_FLASH);
+            }
+            break;
+    }
+}
+
+#endif

From cb0372b5bfe72fee99f5b3ffb94dcd1735353f4b Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 24 Mar 2022 10:18:34 +1100
Subject: [PATCH 1903/3533] stm32/mboot: Add macros for use in led_state_all().

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/mboot/mboot.h |  6 ++++++
 ports/stm32/mboot/ui.c    | 12 ++++++------
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/ports/stm32/mboot/mboot.h b/ports/stm32/mboot/mboot.h
index 0984fd9ac5f67..db90e07a0ebe1 100644
--- a/ports/stm32/mboot/mboot.h
+++ b/ports/stm32/mboot/mboot.h
@@ -46,6 +46,12 @@
 #define MBOOT_ADDRESS_SPACE_64BIT (0)
 #endif
 
+// These are for led_state_all() and can be or'd together.
+#define MBOOT_LED_STATE_LED0 (0x01)
+#define MBOOT_LED_STATE_LED1 (0x02)
+#define MBOOT_LED_STATE_LED2 (0x04)
+#define MBOOT_LED_STATE_LED3 (0x08)
+
 // These enum values are passed as the first argument to mboot_state_change() to
 // notify of a change in state of the bootloader activity.  This function has a
 // default implementation in ui.c but can be overridden by a board.  Some states
diff --git a/ports/stm32/mboot/ui.c b/ports/stm32/mboot/ui.c
index 36cba1cf50f04..840803829ed9b 100644
--- a/ports/stm32/mboot/ui.c
+++ b/ports/stm32/mboot/ui.c
@@ -103,15 +103,15 @@ MP_WEAK void led_state(uint32_t led, int val) {
 }
 
 void led_state_all(unsigned int mask) {
-    led_state(LED0, mask & 1);
+    led_state(LED0, mask & MBOOT_LED_STATE_LED0);
     #ifdef LED1
-    led_state(LED1, mask & 2);
+    led_state(LED1, mask & MBOOT_LED_STATE_LED1);
     #endif
     #ifdef LED2
-    led_state(LED2, mask & 4);
+    led_state(LED2, mask & MBOOT_LED_STATE_LED2);
     #endif
     #ifdef LED3
-    led_state(LED3, mask & 8);
+    led_state(LED3, mask & MBOOT_LED_STATE_LED3);
     #endif
 }
 
@@ -218,9 +218,9 @@ void mboot_state_change(mboot_state_t state, uint32_t arg) {
             // Flash LEDs based on success/failure of update
             for (int i = 0; i < 4; ++i) {
                 if (arg == 0) {
-                    led_state_all(7);
+                    led_state_all(MBOOT_LED_STATE_LED0 | MBOOT_LED_STATE_LED1 | MBOOT_LED_STATE_LED2);
                 } else {
-                    led_state_all(1);
+                    led_state_all(MBOOT_LED_STATE_LED0);
                 }
                 mp_hal_delay_ms(100);
                 led_state_all(0);

From 2a19c3cfe15506b3b51b9a5435db984f64299df0 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Thu, 7 Apr 2022 16:29:44 +0200
Subject: [PATCH 1904/3533] stm32/sdram: Add function to enable SDRAM
 power-down mode.

Add power-down mode for maximum power saving while in standby mode, to be
used by a board if needed.  Also fix a typo in a comment.
---
 ports/stm32/sdram.c | 10 +++++++++-
 ports/stm32/sdram.h |  1 +
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/ports/stm32/sdram.c b/ports/stm32/sdram.c
index 4615c4fe1e9a7..4ca79f270c6c2 100644
--- a/ports/stm32/sdram.c
+++ b/ports/stm32/sdram.c
@@ -259,7 +259,7 @@ static void sdram_init_seq(SDRAM_HandleTypeDef
 
 void sdram_enter_low_power(void) {
     // Enter self-refresh mode.
-    // In self-refresh mode the SDRAM retains data with external clocking.
+    // In self-refresh mode the SDRAM retains data without external clocking.
     FMC_SDRAM_DEVICE->SDCMR |= (FMC_SDRAM_CMD_SELFREFRESH_MODE |     // Command Mode
         FMC_SDRAM_CMD_TARGET_BANK |                                  // Command Target
         (0 << 5U) |                                                  // Auto Refresh Number -1
@@ -276,6 +276,14 @@ void sdram_leave_low_power(void) {
         (0 << 9U));                                                  // Mode Register Definition
 }
 
+void sdram_enter_power_down(void) {
+    // Enter power-down mode.
+    FMC_SDRAM_DEVICE->SDCMR |= (FMC_SDRAM_CMD_POWERDOWN_MODE |       // Command Mode
+        FMC_SDRAM_CMD_TARGET_BANK |                                  // Command Target
+        (0 << 5U) |                                                  // Auto Refresh Number -1
+        (0 << 9U));                                                  // Mode Register Definition
+}
+
 #if __GNUC__ >= 11
 // Prevent array bounds warnings when accessing SDRAM_START_ADDRESS as a memory pointer.
 #pragma GCC diagnostic push
diff --git a/ports/stm32/sdram.h b/ports/stm32/sdram.h
index f7a124adddf3a..5d170ea0d0d7d 100644
--- a/ports/stm32/sdram.h
+++ b/ports/stm32/sdram.h
@@ -13,5 +13,6 @@ void *sdram_start(void);
 void *sdram_end(void);
 void sdram_enter_low_power(void);
 void sdram_leave_low_power(void);
+void sdram_enter_power_down(void);
 bool sdram_test(bool exhaustive);
 #endif // __SDRAM_H__

From 7b3adb5ce583614acd72c14ee343b395190aba76 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Thu, 7 Apr 2022 16:32:02 +0200
Subject: [PATCH 1905/3533] stm32/Makefile: Add H747 to Makefile's MCU flags.

---
 ports/stm32/Makefile | 2 +-
 ports/stm32/stm32.mk | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/stm32/Makefile b/ports/stm32/Makefile
index fd5688056ce6d..85b25c77e2fc0 100644
--- a/ports/stm32/Makefile
+++ b/ports/stm32/Makefile
@@ -399,7 +399,7 @@ ifeq ($(MCU_SERIES),$(filter $(MCU_SERIES),g4))
     HAL_SRC_C += $(addprefix $(STM32LIB_HAL_BASE)/Src/stm32$(MCU_SERIES)xx_, hal_fdcan.c)
 endif
 
-ifeq ($(CMSIS_MCU),$(filter $(CMSIS_MCU),STM32H743xx STM32H750xx STM32H7A3xx STM32H7A3xxQ STM32H7B3xx STM32H7B3xxQ))
+ifeq ($(CMSIS_MCU),$(filter $(CMSIS_MCU),STM32H743xx STM32H747xx STM32H750xx STM32H7A3xx STM32H7A3xxQ STM32H7B3xx STM32H7B3xxQ))
     HAL_SRC_C += $(addprefix $(STM32LIB_HAL_BASE)/Src/stm32$(MCU_SERIES)xx_, hal_fdcan.c)
 else
 ifeq ($(MCU_SERIES),$(filter $(MCU_SERIES),f0 f4 f7 h7))
diff --git a/ports/stm32/stm32.mk b/ports/stm32/stm32.mk
index 4de101ce7a51a..ed3298824ba83 100644
--- a/ports/stm32/stm32.mk
+++ b/ports/stm32/stm32.mk
@@ -43,7 +43,7 @@ ifneq ($(BUILDING_MBOOT),1)
 # Select hardware floating-point support.
 SUPPORTS_HARDWARE_FP_SINGLE = 0
 SUPPORTS_HARDWARE_FP_DOUBLE = 0
-ifeq ($(CMSIS_MCU),$(filter $(CMSIS_MCU),STM32F765xx STM32F767xx STM32F769xx STM32H743xx STM32H750xx STM32H7A3xx STM32H7A3xxQ STM32H7B3xx STM32H7B3xxQ))
+ifeq ($(CMSIS_MCU),$(filter $(CMSIS_MCU),STM32F765xx STM32F767xx STM32F769xx STM32H743xx STM32H747xx STM32H750xx STM32H7A3xx STM32H7A3xxQ STM32H7B3xx STM32H7B3xxQ))
 CFLAGS_CORTEX_M += -mfpu=fpv5-d16 -mfloat-abi=hard
 SUPPORTS_HARDWARE_FP_SINGLE = 1
 SUPPORTS_HARDWARE_FP_DOUBLE = 1

From bdbc9b395fb19ae7b31e9f4c6116a0bba24addd1 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Thu, 7 Apr 2022 16:46:52 +0200
Subject: [PATCH 1906/3533] stm32/system_stm32: Add H7
 switched-mode-power-supply support.

- Add board-level configuration option to set the SMPS supply mode.
- Wait for valid voltage levels after configuring the SMPS mode.
- Wait for external supply ready flag if SMPS supplies external circuitry.
---
 .../boards/STM32H7B3I_DK/mpconfigboard.h      |  3 +++
 ports/stm32/system_stm32.c                    | 25 ++++++++++++++++---
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/ports/stm32/boards/STM32H7B3I_DK/mpconfigboard.h b/ports/stm32/boards/STM32H7B3I_DK/mpconfigboard.h
index 02f5fcac203e8..29d00e29eb8e6 100644
--- a/ports/stm32/boards/STM32H7B3I_DK/mpconfigboard.h
+++ b/ports/stm32/boards/STM32H7B3I_DK/mpconfigboard.h
@@ -29,6 +29,9 @@
 // 6 wait states when running at 280MHz (VOS0 range)
 #define MICROPY_HW_FLASH_LATENCY    FLASH_LATENCY_6
 
+// SMPS configuration
+#define MICROPY_HW_PWR_SMPS_CONFIG  (PWR_DIRECT_SMPS_SUPPLY)
+
 #if 0
 // 512MBit external OSPI flash, used for either the filesystem or XIP memory mapped
 #define MICROPY_HW_OSPIFLASH_SIZE_BITS_LOG2 (29)
diff --git a/ports/stm32/system_stm32.c b/ports/stm32/system_stm32.c
index 2ee745a49bde0..cdbfe925fc6c3 100644
--- a/ports/stm32/system_stm32.c
+++ b/ports/stm32/system_stm32.c
@@ -179,15 +179,32 @@ MP_WEAK void SystemClock_Config(void) {
 
     #if defined(STM32F4) || defined(STM32F7) || defined(STM32H7)
 
-    /* Enable Power Control clock */
-    #if defined(STM32H7A3xxQ) || defined(STM32H7B3xxQ)
-    MODIFY_REG(PWR->CR3, PWR_SUPPLY_CONFIG_MASK, PWR_CR3_SMPSEN);
+    #if defined(STM32H7) && defined(SMPS)
+    // H7 MCUs with SMPS must provide a power supply configuration.
+    MODIFY_REG(PWR->CR3, PWR_SUPPLY_CONFIG_MASK, MICROPY_HW_PWR_SMPS_CONFIG);
     #elif defined(STM32H7)
+    // H7 MCUs without SMPS, lock the power supply configuration update.
     MODIFY_REG(PWR->CR3, PWR_CR3_SCUEN, 0);
     #else
+    // other MCUs, enable power control clock.
     __PWR_CLK_ENABLE();
     #endif
 
+    #if defined(STM32H7)
+    // Wait untill the voltage levels are valid.
+    while (!__HAL_PWR_GET_FLAG(PWR_FLAG_ACTVOSRDY)) {
+    }
+
+    #if defined(MICROPY_HW_PWR_SMPS_CONFIG)
+    // If the SMPS supplies external circuitry, wait for the external supply ready flag.
+    if (MICROPY_HW_PWR_SMPS_CONFIG & PWR_CR3_SMPSEXTHP) {
+        while (!__HAL_PWR_GET_FLAG(PWR_FLAG_SMPSEXTRDY)) {
+        }
+    }
+    #endif // defined(MICROPY_HW_PWR_SMPS_CONFIG)
+
+    #endif // defined(STM32H7)
+
     /* The voltage scaling allows optimizing the power consumption when the device is
        clocked below the maximum system frequency, to update the voltage scaling value
        regarding system frequency refer to product datasheet.  */
@@ -202,7 +219,7 @@ MP_WEAK void SystemClock_Config(void) {
     #endif
 
     #if defined(STM32H7)
-    // Wait for PWR_FLAG_VOSRDY
+    // Wait until core supply reaches the required voltage level.
     while (!__HAL_PWR_GET_FLAG(PWR_FLAG_VOSRDY)) {
     }
     #endif

From a3e5a68c46af76d4d6e8924388b6a943996aa95e Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Thu, 7 Apr 2022 16:55:18 +0200
Subject: [PATCH 1907/3533] stm32/system_stm32: Set voltage scaling level 0 for
 H7 Rev-V devices.

This enables voltage scaling level 0 for H7 Rev-V devices, which allows the
CPU to run at the maximum supported operating frequency (480MHz).
---
 ports/stm32/system_stm32.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/ports/stm32/system_stm32.c b/ports/stm32/system_stm32.c
index cdbfe925fc6c3..dfff803e03ee5 100644
--- a/ports/stm32/system_stm32.c
+++ b/ports/stm32/system_stm32.c
@@ -208,7 +208,16 @@ MP_WEAK void SystemClock_Config(void) {
     /* The voltage scaling allows optimizing the power consumption when the device is
        clocked below the maximum system frequency, to update the voltage scaling value
        regarding system frequency refer to product datasheet.  */
-    __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1);
+    #if defined(STM32H7)
+    if (HAL_GetREVID() >= 0x2003) {
+        // Enable VSCALE0 for revision V devices.
+        __HAL_RCC_SYSCFG_CLK_ENABLE();
+        __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE0);
+    } else
+    #endif
+    {
+        __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1);
+    }
 
     #elif defined(STM32G4)
     // Configure the main internal regulator output voltage

From 36cac5e1547ece2185561c0c1272c6da28b03f30 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Fri, 8 Apr 2022 09:41:19 +0200
Subject: [PATCH 1908/3533] stm32/system_stm32: Allow boards to configure PLL
 VCI, VCO and FRACN.

This removes hard-coded PLL1/3 VCI, VCO and FRACN.
---
 .../boards/NUCLEO_H743ZI/mpconfigboard.h      | 26 +++++++++++-------
 .../boards/STM32H7B3I_DK/mpconfigboard.h      | 27 ++++++++++++-------
 .../boards/VCC_GND_H743VI/mpconfigboard.h     |  7 +++++
 ports/stm32/system_stm32.c                    | 12 ++++-----
 4 files changed, 46 insertions(+), 26 deletions(-)

diff --git a/ports/stm32/boards/NUCLEO_H743ZI/mpconfigboard.h b/ports/stm32/boards/NUCLEO_H743ZI/mpconfigboard.h
index f25263fd2b13c..4c053828fab5e 100644
--- a/ports/stm32/boards/NUCLEO_H743ZI/mpconfigboard.h
+++ b/ports/stm32/boards/NUCLEO_H743ZI/mpconfigboard.h
@@ -14,18 +14,24 @@
 void NUCLEO_H743ZI_board_early_init(void);
 
 // The board has an 8MHz HSE, the following gives 400MHz CPU speed
-#define MICROPY_HW_CLK_PLLM (4)
-#define MICROPY_HW_CLK_PLLN (400)
-#define MICROPY_HW_CLK_PLLP (2)
-#define MICROPY_HW_CLK_PLLQ (4)
-#define MICROPY_HW_CLK_PLLR (2)
+#define MICROPY_HW_CLK_PLLM         (4)
+#define MICROPY_HW_CLK_PLLN         (400)
+#define MICROPY_HW_CLK_PLLP         (2)
+#define MICROPY_HW_CLK_PLLQ         (4)
+#define MICROPY_HW_CLK_PLLR         (2)
+#define MICROPY_HW_CLK_PLLVCI       (RCC_PLL1VCIRANGE_1)
+#define MICROPY_HW_CLK_PLLVCO       (RCC_PLL1VCOWIDE)
+#define MICROPY_HW_CLK_PLLFRAC      (0)
 
 // The USB clock is set using PLL3
-#define MICROPY_HW_CLK_PLL3M (4)
-#define MICROPY_HW_CLK_PLL3N (120)
-#define MICROPY_HW_CLK_PLL3P (2)
-#define MICROPY_HW_CLK_PLL3Q (5)
-#define MICROPY_HW_CLK_PLL3R (2)
+#define MICROPY_HW_CLK_PLL3M        (4)
+#define MICROPY_HW_CLK_PLL3N        (120)
+#define MICROPY_HW_CLK_PLL3P        (2)
+#define MICROPY_HW_CLK_PLL3Q        (5)
+#define MICROPY_HW_CLK_PLL3R        (2)
+#define MICROPY_HW_CLK_PLL3VCI      (RCC_PLL3VCIRANGE_1)
+#define MICROPY_HW_CLK_PLL3VCO      (RCC_PLL3VCOWIDE)
+#define MICROPY_HW_CLK_PLL3FRAC     (0)
 
 // 4 wait states
 #define MICROPY_HW_FLASH_LATENCY    FLASH_LATENCY_4
diff --git a/ports/stm32/boards/STM32H7B3I_DK/mpconfigboard.h b/ports/stm32/boards/STM32H7B3I_DK/mpconfigboard.h
index 29d00e29eb8e6..f742241f7f869 100644
--- a/ports/stm32/boards/STM32H7B3I_DK/mpconfigboard.h
+++ b/ports/stm32/boards/STM32H7B3I_DK/mpconfigboard.h
@@ -13,18 +13,25 @@
 #define MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE (0)
 
 // The board has a 24MHz HSE, the following gives 280MHz CPU speed
-#define MICROPY_HW_CLK_PLLM (12)
-#define MICROPY_HW_CLK_PLLN (280)
-#define MICROPY_HW_CLK_PLLP (2)
-#define MICROPY_HW_CLK_PLLQ (2)
-#define MICROPY_HW_CLK_PLLR (2)
+#define MICROPY_HW_CLK_PLLM         (12)
+#define MICROPY_HW_CLK_PLLN         (280)
+#define MICROPY_HW_CLK_PLLP         (2)
+#define MICROPY_HW_CLK_PLLQ         (2)
+#define MICROPY_HW_CLK_PLLR         (2)
+#define MICROPY_HW_CLK_PLLVCI       (RCC_PLL1VCIRANGE_1)
+#define MICROPY_HW_CLK_PLLVCO       (RCC_PLL1VCOWIDE)
+#define MICROPY_HW_CLK_PLLFRAC      (0)
+
 
 // The USB clock is set using PLL3 (48Mhz usb clock)
-#define MICROPY_HW_CLK_PLL3M (12)
-#define MICROPY_HW_CLK_PLL3N (192)
-#define MICROPY_HW_CLK_PLL3P (17)
-#define MICROPY_HW_CLK_PLL3Q (8)
-#define MICROPY_HW_CLK_PLL3R (2)
+#define MICROPY_HW_CLK_PLL3M        (12)
+#define MICROPY_HW_CLK_PLL3N        (192)
+#define MICROPY_HW_CLK_PLL3P        (17)
+#define MICROPY_HW_CLK_PLL3Q        (8)
+#define MICROPY_HW_CLK_PLL3R        (2)
+#define MICROPY_HW_CLK_PLL3VCI      (RCC_PLL3VCIRANGE_1)
+#define MICROPY_HW_CLK_PLL3VCO      (RCC_PLL3VCOWIDE)
+#define MICROPY_HW_CLK_PLL3FRAC     (0)
 
 // 6 wait states when running at 280MHz (VOS0 range)
 #define MICROPY_HW_FLASH_LATENCY    FLASH_LATENCY_6
diff --git a/ports/stm32/boards/VCC_GND_H743VI/mpconfigboard.h b/ports/stm32/boards/VCC_GND_H743VI/mpconfigboard.h
index 9ef5490fdbcd4..aedb2b0093335 100644
--- a/ports/stm32/boards/VCC_GND_H743VI/mpconfigboard.h
+++ b/ports/stm32/boards/VCC_GND_H743VI/mpconfigboard.h
@@ -28,6 +28,10 @@
 #define MICROPY_HW_CLK_PLLP         (2)
 #define MICROPY_HW_CLK_PLLQ         (4)
 #define MICROPY_HW_CLK_PLLR         (2)
+#define MICROPY_HW_CLK_PLLVCI       (RCC_PLL1VCIRANGE_1)
+#define MICROPY_HW_CLK_PLLVCO       (RCC_PLL1VCOWIDE)
+#define MICROPY_HW_CLK_PLLFRAC      (0)
+
 
 // The USB clock is set using PLL3
 #define MICROPY_HW_CLK_PLL3M        (5)
@@ -35,6 +39,9 @@
 #define MICROPY_HW_CLK_PLL3P        (2)
 #define MICROPY_HW_CLK_PLL3Q        (5)
 #define MICROPY_HW_CLK_PLL3R        (2)
+#define MICROPY_HW_CLK_PLL3VCI      (RCC_PLL3VCIRANGE_1)
+#define MICROPY_HW_CLK_PLL3VCO      (RCC_PLL3VCOWIDE)
+#define MICROPY_HW_CLK_PLL3FRAC     (0)
 
 // 5 wait states
 #define MICROPY_HW_FLASH_LATENCY    FLASH_LATENCY_5
diff --git a/ports/stm32/system_stm32.c b/ports/stm32/system_stm32.c
index dfff803e03ee5..bf630fb7ca0c6 100644
--- a/ports/stm32/system_stm32.c
+++ b/ports/stm32/system_stm32.c
@@ -351,9 +351,9 @@ MP_WEAK void SystemClock_Config(void) {
     #endif
 
     #if defined(STM32H7)
-    RCC_OscInitStruct.PLL.PLLRGE = RCC_PLL1VCIRANGE_1;
-    RCC_OscInitStruct.PLL.PLLVCOSEL = RCC_PLL1VCOWIDE;
-    RCC_OscInitStruct.PLL.PLLFRACN = 0;
+    RCC_OscInitStruct.PLL.PLLRGE = MICROPY_HW_CLK_PLLVCI;
+    RCC_OscInitStruct.PLL.PLLVCOSEL = MICROPY_HW_CLK_PLLVCO;
+    RCC_OscInitStruct.PLL.PLLFRACN = MICROPY_HW_CLK_PLLFRAC;
     #endif
 
     #if defined(STM32F4) || defined(STM32F7)
@@ -392,9 +392,9 @@ MP_WEAK void SystemClock_Config(void) {
     PeriphClkInitStruct.PLL3.PLL3P = MICROPY_HW_CLK_PLL3P;
     PeriphClkInitStruct.PLL3.PLL3Q = MICROPY_HW_CLK_PLL3Q;
     PeriphClkInitStruct.PLL3.PLL3R = MICROPY_HW_CLK_PLL3R;
-    PeriphClkInitStruct.PLL3.PLL3RGE = RCC_PLL3VCIRANGE_1;
-    PeriphClkInitStruct.PLL3.PLL3VCOSEL = RCC_PLL3VCOWIDE;
-    PeriphClkInitStruct.PLL3.PLL3FRACN = 0;
+    PeriphClkInitStruct.PLL3.PLL3RGE = MICROPY_HW_CLK_PLL3VCI;
+    PeriphClkInitStruct.PLL3.PLL3VCOSEL = MICROPY_HW_CLK_PLL3VCO;
+    PeriphClkInitStruct.PLL3.PLL3FRACN = MICROPY_HW_CLK_PLL3FRAC;
     if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) {
         __fatal_error("HAL_RCCEx_PeriphCLKConfig");
     }

From a82fad7d8ec4f59ddd5b74f2cb3b145ed60877dd Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Fri, 8 Apr 2022 14:09:11 +0200
Subject: [PATCH 1909/3533] stm32/system_stm32: Improve H7 PLL and OSC
 configuration.

- Allow boards to configure CSI, HSI48 and PLL2.
- Allow peripheral clock source configuration.
- Set H7 SYSCLKSource.
---
 ports/stm32/system_stm32.c | 96 +++++++++++++++++++++++++++++++++++---
 1 file changed, 89 insertions(+), 7 deletions(-)

diff --git a/ports/stm32/system_stm32.c b/ports/stm32/system_stm32.c
index bf630fb7ca0c6..e67c32738c281 100644
--- a/ports/stm32/system_stm32.c
+++ b/ports/stm32/system_stm32.c
@@ -239,10 +239,19 @@ MP_WEAK void SystemClock_Config(void) {
     RCC_OscInitStruct.HSEState = MICROPY_HW_RCC_HSE_STATE;
     RCC_OscInitStruct.HSIState = MICROPY_HW_RCC_HSI_STATE;
     RCC_OscInitStruct.HSICalibrationValue = RCC_HSICALIBRATION_DEFAULT;
-    #if defined(STM32H7)
-    RCC_OscInitStruct.CSIState = RCC_CSI_OFF;
+
+    #if defined(MICROPY_HW_RCC_CSI_STATE)
+    RCC_OscInitStruct.CSIState = MICROPY_HW_RCC_CSI_STATE;
+    RCC_OscInitStruct.OscillatorType |= RCC_OSCILLATORTYPE_CSI;
+    #endif
+
+    #if defined(MICROPY_HW_RCC_HSI48_STATE)
+    RCC_OscInitStruct.HSI48State = MICROPY_HW_RCC_HSI48_STATE;
+    RCC_OscInitStruct.OscillatorType |= RCC_OSCILLATORTYPE_HSI48;
     #endif
+
     RCC_OscInitStruct.PLL.PLLSource = MICROPY_HW_RCC_PLL_SRC;
+
     #elif defined(STM32L4)
 
     #if MICROPY_HW_CLK_USE_HSE
@@ -370,6 +379,7 @@ MP_WEAK void SystemClock_Config(void) {
     RCC_ClkInitStruct.APB1CLKDivider = MICROPY_HW_CLK_APB1_DIV;
     RCC_ClkInitStruct.APB2CLKDivider = MICROPY_HW_CLK_APB2_DIV;
     #elif defined(STM32H7)
+    RCC_ClkInitStruct.SYSCLKSource = RCC_SYSCLKSOURCE_PLLCLK;
     RCC_ClkInitStruct.SYSCLKDivider = RCC_SYSCLK_DIV1;
     RCC_ClkInitStruct.AHBCLKDivider = MICROPY_HW_CLK_AHB_DIV;
     RCC_ClkInitStruct.APB3CLKDivider = MICROPY_HW_CLK_APB3_DIV;
@@ -383,10 +393,20 @@ MP_WEAK void SystemClock_Config(void) {
         __fatal_error("HAL_RCC_OscConfig");
     }
 
-    #if defined(STM32H7)
-    /* PLL3 for USB Clock */
-    PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_USB;
-    PeriphClkInitStruct.UsbClockSelection = RCC_USBCLKSOURCE_PLL3;
+    #if defined(MICROPY_HW_CLK_PLL2M)
+    // PLL2 configuration.
+    PeriphClkInitStruct.PLL2.PLL2M = MICROPY_HW_CLK_PLL2M;
+    PeriphClkInitStruct.PLL2.PLL2N = MICROPY_HW_CLK_PLL2N;
+    PeriphClkInitStruct.PLL2.PLL2P = MICROPY_HW_CLK_PLL2P;
+    PeriphClkInitStruct.PLL2.PLL2Q = MICROPY_HW_CLK_PLL2Q;
+    PeriphClkInitStruct.PLL2.PLL2R = MICROPY_HW_CLK_PLL2R;
+    PeriphClkInitStruct.PLL2.PLL2RGE = MICROPY_HW_CLK_PLL2VCI;
+    PeriphClkInitStruct.PLL2.PLL2VCOSEL = MICROPY_HW_CLK_PLL2VCO;
+    PeriphClkInitStruct.PLL2.PLL2FRACN = MICROPY_HW_CLK_PLL2FRAC;
+    #endif
+
+    #if defined(MICROPY_HW_CLK_PLL3M)
+    // PLL3 configuration.
     PeriphClkInitStruct.PLL3.PLL3M = MICROPY_HW_CLK_PLL3M;
     PeriphClkInitStruct.PLL3.PLL3N = MICROPY_HW_CLK_PLL3N;
     PeriphClkInitStruct.PLL3.PLL3P = MICROPY_HW_CLK_PLL3P;
@@ -395,10 +415,72 @@ MP_WEAK void SystemClock_Config(void) {
     PeriphClkInitStruct.PLL3.PLL3RGE = MICROPY_HW_CLK_PLL3VCI;
     PeriphClkInitStruct.PLL3.PLL3VCOSEL = MICROPY_HW_CLK_PLL3VCO;
     PeriphClkInitStruct.PLL3.PLL3FRACN = MICROPY_HW_CLK_PLL3FRAC;
+    #endif
+
+    #if defined(STM32H7)
+
+    PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_USB;
+    #if defined(MICROPY_HW_RCC_USB_CLKSOURCE)
+    PeriphClkInitStruct.UsbClockSelection = MICROPY_HW_RCC_USB_CLKSOURCE;
+    #else
+    // Use PLL3 for USB clock source by default.
+    PeriphClkInitStruct.UsbClockSelection = RCC_USBCLKSOURCE_PLL3;
+    #endif
+
+    #if defined(MICROPY_HW_RCC_RTC_CLKSOURCE)
+    PeriphClkInitStruct.PeriphClockSelection |= RCC_PERIPHCLK_RTC;
+    PeriphClkInitStruct.RTCClockSelection = MICROPY_HW_RCC_RTC_CLKSOURCE;
+    #endif
+
+    #if defined(MICROPY_HW_RCC_RNG_CLKSOURCE)
+    PeriphClkInitStruct.PeriphClockSelection |= RCC_PERIPHCLK_RNG;
+    PeriphClkInitStruct.RngClockSelection = MICROPY_HW_RCC_RNG_CLKSOURCE;
+    #endif
+
+    #if defined(MICROPY_HW_RCC_FMC_CLKSOURCE)
+    PeriphClkInitStruct.PeriphClockSelection |= RCC_PERIPHCLK_FMC;
+    PeriphClkInitStruct.FmcClockSelection = MICROPY_HW_RCC_FMC_CLKSOURCE;
+    #endif
+
+    #if defined(MICROPY_HW_RCC_ADC_CLKSOURCE)
+    PeriphClkInitStruct.PeriphClockSelection |= RCC_PERIPHCLK_ADC;
+    PeriphClkInitStruct.AdcClockSelection = MICROPY_HW_RCC_ADC_CLKSOURCE;
+    #endif
+
+    #if defined(MICROPY_HW_RCC_SDMMC_CLKSOURCE)
+    PeriphClkInitStruct.PeriphClockSelection |= RCC_PERIPHCLK_SDMMC;
+    PeriphClkInitStruct.SdmmcClockSelection = MICROPY_HW_RCC_SDMMC_CLKSOURCE;
+    #endif
+
+    #if defined(MICROPY_HW_RCC_FDCAN_CLKSOURCE)
+    PeriphClkInitStruct.PeriphClockSelection |= RCC_PERIPHCLK_FDCAN;
+    PeriphClkInitStruct.FdcanClockSelection = MICROPY_HW_RCC_FDCAN_CLKSOURCE;
+    #endif
+
+    #if defined(MICROPY_HW_RCC_QSPI_CLKSOURCE)
+    PeriphClkInitStruct.PeriphClockSelection |= RCC_PERIPHCLK_QSPI;
+    PeriphClkInitStruct.QspiClockSelection = MICROPY_HW_RCC_QSPI_CLKSOURCE;
+    #endif
+
+    #if defined(MICROPY_HW_RCC_SPI123_CLKSOURCE)
+    PeriphClkInitStruct.PeriphClockSelection |= RCC_PERIPHCLK_SPI123;
+    PeriphClkInitStruct.Spi123ClockSelection = MICROPY_HW_RCC_SPI123_CLKSOURCE;
+    #endif
+
+    #if defined(MICROPY_HW_RCC_I2C123_CLKSOURCE)
+    PeriphClkInitStruct.PeriphClockSelection |= RCC_PERIPHCLK_I2C123;
+    PeriphClkInitStruct.I2c123ClockSelection = MICROPY_HW_RCC_I2C123_CLKSOURCE;
+    #endif
+
+    #if defined(MICROPY_HW_RCC_SPI45_CLKSOURCE)
+    PeriphClkInitStruct.PeriphClockSelection |= RCC_PERIPHCLK_SPI45;
+    PeriphClkInitStruct.Spi45ClockSelection = MICROPY_HW_RCC_SPI45_CLKSOURCE;
+    #endif
+
     if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) {
         __fatal_error("HAL_RCCEx_PeriphCLKConfig");
     }
-    #endif
+    #endif  // defined(STM32H7)
 
     #if defined(STM32F7)
     /* Activate the OverDrive to reach the 200 MHz Frequency */

From 9d7c168bf5bdf909f77aba4583dbd0739b1373f7 Mon Sep 17 00:00:00 2001
From: Dave Hylands <dhylands@gmail.com>
Date: Sun, 10 Apr 2022 13:31:38 -0700
Subject: [PATCH 1910/3533] stm32/boards/PYBD_SFx: Allow FROZEN_MANIFEST to be
 overridden.

Because mpconfigboard.mk used = rather then ?= it doesn't allow
FROZEN_MANIFEST to be overridden using a GNUmakefile or the manifest.
---
 ports/stm32/boards/PYBD_SF2/mpconfigboard.mk | 2 +-
 ports/stm32/boards/PYBD_SF3/mpconfigboard.mk | 2 +-
 ports/stm32/boards/PYBD_SF6/mpconfigboard.mk | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ports/stm32/boards/PYBD_SF2/mpconfigboard.mk b/ports/stm32/boards/PYBD_SF2/mpconfigboard.mk
index 9917aa2c5730a..6615a44a538d9 100644
--- a/ports/stm32/boards/PYBD_SF2/mpconfigboard.mk
+++ b/ports/stm32/boards/PYBD_SF2/mpconfigboard.mk
@@ -20,4 +20,4 @@ MICROPY_SSL_MBEDTLS = 1
 MICROPY_VFS_LFS2 = 1
 
 # PYBD-specific frozen modules
-FROZEN_MANIFEST = $(BOARD_DIR)/manifest.py
+FROZEN_MANIFEST ?= $(BOARD_DIR)/manifest.py
diff --git a/ports/stm32/boards/PYBD_SF3/mpconfigboard.mk b/ports/stm32/boards/PYBD_SF3/mpconfigboard.mk
index 6bcc68f4b192e..550094b7439db 100644
--- a/ports/stm32/boards/PYBD_SF3/mpconfigboard.mk
+++ b/ports/stm32/boards/PYBD_SF3/mpconfigboard.mk
@@ -20,4 +20,4 @@ MICROPY_SSL_MBEDTLS = 1
 MICROPY_VFS_LFS2 = 1
 
 # PYBD-specific frozen modules
-FROZEN_MANIFEST = boards/PYBD_SF2/manifest.py
+FROZEN_MANIFEST ?= boards/PYBD_SF2/manifest.py
diff --git a/ports/stm32/boards/PYBD_SF6/mpconfigboard.mk b/ports/stm32/boards/PYBD_SF6/mpconfigboard.mk
index bac516ab7949f..9db2210559a63 100644
--- a/ports/stm32/boards/PYBD_SF6/mpconfigboard.mk
+++ b/ports/stm32/boards/PYBD_SF6/mpconfigboard.mk
@@ -17,4 +17,4 @@ MICROPY_SSL_MBEDTLS = 1
 MICROPY_VFS_LFS2 = 1
 
 # PYBD-specific frozen modules
-FROZEN_MANIFEST = boards/PYBD_SF2/manifest.py
+FROZEN_MANIFEST ?= boards/PYBD_SF2/manifest.py

From d242a9b7f7b6d4e744889d5af6c17dfb54aed8c3 Mon Sep 17 00:00:00 2001
From: Peter Hinch <peter@hinch.me.uk>
Date: Wed, 2 Mar 2022 09:19:45 +0000
Subject: [PATCH 1911/3533] rp2/machine_uart: Use read/write mutex to prevent
 char duplication.

Duplication of characters is caused by re-entrant calls from separate cores
of uart_fill_tx_fifo().  This patch uses a mutex to ensure that a
re-entrant execution of the function returns without affecting the UART
FIFO.

Fixes issues #8344 and #8360.
---
 ports/rp2/machine_uart.c | 72 +++++++++++++++++++++++++---------------
 1 file changed, 46 insertions(+), 26 deletions(-)

diff --git a/ports/rp2/machine_uart.c b/ports/rp2/machine_uart.c
index 0642f704f7e61..fafa3c1b5678d 100644
--- a/ports/rp2/machine_uart.c
+++ b/ports/rp2/machine_uart.c
@@ -34,6 +34,7 @@
 #include "hardware/irq.h"
 #include "hardware/uart.h"
 #include "hardware/regs/uart.h"
+#include "pico/mutex.h"
 
 #define DEFAULT_UART_BAUDRATE (115200)
 #define DEFAULT_UART_BITS (8)
@@ -72,6 +73,16 @@
 #define UART_HWCONTROL_CTS  (1)
 #define UART_HWCONTROL_RTS  (2)
 
+STATIC mutex_t write_mutex_0;
+STATIC mutex_t write_mutex_1;
+STATIC mutex_t read_mutex_0;
+STATIC mutex_t read_mutex_1;
+
+auto_init_mutex(write_mutex_0);
+auto_init_mutex(write_mutex_1);
+auto_init_mutex(read_mutex_0);
+auto_init_mutex(read_mutex_1);
+
 typedef struct _machine_uart_obj_t {
     mp_obj_base_t base;
     uart_inst_t *const uart;
@@ -89,18 +100,18 @@ typedef struct _machine_uart_obj_t {
     uint8_t invert;
     uint8_t flow;
     ringbuf_t read_buffer;
-    bool read_lock;
+    mutex_t *read_mutex;
     ringbuf_t write_buffer;
-    bool write_lock;
+    mutex_t *write_mutex;
 } machine_uart_obj_t;
 
 STATIC machine_uart_obj_t machine_uart_obj[] = {
     {{&machine_uart_type}, uart0, 0, 0, DEFAULT_UART_BITS, UART_PARITY_NONE, DEFAULT_UART_STOP,
      MICROPY_HW_UART0_TX, MICROPY_HW_UART0_RX, MICROPY_HW_UART0_CTS, MICROPY_HW_UART0_RTS,
-     0, 0, 0, 0, {NULL, 1, 0, 0}, 0, {NULL, 1, 0, 0}, 0},
+     0, 0, 0, 0, {NULL, 1, 0, 0}, &read_mutex_0, {NULL, 1, 0, 0}, &write_mutex_0},
     {{&machine_uart_type}, uart1, 1, 0, DEFAULT_UART_BITS, UART_PARITY_NONE, DEFAULT_UART_STOP,
      MICROPY_HW_UART1_TX, MICROPY_HW_UART1_RX, MICROPY_HW_UART1_CTS, MICROPY_HW_UART1_RTS,
-     0, 0, 0, 0, {NULL, 1, 0, 0}, 0, {NULL, 1, 0, 0}, 0},
+     0, 0, 0, 0, {NULL, 1, 0, 0}, &read_mutex_1, {NULL, 1, 0, 0}, &write_mutex_1},
 };
 
 STATIC const char *_parity_name[] = {"None", "0", "1"};
@@ -109,19 +120,42 @@ STATIC const char *_invert_name[] = {"None", "INV_TX", "INV_RX", "INV_TX|INV_RX"
 /******************************************************************************/
 // IRQ and buffer handling
 
+static inline bool write_mutex_try_lock(machine_uart_obj_t *u) {
+    return mutex_enter_timeout_ms(u->write_mutex, 0);
+}
+
+static inline void write_mutex_unlock(machine_uart_obj_t *u) {
+    mutex_exit(u->write_mutex);
+}
+
+static inline bool read_mutex_try_lock(machine_uart_obj_t *u) {
+    return mutex_enter_timeout_ms(u->read_mutex, 0);
+}
+
+static inline void read_mutex_unlock(machine_uart_obj_t *u) {
+    mutex_exit(u->read_mutex);
+}
+
 // take all bytes from the fifo and store them in the buffer
 STATIC void uart_drain_rx_fifo(machine_uart_obj_t *self) {
-    while (uart_is_readable(self->uart) && ringbuf_free(&self->read_buffer) > 0) {
-        // get a byte from uart and put into the buffer
-        ringbuf_put(&(self->read_buffer), uart_get_hw(self->uart)->dr);
+    if (read_mutex_try_lock(self)) {
+        while (uart_is_readable(self->uart) && ringbuf_free(&self->read_buffer) > 0) {
+            // get a byte from uart and put into the buffer
+            ringbuf_put(&(self->read_buffer), uart_get_hw(self->uart)->dr);
+        }
+        read_mutex_unlock(self);
     }
 }
 
 // take bytes from the buffer and put them into the UART FIFO
+// Re-entrancy: quit if an instance already running
 STATIC void uart_fill_tx_fifo(machine_uart_obj_t *self) {
-    while (uart_is_writable(self->uart) && ringbuf_avail(&self->write_buffer) > 0) {
-        // get a byte from the buffer and put it into the uart
-        uart_get_hw(self->uart)->dr = ringbuf_get(&(self->write_buffer));
+    if (write_mutex_try_lock(self)) {
+        while (uart_is_writable(self->uart) && ringbuf_avail(&self->write_buffer) > 0) {
+            // get a byte from the buffer and put it into the uart
+            uart_get_hw(self->uart)->dr = ringbuf_get(&(self->write_buffer));
+        }
+        write_mutex_unlock(self);
     }
 }
 
@@ -129,16 +163,12 @@ STATIC inline void uart_service_interrupt(machine_uart_obj_t *self) {
     if (uart_get_hw(self->uart)->mis & (UART_UARTMIS_RXMIS_BITS | UART_UARTMIS_RTMIS_BITS)) { // rx interrupt?
         // clear all interrupt bits but tx
         uart_get_hw(self->uart)->icr = UART_UARTICR_BITS & (~UART_UARTICR_TXIC_BITS);
-        if (!self->read_lock) {
-            uart_drain_rx_fifo(self);
-        }
+        uart_drain_rx_fifo(self);
     }
     if (uart_get_hw(self->uart)->mis & UART_UARTMIS_TXMIS_BITS) { // tx interrupt?
         // clear all interrupt bits but rx
         uart_get_hw(self->uart)->icr = UART_UARTICR_BITS & (~UART_UARTICR_RXIC_BITS);
-        if (!self->write_lock) {
-            uart_fill_tx_fifo(self);
-        }
+        uart_fill_tx_fifo(self);
     }
 }
 
@@ -270,8 +300,6 @@ STATIC void machine_uart_init_helper(machine_uart_obj_t *self, size_t n_args, co
         self->flow = args[ARG_flow].u_int;
     }
 
-    self->read_lock = false;
-
     // Set the RX buffer size if configured.
     size_t rxbuf_len = DEFAULT_BUFFER_SIZE;
     if (args[ARG_rxbuf].u_int > 0) {
@@ -393,9 +421,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_uart_deinit_obj, machine_uart_deinit);
 STATIC mp_obj_t machine_uart_any(mp_obj_t self_in) {
     machine_uart_obj_t *self = MP_OBJ_TO_PTR(self_in);
     // get all bytes from the fifo first
-    self->read_lock = true;
     uart_drain_rx_fifo(self);
-    self->read_lock = false;
     return MP_OBJ_NEW_SMALL_INT(ringbuf_avail(&self->read_buffer));
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_uart_any_obj, machine_uart_any);
@@ -441,9 +467,7 @@ STATIC mp_uint_t machine_uart_read(mp_obj_t self_in, void *buf_in, mp_uint_t siz
         while (ringbuf_avail(&self->read_buffer) == 0) {
             if (uart_is_readable(self->uart)) {
                 // Force a few incoming bytes to the buffer
-                self->read_lock = true;
                 uart_drain_rx_fifo(self);
-                self->read_lock = false;
                 break;
             }
             if (time_us_64() > t) {  // timed out
@@ -476,9 +500,7 @@ STATIC mp_uint_t machine_uart_write(mp_obj_t self_in, const void *buf_in, mp_uin
     }
 
     // Kickstart the UART transmit.
-    self->write_lock = true;
     uart_fill_tx_fifo(self);
-    self->write_lock = false;
 
     // Send the next characters while busy waiting.
     while (i < size) {
@@ -497,9 +519,7 @@ STATIC mp_uint_t machine_uart_write(mp_obj_t self_in, const void *buf_in, mp_uin
         ringbuf_put(&(self->write_buffer), *src++);
         ++i;
         t = time_us_64() + timeout_char_us;
-        self->write_lock = true;
         uart_fill_tx_fifo(self);
-        self->write_lock = false;
     }
 
     // Just in case the fifo was drained during refill of the ringbuf.

From 75506e496f7545c43c4d76bac131c4e01c258fa5 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 23 Mar 2022 17:13:03 +1100
Subject: [PATCH 1912/3533] py/scheduler: Add support for scheduling static
 C-based callbacks.

If MICROPY_SCHEDULER_STATIC_NODES is enabled then C code can declare a
static mp_sched_node_t and schedule a callback using
mp_sched_schedule_node().  In contrast to using mp_sched_schedule(), the
node version will have at most one pending callback outstanding, and will
always be able to schedule if there is nothing already scheduled on this
node.  This guarantees that the the callback will be called exactly once
after it is scheduled.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/mpconfig.h  |  5 +++++
 py/mpstate.h   | 10 ++++++++++
 py/runtime.c   | 10 +++++++++-
 py/runtime.h   | 10 ++++++++++
 py/scheduler.c | 52 +++++++++++++++++++++++++++++++++++++++++++++++++-
 5 files changed, 85 insertions(+), 2 deletions(-)

diff --git a/py/mpconfig.h b/py/mpconfig.h
index 754daa7bd5a0b..22dfbb867547f 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -893,6 +893,11 @@ typedef double mp_float_t;
 #define MICROPY_ENABLE_SCHEDULER (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
 #endif
 
+// Whether the scheduler supports scheduling static nodes with C callbacks
+#ifndef MICROPY_SCHEDULER_STATIC_NODES
+#define MICROPY_SCHEDULER_STATIC_NODES (0)
+#endif
+
 // Maximum number of entries in the scheduler
 #ifndef MICROPY_SCHEDULER_DEPTH
 #define MICROPY_SCHEDULER_DEPTH (4)
diff --git a/py/mpstate.h b/py/mpstate.h
index a493b780abd30..ab6090e1a2b16 100644
--- a/py/mpstate.h
+++ b/py/mpstate.h
@@ -241,6 +241,16 @@ typedef struct _mp_state_vm_t {
 
     #if MICROPY_ENABLE_SCHEDULER
     volatile int16_t sched_state;
+
+    #if MICROPY_SCHEDULER_STATIC_NODES
+    // These will usually point to statically allocated memory.  They are not
+    // traced by the GC.  They are assumed to be zero'd out before mp_init() is
+    // called (usually because this struct lives in the BSS).
+    struct _mp_sched_node_t *sched_head;
+    struct _mp_sched_node_t *sched_tail;
+    #endif
+
+    // These index sched_queue.
     uint8_t sched_len;
     uint8_t sched_idx;
     #endif
diff --git a/py/runtime.c b/py/runtime.c
index 2a07df6642d79..02b866d83953b 100644
--- a/py/runtime.c
+++ b/py/runtime.c
@@ -65,7 +65,15 @@ void mp_init(void) {
     // no pending exceptions to start with
     MP_STATE_THREAD(mp_pending_exception) = MP_OBJ_NULL;
     #if MICROPY_ENABLE_SCHEDULER
-    MP_STATE_VM(sched_state) = MP_SCHED_IDLE;
+    #if MICROPY_SCHEDULER_STATIC_NODES
+    if (MP_STATE_VM(sched_head) == NULL) {
+        // no pending callbacks to start with
+        MP_STATE_VM(sched_state) = MP_SCHED_IDLE;
+    } else {
+        // pending callbacks are on the list, eg from before a soft reset
+        MP_STATE_VM(sched_state) = MP_SCHED_PENDING;
+    }
+    #endif
     MP_STATE_VM(sched_idx) = 0;
     MP_STATE_VM(sched_len) = 0;
     #endif
diff --git a/py/runtime.h b/py/runtime.h
index f0d41f38df77f..4393fbfa82d19 100644
--- a/py/runtime.h
+++ b/py/runtime.h
@@ -57,6 +57,15 @@ typedef struct _mp_arg_t {
     mp_arg_val_t defval;
 } mp_arg_t;
 
+struct _mp_sched_node_t;
+
+typedef void (*mp_sched_callback_t)(struct _mp_sched_node_t *);
+
+typedef struct _mp_sched_node_t {
+    mp_sched_callback_t callback;
+    struct _mp_sched_node_t *next;
+} mp_sched_node_t;
+
 // Tables mapping operator enums to qstrs, defined in objtype.c
 extern const byte mp_unary_op_method_name[];
 extern const byte mp_binary_op_method_name[];
@@ -74,6 +83,7 @@ void mp_sched_lock(void);
 void mp_sched_unlock(void);
 #define mp_sched_num_pending() (MP_STATE_VM(sched_len))
 bool mp_sched_schedule(mp_obj_t function, mp_obj_t arg);
+bool mp_sched_schedule_node(mp_sched_node_t *node, mp_sched_callback_t callback);
 #endif
 
 // extra printing method specifically for mp_obj_t's which are integral type
diff --git a/py/scheduler.c b/py/scheduler.c
index bd0bbf2078f6c..3966da2975197 100644
--- a/py/scheduler.c
+++ b/py/scheduler.c
@@ -90,6 +90,24 @@ void mp_handle_pending(bool raise_exc) {
 // or by the VM's inlined version of that function.
 void mp_handle_pending_tail(mp_uint_t atomic_state) {
     MP_STATE_VM(sched_state) = MP_SCHED_LOCKED;
+
+    #if MICROPY_SCHEDULER_STATIC_NODES
+    // Run all pending C callbacks.
+    while (MP_STATE_VM(sched_head) != NULL) {
+        mp_sched_node_t *node = MP_STATE_VM(sched_head);
+        MP_STATE_VM(sched_head) = node->next;
+        if (MP_STATE_VM(sched_head) == NULL) {
+            MP_STATE_VM(sched_tail) = NULL;
+        }
+        mp_sched_callback_t callback = node->callback;
+        node->callback = NULL;
+        MICROPY_END_ATOMIC_SECTION(atomic_state);
+        callback(node);
+        atomic_state = MICROPY_BEGIN_ATOMIC_SECTION();
+    }
+    #endif
+
+    // Run at most one pending Python callback.
     if (!mp_sched_empty()) {
         mp_sched_item_t item = MP_STATE_VM(sched_queue)[MP_STATE_VM(sched_idx)];
         MP_STATE_VM(sched_idx) = IDX_MASK(MP_STATE_VM(sched_idx) + 1);
@@ -99,6 +117,7 @@ void mp_handle_pending_tail(mp_uint_t atomic_state) {
     } else {
         MICROPY_END_ATOMIC_SECTION(atomic_state);
     }
+
     mp_sched_unlock();
 }
 
@@ -117,7 +136,11 @@ void mp_sched_unlock(void) {
     assert(MP_STATE_VM(sched_state) < 0);
     if (++MP_STATE_VM(sched_state) == 0) {
         // vm became unlocked
-        if (MP_STATE_THREAD(mp_pending_exception) != MP_OBJ_NULL || mp_sched_num_pending()) {
+        if (MP_STATE_THREAD(mp_pending_exception) != MP_OBJ_NULL
+            #if MICROPY_SCHEDULER_STATIC_NODES
+            || MP_STATE_VM(sched_head) != NULL
+            #endif
+            || mp_sched_num_pending()) {
             MP_STATE_VM(sched_state) = MP_SCHED_PENDING;
         } else {
             MP_STATE_VM(sched_state) = MP_SCHED_IDLE;
@@ -146,6 +169,33 @@ bool MICROPY_WRAP_MP_SCHED_SCHEDULE(mp_sched_schedule)(mp_obj_t function, mp_obj
     return ret;
 }
 
+#if MICROPY_SCHEDULER_STATIC_NODES
+bool mp_sched_schedule_node(mp_sched_node_t *node, mp_sched_callback_t callback) {
+    mp_uint_t atomic_state = MICROPY_BEGIN_ATOMIC_SECTION();
+    bool ret;
+    if (node->callback == NULL) {
+        if (MP_STATE_VM(sched_state) == MP_SCHED_IDLE) {
+            MP_STATE_VM(sched_state) = MP_SCHED_PENDING;
+        }
+        node->callback = callback;
+        node->next = NULL;
+        if (MP_STATE_VM(sched_tail) == NULL) {
+            MP_STATE_VM(sched_head) = node;
+        } else {
+            MP_STATE_VM(sched_tail)->next = node;
+        }
+        MP_STATE_VM(sched_tail) = node;
+        MICROPY_SCHED_HOOK_SCHEDULED;
+        ret = true;
+    } else {
+        // already scheduled
+        ret = false;
+    }
+    MICROPY_END_ATOMIC_SECTION(atomic_state);
+    return ret;
+}
+#endif
+
 #else // MICROPY_ENABLE_SCHEDULER
 
 // A variant of this is inlined in the VM at the pending exception check

From 8045ac07f599c0ccc447c88a0b778f704b497559 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 23 Mar 2022 17:22:53 +1100
Subject: [PATCH 1913/3533] stm32/mpbthciport: Switch scheduling callback to
 use node scheduler.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/mpbthciport.c  | 29 +++++------------------------
 ports/stm32/mpconfigport.h |  1 +
 2 files changed, 6 insertions(+), 24 deletions(-)

diff --git a/ports/stm32/mpbthciport.c b/ports/stm32/mpbthciport.c
index a1ab3258b6269..89b04a5405caf 100644
--- a/ports/stm32/mpbthciport.c
+++ b/ports/stm32/mpbthciport.c
@@ -42,20 +42,12 @@ uint8_t mp_bluetooth_hci_cmd_buf[4 + 256];
 // Soft timer for scheduling a HCI poll.
 STATIC soft_timer_entry_t mp_bluetooth_hci_soft_timer;
 
-#if MICROPY_PY_BLUETOOTH_USE_SYNC_EVENTS
-// Prevent double-enqueuing of the scheduled task.
-STATIC volatile bool events_task_is_scheduled;
-#endif
-
 // This is called by soft_timer and executes at IRQ_PRI_PENDSV.
 STATIC void mp_bluetooth_hci_soft_timer_callback(soft_timer_entry_t *self) {
     mp_bluetooth_hci_poll_now();
 }
 
 void mp_bluetooth_hci_init(void) {
-    #if MICROPY_PY_BLUETOOTH_USE_SYNC_EVENTS
-    events_task_is_scheduled = false;
-    #endif
     soft_timer_static_init(
         &mp_bluetooth_hci_soft_timer,
         SOFT_TIMER_MODE_ONE_SHOT,
@@ -65,9 +57,6 @@ void mp_bluetooth_hci_init(void) {
 }
 
 STATIC void mp_bluetooth_hci_start_polling(void) {
-    #if MICROPY_PY_BLUETOOTH_USE_SYNC_EVENTS
-    events_task_is_scheduled = false;
-    #endif
     mp_bluetooth_hci_poll_now();
 }
 
@@ -77,29 +66,21 @@ void mp_bluetooth_hci_poll_in_ms_default(uint32_t ms) {
 
 #if MICROPY_PY_BLUETOOTH_USE_SYNC_EVENTS
 
+STATIC mp_sched_node_t mp_bluetooth_hci_sched_node;
+
 // For synchronous mode, we run all BLE stack code inside a scheduled task.
 // This task is scheduled periodically via a soft timer, or
 // immediately on HCI UART RXIDLE.
-
-STATIC mp_obj_t run_events_scheduled_task(mp_obj_t none_in) {
-    (void)none_in;
-    events_task_is_scheduled = false;
+STATIC void run_events_scheduled_task(mp_sched_node_t *node) {
     // This will process all buffered HCI UART data, and run any callouts or events.
+    (void)node;
     mp_bluetooth_hci_poll();
-    return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(run_events_scheduled_task_obj, run_events_scheduled_task);
 
 // Called periodically (systick) or directly (e.g. UART RX IRQ) in order to
 // request that processing happens ASAP in the scheduler.
 void mp_bluetooth_hci_poll_now_default(void) {
-    if (!events_task_is_scheduled) {
-        events_task_is_scheduled = mp_sched_schedule(MP_OBJ_FROM_PTR(&run_events_scheduled_task_obj), mp_const_none);
-        if (!events_task_is_scheduled) {
-            // The schedule queue is full, set callback to try again soon.
-            mp_bluetooth_hci_poll_in_ms(5);
-        }
-    }
+    mp_sched_schedule_node(&mp_bluetooth_hci_sched_node, run_events_scheduled_task);
 }
 
 #else // !MICROPY_PY_BLUETOOTH_USE_SYNC_EVENTS
diff --git a/ports/stm32/mpconfigport.h b/ports/stm32/mpconfigport.h
index a52b2cc50508a..b1bf6da22a5b2 100644
--- a/ports/stm32/mpconfigport.h
+++ b/ports/stm32/mpconfigport.h
@@ -75,6 +75,7 @@
 #define MICROPY_FLOAT_IMPL          (MICROPY_FLOAT_IMPL_FLOAT)
 #endif
 #define MICROPY_USE_INTERNAL_ERRNO  (1)
+#define MICROPY_SCHEDULER_STATIC_NODES (1)
 #define MICROPY_SCHEDULER_DEPTH     (8)
 #define MICROPY_VFS                 (1)
 

From b8d959d6cf6afab4277a7e094be5107f27105b17 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 14 Apr 2022 14:02:09 +1000
Subject: [PATCH 1914/3533] Revert "py/emitnative: Don't store prelude at end
 of machine code if..."

This reverts commit 7e8222ae063d78ae8f901bb0f9fef663edd2edb6.

The prelude data must exist somewhere in the native code so load_raw_code
and mpy-tool.py can access and parse it.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/emitnative.c | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/py/emitnative.c b/py/emitnative.c
index 2863984047a15..056a1a8a6175c 100644
--- a/py/emitnative.c
+++ b/py/emitnative.c
@@ -723,13 +723,7 @@ STATIC bool emit_native_end_pass(emit_t *emit) {
 
     if (emit->pass == MP_PASS_EMIT) {
         void *f = mp_asm_base_get_code(&emit->as->base);
-        #if N_PRELUDE_AS_BYTES_OBJ
-        // Keep only the machine code, not the prelude, which is in a separate bytes object.
-        mp_uint_t f_len = emit->prelude_offset;
-        #else
-        // Keep both the machine code and the prelude.
         mp_uint_t f_len = mp_asm_base_get_code_size(&emit->as->base);
-        #endif
 
         mp_emit_glue_assign_native(emit->scope->raw_code,
             emit->do_viper_types ? MP_CODE_NATIVE_VIPER : MP_CODE_NATIVE_PY,

From be25e333dfff076f631e50fd5eec2fa626b2625b Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 14 Apr 2022 13:10:00 +1000
Subject: [PATCH 1915/3533] esp32/boards: Add test manifest to test freezing
 during build.

Includes tests for freezing @micropython.native and @micropython.viper
code.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/boards/manifest_test.py | 10 ++++++++++
 tools/ci.sh                         |  4 +++-
 2 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 ports/esp32/boards/manifest_test.py

diff --git a/ports/esp32/boards/manifest_test.py b/ports/esp32/boards/manifest_test.py
new file mode 100644
index 0000000000000..87c5b7be9bf15
--- /dev/null
+++ b/ports/esp32/boards/manifest_test.py
@@ -0,0 +1,10 @@
+# Manifest for testing the build.
+
+# Include standard manifest.
+include("manifest.py")
+
+# Test freezing @micropython.native code.
+freeze("$(MPY_DIR)/tests/micropython", "native_misc.py")
+
+# Test freezing @micropython.viper code.
+freeze("$(MPY_DIR)/tests/micropython", "viper_misc.py")
diff --git a/tools/ci.sh b/tools/ci.sh
index bf60d788a5ef4..0faf1bc711b7f 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -131,7 +131,9 @@ function ci_esp32_build {
     source esp-idf/export.sh
     make ${MAKEOPTS} -C mpy-cross
     make ${MAKEOPTS} -C ports/esp32 submodules
-    make ${MAKEOPTS} -C ports/esp32 USER_C_MODULES=../../../examples/usercmodule/micropython.cmake FROZEN_MANIFEST=$(pwd)/ports/esp32/boards/manifest.py
+    make ${MAKEOPTS} -C ports/esp32 \
+        USER_C_MODULES=../../../examples/usercmodule/micropython.cmake \
+        FROZEN_MANIFEST=$(pwd)/ports/esp32/boards/manifest_test.py
     if [ -d $IDF_PATH/components/esp32c3 ]; then
         make ${MAKEOPTS} -C ports/esp32 BOARD=GENERIC_C3
     fi

From fe9eaf12f391232f195ac052005ac2b852409dd6 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 13 Apr 2022 16:00:22 +1000
Subject: [PATCH 1916/3533] esp32: Add MICROPY_HW_ENABLE_UART_REPL and enable
 on generic S2/S3.

Some S2/S3 modules don't use the native USB interface but instead have an
external USB-UART.  To make the GENERIC_S3/S3 firmware work on these boards
the UART REPL is enabled in addition to the native USB CDC REPL.

Fixes issues #8418 and #8524.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/boards/GENERIC_S2/mpconfigboard.h        | 3 +++
 ports/esp32/boards/GENERIC_S3/mpconfigboard.h        | 3 +++
 ports/esp32/boards/GENERIC_S3_SPIRAM/mpconfigboard.h | 3 +++
 ports/esp32/main.c                                   | 3 ++-
 ports/esp32/mphalport.c                              | 3 ++-
 ports/esp32/uart.h                                   | 5 +++++
 6 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/ports/esp32/boards/GENERIC_S2/mpconfigboard.h b/ports/esp32/boards/GENERIC_S2/mpconfigboard.h
index 01ac2ce58ec2d..c4f86a8fc6223 100644
--- a/ports/esp32/boards/GENERIC_S2/mpconfigboard.h
+++ b/ports/esp32/boards/GENERIC_S2/mpconfigboard.h
@@ -3,3 +3,6 @@
 
 #define MICROPY_PY_BLUETOOTH                (0)
 #define MICROPY_HW_ENABLE_SDCARD            (0)
+
+// Enable UART REPL for modules that have an external USB-UART and don't use native USB.
+#define MICROPY_HW_ENABLE_UART_REPL         (1)
diff --git a/ports/esp32/boards/GENERIC_S3/mpconfigboard.h b/ports/esp32/boards/GENERIC_S3/mpconfigboard.h
index 3540e5a855680..b8f5fb256055f 100644
--- a/ports/esp32/boards/GENERIC_S3/mpconfigboard.h
+++ b/ports/esp32/boards/GENERIC_S3/mpconfigboard.h
@@ -3,5 +3,8 @@
 
 #define MICROPY_PY_MACHINE_DAC              (0)
 
+// Enable UART REPL for modules that have an external USB-UART and don't use native USB.
+#define MICROPY_HW_ENABLE_UART_REPL         (1)
+
 #define MICROPY_HW_I2C0_SCL                 (9)
 #define MICROPY_HW_I2C0_SDA                 (8)
diff --git a/ports/esp32/boards/GENERIC_S3_SPIRAM/mpconfigboard.h b/ports/esp32/boards/GENERIC_S3_SPIRAM/mpconfigboard.h
index beb796dd9eed1..f9126c98d76e3 100644
--- a/ports/esp32/boards/GENERIC_S3_SPIRAM/mpconfigboard.h
+++ b/ports/esp32/boards/GENERIC_S3_SPIRAM/mpconfigboard.h
@@ -4,5 +4,8 @@
 #define MICROPY_PY_BLUETOOTH                (0)
 #define MICROPY_PY_MACHINE_DAC              (0)
 
+// Enable UART REPL for modules that have an external USB-UART and don't use native USB.
+#define MICROPY_HW_ENABLE_UART_REPL         (1)
+
 #define MICROPY_HW_I2C0_SCL                 (9)
 #define MICROPY_HW_I2C0_SDA                 (8)
diff --git a/ports/esp32/main.c b/ports/esp32/main.c
index a1c27c0a26d4b..f833c95018002 100644
--- a/ports/esp32/main.c
+++ b/ports/esp32/main.c
@@ -92,7 +92,8 @@ void mp_task(void *pvParameter) {
     usb_init();
     #elif CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG
     usb_serial_jtag_init();
-    #else
+    #endif
+    #if MICROPY_HW_ENABLE_UART_REPL
     uart_stdout_init();
     #endif
     machine_init();
diff --git a/ports/esp32/mphalport.c b/ports/esp32/mphalport.c
index 41e6e6ec00a46..aab534937e137 100644
--- a/ports/esp32/mphalport.c
+++ b/ports/esp32/mphalport.c
@@ -111,7 +111,8 @@ void mp_hal_stdout_tx_strn(const char *str, size_t len) {
     usb_tx_strn(str, len);
     #elif CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG
     usb_serial_jtag_tx_strn(str, len);
-    #else
+    #endif
+    #if MICROPY_HW_ENABLE_UART_REPL
     uart_stdout_tx_strn(str, len);
     #endif
     if (release_gil) {
diff --git a/ports/esp32/uart.h b/ports/esp32/uart.h
index f32d5cf342162..e3c7482e7b485 100644
--- a/ports/esp32/uart.h
+++ b/ports/esp32/uart.h
@@ -28,6 +28,11 @@
 #ifndef MICROPY_INCLUDED_ESP32_UART_H
 #define MICROPY_INCLUDED_ESP32_UART_H
 
+// Whether to enable the REPL on a UART.
+#ifndef MICROPY_HW_ENABLE_UART_REPL
+#define MICROPY_HW_ENABLE_UART_REPL (!CONFIG_USB_ENABLED && !CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG)
+#endif
+
 #ifndef MICROPY_HW_UART_REPL
 #define MICROPY_HW_UART_REPL (UART_NUM_0)
 #endif

From ae3d5289a5fa893ed9fd9c6d824043d7644179d7 Mon Sep 17 00:00:00 2001
From: Stephane Smith <stephane.smith@titansensor.com>
Date: Tue, 12 Apr 2022 19:44:45 +0000
Subject: [PATCH 1917/3533] esp32/boards: Compile GENERIC_SPIRAM and
 UM_TINYPICO with -Os.

These boards do not build with IDF v4.4 because the section .iram0.text
does not fit in region iram0_0_seg.  Enabling SPIRAM increases the code
size so use -Os instead of -O2 to build these boards.

Fixes issue #8260.
---
 ports/esp32/boards/GENERIC_SPIRAM/mpconfigboard.cmake | 1 +
 ports/esp32/boards/GENERIC_SPIRAM/sdkconfig.board     | 2 ++
 ports/esp32/boards/UM_TINYPICO/sdkconfig.board        | 3 +++
 3 files changed, 6 insertions(+)
 create mode 100644 ports/esp32/boards/GENERIC_SPIRAM/sdkconfig.board

diff --git a/ports/esp32/boards/GENERIC_SPIRAM/mpconfigboard.cmake b/ports/esp32/boards/GENERIC_SPIRAM/mpconfigboard.cmake
index 2e1d799b93b1c..dcffe5f01e7a0 100644
--- a/ports/esp32/boards/GENERIC_SPIRAM/mpconfigboard.cmake
+++ b/ports/esp32/boards/GENERIC_SPIRAM/mpconfigboard.cmake
@@ -2,4 +2,5 @@ set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.base
     boards/sdkconfig.ble
     boards/sdkconfig.spiram
+    boards/GENERIC_SPIRAM/sdkconfig.board
 )
diff --git a/ports/esp32/boards/GENERIC_SPIRAM/sdkconfig.board b/ports/esp32/boards/GENERIC_SPIRAM/sdkconfig.board
new file mode 100644
index 0000000000000..a2859acb5f906
--- /dev/null
+++ b/ports/esp32/boards/GENERIC_SPIRAM/sdkconfig.board
@@ -0,0 +1,2 @@
+# SPIRAM increases the size of the firmware, use -Os to reduce it again to fit in iram
+CONFIG_COMPILER_OPTIMIZATION_SIZE=y
diff --git a/ports/esp32/boards/UM_TINYPICO/sdkconfig.board b/ports/esp32/boards/UM_TINYPICO/sdkconfig.board
index 766419c7f81a3..8ed083e62d1a4 100644
--- a/ports/esp32/boards/UM_TINYPICO/sdkconfig.board
+++ b/ports/esp32/boards/UM_TINYPICO/sdkconfig.board
@@ -3,3 +3,6 @@ CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
 CONFIG_SPIRAM_SPEED_80M=y
 CONFIG_ESP32_REV_MIN_1=y
 CONFIG_LWIP_LOCAL_HOSTNAME="UMTinyPICO"
+
+# SPIRAM increases the size of the firmware, use -Os to reduce it again to fit in iram
+CONFIG_COMPILER_OPTIMIZATION_SIZE=y

From 700535409908687633237e895f3629cb1a419c64 Mon Sep 17 00:00:00 2001
From: Stephane Smith <stephane.smith@titansensor.com>
Date: Wed, 13 Apr 2022 17:25:29 +0000
Subject: [PATCH 1918/3533] esp32/machine_pin: Don't expose pins 33-37 when
 octal SPIRAM is enabled.

For ESP32-S3 configurations, CONFIG_SPIRAM_MODE_OCT requires pins 33-37 for
PSRAM.  So exclude them from the machine_pin_type and machine_pin_irq_type
object tables.
---
 ports/esp32/machine_pin.c | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/ports/esp32/machine_pin.c b/ports/esp32/machine_pin.c
index c22eb5d847096..edfa4d5cae183 100644
--- a/ports/esp32/machine_pin.c
+++ b/ports/esp32/machine_pin.c
@@ -191,11 +191,19 @@ STATIC const machine_pin_obj_t machine_pin_obj[] = {
     {{NULL}, -1}, // 30 FLASH/PSRAM
     {{NULL}, -1}, // 31 FLASH/PSRAM
     {{NULL}, -1}, // 32 FLASH/PSRAM
+    #if CONFIG_SPIRAM_MODE_OCT
+    {{NULL}, -1}, // 33 FLASH/PSRAM
+    {{NULL}, -1}, // 34 FLASH/PSRAM
+    {{NULL}, -1}, // 35 FLASH/PSRAM
+    {{NULL}, -1}, // 36 FLASH/PSRAM
+    {{NULL}, -1}, // 37 FLASH/PSRAM
+    #else
     {{&machine_pin_type}, GPIO_NUM_33},
     {{&machine_pin_type}, GPIO_NUM_34},
     {{&machine_pin_type}, GPIO_NUM_35},
     {{&machine_pin_type}, GPIO_NUM_36},
     {{&machine_pin_type}, GPIO_NUM_37},
+    #endif
     {{&machine_pin_type}, GPIO_NUM_38},
     {{&machine_pin_type}, GPIO_NUM_39}, // MTCLK
     {{&machine_pin_type}, GPIO_NUM_40}, // MTDO
@@ -658,11 +666,19 @@ STATIC const machine_pin_irq_obj_t machine_pin_irq_object[] = {
     {{NULL}, -1}, // 30 FLASH/PSRAM
     {{NULL}, -1}, // 31 FLASH/PSRAM
     {{NULL}, -1}, // 32 FLASH/PSRAM
+    #if CONFIG_SPIRAM_MODE_OCT
+    {{NULL}, -1}, // 33 FLASH/PSRAM
+    {{NULL}, -1}, // 34 FLASH/PSRAM
+    {{NULL}, -1}, // 35 FLASH/PSRAM
+    {{NULL}, -1}, // 36 FLASH/PSRAM
+    {{NULL}, -1}, // 37 FLASH/PSRAM
+    #else
     {{&machine_pin_irq_type}, GPIO_NUM_33},
     {{&machine_pin_irq_type}, GPIO_NUM_34},
     {{&machine_pin_irq_type}, GPIO_NUM_35},
     {{&machine_pin_irq_type}, GPIO_NUM_36},
     {{&machine_pin_irq_type}, GPIO_NUM_37},
+    #endif
     {{&machine_pin_irq_type}, GPIO_NUM_38},
     {{&machine_pin_irq_type}, GPIO_NUM_39},
     {{&machine_pin_irq_type}, GPIO_NUM_40},

From 988827b85a9b09f1164e101ea2520562dd31634e Mon Sep 17 00:00:00 2001
From: Stephane Smith <stephane.smith@titansensor.com>
Date: Wed, 13 Apr 2022 17:34:09 +0000
Subject: [PATCH 1919/3533] esp32/modesp32: Properly define RTC_VALID_EXT_PINS
 on S2/S3 variants.

On ESP32 S2/S3 variants, GPIO0 through GPIO21 are valid RTC pins.  This
commit defines the valid RTC_VALID_EXT_PINS for the S2/S3 variants,
otherwise, it keeps functionality the same.
---
 ports/esp32/modesp32.h | 37 +++++++++++++++++++++++++++++++++++--
 1 file changed, 35 insertions(+), 2 deletions(-)

diff --git a/ports/esp32/modesp32.h b/ports/esp32/modesp32.h
index d76b3a49a2991..a685b7b38fe6f 100644
--- a/ports/esp32/modesp32.h
+++ b/ports/esp32/modesp32.h
@@ -1,7 +1,38 @@
 #ifndef MICROPY_INCLUDED_ESP32_MODESP32_H
 #define MICROPY_INCLUDED_ESP32_MODESP32_H
 
-#define RTC_VALID_EXT_PINS \
+#if CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3
+
+    #define RTC_VALID_EXT_PINS \
+    ( \
+    (1ll << 0) | \
+    (1ll << 1) | \
+    (1ll << 2) | \
+    (1ll << 3) | \
+    (1ll << 4) | \
+    (1ll << 5) | \
+    (1ll << 6) | \
+    (1ll << 7) | \
+    (1ll << 8) | \
+    (1ll << 9) | \
+    (1ll << 10) | \
+    (1ll << 11) | \
+    (1ll << 12) | \
+    (1ll << 13) | \
+    (1ll << 14) | \
+    (1ll << 15) | \
+    (1ll << 16) | \
+    (1ll << 17) | \
+    (1ll << 18) | \
+    (1ll << 19) | \
+    (1ll << 20) | \
+    (1ll << 21)   \
+    )
+    #define RTC_LAST_EXT_PIN 21
+
+#else
+
+    #define RTC_VALID_EXT_PINS \
     ( \
     (1ll << 0) | \
     (1ll << 2) | \
@@ -22,8 +53,10 @@
     (1ll << 38) | \
     (1ll << 39)   \
     )
+    #define RTC_LAST_EXT_PIN 39
+
+#endif
 
-#define RTC_LAST_EXT_PIN 39
 #define RTC_IS_VALID_EXT_PIN(pin_id) ((1ll << (pin_id)) & RTC_VALID_EXT_PINS)
 
 extern int8_t esp32_rmt_bitstream_channel_id;

From 42d0bd2c17fd76860c3dc0ef5c62faa48efeb121 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 7 Apr 2022 22:18:37 +1000
Subject: [PATCH 1920/3533] py/persistentcode: Define enum values for obj types
 instead of letters.

To keep the separate parts of the code that use these values in sync.  And
make it easier to add new object types.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/persistentcode.c | 30 +++++++++++++++---------------
 py/persistentcode.h | 10 ++++++++++
 tools/mpy-tool.py   | 26 +++++++++++++++++---------
 3 files changed, 42 insertions(+), 24 deletions(-)

diff --git a/py/persistentcode.c b/py/persistentcode.c
index f64e383a61690..c9cfc3b5c285c 100644
--- a/py/persistentcode.c
+++ b/py/persistentcode.c
@@ -198,29 +198,29 @@ STATIC qstr load_qstr(mp_reader_t *reader) {
 STATIC mp_obj_t load_obj(mp_reader_t *reader) {
     byte obj_type = read_byte(reader);
     #if MICROPY_EMIT_MACHINE_CODE
-    if (obj_type == 't') {
+    if (obj_type == MP_PERSISTENT_OBJ_FUN_TABLE) {
         return MP_OBJ_FROM_PTR(&mp_fun_table);
     } else
     #endif
-    if (obj_type == 'e') {
+    if (obj_type == MP_PERSISTENT_OBJ_ELLIPSIS) {
         return MP_OBJ_FROM_PTR(&mp_const_ellipsis_obj);
     } else {
         size_t len = read_uint(reader);
-        if (len == 0 && obj_type == 'b') {
+        if (len == 0 && obj_type == MP_PERSISTENT_OBJ_BYTES) {
             read_byte(reader); // skip null terminator
             return mp_const_empty_bytes;
         }
         vstr_t vstr;
         vstr_init_len(&vstr, len);
         read_bytes(reader, (byte *)vstr.buf, len);
-        if (obj_type == 's' || obj_type == 'b') {
+        if (obj_type == MP_PERSISTENT_OBJ_STR || obj_type == MP_PERSISTENT_OBJ_BYTES) {
             read_byte(reader); // skip null terminator
-            return mp_obj_new_str_from_vstr(obj_type == 's' ? &mp_type_str : &mp_type_bytes, &vstr);
-        } else if (obj_type == 'i') {
+            return mp_obj_new_str_from_vstr(obj_type == MP_PERSISTENT_OBJ_STR ? &mp_type_str : &mp_type_bytes, &vstr);
+        } else if (obj_type == MP_PERSISTENT_OBJ_INT) {
             return mp_parse_num_integer(vstr.buf, vstr.len, 10, NULL);
         } else {
-            assert(obj_type == 'f' || obj_type == 'c');
-            return mp_parse_num_decimal(vstr.buf, vstr.len, obj_type == 'c', false, NULL);
+            assert(obj_type == MP_PERSISTENT_OBJ_FLOAT || obj_type == MP_PERSISTENT_OBJ_COMPLEX);
+            return mp_parse_num_decimal(vstr.buf, vstr.len, obj_type == MP_PERSISTENT_OBJ_COMPLEX, false, NULL);
         }
     }
 }
@@ -498,16 +498,16 @@ STATIC void save_qstr(mp_print_t *print, qstr qst) {
 STATIC void save_obj(mp_print_t *print, mp_obj_t o) {
     #if MICROPY_EMIT_MACHINE_CODE
     if (o == MP_OBJ_FROM_PTR(&mp_fun_table)) {
-        byte obj_type = 't';
+        byte obj_type = MP_PERSISTENT_OBJ_FUN_TABLE;
         mp_print_bytes(print, &obj_type, 1);
     } else
     #endif
     if (mp_obj_is_str_or_bytes(o)) {
         byte obj_type;
         if (mp_obj_is_str(o)) {
-            obj_type = 's';
+            obj_type = MP_PERSISTENT_OBJ_STR;
         } else {
-            obj_type = 'b';
+            obj_type = MP_PERSISTENT_OBJ_BYTES;
         }
         size_t len;
         const char *str = mp_obj_str_get_data(o, &len);
@@ -515,21 +515,21 @@ STATIC void save_obj(mp_print_t *print, mp_obj_t o) {
         mp_print_uint(print, len);
         mp_print_bytes(print, (const byte *)str, len + 1); // +1 to store null terminator
     } else if (MP_OBJ_TO_PTR(o) == &mp_const_ellipsis_obj) {
-        byte obj_type = 'e';
+        byte obj_type = MP_PERSISTENT_OBJ_ELLIPSIS;
         mp_print_bytes(print, &obj_type, 1);
     } else {
         // we save numbers using a simplistic text representation
         // TODO could be improved
         byte obj_type;
         if (mp_obj_is_int(o)) {
-            obj_type = 'i';
+            obj_type = MP_PERSISTENT_OBJ_INT;
         #if MICROPY_PY_BUILTINS_COMPLEX
         } else if (mp_obj_is_type(o, &mp_type_complex)) {
-            obj_type = 'c';
+            obj_type = MP_PERSISTENT_OBJ_COMPLEX;
         #endif
         } else {
             assert(mp_obj_is_float(o));
-            obj_type = 'f';
+            obj_type = MP_PERSISTENT_OBJ_FLOAT;
         }
         vstr_t vstr;
         mp_print_t pr;
diff --git a/py/persistentcode.h b/py/persistentcode.h
index 1991ba26fff43..7426029addc2e 100644
--- a/py/persistentcode.h
+++ b/py/persistentcode.h
@@ -102,6 +102,16 @@ enum {
     MP_NATIVE_ARCH_XTENSAWIN,
 };
 
+enum {
+    MP_PERSISTENT_OBJ_FUN_TABLE = 0,
+    MP_PERSISTENT_OBJ_ELLIPSIS,
+    MP_PERSISTENT_OBJ_STR,
+    MP_PERSISTENT_OBJ_BYTES,
+    MP_PERSISTENT_OBJ_INT,
+    MP_PERSISTENT_OBJ_FLOAT,
+    MP_PERSISTENT_OBJ_COMPLEX,
+};
+
 mp_compiled_module_t mp_raw_code_load(mp_reader_t *reader, mp_module_context_t *ctx);
 mp_compiled_module_t mp_raw_code_load_mem(const byte *buf, size_t len, mp_module_context_t *ctx);
 mp_compiled_module_t mp_raw_code_load_file(const char *filename, mp_module_context_t *ctx);
diff --git a/tools/mpy-tool.py b/tools/mpy-tool.py
index 84c09a0c688d2..fc0b7c09cac1e 100755
--- a/tools/mpy-tool.py
+++ b/tools/mpy-tool.py
@@ -121,6 +121,14 @@ def __init__(self, str):
 MP_NATIVE_ARCH_XTENSA = 9
 MP_NATIVE_ARCH_XTENSAWIN = 10
 
+MP_PERSISTENT_OBJ_FUN_TABLE = 0
+MP_PERSISTENT_OBJ_ELLIPSIS = 1
+MP_PERSISTENT_OBJ_STR = 2
+MP_PERSISTENT_OBJ_BYTES = 3
+MP_PERSISTENT_OBJ_INT = 4
+MP_PERSISTENT_OBJ_FLOAT = 5
+MP_PERSISTENT_OBJ_COMPLEX = 6
+
 MP_SCOPE_FLAG_VIPERRELOC = 0x10
 MP_SCOPE_FLAG_VIPERRODATA = 0x20
 MP_SCOPE_FLAG_VIPERBSS = 0x40
@@ -1104,26 +1112,26 @@ def read_qstr(reader, segments):
 
 
 def read_obj(reader, segments):
-    obj_type = reader.read_bytes(1)
-    if obj_type == b"t":
+    obj_type = reader.read_byte()
+    if obj_type == MP_PERSISTENT_OBJ_FUN_TABLE:
         return MPFunTable()
-    elif obj_type == b"e":
+    elif obj_type == MP_PERSISTENT_OBJ_ELLIPSIS:
         return Ellipsis
     else:
         ln = reader.read_uint()
         start_pos = reader.tell()
         buf = reader.read_bytes(ln)
-        if obj_type in (b"s", b"b"):
+        if obj_type in (MP_PERSISTENT_OBJ_STR, MP_PERSISTENT_OBJ_BYTES):
             reader.read_byte()  # read and discard null terminator
-        if obj_type == b"s":
+        if obj_type == MP_PERSISTENT_OBJ_STR:
             obj = str_cons(buf, "utf8")
-        elif obj_type == b"b":
+        elif obj_type == MP_PERSISTENT_OBJ_BYTES:
             obj = buf
-        elif obj_type == b"i":
+        elif obj_type == MP_PERSISTENT_OBJ_INT:
             obj = int(str_cons(buf, "ascii"), 10)
-        elif obj_type == b"f":
+        elif obj_type == MP_PERSISTENT_OBJ_FLOAT:
             obj = float(str_cons(buf, "ascii"))
-        elif obj_type == b"c":
+        elif obj_type == MP_PERSISTENT_OBJ_COMPLEX:
             obj = complex(str_cons(buf, "ascii"))
         else:
             raise MPYReadError(reader.filename, "corrupt .mpy file")

From e52f14d05772b670847c0692a635a5ec223c5e57 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 31 Mar 2022 14:26:07 +1100
Subject: [PATCH 1921/3533] py/parse: Factor obj extract code to
 mp_parse_node_extract_const_object.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/compile.c |  7 +------
 py/parse.c   | 12 ++++--------
 py/parse.h   | 11 +++++++++++
 3 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/py/compile.c b/py/compile.c
index e4ead7f1ac2ac..6bb601b9252a6 100644
--- a/py/compile.c
+++ b/py/compile.c
@@ -2763,12 +2763,7 @@ STATIC void compile_atom_expr_await(compiler_t *comp, mp_parse_node_struct_t *pn
 #endif
 
 STATIC mp_obj_t get_const_object(mp_parse_node_struct_t *pns) {
-    #if MICROPY_OBJ_REPR == MICROPY_OBJ_REPR_D
-    // nodes are 32-bit pointers, but need to extract 64-bit object
-    return (uint64_t)pns->nodes[0] | ((uint64_t)pns->nodes[1] << 32);
-    #else
-    return (mp_obj_t)pns->nodes[0];
-    #endif
+    return mp_parse_node_extract_const_object(pns);
 }
 
 STATIC void compile_const_object(compiler_t *comp, mp_parse_node_struct_t *pns) {
diff --git a/py/parse.c b/py/parse.c
index 233cba11b46ca..f0e0a165c3458 100644
--- a/py/parse.c
+++ b/py/parse.c
@@ -333,12 +333,7 @@ bool mp_parse_node_get_int_maybe(mp_parse_node_t pn, mp_obj_t *o) {
         return true;
     } else if (MP_PARSE_NODE_IS_STRUCT_KIND(pn, RULE_const_object)) {
         mp_parse_node_struct_t *pns = (mp_parse_node_struct_t *)pn;
-        #if MICROPY_OBJ_REPR == MICROPY_OBJ_REPR_D
-        // nodes are 32-bit pointers, but need to extract 64-bit object
-        *o = (uint64_t)pns->nodes[0] | ((uint64_t)pns->nodes[1] << 32);
-        #else
-        *o = (mp_obj_t)pns->nodes[0];
-        #endif
+        *o = mp_parse_node_extract_const_object(pns);
         return mp_obj_is_int(*o);
     } else {
         return false;
@@ -397,10 +392,11 @@ void mp_parse_node_print(const mp_print_t *print, mp_parse_node_t pn, size_t ind
         // node must be a mp_parse_node_struct_t
         mp_parse_node_struct_t *pns = (mp_parse_node_struct_t *)pn;
         if (MP_PARSE_NODE_STRUCT_KIND(pns) == RULE_const_object) {
+            mp_obj_t obj = mp_parse_node_extract_const_object(pns);
             #if MICROPY_OBJ_REPR == MICROPY_OBJ_REPR_D
-            mp_printf(print, "literal const(%016llx)\n", (uint64_t)pns->nodes[0] | ((uint64_t)pns->nodes[1] << 32));
+            mp_printf(print, "literal const(%016llx)\n", obj);
             #else
-            mp_printf(print, "literal const(%p)\n", (mp_obj_t)pns->nodes[0]);
+            mp_printf(print, "literal const(%p)\n", obj);
             #endif
         } else {
             size_t n = MP_PARSE_NODE_STRUCT_NUM_NODES(pns);
diff --git a/py/parse.h b/py/parse.h
index 9c327c28b6c77..5531e35cbb36c 100644
--- a/py/parse.h
+++ b/py/parse.h
@@ -77,9 +77,20 @@ typedef struct _mp_parse_node_struct_t {
 static inline mp_parse_node_t mp_parse_node_new_small_int(mp_int_t val) {
     return (mp_parse_node_t)(MP_PARSE_NODE_SMALL_INT | ((mp_uint_t)val << 1));
 }
+
 static inline mp_parse_node_t mp_parse_node_new_leaf(size_t kind, mp_int_t arg) {
     return (mp_parse_node_t)(kind | ((mp_uint_t)arg << 4));
 }
+
+static inline mp_obj_t mp_parse_node_extract_const_object(mp_parse_node_struct_t *pns) {
+    #if MICROPY_OBJ_REPR == MICROPY_OBJ_REPR_D
+    // nodes are 32-bit pointers, but need to extract 64-bit object
+    return (uint64_t)pns->nodes[0] | ((uint64_t)pns->nodes[1] << 32);
+    #else
+    return (mp_obj_t)pns->nodes[0];
+    #endif
+}
+
 bool mp_parse_node_is_const_false(mp_parse_node_t pn);
 bool mp_parse_node_is_const_true(mp_parse_node_t pn);
 bool mp_parse_node_get_int_maybe(mp_parse_node_t pn, mp_obj_t *o);

From 24bc1f61f9c73e922cda2cb429d9ace0a85cff94 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 31 Mar 2022 14:26:36 +1100
Subject: [PATCH 1922/3533] py/parse: Print const object value in
 mp_parse_node_print.

To give more information when printing the parse tree.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/parse.c                         | 6 ++++--
 tests/cmdline/cmd_parsetree.py.exp | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/py/parse.c b/py/parse.c
index f0e0a165c3458..8f0a25cf2c731 100644
--- a/py/parse.c
+++ b/py/parse.c
@@ -394,10 +394,12 @@ void mp_parse_node_print(const mp_print_t *print, mp_parse_node_t pn, size_t ind
         if (MP_PARSE_NODE_STRUCT_KIND(pns) == RULE_const_object) {
             mp_obj_t obj = mp_parse_node_extract_const_object(pns);
             #if MICROPY_OBJ_REPR == MICROPY_OBJ_REPR_D
-            mp_printf(print, "literal const(%016llx)\n", obj);
+            mp_printf(print, "literal const(%016llx)=", obj);
             #else
-            mp_printf(print, "literal const(%p)\n", obj);
+            mp_printf(print, "literal const(%p)=", obj);
             #endif
+            mp_obj_print_helper(print, obj, PRINT_REPR);
+            mp_printf(print, "\n");
         } else {
             size_t n = MP_PARSE_NODE_STRUCT_NUM_NODES(pns);
             #if MICROPY_DEBUG_PARSE_RULE_NAME
diff --git a/tests/cmdline/cmd_parsetree.py.exp b/tests/cmdline/cmd_parsetree.py.exp
index 6ee96b7caf293..7f9aa047e4d56 100644
--- a/tests/cmdline/cmd_parsetree.py.exp
+++ b/tests/cmdline/cmd_parsetree.py.exp
@@ -31,7 +31,7 @@
 [  13]   \(rule\|expr_stmt\)(5) (n=2)
            id(h)
 [  13]     \(rule\|atom_expr_normal\)(44) (n=2)
-[  13]       literal const(\.\+)
+[  13]       literal const(\.\+)="fstring: '{}'"
 [  13]       \(rule\|atom_expr_trailers\)(142) (n=2)
 [  13]         \(rule\|trailer_period\)(50) (n=1)
                  id(format)

From 35c0cff92bea230f8e16a8a7cdd50ea5f6a9df03 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 31 Mar 2022 14:27:47 +1100
Subject: [PATCH 1923/3533] py/parse: Add MICROPY_COMP_CONST_TUPLE option to
 build const tuples.

This commit adds support to the parser so that tuples which contain only
constant elements (bool, int, str, bytes, etc) are immediately converted to
a tuple object.  This makes it more efficient to use tuples containing
constant data because they no longer need to be created at runtime by the
bytecode (or native code).

Furthermore, with this improvement constant tuples that are part of frozen
code are now able to be stored fully in ROM (this will be implemented in
later commits).

Code size is increased by about 400 bytes on Cortex-M4 platforms.

See related issue #722.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/mpconfig.h                   |   6 +
 py/parse.c                      | 147 ++++++++
 tests/cmdline/cmd_showbc.py.exp | 644 ++++++++++++++++----------------
 3 files changed, 474 insertions(+), 323 deletions(-)

diff --git a/py/mpconfig.h b/py/mpconfig.h
index 22dfbb867547f..c308c31bda562 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -441,6 +441,12 @@
 #define MICROPY_COMP_CONST_FOLDING (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_CORE_FEATURES)
 #endif
 
+// Whether to compile constant tuples immediately to their respective objects; eg (1, True)
+// Otherwise the tuple will be built at runtime
+#ifndef MICROPY_COMP_CONST_TUPLE
+#define MICROPY_COMP_CONST_TUPLE (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_CORE_FEATURES)
+#endif
+
 // Whether to enable optimisations for constant literals, eg OrderedDict
 #ifndef MICROPY_COMP_CONST_LITERAL
 #define MICROPY_COMP_CONST_LITERAL (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_CORE_FEATURES)
diff --git a/py/parse.c b/py/parse.c
index 8f0a25cf2c731..b8a40f4bb5062 100644
--- a/py/parse.c
+++ b/py/parse.c
@@ -291,6 +291,16 @@ STATIC void *parser_alloc(parser_t *parser, size_t num_bytes) {
     return ret;
 }
 
+#if MICROPY_COMP_CONST_TUPLE
+STATIC void parser_free_parse_node_struct(parser_t *parser, mp_parse_node_struct_t *pns) {
+    mp_parse_chunk_t *chunk = parser->cur_chunk;
+    if (chunk->data <= (byte *)pns && (byte *)pns < chunk->data + chunk->union_.used) {
+        size_t num_bytes = sizeof(mp_parse_node_struct_t) + sizeof(mp_parse_node_t) * MP_PARSE_NODE_STRUCT_NUM_NODES(pns);
+        chunk->union_.used -= num_bytes;
+    }
+}
+#endif
+
 STATIC void push_rule(parser_t *parser, size_t src_line, uint8_t rule_id, size_t arg_i) {
     if (parser->rule_stack_top >= parser->rule_stack_alloc) {
         rule_stack_t *rs = m_renew(rule_stack_t, parser->rule_stack, parser->rule_stack_alloc, parser->rule_stack_alloc + MICROPY_ALLOC_PARSE_RULE_INC);
@@ -317,6 +327,13 @@ STATIC uint8_t pop_rule(parser_t *parser, size_t *arg_i, size_t *src_line) {
     return rule_id;
 }
 
+#if MICROPY_COMP_CONST_TUPLE
+STATIC uint8_t peek_rule(parser_t *parser, size_t n) {
+    assert(parser->rule_stack_top > n);
+    return parser->rule_stack[parser->rule_stack_top - 1 - n].rule_id;
+}
+#endif
+
 bool mp_parse_node_is_const_false(mp_parse_node_t pn) {
     return MP_PARSE_NODE_IS_TOKEN_KIND(pn, MP_TOKEN_KW_FALSE)
            || (MP_PARSE_NODE_IS_SMALL_INT(pn) && MP_PARSE_NODE_LEAF_SMALL_INT(pn) == 0);
@@ -340,6 +357,76 @@ bool mp_parse_node_get_int_maybe(mp_parse_node_t pn, mp_obj_t *o) {
     }
 }
 
+#if MICROPY_COMP_CONST_TUPLE
+STATIC bool mp_parse_node_is_const(mp_parse_node_t pn) {
+    if (MP_PARSE_NODE_IS_SMALL_INT(pn)) {
+        // Small integer.
+        return true;
+    } else if (MP_PARSE_NODE_IS_LEAF(pn)) {
+        // Possible str, or constant literal.
+        uintptr_t kind = MP_PARSE_NODE_LEAF_KIND(pn);
+        if (kind == MP_PARSE_NODE_STRING) {
+            return true;
+        } else if (kind == MP_PARSE_NODE_TOKEN) {
+            uintptr_t arg = MP_PARSE_NODE_LEAF_ARG(pn);
+            return arg == MP_TOKEN_KW_NONE
+                   || arg == MP_TOKEN_KW_FALSE
+                   || arg == MP_TOKEN_KW_TRUE
+                   || arg == MP_TOKEN_ELLIPSIS;
+        }
+    } else if (MP_PARSE_NODE_IS_STRUCT_KIND(pn, RULE_const_object)) {
+        // Constant object.
+        return true;
+    } else if (MP_PARSE_NODE_IS_STRUCT_KIND(pn, RULE_atom_paren)) {
+        // Possible empty tuple.
+        mp_parse_node_struct_t *pns = (mp_parse_node_struct_t *)pn;
+        return MP_PARSE_NODE_IS_NULL(pns->nodes[0]);
+    }
+    return false;
+}
+
+STATIC mp_obj_t mp_parse_node_convert_to_obj(mp_parse_node_t pn) {
+    assert(mp_parse_node_is_const(pn));
+    if (MP_PARSE_NODE_IS_SMALL_INT(pn)) {
+        mp_int_t arg = MP_PARSE_NODE_LEAF_SMALL_INT(pn);
+        #if MICROPY_DYNAMIC_COMPILER
+        mp_uint_t sign_mask = -((mp_uint_t)1 << (mp_dynamic_compiler.small_int_bits - 1));
+        if (!((arg & sign_mask) == 0 || (arg & sign_mask) == sign_mask)) {
+            // Integer doesn't fit in a small-int, so create a multi-precision int object.
+            return mp_obj_new_int_from_ll(arg);
+        }
+        #endif
+        return MP_OBJ_NEW_SMALL_INT(arg);
+    } else if (MP_PARSE_NODE_IS_LEAF(pn)) {
+        uintptr_t kind = MP_PARSE_NODE_LEAF_KIND(pn);
+        uintptr_t arg = MP_PARSE_NODE_LEAF_ARG(pn);
+        if (kind == MP_PARSE_NODE_STRING) {
+            return MP_OBJ_NEW_QSTR(arg);
+        } else {
+            assert(MP_PARSE_NODE_LEAF_KIND(pn) == MP_PARSE_NODE_TOKEN);
+            switch (arg) {
+                case MP_TOKEN_KW_NONE:
+                    return mp_const_none;
+                case MP_TOKEN_KW_FALSE:
+                    return mp_const_false;
+                case MP_TOKEN_KW_TRUE:
+                    return mp_const_true;
+                default:
+                    assert(arg == MP_TOKEN_ELLIPSIS);
+                    return MP_OBJ_FROM_PTR(&mp_const_ellipsis_obj);
+            }
+        }
+    } else if (MP_PARSE_NODE_IS_STRUCT_KIND(pn, RULE_const_object)) {
+        mp_parse_node_struct_t *pns = (mp_parse_node_struct_t *)pn;
+        return mp_parse_node_extract_const_object(pns);
+    } else {
+        assert(MP_PARSE_NODE_IS_STRUCT_KIND(pn, RULE_atom_paren));
+        assert(MP_PARSE_NODE_IS_NULL(((mp_parse_node_struct_t *)pn)->nodes[0]));
+        return mp_const_empty_tuple;
+    }
+}
+#endif
+
 size_t mp_parse_node_extract_list(mp_parse_node_t *pn, size_t pn_kind, mp_parse_node_t **nodes) {
     if (MP_PARSE_NODE_IS_NULL(*pn)) {
         *nodes = NULL;
@@ -791,6 +878,59 @@ STATIC bool fold_constants(parser_t *parser, uint8_t rule_id, size_t num_args) {
 }
 #endif
 
+#if MICROPY_COMP_CONST_TUPLE
+STATIC bool build_tuple_from_stack(parser_t *parser, size_t src_line, size_t num_args) {
+    for (size_t i = num_args; i > 0;) {
+        mp_parse_node_t pn = peek_result(parser, --i);
+        if (!mp_parse_node_is_const(pn)) {
+            return false;
+        }
+    }
+    mp_obj_tuple_t *tuple = MP_OBJ_TO_PTR(mp_obj_new_tuple(num_args, NULL));
+    for (size_t i = num_args; i > 0;) {
+        mp_parse_node_t pn = pop_result(parser);
+        tuple->items[--i] = mp_parse_node_convert_to_obj(pn);
+        if (MP_PARSE_NODE_IS_STRUCT(pn)) {
+            parser_free_parse_node_struct(parser, (mp_parse_node_struct_t *)pn);
+        }
+    }
+    push_result_node(parser, make_node_const_object(parser, src_line, MP_OBJ_FROM_PTR(tuple)));
+    return true;
+}
+
+STATIC bool build_tuple(parser_t *parser, size_t src_line, uint8_t rule_id, size_t num_args) {
+    if (rule_id == RULE_testlist_comp) {
+        if (peek_rule(parser, 0) == RULE_atom_paren) {
+            // Tuple of the form "(a,)".
+            return build_tuple_from_stack(parser, src_line, num_args);
+        }
+    }
+    if (rule_id == RULE_testlist_comp_3c) {
+        assert(peek_rule(parser, 0) == RULE_testlist_comp_3b);
+        assert(peek_rule(parser, 1) == RULE_testlist_comp);
+        if (peek_rule(parser, 2) == RULE_atom_paren) {
+            // Tuple of the form "(a, b)".
+            if (build_tuple_from_stack(parser, src_line, num_args)) {
+                parser->rule_stack_top -= 2; // discard 2 rules
+                return true;
+            }
+        }
+    }
+    if (rule_id == RULE_testlist_star_expr
+        || rule_id == RULE_testlist
+        || rule_id == RULE_subscriptlist) {
+        // Tuple of the form:
+        //  - x = a, b
+        //  - return a, b
+        //  - for x in a, b: pass
+        //  - x[a, b]
+        return build_tuple_from_stack(parser, src_line, num_args);
+    }
+
+    return false;
+}
+#endif
+
 STATIC void push_result_rule(parser_t *parser, size_t src_line, uint8_t rule_id, size_t num_args) {
     // Simplify and optimise certain rules, to reduce memory usage and simplify the compiler.
     if (rule_id == RULE_atom_paren) {
@@ -847,6 +987,13 @@ STATIC void push_result_rule(parser_t *parser, size_t src_line, uint8_t rule_id,
     }
     #endif
 
+    #if MICROPY_COMP_CONST_TUPLE
+    if (build_tuple(parser, src_line, rule_id, num_args)) {
+        // we built a tuple from this rule so return straightaway
+        return;
+    }
+    #endif
+
     mp_parse_node_struct_t *pn = parser_alloc(parser, sizeof(mp_parse_node_struct_t) + sizeof(mp_parse_node_t) * num_args);
     pn->source_line = src_line;
     pn->kind_num_nodes = (rule_id & 0xff) | (num_args << 8);
diff --git a/tests/cmdline/cmd_showbc.py.exp b/tests/cmdline/cmd_showbc.py.exp
index 663bacda0159d..f3ca2eb634b95 100644
--- a/tests/cmdline/cmd_showbc.py.exp
+++ b/tests/cmdline/cmd_showbc.py.exp
@@ -47,9 +47,9 @@ arg names:
 42 IMPORT_STAR
 43 LOAD_CONST_NONE
 44 RETURN_VALUE
-File cmdline/cmd_showbc.py, code block 'f' (descriptor: \.\+, bytecode @\.\+ 45\[68\] bytes)
-Raw bytecode (code_info_size=8\[46\], bytecode_size=372):
- a8 12 9\[bf\] 03 02 60 60 26 22 24 64 22 26 25 25 24
+File cmdline/cmd_showbc.py, code block 'f' (descriptor: \.\+, bytecode @\.\+ 45\[46\] bytes)
+Raw bytecode (code_info_size=8\[46\], bytecode_size=370):
+ a8 12 9\[bf\] 03 02 60 60 26 22 24 64 22 24 25 25 24
  26 23 63 22 22 25 23 23 2f 6c 25 65 25 25 69 68
  26 65 27 6a 62 20 23 62 2a 29 69 24 25 28 67 26
 ########
@@ -68,77 +68,77 @@ arg names:
   bc=12 line=10
   bc=16 line=13
   bc=18 line=14
-  bc=24 line=15
-  bc=29 line=16
-  bc=34 line=17
-  bc=38 line=18
-  bc=44 line=19
-  bc=47 line=20
-  bc=50 line=23
-  bc=52 line=24
-  bc=54 line=25
-  bc=59 line=26
-  bc=62 line=27
-  bc=65 line=28
-  bc=80 line=29
-  bc=92 line=32
-  bc=97 line=33
-  bc=102 line=36
-  bc=107 line=37
-  bc=112 line=38
-  bc=121 line=41
-  bc=129 line=44
-  bc=135 line=45
-  bc=140 line=48
-  bc=147 line=49
-  bc=157 line=52
-  bc=159 line=55
-  bc=159 line=56
-  bc=162 line=57
-  bc=164 line=60
-  bc=174 line=61
-  bc=183 line=62
-  bc=192 line=65
-  bc=196 line=66
-  bc=201 line=67
-  bc=209 line=68
-  bc=216 line=71
-  bc=222 line=72
-  bc=229 line=73
-  bc=239 line=74
-  bc=247 line=77
-  bc=250 line=78
-  bc=255 line=80
-  bc=258 line=81
-  bc=260 line=82
-  bc=266 line=83
-  bc=268 line=84
-  bc=274 line=85
-  bc=279 line=88
-  bc=285 line=89
-  bc=289 line=92
-  bc=293 line=93
-  bc=295 line=94
+  bc=22 line=15
+  bc=27 line=16
+  bc=32 line=17
+  bc=36 line=18
+  bc=42 line=19
+  bc=45 line=20
+  bc=48 line=23
+  bc=50 line=24
+  bc=52 line=25
+  bc=57 line=26
+  bc=60 line=27
+  bc=63 line=28
+  bc=78 line=29
+  bc=90 line=32
+  bc=95 line=33
+  bc=100 line=36
+  bc=105 line=37
+  bc=110 line=38
+  bc=119 line=41
+  bc=127 line=44
+  bc=133 line=45
+  bc=138 line=48
+  bc=145 line=49
+  bc=155 line=52
+  bc=157 line=55
+  bc=157 line=56
+  bc=160 line=57
+  bc=162 line=60
+  bc=172 line=61
+  bc=181 line=62
+  bc=190 line=65
+  bc=194 line=66
+  bc=199 line=67
+  bc=207 line=68
+  bc=214 line=71
+  bc=220 line=72
+  bc=227 line=73
+  bc=237 line=74
+  bc=245 line=77
+  bc=248 line=78
+  bc=253 line=80
+  bc=256 line=81
+  bc=258 line=82
+  bc=264 line=83
+  bc=266 line=84
+  bc=272 line=85
+  bc=277 line=88
+  bc=283 line=89
+  bc=287 line=92
+  bc=291 line=93
+  bc=293 line=94
 ########
-  bc=303 line=96
-  bc=310 line=98
-  bc=313 line=99
-  bc=315 line=100
-  bc=317 line=101
+  bc=301 line=96
+  bc=308 line=98
+  bc=311 line=99
+  bc=313 line=100
+  bc=315 line=101
 ########
-  bc=323 line=103
-  bc=329 line=106
-  bc=333 line=107
-  bc=339 line=110
-  bc=342 line=111
-  bc=348 line=114
-  bc=348 line=117
-  bc=353 line=118
-  bc=365 line=121
-  bc=365 line=122
-  bc=366 line=123
-  bc=368 line=126
-  bc=370 line=127
+  bc=321 line=103
+  bc=327 line=106
+  bc=331 line=107
+  bc=337 line=110
+  bc=340 line=111
+  bc=346 line=114
+  bc=346 line=117
+  bc=351 line=118
+  bc=363 line=121
+  bc=363 line=122
+  bc=364 line=123
+  bc=366 line=126
+  bc=368 line=127
 00 LOAD_CONST_NONE
 01 LOAD_CONST_FALSE
 02 BINARY_OP 27 __add__
@@ -153,258 +153,256 @@ arg names:
 15 STORE_FAST 0
 16 LOAD_CONST_SMALL_INT 1
 17 STORE_FAST 0
-18 LOAD_CONST_SMALL_INT 1
-19 LOAD_CONST_SMALL_INT 2
-20 BUILD_TUPLE 2
-22 STORE_DEREF 14
-24 LOAD_CONST_SMALL_INT 1
-25 LOAD_CONST_SMALL_INT 2
-26 BUILD_LIST 2
-28 STORE_FAST 1
-29 LOAD_CONST_SMALL_INT 1
-30 LOAD_CONST_SMALL_INT 2
-31 BUILD_SET 2
-33 STORE_FAST 2
-34 BUILD_MAP 0
-36 STORE_DEREF 15
-38 BUILD_MAP 1
-40 LOAD_CONST_SMALL_INT 2
-41 LOAD_CONST_SMALL_INT 1
-42 STORE_MAP
-43 STORE_FAST 3
-44 LOAD_CONST_STRING 'a'
-46 STORE_FAST 4
-47 LOAD_CONST_OBJ \.\+=b'a'
-49 STORE_FAST 5
-50 LOAD_CONST_SMALL_INT 1
-51 STORE_FAST 6
-52 LOAD_CONST_SMALL_INT 2
-53 STORE_FAST 7
-54 LOAD_FAST 0
-55 LOAD_DEREF 14
-57 BINARY_OP 27 __add__
-58 STORE_FAST 8
-59 LOAD_FAST 0
-60 UNARY_OP 1 __neg__
-61 STORE_FAST 9
-62 LOAD_FAST 0
-63 UNARY_OP 3 
-64 STORE_FAST 10
-65 LOAD_FAST 0
-66 LOAD_DEREF 14
-68 DUP_TOP
-69 ROT_THREE
-70 BINARY_OP 2 __eq__
-71 JUMP_IF_FALSE_OR_POP 77
-73 LOAD_FAST 1
-74 BINARY_OP 2 __eq__
-75 JUMP 79
-77 ROT_TWO
-78 POP_TOP
-79 STORE_FAST 10
-80 LOAD_FAST 0
-81 LOAD_DEREF 14
-83 BINARY_OP 2 __eq__
-84 JUMP_IF_FALSE_OR_POP 90
-86 LOAD_DEREF 14
-88 LOAD_FAST 1
-89 BINARY_OP 2 __eq__
-90 UNARY_OP 3 
-91 STORE_FAST 10
-92 LOAD_DEREF 14
-94 LOAD_ATTR c
-96 STORE_FAST 11
-97 LOAD_FAST 11
-98 LOAD_DEREF 14
-100 STORE_ATTR c
-102 LOAD_DEREF 14
-104 LOAD_CONST_SMALL_INT 0
-105 LOAD_SUBSCR
-106 STORE_FAST 12
-107 LOAD_FAST 12
-108 LOAD_DEREF 14
-110 LOAD_CONST_SMALL_INT 0
-111 STORE_SUBSCR
-112 LOAD_DEREF 14
-114 LOAD_CONST_SMALL_INT 0
-115 DUP_TOP_TWO
-116 LOAD_SUBSCR
-117 LOAD_FAST 12
-118 BINARY_OP 14 __iadd__
-119 ROT_THREE
-120 STORE_SUBSCR
-121 LOAD_DEREF 14
-123 LOAD_CONST_NONE
-124 LOAD_CONST_NONE
-125 BUILD_SLICE 2
-127 LOAD_SUBSCR
-128 STORE_FAST 0
-129 LOAD_FAST 1
-130 UNPACK_SEQUENCE 2
-132 STORE_FAST 0
-133 STORE_DEREF 14
-135 LOAD_FAST 0
-136 UNPACK_EX 1
-138 STORE_FAST 0
-139 STORE_FAST 0
-140 LOAD_DEREF 14
-142 LOAD_FAST 0
-143 ROT_TWO
-144 STORE_FAST 0
-145 STORE_DEREF 14
-147 LOAD_FAST 1
-148 LOAD_DEREF 14
-150 LOAD_FAST 0
-151 ROT_THREE
-152 ROT_TWO
-153 STORE_FAST 0
-154 STORE_DEREF 14
-156 STORE_FAST 1
-157 DELETE_FAST 0
-159 LOAD_FAST 0
-160 STORE_GLOBAL gl
-162 DELETE_GLOBAL gl
-164 LOAD_FAST 14
-165 LOAD_FAST 15
-166 MAKE_CLOSURE \.\+ 2
-169 LOAD_FAST 2
-170 GET_ITER
-171 CALL_FUNCTION n=1 nkw=0
-173 STORE_FAST 0
-174 LOAD_FAST 14
-175 LOAD_FAST 15
-176 MAKE_CLOSURE \.\+ 2
-179 LOAD_FAST 2
-180 CALL_FUNCTION n=1 nkw=0
-182 STORE_FAST 0
-183 LOAD_FAST 14
-184 LOAD_FAST 15
-185 MAKE_CLOSURE \.\+ 2
-188 LOAD_FAST 2
-189 CALL_FUNCTION n=1 nkw=0
-191 STORE_FAST 0
-192 LOAD_FAST 0
-193 CALL_FUNCTION n=0 nkw=0
-195 POP_TOP
-196 LOAD_FAST 0
-197 LOAD_CONST_SMALL_INT 1
-198 CALL_FUNCTION n=1 nkw=0
-200 POP_TOP
-201 LOAD_FAST 0
-202 LOAD_CONST_STRING 'b'
-204 LOAD_CONST_SMALL_INT 1
-205 CALL_FUNCTION n=0 nkw=1
-208 POP_TOP
-209 LOAD_FAST 0
-210 LOAD_DEREF 14
-212 LOAD_CONST_SMALL_INT 1
-213 CALL_FUNCTION_VAR_KW n=1 nkw=0
-215 POP_TOP
-216 LOAD_FAST 0
-217 LOAD_METHOD b
-219 CALL_METHOD n=0 nkw=0
-221 POP_TOP
-222 LOAD_FAST 0
-223 LOAD_METHOD b
-225 LOAD_CONST_SMALL_INT 1
-226 CALL_METHOD n=1 nkw=0
-228 POP_TOP
-229 LOAD_FAST 0
-230 LOAD_METHOD b
-232 LOAD_CONST_STRING 'c'
-234 LOAD_CONST_SMALL_INT 1
-235 CALL_METHOD n=0 nkw=1
-238 POP_TOP
-239 LOAD_FAST 0
-240 LOAD_METHOD b
-242 LOAD_FAST 1
-243 LOAD_CONST_SMALL_INT 1
-244 CALL_METHOD_VAR_KW n=1 nkw=0
-246 POP_TOP
-247 LOAD_FAST 0
-248 POP_JUMP_IF_FALSE 255
-250 LOAD_DEREF 16
-252 POP_TOP
-253 JUMP 258
-255 LOAD_GLOBAL y
-257 POP_TOP
-258 JUMP 263
-260 LOAD_DEREF 14
-262 POP_TOP
-263 LOAD_FAST 0
-264 POP_JUMP_IF_TRUE 260
-266 JUMP 271
-268 LOAD_DEREF 14
-270 POP_TOP
-271 LOAD_FAST 0
-272 POP_JUMP_IF_FALSE 268
-274 LOAD_FAST 0
-275 JUMP_IF_TRUE_OR_POP 278
-277 LOAD_FAST 0
-278 STORE_FAST 0
-279 LOAD_DEREF 14
-281 GET_ITER_STACK
-282 FOR_ITER 289
-284 STORE_FAST 0
-285 LOAD_FAST 1
-286 POP_TOP
-287 JUMP 282
-289 SETUP_FINALLY 310
-291 SETUP_EXCEPT 302
-293 JUMP 297
-295 JUMP 300
-297 LOAD_FAST 0
-298 POP_JUMP_IF_TRUE 295
-300 POP_EXCEPT_JUMP 309
-302 POP_TOP
-303 LOAD_DEREF 14
-305 POP_TOP
-306 POP_EXCEPT_JUMP 309
-308 END_FINALLY
-309 LOAD_CONST_NONE
-310 LOAD_FAST 1
-311 POP_TOP
-312 END_FINALLY
-313 JUMP 326
-315 SETUP_EXCEPT 322
-317 UNWIND_JUMP 329 1
-320 POP_EXCEPT_JUMP 326
-322 POP_TOP
-323 POP_EXCEPT_JUMP 326
-325 END_FINALLY
-326 LOAD_FAST 0
-327 POP_JUMP_IF_TRUE 315
-329 LOAD_FAST 0
-330 SETUP_WITH 337
-332 POP_TOP
-333 LOAD_DEREF 14
-335 POP_TOP
-336 LOAD_CONST_NONE
-337 WITH_CLEANUP
-338 END_FINALLY
-339 LOAD_CONST_SMALL_INT 1
-340 STORE_DEREF 16
-342 LOAD_FAST_N 16
-344 MAKE_CLOSURE \.\+ 1
-347 STORE_FAST 13
-348 LOAD_CONST_SMALL_INT 0
-349 LOAD_CONST_NONE
-350 IMPORT_NAME 'a'
-352 STORE_FAST 0
-353 LOAD_CONST_SMALL_INT 0
-354 LOAD_CONST_STRING 'b'
-356 BUILD_TUPLE 1
-358 IMPORT_NAME 'a'
-360 IMPORT_FROM 'b'
-362 STORE_DEREF 14
-364 POP_TOP
-365 RAISE_LAST
-366 LOAD_CONST_SMALL_INT 1
-367 RAISE_OBJ
-368 LOAD_CONST_NONE
+18 LOAD_CONST_OBJ \.\+=(1, 2)
+20 STORE_DEREF 14
+22 LOAD_CONST_SMALL_INT 1
+23 LOAD_CONST_SMALL_INT 2
+24 BUILD_LIST 2
+26 STORE_FAST 1
+27 LOAD_CONST_SMALL_INT 1
+28 LOAD_CONST_SMALL_INT 2
+29 BUILD_SET 2
+31 STORE_FAST 2
+32 BUILD_MAP 0
+34 STORE_DEREF 15
+36 BUILD_MAP 1
+38 LOAD_CONST_SMALL_INT 2
+39 LOAD_CONST_SMALL_INT 1
+40 STORE_MAP
+41 STORE_FAST 3
+42 LOAD_CONST_STRING 'a'
+44 STORE_FAST 4
+45 LOAD_CONST_OBJ \.\+=b'a'
+47 STORE_FAST 5
+48 LOAD_CONST_SMALL_INT 1
+49 STORE_FAST 6
+50 LOAD_CONST_SMALL_INT 2
+51 STORE_FAST 7
+52 LOAD_FAST 0
+53 LOAD_DEREF 14
+55 BINARY_OP 27 __add__
+56 STORE_FAST 8
+57 LOAD_FAST 0
+58 UNARY_OP 1 __neg__
+59 STORE_FAST 9
+60 LOAD_FAST 0
+61 UNARY_OP 3 
+62 STORE_FAST 10
+63 LOAD_FAST 0
+64 LOAD_DEREF 14
+66 DUP_TOP
+67 ROT_THREE
+68 BINARY_OP 2 __eq__
+69 JUMP_IF_FALSE_OR_POP 75
+71 LOAD_FAST 1
+72 BINARY_OP 2 __eq__
+73 JUMP 77
+75 ROT_TWO
+76 POP_TOP
+77 STORE_FAST 10
+78 LOAD_FAST 0
+79 LOAD_DEREF 14
+81 BINARY_OP 2 __eq__
+82 JUMP_IF_FALSE_OR_POP 88
+84 LOAD_DEREF 14
+86 LOAD_FAST 1
+87 BINARY_OP 2 __eq__
+88 UNARY_OP 3 
+89 STORE_FAST 10
+90 LOAD_DEREF 14
+92 LOAD_ATTR c
+94 STORE_FAST 11
+95 LOAD_FAST 11
+96 LOAD_DEREF 14
+98 STORE_ATTR c
+100 LOAD_DEREF 14
+102 LOAD_CONST_SMALL_INT 0
+103 LOAD_SUBSCR
+104 STORE_FAST 12
+105 LOAD_FAST 12
+106 LOAD_DEREF 14
+108 LOAD_CONST_SMALL_INT 0
+109 STORE_SUBSCR
+110 LOAD_DEREF 14
+112 LOAD_CONST_SMALL_INT 0
+113 DUP_TOP_TWO
+114 LOAD_SUBSCR
+115 LOAD_FAST 12
+116 BINARY_OP 14 __iadd__
+117 ROT_THREE
+118 STORE_SUBSCR
+119 LOAD_DEREF 14
+121 LOAD_CONST_NONE
+122 LOAD_CONST_NONE
+123 BUILD_SLICE 2
+125 LOAD_SUBSCR
+126 STORE_FAST 0
+127 LOAD_FAST 1
+128 UNPACK_SEQUENCE 2
+130 STORE_FAST 0
+131 STORE_DEREF 14
+133 LOAD_FAST 0
+134 UNPACK_EX 1
+136 STORE_FAST 0
+137 STORE_FAST 0
+138 LOAD_DEREF 14
+140 LOAD_FAST 0
+141 ROT_TWO
+142 STORE_FAST 0
+143 STORE_DEREF 14
+145 LOAD_FAST 1
+146 LOAD_DEREF 14
+148 LOAD_FAST 0
+149 ROT_THREE
+150 ROT_TWO
+151 STORE_FAST 0
+152 STORE_DEREF 14
+154 STORE_FAST 1
+155 DELETE_FAST 0
+157 LOAD_FAST 0
+158 STORE_GLOBAL gl
+160 DELETE_GLOBAL gl
+162 LOAD_FAST 14
+163 LOAD_FAST 15
+164 MAKE_CLOSURE \.\+ 2
+167 LOAD_FAST 2
+168 GET_ITER
+169 CALL_FUNCTION n=1 nkw=0
+171 STORE_FAST 0
+172 LOAD_FAST 14
+173 LOAD_FAST 15
+174 MAKE_CLOSURE \.\+ 2
+177 LOAD_FAST 2
+178 CALL_FUNCTION n=1 nkw=0
+180 STORE_FAST 0
+181 LOAD_FAST 14
+182 LOAD_FAST 15
+183 MAKE_CLOSURE \.\+ 2
+186 LOAD_FAST 2
+187 CALL_FUNCTION n=1 nkw=0
+189 STORE_FAST 0
+190 LOAD_FAST 0
+191 CALL_FUNCTION n=0 nkw=0
+193 POP_TOP
+194 LOAD_FAST 0
+195 LOAD_CONST_SMALL_INT 1
+196 CALL_FUNCTION n=1 nkw=0
+198 POP_TOP
+199 LOAD_FAST 0
+200 LOAD_CONST_STRING 'b'
+202 LOAD_CONST_SMALL_INT 1
+203 CALL_FUNCTION n=0 nkw=1
+206 POP_TOP
+207 LOAD_FAST 0
+208 LOAD_DEREF 14
+210 LOAD_CONST_SMALL_INT 1
+211 CALL_FUNCTION_VAR_KW n=1 nkw=0
+213 POP_TOP
+214 LOAD_FAST 0
+215 LOAD_METHOD b
+217 CALL_METHOD n=0 nkw=0
+219 POP_TOP
+220 LOAD_FAST 0
+221 LOAD_METHOD b
+223 LOAD_CONST_SMALL_INT 1
+224 CALL_METHOD n=1 nkw=0
+226 POP_TOP
+227 LOAD_FAST 0
+228 LOAD_METHOD b
+230 LOAD_CONST_STRING 'c'
+232 LOAD_CONST_SMALL_INT 1
+233 CALL_METHOD n=0 nkw=1
+236 POP_TOP
+237 LOAD_FAST 0
+238 LOAD_METHOD b
+240 LOAD_FAST 1
+241 LOAD_CONST_SMALL_INT 1
+242 CALL_METHOD_VAR_KW n=1 nkw=0
+244 POP_TOP
+245 LOAD_FAST 0
+246 POP_JUMP_IF_FALSE 253
+248 LOAD_DEREF 16
+250 POP_TOP
+251 JUMP 256
+253 LOAD_GLOBAL y
+255 POP_TOP
+256 JUMP 261
+258 LOAD_DEREF 14
+260 POP_TOP
+261 LOAD_FAST 0
+262 POP_JUMP_IF_TRUE 258
+264 JUMP 269
+266 LOAD_DEREF 14
+268 POP_TOP
+269 LOAD_FAST 0
+270 POP_JUMP_IF_FALSE 266
+272 LOAD_FAST 0
+273 JUMP_IF_TRUE_OR_POP 276
+275 LOAD_FAST 0
+276 STORE_FAST 0
+277 LOAD_DEREF 14
+279 GET_ITER_STACK
+280 FOR_ITER 287
+282 STORE_FAST 0
+283 LOAD_FAST 1
+284 POP_TOP
+285 JUMP 280
+287 SETUP_FINALLY 308
+289 SETUP_EXCEPT 300
+291 JUMP 295
+293 JUMP 298
+295 LOAD_FAST 0
+296 POP_JUMP_IF_TRUE 293
+298 POP_EXCEPT_JUMP 307
+300 POP_TOP
+301 LOAD_DEREF 14
+303 POP_TOP
+304 POP_EXCEPT_JUMP 307
+306 END_FINALLY
+307 LOAD_CONST_NONE
+308 LOAD_FAST 1
+309 POP_TOP
+310 END_FINALLY
+311 JUMP 324
+313 SETUP_EXCEPT 320
+315 UNWIND_JUMP 327 1
+318 POP_EXCEPT_JUMP 324
+320 POP_TOP
+321 POP_EXCEPT_JUMP 324
+323 END_FINALLY
+324 LOAD_FAST 0
+325 POP_JUMP_IF_TRUE 313
+327 LOAD_FAST 0
+328 SETUP_WITH 335
+330 POP_TOP
+331 LOAD_DEREF 14
+333 POP_TOP
+334 LOAD_CONST_NONE
+335 WITH_CLEANUP
+336 END_FINALLY
+337 LOAD_CONST_SMALL_INT 1
+338 STORE_DEREF 16
+340 LOAD_FAST_N 16
+342 MAKE_CLOSURE \.\+ 1
+345 STORE_FAST 13
+346 LOAD_CONST_SMALL_INT 0
+347 LOAD_CONST_NONE
+348 IMPORT_NAME 'a'
+350 STORE_FAST 0
+351 LOAD_CONST_SMALL_INT 0
+352 LOAD_CONST_STRING 'b'
+354 BUILD_TUPLE 1
+356 IMPORT_NAME 'a'
+358 IMPORT_FROM 'b'
+360 STORE_DEREF 14
+362 POP_TOP
+363 RAISE_LAST
+364 LOAD_CONST_SMALL_INT 1
+365 RAISE_OBJ
+366 LOAD_CONST_NONE
+367 RETURN_VALUE
+368 LOAD_CONST_SMALL_INT 1
 369 RETURN_VALUE
-370 LOAD_CONST_SMALL_INT 1
-371 RETURN_VALUE
 File cmdline/cmd_showbc.py, code block 'f' (descriptor: \.\+, bytecode @\.\+ 59 bytes)
 Raw bytecode (code_info_size=8, bytecode_size=51):
  a8 10 0a 02 80 82 34 38 81 57 c0 57 c1 57 c2 57

From 4ca96983ff808d914256fb85376fc14b871d235e Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 31 Mar 2022 14:28:19 +1100
Subject: [PATCH 1924/3533] py/persistentcode: Support loading and saving
 tuples in .mpy files.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/persistentcode.c | 33 ++++++++++++++++++++++++++++++++-
 py/persistentcode.h |  4 ++++
 2 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/py/persistentcode.c b/py/persistentcode.c
index c9cfc3b5c285c..f3d6b7205d6a2 100644
--- a/py/persistentcode.c
+++ b/py/persistentcode.c
@@ -202,13 +202,25 @@ STATIC mp_obj_t load_obj(mp_reader_t *reader) {
         return MP_OBJ_FROM_PTR(&mp_fun_table);
     } else
     #endif
-    if (obj_type == MP_PERSISTENT_OBJ_ELLIPSIS) {
+    if (obj_type == MP_PERSISTENT_OBJ_NONE) {
+        return mp_const_none;
+    } else if (obj_type == MP_PERSISTENT_OBJ_FALSE) {
+        return mp_const_false;
+    } else if (obj_type == MP_PERSISTENT_OBJ_TRUE) {
+        return mp_const_true;
+    } else if (obj_type == MP_PERSISTENT_OBJ_ELLIPSIS) {
         return MP_OBJ_FROM_PTR(&mp_const_ellipsis_obj);
     } else {
         size_t len = read_uint(reader);
         if (len == 0 && obj_type == MP_PERSISTENT_OBJ_BYTES) {
             read_byte(reader); // skip null terminator
             return mp_const_empty_bytes;
+        } else if (obj_type == MP_PERSISTENT_OBJ_TUPLE) {
+            mp_obj_tuple_t *tuple = MP_OBJ_TO_PTR(mp_obj_new_tuple(len, NULL));
+            for (size_t i = 0; i < len; ++i) {
+                tuple->items[i] = load_obj(reader);
+            }
+            return MP_OBJ_FROM_PTR(tuple);
         }
         vstr_t vstr;
         vstr_init_len(&vstr, len);
@@ -514,9 +526,28 @@ STATIC void save_obj(mp_print_t *print, mp_obj_t o) {
         mp_print_bytes(print, &obj_type, 1);
         mp_print_uint(print, len);
         mp_print_bytes(print, (const byte *)str, len + 1); // +1 to store null terminator
+    } else if (o == mp_const_none) {
+        byte obj_type = MP_PERSISTENT_OBJ_NONE;
+        mp_print_bytes(print, &obj_type, 1);
+    } else if (o == mp_const_false) {
+        byte obj_type = MP_PERSISTENT_OBJ_FALSE;
+        mp_print_bytes(print, &obj_type, 1);
+    } else if (o == mp_const_true) {
+        byte obj_type = MP_PERSISTENT_OBJ_TRUE;
+        mp_print_bytes(print, &obj_type, 1);
     } else if (MP_OBJ_TO_PTR(o) == &mp_const_ellipsis_obj) {
         byte obj_type = MP_PERSISTENT_OBJ_ELLIPSIS;
         mp_print_bytes(print, &obj_type, 1);
+    } else if (mp_obj_is_type(o, &mp_type_tuple)) {
+        size_t len;
+        mp_obj_t *items;
+        mp_obj_tuple_get(o, &len, &items);
+        byte obj_type = MP_PERSISTENT_OBJ_TUPLE;
+        mp_print_bytes(print, &obj_type, 1);
+        mp_print_uint(print, len);
+        for (size_t i = 0; i < len; ++i) {
+            save_obj(print, items[i]);
+        }
     } else {
         // we save numbers using a simplistic text representation
         // TODO could be improved
diff --git a/py/persistentcode.h b/py/persistentcode.h
index 7426029addc2e..37263f66b3c3a 100644
--- a/py/persistentcode.h
+++ b/py/persistentcode.h
@@ -104,12 +104,16 @@ enum {
 
 enum {
     MP_PERSISTENT_OBJ_FUN_TABLE = 0,
+    MP_PERSISTENT_OBJ_NONE,
+    MP_PERSISTENT_OBJ_FALSE,
+    MP_PERSISTENT_OBJ_TRUE,
     MP_PERSISTENT_OBJ_ELLIPSIS,
     MP_PERSISTENT_OBJ_STR,
     MP_PERSISTENT_OBJ_BYTES,
     MP_PERSISTENT_OBJ_INT,
     MP_PERSISTENT_OBJ_FLOAT,
     MP_PERSISTENT_OBJ_COMPLEX,
+    MP_PERSISTENT_OBJ_TUPLE,
 };
 
 mp_compiled_module_t mp_raw_code_load(mp_reader_t *reader, mp_module_context_t *ctx);

From 2a075cc8a9596d42a71906be4b3c91858e249a3c Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 31 Mar 2022 15:26:14 +1100
Subject: [PATCH 1925/3533] tools/mpy-tool.py: Support loading tuples from .mpy
 files.

Signed-off-by: Damien George <damien@micropython.org>
---
 tools/mpy-tool.py | 27 ++++++++++++++++++++-------
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/tools/mpy-tool.py b/tools/mpy-tool.py
index fc0b7c09cac1e..e5470861138de 100755
--- a/tools/mpy-tool.py
+++ b/tools/mpy-tool.py
@@ -122,12 +122,16 @@ def __init__(self, str):
 MP_NATIVE_ARCH_XTENSAWIN = 10
 
 MP_PERSISTENT_OBJ_FUN_TABLE = 0
-MP_PERSISTENT_OBJ_ELLIPSIS = 1
-MP_PERSISTENT_OBJ_STR = 2
-MP_PERSISTENT_OBJ_BYTES = 3
-MP_PERSISTENT_OBJ_INT = 4
-MP_PERSISTENT_OBJ_FLOAT = 5
-MP_PERSISTENT_OBJ_COMPLEX = 6
+MP_PERSISTENT_OBJ_NONE = 1
+MP_PERSISTENT_OBJ_FALSE = 2
+MP_PERSISTENT_OBJ_TRUE = 3
+MP_PERSISTENT_OBJ_ELLIPSIS = 4
+MP_PERSISTENT_OBJ_STR = 5
+MP_PERSISTENT_OBJ_BYTES = 6
+MP_PERSISTENT_OBJ_INT = 7
+MP_PERSISTENT_OBJ_FLOAT = 8
+MP_PERSISTENT_OBJ_COMPLEX = 9
+MP_PERSISTENT_OBJ_TUPLE = 10
 
 MP_SCOPE_FLAG_VIPERRELOC = 0x10
 MP_SCOPE_FLAG_VIPERRODATA = 0x20
@@ -846,7 +850,7 @@ def disassemble(self):
         while ip < len(bc):
             fmt, sz, arg = mp_opcode_decode(bc, ip)
             if bc[ip] == Opcodes.MP_BC_LOAD_CONST_OBJ:
-                arg = "%r" % self.obj_table[arg]
+                arg = repr(self.obj_table[arg])
             if fmt == MP_BC_FORMAT_QSTR:
                 arg = self.qstr_table[arg].str
             elif fmt in (MP_BC_FORMAT_VAR_UINT, MP_BC_FORMAT_OFFSET):
@@ -1115,8 +1119,17 @@ def read_obj(reader, segments):
     obj_type = reader.read_byte()
     if obj_type == MP_PERSISTENT_OBJ_FUN_TABLE:
         return MPFunTable()
+    elif obj_type == MP_PERSISTENT_OBJ_NONE:
+        return None
+    elif obj_type == MP_PERSISTENT_OBJ_FALSE:
+        return False
+    elif obj_type == MP_PERSISTENT_OBJ_TRUE:
+        return True
     elif obj_type == MP_PERSISTENT_OBJ_ELLIPSIS:
         return Ellipsis
+    elif obj_type == MP_PERSISTENT_OBJ_TUPLE:
+        ln = reader.read_uint()
+        return tuple(read_obj(reader, segments) for _ in range(ln))
     else:
         ln = reader.read_uint()
         start_pos = reader.tell()

From 68b3aeeb577c92328dc96a197d3625dd4379d969 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 31 Mar 2022 16:20:23 +1100
Subject: [PATCH 1926/3533] tools/mpy-tool.py: Support freezing tuples and
 other consts.

This also simplifies how constants are frozen.

Signed-off-by: Damien George <damien@micropython.org>
---
 tools/mpy-tool.py | 195 ++++++++++++++++++++++++++--------------------
 1 file changed, 109 insertions(+), 86 deletions(-)

diff --git a/tools/mpy-tool.py b/tools/mpy-tool.py
index e5470861138de..000b22578881a 100755
--- a/tools/mpy-tool.py
+++ b/tools/mpy-tool.py
@@ -600,9 +600,113 @@ def freeze(self, compiled_module_index):
         print("    .rc = &raw_code_%s," % self.raw_code.escaped_name)
         print("};")
 
-    def freeze_constants(self):
+    def freeze_constant_obj(self, obj_name, obj):
         global const_str_content, const_int_content, const_obj_content
 
+        if isinstance(obj, MPFunTable):
+            return "&mp_fun_table"
+        elif obj is None:
+            return "MP_ROM_NONE"
+        elif obj is False:
+            return "MP_ROM_FALSE"
+        elif obj is True:
+            return "MP_ROM_TRUE"
+        elif obj is Ellipsis:
+            return "MP_ROM_PTR(&mp_const_ellipsis_obj)"
+        elif is_str_type(obj) or is_bytes_type(obj):
+            if is_str_type(obj):
+                obj = bytes_cons(obj, "utf8")
+                obj_type = "mp_type_str"
+            else:
+                obj_type = "mp_type_bytes"
+            print(
+                'static const mp_obj_str_t %s = {{&%s}, %u, %u, (const byte*)"%s"};'
+                % (
+                    obj_name,
+                    obj_type,
+                    qstrutil.compute_hash(obj, config.MICROPY_QSTR_BYTES_IN_HASH),
+                    len(obj),
+                    "".join(("\\x%02x" % b) for b in obj),
+                )
+            )
+            const_str_content += len(obj)
+            const_obj_content += 4 * 4
+            return "MP_ROM_PTR(&%s)" % obj_name
+        elif is_int_type(obj):
+            if config.MICROPY_LONGINT_IMPL == config.MICROPY_LONGINT_IMPL_NONE:
+                # TODO check if we can actually fit this long-int into a small-int
+                raise FreezeError(self, "target does not support long int")
+            elif config.MICROPY_LONGINT_IMPL == config.MICROPY_LONGINT_IMPL_LONGLONG:
+                # TODO
+                raise FreezeError(self, "freezing int to long-long is not implemented")
+            elif config.MICROPY_LONGINT_IMPL == config.MICROPY_LONGINT_IMPL_MPZ:
+                neg = 0
+                if obj < 0:
+                    obj = -obj
+                    neg = 1
+                bits_per_dig = config.MPZ_DIG_SIZE
+                digs = []
+                z = obj
+                while z:
+                    digs.append(z & ((1 << bits_per_dig) - 1))
+                    z >>= bits_per_dig
+                ndigs = len(digs)
+                digs = ",".join(("%#x" % d) for d in digs)
+                print(
+                    "static const mp_obj_int_t %s = {{&mp_type_int}, "
+                    "{.neg=%u, .fixed_dig=1, .alloc=%u, .len=%u, .dig=(uint%u_t*)(const uint%u_t[]){%s}}};"
+                    % (obj_name, neg, ndigs, ndigs, bits_per_dig, bits_per_dig, digs)
+                )
+                const_int_content += (digs.count(",") + 1) * bits_per_dig // 8
+                const_obj_content += 4 * 4
+                return "MP_ROM_PTR(&%s)" % obj_name
+        elif type(obj) is float:
+            macro_name = "%s_macro" % obj_name
+            print(
+                "#if MICROPY_OBJ_REPR == MICROPY_OBJ_REPR_A || MICROPY_OBJ_REPR == MICROPY_OBJ_REPR_B"
+            )
+            print(
+                "static const mp_obj_float_t %s = {{&mp_type_float}, (mp_float_t)%.16g};"
+                % (obj_name, obj)
+            )
+            print("#define %s MP_ROM_PTR(&%s)" % (macro_name, obj_name))
+            print("#elif MICROPY_OBJ_REPR == MICROPY_OBJ_REPR_C")
+            n = struct.unpack("<I", struct.pack("<f", obj))[0]
+            n = ((n & ~0x3) | 2) + 0x80800000
+            print("#define %s ((mp_rom_obj_t)(0x%08x))" % (macro_name, n))
+            print("#elif MICROPY_OBJ_REPR == MICROPY_OBJ_REPR_D")
+            n = struct.unpack("<Q", struct.pack("<d", obj))[0]
+            n += 0x8004000000000000
+            print("#define %s ((mp_rom_obj_t)(0x%016x))" % (macro_name, n))
+            print("#endif")
+            const_obj_content += 3 * 4
+            return macro_name
+        elif type(obj) is complex:
+            print(
+                "static const mp_obj_complex_t %s = {{&mp_type_complex}, (mp_float_t)%.16g, (mp_float_t)%.16g};"
+                % (obj_name, obj.real, obj.imag)
+            )
+            return "MP_ROM_PTR(&%s)" % obj_name
+        elif type(obj) is tuple:
+            if len(obj) == 0:
+                return "MP_ROM_PTR(&mp_const_empty_tuple_obj)"
+            else:
+                obj_refs = []
+                for i, sub_obj in enumerate(obj):
+                    sub_obj_name = "%s_%u" % (obj_name, i)
+                    obj_refs.append(self.freeze_constant_obj(sub_obj_name, sub_obj))
+                print(
+                    "static const mp_rom_obj_tuple_t %s = {{&mp_type_tuple}, %d, {"
+                    % (obj_name, len(obj))
+                )
+                for ref in obj_refs:
+                    print("    %s," % ref)
+                print("}};")
+                return "MP_ROM_PTR(&%s)" % obj_name
+        else:
+            raise FreezeError(self, "freezing of object %r is not implemented" % (obj,))
+
+    def freeze_constants(self):
         if len(self.qstr_table):
             print(
                 "static const qstr_short_t const_qstr_table_data_%s[%u] = {"
@@ -618,74 +722,10 @@ def freeze_constants(self):
         # generate constant objects
         print()
         print("// constants")
+        obj_refs = []
         for i, obj in enumerate(self.obj_table):
             obj_name = "const_obj_%s_%u" % (self.escaped_name, i)
-            if isinstance(obj, MPFunTable):
-                pass
-            elif obj is Ellipsis:
-                print("#define %s mp_const_ellipsis_obj" % obj_name)
-            elif is_str_type(obj) or is_bytes_type(obj):
-                if is_str_type(obj):
-                    obj = bytes_cons(obj, "utf8")
-                    obj_type = "mp_type_str"
-                else:
-                    obj_type = "mp_type_bytes"
-                print(
-                    'static const mp_obj_str_t %s = {{&%s}, %u, %u, (const byte*)"%s"};'
-                    % (
-                        obj_name,
-                        obj_type,
-                        qstrutil.compute_hash(obj, config.MICROPY_QSTR_BYTES_IN_HASH),
-                        len(obj),
-                        "".join(("\\x%02x" % b) for b in obj),
-                    )
-                )
-                const_str_content += len(obj)
-                const_obj_content += 4 * 4
-            elif is_int_type(obj):
-                if config.MICROPY_LONGINT_IMPL == config.MICROPY_LONGINT_IMPL_NONE:
-                    # TODO check if we can actually fit this long-int into a small-int
-                    raise FreezeError(self, "target does not support long int")
-                elif config.MICROPY_LONGINT_IMPL == config.MICROPY_LONGINT_IMPL_LONGLONG:
-                    # TODO
-                    raise FreezeError(self, "freezing int to long-long is not implemented")
-                elif config.MICROPY_LONGINT_IMPL == config.MICROPY_LONGINT_IMPL_MPZ:
-                    neg = 0
-                    if obj < 0:
-                        obj = -obj
-                        neg = 1
-                    bits_per_dig = config.MPZ_DIG_SIZE
-                    digs = []
-                    z = obj
-                    while z:
-                        digs.append(z & ((1 << bits_per_dig) - 1))
-                        z >>= bits_per_dig
-                    ndigs = len(digs)
-                    digs = ",".join(("%#x" % d) for d in digs)
-                    print(
-                        "static const mp_obj_int_t %s = {{&mp_type_int}, "
-                        "{.neg=%u, .fixed_dig=1, .alloc=%u, .len=%u, .dig=(uint%u_t*)(const uint%u_t[]){%s}}};"
-                        % (obj_name, neg, ndigs, ndigs, bits_per_dig, bits_per_dig, digs)
-                    )
-                    const_int_content += (digs.count(",") + 1) * bits_per_dig // 8
-                    const_obj_content += 4 * 4
-            elif type(obj) is float:
-                print(
-                    "#if MICROPY_OBJ_REPR == MICROPY_OBJ_REPR_A || MICROPY_OBJ_REPR == MICROPY_OBJ_REPR_B"
-                )
-                print(
-                    "static const mp_obj_float_t %s = {{&mp_type_float}, (mp_float_t)%.16g};"
-                    % (obj_name, obj)
-                )
-                print("#endif")
-                const_obj_content += 3 * 4
-            elif type(obj) is complex:
-                print(
-                    "static const mp_obj_complex_t %s = {{&mp_type_complex}, (mp_float_t)%.16g, (mp_float_t)%.16g};"
-                    % (obj_name, obj.real, obj.imag)
-                )
-            else:
-                raise FreezeError(self, "freezing of object %r is not implemented" % (obj,))
+            obj_refs.append(self.freeze_constant_obj(obj_name, obj))
 
         # generate constant table
         print()
@@ -694,25 +734,8 @@ def freeze_constants(self):
             "static const mp_rom_obj_t const_obj_table_data_%s[%u] = {"
             % (self.escaped_name, len(self.obj_table))
         )
-        for i in range(len(self.obj_table)):
-            if isinstance(self.obj_table[i], MPFunTable):
-                print("    &mp_fun_table,")
-            elif type(self.obj_table[i]) is float:
-                print(
-                    "#if MICROPY_OBJ_REPR == MICROPY_OBJ_REPR_A || MICROPY_OBJ_REPR == MICROPY_OBJ_REPR_B"
-                )
-                print("    MP_ROM_PTR(&const_obj_%s_%u)," % (self.escaped_name, i))
-                print("#elif MICROPY_OBJ_REPR == MICROPY_OBJ_REPR_C")
-                n = struct.unpack("<I", struct.pack("<f", self.obj_table[i]))[0]
-                n = ((n & ~0x3) | 2) + 0x80800000
-                print("    (mp_rom_obj_t)(0x%08x)," % (n,))
-                print("#elif MICROPY_OBJ_REPR == MICROPY_OBJ_REPR_D")
-                n = struct.unpack("<Q", struct.pack("<d", self.obj_table[i]))[0]
-                n += 0x8004000000000000
-                print("    (mp_rom_obj_t)(0x%016x)," % (n,))
-                print("#endif")
-            else:
-                print("    MP_ROM_PTR(&const_obj_%s_%u)," % (self.escaped_name, i))
+        for ref in obj_refs:
+            print("    %s," % ref)
         print("};")
 
         global const_table_ptr_content

From 24894f9065a42f3ccf4b6f38d4034122ec1721ef Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 7 Apr 2022 23:59:59 +1000
Subject: [PATCH 1927/3533] ports: Recompile bytecode tests now that .mpy
 format changed.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/minimal/frozentest.mpy | Bin 198 -> 196 bytes
 ports/powerpc/frozentest.mpy | Bin 198 -> 196 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/ports/minimal/frozentest.mpy b/ports/minimal/frozentest.mpy
index cd75d65a8bad195029d131cc42f18437ffeb7523..99581617ac3d13e416722a63852da14088ff8db7 100644
GIT binary patch
delta 67
zcmX@cc!Y6+0we20MHL|7rXk73om5$pTC8AbWNgC7&|)CK$EXejT51#9HAH>F#aINH
U1X)ZNBO9NFw_JDDj|@x(02fRUcmMzZ

delta 69
zcmX@Yc#Ls^0%P$+MHL|7rXiWcom5$pTC8AbWNgC7(BdG#$EXejTIv(qHN<%u!o^qw
WnFLu(7$X~>hPPaIepeqEm<#}f(i1@d

diff --git a/ports/powerpc/frozentest.mpy b/ports/powerpc/frozentest.mpy
index cd75d65a8bad195029d131cc42f18437ffeb7523..99581617ac3d13e416722a63852da14088ff8db7 100644
GIT binary patch
delta 67
zcmX@cc!Y6+0we20MHL|7rXk73om5$pTC8AbWNgC7&|)CK$EXejT51#9HAH>F#aINH
U1X)ZNBO9NFw_JDDj|@x(02fRUcmMzZ

delta 69
zcmX@Yc#Ls^0%P$+MHL|7rXiWcom5$pTC8AbWNgC7(BdG#$EXejTIv(qHN<%u!o^qw
WnFLu(7$X~>hPPaIepeqEm<#}f(i1@d


From 999abbb8b5a0ed9ee17e9295cc758e44a5511b80 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 8 Apr 2022 14:50:47 +1000
Subject: [PATCH 1928/3533] tests/perf_bench: Update import tests for changes
 to .mpy consts.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/perf_bench/core_import_mpy_multi.py  | 2 +-
 tests/perf_bench/core_import_mpy_single.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/perf_bench/core_import_mpy_multi.py b/tests/perf_bench/core_import_mpy_multi.py
index 74caf20a38dca..a807aa6d7739c 100644
--- a/tests/perf_bench/core_import_mpy_multi.py
+++ b/tests/perf_bench/core_import_mpy_multi.py
@@ -23,7 +23,7 @@ def f():
     x = ("const tuple", None, False, True, 1, 2, 3)
 result = 123
 """
-file_data = b'M\x06\x02\x1f\x14\x03\x0etest.py\x00\x0f\x02A\x00\x02f\x00\x0cresult\x00/-5#\x82I\x81{\x81w\x82/\x81\x05\x81\x17Iom\x82\x13\x06arg\x00s\x1cthis will be a string object\x00b\x1bthis will be a bytes object\x00s\x0bconst tuple\x00\x81\\\x10\n\x01\x89\x07d`T2\x00\x10\x024\x02\x16\x022\x01\x16\x03"\x80{\x16\x04Qc\x02\x81d\x00\x08\x02(DD\x11\x05\x16\x06\x10\x02\x16\x072\x00\x16\x082\x01\x16\t2\x02\x16\nQc\x03`\x1a\x08\x08\x12\x13@\xb1\xb0\x18\x13Qc@\t\x08\t\x12` Qc@\t\x08\n\x12``Qc\x83\x008\x0e\x03\x80\x08+)##\x12\x0b\x12\x0c\x12\r\x12\x0e*\x04Y\x12\x0f\x12\x10\x12\x11*\x03Y#\x00\xc0#\x01\xc0#\x02QPR\x81\x82\x83*\x07\xc0Qc'
+file_data = b'M\x06\x02\x1f\x14\x03\x0etest.py\x00\x0f\x02A\x00\x02f\x00\x0cresult\x00/-5#\x82I\x81{\x81w\x82/\x81\x05\x81\x17Iom\x82\x13\x06arg\x00\x05\x1cthis will be a string object\x00\x06\x1bthis will be a bytes object\x00\n\x07\x05\x0bconst tuple\x00\x01\x02\x03\x07\x011\x07\x012\x07\x013\x81\\\x10\n\x01\x89\x07d`T2\x00\x10\x024\x02\x16\x022\x01\x16\x03"\x80{\x16\x04Qc\x02\x81d\x00\x08\x02(DD\x11\x05\x16\x06\x10\x02\x16\x072\x00\x16\x082\x01\x16\t2\x02\x16\nQc\x03`\x1a\x08\x08\x12\x13@\xb1\xb0\x18\x13Qc@\t\x08\t\x12` Qc@\t\x08\n\x12``Qc\x82@ \x0e\x03\x80\x08+)##\x12\x0b\x12\x0c\x12\r\x12\x0e*\x04Y\x12\x0f\x12\x10\x12\x11*\x03Y#\x00\xc0#\x01\xc0#\x02\xc0Qc'
 
 
 class File(uio.IOBase):
diff --git a/tests/perf_bench/core_import_mpy_single.py b/tests/perf_bench/core_import_mpy_single.py
index 1e8a4f531e3d3..87ad995aa6f42 100644
--- a/tests/perf_bench/core_import_mpy_single.py
+++ b/tests/perf_bench/core_import_mpy_single.py
@@ -78,7 +78,7 @@ def f1():
     x = ("const tuple 9", None, False, True, 1, 2, 3)
 result = 123
 """
-file_data = b"M\x06\x02\x1f\x81=\x1e\x0etest.py\x00\x0f\x04A0\x00\x04A1\x00\x04f0\x00\x04f1\x00\x0cresult\x00/-5\x04a0\x00\x04a1\x00\x04a2\x00\x04a3\x00\x13\x15\x17\x19\x1b\x1d\x1f!#%')+1379;=?ACEGIKMOQSUWY[]_acegikmoqsuwy{}\x7f\x81\x01\x81\x03\x81\x05\x81\x07\x81\t\x81\x0b\x81\r\x81\x0f\x81\x11\x81\x13\x81\x15\x81\x17\x81\x19\x81\x1b\x81\x1d\x81\x1f\x81!\x81#\x81%\x81'\x81)\x81+\x81-\x81/\x811\x813\x815\x817\x819\x81;\x81=\x81?\x81A\x81C\x81E\x81G\x81I\x81K\x81M\x81O\x81Q\x81S\x81U\x81W\x81Y\x81[\x81]\x81_\x81a\x81c\x81e\x81g\x81i\x81k\x81m\x81o\x81q\x81s\x81u\x81w\x81y\x81{\x81}\x81\x7f\x82\x01\x82\x03\x82\x05\x82\x07\x82\t\x82\x0b\x82\r\x82\x0f\x82\x11\x82\x13\x82\x15\x82\x17\x82\x19\x82\x1b\x82\x1d\x82\x1f\x82!\x82#\x82%\x82'\x82)\x82+\x82-\x82/\x821\x823\x825\x827\x829\x82;\x82=\x82?\x82A\x82E\x82G\x82I\x82K\nname0\x00\nname1\x00\nname2\x00\nname3\x00\nname4\x00\nname5\x00\nname6\x00\nname7\x00\nname8\x00\nname9\x00$quite_a_long_name0\x00$quite_a_long_name1\x00$quite_a_long_name2\x00$quite_a_long_name3\x00$quite_a_long_name4\x00$quite_a_long_name5\x00$quite_a_long_name6\x00$quite_a_long_name7\x00$quite_a_long_name8\x00$quite_a_long_name9\x00&quite_a_long_name10\x00&quite_a_long_name11\x00s\x1ethis will be a string object 0\x00s\x1ethis will be a string object 1\x00s\x1ethis will be a string object 2\x00s\x1ethis will be a string object 3\x00s\x1ethis will be a string object 4\x00s\x1ethis will be a string object 5\x00s\x1ethis will be a string object 6\x00s\x1ethis will be a string object 7\x00s\x1ethis will be a string object 8\x00s\x1ethis will be a string object 9\x00b\x1dthis will be a bytes object 0\x00b\x1dthis will be a bytes object 1\x00b\x1dthis will be a bytes object 2\x00b\x1dthis will be a bytes object 3\x00b\x1dthis will be a bytes object 4\x00b\x1dthis will be a bytes object 5\x00b\x1dthis will be a bytes object 6\x00b\x1dthis will be a bytes object 7\x00b\x1dthis will be a bytes object 8\x00b\x1dthis will be a bytes object 9\x00s\rconst tuple 0\x00s\rconst tuple 1\x00s\rconst tuple 2\x00s\rconst tuple 3\x00s\rconst tuple 4\x00s\rconst tuple 5\x00s\rconst tuple 6\x00s\rconst tuple 7\x00s\rconst tuple 8\x00s\rconst tuple 9\x00\x82d\x10\x12\x01i@i@\x84\x18\x84\x1fT2\x00\x10\x024\x02\x16\x02T2\x01\x10\x034\x02\x16\x032\x02\x16\x042\x03\x16\x05\"\x80{\x16\x06Qc\x04\x82\x0c\x00\n\x02($$$\x11\x07\x16\x08\x10\x02\x16\t2\x00\x16\n2\x01\x16\x0b2\x02\x16\x0c2\x03\x16\rQc\x04@\t\x08\n\x81\x0b Qc@\t\x08\x0b\x81\x0b@Qc@\t\x08\x0c\x81\x0b`QcH\t\n\r\x81\x0b` Qc\x82\x14\x00\x0c\x03h`$$$\x11\x07\x16\x08\x10\x03\x16\t2\x00\x16\n2\x01\x16\x0b2\x02\x16\x0c2\x03\x16\rQc\x04H\t\n\n\x81\x0b``QcH\t\n\x0b\x81\x0b\x80\x07QcH\t\n\x0c\x81\x0b\x80\x08QcH\t\n\r\x81\x0b\x80\tQc\xa08P:\x04\x80\x0b13///---997799<\x1f%\x1f\"\x1f%)\x1f\"//\x12\x0e\x12\x0f\x12\x10\x12\x11\x12\x12\x12\x13\x12\x14*\x07Y\x12\x15\x12\x16\x12\x17\x12\x18\x12\x19\x12\x1a\x12\x08\x12\x07*\x08Y\x12\x1b\x12\x1c\x12\t\x12\x1d\x12\x1e\x12\x1f*\x06Y\x12 \x12!\x12\"\x12#\x12$\x12%*\x06Y\x12&\x12'\x12(\x12)\x12*\x12+*\x06Y\x12,\x12-\x12.\x12/\x120*\x05Y\x121\x122\x123\x124\x125*\x05Y\x126\x127\x128\x129\x12:*\x05Y\x12;\x12<\x12=\x12>\x12?\x12@\x12A\x12B\x12C\x12D\x12E*\x0bY\x12F\x12G\x12H\x12I\x12J\x12K\x12L\x12M\x12N\x12O\x12P*\x0bY\x12Q\x12R\x12S\x12T\x12U\x12V\x12W\x12X\x12Y\x12Z*\nY\x12[\x12\\\x12]\x12^\x12_\x12`\x12a\x12b\x12c\x12d*\nY\x12e\x12f\x12g\x12h\x12i\x12j\x12k\x12l\x12m\x12n\x12o*\x0bY\x12p\x12q\x12r\x12s\x12t\x12u\x12v\x12w\x12x\x12y\x12z*\x0bY\x12{\x12|\x12}\x12~\x12\x7f\x12\x81\x00\x12\x81\x01\x12\x81\x02\x12\x81\x03\x12\x81\x04*\nY\x12\x81\x05\x12\x81\x06\x12\x81\x07\x12\x81\x08\x12\x81\t\x12\x81\n\x12\x81\x0b\x12\x81\x0c\x12\x81\r\x12\x81\x0e\x12\x81\x0f*\x0bY\x12\x81\x10\x12\x81\x11\x12\x81\x12\x12\x81\x13\x12\x81\x14\x12\x81\x15\x12\x81\x16\x12\x81\x17\x12\x81\x18\x12\x81\x19*\nY\x12\x81\x1a\x12\x81\x1b\x12\x81\x1c\x12\x81\x1d\x12\x81\x1e\x12\x81\x1f\x12\x81 \x12\x81!\x12\x81\"\x12\x81#\x12\x81$*\x0bY\x12\x81%\x12\x81&*\x02Y\x12\x81'\x12\x81(\x12\x81)\x12\x81*\x12\x81+\x12\x81,\x12\x81-\x12\x81.\x12\x81/\x12\x810*\nY\x12\x811\x12\x812\x12\x813\x12\x814*\x04Y\x12\x815\x12\x816\x12\x817\x12\x818*\x04Y\x12\x819\x12\x81:\x12\x81;\x12\x81<*\x04YQc\x8cp8@\x05\x80#####################+++++++++#\x00\xc0#\x01\xc0#\x02\xc0#\x03\xc0#\x04\xc0#\x05\xc0#\x06\xc0#\x07\xc0#\x08\xc0#\t\xc0#\n\xc0#\x0b\xc0#\x0c\xc0#\r\xc0#\x0e\xc0#\x0f\xc0#\x10\xc0#\x11\xc0#\x12\xc0#\x13\xc0#\x14QPR\x81\x82\x83*\x07\xc0#\x15QPR\x81\x82\x83*\x07\xc0#\x16QPR\x81\x82\x83*\x07\xc0#\x17QPR\x81\x82\x83*\x07\xc0#\x18QPR\x81\x82\x83*\x07\xc0#\x19QPR\x81\x82\x83*\x07\xc0#\x1aQPR\x81\x82\x83*\x07\xc0#\x1bQPR\x81\x82\x83*\x07\xc0#\x1cQPR\x81\x82\x83*\x07\xc0#\x1dQPR\x81\x82\x83*\x07\xc0Qc"
+file_data = b"M\x06\x02\x1f\x81=\x1e\x0etest.py\x00\x0f\x04A0\x00\x04A1\x00\x04f0\x00\x04f1\x00\x0cresult\x00/-5\x04a0\x00\x04a1\x00\x04a2\x00\x04a3\x00\x13\x15\x17\x19\x1b\x1d\x1f!#%')+1379;=?ACEGIKMOQSUWY[]_acegikmoqsuwy{}\x7f\x81\x01\x81\x03\x81\x05\x81\x07\x81\t\x81\x0b\x81\r\x81\x0f\x81\x11\x81\x13\x81\x15\x81\x17\x81\x19\x81\x1b\x81\x1d\x81\x1f\x81!\x81#\x81%\x81'\x81)\x81+\x81-\x81/\x811\x813\x815\x817\x819\x81;\x81=\x81?\x81A\x81C\x81E\x81G\x81I\x81K\x81M\x81O\x81Q\x81S\x81U\x81W\x81Y\x81[\x81]\x81_\x81a\x81c\x81e\x81g\x81i\x81k\x81m\x81o\x81q\x81s\x81u\x81w\x81y\x81{\x81}\x81\x7f\x82\x01\x82\x03\x82\x05\x82\x07\x82\t\x82\x0b\x82\r\x82\x0f\x82\x11\x82\x13\x82\x15\x82\x17\x82\x19\x82\x1b\x82\x1d\x82\x1f\x82!\x82#\x82%\x82'\x82)\x82+\x82-\x82/\x821\x823\x825\x827\x829\x82;\x82=\x82?\x82A\x82E\x82G\x82I\x82K\nname0\x00\nname1\x00\nname2\x00\nname3\x00\nname4\x00\nname5\x00\nname6\x00\nname7\x00\nname8\x00\nname9\x00$quite_a_long_name0\x00$quite_a_long_name1\x00$quite_a_long_name2\x00$quite_a_long_name3\x00$quite_a_long_name4\x00$quite_a_long_name5\x00$quite_a_long_name6\x00$quite_a_long_name7\x00$quite_a_long_name8\x00$quite_a_long_name9\x00&quite_a_long_name10\x00&quite_a_long_name11\x00\x05\x1ethis will be a string object 0\x00\x05\x1ethis will be a string object 1\x00\x05\x1ethis will be a string object 2\x00\x05\x1ethis will be a string object 3\x00\x05\x1ethis will be a string object 4\x00\x05\x1ethis will be a string object 5\x00\x05\x1ethis will be a string object 6\x00\x05\x1ethis will be a string object 7\x00\x05\x1ethis will be a string object 8\x00\x05\x1ethis will be a string object 9\x00\x06\x1dthis will be a bytes object 0\x00\x06\x1dthis will be a bytes object 1\x00\x06\x1dthis will be a bytes object 2\x00\x06\x1dthis will be a bytes object 3\x00\x06\x1dthis will be a bytes object 4\x00\x06\x1dthis will be a bytes object 5\x00\x06\x1dthis will be a bytes object 6\x00\x06\x1dthis will be a bytes object 7\x00\x06\x1dthis will be a bytes object 8\x00\x06\x1dthis will be a bytes object 9\x00\n\x07\x05\rconst tuple 0\x00\x01\x02\x03\x07\x011\x07\x012\x07\x013\n\x07\x05\rconst tuple 1\x00\x01\x02\x03\x07\x011\x07\x012\x07\x013\n\x07\x05\rconst tuple 2\x00\x01\x02\x03\x07\x011\x07\x012\x07\x013\n\x07\x05\rconst tuple 3\x00\x01\x02\x03\x07\x011\x07\x012\x07\x013\n\x07\x05\rconst tuple 4\x00\x01\x02\x03\x07\x011\x07\x012\x07\x013\n\x07\x05\rconst tuple 5\x00\x01\x02\x03\x07\x011\x07\x012\x07\x013\n\x07\x05\rconst tuple 6\x00\x01\x02\x03\x07\x011\x07\x012\x07\x013\n\x07\x05\rconst tuple 7\x00\x01\x02\x03\x07\x011\x07\x012\x07\x013\n\x07\x05\rconst tuple 8\x00\x01\x02\x03\x07\x011\x07\x012\x07\x013\n\x07\x05\rconst tuple 9\x00\x01\x02\x03\x07\x011\x07\x012\x07\x013\x82d\x10\x12\x01i@i@\x84\x18\x84\x1fT2\x00\x10\x024\x02\x16\x02T2\x01\x10\x034\x02\x16\x032\x02\x16\x042\x03\x16\x05\"\x80{\x16\x06Qc\x04\x82\x0c\x00\n\x02($$$\x11\x07\x16\x08\x10\x02\x16\t2\x00\x16\n2\x01\x16\x0b2\x02\x16\x0c2\x03\x16\rQc\x04@\t\x08\n\x81\x0b Qc@\t\x08\x0b\x81\x0b@Qc@\t\x08\x0c\x81\x0b`QcH\t\n\r\x81\x0b` Qc\x82\x14\x00\x0c\x03h`$$$\x11\x07\x16\x08\x10\x03\x16\t2\x00\x16\n2\x01\x16\x0b2\x02\x16\x0c2\x03\x16\rQc\x04H\t\n\n\x81\x0b``QcH\t\n\x0b\x81\x0b\x80\x07QcH\t\n\x0c\x81\x0b\x80\x08QcH\t\n\r\x81\x0b\x80\tQc\xa08P:\x04\x80\x0b13///---997799<\x1f%\x1f\"\x1f%)\x1f\"//\x12\x0e\x12\x0f\x12\x10\x12\x11\x12\x12\x12\x13\x12\x14*\x07Y\x12\x15\x12\x16\x12\x17\x12\x18\x12\x19\x12\x1a\x12\x08\x12\x07*\x08Y\x12\x1b\x12\x1c\x12\t\x12\x1d\x12\x1e\x12\x1f*\x06Y\x12 \x12!\x12\"\x12#\x12$\x12%*\x06Y\x12&\x12'\x12(\x12)\x12*\x12+*\x06Y\x12,\x12-\x12.\x12/\x120*\x05Y\x121\x122\x123\x124\x125*\x05Y\x126\x127\x128\x129\x12:*\x05Y\x12;\x12<\x12=\x12>\x12?\x12@\x12A\x12B\x12C\x12D\x12E*\x0bY\x12F\x12G\x12H\x12I\x12J\x12K\x12L\x12M\x12N\x12O\x12P*\x0bY\x12Q\x12R\x12S\x12T\x12U\x12V\x12W\x12X\x12Y\x12Z*\nY\x12[\x12\\\x12]\x12^\x12_\x12`\x12a\x12b\x12c\x12d*\nY\x12e\x12f\x12g\x12h\x12i\x12j\x12k\x12l\x12m\x12n\x12o*\x0bY\x12p\x12q\x12r\x12s\x12t\x12u\x12v\x12w\x12x\x12y\x12z*\x0bY\x12{\x12|\x12}\x12~\x12\x7f\x12\x81\x00\x12\x81\x01\x12\x81\x02\x12\x81\x03\x12\x81\x04*\nY\x12\x81\x05\x12\x81\x06\x12\x81\x07\x12\x81\x08\x12\x81\t\x12\x81\n\x12\x81\x0b\x12\x81\x0c\x12\x81\r\x12\x81\x0e\x12\x81\x0f*\x0bY\x12\x81\x10\x12\x81\x11\x12\x81\x12\x12\x81\x13\x12\x81\x14\x12\x81\x15\x12\x81\x16\x12\x81\x17\x12\x81\x18\x12\x81\x19*\nY\x12\x81\x1a\x12\x81\x1b\x12\x81\x1c\x12\x81\x1d\x12\x81\x1e\x12\x81\x1f\x12\x81 \x12\x81!\x12\x81\"\x12\x81#\x12\x81$*\x0bY\x12\x81%\x12\x81&*\x02Y\x12\x81'\x12\x81(\x12\x81)\x12\x81*\x12\x81+\x12\x81,\x12\x81-\x12\x81.\x12\x81/\x12\x810*\nY\x12\x811\x12\x812\x12\x813\x12\x814*\x04Y\x12\x815\x12\x816\x12\x817\x12\x818*\x04Y\x12\x819\x12\x81:\x12\x81;\x12\x81<*\x04YQc\x87p\x08@\x05\x80###############################\x00\xc0#\x01\xc0#\x02\xc0#\x03\xc0#\x04\xc0#\x05\xc0#\x06\xc0#\x07\xc0#\x08\xc0#\t\xc0#\n\xc0#\x0b\xc0#\x0c\xc0#\r\xc0#\x0e\xc0#\x0f\xc0#\x10\xc0#\x11\xc0#\x12\xc0#\x13\xc0#\x14\xc0#\x15\xc0#\x16\xc0#\x17\xc0#\x18\xc0#\x19\xc0#\x1a\xc0#\x1b\xc0#\x1c\xc0#\x1d\xc0Qc"
 
 
 class File(uio.IOBase):

From abdc4ec08d742642598555ba8e1854fe1445645e Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 7 Apr 2022 23:54:24 +1000
Subject: [PATCH 1929/3533] qemu-arm/test-frzmpy: Add test for freezing
 constant tuples.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/qemu-arm/test-frzmpy/frozen_const.py | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 ports/qemu-arm/test-frzmpy/frozen_const.py

diff --git a/ports/qemu-arm/test-frzmpy/frozen_const.py b/ports/qemu-arm/test-frzmpy/frozen_const.py
new file mode 100644
index 0000000000000..19af4a3e2a3da
--- /dev/null
+++ b/ports/qemu-arm/test-frzmpy/frozen_const.py
@@ -0,0 +1,11 @@
+# Test freezing constants.
+
+x0 = (1,)
+x1 = (1, 2)
+x2 = (1, 1 << 100)
+x3 = (None, False, True, ...)
+x4 = ("str", b"bytes")
+x5 = ((),)
+x6 = ((1,),)
+x7 = ((1, 2),)
+x8 = (1, "str", (), ("nested", 2, ((False, True), None, ...)))

From 9c8a56343fea4e3603dbeeabd1b3a2194f9dca91 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 7 Apr 2022 23:53:37 +1000
Subject: [PATCH 1930/3533] tools/mpy-tool.py: Optimise freezing of ints that
 can fit a small int.

Signed-off-by: Damien George <damien@micropython.org>
---
 tools/mpy-tool.py | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/tools/mpy-tool.py b/tools/mpy-tool.py
index 000b22578881a..17dd8704aebcb 100755
--- a/tools/mpy-tool.py
+++ b/tools/mpy-tool.py
@@ -327,6 +327,13 @@ class Opcodes:
         mapping[MP_BC_BINARY_OP_MULTI + i] = "BINARY_OP %d %s" % (i, mp_binary_op_method_name[i])
 
 
+# This definition of a small int covers all possible targets, in the sense that every
+# target can encode as a small int, an integer that passes this test.  The minimum is set
+# by MICROPY_OBJ_REPR_B on a 16-bit machine, where there are 14 bits for the small int.
+def mp_small_int_fits(i):
+    return -0x2000 <= i <= 0x1FFF
+
+
 # this function mirrors that in py/bc.c
 def mp_opcode_format(bytecode, ip, count_var_uint):
     opcode = bytecode[ip]
@@ -633,8 +640,10 @@ def freeze_constant_obj(self, obj_name, obj):
             const_obj_content += 4 * 4
             return "MP_ROM_PTR(&%s)" % obj_name
         elif is_int_type(obj):
-            if config.MICROPY_LONGINT_IMPL == config.MICROPY_LONGINT_IMPL_NONE:
-                # TODO check if we can actually fit this long-int into a small-int
+            if mp_small_int_fits(obj):
+                # Encode directly as a small integer object.
+                return "MP_ROM_INT(%d)" % obj
+            elif config.MICROPY_LONGINT_IMPL == config.MICROPY_LONGINT_IMPL_NONE:
                 raise FreezeError(self, "target does not support long int")
             elif config.MICROPY_LONGINT_IMPL == config.MICROPY_LONGINT_IMPL_LONGLONG:
                 # TODO

From dfc6c6299c3ce3788412e054b8381d11283eb4a9 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 8 Apr 2022 13:07:25 +1000
Subject: [PATCH 1931/3533] tools/mpy-tool.py: Optimise freezing of empty str
 and bytes objects.

Signed-off-by: Damien George <damien@micropython.org>
---
 tools/mpy-tool.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/tools/mpy-tool.py b/tools/mpy-tool.py
index 17dd8704aebcb..6a769f7b4070a 100755
--- a/tools/mpy-tool.py
+++ b/tools/mpy-tool.py
@@ -621,6 +621,11 @@ def freeze_constant_obj(self, obj_name, obj):
         elif obj is Ellipsis:
             return "MP_ROM_PTR(&mp_const_ellipsis_obj)"
         elif is_str_type(obj) or is_bytes_type(obj):
+            if len(obj) == 0:
+                if is_str_type(obj):
+                    return "MP_ROM_QSTR(MP_QSTR_)"
+                else:
+                    return "MP_ROM_PTR(&mp_const_empty_bytes_obj)"
             if is_str_type(obj):
                 obj = bytes_cons(obj, "utf8")
                 obj_type = "mp_type_str"

From e647966fc919cc4519b84a36960e983f70b4cdca Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 8 Apr 2022 14:04:21 +1000
Subject: [PATCH 1932/3533] tools/mpy-tool.py: Make global qstr list a
 dedicated class.

Signed-off-by: Damien George <damien@micropython.org>
---
 tools/mpy-tool.py | 63 ++++++++++++++++++++++++++---------------------
 1 file changed, 35 insertions(+), 28 deletions(-)

diff --git a/tools/mpy-tool.py b/tools/mpy-tool.py
index 6a769f7b4070a..e3a812ebe0596 100755
--- a/tools/mpy-tool.py
+++ b/tools/mpy-tool.py
@@ -91,19 +91,6 @@ class Config:
 config = Config()
 
 
-class QStrType:
-    def __init__(self, str):
-        self.str = str
-        self.qstr_esc = qstrutil.qstr_escape(self.str)
-        self.qstr_id = "MP_QSTR_" + self.qstr_esc
-
-
-# Initialise global list of qstrs with static qstrs
-global_qstrs = [None]  # MP_QSTRnull should never be referenced
-for n in qstrutil.static_qstr_list:
-    global_qstrs.append(QStrType(n))
-
-
 MP_CODE_BYTECODE = 2
 MP_CODE_NATIVE_PY = 3
 MP_CODE_NATIVE_VIPER = 4
@@ -469,6 +456,29 @@ def local_read_byte():
     )
 
 
+class QStrType:
+    def __init__(self, str):
+        self.str = str
+        self.qstr_esc = qstrutil.qstr_escape(self.str)
+        self.qstr_id = "MP_QSTR_" + self.qstr_esc
+
+
+class GlobalQStrList:
+    def __init__(self):
+        # Initialise global list of qstrs with static qstrs
+        self.qstrs = [None]  # MP_QSTRnull should never be referenced
+        for n in qstrutil.static_qstr_list:
+            self.qstrs.append(QStrType(n))
+
+    def add(self, s):
+        q = QStrType(s)
+        self.qstrs.append(q)
+        return q
+
+    def get_by_index(self, i):
+        return self.qstrs[i]
+
+
 class MPFunTable:
     def __repr__(self):
         return "mp_fun_table"
@@ -496,10 +506,6 @@ def __init__(
         self.raw_code = raw_code
         self.escaped_name = escaped_name
 
-    def _unpack_qstr(self, ip):
-        qst = self.bytecode[ip] | self.bytecode[ip + 1] << 8
-        return global_qstrs[qst]
-
     def hexdump(self):
         with open(self.mpy_source_file, "rb") as f:
             WIDTH = 16
@@ -1077,8 +1083,7 @@ def freeze(self):
             if qi < len(self.qstr_links) and i == self.qstr_links[qi][0]:
                 # link qstr
                 qi_off, qi_kind, qi_val = self.qstr_links[qi]
-                qst = global_qstrs[qi_val].qstr_id
-                i += self._link_qstr(i, qi_kind, qst)
+                i += self._link_qstr(i, qi_kind, qi_val.qstr_id)
                 qi += 1
             else:
                 # copy machine code (max 16 bytes)
@@ -1139,17 +1144,15 @@ def read_qstr(reader, segments):
     ln = reader.read_uint()
     if ln & 1:
         # static qstr
-        segments.append(
-            MPYSegment(MPYSegment.META, global_qstrs[ln >> 1].str, start_pos, start_pos)
-        )
-        return ln >> 1
+        q = global_qstrs.get_by_index(ln >> 1)
+        segments.append(MPYSegment(MPYSegment.META, q.str, start_pos, start_pos))
+        return q
     ln >>= 1
     start_pos = reader.tell()
     data = str_cons(reader.read_bytes(ln), "utf8")
     reader.read_byte()  # read and discard null terminator
     segments.append(MPYSegment(MPYSegment.QSTR, data, start_pos, reader.tell()))
-    global_qstrs.append(QStrType(data))
-    return len(global_qstrs) - 1
+    return global_qstrs.add(data)
 
 
 def read_obj(reader, segments):
@@ -1304,8 +1307,7 @@ def read_mpy(filename):
         # Read qstrs and construct qstr table.
         qstr_table = []
         for i in range(n_qstr):
-            q = read_qstr(reader, segments)
-            qstr_table.append(global_qstrs[q])
+            qstr_table.append(read_qstr(reader, segments))
 
         # Read objects and construct object table.
         obj_table = []
@@ -1345,7 +1347,7 @@ def disassemble_mpy(compiled_modules):
 def freeze_mpy(base_qstrs, compiled_modules):
     # add to qstrs
     new = {}
-    for q in global_qstrs:
+    for q in global_qstrs.qstrs:
         # don't add duplicates
         if q is None or q.qstr_esc in base_qstrs or q.qstr_esc in new:
             continue
@@ -1587,6 +1589,8 @@ def merge_mpy(raw_codes, output_file):
 
 
 def main():
+    global global_qstrs
+
     import argparse
 
     cmd_parser = argparse.ArgumentParser(description="A tool to work with MicroPython .mpy files.")
@@ -1637,6 +1641,9 @@ def main():
         config.MICROPY_QSTR_BYTES_IN_HASH = 1
         base_qstrs = list(qstrutil.static_qstr_list)
 
+    # Create initial list of global qstrs.
+    global_qstrs = GlobalQStrList()
+
     # Load all .mpy files.
     try:
         compiled_modules = [read_mpy(file) for file in args.files]

From 40d431d1bbb7928ab399bf892e90cf232a83e2b9 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 8 Apr 2022 14:05:23 +1000
Subject: [PATCH 1933/3533] tools/mpy-tool.py: Optimise freezing of str when
 str data is a qstr.

Signed-off-by: Damien George <damien@micropython.org>
---
 tools/mpy-tool.py | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/tools/mpy-tool.py b/tools/mpy-tool.py
index e3a812ebe0596..f4a8ef6420f20 100755
--- a/tools/mpy-tool.py
+++ b/tools/mpy-tool.py
@@ -478,6 +478,12 @@ def add(self, s):
     def get_by_index(self, i):
         return self.qstrs[i]
 
+    def find_by_str(self, s):
+        for q in self.qstrs:
+            if q is not None and q.str == s:
+                return q
+        return None
+
 
 class MPFunTable:
     def __repr__(self):
@@ -633,6 +639,9 @@ def freeze_constant_obj(self, obj_name, obj):
                 else:
                     return "MP_ROM_PTR(&mp_const_empty_bytes_obj)"
             if is_str_type(obj):
+                q = global_qstrs.find_by_str(obj)
+                if q:
+                    return "MP_ROM_QSTR(%s)" % q.qstr_id
                 obj = bytes_cons(obj, "utf8")
                 obj_type = "mp_type_str"
             else:

From 07f526067e207f23529b4f2234baffd74ce1f35c Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 8 Apr 2022 14:09:08 +1000
Subject: [PATCH 1934/3533] tools/mpy-tool.py: Intern more strings when
 freezing.

Signed-off-by: Damien George <damien@micropython.org>
---
 tools/mpy-tool.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/tools/mpy-tool.py b/tools/mpy-tool.py
index f4a8ef6420f20..3ebbdd11042ab 100755
--- a/tools/mpy-tool.py
+++ b/tools/mpy-tool.py
@@ -62,6 +62,11 @@ def hexlify_to_str(b):
 sys.path.append(sys.path[0] + "/../py")
 import makeqstrdata as qstrutil
 
+# Threshold of str length below which it will be turned into a qstr when freezing.
+# This helps to reduce frozen code size because qstrs are more efficient to encode
+# as objects than full mp_obj_str_t instances.
+PERSISTENT_STR_INTERN_THRESHOLD = 25
+
 
 class MPYReadError(Exception):
     def __init__(self, filename, msg):
@@ -1187,6 +1192,9 @@ def read_obj(reader, segments):
             reader.read_byte()  # read and discard null terminator
         if obj_type == MP_PERSISTENT_OBJ_STR:
             obj = str_cons(buf, "utf8")
+            if len(obj) < PERSISTENT_STR_INTERN_THRESHOLD:
+                if not global_qstrs.find_by_str(obj):
+                    global_qstrs.add(obj)
         elif obj_type == MP_PERSISTENT_OBJ_BYTES:
             obj = buf
         elif obj_type == MP_PERSISTENT_OBJ_INT:

From 865b61dac205fe10150e8c4a38411470b4eb82f4 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 11 Apr 2022 23:34:37 +1000
Subject: [PATCH 1935/3533] tests/micropython: Add tests that const tuples
 don't use the heap.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/micropython/heapalloc.py     | 8 ++++++++
 tests/micropython/heapalloc.py.exp | 4 ++++
 2 files changed, 12 insertions(+)

diff --git a/tests/micropython/heapalloc.py b/tests/micropython/heapalloc.py
index 99f157105daa9..e19f8d0255deb 100644
--- a/tests/micropython/heapalloc.py
+++ b/tests/micropython/heapalloc.py
@@ -33,6 +33,10 @@ def f3(a, b, c, d):
     print(x1, x3, x5, x7, x2 + x4 + x6 + x8)
 
 
+def f4():
+    return True, b"bytes", ()
+
+
 global_var = 1
 
 
@@ -45,7 +49,11 @@ def test():
         f1(a=i)  # keyword arguments
         f2(i)  # default arg (second one)
         f2(i, i)  # 2 args
+    f1((1, "two", (b"three",)))  # use a constant tuple
     f3(1, 2, 3, 4)  # function with lots of local state
+    for i in 1, "two":  # iterate over constant tuple
+        print(i)
+    print(f4())  # returns a constant tuple
 
 
 # call test() with heap allocation disabled
diff --git a/tests/micropython/heapalloc.py.exp b/tests/micropython/heapalloc.py.exp
index c8cffe183f074..b8580edc61c05 100644
--- a/tests/micropython/heapalloc.py.exp
+++ b/tests/micropython/heapalloc.py.exp
@@ -8,4 +8,8 @@
 1
 1 2
 1 1
+(1, 'two', (b'three',))
 1 2 3 4 10
+1
+two
+(True, b'bytes', ())

From 9ab66b50cb0f15dab9c935324751edb638144099 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 11 Apr 2022 23:40:42 +1000
Subject: [PATCH 1936/3533] docs/reference: Update constrained docs now that
 tuples can be const.

Signed-off-by: Damien George <damien@micropython.org>
---
 docs/reference/constrained.rst | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/docs/reference/constrained.rst b/docs/reference/constrained.rst
index 816a20f9da80e..8d3ba0e3af46b 100644
--- a/docs/reference/constrained.rst
+++ b/docs/reference/constrained.rst
@@ -126,8 +126,9 @@ that the objects remain in flash memory rather than being copied to RAM. The
 Python built-in types.
 
 When considering the implications of frozen bytecode, note that in Python
-strings, floats, bytes, integers and complex numbers are immutable. Accordingly
-these will be frozen into flash. Thus, in the line
+strings, floats, bytes, integers, complex numbers and tuples are immutable.
+Accordingly these will be frozen into flash (for tuples, only if all their
+elements are immutable). Thus, in the line
 
 .. code::
 
@@ -146,16 +147,16 @@ As in the string example, at runtime a reference to the arbitrarily large
 integer is assigned to the variable ``bar``. That reference occupies a
 single machine word.
 
-It might be expected that tuples of integers could be employed for the purpose
-of storing constant data with minimal RAM use. With the current compiler this
-is ineffective (the code works, but RAM is not saved).
+Tuples of constant objects are themselves constant. Such constant tuples are
+optimised by the compiler so they do not need to be created at runtime each time
+they are used. For example:
 
 .. code::
 
-    foo = (1, 2, 3, 4, 5, 6, 100000)
+    foo = (1, 2, 3, 4, 5, 6, 100000, ("string", b"bytes", False, True))
 
-At runtime the tuple will be located in RAM. This may be subject to future
-improvement.
+This entire tuple will exist as a single object (potentially in flash if the
+code is frozen) and referenced each time it is needed.
 
 **Needless object creation**
 
@@ -214,7 +215,7 @@ buffer; this is both faster and more efficient in terms of memory fragmentation.
 
 **Bytes are smaller than ints**
 
-On most platforms an integer consumes four bytes. Consider the two calls to the
+On most platforms an integer consumes four bytes. Consider the three calls to the
 function ``foo()``:
 
 .. code::
@@ -222,12 +223,16 @@ function ``foo()``:
     def foo(bar):
         for x in bar:
             print(x)
+    foo([1, 2, 0xff])
     foo((1, 2, 0xff))
     foo(b'\1\2\xff')
 
-In the first call a tuple of integers is created in RAM. The second efficiently
+In the first call a `list` of integers is created in RAM each time the code is
+executed. The second call creates a constant `tuple` object (a `tuple` containing
+only constant objects) as part of the compilation phase, so it is only created
+once and is more efficient than the `list`. The third call efficiently
 creates a `bytes` object consuming the minimum amount of RAM. If the module
-were frozen as bytecode, the `bytes` object would reside in flash.
+were frozen as bytecode, both the `tuple` and `bytes` object would reside in flash.
 
 **Strings Versus Bytes**
 

From b50fe9a6da13bc14cd3fcdba87d715f406d5c913 Mon Sep 17 00:00:00 2001
From: Chris Wilson <christopher.david.wilson@gmail.com>
Date: Tue, 1 Mar 2022 14:29:48 -0800
Subject: [PATCH 1937/3533] stm32/boards/SPARKFUN_MICROMOD_STM32: Fix incorrect
 UART and I2C config.

Based on testing with real hardware.
---
 .../SPARKFUN_MICROMOD_STM32/mpconfigboard.h   | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/ports/stm32/boards/SPARKFUN_MICROMOD_STM32/mpconfigboard.h b/ports/stm32/boards/SPARKFUN_MICROMOD_STM32/mpconfigboard.h
index 0c451a4dbb5e6..51fedc33f9ad7 100644
--- a/ports/stm32/boards/SPARKFUN_MICROMOD_STM32/mpconfigboard.h
+++ b/ports/stm32/boards/SPARKFUN_MICROMOD_STM32/mpconfigboard.h
@@ -63,25 +63,25 @@ extern struct _spi_bdev_t spi_bdev;
 #define MICROPY_HW_RTC_USE_US (0)
 #define MICROPY_HW_RTC_USE_CALOUT (1)
 
-// UART1 config (MicroMod UART1)
-#define MICROPY_HW_UART1_NAME "UART1"
-#define MICROPY_HW_UART1_TX (pin_A2)
-#define MICROPY_HW_UART1_RX (pin_A3)
+// UART2 config (MicroMod UART1)
+#define MICROPY_HW_UART2_NAME "UART1"
+#define MICROPY_HW_UART2_TX (pin_A2)
+#define MICROPY_HW_UART2_RX (pin_A3)
 
 // CAN1 config (MicroMod CAN)
 #define MICROPY_HW_CAN1_NAME "CAN"
 #define MICROPY_HW_CAN1_TX (pin_B9)
 #define MICROPY_HW_CAN1_RX (pin_B8)
 
-// I2C1 config (MicroMod I2C)
-#define MICROPY_HW_I2C1_NAME "I2C"
-#define MICROPY_HW_I2C1_SCL (pin_B10)
-#define MICROPY_HW_I2C1_SDA (pin_B11)
+// I2C1 config (MicroMod I2C1)
+#define MICROPY_HW_I2C1_NAME "I2C1"
+#define MICROPY_HW_I2C1_SCL (pin_B6)
+#define MICROPY_HW_I2C1_SDA (pin_B7)
 
-// I2C2 config (MicroMod I2C1)
-#define MICROPY_HW_I2C2_NAME "I2C1"
-#define MICROPY_HW_I2C2_SCL (pin_B6)
-#define MICROPY_HW_I2C2_SDA (pin_B7)
+// I2C2 config (MicroMod I2C)
+#define MICROPY_HW_I2C2_NAME "I2C"
+#define MICROPY_HW_I2C2_SCL (pin_B10)
+#define MICROPY_HW_I2C2_SDA (pin_B11)
 
 // SPI1 config (MicroMod SPI)
 #define MICROPY_HW_SPI1_NAME "SPI"

From 71afed1a70d1b783d104d29878be3c44fae7cbcf Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Wed, 13 Apr 2022 16:54:01 +0200
Subject: [PATCH 1938/3533] stm32/mphalport: Fix I/O glitches when switching
 GPIO mode to alt-func.

To avoid any I/O glitches in mp_hal_pin_config, make sure a valid alternate
function is set in AFR first before switching the pin mode.  When switching
from AF to INPUT or OUTPUT, the AF in AFR will remain valid up until the
pin mode is switched.
---
 ports/stm32/mphalport.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/ports/stm32/mphalport.c b/ports/stm32/mphalport.c
index 2025388413fa6..9961c3d998347 100644
--- a/ports/stm32/mphalport.c
+++ b/ports/stm32/mphalport.c
@@ -114,6 +114,12 @@ void mp_hal_pin_config(mp_hal_pin_obj_t pin_obj, uint32_t mode, uint32_t pull, u
     GPIO_TypeDef *gpio = pin_obj->gpio;
     uint32_t pin = pin_obj->pin;
     mp_hal_gpio_clock_enable(gpio);
+    if (mode == MP_HAL_PIN_MODE_ALT || mode == MP_HAL_PIN_MODE_ALT_OPEN_DRAIN) {
+        // To avoid any I/O glitches, make sure a valid alternate function is set in
+        // AFR first before switching the pin mode. When switching from AF to INPUT or
+        // OUTPUT, the AF in AFR will remain valid up until the pin mode is switched.
+        gpio->AFR[pin >> 3] = (gpio->AFR[pin >> 3] & ~(15 << (4 * (pin & 7)))) | (alt << (4 * (pin & 7)));
+    }
     gpio->MODER = (gpio->MODER & ~(3 << (2 * pin))) | ((mode & 3) << (2 * pin));
     #if defined(GPIO_ASCR_ASC0)
     // The L4 has a special analog switch to connect the GPIO to the ADC
@@ -124,7 +130,6 @@ void mp_hal_pin_config(mp_hal_pin_obj_t pin_obj, uint32_t mode, uint32_t pull, u
     #endif
     gpio->OSPEEDR = (gpio->OSPEEDR & ~(3 << (2 * pin))) | (2 << (2 * pin)); // full speed
     gpio->PUPDR = (gpio->PUPDR & ~(3 << (2 * pin))) | (pull << (2 * pin));
-    gpio->AFR[pin >> 3] = (gpio->AFR[pin >> 3] & ~(15 << (4 * (pin & 7)))) | (alt << (4 * (pin & 7)));
 }
 
 bool mp_hal_pin_config_alt(mp_hal_pin_obj_t pin, uint32_t mode, uint32_t pull, uint8_t fn, uint8_t unit) {

From 03c61916bc4c8ccaa28210ed4b848effc2036b4e Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Sun, 17 Apr 2022 15:17:57 +0200
Subject: [PATCH 1939/3533] stm32/boards/ADAFRUIT_F405_EXPRESS: Use external
 SPI flash for storage.

Fixes issue #8553.
---
 .../stm32/boards/ADAFRUIT_F405_EXPRESS/bdev.c | 28 +++++++++++++++++
 .../ADAFRUIT_F405_EXPRESS/mpconfigboard.h     | 31 +++++++++++++++++--
 2 files changed, 56 insertions(+), 3 deletions(-)
 create mode 100644 ports/stm32/boards/ADAFRUIT_F405_EXPRESS/bdev.c

diff --git a/ports/stm32/boards/ADAFRUIT_F405_EXPRESS/bdev.c b/ports/stm32/boards/ADAFRUIT_F405_EXPRESS/bdev.c
new file mode 100644
index 0000000000000..402d5b83a97bc
--- /dev/null
+++ b/ports/stm32/boards/ADAFRUIT_F405_EXPRESS/bdev.c
@@ -0,0 +1,28 @@
+#include "py/obj.h"
+#include "storage.h"
+#include "spi.h"
+
+#if !MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE
+
+STATIC const spi_proto_cfg_t spi_bus = {
+    .spi = &spi_obj[0], // SPI1
+    .baudrate = 25000000,
+    .polarity = 0,
+    .phase = 0,
+    .bits = 8,
+    .firstbit = SPI_FIRSTBIT_MSB,
+};
+
+STATIC mp_spiflash_cache_t spi_bdev_cache;
+
+const mp_spiflash_config_t spiflash_config = {
+    .bus_kind = MP_SPIFLASH_BUS_SPI,
+    .bus.u_spi.cs = MICROPY_HW_SPIFLASH_CS,
+    .bus.u_spi.data = (void *)&spi_bus,
+    .bus.u_spi.proto = &spi_proto,
+    .cache = &spi_bdev_cache,
+};
+
+spi_bdev_t spi_bdev;
+
+#endif
diff --git a/ports/stm32/boards/ADAFRUIT_F405_EXPRESS/mpconfigboard.h b/ports/stm32/boards/ADAFRUIT_F405_EXPRESS/mpconfigboard.h
index afa81a5ba0938..edf1e6c237e61 100644
--- a/ports/stm32/boards/ADAFRUIT_F405_EXPRESS/mpconfigboard.h
+++ b/ports/stm32/boards/ADAFRUIT_F405_EXPRESS/mpconfigboard.h
@@ -11,6 +11,7 @@
 #define MICROPY_HW_ENABLE_DAC       (1)
 #define MICROPY_HW_ENABLE_USB       (1)
 #define MICROPY_HW_ENABLE_SDCARD    (1)
+#define MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE (0)
 
 // HSE is 12MHz
 #define MICROPY_HW_CLK_PLLM (12)
@@ -24,6 +25,30 @@
 #define MICROPY_HW_RTC_USE_US       (0)
 #define MICROPY_HW_RTC_USE_CALOUT   (1)
 
+// External SPI Flash config
+#if !MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE
+
+#define MICROPY_HW_SPIFLASH_SIZE_BITS (16 * 1024 * 1024) // 16 Mbit (2 MByte)
+
+#define MICROPY_HW_SPIFLASH_CS      (MICROPY_HW_SPI1_NSS)
+#define MICROPY_HW_SPIFLASH_SCK     (MICROPY_HW_SPI1_SCK)
+#define MICROPY_HW_SPIFLASH_MISO    (MICROPY_HW_SPI1_MISO)
+#define MICROPY_HW_SPIFLASH_MOSI    (MICROPY_HW_SPI1_MOSI)
+
+extern const struct _mp_spiflash_config_t spiflash_config;
+extern struct _spi_bdev_t spi_bdev;
+#define MICROPY_HW_SPIFLASH_ENABLE_CACHE (1)
+#define MICROPY_HW_BDEV_IOCTL(op, arg) ( \
+    (op) == BDEV_IOCTL_NUM_BLOCKS ? (MICROPY_HW_SPIFLASH_SIZE_BITS / 8 / FLASH_BLOCK_SIZE) : \
+    (op) == BDEV_IOCTL_INIT ? spi_bdev_ioctl(&spi_bdev, (op), (uint32_t)&spiflash_config) : \
+    spi_bdev_ioctl(&spi_bdev, (op), (arg)) \
+)
+#define MICROPY_HW_BDEV_READBLOCKS(dest, bl, n) spi_bdev_readblocks(&spi_bdev, (dest), (bl), (n))
+#define MICROPY_HW_BDEV_WRITEBLOCKS(src, bl, n) spi_bdev_writeblocks(&spi_bdev, (src), (bl), (n))
+#define MICROPY_HW_BDEV_SPIFLASH_EXTENDED (&spi_bdev) // for extended block protocol
+
+#endif // !MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE
+
 // UART config
 #define MICROPY_HW_UART3_NAME   "UART3"    // on RX / TX
 #define MICROPY_HW_UART3_TX     (pin_B10)  // TX
@@ -50,9 +75,9 @@
 // SPI buses
 #define MICROPY_HW_SPI1_NAME "SPIFLASH"
 #define MICROPY_HW_SPI1_NSS  (pin_A15) // FLASH CS
-#define MICROPY_HW_SPI1_SCK  (pin_B3) // FLASH CLK
-#define MICROPY_HW_SPI1_MISO (pin_B4) // FLASH MISO
-#define MICROPY_HW_SPI1_MOSI (pin_B5) // FLASH MOSI
+#define MICROPY_HW_SPI1_SCK  (pin_B3)  // FLASH CLK
+#define MICROPY_HW_SPI1_MISO (pin_B4)  // FLASH MISO
+#define MICROPY_HW_SPI1_MOSI (pin_B5)  // FLASH MOSI
 #define MICROPY_HW_SPI2_NAME "SPI1"
 #define MICROPY_HW_SPI2_NSS  (pin_B12) // SD DETECT
 #define MICROPY_HW_SPI2_SCK  (pin_B13) // SCK

From 52c2580a403a8259eabcd1bd1f9911c0ac4efd4c Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Mon, 18 Apr 2022 21:04:36 +0200
Subject: [PATCH 1940/3533] drivers/ninaw10: Fix isconnected to return False
 when inactive.

If isconnected is called before active, it returns -1, which causes
mp_obj_new_bool return True, indicating the module is connected.
---
 drivers/ninaw10/nina_wifi_drv.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/drivers/ninaw10/nina_wifi_drv.c b/drivers/ninaw10/nina_wifi_drv.c
index 1ad77218b6505..e811650b95c55 100644
--- a/drivers/ninaw10/nina_wifi_drv.c
+++ b/drivers/ninaw10/nina_wifi_drv.c
@@ -469,11 +469,7 @@ int nina_disconnect(void) {
 }
 
 int nina_isconnected(void) {
-    int status = nina_connection_status();
-    if (status == -1) {
-        return -1;
-    }
-    return status == NINA_STATUS_CONNECTED;
+    return nina_connection_status() == NINA_STATUS_CONNECTED;
 }
 
 int nina_connected_sta(uint32_t *sta_ip) {

From 1ded8a2977a84777f339ea7e7c788b11d75a6cce Mon Sep 17 00:00:00 2001
From: Jon Bjarni Bjarnason <jbbjarnason@gmail.com>
Date: Tue, 12 Apr 2022 22:17:38 +0000
Subject: [PATCH 1941/3533] py/objtype: Convert result of user __contains__
 method to bool.

Per https://docs.python.org/3/reference/expressions.html#membership-test-operations

    For user-defined classes which define the contains() method, x in y
    returns True if y.contains(x) returns a true value, and False
    otherwise.

Fixes issue #7884.
---
 py/objtype.c                   |  1 +
 tests/basics/class_contains.py | 24 ++++++++++++++++++++++++
 2 files changed, 25 insertions(+)

diff --git a/py/objtype.c b/py/objtype.c
index 0977a67cedc58..e320adc8bb330 100644
--- a/py/objtype.c
+++ b/py/objtype.c
@@ -549,6 +549,7 @@ retry:;
     } else if (dest[0] != MP_OBJ_NULL) {
         dest[2] = rhs_in;
         res = mp_call_method_n_kw(1, 0, dest);
+        res = op == MP_BINARY_OP_CONTAINS ? mp_obj_new_bool(mp_obj_is_true(res)) : res;
     } else {
         // If this was an inplace method, fallback to normal method
         // https://docs.python.org/3/reference/datamodel.html#object.__iadd__ :
diff --git a/tests/basics/class_contains.py b/tests/basics/class_contains.py
index b6dd3661cde90..5fdb1db4c0423 100644
--- a/tests/basics/class_contains.py
+++ b/tests/basics/class_contains.py
@@ -21,3 +21,27 @@ def __contains__(self, key):
 print(1 in b)
 print(2 in b)
 print(3 in b)
+
+
+class C:
+    def __contains__(self, arg):
+        return arg
+
+
+print(C().__contains__(0))
+print(C().__contains__(1))
+print(C().__contains__(''))
+print(C().__contains__('foo'))
+print(C().__contains__(None))
+
+print(0 in C())
+print(1 in C())
+print('' in C())
+print('foo' in C())
+print(None in C())
+
+print(0 not in C())
+print(1 not in C())
+print('' not in C())
+print('foo' not in C())
+print(None not in C())

From 707aaa350aee6e52dd0b9ee87e962aedad052081 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 19 Apr 2022 11:35:48 +1000
Subject: [PATCH 1942/3533] stm32/boards/LEGO_HUB_NO6: Exclude BTstack code
 from formatting.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/boards/LEGO_HUB_NO6/bluetooth_init_cc2564C_1.5.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ports/stm32/boards/LEGO_HUB_NO6/bluetooth_init_cc2564C_1.5.c b/ports/stm32/boards/LEGO_HUB_NO6/bluetooth_init_cc2564C_1.5.c
index b185b579f87c6..61cd153fcff5b 100644
--- a/ports/stm32/boards/LEGO_HUB_NO6/bluetooth_init_cc2564C_1.5.c
+++ b/ports/stm32/boards/LEGO_HUB_NO6/bluetooth_init_cc2564C_1.5.c
@@ -1,8 +1,10 @@
+// *FORMAT-OFF*
+
 // This file contains CC256x initialisation code, and was generated by BTstack via:
 //  $ cd chipset/cc256x
 //  $ make -f Makefile.inc BTSTACK_ROOT=../.. bluetooth_init_cc2564C_1.4.c
 #if !BUILDING_MBOOT
- 
+
  // init script created from
 // - CC256XC_BT_SP/v1.5/initscripts-TIInit_6.12.26.bts
 // - AKA TIInit_6.12.26.bts

From 71a64545a8d12edb730757673a728a3d56f225d5 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 20 Apr 2022 16:01:11 +1000
Subject: [PATCH 1943/3533] tools/codeformat.py: Remove ports/unix/*.py from
 exclusion list.

These .py files were removed from the .gitignore in commit
3c2aa5ff93a3b12723c7ca794aa9c583891c349b

Signed-off-by: Damien George <damien@micropython.org>
---
 tools/codeformat.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/tools/codeformat.py b/tools/codeformat.py
index 04cce1d830356..03a56d33deef3 100755
--- a/tools/codeformat.py
+++ b/tools/codeformat.py
@@ -62,8 +62,6 @@
 EXCLUSIONS = [
     # STM32 build includes generated Python code.
     "ports/*/build*",
-    # gitignore in ports/unix ignores *.py, so also do it here.
-    "ports/unix/*.py",
     # not real python files
     "tests/**/repl_*.py",
     # needs careful attention before applying automatic formatting

From fb10d15d4745da87670b06f2bfea14aaa7e7ae90 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 19 Apr 2022 11:36:07 +1000
Subject: [PATCH 1944/3533] tools/codeformat.py: Include more ports .c/.h files
 in formatting.

This adds a rule to cover all ports/**/*.[ch] file to the code formatting
list.  Explicit exclusions are also added for code in ports/ which is third
party, or which requires a lot of reformatting.

Signed-off-by: Damien George <damien@micropython.org>
---
 tools/codeformat.py | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/tools/codeformat.py b/tools/codeformat.py
index 03a56d33deef3..1c865663a495c 100755
--- a/tools/codeformat.py
+++ b/tools/codeformat.py
@@ -44,22 +44,37 @@
     "shared/timeutils/*.[ch]",
     "shared/runtime/*.[ch]",
     "mpy-cross/*.[ch]",
-    "ports/*/*.[ch]",
-    "ports/windows/msvc/**/*.[ch]",
-    "ports/nrf/modules/nrf/*.[ch]",
+    "ports/**/*.[ch]",
     "py/*.[ch]",
     # Python
     "drivers/**/*.py",
     "examples/**/*.py",
     "extmod/**/*.py",
     "ports/**/*.py",
-    "ports/mimxrt/**/*.[ch]",
     "py/**/*.py",
     "tools/**/*.py",
     "tests/**/*.py",
 ]
 
 EXCLUSIONS = [
+    # The cc3200 port is not fully formatted yet.
+    "ports/cc3200/*/*.[ch]",
+    # The nrf port is not fully formatted yet.
+    "ports/nrf/boards/*.[ch]",
+    "ports/nrf/device/*.[ch]",
+    "ports/nrf/drivers/*.[ch]",
+    "ports/nrf/modules/ble/*.[ch]",
+    "ports/nrf/modules/board/*.[ch]",
+    "ports/nrf/modules/machine/*.[ch]",
+    "ports/nrf/modules/music/*.[ch]",
+    "ports/nrf/modules/ubluepy/*.[ch]",
+    "ports/nrf/modules/uos/*.[ch]",
+    "ports/nrf/modules/utime/*.[ch]",
+    # STM32 USB dev/host code is mostly 3rd party.
+    "ports/stm32/usbdev/**/*.[ch]",
+    "ports/stm32/usbhost/**/*.[ch]",
+    # Teensy core code is 3rd party.
+    "ports/teensy/core/*.[ch]",
     # STM32 build includes generated Python code.
     "ports/*/build*",
     # not real python files

From 5c32111fa0e31e451b0f1666bdf926be2fdfd82c Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 19 Apr 2022 11:41:41 +1000
Subject: [PATCH 1945/3533] ports: Reformat more C and Python source code.

These files that are reformatted only now fall under the list of files to
apply uncrustify/black formatting to.

Signed-off-by: Damien George <damien@micropython.org>
---
 .../mpconfigboard.h                           |   2 +-
 ports/rp2/boards/PICO/mpconfigboard.h         |   4 +-
 .../mpconfigboard.h                           |   2 +-
 .../ADAFRUIT_F405_EXPRESS/mpconfigboard.h     |   2 +-
 ports/stm32/boards/CERB40/mpconfigboard.h     |   4 +-
 .../mpconfigboard.h                           |   6 +-
 .../LEGO_HUB_NO6/bluetooth_init_cc2564C_1.5.c |   2 +-
 ports/stm32/boards/LEGO_HUB_NO6/hub_display.c |   4 +-
 ports/stm32/boards/LIMIFROG/board_init.c      |  62 +++---
 .../stm32/boards/MIKROE_QUAIL/mpconfigboard.h |   4 +-
 .../stm32/boards/NETDUINO_PLUS_2/board_init.c |   4 +-
 .../boards/NUCLEO_F091RC/mpconfigboard.h      |   4 +-
 .../boards/NUCLEO_G474RE/mpconfigboard.h      |  46 ++--
 ports/stm32/boards/NUCLEO_WB55/mboot_keys.h   |   2 +-
 ports/stm32/boards/PYBD_SF2/bdev.c            |   2 +-
 ports/stm32/boards/PYBD_SF2/board_init.c      |   2 +-
 ports/stm32/boards/PYBD_SF2/mpconfigboard.h   |   2 +-
 .../boards/SPARKFUN_MICROMOD_STM32/bdev.c     |   2 +-
 .../SPARKFUN_MICROMOD_STM32/board_init.c      |   4 +-
 .../SPARKFUN_MICROMOD_STM32/mpconfigboard.h   |   2 +-
 .../boards/STM32F411DISC/mpconfigboard.h      |   4 +-
 .../boards/STM32F429DISC/mpconfigboard.h      |  24 +-
 ports/stm32/boards/STM32F439/mpconfigboard.h  |  33 ++-
 .../boards/STM32F769DISC/mpconfigboard.h      |   2 +-
 ports/stm32/boards/STM32L476DISC/bdev.c       |   2 +-
 .../boards/STM32L476DISC/mpconfigboard.h      |   2 +-
 ports/stm32/boards/VCC_GND_F407VE/bdev.c      |   2 +-
 .../boards/VCC_GND_F407VE/mpconfigboard.h     |   2 +-
 ports/stm32/boards/VCC_GND_F407ZG/bdev.c      |   2 +-
 .../boards/VCC_GND_F407ZG/mpconfigboard.h     |   2 +-
 ports/stm32/boards/stm32f4xx_prefix.c         |  42 ++--
 ports/stm32/mbedtls/mbedtls_config.h          |   2 +-
 ports/stm32/mbedtls/mbedtls_port.c            |   8 +-
 ports/stm32/mboot/main.c                      | 102 ++++-----
 ports/stm32/mboot/mphalport.h                 | 206 +++++++++---------
 ports/stm32/mboot/pack.c                      |   2 +-
 ports/stm32/mboot/vfs_fat.c                   |   8 +-
 ports/stm32/mboot/vfs_lfs.c                   |  12 +-
 .../unix/variants/coverage/frzmpy/frzmpy1.py  |   2 +-
 .../coverage/frzmpy/frzmpy_pkg1/__init__.py   |   2 +-
 .../coverage/frzmpy/frzmpy_pkg2/mod.py        |   4 +-
 .../unix/variants/coverage/frzstr/frzstr1.py  |   2 +-
 .../coverage/frzstr/frzstr_pkg1/__init__.py   |   2 +-
 .../coverage/frzstr/frzstr_pkg2/mod.py        |   4 +-
 ports/unix/variants/manifest.py               |   4 +-
 ports/zephyr/src/zephyr_getchar.c             |   5 +-
 ports/zephyr/src/zephyr_start.c               |   6 +-
 47 files changed, 322 insertions(+), 328 deletions(-)

diff --git a/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/mpconfigboard.h b/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/mpconfigboard.h
index 57c2d7879eba6..25eca725ab526 100644
--- a/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/mpconfigboard.h
+++ b/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/mpconfigboard.h
@@ -1,4 +1,4 @@
-//Board config for Arduino Nano RP2040 Connect.
+// Board config for Arduino Nano RP2040 Connect.
 
 // Board and hardware specific configuration
 #define MICROPY_HW_BOARD_NAME           "Arduino Nano RP2040 Connect"
diff --git a/ports/rp2/boards/PICO/mpconfigboard.h b/ports/rp2/boards/PICO/mpconfigboard.h
index 0bab214e208af..fb7f8054aaa1a 100644
--- a/ports/rp2/boards/PICO/mpconfigboard.h
+++ b/ports/rp2/boards/PICO/mpconfigboard.h
@@ -1,6 +1,6 @@
 // Board and hardware specific configuration
 #define MICROPY_HW_BOARD_NAME                   "Raspberry Pi Pico"
-#define MICROPY_HW_FLASH_STORAGE_BYTES          (1408 * 1024) 
+#define MICROPY_HW_FLASH_STORAGE_BYTES          (1408 * 1024)
 
 // Enable USB Mass Storage with FatFS filesystem.
-//#define MICROPY_HW_USB_MSC  (1)
+// #define MICROPY_HW_USB_MSC  (1)
diff --git a/ports/samd/boards/ADAFRUIT_FEATHER_M0_EXPRESS/mpconfigboard.h b/ports/samd/boards/ADAFRUIT_FEATHER_M0_EXPRESS/mpconfigboard.h
index ba384645dbbd8..6d3b7987e39de 100644
--- a/ports/samd/boards/ADAFRUIT_FEATHER_M0_EXPRESS/mpconfigboard.h
+++ b/ports/samd/boards/ADAFRUIT_FEATHER_M0_EXPRESS/mpconfigboard.h
@@ -17,7 +17,7 @@
 // USART pin assignments: Tx=PA10=SERCOM0/PAD[2], Rx=PA11==SERCOM0/PAD[3]
 #define CPU_FREQ (48000000) // For selecting Baud from clock.
 #define MP_PIN_GRP 0 // A=0, B=1
-#define MP_TX_PIN 10 //'n'
+#define MP_TX_PIN 10 // 'n'
 #define MP_RX_PIN 11
 #define MP_PERIPHERAL_MUX 5 // 'n'th group of 2 pins
 #define USARTx SERCOM0 // SERCOM0: tx/rx
diff --git a/ports/stm32/boards/ADAFRUIT_F405_EXPRESS/mpconfigboard.h b/ports/stm32/boards/ADAFRUIT_F405_EXPRESS/mpconfigboard.h
index edf1e6c237e61..b0821b27594d8 100644
--- a/ports/stm32/boards/ADAFRUIT_F405_EXPRESS/mpconfigboard.h
+++ b/ports/stm32/boards/ADAFRUIT_F405_EXPRESS/mpconfigboard.h
@@ -42,7 +42,7 @@ extern struct _spi_bdev_t spi_bdev;
     (op) == BDEV_IOCTL_NUM_BLOCKS ? (MICROPY_HW_SPIFLASH_SIZE_BITS / 8 / FLASH_BLOCK_SIZE) : \
     (op) == BDEV_IOCTL_INIT ? spi_bdev_ioctl(&spi_bdev, (op), (uint32_t)&spiflash_config) : \
     spi_bdev_ioctl(&spi_bdev, (op), (arg)) \
-)
+    )
 #define MICROPY_HW_BDEV_READBLOCKS(dest, bl, n) spi_bdev_readblocks(&spi_bdev, (dest), (bl), (n))
 #define MICROPY_HW_BDEV_WRITEBLOCKS(src, bl, n) spi_bdev_writeblocks(&spi_bdev, (src), (bl), (n))
 #define MICROPY_HW_BDEV_SPIFLASH_EXTENDED (&spi_bdev) // for extended block protocol
diff --git a/ports/stm32/boards/CERB40/mpconfigboard.h b/ports/stm32/boards/CERB40/mpconfigboard.h
index 2f9199d4e02be..8a018264908e4 100644
--- a/ports/stm32/boards/CERB40/mpconfigboard.h
+++ b/ports/stm32/boards/CERB40/mpconfigboard.h
@@ -61,5 +61,5 @@
 
 // USB config
 #define MICROPY_HW_USB_FS (1)
-//#define MICROPY_HW_USB_VBUS_DETECT_PIN (pin_A9)
-//#define MICROPY_HW_USB_OTG_ID_PIN      (pin_A10)
+// #define MICROPY_HW_USB_VBUS_DETECT_PIN (pin_A9)
+// #define MICROPY_HW_USB_OTG_ID_PIN      (pin_A10)
diff --git a/ports/stm32/boards/GARATRONIC_PYBSTICK26_F411/mpconfigboard.h b/ports/stm32/boards/GARATRONIC_PYBSTICK26_F411/mpconfigboard.h
index 408bc28512bcd..31fc71a5a6096 100644
--- a/ports/stm32/boards/GARATRONIC_PYBSTICK26_F411/mpconfigboard.h
+++ b/ports/stm32/boards/GARATRONIC_PYBSTICK26_F411/mpconfigboard.h
@@ -30,8 +30,8 @@
 #define MICROPY_HW_UART2_NAME   "XA"
 #define MICROPY_HW_UART2_TX     (pin_A2)
 #define MICROPY_HW_UART2_RX     (pin_A3)
-//#define MICROPY_HW_UART2_RTS    (pin_A1)
-//#define MICROPY_HW_UART2_CTS    (pin_A0)
+// #define MICROPY_HW_UART2_RTS    (pin_A1)
+// #define MICROPY_HW_UART2_CTS    (pin_A0)
 #define MICROPY_HW_UART6_NAME   "YA"
 #define MICROPY_HW_UART6_TX     (pin_C6)
 #define MICROPY_HW_UART6_RX     (pin_C7)
@@ -41,7 +41,7 @@
 #define MICROPY_HW_I2C1_SCL (pin_B8) // S5
 #define MICROPY_HW_I2C1_SDA (pin_B9) // S3
 #define MICROPY_HW_I2C2_NAME "Y"
-#define MICROPY_HW_I2C2_SCL (pin_B10) //S13
+#define MICROPY_HW_I2C2_SCL (pin_B10) // S13
 #define MICROPY_HW_I2C2_SDA (pin_B3) // S11
 
 // SPI buses
diff --git a/ports/stm32/boards/LEGO_HUB_NO6/bluetooth_init_cc2564C_1.5.c b/ports/stm32/boards/LEGO_HUB_NO6/bluetooth_init_cc2564C_1.5.c
index 61cd153fcff5b..aa2ac521dbeea 100644
--- a/ports/stm32/boards/LEGO_HUB_NO6/bluetooth_init_cc2564C_1.5.c
+++ b/ports/stm32/boards/LEGO_HUB_NO6/bluetooth_init_cc2564C_1.5.c
@@ -530,7 +530,7 @@ const uint8_t cc256x_init_script[] = {
     0x00, 0x6d, 0x22, 0x08, 0x00, 0x69, 0x53, 0x08, 0x00, 0x50, 0x66, 0x08, 0x00, 0x54, 0x66, 
     0x08, 0x00, 0xd1, 0xa1, 0x04, 0x00, 0x5c, 0x66, 0x08, 0x00, 0xb3, 0x11, 0x08, 0x00, 0xe4, 
     0x15, 0x08, 0x00, 0x63, 0x66, 0x08, 0x00, 0x60, 0x66, 0x08, 0x00, 0x61, 0x66, 0x08, 0x00, 
-    
+
 
     0x01, 0x83, 0xff, 0x14, 0x79, 0x7b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
diff --git a/ports/stm32/boards/LEGO_HUB_NO6/hub_display.c b/ports/stm32/boards/LEGO_HUB_NO6/hub_display.c
index 1efc388c7723f..d5556be2d0a6e 100644
--- a/ports/stm32/boards/LEGO_HUB_NO6/hub_display.c
+++ b/ports/stm32/boards/LEGO_HUB_NO6/hub_display.c
@@ -30,7 +30,7 @@
 // Map pixel number 0-24, and 25-36 to TLC bit number.
 static const uint8_t hub_display_pixel_map[] = {
     // 5x5 display
-     9,  11,   6,   1,  14,
+    9,  11,   6,   1,  14,
     10,  19,   8,   0,  26,
     23,  18,   3,   2,  24,
     21,  20,  15,  13,  25,
@@ -61,7 +61,7 @@ static void hub_display_tim_init(void) {
     uint32_t reg = 6 << TIM_CCMR1_OC1M_Pos // PWM1 mode
         | 1 << TIM_CCMR1_OC1PE_Pos // preload enabled
         | 0 << TIM_CCMR1_CC1S_Pos // output mode
-        ;
+    ;
     uint32_t shift = 8 * (ch & 1);
     tim->CCMR1 = (tim->CCMR1 & ~(0xff << shift)) | reg << shift;
 
diff --git a/ports/stm32/boards/LIMIFROG/board_init.c b/ports/stm32/boards/LIMIFROG/board_init.c
index 67ccf23cc5874..1b4d9494fb927 100644
--- a/ports/stm32/boards/LIMIFROG/board_init.c
+++ b/ports/stm32/boards/LIMIFROG/board_init.c
@@ -40,23 +40,18 @@ void LIMIFROG_board_early_init(void) {
   #define   CONN_POS10_PORT     GPIOB
 #endif
 
-static inline void  GPIO_HIGH(GPIO_TypeDef* GPIOx, uint16_t GPIO_Pin)
-{
-       GPIOx->BSRR = (uint32_t)GPIO_Pin;
+static inline void  GPIO_HIGH(GPIO_TypeDef *GPIOx, uint16_t GPIO_Pin) {
+    GPIOx->BSRR = (uint32_t)GPIO_Pin;
 }
 
-static inline int  IS_GPIO_RESET(GPIO_TypeDef* GPIOx, uint16_t GPIO_Pin)
-{
+static inline int  IS_GPIO_RESET(GPIO_TypeDef *GPIOx, uint16_t GPIO_Pin) {
     GPIO_PinState bitstatus;
-      if((GPIOx->IDR & GPIO_Pin) != (uint32_t)GPIO_PIN_RESET)
-            {
-                    bitstatus = GPIO_PIN_SET;
-                      }
-        else
-              {
-                      bitstatus = GPIO_PIN_RESET;
-                        }
-          return (bitstatus==GPIO_PIN_RESET);
+    if ((GPIOx->IDR & GPIO_Pin) != (uint32_t)GPIO_PIN_RESET) {
+        bitstatus = GPIO_PIN_SET;
+    } else {
+        bitstatus = GPIO_PIN_RESET;
+    }
+    return bitstatus == GPIO_PIN_RESET;
 }
 
 /**************************************************************
@@ -94,15 +89,14 @@ static inline int  IS_GPIO_RESET(GPIO_TypeDef* GPIOx, uint16_t GPIO_Pin)
 
   ********************************************************************/
 
-static void LBF_DFU_If_Needed(void)
-{
+static void LBF_DFU_If_Needed(void) {
 
 
- GPIO_InitTypeDef GPIO_InitStruct;
+    GPIO_InitTypeDef GPIO_InitStruct;
 
 
-   // Initialize and assert pin BTLE_RST
-   // (hw reset to BLE module, so it won't drive UART3)
+    // Initialize and assert pin BTLE_RST
+    // (hw reset to BLE module, so it won't drive UART3)
 
     __HAL_RCC_GPIOC_CLK_ENABLE();
     GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
@@ -114,11 +108,11 @@ static void LBF_DFU_If_Needed(void)
     GPIO_HIGH(BT_RST_PORT, BT_RST_PIN); // assert BTLE reset
 
 
- /* -- Bootloader will be called if position 10 on the extension port
-       is actively pulled low -- */
-       // Note - this is an arbitrary choice, code could be modified to
-       // monitor another GPIO of the STM32 and/or decide that active level
-       // is high rather than low
+    /* -- Bootloader will be called if position 10 on the extension port
+          is actively pulled low -- */
+    // Note - this is an arbitrary choice, code could be modified to
+    // monitor another GPIO of the STM32 and/or decide that active level
+    // is high rather than low
 
 
     // Initialize Extension Port Position 10 = PB8 (bears I2C1_SCL)
@@ -131,24 +125,22 @@ static void LBF_DFU_If_Needed(void)
     HAL_GPIO_Init(CONN_POS10_PORT, &GPIO_InitStruct);
 
     // If selection pin pulled low...
-    if ( IS_GPIO_RESET(CONN_POS10_PORT, CONN_POS10_PIN ))
-
-    {
+    if (IS_GPIO_RESET(CONN_POS10_PORT, CONN_POS10_PIN)) {
         // Remap bootloader ROM (ie System Flash) to address 0x0
         SYSCFG->MEMRMP = 0x00000001;
 
         // Init stack pointer with value residing at ROM base
-    asm (
-        "LDR     R0, =0x00000000\n\t"  // load ROM base address"
-        "LDR     SP,[R0, #0]\n\t"      // assign main stack pointer"
-        );
+        asm (
+            "LDR     R0, =0x00000000\n\t" // load ROM base address"
+            "LDR     SP,[R0, #0]\n\t"  // assign main stack pointer"
+            );
 
         // Jump to address pointed by 0x00000004 -- */
 
-    asm (
-        "LDR     R0,[R0, #4]\n\t"      // load bootloader address
-        "BX      R0\n\t"
-        );
+        asm (
+            "LDR     R0,[R0, #4]\n\t"  // load bootloader address
+            "BX      R0\n\t"
+            );
 
     }
 }
diff --git a/ports/stm32/boards/MIKROE_QUAIL/mpconfigboard.h b/ports/stm32/boards/MIKROE_QUAIL/mpconfigboard.h
index 6cb6b726001ab..d092586f608d5 100644
--- a/ports/stm32/boards/MIKROE_QUAIL/mpconfigboard.h
+++ b/ports/stm32/boards/MIKROE_QUAIL/mpconfigboard.h
@@ -85,7 +85,7 @@ extern struct _spi_bdev_t spi_bdev;
     (op) == BDEV_IOCTL_NUM_BLOCKS ? (MICROPY_HW_SPIFLASH_SIZE_BITS / 8 / FLASH_BLOCK_SIZE) : \
     (op) == BDEV_IOCTL_INIT ? spi_bdev_ioctl(&spi_bdev, (op), (uint32_t)&spiflash_config) : \
     spi_bdev_ioctl(&spi_bdev, (op), (arg)) \
-)
+    )
 #define MICROPY_HW_BDEV_READBLOCKS(dest, bl, n) spi_bdev_readblocks(&spi_bdev, (dest), (bl), (n))
 #define MICROPY_HW_BDEV_WRITEBLOCKS(src, bl, n) spi_bdev_writeblocks(&spi_bdev, (src), (bl), (n))
 #define MICROPY_HW_BDEV_SPIFLASH_EXTENDED (&spi_bdev) // for extended block protocol
@@ -104,6 +104,6 @@ extern struct _spi_bdev_t spi_bdev;
 #define MBOOT_SPIFLASH_BYTE_SIZE    (8 * 1024 * 1024)
 #define MBOOT_SPIFLASH_LAYOUT       "/0x80000000/512*8Kg"
 #define MBOOT_SPIFLASH_ERASE_BLOCKS_PER_PAGE \
-                                    (8 / 4) // 8k page, 4k erase block
+    (8 / 4)                                 // 8k page, 4k erase block
 #define MBOOT_SPIFLASH_CONFIG       (&spiflash_config)
 #define MBOOT_SPIFLASH_SPIFLASH     (&spi_bdev.spiflash)
diff --git a/ports/stm32/boards/NETDUINO_PLUS_2/board_init.c b/ports/stm32/boards/NETDUINO_PLUS_2/board_init.c
index 176e085943053..18fe0bae70afb 100644
--- a/ports/stm32/boards/NETDUINO_PLUS_2/board_init.c
+++ b/ports/stm32/boards/NETDUINO_PLUS_2/board_init.c
@@ -10,12 +10,12 @@ void NETDUINO_PLUS_2_board_early_init(void) {
     GPIO_InitStructure.Mode = GPIO_MODE_OUTPUT_PP;
     GPIO_InitStructure.Pull = GPIO_PULLUP;
 
-#if MICROPY_HW_ENABLE_SDCARD
+    #if MICROPY_HW_ENABLE_SDCARD
     // Turn on the power enable for the sdcard (PB1)
     GPIO_InitStructure.Pin = GPIO_PIN_1;
     HAL_GPIO_Init(GPIOB, &GPIO_InitStructure);
     HAL_GPIO_WritePin(GPIOB, GPIO_PIN_1, GPIO_PIN_SET);
-#endif
+    #endif
 
     // Turn on the power for the 5V on the expansion header (PB2)
     GPIO_InitStructure.Pin = GPIO_PIN_2;
diff --git a/ports/stm32/boards/NUCLEO_F091RC/mpconfigboard.h b/ports/stm32/boards/NUCLEO_F091RC/mpconfigboard.h
index 9f65477edebae..38fcb2f28e336 100644
--- a/ports/stm32/boards/NUCLEO_F091RC/mpconfigboard.h
+++ b/ports/stm32/boards/NUCLEO_F091RC/mpconfigboard.h
@@ -17,9 +17,9 @@
 #define MICROPY_HW_HAS_SWITCH       (1)
 
 // For system clock, enable one source:
-//#define MICROPY_HW_CLK_USE_HSI      (1) // internal 8MHz -> PLL = 48MHz.
+// #define MICROPY_HW_CLK_USE_HSI      (1) // internal 8MHz -> PLL = 48MHz.
 #define MICROPY_HW_CLK_USE_HSI48    (1) // internal 48MHz.
-//#define MICROPY_HW_CLK_USE_HSE      (1) // external crystal -> PLL = 48MHz.
+// #define MICROPY_HW_CLK_USE_HSE      (1) // external crystal -> PLL = 48MHz.
 // For HSE set the crystal / clock input frequency HSE_VALUE in stm32f0xx_hal_conf.h
 #if MICROPY_HW_CLK_USE_HSE
 #define MICROPY_HW_CLK_USE_BYPASS   (1) // HSE comes from STLINK 8MHz, not crystal.
diff --git a/ports/stm32/boards/NUCLEO_G474RE/mpconfigboard.h b/ports/stm32/boards/NUCLEO_G474RE/mpconfigboard.h
index 06b4e4c52a0fd..72c395d493637 100644
--- a/ports/stm32/boards/NUCLEO_G474RE/mpconfigboard.h
+++ b/ports/stm32/boards/NUCLEO_G474RE/mpconfigboard.h
@@ -36,16 +36,16 @@
 #define MICROPY_HW_LPUART1_RX       (pin_A3)  // A3 (to STLINK), B10, C0
 #define MICROPY_HW_UART1_TX         (pin_C4)  // A9, B6, C4, E0
 #define MICROPY_HW_UART1_RX         (pin_C5)  // A10, B7, C5, E1
-//#define MICROPY_HW_UART2_TX       (pin_A2)  // A14, B3, D5
-//#define MICROPY_HW_UART2_RX       (pin_A3)  // A15, B4, D6
-//#define MICROPY_HW_UART2_RTS      (pin_A1)  // D4
-//#define MICROPY_HW_UART2_CTS      (pin_A0)  // D3
+// #define MICROPY_HW_UART2_TX       (pin_A2)  // A14, B3, D5
+// #define MICROPY_HW_UART2_RX       (pin_A3)  // A15, B4, D6
+// #define MICROPY_HW_UART2_RTS      (pin_A1)  // D4
+// #define MICROPY_HW_UART2_CTS      (pin_A0)  // D3
 #define MICROPY_HW_UART3_TX         (pin_B10) // B9, B10, C10, D8
 #define MICROPY_HW_UART3_RX         (pin_B11) // B8 = boot0, B11, C11, D9, E15
-//#define MICROPY_HW_UART3_RTS      (pin_B14) // D12, F6
-//#define MICROPY_HW_UART3_CTS      (pin_B13) // A13, D11
-//#define MICROPY_HW_UART4_TX       (pin_)    // C10
-//#define MICROPY_HW_UART4_RX       (pin_)    // C11
+// #define MICROPY_HW_UART3_RTS      (pin_B14) // D12, F6
+// #define MICROPY_HW_UART3_CTS      (pin_B13) // A13, D11
+// #define MICROPY_HW_UART4_TX       (pin_)    // C10
+// #define MICROPY_HW_UART4_RX       (pin_)    // C11
 
 #define MICROPY_HW_UART_REPL        (PYB_LPUART_1) // default on Nucleo G474
 #define MICROPY_HW_UART_REPL_BAUD   (115200)
@@ -53,24 +53,24 @@
 // I2C buses
 #define MICROPY_HW_I2C1_SCL         (pin_B8) // A13, A15, B8 (=boot0)
 #define MICROPY_HW_I2C1_SDA         (pin_B9) // A14, B7, B9
-//#define MICROPY_HW_I2C2_SCL       (pin_)   // A9, C4
-//#define MICROPY_HW_I2C2_SDA       (pin_)   // A8, F0
-//#define MICROPY_HW_I2C3_SCL       (pin_)   // A8, C8
-//#define MICROPY_HW_I2C3_SDA       (pin_)   // B5, C9, C11
+// #define MICROPY_HW_I2C2_SCL       (pin_)   // A9, C4
+// #define MICROPY_HW_I2C2_SDA       (pin_)   // A8, F0
+// #define MICROPY_HW_I2C3_SCL       (pin_)   // A8, C8
+// #define MICROPY_HW_I2C3_SDA       (pin_)   // B5, C9, C11
 
 // SPI
 #define MICROPY_HW_SPI1_NSS         (pin_A4) // A4, A15 (Nucleo64 specifies B6 as pin CS, must be done as GPIO, not as AF)
 #define MICROPY_HW_SPI1_SCK         (pin_A5) // A5 (LED), B3 (SWO)
 #define MICROPY_HW_SPI1_MISO        (pin_A6) // A6, B4
 #define MICROPY_HW_SPI1_MOSI        (pin_A7) // A7, B5
-//#define MICROPY_HW_SPI2_NSS       (pin_)   // B12, D15, F0
-//#define MICROPY_HW_SPI2_SCK       (pin_)   // B13, F1, F9, F10
-//#define MICROPY_HW_SPI2_MISO      (pin_)   // A10, B14
-//#define MICROPY_HW_SPI2_MOSI      (pin_)   // A11, B15
-//#define MICROPY_HW_SPI3_NSS       (pin_)   // A4, A15
-//#define MICROPY_HW_SPI3_SCK       (pin_)   // B3, C10
-//#define MICROPY_HW_SPI3_MISO      (pin_)   // B4, C11
-//#define MICROPY_HW_SPI3_MOSI      (pin_)   // B5, C12
+// #define MICROPY_HW_SPI2_NSS       (pin_)   // B12, D15, F0
+// #define MICROPY_HW_SPI2_SCK       (pin_)   // B13, F1, F9, F10
+// #define MICROPY_HW_SPI2_MISO      (pin_)   // A10, B14
+// #define MICROPY_HW_SPI2_MOSI      (pin_)   // A11, B15
+// #define MICROPY_HW_SPI3_NSS       (pin_)   // A4, A15
+// #define MICROPY_HW_SPI3_SCK       (pin_)   // B3, C10
+// #define MICROPY_HW_SPI3_MISO      (pin_)   // B4, C11
+// #define MICROPY_HW_SPI3_MOSI      (pin_)   // B5, C12
 
 // USRSW is pulled low. Pressing the button makes the input go high.
 #define MICROPY_HW_USRSW_PIN        (pin_C13)
@@ -84,9 +84,9 @@
 #define MICROPY_HW_LED_OFF(pin)     (mp_hal_pin_low(pin))
 
 // USB config pin A12 (dp), A11 (dm) not mounted on Nucleo
-//#define MICROPY_HW_USB_FS              (1)
-//#define MICROPY_HW_USB_VBUS_DETECT_PIN (pin_A9)
-//#define MICROPY_HW_USB_OTG_ID_PIN      (pin_A10)
+// #define MICROPY_HW_USB_FS              (1)
+// #define MICROPY_HW_USB_VBUS_DETECT_PIN (pin_A9)
+// #define MICROPY_HW_USB_OTG_ID_PIN      (pin_A10)
 
 // FDCAN bus
 // User TODO: fit transceiver chip
diff --git a/ports/stm32/boards/NUCLEO_WB55/mboot_keys.h b/ports/stm32/boards/NUCLEO_WB55/mboot_keys.h
index 773813079a0ec..65952b849a73d 100644
--- a/ports/stm32/boards/NUCLEO_WB55/mboot_keys.h
+++ b/ports/stm32/boards/NUCLEO_WB55/mboot_keys.h
@@ -1,4 +1,4 @@
-//const uint8_t mboot_pack_sign_secret_key[] = {0xf1,0xd8,0x66,0x08,0xbc,0x78,0x39,0x65,0x6a,0xf4,0x88,0xf4,0x43,0x4d,0x10,0xfe,0x4f,0x79,0xb9,0xc3,0x77,0x36,0x23,0xc8,0xcf,0x62,0xa1,0x90,0xf1,0xdc,0xd9,0xbc,0xb2,0x2e,0x59,0x1e,0x53,0x04,0x54,0xd5,0xd1,0x3a,0x6d,0x2e,0x79,0x3e,0xb5,0x70,0xb4,0x9f,0x33,0xff,0x90,0x1d,0xc3,0x54,0x90,0x12,0x96,0x79,0xf4,0xed,0x56,0x75};
+// const uint8_t mboot_pack_sign_secret_key[] = {0xf1,0xd8,0x66,0x08,0xbc,0x78,0x39,0x65,0x6a,0xf4,0x88,0xf4,0x43,0x4d,0x10,0xfe,0x4f,0x79,0xb9,0xc3,0x77,0x36,0x23,0xc8,0xcf,0x62,0xa1,0x90,0xf1,0xdc,0xd9,0xbc,0xb2,0x2e,0x59,0x1e,0x53,0x04,0x54,0xd5,0xd1,0x3a,0x6d,0x2e,0x79,0x3e,0xb5,0x70,0xb4,0x9f,0x33,0xff,0x90,0x1d,0xc3,0x54,0x90,0x12,0x96,0x79,0xf4,0xed,0x56,0x75};
 const uint8_t mboot_pack_sign_public_key[] = {0xb2,0x2e,0x59,0x1e,0x53,0x04,0x54,0xd5,0xd1,0x3a,0x6d,0x2e,0x79,0x3e,0xb5,0x70,0xb4,0x9f,0x33,0xff,0x90,0x1d,0xc3,0x54,0x90,0x12,0x96,0x79,0xf4,0xed,0x56,0x75};
 const uint8_t mboot_pack_secretbox_key[] = {0x4a,0xbe,0x9b,0xed,0x55,0x9f,0x74,0xeb,0x1e,0x70,0xde,0xf5,0x19,0x0a,0xeb,0xa5,0x68,0xea,0xb0,0x88,0xe6,0xfe,0x4d,0x10,0x69,0x23,0x06,0x7f,0xdd,0x83,0xf0,0xbf};
 
diff --git a/ports/stm32/boards/PYBD_SF2/bdev.c b/ports/stm32/boards/PYBD_SF2/bdev.c
index d9bec93c27e40..fba0b8f22790a 100644
--- a/ports/stm32/boards/PYBD_SF2/bdev.c
+++ b/ports/stm32/boards/PYBD_SF2/bdev.c
@@ -45,7 +45,7 @@ STATIC const mp_soft_qspi_obj_t soft_qspi_bus = {
 
 const mp_spiflash_config_t spiflash_config = {
     .bus_kind = MP_SPIFLASH_BUS_QSPI,
-    .bus.u_qspi.data = (void*)&soft_qspi_bus,
+    .bus.u_qspi.data = (void *)&soft_qspi_bus,
     .bus.u_qspi.proto = &mp_soft_qspi_proto,
     #if MICROPY_HW_SPIFLASH_ENABLE_CACHE
     .cache = &spi_bdev_cache,
diff --git a/ports/stm32/boards/PYBD_SF2/board_init.c b/ports/stm32/boards/PYBD_SF2/board_init.c
index ab15783a7ee4b..b39da97c4584e 100644
--- a/ports/stm32/boards/PYBD_SF2/board_init.c
+++ b/ports/stm32/boards/PYBD_SF2/board_init.c
@@ -33,7 +33,7 @@
 #else
 #define OTP_ADDR (0x1ff0f3c0)
 #endif
-#define OTP ((pyb_otp_t*)OTP_ADDR)
+#define OTP ((pyb_otp_t *)OTP_ADDR)
 
 typedef struct _pyb_otp_t {
     uint16_t series;
diff --git a/ports/stm32/boards/PYBD_SF2/mpconfigboard.h b/ports/stm32/boards/PYBD_SF2/mpconfigboard.h
index 9ac789a83b95e..a3e1ab398028a 100644
--- a/ports/stm32/boards/PYBD_SF2/mpconfigboard.h
+++ b/ports/stm32/boards/PYBD_SF2/mpconfigboard.h
@@ -84,7 +84,7 @@ extern struct _spi_bdev_t spi_bdev;
     (op) == BDEV_IOCTL_NUM_BLOCKS ? (MICROPY_HW_SPIFLASH_SIZE_BITS / 8 / FLASH_BLOCK_SIZE) : \
     (op) == BDEV_IOCTL_INIT ? spi_bdev_ioctl(&spi_bdev, (op), (uint32_t)&spiflash_config) : \
     spi_bdev_ioctl(&spi_bdev, (op), (arg)) \
-)
+    )
 #define MICROPY_HW_BDEV_READBLOCKS(dest, bl, n) spi_bdev_readblocks(&spi_bdev, (dest), (bl), (n))
 #define MICROPY_HW_BDEV_WRITEBLOCKS(src, bl, n) spi_bdev_writeblocks(&spi_bdev, (src), (bl), (n))
 #define MICROPY_HW_BDEV_SPIFLASH_EXTENDED (&spi_bdev) // for extended block protocol
diff --git a/ports/stm32/boards/SPARKFUN_MICROMOD_STM32/bdev.c b/ports/stm32/boards/SPARKFUN_MICROMOD_STM32/bdev.c
index 18b5b85b18f8c..dd62a0eb17fd1 100644
--- a/ports/stm32/boards/SPARKFUN_MICROMOD_STM32/bdev.c
+++ b/ports/stm32/boards/SPARKFUN_MICROMOD_STM32/bdev.c
@@ -18,7 +18,7 @@ STATIC mp_spiflash_cache_t spi_bdev_cache;
 const mp_spiflash_config_t spiflash_config = {
     .bus_kind = MP_SPIFLASH_BUS_SPI,
     .bus.u_spi.cs = MICROPY_HW_SPIFLASH_CS,
-    .bus.u_spi.data = (void*)&soft_spi_bus,
+    .bus.u_spi.data = (void *)&soft_spi_bus,
     .bus.u_spi.proto = &mp_soft_spi_proto,
     .cache = &spi_bdev_cache,
 };
diff --git a/ports/stm32/boards/SPARKFUN_MICROMOD_STM32/board_init.c b/ports/stm32/boards/SPARKFUN_MICROMOD_STM32/board_init.c
index 0184bc8205f39..297b58aab92f9 100644
--- a/ports/stm32/boards/SPARKFUN_MICROMOD_STM32/board_init.c
+++ b/ports/stm32/boards/SPARKFUN_MICROMOD_STM32/board_init.c
@@ -2,10 +2,10 @@
 
 void board_early_init(void) {
 
-#if !MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE
+    #if !MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE
     // set external SPI flash CS pin high
     mp_hal_pin_output(MICROPY_HW_SPIFLASH_CS);
     mp_hal_pin_write(MICROPY_HW_SPIFLASH_CS, 1);
-#endif
+    #endif
 
 }
diff --git a/ports/stm32/boards/SPARKFUN_MICROMOD_STM32/mpconfigboard.h b/ports/stm32/boards/SPARKFUN_MICROMOD_STM32/mpconfigboard.h
index 51fedc33f9ad7..98e3c896d78c4 100644
--- a/ports/stm32/boards/SPARKFUN_MICROMOD_STM32/mpconfigboard.h
+++ b/ports/stm32/boards/SPARKFUN_MICROMOD_STM32/mpconfigboard.h
@@ -42,7 +42,7 @@ extern struct _spi_bdev_t spi_bdev;
     (op) == BDEV_IOCTL_NUM_BLOCKS ? (MICROPY_HW_SPIFLASH_SIZE_BITS / 8 / FLASH_BLOCK_SIZE) : \
     (op) == BDEV_IOCTL_INIT ? spi_bdev_ioctl(&spi_bdev, (op), (uint32_t)&spiflash_config) : \
     spi_bdev_ioctl(&spi_bdev, (op), (arg)) \
-)
+    )
 #define MICROPY_HW_BDEV_READBLOCKS(dest, bl, n) spi_bdev_readblocks(&spi_bdev, (dest), (bl), (n))
 #define MICROPY_HW_BDEV_WRITEBLOCKS(src, bl, n) spi_bdev_writeblocks(&spi_bdev, (src), (bl), (n))
 #define MICROPY_HW_BDEV_SPIFLASH_EXTENDED (&spi_bdev) // for extended block protocol
diff --git a/ports/stm32/boards/STM32F411DISC/mpconfigboard.h b/ports/stm32/boards/STM32F411DISC/mpconfigboard.h
index 97da20461257f..c5f69ab90ec6e 100644
--- a/ports/stm32/boards/STM32F411DISC/mpconfigboard.h
+++ b/ports/stm32/boards/STM32F411DISC/mpconfigboard.h
@@ -29,8 +29,8 @@
 // I2C buses
 #define MICROPY_HW_I2C1_SCL (pin_B6)
 #define MICROPY_HW_I2C1_SDA (pin_B9)
-//#define MICROPY_HW_I2C2_SCL (pin_B10)
-//#define MICROPY_HW_I2C2_SDA (pin_B11)
+// #define MICROPY_HW_I2C2_SCL (pin_B10)
+// #define MICROPY_HW_I2C2_SDA (pin_B11)
 #define MICROPY_HW_I2C3_SCL (pin_A8)
 #define MICROPY_HW_I2C3_SDA (pin_A9)
 
diff --git a/ports/stm32/boards/STM32F429DISC/mpconfigboard.h b/ports/stm32/boards/STM32F429DISC/mpconfigboard.h
index bae6ae255247d..8754d3e46f31b 100644
--- a/ports/stm32/boards/STM32F429DISC/mpconfigboard.h
+++ b/ports/stm32/boards/STM32F429DISC/mpconfigboard.h
@@ -32,10 +32,10 @@
 #define MICROPY_HW_I2C3_SDA (pin_C9)
 
 // SPI buses
-//#define MICROPY_HW_SPI1_NSS     (pin_A4)
-//#define MICROPY_HW_SPI1_SCK     (pin_A5)
-//#define MICROPY_HW_SPI1_MISO    (pin_A6)
-//#define MICROPY_HW_SPI1_MOSI    (pin_A7)
+// #define MICROPY_HW_SPI1_NSS     (pin_A4)
+// #define MICROPY_HW_SPI1_SCK     (pin_A5)
+// #define MICROPY_HW_SPI1_MISO    (pin_A6)
+// #define MICROPY_HW_SPI1_MOSI    (pin_A7)
 #if defined(USE_USB_HS_IN_FS)
 // The HS USB uses B14 & B15 for D- and D+
 #else
@@ -44,18 +44,18 @@
 #define MICROPY_HW_SPI2_MISO (pin_B14)
 #define MICROPY_HW_SPI2_MOSI (pin_B15)
 #endif
-//#define MICROPY_HW_SPI4_NSS     (pin_E11)
-//#define MICROPY_HW_SPI4_SCK     (pin_E12)
-//#define MICROPY_HW_SPI4_MISO    (pin_E13)
-//#define MICROPY_HW_SPI4_MOSI    (pin_E14)
+// #define MICROPY_HW_SPI4_NSS     (pin_E11)
+// #define MICROPY_HW_SPI4_SCK     (pin_E12)
+// #define MICROPY_HW_SPI4_MISO    (pin_E13)
+// #define MICROPY_HW_SPI4_MOSI    (pin_E14)
 #define MICROPY_HW_SPI5_NSS     (pin_F6)
 #define MICROPY_HW_SPI5_SCK     (pin_F7)
 #define MICROPY_HW_SPI5_MISO    (pin_F8)
 #define MICROPY_HW_SPI5_MOSI    (pin_F9)
-//#define MICROPY_HW_SPI6_NSS     (pin_G8)
-//#define MICROPY_HW_SPI6_SCK     (pin_G13)
-//#define MICROPY_HW_SPI6_MISO    (pin_G12)
-//#define MICROPY_HW_SPI6_MOSI    (pin_G14)
+// #define MICROPY_HW_SPI6_NSS     (pin_G8)
+// #define MICROPY_HW_SPI6_SCK     (pin_G13)
+// #define MICROPY_HW_SPI6_MISO    (pin_G12)
+// #define MICROPY_HW_SPI6_MOSI    (pin_G14)
 
 // CAN buses
 #define MICROPY_HW_CAN1_TX (pin_B9)
diff --git a/ports/stm32/boards/STM32F439/mpconfigboard.h b/ports/stm32/boards/STM32F439/mpconfigboard.h
index 917ea89481006..c888068a690d9 100644
--- a/ports/stm32/boards/STM32F439/mpconfigboard.h
+++ b/ports/stm32/boards/STM32F439/mpconfigboard.h
@@ -17,10 +17,10 @@
 #endif
 
 // HSE is 8MHz
-#define MICROPY_HW_CLK_PLLM (8) //divide external clock by this to get 1MHz
-#define MICROPY_HW_CLK_PLLN (384) //this number is the PLL clock in MHz
-#define MICROPY_HW_CLK_PLLP (RCC_PLLP_DIV2) //divide PLL clock by this to get core clock
-#define MICROPY_HW_CLK_PLLQ (8) //divide core clock by this to get 48MHz
+#define MICROPY_HW_CLK_PLLM (8) // divide external clock by this to get 1MHz
+#define MICROPY_HW_CLK_PLLN (384) // this number is the PLL clock in MHz
+#define MICROPY_HW_CLK_PLLP (RCC_PLLP_DIV2) // divide PLL clock by this to get core clock
+#define MICROPY_HW_CLK_PLLQ (8) // divide core clock by this to get 48MHz
 
 // USB config
 #define MICROPY_HW_USB_FS (1)
@@ -62,18 +62,18 @@
 #define MICROPY_HW_SPI3_SCK     (pin_E12)
 #define MICROPY_HW_SPI3_MISO    (pin_E13)
 #define MICROPY_HW_SPI3_MOSI    (pin_E14)
-//#define MICROPY_HW_SPI4_NSS     (pin_E11)
-//#define MICROPY_HW_SPI4_SCK     (pin_E12)
-//#define MICROPY_HW_SPI4_MISO    (pin_E13)
-//#define MICROPY_HW_SPI4_MOSI    (pin_E14)
-//#define MICROPY_HW_SPI5_NSS     (pin_F6)
-//#define MICROPY_HW_SPI5_SCK     (pin_F7)
-//#define MICROPY_HW_SPI5_MISO    (pin_F8)
-//#define MICROPY_HW_SPI5_MOSI    (pin_F9)
-//#define MICROPY_HW_SPI6_NSS     (pin_G8)
-//#define MICROPY_HW_SPI6_SCK     (pin_G13)
-//#define MICROPY_HW_SPI6_MISO    (pin_G12)
-//#define MICROPY_HW_SPI6_MOSI    (pin_G14)
+// #define MICROPY_HW_SPI4_NSS     (pin_E11)
+// #define MICROPY_HW_SPI4_SCK     (pin_E12)
+// #define MICROPY_HW_SPI4_MISO    (pin_E13)
+// #define MICROPY_HW_SPI4_MOSI    (pin_E14)
+// #define MICROPY_HW_SPI5_NSS     (pin_F6)
+// #define MICROPY_HW_SPI5_SCK     (pin_F7)
+// #define MICROPY_HW_SPI5_MISO    (pin_F8)
+// #define MICROPY_HW_SPI5_MOSI    (pin_F9)
+// #define MICROPY_HW_SPI6_NSS     (pin_G8)
+// #define MICROPY_HW_SPI6_SCK     (pin_G13)
+// #define MICROPY_HW_SPI6_MISO    (pin_G12)
+// #define MICROPY_HW_SPI6_MOSI    (pin_G14)
 
 // CAN buses
 #define MICROPY_HW_CAN1_TX (pin_B9)
@@ -86,4 +86,3 @@
 #define MICROPY_HW_USRSW_PULL       (GPIO_NOPULL)
 #define MICROPY_HW_USRSW_EXTI_MODE  (GPIO_MODE_IT_RISING)
 #define MICROPY_HW_USRSW_PRESSED    (1)
-
diff --git a/ports/stm32/boards/STM32F769DISC/mpconfigboard.h b/ports/stm32/boards/STM32F769DISC/mpconfigboard.h
index 8728d1b37e82a..fd58854b4a995 100644
--- a/ports/stm32/boards/STM32F769DISC/mpconfigboard.h
+++ b/ports/stm32/boards/STM32F769DISC/mpconfigboard.h
@@ -46,7 +46,7 @@ extern struct _spi_bdev_t spi_bdev;
     (op) == BDEV_IOCTL_NUM_BLOCKS ? ((1 << MICROPY_HW_QSPIFLASH_SIZE_BITS_LOG2) / 8 / FLASH_BLOCK_SIZE) : \
     (op) == BDEV_IOCTL_INIT ? spi_bdev_ioctl(&spi_bdev, (op), (uint32_t)&spiflash_config) : \
     spi_bdev_ioctl(&spi_bdev, (op), (arg)) \
-)
+    )
 #define MICROPY_HW_BDEV_READBLOCKS(dest, bl, n) spi_bdev_readblocks(&spi_bdev, (dest), (bl), (n))
 #define MICROPY_HW_BDEV_WRITEBLOCKS(src, bl, n) spi_bdev_writeblocks(&spi_bdev, (src), (bl), (n))
 #define MICROPY_HW_BDEV_SPIFLASH_EXTENDED (&spi_bdev) // for extended block protocol
diff --git a/ports/stm32/boards/STM32L476DISC/bdev.c b/ports/stm32/boards/STM32L476DISC/bdev.c
index 01f06b8b1d2e5..c76eb6e2c9077 100644
--- a/ports/stm32/boards/STM32L476DISC/bdev.c
+++ b/ports/stm32/boards/STM32L476DISC/bdev.c
@@ -16,7 +16,7 @@ STATIC mp_spiflash_cache_t spi_bdev_cache;
 const mp_spiflash_config_t spiflash_config = {
     .bus_kind = MP_SPIFLASH_BUS_SPI,
     .bus.u_spi.cs = MICROPY_HW_SPIFLASH_CS,
-    .bus.u_spi.data = (void*)&soft_spi_bus,
+    .bus.u_spi.data = (void *)&soft_spi_bus,
     .bus.u_spi.proto = &mp_soft_spi_proto,
     .cache = &spi_bdev_cache,
 };
diff --git a/ports/stm32/boards/STM32L476DISC/mpconfigboard.h b/ports/stm32/boards/STM32L476DISC/mpconfigboard.h
index 58fb8ef1440d2..2ee505447ea74 100644
--- a/ports/stm32/boards/STM32L476DISC/mpconfigboard.h
+++ b/ports/stm32/boards/STM32L476DISC/mpconfigboard.h
@@ -27,7 +27,7 @@ extern struct _spi_bdev_t spi_bdev;
     (op) == BDEV_IOCTL_NUM_BLOCKS ? (MICROPY_HW_SPIFLASH_SIZE_BITS / 8 / FLASH_BLOCK_SIZE) : \
     (op) == BDEV_IOCTL_INIT ? spi_bdev_ioctl(&spi_bdev, (op), (uint32_t)&spiflash_config) : \
     spi_bdev_ioctl(&spi_bdev, (op), (arg)) \
-)
+    )
 #define MICROPY_HW_BDEV_READBLOCKS(dest, bl, n) spi_bdev_readblocks(&spi_bdev, (dest), (bl), (n))
 #define MICROPY_HW_BDEV_WRITEBLOCKS(src, bl, n) spi_bdev_writeblocks(&spi_bdev, (src), (bl), (n))
 
diff --git a/ports/stm32/boards/VCC_GND_F407VE/bdev.c b/ports/stm32/boards/VCC_GND_F407VE/bdev.c
index 18b5b85b18f8c..dd62a0eb17fd1 100644
--- a/ports/stm32/boards/VCC_GND_F407VE/bdev.c
+++ b/ports/stm32/boards/VCC_GND_F407VE/bdev.c
@@ -18,7 +18,7 @@ STATIC mp_spiflash_cache_t spi_bdev_cache;
 const mp_spiflash_config_t spiflash_config = {
     .bus_kind = MP_SPIFLASH_BUS_SPI,
     .bus.u_spi.cs = MICROPY_HW_SPIFLASH_CS,
-    .bus.u_spi.data = (void*)&soft_spi_bus,
+    .bus.u_spi.data = (void *)&soft_spi_bus,
     .bus.u_spi.proto = &mp_soft_spi_proto,
     .cache = &spi_bdev_cache,
 };
diff --git a/ports/stm32/boards/VCC_GND_F407VE/mpconfigboard.h b/ports/stm32/boards/VCC_GND_F407VE/mpconfigboard.h
index e9e1f55c26b92..0ba2ee32e8f71 100644
--- a/ports/stm32/boards/VCC_GND_F407VE/mpconfigboard.h
+++ b/ports/stm32/boards/VCC_GND_F407VE/mpconfigboard.h
@@ -137,7 +137,7 @@ extern struct _spi_bdev_t spi_bdev;
     (op) == BDEV_IOCTL_NUM_BLOCKS ? (MICROPY_HW_SPIFLASH_SIZE_BITS / 8 / FLASH_BLOCK_SIZE) : \
     (op) == BDEV_IOCTL_INIT ? spi_bdev_ioctl(&spi_bdev, (op), (uint32_t)&spiflash_config) : \
     spi_bdev_ioctl(&spi_bdev, (op), (arg)) \
-)
+    )
 #define MICROPY_HW_BDEV_READBLOCKS(dest, bl, n) spi_bdev_readblocks(&spi_bdev, (dest), (bl), (n))
 #define MICROPY_HW_BDEV_WRITEBLOCKS(src, bl, n) spi_bdev_writeblocks(&spi_bdev, (src), (bl), (n))
 
diff --git a/ports/stm32/boards/VCC_GND_F407ZG/bdev.c b/ports/stm32/boards/VCC_GND_F407ZG/bdev.c
index 18b5b85b18f8c..dd62a0eb17fd1 100644
--- a/ports/stm32/boards/VCC_GND_F407ZG/bdev.c
+++ b/ports/stm32/boards/VCC_GND_F407ZG/bdev.c
@@ -18,7 +18,7 @@ STATIC mp_spiflash_cache_t spi_bdev_cache;
 const mp_spiflash_config_t spiflash_config = {
     .bus_kind = MP_SPIFLASH_BUS_SPI,
     .bus.u_spi.cs = MICROPY_HW_SPIFLASH_CS,
-    .bus.u_spi.data = (void*)&soft_spi_bus,
+    .bus.u_spi.data = (void *)&soft_spi_bus,
     .bus.u_spi.proto = &mp_soft_spi_proto,
     .cache = &spi_bdev_cache,
 };
diff --git a/ports/stm32/boards/VCC_GND_F407ZG/mpconfigboard.h b/ports/stm32/boards/VCC_GND_F407ZG/mpconfigboard.h
index 37eeff513862a..3000389bee7c1 100644
--- a/ports/stm32/boards/VCC_GND_F407ZG/mpconfigboard.h
+++ b/ports/stm32/boards/VCC_GND_F407ZG/mpconfigboard.h
@@ -145,7 +145,7 @@ extern struct _spi_bdev_t spi_bdev;
     (op) == BDEV_IOCTL_NUM_BLOCKS ? (MICROPY_HW_SPIFLASH_SIZE_BITS / 8 / FLASH_BLOCK_SIZE) : \
     (op) == BDEV_IOCTL_INIT ? spi_bdev_ioctl(&spi_bdev, (op), (uint32_t)&spiflash_config) : \
     spi_bdev_ioctl(&spi_bdev, (op), (arg)) \
-)
+    )
 #define MICROPY_HW_BDEV_READBLOCKS(dest, bl, n) spi_bdev_readblocks(&spi_bdev, (dest), (bl), (n))
 #define MICROPY_HW_BDEV_WRITEBLOCKS(src, bl, n) spi_bdev_writeblocks(&spi_bdev, (src), (bl), (n))
 
diff --git a/ports/stm32/boards/stm32f4xx_prefix.c b/ports/stm32/boards/stm32f4xx_prefix.c
index 3bcd6e6410de3..99bf4473aa1a1 100644
--- a/ports/stm32/boards/stm32f4xx_prefix.c
+++ b/ports/stm32/boards/stm32f4xx_prefix.c
@@ -7,26 +7,26 @@
 #include "pin.h"
 
 #define AF(af_idx, af_fn, af_unit, af_type, af_ptr) \
-{ \
-    { &pin_af_type }, \
-    .name = MP_QSTR_AF ## af_idx ## _ ## af_fn ## af_unit, \
-    .idx = (af_idx), \
-    .fn = AF_FN_ ## af_fn, \
-    .unit = (af_unit), \
-    .type = AF_PIN_TYPE_ ## af_fn ## _ ## af_type, \
-    .reg = (af_ptr) \
-}
+    { \
+        { &pin_af_type }, \
+        .name = MP_QSTR_AF##af_idx##_##af_fn##af_unit, \
+        .idx = (af_idx), \
+        .fn = AF_FN_##af_fn, \
+        .unit = (af_unit), \
+        .type = AF_PIN_TYPE_##af_fn##_##af_type, \
+        .reg = (af_ptr) \
+    }
 
 #define PIN(p_port, p_pin, p_af, p_adc_num, p_adc_channel) \
-{ \
-    { &pin_type }, \
-    .name = MP_QSTR_ ## p_port ## p_pin, \
-    .port = PORT_ ## p_port, \
-    .pin = (p_pin), \
-    .num_af = (sizeof(p_af) / sizeof(pin_af_obj_t)), \
-    .pin_mask = (1 << ((p_pin) & 0x0f)), \
-    .gpio = GPIO ## p_port, \
-    .af = p_af, \
-    .adc_num = p_adc_num, \
-    .adc_channel = p_adc_channel, \
-}
+    { \
+        { &pin_type }, \
+        .name = MP_QSTR_##p_port##p_pin, \
+        .port = PORT_##p_port, \
+        .pin = (p_pin), \
+        .num_af = (sizeof(p_af) / sizeof(pin_af_obj_t)), \
+        .pin_mask = (1 << ((p_pin) & 0x0f)), \
+        .gpio = GPIO##p_port, \
+        .af = p_af, \
+        .adc_num = p_adc_num, \
+        .adc_channel = p_adc_channel, \
+    }
diff --git a/ports/stm32/mbedtls/mbedtls_config.h b/ports/stm32/mbedtls/mbedtls_config.h
index 904d08548fa4c..3fbf36126cda3 100644
--- a/ports/stm32/mbedtls/mbedtls_config.h
+++ b/ports/stm32/mbedtls/mbedtls_config.h
@@ -65,7 +65,7 @@
 #define MBEDTLS_BIGNUM_C
 #define MBEDTLS_CIPHER_C
 #define MBEDTLS_CTR_DRBG_C
-//#define MBEDTLS_ECP_C
+// #define MBEDTLS_ECP_C
 #define MBEDTLS_ENTROPY_C
 #define MBEDTLS_ERROR_C
 #define MBEDTLS_MD_C
diff --git a/ports/stm32/mbedtls/mbedtls_port.c b/ports/stm32/mbedtls/mbedtls_port.c
index 44e23a3b904b2..324abb7a66c04 100644
--- a/ports/stm32/mbedtls/mbedtls_port.c
+++ b/ports/stm32/mbedtls/mbedtls_port.c
@@ -39,7 +39,7 @@ static size_t count_links(uint32_t *nb) {
     while (p != NULL) {
         ++n;
         *nb += gc_nbytes(p);
-        p = (void**)p[1];
+        p = (void **)p[1];
     }
     return n;
 }
@@ -65,17 +65,17 @@ void m_free_mbedtls(void *ptr_in) {
     if (ptr_in == NULL) {
         return;
     }
-    void **ptr = &((void**)ptr_in)[-2];
+    void **ptr = &((void **)ptr_in)[-2];
     #if DEBUG
     uint32_t nb;
     size_t n = count_links(&nb);
     printf("mbed_free(%p, [%p, %p], nbytes=%u, links=%u;%u)\n", ptr, ptr[0], ptr[1], gc_nbytes(ptr), n, (uint)nb);
     #endif
     if (ptr[1] != NULL) {
-        ((void**)ptr[1])[0] = ptr[0];
+        ((void **)ptr[1])[0] = ptr[0];
     }
     if (ptr[0] != NULL) {
-        ((void**)ptr[0])[1] = ptr[1];
+        ((void **)ptr[0])[1] = ptr[1];
     } else {
         MP_STATE_PORT(mbedtls_memory) = ptr[1];
     }
diff --git a/ports/stm32/mboot/main.c b/ports/stm32/mboot/main.c
index 37c7c0cf5d79d..1420f13fbed7f 100644
--- a/ports/stm32/mboot/main.c
+++ b/ports/stm32/mboot/main.c
@@ -62,13 +62,13 @@
 #define IRQ_PRI_I2C (NVIC_EncodePriority(NVIC_PRIORITYGROUP_4, 1, 0))
 
 #if defined(MBOOT_CLK_PLLM)
-  // The board specified the PLL values, flash latency and bus dividers
+// The board specified the PLL values, flash latency and bus dividers
   #define CORE_PLL_FREQ (1000000 * MBOOT_CLK_PLLN / MBOOT_CLK_PLLP)
 #else
-  // The board did not specify the clock values, so configure defaults
+// The board did not specify the clock values, so configure defaults
   #if defined(STM32F4) || defined(STM32F7)
     #if MBOOT_ENABLE_PACKING
-      // With encryption/signing/compression, a faster CPU makes processing much faster.
+// With encryption/signing/compression, a faster CPU makes processing much faster.
       #define CORE_PLL_FREQ (96000000)
       #define MBOOT_FLASH_LATENCY FLASH_LATENCY_3
     #else
@@ -120,7 +120,7 @@ uint32_t get_le32(const uint8_t *b) {
 
 uint64_t get_le64(const uint8_t *b) {
     return (uint64_t)b[0] | (uint64_t)b[1] << 8 | (uint64_t)b[2] << 16 | (uint64_t)b[3] << 24
-        | (uint64_t)b[4] << 32 | (uint64_t)b[5] << 40 | (uint64_t)b[6] << 48 | (uint64_t)b[7] << 56;
+           | (uint64_t)b[4] << 32 | (uint64_t)b[5] << 40 | (uint64_t)b[6] << 48 | (uint64_t)b[7] << 56;
 }
 
 mp_uint_t mp_hal_ticks_ms(void) {
@@ -217,17 +217,17 @@ void SystemClock_Config(void) {
         1 << RCC_PLLCFGR_PLLSRC_Pos // HSE selected as PLL source
         #endif
         | MBOOT_CLK_PLLM << RCC_PLLCFGR_PLLM_Pos
-        | MBOOT_CLK_PLLN << RCC_PLLCFGR_PLLN_Pos
-        | ((MBOOT_CLK_PLLP >> 1) - 1) << RCC_PLLCFGR_PLLP_Pos
-        | MBOOT_CLK_PLLQ << RCC_PLLCFGR_PLLQ_Pos
+            | MBOOT_CLK_PLLN << RCC_PLLCFGR_PLLN_Pos
+            | ((MBOOT_CLK_PLLP >> 1) - 1) << RCC_PLLCFGR_PLLP_Pos
+            | MBOOT_CLK_PLLQ << RCC_PLLCFGR_PLLQ_Pos
         #ifdef RCC_PLLCFGR_PLLR
         | 2 << RCC_PLLCFGR_PLLR_Pos // default PLLR value of 2
         #endif
-        ;
+    ;
 
     // Enable PLL
     __HAL_RCC_PLL_ENABLE();
-    while(__HAL_RCC_GET_FLAG(RCC_FLAG_PLLRDY) == RESET) {
+    while (__HAL_RCC_GET_FLAG(RCC_FLAG_PLLRDY) == RESET) {
     }
 
     // Increase latency before changing clock
@@ -299,9 +299,9 @@ void SystemClock_Config(void) {
     RCC->PLL1FRACR = 0;
     RCC->PLL1DIVR =
         (MBOOT_CLK_PLLN - 1) << RCC_PLL1DIVR_N1_Pos
-        | (MBOOT_CLK_PLLP - 1) << RCC_PLL1DIVR_P1_Pos // only even P allowed
-        | (MBOOT_CLK_PLLQ - 1) << RCC_PLL1DIVR_Q1_Pos
-        | (MBOOT_CLK_PLLR - 1) << RCC_PLL1DIVR_R1_Pos;
+            | (MBOOT_CLK_PLLP - 1) << RCC_PLL1DIVR_P1_Pos // only even P allowed
+            | (MBOOT_CLK_PLLQ - 1) << RCC_PLL1DIVR_Q1_Pos
+            | (MBOOT_CLK_PLLR - 1) << RCC_PLL1DIVR_R1_Pos;
 
     // Configure PLL3 for use by USB at Q=48MHz
     RCC->PLLCKSELR |= MICROPY_HW_CLK_PLL3M << RCC_PLLCKSELR_DIVM3_Pos;
@@ -309,21 +309,21 @@ void SystemClock_Config(void) {
     RCC->PLL3FRACR = 0;
     RCC->PLL3DIVR =
         (MICROPY_HW_CLK_PLL3N - 1) << RCC_PLL3DIVR_N3_Pos
-        | (MICROPY_HW_CLK_PLL3P - 1) << RCC_PLL3DIVR_P3_Pos // only even P allowed
-        | (MICROPY_HW_CLK_PLL3Q - 1) << RCC_PLL3DIVR_Q3_Pos
-        | (MICROPY_HW_CLK_PLL3R - 1) << RCC_PLL3DIVR_R3_Pos;
+            | (MICROPY_HW_CLK_PLL3P - 1) << RCC_PLL3DIVR_P3_Pos // only even P allowed
+            | (MICROPY_HW_CLK_PLL3Q - 1) << RCC_PLL3DIVR_Q3_Pos
+            | (MICROPY_HW_CLK_PLL3R - 1) << RCC_PLL3DIVR_R3_Pos;
 
     // Select PLL3-Q for USB clock source
     MODIFY_REG(RCC->D2CCIP2R, RCC_D2CCIP2R_USBSEL, RCC_D2CCIP2R_USBSEL_1);
 
     // Enable PLL1
     __HAL_RCC_PLL_ENABLE();
-    while(__HAL_RCC_GET_FLAG(RCC_FLAG_PLLRDY) == RESET) {
+    while (__HAL_RCC_GET_FLAG(RCC_FLAG_PLLRDY) == RESET) {
     }
 
     // Enable PLL3
     __HAL_RCC_PLL3_ENABLE();
-    while(__HAL_RCC_GET_FLAG(RCC_FLAG_PLL3RDY) == RESET) {
+    while (__HAL_RCC_GET_FLAG(RCC_FLAG_PLL3RDY) == RESET) {
     }
 
     // Increase latency before changing SYSCLK
@@ -334,8 +334,8 @@ void SystemClock_Config(void) {
     // Configure AHB divider
     RCC->D1CFGR =
         0 << RCC_D1CFGR_D1CPRE_Pos // SYSCLK prescaler of 1
-        | MBOOT_CLK_AHB_DIV
-        ;
+            | MBOOT_CLK_AHB_DIV
+    ;
 
     // Configure SYSCLK source from PLL
     __HAL_RCC_SYSCLK_CONFIG(RCC_SYSCLKSOURCE_PLLCLK);
@@ -374,7 +374,7 @@ void SystemClock_Config(void) {
 #endif
 
 void mp_hal_pin_config(mp_hal_pin_obj_t port_pin, uint32_t mode, uint32_t pull, uint32_t alt) {
-    GPIO_TypeDef *gpio = (GPIO_TypeDef*)(port_pin & ~0xf);
+    GPIO_TypeDef *gpio = (GPIO_TypeDef *)(port_pin & ~0xf);
 
     // Enable the GPIO peripheral clock
     uint32_t gpio_idx = ((uintptr_t)gpio - GPIOA_BASE) / (GPIOB_BASE - GPIOA_BASE);
@@ -392,7 +392,7 @@ void mp_hal_pin_config(mp_hal_pin_obj_t port_pin, uint32_t mode, uint32_t pull,
 }
 
 void mp_hal_pin_config_speed(uint32_t port_pin, uint32_t speed) {
-    GPIO_TypeDef *gpio = (GPIO_TypeDef*)(port_pin & ~0xf);
+    GPIO_TypeDef *gpio = (GPIO_TypeDef *)(port_pin & ~0xf);
     uint32_t pin = port_pin & 0xf;
     gpio->OSPEEDR = (gpio->OSPEEDR & ~(3 << (2 * pin))) | (speed << (2 * pin));
 }
@@ -457,7 +457,7 @@ static int mboot_flash_page_erase(uint32_t addr, uint32_t *next_addr) {
 
     // Check the erase set bits to 1, at least for the first 256 bytes
     for (int i = 0; i < 64; ++i) {
-        if (((volatile uint32_t*)sector_start)[i] != 0xffffffff) {
+        if (((volatile uint32_t *)sector_start)[i] != 0xffffffff) {
             return -MBOOT_ERRNO_FLASH_ERASE_FAILED;
         }
     }
@@ -475,7 +475,7 @@ static int mboot_flash_write(uint32_t addr, const uint8_t *src8, size_t len) {
         return -MBOOT_ERRNO_FLASH_WRITE_DISALLOWED;
     }
 
-    const uint32_t *src = (const uint32_t*)src8;
+    const uint32_t *src = (const uint32_t *)src8;
     size_t num_word32 = (len + 3) / 4;
 
     // Write the data to flash.
@@ -633,8 +633,8 @@ int do_write(uint32_t addr, const uint8_t *src8, size_t len, bool dry_run) {
 
 #if defined(MBOOT_I2C_SCL)
 
-#define PASTE2(a, b) a ## b
-#define PASTE3(a, b, c) a ## b ## c
+#define PASTE2(a, b) a##b
+#define PASTE3(a, b, c) a##b##c
 #define EVAL_PASTE2(a, b) PASTE2(a, b)
 #define EVAL_PASTE3(a, b, c) PASTE3(a, b, c)
 
@@ -714,7 +714,7 @@ void i2c_slave_process_rx_end(i2c_slave_t *i2c) {
         #pragma GCC diagnostic ignored "-Warray-bounds"
         #pragma GCC diagnostic ignored "-Wstringop-overread"
         #endif
-        memcpy(buf, (uint8_t*)MP_HAL_UNIQUE_ID_ADDRESS, 12);
+        memcpy(buf, (uint8_t *)MP_HAL_UNIQUE_ID_ADDRESS, 12);
         #if __GNUC__ >= 11
         #pragma GCC diagnostic pop
         #endif
@@ -760,22 +760,22 @@ void i2c_slave_process_rx_end(i2c_slave_t *i2c) {
         uint32_t hashlen = get_le32(buf + 1);
         static CRYAL_SHA256_CTX ctx;
         sha256_init(&ctx);
-        sha256_update(&ctx, (const void*)i2c_obj.cmd_rdaddr, hashlen);
+        sha256_update(&ctx, (const void *)i2c_obj.cmd_rdaddr, hashlen);
         i2c_obj.cmd_rdaddr += hashlen;
         sha256_final(&ctx, buf);
         len = 32;
     } else if (buf[0] == I2C_CMD_MARKVALID && len == 0) {
         uint32_t buf;
-        buf = *(volatile uint32_t*)APPLICATION_ADDR;
+        buf = *(volatile uint32_t *)APPLICATION_ADDR;
         if ((buf & APP_VALIDITY_BITS) != APP_VALIDITY_BITS) {
             len = -1;
         } else {
             buf &= ~APP_VALIDITY_BITS;
-            int ret = do_write(APPLICATION_ADDR, (void*)&buf, 4, false);
+            int ret = do_write(APPLICATION_ADDR, (void *)&buf, 4, false);
             if (ret < 0) {
                 len = ret;
             } else {
-                buf = *(volatile uint32_t*)APPLICATION_ADDR;
+                buf = *(volatile uint32_t *)APPLICATION_ADDR;
                 if ((buf & APP_VALIDITY_BITS) != 0) {
                     len = -2;
                 } else {
@@ -1018,7 +1018,7 @@ static uint8_t cfg_descr[9 + 9 + 9] =
 
 static uint8_t *pyb_usbdd_DeviceDescriptor(USBD_HandleTypeDef *pdev, uint16_t *length) {
     *length = USB_LEN_DEV_DESC;
-    return (uint8_t*)dev_descr;
+    return (uint8_t *)dev_descr;
 }
 
 static char get_hex_char(int val) {
@@ -1036,19 +1036,19 @@ static void format_hex(char *buf, int val) {
 }
 
 static uint8_t *pyb_usbdd_StrDescriptor(USBD_HandleTypeDef *pdev, uint8_t idx, uint16_t *length) {
-    pyb_usbdd_obj_t *self = (pyb_usbdd_obj_t*)pdev->pClassData;
+    pyb_usbdd_obj_t *self = (pyb_usbdd_obj_t *)pdev->pClassData;
     uint8_t *str_desc = self->usbd_str_desc;
     switch (idx) {
         case USBD_IDX_LANGID_STR:
             *length = sizeof(USBD_LangIDDesc);
-            return (uint8_t*)USBD_LangIDDesc; // the data should only be read from this buf
+            return (uint8_t *)USBD_LangIDDesc; // the data should only be read from this buf
 
         case USBD_IDX_MFC_STR:
-            USBD_GetString((uint8_t*)MBOOT_USBD_MANUFACTURER_STRING, str_desc, length);
+            USBD_GetString((uint8_t *)MBOOT_USBD_MANUFACTURER_STRING, str_desc, length);
             return str_desc;
 
         case USBD_IDX_PRODUCT_STR:
-            USBD_GetString((uint8_t*)MBOOT_USBD_PRODUCT_STRING, str_desc, length);
+            USBD_GetString((uint8_t *)MBOOT_USBD_PRODUCT_STRING, str_desc, length);
             return str_desc;
 
         case USBD_IDX_SERIAL_STR: {
@@ -1064,7 +1064,7 @@ static uint8_t *pyb_usbdd_StrDescriptor(USBD_HandleTypeDef *pdev, uint8_t idx, u
             //     dfu-util -l
             //
             // See: https://my.st.com/52d187b7 for the algorithim used.
-            uint8_t *id = (uint8_t*)MP_HAL_UNIQUE_ID_ADDRESS;
+            uint8_t *id = (uint8_t *)MP_HAL_UNIQUE_ID_ADDRESS;
             char serial_buf[16];
             format_hex(&serial_buf[0], id[11]);
             format_hex(&serial_buf[2], id[10] + id[2]);
@@ -1074,29 +1074,29 @@ static uint8_t *pyb_usbdd_StrDescriptor(USBD_HandleTypeDef *pdev, uint8_t idx, u
             format_hex(&serial_buf[10], id[6]);
             serial_buf[12] = '\0';
 
-            USBD_GetString((uint8_t*)serial_buf, str_desc, length);
+            USBD_GetString((uint8_t *)serial_buf, str_desc, length);
             return str_desc;
         }
 
         case USBD_IDX_CONFIG_STR:
-            USBD_GetString((uint8_t*)FLASH_LAYOUT_STR, str_desc, length);
+            USBD_GetString((uint8_t *)FLASH_LAYOUT_STR, str_desc, length);
             return str_desc;
 
         case MBOOT_ERROR_STR_OVERWRITE_BOOTLOADER_IDX:
-            USBD_GetString((uint8_t*)MBOOT_ERROR_STR_OVERWRITE_BOOTLOADER, str_desc, length);
+            USBD_GetString((uint8_t *)MBOOT_ERROR_STR_OVERWRITE_BOOTLOADER, str_desc, length);
             return str_desc;
 
         case MBOOT_ERROR_STR_INVALID_ADDRESS_IDX:
-            USBD_GetString((uint8_t*)MBOOT_ERROR_STR_INVALID_ADDRESS, str_desc, length);
+            USBD_GetString((uint8_t *)MBOOT_ERROR_STR_INVALID_ADDRESS, str_desc, length);
             return str_desc;
 
         #if MBOOT_ENABLE_PACKING
         case MBOOT_ERROR_STR_INVALID_SIG_IDX:
-            USBD_GetString((uint8_t*)MBOOT_ERROR_STR_INVALID_SIG, str_desc, length);
+            USBD_GetString((uint8_t *)MBOOT_ERROR_STR_INVALID_SIG, str_desc, length);
             return str_desc;
 
         case MBOOT_ERROR_STR_INVALID_READ_IDX:
-            USBD_GetString((uint8_t*)MBOOT_ERROR_STR_INVALID_READ, str_desc, length);
+            USBD_GetString((uint8_t *)MBOOT_ERROR_STR_INVALID_READ, str_desc, length);
             return str_desc;
         #endif
 
@@ -1111,19 +1111,19 @@ static const USBD_DescriptorsTypeDef pyb_usbdd_descriptors = {
 };
 
 static uint8_t pyb_usbdd_Init(USBD_HandleTypeDef *pdev, uint8_t cfgidx) {
-    pyb_usbdd_obj_t *self = (pyb_usbdd_obj_t*)pdev->pClassData;
+    pyb_usbdd_obj_t *self = (pyb_usbdd_obj_t *)pdev->pClassData;
     (void)self;
     return USBD_OK;
 }
 
 static uint8_t pyb_usbdd_DeInit(USBD_HandleTypeDef *pdev, uint8_t cfgidx) {
-    pyb_usbdd_obj_t *self = (pyb_usbdd_obj_t*)pdev->pClassData;
+    pyb_usbdd_obj_t *self = (pyb_usbdd_obj_t *)pdev->pClassData;
     (void)self;
     return USBD_OK;
 }
 
 static uint8_t pyb_usbdd_Setup(USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef *req) {
-    pyb_usbdd_obj_t *self = (pyb_usbdd_obj_t*)pdev->pClassData;
+    pyb_usbdd_obj_t *self = (pyb_usbdd_obj_t *)pdev->pClassData;
     (void)self;
     self->bRequest = req->bRequest;
     self->wValue = req->wValue;
@@ -1149,7 +1149,7 @@ static uint8_t pyb_usbdd_Setup(USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef *r
 }
 
 static uint8_t pyb_usbdd_EP0_TxSent(USBD_HandleTypeDef *pdev) {
-    pyb_usbdd_obj_t *self = (pyb_usbdd_obj_t*)pdev->pClassData;
+    pyb_usbdd_obj_t *self = (pyb_usbdd_obj_t *)pdev->pClassData;
     self->tx_pending = false;
     #if !USE_USB_POLLING
     // Process now that we have sent a response
@@ -1159,19 +1159,19 @@ static uint8_t pyb_usbdd_EP0_TxSent(USBD_HandleTypeDef *pdev) {
 }
 
 static uint8_t pyb_usbdd_EP0_RxReady(USBD_HandleTypeDef *pdev) {
-    pyb_usbdd_obj_t *self = (pyb_usbdd_obj_t*)pdev->pClassData;
+    pyb_usbdd_obj_t *self = (pyb_usbdd_obj_t *)pdev->pClassData;
     dfu_handle_rx(self->bRequest, self->wValue, self->wLength, self->rx_buf);
     return USBD_OK;
 }
 
 static uint8_t *pyb_usbdd_GetCfgDesc(USBD_HandleTypeDef *pdev, uint16_t *length) {
     *length = sizeof(cfg_descr);
-    return (uint8_t*)cfg_descr;
+    return (uint8_t *)cfg_descr;
 }
 
 // this is used only in high-speed mode, which we don't support
 static uint8_t *pyb_usbdd_GetDeviceQualifierDescriptor(USBD_HandleTypeDef *pdev, uint16_t *length) {
-    pyb_usbdd_obj_t *self = (pyb_usbdd_obj_t*)pdev->pClassData;
+    pyb_usbdd_obj_t *self = (pyb_usbdd_obj_t *)pdev->pClassData;
     (void)self;
     /*
     *length = sizeof(USBD_CDC_MSC_HID_DeviceQualifierDesc);
@@ -1228,7 +1228,7 @@ static void pyb_usbdd_init(pyb_usbdd_obj_t *self, int phy_id) {
     USBD_HandleTypeDef *usbd = &self->hUSBDDevice;
     usbd->id = phy_id;
     usbd->dev_state = USBD_STATE_DEFAULT;
-    usbd->pDesc = (USBD_DescriptorsTypeDef*)&pyb_usbdd_descriptors;
+    usbd->pDesc = (USBD_DescriptorsTypeDef *)&pyb_usbdd_descriptors;
     usbd->pClass = &pyb_usbdd_class;
     usbd->pClassData = self;
 }
@@ -1272,7 +1272,7 @@ NORETURN static __attribute__((naked)) void branch_to_application(uint32_t r0, u
 }
 
 static void try_enter_application(int reset_mode) {
-    uint32_t msp = *(volatile uint32_t*)APPLICATION_ADDR;
+    uint32_t msp = *(volatile uint32_t *)APPLICATION_ADDR;
     if ((msp & APP_VALIDITY_BITS) != 0) {
         // Application is invalid.
         return;
diff --git a/ports/stm32/mboot/mphalport.h b/ports/stm32/mboot/mphalport.h
index ab0bc1587cda9..aa36026646392 100644
--- a/ports/stm32/mboot/mphalport.h
+++ b/ports/stm32/mboot/mphalport.h
@@ -58,26 +58,26 @@ static inline int mp_hal_status_to_neg_errno(HAL_StatusTypeDef status) {
 #define mp_hal_pin_input(p)     mp_hal_pin_config((p), MP_HAL_PIN_MODE_INPUT, MP_HAL_PIN_PULL_NONE, 0)
 #define mp_hal_pin_output(p)    mp_hal_pin_config((p), MP_HAL_PIN_MODE_OUTPUT, MP_HAL_PIN_PULL_NONE, 0)
 #define mp_hal_pin_open_drain(p) mp_hal_pin_config((p), MP_HAL_PIN_MODE_OPEN_DRAIN, MP_HAL_PIN_PULL_NONE, 0)
-#define mp_hal_pin_low(p)       (((GPIO_TypeDef*)((p) & ~0xf))->BSRR = 0x10000 << ((p) & 0xf))
-#define mp_hal_pin_high(p)      (((GPIO_TypeDef*)((p) & ~0xf))->BSRR = 1 << ((p) & 0xf))
+#define mp_hal_pin_low(p)       (((GPIO_TypeDef *)((p) & ~0xf))->BSRR = 0x10000 << ((p) & 0xf))
+#define mp_hal_pin_high(p)      (((GPIO_TypeDef *)((p) & ~0xf))->BSRR = 1 << ((p) & 0xf))
 #define mp_hal_pin_od_low(p)    mp_hal_pin_low(p)
 #define mp_hal_pin_od_high(p)   mp_hal_pin_high(p)
-#define mp_hal_pin_read(p)      ((((GPIO_TypeDef*)((p) & ~0xf))->IDR >> ((p) & 0xf)) & 1)
+#define mp_hal_pin_read(p)      ((((GPIO_TypeDef *)((p) & ~0xf))->IDR >> ((p) & 0xf)) & 1)
 #define mp_hal_pin_write(p, v)  ((v) ? mp_hal_pin_high(p) : mp_hal_pin_low(p))
 
 void mp_hal_pin_config(uint32_t port_pin, uint32_t mode, uint32_t pull, uint32_t alt);
 void mp_hal_pin_config_speed(uint32_t port_pin, uint32_t speed);
 
-#define pin_A0  (GPIOA_BASE |  0)
-#define pin_A1  (GPIOA_BASE |  1)
-#define pin_A2  (GPIOA_BASE |  2)
-#define pin_A3  (GPIOA_BASE |  3)
-#define pin_A4  (GPIOA_BASE |  4)
-#define pin_A5  (GPIOA_BASE |  5)
-#define pin_A6  (GPIOA_BASE |  6)
-#define pin_A7  (GPIOA_BASE |  7)
-#define pin_A8  (GPIOA_BASE |  8)
-#define pin_A9  (GPIOA_BASE |  9)
+#define pin_A0  (GPIOA_BASE | 0)
+#define pin_A1  (GPIOA_BASE | 1)
+#define pin_A2  (GPIOA_BASE | 2)
+#define pin_A3  (GPIOA_BASE | 3)
+#define pin_A4  (GPIOA_BASE | 4)
+#define pin_A5  (GPIOA_BASE | 5)
+#define pin_A6  (GPIOA_BASE | 6)
+#define pin_A7  (GPIOA_BASE | 7)
+#define pin_A8  (GPIOA_BASE | 8)
+#define pin_A9  (GPIOA_BASE | 9)
 #define pin_A10 (GPIOA_BASE | 10)
 #define pin_A11 (GPIOA_BASE | 11)
 #define pin_A12 (GPIOA_BASE | 12)
@@ -85,16 +85,16 @@ void mp_hal_pin_config_speed(uint32_t port_pin, uint32_t speed);
 #define pin_A14 (GPIOA_BASE | 14)
 #define pin_A15 (GPIOA_BASE | 15)
 
-#define pin_B0  (GPIOB_BASE |  0)
-#define pin_B1  (GPIOB_BASE |  1)
-#define pin_B2  (GPIOB_BASE |  2)
-#define pin_B3  (GPIOB_BASE |  3)
-#define pin_B4  (GPIOB_BASE |  4)
-#define pin_B5  (GPIOB_BASE |  5)
-#define pin_B6  (GPIOB_BASE |  6)
-#define pin_B7  (GPIOB_BASE |  7)
-#define pin_B8  (GPIOB_BASE |  8)
-#define pin_B9  (GPIOB_BASE |  9)
+#define pin_B0  (GPIOB_BASE | 0)
+#define pin_B1  (GPIOB_BASE | 1)
+#define pin_B2  (GPIOB_BASE | 2)
+#define pin_B3  (GPIOB_BASE | 3)
+#define pin_B4  (GPIOB_BASE | 4)
+#define pin_B5  (GPIOB_BASE | 5)
+#define pin_B6  (GPIOB_BASE | 6)
+#define pin_B7  (GPIOB_BASE | 7)
+#define pin_B8  (GPIOB_BASE | 8)
+#define pin_B9  (GPIOB_BASE | 9)
 #define pin_B10 (GPIOB_BASE | 10)
 #define pin_B11 (GPIOB_BASE | 11)
 #define pin_B12 (GPIOB_BASE | 12)
@@ -102,16 +102,16 @@ void mp_hal_pin_config_speed(uint32_t port_pin, uint32_t speed);
 #define pin_B14 (GPIOB_BASE | 14)
 #define pin_B15 (GPIOB_BASE | 15)
 
-#define pin_C0  (GPIOC_BASE |  0)
-#define pin_C1  (GPIOC_BASE |  1)
-#define pin_C2  (GPIOC_BASE |  2)
-#define pin_C3  (GPIOC_BASE |  3)
-#define pin_C4  (GPIOC_BASE |  4)
-#define pin_C5  (GPIOC_BASE |  5)
-#define pin_C6  (GPIOC_BASE |  6)
-#define pin_C7  (GPIOC_BASE |  7)
-#define pin_C8  (GPIOC_BASE |  8)
-#define pin_C9  (GPIOC_BASE |  9)
+#define pin_C0  (GPIOC_BASE | 0)
+#define pin_C1  (GPIOC_BASE | 1)
+#define pin_C2  (GPIOC_BASE | 2)
+#define pin_C3  (GPIOC_BASE | 3)
+#define pin_C4  (GPIOC_BASE | 4)
+#define pin_C5  (GPIOC_BASE | 5)
+#define pin_C6  (GPIOC_BASE | 6)
+#define pin_C7  (GPIOC_BASE | 7)
+#define pin_C8  (GPIOC_BASE | 8)
+#define pin_C9  (GPIOC_BASE | 9)
 #define pin_C10 (GPIOC_BASE | 10)
 #define pin_C11 (GPIOC_BASE | 11)
 #define pin_C12 (GPIOC_BASE | 12)
@@ -119,16 +119,16 @@ void mp_hal_pin_config_speed(uint32_t port_pin, uint32_t speed);
 #define pin_C14 (GPIOC_BASE | 14)
 #define pin_C15 (GPIOC_BASE | 15)
 
-#define pin_D0  (GPIOD_BASE |  0)
-#define pin_D1  (GPIOD_BASE |  1)
-#define pin_D2  (GPIOD_BASE |  2)
-#define pin_D3  (GPIOD_BASE |  3)
-#define pin_D4  (GPIOD_BASE |  4)
-#define pin_D5  (GPIOD_BASE |  5)
-#define pin_D6  (GPIOD_BASE |  6)
-#define pin_D7  (GPIOD_BASE |  7)
-#define pin_D8  (GPIOD_BASE |  8)
-#define pin_D9  (GPIOD_BASE |  9)
+#define pin_D0  (GPIOD_BASE | 0)
+#define pin_D1  (GPIOD_BASE | 1)
+#define pin_D2  (GPIOD_BASE | 2)
+#define pin_D3  (GPIOD_BASE | 3)
+#define pin_D4  (GPIOD_BASE | 4)
+#define pin_D5  (GPIOD_BASE | 5)
+#define pin_D6  (GPIOD_BASE | 6)
+#define pin_D7  (GPIOD_BASE | 7)
+#define pin_D8  (GPIOD_BASE | 8)
+#define pin_D9  (GPIOD_BASE | 9)
 #define pin_D10 (GPIOD_BASE | 10)
 #define pin_D11 (GPIOD_BASE | 11)
 #define pin_D12 (GPIOD_BASE | 12)
@@ -136,16 +136,16 @@ void mp_hal_pin_config_speed(uint32_t port_pin, uint32_t speed);
 #define pin_D14 (GPIOD_BASE | 14)
 #define pin_D15 (GPIOD_BASE | 15)
 
-#define pin_E0  (GPIOE_BASE |  0)
-#define pin_E1  (GPIOE_BASE |  1)
-#define pin_E2  (GPIOE_BASE |  2)
-#define pin_E3  (GPIOE_BASE |  3)
-#define pin_E4  (GPIOE_BASE |  4)
-#define pin_E5  (GPIOE_BASE |  5)
-#define pin_E6  (GPIOE_BASE |  6)
-#define pin_E7  (GPIOE_BASE |  7)
-#define pin_E8  (GPIOE_BASE |  8)
-#define pin_E9  (GPIOE_BASE |  9)
+#define pin_E0  (GPIOE_BASE | 0)
+#define pin_E1  (GPIOE_BASE | 1)
+#define pin_E2  (GPIOE_BASE | 2)
+#define pin_E3  (GPIOE_BASE | 3)
+#define pin_E4  (GPIOE_BASE | 4)
+#define pin_E5  (GPIOE_BASE | 5)
+#define pin_E6  (GPIOE_BASE | 6)
+#define pin_E7  (GPIOE_BASE | 7)
+#define pin_E8  (GPIOE_BASE | 8)
+#define pin_E9  (GPIOE_BASE | 9)
 #define pin_E10 (GPIOE_BASE | 10)
 #define pin_E11 (GPIOE_BASE | 11)
 #define pin_E12 (GPIOE_BASE | 12)
@@ -153,16 +153,16 @@ void mp_hal_pin_config_speed(uint32_t port_pin, uint32_t speed);
 #define pin_E14 (GPIOE_BASE | 14)
 #define pin_E15 (GPIOE_BASE | 15)
 
-#define pin_F0  (GPIOF_BASE |  0)
-#define pin_F1  (GPIOF_BASE |  1)
-#define pin_F2  (GPIOF_BASE |  2)
-#define pin_F3  (GPIOF_BASE |  3)
-#define pin_F4  (GPIOF_BASE |  4)
-#define pin_F5  (GPIOF_BASE |  5)
-#define pin_F6  (GPIOF_BASE |  6)
-#define pin_F7  (GPIOF_BASE |  7)
-#define pin_F8  (GPIOF_BASE |  8)
-#define pin_F9  (GPIOF_BASE |  9)
+#define pin_F0  (GPIOF_BASE | 0)
+#define pin_F1  (GPIOF_BASE | 1)
+#define pin_F2  (GPIOF_BASE | 2)
+#define pin_F3  (GPIOF_BASE | 3)
+#define pin_F4  (GPIOF_BASE | 4)
+#define pin_F5  (GPIOF_BASE | 5)
+#define pin_F6  (GPIOF_BASE | 6)
+#define pin_F7  (GPIOF_BASE | 7)
+#define pin_F8  (GPIOF_BASE | 8)
+#define pin_F9  (GPIOF_BASE | 9)
 #define pin_F10 (GPIOF_BASE | 10)
 #define pin_F11 (GPIOF_BASE | 11)
 #define pin_F12 (GPIOF_BASE | 12)
@@ -170,16 +170,16 @@ void mp_hal_pin_config_speed(uint32_t port_pin, uint32_t speed);
 #define pin_F14 (GPIOF_BASE | 14)
 #define pin_F15 (GPIOF_BASE | 15)
 
-#define pin_G0  (GPIOG_BASE |  0)
-#define pin_G1  (GPIOG_BASE |  1)
-#define pin_G2  (GPIOG_BASE |  2)
-#define pin_G3  (GPIOG_BASE |  3)
-#define pin_G4  (GPIOG_BASE |  4)
-#define pin_G5  (GPIOG_BASE |  5)
-#define pin_G6  (GPIOG_BASE |  6)
-#define pin_G7  (GPIOG_BASE |  7)
-#define pin_G8  (GPIOG_BASE |  8)
-#define pin_G9  (GPIOG_BASE |  9)
+#define pin_G0  (GPIOG_BASE | 0)
+#define pin_G1  (GPIOG_BASE | 1)
+#define pin_G2  (GPIOG_BASE | 2)
+#define pin_G3  (GPIOG_BASE | 3)
+#define pin_G4  (GPIOG_BASE | 4)
+#define pin_G5  (GPIOG_BASE | 5)
+#define pin_G6  (GPIOG_BASE | 6)
+#define pin_G7  (GPIOG_BASE | 7)
+#define pin_G8  (GPIOG_BASE | 8)
+#define pin_G9  (GPIOG_BASE | 9)
 #define pin_G10 (GPIOG_BASE | 10)
 #define pin_G11 (GPIOG_BASE | 11)
 #define pin_G12 (GPIOG_BASE | 12)
@@ -187,16 +187,16 @@ void mp_hal_pin_config_speed(uint32_t port_pin, uint32_t speed);
 #define pin_G14 (GPIOG_BASE | 14)
 #define pin_G15 (GPIOG_BASE | 15)
 
-#define pin_H0  (GPIOH_BASE |  0)
-#define pin_H1  (GPIOH_BASE |  1)
-#define pin_H2  (GPIOH_BASE |  2)
-#define pin_H3  (GPIOH_BASE |  3)
-#define pin_H4  (GPIOH_BASE |  4)
-#define pin_H5  (GPIOH_BASE |  5)
-#define pin_H6  (GPIOH_BASE |  6)
-#define pin_H7  (GPIOH_BASE |  7)
-#define pin_H8  (GPIOH_BASE |  8)
-#define pin_H9  (GPIOH_BASE |  9)
+#define pin_H0  (GPIOH_BASE | 0)
+#define pin_H1  (GPIOH_BASE | 1)
+#define pin_H2  (GPIOH_BASE | 2)
+#define pin_H3  (GPIOH_BASE | 3)
+#define pin_H4  (GPIOH_BASE | 4)
+#define pin_H5  (GPIOH_BASE | 5)
+#define pin_H6  (GPIOH_BASE | 6)
+#define pin_H7  (GPIOH_BASE | 7)
+#define pin_H8  (GPIOH_BASE | 8)
+#define pin_H9  (GPIOH_BASE | 9)
 #define pin_H10 (GPIOH_BASE | 10)
 #define pin_H11 (GPIOH_BASE | 11)
 #define pin_H12 (GPIOH_BASE | 12)
@@ -204,16 +204,16 @@ void mp_hal_pin_config_speed(uint32_t port_pin, uint32_t speed);
 #define pin_H14 (GPIOH_BASE | 14)
 #define pin_H15 (GPIOH_BASE | 15)
 
-#define pin_I0  (GPIOI_BASE |  0)
-#define pin_I1  (GPIOI_BASE |  1)
-#define pin_I2  (GPIOI_BASE |  2)
-#define pin_I3  (GPIOI_BASE |  3)
-#define pin_I4  (GPIOI_BASE |  4)
-#define pin_I5  (GPIOI_BASE |  5)
-#define pin_I6  (GPIOI_BASE |  6)
-#define pin_I7  (GPIOI_BASE |  7)
-#define pin_I8  (GPIOI_BASE |  8)
-#define pin_I9  (GPIOI_BASE |  9)
+#define pin_I0  (GPIOI_BASE | 0)
+#define pin_I1  (GPIOI_BASE | 1)
+#define pin_I2  (GPIOI_BASE | 2)
+#define pin_I3  (GPIOI_BASE | 3)
+#define pin_I4  (GPIOI_BASE | 4)
+#define pin_I5  (GPIOI_BASE | 5)
+#define pin_I6  (GPIOI_BASE | 6)
+#define pin_I7  (GPIOI_BASE | 7)
+#define pin_I8  (GPIOI_BASE | 8)
+#define pin_I9  (GPIOI_BASE | 9)
 #define pin_I10 (GPIOI_BASE | 10)
 #define pin_I11 (GPIOI_BASE | 11)
 #define pin_I12 (GPIOI_BASE | 12)
@@ -221,16 +221,16 @@ void mp_hal_pin_config_speed(uint32_t port_pin, uint32_t speed);
 #define pin_I14 (GPIOI_BASE | 14)
 #define pin_I15 (GPIOI_BASE | 15)
 
-#define pin_J0  (GPIOJ_BASE |  0)
-#define pin_J1  (GPIOJ_BASE |  1)
-#define pin_J2  (GPIOJ_BASE |  2)
-#define pin_J3  (GPIOJ_BASE |  3)
-#define pin_J4  (GPIOJ_BASE |  4)
-#define pin_J5  (GPIOJ_BASE |  5)
-#define pin_J6  (GPIOJ_BASE |  6)
-#define pin_J7  (GPIOJ_BASE |  7)
-#define pin_J8  (GPIOJ_BASE |  8)
-#define pin_J9  (GPIOJ_BASE |  9)
+#define pin_J0  (GPIOJ_BASE | 0)
+#define pin_J1  (GPIOJ_BASE | 1)
+#define pin_J2  (GPIOJ_BASE | 2)
+#define pin_J3  (GPIOJ_BASE | 3)
+#define pin_J4  (GPIOJ_BASE | 4)
+#define pin_J5  (GPIOJ_BASE | 5)
+#define pin_J6  (GPIOJ_BASE | 6)
+#define pin_J7  (GPIOJ_BASE | 7)
+#define pin_J8  (GPIOJ_BASE | 8)
+#define pin_J9  (GPIOJ_BASE | 9)
 #define pin_J10 (GPIOJ_BASE | 10)
 #define pin_J11 (GPIOJ_BASE | 11)
 #define pin_J12 (GPIOJ_BASE | 12)
diff --git a/ports/stm32/mboot/pack.c b/ports/stm32/mboot/pack.c
index 03ac6a4dc55ab..6a2b7d4780370 100644
--- a/ports/stm32/mboot/pack.c
+++ b/ports/stm32/mboot/pack.c
@@ -284,7 +284,7 @@ int mboot_pack_write(uint32_t addr, const uint8_t *src8, size_t len, bool dry_ru
     } else if (firmware_chunk_buf.header.format == MBOOT_PACK_CHUNK_FULL_SIG) {
         return mboot_pack_handle_full_sig();
     } else if (firmware_chunk_buf.header.format == MBOOT_PACK_CHUNK_FW_RAW
-        || firmware_chunk_buf.header.format == MBOOT_PACK_CHUNK_FW_GZIP) {
+               || firmware_chunk_buf.header.format == MBOOT_PACK_CHUNK_FW_GZIP) {
         return mboot_pack_handle_firmware();
     } else {
         // Unsupported contents.
diff --git a/ports/stm32/mboot/vfs_fat.c b/ports/stm32/mboot/vfs_fat.c
index e316910466cbb..09c7931fd3aaf 100644
--- a/ports/stm32/mboot/vfs_fat.c
+++ b/ports/stm32/mboot/vfs_fat.c
@@ -58,20 +58,20 @@ DRESULT disk_ioctl(void *pdrv, BYTE cmd, void *buf) {
             return RES_OK;
 
         case GET_SECTOR_COUNT:
-            *((DWORD*)buf) = ctx->bdev_num_blocks;
+            *((DWORD *)buf) = ctx->bdev_num_blocks;
             return RES_OK;
 
         case GET_SECTOR_SIZE:
-            *((WORD*)buf) = SECSIZE;
+            *((WORD *)buf) = SECSIZE;
             return RES_OK;
 
         case GET_BLOCK_SIZE:
-            *((DWORD*)buf) = 1; // erase block size in units of sector size
+            *((DWORD *)buf) = 1; // erase block size in units of sector size
             return RES_OK;
 
         case IOCTL_INIT:
         case IOCTL_STATUS:
-            *((DSTATUS*)buf) = STA_PROTECT;
+            *((DSTATUS *)buf) = STA_PROTECT;
             return RES_OK;
 
         default:
diff --git a/ports/stm32/mboot/vfs_lfs.c b/ports/stm32/mboot/vfs_lfs.c
index 5aa400df40500..a575cdd30aff4 100644
--- a/ports/stm32/mboot/vfs_lfs.c
+++ b/ports/stm32/mboot/vfs_lfs.c
@@ -41,7 +41,7 @@
 #define MBOOT_ERRNO_VFS_LFS_OPEN_FAILED MBOOT_ERRNO_VFS_LFS1_OPEN_FAILED
 
 #define LFSx_MACRO(s) LFS1##s
-#define LFSx_API(x) lfs1_ ## x
+#define LFSx_API(x) lfs1_##x
 #define VFS_LFSx_CONTEXT_T vfs_lfs1_context_t
 #define VFS_LFSx_MOUNT vfs_lfs1_mount
 #define VFS_LFSx_STREAM_METHODS vfs_lfs1_stream_methods
@@ -56,7 +56,7 @@ static uint8_t lfs_lookahead_buffer[LFS_LOOKAHEAD_SIZE / 8];
 #define MBOOT_ERRNO_VFS_LFS_OPEN_FAILED MBOOT_ERRNO_VFS_LFS2_OPEN_FAILED
 
 #define LFSx_MACRO(s) LFS2##s
-#define LFSx_API(x) lfs2_ ## x
+#define LFSx_API(x) lfs2_##x
 #define VFS_LFSx_CONTEXT_T vfs_lfs2_context_t
 #define VFS_LFSx_MOUNT vfs_lfs2_mount
 #define VFS_LFSx_STREAM_METHODS vfs_lfs2_stream_methods
@@ -67,7 +67,7 @@ static uint8_t lfs_lookahead_buffer[LFS_LOOKAHEAD_SIZE];
 
 #endif
 
-static int dev_read(const struct LFSx_API (config) * c, LFSx_API(block_t) block, LFSx_API(off_t) off, void *buffer, LFSx_API(size_t) size) {
+static int dev_read(const struct LFSx_API (config) * c, LFSx_API(block_t)block, LFSx_API(off_t)off, void *buffer, LFSx_API(size_t)size) {
     VFS_LFSx_CONTEXT_T *ctx = c->context;
     if (0 <= block && block < ctx->config.block_count) {
         mboot_addr_t addr = ctx->bdev_base_addr + (mboot_addr_t)block * (mboot_addr_t)ctx->config.block_size + (mboot_addr_t)off;
@@ -77,11 +77,11 @@ static int dev_read(const struct LFSx_API (config) * c, LFSx_API(block_t) block,
     return LFSx_MACRO(_ERR_IO);
 }
 
-static int dev_prog(const struct LFSx_API (config) * c, LFSx_API(block_t) block, LFSx_API(off_t) off, const void *buffer, LFSx_API(size_t) size) {
+static int dev_prog(const struct LFSx_API (config) * c, LFSx_API(block_t)block, LFSx_API(off_t)off, const void *buffer, LFSx_API(size_t)size) {
     return LFSx_MACRO(_ERR_IO);
 }
 
-static int dev_erase(const struct LFSx_API (config) * c, LFSx_API(block_t) block) {
+static int dev_erase(const struct LFSx_API (config) * c, LFSx_API(block_t)block) {
     return LFSx_MACRO(_ERR_IO);
 }
 
@@ -92,7 +92,7 @@ static int dev_sync(const struct LFSx_API (config) * c) {
 int VFS_LFSx_MOUNT(VFS_LFSx_CONTEXT_T *ctx, mboot_addr_t base_addr, mboot_addr_t byte_len, uint32_t block_size) {
     ctx->bdev_base_addr = base_addr;
 
-    struct LFSx_API (config) *config = &ctx->config;
+    struct LFSx_API (config) * config = &ctx->config;
     memset(config, 0, sizeof(*config));
 
     config->context = ctx;
diff --git a/ports/unix/variants/coverage/frzmpy/frzmpy1.py b/ports/unix/variants/coverage/frzmpy/frzmpy1.py
index 8ad0f15730205..83231c81a5f53 100644
--- a/ports/unix/variants/coverage/frzmpy/frzmpy1.py
+++ b/ports/unix/variants/coverage/frzmpy/frzmpy1.py
@@ -1 +1 @@
-print('frzmpy1')
+print("frzmpy1")
diff --git a/ports/unix/variants/coverage/frzmpy/frzmpy_pkg1/__init__.py b/ports/unix/variants/coverage/frzmpy/frzmpy_pkg1/__init__.py
index 8c023afeba975..a0f0a6e540eb0 100644
--- a/ports/unix/variants/coverage/frzmpy/frzmpy_pkg1/__init__.py
+++ b/ports/unix/variants/coverage/frzmpy/frzmpy_pkg1/__init__.py
@@ -1,3 +1,3 @@
 # test frozen package with __init__.py
-print('frzmpy_pkg1.__init__')
+print("frzmpy_pkg1.__init__")
 x = 1
diff --git a/ports/unix/variants/coverage/frzmpy/frzmpy_pkg2/mod.py b/ports/unix/variants/coverage/frzmpy/frzmpy_pkg2/mod.py
index a66b505bf6b3f..bd5419a0a7696 100644
--- a/ports/unix/variants/coverage/frzmpy/frzmpy_pkg2/mod.py
+++ b/ports/unix/variants/coverage/frzmpy/frzmpy_pkg2/mod.py
@@ -1,4 +1,6 @@
 # test frozen package without __init__.py
-print('frzmpy_pkg2.mod')
+print("frzmpy_pkg2.mod")
+
+
 class Foo:
     x = 1
diff --git a/ports/unix/variants/coverage/frzstr/frzstr1.py b/ports/unix/variants/coverage/frzstr/frzstr1.py
index 6e88ac38d2cde..cf4b98d338d11 100644
--- a/ports/unix/variants/coverage/frzstr/frzstr1.py
+++ b/ports/unix/variants/coverage/frzstr/frzstr1.py
@@ -1 +1 @@
-print('frzstr1')
+print("frzstr1")
diff --git a/ports/unix/variants/coverage/frzstr/frzstr_pkg1/__init__.py b/ports/unix/variants/coverage/frzstr/frzstr_pkg1/__init__.py
index 1d1df9417edfe..748abb6ce90eb 100644
--- a/ports/unix/variants/coverage/frzstr/frzstr_pkg1/__init__.py
+++ b/ports/unix/variants/coverage/frzstr/frzstr_pkg1/__init__.py
@@ -1,3 +1,3 @@
 # test frozen package with __init__.py
-print('frzstr_pkg1.__init__')
+print("frzstr_pkg1.__init__")
 x = 1
diff --git a/ports/unix/variants/coverage/frzstr/frzstr_pkg2/mod.py b/ports/unix/variants/coverage/frzstr/frzstr_pkg2/mod.py
index bafb5978b0a78..9e256d9ea796e 100644
--- a/ports/unix/variants/coverage/frzstr/frzstr_pkg2/mod.py
+++ b/ports/unix/variants/coverage/frzstr/frzstr_pkg2/mod.py
@@ -1,4 +1,6 @@
 # test frozen package without __init__.py
-print('frzstr_pkg2.mod')
+print("frzstr_pkg2.mod")
+
+
 class Foo:
     x = 1
diff --git a/ports/unix/variants/manifest.py b/ports/unix/variants/manifest.py
index 666b4c0ab3eee..7708e598dbcfb 100644
--- a/ports/unix/variants/manifest.py
+++ b/ports/unix/variants/manifest.py
@@ -1,2 +1,2 @@
-freeze_as_mpy('$(MPY_DIR)/tools', 'upip.py')
-freeze_as_mpy('$(MPY_DIR)/tools', 'upip_utarfile.py', opt=3)
+freeze_as_mpy("$(MPY_DIR)/tools", "upip.py")
+freeze_as_mpy("$(MPY_DIR)/tools", "upip_utarfile.py", opt=3)
diff --git a/ports/zephyr/src/zephyr_getchar.c b/ports/zephyr/src/zephyr_getchar.c
index 95d0b49959326..218fb18646345 100644
--- a/ports/zephyr/src/zephyr_getchar.c
+++ b/ports/zephyr/src/zephyr_getchar.c
@@ -30,8 +30,7 @@ static struct k_sem uart_sem;
 static uint8_t uart_ringbuf[UART_BUFSIZE];
 static uint8_t i_get, i_put;
 
-static int console_irq_input_hook(uint8_t ch)
-{
+static int console_irq_input_hook(uint8_t ch) {
     int i_next = (i_put + 1) & (UART_BUFSIZE - 1);
     if (i_next == i_get) {
         printk("UART buffer overflow - char dropped\n");
@@ -45,7 +44,7 @@ static int console_irq_input_hook(uint8_t ch)
         uart_ringbuf[i_put] = ch;
         i_put = i_next;
     }
-    //printk("%x\n", ch);
+    // printk("%x\n", ch);
     k_sem_give(&uart_sem);
     k_yield();
     return 1;
diff --git a/ports/zephyr/src/zephyr_start.c b/ports/zephyr/src/zephyr_start.c
index 62ee922a86c6d..7806eeeea32e9 100644
--- a/ports/zephyr/src/zephyr_start.c
+++ b/ports/zephyr/src/zephyr_start.c
@@ -30,11 +30,11 @@
 int real_main(void);
 
 void main(void) {
-#ifdef CONFIG_CONSOLE_SUBSYS
+    #ifdef CONFIG_CONSOLE_SUBSYS
     console_init();
-#else
+    #else
     zephyr_getchar_init();
-#endif
+    #endif
     real_main();
 
     // This is needed so the linker includes k_timer_init, z_impl_k_timer_start

From c8a687a8fa696a2c8ce46b36d5e14322bb1cd526 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 19 Apr 2022 11:44:31 +1000
Subject: [PATCH 1946/3533] top: Update .git-blame-ignore-revs for latest
 formatting commit.

Signed-off-by: Damien George <damien@micropython.org>
---
 .git-blame-ignore-revs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index fbd35fd2c23aa..648cdc3bc4065 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -1,3 +1,6 @@
+# ports: Reformat more C and Python source code.
+5c32111fa0e31e451b0f1666bdf926be2fdfd82c
+
 # all: Update Python formatting to latest Black version 22.1.0.
 ab2923dfa1174dc177f0a90cb00a7e4ff87958d2
 

From ef1c2cdab0fbc2d71177d33281539dd88cea1904 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 20 Apr 2022 17:11:55 +1000
Subject: [PATCH 1947/3533] tests/extmod/uasyncio_gather: Make double-raise
 gather test reliable.

This double-raise test could fail when task[0] raises and stops the gather
before task[1] raises, then task[1] is left to raise later on and spoil the
test.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/extmod/uasyncio_gather.py     | 8 +++++---
 tests/extmod/uasyncio_gather.py.exp | 4 ++++
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/tests/extmod/uasyncio_gather.py b/tests/extmod/uasyncio_gather.py
index 718e702be6be9..366c113a26be8 100644
--- a/tests/extmod/uasyncio_gather.py
+++ b/tests/extmod/uasyncio_gather.py
@@ -34,9 +34,10 @@ async def task_loop(id):
         print("task_loop loop", id)
 
 
-async def task_raise(id):
+async def task_raise(id, t=0.02):
     print("task_raise start", id)
-    await asyncio.sleep(0.02)
+    await asyncio.sleep(t)
+    print("task_raise raise", id)
     raise ValueError(id)
 
 
@@ -79,7 +80,8 @@ async def main():
     print("====")
 
     # Test case where both tasks raise an exception.
-    tasks = [asyncio.create_task(task_raise(1)), asyncio.create_task(task_raise(2))]
+    # Use t=0 so they raise one after the other, between the gather starting and finishing.
+    tasks = [asyncio.create_task(task_raise(1, t=0)), asyncio.create_task(task_raise(2, t=0))]
     try:
         await asyncio.gather(*tasks)
     except ValueError as er:
diff --git a/tests/extmod/uasyncio_gather.py.exp b/tests/extmod/uasyncio_gather.py.exp
index 9b30c36b67a47..74a2ecf7519ff 100644
--- a/tests/extmod/uasyncio_gather.py.exp
+++ b/tests/extmod/uasyncio_gather.py.exp
@@ -16,16 +16,20 @@ end 2
 start 1
 task_raise start 2
 end 1
+task_raise raise 2
 [1, ValueError(2,)]
 ====
 task_loop start 1
 task_raise start 2
 task_loop loop 1
+task_raise raise 2
 ValueError(2,)
 False True
 ====
 task_raise start 1
 task_raise start 2
+task_raise raise 1
+task_raise raise 2
 ValueError(1,)
 True True
 ====

From 81c9219375a005e5fd1abee236733fa4c95b19da Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 21 Apr 2022 14:24:37 +1000
Subject: [PATCH 1948/3533] tools/ci.sh: Don't run uasyncio_gather test on
 macOS.

The timing on macOS makes this test unreliable.

Signed-off-by: Damien George <damien@micropython.org>
---
 tools/ci.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/ci.sh b/tools/ci.sh
index 0faf1bc711b7f..7d68709ae4999 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -561,7 +561,7 @@ function ci_unix_macos_run_tests {
     # - OSX has poor time resolution and these uasyncio tests do not have correct output
     # - import_pkg7 has a problem with relative imports
     # - urandom_basic has a problem with getrandbits(0)
-    (cd tests && ./run-tests.py --exclude 'uasyncio_(basic|heaplock|lock|wait_task)' --exclude 'import_pkg7.py' --exclude 'urandom_basic.py')
+    (cd tests && ./run-tests.py --exclude 'uasyncio_(basic|gather|heaplock|lock|wait_task)' --exclude 'import_pkg7.py' --exclude 'urandom_basic.py')
 }
 
 function ci_unix_qemu_mips_setup {

From 8631753ff450850fabc7cb925b829030f0e51f44 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 21 Apr 2022 10:54:02 +1000
Subject: [PATCH 1949/3533] tests/run-tests.py: Add timeout for running
 PC-based MicroPython test.

So the test suite runs to completion, even if the interpreter locks up.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/run-tests.py | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/tests/run-tests.py b/tests/run-tests.py
index d0ecc74a9a735..3732e47adaff8 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -13,6 +13,9 @@
 import threading
 import tempfile
 
+# Maximum time to run a PC-based test, in seconds.
+TEST_TIMEOUT = 30
+
 # See stackoverflow.com/questions/2632199: __file__ nor sys.argv[0]
 # are guaranteed to always work, this one should though.
 BASEPATH = os.path.dirname(os.path.abspath(inspect.getsourcefile(lambda: None)))
@@ -178,10 +181,15 @@ def send_get(what):
 
             # run the actual test
             try:
-                output_mupy = subprocess.check_output(cmdlist, stderr=subprocess.STDOUT)
+                output_mupy = subprocess.check_output(
+                    cmdlist, stderr=subprocess.STDOUT, timeout=TEST_TIMEOUT
+                )
             except subprocess.CalledProcessError as er:
                 had_crash = True
                 output_mupy = er.output + b"CRASH"
+            except subprocess.TimeoutExpired as er:
+                had_crash = True
+                output_mupy = (er.output or b"") + b"TIMEOUT"
 
             # clean up if we had an intermediate .mpy file
             if args.via_mpy:

From f7454f850feaeef7f567e434205ad648192ba01b Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 21 Apr 2022 13:17:33 +1000
Subject: [PATCH 1950/3533] extmod/uasyncio: Make Python Task match C version
 with use of asserts.

This helps to catch bugs when a Task is put on more than one pairing heap.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/uasyncio/task.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/extmod/uasyncio/task.py b/extmod/uasyncio/task.py
index d775164909492..94768b95a4a5f 100644
--- a/extmod/uasyncio/task.py
+++ b/extmod/uasyncio/task.py
@@ -100,10 +100,10 @@ def peek(self):
         return self.heap
 
     def push_sorted(self, v, key):
+        assert v.ph_child is None
+        assert v.ph_next is None
         v.data = None
         v.ph_key = key
-        v.ph_child = None
-        v.ph_next = None
         self.heap = ph_meld(v, self.heap)
 
     def push_head(self, v):
@@ -111,7 +111,9 @@ def push_head(self, v):
 
     def pop_head(self):
         v = self.heap
-        self.heap = ph_pairing(self.heap.ph_child)
+        assert v.ph_next is None
+        self.heap = ph_pairing(v.ph_child)
+        v.ph_child = None
         return v
 
     def remove(self, v):

From 28e7e15c0ad03f406cc5214f22d9a90a560f65c4 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 21 Apr 2022 13:19:34 +1000
Subject: [PATCH 1951/3533] extmod/uasyncio: Fix bug with task ending just
 after gather is cancel'd.

This fixes a bug where the gather is cancelled externally and then one of
its sub-tasks (that the gather was waiting on) finishes right between the
cancellation being queued and being executed.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/uasyncio/funcs.py            |  8 ++++++--
 tests/extmod/uasyncio_gather.py     | 13 +++++++++++--
 tests/extmod/uasyncio_gather.py.exp | 16 ++++++++++++++++
 3 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/extmod/uasyncio/funcs.py b/extmod/uasyncio/funcs.py
index b19edeb6ef258..a76ab0d32148c 100644
--- a/extmod/uasyncio/funcs.py
+++ b/extmod/uasyncio/funcs.py
@@ -61,9 +61,13 @@ def remove(t):
 
 async def gather(*aws, return_exceptions=False):
     def done(t, er):
+        # Sub-task "t" has finished, with exception "er".
         nonlocal state
-        if type(state) is not int:
-            # A sub-task already raised an exception, so do nothing.
+        if gather_task.data is not _Remove:
+            # The main gather task has already been scheduled, so do nothing.
+            # This happens if another sub-task already raised an exception and
+            # woke the main gather task (via this done function), or if the main
+            # gather task was cancelled externally.
             return
         elif not return_exceptions and not isinstance(er, StopIteration):
             # A sub-task raised an exception, indicate that to the gather task.
diff --git a/tests/extmod/uasyncio_gather.py b/tests/extmod/uasyncio_gather.py
index 366c113a26be8..fb47e753f1429 100644
--- a/tests/extmod/uasyncio_gather.py
+++ b/tests/extmod/uasyncio_gather.py
@@ -20,9 +20,9 @@ async def factorial(name, number):
     return f
 
 
-async def task(id):
+async def task(id, t=0.02):
     print("start", id)
-    await asyncio.sleep(0.02)
+    await asyncio.sleep(t)
     print("end", id)
     return id
 
@@ -96,5 +96,14 @@ async def main():
     t.cancel()
     await asyncio.sleep(0.04)
 
+    # Test edge cases where the gather is cancelled just as tasks are created and ending.
+    for i in range(1, 4):
+        print("====")
+        t = asyncio.create_task(gather_task(task(1, t=0), task(2, t=0)))
+        for _ in range(i):
+            await asyncio.sleep(0)
+        t.cancel()
+        await asyncio.sleep(0.2)
+
 
 asyncio.run(main())
diff --git a/tests/extmod/uasyncio_gather.py.exp b/tests/extmod/uasyncio_gather.py.exp
index 74a2ecf7519ff..a5ea47ab500d8 100644
--- a/tests/extmod/uasyncio_gather.py.exp
+++ b/tests/extmod/uasyncio_gather.py.exp
@@ -36,3 +36,19 @@ True True
 gather_task
 start 1
 start 2
+====
+gather_task
+start 1
+start 2
+====
+gather_task
+start 1
+start 2
+end 1
+end 2
+====
+gather_task
+start 1
+start 2
+end 1
+end 2

From caaff940a265bd30cca5a271b49e7addaf05ef53 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 20 Apr 2022 17:20:07 +1000
Subject: [PATCH 1952/3533] extmod/uasyncio: Rename and merge TaskQueue
 push/pop methods.

These are internal names and can be safely renamed without affecting user
code.  push_sorted() and push_head() are merged into a single push()
method, which is already how the C version is implemented.  pop_head() is
simply renamed to pop().

The changes are:
- q.push_sorted(task, t) -> q.push(task, t)
- q.push_head(task) -> q.push(task)
- q.pop_head() -> q.pop()

The shorter names and removal of push_head() leads to a code size reduction
of between 40 and 64 bytes on bare-metal targets.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/moduasyncio.c     | 23 +++++++++++------------
 extmod/uasyncio/core.py  | 16 ++++++++--------
 extmod/uasyncio/event.py |  4 ++--
 extmod/uasyncio/funcs.py |  2 +-
 extmod/uasyncio/lock.py  |  6 +++---
 extmod/uasyncio/task.py  | 15 ++++++---------
 6 files changed, 31 insertions(+), 35 deletions(-)

diff --git a/extmod/moduasyncio.c b/extmod/moduasyncio.c
index b0921b6eb13fe..229a146c1a84e 100644
--- a/extmod/moduasyncio.c
+++ b/extmod/moduasyncio.c
@@ -103,7 +103,7 @@ STATIC mp_obj_t task_queue_peek(mp_obj_t self_in) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(task_queue_peek_obj, task_queue_peek);
 
-STATIC mp_obj_t task_queue_push_sorted(size_t n_args, const mp_obj_t *args) {
+STATIC mp_obj_t task_queue_push(size_t n_args, const mp_obj_t *args) {
     mp_obj_task_queue_t *self = MP_OBJ_TO_PTR(args[0]);
     mp_obj_task_t *task = MP_OBJ_TO_PTR(args[1]);
     task->data = mp_const_none;
@@ -116,9 +116,9 @@ STATIC mp_obj_t task_queue_push_sorted(size_t n_args, const mp_obj_t *args) {
     self->heap = (mp_obj_task_t *)mp_pairheap_push(task_lt, TASK_PAIRHEAP(self->heap), TASK_PAIRHEAP(task));
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(task_queue_push_sorted_obj, 2, 3, task_queue_push_sorted);
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(task_queue_push_obj, 2, 3, task_queue_push);
 
-STATIC mp_obj_t task_queue_pop_head(mp_obj_t self_in) {
+STATIC mp_obj_t task_queue_pop(mp_obj_t self_in) {
     mp_obj_task_queue_t *self = MP_OBJ_TO_PTR(self_in);
     mp_obj_task_t *head = (mp_obj_task_t *)mp_pairheap_peek(task_lt, &self->heap->pairheap);
     if (head == NULL) {
@@ -127,7 +127,7 @@ STATIC mp_obj_t task_queue_pop_head(mp_obj_t self_in) {
     self->heap = (mp_obj_task_t *)mp_pairheap_pop(task_lt, &self->heap->pairheap);
     return MP_OBJ_FROM_PTR(head);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(task_queue_pop_head_obj, task_queue_pop_head);
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(task_queue_pop_obj, task_queue_pop);
 
 STATIC mp_obj_t task_queue_remove(mp_obj_t self_in, mp_obj_t task_in) {
     mp_obj_task_queue_t *self = MP_OBJ_TO_PTR(self_in);
@@ -139,9 +139,8 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(task_queue_remove_obj, task_queue_remove);
 
 STATIC const mp_rom_map_elem_t task_queue_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_peek), MP_ROM_PTR(&task_queue_peek_obj) },
-    { MP_ROM_QSTR(MP_QSTR_push_sorted), MP_ROM_PTR(&task_queue_push_sorted_obj) },
-    { MP_ROM_QSTR(MP_QSTR_push_head), MP_ROM_PTR(&task_queue_push_sorted_obj) },
-    { MP_ROM_QSTR(MP_QSTR_pop_head), MP_ROM_PTR(&task_queue_pop_head_obj) },
+    { MP_ROM_QSTR(MP_QSTR_push), MP_ROM_PTR(&task_queue_push_obj) },
+    { MP_ROM_QSTR(MP_QSTR_pop), MP_ROM_PTR(&task_queue_pop_obj) },
     { MP_ROM_QSTR(MP_QSTR_remove), MP_ROM_PTR(&task_queue_remove_obj) },
 };
 STATIC MP_DEFINE_CONST_DICT(task_queue_locals_dict, task_queue_locals_dict_table);
@@ -205,18 +204,18 @@ STATIC mp_obj_t task_cancel(mp_obj_t self_in) {
         // Not on the main running queue, remove the task from the queue it's on.
         dest[2] = MP_OBJ_FROM_PTR(self);
         mp_call_method_n_kw(1, 0, dest);
-        // _task_queue.push_head(self)
+        // _task_queue.push(self)
         dest[0] = _task_queue;
         dest[1] = MP_OBJ_FROM_PTR(self);
-        task_queue_push_sorted(2, dest);
+        task_queue_push(2, dest);
     } else if (ticks_diff(self->ph_key, ticks()) > 0) {
         // On the main running queue but scheduled in the future, so bring it forward to now.
         // _task_queue.remove(self)
         task_queue_remove(_task_queue, MP_OBJ_FROM_PTR(self));
-        // _task_queue.push_head(self)
+        // _task_queue.push(self)
         dest[0] = _task_queue;
         dest[1] = MP_OBJ_FROM_PTR(self);
-        task_queue_push_sorted(2, dest);
+        task_queue_push(2, dest);
     }
 
     self->data = mp_obj_dict_get(uasyncio_context, MP_OBJ_NEW_QSTR(MP_QSTR_CancelledError));
@@ -281,7 +280,7 @@ STATIC mp_obj_t task_iternext(mp_obj_t self_in) {
         // Put calling task on waiting queue.
         mp_obj_t cur_task = mp_obj_dict_get(uasyncio_context, MP_OBJ_NEW_QSTR(MP_QSTR_cur_task));
         mp_obj_t args[2] = { self->state, cur_task };
-        task_queue_push_sorted(2, args);
+        task_queue_push(2, args);
         // Set calling task's data to this task that it waits on, to double-link it.
         ((mp_obj_task_t *)MP_OBJ_TO_PTR(cur_task))->data = self_in;
     }
diff --git a/extmod/uasyncio/core.py b/extmod/uasyncio/core.py
index 28b5e960acc8f..10a310809c0e6 100644
--- a/extmod/uasyncio/core.py
+++ b/extmod/uasyncio/core.py
@@ -41,7 +41,7 @@ def __iter__(self):
 
     def __next__(self):
         if self.state is not None:
-            _task_queue.push_sorted(cur_task, self.state)
+            _task_queue.push(cur_task, self.state)
             self.state = None
             return None
         else:
@@ -115,11 +115,11 @@ def wait_io_event(self, dt):
             # print('poll', s, sm, ev)
             if ev & ~select.POLLOUT and sm[0] is not None:
                 # POLLIN or error
-                _task_queue.push_head(sm[0])
+                _task_queue.push(sm[0])
                 sm[0] = None
             if ev & ~select.POLLIN and sm[1] is not None:
                 # POLLOUT or error
-                _task_queue.push_head(sm[1])
+                _task_queue.push(sm[1])
                 sm[1] = None
             if sm[0] is None and sm[1] is None:
                 self._dequeue(s)
@@ -142,7 +142,7 @@ def create_task(coro):
     if not hasattr(coro, "send"):
         raise TypeError("coroutine expected")
     t = Task(coro, globals())
-    _task_queue.push_head(t)
+    _task_queue.push(t)
     return t
 
 
@@ -167,7 +167,7 @@ def run_until_complete(main_task=None):
             _io_queue.wait_io_event(dt)
 
         # Get next task to run and continue it
-        t = _task_queue.pop_head()
+        t = _task_queue.pop()
         cur_task = t
         try:
             # Continue running the coroutine, it's responsible for rescheduling itself
@@ -203,7 +203,7 @@ def run_until_complete(main_task=None):
                 else:
                     # Schedule any other tasks waiting on the completion of this task.
                     while t.state.peek():
-                        _task_queue.push_head(t.state.pop_head())
+                        _task_queue.push(t.state.pop())
                         waiting = True
                     # "False" indicates that the task is complete and has been await'ed on.
                     t.state = False
@@ -211,7 +211,7 @@ def run_until_complete(main_task=None):
                     # An exception ended this detached task, so queue it for later
                     # execution to handle the uncaught exception if no other task retrieves
                     # the exception in the meantime (this is handled by Task.throw).
-                    _task_queue.push_head(t)
+                    _task_queue.push(t)
                 # Save return value of coro to pass up to caller.
                 t.data = er
             elif t.state is None:
@@ -256,7 +256,7 @@ def run_until_complete(aw):
     def stop():
         global _stop_task
         if _stop_task is not None:
-            _task_queue.push_head(_stop_task)
+            _task_queue.push(_stop_task)
             # If stop() is called again, do nothing
             _stop_task = None
 
diff --git a/extmod/uasyncio/event.py b/extmod/uasyncio/event.py
index 1954c80f54aca..c48904b9835c7 100644
--- a/extmod/uasyncio/event.py
+++ b/extmod/uasyncio/event.py
@@ -17,7 +17,7 @@ def set(self):
         # Note: This must not be called from anything except the thread running
         # the asyncio loop (i.e. neither hard or soft IRQ, or a different thread).
         while self.waiting.peek():
-            core._task_queue.push_head(self.waiting.pop_head())
+            core._task_queue.push(self.waiting.pop())
         self.state = True
 
     def clear(self):
@@ -26,7 +26,7 @@ def clear(self):
     async def wait(self):
         if not self.state:
             # Event not set, put the calling task on the event's waiting queue
-            self.waiting.push_head(core.cur_task)
+            self.waiting.push(core.cur_task)
             # Set calling task's data to the event's queue so it can be removed if needed
             core.cur_task.data = self.waiting
             yield
diff --git a/extmod/uasyncio/funcs.py b/extmod/uasyncio/funcs.py
index a76ab0d32148c..258948f73e6d7 100644
--- a/extmod/uasyncio/funcs.py
+++ b/extmod/uasyncio/funcs.py
@@ -78,7 +78,7 @@ def done(t, er):
                 # Still some sub-tasks running.
                 return
         # Gather waiting is done, schedule the main gather task.
-        core._task_queue.push_head(gather_task)
+        core._task_queue.push(gather_task)
 
     ts = [core._promote_to_task(aw) for aw in aws]
     for i in range(len(ts)):
diff --git a/extmod/uasyncio/lock.py b/extmod/uasyncio/lock.py
index bddca295b6af0..f50213d7c1862 100644
--- a/extmod/uasyncio/lock.py
+++ b/extmod/uasyncio/lock.py
@@ -22,8 +22,8 @@ def release(self):
             raise RuntimeError("Lock not acquired")
         if self.waiting.peek():
             # Task(s) waiting on lock, schedule next Task
-            self.state = self.waiting.pop_head()
-            core._task_queue.push_head(self.state)
+            self.state = self.waiting.pop()
+            core._task_queue.push(self.state)
         else:
             # No Task waiting so unlock
             self.state = 0
@@ -31,7 +31,7 @@ def release(self):
     async def acquire(self):
         if self.state != 0:
             # Lock unavailable, put the calling Task on the waiting queue
-            self.waiting.push_head(core.cur_task)
+            self.waiting.push(core.cur_task)
             # Set calling task's data to the lock's queue so it can be removed if needed
             core.cur_task.data = self.waiting
             try:
diff --git a/extmod/uasyncio/task.py b/extmod/uasyncio/task.py
index 94768b95a4a5f..4ead2a1308437 100644
--- a/extmod/uasyncio/task.py
+++ b/extmod/uasyncio/task.py
@@ -99,17 +99,14 @@ def __init__(self):
     def peek(self):
         return self.heap
 
-    def push_sorted(self, v, key):
+    def push(self, v, key=None):
         assert v.ph_child is None
         assert v.ph_next is None
         v.data = None
-        v.ph_key = key
+        v.ph_key = key if key is not None else core.ticks()
         self.heap = ph_meld(v, self.heap)
 
-    def push_head(self, v):
-        self.push_sorted(v, core.ticks())
-
-    def pop_head(self):
+    def pop(self):
         v = self.heap
         assert v.ph_next is None
         self.heap = ph_pairing(v.ph_child)
@@ -150,7 +147,7 @@ def __next__(self):
             raise self.data
         else:
             # Put calling task on waiting queue.
-            self.state.push_head(core.cur_task)
+            self.state.push(core.cur_task)
             # Set calling task's data to this task that it waits on, to double-link it.
             core.cur_task.data = self
 
@@ -171,10 +168,10 @@ def cancel(self):
         if hasattr(self.data, "remove"):
             # Not on the main running queue, remove the task from the queue it's on.
             self.data.remove(self)
-            core._task_queue.push_head(self)
+            core._task_queue.push(self)
         elif core.ticks_diff(self.ph_key, core.ticks()) > 0:
             # On the main running queue but scheduled in the future, so bring it forward to now.
             core._task_queue.remove(self)
-            core._task_queue.push_head(self)
+            core._task_queue.push(self)
         self.data = core.CancelledError
         return True

From a8f23f6366b7bb258c7c34a45a3a9bde99e4a32b Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 14 Apr 2022 11:33:00 +1000
Subject: [PATCH 1953/3533] shared/readline: Make tab insert an indent when it
 follows whitespace.

Entering tab at the REPL will now make it insert an indent (4 spaces) in
the following cases:
- after any whitespace on a line
- at the start of a line that is not the first line

This changes the existing behaviour where a tab would insert an indent only
if there were no matches in the auto-complete search, and it was the start
of the line.  This means, if there were any symbols in the global
namespace, tab could never be used to indent.

Note that entering tab at the start of the first line will still do
auto-completion, but will now do nothing if there are no symbols in the
global namespace, which is more consistent than before.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/repl.c                  |  5 +----
 shared/readline/readline.c | 17 ++++++++++++++++-
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/py/repl.c b/py/repl.c
index 4e47cf784c344..0369b02195195 100644
--- a/py/repl.c
+++ b/py/repl.c
@@ -313,10 +313,7 @@ size_t mp_repl_autocomplete(const char *str, size_t len, const mp_print_t *print
                 return sizeof(import_str) - 1 - s_len;
             }
         }
-        if (q_first == 0) {
-            *compl_str = "    ";
-            return s_len ? 0 : 4;
-        }
+        return 0;
     }
 
     // 1 match found, or multiple matches with a common prefix
diff --git a/shared/readline/readline.c b/shared/readline/readline.c
index cad85b4e6b5c2..915bcda84139b 100644
--- a/shared/readline/readline.c
+++ b/shared/readline/readline.c
@@ -222,7 +222,22 @@ int readline_process_char(int c) {
         } else if (c == 9) {
             // tab magic
             const char *compl_str;
-            size_t compl_len = mp_repl_autocomplete(rl.line->buf + rl.orig_line_len, rl.cursor_pos - rl.orig_line_len, &mp_plat_print, &compl_str);
+            size_t compl_len;
+            if (vstr_len(rl.line) != 0 && unichar_isspace(vstr_str(rl.line)[rl.cursor_pos - 1])) {
+                // expand tab to 4 spaces if it follows whitespace:
+                //  - includes the case of additional indenting
+                //  - includes the case of indenting the start of a line that's not the first line,
+                //    because a newline will be the previous character
+                //  - doesn't include the case when at the start of the first line, because we still
+                //    want to use auto-complete there
+                compl_str = "    ";
+                compl_len = 4;
+            } else {
+                // try to auto-complete a word
+                const char *cur_line_buf = vstr_str(rl.line) + rl.orig_line_len;
+                size_t cur_line_len = rl.cursor_pos - rl.orig_line_len;
+                compl_len = mp_repl_autocomplete(cur_line_buf, cur_line_len, &mp_plat_print, &compl_str);
+            }
             if (compl_len == 0) {
                 // no match
             } else if (compl_len == (size_t)(-1)) {

From 6d401be4dd0164cb197a05c7419f7b6ef5bbdf51 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 8 Mar 2022 11:11:23 +1100
Subject: [PATCH 1954/3533] shared/readline: Disable auto-indent if space/tab
 follows added indent.

Auto-indent still works as the default behaviour, but it is now undone and
disabled if there is a space/tab immediately after an automatically-added
indent.  This makes the REPL behaviour closer to CPython, and in particular
allows text to be pasted at the normal REPL.

Addresses issue #7925.

Signed-off-by: Damien George <damien@micropython.org>
---
 shared/readline/readline.c | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/shared/readline/readline.c b/shared/readline/readline.c
index 915bcda84139b..9b8961712d0d8 100644
--- a/shared/readline/readline.c
+++ b/shared/readline/readline.c
@@ -42,6 +42,10 @@
 
 #define READLINE_HIST_SIZE (MP_ARRAY_SIZE(MP_STATE_PORT(readline_hist)))
 
+// flags for readline_t.auto_indent_state
+#define AUTO_INDENT_ENABLED (0x01)
+#define AUTO_INDENT_JUST_ADDED (0x02)
+
 enum { ESEQ_NONE, ESEQ_ESC, ESEQ_ESC_BRACKET, ESEQ_ESC_BRACKET_DIGIT, ESEQ_ESC_O };
 
 void readline_init0(void) {
@@ -94,6 +98,9 @@ typedef struct _readline_t {
     int hist_cur;
     size_t cursor_pos;
     char escape_seq_buf[1];
+    #if MICROPY_REPL_AUTO_INDENT
+    uint8_t auto_indent_state;
+    #endif
     const char *prompt;
 } readline_t;
 
@@ -218,6 +225,17 @@ int readline_process_char(int c) {
                 redraw_step_back = nspace;
                 redraw_from_cursor = true;
             }
+        #if MICROPY_REPL_AUTO_INDENT
+        } else if ((rl.auto_indent_state & AUTO_INDENT_JUST_ADDED) && (c == 9 || c == ' ')) {
+            // tab/space after auto-indent: disable auto-indent
+            //  - if it's a tab then leave existing indent
+            //  - if it's a space then remove 3 spaces from existing indent
+            rl.auto_indent_state = 0;
+            if (c == ' ') {
+                redraw_step_back = 3;
+                vstr_cut_tail_bytes(rl.line, 3);
+            }
+        #endif
         #if MICROPY_HELPER_REPL
         } else if (c == 9) {
             // tab magic
@@ -452,11 +470,18 @@ int readline_process_char(int c) {
         rl.cursor_pos += redraw_step_forward;
     }
 
+    #if MICROPY_REPL_AUTO_INDENT
+    rl.auto_indent_state &= ~AUTO_INDENT_JUST_ADDED;
+    #endif
+
     return -1;
 }
 
 #if MICROPY_REPL_AUTO_INDENT
 STATIC void readline_auto_indent(void) {
+    if (!(rl.auto_indent_state & AUTO_INDENT_ENABLED)) {
+        return;
+    }
     vstr_t *line = rl.line;
     if (line->len > 1 && line->buf[line->len - 1] == '\n') {
         int i;
@@ -492,6 +517,7 @@ STATIC void readline_auto_indent(void) {
             vstr_add_strn(line, "    ", 4);
             mp_hal_stdout_tx_strn("    ", 4);
             rl.cursor_pos += 4;
+            rl.auto_indent_state |= AUTO_INDENT_JUST_ADDED;
         }
     }
 }
@@ -517,6 +543,10 @@ void readline_init(vstr_t *line, const char *prompt) {
     rl.prompt = prompt;
     mp_hal_stdout_tx_str(prompt);
     #if MICROPY_REPL_AUTO_INDENT
+    if (vstr_len(line) == 0) {
+        // start with auto-indent enabled
+        rl.auto_indent_state = AUTO_INDENT_ENABLED;
+    }
     readline_auto_indent();
     #endif
 }

From 6bec5c4da52c323c8e2a7a37aa29584cd726612f Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 13 Apr 2022 17:39:05 +1000
Subject: [PATCH 1955/3533] tests/cmdline: Add test for REPL auto-indent.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/cmdline/repl_autoindent.py     | 16 ++++++++++++++++
 tests/cmdline/repl_autoindent.py.exp | 22 ++++++++++++++++++++++
 2 files changed, 38 insertions(+)
 create mode 100644 tests/cmdline/repl_autoindent.py
 create mode 100644 tests/cmdline/repl_autoindent.py.exp

diff --git a/tests/cmdline/repl_autoindent.py b/tests/cmdline/repl_autoindent.py
new file mode 100644
index 0000000000000..152c81895f196
--- /dev/null
+++ b/tests/cmdline/repl_autoindent.py
@@ -0,0 +1,16 @@
+# tests for autoindent
+if 1:
+print(1)
+
+
+
+if 0:
+  print(2)
+else:
+  print(3)
+
+if 0:
+	print(4)
+else:
+	print(5)
+
diff --git a/tests/cmdline/repl_autoindent.py.exp b/tests/cmdline/repl_autoindent.py.exp
new file mode 100644
index 0000000000000..9127a7d31d903
--- /dev/null
+++ b/tests/cmdline/repl_autoindent.py.exp
@@ -0,0 +1,22 @@
+MicroPython \.\+ version
+Use \.\+
+>>> # tests for autoindent
+>>> if 1:
+...     print(1)
+...     
+...     
+... 
+1
+>>> if 0:
+...      print(2)
+... else:
+...   print(3)
+... 
+3
+>>> if 0:
+...     print(4)
+... else:
+...     print(5)
+... 
+5
+>>> 

From 2a08e38c603440fea487df4c5ee51db6789c2b1f Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 22 Apr 2022 21:50:20 +1000
Subject: [PATCH 1956/3533] docs/library/network.WLAN: Add "txpower" to list of
 known WLAN configs.

Signed-off-by: Damien George <damien@micropython.org>
---
 docs/library/network.WLAN.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/library/network.WLAN.rst b/docs/library/network.WLAN.rst
index 72091d0ea5a0f..274681f178a0e 100644
--- a/docs/library/network.WLAN.rst
+++ b/docs/library/network.WLAN.rst
@@ -132,4 +132,5 @@ Methods
    password       Access password (string)
    dhcp_hostname  The DHCP hostname to use
    reconnects     Number of reconnect attempts to make (integer, 0=none, -1=unlimited)
+   txpower        Maximum transmit power in dBm (integer or float)
    =============  ===========

From ff28d2e3b349b10c10e57d9493f7f9d3869af8eb Mon Sep 17 00:00:00 2001
From: wemos <support@wemos.cc>
Date: Mon, 11 Apr 2022 20:12:57 +0800
Subject: [PATCH 1957/3533] esp32/network_wlan: Support setting/getting txpower
 in WLAN.config().

---
 ports/esp32/network_wlan.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/ports/esp32/network_wlan.c b/ports/esp32/network_wlan.c
index 8702ca7704598..58c898d9a46ef 100644
--- a/ports/esp32/network_wlan.c
+++ b/ports/esp32/network_wlan.c
@@ -461,6 +461,11 @@ STATIC mp_obj_t network_wlan_config(size_t n_args, const mp_obj_t *args, mp_map_
                         conf_wifi_sta_reconnects = (reconnects == -1) ? 0 : reconnects + 1;
                         break;
                     }
+                    case MP_QSTR_txpower: {
+                        int8_t power = (mp_obj_get_float(kwargs->table[i].value) * 4);
+                        esp_exceptions(esp_wifi_set_max_tx_power(power));
+                        break;
+                    }
                     default:
                         goto unknown;
                 }
@@ -537,6 +542,12 @@ STATIC mp_obj_t network_wlan_config(size_t n_args, const mp_obj_t *args, mp_map_
             int rec = conf_wifi_sta_reconnects - 1;
             val = MP_OBJ_NEW_SMALL_INT(rec);
             break;
+        case MP_QSTR_txpower: {
+            int8_t power;
+            esp_exceptions(esp_wifi_get_max_tx_power(&power));
+            val = mp_obj_new_float(power * 0.25);
+            break;
+        }
         default:
             goto unknown;
     }

From eb9674822b4d3be308beae2fa238ad85de9f09fa Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 14 Apr 2022 16:33:53 +1000
Subject: [PATCH 1958/3533] esp32/modnetwork: Fix build when
 MICROPY_PY_NETWORK_WLAN is disabled.

Fixes issue #8541.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/modnetwork.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ports/esp32/modnetwork.c b/ports/esp32/modnetwork.c
index 206fecbcf9856..e025f0293a08a 100644
--- a/ports/esp32/modnetwork.c
+++ b/ports/esp32/modnetwork.c
@@ -99,12 +99,14 @@ NORETURN void esp_exceptions_helper(esp_err_t e) {
 // thread to the main MicroPython task.  It must not raise any Python exceptions.
 static esp_err_t event_handler(void *ctx, system_event_t *event) {
     switch (event->event_id) {
+        #if MICROPY_PY_NETWORK_WLAN
         case SYSTEM_EVENT_STA_START:
         case SYSTEM_EVENT_STA_CONNECTED:
         case SYSTEM_EVENT_STA_GOT_IP:
         case SYSTEM_EVENT_STA_DISCONNECTED:
             network_wlan_event_handler(event);
             break;
+        #endif
         case SYSTEM_EVENT_GOT_IP6:
             ESP_LOGI("network", "Got IPv6");
             break;

From 0e6873840b820e75da29585ed3e4b9fefdf2e90b Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 26 Apr 2022 22:15:07 +1000
Subject: [PATCH 1959/3533] rp2/mpconfigport: Enable execfile, NotImplemented
 and REPL EMACS keys.

To bring this port in line with other ports that use
MICROPY_CONFIG_ROM_LEVEL_EXTRA_FEATURES.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/rp2/mpconfigport.h | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/ports/rp2/mpconfigport.h b/ports/rp2/mpconfigport.h
index 98e58dee9d7ce..0ca704755a7af 100644
--- a/ports/rp2/mpconfigport.h
+++ b/ports/rp2/mpconfigport.h
@@ -60,12 +60,6 @@
 // Optimisations
 #define MICROPY_OPT_COMPUTED_GOTO               (1)
 
-// Features currently overriden for rp2, planned to be brought in line with
-// other ports
-#define MICROPY_PY_BUILTINS_EXECFILE            (0)
-#define MICROPY_PY_BUILTINS_NOTIMPLEMENTED      (0)
-#define MICROPY_REPL_EMACS_KEYS                 (0)
-
 // Python internal features
 #define MICROPY_READER_VFS                      (1)
 #define MICROPY_ENABLE_GC                       (1)

From b28839420d84e9f7d73e37258b6ecc74d0a017d3 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Wed, 13 Apr 2022 12:21:42 +0200
Subject: [PATCH 1960/3533] stm32/qspi: Support common flash sizes in MPU
 configuration.

Add MPU configuration for common flash sizes up to 256MiB.
---
 ports/stm32/qspi.c | 34 ++++++++++++++++++++++++++++++++--
 1 file changed, 32 insertions(+), 2 deletions(-)

diff --git a/ports/stm32/qspi.c b/ports/stm32/qspi.c
index 5ead66f4e40b3..027061fd7048c 100644
--- a/ports/stm32/qspi.c
+++ b/ports/stm32/qspi.c
@@ -52,6 +52,10 @@
 #define MICROPY_HW_QSPI_CS_HIGH_CYCLES  2  // nCS stays high for 2 cycles
 #endif
 
+#ifndef MICROPY_HW_QSPI_MPU_REGION_SIZE
+#define MICROPY_HW_QSPI_MPU_REGION_SIZE ((1 << (MICROPY_HW_QSPIFLASH_SIZE_BITS_LOG2 - 3)) >> 20)
+#endif
+
 #if (MICROPY_HW_QSPIFLASH_SIZE_BITS_LOG2 - 3 - 1) >= 24
 #define QSPI_CMD 0xec
 #define QSPI_ADSIZE 3
@@ -74,11 +78,37 @@ static inline void qspi_mpu_enable_mapped(void) {
     // for the memory-mapped region, so 3 MPU regions are used to disable access
     // to everything except the valid address space, using holes in the bottom
     // of the regions and nesting them.
-    // At the moment this is hard-coded to 2MiB of QSPI address space.
+    // Note: Disabling a subregion (by setting its corresponding SRD bit to 1)
+    // means another region overlapping the disabled range matches instead.  If no
+    // other enabled region overlaps the disabled subregion, and the access is
+    // unprivileged or the background region is disabled, the MPU issues a fault.
     uint32_t irq_state = mpu_config_start();
+    #if MICROPY_HW_QSPI_MPU_REGION_SIZE > 128
+    mpu_config_region(MPU_REGION_QSPI1, QSPI_MAP_ADDR, MPU_CONFIG_DISABLE(0xFF, MPU_REGION_SIZE_256MB));
+    #elif MICROPY_HW_QSPI_MPU_REGION_SIZE > 64
+    mpu_config_region(MPU_REGION_QSPI1, QSPI_MAP_ADDR, MPU_CONFIG_DISABLE(0x0F, MPU_REGION_SIZE_256MB));
+    #elif MICROPY_HW_QSPI_MPU_REGION_SIZE > 32
+    mpu_config_region(MPU_REGION_QSPI1, QSPI_MAP_ADDR, MPU_CONFIG_DISABLE(0x03, MPU_REGION_SIZE_256MB));
+    #elif MICROPY_HW_QSPI_MPU_REGION_SIZE > 16
+    mpu_config_region(MPU_REGION_QSPI1, QSPI_MAP_ADDR, MPU_CONFIG_DISABLE(0x01, MPU_REGION_SIZE_256MB));
+    #elif MICROPY_HW_QSPI_MPU_REGION_SIZE > 8
+    mpu_config_region(MPU_REGION_QSPI1, QSPI_MAP_ADDR, MPU_CONFIG_DISABLE(0x01, MPU_REGION_SIZE_256MB));
+    mpu_config_region(MPU_REGION_QSPI2, QSPI_MAP_ADDR, MPU_CONFIG_DISABLE(0x0F, MPU_REGION_SIZE_32MB));
+    #elif MICROPY_HW_QSPI_MPU_REGION_SIZE > 4
     mpu_config_region(MPU_REGION_QSPI1, QSPI_MAP_ADDR, MPU_CONFIG_DISABLE(0x01, MPU_REGION_SIZE_256MB));
-    mpu_config_region(MPU_REGION_QSPI2, QSPI_MAP_ADDR, MPU_CONFIG_DISABLE(0x0f, MPU_REGION_SIZE_32MB));
+    mpu_config_region(MPU_REGION_QSPI2, QSPI_MAP_ADDR, MPU_CONFIG_DISABLE(0x03, MPU_REGION_SIZE_32MB));
+    #elif MICROPY_HW_QSPI_MPU_REGION_SIZE > 2
+    mpu_config_region(MPU_REGION_QSPI1, QSPI_MAP_ADDR, MPU_CONFIG_DISABLE(0x01, MPU_REGION_SIZE_256MB));
+    mpu_config_region(MPU_REGION_QSPI2, QSPI_MAP_ADDR, MPU_CONFIG_DISABLE(0x01, MPU_REGION_SIZE_32MB));
+    #elif MICROPY_HW_QSPI_MPU_REGION_SIZE > 1
+    mpu_config_region(MPU_REGION_QSPI1, QSPI_MAP_ADDR, MPU_CONFIG_DISABLE(0x01, MPU_REGION_SIZE_256MB));
+    mpu_config_region(MPU_REGION_QSPI2, QSPI_MAP_ADDR, MPU_CONFIG_DISABLE(0x0F, MPU_REGION_SIZE_32MB));
     mpu_config_region(MPU_REGION_QSPI3, QSPI_MAP_ADDR, MPU_CONFIG_DISABLE(0x01, MPU_REGION_SIZE_16MB));
+    #else
+    mpu_config_region(MPU_REGION_QSPI1, QSPI_MAP_ADDR, MPU_CONFIG_DISABLE(0x01, MPU_REGION_SIZE_256MB));
+    mpu_config_region(MPU_REGION_QSPI2, QSPI_MAP_ADDR, MPU_CONFIG_DISABLE(0x01, MPU_REGION_SIZE_32MB));
+    mpu_config_region(MPU_REGION_QSPI3, QSPI_MAP_ADDR, MPU_CONFIG_DISABLE(0x03, MPU_REGION_SIZE_4MB));
+    #endif
     mpu_config_end(irq_state);
 }
 

From 5974ac256b04a86e1ec88fd98cc8d68243f9d6be Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Wed, 13 Apr 2022 12:40:11 +0200
Subject: [PATCH 1961/3533] stm32/qspi: Wait for a free FIFO location before
 writing to DR.

Must always check the FIFO before writing to DR.  Without this, this
function hangs on the H747.
---
 ports/stm32/qspi.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ports/stm32/qspi.c b/ports/stm32/qspi.c
index 027061fd7048c..d741cf9aad76c 100644
--- a/ports/stm32/qspi.c
+++ b/ports/stm32/qspi.c
@@ -228,6 +228,10 @@ STATIC void qspi_write_cmd_data(void *self_in, uint8_t cmd, size_t len, uint32_t
                 | cmd << QUADSPI_CCR_INSTRUCTION_Pos // write opcode
         ;
 
+        // Wait for at least 1 free byte location in the FIFO.
+        while (!(QUADSPI->SR & QUADSPI_SR_FTF)) {
+        }
+
         // This assumes len==2
         *(uint16_t *)&QUADSPI->DR = data;
     }

From 32914c53ef2b5ec78844427c7221ee77d67035ac Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Wed, 13 Apr 2022 12:41:28 +0200
Subject: [PATCH 1962/3533] stm32/qspi: Workaround for SR set immediately after
 setting AR.

See issue #5441.  This issue is now reproducible on the Arduino Portenta
H747, QSPI flash PN MX25L12833F.
---
 ports/stm32/qspi.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/ports/stm32/qspi.c b/ports/stm32/qspi.c
index d741cf9aad76c..d32bd4dcf4a99 100644
--- a/ports/stm32/qspi.c
+++ b/ports/stm32/qspi.c
@@ -354,6 +354,14 @@ STATIC void qspi_read_cmd_qaddr_qdata(void *self_in, uint8_t cmd, uint32_t addr,
     QUADSPI->ABR = 0; // alternate byte: disable continuous read mode
     QUADSPI->AR = addr; // address to read from
 
+    #if defined(STM32H7)
+    // Workaround for SR getting set immediately after setting the address.
+    if (QUADSPI->SR & 0x01) {
+        QUADSPI->FCR |= QUADSPI_FCR_CTEF;
+        QUADSPI->AR = addr; // address to read from
+    }
+    #endif
+
     // Read in the data 4 bytes at a time if dest is aligned
     if (((uintptr_t)dest & 3) == 0) {
         while (len >= 4) {

From 014912daae9e558f90780e92abef6bf009bf8161 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Wed, 13 Apr 2022 16:51:44 +0200
Subject: [PATCH 1963/3533] stm32/ulpi: Add USB3320 ULPI low-power functions.

This driver allows switching USB3320 ULPI to low-power mode.  It is ported/
adapted from ST code, stm32f7xx_lp_modes.c, which is BSD-3 licensed code.
---
 ports/stm32/Makefile |   1 +
 ports/stm32/ulpi.c   | 194 +++++++++++++++++++++++++++++++++++++++++++
 ports/stm32/ulpi.h   |  32 +++++++
 3 files changed, 227 insertions(+)
 create mode 100644 ports/stm32/ulpi.c
 create mode 100644 ports/stm32/ulpi.h

diff --git a/ports/stm32/Makefile b/ports/stm32/Makefile
index 85b25c77e2fc0..34d5866747942 100644
--- a/ports/stm32/Makefile
+++ b/ports/stm32/Makefile
@@ -279,6 +279,7 @@ SRC_C += \
 	pyb_spi.c \
 	qspi.c \
 	uart.c \
+	ulpi.c \
 	can.c \
 	fdcan.c \
 	pyb_can.c \
diff --git a/ports/stm32/ulpi.c b/ports/stm32/ulpi.c
new file mode 100644
index 0000000000000..a118ca57f231f
--- /dev/null
+++ b/ports/stm32/ulpi.c
@@ -0,0 +1,194 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * Copyright (c) 2016 STMicroelectronics. All rights reserved.
+ *
+ * This software component is licensed by ST under BSD 3-Clause license,
+ * the "License"; You may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at:
+ *                        opensource.org/licenses/BSD-3-Clause
+ *
+ * USB3320 ULPI functions ported from stm32f7xx_lp_modes.c
+ *
+ * Source file: https://github.com/STMicroelectronics/STM32CubeF7/blob/v1.15.0/Projects/STM32746G-Discovery/Examples/PWR/PWR_CurrentConsumption/Src/stm32f7xx_lp_modes.c
+ */
+
+#include <stdint.h>
+#include "py/mphal.h"
+#include "pin_static_af.h"
+#include "ulpi.h"
+
+#if MICROPY_HW_USB_HS_ULPI3320
+
+#include STM32_HAL_H
+
+#define USBULPI_PHYCR           ((uint32_t)(0x40040000 + 0x034))
+#define USBULPI_D07             ((uint32_t)0x000000FF)
+#define USBULPI_New             ((uint32_t)0x02000000)
+#define USBULPI_RW              ((uint32_t)0x00400000)
+#define USBULPI_S_BUSY          ((uint32_t)0x04000000)
+#define USBULPI_S_DONE          ((uint32_t)0x08000000)
+#define USBULPI_TIMEOUT_COUNT   (100)
+
+#define USB_OTG_READ_REG32(reg)  (*(__IO uint32_t *)(reg))
+#define USB_OTG_WRITE_REG32(reg,value) (*(__IO uint32_t *)(reg) = (value))
+
+/**
+  * @brief  Read CR value
+  * @param  Addr the Address of the ULPI Register
+  * @retval Returns value of PHY CR register
+  */
+static uint32_t USB_ULPI_Read(uint32_t Addr) {
+    uint32_t val = 0;
+    uint32_t timeout = USBULPI_TIMEOUT_COUNT;
+
+    USB_OTG_WRITE_REG32(USBULPI_PHYCR, USBULPI_New | (Addr << 16));
+    val = USB_OTG_READ_REG32(USBULPI_PHYCR);
+    while (((val & USBULPI_S_DONE) == 0) && (timeout--)) {
+        val = USB_OTG_READ_REG32(USBULPI_PHYCR);
+    }
+    val = USB_OTG_READ_REG32(USBULPI_PHYCR);
+    return val & 0x000000ff;
+}
+
+/**
+  * @brief  Write CR value
+  * @param  Addr the Address of the ULPI Register
+  * @param  Data Data to write
+  * @retval Returns value of PHY CR register
+  */
+static uint32_t USB_ULPI_Write(uint32_t Addr, uint32_t Data) {
+    uint32_t val;
+    uint32_t timeout = USBULPI_TIMEOUT_COUNT;
+
+    USB_OTG_WRITE_REG32(USBULPI_PHYCR, USBULPI_New | USBULPI_RW | (Addr << 16) | (Data & 0x000000ff));
+    val = USB_OTG_READ_REG32(USBULPI_PHYCR);
+    while (((val & USBULPI_S_DONE) == 0) && (timeout--)) {
+        val = USB_OTG_READ_REG32(USBULPI_PHYCR);
+    }
+
+    val = USB_OTG_READ_REG32(USBULPI_PHYCR);
+    return 0;
+}
+
+/**
+  * @brief  This function configures the USB PHY to enter the low power mode
+  * @param  None
+  * @retval None
+  */
+int ulpi_enter_low_power(void) {
+    uint32_t regval = 0;
+
+    // Disable ULPI_CLK by accessing ULPI_PHY
+    // Read Vendor ID : (Low, High) 0x24,0x04 for USB3300
+    regval = USB_ULPI_Read(0x00);
+    if (regval != 0x24) {
+        return MP_EIO;
+    }
+
+    regval = USB_ULPI_Read(0x01);
+    if (regval != 0x04) {
+        return MP_EIO;
+    }
+
+    // Read Product ID
+    regval = USB_ULPI_Read(0x02);
+    if (regval != 0x07) {
+        return MP_EIO;
+    }
+
+    regval = USB_ULPI_Read(0x03);
+    if (regval != 0x00) {
+        return MP_EIO;
+    }
+
+    // Write to scratch register the pattern 0x55
+    USB_ULPI_Write(0x16, 0x55);
+    // Read to scratch Register and check-it again the written Pattern
+    regval = USB_ULPI_Read(0x16);
+    if (regval != 0x55) {
+        return MP_EIO;
+    }
+
+    // Write to scratch register the pattern 0xAA
+    USB_ULPI_Write(0x16, 0xAA);
+    // Read to scratch Register and check-it again the written Pattern
+    regval = USB_ULPI_Read(0x16);
+    if (regval != 0xAA) {
+        return MP_EIO;
+    }
+
+    // Read InterfaceControl reg
+    regval = USB_ULPI_Read(0x07);
+
+    // Write InterfaceControl reg,to disable PullUp on stp,
+    // to avoid USB_PHY wake up when MCU entering standby
+    USB_ULPI_Write(0x07, regval | 0x80);
+
+    // Read InterfaceControl reg
+    regval = USB_ULPI_Read(0x07);
+    if (regval != 0x80) {
+        return MP_EIO;
+    }
+
+    // Read FunctionControl reg
+    regval = USB_ULPI_Read(0x04);
+
+    // Reg 0x40 has a different value if USB is disconnected
+    if (regval != 0x40 && regval != 0x45) {
+        return MP_EIO;
+    }
+
+    // Write FunctionControl reg,to put PHY into LowPower mode
+    USB_ULPI_Write(0x04, regval & (~0x40));
+
+    // Read FunctionControl reg again
+    regval = USB_ULPI_Read(0x04);
+    if (regval != 0x00) {
+        return MP_EIO;
+    }
+
+    // Wait for the transceiver clock to stop.
+    HAL_Delay(10);
+
+    return 0;
+}
+
+/**
+ * @brief  This function wakeup the USB PHY from the Low power mode
+ * @param  None
+ * @retval None
+ */
+int ulpi_leave_low_power(void) {
+    // Configure STP as an output pin
+    mp_hal_pin_config(MICROPY_HW_USB_HS_ULPI_STP, MP_HAL_PIN_MODE_OUTPUT, MP_HAL_PIN_PULL_NONE, 0);
+    mp_hal_pin_config_speed(MICROPY_HW_USB_HS_ULPI_STP, MP_HAL_PIN_SPEED_VERY_HIGH);
+
+    // Configure DIR as an input pin
+    mp_hal_pin_config(MICROPY_HW_USB_HS_ULPI_DIR, MP_HAL_PIN_MODE_INPUT, MP_HAL_PIN_PULL_NONE, 0);
+    mp_hal_pin_config_speed(MICROPY_HW_USB_HS_ULPI_DIR, MP_HAL_PIN_SPEED_VERY_HIGH);
+
+    // Set STP pin high
+    mp_hal_pin_high(MICROPY_HW_USB_HS_ULPI_STP);
+
+    // Wait for DIR to go low
+    for (uint32_t i = 0; i < 500; i++, HAL_Delay(1)) {
+        if (mp_hal_pin_read(MICROPY_HW_USB_HS_ULPI_DIR) == 0) {
+            break;
+        }
+    }
+
+    // Save DIR pin state before switching to alternate function
+    int dir_state = mp_hal_pin_read(MICROPY_HW_USB_HS_ULPI_DIR);
+
+    // Revert STP/DIR to their alternate functions
+    mp_hal_pin_config(MICROPY_HW_USB_HS_ULPI_STP, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE, GPIO_AF10_OTG_HS);
+    mp_hal_pin_config_speed(MICROPY_HW_USB_HS_ULPI_STP, MP_HAL_PIN_SPEED_VERY_HIGH);
+
+    mp_hal_pin_config(MICROPY_HW_USB_HS_ULPI_DIR, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE, GPIO_AF10_OTG_HS);
+    mp_hal_pin_config_speed(MICROPY_HW_USB_HS_ULPI_DIR, MP_HAL_PIN_SPEED_VERY_HIGH);
+
+    return (dir_state == 0) ? 0 : -1;
+}
+
+#endif // MICROPY_HW_USB_HS_ULPI3320
diff --git a/ports/stm32/ulpi.h b/ports/stm32/ulpi.h
new file mode 100644
index 0000000000000..1464110e77fd6
--- /dev/null
+++ b/ports/stm32/ulpi.h
@@ -0,0 +1,32 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2022 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+#ifndef MICROPY_INCLUDED_STM32_ULPI_H
+#define MICROPY_INCLUDED_STM32_ULPI_H
+
+int ulpi_enter_low_power(void);
+int ulpi_leave_low_power(void);
+
+#endif // MICROPY_INCLUDED_STM32_ULPI_H

From 1f33ec140aa42c71fa407ec9fb25b67de4ed488e Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Wed, 27 Apr 2022 08:46:44 +0200
Subject: [PATCH 1964/3533] stm32/ulpi: Include missing py/mperrno.h header.

---
 ports/stm32/ulpi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/stm32/ulpi.c b/ports/stm32/ulpi.c
index a118ca57f231f..0493279c1d048 100644
--- a/ports/stm32/ulpi.c
+++ b/ports/stm32/ulpi.c
@@ -13,8 +13,8 @@
  * Source file: https://github.com/STMicroelectronics/STM32CubeF7/blob/v1.15.0/Projects/STM32746G-Discovery/Examples/PWR/PWR_CurrentConsumption/Src/stm32f7xx_lp_modes.c
  */
 
-#include <stdint.h>
 #include "py/mphal.h"
+#include "py/mperrno.h"
 #include "pin_static_af.h"
 #include "ulpi.h"
 

From 96ad86ed2b28b139e681e5ed8fee8d7f7f981374 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Wed, 13 Apr 2022 09:54:58 +0200
Subject: [PATCH 1965/3533] stm32/boards/ARDUINO_PORTENTA_H7: Add support for
 Arduino Portenta H7.

---
 ports/stm32/boards/ARDUINO_PORTENTA_H7/bdev.c |  45 +++
 .../boards/ARDUINO_PORTENTA_H7/board.json     |  24 ++
 .../boards/ARDUINO_PORTENTA_H7/board_init.c   | 180 ++++++++++
 .../boards/ARDUINO_PORTENTA_H7/deploy.md      |  14 +
 .../boards/ARDUINO_PORTENTA_H7/manifest.py    |   9 +
 .../ARDUINO_PORTENTA_H7/mpconfigboard.h       | 324 ++++++++++++++++++
 .../ARDUINO_PORTENTA_H7/mpconfigboard.mk      |  27 ++
 .../stm32/boards/ARDUINO_PORTENTA_H7/pins.csv | 233 +++++++++++++
 .../boards/ARDUINO_PORTENTA_H7/stm32h747.ld   |  70 ++++
 .../ARDUINO_PORTENTA_H7/stm32h7xx_hal_conf.h  |  51 +++
 10 files changed, 977 insertions(+)
 create mode 100644 ports/stm32/boards/ARDUINO_PORTENTA_H7/bdev.c
 create mode 100644 ports/stm32/boards/ARDUINO_PORTENTA_H7/board.json
 create mode 100644 ports/stm32/boards/ARDUINO_PORTENTA_H7/board_init.c
 create mode 100644 ports/stm32/boards/ARDUINO_PORTENTA_H7/deploy.md
 create mode 100644 ports/stm32/boards/ARDUINO_PORTENTA_H7/manifest.py
 create mode 100644 ports/stm32/boards/ARDUINO_PORTENTA_H7/mpconfigboard.h
 create mode 100644 ports/stm32/boards/ARDUINO_PORTENTA_H7/mpconfigboard.mk
 create mode 100644 ports/stm32/boards/ARDUINO_PORTENTA_H7/pins.csv
 create mode 100644 ports/stm32/boards/ARDUINO_PORTENTA_H7/stm32h747.ld
 create mode 100644 ports/stm32/boards/ARDUINO_PORTENTA_H7/stm32h7xx_hal_conf.h

diff --git a/ports/stm32/boards/ARDUINO_PORTENTA_H7/bdev.c b/ports/stm32/boards/ARDUINO_PORTENTA_H7/bdev.c
new file mode 100644
index 0000000000000..bba81990cf90b
--- /dev/null
+++ b/ports/stm32/boards/ARDUINO_PORTENTA_H7/bdev.c
@@ -0,0 +1,45 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2022 Arduino SA
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "storage.h"
+#include "qspi.h"
+
+#if MICROPY_HW_SPIFLASH_ENABLE_CACHE
+// Shared cache for first and second SPI block devices
+STATIC mp_spiflash_cache_t spi_bdev_cache;
+#endif
+
+// First external SPI flash uses hardware QSPI interface
+const mp_spiflash_config_t spiflash_config = {
+    .bus_kind = MP_SPIFLASH_BUS_QSPI,
+    .bus.u_qspi.data = NULL,
+    .bus.u_qspi.proto = &qspi_proto,
+    #if MICROPY_HW_SPIFLASH_ENABLE_CACHE
+    .cache = &spi_bdev_cache,
+    #endif
+};
+
+spi_bdev_t spi_bdev;
diff --git a/ports/stm32/boards/ARDUINO_PORTENTA_H7/board.json b/ports/stm32/boards/ARDUINO_PORTENTA_H7/board.json
new file mode 100644
index 0000000000000..65cf4d4f8649a
--- /dev/null
+++ b/ports/stm32/boards/ARDUINO_PORTENTA_H7/board.json
@@ -0,0 +1,24 @@
+{
+    "deploy": [
+        "./deploy.md"
+    ],
+    "docs": "",
+    "features": [
+        "8MB SDRAM",
+        "16MB Flash",
+        "Dual-core processor",
+        "USB High Speed Phy",
+        "10/100 Ethernet Phy",
+        "CYW43 WiFi/BT Module",
+        "DisplayPort over USB-C",
+        "2x80 pin HD connectors"
+    ],
+    "images": [
+        "ABX00042_01.iso_1000x750.jpg"
+    ],
+    "mcu": "STM32H747",
+    "product": "Arduino Portenta H7",
+    "thumbnail": "",
+    "url": "https://store.arduino.cc/products/portenta-h7",
+    "vendor": "Arduino"
+}
diff --git a/ports/stm32/boards/ARDUINO_PORTENTA_H7/board_init.c b/ports/stm32/boards/ARDUINO_PORTENTA_H7/board_init.c
new file mode 100644
index 0000000000000..30b9e487601d8
--- /dev/null
+++ b/ports/stm32/boards/ARDUINO_PORTENTA_H7/board_init.c
@@ -0,0 +1,180 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2022 Arduino SA
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include <string.h>
+#include "py/mphal.h"
+#include "storage.h"
+#include "sdram.h"
+#include "eth.h"
+#if MICROPY_HW_USB_HS_ULPI3320
+#include "ulpi.h"
+#endif
+
+#define PORTENTA_PMIC_ERRATA    (1)
+
+void PORTENTA_board_startup(void) {
+}
+
+void PORTENTA_board_early_init(void) {
+    HAL_InitTick(0);
+
+    // Enable oscillator pin
+    // This is enabled in the bootloader anyway.
+    PORTENTA_board_osc_enable(true);
+
+    #if MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE
+    // The Arduino/mbed bootloader uses the MPU to protect sector 1
+    // which is used for the flash filesystem. The following code
+    // resets and disables all MPU regions configured in the bootloader.
+    HAL_MPU_Disable();
+    MPU_Region_InitTypeDef MPU_InitStruct;
+    MPU_InitStruct.AccessPermission = MPU_REGION_FULL_ACCESS;
+    MPU_InitStruct.IsBufferable = MPU_ACCESS_NOT_BUFFERABLE;
+    MPU_InitStruct.IsCacheable = MPU_ACCESS_NOT_CACHEABLE;
+    MPU_InitStruct.IsShareable = MPU_ACCESS_NOT_SHAREABLE;
+    MPU_InitStruct.TypeExtField = MPU_TEX_LEVEL1;
+    MPU_InitStruct.SubRegionDisable = 0x00;
+    MPU_InitStruct.DisableExec = MPU_INSTRUCTION_ACCESS_ENABLE;
+
+    for (int i = MPU_REGION_NUMBER0; i < MPU_REGION_NUMBER15; i++) {
+        MPU_InitStruct.Number = i;
+        MPU_InitStruct.Enable = MPU_REGION_DISABLE;
+        HAL_MPU_ConfigRegion(&MPU_InitStruct);
+    }
+    #endif
+
+    #if PORTENTA_PMIC_ERRATA
+    // PMIC SW1 current limit fix
+    // Configure PMIC I2C GPIOs
+    mp_hal_pin_config(pyb_pin_I2C1_SCL, MP_HAL_PIN_MODE_ALT_OPEN_DRAIN, MP_HAL_PIN_PULL_NONE, GPIO_AF4_I2C1);
+    mp_hal_pin_config_speed(pyb_pin_I2C1_SCL, MP_HAL_PIN_SPEED_LOW);
+
+    mp_hal_pin_config(pyb_pin_I2C1_SDA, MP_HAL_PIN_MODE_ALT_OPEN_DRAIN, MP_HAL_PIN_PULL_NONE, GPIO_AF4_I2C1);
+    mp_hal_pin_config_speed(pyb_pin_I2C1_SDA, MP_HAL_PIN_SPEED_LOW);
+
+    // Configure PMIC I2C
+    I2C_HandleTypeDef i2c;
+    i2c.Instance = I2C1;
+    i2c.Init.AddressingMode = I2C_ADDRESSINGMODE_7BIT;
+    i2c.Init.Timing = 0x20D09DE7;
+    i2c.Init.DualAddressMode = I2C_DUALADDRESS_DISABLED;
+    i2c.Init.GeneralCallMode = I2C_GENERALCALL_DISABLED;
+    i2c.Init.NoStretchMode = I2C_NOSTRETCH_DISABLED;
+    i2c.Init.OwnAddress1 = 0xFE;
+    i2c.Init.OwnAddress2 = 0xFE;
+    i2c.Init.OwnAddress2Masks = 0;
+
+    __HAL_RCC_I2C1_CLK_ENABLE();
+    __HAL_RCC_I2C1_FORCE_RESET();
+    __HAL_RCC_I2C1_RELEASE_RESET();
+    HAL_I2C_Init(&i2c);
+
+    // Set SW1 current limit to 1.5A
+    // Fixes power glitches with Eth and SDRAM.
+    uint8_t buf[] = {0x36, 0x02};
+    HAL_I2C_Master_Transmit(&i2c, 0x08 << 1, buf, 2, 1000);
+
+    HAL_I2C_DeInit(&i2c);
+    __HAL_RCC_I2C1_FORCE_RESET();
+    __HAL_RCC_I2C1_RELEASE_RESET();
+    __HAL_RCC_I2C1_CLK_DISABLE();
+
+    HAL_GPIO_DeInit(GPIOB, GPIO_PIN_6);
+    HAL_GPIO_DeInit(GPIOB, GPIO_PIN_7);
+    __HAL_RCC_GPIOB_CLK_DISABLE();
+    #endif // PORTENTA_PMIC_ERRATA
+
+    // Reset ETH Phy
+    mp_hal_pin_config(pyb_pin_ETH_RST, MP_HAL_PIN_MODE_OUTPUT, MP_HAL_PIN_PULL_UP, 0);
+    mp_hal_pin_config_speed(pyb_pin_ETH_RST, MP_HAL_PIN_SPEED_LOW);
+    mp_hal_pin_write(pyb_pin_ETH_RST, 0);
+    HAL_Delay(100);
+    mp_hal_pin_write(pyb_pin_ETH_RST, 1);
+
+    // Put Eth in low-power mode
+    eth_init(&eth_instance, MP_HAL_MAC_ETH0);
+    eth_low_power_mode(&eth_instance, true);
+
+    #if MICROPY_HW_USB_HS_ULPI3320
+    // Make sure UPLI is Not in low-power mode.
+    ulpi_leave_low_power();
+    #endif
+}
+
+void PORTENTA_board_enter_bootloader(void) {
+    RTC_HandleTypeDef RTCHandle;
+    RTCHandle.Instance = RTC;
+    HAL_RTCEx_BKUPWrite(&RTCHandle, RTC_BKP_DR0, 0xDF59);
+    NVIC_SystemReset();
+}
+
+void PORTENTA_board_osc_enable(int enable) {
+    mp_hal_pin_config(pyb_pin_OSCEN, MP_HAL_PIN_MODE_OUTPUT, MP_HAL_PIN_PULL_UP, 0);
+    mp_hal_pin_config_speed(pyb_pin_OSCEN, MP_HAL_PIN_SPEED_LOW);
+    mp_hal_pin_write(pyb_pin_OSCEN, enable);
+}
+
+void PORTENTA_board_low_power(int mode) {
+    switch (mode) {
+        case 0:     // Leave stop mode.
+            #if MICROPY_HW_USB_HS_ULPI3320
+            ulpi_leave_low_power();
+            #endif
+            eth_low_power_mode(NULL, false);
+            sdram_leave_low_power();
+            break;
+        case 1:     // Enter stop mode.
+            #if MICROPY_HW_USB_HS_ULPI3320
+            ulpi_enter_low_power();
+            #endif
+            eth_low_power_mode(NULL, true);
+            sdram_enter_low_power();
+            break;
+        case 2:     // Enter standby mode.
+            #if MICROPY_HW_USB_HS_ULPI3320
+            ulpi_enter_low_power();
+            #endif
+            eth_low_power_mode(NULL, true);
+            sdram_enter_power_down();
+            break;
+    }
+
+    #if MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE
+    // Enable QSPI deepsleep for modes 1 and 2
+    mp_spiflash_deepsleep(&spi_bdev.spiflash, (mode != 0));
+    #endif
+
+    #if defined(M4_APP_ADDR)
+    // Signal Cortex-M4 to go to Standby mode.
+    if (mode == 2) {
+        __HAL_RCC_HSEM_CLK_ENABLE();
+        HAL_HSEM_FastTake(0);
+        HAL_HSEM_Release(0, 0);
+        __HAL_RCC_HSEM_CLK_DISABLE();
+        HAL_Delay(100);
+    }
+    #endif
+}
diff --git a/ports/stm32/boards/ARDUINO_PORTENTA_H7/deploy.md b/ports/stm32/boards/ARDUINO_PORTENTA_H7/deploy.md
new file mode 100644
index 0000000000000..8de726b43b4c3
--- /dev/null
+++ b/ports/stm32/boards/ARDUINO_PORTENTA_H7/deploy.md
@@ -0,0 +1,14 @@
+### Via dfu-util
+
+This board can programmed via DFU bootloader, using e.g. [dfu-util](http://dfu-util.sourceforge.net/).
+To enter the DFU bootloader, double tap the reset (blue) button, or you can use `machine.bootloader()` from the MicroPython REPL.
+
+```bash
+dfu-util -w -d 2341:035b -a 0 -d 0x8040000 -D firmware.dfu
+```
+
+Or from MicroPython source repository:
+
+```bash
+make BOARD=ARDUINO_PORTENTA_H7 deploy
+```
diff --git a/ports/stm32/boards/ARDUINO_PORTENTA_H7/manifest.py b/ports/stm32/boards/ARDUINO_PORTENTA_H7/manifest.py
new file mode 100644
index 0000000000000..cd721d0ac45d1
--- /dev/null
+++ b/ports/stm32/boards/ARDUINO_PORTENTA_H7/manifest.py
@@ -0,0 +1,9 @@
+include("$(PORT_DIR)/boards/manifest.py")
+include("$(MPY_DIR)/extmod/webrepl/manifest.py")
+include(
+    "$(MPY_LIB_DIR)/micropython/bluetooth/aioble/manifest.py",
+    client=True,
+    central=True,
+    l2cap=True,
+    security=True,
+)
diff --git a/ports/stm32/boards/ARDUINO_PORTENTA_H7/mpconfigboard.h b/ports/stm32/boards/ARDUINO_PORTENTA_H7/mpconfigboard.h
new file mode 100644
index 0000000000000..30c909913c41a
--- /dev/null
+++ b/ports/stm32/boards/ARDUINO_PORTENTA_H7/mpconfigboard.h
@@ -0,0 +1,324 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ * The MIT License (MIT)
+ * Copyright (c) 2022 Arduino SA
+ */
+
+#define MICROPY_HW_BOARD_NAME       "PORTENTA"
+#define MICROPY_HW_MCU_NAME         "STM32H747"
+#define MICROPY_PY_SYS_PLATFORM     "Portenta"
+#define MICROPY_HW_FLASH_FS_LABEL   "portenta"
+
+#define MICROPY_OBJ_REPR            (MICROPY_OBJ_REPR_C)
+#define UINT_FMT                    "%u"
+#define INT_FMT                     "%d"
+typedef int mp_int_t;               // must be pointer size
+typedef unsigned int mp_uint_t;     // must be pointer size
+
+#define MICROPY_FATFS_EXFAT         (1)
+#define MICROPY_HW_ENABLE_RTC       (1)
+#define MICROPY_HW_ENABLE_RNG       (1)
+#define MICROPY_HW_ENABLE_ADC       (1)
+#define MICROPY_HW_ENABLE_DAC       (1)
+#define MICROPY_HW_ENABLE_USB       (1)
+#define MICROPY_HW_HAS_SWITCH       (0)
+#define MICROPY_HW_HAS_FLASH        (1)
+#define MICROPY_HW_ENABLE_SERVO     (1)
+#define MICROPY_HW_ENABLE_TIMER     (1)
+#define MICROPY_HW_ENABLE_SDCARD    (1)
+#define MICROPY_HW_ENABLE_MMCARD    (0)
+
+// Flash storage config
+#define MICROPY_HW_SPIFLASH_ENABLE_CACHE            (1)
+#define MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE    (0)
+
+#define MICROPY_BOARD_STARTUP       PORTENTA_board_startup
+void PORTENTA_board_startup(void);
+
+#define MICROPY_BOARD_EARLY_INIT    PORTENTA_board_early_init
+void PORTENTA_board_early_init(void);
+
+#define MICROPY_BOARD_ENTER_BOOTLOADER PORTENTA_board_enter_bootloader
+void PORTENTA_board_enter_bootloader(void);
+
+void PORTENTA_board_low_power(int mode);
+#define MICROPY_BOARD_LEAVE_STOP    PORTENTA_board_low_power(0);
+#define MICROPY_BOARD_ENTER_STOP    PORTENTA_board_low_power(1);
+#define MICROPY_BOARD_ENTER_STANDBY PORTENTA_board_low_power(2);
+
+void PORTENTA_board_osc_enable(int enable);
+#define MICROPY_BOARD_OSC_ENABLE    PORTENTA_board_osc_enable(1);
+#define MICROPY_BOARD_OSC_DISABLE   PORTENTA_board_osc_enable(0);
+
+// PLL1 400MHz/50MHz for SDMMC and FDCAN
+// USB and RNG are clocked from the HSI48
+#define MICROPY_HW_CLK_PLLM             (5)
+#define MICROPY_HW_CLK_PLLN             (160)
+#define MICROPY_HW_CLK_PLLP             (2)
+#define MICROPY_HW_CLK_PLLQ             (16)
+#define MICROPY_HW_CLK_PLLR             (2)
+#define MICROPY_HW_CLK_PLLVCI           (RCC_PLL1VCIRANGE_2)
+#define MICROPY_HW_CLK_PLLVCO           (RCC_PLL1VCOWIDE)
+#define MICROPY_HW_CLK_PLLFRAC          (0)
+
+// PLL2 200MHz for FMC and QSPI.
+#define MICROPY_HW_CLK_PLL2M            (5)
+#define MICROPY_HW_CLK_PLL2N            (80)
+#define MICROPY_HW_CLK_PLL2P            (2)
+#define MICROPY_HW_CLK_PLL2Q            (2)
+#define MICROPY_HW_CLK_PLL2R            (2)
+#define MICROPY_HW_CLK_PLL2VCI          (RCC_PLL2VCIRANGE_2)
+#define MICROPY_HW_CLK_PLL2VCO          (RCC_PLL2VCOWIDE)
+#define MICROPY_HW_CLK_PLL2FRAC         (0)
+
+// PLL3 160MHz for ADC and SPI123
+#define MICROPY_HW_CLK_PLL3M            (5)
+#define MICROPY_HW_CLK_PLL3N            (160)
+#define MICROPY_HW_CLK_PLL3P            (2)
+#define MICROPY_HW_CLK_PLL3Q            (5)
+#define MICROPY_HW_CLK_PLL3R            (2)
+#define MICROPY_HW_CLK_PLL3VCI          (RCC_PLL3VCIRANGE_2)
+#define MICROPY_HW_CLK_PLL3VCO          (RCC_PLL3VCOWIDE)
+#define MICROPY_HW_CLK_PLL3FRAC         (0)
+
+// HSE in BYPASS mode.
+#define MICROPY_HW_CLK_USE_BYPASS       (1)
+
+// Bus clock divider values
+#define MICROPY_HW_CLK_AHB_DIV          (RCC_HCLK_DIV2)
+#define MICROPY_HW_CLK_APB1_DIV         (RCC_APB1_DIV2)
+#define MICROPY_HW_CLK_APB2_DIV         (RCC_APB2_DIV2)
+#define MICROPY_HW_CLK_APB3_DIV         (RCC_APB3_DIV2)
+#define MICROPY_HW_CLK_APB4_DIV         (RCC_APB4_DIV2)
+
+// Peripheral clock sources
+#define MICROPY_HW_RCC_HSI48_STATE      (RCC_HSI48_ON)
+#define MICROPY_HW_RCC_USB_CLKSOURCE    (RCC_USBCLKSOURCE_HSI48)
+#define MICROPY_HW_RCC_RTC_CLKSOURCE    (RCC_RTCCLKSOURCE_LSI)
+#define MICROPY_HW_RCC_FMC_CLKSOURCE    (RCC_FMCCLKSOURCE_PLL2)
+#define MICROPY_HW_RCC_RNG_CLKSOURCE    (RCC_RNGCLKSOURCE_HSI48)
+#define MICROPY_HW_RCC_ADC_CLKSOURCE    (RCC_ADCCLKSOURCE_PLL3)
+#define MICROPY_HW_RCC_SDMMC_CLKSOURCE  (RCC_SDMMCCLKSOURCE_PLL)
+#define MICROPY_HW_RCC_FDCAN_CLKSOURCE  (RCC_FDCANCLKSOURCE_PLL)
+#define MICROPY_HW_RCC_SPI123_CLKSOURCE (RCC_SPI123CLKSOURCE_PLL3)
+#define MICROPY_HW_RCC_I2C123_CLKSOURCE (RCC_I2C123CLKSOURCE_D2PCLK1)
+#define MICROPY_HW_RCC_QSPI_CLKSOURCE   (RCC_QSPICLKSOURCE_PLL2)
+
+// SMPS configuration
+#define MICROPY_HW_PWR_SMPS_CONFIG      (PWR_SMPS_1V8_SUPPLIES_LDO)
+
+// There is an external 32kHz oscillator
+#define RTC_ASYNCH_PREDIV           (0)
+#define RTC_SYNCH_PREDIV            (0x7fff)
+#define MICROPY_HW_RTC_USE_BYPASS   (1)
+#define MICROPY_HW_RTC_USE_US       (1)
+#define MICROPY_HW_RTC_USE_CALOUT   (1)
+
+#if (MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE == 0)
+// QSPI flash #1 for storage
+#define MICROPY_HW_QSPI_PRESCALER           (2) // 100MHz
+#define MICROPY_HW_QSPIFLASH_SIZE_BITS_LOG2 (27)
+#define MICROPY_HW_SPIFLASH_SIZE_BITS       (128 * 1024 * 1024)
+#define MICROPY_HW_QSPIFLASH_CS             (pyb_pin_QSPI2_CS)
+#define MICROPY_HW_QSPIFLASH_SCK            (pyb_pin_QSPI2_CLK)
+#define MICROPY_HW_QSPIFLASH_IO0            (pyb_pin_QSPI2_D0)
+#define MICROPY_HW_QSPIFLASH_IO1            (pyb_pin_QSPI2_D1)
+#define MICROPY_HW_QSPIFLASH_IO2            (pyb_pin_QSPI2_D2)
+#define MICROPY_HW_QSPIFLASH_IO3            (pyb_pin_QSPI2_D3)
+
+// SPI flash #1, block device config
+extern const struct _mp_spiflash_config_t spiflash_config;
+extern struct _spi_bdev_t spi_bdev;
+#define MICROPY_HW_BDEV_IOCTL(op, arg) ( \
+    (op) == BDEV_IOCTL_NUM_BLOCKS ? (MICROPY_HW_SPIFLASH_SIZE_BITS / 8 / FLASH_BLOCK_SIZE) : \
+    (op) == BDEV_IOCTL_INIT ? spi_bdev_ioctl(&spi_bdev, (op), (uint32_t)&spiflash_config) : \
+    spi_bdev_ioctl(&spi_bdev, (op), (arg)) \
+    )
+#define MICROPY_HW_BDEV_READBLOCKS(dest, bl, n) spi_bdev_readblocks(&spi_bdev, (dest), (bl), (n))
+#define MICROPY_HW_BDEV_WRITEBLOCKS(src, bl, n) spi_bdev_writeblocks(&spi_bdev, (src), (bl), (n))
+#define MICROPY_HW_BDEV_SPIFLASH_EXTENDED (&spi_bdev)
+#endif
+
+// 4 wait states
+#define MICROPY_HW_FLASH_LATENCY    FLASH_LATENCY_2
+
+// UART config
+#define MICROPY_HW_UART1_TX         (pin_A9)
+#define MICROPY_HW_UART1_RX         (pin_A10)
+#define MICROPY_HW_UART_REPL        PYB_UART_1
+#define MICROPY_HW_UART_REPL_BAUD   115200
+
+// UART config
+#define MICROPY_HW_UART8_TX         (pin_J8)
+#define MICROPY_HW_UART8_RX         (pin_J9)
+
+// UART7 config
+#define MICROPY_HW_UART7_TX         (pyb_pin_BT_TXD)
+#define MICROPY_HW_UART7_RX         (pyb_pin_BT_RXD)
+#define MICROPY_HW_UART7_RTS        (pyb_pin_BT_RTS)
+#define MICROPY_HW_UART7_CTS        (pyb_pin_BT_CTS)
+
+// I2C busses
+#define MICROPY_HW_I2C3_SCL         (pin_H7)
+#define MICROPY_HW_I2C3_SDA         (pin_H8)
+
+// SPI
+#define MICROPY_HW_SPI2_NSS         (pin_I0)
+#define MICROPY_HW_SPI2_SCK         (pin_I1)
+#define MICROPY_HW_SPI2_MISO        (pin_C2)
+#define MICROPY_HW_SPI2_MOSI        (pin_C3)
+
+// USRSW is pulled low. Pressing the button makes the input go high.
+#define MICROPY_HW_USRSW_PIN        (pin_A0)
+#define MICROPY_HW_USRSW_PULL       (GPIO_NOPULL)
+#define MICROPY_HW_USRSW_EXTI_MODE  (GPIO_MODE_IT_RISING)
+#define MICROPY_HW_USRSW_PRESSED    (1)
+
+// LEDs
+#define MICROPY_HW_LED1             (pyb_pin_LEDR) // red
+#define MICROPY_HW_LED2             (pyb_pin_LEDG) // green
+#define MICROPY_HW_LED3             (pyb_pin_LEDB) // yellow
+#define MICROPY_HW_LED_ON(pin)      (mp_hal_pin_low(pin))
+#define MICROPY_HW_LED_OFF(pin)     (mp_hal_pin_high(pin))
+
+// WiFi SDMMC
+#define MICROPY_HW_SDIO_SDMMC       (1)
+#define MICROPY_HW_SDIO_CK          (pin_C12)
+#define MICROPY_HW_SDIO_CMD         (pin_D2)
+#define MICROPY_HW_SDIO_D0          (pin_C8)
+#define MICROPY_HW_SDIO_D1          (pin_C9)
+#define MICROPY_HW_SDIO_D2          (pin_C10)
+#define MICROPY_HW_SDIO_D3          (pin_C11)
+
+// SD Card SDMMC
+#define MICROPY_HW_SDCARD_SDMMC     (2)
+#define MICROPY_HW_SDCARD_CK        (pin_D6)
+#define MICROPY_HW_SDCARD_CMD       (pin_D7)
+#define MICROPY_HW_SDCARD_D0        (pin_B14)
+#define MICROPY_HW_SDCARD_D1        (pin_B15)
+#define MICROPY_HW_SDCARD_D2        (pin_B3)
+#define MICROPY_HW_SDCARD_D3        (pin_B4)
+
+// USB config
+#define MICROPY_HW_USB_HS           (1)
+#define MICROPY_HW_USB_HS_ULPI_NXT  (pin_H4)
+#define MICROPY_HW_USB_HS_ULPI_STP  (pin_C0)
+#define MICROPY_HW_USB_HS_ULPI_DIR  (pin_I11)
+#define MICROPY_HW_USB_HS_ULPI3320  (1)
+
+#define MICROPY_HW_USB_CDC_RX_DATA_SIZE     (512)
+#define MICROPY_HW_USB_CDC_TX_DATA_SIZE     (512)
+#define MICROPY_HW_USB_CDC_1200BPS_TOUCH    (1)
+#define GPIO_AF10_OTG_HS                    (GPIO_AF10_OTG2_HS)
+
+// Bluetooth config
+#define MICROPY_HW_BLE_UART_ID              (PYB_UART_7)
+#define MICROPY_HW_BLE_UART_BAUDRATE        (115200)
+#define MICROPY_HW_BLE_UART_BAUDRATE_SECONDARY (3000000)
+
+// SDRAM
+#define MICROPY_HW_SDRAM_SIZE               (64 / 8 * 1024 * 1024)  // 64 Mbit
+#define MICROPY_HW_SDRAM_STARTUP_TEST       (1)
+#define MICROPY_HW_SDRAM_TEST_FAIL_ON_ERROR (true)
+
+// Timing configuration for 200MHz/2=100MHz (10ns)
+#define MICROPY_HW_SDRAM_CLOCK_PERIOD       2
+#define MICROPY_HW_SDRAM_CAS_LATENCY        2
+#define MICROPY_HW_SDRAM_FREQUENCY          (100000) // 100 MHz
+#define MICROPY_HW_SDRAM_TIMING_TMRD        (2)
+#define MICROPY_HW_SDRAM_TIMING_TXSR        (7)
+#define MICROPY_HW_SDRAM_TIMING_TRAS        (5)
+#define MICROPY_HW_SDRAM_TIMING_TRC         (7)
+#define MICROPY_HW_SDRAM_TIMING_TWR         (2)
+#define MICROPY_HW_SDRAM_TIMING_TRP         (3)
+#define MICROPY_HW_SDRAM_TIMING_TRCD        (3)
+
+#define MICROPY_HW_SDRAM_ROW_BITS_NUM       12
+#define MICROPY_HW_SDRAM_MEM_BUS_WIDTH      16
+#define MICROPY_HW_SDRAM_REFRESH_CYCLES     4096
+
+#define MICROPY_HW_SDRAM_COLUMN_BITS_NUM    8
+#define MICROPY_HW_SDRAM_INTERN_BANKS_NUM   4
+#define MICROPY_HW_SDRAM_RPIPE_DELAY        0
+#define MICROPY_HW_SDRAM_RBURST             (1)
+#define MICROPY_HW_SDRAM_WRITE_PROTECTION   (0)
+
+#define MICROPY_HW_SDRAM_AUTOREFRESH_NUM    (8)
+#define MICROPY_HW_SDRAM_BURST_LENGTH       1
+#define MICROPY_HW_SDRAM_REFRESH_RATE       (64) // ms
+
+// SDRAM configuration
+#define MICROPY_HW_FMC_SDCKE0       (pin_H2)
+#define MICROPY_HW_FMC_SDNE0        (pin_H3)
+#define MICROPY_HW_FMC_SDNBL0       (pin_E0)
+#define MICROPY_HW_FMC_SDNBL1       (pin_E1)
+#define MICROPY_HW_FMC_SDCLK        (pin_G8)
+#define MICROPY_HW_FMC_SDNCAS       (pin_G15)
+#define MICROPY_HW_FMC_SDNRAS       (pin_F11)
+#define MICROPY_HW_FMC_SDNWE        (pin_H5)
+#define MICROPY_HW_FMC_BA0          (pin_G4)
+#define MICROPY_HW_FMC_BA1          (pin_G5)
+#define MICROPY_HW_FMC_NBL0         (pin_E0)
+#define MICROPY_HW_FMC_NBL1         (pin_E1)
+#define MICROPY_HW_FMC_A0           (pin_F0)
+#define MICROPY_HW_FMC_A1           (pin_F1)
+#define MICROPY_HW_FMC_A2           (pin_F2)
+#define MICROPY_HW_FMC_A3           (pin_F3)
+#define MICROPY_HW_FMC_A4           (pin_F4)
+#define MICROPY_HW_FMC_A5           (pin_F5)
+#define MICROPY_HW_FMC_A6           (pin_F12)
+#define MICROPY_HW_FMC_A7           (pin_F13)
+#define MICROPY_HW_FMC_A8           (pin_F14)
+#define MICROPY_HW_FMC_A9           (pin_F15)
+#define MICROPY_HW_FMC_A10          (pin_G0)
+#define MICROPY_HW_FMC_A11          (pin_G1)
+#define MICROPY_HW_FMC_A12          (pin_G2)
+#define MICROPY_HW_FMC_D0           (pin_D14)
+#define MICROPY_HW_FMC_D1           (pin_D15)
+#define MICROPY_HW_FMC_D2           (pin_D0)
+#define MICROPY_HW_FMC_D3           (pin_D1)
+#define MICROPY_HW_FMC_D4           (pin_E7)
+#define MICROPY_HW_FMC_D5           (pin_E8)
+#define MICROPY_HW_FMC_D6           (pin_E9)
+#define MICROPY_HW_FMC_D7           (pin_E10)
+#define MICROPY_HW_FMC_D8           (pin_E11)
+#define MICROPY_HW_FMC_D9           (pin_E12)
+#define MICROPY_HW_FMC_D10          (pin_E13)
+#define MICROPY_HW_FMC_D11          (pin_E14)
+#define MICROPY_HW_FMC_D12          (pin_E15)
+#define MICROPY_HW_FMC_D13          (pin_D8)
+#define MICROPY_HW_FMC_D14          (pin_D9)
+#define MICROPY_HW_FMC_D15          (pin_D10)
+
+// Ethernet via RMII
+#define MICROPY_HW_ETH_MDC          (pin_C1)
+#define MICROPY_HW_ETH_MDIO         (pin_A2)
+#define MICROPY_HW_ETH_RMII_REF_CLK (pin_A1)
+#define MICROPY_HW_ETH_RMII_CRS_DV  (pin_A7)
+#define MICROPY_HW_ETH_RMII_RXD0    (pin_C4)
+#define MICROPY_HW_ETH_RMII_RXD1    (pin_C5)
+#define MICROPY_HW_ETH_RMII_TX_EN   (pin_G11)
+#define MICROPY_HW_ETH_RMII_TXD0    (pin_G13)
+#define MICROPY_HW_ETH_RMII_TXD1    (pin_G12)
+
+#define MICROPY_HW_USB_VID                      0x2341
+#define MICROPY_HW_USB_PID                      0x055B
+#define MICROPY_HW_USB_PID_CDC_MSC              (MICROPY_HW_USB_PID)
+#define MICROPY_HW_USB_PID_CDC_HID              (MICROPY_HW_USB_PID)
+#define MICROPY_HW_USB_PID_CDC                  (MICROPY_HW_USB_PID)
+#define MICROPY_HW_USB_PID_MSC                  (MICROPY_HW_USB_PID)
+#define MICROPY_HW_USB_PID_CDC2_MSC             (MICROPY_HW_USB_PID)
+#define MICROPY_HW_USB_PID_CDC2                 (MICROPY_HW_USB_PID)
+#define MICROPY_HW_USB_PID_CDC3                 (MICROPY_HW_USB_PID)
+#define MICROPY_HW_USB_PID_CDC3_MSC             (MICROPY_HW_USB_PID)
+#define MICROPY_HW_USB_PID_CDC_MSC_HID          (MICROPY_HW_USB_PID)
+#define MICROPY_HW_USB_PID_CDC2_MSC_HID         (MICROPY_HW_USB_PID)
+#define MICROPY_HW_USB_PID_CDC3_MSC_HID         (MICROPY_HW_USB_PID)
+#define MICROPY_HW_USB_LANGID_STRING            0x409
+#define MICROPY_HW_USB_MANUFACTURER_STRING      "Arduino"
+#define MICROPY_HW_USB_PRODUCT_FS_STRING        "Portenta Virtual Comm Port in FS Mode"
+#define MICROPY_HW_USB_PRODUCT_HS_STRING        "Portenta Virtual Comm Port in HS Mode"
+#define MICROPY_HW_USB_INTERFACE_FS_STRING      "Portenta Interface"
+#define MICROPY_HW_USB_INTERFACE_HS_STRING      "Portenta Interface"
+#define MICROPY_HW_USB_CONFIGURATION_FS_STRING  "Portenta Config"
+#define MICROPY_HW_USB_CONFIGURATION_HS_STRING  "Portenta Config"
diff --git a/ports/stm32/boards/ARDUINO_PORTENTA_H7/mpconfigboard.mk b/ports/stm32/boards/ARDUINO_PORTENTA_H7/mpconfigboard.mk
new file mode 100644
index 0000000000000..e5b48d0644f0f
--- /dev/null
+++ b/ports/stm32/boards/ARDUINO_PORTENTA_H7/mpconfigboard.mk
@@ -0,0 +1,27 @@
+USE_MBOOT = 0
+USE_PYDFU = 0
+# For dual core HAL drivers.
+CFLAGS += -DCORE_CM7
+
+# Arduino bootloader PID:VID
+BOOTLOADER_DFU_USB_VID = 0x2341
+BOOTLOADER_DFU_USB_PID = 0x035b
+
+# MCU settings
+MCU_SERIES = h7
+CMSIS_MCU = STM32H747xx
+MICROPY_FLOAT_IMPL = double
+AF_FILE = boards/stm32h743_af.csv
+LD_FILES = boards/ARDUINO_PORTENTA_H7/stm32h747.ld
+TEXT0_ADDR = 0x08040000
+
+# MicroPython settings
+MICROPY_PY_BLUETOOTH = 1
+MICROPY_BLUETOOTH_NIMBLE = 1
+MICROPY_BLUETOOTH_BTSTACK = 0
+MICROPY_PY_LWIP = 1
+MICROPY_PY_NETWORK_CYW43 = 1
+MICROPY_PY_USSL = 1
+MICROPY_SSL_MBEDTLS = 1
+
+FROZEN_MANIFEST = $(BOARD_DIR)/manifest.py
diff --git a/ports/stm32/boards/ARDUINO_PORTENTA_H7/pins.csv b/ports/stm32/boards/ARDUINO_PORTENTA_H7/pins.csv
new file mode 100644
index 0000000000000..b22da66dd4c08
--- /dev/null
+++ b/ports/stm32/boards/ARDUINO_PORTENTA_H7/pins.csv
@@ -0,0 +1,233 @@
+PA0,PA0
+PA1,PA1
+PA2,-PA2
+PA3,-PA3
+PA4,PA4
+PA5,-PA5
+PA6,-PA6
+PA7,-PA7
+PA8,PA8
+PA9,PA9
+PA10,PA10
+PA11,PA11
+PA12,PA12
+PA13,PA13
+PA14,PA14
+PA15,PA15
+PB0,-PB0
+PB1,-PB1
+PB2,PB2
+PB3,PB3
+PB4,PB4
+PB5,PB5
+PB6,PB6
+PB7,PB7
+PB8,PB8
+PB9,PB9
+PB10,PB10
+PB11,PB11
+PB12,PB12
+PB13,PB13
+PB14,PB14
+PB15,PB15
+PC0,-PC0
+PC1,-PC1
+PC2,PC2
+PC3,PC3
+PC4,-PC4
+PC5,-PC5
+PC6,PC6
+PC7,PC7
+PC8,PC8
+PC9,PC9
+PC10,PC10
+PC11,PC11
+PC12,PC12
+PC13,PC13
+PC14,PC14
+PC15,PC15
+PD0,PD0
+PD1,PD1
+PD2,PD2
+PD3,PD3
+PD4,PD4
+PD5,PD5
+PD6,PD6
+PD7,PD7
+PD8,PD8
+PD9,PD9
+PD10,PD10
+PD11,PD11
+PD12,PD12
+PD13,PD13
+PD14,PD14
+PD15,PD15
+PE0,PE0
+PE1,PE1
+PE2,PE2
+PE3,PE3
+PE4,PE4
+PE5,PE5
+PE6,PE6
+PE7,PE7
+PE8,PE8
+PE9,PE9
+PE10,PE10
+PE11,PE11
+PE12,PE12
+PE13,PE13
+PE14,PE14
+PE15,PE15
+PF0,PF0
+PF1,PF1
+PF2,PF2
+PF3,-PF3
+PF4,-PF4
+PF5,-PF5
+PF6,-PF6
+PF7,-PF7
+PF8,-PF8
+PF9,-PF9
+PF10,-PF10
+PF11,-PF11
+PF12,PF12
+PF13,PF13
+PF14,-PF14
+PF15,PF15
+PG0,PG0
+PG1,PG1
+PG2,PG2
+PG3,PG3
+PG4,PG4
+PG5,PG5
+PG6,PG6
+PG7,PG7
+PG8,PG8
+PG9,PG9
+PG10,PG10
+PG11,PG11
+PG12,PG12
+PG13,PG13
+PG14,PG14
+PG15,PG15
+PH0,PH0
+PH1,PH1
+PH2,-PH2
+PH3,-PH3
+PH4,-PH4
+PH5,-PH5
+PH6,PH6
+PH7,PH7
+PH8,PH8
+PH9,PH9
+PH10,PH10
+PH11,PH11
+PH12,PH12
+PH13,PH13
+PH14,PH14
+PH15,PH15
+PI0,PI0
+PI1,PI1
+PI2,PI2
+PI3,PI3
+PI4,PI4
+PI5,PI5
+PI6,PI6
+PI7,PI7
+PI8,PI8
+PI9,PI9
+PI10,PI10
+PI11,PI11
+PI12,PI12
+PI13,PI13
+PI14,PI14
+PI15,PI15
+PJ0,PJ0
+PJ1,PJ1
+PJ2,PJ2
+PJ3,PJ3
+PJ4,PJ4
+PJ5,PJ5
+PJ6,PJ6
+PJ7,PJ7
+PJ8,PJ8
+PJ9,PJ9
+PJ10,PJ10
+PJ11,PJ11
+PJ12,PJ12
+PJ13,PJ13
+PJ14,PJ14
+PJ15,PJ15
+PK0,PK0
+PK1,PK1
+PK2,PK2
+PK3,PK3
+PK4,PK4
+PK5,PK5
+PK6,PK6
+PK7,PK7
+UART1_TX,PA9
+UART1_RX,PA10
+UART4_TX,PA0
+UART4_RX,PI9
+UART6_TX,PG14
+UART6_RX,PG9
+UART8_TX,PJ8
+UART8_RX,PJ9
+-ETH_RST,PJ15
+-ETH_RMII_REF_CLK,PA1
+-ETH_MDIO,-PA2
+-ETH_RMII_CRS_DV,-PA7
+-ETH_MDC,-PC1
+-ETH_RMII_RXD0,-PC4
+-ETH_RMII_RXD1,-PC5
+-ETH_RMII_TX_EN,PG11
+-ETH_RMII_TXD0,PG13
+-ETH_RMII_TXD1,PG12
+-USB_HS_CLK,-PA5
+-USB_HS_STP,-PC0
+-USB_HS_NXT,-PH4
+-USB_HS_DIR,PI11
+-USB_HS_D0,-PA3
+-USB_HS_D1,-PB0
+-USB_HS_D2,-PB1
+-USB_HS_D3,PB10
+-USB_HS_D4,PB11
+-USB_HS_D5,PB12
+-USB_HS_D6,PB13
+-USB_HS_D7,PB5
+-USB_HS_RST,PJ4
+-USB_DM,PA11
+-USB_DP,PA12
+BOOT0,BOOT0
+OSCEN,PH1
+DAC1,PA4
+DAC2,-PA5
+LEDR,PK5
+LEDG,PK6
+LEDB,PK7
+I2C1_SDA,PB7
+I2C1_SCL,PB6
+I2C3_SDA,PH8
+I2C3_SCL,PH7
+-WL_REG_ON,PJ1
+-WL_HOST_WAKE,PJ5
+-WL_SDIO_0,PC8
+-WL_SDIO_1,PC9
+-WL_SDIO_2,PC10
+-WL_SDIO_3,PC11
+-WL_SDIO_CMD,PD2
+-WL_SDIO_CLK,PC12
+-BT_RXD,-PF6
+-BT_TXD,PA15
+-BT_CTS,-PF9
+-BT_RTS,-PF8
+-BT_REG_ON,PJ12
+-BT_HOST_WAKE,PJ13
+-BT_DEV_WAKE,PJ14
+-QSPI2_CS,PG6
+-QSPI2_CLK,-PF10
+-QSPI2_D0,PD11
+-QSPI2_D1,PD12
+-QSPI2_D2,-PF7
+-QSPI2_D3,PD13
diff --git a/ports/stm32/boards/ARDUINO_PORTENTA_H7/stm32h747.ld b/ports/stm32/boards/ARDUINO_PORTENTA_H7/stm32h747.ld
new file mode 100644
index 0000000000000..650756a19f665
--- /dev/null
+++ b/ports/stm32/boards/ARDUINO_PORTENTA_H7/stm32h747.ld
@@ -0,0 +1,70 @@
+/*
+    GNU linker script for STM32H747
+*/
+
+/* Specify the memory areas */
+MEMORY
+{
+    ITCM (xrw)      : ORIGIN = 0x00000000, LENGTH = 64K
+    DTCM (xrw)      : ORIGIN = 0x20000000, LENGTH = 128K
+    RAM (xrw)       : ORIGIN = 0x24000000, LENGTH = 512K    /* AXI SRAM D1 */
+    SRAM1 (xrw)     : ORIGIN = 0x30000000, LENGTH = 128K    /* SRAM1 D2    */
+    SRAM2 (xrw)     : ORIGIN = 0x30020000, LENGTH = 128K    /* SRAM2 D2    */
+    SRAM3 (xrw)     : ORIGIN = 0x30040000, LENGTH = 32K     /* SRAM3 D2    */
+    SRAM4 (xrw)     : ORIGIN = 0x38000000, LENGTH = 64K     /* SRAM4 D3    */
+    FLASH (rx)      : ORIGIN = 0x08000000, LENGTH = 2048K   /* Total available flash */
+    FLASH_EXT (rx)  : ORIGIN = 0x90000000, LENGTH = 16384K  /* 16MBs external QSPI flash */
+    FLASH_FS (r)    : ORIGIN = 0x08020000, LENGTH = 128K    /* sector  1 -> Flash storage */
+    FLASH_TEXT (rx) : ORIGIN = 0x08040000, LENGTH = 1792K   /* Sector  0 -> Arduino Bootloader
+                                                               Sector  1 -> Reserved for CM4/FS
+                                                               Sectors 2 -> 15 firmware */
+}
+
+/* produce a link error if there is not this amount of RAM for these sections */
+_minimum_stack_size = 2K;
+_minimum_heap_size = 16K;
+
+/* Define the stack.  The stack is full descending so begins just above last byte
+   of RAM.  Note that EABI requires the stack to be 8-byte aligned for a call. */
+_estack = ORIGIN(RAM) + LENGTH(RAM) - _estack_reserve;
+_sstack = _estack - 16K; /* tunable */
+
+/* RAM extents for the garbage collector */
+_ram_start = ORIGIN(RAM);
+_ram_end = ORIGIN(RAM) + LENGTH(RAM);
+_heap_start = _ebss; /* heap starts just after statically allocated memory */
+_heap_end = _sstack;
+
+/* Note the following varilables are only used if the filesystem flash storage is enabled */
+/* Location of filesystem RAM cache */
+_micropy_hw_internal_flash_storage_ram_cache_start = ORIGIN(DTCM);
+_micropy_hw_internal_flash_storage_ram_cache_end = ORIGIN(DTCM) + LENGTH(DTCM);
+
+/* Location of filesystem flash storage */
+_micropy_hw_internal_flash_storage_start = ORIGIN(FLASH_FS);
+_micropy_hw_internal_flash_storage_end = ORIGIN(FLASH_FS) + LENGTH(FLASH_FS);
+
+/* define output sections */
+SECTIONS
+{
+    .isr_vector :
+    {
+        . = ALIGN(4);
+        KEEP(*(.isr_vector))
+        . = ALIGN(4);
+    } >FLASH_TEXT
+
+    .text :
+    {
+        . = ALIGN(4);
+        *(.text*)
+        *(.rodata*)
+        . = ALIGN(512);
+        *(.big_const*)
+        . = ALIGN(4);
+        _etext = .;
+    } >FLASH_TEXT
+
+    INCLUDE common_extratext_data_in_flash_text.ld
+    INCLUDE common_bss_heap_stack.ld
+}
diff --git a/ports/stm32/boards/ARDUINO_PORTENTA_H7/stm32h7xx_hal_conf.h b/ports/stm32/boards/ARDUINO_PORTENTA_H7/stm32h7xx_hal_conf.h
new file mode 100644
index 0000000000000..737a2e5b0d242
--- /dev/null
+++ b/ports/stm32/boards/ARDUINO_PORTENTA_H7/stm32h7xx_hal_conf.h
@@ -0,0 +1,51 @@
+/* This file is part of the MicroPython project, http://micropython.org/
+ * The MIT License (MIT)
+ * Copyright (c) 2019 Damien P. George
+ */
+#ifndef MICROPY_INCLUDED_STM32H7XX_HAL_CONF_H
+#define MICROPY_INCLUDED_STM32H7XX_HAL_CONF_H
+
+#include "boards/stm32h7xx_hal_conf_base.h"
+
+// Oscillator values in Hz
+#define HSE_VALUE (25000000)
+#define LSE_VALUE (32768)
+#define EXTERNAL_CLOCK_VALUE (12288000)
+
+// Oscillator timeouts in ms
+#define HSE_STARTUP_TIMEOUT (5000)
+#define LSE_STARTUP_TIMEOUT (5000)
+
+#define DATA_CACHE_ENABLE           1
+#define INSTRUCTION_CACHE_ENABLE    1
+#define DATA_CACHE_ENABLE           1
+#define INSTRUCTION_CACHE_ENABLE    1
+#define PREFETCH_ENABLE             1
+#define USE_RTOS                    0
+
+#define HAL_HSEM_MODULE_ENABLED
+#define HAL_JPEG_MODULE_ENABLED
+#define HAL_LPTIM_MODULE_ENABLED
+#define HAL_LTDC_MODULE_ENABLED
+#define HAL_MDIOS_MODULE_ENABLED
+#define HAL_MDMA_MODULE_ENABLED
+#define HAL_MMC_MODULE_ENABLED
+#define HAL_NAND_MODULE_ENABLED
+#define HAL_OPAMP_MODULE_ENABLED
+#define HAL_QSPI_MODULE_ENABLED
+#define HAL_RNG_MODULE_ENABLED
+#define HAL_SAI_MODULE_ENABLED
+#define HAL_SMBUS_MODULE_ENABLED
+#define HAL_SPDIFRX_MODULE_ENABLED
+#define HAL_SRAM_MODULE_ENABLED
+#define HAL_SWPMI_MODULE_ENABLED
+
+#ifdef HAL_HSEM_MODULE_ENABLED
+#include "stm32h7xx_hal_hsem.h"
+#endif
+
+#ifdef HAL_MMC_MODULE_ENABLED
+#include "stm32h7xx_hal_mmc.h"
+#endif
+
+#endif // MICROPY_INCLUDED_STM32H7XX_HAL_CONF_H

From 7f445e3d39b8aa6944372658c533d8498b7a37d5 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 28 Apr 2022 11:54:00 +1000
Subject: [PATCH 1966/3533] lib/stm32lib: Update library for G0 v1.5.1.

Changes in this new library version are:
- Add G0 HAL at v1.5.1.

Signed-off-by: Damien George <damien@micropython.org>
---
 lib/stm32lib | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/stm32lib b/lib/stm32lib
index c1b7a41577824..eb80f0126e506 160000
--- a/lib/stm32lib
+++ b/lib/stm32lib
@@ -1 +1 @@
-Subproject commit c1b7a415778247dd3881a1f3d11ea02190cbc94d
+Subproject commit eb80f0126e50687aac966f4c39a2b5a5deffbe78

From 3587d8e80853051b84da25e8d9abc3422bc6f57f Mon Sep 17 00:00:00 2001
From: Asensio Lorenzo Sempere <asensio.aerospace@gmail.com>
Date: Mon, 18 Apr 2022 02:39:09 -0500
Subject: [PATCH 1967/3533] stm32/storage: Add support for internal storage on
 Cortex-M0 MCUs.

This implements self-triggering of the Flash NVIC interrupt on Cortex-M0
devices, which allows enabling internal storage on those MCUs.

Signed-off-by: Asensio Lorenzo Sempere <asensio.aerospace@gmail.com>
---
 ports/stm32/storage.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ports/stm32/storage.c b/ports/stm32/storage.c
index fcc6d51b3d2a1..a043570f1bb57 100644
--- a/ports/stm32/storage.c
+++ b/ports/stm32/storage.c
@@ -83,7 +83,11 @@ uint32_t storage_get_block_count(void) {
 static void storage_systick_callback(uint32_t ticks_ms) {
     if (STORAGE_IDLE_TICK(ticks_ms)) {
         // Trigger a FLASH IRQ to execute at a lower priority
+        #if __CORTEX_M == 0
+        NVIC_SetPendingIRQ(FLASH_IRQn);
+        #else
         NVIC->STIR = FLASH_IRQn;
+        #endif
     }
 }
 

From 010012c7c3af76ca47cf28eb156e0fe5ac3d87a5 Mon Sep 17 00:00:00 2001
From: Asensio Lorenzo Sempere <asensio.aerospace@gmail.com>
Date: Sat, 12 Feb 2022 14:36:58 -0600
Subject: [PATCH 1968/3533] stm32: Add support for G0 MCUs.

This commit adds support for the STM32G0 series of MCUs.

Signed-off-by: Asensio Lorenzo Sempere <asensio.aerospace@gmail.com>
---
 ports/stm32/Makefile                         |  24 ++--
 ports/stm32/adc.c                            |  34 ++++--
 ports/stm32/adc.h                            |   2 +-
 ports/stm32/boards/stm32g0xx_hal_conf_base.h | 106 +++++++++++++++++
 ports/stm32/dac.c                            |   6 +-
 ports/stm32/dma.c                            | 115 +++++++++++++++++--
 ports/stm32/dma.h                            |   2 +-
 ports/stm32/extint.c                         |  41 +++++--
 ports/stm32/extint.h                         |   3 +
 ports/stm32/flash.c                          |  24 +++-
 ports/stm32/machine_adc.c                    |  18 +--
 ports/stm32/machine_uart.c                   |  24 +++-
 ports/stm32/modmachine.c                     |  12 +-
 ports/stm32/mpconfigboard_common.h           |  12 +-
 ports/stm32/mphalport.c                      |   3 +
 ports/stm32/mphalport.h                      |   4 +-
 ports/stm32/powerctrl.c                      |  27 +++--
 ports/stm32/powerctrlboot.c                  |  71 ++++++++++++
 ports/stm32/pyb_i2c.c                        |  12 +-
 ports/stm32/rtc.c                            |  18 ++-
 ports/stm32/spi.c                            |  18 ++-
 ports/stm32/stm32.mk                         |   3 +-
 ports/stm32/stm32_it.c                       | 113 +++++++++++++++++-
 ports/stm32/timer.c                          |  34 ++++--
 ports/stm32/uart.c                           |  98 +++++++++++++---
 ports/stm32/uart.h                           |   5 +-
 26 files changed, 719 insertions(+), 110 deletions(-)
 create mode 100644 ports/stm32/boards/stm32g0xx_hal_conf_base.h

diff --git a/ports/stm32/Makefile b/ports/stm32/Makefile
index 34d5866747942..10e4e15d9f801 100644
--- a/ports/stm32/Makefile
+++ b/ports/stm32/Makefile
@@ -324,14 +324,12 @@ SRC_CXX += \
 SRC_O += \
 	$(STARTUP_FILE) \
 	$(SYSTEM_FILE)
-
-ifeq ($(MCU_SERIES),f0)
-SRC_O += \
-	resethandler_m0.o \
-	shared/runtime/gchelper_m0.o
-else
+    
 ifeq ($(MCU_SERIES),l0)
 CSUPEROPT = -Os # save some code space
+endif
+
+ifeq ($(MCU_SERIES),$(filter $(MCU_SERIES),f0 g0 l0))
 SRC_O += \
 	resethandler_m0.o \
 	shared/runtime/gchelper_m0.o
@@ -341,7 +339,6 @@ SRC_O += \
 	resethandler.o \
 	shared/runtime/gchelper_m3.o
 endif
-endif
 
 HAL_SRC_C += $(addprefix $(STM32LIB_HAL_BASE)/Src/stm32$(MCU_SERIES)xx_,\
 	hal.c \
@@ -366,7 +363,7 @@ HAL_SRC_C += $(addprefix $(STM32LIB_HAL_BASE)/Src/stm32$(MCU_SERIES)xx_,\
 	ll_utils.c \
 	)
 
-ifeq ($(MCU_SERIES),$(filter $(MCU_SERIES),f4 f7 g4 h7 l0 l4 wb))
+ifeq ($(MCU_SERIES),$(filter $(MCU_SERIES),f4 f7 g0 g4 h7 l0 l4 wb))
 HAL_SRC_C += $(addprefix $(STM32LIB_HAL_BASE)/Src/stm32$(MCU_SERIES)xx_,\
 	hal_pcd.c \
 	hal_pcd_ex.c \
@@ -386,7 +383,6 @@ ifeq ($(MCU_SERIES),$(filter $(MCU_SERIES),f4 f7 h7))
 HAL_SRC_C += $(addprefix $(STM32LIB_HAL_BASE)/Src/stm32$(MCU_SERIES)xx_,\
 	hal_mmc.c \
 	hal_sdram.c \
-	hal_dma_ex.c \
 	hal_dcmi.c \
 	)
 ifeq ($(MCU_SERIES),$(filter $(MCU_SERIES),f4))
@@ -396,7 +392,13 @@ $(BUILD)/$(STM32LIB_HAL_BASE)/Src/stm32$(MCU_SERIES)xx_hal_mmc.o: CFLAGS += -Wno
 endif
 endif
 
-ifeq ($(MCU_SERIES),$(filter $(MCU_SERIES),g4))
+ifeq ($(MCU_SERIES),$(filter $(MCU_SERIES),f4 f7 g0 g4 h7))
+HAL_SRC_C += $(addprefix $(STM32LIB_HAL_BASE)/Src/stm32$(MCU_SERIES)xx_,\
+	hal_dma_ex.c \
+	)
+endif
+
+ifeq ($(MCU_SERIES),$(filter $(MCU_SERIES),g0 g4))
     HAL_SRC_C += $(addprefix $(STM32LIB_HAL_BASE)/Src/stm32$(MCU_SERIES)xx_, hal_fdcan.c)
 endif
 
@@ -413,7 +415,7 @@ endif
 endif
 endif
 
-ifeq ($(MCU_SERIES),$(filter $(MCU_SERIES),f0 f4 f7 l0))
+ifeq ($(MCU_SERIES),$(filter $(MCU_SERIES),f0 f4 f7 g0 l0))
 HAL_SRC_C += $(addprefix $(STM32LIB_HAL_BASE)/Src/stm32$(MCU_SERIES)xx_,\
 	hal_i2s.c \
 	)
diff --git a/ports/stm32/adc.c b/ports/stm32/adc.c
index c5ca6306e4088..3b5a8b3646303 100644
--- a/ports/stm32/adc.c
+++ b/ports/stm32/adc.c
@@ -102,13 +102,13 @@
 #define ADC_CAL2                ((uint16_t *)(ADC_CAL_ADDRESS + 4))
 #define ADC_CAL_BITS            (12)
 
-#elif defined(STM32G4)
+#elif defined(STM32G0) || defined(STM32G4)
 
 #define ADC_SCALE_V             (((float)VREFINT_CAL_VREF) / 1000.0f)
 #define ADC_CAL_ADDRESS         VREFINT_CAL_ADDR
 #define ADC_CAL1                TEMPSENSOR_CAL1_ADDR
 #define ADC_CAL2                TEMPSENSOR_CAL2_ADDR
-#define ADC_CAL_BITS            (12) // UM2570, __HAL_ADC_CALC_TEMPERATURE: 'corresponds to a resolution of 12 bits'
+#define ADC_CAL_BITS            (12) // UM2319/UM2570, __HAL_ADC_CALC_TEMPERATURE: 'corresponds to a resolution of 12 bits'
 
 #elif defined(STM32H7)
 
@@ -150,7 +150,7 @@
     defined(STM32F746xx) || defined(STM32F765xx) || \
     defined(STM32F767xx) || defined(STM32F769xx)
 #define VBAT_DIV (4)
-#elif defined(STM32G4)
+#elif defined(STM32G0) || defined(STM32G4)
 #define VBAT_DIV (3)
 #elif defined(STM32H743xx) || defined(STM32H747xx) || \
     defined(STM32H7A3xx) || defined(STM32H7A3xxQ) || \
@@ -210,7 +210,7 @@ STATIC bool is_adcx_channel(int channel) {
     return IS_ADC_CHANNEL(channel) || channel == ADC_CHANNEL_TEMPSENSOR;
     #elif defined(STM32F0) || defined(STM32F4) || defined(STM32F7)
     return IS_ADC_CHANNEL(channel);
-    #elif defined(STM32H7)
+    #elif defined(STM32G0) || defined(STM32H7)
     return __HAL_ADC_IS_CHANNEL_INTERNAL(channel)
            || IS_ADC_CHANNEL(__HAL_ADC_DECIMAL_NB_TO_CHANNEL(channel));
     #elif defined(STM32G4) || defined(STM32L4) || defined(STM32WB)
@@ -227,7 +227,7 @@ STATIC void adc_wait_for_eoc_or_timeout(ADC_HandleTypeDef *adcHandle, int32_t ti
     uint32_t tickstart = HAL_GetTick();
     #if defined(STM32F4) || defined(STM32F7)
     while ((adcHandle->Instance->SR & ADC_FLAG_EOC) != ADC_FLAG_EOC) {
-    #elif defined(STM32F0) || defined(STM32G4) || defined(STM32H7) || defined(STM32L4) || defined(STM32WB)
+    #elif defined(STM32F0) || defined(STM32G0) || defined(STM32G4) || defined(STM32H7) || defined(STM32L4) || defined(STM32WB)
     while (READ_BIT(adcHandle->Instance->ISR, ADC_FLAG_EOC) != ADC_FLAG_EOC) {
     #else
     #error Unsupported processor
@@ -244,6 +244,8 @@ STATIC void adcx_clock_enable(ADC_HandleTypeDef *adch) {
     #elif defined(STM32H7A3xx) || defined(STM32H7A3xxQ) || defined(STM32H7B3xx) || defined(STM32H7B3xxQ)
     __HAL_RCC_ADC12_CLK_ENABLE();
     __HAL_RCC_ADC_CONFIG(RCC_ADCCLKSOURCE_CLKP);
+    #elif defined(STM32G0)
+    __HAL_RCC_ADC_CLK_ENABLE();
     #elif defined(STM32G4)
     __HAL_RCC_ADC12_CLK_ENABLE();
     #elif defined(STM32H7)
@@ -269,8 +271,10 @@ STATIC void adcx_init_periph(ADC_HandleTypeDef *adch, uint32_t resolution) {
     adch->Init.Resolution = resolution;
     adch->Init.ContinuousConvMode = DISABLE;
     adch->Init.DiscontinuousConvMode = DISABLE;
-    #if !defined(STM32F0)
+    #if !defined(STM32F0) && !defined(STM32G0)
     adch->Init.NbrOfDiscConversion = 0;
+    #endif
+    #if !defined(STM32F0)
     adch->Init.NbrOfConversion = 1;
     #endif
     adch->Init.EOCSelection = ADC_EOC_SINGLE_CONV;
@@ -295,7 +299,7 @@ STATIC void adcx_init_periph(ADC_HandleTypeDef *adch, uint32_t resolution) {
     adch->Init.OversamplingMode = DISABLE;
     adch->Init.LeftBitShift = ADC_LEFTBITSHIFT_NONE;
     adch->Init.ConversionDataManagement = ADC_CONVERSIONDATA_DR;
-    #elif defined(STM32G4) || defined(STM32L4) || defined(STM32WB)
+    #elif defined(STM32G0) || defined(STM32G4) || defined(STM32L4) || defined(STM32WB)
     adch->Init.ClockPrescaler = ADC_CLOCK_ASYNC_DIV1;
     adch->Init.ScanConvMode = ADC_SCAN_DISABLE;
     adch->Init.LowPowerAutoWait = DISABLE;
@@ -312,7 +316,9 @@ STATIC void adcx_init_periph(ADC_HandleTypeDef *adch, uint32_t resolution) {
     #if defined(STM32H7)
     HAL_ADCEx_Calibration_Start(adch, ADC_CALIB_OFFSET, ADC_SINGLE_ENDED);
     #endif
-    #if defined(STM32G4) || defined(STM32L4) || defined(STM32WB)
+    #if defined(STM32G0)
+    HAL_ADCEx_Calibration_Start(adch);
+    #elif defined(STM32G4) || defined(STM32L4) || defined(STM32WB)
     HAL_ADCEx_Calibration_Start(adch, ADC_SINGLE_ENDED);
     #endif
 }
@@ -333,7 +339,7 @@ STATIC void adc_init_single(pyb_obj_adc_t *adc_obj) {
 STATIC void adc_config_channel(ADC_HandleTypeDef *adc_handle, uint32_t channel) {
     ADC_ChannelConfTypeDef sConfig;
 
-    #if defined(STM32G4) || defined(STM32H7) || defined(STM32L4) || defined(STM32WB)
+    #if defined(STM32G0) || defined(STM32G4) || defined(STM32H7) || defined(STM32L4) || defined(STM32WB)
     sConfig.Rank = ADC_REGULAR_RANK_1;
     if (__HAL_ADC_IS_CHANNEL_INTERNAL(channel) == 0) {
         channel = __HAL_ADC_DECIMAL_NB_TO_CHANNEL(channel);
@@ -361,6 +367,12 @@ STATIC void adc_config_channel(ADC_HandleTypeDef *adc_handle, uint32_t channel)
     sConfig.OffsetNumber = ADC_OFFSET_NONE;
     sConfig.OffsetRightShift = DISABLE;
     sConfig.OffsetSignedSaturation = DISABLE;
+    #elif defined(STM32G0)
+    if (__HAL_ADC_IS_CHANNEL_INTERNAL(channel)) {
+        sConfig.SamplingTime = ADC_SAMPLETIME_160CYCLES_5;
+    } else {
+        sConfig.SamplingTime = ADC_SAMPLETIME_12CYCLES_5;
+    }
     #elif defined(STM32G4) || defined(STM32L4) || defined(STM32WB)
     if (__HAL_ADC_IS_CHANNEL_INTERNAL(channel)) {
         sConfig.SamplingTime = ADC_SAMPLETIME_247CYCLES_5;
@@ -545,7 +557,7 @@ STATIC mp_obj_t adc_read_timed(mp_obj_t self_in, mp_obj_t buf_in, mp_obj_t freq_
             // for subsequent samples we can just set the "start sample" bit
             #if defined(STM32F4) || defined(STM32F7)
             self->handle.Instance->CR2 |= (uint32_t)ADC_CR2_SWSTART;
-            #elif defined(STM32F0) || defined(STM32G4) || defined(STM32H7) || defined(STM32L4) || defined(STM32WB)
+            #elif defined(STM32F0) || defined(STM32G0) || defined(STM32G4) || defined(STM32H7) || defined(STM32L4) || defined(STM32WB)
             SET_BIT(self->handle.Instance->CR, ADC_CR_ADSTART);
             #else
             #error Unsupported processor
@@ -655,7 +667,7 @@ STATIC mp_obj_t adc_read_timed_multi(mp_obj_t adc_array_in, mp_obj_t buf_array_i
             // ADC is started: set the "start sample" bit
             #if defined(STM32F4) || defined(STM32F7)
             adc->handle.Instance->CR2 |= (uint32_t)ADC_CR2_SWSTART;
-            #elif defined(STM32F0) || defined(STM32G4) || defined(STM32H7) || defined(STM32L4) || defined(STM32WB)
+            #elif defined(STM32F0) || defined(STM32G0) || defined(STM32G4) || defined(STM32H7) || defined(STM32L4) || defined(STM32WB)
             SET_BIT(adc->handle.Instance->CR, ADC_CR_ADSTART);
             #else
             #error Unsupported processor
diff --git a/ports/stm32/adc.h b/ports/stm32/adc.h
index 3b79dc01f5aea..c61bad459cddb 100644
--- a/ports/stm32/adc.h
+++ b/ports/stm32/adc.h
@@ -42,7 +42,7 @@ static inline void adc_deselect_vbat(ADC_TypeDef *adc, uint32_t channel) {
     if (channel == ADC_CHANNEL_VBAT) {
         ADC_Common_TypeDef *adc_common;
 
-        #if defined(STM32F0) || defined(STM32WB)
+        #if defined(STM32F0) || defined(STM32G0) || defined(STM32WB)
         adc_common = ADC1_COMMON;
         #elif defined(STM32F4)
         adc_common = ADC_COMMON_REGISTER(0);
diff --git a/ports/stm32/boards/stm32g0xx_hal_conf_base.h b/ports/stm32/boards/stm32g0xx_hal_conf_base.h
new file mode 100644
index 0000000000000..fc49ca945f3f9
--- /dev/null
+++ b/ports/stm32/boards/stm32g0xx_hal_conf_base.h
@@ -0,0 +1,106 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2019 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#ifndef MICROPY_INCLUDED_STM32G0XX_HAL_CONF_BASE_H
+#define MICROPY_INCLUDED_STM32G0XX_HAL_CONF_BASE_H
+
+// Oscillator values in Hz
+// These must come before the HAL headers because stm32g0xx_ll_rcc.h will define HSI_VALUE unless already defined
+#define HSI_VALUE    (16000000)
+#define LSI_VALUE    (32000)
+#if defined(STM32G0C1xx) || defined(STM32G0B1xx) || defined(STM32G0B0xx)
+#define HSI48_VALUE   48000000
+#endif
+
+// Include various HAL modules for convenience
+
+#include "stm32g0xx_hal_rcc.h"
+#include "stm32g0xx_hal_gpio.h"
+#include "stm32g0xx_hal_dma.h"
+#include "stm32g0xx_hal_cortex.h"
+#include "stm32g0xx_hal_adc.h"
+#include "stm32g0xx_hal_adc_ex.h"
+#include "stm32g0xx_hal_cec.h"
+#include "stm32g0xx_hal_comp.h"
+#include "stm32g0xx_hal_crc.h"
+#include "stm32g0xx_hal_cryp.h"
+#include "stm32g0xx_hal_dac.h"
+#include "stm32g0xx_hal_exti.h"
+#include "stm32g0xx_hal_fdcan.h"
+#include "stm32g0xx_hal_flash.h"
+#include "stm32g0xx_hal_i2c.h"
+#include "stm32g0xx_hal_i2s.h"
+#include "stm32g0xx_hal_irda.h"
+#include "stm32g0xx_hal_iwdg.h"
+#include "stm32g0xx_hal_lptim.h"
+#include "stm32g0xx_hal_pcd.h"
+#include "stm32g0xx_hal_hcd.h"
+#include "stm32g0xx_hal_pwr.h"
+#include "stm32g0xx_hal_rng.h"
+#include "stm32g0xx_hal_rtc.h"
+#include "stm32g0xx_hal_smartcard.h"
+#include "stm32g0xx_hal_smbus.h"
+#include "stm32g0xx_hal_spi.h"
+#include "stm32g0xx_hal_tim.h"
+#include "stm32g0xx_hal_uart.h"
+#include "stm32g0xx_hal_usart.h"
+#include "stm32g0xx_hal_wwdg.h"
+
+#include "stm32g0xx_ll_lpuart.h"
+#include "stm32g0xx_ll_rtc.h"
+#include "stm32g0xx_ll_usart.h"
+
+// Enable various HAL modules
+#define HAL_MODULE_ENABLED
+#define HAL_ADC_MODULE_ENABLED
+#define HAL_CORTEX_MODULE_ENABLED
+#define HAL_DMA_MODULE_ENABLED
+#define HAL_EXTI_MODULE_ENABLED
+#define HAL_FLASH_MODULE_ENABLED
+#define HAL_GPIO_MODULE_ENABLED
+#define HAL_I2C_MODULE_ENABLED
+#define HAL_PWR_MODULE_ENABLED
+#define HAL_RCC_MODULE_ENABLED
+#define HAL_RTC_MODULE_ENABLED
+#define HAL_SPI_MODULE_ENABLED
+#define HAL_TIM_MODULE_ENABLED
+#define HAL_UART_MODULE_ENABLED
+#define HAL_USART_MODULE_ENABLED
+
+// SysTick has the highest priority
+#define TICK_INT_PRIORITY (0x00)
+
+// Miscellaneous HAL settings
+#define  USE_RTOS                     0
+#define  PREFETCH_ENABLE              1
+#define  INSTRUCTION_CACHE_ENABLE     1
+#define  USE_SPI_CRC                  1
+#define  USE_HAL_CRYP_SUSPEND_RESUME  1
+
+// HAL parameter assertions are disabled
+#define assert_param(expr) ((void)0)
+
+#endif // MICROPY_INCLUDED_STM32G0XX_HAL_CONF_BASE_H
diff --git a/ports/stm32/dac.c b/ports/stm32/dac.c
index b7fb0cbd708df..c41bf858a7ed4 100644
--- a/ports/stm32/dac.c
+++ b/ports/stm32/dac.c
@@ -124,7 +124,7 @@ STATIC uint32_t TIMx_Config(mp_obj_t timer) {
 
 STATIC void dac_deinit(uint32_t dac_channel) {
     DAC->CR &= ~(DAC_CR_EN1 << dac_channel);
-    #if defined(STM32G4) || defined(STM32H7) || defined(STM32L4)
+    #if defined(STM32G0) || defined(STM32G4) || defined(STM32H7) || defined(STM32L4)
     DAC->MCR = (DAC->MCR & ~(DAC_MCR_MODE1_Msk << dac_channel)) | (DAC_OUTPUTBUFFER_DISABLE << dac_channel);
     #else
     DAC->CR |= DAC_CR_BOFF1 << dac_channel;
@@ -142,7 +142,7 @@ STATIC void dac_config_channel(uint32_t dac_channel, uint32_t trig, uint32_t out
     DAC->CR &= ~(DAC_CR_EN1 << dac_channel);
     uint32_t cr_off = DAC_CR_DMAEN1 | DAC_CR_MAMP1 | DAC_CR_WAVE1 | DAC_CR_TSEL1 | DAC_CR_TEN1;
     uint32_t cr_on = trig;
-    #if defined(STM32G4) || defined(STM32H7) || defined(STM32L4)
+    #if defined(STM32G0) || defined(STM32G4) || defined(STM32H7) || defined(STM32L4)
     DAC->MCR = (DAC->MCR & ~(DAC_MCR_MODE1_Msk << dac_channel)) | (outbuf << dac_channel);
     #else
     cr_off |= DAC_CR_BOFF1;
@@ -259,7 +259,7 @@ STATIC mp_obj_t pyb_dac_init_helper(pyb_dac_obj_t *self, size_t n_args, const mp
     __DAC_CLK_ENABLE();
     #elif defined(STM32H7)
     __HAL_RCC_DAC12_CLK_ENABLE();
-    #elif defined(STM32F0) || defined(STM32G4) || defined(STM32L4)
+    #elif defined(STM32F0) || defined(STM32G0) || defined(STM32G4) || defined(STM32L4)
     __HAL_RCC_DAC1_CLK_ENABLE();
     #else
     #error Unsupported Processor
diff --git a/ports/stm32/dma.c b/ports/stm32/dma.c
index cb8e555df4b95..2dc6e8e8b463b 100644
--- a/ports/stm32/dma.c
+++ b/ports/stm32/dma.c
@@ -80,7 +80,7 @@ typedef union {
 struct _dma_descr_t {
     #if defined(STM32F4) || defined(STM32F7) || defined(STM32H7)
     DMA_Stream_TypeDef *instance;
-    #elif defined(STM32F0) || defined(STM32G4) || defined(STM32L0) || defined(STM32L4) || defined(STM32WB) || defined(STM32WL)
+    #elif defined(STM32F0) || defined(STM32G0) || defined(STM32G4) || defined(STM32L0) || defined(STM32L4) || defined(STM32WB) || defined(STM32WL)
     DMA_Channel_TypeDef *instance;
     #else
     #error "Unsupported Processor"
@@ -95,7 +95,7 @@ struct _dma_descr_t {
 static const DMA_InitTypeDef dma_init_struct_spi_i2c = {
     #if defined(STM32F4) || defined(STM32F7)
     .Channel = 0,
-    #elif defined(STM32G4) || defined(STM32H7) || defined(STM32L0) || defined(STM32L4) || defined(STM32WB) || defined(STM32WL)
+    #elif defined(STM32G0) || defined(STM32G4) || defined(STM32H7) || defined(STM32L0) || defined(STM32L4) || defined(STM32WB) || defined(STM32WL)
     .Request = 0,
     #endif
     .Direction = 0,
@@ -119,7 +119,7 @@ static const DMA_InitTypeDef dma_init_struct_spi_i2c = {
 static const DMA_InitTypeDef dma_init_struct_i2s = {
     #if defined(STM32F4) || defined(STM32F7)
     .Channel = 0,
-    #elif defined(STM32H7) || defined(STM32L0) || defined(STM32L4)
+    #elif defined(STM32G0) || defined(STM32H7) || defined(STM32L0) || defined(STM32L4)
     .Request = 0,
     #endif
     .Direction = DMA_MEMORY_TO_PERIPH,
@@ -143,7 +143,7 @@ static const DMA_InitTypeDef dma_init_struct_i2s = {
 static const DMA_InitTypeDef dma_init_struct_sdio = {
     #if defined(STM32F4) || defined(STM32F7)
     .Channel = 0,
-    #elif defined(STM32G4) || defined(STM32L0) || defined(STM32L4) || defined(STM32WB)
+    #elif defined(STM32G0) || defined(STM32G4) || defined(STM32L0) || defined(STM32L4) || defined(STM32WB)
     .Request = 0,
     #endif
     .Direction = 0,
@@ -153,7 +153,7 @@ static const DMA_InitTypeDef dma_init_struct_sdio = {
     .MemDataAlignment = DMA_MDATAALIGN_WORD,
     #if defined(STM32F4) || defined(STM32F7)
     .Mode = DMA_PFCTRL,
-    #elif defined(STM32G4) || defined(STM32L0) || defined(STM32L4) || defined(STM32WB)
+    #elif defined(STM32G0) || defined(STM32G4) || defined(STM32L0) || defined(STM32L4) || defined(STM32WB)
     .Mode = DMA_NORMAL,
     #endif
     .Priority = DMA_PRIORITY_VERY_HIGH,
@@ -171,7 +171,7 @@ static const DMA_InitTypeDef dma_init_struct_sdio = {
 static const DMA_InitTypeDef dma_init_struct_dac = {
     #if defined(STM32F4) || defined(STM32F7)
     .Channel = 0,
-    #elif defined(STM32G4) || defined(STM32H7) || defined(STM32L0) || defined(STM32L4) || defined(STM32WB)
+    #elif defined(STM32G0) || defined(STM32G4) || defined(STM32H7) || defined(STM32L0) || defined(STM32L4) || defined(STM32WB)
     .Request = 0,
     #endif
     .Direction = 0,
@@ -507,6 +507,46 @@ static const uint8_t dma_irqn[NSTREAM] = {
     DMA2_Channel7_IRQn,
 };
 
+#elif defined(STM32G0)
+
+#define NCONTROLLERS            (2)
+#define NSTREAMS_PER_CONTROLLER (7)
+#define NSTREAM                 (NCONTROLLERS * NSTREAMS_PER_CONTROLLER)
+
+#define DMA_SUB_INSTANCE_AS_UINT8(dma_request) (dma_request)
+
+#define DMA1_ENABLE_MASK (0x007f) // Bits in dma_enable_mask corresponding to DMA1 (7 channels)
+#define DMA2_ENABLE_MASK (0x0f80) // Bits in dma_enable_mask corresponding to DMA2 (only 5 channels)
+
+// DMA1 streams
+#if MICROPY_HW_ENABLE_DAC
+const dma_descr_t dma_DAC_1_TX = { DMA1_Channel3, DMA_REQUEST_DAC1_CH1, dma_id_2, &dma_init_struct_dac };
+const dma_descr_t dma_DAC_2_TX = { DMA1_Channel4, DMA_REQUEST_DAC1_CH2, dma_id_3, &dma_init_struct_dac };
+#endif
+const dma_descr_t dma_SPI_3_TX = { DMA1_Channel7, DMA_REQUEST_SPI3_TX, dma_id_6, &dma_init_struct_spi_i2c};
+const dma_descr_t dma_SPI_3_RX = { DMA2_Channel1, DMA_REQUEST_SPI3_RX, dma_id_7, &dma_init_struct_spi_i2c};
+const dma_descr_t dma_SPI_2_TX = { DMA1_Channel5, DMA_REQUEST_SPI2_TX, dma_id_4, &dma_init_struct_spi_i2c};
+const dma_descr_t dma_SPI_2_RX = { DMA1_Channel6, DMA_REQUEST_SPI2_RX, dma_id_5, &dma_init_struct_spi_i2c};
+const dma_descr_t dma_SPI_1_RX = { DMA2_Channel3, DMA_REQUEST_SPI1_RX, dma_id_9, &dma_init_struct_spi_i2c};
+const dma_descr_t dma_SPI_1_TX = { DMA2_Channel4, DMA_REQUEST_SPI1_TX, dma_id_10, &dma_init_struct_spi_i2c};
+
+static const uint8_t dma_irqn[NSTREAM] = {
+    DMA1_Channel1_IRQn,
+    DMA1_Channel2_3_IRQn,
+    DMA1_Channel2_3_IRQn,
+    DMA1_Ch4_7_DMA2_Ch1_5_DMAMUX1_OVR_IRQn,
+    DMA1_Ch4_7_DMA2_Ch1_5_DMAMUX1_OVR_IRQn,
+    DMA1_Ch4_7_DMA2_Ch1_5_DMAMUX1_OVR_IRQn,
+    DMA1_Ch4_7_DMA2_Ch1_5_DMAMUX1_OVR_IRQn,
+    DMA1_Ch4_7_DMA2_Ch1_5_DMAMUX1_OVR_IRQn,
+    DMA1_Ch4_7_DMA2_Ch1_5_DMAMUX1_OVR_IRQn,
+    DMA1_Ch4_7_DMA2_Ch1_5_DMAMUX1_OVR_IRQn,
+    DMA1_Ch4_7_DMA2_Ch1_5_DMAMUX1_OVR_IRQn,
+    DMA1_Ch4_7_DMA2_Ch1_5_DMAMUX1_OVR_IRQn,
+    0,
+    0,
+};
+
 #elif defined(STM32G4)
 
 #define NCONTROLLERS            (2)
@@ -665,7 +705,7 @@ volatile dma_idle_count_t dma_idle;
 
 #define DMA_INVALID_CHANNEL 0xff    // Value stored in dma_last_channel which means invalid
 
-#if defined(STM32F0) || defined(STM32L0)
+#if defined(STM32F0) || defined(STM32G0) || defined(STM32L0)
 #define DMA1_IS_CLK_ENABLED()   ((RCC->AHBENR & RCC_AHBENR_DMA1EN) != 0)
 #if defined(DMA2)
 #define DMA2_IS_CLK_ENABLED()   ((RCC->AHBENR & RCC_AHBENR_DMA2EN) != 0)
@@ -830,6 +870,59 @@ void DMA2_Stream7_IRQHandler(void) {
     IRQ_EXIT(DMA2_Stream7_IRQn);
 }
 
+#elif defined(STM32G0)
+
+void DMA1_Channel1_IRQHandler(void) {
+    IRQ_ENTER(DMA1_Channel1_IRQn);
+    if (dma_handle[dma_id_0] != NULL) {
+        HAL_DMA_IRQHandler(dma_handle[dma_id_0]);
+    }
+    IRQ_EXIT(DMA1_Channel1_IRQn);
+}
+
+void DMA1_Channel2_3_IRQHandler(void) {
+    IRQ_ENTER(DMA1_Channel2_3_IRQn);
+    if (dma_handle[dma_id_1] != NULL) {
+        HAL_DMA_IRQHandler(dma_handle[dma_id_1]);
+    }
+    if (dma_handle[dma_id_2] != NULL) {
+        HAL_DMA_IRQHandler(dma_handle[dma_id_2]);
+    }
+    IRQ_EXIT(DMA1_Channel2_3_IRQn);
+}
+
+void DMA1_Ch4_7_DMA2_Ch1_5_DMAMUX1_OVR_IRQHandler(void) {
+    IRQ_ENTER(DMA1_Ch4_7_DMA2_Ch1_5_DMAMUX1_OVR_IRQn);
+    if (dma_handle[dma_id_3] != NULL) {
+        HAL_DMA_IRQHandler(dma_handle[dma_id_3]);
+    }
+    if (dma_handle[dma_id_4] != NULL) {
+        HAL_DMA_IRQHandler(dma_handle[dma_id_4]);
+    }
+    if (dma_handle[dma_id_5] != NULL) {
+        HAL_DMA_IRQHandler(dma_handle[dma_id_5]);
+    }
+    if (dma_handle[dma_id_6] != NULL) {
+        HAL_DMA_IRQHandler(dma_handle[dma_id_6]);
+    }
+    if (dma_handle[dma_id_7] != NULL) {
+        HAL_DMA_IRQHandler(dma_handle[dma_id_7]);
+    }
+    if (dma_handle[dma_id_8] != NULL) {
+        HAL_DMA_IRQHandler(dma_handle[dma_id_8]);
+    }
+    if (dma_handle[dma_id_9] != NULL) {
+        HAL_DMA_IRQHandler(dma_handle[dma_id_9]);
+    }
+    if (dma_handle[dma_id_10] != NULL) {
+        HAL_DMA_IRQHandler(dma_handle[dma_id_10]);
+    }
+    if (dma_handle[dma_id_11] != NULL) {
+        HAL_DMA_IRQHandler(dma_handle[dma_id_11]);
+    }
+    IRQ_EXIT(DMA1_Ch4_7_DMA2_Ch1_5_DMAMUX1_OVR_IRQn);
+}
+
 #elif defined(STM32G4)
 
 void DMA1_Channel1_IRQHandler(void) {
@@ -1164,7 +1257,7 @@ void dma_init_handle(DMA_HandleTypeDef *dma, const dma_descr_t *dma_descr, uint3
     dma->Instance = dma_descr->instance;
     dma->Init = *dma_descr->init;
     dma->Init.Direction = dir;
-    #if defined(STM32G4) || defined(STM32H7) || defined(STM32L0) || defined(STM32L4) || defined(STM32WB) || defined(STM32WL)
+    #if defined(STM32G0) || defined(STM32G4) || defined(STM32H7) || defined(STM32L0) || defined(STM32L4) || defined(STM32WB) || defined(STM32WL)
     dma->Init.Request = dma_descr->sub_instance;
     #else
     #if !defined(STM32F0)
@@ -1191,8 +1284,8 @@ void dma_init(DMA_HandleTypeDef *dma, const dma_descr_t *dma_descr, uint32_t dir
 
         dma_enable_clock(dma_id);
 
-        #if defined(STM32G4) || defined(STM32H7) || defined(STM32L0) || defined(STM32L4) || defined(STM32WB) || defined(STM32WL)
-        // Always reset and configure the H7 and L0/L4 DMA peripheral
+        #if defined(STM32G0) || defined(STM32G4) || defined(STM32H7) || defined(STM32L0) || defined(STM32L4) || defined(STM32WB) || defined(STM32WL)
+        // Always reset and configure the H7 and G0/G4/H7/L0/L4/WB/WL DMA peripheral
         // (dma->State is set to HAL_DMA_STATE_RESET by memset above)
         // TODO: understand how L0/L4 DMA works so this is not needed
         HAL_DMA_DeInit(dma);
@@ -1367,7 +1460,7 @@ void dma_nohal_start(const dma_descr_t *descr, uint32_t src_addr, uint32_t dst_a
     dma->CCR |= DMA_CCR_EN;
 }
 
-#elif defined(STM32WB) || defined(STM32WL)
+#elif defined(STM32G0) || defined(STM32WB) || defined(STM32WL)
 
 // These functions are currently not implemented or needed for this MCU.
 
diff --git a/ports/stm32/dma.h b/ports/stm32/dma.h
index 9b0b4c77a6621..70c7e6a005238 100644
--- a/ports/stm32/dma.h
+++ b/ports/stm32/dma.h
@@ -28,7 +28,7 @@
 
 typedef struct _dma_descr_t dma_descr_t;
 
-#if defined(STM32F0) || defined(STM32F4) || defined(STM32F7) || defined(STM32H7)
+#if defined(STM32F0) || defined(STM32F4) || defined(STM32F7) || defined(STM32G0) || defined(STM32H7)
 
 extern const dma_descr_t dma_I2C_1_RX;
 extern const dma_descr_t dma_SPI_3_RX;
diff --git a/ports/stm32/extint.c b/ports/stm32/extint.c
index 55c9095f117e2..2fc68e1958be3 100644
--- a/ports/stm32/extint.c
+++ b/ports/stm32/extint.c
@@ -91,7 +91,7 @@
 #define EXTI_SWIER_BB(line) (*(__IO uint32_t *)(PERIPH_BB_BASE + ((EXTI_OFFSET + offsetof(EXTI_TypeDef, SWIER)) * 32) + ((line) * 4)))
 #endif
 
-#if defined(STM32G4) || defined(STM32L4) || defined(STM32WB) || defined(STM32WL)
+#if defined(STM32G0) || defined(STM32G4) || defined(STM32L4) || defined(STM32WB) || defined(STM32WL)
 // The L4 MCU supports 40 Events/IRQs lines of the type configurable and direct.
 // Here we only support configurable line types.  Details, see page 330 of RM0351, Rev 1.
 // The USB_FS_WAKUP event is a direct type and there is no support for it.
@@ -143,7 +143,7 @@ STATIC mp_obj_t pyb_extint_callback_arg[EXTI_NUM_VECTORS];
 #endif
 
 STATIC const uint8_t nvic_irq_channel[EXTI_NUM_VECTORS] = {
-    #if defined(STM32F0) || defined(STM32L0)
+    #if defined(STM32F0) || defined(STM32L0) || defined(STM32G0)
 
     EXTI0_1_IRQn,  EXTI0_1_IRQn,  EXTI2_3_IRQn,  EXTI2_3_IRQn,
     EXTI4_15_IRQn, EXTI4_15_IRQn, EXTI4_15_IRQn, EXTI4_15_IRQn,
@@ -154,12 +154,20 @@ STATIC const uint8_t nvic_irq_channel[EXTI_NUM_VECTORS] = {
     #else
     PVD_VDDIO2_IRQn,
     #endif
+    #if defined(STM32G0)
+    ADC1_COMP_IRQn,
+    ADC1_COMP_IRQn,
+    RTC_TAMP_IRQn,
+    0, // COMP3
+    RTC_TAMP_IRQn,// 21
+    #else
     RTC_IRQn,
     0, // internal USB wakeup event
     RTC_IRQn,
     RTC_IRQn,
     ADC1_COMP_IRQn,
     ADC1_COMP_IRQn,
+    #endif
 
     #else
 
@@ -317,9 +325,15 @@ void extint_register_pin(const pin_obj_t *pin, uint32_t mode, bool hard_irq, mp_
         #if !defined(STM32WB) && !defined(STM32WL)
         __HAL_RCC_SYSCFG_CLK_ENABLE();
         #endif
+        #if defined(STM32G0)
+        EXTI->EXTICR[line >> 2] =
+            (EXTI->EXTICR[line >> 2] & ~(0x0f << (4 * (line & 0x03))))
+            | ((uint32_t)(GPIO_GET_INDEX(pin->gpio)) << (4 * (line & 0x03)));
+        #else
         SYSCFG->EXTICR[line >> 2] =
             (SYSCFG->EXTICR[line >> 2] & ~(0x0f << (4 * (line & 0x03))))
             | ((uint32_t)(GPIO_GET_INDEX(pin->gpio)) << (4 * (line & 0x03)));
+        #endif
 
         extint_trigger_mode(line, mode);
 
@@ -354,9 +368,15 @@ void extint_set(const pin_obj_t *pin, uint32_t mode) {
         #if !defined(STM32WB) && !defined(STM32WL)
         __HAL_RCC_SYSCFG_CLK_ENABLE();
         #endif
+        #if defined(STM32G0)
+        EXTI->EXTICR[line >> 2] =
+            (EXTI->EXTICR[line >> 2] & ~(0x0f << (4 * (line & 0x03))))
+            | ((uint32_t)(GPIO_GET_INDEX(pin->gpio)) << (4 * (line & 0x03)));
+        #else
         SYSCFG->EXTICR[line >> 2] =
             (SYSCFG->EXTICR[line >> 2] & ~(0x0f << (4 * (line & 0x03))))
             | ((uint32_t)(GPIO_GET_INDEX(pin->gpio)) << (4 * (line & 0x03)));
+        #endif
 
         // Enable or disable the rising detector
         if ((mode & GPIO_MODE_IT_RISING) == GPIO_MODE_IT_RISING) {
@@ -391,7 +411,7 @@ void extint_enable(uint line) {
     if (pyb_extint_mode[line] == EXTI_Mode_Interrupt) {
         #if defined(STM32H7)
         EXTI_D1->IMR1 |= (1 << line);
-        #elif defined(STM32G4) || defined(STM32WB) || defined(STM32WL)
+        #elif defined(STM32G0) || defined(STM32G4) || defined(STM32WB) || defined(STM32WL)
         EXTI->IMR1 |= (1 << line);
         #else
         EXTI->IMR |= (1 << line);
@@ -399,7 +419,7 @@ void extint_enable(uint line) {
     } else {
         #if defined(STM32H7)
         EXTI_D1->EMR1 |= (1 << line);
-        #elif defined(STM32G4) || defined(STM32WB) || defined(STM32WL)
+        #elif defined(STM32G0) || defined(STM32G4) || defined(STM32WB) || defined(STM32WL)
         EXTI->EMR1 |= (1 << line);
         #else
         EXTI->EMR |= (1 << line);
@@ -425,7 +445,7 @@ void extint_disable(uint line) {
     #if defined(STM32H7)
     EXTI_D1->IMR1 &= ~(1 << line);
     EXTI_D1->EMR1 &= ~(1 << line);
-    #elif defined(STM32G4) || defined(STM32WB) || defined(STM32WL)
+    #elif defined(STM32G0) || defined(STM32G4) || defined(STM32WB) || defined(STM32WL)
     EXTI->IMR1 &= ~(1 << line);
     EXTI->EMR1 &= ~(1 << line);
     #else
@@ -447,7 +467,7 @@ void extint_swint(uint line) {
         return;
     }
     // we need 0 to 1 transition to trigger the interrupt
-    #if defined(STM32G4) || defined(STM32H7) || defined(STM32L4) || defined(STM32WB) || defined(STM32WL)
+    #if defined(STM32G0) || defined(STM32G4) || defined(STM32H7) || defined(STM32L4) || defined(STM32WB) || defined(STM32WL)
     EXTI->SWIER1 &= ~(1 << line);
     EXTI->SWIER1 |= (1 << line);
     #else
@@ -525,7 +545,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(extint_obj_swint_obj,  extint_obj_swint);
 /// \classmethod regs()
 /// Dump the values of the EXTI registers.
 STATIC mp_obj_t extint_regs(void) {
-    #if defined(STM32G4) || defined(STM32L4) || defined(STM32WB) || defined(STM32WL)
+    #if defined(STM32G0) || defined(STM32G4) || defined(STM32L4) || defined(STM32WB) || defined(STM32WL)
     printf("EXTI_IMR1   %08x\n", (unsigned int)EXTI->IMR1);
     printf("EXTI_IMR2   %08x\n", (unsigned int)EXTI->IMR2);
     printf("EXTI_EMR1   %08x\n", (unsigned int)EXTI->EMR1);
@@ -536,8 +556,15 @@ STATIC mp_obj_t extint_regs(void) {
     printf("EXTI_FTSR2  %08x\n", (unsigned int)EXTI->FTSR2);
     printf("EXTI_SWIER1 %08x\n", (unsigned int)EXTI->SWIER1);
     printf("EXTI_SWIER2 %08x\n", (unsigned int)EXTI->SWIER2);
+    #if defined(STM32G0)
+    printf("EXTI_RPR1    %08x\n", (unsigned int)EXTI->RPR1);
+    printf("EXTI_FPR1    %08x\n", (unsigned int)EXTI->FPR1);
+    printf("EXTI_RPR2    %08x\n", (unsigned int)EXTI->RPR2);
+    printf("EXTI_FPR2    %08x\n", (unsigned int)EXTI->FPR2);
+    #else
     printf("EXTI_PR1    %08x\n", (unsigned int)EXTI->PR1);
     printf("EXTI_PR2    %08x\n", (unsigned int)EXTI->PR2);
+    #endif
     #elif defined(STM32H7)
     printf("EXTI_IMR1   %08x\n", (unsigned int)EXTI_D1->IMR1);
     printf("EXTI_IMR2   %08x\n", (unsigned int)EXTI_D1->IMR2);
diff --git a/ports/stm32/extint.h b/ports/stm32/extint.h
index 247852fa19bcb..95e29c97fdc7e 100644
--- a/ports/stm32/extint.h
+++ b/ports/stm32/extint.h
@@ -49,6 +49,9 @@
 #elif defined(STM32H7) || defined(STM32WB)
 #define EXTI_RTC_TIMESTAMP      (18)
 #define EXTI_RTC_WAKEUP         (19)
+#elif defined(STM32G0)
+#define EXTI_RTC_WAKEUP         (19)
+#define EXTI_RTC_TIMESTAMP      (21)
 #else
 #define EXTI_RTC_TIMESTAMP      (21)
 #define EXTI_RTC_WAKEUP         (22)
diff --git a/ports/stm32/flash.c b/ports/stm32/flash.c
index 0c4d2cf5b9404..2644e0f58ae06 100644
--- a/ports/stm32/flash.c
+++ b/ports/stm32/flash.c
@@ -29,6 +29,20 @@
 #include "py/mphal.h"
 #include "flash.h"
 
+#if defined(STM32G0)
+// These are not defined on the CMSIS header
+#define FLASH_FLAG_SR_ERRORS      (FLASH_FLAG_OPERR | FLASH_FLAG_PROGERR | FLASH_FLAG_WRPERR | \
+    FLASH_FLAG_PGAERR | FLASH_FLAG_SIZERR | FLASH_FLAG_PGSERR | \
+    FLASH_FLAG_MISERR | FLASH_FLAG_FASTERR | FLASH_FLAG_RDERR | \
+    FLASH_FLAG_OPTVERR)
+#if defined(FLASH_OPTR_DBANK)
+#define FLASH_FLAG_ECCR_ERRORS    (FLASH_FLAG_ECCC | FLASH_FLAG_ECCD | FLASH_FLAG_ECCC2 | FLASH_FLAG_ECCD2)
+#else
+#define FLASH_FLAG_ECCR_ERRORS    (FLASH_FLAG_ECCC | FLASH_FLAG_ECCD)
+#endif
+#define FLASH_FLAG_ALL_ERRORS     (FLASH_FLAG_SR_ERRORS | FLASH_FLAG_ECCR_ERRORS)
+#endif
+
 #if MICROPY_HW_STM32WB_FLASH_SYNCRONISATION
 // See WB55 specific documentation in AN5289 Rev 3, and in particular, Figure 10.
 
@@ -97,7 +111,7 @@ static const flash_layout_t flash_layout[] = {
 };
 #endif
 
-#elif defined(STM32G4) || defined(STM32L0) || defined(STM32L4) || defined(STM32WB) || defined(STM32WL)
+#elif defined(STM32G0) || defined(STM32G4) || defined(STM32L0) || defined(STM32L4) || defined(STM32WB) || defined(STM32WL)
 
 static const flash_layout_t flash_layout[] = {
     { (uint32_t)FLASH_BASE, (uint32_t)FLASH_PAGE_SIZE, 512 },
@@ -165,7 +179,7 @@ static uint32_t get_page(uint32_t addr) {
     return (addr - FLASH_BASE) / FLASH_PAGE_SIZE;
 }
 
-#elif defined(STM32G4)
+#elif defined(STM32G0) || defined(STM32G4)
 
 static uint32_t get_page(uint32_t addr) {
     return (addr - FLASH_BASE) / FLASH_PAGE_SIZE;
@@ -252,7 +266,7 @@ int flash_erase(uint32_t flash_dest, uint32_t num_word32) {
     EraseInitStruct.TypeErase = FLASH_TYPEERASE_PAGES;
     EraseInitStruct.PageAddress = flash_dest;
     EraseInitStruct.NbPages = (4 * num_word32 + FLASH_PAGE_SIZE - 4) / FLASH_PAGE_SIZE;
-    #elif defined(STM32G4)
+    #elif defined(STM32G0) || defined(STM32G4)
     __HAL_FLASH_CLEAR_FLAG(FLASH_FLAG_ALL_ERRORS);
     EraseInitStruct.TypeErase = FLASH_TYPEERASE_PAGES;
     EraseInitStruct.Page = get_page(flash_dest);
@@ -291,7 +305,7 @@ int flash_erase(uint32_t flash_dest, uint32_t num_word32) {
     #else
     EraseInitStruct.VoltageRange = 0; // unused parameter on STM32H7A3/B3
     #endif
-    #if defined(STM32G4) || defined(STM32H7)
+    #if defined(STM32G0) || defined(STM32G4) || defined(STM32H7)
     EraseInitStruct.Banks = get_bank(flash_dest);
     #endif
     EraseInitStruct.Sector = flash_get_sector_info(flash_dest, NULL, NULL);
@@ -370,7 +384,7 @@ int flash_write(uint32_t flash_dest, const uint32_t *src, uint32_t num_word32) {
 
     HAL_StatusTypeDef status = HAL_OK;
 
-    #if defined(STM32G4) || defined(STM32L4) || defined(STM32WB) || defined(STM32WL)
+    #if defined(STM32G0) || defined(STM32G4) || defined(STM32L4) || defined(STM32WB) || defined(STM32WL)
 
     // program the flash uint64 by uint64
     for (int i = 0; i < num_word32 / 2; i++) {
diff --git a/ports/stm32/machine_adc.c b/ports/stm32/machine_adc.c
index 819fd3414f68a..ca40acf0d25c9 100644
--- a/ports/stm32/machine_adc.c
+++ b/ports/stm32/machine_adc.c
@@ -28,7 +28,7 @@
 #include "py/mphal.h"
 #include "adc.h"
 
-#if defined(STM32F0) || defined(STM32G4) || defined(STM32H7) || defined(STM32L0) || defined(STM32L4) || defined(STM32WB) || defined(STM32WL)
+#if defined(STM32F0) || defined(STM32G0) || defined(STM32G4) || defined(STM32H7) || defined(STM32L0) || defined(STM32L4) || defined(STM32WB) || defined(STM32WL)
 #define ADC_V2 (1)
 #else
 #define ADC_V2 (0)
@@ -42,7 +42,7 @@
 #define ADCx_COMMON __LL_ADC_COMMON_INSTANCE(0)
 #endif
 
-#if defined(STM32F0) || defined(STM32L0) || defined(STM32WL)
+#if defined(STM32F0) || defined(STM32G0) || defined(STM32L0) || defined(STM32WL)
 #define ADC_STAB_DELAY_US (1)
 #define ADC_TEMPSENSOR_DELAY_US (10)
 #elif defined(STM32G4)
@@ -65,7 +65,7 @@
 #elif defined(STM32H7)
 #define ADC_SAMPLETIME_DEFAULT      ADC_SAMPLETIME_8CYCLES_5
 #define ADC_SAMPLETIME_DEFAULT_INT  ADC_SAMPLETIME_387CYCLES_5
-#elif defined(STM32L0) || defined(STM32WL)
+#elif defined(STM32G0) || defined(STM32L0) || defined(STM32WL)
 #define ADC_SAMPLETIME_DEFAULT      ADC_SAMPLETIME_12CYCLES_5
 #define ADC_SAMPLETIME_DEFAULT_INT  ADC_SAMPLETIME_160CYCLES_5
 #elif defined(STM32L4) || defined(STM32WB)
@@ -105,7 +105,7 @@ STATIC const uint8_t adc_cr_to_bits_table[] = {12, 10, 8, 6};
 
 void adc_config(ADC_TypeDef *adc, uint32_t bits) {
     // Configure ADC clock source and enable ADC clock
-    #if defined(STM32L4) || defined(STM32WB) || defined(STM32WL)
+    #if defined(STM32G0) || defined(STM32L4) || defined(STM32WB) || defined(STM32WL)
     __HAL_RCC_ADC_CONFIG(RCC_ADCCLKSOURCE_SYSCLK);
     __HAL_RCC_ADC_CLK_ENABLE();
     #else
@@ -174,7 +174,7 @@ void adc_config(ADC_TypeDef *adc, uint32_t bits) {
     #if ADC_V2
     if (!(adc->CR & ADC_CR_ADEN)) {
         // ADC isn't enabled so calibrate it now
-        #if defined(STM32F0) || defined(STM32L0) || defined(STM32WL)
+        #if defined(STM32F0) || defined(STM32G0) || defined(STM32L0) || defined(STM32WL)
         LL_ADC_StartCalibration(adc);
         #elif defined(STM32G4) || defined(STM32L4) || defined(STM32WB)
         LL_ADC_StartCalibration(adc, LL_ADC_SINGLE_ENDED);
@@ -237,7 +237,7 @@ void adc_config(ADC_TypeDef *adc, uint32_t bits) {
 }
 
 STATIC int adc_get_bits(ADC_TypeDef *adc) {
-    #if defined(STM32F0) || defined(STM32L0) || defined(STM32WL)
+    #if defined(STM32F0) || defined(STM32G0) || defined(STM32L0) || defined(STM32WL)
     uint32_t res = (adc->CFGR1 & ADC_CFGR1_RES) >> ADC_CFGR1_RES_Pos;
     #elif defined(STM32F4) || defined(STM32F7)
     uint32_t res = (adc->CR1 & ADC_CR1_RES) >> ADC_CR1_RES_Pos;
@@ -267,7 +267,7 @@ STATIC void adc_config_channel(ADC_TypeDef *adc, uint32_t channel, uint32_t samp
     }
     #endif
 
-    #if defined(STM32F0) || defined(STM32L0)
+    #if defined(STM32F0) || defined(STM32G0) || defined(STM32L0)
 
     if (channel == ADC_CHANNEL_VREFINT) {
         ADC1_COMMON->CCR |= ADC_CCR_VREFEN;
@@ -279,7 +279,11 @@ STATIC void adc_config_channel(ADC_TypeDef *adc, uint32_t channel, uint32_t samp
         ADC1_COMMON->CCR |= ADC_CCR_VBATEN;
     #endif
     }
+    #if defined(STM32G0)
+    adc->SMPR = sample_time << ADC_SMPR_SMP1_Pos; // select sample time from SMP1 (default)
+    #else
     adc->SMPR = sample_time << ADC_SMPR_SMP_Pos; // select sample time
+    #endif
     adc->CHSELR = 1 << channel; // select channel for conversion
 
     #elif defined(STM32F4) || defined(STM32F7)
diff --git a/ports/stm32/machine_uart.c b/ports/stm32/machine_uart.c
index 681939094b9ed..bf7bcfb9cd354 100644
--- a/ports/stm32/machine_uart.c
+++ b/ports/stm32/machine_uart.c
@@ -76,10 +76,14 @@
 STATIC void pyb_uart_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     pyb_uart_obj_t *self = MP_OBJ_TO_PTR(self_in);
     if (!self->is_enabled) {
-        #ifdef LPUART1
+        #if defined(LPUART1)
         if (self->uart_id == PYB_LPUART_1) {
             mp_printf(print, "UART('LP1')");
         } else
+        #elif defined(LPUART2)
+        if (self->uart_id == PYB_LPUART_2) {
+            mp_printf(print, "UART('LP2')");
+        } else
         #endif
         {
             mp_printf(print, "UART(%u)", self->uart_id);
@@ -105,12 +109,18 @@ STATIC void pyb_uart_print(const mp_print_t *print, mp_obj_t self_in, mp_print_k
         if (cr1 & USART_CR1_PCE) {
             bits -= 1;
         }
-        #ifdef LPUART1
+        #if defined(LPUART1)
         if (self->uart_id == PYB_LPUART_1) {
             mp_printf(print, "UART('LP1', baudrate=%u, bits=%u, parity=",
                 uart_get_baudrate(self), bits);
         } else
         #endif
+        #if defined(LPUART2)
+        if (self->uart_id == PYB_LPUART_2) {
+            mp_printf(print, "UART('LP2', baudrate=%u, bits=%u, parity=",
+                uart_get_baudrate(self), bits);
+        } else
+        #endif
         {
             mp_printf(print, "UART(%u, baudrate=%u, bits=%u, parity=",
                 self->uart_id, uart_get_baudrate(self), bits);
@@ -354,10 +364,18 @@ STATIC mp_obj_t pyb_uart_make_new(const mp_obj_type_t *type, size_t n_args, size
         } else if (strcmp(port, MICROPY_HW_LPUART1_NAME) == 0) {
             uart_id = PYB_LPUART_1;
         #endif
+        #ifdef MICROPY_HW_LPUART2_NAME
+        } else if (strcmp(port, MICROPY_HW_LPUART2_NAME) == 0) {
+            uart_id = PYB_LPUART_2;
+        #endif
         #ifdef LPUART1
         } else if (strcmp(port, "LP1") == 0 && uart_exists(PYB_LPUART_1)) {
             uart_id = PYB_LPUART_1;
         #endif
+        #ifdef LPUART2
+        } else if (strcmp(port, "LP2") == 0 && uart_exists(PYB_LPUART_2)) {
+            uart_id = PYB_LPUART_2;
+        #endif
         } else {
             mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("UART(%s) doesn't exist"), port);
         }
@@ -459,7 +477,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(pyb_uart_readchar_obj, pyb_uart_readchar);
 // uart.sendbreak()
 STATIC mp_obj_t pyb_uart_sendbreak(mp_obj_t self_in) {
     pyb_uart_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    #if defined(STM32F0) || defined(STM32F7) || defined(STM32G4) || defined(STM32H7) || defined(STM32L0) || defined(STM32L4) || defined(STM32WB) || defined(STM32WL)
+    #if defined(STM32F0) || defined(STM32F7) || defined(STM32G0) || defined(STM32G4) || defined(STM32H7) || defined(STM32L0) || defined(STM32L4) || defined(STM32WB) || defined(STM32WL)
     self->uartx->RQR = USART_RQR_SBKRQ; // write-only register
     #else
     self->uartx->CR1 |= USART_CR1_SBK;
diff --git a/ports/stm32/modmachine.c b/ports/stm32/modmachine.c
index 0239ea64cac10..3a24e08f4885d 100644
--- a/ports/stm32/modmachine.c
+++ b/ports/stm32/modmachine.c
@@ -68,6 +68,12 @@
 #define RCC_CSR_PORRSTF RCC_CSR_BORRSTF
 #endif
 
+#if defined(STM32G0)
+// G0 has BOR and POR combined
+#define RCC_CSR_BORRSTF RCC_CSR_PWRRSTF
+#define RCC_CSR_PORRSTF RCC_CSR_PWRRSTF
+#endif
+
 #if defined(STM32H7)
 #define RCC_SR          RSR
 #define RCC_SR_IWDGRSTF RCC_RSR_IWDG1RSTF
@@ -167,7 +173,7 @@ STATIC mp_obj_t machine_info(size_t n_args, const mp_obj_t *args) {
     // get and print clock speeds
     // SYSCLK=168MHz, HCLK=168MHz, PCLK1=42MHz, PCLK2=84MHz
     {
-        #if defined(STM32F0)
+        #if defined(STM32F0) || defined(STM32G0)
         printf("S=%u\nH=%u\nP1=%u\n",
             (unsigned int)HAL_RCC_GetSysClockFreq(),
             (unsigned int)HAL_RCC_GetHCLKFreq(),
@@ -310,14 +316,14 @@ STATIC mp_obj_t machine_freq(size_t n_args, const mp_obj_t *args) {
             mp_obj_new_int(HAL_RCC_GetSysClockFreq()),
             mp_obj_new_int(HAL_RCC_GetHCLKFreq()),
             mp_obj_new_int(HAL_RCC_GetPCLK1Freq()),
-            #if !defined(STM32F0)
+            #if !defined(STM32F0) && !defined(STM32G0)
             mp_obj_new_int(HAL_RCC_GetPCLK2Freq()),
             #endif
         };
         return mp_obj_new_tuple(MP_ARRAY_SIZE(tuple), tuple);
     } else {
         // set
-        #if defined(STM32F0) || defined(STM32L0) || defined(STM32L4)
+        #if defined(STM32F0) || defined(STM32L0) || defined(STM32L4) || defined(STM32G0)
         mp_raise_NotImplementedError(MP_ERROR_TEXT("machine.freq set not supported yet"));
         #else
         mp_int_t sysclk = mp_obj_get_int(args[0]);
diff --git a/ports/stm32/mpconfigboard_common.h b/ports/stm32/mpconfigboard_common.h
index 7c8662318dbc0..51bad18dd53ed 100644
--- a/ports/stm32/mpconfigboard_common.h
+++ b/ports/stm32/mpconfigboard_common.h
@@ -319,6 +319,16 @@
 #define MICROPY_HW_MAX_UART (8)
 #define MICROPY_HW_MAX_LPUART (0)
 
+// Configuration for STM32G0 series
+#elif defined(STM32G0)
+
+#define MP_HAL_UNIQUE_ID_ADDRESS (UID_BASE)
+#define PYB_EXTI_NUM_VECTORS (22) // previously 23
+#define MICROPY_HW_MAX_I2C (3)
+#define MICROPY_HW_MAX_TIMER (17)
+#define MICROPY_HW_MAX_UART (6)
+#define MICROPY_HW_MAX_LPUART (2)
+
 // Configuration for STM32G4 series
 #elif defined(STM32G4)
 
@@ -505,7 +515,7 @@
 // Enable CAN if there are any peripherals defined
 #if defined(MICROPY_HW_CAN1_TX) || defined(MICROPY_HW_CAN2_TX) || defined(MICROPY_HW_CAN3_TX)
 #define MICROPY_HW_ENABLE_CAN (1)
-#if defined(STM32G4) || defined(STM32H7)
+#if defined(STM32G0) || defined(STM32G4) || defined(STM32H7)
 #define MICROPY_HW_ENABLE_FDCAN (1) // define for MCUs with FDCAN
 #endif
 #else
diff --git a/ports/stm32/mphalport.c b/ports/stm32/mphalport.c
index 9961c3d998347..477192330bae0 100644
--- a/ports/stm32/mphalport.c
+++ b/ports/stm32/mphalport.c
@@ -99,6 +99,9 @@ void mp_hal_gpio_clock_enable(GPIO_TypeDef *gpio) {
     #elif defined(STM32L0)
     #define AHBxENR IOPENR
     #define AHBxENR_GPIOAEN_Pos RCC_IOPENR_IOPAEN_Pos
+    #elif defined(STM32G0)
+    #define AHBxENR IOPENR
+    #define AHBxENR_GPIOAEN_Pos RCC_IOPENR_GPIOAEN_Pos
     #elif defined(STM32G4) || defined(STM32L4) || defined(STM32WB) || defined(STM32WL)
     #define AHBxENR AHB2ENR
     #define AHBxENR_GPIOAEN_Pos RCC_AHB2ENR_GPIOAEN_Pos
diff --git a/ports/stm32/mphalport.h b/ports/stm32/mphalport.h
index 6cfa9b92702d3..47bb1f8c84417 100644
--- a/ports/stm32/mphalport.h
+++ b/ports/stm32/mphalport.h
@@ -2,13 +2,15 @@
 #include STM32_HAL_H
 #include "pin.h"
 
-// F0-1.9.0+F4-1.16.0+F7-1.7.0+G4-1.3.0+H7-1.6.0+L0-1.11.2+L4-1.17.0+WB-1.10.0+WL-1.1.0
+// F0-1.9.0+F4-1.16.0+F7-1.7.0+G0-1.5.1+G4-1.3.0+H7-1.6.0+L0-1.11.2+L4-1.17.0+WB-1.10.0+WL-1.1.0
 #if defined(STM32F0)
 #define MICROPY_PLATFORM_VERSION "HAL1.9.0"
 #elif defined(STM32F4)
 #define MICROPY_PLATFORM_VERSION "HAL1.16.0"
 #elif defined(STM32F7)
 #define MICROPY_PLATFORM_VERSION "HAL1.7.0"
+#elif defined(STM32G0)
+#define MICROPY_PLATFORM_VERSION "HAL1.5.1"
 #elif defined(STM32G4)
 #define MICROPY_PLATFORM_VERSION "HAL1.3.0"
 #elif defined(STM32H7)
diff --git a/ports/stm32/powerctrl.c b/ports/stm32/powerctrl.c
index a2e3b5c71b663..cf06f3e18eac7 100644
--- a/ports/stm32/powerctrl.c
+++ b/ports/stm32/powerctrl.c
@@ -143,7 +143,7 @@ void powerctrl_check_enter_bootloader(void) {
     if (BL_STATE_GET_KEY(bl_state) == BL_STATE_KEY && (RCC->RCC_SR & RCC_SR_SFTRSTF)) {
         // Reset by NVIC_SystemReset with bootloader data set -> branch to bootloader
         RCC->RCC_SR = RCC_SR_RMVF;
-        #if defined(STM32F0) || defined(STM32F4) || defined(STM32G4) || defined(STM32L0) || defined(STM32L4) || defined(STM32WB)
+        #if defined(STM32F0) || defined(STM32F4) || defined(STM32G0) || defined(STM32G4) || defined(STM32L0) || defined(STM32L4) || defined(STM32WB)
         __HAL_SYSCFG_REMAPMEMORY_SYSTEMFLASH();
         #endif
         branch_to_bootloader(BL_STATE_GET_REG(bl_state), BL_STATE_GET_ADDR(bl_state));
@@ -286,7 +286,7 @@ int powerctrl_rcc_clock_config_pll(RCC_ClkInitTypeDef *rcc_init, uint32_t sysclk
 
 #endif
 
-#if !defined(STM32F0) && !defined(STM32L0) && !defined(STM32L4)
+#if !defined(STM32F0) && !defined(STM32G0) && !defined(STM32L0) && !defined(STM32L4)
 
 STATIC uint32_t calc_ahb_div(uint32_t wanted_div) {
     #if defined(STM32H7)
@@ -378,14 +378,17 @@ STATIC uint32_t calc_apb2_div(uint32_t wanted_div) {
     #endif
 }
 
-#if defined(STM32F4) || defined(STM32F7) || defined(STM32G4) || defined(STM32H7)
+#if defined(STM32F4) || defined(STM32F7) || defined(STM32G0) || defined(STM32G4) || defined(STM32H7)
 
 int powerctrl_set_sysclk(uint32_t sysclk, uint32_t ahb, uint32_t apb1, uint32_t apb2) {
     // Return straightaway if the clocks are already at the desired frequency
     if (sysclk == HAL_RCC_GetSysClockFreq()
         && ahb == HAL_RCC_GetHCLKFreq()
         && apb1 == HAL_RCC_GetPCLK1Freq()
-        && apb2 == HAL_RCC_GetPCLK2Freq()) {
+        #if !defined(STM32G0)
+        && apb2 == HAL_RCC_GetPCLK2Freq()
+        #endif
+        ) {
         return 0;
     }
 
@@ -428,7 +431,11 @@ int powerctrl_set_sysclk(uint32_t sysclk, uint32_t ahb, uint32_t apb1, uint32_t
 
     // Desired system clock source is in sysclk_source
     RCC_ClkInitTypeDef RCC_ClkInitStruct;
+    #if defined(STM32G0) || defined(STM32G4)
+    RCC_ClkInitStruct.ClockType = RCC_CLOCKTYPE_ALL;
+    #else
     RCC_ClkInitStruct.ClockType = (RCC_CLOCKTYPE_SYSCLK | RCC_CLOCKTYPE_HCLK | RCC_CLOCKTYPE_PCLK1 | RCC_CLOCKTYPE_PCLK2);
+    #endif
     if (sysclk_source == RCC_SYSCLKSOURCE_PLLCLK) {
         // Set HSE as system clock source to allow modification of the PLL configuration
         // We then change to PLL after re-configuring PLL
@@ -449,7 +456,9 @@ int powerctrl_set_sysclk(uint32_t sysclk, uint32_t ahb, uint32_t apb1, uint32_t
     ahb = sysclk >> AHBPrescTable[RCC_ClkInitStruct.AHBCLKDivider >> RCC_CFGR_HPRE_Pos];
     #endif
     RCC_ClkInitStruct.APB1CLKDivider = calc_apb1_div(ahb / apb1);
+    #if !defined(STM32G0)
     RCC_ClkInitStruct.APB2CLKDivider = calc_apb2_div(ahb / apb2);
+    #endif
     #if defined(STM32H7)
     RCC_ClkInitStruct.SYSCLKDivider = RCC_SYSCLK_DIV1;
     RCC_ClkInitStruct.APB3CLKDivider = MICROPY_HW_CLK_APB3_DIV;
@@ -692,7 +701,7 @@ void powerctrl_enter_stop_mode(void) {
     __HAL_RCC_WAKEUPSTOP_CLK_CONFIG(RCC_STOP_WAKEUPCLOCK_MSI);
     #endif
 
-    #if !defined(STM32F0) && !defined(STM32G4) && !defined(STM32L0) && !defined(STM32L4) && !defined(STM32WB) && !defined(STM32WL)
+    #if !defined(STM32F0) && !defined(STM32G0) && !defined(STM32G4) && !defined(STM32L0) && !defined(STM32L4) && !defined(STM32WB) && !defined(STM32WL)
     // takes longer to wake but reduces stop current
     HAL_PWREx_EnableFlashPowerDown();
     #endif
@@ -771,7 +780,7 @@ void powerctrl_enter_stop_mode(void) {
     #if defined(STM32H7)
     while (__HAL_RCC_GET_SYSCLK_SOURCE() != RCC_CFGR_SWS_PLL1) {
     }
-    #elif defined(STM32WB) || defined(STM32WL)
+    #elif defined(STM32G0) || defined(STM32WB) || defined(STM32WL)
     while (__HAL_RCC_GET_SYSCLK_SOURCE() != RCC_SYSCLKSOURCE_STATUS_PLLCLK) {
     }
     #else
@@ -867,7 +876,7 @@ void powerctrl_enter_standby_mode(void) {
     #if defined(STM32F0) || defined(STM32L0)
     #define CR_BITS (RTC_CR_ALRAIE | RTC_CR_WUTIE | RTC_CR_TSIE)
     #define ISR_BITS (RTC_ISR_ALRAF | RTC_ISR_WUTF | RTC_ISR_TSF)
-    #elif defined(STM32G4) || defined(STM32WL)
+    #elif defined(STM32G0) || defined(STM32G4) || defined(STM32WL)
     #define CR_BITS (RTC_CR_ALRAIE | RTC_CR_ALRBIE | RTC_CR_WUTIE | RTC_CR_TSIE)
     #define ISR_BITS (RTC_MISR_ALRAMF | RTC_MISR_ALRBMF | RTC_MISR_WUTMF | RTC_MISR_TSMF)
     #elif defined(STM32H7A3xx) || defined(STM32H7A3xxQ) || defined(STM32H7B3xx) || defined(STM32H7B3xxQ)
@@ -891,7 +900,7 @@ void powerctrl_enter_standby_mode(void) {
     // clear RTC wake-up flags
     #if defined(SR_BITS)
     RTC->SR &= ~SR_BITS;
-    #elif defined(STM32G4) || defined(STM32WL)
+    #elif defined(STM32G0) || defined(STM32G4) || defined(STM32WL)
     RTC->MISR &= ~ISR_BITS;
     #else
     RTC->ISR &= ~ISR_BITS;
@@ -909,7 +918,7 @@ void powerctrl_enter_standby_mode(void) {
     #elif defined(STM32H7)
     EXTI_D1->PR1 = 0x3fffff;
     PWR->WKUPCR |= PWR_WAKEUP_FLAG1 | PWR_WAKEUP_FLAG2 | PWR_WAKEUP_FLAG3 | PWR_WAKEUP_FLAG4 | PWR_WAKEUP_FLAG5 | PWR_WAKEUP_FLAG6;
-    #elif defined(STM32G4) || defined(STM32L4) || defined(STM32WB)
+    #elif defined(STM32G0) || defined(STM32G4) || defined(STM32L4) || defined(STM32WB)
     // clear all wake-up flags
     PWR->SCR |= PWR_SCR_CWUF5 | PWR_SCR_CWUF4 | PWR_SCR_CWUF3 | PWR_SCR_CWUF2 | PWR_SCR_CWUF1;
     // TODO
diff --git a/ports/stm32/powerctrlboot.c b/ports/stm32/powerctrlboot.c
index 4ecd83e2c6d07..555457c582e2f 100644
--- a/ports/stm32/powerctrlboot.c
+++ b/ports/stm32/powerctrlboot.c
@@ -104,6 +104,77 @@ void SystemClock_Config(void) {
     powerctrl_config_systick();
 }
 
+#elif defined(STM32G0)
+
+void SystemClock_Config(void) {
+    // Enable power control peripheral
+    __HAL_RCC_PWR_CLK_ENABLE();
+
+    // Set flash latency to 2 because SYSCLK > 48MHz
+    FLASH->ACR = (FLASH->ACR & ~0x7) | 0x2;
+
+    #if MICROPY_HW_CLK_USE_HSI
+    // Enable the 16MHz internal oscillator and the PLL to get a 64MHz SYSCLK
+    RCC->CR |= RCC_CR_HSION;
+    while ((RCC->CR & RCC_CR_HSIRDY) == 0) {
+        // Wait for HSI to be ready
+    }
+
+    // Use the PLL to get a 64MHz SYSCLK
+    #define PLLM (HSI_VALUE / 16000000) // input is 8MHz
+    #define PLLN (8) // 8*16MHz = 128MHz
+    #define PLLP (2) // f_P = 64MHz
+    #define PLLQ (2) // f_Q = 64MHz
+    #define PLLR (2) // f_R = 64MHz
+    RCC->PLLCFGR =
+        (PLLP - 1) << RCC_PLLCFGR_PLLP_Pos | RCC_PLLCFGR_PLLPEN
+            | (PLLQ - 1) << RCC_PLLCFGR_PLLQ_Pos | RCC_PLLCFGR_PLLQEN
+            | (PLLR - 1) << RCC_PLLCFGR_PLLR_Pos | RCC_PLLCFGR_PLLREN
+            | PLLN << RCC_PLLCFGR_PLLN_Pos
+            | (PLLM - 1) << RCC_PLLCFGR_PLLM_Pos
+            | RCC_PLLCFGR_PLLSRC_HSI;
+
+    #else
+    #error System clock not specified
+    #endif
+
+    RCC->CR |= RCC_CR_PLLON; // Turn PLL on
+    while ((RCC->CR & RCC_CR_PLLRDY) == 0) {
+        // Wait for PLL to lock
+    }
+    const uint32_t sysclk_src = 2; // 2 = PLLRCLK
+
+    // Select SYSCLK source
+    RCC->CFGR |= sysclk_src << RCC_CFGR_SW_Pos;
+    while (((RCC->CFGR >> RCC_CFGR_SWS_Pos) & 0x7) != sysclk_src) {
+        // Wait for SYSCLK source to change
+    }
+
+    SystemCoreClockUpdate();
+    powerctrl_config_systick();
+
+    #if MICROPY_HW_ENABLE_RNG || MICROPY_HW_ENABLE_USB
+    // Enable the 48MHz internal oscillator
+    RCC->CRRCR |= RCC_CRRCR_HSI48ON;
+    RCC->APB2ENR |= RCC_APB2ENR_SYSCFGEN;
+    SYSCFG->CFGR3 |= SYSCFG_CFGR3_ENREF_HSI48;
+    while (!(RCC->CRRCR & RCC_CRRCR_HSI48RDY)) {
+        // Wait for HSI48 to be ready
+    }
+
+    // Select RC48 as HSI48 for USB and RNG
+    RCC->CCIPR |= RCC_CCIPR_HSI48SEL;
+
+    #if MICROPY_HW_ENABLE_USB
+    // Synchronise HSI48 with 1kHz USB SoF
+    __HAL_RCC_CRS_CLK_ENABLE();
+    CRS->CR = 0x20 << CRS_CR_TRIM_Pos;
+    CRS->CFGR = 2 << CRS_CFGR_SYNCSRC_Pos | 0x22 << CRS_CFGR_FELIM_Pos
+        | __HAL_RCC_CRS_RELOADVALUE_CALCULATE(48000000, 1000) << CRS_CFGR_RELOAD_Pos;
+    #endif
+    #endif
+}
+
 #elif defined(STM32L0)
 
 void SystemClock_Config(void) {
diff --git a/ports/stm32/pyb_i2c.c b/ports/stm32/pyb_i2c.c
index 5cd7c0c8b06d0..9dfa276561147 100644
--- a/ports/stm32/pyb_i2c.c
+++ b/ports/stm32/pyb_i2c.c
@@ -130,7 +130,7 @@ const pyb_i2c_obj_t pyb_i2c_obj[] = {
     #endif
 };
 
-#if defined(STM32F7) || defined(STM32G4) || defined(STM32L4) || defined(STM32H7)
+#if defined(STM32F7) || defined(STM32G0) || defined(STM32G4) || defined(STM32H7) || defined(STM32L4)
 
 // The STM32F0, F3, F7, H7 and L4 use a TIMINGR register rather than ClockSpeed and
 // DutyCycle.
@@ -163,6 +163,16 @@ const pyb_i2c_obj_t pyb_i2c_obj[] = {
 #define MICROPY_HW_I2C_BAUDRATE_DEFAULT (PYB_I2C_SPEED_FULL)
 #define MICROPY_HW_I2C_BAUDRATE_MAX (PYB_I2C_SPEED_FAST)
 
+#elif defined(STM32G0)
+// generated using CubeMX
+#define MICROPY_HW_I2C_BAUDRATE_TIMING { \
+        {PYB_I2C_SPEED_STANDARD, 0x10707DBC}, \
+        {PYB_I2C_SPEED_FULL, 0x00602173}, \
+        {PYB_I2C_SPEED_FAST, 0x00300B29}, \
+}
+#define MICROPY_HW_I2C_BAUDRATE_DEFAULT (PYB_I2C_SPEED_FULL)
+#define MICROPY_HW_I2C_BAUDRATE_MAX (PYB_I2C_SPEED_FAST)
+
 #elif defined(STM32G4)
 // timing input depends on PLL
 // for now: 170MHz sysclock, PCLK 10.625 MHz
diff --git a/ports/stm32/rtc.c b/ports/stm32/rtc.c
index e776f67bb9b09..55977791b8c24 100644
--- a/ports/stm32/rtc.c
+++ b/ports/stm32/rtc.c
@@ -225,7 +225,9 @@ void rtc_init_finalise() {
 
     // fresh reset; configure RTC Calendar
     RTC_CalendarConfig();
-    #if defined(STM32G4) || defined(STM32L4) || defined(STM32WB) || defined(STM32WL)
+    #if defined(STM32G0)
+    if (__HAL_RCC_GET_FLAG(RCC_FLAG_PWRRST) != RESET) {
+    #elif defined(STM32G4) || defined(STM32L4) || defined(STM32WB) || defined(STM32WL)
     if (__HAL_RCC_GET_FLAG(RCC_FLAG_BORRST) != RESET) {
     #else
     if (__HAL_RCC_GET_FLAG(RCC_FLAG_PORRST) != RESET) {
@@ -266,7 +268,7 @@ STATIC HAL_StatusTypeDef PYB_RCC_OscConfig(RCC_OscInitTypeDef *RCC_OscInitStruct
         HAL_PWR_EnableBkUpAccess();
         uint32_t tickstart = HAL_GetTick();
 
-        #if defined(STM32F7) || defined(STM32G4) || defined(STM32L4) || defined(STM32H7) || defined(STM32WB) || defined(STM32WL)
+        #if defined(STM32F7) || defined(STM32G0) || defined(STM32G4) || defined(STM32H7) || defined(STM32L4) || defined(STM32WB) || defined(STM32WL)
         // __HAL_RCC_PWR_CLK_ENABLE();
         // Enable write access to Backup domain
         // PWR->CR1 |= PWR_CR1_DBP;
@@ -354,7 +356,7 @@ STATIC HAL_StatusTypeDef PYB_RTC_Init(RTC_HandleTypeDef *hrtc) {
         #elif defined(STM32F7)
         hrtc->Instance->OR &= (uint32_t) ~RTC_OR_ALARMTYPE;
         hrtc->Instance->OR |= (uint32_t)(hrtc->Init.OutPutType);
-        #elif defined(STM32G4) || defined(STM32WL)
+        #elif defined(STM32G0) || defined(STM32G4) || defined(STM32WL)
         hrtc->Instance->CR &= (uint32_t) ~RTC_CR_TAMPALRM_TYPE_Msk;
         hrtc->Instance->CR |= (uint32_t)(hrtc->Init.OutPutType);
         #else
@@ -622,6 +624,8 @@ MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pyb_rtc_datetime_obj, 1, 2, pyb_rtc_datetime
 
 #if defined(STM32F0) || defined(STM32L0)
 #define RTC_WKUP_IRQn RTC_IRQn
+#elif defined(STM32G0)
+#define RTC_WKUP_IRQn RTC_TAMP_IRQn
 #endif
 
 // wakeup(None)
@@ -719,7 +723,7 @@ mp_obj_t pyb_rtc_wakeup(size_t n_args, const mp_obj_t *args) {
         RTC->WPR = 0xff;
 
         // enable external interrupts on line EXTI_RTC_WAKEUP
-        #if defined(STM32G4) || defined(STM32L4) || defined(STM32WB) || defined(STM32WL)
+        #if defined(STM32G0) || defined(STM32G4) || defined(STM32L4) || defined(STM32WB) || defined(STM32WL)
         EXTI->IMR1 |= 1 << EXTI_RTC_WAKEUP;
         EXTI->RTSR1 |= 1 << EXTI_RTC_WAKEUP;
         #elif defined(STM32H7)
@@ -731,7 +735,7 @@ mp_obj_t pyb_rtc_wakeup(size_t n_args, const mp_obj_t *args) {
         #endif
 
         // clear interrupt flags
-        #if defined(STM32G4) || defined(STM32WL)
+        #if defined(STM32G0) || defined(STM32G4) || defined(STM32WL)
         RTC->ICSR &= ~RTC_ICSR_WUTWF;
         #elif defined(STM32H7A3xx) || defined(STM32H7A3xxQ) || defined(STM32H7B3xx) || defined(STM32H7B3xxQ)
         RTC->SR &= ~RTC_SR_WUTF;
@@ -742,6 +746,8 @@ mp_obj_t pyb_rtc_wakeup(size_t n_args, const mp_obj_t *args) {
         EXTI->PR1 = 1 << EXTI_RTC_WAKEUP;
         #elif defined(STM32H7)
         EXTI_D1->PR1 = 1 << EXTI_RTC_WAKEUP;
+        #elif defined(STM32G0)
+        // Do nothing
         #else
         EXTI->PR = 1 << EXTI_RTC_WAKEUP;
         #endif
@@ -758,7 +764,7 @@ mp_obj_t pyb_rtc_wakeup(size_t n_args, const mp_obj_t *args) {
         RTC->WPR = 0xff;
 
         // disable external interrupts on line EXTI_RTC_WAKEUP
-        #if defined(STM32G4) || defined(STM32L4) || defined(STM32WB) || defined(STM32WL)
+        #if defined(STM32G0) || defined(STM32G4) || defined(STM32L4) || defined(STM32WB) || defined(STM32WL)
         EXTI->IMR1 &= ~(1 << EXTI_RTC_WAKEUP);
         #elif defined(STM32H7)
         EXTI_D1->IMR1 |= 1 << EXTI_RTC_WAKEUP;
diff --git a/ports/stm32/spi.c b/ports/stm32/spi.c
index 0ce6b5abc6f15..188376ec06d54 100644
--- a/ports/stm32/spi.c
+++ b/ports/stm32/spi.c
@@ -216,7 +216,7 @@ int spi_find_index(mp_obj_t id) {
 }
 
 STATIC uint32_t spi_get_source_freq(SPI_HandleTypeDef *spi) {
-    #if defined(STM32F0)
+    #if defined(STM32F0) || defined(STM32G0)
     return HAL_RCC_GetPCLK1Freq();
     #elif defined(STM32H7)
     if (spi->Instance == SPI1 || spi->Instance == SPI2 || spi->Instance == SPI3) {
@@ -317,7 +317,11 @@ void spi_init(const spi_t *self, bool enable_nss_pin) {
     #endif
     #if defined(MICROPY_HW_SPI2_SCK)
     } else if (spi->Instance == SPI2) {
+        #if defined(STM32G0)
+        irqn = SPI2_3_IRQn;
+        #else
         irqn = SPI2_IRQn;
+        #endif
         #if defined(MICROPY_HW_SPI2_NSS)
         pins[0] = MICROPY_HW_SPI2_NSS;
         #endif
@@ -331,7 +335,11 @@ void spi_init(const spi_t *self, bool enable_nss_pin) {
     #endif
     #if defined(MICROPY_HW_SPI3_SCK)
     } else if (spi->Instance == SPI3) {
+        #if defined(STM32G0)
+        irqn = SPI2_3_IRQn;
+        #else
         irqn = SPI3_IRQn;
+        #endif
         #if defined(MICROPY_HW_SPI3_NSS)
         pins[0] = MICROPY_HW_SPI3_NSS;
         #endif
@@ -439,14 +447,22 @@ void spi_deinit(const spi_t *spi_obj) {
         __HAL_RCC_SPI2_FORCE_RESET();
         __HAL_RCC_SPI2_RELEASE_RESET();
         __HAL_RCC_SPI2_CLK_DISABLE();
+        #if defined(STM32G0)
+        HAL_NVIC_DisableIRQ(SPI2_3_IRQn);
+        #else
         HAL_NVIC_DisableIRQ(SPI2_IRQn);
+        #endif
     #endif
     #if defined(MICROPY_HW_SPI3_SCK)
     } else if (spi->Instance == SPI3) {
         __HAL_RCC_SPI3_FORCE_RESET();
         __HAL_RCC_SPI3_RELEASE_RESET();
         __HAL_RCC_SPI3_CLK_DISABLE();
+        #if defined(STM32G0)
+        HAL_NVIC_DisableIRQ(SPI2_3_IRQn);
+        #else
         HAL_NVIC_DisableIRQ(SPI3_IRQn);
+        #endif
     #endif
     #if defined(MICROPY_HW_SPI4_SCK)
     } else if (spi->Instance == SPI4) {
diff --git a/ports/stm32/stm32.mk b/ports/stm32/stm32.mk
index ed3298824ba83..c55b243fe5734 100644
--- a/ports/stm32/stm32.mk
+++ b/ports/stm32/stm32.mk
@@ -48,7 +48,7 @@ CFLAGS_CORTEX_M += -mfpu=fpv5-d16 -mfloat-abi=hard
 SUPPORTS_HARDWARE_FP_SINGLE = 1
 SUPPORTS_HARDWARE_FP_DOUBLE = 1
 else
-ifeq ($(MCU_SERIES),$(filter $(MCU_SERIES),f0 l0 wl))
+ifeq ($(MCU_SERIES),$(filter $(MCU_SERIES),f0 g0 l0 wl))
 CFLAGS_CORTEX_M += -msoft-float
 else
 CFLAGS_CORTEX_M += -mfpu=fpv4-sp-d16 -mfloat-abi=hard
@@ -61,6 +61,7 @@ endif
 CFLAGS_MCU_f0 = $(CFLAGS_CORTEX_M) -mtune=cortex-m0 -mcpu=cortex-m0
 CFLAGS_MCU_f4 = $(CFLAGS_CORTEX_M) -mtune=cortex-m4 -mcpu=cortex-m4
 CFLAGS_MCU_f7 = $(CFLAGS_CORTEX_M) -mtune=cortex-m7 -mcpu=cortex-m7
+CFLAGS_MCU_g0 = $(CFLAGS_CORTEX_M) -mtune=cortex-m0plus -mcpu=cortex-m0plus
 CFLAGS_MCU_g4 = $(CFLAGS_CORTEX_M) -mtune=cortex-m4 -mcpu=cortex-m4
 CFLAGS_MCU_l0 = $(CFLAGS_CORTEX_M) -mtune=cortex-m0plus -mcpu=cortex-m0plus
 CFLAGS_MCU_l4 = $(CFLAGS_CORTEX_M) -mtune=cortex-m4 -mcpu=cortex-m4
diff --git a/ports/stm32/stm32_it.c b/ports/stm32/stm32_it.c
index 39229a143ba3d..55c772efb4e80 100644
--- a/ports/stm32/stm32_it.c
+++ b/ports/stm32/stm32_it.c
@@ -529,7 +529,7 @@ void TAMP_STAMP_IRQHandler(void) {
 
 void RTC_WKUP_IRQHandler(void) {
     IRQ_ENTER(RTC_WKUP_IRQn);
-    #if defined(STM32G4) || defined(STM32WL)
+    #if defined(STM32G0) || defined(STM32G4) || defined(STM32WL)
     RTC->MISR &= ~RTC_MISR_WUTMF; // clear wakeup interrupt flag
     #elif defined(STM32H7A3xx) || defined(STM32H7A3xxQ) || defined(STM32H7B3xx) || defined(STM32H7B3xxQ)
     RTC->SR &= ~RTC_SR_WUTF; // clear wakeup interrupt flag
@@ -540,8 +540,17 @@ void RTC_WKUP_IRQHandler(void) {
     IRQ_EXIT(RTC_WKUP_IRQn);
 }
 
-#if defined(STM32F0) || defined(STM32L0)
+#if defined(STM32F0) || defined(STM32G0) || defined(STM32L0)
 
+#if defined(STM32G0)
+void RTC_TAMP_IRQHandler(void) {
+    IRQ_ENTER(RTC_TAMP_IRQn);
+    RTC->MISR &= ~RTC_MISR_WUTMF; // clear wakeup interrupt flag
+    Handle_EXTI_Irq(EXTI_RTC_WAKEUP);    // clear EXTI flag and execute optional callback
+    Handle_EXTI_Irq(EXTI_RTC_TIMESTAMP); // clear EXTI flag and execute optional callback
+    IRQ_EXIT(RTC_TAMP_IRQn);
+}
+#else
 void RTC_IRQHandler(void) {
     IRQ_ENTER(RTC_IRQn);
     if (RTC->ISR & RTC_ISR_WUTF) {
@@ -558,6 +567,7 @@ void RTC_IRQHandler(void) {
     }
     IRQ_EXIT(RTC_IRQn);
 }
+#endif
 
 void EXTI0_1_IRQHandler(void) {
     IRQ_ENTER(EXTI0_1_IRQn);
@@ -653,6 +663,15 @@ void TIM2_IRQHandler(void) {
     IRQ_EXIT(TIM2_IRQn);
 }
 
+#if defined(STM32G0)
+void TIM3_TIM4_IRQHandler(void) {
+    IRQ_ENTER(TIM3_TIM4_IRQn);
+    timer_irq_handler(3);
+    timer_irq_handler(4);
+    IRQ_EXIT(TIM3_TIM4_IRQn);
+}
+
+#else
 void TIM3_IRQHandler(void) {
     IRQ_ENTER(TIM3_IRQn);
     timer_irq_handler(3);
@@ -664,6 +683,7 @@ void TIM4_IRQHandler(void) {
     timer_irq_handler(4);
     IRQ_EXIT(TIM4_IRQn);
 }
+#endif
 
 void TIM5_IRQHandler(void) {
     IRQ_ENTER(TIM5_IRQn);
@@ -673,15 +693,29 @@ void TIM5_IRQHandler(void) {
 }
 
 #if defined(TIM6) // STM32F401 doesn't have TIM6
+#if defined(STM32G0)
+void TIM6_DAC_LPTIM1_IRQHandler(void) {
+    IRQ_ENTER(TIM6_DAC_LPTIM1_IRQn);
+    timer_irq_handler(6);
+    IRQ_EXIT(TIM6_DAC_LPTIM1_IRQn);
+}
+#else
 void TIM6_DAC_IRQHandler(void) {
     IRQ_ENTER(TIM6_DAC_IRQn);
     timer_irq_handler(6);
     IRQ_EXIT(TIM6_DAC_IRQn);
 }
 #endif
+#endif
 
 #if defined(TIM7) // STM32F401 doesn't have TIM7
-#if defined(STM32G4)
+#if defined(STM32G0)
+void TIM7_LPTIM2_IRQHandler(void) {
+    IRQ_ENTER(TIM7_LPTIM2_IRQn);
+    timer_irq_handler(7);
+    IRQ_EXIT(TIM7_LPTIM2_IRQn);
+}
+#elif defined(STM32G4)
 void TIM7_DAC_IRQHandler(void) {
     IRQ_ENTER(TIM7_DAC_IRQn);
     timer_irq_handler(7);
@@ -731,6 +765,32 @@ void TIM8_TRG_COM_TIM14_IRQHandler(void) {
 }
 #endif
 
+#if defined(STM32G0)
+void TIM14_IRQHandler(void) {
+    IRQ_ENTER(TIM14_IRQn);
+    timer_irq_handler(14);
+    IRQ_EXIT(TIM14_IRQn);
+}
+
+void TIM15_IRQHandler(void) {
+    IRQ_ENTER(TIM15_IRQn);
+    timer_irq_handler(15);
+    IRQ_EXIT(TIM15_IRQn);
+}
+
+void TIM16_FDCAN_IT0_IRQHandler(void) {
+    IRQ_ENTER(TIM16_FDCAN_IT0_IRQn);
+    timer_irq_handler(16);
+    IRQ_EXIT(TIM16_FDCAN_IT0_IRQn);
+}
+
+void TIM17_FDCAN_IT1_IRQHandler(void) {
+    IRQ_ENTER(TIM17_FDCAN_IT1_IRQn);
+    timer_irq_handler(17);
+    IRQ_EXIT(TIM17_FDCAN_IT1_IRQn);
+}
+#endif
+
 #if defined(STM32H7)
 void TIM15_IRQHandler(void) {
     IRQ_ENTER(TIM15_IRQn);
@@ -779,6 +839,29 @@ void USART3_8_IRQHandler(void) {
     IRQ_EXIT(USART3_8_IRQn);
 }
 
+#elif defined(STM32G0)
+
+#if defined(STM32G0B1xx) || defined(STM32G0C1xx)
+void USART2_LPUART2_IRQHandler(void) {
+    IRQ_ENTER(USART2_LPUART2_IRQn);
+    uart_irq_handler(2);
+    uart_irq_handler(PYB_LPUART_2);
+    IRQ_EXIT(USART2_LPUART2_IRQn);
+}
+
+void USART3_4_5_6_LPUART1_IRQHandler(void) {
+    IRQ_ENTER(USART3_4_5_6_LPUART1_IRQn);
+    uart_irq_handler(3);
+    uart_irq_handler(4);
+    uart_irq_handler(5);
+    uart_irq_handler(6);
+    uart_irq_handler(PYB_LPUART_1);
+    IRQ_EXIT(USART3_4_5_6_LPUART1_IRQn);
+}
+#else
+#error Unsupported processor
+#endif
+
 #elif defined(STM32L0)
 
 void USART4_5_IRQHandler(void) {
@@ -798,6 +881,14 @@ void USART3_IRQHandler(void) {
 }
 #endif
 
+#if defined(USART4)
+void USART4_IRQHandler(void) {
+    IRQ_ENTER(USART4_IRQn);
+    uart_irq_handler(4);
+    IRQ_EXIT(USART4_IRQn);
+}
+#endif
+
 #if defined(UART4)
 void UART4_IRQHandler(void) {
     IRQ_ENTER(UART4_IRQn);
@@ -806,6 +897,14 @@ void UART4_IRQHandler(void) {
 }
 #endif
 
+#if defined(USART5)
+void USART5_IRQHandler(void) {
+    IRQ_ENTER(USART5_IRQn);
+    uart_irq_handler(5);
+    IRQ_EXIT(USART5_IRQn);
+}
+#endif
+
 #if defined(UART5)
 void UART5_IRQHandler(void) {
     IRQ_ENTER(UART5_IRQn);
@@ -864,6 +963,14 @@ void LPUART1_IRQHandler(void) {
 }
 #endif
 
+#if defined(LPUART2)
+void LPUART2_IRQHandler(void) {
+    IRQ_ENTER(LPUART2_IRQn);
+    uart_irq_handler(PYB_LPUART_2);
+    IRQ_EXIT(LPUART2_IRQn);
+}
+#endif
+
 #if MICROPY_PY_PYB_LEGACY
 
 #if defined(MICROPY_HW_I2C1_SCL)
diff --git a/ports/stm32/timer.c b/ports/stm32/timer.c
index 12f0515d4e99f..8181885e2ed77 100644
--- a/ports/stm32/timer.c
+++ b/ports/stm32/timer.c
@@ -236,7 +236,7 @@ uint32_t timer_get_source_freq(uint32_t tim_id) {
     uint32_t source, clk_div;
     if (tim_id == 1 || (8 <= tim_id && tim_id <= 11)) {
         // TIM{1,8,9,10,11} are on APB2
-        #if defined(STM32F0)
+        #if defined(STM32F0) || defined(STM32G0)
         source = HAL_RCC_GetPCLK1Freq();
         clk_div = RCC->CFGR & RCC_CFGR_PPRE;
         #elif defined(STM32H7A3xx) || defined(STM32H7A3xxQ) || defined(STM32H7B3xx) || defined(STM32H7B3xxQ)
@@ -252,7 +252,7 @@ uint32_t timer_get_source_freq(uint32_t tim_id) {
     } else {
         // TIM{2,3,4,5,6,7,12,13,14} are on APB1
         source = HAL_RCC_GetPCLK1Freq();
-        #if defined(STM32F0)
+        #if defined(STM32F0) || defined(STM32G0)
         clk_div = RCC->CFGR & RCC_CFGR_PPRE;
         #elif defined(STM32H7A3xx) || defined(STM32H7A3xxQ) || defined(STM32H7B3xx) || defined(STM32H7B3xxQ)
         clk_div = RCC->CDCFGR1 & RCC_CDCFGR2_CDPPRE1;
@@ -482,7 +482,7 @@ STATIC void config_deadtime(pyb_timer_obj_t *self, mp_int_t ticks, mp_int_t brk)
     deadTimeConfig.DeadTime = compute_dtg_from_ticks(ticks);
     deadTimeConfig.BreakState = brk == BRK_OFF ? TIM_BREAK_DISABLE : TIM_BREAK_ENABLE;
     deadTimeConfig.BreakPolarity = brk == BRK_LOW ? TIM_BREAKPOLARITY_LOW : TIM_BREAKPOLARITY_HIGH;
-    #if defined(STM32F7) || defined(STM32G4) || defined(STM32H7) || defined(STM32L4) || defined(STM32WB)
+    #if defined(STM32F7) || defined(STM32G0) || defined(STM32G4) || defined(STM32H7) || defined(STM32L4) || defined(STM32WB)
     deadTimeConfig.BreakFilter = 0;
     deadTimeConfig.Break2State = TIM_BREAK_DISABLE;
     deadTimeConfig.Break2Polarity = TIM_BREAKPOLARITY_LOW;
@@ -804,7 +804,7 @@ STATIC mp_obj_t pyb_timer_init_helper(pyb_timer_obj_t *self, size_t n_args, cons
 #define TIM_ENTRY(id, irq) [id - 1] = (uint32_t)TIM##id | irq
 STATIC const uint32_t tim_instance_table[MICROPY_HW_MAX_TIMER] = {
     #if defined(TIM1)
-    #if defined(STM32F0)
+    #if defined(STM32F0) || defined(STM32G0)
     TIM_ENTRY(1, TIM1_BRK_UP_TRG_COM_IRQn),
     #elif defined(STM32F4) || defined(STM32F7)
     TIM_ENTRY(1, TIM1_UP_TIM10_IRQn),
@@ -816,23 +816,35 @@ STATIC const uint32_t tim_instance_table[MICROPY_HW_MAX_TIMER] = {
     #endif
     TIM_ENTRY(2, TIM2_IRQn),
     #if defined(TIM3)
+    #if defined(STM32G0B1xx) || defined(STM32G0C1xx)
+    TIM_ENTRY(3, TIM3_TIM4_IRQn),
+    #else
     TIM_ENTRY(3, TIM3_IRQn),
     #endif
+    #endif
     #if defined(TIM4)
+    #if defined(STM32G0B1xx) || defined(STM32G0C1xx)
+    TIM_ENTRY(3, TIM3_TIM4_IRQn),
+    #else
     TIM_ENTRY(4, TIM4_IRQn),
     #endif
+    #endif
     #if defined(TIM5)
     TIM_ENTRY(5, TIM5_IRQn),
     #endif
     #if defined(TIM6)
     #if defined(STM32F412Zx)
     TIM_ENTRY(6, TIM6_IRQn),
+    #elif defined(STM32G0)
+    TIM_ENTRY(6, TIM6_DAC_LPTIM1_IRQn),
     #else
     TIM_ENTRY(6, TIM6_DAC_IRQn),
     #endif
     #endif
     #if defined(TIM7)
-    #if defined(STM32G4)
+    #if defined(STM32G0)
+    TIM_ENTRY(7, TIM7_LPTIM2_IRQn),
+    #elif defined(STM32G4)
     TIM_ENTRY(7, TIM7_DAC_IRQn),
     #else
     TIM_ENTRY(7, TIM7_IRQn),
@@ -860,27 +872,31 @@ STATIC const uint32_t tim_instance_table[MICROPY_HW_MAX_TIMER] = {
     #if defined(TIM13)
     TIM_ENTRY(13, TIM8_UP_TIM13_IRQn),
     #endif
-    #if defined(STM32F0)
+    #if defined(STM32F0) || defined(STM32G0)
     TIM_ENTRY(14, TIM14_IRQn),
     #elif defined(TIM14)
     TIM_ENTRY(14, TIM8_TRG_COM_TIM14_IRQn),
     #endif
     #if defined(TIM15)
-    #if defined(STM32F0) || defined(STM32H7)
+    #if defined(STM32F0) || defined(STM32G0) || defined(STM32H7)
     TIM_ENTRY(15, TIM15_IRQn),
     #else
     TIM_ENTRY(15, TIM1_BRK_TIM15_IRQn),
     #endif
     #endif
     #if defined(TIM16)
-    #if defined(STM32F0) || defined(STM32H7) || defined(STM32WL)
+    #if defined(STM32G0B1xx) || defined(STM32G0C1xx)
+    TIM_ENTRY(16, TIM16_FDCAN_IT0_IRQn),
+    #elif defined(STM32F0) || defined(STM32G0) || defined(STM32H7) || defined(STM32WL)
     TIM_ENTRY(16, TIM16_IRQn),
     #else
     TIM_ENTRY(16, TIM1_UP_TIM16_IRQn),
     #endif
     #endif
     #if defined(TIM17)
-    #if defined(STM32F0) || defined(STM32H7) || defined(STM32WL)
+    #if defined(STM32G0B1xx) || defined(STM32G0C1xx)
+    TIM_ENTRY(17, TIM17_FDCAN_IT1_IRQn),
+    #elif defined(STM32F0) || defined(STM32G0) || defined(STM32H7) || defined(STM32WL)
     TIM_ENTRY(17, TIM17_IRQn),
     #else
     TIM_ENTRY(17, TIM1_TRG_COM_TIM17_IRQn),
diff --git a/ports/stm32/uart.c b/ports/stm32/uart.c
index 13e1667d2c324..adcbe883686e2 100644
--- a/ports/stm32/uart.c
+++ b/ports/stm32/uart.c
@@ -41,13 +41,13 @@
 #if defined(STM32F4)
 #define UART_RXNE_IS_SET(uart) ((uart)->SR & USART_SR_RXNE)
 #else
-#if defined(STM32H7) || defined(STM32WL)
+#if defined(STM32G0) || defined(STM32H7) || defined(STM32WL)
 #define USART_ISR_RXNE USART_ISR_RXNE_RXFNE
 #endif
 #define UART_RXNE_IS_SET(uart) ((uart)->ISR & USART_ISR_RXNE)
 #endif
 
-#if defined(STM32WL)
+#if defined(STM32G0) || defined(STM32WL)
 #define UART_RXNE_IT_EN(uart) do { (uart)->CR1 |= USART_CR1_RXNEIE_RXFNEIE; } while (0)
 #define UART_RXNE_IT_DIS(uart) do { (uart)->CR1 &= ~USART_CR1_RXNEIE_RXFNEIE; } while (0)
 #else
@@ -55,7 +55,7 @@
 #define UART_RXNE_IT_DIS(uart) do { (uart)->CR1 &= ~USART_CR1_RXNEIE; } while (0)
 #endif
 
-#if defined(STM32WL)
+#if defined(STM32G0) || defined(STM32WL)
 #define USART_CR1_IE_BASE (USART_CR1_PEIE | USART_CR1_TXEIE_TXFNFIE | USART_CR1_TCIE | USART_CR1_RXNEIE_RXFNEIE | USART_CR1_IDLEIE)
 #else
 #define USART_CR1_IE_BASE (USART_CR1_PEIE | USART_CR1_TXEIE | USART_CR1_TCIE | USART_CR1_RXNEIE | USART_CR1_IDLEIE)
@@ -82,7 +82,7 @@
 #define USART_CR3_IE_ALL (USART_CR3_IE_BASE)
 #endif
 
-#elif defined(STM32G4)
+#elif defined(STM32G0) || defined(STM32G4)
 #define USART_CR1_IE_ALL (USART_CR1_IE_BASE | USART_CR1_EOBIE | USART_CR1_RTOIE | USART_CR1_CMIE)
 #define USART_CR2_IE_ALL (USART_CR2_IE_BASE)
 #if defined(USART_CR3_TCBGTIE)
@@ -122,13 +122,13 @@ typedef struct _pyb_uart_irq_map_t {
 STATIC const pyb_uart_irq_map_t mp_uart_irq_map[] = {
     { USART_CR1_IDLEIE, UART_FLAG_IDLE}, // RX idle
     { USART_CR1_PEIE,   UART_FLAG_PE},   // parity error
-    #if defined(STM32WL)
+    #if defined(STM32G0) || defined(STM32WL)
     { USART_CR1_TXEIE_TXFNFIE, UART_FLAG_TXE}, // TX register empty
     #else
     { USART_CR1_TXEIE,  UART_FLAG_TXE},  // TX register empty
     #endif
     { USART_CR1_TCIE,   UART_FLAG_TC},   // TX complete
-    #if defined(STM32WL)
+    #if defined(STM32G0) || defined(STM32WL)
     { USART_CR1_RXNEIE_RXFNEIE, UART_FLAG_RXNE}, // RX register not empty
     #else
     { USART_CR1_RXNEIE, UART_FLAG_RXNE}, // RX register not empty
@@ -229,6 +229,11 @@ bool uart_exists(int uart_id) {
             return true;
         #endif
 
+        #if defined(MICROPY_HW_LPUART2_TX) && defined(MICROPY_HW_LPUART2_RX)
+        case PYB_LPUART_2:
+            return true;
+        #endif
+
         default:
             return false;
     }
@@ -270,7 +275,11 @@ bool uart_init(pyb_uart_obj_t *uart_obj,
         case PYB_UART_2:
             uart_unit = 2;
             UARTx = USART2;
+            #if defined(STM32G0)
+            irqn = USART2_LPUART2_IRQn;
+            #else
             irqn = USART2_IRQn;
+            #endif
             pins[0] = MICROPY_HW_UART2_TX;
             pins[1] = MICROPY_HW_UART2_RX;
             #if defined(MICROPY_HW_UART2_RTS)
@@ -293,6 +302,8 @@ bool uart_init(pyb_uart_obj_t *uart_obj,
             UARTx = USART3;
             #if defined(STM32F0)
             irqn = USART3_8_IRQn;
+            #elif defined(STM32G0)
+            irqn = USART3_4_5_6_LPUART1_IRQn;
             #else
             irqn = USART3_IRQn;
             #endif
@@ -323,6 +334,10 @@ bool uart_init(pyb_uart_obj_t *uart_obj,
             UARTx = USART4;
             irqn = USART4_5_IRQn;
             __HAL_RCC_USART4_CLK_ENABLE();
+            #elif defined(STM32G0)
+            UARTx = USART4;
+            irqn = USART3_4_5_6_LPUART1_IRQn;
+            __HAL_RCC_USART4_CLK_ENABLE();
             #else
             UARTx = UART4;
             irqn = UART4_IRQn;
@@ -354,6 +369,10 @@ bool uart_init(pyb_uart_obj_t *uart_obj,
             UARTx = USART5;
             irqn = USART4_5_IRQn;
             __HAL_RCC_USART5_CLK_ENABLE();
+            #elif defined(STM32G0)
+            UARTx = USART5;
+            irqn = USART3_4_5_6_LPUART1_IRQn;
+            __HAL_RCC_USART5_CLK_ENABLE();
             #else
             UARTx = UART5;
             irqn = UART5_IRQn;
@@ -380,6 +399,8 @@ bool uart_init(pyb_uart_obj_t *uart_obj,
             UARTx = USART6;
             #if defined(STM32F0)
             irqn = USART3_8_IRQn;
+            #elif defined(STM32G0)
+            irqn = USART3_4_5_6_LPUART1_IRQn;
             #else
             irqn = USART6_IRQn;
             #endif
@@ -480,7 +501,11 @@ bool uart_init(pyb_uart_obj_t *uart_obj,
             uart_fn = AF_FN_LPUART;
             uart_unit = 1;
             UARTx = LPUART1;
+            #if defined(STM32G0)
+            irqn = USART3_4_5_6_LPUART1_IRQn;
+            #else
             irqn = LPUART1_IRQn;
+            #endif
             pins[0] = MICROPY_HW_LPUART1_TX;
             pins[1] = MICROPY_HW_LPUART1_RX;
             #if defined(MICROPY_HW_LPUART1_RTS)
@@ -497,6 +522,30 @@ bool uart_init(pyb_uart_obj_t *uart_obj,
             break;
         #endif
 
+        #if defined(MICROPY_HW_LPUART2_TX) && defined(MICROPY_HW_LPUART2_RX)
+        case PYB_LPUART_2:
+            uart_fn = AF_FN_LPUART;
+            uart_unit = 2;
+            UARTx = LPUART2;
+            #if defined(STM32G0)
+            irqn = USART2_LPUART2_IRQn;
+            #endif
+            pins[0] = MICROPY_HW_LPUART2_TX;
+            pins[1] = MICROPY_HW_LPUART2_RX;
+            #if defined(MICROPY_HW_LPUART2_RTS)
+            if (flow & UART_HWCONTROL_RTS) {
+                pins[2] = MICROPY_HW_LPUART2_RTS;
+            }
+            #endif
+            #if defined(MICROPY_HW_LPUART2_CTS)
+            if (flow & UART_HWCONTROL_CTS) {
+                pins[3] = MICROPY_HW_LPUART2_CTS;
+            }
+            #endif
+            __HAL_RCC_LPUART2_CLK_ENABLE();
+            break;
+        #endif
+
         default:
             // UART does not exist or is not configured for this board
             return false;
@@ -626,14 +675,20 @@ void uart_deinit(pyb_uart_obj_t *self) {
         __HAL_RCC_USART1_CLK_DISABLE();
     #if defined(USART2)
     } else if (self->uart_id == 2) {
+        #if defined(STM32G0)
+        HAL_NVIC_DisableIRQ(USART2_LPUART2_IRQn);
+        #else
         HAL_NVIC_DisableIRQ(USART2_IRQn);
+        #endif
         __HAL_RCC_USART2_FORCE_RESET();
         __HAL_RCC_USART2_RELEASE_RESET();
         __HAL_RCC_USART2_CLK_DISABLE();
     #endif
     #if defined(USART3)
     } else if (self->uart_id == 3) {
-        #if !defined(STM32F0)
+        #if defined(STM32G0)
+        HAL_NVIC_DisableIRQ(USART3_4_5_6_LPUART1_IRQn);
+        #elif !defined(STM32F0)
         HAL_NVIC_DisableIRQ(USART3_IRQn);
         #endif
         __HAL_RCC_USART3_FORCE_RESET();
@@ -715,11 +770,26 @@ void uart_deinit(pyb_uart_obj_t *self) {
     #endif
     #if defined(LPUART1)
     } else if (self->uart_id == PYB_LPUART_1) {
+        #if defined(STM32G0)
+        HAL_NVIC_DisableIRQ(USART3_4_5_6_LPUART1_IRQn);
+        #else
         HAL_NVIC_DisableIRQ(LPUART1_IRQn);
+        #endif
         __HAL_RCC_LPUART1_FORCE_RESET();
         __HAL_RCC_LPUART1_RELEASE_RESET();
         __HAL_RCC_LPUART1_CLK_DISABLE();
     #endif
+    #if defined(LPUART2)
+    } else if (self->uart_id == PYB_LPUART_2) {
+        #if defined(STM32G0)
+        HAL_NVIC_DisableIRQ(USART2_LPUART2_IRQn);
+        #else
+        HAL_NVIC_DisableIRQ(LPUART2_IRQn);
+        #endif
+        __HAL_RCC_LPUART2_FORCE_RESET();
+        __HAL_RCC_LPUART2_RELEASE_RESET();
+        __HAL_RCC_LPUART2_CLK_DISABLE();
+    #endif
     }
 }
 
@@ -730,7 +800,7 @@ void uart_attach_to_repl(pyb_uart_obj_t *self, bool attached) {
 uint32_t uart_get_source_freq(pyb_uart_obj_t *self) {
     uint32_t uart_clk = 0;
 
-    #if defined(STM32F0)
+    #if defined(STM32F0) || defined(STM32G0)
     uart_clk = HAL_RCC_GetPCLK1Freq();
     #elif defined(STM32F7)
     switch ((RCC->DCKCFGR2 >> ((self->uart_id - 1) * 2)) & 3) {
@@ -830,14 +900,14 @@ uint32_t uart_get_baudrate(pyb_uart_obj_t *self) {
     #if defined(LPUART1)
     if (self->uart_id == PYB_LPUART_1) {
         return LL_LPUART_GetBaudRate(self->uartx, uart_get_source_freq(self)
-            #if defined(STM32G4) || defined(STM32H7) || defined(STM32WB) || defined(STM32WL)
+            #if defined(STM32G0) || defined(STM32G4) || defined(STM32H7) || defined(STM32WB) || defined(STM32WL)
             , self->uartx->PRESC
             #endif
             );
     }
     #endif
     return LL_USART_GetBaudRate(self->uartx, uart_get_source_freq(self),
-        #if defined(STM32G4) || defined(STM32H7) || defined(STM32WB) || defined(STM32WL)
+        #if defined(STM32G0) || defined(STM32G4) || defined(STM32H7) || defined(STM32WB) || defined(STM32WL)
         self->uartx->PRESC,
         #endif
         LL_USART_OVERSAMPLING_16);
@@ -847,7 +917,7 @@ void uart_set_baudrate(pyb_uart_obj_t *self, uint32_t baudrate) {
     #if defined(LPUART1)
     if (self->uart_id == PYB_LPUART_1) {
         LL_LPUART_SetBaudRate(self->uartx, uart_get_source_freq(self),
-            #if defined(STM32G4) || defined(STM32H7) || defined(STM32WB) || defined(STM32WL)
+            #if defined(STM32G0) || defined(STM32G4) || defined(STM32H7) || defined(STM32WB) || defined(STM32WL)
             LL_LPUART_PRESCALER_DIV1,
             #endif
             baudrate);
@@ -855,7 +925,7 @@ void uart_set_baudrate(pyb_uart_obj_t *self, uint32_t baudrate) {
     }
     #endif
     LL_USART_SetBaudRate(self->uartx, uart_get_source_freq(self),
-        #if defined(STM32G4) || defined(STM32H7) || defined(STM32WB) || defined(STM32WL)
+        #if defined(STM32G0) || defined(STM32G4) || defined(STM32H7) || defined(STM32WB) || defined(STM32WL)
         LL_USART_PRESCALER_DIV1,
         #endif
         LL_USART_OVERSAMPLING_16, baudrate);
@@ -906,7 +976,7 @@ int uart_rx_char(pyb_uart_obj_t *self) {
         return data;
     } else {
         // no buffering
-        #if defined(STM32F0) || defined(STM32F7) || defined(STM32G4) || defined(STM32L0) || defined(STM32L4) || defined(STM32H7) || defined(STM32WB) || defined(STM32WL)
+        #if defined(STM32F0) || defined(STM32F7) || defined(STM32G0) || defined(STM32G4) || defined(STM32L0) || defined(STM32L4) || defined(STM32H7) || defined(STM32WB) || defined(STM32WL)
         int data = self->uartx->RDR & self->char_mask;
         self->uartx->ICR = USART_ICR_ORECF; // clear ORE if it was set
         return data;
@@ -1056,7 +1126,7 @@ void uart_irq_handler(mp_uint_t uart_id) {
             uint16_t next_head = (self->read_buf_head + 1) % self->read_buf_len;
             if (next_head != self->read_buf_tail) {
                 // only read data if room in buf
-                #if defined(STM32F0) || defined(STM32F7) || defined(STM32G4) || defined(STM32L0) || defined(STM32L4) || defined(STM32H7) || defined(STM32WB) || defined(STM32WL)
+                #if defined(STM32F0) || defined(STM32F7) || defined(STM32G0) || defined(STM32G4) || defined(STM32H7) || defined(STM32L0) || defined(STM32L4) || defined(STM32WB) || defined(STM32WL)
                 int data = self->uartx->RDR; // clears UART_FLAG_RXNE
                 #else
                 self->mp_irq_flags = self->uartx->SR; // resample to get any new flags since next read of DR will clear SR
diff --git a/ports/stm32/uart.h b/ports/stm32/uart.h
index 5fee841f8f769..ec8a27591c1e5 100644
--- a/ports/stm32/uart.h
+++ b/ports/stm32/uart.h
@@ -43,6 +43,9 @@ typedef enum {
     #ifdef LPUART1
     PYB_LPUART_1 = MICROPY_HW_MAX_UART + 1,
     #endif
+    #ifdef LPUART2
+    PYB_LPUART_2 = MICROPY_HW_MAX_UART + 2,
+    #endif
 } pyb_uart_t;
 
 #define CHAR_WIDTH_8BIT (0)
@@ -102,7 +105,7 @@ void uart_tx_strn(pyb_uart_obj_t *uart_obj, const char *str, uint len);
 static inline bool uart_tx_avail(pyb_uart_obj_t *self) {
     #if defined(STM32F4)
     return self->uartx->SR & USART_SR_TXE;
-    #elif defined(STM32H7) || defined(STM32WL)
+    #elif defined(STM32G0) || defined(STM32H7) || defined(STM32WL)
     return self->uartx->ISR & USART_ISR_TXE_TXFNF;
     #else
     return self->uartx->ISR & USART_ISR_TXE;

From 9d08eb02474fcace0a81dd3518b938afbf1486eb Mon Sep 17 00:00:00 2001
From: Asensio Lorenzo Sempere <asensio.aerospace@gmail.com>
Date: Sat, 12 Feb 2022 14:52:32 -0600
Subject: [PATCH 1969/3533] stm32/boards/NUCLEO_G0B1RE: Add NUCLEO_G0B1RE board
 definition.

This commit adds a board definition for NUCLEO_G0B1RE. This board has the
REPL on UART2 which is connected to the on-board ST-link USB-UART.

Signed-off-by: Asensio Lorenzo Sempere <asensio.aerospace@gmail.com>
---
 ports/stm32/boards/NUCLEO_G0B1RE/board.json   | 15 +++
 .../boards/NUCLEO_G0B1RE/mpconfigboard.h      | 89 +++++++++++++++++
 .../boards/NUCLEO_G0B1RE/mpconfigboard.mk     |  4 +
 ports/stm32/boards/NUCLEO_G0B1RE/pins.csv     | 79 +++++++++++++++
 .../boards/NUCLEO_G0B1RE/stm32g0xx_hal_conf.h | 22 +++++
 ports/stm32/boards/stm32g0b1_af.csv           | 96 +++++++++++++++++++
 ports/stm32/boards/stm32g0b1xe.ld             | 28 ++++++
 7 files changed, 333 insertions(+)
 create mode 100644 ports/stm32/boards/NUCLEO_G0B1RE/board.json
 create mode 100644 ports/stm32/boards/NUCLEO_G0B1RE/mpconfigboard.h
 create mode 100644 ports/stm32/boards/NUCLEO_G0B1RE/mpconfigboard.mk
 create mode 100644 ports/stm32/boards/NUCLEO_G0B1RE/pins.csv
 create mode 100644 ports/stm32/boards/NUCLEO_G0B1RE/stm32g0xx_hal_conf.h
 create mode 100644 ports/stm32/boards/stm32g0b1_af.csv
 create mode 100644 ports/stm32/boards/stm32g0b1xe.ld

diff --git a/ports/stm32/boards/NUCLEO_G0B1RE/board.json b/ports/stm32/boards/NUCLEO_G0B1RE/board.json
new file mode 100644
index 0000000000000..f4c6f2f2df3ae
--- /dev/null
+++ b/ports/stm32/boards/NUCLEO_G0B1RE/board.json
@@ -0,0 +1,15 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [],
+    "images": [
+        "nucleo_g0b1re.jpg"
+    ],
+    "mcu": "stm32g0",
+    "product": "Nucleo G0B1RE",
+    "thumbnail": "",
+    "url": "",
+    "vendor": "ST Microelectronics"
+}
diff --git a/ports/stm32/boards/NUCLEO_G0B1RE/mpconfigboard.h b/ports/stm32/boards/NUCLEO_G0B1RE/mpconfigboard.h
new file mode 100644
index 0000000000000..6ba3e0115c9d8
--- /dev/null
+++ b/ports/stm32/boards/NUCLEO_G0B1RE/mpconfigboard.h
@@ -0,0 +1,89 @@
+#define MICROPY_HW_BOARD_NAME       "NUCLEO-G0B1RE"
+#define MICROPY_HW_MCU_NAME         "STM32G0B1xE"
+
+#define MICROPY_HW_HAS_SWITCH       (1)
+#define MICROPY_HW_HAS_FLASH        (1)
+#define MICROPY_HW_ENABLE_RNG       (0)
+#define MICROPY_HW_ENABLE_RTC       (1)
+#define MICROPY_HW_ENABLE_DAC       (0)
+#define MICROPY_PY_PYB_LEGACY       (0)
+
+#define MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE (1)
+
+// HSE is 8MHz, HSI is 16MHz CPU freq set to 64MHz
+// Default source for the clock is HSI.
+#define MICROPY_HW_CLK_USE_HSI (1)
+
+#define MICROPY_HW_FLASH_LATENCY    FLASH_LATENCY_2
+
+#if MICROPY_HW_CLK_USE_HSI
+#define MICROPY_HW_CLK_PLLM (16)
+#else
+#define MICROPY_HW_CLK_PLLM (8)
+#endif
+#define MICROPY_HW_CLK_PLLN (336)
+#define MICROPY_HW_CLK_PLLP (RCC_PLLP_DIV4)
+#define MICROPY_HW_CLK_PLLQ (7)
+
+// USART1 config
+#define MICROPY_HW_UART1_TX         (pin_A9)
+#define MICROPY_HW_UART1_RX         (pin_A10)
+// UART2 config
+#define MICROPY_HW_UART2_TX         (pin_A2)
+#define MICROPY_HW_UART2_RX         (pin_A3)
+// USART3 config
+#define MICROPY_HW_UART3_TX         (pin_C4)
+#define MICROPY_HW_UART3_RX         (pin_C5)
+#define MICROPY_HW_UART3_RTS        (pin_B14)
+#define MICROPY_HW_UART3_CTS        (pin_B13)
+// USART4 config
+#define MICROPY_HW_UART4_TX         (pin_A0)
+#define MICROPY_HW_UART4_RX         (pin_A1)
+// USART5 config
+#define MICROPY_HW_UART5_TX         (pin_B0)
+#define MICROPY_HW_UART5_RX         (pin_B1)
+// USART6 config
+#define MICROPY_HW_UART6_TX         (pin_C0)
+#define MICROPY_HW_UART6_RX         (pin_C1)
+// LPUART1 config
+#define MICROPY_HW_LPUART1_TX       (pin_C1)
+#define MICROPY_HW_LPUART1_RX       (pin_C0)
+// LPUART2 config
+#define MICROPY_HW_LPUART2_TX       (pin_C6)
+#define MICROPY_HW_LPUART2_RX       (pin_C7)
+// USART2 is connected to the virtual com port on the ST-Link
+#define MICROPY_HW_UART_REPL        PYB_UART_2
+#define MICROPY_HW_UART_REPL_BAUD   115200
+
+// I2C buses
+#define MICROPY_HW_I2C1_SCL         (pin_B8)
+#define MICROPY_HW_I2C1_SDA         (pin_B9)
+#define MICROPY_HW_I2C2_SCL         (pin_B10)
+#define MICROPY_HW_I2C2_SDA         (pin_B11)
+
+// SPI buses
+#define MICROPY_HW_SPI1_NSS         (pin_A4)
+#define MICROPY_HW_SPI1_SCK         (pin_B3)
+#define MICROPY_HW_SPI1_MISO        (pin_B4)
+#define MICROPY_HW_SPI1_MOSI        (pin_B5)
+#define MICROPY_HW_SPI2_NSS         (pin_B12)
+#define MICROPY_HW_SPI2_SCK         (pin_B13)
+#define MICROPY_HW_SPI2_MISO        (pin_B14)
+#define MICROPY_HW_SPI2_MOSI        (pin_B15)
+
+// CAN buses
+// #define MICROPY_HW_CAN1_TX          (pin_A12)
+// #define MICROPY_HW_CAN1_RX          (pin_A11)
+// #define MICROPY_HW_CAN2_TX          (pin_C2)
+// #define MICROPY_HW_CAN2_RX          (pin_C3)
+
+// USRSW is pulled low. Pressing the button makes the input go high.
+#define MICROPY_HW_USRSW_PIN        (pin_C13)
+#define MICROPY_HW_USRSW_PULL       (GPIO_NOPULL)
+#define MICROPY_HW_USRSW_EXTI_MODE  (GPIO_MODE_IT_FALLING)
+#define MICROPY_HW_USRSW_PRESSED    (0)
+
+// LEDs
+#define MICROPY_HW_LED1             (pin_A5) // Green LD2 LED on Nucleo
+#define MICROPY_HW_LED_ON(pin)      (mp_hal_pin_high(pin))
+#define MICROPY_HW_LED_OFF(pin)     (mp_hal_pin_low(pin))
diff --git a/ports/stm32/boards/NUCLEO_G0B1RE/mpconfigboard.mk b/ports/stm32/boards/NUCLEO_G0B1RE/mpconfigboard.mk
new file mode 100644
index 0000000000000..371e10d154cbc
--- /dev/null
+++ b/ports/stm32/boards/NUCLEO_G0B1RE/mpconfigboard.mk
@@ -0,0 +1,4 @@
+MCU_SERIES = g0
+CMSIS_MCU = STM32G0B1xx
+AF_FILE = boards/stm32g0b1_af.csv
+LD_FILES = boards/stm32g0b1xe.ld boards/common_basic.ld
diff --git a/ports/stm32/boards/NUCLEO_G0B1RE/pins.csv b/ports/stm32/boards/NUCLEO_G0B1RE/pins.csv
new file mode 100644
index 0000000000000..9c03b1b68a64e
--- /dev/null
+++ b/ports/stm32/boards/NUCLEO_G0B1RE/pins.csv
@@ -0,0 +1,79 @@
+A0,PA0
+A1,PA1
+A2,PA4
+A3,PB1
+A4,PB11
+A5,PB12
+D0,PC5
+D1,PC4
+D10,PB0
+D11,PA7
+D12,PA6
+D13,PA5
+D14,PB9
+D15,PB8
+D2,PA10
+D3,PB3
+D4,PB5
+D5,PB4
+D6,PB14
+D7,PA8
+D8,PA9
+D9,PC7
+PA0,PA0
+PA1,PA1
+PA10,PA10
+PA11,PA11
+PA12,PA12
+PA13,TMS
+PA15,PA15
+PA2,PA2
+PA3,PA3
+PA4,PA4
+PA5,PA5
+PA6,PA6
+PA7,PA7
+PA8,PA8
+PA9,PA9
+PB0,PB0
+PB1,PB1
+PB10,PB10
+PB11,PB11
+PB12,PB12
+PB13,PB13
+PB14,PB14
+PB15,PB15
+PB2,PB2
+PB3,PB3
+PB4,PB4
+PB5,PB5
+PB6,PB6
+PB7,PB7
+PB8,PB8
+PB9,PB9
+PC0,PC0
+PC1,PC1
+PC10,PC10
+PC11,PC11
+PC12,PC12
+PC13,PC13
+PC2,PC2
+PC3,PC3
+PC4,PC4
+PC5,PC5
+PC6,PC6
+PC7,PC7
+PC8,PC8
+PC9,PC9
+PD0,PD0
+PD1,PD1
+PD2,PD2
+PD3,PD3
+PD4,PD4
+PD5,PD5
+PD6,PD6
+PD8,PD8
+PD9,PD9
+PD13,PD13
+LED_GREEN,PD13
+SW,PC13
diff --git a/ports/stm32/boards/NUCLEO_G0B1RE/stm32g0xx_hal_conf.h b/ports/stm32/boards/NUCLEO_G0B1RE/stm32g0xx_hal_conf.h
new file mode 100644
index 0000000000000..31fc89e48611b
--- /dev/null
+++ b/ports/stm32/boards/NUCLEO_G0B1RE/stm32g0xx_hal_conf.h
@@ -0,0 +1,22 @@
+/* This file is part of the MicroPython project, http://micropython.org/
+ * The MIT License (MIT)
+ * Copyright (c) 2019 Damien P. George
+ */
+#ifndef MICROPY_INCLUDED_STM32G0XX_HAL_CONF_H
+#define MICROPY_INCLUDED_STM32G0XX_HAL_CONF_H
+
+// Oscillator values in Hz
+#define HSE_VALUE (8000000)
+#define LSE_VALUE (32768)
+#define EXTERNAL_I2S1_CLOCK_VALUE (48000)
+#if defined(STM32G0C1xx) || defined(STM32G0B1xx) || defined(STM32G0B0xx)
+#define EXTERNAL_I2S2_CLOCK_VALUE (48000)
+#endif
+
+// Oscillator timeouts in ms
+#define HSE_STARTUP_TIMEOUT (100)
+#define LSE_STARTUP_TIMEOUT (5000)
+
+#include "boards/stm32g0xx_hal_conf_base.h"
+
+#endif // MICROPY_INCLUDED_STM32G0XX_HAL_CONF_H
diff --git a/ports/stm32/boards/stm32g0b1_af.csv b/ports/stm32/boards/stm32g0b1_af.csv
new file mode 100644
index 0000000000000..bea1c1e156337
--- /dev/null
+++ b/ports/stm32/boards/stm32g0b1_af.csv
@@ -0,0 +1,96 @@
+Port,Pin,AF0,AF1,AF2,AF3,AF4,AF5,AF6,AF7,AF8,AF9,AF10,AF11,AF12,AF13,AF14,AF15,
+,,AF0,AF1,AF2,AF3,AF4,AF5,AF6,AF7,AF8,AF9,AF10,AF11,AF12,AF13,AF14,AF15,ADC
+PortA,PA0,SPI2_SCK/I2S2_CK,USART2_CTS,TIM2_CH1/TIM2_ETR,,USART4_TX,LPTIM1_OUT,UCPD2_FRSTX,COMP1_OUT,,,,,,,,,ADC1_IN0
+PortA,PA1,SPI1_SCK/I2S1_CK,USART2_RTS/USART2_DE/USART2_CK,TIM2_CH2,,USART4_RX,TIM15_CH1N,I2C1_SMBA,EVENTOUT,,,,,,,,,ADC1_IN1
+PortA,PA2,SPI1_MOSI/I2S1_SD,USART2_TX,TIM2_CH3,,UCPD1_FRSTX,TIM15_CH1,LPUART1_TX,COMP2_OUT,,,,,,,,,ADC1_IN2
+PortA,PA3,SPI2_MISO/I2S2_MCK,USART2_RX,TIM2_CH4,,UCPD2_FRSTX,TIM15_CH2,LPUART1_RX,EVENTOUT,,,,,,,,,ADC1_IN3
+PortA,PA4,SPI1_NSS/I2S1_WS,SPI2_MOSI/I2S2_SD,USB_NOE,USART6_TX,TIM14_CH1,LPTIM2_OUT,UCPD2_FRSTX,EVENTOUT,,SPI3_NSS,,,,,,,ADC1_IN4
+PortA,PA5,SPI1_SCK/I2S1_CK,CEC,TIM2_CH1/TIM2_ETR,USART6_RX,USART3_TX,LPTIM2_ETR,UCPD1_FRSTX,EVENTOUT,,,,,,,,,ADC1_IN5
+PortA,PA6,SPI1_MISO/I2S1_MCK,TIM3_CH1,TIM1_BKIN,USART6_CTS,USART3_CTS,TIM16_CH1,LPUART1_CTS,COMP1_OUT,I2C2_SDA,I2C3_SDA,,,,,,,ADC1_IN6
+PortA,PA7,SPI1_MOSI/I2S1_SD,TIM3_CH2,TIM1_CH1N,USART6_RTS/USART6_DE/USART6_CK,TIM14_CH1,TIM17_CH1,UCPD1_FRSTX,COMP2_OUT,I2C2_SCL,I2C3_SCL,,,,,,,ADC1_IN7
+PortA,PA8,MCO,SPI2_NSS/I2S2_WS,TIM1_CH1,,CRS1_SYNC,LPTIM2_OUT,,EVENTOUT,I2C2_SMBA,,,,,,,,
+PortA,PA9,MCO,USART1_TX,TIM1_CH2,,SPI2_MISO/I2S2_MCK,TIM15_BKIN,I2C1_SCL,EVENTOUT,I2C2_SCL,,,,,,,,
+PortA,PA10,SPI2_MOSI/I2S2_SD,USART1_RX,TIM1_CH3,MCO2,,TIM17_BKIN,I2C1_SDA,EVENTOUT,I2C2_SDA,,,,,,,,
+PortA,PA11,SPI1_MISO/I2S1_MCK,USART1_CTS,TIM1_CH4,FDCAN1_RX,,TIM1_BKIN2,I2C2_SCL,COMP1_OUT,,,,,,,,,
+PortA,PA12,SPI1_MOSI/I2S1_SD,USART1_RTS/USART1_DE/USART1_CK,TIM1_ETR,FDCAN1_TX,,I2S_CKIN,I2C2_SDA,COMP2_OUT,,,,,,,,,
+PortA,PA13,SWDIO,IR_OUT,USB_NOE,,,,,EVENTOUT,,,LPUART2_RX,,,,,,
+PortA,PA14,SWCLK,USART2_TX,,,,,,EVENTOUT,,,LPUART2_TX,,,,,,
+PortA,PA15,SPI1_NSS/I2S1_WS,USART2_RX,TIM2_CH1/TIM2_ETR,MCO2,USART4_RTS/USART4_DE/USART4_CK,USART3_RTS/USART3_DE/USART3_CK,USB_NOE,EVENTOUT,I2C2_SMBA,SPI3_NSS,,,,,,,
+PortB,PB0,SPI1_NSS/I2S1_WS,TIM3_CH3,TIM1_CH2N,FDCAN2_RX,USART3_RX,LPTIM1_OUT,UCPD1_FRSTX,COMP1_OUT,USART5_TX,,LPUART2_CTS,,,,,,ADC1_IN8
+PortB,PB1,TIM14_CH1,TIM3_CH4,TIM1_CH3N,FDCAN2_TX,USART3_RTS/USART3_DE/USART3_CK,LPTIM2_IN1,LPUART1_RTS/LPUART1_DE,COMP3_OUT,USART5_RX,,LPUART2_RTS/LPUART2_DE,,,,,,ADC1_IN9
+PortB,PB2,,SPI2_MISO/I2S2_MCK,,MCO2,USART3_TX,LPTIM1_OUT,,EVENTOUT,,,,,,,,,ADC1_IN10
+PortB,PB3,SPI1_SCK/I2S1_CK,TIM1_CH2,TIM2_CH2,USART5_TX,USART1_RTS/USART1_DE/USART1_CK,,I2C3_SCL,EVENTOUT,I2C2_SCL,SPI3_SCK,,,,,,,
+PortB,PB4,SPI1_MISO/I2S1_MCK,TIM3_CH1,,USART5_RX,USART1_CTS,TIM17_BKIN,I2C3_SDA,EVENTOUT,I2C2_SDA,SPI3_MISO,,,,,,,
+PortB,PB5,SPI1_MOSI/I2S1_SD,TIM3_CH2,TIM16_BKIN,FDCAN2_RX,,LPTIM1_IN1,I2C1_SMBA,COMP2_OUT,USART5_RTS/USART5_DE/USART5_CK,SPI3_MOSI,,,,,,,
+PortB,PB6,USART1_TX,TIM1_CH3,TIM16_CH1N,FDCAN2_TX,SPI2_MISO/I2S2_MCK,LPTIM1_ETR,I2C1_SCL,EVENTOUT,USART5_CTS,TIM4_CH1,LPUART2_TX,,,,,,
+PortB,PB7,USART1_RX,SPI2_MOSI/I2S2_SD,TIM17_CH1N,,USART4_CTS,LPTIM1_IN2,I2C1_SDA,EVENTOUT,,TIM4_CH2,LPUART2_RX,,,,,,
+PortB,PB8,CEC,SPI2_SCK/I2S2_CK,TIM16_CH1,FDCAN1_RX,USART3_TX,TIM15_BKIN,I2C1_SCL,EVENTOUT,USART6_TX,TIM4_CH3,,,,,,,
+PortB,PB9,IR_OUT,UCPD2_FRSTX,TIM17_CH1,FDCAN1_TX,USART3_RX,SPI2_NSS/I2S2_WS,I2C1_SDA,EVENTOUT,USART6_RX,TIM4_CH4,,,,,,,
+PortB,PB10,CEC,LPUART1_RX,TIM2_CH3,,USART3_TX,SPI2_SCK/I2S2_CK,I2C2_SCL,COMP1_OUT,,,,,,,,,ADC1_IN11
+PortB,PB11,SPI2_MOSI/I2S2_SD,LPUART1_TX,TIM2_CH4,,USART3_RX,,I2C2_SDA,COMP2_OUT,,,,,,,,,
+PortB,PB12,SPI2_NSS/I2S2_WS,LPUART1_RTS/LPUART1_DE,TIM1_BKIN,FDCAN2_RX,,TIM15_BKIN,UCPD2_FRSTX,EVENTOUT,I2C2_SMBA,,,,,,,,
+PortB,PB13,SPI2_SCK/I2S2_CK,LPUART1_CTS,TIM1_CH1N,FDCAN2_TX,USART3_CTS,TIM15_CH1N,I2C2_SCL,EVENTOUT,,,,,,,,,
+PortB,PB14,SPI2_MISO/I2S2_MCK,UCPD1_FRSTX,TIM1_CH2N,,USART3_RTS/USART3_DE/USART3_CK,TIM15_CH1,I2C2_SDA,EVENTOUT,USART6_RTS/USART6_DE/USART6_CK,,,,,,,,
+PortB,PB15,SPI2_MOSI/I2S2_SD,,TIM1_CH3N,,TIM15_CH1N,TIM15_CH2,,EVENTOUT,USART6_CTS,,,,,,,,
+PortC,PC0,LPTIM1_IN1,LPUART1_RX,LPTIM2_IN1,LPUART2_TX,USART6_TX,,I2C3_SCL,COMP3_OUT,,,,,,,,,
+PortC,PC1,LPTIM1_OUT,LPUART1_TX,TIM15_CH1,LPUART2_RX,USART6_RX,,I2C3_SDA,,,,,,,,,,
+PortC,PC2,LPTIM1_IN2,SPI2_MISO/I2S2_MCK,TIM15_CH2,FDCAN2_RX,,,,COMP3_OUT,,,,,,,,,
+PortC,PC3,LPTIM1_ETR,SPI2_MOSI/I2S2_SD,LPTIM2_ETR,FDCAN2_TX,,,,,,,,,,,,,
+PortC,PC4,USART3_TX,USART1_TX,TIM2_CH1/TIM2_ETR,FDCAN1_RX,,,,,,,,,,,,,
+PortC,PC5,USART3_RX,USART1_RX,TIM2_CH2,FDCAN1_TX,,,,,,,,,,,,,ADC1_IN18
+PortC,PC6,UCPD1_FRSTX,TIM3_CH1,TIM2_CH3,LPUART2_TX,,,,,,,,,,,,,
+PortC,PC7,UCPD2_FRSTX,TIM3_CH2,TIM2_CH4,LPUART2_RX,,,,,,,,,,,,,
+PortC,PC8,UCPD2_FRSTX,TIM3_CH3,TIM1_CH1,LPUART2_CTS,,,,,,,,,,,,,
+PortC,PC9,I2S_CKIN,TIM3_CH4,TIM1_CH2,LPUART2_RTS/LPUART2_DE,,,USB_NOE,,,,,,,,,,
+PortC,PC10,USART3_TX,USART4_TX,TIM1_CH3,,SPI3_SCK,,,,,,,,,,,,
+PortC,PC11,USART3_RX,USART4_RX,TIM1_CH4,,SPI3_MISO,,,,,,,,,,,,
+PortC,PC12,LPTIM1_IN1,UCPD1_FRSTX,TIM14_CH1,USART5_TX,SPI3_MOSI,,,,,,,,,,,,
+PortC,PC13,,,TIM1_BKIN,,,,,,,,,,,,,,
+PortC,PC14,,,TIM1_BKIN2,,,,,,,,,,,,,,
+PortC,PC15,OSC32_EN,OSC_EN,TIM15_BKIN,,,,,,,,,,,,,,
+PortD,PD0,EVENTOUT,SPI2_NSS/I2S2_WS,TIM16_CH1,FDCAN1_RX,,,,,,,,,,,,,
+PortD,PD1,EVENTOUT,SPI2_SCK/I2S2_CK,TIM17_CH1,FDCAN1_TX,,,,,,,,,,,,,
+PortD,PD2,USART3_RTS/USART3_DE/USART3_CK,TIM3_ETR,TIM1_CH1N,USART5_RX,,,,,,,,,,,,,
+PortD,PD3,USART2_CTS,SPI2_MISO/I2S2_MCK,TIM1_CH2N,USART5_TX,,,,,,,,,,,,,
+PortD,PD4,USART2_RTS/USART2_DE/USART2_CK,SPI2_MOSI/I2S2_SD,TIM1_CH3N,USART5_RTS/USART5_DE/USART5_CK,,,,,,,,,,,,,
+PortD,PD5,USART2_TX,SPI1_MISO/I2S1_MCK,TIM1_BKIN,USART5_CTS,,,,,,,,,,,,,
+PortD,PD6,USART2_RX,SPI1_MOSI/I2S1_SD,LPTIM2_OUT,,,,,,,,,,,,,,
+PortD,PD7,,,,MCO2,,,,,,,,,,,,,
+PortD,PD8,USART3_TX,SPI1_SCK/I2S1_CK,LPTIM1_OUT,,,,,,,,,,,,,,
+PortD,PD9,USART3_RX,SPI1_NSS/I2S1_WS,TIM1_BKIN2,,,,,,,,,,,,,,
+PortD,PD10,MCO,,,,,,,,,,,,,,,,
+PortD,PD11,USART3_CTS,LPTIM2_ETR,,,,,,,,,,,,,,,
+PortD,PD12,USART3_RTS/USART3_DE/USART3_CK,LPTIM2_IN1,TIM4_CH1,FDCAN1_RX,,,,,,,,,,,,,
+PortD,PD13,,LPTIM2_OUT,TIM4_CH2,FDCAN1_TX,,,,,,,,,,,,,
+PortD,PD14,,LPUART2_CTS,TIM4_CH3,FDCAN2_RX,,,,,,,,,,,,,
+PortD,PD15,CRS1_SYNC,LPUART2_RTS/LPUART2_DE,TIM4_CH4,FDCAN2_TX,,,,,,,,,,,,,
+PortE,PE0,TIM16_CH1,EVENTOUT,TIM4_ETR,,,,,,,,,,,,,,
+PortE,PE1,TIM17_CH1,EVENTOUT,,,,,,,,,,,,,,,
+PortE,PE2,,TIM3_ETR,,,,,,,,,,,,,,,
+PortE,PE3,,TIM3_CH1,,,,,,,,,,,,,,,
+PortE,PE4,,TIM3_CH2,,,,,,,,,,,,,,,
+PortE,PE5,,TIM3_CH3,,,,,,,,,,,,,,,
+PortE,PE6,,TIM3_CH4,,,,,,,,,,,,,,,
+PortE,PE7,,TIM1_ETR,,USART5_RTS/USART5_DE/USART5_CK,,,,,,,,,,,,,
+PortE,PE8,USART4_TX,TIM1_CH1N,,,,,,,,,,,,,,,
+PortE,PE9,USART4_RX,TIM1_CH1,,,,,,,,,,,,,,,
+PortE,PE10,,TIM1_CH2N,,USART5_TX,,,,,,,,,,,,,
+PortE,PE11,,TIM1_CH2,,USART5_RX,,,,,,,,,,,,,
+PortE,PE12,SPI1_NSS/I2S1_WS,TIM1_CH3N,,,,,,,,,,,,,,,
+PortE,PE13,SPI1_SCK/I2S1_CK,TIM1_CH3,,,,,,,,,,,,,,,
+PortE,PE14,SPI1_MISO/I2S1_MCK,TIM1_CH4,TIM1_BK2,,,,,,,,,,,,,,
+PortE,PE15,SPI1_MOSI/I2S1_SD,TIM1_BK,,,,,,,,,,,,,,,
+PortF,PF0,CRS1_SYNC,EVENTOUT,TIM14_CH1,,,,,,,,,,,,,,
+PortF,PF1,OSC_EN,EVENTOUT,TIM15_CH1N,,,,,,,,,,,,,,
+PortF,PF2,MCO,LPUART2_TX,,LPUART2_RTS/LPUART2_DE,,,,,,,,,,,,,
+PortF,PF3,,LPUART2_RX,,USART6_RTS/USART6_DE/USART6_CK,,,,,,,,,,,,,
+PortF,PF4,,LPUART1_TX,,,,,,,,,,,,,,,
+PortF,PF5,,LPUART1_RX,,,,,,,,,,,,,,,
+PortF,PF6,,LPUART1_RTS/LPUART1_DE,,,,,,,,,,,,,,,
+PortF,PF7,,LPUART1_CTS,,USART5_CTS,,,,,,,,,,,,,
+PortF,PF8,,,,,,,,,,,,,,,,,
+PortF,PF9,,,,USART6_TX,,,,,,,,,,,,,
+PortF,PF10,,,,USART6_RX,,,,,,,,,,,,,
+PortF,PF11,,,,USART6_RTS/USART6_DE/USART6_CK,,,,,,,,,,,,,
+PortF,PF12,TIM15_CH1,,,USART6_CTS,,,,,,,,,,,,,
+PortF,PF13,TIM15_CH2,,,,,,,,,,,,,,,,
diff --git a/ports/stm32/boards/stm32g0b1xe.ld b/ports/stm32/boards/stm32g0b1xe.ld
new file mode 100644
index 0000000000000..4fe61a472ff71
--- /dev/null
+++ b/ports/stm32/boards/stm32g0b1xe.ld
@@ -0,0 +1,28 @@
+/* Specify the memory areas */
+MEMORY
+{
+    RAM (xrw)       : ORIGIN = 0x20000000, LENGTH = 128K
+    FLASH (rx)      : ORIGIN = 0x08000000, LENGTH = 352K
+    FLASH_FS (rx)   : ORIGIN = 0x08058000, LENGTH = 160K  /* starting @ 352K */
+}
+
+/* Generate a link error if heap and stack don't fit into RAM */
+_minimum_heap_size = 0x200; /* required amount of heap  */
+_minimum_stack_size = 0x400; /* required amount of stack */
+
+_ram_start = ORIGIN(RAM);
+_ram_end = ORIGIN(RAM) + LENGTH(RAM);
+
+_micropy_hw_internal_flash_storage_ram_cache_end = ORIGIN(RAM) + LENGTH(RAM);
+_micropy_hw_internal_flash_storage_ram_cache_start = _micropy_hw_internal_flash_storage_ram_cache_end - 2K; /* fs cache = 2K RAM */
+
+/* Define the stack.  The stack is full descending so begins just above last byte
+   of RAM.  Note that EABI requires the stack to be 8-byte aligned for a call. */
+_estack = _micropy_hw_internal_flash_storage_ram_cache_start - _estack_reserve;
+_sstack = _estack - 8K; /* tunable */
+
+_heap_start = _ebss; /* heap starts just after statically allocated memory */
+_heap_end = _sstack;
+
+_micropy_hw_internal_flash_storage_start = ORIGIN(FLASH_FS);
+_micropy_hw_internal_flash_storage_end   = ORIGIN(FLASH_FS) + LENGTH(FLASH_FS);

From 40047823bcde4ff97b91fdc19d3d5e8f575e4dde Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 21 Apr 2022 16:30:23 +1000
Subject: [PATCH 1970/3533] py/modsys: Append MicroPython git version and build
 date to sys.version.

This commit adds the git hash and build date to sys.version.  This is
allowed according to CPython docs, and is what PyPy does.  The docs state:

    A string containing the version number of the Python interpreter plus
    additional information on the build number and compiler used.

Eg on CPython:

    Python 3.10.4 (main, Mar 23 2022, 23:05:40) [GCC 11.2.0] on linux
    Type "help", "copyright", "credits" or "license" for more information.
    >>> import sys
    >>> sys.version
    '3.10.4 (main, Mar 23 2022, 23:05:40) [GCC 11.2.0]'

and PyPy:

    Python 2.7.12 (5.6.0+dfsg-4, Nov 20 2016, 10:43:30)
    [PyPy 5.6.0 with GCC 6.2.0 20161109] on linux2
    Type "help", "copyright", "credits" or "license" for more information.
    >>>> import sys
    >>>> sys.version
    '2.7.12 (5.6.0+dfsg-4, Nov 20 2016, 10:43:30)\n[PyPy 5.6.0 with GCC ...

With this commit on MicroPython we now have:

    MicroPython v1.18-371-g9d08eb024 on 2022-04-28; linux [GCC 11.2.0] v...
    Use Ctrl-D to exit, Ctrl-E for paste mode
    >>> import sys
    >>> sys.version
    '3.4.0; MicroPython v1.18-371-g9d08eb024 on 2022-04-28'

Note that the start of the banner is the same as the end of sys.version.
This helps to keep code size under control because the string can be reused
by the compiler.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/unix/main.c       | 4 ++--
 py/modsys.c             | 3 ++-
 py/mpconfig.h           | 5 +++++
 shared/runtime/pyexec.c | 6 ++++--
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/ports/unix/main.c b/ports/unix/main.c
index c2a6c8c6b90e6..ea3154860b859 100644
--- a/ports/unix/main.c
+++ b/ports/unix/main.c
@@ -178,8 +178,8 @@ STATIC char *strjoin(const char *s1, int sep_char, const char *s2) {
 #endif
 
 STATIC int do_repl(void) {
-    mp_hal_stdout_tx_str("MicroPython " MICROPY_GIT_TAG " on " MICROPY_BUILD_DATE "; "
-        MICROPY_PY_SYS_PLATFORM " [" MICROPY_PLATFORM_COMPILER "] version\n"
+    mp_hal_stdout_tx_str(MICROPY_BANNER_NAME_AND_VERSION);
+    mp_hal_stdout_tx_str("; " MICROPY_PY_SYS_PLATFORM " [" MICROPY_PLATFORM_COMPILER "] version\n"
         "Use Ctrl-D to exit, Ctrl-E for paste mode\n");
 
     #if MICROPY_USE_READLINE == 1
diff --git a/py/modsys.c b/py/modsys.c
index ac90776226165..bdc4d69733583 100644
--- a/py/modsys.c
+++ b/py/modsys.c
@@ -36,6 +36,7 @@
 #include "py/smallint.h"
 #include "py/runtime.h"
 #include "py/persistentcode.h"
+#include "genhdr/mpversion.h"
 
 #if MICROPY_PY_SYS_SETTRACE
 #include "py/objmodule.h"
@@ -54,7 +55,7 @@ const mp_print_t mp_sys_stdout_print = {&mp_sys_stdout_obj, mp_stream_write_adap
 #endif
 
 // version - Python language version that this implementation conforms to, as a string
-STATIC const MP_DEFINE_STR_OBJ(mp_sys_version_obj, "3.4.0");
+STATIC const MP_DEFINE_STR_OBJ(mp_sys_version_obj, "3.4.0; " MICROPY_BANNER_NAME_AND_VERSION);
 
 // version_info - Python language version that this implementation conforms to, as a tuple of ints
 #define I(n) MP_OBJ_NEW_SMALL_INT(n)
diff --git a/py/mpconfig.h b/py/mpconfig.h
index c308c31bda562..0b190a997b66a 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -1714,6 +1714,11 @@ typedef double mp_float_t;
 #define MICROPY_OBJ_BASE_ALIGNMENT
 #endif
 
+// String used for the banner, and sys.version additional information
+#ifndef MICROPY_BANNER_NAME_AND_VERSION
+#define MICROPY_BANNER_NAME_AND_VERSION "MicroPython " MICROPY_GIT_TAG " on " MICROPY_BUILD_DATE
+#endif
+
 // On embedded platforms, these will typically enable/disable irqs.
 #ifndef MICROPY_BEGIN_ATOMIC_SECTION
 #define MICROPY_BEGIN_ATOMIC_SECTION() (0)
diff --git a/shared/runtime/pyexec.c b/shared/runtime/pyexec.c
index 9fde987a4b5cf..eabf2f5673507 100644
--- a/shared/runtime/pyexec.c
+++ b/shared/runtime/pyexec.c
@@ -401,7 +401,8 @@ STATIC int pyexec_friendly_repl_process_char(int c) {
         } else if (ret == CHAR_CTRL_B) {
             // reset friendly REPL
             mp_hal_stdout_tx_str("\r\n");
-            mp_hal_stdout_tx_str("MicroPython " MICROPY_GIT_TAG " on " MICROPY_BUILD_DATE "; " MICROPY_HW_BOARD_NAME " with " MICROPY_HW_MCU_NAME "\r\n");
+            mp_hal_stdout_tx_str(MICROPY_BANNER_NAME_AND_VERSION);
+            mp_hal_stdout_tx_str("; " MICROPY_HW_BOARD_NAME " with " MICROPY_HW_MCU_NAME "\r\n");
             #if MICROPY_PY_BUILTINS_HELP
             mp_hal_stdout_tx_str("Type \"help()\" for more information.\r\n");
             #endif
@@ -552,7 +553,8 @@ int pyexec_friendly_repl(void) {
     vstr_init(&line, 32);
 
 friendly_repl_reset:
-    mp_hal_stdout_tx_str("MicroPython " MICROPY_GIT_TAG " on " MICROPY_BUILD_DATE "; " MICROPY_HW_BOARD_NAME " with " MICROPY_HW_MCU_NAME "\r\n");
+    mp_hal_stdout_tx_str(MICROPY_BANNER_NAME_AND_VERSION);
+    mp_hal_stdout_tx_str("; " MICROPY_HW_BOARD_NAME " with " MICROPY_HW_MCU_NAME "\r\n");
     #if MICROPY_PY_BUILTINS_HELP
     mp_hal_stdout_tx_str("Type \"help()\" for more information.\r\n");
     #endif

From 59c5d4161120db28bc6cbc7653f2e7fdb4a87370 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 26 Apr 2022 17:23:29 +1000
Subject: [PATCH 1971/3533] py/modsys: Rename sys.implementation.mpy to
 sys.implementation._mpy.

Per CPython docs, non-standard attributes must begin with an underscore.

Signed-off-by: Damien George <damien@micropython.org>
---
 docs/library/sys.rst        | 1 +
 docs/reference/mpyfiles.rst | 4 ++--
 py/modsys.c                 | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/docs/library/sys.rst b/docs/library/sys.rst
index a2d55fecbb033..1186af6134d27 100644
--- a/docs/library/sys.rst
+++ b/docs/library/sys.rst
@@ -70,6 +70,7 @@ Constants
 
    * *name* - string "micropython"
    * *version* - tuple (major, minor, micro), e.g. (1, 7, 0)
+   * *_mpy* - supported mpy file-format version (optional attribute)
 
    This object is the recommended way to distinguish MicroPython from other
    Python implementations (note that it still may not exist in the very
diff --git a/docs/reference/mpyfiles.rst b/docs/reference/mpyfiles.rst
index 6ba7389cf0654..9d6388741ecb9 100644
--- a/docs/reference/mpyfiles.rst
+++ b/docs/reference/mpyfiles.rst
@@ -44,7 +44,7 @@ Compatibility is based on the following:
   loading it must support execution of that architecture's code.
 
 If a MicroPython system supports importing .mpy files then the
-``sys.implementation.mpy`` field will exist and return an integer which
+``sys.implementation._mpy`` field will exist and return an integer which
 encodes the version (lower 8 bits), features and native architecture.
 
 Trying to import an .mpy file that fails one of the first four tests will
@@ -58,7 +58,7 @@ If importing an .mpy file fails then try the following:
   by executing::
 
     import sys
-    sys_mpy = sys.implementation.mpy
+    sys_mpy = sys.implementation._mpy
     arch = [None, 'x86', 'x64',
         'armv6', 'armv6m', 'armv7m', 'armv7em', 'armv7emsp', 'armv7emdp',
         'xtensa', 'xtensawin'][sys_mpy >> 10]
diff --git a/py/modsys.c b/py/modsys.c
index bdc4d69733583..12f3f00264b87 100644
--- a/py/modsys.c
+++ b/py/modsys.c
@@ -84,7 +84,7 @@ STATIC const qstr impl_fields[] = {
     MP_QSTR_name,
     MP_QSTR_version,
     #if MICROPY_PERSISTENT_CODE_LOAD
-    MP_QSTR_mpy,
+    MP_QSTR__mpy,
     #endif
 };
 STATIC MP_DEFINE_ATTRTUPLE(

From 402df833fe6da5233c83c58421e81493cda54f67 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 26 Apr 2022 17:28:39 +1000
Subject: [PATCH 1972/3533] py/modsys: Introduce sys.implementation._machine
 constant.

This contains a string useful for identifying the underlying machine.  This
string is kept consistent with the second part of the REPL banner via the
new config option MICROPY_BANNER_MACHINE.

This makes os.uname() more or less redundant, as all the information in
os.uname() is now available in the sys module.

Signed-off-by: Damien George <damien@micropython.org>
---
 docs/library/sys.rst    |  1 +
 ports/unix/main.c       |  4 ++--
 py/modsys.c             | 11 ++++++++---
 py/mpconfig.h           |  9 +++++++++
 shared/runtime/pyexec.c |  6 ++++--
 5 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/docs/library/sys.rst b/docs/library/sys.rst
index 1186af6134d27..3efdce964ce05 100644
--- a/docs/library/sys.rst
+++ b/docs/library/sys.rst
@@ -70,6 +70,7 @@ Constants
 
    * *name* - string "micropython"
    * *version* - tuple (major, minor, micro), e.g. (1, 7, 0)
+   * *_machine* - string describing the underlying machine
    * *_mpy* - supported mpy file-format version (optional attribute)
 
    This object is the recommended way to distinguish MicroPython from other
diff --git a/ports/unix/main.c b/ports/unix/main.c
index ea3154860b859..8d7fcf4843a60 100644
--- a/ports/unix/main.c
+++ b/ports/unix/main.c
@@ -179,8 +179,8 @@ STATIC char *strjoin(const char *s1, int sep_char, const char *s2) {
 
 STATIC int do_repl(void) {
     mp_hal_stdout_tx_str(MICROPY_BANNER_NAME_AND_VERSION);
-    mp_hal_stdout_tx_str("; " MICROPY_PY_SYS_PLATFORM " [" MICROPY_PLATFORM_COMPILER "] version\n"
-        "Use Ctrl-D to exit, Ctrl-E for paste mode\n");
+    mp_hal_stdout_tx_str("; " MICROPY_BANNER_MACHINE);
+    mp_hal_stdout_tx_str("\nUse Ctrl-D to exit, Ctrl-E for paste mode\n");
 
     #if MICROPY_USE_READLINE == 1
 
diff --git a/py/modsys.c b/py/modsys.c
index 12f3f00264b87..4ddc27fc51d29 100644
--- a/py/modsys.c
+++ b/py/modsys.c
@@ -36,6 +36,7 @@
 #include "py/smallint.h"
 #include "py/runtime.h"
 #include "py/persistentcode.h"
+#include "extmod/moduplatform.h"
 #include "genhdr/mpversion.h"
 
 #if MICROPY_PY_SYS_SETTRACE
@@ -69,20 +70,24 @@ STATIC const mp_obj_tuple_t mp_sys_implementation_version_info_obj = {
     3,
     { I(MICROPY_VERSION_MAJOR), I(MICROPY_VERSION_MINOR), I(MICROPY_VERSION_MICRO) }
 };
+STATIC const MP_DEFINE_STR_OBJ(mp_sys_implementation_machine_obj, MICROPY_BANNER_MACHINE);
 #if MICROPY_PERSISTENT_CODE_LOAD
 #define SYS_IMPLEMENTATION_ELEMS \
     MP_ROM_QSTR(MP_QSTR_micropython), \
     MP_ROM_PTR(&mp_sys_implementation_version_info_obj), \
+    MP_ROM_PTR(&mp_sys_implementation_machine_obj), \
     MP_ROM_INT(MPY_FILE_HEADER_INT)
 #else
 #define SYS_IMPLEMENTATION_ELEMS \
     MP_ROM_QSTR(MP_QSTR_micropython), \
-    MP_ROM_PTR(&mp_sys_implementation_version_info_obj)
+    MP_ROM_PTR(&mp_sys_implementation_version_info_obj), \
+    MP_ROM_PTR(&mp_sys_implementation_machine_obj)
 #endif
 #if MICROPY_PY_ATTRTUPLE
 STATIC const qstr impl_fields[] = {
     MP_QSTR_name,
     MP_QSTR_version,
+    MP_QSTR__machine,
     #if MICROPY_PERSISTENT_CODE_LOAD
     MP_QSTR__mpy,
     #endif
@@ -90,13 +95,13 @@ STATIC const qstr impl_fields[] = {
 STATIC MP_DEFINE_ATTRTUPLE(
     mp_sys_implementation_obj,
     impl_fields,
-    2 + MICROPY_PERSISTENT_CODE_LOAD,
+    3 + MICROPY_PERSISTENT_CODE_LOAD,
     SYS_IMPLEMENTATION_ELEMS
     );
 #else
 STATIC const mp_rom_obj_tuple_t mp_sys_implementation_obj = {
     {&mp_type_tuple},
-    2 + MICROPY_PERSISTENT_CODE_LOAD,
+    3 + MICROPY_PERSISTENT_CODE_LOAD,
     {
         SYS_IMPLEMENTATION_ELEMS
     }
diff --git a/py/mpconfig.h b/py/mpconfig.h
index 0b190a997b66a..b58cef309a317 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -1719,6 +1719,15 @@ typedef double mp_float_t;
 #define MICROPY_BANNER_NAME_AND_VERSION "MicroPython " MICROPY_GIT_TAG " on " MICROPY_BUILD_DATE
 #endif
 
+// String used for the second part of the banner, and sys.implementation._machine
+#ifndef MICROPY_BANNER_MACHINE
+#ifdef MICROPY_HW_BOARD_NAME
+#define MICROPY_BANNER_MACHINE MICROPY_HW_BOARD_NAME " with " MICROPY_HW_MCU_NAME
+#else
+#define MICROPY_BANNER_MACHINE MICROPY_PY_SYS_PLATFORM " [" MICROPY_PLATFORM_COMPILER "] version"
+#endif
+#endif
+
 // On embedded platforms, these will typically enable/disable irqs.
 #ifndef MICROPY_BEGIN_ATOMIC_SECTION
 #define MICROPY_BEGIN_ATOMIC_SECTION() (0)
diff --git a/shared/runtime/pyexec.c b/shared/runtime/pyexec.c
index eabf2f5673507..2763319c01b75 100644
--- a/shared/runtime/pyexec.c
+++ b/shared/runtime/pyexec.c
@@ -402,7 +402,8 @@ STATIC int pyexec_friendly_repl_process_char(int c) {
             // reset friendly REPL
             mp_hal_stdout_tx_str("\r\n");
             mp_hal_stdout_tx_str(MICROPY_BANNER_NAME_AND_VERSION);
-            mp_hal_stdout_tx_str("; " MICROPY_HW_BOARD_NAME " with " MICROPY_HW_MCU_NAME "\r\n");
+            mp_hal_stdout_tx_str("; " MICROPY_BANNER_MACHINE);
+            mp_hal_stdout_tx_str("\r\n");
             #if MICROPY_PY_BUILTINS_HELP
             mp_hal_stdout_tx_str("Type \"help()\" for more information.\r\n");
             #endif
@@ -554,7 +555,8 @@ int pyexec_friendly_repl(void) {
 
 friendly_repl_reset:
     mp_hal_stdout_tx_str(MICROPY_BANNER_NAME_AND_VERSION);
-    mp_hal_stdout_tx_str("; " MICROPY_HW_BOARD_NAME " with " MICROPY_HW_MCU_NAME "\r\n");
+    mp_hal_stdout_tx_str("; " MICROPY_BANNER_MACHINE);
+    mp_hal_stdout_tx_str("\r\n");
     #if MICROPY_PY_BUILTINS_HELP
     mp_hal_stdout_tx_str("Type \"help()\" for more information.\r\n");
     #endif

From 44186ef59b4b37d7b3fbebcfe7a5e4c2b78a70e7 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 28 Apr 2022 16:51:49 +1000
Subject: [PATCH 1973/3533] qemu-arm/mpconfigport: Define
 MICROPY_PY_SYS_PLATFORM.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/qemu-arm/mpconfigport.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/qemu-arm/mpconfigport.h b/ports/qemu-arm/mpconfigport.h
index cccfa1e180d73..879ad7eaaf56f 100644
--- a/ports/qemu-arm/mpconfigport.h
+++ b/ports/qemu-arm/mpconfigport.h
@@ -34,6 +34,7 @@
 #define MICROPY_PY_IO               (1)
 #define MICROPY_PY_SYS_EXIT         (1)
 #define MICROPY_PY_SYS_MAXSIZE      (1)
+#define MICROPY_PY_SYS_PLATFORM     "qemu-arm"
 #define MICROPY_PY_UERRNO           (1)
 #define MICROPY_PY_UBINASCII        (1)
 #define MICROPY_PY_URANDOM          (1)

From 4c9b00b4250a51b286305f43a88c1809908f3f89 Mon Sep 17 00:00:00 2001
From: TakeoTakahashi2020 <takeo.takahashi.xv@renesas.com>
Date: Mon, 15 Mar 2021 15:57:36 +0900
Subject: [PATCH 1974/3533] lib/fsp: Add renesas fsp git repository as
 submodule.

Signed-off-by: Takeo Takahashi <takeo.takahashi.xv@renesas.com>
---
 .gitmodules | 3 +++
 lib/fsp     | 1 +
 2 files changed, 4 insertions(+)
 create mode 160000 lib/fsp

diff --git a/.gitmodules b/.gitmodules
index d0b73e2ecf8e9..2d28230a8394a 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -42,3 +42,6 @@
 [submodule "lib/pico-sdk"]
 	path = lib/pico-sdk
 	url = https://github.com/raspberrypi/pico-sdk.git
+[submodule "lib/fsp"]
+	path = lib/fsp
+	url = https://github.com/renesas/fsp.git
diff --git a/lib/fsp b/lib/fsp
new file mode 160000
index 0000000000000..55bffd3a71cbe
--- /dev/null
+++ b/lib/fsp
@@ -0,0 +1 @@
+Subproject commit 55bffd3a71cbeed2104cf30e7a39b641d8c1ff48

From 0f57ccf7f2d396317b41cd90e0599fc7d4d182d8 Mon Sep 17 00:00:00 2001
From: Takeo Takahashi <takeo.takahashi.xv@renesas.com>
Date: Fri, 29 Apr 2022 10:49:44 +0900
Subject: [PATCH 1975/3533] renesas-ra: Add new port to Renesas RA.

Signed-off-by: Takeo Takahashi <takeo.takahashi.xv@renesas.com>
---
 ports/renesas-ra/Makefile                     |  540 ++++++++
 ports/renesas-ra/RA4M1_hal.h                  |  103 ++
 ports/renesas-ra/RA4W1_hal.h                  |  103 ++
 ports/renesas-ra/RA6M1_hal.h                  |  103 ++
 ports/renesas-ra/RA6M2_hal.h                  |  103 ++
 ports/renesas-ra/README.md                    |   81 ++
 ports/renesas-ra/boardctrl.c                  |  171 +++
 ports/renesas-ra/boardctrl.h                  |   93 ++
 .../boards/RA4M1_CLICKER/board.json           |   22 +
 .../boards/RA4M1_CLICKER/manifest.py          |    2 +
 .../boards/RA4M1_CLICKER/mpconfigboard.h      |   59 +
 .../boards/RA4M1_CLICKER/mpconfigboard.mk     |    9 +
 .../renesas-ra/boards/RA4M1_CLICKER/pins.csv  |   65 +
 .../boards/RA4M1_CLICKER/ra4m1_clicker.ld     |  298 ++++
 .../boards/RA4M1_CLICKER/ra4m1_clicker_conf.h |   30 +
 .../ra_cfg/fsp_cfg/bsp/board_cfg.h            |    5 +
 .../ra_cfg/fsp_cfg/bsp/bsp_cfg.h              |   49 +
 .../ra_cfg/fsp_cfg/bsp/bsp_mcu_device_cfg.h   |    5 +
 .../fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h       |   10 +
 .../ra_cfg/fsp_cfg/bsp/bsp_mcu_family_cfg.h   |   74 +
 .../RA4M1_CLICKER/ra_cfg/fsp_cfg/r_adc_cfg.h  |    5 +
 .../RA4M1_CLICKER/ra_cfg/fsp_cfg/r_agt_cfg.h  |    7 +
 .../RA4M1_CLICKER/ra_cfg/fsp_cfg/r_dtc_cfg.h  |    6 +
 .../ra_cfg/fsp_cfg/r_flash_lp_cfg.h           |    7 +
 .../RA4M1_CLICKER/ra_cfg/fsp_cfg/r_icu_cfg.h  |    5 +
 .../ra_cfg/fsp_cfg/r_iic_master_cfg.h         |    7 +
 .../ra_cfg/fsp_cfg/r_ioport_cfg.h             |    5 +
 .../RA4M1_CLICKER/ra_cfg/fsp_cfg/r_lpm_cfg.h  |    5 +
 .../RA4M1_CLICKER/ra_cfg/fsp_cfg/r_rtc_cfg.h  |    5 +
 .../ra_cfg/fsp_cfg/r_sci_uart_cfg.h           |    8 +
 .../RA4M1_CLICKER/ra_cfg/fsp_cfg/r_spi_cfg.h  |    7 +
 .../RA4M1_CLICKER/ra_gen/R7FA4M1AB3CFM.csv    |  352 +++++
 .../RA4M1_CLICKER/ra_gen/bsp_clock_cfg.h      |   21 +
 .../boards/RA4M1_CLICKER/ra_gen/bsp_pin_cfg.h |    7 +
 .../boards/RA4M1_CLICKER/ra_gen/common_data.c |    7 +
 .../boards/RA4M1_CLICKER/ra_gen/common_data.h |   16 +
 .../boards/RA4M1_CLICKER/ra_gen/hal_data.c    |  487 +++++++
 .../boards/RA4M1_CLICKER/ra_gen/hal_data.h    |  175 +++
 .../boards/RA4M1_CLICKER/ra_gen/main.c        |    6 +
 .../boards/RA4M1_CLICKER/ra_gen/pin_data.c    |   73 +
 .../boards/RA4M1_CLICKER/ra_gen/vector_data.c |   57 +
 .../boards/RA4M1_CLICKER/ra_gen/vector_data.h |   87 ++
 .../boards/RA4M1_CLICKER/src/hal_entry.c      |   58 +
 ports/renesas-ra/boards/RA4M1_EK/board.json   |   21 +
 ports/renesas-ra/boards/RA4M1_EK/manifest.py  |    2 +
 .../boards/RA4M1_EK/mpconfigboard.h           |   70 +
 .../boards/RA4M1_EK/mpconfigboard.mk          |    9 +
 ports/renesas-ra/boards/RA4M1_EK/pins.csv     |  104 ++
 ports/renesas-ra/boards/RA4M1_EK/ra4m1_ek.ld  |  298 ++++
 .../boards/RA4M1_EK/ra4m1_ek_conf.h           |   30 +
 .../RA4M1_EK/ra_cfg/fsp_cfg/bsp/board_cfg.h   |    5 +
 .../RA4M1_EK/ra_cfg/fsp_cfg/bsp/bsp_cfg.h     |   49 +
 .../ra_cfg/fsp_cfg/bsp/bsp_mcu_device_cfg.h   |    5 +
 .../fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h       |   10 +
 .../ra_cfg/fsp_cfg/bsp/bsp_mcu_family_cfg.h   |   74 +
 .../RA4M1_EK/ra_cfg/fsp_cfg/r_adc_cfg.h       |    5 +
 .../RA4M1_EK/ra_cfg/fsp_cfg/r_agt_cfg.h       |    7 +
 .../RA4M1_EK/ra_cfg/fsp_cfg/r_dtc_cfg.h       |    6 +
 .../RA4M1_EK/ra_cfg/fsp_cfg/r_flash_lp_cfg.h  |    7 +
 .../RA4M1_EK/ra_cfg/fsp_cfg/r_icu_cfg.h       |    5 +
 .../RA4M1_EK/ra_cfg/fsp_cfg/r_ioport_cfg.h    |    5 +
 .../RA4M1_EK/ra_cfg/fsp_cfg/r_lpm_cfg.h       |    5 +
 .../RA4M1_EK/ra_cfg/fsp_cfg/r_rtc_cfg.h       |    5 +
 .../RA4M1_EK/ra_cfg/fsp_cfg/r_sci_uart_cfg.h  |    8 +
 .../RA4M1_EK/ra_cfg/fsp_cfg/r_spi_cfg.h       |    7 +
 .../boards/RA4M1_EK/ra_gen/RA4M1-EK.csv       |  450 ++++++
 .../boards/RA4M1_EK/ra_gen/bsp_clock_cfg.h    |   21 +
 .../boards/RA4M1_EK/ra_gen/bsp_pin_cfg.h      |    7 +
 .../boards/RA4M1_EK/ra_gen/common_data.c      |    7 +
 .../boards/RA4M1_EK/ra_gen/common_data.h      |   16 +
 .../boards/RA4M1_EK/ra_gen/hal_data.c         |  471 +++++++
 .../boards/RA4M1_EK/ra_gen/hal_data.h         |  154 ++
 .../renesas-ra/boards/RA4M1_EK/ra_gen/main.c  |    6 +
 .../boards/RA4M1_EK/ra_gen/pin_data.c         |  105 ++
 .../boards/RA4M1_EK/ra_gen/vector_data.c      |   53 +
 .../boards/RA4M1_EK/ra_gen/vector_data.h      |   79 ++
 .../boards/RA4M1_EK/src/hal_entry.c           |   58 +
 ports/renesas-ra/boards/RA4W1_EK/board.json   |   21 +
 .../boards/RA4W1_EK/mpconfigboard.h           |   70 +
 .../boards/RA4W1_EK/mpconfigboard.mk          |    6 +
 ports/renesas-ra/boards/RA4W1_EK/pins.csv     |   67 +
 ports/renesas-ra/boards/RA4W1_EK/ra4w1_ek.ld  |  298 ++++
 .../boards/RA4W1_EK/ra4w1_ek_conf.h           |   30 +
 .../RA4W1_EK/ra_cfg/fsp_cfg/bsp/board_cfg.h   |    5 +
 .../RA4W1_EK/ra_cfg/fsp_cfg/bsp/bsp_cfg.h     |   49 +
 .../ra_cfg/fsp_cfg/bsp/bsp_mcu_device_cfg.h   |    5 +
 .../fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h       |   10 +
 .../ra_cfg/fsp_cfg/bsp/bsp_mcu_family_cfg.h   |   74 +
 .../RA4W1_EK/ra_cfg/fsp_cfg/r_adc_cfg.h       |    5 +
 .../RA4W1_EK/ra_cfg/fsp_cfg/r_agt_cfg.h       |    7 +
 .../RA4W1_EK/ra_cfg/fsp_cfg/r_dtc_cfg.h       |    6 +
 .../RA4W1_EK/ra_cfg/fsp_cfg/r_flash_lp_cfg.h  |    7 +
 .../RA4W1_EK/ra_cfg/fsp_cfg/r_icu_cfg.h       |    5 +
 .../ra_cfg/fsp_cfg/r_iic_master_cfg.h         |    7 +
 .../RA4W1_EK/ra_cfg/fsp_cfg/r_ioport_cfg.h    |    5 +
 .../RA4W1_EK/ra_cfg/fsp_cfg/r_lpm_cfg.h       |    5 +
 .../RA4W1_EK/ra_cfg/fsp_cfg/r_rtc_cfg.h       |    5 +
 .../RA4W1_EK/ra_cfg/fsp_cfg/r_sci_uart_cfg.h  |    8 +
 .../RA4W1_EK/ra_cfg/fsp_cfg/r_spi_cfg.h       |    7 +
 .../boards/RA4W1_EK/ra_gen/RA4W1-EK.csv       |  257 ++++
 .../boards/RA4W1_EK/ra_gen/bsp_clock_cfg.h    |   23 +
 .../boards/RA4W1_EK/ra_gen/bsp_pin_cfg.h      |    7 +
 .../boards/RA4W1_EK/ra_gen/common_data.c      |    7 +
 .../boards/RA4W1_EK/ra_gen/common_data.h      |   16 +
 .../boards/RA4W1_EK/ra_gen/hal_data.c         |  624 +++++++++
 .../boards/RA4W1_EK/ra_gen/hal_data.h         |  216 +++
 .../renesas-ra/boards/RA4W1_EK/ra_gen/main.c  |    6 +
 .../boards/RA4W1_EK/ra_gen/pin_data.c         |   69 +
 .../boards/RA4W1_EK/ra_gen/vector_data.c      |   71 +
 .../boards/RA4W1_EK/ra_gen/vector_data.h      |  101 ++
 .../boards/RA4W1_EK/src/hal_entry.c           |   59 +
 ports/renesas-ra/boards/RA6M1_EK/board.json   |   21 +
 .../boards/RA6M1_EK/mpconfigboard.h           |   75 +
 .../boards/RA6M1_EK/mpconfigboard.mk          |    6 +
 ports/renesas-ra/boards/RA6M1_EK/pins.csv     |   85 ++
 ports/renesas-ra/boards/RA6M1_EK/ra6m1_ek.ld  |  298 ++++
 .../boards/RA6M1_EK/ra6m1_ek_conf.h           |   30 +
 .../RA6M1_EK/ra_cfg/fsp_cfg/bsp/board_cfg.h   |    5 +
 .../RA6M1_EK/ra_cfg/fsp_cfg/bsp/bsp_cfg.h     |   49 +
 .../ra_cfg/fsp_cfg/bsp/bsp_mcu_device_cfg.h   |    5 +
 .../fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h       |   10 +
 .../ra_cfg/fsp_cfg/bsp/bsp_mcu_family_cfg.h   |   74 +
 .../RA6M1_EK/ra_cfg/fsp_cfg/r_adc_cfg.h       |    5 +
 .../RA6M1_EK/ra_cfg/fsp_cfg/r_agt_cfg.h       |    7 +
 .../RA6M1_EK/ra_cfg/fsp_cfg/r_dtc_cfg.h       |    6 +
 .../RA6M1_EK/ra_cfg/fsp_cfg/r_flash_hp_cfg.h  |    7 +
 .../RA6M1_EK/ra_cfg/fsp_cfg/r_icu_cfg.h       |    5 +
 .../ra_cfg/fsp_cfg/r_iic_master_cfg.h         |    7 +
 .../RA6M1_EK/ra_cfg/fsp_cfg/r_ioport_cfg.h    |    5 +
 .../RA6M1_EK/ra_cfg/fsp_cfg/r_lpm_cfg.h       |    5 +
 .../RA6M1_EK/ra_cfg/fsp_cfg/r_rtc_cfg.h       |    5 +
 .../RA6M1_EK/ra_cfg/fsp_cfg/r_sci_uart_cfg.h  |    8 +
 .../RA6M1_EK/ra_cfg/fsp_cfg/r_spi_cfg.h       |    7 +
 .../boards/RA6M1_EK/ra_gen/RA6M1-EK.csv       |  462 ++++++
 .../boards/RA6M1_EK/ra_gen/bsp_clock_cfg.h    |   23 +
 .../boards/RA6M1_EK/ra_gen/bsp_pin_cfg.h      |    7 +
 .../boards/RA6M1_EK/ra_gen/common_data.c      |    7 +
 .../boards/RA6M1_EK/ra_gen/common_data.h      |   16 +
 .../boards/RA6M1_EK/ra_gen/hal_data.c         |  834 +++++++++++
 .../boards/RA6M1_EK/ra_gen/hal_data.h         |  317 +++++
 .../renesas-ra/boards/RA6M1_EK/ra_gen/main.c  |    6 +
 .../boards/RA6M1_EK/ra_gen/pin_data.c         |  109 ++
 .../boards/RA6M1_EK/ra_gen/vector_data.c      |   89 ++
 .../boards/RA6M1_EK/ra_gen/vector_data.h      |  119 ++
 .../boards/RA6M1_EK/src/hal_entry.c           |   58 +
 ports/renesas-ra/boards/RA6M2_EK/board.json   |   25 +
 .../boards/RA6M2_EK/mpconfigboard.h           |   88 ++
 .../boards/RA6M2_EK/mpconfigboard.mk          |    6 +
 ports/renesas-ra/boards/RA6M2_EK/pins.csv     |  118 ++
 ports/renesas-ra/boards/RA6M2_EK/ra6m2_ek.ld  |  298 ++++
 .../boards/RA6M2_EK/ra6m2_ek_conf.h           |   30 +
 .../RA6M2_EK/ra_cfg/fsp_cfg/bsp/board_cfg.h   |    5 +
 .../RA6M2_EK/ra_cfg/fsp_cfg/bsp/bsp_cfg.h     |   49 +
 .../ra_cfg/fsp_cfg/bsp/bsp_mcu_device_cfg.h   |    5 +
 .../fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h       |   10 +
 .../ra_cfg/fsp_cfg/bsp/bsp_mcu_family_cfg.h   |   74 +
 .../RA6M2_EK/ra_cfg/fsp_cfg/r_adc_cfg.h       |    5 +
 .../RA6M2_EK/ra_cfg/fsp_cfg/r_agt_cfg.h       |    7 +
 .../RA6M2_EK/ra_cfg/fsp_cfg/r_dtc_cfg.h       |    6 +
 .../RA6M2_EK/ra_cfg/fsp_cfg/r_flash_hp_cfg.h  |    7 +
 .../RA6M2_EK/ra_cfg/fsp_cfg/r_icu_cfg.h       |    5 +
 .../ra_cfg/fsp_cfg/r_iic_master_cfg.h         |    7 +
 .../RA6M2_EK/ra_cfg/fsp_cfg/r_ioport_cfg.h    |    5 +
 .../RA6M2_EK/ra_cfg/fsp_cfg/r_lpm_cfg.h       |    5 +
 .../RA6M2_EK/ra_cfg/fsp_cfg/r_rtc_cfg.h       |    5 +
 .../RA6M2_EK/ra_cfg/fsp_cfg/r_sci_uart_cfg.h  |    8 +
 .../RA6M2_EK/ra_cfg/fsp_cfg/r_spi_cfg.h       |    7 +
 .../boards/RA6M2_EK/ra_gen/RA6M2-EK.csv       |  701 ++++++++++
 .../boards/RA6M2_EK/ra_gen/bsp_clock_cfg.h    |   24 +
 .../boards/RA6M2_EK/ra_gen/bsp_pin_cfg.h      |    7 +
 .../boards/RA6M2_EK/ra_gen/common_data.c      |    7 +
 .../boards/RA6M2_EK/ra_gen/common_data.h      |   16 +
 .../boards/RA6M2_EK/ra_gen/hal_data.c         |  983 +++++++++++++
 .../boards/RA6M2_EK/ra_gen/hal_data.h         |  373 +++++
 .../renesas-ra/boards/RA6M2_EK/ra_gen/main.c  |    6 +
 .../boards/RA6M2_EK/ra_gen/pin_data.c         |  117 ++
 .../boards/RA6M2_EK/ra_gen/vector_data.c      |   99 ++
 .../boards/RA6M2_EK/ra_gen/vector_data.h      |  129 ++
 .../boards/RA6M2_EK/src/hal_entry.c           |   58 +
 ports/renesas-ra/boards/deploy.md             |   22 +
 ports/renesas-ra/boards/make-pins.py          |  333 +++++
 ports/renesas-ra/boards/manifest.py           |    4 +
 ports/renesas-ra/boards/ra4m1_af.csv          |  161 +++
 ports/renesas-ra/boards/ra4w1_af.csv          |  161 +++
 ports/renesas-ra/boards/ra6m1_af.csv          |  163 +++
 ports/renesas-ra/boards/ra6m2_af.csv          |  161 +++
 ports/renesas-ra/boards/ra_pin_prefix.c       |   37 +
 ports/renesas-ra/build_all_boards.sh          |   26 +
 ports/renesas-ra/extint.c                     |  402 ++++++
 ports/renesas-ra/extint.h                     |   47 +
 ports/renesas-ra/factoryreset.c               |  111 ++
 ports/renesas-ra/factoryreset.h               |   34 +
 ports/renesas-ra/fatfs_port.c                 |   50 +
 ports/renesas-ra/flash.c                      |   58 +
 ports/renesas-ra/flash.h                      |   34 +
 ports/renesas-ra/flashbdev.c                  |  321 +++++
 ports/renesas-ra/gccollect.c                  |   71 +
 ports/renesas-ra/gccollect.h                  |   44 +
 ports/renesas-ra/help.c                       |   61 +
 ports/renesas-ra/irq.c                        |   59 +
 ports/renesas-ra/irq.h                        |  241 ++++
 ports/renesas-ra/led.c                        |  190 +++
 ports/renesas-ra/led.h                        |   44 +
 ports/renesas-ra/machine_adc.c                |  136 ++
 ports/renesas-ra/machine_i2c.c                |  180 +++
 ports/renesas-ra/machine_pin.c                |  642 +++++++++
 ports/renesas-ra/machine_rtc.c                |  349 +++++
 ports/renesas-ra/machine_spi.c                |  379 +++++
 ports/renesas-ra/machine_timer.c              |  145 ++
 ports/renesas-ra/machine_uart.c               |  583 ++++++++
 ports/renesas-ra/main.c                       |  399 ++++++
 ports/renesas-ra/modmachine.c                 |  304 ++++
 ports/renesas-ra/modmachine.h                 |   68 +
 ports/renesas-ra/moduos.c                     |   62 +
 ports/renesas-ra/modutime.c                   |  158 +++
 ports/renesas-ra/mpconfigboard_common.h       |  244 ++++
 ports/renesas-ra/mpconfigport.h               |  303 ++++
 ports/renesas-ra/mpconfigport.mk              |    4 +
 ports/renesas-ra/mphalport.c                  |  120 ++
 ports/renesas-ra/mphalport.h                  |   98 ++
 ports/renesas-ra/mpthreadport.c               |   93 ++
 ports/renesas-ra/mpthreadport.h               |   53 +
 ports/renesas-ra/pendsv.c                     |  184 +++
 ports/renesas-ra/pendsv.h                     |   54 +
 ports/renesas-ra/pin.h                        |   98 ++
 ports/renesas-ra/powerctrl.c                  |  304 ++++
 ports/renesas-ra/powerctrl.h                  |   42 +
 ports/renesas-ra/powerctrlboot.c              |   36 +
 ports/renesas-ra/pybthread.c                  |  237 ++++
 ports/renesas-ra/pybthread.h                  |   77 +
 ports/renesas-ra/qstrdefsport.h               |   44 +
 ports/renesas-ra/ra/ra_adc.c                  |  556 ++++++++
 ports/renesas-ra/ra/ra_adc.h                  |  186 +++
 ports/renesas-ra/ra/ra_config.h               |  103 ++
 ports/renesas-ra/ra/ra_flash.c                |  298 ++++
 ports/renesas-ra/ra/ra_flash.h                |   57 +
 ports/renesas-ra/ra/ra_gpio.c                 |  176 +++
 ports/renesas-ra/ra/ra_gpio.h                 |  187 +++
 ports/renesas-ra/ra/ra_i2c.c                  |  603 ++++++++
 ports/renesas-ra/ra/ra_i2c.h                  |   99 ++
 ports/renesas-ra/ra/ra_icu.c                  |  750 ++++++++++
 ports/renesas-ra/ra/ra_icu.h                  |   58 +
 ports/renesas-ra/ra/ra_init.c                 |   39 +
 ports/renesas-ra/ra/ra_init.h                 |   31 +
 ports/renesas-ra/ra/ra_int.c                  |  273 ++++
 ports/renesas-ra/ra/ra_int.h                  |   42 +
 ports/renesas-ra/ra/ra_rtc.c                  |  430 ++++++
 ports/renesas-ra/ra/ra_rtc.h                  |   70 +
 ports/renesas-ra/ra/ra_sci.c                  | 1233 +++++++++++++++++
 ports/renesas-ra/ra/ra_sci.h                  |   72 +
 ports/renesas-ra/ra/ra_spi.c                  |  457 ++++++
 ports/renesas-ra/ra/ra_spi.h                  |   63 +
 ports/renesas-ra/ra/ra_timer.c                |  155 +++
 ports/renesas-ra/ra/ra_timer.h                |   53 +
 ports/renesas-ra/ra/ra_utils.c                |   90 ++
 ports/renesas-ra/ra/ra_utils.h                |   56 +
 ports/renesas-ra/ra_it.c                      |  244 ++++
 ports/renesas-ra/ra_it.h                      |   42 +
 ports/renesas-ra/rtc.h                        |   69 +
 ports/renesas-ra/softtimer.c                  |  148 ++
 ports/renesas-ra/softtimer.h                  |   66 +
 ports/renesas-ra/spi.h                        |   44 +
 ports/renesas-ra/storage.c                    |  429 ++++++
 ports/renesas-ra/storage.h                    |   67 +
 ports/renesas-ra/systick.c                    |  187 +++
 ports/renesas-ra/systick.h                    |   60 +
 ports/renesas-ra/timer.c                      |  569 ++++++++
 ports/renesas-ra/timer.h                      |   36 +
 ports/renesas-ra/uart.c                       |  514 +++++++
 ports/renesas-ra/uart.h                       |  115 ++
 ports/renesas-ra/usrsw.c                      |  147 ++
 ports/renesas-ra/usrsw.h                      |   34 +
 272 files changed, 30866 insertions(+)
 create mode 100644 ports/renesas-ra/Makefile
 create mode 100644 ports/renesas-ra/RA4M1_hal.h
 create mode 100644 ports/renesas-ra/RA4W1_hal.h
 create mode 100644 ports/renesas-ra/RA6M1_hal.h
 create mode 100644 ports/renesas-ra/RA6M2_hal.h
 create mode 100644 ports/renesas-ra/README.md
 create mode 100644 ports/renesas-ra/boardctrl.c
 create mode 100644 ports/renesas-ra/boardctrl.h
 create mode 100644 ports/renesas-ra/boards/RA4M1_CLICKER/board.json
 create mode 100644 ports/renesas-ra/boards/RA4M1_CLICKER/manifest.py
 create mode 100644 ports/renesas-ra/boards/RA4M1_CLICKER/mpconfigboard.h
 create mode 100644 ports/renesas-ra/boards/RA4M1_CLICKER/mpconfigboard.mk
 create mode 100644 ports/renesas-ra/boards/RA4M1_CLICKER/pins.csv
 create mode 100644 ports/renesas-ra/boards/RA4M1_CLICKER/ra4m1_clicker.ld
 create mode 100644 ports/renesas-ra/boards/RA4M1_CLICKER/ra4m1_clicker_conf.h
 create mode 100644 ports/renesas-ra/boards/RA4M1_CLICKER/ra_cfg/fsp_cfg/bsp/board_cfg.h
 create mode 100644 ports/renesas-ra/boards/RA4M1_CLICKER/ra_cfg/fsp_cfg/bsp/bsp_cfg.h
 create mode 100644 ports/renesas-ra/boards/RA4M1_CLICKER/ra_cfg/fsp_cfg/bsp/bsp_mcu_device_cfg.h
 create mode 100644 ports/renesas-ra/boards/RA4M1_CLICKER/ra_cfg/fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h
 create mode 100644 ports/renesas-ra/boards/RA4M1_CLICKER/ra_cfg/fsp_cfg/bsp/bsp_mcu_family_cfg.h
 create mode 100644 ports/renesas-ra/boards/RA4M1_CLICKER/ra_cfg/fsp_cfg/r_adc_cfg.h
 create mode 100644 ports/renesas-ra/boards/RA4M1_CLICKER/ra_cfg/fsp_cfg/r_agt_cfg.h
 create mode 100644 ports/renesas-ra/boards/RA4M1_CLICKER/ra_cfg/fsp_cfg/r_dtc_cfg.h
 create mode 100644 ports/renesas-ra/boards/RA4M1_CLICKER/ra_cfg/fsp_cfg/r_flash_lp_cfg.h
 create mode 100644 ports/renesas-ra/boards/RA4M1_CLICKER/ra_cfg/fsp_cfg/r_icu_cfg.h
 create mode 100644 ports/renesas-ra/boards/RA4M1_CLICKER/ra_cfg/fsp_cfg/r_iic_master_cfg.h
 create mode 100644 ports/renesas-ra/boards/RA4M1_CLICKER/ra_cfg/fsp_cfg/r_ioport_cfg.h
 create mode 100644 ports/renesas-ra/boards/RA4M1_CLICKER/ra_cfg/fsp_cfg/r_lpm_cfg.h
 create mode 100644 ports/renesas-ra/boards/RA4M1_CLICKER/ra_cfg/fsp_cfg/r_rtc_cfg.h
 create mode 100644 ports/renesas-ra/boards/RA4M1_CLICKER/ra_cfg/fsp_cfg/r_sci_uart_cfg.h
 create mode 100644 ports/renesas-ra/boards/RA4M1_CLICKER/ra_cfg/fsp_cfg/r_spi_cfg.h
 create mode 100644 ports/renesas-ra/boards/RA4M1_CLICKER/ra_gen/R7FA4M1AB3CFM.csv
 create mode 100644 ports/renesas-ra/boards/RA4M1_CLICKER/ra_gen/bsp_clock_cfg.h
 create mode 100644 ports/renesas-ra/boards/RA4M1_CLICKER/ra_gen/bsp_pin_cfg.h
 create mode 100644 ports/renesas-ra/boards/RA4M1_CLICKER/ra_gen/common_data.c
 create mode 100644 ports/renesas-ra/boards/RA4M1_CLICKER/ra_gen/common_data.h
 create mode 100644 ports/renesas-ra/boards/RA4M1_CLICKER/ra_gen/hal_data.c
 create mode 100644 ports/renesas-ra/boards/RA4M1_CLICKER/ra_gen/hal_data.h
 create mode 100644 ports/renesas-ra/boards/RA4M1_CLICKER/ra_gen/main.c
 create mode 100644 ports/renesas-ra/boards/RA4M1_CLICKER/ra_gen/pin_data.c
 create mode 100644 ports/renesas-ra/boards/RA4M1_CLICKER/ra_gen/vector_data.c
 create mode 100644 ports/renesas-ra/boards/RA4M1_CLICKER/ra_gen/vector_data.h
 create mode 100644 ports/renesas-ra/boards/RA4M1_CLICKER/src/hal_entry.c
 create mode 100644 ports/renesas-ra/boards/RA4M1_EK/board.json
 create mode 100644 ports/renesas-ra/boards/RA4M1_EK/manifest.py
 create mode 100644 ports/renesas-ra/boards/RA4M1_EK/mpconfigboard.h
 create mode 100644 ports/renesas-ra/boards/RA4M1_EK/mpconfigboard.mk
 create mode 100644 ports/renesas-ra/boards/RA4M1_EK/pins.csv
 create mode 100644 ports/renesas-ra/boards/RA4M1_EK/ra4m1_ek.ld
 create mode 100644 ports/renesas-ra/boards/RA4M1_EK/ra4m1_ek_conf.h
 create mode 100644 ports/renesas-ra/boards/RA4M1_EK/ra_cfg/fsp_cfg/bsp/board_cfg.h
 create mode 100644 ports/renesas-ra/boards/RA4M1_EK/ra_cfg/fsp_cfg/bsp/bsp_cfg.h
 create mode 100644 ports/renesas-ra/boards/RA4M1_EK/ra_cfg/fsp_cfg/bsp/bsp_mcu_device_cfg.h
 create mode 100644 ports/renesas-ra/boards/RA4M1_EK/ra_cfg/fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h
 create mode 100644 ports/renesas-ra/boards/RA4M1_EK/ra_cfg/fsp_cfg/bsp/bsp_mcu_family_cfg.h
 create mode 100644 ports/renesas-ra/boards/RA4M1_EK/ra_cfg/fsp_cfg/r_adc_cfg.h
 create mode 100644 ports/renesas-ra/boards/RA4M1_EK/ra_cfg/fsp_cfg/r_agt_cfg.h
 create mode 100644 ports/renesas-ra/boards/RA4M1_EK/ra_cfg/fsp_cfg/r_dtc_cfg.h
 create mode 100644 ports/renesas-ra/boards/RA4M1_EK/ra_cfg/fsp_cfg/r_flash_lp_cfg.h
 create mode 100644 ports/renesas-ra/boards/RA4M1_EK/ra_cfg/fsp_cfg/r_icu_cfg.h
 create mode 100644 ports/renesas-ra/boards/RA4M1_EK/ra_cfg/fsp_cfg/r_ioport_cfg.h
 create mode 100644 ports/renesas-ra/boards/RA4M1_EK/ra_cfg/fsp_cfg/r_lpm_cfg.h
 create mode 100644 ports/renesas-ra/boards/RA4M1_EK/ra_cfg/fsp_cfg/r_rtc_cfg.h
 create mode 100644 ports/renesas-ra/boards/RA4M1_EK/ra_cfg/fsp_cfg/r_sci_uart_cfg.h
 create mode 100644 ports/renesas-ra/boards/RA4M1_EK/ra_cfg/fsp_cfg/r_spi_cfg.h
 create mode 100644 ports/renesas-ra/boards/RA4M1_EK/ra_gen/RA4M1-EK.csv
 create mode 100644 ports/renesas-ra/boards/RA4M1_EK/ra_gen/bsp_clock_cfg.h
 create mode 100644 ports/renesas-ra/boards/RA4M1_EK/ra_gen/bsp_pin_cfg.h
 create mode 100644 ports/renesas-ra/boards/RA4M1_EK/ra_gen/common_data.c
 create mode 100644 ports/renesas-ra/boards/RA4M1_EK/ra_gen/common_data.h
 create mode 100644 ports/renesas-ra/boards/RA4M1_EK/ra_gen/hal_data.c
 create mode 100644 ports/renesas-ra/boards/RA4M1_EK/ra_gen/hal_data.h
 create mode 100644 ports/renesas-ra/boards/RA4M1_EK/ra_gen/main.c
 create mode 100644 ports/renesas-ra/boards/RA4M1_EK/ra_gen/pin_data.c
 create mode 100644 ports/renesas-ra/boards/RA4M1_EK/ra_gen/vector_data.c
 create mode 100644 ports/renesas-ra/boards/RA4M1_EK/ra_gen/vector_data.h
 create mode 100644 ports/renesas-ra/boards/RA4M1_EK/src/hal_entry.c
 create mode 100644 ports/renesas-ra/boards/RA4W1_EK/board.json
 create mode 100644 ports/renesas-ra/boards/RA4W1_EK/mpconfigboard.h
 create mode 100644 ports/renesas-ra/boards/RA4W1_EK/mpconfigboard.mk
 create mode 100644 ports/renesas-ra/boards/RA4W1_EK/pins.csv
 create mode 100644 ports/renesas-ra/boards/RA4W1_EK/ra4w1_ek.ld
 create mode 100644 ports/renesas-ra/boards/RA4W1_EK/ra4w1_ek_conf.h
 create mode 100644 ports/renesas-ra/boards/RA4W1_EK/ra_cfg/fsp_cfg/bsp/board_cfg.h
 create mode 100644 ports/renesas-ra/boards/RA4W1_EK/ra_cfg/fsp_cfg/bsp/bsp_cfg.h
 create mode 100644 ports/renesas-ra/boards/RA4W1_EK/ra_cfg/fsp_cfg/bsp/bsp_mcu_device_cfg.h
 create mode 100644 ports/renesas-ra/boards/RA4W1_EK/ra_cfg/fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h
 create mode 100644 ports/renesas-ra/boards/RA4W1_EK/ra_cfg/fsp_cfg/bsp/bsp_mcu_family_cfg.h
 create mode 100644 ports/renesas-ra/boards/RA4W1_EK/ra_cfg/fsp_cfg/r_adc_cfg.h
 create mode 100644 ports/renesas-ra/boards/RA4W1_EK/ra_cfg/fsp_cfg/r_agt_cfg.h
 create mode 100644 ports/renesas-ra/boards/RA4W1_EK/ra_cfg/fsp_cfg/r_dtc_cfg.h
 create mode 100644 ports/renesas-ra/boards/RA4W1_EK/ra_cfg/fsp_cfg/r_flash_lp_cfg.h
 create mode 100644 ports/renesas-ra/boards/RA4W1_EK/ra_cfg/fsp_cfg/r_icu_cfg.h
 create mode 100644 ports/renesas-ra/boards/RA4W1_EK/ra_cfg/fsp_cfg/r_iic_master_cfg.h
 create mode 100644 ports/renesas-ra/boards/RA4W1_EK/ra_cfg/fsp_cfg/r_ioport_cfg.h
 create mode 100644 ports/renesas-ra/boards/RA4W1_EK/ra_cfg/fsp_cfg/r_lpm_cfg.h
 create mode 100644 ports/renesas-ra/boards/RA4W1_EK/ra_cfg/fsp_cfg/r_rtc_cfg.h
 create mode 100644 ports/renesas-ra/boards/RA4W1_EK/ra_cfg/fsp_cfg/r_sci_uart_cfg.h
 create mode 100644 ports/renesas-ra/boards/RA4W1_EK/ra_cfg/fsp_cfg/r_spi_cfg.h
 create mode 100644 ports/renesas-ra/boards/RA4W1_EK/ra_gen/RA4W1-EK.csv
 create mode 100644 ports/renesas-ra/boards/RA4W1_EK/ra_gen/bsp_clock_cfg.h
 create mode 100644 ports/renesas-ra/boards/RA4W1_EK/ra_gen/bsp_pin_cfg.h
 create mode 100644 ports/renesas-ra/boards/RA4W1_EK/ra_gen/common_data.c
 create mode 100644 ports/renesas-ra/boards/RA4W1_EK/ra_gen/common_data.h
 create mode 100644 ports/renesas-ra/boards/RA4W1_EK/ra_gen/hal_data.c
 create mode 100644 ports/renesas-ra/boards/RA4W1_EK/ra_gen/hal_data.h
 create mode 100644 ports/renesas-ra/boards/RA4W1_EK/ra_gen/main.c
 create mode 100644 ports/renesas-ra/boards/RA4W1_EK/ra_gen/pin_data.c
 create mode 100644 ports/renesas-ra/boards/RA4W1_EK/ra_gen/vector_data.c
 create mode 100644 ports/renesas-ra/boards/RA4W1_EK/ra_gen/vector_data.h
 create mode 100644 ports/renesas-ra/boards/RA4W1_EK/src/hal_entry.c
 create mode 100644 ports/renesas-ra/boards/RA6M1_EK/board.json
 create mode 100644 ports/renesas-ra/boards/RA6M1_EK/mpconfigboard.h
 create mode 100644 ports/renesas-ra/boards/RA6M1_EK/mpconfigboard.mk
 create mode 100644 ports/renesas-ra/boards/RA6M1_EK/pins.csv
 create mode 100644 ports/renesas-ra/boards/RA6M1_EK/ra6m1_ek.ld
 create mode 100644 ports/renesas-ra/boards/RA6M1_EK/ra6m1_ek_conf.h
 create mode 100644 ports/renesas-ra/boards/RA6M1_EK/ra_cfg/fsp_cfg/bsp/board_cfg.h
 create mode 100644 ports/renesas-ra/boards/RA6M1_EK/ra_cfg/fsp_cfg/bsp/bsp_cfg.h
 create mode 100644 ports/renesas-ra/boards/RA6M1_EK/ra_cfg/fsp_cfg/bsp/bsp_mcu_device_cfg.h
 create mode 100644 ports/renesas-ra/boards/RA6M1_EK/ra_cfg/fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h
 create mode 100644 ports/renesas-ra/boards/RA6M1_EK/ra_cfg/fsp_cfg/bsp/bsp_mcu_family_cfg.h
 create mode 100644 ports/renesas-ra/boards/RA6M1_EK/ra_cfg/fsp_cfg/r_adc_cfg.h
 create mode 100644 ports/renesas-ra/boards/RA6M1_EK/ra_cfg/fsp_cfg/r_agt_cfg.h
 create mode 100644 ports/renesas-ra/boards/RA6M1_EK/ra_cfg/fsp_cfg/r_dtc_cfg.h
 create mode 100644 ports/renesas-ra/boards/RA6M1_EK/ra_cfg/fsp_cfg/r_flash_hp_cfg.h
 create mode 100644 ports/renesas-ra/boards/RA6M1_EK/ra_cfg/fsp_cfg/r_icu_cfg.h
 create mode 100644 ports/renesas-ra/boards/RA6M1_EK/ra_cfg/fsp_cfg/r_iic_master_cfg.h
 create mode 100644 ports/renesas-ra/boards/RA6M1_EK/ra_cfg/fsp_cfg/r_ioport_cfg.h
 create mode 100644 ports/renesas-ra/boards/RA6M1_EK/ra_cfg/fsp_cfg/r_lpm_cfg.h
 create mode 100644 ports/renesas-ra/boards/RA6M1_EK/ra_cfg/fsp_cfg/r_rtc_cfg.h
 create mode 100644 ports/renesas-ra/boards/RA6M1_EK/ra_cfg/fsp_cfg/r_sci_uart_cfg.h
 create mode 100644 ports/renesas-ra/boards/RA6M1_EK/ra_cfg/fsp_cfg/r_spi_cfg.h
 create mode 100644 ports/renesas-ra/boards/RA6M1_EK/ra_gen/RA6M1-EK.csv
 create mode 100644 ports/renesas-ra/boards/RA6M1_EK/ra_gen/bsp_clock_cfg.h
 create mode 100644 ports/renesas-ra/boards/RA6M1_EK/ra_gen/bsp_pin_cfg.h
 create mode 100644 ports/renesas-ra/boards/RA6M1_EK/ra_gen/common_data.c
 create mode 100644 ports/renesas-ra/boards/RA6M1_EK/ra_gen/common_data.h
 create mode 100644 ports/renesas-ra/boards/RA6M1_EK/ra_gen/hal_data.c
 create mode 100644 ports/renesas-ra/boards/RA6M1_EK/ra_gen/hal_data.h
 create mode 100644 ports/renesas-ra/boards/RA6M1_EK/ra_gen/main.c
 create mode 100644 ports/renesas-ra/boards/RA6M1_EK/ra_gen/pin_data.c
 create mode 100644 ports/renesas-ra/boards/RA6M1_EK/ra_gen/vector_data.c
 create mode 100644 ports/renesas-ra/boards/RA6M1_EK/ra_gen/vector_data.h
 create mode 100644 ports/renesas-ra/boards/RA6M1_EK/src/hal_entry.c
 create mode 100644 ports/renesas-ra/boards/RA6M2_EK/board.json
 create mode 100644 ports/renesas-ra/boards/RA6M2_EK/mpconfigboard.h
 create mode 100644 ports/renesas-ra/boards/RA6M2_EK/mpconfigboard.mk
 create mode 100644 ports/renesas-ra/boards/RA6M2_EK/pins.csv
 create mode 100644 ports/renesas-ra/boards/RA6M2_EK/ra6m2_ek.ld
 create mode 100644 ports/renesas-ra/boards/RA6M2_EK/ra6m2_ek_conf.h
 create mode 100644 ports/renesas-ra/boards/RA6M2_EK/ra_cfg/fsp_cfg/bsp/board_cfg.h
 create mode 100644 ports/renesas-ra/boards/RA6M2_EK/ra_cfg/fsp_cfg/bsp/bsp_cfg.h
 create mode 100644 ports/renesas-ra/boards/RA6M2_EK/ra_cfg/fsp_cfg/bsp/bsp_mcu_device_cfg.h
 create mode 100644 ports/renesas-ra/boards/RA6M2_EK/ra_cfg/fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h
 create mode 100644 ports/renesas-ra/boards/RA6M2_EK/ra_cfg/fsp_cfg/bsp/bsp_mcu_family_cfg.h
 create mode 100644 ports/renesas-ra/boards/RA6M2_EK/ra_cfg/fsp_cfg/r_adc_cfg.h
 create mode 100644 ports/renesas-ra/boards/RA6M2_EK/ra_cfg/fsp_cfg/r_agt_cfg.h
 create mode 100644 ports/renesas-ra/boards/RA6M2_EK/ra_cfg/fsp_cfg/r_dtc_cfg.h
 create mode 100644 ports/renesas-ra/boards/RA6M2_EK/ra_cfg/fsp_cfg/r_flash_hp_cfg.h
 create mode 100644 ports/renesas-ra/boards/RA6M2_EK/ra_cfg/fsp_cfg/r_icu_cfg.h
 create mode 100644 ports/renesas-ra/boards/RA6M2_EK/ra_cfg/fsp_cfg/r_iic_master_cfg.h
 create mode 100644 ports/renesas-ra/boards/RA6M2_EK/ra_cfg/fsp_cfg/r_ioport_cfg.h
 create mode 100644 ports/renesas-ra/boards/RA6M2_EK/ra_cfg/fsp_cfg/r_lpm_cfg.h
 create mode 100644 ports/renesas-ra/boards/RA6M2_EK/ra_cfg/fsp_cfg/r_rtc_cfg.h
 create mode 100644 ports/renesas-ra/boards/RA6M2_EK/ra_cfg/fsp_cfg/r_sci_uart_cfg.h
 create mode 100644 ports/renesas-ra/boards/RA6M2_EK/ra_cfg/fsp_cfg/r_spi_cfg.h
 create mode 100644 ports/renesas-ra/boards/RA6M2_EK/ra_gen/RA6M2-EK.csv
 create mode 100644 ports/renesas-ra/boards/RA6M2_EK/ra_gen/bsp_clock_cfg.h
 create mode 100644 ports/renesas-ra/boards/RA6M2_EK/ra_gen/bsp_pin_cfg.h
 create mode 100644 ports/renesas-ra/boards/RA6M2_EK/ra_gen/common_data.c
 create mode 100644 ports/renesas-ra/boards/RA6M2_EK/ra_gen/common_data.h
 create mode 100644 ports/renesas-ra/boards/RA6M2_EK/ra_gen/hal_data.c
 create mode 100644 ports/renesas-ra/boards/RA6M2_EK/ra_gen/hal_data.h
 create mode 100644 ports/renesas-ra/boards/RA6M2_EK/ra_gen/main.c
 create mode 100644 ports/renesas-ra/boards/RA6M2_EK/ra_gen/pin_data.c
 create mode 100644 ports/renesas-ra/boards/RA6M2_EK/ra_gen/vector_data.c
 create mode 100644 ports/renesas-ra/boards/RA6M2_EK/ra_gen/vector_data.h
 create mode 100644 ports/renesas-ra/boards/RA6M2_EK/src/hal_entry.c
 create mode 100644 ports/renesas-ra/boards/deploy.md
 create mode 100644 ports/renesas-ra/boards/make-pins.py
 create mode 100644 ports/renesas-ra/boards/manifest.py
 create mode 100644 ports/renesas-ra/boards/ra4m1_af.csv
 create mode 100644 ports/renesas-ra/boards/ra4w1_af.csv
 create mode 100644 ports/renesas-ra/boards/ra6m1_af.csv
 create mode 100644 ports/renesas-ra/boards/ra6m2_af.csv
 create mode 100644 ports/renesas-ra/boards/ra_pin_prefix.c
 create mode 100644 ports/renesas-ra/build_all_boards.sh
 create mode 100644 ports/renesas-ra/extint.c
 create mode 100644 ports/renesas-ra/extint.h
 create mode 100644 ports/renesas-ra/factoryreset.c
 create mode 100644 ports/renesas-ra/factoryreset.h
 create mode 100644 ports/renesas-ra/fatfs_port.c
 create mode 100644 ports/renesas-ra/flash.c
 create mode 100644 ports/renesas-ra/flash.h
 create mode 100644 ports/renesas-ra/flashbdev.c
 create mode 100644 ports/renesas-ra/gccollect.c
 create mode 100644 ports/renesas-ra/gccollect.h
 create mode 100644 ports/renesas-ra/help.c
 create mode 100644 ports/renesas-ra/irq.c
 create mode 100644 ports/renesas-ra/irq.h
 create mode 100644 ports/renesas-ra/led.c
 create mode 100644 ports/renesas-ra/led.h
 create mode 100644 ports/renesas-ra/machine_adc.c
 create mode 100644 ports/renesas-ra/machine_i2c.c
 create mode 100644 ports/renesas-ra/machine_pin.c
 create mode 100644 ports/renesas-ra/machine_rtc.c
 create mode 100644 ports/renesas-ra/machine_spi.c
 create mode 100644 ports/renesas-ra/machine_timer.c
 create mode 100644 ports/renesas-ra/machine_uart.c
 create mode 100644 ports/renesas-ra/main.c
 create mode 100644 ports/renesas-ra/modmachine.c
 create mode 100644 ports/renesas-ra/modmachine.h
 create mode 100644 ports/renesas-ra/moduos.c
 create mode 100644 ports/renesas-ra/modutime.c
 create mode 100644 ports/renesas-ra/mpconfigboard_common.h
 create mode 100644 ports/renesas-ra/mpconfigport.h
 create mode 100644 ports/renesas-ra/mpconfigport.mk
 create mode 100644 ports/renesas-ra/mphalport.c
 create mode 100644 ports/renesas-ra/mphalport.h
 create mode 100644 ports/renesas-ra/mpthreadport.c
 create mode 100644 ports/renesas-ra/mpthreadport.h
 create mode 100644 ports/renesas-ra/pendsv.c
 create mode 100644 ports/renesas-ra/pendsv.h
 create mode 100644 ports/renesas-ra/pin.h
 create mode 100644 ports/renesas-ra/powerctrl.c
 create mode 100644 ports/renesas-ra/powerctrl.h
 create mode 100644 ports/renesas-ra/powerctrlboot.c
 create mode 100644 ports/renesas-ra/pybthread.c
 create mode 100644 ports/renesas-ra/pybthread.h
 create mode 100644 ports/renesas-ra/qstrdefsport.h
 create mode 100644 ports/renesas-ra/ra/ra_adc.c
 create mode 100644 ports/renesas-ra/ra/ra_adc.h
 create mode 100644 ports/renesas-ra/ra/ra_config.h
 create mode 100644 ports/renesas-ra/ra/ra_flash.c
 create mode 100644 ports/renesas-ra/ra/ra_flash.h
 create mode 100644 ports/renesas-ra/ra/ra_gpio.c
 create mode 100644 ports/renesas-ra/ra/ra_gpio.h
 create mode 100644 ports/renesas-ra/ra/ra_i2c.c
 create mode 100644 ports/renesas-ra/ra/ra_i2c.h
 create mode 100644 ports/renesas-ra/ra/ra_icu.c
 create mode 100644 ports/renesas-ra/ra/ra_icu.h
 create mode 100644 ports/renesas-ra/ra/ra_init.c
 create mode 100644 ports/renesas-ra/ra/ra_init.h
 create mode 100644 ports/renesas-ra/ra/ra_int.c
 create mode 100644 ports/renesas-ra/ra/ra_int.h
 create mode 100644 ports/renesas-ra/ra/ra_rtc.c
 create mode 100644 ports/renesas-ra/ra/ra_rtc.h
 create mode 100644 ports/renesas-ra/ra/ra_sci.c
 create mode 100644 ports/renesas-ra/ra/ra_sci.h
 create mode 100644 ports/renesas-ra/ra/ra_spi.c
 create mode 100644 ports/renesas-ra/ra/ra_spi.h
 create mode 100644 ports/renesas-ra/ra/ra_timer.c
 create mode 100644 ports/renesas-ra/ra/ra_timer.h
 create mode 100644 ports/renesas-ra/ra/ra_utils.c
 create mode 100644 ports/renesas-ra/ra/ra_utils.h
 create mode 100644 ports/renesas-ra/ra_it.c
 create mode 100644 ports/renesas-ra/ra_it.h
 create mode 100644 ports/renesas-ra/rtc.h
 create mode 100644 ports/renesas-ra/softtimer.c
 create mode 100644 ports/renesas-ra/softtimer.h
 create mode 100644 ports/renesas-ra/spi.h
 create mode 100644 ports/renesas-ra/storage.c
 create mode 100644 ports/renesas-ra/storage.h
 create mode 100644 ports/renesas-ra/systick.c
 create mode 100644 ports/renesas-ra/systick.h
 create mode 100644 ports/renesas-ra/timer.c
 create mode 100644 ports/renesas-ra/timer.h
 create mode 100644 ports/renesas-ra/uart.c
 create mode 100644 ports/renesas-ra/uart.h
 create mode 100644 ports/renesas-ra/usrsw.c
 create mode 100644 ports/renesas-ra/usrsw.h

diff --git a/ports/renesas-ra/Makefile b/ports/renesas-ra/Makefile
new file mode 100644
index 0000000000000..efbcb5f70f070
--- /dev/null
+++ b/ports/renesas-ra/Makefile
@@ -0,0 +1,540 @@
+# Select the board to build for: if not given on the command line,
+# then default to RA6M2_EK.
+BOARD ?= RA6M2_EK
+
+# If the build directory is not given, make it reflect the board name.
+BUILD ?= build-$(BOARD)
+
+BOARD_DIR ?= boards/$(BOARD)
+ifeq ($(wildcard $(BOARD_DIR)/.),)
+$(error Invalid BOARD specified: $(BOARD_DIR))
+endif
+
+ifeq ($(BOARD),RA4M1_CLICKER)
+BOARD_LOW = ra4m1_ek
+CMSIS_MCU_LOW = ra4m1
+CMSIS_MCU_CAP = RA4M1
+USE_FSP_LPM = 0
+endif
+
+ifeq ($(BOARD),RA4M1_EK)
+BOARD_LOW = ra4m1_ek
+CMSIS_MCU_LOW = ra4m1
+CMSIS_MCU_CAP = RA4M1
+USE_FSP_LPM = 0
+endif
+
+ifeq ($(BOARD),RA4W1_EK)
+BOARD_LOW = ra4w1_ek
+CMSIS_MCU_LOW = ra4w1
+CMSIS_MCU_CAP = RA4W1
+USE_FSP_LPM = 1
+endif
+
+ifeq ($(BOARD),RA6M1_EK)
+BOARD_LOW = ra6m1_ek
+CMSIS_MCU_LOW = ra6m1
+CMSIS_MCU_CAP = RA6M1
+USE_FSP_LPM = 1
+endif
+
+ifeq ($(BOARD),RA6M2_EK)
+BOARD_LOW = ra6m2_ek
+CMSIS_MCU_LOW = ra6m2
+CMSIS_MCU_CAP = RA6M2
+USE_FSP_LPM = 1
+endif
+
+# select use wrapper function of FSP library
+USE_FSP_FLASH = 1
+
+include ../../py/mkenv.mk
+-include mpconfigport.mk
+include $(BOARD_DIR)/mpconfigboard.mk
+
+# Files that are generated and needed before the QSTR build.
+#QSTR_GENERATED_HEADERS = $(BUILD)/pins_qstr.h $(BUILD)/modstm_qstr.h
+QSTR_GENERATED_HEADERS = $(BUILD)/pins_qstr.h
+# qstr definitions (must come before including py.mk)
+QSTR_DEFS += qstrdefsport.h $(QSTR_GENERATED_HEADERS)
+QSTR_GLOBAL_DEPENDENCIES += mpconfigboard_common.h $(BOARD_DIR)/mpconfigboard.h $(QSTR_GENERATED_HEADERS)
+
+# MicroPython feature configurations
+MICROPY_ROM_TEXT_COMPRESSION ?= 1
+
+# File containing description of content to be frozen into firmware.
+FROZEN_MANIFEST ?= boards/manifest.py
+
+# include py core make definitions
+include $(TOP)/py/py.mk
+
+GIT_SUBMODULES += lib/fsp
+
+MCU_SERIES_UPPER = $(shell echo $(MCU_SERIES) | tr '[:lower:]' '[:upper:]')
+CMSIS_MCU_LOWER = $(shell echo $(CMSIS_MCU) | tr '[:upper:]' '[:lower:]')
+
+LD_DIR=boards
+CMSIS_DIR=lib/cmsis/inc
+HAL_DIR=lib/fsp
+STARTUP_FILE ?= lib/fsp/ra/fsp/src/bsp/cmsis/Device/RENESAS/Source/startup.o
+SYSTEM_FILE ?= lib/fsp/ra/fsp/src/bsp/cmsis/Device/RENESAS/Source/system.o
+
+# Select the cross compile prefix
+CROSS_COMPILE ?= arm-none-eabi-
+
+INC += -I.
+INC += -I$(TOP)
+INC += -I$(BUILD)
+INC += -I$(TOP)/$(CMSIS_DIR)
+INC += -I$(TOP)/$(HAL_DIR)
+INC += -I$(TOP)/$(HAL_DIR)/ra/fsp/inc
+INC += -I$(TOP)/$(HAL_DIR)/ra/fsp/inc/api
+INC += -I$(TOP)/$(HAL_DIR)/ra/fsp/inc/instances
+INC += -I$(TOP)/$(HAL_DIR)/ra/fsp/src/bsp/cmsis/Device/RENESAS/Include
+#INC += -Ilwip_inc
+ifeq ($(CMSIS_MCU),$(filter $(CMSIS_MCU),RA4M1 RA4W1 RA6M1 RA6M2))
+INC += -Ira
+endif
+INC += -I$(BOARD_DIR)/ra_gen
+INC += -I$(BOARD_DIR)/ra_cfg/fsp_cfg
+INC += -I$(BOARD_DIR)/ra_cfg/fsp_cfg/bsp
+INC += -Idebug
+
+CFLAGS += -D$(CMSIS_MCU)
+CFLAGS += -DRA_HAL_H='<$(CMSIS_MCU)_hal.h>'
+
+# Basic Cortex-M flags
+CFLAGS_CORTEX_M = -mthumb
+
+# Select hardware floating-point support
+SUPPORTS_HARDWARE_FP_SINGLE = 0
+SUPPORTS_HARDWARE_FP_DOUBLE = 0
+ifeq ($(MCU_SERIES),$(filter $(MCU_SERIES),m4))
+CFLAGS_CORTEX_M += -mfpu=fpv4-sp-d16 -mfloat-abi=hard 
+SUPPORTS_HARDWARE_FP_SINGLE = 1
+endif
+
+# Options for particular MCU series
+CFLAGS_MCU_RA4M1 = $(CFLAGS_CORTEX_M) -mtune=cortex-m4 -mcpu=cortex-m4
+CFLAGS_MCU_RA4W1 = $(CFLAGS_CORTEX_M) -mtune=cortex-m4 -mcpu=cortex-m4
+CFLAGS_MCU_RA6M1 = $(CFLAGS_CORTEX_M) -mtune=cortex-m4 -mcpu=cortex-m4
+CFLAGS_MCU_RA6M2 = $(CFLAGS_CORTEX_M) -mtune=cortex-m4 -mcpu=cortex-m4
+
+CFLAGS += $(INC) -Wall -Wpointer-arith -Werror -Wdouble-promotion -Wfloat-conversion -std=gnu99 -nostdlib $(CFLAGS_MOD) $(CFLAGS_EXTRA)
+#CFLAGS += -D$(CMSIS_MCU)
+CFLAGS += $(CFLAGS_MCU_$(CMSIS_MCU))
+CFLAGS += $(COPT)
+CFLAGS += -I$(BOARD_DIR)
+
+# Configure floating point support
+ifeq ($(MICROPY_FLOAT_IMPL),double)
+CFLAGS += -DMICROPY_FLOAT_IMPL=MICROPY_FLOAT_IMPL_DOUBLE
+else
+ifeq ($(MICROPY_FLOAT_IMPL),none)
+CFLAGS += -DMICROPY_FLOAT_IMPL=MICROPY_FLOAT_IMPL_NONE
+else
+CFLAGS += -DMICROPY_FLOAT_IMPL=MICROPY_FLOAT_IMPL_FLOAT
+CFLAGS += -fsingle-precision-constant
+endif
+endif
+
+LDFLAGS = -nostdlib -L $(LD_DIR) $(addprefix -T,$(LD_FILES)) -Map=$(@:.elf=.map) --cref
+LDFLAGS += --defsym=_estack_reserve=8
+LIBS += "$(shell $(CC) $(CFLAGS) -print-libgcc-file-name)"
+
+# Remove uncalled code from the final image.
+CFLAGS += -fdata-sections -ffunction-sections
+LDFLAGS += --gc-sections
+
+# Debugging/Optimization
+ifeq ($(DEBUG), 1)
+CFLAGS += -g -DPENDSV_DEBUG
+#COPT = -Og
+COPT = -Os
+# Disable text compression in debug builds
+MICROPY_ROM_TEXT_COMPRESSION = 0
+else
+COPT += -Os -DNDEBUG
+endif
+
+# Flags for optional C++ source code
+CXXFLAGS += $(filter-out -Wmissing-prototypes -Wold-style-definition -std=gnu99,$(CFLAGS))
+CXXFLAGS += $(CXXFLAGS_MOD)
+ifneq ($(SRC_CXX)$(SRC_MOD_CXX),)
+LIBSTDCPP_FILE_NAME = "$(shell $(CXX) $(CXXFLAGS) -print-file-name=libstdc++.a)"
+LDFLAGS += -L"$(shell dirname $(LIBSTDCPP_FILE_NAME))"
+endif
+
+# Options for mpy-cross
+MPY_CROSS_FLAGS += -march=armv7m
+
+SHARED_SRC_C += $(addprefix shared/,\
+	libc/string0.c \
+	netutils/dhcpserver.c \
+	netutils/netutils.c \
+	netutils/trace.c \
+	readline/readline.c \
+	runtime/gchelper_native.c \
+	runtime/interrupt_char.c \
+	runtime/mpirq.c \
+	runtime/pyexec.c \
+	runtime/stdout_helpers.c \
+	runtime/sys_stdio_mphal.c \
+	timeutils/timeutils.c \
+	)
+
+ifeq ($(MICROPY_FLOAT_IMPL),double)
+LIBM_SRC_C += $(addprefix lib/libm_dbl/,\
+	__cos.c \
+	__expo2.c \
+	__fpclassify.c \
+	__rem_pio2.c \
+	__rem_pio2_large.c \
+	__signbit.c \
+	__sin.c \
+	__tan.c \
+	acos.c \
+	acosh.c \
+	asin.c \
+	asinh.c \
+	atan.c \
+	atan2.c \
+	atanh.c \
+	ceil.c \
+	cos.c \
+	cosh.c \
+	copysign.c \
+	erf.c \
+	exp.c \
+	expm1.c \
+	floor.c \
+	fmod.c \
+	frexp.c \
+	ldexp.c \
+	lgamma.c \
+	log.c \
+	log10.c \
+	log1p.c \
+	modf.c \
+	nearbyint.c \
+	pow.c \
+	rint.c \
+	round.c \
+	scalbn.c \
+	sin.c \
+	sinh.c \
+	tan.c \
+	tanh.c \
+	tgamma.c \
+	trunc.c \
+	)
+ifeq ($(SUPPORTS_HARDWARE_FP_DOUBLE),1)
+LIBM_SRC_C += lib/libm_dbl/thumb_vfp_sqrt.c
+else
+LIBM_SRC_C += lib/libm_dbl/sqrt.c
+endif
+else
+LIBM_SRC_C += $(addprefix lib/libm/,\
+	math.c \
+	acoshf.c \
+	asinfacosf.c \
+	asinhf.c \
+	atan2f.c \
+	atanf.c \
+	atanhf.c \
+	ef_rem_pio2.c \
+	erf_lgamma.c \
+	fmodf.c \
+	kf_cos.c \
+	kf_rem_pio2.c \
+	kf_sin.c \
+	kf_tan.c \
+	log1pf.c \
+	nearbyintf.c \
+	roundf.c \
+	sf_cos.c \
+	sf_erf.c \
+	sf_frexp.c \
+	sf_ldexp.c \
+	sf_modf.c \
+	sf_sin.c \
+	sf_tan.c \
+	wf_lgamma.c \
+	wf_tgamma.c \
+	)
+ifeq ($(SUPPORTS_HARDWARE_FP_SINGLE),1)
+LIBM_SRC_C += lib/libm/thumb_vfp_sqrtf.c
+else
+LIBM_SRC_C += lib/libm/ef_sqrt.c
+endif
+endif
+
+LIBM_O = $(addprefix $(BUILD)/, $(LIBM_SRC_C:.c=.o))
+
+# Too many warnings in libm_dbl, disable for now.
+ifeq ($(MICROPY_FLOAT_IMPL),double)
+$(LIBM_O): CFLAGS := $(filter-out -Wdouble-promotion -Wfloat-conversion, $(CFLAGS))
+endif
+
+EXTMOD_SRC_C += $(addprefix extmod/,\
+	modonewire.c \
+	)
+
+DRIVERS_SRC_C += $(addprefix drivers/,\
+	bus/softspi.c \
+	bus/softqspi.c \
+	memory/spiflash.c \
+	dht/dht.c \
+	)
+
+SRC_C += \
+	boardctrl.c \
+	main.c \
+	ra_it.c \
+	mphalport.c \
+	mpthreadport.c \
+	irq.c \
+	pendsv.c \
+	systick.c  \
+	softtimer.c  \
+	powerctrl.c \
+	powerctrlboot.c \
+	pybthread.c \
+	factoryreset.c \
+	timer.c \
+	led.c \
+	uart.c \
+	gccollect.c \
+	help.c \
+	machine_adc.c \
+	machine_i2c.c \
+	machine_spi.c \
+	machine_timer.c \
+	machine_uart.c \
+	machine_pin.c \
+	machine_rtc.c \
+	modmachine.c \
+	modutime.c \
+	extint.c \
+	usrsw.c \
+	flash.c \
+	flashbdev.c \
+	storage.c \
+	fatfs_port.c \
+	$(BOARD_DIR)/src/hal_entry.c \
+	$(wildcard $(BOARD_DIR)/*.c)
+
+SRC_C += $(addprefix $(BOARD_DIR)/ra_gen/,\
+	common_data.c \
+	hal_data.c \
+	main.c \
+	pin_data.c \
+	vector_data.c \
+	)
+
+SRC_CXX += \
+	$(SRC_MOD_CXX)
+
+SRC_O += \
+	$(STARTUP_FILE) \
+	$(SYSTEM_FILE)
+
+SRC_O += \
+	shared/runtime/gchelper_m3.o
+
+HAL_SRC_C += $(addprefix $(HAL_DIR)/ra/board/$(BOARD_LOW)/,\
+	board_init.c \
+	board_leds.c \
+	)
+
+HAL_SRC_C += $(addprefix $(HAL_DIR)/ra/fsp/src/bsp/mcu/all/,\
+	bsp_clocks.c \
+	bsp_common.c \
+	bsp_delay.c \
+	bsp_group_irq.c \
+	bsp_guard.c \
+	bsp_io.c \
+	bsp_irq.c \
+	bsp_register_protection.c \
+	bsp_rom_registers.c \
+	bsp_sbrk.c \
+	bsp_security.c \
+	)
+
+HAL_SRC_C += $(addprefix $(HAL_DIR)/ra/fsp/src/,\
+	r_ioport/r_ioport.c \
+	)
+
+ifeq ($(USE_FSP_LPM), 1)
+CFLAGS += -DUSE_FSP_LPM
+HAL_SRC_C += $(HAL_DIR)/ra/fsp/src/r_lpm/r_lpm.c
+endif
+
+ifeq ($(CMSIS_MCU),$(filter $(CMSIS_MCU),RA4M1 RA4W1))
+ifeq ($(USE_FSP_FLASH), 1)
+CFLAGS += -DUSE_FSP_FLASH
+HAL_SRC_C += $(HAL_DIR)/ra/fsp/src/r_flash_lp/r_flash_lp.c
+endif
+endif
+
+ifeq ($(CMSIS_MCU),$(filter $(CMSIS_MCU),RA6M1 RA6M2))
+ifeq ($(USE_FSP_FLASH), 1)
+CFLAGS += -DUSE_FSP_FLASH
+HAL_SRC_C += $(HAL_DIR)/ra/fsp/src/r_flash_hp/r_flash_hp.c
+endif
+endif
+
+ifeq ($(CMSIS_MCU),$(filter $(CMSIS_MCU),RA4M1 RA4W1 RA6M1 RA6M2))
+HAL_SRC_C += $(addprefix ra/,\
+	ra_adc.c \
+	ra_flash.c \
+	ra_gpio.c \
+	ra_i2c.c \
+	ra_icu.c \
+	ra_init.c \
+	ra_int.c \
+	ra_rtc.c \
+	ra_sci.c \
+	ra_spi.c \
+	ra_timer.c \
+	ra_utils.c \
+	)
+
+endif
+
+OBJ += $(PY_O)
+OBJ += $(addprefix $(BUILD)/, $(LIB_SRC_C:.c=.o))
+OBJ += $(LIBM_O)
+OBJ += $(addprefix $(BUILD)/, $(SHARED_SRC_C:.c=.o))
+OBJ += $(addprefix $(BUILD)/, $(EXTMOD_SRC_C:.c=.o))
+OBJ += $(addprefix $(BUILD)/, $(DRIVERS_SRC_C:.c=.o))
+OBJ += $(addprefix $(BUILD)/, $(HAL_SRC_C:.c=.o))
+OBJ += $(addprefix $(BUILD)/, $(SRC_C:.c=.o))
+OBJ += $(addprefix $(BUILD)/, $(SRC_CXX:.cpp=.o))
+OBJ += $(addprefix $(BUILD)/, $(SRC_O))
+OBJ += $(addprefix $(BUILD)/, $(SRC_MOD:.c=.o))
+OBJ += $(BUILD)/pins_$(BOARD).o
+
+# This file contains performance critical functions so turn up the optimisation
+# level.  It doesn't add much to the code size and improves performance a bit.
+# Don't use -O3 with this file because gcc tries to optimise memset in terms of itself.
+$(BUILD)/shared/libc/string0.o: COPT += -O2
+
+# We put several files into the first 16K section with the ISRs.
+# If we compile these using -O0 then it won't fit. So if you really want these
+# to be compiled with -O0, then edit boards/common.ld (in the .isr_vector section)
+# and comment out the following lines.
+$(BUILD)/$(OOFATFS_DIR)/ff.o: COPT += -Os
+$(filter $(PY_BUILD)/../extmod/vfs_fat_%.o, $(PY_O)): COPT += -Os
+$(PY_BUILD)/formatfloat.o: COPT += -Os
+$(PY_BUILD)/parsenum.o: COPT += -Os
+$(PY_BUILD)/mpprint.o: COPT += -Os
+
+all: $(TOP)/lib/fsp/README.md $(BUILD)/firmware.hex
+
+# For convenience, automatically fetch required submodules if they don't exist
+$(TOP)/lib/fsp/README.md:
+	$(ECHO) "fsp submodule not found, fetching it now..."
+	(cd $(TOP) && git submodule update --init lib/fsp)
+
+ifneq ($(FROZEN_MANIFEST)$(FROZEN_DIR),)
+# To use frozen source modules, put your .py files in a subdirectory (eg scripts/)
+# and then invoke make with FROZEN_DIR=scripts (be sure to build from scratch).
+CFLAGS += -DMICROPY_MODULE_FROZEN_STR
+endif
+
+ifneq ($(FROZEN_MANIFEST)$(FROZEN_MPY_DIR),)
+# To use frozen bytecode, put your .py files in a subdirectory (eg frozen/) and
+# then invoke make with FROZEN_MPY_DIR=frozen (be sure to build from scratch).
+CFLAGS += -DMICROPY_QSTR_EXTRA_POOL=mp_qstr_frozen_const_pool
+CFLAGS += -DMICROPY_MODULE_FROZEN_MPY
+endif
+
+define GENERATE_ELF
+	$(ECHO) "LINK $(1)"
+	$(Q)$(LD) $(LDFLAGS) -o $(1) $(2) $(LDFLAGS_MOD) $(LIBS)
+	$(Q)$(SIZE) $(1)
+endef
+
+define GENERATE_BIN
+	$(ECHO) "GEN $(1)"
+	$(Q)$(OBJCOPY) -O binary $(addprefix -j ,$(3)) $(2) $(1)
+endef
+
+define GENERATE_HEX
+	$(ECHO) "GEN $(1)"
+	$(Q)$(OBJCOPY) -O ihex $(2) $(1)
+endef
+
+.PHONY: 
+
+# A board should specify TEXT0_ADDR if to use a different location than the
+# default for the firmware memory location.  A board can also optionally define
+# TEXT1_ADDR to split the firmware into two sections; see below for details.
+TEXT0_ADDR ?= 0x00000000
+
+# No TEXT1_ADDR given so put all firmware at TEXT0_ADDR location
+
+TEXT0_SECTIONS ?= .isr_vector .text .data
+
+$(BUILD)/firmware.bin: $(BUILD)/firmware.elf
+	$(call GENERATE_BIN,$@,$^,$(TEXT0_SECTIONS))
+
+$(BUILD)/firmware.hex: $(BUILD)/firmware.elf
+	$(call GENERATE_HEX,$@,$^)
+
+$(BUILD)/firmware.elf: $(OBJ)
+	$(call GENERATE_ELF,$@,$^)
+
+MAKE_PINS = boards/make-pins.py
+BOARD_PINS = $(BOARD_DIR)/pins.csv
+PREFIX_FILE = boards/ra_pin_prefix.c
+ifeq ($(CMSIS_MCU),$(filter $(CMSIS_MCU),RA4M1))
+AF_FILE = boards/ra4m1_af.csv
+endif
+ifeq ($(CMSIS_MCU),$(filter $(CMSIS_MCU),RA4W1))
+AF_FILE = boards/ra4w1_af.csv
+endif
+ifeq ($(CMSIS_MCU),$(filter $(CMSIS_MCU),RA6M1))
+AF_FILE = boards/ra6m1_af.csv
+endif
+ifeq ($(CMSIS_MCU),$(filter $(CMSIS_MCU),RA6M2))
+AF_FILE = boards/ra6m2_af.csv
+endif
+GEN_PINS_SRC = $(BUILD)/pins_$(BOARD).c
+GEN_PINS_HDR = $(HEADER_BUILD)/pins.h
+GEN_PINS_QSTR = $(BUILD)/pins_qstr.h
+GEN_PINS_AD_CONST = $(HEADER_BUILD)/pins_ad_const.h
+GEN_PINS_AF_CONST = $(HEADER_BUILD)/pins_af_const.h
+#GEN_PINS_AF_DEFS = $(HEADER_BUILD)/pins_af_defs.h
+GEN_PINS_AF_PY = $(BUILD)/pins_af.py
+
+FILE2H = $(TOP)/tools/file2h.py
+
+# List of sources for qstr extraction
+SRC_QSTR += $(SRC_C) $(SRC_CXX) $(SRC_MOD) $(SHARED_SRC_C) $(EXTMOD_SRC_C)
+
+# Making OBJ use an order-only depenedency on the generated pins.h file
+# has the side effect of making the pins.h file before we actually compile
+# any of the objects. The normal dependency generation will deal with the
+# case when pins.h is modified. But when it doesn't exist, we don't know
+# which source files might need it.
+$(OBJ): | $(GEN_PINS_HDR)
+
+# With conditional pins, we may need to regenerate qstrdefs.h when config
+# options change.
+$(HEADER_BUILD)/qstrdefs.generated.h: $(BOARD_DIR)/mpconfigboard.h
+
+# Use a pattern rule here so that make will only call make-pins.py once to make
+# both pins_$(BOARD).c and pins.h
+.PRECIOUS: $(GEN_PINS_SRC)
+$(BUILD)/%_$(BOARD).c $(HEADER_BUILD)/%.h $(HEADER_BUILD)/%_af_const.h $(HEADER_BUILD)/%_af_defs.h $(BUILD)/%_qstr.h: $(BOARD_DIR)/%.csv $(MAKE_PINS) $(AF_FILE) $(PREFIX_FILE) | $(HEADER_BUILD)
+	$(ECHO) "GEN $@"
+	$(Q)$(PYTHON) $(MAKE_PINS) --board $(BOARD_PINS) --af $(AF_FILE) --prefix $(PREFIX_FILE) --hdr $(GEN_PINS_HDR) --qstr $(GEN_PINS_QSTR) --ad-const $(GEN_PINS_AD_CONST) --af-const $(GEN_PINS_AF_CONST) --af-py $(GEN_PINS_AF_PY) > $(GEN_PINS_SRC)
+
+#$(BUILD)/pins_$(BOARD).o: $(BUILD)/pins_$(BOARD).c
+#	$(call compile_c)
+
+CMSIS_MCU_HDR = $(CMSIS_DIR)/$(CMSIS_MCU_LOWER).h
+
+include $(TOP)/py/mkrules.mk
diff --git a/ports/renesas-ra/RA4M1_hal.h b/ports/renesas-ra/RA4M1_hal.h
new file mode 100644
index 0000000000000..7f0ad9666f47b
--- /dev/null
+++ b/ports/renesas-ra/RA4M1_hal.h
@@ -0,0 +1,103 @@
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Renesas Electronics Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#ifndef PORTS_RA_RA4M1_HAL_H_
+#define PORTS_RA_RA4M1_HAL_H_
+
+#include <stdio.h>
+#include <stdint.h>
+#include <stdbool.h>
+// #include "hal_data.h"
+#include "bsp_api.h"
+#include "common_data.h"
+
+#define SCI_CH      0
+#define SCI_BAUD    115200
+#define UART_CH     SCI_CH
+#define UART_TxStr  sci_tx_str
+#define PCLK        48000000
+
+#define RA_PRI_SYSTICK  (0)
+#define RA_PRI_UART     (1)
+#define RA_PRI_SDIO     (4)
+#define RA_PRI_DMA      (5)
+#define RA_PRI_FLASH    (6)
+#define RA_PRI_OTG_FS   (6)
+#define RA_PRI_OTG_HS   (6)
+#define RA_PRI_TIM5     (6)
+#define RA_PRI_CAN      (7)
+#define RA_PRI_SPI      (8)
+#define RA_PRI_I2C      (8)
+#define RA_PRI_TIMX     (13)
+#define RA_PRI_EXTINT   (14)
+#define RA_PRI_PENDSV   (15)
+#define RA_PRI_RTC_WKUP (15)
+
+#include "ra_config.h"
+#include "ra_adc.h"
+#include "ra_flash.h"
+#include "ra_gpio.h"
+#include "ra_i2c.h"
+#include "ra_icu.h"
+#include "ra_init.h"
+#include "ra_int.h"
+#include "ra_rtc.h"
+#include "ra_sci.h"
+#include "ra_spi.h"
+#include "ra_timer.h"
+#include "ra_utils.h"
+
+typedef enum {
+    HAL_OK       = 0x00,
+    HAL_ERROR    = 0x01,
+    HAL_BUSY     = 0x02,
+    HAL_TIMEOUT  = 0x03
+} HAL_StatusTypeDef;
+
+#define __IO    volatile
+
+#if defined(USE_DBG_PRINT)
+#if !defined(DEBUG_CH)
+#define DEBUG_CH SCI_CH
+#endif
+#if (DEBUG_CH == 0)
+#define DEBUG_TX_PIN    P411
+#define DEBUG_RX_PIN    P410
+#endif
+#if (DEBUG_CH == 1)
+#define DEBUG_TX_PIN    P401
+#define DEBUG_RX_PIN    P402
+#endif
+#if (DEBUG_CH == 9)
+#define DEBUG_TX_PIN    P203
+#define DEBUG_RX_PIN    P202
+#endif
+#define DEBUG_TXSTR(s)  ra_sci_tx_str(DEBUG_CH, (unsigned char *)s)
+#define DEBUG_TXCH(c)   ra_sci_tx_ch(DEBUG_CH, c)
+#else
+#define DEBUG_TXSTR(s)
+#define DEBUG_TXCH(c)
+#endif
+
+#endif /* PORTS_RA_RA4M1_HAL_H_ */
diff --git a/ports/renesas-ra/RA4W1_hal.h b/ports/renesas-ra/RA4W1_hal.h
new file mode 100644
index 0000000000000..774ec46b38196
--- /dev/null
+++ b/ports/renesas-ra/RA4W1_hal.h
@@ -0,0 +1,103 @@
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Renesas Electronics Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#ifndef PORTS_RA_RA4W1_HAL_H_
+#define PORTS_RA_RA4W1_HAL_H_
+
+#include <stdio.h>
+#include <stdint.h>
+#include <stdbool.h>
+// #include "hal_data.h"
+#include "bsp_api.h"
+#include "common_data.h"
+
+#define SCI_CH      0
+#define SCI_BAUD    115200
+#define UART_CH     SCI_CH
+#define UART_TxStr  sci_tx_str
+#define PCLK        48000000
+
+#define RA_PRI_SYSTICK  (0)
+#define RA_PRI_UART     (1)
+#define RA_PRI_SDIO     (4)
+#define RA_PRI_DMA      (5)
+#define RA_PRI_FLASH    (6)
+#define RA_PRI_OTG_FS   (6)
+#define RA_PRI_OTG_HS   (6)
+#define RA_PRI_TIM5     (6)
+#define RA_PRI_CAN      (7)
+#define RA_PRI_SPI      (8)
+#define RA_PRI_I2C      (8)
+#define RA_PRI_TIMX     (13)
+#define RA_PRI_EXTINT   (14)
+#define RA_PRI_PENDSV   (15)
+#define RA_PRI_RTC_WKUP (15)
+
+#include "ra_config.h"
+#include "ra_adc.h"
+#include "ra_flash.h"
+#include "ra_gpio.h"
+#include "ra_i2c.h"
+#include "ra_icu.h"
+#include "ra_init.h"
+#include "ra_int.h"
+#include "ra_rtc.h"
+#include "ra_sci.h"
+#include "ra_spi.h"
+#include "ra_timer.h"
+#include "ra_utils.h"
+
+typedef enum {
+    HAL_OK       = 0x00,
+    HAL_ERROR    = 0x01,
+    HAL_BUSY     = 0x02,
+    HAL_TIMEOUT  = 0x03
+} HAL_StatusTypeDef;
+
+#define __IO    volatile
+
+#if defined(USE_DBG_PRINT)
+#if !defined(DEBUG_CH)
+#define DEBUG_CH SCI_CH
+#endif
+#if (DEBUG_CH == 0)
+#define DEBUG_TX_PIN    P411
+#define DEBUG_RX_PIN    P410
+#endif
+#if (DEBUG_CH == 1)
+#define DEBUG_TX_PIN    P401
+#define DEBUG_RX_PIN    P402
+#endif
+#if (DEBUG_CH == 9)
+#define DEBUG_TX_PIN    P203
+#define DEBUG_RX_PIN    P202
+#endif
+#define DEBUG_TXSTR(s)  ra_sci_tx_str(DEBUG_CH, (unsigned char *)s)
+#define DEBUG_TXCH(c)   ra_sci_tx_ch(DEBUG_CH, c)
+#else
+#define DEBUG_TXSTR(s)
+#define DEBUG_TXCH(c)
+#endif
+
+#endif /* PORTS_RA_RA4W1_HAL_H_ */
diff --git a/ports/renesas-ra/RA6M1_hal.h b/ports/renesas-ra/RA6M1_hal.h
new file mode 100644
index 0000000000000..9929d29b5462a
--- /dev/null
+++ b/ports/renesas-ra/RA6M1_hal.h
@@ -0,0 +1,103 @@
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Renesas Electronics Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#ifndef PORTS_RA_RA6M1_HAL_H_
+#define PORTS_RA_RA6M1_HAL_H_
+
+#include <stdio.h>
+#include <stdint.h>
+#include <stdbool.h>
+// #include "hal_data.h"
+#include "bsp_api.h"
+#include "common_data.h"
+
+#define SCI_CH      0
+#define SCI_BAUD    115200
+#define UART_CH     SCI_CH
+#define UART_TxStr  sci_tx_str
+#define PCLK        120000000
+
+#define RA_PRI_SYSTICK  (0)
+#define RA_PRI_UART     (1)
+#define RA_PRI_SDIO     (4)
+#define RA_PRI_DMA      (5)
+#define RA_PRI_FLASH    (6)
+#define RA_PRI_OTG_FS   (6)
+#define RA_PRI_OTG_HS   (6)
+#define RA_PRI_TIM5     (6)
+#define RA_PRI_CAN      (7)
+#define RA_PRI_SPI      (8)
+#define RA_PRI_I2C      (8)
+#define RA_PRI_TIMX     (13)
+#define RA_PRI_EXTINT   (14)
+#define RA_PRI_PENDSV   (15)
+#define RA_PRI_RTC_WKUP (15)
+
+#include "ra_config.h"
+#include "ra_adc.h"
+#include "ra_flash.h"
+#include "ra_gpio.h"
+#include "ra_i2c.h"
+#include "ra_icu.h"
+#include "ra_init.h"
+#include "ra_int.h"
+#include "ra_rtc.h"
+#include "ra_sci.h"
+#include "ra_spi.h"
+#include "ra_timer.h"
+#include "ra_utils.h"
+
+typedef enum {
+    HAL_OK       = 0x00,
+    HAL_ERROR    = 0x01,
+    HAL_BUSY     = 0x02,
+    HAL_TIMEOUT  = 0x03
+} HAL_StatusTypeDef;
+
+#define __IO    volatile
+
+#if defined(USE_DBG_PRINT)
+#if !defined(DEBUG_CH)
+#define DEBUG_CH SCI_CH
+#endif
+#if (DEBUG_CH == 0)
+#define DEBUG_TX_PIN    P411
+#define DEBUG_RX_PIN    P410
+#endif
+#if (DEBUG_CH == 1)
+#define DEBUG_TX_PIN    P401
+#define DEBUG_RX_PIN    P402
+#endif
+#if (DEBUG_CH == 9)
+#define DEBUG_TX_PIN    P203
+#define DEBUG_RX_PIN    P202
+#endif
+#define DEBUG_TXSTR(s)  ra_sci_tx_str(DEBUG_CH, (unsigned char *)s)
+#define DEBUG_TXCH(c)   ra_sci_tx_ch(DEBUG_CH, c)
+#else
+#define DEBUG_TXSTR(s)
+#define DEBUG_TXCH(c)
+#endif
+
+#endif /* PORTS_RA_RA6M1_HAL_H_ */
diff --git a/ports/renesas-ra/RA6M2_hal.h b/ports/renesas-ra/RA6M2_hal.h
new file mode 100644
index 0000000000000..75877cc0f6052
--- /dev/null
+++ b/ports/renesas-ra/RA6M2_hal.h
@@ -0,0 +1,103 @@
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Renesas Electronics Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#ifndef PORTS_RA_RA6M2_HAL_H_
+#define PORTS_RA_RA6M2_HAL_H_
+
+#include <stdio.h>
+#include <stdint.h>
+#include <stdbool.h>
+// #include "hal_data.h"
+#include "bsp_api.h"
+#include "common_data.h"
+
+#define SCI_CH      0
+#define SCI_BAUD    115200
+#define UART_CH     SCI_CH
+#define UART_TxStr  sci_tx_str
+#define PCLK        120000000
+
+#define RA_PRI_SYSTICK  (0)
+#define RA_PRI_UART     (1)
+#define RA_PRI_SDIO     (4)
+#define RA_PRI_DMA      (5)
+#define RA_PRI_FLASH    (6)
+#define RA_PRI_OTG_FS   (6)
+#define RA_PRI_OTG_HS   (6)
+#define RA_PRI_TIM5     (6)
+#define RA_PRI_CAN      (7)
+#define RA_PRI_SPI      (8)
+#define RA_PRI_I2C      (8)
+#define RA_PRI_TIMX     (13)
+#define RA_PRI_EXTINT   (14)
+#define RA_PRI_PENDSV   (15)
+#define RA_PRI_RTC_WKUP (15)
+
+#include "ra_config.h"
+#include "ra_adc.h"
+#include "ra_flash.h"
+#include "ra_gpio.h"
+#include "ra_i2c.h"
+#include "ra_icu.h"
+#include "ra_init.h"
+#include "ra_int.h"
+#include "ra_rtc.h"
+#include "ra_sci.h"
+#include "ra_spi.h"
+#include "ra_timer.h"
+#include "ra_utils.h"
+
+typedef enum {
+    HAL_OK       = 0x00,
+    HAL_ERROR    = 0x01,
+    HAL_BUSY     = 0x02,
+    HAL_TIMEOUT  = 0x03
+} HAL_StatusTypeDef;
+
+#define __IO    volatile
+
+#if defined(USE_DBG_PRINT)
+#if !defined(DEBUG_CH)
+#define DEBUG_CH SCI_CH
+#endif
+#if (DEBUG_CH == 0)
+#define DEBUG_TX_PIN    P411
+#define DEBUG_RX_PIN    P410
+#endif
+#if (DEBUG_CH == 1)
+#define DEBUG_TX_PIN    P401
+#define DEBUG_RX_PIN    P402
+#endif
+#if (DEBUG_CH == 9)
+#define DEBUG_TX_PIN    P203
+#define DEBUG_RX_PIN    P202
+#endif
+#define DEBUG_TXSTR(s)  ra_sci_tx_str(DEBUG_CH, (unsigned char *)s)
+#define DEBUG_TXCH(c)   ra_sci_tx_ch(DEBUG_CH, c)
+#else
+#define DEBUG_TXSTR(s)
+#define DEBUG_TXCH(c)
+#endif
+
+#endif /* PORTS_RA_RA6M2_HAL_H_ */
diff --git a/ports/renesas-ra/README.md b/ports/renesas-ra/README.md
new file mode 100644
index 0000000000000..482870e1c0368
--- /dev/null
+++ b/ports/renesas-ra/README.md
@@ -0,0 +1,81 @@
+# The Renesas RA port
+
+This is a port of MicroPython to the Renesas RA family of microcontrollers.
+Currently supported features are:
+
+- Filesystem on the internal flash using FatFs.
+- `utime` module with sleep, time, and ticks functions.
+- `uos` module with VFS support.
+- `machine` module with the following classes: `Pin`, `ADC`, `I2C`, `SPI`,
+   `SoftI2C`, `SoftSPI`, `UART`, `RTC`
+- sdcard driver if frozen driver is installed.
+
+Currently supported board product names are:
+
+- EK-RA6M2
+- RA4M1 CLICKER
+- EK-RA6M1
+- EK-RA4M1
+- EK-RA4W1
+
+Please refer to the quick reference of `renesas-ra` port for more
+information about the boards.
+
+## Build instructions
+
+* MicroPython cross-compier
+The MicroPython cross-compiler must be built first, which will be
+used to pre-compile (freeze) built-in Python code. THis cross-compiler
+is built and run on the host machine, using:
+
+      $ make -C mpy-cross
+
+  This command should be executed from the root directory of this repository.
+All other commands below should be executed from the ports/renesas-ra/ directory.
+
+* Arm compiler
+An `Arm compiler` is required for the build, along with the associated binary
+utilities.  The default compiler is `arm-none-eabi-gcc`, which is available for
+Arch Linux and Windows hosts via https://developer.arm.com/tools-and-software/open-source-software/developer-tools/gnu-toolchain/gnu-rm/downloads.
+The compiler can be changed using the `CROSS_COMPILE` variable
+when invoking `make`.
+
+* Obtain submodules
+First the submodules must be obtained using:
+
+      $ make submodules
+
+* Build binary image `.hex`
+Then to build for a given board subdirectory name, run:
+
+      $ make BOARD=RA6M2_EK clean
+      $ make BOARD=RA6M2_EK
+
+  The default board subdirectory name is RA6M2_EK (which is for EK-RA6M2 board)
+but any of the names of the subdirectories in the `boards/` directory can be
+passed as the argument to `BOARD=`; for example `RA4M1_CLICKER`, `RA4M1_EK`,
+`RA4W1_EK` and `RA6M1_EK`.
+The above command should produce binary images `firmware.hex` in the
+build-RA6M2_EK/` subdirectory (or the equivalent directory for the board specified).
+
+## Supported/Unsupprted funtions
+Please refer to the `renesas-ra` quick reference.
+
+## Known issues
+
+### all boards
+* machine.lightsleep(time_ms) and machine.deepsleep(time_ms) raise uncaught exceptions.
+
+    >>> machine.deepsleep(1000)
+    >>> Uncaught exception in ExtInt interrupt handler line 16
+    TypeError:
+
+### RA4M1-CLICKER
+* mpremote: mount command is not available due to limited memory resources.
+
+### EK-RA4M1
+* mpremote: mount command is not available due to limited memory resources.
+
+### EK-RA4W1
+* mpremote: "Execution: timeout waiting for remote" error happens when importing a file on /remote.
+
diff --git a/ports/renesas-ra/boardctrl.c b/ports/renesas-ra/boardctrl.c
new file mode 100644
index 0000000000000..b6f0a9093843e
--- /dev/null
+++ b/ports/renesas-ra/boardctrl.c
@@ -0,0 +1,171 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013-2020 Damien P. George
+ * Copyright (c) 2022 Renesas Electronics Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "py/runtime.h"
+#include "py/mphal.h"
+#include "shared/runtime/pyexec.h"
+#include "boardctrl.h"
+#include "led.h"
+#include "usrsw.h"
+
+STATIC void flash_error(int n) {
+    for (int i = 0; i < n; i++) {
+        led_state(RA_LED1, 1);
+        mp_hal_delay_ms(250);
+        led_state(RA_LED1, 0);
+        mp_hal_delay_ms(250);
+    }
+}
+
+#if !MICROPY_HW_USES_BOOTLOADER
+STATIC uint update_reset_mode(uint reset_mode) {
+    #if MICROPY_HW_HAS_SWITCH
+    bool press_status;
+
+    if (switch_get()) {
+        press_status = true;
+        mp_printf(&mp_plat_print, "\nEntering select boot mode\n");
+        mp_printf(&mp_plat_print, "Normal: release switch after LED1 flashes 4 times or more.\n");
+        mp_printf(&mp_plat_print, "Safe: release switch after LED1 flashes 2 times.\n");
+        mp_printf(&mp_plat_print, "Factory filesystem: release switch after LED1 flashes 3 times.\n");
+        // For boards with only a single LED, we'll flash that LED the
+        // appropriate number of times, with a pause between each one
+        for (uint i = 0; i < 100; i++) {
+            led_state(RA_LED1, 1);
+            mp_hal_delay_ms(1000);
+            led_state(RA_LED1, 0);
+            for (uint i = 0; i < 50; i++) {
+                mp_hal_delay_ms(20);
+                if (!switch_get()) {
+                    press_status = false;
+                    break;
+                }
+            }
+            if (press_status == false) {
+                break;
+            }
+            ++reset_mode;
+        }
+        if (reset_mode > BOARDCTRL_RESET_MODE_FACTORY_FILESYSTEM) {
+            reset_mode = BOARDCTRL_RESET_MODE_NORMAL;
+        }
+        #if 0   // if selected mode is displayed, LED1 flash is unnecessary.
+        // Flash the selected reset mode twice.
+        //   We'll flash LED selected number of times, and wait for 2 secs, then flash again:
+        //     BOARDCTRL_RESET_MODE_NORMAL = 1,
+        //     BOARDCTRL_RESET_MODE_SAFE_MODE = 2,
+        //     BOARDCTRL_RESET_MODE_FACTORY_FILESYSTEM = 3,
+        mp_hal_delay_ms(1000);
+        for (uint i = 0; i < 2; i++) {
+            for (uint j = 0; j < reset_mode; j++) {
+                led_state(RA_LED1, 1);
+                mp_hal_delay_ms(1000);
+                led_state(RA_LED1, 0);
+                mp_hal_delay_ms(1000);
+            }
+            mp_hal_delay_ms(2000);
+        }
+        #endif
+        if (reset_mode == BOARDCTRL_RESET_MODE_SAFE_MODE) {
+            mp_printf(&mp_plat_print, "\nBoot with safe mode\n");
+        } else if (reset_mode == BOARDCTRL_RESET_MODE_FACTORY_FILESYSTEM) {
+            mp_printf(&mp_plat_print, "\nBoot with factory filesystem mode\n");
+        } else {
+            mp_printf(&mp_plat_print, "\nBoot with Normal mode\n");
+        }
+    }
+    #endif
+    return reset_mode;
+}
+#endif
+
+void boardctrl_before_soft_reset_loop(boardctrl_state_t *state) {
+    #if !MICROPY_HW_USES_BOOTLOADER
+    // Update the reset_mode via the default
+    // method which uses the board switch/button and LEDs.
+    state->reset_mode = update_reset_mode(BOARDCTRL_RESET_MODE_NORMAL);
+    #endif
+}
+
+void boardctrl_top_soft_reset_loop(boardctrl_state_t *state) {
+}
+
+int boardctrl_run_boot_py(boardctrl_state_t *state) {
+    bool run_boot_py = state->reset_mode != BOARDCTRL_RESET_MODE_SAFE_MODE;
+
+    if (run_boot_py) {
+        // Run boot.py, if it exists.
+        const char *boot_py = "boot.py";
+        int ret = pyexec_file_if_exists(boot_py);
+
+        // Take action based on the execution result.
+        if (ret & PYEXEC_FORCED_EXIT) {
+            return BOARDCTRL_GOTO_SOFT_RESET_EXIT;
+        }
+        if (!ret) {
+            // There was an error, prevent main.py from running and flash LEDs.
+            state->reset_mode = BOARDCTRL_RESET_MODE_SAFE_MODE;
+            flash_error(4);
+        }
+    }
+    return BOARDCTRL_CONTINUE;
+}
+
+int boardctrl_run_main_py(boardctrl_state_t *state) {
+    bool run_main_py = state->reset_mode != BOARDCTRL_RESET_MODE_SAFE_MODE
+        && pyexec_mode_kind == PYEXEC_MODE_FRIENDLY_REPL;
+
+    if (run_main_py) {
+        // Run main.py (or what it was configured to be), if it exists.
+        const char *main_py;
+        if (MP_STATE_PORT(pyb_config_main) == MP_OBJ_NULL) {
+            main_py = "main.py";
+        } else {
+            main_py = mp_obj_str_get_str(MP_STATE_PORT(pyb_config_main));
+        }
+        int ret = pyexec_file_if_exists(main_py);
+
+        // Take action based on the execution result.
+        if (ret & PYEXEC_FORCED_EXIT) {
+            return BOARDCTRL_GOTO_SOFT_RESET_EXIT;
+        }
+        if (!ret) {
+            flash_error(3);
+        }
+    }
+
+    return BOARDCTRL_CONTINUE;
+}
+
+void boardctrl_start_soft_reset(boardctrl_state_t *state) {
+    state->log_soft_reset = true;
+}
+
+void boardctrl_end_soft_reset(boardctrl_state_t *state) {
+    // Set reset_mode to normal boot.
+    state->reset_mode = BOARDCTRL_RESET_MODE_NORMAL;
+}
diff --git a/ports/renesas-ra/boardctrl.h b/ports/renesas-ra/boardctrl.h
new file mode 100644
index 0000000000000..cc7918c35f90b
--- /dev/null
+++ b/ports/renesas-ra/boardctrl.h
@@ -0,0 +1,93 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+#ifndef MICROPY_INCLUDED_RENESAS_RA_BOARDCTRL_H
+#define MICROPY_INCLUDED_RENESAS_RA_BOARDCTRL_H
+
+#include "py/mpconfig.h"
+
+// Additional entries for use with pendsv_schedule_dispatch.
+#ifndef MICROPY_BOARD_PENDSV_ENTRIES
+#define MICROPY_BOARD_PENDSV_ENTRIES
+#endif
+
+#ifndef MICROPY_BOARD_STARTUP
+#define MICROPY_BOARD_STARTUP powerctrl_check_enter_bootloader
+#endif
+
+#ifndef MICROPY_BOARD_EARLY_INIT
+#define MICROPY_BOARD_EARLY_INIT()
+#endif
+
+#ifndef MICROPY_BOARD_BEFORE_SOFT_RESET_LOOP
+#define MICROPY_BOARD_BEFORE_SOFT_RESET_LOOP boardctrl_before_soft_reset_loop
+#endif
+
+#ifndef MICROPY_BOARD_TOP_SOFT_RESET_LOOP
+#define MICROPY_BOARD_TOP_SOFT_RESET_LOOP boardctrl_top_soft_reset_loop
+#endif
+
+#ifndef MICROPY_BOARD_RUN_BOOT_PY
+#define MICROPY_BOARD_RUN_BOOT_PY boardctrl_run_boot_py
+#endif
+
+#ifndef MICROPY_BOARD_RUN_MAIN_PY
+#define MICROPY_BOARD_RUN_MAIN_PY boardctrl_run_main_py
+#endif
+
+#ifndef MICROPY_BOARD_START_SOFT_RESET
+#define MICROPY_BOARD_START_SOFT_RESET boardctrl_start_soft_reset
+#endif
+
+#ifndef MICROPY_BOARD_END_SOFT_RESET
+#define MICROPY_BOARD_END_SOFT_RESET boardctrl_end_soft_reset
+#endif
+
+// Constants to return from boardctrl_run_boot_py, boardctrl_run_main_py.
+enum {
+    BOARDCTRL_CONTINUE,
+    BOARDCTRL_GOTO_SOFT_RESET_EXIT,
+};
+
+// Constants for boardctrl_state_t.reset_mode.
+enum {
+    BOARDCTRL_RESET_MODE_NORMAL = 1,
+    BOARDCTRL_RESET_MODE_SAFE_MODE = 2,
+    BOARDCTRL_RESET_MODE_FACTORY_FILESYSTEM = 3,
+};
+
+typedef struct _boardctrl_state_t {
+    uint8_t reset_mode;
+    bool log_soft_reset;
+} boardctrl_state_t;
+
+void boardctrl_before_soft_reset_loop(boardctrl_state_t *state);
+void boardctrl_top_soft_reset_loop(boardctrl_state_t *state);
+int boardctrl_run_boot_py(boardctrl_state_t *state);
+int boardctrl_run_main_py(boardctrl_state_t *state);
+void boardctrl_start_soft_reset(boardctrl_state_t *state);
+void boardctrl_end_soft_reset(boardctrl_state_t *state);
+
+#endif // MICROPY_INCLUDED_RENESAS_RA_BOARDCTRL_H
diff --git a/ports/renesas-ra/boards/RA4M1_CLICKER/board.json b/ports/renesas-ra/boards/RA4M1_CLICKER/board.json
new file mode 100644
index 0000000000000..1c3c4c8e91e22
--- /dev/null
+++ b/ports/renesas-ra/boards/RA4M1_CLICKER/board.json
@@ -0,0 +1,22 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [
+	"UART",
+	"SPI",
+	"I2C",
+	"ADC"
+    ],
+    "id": "RA4M1-CLICKER",
+    "images": [
+        "ra4m1_clicker_board.jpg",
+        "ra4m1_clicker_pins.jpg"
+    ],
+    "mcu": "RA4M1",
+    "product": "Mikroe RA4M1 Clicker",
+    "thumbnail": "",
+    "url": "https://www.mikroe.com/ra4m1-clicker",
+    "vendor": "MikroElektronika"
+}
diff --git a/ports/renesas-ra/boards/RA4M1_CLICKER/manifest.py b/ports/renesas-ra/boards/RA4M1_CLICKER/manifest.py
new file mode 100644
index 0000000000000..4a387915d37e0
--- /dev/null
+++ b/ports/renesas-ra/boards/RA4M1_CLICKER/manifest.py
@@ -0,0 +1,2 @@
+# We do not want to include default frozen modules,
+freeze("$(MPY_DIR)/drivers/sdcard", "sdcard.py")
diff --git a/ports/renesas-ra/boards/RA4M1_CLICKER/mpconfigboard.h b/ports/renesas-ra/boards/RA4M1_CLICKER/mpconfigboard.h
new file mode 100644
index 0000000000000..ec67d68b6584e
--- /dev/null
+++ b/ports/renesas-ra/boards/RA4M1_CLICKER/mpconfigboard.h
@@ -0,0 +1,59 @@
+// MCU config
+#define MICROPY_HW_BOARD_NAME       "RA4M1_CLICKER"
+#define MICROPY_HW_MCU_NAME         "RA4M1"
+#define MICROPY_HW_MCU_SYSCLK       48000000
+#define MICROPY_HW_MCU_PCLK         48000000
+
+// module config
+#define MICROPY_EMIT_THUMB          (0)
+#define MICROPY_EMIT_INLINE_THUMB   (0)
+#define MICROPY_PY_BUILTINS_COMPLEX (0)
+#define MICROPY_PY_GENERATOR_PEND_THROW (0)
+#define MICROPY_PY_MATH             (0)
+#define MICROPY_PY_UHEAPQ           (0)
+#define MICROPY_PY_UTIMEQ           (0)
+#define MICROPY_PY_THREAD           (0)
+
+// peripheral config
+#define MICROPY_HW_ENABLE_RTC       (1)
+#define MICROPY_HW_RTC_SOURCE       (0)         // 0: subclock, 1:LOCO
+#define MICROPY_HW_ENABLE_ADC       (1)
+#define MICROPY_HW_HAS_FLASH        (1)
+#define MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE (1)
+
+// board config
+
+// UART
+#define MICROPY_HW_UART0_TX         (pin_P411) // MBTX0
+#define MICROPY_HW_UART0_RX         (pin_P410) // MBRX0
+// #define MICROPY_HW_UART0_CTS     (pin_P103) // Disable (Conflict with SSLA0)
+#define MICROPY_HW_UART1_TX         (pin_P401) // REPL
+#define MICROPY_HW_UART1_RX         (pin_P402) // REPL
+#define MICROPY_HW_UART_REPL        HW_UART_1
+#define MICROPY_HW_UART_REPL_BAUD   115200
+
+// I2C
+// #define MICROPY_HW_I2C0_SCL       (pin_P400) // Disable (Conflict with REPL)
+// #define MICROPY_HW_I2C0_SDA       (pin_P401) // Disable (Conflict with REPL)
+#define MICROPY_HW_I2C1_SCL         (pin_P205)
+#define MICROPY_HW_I2C1_SDA         (pin_P206)
+
+// SPI
+#define MICROPY_HW_SPI0_SSL         (pin_P103)
+#define MICROPY_HW_SPI0_RSPCK       (pin_P102)
+#define MICROPY_HW_SPI0_MISO        (pin_P100)
+#define MICROPY_HW_SPI0_MOSI        (pin_P101)
+
+// Switch
+#define MICROPY_HW_HAS_SWITCH       (1)
+#define MICROPY_HW_USRSW_PIN        (pin_P304)
+#define MICROPY_HW_USRSW_PULL       (GPIO_NOPULL)
+#define MICROPY_HW_USRSW_EXTI_MODE  (GPIO_MODE_IT_FALLING)
+#define MICROPY_HW_USRSW_PRESSED    (0)
+
+// LEDs
+#define MICROPY_HW_LED1             (pin_P409)
+#define MICROPY_HW_LED2             (pin_P408)
+#define MICROPY_HW_LED_ON(pin)      mp_hal_pin_high(pin)
+#define MICROPY_HW_LED_OFF(pin)     mp_hal_pin_low(pin)
+#define MICROPY_HW_LED_TOGGLE(pin)  mp_hal_pin_toggle(pin)
diff --git a/ports/renesas-ra/boards/RA4M1_CLICKER/mpconfigboard.mk b/ports/renesas-ra/boards/RA4M1_CLICKER/mpconfigboard.mk
new file mode 100644
index 0000000000000..1758ce67388d3
--- /dev/null
+++ b/ports/renesas-ra/boards/RA4M1_CLICKER/mpconfigboard.mk
@@ -0,0 +1,9 @@
+CMSIS_MCU = RA4M1
+MCU_SERIES = m4
+LD_FILES = boards/RA4M1_CLICKER/ra4m1_clicker.ld
+
+# MicroPython settings
+MICROPY_VFS_FAT = 1
+
+# Don't include default frozen modules because MCU is tight on flash space
+FROZEN_MANIFEST ?= boards/RA4M1_CLICKER/manifest.py
diff --git a/ports/renesas-ra/boards/RA4M1_CLICKER/pins.csv b/ports/renesas-ra/boards/RA4M1_CLICKER/pins.csv
new file mode 100644
index 0000000000000..f051cf0bb00f6
--- /dev/null
+++ b/ports/renesas-ra/boards/RA4M1_CLICKER/pins.csv
@@ -0,0 +1,65 @@
+P000,P000
+P012,P012
+P013,P013
+P014,P014
+P100,P100
+P101,P101
+P102,P102
+P103,P103
+P107,P107
+P108,P108
+P109,P109
+P110,P110
+P112,P112
+P201,P201
+P205,P205
+P206,P206
+P300,P300
+P301,P301
+P302,P302
+P304,P304
+P400,P400
+P401,P401
+P402,P402
+P407,P407
+P408,P408
+P409,P409
+P410,P410
+P411,P411
+P501,P501
+P502,P502
+P914,P914
+P915,P915
+MBAN,P000
+GPIOHD10,P012
+GPIOHD9,P013
+GPIOHD8,P014
+MBMISO,P100
+MBMOSI,P101
+MBSCK,P102
+MBSSL,P103
+MBPWM,P107
+SWDIO,P108
+SWO,P109
+TDI,P110
+TSCAP,P112
+MD,P201
+MBSCLI,P205
+MBSDA1,P206
+SWCLK,P300
+SW2,P301
+MBINT,P302
+SW1,P304
+GPIOHD5,P400
+GPIOHD4,P401
+GPIOHD3,P402
+MBRST,P407
+LED2,P408
+LED1,P409
+MBRX0,P410
+MBTX0,P411
+GPIOHD7,P501
+GPIOHD6,P502
+USBDP,P914
+USBDM,P915
+
diff --git a/ports/renesas-ra/boards/RA4M1_CLICKER/ra4m1_clicker.ld b/ports/renesas-ra/boards/RA4M1_CLICKER/ra4m1_clicker.ld
new file mode 100644
index 0000000000000..0ce4e9267160f
--- /dev/null
+++ b/ports/renesas-ra/boards/RA4M1_CLICKER/ra4m1_clicker.ld
@@ -0,0 +1,298 @@
+/*
+                  Linker File for RA4M1 MCU
+*/
+
+/* Linker script to configure memory regions. */
+MEMORY
+{
+  FLASH (rx)         : ORIGIN = 0x00000000, LENGTH = 0x00040000  /* 256KB */
+  RAM (rwx)          : ORIGIN = 0x20000000, LENGTH = 0x00008000  /* 32KB */
+  DATA_FLASH (rx)    : ORIGIN = 0x40100000, LENGTH = 0x00002000  /* 8KB */
+  ID_CODE (rx)       : ORIGIN = 0x01010018, LENGTH = 0x00000020  /* 32bytes */
+}
+
+/* Library configurations */
+/*GROUP(libgcc.a libc.a libm.a libnosys.a) */
+
+/* Linker script to place sections and symbol values. Should be used together
+ * with other linker script that defines memory regions FLASH and RAM.
+ * It references following symbols, which must be defined in code:
+ *   Reset_Handler : Entry of reset handler
+ *
+ * It defines following symbols, which code can use without definition:
+ *   __exidx_start
+ *   __exidx_end
+ *   __copy_table_start__
+ *   __copy_table_end__
+ *   __zero_table_start__
+ *   __zero_table_end__
+ *   __etext
+ *   __data_start__
+ *   __preinit_array_start
+ *   __preinit_array_end
+ *   __init_array_start
+ *   __init_array_end
+ *   __fini_array_start
+ *   __fini_array_end
+ *   __data_end__
+ *   __bss_start__
+ *   __bss_end__
+ *   __end__
+ *   end
+ *   __HeapLimit
+ *   __StackLimit
+ *   __StackTop
+ *   __stack
+ *   __Vectors_End
+ *   __Vectors_Size
+ */
+ENTRY(Reset_Handler)
+
+SECTIONS
+{
+    .text :
+    {
+        _stext = .;
+        __ROM_Start = .;
+
+        /* Even though the vector table is not 256 entries (1KB) long, we still allocate that much
+         * space because ROM registers are at address 0x400 and there is very little space
+         * in between. */
+        KEEP(*(.fixed_vectors*))
+        KEEP(*(.application_vectors*))
+        __Vectors_End = .;
+        __end__ = .;
+
+        /* ROM Registers start at address 0x00000400 */
+        . = __ROM_Start + 0x400;
+        KEEP(*(.rom_registers*))
+
+        /* Reserving 0x100 bytes of space for ROM registers. */
+        . = __ROM_Start + 0x500;
+
+        *(.text*)
+
+        KEEP(*(.version))
+        KEEP(*(.init))
+        KEEP(*(.fini))
+
+        /* .ctors */
+        *crtbegin.o(.ctors)
+        *crtbegin?.o(.ctors)
+        *(EXCLUDE_FILE(*crtend?.o *crtend.o) .ctors)
+        *(SORT(.ctors.*))
+        *(.ctors)
+
+        /* .dtors */
+        *crtbegin.o(.dtors)
+        *crtbegin?.o(.dtors)
+        *(EXCLUDE_FILE(*crtend?.o *crtend.o) .dtors)
+        *(SORT(.dtors.*))
+        *(.dtors)
+
+        *(.rodata*)
+        __usb_dev_descriptor_start_fs = .;
+        KEEP(*(.usb_device_desc_fs*))
+        __usb_cfg_descriptor_start_fs = .;
+        KEEP(*(.usb_config_desc_fs*))
+        __usb_interface_descriptor_start_fs = .;
+        KEEP(*(.usb_interface_desc_fs*))
+        __usb_descriptor_end_fs = .;
+        __usb_dev_descriptor_start_hs = .;
+        KEEP(*(.usb_device_desc_hs*))
+        __usb_cfg_descriptor_start_hs = .;
+        KEEP(*(.usb_config_desc_hs*))
+        __usb_interface_descriptor_start_hs = .;
+        KEEP(*(.usb_interface_desc_hs*))
+        __usb_descriptor_end_hs = .;
+
+        KEEP(*(.eh_frame*))
+
+        __ROM_End = .;
+        _etext = .;
+    } > FLASH = 0xFF
+
+    __Vectors_Size = __Vectors_End - __Vectors;
+
+    .ARM.extab :
+    {
+        *(.ARM.extab* .gnu.linkonce.armextab.*)
+    } > FLASH
+
+    __exidx_start = .;
+    .ARM.exidx :
+    {
+        *(.ARM.exidx* .gnu.linkonce.armexidx.*)
+    } > FLASH
+    __exidx_end = .;
+
+    /* To copy multiple ROM to RAM sections,
+     * uncomment .copy.table section and,
+     * define __STARTUP_COPY_MULTIPLE in startup_ARMCMx.S */
+    /*
+    .copy.table :
+    {
+        . = ALIGN(4);
+        __copy_table_start__ = .;
+        LONG (__etext)
+        LONG (__data_start__)
+        LONG (__data_end__ - __data_start__)
+        LONG (__etext2)
+        LONG (__data2_start__)
+        LONG (__data2_end__ - __data2_start__)
+        __copy_table_end__ = .;
+    } > FLASH
+    */
+
+    /* To clear multiple BSS sections,
+     * uncomment .zero.table section and,
+     * define __STARTUP_CLEAR_BSS_MULTIPLE in startup_ARMCMx.S */
+    /*
+    .zero.table :
+    {
+        . = ALIGN(4);
+        __zero_table_start__ = .;
+        LONG (__bss_start__)
+        LONG (__bss_end__ - __bss_start__)
+        LONG (__bss2_start__)
+        LONG (__bss2_end__ - __bss2_start__)
+        __zero_table_end__ = .;
+    } > FLASH
+    */
+
+    __etext = .;
+
+    /* If DTC is used, put the DTC vector table at the start of SRAM.
+       This avoids memory holes due to 1K alignment required by it. */
+    .fsp_dtc_vector_table (NOLOAD) :
+    {
+        . = ORIGIN(RAM);
+        *(.fsp_dtc_vector_table)
+    } > RAM
+
+    /* Initialized data section. */
+    .data :
+    {
+        _sidata = .;
+        _sdata = .;
+        __data_start__ = .;
+        *(vtable)
+        *(.data.*)
+
+        . = ALIGN(4);
+        /* preinit data */
+        PROVIDE_HIDDEN (__preinit_array_start = .);
+        KEEP(*(.preinit_array))
+        PROVIDE_HIDDEN (__preinit_array_end = .);
+
+        . = ALIGN(4);
+        /* init data */
+        PROVIDE_HIDDEN (__init_array_start = .);
+        KEEP(*(SORT(.init_array.*)))
+        KEEP(*(.init_array))
+        PROVIDE_HIDDEN (__init_array_end = .);
+
+
+        . = ALIGN(4);
+        /* finit data */
+        PROVIDE_HIDDEN (__fini_array_start = .);
+        KEEP(*(SORT(.fini_array.*)))
+        KEEP(*(.fini_array))
+        PROVIDE_HIDDEN (__fini_array_end = .);
+
+        KEEP(*(.jcr*))
+        . = ALIGN(4);
+
+        __Code_In_RAM_Start = .;
+
+        KEEP(*(.code_in_ram*))
+        __Code_In_RAM_End = .;
+
+        /* All data end */
+        __data_end__ = .;
+        _edata = .;
+
+    } > RAM AT > FLASH
+
+
+
+    .noinit (NOLOAD):
+    {
+        . = ALIGN(4);
+        __noinit_start = .;
+        KEEP(*(.noinit*))
+        __noinit_end = .;
+    } > RAM
+
+    .bss :
+    {
+        . = ALIGN(4);
+        _sbss = .;
+        __bss_start__ = .;
+        *(.bss*)
+        *(COMMON)
+        . = ALIGN(4);
+        __bss_end__ = .;
+        _ebss = .;
+    } > RAM
+
+    .heap (NOLOAD):
+    {
+        . = ALIGN(8);
+        __HeapBase = .;
+        __end__ = .;
+        end = __end__;
+        KEEP(*(.heap*))
+        __HeapLimit = .;
+    } > RAM
+
+    /* Stacks are stored in this section. */
+    .stack_dummy (NOLOAD):
+    {
+        . = ALIGN(8);
+        _sstack = .;
+        __StackLimit = .;
+        /* Main stack */
+        KEEP(*(.stack))
+        __StackTop = .;
+        /* Thread stacks */
+        KEEP(*(.stack*))
+        __StackTopAll = .;
+        _estack = .;
+    } > RAM
+
+    PROVIDE(__stack = __StackTopAll);
+
+    /* This symbol represents the end of user allocated RAM. The RAM after this symbol can be used
+       at run time for things such as ThreadX memory pool allocations. */
+    __RAM_segment_used_end__ = ALIGN(__StackTopAll , 4);
+
+    /* Data flash. */
+    .data_flash :
+    {
+        __Data_Flash_Start = .;
+        KEEP(*(.data_flash*))
+        __Data_Flash_End = .;
+    } > DATA_FLASH
+
+    .id_code :
+    {
+        __ID_Code_Start = .;
+        KEEP(*(.id_code*))
+        __ID_Code_End = .;
+    } > ID_CODE
+}
+/* produce a link error if there is not this amount of RAM for these sections */
+/* _minimum_stack_size = 2K; */
+/* _minimum_heap_size = 16K; */
+
+/* Define tho top end of the stack.  The stack is full descending so begins just
+   above last byte of RAM.  Note that EABI requires the stack to be 8-byte
+   aligned for a call. */
+_estack = ORIGIN(RAM) + LENGTH(RAM);
+
+/* RAM extents for the garbage collector */
+_ram_start = ORIGIN(RAM);
+_ram_end = ORIGIN(RAM) + LENGTH(RAM);
+_heap_start = __HeapBase;	/* heap starts just after statically allocated memory */
+_heap_end = __HeapLimit;	/* tunable */
diff --git a/ports/renesas-ra/boards/RA4M1_CLICKER/ra4m1_clicker_conf.h b/ports/renesas-ra/boards/RA4M1_CLICKER/ra4m1_clicker_conf.h
new file mode 100644
index 0000000000000..6427e964bc65d
--- /dev/null
+++ b/ports/renesas-ra/boards/RA4M1_CLICKER/ra4m1_clicker_conf.h
@@ -0,0 +1,30 @@
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Renesas Electronics Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#ifndef RA4M1_CLICKER_CONF_H
+#define RA4M1_CLICKER_CONF_H
+
+#define DEBUG_CH    0
+
+#endif /* RA4M1_CLICKER_CONF_H */
diff --git a/ports/renesas-ra/boards/RA4M1_CLICKER/ra_cfg/fsp_cfg/bsp/board_cfg.h b/ports/renesas-ra/boards/RA4M1_CLICKER/ra_cfg/fsp_cfg/bsp/board_cfg.h
new file mode 100644
index 0000000000000..87cb51e00ba74
--- /dev/null
+++ b/ports/renesas-ra/boards/RA4M1_CLICKER/ra_cfg/fsp_cfg/bsp/board_cfg.h
@@ -0,0 +1,5 @@
+/* generated configuration header file - do not edit */
+#ifndef BOARD_CFG_H_
+#define BOARD_CFG_H_
+void bsp_init(void *p_args);
+#endif /* BOARD_CFG_H_ */
diff --git a/ports/renesas-ra/boards/RA4M1_CLICKER/ra_cfg/fsp_cfg/bsp/bsp_cfg.h b/ports/renesas-ra/boards/RA4M1_CLICKER/ra_cfg/fsp_cfg/bsp/bsp_cfg.h
new file mode 100644
index 0000000000000..9940d7ed3beda
--- /dev/null
+++ b/ports/renesas-ra/boards/RA4M1_CLICKER/ra_cfg/fsp_cfg/bsp/bsp_cfg.h
@@ -0,0 +1,49 @@
+/* generated configuration header file - do not edit */
+#ifndef BSP_CFG_H_
+#define BSP_CFG_H_
+#include "bsp_clock_cfg.h"
+#include "bsp_mcu_family_cfg.h"
+#include "board_cfg.h"
+#define RA_NOT_DEFINED 0
+#ifndef BSP_CFG_RTOS
+#if (RA_NOT_DEFINED) != (RA_NOT_DEFINED)
+#define BSP_CFG_RTOS (2)
+#elif (RA_NOT_DEFINED) != (RA_NOT_DEFINED)
+#define BSP_CFG_RTOS (1)
+#else
+#define BSP_CFG_RTOS (0)
+#endif
+#endif
+#undef RA_NOT_DEFINED
+#define BSP_CFG_MCU_VCC_MV (3300)
+#define BSP_CFG_STACK_MAIN_BYTES (0x1000)
+#define BSP_CFG_HEAP_BYTES (0x4980)
+#define BSP_CFG_PARAM_CHECKING_ENABLE (0)
+#define BSP_CFG_ASSERT (0)
+#define BSP_CFG_ERROR_LOG (0)
+
+#define BSP_CFG_PFS_PROTECT ((1))
+
+#define BSP_CFG_C_RUNTIME_INIT ((1))
+
+#define BSP_CFG_SOFT_RESET_SUPPORTED ((0))
+
+#ifndef BSP_CLOCK_CFG_MAIN_OSC_POPULATED
+#define BSP_CLOCK_CFG_MAIN_OSC_POPULATED (1)
+#endif
+#ifndef BSP_CLOCK_CFG_MAIN_OSC_WAIT
+#define BSP_CLOCK_CFG_MAIN_OSC_WAIT (9)
+#endif
+#ifndef BSP_CLOCK_CFG_MAIN_OSC_CLOCK_SOURCE
+#define BSP_CLOCK_CFG_MAIN_OSC_CLOCK_SOURCE (0)
+#endif
+#ifndef BSP_CLOCK_CFG_SUBCLOCK_DRIVE
+#define BSP_CLOCK_CFG_SUBCLOCK_DRIVE (0)
+#endif
+#ifndef BSP_CLOCK_CFG_SUBCLOCK_POPULATED
+#define BSP_CLOCK_CFG_SUBCLOCK_POPULATED (1)
+#endif
+#ifndef BSP_CLOCK_CFG_SUBCLOCK_STABILIZATION_MS
+#define BSP_CLOCK_CFG_SUBCLOCK_STABILIZATION_MS 1000
+#endif
+#endif /* BSP_CFG_H_ */
diff --git a/ports/renesas-ra/boards/RA4M1_CLICKER/ra_cfg/fsp_cfg/bsp/bsp_mcu_device_cfg.h b/ports/renesas-ra/boards/RA4M1_CLICKER/ra_cfg/fsp_cfg/bsp/bsp_mcu_device_cfg.h
new file mode 100644
index 0000000000000..444d32e5606c8
--- /dev/null
+++ b/ports/renesas-ra/boards/RA4M1_CLICKER/ra_cfg/fsp_cfg/bsp/bsp_mcu_device_cfg.h
@@ -0,0 +1,5 @@
+/* generated configuration header file - do not edit */
+#ifndef BSP_MCU_DEVICE_CFG_H_
+#define BSP_MCU_DEVICE_CFG_H_
+#define BSP_CFG_MCU_PART_SERIES (4)
+#endif /* BSP_MCU_DEVICE_CFG_H_ */
diff --git a/ports/renesas-ra/boards/RA4M1_CLICKER/ra_cfg/fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h b/ports/renesas-ra/boards/RA4M1_CLICKER/ra_cfg/fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h
new file mode 100644
index 0000000000000..713af295bcfaa
--- /dev/null
+++ b/ports/renesas-ra/boards/RA4M1_CLICKER/ra_cfg/fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h
@@ -0,0 +1,10 @@
+/* generated configuration header file - do not edit */
+#ifndef BSP_MCU_DEVICE_PN_CFG_H_
+#define BSP_MCU_DEVICE_PN_CFG_H_
+#define BSP_MCU_R7FA4M1AB3CFM
+#define BSP_ROM_SIZE_BYTES (262144)
+#define BSP_RAM_SIZE_BYTES (32768)
+#define BSP_DATA_FLASH_SIZE_BYTES (8192)
+#define BSP_PACKAGE_LQFP
+#define BSP_PACKAGE_PINS (64)
+#endif /* BSP_MCU_DEVICE_PN_CFG_H_ */
diff --git a/ports/renesas-ra/boards/RA4M1_CLICKER/ra_cfg/fsp_cfg/bsp/bsp_mcu_family_cfg.h b/ports/renesas-ra/boards/RA4M1_CLICKER/ra_cfg/fsp_cfg/bsp/bsp_mcu_family_cfg.h
new file mode 100644
index 0000000000000..4766823b355bb
--- /dev/null
+++ b/ports/renesas-ra/boards/RA4M1_CLICKER/ra_cfg/fsp_cfg/bsp/bsp_mcu_family_cfg.h
@@ -0,0 +1,74 @@
+/* generated configuration header file - do not edit */
+#ifndef BSP_MCU_FAMILY_CFG_H_
+#define BSP_MCU_FAMILY_CFG_H_
+#include "bsp_mcu_device_pn_cfg.h"
+#include "bsp_mcu_device_cfg.h"
+#include "../../../ra/fsp/src/bsp/mcu/ra4m1/bsp_mcu_info.h"
+#include "bsp_clock_cfg.h"
+#define BSP_MCU_GROUP_RA4M1 (1)
+#define BSP_LOCO_HZ                 (32768)
+#define BSP_MOCO_HZ                 (8000000)
+#define BSP_SUB_CLOCK_HZ            (32768)
+#if   BSP_CFG_HOCO_FREQUENCY == 0
+#define BSP_HOCO_HZ             (24000000)
+#elif BSP_CFG_HOCO_FREQUENCY == 2
+#define BSP_HOCO_HZ             (32000000)
+#elif BSP_CFG_HOCO_FREQUENCY == 4
+#define BSP_HOCO_HZ             (48000000)
+#elif BSP_CFG_HOCO_FREQUENCY == 5
+#define BSP_HOCO_HZ             (64000000)
+#else
+#error "Invalid HOCO frequency chosen (BSP_CFG_HOCO_FREQUENCY) in bsp_clock_cfg.h"
+#endif
+#define BSP_CORTEX_VECTOR_TABLE_ENTRIES    (16U)
+#define BSP_VECTOR_TABLE_MAX_ENTRIES       (48U)
+#define BSP_MCU_VBATT_SUPPORT       (1)
+
+#define OFS_SEQ1 0xA001A001 | (1 << 1) | (3 << 2)
+#define OFS_SEQ2 (15 << 4) | (3 << 8) | (3 << 10)
+#define OFS_SEQ3 (1 << 12) | (1 << 14) | (1 << 17)
+#define OFS_SEQ4 (3 << 18) | (15 << 20) | (3 << 24) | (3 << 26)
+#define OFS_SEQ5 (1 << 28) | (1 << 30)
+#define BSP_CFG_ROM_REG_OFS0 (OFS_SEQ1 | OFS_SEQ2 | OFS_SEQ3 | OFS_SEQ4 | OFS_SEQ5)
+#define BSP_CFG_ROM_REG_OFS1 (0xFFFFFEC3 | (1 << 2) | (3 << 3) | (0 << 8))
+#define BSP_CFG_USE_LOW_VOLTAGE_MODE ((0))
+#define BSP_CFG_ROM_REG_MPU_PC0_ENABLE (1)
+#define BSP_CFG_ROM_REG_MPU_PC0_START (0x00FFFFFC)
+#define BSP_CFG_ROM_REG_MPU_PC0_END (0x00FFFFFF)
+#define BSP_CFG_ROM_REG_MPU_PC1_ENABLE (1)
+#define BSP_CFG_ROM_REG_MPU_PC1_START (0x00FFFFFC)
+#define BSP_CFG_ROM_REG_MPU_PC1_END (0x00FFFFFF)
+#define BSP_CFG_ROM_REG_MPU_REGION0_ENABLE (1)
+#define BSP_CFG_ROM_REG_MPU_REGION0_START (0x00FFFFFC)
+#define BSP_CFG_ROM_REG_MPU_REGION0_END (0x00FFFFFF)
+#define BSP_CFG_ROM_REG_MPU_REGION1_ENABLE (1)
+#define BSP_CFG_ROM_REG_MPU_REGION1_START (0x200FFFFC)
+#define BSP_CFG_ROM_REG_MPU_REGION1_END (0x200FFFFF)
+#define BSP_CFG_ROM_REG_MPU_REGION2_ENABLE (1)
+#define BSP_CFG_ROM_REG_MPU_REGION2_START (0x407FFFFC)
+#define BSP_CFG_ROM_REG_MPU_REGION2_END (0x407FFFFF)
+#define BSP_CFG_ROM_REG_MPU_REGION3_ENABLE (1)
+#define BSP_CFG_ROM_REG_MPU_REGION3_START (0x400DFFFC)
+#define BSP_CFG_ROM_REG_MPU_REGION3_END (0x400DFFFF)
+
+/* Used to create IELS values for the interrupt initialization table g_interrupt_event_link_select. */
+#define BSP_PRV_IELS_ENUM(vector)    (ELC_##vector)
+
+/*
+ ID Code
+ Note: To permanently lock and disable the debug interface define the BSP_ID_CODE_PERMANENTLY_LOCKED in the compiler settings.
+ WARNING: This will disable debug access to the part and cannot be reversed by a debug probe.
+ */
+#if defined(BSP_ID_CODE_PERMANENTLY_LOCKED)
+#define BSP_CFG_ID_CODE_LONG_1 (0x00000000)
+#define BSP_CFG_ID_CODE_LONG_2 (0x00000000)
+#define BSP_CFG_ID_CODE_LONG_3 (0x00000000)
+#define BSP_CFG_ID_CODE_LONG_4 (0x00000000)
+#else
+/* ID CODE: FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF */
+#define BSP_CFG_ID_CODE_LONG_1 (0xFFFFFFFF)
+#define BSP_CFG_ID_CODE_LONG_2 (0xFFFFFFFF)
+#define BSP_CFG_ID_CODE_LONG_3 (0xFFFFFFFF)
+#define BSP_CFG_ID_CODE_LONG_4 (0xffFFFFFF)
+#endif
+#endif /* BSP_MCU_FAMILY_CFG_H_ */
diff --git a/ports/renesas-ra/boards/RA4M1_CLICKER/ra_cfg/fsp_cfg/r_adc_cfg.h b/ports/renesas-ra/boards/RA4M1_CLICKER/ra_cfg/fsp_cfg/r_adc_cfg.h
new file mode 100644
index 0000000000000..9c59889ca8fee
--- /dev/null
+++ b/ports/renesas-ra/boards/RA4M1_CLICKER/ra_cfg/fsp_cfg/r_adc_cfg.h
@@ -0,0 +1,5 @@
+/* generated configuration header file - do not edit */
+#ifndef R_ADC_CFG_H_
+#define R_ADC_CFG_H_
+#define ADC_CFG_PARAM_CHECKING_ENABLE (BSP_CFG_PARAM_CHECKING_ENABLE)
+#endif /* R_ADC_CFG_H_ */
diff --git a/ports/renesas-ra/boards/RA4M1_CLICKER/ra_cfg/fsp_cfg/r_agt_cfg.h b/ports/renesas-ra/boards/RA4M1_CLICKER/ra_cfg/fsp_cfg/r_agt_cfg.h
new file mode 100644
index 0000000000000..d3ab559238cbd
--- /dev/null
+++ b/ports/renesas-ra/boards/RA4M1_CLICKER/ra_cfg/fsp_cfg/r_agt_cfg.h
@@ -0,0 +1,7 @@
+/* generated configuration header file - do not edit */
+#ifndef R_AGT_CFG_H_
+#define R_AGT_CFG_H_
+#define AGT_CFG_PARAM_CHECKING_ENABLE (BSP_CFG_PARAM_CHECKING_ENABLE)
+#define AGT_CFG_OUTPUT_SUPPORT_ENABLE (0)
+#define AGT_CFG_INPUT_SUPPORT_ENABLE (0)
+#endif /* R_AGT_CFG_H_ */
diff --git a/ports/renesas-ra/boards/RA4M1_CLICKER/ra_cfg/fsp_cfg/r_dtc_cfg.h b/ports/renesas-ra/boards/RA4M1_CLICKER/ra_cfg/fsp_cfg/r_dtc_cfg.h
new file mode 100644
index 0000000000000..21405f96741e2
--- /dev/null
+++ b/ports/renesas-ra/boards/RA4M1_CLICKER/ra_cfg/fsp_cfg/r_dtc_cfg.h
@@ -0,0 +1,6 @@
+/* generated configuration header file - do not edit */
+#ifndef R_DTC_CFG_H_
+#define R_DTC_CFG_H_
+#define DTC_CFG_PARAM_CHECKING_ENABLE (BSP_CFG_PARAM_CHECKING_ENABLE)
+#define DTC_CFG_VECTOR_TABLE_SECTION_NAME ".fsp_dtc_vector_table"
+#endif /* R_DTC_CFG_H_ */
diff --git a/ports/renesas-ra/boards/RA4M1_CLICKER/ra_cfg/fsp_cfg/r_flash_lp_cfg.h b/ports/renesas-ra/boards/RA4M1_CLICKER/ra_cfg/fsp_cfg/r_flash_lp_cfg.h
new file mode 100644
index 0000000000000..26879f9f4e52a
--- /dev/null
+++ b/ports/renesas-ra/boards/RA4M1_CLICKER/ra_cfg/fsp_cfg/r_flash_lp_cfg.h
@@ -0,0 +1,7 @@
+/* generated configuration header file - do not edit */
+#ifndef R_FLASH_LP_CFG_H_
+#define R_FLASH_LP_CFG_H_
+#define FLASH_LP_CFG_PARAM_CHECKING_ENABLE (BSP_CFG_PARAM_CHECKING_ENABLE)
+#define FLASH_LP_CFG_CODE_FLASH_PROGRAMMING_ENABLE (1)
+#define FLASH_LP_CFG_DATA_FLASH_PROGRAMMING_ENABLE (0)
+#endif /* R_FLASH_LP_CFG_H_ */
diff --git a/ports/renesas-ra/boards/RA4M1_CLICKER/ra_cfg/fsp_cfg/r_icu_cfg.h b/ports/renesas-ra/boards/RA4M1_CLICKER/ra_cfg/fsp_cfg/r_icu_cfg.h
new file mode 100644
index 0000000000000..5e77b6980f4ee
--- /dev/null
+++ b/ports/renesas-ra/boards/RA4M1_CLICKER/ra_cfg/fsp_cfg/r_icu_cfg.h
@@ -0,0 +1,5 @@
+/* generated configuration header file - do not edit */
+#ifndef R_ICU_CFG_H_
+#define R_ICU_CFG_H_
+#define ICU_CFG_PARAM_CHECKING_ENABLE (BSP_CFG_PARAM_CHECKING_ENABLE)
+#endif /* R_ICU_CFG_H_ */
diff --git a/ports/renesas-ra/boards/RA4M1_CLICKER/ra_cfg/fsp_cfg/r_iic_master_cfg.h b/ports/renesas-ra/boards/RA4M1_CLICKER/ra_cfg/fsp_cfg/r_iic_master_cfg.h
new file mode 100644
index 0000000000000..595ea938d13a7
--- /dev/null
+++ b/ports/renesas-ra/boards/RA4M1_CLICKER/ra_cfg/fsp_cfg/r_iic_master_cfg.h
@@ -0,0 +1,7 @@
+/* generated configuration header file - do not edit */
+#ifndef R_IIC_MASTER_CFG_H_
+#define R_IIC_MASTER_CFG_H_
+#define IIC_MASTER_CFG_PARAM_CHECKING_ENABLE (BSP_CFG_PARAM_CHECKING_ENABLE)
+#define IIC_MASTER_CFG_DTC_ENABLE (0)
+#define IIC_MASTER_CFG_ADDR_MODE_10_BIT_ENABLE (0)
+#endif /* R_IIC_MASTER_CFG_H_ */
diff --git a/ports/renesas-ra/boards/RA4M1_CLICKER/ra_cfg/fsp_cfg/r_ioport_cfg.h b/ports/renesas-ra/boards/RA4M1_CLICKER/ra_cfg/fsp_cfg/r_ioport_cfg.h
new file mode 100644
index 0000000000000..6b4353d238352
--- /dev/null
+++ b/ports/renesas-ra/boards/RA4M1_CLICKER/ra_cfg/fsp_cfg/r_ioport_cfg.h
@@ -0,0 +1,5 @@
+/* generated configuration header file - do not edit */
+#ifndef R_IOPORT_CFG_H_
+#define R_IOPORT_CFG_H_
+#define IOPORT_CFG_PARAM_CHECKING_ENABLE (BSP_CFG_PARAM_CHECKING_ENABLE)
+#endif /* R_IOPORT_CFG_H_ */
diff --git a/ports/renesas-ra/boards/RA4M1_CLICKER/ra_cfg/fsp_cfg/r_lpm_cfg.h b/ports/renesas-ra/boards/RA4M1_CLICKER/ra_cfg/fsp_cfg/r_lpm_cfg.h
new file mode 100644
index 0000000000000..5f4d5c4a73627
--- /dev/null
+++ b/ports/renesas-ra/boards/RA4M1_CLICKER/ra_cfg/fsp_cfg/r_lpm_cfg.h
@@ -0,0 +1,5 @@
+/* generated configuration header file - do not edit */
+#ifndef R_LPM_CFG_H_
+#define R_LPM_CFG_H_
+#define LPM_CFG_PARAM_CHECKING_ENABLE (BSP_CFG_PARAM_CHECKING_ENABLE)
+#endif /* R_LPM_CFG_H_ */
diff --git a/ports/renesas-ra/boards/RA4M1_CLICKER/ra_cfg/fsp_cfg/r_rtc_cfg.h b/ports/renesas-ra/boards/RA4M1_CLICKER/ra_cfg/fsp_cfg/r_rtc_cfg.h
new file mode 100644
index 0000000000000..484b7ed044c26
--- /dev/null
+++ b/ports/renesas-ra/boards/RA4M1_CLICKER/ra_cfg/fsp_cfg/r_rtc_cfg.h
@@ -0,0 +1,5 @@
+/* generated configuration header file - do not edit */
+#ifndef R_RTC_CFG_H_
+#define R_RTC_CFG_H_
+#define RTC_CFG_PARAM_CHECKING_ENABLE (BSP_CFG_PARAM_CHECKING_ENABLE)
+#endif /* R_RTC_CFG_H_ */
diff --git a/ports/renesas-ra/boards/RA4M1_CLICKER/ra_cfg/fsp_cfg/r_sci_uart_cfg.h b/ports/renesas-ra/boards/RA4M1_CLICKER/ra_cfg/fsp_cfg/r_sci_uart_cfg.h
new file mode 100644
index 0000000000000..c70c0be344f9d
--- /dev/null
+++ b/ports/renesas-ra/boards/RA4M1_CLICKER/ra_cfg/fsp_cfg/r_sci_uart_cfg.h
@@ -0,0 +1,8 @@
+/* generated configuration header file - do not edit */
+#ifndef R_SCI_UART_CFG_H_
+#define R_SCI_UART_CFG_H_
+#define SCI_UART_CFG_PARAM_CHECKING_ENABLE (BSP_CFG_PARAM_CHECKING_ENABLE)
+#define SCI_UART_CFG_FIFO_SUPPORT (0)
+#define SCI_UART_CFG_DTC_SUPPORTED (0)
+#define SCI_UART_CFG_FLOW_CONTROL_SUPPORT (0)
+#endif /* R_SCI_UART_CFG_H_ */
diff --git a/ports/renesas-ra/boards/RA4M1_CLICKER/ra_cfg/fsp_cfg/r_spi_cfg.h b/ports/renesas-ra/boards/RA4M1_CLICKER/ra_cfg/fsp_cfg/r_spi_cfg.h
new file mode 100644
index 0000000000000..861fe12194f63
--- /dev/null
+++ b/ports/renesas-ra/boards/RA4M1_CLICKER/ra_cfg/fsp_cfg/r_spi_cfg.h
@@ -0,0 +1,7 @@
+/* generated configuration header file - do not edit */
+#ifndef R_SPI_CFG_H_
+#define R_SPI_CFG_H_
+#define SPI_CFG_PARAM_CHECKING_ENABLE (BSP_CFG_PARAM_CHECKING_ENABLE)
+#define SPI_DTC_SUPPORT_ENABLE (1)
+#define SPI_TRANSMIT_FROM_RXI_ISR (0)
+#endif /* R_SPI_CFG_H_ */
diff --git a/ports/renesas-ra/boards/RA4M1_CLICKER/ra_gen/R7FA4M1AB3CFM.csv b/ports/renesas-ra/boards/RA4M1_CLICKER/ra_gen/R7FA4M1AB3CFM.csv
new file mode 100644
index 0000000000000..da414f0e844e8
--- /dev/null
+++ b/ports/renesas-ra/boards/RA4M1_CLICKER/ra_gen/R7FA4M1AB3CFM.csv
@@ -0,0 +1,352 @@
+"Name","Pin","Function","Drive Capacity","IRQ","Mode","Output type","Pull up","Port Capabilities"
+"AVCC0","56","ADC_AVCC0","","","","","",""
+"AVSS0","57","ADC_AVSS0","","","","","",""
+"P000","64","","","","Disabled","","","ADC0: AN00
+CTSU0: TS21
+IRQ0: IRQ06
+OPAMP0: AMP+"
+"P001","63","","","","Disabled","","","ADC0: AN01
+CTSU0: TS22
+IRQ0: IRQ07
+OPAMP0: AMP-"
+"P002","62","","","","Disabled","","","ADC0: AN02
+IRQ0: IRQ02
+OPAMP0: AMPO"
+"P003","61","","","","Disabled","","","ADC0: AN03
+OPAMP1: AMPO"
+"P004","60","","","","Disabled","","","ADC0: AN04
+IRQ0: IRQ03
+OPAMP2: AMPO"
+"P010","59","","","","Disabled","","","ADC: VREFH0
+ADC0: AN05
+CTSU0: TS30
+OPAMP2: AMP-"
+"P011","58","","","","Disabled","","","ADC: VREFL0
+ADC0: AN06
+CTSU0: TS31
+IRQ0: IRQ15
+OPAMP2: AMP+"
+"P012","55","","","","Disabled","","","ADC: VREFH
+ADC0: AN07
+OPAMP1: AMP-"
+"P013","54","","","","Disabled","","","ADC: VREFL
+ADC0: AN08
+OPAMP1: AMP+"
+"P014","53","","","","Disabled","","","ADC0: AN09
+DAC120: DA"
+"P015","52","","","","Disabled","","","ADC0: AN10
+CTSU0: TS28
+IRQ0: IRQ07"
+"P100","48","SPI0_MISO","Low","None","Peripheral mode","CMOS","None","ADC0: AN22
+AGT0: AGTIO
+CMP0: CMPIN0
+GPT5: GTIOCB
+IIC1: SCL
+IRQ0: IRQ02
+KINT0: KRM0
+POEG0: GTETRG
+SCI0: RXD_MISO
+SCI0: SCL
+SCI1: SCK
+SLCDC0: VL1
+SPI0: MISO"
+"P101","47","SPI0_MOSI","Low","None","Peripheral mode","CMOS","None","ADC0: AN21
+AGT0: AGTEE
+CMP0: CMPREF0
+GPT5: GTIOCA
+IIC1: SDA
+IRQ0: IRQ01
+KINT0: KRM1
+POEG1: GTETRG
+SCI0: SDA
+SCI0: TXD_MOSI
+SCI1: CTS_RTS_SS
+SLCDC0: VL2
+SPI0: MOSI"
+"P102","46","SPI0_RSPCK","Low","","Peripheral mode","CMOS","None","ADC0: ADTRG
+ADC0: AN20
+AGT0: AGTO
+CAN0: CRX
+CMP0: CMPIN1
+GPT2: GTIOCB
+KINT0: KRM2
+OPS0: GTOWLO
+SCI0: SCK
+SCI2: SDA
+SCI2: TXD_MOSI
+SLCDC0: VL3
+SPI0: RSPCK"
+"P103","45","","","","Disabled","","","ADC0: AN19
+CAN0: CTX
+CMP0: CMPREF1
+GPT2: GTIOCA
+KINT0: KRM3
+OPS0: GTOWUP
+SCI0: CTS_RTS_SS
+SLCDC0: VL4
+SPI0: SSL0"
+"P104","44","","","","Disabled","","","CTSU0: TS13
+GPT1: GTIOCB
+IRQ0: IRQ01
+KINT0: KRM4
+POEG1: GTETRG
+SCI0: RXD_MISO
+SCI0: SCL
+SLCDC0: COM0
+SPI0: SSL1"
+"P105","43","","","","Disabled","","","CTSU0: TS34
+GPT1: GTIOCA
+IRQ0: IRQ00
+KINT0: KRM5
+POEG0: GTETRG
+SLCDC0: COM1
+SPI0: SSL2"
+"P106","42","","","","Disabled","","","GPT0: GTIOCB
+KINT0: KRM6
+SLCDC0: COM2
+SPI0: SSL3"
+"P107","41","","","","Disabled","","","GPT0: GTIOCA
+KINT0: KRM7
+SLCDC0: COM3"
+"P108","33","DEBUG0_TMS","Low","","Peripheral mode","CMOS","None","DEBUG0: SWDIO
+DEBUG0: TMS
+GPT0: GTIOCB
+OPS0: GTOULO
+SCI9: CTS_RTS_SS
+SPI1: SSL0"
+"P109","34","DEBUG0_TDO","Low","","Peripheral mode","CMOS","None","CAN0: CTX
+CGC0: CLKOUT
+CTSU0: TS10
+DEBUG0: SWO
+DEBUG0: TDO
+GPT1: GTIOCA
+OPS0: GTOVUP
+SCI1: SCK
+SCI9: SDA
+SCI9: TXD_MOSI
+SLCDC0: SEG23
+SPI1: MOSI"
+"P110","35","DEBUG0_TDI","Low","None","Peripheral mode","CMOS","None","CAN0: CRX
+CMP0: VCOUT
+DEBUG0: TDI
+GPT1: GTIOCB
+IRQ0: IRQ03
+OPS0: GTOVLO
+SCI2: CTS_RTS_SS
+SCI9: RXD_MISO
+SCI9: SCL
+SLCDC0: SEG24
+SPI1: MISO"
+"P111","36","","","","Disabled","","","CTSU0: TS12
+GPT3: GTIOCA
+IRQ0: IRQ04
+SCI2: SCK
+SCI9: SCK
+SLCDC0: CAPH
+SPI1: RSPCK"
+"P112","37","","","","Disabled","","","CTSU0: TSCAP
+GPT3: GTIOCB
+SCI1: SCK
+SCI2: SDA
+SCI2: TXD_MOSI
+SLCDC0: CAPL
+SPI1: SSL0"
+"P113","38","","","","Disabled","","","CTSU0: TS27
+GPT2: GTIOCA
+SLCDC0: COM4
+SLCDC0: SEG00"
+"P200","27","","","","Disabled","","","IRQ0: NMI"
+"P201","26","","","","Disabled","","",""
+"P204","24","","","","Disabled","","","AGT1: AGTIO
+CAC0: CACREF
+CTSU0: TS00
+GPT4: GTIOCB
+IIC0: SCL
+OPS0: GTIW
+SCI0: SCK
+SCI9: SCK
+SLCDC0: SEG14
+SPI1: RSPCK
+USBFS0: OVRCURB"
+"P205","23","","","","Disabled","","","AGT1: AGTO
+CGC0: CLKOUT
+CTSU0: TSCAP
+GPT4: GTIOCA
+IIC1: SCL
+IRQ0: IRQ01
+OPS0: GTIV
+SCI0: SDA
+SCI0: TXD_MOSI
+SCI9: CTS_RTS_SS
+SLCDC0: SEG13
+SPI1: SSL0
+USBFS0: OVRCURA"
+"P206","22","","","","Disabled","","","CTSU0: TS01
+IIC1: SDA
+IRQ0: IRQ00
+OPS0: GTIU
+SCI0: RXD_MISO
+SCI0: SCL
+SLCDC0: SEG12
+SPI1: SSL1
+USBFS0: VBUSEN"
+"P212","10","","","","Disabled","","","AGT1: AGTEE
+CGC0: EXTAL
+GPT0: GTIOCB
+IRQ0: IRQ03
+POEG1: GTETRG
+SCI1: RXD_MISO
+SCI1: SCL"
+"P213","9","","","","Disabled","","","CGC0: XTAL
+GPT0: GTIOCA
+IRQ0: IRQ02
+POEG0: GTETRG
+SCI1: SDA
+SCI1: TXD_MOSI"
+"P214","7","","","","Disabled","","","CGC0: XCOUT"
+"P215","6","","","","Disabled","","","CGC0: XCIN"
+"P300","32","DEBUG0_TCK","Low","","Peripheral mode","CMOS","None","DEBUG0: SWCLK
+DEBUG0: TCK
+GPT0: GTIOCA
+OPS0: GTOUUP
+SPI1: SSL1"
+"P301","31","GPIO","","IRQ6","Input mode","","None","AGT0: AGTIO
+CTSU0: TS09
+GPT4: GTIOCB
+IRQ0: IRQ06
+OPS0: GTOULO
+SCI2: RXD_MISO
+SCI2: SCL
+SCI9: CTS_RTS_SS
+SLCDC0: COM5
+SLCDC0: SEG01
+SPI1: SSL2"
+"P302","30","GPIO","","IRQ5","Input mode","","None","CTSU0: TS08
+GPT4: GTIOCA
+IRQ0: IRQ05
+OPS0: GTOUUP
+SCI2: SDA
+SCI2: TXD_MOSI
+SLCDC0: COM6
+SLCDC0: SEG02
+SPI1: SSL3"
+"P303","29","","","","Disabled","","","CTSU0: TS02
+GPT7: GTIOCB
+SLCDC0: COM7
+SLCDC0: SEG03"
+"P304","28","GPIO","","IRQ9","Input mode","","None","CTSU0: TS11
+GPT7: GTIOCA
+IRQ0: IRQ09
+SLCDC0: SEG20"
+"P400","1","","","","Disabled","","","AGT1: AGTIO
+CAC0: CACREF
+CTSU0: TS20
+GPT6: GTIOCA
+IIC0: SCL
+IRQ0: IRQ00
+SCI0: SCK
+SCI1: SCK
+SLCDC0: SEG04
+SSI: AUDIO_CLK"
+"P401","2","SCI1_TXD_MOSI","Low","None","Peripheral mode","CMOS","None","CAN0: CTX
+CTSU0: TS19
+GPT6: GTIOCB
+IIC0: SDA
+IRQ0: IRQ05
+POEG0: GTETRG
+SCI0: CTS_RTS_SS
+SCI1: SDA
+SCI1: TXD_MOSI
+SLCDC0: SEG05"
+"P402","3","SCI1_RXD_MISO","Low","None","Peripheral mode","CMOS","None","AGT0: AGTIO
+AGT1: AGTIO
+CAN0: CRX
+CTSU0: TS18
+IRQ0: IRQ04
+RTC0: RTCIC0
+SCI1: RXD_MISO
+SCI1: SCL
+SLCDC0: SEG06"
+"P407","16","","","","Disabled","","","ADC0: ADTRG
+AGT0: AGTIO
+CTSU0: TS03
+IIC0: SDA
+RTC0: RTCOUT
+SCI0: CTS_RTS_SS
+SLCDC0: SEG11
+SPI1: SSL3
+USBFS0: VBUS"
+"P408","15","GPIO","Low","None","Output mode (Initial Low)","CMOS","None","CTSU0: TS04
+GPT5: GTIOCB
+IIC0: SCL
+IRQ0: IRQ07
+OPS0: GTOWLO
+SCI1: CTS_RTS_SS
+SCI9: RXD_MISO
+SCI9: SCL
+SLCDC0: SEG10
+USBFS0: ID"
+"P409","14","GPIO","Low","None","Output mode (Initial Low)","CMOS","None","CTSU0: TS05
+GPT5: GTIOCA
+IRQ0: IRQ06
+OPS0: GTOWUP
+SCI9: SDA
+SCI9: TXD_MOSI
+SLCDC0: SEG09
+USBFS0: EXICEN"
+"P410","13","SCI0_RXD_MISO","Low","None","Peripheral mode","CMOS","None","AGT1: AGTOB
+CTSU0: TS06
+GPT6: GTIOCB
+IRQ0: IRQ05
+OPS0: GTOVLO
+SCI0: RXD_MISO
+SCI0: SCL
+SLCDC0: SEG08
+SPI0: MISO"
+"P411","12","SCI0_TXD_MOSI","Low","None","Peripheral mode","CMOS","None","AGT1: AGTOA
+CTSU0: TS07
+GPT6: GTIOCA
+IRQ0: IRQ04
+OPS0: GTOVUP
+SCI0: SDA
+SCI0: TXD_MOSI
+SLCDC0: SEG07
+SPI0: MOSI"
+"P500","49","","","","Disabled","","","ADC0: AN16
+AGT0: AGTOA
+CMP0: CMPREF1
+GPT2: GTIOCA
+OPS0: GTIU
+SLCDC0: SEG34
+USBFS0: VBUSEN"
+"P501","50","","","","Disabled","","","ADC0: AN17
+AGT0: AGTOB
+CMP0: CMPIN1
+GPT2: GTIOCB
+IRQ0: IRQ11
+OPS0: GTIV
+SCI1: SDA
+SCI1: TXD_MOSI
+SLCDC0: SEG35
+USBFS0: OVRCURA"
+"P502","51","","","","Disabled","","","ADC0: AN18
+CMP0: CMPREF0
+GPT3: GTIOCB
+IRQ0: IRQ12
+OPS0: GTIW
+SCI1: RXD_MISO
+SCI1: SCL
+SLCDC0: SEG36
+USBFS0: OVRCURB"
+"P914","19","","","","Disabled","","","USBFS0: USBDP"
+"P915","18","","","","Disabled","","","USBFS0: USBDM"
+"RES","25","","","","","","",""
+"VBAT","4","","","","","","",""
+"VCC","11","","","","","","",""
+"VCC","39","","","","","","",""
+"VCCUSB","20","USBFS0_VCCUSB","","","","","",""
+"VCCUSBLDO","21","USBFS0_VCCUSBLDO","","","","","",""
+"VCL","5","","","","","","",""
+"VSS","8","","","","","","",""
+"VSS","40","","","","","","",""
+"VSSUSB","17","USBFS0_VSSUSB","","","","","",""
diff --git a/ports/renesas-ra/boards/RA4M1_CLICKER/ra_gen/bsp_clock_cfg.h b/ports/renesas-ra/boards/RA4M1_CLICKER/ra_gen/bsp_clock_cfg.h
new file mode 100644
index 0000000000000..cf28c33d7af04
--- /dev/null
+++ b/ports/renesas-ra/boards/RA4M1_CLICKER/ra_gen/bsp_clock_cfg.h
@@ -0,0 +1,21 @@
+/* generated configuration header file - do not edit */
+#ifndef BSP_CLOCK_CFG_H_
+#define BSP_CLOCK_CFG_H_
+#define BSP_CFG_CLOCKS_SECURE (0)
+#define BSP_CFG_CLOCKS_OVERRIDE (0)
+#define BSP_CFG_XTAL_HZ (12000000) /* XTAL 12000000Hz */
+#define BSP_CFG_PLL_SOURCE (BSP_CLOCKS_SOURCE_CLOCK_MAIN_OSC) /* PLL Src: XTAL */
+#define BSP_CFG_HOCO_FREQUENCY (0) /* HOCO 24MHz */
+#define BSP_CFG_PLL_DIV (BSP_CLOCKS_PLL_DIV_2) /* PLL Div /2 */
+#define BSP_CFG_PLL_MUL BSP_CLOCKS_PLL_MUL_8_0 /* PLL Mul x8 */
+#define BSP_CFG_CLOCK_SOURCE (BSP_CLOCKS_SOURCE_CLOCK_PLL) /* Clock Src: PLL */
+#define BSP_CFG_ICLK_DIV (BSP_CLOCKS_SYS_CLOCK_DIV_1) /* ICLK Div /1 */
+#define BSP_CFG_PCLKA_DIV (BSP_CLOCKS_SYS_CLOCK_DIV_1) /* PCLKA Div /1 */
+#define BSP_CFG_PCLKB_DIV (BSP_CLOCKS_SYS_CLOCK_DIV_2) /* PCLKB Div /2 */
+#define BSP_CFG_PCLKC_DIV (BSP_CLOCKS_SYS_CLOCK_DIV_1) /* PCLKC Div /1 */
+#define BSP_CFG_PCLKD_DIV (BSP_CLOCKS_SYS_CLOCK_DIV_1) /* PCLKD Div /1 */
+#define BSP_CFG_FCLK_DIV (BSP_CLOCKS_SYS_CLOCK_DIV_2) /* FCLK Div /2 */
+#define BSP_CFG_CLKOUT_SOURCE (BSP_CLOCKS_CLOCK_DISABLED) /* CLKOUT Disabled */
+#define BSP_CFG_CLKOUT_DIV (BSP_CLOCKS_SYS_CLOCK_DIV_1) /* CLKOUT Div /1 */
+#define BSP_CFG_UCK_SOURCE (BSP_CLOCKS_SOURCE_CLOCK_PLL) /* UCLK Src: PLL */
+#endif /* BSP_CLOCK_CFG_H_ */
diff --git a/ports/renesas-ra/boards/RA4M1_CLICKER/ra_gen/bsp_pin_cfg.h b/ports/renesas-ra/boards/RA4M1_CLICKER/ra_gen/bsp_pin_cfg.h
new file mode 100644
index 0000000000000..8b6a627f95e5a
--- /dev/null
+++ b/ports/renesas-ra/boards/RA4M1_CLICKER/ra_gen/bsp_pin_cfg.h
@@ -0,0 +1,7 @@
+/* generated configuration header file - do not edit */
+#ifndef BSP_PIN_CFG_H_
+#define BSP_PIN_CFG_H_
+#include "bsp_api.h"
+#include "r_ioport_api.h"
+extern const ioport_cfg_t g_bsp_pin_cfg; /* R7FA4M1AB3CFM.pincfg */
+#endif /* BSP_PIN_CFG_H_ */
diff --git a/ports/renesas-ra/boards/RA4M1_CLICKER/ra_gen/common_data.c b/ports/renesas-ra/boards/RA4M1_CLICKER/ra_gen/common_data.c
new file mode 100644
index 0000000000000..34aad762ff245
--- /dev/null
+++ b/ports/renesas-ra/boards/RA4M1_CLICKER/ra_gen/common_data.c
@@ -0,0 +1,7 @@
+/* generated common source file - do not edit */
+#include "common_data.h"
+ioport_instance_ctrl_t g_ioport_ctrl;
+const ioport_instance_t g_ioport =
+{ .p_api = &g_ioport_on_ioport, .p_ctrl = &g_ioport_ctrl, .p_cfg = &g_bsp_pin_cfg, };
+void g_common_init(void) {
+}
diff --git a/ports/renesas-ra/boards/RA4M1_CLICKER/ra_gen/common_data.h b/ports/renesas-ra/boards/RA4M1_CLICKER/ra_gen/common_data.h
new file mode 100644
index 0000000000000..e2eb70836ba79
--- /dev/null
+++ b/ports/renesas-ra/boards/RA4M1_CLICKER/ra_gen/common_data.h
@@ -0,0 +1,16 @@
+/* generated common header file - do not edit */
+#ifndef COMMON_DATA_H_
+#define COMMON_DATA_H_
+#include <stdint.h>
+#include "bsp_api.h"
+#include "r_ioport.h"
+#include "bsp_pin_cfg.h"
+FSP_HEADER
+/* IOPORT Instance */
+extern const ioport_instance_t g_ioport;
+
+/* IOPORT control structure. */
+extern ioport_instance_ctrl_t g_ioport_ctrl;
+void g_common_init(void);
+FSP_FOOTER
+#endif /* COMMON_DATA_H_ */
diff --git a/ports/renesas-ra/boards/RA4M1_CLICKER/ra_gen/hal_data.c b/ports/renesas-ra/boards/RA4M1_CLICKER/ra_gen/hal_data.c
new file mode 100644
index 0000000000000..ebef37a7dfe18
--- /dev/null
+++ b/ports/renesas-ra/boards/RA4M1_CLICKER/ra_gen/hal_data.c
@@ -0,0 +1,487 @@
+/* generated HAL source file - do not edit */
+#include "hal_data.h"
+/* Macros to tie dynamic ELC links to ADC_TRIGGER_SYNC_ELC option in adc_trigger_t. */
+#define ADC_TRIGGER_ADC0        ADC_TRIGGER_SYNC_ELC
+#define ADC_TRIGGER_ADC0_B      ADC_TRIGGER_SYNC_ELC
+#define ADC_TRIGGER_ADC1        ADC_TRIGGER_SYNC_ELC
+#define ADC_TRIGGER_ADC1_B      ADC_TRIGGER_SYNC_ELC
+icu_instance_ctrl_t g_external_irq9_ctrl;
+const external_irq_cfg_t g_external_irq9_cfg =
+{ .channel = 9,
+  .trigger = EXTERNAL_IRQ_TRIG_RISING,
+  .filter_enable = false,
+  .pclk_div = EXTERNAL_IRQ_PCLK_DIV_BY_64,
+  .p_callback = callback_icu,
+  .p_context = NULL,
+  .p_extend = NULL,
+  .ipl = (12),
+  #if defined(VECTOR_NUMBER_ICU_IRQ9)
+  .irq = VECTOR_NUMBER_ICU_IRQ9,
+  #else
+  .irq = FSP_INVALID_VECTOR,
+  #endif
+};
+/* Instance structure to use this module. */
+const external_irq_instance_t g_external_irq9 =
+{ .p_ctrl = &g_external_irq9_ctrl, .p_cfg = &g_external_irq9_cfg, .p_api = &g_external_irq_on_icu };
+icu_instance_ctrl_t g_external_irq6_ctrl;
+const external_irq_cfg_t g_external_irq6_cfg =
+{ .channel = 6,
+  .trigger = EXTERNAL_IRQ_TRIG_RISING,
+  .filter_enable = false,
+  .pclk_div = EXTERNAL_IRQ_PCLK_DIV_BY_64,
+  .p_callback = callback_icu,
+  .p_context = NULL,
+  .p_extend = NULL,
+  .ipl = (12),
+  #if defined(VECTOR_NUMBER_ICU_IRQ6)
+  .irq = VECTOR_NUMBER_ICU_IRQ6,
+  #else
+  .irq = FSP_INVALID_VECTOR,
+  #endif
+};
+/* Instance structure to use this module. */
+const external_irq_instance_t g_external_irq6 =
+{ .p_ctrl = &g_external_irq6_ctrl, .p_cfg = &g_external_irq6_cfg, .p_api = &g_external_irq_on_icu };
+iic_master_instance_ctrl_t g_i2c_master1_ctrl;
+const iic_master_extended_cfg_t g_i2c_master1_extend =
+{ .timeout_mode = IIC_MASTER_TIMEOUT_MODE_SHORT,
+/* Actual calculated bitrate: 99272. Actual calculated duty cycle: 49%. */ .clock_settings.brl_value = 27,
+  .clock_settings.brh_value = 26, .clock_settings.cks_value = 2, };
+const i2c_master_cfg_t g_i2c_master1_cfg =
+{ .channel = 1, .rate = I2C_MASTER_RATE_STANDARD, .slave = 0x00, .addr_mode = I2C_MASTER_ADDR_MODE_7BIT,
+#define RA_NOT_DEFINED (1)
+  #if (RA_NOT_DEFINED == RA_NOT_DEFINED)
+  .p_transfer_tx = NULL,
+  #else
+  .p_transfer_tx = &RA_NOT_DEFINED,
+  #endif
+  #if (RA_NOT_DEFINED == RA_NOT_DEFINED)
+  .p_transfer_rx = NULL,
+  #else
+  .p_transfer_rx = &RA_NOT_DEFINED,
+  #endif
+#undef RA_NOT_DEFINED
+  .p_callback = callback_iic,
+  .p_context = NULL,
+  #if defined(VECTOR_NUMBER_IIC1_RXI)
+  .rxi_irq = VECTOR_NUMBER_IIC1_RXI,
+  #else
+  .rxi_irq = FSP_INVALID_VECTOR,
+  #endif
+  #if defined(VECTOR_NUMBER_IIC1_TXI)
+  .txi_irq = VECTOR_NUMBER_IIC1_TXI,
+  #else
+  .txi_irq = FSP_INVALID_VECTOR,
+  #endif
+  #if defined(VECTOR_NUMBER_IIC1_TEI)
+  .tei_irq = VECTOR_NUMBER_IIC1_TEI,
+  #else
+  .tei_irq = FSP_INVALID_VECTOR,
+  #endif
+  #if defined(VECTOR_NUMBER_IIC1_ERI)
+  .eri_irq = VECTOR_NUMBER_IIC1_ERI,
+  #else
+  .eri_irq = FSP_INVALID_VECTOR,
+  #endif
+  .ipl = (12),
+  .p_extend = &g_i2c_master1_extend, };
+/* Instance structure to use this module. */
+const i2c_master_instance_t g_i2c_master1 =
+{ .p_ctrl = &g_i2c_master1_ctrl, .p_cfg = &g_i2c_master1_cfg, .p_api = &g_i2c_master_on_iic };
+adc_instance_ctrl_t g_adc0_ctrl;
+const adc_extended_cfg_t g_adc0_cfg_extend =
+{ .add_average_count = ADC_ADD_OFF,
+  .clearing = ADC_CLEAR_AFTER_READ_ON,
+  .trigger_group_b = ADC_TRIGGER_SYNC_ELC,
+  .double_trigger_mode = ADC_DOUBLE_TRIGGER_DISABLED,
+  .adc_vref_control = ADC_VREF_CONTROL_VREFH, };
+const adc_cfg_t g_adc0_cfg =
+{ .unit = 0, .mode = ADC_MODE_SINGLE_SCAN, .resolution = ADC_RESOLUTION_14_BIT, .alignment =
+      (adc_alignment_t)ADC_ALIGNMENT_RIGHT,
+  .trigger = ADC_TRIGGER_SOFTWARE, .p_callback = NULL, .p_context = NULL, .p_extend = &g_adc0_cfg_extend,
+  #if defined(VECTOR_NUMBER_ADC0_SCAN_END)
+  .scan_end_irq = VECTOR_NUMBER_ADC0_SCAN_END,
+  #else
+  .scan_end_irq = FSP_INVALID_VECTOR,
+  #endif
+  .scan_end_ipl = (BSP_IRQ_DISABLED),
+  #if defined(VECTOR_NUMBER_ADC0_SCAN_END_B)
+  .scan_end_b_irq = VECTOR_NUMBER_ADC0_SCAN_END_B,
+  #else
+  .scan_end_b_irq = FSP_INVALID_VECTOR,
+  #endif
+  .scan_end_b_ipl = (BSP_IRQ_DISABLED), };
+const adc_channel_cfg_t g_adc0_channel_cfg =
+{ .scan_mask = 0,
+  .scan_mask_group_b = 0,
+  .priority_group_a = ADC_GROUP_A_PRIORITY_OFF,
+  .add_mask = 0,
+  .sample_hold_mask = 0,
+  .sample_hold_states = 24, };
+/* Instance structure to use this module. */
+const adc_instance_t g_adc0 =
+{ .p_ctrl = &g_adc0_ctrl, .p_cfg = &g_adc0_cfg, .p_channel_cfg = &g_adc0_channel_cfg, .p_api = &g_adc_on_adc };
+lpm_instance_ctrl_t g_lpm0_ctrl;
+
+const lpm_cfg_t g_lpm0_cfg =
+{ .low_power_mode = LPM_MODE_SLEEP,
+  .snooze_cancel_sources = LPM_SNOOZE_CANCEL_SOURCE_NONE,
+  .standby_wake_sources = LPM_STANDBY_WAKE_SOURCE_RTCALM | (lpm_standby_wake_source_t)0,
+  .snooze_request_source = LPM_SNOOZE_REQUEST_RXD0_FALLING,
+  .snooze_end_sources = (lpm_snooze_end_t)0,
+  .dtc_state_in_snooze = LPM_SNOOZE_DTC_DISABLE,
+  #if BSP_FEATURE_LPM_HAS_SBYCR_OPE
+  .output_port_enable = 0,
+  #endif
+  #if BSP_FEATURE_LPM_HAS_DEEP_STANDBY
+  .io_port_state = 0,
+  .power_supply_state = 0,
+  .deep_standby_cancel_source = (lpm_deep_standby_cancel_source_t)0,
+  .deep_standby_cancel_edge = (lpm_deep_standby_cancel_edge_t)0,
+  #endif
+  .p_extend = NULL, };
+
+const lpm_instance_t g_lpm0 =
+{ .p_api = &g_lpm_on_lpm, .p_ctrl = &g_lpm0_ctrl, .p_cfg = &g_lpm0_cfg };
+dtc_instance_ctrl_t g_transfer1_ctrl;
+
+transfer_info_t g_transfer1_info =
+{ .dest_addr_mode = TRANSFER_ADDR_MODE_INCREMENTED,
+  .repeat_area = TRANSFER_REPEAT_AREA_DESTINATION,
+  .irq = TRANSFER_IRQ_END,
+  .chain_mode = TRANSFER_CHAIN_MODE_DISABLED,
+  .src_addr_mode = TRANSFER_ADDR_MODE_FIXED,
+  .size = TRANSFER_SIZE_2_BYTE,
+  .mode = TRANSFER_MODE_NORMAL,
+  .p_dest = (void *)NULL,
+  .p_src = (void const *)NULL,
+  .num_blocks = 0,
+  .length = 0, };
+const dtc_extended_cfg_t g_transfer1_cfg_extend =
+{ .activation_source = VECTOR_NUMBER_SPI0_RXI, };
+const transfer_cfg_t g_transfer1_cfg =
+{ .p_info = &g_transfer1_info, .p_extend = &g_transfer1_cfg_extend, };
+
+/* Instance structure to use this module. */
+const transfer_instance_t g_transfer1 =
+{ .p_ctrl = &g_transfer1_ctrl, .p_cfg = &g_transfer1_cfg, .p_api = &g_transfer_on_dtc };
+dtc_instance_ctrl_t g_transfer0_ctrl;
+
+transfer_info_t g_transfer0_info =
+{ .dest_addr_mode = TRANSFER_ADDR_MODE_FIXED,
+  .repeat_area = TRANSFER_REPEAT_AREA_SOURCE,
+  .irq = TRANSFER_IRQ_END,
+  .chain_mode = TRANSFER_CHAIN_MODE_DISABLED,
+  .src_addr_mode = TRANSFER_ADDR_MODE_INCREMENTED,
+  .size = TRANSFER_SIZE_2_BYTE,
+  .mode = TRANSFER_MODE_NORMAL,
+  .p_dest = (void *)NULL,
+  .p_src = (void const *)NULL,
+  .num_blocks = 0,
+  .length = 0, };
+const dtc_extended_cfg_t g_transfer0_cfg_extend =
+{ .activation_source = VECTOR_NUMBER_SPI0_TXI, };
+const transfer_cfg_t g_transfer0_cfg =
+{ .p_info = &g_transfer0_info, .p_extend = &g_transfer0_cfg_extend, };
+
+/* Instance structure to use this module. */
+const transfer_instance_t g_transfer0 =
+{ .p_ctrl = &g_transfer0_ctrl, .p_cfg = &g_transfer0_cfg, .p_api = &g_transfer_on_dtc };
+spi_instance_ctrl_t g_spi0_ctrl;
+
+/** SPI extended configuration for SPI HAL driver */
+const spi_extended_cfg_t g_spi0_ext_cfg =
+{ .spi_clksyn = SPI_SSL_MODE_CLK_SYN,
+  .spi_comm = SPI_COMMUNICATION_FULL_DUPLEX,
+  .ssl_polarity = SPI_SSLP_LOW,
+  .ssl_select = SPI_SSL_SELECT_SSL0,
+  .mosi_idle = SPI_MOSI_IDLE_VALUE_FIXING_DISABLE,
+  .parity = SPI_PARITY_MODE_DISABLE,
+  .byte_swap = SPI_BYTE_SWAP_DISABLE,
+  .spck_div =
+  {
+      /* Actual calculated bitrate: 12000000. */ .spbr = 1,
+      .brdv = 0
+  },
+  .spck_delay = SPI_DELAY_COUNT_1,
+  .ssl_negation_delay = SPI_DELAY_COUNT_1,
+  .next_access_delay = SPI_DELAY_COUNT_1 };
+
+/** SPI configuration for SPI HAL driver */
+const spi_cfg_t g_spi0_cfg =
+{ .channel = 0,
+
+  #if defined(VECTOR_NUMBER_SPI0_RXI)
+  .rxi_irq = VECTOR_NUMBER_SPI0_RXI,
+  #else
+  .rxi_irq = FSP_INVALID_VECTOR,
+  #endif
+  #if defined(VECTOR_NUMBER_SPI0_TXI)
+  .txi_irq = VECTOR_NUMBER_SPI0_TXI,
+  #else
+  .txi_irq = FSP_INVALID_VECTOR,
+  #endif
+  #if defined(VECTOR_NUMBER_SPI0_TEI)
+  .tei_irq = VECTOR_NUMBER_SPI0_TEI,
+  #else
+  .tei_irq = FSP_INVALID_VECTOR,
+  #endif
+  #if defined(VECTOR_NUMBER_SPI0_ERI)
+  .eri_irq = VECTOR_NUMBER_SPI0_ERI,
+  #else
+  .eri_irq = FSP_INVALID_VECTOR,
+  #endif
+
+  .rxi_ipl = (12),
+  .txi_ipl = (12),
+  .tei_ipl = (12),
+  .eri_ipl = (12),
+
+  .operating_mode = SPI_MODE_MASTER,
+
+  .clk_phase = SPI_CLK_PHASE_EDGE_ODD,
+  .clk_polarity = SPI_CLK_POLARITY_LOW,
+
+  .mode_fault = SPI_MODE_FAULT_ERROR_DISABLE,
+  .bit_order = SPI_BIT_ORDER_MSB_FIRST,
+  .p_transfer_tx = g_spi0_P_TRANSFER_TX,
+  .p_transfer_rx = g_spi0_P_TRANSFER_RX,
+  .p_callback = spi_callback,
+
+  .p_context = NULL,
+  .p_extend = (void *)&g_spi0_ext_cfg, };
+
+/* Instance structure to use this module. */
+const spi_instance_t g_spi0 =
+{ .p_ctrl = &g_spi0_ctrl, .p_cfg = &g_spi0_cfg, .p_api = &g_spi_on_spi };
+icu_instance_ctrl_t g_external_irq5_ctrl;
+const external_irq_cfg_t g_external_irq5_cfg =
+{ .channel = 5,
+  .trigger = EXTERNAL_IRQ_TRIG_RISING,
+  .filter_enable = false,
+  .pclk_div = EXTERNAL_IRQ_PCLK_DIV_BY_64,
+  .p_callback = callback_icu,
+  .p_context = NULL,
+  .p_extend = NULL,
+  .ipl = (12),
+  #if defined(VECTOR_NUMBER_ICU_IRQ5)
+  .irq = VECTOR_NUMBER_ICU_IRQ5,
+  #else
+  .irq = FSP_INVALID_VECTOR,
+  #endif
+};
+/* Instance structure to use this module. */
+const external_irq_instance_t g_external_irq5 =
+{ .p_ctrl = &g_external_irq5_ctrl, .p_cfg = &g_external_irq5_cfg, .p_api = &g_external_irq_on_icu };
+agt_instance_ctrl_t g_timer0_ctrl;
+const agt_extended_cfg_t g_timer0_extend =
+{ .count_source = AGT_CLOCK_PCLKB,
+  .agto = AGT_PIN_CFG_DISABLED,
+  .agtoa = AGT_PIN_CFG_DISABLED,
+  .agtob = AGT_PIN_CFG_DISABLED,
+  .measurement_mode = AGT_MEASURE_DISABLED,
+  .agtio_filter = AGT_AGTIO_FILTER_NONE,
+  .enable_pin = AGT_ENABLE_PIN_NOT_USED,
+  .trigger_edge = AGT_TRIGGER_EDGE_RISING, };
+const timer_cfg_t g_timer0_cfg =
+{ .mode = TIMER_MODE_PERIODIC,
+/* Actual period: 0.002730666666666667 seconds. Actual duty: 50%. */ .period_counts = 0x10000,
+  .duty_cycle_counts = 0x8000, .source_div = (timer_source_div_t)0, .channel = 0, .p_callback = callback_agt,
+  /** If NULL then do not add & */
+  #if defined(NULL)
+  .p_context = NULL,
+  #else
+  .p_context = &NULL,
+  #endif
+  .p_extend = &g_timer0_extend,
+  .cycle_end_ipl = (5),
+  #if defined(VECTOR_NUMBER_AGT0_INT)
+  .cycle_end_irq = VECTOR_NUMBER_AGT0_INT,
+  #else
+  .cycle_end_irq = FSP_INVALID_VECTOR,
+  #endif
+};
+/* Instance structure to use this module. */
+const timer_instance_t g_timer0 =
+{ .p_ctrl = &g_timer0_ctrl, .p_cfg = &g_timer0_cfg, .p_api = &g_timer_on_agt };
+flash_lp_instance_ctrl_t g_flash0_ctrl;
+const flash_cfg_t g_flash0_cfg =
+{ .data_flash_bgo = false, .p_callback = NULL, .p_context = NULL, .ipl = (BSP_IRQ_DISABLED),
+  #if defined(VECTOR_NUMBER_FCU_FRDYI)
+  .irq = VECTOR_NUMBER_FCU_FRDYI,
+  #else
+  .irq = FSP_INVALID_VECTOR,
+  #endif
+};
+/* Instance structure to use this module. */
+const flash_instance_t g_flash0 =
+{ .p_ctrl = &g_flash0_ctrl, .p_cfg = &g_flash0_cfg, .p_api = &g_flash_on_flash_lp };
+rtc_instance_ctrl_t g_rtc0_ctrl;
+const rtc_error_adjustment_cfg_t g_rtc0_err_cfg =
+{ .adjustment_mode = RTC_ERROR_ADJUSTMENT_MODE_AUTOMATIC,
+  .adjustment_period = RTC_ERROR_ADJUSTMENT_PERIOD_10_SECOND,
+  .adjustment_type = RTC_ERROR_ADJUSTMENT_NONE,
+  .adjustment_value = 0, };
+const rtc_cfg_t g_rtc0_cfg =
+{ .clock_source = RTC_CLOCK_SOURCE_SUBCLK, .freq_compare_value_loco = 255, .p_err_cfg = &g_rtc0_err_cfg, .p_callback =
+      NULL,
+  .p_context = NULL, .alarm_ipl = (14), .periodic_ipl = (14), .carry_ipl = (14),
+  #if defined(VECTOR_NUMBER_RTC_ALARM)
+  .alarm_irq = VECTOR_NUMBER_RTC_ALARM,
+  #else
+  .alarm_irq = FSP_INVALID_VECTOR,
+  #endif
+  #if defined(VECTOR_NUMBER_RTC_PERIOD)
+  .periodic_irq = VECTOR_NUMBER_RTC_PERIOD,
+  #else
+  .periodic_irq = FSP_INVALID_VECTOR,
+  #endif
+  #if defined(VECTOR_NUMBER_RTC_CARRY)
+  .carry_irq = VECTOR_NUMBER_RTC_CARRY,
+  #else
+  .carry_irq = FSP_INVALID_VECTOR,
+  #endif
+};
+/* Instance structure to use this module. */
+const rtc_instance_t g_rtc0 =
+{ .p_ctrl = &g_rtc0_ctrl, .p_cfg = &g_rtc0_cfg, .p_api = &g_rtc_on_rtc };
+sci_uart_instance_ctrl_t g_uart1_ctrl;
+
+baud_setting_t g_uart1_baud_setting =
+{
+/* Baud rate calculated with 0.160% error. */ .abcse = 0,
+    .abcs = 0, .bgdm = 1, .cks = 0, .brr = 25, .mddr = (uint8_t)256, .brme = false
+};
+
+/** UART extended configuration for UARTonSCI HAL driver */
+const sci_uart_extended_cfg_t g_uart1_cfg_extend =
+{ .clock = SCI_UART_CLOCK_INT,
+  .rx_edge_start = SCI_UART_START_BIT_FALLING_EDGE,
+  .noise_cancel = SCI_UART_NOISE_CANCELLATION_DISABLE,
+  .rx_fifo_trigger = SCI_UART_RX_FIFO_TRIGGER_MAX,
+  .p_baud_setting = &g_uart1_baud_setting,
+  .uart_mode = UART_MODE_RS232,
+  .ctsrts_en = SCI_UART_CTSRTS_RTS_OUTPUT,
+  #if 0
+  .flow_control_pin = BSP_IO_PORT_00_PIN_00,
+  #else
+  .flow_control_pin = (bsp_io_port_pin_t)(0xFFFFU),
+  #endif
+};
+
+/** UART interface configuration */
+const uart_cfg_t g_uart1_cfg =
+{ .channel = 1, .data_bits = UART_DATA_BITS_8, .parity = UART_PARITY_OFF, .stop_bits = UART_STOP_BITS_1, .p_callback =
+      user_uart_callback,
+  .p_context = NULL, .p_extend = &g_uart1_cfg_extend,
+#define RA_NOT_DEFINED (1)
+  #if (RA_NOT_DEFINED == RA_NOT_DEFINED)
+  .p_transfer_tx = NULL,
+  #else
+  .p_transfer_tx = &RA_NOT_DEFINED,
+  #endif
+  #if (RA_NOT_DEFINED == RA_NOT_DEFINED)
+  .p_transfer_rx = NULL,
+  #else
+  .p_transfer_rx = &RA_NOT_DEFINED,
+  #endif
+#undef RA_NOT_DEFINED
+  .rxi_ipl = (12),
+  .txi_ipl = (12), .tei_ipl = (12), .eri_ipl = (12),
+  #if defined(VECTOR_NUMBER_SCI1_RXI)
+  .rxi_irq = VECTOR_NUMBER_SCI1_RXI,
+  #else
+  .rxi_irq = FSP_INVALID_VECTOR,
+  #endif
+  #if defined(VECTOR_NUMBER_SCI1_TXI)
+  .txi_irq = VECTOR_NUMBER_SCI1_TXI,
+  #else
+  .txi_irq = FSP_INVALID_VECTOR,
+  #endif
+  #if defined(VECTOR_NUMBER_SCI1_TEI)
+  .tei_irq = VECTOR_NUMBER_SCI1_TEI,
+  #else
+  .tei_irq = FSP_INVALID_VECTOR,
+  #endif
+  #if defined(VECTOR_NUMBER_SCI1_ERI)
+  .eri_irq = VECTOR_NUMBER_SCI1_ERI,
+  #else
+  .eri_irq = FSP_INVALID_VECTOR,
+  #endif
+};
+
+/* Instance structure to use this module. */
+const uart_instance_t g_uart1 =
+{ .p_ctrl = &g_uart1_ctrl, .p_cfg = &g_uart1_cfg, .p_api = &g_uart_on_sci };
+sci_uart_instance_ctrl_t g_uart0_ctrl;
+
+baud_setting_t g_uart0_baud_setting =
+{
+/* Baud rate calculated with 0.160% error. */ .abcse = 0,
+    .abcs = 0, .bgdm = 1, .cks = 0, .brr = 25, .mddr = (uint8_t)256, .brme = false
+};
+
+/** UART extended configuration for UARTonSCI HAL driver */
+const sci_uart_extended_cfg_t g_uart0_cfg_extend =
+{ .clock = SCI_UART_CLOCK_INT,
+  .rx_edge_start = SCI_UART_START_BIT_FALLING_EDGE,
+  .noise_cancel = SCI_UART_NOISE_CANCELLATION_DISABLE,
+  .rx_fifo_trigger = SCI_UART_RX_FIFO_TRIGGER_MAX,
+  .p_baud_setting = &g_uart0_baud_setting,
+  .uart_mode = UART_MODE_RS232,
+  .ctsrts_en = SCI_UART_CTSRTS_RTS_OUTPUT,
+  #if 0
+  .flow_control_pin = BSP_IO_PORT_00_PIN_00,
+  #else
+  .flow_control_pin = (bsp_io_port_pin_t)(0xFFFFU),
+  #endif
+};
+
+/** UART interface configuration */
+const uart_cfg_t g_uart0_cfg =
+{ .channel = 0, .data_bits = UART_DATA_BITS_8, .parity = UART_PARITY_OFF, .stop_bits = UART_STOP_BITS_1, .p_callback =
+      user_uart_callback,
+  .p_context = NULL, .p_extend = &g_uart0_cfg_extend,
+#define RA_NOT_DEFINED (1)
+  #if (RA_NOT_DEFINED == RA_NOT_DEFINED)
+  .p_transfer_tx = NULL,
+  #else
+  .p_transfer_tx = &RA_NOT_DEFINED,
+  #endif
+  #if (RA_NOT_DEFINED == RA_NOT_DEFINED)
+  .p_transfer_rx = NULL,
+  #else
+  .p_transfer_rx = &RA_NOT_DEFINED,
+  #endif
+#undef RA_NOT_DEFINED
+  .rxi_ipl = (12),
+  .txi_ipl = (12), .tei_ipl = (12), .eri_ipl = (12),
+  #if defined(VECTOR_NUMBER_SCI0_RXI)
+  .rxi_irq = VECTOR_NUMBER_SCI0_RXI,
+  #else
+  .rxi_irq = FSP_INVALID_VECTOR,
+  #endif
+  #if defined(VECTOR_NUMBER_SCI0_TXI)
+  .txi_irq = VECTOR_NUMBER_SCI0_TXI,
+  #else
+  .txi_irq = FSP_INVALID_VECTOR,
+  #endif
+  #if defined(VECTOR_NUMBER_SCI0_TEI)
+  .tei_irq = VECTOR_NUMBER_SCI0_TEI,
+  #else
+  .tei_irq = FSP_INVALID_VECTOR,
+  #endif
+  #if defined(VECTOR_NUMBER_SCI0_ERI)
+  .eri_irq = VECTOR_NUMBER_SCI0_ERI,
+  #else
+  .eri_irq = FSP_INVALID_VECTOR,
+  #endif
+};
+
+/* Instance structure to use this module. */
+const uart_instance_t g_uart0 =
+{ .p_ctrl = &g_uart0_ctrl, .p_cfg = &g_uart0_cfg, .p_api = &g_uart_on_sci };
+void g_hal_init(void) {
+    g_common_init();
+}
diff --git a/ports/renesas-ra/boards/RA4M1_CLICKER/ra_gen/hal_data.h b/ports/renesas-ra/boards/RA4M1_CLICKER/ra_gen/hal_data.h
new file mode 100644
index 0000000000000..2c95755ee0250
--- /dev/null
+++ b/ports/renesas-ra/boards/RA4M1_CLICKER/ra_gen/hal_data.h
@@ -0,0 +1,175 @@
+/* generated HAL header file - do not edit */
+#ifndef HAL_DATA_H_
+#define HAL_DATA_H_
+#include <stdint.h>
+#include "bsp_api.h"
+#include "common_data.h"
+#include "r_icu.h"
+#include "r_external_irq_api.h"
+#include "r_iic_master.h"
+#include "r_i2c_master_api.h"
+#include "r_adc.h"
+#include "r_adc_api.h"
+#include "r_lpm.h"
+#include "r_lpm_api.h"
+#include "r_dtc.h"
+#include "r_transfer_api.h"
+#include "r_spi.h"
+#include "r_agt.h"
+#include "r_timer_api.h"
+#include "r_flash_lp.h"
+#include "r_flash_api.h"
+#include "r_rtc.h"
+#include "r_rtc_api.h"
+#include "r_sci_uart.h"
+#include "r_uart_api.h"
+FSP_HEADER
+/** External IRQ on ICU Instance. */
+extern const external_irq_instance_t g_external_irq9;
+
+/** Access the ICU instance using these structures when calling API functions directly (::p_api is not used). */
+extern icu_instance_ctrl_t g_external_irq9_ctrl;
+extern const external_irq_cfg_t g_external_irq9_cfg;
+
+#ifndef callback_icu
+void callback_icu(external_irq_callback_args_t *p_args);
+#endif
+/** External IRQ on ICU Instance. */
+extern const external_irq_instance_t g_external_irq6;
+
+/** Access the ICU instance using these structures when calling API functions directly (::p_api is not used). */
+extern icu_instance_ctrl_t g_external_irq6_ctrl;
+extern const external_irq_cfg_t g_external_irq6_cfg;
+
+#ifndef callback_icu
+void callback_icu(external_irq_callback_args_t *p_args);
+#endif
+/* I2C Master on IIC Instance. */
+extern const i2c_master_instance_t g_i2c_master1;
+
+/** Access the I2C Master instance using these structures when calling API functions directly (::p_api is not used). */
+extern iic_master_instance_ctrl_t g_i2c_master1_ctrl;
+extern const i2c_master_cfg_t g_i2c_master1_cfg;
+
+#ifndef callback_iic
+void callback_iic(i2c_master_callback_args_t *p_args);
+#endif
+/** ADC on ADC Instance. */
+extern const adc_instance_t g_adc0;
+
+/** Access the ADC instance using these structures when calling API functions directly (::p_api is not used). */
+extern adc_instance_ctrl_t g_adc0_ctrl;
+extern const adc_cfg_t g_adc0_cfg;
+extern const adc_channel_cfg_t g_adc0_channel_cfg;
+
+#ifndef NULL
+void NULL(adc_callback_args_t *p_args);
+#endif
+/** lpm Instance */
+extern const lpm_instance_t g_lpm0;
+
+/** Access the LPM instance using these structures when calling API functions directly (::p_api is not used). */
+extern lpm_instance_ctrl_t g_lpm0_ctrl;
+extern const lpm_cfg_t g_lpm0_cfg;
+/* Transfer on DTC Instance. */
+extern const transfer_instance_t g_transfer1;
+
+/** Access the DTC instance using these structures when calling API functions directly (::p_api is not used). */
+extern dtc_instance_ctrl_t g_transfer1_ctrl;
+extern const transfer_cfg_t g_transfer1_cfg;
+/* Transfer on DTC Instance. */
+extern const transfer_instance_t g_transfer0;
+
+/** Access the DTC instance using these structures when calling API functions directly (::p_api is not used). */
+extern dtc_instance_ctrl_t g_transfer0_ctrl;
+extern const transfer_cfg_t g_transfer0_cfg;
+/** SPI on SPI Instance. */
+extern const spi_instance_t g_spi0;
+
+/** Access the SPI instance using these structures when calling API functions directly (::p_api is not used). */
+extern spi_instance_ctrl_t g_spi0_ctrl;
+extern const spi_cfg_t g_spi0_cfg;
+
+/** Callback used by SPI Instance. */
+#ifndef spi_callback
+void spi_callback(spi_callback_args_t *p_args);
+#endif
+
+#define RA_NOT_DEFINED (1)
+#if (RA_NOT_DEFINED == g_transfer0)
+    #define g_spi0_P_TRANSFER_TX (NULL)
+#else
+#define g_spi0_P_TRANSFER_TX (&g_transfer0)
+#endif
+#if (RA_NOT_DEFINED == g_transfer1)
+    #define g_spi0_P_TRANSFER_RX (NULL)
+#else
+#define g_spi0_P_TRANSFER_RX (&g_transfer1)
+#endif
+#undef RA_NOT_DEFINED
+/** External IRQ on ICU Instance. */
+extern const external_irq_instance_t g_external_irq5;
+
+/** Access the ICU instance using these structures when calling API functions directly (::p_api is not used). */
+extern icu_instance_ctrl_t g_external_irq5_ctrl;
+extern const external_irq_cfg_t g_external_irq5_cfg;
+
+#ifndef callback_icu
+void callback_icu(external_irq_callback_args_t *p_args);
+#endif
+/** AGT Timer Instance */
+extern const timer_instance_t g_timer0;
+
+/** Access the AGT instance using these structures when calling API functions directly (::p_api is not used). */
+extern agt_instance_ctrl_t g_timer0_ctrl;
+extern const timer_cfg_t g_timer0_cfg;
+
+#ifndef callback_agt
+void callback_agt(timer_callback_args_t *p_args);
+#endif
+/* Flash on Flash LP Instance. */
+extern const flash_instance_t g_flash0;
+
+/** Access the Flash LP instance using these structures when calling API functions directly (::p_api is not used). */
+extern flash_lp_instance_ctrl_t g_flash0_ctrl;
+extern const flash_cfg_t g_flash0_cfg;
+
+#ifndef NULL
+void NULL(flash_callback_args_t *p_args);
+#endif
+/* RTC Instance. */
+extern const rtc_instance_t g_rtc0;
+
+/** Access the RTC instance using these structures when calling API functions directly (::p_api is not used). */
+extern rtc_instance_ctrl_t g_rtc0_ctrl;
+extern const rtc_cfg_t g_rtc0_cfg;
+
+#ifndef NULL
+void NULL(rtc_callback_args_t *p_args);
+#endif
+/** UART on SCI Instance. */
+extern const uart_instance_t g_uart1;
+
+/** Access the UART instance using these structures when calling API functions directly (::p_api is not used). */
+extern sci_uart_instance_ctrl_t g_uart1_ctrl;
+extern const uart_cfg_t g_uart1_cfg;
+extern const sci_uart_extended_cfg_t g_uart1_cfg_extend;
+
+#ifndef user_uart_callback
+void user_uart_callback(uart_callback_args_t *p_args);
+#endif
+/** UART on SCI Instance. */
+extern const uart_instance_t g_uart0;
+
+/** Access the UART instance using these structures when calling API functions directly (::p_api is not used). */
+extern sci_uart_instance_ctrl_t g_uart0_ctrl;
+extern const uart_cfg_t g_uart0_cfg;
+extern const sci_uart_extended_cfg_t g_uart0_cfg_extend;
+
+#ifndef user_uart_callback
+void user_uart_callback(uart_callback_args_t *p_args);
+#endif
+void hal_entry(void);
+void g_hal_init(void);
+FSP_FOOTER
+#endif /* HAL_DATA_H_ */
diff --git a/ports/renesas-ra/boards/RA4M1_CLICKER/ra_gen/main.c b/ports/renesas-ra/boards/RA4M1_CLICKER/ra_gen/main.c
new file mode 100644
index 0000000000000..5b9f9805595fa
--- /dev/null
+++ b/ports/renesas-ra/boards/RA4M1_CLICKER/ra_gen/main.c
@@ -0,0 +1,6 @@
+/* generated main source file - do not edit */
+#include "hal_data.h"
+int main(void) {
+    hal_entry();
+    return 0;
+}
diff --git a/ports/renesas-ra/boards/RA4M1_CLICKER/ra_gen/pin_data.c b/ports/renesas-ra/boards/RA4M1_CLICKER/ra_gen/pin_data.c
new file mode 100644
index 0000000000000..2479b76a0c9a3
--- /dev/null
+++ b/ports/renesas-ra/boards/RA4M1_CLICKER/ra_gen/pin_data.c
@@ -0,0 +1,73 @@
+/* generated pin source file - do not edit */
+#include "bsp_api.h"
+#include "r_ioport_api.h"
+const ioport_pin_cfg_t g_bsp_pin_cfg_data[] = {
+    {
+        .pin = BSP_IO_PORT_01_PIN_00,
+        .pin_cfg = ((uint32_t)IOPORT_CFG_PERIPHERAL_PIN | (uint32_t)IOPORT_PERIPHERAL_SPI),
+    },
+    {
+        .pin = BSP_IO_PORT_01_PIN_01,
+        .pin_cfg = ((uint32_t)IOPORT_CFG_PERIPHERAL_PIN | (uint32_t)IOPORT_PERIPHERAL_SPI),
+    },
+    {
+        .pin = BSP_IO_PORT_01_PIN_02,
+        .pin_cfg = ((uint32_t)IOPORT_CFG_PERIPHERAL_PIN | (uint32_t)IOPORT_PERIPHERAL_SPI),
+    },
+    {
+        .pin = BSP_IO_PORT_01_PIN_08,
+        .pin_cfg = ((uint32_t)IOPORT_CFG_PERIPHERAL_PIN | (uint32_t)IOPORT_PERIPHERAL_DEBUG),
+    },
+    {
+        .pin = BSP_IO_PORT_01_PIN_09,
+        .pin_cfg = ((uint32_t)IOPORT_CFG_PERIPHERAL_PIN | (uint32_t)IOPORT_PERIPHERAL_DEBUG),
+    },
+    {
+        .pin = BSP_IO_PORT_01_PIN_10,
+        .pin_cfg = ((uint32_t)IOPORT_CFG_PERIPHERAL_PIN | (uint32_t)IOPORT_PERIPHERAL_DEBUG),
+    },
+    {
+        .pin = BSP_IO_PORT_03_PIN_00,
+        .pin_cfg = ((uint32_t)IOPORT_CFG_PERIPHERAL_PIN | (uint32_t)IOPORT_PERIPHERAL_DEBUG),
+    },
+    {
+        .pin = BSP_IO_PORT_03_PIN_01,
+        .pin_cfg = ((uint32_t)IOPORT_CFG_IRQ_ENABLE | (uint32_t)IOPORT_CFG_PORT_DIRECTION_INPUT),
+    },
+    {
+        .pin = BSP_IO_PORT_03_PIN_02,
+        .pin_cfg = ((uint32_t)IOPORT_CFG_IRQ_ENABLE | (uint32_t)IOPORT_CFG_PORT_DIRECTION_INPUT),
+    },
+    {
+        .pin = BSP_IO_PORT_03_PIN_04,
+        .pin_cfg = ((uint32_t)IOPORT_CFG_IRQ_ENABLE | (uint32_t)IOPORT_CFG_PORT_DIRECTION_INPUT),
+    },
+    {
+        .pin = BSP_IO_PORT_04_PIN_01,
+        .pin_cfg = ((uint32_t)IOPORT_CFG_PERIPHERAL_PIN | (uint32_t)IOPORT_PERIPHERAL_SCI1_3_5_7_9),
+    },
+    {
+        .pin = BSP_IO_PORT_04_PIN_02,
+        .pin_cfg = ((uint32_t)IOPORT_CFG_PERIPHERAL_PIN | (uint32_t)IOPORT_PERIPHERAL_SCI1_3_5_7_9),
+    },
+    {
+        .pin = BSP_IO_PORT_04_PIN_08,
+        .pin_cfg = ((uint32_t)IOPORT_CFG_PORT_DIRECTION_OUTPUT | (uint32_t)IOPORT_CFG_PORT_OUTPUT_LOW),
+    },
+    {
+        .pin = BSP_IO_PORT_04_PIN_09,
+        .pin_cfg = ((uint32_t)IOPORT_CFG_PORT_DIRECTION_OUTPUT | (uint32_t)IOPORT_CFG_PORT_OUTPUT_LOW),
+    },
+    {
+        .pin = BSP_IO_PORT_04_PIN_10,
+        .pin_cfg = ((uint32_t)IOPORT_CFG_PERIPHERAL_PIN | (uint32_t)IOPORT_PERIPHERAL_SCI0_2_4_6_8),
+    },
+    {
+        .pin = BSP_IO_PORT_04_PIN_11,
+        .pin_cfg = ((uint32_t)IOPORT_CFG_PERIPHERAL_PIN | (uint32_t)IOPORT_PERIPHERAL_SCI0_2_4_6_8),
+    },
+};
+const ioport_cfg_t g_bsp_pin_cfg = {
+    .number_of_pins = sizeof(g_bsp_pin_cfg_data) / sizeof(ioport_pin_cfg_t),
+    .p_pin_cfg_data = &g_bsp_pin_cfg_data[0],
+};
diff --git a/ports/renesas-ra/boards/RA4M1_CLICKER/ra_gen/vector_data.c b/ports/renesas-ra/boards/RA4M1_CLICKER/ra_gen/vector_data.c
new file mode 100644
index 0000000000000..ea2f3b066f0c2
--- /dev/null
+++ b/ports/renesas-ra/boards/RA4M1_CLICKER/ra_gen/vector_data.c
@@ -0,0 +1,57 @@
+/* generated vector source file - do not edit */
+#include "bsp_api.h"
+/* Do not build these data structures if no interrupts are currently allocated because IAR will have build errors. */
+#if VECTOR_DATA_IRQ_COUNT > 0
+BSP_DONT_REMOVE const fsp_vector_t g_vector_table[BSP_ICU_VECTOR_MAX_ENTRIES] BSP_PLACE_IN_SECTION(BSP_SECTION_APPLICATION_VECTORS) =
+{
+    [0] = sci_uart_rxi_isr,         /* SCI0 RXI (Receive data full) */
+    [1] = sci_uart_txi_isr,         /* SCI0 TXI (Transmit data empty) */
+    [2] = sci_uart_tei_isr,         /* SCI0 TEI (Transmit end) */
+    [3] = sci_uart_eri_isr,         /* SCI0 ERI (Receive error) */
+    [4] = sci_uart_rxi_isr,         /* SCI1 RXI (Received data full) */
+    [5] = sci_uart_txi_isr,         /* SCI1 TXI (Transmit data empty) */
+    [6] = sci_uart_tei_isr,         /* SCI1 TEI (Transmit end) */
+    [7] = sci_uart_eri_isr,         /* SCI1 ERI (Receive error) */
+    [8] = rtc_alarm_periodic_isr,   /* RTC ALARM (Alarm interrupt) */
+    [9] = rtc_alarm_periodic_isr,   /* RTC PERIOD (Periodic interrupt) */
+    [10] = rtc_carry_isr,           /* RTC CARRY (Carry interrupt) */
+    [11] = agt_int_isr,             /* AGT0 INT (AGT interrupt) */
+    [12] = r_icu_isr,               /* ICU IRQ5 (External pin interrupt 5) */
+    [13] = spi_rxi_isr,             /* SPI0 RXI (Receive buffer full) */
+    [14] = spi_txi_isr,             /* SPI0 TXI (Transmit buffer empty) */
+    [15] = spi_tei_isr,             /* SPI0 TEI (Transmission complete event) */
+    [16] = spi_eri_isr,             /* SPI0 ERI (Error) */
+    [17] = iic_master_rxi_isr,      /* IIC1 RXI (Receive data full) */
+    [18] = iic_master_txi_isr,      /* IIC1 TXI (Transmit data empty) */
+    [19] = iic_master_tei_isr,      /* IIC1 TEI (Transmit end) */
+    [20] = iic_master_eri_isr,      /* IIC1 ERI (Transfer error) */
+    [21] = r_icu_isr,               /* ICU IRQ6 (External pin interrupt 6) */
+    [22] = r_icu_isr,               /* ICU IRQ9 (External pin interrupt 9) */
+};
+const bsp_interrupt_event_t g_interrupt_event_link_select[BSP_ICU_VECTOR_MAX_ENTRIES] =
+{
+    [0] = BSP_PRV_IELS_ENUM(EVENT_SCI0_RXI),         /* SCI0 RXI (Receive data full) */
+    [1] = BSP_PRV_IELS_ENUM(EVENT_SCI0_TXI),         /* SCI0 TXI (Transmit data empty) */
+    [2] = BSP_PRV_IELS_ENUM(EVENT_SCI0_TEI),         /* SCI0 TEI (Transmit end) */
+    [3] = BSP_PRV_IELS_ENUM(EVENT_SCI0_ERI),         /* SCI0 ERI (Receive error) */
+    [4] = BSP_PRV_IELS_ENUM(EVENT_SCI1_RXI),         /* SCI1 RXI (Received data full) */
+    [5] = BSP_PRV_IELS_ENUM(EVENT_SCI1_TXI),         /* SCI1 TXI (Transmit data empty) */
+    [6] = BSP_PRV_IELS_ENUM(EVENT_SCI1_TEI),         /* SCI1 TEI (Transmit end) */
+    [7] = BSP_PRV_IELS_ENUM(EVENT_SCI1_ERI),         /* SCI1 ERI (Receive error) */
+    [8] = BSP_PRV_IELS_ENUM(EVENT_RTC_ALARM),        /* RTC ALARM (Alarm interrupt) */
+    [9] = BSP_PRV_IELS_ENUM(EVENT_RTC_PERIOD),       /* RTC PERIOD (Periodic interrupt) */
+    [10] = BSP_PRV_IELS_ENUM(EVENT_RTC_CARRY),       /* RTC CARRY (Carry interrupt) */
+    [11] = BSP_PRV_IELS_ENUM(EVENT_AGT0_INT),        /* AGT0 INT (AGT interrupt) */
+    [12] = BSP_PRV_IELS_ENUM(EVENT_ICU_IRQ5),        /* ICU IRQ5 (External pin interrupt 5) */
+    [13] = BSP_PRV_IELS_ENUM(EVENT_SPI0_RXI),        /* SPI0 RXI (Receive buffer full) */
+    [14] = BSP_PRV_IELS_ENUM(EVENT_SPI0_TXI),        /* SPI0 TXI (Transmit buffer empty) */
+    [15] = BSP_PRV_IELS_ENUM(EVENT_SPI0_TEI),        /* SPI0 TEI (Transmission complete event) */
+    [16] = BSP_PRV_IELS_ENUM(EVENT_SPI0_ERI),        /* SPI0 ERI (Error) */
+    [17] = BSP_PRV_IELS_ENUM(EVENT_IIC1_RXI),        /* IIC1 RXI (Receive data full) */
+    [18] = BSP_PRV_IELS_ENUM(EVENT_IIC1_TXI),        /* IIC1 TXI (Transmit data empty) */
+    [19] = BSP_PRV_IELS_ENUM(EVENT_IIC1_TEI),        /* IIC1 TEI (Transmit end) */
+    [20] = BSP_PRV_IELS_ENUM(EVENT_IIC1_ERI),        /* IIC1 ERI (Transfer error) */
+    [21] = BSP_PRV_IELS_ENUM(EVENT_ICU_IRQ6),        /* ICU IRQ6 (External pin interrupt 6) */
+    [22] = BSP_PRV_IELS_ENUM(EVENT_ICU_IRQ9),        /* ICU IRQ9 (External pin interrupt 9) */
+};
+#endif
diff --git a/ports/renesas-ra/boards/RA4M1_CLICKER/ra_gen/vector_data.h b/ports/renesas-ra/boards/RA4M1_CLICKER/ra_gen/vector_data.h
new file mode 100644
index 0000000000000..5481e446c149a
--- /dev/null
+++ b/ports/renesas-ra/boards/RA4M1_CLICKER/ra_gen/vector_data.h
@@ -0,0 +1,87 @@
+/* generated vector header file - do not edit */
+#ifndef VECTOR_DATA_H
+#define VECTOR_DATA_H
+/* Number of interrupts allocated */
+#ifndef VECTOR_DATA_IRQ_COUNT
+#define VECTOR_DATA_IRQ_COUNT    (23)
+#endif
+/* ISR prototypes */
+void sci_uart_rxi_isr(void);
+void sci_uart_txi_isr(void);
+void sci_uart_tei_isr(void);
+void sci_uart_eri_isr(void);
+void rtc_alarm_periodic_isr(void);
+void rtc_carry_isr(void);
+void agt_int_isr(void);
+void r_icu_isr(void);
+void spi_rxi_isr(void);
+void spi_txi_isr(void);
+void spi_tei_isr(void);
+void spi_eri_isr(void);
+void iic_master_rxi_isr(void);
+void iic_master_txi_isr(void);
+void iic_master_tei_isr(void);
+void iic_master_eri_isr(void);
+
+/* Vector table allocations */
+#define VECTOR_NUMBER_SCI0_RXI ((IRQn_Type)0)  /* SCI0 RXI (Receive data full) */
+#define VECTOR_NUMBER_SCI0_TXI ((IRQn_Type)1)  /* SCI0 TXI (Transmit data empty) */
+#define VECTOR_NUMBER_SCI0_TEI ((IRQn_Type)2)  /* SCI0 TEI (Transmit end) */
+#define VECTOR_NUMBER_SCI0_ERI ((IRQn_Type)3)  /* SCI0 ERI (Receive error) */
+#define VECTOR_NUMBER_SCI1_RXI ((IRQn_Type)4)  /* SCI1 RXI (Received data full) */
+#define VECTOR_NUMBER_SCI1_TXI ((IRQn_Type)5)  /* SCI1 TXI (Transmit data empty) */
+#define VECTOR_NUMBER_SCI1_TEI ((IRQn_Type)6)  /* SCI1 TEI (Transmit end) */
+#define VECTOR_NUMBER_SCI1_ERI ((IRQn_Type)7)  /* SCI1 ERI (Receive error) */
+#define VECTOR_NUMBER_RTC_ALARM ((IRQn_Type)8)  /* RTC ALARM (Alarm interrupt) */
+#define VECTOR_NUMBER_RTC_PERIOD ((IRQn_Type)9)  /* RTC PERIOD (Periodic interrupt) */
+#define VECTOR_NUMBER_RTC_CARRY ((IRQn_Type)10)  /* RTC CARRY (Carry interrupt) */
+#define VECTOR_NUMBER_AGT0_INT ((IRQn_Type)11)  /* AGT0 INT (AGT interrupt) */
+#define VECTOR_NUMBER_ICU_IRQ5 ((IRQn_Type)12)  /* ICU IRQ5 (External pin interrupt 5) */
+#define VECTOR_NUMBER_SPI0_RXI ((IRQn_Type)13)  /* SPI0 RXI (Receive buffer full) */
+#define VECTOR_NUMBER_SPI0_TXI ((IRQn_Type)14)  /* SPI0 TXI (Transmit buffer empty) */
+#define VECTOR_NUMBER_SPI0_TEI ((IRQn_Type)15)  /* SPI0 TEI (Transmission complete event) */
+#define VECTOR_NUMBER_SPI0_ERI ((IRQn_Type)16)  /* SPI0 ERI (Error) */
+#define VECTOR_NUMBER_IIC1_RXI ((IRQn_Type)17)  /* IIC1 RXI (Receive data full) */
+#define VECTOR_NUMBER_IIC1_TXI ((IRQn_Type)18)  /* IIC1 TXI (Transmit data empty) */
+#define VECTOR_NUMBER_IIC1_TEI ((IRQn_Type)19)  /* IIC1 TEI (Transmit end) */
+#define VECTOR_NUMBER_IIC1_ERI ((IRQn_Type)20)  /* IIC1 ERI (Transfer error) */
+#define VECTOR_NUMBER_ICU_IRQ6 ((IRQn_Type)21)  /* ICU IRQ6 (External pin interrupt 6) */
+#define VECTOR_NUMBER_ICU_IRQ9 ((IRQn_Type)22)  /* ICU IRQ9 (External pin interrupt 9) */
+typedef enum IRQn
+{
+    Reset_IRQn = -15,
+    NonMaskableInt_IRQn = -14,
+    HardFault_IRQn = -13,
+    MemoryManagement_IRQn = -12,
+    BusFault_IRQn = -11,
+    UsageFault_IRQn = -10,
+    SecureFault_IRQn = -9,
+    SVCall_IRQn = -5,
+    DebugMonitor_IRQn = -4,
+    PendSV_IRQn = -2,
+    SysTick_IRQn = -1,
+    SCI0_RXI_IRQn = 0, /* SCI0 RXI (Receive data full) */
+    SCI0_TXI_IRQn = 1, /* SCI0 TXI (Transmit data empty) */
+    SCI0_TEI_IRQn = 2, /* SCI0 TEI (Transmit end) */
+    SCI0_ERI_IRQn = 3, /* SCI0 ERI (Receive error) */
+    SCI1_RXI_IRQn = 4, /* SCI1 RXI (Received data full) */
+    SCI1_TXI_IRQn = 5, /* SCI1 TXI (Transmit data empty) */
+    SCI1_TEI_IRQn = 6, /* SCI1 TEI (Transmit end) */
+    SCI1_ERI_IRQn = 7, /* SCI1 ERI (Receive error) */
+    RTC_ALARM_IRQn = 8, /* RTC ALARM (Alarm interrupt) */
+    RTC_PERIOD_IRQn = 9, /* RTC PERIOD (Periodic interrupt) */
+    RTC_CARRY_IRQn = 10, /* RTC CARRY (Carry interrupt) */
+    AGT0_INT_IRQn = 11, /* AGT0 INT (AGT interrupt) */
+    ICU_IRQ5_IRQn = 12, /* ICU IRQ5 (External pin interrupt 5) */
+    SPI0_RXI_IRQn = 13, /* SPI0 RXI (Receive buffer full) */
+    SPI0_TXI_IRQn = 14, /* SPI0 TXI (Transmit buffer empty) */
+    SPI0_TEI_IRQn = 15, /* SPI0 TEI (Transmission complete event) */
+    SPI0_ERI_IRQn = 16, /* SPI0 ERI (Error) */
+    IIC1_RXI_IRQn = 17, /* IIC1 RXI (Receive data full) */
+    IIC1_TXI_IRQn = 18, /* IIC1 TXI (Transmit data empty) */
+    IIC1_TEI_IRQn = 19, /* IIC1 TEI (Transmit end) */
+    IIC1_ERI_IRQn = 20, /* IIC1 ERI (Transfer error) */
+    ICU_IRQ6_IRQn = 21, /* ICU IRQ6 (External pin interrupt 6) */
+    ICU_IRQ9_IRQn = 22, /* ICU IRQ9 (External pin interrupt 9) */
+} IRQn_Type;
+#endif /* VECTOR_DATA_H */
diff --git a/ports/renesas-ra/boards/RA4M1_CLICKER/src/hal_entry.c b/ports/renesas-ra/boards/RA4M1_CLICKER/src/hal_entry.c
new file mode 100644
index 0000000000000..c922cfd17ad9a
--- /dev/null
+++ b/ports/renesas-ra/boards/RA4M1_CLICKER/src/hal_entry.c
@@ -0,0 +1,58 @@
+#include "hal_data.h"
+
+FSP_CPP_HEADER
+void R_BSP_WarmStart(bsp_warm_start_event_t event);
+FSP_CPP_FOOTER
+
+void ra_main(uint32_t reset_mode);
+
+/*******************************************************************************************************************//**
+ * main() is generated by the RA Configuration editor and is used to generate threads if an RTOS is used.  This function
+ * is called by main() when no RTOS is used.
+ **********************************************************************************************************************/
+void hal_entry(void) {
+    /* TODO: add your own code here */
+
+    ra_main(1);
+
+    #if BSP_TZ_SECURE_BUILD
+    /* Enter non-secure code */
+    R_BSP_NonSecureEnter();
+    #endif
+}
+
+/*******************************************************************************************************************//**
+ * This function is called at various points during the startup process.  This implementation uses the event that is
+ * called right before main() to set up the pins.
+ *
+ * @param[in]  event    Where at in the start up process the code is currently at
+ **********************************************************************************************************************/
+void R_BSP_WarmStart(bsp_warm_start_event_t event) {
+    if (BSP_WARM_START_RESET == event) {
+        #if BSP_FEATURE_FLASH_LP_VERSION != 0
+
+        /* Enable reading from data flash. */
+        R_FACI_LP->DFLCTL = 1U;
+
+        /* Would normally have to wait tDSTOP(6us) for data flash recovery. Placing the enable here, before clock and
+         * C runtime initialization, should negate the need for a delay since the initialization will typically take more than 6us. */
+        #endif
+    }
+
+    if (BSP_WARM_START_POST_C == event) {
+        /* C runtime environment and system clocks are setup. */
+
+        /* Configure pins. */
+        R_IOPORT_Open(&g_ioport_ctrl, &g_bsp_pin_cfg);
+    }
+}
+
+#if BSP_TZ_SECURE_BUILD
+
+BSP_CMSE_NONSECURE_ENTRY void template_nonsecure_callable();
+
+/* Trustzone Secure Projects require at least one nonsecure callable function in order to build (Remove this if it is not required to build). */
+BSP_CMSE_NONSECURE_ENTRY void template_nonsecure_callable() {
+
+}
+#endif
diff --git a/ports/renesas-ra/boards/RA4M1_EK/board.json b/ports/renesas-ra/boards/RA4M1_EK/board.json
new file mode 100644
index 0000000000000..bab3bcacee296
--- /dev/null
+++ b/ports/renesas-ra/boards/RA4M1_EK/board.json
@@ -0,0 +1,21 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [
+	"UART",
+	"SPI",
+	"I2C",
+	"ADC"
+    ],
+    "id": "EK-RA4M1",
+    "images": [
+        "ek_ra4m1_board.jpg"
+    ],
+    "mcu": "RA4M1",
+    "product": "EK-RA4M1",
+    "thumbnail": "",
+    "url": "https://www.renesas.com/products/microcontrollers-microprocessors/ra-cortex-m-mcus/ek-ra4m1-evaluation-kit-ra4m1-mcu-group",
+    "vendor": "Renesas Electronics"
+}
diff --git a/ports/renesas-ra/boards/RA4M1_EK/manifest.py b/ports/renesas-ra/boards/RA4M1_EK/manifest.py
new file mode 100644
index 0000000000000..4a387915d37e0
--- /dev/null
+++ b/ports/renesas-ra/boards/RA4M1_EK/manifest.py
@@ -0,0 +1,2 @@
+# We do not want to include default frozen modules,
+freeze("$(MPY_DIR)/drivers/sdcard", "sdcard.py")
diff --git a/ports/renesas-ra/boards/RA4M1_EK/mpconfigboard.h b/ports/renesas-ra/boards/RA4M1_EK/mpconfigboard.h
new file mode 100644
index 0000000000000..500fe78b9e121
--- /dev/null
+++ b/ports/renesas-ra/boards/RA4M1_EK/mpconfigboard.h
@@ -0,0 +1,70 @@
+// MCU config
+#define MICROPY_HW_BOARD_NAME       "RA4M1_EK"
+#define MICROPY_HW_MCU_NAME         "RA4M1"
+#define MICROPY_HW_MCU_SYSCLK       48000000
+#define MICROPY_HW_MCU_PCLK         48000000
+
+// module config
+#define MICROPY_EMIT_THUMB          (0)
+#define MICROPY_EMIT_INLINE_THUMB   (0)
+#define MICROPY_PY_BUILTINS_COMPLEX (0)
+#define MICROPY_PY_GENERATOR_PEND_THROW (0)
+#define MICROPY_PY_MATH             (0)
+#define MICROPY_PY_UHEAPQ           (0)
+#define MICROPY_PY_UTIMEQ           (0)
+#define MICROPY_PY_THREAD           (0)
+
+// peripheral config
+#define MICROPY_HW_ENABLE_RTC       (1)
+#define MICROPY_HW_RTC_SOURCE       (0)    // 0: subclock, 1:LOCO
+#define MICROPY_HW_ENABLE_ADC       (1)
+#define MICROPY_HW_HAS_FLASH        (1)
+#define MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE (1)
+
+// board config
+
+// UART
+#define MICROPY_HW_UART0_TX         (pin_P411) // REPL
+#define MICROPY_HW_UART0_RX         (pin_P410) // REPL
+#define MICROPY_HW_UART1_TX         (pin_P401) // PMOD B
+#define MICROPY_HW_UART1_RX         (pin_P402) // PMOD B
+#define MICROPY_HW_UART1_CTS        (pin_P403) // PMOD B
+#define MICROPY_HW_UART2_TX         (pin_P302)
+#define MICROPY_HW_UART2_RX         (pin_P301)
+#define MICROPY_HW_UART2_CTS        (pin_P203) // (Conflict with SPI1)
+// #define MICROPY_HW_UART9_TX       (pin_P602) // Disable (vector not registered)
+// #define MICROPY_HW_UART9_RX       (pin_P601) // Disable (vector not registered)
+// #define MICROPY_HW_UART9_CTS      (pin_P603) // Disable (vector not registered)
+#define MICROPY_HW_UART_REPL        HW_UART_0
+#define MICROPY_HW_UART_REPL_BAUD   115200
+
+// I2C (not supported)
+// #define MICROPY_HW_I2C0_SCL      (pin_P204) // Conflict with SPI1
+// #define MICROPY_HW_I2C0_SDA      (pin_P407) // Conflict with USB_VBUS
+// #define MICROPY_HW_I2C0_SCL      (pin_P400) // Conflict wiht PMOD B (GPIO)
+// #define MICROPY_HW_I2C0_SDA      (pin_P401) // Conflict with PMOD B (TXD1)
+// #define MICROPY_HW_I2C1_SCL      (pin_P100) // Conflict with PMOD A (MISOA_A)
+// #define MICROPY_HW_I2C1_SDA      (pin_P101) // Conflict with PMOD A (MOSIA_A)
+
+// SPI
+#define MICROPY_HW_SPI0_SSL         (pin_P103) // PMOD A
+#define MICROPY_HW_SPI0_RSPCK       (pin_P102) // PMOD A
+#define MICROPY_HW_SPI0_MISO        (pin_P100) // PMOD A
+#define MICROPY_HW_SPI0_MOSI        (pin_P101) // PMOD A
+#define MICROPY_HW_SPI1_SSL         (pin_P206) // Use SSLB1 due to SSLB0 is used for TSCAP
+// #define MICROPY_HW_SPI1_RSPCK     (pin_P204) // Disable (vector not registered)
+// #define MICROPY_HW_SPI1_MISO      (pin_P202) // Disable (vector not registered)
+// #define MICROPY_HW_SPI1_MOSI      (pin_P203) // Disable (vector not registered)
+
+// Switch
+#define MICROPY_HW_HAS_SWITCH       (1)
+#define MICROPY_HW_USRSW_PIN        (pin_P105)
+#define MICROPY_HW_USRSW_PULL       (GPIO_NOPULL)
+#define MICROPY_HW_USRSW_EXTI_MODE  (GPIO_MODE_IT_FALLING)
+#define MICROPY_HW_USRSW_PRESSED    (0)
+
+// LEDs
+#define MICROPY_HW_LED1             (pin_P106)
+#define MICROPY_HW_LED_ON(pin)      mp_hal_pin_high(pin)
+#define MICROPY_HW_LED_OFF(pin)     mp_hal_pin_low(pin)
+#define MICROPY_HW_LED_TOGGLE(pin)  mp_hal_pin_toggle(pin)
diff --git a/ports/renesas-ra/boards/RA4M1_EK/mpconfigboard.mk b/ports/renesas-ra/boards/RA4M1_EK/mpconfigboard.mk
new file mode 100644
index 0000000000000..1213fa3229c0e
--- /dev/null
+++ b/ports/renesas-ra/boards/RA4M1_EK/mpconfigboard.mk
@@ -0,0 +1,9 @@
+CMSIS_MCU = RA4M1
+MCU_SERIES = m4
+LD_FILES = boards/RA4M1_EK/ra4m1_ek.ld
+
+# MicroPython settings
+MICROPY_VFS_FAT = 1
+
+# Don't include default frozen modules because MCU is tight on flash space
+FROZEN_MANIFEST ?= boards/RA4M1_EK/manifest.py
diff --git a/ports/renesas-ra/boards/RA4M1_EK/pins.csv b/ports/renesas-ra/boards/RA4M1_EK/pins.csv
new file mode 100644
index 0000000000000..910321b966732
--- /dev/null
+++ b/ports/renesas-ra/boards/RA4M1_EK/pins.csv
@@ -0,0 +1,104 @@
+P000,P000
+P001,P001
+P002,P002
+P003,P003
+P004,P004
+P005,P005
+P006,P006
+P007,P007
+P008,P008
+P010,P010
+P011,P011
+P012,P012
+P013,P013
+P014,P014
+P015,P015
+P100,P100
+P101,P101
+P102,P102
+P103,P103
+P104,P104
+P105,P105
+P106,P106
+P107,P107
+P108,P108
+P109,P109
+P110,P110
+P111,P111
+P112,P112
+P113,P113
+P114,P114
+P115,P115
+P200,P200
+P201,P201
+P202,P202
+P203,P203
+P204,P204
+P205,P205
+P206,P206
+P212,P212
+P213,P213
+P214,P214
+P215,P215
+P300,P300
+P301,P301
+P302,P302
+P303,P303
+P304,P304
+P400,P400
+P401,P401
+P402,P402
+P403,P403
+P404,P404
+P405,P405
+P406,P406
+P407,P407
+P408,P408
+P409,P409
+P410,P410
+P411,P411
+P412,P412
+P413,P413
+P414,P414
+P415,P415
+P500,P500
+P501,P501
+P502,P502
+P503,P503
+P504,P504
+P505,P505
+P600,P601
+P601,P601
+P602,P602
+P603,P603
+P608,P608
+P609,P609
+P610,P610
+P808,P808
+P809,P809
+P708,P708
+P914,P914
+P915,P915
+MBAN,P000
+MBMISO,P100
+MBMOSI,P101
+MBSCK,P102
+MBSSL,P103
+MBPWM,P107
+SWDIO,P108
+SWO,P109
+TDI,P110
+TSCAP,P112
+MD,P201
+MBSCLI,P205
+MBSDA1,P206
+SWCLK,P300
+MBINT,P302
+SW1,P105
+MBRST,P407
+LED1,P106
+MBRX0,P410
+MBTX0,P411
+USBDP,P914
+USBDM,P915
+
diff --git a/ports/renesas-ra/boards/RA4M1_EK/ra4m1_ek.ld b/ports/renesas-ra/boards/RA4M1_EK/ra4m1_ek.ld
new file mode 100644
index 0000000000000..0ce4e9267160f
--- /dev/null
+++ b/ports/renesas-ra/boards/RA4M1_EK/ra4m1_ek.ld
@@ -0,0 +1,298 @@
+/*
+                  Linker File for RA4M1 MCU
+*/
+
+/* Linker script to configure memory regions. */
+MEMORY
+{
+  FLASH (rx)         : ORIGIN = 0x00000000, LENGTH = 0x00040000  /* 256KB */
+  RAM (rwx)          : ORIGIN = 0x20000000, LENGTH = 0x00008000  /* 32KB */
+  DATA_FLASH (rx)    : ORIGIN = 0x40100000, LENGTH = 0x00002000  /* 8KB */
+  ID_CODE (rx)       : ORIGIN = 0x01010018, LENGTH = 0x00000020  /* 32bytes */
+}
+
+/* Library configurations */
+/*GROUP(libgcc.a libc.a libm.a libnosys.a) */
+
+/* Linker script to place sections and symbol values. Should be used together
+ * with other linker script that defines memory regions FLASH and RAM.
+ * It references following symbols, which must be defined in code:
+ *   Reset_Handler : Entry of reset handler
+ *
+ * It defines following symbols, which code can use without definition:
+ *   __exidx_start
+ *   __exidx_end
+ *   __copy_table_start__
+ *   __copy_table_end__
+ *   __zero_table_start__
+ *   __zero_table_end__
+ *   __etext
+ *   __data_start__
+ *   __preinit_array_start
+ *   __preinit_array_end
+ *   __init_array_start
+ *   __init_array_end
+ *   __fini_array_start
+ *   __fini_array_end
+ *   __data_end__
+ *   __bss_start__
+ *   __bss_end__
+ *   __end__
+ *   end
+ *   __HeapLimit
+ *   __StackLimit
+ *   __StackTop
+ *   __stack
+ *   __Vectors_End
+ *   __Vectors_Size
+ */
+ENTRY(Reset_Handler)
+
+SECTIONS
+{
+    .text :
+    {
+        _stext = .;
+        __ROM_Start = .;
+
+        /* Even though the vector table is not 256 entries (1KB) long, we still allocate that much
+         * space because ROM registers are at address 0x400 and there is very little space
+         * in between. */
+        KEEP(*(.fixed_vectors*))
+        KEEP(*(.application_vectors*))
+        __Vectors_End = .;
+        __end__ = .;
+
+        /* ROM Registers start at address 0x00000400 */
+        . = __ROM_Start + 0x400;
+        KEEP(*(.rom_registers*))
+
+        /* Reserving 0x100 bytes of space for ROM registers. */
+        . = __ROM_Start + 0x500;
+
+        *(.text*)
+
+        KEEP(*(.version))
+        KEEP(*(.init))
+        KEEP(*(.fini))
+
+        /* .ctors */
+        *crtbegin.o(.ctors)
+        *crtbegin?.o(.ctors)
+        *(EXCLUDE_FILE(*crtend?.o *crtend.o) .ctors)
+        *(SORT(.ctors.*))
+        *(.ctors)
+
+        /* .dtors */
+        *crtbegin.o(.dtors)
+        *crtbegin?.o(.dtors)
+        *(EXCLUDE_FILE(*crtend?.o *crtend.o) .dtors)
+        *(SORT(.dtors.*))
+        *(.dtors)
+
+        *(.rodata*)
+        __usb_dev_descriptor_start_fs = .;
+        KEEP(*(.usb_device_desc_fs*))
+        __usb_cfg_descriptor_start_fs = .;
+        KEEP(*(.usb_config_desc_fs*))
+        __usb_interface_descriptor_start_fs = .;
+        KEEP(*(.usb_interface_desc_fs*))
+        __usb_descriptor_end_fs = .;
+        __usb_dev_descriptor_start_hs = .;
+        KEEP(*(.usb_device_desc_hs*))
+        __usb_cfg_descriptor_start_hs = .;
+        KEEP(*(.usb_config_desc_hs*))
+        __usb_interface_descriptor_start_hs = .;
+        KEEP(*(.usb_interface_desc_hs*))
+        __usb_descriptor_end_hs = .;
+
+        KEEP(*(.eh_frame*))
+
+        __ROM_End = .;
+        _etext = .;
+    } > FLASH = 0xFF
+
+    __Vectors_Size = __Vectors_End - __Vectors;
+
+    .ARM.extab :
+    {
+        *(.ARM.extab* .gnu.linkonce.armextab.*)
+    } > FLASH
+
+    __exidx_start = .;
+    .ARM.exidx :
+    {
+        *(.ARM.exidx* .gnu.linkonce.armexidx.*)
+    } > FLASH
+    __exidx_end = .;
+
+    /* To copy multiple ROM to RAM sections,
+     * uncomment .copy.table section and,
+     * define __STARTUP_COPY_MULTIPLE in startup_ARMCMx.S */
+    /*
+    .copy.table :
+    {
+        . = ALIGN(4);
+        __copy_table_start__ = .;
+        LONG (__etext)
+        LONG (__data_start__)
+        LONG (__data_end__ - __data_start__)
+        LONG (__etext2)
+        LONG (__data2_start__)
+        LONG (__data2_end__ - __data2_start__)
+        __copy_table_end__ = .;
+    } > FLASH
+    */
+
+    /* To clear multiple BSS sections,
+     * uncomment .zero.table section and,
+     * define __STARTUP_CLEAR_BSS_MULTIPLE in startup_ARMCMx.S */
+    /*
+    .zero.table :
+    {
+        . = ALIGN(4);
+        __zero_table_start__ = .;
+        LONG (__bss_start__)
+        LONG (__bss_end__ - __bss_start__)
+        LONG (__bss2_start__)
+        LONG (__bss2_end__ - __bss2_start__)
+        __zero_table_end__ = .;
+    } > FLASH
+    */
+
+    __etext = .;
+
+    /* If DTC is used, put the DTC vector table at the start of SRAM.
+       This avoids memory holes due to 1K alignment required by it. */
+    .fsp_dtc_vector_table (NOLOAD) :
+    {
+        . = ORIGIN(RAM);
+        *(.fsp_dtc_vector_table)
+    } > RAM
+
+    /* Initialized data section. */
+    .data :
+    {
+        _sidata = .;
+        _sdata = .;
+        __data_start__ = .;
+        *(vtable)
+        *(.data.*)
+
+        . = ALIGN(4);
+        /* preinit data */
+        PROVIDE_HIDDEN (__preinit_array_start = .);
+        KEEP(*(.preinit_array))
+        PROVIDE_HIDDEN (__preinit_array_end = .);
+
+        . = ALIGN(4);
+        /* init data */
+        PROVIDE_HIDDEN (__init_array_start = .);
+        KEEP(*(SORT(.init_array.*)))
+        KEEP(*(.init_array))
+        PROVIDE_HIDDEN (__init_array_end = .);
+
+
+        . = ALIGN(4);
+        /* finit data */
+        PROVIDE_HIDDEN (__fini_array_start = .);
+        KEEP(*(SORT(.fini_array.*)))
+        KEEP(*(.fini_array))
+        PROVIDE_HIDDEN (__fini_array_end = .);
+
+        KEEP(*(.jcr*))
+        . = ALIGN(4);
+
+        __Code_In_RAM_Start = .;
+
+        KEEP(*(.code_in_ram*))
+        __Code_In_RAM_End = .;
+
+        /* All data end */
+        __data_end__ = .;
+        _edata = .;
+
+    } > RAM AT > FLASH
+
+
+
+    .noinit (NOLOAD):
+    {
+        . = ALIGN(4);
+        __noinit_start = .;
+        KEEP(*(.noinit*))
+        __noinit_end = .;
+    } > RAM
+
+    .bss :
+    {
+        . = ALIGN(4);
+        _sbss = .;
+        __bss_start__ = .;
+        *(.bss*)
+        *(COMMON)
+        . = ALIGN(4);
+        __bss_end__ = .;
+        _ebss = .;
+    } > RAM
+
+    .heap (NOLOAD):
+    {
+        . = ALIGN(8);
+        __HeapBase = .;
+        __end__ = .;
+        end = __end__;
+        KEEP(*(.heap*))
+        __HeapLimit = .;
+    } > RAM
+
+    /* Stacks are stored in this section. */
+    .stack_dummy (NOLOAD):
+    {
+        . = ALIGN(8);
+        _sstack = .;
+        __StackLimit = .;
+        /* Main stack */
+        KEEP(*(.stack))
+        __StackTop = .;
+        /* Thread stacks */
+        KEEP(*(.stack*))
+        __StackTopAll = .;
+        _estack = .;
+    } > RAM
+
+    PROVIDE(__stack = __StackTopAll);
+
+    /* This symbol represents the end of user allocated RAM. The RAM after this symbol can be used
+       at run time for things such as ThreadX memory pool allocations. */
+    __RAM_segment_used_end__ = ALIGN(__StackTopAll , 4);
+
+    /* Data flash. */
+    .data_flash :
+    {
+        __Data_Flash_Start = .;
+        KEEP(*(.data_flash*))
+        __Data_Flash_End = .;
+    } > DATA_FLASH
+
+    .id_code :
+    {
+        __ID_Code_Start = .;
+        KEEP(*(.id_code*))
+        __ID_Code_End = .;
+    } > ID_CODE
+}
+/* produce a link error if there is not this amount of RAM for these sections */
+/* _minimum_stack_size = 2K; */
+/* _minimum_heap_size = 16K; */
+
+/* Define tho top end of the stack.  The stack is full descending so begins just
+   above last byte of RAM.  Note that EABI requires the stack to be 8-byte
+   aligned for a call. */
+_estack = ORIGIN(RAM) + LENGTH(RAM);
+
+/* RAM extents for the garbage collector */
+_ram_start = ORIGIN(RAM);
+_ram_end = ORIGIN(RAM) + LENGTH(RAM);
+_heap_start = __HeapBase;	/* heap starts just after statically allocated memory */
+_heap_end = __HeapLimit;	/* tunable */
diff --git a/ports/renesas-ra/boards/RA4M1_EK/ra4m1_ek_conf.h b/ports/renesas-ra/boards/RA4M1_EK/ra4m1_ek_conf.h
new file mode 100644
index 0000000000000..261073cfe98e8
--- /dev/null
+++ b/ports/renesas-ra/boards/RA4M1_EK/ra4m1_ek_conf.h
@@ -0,0 +1,30 @@
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Renesas Electronics Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#ifndef RA4M1_EK_CONF_H
+#define RA4M1_EK_CONF_H
+
+#define DEBUG_CH    0
+
+#endif /* RA4M1_EK_CONF_H */
diff --git a/ports/renesas-ra/boards/RA4M1_EK/ra_cfg/fsp_cfg/bsp/board_cfg.h b/ports/renesas-ra/boards/RA4M1_EK/ra_cfg/fsp_cfg/bsp/board_cfg.h
new file mode 100644
index 0000000000000..4fab9f48c3371
--- /dev/null
+++ b/ports/renesas-ra/boards/RA4M1_EK/ra_cfg/fsp_cfg/bsp/board_cfg.h
@@ -0,0 +1,5 @@
+/* generated configuration header file - do not edit */
+#ifndef BOARD_CFG_H_
+#define BOARD_CFG_H_
+#include "../../../ra/board/ra4m1_ek/board.h"
+#endif /* BOARD_CFG_H_ */
diff --git a/ports/renesas-ra/boards/RA4M1_EK/ra_cfg/fsp_cfg/bsp/bsp_cfg.h b/ports/renesas-ra/boards/RA4M1_EK/ra_cfg/fsp_cfg/bsp/bsp_cfg.h
new file mode 100644
index 0000000000000..9940d7ed3beda
--- /dev/null
+++ b/ports/renesas-ra/boards/RA4M1_EK/ra_cfg/fsp_cfg/bsp/bsp_cfg.h
@@ -0,0 +1,49 @@
+/* generated configuration header file - do not edit */
+#ifndef BSP_CFG_H_
+#define BSP_CFG_H_
+#include "bsp_clock_cfg.h"
+#include "bsp_mcu_family_cfg.h"
+#include "board_cfg.h"
+#define RA_NOT_DEFINED 0
+#ifndef BSP_CFG_RTOS
+#if (RA_NOT_DEFINED) != (RA_NOT_DEFINED)
+#define BSP_CFG_RTOS (2)
+#elif (RA_NOT_DEFINED) != (RA_NOT_DEFINED)
+#define BSP_CFG_RTOS (1)
+#else
+#define BSP_CFG_RTOS (0)
+#endif
+#endif
+#undef RA_NOT_DEFINED
+#define BSP_CFG_MCU_VCC_MV (3300)
+#define BSP_CFG_STACK_MAIN_BYTES (0x1000)
+#define BSP_CFG_HEAP_BYTES (0x4980)
+#define BSP_CFG_PARAM_CHECKING_ENABLE (0)
+#define BSP_CFG_ASSERT (0)
+#define BSP_CFG_ERROR_LOG (0)
+
+#define BSP_CFG_PFS_PROTECT ((1))
+
+#define BSP_CFG_C_RUNTIME_INIT ((1))
+
+#define BSP_CFG_SOFT_RESET_SUPPORTED ((0))
+
+#ifndef BSP_CLOCK_CFG_MAIN_OSC_POPULATED
+#define BSP_CLOCK_CFG_MAIN_OSC_POPULATED (1)
+#endif
+#ifndef BSP_CLOCK_CFG_MAIN_OSC_WAIT
+#define BSP_CLOCK_CFG_MAIN_OSC_WAIT (9)
+#endif
+#ifndef BSP_CLOCK_CFG_MAIN_OSC_CLOCK_SOURCE
+#define BSP_CLOCK_CFG_MAIN_OSC_CLOCK_SOURCE (0)
+#endif
+#ifndef BSP_CLOCK_CFG_SUBCLOCK_DRIVE
+#define BSP_CLOCK_CFG_SUBCLOCK_DRIVE (0)
+#endif
+#ifndef BSP_CLOCK_CFG_SUBCLOCK_POPULATED
+#define BSP_CLOCK_CFG_SUBCLOCK_POPULATED (1)
+#endif
+#ifndef BSP_CLOCK_CFG_SUBCLOCK_STABILIZATION_MS
+#define BSP_CLOCK_CFG_SUBCLOCK_STABILIZATION_MS 1000
+#endif
+#endif /* BSP_CFG_H_ */
diff --git a/ports/renesas-ra/boards/RA4M1_EK/ra_cfg/fsp_cfg/bsp/bsp_mcu_device_cfg.h b/ports/renesas-ra/boards/RA4M1_EK/ra_cfg/fsp_cfg/bsp/bsp_mcu_device_cfg.h
new file mode 100644
index 0000000000000..444d32e5606c8
--- /dev/null
+++ b/ports/renesas-ra/boards/RA4M1_EK/ra_cfg/fsp_cfg/bsp/bsp_mcu_device_cfg.h
@@ -0,0 +1,5 @@
+/* generated configuration header file - do not edit */
+#ifndef BSP_MCU_DEVICE_CFG_H_
+#define BSP_MCU_DEVICE_CFG_H_
+#define BSP_CFG_MCU_PART_SERIES (4)
+#endif /* BSP_MCU_DEVICE_CFG_H_ */
diff --git a/ports/renesas-ra/boards/RA4M1_EK/ra_cfg/fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h b/ports/renesas-ra/boards/RA4M1_EK/ra_cfg/fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h
new file mode 100644
index 0000000000000..f52adbafae8c0
--- /dev/null
+++ b/ports/renesas-ra/boards/RA4M1_EK/ra_cfg/fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h
@@ -0,0 +1,10 @@
+/* generated configuration header file - do not edit */
+#ifndef BSP_MCU_DEVICE_PN_CFG_H_
+#define BSP_MCU_DEVICE_PN_CFG_H_
+#define BSP_MCU_R7FA4M1AB3CFP
+#define BSP_ROM_SIZE_BYTES (262144)
+#define BSP_RAM_SIZE_BYTES (32768)
+#define BSP_DATA_FLASH_SIZE_BYTES (8192)
+#define BSP_PACKAGE_LQFP
+#define BSP_PACKAGE_PINS (100)
+#endif /* BSP_MCU_DEVICE_PN_CFG_H_ */
diff --git a/ports/renesas-ra/boards/RA4M1_EK/ra_cfg/fsp_cfg/bsp/bsp_mcu_family_cfg.h b/ports/renesas-ra/boards/RA4M1_EK/ra_cfg/fsp_cfg/bsp/bsp_mcu_family_cfg.h
new file mode 100644
index 0000000000000..4766823b355bb
--- /dev/null
+++ b/ports/renesas-ra/boards/RA4M1_EK/ra_cfg/fsp_cfg/bsp/bsp_mcu_family_cfg.h
@@ -0,0 +1,74 @@
+/* generated configuration header file - do not edit */
+#ifndef BSP_MCU_FAMILY_CFG_H_
+#define BSP_MCU_FAMILY_CFG_H_
+#include "bsp_mcu_device_pn_cfg.h"
+#include "bsp_mcu_device_cfg.h"
+#include "../../../ra/fsp/src/bsp/mcu/ra4m1/bsp_mcu_info.h"
+#include "bsp_clock_cfg.h"
+#define BSP_MCU_GROUP_RA4M1 (1)
+#define BSP_LOCO_HZ                 (32768)
+#define BSP_MOCO_HZ                 (8000000)
+#define BSP_SUB_CLOCK_HZ            (32768)
+#if   BSP_CFG_HOCO_FREQUENCY == 0
+#define BSP_HOCO_HZ             (24000000)
+#elif BSP_CFG_HOCO_FREQUENCY == 2
+#define BSP_HOCO_HZ             (32000000)
+#elif BSP_CFG_HOCO_FREQUENCY == 4
+#define BSP_HOCO_HZ             (48000000)
+#elif BSP_CFG_HOCO_FREQUENCY == 5
+#define BSP_HOCO_HZ             (64000000)
+#else
+#error "Invalid HOCO frequency chosen (BSP_CFG_HOCO_FREQUENCY) in bsp_clock_cfg.h"
+#endif
+#define BSP_CORTEX_VECTOR_TABLE_ENTRIES    (16U)
+#define BSP_VECTOR_TABLE_MAX_ENTRIES       (48U)
+#define BSP_MCU_VBATT_SUPPORT       (1)
+
+#define OFS_SEQ1 0xA001A001 | (1 << 1) | (3 << 2)
+#define OFS_SEQ2 (15 << 4) | (3 << 8) | (3 << 10)
+#define OFS_SEQ3 (1 << 12) | (1 << 14) | (1 << 17)
+#define OFS_SEQ4 (3 << 18) | (15 << 20) | (3 << 24) | (3 << 26)
+#define OFS_SEQ5 (1 << 28) | (1 << 30)
+#define BSP_CFG_ROM_REG_OFS0 (OFS_SEQ1 | OFS_SEQ2 | OFS_SEQ3 | OFS_SEQ4 | OFS_SEQ5)
+#define BSP_CFG_ROM_REG_OFS1 (0xFFFFFEC3 | (1 << 2) | (3 << 3) | (0 << 8))
+#define BSP_CFG_USE_LOW_VOLTAGE_MODE ((0))
+#define BSP_CFG_ROM_REG_MPU_PC0_ENABLE (1)
+#define BSP_CFG_ROM_REG_MPU_PC0_START (0x00FFFFFC)
+#define BSP_CFG_ROM_REG_MPU_PC0_END (0x00FFFFFF)
+#define BSP_CFG_ROM_REG_MPU_PC1_ENABLE (1)
+#define BSP_CFG_ROM_REG_MPU_PC1_START (0x00FFFFFC)
+#define BSP_CFG_ROM_REG_MPU_PC1_END (0x00FFFFFF)
+#define BSP_CFG_ROM_REG_MPU_REGION0_ENABLE (1)
+#define BSP_CFG_ROM_REG_MPU_REGION0_START (0x00FFFFFC)
+#define BSP_CFG_ROM_REG_MPU_REGION0_END (0x00FFFFFF)
+#define BSP_CFG_ROM_REG_MPU_REGION1_ENABLE (1)
+#define BSP_CFG_ROM_REG_MPU_REGION1_START (0x200FFFFC)
+#define BSP_CFG_ROM_REG_MPU_REGION1_END (0x200FFFFF)
+#define BSP_CFG_ROM_REG_MPU_REGION2_ENABLE (1)
+#define BSP_CFG_ROM_REG_MPU_REGION2_START (0x407FFFFC)
+#define BSP_CFG_ROM_REG_MPU_REGION2_END (0x407FFFFF)
+#define BSP_CFG_ROM_REG_MPU_REGION3_ENABLE (1)
+#define BSP_CFG_ROM_REG_MPU_REGION3_START (0x400DFFFC)
+#define BSP_CFG_ROM_REG_MPU_REGION3_END (0x400DFFFF)
+
+/* Used to create IELS values for the interrupt initialization table g_interrupt_event_link_select. */
+#define BSP_PRV_IELS_ENUM(vector)    (ELC_##vector)
+
+/*
+ ID Code
+ Note: To permanently lock and disable the debug interface define the BSP_ID_CODE_PERMANENTLY_LOCKED in the compiler settings.
+ WARNING: This will disable debug access to the part and cannot be reversed by a debug probe.
+ */
+#if defined(BSP_ID_CODE_PERMANENTLY_LOCKED)
+#define BSP_CFG_ID_CODE_LONG_1 (0x00000000)
+#define BSP_CFG_ID_CODE_LONG_2 (0x00000000)
+#define BSP_CFG_ID_CODE_LONG_3 (0x00000000)
+#define BSP_CFG_ID_CODE_LONG_4 (0x00000000)
+#else
+/* ID CODE: FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF */
+#define BSP_CFG_ID_CODE_LONG_1 (0xFFFFFFFF)
+#define BSP_CFG_ID_CODE_LONG_2 (0xFFFFFFFF)
+#define BSP_CFG_ID_CODE_LONG_3 (0xFFFFFFFF)
+#define BSP_CFG_ID_CODE_LONG_4 (0xffFFFFFF)
+#endif
+#endif /* BSP_MCU_FAMILY_CFG_H_ */
diff --git a/ports/renesas-ra/boards/RA4M1_EK/ra_cfg/fsp_cfg/r_adc_cfg.h b/ports/renesas-ra/boards/RA4M1_EK/ra_cfg/fsp_cfg/r_adc_cfg.h
new file mode 100644
index 0000000000000..9c59889ca8fee
--- /dev/null
+++ b/ports/renesas-ra/boards/RA4M1_EK/ra_cfg/fsp_cfg/r_adc_cfg.h
@@ -0,0 +1,5 @@
+/* generated configuration header file - do not edit */
+#ifndef R_ADC_CFG_H_
+#define R_ADC_CFG_H_
+#define ADC_CFG_PARAM_CHECKING_ENABLE (BSP_CFG_PARAM_CHECKING_ENABLE)
+#endif /* R_ADC_CFG_H_ */
diff --git a/ports/renesas-ra/boards/RA4M1_EK/ra_cfg/fsp_cfg/r_agt_cfg.h b/ports/renesas-ra/boards/RA4M1_EK/ra_cfg/fsp_cfg/r_agt_cfg.h
new file mode 100644
index 0000000000000..d3ab559238cbd
--- /dev/null
+++ b/ports/renesas-ra/boards/RA4M1_EK/ra_cfg/fsp_cfg/r_agt_cfg.h
@@ -0,0 +1,7 @@
+/* generated configuration header file - do not edit */
+#ifndef R_AGT_CFG_H_
+#define R_AGT_CFG_H_
+#define AGT_CFG_PARAM_CHECKING_ENABLE (BSP_CFG_PARAM_CHECKING_ENABLE)
+#define AGT_CFG_OUTPUT_SUPPORT_ENABLE (0)
+#define AGT_CFG_INPUT_SUPPORT_ENABLE (0)
+#endif /* R_AGT_CFG_H_ */
diff --git a/ports/renesas-ra/boards/RA4M1_EK/ra_cfg/fsp_cfg/r_dtc_cfg.h b/ports/renesas-ra/boards/RA4M1_EK/ra_cfg/fsp_cfg/r_dtc_cfg.h
new file mode 100644
index 0000000000000..21405f96741e2
--- /dev/null
+++ b/ports/renesas-ra/boards/RA4M1_EK/ra_cfg/fsp_cfg/r_dtc_cfg.h
@@ -0,0 +1,6 @@
+/* generated configuration header file - do not edit */
+#ifndef R_DTC_CFG_H_
+#define R_DTC_CFG_H_
+#define DTC_CFG_PARAM_CHECKING_ENABLE (BSP_CFG_PARAM_CHECKING_ENABLE)
+#define DTC_CFG_VECTOR_TABLE_SECTION_NAME ".fsp_dtc_vector_table"
+#endif /* R_DTC_CFG_H_ */
diff --git a/ports/renesas-ra/boards/RA4M1_EK/ra_cfg/fsp_cfg/r_flash_lp_cfg.h b/ports/renesas-ra/boards/RA4M1_EK/ra_cfg/fsp_cfg/r_flash_lp_cfg.h
new file mode 100644
index 0000000000000..26879f9f4e52a
--- /dev/null
+++ b/ports/renesas-ra/boards/RA4M1_EK/ra_cfg/fsp_cfg/r_flash_lp_cfg.h
@@ -0,0 +1,7 @@
+/* generated configuration header file - do not edit */
+#ifndef R_FLASH_LP_CFG_H_
+#define R_FLASH_LP_CFG_H_
+#define FLASH_LP_CFG_PARAM_CHECKING_ENABLE (BSP_CFG_PARAM_CHECKING_ENABLE)
+#define FLASH_LP_CFG_CODE_FLASH_PROGRAMMING_ENABLE (1)
+#define FLASH_LP_CFG_DATA_FLASH_PROGRAMMING_ENABLE (0)
+#endif /* R_FLASH_LP_CFG_H_ */
diff --git a/ports/renesas-ra/boards/RA4M1_EK/ra_cfg/fsp_cfg/r_icu_cfg.h b/ports/renesas-ra/boards/RA4M1_EK/ra_cfg/fsp_cfg/r_icu_cfg.h
new file mode 100644
index 0000000000000..5e77b6980f4ee
--- /dev/null
+++ b/ports/renesas-ra/boards/RA4M1_EK/ra_cfg/fsp_cfg/r_icu_cfg.h
@@ -0,0 +1,5 @@
+/* generated configuration header file - do not edit */
+#ifndef R_ICU_CFG_H_
+#define R_ICU_CFG_H_
+#define ICU_CFG_PARAM_CHECKING_ENABLE (BSP_CFG_PARAM_CHECKING_ENABLE)
+#endif /* R_ICU_CFG_H_ */
diff --git a/ports/renesas-ra/boards/RA4M1_EK/ra_cfg/fsp_cfg/r_ioport_cfg.h b/ports/renesas-ra/boards/RA4M1_EK/ra_cfg/fsp_cfg/r_ioport_cfg.h
new file mode 100644
index 0000000000000..6b4353d238352
--- /dev/null
+++ b/ports/renesas-ra/boards/RA4M1_EK/ra_cfg/fsp_cfg/r_ioport_cfg.h
@@ -0,0 +1,5 @@
+/* generated configuration header file - do not edit */
+#ifndef R_IOPORT_CFG_H_
+#define R_IOPORT_CFG_H_
+#define IOPORT_CFG_PARAM_CHECKING_ENABLE (BSP_CFG_PARAM_CHECKING_ENABLE)
+#endif /* R_IOPORT_CFG_H_ */
diff --git a/ports/renesas-ra/boards/RA4M1_EK/ra_cfg/fsp_cfg/r_lpm_cfg.h b/ports/renesas-ra/boards/RA4M1_EK/ra_cfg/fsp_cfg/r_lpm_cfg.h
new file mode 100644
index 0000000000000..5f4d5c4a73627
--- /dev/null
+++ b/ports/renesas-ra/boards/RA4M1_EK/ra_cfg/fsp_cfg/r_lpm_cfg.h
@@ -0,0 +1,5 @@
+/* generated configuration header file - do not edit */
+#ifndef R_LPM_CFG_H_
+#define R_LPM_CFG_H_
+#define LPM_CFG_PARAM_CHECKING_ENABLE (BSP_CFG_PARAM_CHECKING_ENABLE)
+#endif /* R_LPM_CFG_H_ */
diff --git a/ports/renesas-ra/boards/RA4M1_EK/ra_cfg/fsp_cfg/r_rtc_cfg.h b/ports/renesas-ra/boards/RA4M1_EK/ra_cfg/fsp_cfg/r_rtc_cfg.h
new file mode 100644
index 0000000000000..484b7ed044c26
--- /dev/null
+++ b/ports/renesas-ra/boards/RA4M1_EK/ra_cfg/fsp_cfg/r_rtc_cfg.h
@@ -0,0 +1,5 @@
+/* generated configuration header file - do not edit */
+#ifndef R_RTC_CFG_H_
+#define R_RTC_CFG_H_
+#define RTC_CFG_PARAM_CHECKING_ENABLE (BSP_CFG_PARAM_CHECKING_ENABLE)
+#endif /* R_RTC_CFG_H_ */
diff --git a/ports/renesas-ra/boards/RA4M1_EK/ra_cfg/fsp_cfg/r_sci_uart_cfg.h b/ports/renesas-ra/boards/RA4M1_EK/ra_cfg/fsp_cfg/r_sci_uart_cfg.h
new file mode 100644
index 0000000000000..c70c0be344f9d
--- /dev/null
+++ b/ports/renesas-ra/boards/RA4M1_EK/ra_cfg/fsp_cfg/r_sci_uart_cfg.h
@@ -0,0 +1,8 @@
+/* generated configuration header file - do not edit */
+#ifndef R_SCI_UART_CFG_H_
+#define R_SCI_UART_CFG_H_
+#define SCI_UART_CFG_PARAM_CHECKING_ENABLE (BSP_CFG_PARAM_CHECKING_ENABLE)
+#define SCI_UART_CFG_FIFO_SUPPORT (0)
+#define SCI_UART_CFG_DTC_SUPPORTED (0)
+#define SCI_UART_CFG_FLOW_CONTROL_SUPPORT (0)
+#endif /* R_SCI_UART_CFG_H_ */
diff --git a/ports/renesas-ra/boards/RA4M1_EK/ra_cfg/fsp_cfg/r_spi_cfg.h b/ports/renesas-ra/boards/RA4M1_EK/ra_cfg/fsp_cfg/r_spi_cfg.h
new file mode 100644
index 0000000000000..861fe12194f63
--- /dev/null
+++ b/ports/renesas-ra/boards/RA4M1_EK/ra_cfg/fsp_cfg/r_spi_cfg.h
@@ -0,0 +1,7 @@
+/* generated configuration header file - do not edit */
+#ifndef R_SPI_CFG_H_
+#define R_SPI_CFG_H_
+#define SPI_CFG_PARAM_CHECKING_ENABLE (BSP_CFG_PARAM_CHECKING_ENABLE)
+#define SPI_DTC_SUPPORT_ENABLE (1)
+#define SPI_TRANSMIT_FROM_RXI_ISR (0)
+#endif /* R_SPI_CFG_H_ */
diff --git a/ports/renesas-ra/boards/RA4M1_EK/ra_gen/RA4M1-EK.csv b/ports/renesas-ra/boards/RA4M1_EK/ra_gen/RA4M1-EK.csv
new file mode 100644
index 0000000000000..a4118a68264eb
--- /dev/null
+++ b/ports/renesas-ra/boards/RA4M1_EK/ra_gen/RA4M1-EK.csv
@@ -0,0 +1,450 @@
+"Name","Pin","Function","Drive Capacity","IRQ","Mode","Output type","Pull up","Port Capabilities"
+"AVCC0","88","ADC_AVCC0","","","","","",""
+"AVSS0","89","ADC_AVSS0","","","","","",""
+"P000","100","ADC0_AN00","","","Analog mode","","","ADC0: AN00
+CTSU0: TS21
+IRQ0: IRQ06
+OPAMP0: AMP+"
+"P001","99","","","","Disabled","","","ADC0: AN01
+CTSU0: TS22
+IRQ0: IRQ07
+OPAMP0: AMP-"
+"P002","98","","","","Disabled","","","ADC0: AN02
+IRQ0: IRQ02
+OPAMP0: AMPO"
+"P003","97","","","","Disabled","","","ADC0: AN03
+OPAMP1: AMPO"
+"P004","96","","","","Disabled","","","ADC0: AN04
+IRQ0: IRQ03
+OPAMP2: AMPO"
+"P005","95","","","","Disabled","","","ADC0: AN11
+IRQ0: IRQ10
+OPAMP3: AMP+"
+"P006","94","","","","Disabled","","","ADC0: AN12
+OPAMP3: AMP-"
+"P007","93","","","","Disabled","","","ADC0: AN13
+OPAMP3: AMPO"
+"P008","92","","","","Disabled","","","ADC0: AN14"
+"P010","91","","","","Disabled","","","ADC: VREFH0
+ADC0: AN05
+CTSU0: TS30
+OPAMP2: AMP-"
+"P011","90","","","","Disabled","","","ADC: VREFL0
+ADC0: AN06
+CTSU0: TS31
+IRQ0: IRQ15
+OPAMP2: AMP+"
+"P012","87","","","","Disabled","","","ADC: VREFH
+ADC0: AN07
+OPAMP1: AMP-"
+"P013","86","","","","Disabled","","","ADC: VREFL
+ADC0: AN08
+OPAMP1: AMP+"
+"P014","85","","","","Disabled","","","ADC0: AN09
+DAC120: DA"
+"P015","84","","","","Disabled","","","ADC0: AN10
+CTSU0: TS28
+IRQ0: IRQ07"
+"P100","75","SPI0_MISO","Low","None","Peripheral mode","CMOS","None","ADC0: AN22
+AGT0: AGTIO
+CMP0: CMPIN0
+GPT5: GTIOCB
+IIC1: SCL
+IRQ0: IRQ02
+KINT0: KRM0
+POEG0: GTETRG
+SCI0: RXD_MISO
+SCI0: SCL
+SCI1: SCK
+SLCDC0: VL1
+SPI0: MISO"
+"P101","74","SPI0_MOSI","Low","None","Peripheral mode","CMOS","None","ADC0: AN21
+AGT0: AGTEE
+CMP0: CMPREF0
+GPT5: GTIOCA
+IIC1: SDA
+IRQ0: IRQ01
+KINT0: KRM1
+POEG1: GTETRG
+SCI0: SDA
+SCI0: TXD_MOSI
+SCI1: CTS_RTS_SS
+SLCDC0: VL2
+SPI0: MOSI"
+"P102","73","SPI0_RSPCK","Low","","Peripheral mode","CMOS","None","ADC0: ADTRG
+ADC0: AN20
+AGT0: AGTO
+CAN0: CRX
+CMP0: CMPIN1
+GPT2: GTIOCB
+KINT0: KRM2
+OPS0: GTOWLO
+SCI0: SCK
+SCI2: SDA
+SCI2: TXD_MOSI
+SLCDC0: VL3
+SPI0: RSPCK"
+"P103","72","SPI0_SSL0","Low","","Peripheral mode","CMOS","None","ADC0: AN19
+CAN0: CTX
+CMP0: CMPREF1
+GPT2: GTIOCA
+KINT0: KRM3
+OPS0: GTOWUP
+SCI0: CTS_RTS_SS
+SLCDC0: VL4
+SPI0: SSL0"
+"P104","71","","","","Disabled","","","CTSU0: TS13
+GPT1: GTIOCB
+IRQ0: IRQ01
+KINT0: KRM4
+POEG1: GTETRG
+SCI0: RXD_MISO
+SCI0: SCL
+SLCDC0: COM0
+SPI0: SSL1"
+"P105","70","GPIO","","IRQ0","Input mode","","None","CTSU0: TS34
+GPT1: GTIOCA
+IRQ0: IRQ00
+KINT0: KRM5
+POEG0: GTETRG
+SLCDC0: COM1
+SPI0: SSL2"
+"P106","69","GPIO","Low","","Output mode (Initial Low)","CMOS","None","GPT0: GTIOCB
+KINT0: KRM6
+SLCDC0: COM2
+SPI0: SSL3"
+"P107","68","","","","Disabled","","","GPT0: GTIOCA
+KINT0: KRM7
+SLCDC0: COM3"
+"P108","51","DEBUG0_TMS","Low","","Peripheral mode","CMOS","None","DEBUG0: SWDIO
+DEBUG0: TMS
+GPT0: GTIOCB
+OPS0: GTOULO
+SCI9: CTS_RTS_SS
+SPI1: SSL0"
+"P109","52","DEBUG0_TDO","Low","","Peripheral mode","CMOS","None","CAN0: CTX
+CGC0: CLKOUT
+CTSU0: TS10
+DEBUG0: SWO
+DEBUG0: TDO
+GPT1: GTIOCA
+OPS0: GTOVUP
+SCI1: SCK
+SCI9: SDA
+SCI9: TXD_MOSI
+SLCDC0: SEG23
+SPI1: MOSI"
+"P110","53","DEBUG0_TDI","Low","None","Peripheral mode","CMOS","None","CAN0: CRX
+CMP0: VCOUT
+DEBUG0: TDI
+GPT1: GTIOCB
+IRQ0: IRQ03
+OPS0: GTOVLO
+SCI2: CTS_RTS_SS
+SCI9: RXD_MISO
+SCI9: SCL
+SLCDC0: SEG24
+SPI1: MISO"
+"P111","54","","","","Disabled","","","CTSU0: TS12
+GPT3: GTIOCA
+IRQ0: IRQ04
+SCI2: SCK
+SCI9: SCK
+SLCDC0: CAPH
+SPI1: RSPCK"
+"P112","55","","","","Disabled","","","CTSU0: TSCAP
+GPT3: GTIOCB
+SCI1: SCK
+SCI2: SDA
+SCI2: TXD_MOSI
+SLCDC0: CAPL
+SPI1: SSL0
+SSI0: SSISCK"
+"P113","56","","","","Disabled","","","CTSU0: TS27
+GPT2: GTIOCA
+SLCDC0: COM4
+SLCDC0: SEG00
+SSI0: SSIWS"
+"P114","57","","","","Disabled","","","CTSU0: TS29
+GPT2: GTIOCB
+SLCDC0: SEG25
+SSI0: SSIRXD"
+"P115","58","CTSU0_TS35","Low","","Peripheral mode","CMOS","None","CTSU0: TS35
+GPT4: GTIOCA
+SLCDC0: SEG26
+SSI0: SSITXD"
+"P200","40","","","","Disabled","","","IRQ0: NMI"
+"P201","39","","","","Disabled","","",""
+"P202","35","","","","Disabled","","","GPT5: GTIOCB
+SCI2: SCK
+SCI9: RXD_MISO
+SCI9: SCL
+SLCDC0: SEG16
+SPI1: MISO"
+"P203","34","","","","Disabled","","","CTSU0: TSCAP
+GPT5: GTIOCA
+SCI2: CTS_RTS_SS
+SCI9: SDA
+SCI9: TXD_MOSI
+SLCDC0: SEG15
+SPI1: MOSI"
+"P204","33","","","","Disabled","","","AGT1: AGTIO
+CAC0: CACREF
+CTSU0: TS00
+GPT4: GTIOCB
+IIC0: SCL
+OPS0: GTIW
+SCI0: SCK
+SCI9: SCK
+SLCDC0: SEG14
+SPI1: RSPCK
+USBFS0: OVRCURB"
+"P205","32","CTSU0_TSCAP","Low","None","Peripheral mode","CMOS","None","AGT1: AGTO
+CGC0: CLKOUT
+CTSU0: TSCAP
+GPT4: GTIOCA
+IIC1: SCL
+IRQ0: IRQ01
+OPS0: GTIV
+SCI0: SDA
+SCI0: TXD_MOSI
+SCI9: CTS_RTS_SS
+SLCDC0: SEG13
+SPI1: SSL0
+USBFS0: OVRCURA"
+"P206","31","","","","Disabled","","","CTSU0: TS01
+IIC1: SDA
+IRQ0: IRQ00
+OPS0: GTIU
+SCI0: RXD_MISO
+SCI0: SCL
+SLCDC0: SEG12
+SPI1: SSL1
+USBFS0: VBUSEN"
+"P212","14","","","","Disabled","","","AGT1: AGTEE
+CGC0: EXTAL
+GPT0: GTIOCB
+IRQ0: IRQ03
+POEG1: GTETRG
+SCI1: RXD_MISO
+SCI1: SCL"
+"P213","13","","","","Disabled","","","CGC0: XTAL
+GPT0: GTIOCA
+IRQ0: IRQ02
+POEG0: GTETRG
+SCI1: SDA
+SCI1: TXD_MOSI"
+"P214","11","","","","Disabled","","","CGC0: XCOUT"
+"P215","10","","","","Disabled","","","CGC0: XCIN"
+"P300","50","DEBUG0_TCK","Low","","Peripheral mode","CMOS","None","DEBUG0: SWCLK
+DEBUG0: TCK
+GPT0: GTIOCA
+OPS0: GTOUUP
+SPI1: SSL1"
+"P301","49","SCI2_RXD_MISO","Low","None","Peripheral mode","CMOS","None","AGT0: AGTIO
+CTSU0: TS09
+GPT4: GTIOCB
+IRQ0: IRQ06
+OPS0: GTOULO
+SCI2: RXD_MISO
+SCI2: SCL
+SCI9: CTS_RTS_SS
+SLCDC0: COM5
+SLCDC0: SEG01
+SPI1: SSL2"
+"P302","48","SCI2_TXD_MOSI","Low","None","Peripheral mode","CMOS","None","CTSU0: TS08
+GPT4: GTIOCA
+IRQ0: IRQ05
+OPS0: GTOUUP
+SCI2: SDA
+SCI2: TXD_MOSI
+SLCDC0: COM6
+SLCDC0: SEG02
+SPI1: SSL3"
+"P303","47","","","","Disabled","","","CTSU0: TS02
+GPT7: GTIOCB
+SLCDC0: COM7
+SLCDC0: SEG03"
+"P304","44","","","","Disabled","","","CTSU0: TS11
+GPT7: GTIOCA
+IRQ0: IRQ09
+SLCDC0: SEG20"
+"P305","43","","","","Disabled","","","IRQ0: IRQ08
+SLCDC0: SEG19"
+"P306","42","","","","Disabled","","","SLCDC0: SEG18"
+"P307","41","","","","Disabled","","","SLCDC0: SEG17"
+"P400","1","GPIO","Low","None","Output mode (Initial Low)","CMOS","None","AGT1: AGTIO
+CAC0: CACREF
+CTSU0: TS20
+GPT6: GTIOCA
+IIC0: SCL
+IRQ0: IRQ00
+SCI0: SCK
+SCI1: SCK
+SLCDC0: SEG04
+SSI: AUDIO_CLK"
+"P401","2","SCI1_TXD_MOSI","Low","None","Peripheral mode","CMOS","None","CAN0: CTX
+CTSU0: TS19
+GPT6: GTIOCB
+IIC0: SDA
+IRQ0: IRQ05
+POEG0: GTETRG
+SCI0: CTS_RTS_SS
+SCI1: SDA
+SCI1: TXD_MOSI
+SLCDC0: SEG05"
+"P402","3","SCI1_RXD_MISO","Low","None","Peripheral mode","CMOS","None","AGT0: AGTIO
+AGT1: AGTIO
+CAN0: CRX
+CTSU0: TS18
+IRQ0: IRQ04
+RTC0: RTCIC0
+SCI1: RXD_MISO
+SCI1: SCL
+SLCDC0: SEG06"
+"P403","4","GPIO","Low","","Output mode (Initial Low)","CMOS","None","AGT0: AGTIO
+AGT1: AGTIO
+CTSU0: TS17
+GPT3: GTIOCA
+RTC0: RTCIC1
+SCI1: CTS_RTS_SS
+SSI0: SSISCK"
+"P404","5","","","","Disabled","","","GPT3: GTIOCB
+RTC0: RTCIC2
+SSI0: SSIWS"
+"P405","6","","","","Disabled","","","GPT1: GTIOCA
+SSI0: SSITXD"
+"P406","7","","","","Disabled","","","GPT1: GTIOCB
+SSI0: SSIRXD"
+"P407","25","USBFS0_VBUS","Low","","Peripheral mode","CMOS","None","ADC0: ADTRG
+AGT0: AGTIO
+CTSU0: TS03
+IIC0: SDA
+RTC0: RTCOUT
+SCI0: CTS_RTS_SS
+SLCDC0: SEG11
+SPI1: SSL3
+USBFS0: VBUS"
+"P408","24","","","","Disabled","","","CTSU0: TS04
+GPT5: GTIOCB
+IIC0: SCL
+IRQ0: IRQ07
+OPS0: GTOWLO
+SCI1: CTS_RTS_SS
+SCI9: RXD_MISO
+SCI9: SCL
+SLCDC0: SEG10
+USBFS0: ID"
+"P409","23","","","","Disabled","","","CTSU0: TS05
+GPT5: GTIOCA
+IRQ0: IRQ06
+OPS0: GTOWUP
+SCI9: SDA
+SCI9: TXD_MOSI
+SLCDC0: SEG09
+USBFS0: EXICEN"
+"P410","22","SCI0_RXD_MISO","Low","None","Peripheral mode","CMOS","None","AGT1: AGTOB
+CTSU0: TS06
+GPT6: GTIOCB
+IRQ0: IRQ05
+OPS0: GTOVLO
+SCI0: RXD_MISO
+SCI0: SCL
+SLCDC0: SEG08
+SPI0: MISO"
+"P411","21","SCI0_TXD_MOSI","Low","None","Peripheral mode","CMOS","None","AGT1: AGTOA
+CTSU0: TS07
+GPT6: GTIOCA
+IRQ0: IRQ04
+OPS0: GTOVUP
+SCI0: SDA
+SCI0: TXD_MOSI
+SLCDC0: SEG07
+SPI0: MOSI"
+"P412","20","","","","Disabled","","","SCI0: SCK
+SPI0: RSPCK"
+"P413","19","","","","Disabled","","","SCI0: CTS_RTS_SS
+SPI0: SSL0"
+"P414","18","","","","Disabled","","","GPT0: GTIOCB
+IRQ0: IRQ09
+SPI0: SSL1"
+"P415","17","","","","Disabled","","","GPT0: GTIOCA
+IRQ0: IRQ08
+SPI0: SSL2"
+"P500","76","","","","Disabled","","","ADC0: AN16
+AGT0: AGTOA
+CMP0: CMPREF1
+GPT2: GTIOCA
+OPS0: GTIU
+SLCDC0: SEG34
+USBFS0: VBUSEN"
+"P501","77","","","","Disabled","","","ADC0: AN17
+AGT0: AGTOB
+CMP0: CMPIN1
+GPT2: GTIOCB
+IRQ0: IRQ11
+OPS0: GTIV
+SCI1: SDA
+SCI1: TXD_MOSI
+SLCDC0: SEG35
+USBFS0: OVRCURA"
+"P502","78","","","","Disabled","","","ADC0: AN18
+CMP0: CMPREF0
+GPT3: GTIOCB
+IRQ0: IRQ12
+OPS0: GTIW
+SCI1: RXD_MISO
+SCI1: SCL
+SLCDC0: SEG36
+USBFS0: OVRCURB"
+"P503","79","","","","Disabled","","","ADC0: AN23
+CMP0: CMPIN0
+SCI1: SCK
+SLCDC0: SEG37
+USBFS0: EXICEN"
+"P504","80","","","","Disabled","","","ADC0: AN24
+SCI1: CTS_RTS_SS
+USBFS0: ID"
+"P505","81","","","","Disabled","","","ADC0: AN25
+IRQ0: IRQ14"
+"P600","67","","","","Disabled","","","GPT6: GTIOCB
+SCI9: SCK
+SLCDC0: SEG33"
+"P601","66","","","","Disabled","","","GPT6: GTIOCA
+SCI9: RXD_MISO
+SCI9: SCL
+SLCDC0: SEG32"
+"P602","65","","","","Disabled","","","GPT7: GTIOCB
+SCI9: SDA
+SCI9: TXD_MOSI
+SLCDC0: SEG31"
+"P603","64","","","","Disabled","","","GPT7: GTIOCA
+SCI9: CTS_RTS_SS
+SLCDC0: SEG30"
+"P608","59","","","","Disabled","","","GPT4: GTIOCB
+SLCDC0: SEG27"
+"P609","60","","","","Disabled","","","GPT5: GTIOCA
+SLCDC0: SEG28"
+"P610","61","","","","Disabled","","","GPT5: GTIOCB
+SLCDC0: SEG29"
+"P708","16","","","","Disabled","","","SCI1: RXD_MISO
+SCI1: SCL
+SPI0: SSL3"
+"P808","45","","","","Disabled","","","SLCDC0: SEG21"
+"P809","46","","","","Disabled","","","SLCDC0: SEG22"
+"P914","28","USBFS0_USBDP","","","Peripheral mode","","","USBFS0: USBDP"
+"P915","27","USBFS0_USBDM","","","Peripheral mode","","","USBFS0: USBDM"
+"RES","38","","","","","","",""
+"VBAT","8","","","","","","",""
+"VCC","15","","","","","","",""
+"VCC","37","","","","","","",""
+"VCC","82","","","","","","",""
+"VCC","62","","","","","","",""
+"VCCUSB","29","USBFS0_VCCUSB","","","","","",""
+"VCCUSBLDO","30","USBFS0_VCCUSBLDO","","","","","",""
+"VCL","9","","","","","","",""
+"VSS","12","","","","","","",""
+"VSS","36","","","","","","",""
+"VSS","83","","","","","","",""
+"VSS","63","","","","","","",""
+"VSSUSB","26","USBFS0_VSSUSB","","","","","",""
diff --git a/ports/renesas-ra/boards/RA4M1_EK/ra_gen/bsp_clock_cfg.h b/ports/renesas-ra/boards/RA4M1_EK/ra_gen/bsp_clock_cfg.h
new file mode 100644
index 0000000000000..cf28c33d7af04
--- /dev/null
+++ b/ports/renesas-ra/boards/RA4M1_EK/ra_gen/bsp_clock_cfg.h
@@ -0,0 +1,21 @@
+/* generated configuration header file - do not edit */
+#ifndef BSP_CLOCK_CFG_H_
+#define BSP_CLOCK_CFG_H_
+#define BSP_CFG_CLOCKS_SECURE (0)
+#define BSP_CFG_CLOCKS_OVERRIDE (0)
+#define BSP_CFG_XTAL_HZ (12000000) /* XTAL 12000000Hz */
+#define BSP_CFG_PLL_SOURCE (BSP_CLOCKS_SOURCE_CLOCK_MAIN_OSC) /* PLL Src: XTAL */
+#define BSP_CFG_HOCO_FREQUENCY (0) /* HOCO 24MHz */
+#define BSP_CFG_PLL_DIV (BSP_CLOCKS_PLL_DIV_2) /* PLL Div /2 */
+#define BSP_CFG_PLL_MUL BSP_CLOCKS_PLL_MUL_8_0 /* PLL Mul x8 */
+#define BSP_CFG_CLOCK_SOURCE (BSP_CLOCKS_SOURCE_CLOCK_PLL) /* Clock Src: PLL */
+#define BSP_CFG_ICLK_DIV (BSP_CLOCKS_SYS_CLOCK_DIV_1) /* ICLK Div /1 */
+#define BSP_CFG_PCLKA_DIV (BSP_CLOCKS_SYS_CLOCK_DIV_1) /* PCLKA Div /1 */
+#define BSP_CFG_PCLKB_DIV (BSP_CLOCKS_SYS_CLOCK_DIV_2) /* PCLKB Div /2 */
+#define BSP_CFG_PCLKC_DIV (BSP_CLOCKS_SYS_CLOCK_DIV_1) /* PCLKC Div /1 */
+#define BSP_CFG_PCLKD_DIV (BSP_CLOCKS_SYS_CLOCK_DIV_1) /* PCLKD Div /1 */
+#define BSP_CFG_FCLK_DIV (BSP_CLOCKS_SYS_CLOCK_DIV_2) /* FCLK Div /2 */
+#define BSP_CFG_CLKOUT_SOURCE (BSP_CLOCKS_CLOCK_DISABLED) /* CLKOUT Disabled */
+#define BSP_CFG_CLKOUT_DIV (BSP_CLOCKS_SYS_CLOCK_DIV_1) /* CLKOUT Div /1 */
+#define BSP_CFG_UCK_SOURCE (BSP_CLOCKS_SOURCE_CLOCK_PLL) /* UCLK Src: PLL */
+#endif /* BSP_CLOCK_CFG_H_ */
diff --git a/ports/renesas-ra/boards/RA4M1_EK/ra_gen/bsp_pin_cfg.h b/ports/renesas-ra/boards/RA4M1_EK/ra_gen/bsp_pin_cfg.h
new file mode 100644
index 0000000000000..9aea535b5ec8f
--- /dev/null
+++ b/ports/renesas-ra/boards/RA4M1_EK/ra_gen/bsp_pin_cfg.h
@@ -0,0 +1,7 @@
+/* generated configuration header file - do not edit */
+#ifndef BSP_PIN_CFG_H_
+#define BSP_PIN_CFG_H_
+#include "bsp_api.h"
+#include "r_ioport_api.h"
+extern const ioport_cfg_t g_bsp_pin_cfg; /* RA4M1-EK.pincfg */
+#endif /* BSP_PIN_CFG_H_ */
diff --git a/ports/renesas-ra/boards/RA4M1_EK/ra_gen/common_data.c b/ports/renesas-ra/boards/RA4M1_EK/ra_gen/common_data.c
new file mode 100644
index 0000000000000..34aad762ff245
--- /dev/null
+++ b/ports/renesas-ra/boards/RA4M1_EK/ra_gen/common_data.c
@@ -0,0 +1,7 @@
+/* generated common source file - do not edit */
+#include "common_data.h"
+ioport_instance_ctrl_t g_ioport_ctrl;
+const ioport_instance_t g_ioport =
+{ .p_api = &g_ioport_on_ioport, .p_ctrl = &g_ioport_ctrl, .p_cfg = &g_bsp_pin_cfg, };
+void g_common_init(void) {
+}
diff --git a/ports/renesas-ra/boards/RA4M1_EK/ra_gen/common_data.h b/ports/renesas-ra/boards/RA4M1_EK/ra_gen/common_data.h
new file mode 100644
index 0000000000000..e2eb70836ba79
--- /dev/null
+++ b/ports/renesas-ra/boards/RA4M1_EK/ra_gen/common_data.h
@@ -0,0 +1,16 @@
+/* generated common header file - do not edit */
+#ifndef COMMON_DATA_H_
+#define COMMON_DATA_H_
+#include <stdint.h>
+#include "bsp_api.h"
+#include "r_ioport.h"
+#include "bsp_pin_cfg.h"
+FSP_HEADER
+/* IOPORT Instance */
+extern const ioport_instance_t g_ioport;
+
+/* IOPORT control structure. */
+extern ioport_instance_ctrl_t g_ioport_ctrl;
+void g_common_init(void);
+FSP_FOOTER
+#endif /* COMMON_DATA_H_ */
diff --git a/ports/renesas-ra/boards/RA4M1_EK/ra_gen/hal_data.c b/ports/renesas-ra/boards/RA4M1_EK/ra_gen/hal_data.c
new file mode 100644
index 0000000000000..cfaa1abd0e18a
--- /dev/null
+++ b/ports/renesas-ra/boards/RA4M1_EK/ra_gen/hal_data.c
@@ -0,0 +1,471 @@
+/* generated HAL source file - do not edit */
+#include "hal_data.h"
+/* Macros to tie dynamic ELC links to ADC_TRIGGER_SYNC_ELC option in adc_trigger_t. */
+#define ADC_TRIGGER_ADC0        ADC_TRIGGER_SYNC_ELC
+#define ADC_TRIGGER_ADC0_B      ADC_TRIGGER_SYNC_ELC
+#define ADC_TRIGGER_ADC1        ADC_TRIGGER_SYNC_ELC
+#define ADC_TRIGGER_ADC1_B      ADC_TRIGGER_SYNC_ELC
+adc_instance_ctrl_t g_adc0_ctrl;
+const adc_extended_cfg_t g_adc0_cfg_extend =
+{ .add_average_count = ADC_ADD_OFF,
+  .clearing = ADC_CLEAR_AFTER_READ_ON,
+  .trigger_group_b = ADC_TRIGGER_SYNC_ELC,
+  .double_trigger_mode = ADC_DOUBLE_TRIGGER_DISABLED,
+  .adc_vref_control = ADC_VREF_CONTROL_VREFH, };
+const adc_cfg_t g_adc0_cfg =
+{ .unit = 0, .mode = ADC_MODE_SINGLE_SCAN, .resolution = ADC_RESOLUTION_14_BIT, .alignment =
+      (adc_alignment_t)ADC_ALIGNMENT_RIGHT,
+  .trigger = ADC_TRIGGER_SOFTWARE, .p_callback = NULL, .p_context = NULL, .p_extend = &g_adc0_cfg_extend,
+  #if defined(VECTOR_NUMBER_ADC0_SCAN_END)
+  .scan_end_irq = VECTOR_NUMBER_ADC0_SCAN_END,
+  #else
+  .scan_end_irq = FSP_INVALID_VECTOR,
+  #endif
+  .scan_end_ipl = (BSP_IRQ_DISABLED),
+  #if defined(VECTOR_NUMBER_ADC0_SCAN_END_B)
+  .scan_end_b_irq = VECTOR_NUMBER_ADC0_SCAN_END_B,
+  #else
+  .scan_end_b_irq = FSP_INVALID_VECTOR,
+  #endif
+  .scan_end_b_ipl = (BSP_IRQ_DISABLED), };
+const adc_channel_cfg_t g_adc0_channel_cfg =
+{ .scan_mask = 0,
+  .scan_mask_group_b = 0,
+  .priority_group_a = ADC_GROUP_A_PRIORITY_OFF,
+  .add_mask = 0,
+  .sample_hold_mask = 0,
+  .sample_hold_states = 24, };
+/* Instance structure to use this module. */
+const adc_instance_t g_adc0 =
+{ .p_ctrl = &g_adc0_ctrl, .p_cfg = &g_adc0_cfg, .p_channel_cfg = &g_adc0_channel_cfg, .p_api = &g_adc_on_adc };
+lpm_instance_ctrl_t g_lpm0_ctrl;
+
+const lpm_cfg_t g_lpm0_cfg =
+{ .low_power_mode = LPM_MODE_SLEEP,
+  .snooze_cancel_sources = LPM_SNOOZE_CANCEL_SOURCE_NONE,
+  .standby_wake_sources = LPM_STANDBY_WAKE_SOURCE_RTCALM | (lpm_standby_wake_source_t)0,
+  .snooze_request_source = LPM_SNOOZE_REQUEST_RXD0_FALLING,
+  .snooze_end_sources = (lpm_snooze_end_t)0,
+  .dtc_state_in_snooze = LPM_SNOOZE_DTC_DISABLE,
+  #if BSP_FEATURE_LPM_HAS_SBYCR_OPE
+  .output_port_enable = 0,
+  #endif
+  #if BSP_FEATURE_LPM_HAS_DEEP_STANDBY
+  .io_port_state = 0,
+  .power_supply_state = 0,
+  .deep_standby_cancel_source = (lpm_deep_standby_cancel_source_t)0,
+  .deep_standby_cancel_edge = (lpm_deep_standby_cancel_edge_t)0,
+  #endif
+  .p_extend = NULL, };
+
+const lpm_instance_t g_lpm0 =
+{ .p_api = &g_lpm_on_lpm, .p_ctrl = &g_lpm0_ctrl, .p_cfg = &g_lpm0_cfg };
+dtc_instance_ctrl_t g_transfer1_ctrl;
+
+transfer_info_t g_transfer1_info =
+{ .dest_addr_mode = TRANSFER_ADDR_MODE_INCREMENTED,
+  .repeat_area = TRANSFER_REPEAT_AREA_DESTINATION,
+  .irq = TRANSFER_IRQ_END,
+  .chain_mode = TRANSFER_CHAIN_MODE_DISABLED,
+  .src_addr_mode = TRANSFER_ADDR_MODE_FIXED,
+  .size = TRANSFER_SIZE_2_BYTE,
+  .mode = TRANSFER_MODE_NORMAL,
+  .p_dest = (void *)NULL,
+  .p_src = (void const *)NULL,
+  .num_blocks = 0,
+  .length = 0, };
+const dtc_extended_cfg_t g_transfer1_cfg_extend =
+{ .activation_source = VECTOR_NUMBER_SPI0_RXI, };
+const transfer_cfg_t g_transfer1_cfg =
+{ .p_info = &g_transfer1_info, .p_extend = &g_transfer1_cfg_extend, };
+
+/* Instance structure to use this module. */
+const transfer_instance_t g_transfer1 =
+{ .p_ctrl = &g_transfer1_ctrl, .p_cfg = &g_transfer1_cfg, .p_api = &g_transfer_on_dtc };
+dtc_instance_ctrl_t g_transfer0_ctrl;
+
+transfer_info_t g_transfer0_info =
+{ .dest_addr_mode = TRANSFER_ADDR_MODE_FIXED,
+  .repeat_area = TRANSFER_REPEAT_AREA_SOURCE,
+  .irq = TRANSFER_IRQ_END,
+  .chain_mode = TRANSFER_CHAIN_MODE_DISABLED,
+  .src_addr_mode = TRANSFER_ADDR_MODE_INCREMENTED,
+  .size = TRANSFER_SIZE_2_BYTE,
+  .mode = TRANSFER_MODE_NORMAL,
+  .p_dest = (void *)NULL,
+  .p_src = (void const *)NULL,
+  .num_blocks = 0,
+  .length = 0, };
+const dtc_extended_cfg_t g_transfer0_cfg_extend =
+{ .activation_source = VECTOR_NUMBER_SPI0_TXI, };
+const transfer_cfg_t g_transfer0_cfg =
+{ .p_info = &g_transfer0_info, .p_extend = &g_transfer0_cfg_extend, };
+
+/* Instance structure to use this module. */
+const transfer_instance_t g_transfer0 =
+{ .p_ctrl = &g_transfer0_ctrl, .p_cfg = &g_transfer0_cfg, .p_api = &g_transfer_on_dtc };
+spi_instance_ctrl_t g_spi0_ctrl;
+
+/** SPI extended configuration for SPI HAL driver */
+const spi_extended_cfg_t g_spi0_ext_cfg =
+{ .spi_clksyn = SPI_SSL_MODE_CLK_SYN,
+  .spi_comm = SPI_COMMUNICATION_FULL_DUPLEX,
+  .ssl_polarity = SPI_SSLP_LOW,
+  .ssl_select = SPI_SSL_SELECT_SSL0,
+  .mosi_idle = SPI_MOSI_IDLE_VALUE_FIXING_DISABLE,
+  .parity = SPI_PARITY_MODE_DISABLE,
+  .byte_swap = SPI_BYTE_SWAP_DISABLE,
+  .spck_div =
+  {
+      /* Actual calculated bitrate: 12000000. */ .spbr = 1,
+      .brdv = 0
+  },
+  .spck_delay = SPI_DELAY_COUNT_1,
+  .ssl_negation_delay = SPI_DELAY_COUNT_1,
+  .next_access_delay = SPI_DELAY_COUNT_1 };
+
+/** SPI configuration for SPI HAL driver */
+const spi_cfg_t g_spi0_cfg =
+{ .channel = 0,
+
+  #if defined(VECTOR_NUMBER_SPI0_RXI)
+  .rxi_irq = VECTOR_NUMBER_SPI0_RXI,
+  #else
+  .rxi_irq = FSP_INVALID_VECTOR,
+  #endif
+  #if defined(VECTOR_NUMBER_SPI0_TXI)
+  .txi_irq = VECTOR_NUMBER_SPI0_TXI,
+  #else
+  .txi_irq = FSP_INVALID_VECTOR,
+  #endif
+  #if defined(VECTOR_NUMBER_SPI0_TEI)
+  .tei_irq = VECTOR_NUMBER_SPI0_TEI,
+  #else
+  .tei_irq = FSP_INVALID_VECTOR,
+  #endif
+  #if defined(VECTOR_NUMBER_SPI0_ERI)
+  .eri_irq = VECTOR_NUMBER_SPI0_ERI,
+  #else
+  .eri_irq = FSP_INVALID_VECTOR,
+  #endif
+
+  .rxi_ipl = (12),
+  .txi_ipl = (12),
+  .tei_ipl = (12),
+  .eri_ipl = (12),
+
+  .operating_mode = SPI_MODE_MASTER,
+
+  .clk_phase = SPI_CLK_PHASE_EDGE_ODD,
+  .clk_polarity = SPI_CLK_POLARITY_LOW,
+
+  .mode_fault = SPI_MODE_FAULT_ERROR_DISABLE,
+  .bit_order = SPI_BIT_ORDER_MSB_FIRST,
+  .p_transfer_tx = g_spi0_P_TRANSFER_TX,
+  .p_transfer_rx = g_spi0_P_TRANSFER_RX,
+  .p_callback = spi_callback,
+
+  .p_context = NULL,
+  .p_extend = (void *)&g_spi0_ext_cfg, };
+
+/* Instance structure to use this module. */
+const spi_instance_t g_spi0 =
+{ .p_ctrl = &g_spi0_ctrl, .p_cfg = &g_spi0_cfg, .p_api = &g_spi_on_spi };
+icu_instance_ctrl_t g_external_irq0_ctrl;
+const external_irq_cfg_t g_external_irq0_cfg =
+{ .channel = 0,
+  .trigger = EXTERNAL_IRQ_TRIG_RISING,
+  .filter_enable = false,
+  .pclk_div = EXTERNAL_IRQ_PCLK_DIV_BY_64,
+  .p_callback = callback_icu,
+  .p_context = NULL,
+  .p_extend = NULL,
+  .ipl = (12),
+  #if defined(VECTOR_NUMBER_ICU_IRQ0)
+  .irq = VECTOR_NUMBER_ICU_IRQ0,
+  #else
+  .irq = FSP_INVALID_VECTOR,
+  #endif
+};
+/* Instance structure to use this module. */
+const external_irq_instance_t g_external_irq0 =
+{ .p_ctrl = &g_external_irq0_ctrl, .p_cfg = &g_external_irq0_cfg, .p_api = &g_external_irq_on_icu };
+agt_instance_ctrl_t g_timer0_ctrl;
+const agt_extended_cfg_t g_timer0_extend =
+{ .count_source = AGT_CLOCK_PCLKB,
+  .agto = AGT_PIN_CFG_DISABLED,
+  .agtoa = AGT_PIN_CFG_DISABLED,
+  .agtob = AGT_PIN_CFG_DISABLED,
+  .measurement_mode = AGT_MEASURE_DISABLED,
+  .agtio_filter = AGT_AGTIO_FILTER_NONE,
+  .enable_pin = AGT_ENABLE_PIN_NOT_USED,
+  .trigger_edge = AGT_TRIGGER_EDGE_RISING, };
+const timer_cfg_t g_timer0_cfg =
+{ .mode = TIMER_MODE_PERIODIC,
+/* Actual period: 0.002730666666666667 seconds. Actual duty: 50%. */ .period_counts = 0x10000,
+  .duty_cycle_counts = 0x8000, .source_div = (timer_source_div_t)0, .channel = 0, .p_callback = callback_agt,
+  /** If NULL then do not add & */
+  #if defined(NULL)
+  .p_context = NULL,
+  #else
+  .p_context = &NULL,
+  #endif
+  .p_extend = &g_timer0_extend,
+  .cycle_end_ipl = (5),
+  #if defined(VECTOR_NUMBER_AGT0_INT)
+  .cycle_end_irq = VECTOR_NUMBER_AGT0_INT,
+  #else
+  .cycle_end_irq = FSP_INVALID_VECTOR,
+  #endif
+};
+/* Instance structure to use this module. */
+const timer_instance_t g_timer0 =
+{ .p_ctrl = &g_timer0_ctrl, .p_cfg = &g_timer0_cfg, .p_api = &g_timer_on_agt };
+flash_lp_instance_ctrl_t g_flash0_ctrl;
+const flash_cfg_t g_flash0_cfg =
+{ .data_flash_bgo = false, .p_callback = NULL, .p_context = NULL, .ipl = (BSP_IRQ_DISABLED),
+  #if defined(VECTOR_NUMBER_FCU_FRDYI)
+  .irq = VECTOR_NUMBER_FCU_FRDYI,
+  #else
+  .irq = FSP_INVALID_VECTOR,
+  #endif
+};
+/* Instance structure to use this module. */
+const flash_instance_t g_flash0 =
+{ .p_ctrl = &g_flash0_ctrl, .p_cfg = &g_flash0_cfg, .p_api = &g_flash_on_flash_lp };
+rtc_instance_ctrl_t g_rtc0_ctrl;
+const rtc_error_adjustment_cfg_t g_rtc0_err_cfg =
+{ .adjustment_mode = RTC_ERROR_ADJUSTMENT_MODE_AUTOMATIC,
+  .adjustment_period = RTC_ERROR_ADJUSTMENT_PERIOD_10_SECOND,
+  .adjustment_type = RTC_ERROR_ADJUSTMENT_NONE,
+  .adjustment_value = 0, };
+const rtc_cfg_t g_rtc0_cfg =
+{ .clock_source = RTC_CLOCK_SOURCE_LOCO, .freq_compare_value_loco = 255, .p_err_cfg = &g_rtc0_err_cfg, .p_callback =
+      NULL,
+  .p_context = NULL, .alarm_ipl = (14), .periodic_ipl = (14), .carry_ipl = (14),
+  #if defined(VECTOR_NUMBER_RTC_ALARM)
+  .alarm_irq = VECTOR_NUMBER_RTC_ALARM,
+  #else
+  .alarm_irq = FSP_INVALID_VECTOR,
+  #endif
+  #if defined(VECTOR_NUMBER_RTC_PERIOD)
+  .periodic_irq = VECTOR_NUMBER_RTC_PERIOD,
+  #else
+  .periodic_irq = FSP_INVALID_VECTOR,
+  #endif
+  #if defined(VECTOR_NUMBER_RTC_CARRY)
+  .carry_irq = VECTOR_NUMBER_RTC_CARRY,
+  #else
+  .carry_irq = FSP_INVALID_VECTOR,
+  #endif
+};
+/* Instance structure to use this module. */
+const rtc_instance_t g_rtc0 =
+{ .p_ctrl = &g_rtc0_ctrl, .p_cfg = &g_rtc0_cfg, .p_api = &g_rtc_on_rtc };
+sci_uart_instance_ctrl_t g_uart2_ctrl;
+
+baud_setting_t g_uart2_baud_setting =
+{
+/* Baud rate calculated with 0.160% error. */ .abcse = 0,
+    .abcs = 0, .bgdm = 1, .cks = 0, .brr = 25, .mddr = (uint8_t)256, .brme = false
+};
+
+/** UART extended configuration for UARTonSCI HAL driver */
+const sci_uart_extended_cfg_t g_uart2_cfg_extend =
+{ .clock = SCI_UART_CLOCK_INT,
+  .rx_edge_start = SCI_UART_START_BIT_FALLING_EDGE,
+  .noise_cancel = SCI_UART_NOISE_CANCELLATION_DISABLE,
+  .rx_fifo_trigger = SCI_UART_RX_FIFO_TRIGGER_MAX,
+  .p_baud_setting = &g_uart2_baud_setting,
+  .uart_mode = UART_MODE_RS232,
+  .ctsrts_en = SCI_UART_CTSRTS_RTS_OUTPUT,
+  #if 0
+  .flow_control_pin = BSP_IO_PORT_00_PIN_00,
+  #else
+  .flow_control_pin = (bsp_io_port_pin_t)(0xFFFFU),
+  #endif
+};
+
+/** UART interface configuration */
+const uart_cfg_t g_uart2_cfg =
+{ .channel = 2, .data_bits = UART_DATA_BITS_8, .parity = UART_PARITY_OFF, .stop_bits = UART_STOP_BITS_1, .p_callback =
+      user_uart_callback,
+  .p_context = NULL, .p_extend = &g_uart2_cfg_extend,
+#define RA_NOT_DEFINED (1)
+  #if (RA_NOT_DEFINED == RA_NOT_DEFINED)
+  .p_transfer_tx = NULL,
+  #else
+  .p_transfer_tx = &RA_NOT_DEFINED,
+  #endif
+  #if (RA_NOT_DEFINED == RA_NOT_DEFINED)
+  .p_transfer_rx = NULL,
+  #else
+  .p_transfer_rx = &RA_NOT_DEFINED,
+  #endif
+#undef RA_NOT_DEFINED
+  .rxi_ipl = (12),
+  .txi_ipl = (12), .tei_ipl = (12), .eri_ipl = (12),
+  #if defined(VECTOR_NUMBER_SCI2_RXI)
+  .rxi_irq = VECTOR_NUMBER_SCI2_RXI,
+  #else
+  .rxi_irq = FSP_INVALID_VECTOR,
+  #endif
+  #if defined(VECTOR_NUMBER_SCI2_TXI)
+  .txi_irq = VECTOR_NUMBER_SCI2_TXI,
+  #else
+  .txi_irq = FSP_INVALID_VECTOR,
+  #endif
+  #if defined(VECTOR_NUMBER_SCI2_TEI)
+  .tei_irq = VECTOR_NUMBER_SCI2_TEI,
+  #else
+  .tei_irq = FSP_INVALID_VECTOR,
+  #endif
+  #if defined(VECTOR_NUMBER_SCI2_ERI)
+  .eri_irq = VECTOR_NUMBER_SCI2_ERI,
+  #else
+  .eri_irq = FSP_INVALID_VECTOR,
+  #endif
+};
+
+/* Instance structure to use this module. */
+const uart_instance_t g_uart2 =
+{ .p_ctrl = &g_uart2_ctrl, .p_cfg = &g_uart2_cfg, .p_api = &g_uart_on_sci };
+sci_uart_instance_ctrl_t g_uart1_ctrl;
+
+baud_setting_t g_uart1_baud_setting =
+{
+/* Baud rate calculated with 0.160% error. */ .abcse = 0,
+    .abcs = 0, .bgdm = 1, .cks = 0, .brr = 25, .mddr = (uint8_t)256, .brme = false
+};
+
+/** UART extended configuration for UARTonSCI HAL driver */
+const sci_uart_extended_cfg_t g_uart1_cfg_extend =
+{ .clock = SCI_UART_CLOCK_INT,
+  .rx_edge_start = SCI_UART_START_BIT_FALLING_EDGE,
+  .noise_cancel = SCI_UART_NOISE_CANCELLATION_DISABLE,
+  .rx_fifo_trigger = SCI_UART_RX_FIFO_TRIGGER_MAX,
+  .p_baud_setting = &g_uart1_baud_setting,
+  .uart_mode = UART_MODE_RS232,
+  .ctsrts_en = SCI_UART_CTSRTS_RTS_OUTPUT,
+  #if 0
+  .flow_control_pin = BSP_IO_PORT_00_PIN_00,
+  #else
+  .flow_control_pin = (bsp_io_port_pin_t)(0xFFFFU),
+  #endif
+};
+
+/** UART interface configuration */
+const uart_cfg_t g_uart1_cfg =
+{ .channel = 1, .data_bits = UART_DATA_BITS_8, .parity = UART_PARITY_OFF, .stop_bits = UART_STOP_BITS_1, .p_callback =
+      user_uart_callback,
+  .p_context = NULL, .p_extend = &g_uart1_cfg_extend,
+#define RA_NOT_DEFINED (1)
+  #if (RA_NOT_DEFINED == RA_NOT_DEFINED)
+  .p_transfer_tx = NULL,
+  #else
+  .p_transfer_tx = &RA_NOT_DEFINED,
+  #endif
+  #if (RA_NOT_DEFINED == RA_NOT_DEFINED)
+  .p_transfer_rx = NULL,
+  #else
+  .p_transfer_rx = &RA_NOT_DEFINED,
+  #endif
+#undef RA_NOT_DEFINED
+  .rxi_ipl = (12),
+  .txi_ipl = (12), .tei_ipl = (12), .eri_ipl = (12),
+  #if defined(VECTOR_NUMBER_SCI1_RXI)
+  .rxi_irq = VECTOR_NUMBER_SCI1_RXI,
+  #else
+  .rxi_irq = FSP_INVALID_VECTOR,
+  #endif
+  #if defined(VECTOR_NUMBER_SCI1_TXI)
+  .txi_irq = VECTOR_NUMBER_SCI1_TXI,
+  #else
+  .txi_irq = FSP_INVALID_VECTOR,
+  #endif
+  #if defined(VECTOR_NUMBER_SCI1_TEI)
+  .tei_irq = VECTOR_NUMBER_SCI1_TEI,
+  #else
+  .tei_irq = FSP_INVALID_VECTOR,
+  #endif
+  #if defined(VECTOR_NUMBER_SCI1_ERI)
+  .eri_irq = VECTOR_NUMBER_SCI1_ERI,
+  #else
+  .eri_irq = FSP_INVALID_VECTOR,
+  #endif
+};
+
+/* Instance structure to use this module. */
+const uart_instance_t g_uart1 =
+{ .p_ctrl = &g_uart1_ctrl, .p_cfg = &g_uart1_cfg, .p_api = &g_uart_on_sci };
+sci_uart_instance_ctrl_t g_uart0_ctrl;
+
+baud_setting_t g_uart0_baud_setting =
+{
+/* Baud rate calculated with 0.160% error. */ .abcse = 0,
+    .abcs = 0, .bgdm = 1, .cks = 0, .brr = 25, .mddr = (uint8_t)256, .brme = false
+};
+
+/** UART extended configuration for UARTonSCI HAL driver */
+const sci_uart_extended_cfg_t g_uart0_cfg_extend =
+{ .clock = SCI_UART_CLOCK_INT,
+  .rx_edge_start = SCI_UART_START_BIT_FALLING_EDGE,
+  .noise_cancel = SCI_UART_NOISE_CANCELLATION_DISABLE,
+  .rx_fifo_trigger = SCI_UART_RX_FIFO_TRIGGER_MAX,
+  .p_baud_setting = &g_uart0_baud_setting,
+  .uart_mode = UART_MODE_RS232,
+  .ctsrts_en = SCI_UART_CTSRTS_RTS_OUTPUT,
+  #if 0
+  .flow_control_pin = BSP_IO_PORT_00_PIN_00,
+  #else
+  .flow_control_pin = (bsp_io_port_pin_t)(0xFFFFU),
+  #endif
+};
+
+/** UART interface configuration */
+const uart_cfg_t g_uart0_cfg =
+{ .channel = 0, .data_bits = UART_DATA_BITS_8, .parity = UART_PARITY_OFF, .stop_bits = UART_STOP_BITS_1, .p_callback =
+      user_uart_callback,
+  .p_context = NULL, .p_extend = &g_uart0_cfg_extend,
+#define RA_NOT_DEFINED (1)
+  #if (RA_NOT_DEFINED == RA_NOT_DEFINED)
+  .p_transfer_tx = NULL,
+  #else
+  .p_transfer_tx = &RA_NOT_DEFINED,
+  #endif
+  #if (RA_NOT_DEFINED == RA_NOT_DEFINED)
+  .p_transfer_rx = NULL,
+  #else
+  .p_transfer_rx = &RA_NOT_DEFINED,
+  #endif
+#undef RA_NOT_DEFINED
+  .rxi_ipl = (12),
+  .txi_ipl = (12), .tei_ipl = (12), .eri_ipl = (12),
+  #if defined(VECTOR_NUMBER_SCI0_RXI)
+  .rxi_irq = VECTOR_NUMBER_SCI0_RXI,
+  #else
+  .rxi_irq = FSP_INVALID_VECTOR,
+  #endif
+  #if defined(VECTOR_NUMBER_SCI0_TXI)
+  .txi_irq = VECTOR_NUMBER_SCI0_TXI,
+  #else
+  .txi_irq = FSP_INVALID_VECTOR,
+  #endif
+  #if defined(VECTOR_NUMBER_SCI0_TEI)
+  .tei_irq = VECTOR_NUMBER_SCI0_TEI,
+  #else
+  .tei_irq = FSP_INVALID_VECTOR,
+  #endif
+  #if defined(VECTOR_NUMBER_SCI0_ERI)
+  .eri_irq = VECTOR_NUMBER_SCI0_ERI,
+  #else
+  .eri_irq = FSP_INVALID_VECTOR,
+  #endif
+};
+
+/* Instance structure to use this module. */
+const uart_instance_t g_uart0 =
+{ .p_ctrl = &g_uart0_ctrl, .p_cfg = &g_uart0_cfg, .p_api = &g_uart_on_sci };
+void g_hal_init(void) {
+    g_common_init();
+}
diff --git a/ports/renesas-ra/boards/RA4M1_EK/ra_gen/hal_data.h b/ports/renesas-ra/boards/RA4M1_EK/ra_gen/hal_data.h
new file mode 100644
index 0000000000000..4120a48030541
--- /dev/null
+++ b/ports/renesas-ra/boards/RA4M1_EK/ra_gen/hal_data.h
@@ -0,0 +1,154 @@
+/* generated HAL header file - do not edit */
+#ifndef HAL_DATA_H_
+#define HAL_DATA_H_
+#include <stdint.h>
+#include "bsp_api.h"
+#include "common_data.h"
+#include "r_adc.h"
+#include "r_adc_api.h"
+#include "r_lpm.h"
+#include "r_lpm_api.h"
+#include "r_dtc.h"
+#include "r_transfer_api.h"
+#include "r_spi.h"
+#include "r_icu.h"
+#include "r_external_irq_api.h"
+#include "r_agt.h"
+#include "r_timer_api.h"
+#include "r_flash_lp.h"
+#include "r_flash_api.h"
+#include "r_rtc.h"
+#include "r_rtc_api.h"
+#include "r_sci_uart.h"
+#include "r_uart_api.h"
+FSP_HEADER
+/** ADC on ADC Instance. */
+extern const adc_instance_t g_adc0;
+
+/** Access the ADC instance using these structures when calling API functions directly (::p_api is not used). */
+extern adc_instance_ctrl_t g_adc0_ctrl;
+extern const adc_cfg_t g_adc0_cfg;
+extern const adc_channel_cfg_t g_adc0_channel_cfg;
+
+#ifndef NULL
+void NULL(adc_callback_args_t *p_args);
+#endif
+/** lpm Instance */
+extern const lpm_instance_t g_lpm0;
+
+/** Access the LPM instance using these structures when calling API functions directly (::p_api is not used). */
+extern lpm_instance_ctrl_t g_lpm0_ctrl;
+extern const lpm_cfg_t g_lpm0_cfg;
+/* Transfer on DTC Instance. */
+extern const transfer_instance_t g_transfer1;
+
+/** Access the DTC instance using these structures when calling API functions directly (::p_api is not used). */
+extern dtc_instance_ctrl_t g_transfer1_ctrl;
+extern const transfer_cfg_t g_transfer1_cfg;
+/* Transfer on DTC Instance. */
+extern const transfer_instance_t g_transfer0;
+
+/** Access the DTC instance using these structures when calling API functions directly (::p_api is not used). */
+extern dtc_instance_ctrl_t g_transfer0_ctrl;
+extern const transfer_cfg_t g_transfer0_cfg;
+/** SPI on SPI Instance. */
+extern const spi_instance_t g_spi0;
+
+/** Access the SPI instance using these structures when calling API functions directly (::p_api is not used). */
+extern spi_instance_ctrl_t g_spi0_ctrl;
+extern const spi_cfg_t g_spi0_cfg;
+
+/** Callback used by SPI Instance. */
+#ifndef spi_callback
+void spi_callback(spi_callback_args_t *p_args);
+#endif
+
+#define RA_NOT_DEFINED (1)
+#if (RA_NOT_DEFINED == g_transfer0)
+    #define g_spi0_P_TRANSFER_TX (NULL)
+#else
+#define g_spi0_P_TRANSFER_TX (&g_transfer0)
+#endif
+#if (RA_NOT_DEFINED == g_transfer1)
+    #define g_spi0_P_TRANSFER_RX (NULL)
+#else
+#define g_spi0_P_TRANSFER_RX (&g_transfer1)
+#endif
+#undef RA_NOT_DEFINED
+/** External IRQ on ICU Instance. */
+extern const external_irq_instance_t g_external_irq0;
+
+/** Access the ICU instance using these structures when calling API functions directly (::p_api is not used). */
+extern icu_instance_ctrl_t g_external_irq0_ctrl;
+extern const external_irq_cfg_t g_external_irq0_cfg;
+
+#ifndef callback_icu
+void callback_icu(external_irq_callback_args_t *p_args);
+#endif
+/** AGT Timer Instance */
+extern const timer_instance_t g_timer0;
+
+/** Access the AGT instance using these structures when calling API functions directly (::p_api is not used). */
+extern agt_instance_ctrl_t g_timer0_ctrl;
+extern const timer_cfg_t g_timer0_cfg;
+
+#ifndef callback_agt
+void callback_agt(timer_callback_args_t *p_args);
+#endif
+/* Flash on Flash LP Instance. */
+extern const flash_instance_t g_flash0;
+
+/** Access the Flash LP instance using these structures when calling API functions directly (::p_api is not used). */
+extern flash_lp_instance_ctrl_t g_flash0_ctrl;
+extern const flash_cfg_t g_flash0_cfg;
+
+#ifndef NULL
+void NULL(flash_callback_args_t *p_args);
+#endif
+/* RTC Instance. */
+extern const rtc_instance_t g_rtc0;
+
+/** Access the RTC instance using these structures when calling API functions directly (::p_api is not used). */
+extern rtc_instance_ctrl_t g_rtc0_ctrl;
+extern const rtc_cfg_t g_rtc0_cfg;
+
+#ifndef NULL
+void NULL(rtc_callback_args_t *p_args);
+#endif
+/** UART on SCI Instance. */
+extern const uart_instance_t g_uart2;
+
+/** Access the UART instance using these structures when calling API functions directly (::p_api is not used). */
+extern sci_uart_instance_ctrl_t g_uart2_ctrl;
+extern const uart_cfg_t g_uart2_cfg;
+extern const sci_uart_extended_cfg_t g_uart2_cfg_extend;
+
+#ifndef user_uart_callback
+void user_uart_callback(uart_callback_args_t *p_args);
+#endif
+/** UART on SCI Instance. */
+extern const uart_instance_t g_uart1;
+
+/** Access the UART instance using these structures when calling API functions directly (::p_api is not used). */
+extern sci_uart_instance_ctrl_t g_uart1_ctrl;
+extern const uart_cfg_t g_uart1_cfg;
+extern const sci_uart_extended_cfg_t g_uart1_cfg_extend;
+
+#ifndef user_uart_callback
+void user_uart_callback(uart_callback_args_t *p_args);
+#endif
+/** UART on SCI Instance. */
+extern const uart_instance_t g_uart0;
+
+/** Access the UART instance using these structures when calling API functions directly (::p_api is not used). */
+extern sci_uart_instance_ctrl_t g_uart0_ctrl;
+extern const uart_cfg_t g_uart0_cfg;
+extern const sci_uart_extended_cfg_t g_uart0_cfg_extend;
+
+#ifndef user_uart_callback
+void user_uart_callback(uart_callback_args_t *p_args);
+#endif
+void hal_entry(void);
+void g_hal_init(void);
+FSP_FOOTER
+#endif /* HAL_DATA_H_ */
diff --git a/ports/renesas-ra/boards/RA4M1_EK/ra_gen/main.c b/ports/renesas-ra/boards/RA4M1_EK/ra_gen/main.c
new file mode 100644
index 0000000000000..5b9f9805595fa
--- /dev/null
+++ b/ports/renesas-ra/boards/RA4M1_EK/ra_gen/main.c
@@ -0,0 +1,6 @@
+/* generated main source file - do not edit */
+#include "hal_data.h"
+int main(void) {
+    hal_entry();
+    return 0;
+}
diff --git a/ports/renesas-ra/boards/RA4M1_EK/ra_gen/pin_data.c b/ports/renesas-ra/boards/RA4M1_EK/ra_gen/pin_data.c
new file mode 100644
index 0000000000000..bc928d63f5717
--- /dev/null
+++ b/ports/renesas-ra/boards/RA4M1_EK/ra_gen/pin_data.c
@@ -0,0 +1,105 @@
+/* generated pin source file - do not edit */
+#include "bsp_api.h"
+#include "r_ioport_api.h"
+const ioport_pin_cfg_t g_bsp_pin_cfg_data[] = {
+    {
+        .pin = BSP_IO_PORT_00_PIN_00,
+        .pin_cfg = ((uint32_t)IOPORT_CFG_ANALOG_ENABLE),
+    },
+    {
+        .pin = BSP_IO_PORT_01_PIN_00,
+        .pin_cfg = ((uint32_t)IOPORT_CFG_PERIPHERAL_PIN | (uint32_t)IOPORT_PERIPHERAL_SPI),
+    },
+    {
+        .pin = BSP_IO_PORT_01_PIN_01,
+        .pin_cfg = ((uint32_t)IOPORT_CFG_PERIPHERAL_PIN | (uint32_t)IOPORT_PERIPHERAL_SPI),
+    },
+    {
+        .pin = BSP_IO_PORT_01_PIN_02,
+        .pin_cfg = ((uint32_t)IOPORT_CFG_PERIPHERAL_PIN | (uint32_t)IOPORT_PERIPHERAL_SPI),
+    },
+    {
+        .pin = BSP_IO_PORT_01_PIN_03,
+        .pin_cfg = ((uint32_t)IOPORT_CFG_PERIPHERAL_PIN | (uint32_t)IOPORT_PERIPHERAL_SPI),
+    },
+    {
+        .pin = BSP_IO_PORT_01_PIN_05,
+        .pin_cfg = ((uint32_t)IOPORT_CFG_IRQ_ENABLE | (uint32_t)IOPORT_CFG_PORT_DIRECTION_INPUT),
+    },
+    {
+        .pin = BSP_IO_PORT_01_PIN_06,
+        .pin_cfg = ((uint32_t)IOPORT_CFG_PORT_DIRECTION_OUTPUT | (uint32_t)IOPORT_CFG_PORT_OUTPUT_LOW),
+    },
+    {
+        .pin = BSP_IO_PORT_01_PIN_08,
+        .pin_cfg = ((uint32_t)IOPORT_CFG_PERIPHERAL_PIN | (uint32_t)IOPORT_PERIPHERAL_DEBUG),
+    },
+    {
+        .pin = BSP_IO_PORT_01_PIN_09,
+        .pin_cfg = ((uint32_t)IOPORT_CFG_PERIPHERAL_PIN | (uint32_t)IOPORT_PERIPHERAL_DEBUG),
+    },
+    {
+        .pin = BSP_IO_PORT_01_PIN_10,
+        .pin_cfg = ((uint32_t)IOPORT_CFG_PERIPHERAL_PIN | (uint32_t)IOPORT_PERIPHERAL_DEBUG),
+    },
+    {
+        .pin = BSP_IO_PORT_01_PIN_15,
+        .pin_cfg = ((uint32_t)IOPORT_CFG_PERIPHERAL_PIN | (uint32_t)IOPORT_PERIPHERAL_CTSU),
+    },
+    {
+        .pin = BSP_IO_PORT_02_PIN_05,
+        .pin_cfg = ((uint32_t)IOPORT_CFG_PERIPHERAL_PIN | (uint32_t)IOPORT_PERIPHERAL_CTSU),
+    },
+    {
+        .pin = BSP_IO_PORT_03_PIN_00,
+        .pin_cfg = ((uint32_t)IOPORT_CFG_PERIPHERAL_PIN | (uint32_t)IOPORT_PERIPHERAL_DEBUG),
+    },
+    {
+        .pin = BSP_IO_PORT_03_PIN_01,
+        .pin_cfg = ((uint32_t)IOPORT_CFG_PERIPHERAL_PIN | (uint32_t)IOPORT_PERIPHERAL_SCI0_2_4_6_8),
+    },
+    {
+        .pin = BSP_IO_PORT_03_PIN_02,
+        .pin_cfg = ((uint32_t)IOPORT_CFG_PERIPHERAL_PIN | (uint32_t)IOPORT_PERIPHERAL_SCI0_2_4_6_8),
+    },
+    {
+        .pin = BSP_IO_PORT_04_PIN_00,
+        .pin_cfg = ((uint32_t)IOPORT_CFG_PORT_DIRECTION_OUTPUT | (uint32_t)IOPORT_CFG_PORT_OUTPUT_LOW),
+    },
+    {
+        .pin = BSP_IO_PORT_04_PIN_01,
+        .pin_cfg = ((uint32_t)IOPORT_CFG_PERIPHERAL_PIN | (uint32_t)IOPORT_PERIPHERAL_SCI1_3_5_7_9),
+    },
+    {
+        .pin = BSP_IO_PORT_04_PIN_02,
+        .pin_cfg = ((uint32_t)IOPORT_CFG_PERIPHERAL_PIN | (uint32_t)IOPORT_PERIPHERAL_SCI1_3_5_7_9),
+    },
+    {
+        .pin = BSP_IO_PORT_04_PIN_03,
+        .pin_cfg = ((uint32_t)IOPORT_CFG_PORT_DIRECTION_OUTPUT | (uint32_t)IOPORT_CFG_PORT_OUTPUT_LOW),
+    },
+    {
+        .pin = BSP_IO_PORT_04_PIN_07,
+        .pin_cfg = ((uint32_t)IOPORT_CFG_PERIPHERAL_PIN | (uint32_t)IOPORT_PERIPHERAL_USB_FS),
+    },
+    {
+        .pin = BSP_IO_PORT_04_PIN_10,
+        .pin_cfg = ((uint32_t)IOPORT_CFG_PERIPHERAL_PIN | (uint32_t)IOPORT_PERIPHERAL_SCI0_2_4_6_8),
+    },
+    {
+        .pin = BSP_IO_PORT_04_PIN_11,
+        .pin_cfg = ((uint32_t)IOPORT_CFG_PERIPHERAL_PIN | (uint32_t)IOPORT_PERIPHERAL_SCI0_2_4_6_8),
+    },
+    {
+        .pin = BSP_IO_PORT_09_PIN_14,
+        .pin_cfg = ((uint32_t)IOPORT_CFG_PERIPHERAL_PIN | (uint32_t)IOPORT_PERIPHERAL_USB_FS),
+    },
+    {
+        .pin = BSP_IO_PORT_09_PIN_15,
+        .pin_cfg = ((uint32_t)IOPORT_CFG_PERIPHERAL_PIN | (uint32_t)IOPORT_PERIPHERAL_USB_FS),
+    },
+};
+const ioport_cfg_t g_bsp_pin_cfg = {
+    .number_of_pins = sizeof(g_bsp_pin_cfg_data) / sizeof(ioport_pin_cfg_t),
+    .p_pin_cfg_data = &g_bsp_pin_cfg_data[0],
+};
diff --git a/ports/renesas-ra/boards/RA4M1_EK/ra_gen/vector_data.c b/ports/renesas-ra/boards/RA4M1_EK/ra_gen/vector_data.c
new file mode 100644
index 0000000000000..a5f0092a561ea
--- /dev/null
+++ b/ports/renesas-ra/boards/RA4M1_EK/ra_gen/vector_data.c
@@ -0,0 +1,53 @@
+/* generated vector source file - do not edit */
+#include "bsp_api.h"
+/* Do not build these data structures if no interrupts are currently allocated because IAR will have build errors. */
+#if VECTOR_DATA_IRQ_COUNT > 0
+BSP_DONT_REMOVE const fsp_vector_t g_vector_table[BSP_ICU_VECTOR_MAX_ENTRIES] BSP_PLACE_IN_SECTION(BSP_SECTION_APPLICATION_VECTORS) =
+{
+    [0] = sci_uart_rxi_isr,         /* SCI0 RXI (Receive data full) */
+    [1] = sci_uart_txi_isr,         /* SCI0 TXI (Transmit data empty) */
+    [2] = sci_uart_tei_isr,         /* SCI0 TEI (Transmit end) */
+    [3] = sci_uart_eri_isr,         /* SCI0 ERI (Receive error) */
+    [4] = sci_uart_rxi_isr,         /* SCI1 RXI (Received data full) */
+    [5] = sci_uart_txi_isr,         /* SCI1 TXI (Transmit data empty) */
+    [6] = sci_uart_tei_isr,         /* SCI1 TEI (Transmit end) */
+    [7] = sci_uart_eri_isr,         /* SCI1 ERI (Receive error) */
+    [8] = sci_uart_rxi_isr,         /* SCI2 RXI (Received data full) */
+    [9] = sci_uart_txi_isr,         /* SCI2 TXI (Transmit data empty) */
+    [10] = sci_uart_tei_isr,        /* SCI2 TEI (Transmit end) */
+    [11] = sci_uart_eri_isr,        /* SCI2 ERI (Receive error) */
+    [12] = rtc_alarm_periodic_isr,  /* RTC ALARM (Alarm interrupt) */
+    [13] = rtc_alarm_periodic_isr,  /* RTC PERIOD (Periodic interrupt) */
+    [14] = rtc_carry_isr,           /* RTC CARRY (Carry interrupt) */
+    [15] = agt_int_isr,             /* AGT0 INT (AGT interrupt) */
+    [16] = r_icu_isr,               /* ICU IRQ0 (External pin interrupt 0) */
+    [17] = spi_rxi_isr,             /* SPI0 RXI (Receive buffer full) */
+    [18] = spi_txi_isr,             /* SPI0 TXI (Transmit buffer empty) */
+    [19] = spi_tei_isr,             /* SPI0 TEI (Transmission complete event) */
+    [20] = spi_eri_isr,             /* SPI0 ERI (Error) */
+};
+const bsp_interrupt_event_t g_interrupt_event_link_select[BSP_ICU_VECTOR_MAX_ENTRIES] =
+{
+    [0] = BSP_PRV_IELS_ENUM(EVENT_SCI0_RXI),         /* SCI0 RXI (Receive data full) */
+    [1] = BSP_PRV_IELS_ENUM(EVENT_SCI0_TXI),         /* SCI0 TXI (Transmit data empty) */
+    [2] = BSP_PRV_IELS_ENUM(EVENT_SCI0_TEI),         /* SCI0 TEI (Transmit end) */
+    [3] = BSP_PRV_IELS_ENUM(EVENT_SCI0_ERI),         /* SCI0 ERI (Receive error) */
+    [4] = BSP_PRV_IELS_ENUM(EVENT_SCI1_RXI),         /* SCI1 RXI (Received data full) */
+    [5] = BSP_PRV_IELS_ENUM(EVENT_SCI1_TXI),         /* SCI1 TXI (Transmit data empty) */
+    [6] = BSP_PRV_IELS_ENUM(EVENT_SCI1_TEI),         /* SCI1 TEI (Transmit end) */
+    [7] = BSP_PRV_IELS_ENUM(EVENT_SCI1_ERI),         /* SCI1 ERI (Receive error) */
+    [8] = BSP_PRV_IELS_ENUM(EVENT_SCI2_RXI),         /* SCI2 RXI (Received data full) */
+    [9] = BSP_PRV_IELS_ENUM(EVENT_SCI2_TXI),         /* SCI2 TXI (Transmit data empty) */
+    [10] = BSP_PRV_IELS_ENUM(EVENT_SCI2_TEI),        /* SCI2 TEI (Transmit end) */
+    [11] = BSP_PRV_IELS_ENUM(EVENT_SCI2_ERI),        /* SCI2 ERI (Receive error) */
+    [12] = BSP_PRV_IELS_ENUM(EVENT_RTC_ALARM),       /* RTC ALARM (Alarm interrupt) */
+    [13] = BSP_PRV_IELS_ENUM(EVENT_RTC_PERIOD),      /* RTC PERIOD (Periodic interrupt) */
+    [14] = BSP_PRV_IELS_ENUM(EVENT_RTC_CARRY),       /* RTC CARRY (Carry interrupt) */
+    [15] = BSP_PRV_IELS_ENUM(EVENT_AGT0_INT),        /* AGT0 INT (AGT interrupt) */
+    [16] = BSP_PRV_IELS_ENUM(EVENT_ICU_IRQ0),        /* ICU IRQ0 (External pin interrupt 0) */
+    [17] = BSP_PRV_IELS_ENUM(EVENT_SPI0_RXI),        /* SPI0 RXI (Receive buffer full) */
+    [18] = BSP_PRV_IELS_ENUM(EVENT_SPI0_TXI),        /* SPI0 TXI (Transmit buffer empty) */
+    [19] = BSP_PRV_IELS_ENUM(EVENT_SPI0_TEI),        /* SPI0 TEI (Transmission complete event) */
+    [20] = BSP_PRV_IELS_ENUM(EVENT_SPI0_ERI),        /* SPI0 ERI (Error) */
+};
+#endif
diff --git a/ports/renesas-ra/boards/RA4M1_EK/ra_gen/vector_data.h b/ports/renesas-ra/boards/RA4M1_EK/ra_gen/vector_data.h
new file mode 100644
index 0000000000000..1e23b674cace2
--- /dev/null
+++ b/ports/renesas-ra/boards/RA4M1_EK/ra_gen/vector_data.h
@@ -0,0 +1,79 @@
+/* generated vector header file - do not edit */
+#ifndef VECTOR_DATA_H
+#define VECTOR_DATA_H
+/* Number of interrupts allocated */
+#ifndef VECTOR_DATA_IRQ_COUNT
+#define VECTOR_DATA_IRQ_COUNT    (21)
+#endif
+/* ISR prototypes */
+void sci_uart_rxi_isr(void);
+void sci_uart_txi_isr(void);
+void sci_uart_tei_isr(void);
+void sci_uart_eri_isr(void);
+void rtc_alarm_periodic_isr(void);
+void rtc_carry_isr(void);
+void agt_int_isr(void);
+void r_icu_isr(void);
+void spi_rxi_isr(void);
+void spi_txi_isr(void);
+void spi_tei_isr(void);
+void spi_eri_isr(void);
+
+/* Vector table allocations */
+#define VECTOR_NUMBER_SCI0_RXI ((IRQn_Type)0)  /* SCI0 RXI (Receive data full) */
+#define VECTOR_NUMBER_SCI0_TXI ((IRQn_Type)1)  /* SCI0 TXI (Transmit data empty) */
+#define VECTOR_NUMBER_SCI0_TEI ((IRQn_Type)2)  /* SCI0 TEI (Transmit end) */
+#define VECTOR_NUMBER_SCI0_ERI ((IRQn_Type)3)  /* SCI0 ERI (Receive error) */
+#define VECTOR_NUMBER_SCI1_RXI ((IRQn_Type)4)  /* SCI1 RXI (Received data full) */
+#define VECTOR_NUMBER_SCI1_TXI ((IRQn_Type)5)  /* SCI1 TXI (Transmit data empty) */
+#define VECTOR_NUMBER_SCI1_TEI ((IRQn_Type)6)  /* SCI1 TEI (Transmit end) */
+#define VECTOR_NUMBER_SCI1_ERI ((IRQn_Type)7)  /* SCI1 ERI (Receive error) */
+#define VECTOR_NUMBER_SCI2_RXI ((IRQn_Type)8)  /* SCI2 RXI (Received data full) */
+#define VECTOR_NUMBER_SCI2_TXI ((IRQn_Type)9)  /* SCI2 TXI (Transmit data empty) */
+#define VECTOR_NUMBER_SCI2_TEI ((IRQn_Type)10)  /* SCI2 TEI (Transmit end) */
+#define VECTOR_NUMBER_SCI2_ERI ((IRQn_Type)11)  /* SCI2 ERI (Receive error) */
+#define VECTOR_NUMBER_RTC_ALARM ((IRQn_Type)12)  /* RTC ALARM (Alarm interrupt) */
+#define VECTOR_NUMBER_RTC_PERIOD ((IRQn_Type)13)  /* RTC PERIOD (Periodic interrupt) */
+#define VECTOR_NUMBER_RTC_CARRY ((IRQn_Type)14)  /* RTC CARRY (Carry interrupt) */
+#define VECTOR_NUMBER_AGT0_INT ((IRQn_Type)15)  /* AGT0 INT (AGT interrupt) */
+#define VECTOR_NUMBER_ICU_IRQ0 ((IRQn_Type)16)  /* ICU IRQ0 (External pin interrupt 0) */
+#define VECTOR_NUMBER_SPI0_RXI ((IRQn_Type)17)  /* SPI0 RXI (Receive buffer full) */
+#define VECTOR_NUMBER_SPI0_TXI ((IRQn_Type)18)  /* SPI0 TXI (Transmit buffer empty) */
+#define VECTOR_NUMBER_SPI0_TEI ((IRQn_Type)19)  /* SPI0 TEI (Transmission complete event) */
+#define VECTOR_NUMBER_SPI0_ERI ((IRQn_Type)20)  /* SPI0 ERI (Error) */
+typedef enum IRQn
+{
+    Reset_IRQn = -15,
+    NonMaskableInt_IRQn = -14,
+    HardFault_IRQn = -13,
+    MemoryManagement_IRQn = -12,
+    BusFault_IRQn = -11,
+    UsageFault_IRQn = -10,
+    SecureFault_IRQn = -9,
+    SVCall_IRQn = -5,
+    DebugMonitor_IRQn = -4,
+    PendSV_IRQn = -2,
+    SysTick_IRQn = -1,
+    SCI0_RXI_IRQn = 0, /* SCI0 RXI (Receive data full) */
+    SCI0_TXI_IRQn = 1, /* SCI0 TXI (Transmit data empty) */
+    SCI0_TEI_IRQn = 2, /* SCI0 TEI (Transmit end) */
+    SCI0_ERI_IRQn = 3, /* SCI0 ERI (Receive error) */
+    SCI1_RXI_IRQn = 4, /* SCI1 RXI (Received data full) */
+    SCI1_TXI_IRQn = 5, /* SCI1 TXI (Transmit data empty) */
+    SCI1_TEI_IRQn = 6, /* SCI1 TEI (Transmit end) */
+    SCI1_ERI_IRQn = 7, /* SCI1 ERI (Receive error) */
+    SCI2_RXI_IRQn = 8, /* SCI2 RXI (Received data full) */
+    SCI2_TXI_IRQn = 9, /* SCI2 TXI (Transmit data empty) */
+    SCI2_TEI_IRQn = 10, /* SCI2 TEI (Transmit end) */
+    SCI2_ERI_IRQn = 11, /* SCI2 ERI (Receive error) */
+    RTC_ALARM_IRQn = 12, /* RTC ALARM (Alarm interrupt) */
+    RTC_PERIOD_IRQn = 13, /* RTC PERIOD (Periodic interrupt) */
+    RTC_CARRY_IRQn = 14, /* RTC CARRY (Carry interrupt) */
+    AGT0_INT_IRQn = 15, /* AGT0 INT (AGT interrupt) */
+    ICU_IRQ0_IRQn = 16, /* ICU IRQ0 (External pin interrupt 0) */
+    SPI0_RXI_IRQn = 17, /* SPI0 RXI (Receive buffer full) */
+    SPI0_TXI_IRQn = 18, /* SPI0 TXI (Transmit buffer empty) */
+    SPI0_TEI_IRQn = 19, /* SPI0 TEI (Transmission complete event) */
+    SPI0_ERI_IRQn = 20, /* SPI0 ERI (Error) */
+} IRQn_Type;
+#endif /* VECTOR_DATA_H */
diff --git a/ports/renesas-ra/boards/RA4M1_EK/src/hal_entry.c b/ports/renesas-ra/boards/RA4M1_EK/src/hal_entry.c
new file mode 100644
index 0000000000000..c922cfd17ad9a
--- /dev/null
+++ b/ports/renesas-ra/boards/RA4M1_EK/src/hal_entry.c
@@ -0,0 +1,58 @@
+#include "hal_data.h"
+
+FSP_CPP_HEADER
+void R_BSP_WarmStart(bsp_warm_start_event_t event);
+FSP_CPP_FOOTER
+
+void ra_main(uint32_t reset_mode);
+
+/*******************************************************************************************************************//**
+ * main() is generated by the RA Configuration editor and is used to generate threads if an RTOS is used.  This function
+ * is called by main() when no RTOS is used.
+ **********************************************************************************************************************/
+void hal_entry(void) {
+    /* TODO: add your own code here */
+
+    ra_main(1);
+
+    #if BSP_TZ_SECURE_BUILD
+    /* Enter non-secure code */
+    R_BSP_NonSecureEnter();
+    #endif
+}
+
+/*******************************************************************************************************************//**
+ * This function is called at various points during the startup process.  This implementation uses the event that is
+ * called right before main() to set up the pins.
+ *
+ * @param[in]  event    Where at in the start up process the code is currently at
+ **********************************************************************************************************************/
+void R_BSP_WarmStart(bsp_warm_start_event_t event) {
+    if (BSP_WARM_START_RESET == event) {
+        #if BSP_FEATURE_FLASH_LP_VERSION != 0
+
+        /* Enable reading from data flash. */
+        R_FACI_LP->DFLCTL = 1U;
+
+        /* Would normally have to wait tDSTOP(6us) for data flash recovery. Placing the enable here, before clock and
+         * C runtime initialization, should negate the need for a delay since the initialization will typically take more than 6us. */
+        #endif
+    }
+
+    if (BSP_WARM_START_POST_C == event) {
+        /* C runtime environment and system clocks are setup. */
+
+        /* Configure pins. */
+        R_IOPORT_Open(&g_ioport_ctrl, &g_bsp_pin_cfg);
+    }
+}
+
+#if BSP_TZ_SECURE_BUILD
+
+BSP_CMSE_NONSECURE_ENTRY void template_nonsecure_callable();
+
+/* Trustzone Secure Projects require at least one nonsecure callable function in order to build (Remove this if it is not required to build). */
+BSP_CMSE_NONSECURE_ENTRY void template_nonsecure_callable() {
+
+}
+#endif
diff --git a/ports/renesas-ra/boards/RA4W1_EK/board.json b/ports/renesas-ra/boards/RA4W1_EK/board.json
new file mode 100644
index 0000000000000..db06b6751db92
--- /dev/null
+++ b/ports/renesas-ra/boards/RA4W1_EK/board.json
@@ -0,0 +1,21 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [
+	"UART",
+	"SPI",
+	"I2C",
+	"ADC"
+    ],
+    "id": "EK-RA4W1",
+    "images": [
+        "ek_ra4w1_board.jpg"
+    ],
+    "mcu": "RA4W1",
+    "product": "EK-RA4W1",
+    "thumbnail": "",
+    "url": "https://www.renesas.com/products/microcontrollers-microprocessors/ra-cortex-m-mcus/ek-ra4w1-evaluation-kit-ra4w1-mcu-group",
+    "vendor": "Renesas Electronics"
+}
diff --git a/ports/renesas-ra/boards/RA4W1_EK/mpconfigboard.h b/ports/renesas-ra/boards/RA4W1_EK/mpconfigboard.h
new file mode 100644
index 0000000000000..0e0dff14755cf
--- /dev/null
+++ b/ports/renesas-ra/boards/RA4W1_EK/mpconfigboard.h
@@ -0,0 +1,70 @@
+// MCU config
+#define MICROPY_HW_BOARD_NAME       "RA4W1_EK"
+#define MICROPY_HW_MCU_NAME         "RA4W1"
+#define MICROPY_HW_MCU_SYSCLK       48000000
+#define MICROPY_HW_MCU_PCLK         48000000
+
+// module config
+#define MICROPY_EMIT_THUMB          (1)
+#define MICROPY_EMIT_INLINE_THUMB   (1)
+#define MICROPY_PY_BUILTINS_COMPLEX (1)
+#define MICROPY_PY_GENERATOR_PEND_THROW (1)
+#define MICROPY_PY_MATH             (1)
+#define MICROPY_PY_UHEAPQ           (1)
+#define MICROPY_PY_UTIMEQ           (1)
+#define MICROPY_PY_THREAD           (0) // disable ARM_THUMB_FP using vldr due to RA has single float only
+
+// peripheral config
+#define MICROPY_HW_ENABLE_RTC       (1)
+#define MICROPY_HW_RTC_SOURCE       (1)     // 0: subclock, 1: LOCO (32.768khz)
+#define MICROPY_HW_ENABLE_ADC       (1)
+#define MICROPY_HW_HAS_FLASH        (1)
+#define MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE (1)
+
+// board config
+
+// UART
+// #define MICROPY_HW_UART0_TX       (pin_P101) // Disable (Conflict with PMOD)
+// #define MICROPY_HW_UART0_RX       (pin_P100) // Disable (Conflict with PMOD)
+// #define MICROPY_HW_UART0_CTS      (pin_P103) // Disable (Conflict with PMOD)
+#define MICROPY_HW_UART1_TX         (pin_P213)
+#define MICROPY_HW_UART1_RX         (pin_P212)
+// #define MICROPY_HW_UART1_CTS      (pin_P101) // Disable (Conflict with PMOD)
+#define MICROPY_HW_UART4_TX         (pin_P205) // REPL
+#define MICROPY_HW_UART4_RX         (pin_P206) // REPL
+// #define MICROPY_HW_UART4_CTS      (pin_P407) // Conflict with PMOD1-IO1
+#define MICROPY_HW_UART9_TX         (pin_P109)
+#define MICROPY_HW_UART9_RX         (pin_P110)
+// #define MICROPY_HW_UART9_CTS      (pin_P108) // NC
+#define MICROPY_HW_UART_REPL        HW_UART_4
+#define MICROPY_HW_UART_REPL_BAUD   115200
+
+// I2C
+#define MICROPY_HW_I2C0_SCL         (pin_P204) // Note that conflict with PMOD IO0
+#define MICROPY_HW_I2C0_SDA         (pin_P407) // Note that conflict with PMOD IO1
+// #define MICROPY_HW_I2C1_SCL       (pin_P100) // Disable (Conflict with SPI0)
+// #define MICROPY_HW_I2C1_SDA       (pin_P101) // Disable (Conflict with SPI0)
+
+// SPI
+#define MICROPY_HW_SPI0_SSL         (pin_P103) // PMOD
+#define MICROPY_HW_SPI0_RSPCK       (pin_P102) // PMOD
+#define MICROPY_HW_SPI0_MISO        (pin_P100) // PMOD
+#define MICROPY_HW_SPI0_MOSI        (pin_P101) // PMOD
+// #define MICROPY_HW_SPI1_SSL       (pin_P108) // Disable (vector not registered)
+// #define MICROPY_HW_SPI1_RSPCK     (pin_P111) // Disable (vector not registered)
+// #define MICROPY_HW_SPI1_MISO      (pin_P110) // Disable (vector not registered)
+// #define MICROPY_HW_SPI1_MOSI      (pin_P109) // Disable (vector not registered)
+
+// Switch
+#define MICROPY_HW_HAS_SWITCH       (1)
+#define MICROPY_HW_USRSW_PIN        (pin_P402)
+#define MICROPY_HW_USRSW_PULL       (GPIO_NOPULL)
+#define MICROPY_HW_USRSW_EXTI_MODE  (GPIO_MODE_IT_FALLING)
+#define MICROPY_HW_USRSW_PRESSED    (0)
+
+// LEDs
+#define MICROPY_HW_LED1             (pin_P106)
+#define MICROPY_HW_LED2             (pin_P404)
+#define MICROPY_HW_LED_ON(pin)      mp_hal_pin_low(pin)
+#define MICROPY_HW_LED_OFF(pin)     mp_hal_pin_high(pin)
+#define MICROPY_HW_LED_TOGGLE(pin)  mp_hal_pin_toggle(pin)
diff --git a/ports/renesas-ra/boards/RA4W1_EK/mpconfigboard.mk b/ports/renesas-ra/boards/RA4W1_EK/mpconfigboard.mk
new file mode 100644
index 0000000000000..a22e577fcbd58
--- /dev/null
+++ b/ports/renesas-ra/boards/RA4W1_EK/mpconfigboard.mk
@@ -0,0 +1,6 @@
+CMSIS_MCU = RA4W1
+MCU_SERIES = m4
+LD_FILES = boards/RA4W1_EK/ra4w1_ek.ld
+
+# MicroPython settings
+MICROPY_VFS_FAT = 1
diff --git a/ports/renesas-ra/boards/RA4W1_EK/pins.csv b/ports/renesas-ra/boards/RA4W1_EK/pins.csv
new file mode 100644
index 0000000000000..43afa52713d91
--- /dev/null
+++ b/ports/renesas-ra/boards/RA4W1_EK/pins.csv
@@ -0,0 +1,67 @@
+P004,P004
+P010,P010
+P011,P011
+P014,P014
+P015,P015
+P100,P100
+P101,P101
+P102,P102
+P103,P103
+P104,P104
+P105,P105
+P106,P106
+P107,P107
+P108,P108
+P109,P109
+P110,P110
+P111,P111
+P200,P200
+P201,P201
+P204,P204
+P205,P205
+P206,P206
+P212,P212
+P213,P213
+P214,P214
+P215,P215
+P300,P300
+P402,P402
+P404,P404
+P407,P407
+P409,P409
+P414,P414
+P501,P501
+P914,P914
+P915,P915
+A0,P004
+A1,P014
+A2,P015
+A3,P501
+A4,P101
+A5,P100
+SDA1,P101
+SCL1,P100
+SCK,P204
+SDA,P407
+D13,P102
+D12,P100
+D11,P101
+D10,P103
+D9,P104
+D8,P106
+D7,P212
+D6,P213
+D5,P414
+D4,P409
+D3,P105
+D2,P111
+D1,P109
+D0,P110
+SWDIO,P108
+SWO,P109
+TDI,P110
+MD,P201
+SWCLK,P300
+SW1,P402
+LED1,P106
+LED2,P404
diff --git a/ports/renesas-ra/boards/RA4W1_EK/ra4w1_ek.ld b/ports/renesas-ra/boards/RA4W1_EK/ra4w1_ek.ld
new file mode 100644
index 0000000000000..172f124fc8de3
--- /dev/null
+++ b/ports/renesas-ra/boards/RA4W1_EK/ra4w1_ek.ld
@@ -0,0 +1,298 @@
+/*
+                  Linker File for RA4W1 MCU
+*/
+
+/* Linker script to configure memory regions. */
+MEMORY
+{
+  FLASH (rx)         : ORIGIN = 0x00000000, LENGTH = 0x00080000  /* 512KB */
+  RAM (rwx)          : ORIGIN = 0x20000000, LENGTH = 0x00018000  /* 96KB */
+  DATA_FLASH (rx)    : ORIGIN = 0x40100000, LENGTH = 0x00002000  /* 8KB */
+  ID_CODE (rx)       : ORIGIN = 0x01010018, LENGTH = 0x00000020  /* 32bytes */
+}
+
+/* Library configurations */
+/*GROUP(libgcc.a libc.a libm.a libnosys.a) */
+
+/* Linker script to place sections and symbol values. Should be used together
+ * with other linker script that defines memory regions FLASH and RAM.
+ * It references following symbols, which must be defined in code:
+ *   Reset_Handler : Entry of reset handler
+ *
+ * It defines following symbols, which code can use without definition:
+ *   __exidx_start
+ *   __exidx_end
+ *   __copy_table_start__
+ *   __copy_table_end__
+ *   __zero_table_start__
+ *   __zero_table_end__
+ *   __etext
+ *   __data_start__
+ *   __preinit_array_start
+ *   __preinit_array_end
+ *   __init_array_start
+ *   __init_array_end
+ *   __fini_array_start
+ *   __fini_array_end
+ *   __data_end__
+ *   __bss_start__
+ *   __bss_end__
+ *   __end__
+ *   end
+ *   __HeapLimit
+ *   __StackLimit
+ *   __StackTop
+ *   __stack
+ *   __Vectors_End
+ *   __Vectors_Size
+ */
+ENTRY(Reset_Handler)
+
+SECTIONS
+{
+    .text :
+    {
+        _stext = .;
+        __ROM_Start = .;
+
+        /* Even though the vector table is not 256 entries (1KB) long, we still allocate that much
+         * space because ROM registers are at address 0x400 and there is very little space
+         * in between. */
+        KEEP(*(.fixed_vectors*))
+        KEEP(*(.application_vectors*))
+        __Vectors_End = .;
+        __end__ = .;
+
+        /* ROM Registers start at address 0x00000400 */
+        . = __ROM_Start + 0x400;
+        KEEP(*(.rom_registers*))
+
+        /* Reserving 0x100 bytes of space for ROM registers. */
+        . = __ROM_Start + 0x500;
+
+        *(.text*)
+
+        KEEP(*(.version))
+        KEEP(*(.init))
+        KEEP(*(.fini))
+
+        /* .ctors */
+        *crtbegin.o(.ctors)
+        *crtbegin?.o(.ctors)
+        *(EXCLUDE_FILE(*crtend?.o *crtend.o) .ctors)
+        *(SORT(.ctors.*))
+        *(.ctors)
+
+        /* .dtors */
+        *crtbegin.o(.dtors)
+        *crtbegin?.o(.dtors)
+        *(EXCLUDE_FILE(*crtend?.o *crtend.o) .dtors)
+        *(SORT(.dtors.*))
+        *(.dtors)
+
+        *(.rodata*)
+        __usb_dev_descriptor_start_fs = .;
+        KEEP(*(.usb_device_desc_fs*))
+        __usb_cfg_descriptor_start_fs = .;
+        KEEP(*(.usb_config_desc_fs*))
+        __usb_interface_descriptor_start_fs = .;
+        KEEP(*(.usb_interface_desc_fs*))
+        __usb_descriptor_end_fs = .;
+        __usb_dev_descriptor_start_hs = .;
+        KEEP(*(.usb_device_desc_hs*))
+        __usb_cfg_descriptor_start_hs = .;
+        KEEP(*(.usb_config_desc_hs*))
+        __usb_interface_descriptor_start_hs = .;
+        KEEP(*(.usb_interface_desc_hs*))
+        __usb_descriptor_end_hs = .;
+
+        KEEP(*(.eh_frame*))
+
+        __ROM_End = .;
+        _etext = .;
+    } > FLASH = 0xFF
+
+    __Vectors_Size = __Vectors_End - __Vectors;
+
+    .ARM.extab :
+    {
+        *(.ARM.extab* .gnu.linkonce.armextab.*)
+    } > FLASH
+
+    __exidx_start = .;
+    .ARM.exidx :
+    {
+        *(.ARM.exidx* .gnu.linkonce.armexidx.*)
+    } > FLASH
+    __exidx_end = .;
+
+    /* To copy multiple ROM to RAM sections,
+     * uncomment .copy.table section and,
+     * define __STARTUP_COPY_MULTIPLE in startup_ARMCMx.S */
+    /*
+    .copy.table :
+    {
+        . = ALIGN(4);
+        __copy_table_start__ = .;
+        LONG (__etext)
+        LONG (__data_start__)
+        LONG (__data_end__ - __data_start__)
+        LONG (__etext2)
+        LONG (__data2_start__)
+        LONG (__data2_end__ - __data2_start__)
+        __copy_table_end__ = .;
+    } > FLASH
+    */
+
+    /* To clear multiple BSS sections,
+     * uncomment .zero.table section and,
+     * define __STARTUP_CLEAR_BSS_MULTIPLE in startup_ARMCMx.S */
+    /*
+    .zero.table :
+    {
+        . = ALIGN(4);
+        __zero_table_start__ = .;
+        LONG (__bss_start__)
+        LONG (__bss_end__ - __bss_start__)
+        LONG (__bss2_start__)
+        LONG (__bss2_end__ - __bss2_start__)
+        __zero_table_end__ = .;
+    } > FLASH
+    */
+
+    __etext = .;
+
+    /* If DTC is used, put the DTC vector table at the start of SRAM.
+       This avoids memory holes due to 1K alignment required by it. */
+    .fsp_dtc_vector_table (NOLOAD) :
+    {
+        . = ORIGIN(RAM);
+        *(.fsp_dtc_vector_table)
+    } > RAM
+
+    /* Initialized data section. */
+    .data :
+    {
+        _sidata = .;
+        _sdata = .;
+        __data_start__ = .;
+        *(vtable)
+        *(.data.*)
+
+        . = ALIGN(4);
+        /* preinit data */
+        PROVIDE_HIDDEN (__preinit_array_start = .);
+        KEEP(*(.preinit_array))
+        PROVIDE_HIDDEN (__preinit_array_end = .);
+
+        . = ALIGN(4);
+        /* init data */
+        PROVIDE_HIDDEN (__init_array_start = .);
+        KEEP(*(SORT(.init_array.*)))
+        KEEP(*(.init_array))
+        PROVIDE_HIDDEN (__init_array_end = .);
+
+
+        . = ALIGN(4);
+        /* finit data */
+        PROVIDE_HIDDEN (__fini_array_start = .);
+        KEEP(*(SORT(.fini_array.*)))
+        KEEP(*(.fini_array))
+        PROVIDE_HIDDEN (__fini_array_end = .);
+
+        KEEP(*(.jcr*))
+        . = ALIGN(4);
+
+        __Code_In_RAM_Start = .;
+
+        KEEP(*(.code_in_ram*))
+        __Code_In_RAM_End = .;
+
+        /* All data end */
+        __data_end__ = .;
+        _edata = .;
+
+    } > RAM AT > FLASH
+
+
+
+    .noinit (NOLOAD):
+    {
+        . = ALIGN(4);
+        __noinit_start = .;
+        KEEP(*(.noinit*))
+        __noinit_end = .;
+    } > RAM
+
+    .bss :
+    {
+        . = ALIGN(4);
+        _sbss = .;
+        __bss_start__ = .;
+        *(.bss*)
+        *(COMMON)
+        . = ALIGN(4);
+        __bss_end__ = .;
+        _ebss = .;
+    } > RAM
+
+    .heap (NOLOAD):
+    {
+        . = ALIGN(8);
+        __HeapBase = .;
+        __end__ = .;
+        end = __end__;
+        KEEP(*(.heap*))
+        __HeapLimit = .;
+    } > RAM
+
+    /* Stacks are stored in this section. */
+    .stack_dummy (NOLOAD):
+    {
+        . = ALIGN(8);
+        _sstack = .;
+        __StackLimit = .;
+        /* Main stack */
+        KEEP(*(.stack))
+        __StackTop = .;
+        /* Thread stacks */
+        KEEP(*(.stack*))
+        __StackTopAll = .;
+        _estack = .;
+    } > RAM
+
+    PROVIDE(__stack = __StackTopAll);
+
+    /* This symbol represents the end of user allocated RAM. The RAM after this symbol can be used
+       at run time for things such as ThreadX memory pool allocations. */
+    __RAM_segment_used_end__ = ALIGN(__StackTopAll , 4);
+
+    /* Data flash. */
+    .data_flash :
+    {
+        __Data_Flash_Start = .;
+        KEEP(*(.data_flash*))
+        __Data_Flash_End = .;
+    } > DATA_FLASH
+
+    .id_code :
+    {
+        __ID_Code_Start = .;
+        KEEP(*(.id_code*))
+        __ID_Code_End = .;
+    } > ID_CODE
+}
+/* produce a link error if there is not this amount of RAM for these sections */
+/* _minimum_stack_size = 2K; */
+/* _minimum_heap_size = 16K; */
+
+/* Define tho top end of the stack.  The stack is full descending so begins just
+   above last byte of RAM.  Note that EABI requires the stack to be 8-byte
+   aligned for a call. */
+_estack = ORIGIN(RAM) + LENGTH(RAM);
+
+/* RAM extents for the garbage collector */
+_ram_start = ORIGIN(RAM);
+_ram_end = ORIGIN(RAM) + LENGTH(RAM);
+_heap_start = __HeapBase;	/* heap starts just after statically allocated memory */
+_heap_end = __HeapLimit;	/* tunable */
diff --git a/ports/renesas-ra/boards/RA4W1_EK/ra4w1_ek_conf.h b/ports/renesas-ra/boards/RA4W1_EK/ra4w1_ek_conf.h
new file mode 100644
index 0000000000000..261073cfe98e8
--- /dev/null
+++ b/ports/renesas-ra/boards/RA4W1_EK/ra4w1_ek_conf.h
@@ -0,0 +1,30 @@
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Renesas Electronics Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#ifndef RA4M1_EK_CONF_H
+#define RA4M1_EK_CONF_H
+
+#define DEBUG_CH    0
+
+#endif /* RA4M1_EK_CONF_H */
diff --git a/ports/renesas-ra/boards/RA4W1_EK/ra_cfg/fsp_cfg/bsp/board_cfg.h b/ports/renesas-ra/boards/RA4W1_EK/ra_cfg/fsp_cfg/bsp/board_cfg.h
new file mode 100644
index 0000000000000..fd7b0ccb8fc12
--- /dev/null
+++ b/ports/renesas-ra/boards/RA4W1_EK/ra_cfg/fsp_cfg/bsp/board_cfg.h
@@ -0,0 +1,5 @@
+/* generated configuration header file - do not edit */
+#ifndef BOARD_CFG_H_
+#define BOARD_CFG_H_
+#include "../../../ra/board/ra4w1_ek/board.h"
+#endif /* BOARD_CFG_H_ */
diff --git a/ports/renesas-ra/boards/RA4W1_EK/ra_cfg/fsp_cfg/bsp/bsp_cfg.h b/ports/renesas-ra/boards/RA4W1_EK/ra_cfg/fsp_cfg/bsp/bsp_cfg.h
new file mode 100644
index 0000000000000..9ebcbf977775f
--- /dev/null
+++ b/ports/renesas-ra/boards/RA4W1_EK/ra_cfg/fsp_cfg/bsp/bsp_cfg.h
@@ -0,0 +1,49 @@
+/* generated configuration header file - do not edit */
+#ifndef BSP_CFG_H_
+#define BSP_CFG_H_
+#include "bsp_clock_cfg.h"
+#include "bsp_mcu_family_cfg.h"
+#include "board_cfg.h"
+#define RA_NOT_DEFINED 0
+#ifndef BSP_CFG_RTOS
+#if (RA_NOT_DEFINED) != (RA_NOT_DEFINED)
+#define BSP_CFG_RTOS (2)
+#elif (RA_NOT_DEFINED) != (RA_NOT_DEFINED)
+#define BSP_CFG_RTOS (1)
+#else
+#define BSP_CFG_RTOS (0)
+#endif
+#endif
+#undef RA_NOT_DEFINED
+#define BSP_CFG_MCU_VCC_MV (3300)
+#define BSP_CFG_STACK_MAIN_BYTES (0x4000)
+#define BSP_CFG_HEAP_BYTES (0xf000)
+#define BSP_CFG_PARAM_CHECKING_ENABLE (0)
+#define BSP_CFG_ASSERT (0)
+#define BSP_CFG_ERROR_LOG (0)
+
+#define BSP_CFG_PFS_PROTECT ((1))
+
+#define BSP_CFG_C_RUNTIME_INIT ((1))
+
+#define BSP_CFG_SOFT_RESET_SUPPORTED ((0))
+
+#ifndef BSP_CLOCK_CFG_MAIN_OSC_POPULATED
+#define BSP_CLOCK_CFG_MAIN_OSC_POPULATED (0)
+#endif
+#ifndef BSP_CLOCK_CFG_MAIN_OSC_WAIT
+#define BSP_CLOCK_CFG_MAIN_OSC_WAIT (9)
+#endif
+#ifndef BSP_CLOCK_CFG_MAIN_OSC_CLOCK_SOURCE
+#define BSP_CLOCK_CFG_MAIN_OSC_CLOCK_SOURCE (0)
+#endif
+#ifndef BSP_CLOCK_CFG_SUBCLOCK_DRIVE
+#define BSP_CLOCK_CFG_SUBCLOCK_DRIVE (0)
+#endif
+#ifndef BSP_CLOCK_CFG_SUBCLOCK_POPULATED
+#define BSP_CLOCK_CFG_SUBCLOCK_POPULATED (0)
+#endif
+#ifndef BSP_CLOCK_CFG_SUBCLOCK_STABILIZATION_MS
+#define BSP_CLOCK_CFG_SUBCLOCK_STABILIZATION_MS 1000
+#endif
+#endif /* BSP_CFG_H_ */
diff --git a/ports/renesas-ra/boards/RA4W1_EK/ra_cfg/fsp_cfg/bsp/bsp_mcu_device_cfg.h b/ports/renesas-ra/boards/RA4W1_EK/ra_cfg/fsp_cfg/bsp/bsp_mcu_device_cfg.h
new file mode 100644
index 0000000000000..444d32e5606c8
--- /dev/null
+++ b/ports/renesas-ra/boards/RA4W1_EK/ra_cfg/fsp_cfg/bsp/bsp_mcu_device_cfg.h
@@ -0,0 +1,5 @@
+/* generated configuration header file - do not edit */
+#ifndef BSP_MCU_DEVICE_CFG_H_
+#define BSP_MCU_DEVICE_CFG_H_
+#define BSP_CFG_MCU_PART_SERIES (4)
+#endif /* BSP_MCU_DEVICE_CFG_H_ */
diff --git a/ports/renesas-ra/boards/RA4W1_EK/ra_cfg/fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h b/ports/renesas-ra/boards/RA4W1_EK/ra_cfg/fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h
new file mode 100644
index 0000000000000..70984c8ef6ebc
--- /dev/null
+++ b/ports/renesas-ra/boards/RA4W1_EK/ra_cfg/fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h
@@ -0,0 +1,10 @@
+/* generated configuration header file - do not edit */
+#ifndef BSP_MCU_DEVICE_PN_CFG_H_
+#define BSP_MCU_DEVICE_PN_CFG_H_
+#define BSP_MCU_R7FA4W1AD2CNG
+#define BSP_ROM_SIZE_BYTES (524288)
+#define BSP_RAM_SIZE_BYTES (98304)
+#define BSP_DATA_FLASH_SIZE_BYTES (8192)
+#define BSP_PACKAGE_QFN
+#define BSP_PACKAGE_PINS (56)
+#endif /* BSP_MCU_DEVICE_PN_CFG_H_ */
diff --git a/ports/renesas-ra/boards/RA4W1_EK/ra_cfg/fsp_cfg/bsp/bsp_mcu_family_cfg.h b/ports/renesas-ra/boards/RA4W1_EK/ra_cfg/fsp_cfg/bsp/bsp_mcu_family_cfg.h
new file mode 100644
index 0000000000000..fd26bb64e0eb5
--- /dev/null
+++ b/ports/renesas-ra/boards/RA4W1_EK/ra_cfg/fsp_cfg/bsp/bsp_mcu_family_cfg.h
@@ -0,0 +1,74 @@
+/* generated configuration header file - do not edit */
+#ifndef BSP_MCU_FAMILY_CFG_H_
+#define BSP_MCU_FAMILY_CFG_H_
+#include "bsp_mcu_device_pn_cfg.h"
+#include "bsp_mcu_device_cfg.h"
+#include "../../../ra/fsp/src/bsp/mcu/ra4w1/bsp_mcu_info.h"
+#include "bsp_clock_cfg.h"
+#define BSP_MCU_GROUP_RA4W1 (1)
+#define BSP_LOCO_HZ                 (32768)
+#define BSP_MOCO_HZ                 (8000000)
+#define BSP_SUB_CLOCK_HZ            (32768)
+#if   BSP_CFG_HOCO_FREQUENCY == 0
+#define BSP_HOCO_HZ             (24000000)
+#elif BSP_CFG_HOCO_FREQUENCY == 2
+#define BSP_HOCO_HZ             (32000000)
+#elif BSP_CFG_HOCO_FREQUENCY == 4
+#define BSP_HOCO_HZ             (48000000)
+#elif BSP_CFG_HOCO_FREQUENCY == 5
+#define BSP_HOCO_HZ             (64000000)
+#else
+#error "Invalid HOCO frequency chosen (BSP_CFG_HOCO_FREQUENCY) in bsp_clock_cfg.h"
+#endif
+#define BSP_CORTEX_VECTOR_TABLE_ENTRIES    (16U)
+#define BSP_VECTOR_TABLE_MAX_ENTRIES       (48U)
+#define BSP_MCU_VBATT_SUPPORT       (1)
+
+#define OFS_SEQ1 0xA001A001 | (1 << 1) | (3 << 2)
+#define OFS_SEQ2 (15 << 4) | (3 << 8) | (3 << 10)
+#define OFS_SEQ3 (1 << 12) | (1 << 14) | (1 << 17)
+#define OFS_SEQ4 (3 << 18) | (15 << 20) | (3 << 24) | (3 << 26)
+#define OFS_SEQ5 (1 << 28) | (1 << 30)
+#define BSP_CFG_ROM_REG_OFS0 (OFS_SEQ1 | OFS_SEQ2 | OFS_SEQ3 | OFS_SEQ4 | OFS_SEQ5)
+#define BSP_CFG_ROM_REG_OFS1 (0xFFFFFEC3 | (1 << 2) | (3 << 3) | (0 << 8))
+#define BSP_CFG_USE_LOW_VOLTAGE_MODE ((0))
+#define BSP_CFG_ROM_REG_MPU_PC0_ENABLE (1)
+#define BSP_CFG_ROM_REG_MPU_PC0_START (0x00FFFFFC)
+#define BSP_CFG_ROM_REG_MPU_PC0_END (0x00FFFFFF)
+#define BSP_CFG_ROM_REG_MPU_PC1_ENABLE (1)
+#define BSP_CFG_ROM_REG_MPU_PC1_START (0x00FFFFFC)
+#define BSP_CFG_ROM_REG_MPU_PC1_END (0x00FFFFFF)
+#define BSP_CFG_ROM_REG_MPU_REGION0_ENABLE (1)
+#define BSP_CFG_ROM_REG_MPU_REGION0_START (0x00FFFFFC)
+#define BSP_CFG_ROM_REG_MPU_REGION0_END (0x00FFFFFF)
+#define BSP_CFG_ROM_REG_MPU_REGION1_ENABLE (1)
+#define BSP_CFG_ROM_REG_MPU_REGION1_START (0x200FFFFC)
+#define BSP_CFG_ROM_REG_MPU_REGION1_END (0x200FFFFF)
+#define BSP_CFG_ROM_REG_MPU_REGION2_ENABLE (1)
+#define BSP_CFG_ROM_REG_MPU_REGION2_START (0x407FFFFC)
+#define BSP_CFG_ROM_REG_MPU_REGION2_END (0x407FFFFF)
+#define BSP_CFG_ROM_REG_MPU_REGION3_ENABLE (1)
+#define BSP_CFG_ROM_REG_MPU_REGION3_START (0x400DFFFC)
+#define BSP_CFG_ROM_REG_MPU_REGION3_END (0x400DFFFF)
+
+/* Used to create IELS values for the interrupt initialization table g_interrupt_event_link_select. */
+#define BSP_PRV_IELS_ENUM(vector)    (ELC_##vector)
+
+/*
+ ID Code
+ Note: To permanently lock and disable the debug interface define the BSP_ID_CODE_PERMANENTLY_LOCKED in the compiler settings.
+ WARNING: This will disable debug access to the part and cannot be reversed by a debug probe.
+ */
+#if defined(BSP_ID_CODE_PERMANENTLY_LOCKED)
+#define BSP_CFG_ID_CODE_LONG_1 (0x00000000)
+#define BSP_CFG_ID_CODE_LONG_2 (0x00000000)
+#define BSP_CFG_ID_CODE_LONG_3 (0x00000000)
+#define BSP_CFG_ID_CODE_LONG_4 (0x00000000)
+#else
+/* ID CODE: FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF */
+#define BSP_CFG_ID_CODE_LONG_1 (0xFFFFFFFF)
+#define BSP_CFG_ID_CODE_LONG_2 (0xFFFFFFFF)
+#define BSP_CFG_ID_CODE_LONG_3 (0xFFFFFFFF)
+#define BSP_CFG_ID_CODE_LONG_4 (0xffFFFFFF)
+#endif
+#endif /* BSP_MCU_FAMILY_CFG_H_ */
diff --git a/ports/renesas-ra/boards/RA4W1_EK/ra_cfg/fsp_cfg/r_adc_cfg.h b/ports/renesas-ra/boards/RA4W1_EK/ra_cfg/fsp_cfg/r_adc_cfg.h
new file mode 100644
index 0000000000000..9c59889ca8fee
--- /dev/null
+++ b/ports/renesas-ra/boards/RA4W1_EK/ra_cfg/fsp_cfg/r_adc_cfg.h
@@ -0,0 +1,5 @@
+/* generated configuration header file - do not edit */
+#ifndef R_ADC_CFG_H_
+#define R_ADC_CFG_H_
+#define ADC_CFG_PARAM_CHECKING_ENABLE (BSP_CFG_PARAM_CHECKING_ENABLE)
+#endif /* R_ADC_CFG_H_ */
diff --git a/ports/renesas-ra/boards/RA4W1_EK/ra_cfg/fsp_cfg/r_agt_cfg.h b/ports/renesas-ra/boards/RA4W1_EK/ra_cfg/fsp_cfg/r_agt_cfg.h
new file mode 100644
index 0000000000000..d3ab559238cbd
--- /dev/null
+++ b/ports/renesas-ra/boards/RA4W1_EK/ra_cfg/fsp_cfg/r_agt_cfg.h
@@ -0,0 +1,7 @@
+/* generated configuration header file - do not edit */
+#ifndef R_AGT_CFG_H_
+#define R_AGT_CFG_H_
+#define AGT_CFG_PARAM_CHECKING_ENABLE (BSP_CFG_PARAM_CHECKING_ENABLE)
+#define AGT_CFG_OUTPUT_SUPPORT_ENABLE (0)
+#define AGT_CFG_INPUT_SUPPORT_ENABLE (0)
+#endif /* R_AGT_CFG_H_ */
diff --git a/ports/renesas-ra/boards/RA4W1_EK/ra_cfg/fsp_cfg/r_dtc_cfg.h b/ports/renesas-ra/boards/RA4W1_EK/ra_cfg/fsp_cfg/r_dtc_cfg.h
new file mode 100644
index 0000000000000..21405f96741e2
--- /dev/null
+++ b/ports/renesas-ra/boards/RA4W1_EK/ra_cfg/fsp_cfg/r_dtc_cfg.h
@@ -0,0 +1,6 @@
+/* generated configuration header file - do not edit */
+#ifndef R_DTC_CFG_H_
+#define R_DTC_CFG_H_
+#define DTC_CFG_PARAM_CHECKING_ENABLE (BSP_CFG_PARAM_CHECKING_ENABLE)
+#define DTC_CFG_VECTOR_TABLE_SECTION_NAME ".fsp_dtc_vector_table"
+#endif /* R_DTC_CFG_H_ */
diff --git a/ports/renesas-ra/boards/RA4W1_EK/ra_cfg/fsp_cfg/r_flash_lp_cfg.h b/ports/renesas-ra/boards/RA4W1_EK/ra_cfg/fsp_cfg/r_flash_lp_cfg.h
new file mode 100644
index 0000000000000..26879f9f4e52a
--- /dev/null
+++ b/ports/renesas-ra/boards/RA4W1_EK/ra_cfg/fsp_cfg/r_flash_lp_cfg.h
@@ -0,0 +1,7 @@
+/* generated configuration header file - do not edit */
+#ifndef R_FLASH_LP_CFG_H_
+#define R_FLASH_LP_CFG_H_
+#define FLASH_LP_CFG_PARAM_CHECKING_ENABLE (BSP_CFG_PARAM_CHECKING_ENABLE)
+#define FLASH_LP_CFG_CODE_FLASH_PROGRAMMING_ENABLE (1)
+#define FLASH_LP_CFG_DATA_FLASH_PROGRAMMING_ENABLE (0)
+#endif /* R_FLASH_LP_CFG_H_ */
diff --git a/ports/renesas-ra/boards/RA4W1_EK/ra_cfg/fsp_cfg/r_icu_cfg.h b/ports/renesas-ra/boards/RA4W1_EK/ra_cfg/fsp_cfg/r_icu_cfg.h
new file mode 100644
index 0000000000000..5e77b6980f4ee
--- /dev/null
+++ b/ports/renesas-ra/boards/RA4W1_EK/ra_cfg/fsp_cfg/r_icu_cfg.h
@@ -0,0 +1,5 @@
+/* generated configuration header file - do not edit */
+#ifndef R_ICU_CFG_H_
+#define R_ICU_CFG_H_
+#define ICU_CFG_PARAM_CHECKING_ENABLE (BSP_CFG_PARAM_CHECKING_ENABLE)
+#endif /* R_ICU_CFG_H_ */
diff --git a/ports/renesas-ra/boards/RA4W1_EK/ra_cfg/fsp_cfg/r_iic_master_cfg.h b/ports/renesas-ra/boards/RA4W1_EK/ra_cfg/fsp_cfg/r_iic_master_cfg.h
new file mode 100644
index 0000000000000..595ea938d13a7
--- /dev/null
+++ b/ports/renesas-ra/boards/RA4W1_EK/ra_cfg/fsp_cfg/r_iic_master_cfg.h
@@ -0,0 +1,7 @@
+/* generated configuration header file - do not edit */
+#ifndef R_IIC_MASTER_CFG_H_
+#define R_IIC_MASTER_CFG_H_
+#define IIC_MASTER_CFG_PARAM_CHECKING_ENABLE (BSP_CFG_PARAM_CHECKING_ENABLE)
+#define IIC_MASTER_CFG_DTC_ENABLE (0)
+#define IIC_MASTER_CFG_ADDR_MODE_10_BIT_ENABLE (0)
+#endif /* R_IIC_MASTER_CFG_H_ */
diff --git a/ports/renesas-ra/boards/RA4W1_EK/ra_cfg/fsp_cfg/r_ioport_cfg.h b/ports/renesas-ra/boards/RA4W1_EK/ra_cfg/fsp_cfg/r_ioport_cfg.h
new file mode 100644
index 0000000000000..6b4353d238352
--- /dev/null
+++ b/ports/renesas-ra/boards/RA4W1_EK/ra_cfg/fsp_cfg/r_ioport_cfg.h
@@ -0,0 +1,5 @@
+/* generated configuration header file - do not edit */
+#ifndef R_IOPORT_CFG_H_
+#define R_IOPORT_CFG_H_
+#define IOPORT_CFG_PARAM_CHECKING_ENABLE (BSP_CFG_PARAM_CHECKING_ENABLE)
+#endif /* R_IOPORT_CFG_H_ */
diff --git a/ports/renesas-ra/boards/RA4W1_EK/ra_cfg/fsp_cfg/r_lpm_cfg.h b/ports/renesas-ra/boards/RA4W1_EK/ra_cfg/fsp_cfg/r_lpm_cfg.h
new file mode 100644
index 0000000000000..5f4d5c4a73627
--- /dev/null
+++ b/ports/renesas-ra/boards/RA4W1_EK/ra_cfg/fsp_cfg/r_lpm_cfg.h
@@ -0,0 +1,5 @@
+/* generated configuration header file - do not edit */
+#ifndef R_LPM_CFG_H_
+#define R_LPM_CFG_H_
+#define LPM_CFG_PARAM_CHECKING_ENABLE (BSP_CFG_PARAM_CHECKING_ENABLE)
+#endif /* R_LPM_CFG_H_ */
diff --git a/ports/renesas-ra/boards/RA4W1_EK/ra_cfg/fsp_cfg/r_rtc_cfg.h b/ports/renesas-ra/boards/RA4W1_EK/ra_cfg/fsp_cfg/r_rtc_cfg.h
new file mode 100644
index 0000000000000..484b7ed044c26
--- /dev/null
+++ b/ports/renesas-ra/boards/RA4W1_EK/ra_cfg/fsp_cfg/r_rtc_cfg.h
@@ -0,0 +1,5 @@
+/* generated configuration header file - do not edit */
+#ifndef R_RTC_CFG_H_
+#define R_RTC_CFG_H_
+#define RTC_CFG_PARAM_CHECKING_ENABLE (BSP_CFG_PARAM_CHECKING_ENABLE)
+#endif /* R_RTC_CFG_H_ */
diff --git a/ports/renesas-ra/boards/RA4W1_EK/ra_cfg/fsp_cfg/r_sci_uart_cfg.h b/ports/renesas-ra/boards/RA4W1_EK/ra_cfg/fsp_cfg/r_sci_uart_cfg.h
new file mode 100644
index 0000000000000..c70c0be344f9d
--- /dev/null
+++ b/ports/renesas-ra/boards/RA4W1_EK/ra_cfg/fsp_cfg/r_sci_uart_cfg.h
@@ -0,0 +1,8 @@
+/* generated configuration header file - do not edit */
+#ifndef R_SCI_UART_CFG_H_
+#define R_SCI_UART_CFG_H_
+#define SCI_UART_CFG_PARAM_CHECKING_ENABLE (BSP_CFG_PARAM_CHECKING_ENABLE)
+#define SCI_UART_CFG_FIFO_SUPPORT (0)
+#define SCI_UART_CFG_DTC_SUPPORTED (0)
+#define SCI_UART_CFG_FLOW_CONTROL_SUPPORT (0)
+#endif /* R_SCI_UART_CFG_H_ */
diff --git a/ports/renesas-ra/boards/RA4W1_EK/ra_cfg/fsp_cfg/r_spi_cfg.h b/ports/renesas-ra/boards/RA4W1_EK/ra_cfg/fsp_cfg/r_spi_cfg.h
new file mode 100644
index 0000000000000..861fe12194f63
--- /dev/null
+++ b/ports/renesas-ra/boards/RA4W1_EK/ra_cfg/fsp_cfg/r_spi_cfg.h
@@ -0,0 +1,7 @@
+/* generated configuration header file - do not edit */
+#ifndef R_SPI_CFG_H_
+#define R_SPI_CFG_H_
+#define SPI_CFG_PARAM_CHECKING_ENABLE (BSP_CFG_PARAM_CHECKING_ENABLE)
+#define SPI_DTC_SUPPORT_ENABLE (1)
+#define SPI_TRANSMIT_FROM_RXI_ISR (0)
+#endif /* R_SPI_CFG_H_ */
diff --git a/ports/renesas-ra/boards/RA4W1_EK/ra_gen/RA4W1-EK.csv b/ports/renesas-ra/boards/RA4W1_EK/ra_gen/RA4W1-EK.csv
new file mode 100644
index 0000000000000..b686a5c0c9714
--- /dev/null
+++ b/ports/renesas-ra/boards/RA4W1_EK/ra_gen/RA4W1-EK.csv
@@ -0,0 +1,257 @@
+"Name","Pin","Function","Drive Capacity","IRQ","Mode","Output type","Pull up","Port Capabilities"
+"ANT","30","RADIO0_ANT","","","","","",""
+"AVCC0","35","ANALOG0_AVCC0","","","","","",""
+"AVDDRF","39","RADIO0_AVDDRF","","","","","",""
+"AVSS0","36","ANALOG0_AVSS0","","","","","",""
+"FBIN","45","RADIO0_FBIN","","","","","",""
+"LX","41","RADIO0_LX","","","","","",""
+"P004","40","","","","Disabled","","","ADC0: AN04
+ICU0: IRQ03
+OPAMP2: AMPO"
+"P010","38","","","","Disabled","","","ADC0: AN05
+CTSU0: TS30
+ICU0: IRQ14
+OPAMP2: AMP-"
+"P011","37","","","","Disabled","","","ADC0: AN06
+CTSU0: TS31
+ICU0: IRQ15
+OPAMP2: AMP+"
+"P014","32","","","","Disabled","","","ADC0: AN09
+DAC0: DA"
+"P015","31","","","","Disabled","","","ADC0: AN10
+CTSU0: TS28
+ICU0: IRQ07"
+"P100","27","SPI0_MISO","Low","None","Peripheral mode","CMOS","None","ACMPLP0: CMPIN
+AGT0: AGTIO
+BUS_ASYNCH0: D00
+GPT_POEG0: GTETRG
+GPT5: GTIOCB
+ICU0: IRQ02
+IIC1: SCL
+KINT0: KRM0
+SCI0: RXD
+SCI0: SCL
+SCI1: SCK
+SLCDC0: VL1
+SPI0: MISO"
+"P101","26","SPI0_MOSI","Low","None","Peripheral mode","CMOS","None","ACMPLP0: CMPREF
+AGT0: AGTEE
+BUS_ASYNCH0: D01
+GPT_POEG1: GTETRG
+GPT5: GTIOCA
+ICU0: IRQ01
+IIC1: SDA
+KINT0: KRM1
+SCI0: SDA
+SCI0: TXD
+SCI1: CTS
+SLCDC0: VL2
+SPI0: MOSI"
+"P102","25","SPI0_RSPCK","Low","","Peripheral mode","CMOS","None","ACMPLP1: CMPIN
+ADC0: ADTRG
+ADC0: AN20
+AGT0: AGTO
+BUS_ASYNCH0: D02
+CAN0: CRX
+GPT_OPS0: GTOWLO
+GPT2: GTIOCB
+KINT0: KRM2
+SCI0: SCK
+SLCDC0: VL3
+SPI0: RSPCK"
+"P103","24","GPIO","Low","","Output mode (Initial High)","CMOS","","ACMPLP1: CMPREF
+ADC0: AN19
+BUS_ASYNCH0: D03
+CAN0: CTX
+GPT_OPS0: GTOWUP
+GPT2: GTIOCA
+KINT0: KRM3
+SCI0: CTS
+SLCDC0: VL4
+SPI0: SSL0"
+"P104","23","","","","Disabled","","","BUS_ASYNCH0: D04
+CTSU0: TS13
+GPT_POEG1: GTETRG
+GPT1: GTIOCB
+ICU0: IRQ01
+KINT0: KRM4
+SCI0: RXD
+SCI0: SCL
+SLCDC0: COM0
+SPI0: SSL1"
+"P105","22","","","","Disabled","","","BUS_ASYNCH0: D05
+CTSU0: TS34
+GPT_POEG0: GTETRG
+GPT1: GTIOCA
+ICU0: IRQ00
+KINT0: KRM5
+SLCDC0: COM1
+SPI0: SSL2"
+"P106","21","GPIO","Low","","Output mode (Initial High)","CMOS","","BUS_ASYNCH0: D06
+GPT8: GTIOCB
+KINT0: KRM6
+SLCDC0: COM2
+SPI0: SSL3"
+"P107","20","","","","Disabled","","","BUS_ASYNCH0: D07
+GPT8: GTIOCA
+KINT0: KRM7
+SLCDC0: COM3"
+"P108","14","","","","Disabled","","","DEBUG0: SWDIO
+DEBUG0: TMS
+GPT_OPS0: GTOULO
+GPT0: GTIOCB
+SCI9: CTS
+SPI1: SSL0"
+"P109","15","SCI9_TXD","Low","","Peripheral mode","CMOS","None","CAN0: CTX
+CGC0: CLKOUT
+CTSU0: TS10
+DEBUG0: TDO
+DEBUG0: TRACESWO
+GPT_OPS0: GTOVUP
+GPT1: GTIOCA
+SCI1: SCK
+SCI9: SDA
+SCI9: TXD
+SLCDC0: SEG52
+SPI1: MOSI"
+"P110","16","SCI9_RXD","Low","None","Peripheral mode","CMOS","None","ACMP(0-1): VCOUT
+CAN0: CRX
+DEBUG0: TDI
+GPT_OPS0: GTOVLO
+GPT1: GTIOCB
+ICU0: IRQ03
+SCI9: RXD
+SCI9: SCL
+SLCDC0: SEG53
+SPI1: MISO"
+"P111","17","GPIO","Low","None","Output mode (Initial High)","CMOS","","BUS_ASYNCH0: A05
+CTSU0: TS12
+GPT3: GTIOCA
+ICU0: IRQ04
+SCI9: SCK
+SLCDC0: CAPH
+SPI1: RSPCK"
+"P200","12","","","","Disabled","","","ICU0: NMI"
+"P201","11","","","","Disabled","","","SYSTEM0: MD
+SYSTEM0: VCC
+SYSTEM0: VCC
+SYSTEM0: VCC
+SYSTEM0: VCC
+SYSTEM0: VCC
+SYSTEM0: VCC
+SYSTEM0: VCC"
+"P204","9","GPIO","Low","","Output mode (Initial High)","CMOS","","AGT1: AGTIO
+BUS_ASYNCH0: A18
+CAC0: CACREF
+CTSU0: TS00
+GPT_OPS0: GTIW
+GPT4: GTIOCB
+IIC0: SCL
+SCI4: SCK
+SCI9: SCK
+SDHI0: DAT4
+SLCDC0: SEG23
+SPI1: RSPCK
+USB_FS0: OVRCURB"
+"P205","8","SCI4_TXD","Low","None","Peripheral mode","CMOS","None","AGT1: AGTO
+BUS_ASYNCH0: A16
+CGC0: CLKOUT
+CTSU0: TSCAP
+GPT_OPS0: GTIV
+GPT4: GTIOCA
+ICU0: IRQ01
+IIC1: SCL
+SCI4: SDA
+SCI4: TXD
+SCI9: CTS
+SDHI0: DAT3
+SLCDC0: SEG20
+SPI1: SSL0
+USB_FS0: OVRCURA"
+"P206","7","SCI4_RXD","Low","None","Peripheral mode","CMOS","None","BUS_ASYNCH0: WAIT
+CTSU0: TS01
+GPT_OPS0: GTIU
+ICU0: IRQ00
+IIC1: SDA
+SCI4: RXD
+SCI4: SCL
+SDHI0: DAT2
+SLCDC0: SEG12
+SPI1: SSL1
+USB_FS0: VBUSEN"
+"P212","53","SCI1_RXD","","None","Peripheral mode","CMOS","None","AGT1: AGTEE
+CGC0: EXTAL
+GPT_POEG1: GTETRG
+GPT0: GTIOCB
+ICU0: IRQ03
+SCI1: RXD
+SCI1: SCL"
+"P213","52","SCI1_TXD","","None","Peripheral mode","CMOS","None","CGC0: XTAL
+GPT_POEG0: GTETRG
+GPT0: GTIOCA
+ICU0: IRQ02
+SCI1: SDA
+SCI1: TXD"
+"P214","50","","","","Disabled","","","CGC0: XCOUT"
+"P215","49","","","","Disabled","","","CGC0: XCIN"
+"P300","13","","","","Disabled","","","DEBUG0: SWCLK
+DEBUG0: TCK
+GPT_OPS0: GTOUUP
+GPT0: GTIOCA
+SPI1: SSL1"
+"P305","","","","","Disabled","","",""
+"P402","44","IRQ0_IRQ04","","IRQ04","IRQ mode","","None","AGT0: AGTIO
+AGT1: AGTIO
+CAN0: CRX
+CTSU0: TS18
+ICU0: IRQ04
+RTC0: RTCIC0
+SCI1: RXD
+SCI1: SCL
+SLCDC0: SEG06"
+"P404","46","GPIO","Low","","Output mode (Initial High)","CMOS","","GPT3: GTIOCB
+RTC0: RTCIC2
+SSI0: SSIWS"
+"P407","1","","","","Disabled","","","ADC0: ADTRG
+AGT0: AGTIO
+CTSU0: TS03
+IIC0: SDA
+RTC0: RTCOUT
+SCI4: CTS
+SLCDC0: SEG11
+SPI1: SSL3
+USBFS0: VBUS"
+"P409","56","","","","Disabled","","","GPT_OPS0: GTOWUP
+GPT5: GTIOCA
+ICU0: IRQ06
+SLCDC0: SEG09"
+"P414","55","","","","Disabled","","","GPT0: GTIOCB
+ICU0: IRQ09
+SDHI0: WP
+SPI0: SSL1"
+"P501","29","","","","Disabled","","","ACMPLP1: CMPIN
+ADC0: AN17
+AGT0: AGTOB
+GPT_OPS0: GTIV
+GPT2: GTIOCB
+ICU0: IRQ11
+QSPI0: QSSL
+SLCDC0: SEG49
+USB_FS0: OVRCURA"
+"P914","4","","","","Disabled","","","USB_FS0: DP"
+"P915","3","","","","Disabled","","","USB_FS0: DM"
+"Q1","34","RADIO0_Q1","","","","","",""
+"Q2","33","RADIO0_Q2","","","","","",""
+"RES#","10","SYSTEM0_RES","","","","","",""
+"TEST0","28","RADIO0_TEST0","","","","","",""
+"VBATT","47","SYSTEM0_VBATT","","","","","",""
+"VCC","18","SYSTEM0_VCC","","","","","",""
+"VCC","54","SYSTEM0_VCC","","","","","",""
+"VCCUSB","5","USBFS0_VCC","","","","","",""
+"VCCUSBLDO","6","USBFS0_VCCLDO","","","","","",""
+"VCL","48","SYSTEM0_VCL","","","","","",""
+"VDDDIG","43","RADIO0_VDDDIG","","","","","",""
+"VDDRF","42","RADIO0_VDDRF","","","","","",""
+"VSS","19","SYSTEM0_VSS","","","","","",""
+"VSS","51","SYSTEM0_VSS","","","","","",""
+"VSSUSB","2","USBFS0_VSS","","","","","",""
diff --git a/ports/renesas-ra/boards/RA4W1_EK/ra_gen/bsp_clock_cfg.h b/ports/renesas-ra/boards/RA4W1_EK/ra_gen/bsp_clock_cfg.h
new file mode 100644
index 0000000000000..9432ad009c5c0
--- /dev/null
+++ b/ports/renesas-ra/boards/RA4W1_EK/ra_gen/bsp_clock_cfg.h
@@ -0,0 +1,23 @@
+/* generated configuration header file - do not edit */
+#ifndef BSP_CLOCK_CFG_H_
+#define BSP_CLOCK_CFG_H_
+#define BSP_CFG_CLOCKS_SECURE (0)
+#define BSP_CFG_CLOCKS_OVERRIDE (0)
+#define BSP_CFG_XTAL_HZ (8000000) /* XTAL 8000000Hz */
+#define BSP_CFG_PLL_SOURCE (BSP_CLOCKS_SOURCE_CLOCK_MAIN_OSC) /* PLL Src: XTAL */
+#define BSP_CFG_HOCO_FREQUENCY (4) /* HOCO 48MHz */
+#define BSP_CFG_PLL_DIV (BSP_CLOCKS_PLL_DIV_2) /* PLL Div /2 */
+#define BSP_CFG_PLL_MUL (BSP_CLOCKS_PLL_MUL_12_0) /* PLL Mul x12 */
+#define BSP_CFG_CLOCK_SOURCE (BSP_CLOCKS_SOURCE_CLOCK_HOCO) /* Clock Src: HOCO */
+#define BSP_CFG_ICLK_DIV (BSP_CLOCKS_SYS_CLOCK_DIV_1) /* ICLK Div /1 */
+#define BSP_CFG_PCLKA_DIV (BSP_CLOCKS_SYS_CLOCK_DIV_1) /* PCLKA Div /1 */
+#define BSP_CFG_PCLKB_DIV (BSP_CLOCKS_SYS_CLOCK_DIV_2) /* PCLKB Div /2 */
+#define BSP_CFG_PCLKC_DIV (BSP_CLOCKS_SYS_CLOCK_DIV_1) /* PCLKC Div /1 */
+#define BSP_CFG_PCLKD_DIV (BSP_CLOCKS_SYS_CLOCK_DIV_1) /* PCLKD Div /1 */
+#define BSP_CFG_BCLK_DIV (BSP_CLOCKS_SYS_CLOCK_DIV_2) /* BCLK Div /2 */
+#define BSP_CFG_BCLK_OUTPUT (2) /* BCK/2 */
+#define BSP_CFG_FCLK_DIV (BSP_CLOCKS_SYS_CLOCK_DIV_2) /* FCLK Div /2 */
+#define BSP_CFG_CLKOUT_SOURCE (BSP_CLOCKS_CLOCK_DISABLED) /* CLKOUT Disabled */
+#define BSP_CFG_CLKOUT_DIV (BSP_CLOCKS_SYS_CLOCK_DIV_1) /* CLKOUT Div /1 */
+#define BSP_CFG_UCK_SOURCE (BSP_CLOCKS_SOURCE_CLOCK_HOCO) /* UCLK Src: HOCO */
+#endif /* BSP_CLOCK_CFG_H_ */
diff --git a/ports/renesas-ra/boards/RA4W1_EK/ra_gen/bsp_pin_cfg.h b/ports/renesas-ra/boards/RA4W1_EK/ra_gen/bsp_pin_cfg.h
new file mode 100644
index 0000000000000..497c92d06e32b
--- /dev/null
+++ b/ports/renesas-ra/boards/RA4W1_EK/ra_gen/bsp_pin_cfg.h
@@ -0,0 +1,7 @@
+/* generated configuration header file - do not edit */
+#ifndef BSP_PIN_CFG_H_
+#define BSP_PIN_CFG_H_
+#include "bsp_api.h"
+#include "r_ioport_api.h"
+extern const ioport_cfg_t g_bsp_pin_cfg; /* RA4W1-EK.pincfg */
+#endif /* BSP_PIN_CFG_H_ */
diff --git a/ports/renesas-ra/boards/RA4W1_EK/ra_gen/common_data.c b/ports/renesas-ra/boards/RA4W1_EK/ra_gen/common_data.c
new file mode 100644
index 0000000000000..34aad762ff245
--- /dev/null
+++ b/ports/renesas-ra/boards/RA4W1_EK/ra_gen/common_data.c
@@ -0,0 +1,7 @@
+/* generated common source file - do not edit */
+#include "common_data.h"
+ioport_instance_ctrl_t g_ioport_ctrl;
+const ioport_instance_t g_ioport =
+{ .p_api = &g_ioport_on_ioport, .p_ctrl = &g_ioport_ctrl, .p_cfg = &g_bsp_pin_cfg, };
+void g_common_init(void) {
+}
diff --git a/ports/renesas-ra/boards/RA4W1_EK/ra_gen/common_data.h b/ports/renesas-ra/boards/RA4W1_EK/ra_gen/common_data.h
new file mode 100644
index 0000000000000..e2eb70836ba79
--- /dev/null
+++ b/ports/renesas-ra/boards/RA4W1_EK/ra_gen/common_data.h
@@ -0,0 +1,16 @@
+/* generated common header file - do not edit */
+#ifndef COMMON_DATA_H_
+#define COMMON_DATA_H_
+#include <stdint.h>
+#include "bsp_api.h"
+#include "r_ioport.h"
+#include "bsp_pin_cfg.h"
+FSP_HEADER
+/* IOPORT Instance */
+extern const ioport_instance_t g_ioport;
+
+/* IOPORT control structure. */
+extern ioport_instance_ctrl_t g_ioport_ctrl;
+void g_common_init(void);
+FSP_FOOTER
+#endif /* COMMON_DATA_H_ */
diff --git a/ports/renesas-ra/boards/RA4W1_EK/ra_gen/hal_data.c b/ports/renesas-ra/boards/RA4W1_EK/ra_gen/hal_data.c
new file mode 100644
index 0000000000000..8e7ee1bd4aa13
--- /dev/null
+++ b/ports/renesas-ra/boards/RA4W1_EK/ra_gen/hal_data.c
@@ -0,0 +1,624 @@
+/* generated HAL source file - do not edit */
+#include "hal_data.h"
+/* Macros to tie dynamic ELC links to ADC_TRIGGER_SYNC_ELC option in adc_trigger_t. */
+#define ADC_TRIGGER_ADC0        ADC_TRIGGER_SYNC_ELC
+#define ADC_TRIGGER_ADC0_B      ADC_TRIGGER_SYNC_ELC
+#define ADC_TRIGGER_ADC1        ADC_TRIGGER_SYNC_ELC
+#define ADC_TRIGGER_ADC1_B      ADC_TRIGGER_SYNC_ELC
+adc_instance_ctrl_t g_adc0_ctrl;
+const adc_extended_cfg_t g_adc0_cfg_extend =
+{ .add_average_count = ADC_ADD_OFF,
+  .clearing = ADC_CLEAR_AFTER_READ_ON,
+  .trigger_group_b = ADC_TRIGGER_SYNC_ELC,
+  .double_trigger_mode = ADC_DOUBLE_TRIGGER_DISABLED,
+  .adc_vref_control = ADC_VREF_CONTROL_VREFH, };
+const adc_cfg_t g_adc0_cfg =
+{ .unit = 0, .mode = ADC_MODE_SINGLE_SCAN, .resolution = ADC_RESOLUTION_14_BIT, .alignment =
+      (adc_alignment_t)ADC_ALIGNMENT_RIGHT,
+  .trigger = ADC_TRIGGER_SOFTWARE, .p_callback = NULL, .p_context = NULL, .p_extend = &g_adc0_cfg_extend,
+  #if defined(VECTOR_NUMBER_ADC0_SCAN_END)
+  .scan_end_irq = VECTOR_NUMBER_ADC0_SCAN_END,
+  #else
+  .scan_end_irq = FSP_INVALID_VECTOR,
+  #endif
+  .scan_end_ipl = (BSP_IRQ_DISABLED),
+  #if defined(VECTOR_NUMBER_ADC0_SCAN_END_B)
+  .scan_end_b_irq = VECTOR_NUMBER_ADC0_SCAN_END_B,
+  #else
+  .scan_end_b_irq = FSP_INVALID_VECTOR,
+  #endif
+  .scan_end_b_ipl = (BSP_IRQ_DISABLED), };
+const adc_channel_cfg_t g_adc0_channel_cfg =
+{ .scan_mask = 0,
+  .scan_mask_group_b = 0,
+  .priority_group_a = ADC_GROUP_A_PRIORITY_OFF,
+  .add_mask = 0,
+  .sample_hold_mask = 0,
+  .sample_hold_states = 24, };
+/* Instance structure to use this module. */
+const adc_instance_t g_adc0 =
+{ .p_ctrl = &g_adc0_ctrl, .p_cfg = &g_adc0_cfg, .p_channel_cfg = &g_adc0_channel_cfg, .p_api = &g_adc_on_adc };
+iic_master_instance_ctrl_t g_i2c_master0_ctrl;
+const iic_master_extended_cfg_t g_i2c_master0_extend =
+{ .timeout_mode = IIC_MASTER_TIMEOUT_MODE_SHORT,
+/* Actual calculated bitrate: 99272. Actual calculated duty cycle: 49%. */ .clock_settings.brl_value = 27,
+  .clock_settings.brh_value = 26, .clock_settings.cks_value = 2, };
+const i2c_master_cfg_t g_i2c_master0_cfg =
+{ .channel = 0, .rate = I2C_MASTER_RATE_STANDARD, .slave = 0x00, .addr_mode = I2C_MASTER_ADDR_MODE_7BIT,
+#define RA_NOT_DEFINED (1)
+  #if (RA_NOT_DEFINED == RA_NOT_DEFINED)
+  .p_transfer_tx = NULL,
+  #else
+  .p_transfer_tx = &RA_NOT_DEFINED,
+  #endif
+  #if (RA_NOT_DEFINED == RA_NOT_DEFINED)
+  .p_transfer_rx = NULL,
+  #else
+  .p_transfer_rx = &RA_NOT_DEFINED,
+  #endif
+#undef RA_NOT_DEFINED
+  .p_callback = callback_iic,
+  .p_context = NULL,
+  #if defined(VECTOR_NUMBER_IIC0_RXI)
+  .rxi_irq = VECTOR_NUMBER_IIC0_RXI,
+  #else
+  .rxi_irq = FSP_INVALID_VECTOR,
+  #endif
+  #if defined(VECTOR_NUMBER_IIC0_TXI)
+  .txi_irq = VECTOR_NUMBER_IIC0_TXI,
+  #else
+  .txi_irq = FSP_INVALID_VECTOR,
+  #endif
+  #if defined(VECTOR_NUMBER_IIC0_TEI)
+  .tei_irq = VECTOR_NUMBER_IIC0_TEI,
+  #else
+  .tei_irq = FSP_INVALID_VECTOR,
+  #endif
+  #if defined(VECTOR_NUMBER_IIC0_ERI)
+  .eri_irq = VECTOR_NUMBER_IIC0_ERI,
+  #else
+  .eri_irq = FSP_INVALID_VECTOR,
+  #endif
+  .ipl = (12),
+  .p_extend = &g_i2c_master0_extend, };
+/* Instance structure to use this module. */
+const i2c_master_instance_t g_i2c_master0 =
+{ .p_ctrl = &g_i2c_master0_ctrl, .p_cfg = &g_i2c_master0_cfg, .p_api = &g_i2c_master_on_iic };
+lpm_instance_ctrl_t g_lpm0_ctrl;
+
+const lpm_cfg_t g_lpm0_cfg =
+{ .low_power_mode = LPM_MODE_SLEEP,
+  .snooze_cancel_sources = LPM_SNOOZE_CANCEL_SOURCE_NONE,
+  .standby_wake_sources = LPM_STANDBY_WAKE_SOURCE_RTCALM | (lpm_standby_wake_source_t)0,
+  .snooze_request_source = LPM_SNOOZE_REQUEST_RXD0_FALLING,
+  .snooze_end_sources = (lpm_snooze_end_t)0,
+  .dtc_state_in_snooze = LPM_SNOOZE_DTC_DISABLE,
+  #if BSP_FEATURE_LPM_HAS_SBYCR_OPE
+  .output_port_enable = LPM_OUTPUT_PORT_ENABLE_RETAIN,
+  #endif
+  #if BSP_FEATURE_LPM_HAS_DEEP_STANDBY
+  .io_port_state = 0,
+  .power_supply_state = 0,
+  .deep_standby_cancel_source = (lpm_deep_standby_cancel_source_t)0,
+  .deep_standby_cancel_edge = (lpm_deep_standby_cancel_edge_t)0,
+  #endif
+  .p_extend = NULL, };
+
+const lpm_instance_t g_lpm0 =
+{ .p_api = &g_lpm_on_lpm, .p_ctrl = &g_lpm0_ctrl, .p_cfg = &g_lpm0_cfg };
+dtc_instance_ctrl_t g_transfer1_ctrl;
+
+transfer_info_t g_transfer1_info =
+{ .dest_addr_mode = TRANSFER_ADDR_MODE_INCREMENTED,
+  .repeat_area = TRANSFER_REPEAT_AREA_DESTINATION,
+  .irq = TRANSFER_IRQ_END,
+  .chain_mode = TRANSFER_CHAIN_MODE_DISABLED,
+  .src_addr_mode = TRANSFER_ADDR_MODE_FIXED,
+  .size = TRANSFER_SIZE_2_BYTE,
+  .mode = TRANSFER_MODE_NORMAL,
+  .p_dest = (void *)NULL,
+  .p_src = (void const *)NULL,
+  .num_blocks = 0,
+  .length = 0, };
+const dtc_extended_cfg_t g_transfer1_cfg_extend =
+{ .activation_source = VECTOR_NUMBER_SPI0_RXI, };
+const transfer_cfg_t g_transfer1_cfg =
+{ .p_info = &g_transfer1_info, .p_extend = &g_transfer1_cfg_extend, };
+
+/* Instance structure to use this module. */
+const transfer_instance_t g_transfer1 =
+{ .p_ctrl = &g_transfer1_ctrl, .p_cfg = &g_transfer1_cfg, .p_api = &g_transfer_on_dtc };
+dtc_instance_ctrl_t g_transfer0_ctrl;
+
+transfer_info_t g_transfer0_info =
+{ .dest_addr_mode = TRANSFER_ADDR_MODE_FIXED,
+  .repeat_area = TRANSFER_REPEAT_AREA_SOURCE,
+  .irq = TRANSFER_IRQ_END,
+  .chain_mode = TRANSFER_CHAIN_MODE_DISABLED,
+  .src_addr_mode = TRANSFER_ADDR_MODE_INCREMENTED,
+  .size = TRANSFER_SIZE_2_BYTE,
+  .mode = TRANSFER_MODE_NORMAL,
+  .p_dest = (void *)NULL,
+  .p_src = (void const *)NULL,
+  .num_blocks = 0,
+  .length = 0, };
+const dtc_extended_cfg_t g_transfer0_cfg_extend =
+{ .activation_source = VECTOR_NUMBER_SPI0_TXI, };
+const transfer_cfg_t g_transfer0_cfg =
+{ .p_info = &g_transfer0_info, .p_extend = &g_transfer0_cfg_extend, };
+
+/* Instance structure to use this module. */
+const transfer_instance_t g_transfer0 =
+{ .p_ctrl = &g_transfer0_ctrl, .p_cfg = &g_transfer0_cfg, .p_api = &g_transfer_on_dtc };
+spi_instance_ctrl_t g_spi0_ctrl;
+
+/** SPI extended configuration for SPI HAL driver */
+const spi_extended_cfg_t g_spi0_ext_cfg =
+{ .spi_clksyn = SPI_SSL_MODE_CLK_SYN,
+  .spi_comm = SPI_COMMUNICATION_FULL_DUPLEX,
+  .ssl_polarity = SPI_SSLP_LOW,
+  .ssl_select = SPI_SSL_SELECT_SSL0,
+  .mosi_idle = SPI_MOSI_IDLE_VALUE_FIXING_DISABLE,
+  .parity = SPI_PARITY_MODE_DISABLE,
+  .byte_swap = SPI_BYTE_SWAP_DISABLE,
+  .spck_div =
+  {
+      /* Actual calculated bitrate: 12000000. */ .spbr = 1,
+      .brdv = 0
+  },
+  .spck_delay = SPI_DELAY_COUNT_1,
+  .ssl_negation_delay = SPI_DELAY_COUNT_1,
+  .next_access_delay = SPI_DELAY_COUNT_1 };
+
+/** SPI configuration for SPI HAL driver */
+const spi_cfg_t g_spi0_cfg =
+{ .channel = 0,
+
+  #if defined(VECTOR_NUMBER_SPI0_RXI)
+  .rxi_irq = VECTOR_NUMBER_SPI0_RXI,
+  #else
+  .rxi_irq = FSP_INVALID_VECTOR,
+  #endif
+  #if defined(VECTOR_NUMBER_SPI0_TXI)
+  .txi_irq = VECTOR_NUMBER_SPI0_TXI,
+  #else
+  .txi_irq = FSP_INVALID_VECTOR,
+  #endif
+  #if defined(VECTOR_NUMBER_SPI0_TEI)
+  .tei_irq = VECTOR_NUMBER_SPI0_TEI,
+  #else
+  .tei_irq = FSP_INVALID_VECTOR,
+  #endif
+  #if defined(VECTOR_NUMBER_SPI0_ERI)
+  .eri_irq = VECTOR_NUMBER_SPI0_ERI,
+  #else
+  .eri_irq = FSP_INVALID_VECTOR,
+  #endif
+
+  .rxi_ipl = (12),
+  .txi_ipl = (12),
+  .tei_ipl = (12),
+  .eri_ipl = (12),
+
+  .operating_mode = SPI_MODE_MASTER,
+
+  .clk_phase = SPI_CLK_PHASE_EDGE_ODD,
+  .clk_polarity = SPI_CLK_POLARITY_LOW,
+
+  .mode_fault = SPI_MODE_FAULT_ERROR_DISABLE,
+  .bit_order = SPI_BIT_ORDER_MSB_FIRST,
+  .p_transfer_tx = g_spi0_P_TRANSFER_TX,
+  .p_transfer_rx = g_spi0_P_TRANSFER_RX,
+  .p_callback = spi_callback,
+
+  .p_context = NULL,
+  .p_extend = (void *)&g_spi0_ext_cfg, };
+
+/* Instance structure to use this module. */
+const spi_instance_t g_spi0 =
+{ .p_ctrl = &g_spi0_ctrl, .p_cfg = &g_spi0_cfg, .p_api = &g_spi_on_spi };
+icu_instance_ctrl_t g_external_irq4_ctrl;
+const external_irq_cfg_t g_external_irq4_cfg =
+{ .channel = 4,
+  .trigger = EXTERNAL_IRQ_TRIG_RISING,
+  .filter_enable = false,
+  .pclk_div = EXTERNAL_IRQ_PCLK_DIV_BY_64,
+  .p_callback = callback_icu,
+  .p_context = NULL,
+  .p_extend = NULL,
+  .ipl = (12),
+  #if defined(VECTOR_NUMBER_ICU_IRQ4)
+  .irq = VECTOR_NUMBER_ICU_IRQ4,
+  #else
+  .irq = FSP_INVALID_VECTOR,
+  #endif
+};
+/* Instance structure to use this module. */
+const external_irq_instance_t g_external_irq4 =
+{ .p_ctrl = &g_external_irq4_ctrl, .p_cfg = &g_external_irq4_cfg, .p_api = &g_external_irq_on_icu };
+icu_instance_ctrl_t g_external_irq3_ctrl;
+const external_irq_cfg_t g_external_irq3_cfg =
+{ .channel = 3,
+  .trigger = EXTERNAL_IRQ_TRIG_RISING,
+  .filter_enable = false,
+  .pclk_div = EXTERNAL_IRQ_PCLK_DIV_BY_64,
+  .p_callback = callback_icu,
+  .p_context = NULL,
+  .p_extend = NULL,
+  .ipl = (12),
+  #if defined(VECTOR_NUMBER_ICU_IRQ3)
+  .irq = VECTOR_NUMBER_ICU_IRQ3,
+  #else
+  .irq = FSP_INVALID_VECTOR,
+  #endif
+};
+/* Instance structure to use this module. */
+const external_irq_instance_t g_external_irq3 =
+{ .p_ctrl = &g_external_irq3_ctrl, .p_cfg = &g_external_irq3_cfg, .p_api = &g_external_irq_on_icu };
+icu_instance_ctrl_t g_external_irq2_ctrl;
+const external_irq_cfg_t g_external_irq2_cfg =
+{ .channel = 2,
+  .trigger = EXTERNAL_IRQ_TRIG_RISING,
+  .filter_enable = false,
+  .pclk_div = EXTERNAL_IRQ_PCLK_DIV_BY_64,
+  .p_callback = callback_icu,
+  .p_context = NULL,
+  .p_extend = NULL,
+  .ipl = (12),
+  #if defined(VECTOR_NUMBER_ICU_IRQ2)
+  .irq = VECTOR_NUMBER_ICU_IRQ2,
+  #else
+  .irq = FSP_INVALID_VECTOR,
+  #endif
+};
+/* Instance structure to use this module. */
+const external_irq_instance_t g_external_irq2 =
+{ .p_ctrl = &g_external_irq2_ctrl, .p_cfg = &g_external_irq2_cfg, .p_api = &g_external_irq_on_icu };
+icu_instance_ctrl_t g_external_irq1_ctrl;
+const external_irq_cfg_t g_external_irq1_cfg =
+{ .channel = 1,
+  .trigger = EXTERNAL_IRQ_TRIG_RISING,
+  .filter_enable = false,
+  .pclk_div = EXTERNAL_IRQ_PCLK_DIV_BY_64,
+  .p_callback = callback_icu,
+  .p_context = NULL,
+  .p_extend = NULL,
+  .ipl = (12),
+  #if defined(VECTOR_NUMBER_ICU_IRQ1)
+  .irq = VECTOR_NUMBER_ICU_IRQ1,
+  #else
+  .irq = FSP_INVALID_VECTOR,
+  #endif
+};
+/* Instance structure to use this module. */
+const external_irq_instance_t g_external_irq1 =
+{ .p_ctrl = &g_external_irq1_ctrl, .p_cfg = &g_external_irq1_cfg, .p_api = &g_external_irq_on_icu };
+icu_instance_ctrl_t g_external_irq0_ctrl;
+const external_irq_cfg_t g_external_irq0_cfg =
+{ .channel = 0,
+  .trigger = EXTERNAL_IRQ_TRIG_RISING,
+  .filter_enable = false,
+  .pclk_div = EXTERNAL_IRQ_PCLK_DIV_BY_64,
+  .p_callback = callback_icu,
+  .p_context = NULL,
+  .p_extend = NULL,
+  .ipl = (12),
+  #if defined(VECTOR_NUMBER_ICU_IRQ0)
+  .irq = VECTOR_NUMBER_ICU_IRQ0,
+  #else
+  .irq = FSP_INVALID_VECTOR,
+  #endif
+};
+/* Instance structure to use this module. */
+const external_irq_instance_t g_external_irq0 =
+{ .p_ctrl = &g_external_irq0_ctrl, .p_cfg = &g_external_irq0_cfg, .p_api = &g_external_irq_on_icu };
+agt_instance_ctrl_t g_timer1_ctrl;
+const agt_extended_cfg_t g_timer1_extend =
+{ .count_source = AGT_CLOCK_PCLKB,
+  .agto = AGT_PIN_CFG_DISABLED,
+  .agtoa = AGT_PIN_CFG_DISABLED,
+  .agtob = AGT_PIN_CFG_DISABLED,
+  .measurement_mode = AGT_MEASURE_DISABLED,
+  .agtio_filter = AGT_AGTIO_FILTER_NONE,
+  .enable_pin = AGT_ENABLE_PIN_NOT_USED,
+  .trigger_edge = AGT_TRIGGER_EDGE_RISING, };
+const timer_cfg_t g_timer1_cfg =
+{ .mode = TIMER_MODE_PERIODIC,
+/* Actual period: 0.002730666666666667 seconds. Actual duty: 50%. */ .period_counts = 0x10000,
+  .duty_cycle_counts = 0x8000, .source_div = (timer_source_div_t)0, .channel = 1, .p_callback = callback_agt,
+  /** If NULL then do not add & */
+  #if defined(NULL)
+  .p_context = NULL,
+  #else
+  .p_context = &NULL,
+  #endif
+  .p_extend = &g_timer1_extend,
+  .cycle_end_ipl = (5),
+  #if defined(VECTOR_NUMBER_AGT1_INT)
+  .cycle_end_irq = VECTOR_NUMBER_AGT1_INT,
+  #else
+  .cycle_end_irq = FSP_INVALID_VECTOR,
+  #endif
+};
+/* Instance structure to use this module. */
+const timer_instance_t g_timer1 =
+{ .p_ctrl = &g_timer1_ctrl, .p_cfg = &g_timer1_cfg, .p_api = &g_timer_on_agt };
+agt_instance_ctrl_t g_timer0_ctrl;
+const agt_extended_cfg_t g_timer0_extend =
+{ .count_source = AGT_CLOCK_PCLKB,
+  .agto = AGT_PIN_CFG_DISABLED,
+  .agtoa = AGT_PIN_CFG_DISABLED,
+  .agtob = AGT_PIN_CFG_DISABLED,
+  .measurement_mode = AGT_MEASURE_DISABLED,
+  .agtio_filter = AGT_AGTIO_FILTER_NONE,
+  .enable_pin = AGT_ENABLE_PIN_NOT_USED,
+  .trigger_edge = AGT_TRIGGER_EDGE_RISING, };
+const timer_cfg_t g_timer0_cfg =
+{ .mode = TIMER_MODE_PERIODIC,
+/* Actual period: 0.002730666666666667 seconds. Actual duty: 50%. */ .period_counts = 0x10000,
+  .duty_cycle_counts = 0x8000, .source_div = (timer_source_div_t)0, .channel = 0, .p_callback = callback_agt,
+  /** If NULL then do not add & */
+  #if defined(NULL)
+  .p_context = NULL,
+  #else
+  .p_context = &NULL,
+  #endif
+  .p_extend = &g_timer0_extend,
+  .cycle_end_ipl = (5),
+  #if defined(VECTOR_NUMBER_AGT0_INT)
+  .cycle_end_irq = VECTOR_NUMBER_AGT0_INT,
+  #else
+  .cycle_end_irq = FSP_INVALID_VECTOR,
+  #endif
+};
+/* Instance structure to use this module. */
+const timer_instance_t g_timer0 =
+{ .p_ctrl = &g_timer0_ctrl, .p_cfg = &g_timer0_cfg, .p_api = &g_timer_on_agt };
+flash_lp_instance_ctrl_t g_flash0_ctrl;
+const flash_cfg_t g_flash0_cfg =
+{ .data_flash_bgo = false, .p_callback = NULL, .p_context = NULL, .ipl = (BSP_IRQ_DISABLED),
+  #if defined(VECTOR_NUMBER_FCU_FRDYI)
+  .irq = VECTOR_NUMBER_FCU_FRDYI,
+  #else
+  .irq = FSP_INVALID_VECTOR,
+  #endif
+};
+/* Instance structure to use this module. */
+const flash_instance_t g_flash0 =
+{ .p_ctrl = &g_flash0_ctrl, .p_cfg = &g_flash0_cfg, .p_api = &g_flash_on_flash_lp };
+rtc_instance_ctrl_t g_rtc0_ctrl;
+const rtc_error_adjustment_cfg_t g_rtc0_err_cfg =
+{ .adjustment_mode = RTC_ERROR_ADJUSTMENT_MODE_AUTOMATIC,
+  .adjustment_period = RTC_ERROR_ADJUSTMENT_PERIOD_10_SECOND,
+  .adjustment_type = RTC_ERROR_ADJUSTMENT_NONE,
+  .adjustment_value = 0, };
+const rtc_cfg_t g_rtc0_cfg =
+{ .clock_source = RTC_CLOCK_SOURCE_LOCO, .freq_compare_value_loco = 255, .p_err_cfg = &g_rtc0_err_cfg, .p_callback =
+      NULL,
+  .p_context = NULL, .alarm_ipl = (14), .periodic_ipl = (14), .carry_ipl = (14),
+  #if defined(VECTOR_NUMBER_RTC_ALARM)
+  .alarm_irq = VECTOR_NUMBER_RTC_ALARM,
+  #else
+  .alarm_irq = FSP_INVALID_VECTOR,
+  #endif
+  #if defined(VECTOR_NUMBER_RTC_PERIOD)
+  .periodic_irq = VECTOR_NUMBER_RTC_PERIOD,
+  #else
+  .periodic_irq = FSP_INVALID_VECTOR,
+  #endif
+  #if defined(VECTOR_NUMBER_RTC_CARRY)
+  .carry_irq = VECTOR_NUMBER_RTC_CARRY,
+  #else
+  .carry_irq = FSP_INVALID_VECTOR,
+  #endif
+};
+/* Instance structure to use this module. */
+const rtc_instance_t g_rtc0 =
+{ .p_ctrl = &g_rtc0_ctrl, .p_cfg = &g_rtc0_cfg, .p_api = &g_rtc_on_rtc };
+sci_uart_instance_ctrl_t g_uart9_ctrl;
+
+baud_setting_t g_uart9_baud_setting =
+{
+/* Baud rate calculated with 0.160% error. */ .abcse = 0,
+    .abcs = 0, .bgdm = 1, .cks = 0, .brr = 25, .mddr = (uint8_t)256, .brme = false
+};
+
+/** UART extended configuration for UARTonSCI HAL driver */
+const sci_uart_extended_cfg_t g_uart9_cfg_extend =
+{ .clock = SCI_UART_CLOCK_INT,
+  .rx_edge_start = SCI_UART_START_BIT_FALLING_EDGE,
+  .noise_cancel = SCI_UART_NOISE_CANCELLATION_DISABLE,
+  .rx_fifo_trigger = SCI_UART_RX_FIFO_TRIGGER_MAX,
+  .p_baud_setting = &g_uart9_baud_setting,
+  .uart_mode = UART_MODE_RS232,
+  .ctsrts_en = SCI_UART_CTSRTS_RTS_OUTPUT,
+  #if 0
+  .flow_control_pin = BSP_IO_PORT_00_PIN_00,
+  #else
+  .flow_control_pin = (bsp_io_port_pin_t)(0xFFFFU),
+  #endif
+};
+
+/** UART interface configuration */
+const uart_cfg_t g_uart9_cfg =
+{ .channel = 9, .data_bits = UART_DATA_BITS_8, .parity = UART_PARITY_OFF, .stop_bits = UART_STOP_BITS_1, .p_callback =
+      user_uart_callback,
+  .p_context = NULL, .p_extend = &g_uart9_cfg_extend,
+#define RA_NOT_DEFINED (1)
+  #if (RA_NOT_DEFINED == RA_NOT_DEFINED)
+  .p_transfer_tx = NULL,
+  #else
+  .p_transfer_tx = &RA_NOT_DEFINED,
+  #endif
+  #if (RA_NOT_DEFINED == RA_NOT_DEFINED)
+  .p_transfer_rx = NULL,
+  #else
+  .p_transfer_rx = &RA_NOT_DEFINED,
+  #endif
+#undef RA_NOT_DEFINED
+  .rxi_ipl = (12),
+  .txi_ipl = (12), .tei_ipl = (12), .eri_ipl = (12),
+  #if defined(VECTOR_NUMBER_SCI9_RXI)
+  .rxi_irq = VECTOR_NUMBER_SCI9_RXI,
+  #else
+  .rxi_irq = FSP_INVALID_VECTOR,
+  #endif
+  #if defined(VECTOR_NUMBER_SCI9_TXI)
+  .txi_irq = VECTOR_NUMBER_SCI9_TXI,
+  #else
+  .txi_irq = FSP_INVALID_VECTOR,
+  #endif
+  #if defined(VECTOR_NUMBER_SCI9_TEI)
+  .tei_irq = VECTOR_NUMBER_SCI9_TEI,
+  #else
+  .tei_irq = FSP_INVALID_VECTOR,
+  #endif
+  #if defined(VECTOR_NUMBER_SCI9_ERI)
+  .eri_irq = VECTOR_NUMBER_SCI9_ERI,
+  #else
+  .eri_irq = FSP_INVALID_VECTOR,
+  #endif
+};
+
+/* Instance structure to use this module. */
+const uart_instance_t g_uart9 =
+{ .p_ctrl = &g_uart9_ctrl, .p_cfg = &g_uart9_cfg, .p_api = &g_uart_on_sci };
+sci_uart_instance_ctrl_t g_uart4_ctrl;
+
+baud_setting_t g_uart4_baud_setting =
+{
+/* Baud rate calculated with 0.160% error. */ .abcse = 0,
+    .abcs = 0, .bgdm = 1, .cks = 0, .brr = 25, .mddr = (uint8_t)256, .brme = false
+};
+
+/** UART extended configuration for UARTonSCI HAL driver */
+const sci_uart_extended_cfg_t g_uart4_cfg_extend =
+{ .clock = SCI_UART_CLOCK_INT,
+  .rx_edge_start = SCI_UART_START_BIT_FALLING_EDGE,
+  .noise_cancel = SCI_UART_NOISE_CANCELLATION_DISABLE,
+  .rx_fifo_trigger = SCI_UART_RX_FIFO_TRIGGER_MAX,
+  .p_baud_setting = &g_uart4_baud_setting,
+  .uart_mode = UART_MODE_RS232,
+  .ctsrts_en = SCI_UART_CTSRTS_RTS_OUTPUT,
+  #if 0
+  .flow_control_pin = BSP_IO_PORT_00_PIN_00,
+  #else
+  .flow_control_pin = (bsp_io_port_pin_t)(0xFFFFU),
+  #endif
+};
+
+/** UART interface configuration */
+const uart_cfg_t g_uart4_cfg =
+{ .channel = 4, .data_bits = UART_DATA_BITS_8, .parity = UART_PARITY_OFF, .stop_bits = UART_STOP_BITS_1, .p_callback =
+      user_uart_callback,
+  .p_context = NULL, .p_extend = &g_uart4_cfg_extend,
+#define RA_NOT_DEFINED (1)
+  #if (RA_NOT_DEFINED == RA_NOT_DEFINED)
+  .p_transfer_tx = NULL,
+  #else
+  .p_transfer_tx = &RA_NOT_DEFINED,
+  #endif
+  #if (RA_NOT_DEFINED == RA_NOT_DEFINED)
+  .p_transfer_rx = NULL,
+  #else
+  .p_transfer_rx = &RA_NOT_DEFINED,
+  #endif
+#undef RA_NOT_DEFINED
+  .rxi_ipl = (12),
+  .txi_ipl = (12), .tei_ipl = (12), .eri_ipl = (12),
+  #if defined(VECTOR_NUMBER_SCI4_RXI)
+  .rxi_irq = VECTOR_NUMBER_SCI4_RXI,
+  #else
+  .rxi_irq = FSP_INVALID_VECTOR,
+  #endif
+  #if defined(VECTOR_NUMBER_SCI4_TXI)
+  .txi_irq = VECTOR_NUMBER_SCI4_TXI,
+  #else
+  .txi_irq = FSP_INVALID_VECTOR,
+  #endif
+  #if defined(VECTOR_NUMBER_SCI4_TEI)
+  .tei_irq = VECTOR_NUMBER_SCI4_TEI,
+  #else
+  .tei_irq = FSP_INVALID_VECTOR,
+  #endif
+  #if defined(VECTOR_NUMBER_SCI4_ERI)
+  .eri_irq = VECTOR_NUMBER_SCI4_ERI,
+  #else
+  .eri_irq = FSP_INVALID_VECTOR,
+  #endif
+};
+
+/* Instance structure to use this module. */
+const uart_instance_t g_uart4 =
+{ .p_ctrl = &g_uart4_ctrl, .p_cfg = &g_uart4_cfg, .p_api = &g_uart_on_sci };
+sci_uart_instance_ctrl_t g_uart1_ctrl;
+
+baud_setting_t g_uart1_baud_setting =
+{
+/* Baud rate calculated with 0.160% error. */ .abcse = 0,
+    .abcs = 0, .bgdm = 1, .cks = 0, .brr = 25, .mddr = (uint8_t)256, .brme = false
+};
+
+/** UART extended configuration for UARTonSCI HAL driver */
+const sci_uart_extended_cfg_t g_uart1_cfg_extend =
+{ .clock = SCI_UART_CLOCK_INT,
+  .rx_edge_start = SCI_UART_START_BIT_FALLING_EDGE,
+  .noise_cancel = SCI_UART_NOISE_CANCELLATION_DISABLE,
+  .rx_fifo_trigger = SCI_UART_RX_FIFO_TRIGGER_MAX,
+  .p_baud_setting = &g_uart1_baud_setting,
+  .uart_mode = UART_MODE_RS232,
+  .ctsrts_en = SCI_UART_CTSRTS_RTS_OUTPUT,
+  #if 0
+  .flow_control_pin = BSP_IO_PORT_00_PIN_00,
+  #else
+  .flow_control_pin = (bsp_io_port_pin_t)(0xFFFFU),
+  #endif
+};
+
+/** UART interface configuration */
+const uart_cfg_t g_uart1_cfg =
+{ .channel = 1, .data_bits = UART_DATA_BITS_8, .parity = UART_PARITY_OFF, .stop_bits = UART_STOP_BITS_1, .p_callback =
+      user_uart_callback,
+  .p_context = NULL, .p_extend = &g_uart1_cfg_extend,
+#define RA_NOT_DEFINED (1)
+  #if (RA_NOT_DEFINED == RA_NOT_DEFINED)
+  .p_transfer_tx = NULL,
+  #else
+  .p_transfer_tx = &RA_NOT_DEFINED,
+  #endif
+  #if (RA_NOT_DEFINED == RA_NOT_DEFINED)
+  .p_transfer_rx = NULL,
+  #else
+  .p_transfer_rx = &RA_NOT_DEFINED,
+  #endif
+#undef RA_NOT_DEFINED
+  .rxi_ipl = (12),
+  .txi_ipl = (12), .tei_ipl = (12), .eri_ipl = (12),
+  #if defined(VECTOR_NUMBER_SCI1_RXI)
+  .rxi_irq = VECTOR_NUMBER_SCI1_RXI,
+  #else
+  .rxi_irq = FSP_INVALID_VECTOR,
+  #endif
+  #if defined(VECTOR_NUMBER_SCI1_TXI)
+  .txi_irq = VECTOR_NUMBER_SCI1_TXI,
+  #else
+  .txi_irq = FSP_INVALID_VECTOR,
+  #endif
+  #if defined(VECTOR_NUMBER_SCI1_TEI)
+  .tei_irq = VECTOR_NUMBER_SCI1_TEI,
+  #else
+  .tei_irq = FSP_INVALID_VECTOR,
+  #endif
+  #if defined(VECTOR_NUMBER_SCI1_ERI)
+  .eri_irq = VECTOR_NUMBER_SCI1_ERI,
+  #else
+  .eri_irq = FSP_INVALID_VECTOR,
+  #endif
+};
+
+/* Instance structure to use this module. */
+const uart_instance_t g_uart1 =
+{ .p_ctrl = &g_uart1_ctrl, .p_cfg = &g_uart1_cfg, .p_api = &g_uart_on_sci };
+void g_hal_init(void) {
+    g_common_init();
+}
diff --git a/ports/renesas-ra/boards/RA4W1_EK/ra_gen/hal_data.h b/ports/renesas-ra/boards/RA4W1_EK/ra_gen/hal_data.h
new file mode 100644
index 0000000000000..cf3f00771b752
--- /dev/null
+++ b/ports/renesas-ra/boards/RA4W1_EK/ra_gen/hal_data.h
@@ -0,0 +1,216 @@
+/* generated HAL header file - do not edit */
+#ifndef HAL_DATA_H_
+#define HAL_DATA_H_
+#include <stdint.h>
+#include "bsp_api.h"
+#include "common_data.h"
+#include "r_adc.h"
+#include "r_adc_api.h"
+#include "r_iic_master.h"
+#include "r_i2c_master_api.h"
+#include "r_lpm.h"
+#include "r_lpm_api.h"
+#include "r_dtc.h"
+#include "r_transfer_api.h"
+#include "r_spi.h"
+#include "r_icu.h"
+#include "r_external_irq_api.h"
+#include "r_agt.h"
+#include "r_timer_api.h"
+#include "r_flash_lp.h"
+#include "r_flash_api.h"
+#include "r_rtc.h"
+#include "r_rtc_api.h"
+#include "r_sci_uart.h"
+#include "r_uart_api.h"
+FSP_HEADER
+/** ADC on ADC Instance. */
+extern const adc_instance_t g_adc0;
+
+/** Access the ADC instance using these structures when calling API functions directly (::p_api is not used). */
+extern adc_instance_ctrl_t g_adc0_ctrl;
+extern const adc_cfg_t g_adc0_cfg;
+extern const adc_channel_cfg_t g_adc0_channel_cfg;
+
+#ifndef NULL
+void NULL(adc_callback_args_t *p_args);
+#endif
+/* I2C Master on IIC Instance. */
+extern const i2c_master_instance_t g_i2c_master0;
+
+/** Access the I2C Master instance using these structures when calling API functions directly (::p_api is not used). */
+extern iic_master_instance_ctrl_t g_i2c_master0_ctrl;
+extern const i2c_master_cfg_t g_i2c_master0_cfg;
+
+#ifndef callback_iic
+void callback_iic(i2c_master_callback_args_t *p_args);
+#endif
+/** lpm Instance */
+extern const lpm_instance_t g_lpm0;
+
+/** Access the LPM instance using these structures when calling API functions directly (::p_api is not used). */
+extern lpm_instance_ctrl_t g_lpm0_ctrl;
+extern const lpm_cfg_t g_lpm0_cfg;
+/* Transfer on DTC Instance. */
+extern const transfer_instance_t g_transfer1;
+
+/** Access the DTC instance using these structures when calling API functions directly (::p_api is not used). */
+extern dtc_instance_ctrl_t g_transfer1_ctrl;
+extern const transfer_cfg_t g_transfer1_cfg;
+/* Transfer on DTC Instance. */
+extern const transfer_instance_t g_transfer0;
+
+/** Access the DTC instance using these structures when calling API functions directly (::p_api is not used). */
+extern dtc_instance_ctrl_t g_transfer0_ctrl;
+extern const transfer_cfg_t g_transfer0_cfg;
+/** SPI on SPI Instance. */
+extern const spi_instance_t g_spi0;
+
+/** Access the SPI instance using these structures when calling API functions directly (::p_api is not used). */
+extern spi_instance_ctrl_t g_spi0_ctrl;
+extern const spi_cfg_t g_spi0_cfg;
+
+/** Callback used by SPI Instance. */
+#ifndef spi_callback
+void spi_callback(spi_callback_args_t *p_args);
+#endif
+
+#define RA_NOT_DEFINED (1)
+#if (RA_NOT_DEFINED == g_transfer0)
+    #define g_spi0_P_TRANSFER_TX (NULL)
+#else
+#define g_spi0_P_TRANSFER_TX (&g_transfer0)
+#endif
+#if (RA_NOT_DEFINED == g_transfer1)
+    #define g_spi0_P_TRANSFER_RX (NULL)
+#else
+#define g_spi0_P_TRANSFER_RX (&g_transfer1)
+#endif
+#undef RA_NOT_DEFINED
+/** External IRQ on ICU Instance. */
+extern const external_irq_instance_t g_external_irq4;
+
+/** Access the ICU instance using these structures when calling API functions directly (::p_api is not used). */
+extern icu_instance_ctrl_t g_external_irq4_ctrl;
+extern const external_irq_cfg_t g_external_irq4_cfg;
+
+#ifndef callback_icu
+void callback_icu(external_irq_callback_args_t *p_args);
+#endif
+/** External IRQ on ICU Instance. */
+extern const external_irq_instance_t g_external_irq3;
+
+/** Access the ICU instance using these structures when calling API functions directly (::p_api is not used). */
+extern icu_instance_ctrl_t g_external_irq3_ctrl;
+extern const external_irq_cfg_t g_external_irq3_cfg;
+
+#ifndef callback_icu
+void callback_icu(external_irq_callback_args_t *p_args);
+#endif
+/** External IRQ on ICU Instance. */
+extern const external_irq_instance_t g_external_irq2;
+
+/** Access the ICU instance using these structures when calling API functions directly (::p_api is not used). */
+extern icu_instance_ctrl_t g_external_irq2_ctrl;
+extern const external_irq_cfg_t g_external_irq2_cfg;
+
+#ifndef callback_icu
+void callback_icu(external_irq_callback_args_t *p_args);
+#endif
+/** External IRQ on ICU Instance. */
+extern const external_irq_instance_t g_external_irq1;
+
+/** Access the ICU instance using these structures when calling API functions directly (::p_api is not used). */
+extern icu_instance_ctrl_t g_external_irq1_ctrl;
+extern const external_irq_cfg_t g_external_irq1_cfg;
+
+#ifndef callback_icu
+void callback_icu(external_irq_callback_args_t *p_args);
+#endif
+/** External IRQ on ICU Instance. */
+extern const external_irq_instance_t g_external_irq0;
+
+/** Access the ICU instance using these structures when calling API functions directly (::p_api is not used). */
+extern icu_instance_ctrl_t g_external_irq0_ctrl;
+extern const external_irq_cfg_t g_external_irq0_cfg;
+
+#ifndef callback_icu
+void callback_icu(external_irq_callback_args_t *p_args);
+#endif
+/** AGT Timer Instance */
+extern const timer_instance_t g_timer1;
+
+/** Access the AGT instance using these structures when calling API functions directly (::p_api is not used). */
+extern agt_instance_ctrl_t g_timer1_ctrl;
+extern const timer_cfg_t g_timer1_cfg;
+
+#ifndef callback_agt
+void callback_agt(timer_callback_args_t *p_args);
+#endif
+/** AGT Timer Instance */
+extern const timer_instance_t g_timer0;
+
+/** Access the AGT instance using these structures when calling API functions directly (::p_api is not used). */
+extern agt_instance_ctrl_t g_timer0_ctrl;
+extern const timer_cfg_t g_timer0_cfg;
+
+#ifndef callback_agt
+void callback_agt(timer_callback_args_t *p_args);
+#endif
+/* Flash on Flash LP Instance. */
+extern const flash_instance_t g_flash0;
+
+/** Access the Flash LP instance using these structures when calling API functions directly (::p_api is not used). */
+extern flash_lp_instance_ctrl_t g_flash0_ctrl;
+extern const flash_cfg_t g_flash0_cfg;
+
+#ifndef NULL
+void NULL(flash_callback_args_t *p_args);
+#endif
+/* RTC Instance. */
+extern const rtc_instance_t g_rtc0;
+
+/** Access the RTC instance using these structures when calling API functions directly (::p_api is not used). */
+extern rtc_instance_ctrl_t g_rtc0_ctrl;
+extern const rtc_cfg_t g_rtc0_cfg;
+
+#ifndef NULL
+void NULL(rtc_callback_args_t *p_args);
+#endif
+/** UART on SCI Instance. */
+extern const uart_instance_t g_uart9;
+
+/** Access the UART instance using these structures when calling API functions directly (::p_api is not used). */
+extern sci_uart_instance_ctrl_t g_uart9_ctrl;
+extern const uart_cfg_t g_uart9_cfg;
+extern const sci_uart_extended_cfg_t g_uart9_cfg_extend;
+
+#ifndef user_uart_callback
+void user_uart_callback(uart_callback_args_t *p_args);
+#endif
+/** UART on SCI Instance. */
+extern const uart_instance_t g_uart4;
+
+/** Access the UART instance using these structures when calling API functions directly (::p_api is not used). */
+extern sci_uart_instance_ctrl_t g_uart4_ctrl;
+extern const uart_cfg_t g_uart4_cfg;
+extern const sci_uart_extended_cfg_t g_uart4_cfg_extend;
+
+#ifndef user_uart_callback
+void user_uart_callback(uart_callback_args_t *p_args);
+#endif
+/** UART on SCI Instance. */
+extern const uart_instance_t g_uart1;
+
+/** Access the UART instance using these structures when calling API functions directly (::p_api is not used). */
+extern sci_uart_instance_ctrl_t g_uart1_ctrl;
+extern const uart_cfg_t g_uart1_cfg;
+extern const sci_uart_extended_cfg_t g_uart1_cfg_extend;
+
+#ifndef user_uart_callback
+void user_uart_callback(uart_callback_args_t *p_args);
+#endif
+void hal_entry(void);
+void g_hal_init(void);
+FSP_FOOTER
+#endif /* HAL_DATA_H_ */
diff --git a/ports/renesas-ra/boards/RA4W1_EK/ra_gen/main.c b/ports/renesas-ra/boards/RA4W1_EK/ra_gen/main.c
new file mode 100644
index 0000000000000..5b9f9805595fa
--- /dev/null
+++ b/ports/renesas-ra/boards/RA4W1_EK/ra_gen/main.c
@@ -0,0 +1,6 @@
+/* generated main source file - do not edit */
+#include "hal_data.h"
+int main(void) {
+    hal_entry();
+    return 0;
+}
diff --git a/ports/renesas-ra/boards/RA4W1_EK/ra_gen/pin_data.c b/ports/renesas-ra/boards/RA4W1_EK/ra_gen/pin_data.c
new file mode 100644
index 0000000000000..2a5a8764c5c41
--- /dev/null
+++ b/ports/renesas-ra/boards/RA4W1_EK/ra_gen/pin_data.c
@@ -0,0 +1,69 @@
+/* generated pin source file - do not edit */
+#include "bsp_api.h"
+#include "r_ioport_api.h"
+const ioport_pin_cfg_t g_bsp_pin_cfg_data[] = {
+    {
+        .pin = BSP_IO_PORT_01_PIN_00,
+        .pin_cfg = ((uint32_t)IOPORT_CFG_PERIPHERAL_PIN | (uint32_t)IOPORT_PERIPHERAL_SPI),
+    },
+    {
+        .pin = BSP_IO_PORT_01_PIN_01,
+        .pin_cfg = ((uint32_t)IOPORT_CFG_PERIPHERAL_PIN | (uint32_t)IOPORT_PERIPHERAL_SPI),
+    },
+    {
+        .pin = BSP_IO_PORT_01_PIN_02,
+        .pin_cfg = ((uint32_t)IOPORT_CFG_PERIPHERAL_PIN | (uint32_t)IOPORT_PERIPHERAL_SPI),
+    },
+    {
+        .pin = BSP_IO_PORT_01_PIN_03,
+        .pin_cfg = ((uint32_t)IOPORT_CFG_PORT_DIRECTION_OUTPUT | (uint32_t)IOPORT_CFG_PORT_OUTPUT_HIGH),
+    },
+    {
+        .pin = BSP_IO_PORT_01_PIN_06,
+        .pin_cfg = ((uint32_t)IOPORT_CFG_PORT_DIRECTION_OUTPUT | (uint32_t)IOPORT_CFG_PORT_OUTPUT_HIGH),
+    },
+    {
+        .pin = BSP_IO_PORT_01_PIN_09,
+        .pin_cfg = ((uint32_t)IOPORT_CFG_PERIPHERAL_PIN | (uint32_t)IOPORT_PERIPHERAL_SCI1_3_5_7_9),
+    },
+    {
+        .pin = BSP_IO_PORT_01_PIN_10,
+        .pin_cfg = ((uint32_t)IOPORT_CFG_PERIPHERAL_PIN | (uint32_t)IOPORT_PERIPHERAL_SCI1_3_5_7_9),
+    },
+    {
+        .pin = BSP_IO_PORT_01_PIN_11,
+        .pin_cfg = ((uint32_t)IOPORT_CFG_PORT_DIRECTION_OUTPUT | (uint32_t)IOPORT_CFG_PORT_OUTPUT_HIGH),
+    },
+    {
+        .pin = BSP_IO_PORT_02_PIN_04,
+        .pin_cfg = ((uint32_t)IOPORT_CFG_PORT_DIRECTION_OUTPUT | (uint32_t)IOPORT_CFG_PORT_OUTPUT_HIGH),
+    },
+    {
+        .pin = BSP_IO_PORT_02_PIN_05,
+        .pin_cfg = ((uint32_t)IOPORT_CFG_PERIPHERAL_PIN | (uint32_t)IOPORT_PERIPHERAL_SCI0_2_4_6_8),
+    },
+    {
+        .pin = BSP_IO_PORT_02_PIN_06,
+        .pin_cfg = ((uint32_t)IOPORT_CFG_PERIPHERAL_PIN | (uint32_t)IOPORT_PERIPHERAL_SCI0_2_4_6_8),
+    },
+    {
+        .pin = BSP_IO_PORT_02_PIN_12,
+        .pin_cfg = ((uint32_t)IOPORT_CFG_PERIPHERAL_PIN | (uint32_t)IOPORT_PERIPHERAL_SCI1_3_5_7_9),
+    },
+    {
+        .pin = BSP_IO_PORT_02_PIN_13,
+        .pin_cfg = ((uint32_t)IOPORT_CFG_PERIPHERAL_PIN | (uint32_t)IOPORT_PERIPHERAL_SCI1_3_5_7_9),
+    },
+    {
+        .pin = BSP_IO_PORT_04_PIN_02,
+        .pin_cfg = ((uint32_t)IOPORT_CFG_IRQ_ENABLE | (uint32_t)IOPORT_CFG_PORT_DIRECTION_INPUT),
+    },
+    {
+        .pin = BSP_IO_PORT_04_PIN_04,
+        .pin_cfg = ((uint32_t)IOPORT_CFG_PORT_DIRECTION_OUTPUT | (uint32_t)IOPORT_CFG_PORT_OUTPUT_HIGH),
+    },
+};
+const ioport_cfg_t g_bsp_pin_cfg = {
+    .number_of_pins = sizeof(g_bsp_pin_cfg_data) / sizeof(ioport_pin_cfg_t),
+    .p_pin_cfg_data = &g_bsp_pin_cfg_data[0],
+};
diff --git a/ports/renesas-ra/boards/RA4W1_EK/ra_gen/vector_data.c b/ports/renesas-ra/boards/RA4W1_EK/ra_gen/vector_data.c
new file mode 100644
index 0000000000000..1867e73836133
--- /dev/null
+++ b/ports/renesas-ra/boards/RA4W1_EK/ra_gen/vector_data.c
@@ -0,0 +1,71 @@
+/* generated vector source file - do not edit */
+#include "bsp_api.h"
+/* Do not build these data structures if no interrupts are currently allocated because IAR will have build errors. */
+#if VECTOR_DATA_IRQ_COUNT > 0
+BSP_DONT_REMOVE const fsp_vector_t g_vector_table[BSP_ICU_VECTOR_MAX_ENTRIES] BSP_PLACE_IN_SECTION(BSP_SECTION_APPLICATION_VECTORS) =
+{
+    [0] = sci_uart_rxi_isr,         /* SCI1 RXI (Received data full) */
+    [1] = sci_uart_txi_isr,         /* SCI1 TXI (Transmit data empty) */
+    [2] = sci_uart_tei_isr,         /* SCI1 TEI (Transmit end) */
+    [3] = sci_uart_eri_isr,         /* SCI1 ERI (Receive error) */
+    [4] = sci_uart_rxi_isr,         /* SCI4 RXI (Received data full) */
+    [5] = sci_uart_txi_isr,         /* SCI4 TXI (Transmit data empty) */
+    [6] = sci_uart_tei_isr,         /* SCI4 TEI (Transmit end) */
+    [7] = sci_uart_eri_isr,         /* SCI4 ERI (Receive error) */
+    [8] = sci_uart_rxi_isr,         /* SCI9 RXI (Received data full) */
+    [9] = sci_uart_txi_isr,         /* SCI9 TXI (Transmit data empty) */
+    [10] = sci_uart_tei_isr,        /* SCI9 TEI (Transmit end) */
+    [11] = sci_uart_eri_isr,        /* SCI9 ERI (Receive error) */
+    [12] = rtc_alarm_periodic_isr,  /* RTC ALARM (Alarm interrupt) */
+    [13] = rtc_alarm_periodic_isr,  /* RTC PERIOD (Periodic interrupt) */
+    [14] = rtc_carry_isr,           /* RTC CARRY (Carry interrupt) */
+    [15] = agt_int_isr,             /* AGT0 INT (AGT interrupt) */
+    [16] = agt_int_isr,             /* AGT1 INT (AGT interrupt) */
+    [17] = r_icu_isr,               /* ICU IRQ0 (External pin interrupt 0) */
+    [18] = r_icu_isr,               /* ICU IRQ1 (External pin interrupt 1) */
+    [19] = r_icu_isr,               /* ICU IRQ2 (External pin interrupt 2) */
+    [20] = r_icu_isr,               /* ICU IRQ3 (External pin interrupt 3) */
+    [21] = r_icu_isr,               /* ICU IRQ4 (External pin interrupt 4) */
+    [22] = spi_rxi_isr,             /* SPI0 RXI (Receive buffer full) */
+    [23] = spi_txi_isr,             /* SPI0 TXI (Transmit buffer empty) */
+    [24] = spi_tei_isr,             /* SPI0 TEI (Transmission complete event) */
+    [25] = spi_eri_isr,             /* SPI0 ERI (Error) */
+    [26] = iic_master_rxi_isr,      /* IIC0 RXI (Receive data full) */
+    [27] = iic_master_txi_isr,      /* IIC0 TXI (Transmit data empty) */
+    [28] = iic_master_tei_isr,      /* IIC0 TEI (Transmit end) */
+    [29] = iic_master_eri_isr,      /* IIC0 ERI (Transfer error) */
+};
+const bsp_interrupt_event_t g_interrupt_event_link_select[BSP_ICU_VECTOR_MAX_ENTRIES] =
+{
+    [0] = BSP_PRV_IELS_ENUM(EVENT_SCI1_RXI),         /* SCI1 RXI (Received data full) */
+    [1] = BSP_PRV_IELS_ENUM(EVENT_SCI1_TXI),         /* SCI1 TXI (Transmit data empty) */
+    [2] = BSP_PRV_IELS_ENUM(EVENT_SCI1_TEI),         /* SCI1 TEI (Transmit end) */
+    [3] = BSP_PRV_IELS_ENUM(EVENT_SCI1_ERI),         /* SCI1 ERI (Receive error) */
+    [4] = BSP_PRV_IELS_ENUM(EVENT_SCI4_RXI),         /* SCI4 RXI (Received data full) */
+    [5] = BSP_PRV_IELS_ENUM(EVENT_SCI4_TXI),         /* SCI4 TXI (Transmit data empty) */
+    [6] = BSP_PRV_IELS_ENUM(EVENT_SCI4_TEI),         /* SCI4 TEI (Transmit end) */
+    [7] = BSP_PRV_IELS_ENUM(EVENT_SCI4_ERI),         /* SCI4 ERI (Receive error) */
+    [8] = BSP_PRV_IELS_ENUM(EVENT_SCI9_RXI),         /* SCI9 RXI (Received data full) */
+    [9] = BSP_PRV_IELS_ENUM(EVENT_SCI9_TXI),         /* SCI9 TXI (Transmit data empty) */
+    [10] = BSP_PRV_IELS_ENUM(EVENT_SCI9_TEI),        /* SCI9 TEI (Transmit end) */
+    [11] = BSP_PRV_IELS_ENUM(EVENT_SCI9_ERI),        /* SCI9 ERI (Receive error) */
+    [12] = BSP_PRV_IELS_ENUM(EVENT_RTC_ALARM),       /* RTC ALARM (Alarm interrupt) */
+    [13] = BSP_PRV_IELS_ENUM(EVENT_RTC_PERIOD),      /* RTC PERIOD (Periodic interrupt) */
+    [14] = BSP_PRV_IELS_ENUM(EVENT_RTC_CARRY),       /* RTC CARRY (Carry interrupt) */
+    [15] = BSP_PRV_IELS_ENUM(EVENT_AGT0_INT),        /* AGT0 INT (AGT interrupt) */
+    [16] = BSP_PRV_IELS_ENUM(EVENT_AGT1_INT),        /* AGT1 INT (AGT interrupt) */
+    [17] = BSP_PRV_IELS_ENUM(EVENT_ICU_IRQ0),        /* ICU IRQ0 (External pin interrupt 0) */
+    [18] = BSP_PRV_IELS_ENUM(EVENT_ICU_IRQ1),        /* ICU IRQ1 (External pin interrupt 1) */
+    [19] = BSP_PRV_IELS_ENUM(EVENT_ICU_IRQ2),        /* ICU IRQ2 (External pin interrupt 2) */
+    [20] = BSP_PRV_IELS_ENUM(EVENT_ICU_IRQ3),        /* ICU IRQ3 (External pin interrupt 3) */
+    [21] = BSP_PRV_IELS_ENUM(EVENT_ICU_IRQ4),        /* ICU IRQ4 (External pin interrupt 4) */
+    [22] = BSP_PRV_IELS_ENUM(EVENT_SPI0_RXI),        /* SPI0 RXI (Receive buffer full) */
+    [23] = BSP_PRV_IELS_ENUM(EVENT_SPI0_TXI),        /* SPI0 TXI (Transmit buffer empty) */
+    [24] = BSP_PRV_IELS_ENUM(EVENT_SPI0_TEI),        /* SPI0 TEI (Transmission complete event) */
+    [25] = BSP_PRV_IELS_ENUM(EVENT_SPI0_ERI),        /* SPI0 ERI (Error) */
+    [26] = BSP_PRV_IELS_ENUM(EVENT_IIC0_RXI),        /* IIC0 RXI (Receive data full) */
+    [27] = BSP_PRV_IELS_ENUM(EVENT_IIC0_TXI),        /* IIC0 TXI (Transmit data empty) */
+    [28] = BSP_PRV_IELS_ENUM(EVENT_IIC0_TEI),        /* IIC0 TEI (Transmit end) */
+    [29] = BSP_PRV_IELS_ENUM(EVENT_IIC0_ERI),        /* IIC0 ERI (Transfer error) */
+};
+#endif
diff --git a/ports/renesas-ra/boards/RA4W1_EK/ra_gen/vector_data.h b/ports/renesas-ra/boards/RA4W1_EK/ra_gen/vector_data.h
new file mode 100644
index 0000000000000..c45ef8d95973e
--- /dev/null
+++ b/ports/renesas-ra/boards/RA4W1_EK/ra_gen/vector_data.h
@@ -0,0 +1,101 @@
+/* generated vector header file - do not edit */
+#ifndef VECTOR_DATA_H
+#define VECTOR_DATA_H
+/* Number of interrupts allocated */
+#ifndef VECTOR_DATA_IRQ_COUNT
+#define VECTOR_DATA_IRQ_COUNT    (30)
+#endif
+/* ISR prototypes */
+void sci_uart_rxi_isr(void);
+void sci_uart_txi_isr(void);
+void sci_uart_tei_isr(void);
+void sci_uart_eri_isr(void);
+void rtc_alarm_periodic_isr(void);
+void rtc_carry_isr(void);
+void agt_int_isr(void);
+void r_icu_isr(void);
+void spi_rxi_isr(void);
+void spi_txi_isr(void);
+void spi_tei_isr(void);
+void spi_eri_isr(void);
+void iic_master_rxi_isr(void);
+void iic_master_txi_isr(void);
+void iic_master_tei_isr(void);
+void iic_master_eri_isr(void);
+
+/* Vector table allocations */
+#define VECTOR_NUMBER_SCI1_RXI ((IRQn_Type)0)  /* SCI1 RXI (Received data full) */
+#define VECTOR_NUMBER_SCI1_TXI ((IRQn_Type)1)  /* SCI1 TXI (Transmit data empty) */
+#define VECTOR_NUMBER_SCI1_TEI ((IRQn_Type)2)  /* SCI1 TEI (Transmit end) */
+#define VECTOR_NUMBER_SCI1_ERI ((IRQn_Type)3)  /* SCI1 ERI (Receive error) */
+#define VECTOR_NUMBER_SCI4_RXI ((IRQn_Type)4)  /* SCI4 RXI (Received data full) */
+#define VECTOR_NUMBER_SCI4_TXI ((IRQn_Type)5)  /* SCI4 TXI (Transmit data empty) */
+#define VECTOR_NUMBER_SCI4_TEI ((IRQn_Type)6)  /* SCI4 TEI (Transmit end) */
+#define VECTOR_NUMBER_SCI4_ERI ((IRQn_Type)7)  /* SCI4 ERI (Receive error) */
+#define VECTOR_NUMBER_SCI9_RXI ((IRQn_Type)8)  /* SCI9 RXI (Received data full) */
+#define VECTOR_NUMBER_SCI9_TXI ((IRQn_Type)9)  /* SCI9 TXI (Transmit data empty) */
+#define VECTOR_NUMBER_SCI9_TEI ((IRQn_Type)10)  /* SCI9 TEI (Transmit end) */
+#define VECTOR_NUMBER_SCI9_ERI ((IRQn_Type)11)  /* SCI9 ERI (Receive error) */
+#define VECTOR_NUMBER_RTC_ALARM ((IRQn_Type)12)  /* RTC ALARM (Alarm interrupt) */
+#define VECTOR_NUMBER_RTC_PERIOD ((IRQn_Type)13)  /* RTC PERIOD (Periodic interrupt) */
+#define VECTOR_NUMBER_RTC_CARRY ((IRQn_Type)14)  /* RTC CARRY (Carry interrupt) */
+#define VECTOR_NUMBER_AGT0_INT ((IRQn_Type)15)  /* AGT0 INT (AGT interrupt) */
+#define VECTOR_NUMBER_AGT1_INT ((IRQn_Type)16)  /* AGT1 INT (AGT interrupt) */
+#define VECTOR_NUMBER_ICU_IRQ0 ((IRQn_Type)17)  /* ICU IRQ0 (External pin interrupt 0) */
+#define VECTOR_NUMBER_ICU_IRQ1 ((IRQn_Type)18)  /* ICU IRQ1 (External pin interrupt 1) */
+#define VECTOR_NUMBER_ICU_IRQ2 ((IRQn_Type)19)  /* ICU IRQ2 (External pin interrupt 2) */
+#define VECTOR_NUMBER_ICU_IRQ3 ((IRQn_Type)20)  /* ICU IRQ3 (External pin interrupt 3) */
+#define VECTOR_NUMBER_ICU_IRQ4 ((IRQn_Type)21)  /* ICU IRQ4 (External pin interrupt 4) */
+#define VECTOR_NUMBER_SPI0_RXI ((IRQn_Type)22)  /* SPI0 RXI (Receive buffer full) */
+#define VECTOR_NUMBER_SPI0_TXI ((IRQn_Type)23)  /* SPI0 TXI (Transmit buffer empty) */
+#define VECTOR_NUMBER_SPI0_TEI ((IRQn_Type)24)  /* SPI0 TEI (Transmission complete event) */
+#define VECTOR_NUMBER_SPI0_ERI ((IRQn_Type)25)  /* SPI0 ERI (Error) */
+#define VECTOR_NUMBER_IIC0_RXI ((IRQn_Type)26)  /* IIC0 RXI (Receive data full) */
+#define VECTOR_NUMBER_IIC0_TXI ((IRQn_Type)27)  /* IIC0 TXI (Transmit data empty) */
+#define VECTOR_NUMBER_IIC0_TEI ((IRQn_Type)28)  /* IIC0 TEI (Transmit end) */
+#define VECTOR_NUMBER_IIC0_ERI ((IRQn_Type)29)  /* IIC0 ERI (Transfer error) */
+typedef enum IRQn
+{
+    Reset_IRQn = -15,
+    NonMaskableInt_IRQn = -14,
+    HardFault_IRQn = -13,
+    MemoryManagement_IRQn = -12,
+    BusFault_IRQn = -11,
+    UsageFault_IRQn = -10,
+    SecureFault_IRQn = -9,
+    SVCall_IRQn = -5,
+    DebugMonitor_IRQn = -4,
+    PendSV_IRQn = -2,
+    SysTick_IRQn = -1,
+    SCI1_RXI_IRQn = 0, /* SCI1 RXI (Received data full) */
+    SCI1_TXI_IRQn = 1, /* SCI1 TXI (Transmit data empty) */
+    SCI1_TEI_IRQn = 2, /* SCI1 TEI (Transmit end) */
+    SCI1_ERI_IRQn = 3, /* SCI1 ERI (Receive error) */
+    SCI4_RXI_IRQn = 4, /* SCI4 RXI (Received data full) */
+    SCI4_TXI_IRQn = 5, /* SCI4 TXI (Transmit data empty) */
+    SCI4_TEI_IRQn = 6, /* SCI4 TEI (Transmit end) */
+    SCI4_ERI_IRQn = 7, /* SCI4 ERI (Receive error) */
+    SCI9_RXI_IRQn = 8, /* SCI9 RXI (Received data full) */
+    SCI9_TXI_IRQn = 9, /* SCI9 TXI (Transmit data empty) */
+    SCI9_TEI_IRQn = 10, /* SCI9 TEI (Transmit end) */
+    SCI9_ERI_IRQn = 11, /* SCI9 ERI (Receive error) */
+    RTC_ALARM_IRQn = 12, /* RTC ALARM (Alarm interrupt) */
+    RTC_PERIOD_IRQn = 13, /* RTC PERIOD (Periodic interrupt) */
+    RTC_CARRY_IRQn = 14, /* RTC CARRY (Carry interrupt) */
+    AGT0_INT_IRQn = 15, /* AGT0 INT (AGT interrupt) */
+    AGT1_INT_IRQn = 16, /* AGT1 INT (AGT interrupt) */
+    ICU_IRQ0_IRQn = 17, /* ICU IRQ0 (External pin interrupt 0) */
+    ICU_IRQ1_IRQn = 18, /* ICU IRQ1 (External pin interrupt 1) */
+    ICU_IRQ2_IRQn = 19, /* ICU IRQ2 (External pin interrupt 2) */
+    ICU_IRQ3_IRQn = 20, /* ICU IRQ3 (External pin interrupt 3) */
+    ICU_IRQ4_IRQn = 21, /* ICU IRQ4 (External pin interrupt 4) */
+    SPI0_RXI_IRQn = 22, /* SPI0 RXI (Receive buffer full) */
+    SPI0_TXI_IRQn = 23, /* SPI0 TXI (Transmit buffer empty) */
+    SPI0_TEI_IRQn = 24, /* SPI0 TEI (Transmission complete event) */
+    SPI0_ERI_IRQn = 25, /* SPI0 ERI (Error) */
+    IIC0_RXI_IRQn = 26, /* IIC0 RXI (Receive data full) */
+    IIC0_TXI_IRQn = 27, /* IIC0 TXI (Transmit data empty) */
+    IIC0_TEI_IRQn = 28, /* IIC0 TEI (Transmit end) */
+    IIC0_ERI_IRQn = 29, /* IIC0 ERI (Transfer error) */
+} IRQn_Type;
+#endif /* VECTOR_DATA_H */
diff --git a/ports/renesas-ra/boards/RA4W1_EK/src/hal_entry.c b/ports/renesas-ra/boards/RA4W1_EK/src/hal_entry.c
new file mode 100644
index 0000000000000..3e53787c615e8
--- /dev/null
+++ b/ports/renesas-ra/boards/RA4W1_EK/src/hal_entry.c
@@ -0,0 +1,59 @@
+#include "stdbool.h"
+#include "hal_data.h"
+
+FSP_CPP_HEADER
+void R_BSP_WarmStart(bsp_warm_start_event_t event);
+FSP_CPP_FOOTER
+
+void ra_main(uint32_t reset_mode);
+
+/*******************************************************************************************************************//**
+ * main() is generated by the RA Configuration editor and is used to generate threads if an RTOS is used.  This function
+ * is called by main() when no RTOS is used.
+ **********************************************************************************************************************/
+void hal_entry(void) {
+    /* TODO: add your own code here */
+
+    ra_main(1);
+
+    #if BSP_TZ_SECURE_BUILD
+    /* Enter non-secure code */
+    R_BSP_NonSecureEnter();
+    #endif
+}
+
+/*******************************************************************************************************************//**
+ * This function is called at various points during the startup process.  This implementation uses the event that is
+ * called right before main() to set up the pins.
+ *
+ * @param[in]  event    Where at in the start up process the code is currently at
+ **********************************************************************************************************************/
+void R_BSP_WarmStart(bsp_warm_start_event_t event) {
+    if (BSP_WARM_START_RESET == event) {
+        #if BSP_FEATURE_FLASH_LP_VERSION != 0
+
+        /* Enable reading from data flash. */
+        R_FACI_LP->DFLCTL = 1U;
+
+        /* Would normally have to wait tDSTOP(6us) for data flash recovery. Placing the enable here, before clock and
+         * C runtime initialization, should negate the need for a delay since the initialization will typically take more than 6us. */
+        #endif
+    }
+
+    if (BSP_WARM_START_POST_C == event) {
+        /* C runtime environment and system clocks are setup. */
+
+        /* Configure pins. */
+        R_IOPORT_Open(&g_ioport_ctrl, &g_bsp_pin_cfg);
+    }
+}
+
+#if BSP_TZ_SECURE_BUILD
+
+BSP_CMSE_NONSECURE_ENTRY void template_nonsecure_callable();
+
+/* Trustzone Secure Projects require at least one nonsecure callable function in order to build (Remove this if it is not required to build). */
+BSP_CMSE_NONSECURE_ENTRY void template_nonsecure_callable() {
+
+}
+#endif
diff --git a/ports/renesas-ra/boards/RA6M1_EK/board.json b/ports/renesas-ra/boards/RA6M1_EK/board.json
new file mode 100644
index 0000000000000..babcc5c166aa1
--- /dev/null
+++ b/ports/renesas-ra/boards/RA6M1_EK/board.json
@@ -0,0 +1,21 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [
+	"UART",
+	"SPI",
+	"I2C",
+	"ADC"
+    ],
+    "id": "EK-RA6M1",
+    "images": [
+        "ek_ra6m1_board.jpg"
+    ],
+    "mcu": "RA6M1",
+    "product": "EK-RA6M1",
+    "thumbnail": "",
+    "url": "https://www.renesas.com/products/microcontrollers-microprocessors/ra-cortex-m-mcus/ek-ra6m1-evaluation-kit-ra6m1-mcu-group",
+    "vendor": "Renesas Electronics"
+}
diff --git a/ports/renesas-ra/boards/RA6M1_EK/mpconfigboard.h b/ports/renesas-ra/boards/RA6M1_EK/mpconfigboard.h
new file mode 100644
index 0000000000000..0693e404fd8f3
--- /dev/null
+++ b/ports/renesas-ra/boards/RA6M1_EK/mpconfigboard.h
@@ -0,0 +1,75 @@
+// MCU config
+#define MICROPY_HW_BOARD_NAME       "RA6M1_EK"
+#define MICROPY_HW_MCU_NAME         "RA6M1"
+#define MICROPY_HW_MCU_SYSCLK       120000000
+#define MICROPY_HW_MCU_PCLK         60000000
+
+// module config
+#define MICROPY_EMIT_THUMB          (1)
+#define MICROPY_EMIT_INLINE_THUMB   (1)
+#define MICROPY_PY_BUILTINS_COMPLEX (1)
+#define MICROPY_PY_GENERATOR_PEND_THROW (1)
+#define MICROPY_PY_MATH             (1)
+#define MICROPY_PY_UHEAPQ           (1)
+#define MICROPY_PY_UTIMEQ           (1)
+#define MICROPY_PY_THREAD           (0) // disable ARM_THUMB_FP using vldr due to RA has single float only
+
+// peripheral config
+#define MICROPY_HW_ENABLE_RTC       (1)
+#define MICROPY_HW_RTC_SOURCE       (0)     // subclock
+#define MICROPY_HW_ENABLE_ADC       (1)
+#define MICROPY_HW_HAS_FLASH        (1)
+#define MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE (1)
+
+// board config
+
+// UART
+#define MICROPY_HW_UART0_TX         (pin_P411) // REPL
+#define MICROPY_HW_UART0_RX         (pin_P410) // REPL
+// #define MICROPY_HW_UART1_TX       (pin_P213) // Disable (Conflict with XTAL)
+// #define MICROPY_HW_UART1_RX       (pin_P212) // Disable (Conflict with XTAL)
+#define MICROPY_HW_UART2_TX         (pin_P302)
+#define MICROPY_HW_UART2_RX         (pin_P301)
+// #define MICROPY_HW_UART3_TX       (pin_P409) // Disable
+// #define MICROPY_HW_UART3_RX       (pin_P408) // Disable
+// #define MICROPY_HW_UART3_CTS      (pin_P411) // Disable (Conflict with UART0_TX)
+// #define MICROPY_HW_UART4_TX       (pin_P205) // Disable (Conflict with TSCAP-A)
+// #define MICROPY_HW_UART4_RX       (pin_P206) // Disable
+// #define MICROPY_HW_UART4_CTS      (pin_P401) // Disable
+#define MICROPY_HW_UART8_TX         (pin_P105) // PMOD B
+#define MICROPY_HW_UART8_RX         (pin_P104) // PMOD B
+#define MICROPY_HW_UART8_CTS        (pin_P107) // PMOD B
+// #define MICROPY_HW_UART9_TX       (pin_P602) // Disable (does not work properly)
+// #define MICROPY_HW_UART9_RX       (pin_P601) // Disable (does not work properly)
+// #define MICROPY_HW_UART9_CTS      (pin_P301) // Disable (does not work properly)
+#define MICROPY_HW_UART_REPL        HW_UART_0
+#define MICROPY_HW_UART_REPL_BAUD   115200
+
+// I2C
+#define MICROPY_HW_I2C0_SCL         (pin_P400)
+#define MICROPY_HW_I2C0_SDA         (pin_P401)
+// #define MICROPY_HW_I2C1_SCL       (pin_P100) // Disable (Conflict with SPI0)
+// #define MICROPY_HW_I2C1_SDA       (pin_P101) // Disable (Conflict with SPI0)
+
+// SPI
+#define MICROPY_HW_SPI0_SSL         (pin_P103) // PMOD A
+#define MICROPY_HW_SPI0_RSPCK       (pin_P102) // PMOD A
+#define MICROPY_HW_SPI0_MISO        (pin_P100) // PMOD A
+#define MICROPY_HW_SPI0_MOSI        (pin_P101) // PMOD A
+// #define MICROPY_HW_SPI1_SSL       (pin_P108) // Disable (Used for J-Link)
+// #define MICROPY_HW_SPI1_RSPCK     (pin_P111)
+// #define MICROPY_HW_SPI1_MISO      (pin_P110)
+// #define MICROPY_HW_SPI1_MOSI      (pin_P109)
+
+// Switch
+#define MICROPY_HW_HAS_SWITCH       (1)
+#define MICROPY_HW_USRSW_PIN        (pin_P415)
+#define MICROPY_HW_USRSW_PULL       (GPIO_NOPULL)
+#define MICROPY_HW_USRSW_EXTI_MODE  (GPIO_MODE_IT_FALLING)
+#define MICROPY_HW_USRSW_PRESSED    (0)
+
+// LEDs
+#define MICROPY_HW_LED1             (pin_P112)
+#define MICROPY_HW_LED_ON(pin)      mp_hal_pin_high(pin)
+#define MICROPY_HW_LED_OFF(pin)     mp_hal_pin_low(pin)
+#define MICROPY_HW_LED_TOGGLE(pin)  mp_hal_pin_toggle(pin)
diff --git a/ports/renesas-ra/boards/RA6M1_EK/mpconfigboard.mk b/ports/renesas-ra/boards/RA6M1_EK/mpconfigboard.mk
new file mode 100644
index 0000000000000..06f5f97bda7b4
--- /dev/null
+++ b/ports/renesas-ra/boards/RA6M1_EK/mpconfigboard.mk
@@ -0,0 +1,6 @@
+CMSIS_MCU = RA6M1
+MCU_SERIES = m4
+LD_FILES = boards/RA6M1_EK/ra6m1_ek.ld
+
+# MicroPython settings
+MICROPY_VFS_FAT = 1
diff --git a/ports/renesas-ra/boards/RA6M1_EK/pins.csv b/ports/renesas-ra/boards/RA6M1_EK/pins.csv
new file mode 100644
index 0000000000000..6f685fa37c68f
--- /dev/null
+++ b/ports/renesas-ra/boards/RA6M1_EK/pins.csv
@@ -0,0 +1,85 @@
+P000,P000
+P001,P001
+P002,P002
+P003,P003
+P004,P004
+P005,P005
+P006,P006
+P007,P007
+P008,P008
+P014,P014
+P015,P015
+P100,P100
+P101,P101
+P102,P102
+P103,P103
+P104,P104
+P105,P105
+P106,P106
+P107,P107
+P108,P108
+P109,P109
+P110,P110
+P111,P111
+P112,P112
+P113,P113
+P114,P114
+P115,P115
+P200,P200
+P201,P201
+P205,P205
+P206,P206
+P207,P207
+P208,P208
+P209,P209
+P210,P210
+P211,P211
+P212,P212
+P213,P213
+P214,P214
+P300,P300
+P301,P301
+P302,P302
+P303,P303
+P304,P304
+P305,P305
+P306,P306
+P307,P307
+P400,P400
+P401,P401
+P402,P402
+P403,P403
+P404,P404
+P405,P405
+P406,P406
+P407,P407
+P408,P408
+P409,P409
+P410,P410
+P411,P411
+P412,P412
+P413,P413
+P414,P414
+P415,P415
+P500,P500
+P501,P501
+P502,P502
+P503,P503
+P504,P504
+P508,P508
+P600,P600
+P601,P601
+P602,P602
+P603,P603
+P608,P608
+P609,P609
+P610,P610
+P708,P708
+P808,P808
+P809,P809
+P914,P914
+P915,P915
+SW1,P415
+LED1,P112
+USBDP,P914
+USBDM,P915
diff --git a/ports/renesas-ra/boards/RA6M1_EK/ra6m1_ek.ld b/ports/renesas-ra/boards/RA6M1_EK/ra6m1_ek.ld
new file mode 100644
index 0000000000000..10ec87aaa60c6
--- /dev/null
+++ b/ports/renesas-ra/boards/RA6M1_EK/ra6m1_ek.ld
@@ -0,0 +1,298 @@
+/*
+                  Linker File for RA6M1 MCU
+*/
+
+/* Linker script to configure memory regions. */
+MEMORY
+{
+  FLASH (rx)         : ORIGIN = 0x00000000, LENGTH = 0x00080000  /* 512KB */
+  RAM (rwx)          : ORIGIN = 0x1FFE0000, LENGTH = 0x00040000  /* 256KB */
+  DATA_FLASH (rx)    : ORIGIN = 0x40100000, LENGTH = 0x00002000  /* 8KB */
+  ID_CODE (rx)       : ORIGIN = 0x0100A150, LENGTH = 0x00000010  /* 32bytes */
+}
+
+/* Library configurations */
+/*GROUP(libgcc.a libc.a libm.a libnosys.a) */
+
+/* Linker script to place sections and symbol values. Should be used together
+ * with other linker script that defines memory regions FLASH and RAM.
+ * It references following symbols, which must be defined in code:
+ *   Reset_Handler : Entry of reset handler
+ *
+ * It defines following symbols, which code can use without definition:
+ *   __exidx_start
+ *   __exidx_end
+ *   __copy_table_start__
+ *   __copy_table_end__
+ *   __zero_table_start__
+ *   __zero_table_end__
+ *   __etext
+ *   __data_start__
+ *   __preinit_array_start
+ *   __preinit_array_end
+ *   __init_array_start
+ *   __init_array_end
+ *   __fini_array_start
+ *   __fini_array_end
+ *   __data_end__
+ *   __bss_start__
+ *   __bss_end__
+ *   __end__
+ *   end
+ *   __HeapLimit
+ *   __StackLimit
+ *   __StackTop
+ *   __stack
+ *   __Vectors_End
+ *   __Vectors_Size
+ */
+ENTRY(Reset_Handler)
+
+SECTIONS
+{
+    .text :
+    {
+        _stext = .;
+        __ROM_Start = .;
+
+        /* Even though the vector table is not 256 entries (1KB) long, we still allocate that much
+         * space because ROM registers are at address 0x400 and there is very little space
+         * in between. */
+        KEEP(*(.fixed_vectors*))
+        KEEP(*(.application_vectors*))
+        __Vectors_End = .;
+        __end__ = .;
+
+        /* ROM Registers start at address 0x00000400 */
+        . = __ROM_Start + 0x400;
+        KEEP(*(.rom_registers*))
+
+        /* Reserving 0x100 bytes of space for ROM registers. */
+        . = __ROM_Start + 0x500;
+
+        *(.text*)
+
+        KEEP(*(.version))
+        KEEP(*(.init))
+        KEEP(*(.fini))
+
+        /* .ctors */
+        *crtbegin.o(.ctors)
+        *crtbegin?.o(.ctors)
+        *(EXCLUDE_FILE(*crtend?.o *crtend.o) .ctors)
+        *(SORT(.ctors.*))
+        *(.ctors)
+
+        /* .dtors */
+        *crtbegin.o(.dtors)
+        *crtbegin?.o(.dtors)
+        *(EXCLUDE_FILE(*crtend?.o *crtend.o) .dtors)
+        *(SORT(.dtors.*))
+        *(.dtors)
+
+        *(.rodata*)
+        __usb_dev_descriptor_start_fs = .;
+        KEEP(*(.usb_device_desc_fs*))
+        __usb_cfg_descriptor_start_fs = .;
+        KEEP(*(.usb_config_desc_fs*))
+        __usb_interface_descriptor_start_fs = .;
+        KEEP(*(.usb_interface_desc_fs*))
+        __usb_descriptor_end_fs = .;
+        __usb_dev_descriptor_start_hs = .;
+        KEEP(*(.usb_device_desc_hs*))
+        __usb_cfg_descriptor_start_hs = .;
+        KEEP(*(.usb_config_desc_hs*))
+        __usb_interface_descriptor_start_hs = .;
+        KEEP(*(.usb_interface_desc_hs*))
+        __usb_descriptor_end_hs = .;
+
+        KEEP(*(.eh_frame*))
+
+        __ROM_End = .;
+        _etext = .;
+    } > FLASH = 0xFF
+
+    __Vectors_Size = __Vectors_End - __Vectors;
+
+    .ARM.extab :
+    {
+        *(.ARM.extab* .gnu.linkonce.armextab.*)
+    } > FLASH
+
+    __exidx_start = .;
+    .ARM.exidx :
+    {
+        *(.ARM.exidx* .gnu.linkonce.armexidx.*)
+    } > FLASH
+    __exidx_end = .;
+
+    /* To copy multiple ROM to RAM sections,
+     * uncomment .copy.table section and,
+     * define __STARTUP_COPY_MULTIPLE in startup_ARMCMx.S */
+    /*
+    .copy.table :
+    {
+        . = ALIGN(4);
+        __copy_table_start__ = .;
+        LONG (__etext)
+        LONG (__data_start__)
+        LONG (__data_end__ - __data_start__)
+        LONG (__etext2)
+        LONG (__data2_start__)
+        LONG (__data2_end__ - __data2_start__)
+        __copy_table_end__ = .;
+    } > FLASH
+    */
+
+    /* To clear multiple BSS sections,
+     * uncomment .zero.table section and,
+     * define __STARTUP_CLEAR_BSS_MULTIPLE in startup_ARMCMx.S */
+    /*
+    .zero.table :
+    {
+        . = ALIGN(4);
+        __zero_table_start__ = .;
+        LONG (__bss_start__)
+        LONG (__bss_end__ - __bss_start__)
+        LONG (__bss2_start__)
+        LONG (__bss2_end__ - __bss2_start__)
+        __zero_table_end__ = .;
+    } > FLASH
+    */
+
+    __etext = .;
+
+    /* If DTC is used, put the DTC vector table at the start of SRAM.
+       This avoids memory holes due to 1K alignment required by it. */
+    .fsp_dtc_vector_table (NOLOAD) :
+    {
+        . = ORIGIN(RAM);
+        *(.fsp_dtc_vector_table)
+    } > RAM
+
+    /* Initialized data section. */
+    .data :
+    {
+        _sidata = .;
+        _sdata = .;
+        __data_start__ = .;
+        *(vtable)
+        *(.data.*)
+
+        . = ALIGN(4);
+        /* preinit data */
+        PROVIDE_HIDDEN (__preinit_array_start = .);
+        KEEP(*(.preinit_array))
+        PROVIDE_HIDDEN (__preinit_array_end = .);
+
+        . = ALIGN(4);
+        /* init data */
+        PROVIDE_HIDDEN (__init_array_start = .);
+        KEEP(*(SORT(.init_array.*)))
+        KEEP(*(.init_array))
+        PROVIDE_HIDDEN (__init_array_end = .);
+
+
+        . = ALIGN(4);
+        /* finit data */
+        PROVIDE_HIDDEN (__fini_array_start = .);
+        KEEP(*(SORT(.fini_array.*)))
+        KEEP(*(.fini_array))
+        PROVIDE_HIDDEN (__fini_array_end = .);
+
+        KEEP(*(.jcr*))
+        . = ALIGN(4);
+
+        __Code_In_RAM_Start = .;
+
+        KEEP(*(.code_in_ram*))
+        __Code_In_RAM_End = .;
+
+        /* All data end */
+        __data_end__ = .;
+        _edata = .;
+
+    } > RAM AT > FLASH
+
+
+
+    .noinit (NOLOAD):
+    {
+        . = ALIGN(4);
+        __noinit_start = .;
+        KEEP(*(.noinit*))
+        __noinit_end = .;
+    } > RAM
+
+    .bss :
+    {
+        . = ALIGN(4);
+        _sbss = .;
+        __bss_start__ = .;
+        *(.bss*)
+        *(COMMON)
+        . = ALIGN(4);
+        __bss_end__ = .;
+        _ebss = .;
+    } > RAM
+
+    .heap (NOLOAD):
+    {
+        . = ALIGN(8);
+        __HeapBase = .;
+        __end__ = .;
+        end = __end__;
+        KEEP(*(.heap*))
+        __HeapLimit = .;
+    } > RAM
+
+    /* Stacks are stored in this section. */
+    .stack_dummy (NOLOAD):
+    {
+        . = ALIGN(8);
+        _sstack = .;
+        __StackLimit = .;
+        /* Main stack */
+        KEEP(*(.stack))
+        __StackTop = .;
+        /* Thread stacks */
+        KEEP(*(.stack*))
+        __StackTopAll = .;
+        _estack = .;
+    } > RAM
+
+    PROVIDE(__stack = __StackTopAll);
+
+    /* This symbol represents the end of user allocated RAM. The RAM after this symbol can be used
+       at run time for things such as ThreadX memory pool allocations. */
+    __RAM_segment_used_end__ = ALIGN(__StackTopAll , 4);
+
+    /* Data flash. */
+    .data_flash :
+    {
+        __Data_Flash_Start = .;
+        KEEP(*(.data_flash*))
+        __Data_Flash_End = .;
+    } > DATA_FLASH
+
+    .id_code :
+    {
+        __ID_Code_Start = .;
+        KEEP(*(.id_code*))
+        __ID_Code_End = .;
+    } > ID_CODE
+}
+/* produce a link error if there is not this amount of RAM for these sections */
+/* _minimum_stack_size = 2K; */
+/* _minimum_heap_size = 16K; */
+
+/* Define tho top end of the stack.  The stack is full descending so begins just
+   above last byte of RAM.  Note that EABI requires the stack to be 8-byte
+   aligned for a call. */
+_estack = ORIGIN(RAM) + LENGTH(RAM);
+
+/* RAM extents for the garbage collector */
+_ram_start = ORIGIN(RAM);
+_ram_end = ORIGIN(RAM) + LENGTH(RAM);
+_heap_start = __HeapBase;	/* heap starts just after statically allocated memory */
+_heap_end = __HeapLimit;	/* tunable */
diff --git a/ports/renesas-ra/boards/RA6M1_EK/ra6m1_ek_conf.h b/ports/renesas-ra/boards/RA6M1_EK/ra6m1_ek_conf.h
new file mode 100644
index 0000000000000..4ef32aefb2812
--- /dev/null
+++ b/ports/renesas-ra/boards/RA6M1_EK/ra6m1_ek_conf.h
@@ -0,0 +1,30 @@
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Renesas Electronics Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#ifndef RA6M1_EK_CONF_H
+#define RA6M1_EK_CONF_H
+
+#define DEBUG_CH    0
+
+#endif /* RA6M1_EK_CONF_H */
diff --git a/ports/renesas-ra/boards/RA6M1_EK/ra_cfg/fsp_cfg/bsp/board_cfg.h b/ports/renesas-ra/boards/RA6M1_EK/ra_cfg/fsp_cfg/bsp/board_cfg.h
new file mode 100644
index 0000000000000..f518a94aa7467
--- /dev/null
+++ b/ports/renesas-ra/boards/RA6M1_EK/ra_cfg/fsp_cfg/bsp/board_cfg.h
@@ -0,0 +1,5 @@
+/* generated configuration header file - do not edit */
+#ifndef BOARD_CFG_H_
+#define BOARD_CFG_H_
+#include "../../../ra/board/ra6m1_ek/board.h"
+#endif /* BOARD_CFG_H_ */
diff --git a/ports/renesas-ra/boards/RA6M1_EK/ra_cfg/fsp_cfg/bsp/bsp_cfg.h b/ports/renesas-ra/boards/RA6M1_EK/ra_cfg/fsp_cfg/bsp/bsp_cfg.h
new file mode 100644
index 0000000000000..54b41a45d4e78
--- /dev/null
+++ b/ports/renesas-ra/boards/RA6M1_EK/ra_cfg/fsp_cfg/bsp/bsp_cfg.h
@@ -0,0 +1,49 @@
+/* generated configuration header file - do not edit */
+#ifndef BSP_CFG_H_
+#define BSP_CFG_H_
+#include "bsp_clock_cfg.h"
+#include "bsp_mcu_family_cfg.h"
+#include "board_cfg.h"
+#define RA_NOT_DEFINED 0
+#ifndef BSP_CFG_RTOS
+#if (RA_NOT_DEFINED) != (RA_NOT_DEFINED)
+#define BSP_CFG_RTOS (2)
+#elif (RA_NOT_DEFINED) != (RA_NOT_DEFINED)
+#define BSP_CFG_RTOS (1)
+#else
+#define BSP_CFG_RTOS (0)
+#endif
+#endif
+#undef RA_NOT_DEFINED
+#define BSP_CFG_MCU_VCC_MV (3300)
+#define BSP_CFG_STACK_MAIN_BYTES (0x4000)
+#define BSP_CFG_HEAP_BYTES (0x2d000)
+#define BSP_CFG_PARAM_CHECKING_ENABLE (0)
+#define BSP_CFG_ASSERT (0)
+#define BSP_CFG_ERROR_LOG (0)
+
+#define BSP_CFG_PFS_PROTECT ((1))
+
+#define BSP_CFG_C_RUNTIME_INIT ((1))
+
+#define BSP_CFG_SOFT_RESET_SUPPORTED ((0))
+
+#ifndef BSP_CLOCK_CFG_MAIN_OSC_POPULATED
+#define BSP_CLOCK_CFG_MAIN_OSC_POPULATED (1)
+#endif
+#ifndef BSP_CLOCK_CFG_MAIN_OSC_WAIT
+#define BSP_CLOCK_CFG_MAIN_OSC_WAIT (9)
+#endif
+#ifndef BSP_CLOCK_CFG_MAIN_OSC_CLOCK_SOURCE
+#define BSP_CLOCK_CFG_MAIN_OSC_CLOCK_SOURCE (0)
+#endif
+#ifndef BSP_CLOCK_CFG_SUBCLOCK_DRIVE
+#define BSP_CLOCK_CFG_SUBCLOCK_DRIVE (0)
+#endif
+#ifndef BSP_CLOCK_CFG_SUBCLOCK_POPULATED
+#define BSP_CLOCK_CFG_SUBCLOCK_POPULATED (1)
+#endif
+#ifndef BSP_CLOCK_CFG_SUBCLOCK_STABILIZATION_MS
+#define BSP_CLOCK_CFG_SUBCLOCK_STABILIZATION_MS 1000
+#endif
+#endif /* BSP_CFG_H_ */
diff --git a/ports/renesas-ra/boards/RA6M1_EK/ra_cfg/fsp_cfg/bsp/bsp_mcu_device_cfg.h b/ports/renesas-ra/boards/RA6M1_EK/ra_cfg/fsp_cfg/bsp/bsp_mcu_device_cfg.h
new file mode 100644
index 0000000000000..bd6a901c32d6e
--- /dev/null
+++ b/ports/renesas-ra/boards/RA6M1_EK/ra_cfg/fsp_cfg/bsp/bsp_mcu_device_cfg.h
@@ -0,0 +1,5 @@
+/* generated configuration header file - do not edit */
+#ifndef BSP_MCU_DEVICE_CFG_H_
+#define BSP_MCU_DEVICE_CFG_H_
+#define BSP_CFG_MCU_PART_SERIES (6)
+#endif /* BSP_MCU_DEVICE_CFG_H_ */
diff --git a/ports/renesas-ra/boards/RA6M1_EK/ra_cfg/fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h b/ports/renesas-ra/boards/RA6M1_EK/ra_cfg/fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h
new file mode 100644
index 0000000000000..5fc7730d2d62d
--- /dev/null
+++ b/ports/renesas-ra/boards/RA6M1_EK/ra_cfg/fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h
@@ -0,0 +1,10 @@
+/* generated configuration header file - do not edit */
+#ifndef BSP_MCU_DEVICE_PN_CFG_H_
+#define BSP_MCU_DEVICE_PN_CFG_H_
+#define BSP_MCU_R7FA6M1AD3CFP
+#define BSP_ROM_SIZE_BYTES (524288)
+#define BSP_RAM_SIZE_BYTES (262144)
+#define BSP_DATA_FLASH_SIZE_BYTES (8192)
+#define BSP_PACKAGE_LQFP
+#define BSP_PACKAGE_PINS (100)
+#endif /* BSP_MCU_DEVICE_PN_CFG_H_ */
diff --git a/ports/renesas-ra/boards/RA6M1_EK/ra_cfg/fsp_cfg/bsp/bsp_mcu_family_cfg.h b/ports/renesas-ra/boards/RA6M1_EK/ra_cfg/fsp_cfg/bsp/bsp_mcu_family_cfg.h
new file mode 100644
index 0000000000000..720eee2d7f317
--- /dev/null
+++ b/ports/renesas-ra/boards/RA6M1_EK/ra_cfg/fsp_cfg/bsp/bsp_mcu_family_cfg.h
@@ -0,0 +1,74 @@
+/* generated configuration header file - do not edit */
+#ifndef BSP_MCU_FAMILY_CFG_H_
+#define BSP_MCU_FAMILY_CFG_H_
+#include "bsp_mcu_device_pn_cfg.h"
+#include "bsp_mcu_device_cfg.h"
+#include "../../../ra/fsp/src/bsp/mcu/ra6m1/bsp_mcu_info.h"
+#include "bsp_clock_cfg.h"
+#define BSP_MCU_GROUP_RA6M1 (1)
+#define BSP_LOCO_HZ                 (32768)
+#define BSP_MOCO_HZ                 (8000000)
+#define BSP_SUB_CLOCK_HZ            (32768)
+#if   BSP_CFG_HOCO_FREQUENCY == 0
+#define BSP_HOCO_HZ                 (16000000)
+#elif BSP_CFG_HOCO_FREQUENCY == 1
+#define BSP_HOCO_HZ                 (18000000)
+#elif BSP_CFG_HOCO_FREQUENCY == 2
+#define BSP_HOCO_HZ                 (20000000)
+#else
+#error "Invalid HOCO frequency chosen (BSP_CFG_HOCO_FREQUENCY) in bsp_clock_cfg.h"
+#endif
+
+#define BSP_CFG_FLL_ENABLE                 (0)
+
+#define BSP_CORTEX_VECTOR_TABLE_ENTRIES    (16U)
+#define BSP_VECTOR_TABLE_MAX_ENTRIES       (112U)
+#define BSP_MCU_VBATT_SUPPORT       (1)
+
+#define OFS_SEQ1 0xA001A001 | (1 << 1) | (3 << 2)
+#define OFS_SEQ2 (15 << 4) | (3 << 8) | (3 << 10)
+#define OFS_SEQ3 (1 << 12) | (1 << 14) | (1 << 17)
+#define OFS_SEQ4 (3 << 18) | (15 << 20) | (3 << 24) | (3 << 26)
+#define OFS_SEQ5 (1 << 28) | (1 << 30)
+#define BSP_CFG_ROM_REG_OFS0 (OFS_SEQ1 | OFS_SEQ2 | OFS_SEQ3 | OFS_SEQ4 | OFS_SEQ5)
+#define BSP_CFG_ROM_REG_OFS1 (0xFFFFFEF8 | (1 << 2) | (3) | (1 << 8))
+#define BSP_CFG_ROM_REG_MPU_PC0_ENABLE (1)
+#define BSP_CFG_ROM_REG_MPU_PC0_START (0xFFFFFFFC)
+#define BSP_CFG_ROM_REG_MPU_PC0_END (0xFFFFFFFF)
+#define BSP_CFG_ROM_REG_MPU_PC1_ENABLE (1)
+#define BSP_CFG_ROM_REG_MPU_PC1_START (0xFFFFFFFC)
+#define BSP_CFG_ROM_REG_MPU_PC1_END (0xFFFFFFFF)
+#define BSP_CFG_ROM_REG_MPU_REGION0_ENABLE (1)
+#define BSP_CFG_ROM_REG_MPU_REGION0_START (0x00FFFFFC)
+#define BSP_CFG_ROM_REG_MPU_REGION0_END (0x00FFFFFF)
+#define BSP_CFG_ROM_REG_MPU_REGION1_ENABLE (1)
+#define BSP_CFG_ROM_REG_MPU_REGION1_START (0x200FFFFC)
+#define BSP_CFG_ROM_REG_MPU_REGION1_END (0x200FFFFF)
+#define BSP_CFG_ROM_REG_MPU_REGION2_ENABLE (1)
+#define BSP_CFG_ROM_REG_MPU_REGION2_START (0x407FFFFC)
+#define BSP_CFG_ROM_REG_MPU_REGION2_END (0x407FFFFF)
+#define BSP_CFG_ROM_REG_MPU_REGION3_ENABLE (1)
+#define BSP_CFG_ROM_REG_MPU_REGION3_START (0x400DFFFC)
+#define BSP_CFG_ROM_REG_MPU_REGION3_END (0x400DFFFF)
+
+/* Used to create IELS values for the interrupt initialization table g_interrupt_event_link_select. */
+#define BSP_PRV_IELS_ENUM(vector)    (ELC_##vector)
+
+/*
+ ID Code
+ Note: To permanently lock and disable the debug interface define the BSP_ID_CODE_PERMANENTLY_LOCKED in the compiler settings.
+ WARNING: This will disable debug access to the part and cannot be reversed by a debug probe.
+ */
+#if defined(BSP_ID_CODE_PERMANENTLY_LOCKED)
+#define BSP_CFG_ID_CODE_LONG_1 (0x00000000)
+#define BSP_CFG_ID_CODE_LONG_2 (0x00000000)
+#define BSP_CFG_ID_CODE_LONG_3 (0x00000000)
+#define BSP_CFG_ID_CODE_LONG_4 (0x00000000)
+#else
+/* ID CODE: FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF */
+#define BSP_CFG_ID_CODE_LONG_1 (0xFFFFFFFF)
+#define BSP_CFG_ID_CODE_LONG_2 (0xFFFFFFFF)
+#define BSP_CFG_ID_CODE_LONG_3 (0xFFFFFFFF)
+#define BSP_CFG_ID_CODE_LONG_4 (0xffFFFFFF)
+#endif
+#endif /* BSP_MCU_FAMILY_CFG_H_ */
diff --git a/ports/renesas-ra/boards/RA6M1_EK/ra_cfg/fsp_cfg/r_adc_cfg.h b/ports/renesas-ra/boards/RA6M1_EK/ra_cfg/fsp_cfg/r_adc_cfg.h
new file mode 100644
index 0000000000000..9c59889ca8fee
--- /dev/null
+++ b/ports/renesas-ra/boards/RA6M1_EK/ra_cfg/fsp_cfg/r_adc_cfg.h
@@ -0,0 +1,5 @@
+/* generated configuration header file - do not edit */
+#ifndef R_ADC_CFG_H_
+#define R_ADC_CFG_H_
+#define ADC_CFG_PARAM_CHECKING_ENABLE (BSP_CFG_PARAM_CHECKING_ENABLE)
+#endif /* R_ADC_CFG_H_ */
diff --git a/ports/renesas-ra/boards/RA6M1_EK/ra_cfg/fsp_cfg/r_agt_cfg.h b/ports/renesas-ra/boards/RA6M1_EK/ra_cfg/fsp_cfg/r_agt_cfg.h
new file mode 100644
index 0000000000000..d3ab559238cbd
--- /dev/null
+++ b/ports/renesas-ra/boards/RA6M1_EK/ra_cfg/fsp_cfg/r_agt_cfg.h
@@ -0,0 +1,7 @@
+/* generated configuration header file - do not edit */
+#ifndef R_AGT_CFG_H_
+#define R_AGT_CFG_H_
+#define AGT_CFG_PARAM_CHECKING_ENABLE (BSP_CFG_PARAM_CHECKING_ENABLE)
+#define AGT_CFG_OUTPUT_SUPPORT_ENABLE (0)
+#define AGT_CFG_INPUT_SUPPORT_ENABLE (0)
+#endif /* R_AGT_CFG_H_ */
diff --git a/ports/renesas-ra/boards/RA6M1_EK/ra_cfg/fsp_cfg/r_dtc_cfg.h b/ports/renesas-ra/boards/RA6M1_EK/ra_cfg/fsp_cfg/r_dtc_cfg.h
new file mode 100644
index 0000000000000..21405f96741e2
--- /dev/null
+++ b/ports/renesas-ra/boards/RA6M1_EK/ra_cfg/fsp_cfg/r_dtc_cfg.h
@@ -0,0 +1,6 @@
+/* generated configuration header file - do not edit */
+#ifndef R_DTC_CFG_H_
+#define R_DTC_CFG_H_
+#define DTC_CFG_PARAM_CHECKING_ENABLE (BSP_CFG_PARAM_CHECKING_ENABLE)
+#define DTC_CFG_VECTOR_TABLE_SECTION_NAME ".fsp_dtc_vector_table"
+#endif /* R_DTC_CFG_H_ */
diff --git a/ports/renesas-ra/boards/RA6M1_EK/ra_cfg/fsp_cfg/r_flash_hp_cfg.h b/ports/renesas-ra/boards/RA6M1_EK/ra_cfg/fsp_cfg/r_flash_hp_cfg.h
new file mode 100644
index 0000000000000..48c9dec4e0764
--- /dev/null
+++ b/ports/renesas-ra/boards/RA6M1_EK/ra_cfg/fsp_cfg/r_flash_hp_cfg.h
@@ -0,0 +1,7 @@
+/* generated configuration header file - do not edit */
+#ifndef R_FLASH_HP_CFG_H_
+#define R_FLASH_HP_CFG_H_
+#define FLASH_HP_CFG_PARAM_CHECKING_ENABLE (BSP_CFG_PARAM_CHECKING_ENABLE)
+#define FLASH_HP_CFG_CODE_FLASH_PROGRAMMING_ENABLE (1)
+#define FLASH_HP_CFG_DATA_FLASH_PROGRAMMING_ENABLE (0)
+#endif /* R_FLASH_HP_CFG_H_ */
diff --git a/ports/renesas-ra/boards/RA6M1_EK/ra_cfg/fsp_cfg/r_icu_cfg.h b/ports/renesas-ra/boards/RA6M1_EK/ra_cfg/fsp_cfg/r_icu_cfg.h
new file mode 100644
index 0000000000000..5e77b6980f4ee
--- /dev/null
+++ b/ports/renesas-ra/boards/RA6M1_EK/ra_cfg/fsp_cfg/r_icu_cfg.h
@@ -0,0 +1,5 @@
+/* generated configuration header file - do not edit */
+#ifndef R_ICU_CFG_H_
+#define R_ICU_CFG_H_
+#define ICU_CFG_PARAM_CHECKING_ENABLE (BSP_CFG_PARAM_CHECKING_ENABLE)
+#endif /* R_ICU_CFG_H_ */
diff --git a/ports/renesas-ra/boards/RA6M1_EK/ra_cfg/fsp_cfg/r_iic_master_cfg.h b/ports/renesas-ra/boards/RA6M1_EK/ra_cfg/fsp_cfg/r_iic_master_cfg.h
new file mode 100644
index 0000000000000..595ea938d13a7
--- /dev/null
+++ b/ports/renesas-ra/boards/RA6M1_EK/ra_cfg/fsp_cfg/r_iic_master_cfg.h
@@ -0,0 +1,7 @@
+/* generated configuration header file - do not edit */
+#ifndef R_IIC_MASTER_CFG_H_
+#define R_IIC_MASTER_CFG_H_
+#define IIC_MASTER_CFG_PARAM_CHECKING_ENABLE (BSP_CFG_PARAM_CHECKING_ENABLE)
+#define IIC_MASTER_CFG_DTC_ENABLE (0)
+#define IIC_MASTER_CFG_ADDR_MODE_10_BIT_ENABLE (0)
+#endif /* R_IIC_MASTER_CFG_H_ */
diff --git a/ports/renesas-ra/boards/RA6M1_EK/ra_cfg/fsp_cfg/r_ioport_cfg.h b/ports/renesas-ra/boards/RA6M1_EK/ra_cfg/fsp_cfg/r_ioport_cfg.h
new file mode 100644
index 0000000000000..6b4353d238352
--- /dev/null
+++ b/ports/renesas-ra/boards/RA6M1_EK/ra_cfg/fsp_cfg/r_ioport_cfg.h
@@ -0,0 +1,5 @@
+/* generated configuration header file - do not edit */
+#ifndef R_IOPORT_CFG_H_
+#define R_IOPORT_CFG_H_
+#define IOPORT_CFG_PARAM_CHECKING_ENABLE (BSP_CFG_PARAM_CHECKING_ENABLE)
+#endif /* R_IOPORT_CFG_H_ */
diff --git a/ports/renesas-ra/boards/RA6M1_EK/ra_cfg/fsp_cfg/r_lpm_cfg.h b/ports/renesas-ra/boards/RA6M1_EK/ra_cfg/fsp_cfg/r_lpm_cfg.h
new file mode 100644
index 0000000000000..5f4d5c4a73627
--- /dev/null
+++ b/ports/renesas-ra/boards/RA6M1_EK/ra_cfg/fsp_cfg/r_lpm_cfg.h
@@ -0,0 +1,5 @@
+/* generated configuration header file - do not edit */
+#ifndef R_LPM_CFG_H_
+#define R_LPM_CFG_H_
+#define LPM_CFG_PARAM_CHECKING_ENABLE (BSP_CFG_PARAM_CHECKING_ENABLE)
+#endif /* R_LPM_CFG_H_ */
diff --git a/ports/renesas-ra/boards/RA6M1_EK/ra_cfg/fsp_cfg/r_rtc_cfg.h b/ports/renesas-ra/boards/RA6M1_EK/ra_cfg/fsp_cfg/r_rtc_cfg.h
new file mode 100644
index 0000000000000..484b7ed044c26
--- /dev/null
+++ b/ports/renesas-ra/boards/RA6M1_EK/ra_cfg/fsp_cfg/r_rtc_cfg.h
@@ -0,0 +1,5 @@
+/* generated configuration header file - do not edit */
+#ifndef R_RTC_CFG_H_
+#define R_RTC_CFG_H_
+#define RTC_CFG_PARAM_CHECKING_ENABLE (BSP_CFG_PARAM_CHECKING_ENABLE)
+#endif /* R_RTC_CFG_H_ */
diff --git a/ports/renesas-ra/boards/RA6M1_EK/ra_cfg/fsp_cfg/r_sci_uart_cfg.h b/ports/renesas-ra/boards/RA6M1_EK/ra_cfg/fsp_cfg/r_sci_uart_cfg.h
new file mode 100644
index 0000000000000..c70c0be344f9d
--- /dev/null
+++ b/ports/renesas-ra/boards/RA6M1_EK/ra_cfg/fsp_cfg/r_sci_uart_cfg.h
@@ -0,0 +1,8 @@
+/* generated configuration header file - do not edit */
+#ifndef R_SCI_UART_CFG_H_
+#define R_SCI_UART_CFG_H_
+#define SCI_UART_CFG_PARAM_CHECKING_ENABLE (BSP_CFG_PARAM_CHECKING_ENABLE)
+#define SCI_UART_CFG_FIFO_SUPPORT (0)
+#define SCI_UART_CFG_DTC_SUPPORTED (0)
+#define SCI_UART_CFG_FLOW_CONTROL_SUPPORT (0)
+#endif /* R_SCI_UART_CFG_H_ */
diff --git a/ports/renesas-ra/boards/RA6M1_EK/ra_cfg/fsp_cfg/r_spi_cfg.h b/ports/renesas-ra/boards/RA6M1_EK/ra_cfg/fsp_cfg/r_spi_cfg.h
new file mode 100644
index 0000000000000..861fe12194f63
--- /dev/null
+++ b/ports/renesas-ra/boards/RA6M1_EK/ra_cfg/fsp_cfg/r_spi_cfg.h
@@ -0,0 +1,7 @@
+/* generated configuration header file - do not edit */
+#ifndef R_SPI_CFG_H_
+#define R_SPI_CFG_H_
+#define SPI_CFG_PARAM_CHECKING_ENABLE (BSP_CFG_PARAM_CHECKING_ENABLE)
+#define SPI_DTC_SUPPORT_ENABLE (1)
+#define SPI_TRANSMIT_FROM_RXI_ISR (0)
+#endif /* R_SPI_CFG_H_ */
diff --git a/ports/renesas-ra/boards/RA6M1_EK/ra_gen/RA6M1-EK.csv b/ports/renesas-ra/boards/RA6M1_EK/ra_gen/RA6M1-EK.csv
new file mode 100644
index 0000000000000..3e1b001163d51
--- /dev/null
+++ b/ports/renesas-ra/boards/RA6M1_EK/ra_gen/RA6M1-EK.csv
@@ -0,0 +1,462 @@
+"Name","Pin","Function","Drive Capacity","IRQ","Mode","Output type","Pull up","Port Capabilities"
+"AVCC0","88","ANALOG0_AVCC0","","","","","",""
+"AVSS0","89","ANALOG0_AVSS0","","","","","",""
+"P000","100","","","","Disabled","","","ACMPHS0: IVCMP
+ADC0: AN00
+ICU0: IRQ06"
+"P001","99","","","","Disabled","","","ACMPHS1: IVCMP
+ADC0: AN01
+ICU0: IRQ07"
+"P002","98","","","","Disabled","","","ACMPHS2: IVCMP
+ADC0: AN02
+ICU0: IRQ08"
+"P003","97","","","","Disabled","","","ADC0: AN07"
+"P004","96","ADC1_AN00","","","Analog mode","","","ACMPHS3: IVCMP
+ADC1: AN00
+ICU0: IRQ09"
+"P005","95","","","","Disabled","","","ACMPHS4: IVCMP
+ADC1: AN01
+ICU0: IRQ10"
+"P006","94","","","","Disabled","","","ACMPHS5: IVCMP
+ADC1: AN02
+ICU0: IRQ11"
+"P007","93","","","","Disabled","","","ADC1: AN07"
+"P008","92","","","","Disabled","","","ADC0: AN03
+ICU0: IRQ12"
+"P014","85","","","","Disabled","","","ACMPHS0: IVREF
+ACMPHS1: IVREF
+ACMPHS2: IVREF
+ACMPHS3: IVREF
+ACMPHS4: IVREF
+ACMPHS5: IVREF
+ADC0: AN05
+ADC1: AN05
+DAC0: DA"
+"P015","84","","","","Disabled","","","ACMPHS0: IVCMP
+ACMPHS1: IVCMP
+ACMPHS2: IVCMP
+ACMPHS3: IVCMP
+ACMPHS4: IVCMP
+ACMPHS5: IVCMP
+ADC0: AN06
+ADC1: AN06
+DAC1: DA
+ICU0: IRQ13"
+"P100","75","SPI0_MISO","Low","None","Peripheral mode","CMOS","None","AGT0: AGTIO
+BUS_ASYNCH0: D00
+GPT_POEG0: GTETRG
+GPT5: GTIOCB
+ICU0: IRQ02
+IIC1: SCL
+KINT0: KRM0
+SCI0: RXD
+SCI0: SCL
+SCI1: SCK
+SPI0: MISO"
+"P101","74","SPI0_MOSI","Low","None","Peripheral mode","CMOS","None","AGT0: AGTEE
+BUS_ASYNCH0: D01
+GPT_POEG1: GTETRG
+GPT5: GTIOCA
+ICU0: IRQ01
+IIC1: SDA
+KINT0: KRM1
+SCI0: SDA
+SCI0: TXD
+SCI1: CTS
+SPI0: MOSI"
+"P102","73","SPI0_RSPCK","Low","","Peripheral mode","CMOS","None","ADC0: ADTRG
+AGT0: AGTO
+BUS_ASYNCH0: D02
+CAN0: CRX
+GPT_OPS0: GTOWLO
+GPT2: GTIOCB
+KINT0: KRM2
+SCI0: SCK
+SPI0: RSPCK"
+"P103","72","SPI0_SSL0","Low","","Peripheral mode","CMOS","None","BUS_ASYNCH0: D03
+CAN0: CTX
+GPT_OPS0: GTOWUP
+GPT2: GTIOCA
+KINT0: KRM3
+SCI0: CTS
+SPI0: SSL0"
+"P104","71","SCI8_RXD","Low","None","Peripheral mode","CMOS","None","BUS_ASYNCH0: D04
+GPT_POEG1: GTETRG
+GPT1: GTIOCB
+ICU0: IRQ01
+KINT0: KRM4
+QSPI0: QIO0
+SCI8: RXD
+SCI8: SCL
+SPI0: SSL1"
+"P105","70","SCI8_TXD","Low","None","Peripheral mode","CMOS","None","BUS_ASYNCH0: D05
+GPT_POEG0: GTETRG
+GPT1: GTIOCA
+ICU0: IRQ00
+KINT0: KRM5
+QSPI0: QIO1
+SCI8: SDA
+SCI8: TXD
+SPI0: SSL2"
+"P106","69","GPIO","Low","","Output mode (Initial Low)","CMOS","","AGT0: AGTOB
+BUS_ASYNCH0: D06
+GPT8: GTIOCB
+KINT0: KRM6
+QSPI0: QIO2
+SCI8: SCK
+SPI0: SSL3"
+"P107","68","GPIO","Low","","Output mode (Initial Low)","CMOS","","AGT0: AGTOA
+BUS_ASYNCH0: D07
+GPT8: GTIOCA
+KINT0: KRM7
+QSPI0: QIO3
+SCI8: CTS"
+"P108","51","DEBUG0_TMS","Low","","Peripheral mode","CMOS","None","DEBUG0: SWDIO
+DEBUG0: TMS
+GPT_OPS0: GTOULO
+GPT0: GTIOCB
+SCI9: CTS
+SPI1: SSL0"
+"P109","52","DEBUG0_TDO","Low","","Peripheral mode","CMOS","None","CAN1: CTX
+CGC0: CLKOUT
+DEBUG0: TDO
+DEBUG0: TRACESWO
+GPT_OPS0: GTOVUP
+GPT1: GTIOCA
+SCI9: SDA
+SCI9: TXD
+SPI1: MOSI"
+"P110","53","DEBUG0_TDI","Low","None","Peripheral mode","CMOS","None","ACMP(0-5): VCOUT
+CAN1: CRX
+DEBUG0: TDI
+GPT_OPS0: GTOVLO
+GPT1: GTIOCB
+ICU0: IRQ03
+SCI2: CTS
+SCI9: RXD
+SCI9: SCL
+SPI1: MISO"
+"P111","54","","","","Disabled","","","BUS_ASYNCH0: A05
+GPT3: GTIOCA
+ICU0: IRQ04
+SCI2: SCK
+SCI9: SCK
+SPI1: RSPCK"
+"P112","55","GPIO","Low","","Output mode (Initial Low)","CMOS","","BUS_ASYNCH0: A04
+GPT3: GTIOCB
+SCI1: SCK
+SCI2: SDA
+SCI2: TXD
+SPI1: SSL0
+SSI0: SSISCK"
+"P113","56","","","","Disabled","","","BUS_ASYNCH0: A03
+GPT2: GTIOCA
+SCI2: RXD
+SCI2: SCL
+SSI0: SSIWS"
+"P114","57","","","","Disabled","","","BUS_ASYNCH0: A02
+GPT2: GTIOCB
+SSI0: SSIRXD"
+"P115","58","","","","Disabled","","","BUS_ASYNCH0: A01
+GPT4: GTIOCA
+SSI0: SSITXD"
+"P200","40","","","","Disabled","","","ICU0: NMI"
+"P201","39","GPIO","","","Input mode","","None","SYSTEM0: MD"
+"P205","32","CTSU0_TSCAP","Low","None","Peripheral mode","CMOS","None","AGT1: AGTO
+CGC0: CLKOUT
+CTSU0: TSCAP
+GPT_OPS0: GTIV
+GPT4: GTIOCA
+ICU0: IRQ01
+IIC1: SCL
+SCI4: SDA
+SCI4: TXD
+SCI9: CTS
+SDHI0: DAT3
+USB_FS0: OVRCURA"
+"P206","31","","","","Disabled","","","BUS_ASYNCH0: WAIT
+CTSU0: TS01
+GPT_OPS0: GTIU
+ICU0: IRQ00
+IIC1: SDA
+SCI4: RXD
+SCI4: SCL
+SDHI0: DAT2
+USB_FS0: VBUSEN"
+"P207","30","CTSU0_TS02","Low","","Peripheral mode","CMOS","None","CTSU0: TS02
+QSPI0: QSSL"
+"P208","37","","","","Disabled","","","BUS_ASYNCH0: CS4
+DEBUG_TRACE0: TDATA3
+GPT_OPS0: GTOVLO
+QSPI0: QIO3
+SDHI0: DAT0"
+"P209","36","","","","Disabled","","","BUS_ASYNCH0: CS5
+DEBUG_TRACE0: TDATA2
+GPT_OPS0: GTOVUP
+QSPI0: QIO2
+SDHI0: WP"
+"P210","35","","","","Disabled","","","BUS_ASYNCH0: CS6
+DEBUG_TRACE0: TDATA1
+GPT_OPS0: GTIW
+QSPI0: QIO1
+SDHI0: CD"
+"P211","34","","","","Disabled","","","BUS_ASYNCH0: CS7
+DEBUG_TRACE0: TDATA0
+GPT_OPS0: GTIV
+QSPI0: QIO0
+SDHI0: CMD"
+"P212","14","","","","Disabled","","","AGT1: AGTEE
+CGC0: EXTAL
+GPT_POEG3: GTETRG
+GPT0: GTIOCB
+ICU0: IRQ03
+SCI1: RXD
+SCI1: SCL"
+"P213","13","","","","Disabled","","","ADC1: ADTRG
+CGC0: XTAL
+GPT_POEG2: GTETRG
+GPT0: GTIOCA
+ICU0: IRQ02
+SCI1: SDA
+SCI1: TXD"
+"P214","33","","","","Disabled","","","DEBUG_TRACE0: TCLK
+GPT_OPS0: GTIU
+QSPI0: QSPCLK
+SDHI0: CLK"
+"P300","50","DEBUG0_TCK","Low","","Peripheral mode","CMOS","None","DEBUG0: SWCLK
+DEBUG0: TCK
+GPT_OPS0: GTOUUP
+GPT0: GTIOCA
+SPI1: SSL1"
+"P301","49","SCI2_RXD","Low","None","Peripheral mode","CMOS","None","AGT0: AGTIO
+BUS_ASYNCH0: A06
+GPT_OPS0: GTOULO
+GPT4: GTIOCB
+ICU0: IRQ06
+SCI2: RXD
+SCI2: SCL
+SCI9: CTS
+SPI1: SSL2"
+"P302","48","SCI2_TXD","Low","None","Peripheral mode","CMOS","None","BUS_ASYNCH0: A07
+GPT_OPS0: GTOUUP
+GPT4: GTIOCA
+ICU0: IRQ05
+SCI2: SDA
+SCI2: TXD
+SPI1: SSL3"
+"P303","47","","","","Disabled","","","BUS_ASYNCH0: A08
+GPT7: GTIOCB"
+"P304","44","","","","Disabled","","","BUS_ASYNCH0: A09
+GPT_OPS0: GTOWLO
+GPT7: GTIOCA
+ICU0: IRQ09"
+"P305","43","","","","Disabled","","","BUS_ASYNCH0: A10
+GPT_OPS0: GTOWUP
+ICU0: IRQ08
+QSPI0: QSPCLK"
+"P306","42","","","","Disabled","","","BUS_ASYNCH0: A11
+GPT_OPS0: GTOULO
+QSPI0: QSSL"
+"P307","41","","","","Disabled","","","BUS_ASYNCH0: A12
+GPT_OPS0: GTOUUP
+QSPI0: QIO0"
+"P400","1","IIC0_SCL","Medium","None","Peripheral mode","CMOS","None","ADC1: ADTRG
+AGT1: AGTIO
+GPT6: GTIOCA
+ICU0: IRQ00
+IIC0: SCL
+SCI4: SCK
+SSI_COMMON0: AUDIO_CLK"
+"P401","2","IIC0_SDA","Medium","None","Peripheral mode","CMOS","None","CAN0: CTX
+GPT_POEG0: GTETRG
+GPT6: GTIOCB
+ICU0: IRQ05
+IIC0: SDA
+SCI4: CTS"
+"P402","3","","","","Disabled","","","AGT0: AGTIO
+AGT1: AGTIO
+CAC0: CACREF
+CAN0: CRX
+ICU0: IRQ04
+RTC0: RTCIC0
+SSI_COMMON0: AUDIO_CLK"
+"P403","4","","","","Disabled","","","AGT0: AGTIO
+AGT1: AGTIO
+GPT3: GTIOCA
+RTC0: RTCIC1
+SSI0: SSISCK"
+"P404","5","","","","Disabled","","","GPT3: GTIOCB
+RTC0: RTCIC2
+SSI0: SSIWS"
+"P405","6","","","","Disabled","","","GPT1: GTIOCA
+SSI0: SSITXD"
+"P406","7","","","","Disabled","","","GPT1: GTIOCB
+SSI0: SSIRXD"
+"P407","25","USBFS0_VBUS","Low","","Peripheral mode","CMOS","None","ADC0: ADTRG
+AGT0: AGTIO
+CTSU0: TS03
+IIC0: SDA
+RTC0: RTCOUT
+SCI4: CTS
+USB_FS0: VBUS"
+"P408","24","","","","Disabled","","","CTSU0: TS04
+GPT_OPS0: GTOWLO
+GPT10: GTIOCB
+ICU0: IRQ07
+IIC0: SCL
+SCI3: RXD
+SCI3: SCL
+USB_FS0: ID"
+"P409","23","","","","Disabled","","","CTSU0: TS05
+GPT_OPS0: GTOWUP
+GPT10: GTIOCA
+ICU0: IRQ06
+SCI3: SDA
+SCI3: TXD
+USB_FS0: EXICEN"
+"P410","22","SCI0_RXD","Low","None","Peripheral mode","CMOS","None","AGT1: AGTOB
+CTSU0: TS06
+GPT_OPS0: GTOVLO
+GPT9: GTIOCB
+ICU0: IRQ05
+SCI0: RXD
+SCI0: SCL
+SCI3: SCK
+SDHI0: DAT1
+SPI0: MISO"
+"P411","21","SCI0_TXD","Low","None","Peripheral mode","CMOS","None","AGT1: AGTOA
+CTSU0: TS07
+GPT_OPS0: GTOVUP
+GPT9: GTIOCA
+ICU0: IRQ04
+SCI0: SDA
+SCI0: TXD
+SCI3: CTS
+SDHI0: DAT0
+SPI0: MOSI"
+"P412","20","","","","Disabled","","","AGT1: AGTEE
+CTSU0: TS08
+GPT_OPS0: GTOULO
+SCI0: SCK
+SDHI0: CMD
+SPI0: RSPCK"
+"P413","19","","","","Disabled","","","CTSU0: TS09
+GPT_OPS0: GTOUUP
+SCI0: CTS
+SDHI0: CLK
+SPI0: SSL0"
+"P414","18","","","","Disabled","","","CTSU0: TS10
+GPT0: GTIOCB
+ICU0: IRQ09
+SDHI0: WP
+SPI0: SSL1"
+"P415","17","GPIO","","IRQ08","Input mode","","None","CTSU0: TS11
+GPT0: GTIOCA
+ICU0: IRQ08
+SDHI0: CD
+SPI0: SSL2
+USB_FS0: VBUSEN"
+"P500","76","","","","Disabled","","","ACMPHS0: IVREF
+ACMPHS1: IVREF
+ACMPHS2: IVREF
+ACMPHS3: IVREF
+ACMPHS4: IVREF
+ACMPHS5: IVREF
+ADC0: AN16
+AGT0: AGTOA
+GPT_OPS0: GTIU
+GPT11: GTIOCA
+QSPI0: QSPCLK
+SDHI1: CLK
+USB_FS0: VBUSEN"
+"P501","77","","","","Disabled","","","ACMPHS0: IVREF
+ACMPHS1: IVREF
+ACMPHS2: IVREF
+ACMPHS3: IVREF
+ACMPHS4: IVREF
+ACMPHS5: IVREF
+ADC1: AN16
+AGT0: AGTOB
+GPT_OPS0: GTIV
+GPT11: GTIOCB
+ICU0: IRQ11
+QSPI0: QSSL
+SDHI1: CMD
+USB_FS0: OVRCURA"
+"P502","78","","","","Disabled","","","ACMPHS0: IVCMP
+ACMPHS1: IVCMP
+ACMPHS2: IVCMP
+ACMPHS3: IVCMP
+ACMPHS4: IVCMP
+ACMPHS5: IVCMP
+ADC0: AN17
+GPT_OPS0: GTIW
+GPT12: GTIOCA
+ICU0: IRQ12
+QSPI0: QIO0
+SDHI1: DAT0
+USB_FS0: OVRCURB"
+"P503","79","","","","Disabled","","","ADC1: AN17
+GPT_POEG2: GTETRG
+GPT12: GTIOCB
+QSPI0: QIO1
+SDHI1: DAT1
+USB_FS0: EXICEN"
+"P504","80","","","","Disabled","","","ADC0: AN18
+BUS_ASYNCH0: ALE
+GPT_POEG3: GTETRG
+QSPI0: QIO2
+SDHI1: DAT2
+USB_FS0: ID"
+"P508","81","","","","Disabled","","","ADC0: AN20
+SDHI1: DAT3"
+"P600","67","","","","Disabled","","","BUS_ASYNCH0: RD
+CAC0: CACREF
+CGC0: CLKOUT
+GPT6: GTIOCB
+SCI9: SCK"
+"P601","66","","","","Disabled","","","BUS_ASYNCH0: WR0
+GPT6: GTIOCA
+SCI9: RXD
+SCI9: SCL"
+"P602","65","","","","Disabled","","","BUS_ASYNCH0: BCLK
+GPT7: GTIOCB
+SCI9: SDA
+SCI9: TXD"
+"P608","59","","","","Disabled","","","BUS_ASYNCH0: A00
+GPT4: GTIOCB"
+"P609","60","","","","Disabled","","","BUS_ASYNCH0: CS1
+CAN1: CTX
+GPT5: GTIOCA"
+"P610","61","","","","Disabled","","","BUS_ASYNCH0: CS0
+CAN1: CRX
+GPT5: GTIOCB"
+"P708","16","","","","Disabled","","","CAC0: CACREF
+CTSU0: TS12
+ICU0: IRQ11
+SCI1: RXD
+SCI1: SCL
+SPI0: SSL3
+SSI_COMMON0: AUDIO_CLK"
+"RES#","38","SYSTEM0_RES","","","","","",""
+"USBDM","27","USBFS0_DM","","","","","",""
+"USBDP","28","USBFS0_DP","","","","","",""
+"VBATT","8","SYSTEM0_VBATT","","","","","",""
+"VCC","46","SYSTEM0_VCC","","","","","",""
+"VCC","15","SYSTEM0_VCC","","","","","",""
+"VCC","82","SYSTEM0_VCC","","","","","",""
+"VCC","62","SYSTEM0_VCC","","","","","",""
+"VCCUSB","29","USBFS0_VCC","","","","","",""
+"VCL","64","SYSTEM0_VCL","","","","","",""
+"VCL0","9","SYSTEM0_VCL0","","","","","",""
+"VREFH","87","ANALOG0_VREFH","","","","","",""
+"VREFH0","91","ANALOG0_VREFH0","","","","","",""
+"VREFL","86","ANALOG0_VREFL","","","","","",""
+"VREFL0","90","ANALOG0_VREFL0","","","","","",""
+"VSS","12","SYSTEM0_VSS","","","","","",""
+"VSS","45","SYSTEM0_VSS","","","","","",""
+"VSS","83","SYSTEM0_VSS","","","","","",""
+"VSS","63","SYSTEM0_VSS","","","","","",""
+"VSSUSB","26","USBFS0_VSS","","","","","",""
+"XCIN","10","CGC0_XCIN","","","","","",""
+"XCOUT","11","CGC0_XCOUT","","","","","",""
diff --git a/ports/renesas-ra/boards/RA6M1_EK/ra_gen/bsp_clock_cfg.h b/ports/renesas-ra/boards/RA6M1_EK/ra_gen/bsp_clock_cfg.h
new file mode 100644
index 0000000000000..013621000b891
--- /dev/null
+++ b/ports/renesas-ra/boards/RA6M1_EK/ra_gen/bsp_clock_cfg.h
@@ -0,0 +1,23 @@
+/* generated configuration header file - do not edit */
+#ifndef BSP_CLOCK_CFG_H_
+#define BSP_CLOCK_CFG_H_
+#define BSP_CFG_CLOCKS_SECURE (0)
+#define BSP_CFG_CLOCKS_OVERRIDE (0)
+#define BSP_CFG_XTAL_HZ (12000000) /* XTAL 12000000Hz */
+#define BSP_CFG_PLL_SOURCE (BSP_CLOCKS_SOURCE_CLOCK_MAIN_OSC) /* PLL Src: XTAL */
+#define BSP_CFG_HOCO_FREQUENCY (2) /* HOCO 20MHz */
+#define BSP_CFG_PLL_DIV (BSP_CLOCKS_PLL_DIV_1) /* PLL Div /1 */
+#define BSP_CFG_PLL_MUL BSP_CLOCKS_PLL_MUL_20_0 /* PLL Mul x20.0 */
+#define BSP_CFG_CLOCK_SOURCE (BSP_CLOCKS_SOURCE_CLOCK_PLL) /* Clock Src: PLL */
+#define BSP_CFG_ICLK_DIV (BSP_CLOCKS_SYS_CLOCK_DIV_2) /* ICLK Div /2 */
+#define BSP_CFG_PCLKA_DIV (BSP_CLOCKS_SYS_CLOCK_DIV_2) /* PCLKA Div /2 */
+#define BSP_CFG_PCLKB_DIV (BSP_CLOCKS_SYS_CLOCK_DIV_4) /* PCLKB Div /4 */
+#define BSP_CFG_PCLKC_DIV (BSP_CLOCKS_SYS_CLOCK_DIV_4) /* PCLKC Div /4 */
+#define BSP_CFG_PCLKD_DIV (BSP_CLOCKS_SYS_CLOCK_DIV_2) /* PCLKD Div /2 */
+#define BSP_CFG_BCLK_DIV (BSP_CLOCKS_SYS_CLOCK_DIV_2) /* BCLK Div /2 */
+#define BSP_CFG_BCLK_OUTPUT (2) /* BCK/2 */
+#define BSP_CFG_UCK_DIV (BSP_CLOCKS_USB_CLOCK_DIV_5) /* UCLK Div /5 */
+#define BSP_CFG_FCLK_DIV (BSP_CLOCKS_SYS_CLOCK_DIV_4) /* FCLK Div /4 */
+#define BSP_CFG_CLKOUT_SOURCE (BSP_CLOCKS_CLOCK_DISABLED) /* CLKOUT Disabled */
+#define BSP_CFG_CLKOUT_DIV (BSP_CLOCKS_SYS_CLOCK_DIV_1) /* CLKOUT Div /1 */
+#endif /* BSP_CLOCK_CFG_H_ */
diff --git a/ports/renesas-ra/boards/RA6M1_EK/ra_gen/bsp_pin_cfg.h b/ports/renesas-ra/boards/RA6M1_EK/ra_gen/bsp_pin_cfg.h
new file mode 100644
index 0000000000000..cc0fd2fe7737a
--- /dev/null
+++ b/ports/renesas-ra/boards/RA6M1_EK/ra_gen/bsp_pin_cfg.h
@@ -0,0 +1,7 @@
+/* generated configuration header file - do not edit */
+#ifndef BSP_PIN_CFG_H_
+#define BSP_PIN_CFG_H_
+#include "bsp_api.h"
+#include "r_ioport_api.h"
+extern const ioport_cfg_t g_bsp_pin_cfg; /* RA6M1-EK.pincfg */
+#endif /* BSP_PIN_CFG_H_ */
diff --git a/ports/renesas-ra/boards/RA6M1_EK/ra_gen/common_data.c b/ports/renesas-ra/boards/RA6M1_EK/ra_gen/common_data.c
new file mode 100644
index 0000000000000..34aad762ff245
--- /dev/null
+++ b/ports/renesas-ra/boards/RA6M1_EK/ra_gen/common_data.c
@@ -0,0 +1,7 @@
+/* generated common source file - do not edit */
+#include "common_data.h"
+ioport_instance_ctrl_t g_ioport_ctrl;
+const ioport_instance_t g_ioport =
+{ .p_api = &g_ioport_on_ioport, .p_ctrl = &g_ioport_ctrl, .p_cfg = &g_bsp_pin_cfg, };
+void g_common_init(void) {
+}
diff --git a/ports/renesas-ra/boards/RA6M1_EK/ra_gen/common_data.h b/ports/renesas-ra/boards/RA6M1_EK/ra_gen/common_data.h
new file mode 100644
index 0000000000000..e2eb70836ba79
--- /dev/null
+++ b/ports/renesas-ra/boards/RA6M1_EK/ra_gen/common_data.h
@@ -0,0 +1,16 @@
+/* generated common header file - do not edit */
+#ifndef COMMON_DATA_H_
+#define COMMON_DATA_H_
+#include <stdint.h>
+#include "bsp_api.h"
+#include "r_ioport.h"
+#include "bsp_pin_cfg.h"
+FSP_HEADER
+/* IOPORT Instance */
+extern const ioport_instance_t g_ioport;
+
+/* IOPORT control structure. */
+extern ioport_instance_ctrl_t g_ioport_ctrl;
+void g_common_init(void);
+FSP_FOOTER
+#endif /* COMMON_DATA_H_ */
diff --git a/ports/renesas-ra/boards/RA6M1_EK/ra_gen/hal_data.c b/ports/renesas-ra/boards/RA6M1_EK/ra_gen/hal_data.c
new file mode 100644
index 0000000000000..56f1735118e51
--- /dev/null
+++ b/ports/renesas-ra/boards/RA6M1_EK/ra_gen/hal_data.c
@@ -0,0 +1,834 @@
+/* generated HAL source file - do not edit */
+#include "hal_data.h"
+/* Macros to tie dynamic ELC links to ADC_TRIGGER_SYNC_ELC option in adc_trigger_t. */
+#define ADC_TRIGGER_ADC0        ADC_TRIGGER_SYNC_ELC
+#define ADC_TRIGGER_ADC0_B      ADC_TRIGGER_SYNC_ELC
+#define ADC_TRIGGER_ADC1        ADC_TRIGGER_SYNC_ELC
+#define ADC_TRIGGER_ADC1_B      ADC_TRIGGER_SYNC_ELC
+adc_instance_ctrl_t g_adc1_ctrl;
+const adc_extended_cfg_t g_adc1_cfg_extend =
+{ .add_average_count = ADC_ADD_OFF,
+  .clearing = ADC_CLEAR_AFTER_READ_ON,
+  .trigger_group_b = ADC_TRIGGER_SYNC_ELC,
+  .double_trigger_mode = ADC_DOUBLE_TRIGGER_DISABLED,
+  .adc_vref_control = ADC_VREF_CONTROL_VREFH, };
+const adc_cfg_t g_adc1_cfg =
+{ .unit = 1, .mode = ADC_MODE_SINGLE_SCAN, .resolution = ADC_RESOLUTION_12_BIT, .alignment =
+      (adc_alignment_t)ADC_ALIGNMENT_RIGHT,
+  .trigger = ADC_TRIGGER_SOFTWARE, .p_callback = NULL, .p_context = NULL, .p_extend = &g_adc1_cfg_extend,
+  #if defined(VECTOR_NUMBER_ADC1_SCAN_END)
+  .scan_end_irq = VECTOR_NUMBER_ADC1_SCAN_END,
+  #else
+  .scan_end_irq = FSP_INVALID_VECTOR,
+  #endif
+  .scan_end_ipl = (BSP_IRQ_DISABLED),
+  #if defined(VECTOR_NUMBER_ADC1_SCAN_END_B)
+  .scan_end_b_irq = VECTOR_NUMBER_ADC1_SCAN_END_B,
+  #else
+  .scan_end_b_irq = FSP_INVALID_VECTOR,
+  #endif
+  .scan_end_b_ipl = (BSP_IRQ_DISABLED), };
+const adc_channel_cfg_t g_adc1_channel_cfg =
+{ .scan_mask = 0,
+  .scan_mask_group_b = 0,
+  .priority_group_a = ADC_GROUP_A_PRIORITY_OFF,
+  .add_mask = 0,
+  .sample_hold_mask = 0,
+  .sample_hold_states = 24, };
+/* Instance structure to use this module. */
+const adc_instance_t g_adc1 =
+{ .p_ctrl = &g_adc1_ctrl, .p_cfg = &g_adc1_cfg, .p_channel_cfg = &g_adc1_channel_cfg, .p_api = &g_adc_on_adc };
+iic_master_instance_ctrl_t g_i2c_master0_ctrl;
+const iic_master_extended_cfg_t g_i2c_master0_extend =
+{ .timeout_mode = IIC_MASTER_TIMEOUT_MODE_SHORT,
+/* Actual calculated bitrate: 98945. Actual calculated duty cycle: 51%. */ .clock_settings.brl_value = 15,
+  .clock_settings.brh_value = 16, .clock_settings.cks_value = 4, };
+const i2c_master_cfg_t g_i2c_master0_cfg =
+{ .channel = 0, .rate = I2C_MASTER_RATE_STANDARD, .slave = 0x00, .addr_mode = I2C_MASTER_ADDR_MODE_7BIT,
+#define RA_NOT_DEFINED (1)
+  #if (RA_NOT_DEFINED == RA_NOT_DEFINED)
+  .p_transfer_tx = NULL,
+  #else
+  .p_transfer_tx = &RA_NOT_DEFINED,
+  #endif
+  #if (RA_NOT_DEFINED == RA_NOT_DEFINED)
+  .p_transfer_rx = NULL,
+  #else
+  .p_transfer_rx = &RA_NOT_DEFINED,
+  #endif
+#undef RA_NOT_DEFINED
+  .p_callback = callback_iic,
+  .p_context = NULL,
+  #if defined(VECTOR_NUMBER_IIC0_RXI)
+  .rxi_irq = VECTOR_NUMBER_IIC0_RXI,
+  #else
+  .rxi_irq = FSP_INVALID_VECTOR,
+  #endif
+  #if defined(VECTOR_NUMBER_IIC0_TXI)
+  .txi_irq = VECTOR_NUMBER_IIC0_TXI,
+  #else
+  .txi_irq = FSP_INVALID_VECTOR,
+  #endif
+  #if defined(VECTOR_NUMBER_IIC0_TEI)
+  .tei_irq = VECTOR_NUMBER_IIC0_TEI,
+  #else
+  .tei_irq = FSP_INVALID_VECTOR,
+  #endif
+  #if defined(VECTOR_NUMBER_IIC0_ERI)
+  .eri_irq = VECTOR_NUMBER_IIC0_ERI,
+  #else
+  .eri_irq = FSP_INVALID_VECTOR,
+  #endif
+  .ipl = (12),
+  .p_extend = &g_i2c_master0_extend, };
+/* Instance structure to use this module. */
+const i2c_master_instance_t g_i2c_master0 =
+{ .p_ctrl = &g_i2c_master0_ctrl, .p_cfg = &g_i2c_master0_cfg, .p_api = &g_i2c_master_on_iic };
+adc_instance_ctrl_t g_adc0_ctrl;
+const adc_extended_cfg_t g_adc0_cfg_extend =
+{ .add_average_count = ADC_ADD_OFF,
+  .clearing = ADC_CLEAR_AFTER_READ_ON,
+  .trigger_group_b = ADC_TRIGGER_SYNC_ELC,
+  .double_trigger_mode = ADC_DOUBLE_TRIGGER_DISABLED,
+  .adc_vref_control = ADC_VREF_CONTROL_VREFH, };
+const adc_cfg_t g_adc0_cfg =
+{ .unit = 0, .mode = ADC_MODE_SINGLE_SCAN, .resolution = ADC_RESOLUTION_12_BIT, .alignment =
+      (adc_alignment_t)ADC_ALIGNMENT_RIGHT,
+  .trigger = ADC_TRIGGER_SOFTWARE, .p_callback = NULL, .p_context = NULL, .p_extend = &g_adc0_cfg_extend,
+  #if defined(VECTOR_NUMBER_ADC0_SCAN_END)
+  .scan_end_irq = VECTOR_NUMBER_ADC0_SCAN_END,
+  #else
+  .scan_end_irq = FSP_INVALID_VECTOR,
+  #endif
+  .scan_end_ipl = (BSP_IRQ_DISABLED),
+  #if defined(VECTOR_NUMBER_ADC0_SCAN_END_B)
+  .scan_end_b_irq = VECTOR_NUMBER_ADC0_SCAN_END_B,
+  #else
+  .scan_end_b_irq = FSP_INVALID_VECTOR,
+  #endif
+  .scan_end_b_ipl = (BSP_IRQ_DISABLED), };
+const adc_channel_cfg_t g_adc0_channel_cfg =
+{ .scan_mask = 0,
+  .scan_mask_group_b = 0,
+  .priority_group_a = ADC_GROUP_A_PRIORITY_OFF,
+  .add_mask = 0,
+  .sample_hold_mask = 0,
+  .sample_hold_states = 24, };
+/* Instance structure to use this module. */
+const adc_instance_t g_adc0 =
+{ .p_ctrl = &g_adc0_ctrl, .p_cfg = &g_adc0_cfg, .p_channel_cfg = &g_adc0_channel_cfg, .p_api = &g_adc_on_adc };
+lpm_instance_ctrl_t g_lpm0_ctrl;
+
+const lpm_cfg_t g_lpm0_cfg =
+{ .low_power_mode = LPM_MODE_SLEEP,
+  .snooze_cancel_sources = LPM_SNOOZE_CANCEL_SOURCE_NONE,
+  .standby_wake_sources = LPM_STANDBY_WAKE_SOURCE_RTCALM | (lpm_standby_wake_source_t)0,
+  .snooze_request_source = LPM_SNOOZE_REQUEST_RXD0_FALLING,
+  .snooze_end_sources = (lpm_snooze_end_t)0,
+  .dtc_state_in_snooze = LPM_SNOOZE_DTC_DISABLE,
+  #if BSP_FEATURE_LPM_HAS_SBYCR_OPE
+  .output_port_enable = LPM_OUTPUT_PORT_ENABLE_RETAIN,
+  #endif
+  #if BSP_FEATURE_LPM_HAS_DEEP_STANDBY
+  .io_port_state = LPM_IO_PORT_NO_CHANGE,
+  .power_supply_state = LPM_POWER_SUPPLY_DEEPCUT0,
+  .deep_standby_cancel_source = (lpm_deep_standby_cancel_source_t)0,
+  .deep_standby_cancel_edge = (lpm_deep_standby_cancel_edge_t)0,
+  #endif
+  .p_extend = NULL, };
+
+const lpm_instance_t g_lpm0 =
+{ .p_api = &g_lpm_on_lpm, .p_ctrl = &g_lpm0_ctrl, .p_cfg = &g_lpm0_cfg };
+dtc_instance_ctrl_t g_transfer1_ctrl;
+
+transfer_info_t g_transfer1_info =
+{ .dest_addr_mode = TRANSFER_ADDR_MODE_INCREMENTED,
+  .repeat_area = TRANSFER_REPEAT_AREA_DESTINATION,
+  .irq = TRANSFER_IRQ_END,
+  .chain_mode = TRANSFER_CHAIN_MODE_DISABLED,
+  .src_addr_mode = TRANSFER_ADDR_MODE_FIXED,
+  .size = TRANSFER_SIZE_2_BYTE,
+  .mode = TRANSFER_MODE_NORMAL,
+  .p_dest = (void *)NULL,
+  .p_src = (void const *)NULL,
+  .num_blocks = 0,
+  .length = 0, };
+const dtc_extended_cfg_t g_transfer1_cfg_extend =
+{ .activation_source = VECTOR_NUMBER_SPI0_RXI, };
+const transfer_cfg_t g_transfer1_cfg =
+{ .p_info = &g_transfer1_info, .p_extend = &g_transfer1_cfg_extend, };
+
+/* Instance structure to use this module. */
+const transfer_instance_t g_transfer1 =
+{ .p_ctrl = &g_transfer1_ctrl, .p_cfg = &g_transfer1_cfg, .p_api = &g_transfer_on_dtc };
+dtc_instance_ctrl_t g_transfer0_ctrl;
+
+transfer_info_t g_transfer0_info =
+{ .dest_addr_mode = TRANSFER_ADDR_MODE_FIXED,
+  .repeat_area = TRANSFER_REPEAT_AREA_SOURCE,
+  .irq = TRANSFER_IRQ_END,
+  .chain_mode = TRANSFER_CHAIN_MODE_DISABLED,
+  .src_addr_mode = TRANSFER_ADDR_MODE_INCREMENTED,
+  .size = TRANSFER_SIZE_2_BYTE,
+  .mode = TRANSFER_MODE_NORMAL,
+  .p_dest = (void *)NULL,
+  .p_src = (void const *)NULL,
+  .num_blocks = 0,
+  .length = 0, };
+const dtc_extended_cfg_t g_transfer0_cfg_extend =
+{ .activation_source = VECTOR_NUMBER_SPI0_TXI, };
+const transfer_cfg_t g_transfer0_cfg =
+{ .p_info = &g_transfer0_info, .p_extend = &g_transfer0_cfg_extend, };
+
+/* Instance structure to use this module. */
+const transfer_instance_t g_transfer0 =
+{ .p_ctrl = &g_transfer0_ctrl, .p_cfg = &g_transfer0_cfg, .p_api = &g_transfer_on_dtc };
+spi_instance_ctrl_t g_spi0_ctrl;
+
+/** SPI extended configuration for SPI HAL driver */
+const spi_extended_cfg_t g_spi0_ext_cfg =
+{ .spi_clksyn = SPI_SSL_MODE_CLK_SYN,
+  .spi_comm = SPI_COMMUNICATION_FULL_DUPLEX,
+  .ssl_polarity = SPI_SSLP_LOW,
+  .ssl_select = SPI_SSL_SELECT_SSL0,
+  .mosi_idle = SPI_MOSI_IDLE_VALUE_FIXING_DISABLE,
+  .parity = SPI_PARITY_MODE_DISABLE,
+  .byte_swap = SPI_BYTE_SWAP_DISABLE,
+  .spck_div =
+  {
+      /* Actual calculated bitrate: 15000000. */ .spbr = 3,
+      .brdv = 0
+  },
+  .spck_delay = SPI_DELAY_COUNT_1,
+  .ssl_negation_delay = SPI_DELAY_COUNT_1,
+  .next_access_delay = SPI_DELAY_COUNT_1 };
+
+/** SPI configuration for SPI HAL driver */
+const spi_cfg_t g_spi0_cfg =
+{ .channel = 0,
+
+  #if defined(VECTOR_NUMBER_SPI0_RXI)
+  .rxi_irq = VECTOR_NUMBER_SPI0_RXI,
+  #else
+  .rxi_irq = FSP_INVALID_VECTOR,
+  #endif
+  #if defined(VECTOR_NUMBER_SPI0_TXI)
+  .txi_irq = VECTOR_NUMBER_SPI0_TXI,
+  #else
+  .txi_irq = FSP_INVALID_VECTOR,
+  #endif
+  #if defined(VECTOR_NUMBER_SPI0_TEI)
+  .tei_irq = VECTOR_NUMBER_SPI0_TEI,
+  #else
+  .tei_irq = FSP_INVALID_VECTOR,
+  #endif
+  #if defined(VECTOR_NUMBER_SPI0_ERI)
+  .eri_irq = VECTOR_NUMBER_SPI0_ERI,
+  #else
+  .eri_irq = FSP_INVALID_VECTOR,
+  #endif
+
+  .rxi_ipl = (12),
+  .txi_ipl = (12),
+  .tei_ipl = (12),
+  .eri_ipl = (12),
+
+  .operating_mode = SPI_MODE_MASTER,
+
+  .clk_phase = SPI_CLK_PHASE_EDGE_ODD,
+  .clk_polarity = SPI_CLK_POLARITY_LOW,
+
+  .mode_fault = SPI_MODE_FAULT_ERROR_DISABLE,
+  .bit_order = SPI_BIT_ORDER_MSB_FIRST,
+  .p_transfer_tx = g_spi0_P_TRANSFER_TX,
+  .p_transfer_rx = g_spi0_P_TRANSFER_RX,
+  .p_callback = spi_callback,
+
+  .p_context = NULL,
+  .p_extend = (void *)&g_spi0_ext_cfg, };
+
+/* Instance structure to use this module. */
+const spi_instance_t g_spi0 =
+{ .p_ctrl = &g_spi0_ctrl, .p_cfg = &g_spi0_cfg, .p_api = &g_spi_on_spi };
+icu_instance_ctrl_t g_external_irq13_ctrl;
+const external_irq_cfg_t g_external_irq13_cfg =
+{ .channel = 13,
+  .trigger = EXTERNAL_IRQ_TRIG_RISING,
+  .filter_enable = false,
+  .pclk_div = EXTERNAL_IRQ_PCLK_DIV_BY_64,
+  .p_callback = callback_icu,
+  .p_context = NULL,
+  .p_extend = NULL,
+  .ipl = (12),
+  #if defined(VECTOR_NUMBER_ICU_IRQ13)
+  .irq = VECTOR_NUMBER_ICU_IRQ13,
+  #else
+  .irq = FSP_INVALID_VECTOR,
+  #endif
+};
+/* Instance structure to use this module. */
+const external_irq_instance_t g_external_irq13 =
+{ .p_ctrl = &g_external_irq13_ctrl, .p_cfg = &g_external_irq13_cfg, .p_api = &g_external_irq_on_icu };
+icu_instance_ctrl_t g_external_irq12_ctrl;
+const external_irq_cfg_t g_external_irq12_cfg =
+{ .channel = 12,
+  .trigger = EXTERNAL_IRQ_TRIG_RISING,
+  .filter_enable = false,
+  .pclk_div = EXTERNAL_IRQ_PCLK_DIV_BY_64,
+  .p_callback = callback_icu,
+  .p_context = NULL,
+  .p_extend = NULL,
+  .ipl = (12),
+  #if defined(VECTOR_NUMBER_ICU_IRQ12)
+  .irq = VECTOR_NUMBER_ICU_IRQ12,
+  #else
+  .irq = FSP_INVALID_VECTOR,
+  #endif
+};
+/* Instance structure to use this module. */
+const external_irq_instance_t g_external_irq12 =
+{ .p_ctrl = &g_external_irq12_ctrl, .p_cfg = &g_external_irq12_cfg, .p_api = &g_external_irq_on_icu };
+icu_instance_ctrl_t g_external_irq11_ctrl;
+const external_irq_cfg_t g_external_irq11_cfg =
+{ .channel = 11,
+  .trigger = EXTERNAL_IRQ_TRIG_RISING,
+  .filter_enable = false,
+  .pclk_div = EXTERNAL_IRQ_PCLK_DIV_BY_64,
+  .p_callback = callback_icu,
+  .p_context = NULL,
+  .p_extend = NULL,
+  .ipl = (12),
+  #if defined(VECTOR_NUMBER_ICU_IRQ11)
+  .irq = VECTOR_NUMBER_ICU_IRQ11,
+  #else
+  .irq = FSP_INVALID_VECTOR,
+  #endif
+};
+/* Instance structure to use this module. */
+const external_irq_instance_t g_external_irq11 =
+{ .p_ctrl = &g_external_irq11_ctrl, .p_cfg = &g_external_irq11_cfg, .p_api = &g_external_irq_on_icu };
+icu_instance_ctrl_t g_external_irq10_ctrl;
+const external_irq_cfg_t g_external_irq10_cfg =
+{ .channel = 10,
+  .trigger = EXTERNAL_IRQ_TRIG_RISING,
+  .filter_enable = false,
+  .pclk_div = EXTERNAL_IRQ_PCLK_DIV_BY_64,
+  .p_callback = callback_icu,
+  .p_context = NULL,
+  .p_extend = NULL,
+  .ipl = (12),
+  #if defined(VECTOR_NUMBER_ICU_IRQ10)
+  .irq = VECTOR_NUMBER_ICU_IRQ10,
+  #else
+  .irq = FSP_INVALID_VECTOR,
+  #endif
+};
+/* Instance structure to use this module. */
+const external_irq_instance_t g_external_irq10 =
+{ .p_ctrl = &g_external_irq10_ctrl, .p_cfg = &g_external_irq10_cfg, .p_api = &g_external_irq_on_icu };
+icu_instance_ctrl_t g_external_irq9_ctrl;
+const external_irq_cfg_t g_external_irq9_cfg =
+{ .channel = 9,
+  .trigger = EXTERNAL_IRQ_TRIG_RISING,
+  .filter_enable = false,
+  .pclk_div = EXTERNAL_IRQ_PCLK_DIV_BY_64,
+  .p_callback = callback_icu,
+  .p_context = NULL,
+  .p_extend = NULL,
+  .ipl = (12),
+  #if defined(VECTOR_NUMBER_ICU_IRQ9)
+  .irq = VECTOR_NUMBER_ICU_IRQ9,
+  #else
+  .irq = FSP_INVALID_VECTOR,
+  #endif
+};
+/* Instance structure to use this module. */
+const external_irq_instance_t g_external_irq9 =
+{ .p_ctrl = &g_external_irq9_ctrl, .p_cfg = &g_external_irq9_cfg, .p_api = &g_external_irq_on_icu };
+icu_instance_ctrl_t g_external_irq8_ctrl;
+const external_irq_cfg_t g_external_irq8_cfg =
+{ .channel = 8,
+  .trigger = EXTERNAL_IRQ_TRIG_RISING,
+  .filter_enable = false,
+  .pclk_div = EXTERNAL_IRQ_PCLK_DIV_BY_64,
+  .p_callback = callback_icu,
+  .p_context = NULL,
+  .p_extend = NULL,
+  .ipl = (12),
+  #if defined(VECTOR_NUMBER_ICU_IRQ8)
+  .irq = VECTOR_NUMBER_ICU_IRQ8,
+  #else
+  .irq = FSP_INVALID_VECTOR,
+  #endif
+};
+/* Instance structure to use this module. */
+const external_irq_instance_t g_external_irq8 =
+{ .p_ctrl = &g_external_irq8_ctrl, .p_cfg = &g_external_irq8_cfg, .p_api = &g_external_irq_on_icu };
+icu_instance_ctrl_t g_external_irq7_ctrl;
+const external_irq_cfg_t g_external_irq7_cfg =
+{ .channel = 7,
+  .trigger = EXTERNAL_IRQ_TRIG_RISING,
+  .filter_enable = false,
+  .pclk_div = EXTERNAL_IRQ_PCLK_DIV_BY_64,
+  .p_callback = callback_icu,
+  .p_context = NULL,
+  .p_extend = NULL,
+  .ipl = (12),
+  #if defined(VECTOR_NUMBER_ICU_IRQ7)
+  .irq = VECTOR_NUMBER_ICU_IRQ7,
+  #else
+  .irq = FSP_INVALID_VECTOR,
+  #endif
+};
+/* Instance structure to use this module. */
+const external_irq_instance_t g_external_irq7 =
+{ .p_ctrl = &g_external_irq7_ctrl, .p_cfg = &g_external_irq7_cfg, .p_api = &g_external_irq_on_icu };
+icu_instance_ctrl_t g_external_irq6_ctrl;
+const external_irq_cfg_t g_external_irq6_cfg =
+{ .channel = 6,
+  .trigger = EXTERNAL_IRQ_TRIG_RISING,
+  .filter_enable = false,
+  .pclk_div = EXTERNAL_IRQ_PCLK_DIV_BY_64,
+  .p_callback = callback_icu,
+  .p_context = NULL,
+  .p_extend = NULL,
+  .ipl = (12),
+  #if defined(VECTOR_NUMBER_ICU_IRQ6)
+  .irq = VECTOR_NUMBER_ICU_IRQ6,
+  #else
+  .irq = FSP_INVALID_VECTOR,
+  #endif
+};
+/* Instance structure to use this module. */
+const external_irq_instance_t g_external_irq6 =
+{ .p_ctrl = &g_external_irq6_ctrl, .p_cfg = &g_external_irq6_cfg, .p_api = &g_external_irq_on_icu };
+icu_instance_ctrl_t g_external_irq5_ctrl;
+const external_irq_cfg_t g_external_irq5_cfg =
+{ .channel = 5,
+  .trigger = EXTERNAL_IRQ_TRIG_RISING,
+  .filter_enable = false,
+  .pclk_div = EXTERNAL_IRQ_PCLK_DIV_BY_64,
+  .p_callback = callback_icu,
+  .p_context = NULL,
+  .p_extend = NULL,
+  .ipl = (12),
+  #if defined(VECTOR_NUMBER_ICU_IRQ5)
+  .irq = VECTOR_NUMBER_ICU_IRQ5,
+  #else
+  .irq = FSP_INVALID_VECTOR,
+  #endif
+};
+/* Instance structure to use this module. */
+const external_irq_instance_t g_external_irq5 =
+{ .p_ctrl = &g_external_irq5_ctrl, .p_cfg = &g_external_irq5_cfg, .p_api = &g_external_irq_on_icu };
+icu_instance_ctrl_t g_external_irq4_ctrl;
+const external_irq_cfg_t g_external_irq4_cfg =
+{ .channel = 4,
+  .trigger = EXTERNAL_IRQ_TRIG_RISING,
+  .filter_enable = false,
+  .pclk_div = EXTERNAL_IRQ_PCLK_DIV_BY_64,
+  .p_callback = callback_icu,
+  .p_context = NULL,
+  .p_extend = NULL,
+  .ipl = (12),
+  #if defined(VECTOR_NUMBER_ICU_IRQ4)
+  .irq = VECTOR_NUMBER_ICU_IRQ4,
+  #else
+  .irq = FSP_INVALID_VECTOR,
+  #endif
+};
+/* Instance structure to use this module. */
+const external_irq_instance_t g_external_irq4 =
+{ .p_ctrl = &g_external_irq4_ctrl, .p_cfg = &g_external_irq4_cfg, .p_api = &g_external_irq_on_icu };
+icu_instance_ctrl_t g_external_irq3_ctrl;
+const external_irq_cfg_t g_external_irq3_cfg =
+{ .channel = 3,
+  .trigger = EXTERNAL_IRQ_TRIG_RISING,
+  .filter_enable = false,
+  .pclk_div = EXTERNAL_IRQ_PCLK_DIV_BY_64,
+  .p_callback = callback_icu,
+  .p_context = NULL,
+  .p_extend = NULL,
+  .ipl = (12),
+  #if defined(VECTOR_NUMBER_ICU_IRQ3)
+  .irq = VECTOR_NUMBER_ICU_IRQ3,
+  #else
+  .irq = FSP_INVALID_VECTOR,
+  #endif
+};
+/* Instance structure to use this module. */
+const external_irq_instance_t g_external_irq3 =
+{ .p_ctrl = &g_external_irq3_ctrl, .p_cfg = &g_external_irq3_cfg, .p_api = &g_external_irq_on_icu };
+icu_instance_ctrl_t g_external_irq2_ctrl;
+const external_irq_cfg_t g_external_irq2_cfg =
+{ .channel = 2,
+  .trigger = EXTERNAL_IRQ_TRIG_RISING,
+  .filter_enable = false,
+  .pclk_div = EXTERNAL_IRQ_PCLK_DIV_BY_64,
+  .p_callback = callback_icu,
+  .p_context = NULL,
+  .p_extend = NULL,
+  .ipl = (12),
+  #if defined(VECTOR_NUMBER_ICU_IRQ2)
+  .irq = VECTOR_NUMBER_ICU_IRQ2,
+  #else
+  .irq = FSP_INVALID_VECTOR,
+  #endif
+};
+/* Instance structure to use this module. */
+const external_irq_instance_t g_external_irq2 =
+{ .p_ctrl = &g_external_irq2_ctrl, .p_cfg = &g_external_irq2_cfg, .p_api = &g_external_irq_on_icu };
+icu_instance_ctrl_t g_external_irq1_ctrl;
+const external_irq_cfg_t g_external_irq1_cfg =
+{ .channel = 1,
+  .trigger = EXTERNAL_IRQ_TRIG_RISING,
+  .filter_enable = false,
+  .pclk_div = EXTERNAL_IRQ_PCLK_DIV_BY_64,
+  .p_callback = callback_icu,
+  .p_context = NULL,
+  .p_extend = NULL,
+  .ipl = (12),
+  #if defined(VECTOR_NUMBER_ICU_IRQ1)
+  .irq = VECTOR_NUMBER_ICU_IRQ1,
+  #else
+  .irq = FSP_INVALID_VECTOR,
+  #endif
+};
+/* Instance structure to use this module. */
+const external_irq_instance_t g_external_irq1 =
+{ .p_ctrl = &g_external_irq1_ctrl, .p_cfg = &g_external_irq1_cfg, .p_api = &g_external_irq_on_icu };
+icu_instance_ctrl_t g_external_irq0_ctrl;
+const external_irq_cfg_t g_external_irq0_cfg =
+{ .channel = 0,
+  .trigger = EXTERNAL_IRQ_TRIG_RISING,
+  .filter_enable = false,
+  .pclk_div = EXTERNAL_IRQ_PCLK_DIV_BY_64,
+  .p_callback = callback_icu,
+  .p_context = NULL,
+  .p_extend = NULL,
+  .ipl = (12),
+  #if defined(VECTOR_NUMBER_ICU_IRQ0)
+  .irq = VECTOR_NUMBER_ICU_IRQ0,
+  #else
+  .irq = FSP_INVALID_VECTOR,
+  #endif
+};
+/* Instance structure to use this module. */
+const external_irq_instance_t g_external_irq0 =
+{ .p_ctrl = &g_external_irq0_ctrl, .p_cfg = &g_external_irq0_cfg, .p_api = &g_external_irq_on_icu };
+agt_instance_ctrl_t g_timer1_ctrl;
+const agt_extended_cfg_t g_timer1_extend =
+{ .count_source = AGT_CLOCK_PCLKB,
+  .agto = AGT_PIN_CFG_DISABLED,
+  .agtoa = AGT_PIN_CFG_DISABLED,
+  .agtob = AGT_PIN_CFG_DISABLED,
+  .measurement_mode = AGT_MEASURE_DISABLED,
+  .agtio_filter = AGT_AGTIO_FILTER_NONE,
+  .enable_pin = AGT_ENABLE_PIN_NOT_USED,
+  .trigger_edge = AGT_TRIGGER_EDGE_RISING, };
+const timer_cfg_t g_timer1_cfg =
+{ .mode = TIMER_MODE_PERIODIC,
+/* Actual period: 0.0010922666666666667 seconds. Actual duty: 50%. */ .period_counts = 0x10000,
+  .duty_cycle_counts = 0x8000, .source_div = (timer_source_div_t)0, .channel = 1, .p_callback = callback_agt,
+  /** If NULL then do not add & */
+  #if defined(NULL)
+  .p_context = NULL,
+  #else
+  .p_context = &NULL,
+  #endif
+  .p_extend = &g_timer1_extend,
+  .cycle_end_ipl = (5),
+  #if defined(VECTOR_NUMBER_AGT1_INT)
+  .cycle_end_irq = VECTOR_NUMBER_AGT1_INT,
+  #else
+  .cycle_end_irq = FSP_INVALID_VECTOR,
+  #endif
+};
+/* Instance structure to use this module. */
+const timer_instance_t g_timer1 =
+{ .p_ctrl = &g_timer1_ctrl, .p_cfg = &g_timer1_cfg, .p_api = &g_timer_on_agt };
+agt_instance_ctrl_t g_timer0_ctrl;
+const agt_extended_cfg_t g_timer0_extend =
+{ .count_source = AGT_CLOCK_PCLKB,
+  .agto = AGT_PIN_CFG_DISABLED,
+  .agtoa = AGT_PIN_CFG_DISABLED,
+  .agtob = AGT_PIN_CFG_DISABLED,
+  .measurement_mode = AGT_MEASURE_DISABLED,
+  .agtio_filter = AGT_AGTIO_FILTER_NONE,
+  .enable_pin = AGT_ENABLE_PIN_NOT_USED,
+  .trigger_edge = AGT_TRIGGER_EDGE_RISING, };
+const timer_cfg_t g_timer0_cfg =
+{ .mode = TIMER_MODE_PERIODIC,
+/* Actual period: 0.0010922666666666667 seconds. Actual duty: 50%. */ .period_counts = 0x10000,
+  .duty_cycle_counts = 0x8000, .source_div = (timer_source_div_t)0, .channel = 0, .p_callback = callback_agt,
+  /** If NULL then do not add & */
+  #if defined(NULL)
+  .p_context = NULL,
+  #else
+  .p_context = &NULL,
+  #endif
+  .p_extend = &g_timer0_extend,
+  .cycle_end_ipl = (5),
+  #if defined(VECTOR_NUMBER_AGT0_INT)
+  .cycle_end_irq = VECTOR_NUMBER_AGT0_INT,
+  #else
+  .cycle_end_irq = FSP_INVALID_VECTOR,
+  #endif
+};
+/* Instance structure to use this module. */
+const timer_instance_t g_timer0 =
+{ .p_ctrl = &g_timer0_ctrl, .p_cfg = &g_timer0_cfg, .p_api = &g_timer_on_agt };
+flash_hp_instance_ctrl_t g_flash0_ctrl;
+const flash_cfg_t g_flash0_cfg =
+{ .data_flash_bgo = false, .p_callback = NULL, .p_context = NULL,
+  #if defined(VECTOR_NUMBER_FCU_FRDYI)
+  .irq = VECTOR_NUMBER_FCU_FRDYI,
+  #else
+  .irq = FSP_INVALID_VECTOR,
+  #endif
+  #if defined(VECTOR_NUMBER_FCU_FIFERR)
+  .err_irq = VECTOR_NUMBER_FCU_FIFERR,
+  #else
+  .err_irq = FSP_INVALID_VECTOR,
+  #endif
+  .err_ipl = (BSP_IRQ_DISABLED),
+  .ipl = (BSP_IRQ_DISABLED), };
+/* Instance structure to use this module. */
+const flash_instance_t g_flash0 =
+{ .p_ctrl = &g_flash0_ctrl, .p_cfg = &g_flash0_cfg, .p_api = &g_flash_on_flash_hp };
+rtc_instance_ctrl_t g_rtc0_ctrl;
+const rtc_error_adjustment_cfg_t g_rtc0_err_cfg =
+{ .adjustment_mode = RTC_ERROR_ADJUSTMENT_MODE_AUTOMATIC,
+  .adjustment_period = RTC_ERROR_ADJUSTMENT_PERIOD_10_SECOND,
+  .adjustment_type = RTC_ERROR_ADJUSTMENT_NONE,
+  .adjustment_value = 0, };
+const rtc_cfg_t g_rtc0_cfg =
+{ .clock_source = RTC_CLOCK_SOURCE_LOCO, .freq_compare_value_loco = 255, .p_err_cfg = &g_rtc0_err_cfg, .p_callback =
+      NULL,
+  .p_context = NULL, .alarm_ipl = (14), .periodic_ipl = (14), .carry_ipl = (14),
+  #if defined(VECTOR_NUMBER_RTC_ALARM)
+  .alarm_irq = VECTOR_NUMBER_RTC_ALARM,
+  #else
+  .alarm_irq = FSP_INVALID_VECTOR,
+  #endif
+  #if defined(VECTOR_NUMBER_RTC_PERIOD)
+  .periodic_irq = VECTOR_NUMBER_RTC_PERIOD,
+  #else
+  .periodic_irq = FSP_INVALID_VECTOR,
+  #endif
+  #if defined(VECTOR_NUMBER_RTC_CARRY)
+  .carry_irq = VECTOR_NUMBER_RTC_CARRY,
+  #else
+  .carry_irq = FSP_INVALID_VECTOR,
+  #endif
+};
+/* Instance structure to use this module. */
+const rtc_instance_t g_rtc0 =
+{ .p_ctrl = &g_rtc0_ctrl, .p_cfg = &g_rtc0_cfg, .p_api = &g_rtc_on_rtc };
+sci_uart_instance_ctrl_t g_uart8_ctrl;
+
+baud_setting_t g_uart8_baud_setting =
+{
+/* Baud rate calculated with 0.160% error. */ .abcse = 0,
+    .abcs = 0, .bgdm = 1, .cks = 0, .brr = 64, .mddr = (uint8_t)256, .brme = false
+};
+
+/** UART extended configuration for UARTonSCI HAL driver */
+const sci_uart_extended_cfg_t g_uart8_cfg_extend =
+{ .clock = SCI_UART_CLOCK_INT,
+  .rx_edge_start = SCI_UART_START_BIT_FALLING_EDGE,
+  .noise_cancel = SCI_UART_NOISE_CANCELLATION_DISABLE,
+  .rx_fifo_trigger = SCI_UART_RX_FIFO_TRIGGER_MAX,
+  .p_baud_setting = &g_uart8_baud_setting,
+  .uart_mode = UART_MODE_RS232,
+  .ctsrts_en = SCI_UART_CTSRTS_RTS_OUTPUT,
+  #if 0
+  .flow_control_pin = BSP_IO_PORT_00_PIN_00,
+  #else
+  .flow_control_pin = (bsp_io_port_pin_t)(0xFFFFU),
+  #endif
+};
+
+/** UART interface configuration */
+const uart_cfg_t g_uart8_cfg =
+{ .channel = 8, .data_bits = UART_DATA_BITS_8, .parity = UART_PARITY_OFF, .stop_bits = UART_STOP_BITS_1, .p_callback =
+      user_uart_callback,
+  .p_context = NULL, .p_extend = &g_uart8_cfg_extend,
+#define RA_NOT_DEFINED (1)
+  #if (RA_NOT_DEFINED == RA_NOT_DEFINED)
+  .p_transfer_tx = NULL,
+  #else
+  .p_transfer_tx = &RA_NOT_DEFINED,
+  #endif
+  #if (RA_NOT_DEFINED == RA_NOT_DEFINED)
+  .p_transfer_rx = NULL,
+  #else
+  .p_transfer_rx = &RA_NOT_DEFINED,
+  #endif
+#undef RA_NOT_DEFINED
+  .rxi_ipl = (12),
+  .txi_ipl = (12), .tei_ipl = (12), .eri_ipl = (12),
+  #if defined(VECTOR_NUMBER_SCI8_RXI)
+  .rxi_irq = VECTOR_NUMBER_SCI8_RXI,
+  #else
+  .rxi_irq = FSP_INVALID_VECTOR,
+  #endif
+  #if defined(VECTOR_NUMBER_SCI8_TXI)
+  .txi_irq = VECTOR_NUMBER_SCI8_TXI,
+  #else
+  .txi_irq = FSP_INVALID_VECTOR,
+  #endif
+  #if defined(VECTOR_NUMBER_SCI8_TEI)
+  .tei_irq = VECTOR_NUMBER_SCI8_TEI,
+  #else
+  .tei_irq = FSP_INVALID_VECTOR,
+  #endif
+  #if defined(VECTOR_NUMBER_SCI8_ERI)
+  .eri_irq = VECTOR_NUMBER_SCI8_ERI,
+  #else
+  .eri_irq = FSP_INVALID_VECTOR,
+  #endif
+};
+
+/* Instance structure to use this module. */
+const uart_instance_t g_uart8 =
+{ .p_ctrl = &g_uart8_ctrl, .p_cfg = &g_uart8_cfg, .p_api = &g_uart_on_sci };
+sci_uart_instance_ctrl_t g_uart2_ctrl;
+
+baud_setting_t g_uart2_baud_setting =
+{
+/* Baud rate calculated with 0.160% error. */ .abcse = 0,
+    .abcs = 0, .bgdm = 1, .cks = 0, .brr = 64, .mddr = (uint8_t)256, .brme = false
+};
+
+/** UART extended configuration for UARTonSCI HAL driver */
+const sci_uart_extended_cfg_t g_uart2_cfg_extend =
+{ .clock = SCI_UART_CLOCK_INT,
+  .rx_edge_start = SCI_UART_START_BIT_FALLING_EDGE,
+  .noise_cancel = SCI_UART_NOISE_CANCELLATION_DISABLE,
+  .rx_fifo_trigger = SCI_UART_RX_FIFO_TRIGGER_MAX,
+  .p_baud_setting = &g_uart2_baud_setting,
+  .uart_mode = UART_MODE_RS232,
+  .ctsrts_en = SCI_UART_CTSRTS_RTS_OUTPUT,
+  #if 0
+  .flow_control_pin = BSP_IO_PORT_00_PIN_00,
+  #else
+  .flow_control_pin = (bsp_io_port_pin_t)(0xFFFFU),
+  #endif
+};
+
+/** UART interface configuration */
+const uart_cfg_t g_uart2_cfg =
+{ .channel = 2, .data_bits = UART_DATA_BITS_8, .parity = UART_PARITY_OFF, .stop_bits = UART_STOP_BITS_1, .p_callback =
+      user_uart_callback,
+  .p_context = NULL, .p_extend = &g_uart2_cfg_extend,
+#define RA_NOT_DEFINED (1)
+  #if (RA_NOT_DEFINED == RA_NOT_DEFINED)
+  .p_transfer_tx = NULL,
+  #else
+  .p_transfer_tx = &RA_NOT_DEFINED,
+  #endif
+  #if (RA_NOT_DEFINED == RA_NOT_DEFINED)
+  .p_transfer_rx = NULL,
+  #else
+  .p_transfer_rx = &RA_NOT_DEFINED,
+  #endif
+#undef RA_NOT_DEFINED
+  .rxi_ipl = (12),
+  .txi_ipl = (12), .tei_ipl = (12), .eri_ipl = (12),
+  #if defined(VECTOR_NUMBER_SCI2_RXI)
+  .rxi_irq = VECTOR_NUMBER_SCI2_RXI,
+  #else
+  .rxi_irq = FSP_INVALID_VECTOR,
+  #endif
+  #if defined(VECTOR_NUMBER_SCI2_TXI)
+  .txi_irq = VECTOR_NUMBER_SCI2_TXI,
+  #else
+  .txi_irq = FSP_INVALID_VECTOR,
+  #endif
+  #if defined(VECTOR_NUMBER_SCI2_TEI)
+  .tei_irq = VECTOR_NUMBER_SCI2_TEI,
+  #else
+  .tei_irq = FSP_INVALID_VECTOR,
+  #endif
+  #if defined(VECTOR_NUMBER_SCI2_ERI)
+  .eri_irq = VECTOR_NUMBER_SCI2_ERI,
+  #else
+  .eri_irq = FSP_INVALID_VECTOR,
+  #endif
+};
+
+/* Instance structure to use this module. */
+const uart_instance_t g_uart2 =
+{ .p_ctrl = &g_uart2_ctrl, .p_cfg = &g_uart2_cfg, .p_api = &g_uart_on_sci };
+sci_uart_instance_ctrl_t g_uart0_ctrl;
+
+baud_setting_t g_uart0_baud_setting =
+{
+/* Baud rate calculated with 0.160% error. */ .abcse = 0,
+    .abcs = 0, .bgdm = 1, .cks = 0, .brr = 64, .mddr = (uint8_t)256, .brme = false
+};
+
+/** UART extended configuration for UARTonSCI HAL driver */
+const sci_uart_extended_cfg_t g_uart0_cfg_extend =
+{ .clock = SCI_UART_CLOCK_INT,
+  .rx_edge_start = SCI_UART_START_BIT_FALLING_EDGE,
+  .noise_cancel = SCI_UART_NOISE_CANCELLATION_DISABLE,
+  .rx_fifo_trigger = SCI_UART_RX_FIFO_TRIGGER_MAX,
+  .p_baud_setting = &g_uart0_baud_setting,
+  .uart_mode = UART_MODE_RS232,
+  .ctsrts_en = SCI_UART_CTSRTS_RTS_OUTPUT,
+  #if 0
+  .flow_control_pin = BSP_IO_PORT_00_PIN_00,
+  #else
+  .flow_control_pin = (bsp_io_port_pin_t)(0xFFFFU),
+  #endif
+};
+
+/** UART interface configuration */
+const uart_cfg_t g_uart0_cfg =
+{ .channel = 0, .data_bits = UART_DATA_BITS_8, .parity = UART_PARITY_OFF, .stop_bits = UART_STOP_BITS_1, .p_callback =
+      user_uart_callback,
+  .p_context = NULL, .p_extend = &g_uart0_cfg_extend,
+#define RA_NOT_DEFINED (1)
+  #if (RA_NOT_DEFINED == RA_NOT_DEFINED)
+  .p_transfer_tx = NULL,
+  #else
+  .p_transfer_tx = &RA_NOT_DEFINED,
+  #endif
+  #if (RA_NOT_DEFINED == RA_NOT_DEFINED)
+  .p_transfer_rx = NULL,
+  #else
+  .p_transfer_rx = &RA_NOT_DEFINED,
+  #endif
+#undef RA_NOT_DEFINED
+  .rxi_ipl = (12),
+  .txi_ipl = (12), .tei_ipl = (12), .eri_ipl = (12),
+  #if defined(VECTOR_NUMBER_SCI0_RXI)
+  .rxi_irq = VECTOR_NUMBER_SCI0_RXI,
+  #else
+  .rxi_irq = FSP_INVALID_VECTOR,
+  #endif
+  #if defined(VECTOR_NUMBER_SCI0_TXI)
+  .txi_irq = VECTOR_NUMBER_SCI0_TXI,
+  #else
+  .txi_irq = FSP_INVALID_VECTOR,
+  #endif
+  #if defined(VECTOR_NUMBER_SCI0_TEI)
+  .tei_irq = VECTOR_NUMBER_SCI0_TEI,
+  #else
+  .tei_irq = FSP_INVALID_VECTOR,
+  #endif
+  #if defined(VECTOR_NUMBER_SCI0_ERI)
+  .eri_irq = VECTOR_NUMBER_SCI0_ERI,
+  #else
+  .eri_irq = FSP_INVALID_VECTOR,
+  #endif
+};
+
+/* Instance structure to use this module. */
+const uart_instance_t g_uart0 =
+{ .p_ctrl = &g_uart0_ctrl, .p_cfg = &g_uart0_cfg, .p_api = &g_uart_on_sci };
+void g_hal_init(void) {
+    g_common_init();
+}
diff --git a/ports/renesas-ra/boards/RA6M1_EK/ra_gen/hal_data.h b/ports/renesas-ra/boards/RA6M1_EK/ra_gen/hal_data.h
new file mode 100644
index 0000000000000..d8773ab5ed24e
--- /dev/null
+++ b/ports/renesas-ra/boards/RA6M1_EK/ra_gen/hal_data.h
@@ -0,0 +1,317 @@
+/* generated HAL header file - do not edit */
+#ifndef HAL_DATA_H_
+#define HAL_DATA_H_
+#include <stdint.h>
+#include "bsp_api.h"
+#include "common_data.h"
+#include "r_adc.h"
+#include "r_adc_api.h"
+#include "r_iic_master.h"
+#include "r_i2c_master_api.h"
+#include "r_lpm.h"
+#include "r_lpm_api.h"
+#include "r_dtc.h"
+#include "r_transfer_api.h"
+#include "r_spi.h"
+#include "r_icu.h"
+#include "r_external_irq_api.h"
+#include "r_agt.h"
+#include "r_timer_api.h"
+#include "r_flash_hp.h"
+#include "r_flash_api.h"
+#include "r_rtc.h"
+#include "r_rtc_api.h"
+#include "r_sci_uart.h"
+#include "r_uart_api.h"
+FSP_HEADER
+/** ADC on ADC Instance. */
+extern const adc_instance_t g_adc1;
+
+/** Access the ADC instance using these structures when calling API functions directly (::p_api is not used). */
+extern adc_instance_ctrl_t g_adc1_ctrl;
+extern const adc_cfg_t g_adc1_cfg;
+extern const adc_channel_cfg_t g_adc1_channel_cfg;
+
+#ifndef NULL
+void NULL(adc_callback_args_t *p_args);
+#endif
+/* I2C Master on IIC Instance. */
+extern const i2c_master_instance_t g_i2c_master0;
+
+/** Access the I2C Master instance using these structures when calling API functions directly (::p_api is not used). */
+extern iic_master_instance_ctrl_t g_i2c_master0_ctrl;
+extern const i2c_master_cfg_t g_i2c_master0_cfg;
+
+#ifndef callback_iic
+void callback_iic(i2c_master_callback_args_t *p_args);
+#endif
+/** ADC on ADC Instance. */
+extern const adc_instance_t g_adc0;
+
+/** Access the ADC instance using these structures when calling API functions directly (::p_api is not used). */
+extern adc_instance_ctrl_t g_adc0_ctrl;
+extern const adc_cfg_t g_adc0_cfg;
+extern const adc_channel_cfg_t g_adc0_channel_cfg;
+
+#ifndef NULL
+void NULL(adc_callback_args_t *p_args);
+#endif
+/** lpm Instance */
+extern const lpm_instance_t g_lpm0;
+
+/** Access the LPM instance using these structures when calling API functions directly (::p_api is not used). */
+extern lpm_instance_ctrl_t g_lpm0_ctrl;
+extern const lpm_cfg_t g_lpm0_cfg;
+/* Transfer on DTC Instance. */
+extern const transfer_instance_t g_transfer1;
+
+/** Access the DTC instance using these structures when calling API functions directly (::p_api is not used). */
+extern dtc_instance_ctrl_t g_transfer1_ctrl;
+extern const transfer_cfg_t g_transfer1_cfg;
+/* Transfer on DTC Instance. */
+extern const transfer_instance_t g_transfer0;
+
+/** Access the DTC instance using these structures when calling API functions directly (::p_api is not used). */
+extern dtc_instance_ctrl_t g_transfer0_ctrl;
+extern const transfer_cfg_t g_transfer0_cfg;
+/** SPI on SPI Instance. */
+extern const spi_instance_t g_spi0;
+
+/** Access the SPI instance using these structures when calling API functions directly (::p_api is not used). */
+extern spi_instance_ctrl_t g_spi0_ctrl;
+extern const spi_cfg_t g_spi0_cfg;
+
+/** Callback used by SPI Instance. */
+#ifndef spi_callback
+void spi_callback(spi_callback_args_t *p_args);
+#endif
+
+#define RA_NOT_DEFINED (1)
+#if (RA_NOT_DEFINED == g_transfer0)
+    #define g_spi0_P_TRANSFER_TX (NULL)
+#else
+#define g_spi0_P_TRANSFER_TX (&g_transfer0)
+#endif
+#if (RA_NOT_DEFINED == g_transfer1)
+    #define g_spi0_P_TRANSFER_RX (NULL)
+#else
+#define g_spi0_P_TRANSFER_RX (&g_transfer1)
+#endif
+#undef RA_NOT_DEFINED
+/** External IRQ on ICU Instance. */
+extern const external_irq_instance_t g_external_irq13;
+
+/** Access the ICU instance using these structures when calling API functions directly (::p_api is not used). */
+extern icu_instance_ctrl_t g_external_irq13_ctrl;
+extern const external_irq_cfg_t g_external_irq13_cfg;
+
+#ifndef callback_icu
+void callback_icu(external_irq_callback_args_t *p_args);
+#endif
+/** External IRQ on ICU Instance. */
+extern const external_irq_instance_t g_external_irq12;
+
+/** Access the ICU instance using these structures when calling API functions directly (::p_api is not used). */
+extern icu_instance_ctrl_t g_external_irq12_ctrl;
+extern const external_irq_cfg_t g_external_irq12_cfg;
+
+#ifndef callback_icu
+void callback_icu(external_irq_callback_args_t *p_args);
+#endif
+/** External IRQ on ICU Instance. */
+extern const external_irq_instance_t g_external_irq11;
+
+/** Access the ICU instance using these structures when calling API functions directly (::p_api is not used). */
+extern icu_instance_ctrl_t g_external_irq11_ctrl;
+extern const external_irq_cfg_t g_external_irq11_cfg;
+
+#ifndef callback_icu
+void callback_icu(external_irq_callback_args_t *p_args);
+#endif
+/** External IRQ on ICU Instance. */
+extern const external_irq_instance_t g_external_irq10;
+
+/** Access the ICU instance using these structures when calling API functions directly (::p_api is not used). */
+extern icu_instance_ctrl_t g_external_irq10_ctrl;
+extern const external_irq_cfg_t g_external_irq10_cfg;
+
+#ifndef callback_icu
+void callback_icu(external_irq_callback_args_t *p_args);
+#endif
+/** External IRQ on ICU Instance. */
+extern const external_irq_instance_t g_external_irq9;
+
+/** Access the ICU instance using these structures when calling API functions directly (::p_api is not used). */
+extern icu_instance_ctrl_t g_external_irq9_ctrl;
+extern const external_irq_cfg_t g_external_irq9_cfg;
+
+#ifndef callback_icu
+void callback_icu(external_irq_callback_args_t *p_args);
+#endif
+/** External IRQ on ICU Instance. */
+extern const external_irq_instance_t g_external_irq8;
+
+/** Access the ICU instance using these structures when calling API functions directly (::p_api is not used). */
+extern icu_instance_ctrl_t g_external_irq8_ctrl;
+extern const external_irq_cfg_t g_external_irq8_cfg;
+
+#ifndef callback_icu
+void callback_icu(external_irq_callback_args_t *p_args);
+#endif
+/** External IRQ on ICU Instance. */
+extern const external_irq_instance_t g_external_irq7;
+
+/** Access the ICU instance using these structures when calling API functions directly (::p_api is not used). */
+extern icu_instance_ctrl_t g_external_irq7_ctrl;
+extern const external_irq_cfg_t g_external_irq7_cfg;
+
+#ifndef callback_icu
+void callback_icu(external_irq_callback_args_t *p_args);
+#endif
+/** External IRQ on ICU Instance. */
+extern const external_irq_instance_t g_external_irq6;
+
+/** Access the ICU instance using these structures when calling API functions directly (::p_api is not used). */
+extern icu_instance_ctrl_t g_external_irq6_ctrl;
+extern const external_irq_cfg_t g_external_irq6_cfg;
+
+#ifndef callback_icu
+void callback_icu(external_irq_callback_args_t *p_args);
+#endif
+/** External IRQ on ICU Instance. */
+extern const external_irq_instance_t g_external_irq5;
+
+/** Access the ICU instance using these structures when calling API functions directly (::p_api is not used). */
+extern icu_instance_ctrl_t g_external_irq5_ctrl;
+extern const external_irq_cfg_t g_external_irq5_cfg;
+
+#ifndef callback_icu
+void callback_icu(external_irq_callback_args_t *p_args);
+#endif
+/** External IRQ on ICU Instance. */
+extern const external_irq_instance_t g_external_irq4;
+
+/** Access the ICU instance using these structures when calling API functions directly (::p_api is not used). */
+extern icu_instance_ctrl_t g_external_irq4_ctrl;
+extern const external_irq_cfg_t g_external_irq4_cfg;
+
+#ifndef callback_icu
+void callback_icu(external_irq_callback_args_t *p_args);
+#endif
+/** External IRQ on ICU Instance. */
+extern const external_irq_instance_t g_external_irq3;
+
+/** Access the ICU instance using these structures when calling API functions directly (::p_api is not used). */
+extern icu_instance_ctrl_t g_external_irq3_ctrl;
+extern const external_irq_cfg_t g_external_irq3_cfg;
+
+#ifndef callback_icu
+void callback_icu(external_irq_callback_args_t *p_args);
+#endif
+/** External IRQ on ICU Instance. */
+extern const external_irq_instance_t g_external_irq2;
+
+/** Access the ICU instance using these structures when calling API functions directly (::p_api is not used). */
+extern icu_instance_ctrl_t g_external_irq2_ctrl;
+extern const external_irq_cfg_t g_external_irq2_cfg;
+
+#ifndef callback_icu
+void callback_icu(external_irq_callback_args_t *p_args);
+#endif
+/** External IRQ on ICU Instance. */
+extern const external_irq_instance_t g_external_irq1;
+
+/** Access the ICU instance using these structures when calling API functions directly (::p_api is not used). */
+extern icu_instance_ctrl_t g_external_irq1_ctrl;
+extern const external_irq_cfg_t g_external_irq1_cfg;
+
+#ifndef callback_icu
+void callback_icu(external_irq_callback_args_t *p_args);
+#endif
+/** External IRQ on ICU Instance. */
+extern const external_irq_instance_t g_external_irq0;
+
+/** Access the ICU instance using these structures when calling API functions directly (::p_api is not used). */
+extern icu_instance_ctrl_t g_external_irq0_ctrl;
+extern const external_irq_cfg_t g_external_irq0_cfg;
+
+#ifndef callback_icu
+void callback_icu(external_irq_callback_args_t *p_args);
+#endif
+/** AGT Timer Instance */
+extern const timer_instance_t g_timer1;
+
+/** Access the AGT instance using these structures when calling API functions directly (::p_api is not used). */
+extern agt_instance_ctrl_t g_timer1_ctrl;
+extern const timer_cfg_t g_timer1_cfg;
+
+#ifndef callback_agt
+void callback_agt(timer_callback_args_t *p_args);
+#endif
+/** AGT Timer Instance */
+extern const timer_instance_t g_timer0;
+
+/** Access the AGT instance using these structures when calling API functions directly (::p_api is not used). */
+extern agt_instance_ctrl_t g_timer0_ctrl;
+extern const timer_cfg_t g_timer0_cfg;
+
+#ifndef callback_agt
+void callback_agt(timer_callback_args_t *p_args);
+#endif
+/* Flash on Flash HP Instance */
+extern const flash_instance_t g_flash0;
+
+/** Access the Flash HP instance using these structures when calling API functions directly (::p_api is not used). */
+extern flash_hp_instance_ctrl_t g_flash0_ctrl;
+extern const flash_cfg_t g_flash0_cfg;
+
+#ifndef NULL
+void NULL(flash_callback_args_t *p_args);
+#endif
+/* RTC Instance. */
+extern const rtc_instance_t g_rtc0;
+
+/** Access the RTC instance using these structures when calling API functions directly (::p_api is not used). */
+extern rtc_instance_ctrl_t g_rtc0_ctrl;
+extern const rtc_cfg_t g_rtc0_cfg;
+
+#ifndef NULL
+void NULL(rtc_callback_args_t *p_args);
+#endif
+/** UART on SCI Instance. */
+extern const uart_instance_t g_uart8;
+
+/** Access the UART instance using these structures when calling API functions directly (::p_api is not used). */
+extern sci_uart_instance_ctrl_t g_uart8_ctrl;
+extern const uart_cfg_t g_uart8_cfg;
+extern const sci_uart_extended_cfg_t g_uart8_cfg_extend;
+
+#ifndef user_uart_callback
+void user_uart_callback(uart_callback_args_t *p_args);
+#endif
+/** UART on SCI Instance. */
+extern const uart_instance_t g_uart2;
+
+/** Access the UART instance using these structures when calling API functions directly (::p_api is not used). */
+extern sci_uart_instance_ctrl_t g_uart2_ctrl;
+extern const uart_cfg_t g_uart2_cfg;
+extern const sci_uart_extended_cfg_t g_uart2_cfg_extend;
+
+#ifndef user_uart_callback
+void user_uart_callback(uart_callback_args_t *p_args);
+#endif
+/** UART on SCI Instance. */
+extern const uart_instance_t g_uart0;
+
+/** Access the UART instance using these structures when calling API functions directly (::p_api is not used). */
+extern sci_uart_instance_ctrl_t g_uart0_ctrl;
+extern const uart_cfg_t g_uart0_cfg;
+extern const sci_uart_extended_cfg_t g_uart0_cfg_extend;
+
+#ifndef user_uart_callback
+void user_uart_callback(uart_callback_args_t *p_args);
+#endif
+void hal_entry(void);
+void g_hal_init(void);
+FSP_FOOTER
+#endif /* HAL_DATA_H_ */
diff --git a/ports/renesas-ra/boards/RA6M1_EK/ra_gen/main.c b/ports/renesas-ra/boards/RA6M1_EK/ra_gen/main.c
new file mode 100644
index 0000000000000..5b9f9805595fa
--- /dev/null
+++ b/ports/renesas-ra/boards/RA6M1_EK/ra_gen/main.c
@@ -0,0 +1,6 @@
+/* generated main source file - do not edit */
+#include "hal_data.h"
+int main(void) {
+    hal_entry();
+    return 0;
+}
diff --git a/ports/renesas-ra/boards/RA6M1_EK/ra_gen/pin_data.c b/ports/renesas-ra/boards/RA6M1_EK/ra_gen/pin_data.c
new file mode 100644
index 0000000000000..a2ddad010f732
--- /dev/null
+++ b/ports/renesas-ra/boards/RA6M1_EK/ra_gen/pin_data.c
@@ -0,0 +1,109 @@
+/* generated pin source file - do not edit */
+#include "bsp_api.h"
+#include "r_ioport_api.h"
+const ioport_pin_cfg_t g_bsp_pin_cfg_data[] = {
+    {
+        .pin = BSP_IO_PORT_00_PIN_04,
+        .pin_cfg = ((uint32_t)IOPORT_CFG_ANALOG_ENABLE),
+    },
+    {
+        .pin = BSP_IO_PORT_01_PIN_00,
+        .pin_cfg = ((uint32_t)IOPORT_CFG_PERIPHERAL_PIN | (uint32_t)IOPORT_PERIPHERAL_SPI),
+    },
+    {
+        .pin = BSP_IO_PORT_01_PIN_01,
+        .pin_cfg = ((uint32_t)IOPORT_CFG_PERIPHERAL_PIN | (uint32_t)IOPORT_PERIPHERAL_SPI),
+    },
+    {
+        .pin = BSP_IO_PORT_01_PIN_02,
+        .pin_cfg = ((uint32_t)IOPORT_CFG_PERIPHERAL_PIN | (uint32_t)IOPORT_PERIPHERAL_SPI),
+    },
+    {
+        .pin = BSP_IO_PORT_01_PIN_03,
+        .pin_cfg = ((uint32_t)IOPORT_CFG_PERIPHERAL_PIN | (uint32_t)IOPORT_PERIPHERAL_SPI),
+    },
+    {
+        .pin = BSP_IO_PORT_01_PIN_04,
+        .pin_cfg = ((uint32_t)IOPORT_CFG_PERIPHERAL_PIN | (uint32_t)IOPORT_PERIPHERAL_SCI0_2_4_6_8),
+    },
+    {
+        .pin = BSP_IO_PORT_01_PIN_05,
+        .pin_cfg = ((uint32_t)IOPORT_CFG_PERIPHERAL_PIN | (uint32_t)IOPORT_PERIPHERAL_SCI0_2_4_6_8),
+    },
+    {
+        .pin = BSP_IO_PORT_01_PIN_06,
+        .pin_cfg = ((uint32_t)IOPORT_CFG_PORT_DIRECTION_OUTPUT | (uint32_t)IOPORT_CFG_PORT_OUTPUT_LOW),
+    },
+    {
+        .pin = BSP_IO_PORT_01_PIN_07,
+        .pin_cfg = ((uint32_t)IOPORT_CFG_PORT_DIRECTION_OUTPUT | (uint32_t)IOPORT_CFG_PORT_OUTPUT_LOW),
+    },
+    {
+        .pin = BSP_IO_PORT_01_PIN_08,
+        .pin_cfg = ((uint32_t)IOPORT_CFG_PERIPHERAL_PIN | (uint32_t)IOPORT_PERIPHERAL_DEBUG),
+    },
+    {
+        .pin = BSP_IO_PORT_01_PIN_09,
+        .pin_cfg = ((uint32_t)IOPORT_CFG_PERIPHERAL_PIN | (uint32_t)IOPORT_PERIPHERAL_DEBUG),
+    },
+    {
+        .pin = BSP_IO_PORT_01_PIN_10,
+        .pin_cfg = ((uint32_t)IOPORT_CFG_PERIPHERAL_PIN | (uint32_t)IOPORT_PERIPHERAL_DEBUG),
+    },
+    {
+        .pin = BSP_IO_PORT_01_PIN_12,
+        .pin_cfg = ((uint32_t)IOPORT_CFG_PORT_DIRECTION_OUTPUT | (uint32_t)IOPORT_CFG_PORT_OUTPUT_LOW),
+    },
+    {
+        .pin = BSP_IO_PORT_02_PIN_01,
+        .pin_cfg = ((uint32_t)IOPORT_CFG_PORT_DIRECTION_INPUT),
+    },
+    {
+        .pin = BSP_IO_PORT_02_PIN_05,
+        .pin_cfg = ((uint32_t)IOPORT_CFG_PERIPHERAL_PIN | (uint32_t)IOPORT_PERIPHERAL_CTSU),
+    },
+    {
+        .pin = BSP_IO_PORT_02_PIN_07,
+        .pin_cfg = ((uint32_t)IOPORT_CFG_PERIPHERAL_PIN | (uint32_t)IOPORT_PERIPHERAL_CTSU),
+    },
+    {
+        .pin = BSP_IO_PORT_03_PIN_00,
+        .pin_cfg = ((uint32_t)IOPORT_CFG_PERIPHERAL_PIN | (uint32_t)IOPORT_PERIPHERAL_DEBUG),
+    },
+    {
+        .pin = BSP_IO_PORT_03_PIN_01,
+        .pin_cfg = ((uint32_t)IOPORT_CFG_PERIPHERAL_PIN | (uint32_t)IOPORT_PERIPHERAL_SCI0_2_4_6_8),
+    },
+    {
+        .pin = BSP_IO_PORT_03_PIN_02,
+        .pin_cfg = ((uint32_t)IOPORT_CFG_PERIPHERAL_PIN | (uint32_t)IOPORT_PERIPHERAL_SCI0_2_4_6_8),
+    },
+    {
+        .pin = BSP_IO_PORT_04_PIN_00,
+        .pin_cfg = ((uint32_t)IOPORT_CFG_DRIVE_MID | (uint32_t)IOPORT_CFG_PERIPHERAL_PIN | (uint32_t)IOPORT_PERIPHERAL_IIC),
+    },
+    {
+        .pin = BSP_IO_PORT_04_PIN_01,
+        .pin_cfg = ((uint32_t)IOPORT_CFG_DRIVE_MID | (uint32_t)IOPORT_CFG_PERIPHERAL_PIN | (uint32_t)IOPORT_PERIPHERAL_IIC),
+    },
+    {
+        .pin = BSP_IO_PORT_04_PIN_07,
+        .pin_cfg = ((uint32_t)IOPORT_CFG_PERIPHERAL_PIN | (uint32_t)IOPORT_PERIPHERAL_USB_FS),
+    },
+    {
+        .pin = BSP_IO_PORT_04_PIN_10,
+        .pin_cfg = ((uint32_t)IOPORT_CFG_PERIPHERAL_PIN | (uint32_t)IOPORT_PERIPHERAL_SCI0_2_4_6_8),
+    },
+    {
+        .pin = BSP_IO_PORT_04_PIN_11,
+        .pin_cfg = ((uint32_t)IOPORT_CFG_PERIPHERAL_PIN | (uint32_t)IOPORT_PERIPHERAL_SCI0_2_4_6_8),
+    },
+    {
+        .pin = BSP_IO_PORT_04_PIN_15,
+        .pin_cfg = ((uint32_t)IOPORT_CFG_IRQ_ENABLE | (uint32_t)IOPORT_CFG_PORT_DIRECTION_INPUT),
+    },
+};
+const ioport_cfg_t g_bsp_pin_cfg = {
+    .number_of_pins = sizeof(g_bsp_pin_cfg_data) / sizeof(ioport_pin_cfg_t),
+    .p_pin_cfg_data = &g_bsp_pin_cfg_data[0],
+};
diff --git a/ports/renesas-ra/boards/RA6M1_EK/ra_gen/vector_data.c b/ports/renesas-ra/boards/RA6M1_EK/ra_gen/vector_data.c
new file mode 100644
index 0000000000000..cf17573a03480
--- /dev/null
+++ b/ports/renesas-ra/boards/RA6M1_EK/ra_gen/vector_data.c
@@ -0,0 +1,89 @@
+/* generated vector source file - do not edit */
+#include "bsp_api.h"
+/* Do not build these data structures if no interrupts are currently allocated because IAR will have build errors. */
+#if VECTOR_DATA_IRQ_COUNT > 0
+BSP_DONT_REMOVE const fsp_vector_t g_vector_table[BSP_ICU_VECTOR_MAX_ENTRIES] BSP_PLACE_IN_SECTION(BSP_SECTION_APPLICATION_VECTORS) =
+{
+    [0] = sci_uart_rxi_isr,         /* SCI0 RXI (Receive data full) */
+    [1] = sci_uart_txi_isr,         /* SCI0 TXI (Transmit data empty) */
+    [2] = sci_uart_tei_isr,         /* SCI0 TEI (Transmit end) */
+    [3] = sci_uart_eri_isr,         /* SCI0 ERI (Receive error) */
+    [4] = sci_uart_rxi_isr,         /* SCI2 RXI (Received data full) */
+    [5] = sci_uart_txi_isr,         /* SCI2 TXI (Transmit data empty) */
+    [6] = sci_uart_tei_isr,         /* SCI2 TEI (Transmit end) */
+    [7] = sci_uart_eri_isr,         /* SCI2 ERI (Receive error) */
+    [8] = sci_uart_rxi_isr,         /* SCI8 RXI (Received data full) */
+    [9] = sci_uart_txi_isr,         /* SCI8 TXI (Transmit data empty) */
+    [10] = sci_uart_tei_isr,        /* SCI8 TEI (Transmit end) */
+    [11] = sci_uart_eri_isr,        /* SCI8 ERI (Receive error) */
+    [12] = rtc_alarm_periodic_isr,  /* RTC ALARM (Alarm interrupt) */
+    [13] = rtc_alarm_periodic_isr,  /* RTC PERIOD (Periodic interrupt) */
+    [14] = rtc_carry_isr,           /* RTC CARRY (Carry interrupt) */
+    [15] = agt_int_isr,             /* AGT0 INT (AGT interrupt) */
+    [16] = agt_int_isr,             /* AGT1 INT (AGT interrupt) */
+    [17] = r_icu_isr,               /* ICU IRQ0 (External pin interrupt 0) */
+    [18] = r_icu_isr,               /* ICU IRQ1 (External pin interrupt 1) */
+    [19] = r_icu_isr,               /* ICU IRQ2 (External pin interrupt 2) */
+    [20] = r_icu_isr,               /* ICU IRQ3 (External pin interrupt 3) */
+    [21] = r_icu_isr,               /* ICU IRQ4 (External pin interrupt 4) */
+    [22] = r_icu_isr,               /* ICU IRQ5 (External pin interrupt 5) */
+    [23] = r_icu_isr,               /* ICU IRQ6 (External pin interrupt 6) */
+    [24] = r_icu_isr,               /* ICU IRQ7 (External pin interrupt 7) */
+    [25] = r_icu_isr,               /* ICU IRQ8 (External pin interrupt 8) */
+    [26] = r_icu_isr,               /* ICU IRQ9 (External pin interrupt 9) */
+    [27] = r_icu_isr,               /* ICU IRQ10 (External pin interrupt 10) */
+    [28] = r_icu_isr,               /* ICU IRQ11 (External pin interrupt 11) */
+    [29] = r_icu_isr,               /* ICU IRQ12 (External pin interrupt 12) */
+    [30] = r_icu_isr,               /* ICU IRQ13 (External pin interrupt 13) */
+    [31] = spi_rxi_isr,             /* SPI0 RXI (Receive buffer full) */
+    [32] = spi_txi_isr,             /* SPI0 TXI (Transmit buffer empty) */
+    [33] = spi_tei_isr,             /* SPI0 TEI (Transmission complete event) */
+    [34] = spi_eri_isr,             /* SPI0 ERI (Error) */
+    [35] = iic_master_rxi_isr,      /* IIC0 RXI (Receive data full) */
+    [36] = iic_master_txi_isr,      /* IIC0 TXI (Transmit data empty) */
+    [37] = iic_master_tei_isr,      /* IIC0 TEI (Transmit end) */
+    [38] = iic_master_eri_isr,      /* IIC0 ERI (Transfer error) */
+};
+const bsp_interrupt_event_t g_interrupt_event_link_select[BSP_ICU_VECTOR_MAX_ENTRIES] =
+{
+    [0] = BSP_PRV_IELS_ENUM(EVENT_SCI0_RXI),         /* SCI0 RXI (Receive data full) */
+    [1] = BSP_PRV_IELS_ENUM(EVENT_SCI0_TXI),         /* SCI0 TXI (Transmit data empty) */
+    [2] = BSP_PRV_IELS_ENUM(EVENT_SCI0_TEI),         /* SCI0 TEI (Transmit end) */
+    [3] = BSP_PRV_IELS_ENUM(EVENT_SCI0_ERI),         /* SCI0 ERI (Receive error) */
+    [4] = BSP_PRV_IELS_ENUM(EVENT_SCI2_RXI),         /* SCI2 RXI (Received data full) */
+    [5] = BSP_PRV_IELS_ENUM(EVENT_SCI2_TXI),         /* SCI2 TXI (Transmit data empty) */
+    [6] = BSP_PRV_IELS_ENUM(EVENT_SCI2_TEI),         /* SCI2 TEI (Transmit end) */
+    [7] = BSP_PRV_IELS_ENUM(EVENT_SCI2_ERI),         /* SCI2 ERI (Receive error) */
+    [8] = BSP_PRV_IELS_ENUM(EVENT_SCI8_RXI),         /* SCI8 RXI (Received data full) */
+    [9] = BSP_PRV_IELS_ENUM(EVENT_SCI8_TXI),         /* SCI8 TXI (Transmit data empty) */
+    [10] = BSP_PRV_IELS_ENUM(EVENT_SCI8_TEI),        /* SCI8 TEI (Transmit end) */
+    [11] = BSP_PRV_IELS_ENUM(EVENT_SCI8_ERI),        /* SCI8 ERI (Receive error) */
+    [12] = BSP_PRV_IELS_ENUM(EVENT_RTC_ALARM),       /* RTC ALARM (Alarm interrupt) */
+    [13] = BSP_PRV_IELS_ENUM(EVENT_RTC_PERIOD),      /* RTC PERIOD (Periodic interrupt) */
+    [14] = BSP_PRV_IELS_ENUM(EVENT_RTC_CARRY),       /* RTC CARRY (Carry interrupt) */
+    [15] = BSP_PRV_IELS_ENUM(EVENT_AGT0_INT),        /* AGT0 INT (AGT interrupt) */
+    [16] = BSP_PRV_IELS_ENUM(EVENT_AGT1_INT),        /* AGT1 INT (AGT interrupt) */
+    [17] = BSP_PRV_IELS_ENUM(EVENT_ICU_IRQ0),        /* ICU IRQ0 (External pin interrupt 0) */
+    [18] = BSP_PRV_IELS_ENUM(EVENT_ICU_IRQ1),        /* ICU IRQ1 (External pin interrupt 1) */
+    [19] = BSP_PRV_IELS_ENUM(EVENT_ICU_IRQ2),        /* ICU IRQ2 (External pin interrupt 2) */
+    [20] = BSP_PRV_IELS_ENUM(EVENT_ICU_IRQ3),        /* ICU IRQ3 (External pin interrupt 3) */
+    [21] = BSP_PRV_IELS_ENUM(EVENT_ICU_IRQ4),        /* ICU IRQ4 (External pin interrupt 4) */
+    [22] = BSP_PRV_IELS_ENUM(EVENT_ICU_IRQ5),        /* ICU IRQ5 (External pin interrupt 5) */
+    [23] = BSP_PRV_IELS_ENUM(EVENT_ICU_IRQ6),        /* ICU IRQ6 (External pin interrupt 6) */
+    [24] = BSP_PRV_IELS_ENUM(EVENT_ICU_IRQ7),        /* ICU IRQ7 (External pin interrupt 7) */
+    [25] = BSP_PRV_IELS_ENUM(EVENT_ICU_IRQ8),        /* ICU IRQ8 (External pin interrupt 8) */
+    [26] = BSP_PRV_IELS_ENUM(EVENT_ICU_IRQ9),        /* ICU IRQ9 (External pin interrupt 9) */
+    [27] = BSP_PRV_IELS_ENUM(EVENT_ICU_IRQ10),       /* ICU IRQ10 (External pin interrupt 10) */
+    [28] = BSP_PRV_IELS_ENUM(EVENT_ICU_IRQ11),       /* ICU IRQ11 (External pin interrupt 11) */
+    [29] = BSP_PRV_IELS_ENUM(EVENT_ICU_IRQ12),       /* ICU IRQ12 (External pin interrupt 12) */
+    [30] = BSP_PRV_IELS_ENUM(EVENT_ICU_IRQ13),       /* ICU IRQ13 (External pin interrupt 13) */
+    [31] = BSP_PRV_IELS_ENUM(EVENT_SPI0_RXI),        /* SPI0 RXI (Receive buffer full) */
+    [32] = BSP_PRV_IELS_ENUM(EVENT_SPI0_TXI),        /* SPI0 TXI (Transmit buffer empty) */
+    [33] = BSP_PRV_IELS_ENUM(EVENT_SPI0_TEI),        /* SPI0 TEI (Transmission complete event) */
+    [34] = BSP_PRV_IELS_ENUM(EVENT_SPI0_ERI),        /* SPI0 ERI (Error) */
+    [35] = BSP_PRV_IELS_ENUM(EVENT_IIC0_RXI),        /* IIC0 RXI (Receive data full) */
+    [36] = BSP_PRV_IELS_ENUM(EVENT_IIC0_TXI),        /* IIC0 TXI (Transmit data empty) */
+    [37] = BSP_PRV_IELS_ENUM(EVENT_IIC0_TEI),        /* IIC0 TEI (Transmit end) */
+    [38] = BSP_PRV_IELS_ENUM(EVENT_IIC0_ERI),        /* IIC0 ERI (Transfer error) */
+};
+#endif
diff --git a/ports/renesas-ra/boards/RA6M1_EK/ra_gen/vector_data.h b/ports/renesas-ra/boards/RA6M1_EK/ra_gen/vector_data.h
new file mode 100644
index 0000000000000..b812cff2e15d3
--- /dev/null
+++ b/ports/renesas-ra/boards/RA6M1_EK/ra_gen/vector_data.h
@@ -0,0 +1,119 @@
+/* generated vector header file - do not edit */
+#ifndef VECTOR_DATA_H
+#define VECTOR_DATA_H
+/* Number of interrupts allocated */
+#ifndef VECTOR_DATA_IRQ_COUNT
+#define VECTOR_DATA_IRQ_COUNT    (39)
+#endif
+/* ISR prototypes */
+void sci_uart_rxi_isr(void);
+void sci_uart_txi_isr(void);
+void sci_uart_tei_isr(void);
+void sci_uart_eri_isr(void);
+void rtc_alarm_periodic_isr(void);
+void rtc_carry_isr(void);
+void agt_int_isr(void);
+void r_icu_isr(void);
+void spi_rxi_isr(void);
+void spi_txi_isr(void);
+void spi_tei_isr(void);
+void spi_eri_isr(void);
+void iic_master_rxi_isr(void);
+void iic_master_txi_isr(void);
+void iic_master_tei_isr(void);
+void iic_master_eri_isr(void);
+
+/* Vector table allocations */
+#define VECTOR_NUMBER_SCI0_RXI ((IRQn_Type)0)  /* SCI0 RXI (Receive data full) */
+#define VECTOR_NUMBER_SCI0_TXI ((IRQn_Type)1)  /* SCI0 TXI (Transmit data empty) */
+#define VECTOR_NUMBER_SCI0_TEI ((IRQn_Type)2)  /* SCI0 TEI (Transmit end) */
+#define VECTOR_NUMBER_SCI0_ERI ((IRQn_Type)3)  /* SCI0 ERI (Receive error) */
+#define VECTOR_NUMBER_SCI2_RXI ((IRQn_Type)4)  /* SCI2 RXI (Received data full) */
+#define VECTOR_NUMBER_SCI2_TXI ((IRQn_Type)5)  /* SCI2 TXI (Transmit data empty) */
+#define VECTOR_NUMBER_SCI2_TEI ((IRQn_Type)6)  /* SCI2 TEI (Transmit end) */
+#define VECTOR_NUMBER_SCI2_ERI ((IRQn_Type)7)  /* SCI2 ERI (Receive error) */
+#define VECTOR_NUMBER_SCI8_RXI ((IRQn_Type)8)  /* SCI8 RXI (Received data full) */
+#define VECTOR_NUMBER_SCI8_TXI ((IRQn_Type)9)  /* SCI8 TXI (Transmit data empty) */
+#define VECTOR_NUMBER_SCI8_TEI ((IRQn_Type)10)  /* SCI8 TEI (Transmit end) */
+#define VECTOR_NUMBER_SCI8_ERI ((IRQn_Type)11)  /* SCI8 ERI (Receive error) */
+#define VECTOR_NUMBER_RTC_ALARM ((IRQn_Type)12)  /* RTC ALARM (Alarm interrupt) */
+#define VECTOR_NUMBER_RTC_PERIOD ((IRQn_Type)13)  /* RTC PERIOD (Periodic interrupt) */
+#define VECTOR_NUMBER_RTC_CARRY ((IRQn_Type)14)  /* RTC CARRY (Carry interrupt) */
+#define VECTOR_NUMBER_AGT0_INT ((IRQn_Type)15)  /* AGT0 INT (AGT interrupt) */
+#define VECTOR_NUMBER_AGT1_INT ((IRQn_Type)16)  /* AGT1 INT (AGT interrupt) */
+#define VECTOR_NUMBER_ICU_IRQ0 ((IRQn_Type)17)  /* ICU IRQ0 (External pin interrupt 0) */
+#define VECTOR_NUMBER_ICU_IRQ1 ((IRQn_Type)18)  /* ICU IRQ1 (External pin interrupt 1) */
+#define VECTOR_NUMBER_ICU_IRQ2 ((IRQn_Type)19)  /* ICU IRQ2 (External pin interrupt 2) */
+#define VECTOR_NUMBER_ICU_IRQ3 ((IRQn_Type)20)  /* ICU IRQ3 (External pin interrupt 3) */
+#define VECTOR_NUMBER_ICU_IRQ4 ((IRQn_Type)21)  /* ICU IRQ4 (External pin interrupt 4) */
+#define VECTOR_NUMBER_ICU_IRQ5 ((IRQn_Type)22)  /* ICU IRQ5 (External pin interrupt 5) */
+#define VECTOR_NUMBER_ICU_IRQ6 ((IRQn_Type)23)  /* ICU IRQ6 (External pin interrupt 6) */
+#define VECTOR_NUMBER_ICU_IRQ7 ((IRQn_Type)24)  /* ICU IRQ7 (External pin interrupt 7) */
+#define VECTOR_NUMBER_ICU_IRQ8 ((IRQn_Type)25)  /* ICU IRQ8 (External pin interrupt 8) */
+#define VECTOR_NUMBER_ICU_IRQ9 ((IRQn_Type)26)  /* ICU IRQ9 (External pin interrupt 9) */
+#define VECTOR_NUMBER_ICU_IRQ10 ((IRQn_Type)27)  /* ICU IRQ10 (External pin interrupt 10) */
+#define VECTOR_NUMBER_ICU_IRQ11 ((IRQn_Type)28)  /* ICU IRQ11 (External pin interrupt 11) */
+#define VECTOR_NUMBER_ICU_IRQ12 ((IRQn_Type)29)  /* ICU IRQ12 (External pin interrupt 12) */
+#define VECTOR_NUMBER_ICU_IRQ13 ((IRQn_Type)30)  /* ICU IRQ13 (External pin interrupt 13) */
+#define VECTOR_NUMBER_SPI0_RXI ((IRQn_Type)31)  /* SPI0 RXI (Receive buffer full) */
+#define VECTOR_NUMBER_SPI0_TXI ((IRQn_Type)32)  /* SPI0 TXI (Transmit buffer empty) */
+#define VECTOR_NUMBER_SPI0_TEI ((IRQn_Type)33)  /* SPI0 TEI (Transmission complete event) */
+#define VECTOR_NUMBER_SPI0_ERI ((IRQn_Type)34)  /* SPI0 ERI (Error) */
+#define VECTOR_NUMBER_IIC0_RXI ((IRQn_Type)35)  /* IIC0 RXI (Receive data full) */
+#define VECTOR_NUMBER_IIC0_TXI ((IRQn_Type)36)  /* IIC0 TXI (Transmit data empty) */
+#define VECTOR_NUMBER_IIC0_TEI ((IRQn_Type)37)  /* IIC0 TEI (Transmit end) */
+#define VECTOR_NUMBER_IIC0_ERI ((IRQn_Type)38)  /* IIC0 ERI (Transfer error) */
+typedef enum IRQn
+{
+    Reset_IRQn = -15,
+    NonMaskableInt_IRQn = -14,
+    HardFault_IRQn = -13,
+    MemoryManagement_IRQn = -12,
+    BusFault_IRQn = -11,
+    UsageFault_IRQn = -10,
+    SecureFault_IRQn = -9,
+    SVCall_IRQn = -5,
+    DebugMonitor_IRQn = -4,
+    PendSV_IRQn = -2,
+    SysTick_IRQn = -1,
+    SCI0_RXI_IRQn = 0, /* SCI0 RXI (Receive data full) */
+    SCI0_TXI_IRQn = 1, /* SCI0 TXI (Transmit data empty) */
+    SCI0_TEI_IRQn = 2, /* SCI0 TEI (Transmit end) */
+    SCI0_ERI_IRQn = 3, /* SCI0 ERI (Receive error) */
+    SCI2_RXI_IRQn = 4, /* SCI2 RXI (Received data full) */
+    SCI2_TXI_IRQn = 5, /* SCI2 TXI (Transmit data empty) */
+    SCI2_TEI_IRQn = 6, /* SCI2 TEI (Transmit end) */
+    SCI2_ERI_IRQn = 7, /* SCI2 ERI (Receive error) */
+    SCI8_RXI_IRQn = 8, /* SCI8 RXI (Received data full) */
+    SCI8_TXI_IRQn = 9, /* SCI8 TXI (Transmit data empty) */
+    SCI8_TEI_IRQn = 10, /* SCI8 TEI (Transmit end) */
+    SCI8_ERI_IRQn = 11, /* SCI8 ERI (Receive error) */
+    RTC_ALARM_IRQn = 12, /* RTC ALARM (Alarm interrupt) */
+    RTC_PERIOD_IRQn = 13, /* RTC PERIOD (Periodic interrupt) */
+    RTC_CARRY_IRQn = 14, /* RTC CARRY (Carry interrupt) */
+    AGT0_INT_IRQn = 15, /* AGT0 INT (AGT interrupt) */
+    AGT1_INT_IRQn = 16, /* AGT1 INT (AGT interrupt) */
+    ICU_IRQ0_IRQn = 17, /* ICU IRQ0 (External pin interrupt 0) */
+    ICU_IRQ1_IRQn = 18, /* ICU IRQ1 (External pin interrupt 1) */
+    ICU_IRQ2_IRQn = 19, /* ICU IRQ2 (External pin interrupt 2) */
+    ICU_IRQ3_IRQn = 20, /* ICU IRQ3 (External pin interrupt 3) */
+    ICU_IRQ4_IRQn = 21, /* ICU IRQ4 (External pin interrupt 4) */
+    ICU_IRQ5_IRQn = 22, /* ICU IRQ5 (External pin interrupt 5) */
+    ICU_IRQ6_IRQn = 23, /* ICU IRQ6 (External pin interrupt 6) */
+    ICU_IRQ7_IRQn = 24, /* ICU IRQ7 (External pin interrupt 7) */
+    ICU_IRQ8_IRQn = 25, /* ICU IRQ8 (External pin interrupt 8) */
+    ICU_IRQ9_IRQn = 26, /* ICU IRQ9 (External pin interrupt 9) */
+    ICU_IRQ10_IRQn = 27, /* ICU IRQ10 (External pin interrupt 10) */
+    ICU_IRQ11_IRQn = 28, /* ICU IRQ11 (External pin interrupt 11) */
+    ICU_IRQ12_IRQn = 29, /* ICU IRQ12 (External pin interrupt 12) */
+    ICU_IRQ13_IRQn = 30, /* ICU IRQ13 (External pin interrupt 13) */
+    SPI0_RXI_IRQn = 31, /* SPI0 RXI (Receive buffer full) */
+    SPI0_TXI_IRQn = 32, /* SPI0 TXI (Transmit buffer empty) */
+    SPI0_TEI_IRQn = 33, /* SPI0 TEI (Transmission complete event) */
+    SPI0_ERI_IRQn = 34, /* SPI0 ERI (Error) */
+    IIC0_RXI_IRQn = 35, /* IIC0 RXI (Receive data full) */
+    IIC0_TXI_IRQn = 36, /* IIC0 TXI (Transmit data empty) */
+    IIC0_TEI_IRQn = 37, /* IIC0 TEI (Transmit end) */
+    IIC0_ERI_IRQn = 38, /* IIC0 ERI (Transfer error) */
+} IRQn_Type;
+#endif /* VECTOR_DATA_H */
diff --git a/ports/renesas-ra/boards/RA6M1_EK/src/hal_entry.c b/ports/renesas-ra/boards/RA6M1_EK/src/hal_entry.c
new file mode 100644
index 0000000000000..c922cfd17ad9a
--- /dev/null
+++ b/ports/renesas-ra/boards/RA6M1_EK/src/hal_entry.c
@@ -0,0 +1,58 @@
+#include "hal_data.h"
+
+FSP_CPP_HEADER
+void R_BSP_WarmStart(bsp_warm_start_event_t event);
+FSP_CPP_FOOTER
+
+void ra_main(uint32_t reset_mode);
+
+/*******************************************************************************************************************//**
+ * main() is generated by the RA Configuration editor and is used to generate threads if an RTOS is used.  This function
+ * is called by main() when no RTOS is used.
+ **********************************************************************************************************************/
+void hal_entry(void) {
+    /* TODO: add your own code here */
+
+    ra_main(1);
+
+    #if BSP_TZ_SECURE_BUILD
+    /* Enter non-secure code */
+    R_BSP_NonSecureEnter();
+    #endif
+}
+
+/*******************************************************************************************************************//**
+ * This function is called at various points during the startup process.  This implementation uses the event that is
+ * called right before main() to set up the pins.
+ *
+ * @param[in]  event    Where at in the start up process the code is currently at
+ **********************************************************************************************************************/
+void R_BSP_WarmStart(bsp_warm_start_event_t event) {
+    if (BSP_WARM_START_RESET == event) {
+        #if BSP_FEATURE_FLASH_LP_VERSION != 0
+
+        /* Enable reading from data flash. */
+        R_FACI_LP->DFLCTL = 1U;
+
+        /* Would normally have to wait tDSTOP(6us) for data flash recovery. Placing the enable here, before clock and
+         * C runtime initialization, should negate the need for a delay since the initialization will typically take more than 6us. */
+        #endif
+    }
+
+    if (BSP_WARM_START_POST_C == event) {
+        /* C runtime environment and system clocks are setup. */
+
+        /* Configure pins. */
+        R_IOPORT_Open(&g_ioport_ctrl, &g_bsp_pin_cfg);
+    }
+}
+
+#if BSP_TZ_SECURE_BUILD
+
+BSP_CMSE_NONSECURE_ENTRY void template_nonsecure_callable();
+
+/* Trustzone Secure Projects require at least one nonsecure callable function in order to build (Remove this if it is not required to build). */
+BSP_CMSE_NONSECURE_ENTRY void template_nonsecure_callable() {
+
+}
+#endif
diff --git a/ports/renesas-ra/boards/RA6M2_EK/board.json b/ports/renesas-ra/boards/RA6M2_EK/board.json
new file mode 100644
index 0000000000000..63547d880733d
--- /dev/null
+++ b/ports/renesas-ra/boards/RA6M2_EK/board.json
@@ -0,0 +1,25 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [
+	"UART",
+	"SPI",
+	"I2C",
+	"ADC"
+    ],
+    "id": "EK-RA6M2",
+    "images": [
+        "ek_ra6m2_board.jpg",
+        "ek_ra6m2_j1_pins.jpg",
+        "ek_ra6m2_j2_pins.jpg",
+        "ek_ra6m2_j3_pins.jpg",
+        "ek_ra6m2_j4_pins.jpg"
+    ],
+    "mcu": "RA6M2",
+    "product": "EK-RA6M2",
+    "thumbnail": "",
+    "url": "https://www.renesas.com/products/microcontrollers-microprocessors/ra-cortex-m-mcus/ek-ra6m2-evaluation-kit-ra6m2-mcu-group",
+    "vendor": "Renesas Electronics"
+}
diff --git a/ports/renesas-ra/boards/RA6M2_EK/mpconfigboard.h b/ports/renesas-ra/boards/RA6M2_EK/mpconfigboard.h
new file mode 100644
index 0000000000000..2d2dc326d3384
--- /dev/null
+++ b/ports/renesas-ra/boards/RA6M2_EK/mpconfigboard.h
@@ -0,0 +1,88 @@
+// MCU config
+#define MICROPY_HW_BOARD_NAME       "RA6M2_EK"
+#define MICROPY_HW_MCU_NAME         "RA6M2"
+#define MICROPY_HW_MCU_SYSCLK       120000000
+#define MICROPY_HW_MCU_PCLK         60000000
+
+// module config
+#define MICROPY_EMIT_THUMB          (1)
+#define MICROPY_EMIT_INLINE_THUMB   (1)
+#define MICROPY_PY_BUILTINS_COMPLEX (1)
+#define MICROPY_PY_GENERATOR_PEND_THROW (1)
+#define MICROPY_PY_MATH             (1)
+#define MICROPY_PY_UHEAPQ           (1)
+#define MICROPY_PY_UTIMEQ           (1)
+#define MICROPY_PY_THREAD           (0) // disable ARM_THUMB_FP using vldr due to RA has single float only
+
+// peripheral config
+#define MICROPY_HW_ENABLE_RTC       (1)
+#define MICROPY_HW_RTC_SOURCE       (0)     // 0: subclock
+#define MICROPY_HW_ENABLE_ADC       (1)
+#define MICROPY_HW_HAS_FLASH        (1)
+#define MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE (1)
+
+// board config
+
+// UART
+#define MICROPY_HW_UART0_TX         (pin_P411) // REPL
+#define MICROPY_HW_UART0_RX         (pin_P410) // REPL
+// #define MICROPY_HW_UART0_CTS      (pin_P413) // NC
+// #define MICROPY_HW_UART1_TX       (pin_P709) // Disable (read not work properly)
+// #define MICROPY_HW_UART1_RX       (pin_P708) // Disable (read not work properly)
+// #define MICROPY_HW_UART1_CTS      (pin_P711) // Disable (read not work properly)
+// #define MICROPY_HW_UART2_TX       (pin_P302) // Disable
+// #define MICROPY_HW_UART2_RX       (pin_P301) // Disable
+// #define MICROPY_HW_UART2_CTS      (pin_P203) // NC
+// #define MICROPY_HW_UART3_TX       (pin_P310) // Disable
+// #define MICROPY_HW_UART3_RX       (pin_P309) // Disable
+// #define MICROPY_HW_UART3_CTS      (pin_P312) // Disable
+// #define MICROPY_HW_UART4_TX       (pin_P512) // Disable (Conflict with I2C2)
+// #define MICROPY_HW_UART4_RX       (pin_P511) // Disable (Conflict with I2C2)
+// #define MICROPY_HW_UART4_CTS      (pin_P401) // Disable (Conflict with PMOD B)
+// #define MICROPY_HW_UART5_TX       (pin_P501) // Disable
+// #define MICROPY_HW_UART5_RX       (pin_P502) // Disable
+// #define MICROPY_HW_UART5_CTS      (pin_P504) // Disable
+// #define MICROPY_HW_UART6_TX       (pin_P506) // Disable (read not work properly)
+// #define MICROPY_HW_UART6_RX       (pin_P505) // Disable (read not work properly)
+// #define MICROPY_HW_UART6_CTS      (pin_P503) // Disable (read not work properly)
+#define MICROPY_HW_UART7_TX         (pin_P401) // PMOD B
+#define MICROPY_HW_UART7_RX         (pin_P402) // PMOD B
+#define MICROPY_HW_UART7_CTS        (pin_P403) // PMOD B
+// #define MICROPY_HW_UART8_TX       (pin_P105) // Disable (conflict with USER SW1)
+// #define MICROPY_HW_UART8_RX       (pin_P104)
+#define MICROPY_HW_UART9_TX         (pin_P602)
+#define MICROPY_HW_UART9_RX         (pin_P601)
+#define MICROPY_HW_UART9_CTS        (pin_P603)
+#define MICROPY_HW_UART_REPL        HW_UART_0
+#define MICROPY_HW_UART_REPL_BAUD   115200
+
+// I2C
+// #define MICROPY_HW_I2C0_SCL       (pin_P400) // Disable (Conflict with PMOD B)
+// #define MICROPY_HW_I2C0_SDA       (pin_P401) // Disable (Conflict with PMOD B)
+// #define MICROPY_HW_I2C1_SCL       (pin_P100) // Disable (Conflict with SPI & SDcard)
+// #define MICROPY_HW_I2C1_SDA       (pin_P101) // Disable (Conflict with SPI & SDcard)
+#define MICROPY_HW_I2C2_SCL         (pin_P512)
+#define MICROPY_HW_I2C2_SDA         (pin_P511)
+
+// SPI
+#define MICROPY_HW_SPI0_SSL         (pin_P103) // PMOD A
+#define MICROPY_HW_SPI0_RSPCK       (pin_P102)
+#define MICROPY_HW_SPI0_MISO        (pin_P100)
+#define MICROPY_HW_SPI0_MOSI        (pin_P101)
+#define MICROPY_HW_SPI1_SSL         (pin_P703) // Pin Header
+#define MICROPY_HW_SPI1_RSPCK       (pin_P702)
+#define MICROPY_HW_SPI1_MISO        (pin_P700)
+#define MICROPY_HW_SPI1_MOSI        (pin_P701)
+
+// Switch
+#define MICROPY_HW_HAS_SWITCH       (1)
+#define MICROPY_HW_USRSW_PIN        (pin_P105)
+#define MICROPY_HW_USRSW_PULL       (GPIO_NOPULL)
+#define MICROPY_HW_USRSW_EXTI_MODE  (GPIO_MODE_IT_FALLING)
+#define MICROPY_HW_USRSW_PRESSED    (0)
+
+// LEDs
+#define MICROPY_HW_LED1             (pin_P106)
+#define MICROPY_HW_LED_ON(pin)      mp_hal_pin_high(pin)
+#define MICROPY_HW_LED_OFF(pin)     mp_hal_pin_low(pin)
+#define MICROPY_HW_LED_TOGGLE(pin)  mp_hal_pin_toggle(pin)
diff --git a/ports/renesas-ra/boards/RA6M2_EK/mpconfigboard.mk b/ports/renesas-ra/boards/RA6M2_EK/mpconfigboard.mk
new file mode 100644
index 0000000000000..59d48c0e6cf34
--- /dev/null
+++ b/ports/renesas-ra/boards/RA6M2_EK/mpconfigboard.mk
@@ -0,0 +1,6 @@
+CMSIS_MCU = RA6M2
+MCU_SERIES = m4
+LD_FILES = boards/RA6M2_EK/ra6m2_ek.ld
+
+# MicroPython settings
+MICROPY_VFS_FAT = 1
diff --git a/ports/renesas-ra/boards/RA6M2_EK/pins.csv b/ports/renesas-ra/boards/RA6M2_EK/pins.csv
new file mode 100644
index 0000000000000..5986d72124d20
--- /dev/null
+++ b/ports/renesas-ra/boards/RA6M2_EK/pins.csv
@@ -0,0 +1,118 @@
+P000,P000
+P001,P001
+P002,P002
+P003,P003
+P004,P004
+P005,P005
+P006,P006
+P007,P007
+P008,P008
+P009,P009
+P014,P014
+P015,P015
+P100,P100
+P101,P101
+P102,P102
+P103,P103
+P104,P104
+P105,P105
+P106,P106
+P107,P107
+P108,P108
+P109,P109
+P110,P110
+P111,P111
+P112,P112
+P113,P113
+P114,P114
+P115,P115
+P200,P200
+P201,P201
+P202,P202
+P203,P203
+P204,P204
+P205,P205
+P206,P206
+P207,P207
+P208,P208
+P209,P209
+P210,P210
+P211,P211
+P212,P212
+P213,P213
+P214,P214
+P300,P300
+P301,P301
+P302,P302
+P303,P303
+P304,P304
+P305,P305
+P306,P306
+P307,P307
+P308,P308
+P309,P309
+P310,P310
+P311,P311
+P312,P312
+P313,P313
+P400,P400
+P401,P401
+P402,P402
+P403,P403
+P404,P404
+P405,P405
+P406,P406
+P407,P407
+P408,P408
+P409,P409
+P410,P410
+P411,P411
+P412,P412
+P413,P413
+P414,P414
+P415,P415
+P500,P500
+P501,P501
+P502,P502
+P503,P503
+P504,P504
+P505,P505
+P506,P506
+P508,P508
+P511,P511
+P512,P512
+P600,P600
+P601,P601
+P602,P602
+P603,P603
+P604,P604
+P605,P605
+P608,P608
+P609,P609
+P610,P610
+P611,P611
+P612,P612
+P613,P613
+P614,P614
+P700,P700
+P701,P701
+P702,P702
+P703,P703
+P704,P704
+P705,P705
+P708,P708
+P709,P709
+P710,P710
+P711,P711
+P712,P712
+P713,P713
+P800,P800
+P801,P801
+P808,P808
+P809,P809
+P914,P914
+P915,P915
+SW1,P105
+LED1,P106
+USBDP,P914
+USBDM,P915
diff --git a/ports/renesas-ra/boards/RA6M2_EK/ra6m2_ek.ld b/ports/renesas-ra/boards/RA6M2_EK/ra6m2_ek.ld
new file mode 100644
index 0000000000000..4ad1b1ac1b8b0
--- /dev/null
+++ b/ports/renesas-ra/boards/RA6M2_EK/ra6m2_ek.ld
@@ -0,0 +1,298 @@
+/*
+                  Linker File for RA6M2 MCU
+*/
+
+/* Linker script to configure memory regions. */
+MEMORY
+{
+  FLASH (rx)         : ORIGIN = 0x00000000, LENGTH = 0x00100000  /* 1MB */
+  RAM (rwx)          : ORIGIN = 0x1FFE0000, LENGTH = 0x00060000  /* 384KB */
+  DATA_FLASH (rx)    : ORIGIN = 0x40100000, LENGTH = 0x00008000  /* 32KB */
+  ID_CODE (rx)       : ORIGIN = 0x0100A150, LENGTH = 0x00000010  /* 32bytes */
+}
+
+/* Library configurations */
+/*GROUP(libgcc.a libc.a libm.a libnosys.a) */
+
+/* Linker script to place sections and symbol values. Should be used together
+ * with other linker script that defines memory regions FLASH and RAM.
+ * It references following symbols, which must be defined in code:
+ *   Reset_Handler : Entry of reset handler
+ *
+ * It defines following symbols, which code can use without definition:
+ *   __exidx_start
+ *   __exidx_end
+ *   __copy_table_start__
+ *   __copy_table_end__
+ *   __zero_table_start__
+ *   __zero_table_end__
+ *   __etext
+ *   __data_start__
+ *   __preinit_array_start
+ *   __preinit_array_end
+ *   __init_array_start
+ *   __init_array_end
+ *   __fini_array_start
+ *   __fini_array_end
+ *   __data_end__
+ *   __bss_start__
+ *   __bss_end__
+ *   __end__
+ *   end
+ *   __HeapLimit
+ *   __StackLimit
+ *   __StackTop
+ *   __stack
+ *   __Vectors_End
+ *   __Vectors_Size
+ */
+ENTRY(Reset_Handler)
+
+SECTIONS
+{
+    .text :
+    {
+        _stext = .;
+        __ROM_Start = .;
+
+        /* Even though the vector table is not 256 entries (1KB) long, we still allocate that much
+         * space because ROM registers are at address 0x400 and there is very little space
+         * in between. */
+        KEEP(*(.fixed_vectors*))
+        KEEP(*(.application_vectors*))
+        __Vectors_End = .;
+        __end__ = .;
+
+        /* ROM Registers start at address 0x00000400 */
+        . = __ROM_Start + 0x400;
+        KEEP(*(.rom_registers*))
+
+        /* Reserving 0x100 bytes of space for ROM registers. */
+        . = __ROM_Start + 0x500;
+
+        *(.text*)
+
+        KEEP(*(.version))
+        KEEP(*(.init))
+        KEEP(*(.fini))
+
+        /* .ctors */
+        *crtbegin.o(.ctors)
+        *crtbegin?.o(.ctors)
+        *(EXCLUDE_FILE(*crtend?.o *crtend.o) .ctors)
+        *(SORT(.ctors.*))
+        *(.ctors)
+
+        /* .dtors */
+        *crtbegin.o(.dtors)
+        *crtbegin?.o(.dtors)
+        *(EXCLUDE_FILE(*crtend?.o *crtend.o) .dtors)
+        *(SORT(.dtors.*))
+        *(.dtors)
+
+        *(.rodata*)
+        __usb_dev_descriptor_start_fs = .;
+        KEEP(*(.usb_device_desc_fs*))
+        __usb_cfg_descriptor_start_fs = .;
+        KEEP(*(.usb_config_desc_fs*))
+        __usb_interface_descriptor_start_fs = .;
+        KEEP(*(.usb_interface_desc_fs*))
+        __usb_descriptor_end_fs = .;
+        __usb_dev_descriptor_start_hs = .;
+        KEEP(*(.usb_device_desc_hs*))
+        __usb_cfg_descriptor_start_hs = .;
+        KEEP(*(.usb_config_desc_hs*))
+        __usb_interface_descriptor_start_hs = .;
+        KEEP(*(.usb_interface_desc_hs*))
+        __usb_descriptor_end_hs = .;
+
+        KEEP(*(.eh_frame*))
+
+        __ROM_End = .;
+        _etext = .;
+    } > FLASH = 0xFF
+
+    __Vectors_Size = __Vectors_End - __Vectors;
+
+    .ARM.extab :
+    {
+        *(.ARM.extab* .gnu.linkonce.armextab.*)
+    } > FLASH
+
+    __exidx_start = .;
+    .ARM.exidx :
+    {
+        *(.ARM.exidx* .gnu.linkonce.armexidx.*)
+    } > FLASH
+    __exidx_end = .;
+
+    /* To copy multiple ROM to RAM sections,
+     * uncomment .copy.table section and,
+     * define __STARTUP_COPY_MULTIPLE in startup_ARMCMx.S */
+    /*
+    .copy.table :
+    {
+        . = ALIGN(4);
+        __copy_table_start__ = .;
+        LONG (__etext)
+        LONG (__data_start__)
+        LONG (__data_end__ - __data_start__)
+        LONG (__etext2)
+        LONG (__data2_start__)
+        LONG (__data2_end__ - __data2_start__)
+        __copy_table_end__ = .;
+    } > FLASH
+    */
+
+    /* To clear multiple BSS sections,
+     * uncomment .zero.table section and,
+     * define __STARTUP_CLEAR_BSS_MULTIPLE in startup_ARMCMx.S */
+    /*
+    .zero.table :
+    {
+        . = ALIGN(4);
+        __zero_table_start__ = .;
+        LONG (__bss_start__)
+        LONG (__bss_end__ - __bss_start__)
+        LONG (__bss2_start__)
+        LONG (__bss2_end__ - __bss2_start__)
+        __zero_table_end__ = .;
+    } > FLASH
+    */
+
+    __etext = .;
+
+    /* If DTC is used, put the DTC vector table at the start of SRAM.
+       This avoids memory holes due to 1K alignment required by it. */
+    .fsp_dtc_vector_table (NOLOAD) :
+    {
+        . = ORIGIN(RAM);
+        *(.fsp_dtc_vector_table)
+    } > RAM
+
+    /* Initialized data section. */
+    .data :
+    {
+        _sidata = .;
+        _sdata = .;
+        __data_start__ = .;
+        *(vtable)
+        *(.data.*)
+
+        . = ALIGN(4);
+        /* preinit data */
+        PROVIDE_HIDDEN (__preinit_array_start = .);
+        KEEP(*(.preinit_array))
+        PROVIDE_HIDDEN (__preinit_array_end = .);
+
+        . = ALIGN(4);
+        /* init data */
+        PROVIDE_HIDDEN (__init_array_start = .);
+        KEEP(*(SORT(.init_array.*)))
+        KEEP(*(.init_array))
+        PROVIDE_HIDDEN (__init_array_end = .);
+
+
+        . = ALIGN(4);
+        /* finit data */
+        PROVIDE_HIDDEN (__fini_array_start = .);
+        KEEP(*(SORT(.fini_array.*)))
+        KEEP(*(.fini_array))
+        PROVIDE_HIDDEN (__fini_array_end = .);
+
+        KEEP(*(.jcr*))
+        . = ALIGN(4);
+
+        __Code_In_RAM_Start = .;
+
+        KEEP(*(.code_in_ram*))
+        __Code_In_RAM_End = .;
+
+        /* All data end */
+        __data_end__ = .;
+        _edata = .;
+
+    } > RAM AT > FLASH
+
+
+
+    .noinit (NOLOAD):
+    {
+        . = ALIGN(4);
+        __noinit_start = .;
+        KEEP(*(.noinit*))
+        __noinit_end = .;
+    } > RAM
+
+    .bss :
+    {
+        . = ALIGN(4);
+        _sbss = .;
+        __bss_start__ = .;
+        *(.bss*)
+        *(COMMON)
+        . = ALIGN(4);
+        __bss_end__ = .;
+        _ebss = .;
+    } > RAM
+
+    .heap (NOLOAD):
+    {
+        . = ALIGN(8);
+        __HeapBase = .;
+        __end__ = .;
+        end = __end__;
+        KEEP(*(.heap*))
+        __HeapLimit = .;
+    } > RAM
+
+    /* Stacks are stored in this section. */
+    .stack_dummy (NOLOAD):
+    {
+        . = ALIGN(8);
+        _sstack = .;
+        __StackLimit = .;
+        /* Main stack */
+        KEEP(*(.stack))
+        __StackTop = .;
+        /* Thread stacks */
+        KEEP(*(.stack*))
+        __StackTopAll = .;
+        _estack = .;
+    } > RAM
+
+    PROVIDE(__stack = __StackTopAll);
+
+    /* This symbol represents the end of user allocated RAM. The RAM after this symbol can be used
+       at run time for things such as ThreadX memory pool allocations. */
+    __RAM_segment_used_end__ = ALIGN(__StackTopAll , 4);
+
+    /* Data flash. */
+    .data_flash :
+    {
+        __Data_Flash_Start = .;
+        KEEP(*(.data_flash*))
+        __Data_Flash_End = .;
+    } > DATA_FLASH
+
+    .id_code :
+    {
+        __ID_Code_Start = .;
+        KEEP(*(.id_code*))
+        __ID_Code_End = .;
+    } > ID_CODE
+}
+/* produce a link error if there is not this amount of RAM for these sections */
+/* _minimum_stack_size = 2K; */
+/* _minimum_heap_size = 16K; */
+
+/* Define tho top end of the stack.  The stack is full descending so begins just
+   above last byte of RAM.  Note that EABI requires the stack to be 8-byte
+   aligned for a call. */
+_estack = ORIGIN(RAM) + LENGTH(RAM);
+
+/* RAM extents for the garbage collector */
+_ram_start = ORIGIN(RAM);
+_ram_end = ORIGIN(RAM) + LENGTH(RAM);
+_heap_start = __HeapBase;	/* heap starts just after statically allocated memory */
+_heap_end = __HeapLimit;	/* tunable */
diff --git a/ports/renesas-ra/boards/RA6M2_EK/ra6m2_ek_conf.h b/ports/renesas-ra/boards/RA6M2_EK/ra6m2_ek_conf.h
new file mode 100644
index 0000000000000..e34443e064475
--- /dev/null
+++ b/ports/renesas-ra/boards/RA6M2_EK/ra6m2_ek_conf.h
@@ -0,0 +1,30 @@
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Renesas Electronics Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#ifndef RA6M2_EK_CONF_H
+#define RA6M2_EK_CONF_H
+
+#define DEBUG_CH    0
+
+#endif /* RA6M2_EK_CONF_H */
diff --git a/ports/renesas-ra/boards/RA6M2_EK/ra_cfg/fsp_cfg/bsp/board_cfg.h b/ports/renesas-ra/boards/RA6M2_EK/ra_cfg/fsp_cfg/bsp/board_cfg.h
new file mode 100644
index 0000000000000..ecffc5a448a5d
--- /dev/null
+++ b/ports/renesas-ra/boards/RA6M2_EK/ra_cfg/fsp_cfg/bsp/board_cfg.h
@@ -0,0 +1,5 @@
+/* generated configuration header file - do not edit */
+#ifndef BOARD_CFG_H_
+#define BOARD_CFG_H_
+#include "../../../ra/board/ra6m2_ek/board.h"
+#endif /* BOARD_CFG_H_ */
diff --git a/ports/renesas-ra/boards/RA6M2_EK/ra_cfg/fsp_cfg/bsp/bsp_cfg.h b/ports/renesas-ra/boards/RA6M2_EK/ra_cfg/fsp_cfg/bsp/bsp_cfg.h
new file mode 100644
index 0000000000000..7255cdd17c50e
--- /dev/null
+++ b/ports/renesas-ra/boards/RA6M2_EK/ra_cfg/fsp_cfg/bsp/bsp_cfg.h
@@ -0,0 +1,49 @@
+/* generated configuration header file - do not edit */
+#ifndef BSP_CFG_H_
+#define BSP_CFG_H_
+#include "bsp_clock_cfg.h"
+#include "bsp_mcu_family_cfg.h"
+#include "board_cfg.h"
+#define RA_NOT_DEFINED 0
+#ifndef BSP_CFG_RTOS
+#if (RA_NOT_DEFINED) != (RA_NOT_DEFINED)
+#define BSP_CFG_RTOS (2)
+#elif (RA_NOT_DEFINED) != (RA_NOT_DEFINED)
+#define BSP_CFG_RTOS (1)
+#else
+#define BSP_CFG_RTOS (0)
+#endif
+#endif
+#undef RA_NOT_DEFINED
+#define BSP_CFG_MCU_VCC_MV (3300)
+#define BSP_CFG_STACK_MAIN_BYTES (0x4000)
+#define BSP_CFG_HEAP_BYTES (0x4d000)
+#define BSP_CFG_PARAM_CHECKING_ENABLE (0)
+#define BSP_CFG_ASSERT (0)
+#define BSP_CFG_ERROR_LOG (0)
+
+#define BSP_CFG_PFS_PROTECT ((1))
+
+#define BSP_CFG_C_RUNTIME_INIT ((1))
+
+#define BSP_CFG_SOFT_RESET_SUPPORTED ((0))
+
+#ifndef BSP_CLOCK_CFG_MAIN_OSC_POPULATED
+#define BSP_CLOCK_CFG_MAIN_OSC_POPULATED (1)
+#endif
+#ifndef BSP_CLOCK_CFG_MAIN_OSC_WAIT
+#define BSP_CLOCK_CFG_MAIN_OSC_WAIT (9)
+#endif
+#ifndef BSP_CLOCK_CFG_MAIN_OSC_CLOCK_SOURCE
+#define BSP_CLOCK_CFG_MAIN_OSC_CLOCK_SOURCE (0)
+#endif
+#ifndef BSP_CLOCK_CFG_SUBCLOCK_DRIVE
+#define BSP_CLOCK_CFG_SUBCLOCK_DRIVE (0)
+#endif
+#ifndef BSP_CLOCK_CFG_SUBCLOCK_POPULATED
+#define BSP_CLOCK_CFG_SUBCLOCK_POPULATED (1)
+#endif
+#ifndef BSP_CLOCK_CFG_SUBCLOCK_STABILIZATION_MS
+#define BSP_CLOCK_CFG_SUBCLOCK_STABILIZATION_MS 1000
+#endif
+#endif /* BSP_CFG_H_ */
diff --git a/ports/renesas-ra/boards/RA6M2_EK/ra_cfg/fsp_cfg/bsp/bsp_mcu_device_cfg.h b/ports/renesas-ra/boards/RA6M2_EK/ra_cfg/fsp_cfg/bsp/bsp_mcu_device_cfg.h
new file mode 100644
index 0000000000000..bd6a901c32d6e
--- /dev/null
+++ b/ports/renesas-ra/boards/RA6M2_EK/ra_cfg/fsp_cfg/bsp/bsp_mcu_device_cfg.h
@@ -0,0 +1,5 @@
+/* generated configuration header file - do not edit */
+#ifndef BSP_MCU_DEVICE_CFG_H_
+#define BSP_MCU_DEVICE_CFG_H_
+#define BSP_CFG_MCU_PART_SERIES (6)
+#endif /* BSP_MCU_DEVICE_CFG_H_ */
diff --git a/ports/renesas-ra/boards/RA6M2_EK/ra_cfg/fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h b/ports/renesas-ra/boards/RA6M2_EK/ra_cfg/fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h
new file mode 100644
index 0000000000000..6097e9d7d35de
--- /dev/null
+++ b/ports/renesas-ra/boards/RA6M2_EK/ra_cfg/fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h
@@ -0,0 +1,10 @@
+/* generated configuration header file - do not edit */
+#ifndef BSP_MCU_DEVICE_PN_CFG_H_
+#define BSP_MCU_DEVICE_PN_CFG_H_
+#define BSP_MCU_R7FA6M2AF3CFB
+#define BSP_ROM_SIZE_BYTES (1048576)
+#define BSP_RAM_SIZE_BYTES (393216)
+#define BSP_DATA_FLASH_SIZE_BYTES (32768)
+#define BSP_PACKAGE_LQFP
+#define BSP_PACKAGE_PINS (144)
+#endif /* BSP_MCU_DEVICE_PN_CFG_H_ */
diff --git a/ports/renesas-ra/boards/RA6M2_EK/ra_cfg/fsp_cfg/bsp/bsp_mcu_family_cfg.h b/ports/renesas-ra/boards/RA6M2_EK/ra_cfg/fsp_cfg/bsp/bsp_mcu_family_cfg.h
new file mode 100644
index 0000000000000..51f399e3c93f2
--- /dev/null
+++ b/ports/renesas-ra/boards/RA6M2_EK/ra_cfg/fsp_cfg/bsp/bsp_mcu_family_cfg.h
@@ -0,0 +1,74 @@
+/* generated configuration header file - do not edit */
+#ifndef BSP_MCU_FAMILY_CFG_H_
+#define BSP_MCU_FAMILY_CFG_H_
+#include "bsp_mcu_device_pn_cfg.h"
+#include "bsp_mcu_device_cfg.h"
+#include "../../../ra/fsp/src/bsp/mcu/ra6m2/bsp_mcu_info.h"
+#include "bsp_clock_cfg.h"
+#define BSP_MCU_GROUP_RA6M2 (1)
+#define BSP_LOCO_HZ                 (32768)
+#define BSP_MOCO_HZ                 (8000000)
+#define BSP_SUB_CLOCK_HZ            (32768)
+#if   BSP_CFG_HOCO_FREQUENCY == 0
+#define BSP_HOCO_HZ                 (16000000)
+#elif BSP_CFG_HOCO_FREQUENCY == 1
+#define BSP_HOCO_HZ                 (18000000)
+#elif BSP_CFG_HOCO_FREQUENCY == 2
+#define BSP_HOCO_HZ                 (20000000)
+#else
+#error "Invalid HOCO frequency chosen (BSP_CFG_HOCO_FREQUENCY) in bsp_clock_cfg.h"
+#endif
+
+#define BSP_CFG_FLL_ENABLE                 (0)
+
+#define BSP_CORTEX_VECTOR_TABLE_ENTRIES    (16U)
+#define BSP_VECTOR_TABLE_MAX_ENTRIES       (112U)
+#define BSP_MCU_VBATT_SUPPORT       (1)
+
+#define OFS_SEQ1 0xA001A001 | (1 << 1) | (3 << 2)
+#define OFS_SEQ2 (15 << 4) | (3 << 8) | (3 << 10)
+#define OFS_SEQ3 (1 << 12) | (1 << 14) | (1 << 17)
+#define OFS_SEQ4 (3 << 18) | (15 << 20) | (3 << 24) | (3 << 26)
+#define OFS_SEQ5 (1 << 28) | (1 << 30)
+#define BSP_CFG_ROM_REG_OFS0 (OFS_SEQ1 | OFS_SEQ2 | OFS_SEQ3 | OFS_SEQ4 | OFS_SEQ5)
+#define BSP_CFG_ROM_REG_OFS1 (0xFFFFFEF8 | (1 << 2) | (3) | (1 << 8))
+#define BSP_CFG_ROM_REG_MPU_PC0_ENABLE (1)
+#define BSP_CFG_ROM_REG_MPU_PC0_START (0xFFFFFFFC)
+#define BSP_CFG_ROM_REG_MPU_PC0_END (0xFFFFFFFF)
+#define BSP_CFG_ROM_REG_MPU_PC1_ENABLE (1)
+#define BSP_CFG_ROM_REG_MPU_PC1_START (0xFFFFFFFC)
+#define BSP_CFG_ROM_REG_MPU_PC1_END (0xFFFFFFFF)
+#define BSP_CFG_ROM_REG_MPU_REGION0_ENABLE (1)
+#define BSP_CFG_ROM_REG_MPU_REGION0_START (0x00FFFFFC)
+#define BSP_CFG_ROM_REG_MPU_REGION0_END (0x00FFFFFF)
+#define BSP_CFG_ROM_REG_MPU_REGION1_ENABLE (1)
+#define BSP_CFG_ROM_REG_MPU_REGION1_START (0x200FFFFC)
+#define BSP_CFG_ROM_REG_MPU_REGION1_END (0x200FFFFF)
+#define BSP_CFG_ROM_REG_MPU_REGION2_ENABLE (1)
+#define BSP_CFG_ROM_REG_MPU_REGION2_START (0x407FFFFC)
+#define BSP_CFG_ROM_REG_MPU_REGION2_END (0x407FFFFF)
+#define BSP_CFG_ROM_REG_MPU_REGION3_ENABLE (1)
+#define BSP_CFG_ROM_REG_MPU_REGION3_START (0x400DFFFC)
+#define BSP_CFG_ROM_REG_MPU_REGION3_END (0x400DFFFF)
+
+/* Used to create IELS values for the interrupt initialization table g_interrupt_event_link_select. */
+#define BSP_PRV_IELS_ENUM(vector)    (ELC_##vector)
+
+/*
+ ID Code
+ Note: To permanently lock and disable the debug interface define the BSP_ID_CODE_PERMANENTLY_LOCKED in the compiler settings.
+ WARNING: This will disable debug access to the part and cannot be reversed by a debug probe.
+ */
+#if defined(BSP_ID_CODE_PERMANENTLY_LOCKED)
+#define BSP_CFG_ID_CODE_LONG_1 (0x00000000)
+#define BSP_CFG_ID_CODE_LONG_2 (0x00000000)
+#define BSP_CFG_ID_CODE_LONG_3 (0x00000000)
+#define BSP_CFG_ID_CODE_LONG_4 (0x00000000)
+#else
+/* ID CODE: FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF */
+#define BSP_CFG_ID_CODE_LONG_1 (0xFFFFFFFF)
+#define BSP_CFG_ID_CODE_LONG_2 (0xFFFFFFFF)
+#define BSP_CFG_ID_CODE_LONG_3 (0xFFFFFFFF)
+#define BSP_CFG_ID_CODE_LONG_4 (0xffFFFFFF)
+#endif
+#endif /* BSP_MCU_FAMILY_CFG_H_ */
diff --git a/ports/renesas-ra/boards/RA6M2_EK/ra_cfg/fsp_cfg/r_adc_cfg.h b/ports/renesas-ra/boards/RA6M2_EK/ra_cfg/fsp_cfg/r_adc_cfg.h
new file mode 100644
index 0000000000000..9c59889ca8fee
--- /dev/null
+++ b/ports/renesas-ra/boards/RA6M2_EK/ra_cfg/fsp_cfg/r_adc_cfg.h
@@ -0,0 +1,5 @@
+/* generated configuration header file - do not edit */
+#ifndef R_ADC_CFG_H_
+#define R_ADC_CFG_H_
+#define ADC_CFG_PARAM_CHECKING_ENABLE (BSP_CFG_PARAM_CHECKING_ENABLE)
+#endif /* R_ADC_CFG_H_ */
diff --git a/ports/renesas-ra/boards/RA6M2_EK/ra_cfg/fsp_cfg/r_agt_cfg.h b/ports/renesas-ra/boards/RA6M2_EK/ra_cfg/fsp_cfg/r_agt_cfg.h
new file mode 100644
index 0000000000000..d3ab559238cbd
--- /dev/null
+++ b/ports/renesas-ra/boards/RA6M2_EK/ra_cfg/fsp_cfg/r_agt_cfg.h
@@ -0,0 +1,7 @@
+/* generated configuration header file - do not edit */
+#ifndef R_AGT_CFG_H_
+#define R_AGT_CFG_H_
+#define AGT_CFG_PARAM_CHECKING_ENABLE (BSP_CFG_PARAM_CHECKING_ENABLE)
+#define AGT_CFG_OUTPUT_SUPPORT_ENABLE (0)
+#define AGT_CFG_INPUT_SUPPORT_ENABLE (0)
+#endif /* R_AGT_CFG_H_ */
diff --git a/ports/renesas-ra/boards/RA6M2_EK/ra_cfg/fsp_cfg/r_dtc_cfg.h b/ports/renesas-ra/boards/RA6M2_EK/ra_cfg/fsp_cfg/r_dtc_cfg.h
new file mode 100644
index 0000000000000..21405f96741e2
--- /dev/null
+++ b/ports/renesas-ra/boards/RA6M2_EK/ra_cfg/fsp_cfg/r_dtc_cfg.h
@@ -0,0 +1,6 @@
+/* generated configuration header file - do not edit */
+#ifndef R_DTC_CFG_H_
+#define R_DTC_CFG_H_
+#define DTC_CFG_PARAM_CHECKING_ENABLE (BSP_CFG_PARAM_CHECKING_ENABLE)
+#define DTC_CFG_VECTOR_TABLE_SECTION_NAME ".fsp_dtc_vector_table"
+#endif /* R_DTC_CFG_H_ */
diff --git a/ports/renesas-ra/boards/RA6M2_EK/ra_cfg/fsp_cfg/r_flash_hp_cfg.h b/ports/renesas-ra/boards/RA6M2_EK/ra_cfg/fsp_cfg/r_flash_hp_cfg.h
new file mode 100644
index 0000000000000..48c9dec4e0764
--- /dev/null
+++ b/ports/renesas-ra/boards/RA6M2_EK/ra_cfg/fsp_cfg/r_flash_hp_cfg.h
@@ -0,0 +1,7 @@
+/* generated configuration header file - do not edit */
+#ifndef R_FLASH_HP_CFG_H_
+#define R_FLASH_HP_CFG_H_
+#define FLASH_HP_CFG_PARAM_CHECKING_ENABLE (BSP_CFG_PARAM_CHECKING_ENABLE)
+#define FLASH_HP_CFG_CODE_FLASH_PROGRAMMING_ENABLE (1)
+#define FLASH_HP_CFG_DATA_FLASH_PROGRAMMING_ENABLE (0)
+#endif /* R_FLASH_HP_CFG_H_ */
diff --git a/ports/renesas-ra/boards/RA6M2_EK/ra_cfg/fsp_cfg/r_icu_cfg.h b/ports/renesas-ra/boards/RA6M2_EK/ra_cfg/fsp_cfg/r_icu_cfg.h
new file mode 100644
index 0000000000000..5e77b6980f4ee
--- /dev/null
+++ b/ports/renesas-ra/boards/RA6M2_EK/ra_cfg/fsp_cfg/r_icu_cfg.h
@@ -0,0 +1,5 @@
+/* generated configuration header file - do not edit */
+#ifndef R_ICU_CFG_H_
+#define R_ICU_CFG_H_
+#define ICU_CFG_PARAM_CHECKING_ENABLE (BSP_CFG_PARAM_CHECKING_ENABLE)
+#endif /* R_ICU_CFG_H_ */
diff --git a/ports/renesas-ra/boards/RA6M2_EK/ra_cfg/fsp_cfg/r_iic_master_cfg.h b/ports/renesas-ra/boards/RA6M2_EK/ra_cfg/fsp_cfg/r_iic_master_cfg.h
new file mode 100644
index 0000000000000..595ea938d13a7
--- /dev/null
+++ b/ports/renesas-ra/boards/RA6M2_EK/ra_cfg/fsp_cfg/r_iic_master_cfg.h
@@ -0,0 +1,7 @@
+/* generated configuration header file - do not edit */
+#ifndef R_IIC_MASTER_CFG_H_
+#define R_IIC_MASTER_CFG_H_
+#define IIC_MASTER_CFG_PARAM_CHECKING_ENABLE (BSP_CFG_PARAM_CHECKING_ENABLE)
+#define IIC_MASTER_CFG_DTC_ENABLE (0)
+#define IIC_MASTER_CFG_ADDR_MODE_10_BIT_ENABLE (0)
+#endif /* R_IIC_MASTER_CFG_H_ */
diff --git a/ports/renesas-ra/boards/RA6M2_EK/ra_cfg/fsp_cfg/r_ioport_cfg.h b/ports/renesas-ra/boards/RA6M2_EK/ra_cfg/fsp_cfg/r_ioport_cfg.h
new file mode 100644
index 0000000000000..6b4353d238352
--- /dev/null
+++ b/ports/renesas-ra/boards/RA6M2_EK/ra_cfg/fsp_cfg/r_ioport_cfg.h
@@ -0,0 +1,5 @@
+/* generated configuration header file - do not edit */
+#ifndef R_IOPORT_CFG_H_
+#define R_IOPORT_CFG_H_
+#define IOPORT_CFG_PARAM_CHECKING_ENABLE (BSP_CFG_PARAM_CHECKING_ENABLE)
+#endif /* R_IOPORT_CFG_H_ */
diff --git a/ports/renesas-ra/boards/RA6M2_EK/ra_cfg/fsp_cfg/r_lpm_cfg.h b/ports/renesas-ra/boards/RA6M2_EK/ra_cfg/fsp_cfg/r_lpm_cfg.h
new file mode 100644
index 0000000000000..5f4d5c4a73627
--- /dev/null
+++ b/ports/renesas-ra/boards/RA6M2_EK/ra_cfg/fsp_cfg/r_lpm_cfg.h
@@ -0,0 +1,5 @@
+/* generated configuration header file - do not edit */
+#ifndef R_LPM_CFG_H_
+#define R_LPM_CFG_H_
+#define LPM_CFG_PARAM_CHECKING_ENABLE (BSP_CFG_PARAM_CHECKING_ENABLE)
+#endif /* R_LPM_CFG_H_ */
diff --git a/ports/renesas-ra/boards/RA6M2_EK/ra_cfg/fsp_cfg/r_rtc_cfg.h b/ports/renesas-ra/boards/RA6M2_EK/ra_cfg/fsp_cfg/r_rtc_cfg.h
new file mode 100644
index 0000000000000..484b7ed044c26
--- /dev/null
+++ b/ports/renesas-ra/boards/RA6M2_EK/ra_cfg/fsp_cfg/r_rtc_cfg.h
@@ -0,0 +1,5 @@
+/* generated configuration header file - do not edit */
+#ifndef R_RTC_CFG_H_
+#define R_RTC_CFG_H_
+#define RTC_CFG_PARAM_CHECKING_ENABLE (BSP_CFG_PARAM_CHECKING_ENABLE)
+#endif /* R_RTC_CFG_H_ */
diff --git a/ports/renesas-ra/boards/RA6M2_EK/ra_cfg/fsp_cfg/r_sci_uart_cfg.h b/ports/renesas-ra/boards/RA6M2_EK/ra_cfg/fsp_cfg/r_sci_uart_cfg.h
new file mode 100644
index 0000000000000..c70c0be344f9d
--- /dev/null
+++ b/ports/renesas-ra/boards/RA6M2_EK/ra_cfg/fsp_cfg/r_sci_uart_cfg.h
@@ -0,0 +1,8 @@
+/* generated configuration header file - do not edit */
+#ifndef R_SCI_UART_CFG_H_
+#define R_SCI_UART_CFG_H_
+#define SCI_UART_CFG_PARAM_CHECKING_ENABLE (BSP_CFG_PARAM_CHECKING_ENABLE)
+#define SCI_UART_CFG_FIFO_SUPPORT (0)
+#define SCI_UART_CFG_DTC_SUPPORTED (0)
+#define SCI_UART_CFG_FLOW_CONTROL_SUPPORT (0)
+#endif /* R_SCI_UART_CFG_H_ */
diff --git a/ports/renesas-ra/boards/RA6M2_EK/ra_cfg/fsp_cfg/r_spi_cfg.h b/ports/renesas-ra/boards/RA6M2_EK/ra_cfg/fsp_cfg/r_spi_cfg.h
new file mode 100644
index 0000000000000..861fe12194f63
--- /dev/null
+++ b/ports/renesas-ra/boards/RA6M2_EK/ra_cfg/fsp_cfg/r_spi_cfg.h
@@ -0,0 +1,7 @@
+/* generated configuration header file - do not edit */
+#ifndef R_SPI_CFG_H_
+#define R_SPI_CFG_H_
+#define SPI_CFG_PARAM_CHECKING_ENABLE (BSP_CFG_PARAM_CHECKING_ENABLE)
+#define SPI_DTC_SUPPORT_ENABLE (1)
+#define SPI_TRANSMIT_FROM_RXI_ISR (0)
+#endif /* R_SPI_CFG_H_ */
diff --git a/ports/renesas-ra/boards/RA6M2_EK/ra_gen/RA6M2-EK.csv b/ports/renesas-ra/boards/RA6M2_EK/ra_gen/RA6M2-EK.csv
new file mode 100644
index 0000000000000..ff82aa9ce9502
--- /dev/null
+++ b/ports/renesas-ra/boards/RA6M2_EK/ra_gen/RA6M2-EK.csv
@@ -0,0 +1,701 @@
+"Name","Pin","Function","Drive Capacity","IRQ","Mode","Output type","Pull up","Port Capabilities"
+"AVCC0","127","ADC_AVCC0","","","","","",""
+"AVSS0","128","ADC_AVSS0","","","","","",""
+"P000","140","","","","Disabled","","","ADC0: AN00
+CMP0: IVCMP2
+IRQ0: IRQ06"
+"P001","139","","","","Disabled","","","ADC0: AN01
+CMP0: IVCMP2
+IRQ0: IRQ07"
+"P002","138","","","","Disabled","","","ADC0: AN02
+CMP0: IVCMP2
+IRQ0: IRQ08"
+"P003","137","","","","Disabled","","","ADC0: AN07"
+"P004","136","ADC1_AN00","","","Analog mode","","","ADC1: AN00
+CMP0: IVCMP2
+IRQ0: IRQ09"
+"P005","135","","","","Disabled","","","ADC1: AN01
+CMP0: IVCMP2
+IRQ0: IRQ10"
+"P006","134","","","","Disabled","","","ADC1: AN02
+CMP0: IVCMP2
+IRQ0: IRQ11"
+"P007","133","","","","Disabled","","","ADC1: AN07"
+"P008","132","","","","Disabled","","","ADC0: AN03
+IRQ0: IRQ12"
+"P009","131","","","","Disabled","","","ADC0: AN04
+IRQ0: IRQ13"
+"P014","124","","","","Disabled","","","ADC0: AN05
+ADC1: AN05
+CMP0: IVREF3
+DAC120: DA"
+"P015","123","","","","Disabled","","","ADC0: AN06
+ADC1: AN06
+CMP0: IVCMP1
+DAC121: DA
+IRQ0: IRQ13"
+"P100","108","SPI0_MISO","Low","None","Peripheral mode","CMOS","None","AGT0: AGTIO
+BUS0: D0_DQ0
+GPT5: GTIOCB
+IIC1: SCL
+IRQ0: IRQ02
+KINT0: KRM0
+POEG0: GTETRG
+SCI0: RXD_MISO
+SCI0: SCL
+SCI1: SCK
+SPI0: MISO"
+"P101","107","SPI0_MOSI","Low","None","Peripheral mode","CMOS","None","AGT0: AGTEE
+BUS0: D1_DQ1
+GPT5: GTIOCA
+IIC1: SDA
+IRQ0: IRQ01
+KINT0: KRM1
+POEG1: GTETRG
+SCI0: SDA
+SCI0: TXD_MOSI
+SCI1: CTS_RTS_SS
+SPI0: MOSI"
+"P102","106","SPI0_RSPCK","Low","","Peripheral mode","CMOS","None","ADC0: ADTRG
+AGT0: AGTO
+BUS0: D2_DQ2
+CAN0: CRX
+GPT2: GTIOCB
+KINT0: KRM2
+OPS0: GTOWLO
+SCI0: SCK
+SPI0: RSPCK"
+"P103","105","SPI0_SSL0","Low","","Peripheral mode","CMOS","None","BUS0: D3_DQ3
+CAN0: CTX
+GPT2: GTIOCA
+KINT0: KRM3
+OPS0: GTOWUP
+SCI0: CTS_RTS_SS
+SPI0: SSL0"
+"P104","104","","","","Disabled","","","BUS0: D4_DQ4
+GPT1: GTIOCB
+IRQ0: IRQ01
+KINT0: KRM4
+POEG1: GTETRG
+SCI8: RXD_MISO
+SCI8: SCL
+SPI0: SSL1"
+"P105","103","GPIO","","IRQ0","Input mode","","None","BUS0: D5_DQ5
+GPT1: GTIOCA
+IRQ0: IRQ00
+KINT0: KRM5
+POEG0: GTETRG
+SCI8: SDA
+SCI8: TXD_MOSI
+SPI0: SSL2"
+"P106","102","GPIO","Low","","Output mode (Initial Low)","CMOS","None","AGT0: AGTOB
+BUS0: D6_DQ6
+GPT8: GTIOCB
+KINT0: KRM6
+SCI8: SCK
+SPI0: SSL3"
+"P107","101","","","","Disabled","","","AGT0: AGTOA
+BUS0: D7_DQ7
+GPT8: GTIOCA
+KINT0: KRM7
+SCI8: CTS_RTS_SS"
+"P108","73","DEBUG0_TMS","Low","","Peripheral mode","CMOS","None","DEBUG0: SWDIO
+DEBUG0: TMS
+GPT0: GTIOCB
+OPS0: GTOULO
+SCI9: CTS_RTS_SS
+SPI1: SSL0"
+"P109","74","DEBUG0_TDO","Low","","Peripheral mode","CMOS","None","CAN1: CTX
+CGC0: CLKOUT
+DEBUG0: SWO
+DEBUG0: TDO
+GPT1: GTIOCA
+OPS0: GTOVUP
+SCI9: SDA
+SCI9: TXD_MOSI
+SPI1: MOSI"
+"P110","75","DEBUG0_TDI","Low","None","Peripheral mode","CMOS","None","CAN1: CRX
+CMP0: VCOUT
+DEBUG0: TDI
+GPT1: GTIOCB
+IRQ0: IRQ03
+OPS0: GTOVLO
+SCI2: CTS_RTS_SS
+SCI9: RXD_MISO
+SCI9: SCL
+SPI1: MISO"
+"P111","76","","","","Disabled","","","BUS0: A05
+GPT3: GTIOCA
+IRQ0: IRQ04
+SCI2: SCK
+SCI9: SCK
+SPI1: RSPCK"
+"P112","77","","","","Disabled","","","BUS0: A04
+GPT3: GTIOCB
+SCI1: SCK
+SCI2: SDA
+SCI2: TXD_MOSI
+SPI1: SSL0
+SSI0: SSISCK"
+"P113","78","","","","Disabled","","","BUS0: A03
+GPT2: GTIOCA
+SCI2: RXD_MISO
+SCI2: SCL
+SSI0: SSIWS"
+"P114","79","","","","Disabled","","","BUS0: A02
+GPT2: GTIOCB
+SSI0: SSIRXD"
+"P115","80","","","","Disabled","","","BUS0: A01
+GPT4: GTIOCA
+SSI0: SSITXD"
+"P200","57","","","","Disabled","","","IRQ0: NMI"
+"P201","56","","","","Disabled","","",""
+"P202","46","","","","Disabled","","","BUS0: WR1_BC1
+CAN0: CRX
+ETHERC0: ERXD2
+GPT5: GTIOCB
+IRQ0: IRQ03
+SCI2: SCK
+SCI9: RXD_MISO
+SCI9: SCL
+SDHI0: DAT6
+SPI1: MISO"
+"P203","45","","","","Disabled","","","BUS0: A19
+CAN0: CTX
+CTSU0: TSCAP
+ETHERC0: COL
+GPT5: GTIOCA
+IRQ0: IRQ02
+SCI2: CTS_RTS_SS
+SCI9: SDA
+SCI9: TXD_MOSI
+SDHI0: DAT5
+SPI1: MOSI"
+"P204","44","","","","Disabled","","","AGT1: AGTIO
+BUS0: A18
+CAC0: CACREF
+CTSU0: TS00
+ETHERC0: RX_DV
+GPT4: GTIOCB
+IIC0: SCL
+OPS0: GTIW
+SCI4: SCK
+SCI9: SCK
+SDHI0: DAT4
+SPI1: RSPCK
+SSI0: SSISCK
+USBFS0: OVRCURB"
+"P205","43","CTSU0_TSCAP","Low","None","Peripheral mode","CMOS","None","AGT1: AGTO
+BUS0: A16
+CGC0: CLKOUT
+CTSU0: TSCAP
+ETHERC0: WOL
+ETHERC0: WOL
+GPT4: GTIOCA
+IIC1: SCL
+IRQ0: IRQ01
+OPS0: GTIV
+SCI4: SDA
+SCI4: TXD_MOSI
+SCI9: CTS_RTS_SS
+SDHI0: DAT3
+SPI1: SSL0
+SSI0: SSIWS
+USBFS0: OVRCURA"
+"P206","42","","","","Disabled","","","BUS0: WAIT
+CTSU0: TS01
+ETHERC0: LINKSTA
+ETHERC0: LINKSTA
+IIC1: SDA
+IRQ0: IRQ00
+OPS0: GTIU
+SCI4: RXD_MISO
+SCI4: SCL
+SDHI0: DAT2
+SPI1: SSL1
+SSI0: SSIDATA
+USBFS0: VBUSEN"
+"P207","41","CTSU0_TS02","Low","","Peripheral mode","CMOS","None","BUS0: A17
+CTSU0: TS02
+QSPI0: QSSL
+SPI1: SSL2"
+"P208","54","","","","Disabled","","","BUS0: CS4
+ETHERC0: LINKSTA
+ETHERC0: LINKSTA
+OPS0: GTOVLO
+QSPI0: QIO3
+SDHI0: DAT0
+TRACE0: TDATA3"
+"P209","53","","","","Disabled","","","BUS0: CS5
+ETHERC0: EXOUT
+ETHERC0: EXOUT
+OPS0: GTOVUP
+QSPI0: QIO2
+SDHI0: WP
+TRACE0: TDATA2"
+"P210","52","","","","Disabled","","","BUS0: CS6
+ETHERC0: WOL
+ETHERC0: WOL
+OPS0: GTIW
+QSPI0: QIO1
+SDHI0: CD
+TRACE0: TDATA1"
+"P211","51","","","","Disabled","","","BUS0: CS7
+ETHERC0: MDIO
+ETHERC0: MDIO
+OPS0: GTIV
+QSPI0: QIO0
+SDHI0: CMD
+TRACE0: TDATA0"
+"P212","20","","","","Disabled","","","AGT1: AGTEE
+CGC0: EXTAL
+GPT0: GTIOCB
+IRQ0: IRQ03
+POEG3: GTETRG
+SCI1: RXD_MISO
+SCI1: SCL"
+"P213","19","","","","Disabled","","","ADC1: ADTRG
+CGC0: XTAL
+GPT0: GTIOCA
+IRQ0: IRQ02
+POEG2: GTETRG
+SCI1: SDA
+SCI1: TXD_MOSI"
+"P214","50","","","","Disabled","","","ETHERC0: MDC
+ETHERC0: MDC
+OPS0: GTIU
+QSPI0: QSPCLK
+SDHI0: CLK
+TRACE0: TCLK"
+"P300","72","DEBUG0_TCK","Low","","Peripheral mode","CMOS","None","DEBUG0: SWCLK
+DEBUG0: TCK
+GPT0: GTIOCA
+OPS0: GTOUUP
+SPI1: SSL1"
+"P301","71","","","","Disabled","","","AGT0: AGTIO
+BUS0: A06
+GPT4: GTIOCB
+IRQ0: IRQ06
+OPS0: GTOULO
+SCI2: RXD_MISO
+SCI2: SCL
+SCI9: CTS_RTS_SS
+SPI1: SSL2"
+"P302","70","","","","Disabled","","","BUS0: A07
+GPT4: GTIOCA
+IRQ0: IRQ05
+OPS0: GTOUUP
+SCI2: SDA
+SCI2: TXD_MOSI
+SPI1: SSL3"
+"P303","69","","","","Disabled","","","BUS0: A08
+GPT7: GTIOCB"
+"P304","66","","","","Disabled","","","BUS0: A09
+GPT7: GTIOCA
+IRQ0: IRQ09
+OPS0: GTOWLO
+SCI6: RXD_MISO
+SCI6: SCL"
+"P305","65","","","","Disabled","","","BUS0: A10
+IRQ0: IRQ08
+OPS0: GTOWUP
+QSPI0: QSPCLK
+SCI6: SDA
+SCI6: TXD_MOSI"
+"P306","64","","","","Disabled","","","BUS0: A11
+OPS0: GTOULO
+QSPI0: QSSL
+SCI6: SCK"
+"P307","63","","","","Disabled","","","BUS0: A12
+OPS0: GTOUUP
+QSPI0: QIO0
+SCI6: CTS_RTS_SS"
+"P308","62","","","","Disabled","","","BUS0: A13
+QSPI0: QIO1"
+"P309","61","","","","Disabled","","","BUS0: A14
+QSPI0: QIO2
+SCI3: RXD_MISO
+SCI3: SCL"
+"P310","60","","","","Disabled","","","AGT1: AGTEE
+BUS0: A15
+QSPI0: QIO3
+SCI3: SDA
+SCI3: TXD_MOSI"
+"P311","59","","","","Disabled","","","AGT1: AGTOB
+BUS0: CS2_RAS
+SCI3: SCK"
+"P312","58","","","","Disabled","","","AGT1: AGTOA
+BUS0: CS3_CAS
+SCI3: CTS_RTS_SS"
+"P313","47","","","","Disabled","","","BUS0: A20
+ETHERC0: ERXD3
+SDHI0: DAT7"
+"P400","1","GPIO","Low","None","Output mode (Initial Low)","CMOS","None","ADC1: ADTRG
+AGT1: AGTIO
+ETHERC0: WOL
+ETHERC0: WOL
+GPT6: GTIOCA
+IIC0: SCL
+IRQ0: IRQ00
+SCI4: SCK
+SCI7: SCK
+SSI: AUDIO_CLK"
+"P401","2","SCI7_TXD_MOSI","Low","None","Peripheral mode","CMOS","None","CAN0: CTX
+ETHERC0: MDC
+ETHERC0: MDC
+GPT6: GTIOCB
+IIC0: SDA
+IRQ0: IRQ05
+POEG0: GTETRG
+SCI4: CTS_RTS_SS
+SCI7: SDA
+SCI7: TXD_MOSI"
+"P402","3","SCI7_RXD_MISO","Low","None","Peripheral mode","CMOS","None","AGT0: AGTIO
+AGT1: AGTIO
+CAC0: CACREF
+CAN0: CRX
+ETHERC0: MDIO
+ETHERC0: MDIO
+IRQ0: IRQ04
+PDC0: VSYNC
+RTC0: RTCIC0
+SCI7: RXD_MISO
+SCI7: SCL
+SSI: AUDIO_CLK"
+"P403","4","","","","Disabled","","","AGT0: AGTIO
+AGT1: AGTIO
+ETHERC0: LINKSTA
+ETHERC0: LINKSTA
+GPT3: GTIOCA
+PDC0: PIXD7
+RTC0: RTCIC1
+SCI7: CTS_RTS_SS
+SDHI1: DAT7
+SSI0: SSISCK"
+"P404","5","","","","Disabled","","","ETHERC0: EXOUT
+ETHERC0: EXOUT
+GPT3: GTIOCB
+PDC0: PIXD6
+RTC0: RTCIC2
+SDHI1: DAT6
+SSI0: SSIWS"
+"P405","6","","","","Disabled","","","ETHERC0: TX_EN
+ETHERC0: TXD_EN
+GPT1: GTIOCA
+PDC0: PIXD5
+SDHI1: DAT5
+SSI0: SSITXD"
+"P406","7","","","","Disabled","","","ETHERC0: RX_ER
+ETHERC0: TXD1
+GPT1: GTIOCB
+PDC0: PIXD4
+SDHI1: DAT4
+SPI1: SSL3
+SSI0: SSIRXD"
+"P407","36","USBFS0_VBUS","Low","","Peripheral mode","CMOS","None","ADC0: ADTRG
+AGT0: AGTIO
+CTSU0: TS03
+ETHERC0: EXOUT
+ETHERC0: EXOUT
+IIC0: SDA
+RTC0: RTCOUT
+SCI4: CTS_RTS_SS
+SPI1: SSL3
+USBFS0: VBUS"
+"P408","35","","","","Disabled","","","CTSU0: TS04
+ETHERC0: CRS
+ETHERC0: CRS_DV
+GPT10: GTIOCB
+IIC0: SCL
+IRQ0: IRQ07
+OPS0: GTOWLO
+PDC0: PIXCLK
+SCI3: RXD_MISO
+SCI3: SCL
+USBFS0: ID"
+"P409","34","","","","Disabled","","","CTSU0: TS05
+ETHERC0: RX_CLK
+ETHERC0: RX_ER
+GPT10: GTIOCA
+IRQ0: IRQ06
+OPS0: GTOWUP
+PDC0: HSYNC
+SCI3: SDA
+SCI3: TXD_MOSI
+USBFS0: EXICEN"
+"P410","33","SCI0_RXD_MISO","Low","None","Peripheral mode","CMOS","None","AGT1: AGTOB
+CTSU0: TS06
+ETHERC0: ERXD0
+ETHERC0: RXD1
+GPT9: GTIOCB
+IRQ0: IRQ05
+OPS0: GTOVLO
+PDC0: PIXD0
+SCI0: RXD_MISO
+SCI0: SCL
+SCI3: SCK
+SDHI0: DAT1
+SPI0: MISO"
+"P411","32","SCI0_TXD_MOSI","Low","None","Peripheral mode","CMOS","None","AGT1: AGTOA
+CTSU0: TS07
+ETHERC0: ERXD1
+ETHERC0: RXD0
+GPT9: GTIOCA
+IRQ0: IRQ04
+OPS0: GTOVUP
+PDC0: PIXD1
+SCI0: SDA
+SCI0: TXD_MOSI
+SCI3: CTS_RTS_SS
+SDHI0: DAT0
+SPI0: MOSI"
+"P412","31","","","","Disabled","","","AGT1: AGTEE
+CTSU0: TS08
+ETHERC0: ETXD0
+ETHERC0: REF50CK
+OPS0: GTOULO
+PDC0: PIXD2
+SCI0: SCK
+SDHI0: CMD
+SPI0: RSPCK"
+"P413","30","","","","Disabled","","","CTSU0: TS09
+ETHERC0: ETXD1
+ETHERC0: TXD0
+OPS0: GTOUUP
+PDC0: PIXD3
+SCI0: CTS_RTS_SS
+SDHI0: CLK
+SPI0: SSL0"
+"P414","29","","","","Disabled","","","CTSU0: TS10
+ETHERC0: RX_ER
+ETHERC0: TXD1
+GPT0: GTIOCB
+IRQ0: IRQ09
+PDC0: PIXD4
+SDHI0: WP
+SPI0: SSL1"
+"P415","28","","","","Disabled","","","CTSU0: TS11
+ETHERC0: TX_EN
+ETHERC0: TXD_EN
+GPT0: GTIOCA
+IRQ0: IRQ08
+PDC0: PIXD5
+SDHI0: CD
+SPI0: SSL2
+USBFS0: VBUSEN"
+"P500","113","","","","Disabled","","","ADC0: AN16
+AGT0: AGTOA
+CMP0: IVREF0
+GPT11: GTIOCA
+OPS0: GTIU
+QSPI0: QSPCLK
+SDHI1: CLK
+USBFS0: VBUSEN"
+"P501","114","","","","Disabled","","","ADC1: AN16
+AGT0: AGTOB
+CMP0: IVREF1
+GPT11: GTIOCB
+IRQ0: IRQ11
+OPS0: GTIV
+QSPI0: QSSL
+SCI5: SDA
+SCI5: TXD_MOSI
+SDHI1: CMD
+USBFS0: OVRCURA"
+"P502","115","","","","Disabled","","","ADC0: AN17
+CMP0: IVCMP0
+GPT12: GTIOCA
+IRQ0: IRQ12
+OPS0: GTIW
+QSPI0: QIO0
+SCI5: RXD_MISO
+SCI5: SCL
+SDHI1: DAT0
+USBFS0: OVRCURB"
+"P503","116","","","","Disabled","","","ADC1: AN17
+GPT12: GTIOCB
+POEG2: GTETRG
+QSPI0: QIO1
+SCI5: SCK
+SCI6: CTS_RTS_SS
+SDHI1: DAT1
+USBFS0: EXICEN"
+"P504","117","","","","Disabled","","","ADC0: AN18
+BUS0: ALE
+GPT13: GTIOCA
+POEG3: GTETRG
+QSPI0: QIO2
+SCI5: CTS_RTS_SS
+SCI6: SCK
+SDHI1: DAT2
+USBFS0: ID"
+"P505","118","","","","Disabled","","","ADC1: AN18
+GPT13: GTIOCB
+IRQ0: IRQ14
+QSPI0: QIO3
+SCI6: RXD_MISO
+SCI6: SCL
+SDHI1: DAT3"
+"P506","119","","","","Disabled","","","ADC0: AN19
+IRQ0: IRQ15
+SCI6: SDA
+SCI6: TXD_MOSI
+SDHI1: CD"
+"P508","120","","","","Disabled","","","ADC0: AN20
+SCI5: SCK
+SCI6: SCK
+SDHI1: DAT3"
+"P511","144","IIC2_SDA","Medium","None","Peripheral mode","CMOS","None","CAN1: CRX
+GPT0: GTIOCB
+IIC2: SDA
+IRQ0: IRQ15
+PDC0: PCKO
+SCI4: RXD_MISO
+SCI4: SCL"
+"P512","143","IIC2_SCL","Medium","None","Peripheral mode","CMOS","None","CAN1: CTX
+GPT0: GTIOCA
+IIC2: SCL
+IRQ0: IRQ14
+PDC0: VSYNC
+SCI4: SDA
+SCI4: TXD_MOSI"
+"P600","98","","","","Disabled","","","BUS0: RD
+CAC0: CACREF
+CGC0: CLKOUT
+GPT6: GTIOCB
+SCI9: SCK"
+"P601","97","SCI9_RXD_MISO","Low","","Peripheral mode","CMOS","None","BUS0: WR_WR0_DQM0
+GPT6: GTIOCA
+SCI9: RXD_MISO
+SCI9: SCL"
+"P602","96","SCI9_TXD_MOSI","Low","","Peripheral mode","CMOS","None","BUS0: BCLK_SDCLK
+GPT7: GTIOCB
+SCI9: SDA
+SCI9: TXD_MOSI"
+"P603","95","","","","Disabled","","","BUS0: D13_DQ13
+GPT7: GTIOCA
+SCI9: CTS_RTS_SS"
+"P604","94","","","","Disabled","","","BUS0: D12_DQ12
+GPT8: GTIOCB"
+"P605","93","","","","Disabled","","","BUS0: D11_DQ11
+GPT8: GTIOCA"
+"P608","83","","","","Disabled","","","BUS0: A00_BC0_DQM1
+GPT4: GTIOCB"
+"P609","84","","","","Disabled","","","BUS0: CS1_CKE
+CAN1: CTX
+GPT5: GTIOCA"
+"P610","85","","","","Disabled","","","BUS0: CS0_WE
+CAN1: CRX
+GPT5: GTIOCB"
+"P611","86","","","","Disabled","","","BUS0: SDCS
+CAC0: CACREF
+CGC0: CLKOUT
+SCI7: CTS_RTS_SS"
+"P612","87","","","","Disabled","","","BUS0: D8_DQ8
+SCI7: SCK"
+"P613","88","","","","Disabled","","","BUS0: D9_DQ9
+SCI7: SDA
+SCI7: TXD_MOSI"
+"P614","89","","","","Disabled","","","BUS0: D10_DQ10
+SCI7: RXD_MISO
+SCI7: SCL"
+"P700","8","SPI1_MISO","Low","","Peripheral mode","CMOS","None","ETHERC0: ETXD1
+ETHERC0: TXD0
+GPT5: GTIOCA
+PDC0: PIXD3
+SDHI1: DAT3
+SPI1: MISO"
+"P701","9","SPI1_MOSI","Low","","Peripheral mode","CMOS","None","ETHERC0: ETXD0
+ETHERC0: REF50CK
+GPT5: GTIOCB
+PDC0: PIXD2
+SDHI1: DAT2
+SPI1: MOSI"
+"P702","10","SPI1_RSPCK","Low","","Peripheral mode","CMOS","None","ETHERC0: ERXD1
+ETHERC0: RXD0
+GPT6: GTIOCA
+PDC0: PIXD1
+SDHI1: DAT1
+SPI1: RSPCK"
+"P703","11","SPI1_SSL0","Low","","Peripheral mode","CMOS","None","CMP0: VCOUT
+ETHERC0: ERXD0
+ETHERC0: RXD1
+GPT6: GTIOCB
+PDC0: PIXD0
+SDHI1: DAT0
+SPI1: SSL0"
+"P704","12","","","","Disabled","","","AGT0: AGTO
+CAN0: CTX
+ETHERC0: RX_CLK
+ETHERC0: RX_ER
+PDC0: HSYNC
+SDHI1: CLK
+SPI1: SSL1"
+"P705","13","","","","Disabled","","","AGT0: AGTIO
+CAN0: CRX
+ETHERC0: CRS
+ETHERC0: CRS_DV
+PDC0: PIXCLK
+SDHI1: CMD
+SPI1: SSL2"
+"P708","27","","","","Disabled","","","CAC0: CACREF
+CTSU0: TS12
+ETHERC0: ETXD3
+IRQ0: IRQ11
+PDC0: PCKO
+SCI1: RXD_MISO
+SCI1: SCL
+SPI0: SSL3
+SSI: AUDIO_CLK"
+"P709","26","","","","Disabled","","","CTSU0: TS13
+ETHERC0: ETXD2
+IRQ0: IRQ10
+SCI1: SDA
+SCI1: TXD_MOSI"
+"P710","25","","","","Disabled","","","CTSU0: TS14
+ETHERC0: TX_ER
+SCI1: SCK"
+"P711","24","","","","Disabled","","","AGT0: AGTEE
+CTSU0: TS15
+ETHERC0: TX_CLK
+SCI1: CTS_RTS_SS"
+"P712","23","","","","Disabled","","","AGT0: AGTOB
+CTSU0: TS16
+GPT2: GTIOCB"
+"P713","22","","","","Disabled","","","AGT0: AGTOA
+CTSU0: TS17
+GPT2: GTIOCA"
+"P800","109","","","","Disabled","","","BUS0: D14_DQ14"
+"P801","110","","","","Disabled","","","BUS0: D15_DQ15"
+"RES","55","","","","","","",""
+"USBDM","38","USBFS0_USBDM","","","","","",""
+"USBDP","39","USBFS0_USBDP","","","","","",""
+"VBAT","14","","","","","","",""
+"VCC","99","","","","","","",""
+"VCC","121","","","","","","",""
+"VCC","111","","","","","","",""
+"VCC","68","","","","","","",""
+"VCC","49","","","","","","",""
+"VCC","90","","","","","","",""
+"VCC","81","","","","","","",""
+"VCC","21","","","","","","",""
+"VCC","142","","","","","","",""
+"VCCUSB","40","USBFS0_VCCUSB","","","","","",""
+"VCL","15","","","","","","",""
+"VCL1","92","","","","","","",""
+"VREFH","126","ADC_VREFH","","","","","",""
+"VREFH0","130","ADC_VREFH0","","","","","",""
+"VREFL","125","ADC_VREFL","","","","","",""
+"VREFL0","129","ADC_VREFL0","","","","","",""
+"VSS","122","","","","","","",""
+"VSS","67","","","","","","",""
+"VSS","100","","","","","","",""
+"VSS","112","","","","","","",""
+"VSS","48","","","","","","",""
+"VSS","18","","","","","","",""
+"VSS","91","","","","","","",""
+"VSS","82","","","","","","",""
+"VSS","141","","","","","","",""
+"VSSUSB","37","USBFS0_VSSUSB","","","","","",""
+"XCIN","16","CGC0_XCIN","","","","","",""
+"XCOUT","17","CGC0_XCOUT","","","","","",""
diff --git a/ports/renesas-ra/boards/RA6M2_EK/ra_gen/bsp_clock_cfg.h b/ports/renesas-ra/boards/RA6M2_EK/ra_gen/bsp_clock_cfg.h
new file mode 100644
index 0000000000000..2c93a573b4f33
--- /dev/null
+++ b/ports/renesas-ra/boards/RA6M2_EK/ra_gen/bsp_clock_cfg.h
@@ -0,0 +1,24 @@
+/* generated configuration header file - do not edit */
+#ifndef BSP_CLOCK_CFG_H_
+#define BSP_CLOCK_CFG_H_
+#define BSP_CFG_CLOCKS_SECURE (0)
+#define BSP_CFG_CLOCKS_OVERRIDE (0)
+#define BSP_CFG_XTAL_HZ (12000000) /* XTAL 12000000Hz */
+#define BSP_CFG_PLL_SOURCE (BSP_CLOCKS_SOURCE_CLOCK_MAIN_OSC) /* PLL Src: XTAL */
+#define BSP_CFG_HOCO_FREQUENCY (2) /* HOCO 20MHz */
+#define BSP_CFG_PLL_DIV (BSP_CLOCKS_PLL_DIV_1) /* PLL Div /1 */
+#define BSP_CFG_PLL_MUL BSP_CLOCKS_PLL_MUL_20_0 /* PLL Mul x20.0 */
+#define BSP_CFG_CLOCK_SOURCE (BSP_CLOCKS_SOURCE_CLOCK_PLL) /* Clock Src: PLL */
+#define BSP_CFG_ICLK_DIV (BSP_CLOCKS_SYS_CLOCK_DIV_2) /* ICLK Div /2 */
+#define BSP_CFG_PCLKA_DIV (BSP_CLOCKS_SYS_CLOCK_DIV_2) /* PCLKA Div /2 */
+#define BSP_CFG_PCLKB_DIV (BSP_CLOCKS_SYS_CLOCK_DIV_4) /* PCLKB Div /4 */
+#define BSP_CFG_PCLKC_DIV (BSP_CLOCKS_SYS_CLOCK_DIV_4) /* PCLKC Div /4 */
+#define BSP_CFG_PCLKD_DIV (BSP_CLOCKS_SYS_CLOCK_DIV_2) /* PCLKD Div /2 */
+#define BSP_CFG_SDCLK_OUTPUT (1) /* SDCLKout On */
+#define BSP_CFG_BCLK_DIV (BSP_CLOCKS_SYS_CLOCK_DIV_2) /* BCLK Div /2 */
+#define BSP_CFG_BCLK_OUTPUT (2) /* BCK/2 */
+#define BSP_CFG_UCK_DIV (BSP_CLOCKS_USB_CLOCK_DIV_5) /* UCLK Div /5 */
+#define BSP_CFG_FCLK_DIV (BSP_CLOCKS_SYS_CLOCK_DIV_4) /* FCLK Div /4 */
+#define BSP_CFG_CLKOUT_SOURCE (BSP_CLOCKS_CLOCK_DISABLED) /* CLKOUT Disabled */
+#define BSP_CFG_CLKOUT_DIV (BSP_CLOCKS_SYS_CLOCK_DIV_1) /* CLKOUT Div /1 */
+#endif /* BSP_CLOCK_CFG_H_ */
diff --git a/ports/renesas-ra/boards/RA6M2_EK/ra_gen/bsp_pin_cfg.h b/ports/renesas-ra/boards/RA6M2_EK/ra_gen/bsp_pin_cfg.h
new file mode 100644
index 0000000000000..c5b93301aff54
--- /dev/null
+++ b/ports/renesas-ra/boards/RA6M2_EK/ra_gen/bsp_pin_cfg.h
@@ -0,0 +1,7 @@
+/* generated configuration header file - do not edit */
+#ifndef BSP_PIN_CFG_H_
+#define BSP_PIN_CFG_H_
+#include "bsp_api.h"
+#include "r_ioport_api.h"
+extern const ioport_cfg_t g_bsp_pin_cfg; /* RA6M2-EK.pincfg */
+#endif /* BSP_PIN_CFG_H_ */
diff --git a/ports/renesas-ra/boards/RA6M2_EK/ra_gen/common_data.c b/ports/renesas-ra/boards/RA6M2_EK/ra_gen/common_data.c
new file mode 100644
index 0000000000000..34aad762ff245
--- /dev/null
+++ b/ports/renesas-ra/boards/RA6M2_EK/ra_gen/common_data.c
@@ -0,0 +1,7 @@
+/* generated common source file - do not edit */
+#include "common_data.h"
+ioport_instance_ctrl_t g_ioport_ctrl;
+const ioport_instance_t g_ioport =
+{ .p_api = &g_ioport_on_ioport, .p_ctrl = &g_ioport_ctrl, .p_cfg = &g_bsp_pin_cfg, };
+void g_common_init(void) {
+}
diff --git a/ports/renesas-ra/boards/RA6M2_EK/ra_gen/common_data.h b/ports/renesas-ra/boards/RA6M2_EK/ra_gen/common_data.h
new file mode 100644
index 0000000000000..e2eb70836ba79
--- /dev/null
+++ b/ports/renesas-ra/boards/RA6M2_EK/ra_gen/common_data.h
@@ -0,0 +1,16 @@
+/* generated common header file - do not edit */
+#ifndef COMMON_DATA_H_
+#define COMMON_DATA_H_
+#include <stdint.h>
+#include "bsp_api.h"
+#include "r_ioport.h"
+#include "bsp_pin_cfg.h"
+FSP_HEADER
+/* IOPORT Instance */
+extern const ioport_instance_t g_ioport;
+
+/* IOPORT control structure. */
+extern ioport_instance_ctrl_t g_ioport_ctrl;
+void g_common_init(void);
+FSP_FOOTER
+#endif /* COMMON_DATA_H_ */
diff --git a/ports/renesas-ra/boards/RA6M2_EK/ra_gen/hal_data.c b/ports/renesas-ra/boards/RA6M2_EK/ra_gen/hal_data.c
new file mode 100644
index 0000000000000..b0d38881e0836
--- /dev/null
+++ b/ports/renesas-ra/boards/RA6M2_EK/ra_gen/hal_data.c
@@ -0,0 +1,983 @@
+/* generated HAL source file - do not edit */
+#include "hal_data.h"
+/* Macros to tie dynamic ELC links to ADC_TRIGGER_SYNC_ELC option in adc_trigger_t. */
+#define ADC_TRIGGER_ADC0        ADC_TRIGGER_SYNC_ELC
+#define ADC_TRIGGER_ADC0_B      ADC_TRIGGER_SYNC_ELC
+#define ADC_TRIGGER_ADC1        ADC_TRIGGER_SYNC_ELC
+#define ADC_TRIGGER_ADC1_B      ADC_TRIGGER_SYNC_ELC
+iic_master_instance_ctrl_t g_i2c_master2_ctrl;
+const iic_master_extended_cfg_t g_i2c_master2_extend =
+{ .timeout_mode = IIC_MASTER_TIMEOUT_MODE_SHORT,
+/* Actual calculated bitrate: 98945. Actual calculated duty cycle: 51%. */ .clock_settings.brl_value = 15,
+  .clock_settings.brh_value = 16, .clock_settings.cks_value = 4, };
+const i2c_master_cfg_t g_i2c_master2_cfg =
+{ .channel = 2, .rate = I2C_MASTER_RATE_STANDARD, .slave = 0x00, .addr_mode = I2C_MASTER_ADDR_MODE_7BIT,
+#define RA_NOT_DEFINED (1)
+  #if (RA_NOT_DEFINED == RA_NOT_DEFINED)
+  .p_transfer_tx = NULL,
+  #else
+  .p_transfer_tx = &RA_NOT_DEFINED,
+  #endif
+  #if (RA_NOT_DEFINED == RA_NOT_DEFINED)
+  .p_transfer_rx = NULL,
+  #else
+  .p_transfer_rx = &RA_NOT_DEFINED,
+  #endif
+#undef RA_NOT_DEFINED
+  .p_callback = callback_iic,
+  .p_context = NULL,
+  #if defined(VECTOR_NUMBER_IIC2_RXI)
+  .rxi_irq = VECTOR_NUMBER_IIC2_RXI,
+  #else
+  .rxi_irq = FSP_INVALID_VECTOR,
+  #endif
+  #if defined(VECTOR_NUMBER_IIC2_TXI)
+  .txi_irq = VECTOR_NUMBER_IIC2_TXI,
+  #else
+  .txi_irq = FSP_INVALID_VECTOR,
+  #endif
+  #if defined(VECTOR_NUMBER_IIC2_TEI)
+  .tei_irq = VECTOR_NUMBER_IIC2_TEI,
+  #else
+  .tei_irq = FSP_INVALID_VECTOR,
+  #endif
+  #if defined(VECTOR_NUMBER_IIC2_ERI)
+  .eri_irq = VECTOR_NUMBER_IIC2_ERI,
+  #else
+  .eri_irq = FSP_INVALID_VECTOR,
+  #endif
+  .ipl = (12),
+  .p_extend = &g_i2c_master2_extend, };
+/* Instance structure to use this module. */
+const i2c_master_instance_t g_i2c_master2 =
+{ .p_ctrl = &g_i2c_master2_ctrl, .p_cfg = &g_i2c_master2_cfg, .p_api = &g_i2c_master_on_iic };
+adc_instance_ctrl_t g_adc1_ctrl;
+const adc_extended_cfg_t g_adc1_cfg_extend =
+{ .add_average_count = ADC_ADD_OFF,
+  .clearing = ADC_CLEAR_AFTER_READ_ON,
+  .trigger_group_b = ADC_TRIGGER_SYNC_ELC,
+  .double_trigger_mode = ADC_DOUBLE_TRIGGER_DISABLED,
+  .adc_vref_control = ADC_VREF_CONTROL_VREFH, };
+const adc_cfg_t g_adc1_cfg =
+{ .unit = 1, .mode = ADC_MODE_SINGLE_SCAN, .resolution = ADC_RESOLUTION_12_BIT, .alignment =
+      (adc_alignment_t)ADC_ALIGNMENT_RIGHT,
+  .trigger = ADC_TRIGGER_SOFTWARE, .p_callback = NULL, .p_context = NULL, .p_extend = &g_adc1_cfg_extend,
+  #if defined(VECTOR_NUMBER_ADC1_SCAN_END)
+  .scan_end_irq = VECTOR_NUMBER_ADC1_SCAN_END,
+  #else
+  .scan_end_irq = FSP_INVALID_VECTOR,
+  #endif
+  .scan_end_ipl = (BSP_IRQ_DISABLED),
+  #if defined(VECTOR_NUMBER_ADC1_SCAN_END_B)
+  .scan_end_b_irq = VECTOR_NUMBER_ADC1_SCAN_END_B,
+  #else
+  .scan_end_b_irq = FSP_INVALID_VECTOR,
+  #endif
+  .scan_end_b_ipl = (BSP_IRQ_DISABLED), };
+const adc_channel_cfg_t g_adc1_channel_cfg =
+{ .scan_mask = 0,
+  .scan_mask_group_b = 0,
+  .priority_group_a = ADC_GROUP_A_PRIORITY_OFF,
+  .add_mask = 0,
+  .sample_hold_mask = 0,
+  .sample_hold_states = 24, };
+/* Instance structure to use this module. */
+const adc_instance_t g_adc1 =
+{ .p_ctrl = &g_adc1_ctrl, .p_cfg = &g_adc1_cfg, .p_channel_cfg = &g_adc1_channel_cfg, .p_api = &g_adc_on_adc };
+adc_instance_ctrl_t g_adc0_ctrl;
+const adc_extended_cfg_t g_adc0_cfg_extend =
+{ .add_average_count = ADC_ADD_OFF,
+  .clearing = ADC_CLEAR_AFTER_READ_ON,
+  .trigger_group_b = ADC_TRIGGER_SYNC_ELC,
+  .double_trigger_mode = ADC_DOUBLE_TRIGGER_DISABLED,
+  .adc_vref_control = ADC_VREF_CONTROL_VREFH, };
+const adc_cfg_t g_adc0_cfg =
+{ .unit = 0, .mode = ADC_MODE_SINGLE_SCAN, .resolution = ADC_RESOLUTION_12_BIT, .alignment =
+      (adc_alignment_t)ADC_ALIGNMENT_RIGHT,
+  .trigger = ADC_TRIGGER_SOFTWARE, .p_callback = NULL, .p_context = NULL, .p_extend = &g_adc0_cfg_extend,
+  #if defined(VECTOR_NUMBER_ADC0_SCAN_END)
+  .scan_end_irq = VECTOR_NUMBER_ADC0_SCAN_END,
+  #else
+  .scan_end_irq = FSP_INVALID_VECTOR,
+  #endif
+  .scan_end_ipl = (BSP_IRQ_DISABLED),
+  #if defined(VECTOR_NUMBER_ADC0_SCAN_END_B)
+  .scan_end_b_irq = VECTOR_NUMBER_ADC0_SCAN_END_B,
+  #else
+  .scan_end_b_irq = FSP_INVALID_VECTOR,
+  #endif
+  .scan_end_b_ipl = (BSP_IRQ_DISABLED), };
+const adc_channel_cfg_t g_adc0_channel_cfg =
+{ .scan_mask = 0,
+  .scan_mask_group_b = 0,
+  .priority_group_a = ADC_GROUP_A_PRIORITY_OFF,
+  .add_mask = 0,
+  .sample_hold_mask = 0,
+  .sample_hold_states = 24, };
+/* Instance structure to use this module. */
+const adc_instance_t g_adc0 =
+{ .p_ctrl = &g_adc0_ctrl, .p_cfg = &g_adc0_cfg, .p_channel_cfg = &g_adc0_channel_cfg, .p_api = &g_adc_on_adc };
+lpm_instance_ctrl_t g_lpm0_ctrl;
+
+const lpm_cfg_t g_lpm0_cfg =
+{ .low_power_mode = LPM_MODE_SLEEP,
+  .snooze_cancel_sources = LPM_SNOOZE_CANCEL_SOURCE_NONE,
+  .standby_wake_sources = LPM_STANDBY_WAKE_SOURCE_RTCALM | (lpm_standby_wake_source_t)0,
+  .snooze_request_source = LPM_SNOOZE_REQUEST_RXD0_FALLING,
+  .snooze_end_sources = (lpm_snooze_end_t)0,
+  .dtc_state_in_snooze = LPM_SNOOZE_DTC_DISABLE,
+  #if BSP_FEATURE_LPM_HAS_SBYCR_OPE
+  .output_port_enable = LPM_OUTPUT_PORT_ENABLE_RETAIN,
+  #endif
+  #if BSP_FEATURE_LPM_HAS_DEEP_STANDBY
+  .io_port_state = LPM_IO_PORT_NO_CHANGE,
+  .power_supply_state = LPM_POWER_SUPPLY_DEEPCUT0,
+  .deep_standby_cancel_source = (lpm_deep_standby_cancel_source_t)0,
+  .deep_standby_cancel_edge = (lpm_deep_standby_cancel_edge_t)0,
+  #endif
+  .p_extend = NULL, };
+
+const lpm_instance_t g_lpm0 =
+{ .p_api = &g_lpm_on_lpm, .p_ctrl = &g_lpm0_ctrl, .p_cfg = &g_lpm0_cfg };
+dtc_instance_ctrl_t g_transfer3_ctrl;
+
+transfer_info_t g_transfer3_info =
+{ .dest_addr_mode = TRANSFER_ADDR_MODE_INCREMENTED,
+  .repeat_area = TRANSFER_REPEAT_AREA_DESTINATION,
+  .irq = TRANSFER_IRQ_END,
+  .chain_mode = TRANSFER_CHAIN_MODE_DISABLED,
+  .src_addr_mode = TRANSFER_ADDR_MODE_FIXED,
+  .size = TRANSFER_SIZE_2_BYTE,
+  .mode = TRANSFER_MODE_NORMAL,
+  .p_dest = (void *)NULL,
+  .p_src = (void const *)NULL,
+  .num_blocks = 0,
+  .length = 0, };
+const dtc_extended_cfg_t g_transfer3_cfg_extend =
+{ .activation_source = VECTOR_NUMBER_SPI1_RXI, };
+const transfer_cfg_t g_transfer3_cfg =
+{ .p_info = &g_transfer3_info, .p_extend = &g_transfer3_cfg_extend, };
+
+/* Instance structure to use this module. */
+const transfer_instance_t g_transfer3 =
+{ .p_ctrl = &g_transfer3_ctrl, .p_cfg = &g_transfer3_cfg, .p_api = &g_transfer_on_dtc };
+dtc_instance_ctrl_t g_transfer2_ctrl;
+
+transfer_info_t g_transfer2_info =
+{ .dest_addr_mode = TRANSFER_ADDR_MODE_FIXED,
+  .repeat_area = TRANSFER_REPEAT_AREA_SOURCE,
+  .irq = TRANSFER_IRQ_END,
+  .chain_mode = TRANSFER_CHAIN_MODE_DISABLED,
+  .src_addr_mode = TRANSFER_ADDR_MODE_INCREMENTED,
+  .size = TRANSFER_SIZE_2_BYTE,
+  .mode = TRANSFER_MODE_NORMAL,
+  .p_dest = (void *)NULL,
+  .p_src = (void const *)NULL,
+  .num_blocks = 0,
+  .length = 0, };
+const dtc_extended_cfg_t g_transfer2_cfg_extend =
+{ .activation_source = VECTOR_NUMBER_SPI1_TXI, };
+const transfer_cfg_t g_transfer2_cfg =
+{ .p_info = &g_transfer2_info, .p_extend = &g_transfer2_cfg_extend, };
+
+/* Instance structure to use this module. */
+const transfer_instance_t g_transfer2 =
+{ .p_ctrl = &g_transfer2_ctrl, .p_cfg = &g_transfer2_cfg, .p_api = &g_transfer_on_dtc };
+spi_instance_ctrl_t g_spi1_ctrl;
+
+/** SPI extended configuration for SPI HAL driver */
+const spi_extended_cfg_t g_spi1_ext_cfg =
+{ .spi_clksyn = SPI_SSL_MODE_CLK_SYN,
+  .spi_comm = SPI_COMMUNICATION_FULL_DUPLEX,
+  .ssl_polarity = SPI_SSLP_LOW,
+  .ssl_select = SPI_SSL_SELECT_SSL0,
+  .mosi_idle = SPI_MOSI_IDLE_VALUE_FIXING_DISABLE,
+  .parity = SPI_PARITY_MODE_DISABLE,
+  .byte_swap = SPI_BYTE_SWAP_DISABLE,
+  .spck_div =
+  {
+      /* Actual calculated bitrate: 15000000. */ .spbr = 3,
+      .brdv = 0
+  },
+  .spck_delay = SPI_DELAY_COUNT_1,
+  .ssl_negation_delay = SPI_DELAY_COUNT_1,
+  .next_access_delay = SPI_DELAY_COUNT_1 };
+
+/** SPI configuration for SPI HAL driver */
+const spi_cfg_t g_spi1_cfg =
+{ .channel = 1,
+
+  #if defined(VECTOR_NUMBER_SPI1_RXI)
+  .rxi_irq = VECTOR_NUMBER_SPI1_RXI,
+  #else
+  .rxi_irq = FSP_INVALID_VECTOR,
+  #endif
+  #if defined(VECTOR_NUMBER_SPI1_TXI)
+  .txi_irq = VECTOR_NUMBER_SPI1_TXI,
+  #else
+  .txi_irq = FSP_INVALID_VECTOR,
+  #endif
+  #if defined(VECTOR_NUMBER_SPI1_TEI)
+  .tei_irq = VECTOR_NUMBER_SPI1_TEI,
+  #else
+  .tei_irq = FSP_INVALID_VECTOR,
+  #endif
+  #if defined(VECTOR_NUMBER_SPI1_ERI)
+  .eri_irq = VECTOR_NUMBER_SPI1_ERI,
+  #else
+  .eri_irq = FSP_INVALID_VECTOR,
+  #endif
+
+  .rxi_ipl = (12),
+  .txi_ipl = (12),
+  .tei_ipl = (12),
+  .eri_ipl = (12),
+
+  .operating_mode = SPI_MODE_MASTER,
+
+  .clk_phase = SPI_CLK_PHASE_EDGE_ODD,
+  .clk_polarity = SPI_CLK_POLARITY_LOW,
+
+  .mode_fault = SPI_MODE_FAULT_ERROR_DISABLE,
+  .bit_order = SPI_BIT_ORDER_MSB_FIRST,
+  .p_transfer_tx = g_spi1_P_TRANSFER_TX,
+  .p_transfer_rx = g_spi1_P_TRANSFER_RX,
+  .p_callback = spi_callback,
+
+  .p_context = NULL,
+  .p_extend = (void *)&g_spi1_ext_cfg, };
+
+/* Instance structure to use this module. */
+const spi_instance_t g_spi1 =
+{ .p_ctrl = &g_spi1_ctrl, .p_cfg = &g_spi1_cfg, .p_api = &g_spi_on_spi };
+dtc_instance_ctrl_t g_transfer1_ctrl;
+
+transfer_info_t g_transfer1_info =
+{ .dest_addr_mode = TRANSFER_ADDR_MODE_INCREMENTED,
+  .repeat_area = TRANSFER_REPEAT_AREA_DESTINATION,
+  .irq = TRANSFER_IRQ_END,
+  .chain_mode = TRANSFER_CHAIN_MODE_DISABLED,
+  .src_addr_mode = TRANSFER_ADDR_MODE_FIXED,
+  .size = TRANSFER_SIZE_2_BYTE,
+  .mode = TRANSFER_MODE_NORMAL,
+  .p_dest = (void *)NULL,
+  .p_src = (void const *)NULL,
+  .num_blocks = 0,
+  .length = 0, };
+const dtc_extended_cfg_t g_transfer1_cfg_extend =
+{ .activation_source = VECTOR_NUMBER_SPI0_RXI, };
+const transfer_cfg_t g_transfer1_cfg =
+{ .p_info = &g_transfer1_info, .p_extend = &g_transfer1_cfg_extend, };
+
+/* Instance structure to use this module. */
+const transfer_instance_t g_transfer1 =
+{ .p_ctrl = &g_transfer1_ctrl, .p_cfg = &g_transfer1_cfg, .p_api = &g_transfer_on_dtc };
+dtc_instance_ctrl_t g_transfer0_ctrl;
+
+transfer_info_t g_transfer0_info =
+{ .dest_addr_mode = TRANSFER_ADDR_MODE_FIXED,
+  .repeat_area = TRANSFER_REPEAT_AREA_SOURCE,
+  .irq = TRANSFER_IRQ_END,
+  .chain_mode = TRANSFER_CHAIN_MODE_DISABLED,
+  .src_addr_mode = TRANSFER_ADDR_MODE_INCREMENTED,
+  .size = TRANSFER_SIZE_2_BYTE,
+  .mode = TRANSFER_MODE_NORMAL,
+  .p_dest = (void *)NULL,
+  .p_src = (void const *)NULL,
+  .num_blocks = 0,
+  .length = 0, };
+const dtc_extended_cfg_t g_transfer0_cfg_extend =
+{ .activation_source = VECTOR_NUMBER_SPI0_TXI, };
+const transfer_cfg_t g_transfer0_cfg =
+{ .p_info = &g_transfer0_info, .p_extend = &g_transfer0_cfg_extend, };
+
+/* Instance structure to use this module. */
+const transfer_instance_t g_transfer0 =
+{ .p_ctrl = &g_transfer0_ctrl, .p_cfg = &g_transfer0_cfg, .p_api = &g_transfer_on_dtc };
+spi_instance_ctrl_t g_spi0_ctrl;
+
+/** SPI extended configuration for SPI HAL driver */
+const spi_extended_cfg_t g_spi0_ext_cfg =
+{ .spi_clksyn = SPI_SSL_MODE_CLK_SYN,
+  .spi_comm = SPI_COMMUNICATION_FULL_DUPLEX,
+  .ssl_polarity = SPI_SSLP_LOW,
+  .ssl_select = SPI_SSL_SELECT_SSL0,
+  .mosi_idle = SPI_MOSI_IDLE_VALUE_FIXING_DISABLE,
+  .parity = SPI_PARITY_MODE_DISABLE,
+  .byte_swap = SPI_BYTE_SWAP_DISABLE,
+  .spck_div =
+  {
+      /* Actual calculated bitrate: 15000000. */ .spbr = 3,
+      .brdv = 0
+  },
+  .spck_delay = SPI_DELAY_COUNT_1,
+  .ssl_negation_delay = SPI_DELAY_COUNT_1,
+  .next_access_delay = SPI_DELAY_COUNT_1 };
+
+/** SPI configuration for SPI HAL driver */
+const spi_cfg_t g_spi0_cfg =
+{ .channel = 0,
+
+  #if defined(VECTOR_NUMBER_SPI0_RXI)
+  .rxi_irq = VECTOR_NUMBER_SPI0_RXI,
+  #else
+  .rxi_irq = FSP_INVALID_VECTOR,
+  #endif
+  #if defined(VECTOR_NUMBER_SPI0_TXI)
+  .txi_irq = VECTOR_NUMBER_SPI0_TXI,
+  #else
+  .txi_irq = FSP_INVALID_VECTOR,
+  #endif
+  #if defined(VECTOR_NUMBER_SPI0_TEI)
+  .tei_irq = VECTOR_NUMBER_SPI0_TEI,
+  #else
+  .tei_irq = FSP_INVALID_VECTOR,
+  #endif
+  #if defined(VECTOR_NUMBER_SPI0_ERI)
+  .eri_irq = VECTOR_NUMBER_SPI0_ERI,
+  #else
+  .eri_irq = FSP_INVALID_VECTOR,
+  #endif
+
+  .rxi_ipl = (12),
+  .txi_ipl = (12),
+  .tei_ipl = (12),
+  .eri_ipl = (12),
+
+  .operating_mode = SPI_MODE_MASTER,
+
+  .clk_phase = SPI_CLK_PHASE_EDGE_ODD,
+  .clk_polarity = SPI_CLK_POLARITY_LOW,
+
+  .mode_fault = SPI_MODE_FAULT_ERROR_DISABLE,
+  .bit_order = SPI_BIT_ORDER_MSB_FIRST,
+  .p_transfer_tx = g_spi0_P_TRANSFER_TX,
+  .p_transfer_rx = g_spi0_P_TRANSFER_RX,
+  .p_callback = spi_callback,
+
+  .p_context = NULL,
+  .p_extend = (void *)&g_spi0_ext_cfg, };
+
+/* Instance structure to use this module. */
+const spi_instance_t g_spi0 =
+{ .p_ctrl = &g_spi0_ctrl, .p_cfg = &g_spi0_cfg, .p_api = &g_spi_on_spi };
+icu_instance_ctrl_t g_external_irq15_ctrl;
+const external_irq_cfg_t g_external_irq15_cfg =
+{ .channel = 15,
+  .trigger = EXTERNAL_IRQ_TRIG_RISING,
+  .filter_enable = false,
+  .pclk_div = EXTERNAL_IRQ_PCLK_DIV_BY_64,
+  .p_callback = callback_icu,
+  .p_context = NULL,
+  .p_extend = NULL,
+  .ipl = (12),
+  #if defined(VECTOR_NUMBER_ICU_IRQ15)
+  .irq = VECTOR_NUMBER_ICU_IRQ15,
+  #else
+  .irq = FSP_INVALID_VECTOR,
+  #endif
+};
+/* Instance structure to use this module. */
+const external_irq_instance_t g_external_irq15 =
+{ .p_ctrl = &g_external_irq15_ctrl, .p_cfg = &g_external_irq15_cfg, .p_api = &g_external_irq_on_icu };
+icu_instance_ctrl_t g_external_irq14_ctrl;
+const external_irq_cfg_t g_external_irq14_cfg =
+{ .channel = 14,
+  .trigger = EXTERNAL_IRQ_TRIG_RISING,
+  .filter_enable = false,
+  .pclk_div = EXTERNAL_IRQ_PCLK_DIV_BY_64,
+  .p_callback = callback_icu,
+  .p_context = NULL,
+  .p_extend = NULL,
+  .ipl = (12),
+  #if defined(VECTOR_NUMBER_ICU_IRQ14)
+  .irq = VECTOR_NUMBER_ICU_IRQ14,
+  #else
+  .irq = FSP_INVALID_VECTOR,
+  #endif
+};
+/* Instance structure to use this module. */
+const external_irq_instance_t g_external_irq14 =
+{ .p_ctrl = &g_external_irq14_ctrl, .p_cfg = &g_external_irq14_cfg, .p_api = &g_external_irq_on_icu };
+icu_instance_ctrl_t g_external_irq13_ctrl;
+const external_irq_cfg_t g_external_irq13_cfg =
+{ .channel = 13,
+  .trigger = EXTERNAL_IRQ_TRIG_RISING,
+  .filter_enable = false,
+  .pclk_div = EXTERNAL_IRQ_PCLK_DIV_BY_64,
+  .p_callback = callback_icu,
+  .p_context = NULL,
+  .p_extend = NULL,
+  .ipl = (12),
+  #if defined(VECTOR_NUMBER_ICU_IRQ13)
+  .irq = VECTOR_NUMBER_ICU_IRQ13,
+  #else
+  .irq = FSP_INVALID_VECTOR,
+  #endif
+};
+/* Instance structure to use this module. */
+const external_irq_instance_t g_external_irq13 =
+{ .p_ctrl = &g_external_irq13_ctrl, .p_cfg = &g_external_irq13_cfg, .p_api = &g_external_irq_on_icu };
+icu_instance_ctrl_t g_external_irq12_ctrl;
+const external_irq_cfg_t g_external_irq12_cfg =
+{ .channel = 12,
+  .trigger = EXTERNAL_IRQ_TRIG_RISING,
+  .filter_enable = false,
+  .pclk_div = EXTERNAL_IRQ_PCLK_DIV_BY_64,
+  .p_callback = callback_icu,
+  .p_context = NULL,
+  .p_extend = NULL,
+  .ipl = (12),
+  #if defined(VECTOR_NUMBER_ICU_IRQ12)
+  .irq = VECTOR_NUMBER_ICU_IRQ12,
+  #else
+  .irq = FSP_INVALID_VECTOR,
+  #endif
+};
+/* Instance structure to use this module. */
+const external_irq_instance_t g_external_irq12 =
+{ .p_ctrl = &g_external_irq12_ctrl, .p_cfg = &g_external_irq12_cfg, .p_api = &g_external_irq_on_icu };
+icu_instance_ctrl_t g_external_irq11_ctrl;
+const external_irq_cfg_t g_external_irq11_cfg =
+{ .channel = 11,
+  .trigger = EXTERNAL_IRQ_TRIG_RISING,
+  .filter_enable = false,
+  .pclk_div = EXTERNAL_IRQ_PCLK_DIV_BY_64,
+  .p_callback = callback_icu,
+  .p_context = NULL,
+  .p_extend = NULL,
+  .ipl = (12),
+  #if defined(VECTOR_NUMBER_ICU_IRQ11)
+  .irq = VECTOR_NUMBER_ICU_IRQ11,
+  #else
+  .irq = FSP_INVALID_VECTOR,
+  #endif
+};
+/* Instance structure to use this module. */
+const external_irq_instance_t g_external_irq11 =
+{ .p_ctrl = &g_external_irq11_ctrl, .p_cfg = &g_external_irq11_cfg, .p_api = &g_external_irq_on_icu };
+icu_instance_ctrl_t g_external_irq10_ctrl;
+const external_irq_cfg_t g_external_irq10_cfg =
+{ .channel = 10,
+  .trigger = EXTERNAL_IRQ_TRIG_RISING,
+  .filter_enable = false,
+  .pclk_div = EXTERNAL_IRQ_PCLK_DIV_BY_64,
+  .p_callback = callback_icu,
+  .p_context = NULL,
+  .p_extend = NULL,
+  .ipl = (12),
+  #if defined(VECTOR_NUMBER_ICU_IRQ10)
+  .irq = VECTOR_NUMBER_ICU_IRQ10,
+  #else
+  .irq = FSP_INVALID_VECTOR,
+  #endif
+};
+/* Instance structure to use this module. */
+const external_irq_instance_t g_external_irq10 =
+{ .p_ctrl = &g_external_irq10_ctrl, .p_cfg = &g_external_irq10_cfg, .p_api = &g_external_irq_on_icu };
+icu_instance_ctrl_t g_external_irq9_ctrl;
+const external_irq_cfg_t g_external_irq9_cfg =
+{ .channel = 9,
+  .trigger = EXTERNAL_IRQ_TRIG_RISING,
+  .filter_enable = false,
+  .pclk_div = EXTERNAL_IRQ_PCLK_DIV_BY_64,
+  .p_callback = callback_icu,
+  .p_context = NULL,
+  .p_extend = NULL,
+  .ipl = (12),
+  #if defined(VECTOR_NUMBER_ICU_IRQ9)
+  .irq = VECTOR_NUMBER_ICU_IRQ9,
+  #else
+  .irq = FSP_INVALID_VECTOR,
+  #endif
+};
+/* Instance structure to use this module. */
+const external_irq_instance_t g_external_irq9 =
+{ .p_ctrl = &g_external_irq9_ctrl, .p_cfg = &g_external_irq9_cfg, .p_api = &g_external_irq_on_icu };
+icu_instance_ctrl_t g_external_irq8_ctrl;
+const external_irq_cfg_t g_external_irq8_cfg =
+{ .channel = 8,
+  .trigger = EXTERNAL_IRQ_TRIG_RISING,
+  .filter_enable = false,
+  .pclk_div = EXTERNAL_IRQ_PCLK_DIV_BY_64,
+  .p_callback = callback_icu,
+  .p_context = NULL,
+  .p_extend = NULL,
+  .ipl = (12),
+  #if defined(VECTOR_NUMBER_ICU_IRQ8)
+  .irq = VECTOR_NUMBER_ICU_IRQ8,
+  #else
+  .irq = FSP_INVALID_VECTOR,
+  #endif
+};
+/* Instance structure to use this module. */
+const external_irq_instance_t g_external_irq8 =
+{ .p_ctrl = &g_external_irq8_ctrl, .p_cfg = &g_external_irq8_cfg, .p_api = &g_external_irq_on_icu };
+icu_instance_ctrl_t g_external_irq7_ctrl;
+const external_irq_cfg_t g_external_irq7_cfg =
+{ .channel = 7,
+  .trigger = EXTERNAL_IRQ_TRIG_RISING,
+  .filter_enable = false,
+  .pclk_div = EXTERNAL_IRQ_PCLK_DIV_BY_64,
+  .p_callback = callback_icu,
+  .p_context = NULL,
+  .p_extend = NULL,
+  .ipl = (12),
+  #if defined(VECTOR_NUMBER_ICU_IRQ7)
+  .irq = VECTOR_NUMBER_ICU_IRQ7,
+  #else
+  .irq = FSP_INVALID_VECTOR,
+  #endif
+};
+/* Instance structure to use this module. */
+const external_irq_instance_t g_external_irq7 =
+{ .p_ctrl = &g_external_irq7_ctrl, .p_cfg = &g_external_irq7_cfg, .p_api = &g_external_irq_on_icu };
+icu_instance_ctrl_t g_external_irq6_ctrl;
+const external_irq_cfg_t g_external_irq6_cfg =
+{ .channel = 6,
+  .trigger = EXTERNAL_IRQ_TRIG_RISING,
+  .filter_enable = false,
+  .pclk_div = EXTERNAL_IRQ_PCLK_DIV_BY_64,
+  .p_callback = callback_icu,
+  .p_context = NULL,
+  .p_extend = NULL,
+  .ipl = (12),
+  #if defined(VECTOR_NUMBER_ICU_IRQ6)
+  .irq = VECTOR_NUMBER_ICU_IRQ6,
+  #else
+  .irq = FSP_INVALID_VECTOR,
+  #endif
+};
+/* Instance structure to use this module. */
+const external_irq_instance_t g_external_irq6 =
+{ .p_ctrl = &g_external_irq6_ctrl, .p_cfg = &g_external_irq6_cfg, .p_api = &g_external_irq_on_icu };
+icu_instance_ctrl_t g_external_irq5_ctrl;
+const external_irq_cfg_t g_external_irq5_cfg =
+{ .channel = 5,
+  .trigger = EXTERNAL_IRQ_TRIG_RISING,
+  .filter_enable = false,
+  .pclk_div = EXTERNAL_IRQ_PCLK_DIV_BY_64,
+  .p_callback = callback_icu,
+  .p_context = NULL,
+  .p_extend = NULL,
+  .ipl = (12),
+  #if defined(VECTOR_NUMBER_ICU_IRQ5)
+  .irq = VECTOR_NUMBER_ICU_IRQ5,
+  #else
+  .irq = FSP_INVALID_VECTOR,
+  #endif
+};
+/* Instance structure to use this module. */
+const external_irq_instance_t g_external_irq5 =
+{ .p_ctrl = &g_external_irq5_ctrl, .p_cfg = &g_external_irq5_cfg, .p_api = &g_external_irq_on_icu };
+icu_instance_ctrl_t g_external_irq4_ctrl;
+const external_irq_cfg_t g_external_irq4_cfg =
+{ .channel = 4,
+  .trigger = EXTERNAL_IRQ_TRIG_RISING,
+  .filter_enable = false,
+  .pclk_div = EXTERNAL_IRQ_PCLK_DIV_BY_64,
+  .p_callback = callback_icu,
+  .p_context = NULL,
+  .p_extend = NULL,
+  .ipl = (12),
+  #if defined(VECTOR_NUMBER_ICU_IRQ4)
+  .irq = VECTOR_NUMBER_ICU_IRQ4,
+  #else
+  .irq = FSP_INVALID_VECTOR,
+  #endif
+};
+/* Instance structure to use this module. */
+const external_irq_instance_t g_external_irq4 =
+{ .p_ctrl = &g_external_irq4_ctrl, .p_cfg = &g_external_irq4_cfg, .p_api = &g_external_irq_on_icu };
+icu_instance_ctrl_t g_external_irq3_ctrl;
+const external_irq_cfg_t g_external_irq3_cfg =
+{ .channel = 3,
+  .trigger = EXTERNAL_IRQ_TRIG_RISING,
+  .filter_enable = false,
+  .pclk_div = EXTERNAL_IRQ_PCLK_DIV_BY_64,
+  .p_callback = callback_icu,
+  .p_context = NULL,
+  .p_extend = NULL,
+  .ipl = (12),
+  #if defined(VECTOR_NUMBER_ICU_IRQ3)
+  .irq = VECTOR_NUMBER_ICU_IRQ3,
+  #else
+  .irq = FSP_INVALID_VECTOR,
+  #endif
+};
+/* Instance structure to use this module. */
+const external_irq_instance_t g_external_irq3 =
+{ .p_ctrl = &g_external_irq3_ctrl, .p_cfg = &g_external_irq3_cfg, .p_api = &g_external_irq_on_icu };
+icu_instance_ctrl_t g_external_irq2_ctrl;
+const external_irq_cfg_t g_external_irq2_cfg =
+{ .channel = 2,
+  .trigger = EXTERNAL_IRQ_TRIG_RISING,
+  .filter_enable = false,
+  .pclk_div = EXTERNAL_IRQ_PCLK_DIV_BY_64,
+  .p_callback = callback_icu,
+  .p_context = NULL,
+  .p_extend = NULL,
+  .ipl = (12),
+  #if defined(VECTOR_NUMBER_ICU_IRQ2)
+  .irq = VECTOR_NUMBER_ICU_IRQ2,
+  #else
+  .irq = FSP_INVALID_VECTOR,
+  #endif
+};
+/* Instance structure to use this module. */
+const external_irq_instance_t g_external_irq2 =
+{ .p_ctrl = &g_external_irq2_ctrl, .p_cfg = &g_external_irq2_cfg, .p_api = &g_external_irq_on_icu };
+icu_instance_ctrl_t g_external_irq1_ctrl;
+const external_irq_cfg_t g_external_irq1_cfg =
+{ .channel = 1,
+  .trigger = EXTERNAL_IRQ_TRIG_RISING,
+  .filter_enable = false,
+  .pclk_div = EXTERNAL_IRQ_PCLK_DIV_BY_64,
+  .p_callback = callback_icu,
+  .p_context = NULL,
+  .p_extend = NULL,
+  .ipl = (12),
+  #if defined(VECTOR_NUMBER_ICU_IRQ1)
+  .irq = VECTOR_NUMBER_ICU_IRQ1,
+  #else
+  .irq = FSP_INVALID_VECTOR,
+  #endif
+};
+/* Instance structure to use this module. */
+const external_irq_instance_t g_external_irq1 =
+{ .p_ctrl = &g_external_irq1_ctrl, .p_cfg = &g_external_irq1_cfg, .p_api = &g_external_irq_on_icu };
+icu_instance_ctrl_t g_external_irq0_ctrl;
+const external_irq_cfg_t g_external_irq0_cfg =
+{ .channel = 0,
+  .trigger = EXTERNAL_IRQ_TRIG_RISING,
+  .filter_enable = false,
+  .pclk_div = EXTERNAL_IRQ_PCLK_DIV_BY_64,
+  .p_callback = callback_icu,
+  .p_context = NULL,
+  .p_extend = NULL,
+  .ipl = (12),
+  #if defined(VECTOR_NUMBER_ICU_IRQ0)
+  .irq = VECTOR_NUMBER_ICU_IRQ0,
+  #else
+  .irq = FSP_INVALID_VECTOR,
+  #endif
+};
+/* Instance structure to use this module. */
+const external_irq_instance_t g_external_irq0 =
+{ .p_ctrl = &g_external_irq0_ctrl, .p_cfg = &g_external_irq0_cfg, .p_api = &g_external_irq_on_icu };
+agt_instance_ctrl_t g_timer1_ctrl;
+const agt_extended_cfg_t g_timer1_extend =
+{ .count_source = AGT_CLOCK_PCLKB,
+  .agto = AGT_PIN_CFG_DISABLED,
+  .agtoa = AGT_PIN_CFG_DISABLED,
+  .agtob = AGT_PIN_CFG_DISABLED,
+  .measurement_mode = AGT_MEASURE_DISABLED,
+  .agtio_filter = AGT_AGTIO_FILTER_NONE,
+  .enable_pin = AGT_ENABLE_PIN_NOT_USED,
+  .trigger_edge = AGT_TRIGGER_EDGE_RISING, };
+const timer_cfg_t g_timer1_cfg =
+{ .mode = TIMER_MODE_PERIODIC,
+/* Actual period: 0.0010922666666666667 seconds. Actual duty: 50%. */ .period_counts = 0x10000,
+  .duty_cycle_counts = 0x8000, .source_div = (timer_source_div_t)0, .channel = 0, .p_callback = callback_agt,
+  /** If NULL then do not add & */
+  #if defined(NULL)
+  .p_context = NULL,
+  #else
+  .p_context = &NULL,
+  #endif
+  .p_extend = &g_timer1_extend,
+  .cycle_end_ipl = (5),
+  #if defined(VECTOR_NUMBER_AGT0_INT)
+  .cycle_end_irq = VECTOR_NUMBER_AGT0_INT,
+  #else
+  .cycle_end_irq = FSP_INVALID_VECTOR,
+  #endif
+};
+/* Instance structure to use this module. */
+const timer_instance_t g_timer1 =
+{ .p_ctrl = &g_timer1_ctrl, .p_cfg = &g_timer1_cfg, .p_api = &g_timer_on_agt };
+agt_instance_ctrl_t g_timer0_ctrl;
+const agt_extended_cfg_t g_timer0_extend =
+{ .count_source = AGT_CLOCK_PCLKB,
+  .agto = AGT_PIN_CFG_DISABLED,
+  .agtoa = AGT_PIN_CFG_DISABLED,
+  .agtob = AGT_PIN_CFG_DISABLED,
+  .measurement_mode = AGT_MEASURE_DISABLED,
+  .agtio_filter = AGT_AGTIO_FILTER_NONE,
+  .enable_pin = AGT_ENABLE_PIN_NOT_USED,
+  .trigger_edge = AGT_TRIGGER_EDGE_RISING, };
+const timer_cfg_t g_timer0_cfg =
+{ .mode = TIMER_MODE_PERIODIC,
+/* Actual period: 0.0010922666666666667 seconds. Actual duty: 50%. */ .period_counts = 0x10000,
+  .duty_cycle_counts = 0x8000, .source_div = (timer_source_div_t)0, .channel = 0, .p_callback = callback_agt,
+  /** If NULL then do not add & */
+  #if defined(NULL)
+  .p_context = NULL,
+  #else
+  .p_context = &NULL,
+  #endif
+  .p_extend = &g_timer0_extend,
+  .cycle_end_ipl = (5),
+  #if defined(VECTOR_NUMBER_AGT0_INT)
+  .cycle_end_irq = VECTOR_NUMBER_AGT0_INT,
+  #else
+  .cycle_end_irq = FSP_INVALID_VECTOR,
+  #endif
+};
+/* Instance structure to use this module. */
+const timer_instance_t g_timer0 =
+{ .p_ctrl = &g_timer0_ctrl, .p_cfg = &g_timer0_cfg, .p_api = &g_timer_on_agt };
+flash_hp_instance_ctrl_t g_flash0_ctrl;
+const flash_cfg_t g_flash0_cfg =
+{ .data_flash_bgo = false, .p_callback = NULL, .p_context = NULL,
+  #if defined(VECTOR_NUMBER_FCU_FRDYI)
+  .irq = VECTOR_NUMBER_FCU_FRDYI,
+  #else
+  .irq = FSP_INVALID_VECTOR,
+  #endif
+  #if defined(VECTOR_NUMBER_FCU_FIFERR)
+  .err_irq = VECTOR_NUMBER_FCU_FIFERR,
+  #else
+  .err_irq = FSP_INVALID_VECTOR,
+  #endif
+  .err_ipl = (BSP_IRQ_DISABLED),
+  .ipl = (BSP_IRQ_DISABLED), };
+/* Instance structure to use this module. */
+const flash_instance_t g_flash0 =
+{ .p_ctrl = &g_flash0_ctrl, .p_cfg = &g_flash0_cfg, .p_api = &g_flash_on_flash_hp };
+rtc_instance_ctrl_t g_rtc0_ctrl;
+const rtc_error_adjustment_cfg_t g_rtc0_err_cfg =
+{ .adjustment_mode = RTC_ERROR_ADJUSTMENT_MODE_AUTOMATIC,
+  .adjustment_period = RTC_ERROR_ADJUSTMENT_PERIOD_10_SECOND,
+  .adjustment_type = RTC_ERROR_ADJUSTMENT_NONE,
+  .adjustment_value = 0, };
+const rtc_cfg_t g_rtc0_cfg =
+{ .clock_source = RTC_CLOCK_SOURCE_LOCO, .freq_compare_value_loco = 255, .p_err_cfg = &g_rtc0_err_cfg, .p_callback =
+      NULL,
+  .p_context = NULL, .alarm_ipl = (14), .periodic_ipl = (14), .carry_ipl = (14),
+  #if defined(VECTOR_NUMBER_RTC_ALARM)
+  .alarm_irq = VECTOR_NUMBER_RTC_ALARM,
+  #else
+  .alarm_irq = FSP_INVALID_VECTOR,
+  #endif
+  #if defined(VECTOR_NUMBER_RTC_PERIOD)
+  .periodic_irq = VECTOR_NUMBER_RTC_PERIOD,
+  #else
+  .periodic_irq = FSP_INVALID_VECTOR,
+  #endif
+  #if defined(VECTOR_NUMBER_RTC_CARRY)
+  .carry_irq = VECTOR_NUMBER_RTC_CARRY,
+  #else
+  .carry_irq = FSP_INVALID_VECTOR,
+  #endif
+};
+/* Instance structure to use this module. */
+const rtc_instance_t g_rtc0 =
+{ .p_ctrl = &g_rtc0_ctrl, .p_cfg = &g_rtc0_cfg, .p_api = &g_rtc_on_rtc };
+sci_uart_instance_ctrl_t g_uart9_ctrl;
+
+baud_setting_t g_uart9_baud_setting =
+{
+/* Baud rate calculated with 0.160% error. */ .abcse = 0,
+    .abcs = 0, .bgdm = 1, .cks = 0, .brr = 64, .mddr = (uint8_t)256, .brme = false
+};
+
+/** UART extended configuration for UARTonSCI HAL driver */
+const sci_uart_extended_cfg_t g_uart9_cfg_extend =
+{ .clock = SCI_UART_CLOCK_INT,
+  .rx_edge_start = SCI_UART_START_BIT_FALLING_EDGE,
+  .noise_cancel = SCI_UART_NOISE_CANCELLATION_DISABLE,
+  .rx_fifo_trigger = SCI_UART_RX_FIFO_TRIGGER_MAX,
+  .p_baud_setting = &g_uart9_baud_setting,
+  .uart_mode = UART_MODE_RS232,
+  .ctsrts_en = SCI_UART_CTSRTS_RTS_OUTPUT,
+  #if 0
+  .flow_control_pin = BSP_IO_PORT_00_PIN_00,
+  #else
+  .flow_control_pin = (bsp_io_port_pin_t)(0xFFFFU),
+  #endif
+};
+
+/** UART interface configuration */
+const uart_cfg_t g_uart9_cfg =
+{ .channel = 9, .data_bits = UART_DATA_BITS_8, .parity = UART_PARITY_OFF, .stop_bits = UART_STOP_BITS_1, .p_callback =
+      user_uart_callback,
+  .p_context = NULL, .p_extend = &g_uart9_cfg_extend,
+#define RA_NOT_DEFINED (1)
+  #if (RA_NOT_DEFINED == RA_NOT_DEFINED)
+  .p_transfer_tx = NULL,
+  #else
+  .p_transfer_tx = &RA_NOT_DEFINED,
+  #endif
+  #if (RA_NOT_DEFINED == RA_NOT_DEFINED)
+  .p_transfer_rx = NULL,
+  #else
+  .p_transfer_rx = &RA_NOT_DEFINED,
+  #endif
+#undef RA_NOT_DEFINED
+  .rxi_ipl = (12),
+  .txi_ipl = (12), .tei_ipl = (12), .eri_ipl = (12),
+  #if defined(VECTOR_NUMBER_SCI9_RXI)
+  .rxi_irq = VECTOR_NUMBER_SCI9_RXI,
+  #else
+  .rxi_irq = FSP_INVALID_VECTOR,
+  #endif
+  #if defined(VECTOR_NUMBER_SCI9_TXI)
+  .txi_irq = VECTOR_NUMBER_SCI9_TXI,
+  #else
+  .txi_irq = FSP_INVALID_VECTOR,
+  #endif
+  #if defined(VECTOR_NUMBER_SCI9_TEI)
+  .tei_irq = VECTOR_NUMBER_SCI9_TEI,
+  #else
+  .tei_irq = FSP_INVALID_VECTOR,
+  #endif
+  #if defined(VECTOR_NUMBER_SCI9_ERI)
+  .eri_irq = VECTOR_NUMBER_SCI9_ERI,
+  #else
+  .eri_irq = FSP_INVALID_VECTOR,
+  #endif
+};
+
+/* Instance structure to use this module. */
+const uart_instance_t g_uart9 =
+{ .p_ctrl = &g_uart9_ctrl, .p_cfg = &g_uart9_cfg, .p_api = &g_uart_on_sci };
+sci_uart_instance_ctrl_t g_uart7_ctrl;
+
+baud_setting_t g_uart7_baud_setting =
+{
+/* Baud rate calculated with 0.160% error. */ .abcse = 0,
+    .abcs = 0, .bgdm = 1, .cks = 0, .brr = 64, .mddr = (uint8_t)256, .brme = false
+};
+
+/** UART extended configuration for UARTonSCI HAL driver */
+const sci_uart_extended_cfg_t g_uart7_cfg_extend =
+{ .clock = SCI_UART_CLOCK_INT,
+  .rx_edge_start = SCI_UART_START_BIT_FALLING_EDGE,
+  .noise_cancel = SCI_UART_NOISE_CANCELLATION_DISABLE,
+  .rx_fifo_trigger = SCI_UART_RX_FIFO_TRIGGER_MAX,
+  .p_baud_setting = &g_uart7_baud_setting,
+  .uart_mode = UART_MODE_RS232,
+  .ctsrts_en = SCI_UART_CTSRTS_RTS_OUTPUT,
+  #if 0
+  .flow_control_pin = BSP_IO_PORT_00_PIN_00,
+  #else
+  .flow_control_pin = (bsp_io_port_pin_t)(0xFFFFU),
+  #endif
+};
+
+/** UART interface configuration */
+const uart_cfg_t g_uart7_cfg =
+{ .channel = 7, .data_bits = UART_DATA_BITS_8, .parity = UART_PARITY_OFF, .stop_bits = UART_STOP_BITS_1, .p_callback =
+      user_uart_callback,
+  .p_context = NULL, .p_extend = &g_uart7_cfg_extend,
+#define RA_NOT_DEFINED (1)
+  #if (RA_NOT_DEFINED == RA_NOT_DEFINED)
+  .p_transfer_tx = NULL,
+  #else
+  .p_transfer_tx = &RA_NOT_DEFINED,
+  #endif
+  #if (RA_NOT_DEFINED == RA_NOT_DEFINED)
+  .p_transfer_rx = NULL,
+  #else
+  .p_transfer_rx = &RA_NOT_DEFINED,
+  #endif
+#undef RA_NOT_DEFINED
+  .rxi_ipl = (12),
+  .txi_ipl = (12), .tei_ipl = (12), .eri_ipl = (12),
+  #if defined(VECTOR_NUMBER_SCI7_RXI)
+  .rxi_irq = VECTOR_NUMBER_SCI7_RXI,
+  #else
+  .rxi_irq = FSP_INVALID_VECTOR,
+  #endif
+  #if defined(VECTOR_NUMBER_SCI7_TXI)
+  .txi_irq = VECTOR_NUMBER_SCI7_TXI,
+  #else
+  .txi_irq = FSP_INVALID_VECTOR,
+  #endif
+  #if defined(VECTOR_NUMBER_SCI7_TEI)
+  .tei_irq = VECTOR_NUMBER_SCI7_TEI,
+  #else
+  .tei_irq = FSP_INVALID_VECTOR,
+  #endif
+  #if defined(VECTOR_NUMBER_SCI7_ERI)
+  .eri_irq = VECTOR_NUMBER_SCI7_ERI,
+  #else
+  .eri_irq = FSP_INVALID_VECTOR,
+  #endif
+};
+
+/* Instance structure to use this module. */
+const uart_instance_t g_uart7 =
+{ .p_ctrl = &g_uart7_ctrl, .p_cfg = &g_uart7_cfg, .p_api = &g_uart_on_sci };
+sci_uart_instance_ctrl_t g_uart0_ctrl;
+
+baud_setting_t g_uart0_baud_setting =
+{
+/* Baud rate calculated with 0.160% error. */ .abcse = 0,
+    .abcs = 0, .bgdm = 1, .cks = 0, .brr = 64, .mddr = (uint8_t)256, .brme = false
+};
+
+/** UART extended configuration for UARTonSCI HAL driver */
+const sci_uart_extended_cfg_t g_uart0_cfg_extend =
+{ .clock = SCI_UART_CLOCK_INT,
+  .rx_edge_start = SCI_UART_START_BIT_FALLING_EDGE,
+  .noise_cancel = SCI_UART_NOISE_CANCELLATION_DISABLE,
+  .rx_fifo_trigger = SCI_UART_RX_FIFO_TRIGGER_MAX,
+  .p_baud_setting = &g_uart0_baud_setting,
+  .uart_mode = UART_MODE_RS232,
+  .ctsrts_en = SCI_UART_CTSRTS_RTS_OUTPUT,
+  #if 0
+  .flow_control_pin = BSP_IO_PORT_00_PIN_00,
+  #else
+  .flow_control_pin = (bsp_io_port_pin_t)(0xFFFFU),
+  #endif
+};
+
+/** UART interface configuration */
+const uart_cfg_t g_uart0_cfg =
+{ .channel = 0, .data_bits = UART_DATA_BITS_8, .parity = UART_PARITY_OFF, .stop_bits = UART_STOP_BITS_1, .p_callback =
+      user_uart_callback,
+  .p_context = NULL, .p_extend = &g_uart0_cfg_extend,
+#define RA_NOT_DEFINED (1)
+  #if (RA_NOT_DEFINED == RA_NOT_DEFINED)
+  .p_transfer_tx = NULL,
+  #else
+  .p_transfer_tx = &RA_NOT_DEFINED,
+  #endif
+  #if (RA_NOT_DEFINED == RA_NOT_DEFINED)
+  .p_transfer_rx = NULL,
+  #else
+  .p_transfer_rx = &RA_NOT_DEFINED,
+  #endif
+#undef RA_NOT_DEFINED
+  .rxi_ipl = (12),
+  .txi_ipl = (12), .tei_ipl = (12), .eri_ipl = (12),
+  #if defined(VECTOR_NUMBER_SCI0_RXI)
+  .rxi_irq = VECTOR_NUMBER_SCI0_RXI,
+  #else
+  .rxi_irq = FSP_INVALID_VECTOR,
+  #endif
+  #if defined(VECTOR_NUMBER_SCI0_TXI)
+  .txi_irq = VECTOR_NUMBER_SCI0_TXI,
+  #else
+  .txi_irq = FSP_INVALID_VECTOR,
+  #endif
+  #if defined(VECTOR_NUMBER_SCI0_TEI)
+  .tei_irq = VECTOR_NUMBER_SCI0_TEI,
+  #else
+  .tei_irq = FSP_INVALID_VECTOR,
+  #endif
+  #if defined(VECTOR_NUMBER_SCI0_ERI)
+  .eri_irq = VECTOR_NUMBER_SCI0_ERI,
+  #else
+  .eri_irq = FSP_INVALID_VECTOR,
+  #endif
+};
+
+/* Instance structure to use this module. */
+const uart_instance_t g_uart0 =
+{ .p_ctrl = &g_uart0_ctrl, .p_cfg = &g_uart0_cfg, .p_api = &g_uart_on_sci };
+void g_hal_init(void) {
+    g_common_init();
+}
diff --git a/ports/renesas-ra/boards/RA6M2_EK/ra_gen/hal_data.h b/ports/renesas-ra/boards/RA6M2_EK/ra_gen/hal_data.h
new file mode 100644
index 0000000000000..59d2a9122877b
--- /dev/null
+++ b/ports/renesas-ra/boards/RA6M2_EK/ra_gen/hal_data.h
@@ -0,0 +1,373 @@
+/* generated HAL header file - do not edit */
+#ifndef HAL_DATA_H_
+#define HAL_DATA_H_
+#include <stdint.h>
+#include "bsp_api.h"
+#include "common_data.h"
+#include "r_iic_master.h"
+#include "r_i2c_master_api.h"
+#include "r_adc.h"
+#include "r_adc_api.h"
+#include "r_lpm.h"
+#include "r_lpm_api.h"
+#include "r_dtc.h"
+#include "r_transfer_api.h"
+#include "r_spi.h"
+#include "r_icu.h"
+#include "r_external_irq_api.h"
+#include "r_agt.h"
+#include "r_timer_api.h"
+#include "r_flash_hp.h"
+#include "r_flash_api.h"
+#include "r_rtc.h"
+#include "r_rtc_api.h"
+#include "r_sci_uart.h"
+#include "r_uart_api.h"
+FSP_HEADER
+/* I2C Master on IIC Instance. */
+extern const i2c_master_instance_t g_i2c_master2;
+
+/** Access the I2C Master instance using these structures when calling API functions directly (::p_api is not used). */
+extern iic_master_instance_ctrl_t g_i2c_master2_ctrl;
+extern const i2c_master_cfg_t g_i2c_master2_cfg;
+
+#ifndef callback_iic
+void callback_iic(i2c_master_callback_args_t *p_args);
+#endif
+/** ADC on ADC Instance. */
+extern const adc_instance_t g_adc1;
+
+/** Access the ADC instance using these structures when calling API functions directly (::p_api is not used). */
+extern adc_instance_ctrl_t g_adc1_ctrl;
+extern const adc_cfg_t g_adc1_cfg;
+extern const adc_channel_cfg_t g_adc1_channel_cfg;
+
+#ifndef NULL
+void NULL(adc_callback_args_t *p_args);
+#endif
+/** ADC on ADC Instance. */
+extern const adc_instance_t g_adc0;
+
+/** Access the ADC instance using these structures when calling API functions directly (::p_api is not used). */
+extern adc_instance_ctrl_t g_adc0_ctrl;
+extern const adc_cfg_t g_adc0_cfg;
+extern const adc_channel_cfg_t g_adc0_channel_cfg;
+
+#ifndef NULL
+void NULL(adc_callback_args_t *p_args);
+#endif
+/** lpm Instance */
+extern const lpm_instance_t g_lpm0;
+
+/** Access the LPM instance using these structures when calling API functions directly (::p_api is not used). */
+extern lpm_instance_ctrl_t g_lpm0_ctrl;
+extern const lpm_cfg_t g_lpm0_cfg;
+/* Transfer on DTC Instance. */
+extern const transfer_instance_t g_transfer3;
+
+/** Access the DTC instance using these structures when calling API functions directly (::p_api is not used). */
+extern dtc_instance_ctrl_t g_transfer3_ctrl;
+extern const transfer_cfg_t g_transfer3_cfg;
+/* Transfer on DTC Instance. */
+extern const transfer_instance_t g_transfer2;
+
+/** Access the DTC instance using these structures when calling API functions directly (::p_api is not used). */
+extern dtc_instance_ctrl_t g_transfer2_ctrl;
+extern const transfer_cfg_t g_transfer2_cfg;
+/** SPI on SPI Instance. */
+extern const spi_instance_t g_spi1;
+
+/** Access the SPI instance using these structures when calling API functions directly (::p_api is not used). */
+extern spi_instance_ctrl_t g_spi1_ctrl;
+extern const spi_cfg_t g_spi1_cfg;
+
+/** Callback used by SPI Instance. */
+#ifndef spi_callback
+void spi_callback(spi_callback_args_t *p_args);
+#endif
+
+#define RA_NOT_DEFINED (1)
+#if (RA_NOT_DEFINED == g_transfer2)
+    #define g_spi1_P_TRANSFER_TX (NULL)
+#else
+#define g_spi1_P_TRANSFER_TX (&g_transfer2)
+#endif
+#if (RA_NOT_DEFINED == g_transfer3)
+    #define g_spi1_P_TRANSFER_RX (NULL)
+#else
+#define g_spi1_P_TRANSFER_RX (&g_transfer3)
+#endif
+#undef RA_NOT_DEFINED
+/* Transfer on DTC Instance. */
+extern const transfer_instance_t g_transfer1;
+
+/** Access the DTC instance using these structures when calling API functions directly (::p_api is not used). */
+extern dtc_instance_ctrl_t g_transfer1_ctrl;
+extern const transfer_cfg_t g_transfer1_cfg;
+/* Transfer on DTC Instance. */
+extern const transfer_instance_t g_transfer0;
+
+/** Access the DTC instance using these structures when calling API functions directly (::p_api is not used). */
+extern dtc_instance_ctrl_t g_transfer0_ctrl;
+extern const transfer_cfg_t g_transfer0_cfg;
+/** SPI on SPI Instance. */
+extern const spi_instance_t g_spi0;
+
+/** Access the SPI instance using these structures when calling API functions directly (::p_api is not used). */
+extern spi_instance_ctrl_t g_spi0_ctrl;
+extern const spi_cfg_t g_spi0_cfg;
+
+/** Callback used by SPI Instance. */
+#ifndef spi_callback
+void spi_callback(spi_callback_args_t *p_args);
+#endif
+
+#define RA_NOT_DEFINED (1)
+#if (RA_NOT_DEFINED == g_transfer0)
+    #define g_spi0_P_TRANSFER_TX (NULL)
+#else
+#define g_spi0_P_TRANSFER_TX (&g_transfer0)
+#endif
+#if (RA_NOT_DEFINED == g_transfer1)
+    #define g_spi0_P_TRANSFER_RX (NULL)
+#else
+#define g_spi0_P_TRANSFER_RX (&g_transfer1)
+#endif
+#undef RA_NOT_DEFINED
+/** External IRQ on ICU Instance. */
+extern const external_irq_instance_t g_external_irq15;
+
+/** Access the ICU instance using these structures when calling API functions directly (::p_api is not used). */
+extern icu_instance_ctrl_t g_external_irq15_ctrl;
+extern const external_irq_cfg_t g_external_irq15_cfg;
+
+#ifndef callback_icu
+void callback_icu(external_irq_callback_args_t *p_args);
+#endif
+/** External IRQ on ICU Instance. */
+extern const external_irq_instance_t g_external_irq14;
+
+/** Access the ICU instance using these structures when calling API functions directly (::p_api is not used). */
+extern icu_instance_ctrl_t g_external_irq14_ctrl;
+extern const external_irq_cfg_t g_external_irq14_cfg;
+
+#ifndef callback_icu
+void callback_icu(external_irq_callback_args_t *p_args);
+#endif
+/** External IRQ on ICU Instance. */
+extern const external_irq_instance_t g_external_irq13;
+
+/** Access the ICU instance using these structures when calling API functions directly (::p_api is not used). */
+extern icu_instance_ctrl_t g_external_irq13_ctrl;
+extern const external_irq_cfg_t g_external_irq13_cfg;
+
+#ifndef callback_icu
+void callback_icu(external_irq_callback_args_t *p_args);
+#endif
+/** External IRQ on ICU Instance. */
+extern const external_irq_instance_t g_external_irq12;
+
+/** Access the ICU instance using these structures when calling API functions directly (::p_api is not used). */
+extern icu_instance_ctrl_t g_external_irq12_ctrl;
+extern const external_irq_cfg_t g_external_irq12_cfg;
+
+#ifndef callback_icu
+void callback_icu(external_irq_callback_args_t *p_args);
+#endif
+/** External IRQ on ICU Instance. */
+extern const external_irq_instance_t g_external_irq11;
+
+/** Access the ICU instance using these structures when calling API functions directly (::p_api is not used). */
+extern icu_instance_ctrl_t g_external_irq11_ctrl;
+extern const external_irq_cfg_t g_external_irq11_cfg;
+
+#ifndef callback_icu
+void callback_icu(external_irq_callback_args_t *p_args);
+#endif
+/** External IRQ on ICU Instance. */
+extern const external_irq_instance_t g_external_irq10;
+
+/** Access the ICU instance using these structures when calling API functions directly (::p_api is not used). */
+extern icu_instance_ctrl_t g_external_irq10_ctrl;
+extern const external_irq_cfg_t g_external_irq10_cfg;
+
+#ifndef callback_icu
+void callback_icu(external_irq_callback_args_t *p_args);
+#endif
+/** External IRQ on ICU Instance. */
+extern const external_irq_instance_t g_external_irq9;
+
+/** Access the ICU instance using these structures when calling API functions directly (::p_api is not used). */
+extern icu_instance_ctrl_t g_external_irq9_ctrl;
+extern const external_irq_cfg_t g_external_irq9_cfg;
+
+#ifndef callback_icu
+void callback_icu(external_irq_callback_args_t *p_args);
+#endif
+/** External IRQ on ICU Instance. */
+extern const external_irq_instance_t g_external_irq8;
+
+/** Access the ICU instance using these structures when calling API functions directly (::p_api is not used). */
+extern icu_instance_ctrl_t g_external_irq8_ctrl;
+extern const external_irq_cfg_t g_external_irq8_cfg;
+
+#ifndef callback_icu
+void callback_icu(external_irq_callback_args_t *p_args);
+#endif
+/** External IRQ on ICU Instance. */
+extern const external_irq_instance_t g_external_irq7;
+
+/** Access the ICU instance using these structures when calling API functions directly (::p_api is not used). */
+extern icu_instance_ctrl_t g_external_irq7_ctrl;
+extern const external_irq_cfg_t g_external_irq7_cfg;
+
+#ifndef callback_icu
+void callback_icu(external_irq_callback_args_t *p_args);
+#endif
+/** External IRQ on ICU Instance. */
+extern const external_irq_instance_t g_external_irq6;
+
+/** Access the ICU instance using these structures when calling API functions directly (::p_api is not used). */
+extern icu_instance_ctrl_t g_external_irq6_ctrl;
+extern const external_irq_cfg_t g_external_irq6_cfg;
+
+#ifndef callback_icu
+void callback_icu(external_irq_callback_args_t *p_args);
+#endif
+/** External IRQ on ICU Instance. */
+extern const external_irq_instance_t g_external_irq5;
+
+/** Access the ICU instance using these structures when calling API functions directly (::p_api is not used). */
+extern icu_instance_ctrl_t g_external_irq5_ctrl;
+extern const external_irq_cfg_t g_external_irq5_cfg;
+
+#ifndef callback_icu
+void callback_icu(external_irq_callback_args_t *p_args);
+#endif
+/** External IRQ on ICU Instance. */
+extern const external_irq_instance_t g_external_irq4;
+
+/** Access the ICU instance using these structures when calling API functions directly (::p_api is not used). */
+extern icu_instance_ctrl_t g_external_irq4_ctrl;
+extern const external_irq_cfg_t g_external_irq4_cfg;
+
+#ifndef callback_icu
+void callback_icu(external_irq_callback_args_t *p_args);
+#endif
+/** External IRQ on ICU Instance. */
+extern const external_irq_instance_t g_external_irq3;
+
+/** Access the ICU instance using these structures when calling API functions directly (::p_api is not used). */
+extern icu_instance_ctrl_t g_external_irq3_ctrl;
+extern const external_irq_cfg_t g_external_irq3_cfg;
+
+#ifndef callback_icu
+void callback_icu(external_irq_callback_args_t *p_args);
+#endif
+/** External IRQ on ICU Instance. */
+extern const external_irq_instance_t g_external_irq2;
+
+/** Access the ICU instance using these structures when calling API functions directly (::p_api is not used). */
+extern icu_instance_ctrl_t g_external_irq2_ctrl;
+extern const external_irq_cfg_t g_external_irq2_cfg;
+
+#ifndef callback_icu
+void callback_icu(external_irq_callback_args_t *p_args);
+#endif
+/** External IRQ on ICU Instance. */
+extern const external_irq_instance_t g_external_irq1;
+
+/** Access the ICU instance using these structures when calling API functions directly (::p_api is not used). */
+extern icu_instance_ctrl_t g_external_irq1_ctrl;
+extern const external_irq_cfg_t g_external_irq1_cfg;
+
+#ifndef callback_icu
+void callback_icu(external_irq_callback_args_t *p_args);
+#endif
+/** External IRQ on ICU Instance. */
+extern const external_irq_instance_t g_external_irq0;
+
+/** Access the ICU instance using these structures when calling API functions directly (::p_api is not used). */
+extern icu_instance_ctrl_t g_external_irq0_ctrl;
+extern const external_irq_cfg_t g_external_irq0_cfg;
+
+#ifndef callback_icu
+void callback_icu(external_irq_callback_args_t *p_args);
+#endif
+/** AGT Timer Instance */
+extern const timer_instance_t g_timer1;
+
+/** Access the AGT instance using these structures when calling API functions directly (::p_api is not used). */
+extern agt_instance_ctrl_t g_timer1_ctrl;
+extern const timer_cfg_t g_timer1_cfg;
+
+#ifndef callback_agt
+void callback_agt(timer_callback_args_t *p_args);
+#endif
+/** AGT Timer Instance */
+extern const timer_instance_t g_timer0;
+
+/** Access the AGT instance using these structures when calling API functions directly (::p_api is not used). */
+extern agt_instance_ctrl_t g_timer0_ctrl;
+extern const timer_cfg_t g_timer0_cfg;
+
+#ifndef callback_agt
+void callback_agt(timer_callback_args_t *p_args);
+#endif
+/* Flash on Flash HP Instance */
+extern const flash_instance_t g_flash0;
+
+/** Access the Flash HP instance using these structures when calling API functions directly (::p_api is not used). */
+extern flash_hp_instance_ctrl_t g_flash0_ctrl;
+extern const flash_cfg_t g_flash0_cfg;
+
+#ifndef NULL
+void NULL(flash_callback_args_t *p_args);
+#endif
+/* RTC Instance. */
+extern const rtc_instance_t g_rtc0;
+
+/** Access the RTC instance using these structures when calling API functions directly (::p_api is not used). */
+extern rtc_instance_ctrl_t g_rtc0_ctrl;
+extern const rtc_cfg_t g_rtc0_cfg;
+
+#ifndef NULL
+void NULL(rtc_callback_args_t *p_args);
+#endif
+/** UART on SCI Instance. */
+extern const uart_instance_t g_uart9;
+
+/** Access the UART instance using these structures when calling API functions directly (::p_api is not used). */
+extern sci_uart_instance_ctrl_t g_uart9_ctrl;
+extern const uart_cfg_t g_uart9_cfg;
+extern const sci_uart_extended_cfg_t g_uart9_cfg_extend;
+
+#ifndef user_uart_callback
+void user_uart_callback(uart_callback_args_t *p_args);
+#endif
+/** UART on SCI Instance. */
+extern const uart_instance_t g_uart7;
+
+/** Access the UART instance using these structures when calling API functions directly (::p_api is not used). */
+extern sci_uart_instance_ctrl_t g_uart7_ctrl;
+extern const uart_cfg_t g_uart7_cfg;
+extern const sci_uart_extended_cfg_t g_uart7_cfg_extend;
+
+#ifndef user_uart_callback
+void user_uart_callback(uart_callback_args_t *p_args);
+#endif
+/** UART on SCI Instance. */
+extern const uart_instance_t g_uart0;
+
+/** Access the UART instance using these structures when calling API functions directly (::p_api is not used). */
+extern sci_uart_instance_ctrl_t g_uart0_ctrl;
+extern const uart_cfg_t g_uart0_cfg;
+extern const sci_uart_extended_cfg_t g_uart0_cfg_extend;
+
+#ifndef user_uart_callback
+void user_uart_callback(uart_callback_args_t *p_args);
+#endif
+void hal_entry(void);
+void g_hal_init(void);
+FSP_FOOTER
+#endif /* HAL_DATA_H_ */
diff --git a/ports/renesas-ra/boards/RA6M2_EK/ra_gen/main.c b/ports/renesas-ra/boards/RA6M2_EK/ra_gen/main.c
new file mode 100644
index 0000000000000..5b9f9805595fa
--- /dev/null
+++ b/ports/renesas-ra/boards/RA6M2_EK/ra_gen/main.c
@@ -0,0 +1,6 @@
+/* generated main source file - do not edit */
+#include "hal_data.h"
+int main(void) {
+    hal_entry();
+    return 0;
+}
diff --git a/ports/renesas-ra/boards/RA6M2_EK/ra_gen/pin_data.c b/ports/renesas-ra/boards/RA6M2_EK/ra_gen/pin_data.c
new file mode 100644
index 0000000000000..28330830c9577
--- /dev/null
+++ b/ports/renesas-ra/boards/RA6M2_EK/ra_gen/pin_data.c
@@ -0,0 +1,117 @@
+/* generated pin source file - do not edit */
+#include "bsp_api.h"
+#include "r_ioport_api.h"
+const ioport_pin_cfg_t g_bsp_pin_cfg_data[] = {
+    {
+        .pin = BSP_IO_PORT_00_PIN_04,
+        .pin_cfg = ((uint32_t)IOPORT_CFG_ANALOG_ENABLE),
+    },
+    {
+        .pin = BSP_IO_PORT_01_PIN_00,
+        .pin_cfg = ((uint32_t)IOPORT_CFG_PERIPHERAL_PIN | (uint32_t)IOPORT_PERIPHERAL_SPI),
+    },
+    {
+        .pin = BSP_IO_PORT_01_PIN_01,
+        .pin_cfg = ((uint32_t)IOPORT_CFG_PERIPHERAL_PIN | (uint32_t)IOPORT_PERIPHERAL_SPI),
+    },
+    {
+        .pin = BSP_IO_PORT_01_PIN_02,
+        .pin_cfg = ((uint32_t)IOPORT_CFG_PERIPHERAL_PIN | (uint32_t)IOPORT_PERIPHERAL_SPI),
+    },
+    {
+        .pin = BSP_IO_PORT_01_PIN_03,
+        .pin_cfg = ((uint32_t)IOPORT_CFG_PERIPHERAL_PIN | (uint32_t)IOPORT_PERIPHERAL_SPI),
+    },
+    {
+        .pin = BSP_IO_PORT_01_PIN_05,
+        .pin_cfg = ((uint32_t)IOPORT_CFG_IRQ_ENABLE | (uint32_t)IOPORT_CFG_PORT_DIRECTION_INPUT),
+    },
+    {
+        .pin = BSP_IO_PORT_01_PIN_06,
+        .pin_cfg = ((uint32_t)IOPORT_CFG_PORT_DIRECTION_OUTPUT | (uint32_t)IOPORT_CFG_PORT_OUTPUT_LOW),
+    },
+    {
+        .pin = BSP_IO_PORT_01_PIN_08,
+        .pin_cfg = ((uint32_t)IOPORT_CFG_PERIPHERAL_PIN | (uint32_t)IOPORT_PERIPHERAL_DEBUG),
+    },
+    {
+        .pin = BSP_IO_PORT_01_PIN_09,
+        .pin_cfg = ((uint32_t)IOPORT_CFG_PERIPHERAL_PIN | (uint32_t)IOPORT_PERIPHERAL_DEBUG),
+    },
+    {
+        .pin = BSP_IO_PORT_01_PIN_10,
+        .pin_cfg = ((uint32_t)IOPORT_CFG_PERIPHERAL_PIN | (uint32_t)IOPORT_PERIPHERAL_DEBUG),
+    },
+    {
+        .pin = BSP_IO_PORT_02_PIN_05,
+        .pin_cfg = ((uint32_t)IOPORT_CFG_PERIPHERAL_PIN | (uint32_t)IOPORT_PERIPHERAL_CTSU),
+    },
+    {
+        .pin = BSP_IO_PORT_02_PIN_07,
+        .pin_cfg = ((uint32_t)IOPORT_CFG_PERIPHERAL_PIN | (uint32_t)IOPORT_PERIPHERAL_CTSU),
+    },
+    {
+        .pin = BSP_IO_PORT_03_PIN_00,
+        .pin_cfg = ((uint32_t)IOPORT_CFG_PERIPHERAL_PIN | (uint32_t)IOPORT_PERIPHERAL_DEBUG),
+    },
+    {
+        .pin = BSP_IO_PORT_04_PIN_00,
+        .pin_cfg = ((uint32_t)IOPORT_CFG_PORT_DIRECTION_OUTPUT | (uint32_t)IOPORT_CFG_PORT_OUTPUT_LOW),
+    },
+    {
+        .pin = BSP_IO_PORT_04_PIN_01,
+        .pin_cfg = ((uint32_t)IOPORT_CFG_PERIPHERAL_PIN | (uint32_t)IOPORT_PERIPHERAL_SCI1_3_5_7_9),
+    },
+    {
+        .pin = BSP_IO_PORT_04_PIN_02,
+        .pin_cfg = ((uint32_t)IOPORT_CFG_PERIPHERAL_PIN | (uint32_t)IOPORT_PERIPHERAL_SCI1_3_5_7_9),
+    },
+    {
+        .pin = BSP_IO_PORT_04_PIN_07,
+        .pin_cfg = ((uint32_t)IOPORT_CFG_PERIPHERAL_PIN | (uint32_t)IOPORT_PERIPHERAL_USB_FS),
+    },
+    {
+        .pin = BSP_IO_PORT_04_PIN_10,
+        .pin_cfg = ((uint32_t)IOPORT_CFG_PERIPHERAL_PIN | (uint32_t)IOPORT_PERIPHERAL_SCI0_2_4_6_8),
+    },
+    {
+        .pin = BSP_IO_PORT_04_PIN_11,
+        .pin_cfg = ((uint32_t)IOPORT_CFG_PERIPHERAL_PIN | (uint32_t)IOPORT_PERIPHERAL_SCI0_2_4_6_8),
+    },
+    {
+        .pin = BSP_IO_PORT_05_PIN_11,
+        .pin_cfg = ((uint32_t)IOPORT_CFG_DRIVE_MID | (uint32_t)IOPORT_CFG_PERIPHERAL_PIN | (uint32_t)IOPORT_PERIPHERAL_IIC),
+    },
+    {
+        .pin = BSP_IO_PORT_05_PIN_12,
+        .pin_cfg = ((uint32_t)IOPORT_CFG_DRIVE_MID | (uint32_t)IOPORT_CFG_PERIPHERAL_PIN | (uint32_t)IOPORT_PERIPHERAL_IIC),
+    },
+    {
+        .pin = BSP_IO_PORT_06_PIN_01,
+        .pin_cfg = ((uint32_t)IOPORT_CFG_PERIPHERAL_PIN | (uint32_t)IOPORT_PERIPHERAL_SCI1_3_5_7_9),
+    },
+    {
+        .pin = BSP_IO_PORT_06_PIN_02,
+        .pin_cfg = ((uint32_t)IOPORT_CFG_PERIPHERAL_PIN | (uint32_t)IOPORT_PERIPHERAL_SCI1_3_5_7_9),
+    },
+    {
+        .pin = BSP_IO_PORT_07_PIN_00,
+        .pin_cfg = ((uint32_t)IOPORT_CFG_PERIPHERAL_PIN | (uint32_t)IOPORT_PERIPHERAL_SPI),
+    },
+    {
+        .pin = BSP_IO_PORT_07_PIN_01,
+        .pin_cfg = ((uint32_t)IOPORT_CFG_PERIPHERAL_PIN | (uint32_t)IOPORT_PERIPHERAL_SPI),
+    },
+    {
+        .pin = BSP_IO_PORT_07_PIN_02,
+        .pin_cfg = ((uint32_t)IOPORT_CFG_PERIPHERAL_PIN | (uint32_t)IOPORT_PERIPHERAL_SPI),
+    },
+    {
+        .pin = BSP_IO_PORT_07_PIN_03,
+        .pin_cfg = ((uint32_t)IOPORT_CFG_PERIPHERAL_PIN | (uint32_t)IOPORT_PERIPHERAL_SPI),
+    },
+};
+const ioport_cfg_t g_bsp_pin_cfg = {
+    .number_of_pins = sizeof(g_bsp_pin_cfg_data) / sizeof(ioport_pin_cfg_t),
+    .p_pin_cfg_data = &g_bsp_pin_cfg_data[0],
+};
diff --git a/ports/renesas-ra/boards/RA6M2_EK/ra_gen/vector_data.c b/ports/renesas-ra/boards/RA6M2_EK/ra_gen/vector_data.c
new file mode 100644
index 0000000000000..35de44a48bcd9
--- /dev/null
+++ b/ports/renesas-ra/boards/RA6M2_EK/ra_gen/vector_data.c
@@ -0,0 +1,99 @@
+/* generated vector source file - do not edit */
+#include "bsp_api.h"
+/* Do not build these data structures if no interrupts are currently allocated because IAR will have build errors. */
+#if VECTOR_DATA_IRQ_COUNT > 0
+BSP_DONT_REMOVE const fsp_vector_t g_vector_table[BSP_ICU_VECTOR_MAX_ENTRIES] BSP_PLACE_IN_SECTION(BSP_SECTION_APPLICATION_VECTORS) =
+{
+    [0] = sci_uart_rxi_isr,         /* SCI0 RXI (Receive data full) */
+    [1] = sci_uart_txi_isr,         /* SCI0 TXI (Transmit data empty) */
+    [2] = sci_uart_tei_isr,         /* SCI0 TEI (Transmit end) */
+    [3] = sci_uart_eri_isr,         /* SCI0 ERI (Receive error) */
+    [4] = sci_uart_rxi_isr,         /* SCI7 RXI (Received data full) */
+    [5] = sci_uart_txi_isr,         /* SCI7 TXI (Transmit data empty) */
+    [6] = sci_uart_tei_isr,         /* SCI7 TEI (Transmit end) */
+    [7] = sci_uart_eri_isr,         /* SCI7 ERI (Receive error) */
+    [8] = sci_uart_rxi_isr,         /* SCI9 RXI (Received data full) */
+    [9] = sci_uart_txi_isr,         /* SCI9 TXI (Transmit data empty) */
+    [10] = sci_uart_tei_isr,        /* SCI9 TEI (Transmit end) */
+    [11] = sci_uart_eri_isr,        /* SCI9 ERI (Receive error) */
+    [12] = rtc_alarm_periodic_isr,  /* RTC ALARM (Alarm interrupt) */
+    [13] = rtc_alarm_periodic_isr,  /* RTC PERIOD (Periodic interrupt) */
+    [14] = rtc_carry_isr,           /* RTC CARRY (Carry interrupt) */
+    [15] = agt_int_isr,             /* AGT0 INT (AGT interrupt) */
+    [16] = r_icu_isr,               /* ICU IRQ0 (External pin interrupt 0) */
+    [17] = r_icu_isr,               /* ICU IRQ1 (External pin interrupt 1) */
+    [18] = r_icu_isr,               /* ICU IRQ2 (External pin interrupt 2) */
+    [19] = r_icu_isr,               /* ICU IRQ3 (External pin interrupt 3) */
+    [20] = r_icu_isr,               /* ICU IRQ4 (External pin interrupt 4) */
+    [21] = r_icu_isr,               /* ICU IRQ5 (External pin interrupt 5) */
+    [22] = r_icu_isr,               /* ICU IRQ6 (External pin interrupt 6) */
+    [23] = r_icu_isr,               /* ICU IRQ7 (External pin interrupt 7) */
+    [24] = r_icu_isr,               /* ICU IRQ8 (External pin interrupt 8) */
+    [25] = r_icu_isr,               /* ICU IRQ9 (External pin interrupt 9) */
+    [26] = r_icu_isr,               /* ICU IRQ10 (External pin interrupt 10) */
+    [27] = r_icu_isr,               /* ICU IRQ11 (External pin interrupt 11) */
+    [28] = r_icu_isr,               /* ICU IRQ12 (External pin interrupt 12) */
+    [29] = r_icu_isr,               /* ICU IRQ13 (External pin interrupt 13) */
+    [30] = r_icu_isr,               /* ICU IRQ14 (External pin interrupt 14) */
+    [31] = r_icu_isr,               /* ICU IRQ15 (External pin interrupt 15) */
+    [32] = spi_rxi_isr,             /* SPI0 RXI (Receive buffer full) */
+    [33] = spi_txi_isr,             /* SPI0 TXI (Transmit buffer empty) */
+    [34] = spi_tei_isr,             /* SPI0 TEI (Transmission complete event) */
+    [35] = spi_eri_isr,             /* SPI0 ERI (Error) */
+    [36] = spi_rxi_isr,             /* SPI1 RXI (Receive buffer full) */
+    [37] = spi_txi_isr,             /* SPI1 TXI (Transmit buffer empty) */
+    [38] = spi_tei_isr,             /* SPI1 TEI (Transmission complete event) */
+    [39] = spi_eri_isr,             /* SPI1 ERI (Error) */
+    [40] = iic_master_rxi_isr,      /* IIC2 RXI (Receive data full) */
+    [41] = iic_master_txi_isr,      /* IIC2 TXI (Transmit data empty) */
+    [42] = iic_master_tei_isr,      /* IIC2 TEI (Transmit end) */
+    [43] = iic_master_eri_isr,      /* IIC2 ERI (Transfer error) */
+};
+const bsp_interrupt_event_t g_interrupt_event_link_select[BSP_ICU_VECTOR_MAX_ENTRIES] =
+{
+    [0] = BSP_PRV_IELS_ENUM(EVENT_SCI0_RXI),         /* SCI0 RXI (Receive data full) */
+    [1] = BSP_PRV_IELS_ENUM(EVENT_SCI0_TXI),         /* SCI0 TXI (Transmit data empty) */
+    [2] = BSP_PRV_IELS_ENUM(EVENT_SCI0_TEI),         /* SCI0 TEI (Transmit end) */
+    [3] = BSP_PRV_IELS_ENUM(EVENT_SCI0_ERI),         /* SCI0 ERI (Receive error) */
+    [4] = BSP_PRV_IELS_ENUM(EVENT_SCI7_RXI),         /* SCI7 RXI (Received data full) */
+    [5] = BSP_PRV_IELS_ENUM(EVENT_SCI7_TXI),         /* SCI7 TXI (Transmit data empty) */
+    [6] = BSP_PRV_IELS_ENUM(EVENT_SCI7_TEI),         /* SCI7 TEI (Transmit end) */
+    [7] = BSP_PRV_IELS_ENUM(EVENT_SCI7_ERI),         /* SCI7 ERI (Receive error) */
+    [8] = BSP_PRV_IELS_ENUM(EVENT_SCI9_RXI),         /* SCI9 RXI (Received data full) */
+    [9] = BSP_PRV_IELS_ENUM(EVENT_SCI9_TXI),         /* SCI9 TXI (Transmit data empty) */
+    [10] = BSP_PRV_IELS_ENUM(EVENT_SCI9_TEI),        /* SCI9 TEI (Transmit end) */
+    [11] = BSP_PRV_IELS_ENUM(EVENT_SCI9_ERI),        /* SCI9 ERI (Receive error) */
+    [12] = BSP_PRV_IELS_ENUM(EVENT_RTC_ALARM),       /* RTC ALARM (Alarm interrupt) */
+    [13] = BSP_PRV_IELS_ENUM(EVENT_RTC_PERIOD),      /* RTC PERIOD (Periodic interrupt) */
+    [14] = BSP_PRV_IELS_ENUM(EVENT_RTC_CARRY),       /* RTC CARRY (Carry interrupt) */
+    [15] = BSP_PRV_IELS_ENUM(EVENT_AGT0_INT),        /* AGT0 INT (AGT interrupt) */
+    [16] = BSP_PRV_IELS_ENUM(EVENT_ICU_IRQ0),        /* ICU IRQ0 (External pin interrupt 0) */
+    [17] = BSP_PRV_IELS_ENUM(EVENT_ICU_IRQ1),        /* ICU IRQ1 (External pin interrupt 1) */
+    [18] = BSP_PRV_IELS_ENUM(EVENT_ICU_IRQ2),        /* ICU IRQ2 (External pin interrupt 2) */
+    [19] = BSP_PRV_IELS_ENUM(EVENT_ICU_IRQ3),        /* ICU IRQ3 (External pin interrupt 3) */
+    [20] = BSP_PRV_IELS_ENUM(EVENT_ICU_IRQ4),        /* ICU IRQ4 (External pin interrupt 4) */
+    [21] = BSP_PRV_IELS_ENUM(EVENT_ICU_IRQ5),        /* ICU IRQ5 (External pin interrupt 5) */
+    [22] = BSP_PRV_IELS_ENUM(EVENT_ICU_IRQ6),        /* ICU IRQ6 (External pin interrupt 6) */
+    [23] = BSP_PRV_IELS_ENUM(EVENT_ICU_IRQ7),        /* ICU IRQ7 (External pin interrupt 7) */
+    [24] = BSP_PRV_IELS_ENUM(EVENT_ICU_IRQ8),        /* ICU IRQ8 (External pin interrupt 8) */
+    [25] = BSP_PRV_IELS_ENUM(EVENT_ICU_IRQ9),        /* ICU IRQ9 (External pin interrupt 9) */
+    [26] = BSP_PRV_IELS_ENUM(EVENT_ICU_IRQ10),       /* ICU IRQ10 (External pin interrupt 10) */
+    [27] = BSP_PRV_IELS_ENUM(EVENT_ICU_IRQ11),       /* ICU IRQ11 (External pin interrupt 11) */
+    [28] = BSP_PRV_IELS_ENUM(EVENT_ICU_IRQ12),       /* ICU IRQ12 (External pin interrupt 12) */
+    [29] = BSP_PRV_IELS_ENUM(EVENT_ICU_IRQ13),       /* ICU IRQ13 (External pin interrupt 13) */
+    [30] = BSP_PRV_IELS_ENUM(EVENT_ICU_IRQ14),       /* ICU IRQ14 (External pin interrupt 14) */
+    [31] = BSP_PRV_IELS_ENUM(EVENT_ICU_IRQ15),       /* ICU IRQ15 (External pin interrupt 15) */
+    [32] = BSP_PRV_IELS_ENUM(EVENT_SPI0_RXI),        /* SPI0 RXI (Receive buffer full) */
+    [33] = BSP_PRV_IELS_ENUM(EVENT_SPI0_TXI),        /* SPI0 TXI (Transmit buffer empty) */
+    [34] = BSP_PRV_IELS_ENUM(EVENT_SPI0_TEI),        /* SPI0 TEI (Transmission complete event) */
+    [35] = BSP_PRV_IELS_ENUM(EVENT_SPI0_ERI),        /* SPI0 ERI (Error) */
+    [36] = BSP_PRV_IELS_ENUM(EVENT_SPI1_RXI),        /* SPI1 RXI (Receive buffer full) */
+    [37] = BSP_PRV_IELS_ENUM(EVENT_SPI1_TXI),        /* SPI1 TXI (Transmit buffer empty) */
+    [38] = BSP_PRV_IELS_ENUM(EVENT_SPI1_TEI),        /* SPI1 TEI (Transmission complete event) */
+    [39] = BSP_PRV_IELS_ENUM(EVENT_SPI1_ERI),        /* SPI1 ERI (Error) */
+    [40] = BSP_PRV_IELS_ENUM(EVENT_IIC2_RXI),        /* IIC2 RXI (Receive data full) */
+    [41] = BSP_PRV_IELS_ENUM(EVENT_IIC2_TXI),        /* IIC2 TXI (Transmit data empty) */
+    [42] = BSP_PRV_IELS_ENUM(EVENT_IIC2_TEI),        /* IIC2 TEI (Transmit end) */
+    [43] = BSP_PRV_IELS_ENUM(EVENT_IIC2_ERI),        /* IIC2 ERI (Transfer error) */
+};
+#endif
diff --git a/ports/renesas-ra/boards/RA6M2_EK/ra_gen/vector_data.h b/ports/renesas-ra/boards/RA6M2_EK/ra_gen/vector_data.h
new file mode 100644
index 0000000000000..6629824be8a0c
--- /dev/null
+++ b/ports/renesas-ra/boards/RA6M2_EK/ra_gen/vector_data.h
@@ -0,0 +1,129 @@
+/* generated vector header file - do not edit */
+#ifndef VECTOR_DATA_H
+#define VECTOR_DATA_H
+/* Number of interrupts allocated */
+#ifndef VECTOR_DATA_IRQ_COUNT
+#define VECTOR_DATA_IRQ_COUNT    (44)
+#endif
+/* ISR prototypes */
+void sci_uart_rxi_isr(void);
+void sci_uart_txi_isr(void);
+void sci_uart_tei_isr(void);
+void sci_uart_eri_isr(void);
+void rtc_alarm_periodic_isr(void);
+void rtc_carry_isr(void);
+void agt_int_isr(void);
+void r_icu_isr(void);
+void spi_rxi_isr(void);
+void spi_txi_isr(void);
+void spi_tei_isr(void);
+void spi_eri_isr(void);
+void iic_master_rxi_isr(void);
+void iic_master_txi_isr(void);
+void iic_master_tei_isr(void);
+void iic_master_eri_isr(void);
+
+/* Vector table allocations */
+#define VECTOR_NUMBER_SCI0_RXI ((IRQn_Type)0)  /* SCI0 RXI (Receive data full) */
+#define VECTOR_NUMBER_SCI0_TXI ((IRQn_Type)1)  /* SCI0 TXI (Transmit data empty) */
+#define VECTOR_NUMBER_SCI0_TEI ((IRQn_Type)2)  /* SCI0 TEI (Transmit end) */
+#define VECTOR_NUMBER_SCI0_ERI ((IRQn_Type)3)  /* SCI0 ERI (Receive error) */
+#define VECTOR_NUMBER_SCI7_RXI ((IRQn_Type)4)  /* SCI7 RXI (Received data full) */
+#define VECTOR_NUMBER_SCI7_TXI ((IRQn_Type)5)  /* SCI7 TXI (Transmit data empty) */
+#define VECTOR_NUMBER_SCI7_TEI ((IRQn_Type)6)  /* SCI7 TEI (Transmit end) */
+#define VECTOR_NUMBER_SCI7_ERI ((IRQn_Type)7)  /* SCI7 ERI (Receive error) */
+#define VECTOR_NUMBER_SCI9_RXI ((IRQn_Type)8)  /* SCI9 RXI (Received data full) */
+#define VECTOR_NUMBER_SCI9_TXI ((IRQn_Type)9)  /* SCI9 TXI (Transmit data empty) */
+#define VECTOR_NUMBER_SCI9_TEI ((IRQn_Type)10)  /* SCI9 TEI (Transmit end) */
+#define VECTOR_NUMBER_SCI9_ERI ((IRQn_Type)11)  /* SCI9 ERI (Receive error) */
+#define VECTOR_NUMBER_RTC_ALARM ((IRQn_Type)12)  /* RTC ALARM (Alarm interrupt) */
+#define VECTOR_NUMBER_RTC_PERIOD ((IRQn_Type)13)  /* RTC PERIOD (Periodic interrupt) */
+#define VECTOR_NUMBER_RTC_CARRY ((IRQn_Type)14)  /* RTC CARRY (Carry interrupt) */
+#define VECTOR_NUMBER_AGT0_INT ((IRQn_Type)15)  /* AGT0 INT (AGT interrupt) */
+#define VECTOR_NUMBER_ICU_IRQ0 ((IRQn_Type)16)  /* ICU IRQ0 (External pin interrupt 0) */
+#define VECTOR_NUMBER_ICU_IRQ1 ((IRQn_Type)17)  /* ICU IRQ1 (External pin interrupt 1) */
+#define VECTOR_NUMBER_ICU_IRQ2 ((IRQn_Type)18)  /* ICU IRQ2 (External pin interrupt 2) */
+#define VECTOR_NUMBER_ICU_IRQ3 ((IRQn_Type)19)  /* ICU IRQ3 (External pin interrupt 3) */
+#define VECTOR_NUMBER_ICU_IRQ4 ((IRQn_Type)20)  /* ICU IRQ4 (External pin interrupt 4) */
+#define VECTOR_NUMBER_ICU_IRQ5 ((IRQn_Type)21)  /* ICU IRQ5 (External pin interrupt 5) */
+#define VECTOR_NUMBER_ICU_IRQ6 ((IRQn_Type)22)  /* ICU IRQ6 (External pin interrupt 6) */
+#define VECTOR_NUMBER_ICU_IRQ7 ((IRQn_Type)23)  /* ICU IRQ7 (External pin interrupt 7) */
+#define VECTOR_NUMBER_ICU_IRQ8 ((IRQn_Type)24)  /* ICU IRQ8 (External pin interrupt 8) */
+#define VECTOR_NUMBER_ICU_IRQ9 ((IRQn_Type)25)  /* ICU IRQ9 (External pin interrupt 9) */
+#define VECTOR_NUMBER_ICU_IRQ10 ((IRQn_Type)26)  /* ICU IRQ10 (External pin interrupt 10) */
+#define VECTOR_NUMBER_ICU_IRQ11 ((IRQn_Type)27)  /* ICU IRQ11 (External pin interrupt 11) */
+#define VECTOR_NUMBER_ICU_IRQ12 ((IRQn_Type)28)  /* ICU IRQ12 (External pin interrupt 12) */
+#define VECTOR_NUMBER_ICU_IRQ13 ((IRQn_Type)29)  /* ICU IRQ13 (External pin interrupt 13) */
+#define VECTOR_NUMBER_ICU_IRQ14 ((IRQn_Type)30)  /* ICU IRQ14 (External pin interrupt 14) */
+#define VECTOR_NUMBER_ICU_IRQ15 ((IRQn_Type)31)  /* ICU IRQ15 (External pin interrupt 15) */
+#define VECTOR_NUMBER_SPI0_RXI ((IRQn_Type)32)  /* SPI0 RXI (Receive buffer full) */
+#define VECTOR_NUMBER_SPI0_TXI ((IRQn_Type)33)  /* SPI0 TXI (Transmit buffer empty) */
+#define VECTOR_NUMBER_SPI0_TEI ((IRQn_Type)34)  /* SPI0 TEI (Transmission complete event) */
+#define VECTOR_NUMBER_SPI0_ERI ((IRQn_Type)35)  /* SPI0 ERI (Error) */
+#define VECTOR_NUMBER_SPI1_RXI ((IRQn_Type)36)  /* SPI1 RXI (Receive buffer full) */
+#define VECTOR_NUMBER_SPI1_TXI ((IRQn_Type)37)  /* SPI1 TXI (Transmit buffer empty) */
+#define VECTOR_NUMBER_SPI1_TEI ((IRQn_Type)38)  /* SPI1 TEI (Transmission complete event) */
+#define VECTOR_NUMBER_SPI1_ERI ((IRQn_Type)39)  /* SPI1 ERI (Error) */
+#define VECTOR_NUMBER_IIC2_RXI ((IRQn_Type)40)  /* IIC2 RXI (Receive data full) */
+#define VECTOR_NUMBER_IIC2_TXI ((IRQn_Type)41)  /* IIC2 TXI (Transmit data empty) */
+#define VECTOR_NUMBER_IIC2_TEI ((IRQn_Type)42)  /* IIC2 TEI (Transmit end) */
+#define VECTOR_NUMBER_IIC2_ERI ((IRQn_Type)43)  /* IIC2 ERI (Transfer error) */
+typedef enum IRQn
+{
+    Reset_IRQn = -15,
+    NonMaskableInt_IRQn = -14,
+    HardFault_IRQn = -13,
+    MemoryManagement_IRQn = -12,
+    BusFault_IRQn = -11,
+    UsageFault_IRQn = -10,
+    SecureFault_IRQn = -9,
+    SVCall_IRQn = -5,
+    DebugMonitor_IRQn = -4,
+    PendSV_IRQn = -2,
+    SysTick_IRQn = -1,
+    SCI0_RXI_IRQn = 0, /* SCI0 RXI (Receive data full) */
+    SCI0_TXI_IRQn = 1, /* SCI0 TXI (Transmit data empty) */
+    SCI0_TEI_IRQn = 2, /* SCI0 TEI (Transmit end) */
+    SCI0_ERI_IRQn = 3, /* SCI0 ERI (Receive error) */
+    SCI7_RXI_IRQn = 4, /* SCI7 RXI (Received data full) */
+    SCI7_TXI_IRQn = 5, /* SCI7 TXI (Transmit data empty) */
+    SCI7_TEI_IRQn = 6, /* SCI7 TEI (Transmit end) */
+    SCI7_ERI_IRQn = 7, /* SCI7 ERI (Receive error) */
+    SCI9_RXI_IRQn = 8, /* SCI9 RXI (Received data full) */
+    SCI9_TXI_IRQn = 9, /* SCI9 TXI (Transmit data empty) */
+    SCI9_TEI_IRQn = 10, /* SCI9 TEI (Transmit end) */
+    SCI9_ERI_IRQn = 11, /* SCI9 ERI (Receive error) */
+    RTC_ALARM_IRQn = 12, /* RTC ALARM (Alarm interrupt) */
+    RTC_PERIOD_IRQn = 13, /* RTC PERIOD (Periodic interrupt) */
+    RTC_CARRY_IRQn = 14, /* RTC CARRY (Carry interrupt) */
+    AGT0_INT_IRQn = 15, /* AGT0 INT (AGT interrupt) */
+    ICU_IRQ0_IRQn = 16, /* ICU IRQ0 (External pin interrupt 0) */
+    ICU_IRQ1_IRQn = 17, /* ICU IRQ1 (External pin interrupt 1) */
+    ICU_IRQ2_IRQn = 18, /* ICU IRQ2 (External pin interrupt 2) */
+    ICU_IRQ3_IRQn = 19, /* ICU IRQ3 (External pin interrupt 3) */
+    ICU_IRQ4_IRQn = 20, /* ICU IRQ4 (External pin interrupt 4) */
+    ICU_IRQ5_IRQn = 21, /* ICU IRQ5 (External pin interrupt 5) */
+    ICU_IRQ6_IRQn = 22, /* ICU IRQ6 (External pin interrupt 6) */
+    ICU_IRQ7_IRQn = 23, /* ICU IRQ7 (External pin interrupt 7) */
+    ICU_IRQ8_IRQn = 24, /* ICU IRQ8 (External pin interrupt 8) */
+    ICU_IRQ9_IRQn = 25, /* ICU IRQ9 (External pin interrupt 9) */
+    ICU_IRQ10_IRQn = 26, /* ICU IRQ10 (External pin interrupt 10) */
+    ICU_IRQ11_IRQn = 27, /* ICU IRQ11 (External pin interrupt 11) */
+    ICU_IRQ12_IRQn = 28, /* ICU IRQ12 (External pin interrupt 12) */
+    ICU_IRQ13_IRQn = 29, /* ICU IRQ13 (External pin interrupt 13) */
+    ICU_IRQ14_IRQn = 30, /* ICU IRQ14 (External pin interrupt 14) */
+    ICU_IRQ15_IRQn = 31, /* ICU IRQ15 (External pin interrupt 15) */
+    SPI0_RXI_IRQn = 32, /* SPI0 RXI (Receive buffer full) */
+    SPI0_TXI_IRQn = 33, /* SPI0 TXI (Transmit buffer empty) */
+    SPI0_TEI_IRQn = 34, /* SPI0 TEI (Transmission complete event) */
+    SPI0_ERI_IRQn = 35, /* SPI0 ERI (Error) */
+    SPI1_RXI_IRQn = 36, /* SPI1 RXI (Receive buffer full) */
+    SPI1_TXI_IRQn = 37, /* SPI1 TXI (Transmit buffer empty) */
+    SPI1_TEI_IRQn = 38, /* SPI1 TEI (Transmission complete event) */
+    SPI1_ERI_IRQn = 39, /* SPI1 ERI (Error) */
+    IIC2_RXI_IRQn = 40, /* IIC2 RXI (Receive data full) */
+    IIC2_TXI_IRQn = 41, /* IIC2 TXI (Transmit data empty) */
+    IIC2_TEI_IRQn = 42, /* IIC2 TEI (Transmit end) */
+    IIC2_ERI_IRQn = 43, /* IIC2 ERI (Transfer error) */
+} IRQn_Type;
+#endif /* VECTOR_DATA_H */
diff --git a/ports/renesas-ra/boards/RA6M2_EK/src/hal_entry.c b/ports/renesas-ra/boards/RA6M2_EK/src/hal_entry.c
new file mode 100644
index 0000000000000..c922cfd17ad9a
--- /dev/null
+++ b/ports/renesas-ra/boards/RA6M2_EK/src/hal_entry.c
@@ -0,0 +1,58 @@
+#include "hal_data.h"
+
+FSP_CPP_HEADER
+void R_BSP_WarmStart(bsp_warm_start_event_t event);
+FSP_CPP_FOOTER
+
+void ra_main(uint32_t reset_mode);
+
+/*******************************************************************************************************************//**
+ * main() is generated by the RA Configuration editor and is used to generate threads if an RTOS is used.  This function
+ * is called by main() when no RTOS is used.
+ **********************************************************************************************************************/
+void hal_entry(void) {
+    /* TODO: add your own code here */
+
+    ra_main(1);
+
+    #if BSP_TZ_SECURE_BUILD
+    /* Enter non-secure code */
+    R_BSP_NonSecureEnter();
+    #endif
+}
+
+/*******************************************************************************************************************//**
+ * This function is called at various points during the startup process.  This implementation uses the event that is
+ * called right before main() to set up the pins.
+ *
+ * @param[in]  event    Where at in the start up process the code is currently at
+ **********************************************************************************************************************/
+void R_BSP_WarmStart(bsp_warm_start_event_t event) {
+    if (BSP_WARM_START_RESET == event) {
+        #if BSP_FEATURE_FLASH_LP_VERSION != 0
+
+        /* Enable reading from data flash. */
+        R_FACI_LP->DFLCTL = 1U;
+
+        /* Would normally have to wait tDSTOP(6us) for data flash recovery. Placing the enable here, before clock and
+         * C runtime initialization, should negate the need for a delay since the initialization will typically take more than 6us. */
+        #endif
+    }
+
+    if (BSP_WARM_START_POST_C == event) {
+        /* C runtime environment and system clocks are setup. */
+
+        /* Configure pins. */
+        R_IOPORT_Open(&g_ioport_ctrl, &g_bsp_pin_cfg);
+    }
+}
+
+#if BSP_TZ_SECURE_BUILD
+
+BSP_CMSE_NONSECURE_ENTRY void template_nonsecure_callable();
+
+/* Trustzone Secure Projects require at least one nonsecure callable function in order to build (Remove this if it is not required to build). */
+BSP_CMSE_NONSECURE_ENTRY void template_nonsecure_callable() {
+
+}
+#endif
diff --git a/ports/renesas-ra/boards/deploy.md b/ports/renesas-ra/boards/deploy.md
new file mode 100644
index 0000000000000..1d0703999fb91
--- /dev/null
+++ b/ports/renesas-ra/boards/deploy.md
@@ -0,0 +1,22 @@
+### Renesas RA Family Board via J-Flash Lite
+
+You can download [J-Link Software and Documentation pack](https://www.segger.com/downloads/jlink/) that includes a flash programming tool `J-Flash Lite`.
+
+A `.hex` file can be flashed using `J-Flash Lite`.
+
+1. Start `J-Flash Lite`.
+2. Select devce name for board.
+
+    |      BOARD	       |      DEVICE NAME       |
+    | :------------------: | :--------------------: |
+    |   RA4M1 Clicker	   |       R7FA4M1AB        |
+    |   EK-RA6M2	       |       R7FA6M2AF        |
+    |   EK-RA4M1	       |       R7FA4M1AB        |
+    |   EK-RA6M1	       |       R7FA6M1AD        |
+    |   EK-RA4W1	       |       R7FA4W1AD2CNG    |
+
+3. press `OK`.  
+4. Select `firmware.hex` file for Data File .
+5. Press `Program Device`.
+
+Please refer to the [Renesas MicroPython Wiki](https://github.com/renesas/micropython/wiki) about cable connection between the board and your PC and more information.
\ No newline at end of file
diff --git a/ports/renesas-ra/boards/make-pins.py b/ports/renesas-ra/boards/make-pins.py
new file mode 100644
index 0000000000000..98d7026c21c6c
--- /dev/null
+++ b/ports/renesas-ra/boards/make-pins.py
@@ -0,0 +1,333 @@
+#!/usr/bin/env python
+"""Creates the pin file for the RAxxx."""
+
+from __future__ import print_function
+
+import argparse
+import sys
+import csv
+
+
+class PinAD(object):
+    def __init__(self, name, cpu_pin_name, pin_idx, bit, channel):
+        self._name = name
+        self._cpu_pin_name = cpu_pin_name
+        self._pin_idx = pin_idx
+        self._bit = bit
+        self._channel = channel
+
+    def cpu_pin_name(self):
+        return self._cpu_pin_name
+
+    def name(self):
+        return self._name
+
+    def bit(self):
+        return self._bit
+
+    def channel(self):
+        return self._channel
+
+    def print(self):
+        print(
+            "const pin_ad_obj_t pin_{:s}_ad_obj = PIN_AD({:s}, {:d}, {:d}, {:d});".format(
+                self._cpu_pin_name, self._name, self._pin_idx, self._bit, self._channel
+            )
+        )
+        print("")
+
+    def print_header(self, hdr_file):
+        n = self.cpu_pin_name()
+        hdr_file.write("extern const pin_ad_obj_t pin_{:s}_ad_obj;\n".format(n))
+        hdr_file.write("#define pin_{:s}_ad (&pin_{:s}_ad_obj)\n".format(n, n))
+
+    def qstr_list(self):
+        return [self._name]
+
+
+class Pin(object):
+    def __init__(self, name, port, bit):
+        self._name = name
+        self._pin_idx = port * 16 + bit
+        self._pin_ad = []
+        self._board_pin = False
+        # print('// pin_{:s}_obj = PIN({:s}, {:d});'.format(self.name, self.name, self.pin))
+
+    def cpu_pin_name(self):
+        return self._name
+
+    def pin_ad(self):
+        return self._pin_ad
+
+    def is_board_pin(self):
+        return self._board_pin
+
+    def set_is_board_pin(self):
+        self._board_pin = True
+
+    def parse_ad(self, ad_str):
+        ad_bit = 0
+        ad_channel = 0
+        if (len(ad_str) == 5) and (ad_str[:3] == "AN0"):
+            ad_bit = 12
+            ad_channel = int(ad_str[2:])
+            self._pin_ad.append(PinAD(ad_str, self._name, self._pin_idx, ad_bit, ad_channel))
+        elif (len(ad_str) == 5) and (ad_str[:3] == "AN1"):
+            ad_bit = 12
+            ad_channel = int(ad_str[2:])
+            self._pin_ad.append(PinAD(ad_str, self._name, self._pin_idx, ad_bit, ad_channel))
+        elif ad_str[:2] == "AN":
+            ad_bit = 8
+            ad_channel = int(ad_str[2:4])
+            self._pin_ad.append(PinAD(ad_str, self._name, self._pin_idx, ad_bit, ad_channel))
+
+    def print(self):
+        pin_ad_name = "NULL"
+        for pin_ad in self._pin_ad:
+            pin_ad.print()
+            pin_ad_name = "pin_{:s}_ad".format(pin_ad.cpu_pin_name())
+        print(
+            "const machine_pin_obj_t pin_{:s}_obj = PIN({:s}, {:d}, {:s});".format(
+                self._name, self._name, self._pin_idx, pin_ad_name
+            )
+        )
+        print("")
+
+    def print_header(self, hdr_file):
+        n = self.cpu_pin_name()
+        hdr_file.write("extern const machine_pin_obj_t pin_{:s}_obj;\n".format(n))
+        hdr_file.write("#define pin_{:s} (&pin_{:s}_obj)\n".format(n, n))
+
+    def qstr_list(self):
+        result = []
+        for pin_ad in self._pin_ad:
+            result += pin_ad.qstr_list()
+        # for alt_fn in self.alt_fn:
+        #    if alt_fn.is_supported():
+        #        result += alt_fn.qstr_list()
+        return result
+
+
+class NamedPin(object):
+    def __init__(self, name, pin):
+        self._name = name
+        self._pin = pin
+        # print('// NamedPin {:s}'.format(self._name))
+
+    def pin(self):
+        return self._pin
+
+    def name(self):
+        return self._name
+
+
+class Pins(object):
+    def __init__(self):
+        self.cpu_pins = []  # list of NamedPin objects
+        self.board_pins = []  # list of NamedPin objects
+
+    def find_pin(self, cpu_pin_name):
+        for named_pin in self.cpu_pins:
+            pin = named_pin.pin()
+            if pin.cpu_pin_name() == cpu_pin_name:
+                return pin
+
+    # rx63n_al.csv
+    # cpu_pin_name, cpu_pin_port, cpu_pin_bit
+    def parse_af_file(self, filename):
+        with open(filename, "r") as csvfile:
+            rows = csv.reader(csvfile)
+            for row in rows:
+                try:
+                    cpu_pin_name = row[0]
+                    cpu_pin_port = int(row[1])
+                    cpu_pin_bit = int(row[2])
+                except:
+                    continue
+                pin = Pin(cpu_pin_name, cpu_pin_port, cpu_pin_bit)
+                self.cpu_pins.append(NamedPin(cpu_pin_name, pin))
+                pin.parse_ad(row[3])
+
+    # pins.csv
+    # named_pin, cpu_pin_name
+    def parse_board_file(self, filename):
+        with open(filename, "r") as csvfile:
+            rows = csv.reader(csvfile)
+            for row in rows:
+                try:
+                    board_pin_name = row[0]
+                    cpu_pin_name = row[1]
+                except:
+                    continue
+                pin = self.find_pin(cpu_pin_name)
+                if pin:
+                    pin.set_is_board_pin()
+                    self.board_pins.append(NamedPin(board_pin_name, pin))
+
+    def print_named(self, label, named_pins):
+        print(
+            "STATIC const mp_rom_map_elem_t pin_{:s}_pins_locals_dict_table[] = {{".format(label)
+        )
+        for named_pin in named_pins:
+            pin = named_pin.pin()
+            if pin.is_board_pin():
+                print(
+                    "  {{ MP_ROM_QSTR(MP_QSTR_{:s}), MP_ROM_PTR(&pin_{:s}_obj) }},".format(
+                        named_pin.name(), pin.cpu_pin_name()
+                    )
+                )
+        print("};")
+        print(
+            "MP_DEFINE_CONST_DICT(pin_{:s}_pins_locals_dict, pin_{:s}_pins_locals_dict_table);".format(
+                label, label
+            )
+        )
+
+    def print(self):
+        for named_pin in self.cpu_pins:
+            pin = named_pin.pin()
+            if pin.is_board_pin():
+                pin.print()
+        self.print_named("cpu", self.cpu_pins)
+        print("")
+        self.print_named("board", self.board_pins)
+
+    def print_header(self, hdr_filename):
+        with open(hdr_filename, "wt") as hdr_file:
+            for named_pin in self.cpu_pins:
+                pin = named_pin.pin()
+                if pin.is_board_pin():
+                    pin.print_header(hdr_file)
+                pin_ads = pin.pin_ad()
+                for pin_ad in pin_ads:
+                    pin_ad.print_header(hdr_file)
+            # provide #define's mapping board to cpu name
+            for named_pin in self.board_pins:
+                hdr_file.write(
+                    "#define pyb_pin_{:s} pin_{:s}\n".format(
+                        named_pin.name(), named_pin.pin().cpu_pin_name()
+                    )
+                )
+
+    def print_qstr(self, qstr_filename):
+        with open(qstr_filename, "wt") as qstr_file:
+            qstr_set = set([])
+            for named_pin in self.cpu_pins:
+                pin = named_pin.pin()
+                if pin.is_board_pin():
+                    qstr_set |= set(pin.qstr_list())
+                    qstr_set |= set([named_pin.name()])
+            for named_pin in self.board_pins:
+                qstr_set |= set([named_pin.name()])
+            for qstr in sorted(qstr_set):
+                cond_var = None
+                if qstr.startswith("AF"):
+                    af_words = qstr.split("_")
+                    cond_var = conditional_var(af_words[1])
+                    print_conditional_if(cond_var, file=qstr_file)
+                print("Q({})".format(qstr), file=qstr_file)
+                # print_conditional_endif(cond_var, file=qstr_file)
+
+    def print_ad_hdr(self, ad_const_filename):
+        with open(ad_const_filename, "wt") as ad_const_file:
+            for named_pin in self.cpu_pins:
+                pin = named_pin.pin()
+                if pin.is_board_pin():
+                    pin_ads = pin.pin_ad()
+                    for pin_ad in pin_ads:
+                        ad_const_file.write(
+                            "  {{ MP_ROM_QSTR(MP_QSTR_{:s}), MP_ROM_INT(GPIO_{:s}) }}, \n".format(
+                                pin_ad.name(), pin_ad.name()
+                            )
+                        )
+
+
+def main():
+    parser = argparse.ArgumentParser(
+        prog="make-pins.py",
+        usage="%(prog)s [options] [command]",
+        description="Generate board specific pin file",
+    )
+    parser.add_argument(
+        "-a",
+        "--af",
+        dest="af_filename",
+        help="Specifies the alternate function file for the chip",
+        default="ra4m1_af.csv",
+    )
+    parser.add_argument(
+        "-b", "--board", dest="board_filename", help="Specifies the board file", default="pins.csv"
+    )
+    parser.add_argument(
+        "-p",
+        "--prefix",
+        dest="prefix_filename",
+        help="Specifies beginning portion of generated pins file",
+        default="ra4m1_prefix.c",
+    )
+    parser.add_argument(
+        "--ad-const",
+        dest="ad_const_filename",
+        help="Specifies header file for AD function constants.",
+        default="build/pins_ad_const.h",
+    )
+    parser.add_argument(
+        "--af-const",
+        dest="af_const_filename",
+        help="Specifies header file for alternate function constants.",
+        default="build/pins_af_const.h",
+    )
+    parser.add_argument(
+        "--af-py",
+        dest="af_py_filename",
+        help="Specifies the filename for the python alternate function mappings.",
+        default="build/pins_af.py",
+    )
+    parser.add_argument(
+        "--af-defs",
+        dest="af_defs_filename",
+        help="Specifies the filename for the alternate function defines.",
+        default="build/pins_af_defs.h",
+    )
+    parser.add_argument(
+        "-q",
+        "--qstr",
+        dest="qstr_filename",
+        help="Specifies name of generated qstr header file",
+        default="build/pins_qstr.h",
+    )
+    parser.add_argument(
+        "-r",
+        "--hdr",
+        dest="hdr_filename",
+        help="Specifies name of generated pin header file",
+        default="build/pins.h",
+    )
+    args = parser.parse_args(sys.argv[1:])
+
+    pins = Pins()
+
+    print("// This file was automatically generated by make-pins.py")
+    print("//")
+    if args.af_filename:
+        print("// --af {:s}".format(args.af_filename))
+        pins.parse_af_file(args.af_filename)
+
+    if args.board_filename:
+        print("// --board {:s}".format(args.board_filename))
+        pins.parse_board_file(args.board_filename)
+
+    if args.prefix_filename:
+        print("// --prefix {:s}".format(args.prefix_filename))
+        print("")
+        with open(args.prefix_filename, "r") as prefix_file:
+            print(prefix_file.read())
+
+    pins.print()
+    pins.print_header(args.hdr_filename)
+    pins.print_qstr(args.qstr_filename)
+    pins.print_ad_hdr(args.ad_const_filename)
+
+
+if __name__ == "__main__":
+    main()
diff --git a/ports/renesas-ra/boards/manifest.py b/ports/renesas-ra/boards/manifest.py
new file mode 100644
index 0000000000000..836bf7ccc24dc
--- /dev/null
+++ b/ports/renesas-ra/boards/manifest.py
@@ -0,0 +1,4 @@
+include("$(MPY_DIR)/extmod/uasyncio/manifest.py")
+freeze("$(MPY_DIR)/drivers/dht", "dht.py")
+freeze("$(MPY_DIR)/drivers/onewire", "onewire.py")
+freeze("$(MPY_DIR)/drivers/sdcard", "sdcard.py")
diff --git a/ports/renesas-ra/boards/ra4m1_af.csv b/ports/renesas-ra/boards/ra4m1_af.csv
new file mode 100644
index 0000000000000..a942a490021d9
--- /dev/null
+++ b/ports/renesas-ra/boards/ra4m1_af.csv
@@ -0,0 +1,161 @@
+CPU_PIN,PORT_IDX,PORT_BIT,Analog,IRQ,AF0,AF1,AF2,AF3,AF4,AF5,AF6,AF7,AF8,AF9,AF10,AF11,AF12,AF13,AF14,AF15,AF16,AF17,AF18,AF19
+P000,0,0,AN000,,,,,,,,,,,,,,,,,,,,,
+P001,0,1,AN001,,,,,,,,,,,,,,,,,,,,,
+P002,0,2,AN002,,,,,,,,,,,,,,,,,,,,,
+P003,0,3,AN003,,,,,,,,,,,,,,,,,,,,,
+P004,0,4,AN004,,,,,,,,,,,,,,,,,,,,,
+P005,0,5,AN011,,,,,,,,,,,,,,,,,,,,,
+P006,0,6,AN012,,,,,,,,,,,,,,,,,,,,,
+P007,0,7,AN013,,,,,,,,,,,,,,,,,,,,,
+P008,0,8,AN014,,,,,,,,,,,,,,,,,,,,,
+-,0,9,,,,,,,,,,,,,,,,,,,,,,
+P010,0,10,AN005,,,,,,,,,,,,,,,,,,,,,
+P011,0,11,AN006,,,,,,,,,,,,,,,,,,,,,
+P012,0,12,AN007,,,,,,,,,,,,,,,,,,,,,
+P013,0,13,AN008,,,,,,,,,,,,,,,,,,,,,
+P014,0,14,AN009,,,,,,,,,,,,,,,,,,,,,
+P015,0,15,AN010,,,,,,,,,,,,,,,,,,,,,
+P100,1,0,AN022,IRQ2,,AGTIO0,GTETRGA,GTIOC5B,RXD0/MISO0/SCL0,SCK1,MISOA,SCL1,KR00,,,,,VL1,,,,,,
+P101,1,1,AN021,IRQ1,,AGTEE0,GTETRGB,GTIOC5A,TXD0/MOSI0/SDA0,CTS1_RTS1/SS1,MOSIA,SDA1,KR01,,,,,VL2,,,,,,
+P102,1,2,AN020,,,AGTO0,GTOWLO,GTIOC2B,SCK0,TXD2/MOSI2/SDA2,RSPCKA,,KR02,,ADTRG0,,,VL3,,,CRX0,,,
+P103,1,3,AN019,,,,GTOWUP,GTIOC2A,CTS0_RTS0/SS0,,SSLA0,,KR03,,,,,VL4,,,CTX0,,,
+P104,1,4,,IRQ1,,,GTETRGB,GTIOC1B,RXD0/MISO0/SCL0,,SSLA1,,KR04,,,,,COM0,,,,,,
+P105,1,5,,IRQ0,,,GTETRGA,GTIOC1A,,,SSLA2,,KR05,,,,,COM1,,,,,,
+P106,1,6,,,,,,GTIOC0B,,,SSLA3,,KR06,,,,,COM2,,,,,,
+P107,1,7,,,,,,GTIOC0A,,,,,KR07,,,,,COM3,,,,,,
+P108,1,8,,,TMS/SWDIO,,GTOULO,GTIOC0B,,CTS9_RTS9/SS9,SSLB0,,,,,,,,,,,,,
+P109,1,9,,,TDO/TRACESWO,,GTOVUP,GTIOC1A,SCK1,TXD9/MOSI9/SDA9,MOSIB,,,CLKOUT,,,TS10,SEG23,,,CTX0,,,
+P110,1,10,,IRQ3,TDI,,GTOVLO,GTIOC1B,CTS2_RTS2/SS2,RXD9/MISO9/SCL9,MISOB,,,VCOUT,,,,SEG24,,,CRX0,,,
+P111,1,11,,IRQ4,Hi-Z,,,GTIOC3A,SCK2,SCK9,RSPCKB,,,,,,TS12,CAPH,,,,,,
+P112,1,12,,,,,,GTIOC3B,TXD2/MOSI2/SDA2,SCK1,SSLB0,,,,,,TSCAP,CAPL,,,,,SSIBCK0,
+P113,1,13,,,,,,GTIOC2A,,,,,,,,,TS27,SEG00/COM4,,,,,SSILRCK0/SSIFS0,
+P114,1,14,,,,,,GTIOC2B,,,,,,,,,TS29,SEG25,,,,,SSIRXD0,
+P115,1,15,,,,,,GTIOC4A,,,,,,,,,TS35,SEG26,,,,,SSITXD0,
+P200,2,0,,NMI,,,,,,,,,,,,,,,,,,,,
+P201,2,1,,,MD,,,,,,,,,,,,,,,,,,,
+P202,2,2,,,,,,GTIOC5B,SCK2,RXD9/MISO9/SCL9,MISOB,,,,,,,SEG16,,,,,,
+P203,2,3,,,,,,GTIOC5A,CTS2_RTS2/SS2,TXD9/MOSI9/SDA9,MOSIB,,,,,,TSCAP,SEG15,,,,,,
+P204,2,4,,,,,,GTIOC4B,SCK0,SCK9,RSPCKB,SCL0,,,CACREF,,TS00,SEG14,,,,,,USB_OVRCURB
+P205,2,5,,IRQ1,,,,GTIOC4A,TXD0/MOSI0/SDA0,CTS9_RTS9/SS9,SSLB0,SCL1,,CLKOUT,,,TSCAP,SEG13,,,,,,USB_OVRCURA
+P206,2,6,,IRQ0,,,,,RXD0/MISO0/SCL0,,SSLB1,SDA1,,,,,TS01,SEG12,,,,,,USB_VBUSEN
+-,2,7,,,,,,,,,,,,,,,,,,,,,,
+-,2,8,,,,,,,,,,,,,,,,,,,,,,
+-,2,9,,,,,,,,,,,,,,,,,,,,,,
+-,2,10,,,,,,,,,,,,,,,,,,,,,,
+-,2,11,,,,,,,,,,,,,,,,,,,,,,
+P212,2,12,,IRQ3,,AGTEE1,GTETRGB,GTIOC0B,,RXD1/MISO1/SCL1,,,,,,,,,,,,,,
+P213,2,13,,IRQ2,,,GTETRGA,GTIOC0A,,TXD1/MOSI1/SDA1,,,,,,,,,,,,,,
+P214,2,14,,,,,,,,,,,,,,,,,,,,,,
+P215,2,15,,,,,,,,,,,,,,,,,,,,,,
+P300,3,0,,,TCK/SWCLK,,GTOUUP,GTIOC0A,,,SSLB1,,,,,,,,,,,,,
+P301,3,1,,IRQ6,,AGTIO0,GTOULO,GTIOC4B,RXD2/MISO2/SCL2,CTS9_RTS9/SS9,SSLB2,,,,,,TS09,SEG01/COM5,,,,,,
+P302,3,2,,IRQ5,,,GTOUUP,GTIOC4A,TXD2/MOSI2/SDA2,,SSLB3,,,,,,TS08,SEG02/COM6,,,,,,
+P303,3,3,,,,,,GTIOC7B,,,,,,,,,TS02,SEG03/COM7,,,,,,
+P304,3,4,,IRQ9,,,,GTIOC7A,,,,,,,,,TS11,SEG20,,,,,,
+P305,3,5,,IRQ8,,,,,,,,,,,,,,SEG19,,,,,,
+P306,3,6,,,,,,,,,,,,,,,,SEG18,,,,,,
+P307,3,7,,,,,,,,,,,,,,,,SEG17,,,,,,
+-,3,8,,,,,,,,,,,,,,,,,,,,,,
+-,3,8,,,,,,,,,,,,,,,,,,,,,,
+-,3,10,,,,,,,,,,,,,,,,,,,,,,
+-,3,11,,,,,,,,,,,,,,,,,,,,,,
+-,3,12,,,,,,,,,,,,,,,,,,,,,,
+-,3,13,,,,,,,,,,,,,,,,,,,,,,
+-,3,14,,,,,,,,,,,,,,,,,,,,,,
+-,3,15,,,,,,,,,,,,,,,,,,,,,,
+P400,4,0,,IRQ0,,AGTIO1,,GTIOC6A,SCK0,SCK1,,SCL0,,,CACREF,,TS20,SEG04,,,,,AUDIO_CLK,
+P401,4,1,,IRQ5,,,GTETRGA,GTIOC6B,CTS0_RTS0/SS0,TXD1/MOSI1/SDA1,,SDA0,,,,,TS19,SEG05,,,,,,
+P402,4,2,,IRQ4,,AGTIO0*2/AGTIO1*2,,,,RXD1/MISO1/SCL1,,,,,,,TS18,SEG06,,,,,,
+P403,4,3,,,,AGTIO0*2/AGTIO1*,,GTIOC3A,,CTS1_RTS1/SS1,,,,,,,TS17,,,,,,SSIBCK0,
+P404,4,4,,,,,,GTIOC3B,,,,,,,,,,,,,,,SSILRCK0/SSIFS0,
+P405,4,5,,,,,,GTIOC1A,,,,,,,,,,,,,,,SSITXD0,
+P406,4,6,,,,,,GTIOC1B,,,,,,,,,,,,,,,SSIRXD0,
+P407,4,7,,,,AGTIO0,,,CTS0_RTS0/SS0,,SSLB3,SDA0,,RTCOUT,ADTRG0,,TS03,SEG11,,,,,,USB_VBUS
+P408,4,8,,IRQ7,,,GTOWLO,GTIOC5B,CTS1_RTS1/SS1,RXD9/MISO9/SCL9,,,,,,,TS04,SEG10,,,,,,USB_ID
+P409,4,9,,IRQ6,,,GTOWUP,GTIOC5A,,TXD9/MOSI9/SDA9,,,,,,,TS05,SEG09,,,,,,USB_EXICEN
+P410,4,10,,IRQ5,,AGTOB1,GTOVLO,GTIOC6B,RXD0/MISO0/SCL0,,MISOA,,,,,,TS06,SEG08,,,,,,
+P411,4,11,,IRQ4,,AGTOA1,GTOVUP,GTIOC6A,TXD0/MOSI0/SDA0,,MOSIA,,,,,,TS07,SEG07,,,,,,
+P412,4,12,,,,,,,SCK0,,RSPCKA,,,,,,,,,,,,,
+P413,4,13,,,,,,,CTS0_RTS0/SS0,,SSLA0,,,,,,,,,,,,,
+P414,4,14,,IRQ9,,,,GTIOC0B,,,SSLA1,,,,,,,,,,,,,
+P415,4,15,,IRQ8,,,,GTIOC0A,,,SSLA2,,,,,,,,,,,,,
+P500,5,0,AN016,,,AGTOA0,GTIU,GTIOC2A,,,,,,,,,,SEG34,,,,,,USB_VBUSEN
+P501,5,1,AN017,IRQ11,,AGTOB0,GTIV,GTIOC2B,TXD1/MOSI1/SDA1,,,,,,,,,SEG35,,,,,,USB_OVRCURA
+P502,5,2,AN018,IRQ12,,,GTIW,GTIOC3B,RXD1/MISO1/SCL1,,,,,,,,,SEG36,,,,,,USB_OVRCURB
+P503,5,3,AN023,,,,,,SCK1,,,,,,,,,SEG37,,,,,,USB_EXICEN
+P504,5,4,AN024,,,,,,CTS1_RTS1/SS1,,,,,,,,,,,,,,,USB_ID
+P505,5,5,AN025,IRQ14,,,,,,,,,,,,,,,,,,,,
+-,5,6,,,,,,,,,,,,,,,,,,,,,,
+-,5,7,,,,,,,,,,,,,,,,,,,,,,
+-,5,8,,,,,,,,,,,,,,,,,,,,,,
+-,5,9,,,,,,,,,,,,,,,,,,,,,,
+-,5,10,,,,,,,,,,,,,,,,,,,,,,
+-,5,11,,,,,,,,,,,,,,,,,,,,,,
+-,5,12,,,,,,,,,,,,,,,,,,,,,,
+-,5,13,,,,,,,,,,,,,,,,,,,,,,
+-,5,14,,,,,,,,,,,,,,,,,,,,,,
+-,5,15,,,,,,,,,,,,,,,,,,,,,,
+P600,6,0,,,,,,GTIOC6B,,SCK9,,,,,,,,SEG33,,,,,,
+P601,6,1,,,,,,GTIOC6A,,RXD9/MISO9/SCL9,,,,,,,,SEG32,,,,,,
+P602,6,2,,,,,,GTIOC7B,,TXD9/MOSI9/SDA9,,,,,,,,SEG31,,,,,,
+P603,6,3,,,,,,GTIOC7A,,CTS9_RTS9/SS9,,,,,,,,SEG30,,,,,,
+-,6,4,,,,,,,,,,,,,,,,,,,,,,
+-,6,5,,,,,,,,,,,,,,,,,,,,,,
+-,6,6,,,,,,,,,,,,,,,,,,,,,,
+-,6,7,,,,,,,,,,,,,,,,,,,,,,
+P608,6,8,,,,,,GTIOC4B,,,,,,,,,,SEG27,,,,,,
+P609,6,9,,,,,,GTIOC5A,,,,,,,,,,SEG28,,,,,,
+P610,6,10,,,,,,GTIOC5B,,,,,,,,,,SEG29,,,,,,
+-,6,11,,,,,,,,,,,,,,,,,,,,,,
+-,6,12,,,,,,,,,,,,,,,,,,,,,,
+-,6,13,,,,,,,,,,,,,,,,,,,,,,
+-,6,14,,,,,,,,,,,,,,,,,,,,,,
+-,6,15,,,,,,,,,,,,,,,,,,,,,,
+-,7,0,,,,,,,,,,,,,,,,,,,,,,
+-,7,1,,,,,,,,,,,,,,,,,,,,,,
+-,7,2,,,,,,,,,,,,,,,,,,,,,,
+-,7,3,,,,,,,,,,,,,,,,,,,,,,
+-,7,4,,,,,,,,,,,,,,,,,,,,,,
+-,7,5,,,,,,,,,,,,,,,,,,,,,,
+-,7,6,,,,,,,,,,,,,,,,,,,,,,
+-,7,7,,,,,,,,,,,,,,,,,,,,,,
+P708,7,8,,,,,,,,RXD1/MISO1/SCL1,SSLA3,,,,,,,,,,,,,
+-,7,9,,,,,,,,,,,,,,,,,,,,,,
+-,7,10,,,,,,,,,,,,,,,,,,,,,,
+-,7,11,,,,,,,,,,,,,,,,,,,,,,
+-,7,12,,,,,,,,,,,,,,,,,,,,,,
+-,7,13,,,,,,,,,,,,,,,,,,,,,,
+-,7,14,,,,,,,,,,,,,,,,,,,,,,
+-,7,15,,,,,,,,,,,,,,,,,,,,,,
+-,8,0,,,,,,,,,,,,,,,,,,,,,,
+-,8,1,,,,,,,,,,,,,,,,,,,,,,
+-,8,2,,,,,,,,,,,,,,,,,,,,,,
+-,8,3,,,,,,,,,,,,,,,,,,,,,,
+-,8,4,,,,,,,,,,,,,,,,,,,,,,
+-,8,5,,,,,,,,,,,,,,,,,,,,,,
+-,8,6,,,,,,,,,,,,,,,,,,,,,,
+-,8,7,,,,,,,,,,,,,,,,,,,,,,
+P808,8,8,,,,,,,,,,,,,,,,SEG21,,,,,,
+P809,8,9,,,,,,,,,,,,,,,,SEG22,,,,,,
+-,8,10,,,,,,,,,,,,,,,,,,,,,,
+-,8,11,,,,,,,,,,,,,,,,,,,,,,
+-,8,12,,,,,,,,,,,,,,,,,,,,,,
+-,8,13,,,,,,,,,,,,,,,,,,,,,,
+-,8,14,,,,,,,,,,,,,,,,,,,,,,
+-,8,15,,,,,,,,,,,,,,,,,,,,,,
+-,9,0,,,,,,,,,,,,,,,,,,,,,,
+-,9,1,,,,,,,,,,,,,,,,,,,,,,
+-,9,2,,,,,,,,,,,,,,,,,,,,,,
+-,9,3,,,,,,,,,,,,,,,,,,,,,,
+-,9,4,,,,,,,,,,,,,,,,,,,,,,
+-,9,5,,,,,,,,,,,,,,,,,,,,,,
+-,9,6,,,,,,,,,,,,,,,,,,,,,,
+-,9,7,,,,,,,,,,,,,,,,,,,,,,
+-,9,8,,,,,,,,,,,,,,,,,,,,,,
+-,9,9,,,,,,,,,,,,,,,,,,,,,,
+-,9,10,,,,,,,,,,,,,,,,,,,,,,
+-,9,11,,,,,,,,,,,,,,,,,,,,,,
+-,9,12,,,,,,,,,,,,,,,,,,,,,,
+-,9,13,,,,,,,,,,,,,,,,,,,,,,
+P914,9,14,,,,,,,,,,,,,,,,,,,,,,(USB_DP)
+P915,9,14,,,,,,,,,,,,,,,,,,,,,,(USB_DM)
diff --git a/ports/renesas-ra/boards/ra4w1_af.csv b/ports/renesas-ra/boards/ra4w1_af.csv
new file mode 100644
index 0000000000000..8820846bebd1c
--- /dev/null
+++ b/ports/renesas-ra/boards/ra4w1_af.csv
@@ -0,0 +1,161 @@
+CPU_PIN,PORT_IDX,PORT_BIT,Analog,IRQ,AF0,AF1,AF2,AF3,AF4,AF5,AF6,AF7,AF8,AF9,AF10,AF11,AF12,AF13,AF14,AF15,AF16,AF17,AF18,AF19
+-,0,0,,,,,,,,,,,,,,,,,,,,,,
+-,0,1,,,,,,,,,,,,,,,,,,,,,,
+-,0,2,,,,,,,,,,,,,,,,,,,,,,
+-,0,3,,,,,,,,,,,,,,,,,,,,,,
+P004,0,4,AN004,IRQ3,,,,,,,,,,,,,,,,,,,,
+-,0,5,,,,,,,,,,,,,,,,,,,,,,
+-,0,6,,,,,,,,,,,,,,,,,,,,,,
+-,0,7,,,,,,,,,,,,,,,,,,,,,,
+-,0,8,,,,,,,,,,,,,,,,,,,,,,
+-,0,9,,,,,,,,,,,,,,,,,,,,,,
+P010,0,10,AN005,IRQ14,,,,,,,,,,,,,,,,,,,,
+P011,0,11,AN006,IRQ15,,,,,,,,,,,,,,,,,,,,
+-,0,12,,,,,,,,,,,,,,,,,,,,,,
+-,0,13,,,,,,,,,,,,,,,,,,,,,,
+P014,0,14,AN009,,,,,,,,,,,,,,,,,,,,,
+P015,0,15,AN010,IRQ7,,,,,,,,,,,,,,,,,,,,
+P100,1,0,AN022,IRQ2,,AGTIO0,GTETRGA,GTIOC5B,RXD0/MISO0/SCL0,SCK1,MISOA,SCL1,KR00,,,,,VL1,,,,,,
+P101,1,1,AN021,IRQ1,,AGTEE0,GTETRGB,GTIOC5A,TXD0/MOSI0/SDA0,CTS1_RTS1/SS1,MOSIA,SDA1,KR01,,,,,VL2,,,,,,
+P102,1,2,AN020,,,AGTO0,GTOWLO,GTIOC2B,SCK0,TXD2/MOSI2/SDA2,RSPCKA,,KR02,,ADTRG0,,,VL3,,,CRX0,,,
+P103,1,3,AN019,,,,GTOWUP,GTIOC2A,CTS0_RTS0/SS0,,SSLA0,,KR03,,,,,VL4,,,CTX0,,,
+P104,1,4,,IRQ1,,,GTETRGB,GTIOC1B,RXD0/MISO0/SCL0,,SSLA1,,KR04,,,,TS13,COM0,,,,,,
+P105,1,5,,IRQ0,,,GTETRGA,GTIOC1A,,,SSLA2,,KR05,,,,TS34,COM1,,,,,,
+P106,1,6,,,,,,GTIOC0B,,,SSLA3,,KR06,,,,,COM2,,,,,,
+P107,1,7,,,,,,GTIOC0A,,,,,KR07,,,,,COM3,,,,,,
+P108,1,8,,,TMS/SWDIO,,GTOULO,GTIOC0B,,CTS9_RTS9/SS9,SSLB0,,,,,,,,,,,,,
+P109,1,9,,,TDO/TRACESWO,,GTOVUP,GTIOC1A,SCK1,TXD9/MOSI9/SDA9,MOSIB,,,CLKOUT,,,TS10,SEG23,,,CTX0,,,
+P110,1,10,,IRQ3,TDI,,GTOVLO,GTIOC1B,CTS2_RTS2/SS2,RXD9/MISO9/SCL9,MISOB,,,VCOUT,,,,SEG24,,,CRX0,,,
+P111,1,11,,IRQ4,Hi-Z,,,GTIOC3A,SCK2,SCK9,RSPCKB,,,,,,TS12,CAPH,,,,,,
+-,1,12,,,,,,,,,,,,,,,,,,,,,,
+-,1,13,,,,,,,,,,,,,,,,,,,,,,
+-,1,14,,,,,,,,,,,,,,,,,,,,,,
+-,1,15,,,,,,,,,,,,,,,,,,,,,,
+P200,2,0,,NMI,,,,,,,,,,,,,,,,,,,,
+P201,2,1,,,MD,,,,,,,,,,,,,,,,,,,
+-,2,2,,,,,,,,,,,,,,,,,,,,,,
+-,2,3,,,,,,,,,,,,,,,,,,,,,,
+P204,2,4,,,,AGTIO1,GTIW,GTIOC4B,SCK4,SCK9,RSPCKB,SCL0,,,CACREF,,TS00,SEG14,,,,,,USB_OVRCURB
+P205,2,5,,IRQ1,,AGTO1,GTIV,GTIOC4A,TXD4/MOSI4/SDA4,CTS9_RTS9/SS9,SSLB0,SCL1,,CLKOUT,,,TSCAP,SEG13,,,,,,USB_OVRCURA
+P206,2,6,,IRQ0,,,GTIU,,RXD4/MISO4/SCL4,,SSLB1,SDA1,,,,,TS01,SEG12,,,,,,USB_VBUSEN
+-,2,7,,,,,,,,,,,,,,,,,,,,,,
+-,2,8,,,,,,,,,,,,,,,,,,,,,,
+-,2,9,,,,,,,,,,,,,,,,,,,,,,
+-,2,10,,,,,,,,,,,,,,,,,,,,,,
+-,2,11,,,,,,,,,,,,,,,,,,,,,,
+P212,2,12,,IRQ3,,AGTEE1,GTETRGB,GTIOC0B,,RXD1/MISO1/SCL1,,,,,,,,,,,,,,
+P213,2,13,,IRQ2,,,GTETRGA,GTIOC0A,,TXD1/MOSI1/SDA1,,,,,,,,,,,,,,
+P214,2,14,,,,,,,,,,,,,,,,,,,,,,
+P215,2,15,,,,,,,,,,,,,,,,,,,,,,
+P300,3,0,,,TCK/SWCLK,,GTOUUP,GTIOC0A,,,SSLB1,,,,,,,,,,,,,
+-,3,1,,,,,,,,,,,,,,,,,,,,,,
+-,3,2,,,,,,,,,,,,,,,,,,,,,,
+-,3,3,,,,,,,,,,,,,,,,,,,,,,
+-,3,4,,,,,,,,,,,,,,,,,,,,,,
+-,3,5,,,,,,,,,,,,,,,,,,,,,,
+-,3,6,,,,,,,,,,,,,,,,,,,,,,
+-,3,7,,,,,,,,,,,,,,,,,,,,,,
+-,3,8,,, ,, , ,,, ,,,,,,,,,,,,,
+-,3,9,,,,,,,,,,,,,,,,,,,,,,
+-,3,10,,,,,,,,,,,,,,,,,,,,,,
+-,3,11,,,,,,,,,,,,,,,,,,,,,,
+-,3,12,,,,,,,,,,,,,,,,,,,,,,
+-,3,13,,,,,,,,,,,,,,,,,,,,,,
+-,3,14,,,,,,,,,,,,,,,,,,,,,,
+-,3,15,,,,,,,,,,,,,,,,,,,,,,
+-,4,0,,,,,,,,,,,,,,,,,,,,,,
+-,4,1,,,,,,,,,,,,,,,,,,,,,,
+P402,4,2,,IRQ4,,AGTIO0*2/AGTIO1*2,,,,RXD1/MISO1/SCL1,,,,,,,TS18,SEG06,,,,,,
+-,4,3,,,,,,,,,,,,,,,,,,,,,,
+P404,4,4,,,,,,GTIOC3B,,,,,,,,,,,,,,,SSILRCK0/SSIFS0,
+-,4,5,,,,,,,,,,,,,,,,,,,,,,
+-,4,6,,,,,,,,,,,,,,,,,,,,,,
+P407,4,7,,,,AGTIO0,,,CTS4_RTS4/SS4,,SSLB3,SDA0,,RTCOUT,ADTRG0,,TS03,SEG11,,,,,,USB_VBUS
+-,4,8,,,,,,,,,,,,,,,,,,,,,,
+P409,4,9,,IRQ6,,,GTOWUP,GTIOC5A,,,,,,,,,,SEG09,,,,,,
+-,4,10,,,,,,,,,,,,,,,,,,,,,,
+-,4,11,,,,,,,,,,,,,,,,,,,,,,
+-,4,12,,,,,,,,,,,,,,,,,,,,,,
+-,4,13,,,,,,,,,,,,,,,,,,,,,,
+P414,4,14,,IRQ9,,,,GTIOC0B,,,SSLA1,,,,,,,,,,,,,
+-,4,15,,,,,,,,,,,,,,,,,,,,,,
+-,5,0,,,,,,,,,,,,,,,,,,,,,,
+P501,5,1,AN017,IRQ11,,AGTOB0,GTIV,GTIOC2B,,,,,,,,,,SEG49,,,,,,
+-,5,2,,,,,,,,,,,,,,,,,,,,,,
+-,5,3,,,,,,,,,,,,,,,,,,,,,,
+-,5,4,,,,,,,,,,,,,,,,,,,,,,
+-,5,5,,,,,,,,,,,,,,,,,,,,,,
+-,5,6,,,,,,,,,,,,,,,,,,,,,,
+-,5,7,,,,,,,,,,,,,,,,,,,,,,
+-,5,8,,,,,,,,,,,,,,,,,,,,,,
+-,5,9,,,,,,,,,,,,,,,,,,,,,,
+-,5,10,,,,,,,,,,,,,,,,,,,,,,
+-,5,11,,,,,,,,,,,,,,,,,,,,,,
+-,5,12,,,,,,,,,,,,,,,,,,,,,,
+-,5,13,,,,,,,,,,,,,,,,,,,,,,
+-,5,14,,,,,,,,,,,,,,,,,,,,,,
+-,5,15,,,,,,,,,,,,,,,,,,,,,,
+-,6,0,,,,,,,,,,,,,,,,,,,,,,
+-,6,1,,,,,,,,,,,,,,,,,,,,,,
+-,6,2,,,,,,,,,,,,,,,,,,,,,,
+-,6,3,,,,,,,,,,,,,,,,,,,,,,
+-,6,4,,,,,,,,,,,,,,,,,,,,,,
+-,6,5,,,,,,,,,,,,,,,,,,,,,,
+-,6,6,,,,,,,,,,,,,,,,,,,,,,
+-,6,7,,,,,,,,,,,,,,,,,,,,,,
+-,6,8,,,,,,,,,,,,,,,,,,,,,,
+-,6,9,,,,,,,,,,,,,,,,,,,,,,
+-,6,10,,,,,,,,,,,,,,,,,,,,,,
+-,6,11,,,,,,,,,,,,,,,,,,,,,,
+-,6,12,,,,,,,,,,,,,,,,,,,,,,
+-,6,13,,,,,,,,,,,,,,,,,,,,,,
+-,6,14,,,,,,,,,,,,,,,,,,,,,,
+-,6,15,,,,,,,,,,,,,,,,,,,,,,
+-,7,0,,,,,,,,,,,,,,,,,,,,,,
+-,7,1,,,,,,,,,,,,,,,,,,,,,,
+-,7,2,,,,,,,,,,,,,,,,,,,,,,
+-,7,3,,,,,,,,,,,,,,,,,,,,,,
+-,7,4,,,,,,,,,,,,,,,,,,,,,,
+-,7,5,,,,,,,,,,,,,,,,,,,,,,
+-,7,6,,,,,,,,,,,,,,,,,,,,,,
+-,7,7,,,,,,,,,,,,,,,,,,,,,,
+-,7,8,,,,,,,,,,,,,,,,,,,,,,
+-,7,9,,,,,,,,,,,,,,,,,,,,,,
+-,7,10,,,,,,,,,,,,,,,,,,,,,,
+-,7,11,,,,,,,,,,,,,,,,,,,,,,
+-,7,12,,,,,,,,,,,,,,,,,,,,,,
+-,7,13,,,,,,,,,,,,,,,,,,,,,,
+-,7,14,,,,,,,,,,,,,,,,,,,,,,
+-,7,15,,,,,,,,,,,,,,,,,,,,,,
+-,8,0,,,,,,,,,,,,,,,,,,,,,,
+-,8,1,,,,,,,,,,,,,,,,,,,,,,
+-,8,2,,,,,,,,,,,,,,,,,,,,,,
+-,8,3,,,,,,,,,,,,,,,,,,,,,,
+-,8,4,,,,,,,,,,,,,,,,,,,,,,
+-,8,5,,,,,,,,,,,,,,,,,,,,,,
+-,8,6,,,,,,,,,,,,,,,,,,,,,,
+-,8,7,,,,,,,,,,,,,,,,,,,,,,
+-,8,8,,,,,,,,,,,,,,,,,,,,,,
+-,8,9,,,,,,,,,,,,,,,,,,,,,,
+-,8,10,,,,,,,,,,,,,,,,,,,,,,
+-,8,11,,,,,,,,,,,,,,,,,,,,,,
+-,8,12,,,,,,,,,,,,,,,,,,,,,,
+-,8,13,,,,,,,,,,,,,,,,,,,,,,
+-,8,14,,,,,,,,,,,,,,,,,,,,,,
+-,8,15,,,,,,,,,,,,,,,,,,,,,,
+-,9,0,,,,,,,,,,,,,,,,,,,,,,
+-,9,1,,,,,,,,,,,,,,,,,,,,,,
+-,9,2,,,,,,,,,,,,,,,,,,,,,,
+-,9,3,,,,,,,,,,,,,,,,,,,,,,
+-,9,4,,,,,,,,,,,,,,,,,,,,,,
+-,9,5,,,,,,,,,,,,,,,,,,,,,,
+-,9,6,,,,,,,,,,,,,,,,,,,,,,
+-,9,7,,,,,,,,,,,,,,,,,,,,,,
+-,9,8,,,,,,,,,,,,,,,,,,,,,,
+-,9,9,,,,,,,,,,,,,,,,,,,,,,
+-,9,10,,,,,,,,,,,,,,,,,,,,,,
+-,9,11,,,,,,,,,,,,,,,,,,,,,,
+-,9,12,,,,,,,,,,,,,,,,,,,,,,
+-,9,13,,,,,,,,,,,,,,,,,,,,,,
+P914,9,14,,,,,,,,,,,,,,,,,,,,,,(USB_DP)
+P915,9,15,,,,,,,,,,,,,,,,,,,,,,(USB_DM)
diff --git a/ports/renesas-ra/boards/ra6m1_af.csv b/ports/renesas-ra/boards/ra6m1_af.csv
new file mode 100644
index 0000000000000..da7749e4c7d65
--- /dev/null
+++ b/ports/renesas-ra/boards/ra6m1_af.csv
@@ -0,0 +1,163 @@
+CPU_PIN,PORT_IDX,PORT_BIT,Analog,IRQ,AF0,AF1,AF2,AF3,AF4,AF5,AF6,AF7,AF8,AF9,AF10,AF11,AF12,AF13,AF14,AF15,AF16,AF17,AF18,AF19,AF20,AF21,AF22
+P000,0,0,AN000,IRQ6-DS,,,,,,,,,,,,,,,,,,,,,,,
+P001,0,1,AN001,IRQ7-DS,,,,,,,,,,,,,,,,,,,,,,,
+P002,0,2,AN002,IRQ8-DS,,,,,,,,,,,,,,,,,,,,,,,
+P003,0,3,AN007,,,,,,,,,,,,,,,,,,,,,,,,
+P004,0,4,AN100,IRQ9-DS,,,,,,,,,,,,,,,,,,,,,,,
+P005,0,5,AN101,RQ10-DS,,,,,,,,,,,,,,,,,,,,,,,
+P006,0,6,AN102,IRQ11-DS,,,,,,,,,,,,,,,,,,,,,,,
+P007,0,7,AN107,,,,,,,,,,,,,,,,,,,,,,,,
+P008,0,8,AN003,IRQ12-DS,,,,,,,,,,,,,,,,,,,,,,,
+-,0,9,,,,,,,,,,,,,,,,,,,,,,,,,
+-,0,10,,,,,,,,,,,,,,,,,,,,,,,,,
+-,0,11,,,,,,,,,,,,,,,,,,,,,,,,,
+-,0,12,,,,,,,,,,,,,,,,,,,,,,,,,
+-,0,13,,,,,,,,,,,,,,,,,,,,,,,,,
+P014,0,14,AN005,,,,,,,,,,,,,,,,,,,,,,,,
+P015,0,15,AN006,IRQ13,,,,,,,,,,,,,,,,,,,,,,,
+P100,1,0,AN022,IRQ2,,AGTIO0,GTETRGA,GTIOC5B,RXD0/MISO0/SCL0,SCK1,MISOA_A,SCL1_B,KR00,,,D00[A00/D00],,,,,,,,,,,
+P101,1,1,AN021,IRQ1,,AGTEE0,GTETRGB,GTIOC5A,TXD0/MOSI0/SDA0,CTS1_RTS1/SS1,MOSIA_A,SDA1_B,KR01,,,D01[A01/D01],,,,,,,,,,,
+P102,1,2,AN020,,,AGTO0,GTOWLO,GTIOC2B_A,SCK0,,RSPCKA_A,,KR02,,ADTRG0,D02[A02/D02],,,,,CRX0,,,,,,
+P103,1,3,AN019,,,,GTOWUP,GTIOC2A_A,CTS0_RTS0/SS0,,SSLA0_A,,KR03,,,D03[A03/D03],,,,,CTX0,,,,,,
+P104,1,4,,IRQ1,,,GTETRGB,GTIOC1B,RXD8/MISO8/SCL8,,SSLA1_A,,KR04,,,D04[A04/D04,,,,,,QIO0,,,,,
+P105,1,5,,IRQ0,,,GTETRGA,GTIOC1A,TXD8/MOSI8/SDA8,,SSLA2_A,,KR05,,,D05[A05/D05],,,,,,QIO1,,,,,
+P106,1,6,,,AGTOB0,,,GTIOC8B,SCK8,,SSLA3_A,,KR06,,,D06[A06/D06],,,,,,QIO2,,,,,
+P107,1,7,,,AGTOA0,,,GTIOC8A,CTS8_RTS8/SS8,,,,KR07,,,D07[A07/D07],,,,,,QIO3,,,,,
+P108,1,8,,,"TMS/
+SWDIO",,GTOULO,GTIOC0B_A,,CTS9_RTS9/SS9,SSLB0_B,,,,,,,,,,,,,,,,
+P109,1,9,,,"TDO/
+TRACESWO",,GTOVUP,GTIOC1A_A,,TXD9/MOSI9/SDA9,MOSIB_B,,,CLKOUT,,,,,,,CTX1,,,,,,
+P110,1,10,,IRQ3,TDI,,GTOVLO,GTIOC1B_A,CTS2_RTS2/SS2,RXD9/MISO9/SCL9,MISOB_B,,,VCOUT,,,,,,,CRX1,,,,,,
+P111,1,11,,IRQ4,Hi-Z,,,GTIOC3A_A,SCK2,SCK9,RSPCKB_B,,,,,A05,,,,,,,,,,,
+P112,1,12,,,,,,GTIOC3B_A,TXD2/MOSI2/SDA2,SCK1,SSLB0_B,,,,,A04,,,,,,,SSIBCK0,,,,
+P113,1,13,,,,,,GTIOC2A,RXD2/MISO2/SCL2,,,,,,,A03,,,,,,,SSILRCK0/SSIFS0,,,,
+P114,1,14,,,,,,GTIOC2B,,,,,,,,A02,,,,,,,SSIRXD0,,,,
+P115,1,15,,,,,,GTIOC4A,,,,,,,,A01,,,,,,,SSITXD0,,,,
+P200,2,0,,NMI,,,,,,,,,,,,,,,,,,,,,,,
+P201,2,1,,,,,,,,,,,,,,,,,,,,,,,,,
+-,2,2,,,,,,,,,,,,,,,,,,,,,,,,,
+-,2,3,,,,,,,,,,,,,,,,,,,,,,,,,
+-,2,4,,,,,,,,,,,,,,,,,,,,,,,,,
+P205,2,5,,IRQ1-DS,,AGTO1,GTIV,GTIOC4A,TXD4/MOSI4/SDA4,CTS9_RTS9/SS9,,SCL1_A,,CLKOUT,,WAIT,TSCAP,,,,,,,USB_OVRCURA,,SD0DAT3_A,
+P206,2,6,,IRQ0-DS,,,GTIU,,RXD4/MISO4/SCL4,,,SDA1_A,,,,,TS01,,,,,,,USB_VBUSEN,,SD0DAT2_A,
+P207,2,7,,,,,,,,,,,,,,,,,,,,QSSL,,,,,
+P208,2,8,,,,,GTOVL0,,,,,,,,,CS4,,,,,,QIO3,,,,SD0DAT0_B,TDATA3
+P209,2,9,,,,,GTOVUP,,,,,,,,,CS5,,,,,,QIO2,,,,SD0WP,TDATA2
+P210,2,10,,,,,GTIW,,,,,,,,,CS6,,,,,,QIO1,,,,SD0CD,TDATA1
+P211,2,11,,,,,GTIV,,,,,,,,,CS7,,,,,,QIO0,,,,SD0CMD_B,TDATA0
+P212,2,12,,IRQ3,,AGTEE1,GTETRGD,GTIOC0B,,RXD1/MISO1/SCL1,,,,,,,,,,,,,,,,,
+P213,2,13,,IRQ2,,,GTETRGC,GTIOC0A,,TXD1/MOSI1/SDA1,,,,,,,,,,,,,,,,,
+P214,2,14,,,,,GTIU,,,,,,,,,,,,,,,QSPCLK,,,,SD0CLK_B, TCLK
+-,2,15,,,,,,,,,,,,,,,,,,,,,,,,,
+P300,3,0,,,TCK/SWCLK,,,GTIOC0A_A,,,SSLB1_B,,,,,,,,,,,,,,,,
+P301,3,1,,IRQ6,,AGTIO0,GTOULO,GTIOC4B,RXD2/MISO2/SCL2,CTS9_RTS9/SS9,SSLB2_B,,,,,A06,,,,,,,,,,,
+P302,3,2,,IRQ5,,,GTOUUP,GTIOC4A,TXD2/MOSI2/SDA2,,SSLB3_B,,,,,A07,,,,,,,,,,,
+P303,3,3,,,,,,GTIOC7B,,,,,,,,A08,,,,,,,,,,,
+P304,3,4,,IRQ9,,,GTOWLO,GTIOC7A,,,,,,,,A09,,,,,,,,,,,
+P305,3,5,,IRQ8,,,GTOWUP,,,,,,,,,A10,,,,,,QSPCLK,,,,,
+P306,3,6,,,,,,,,,,,,,,A11,,,,,,QSSL,,,,,
+P307,3,7,,,,,,,,,,,,,,A12,,,,,,QIO0,,,,,
+-,3,8,,,,,,,,,,,,,,,,,,,,,,,,,
+-,3,9,,,,,,,,,,,,,,,,,,,,,,,,,
+-,3,10,,,,,,,,,,,,,,,,,,,,,,,,,
+-,3,11,,,,,,,,,,,,,,,,,,,,,,,,,
+-,3,12,,,,,,,,,,,,,,,,,,,,,,,,,
+-,3,13,,,,,,,,,,,,,,,,,,,,,,,,,
+-,3,14,,,,,,,,,,,,,,,,,,,,,,,,,
+-,3,15,,,,,,,,,,,,,,,,,,,,,,,,,
+P400,4,0,,IRQ0,,AGTIO1,,GTIOC6A,SCK4,,,SCL0_A,,,ADTRG1,,,,,,,,AUDIO_CLK,,,,
+P401,4,1,,IRQ5-DS,,,GTETRGA,GTIOC6B,CTS4_RTS4/SS4,,,SDA0_A,,,,,,,,,,,,,,,
+P402,4,2,,IRQ4-DS,,,,,,,,,,,CACREF,,,,,,,,AUDIO_CLK,,,,
+P403,4,3,,,,,,GTIOC3A,,,,,,,,,,,,,,,SSIBCK0_A,,,,
+P404,4,4,,,,,,GTIOC3B,,,,,,,,,,,,,,,SSILRCK0/SSIFS0_A,,,,
+P405,4,5,,,,,,GTIOC1A,,,,,,,,,,,,,,,SSITXD0_A,,,,
+P406,4,6,,,,,,GTIOC1B,,,,,,,,,,,,,,,SSIRXD0_A,,,,
+P407,4,7,,,,AGTIO0,,,CTS4_RTS4/SS4,,,SDA0_B,,RTCOUT,ADTRG0,,TS03,,,,,,,USB_VBUS,,,
+P408,4,8,,IRQ7,,,GTOWLO,GTIOC10B,CTS1_RTS1/SS1,RXD3/MISO3/SCL3,,,,,,,TS04,,,,,,,USB_ID,,,
+P409,4,9,,IRQ6,,,GTOWUP,GTIOC10A,,TXD3/MOSI3/SDA3,,,,,,,TS05,,,,,,,USB_EXICEN,,,
+P410,4,10,,IRQ5,,AGTOB1,GTOVLO,GTIOC9B,RXD0/MISO0/SCL0,SCK3,MISOA_B,,,,,,TS06,,,,,,,,,SD0DAT1_A,
+P411,4,11,,IRQ4,,AGTOA1,GTOVUP,GTIOC9A,TXD0/MOSI0/SDA0,CTS3_RTS3/SS3,MOSIA_B,,,,,,TS07,,,,,,,,,SD0DAT0_A,
+P412,4,12,,,,AGTEE1,GTOULO,,SCK0,,RSPCKA_B,,,,,,TS08,,,,,,,,,SD0CMD_A,
+P413,4,13,,,,,GTOUUP,,CTS0_RTS0/SS0,,SSLA0_B,,,,,,TS09,,,,,,,,,SD0CLK_A,
+P414,4,14,,IRQ9,,,,GTIOC0B,,,SSLA1_B,,,,,,TS10,,,,,,,,,SD0WP,
+P415,4,15,,IRQ8,,,,GTIOC0A,,,SSLA2_B,,,,,,TS11,,,,,,,USB_VBUSEN,,SD0CD,
+P500,5,0,AN016,,,AGTOA0,GTIU,GTIOC11A,,,,,,,,,,,,,,QSPCLK,,USB_VBUSEN,,SD1CLK_A ,
+P501,5,1,AN116,IRQ11,,AGTOB0,GTIV,GTIOC11B,,,,,,,,,,,,,,QSSL,,USB_OVRCURA,,SD1CMD_A,
+P502,5,2,AN017,IRQ12,,,GTIW, GTIOC12A,,,,,,,,,,,,,,QIO0,,USB_OVRCURB,,SD1DAT0_A,
+P503,5,3,AN117,,,,GTETRGC,GTIOC12B,,,,,,,,,,,,,,QIO1,,USB_EXICEN,,SD1DAT1_A,
+P504,5,4,AN018,,,,GTETRGD,,,,,,,,,,,,,,,QIO2,,USB_ID,,SD1DAT2_A,
+-,5,5,,,,,,,,,,,,,,,,,,,,,,,,,
+-,5,6,,,,,,,,,,,,,,,,,,,,,,,,,
+-,5,7,,,,,,,,,,,,,,,,,,,,,,,,,
+P508,5,8,AN020,,,,,,,,,,,,,,,,,,,,,,,SD1DAT3_A,
+-,5,9,,,,,,,,,,,,,,,,,,,,,,,,,
+-,5,10,,,,,,,,,,,,,,,,,,,,,,,,,
+-,5,11,,,,,,,,,,,,,,,,,,,,,,,,,
+-,5,12,,,,,,,,,,,,,,,,,,,,,,,,,
+-,5,13,,,,,,,,,,,,,,,,,,,,,,,,,
+-,5,14,,,,,,,,,,,,,,,,,,,,,,,,,
+-,5,15,,,,,,,,,,,,,,,,,,,,,,,,,
+P600,6,0,,,,,,GTIOC6B,,SCK9,,,,CLKOUT,CACREF,RD,,,,,,,,,,,
+P601,6,1,,,,,,GTIOC6A,,RXD9,,,,,,WR0,,,,,,,,,,,
+P602,6,2,,,,,,GTIOC7B,,TXD9,,,,,,EBCLK,,,,,,,,,,,
+P603,6,3,,,,,,GTIOC7A,,,,,,,,,,,,,,,,,,,
+-,6,4,,,,,,,,,,,,,,,,,,,,,,,,,
+-,6,5,,,,,,,,,,,,,,,,,,,,,,,,,
+-,6,6,,,,,,,,,,,,,,,,,,,,,,,,,
+-,6,7,,,,,,,,,,,,,,,,,,,,,,,,,
+P608,6,8,,,,,,GTIOC4B,,,,,,,,A00,,,,,,,,,,,
+P609,6,9,,,,,,GTIOC5A,,,,,,,,CS1,,,,,CTX1,,,,,,
+P610,6,10,,,,,,GTIOC5B,,,,,,,,CS0,,,,,CRX1,,,,,,
+-,6,11,,,,,,,,,,,,,,,,,,,,,,,,,
+-,6,12,,,,,,,,,,,,,,,,,,,,,,,,,
+-,6,13,,,,,,,,,,,,,,,,,,,,,,,,,
+-,6,14,,,,,,,,,,,,,,,,,,,,,,,,,
+-,6,15,,,,,,,,,,,,,,,,,,,,,,,,,
+-,7,0,,,,,,,,,,,,,,,,,,,,,,,,,
+-,7,1,,,,,,,,,,,,,,,,,,,,,,,,,
+-,7,2,,,,,,,,,,,,,,,,,,,,,,,,,
+-,7,3,,,,,,,,,,,,,,,,,,,,,,,,,
+-,7,4,,,,,,,,,,,,,,,,,,,,,,,,,
+-,7,5,,,,,,,,,,,,,,,,,,,,,,,,,
+-,7,6,,,,,,,,,,,,,,,,,,,,,,,,,
+-,7,7,,,,,,,,,,,,,,,,,,,,,,,,,
+P708,7,8,,IRQ11,,,,,,RXD1/MISO1/SCL1,SSLA3_B,,,,CACREF,,TS12,,,,,,AUDIO_CLK,,,,
+-,7,9,,,,,,,,,,,,,,,,,,,,,,,,,
+-,7,10,,,,,,,,,,,,,,,,,,,,,,,,,
+-,7,11,,,,,,,,,,,,,,,,,,,,,,,,,
+-,7,12,,,,,,,,,,,,,,,,,,,,,,,,,
+-,7,13,,,,,,,,,,,,,,,,,,,,,,,,,
+-,7,14,,,,,,,,,,,,,,,,,,,,,,,,,
+-,7,15,,,,,,,,,,,,,,,,,,,,,,,,,
+-,8,0,,,,,,,,,,,,,,,,,,,,,,,,,
+-,8,1,,,,,,,,,,,,,,,,,,,,,,,,,
+-,8,2,,,,,,,,,,,,,,,,,,,,,,,,,
+-,8,3,,,,,,,,,,,,,,,,,,,,,,,,,
+-,8,4,,,,,,,,,,,,,,,,,,,,,,,,,
+-,8,5,,,,,,,,,,,,,,,,,,,,,,,,,
+-,8,6,,,,,,,,,,,,,,,,,,,,,,,,,
+-,8,7,,,,,,,,,,,,,,,,,,,,,,,,,
+P808,8,8,,,,,,,,,,,,,,,,,,,,,,,,,
+P809,8,9,,,,,,,,,,,,,,,,,,,,,,,,,
+-,8,10,,,,,,,,,,,,,,,,,,,,,,,,,
+-,8,11,,,,,,,,,,,,,,,,,,,,,,,,,
+-,8,12,,,,,,,,,,,,,,,,,,,,,,,,,
+-,8,13,,,,,,,,,,,,,,,,,,,,,,,,,
+-,8,14,,,,,,,,,,,,,,,,,,,,,,,,,
+-,8,15,,,,,,,,,,,,,,,,,,,,,,,,,
+-,9,0,,,,,,,,,,,,,,,,,,,,,,,,,
+-,9,1,,,,,,,,,,,,,,,,,,,,,,,,,
+-,9,2,,,,,,,,,,,,,,,,,,,,,,,,,
+-,9,3,,,,,,,,,,,,,,,,,,,,,,,,,
+-,9,4,,,,,,,,,,,,,,,,,,,,,,,,,
+-,9,5,,,,,,,,,,,,,,,,,,,,,,,,,
+-,9,6,,,,,,,,,,,,,,,,,,,,,,,,,
+-,9,7,,,,,,,,,,,,,,,,,,,,,,,,,
+-,9,8,,,,,,,,,,,,,,,,,,,,,,,,,
+-,9,9,,,,,,,,,,,,,,,,,,,,,,,,,
+-,9,10,,,,,,,,,,,,,,,,,,,,,,,,,
+-,9,11,,,,,,,,,,,,,,,,,,,,,,,,,
+-,9,12,,,,,,,,,,,,,,,,,,,,,,,,,
+-,9,13,,,,,,,,,,,,,,,,,,,,,,,,,
+P914,9,14,,,,,,,,,,,,,,,,,,,,,,(USB_DP),,,
+P915,9,15,,,,,,,,,,,,,,,,,,,,,,(USB_DM),,,
diff --git a/ports/renesas-ra/boards/ra6m2_af.csv b/ports/renesas-ra/boards/ra6m2_af.csv
new file mode 100644
index 0000000000000..e956a4425886a
--- /dev/null
+++ b/ports/renesas-ra/boards/ra6m2_af.csv
@@ -0,0 +1,161 @@
+CPU_PIN,PORT_IDX,PORT_BIT,Analog,IRQ,AF0,AF1,AF2,AF3,AF4,AF5,AF6,AF7,AF8,AF9,AF10,AF11,AF12,AF13,AF14,AF15,AF16,AF17,AF18,AF19,AF20,AF21,AF22,,,
+P000,0,0,AN000,IRQ6-DS,,,,,,,,,,,,,,,,,,,,,,,,,,
+P001,0,1,AN001,IRQ7-DS,,,,,,,,,,,,,,,,,,,,,,,,,,
+P002,0,2,AN002,IRQ8-DS,,,,,,,,,,,,,,,,,,,,,,,,,,
+P003,0,3,AN007,,,,,,,,,,,,,,,,,,,,,,,,,,,
+P004,0,4,AN100,IRQ9-DS,,,,,,,,,,,,,,,,,,,,,,,,,,
+P005,0,5,AN101,RQ10-DS,,,,,,,,,,,,,,,,,,,,,,,,,,
+P006,0,6,AN102,IRQ11-DS,,,,,,,,,,,,,,,,,,,,,,,,,,
+P007,0,7,AN107,,,,,,,,,,,,,,,,,,,,,,,,,,,
+P008,0,8,AN003,IRQ12-DS,,,,,,,,,,,,,,,,,,,,,,,,,,
+P009,0,9,AN004,IRQ13-DS,,,,,,,,,,,,,,,,,,,,,,,,,,
+-,0,10,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+-,0,11,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+-,0,12,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+-,0,13,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+P014,0,14,AN005,,,,,,,,,,,,,,,,,,,,,,,,,,,
+P015,0,15,AN006,IRQ13,,,,,,,,,,,,,,,,,,,,,,,,,,
+P100,1,0,AN022,IRQ2,,AGTIO0,GTETRGA,GTIOC5B,RXD0/MISO0/SCL0,SCK1,MISOA_A,SCL1_B,KR00,,,D00[A00/D00],,,,,,,,,,,,,,
+P101,1,1,AN021,IRQ1,,AGTEE0,GTETRGB,GTIOC5A,TXD0/MOSI0/SDA0,CTS1_RTS1/SS1,MOSIA_A,SDA1_B,KR01,,,D01[A01/D01],,,,,,,,,,,,,,
+P102,1,2,AN020,,,AGTO0,GTOWLO,GTIOC2B_A,SCK0,,RSPCKA_A,,KR02,,ADTRG0,D02[A02/D02],,,,,CRX0,,,,,,,,,
+P103,1,3,AN019,,,,GTOWUP,GTIOC2A_A,CTS0_RTS0/SS0,,SSLA0_A,,KR03,,,D03[A03/D03],,,,,CTX0,,,,,,,,,
+P104,1,4,,IRQ1,,,GTETRGB,GTIOC1B,RXD8/MISO8/SCL8,,SSLA1_A,,KR04,,,D04[A04/D04,,,,,,QIO0,,,,,,,,
+P105,1,5,,IRQ0,,,GTETRGA,GTIOC1A,TXD8/MOSI8/SDA8,,SSLA2_A,,KR05,,,D05[A05/D05],,,,,,QIO1,,,,,,,,
+P106,1,6,,,AGTOB0,,,GTIOC8B,SCK8,,SSLA3_A,,KR06,,,D06[A06/D06],,,,,,QIO2,,,,,,,,
+P107,1,7,,,AGTOA0,,,GTIOC8A,CTS8_RTS8/SS8,,,,KR07,,,D07[A07/D07],,,,,,QIO3,,,,,,,,
+P108,1,8,,,TMS/SWDIO,,GTOULO,GTIOC0B_A,,CTS9_RTS9/SS9,SSLB0_B,,,,,,,,,,,,,,,,,,,
+P109,1,9,,,TDO/TRACESWO,,GTOVUP,GTIOC1A_A,,TXD9/MOSI9/SDA9,MOSIB_B,,,CLKOUT,,,,,,,CTX1,,,,,,,,,
+P110,1,10,,IRQ3,TDI,,GTOVLO,GTIOC1B_A,CTS2_RTS2/SS2,RXD9/MISO9/SCL9,MISOB_B,,,VCOUT,,,,,,,CRX1,,,,,,,,,
+P111,1,11,,IRQ4,Hi-Z,,,GTIOC3A_A,SCK2,SCK9,RSPCKB_B,,,,,A05,,,,,,,,,,,,,,
+P112,1,12,,,,,,GTIOC3B_A,TXD2/MOSI2/SDA2,SCK1,SSLB0_B,,,,,A04,,,,,,,SSIBCK0_B,,,,,,,
+P113,1,13,,,,,,GTIOC2A,RXD2/MISO2/SCL2,,,,,,,A03,,,,,,,SSILRCK0/SSIFS0_B,,,,,,,
+P114,1,14,,,,,,GTIOC2B,,,,,,,,A02,,,,,,,SSIRXD0_B,,,,,,,
+P115,1,15,,,,,,GTIOC4A,,,,,,,,A01,,,,,,,SSITXD0_B,,,,,,,
+P200,2,0,,NMI,,,,,,,,,,,,,,,,,,,,,,,,,,
+P201,2,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+P202,2,2,,IRQ3-DS,,,,GTIOC5B,SCK2,RXD9/MISO9/SCL9,MISOB_A,,,,,WR1/BC1,,,,,,,,,,SD0DAT6_A,ET0_ERXD2,,,
+P203,2,3,,IRQ2-DS,,,,GTIOC5A,CTS2_RTS2/SS2,TXD9/MOSI9/SDA9,MOSIB_A,,,,,A19,TSCAP,,,,,,,,,SD0DAT5_A,ET0_COL,,,
+P204,2,4,,,,,,GTIOC4B,SCK4,SCK9,RSPCKB_A,SCL0_B,,,CACREF,A18,TS00,,,,,,SSIBCK0_C,USB_OVRCURB-DS,,SD0DAT4_A ,ET0_RX_DV,,,
+P205,2,5,,IRQ1-DS,,AGTO1,GTIV,GTIOC4A,TXD4/MOSI4/SDA4,CTS9_RTS9/SS9,SSLB0_A,SCL1_A,,CLKOUT,,A16,TSCAP,,,,,,SSILRCK0/SSIFS0_C,URB-DSUSB_OVRCURA-DS,,SD0DAT3_A,ET0_WOL,ET0_WOL,,
+P206,2,6,,IRQ0-DS,,,GTIU,,RXD4/MISO4/SCL4,,SSLB1_A,SDA1_A,,,,WAIT,TS01,,,,,,SSIDATA0_C,USB_VBUSEN,,SD0DAT2_A,ET0_LINKSTA,ET0_LINKSTA,,
+P207,2,7,,,,,,,,,SSLB2_A,,,,,A17,TS02,,,,,QSSL,,,,,,,,
+P208,2,8,,,,,GTOVL0,,,,,,,,,CS4,,,,,,QIO3,,,,SD0DAT0_B,ET0_LINKST,ET0_LINKST,,TDATA3
+P209,2,9,,,,,GTOVUP,,,,,,,,,CS5,,,,,,QIO2,,,,SD0WP,ET0_EXOUT,ET0_EXOUT,,TDATA2
+P210,2,10,,,,,GTIW,,,,,,,,,CS6,,,,,,QIO1,,,,SD0CD,ET0_WOL,ET0_WOL,,TDATA1
+P211,2,11,,,,,GTIV,,,,,,,,,CS7,,,,,,QIO0,,,,SD0CMD_B,ET0_MDIO,ET0_MDIO,,TDATA0
+P212,2,12,,IRQ3,,AGTEE1,GTETRGD,GTIOC0B,,RXD1/MISO1/SCL1,,,,,,,,,,,,,,,,,,,,
+P213,2,13,,IRQ2,,,GTETRGC,GTIOC0A,,TXD1/MOSI1/SDA1,,,,,ADTRG1,,,,,,,,,,,,,,,
+P214,2,14,,,,,GTIU,,,,,,,,,,,,,,,QSPCLK,,,,SD0CLK_B,ET0_MDC,ET0_MDC,, TCLK
+-,2,15,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+P300,3,0,,,TCK/SWCLK,,,GTIOC0A_A,,,SSLB1_B,,,,,,,,,,,,,,,,,,,
+P301,3,1,,IRQ6,,AGTIO0,GTOULO,GTIOC4B,RXD2/MISO2/SCL2,CTS9_RTS9/SS9,SSLB2_B,,,,,A06,,,,,,,,,,,,,,
+P302,3,2,,IRQ5,,,GTOUUP,GTIOC4A,TXD2/MOSI2/SDA2,,SSLB3_B,,,,,A07,,,,,,,,,,,,,,
+P303,3,3,,,,,,GTIOC7B,,,,,,,,A08,,,,,,,,,,,,,,
+P304,3,4,,IRQ9,,,GTOWLO,GTIOC7A,RXD6/MISO6/SCL6,,,,,,,A09,,,,,,,,,,,,,,
+P305,3,5,,IRQ8,,,GTOWUP,,TXD6/MOSI6/SDA6,,,,,,,A10,,,,,,QSPCLK,,,,,,,,
+P306,3,6,,,,,GTOULO,,SCK6,,,,,,,A11,,,,,,QSSL,,,,,,,,
+P307,3,7,,,,,GTOUUP,,CTS6_RTS6/SS6,,,,,,,A12,,,,,,QIO0,,,,,,,,
+P308,3,8,,,,,,,,,,,,,,A13,,,,,,QIO1,,,,,,,,
+P309,3,9,,,,,,,,RXD3,,,,,,A14,,,,,,QIO2,,,,,,,,
+P310,3,10,,,,AGTEE1,,,,TXD3,,,,,,A15,,,,,,QIO3,,,,,,,,
+P311,3,11,,,,AGTOB1,,,,SCK3,,,,,,CS2/RAS,,,,,,,,,,,,,,
+P312,3,12,,,,AGTOA1,,,,CTS3_RTS3/SS3,,,,,,CS3/CAS,,,,,,,,,,,,,,
+P313,3,13,,,,,,,,,,,,,,A20,,,,,,,,,,SD0DAT7_A,ET0_ERXD3,,,
+-,3,14,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+-,3,15,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+P400,4,0,,IRQ0,,AGTIO1,,GTIOC6A,SCK4,SCK7,,SCL0_A,,,ADTRG1,,,,,,,,AUDIO_CLK,,,,ET0_WOL,ET0_WOL,,
+P401,4,1,,IRQ5-DS,,,GTETRGA,GTIOC6B,CTS4_RTS4/SS4,TXD7/MOSI7/SDA7,,SDA0_A,,,,,,,,,CTX0,,,,,,ET0_MDC,ET0_MDC,,
+P402,4,2,,IRQ4-DS,,,,,,RXD7/MISO7/SCL7,,,,,CACREF,,,,,,CRX0,,AUDIO_CLK,,,,ET0_MDIO,ET0_MDIO,VSYNC,
+P403,4,3,,,,,,GTIOC3A,,CTS7_RTS7/SS7,,,,,,,,,,,,,SSIBCK0_A,,,SD1DAT7_B,ET0_LINKSTA,ET0_LINKSTA,PIXD7,
+P404,4,4,,,,,,GTIOC3B,,,,,,,,,,,,,,,SSILRCK0/SSIFS0_A,,,SD1DAT6_B,ET0_EXOUT,ET0_EXOUT,PIXD6,
+P405,4,5,,,,,,GTIOC1A,,,,,,,,,,,,,,,SSITXD0_A,,,SD1DAT5_B,ET0_TX_EN,RMII0_TXD_EN_B,PIXD5,
+P406,4,6,,,,,,GTIOC1B,,,SSLB3_C,,,,,,,,,,,,SSIRXD0_A,,,SD1DAT4_B,ET0_RX_ER,RMII0_TXD1_B,PIXD4,
+P407,4,7,,,,AGTIO0,,,CTS4_RTS4/SS4,,SSLB3_A,SDA0_B,,RTCOUT,ADTRG0,,TS03,,,,,,,USB_VBUS,,,ET0_EXOUT,ET0_EXOUT,,
+P408,4,8,,IRQ7,,,GTOWLO,GTIOC10B,,RXD3/MISO3/SCL3,,SCL0_B,,,,,TS04,,,,,,,USB_ID,,,ET0_CRS,RMII0_CRS_DV_A,PIXCLK,
+P409,4,9,,IRQ6,,,GTOWUP,GTIOC10A,,TXD3/MOSI3/SDA3,,,,,,,TS05,,,,,,,USB_EXICEN,,,ET0_RX_CLK,RMII0_RX_ER_A,HSYNC,
+P410,4,10,,IRQ5,,AGTOB1,GTOVLO,GTIOC9B,RXD0/MISO0/SCL0,SCK3,MISOA_B,,,,,,TS06,,,,,,,,,SD0DAT1_A,ET0_ERXD0,RMII0_RXD1_A,PIXD0,
+P411,4,11,,IRQ4,,AGTOA1,GTOVUP,GTIOC9A,TXD0/MOSI0/SDA0,CTS3_RTS3/SS3,MOSIA_B,,,,,,TS07,,,,,,,,,SD0DAT0_A,ET0_ERXD1,RMII0_RXD0_A,PIXD1,
+P412,4,12,,,,AGTEE1,GTOULO,,SCK0,,RSPCKA_B,,,,,,TS08,,,,,,,,,SD0CMD_A,ET0_ETXD0,REF50CK0_A,PIXD2,
+P413,4,13,,,,,GTOUUP,,CTS0_RTS0/SS0,,SSLA0_B,,,,,,TS09,,,,,,,,,SD0CLK_A,ET0_ETXD1,RMII0_TXD0_A,PIXD3,
+P414,4,14,,IRQ9,,,,GTIOC0B,,,SSLA1_B,,,,,,TS10,,,,,,,,,SD0WP,,RMII0_TXD1_A,PIXD4,
+P415,4,15,,IRQ8,,,,GTIOC0A,,,SSLA2_B,,,,,,TS11,,,,,,,USB_VBUSEN,,SD0CD,ET0_TX_EN,RMII0_TXD_EN_A,PIXD5,
+P500,5,0, AN016,,,AGTOA0,GTIU,GTIOC11A,,,,,,,,,,,,,,QSPCLK,,USB_VBUSEN,,SD1CLK_A ,,,,
+P501,5,1,AN116,IRQ11,,AGTOB0,GTIV,GTIOC11B,,TXD5/MOSI5/SDA5,,,,,,,,,,,,QSSL,,USB_OVRCURA,,SD1CMD_A,,,,
+P502,5,2,AN017,IRQ12,,,GTIW, GTIOC12A,,RXD5/MISO5/SCL5,,,,,,,,,,,,QIO0,,USB_OVRCURB,,SD1DAT0_A,,,,
+P503,5,3,AN117,,,,GTETRGC,GTIOC12B,CTS6_RTS6/SS6,SCK5,,,,,,,,,,,,QIO1,,USB_EXICEN,,SD1DAT1_A,,,,
+P504,5,4,AN018,,,,GTETRGD,GTIOC13A,SCK6,CTS5_RTS5/SS5,,,,,,,,,,,,QIO2,,USB_ID,,SD1DAT2_A,,,,
+P505,5,5,AN118,IRQ14,,,,GTIOC13B,RXD6/MISO6/SCL6,,,,,,,,,,,,,QIO3,,,,SD1DAT3_A,,,,
+P506,5,6,AN019,IRQ15,,,,,TXD6/MOSI6/SDA6,,,,,,,,,,,,,,,,,SD1CD,,,,
+-,5,7,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+P508,5,8,AN020,,,,,GTIOC0B,SCK6,SCK5,,,,,,,,,,,,,,,,SD1DAT3_A,,,,
+-,5,9,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+-,5,10,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+P511,5,11,,IRQ15,,,,RXD4/MISO4/SCL4,RXD4/MISO4/SCL4,,,SDA2,,,,,,,,,CRX1,,,,,,,,PCKO,
+P512,5,12,,IRQ14,,,,TXD4/MOSI4/SDA4,TXD4/MOSI4/SDA4,,,SCL2,,,,,,,,,CTX1,,,,,,,,VSYNC,
+-,5,13,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+-,5,14,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+-,5,15,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+P600,6,0,,,,,,GTIOC6B,,SCK9,,,,CLKOUT,CACREF,RD,,,,,,,,,,,,,,
+P601,6,1,,,,,,GTIOC6A,,RXD9,,,,,,WR/WR0/DQM00,,,,,,,,,,,,,,
+P602,6,2,,,,,,GTIOC7B,,TXD9,,,,,,EBCLK/SDCLK,,,,,,,,,,,,,,
+P603,6,3,,,,,,GTIOC7A,,CTS9_RTS9/SS9,,,,,,D13[A13/D13]/DQ13,,,,,,,,,,,,,,
+P604,6,4,,,,,,GTIOC8B,,,,,,,,D12[A12/D12]/DQ12,,,,,,,,,,,,,,
+P605,6,5,,,,,,GTIOC8A,,,,,,,,D11[A11/D11]/DQ11,,,,,,,,,,,,,,
+-,6,6,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+-,6,7,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+P608,6,8,,,,,,GTIOC4B,,,,,,,,A00/BC0/DQM1,,,,,,,,,,,,,,
+P609,6,9,,,,,,GTIOC5A,,,,,,,,CS1/CKE ,,,,,CTX1,,,,,,,,,
+P610,6,10,,,,,,GTIOC5B,,,,,,,,CS0/WE,,,,,CRX1,,,,,,,,,
+P611,6,11,,,,,,,CTS7_RTS7/SS7,,,,,,,SDCS,,,,,,,,,,,,,,
+P612,6,12,,,,,,,SCK7,,,,,,,D08[A08/D08]/DQ08,,,,,,,,,,,,,,
+P613,6,13,,,,,,,TXD7,,,,,,,D09[A09/D09]/DQ09,,,,,,,,,,,,,,
+P614,6,14,,,,,,,RXD7,,,,,,,D10[A10/D10]/DQ10,,,,,,,,,,,,,,
+-,6,15,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+P700,7,0,,,,,,GTIOC5A,,,MISOB_C,,,,,,,,,,,,,,,SD1DAT3_B,ET0_ETXD1,RMII0_TXD0_B,PIXD3,
+P701,7,1,,,,,,GTIOC5B,,,MOSIB_C,,,,,,,,,,,,,,,SD1DAT2_B,ET0_ETXD0,REF50CK0_B,PIXD2,
+P702,7,2,,,,,,GTIOC6A,,,RSPCKB_C,,,,,,,,,,,,,,,SD1DAT1_B,ET0_ERXD1,RMII0_RXD0_B,PIXD1,
+P703,7,3,,,,,,GTIOC6B,,,SSLB0_C,,,VCOUT,,,,,,,,,,,,SD1DAT0_B,ET0_ERXD0,RMII0_RXD1_B,PIXD0,
+P704,7,4,,,,AGTO0,,,,,SSLB1_C,,,,,,,,,,CTX0,,,,,SD1CLK_B,ET0_RX_CLK,RMII0_RX_ER_B,HSYNC,
+P705,7,5,,,,AGTIO0,,,,,SSLB2_C,,,,,,,,,,CRX0,,,,,SD1CMD_B,ET0_CRS,RMII0_CRS_DV_B,PIXCLK,
+-,7,6,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+-,7,7,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+P708,7,8,,IRQ11,,,,,,RXD1/MISO1/SCL1,SSLA3_B,,,,CACREF,,TS12,,,,,,AUDIO_CLK,,,,ET0_ETXD3,,PCKO,
+P709,7,9,,IRQ10,,,,,,TXD1/MOSI1/SDA1,,,,,,,TS13,,,,,,,,,,ET0_ETXD2,,,
+P710,7,10,,,,,,,,SCK1,,,,,,,TS14,,,,,,,,,,ET0_TX_ER,,,
+P711,7,11,,,,AGTEE0,,,,CTS1_RTS1/SS1,,,,,,,TS15,,,,,,,,,,ET0_TX_CLK,,,
+P712,7,12,,,,AGTOB0,,GTIOC2B,,,,,,,,,TS16,,,,,,,,,,,,,
+P713,7,13,,,,AGTOA0,,GTIOC2A,,,,,,,,,TS17,,,,,,,,,,,,,
+-,7,14,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+-,7,15,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+P800,8,0,,,,,,,,,,,,,,D14[A14/D14]/DQ14,,,,,,,,,,,,,,
+P801,8,1,,,,,,,,,,,,,,D15[A15/D15]/DQ15,,,,,,,,,,,,,,
+-,8,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+-,8,3,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+-,8,4,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+-,8,5,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+-,8,6,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+-,8,7,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+P808,8,8,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+P809,8,9,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+-,8,10,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+-,8,11,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+-,8,12,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+-,8,13,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+-,8,14,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+-,8,15,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+-,9,0,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+-,9,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+-,9,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+-,9,3,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+-,9,4,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+-,9,5,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+-,9,6,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+-,9,7,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+-,9,8,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+-,9,9,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+-,9,10,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+-,9,11,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+-,9,12,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+-,9,13,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+P914,9,14,,,,,,,,,,,,,,,,,,,,,,(USB_DP),,,,,,
+P915,9,15,,,,,,,,,,,,,,,,,,,,,,(USB_DM),,,,,,
diff --git a/ports/renesas-ra/boards/ra_pin_prefix.c b/ports/renesas-ra/boards/ra_pin_prefix.c
new file mode 100644
index 0000000000000..78b7878ddafe5
--- /dev/null
+++ b/ports/renesas-ra/boards/ra_pin_prefix.c
@@ -0,0 +1,37 @@
+// ra_pin_prefix.c becomes the initial portion of the generated pins file.
+
+#include <stdio.h>
+
+#include "py/obj.h"
+#include "py/mphal.h"
+#include "pin.h"
+
+#if 0
+#define AF(af_idx, af_fn, af_unit, af_type, af_ptr) \
+    { \
+        { &pin_af_type }, \
+        .name = MP_QSTR_AF##af_idx##_##af_fn##af_unit, \
+        .idx = (af_idx), \
+        .fn = AF_FN_##af_fn, \
+        .unit = (af_unit), \
+        .type = AF_PIN_TYPE_##af_fn##_##af_type, \
+        .af_fn = (af_ptr) \
+    }
+#endif
+
+#define PIN_AD(p_name, p_pin, ad_bit, ad_channel) \
+    { \
+        { &machine_pin_type }, \
+        .name = MP_QSTR_##p_name, \
+        .pin = p_pin, \
+        .bit = ad_bit, \
+        .channel = ad_channel \
+    }
+
+#define PIN(p_name, p_pin, p_ad) \
+    { \
+        { &machine_pin_type }, \
+        .name = MP_QSTR_##p_name, \
+        .pin = p_pin, \
+        .ad = p_ad, \
+    }
diff --git a/ports/renesas-ra/build_all_boards.sh b/ports/renesas-ra/build_all_boards.sh
new file mode 100644
index 0000000000000..49b1cab85d21f
--- /dev/null
+++ b/ports/renesas-ra/build_all_boards.sh
@@ -0,0 +1,26 @@
+#!/bin/bash
+set -eu -o pipefail
+export BOARD="RA4M1_CLICKER"
+DT=`date +%Y%m%d%H%M`
+make DEBUG=1 BOARD=${BOARD} clean 2>&1 | tee ${BOARD}_build_${DT}.log
+make DEBUG=1 BOARD=${BOARD}       2>&1 | tee -a ${BOARD}_build_${DT}.log
+#
+export BOARD="RA6M2_EK"
+DT=`date +%Y%m%d%H%M`
+make DEBUG=1 BOARD=${BOARD} clean 2>&1 | tee ${BOARD}_build_${DT}.log
+make DEBUG=1 BOARD=${BOARD}       2>&1 | tee -a ${BOARD}_build_${DT}.log
+#
+export BOARD="RA4M1_EK"
+DT=`date +%Y%m%d%H%M`
+make DEBUG=1 BOARD=${BOARD} clean 2>&1 | tee ${BOARD}_build_${DT}.log
+make DEBUG=1 BOARD=${BOARD}       2>&1 | tee -a ${BOARD}_build_${DT}.log
+#
+export BOARD="RA4W1_EK"
+DT=`date +%Y%m%d%H%M`
+make DEBUG=1 BOARD=${BOARD} clean 2>&1 | tee ${BOARD}_build_${DT}.log
+make DEBUG=1 BOARD=${BOARD}       2>&1 | tee -a ${BOARD}_build_${DT}.log
+#
+export BOARD="RA6M1_EK"
+DT=`date +%Y%m%d%H%M`
+make DEBUG=1 BOARD=${BOARD} clean 2>&1 | tee ${BOARD}_build_${DT}.log
+make DEBUG=1 BOARD=${BOARD}       2>&1 | tee -a ${BOARD}_build_${DT}.log
diff --git a/ports/renesas-ra/extint.c b/ports/renesas-ra/extint.c
new file mode 100644
index 0000000000000..c3ad26ebe5c7c
--- /dev/null
+++ b/ports/renesas-ra/extint.c
@@ -0,0 +1,402 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013, 2014 Damien P. George
+ * Copyright (c) 2021, 2022 Renesas Electronics Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include <stdio.h>
+#include <stddef.h>
+#include <string.h>
+
+#include "py/runtime.h"
+#include "py/gc.h"
+#include "py/mphal.h"
+#include "pendsv.h"
+#include "pin.h"
+#include "extint.h"
+#include "irq.h"
+#if defined(RA4M1) | defined(RA4M3) | defined(RA4W1) | defined(RA6M1) | defined(RA6M2) | defined(RA6M3)
+#include "ra_icu.h"
+#endif
+
+/// \moduleref pyb
+/// \class ExtInt - configure I/O pins to interrupt on external events
+///
+/// There are a total of 16 interrupt irq_nos. These can come from GPIO pins.
+///
+/// For irq_nos 0 thru 15, a given irq_no can map to the corresponding irq_no from an
+/// arbitrary port.
+///
+///     def callback(irq_no):
+///         print("irq_no =", irq_no)
+///
+/// Note: ExtInt will automatically configure the gpio irq_no as an input.
+///
+///     extint = pyb.ExtInt(pin, pyb.ExtInt.IRQ_FALLING, pyb.Pin.PULL_UP, callback)
+///
+/// Now every time a falling edge is seen on the X1 pin, the callback will be
+/// called. Caution: mechanical pushbuttons have "bounce" and pushing or
+/// releasing a switch will often generate multiple edges.
+/// See: http://www.eng.utah.edu/~cs5780/debouncing.pdf for a detailed
+/// explanation, along with various techniques for debouncing.
+///
+/// Trying to register 2 callbacks onto the same pin will throw an exception.
+///
+/// If pin is passed as an integer, then it is assumed to map to one of the
+/// internal interrupt sources, and must be in the range 16.
+///
+/// All other pin objects go through the pin mapper to come up with one of the
+/// gpio pins.
+///
+///     extint = pyb.ExtInt(pin, mode, pull, callback)
+///
+/// Valid modes are pyb.ExtInt.IRQ_RISING, pyb.ExtInt.IRQ_FALLING,
+/// pyb.ExtInt.IRQ_RISING_FALLING, pyb.ExtInt.EVT_RISING,
+/// pyb.ExtInt.EVT_FALLING, and pyb.ExtInt.EVT_RISING_FALLING.
+///
+///
+/// Valid pull values are pyb.Pin.PULL_UP, pyb.Pin.PULL_NONE.
+///
+/// There is also a C API, so that drivers which require EXTI interrupt irq_nos
+/// can also use this code. See extint.h for the available functions and
+/// usrsw.h for an example of using this.
+
+// TODO Add python method to change callback object.
+
+
+typedef struct {
+    mp_obj_base_t base;
+    mp_int_t pin_idx;
+    mp_int_t irq_no;
+} extint_obj_t;
+
+STATIC uint8_t pyb_extint_mode[EXTI_NUM_VECTORS];
+STATIC bool pyb_extint_hard_irq[EXTI_NUM_VECTORS];
+
+// The callback arg is a small-int or a ROM Pin object, so no need to scan by GC
+mp_obj_t pyb_extint_callback_arg[EXTI_NUM_VECTORS];
+uint extint_irq_no[EXTI_NUM_VECTORS];
+
+void extint_callback(void *param) {
+    uint irq_no = *((uint *)param);
+    mp_obj_t *cb = &MP_STATE_PORT(pyb_extint_callback)[irq_no];
+    if (*cb != mp_const_none) {
+        mp_sched_lock();
+        // When executing code within a handler we must lock the GC to prevent
+        // any memory allocations.  We must also catch any exceptions.
+        gc_lock();
+        nlr_buf_t nlr;
+        if (nlr_push(&nlr) == 0) {
+            mp_call_function_1(*cb, pyb_extint_callback_arg[irq_no]);
+            nlr_pop();
+        } else {
+            // Uncaught exception; disable the callback so it doesn't run again.
+            *cb = mp_const_none;
+            ra_icu_disable_irq_no(irq_no);
+            printf("Uncaught exception in ExtInt interrupt handler line %u\n", (unsigned int)irq_no);
+            mp_obj_print_exception(&mp_plat_print, MP_OBJ_FROM_PTR(nlr.ret_val));
+        }
+        gc_unlock();
+        mp_sched_unlock();
+    }
+}
+
+// Set override_callback_obj to true if you want to unconditionally set the
+// callback function.
+uint extint_register(mp_obj_t pin_obj, uint32_t mode, uint32_t pull, mp_obj_t callback_obj, bool override_callback_obj) {
+    const machine_pin_obj_t *pin = NULL;
+    uint pin_idx;
+    uint8_t v_line = 0xff;
+    if (mp_obj_is_int(pin_obj)) {
+        mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("Pin object is not specified"));
+    } else {
+        pin = machine_pin_find(pin_obj);
+        pin_idx = pin->pin;
+        bool find = ra_icu_find_irq_no((uint32_t)pin_idx, (uint8_t *)&v_line);
+        if (!find) {
+            mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("The Pin object(%d) doesn't have EXTINT feature"), pin_idx);
+        }
+    }
+    if (pull != GPIO_NOPULL &&
+        pull != GPIO_PULLUP) {
+        mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("invalid ExtInt Pull: %d"), pull);
+    }
+    mp_obj_t *cb = &MP_STATE_PORT(pyb_extint_callback)[v_line];
+    if (!override_callback_obj && *cb != mp_const_none && callback_obj != mp_const_none) {
+        mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("ExtInt vector %d is already in use"), v_line);
+    }
+
+    // We need to update callback atomically, so we disable the line
+    // before we update anything.
+
+    extint_disable(v_line);
+
+    *cb = callback_obj;
+    // ToDo: mode should be handled
+    pyb_extint_mode[v_line] = mode;
+    pyb_extint_callback_arg[v_line] = MP_OBJ_NEW_SMALL_INT(v_line);
+    if (*cb != mp_const_none) {
+        pyb_extint_callback_arg[v_line] = MP_OBJ_NEW_SMALL_INT(v_line);
+        pyb_extint_hard_irq[v_line] = true;
+
+        if (pin == NULL) {
+            // pin will be NULL for non GPIO EXTI lines
+            extint_trigger_mode(v_line, mode);
+            extint_enable(v_line);
+        } else {
+            extint_irq_no[v_line] = (uint)v_line;
+            ra_icu_set_callback((uint8_t)v_line, (ICU_CB)extint_callback, (void *)&extint_irq_no[v_line]);
+            ra_icu_set_pin(pin_idx, true, true);
+            ra_icu_enable_pin(pin_idx);
+            extint_trigger_mode(v_line, mode);
+            extint_enable(v_line);
+        }
+    }
+    return v_line;
+}
+
+// This function is intended to be used by the Pin.irq() method
+void extint_register_pin(const machine_pin_obj_t *pin, uint32_t mode, bool hard_irq, mp_obj_t callback_obj) {
+    uint32_t line = 0;
+
+    bool find = ra_icu_find_irq_no((uint32_t)pin->pin, (uint8_t *)&line);
+    if (!find) {
+        mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("The Pin object(%d) doesn't have EXTINT feature"), (uint32_t)pin->pin);
+    }
+
+    // Check if the ExtInt line is already in use by another Pin/ExtInt
+    mp_obj_t *cb = &MP_STATE_PORT(pyb_extint_callback)[line];
+    if (*cb != mp_const_none && MP_OBJ_FROM_PTR(pin) != pyb_extint_callback_arg[line]) {
+        if (mp_obj_is_small_int(pyb_extint_callback_arg[line])) {
+            mp_raise_msg_varg(&mp_type_OSError, MP_ERROR_TEXT("ExtInt vector %d is already in use"), line);
+        } else {
+            const machine_pin_obj_t *other_pin = MP_OBJ_TO_PTR(pyb_extint_callback_arg[line]);
+            mp_raise_msg_varg(&mp_type_OSError,
+                MP_ERROR_TEXT("IRQ resource already taken by Pin('%q')"), other_pin->name);
+        }
+    }
+
+    extint_disable(line);
+
+    *cb = callback_obj;
+    // ToDo: mode should be handled
+    pyb_extint_mode[line] = mode;
+
+    if (*cb != mp_const_none) {
+        // Configure and enable the callback
+
+        pyb_extint_hard_irq[line] = hard_irq;
+        pyb_extint_callback_arg[line] = MP_OBJ_FROM_PTR(pin);
+
+        extint_trigger_mode(line, mode);
+
+        // Configure the NVIC
+        ra_icu_priority_irq_no((uint8_t)line, (uint32_t)IRQ_PRI_EXTINT);
+        extint_irq_no[line] = (uint)line;
+        ra_icu_set_callback((uint8_t)line, (ICU_CB)extint_callback, (void *)&extint_irq_no[line]);
+
+        // Enable the interrupt
+        extint_enable(line);
+    }
+}
+
+void extint_enable(uint line) {
+    if (line >= EXTI_NUM_VECTORS) {
+        return;
+    }
+    mp_uint_t irq_state = disable_irq();
+    ra_icu_enable_irq_no((uint8_t)line);
+    enable_irq(irq_state);
+}
+
+void extint_disable(uint line) {
+    if (line >= EXTI_NUM_VECTORS) {
+        return;
+    }
+    mp_uint_t irq_state = disable_irq();
+    ra_icu_disable_irq_no((uint8_t)line);
+    enable_irq(irq_state);
+}
+
+void extint_swint(uint line) {
+    if (line >= EXTI_NUM_VECTORS) {
+        return;
+    }
+    ra_icu_swint((uint8_t)line);
+}
+
+void extint_trigger_mode(uint line, uint32_t mode) {
+    if (line >= EXTI_NUM_VECTORS) {
+        return;
+    }
+    mp_uint_t irq_state = disable_irq();
+
+    // cond: 0: falling, 1: rising, 2: both edge, 3 low level
+    // Enable or disable the rising detector
+    uint32_t cond = 0;
+    if ((mode == GPIO_MODE_IT_RISING) || (mode == GPIO_MODE_EVT_RISING)) {
+        cond = 1;
+    } else if ((mode == GPIO_MODE_IT_FALLING) || (mode == GPIO_MODE_EVT_FALLING)) {
+        cond = 0;
+    } else if ((mode == GPIO_MODE_IT_RISING_FALLING) || (mode == GPIO_MODE_EVT_RISING_FALLING)) {
+        cond = 2;
+    } else if (mode == GPIO_IRQ_LOWLEVEL) {
+        cond = 3;
+    } else {
+        mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("The device doesn't have (%d) feature"), (uint32_t)mode);
+    }
+    ra_icu_trigger_irq_no((uint8_t)line, cond);
+    enable_irq(irq_state);
+}
+
+/// \method irq_no()
+/// Return the irq_no number that the pin is mapped to.
+STATIC mp_obj_t extint_obj_irq_no(mp_obj_t self_in) {
+    extint_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    uint8_t irq_no;
+    bool find = ra_icu_find_irq_no(self->pin_idx, &irq_no);
+    if (find) {
+        return MP_OBJ_NEW_SMALL_INT(self->irq_no);
+    } else {
+        return mp_const_none;
+    }
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(extint_obj_irq_no_obj, extint_obj_irq_no);
+
+/// \method enable()
+/// Enable a disabled interrupt.
+STATIC mp_obj_t extint_obj_enable(mp_obj_t self_in) {
+    extint_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    ra_icu_enable_pin(self->pin_idx);
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(extint_obj_enable_obj, extint_obj_enable);
+
+/// \method disable()
+/// Disable the interrupt associated with the ExtInt object.
+/// This could be useful for debouncing.
+STATIC mp_obj_t extint_obj_disable(mp_obj_t self_in) {
+    extint_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    ra_icu_disable_pin(self->pin_idx);
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(extint_obj_disable_obj, extint_obj_disable);
+
+/// \method swint()
+/// Trigger the callback from software.
+STATIC mp_obj_t extint_obj_swint(mp_obj_t self_in) {
+    extint_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    ra_icu_swint(self->irq_no);
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(extint_obj_swint_obj,  extint_obj_swint);
+
+// TODO document as a staticmethod
+/// \classmethod regs()
+/// Dump the values of the EXTI registers.
+STATIC mp_obj_t extint_regs(void) {
+    printf("Not Implemented\n");
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(extint_regs_fun_obj, extint_regs);
+STATIC MP_DEFINE_CONST_STATICMETHOD_OBJ(extint_regs_obj, MP_ROM_PTR(&extint_regs_fun_obj));
+
+/// \classmethod \constructor(pin, mode, pull, callback)
+/// Create an ExtInt object:
+///
+///   - `pin` is the pin on which to enable the interrupt (can be a pin object or any valid pin name).
+///   - `mode` can be one of:
+///     - `ExtInt.IRQ_RISING` - trigger on a rising edge;
+///     - `ExtInt.IRQ_FALLING` - trigger on a falling edge;
+///     - `ExtInt.IRQ_RISING_FALLING` - trigger on a rising or falling edge.
+///   - `pull` can be one of:
+///     - `pyb.Pin.PULL_NONE` - no pull up or down resistors;
+///     - `pyb.Pin.PULL_UP` - enable the pull-up resistor;
+///     - `pyb.Pin.PULL_DOWN` - enable the pull-down resistor.
+///   - `callback` is the function to call when the interrupt triggers.  The
+///   callback function must accept exactly 1 argument, which is the irq_no that
+///   triggered the interrupt.
+STATIC const mp_arg_t pyb_extint_make_new_args[] = {
+    { MP_QSTR_pin,      MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
+    { MP_QSTR_mode,     MP_ARG_REQUIRED | MP_ARG_INT, {.u_int = 0} },
+    { MP_QSTR_pull,     MP_ARG_REQUIRED | MP_ARG_INT, {.u_int = 0} },
+    { MP_QSTR_callback, MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
+};
+#define PYB_EXTINT_MAKE_NEW_NUM_ARGS MP_ARRAY_SIZE(pyb_extint_make_new_args)
+
+STATIC mp_obj_t extint_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
+    // type_in == extint_obj_type
+
+    // parse args
+    mp_arg_val_t vals[PYB_EXTINT_MAKE_NEW_NUM_ARGS];
+    mp_arg_parse_all_kw_array(n_args, n_kw, args, PYB_EXTINT_MAKE_NEW_NUM_ARGS, pyb_extint_make_new_args, vals);
+
+    extint_obj_t *self = m_new_obj(extint_obj_t);
+    machine_pin_obj_t *pin = vals[0].u_obj;
+    self->base.type = type;
+    self->pin_idx = pin->pin;
+    self->irq_no = extint_register(vals[0].u_obj, vals[1].u_int, vals[2].u_int, vals[3].u_obj, false);
+
+    return MP_OBJ_FROM_PTR(self);
+}
+
+STATIC void extint_obj_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+    extint_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    mp_printf(print, "<ExtInt irq_no=%u>", self->irq_no);
+}
+
+STATIC const mp_rom_map_elem_t extint_locals_dict_table[] = {
+    { MP_ROM_QSTR(MP_QSTR_irq_no),  MP_ROM_PTR(&extint_obj_irq_no_obj) },
+    { MP_ROM_QSTR(MP_QSTR_line),  MP_ROM_PTR(&extint_obj_irq_no_obj) },
+    { MP_ROM_QSTR(MP_QSTR_enable),  MP_ROM_PTR(&extint_obj_enable_obj) },
+    { MP_ROM_QSTR(MP_QSTR_disable), MP_ROM_PTR(&extint_obj_disable_obj) },
+    { MP_ROM_QSTR(MP_QSTR_swint),   MP_ROM_PTR(&extint_obj_swint_obj) },
+    { MP_ROM_QSTR(MP_QSTR_regs),    MP_ROM_PTR(&extint_regs_obj) },
+
+    // class constants
+    /// \constant IRQ_RISING - interrupt on a rising edge
+    /// \constant IRQ_FALLING - interrupt on a falling edge
+    /// \constant IRQ_RISING_FALLING - interrupt on a rising or falling edge
+    { MP_ROM_QSTR(MP_QSTR_IRQ_RISING),         MP_ROM_INT(GPIO_MODE_IT_RISING) },
+    { MP_ROM_QSTR(MP_QSTR_IRQ_FALLING),        MP_ROM_INT(GPIO_MODE_IT_FALLING) },
+    { MP_ROM_QSTR(MP_QSTR_IRQ_RISING_FALLING), MP_ROM_INT(GPIO_MODE_IT_RISING_FALLING) },
+};
+
+STATIC MP_DEFINE_CONST_DICT(extint_locals_dict, extint_locals_dict_table);
+
+const mp_obj_type_t extint_type = {
+    { &mp_type_type },
+    .name = MP_QSTR_ExtInt,
+    .print = extint_obj_print,
+    .make_new = extint_make_new,
+    .locals_dict = (mp_obj_dict_t *)&extint_locals_dict,
+};
+
+void extint_init0(void) {
+    ra_icu_init();
+    ra_icu_deinit();
+    for (int i = 0; i < PYB_EXTI_NUM_VECTORS; i++) {
+        MP_STATE_PORT(pyb_extint_callback)[i] = mp_const_none;
+    }
+}
diff --git a/ports/renesas-ra/extint.h b/ports/renesas-ra/extint.h
new file mode 100644
index 0000000000000..a3e1ca15c5a28
--- /dev/null
+++ b/ports/renesas-ra/extint.h
@@ -0,0 +1,47 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013, 2014 Damien P. George
+ * Copyright (c) 2021 Renesas Electronics Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+#ifndef MICROPY_INCLUDED_RA_EXTINT_H
+#define MICROPY_INCLUDED_RA_EXTINT_H
+
+#include "py/mphal.h"
+
+#define EXTI_RTC_WAKEUP     (16)
+#define EXTI_NUM_VECTORS    (PYB_EXTI_NUM_VECTORS)
+extern mp_obj_t pyb_extint_callback_arg[];
+
+void extint_callback(void *param);
+void extint_init0(void);
+uint extint_register(mp_obj_t pin_obj, uint32_t mode, uint32_t pull, mp_obj_t callback_obj, bool override_callback_obj);
+void extint_register_pin(const machine_pin_obj_t *pin, uint32_t mode, bool hard_irq, mp_obj_t callback_obj);
+void extint_enable(uint line);
+void extint_disable(uint line);
+void extint_swint(uint line);
+void extint_trigger_mode(uint line, uint32_t mode);
+
+extern const mp_obj_type_t extint_type;
+
+#endif // MICROPY_INCLUDED_RA_EXTINT_H
diff --git a/ports/renesas-ra/factoryreset.c b/ports/renesas-ra/factoryreset.c
new file mode 100644
index 0000000000000..9a44d3dc43669
--- /dev/null
+++ b/ports/renesas-ra/factoryreset.c
@@ -0,0 +1,111 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013-2019 Damien P. George
+ * Copyright (c) 2022 Renesas Electronics Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "py/runtime.h"
+#include "py/mperrno.h"
+#include "extmod/vfs_fat.h"
+#include "systick.h"
+#include "led.h"
+#include "storage.h"
+#include "factoryreset.h"
+
+#if MICROPY_HW_ENABLE_STORAGE
+
+#if MICROPY_VFS_FAT
+
+static const char fresh_boot_py[] =
+    "# boot.py -- run on boot-up\r\n"
+    "# can run arbitrary Python, but best to keep it minimal\r\n"
+;
+
+static const char fresh_main_py[] =
+    "# main.py -- put your code here!\r\n"
+;
+
+typedef struct _factory_file_t {
+    const char *name;
+    size_t len;
+    const char *data;
+} factory_file_t;
+
+static const factory_file_t factory_files[] = {
+    {"boot.py", sizeof(fresh_boot_py) - 1, fresh_boot_py},
+    {"main.py", sizeof(fresh_main_py) - 1, fresh_main_py},
+};
+
+MP_WEAK void factory_reset_make_files(FATFS *fatfs) {
+    for (int i = 0; i < MP_ARRAY_SIZE(factory_files); ++i) {
+        const factory_file_t *f = &factory_files[i];
+        FIL fp;
+        FRESULT res = f_open(fatfs, &fp, f->name, FA_WRITE | FA_CREATE_ALWAYS);
+        if (res == FR_OK) {
+            UINT n;
+            f_write(&fp, f->data, f->len, &n);
+            f_close(&fp);
+        }
+    }
+}
+
+MP_WEAK int factory_reset_create_filesystem(void) {
+    // LED on to indicate creation of local filesystem
+    led_state(RA_LED1, 1);
+    uint32_t start_tick = HAL_GetTick();
+
+    fs_user_mount_t vfs;
+    pyb_flash_init_vfs(&vfs);
+    uint8_t working_buf[FF_MAX_SS];
+    FRESULT res = f_mkfs(&vfs.fatfs, FM_FAT, 0, working_buf, sizeof(working_buf));
+    if (res != FR_OK) {
+        mp_printf(&mp_plat_print, "MPY: can't create flash filesystem\n");
+        return -MP_ENODEV;
+    }
+
+    // Set label
+    f_setlabel(&vfs.fatfs, MICROPY_HW_FLASH_FS_LABEL);
+
+    // Populate the filesystem with factory files
+    factory_reset_make_files(&vfs.fatfs);
+
+    // Keep LED on for at least 200ms
+    systick_wait_at_least(start_tick, 200);
+    led_state(RA_LED1, 0);
+
+    mp_printf(&mp_plat_print, "MPY: created flash filesystem\n");
+
+    return 0; // success
+}
+
+#else
+
+// If FAT is not enabled then it's up to the board to create a fresh filesystem.
+MP_WEAK int factory_reset_create_filesystem(void) {
+    return 0; // success
+}
+
+#endif // MICROPY_VFS_FAT
+
+#endif // MICROPY_HW_ENABLE_STORAGE
diff --git a/ports/renesas-ra/factoryreset.h b/ports/renesas-ra/factoryreset.h
new file mode 100644
index 0000000000000..526f0b4cef1e3
--- /dev/null
+++ b/ports/renesas-ra/factoryreset.h
@@ -0,0 +1,34 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2019 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+#ifndef MICROPY_INCLUDED_RENESAS_RA_FACTORYRESET_H
+#define MICROPY_INCLUDED_RENESAS_RA_FACTORYRESET_H
+
+#include "lib/oofatfs/ff.h"
+
+void factory_reset_make_files(FATFS *fatfs);
+int factory_reset_create_filesystem(void);
+
+#endif // MICROPY_INCLUDED_RENESAS_RA_FACTORYRESET_H
diff --git a/ports/renesas-ra/fatfs_port.c b/ports/renesas-ra/fatfs_port.c
new file mode 100644
index 0000000000000..1e4f3144ea6f7
--- /dev/null
+++ b/ports/renesas-ra/fatfs_port.c
@@ -0,0 +1,50 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013, 2014 Damien P. George
+ * Copyright (c) 2021 Renesas Electronics Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "py/runtime.h"
+#include "lib/oofatfs/ff.h"
+#if MICROPY_HW_ENABLE_RTC
+#include "rtc.h"
+#endif
+
+MP_WEAK DWORD get_fattime(void) {
+    #if MICROPY_HW_ENABLE_RTC
+    rtc_init_finalise();
+    ra_rtc_t time;
+    ra_rtc_get_time(&time);
+    int year = time.year;
+    int month = time.month;
+    int date = time.date;
+    int hour = time.hour;
+    int minute = time.minute;
+    int second = time.second;
+    return ((year) << 25) | ((month) << 21) | ((date) << 16) | ((hour) << 11) | ((minute) << 5) | (second / 2);
+    #else
+    // Jan 1st, 2018 at midnight. Not sure what timezone.
+    return ((2018 - 1980) << 25) | ((1) << 21) | ((1) << 16) | ((0) << 11) | ((0) << 5) | (0 / 2);
+    #endif
+}
diff --git a/ports/renesas-ra/flash.c b/ports/renesas-ra/flash.c
new file mode 100644
index 0000000000000..3501be13caa43
--- /dev/null
+++ b/ports/renesas-ra/flash.c
@@ -0,0 +1,58 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013, 2014 Damien P. George
+ * Copyright (c) 2021 Renesas Electronics Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "py/mpconfig.h"
+#include "py/misc.h"
+#include "py/mphal.h"
+#include "flash.h"
+
+typedef struct {
+    uint32_t base_address;
+    uint32_t sector_size;
+    uint32_t sector_count;
+} flash_layout_t;
+
+uint32_t flash_get_sector_info(uint32_t addr, uint32_t *start_addr, uint32_t *size) {
+    *start_addr = sector_start(addr);
+    *size = sector_size(addr);
+    return sector_index(addr);
+}
+
+bool flash_erase(uint32_t flash_dest, uint32_t num_word32) {
+    // check there is something to write
+    if (num_word32 == 0) {
+        return true;
+    }
+    bool ret = internal_flash_eraseblock((unsigned char *)flash_dest);
+    return ret;
+}
+
+bool flash_write(uint32_t flash_dest, const uint32_t *src, uint32_t num_word32) {
+    bool ret;
+    ret = internal_flash_write((unsigned char *)flash_dest, num_word32, (uint8_t *)src, false);
+    return ret;
+}
diff --git a/ports/renesas-ra/flash.h b/ports/renesas-ra/flash.h
new file mode 100644
index 0000000000000..4b76b581ef58a
--- /dev/null
+++ b/ports/renesas-ra/flash.h
@@ -0,0 +1,34 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013, 2014 Damien P. George
+ * Copyright (c) 2021 Renesas Electronics Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+#ifndef MICROPY_INCLUDED_RA_FLASH_H
+#define MICROPY_INCLUDED_RA_FLASH_H
+
+uint32_t flash_get_sector_info(uint32_t addr, uint32_t *start_addr, uint32_t *size);
+bool flash_erase(uint32_t flash_dest, uint32_t num_word32);
+bool flash_write(uint32_t flash_dest, const uint32_t *src, uint32_t num_word32);
+
+#endif // MICROPY_INCLUDED_RA_FLASH_H
diff --git a/ports/renesas-ra/flashbdev.c b/ports/renesas-ra/flashbdev.c
new file mode 100644
index 0000000000000..8fb20c66eada1
--- /dev/null
+++ b/ports/renesas-ra/flashbdev.c
@@ -0,0 +1,321 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013-2018 Damien P. George
+ * Copyright (c) 2021,2022 Renesas Electronics Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include <stdint.h>
+#include <string.h>
+
+#include "py/obj.h"
+#include "py/mperrno.h"
+#include "irq.h"
+#include "led.h"
+#include "flash.h"
+#include "storage.h"
+#if defined(RA4M1) | defined(RA4M3) | defined(RA4W1) | defined(RA6M1) | defined(RA6M2) | defined(RA6M3)
+#include "ra_flash.h"
+#endif
+
+#if MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE
+
+// #define DEBUG_FLASH_BDEV
+
+// Here we try to automatically configure the location and size of the flash
+// pages to use for the internal storage.  We also configure the location of the
+// cache used for writing.
+
+#if defined(RA4M1)
+
+STATIC byte flash_cache_mem[0x800] __attribute__((aligned(16))); // 2K
+#define CACHE_MEM_START_ADDR (&flash_cache_mem[0])
+#define FLASH_SECTOR_SIZE_MAX (0x800)           // 2k max
+#define FLASH_MEM_SEG1_START_ADDR (0x37000)     // sector 1
+#define FLASH_MEM_SEG1_NUM_BLOCKS (72)          // sectors 1,2,...,72
+
+#elif defined(RA4M3)
+STATIC byte flash_cache_mem[0x800] __attribute__((aligned(16))); // 2K
+#define CACHE_MEM_START_ADDR (&flash_cache_mem[0])
+#define FLASH_SECTOR_SIZE_MAX (0x800)           // 2k max
+#define FLASH_MEM_SEG1_START_ADDR (0x37000)     // sector 1
+#define FLASH_MEM_SEG1_NUM_BLOCKS (72)          // sectors 1,2,...,72
+
+#elif defined(RA4W1)
+STATIC byte flash_cache_mem[0x800] __attribute__((aligned(16))); // 2K
+#define CACHE_MEM_START_ADDR (&flash_cache_mem[0])
+#define FLASH_SECTOR_SIZE_MAX (0x800)           // 2k max
+#define FLASH_MEM_SEG1_START_ADDR (0x70000)     // sector 1
+#define FLASH_MEM_SEG1_NUM_BLOCKS (128)         // sectors 1,2,...,128
+
+#elif defined(RA6M1)
+STATIC byte flash_cache_mem[0x8000] __attribute__((aligned(16))); // 32K
+#define CACHE_MEM_START_ADDR (&flash_cache_mem[0])
+#define FLASH_SECTOR_SIZE_MAX (0x8000)          // 32k max
+#define FLASH_MEM_SEG1_START_ADDR (0x60000)     // sector 1
+#define FLASH_MEM_SEG1_NUM_BLOCKS (256)         // sectors 1,2,...,256
+
+#elif defined(RA6M2)
+STATIC byte flash_cache_mem[0x8000] __attribute__((aligned(16))); // 32K
+#define CACHE_MEM_START_ADDR (&flash_cache_mem[0])
+#define FLASH_SECTOR_SIZE_MAX (0x8000)          // 32k max
+#define FLASH_MEM_SEG1_START_ADDR (0xe0000)     // sector 1
+#define FLASH_MEM_SEG1_NUM_BLOCKS (512)         // sectors 1,2,...,512
+
+#elif defined(RA6M3)
+STATIC byte flash_cache_mem[0x8000] __attribute__((aligned(16))); // 32K
+#define CACHE_MEM_START_ADDR (&flash_cache_mem[0])
+#define FLASH_SECTOR_SIZE_MAX (0x8000)          // 32k max
+#define FLASH_MEM_SEG1_START_ADDR (0x60000)     // sector 1
+#define FLASH_MEM_SEG1_NUM_BLOCKS (256)         // sectors 1,2,...,256
+
+#else
+#error "no internal flash storage support for this MCU"
+#endif
+
+#if !defined(FLASH_MEM_SEG2_START_ADDR)
+#define FLASH_MEM_SEG2_START_ADDR (0) // no second segment
+#define FLASH_MEM_SEG2_NUM_BLOCKS (0) // no second segment
+#endif
+
+#define FLASH_FLAG_DIRTY        (1)
+#define FLASH_FLAG_FORCE_WRITE  (2)
+#define FLASH_FLAG_ERASED       (4)
+static volatile uint8_t flash_flags = 0;
+static uint32_t flash_cache_sector_id;
+static uint32_t flash_cache_sector_start;
+static uint32_t flash_cache_sector_size;
+static long flash_tick_counter_last_write;
+
+void flash_bdev_irq_handler(void);
+
+int32_t flash_bdev_ioctl(uint32_t op, uint32_t arg) {
+    (void)arg;
+    switch (op) {
+        case BDEV_IOCTL_INIT:
+            flash_flags = 0;
+            flash_cache_sector_id = 0;
+            flash_tick_counter_last_write = 0L;
+            return 0;
+
+        case BDEV_IOCTL_NUM_BLOCKS:
+            return FLASH_MEM_SEG1_NUM_BLOCKS + FLASH_MEM_SEG2_NUM_BLOCKS;
+
+        case BDEV_IOCTL_IRQ_HANDLER:
+            flash_bdev_irq_handler();
+            return 0;
+
+        case BDEV_IOCTL_SYNC:
+            if (flash_flags & FLASH_FLAG_DIRTY) {
+                flash_flags |= FLASH_FLAG_FORCE_WRITE;
+                flash_bdev_irq_handler();
+                // while (flash_flags & FLASH_FLAG_DIRTY) {
+                //   NVIC->STIR = FLASH_IRQn;
+                // }
+            }
+            return 0;
+    }
+    // return -MP_EINVAL;
+    return -1;
+}
+
+static uint8_t *flash_cache_get_addr_for_write(uint32_t flash_addr) {
+    uint32_t flash_sector_start;
+    uint32_t flash_sector_size;
+    uint32_t flash_sector_id = flash_get_sector_info(flash_addr, &flash_sector_start, &flash_sector_size);
+    if (flash_sector_size > FLASH_SECTOR_SIZE_MAX) {
+        flash_sector_size = FLASH_SECTOR_SIZE_MAX;
+    }
+    if (flash_cache_sector_id != flash_sector_id) {
+        flash_bdev_ioctl(BDEV_IOCTL_SYNC, 0);
+        memcpy((void *)CACHE_MEM_START_ADDR, (const void *)flash_sector_start, flash_sector_size);
+        flash_cache_sector_id = flash_sector_id;
+        flash_cache_sector_start = flash_sector_start;
+        flash_cache_sector_size = flash_sector_size;
+    }
+    flash_flags |= FLASH_FLAG_DIRTY;
+    led_state(RA_LED1, 1); // indicate a dirty cache with LED on
+    flash_tick_counter_last_write = (long)HAL_GetTick();
+    return (uint8_t *)CACHE_MEM_START_ADDR + flash_addr - flash_sector_start;
+}
+
+void flash_cache_commit(void) {
+    if (flash_flags & FLASH_FLAG_DIRTY) {
+        if (((long)HAL_GetTick() - flash_tick_counter_last_write) > 1000) {
+            flash_bdev_irq_handler();
+        }
+    }
+}
+
+static uint8_t *flash_cache_get_addr_for_read(uint32_t flash_addr) {
+    uint32_t flash_sector_start;
+    uint32_t flash_sector_size;
+    uint32_t flash_sector_id = flash_get_sector_info(flash_addr, &flash_sector_start, &flash_sector_size);
+    if (flash_cache_sector_id == flash_sector_id) {
+        // in cache, copy from there
+        return (uint8_t *)CACHE_MEM_START_ADDR + flash_addr - flash_sector_start;
+    }
+    // not in cache, copy straight from flash
+    return (uint8_t *)flash_addr;
+}
+
+static uint32_t convert_block_to_flash_addr(uint32_t block) {
+    if (block < FLASH_MEM_SEG1_NUM_BLOCKS) {
+        return FLASH_MEM_SEG1_START_ADDR + block * FLASH_BLOCK_SIZE;
+    }
+    if (block < FLASH_MEM_SEG1_NUM_BLOCKS + FLASH_MEM_SEG2_NUM_BLOCKS) {
+        return FLASH_MEM_SEG2_START_ADDR + (block - FLASH_MEM_SEG1_NUM_BLOCKS) * FLASH_BLOCK_SIZE;
+    }
+    // can add more flash segments here if needed, following above pattern
+
+    // bad block
+    return -1;
+}
+
+void flash_bdev_irq_handler(void) {
+    if (!(flash_flags & FLASH_FLAG_DIRTY)) {
+        return;
+    }
+
+    // This code uses interrupts to erase the flash
+    /*
+    if (flash_erase_state == 0) {
+        flash_erase_it(flash_cache_sector_start, flash_cache_sector_size / 4);
+        flash_erase_state = 1;
+        return;
+    }
+
+    if (flash_erase_state == 1) {
+        // wait for erase
+        // TODO add timeout
+        #define flash_erase_done() (__HAL_FLASH_GET_FLAG(FLASH_FLAG_BSY) == RESET)
+        if (!flash_erase_done()) {
+            return;
+        }
+        flash_erase_state = 2;
+    }
+    */
+
+    // This code erases the flash directly, waiting for it to finish
+    if (!(flash_flags & FLASH_FLAG_ERASED)) {
+        flash_erase(flash_cache_sector_start, flash_cache_sector_size);
+        flash_flags |= FLASH_FLAG_ERASED;
+        // return;
+    }
+
+    // If not a forced write, wait at least 5 seconds after last write to flush
+    // On file close and flash unmount we get a forced write, so we can afford to wait a while
+    if ((flash_flags & FLASH_FLAG_FORCE_WRITE) || ((long)HAL_GetTick() - flash_tick_counter_last_write) >= 3000L) {
+        // sync the cache RAM buffer by writing it to the flash page
+        flash_tick_counter_last_write = 0x7fffffffL;
+        flash_write(flash_cache_sector_start, (const uint32_t *)CACHE_MEM_START_ADDR, flash_cache_sector_size);
+        // clear the flash flags now that we have a clean cache
+        flash_flags = 0;
+        // indicate a clean cache with LED off
+        led_state(RA_LED1, 0);
+    }
+}
+
+bool flash_bdev_readblock(uint8_t *dest, uint32_t block) {
+    // non-MBR block, get data from flash memory, possibly via cache
+    uint32_t flash_addr = convert_block_to_flash_addr(block);
+    if (flash_addr == -1) {
+        // bad block number
+        return false;
+    }
+    uint8_t *src = flash_cache_get_addr_for_read(flash_addr);
+    memcpy(dest, src, FLASH_BLOCK_SIZE);
+    return true;
+}
+
+bool flash_bdev_is_erased(uint32_t block) {
+    uint32_t *start;
+    uint32_t *end;
+    bool ret = true;
+    uint32_t flash_addr = convert_block_to_flash_addr(block);
+    start = (uint32_t *)flash_addr;
+    end = (uint32_t *)(flash_addr + FLASH_BLOCK_SIZE);
+    while (start < end) {
+        if (*start++ != 0xffffffff) {
+            ret = false;
+            break;
+        }
+    }
+    return ret;
+}
+
+bool flash_bdev_writeblock(const uint8_t *src, uint32_t block) {
+    // non-MBR block, copy to cache
+    uint32_t flash_addr = convert_block_to_flash_addr(block);
+    if (flash_addr == -1) {
+        // bad block number
+        return false;
+    }
+    uint8_t *dest = flash_cache_get_addr_for_write(flash_addr);
+    memcpy(dest, src, FLASH_BLOCK_SIZE);
+    // flash_flags |= FLASH_FLAG_FORCE_WRITE;
+    // flash_bdev_irq_handler();
+    return true;
+}
+
+int flash_bdev_readblocks_ext(uint8_t *dest, uint32_t block, uint32_t offset, uint32_t len) {
+    // Get data from flash memory, possibly via cache
+    while (len) {
+        uint32_t l = MIN(len, FLASH_BLOCK_SIZE - offset);
+        uint32_t flash_addr = convert_block_to_flash_addr(block);
+        if (flash_addr == -1) {
+            // bad block number
+            return -1;
+        }
+        uint8_t *src = flash_cache_get_addr_for_read(flash_addr + offset);
+        memcpy(dest, src, l);
+        dest += l;
+        block += 1;
+        offset = 0;
+        len -= l;
+    }
+    return 0;
+}
+
+int flash_bdev_writeblocks_ext(const uint8_t *src, uint32_t block, uint32_t offset, uint32_t len) {
+    // Copy to cache
+    while (len) {
+        uint32_t l = MIN(len, FLASH_BLOCK_SIZE - offset);
+        uint32_t flash_addr = convert_block_to_flash_addr(block);
+        if (flash_addr == -1) {
+            // bad block number
+            return -1;
+        }
+//        uint32_t basepri = raise_irq_pri(IRQ_PRI_FLASH); // prevent cache flushing and USB access
+        uint8_t *dest = flash_cache_get_addr_for_write(flash_addr + offset);
+        memcpy(dest, src, l);
+//        restore_irq_pri(basepri);
+        src += l;
+        block += 1;
+        offset = 0;
+        len -= l;
+    }
+    return 0;
+}
+
+#endif // MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE
diff --git a/ports/renesas-ra/gccollect.c b/ports/renesas-ra/gccollect.c
new file mode 100644
index 0000000000000..bd697a2af3b5a
--- /dev/null
+++ b/ports/renesas-ra/gccollect.c
@@ -0,0 +1,71 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013, 2014 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include <stdio.h>
+#include <stdint.h>
+
+#include "py/mpstate.h"
+#include "py/gc.h"
+#include "py/mpthread.h"
+#include "shared/runtime/gchelper.h"
+#include "gccollect.h"
+#include "softtimer.h"
+#include "systick.h"
+
+void gc_collect(void) {
+    // get current time, in case we want to time the GC
+    #if 0
+    uint32_t start = mp_hal_ticks_us();
+    #endif
+
+    // start the GC
+    gc_collect_start();
+
+    // trace the stack and registers
+    gc_helper_collect_regs_and_stack();
+
+    // trace root pointers from any threads
+    #if MICROPY_PY_THREAD
+    mp_thread_gc_others();
+    #endif
+
+    // trace soft timer nodes
+    soft_timer_gc_mark_all();
+
+    // end the GC
+    gc_collect_end();
+
+    #if 0
+    // print GC info
+    uint32_t ticks = mp_hal_ticks_us() - start;
+    gc_info_t info;
+    gc_info(&info);
+    printf("GC@%lu %lums\n", start, ticks);
+    printf(" " UINT_FMT " total\n", info.total);
+    printf(" " UINT_FMT " : " UINT_FMT "\n", info.used, info.free);
+    printf(" 1=" UINT_FMT " 2=" UINT_FMT " m=" UINT_FMT "\n", info.num_1block, info.num_2block, info.max_block);
+    #endif
+}
diff --git a/ports/renesas-ra/gccollect.h b/ports/renesas-ra/gccollect.h
new file mode 100644
index 0000000000000..c33c3513c582d
--- /dev/null
+++ b/ports/renesas-ra/gccollect.h
@@ -0,0 +1,44 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013, 2014 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+#ifndef MICROPY_INCLUDED_RENESAS_RA_GCCOLLECT_H
+#define MICROPY_INCLUDED_RENESAS_RA_GCCOLLECT_H
+
+// variables defining memory layout
+// (these probably belong somewhere else...)
+extern uint32_t _etext;
+extern uint32_t _sidata;
+extern uint32_t _ram_start;
+extern uint32_t _sdata;
+extern uint32_t _edata;
+extern uint32_t _sbss;
+extern uint32_t _ebss;
+extern uint32_t _heap_start;
+extern uint32_t _heap_end;
+extern uint32_t _sstack;
+extern uint32_t _estack;
+extern uint32_t _ram_end;
+
+#endif // MICROPY_INCLUDED_RENESAS_RA_GCCOLLECT_H
diff --git a/ports/renesas-ra/help.c b/ports/renesas-ra/help.c
new file mode 100644
index 0000000000000..3bce504d9ca10
--- /dev/null
+++ b/ports/renesas-ra/help.c
@@ -0,0 +1,61 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013, 2014 Damien P. George
+ * Copyright (c) 2021, 2022 Renesas Electronics Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "py/builtin.h"
+
+const char ra_help_text[] =
+    "Welcome to MicroPython for Renesas RA!\n"
+    "\n"
+    "For online docs please visit http://docs.micropython.org/.\n"
+    "\n"
+    "For access to hardware please use machine module.\n"
+    "import machine\n"
+    "from machine import Pin\n"
+    "machine.info() -- print some general information\n"
+    "machine.freq() -- print some general information\n"
+    "p0 = Pin('P106',Pin.OUT) -- get a pin 'P106'\n"
+    "p0.value(1)    -- Write 1 to pin 'P106'\n"
+    "p0.value()     -- Read from pin 'P106'\n"
+    "Pin name: 'P000' - 'P915', Pin mode: Pin.IN, Pin.OUT\n"
+    "Pin pull: PULL_NONE, PULL_UP, PULL_DOWN\n"
+    "\n"
+    "For change boot mode by reset with pressing switch\n"
+    "Normal: release switch after LED1 flashes 4 times or more\n"
+    "Safe: release switch after LED1 flashes 2 times\n"
+    "Factory filesystem: release switch after LED1 flashes 3 times\n"
+    "*Note that Flash file system is erased and initialized.\n"
+    "\n"
+    "Control commands:\n"
+    "  CTRL-A        -- on a blank line, enter raw REPL mode\n"
+    "  CTRL-B        -- on a blank line, enter normal REPL mode\n"
+    "  CTRL-C        -- interrupt a running program\n"
+    "  CTRL-D        -- on a blank line, do a soft reset of the board\n"
+    "  CTRL-E        -- on a blank line, enter paste mode\n"
+    "\n"
+    "For further help on a specific object, type help(obj)\n"
+    "For a list of available modules, type help('modules')\n"
+;
diff --git a/ports/renesas-ra/irq.c b/ports/renesas-ra/irq.c
new file mode 100644
index 0000000000000..fdaf2385cc9d1
--- /dev/null
+++ b/ports/renesas-ra/irq.c
@@ -0,0 +1,59 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013, 2014 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "py/obj.h"
+#include "py/mphal.h"
+#include "irq.h"
+#include "modmachine.h"
+
+#if IRQ_ENABLE_STATS
+uint32_t irq_stats[IRQ_STATS_MAX] = {0};
+#endif
+
+// disable_irq()
+// Disable interrupt requests.
+// Returns the previous IRQ state which can be passed to enable_irq.
+STATIC mp_obj_t machine_disable_irq(void) {
+    return mp_obj_new_bool(disable_irq() == IRQ_STATE_ENABLED);
+}
+MP_DEFINE_CONST_FUN_OBJ_0(machine_disable_irq_obj, machine_disable_irq);
+
+// enable_irq(state=True)
+// Enable interrupt requests, based on the argument, which is usually the
+// value returned by a previous call to disable_irq.
+STATIC mp_obj_t machine_enable_irq(uint n_args, const mp_obj_t *arg) {
+    enable_irq((n_args == 0 || mp_obj_is_true(arg[0])) ? IRQ_STATE_ENABLED : IRQ_STATE_DISABLED);
+    return mp_const_none;
+}
+MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_enable_irq_obj, 0, 1, machine_enable_irq);
+
+#if IRQ_ENABLE_STATS
+// return a memoryview of the irq statistics array
+STATIC mp_obj_t pyb_irq_stats(void) {
+    return mp_obj_new_memoryview(0x80 | 'I', MP_ARRAY_SIZE(irq_stats), &irq_stats[0]);
+}
+MP_DEFINE_CONST_FUN_OBJ_0(pyb_irq_stats_obj, pyb_irq_stats);
+#endif
diff --git a/ports/renesas-ra/irq.h b/ports/renesas-ra/irq.h
new file mode 100644
index 0000000000000..f2d0478224676
--- /dev/null
+++ b/ports/renesas-ra/irq.h
@@ -0,0 +1,241 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013, 2014 Damien P. George
+ * Copyright (c) 2021 Renesas Electronics Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#ifndef MICROPY_INCLUDED_RA_IRQ_H
+#define MICROPY_INCLUDED_RA_IRQ_H
+
+// Use this macro together with NVIC_SetPriority to indicate that an IRQn is non-negative,
+// which helps the compiler optimise the resulting inline function.
+#define IRQn_NONNEG(pri) ((pri) & 0x7f)
+
+// these states correspond to values from query_irq, enable_irq and disable_irq
+#define IRQ_STATE_DISABLED (0x00000001)
+#define IRQ_STATE_ENABLED  (0x00000000)
+
+// Enable this to get a count for the number of times each irq handler is called,
+// accessible via pyb.irq_stats().
+#define IRQ_ENABLE_STATS (0)
+
+#if IRQ_ENABLE_STATS
+#if defined(RA4M1) | defined(RA4W1)
+#define IRQ_STATS_MAX   (48)
+#else
+#define IRQ_STATS_MAX   (128)
+#endif
+extern uint32_t irq_stats[IRQ_STATS_MAX];
+#define IRQ_ENTER(irq) ++irq_stats[irq]
+#define IRQ_EXIT(irq)
+#else
+#define IRQ_ENTER(irq)
+#define IRQ_EXIT(irq)
+#endif
+
+static inline uint32_t query_irq(void) {
+    return __get_PRIMASK();
+}
+
+// enable_irq and disable_irq are defined inline in mpconfigport.h
+
+#if __CORTEX_M >= 0x03
+
+// irqs with a priority value greater or equal to "pri" will be disabled
+// "pri" should be between 1 and 15 inclusive
+static inline uint32_t raise_irq_pri(uint32_t pri) {
+    uint32_t basepri = __get_BASEPRI();
+    // If non-zero, the processor does not process any exception with a
+    // priority value greater than or equal to BASEPRI.
+    // When writing to BASEPRI_MAX the write goes to BASEPRI only if either:
+    //   - Rn is non-zero and the current BASEPRI value is 0
+    //   - Rn is non-zero and less than the current BASEPRI value
+    pri <<= (8 - __NVIC_PRIO_BITS);
+    __ASM volatile ("msr basepri_max, %0" : : "r" (pri) : "memory");
+    return basepri;
+}
+
+// "basepri" should be the value returned from raise_irq_pri
+static inline void restore_irq_pri(uint32_t basepri) {
+    __set_BASEPRI(basepri);
+}
+
+#else
+
+static inline uint32_t raise_irq_pri(uint32_t pri) {
+    return disable_irq();
+}
+
+// "state" should be the value returned from raise_irq_pri
+static inline void restore_irq_pri(uint32_t state) {
+    enable_irq(state);
+}
+
+#endif
+
+// IRQ priority definitions.
+//
+// Lower number implies higher interrupt priority.
+//
+// The default priority grouping is set to NVIC_PRIORITYGROUP_4 in the
+// HAL_Init function. This corresponds to 4 bits for the priority field
+// and 0 bits for the sub-priority field (which means that for all intensive
+// purposes that the sub-priorities below are ignored).
+//
+// While a given interrupt is being processed, only higher priority (lower number)
+// interrupts will preempt a given interrupt. If sub-priorities are active
+// then the sub-priority determines the order that pending interrupts of
+// a given priority are executed. This is only meaningful if 2 or more
+// interrupts of the same priority are pending at the same time.
+//
+// The priority of the SysTick timer is determined from the TICK_INT_PRIORITY
+// value which is normally set to 0 in the stm32f4xx_hal_conf.h file.
+//
+// The following interrupts are arranged from highest priority to lowest
+// priority to make it a bit easier to figure out.
+
+#if __CORTEX_M == 0
+
+#define IRQ_PRI_SYSTICK         0
+#define IRQ_PRI_UART            1
+#define IRQ_PRI_SDIO            1
+#define IRQ_PRI_DMA             1
+#define IRQ_PRI_FLASH           2
+#define IRQ_PRI_OTG_FS          2
+#define IRQ_PRI_OTG_HS          2
+#define IRQ_PRI_TIM5            2
+#define IRQ_PRI_CAN             2
+#define IRQ_PRI_TIMX            2
+#define IRQ_PRI_EXTINT          2
+#define IRQ_PRI_PENDSV          3
+#define IRQ_PRI_RTC_WKUP        3
+
+#else
+
+#define NVIC_PRIORITYGROUP_0         0x00000007U /*!< 0 bits for pre-emption priority
+                                                      4 bits for subpriority */
+#define NVIC_PRIORITYGROUP_1         0x00000006U /*!< 1 bits for pre-emption priority
+                                                      3 bits for subpriority */
+#define NVIC_PRIORITYGROUP_2         0x00000005U /*!< 2 bits for pre-emption priority
+                                                      2 bits for subpriority */
+#define NVIC_PRIORITYGROUP_3         0x00000004U /*!< 3 bits for pre-emption priority
+                                                      1 bits for subpriority */
+#define NVIC_PRIORITYGROUP_4         0x00000003U /*!< 4 bits for pre-emption priority
+                                                      0 bits for subpriority */
+
+#if defined(RA_PRI_SYSTICK)
+#define IRQ_PRI_SYSTICK         NVIC_EncodePriority(NVIC_PRIORITYGROUP_4, RA_PRI_SYSTICK, 0)
+#else
+#define IRQ_PRI_SYSTICK         NVIC_EncodePriority(NVIC_PRIORITYGROUP_4, 0, 0)
+#endif
+
+// The UARTs have no FIFOs, so if they don't get serviced quickly then characters
+// get dropped. The handling for each character only consumes about 0.5 usec
+#if defined(RA_PRI_UART)
+#define IRQ_PRI_UART            NVIC_EncodePriority(NVIC_PRIORITYGROUP_4, RA_PRI_UART, 0)
+#else
+#define IRQ_PRI_UART            NVIC_EncodePriority(NVIC_PRIORITYGROUP_4, 1, 0)
+#endif
+
+// SDIO must be higher priority than DMA for SDIO DMA transfers to work.
+#if defined(RA_PRI_SDIO)
+#define IRQ_PRI_SDIO            NVIC_EncodePriority(NVIC_PRIORITYGROUP_4, RA_PRI_SDIO, 0)
+#else
+#define IRQ_PRI_SDIO            NVIC_EncodePriority(NVIC_PRIORITYGROUP_4, 4, 0)
+#endif
+
+// DMA should be higher priority than USB, since USB Mass Storage calls
+// into the sdcard driver which waits for the DMA to complete.
+#if defined(RA_PRI_DMA)
+#define IRQ_PRI_DMA             NVIC_EncodePriority(NVIC_PRIORITYGROUP_4, RA_PRI_DMA, 0)
+#else
+#define IRQ_PRI_DMA             NVIC_EncodePriority(NVIC_PRIORITYGROUP_4, 5, 0)
+#endif
+
+// Flash IRQ (used for flushing storage cache) must be at the same priority as
+// the USB IRQs, so that the IRQ priority can be raised to this level to disable
+// both the USB and cache flushing, when storage transfers are in progress.
+#if defined(RA_PRI_FLASH)
+#define IRQ_PRI_FLASH           NVIC_EncodePriority(NVIC_PRIORITYGROUP_4, RA_PRI_FLASH, 0)
+#else
+#define IRQ_PRI_FLASH           NVIC_EncodePriority(NVIC_PRIORITYGROUP_4, 6, 0)
+#endif
+
+#if defined(RA_PRI_OTG_FS)
+#define IRQ_PRI_OTG_FS          NVIC_EncodePriority(NVIC_PRIORITYGROUP_4, RA_PRI_OTG_FS, 0)
+#else
+#define IRQ_PRI_OTG_FS          NVIC_EncodePriority(NVIC_PRIORITYGROUP_4, 6, 0)
+#endif
+#if defined(RA_PRI_OTG_HS)
+#define IRQ_PRI_OTG_HS          NVIC_EncodePriority(NVIC_PRIORITYGROUP_4, RA_PRI_OTG_HS, 0)
+#else
+#define IRQ_PRI_OTG_HS          NVIC_EncodePriority(NVIC_PRIORITYGROUP_4, 6, 0)
+#endif
+#if defined(RA_PRI_TIM5)
+#define IRQ_PRI_TIM5            NVIC_EncodePriority(NVIC_PRIORITYGROUP_4, RA_PRI_TIM5, 0)
+#else
+#define IRQ_PRI_TIM5            NVIC_EncodePriority(NVIC_PRIORITYGROUP_4, 6, 0)
+#endif
+
+#if defined(RA_PRI_CAN)
+#define IRQ_PRI_CAN             NVIC_EncodePriority(NVIC_PRIORITYGROUP_4, RA_PRI_CAN, 0)
+#else
+#define IRQ_PRI_CAN             NVIC_EncodePriority(NVIC_PRIORITYGROUP_4, 7, 0)
+#endif
+
+#if defined(RA_PRI_SPI)
+#define IRQ_PRI_SPI             NVIC_EncodePriority(NVIC_PRIORITYGROUP_4, RA_PRI_SPI, 0)
+#else
+#define IRQ_PRI_SPI             NVIC_EncodePriority(NVIC_PRIORITYGROUP_4, 8, 0)
+#endif
+
+// Interrupt priority for non-special timers.
+#if defined(RA_PRI_TIMX)
+#define IRQ_PRI_TIMX            NVIC_EncodePriority(NVIC_PRIORITYGROUP_4, RA_PRI_TIMX, 0)
+#else
+#define IRQ_PRI_TIMX            NVIC_EncodePriority(NVIC_PRIORITYGROUP_4, 13, 0)
+#endif
+
+#if defined(RA_PRI_EXTINT)
+#define IRQ_PRI_EXTINT          NVIC_EncodePriority(NVIC_PRIORITYGROUP_4, RA_PRI_EXTINT, 0)
+#else
+#define IRQ_PRI_EXTINT          NVIC_EncodePriority(NVIC_PRIORITYGROUP_4, 14, 0)
+#endif
+
+// PENDSV should be at the lowst priority so that other interrupts complete
+// before exception is raised.
+#if defined(RA_PRI_PENDSV)
+#define IRQ_PRI_PENDSV          NVIC_EncodePriority(NVIC_PRIORITYGROUP_4, RA_PRI_PENDSV, 0)
+#else
+#define IRQ_PRI_PENDSV          NVIC_EncodePriority(NVIC_PRIORITYGROUP_4, 15, 0)
+#endif
+#if defined(RA_PRI_RTC_WKUP)
+#define IRQ_PRI_RTC_WKUP        NVIC_EncodePriority(NVIC_PRIORITYGROUP_4, RA_PRI_RTC_WKUP, 0)
+#else
+#define IRQ_PRI_RTC_WKUP        NVIC_EncodePriority(NVIC_PRIORITYGROUP_4, 15, 0)
+#endif
+
+#endif
+
+#endif // MICROPY_INCLUDED_RA_IRQ_H
diff --git a/ports/renesas-ra/led.c b/ports/renesas-ra/led.c
new file mode 100644
index 0000000000000..efc09d9de1b08
--- /dev/null
+++ b/ports/renesas-ra/led.c
@@ -0,0 +1,190 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013-2016 Damien P. George
+ * Copyright (c) 2021,2022 Renesas Electronics Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include <stdio.h>
+
+#include "py/runtime.h"
+#include "py/mphal.h"
+#include "timer.h"
+#include "led.h"
+#include "pin.h"
+
+#if defined(MICROPY_HW_LED1)
+
+/// \moduleref pyb
+/// \class LED - LED object
+///
+/// The LED object controls an individual LED (Light Emitting Diode).
+
+// the default is that LEDs are not inverted, and pin driven high turns them on
+#ifndef MICROPY_HW_LED_INVERTED
+#define MICROPY_HW_LED_INVERTED (0)
+#endif
+
+typedef struct _ra_led_obj_t {
+    mp_obj_base_t base;
+    mp_uint_t led_id;
+    const machine_pin_obj_t *led_pin;
+} ra_led_obj_t;
+
+STATIC const ra_led_obj_t ra_led_obj[] = {
+    {{&ra_led_type}, 1, MICROPY_HW_LED1},
+    #if defined(MICROPY_HW_LED2)
+    {{&ra_led_type}, 2, MICROPY_HW_LED2},
+    #if defined(MICROPY_HW_LED3)
+    {{&ra_led_type}, 3, MICROPY_HW_LED3},
+    #if defined(MICROPY_HW_LED4)
+    {{&ra_led_type}, 4, MICROPY_HW_LED4},
+    #endif
+    #endif
+    #endif
+};
+#define NUM_LEDS MP_ARRAY_SIZE(ra_led_obj)
+
+void led_init(void) {
+    /* Turn off LEDs and initialize */
+    for (int led = 0; led < NUM_LEDS; led++) {
+        const machine_pin_obj_t *led_pin = ra_led_obj[led].led_pin;
+        MICROPY_HW_LED_OFF(led_pin);
+        mp_hal_pin_output(led_pin);
+    }
+}
+
+void led_state(ra_led_t led, int state) {
+    if (led < 1 || led > NUM_LEDS) {
+        return;
+    }
+
+    const machine_pin_obj_t *led_pin = ra_led_obj[led - 1].led_pin;
+    // printf("led_state(%d,%d)\n", led, state);
+    if (state == 0) {
+        // turn LED off
+        MICROPY_HW_LED_OFF(led_pin);
+    } else {
+        // turn LED on
+        MICROPY_HW_LED_ON(led_pin);
+    }
+}
+
+void led_toggle(ra_led_t led) {
+    if (led < 1 || led > NUM_LEDS) {
+        return;
+    }
+    const machine_pin_obj_t *led_pin = ra_led_obj[led - 1].led_pin;
+    MICROPY_HW_LED_TOGGLE(led_pin);
+}
+
+void led_debug(int n, int delay) {
+    led_state(1, n & 1);
+    led_state(2, n & 2);
+    led_state(3, n & 4);
+    led_state(4, n & 8);
+    mp_hal_delay_ms(delay);
+}
+
+/******************************************************************************/
+/* MicroPython bindings                                                       */
+
+void led_obj_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+    ra_led_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    mp_printf(print, "LED(%u)", self->led_id);
+}
+
+/// \classmethod \constructor(id)
+/// Create an LED object associated with the given LED:
+///
+///   - `id` is the LED number, 1-4.
+STATIC mp_obj_t led_obj_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
+    // check arguments
+    mp_arg_check_num(n_args, n_kw, 1, 1, false);
+
+    // get led number
+    mp_int_t led_id = mp_obj_get_int(args[0]);
+
+    // check led number
+    if (!(1 <= led_id && led_id <= NUM_LEDS)) {
+        mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("LED(%d) doesn't exist"), led_id);
+    }
+
+    // return static led object
+    return MP_OBJ_FROM_PTR(&ra_led_obj[led_id - 1]);
+}
+
+/// \method on()
+/// Turn the LED on.
+mp_obj_t led_obj_on(mp_obj_t self_in) {
+    ra_led_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    led_state(self->led_id, 1);
+    return mp_const_none;
+}
+
+/// \method off()
+/// Turn the LED off.
+mp_obj_t led_obj_off(mp_obj_t self_in) {
+    ra_led_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    led_state(self->led_id, 0);
+    return mp_const_none;
+}
+
+/// \method toggle()
+/// Toggle the LED between on and off.
+mp_obj_t led_obj_toggle(mp_obj_t self_in) {
+    ra_led_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    led_toggle(self->led_id);
+    return mp_const_none;
+}
+
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(led_obj_on_obj, led_obj_on);
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(led_obj_off_obj, led_obj_off);
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(led_obj_toggle_obj, led_obj_toggle);
+
+STATIC const mp_rom_map_elem_t led_locals_dict_table[] = {
+    { MP_ROM_QSTR(MP_QSTR_on), MP_ROM_PTR(&led_obj_on_obj) },
+    { MP_ROM_QSTR(MP_QSTR_off), MP_ROM_PTR(&led_obj_off_obj) },
+    { MP_ROM_QSTR(MP_QSTR_toggle), MP_ROM_PTR(&led_obj_toggle_obj) },
+};
+
+STATIC MP_DEFINE_CONST_DICT(led_locals_dict, led_locals_dict_table);
+
+const mp_obj_type_t ra_led_type = {
+    { &mp_type_type },
+    .name = MP_QSTR_LED,
+    .print = led_obj_print,
+    .make_new = led_obj_make_new,
+    .locals_dict = (mp_obj_dict_t *)&led_locals_dict,
+};
+
+#else
+// For boards with no LEDs, we leave an empty function here so that we don't
+// have to put conditionals everywhere.
+void led_init(void) {
+}
+void led_state(ra_led_t led, int state) {
+}
+void led_toggle(ra_led_t led) {
+}
+#endif  // defined(MICROPY_HW_LED1)
diff --git a/ports/renesas-ra/led.h b/ports/renesas-ra/led.h
new file mode 100644
index 0000000000000..2689c7094d280
--- /dev/null
+++ b/ports/renesas-ra/led.h
@@ -0,0 +1,44 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013, 2014 Damien P. George
+ * Copyright (c) 2022 Renesas Electronics Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+#ifndef MICROPY_INCLUDED_RENESAS_RA_LED_H
+#define MICROPY_INCLUDED_RENESAS_RA_LED_H
+
+typedef enum {
+    RA_LED1 = 1,
+    RA_LED2 = 2,
+    RA_LED3 = 3,
+    RA_LED4 = 4,
+} ra_led_t;
+
+void led_init(void);
+void led_state(ra_led_t led, int state);
+void led_toggle(ra_led_t led);
+void led_debug(int value, int delay);
+
+extern const mp_obj_type_t ra_led_type;
+
+#endif // MICROPY_INCLUDED_RENESAS_RA_LED_H
diff --git a/ports/renesas-ra/machine_adc.c b/ports/renesas-ra/machine_adc.c
new file mode 100644
index 0000000000000..29e50b8a39f97
--- /dev/null
+++ b/ports/renesas-ra/machine_adc.c
@@ -0,0 +1,136 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2019 Damien P. George
+ * Copyright (c) 2021,2022 Renesas Electronics Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "py/runtime.h"
+#include "py/mphal.h"
+#include "ra_adc.h"
+
+#define ADC_SAMPLETIME_DEFAULT  1
+#define ADC_CHANNEL_VREFINT     (ADC_REF)
+#define ADC_CHANNEL_TEMPSENSOR  (ADC_TEMP)
+#define ADC_SAMPLETIME_DEFAULT_INT  1
+
+typedef struct {
+    uint8_t dummy;
+} ADC_TypeDef;
+
+// Timeout for waiting for end-of-conversion
+#define ADC_EOC_TIMEOUT_MS (10)
+
+// This is a synthesised channel representing the maximum ADC reading (useful to scale other channels)
+#define ADC_CHANNEL_VREF (0xffff)
+
+/******************************************************************************/
+// MicroPython bindings for machine.ADC
+
+const mp_obj_type_t machine_adc_type;
+
+typedef struct _machine_adc_obj_t {
+    mp_obj_base_t base;
+    ADC_TypeDef *adc;
+    uint32_t channel;
+    uint32_t pin;
+    uint32_t sample_time;
+} machine_adc_obj_t;
+
+STATIC void machine_adc_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+    machine_adc_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    uint8_t resolution = (uint8_t)ra_adc_get_resolution();
+    mp_printf(print, "<ADC%u channel=%u>", resolution, self->channel);
+}
+
+// ADC(id)
+STATIC mp_obj_t machine_adc_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
+    // Check number of arguments
+    mp_arg_check_num(n_args, n_kw, 1, 1, false);
+
+    mp_obj_t source = all_args[0];
+    bool find = false;
+    uint8_t channel;
+    uint32_t pin;
+    uint32_t sample_time = ADC_SAMPLETIME_DEFAULT;
+    if (mp_obj_is_int(source)) {
+        channel = (uint8_t)mp_obj_get_int(source);
+        find = ra_adc_ch_to_pin((uint8_t)channel, (uint32_t *)&pin);
+        if (!find) {
+            mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("Channel(%q) does not have ADC capabilities"), channel);
+        }
+    } else {
+        const machine_pin_obj_t *pin_obj = machine_pin_find(source);
+        find = ra_adc_pin_to_ch((uint32_t)pin_obj->pin, (uint8_t *)&channel);
+        if (!find) {
+            mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("Pin(%q) does not have ADC capabilities"), pin_obj->name);
+        }
+        pin = pin_obj->pin;
+    }
+    ra_adc_init();
+    machine_adc_obj_t *o = m_new_obj(machine_adc_obj_t);
+    o->base.type = &machine_adc_type;
+    o->adc = (ADC_TypeDef *)NULL;
+    o->channel = channel;
+    o->pin = pin;
+    o->sample_time = sample_time;
+    ra_adc_enable((uint8_t)pin);
+    return MP_OBJ_FROM_PTR(o);
+}
+
+STATIC mp_obj_t machine_adc_read(mp_obj_t self_in) {
+    machine_adc_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    return MP_OBJ_NEW_SMALL_INT(ra_adc_read((uint32_t)(self->pin)));
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_adc_read_obj, machine_adc_read);
+
+STATIC mp_obj_t machine_adc_read_u16(mp_obj_t self_in) {
+    const machine_adc_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    mp_uint_t raw = (mp_uint_t)ra_adc_read((uint32_t)(self->pin));
+    mp_int_t bits = (mp_int_t)ra_adc_get_resolution();
+    // Scale raw reading to 16 bit value using a Taylor expansion (for 8 <= bits <= 16)
+    mp_uint_t u16 = raw << (16 - bits) | raw >> (2 * bits - 16);
+    return MP_OBJ_NEW_SMALL_INT(u16);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_adc_read_u16_obj, machine_adc_read_u16);
+
+STATIC const mp_rom_map_elem_t machine_adc_locals_dict_table[] = {
+    { MP_ROM_QSTR(MP_QSTR_read), MP_ROM_PTR(&machine_adc_read_obj) },
+    { MP_ROM_QSTR(MP_QSTR_read_u16), MP_ROM_PTR(&machine_adc_read_u16_obj) },
+
+    { MP_ROM_QSTR(MP_QSTR_VREF), MP_ROM_INT(ADC_CHANNEL_VREF) },
+    { MP_ROM_QSTR(MP_QSTR_CORE_VREF), MP_ROM_INT(ADC_CHANNEL_VREFINT) },
+    { MP_ROM_QSTR(MP_QSTR_CORE_TEMP), MP_ROM_INT(ADC_CHANNEL_TEMPSENSOR) },
+    #if defined(ADC_CHANNEL_VBAT)
+    { MP_ROM_QSTR(MP_QSTR_CORE_VBAT), MP_ROM_INT(ADC_CHANNEL_VBAT) },
+    #endif
+};
+STATIC MP_DEFINE_CONST_DICT(machine_adc_locals_dict, machine_adc_locals_dict_table);
+
+const mp_obj_type_t machine_adc_type = {
+    { &mp_type_type },
+    .name = MP_QSTR_ADC,
+    .print = machine_adc_print,
+    .make_new = machine_adc_make_new,
+    .locals_dict = (mp_obj_dict_t *)&machine_adc_locals_dict,
+};
diff --git a/ports/renesas-ra/machine_i2c.c b/ports/renesas-ra/machine_i2c.c
new file mode 100644
index 0000000000000..5f385f363e6d4
--- /dev/null
+++ b/ports/renesas-ra/machine_i2c.c
@@ -0,0 +1,180 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2016-2018 Damien P. George
+ * Copyright (c) 2021,2022 Renesas Electronics Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include <stdio.h>
+#include <string.h>
+
+#include "py/runtime.h"
+#include "py/mphal.h"
+#include "py/mperrno.h"
+#include "extmod/machine_i2c.h"
+#include "modmachine.h"
+
+#include "ra_i2c.h"
+
+#if MICROPY_HW_ENABLE_HW_I2C
+
+#define DEFAULT_I2C_FREQ (400000)
+#define DEFAULT_I2C_TIMEOUT (1000)
+
+typedef struct _machine_i2c_obj_t {
+    mp_obj_base_t base;
+    R_IIC0_Type *i2c_inst;
+    uint8_t i2c_id;
+    mp_hal_pin_obj_t scl;
+    mp_hal_pin_obj_t sda;
+    uint32_t freq;
+} machine_i2c_obj_t;
+
+STATIC machine_i2c_obj_t machine_i2c_obj[] = {
+    #if defined(MICROPY_HW_I2C0_SCL)
+    {{&machine_i2c_type}, R_IIC0, 0, MICROPY_HW_I2C0_SCL, MICROPY_HW_I2C0_SDA, 0},
+    #endif
+    #if defined(MICROPY_HW_I2C1_SCL)
+    {{&machine_i2c_type}, R_IIC1, 1, MICROPY_HW_I2C1_SCL, MICROPY_HW_I2C1_SDA, 0},
+    #endif
+    #if defined(MICROPY_HW_I2C2_SCL)
+    {{&machine_i2c_type}, R_IIC2, 2, MICROPY_HW_I2C2_SCL, MICROPY_HW_I2C2_SDA, 0},
+    #endif
+};
+
+STATIC int i2c_read(machine_i2c_obj_t *self, uint16_t addr, uint8_t *dest, size_t len, bool stop);
+STATIC int i2c_write(machine_i2c_obj_t *self, uint16_t addr, const uint8_t *src, size_t len, bool stop);
+
+STATIC int i2c_read(machine_i2c_obj_t *self, uint16_t addr, uint8_t *dest, size_t len, bool stop) {
+    bool flag;
+    xaction_t action;
+    xaction_unit_t unit;
+    ra_i2c_xunit_init(&unit, (uint8_t *)dest, (uint32_t)len, true, (void *)NULL);
+    ra_i2c_xaction_init(&action, (xaction_unit_t *)&unit, 1, (uint32_t)addr, stop);
+    flag = ra_i2c_action_execute(self->i2c_inst, &action, false, DEFAULT_I2C_TIMEOUT);
+    return flag? len:-1;
+}
+
+STATIC int i2c_write(machine_i2c_obj_t *self, uint16_t addr, const uint8_t *src, size_t len, bool stop) {
+    bool flag;
+    xaction_t action;
+    xaction_unit_t unit;
+    ra_i2c_xunit_init(&unit, (uint8_t *)src, (uint32_t)len, false, (void *)NULL);
+    ra_i2c_xaction_init(&action, (xaction_unit_t *)&unit, 1, (uint32_t)addr, stop);
+    flag = ra_i2c_action_execute(self->i2c_inst, &action, false, DEFAULT_I2C_TIMEOUT);
+    return flag? len:-1;
+}
+
+// MicroPython bindings for machine API
+
+STATIC void machine_i2c_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+    machine_i2c_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    mp_printf(print, "I2C(%u, freq=%u, scl=%q, sda=%q)",
+        self->i2c_id, self->freq, self->scl->name, self->sda->name);
+}
+
+STATIC void  machine_i2c_init(mp_obj_base_t *obj, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    mp_raise_NotImplementedError(MP_ERROR_TEXT("init is not supported."));
+    return;
+}
+
+STATIC mp_obj_t machine_i2c_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
+    // parse args
+    enum { ARG_id, ARG_freq, ARG_scl, ARG_sda };
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_id, MP_ARG_REQUIRED | MP_ARG_OBJ },
+        { MP_QSTR_freq, MP_ARG_INT, {.u_int = DEFAULT_I2C_FREQ} },
+        { MP_QSTR_scl, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
+        { MP_QSTR_sda, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
+    };
+    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
+    mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
+
+    // get static peripheral object
+    bool found = false;
+    int i2c_id = mp_obj_get_int(args[ARG_id].u_obj);
+    machine_i2c_obj_t *self = (machine_i2c_obj_t *)&machine_i2c_obj[0];
+    for (int i = 0; i < MP_ARRAY_SIZE(machine_i2c_obj); i++) {
+        if (i2c_id == self->i2c_id) {
+            found = true;
+            break;
+        }
+        ++self;
+    }
+    if (found != true) {
+        mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("I2C(%d) doesn't exist"), i2c_id);
+    }
+
+    // here we would check the scl/sda pins and configure them, but it's not implemented
+    if (args[ARG_scl].u_obj != MP_OBJ_NULL || args[ARG_sda].u_obj != MP_OBJ_NULL) {
+        mp_raise_ValueError(MP_ERROR_TEXT("explicit choice of scl/sda is not implemented"));
+    }
+
+    if (n_args > 1 || n_kw > 0 || self->freq == 0) {
+        self->freq = args[ARG_freq].u_int;
+        ra_i2c_init(self->i2c_inst, self->scl->pin, self->sda->pin, self->freq);
+    }
+    return MP_OBJ_FROM_PTR(self);
+}
+
+STATIC int machine_i2c_transfer_single(mp_obj_base_t *self_in, uint16_t addr, size_t len, uint8_t *buf, unsigned int flags) {
+    machine_i2c_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    int ret;
+    bool stop;
+    stop = (flags & MP_MACHINE_I2C_FLAG_STOP)? true : false;
+    if (flags & MP_MACHINE_I2C_FLAG_READ) {
+        ret = i2c_read(self, addr, buf, len, stop);
+    } else {
+        ret = i2c_write(self, addr, buf, len, stop);
+    }
+    return ret;
+}
+
+STATIC int machine_i2c_start(mp_obj_base_t *self) {
+    mp_raise_NotImplementedError(MP_ERROR_TEXT("start is not supported."));
+    return 0;
+}
+
+STATIC int machine_i2c_stop(mp_obj_base_t *self) {
+    mp_raise_NotImplementedError(MP_ERROR_TEXT("start is not supported."));
+    return 0;
+}
+
+STATIC const mp_machine_i2c_p_t machine_i2c_p = {
+    .init = machine_i2c_init,
+    .transfer = mp_machine_i2c_transfer_adaptor,
+    .transfer_single = machine_i2c_transfer_single,
+    .start = machine_i2c_start,
+    .stop = machine_i2c_stop,
+};
+
+const mp_obj_type_t machine_i2c_type = {
+    { &mp_type_type },
+    .name = MP_QSTR_I2C,
+    .print = machine_i2c_print,
+    .make_new = machine_i2c_make_new,
+    .protocol = &machine_i2c_p,
+    .locals_dict = (mp_obj_dict_t *)&mp_machine_i2c_locals_dict,
+};
+
+#endif // MICROPY_HW_ENABLE_HW_I2C
diff --git a/ports/renesas-ra/machine_pin.c b/ports/renesas-ra/machine_pin.c
new file mode 100644
index 0000000000000..e07794e4b25ae
--- /dev/null
+++ b/ports/renesas-ra/machine_pin.c
@@ -0,0 +1,642 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2016-2021 Damien P. George
+ * Copyright (c) 2022 Renesas Electronics Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include <stdio.h>
+#include <stdint.h>
+#include <string.h>
+
+#include "py/runtime.h"
+#include "py/mphal.h"
+#include "shared/runtime/mpirq.h"
+#include "modmachine.h"
+#include "extmod/virtpin.h"
+
+#include "pin.h"
+#include "extint.h"
+
+// Pin class variables
+STATIC bool pin_class_debug;
+
+void machine_pin_init(void) {
+    MP_STATE_PORT(pin_class_mapper) = mp_const_none;
+    MP_STATE_PORT(pin_class_map_dict) = mp_const_none;
+    pin_class_debug = false;
+}
+
+void machine_pin_deinit(void) {
+}
+
+// C API used to convert a user-supplied pin name into an ordinal pin number.
+const machine_pin_obj_t *machine_pin_find(mp_obj_t user_obj) {
+    const machine_pin_obj_t *pin_obj;
+
+    // If a pin was provided, then use it
+    if (mp_obj_is_type(user_obj, &machine_pin_type)) {
+        pin_obj = MP_OBJ_TO_PTR(user_obj);
+        if (pin_class_debug) {
+            printf("Pin map passed pin ");
+            mp_obj_print(MP_OBJ_FROM_PTR(pin_obj), PRINT_STR);
+            printf("\n");
+        }
+        return pin_obj;
+    }
+
+    if (MP_STATE_PORT(pin_class_mapper) != mp_const_none) {
+        mp_obj_t o = mp_call_function_1(MP_STATE_PORT(pin_class_mapper), user_obj);
+        if (o != mp_const_none) {
+            if (!mp_obj_is_type(o, &machine_pin_type)) {
+                mp_raise_ValueError(MP_ERROR_TEXT("Pin.mapper didn't return a Pin object"));
+            }
+            if (pin_class_debug) {
+                printf("Pin.mapper maps ");
+                mp_obj_print(user_obj, PRINT_REPR);
+                printf(" to ");
+                mp_obj_print(o, PRINT_STR);
+                printf("\n");
+            }
+            return MP_OBJ_TO_PTR(o);
+        }
+        // The pin mapping function returned mp_const_none, fall through to
+        // other lookup methods.
+    }
+
+    if (MP_STATE_PORT(pin_class_map_dict) != mp_const_none) {
+        mp_map_t *pin_map_map = mp_obj_dict_get_map(MP_STATE_PORT(pin_class_map_dict));
+        mp_map_elem_t *elem = mp_map_lookup(pin_map_map, user_obj, MP_MAP_LOOKUP);
+        if (elem != NULL && elem->value != MP_OBJ_NULL) {
+            mp_obj_t o = elem->value;
+            if (pin_class_debug) {
+                printf("Pin.map_dict maps ");
+                mp_obj_print(user_obj, PRINT_REPR);
+                printf(" to ");
+                mp_obj_print(o, PRINT_STR);
+                printf("\n");
+            }
+            return MP_OBJ_TO_PTR(o);
+        }
+    }
+
+    // See if the pin name matches a board pin
+    pin_obj = pin_find_named_pin(&pin_board_pins_locals_dict, user_obj);
+    if (pin_obj) {
+        if (pin_class_debug) {
+            printf("Pin.board maps ");
+            mp_obj_print(user_obj, PRINT_REPR);
+            printf(" to ");
+            mp_obj_print(MP_OBJ_FROM_PTR(pin_obj), PRINT_STR);
+            printf("\n");
+        }
+        return pin_obj;
+    }
+
+    // See if the pin name matches a cpu pin
+    pin_obj = pin_find_named_pin(&pin_cpu_pins_locals_dict, user_obj);
+    if (pin_obj) {
+        if (pin_class_debug) {
+            printf("Pin.cpu maps ");
+            mp_obj_print(user_obj, PRINT_REPR);
+            printf(" to ");
+            mp_obj_print(MP_OBJ_FROM_PTR(pin_obj), PRINT_STR);
+            printf("\n");
+        }
+        return pin_obj;
+    }
+
+    mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("Pin(%s) doesn't exist"), mp_obj_str_get_str(user_obj));
+}
+
+/// Return a string describing the pin object.
+STATIC void machine_pin_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+    machine_pin_obj_t *self = MP_OBJ_TO_PTR(self_in);
+
+    // pin name
+    mp_printf(print, "Pin(Pin.cpu.%q, mode=Pin.", self->name);
+
+    uint32_t mode = pin_get_mode(self);
+
+    if (mode == GPIO_MODE_ANALOG) {
+        // analog
+        mp_print_str(print, "ANALOG)");
+
+    } else {
+        // IO mode
+        bool af = false;
+        qstr mode_qst;
+        if (mode == GPIO_MODE_INPUT) {
+            mode_qst = MP_QSTR_IN;
+        } else if (mode == GPIO_MODE_OUTPUT_PP) {
+            mode_qst = MP_QSTR_OUT;
+        } else if (mode == GPIO_MODE_OUTPUT_OD) {
+            mode_qst = MP_QSTR_OPEN_DRAIN;
+        } else {
+            af = true;
+            if (mode == GPIO_MODE_AF_PP) {
+                mode_qst = MP_QSTR_ALT;
+            } else {
+                mode_qst = MP_QSTR_ALT_OPEN_DRAIN;
+            }
+        }
+        mp_print_str(print, qstr_str(mode_qst));
+
+        // pull mode
+        qstr pull_qst = MP_QSTRnull;
+        uint32_t pull = pin_get_pull(self);
+        if (pull == GPIO_PULLUP) {
+            pull_qst = MP_QSTR_PULL_UP;
+        } else if (pull == GPIO_NOPULL) {
+            pull_qst = MP_QSTR_PULL_NONE;
+        }
+        if (pull_qst != MP_QSTRnull) {
+            mp_printf(print, ", pull=Pin.%q", pull_qst);
+        }
+
+        // drive
+        qstr drive_qst = MP_QSTRnull;
+        uint32_t drive = pin_get_drive(self);
+        if (drive == GPIO_HIGH_POWER) {
+            drive_qst = MP_QSTR_HIGH_POWER;
+        } else if (drive == GPIO_MED_POWER) {
+            drive_qst = MP_QSTR_MED_POWER;
+        } else if (drive == GPIO_LOW_POWER) {
+            drive_qst = MP_QSTR_LOW_POWER;
+        }
+        if (drive_qst != MP_QSTRnull) {
+            mp_printf(print, ", drive=Pin.%q", drive_qst);
+        }
+
+        // AF mode
+        if (af) {
+            mp_uint_t af_idx = pin_get_af(self);
+            const pin_af_obj_t *af_obj = pin_find_af_by_index(self, af_idx);
+            if (af_obj == NULL) {
+                mp_printf(print, ", alt=%d)", af_idx);
+            } else {
+                mp_printf(print, ", alt=Pin.%q)", af_obj->name);
+            }
+        } else {
+            mp_print_str(print, ")");
+        }
+    }
+}
+
+// pin.init(mode, pull=None, *, value=None, driver=None, alt=FUNC_SIO)
+STATIC mp_obj_t machine_pin_obj_init_helper(const machine_pin_obj_t *self, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_mode, MP_ARG_REQUIRED | MP_ARG_INT },
+        { MP_QSTR_pull, MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE}},
+        { MP_QSTR_af, MP_ARG_INT, {.u_int = -1}}, // legacy
+        { MP_QSTR_value, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL}},
+        { MP_QSTR_drive, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = GPIO_LOW_POWER}},
+        { MP_QSTR_alt, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1}},
+    };
+
+    // parse args
+    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
+    mp_arg_parse_all(n_args, pos_args, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
+
+    // get io mode
+    uint mode = args[0].u_int;
+    if (!IS_GPIO_MODE(mode)) {
+        mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("invalid pin mode: %d"), mode);
+    }
+
+    // get pull mode
+    uint pull = 0;
+    if (args[1].u_obj != mp_const_none) {
+        pull = mp_obj_get_int(args[1].u_obj);
+    }
+
+    // get drive
+    uint drive = args[4].u_int;
+    if (!IS_GPIO_DRIVE(drive)) {
+        mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("invalid pin drive: %d"), drive);
+    }
+
+    mp_hal_pin_config(self, mode, pull, drive, -1);
+    // if given, set the pin value before initialising to prevent glitches
+    if (args[3].u_obj != MP_OBJ_NULL) {
+        mp_hal_pin_write(self, mp_obj_is_true(args[3].u_obj));
+    }
+
+    return mp_const_none;
+}
+
+// constructor(id, ...)
+mp_obj_t mp_pin_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
+    mp_arg_check_num(n_args, n_kw, 1, MP_OBJ_FUN_ARGS_MAX, true);
+
+    // Run an argument through the mapper and return the result.
+    const machine_pin_obj_t *pin = machine_pin_find(args[0]);
+
+    if (n_args > 1 || n_kw > 0) {
+        // pin mode given, so configure this GPIO
+        mp_map_t kw_args;
+        mp_map_init_fixed_table(&kw_args, n_kw, args + n_args);
+        machine_pin_obj_init_helper(pin, n_args - 1, args + 1, &kw_args);
+    }
+
+    return MP_OBJ_FROM_PTR(pin);
+}
+
+// fast method for getting/setting pin value
+STATIC mp_obj_t machine_pin_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
+    mp_arg_check_num(n_args, n_kw, 0, 1, false);
+    machine_pin_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    if (n_args == 0) {
+        // get pin
+        return MP_OBJ_NEW_SMALL_INT(mp_hal_pin_read(self));
+    } else {
+        // set pin
+        mp_hal_pin_write(self, mp_obj_is_true(args[0]));
+        return mp_const_none;
+    }
+}
+
+/// \classmethod mapper([fun])
+/// Get or set the pin mapper function.
+STATIC mp_obj_t pin_mapper(size_t n_args, const mp_obj_t *args) {
+    if (n_args > 1) {
+        MP_STATE_PORT(pin_class_mapper) = args[1];
+        return mp_const_none;
+    }
+    return MP_STATE_PORT(pin_class_mapper);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pin_mapper_fun_obj, 1, 2, pin_mapper);
+STATIC MP_DEFINE_CONST_CLASSMETHOD_OBJ(pin_mapper_obj, MP_ROM_PTR(&pin_mapper_fun_obj));
+
+/// \classmethod dict([dict])
+/// Get or set the pin mapper dictionary.
+STATIC mp_obj_t pin_map_dict(size_t n_args, const mp_obj_t *args) {
+    if (n_args > 1) {
+        MP_STATE_PORT(pin_class_map_dict) = args[1];
+        return mp_const_none;
+    }
+    return MP_STATE_PORT(pin_class_map_dict);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pin_map_dict_fun_obj, 1, 2, pin_map_dict);
+STATIC MP_DEFINE_CONST_CLASSMETHOD_OBJ(pin_map_dict_obj, MP_ROM_PTR(&pin_map_dict_fun_obj));
+
+#if 0
+/// \classmethod af_list()
+/// Returns an array of alternate functions available for this pin.
+STATIC mp_obj_t pin_af_list(mp_obj_t self_in) {
+    machine_pin_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    mp_obj_t result = mp_obj_new_list(0, NULL);
+
+    const pin_af_obj_t *af = self->af;
+    for (mp_uint_t i = 0; i < self->num_af; i++, af++) {
+        mp_obj_list_append(result, MP_OBJ_FROM_PTR(af));
+    }
+    return result;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(pin_af_list_obj, pin_af_list);
+#endif
+
+/// \classmethod debug([state])
+/// Get or set the debugging state (`True` or `False` for on or off).
+STATIC mp_obj_t pin_debug(size_t n_args, const mp_obj_t *args) {
+    if (n_args > 1) {
+        pin_class_debug = mp_obj_is_true(args[1]);
+        return mp_const_none;
+    }
+    return mp_obj_new_bool(pin_class_debug);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pin_debug_fun_obj, 1, 2, pin_debug);
+STATIC MP_DEFINE_CONST_CLASSMETHOD_OBJ(pin_debug_obj, MP_ROM_PTR(&pin_debug_fun_obj));
+
+// pin.init(mode, pull)
+STATIC mp_obj_t machine_pin_obj_init(size_t n_args, const mp_obj_t *args, mp_map_t *kw_args) {
+    return machine_pin_obj_init_helper(args[0], n_args - 1, args + 1, kw_args);
+}
+MP_DEFINE_CONST_FUN_OBJ_KW(machine_pin_init_obj, 1, machine_pin_obj_init);
+
+// pin.value([value])
+STATIC mp_obj_t machine_pin_value(size_t n_args, const mp_obj_t *args) {
+    return machine_pin_call(args[0], n_args - 1, 0, args + 1);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_pin_value_obj, 1, 2, machine_pin_value);
+
+// pin.low()
+STATIC mp_obj_t machine_pin_low(mp_obj_t self_in) {
+    machine_pin_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    mp_hal_pin_write(self, false);
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_pin_low_obj, machine_pin_low);
+
+// pin.high()
+STATIC mp_obj_t machine_pin_high(mp_obj_t self_in) {
+    machine_pin_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    mp_hal_pin_write(self, true);
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_pin_high_obj, machine_pin_high);
+
+// pin.mode()
+STATIC mp_obj_t machine_pin_mode(mp_obj_t self_in) {
+    return MP_OBJ_NEW_SMALL_INT(pin_get_mode(MP_OBJ_TO_PTR(self_in)));
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_pin_mode_obj, machine_pin_mode);
+
+// pin.pull()
+STATIC mp_obj_t machine_pin_pull(mp_obj_t self_in) {
+    return MP_OBJ_NEW_SMALL_INT(pin_get_pull(MP_OBJ_TO_PTR(self_in)));
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_pin_pull_obj, machine_pin_pull);
+
+// pin.drive()
+STATIC mp_obj_t machine_pin_drive(mp_obj_t self_in) {
+    mp_raise_NotImplementedError(MP_ERROR_TEXT("Pin.drive() is not supported yet"));
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_pin_drive_obj, machine_pin_drive);
+
+// pin.toggle()
+STATIC mp_obj_t machine_pin_toggle(mp_obj_t self_in) {
+    machine_pin_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    mp_hal_pin_toggle(self);
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_pin_toggle_obj, machine_pin_toggle);
+
+// pin.irq(handler=None, trigger=IRQ_FALLING|IRQ_RISING, hard=False)
+STATIC mp_obj_t machine_pin_irq(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    enum { ARG_handler, ARG_trigger, ARG_hard };
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_handler, MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
+        { MP_QSTR_trigger, MP_ARG_INT, {.u_int = GPIO_MODE_IT_RISING | GPIO_MODE_IT_FALLING} },
+        { MP_QSTR_hard, MP_ARG_BOOL, {.u_bool = false} },
+    };
+    machine_pin_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]);
+    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
+    mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
+
+    if (n_args > 1 || kw_args->used != 0) {
+        // configure irq
+        extint_register_pin(self, args[ARG_trigger].u_int,
+            args[ARG_hard].u_bool, args[ARG_handler].u_obj);
+    }
+
+    // TODO should return an IRQ object
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_KW(machine_pin_irq_obj, 1, machine_pin_irq);
+
+/// \method af()
+/// Returns the currently configured alternate-function of the pin. The
+/// integer returned will match one of the allowed constants for the af
+/// argument to the init function.
+STATIC mp_obj_t machine_pin_af(mp_obj_t self_in) {
+    return MP_OBJ_NEW_SMALL_INT(pin_get_af(MP_OBJ_TO_PTR(self_in)));
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_pin_af_obj, machine_pin_af);
+
+STATIC const mp_rom_map_elem_t machine_pin_locals_dict_table[] = {
+    // instance methods
+    { MP_ROM_QSTR(MP_QSTR_init), MP_ROM_PTR(&machine_pin_init_obj) },
+    { MP_ROM_QSTR(MP_QSTR_value), MP_ROM_PTR(&machine_pin_value_obj) },
+    { MP_ROM_QSTR(MP_QSTR_on), MP_ROM_PTR(&machine_pin_high_obj) },
+    { MP_ROM_QSTR(MP_QSTR_off), MP_ROM_PTR(&machine_pin_low_obj) },
+    { MP_ROM_QSTR(MP_QSTR_irq), MP_ROM_PTR(&machine_pin_irq_obj) },
+    { MP_ROM_QSTR(MP_QSTR_low), MP_ROM_PTR(&machine_pin_low_obj) },
+    { MP_ROM_QSTR(MP_QSTR_high), MP_ROM_PTR(&machine_pin_high_obj) },
+    { MP_ROM_QSTR(MP_QSTR_mode), MP_ROM_PTR(&machine_pin_mode_obj) },
+    { MP_ROM_QSTR(MP_QSTR_pull), MP_ROM_PTR(&machine_pin_pull_obj) },
+    { MP_ROM_QSTR(MP_QSTR_drive), MP_ROM_PTR(&machine_pin_drive_obj) },
+    { MP_ROM_QSTR(MP_QSTR_toggle), MP_ROM_PTR(&machine_pin_toggle_obj) },
+    #if 0
+    { MP_ROM_QSTR(MP_QSTR_af_list), MP_ROM_PTR(&pin_af_list) },
+    #endif
+    { MP_ROM_QSTR(MP_QSTR_af),      MP_ROM_PTR(&machine_pin_af_obj) },
+
+    // class methods
+    { MP_ROM_QSTR(MP_QSTR_mapper),  MP_ROM_PTR(&pin_mapper_obj) },
+    { MP_ROM_QSTR(MP_QSTR_dict),    MP_ROM_PTR(&pin_map_dict_obj) },
+    { MP_ROM_QSTR(MP_QSTR_debug),   MP_ROM_PTR(&pin_debug_obj) },
+
+    // class attributes
+    { MP_ROM_QSTR(MP_QSTR_board),   MP_ROM_PTR(&pin_board_pins_obj_type) },
+    { MP_ROM_QSTR(MP_QSTR_cpu),     MP_ROM_PTR(&pin_cpu_pins_obj_type) },
+
+
+    // class constants
+    { MP_ROM_QSTR(MP_QSTR_IN), MP_ROM_INT(GPIO_MODE_INPUT) },
+    { MP_ROM_QSTR(MP_QSTR_OUT), MP_ROM_INT(GPIO_MODE_OUTPUT_PP) },
+    { MP_ROM_QSTR(MP_QSTR_OPEN_DRAIN), MP_ROM_INT(GPIO_MODE_OUTPUT_OD) },
+    { MP_ROM_QSTR(MP_QSTR_ALT), MP_ROM_INT(GPIO_MODE_AF_PP) },
+    { MP_ROM_QSTR(MP_QSTR_ALT_OPEN_DRAIN), MP_ROM_INT(GPIO_MODE_AF_OD) },
+    { MP_ROM_QSTR(MP_QSTR_ANALOG), MP_ROM_INT(GPIO_MODE_ANALOG) },
+    { MP_ROM_QSTR(MP_QSTR_PULL_UP), MP_ROM_INT(GPIO_PULLUP) },
+    { MP_ROM_QSTR(MP_QSTR_PULL_DOWN), MP_ROM_INT(GPIO_PULLDOWN) },
+    { MP_ROM_QSTR(MP_QSTR_PULL_HOLD), MP_ROM_INT(GPIO_PULLHOLD) },
+    { MP_ROM_QSTR(MP_QSTR_PULL_NONE), MP_ROM_INT(GPIO_NOPULL) },
+    { MP_ROM_QSTR(MP_QSTR_LOW_POWER), MP_ROM_INT(GPIO_LOW_POWER) },
+    { MP_ROM_QSTR(MP_QSTR_MED_POWER), MP_ROM_INT(GPIO_MED_POWER) },
+    { MP_ROM_QSTR(MP_QSTR_HIGH_POWER), MP_ROM_INT(GPIO_HIGH_POWER) },
+    { MP_ROM_QSTR(MP_QSTR_IRQ_RISING), MP_ROM_INT(GPIO_MODE_IT_RISING) },
+    { MP_ROM_QSTR(MP_QSTR_IRQ_FALLING), MP_ROM_INT(GPIO_MODE_IT_FALLING) },
+    { MP_ROM_QSTR(MP_QSTR_IRQ_RISING_FALLING), MP_ROM_INT(GPIO_MODE_IT_RISING_FALLING) },
+    { MP_ROM_QSTR(MP_QSTR_EVT_RISING), MP_ROM_INT(GPIO_MODE_EVT_RISING) },
+    { MP_ROM_QSTR(MP_QSTR_EVT_FALLING), MP_ROM_INT(GPIO_MODE_EVT_FALLING) },
+    { MP_ROM_QSTR(MP_QSTR_EVT_RISING_FALLING), MP_ROM_INT(GPIO_MODE_EVT_RISING_FALLING) },
+    { MP_ROM_QSTR(MP_QSTR_IRQ_LOWLEVEL), MP_ROM_INT(GPIO_IRQ_LOWLEVEL) },
+    { MP_ROM_QSTR(MP_QSTR_IRQ_HIGHLEVEL), MP_ROM_INT(GPIO_IRQ_HIGHLEVEL) },
+};
+STATIC MP_DEFINE_CONST_DICT(machine_pin_locals_dict, machine_pin_locals_dict_table);
+
+STATIC mp_uint_t machine_pin_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_t arg, int *errcode) {
+    (void)errcode;
+    machine_pin_obj_t *self = MP_OBJ_TO_PTR(self_in);
+
+    switch (request) {
+        case MP_PIN_READ: {
+            return mp_hal_pin_read(self);
+        }
+        case MP_PIN_WRITE: {
+            mp_hal_pin_write(self, arg);
+            return 0;
+        }
+    }
+    return -1;
+}
+
+STATIC const mp_pin_p_t machine_pin_pin_p = {
+    .ioctl = machine_pin_ioctl,
+};
+
+const mp_obj_type_t machine_pin_type = {
+    { &mp_type_type },
+    .name = MP_QSTR_Pin,
+    .print = machine_pin_print,
+    .make_new = mp_pin_make_new,
+    .call = machine_pin_call,
+    .protocol = &machine_pin_pin_p,
+    .locals_dict = (mp_obj_t)&machine_pin_locals_dict,
+};
+
+// Returns the pin mode. This value returned by this macro should be one of:
+// GPIO_MODE_INPUT, GPIO_MODE_OUTPUT_PP, GPIO_MODE_OUTPUT_OD,
+// GPIO_MODE_AF_PP, GPIO_MODE_AF_OD, or GPIO_MODE_ANALOG.
+
+uint32_t pin_get_mode(const machine_pin_obj_t *pin) {
+    return ra_gpio_get_mode(pin->pin);
+}
+
+// Returns the pin pullup/pulldown. The value returned by this macro should
+// be one of GPIO_NOPULL, GPIO_PULLUP, or GPIO_PULLDOWN.
+
+uint32_t pin_get_pull(const machine_pin_obj_t *pin) {
+    return (uint32_t)ra_gpio_get_pull(pin->pin);
+}
+
+// Returns the pin drive. The value returned by this macro should
+// be one of GPIO_HIGH_POWER, GPIO_MED_POWER, or GPIO_LOW_POWER.
+
+uint32_t pin_get_drive(const machine_pin_obj_t *pin) {
+    return (uint32_t)ra_gpio_get_drive(pin->pin);
+}
+
+// Returns the af (alternate function) index currently set for a pin.
+
+uint32_t pin_get_af(const machine_pin_obj_t *pin) {
+    return (uint32_t)ra_gpio_get_af(pin->pin);
+}
+
+const mp_obj_type_t pin_cpu_pins_obj_type = {
+    { &mp_type_type },
+    .name = MP_QSTR_cpu,
+    .locals_dict = (mp_obj_dict_t *)&pin_cpu_pins_locals_dict,
+};
+
+const mp_obj_type_t pin_board_pins_obj_type = {
+    { &mp_type_type },
+    .name = MP_QSTR_board,
+    .locals_dict = (mp_obj_dict_t *)&pin_board_pins_locals_dict,
+};
+
+const machine_pin_obj_t *pin_find_named_pin(const mp_obj_dict_t *named_pins, mp_obj_t name) {
+    const mp_map_t *named_map = &named_pins->map;
+    mp_map_elem_t *named_elem = mp_map_lookup((mp_map_t *)named_map, name, MP_MAP_LOOKUP);
+    if (named_elem != NULL && named_elem->value != MP_OBJ_NULL) {
+        return MP_OBJ_TO_PTR(named_elem->value);
+    }
+    return NULL;
+}
+
+const pin_af_obj_t *pin_find_af(const machine_pin_obj_t *pin, uint8_t fn, uint8_t unit) {
+    const pin_af_obj_t *af = pin->af;
+    for (mp_uint_t i = 0; i < pin->num_af; i++, af++) {
+        if (af->fn == fn && af->unit == unit) {
+            return af;
+        }
+    }
+    return NULL;
+}
+
+const pin_af_obj_t *pin_find_af_by_index(const machine_pin_obj_t *pin, mp_uint_t af_idx) {
+    const pin_af_obj_t *af = pin->af;
+    for (mp_uint_t i = 0; i < pin->num_af; i++, af++) {
+        if (af->idx == af_idx) {
+            return af;
+        }
+    }
+    return NULL;
+}
+
+// ====================================================================
+// PinAF
+// ====================================================================
+
+/// \moduleref pyb
+/// \class PinAF - Pin Alternate Functions
+///
+/// A Pin represents a physical pin on the microcprocessor. Each pin
+/// can have a variety of functions (GPIO, I2C SDA, etc). Each PinAF
+/// object represents a particular function for a pin.
+///
+/// Usage Model:
+///
+///     x3 = pyb.Pin.board.X3
+///     x3_af = x3.af_list()
+///
+/// x3_af will now contain an array of PinAF objects which are availble on
+/// pin X3.
+///
+/// For the pyboard, x3_af would contain:
+///     [Pin.AF1_TIM2, Pin.AF2_TIM5, Pin.AF3_TIM9, Pin.AF7_USART2]
+///
+/// Normally, each peripheral would configure the af automatically, but sometimes
+/// the same function is available on multiple pins, and having more control
+/// is desired.
+///
+/// To configure X3 to expose TIM2_CH3, you could use:
+///    pin = pyb.Pin(pyb.Pin.board.X3, mode=pyb.Pin.AF_PP, af=pyb.Pin.AF1_TIM2)
+/// or:
+///    pin = pyb.Pin(pyb.Pin.board.X3, mode=pyb.Pin.AF_PP, af=1)
+
+/// \method __str__()
+/// Return a string describing the alternate function.
+STATIC void pin_af_obj_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+    pin_af_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    mp_printf(print, "Pin.%q", self->name);
+}
+
+/// \method index()
+/// Return the alternate function index.
+STATIC mp_obj_t pin_af_index(mp_obj_t self_in) {
+    pin_af_obj_t *af = MP_OBJ_TO_PTR(self_in);
+    return MP_OBJ_NEW_SMALL_INT(af->idx);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(pin_af_index_obj, pin_af_index);
+
+/// \method name()
+/// Return the name of the alternate function.
+STATIC mp_obj_t pin_af_name(mp_obj_t self_in) {
+    pin_af_obj_t *af = MP_OBJ_TO_PTR(self_in);
+    return MP_OBJ_NEW_QSTR(af->name);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(pin_af_name_obj, pin_af_name);
+
+STATIC mp_obj_t pin_af_reg(mp_obj_t self_in) {
+    pin_af_obj_t *af = MP_OBJ_TO_PTR(self_in);
+    return MP_OBJ_NEW_SMALL_INT((uintptr_t)af->reg);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(pin_af_reg_obj, pin_af_reg);
+
+STATIC const mp_rom_map_elem_t pin_af_locals_dict_table[] = {
+    { MP_ROM_QSTR(MP_QSTR_index), MP_ROM_PTR(&pin_af_index_obj) },
+    { MP_ROM_QSTR(MP_QSTR_name), MP_ROM_PTR(&pin_af_name_obj) },
+    { MP_ROM_QSTR(MP_QSTR_reg), MP_ROM_PTR(&pin_af_reg_obj) },
+};
+STATIC MP_DEFINE_CONST_DICT(pin_af_locals_dict, pin_af_locals_dict_table);
+
+const mp_obj_type_t pin_af_type = {
+    { &mp_type_type },
+    .name = MP_QSTR_PinAF,
+    .print = pin_af_obj_print,
+    .locals_dict = (mp_obj_dict_t *)&pin_af_locals_dict,
+};
diff --git a/ports/renesas-ra/machine_rtc.c b/ports/renesas-ra/machine_rtc.c
new file mode 100644
index 0000000000000..9f698b6bcb57e
--- /dev/null
+++ b/ports/renesas-ra/machine_rtc.c
@@ -0,0 +1,349 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013, 2014 Damien P. George
+ * Copyright (c) 2021 Renesas Electronics Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include <stdio.h>
+
+#include "py/runtime.h"
+#include "shared/timeutils/timeutils.h"
+#include "extint.h"
+#include "rtc.h"
+#include "irq.h"
+#if defined(RA4M1) | defined(RA4M3) | defined(RA4W1) | defined(RA6M1) | defined(RA6M2) | defined(RA6M3)
+#include "ra_rtc.h"
+#endif
+
+#define RTC_INIT_YEAR   2019
+#define RTC_INIT_MONTH  1
+#define RTC_INIT_DATE   1
+#define RTC_INIT_WEEKDAY    2   /* Tuesday */
+#define RTC_INIT_HOUR   0
+#define RTC_INIT_MINUTE 0
+#define RTC_INIT_SECOND 0
+
+/// \moduleref pyb
+/// \class RTC - real time clock
+///
+/// The RTC is and independent clock that keeps track of the date
+/// and time.
+///
+/// Example usage:
+///
+///     rtc = pyb.RTC()
+///     rtc.datetime((2014, 5, 1, 4, 13, 0, 0, 0))
+///     print(rtc.datetime())
+
+#define HAL_StatusTypeDef       void
+// rtc_info indicates various things about RTC startup
+// it's a bit of a hack at the moment
+static mp_uint_t rtc_info;
+
+STATIC uint32_t rtc_startup_tick;
+STATIC bool rtc_need_init_finalise = false;
+STATIC uint32_t rtc_wakeup_param;
+
+STATIC void rtc_calendar_config(void) {
+    ra_rtc_t tm;
+    tm.year = RTC_INIT_YEAR - 2000;
+    tm.month = RTC_INIT_MONTH;
+    tm.date = RTC_INIT_DATE;
+    tm.weekday = RTC_INIT_WEEKDAY;
+    tm.hour = RTC_INIT_HOUR;
+    tm.minute = RTC_INIT_MINUTE;
+    tm.second = RTC_INIT_SECOND;
+    ra_rtc_set_time(&tm);
+}
+
+void rtc_get_time(RTC_TimeTypeDef *time) {
+    ra_rtc_t dt;
+    ra_rtc_get_time(&dt);
+    time->DayLightSaving = 0;
+    time->Hours = dt.hour;
+    time->Minutes = dt.minute;
+    time->SecondFraction = 0;
+    time->Seconds = dt.second;
+    // time->StoreOperation;
+    time->SubSeconds = 0;
+    time->TimeFormat = 0;
+}
+
+void rtc_get_date(RTC_DateTypeDef *date) {
+    ra_rtc_t dt;
+    ra_rtc_get_time(&dt);
+    date->Date = dt.date;
+    date->Month = dt.month;
+    date->WeekDay = dt.weekday;
+    date->Year = (uint8_t)(dt.year - 2000);
+}
+
+void rtc_init_start(bool force_init) {
+    /* Configure RTC prescaler and RTC data registers */
+    #if (MICROPY_HW_RTC_SOURCE == 1)
+    // clock source is LOCO
+    ra_rtc_init(1);
+    #else
+    // clock source is subclock
+    ra_rtc_init(0);
+    #endif
+    rtc_need_init_finalise = false;
+
+    if (!force_init) {
+        // So far, this case (force_init == false) is not called.
+        rtc_info |= 0x40000;
+        // or rtc_info |= 0x80000;
+        return;
+    }
+
+    rtc_startup_tick = HAL_GetTick();
+    rtc_info = 0x3f000000 | (rtc_startup_tick & 0xffffff);
+    rtc_need_init_finalise = true;
+}
+
+void rtc_init_finalise(void) {
+    if (!rtc_need_init_finalise) {
+        return;
+    }
+    rtc_info = 0x20000000;
+    rtc_info |= (HAL_GetTick() - rtc_startup_tick) & 0xffff;
+    rtc_calendar_config();
+    rtc_need_init_finalise = false;
+}
+
+uint64_t mp_hal_time_ns(void) {
+    uint64_t ns = 0;
+    #if MICROPY_HW_ENABLE_RTC
+    // Get current according to the RTC.
+    rtc_init_finalise();
+    RTC_TimeTypeDef time;
+    RTC_DateTypeDef date;
+    rtc_get_time(&time);
+    rtc_get_date(&date);
+    ns = timeutils_seconds_since_epoch(2000 + date.Year, date.Month, date.Date, time.Hours, time.Minutes, time.Seconds);
+    ns *= 1000000000ULL;
+    #endif
+    return ns;
+}
+
+/******************************************************************************/
+// MicroPython bindings
+
+typedef struct _pyb_rtc_obj_t {
+    mp_obj_base_t base;
+} pyb_rtc_obj_t;
+
+STATIC const pyb_rtc_obj_t pyb_rtc_obj = {{&pyb_rtc_type}};
+
+/// \classmethod \constructor()
+/// Create an RTC object.
+STATIC mp_obj_t pyb_rtc_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
+    // check arguments
+    mp_arg_check_num(n_args, n_kw, 0, 0, false);
+
+    // return constant object
+    return MP_OBJ_FROM_PTR(&pyb_rtc_obj);
+}
+
+// force rtc to re-initialise
+mp_obj_t pyb_rtc_init(mp_obj_t self_in) {
+    rtc_init_start(true);
+    rtc_init_finalise();
+    return mp_const_none;
+}
+MP_DEFINE_CONST_FUN_OBJ_1(pyb_rtc_init_obj, pyb_rtc_init);
+
+/// \method info()
+/// Get information about the startup time and reset source.
+///
+///  - The lower 0xffff are the number of milliseconds the RTC took to
+///    start up.
+///  - Bit 0x10000 is set if a power-on reset occurred.
+///  - Bit 0x20000 is set if an external reset occurred
+mp_obj_t pyb_rtc_info(mp_obj_t self_in) {
+    return mp_obj_new_int(rtc_info);
+}
+MP_DEFINE_CONST_FUN_OBJ_1(pyb_rtc_info_obj, pyb_rtc_info);
+
+/// \method datetime([datetimetuple])
+/// Get or set the date and time of the RTC.
+///
+/// With no arguments, this method returns an 8-tuple with the current
+/// date and time.  With 1 argument (being an 8-tuple) it sets the date
+/// and time.
+///
+/// The 8-tuple has the following format:
+///
+///     (year, month, day, weekday, hours, minutes, seconds, subseconds)
+///
+/// `weekday` is 1-7 for Monday through Sunday.
+///
+/// `subseconds` counts down from 255 to 0
+
+#define MEG_DIV_64 (1000000 / 64)
+#define MEG_DIV_SCALE ((RTC_SYNCH_PREDIV + 1) / 64)
+
+#if defined(MICROPY_HW_RTC_USE_US) && MICROPY_HW_RTC_USE_US
+uint32_t rtc_subsec_to_us(uint32_t ss) {
+    return ((RTC_SYNCH_PREDIV - ss) * MEG_DIV_64) / MEG_DIV_SCALE;
+}
+
+uint32_t rtc_us_to_subsec(uint32_t us) {
+    return RTC_SYNCH_PREDIV - (us * MEG_DIV_SCALE / MEG_DIV_64);
+}
+#else
+#define rtc_us_to_subsec
+#define rtc_subsec_to_us
+#endif
+
+mp_obj_t pyb_rtc_datetime(size_t n_args, const mp_obj_t *args) {
+    rtc_init_finalise();
+    if (n_args == 1) {
+        ra_rtc_t time;
+        ra_rtc_get_time(&time);
+        mp_obj_t tuple[8] = {
+            mp_obj_new_int(time.year),
+            mp_obj_new_int(time.month),
+            mp_obj_new_int(time.date),
+            mp_obj_new_int(time.weekday),
+            mp_obj_new_int(time.hour),
+            mp_obj_new_int(time.minute),
+            mp_obj_new_int(time.second),
+            mp_obj_new_int(0),
+        };
+        return mp_obj_new_tuple(8, tuple);
+    } else {
+        // set date and time
+        mp_obj_t *items;
+        mp_obj_get_array_fixed_n(args[1], 8, &items);
+        ra_rtc_t tm;
+        tm.year = mp_obj_get_int(items[0]);
+        tm.month = mp_obj_get_int(items[1]);
+        tm.date = mp_obj_get_int(items[2]);
+        tm.weekday = mp_obj_get_int(items[3]);
+        tm.hour = mp_obj_get_int(items[4]);
+        tm.minute = mp_obj_get_int(items[5]);
+        tm.second = mp_obj_get_int(items[6]);
+        ra_rtc_set_time(&tm);
+        return mp_const_none;
+    }
+}
+MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pyb_rtc_datetime_obj, 1, 2, pyb_rtc_datetime);
+
+// wakeup(None)
+// wakeup(ms, callback=None) - ms should be between 4ms - 2000ms
+// wakeup(wucksel, wut, callback) - not implemented
+mp_obj_t pyb_rtc_wakeup(size_t n_args, const mp_obj_t *args) {
+    bool enable = false;
+    mp_int_t ms;
+    mp_obj_t callback = mp_const_none;
+    uint32_t period = 0;
+    if (args[1] == mp_const_none) {
+        // disable wakeup
+    } else {
+        // time given in ms
+        ms = mp_obj_get_int(args[1]);
+        if (ms <= 4) {
+            period = 6;
+        } else if (ms <= 8) {
+            period = 7;
+        } else if (ms <= 16) {
+            period = 8;
+        } else if (ms <= 32) {
+            period = 9;
+        } else if (ms <= 63) {
+            period = 10;
+        } else if (ms <= 125) {
+            period = 11;
+        } else if (ms <= 250) {
+            period = 12;
+        } else if (ms <= 500) {
+            period = 13;
+        } else if (ms <= 1000) {
+            period = 14;
+        } else if (ms <= 2000) {
+            period = 15;
+        }
+        enable = true;
+    }
+    if (n_args >= 2) {
+        callback = args[2];
+    }
+    // set the callback
+    MP_STATE_PORT(pyb_extint_callback)[EXTI_RTC_WAKEUP] = callback;
+    pyb_extint_callback_arg[EXTI_RTC_WAKEUP] = MP_OBJ_NEW_SMALL_INT(EXTI_RTC_WAKEUP);
+    rtc_wakeup_param = EXTI_RTC_WAKEUP;
+    if (enable) {
+        if (callback != mp_const_none) {
+            ra_rtc_set_period_func((void *)extint_callback, (void *)&rtc_wakeup_param);
+        } else {
+            ra_rtc_set_period_func((void *)NULL, (void *)NULL);
+        }
+        ra_rtc_set_period_time(period);
+        ra_rtc_period_on();
+    } else {
+        ra_rtc_period_off();
+    }
+    return mp_const_none;
+}
+MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pyb_rtc_wakeup_obj, 2, 3, pyb_rtc_wakeup);
+
+// calibration(None)
+// calibration(cal)
+// When an integer argument is provided, check that it falls in the range [-63(s) to 63(s)]
+// and set the calibration value; otherwise return calibration value
+mp_obj_t pyb_rtc_calibration(size_t n_args, const mp_obj_t *args) {
+    rtc_init_finalise();
+    mp_int_t cal;
+    if (n_args == 2) {
+        cal = mp_obj_get_int(args[1]);
+        if (cal < -63 || cal > 63) {
+            mp_raise_ValueError(MP_ERROR_TEXT("calibration value out of range"));
+        } else {
+            ra_rtc_set_adjustment(cal, 0); // calibration for second
+        }
+        return mp_const_none;
+    } else {
+        // get calibration register
+        cal = (mp_int_t)ra_rtc_get_adjustment();
+        return mp_obj_new_int(cal);
+    }
+}
+MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pyb_rtc_calibration_obj, 1, 2, pyb_rtc_calibration);
+
+STATIC const mp_rom_map_elem_t pyb_rtc_locals_dict_table[] = {
+    { MP_ROM_QSTR(MP_QSTR_init), MP_ROM_PTR(&pyb_rtc_init_obj) },
+    { MP_ROM_QSTR(MP_QSTR_info), MP_ROM_PTR(&pyb_rtc_info_obj) },
+    { MP_ROM_QSTR(MP_QSTR_datetime), MP_ROM_PTR(&pyb_rtc_datetime_obj) },
+    { MP_ROM_QSTR(MP_QSTR_wakeup), MP_ROM_PTR(&pyb_rtc_wakeup_obj) },
+    { MP_ROM_QSTR(MP_QSTR_calibration), MP_ROM_PTR(&pyb_rtc_calibration_obj) },
+};
+STATIC MP_DEFINE_CONST_DICT(pyb_rtc_locals_dict, pyb_rtc_locals_dict_table);
+
+const mp_obj_type_t pyb_rtc_type = {
+    { &mp_type_type },
+    .name = MP_QSTR_RTC,
+    .make_new = pyb_rtc_make_new,
+    .locals_dict = (mp_obj_dict_t *)&pyb_rtc_locals_dict,
+};
diff --git a/ports/renesas-ra/machine_spi.c b/ports/renesas-ra/machine_spi.c
new file mode 100644
index 0000000000000..01972ad457610
--- /dev/null
+++ b/ports/renesas-ra/machine_spi.c
@@ -0,0 +1,379 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013-2018 Damien P. George
+ * Copyright (c) 2021,2022 Renesas Electronics Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include <stdio.h>
+#include <string.h>
+
+#include "py/runtime.h"
+#include "py/mphal.h"
+#include "py/mperrno.h"
+#include "extmod/machine_spi.h"
+#include "pin.h"
+#include "spi.h"
+#include "ra/ra_spi.h"
+#include "modmachine.h"
+
+typedef struct _machine_hard_spi_obj_t {
+    mp_obj_base_t base;
+    uint8_t spi_id;
+    uint8_t polarity;
+    uint8_t phase;
+    uint8_t bits;
+    uint8_t firstbit;
+    uint32_t baudrate;
+    mp_hal_pin_obj_t sck;
+    mp_hal_pin_obj_t mosi;
+    mp_hal_pin_obj_t miso;
+} machine_hard_spi_obj_t;
+
+#define DEFAULT_SPI_BAUDRATE      (500000)
+#define DEFAULT_SPI_POLARITY      (0)
+#define DEFAULT_SPI_PHASE         (0)
+#define DEFAULT_SPI_BITS          (8)
+#define DEFAULT_SPI_FIRSTBIT      (MICROPY_PY_MACHINE_SPI_MSB)
+
+#define IS_VALID_SCK(obj_pin, arg_pin)      ((obj_pin) == (arg_pin))
+#define IS_VALID_MOSI(obj_pin, arg_pin)     ((obj_pin) == (arg_pin))
+#define IS_VALID_MISO(obj_pin, arg_pin)     ((obj_pin) == (arg_pin))
+#define IS_VALID_POLARITY(n)                (((n) == 0) || ((n) == 1))
+#define IS_VALID_PHASE(n)                   (((n) == 0) || ((n) == 1))
+#define IS_VALID_BITS(n)                    (((n) == 8) || ((n) == 16) || ((n) == 32))
+#define IS_VALID_FIRSTBIT(n)                ((n) == MICROPY_PY_MACHINE_SPI_LSB)
+
+/******************************************************************************/
+// Implementation of hard SPI for machine module
+
+STATIC machine_hard_spi_obj_t machine_hard_spi_obj[] = {
+    #if defined(MICROPY_HW_SPI0_RSPCK)
+    {
+        {&machine_hard_spi_type}, 0,
+        DEFAULT_SPI_POLARITY, DEFAULT_SPI_PHASE, DEFAULT_SPI_BITS,
+        DEFAULT_SPI_FIRSTBIT, DEFAULT_SPI_BAUDRATE,
+        MICROPY_HW_SPI0_RSPCK, MICROPY_HW_SPI0_MOSI, MICROPY_HW_SPI0_MISO,
+    },
+    #endif
+    #if defined(MICROPY_HW_SPI1_RSPCK)
+    {
+        {&machine_hard_spi_type}, 1,
+        DEFAULT_SPI_POLARITY, DEFAULT_SPI_PHASE, DEFAULT_SPI_BITS,
+        DEFAULT_SPI_FIRSTBIT, DEFAULT_SPI_BAUDRATE,
+        MICROPY_HW_SPI1_RSPCK, MICROPY_HW_SPI1_MOSI, MICROPY_HW_SPI1_MISO,
+    },
+    #endif
+};
+
+STATIC void machine_hard_spi_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+    machine_hard_spi_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    mp_printf(print, "SPI(%u, baudrate=%u, polarity=%u, phase=%u, bits=%u, firstbit=%u, sck=%q, mosi=%q, miso=%q)",
+        self->spi_id, self->baudrate, self->polarity, self->phase, self->bits,
+        self->firstbit, self->sck->name, self->mosi->name, self->miso->name);
+}
+
+mp_obj_t machine_hard_spi_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
+    MP_MACHINE_SPI_CHECK_FOR_LEGACY_SOFTSPI_CONSTRUCTION(n_args, n_kw, all_args);
+
+    enum { ARG_id, ARG_baudrate, ARG_polarity, ARG_phase, ARG_bits, ARG_firstbit, ARG_sck, ARG_mosi, ARG_miso };
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_id,       MP_ARG_REQUIRED | MP_ARG_OBJ },
+        { MP_QSTR_baudrate, MP_ARG_INT, {.u_int = -1} },
+        { MP_QSTR_polarity, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} },
+        { MP_QSTR_phase,    MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} },
+        { MP_QSTR_bits,     MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} },
+        { MP_QSTR_firstbit, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} },
+        { MP_QSTR_sck,      MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
+        { MP_QSTR_mosi,     MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
+        { MP_QSTR_miso,     MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
+    };
+    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
+    mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
+
+    // get the SPI bus id.
+    bool found = false;
+    int spi_id = mp_obj_get_int(args[ARG_id].u_obj);
+    machine_hard_spi_obj_t *self = (machine_hard_spi_obj_t *)&machine_hard_spi_obj[0];
+    for (int i = 0; i < MP_ARRAY_SIZE(machine_hard_spi_obj); i++) {
+        if (spi_id == self->spi_id) {
+            found = true;
+            break;
+        }
+        ++self;
+    }
+    if (found != true) {
+        mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("SPI(%d) doesno't exist"), spi_id);
+    }
+
+    if (args[ARG_baudrate].u_int != -1) {
+        self->baudrate = args[ARG_baudrate].u_int;
+    }
+    if (args[ARG_polarity].u_int != -1) {
+        if (IS_VALID_POLARITY(args[ARG_polarity].u_int)) {
+            self->polarity = args[ARG_polarity].u_int;
+        } else {
+            mp_raise_ValueError(MP_ERROR_TEXT("bad polarity"));
+        }
+    }
+    if (args[ARG_phase].u_int != -1) {
+        if (IS_VALID_PHASE(args[ARG_phase].u_int)) {
+            self->phase = args[ARG_phase].u_int;
+        } else {
+            mp_raise_ValueError(MP_ERROR_TEXT("bad phase"));
+        }
+    }
+    if (args[ARG_bits].u_int != -1) {
+        if (IS_VALID_BITS(args[ARG_bits].u_int)) {
+            self->bits = args[ARG_bits].u_int;
+        } else {
+            mp_raise_ValueError(MP_ERROR_TEXT("bad bits"));
+        }
+    }
+    if (args[ARG_firstbit].u_int != -1) {
+        if (IS_VALID_FIRSTBIT(args[ARG_firstbit].u_int)) {
+            self->firstbit = args[ARG_firstbit].u_int;
+        } else {
+            mp_raise_ValueError(MP_ERROR_TEXT("bad firstbit"));
+        }
+    }
+    // Set SCK/MOSI/MISO pins if configured.
+    // currently pins are fixed, can not be changed.
+    uint8_t sck, mosi, miso;
+
+    if (args[ARG_sck].u_obj == MP_OBJ_NULL) {
+        sck = self->sck->pin;
+    } else {
+        const machine_pin_obj_t *arg_sck = mp_hal_get_pin_obj(args[ARG_sck].u_obj);
+        sck = arg_sck->pin;
+        if (!IS_VALID_SCK(self->sck->pin, sck)) {
+            mp_raise_ValueError(MP_ERROR_TEXT("bad SCK pin"));
+        }
+    }
+    if (args[ARG_mosi].u_obj == MP_OBJ_NULL) {
+        mosi = self->mosi->pin;
+    } else {
+        const machine_pin_obj_t *arg_mosi = mp_hal_get_pin_obj(args[ARG_mosi].u_obj);
+        mosi = arg_mosi->pin;
+        if (!IS_VALID_MOSI(self->mosi->pin, mosi)) {
+            mp_raise_ValueError(MP_ERROR_TEXT("bad MOSI pin"));
+        }
+    }
+    if (args[ARG_miso].u_obj == MP_OBJ_NULL) {
+        miso = self->miso->pin;
+    } else {
+        const machine_pin_obj_t *arg_miso = mp_hal_get_pin_obj(args[ARG_miso].u_obj);
+        miso = arg_miso->pin;
+        if (!IS_VALID_MISO(self->miso->pin, miso)) {
+            mp_raise_ValueError(MP_ERROR_TEXT("bad MISO pin"));
+        }
+    }
+    // init the SPI bus
+    spi_init(self->spi_id);
+    // set configurable paramaters
+    spi_set_params(self->spi_id, self->baudrate, self->polarity,
+        self->phase, self->bits, self->firstbit);
+    return MP_OBJ_FROM_PTR(self);
+}
+
+STATIC void machine_hard_spi_init(mp_obj_base_t *self_in, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    machine_hard_spi_obj_t *self = (machine_hard_spi_obj_t *)self_in;
+
+    enum { ARG_baudrate, ARG_polarity, ARG_phase, ARG_bits, ARG_firstbit, ARG_sck, ARG_mosi, ARG_miso };
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_baudrate, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} },
+        { MP_QSTR_polarity, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} },
+        { MP_QSTR_phase,    MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} },
+        { MP_QSTR_bits,     MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} },
+        { MP_QSTR_firstbit, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} },
+        { MP_QSTR_sck,      MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
+        { MP_QSTR_mosi,     MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
+        { MP_QSTR_miso,     MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
+    };
+    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
+    mp_arg_parse_all(n_args, pos_args, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
+
+    // Set SCK/MOSI/MISO pins if configured.
+    // currently pins are fixed, can not be changed.
+    uint8_t sck, mosi, miso;
+
+    if (args[ARG_baudrate].u_int != -1) {
+        self->baudrate = args[ARG_baudrate].u_int;
+    }
+    if (args[ARG_polarity].u_int != -1) {
+        if (IS_VALID_POLARITY(args[ARG_polarity].u_int)) {
+            self->polarity = args[ARG_polarity].u_int;
+        } else {
+            mp_raise_ValueError(MP_ERROR_TEXT("bad polarity"));
+        }
+    }
+    if (args[ARG_phase].u_int != -1) {
+        if (IS_VALID_PHASE(args[ARG_phase].u_int)) {
+            self->phase = args[ARG_phase].u_int;
+        } else {
+            mp_raise_ValueError(MP_ERROR_TEXT("bad phase"));
+        }
+    }
+    if (args[ARG_bits].u_int != -1) {
+        if (IS_VALID_BITS(args[ARG_bits].u_int)) {
+            self->bits = args[ARG_bits].u_int;
+        } else {
+            mp_raise_ValueError(MP_ERROR_TEXT("bad bits"));
+        }
+    }
+    if (args[ARG_firstbit].u_int != -1) {
+        if (IS_VALID_FIRSTBIT(args[ARG_firstbit].u_int)) {
+            self->firstbit = args[ARG_firstbit].u_int;
+        } else {
+            mp_raise_ValueError(MP_ERROR_TEXT("bad firstbit"));
+        }
+    }
+    if (args[ARG_sck].u_obj != MP_OBJ_NULL) {
+        const machine_pin_obj_t *arg_sck = mp_hal_get_pin_obj(args[ARG_sck].u_obj);
+        sck = arg_sck->pin;
+        if (!IS_VALID_SCK(self->sck->pin, sck)) {
+            mp_raise_ValueError(MP_ERROR_TEXT("bad SCK pin"));
+        }
+    }
+    if (args[ARG_mosi].u_obj != MP_OBJ_NULL) {
+        const machine_pin_obj_t *arg_mosi = mp_hal_get_pin_obj(args[ARG_mosi].u_obj);
+        mosi = arg_mosi->pin;
+        if (!IS_VALID_MOSI(self->mosi->pin, mosi)) {
+            mp_raise_ValueError(MP_ERROR_TEXT("bad MOSI pin"));
+        }
+    }
+    if (args[ARG_miso].u_obj != MP_OBJ_NULL) {
+        const machine_pin_obj_t *arg_miso = mp_hal_get_pin_obj(args[ARG_miso].u_obj);
+        miso = arg_miso->pin;
+        if (!IS_VALID_MISO(self->miso->pin, miso)) {
+            mp_raise_ValueError(MP_ERROR_TEXT("bad MISO pin"));
+        }
+    }
+
+    if (self->firstbit == MICROPY_PY_MACHINE_SPI_LSB) {
+        mp_raise_NotImplementedError(MP_ERROR_TEXT("LSB"));
+    }
+
+    // init the SPI bus
+    spi_init(self->spi_id);
+    // set configurable paramaters
+    spi_set_params(self->spi_id, self->baudrate, self->polarity,
+        self->phase, self->bits, self->firstbit);
+}
+
+STATIC void machine_hard_spi_deinit(mp_obj_base_t *self_in) {
+    machine_hard_spi_obj_t *self = (machine_hard_spi_obj_t *)self_in;
+    spi_deinit(self->spi_id);
+}
+
+STATIC void machine_hard_spi_transfer(mp_obj_base_t *self_in, size_t len, const uint8_t *src, uint8_t *dest) {
+    machine_hard_spi_obj_t *self = (machine_hard_spi_obj_t *)self_in;
+    spi_transfer(self->spi_id, self->bits, len, src, dest, SPI_TRANSFER_TIMEOUT(len));
+}
+
+STATIC const mp_machine_spi_p_t machine_hard_spi_p = {
+    .init = machine_hard_spi_init,
+    .deinit = machine_hard_spi_deinit,
+    .transfer = machine_hard_spi_transfer,
+};
+
+const mp_obj_type_t machine_hard_spi_type = {
+    { &mp_type_type },
+    .name = MP_QSTR_SPI,
+    .print = machine_hard_spi_print,
+    .make_new = machine_hard_spi_make_new,
+    .protocol = &machine_hard_spi_p,
+    .locals_dict = (mp_obj_dict_t *)&mp_machine_spi_locals_dict,
+};
+
+void spi_init0(void) {
+}
+
+// sets the parameters in the SPI_InitTypeDef struct
+// if an argument is -1 then the corresponding parameter is not changed
+void spi_set_params(uint32_t ch, int32_t baudrate,
+    int32_t polarity, int32_t phase, int32_t bits, int32_t firstbit) {
+    ra_spi_set_mode(ch, polarity, phase);
+    ra_spi_set_clk(ch, baudrate);
+    ra_spi_set_bits(ch, bits);
+    ra_spi_set_lsb_first(ch, firstbit);
+}
+
+void spi_init(uint32_t ch) {
+    const machine_pin_obj_t *pins[4] = { NULL, NULL, NULL, NULL };
+
+    if (0) {
+    #if defined(MICROPY_HW_SPI0_RSPCK)
+    } else if (ch == 0) {
+        #if defined(MICROPY_HW_SPI0_SSL)
+        pins[0] = MICROPY_HW_SPI0_SSL;
+        #endif
+        #if defined(MICROPY_HW_SPI0_RSPCK)
+        pins[1] = MICROPY_HW_SPI0_RSPCK;
+        #endif
+        #if defined(MICROPY_HW_SPI0_MISO)
+        pins[2] = MICROPY_HW_SPI0_MISO;
+        #endif
+        #if defined(MICROPY_HW_SPI0_MOSI)
+        pins[3] = MICROPY_HW_SPI0_MOSI;
+        #endif
+        ra_spi_init(ch, pins[3]->pin, pins[2]->pin, pins[1]->pin, pins[0]->pin, DEFAULT_SPI_BAUDRATE, DEFAULT_SPI_BITS, DEFAULT_SPI_POLARITY, DEFAULT_SPI_PHASE);
+    #endif
+    #if defined(MICROPY_HW_SPI1_RSPCK)
+    } else if (ch == 1) {
+        #if defined(MICROPY_HW_SPI1_SSL)
+        pins[0] = MICROPY_HW_SPI1_SSL;
+        #endif
+        #if defined(MICROPY_HW_SPI1_RSPCK)
+        pins[1] = MICROPY_HW_SPI1_RSPCK;
+        #endif
+        #if defined(MICROPY_HW_SPI1_MISO)
+        pins[2] = MICROPY_HW_SPI1_MISO;
+        #endif
+        #if defined(MICROPY_HW_SPI1_MOSI)
+        pins[3] = MICROPY_HW_SPI1_MOSI;
+        #endif
+        ra_spi_init(ch, pins[3]->pin, pins[2]->pin, pins[1]->pin, pins[0]->pin, DEFAULT_SPI_BAUDRATE, DEFAULT_SPI_BITS, DEFAULT_SPI_POLARITY, DEFAULT_SPI_PHASE);
+    #endif
+    } else {
+        // SPI does not exist for this board (shouldn't get here, should be checked by caller)
+        return;
+    }
+}
+
+void spi_deinit(uint32_t ch) {
+    if (0) {
+    #if defined(MICROPY_HW_SPI0_RSPCK)
+    } else if (ch == 0) {
+        ra_spi_deinit(ch, 0);
+    #endif
+    #if defined(MICROPY_HW_SPI1_RSPCK)
+    } else if (ch == 1) {
+        ra_spi_deinit(ch, 0);
+    #endif
+    }
+}
+
+void spi_transfer(uint32_t ch, uint32_t bits, size_t len, const uint8_t *src, uint8_t *dest, uint32_t timeout) {
+    ra_spi_transfer(ch, bits, dest, (uint8_t *)src, (uint32_t)len, timeout);
+}
diff --git a/ports/renesas-ra/machine_timer.c b/ports/renesas-ra/machine_timer.c
new file mode 100644
index 0000000000000..c94532218773f
--- /dev/null
+++ b/ports/renesas-ra/machine_timer.c
@@ -0,0 +1,145 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2019 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "py/runtime.h"
+#include "py/mphal.h"
+#include "softtimer.h"
+
+typedef soft_timer_entry_t machine_timer_obj_t;
+
+const mp_obj_type_t machine_timer_type;
+
+STATIC void machine_timer_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+    machine_timer_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    qstr mode = self->mode == SOFT_TIMER_MODE_ONE_SHOT ? MP_QSTR_ONE_SHOT : MP_QSTR_PERIODIC;
+    mp_printf(print, "Timer(mode=%q, period=%u)", mode, self->delta_ms);
+}
+
+STATIC mp_obj_t machine_timer_init_helper(machine_timer_obj_t *self, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    enum { ARG_mode, ARG_callback, ARG_period, ARG_tick_hz, ARG_freq, };
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_mode,         MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = SOFT_TIMER_MODE_PERIODIC} },
+        { MP_QSTR_callback,     MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
+        { MP_QSTR_period,       MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 0xffffffff} },
+        { MP_QSTR_tick_hz,      MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 1000} },
+        { MP_QSTR_freq,         MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
+    };
+
+    // Parse args
+    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
+    mp_arg_parse_all(n_args, pos_args, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
+
+    self->mode = args[ARG_mode].u_int;
+
+    uint64_t delta_ms = self->delta_ms;
+    if (args[ARG_freq].u_obj != mp_const_none) {
+        // Frequency specified in Hz
+        #if MICROPY_PY_BUILTINS_FLOAT
+        delta_ms = (uint32_t)(MICROPY_FLOAT_CONST(1000.0) / mp_obj_get_float(args[ARG_freq].u_obj));
+        #else
+        delta_ms = 1000 / mp_obj_get_int(args[ARG_freq].u_obj);
+        #endif
+    } else if (args[ARG_period].u_int != 0xffffffff) {
+        // Period specified
+        delta_ms = (uint64_t)args[ARG_period].u_int * 1000 / args[ARG_tick_hz].u_int;
+    }
+
+    if (delta_ms < 1) {
+        delta_ms = 1;
+    } else if (delta_ms >= 0x40000000) {
+        mp_raise_ValueError(MP_ERROR_TEXT("period too large"));
+    }
+    self->delta_ms = (uint32_t)delta_ms;
+
+    if (args[ARG_callback].u_obj != MP_OBJ_NULL) {
+        self->py_callback = args[ARG_callback].u_obj;
+    }
+
+    if (self->py_callback != mp_const_none) {
+        soft_timer_insert(self, self->delta_ms);
+    }
+
+    return mp_const_none;
+}
+
+STATIC mp_obj_t machine_timer_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
+    machine_timer_obj_t *self = m_new_obj(machine_timer_obj_t);
+    self->pairheap.base.type = &machine_timer_type;
+    self->flags = SOFT_TIMER_FLAG_PY_CALLBACK | SOFT_TIMER_FLAG_GC_ALLOCATED;
+    self->delta_ms = 1000;
+    self->py_callback = mp_const_none;
+
+    // Get timer id (only soft timer (-1) supported at the moment)
+    mp_int_t id = -1;
+    if (n_args > 0) {
+        id = mp_obj_get_int(args[0]);
+        --n_args;
+        ++args;
+    }
+    if (id != -1) {
+        mp_raise_ValueError(MP_ERROR_TEXT("Timer doesn't exist"));
+    }
+
+    if (n_args > 0 || n_kw > 0) {
+        // Start the timer
+        mp_map_t kw_args;
+        mp_map_init_fixed_table(&kw_args, n_kw, args + n_args);
+        machine_timer_init_helper(self, n_args, args, &kw_args);
+    }
+
+    return MP_OBJ_FROM_PTR(self);
+}
+
+STATIC mp_obj_t machine_timer_init(size_t n_args, const mp_obj_t *args, mp_map_t *kw_args) {
+    machine_timer_obj_t *self = MP_OBJ_TO_PTR(args[0]);
+    soft_timer_remove(self);
+    return machine_timer_init_helper(self, n_args - 1, args + 1, kw_args);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_KW(machine_timer_init_obj, 1, machine_timer_init);
+
+STATIC mp_obj_t machine_timer_deinit(mp_obj_t self_in) {
+    machine_timer_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    soft_timer_remove(self);
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_timer_deinit_obj, machine_timer_deinit);
+
+STATIC const mp_rom_map_elem_t machine_timer_locals_dict_table[] = {
+    { MP_ROM_QSTR(MP_QSTR_init), MP_ROM_PTR(&machine_timer_init_obj) },
+    { MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&machine_timer_deinit_obj) },
+
+    { MP_ROM_QSTR(MP_QSTR_ONE_SHOT), MP_ROM_INT(SOFT_TIMER_MODE_ONE_SHOT) },
+    { MP_ROM_QSTR(MP_QSTR_PERIODIC), MP_ROM_INT(SOFT_TIMER_MODE_PERIODIC) },
+};
+STATIC MP_DEFINE_CONST_DICT(machine_timer_locals_dict, machine_timer_locals_dict_table);
+
+const mp_obj_type_t machine_timer_type = {
+    { &mp_type_type },
+    .name = MP_QSTR_Timer,
+    .print = machine_timer_print,
+    .make_new = machine_timer_make_new,
+    .locals_dict = (mp_obj_dict_t *)&machine_timer_locals_dict,
+};
diff --git a/ports/renesas-ra/machine_uart.c b/ports/renesas-ra/machine_uart.c
new file mode 100644
index 0000000000000..59fa469c3dbf2
--- /dev/null
+++ b/ports/renesas-ra/machine_uart.c
@@ -0,0 +1,583 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013-2018 Damien P. George
+ * Copyright (c) 2021,2022 Renesas Electronics Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include <stdio.h>
+#include <string.h>
+#include <stdarg.h>
+
+#include "py/runtime.h"
+#include "py/stream.h"
+#include "py/mperrno.h"
+#include "py/mphal.h"
+#include "shared/runtime/interrupt_char.h"
+#include "shared/runtime/mpirq.h"
+#include "uart.h"
+#include "irq.h"
+#include "pendsv.h"
+
+#define DEFAULT_UART_BAUDRATE (115200)
+
+STATIC const char *_parity_name[] = {"None", "ODD", "EVEN"};
+
+/// \moduleref pyb
+/// \class UART - duplex serial communication bus
+///
+/// UART implements the standard UART/USART duplex serial communications protocol.  At
+/// the physical level it consists of 2 lines: RX and TX.  The unit of communication
+/// is a character (not to be confused with a string character) which can be 8 or 9
+/// bits wide.
+///
+/// UART objects can be created and initialised using:
+///
+///     from pyb import UART
+///
+///     uart = UART(1, 9600)                         # init with given baudrate
+///     uart.init(9600, bits=8, parity=None, stop=1) # init with given parameters
+///
+/// Bits can be 8 or 9.  Parity can be None, 0 (even) or 1 (odd).  Stop can be 1 or 2.
+///
+/// A UART object acts like a stream object and reading and writing is done
+/// using the standard stream methods:
+///
+///     uart.read(10)       # read 10 characters, returns a bytes object
+///     uart.read()         # read all available characters
+///     uart.readline()     # read a line
+///     uart.readinto(buf)  # read and store into the given buffer
+///     uart.write('abc')   # write the 3 characters
+///
+/// Individual characters can be read/written using:
+///
+///     uart.readchar()     # read 1 character and returns it as an integer
+///     uart.writechar(42)  # write 1 character
+///
+/// To check if there is anything to be read, use:
+///
+///     uart.any()               # returns True if any characters waiting
+
+STATIC void pyb_uart_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+    pyb_uart_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    if (!self->is_enabled) {
+        mp_printf(print, "UART(%u)", self->uart_id);
+    } else {
+        mp_printf(print, "UART(%u, baudrate=%u, bits=%u, parity=%s, stop=%u",
+            self->uart_id, self->baudrate, self->bits,
+            _parity_name[self->parity], self->stop);
+        mp_printf(print, ", tx=%q, rx=%q", self->tx->name, self->rx->name);
+        if (self->rts) {
+            mp_printf(print, ", rts=%q", self->rts->name);
+        }
+        if (self->cts) {
+            mp_printf(print, ", cts=%q", self->cts->name);
+        }
+        mp_printf(print, ", flow=%d, rxbuf=%d, timeout=%u, timeout_char=%u",
+            self->flow,
+            self->read_buf_len == 0 ? 0 : self->read_buf_len - 1,   // -1 to adjust for usable length of buffer
+            self->timeout, self->timeout_char);
+        if (self->mp_irq_trigger != 0) {
+            mp_printf(print, ", irq=0x%x", self->mp_irq_trigger);
+        }
+        mp_print_str(print, ")");
+    }
+}
+
+/// \method init(baudrate, bits=8, parity=None, stop=1, *, timeout=1000, timeout_char=0, flow=0, read_buf_len=64)
+///
+/// Initialise the UART bus with the given parameters:
+///
+///   - `baudrate` is the clock rate.
+///   - `bits` is the number of bits per byte, 7, 8 or 9.
+///   - `parity` is the parity, `None`, 0 (even) or 1 (odd).
+///   - `stop` is the number of stop bits, 1 or 2.
+///   - `timeout` is the timeout in milliseconds to wait for the first character.
+///   - `timeout_char` is the timeout in milliseconds to wait between characters.
+///   - `flow` is RTS | CTS where RTS == 256, CTS == 512
+///   - `read_buf_len` is the character length of the read buffer (0 to disable).
+STATIC mp_obj_t pyb_uart_init_helper(pyb_uart_obj_t *self, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_baudrate, MP_ARG_INT | MP_ARG_INT, {.u_int = 0} },
+        { MP_QSTR_bits, MP_ARG_INT, {.u_int = 8} },
+        { MP_QSTR_parity, MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
+        { MP_QSTR_stop, MP_ARG_INT, {.u_int = 1} },
+        { MP_QSTR_flow, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 0} },
+        { MP_QSTR_timeout, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 0} },
+        { MP_QSTR_timeout_char, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 0} },
+        { MP_QSTR_rxbuf, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} },
+        { MP_QSTR_read_buf_len, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 512} },  // legacy
+    };
+
+    // parse args
+    struct {
+        mp_arg_val_t baudrate, bits, parity, stop, flow, timeout, timeout_char, rxbuf, read_buf_len;
+    } args;
+    mp_arg_parse_all(n_args, pos_args, kw_args,
+        MP_ARRAY_SIZE(allowed_args), allowed_args, (mp_arg_val_t *)&args);
+
+    // baudrate
+    uint32_t baudrate = args.baudrate.u_int;
+    if (baudrate == 0) {
+        baudrate = DEFAULT_UART_BAUDRATE;
+    }
+
+    // parity
+    uint32_t bits = args.bits.u_int;
+    uint32_t parity;
+    if (args.parity.u_obj == mp_const_none) {
+        parity = UART_PARITY_NONE;
+    } else {
+        mp_int_t p = mp_obj_get_int(args.parity.u_obj);
+        parity = (p & 1) ? UART_PARITY_ODD : UART_PARITY_EVEN;
+        bits += 1; // STs convention has bits including parity
+    }
+
+    // number of bits
+    if (!((bits == 7) | (bits == 8) | (bits == 9))) {
+        mp_raise_ValueError(MP_ERROR_TEXT("unsupported combination of bits and parity"));
+    }
+
+    // stop bits
+    uint32_t stop;
+    switch (args.stop.u_int) {
+        case 1:
+            stop = UART_STOPBITS_1;
+            break;
+        default:
+            stop = UART_STOPBITS_2;
+            break;
+    }
+
+    // flow control
+    uint32_t flow = args.flow.u_int;
+
+    // Save attach_to_repl setting because uart_init will disable it.
+    bool attach_to_repl = self->attached_to_repl;
+
+    // uint32_t irq_state = disable_irq();
+
+    // init UART (if it fails, it's because the port doesn't exist)
+    if (!uart_init(self, baudrate, bits, parity, stop, flow)) {
+        mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("UART(%d) doesn't exist"), self->uart_id);
+    }
+
+    // Restore attach_to_repl setting so UART still works if attached to dupterm.
+    uart_attach_to_repl(self, attach_to_repl);
+
+    // set timeout
+    self->timeout = args.timeout.u_int;
+
+    // set timeout_char
+    // make sure it is at least as long as a whole character (13 bits to be safe)
+    // minimum value is 2ms because sys-tick has a resolution of only 1ms
+    self->timeout_char = args.timeout_char.u_int;
+    uint32_t min_timeout_char = 13000 / baudrate + 2;
+    if (self->timeout_char < min_timeout_char) {
+        self->timeout_char = min_timeout_char;
+    }
+
+    if (self->is_static) {
+        // Static UARTs have fixed memory for the rxbuf and can't be reconfigured.
+        if (args.rxbuf.u_int >= 0) {
+            mp_raise_ValueError(MP_ERROR_TEXT("UART is static and rxbuf can't be changed"));
+        }
+        uart_set_rxbuf(self, self->read_buf_len, self->read_buf);
+    } else {
+        // setup the read buffer
+        m_del(byte, self->read_buf, self->read_buf_len << self->char_width);
+        if (args.rxbuf.u_int >= 0) {
+            // rxbuf overrides legacy read_buf_len
+            args.read_buf_len.u_int = args.rxbuf.u_int;
+        }
+        if (args.read_buf_len.u_int <= 0) {
+            // no read buffer
+            uart_set_rxbuf(self, 0, NULL);
+        } else {
+            // read buffer using interrupts
+            size_t len = args.read_buf_len.u_int + 1; // +1 to adjust for usable length of buffer
+            uint8_t *buf = m_new(byte, len << self->char_width);
+            uart_set_rxbuf(self, len, buf);
+        }
+    }
+
+    #if RA_TODO
+    // compute actual baudrate that was configured
+    uint32_t actual_baudrate = uart_get_baudrate(self);
+
+    // check we could set the baudrate within 5%
+    uint32_t baudrate_diff;
+    if (actual_baudrate > baudrate) {
+        baudrate_diff = actual_baudrate - baudrate;
+    } else {
+        baudrate_diff = baudrate - actual_baudrate;
+    }
+    if (20 * baudrate_diff > actual_baudrate) {
+        mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("set baudrate %d is not within 5%% of desired value"), actual_baudrate);
+    }
+    #endif
+
+    // enable_irq(irq_state);
+    return mp_const_none;
+}
+
+/// \classmethod \constructor(bus, ...)
+///
+/// Construct a UART object on the given bus.  `bus` can be 1-6, or 'XA', 'XB', 'YA', or 'YB'.
+/// With no additional parameters, the UART object is created but not
+/// initialised (it has the settings from the last initialisation of
+/// the bus, if any).  If extra arguments are given, the bus is initialised.
+/// See `init` for parameters of initialisation.
+///
+/// The physical pins of the UART buses are:
+///
+///   - `UART(4)` is on `XA`: `(TX, RX) = (X1, X2) = (PA0, PA1)`
+///   - `UART(1)` is on `XB`: `(TX, RX) = (X9, X10) = (PB6, PB7)`
+///   - `UART(6)` is on `YA`: `(TX, RX) = (Y1, Y2) = (PC6, PC7)`
+///   - `UART(3)` is on `YB`: `(TX, RX) = (Y9, Y10) = (PB10, PB11)`
+///   - `UART(2)` is on: `(TX, RX) = (X3, X4) = (PA2, PA3)`
+STATIC mp_obj_t pyb_uart_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
+    // check arguments
+    mp_arg_check_num(n_args, n_kw, 1, MP_OBJ_FUN_ARGS_MAX, true);
+
+    // work out port
+    int uart_id = 0;
+    if (mp_obj_is_str(args[0])) {
+        const char *port = mp_obj_str_get_str(args[0]);
+        if (0) {
+        #ifdef MICROPY_HW_UART0_NAME
+        } else if (strcmp(port, MICROPY_HW_UART0_NAME) == 0) {
+            uart_id = HW_UART_0;
+        #endif
+        #ifdef MICROPY_HW_UART1_NAME
+        } else if (strcmp(port, MICROPY_HW_UART1_NAME) == 0) {
+            uart_id = HW_UART_1;
+        #endif
+        #ifdef MICROPY_HW_UART2_NAME
+        } else if (strcmp(port, MICROPY_HW_UART2_NAME) == 0) {
+            uart_id = HW_UART_2;
+        #endif
+        #ifdef MICROPY_HW_UART3_NAME
+        } else if (strcmp(port, MICROPY_HW_UART3_NAME) == 0) {
+            uart_id = HW_UART_3;
+        #endif
+        #ifdef MICROPY_HW_UART4_NAME
+        } else if (strcmp(port, MICROPY_HW_UART4_NAME) == 0) {
+            uart_id = HW_UART_4;
+        #endif
+        #ifdef MICROPY_HW_UART5_NAME
+        } else if (strcmp(port, MICROPY_HW_UART5_NAME) == 0) {
+            uart_id = HW_UART_5;
+        #endif
+        #ifdef MICROPY_HW_UART6_NAME
+        } else if (strcmp(port, MICROPY_HW_UART6_NAME) == 0) {
+            uart_id = HW_UART_6;
+        #endif
+        #ifdef MICROPY_HW_UART7_NAME
+        } else if (strcmp(port, MICROPY_HW_UART7_NAME) == 0) {
+            uart_id = HW_UART_7;
+        #endif
+        #ifdef MICROPY_HW_UART8_NAME
+        } else if (strcmp(port, MICROPY_HW_UART8_NAME) == 0) {
+            uart_id = HW_UART_8;
+        #endif
+        #ifdef MICROPY_HW_UART9_NAME
+        } else if (strcmp(port, MICROPY_HW_UART9_NAME) == 0) {
+            uart_id = HW_UART_9;
+        #endif
+        } else {
+            mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("UART(%s) doesn't exist"), port);
+        }
+    } else {
+        uart_id = mp_obj_get_int(args[0]);
+        if (!uart_exists(uart_id)) {
+            mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("UART(%d) doesn't exist"), uart_id);
+        }
+    }
+
+    // check if the UART is reserved for system use or not
+    if (MICROPY_HW_UART_IS_RESERVED(uart_id)) {
+        mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("UART(%d) is reserved"), uart_id);
+    }
+
+    pyb_uart_obj_t *self;
+    if (MP_STATE_PORT(pyb_uart_obj_all)[uart_id] == NULL) {
+        // create new UART object
+        self = m_new0(pyb_uart_obj_t, 1);
+        self->base.type = &pyb_uart_type;
+        self->uart_id = uart_id;
+        MP_STATE_PORT(pyb_uart_obj_all)[uart_id] = self;
+    } else {
+        // reference existing UART object
+        self = MP_STATE_PORT(pyb_uart_obj_all)[uart_id];
+    }
+
+    // start the peripheral
+    mp_map_t kw_args;
+    mp_map_init_fixed_table(&kw_args, n_kw, args + n_args);
+    pyb_uart_init_helper(self, n_args - 1, args + 1, &kw_args);
+
+    return MP_OBJ_FROM_PTR(self);
+}
+
+STATIC mp_obj_t pyb_uart_init(size_t n_args, const mp_obj_t *args, mp_map_t *kw_args) {
+    return pyb_uart_init_helper(MP_OBJ_TO_PTR(args[0]), n_args - 1, args + 1, kw_args);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_KW(pyb_uart_init_obj, 1, pyb_uart_init);
+
+/// \method deinit()
+/// Turn off the UART bus.
+STATIC mp_obj_t pyb_uart_deinit(mp_obj_t self_in) {
+    pyb_uart_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    uart_deinit(self);
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(pyb_uart_deinit_obj, pyb_uart_deinit);
+
+/// \method any()
+/// Return `True` if any characters waiting, else `False`.
+STATIC mp_obj_t pyb_uart_any(mp_obj_t self_in) {
+    pyb_uart_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    return MP_OBJ_NEW_SMALL_INT(uart_rx_any(self));
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(pyb_uart_any_obj, pyb_uart_any);
+
+/// \method writechar(char)
+/// Write a single character on the bus.  `char` is an integer to write.
+/// Return value: `None`.
+STATIC mp_obj_t pyb_uart_writechar(mp_obj_t self_in, mp_obj_t char_in) {
+    pyb_uart_obj_t *self = MP_OBJ_TO_PTR(self_in);
+
+    // get the character to write (might be 9 bits)
+    uint16_t data = mp_obj_get_int(char_in);
+
+    // write the character
+    int errcode;
+    if (uart_tx_wait(self, self->timeout)) {
+        uart_tx_data(self, &data, 1, &errcode);
+    } else {
+        errcode = MP_ETIMEDOUT;
+    }
+
+    if (errcode != 0) {
+        mp_raise_OSError(errcode);
+    }
+
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(pyb_uart_writechar_obj, pyb_uart_writechar);
+
+/// \method readchar()
+/// Receive a single character on the bus.
+/// Return value: The character read, as an integer.  Returns -1 on timeout.
+STATIC mp_obj_t pyb_uart_readchar(mp_obj_t self_in) {
+    pyb_uart_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    if (uart_rx_wait(self, self->timeout)) {
+        return MP_OBJ_NEW_SMALL_INT(uart_rx_char(self));
+    } else {
+        // return -1 on timeout
+        return MP_OBJ_NEW_SMALL_INT(-1);
+    }
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(pyb_uart_readchar_obj, pyb_uart_readchar);
+
+// uart.sendbreak()
+STATIC mp_obj_t pyb_uart_sendbreak(mp_obj_t self_in) {
+    pyb_uart_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    ra_sci_tx_break((uint32_t)self->uart_id);
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(pyb_uart_sendbreak_obj, pyb_uart_sendbreak);
+
+// irq(handler, trigger, hard)
+STATIC mp_obj_t pyb_uart_irq(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    mp_arg_val_t args[MP_IRQ_ARG_INIT_NUM_ARGS];
+    mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args, MP_IRQ_ARG_INIT_NUM_ARGS, mp_irq_init_args, args);
+    pyb_uart_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]);
+
+    if (self->mp_irq_obj == NULL) {
+        self->mp_irq_trigger = 0;
+        self->mp_irq_obj = mp_irq_new(&uart_irq_methods, MP_OBJ_FROM_PTR(self));
+    }
+
+    if (n_args > 1 || kw_args->used != 0) {
+        // Check the handler
+        mp_obj_t handler = args[MP_IRQ_ARG_INIT_handler].u_obj;
+        if (handler != mp_const_none && !mp_obj_is_callable(handler)) {
+            mp_raise_ValueError(MP_ERROR_TEXT("handler must be None or callable"));
+        }
+
+        // Check the trigger
+        mp_uint_t trigger = args[MP_IRQ_ARG_INIT_trigger].u_int;
+        mp_uint_t not_supported = trigger & ~MP_UART_ALLOWED_FLAGS;
+        if (trigger != 0 && not_supported) {
+            mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("trigger 0x%08x unsupported"), not_supported);
+        }
+
+        // Reconfigure user IRQs
+        uart_irq_config(self, false);
+        self->mp_irq_obj->handler = handler;
+        self->mp_irq_obj->ishard = args[MP_IRQ_ARG_INIT_hard].u_bool;
+        self->mp_irq_trigger = trigger;
+        uart_irq_config(self, true);
+    }
+
+    return MP_OBJ_FROM_PTR(self->mp_irq_obj);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_KW(pyb_uart_irq_obj, 1, pyb_uart_irq);
+
+STATIC const mp_rom_map_elem_t pyb_uart_locals_dict_table[] = {
+    // instance methods
+
+    { MP_ROM_QSTR(MP_QSTR_init), MP_ROM_PTR(&pyb_uart_init_obj) },
+    { MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&pyb_uart_deinit_obj) },
+    { MP_ROM_QSTR(MP_QSTR_any), MP_ROM_PTR(&pyb_uart_any_obj) },
+
+    /// \method read([nbytes])
+    { MP_ROM_QSTR(MP_QSTR_read), MP_ROM_PTR(&mp_stream_read_obj) },
+    /// \method readline()
+    { MP_ROM_QSTR(MP_QSTR_readline), MP_ROM_PTR(&mp_stream_unbuffered_readline_obj)},
+    /// \method readinto(buf[, nbytes])
+    { MP_ROM_QSTR(MP_QSTR_readinto), MP_ROM_PTR(&mp_stream_readinto_obj) },
+    /// \method write(buf)
+    { MP_ROM_QSTR(MP_QSTR_write), MP_ROM_PTR(&mp_stream_write_obj) },
+    { MP_ROM_QSTR(MP_QSTR_irq), MP_ROM_PTR(&pyb_uart_irq_obj) },
+
+    { MP_ROM_QSTR(MP_QSTR_writechar), MP_ROM_PTR(&pyb_uart_writechar_obj) },
+    { MP_ROM_QSTR(MP_QSTR_readchar), MP_ROM_PTR(&pyb_uart_readchar_obj) },
+    { MP_ROM_QSTR(MP_QSTR_sendbreak), MP_ROM_PTR(&pyb_uart_sendbreak_obj) },
+
+    // class constants
+    { MP_ROM_QSTR(MP_QSTR_RTS), MP_ROM_INT(UART_HWCONTROL_RTS) },
+    { MP_ROM_QSTR(MP_QSTR_CTS), MP_ROM_INT(UART_HWCONTROL_CTS) },
+};
+
+STATIC MP_DEFINE_CONST_DICT(pyb_uart_locals_dict, pyb_uart_locals_dict_table);
+
+STATIC mp_uint_t pyb_uart_read(mp_obj_t self_in, void *buf_in, mp_uint_t size, int *errcode) {
+    pyb_uart_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    byte *buf = buf_in;
+
+    // check that size is a multiple of character width
+    if (size & self->char_width) {
+        *errcode = MP_EIO;
+        return MP_STREAM_ERROR;
+    }
+
+    // convert byte size to char size
+    size >>= self->char_width;
+
+    // make sure we want at least 1 char
+    if (size == 0) {
+        return 0;
+    }
+
+    // wait for first char to become available
+    if (!uart_rx_wait(self, self->timeout)) {
+        // return EAGAIN error to indicate non-blocking (then read() method returns None)
+        *errcode = MP_EAGAIN;
+        return MP_STREAM_ERROR;
+    }
+
+    // read the data
+    byte *orig_buf = buf;
+    for (;;) {
+        int data = uart_rx_char(self);
+        if (self->char_width == CHAR_WIDTH_9BIT) {
+            *(uint16_t *)buf = data;
+            buf += 2;
+        } else {
+            *buf++ = data;
+        }
+        if (--size == 0 || !uart_rx_wait(self, self->timeout_char)) {
+            // return number of bytes read
+            return buf - orig_buf;
+        }
+    }
+}
+
+STATIC mp_uint_t pyb_uart_write(mp_obj_t self_in, const void *buf_in, mp_uint_t size, int *errcode) {
+    pyb_uart_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    const byte *buf = buf_in;
+
+    // check that size is a multiple of character width
+    if (size & self->char_width) {
+        *errcode = MP_EIO;
+        return MP_STREAM_ERROR;
+    }
+
+    // wait to be able to write the first character. EAGAIN causes write to return None
+    if (self->timeout != 0) {
+        if (!uart_tx_wait(self, self->timeout)) {
+            *errcode = MP_EAGAIN;
+            return MP_STREAM_ERROR;
+        }
+    }
+
+    // write the data
+    size_t num_tx = uart_tx_data(self, buf, size >> self->char_width, errcode);
+
+    if (*errcode == 0 || *errcode == MP_ETIMEDOUT) {
+        // return number of bytes written, even if there was a timeout
+        return num_tx << self->char_width;
+    } else {
+        return MP_STREAM_ERROR;
+    }
+}
+
+STATIC mp_uint_t pyb_uart_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_t arg, int *errcode) {
+    pyb_uart_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    mp_uint_t ret;
+    if (request == MP_STREAM_POLL) {
+        uintptr_t flags = arg;
+        ret = 0;
+        if ((flags & MP_STREAM_POLL_RD) && uart_rx_any(self)) {
+            ret |= MP_STREAM_POLL_RD;
+        }
+        if ((flags & MP_STREAM_POLL_WR) && uart_tx_avail(self)) {
+            ret |= MP_STREAM_POLL_WR;
+        }
+    } else {
+        *errcode = MP_EINVAL;
+        ret = MP_STREAM_ERROR;
+    }
+    return ret;
+}
+
+STATIC const mp_stream_p_t uart_stream_p = {
+    .read = pyb_uart_read,
+    .write = pyb_uart_write,
+    .ioctl = pyb_uart_ioctl,
+    .is_text = false,
+};
+
+const mp_obj_type_t pyb_uart_type = {
+    { &mp_type_type },
+    .name = MP_QSTR_UART,
+    .print = pyb_uart_print,
+    .make_new = pyb_uart_make_new,
+    .getiter = mp_identity_getiter,
+    .iternext = mp_stream_unbuffered_iter,
+    .protocol = &uart_stream_p,
+    .locals_dict = (mp_obj_dict_t *)&pyb_uart_locals_dict,
+};
diff --git a/ports/renesas-ra/main.c b/ports/renesas-ra/main.c
new file mode 100644
index 0000000000000..82aa6be893d2a
--- /dev/null
+++ b/ports/renesas-ra/main.c
@@ -0,0 +1,399 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013-2020 Damien P. George
+ * Copyright (c) 2021,2022 Renesas Electronics Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include <stdio.h>
+#include <string.h>
+
+#include "py/runtime.h"
+#include "py/stackctrl.h"
+#include "py/gc.h"
+#include "py/mperrno.h"
+#include "py/mphal.h"
+#include "shared/readline/readline.h"
+#include "shared/runtime/pyexec.h"
+#include "lib/oofatfs/ff.h"
+#include "lib/littlefs/lfs1.h"
+#include "lib/littlefs/lfs1_util.h"
+#include "lib/littlefs/lfs2.h"
+#include "lib/littlefs/lfs2_util.h"
+#include "extmod/vfs.h"
+#include "extmod/vfs_fat.h"
+#include "extmod/vfs_lfs.h"
+
+#include "boardctrl.h"
+#include "systick.h"
+#include "pendsv.h"
+#include "powerctrl.h"
+#include "pybthread.h"
+#include "gccollect.h"
+#include "factoryreset.h"
+#include "modmachine.h"
+#include "softtimer.h"
+#include "spi.h"
+#include "uart.h"
+#include "timer.h"
+#include "led.h"
+#include "pin.h"
+#include "extint.h"
+#include "usrsw.h"
+#include "rtc.h"
+#include "storage.h"
+
+#define RA_EARLY_PRINT  1       /* for enabling mp_print in boardctrl. */
+
+#if MICROPY_PY_THREAD
+STATIC pyb_thread_t pyb_thread_main;
+#endif
+
+#if defined(MICROPY_HW_UART_REPL)
+#ifndef MICROPY_HW_UART_REPL_RXBUF
+#define MICROPY_HW_UART_REPL_RXBUF (260)
+#endif
+STATIC pyb_uart_obj_t pyb_uart_repl_obj;
+STATIC uint8_t pyb_uart_repl_rxbuf[MICROPY_HW_UART_REPL_RXBUF];
+#endif
+
+void NORETURN __fatal_error(const char *msg) {
+    for (volatile uint delay = 0; delay < 1000000; delay++) {
+    }
+    led_state(1, 1);
+    led_state(2, 1);
+    led_state(3, 1);
+    led_state(4, 1);
+    mp_hal_stdout_tx_strn("\nFATAL ERROR:\n", 14);
+    mp_hal_stdout_tx_strn(msg, strlen(msg));
+    for (uint i = 0;;) {
+        led_toggle(((i++) & 3) + 1);
+        for (volatile uint delay = 0; delay < 1000000; delay++) {
+        }
+        if (i >= 16) {
+            // to conserve power
+            __WFI();
+        }
+    }
+}
+
+void nlr_jump_fail(void *val) {
+    printf("FATAL: uncaught exception %p\n", val);
+    mp_obj_print_exception(&mp_plat_print, MP_OBJ_FROM_PTR(val));
+    __fatal_error("");
+}
+
+void abort(void) {
+    __fatal_error("abort");
+}
+
+#ifndef NDEBUG
+void MP_WEAK __assert_func(const char *file, int line, const char *func, const char *expr) {
+    (void)func;
+    printf("Assertion '%s' failed, at file %s:%d\n", expr, file, line);
+    __fatal_error("");
+}
+#endif
+
+STATIC mp_obj_t pyb_main(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_opt, MP_ARG_INT, {.u_int = 0} }
+    };
+
+    if (mp_obj_is_str(pos_args[0])) {
+        MP_STATE_PORT(pyb_config_main) = pos_args[0];
+
+        // parse args
+        mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
+        mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
+        #if MICROPY_ENABLE_COMPILER
+        MP_STATE_VM(mp_optimise_value) = args[0].u_int;
+        #endif
+    }
+    return mp_const_none;
+}
+MP_DEFINE_CONST_FUN_OBJ_KW(pyb_main_obj, 1, pyb_main);
+
+#if MICROPY_HW_FLASH_MOUNT_AT_BOOT
+// avoid inlining to avoid stack usage within main()
+MP_NOINLINE STATIC bool init_flash_fs(uint reset_mode) {
+    if (reset_mode == BOARDCTRL_RESET_MODE_FACTORY_FILESYSTEM) {
+        // Asked by user to reset filesystem
+        factory_reset_create_filesystem();
+    }
+
+    // Default block device to entire flash storage
+    mp_obj_t bdev = MP_OBJ_FROM_PTR(&pyb_flash_obj);
+
+    int ret;
+
+    #if MICROPY_VFS_LFS1 || MICROPY_VFS_LFS2
+
+    // Try to detect the block device used for the main filesystem based on the
+    // contents of the superblock, which can be the first or second block.
+    mp_int_t len = -1;
+    uint8_t buf[64];
+    for (size_t block_num = 0; block_num <= 1; ++block_num) {
+        ret = storage_readblocks_ext(buf, block_num, 0, sizeof(buf));
+
+        #if MICROPY_VFS_LFS1
+        if (ret == 0 && memcmp(&buf[40], "littlefs", 8) == 0) {
+            // LFS1
+            lfs1_superblock_t *superblock = (void *)&buf[12];
+            uint32_t block_size = lfs1_fromle32(superblock->d.block_size);
+            uint32_t block_count = lfs1_fromle32(superblock->d.block_count);
+            len = block_count * block_size;
+            break;
+        }
+        #endif
+
+        #if MICROPY_VFS_LFS2
+        if (ret == 0 && memcmp(&buf[8], "littlefs", 8) == 0) {
+            // LFS2
+            lfs2_superblock_t *superblock = (void *)&buf[20];
+            uint32_t block_size = lfs2_fromle32(superblock->block_size);
+            uint32_t block_count = lfs2_fromle32(superblock->block_count);
+            len = block_count * block_size;
+            break;
+        }
+        #endif
+    }
+
+    if (len != -1) {
+        // Detected a littlefs filesystem so create correct block device for it
+        mp_obj_t args[] = { MP_OBJ_NEW_QSTR(MP_QSTR_len), MP_OBJ_NEW_SMALL_INT(len) };
+        bdev = pyb_flash_type.make_new(&pyb_flash_type, 0, 1, args);
+    }
+
+    #endif
+
+    // Try to mount the flash on "/flash" and chdir to it for the boot-up directory.
+    mp_obj_t mount_point = MP_OBJ_NEW_QSTR(MP_QSTR__slash_flash);
+    ret = mp_vfs_mount_and_chdir_protected(bdev, mount_point);
+
+    if (ret == -MP_ENODEV && bdev == MP_OBJ_FROM_PTR(&pyb_flash_obj)
+        && reset_mode != BOARDCTRL_RESET_MODE_FACTORY_FILESYSTEM) {
+        // No filesystem, bdev is still the default (so didn't detect a possibly corrupt littlefs),
+        // and didn't already create a filesystem, so try to create a fresh one now.
+        ret = factory_reset_create_filesystem();
+        if (ret == 0) {
+            ret = mp_vfs_mount_and_chdir_protected(bdev, mount_point);
+        }
+    }
+
+    if (ret != 0) {
+        printf("MPY: can't mount flash\n");
+        return false;
+    }
+
+    return true;
+}
+#endif
+
+void ra_main(uint32_t reset_mode) {
+    // Hook for a board to run code at start up, for example check if a
+    // bootloader should be entered instead of the main application.
+    MICROPY_BOARD_STARTUP();
+
+    // Initialize interrupt, systick and internal flash for RA.
+    ra_init();
+
+    MICROPY_BOARD_EARLY_INIT();
+
+    // basic sub-system init
+    #if MICROPY_PY_THREAD
+    pyb_thread_init(&pyb_thread_main);
+    #endif
+    pendsv_init();
+    led_init();
+    #if MICROPY_HW_HAS_SWITCH
+    switch_init0();
+    #endif
+    machine_init();
+    #if MICROPY_HW_ENABLE_RTC
+    rtc_init_start(false);
+    #endif
+    uart_init0();
+    spi_init0();
+    #if MICROPY_HW_ENABLE_STORAGE
+    storage_init();
+    #endif
+
+    #if defined(MICROPY_HW_UART_REPL)
+    // Set up a UART REPL using a statically allocated object
+    pyb_uart_repl_obj.base.type = &pyb_uart_type;
+    pyb_uart_repl_obj.uart_id = MICROPY_HW_UART_REPL;
+    pyb_uart_repl_obj.is_static = true;
+    pyb_uart_repl_obj.timeout = 0;
+    pyb_uart_repl_obj.timeout_char = 2;
+    uart_init(&pyb_uart_repl_obj, MICROPY_HW_UART_REPL_BAUD, UART_WORDLENGTH_8B, UART_PARITY_NONE, UART_STOPBITS_1, 0);
+    uart_set_rxbuf(&pyb_uart_repl_obj, sizeof(pyb_uart_repl_rxbuf), pyb_uart_repl_rxbuf);
+    uart_attach_to_repl(&pyb_uart_repl_obj, true);
+    MP_STATE_PORT(pyb_uart_obj_all)[MICROPY_HW_UART_REPL] = &pyb_uart_repl_obj;
+    #if RA_EARLY_PRINT
+    MP_STATE_PORT(pyb_stdio_uart) = &pyb_uart_repl_obj;
+    #endif
+    #endif
+
+    boardctrl_state_t state;
+    state.reset_mode = reset_mode;
+    state.log_soft_reset = false;
+
+    MICROPY_BOARD_BEFORE_SOFT_RESET_LOOP(&state);
+
+soft_reset:
+
+    MICROPY_BOARD_TOP_SOFT_RESET_LOOP(&state);
+
+    // Python threading init
+    #if MICROPY_PY_THREAD
+    mp_thread_init();
+    #endif
+
+    // Stack limit should be less than real stack size, so we have a chance
+    // to recover from limit hit.  (Limit is measured in bytes.)
+    // Note: stack control relies on main thread being initialised above
+    mp_stack_set_top(&_estack);
+    mp_stack_set_limit((char *)&_estack - (char *)&_sstack - 1024);
+
+    // GC init
+    gc_init(MICROPY_HEAP_START, MICROPY_HEAP_END);
+
+    #if MICROPY_ENABLE_PYSTACK
+    static mp_obj_t pystack[384];
+    mp_pystack_init(pystack, &pystack[384]);
+    #endif
+
+    // MicroPython init
+    mp_init();
+
+    // Initialise low-level sub-systems.  Here we need to very basic things like
+    // zeroing out memory and resetting any of the sub-systems.  Following this
+    // we can run Python scripts (eg boot.py), but anything that is configurable
+    // by boot.py must be set after boot.py is run.
+
+    #if defined(MICROPY_HW_UART_REPL)
+    MP_STATE_PORT(pyb_stdio_uart) = &pyb_uart_repl_obj;
+    #else
+    MP_STATE_PORT(pyb_stdio_uart) = NULL;
+    #endif
+
+    readline_init0();
+    machine_pin_init();
+    extint_init0();
+    timer_init0();
+
+    #if MICROPY_HW_ENABLE_I2S
+    machine_i2s_init0();
+    #endif
+
+    // Initialise the local flash filesystem.
+    // Create it if needed, mount in on /flash, and set it as current dir.
+    bool mounted_flash = false;
+    #if MICROPY_HW_FLASH_MOUNT_AT_BOOT
+    mounted_flash = init_flash_fs(state.reset_mode);
+    #endif
+
+    // set sys.path based on mounted filesystems
+    if (mounted_flash) {
+        mp_obj_list_append(mp_sys_path, MP_OBJ_NEW_QSTR(MP_QSTR__slash_flash));
+        mp_obj_list_append(mp_sys_path, MP_OBJ_NEW_QSTR(MP_QSTR__slash_flash_slash_lib));
+    }
+
+    // reset config variables; they should be set by boot.py
+    MP_STATE_PORT(pyb_config_main) = MP_OBJ_NULL;
+
+    // Run optional frozen boot code.
+    #ifdef MICROPY_BOARD_FROZEN_BOOT_FILE
+    pyexec_frozen_module(MICROPY_BOARD_FROZEN_BOOT_FILE);
+    #endif
+
+    // Run boot.py (or whatever else a board configures at this stage).
+    if (MICROPY_BOARD_RUN_BOOT_PY(&state) == BOARDCTRL_GOTO_SOFT_RESET_EXIT) {
+        goto soft_reset_exit;
+    }
+
+    // Now we initialise sub-systems that need configuration from boot.py,
+    // or whose initialisation can be safely deferred until after running
+    // boot.py.
+
+    // At this point everything is fully configured and initialised.
+
+    // Run main.py (or whatever else a board configures at this stage).
+    if (MICROPY_BOARD_RUN_MAIN_PY(&state) == BOARDCTRL_GOTO_SOFT_RESET_EXIT) {
+        goto soft_reset_exit;
+    }
+
+    #if MICROPY_ENABLE_COMPILER
+    // Main script is finished, so now go into REPL mode.
+    // The REPL mode can change, or it can request a soft reset.
+    for (;;) {
+        if (pyexec_mode_kind == PYEXEC_MODE_RAW_REPL) {
+            if (pyexec_raw_repl() != 0) {
+                break;
+            }
+        } else {
+            if (pyexec_friendly_repl() != 0) {
+                break;
+            }
+        }
+    }
+    #endif
+
+soft_reset_exit:
+
+    // soft reset
+
+    MICROPY_BOARD_START_SOFT_RESET(&state);
+
+    #if MICROPY_HW_ENABLE_STORAGE
+    if (state.log_soft_reset) {
+        mp_printf(&mp_plat_print, "MPY: sync filesystems\n");
+    }
+    storage_flush();
+    #endif
+
+    if (state.log_soft_reset) {
+        mp_printf(&mp_plat_print, "MPY: soft reboot\n");
+    }
+
+    soft_timer_deinit();
+    timer_deinit();
+    uart_deinit_all();
+    #if MICROPY_HW_ENABLE_DAC
+    dac_deinit_all();
+    #endif
+    machine_pin_deinit();
+    machine_deinit();
+
+    #if MICROPY_PY_THREAD
+    pyb_thread_deinit();
+    #endif
+
+    MICROPY_BOARD_END_SOFT_RESET(&state);
+
+    gc_sweep_all();
+    mp_deinit();
+
+    goto soft_reset;
+}
diff --git a/ports/renesas-ra/modmachine.c b/ports/renesas-ra/modmachine.c
new file mode 100644
index 0000000000000..7aea7c218b762
--- /dev/null
+++ b/ports/renesas-ra/modmachine.c
@@ -0,0 +1,304 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013-2015 Damien P. George
+ * Copyright (c) 2021,2022 Renesas Electronics Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include <stdio.h>
+#include <string.h>
+
+#include "modmachine.h"
+#include "py/gc.h"
+#include "py/runtime.h"
+#include "py/objstr.h"
+#include "py/mperrno.h"
+#include "py/mphal.h"
+#include "extmod/machine_mem.h"
+#include "extmod/machine_signal.h"
+#include "extmod/machine_pulse.h"
+#include "extmod/machine_i2c.h"
+#include "extmod/machine_spi.h"
+#include "shared/runtime/pyexec.h"
+#include "lib/oofatfs/ff.h"
+#include "extmod/vfs.h"
+#include "extmod/vfs_fat.h"
+#include "drivers/dht/dht.h"
+#include "gccollect.h"
+#include "irq.h"
+#include "powerctrl.h"
+#include "pybthread.h"
+#include "storage.h"
+#include "pin.h"
+#include "timer.h"
+#include "rtc.h"
+#include "spi.h"
+#include "uart.h"
+
+
+#define PYB_RESET_SOFT      (0)
+#define PYB_RESET_POWER_ON  (1)
+#define PYB_RESET_HARD      (2)
+#define PYB_RESET_WDT       (3)
+#define PYB_RESET_DEEPSLEEP (4)
+
+STATIC uint32_t reset_cause;
+
+void get_unique_id(uint8_t *id) {
+    uint32_t *p = (uint32_t *)id;
+    uint32_t *uniqueid = (uint32_t *)R_BSP_UniqueIdGet();
+    p[0] = uniqueid[0];
+    p[1] = uniqueid[1];
+    p[2] = uniqueid[2];
+    p[3] = uniqueid[3];
+}
+
+void machine_init(void) {
+}
+
+void machine_deinit(void) {
+    // we are doing a soft-reset so change the reset_cause
+    reset_cause = PYB_RESET_SOFT;
+}
+
+// machine.info([dump_alloc_table])
+// Print out lots of information about the board.
+STATIC mp_obj_t machine_info(size_t n_args, const mp_obj_t *args) {
+    // get and print unique id; 128 bits
+    {
+        uint8_t id[16];
+        get_unique_id((uint8_t *)&id);
+        printf("ID=%02x%02x%02x%02x:%02x%02x%02x%02x:%02x%02x%02x%02x:%02x%02x%02x%02x\n",
+            id[0], id[1], id[2], id[3], id[4], id[5], id[6], id[7],
+            id[8], id[9], id[10], id[11], id[12], id[13], id[14], id[15]);
+    }
+    // get and print clock speeds
+    // SystemCoreClock is an external variable in FSP
+    printf("S=%u\nP=%u\n",
+        (unsigned int)SystemCoreClock,
+        (unsigned int)MICROPY_HW_MCU_PCLK);
+    // to print info about memory
+    {
+        printf("_etext=%p\n", &_etext);
+        printf("_sidata=%p\n", &_sidata);
+        printf("_sdata=%p\n", &_sdata);
+        printf("_edata=%p\n", &_edata);
+        printf("_sbss=%p\n", &_sbss);
+        printf("_ebss=%p\n", &_ebss);
+        printf("_sstack=%p\n", &_sstack);
+        printf("_estack=%p\n", &_estack);
+        printf("_ram_start=%p\n", &_ram_start);
+        printf("_heap_start=%p\n", &_heap_start);
+        printf("_heap_end=%p\n", &_heap_end);
+        printf("_ram_end=%p\n", &_ram_end);
+    }
+
+    // qstr info
+    {
+        size_t n_pool, n_qstr, n_str_data_bytes, n_total_bytes;
+        qstr_pool_info(&n_pool, &n_qstr, &n_str_data_bytes, &n_total_bytes);
+        printf("qstr:\n  n_pool=%u\n  n_qstr=%u\n  n_str_data_bytes=%u\n  n_total_bytes=%u\n", n_pool, n_qstr, n_str_data_bytes, n_total_bytes);
+    }
+
+    // GC info
+    {
+        gc_info_t info;
+        gc_info(&info);
+        printf("GC:\n");
+        printf("  %u total\n", info.total);
+        printf("  %u : %u\n", info.used, info.free);
+        printf("  1=%u 2=%u m=%u\n", info.num_1block, info.num_2block, info.max_block);
+    }
+
+    // free space on flash
+    {
+        #if MICROPY_VFS_FAT
+        for (mp_vfs_mount_t *vfs = MP_STATE_VM(vfs_mount_table); vfs != NULL; vfs = vfs->next) {
+            if (strncmp("/flash", vfs->str, vfs->len) == 0) {
+                // assumes that it's a FatFs filesystem
+                fs_user_mount_t *vfs_fat = MP_OBJ_TO_PTR(vfs->obj);
+                DWORD nclst;
+                f_getfree(&vfs_fat->fatfs, &nclst);
+                printf("LFS free: %u bytes\n", (uint)(nclst * vfs_fat->fatfs.csize * 512));
+                break;
+            }
+        }
+        #endif
+    }
+
+    #if MICROPY_PY_THREAD
+    pyb_thread_dump();
+    #endif
+
+    if (n_args == 1) {
+        // arg given means dump gc allocation table
+        gc_dump_alloc_table();
+    }
+
+    return mp_const_none;
+}
+MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_info_obj, 0, 1, machine_info);
+
+// Returns a string of 16 bytes (128 bits), which is the unique ID for the MCU.
+STATIC mp_obj_t machine_unique_id(void) {
+    uint8_t id[16];
+    get_unique_id((uint8_t *)&id);
+    return mp_obj_new_bytes(id, 16);
+}
+MP_DEFINE_CONST_FUN_OBJ_0(machine_unique_id_obj, machine_unique_id);
+
+// Resets the pyboard in a manner similar to pushing the external RESET button.
+STATIC mp_obj_t machine_reset(void) {
+    powerctrl_mcu_reset();
+    return mp_const_none;
+}
+MP_DEFINE_CONST_FUN_OBJ_0(machine_reset_obj, machine_reset);
+
+STATIC mp_obj_t machine_soft_reset(void) {
+    pyexec_system_exit = PYEXEC_FORCED_EXIT;
+    mp_raise_type(&mp_type_SystemExit);
+}
+MP_DEFINE_CONST_FUN_OBJ_0(machine_soft_reset_obj, machine_soft_reset);
+
+// Activate the bootloader without BOOT* pins.
+STATIC NORETURN mp_obj_t machine_bootloader(size_t n_args, const mp_obj_t *args) {
+    #if MICROPY_HW_ENABLE_STORAGE
+    storage_flush();
+    #endif
+
+    __disable_irq();
+
+    #if MICROPY_HW_USES_BOOTLOADER
+    // ToDo: need to review how to implement
+
+    #endif
+
+    while (1) {
+        ;
+    }
+}
+MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_bootloader_obj, 0, 1, machine_bootloader);
+
+// get or set the MCU frequencies
+STATIC mp_obj_t machine_freq(size_t n_args, const mp_obj_t *args) {
+    if (n_args == 0) {
+        // get
+        return mp_obj_new_int(SystemCoreClock);
+    } else {
+        // set
+        mp_raise_NotImplementedError(MP_ERROR_TEXT("machine.freq set not supported yet"));
+        return mp_const_none;
+    }
+}
+MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_freq_obj, 0, 4, machine_freq);
+
+// idle()
+// This executies a wfi machine instruction which reduces power consumption
+// of the MCU until an interrupt occurs, at which point execution continues.
+STATIC mp_obj_t machine_idle(void) {
+    __WFI();
+    return mp_const_none;
+}
+MP_DEFINE_CONST_FUN_OBJ_0(machine_idle_obj, machine_idle);
+
+STATIC mp_obj_t machine_lightsleep(size_t n_args, const mp_obj_t *args) {
+    if (n_args != 0) {
+        mp_obj_t args2[2] = {MP_OBJ_NULL, args[0]};
+        pyb_rtc_wakeup(2, args2);
+    }
+    powerctrl_enter_stop_mode();
+    return mp_const_none;
+}
+MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_lightsleep_obj, 0, 1, machine_lightsleep);
+
+STATIC mp_obj_t machine_deepsleep(size_t n_args, const mp_obj_t *args) {
+    if (n_args != 0) {
+        mp_obj_t args2[2] = {MP_OBJ_NULL, args[0]};
+        pyb_rtc_wakeup(2, args2);
+    }
+    powerctrl_enter_standby_mode();
+    return mp_const_none;
+}
+MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_deepsleep_obj, 0, 1, machine_deepsleep);
+
+STATIC mp_obj_t machine_reset_cause(void) {
+    return MP_OBJ_NEW_SMALL_INT(reset_cause);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(machine_reset_cause_obj, machine_reset_cause);
+
+STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
+    { MP_ROM_QSTR(MP_QSTR___name__),            MP_ROM_QSTR(MP_QSTR_umachine) },
+    { MP_ROM_QSTR(MP_QSTR_info),                MP_ROM_PTR(&machine_info_obj) },
+    { MP_ROM_QSTR(MP_QSTR_unique_id),           MP_ROM_PTR(&machine_unique_id_obj) },
+    { MP_ROM_QSTR(MP_QSTR_reset),               MP_ROM_PTR(&machine_reset_obj) },
+    { MP_ROM_QSTR(MP_QSTR_soft_reset),          MP_ROM_PTR(&machine_soft_reset_obj) },
+    { MP_ROM_QSTR(MP_QSTR_bootloader),          MP_ROM_PTR(&machine_bootloader_obj) },
+    { MP_ROM_QSTR(MP_QSTR_freq),                MP_ROM_PTR(&machine_freq_obj) },
+    { MP_ROM_QSTR(MP_QSTR_idle),                MP_ROM_PTR(&machine_idle_obj) },
+    { MP_ROM_QSTR(MP_QSTR_sleep),               MP_ROM_PTR(&machine_lightsleep_obj) },
+    { MP_ROM_QSTR(MP_QSTR_lightsleep),          MP_ROM_PTR(&machine_lightsleep_obj) },
+    { MP_ROM_QSTR(MP_QSTR_deepsleep),           MP_ROM_PTR(&machine_deepsleep_obj) },
+    { MP_ROM_QSTR(MP_QSTR_reset_cause),         MP_ROM_PTR(&machine_reset_cause_obj) },
+    { MP_ROM_QSTR(MP_QSTR_disable_irq),         MP_ROM_PTR(&machine_disable_irq_obj) },
+    { MP_ROM_QSTR(MP_QSTR_enable_irq),          MP_ROM_PTR(&machine_enable_irq_obj) },
+
+    #if MICROPY_PY_MACHINE_PULSE
+    { MP_ROM_QSTR(MP_QSTR_time_pulse_us),       MP_ROM_PTR(&machine_time_pulse_us_obj) },
+    #endif
+
+    { MP_ROM_QSTR(MP_QSTR_mem8),                MP_ROM_PTR(&machine_mem8_obj) },
+    { MP_ROM_QSTR(MP_QSTR_mem16),               MP_ROM_PTR(&machine_mem16_obj) },
+    { MP_ROM_QSTR(MP_QSTR_mem32),               MP_ROM_PTR(&machine_mem32_obj) },
+
+    { MP_ROM_QSTR(MP_QSTR_Pin),                 MP_ROM_PTR(&machine_pin_type) },
+    { MP_ROM_QSTR(MP_QSTR_Signal),              MP_ROM_PTR(&machine_signal_type) },
+
+    { MP_ROM_QSTR(MP_QSTR_RTC),                 MP_ROM_PTR(&pyb_rtc_type) },
+    { MP_ROM_QSTR(MP_QSTR_ADC),                 MP_ROM_PTR(&machine_adc_type) },
+    #if MICROPY_PY_MACHINE_I2C
+    #if MICROPY_HW_ENABLE_HW_I2C
+    { MP_ROM_QSTR(MP_QSTR_I2C),                 MP_ROM_PTR(&machine_i2c_type) },
+    #endif
+    { MP_ROM_QSTR(MP_QSTR_SoftI2C),             MP_ROM_PTR(&mp_machine_soft_i2c_type) },
+    #endif
+    #if MICROPY_PY_MACHINE_SPI
+    { MP_ROM_QSTR(MP_QSTR_SPI),                 MP_ROM_PTR(&machine_hard_spi_type) },
+    { MP_ROM_QSTR(MP_QSTR_SoftSPI),             MP_ROM_PTR(&mp_machine_soft_spi_type) },
+    #endif
+    { MP_ROM_QSTR(MP_QSTR_UART),                MP_ROM_PTR(&pyb_uart_type) },
+    { MP_ROM_QSTR(MP_QSTR_Timer),               MP_ROM_PTR(&machine_timer_type) },
+    { MP_ROM_QSTR(MP_QSTR_PWRON_RESET),         MP_ROM_INT(PYB_RESET_POWER_ON) },
+    { MP_ROM_QSTR(MP_QSTR_HARD_RESET),          MP_ROM_INT(PYB_RESET_HARD) },
+    { MP_ROM_QSTR(MP_QSTR_WDT_RESET),           MP_ROM_INT(PYB_RESET_WDT) },
+    { MP_ROM_QSTR(MP_QSTR_DEEPSLEEP_RESET),     MP_ROM_INT(PYB_RESET_DEEPSLEEP) },
+    { MP_ROM_QSTR(MP_QSTR_SOFT_RESET),          MP_ROM_INT(PYB_RESET_SOFT) },
+
+    { MP_ROM_QSTR(MP_QSTR_dht_readinto),        MP_ROM_PTR(&dht_readinto_obj) },
+};
+
+STATIC MP_DEFINE_CONST_DICT(machine_module_globals, machine_module_globals_table);
+
+const mp_obj_module_t mp_module_machine = {
+    .base = { &mp_type_module },
+    .globals = (mp_obj_dict_t *)&machine_module_globals,
+};
diff --git a/ports/renesas-ra/modmachine.h b/ports/renesas-ra/modmachine.h
new file mode 100644
index 0000000000000..65077220df5ea
--- /dev/null
+++ b/ports/renesas-ra/modmachine.h
@@ -0,0 +1,68 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013-2015 Damien P. George
+ * Copyright (c) 2022 Renesas Electronics Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+#ifndef MICROPY_INCLUDED_RENESAS_RA_MODMACHINE_H
+#define MICROPY_INCLUDED_RENESAS_RA_MODMACHINE_H
+
+#include "py/obj.h"
+
+extern const mp_obj_type_t machine_timer_type;
+extern const mp_obj_type_t machine_wdt_type;
+extern const mp_obj_type_t machine_pin_type;
+extern const mp_obj_type_t machine_touchpad_type;
+extern const mp_obj_type_t machine_adc_type;
+extern const mp_obj_type_t machine_adcblock_type;
+extern const mp_obj_type_t machine_dac_type;
+extern const mp_obj_type_t machine_i2c_type;
+extern const mp_obj_type_t machine_hard_spi_type;
+extern const mp_obj_type_t machine_i2s_type;
+extern const mp_obj_type_t machine_uart_type;
+extern const mp_obj_type_t machine_rtc_type;
+extern const mp_obj_type_t machine_sdcard_type;
+
+
+void machine_init(void);
+void machine_deinit(void);
+void machine_pin_init(void);
+void machine_pin_deinit(void);
+void machine_i2s_init0(void);
+
+MP_DECLARE_CONST_FUN_OBJ_VAR_BETWEEN(machine_info_obj);
+MP_DECLARE_CONST_FUN_OBJ_0(machine_unique_id_obj);
+MP_DECLARE_CONST_FUN_OBJ_0(machine_reset_obj);
+MP_DECLARE_CONST_FUN_OBJ_VAR_BETWEEN(machine_bootloader_obj);
+MP_DECLARE_CONST_FUN_OBJ_VAR_BETWEEN(machine_freq_obj);
+
+MP_DECLARE_CONST_FUN_OBJ_0(machine_idle_obj);
+MP_DECLARE_CONST_FUN_OBJ_VAR_BETWEEN(machine_lightsleep_obj);
+MP_DECLARE_CONST_FUN_OBJ_VAR_BETWEEN(machine_deepsleep_obj);
+
+MP_DECLARE_CONST_FUN_OBJ_0(machine_disable_irq_obj);
+MP_DECLARE_CONST_FUN_OBJ_VAR_BETWEEN(machine_enable_irq_obj);
+
+MP_DECLARE_CONST_FUN_OBJ_0(pyb_irq_stats_obj);
+
+#endif // MICROPY_INCLUDED_RENESAS_RA_MODMACHINE_H
diff --git a/ports/renesas-ra/moduos.c b/ports/renesas-ra/moduos.c
new file mode 100644
index 0000000000000..218c44a291519
--- /dev/null
+++ b/ports/renesas-ra/moduos.c
@@ -0,0 +1,62 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013, 2014 Damien P. George
+ * Copyright (c) 2022 Renesas Electronics Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "py/runtime.h"
+#include "uart.h"
+
+#if MICROPY_VFS_FAT
+#include "lib/oofatfs/ff.h"
+#include "lib/oofatfs/diskio.h"
+#endif
+
+// sync()
+// Sync all filesystems.
+STATIC mp_obj_t mp_uos_sync(void) {
+    #if MICROPY_VFS_FAT
+    for (mp_vfs_mount_t *vfs = MP_STATE_VM(vfs_mount_table); vfs != NULL; vfs = vfs->next) {
+        // this assumes that vfs->obj is fs_user_mount_t with block device functions
+        disk_ioctl(MP_OBJ_TO_PTR(vfs->obj), CTRL_SYNC, NULL);
+    }
+    #endif
+    return mp_const_none;
+}
+MP_DEFINE_CONST_FUN_OBJ_0(mp_uos_sync_obj, mp_uos_sync);
+
+bool mp_uos_dupterm_is_builtin_stream(mp_const_obj_t stream) {
+    const mp_obj_type_t *type = mp_obj_get_type(stream);
+    return type == &pyb_uart_type;
+}
+
+void mp_uos_dupterm_stream_detached_attached(mp_obj_t stream_detached, mp_obj_t stream_attached) {
+    if (mp_obj_get_type(stream_detached) == &pyb_uart_type) {
+        uart_attach_to_repl(MP_OBJ_TO_PTR(stream_detached), false);
+    }
+
+    if (mp_obj_get_type(stream_attached) == &pyb_uart_type) {
+        uart_attach_to_repl(MP_OBJ_TO_PTR(stream_attached), true);
+    }
+}
diff --git a/ports/renesas-ra/modutime.c b/ports/renesas-ra/modutime.c
new file mode 100644
index 0000000000000..bff76035e3f8a
--- /dev/null
+++ b/ports/renesas-ra/modutime.c
@@ -0,0 +1,158 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013, 2014 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include <stdio.h>
+#include <string.h>
+
+#include "py/runtime.h"
+#include "py/smallint.h"
+#include "py/obj.h"
+#include "shared/timeutils/timeutils.h"
+#include "extmod/utime_mphal.h"
+#include "systick.h"
+#include "rtc.h"
+
+/// \module time - time related functions
+///
+/// The `time` module provides functions for getting the current time and date,
+/// and for sleeping.
+
+/// \function localtime([secs])
+/// Convert a time expressed in seconds since Jan 1, 2000 into an 8-tuple which
+/// contains: (year, month, mday, hour, minute, second, weekday, yearday)
+/// If secs is not provided or None, then the current time from the RTC is used.
+/// year includes the century (for example 2014)
+/// month   is 1-12
+/// mday    is 1-31
+/// hour    is 0-23
+/// minute  is 0-59
+/// second  is 0-59
+/// weekday is 0-6 for Mon-Sun.
+/// yearday is 1-366
+STATIC mp_obj_t time_localtime(size_t n_args, const mp_obj_t *args) {
+    if (n_args == 0 || args[0] == mp_const_none) {
+        // get current date and time
+        // note: need to call get time then get date to correctly access the registers
+        rtc_init_finalise();
+        // RTC_DateTypeDef date;
+        // RTC_TimeTypeDef time;
+        // HAL_RTC_GetTime(&RTCHandle, &time, RTC_FORMAT_BIN);
+        // HAL_RTC_GetDate(&RTCHandle, &date, RTC_FORMAT_BIN);
+        ra_rtc_t time;
+        ra_rtc_get_time(&time);
+        mp_obj_t tuple[8] = {
+            mp_obj_new_int(time.year),
+            mp_obj_new_int(time.month),
+            mp_obj_new_int(time.date),
+            mp_obj_new_int(time.hour),
+            mp_obj_new_int(time.minute),
+            mp_obj_new_int(time.second),
+            mp_obj_new_int(time.weekday - 1),
+            mp_obj_new_int(timeutils_year_day(time.year, time.month, time.date)),
+        };
+        return mp_obj_new_tuple(8, tuple);
+    } else {
+        mp_int_t seconds = mp_obj_get_int(args[0]);
+        timeutils_struct_time_t tm;
+        timeutils_seconds_since_epoch_to_struct_time(seconds, &tm);
+        mp_obj_t tuple[8] = {
+            tuple[0] = mp_obj_new_int(tm.tm_year),
+            tuple[1] = mp_obj_new_int(tm.tm_mon),
+            tuple[2] = mp_obj_new_int(tm.tm_mday),
+            tuple[3] = mp_obj_new_int(tm.tm_hour),
+            tuple[4] = mp_obj_new_int(tm.tm_min),
+            tuple[5] = mp_obj_new_int(tm.tm_sec),
+            tuple[6] = mp_obj_new_int(tm.tm_wday),
+            tuple[7] = mp_obj_new_int(tm.tm_yday),
+        };
+        return mp_obj_new_tuple(8, tuple);
+    }
+}
+MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(time_localtime_obj, 0, 1, time_localtime);
+
+
+/// \function mktime()
+/// This is inverse function of localtime. It's argument is a full 8-tuple
+/// which expresses a time as per localtime. It returns an integer which is
+/// the number of seconds since Jan 1, 2000.
+STATIC mp_obj_t time_mktime(mp_obj_t tuple) {
+
+    size_t len;
+    mp_obj_t *elem;
+
+    mp_obj_get_array(tuple, &len, &elem);
+
+    // localtime generates a tuple of len 8. CPython uses 9, so we accept both.
+    if (len < 8 || len > 9) {
+        mp_raise_msg_varg(&mp_type_TypeError, MP_ERROR_TEXT("mktime needs a tuple of length 8 or 9 (%d given)"), len);
+    }
+
+    return mp_obj_new_int_from_uint(timeutils_mktime(mp_obj_get_int(elem[0]),
+        mp_obj_get_int(elem[1]), mp_obj_get_int(elem[2]), mp_obj_get_int(elem[3]),
+        mp_obj_get_int(elem[4]), mp_obj_get_int(elem[5])));
+}
+MP_DEFINE_CONST_FUN_OBJ_1(time_mktime_obj, time_mktime);
+
+/// \function time()
+/// Returns the number of seconds, as an integer, since 1/1/2000.
+STATIC mp_obj_t time_time(void) {
+    // get date and time
+    // note: need to call get time then get date to correctly access the registers
+    rtc_init_finalise();
+    // RTC_DateTypeDef date;
+    // RTC_TimeTypeDef time;
+    // HAL_RTC_GetTime(&RTCHandle, &time, RTC_FORMAT_BIN);
+    // HAL_RTC_GetDate(&RTCHandle, &date, RTC_FORMAT_BIN);
+    ra_rtc_t time;
+    ra_rtc_get_time(&time);
+    return mp_obj_new_int(timeutils_seconds_since_epoch(time.year, time.month, time.date, time.hour, time.minute, time.second));
+}
+MP_DEFINE_CONST_FUN_OBJ_0(time_time_obj, time_time);
+
+STATIC const mp_rom_map_elem_t time_module_globals_table[] = {
+    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_utime) },
+
+    { MP_ROM_QSTR(MP_QSTR_gmtime), MP_ROM_PTR(&time_localtime_obj) },
+    { MP_ROM_QSTR(MP_QSTR_localtime), MP_ROM_PTR(&time_localtime_obj) },
+    { MP_ROM_QSTR(MP_QSTR_mktime), MP_ROM_PTR(&time_mktime_obj) },
+    { MP_ROM_QSTR(MP_QSTR_time), MP_ROM_PTR(&time_time_obj) },
+    { MP_ROM_QSTR(MP_QSTR_sleep), MP_ROM_PTR(&mp_utime_sleep_obj) },
+    { MP_ROM_QSTR(MP_QSTR_sleep_ms), MP_ROM_PTR(&mp_utime_sleep_ms_obj) },
+    { MP_ROM_QSTR(MP_QSTR_sleep_us), MP_ROM_PTR(&mp_utime_sleep_us_obj) },
+    { MP_ROM_QSTR(MP_QSTR_ticks_ms), MP_ROM_PTR(&mp_utime_ticks_ms_obj) },
+    { MP_ROM_QSTR(MP_QSTR_ticks_us), MP_ROM_PTR(&mp_utime_ticks_us_obj) },
+    { MP_ROM_QSTR(MP_QSTR_ticks_cpu), MP_ROM_PTR(&mp_utime_ticks_cpu_obj) },
+    { MP_ROM_QSTR(MP_QSTR_ticks_add), MP_ROM_PTR(&mp_utime_ticks_add_obj) },
+    { MP_ROM_QSTR(MP_QSTR_ticks_diff), MP_ROM_PTR(&mp_utime_ticks_diff_obj) },
+    { MP_ROM_QSTR(MP_QSTR_time_ns), MP_ROM_PTR(&mp_utime_time_ns_obj) },
+};
+
+STATIC MP_DEFINE_CONST_DICT(time_module_globals, time_module_globals_table);
+
+const mp_obj_module_t mp_module_utime = {
+    .base = { &mp_type_module },
+    .globals = (mp_obj_dict_t *)&time_module_globals,
+};
diff --git a/ports/renesas-ra/mpconfigboard_common.h b/ports/renesas-ra/mpconfigboard_common.h
new file mode 100644
index 0000000000000..f63a924ad8e4d
--- /dev/null
+++ b/ports/renesas-ra/mpconfigboard_common.h
@@ -0,0 +1,244 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2018 Damien P. George
+ * Copyright (c) 2021,2022 Renesas Electronics Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+// Common settings and defaults for board configuration.
+// The defaults here should be overridden in mpconfigboard.h.
+
+#include RA_HAL_H
+
+/*****************************************************************************/
+// Feature settings with defaults
+
+// Whether to include the ra module, with peripheral register constants
+#ifndef MICROPY_PY_RA
+#define MICROPY_PY_RA (1)
+#endif
+
+// Whether to include the pyb module
+#ifndef MICROPY_PY_PYB
+#define MICROPY_PY_PYB (1)
+#endif
+
+// Whether to include legacy functions and classes in the pyb module
+#ifndef MICROPY_PY_PYB_LEGACY
+#define MICROPY_PY_PYB_LEGACY (1)
+#endif
+
+// Whether machine.bootloader() will enter the bootloader via reset, or direct jump.
+#ifndef MICROPY_HW_ENTER_BOOTLOADER_VIA_RESET
+#define MICROPY_HW_ENTER_BOOTLOADER_VIA_RESET (1)
+#endif
+
+// Whether to enable storage on the internal flash of the MCU
+#ifndef MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE
+#define MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE (1)
+#endif
+
+// If internal flash storage is enabled, whether to use a second segment of flash.
+#ifndef MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE
+#define MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE_SEGMENT2 (0)
+#endif
+
+// Whether to enable the RTC, exposed as pyb.RTC
+#ifndef MICROPY_HW_ENABLE_RTC
+#define MICROPY_HW_ENABLE_RTC (0)
+#endif
+
+// Whether to enable the hardware RNG peripheral, exposed as pyb.rng()
+#ifndef MICROPY_HW_ENABLE_RNG
+#define MICROPY_HW_ENABLE_RNG (0)
+#endif
+
+// Whether to enable the ADC peripheral, exposed as pyb.ADC and pyb.ADCAll
+#ifndef MICROPY_HW_ENABLE_ADC
+#define MICROPY_HW_ENABLE_ADC (1)
+#endif
+
+// Whether to enable the DAC peripheral, exposed as pyb.DAC
+#ifndef MICROPY_HW_ENABLE_DAC
+#define MICROPY_HW_ENABLE_DAC (0)
+#endif
+
+// Whether to enable the DCMI peripheral
+#ifndef MICROPY_HW_ENABLE_DCMI
+#define MICROPY_HW_ENABLE_DCMI (0)
+#endif
+
+// Whether to enable the PA0-PA3 servo driver, exposed as pyb.Servo
+#ifndef MICROPY_HW_ENABLE_SERVO
+#define MICROPY_HW_ENABLE_SERVO (0)
+#endif
+
+// Whether to enable a USR switch, exposed as pyb.Switch
+#ifndef MICROPY_HW_HAS_SWITCH
+#define MICROPY_HW_HAS_SWITCH (0)
+#endif
+
+// Whether to expose internal flash storage as pyb.Flash
+#ifndef MICROPY_HW_HAS_FLASH
+#define MICROPY_HW_HAS_FLASH (0)
+#endif
+
+// Whether to enable the MMA7660 driver, exposed as pyb.Accel
+#ifndef MICROPY_HW_HAS_MMA7660
+#define MICROPY_HW_HAS_MMA7660 (0)
+#endif
+
+// Whether to enable the LCD32MK driver, exposed as pyb.LCD
+#ifndef MICROPY_HW_HAS_LCD
+#define MICROPY_HW_HAS_LCD (0)
+#endif
+
+// Whether to automatically mount (and boot from) the flash filesystem
+#ifndef MICROPY_HW_FLASH_MOUNT_AT_BOOT
+#define MICROPY_HW_FLASH_MOUNT_AT_BOOT (MICROPY_HW_ENABLE_STORAGE)
+#endif
+
+// The volume label used when creating the flash filesystem
+#ifndef MICROPY_HW_FLASH_FS_LABEL
+#define MICROPY_HW_FLASH_FS_LABEL "raflash"
+#endif
+
+// Function to determine if the given i2c_id is reserved for system use or not.
+#ifndef MICROPY_HW_I2C_IS_RESERVED
+#define MICROPY_HW_I2C_IS_RESERVED(i2c_id) (false)
+#endif
+
+// Function to determine if the given spi_id is reserved for system use or not.
+#ifndef MICROPY_HW_SPI_IS_RESERVED
+#define MICROPY_HW_SPI_IS_RESERVED(spi_id) (false)
+#endif
+
+// Function to determine if the given tim_id is reserved for system use or not.
+#ifndef MICROPY_HW_TIM_IS_RESERVED
+#define MICROPY_HW_TIM_IS_RESERVED(tim_id) (false)
+#endif
+
+// Function to determine if the given uart_id is reserved for system use or not.
+#ifndef MICROPY_HW_UART_IS_RESERVED
+#define MICROPY_HW_UART_IS_RESERVED(uart_id) (false)
+#endif
+
+/*****************************************************************************/
+// General configuration
+
+// Heap start / end definitions
+#ifndef MICROPY_HEAP_START
+#define MICROPY_HEAP_START &_heap_start
+#endif
+#ifndef MICROPY_HEAP_END
+#define MICROPY_HEAP_END &_heap_end
+#endif
+
+// Configuration for RA series
+#if defined(RA4M1)
+
+#define MP_HAL_UNIQUE_ID_ADDRESS (0x1ffff7ac)
+// 16 IRQ + 1 EXTI_RTC_WAKEUP defined in exti.h
+#define PYB_EXTI_NUM_VECTORS (17)
+#define MICROPY_HW_MAX_TIMER (2)
+#define MICROPY_HW_MAX_UART (10)
+#define MICROPY_HW_MAX_LPUART (0)
+
+#elif defined(RA4M3)
+
+#define MP_HAL_UNIQUE_ID_ADDRESS (0x1ffff7ac)   /* To be fixed */
+// 16 IRQ + 1 EXTI_RTC_WAKEUP defined in exti.h
+#define PYB_EXTI_NUM_VECTORS (17)
+#define MICROPY_HW_MAX_TIMER (2)
+#define MICROPY_HW_MAX_UART (10)
+#define MICROPY_HW_MAX_LPUART (0)
+
+#elif defined(RA4W1)
+
+#define MP_HAL_UNIQUE_ID_ADDRESS (0x1ffff7ac)   /* To be fixed */
+// 16 IRQ + 1 EXTI_RTC_WAKEUP defined in exti.h
+#define PYB_EXTI_NUM_VECTORS (17)
+#define MICROPY_HW_MAX_TIMER (2)
+#define MICROPY_HW_MAX_UART (10)
+#define MICROPY_HW_MAX_LPUART (0)
+
+#elif defined(RA6M1)
+
+#define MP_HAL_UNIQUE_ID_ADDRESS (0x0100A150)   /* To be fixed */
+// 16 IRQ + 1 EXTI_RTC_WAKEUP defined in exti.h
+#define PYB_EXTI_NUM_VECTORS (17)
+#define MICROPY_HW_MAX_TIMER (2)
+#define MICROPY_HW_MAX_UART (10)
+#define MICROPY_HW_MAX_LPUART (0)
+
+#elif defined(RA6M2)
+
+#define MP_HAL_UNIQUE_ID_ADDRESS (0x1ffff7ac)   /* To be fixed */
+// 16 IRQ + 1 EXTI_RTC_WAKEUP defined in exti.h
+#define PYB_EXTI_NUM_VECTORS (17)
+#define MICROPY_HW_MAX_TIMER (2)
+#define MICROPY_HW_MAX_UART (10)
+#define MICROPY_HW_MAX_LPUART (0)
+
+#elif defined(RA6M3)
+
+#define MP_HAL_UNIQUE_ID_ADDRESS (0x1ffff7ac)   /* To be fixed */
+// 16 IRQ + 1 EXTI_RTC_WAKEUP defined in exti.h
+#define PYB_EXTI_NUM_VECTORS (17)
+#define MICROPY_HW_MAX_TIMER (2)
+#define MICROPY_HW_MAX_UART (10)
+#define MICROPY_HW_MAX_LPUART (0)
+
+#error Unsupported MCU series
+#endif
+
+// If disabled then try normal (non-bypass) LSE first, with fallback to LSI.
+// If enabled first try LSE in bypass mode.  If that fails to start, try non-bypass mode, with fallback to LSI.
+#ifndef MICROPY_HW_RTC_USE_BYPASS
+#define MICROPY_HW_RTC_USE_BYPASS (0)
+#endif
+
+#if MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE
+// Provide block device macros if internal flash storage is enabled
+#define MICROPY_HW_BDEV_IOCTL flash_bdev_ioctl
+#define MICROPY_HW_BDEV_READBLOCK flash_bdev_readblock
+#define MICROPY_HW_BDEV_WRITEBLOCK flash_bdev_writeblock
+#endif
+
+// Enable the storage sub-system if a block device is defined
+#if defined(MICROPY_HW_BDEV_IOCTL)
+#define MICROPY_HW_ENABLE_STORAGE (1)
+#else
+#define MICROPY_HW_ENABLE_STORAGE (0)
+#endif
+
+// Enable hardware I2C if there are any peripherals defined
+#if defined(MICROPY_HW_I2C0_SCL) || defined(MICROPY_HW_I2C1_SCL) \
+    || defined(MICROPY_HW_I2C2_SCL)
+#define MICROPY_HW_ENABLE_HW_I2C (1)
+#else
+#define MICROPY_HW_ENABLE_HW_I2C (0)
+#endif
+
+// Pin definition header file
+#define MICROPY_PIN_DEFS_PORT_H "pin_defs_ra.h"
diff --git a/ports/renesas-ra/mpconfigport.h b/ports/renesas-ra/mpconfigport.h
new file mode 100644
index 0000000000000..0301a41d396f2
--- /dev/null
+++ b/ports/renesas-ra/mpconfigport.h
@@ -0,0 +1,303 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013-2017 Damien P. George
+ * Copyright (c) 2021,2022 Renesas Electronics Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+// Options to control how MicroPython is built for this port,
+// overriding defaults in py/mpconfig.h.
+
+// board specific definitions
+#include "mpconfigboard.h"
+#include "mpconfigboard_common.h"
+
+#ifndef MICROPY_CONFIG_ROM_LEVEL
+#define MICROPY_CONFIG_ROM_LEVEL (MICROPY_CONFIG_ROM_LEVEL_EXTRA_FEATURES)
+#endif
+
+// memory allocation policies
+#ifndef MICROPY_GC_STACK_ENTRY_TYPE
+#if MICROPY_HW_SDRAM_SIZE
+#define MICROPY_GC_STACK_ENTRY_TYPE uint32_t
+#else
+#define MICROPY_GC_STACK_ENTRY_TYPE uint16_t
+#endif
+#endif
+#define MICROPY_ALLOC_PATH_MAX      (128)
+
+// optimisations
+#ifndef MICROPY_OPT_COMPUTED_GOTO
+#define MICROPY_OPT_COMPUTED_GOTO   (1)
+#endif
+
+// Don't enable lookup cache on M0 (low RAM)
+#ifndef MICROPY_OPT_MAP_LOOKUP_CACHE
+#define MICROPY_OPT_MAP_LOOKUP_CACHE (__CORTEX_M > 0)
+#endif
+
+// emitters
+#define MICROPY_PERSISTENT_CODE_LOAD (1)
+#ifndef MICROPY_EMIT_THUMB
+#define MICROPY_EMIT_THUMB          (1)
+#endif
+#ifndef MICROPY_EMIT_INLINE_THUMB
+#define MICROPY_EMIT_INLINE_THUMB   (1)
+#endif
+
+// Python internal features
+#define MICROPY_READER_VFS          (1)
+#define MICROPY_ENABLE_GC           (1)
+#define MICROPY_ENABLE_EMERGENCY_EXCEPTION_BUF (1)
+#define MICROPY_EMERGENCY_EXCEPTION_BUF_SIZE (0)
+#define MICROPY_REPL_INFO           (1)
+#define MICROPY_LONGINT_IMPL        (MICROPY_LONGINT_IMPL_MPZ)
+#ifndef MICROPY_FLOAT_IMPL // can be configured by each board via mpconfigboard.mk
+#define MICROPY_FLOAT_IMPL          (MICROPY_FLOAT_IMPL_FLOAT)
+#endif
+#define MICROPY_USE_INTERNAL_ERRNO  (1)
+#define MICROPY_SCHEDULER_DEPTH     (8)
+#define MICROPY_VFS                 (1)
+
+// control over Python builtins
+#ifndef MICROPY_PY_BUILTINS_HELP_TEXT
+#define MICROPY_PY_BUILTINS_HELP_TEXT ra_help_text
+#endif
+#define MICROPY_PY_IO_FILEIO        (MICROPY_VFS_FAT || MICROPY_VFS_LFS1 || MICROPY_VFS_LFS2)
+#ifndef MICROPY_PY_SYS_PLATFORM     // let boards override it if they want
+#define MICROPY_PY_SYS_PLATFORM     "renesas-ra"
+#endif
+#ifndef MICROPY_PY_THREAD
+#define MICROPY_PY_THREAD           (0)
+#endif
+
+// extended modules
+#define MICROPY_PY_UOS_INCLUDEFILE  "ports/renesas-ra/moduos.c"
+#define MICROPY_PY_OS_DUPTERM       (3)
+#define MICROPY_PY_UOS_DUPTERM_BUILTIN_STREAM (1)
+#define MICROPY_PY_UOS_DUPTERM_STREAM_DETACHED_ATTACHED (1)
+#define MICROPY_PY_UOS_SEP          (1)
+#define MICROPY_PY_UOS_SYNC         (1)
+#define MICROPY_PY_UOS_UNAME        (1)
+#define MICROPY_PY_UOS_URANDOM      (MICROPY_HW_ENABLE_RNG)
+#ifndef MICROPY_PY_UTIME
+#define MICROPY_PY_UTIME            (1)
+#endif
+#define MICROPY_PY_UTIME_MP_HAL     (MICROPY_PY_UTIME)
+#ifndef MICROPY_PY_UTIMEQ
+#define MICROPY_PY_UTIMEQ           (1)
+#endif
+#ifndef MICROPY_PY_MACHINE
+#define MICROPY_PY_MACHINE          (1)
+#ifndef MICROPY_PY_MACHINE_BITSTREAM
+#define MICROPY_PY_MACHINE_BITSTREAM (1)
+#endif
+#define MICROPY_PY_MACHINE_PULSE    (1)
+#define MICROPY_PY_MACHINE_PIN_MAKE_NEW mp_pin_make_new
+#define MICROPY_PY_MACHINE_I2C      (1)
+#define MICROPY_PY_MACHINE_SOFTI2C  (1)
+#define MICROPY_PY_MACHINE_SPI      (1)
+#define MICROPY_PY_MACHINE_SPI_MSB  (SPI_FIRSTBIT_MSB)
+#define MICROPY_PY_MACHINE_SPI_LSB  (SPI_FIRSTBIT_LSB)
+#define MICROPY_PY_MACHINE_SOFTSPI  (1)
+#endif
+#define MICROPY_HW_SOFTSPI_MIN_DELAY (0)
+#define MICROPY_HW_SOFTSPI_MAX_BAUDRATE (48000000 / 48)
+#ifndef MICROPY_PY_ONEWIRE
+#define MICROPY_PY_ONEWIRE          (1)
+#endif
+#ifndef MICROPY_PY_UPLATFORM
+#define MICROPY_PY_UPLATFORM        (1)
+#endif
+
+// fatfs configuration used in ffconf.h
+#define MICROPY_FATFS_ENABLE_LFN       (1)
+#define MICROPY_FATFS_LFN_CODE_PAGE    437 /* 1=SFN/ANSI 437=LFN/U.S.(OEM) */
+#define MICROPY_FATFS_USE_LABEL        (1)
+#define MICROPY_FATFS_RPATH            (2)
+#define MICROPY_FATFS_MULTI_PARTITION  (1)
+
+// TODO these should be generic, not bound to a particular FS implementation
+#if MICROPY_VFS_FAT
+#define mp_type_fileio mp_type_vfs_fat_fileio
+#define mp_type_textio mp_type_vfs_fat_textio
+#elif MICROPY_VFS_LFS1
+#define mp_type_fileio mp_type_vfs_lfs1_fileio
+#define mp_type_textio mp_type_vfs_lfs1_textio
+#elif MICROPY_VFS_LFS2
+#define mp_type_fileio mp_type_vfs_lfs2_fileio
+#define mp_type_textio mp_type_vfs_lfs2_textio
+#endif
+
+// use vfs's functions for import stat and builtin open
+#define mp_import_stat mp_vfs_import_stat
+#define mp_builtin_open mp_vfs_open
+#define mp_builtin_open_obj mp_vfs_open_obj
+
+// extra built in names to add to the global namespace
+#define MICROPY_PORT_BUILTINS \
+    { MP_ROM_QSTR(MP_QSTR_open), MP_ROM_PTR(&mp_builtin_open_obj) },
+
+// extra built in modules to add to the list of known ones
+extern const struct _mp_obj_module_t mp_module_ubinascii;
+extern const struct _mp_obj_module_t mp_module_ure;
+extern const struct _mp_obj_module_t mp_module_uzlib;
+extern const struct _mp_obj_module_t mp_module_ujson;
+extern const struct _mp_obj_module_t mp_module_uheapq;
+extern const struct _mp_obj_module_t mp_module_uhashlib;
+extern const struct _mp_obj_module_t mp_module_utime;
+extern const struct _mp_obj_module_t mp_module_onewire;
+
+#if MICROPY_PY_MACHINE
+#define MACHINE_BUILTIN_MODULE_CONSTANTS \
+    { MP_ROM_QSTR(MP_QSTR_umachine), MP_ROM_PTR(&mp_module_machine) }, \
+    { MP_ROM_QSTR(MP_QSTR_machine), MP_ROM_PTR(&mp_module_machine) },
+#else
+#define MACHINE_BUILTIN_MODULE_CONSTANTS
+#endif
+
+#if MICROPY_PY_UTIME
+#define UTIME_BUILTIN_MODULE                { MP_ROM_QSTR(MP_QSTR_utime), MP_ROM_PTR(&mp_module_utime) },
+#else
+#define UTIME_BUILTIN_MODULE
+#endif
+
+#if MICROPY_PY_ONEWIRE
+#define ONEWIRE_BUILTIN_MODULE              { MP_ROM_QSTR(MP_QSTR__onewire), MP_ROM_PTR(&mp_module_onewire) },
+#else
+#define ONEWIRE_BUILTIN_MODULE
+#endif
+
+#define MICROPY_PORT_BUILTIN_MODULES \
+    UTIME_BUILTIN_MODULE \
+    ONEWIRE_BUILTIN_MODULE \
+
+// extra constants
+#define MICROPY_PORT_CONSTANTS \
+    MACHINE_BUILTIN_MODULE_CONSTANTS \
+
+#define MP_STATE_PORT MP_STATE_VM
+
+#ifndef MICROPY_BOARD_ROOT_POINTERS
+#define MICROPY_BOARD_ROOT_POINTERS
+#endif
+
+#define MICROPY_PORT_ROOT_POINTERS \
+    const char *readline_hist[8]; \
+    \
+    mp_obj_t pyb_hid_report_desc; \
+    \
+    mp_obj_t pyb_config_main; \
+    \
+    mp_obj_t pyb_switch_callback; \
+    \
+    mp_obj_t pin_class_mapper; \
+    mp_obj_t pin_class_map_dict; \
+    \
+    mp_obj_t pyb_extint_callback[PYB_EXTI_NUM_VECTORS]; \
+    \
+    /* pointers to all Timer objects (if they have been created) */ \
+    struct _pyb_timer_obj_t *pyb_timer_obj_all[MICROPY_HW_MAX_TIMER]; \
+    \
+    /* stdio is repeated on this UART object if it's not null */ \
+    struct _pyb_uart_obj_t *pyb_stdio_uart; \
+    \
+    /* pointers to all UART objects (if they have been created) */ \
+    struct _pyb_uart_obj_t *pyb_uart_obj_all[MICROPY_HW_MAX_UART + MICROPY_HW_MAX_LPUART]; \
+    \
+    /* list of registered NICs */ \
+    /* mp_obj_list_t mod_network_nic_list; */ \
+    \
+    /* root pointers for sub-systems */ \
+    \
+    /* root pointers defined by a board */ \
+    MICROPY_BOARD_ROOT_POINTERS \
+
+// type definitions for the specific machine
+
+#define MICROPY_MAKE_POINTER_CALLABLE(p) ((void *)((uint32_t)(p) | 1))
+
+#define MP_SSIZE_MAX (0x7fffffff)
+
+// Assume that if we already defined the obj repr then we also defined these items
+#ifndef MICROPY_OBJ_REPR
+#define UINT_FMT "%u"
+#define INT_FMT "%d"
+typedef int mp_int_t; // must be pointer size
+typedef unsigned int mp_uint_t; // must be pointer size
+#endif
+
+typedef long mp_off_t;
+
+// We have inlined IRQ functions for efficiency (they are generally
+// 1 machine instruction).
+//
+// Note on IRQ state: you should not need to know the specific
+// value of the state variable, but rather just pass the return
+// value from disable_irq back to enable_irq.  If you really need
+// to know the machine-specific values, see irq.h.
+
+static inline void enable_irq(mp_uint_t state) {
+    __set_PRIMASK(state);
+}
+
+static inline mp_uint_t disable_irq(void) {
+    mp_uint_t state = __get_PRIMASK();
+    __disable_irq();
+    return state;
+}
+
+#define MICROPY_BEGIN_ATOMIC_SECTION()     disable_irq()
+#define MICROPY_END_ATOMIC_SECTION(state)  enable_irq(state)
+
+#if MICROPY_PY_THREAD
+#define MICROPY_EVENT_POLL_HOOK \
+    do { \
+        extern void mp_handle_pending(bool); \
+        mp_handle_pending(true); \
+        if (pyb_thread_enabled) { \
+            MP_THREAD_GIL_EXIT(); \
+            pyb_thread_yield(); \
+            MP_THREAD_GIL_ENTER(); \
+        } else { \
+            __WFI(); \
+        } \
+    } while (0);
+
+#define MICROPY_THREAD_YIELD() pyb_thread_yield()
+#else
+#define MICROPY_EVENT_POLL_HOOK \
+    do { \
+        extern void mp_handle_pending(bool); \
+        mp_handle_pending(true); \
+        __WFI(); \
+    } while (0);
+
+#define MICROPY_THREAD_YIELD()
+#endif
+
+// We need an implementation of the log2 function which is not a macro
+#define MP_NEED_LOG2 (1)
+
+// We need to provide a declaration/definition of alloca()
+#include <alloca.h>
diff --git a/ports/renesas-ra/mpconfigport.mk b/ports/renesas-ra/mpconfigport.mk
new file mode 100644
index 0000000000000..adf2b8f4ab7b7
--- /dev/null
+++ b/ports/renesas-ra/mpconfigport.mk
@@ -0,0 +1,4 @@
+# Enable/disable extra modules
+
+# VFS FAT FS support
+MICROPY_VFS_FAT ?= 1
diff --git a/ports/renesas-ra/mphalport.c b/ports/renesas-ra/mphalport.c
new file mode 100644
index 0000000000000..6a416f431adb5
--- /dev/null
+++ b/ports/renesas-ra/mphalport.c
@@ -0,0 +1,120 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2018 Damien P. George
+ * Copyright (c) 2021,2022 Renesas Electronics Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include <string.h>
+
+#include "py/runtime.h"
+#include "py/stream.h"
+#include "py/mperrno.h"
+#include "py/mphal.h"
+#include "extmod/misc.h"
+#include "uart.h"
+
+// this table converts from HAL_StatusTypeDef to POSIX errno
+const byte mp_hal_status_to_errno_table[4] = {
+    [HAL_OK] = 0,
+    [HAL_ERROR] = MP_EIO,
+    [HAL_BUSY] = MP_EBUSY,
+    [HAL_TIMEOUT] = MP_ETIMEDOUT,
+};
+
+NORETURN void mp_hal_raise(HAL_StatusTypeDef status) {
+    mp_raise_OSError(mp_hal_status_to_errno_table[status]);
+}
+
+MP_WEAK uintptr_t mp_hal_stdio_poll(uintptr_t poll_flags) {
+    uintptr_t ret = 0;
+    if (MP_STATE_PORT(pyb_stdio_uart) != NULL) {
+        mp_obj_t pyb_stdio_uart = MP_OBJ_FROM_PTR(MP_STATE_PORT(pyb_stdio_uart));
+        int errcode;
+        const mp_stream_p_t *stream_p = mp_get_stream(pyb_stdio_uart);
+        ret = stream_p->ioctl(pyb_stdio_uart, MP_STREAM_POLL, poll_flags, &errcode);
+    }
+    return ret | mp_uos_dupterm_poll(poll_flags);
+}
+
+#if MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE
+void flash_cache_commit(void);
+#endif
+
+MP_WEAK int mp_hal_stdin_rx_chr(void) {
+    for (;;) {
+        #if MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE
+        flash_cache_commit();
+        #endif
+        if (MP_STATE_PORT(pyb_stdio_uart) != NULL && uart_rx_any(MP_STATE_PORT(pyb_stdio_uart))) {
+            return uart_rx_char(MP_STATE_PORT(pyb_stdio_uart));
+        }
+        int dupterm_c = mp_uos_dupterm_rx_chr();
+        if (dupterm_c >= 0) {
+            return dupterm_c;
+        }
+        MICROPY_EVENT_POLL_HOOK
+    }
+}
+
+MP_WEAK void mp_hal_stdout_tx_strn(const char *str, size_t len) {
+    if (MP_STATE_PORT(pyb_stdio_uart) != NULL) {
+        uart_tx_strn(MP_STATE_PORT(pyb_stdio_uart), str, len);
+    }
+    mp_uos_dupterm_tx_strn(str, len);
+}
+
+void mp_hal_ticks_cpu_enable(void) {
+}
+
+void mp_hal_pin_config(mp_hal_pin_obj_t pin_obj, uint32_t mode, uint32_t pull, uint32_t drive, uint32_t alt) {
+    ra_gpio_config(pin_obj->pin, mode, pull, drive, alt);
+}
+
+/*******************************************************************************/
+// MAC address
+
+// Generate a random locally administered MAC address (LAA)
+void mp_hal_generate_laa_mac(int idx, uint8_t buf[6]) {
+    uint8_t *id = (uint8_t *)MP_HAL_UNIQUE_ID_ADDRESS;
+    buf[0] = 0x02; // LAA range
+    buf[1] = (id[11] << 4) | (id[10] & 0xf);
+    buf[2] = (id[9] << 4) | (id[8] & 0xf);
+    buf[3] = (id[7] << 4) | (id[6] & 0xf);
+    buf[4] = id[2];
+    buf[5] = (id[0] << 2) | idx;
+}
+
+// A board can override this if needed
+MP_WEAK void mp_hal_get_mac(int idx, uint8_t buf[6]) {
+    mp_hal_generate_laa_mac(idx, buf);
+}
+
+void mp_hal_get_mac_ascii(int idx, size_t chr_off, size_t chr_len, char *dest) {
+    static const char hexchr[16] = "0123456789ABCDEF";
+    uint8_t mac[6];
+    mp_hal_get_mac(idx, mac);
+    for (; chr_len; ++chr_off, --chr_len) {
+        *dest++ = hexchr[mac[chr_off >> 1] >> (4 * (1 - (chr_off & 1))) & 0xf];
+    }
+}
diff --git a/ports/renesas-ra/mphalport.h b/ports/renesas-ra/mphalport.h
new file mode 100644
index 0000000000000..c489d1b966a74
--- /dev/null
+++ b/ports/renesas-ra/mphalport.h
@@ -0,0 +1,98 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2018 Damien P. George
+ * Copyright (c) 2021 Renesas Electronics Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include RA_HAL_H
+#include "pin.h"
+
+extern const unsigned char mp_hal_status_to_errno_table[4];
+
+static inline int mp_hal_status_to_neg_errno(HAL_StatusTypeDef status) {
+    return -mp_hal_status_to_errno_table[status];
+}
+
+NORETURN void mp_hal_raise(HAL_StatusTypeDef status);
+void mp_hal_set_interrupt_char(int c); // -1 to disable
+
+// timing functions
+
+#include "irq.h"
+
+#if __CORTEX_M == 0
+// Don't have raise_irq_pri on Cortex-M0 so keep IRQs enabled to have SysTick timing
+#define mp_hal_quiet_timing_enter() (1)
+#define mp_hal_quiet_timing_exit(irq_state) (void)(irq_state)
+#else
+#define mp_hal_quiet_timing_enter() raise_irq_pri(1)
+#define mp_hal_quiet_timing_exit(irq_state) restore_irq_pri(irq_state)
+#endif
+#define mp_hal_delay_us_fast(us) mp_hal_delay_us(us)
+
+void mp_hal_ticks_cpu_enable(void);
+static inline mp_uint_t mp_hal_ticks_cpu(void) {
+    return 0;
+}
+#define SPI_FIRSTBIT_MSB                (0x00000000U)
+#define SPI_FIRSTBIT_LSB                (0x00000001U)
+
+#define MP_HAL_PIN_FMT                  "%q"
+#define MP_HAL_PIN_MODE_INPUT           (GPIO_MODE_INPUT)
+#define MP_HAL_PIN_MODE_OUTPUT          (GPIO_MODE_OUTPUT_PP)
+#define MP_HAL_PIN_MODE_ALT             (GPIO_MODE_AF_PP)
+#define MP_HAL_PIN_MODE_ANALOG          (GPIO_MODE_ANALOG)
+#define MP_HAL_PIN_MODE_ADC             (GPIO_MODE_ANALOG)
+#define MP_HAL_PIN_MODE_OPEN_DRAIN      (GPIO_MODE_OUTPUT_OD)
+#define MP_HAL_PIN_MODE_ALT_OPEN_DRAIN  (GPIO_MODE_AF_OD)
+#define MP_HAL_PIN_PULL_NONE            (GPIO_NOPULL)
+#define MP_HAL_PIN_PULL_UP              (GPIO_PULLUP)
+#define MP_HAL_PIN_PULL_DOWN            (GPIO_PULLDOWN)
+
+#define mp_hal_pin_obj_t        const machine_pin_obj_t *
+#define mp_hal_get_pin_obj(o)   machine_pin_find(o)
+#define mp_hal_pin_name(p)      ((p)->name)
+#define mp_hal_pin_input(p)     ra_gpio_mode_input((p)->pin)
+#define mp_hal_pin_output(p)    ra_gpio_mode_output((p)->pin)
+#define mp_hal_pin_open_drain(p)    ra_gpio_config((p)->pin, GPIO_MODE_OUTPUT_OD, 0, 0, 0)
+#define mp_hal_pin_high(p)      ra_gpio_write((p)->pin, 1)
+#define mp_hal_pin_low(p)       ra_gpio_write((p)->pin, 0)
+#define mp_hal_pin_toggle(p)    ra_gpio_toggle((p)->pin)
+#define mp_hal_pin_od_low(p)    mp_hal_pin_low(p)
+#define mp_hal_pin_od_high(p)   mp_hal_pin_high(p)
+#define mp_hal_pin_read(p)      ra_gpio_read((p)->pin)
+#define mp_hal_pin_write(p, v)  do { if (v) { mp_hal_pin_high(p); } else { mp_hal_pin_low(p); } } while (0)
+
+void mp_hal_pin_config(mp_hal_pin_obj_t pin, uint32_t mode, uint32_t pull, uint32_t drive, uint32_t alt);
+
+enum {
+    MP_HAL_MAC_WLAN0 = 0,
+    MP_HAL_MAC_WLAN1,
+    MP_HAL_MAC_BDADDR,
+    MP_HAL_MAC_ETH0,
+};
+
+void mp_hal_get_mac(int idx, uint8_t buf[6]);
+
+void mp_hal_set_interrupt_char(int c); // -1 to disable
diff --git a/ports/renesas-ra/mpthreadport.c b/ports/renesas-ra/mpthreadport.c
new file mode 100644
index 0000000000000..ecdb2684684c4
--- /dev/null
+++ b/ports/renesas-ra/mpthreadport.c
@@ -0,0 +1,93 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2016 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include <stdio.h>
+
+#include "py/runtime.h"
+#include "py/gc.h"
+#include "py/mpthread.h"
+#include "gccollect.h"
+
+#if MICROPY_PY_THREAD
+
+// the mutex controls access to the linked list
+STATIC mp_thread_mutex_t thread_mutex;
+
+void mp_thread_init(void) {
+    mp_thread_mutex_init(&thread_mutex);
+    mp_thread_set_state(&mp_state_ctx.thread);
+}
+
+void mp_thread_gc_others(void) {
+    mp_thread_mutex_lock(&thread_mutex, 1);
+    for (pyb_thread_t *th = pyb_thread_all; th != NULL; th = th->all_next) {
+        gc_collect_root((void **)&th, 1);
+        gc_collect_root(&th->arg, 1);
+        gc_collect_root(&th->stack, 1);
+        if (th != pyb_thread_cur) {
+            gc_collect_root(th->stack, th->stack_len);
+        }
+    }
+    mp_thread_mutex_unlock(&thread_mutex);
+}
+
+void mp_thread_create(void *(*entry)(void *), void *arg, size_t *stack_size) {
+    if (*stack_size == 0) {
+        *stack_size = 4096; // default stack size
+    } else if (*stack_size < 2048) {
+        *stack_size = 2048; // minimum stack size
+    }
+
+    // round stack size to a multiple of the word size
+    size_t stack_len = *stack_size / sizeof(uint32_t);
+    *stack_size = stack_len * sizeof(uint32_t);
+
+    // allocate stack and linked-list node (must be done outside thread_mutex lock)
+    uint32_t *stack = m_new(uint32_t, stack_len);
+    pyb_thread_t *th = m_new_obj(pyb_thread_t);
+
+    mp_thread_mutex_lock(&thread_mutex, 1);
+
+    // create thread
+    uint32_t id = pyb_thread_new(th, stack, stack_len, entry, arg);
+    if (id == 0) {
+        mp_thread_mutex_unlock(&thread_mutex);
+        mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("can't create thread"));
+    }
+
+    mp_thread_mutex_unlock(&thread_mutex);
+
+    // adjust stack_size to provide room to recover from hitting the limit
+    *stack_size -= 1024;
+}
+
+void mp_thread_start(void) {
+}
+
+void mp_thread_finish(void) {
+}
+
+#endif // MICROPY_PY_THREAD
diff --git a/ports/renesas-ra/mpthreadport.h b/ports/renesas-ra/mpthreadport.h
new file mode 100644
index 0000000000000..e2b39979fb4c8
--- /dev/null
+++ b/ports/renesas-ra/mpthreadport.h
@@ -0,0 +1,53 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2016 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "py/mpthread.h"
+#include "pybthread.h"
+
+typedef pyb_mutex_t mp_thread_mutex_t;
+
+void mp_thread_init(void);
+void mp_thread_gc_others(void);
+
+static inline void mp_thread_set_state(struct _mp_state_thread_t *state) {
+    pyb_thread_set_local(state);
+}
+
+static inline struct _mp_state_thread_t *mp_thread_get_state(void) {
+    return pyb_thread_get_local();
+}
+
+static inline void mp_thread_mutex_init(mp_thread_mutex_t *m) {
+    pyb_mutex_init(m);
+}
+
+static inline int mp_thread_mutex_lock(mp_thread_mutex_t *m, int wait) {
+    return pyb_mutex_lock(m, wait);
+}
+
+static inline void mp_thread_mutex_unlock(mp_thread_mutex_t *m) {
+    pyb_mutex_unlock(m);
+}
diff --git a/ports/renesas-ra/pendsv.c b/ports/renesas-ra/pendsv.c
new file mode 100644
index 0000000000000..d4c4496f1b33c
--- /dev/null
+++ b/ports/renesas-ra/pendsv.c
@@ -0,0 +1,184 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013, 2014 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include <stdlib.h>
+
+#include "py/runtime.h"
+#include "shared/runtime/interrupt_char.h"
+#include "pendsv.h"
+#include "irq.h"
+
+// This variable is used to save the exception object between a ctrl-C and the
+// PENDSV call that actually raises the exception.  It must be non-static
+// otherwise gcc-5 optimises it away.  It can point to the heap but is not
+// traced by GC.  This is okay because we only ever set it to
+// mp_kbd_exception which is in the root-pointer set.
+void *pendsv_object;
+
+#if defined(PENDSV_DISPATCH_NUM_SLOTS)
+uint32_t pendsv_dispatch_active;
+pendsv_dispatch_t pendsv_dispatch_table[PENDSV_DISPATCH_NUM_SLOTS];
+#endif
+
+void pendsv_init(void) {
+    #if defined(PENDSV_DISPATCH_NUM_SLOTS)
+    pendsv_dispatch_active = false;
+    #endif
+    // set PendSV interrupt at lowest priority
+    NVIC_SetPriority(PendSV_IRQn, IRQ_PRI_PENDSV);
+}
+
+// Call this function to raise a pending exception during an interrupt.
+// It will first try to raise the exception "softly" by setting the
+// mp_pending_exception variable and hoping that the VM will notice it.
+// If this function is called a second time (ie with the mp_pending_exception
+// variable already set) then it will force the exception by using the hardware
+// PENDSV feature.  This will wait until all interrupts are finished then raise
+// the given exception object using nlr_jump in the context of the top-level
+// thread.
+void pendsv_kbd_intr(void) {
+    if (MP_STATE_MAIN_THREAD(mp_pending_exception) == MP_OBJ_NULL) {
+        mp_sched_keyboard_interrupt();
+    } else {
+        MP_STATE_MAIN_THREAD(mp_pending_exception) = MP_OBJ_NULL;
+        pendsv_object = &MP_STATE_VM(mp_kbd_exception);
+        SCB->ICSR = SCB_ICSR_PENDSVSET_Msk;
+    }
+}
+
+#if defined(PENDSV_DISPATCH_NUM_SLOTS)
+void pendsv_schedule_dispatch(size_t slot, pendsv_dispatch_t f) {
+    pendsv_dispatch_table[slot] = f;
+    pendsv_dispatch_active = true;
+    SCB->ICSR = SCB_ICSR_PENDSVSET_Msk;
+}
+
+void pendsv_dispatch_handler(void) {
+    for (size_t i = 0; i < PENDSV_DISPATCH_NUM_SLOTS; ++i) {
+        if (pendsv_dispatch_table[i] != NULL) {
+            pendsv_dispatch_t f = pendsv_dispatch_table[i];
+            pendsv_dispatch_table[i] = NULL;
+            f();
+        }
+    }
+}
+#endif
+
+__attribute__((naked)) void PendSV_Handler(void) {
+    // Handle a PendSV interrupt
+    //
+    // For the case of an asynchronous exception, re-jig the
+    // stack so that when we return from this interrupt handler
+    // it returns instead to nlr_jump with argument pendsv_object
+    // note that stack has a different layout if DEBUG is enabled
+    //
+    // For the case of a thread switch, swap stacks.
+    //
+    // on entry to this (naked) function, stack has the following layout:
+    //
+    // stack layout with DEBUG disabled:
+    //   sp[6]: pc=r15
+    //   sp[5]: lr=r14
+    //   sp[4]: r12
+    //   sp[3]: r3
+    //   sp[2]: r2
+    //   sp[1]: r1
+    //   sp[0]: r0
+    //
+    // stack layout with DEBUG enabled:
+    //   sp[8]: pc=r15
+    //   sp[7]: lr=r14
+    //   sp[6]: r12
+    //   sp[5]: r3
+    //   sp[4]: r2
+    //   sp[3]: r1
+    //   sp[2]: r0
+    //   sp[1]: 0xfffffff9
+    //   sp[0]: ?
+
+    __asm volatile (
+        #if defined(PENDSV_DISPATCH_NUM_SLOTS)
+        // Check if there are any pending calls to dispatch to
+        "ldr r1, pendsv_dispatch_active_ptr\n"
+        "ldr r0, [r1]\n"
+        "cmp r0, #0\n"
+        "beq .no_dispatch\n"
+        "mov r2, #0\n"
+        "str r2, [r1]\n"                // clear pendsv_dispatch_active
+        "b pendsv_dispatch_handler\n"   // jump to the handler
+        ".no_dispatch:\n"
+        #endif
+
+        // Check if there is an active object to throw via nlr_jump
+        "ldr r1, pendsv_object_ptr\n"
+        "ldr r0, [r1]\n"
+        "cmp r0, #0\n"
+        "beq .no_obj\n"
+        #if defined(PENDSV_DEBUG)
+        "str r0, [sp, #8]\n"            // store to r0 on stack
+        #else
+        "str r0, [sp, #0]\n"            // store to r0 on stack
+        #endif
+        "mov r0, #0\n"
+        "str r0, [r1]\n"                // clear pendsv_object
+        "ldr r0, nlr_jump_ptr\n"
+        #if defined(PENDSV_DEBUG)
+        "str r0, [sp, #32]\n"           // store to pc on stack
+        #else
+        "str r0, [sp, #24]\n"           // store to pc on stack
+        #endif
+        "bx lr\n"                       // return from interrupt; will return to nlr_jump
+        ".no_obj:\n"                    // pendsv_object==NULL
+
+        #if MICROPY_PY_THREAD
+        // Do a thread context switch
+        "push {r4-r11, lr}\n"
+        "vpush {s16-s31}\n"
+        "mrs r5, primask\n"             // save PRIMASK in r5
+        "cpsid i\n"                     // disable interrupts while we change stacks
+        "mov r0, sp\n"                  // pass sp to save
+        "mov r4, lr\n"                  // save lr because we are making a call
+        "bl pyb_thread_next\n"          // get next thread to execute
+        "mov lr, r4\n"                  // restore lr
+        "mov sp, r0\n"                  // switch stacks
+        "msr primask, r5\n"             // reenable interrupts
+        "vpop {s16-s31}\n"
+        "pop {r4-r11, lr}\n"
+        "bx lr\n"                       // return from interrupt; will return to new thread
+        #else
+        // Spurious pendsv, just return
+        "bx lr\n"
+        #endif
+
+        // Data
+        ".align 2\n"
+        #if defined(PENDSV_DISPATCH_NUM_SLOTS)
+        "pendsv_dispatch_active_ptr: .word pendsv_dispatch_active\n"
+        #endif
+        "pendsv_object_ptr: .word pendsv_object\n"
+        "nlr_jump_ptr: .word nlr_jump\n"
+        );
+}
diff --git a/ports/renesas-ra/pendsv.h b/ports/renesas-ra/pendsv.h
new file mode 100644
index 0000000000000..9d7c3d94135d6
--- /dev/null
+++ b/ports/renesas-ra/pendsv.h
@@ -0,0 +1,54 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013, 2014 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+#ifndef MICROPY_INCLUDED_RENESAS_RA_PENDSV_H
+#define MICROPY_INCLUDED_RENESAS_RA_PENDSV_H
+
+#include "boardctrl.h"
+
+enum {
+    PENDSV_DISPATCH_SOFT_TIMER,
+    #if MICROPY_PY_NETWORK && MICROPY_PY_LWIP
+    PENDSV_DISPATCH_LWIP,
+    #if MICROPY_PY_NETWORK_CYW43
+    PENDSV_DISPATCH_CYW43,
+    #endif
+    #endif
+    #if MICROPY_PY_BLUETOOTH && !MICROPY_PY_BLUETOOTH_USE_SYNC_EVENTS
+    PENDSV_DISPATCH_BLUETOOTH_HCI,
+    #endif
+    MICROPY_BOARD_PENDSV_ENTRIES
+    PENDSV_DISPATCH_MAX
+};
+
+#define PENDSV_DISPATCH_NUM_SLOTS PENDSV_DISPATCH_MAX
+
+typedef void (*pendsv_dispatch_t)(void);
+
+void pendsv_init(void);
+void pendsv_kbd_intr(void);
+void pendsv_schedule_dispatch(size_t slot, pendsv_dispatch_t f);
+
+#endif // MICROPY_INCLUDED_RENESAS_RA_PENDSV_H
diff --git a/ports/renesas-ra/pin.h b/ports/renesas-ra/pin.h
new file mode 100644
index 0000000000000..32aa96075478f
--- /dev/null
+++ b/ports/renesas-ra/pin.h
@@ -0,0 +1,98 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013, 2014 Damien P. George
+ * Copyright (c) 2021, 2022 Renesas Electronics Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#ifndef MICROPY_INCLUDED_RA_PIN_H
+#define MICROPY_INCLUDED_RA_PIN_H
+
+#include "shared/runtime/mpirq.h"
+#include "py/obj.h"
+
+typedef struct {
+    mp_obj_base_t base;
+    qstr name;
+    uint8_t idx;
+    uint8_t fn;
+    uint8_t unit;
+    uint8_t type;
+    void *reg; // The peripheral associated with this AF
+} pin_af_obj_t;
+
+typedef struct {
+    mp_obj_base_t base;
+    qstr name;
+    uint8_t pin;
+    uint8_t bit;
+    uint8_t channel;
+} pin_ad_obj_t;
+
+typedef struct {
+    mp_obj_base_t base;
+    qstr name;
+    uint8_t pin;
+    uint8_t num_af;
+    const pin_af_obj_t *af;
+    const pin_ad_obj_t *ad;
+} machine_pin_obj_t;
+
+extern const mp_obj_type_t machine_pin_type;
+extern const mp_obj_type_t pin_af_type;
+
+// Include all of the individual pin objects
+#include "genhdr/pins.h"
+
+typedef struct {
+    const char *name;
+    const machine_pin_obj_t *pin;
+} pin_named_pin_t;
+
+extern const pin_named_pin_t pin_board_pins[];
+extern const pin_named_pin_t pin_cpu_pins[];
+
+typedef struct {
+    mp_obj_base_t base;
+    qstr name;
+    const pin_named_pin_t *named_pins;
+} pin_named_pins_obj_t;
+
+extern const mp_obj_type_t pin_board_pins_obj_type;
+extern const mp_obj_type_t pin_cpu_pins_obj_type;
+
+extern const mp_obj_dict_t pin_cpu_pins_locals_dict;
+extern const mp_obj_dict_t pin_board_pins_locals_dict;
+
+void machine_pin_init(void);
+uint32_t pin_get_mode(const machine_pin_obj_t *pin);
+uint32_t pin_get_pull(const machine_pin_obj_t *pin);
+uint32_t pin_get_drive(const machine_pin_obj_t *pin);
+uint32_t pin_get_af(const machine_pin_obj_t *pin);
+const machine_pin_obj_t *machine_pin_find(mp_obj_t user_obj);
+const machine_pin_obj_t *pin_find_named_pin(const mp_obj_dict_t *named_pins, mp_obj_t name);
+const pin_af_obj_t *pin_find_af(const machine_pin_obj_t *pin, uint8_t fn, uint8_t unit);
+const pin_af_obj_t *pin_find_af_by_index(const machine_pin_obj_t *pin, mp_uint_t af_idx);
+const pin_af_obj_t *pin_find_af_by_name(const machine_pin_obj_t *pin, const char *name);
+
+#endif // MICROPY_INCLUDED_RA_PIN_H
diff --git a/ports/renesas-ra/powerctrl.c b/ports/renesas-ra/powerctrl.c
new file mode 100644
index 0000000000000..8f9e25b7240af
--- /dev/null
+++ b/ports/renesas-ra/powerctrl.c
@@ -0,0 +1,304 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013-2018 Damien P. George
+ * Copyright (c) 2022 Renesas Electronics Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "py/runtime.h"
+#include "py/mperrno.h"
+#include "py/mphal.h"
+#include "hal_data.h"
+#include "rtc.h"
+#include "powerctrl.h"
+
+#if 0
+
+// Sleep Mode
+// At power on, by default sleep is set as the low-power mode. Sleep
+// mode is the most convenient low-power mode available, as it does
+// not require any special configuration (other than configuring and
+// enabling a suitable interrupt or event to wake the MCU from sleep)
+// to return to normal program-execution mode.
+// The states of the SRAM, the processor registers, and the hardware
+// peripherals are all maintained in sleep mode, and the time needed
+// to enter and wake from sleep is minimal. Any interrupt causes the
+// MCU device to wake from sleep mode, including the Systick interrupt
+// used by the RTOS scheduler.
+
+// Software Standby Mode
+// In software-standby mode, the CPU, as well as most of the on-chip
+// peripheral functions and all of the internal oscillators, are
+// stopped.
+// The contents of the CPU internal registers and SRAM data, the states
+// of on-chip peripheral functions, and I/O Ports are all retained.
+// Software-standby mode allows significant reduction in power
+// consumption, because most of the oscillators are stopped in this mode.
+// Like sleep mode, standby mode requires an interrupt or event be
+// configured and enabled to wake up.
+
+// Snooze Mode
+// Snooze mode can be used with some MCU peripherals to execute basic
+// tasks while keeping the MCU in a low-power state.
+// Many core peripherals and all clocks can be selected to run during
+// Snooze, allowing for more flexible low-power configuration than
+// Software Standby mode. To enable Snooze, select "Software Standby
+// mode with Snooze mode enabled" for the "Low Power Mode" configuration
+// option.
+// Snooze mode settings (including entry/exit sources) are available
+// under "Standby Options".
+
+// Deep Software Standby Mode
+// Deep Software Standby Mode is only available on some MCU devices.
+// The MCU always wakes from Deep Software Standby Mode by going
+// through reset, either by the negation of the reset pin or by one of
+// the wakeup sources configurable in the "Deep Standby Options"
+// configuration group.
+
+#endif
+
+#if defined(USE_FSP_LPM)
+
+// LPM_MODE_SLEEP:              Sleep mode
+// LPM_MODE_STANDBY:            Software Standby mode
+// LPM_MODE_STANDBY_SNOOZE:     Software Standby mode with Snooze mode enabled
+// LPM_MODE_DEEP:               Deep Software Standby mode
+
+lpm_instance_ctrl_t g_lpm_sleep_ctrl;
+
+const lpm_cfg_t g_lpm_sleep_cfg = {
+    .low_power_mode = LPM_MODE_SLEEP,
+    .snooze_cancel_sources = LPM_SNOOZE_CANCEL_SOURCE_NONE,
+    .standby_wake_sources = (lpm_standby_wake_source_t)0,
+    .snooze_request_source = LPM_SNOOZE_REQUEST_RTC_PERIOD,
+    .snooze_end_sources = (lpm_snooze_end_t)0,
+    .dtc_state_in_snooze = LPM_SNOOZE_DTC_DISABLE,
+    #if BSP_FEATURE_LPM_HAS_SBYCR_OPE
+    .output_port_enable = 0,
+    #endif
+    #if BSP_FEATURE_LPM_HAS_DEEP_STANDBY
+    .io_port_state = 0,
+    .power_supply_state = 0,
+    .deep_standby_cancel_source = (lpm_deep_standby_cancel_source_t)0,
+    .deep_standby_cancel_edge = (lpm_deep_standby_cancel_edge_t)0,
+    #endif
+    .p_extend = NULL,
+};
+
+const lpm_instance_t g_lpm_sleep = {
+    .p_api = &g_lpm_on_lpm,
+    .p_ctrl = &g_lpm_sleep_ctrl,
+    .p_cfg = &g_lpm_sleep_cfg
+};
+
+lpm_instance_ctrl_t g_lpm_deep_ctrl;
+
+const lpm_cfg_t g_lpm_deep_cfg = {
+    .low_power_mode = LPM_MODE_DEEP,
+    .snooze_cancel_sources =
+        LPM_SNOOZE_CANCEL_SOURCE_NONE,
+    .standby_wake_sources =
+        (lpm_standby_wake_source_t)0,
+    .snooze_request_source =
+        LPM_SNOOZE_REQUEST_RXD0_FALLING,
+    .snooze_end_sources =
+        (lpm_snooze_end_t)0,
+    .dtc_state_in_snooze =
+        LPM_SNOOZE_DTC_DISABLE,
+    #if BSP_FEATURE_LPM_HAS_SBYCR_OPE
+    .output_port_enable = LPM_OUTPUT_PORT_ENABLE_RETAIN,
+    #endif
+    #if BSP_FEATURE_LPM_HAS_DEEP_STANDBY
+    .io_port_state = LPM_IO_PORT_NO_CHANGE,
+    .power_supply_state = LPM_POWER_SUPPLY_DEEPCUT0,
+    .deep_standby_cancel_source = LPM_DEEP_STANDBY_CANCEL_SOURCE_RTC_INTERVAL | LPM_DEEP_STANDBY_CANCEL_SOURCE_RTC_ALARM | (lpm_deep_standby_cancel_source_t)0,
+    .deep_standby_cancel_edge = (lpm_deep_standby_cancel_edge_t)0,
+    #endif
+    .p_extend = NULL,
+};
+
+const lpm_instance_t g_lpm_deep = {
+    .p_api = &g_lpm_on_lpm,
+    .p_ctrl = &g_lpm_deep_ctrl,
+    .p_cfg = &g_lpm_deep_cfg
+};
+
+lpm_instance_ctrl_t g_lpm_standby_ctrl;
+
+const lpm_cfg_t g_lpm_standby_cfg = {
+    .low_power_mode = LPM_MODE_STANDBY,
+    .snooze_cancel_sources =
+        LPM_SNOOZE_CANCEL_SOURCE_NONE,
+    .standby_wake_sources =
+        LPM_STANDBY_WAKE_SOURCE_RTCALM | LPM_STANDBY_WAKE_SOURCE_RTCPRD | (lpm_standby_wake_source_t)0,
+    .snooze_request_source = LPM_SNOOZE_REQUEST_RXD0_FALLING,
+    .snooze_end_sources = (lpm_snooze_end_t)0,
+    .dtc_state_in_snooze = LPM_SNOOZE_DTC_DISABLE,
+    #if BSP_FEATURE_LPM_HAS_SBYCR_OPE
+    .output_port_enable = LPM_OUTPUT_PORT_ENABLE_RETAIN,
+    #endif
+    #if BSP_FEATURE_LPM_HAS_DEEP_STANDBY
+    .io_port_state = LPM_IO_PORT_NO_CHANGE,
+    .power_supply_state = LPM_POWER_SUPPLY_DEEPCUT0,
+    .deep_standby_cancel_source = LPM_DEEP_STANDBY_CANCEL_SOURCE_RTC_INTERVAL | (lpm_deep_standby_cancel_source_t)0,
+    .deep_standby_cancel_edge = (lpm_deep_standby_cancel_edge_t)0,
+    #endif
+    .p_extend = NULL,
+};
+
+const lpm_instance_t g_lpm_standby = {
+    .p_api = &g_lpm_on_lpm,
+    .p_ctrl = &g_lpm_standby_ctrl,
+    .p_cfg = &g_lpm_standby_cfg
+};
+
+#endif
+
+NORETURN void powerctrl_mcu_reset(void) {
+    #if BSP_FEATURE_TZ_HAS_TRUSTZONE
+    R_BSP_NonSecureEnter();
+    #else
+    NVIC_SystemReset();
+    #endif
+    while (1) {
+        ;
+    }
+}
+
+NORETURN void powerctrl_enter_bootloader(uint32_t r0, uint32_t bl_addr) {
+    while (1) {
+        ;
+    }
+}
+
+// static __attribute__((naked)) void branch_to_bootloader(uint32_t r0, uint32_t
+// bl_addr) {
+// }
+
+void powerctrl_check_enter_bootloader(void) {
+}
+
+void powerctrl_enter_sleep_mode(void) {
+    // start trandition to RA MCU sleep mode
+    #if defined(USE_FSP_LPM)
+    fsp_err_t err;
+    err = R_LPM_Open(&g_lpm_sleep_ctrl, &g_lpm_sleep_cfg);
+    if (err != FSP_SUCCESS) {
+        mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("Can't enter sleep mode"));
+    }
+    err = R_LPM_LowPowerModeEnter(&g_lpm_sleep_ctrl);
+    if (err != FSP_SUCCESS) {
+        mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("Can't enter sleep mode"));
+    }
+    #endif
+}
+
+void powerctrl_enter_stop_mode(void) {
+    // Disable IRQs so that the IRQ that wakes the device from stop mode is not
+    // executed until after the clocks are reconfigured
+    uint32_t irq_state = disable_irq();
+
+    #if defined(MICROPY_BOARD_ENTER_STOP)
+    MICROPY_BOARD_ENTER_STOP
+    #endif
+
+    // start trandition to RA MCU sleep mode
+    #if defined(USE_FSP_LPM)
+    fsp_err_t err;
+    err = R_LPM_Open(&g_lpm_standby_ctrl, &g_lpm_standby_cfg);
+    if (err != FSP_SUCCESS) {
+        mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("Can't enter stop mode"));
+    }
+    err = R_LPM_LowPowerModeEnter(&g_lpm_standby_ctrl);
+    if (err != FSP_SUCCESS) {
+        mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("Can't enter stop mode"));
+    }
+    #endif
+
+    // reconfigure the system clock after waking up
+
+    #if defined(MICROPY_BOARD_LEAVE_STOP)
+    MICROPY_BOARD_LEAVE_STOP
+    #endif
+
+    // Enable IRQs now that all clocks are reconfigured
+    enable_irq(irq_state);
+}
+
+void powerctrl_enter_standby_mode(void) {
+    rtc_init_finalise();
+
+    #if defined(MICROPY_BOARD_ENTER_STANDBY)
+    MICROPY_BOARD_ENTER_STANDBY
+    #endif
+
+    // start trandition to RA MCU deep software standby mode via software standby mode
+    #if defined(USE_FSP_LPM)
+
+    fsp_err_t err;
+    err = R_LPM_Open(&g_lpm_deep_ctrl, &g_lpm_deep_cfg);
+    /* Handle any errors. This function should be defined by the user. */
+    if (err != FSP_SUCCESS) {
+        mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("Can't enter stop mode"));
+    }
+    /* Check the Deep Software Standby Reset Flag. */
+    if (1U == R_SYSTEM->RSTSR0_b.DPSRSTF) {
+        /* Clear the IOKEEP bit to allow I/O Port use. */
+        err = R_LPM_IoKeepClear(&g_lpm_deep_ctrl);
+        if (err != FSP_SUCCESS) {
+            mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("Can't enter stop mode"));
+        }
+    }
+    /* Add user code here. */
+    /* Reconfigure the module to set the IOKEEP bit before entering deep software standby. */
+    err = R_LPM_LowPowerReconfigure(&g_lpm_deep_ctrl, &g_lpm_deep_cfg);
+    if (err != FSP_SUCCESS) {
+        mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("Can't enter stop mode"));
+    }
+    err = R_LPM_LowPowerModeEnter(&g_lpm_deep_ctrl);
+    /* Code after R_LPM_LowPowerModeEnter when using Deep Software Standby never be executed.
+     * Deep software standby exits by resetting the MCU. */
+    if (err != FSP_SUCCESS) {
+        mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("Can't enter stop mode"));
+    }
+
+    #endif
+
+    // We need to clear the PWR wake-up-flag before entering standby, since
+    // the flag may have been set by a previous wake-up event.  Furthermore,
+    // we need to disable the wake-up sources while clearing this flag, so
+    // that if a source is active it does actually wake the device.
+    // See section 5.3.7 of RM0090.
+
+    // save RTC interrupts
+    // disable register write protection
+    // disable RTC interrupts
+    // clear RTC wake-up flags
+
+    // enable previously-enabled RTC interrupts
+    // enable register write protection
+
+    // enter standby mode
+
+    // we never return; MCU is reset on exit from standby
+}
diff --git a/ports/renesas-ra/powerctrl.h b/ports/renesas-ra/powerctrl.h
new file mode 100644
index 0000000000000..1743150b329f2
--- /dev/null
+++ b/ports/renesas-ra/powerctrl.h
@@ -0,0 +1,42 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2018 Damien P. George
+ * Copyright (c) 2022 Renesas Electronics Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+#ifndef MICROPY_INCLUDED_RA_POWERCTRL_H
+#define MICROPY_INCLUDED_RA_POWERCTRL_H
+
+#include <stdbool.h>
+#include <stdint.h>
+
+void SystemClock_Config(void);
+
+NORETURN void powerctrl_mcu_reset(void);
+NORETURN void powerctrl_enter_bootloader(uint32_t r0, uint32_t bl_addr);
+void powerctrl_check_enter_bootloader(void);
+
+void powerctrl_enter_stop_mode(void);
+void powerctrl_enter_standby_mode(void);
+
+#endif // MICROPY_INCLUDED_RA_POWERCTRL_H
diff --git a/ports/renesas-ra/powerctrlboot.c b/ports/renesas-ra/powerctrlboot.c
new file mode 100644
index 0000000000000..541eb6a9d644a
--- /dev/null
+++ b/ports/renesas-ra/powerctrlboot.c
@@ -0,0 +1,36 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Renesas Electronics Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "py/mphal.h"
+#include "irq.h"
+#include "powerctrl.h"
+
+static inline void powerctrl_config_systick(void) {
+    // Configure SYSTICK to run at 1kHz (1ms interval)
+    SysTick->CTRL |= 0x00000004U;
+    SysTick_Config(MICROPY_HW_MCU_SYSCLK / 1000);
+    NVIC_SetPriority(SysTick_IRQn, IRQ_PRI_SYSTICK);
+}
diff --git a/ports/renesas-ra/pybthread.c b/ports/renesas-ra/pybthread.c
new file mode 100644
index 0000000000000..603bc2e4ec090
--- /dev/null
+++ b/ports/renesas-ra/pybthread.c
@@ -0,0 +1,237 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2017 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include <string.h>
+#include <stdio.h>
+
+#include "py/obj.h"
+#include "gccollect.h"
+#include "irq.h"
+#include "pybthread.h"
+
+#if MICROPY_PY_THREAD
+
+#define PYB_MUTEX_UNLOCKED ((void *)0)
+#define PYB_MUTEX_LOCKED ((void *)1)
+
+// These macros are used when we only need to protect against a thread
+// switch; other interrupts are still allowed to proceed.
+#define RAISE_IRQ_PRI() raise_irq_pri(IRQ_PRI_PENDSV)
+#define RESTORE_IRQ_PRI(state) restore_irq_pri(state)
+
+extern void __fatal_error(const char *);
+
+volatile int pyb_thread_enabled;
+pyb_thread_t *volatile pyb_thread_all;
+pyb_thread_t *volatile pyb_thread_cur;
+
+static inline void pyb_thread_add_to_runable(pyb_thread_t *thread) {
+    thread->run_prev = pyb_thread_cur->run_prev;
+    thread->run_next = pyb_thread_cur;
+    pyb_thread_cur->run_prev->run_next = thread;
+    pyb_thread_cur->run_prev = thread;
+}
+
+static inline void pyb_thread_remove_from_runable(pyb_thread_t *thread) {
+    if (thread->run_next == thread) {
+        __fatal_error("deadlock");
+    }
+    thread->run_prev->run_next = thread->run_next;
+    thread->run_next->run_prev = thread->run_prev;
+}
+
+void pyb_thread_init(pyb_thread_t *thread) {
+    pyb_thread_enabled = 0;
+    pyb_thread_all = thread;
+    pyb_thread_cur = thread;
+    thread->sp = NULL; // will be set when this thread switches out
+    thread->local_state = 0; // will be set by mp_thread_init
+    thread->arg = NULL;
+    thread->stack = &_sstack;
+    thread->stack_len = ((uint32_t)&_estack - (uint32_t)&_sstack) / sizeof(uint32_t);
+    thread->all_next = NULL;
+    thread->run_prev = thread;
+    thread->run_next = thread;
+    thread->queue_next = NULL;
+}
+
+void pyb_thread_deinit() {
+    uint32_t irq_state = disable_irq();
+    pyb_thread_enabled = 0;
+    pyb_thread_all = pyb_thread_cur;
+    pyb_thread_cur->all_next = NULL;
+    pyb_thread_cur->run_prev = pyb_thread_cur;
+    pyb_thread_cur->run_next = pyb_thread_cur;
+    enable_irq(irq_state);
+}
+
+STATIC void pyb_thread_terminate(void) {
+    uint32_t irq_state = disable_irq();
+    pyb_thread_t *thread = pyb_thread_cur;
+    // take current thread off the run list
+    pyb_thread_remove_from_runable(thread);
+    // take current thread off the list of all threads
+    for (pyb_thread_t **n = (pyb_thread_t **)&pyb_thread_all;; n = &(*n)->all_next) {
+        if (*n == thread) {
+            *n = thread->all_next;
+            break;
+        }
+    }
+    // clean pointers as much as possible to help GC
+    thread->all_next = NULL;
+    thread->queue_next = NULL;
+    thread->stack = NULL;
+    if (pyb_thread_all->all_next == NULL) {
+        // only 1 thread left
+        pyb_thread_enabled = 0;
+    }
+    // thread switch will occur after we enable irqs
+    SCB->ICSR = SCB_ICSR_PENDSVSET_Msk;
+    enable_irq(irq_state);
+    // should not return
+    __fatal_error("could not terminate");
+}
+
+uint32_t pyb_thread_new(pyb_thread_t *thread, void *stack, size_t stack_len, void *entry, void *arg) {
+    uint32_t *stack_top = (uint32_t *)stack + stack_len; // stack is full descending
+    *--stack_top = 0x01000000; // xPSR (thumb bit set)
+    *--stack_top = (uint32_t)entry & 0xfffffffe; // pc (must have bit 0 cleared, even for thumb code)
+    *--stack_top = (uint32_t)pyb_thread_terminate; // lr
+    *--stack_top = 0; // r12
+    *--stack_top = 0; // r3
+    *--stack_top = 0; // r2
+    *--stack_top = 0; // r1
+    *--stack_top = (uint32_t)arg; // r0
+    *--stack_top = 0xfffffff9; // lr (return to thread mode, non-FP, use MSP)
+    stack_top -= 8; // r4-r11
+    stack_top -= 16; // s16-s31 (we assume all threads use FP registers)
+    thread->sp = stack_top;
+    thread->local_state = 0;
+    thread->arg = arg;
+    thread->stack = stack;
+    thread->stack_len = stack_len;
+    thread->queue_next = NULL;
+    uint32_t irq_state = disable_irq();
+    pyb_thread_enabled = 1;
+    thread->all_next = pyb_thread_all;
+    pyb_thread_all = thread;
+    pyb_thread_add_to_runable(thread);
+    enable_irq(irq_state);
+    return (uint32_t)thread; // success
+}
+
+void pyb_thread_dump(void) {
+    if (!pyb_thread_enabled) {
+        printf("THREAD: only main thread\n");
+    } else {
+        printf("THREAD:\n");
+        for (pyb_thread_t *th = pyb_thread_all; th != NULL; th = th->all_next) {
+            bool runable = false;
+            for (pyb_thread_t *th2 = pyb_thread_cur;; th2 = th2->run_next) {
+                if (th == th2) {
+                    runable = true;
+                    break;
+                }
+                if (th2->run_next == pyb_thread_cur) {
+                    break;
+                }
+            }
+            printf("    id=%p sp=%p sz=%u", th, th->stack, th->stack_len);
+            if (runable) {
+                printf(" (runable)");
+            }
+            printf("\n");
+        }
+    }
+}
+
+// should only be called from pendsv_isr_handler
+void *pyb_thread_next(void *sp) {
+    pyb_thread_cur->sp = sp;
+    pyb_thread_cur = pyb_thread_cur->run_next;
+    pyb_thread_cur->timeslice = 4; // in milliseconds
+    return pyb_thread_cur->sp;
+}
+
+void pyb_mutex_init(pyb_mutex_t *m) {
+    *m = PYB_MUTEX_UNLOCKED;
+}
+
+int pyb_mutex_lock(pyb_mutex_t *m, int wait) {
+    uint32_t irq_state = RAISE_IRQ_PRI();
+    if (*m == PYB_MUTEX_UNLOCKED) {
+        // mutex is available
+        *m = PYB_MUTEX_LOCKED;
+        RESTORE_IRQ_PRI(irq_state);
+    } else {
+        // mutex is locked
+        if (!wait) {
+            RESTORE_IRQ_PRI(irq_state);
+            return 0; // failed to lock mutex
+        }
+        if (*m == PYB_MUTEX_LOCKED) {
+            *m = pyb_thread_cur;
+        } else {
+            for (pyb_thread_t *n = *m;; n = n->queue_next) {
+                if (n->queue_next == NULL) {
+                    n->queue_next = pyb_thread_cur;
+                    break;
+                }
+            }
+        }
+        pyb_thread_cur->queue_next = NULL;
+        // take current thread off the run list
+        pyb_thread_remove_from_runable(pyb_thread_cur);
+        // thread switch will occur after we enable irqs
+        SCB->ICSR = SCB_ICSR_PENDSVSET_Msk;
+        RESTORE_IRQ_PRI(irq_state);
+        // when we come back we have the mutex
+    }
+    return 1; // have mutex
+}
+
+void pyb_mutex_unlock(pyb_mutex_t *m) {
+    uint32_t irq_state = RAISE_IRQ_PRI();
+    if (*m == PYB_MUTEX_LOCKED) {
+        // no threads are blocked on the mutex
+        *m = PYB_MUTEX_UNLOCKED;
+    } else {
+        // at least one thread is blocked on this mutex
+        pyb_thread_t *th = *m;
+        if (th->queue_next == NULL) {
+            // no other threads are blocked
+            *m = PYB_MUTEX_LOCKED;
+        } else {
+            // at least one other thread is still blocked
+            *m = th->queue_next;
+        }
+        // put unblocked thread on runable list
+        pyb_thread_add_to_runable(th);
+    }
+    RESTORE_IRQ_PRI(irq_state);
+}
+
+#endif // MICROPY_PY_THREAD
diff --git a/ports/renesas-ra/pybthread.h b/ports/renesas-ra/pybthread.h
new file mode 100644
index 0000000000000..91eeeb6d925d7
--- /dev/null
+++ b/ports/renesas-ra/pybthread.h
@@ -0,0 +1,77 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2017 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+#ifndef MICROPY_INCLUDED_RENESAS_RA_PYBTHREAD_H
+#define MICROPY_INCLUDED_RENESAS_RA_PYBTHREAD_H
+
+typedef struct _pyb_thread_t {
+    void *sp;
+    uint32_t local_state;
+    void *arg;                  // thread Python args, a GC root pointer
+    void *stack;                // pointer to the stack
+    size_t stack_len;           // number of words in the stack
+    uint32_t timeslice;
+    struct _pyb_thread_t *all_next;
+    struct _pyb_thread_t *run_prev;
+    struct _pyb_thread_t *run_next;
+    struct _pyb_thread_t *queue_next;
+} pyb_thread_t;
+
+typedef pyb_thread_t *pyb_mutex_t;
+
+extern volatile int pyb_thread_enabled;
+extern pyb_thread_t *volatile pyb_thread_all;
+extern pyb_thread_t *volatile pyb_thread_cur;
+
+void pyb_thread_init(pyb_thread_t *th);
+void pyb_thread_deinit();
+uint32_t pyb_thread_new(pyb_thread_t *th, void *stack, size_t stack_len, void *entry, void *arg);
+void pyb_thread_dump(void);
+
+static inline uint32_t pyb_thread_get_id(void) {
+    return (uint32_t)pyb_thread_cur;
+}
+
+static inline void pyb_thread_set_local(void *value) {
+    pyb_thread_cur->local_state = (uint32_t)value;
+}
+
+static inline void *pyb_thread_get_local(void) {
+    return (void *)pyb_thread_cur->local_state;
+}
+
+static inline void pyb_thread_yield(void) {
+    if (pyb_thread_cur->run_next == pyb_thread_cur) {
+        __WFI();
+    } else {
+        SCB->ICSR = SCB_ICSR_PENDSVSET_Msk;
+    }
+}
+
+void pyb_mutex_init(pyb_mutex_t *m);
+int pyb_mutex_lock(pyb_mutex_t *m, int wait);
+void pyb_mutex_unlock(pyb_mutex_t *m);
+
+#endif // MICROPY_INCLUDED_RENESAS_RA_PYBTHREAD_H
diff --git a/ports/renesas-ra/qstrdefsport.h b/ports/renesas-ra/qstrdefsport.h
new file mode 100644
index 0000000000000..bc07f2752aa85
--- /dev/null
+++ b/ports/renesas-ra/qstrdefsport.h
@@ -0,0 +1,44 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013, 2014 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+// qstrs specific to this port
+// *FORMAT-OFF*
+
+// Entries for sys.path
+Q(/flash)
+Q(/flash/lib)
+Q(/sd)
+Q(/sd/lib)
+
+// For uos.sep
+Q(/)
+
+#if MICROPY_HW_ENABLE_USB
+// for usb modes
+Q(MSC+HID)
+Q(VCP+MSC)
+Q(VCP+HID)
+#endif
diff --git a/ports/renesas-ra/ra/ra_adc.c b/ports/renesas-ra/ra/ra_adc.c
new file mode 100644
index 0000000000000..e7a270a19483c
--- /dev/null
+++ b/ports/renesas-ra/ra/ra_adc.c
@@ -0,0 +1,556 @@
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Renesas Electronics Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include <stdio.h>
+#include <stdint.h>
+#include <stdbool.h>
+#include "hal_data.h"
+#include "ra_config.h"
+#include "ra_gpio.h"
+#include "ra_utils.h"
+#include "ra_adc.h"
+
+static R_ADC0_Type *adc_reg = (R_ADC0_Type *)0x4005c000;
+#if defined(RA4M1) | defined(RA4W1)
+static R_TSN_Type *tsn_reg = (R_TSN_Type *)0x407ec000;
+#endif
+#if defined(RA6M1) | defined(RA6M2)
+static R_TSN_CTRL_Type *tsn_ctrl_reg = (R_TSN_CTRL_Type *)0x4005D000;
+static R_TSN_CAL_Type *tsn_cal_reg = (R_TSN_CAL_Type *)0x407FB17C;
+#endif
+static uint8_t resolution = RA_ADC_DEF_RESOLUTION;
+
+typedef struct adc_pin_to_ch {
+    uint32_t pin;
+    uint8_t ch;
+} adc_pin_to_ch_t;
+
+static const adc_pin_to_ch_t pin_to_ch[] = {
+    #if defined(RA4M1)
+
+    { P000, AN000 },
+    { P001, AN001 },
+    { P002, AN002 },
+    { P003, AN003 },
+    { P004, AN004 },
+    { P005, AN011 },
+    { P006, AN012 },
+    { P007, AN013 },
+    { P008, AN014 },
+    { P010, AN005 },
+    { P011, AN006 },
+    { P012, AN007 },
+    { P013, AN008 },
+    { P014, AN009 },
+    { P015, AN010 },
+    { P100, AN022 },
+    { P101, AN021 },
+    { P102, AN020 },
+    { P103, AN019 },
+    { P500, AN016 },
+    { P501, AN017 },
+    { P502, AN018 },
+    { P503, AN023 },
+    { P504, AN024 },
+    { P505, AN025 },
+
+    #elif defined(RA4W1)
+
+    { P004, AN004 },
+    { P010, AN005 },
+    { P011, AN006 },
+    { P014, AN009 },
+    { P015, AN010 },
+    { P102, AN020 },
+    { P103, AN019 },
+    { P501, AN017 },
+
+    #elif defined(RA6M2)
+    { P000, AN000 },
+    { P001, AN001 },
+    { P002, AN002 },
+    { P003, AN007 },
+    { P004, AN100 },
+    { P005, AN101 },
+    { P006, AN102 },
+    { P007, AN107 },
+    { P008, AN003 },
+    { P009, AN004 },
+    { P014, AN005 },
+    { P014, AN105 },
+    { P015, AN006 },
+    { P015, AN106 },
+    { P500, AN016 },
+    { P501, AN116 },
+    { P502, AN017 },
+    { P503, AN117 },
+    { P504, AN018 },
+    { P505, AN118 },
+    { P506, AN019 },
+    { P509, AN020 },
+
+    #elif defined(RA6M1)
+    { P000, AN000 },
+    { P001, AN001 },
+    { P002, AN002 },
+    { P003, AN007 },
+    { P004, AN100 },
+    { P005, AN101 },
+    { P006, AN102 },
+    { P007, AN107 },
+    { P008, AN003 },
+    { P014, AN005 },
+    { P014, AN105 },
+    { P015, AN006 },
+    { P015, AN106 },
+    { P500, AN016 },
+    { P501, AN116 },
+    { P502, AN017 },
+    { P503, AN117 },
+    { P504, AN018 },
+    { P508, AN020 },
+
+    #else
+    #error "CMSIS MCU Series is not specified."
+    #endif
+};
+#define ADC_PIN_TO_CH_SIZE (sizeof(pin_to_ch) / sizeof(adc_pin_to_ch_t))
+
+#define ADC_CH_MAX         (32)
+#define ADC_UNIT0_SCAN_MAX (28)
+static uint16_t adc_values[ADC_CH_MAX];
+
+bool ra_adc_pin_to_ch(uint32_t pin, uint8_t *ch) {
+    uint32_t i;
+    *ch = (uint8_t)ADC_NON;
+    for (i = 0; i < ADC_PIN_TO_CH_SIZE; i++) {
+        if (pin == pin_to_ch[i].pin) {
+            *ch = pin_to_ch[i].ch;
+            break;
+        }
+    }
+    if (*ch == (uint8_t)ADC_NON) {
+        return false;
+    } else {
+        return true;
+    }
+}
+
+bool ra_adc_ch_to_pin(uint8_t ch, uint32_t *pin) {
+    uint32_t i;
+    *pin = (uint32_t)PIN_END;
+    for (i = 0; i < ADC_PIN_TO_CH_SIZE; i++) {
+        if (ch == pin_to_ch[i].ch) {
+            *pin = pin_to_ch[i].pin;
+            break;
+        }
+    }
+    if (*pin == (uint32_t)PIN_END) {
+        return false;
+    } else {
+        return true;
+    }
+}
+
+uint8_t ra_adc_get_channel(uint32_t pin) {
+    bool flag;
+    uint8_t ch;
+    flag = ra_adc_pin_to_ch(pin, &ch);
+    if (!flag) {
+        ch = 0;
+    }
+    return ch;
+}
+
+static void ra_adc0_module_start(void) {
+    ra_mstpcrd_start(R_MSTP_MSTPCRD_MSTPD16_Msk);
+}
+
+static void ra_adc0_module_stop(void) {
+    ra_mstpcrd_stop(R_MSTP_MSTPCRD_MSTPD16_Msk);
+}
+
+#if defined(RA6M1) | defined(RA6M2)
+static void ra_adc1_module_start(void) {
+    ra_mstpcrd_start(R_MSTP_MSTPCRD_MSTPD15_Msk);
+}
+
+static void ra_adc1_module_stop(void) {
+    ra_mstpcrd_stop(R_MSTP_MSTPCRD_MSTPD15_Msk);
+}
+#endif
+
+// For RA4M1 and RA4W1, there is no TSN configuration
+#if defined(RA6M1) | defined(RA6M2)
+static void ra_tsn_module_start(void) {
+    ra_mstpcrd_start(R_MSTP_MSTPCRD_MSTPD22_Msk);
+}
+
+static void ra_tsn_module_stop(void) {
+    ra_mstpcrd_stop(R_MSTP_MSTPCRD_MSTPD22_Msk);
+}
+#endif
+
+void ra_adc_set_pin(uint32_t pin, bool adc_enable) {
+    uint32_t port = GPIO_PORT(pin);
+    uint32_t bit = GPIO_BIT(pin);
+    uint32_t pfs = _PXXPFS(port, bit);
+    pwpr_unprotect();
+    if (adc_enable) {
+        pfs &= ~PMR_MASK; /* GPIO */
+        pfs &= ~PDR_MASK; /* input */
+        pfs |= ASEL_MASK; /* set adc bit */
+    } else {
+        pfs |= PMR_MASK;   /* GPIO */
+        pfs &= ~PDR_MASK;  /* input */
+        pfs &= ~ASEL_MASK; /* clear adc bit */
+    }
+    _PXXPFS(port, bit) = pfs;
+    pwpr_protect();
+}
+
+void ra_adc_enable(uint32_t pin) {
+    ra_adc_set_pin(pin, true);
+}
+
+void ra_adc_disable(uint32_t pin) {
+    ra_adc_set_pin(pin, false);
+}
+
+__attribute__((naked)) static void min_delay(__attribute__((unused)) uint32_t loop_cnt) {
+    __asm volatile (
+        "sw_delay_loop:         \n"
+        #if defined(__ICCARM__) || defined(__ARMCC_VERSION)
+        "   subs r0, #1         \n"  ///< 1 cycle
+        #elif defined(__GNUC__)
+        "   sub r0, r0, #1      \n"  ///< 1 cycle
+        #endif
+        "   cmp r0, #0          \n"  ///< 1 cycle
+        /* CM0 and CM23 have a different instruction set */
+        #if defined(__CORE_CM0PLUS_H_GENERIC) || defined(__CORE_CM23_H_GENERIC)
+        "   bne sw_delay_loop   \n"  ///< 2 cycles
+        #else
+        "   bne.n sw_delay_loop \n"  ///< 2 cycles
+        #endif
+        "   bx lr               \n");  ///< 2 cycles
+}
+
+static void udelay(uint32_t us) {
+    while (us-- > 0) {
+        min_delay(PCLK / 1000000 / 4);
+    }
+}
+
+void ra_adc_set_resolution(uint8_t res) {
+    uint16_t adcer;
+    uint16_t adprc;
+    #if defined(RA4M1) | defined(RA4W1)
+    if ((res == 14) | (res == 12)) {
+        if (res == 14) {
+            adprc = 0x0006;
+        } else {
+            adprc = 0x0000;
+        }
+        adcer = adc_reg->ADCER;
+        adcer &= (uint16_t) ~0x0006;
+        adcer |= (uint16_t)adprc;
+        adc_reg->ADCER;
+        resolution = res;
+    }
+    #else
+    if ((res == 12) | (res == 10) | (res == 8)) {
+        if (res == 12) {
+            adprc = 0x0000;
+        } else if (res == 10) {
+            adprc = 0x0002;
+        } else {
+            adprc = 0x0004;
+        }
+        adcer = adc_reg->ADCER;
+        adcer &= (uint16_t) ~0x0006;
+        adcer |= (uint16_t)adprc;
+        adc_reg->ADCER;
+        resolution = res;
+    }
+    #endif
+}
+
+uint8_t ra_adc_get_resolution(void) {
+    uint8_t res = 0;
+    uint16_t adcer;
+    adcer = adc_reg->ADCER;
+    adcer &= 0x0006;
+    #if defined(RA4M1) | defined(RA4W1)
+    if (adcer == 0x0006) {
+        res = 14;
+    } else if (adcer == 0x0000) {
+        res = 12;
+    }
+    #else
+    if (adcer == 0x0000) {
+        res = 12;
+    } else if (adcer == 0x0002) {
+        res = 10;
+    } else if (adcer == 0x0004) {
+        res = 8;
+    }
+    #endif
+    return res;
+}
+
+// assumption
+// AVCC0 is used. Neither VREFH0 nor internal reference voltage is not used.
+uint16_t ra_adc_read_ch(uint8_t ch) {
+    uint16_t value16 = 0;
+    if ((ch == ADC_TEMP) | (ch == ADC_REF)) {
+        #if defined(RA6M1) | defined(RA6M2)
+        if (ch == ADC_TEMP) {
+            adc_reg->ADEXICR_b.TSSA = 1;
+            tsn_ctrl_reg->TSCR_b.TSEN = 1;
+            while (!tsn_ctrl_reg->TSCR_b.TSEN) {
+                ;
+            }
+            tsn_ctrl_reg->TSCR_b.TSOE = 1;
+            while (!tsn_ctrl_reg->TSCR_b.TSOE) {
+                ;
+            }
+            udelay(300);
+        } else if (ch == ADC_REF) {
+            adc_reg->ADEXICR_b.OCSA = 1;
+            udelay(300);
+        }
+        #endif
+        adc_reg->ADANSA[0] = 0;
+        adc_reg->ADANSA[1] = 0;
+    } else if (ch < 16) {
+        adc_reg->ADANSA[0] |= (uint16_t)(1 << ch);
+    } else {
+        adc_reg->ADANSA[1] |= (uint16_t)(1 << (ch - 16));
+    }
+    adc_reg->ADCSR_b.ADCS = 0; /* single scan mode */
+    adc_reg->ADCSR_b.ADST = 1; /* start a/d conversion */
+    while (adc_reg->ADCSR_b.ADST) {
+        ; /* ADC in progress*/
+    }
+    if (ch == ADC_TEMP) {
+        value16 = (uint16_t)adc_reg->ADTSDR;
+    } else if (ch == ADC_REF) {
+        value16 = (uint16_t)adc_reg->ADOCDR;
+    } else {
+        value16 = (uint16_t)adc_reg->ADDR[ch];
+    }
+    #if defined(RA6M1) | defined(RA6M2)
+    if (ch == ADC_TEMP) {
+        tsn_ctrl_reg->TSCR_b.TSOE = 0;
+        while (tsn_ctrl_reg->TSCR_b.TSOE) {
+            ;
+        }
+        tsn_ctrl_reg->TSCR_b.TSEN = 0;
+        while (tsn_ctrl_reg->TSCR_b.TSEN) {
+            ;
+        }
+    } else if (ch == ADC_REF) {
+        adc_reg->ADEXICR_b.OCSA = 0;
+    }
+    #endif
+    return value16;
+}
+
+uint16_t ra_adc_read(uint32_t pin) {
+    uint8_t ch = ra_adc_get_channel(pin);
+    if (ch == ADC_NON) {
+        return 0;
+    }
+    return ra_adc_read_ch(ch);
+}
+
+int16_t ra_adc_read_itemp(void) {
+    int16_t temp = 0;
+    int16_t vmax = (int16_t)(1 << resolution);
+    #if defined(RA4M1) | defined(RA4W1)
+    uint16_t cal125 = ((uint16_t)tsn_reg->TSCDRH << 8) + (uint16_t)tsn_reg->TSCDRL;
+    uint16_t val = ra_adc_read_ch(ADC_TEMP);
+    int16_t v125 = (int16_t)(33 * cal125 / vmax / 10);
+    int16_t vtemp = (int16_t)(33 * val / vmax / 10);
+    temp = (int16_t)(125 + ((vtemp - v125) * 1000000 / (int16_t)BSP_FEATURE_ADC_TSN_SLOPE));
+    #elif defined(RA6M1) | defined(RA6M2)
+    uint16_t cal127 = (uint16_t)tsn_cal_reg->TSCDR;
+    uint16_t val = ra_adc_read_ch(ADC_TEMP);
+    int16_t v127 = (int16_t)(33 * cal127 / vmax / 10);
+    int16_t vtemp = (int16_t)(33 * val / vmax / 10);
+    temp = (int16_t)(127 + ((vtemp - v127) * 1000000 / (int16_t)BSP_FEATURE_ADC_TSN_SLOPE));
+    #else
+    #error "CMSIS MCU Series is not specified."
+    #endif
+    return temp;
+}
+
+float ra_adc_read_ftemp(void) {
+    float temp;
+    float vmax = (float)(1 << resolution);
+    #if defined(RA4M1) | defined(RA4W1)
+    uint16_t cal125 = ((uint16_t)tsn_reg->TSCDRH << 8) + (uint16_t)tsn_reg->TSCDRL;
+    uint16_t val = ra_adc_read_ch(ADC_TEMP);
+    float v125 = (float)(3.3f * (float)cal125 / vmax);
+    float vtemp = (float)(3.3f * (float)val / vmax);
+    temp = (float)(125.0f + ((vtemp - v125) * 1000000.0f / (float)BSP_FEATURE_ADC_TSN_SLOPE));
+    #endif
+    #if defined(RA6M1) | defined(RA6M2)
+    uint16_t cal127 = (uint16_t)tsn_cal_reg->TSCDR;
+    uint16_t val = ra_adc_read_ch(ADC_TEMP);
+    float v127 = (float)(3.3f * (float)cal127 / vmax);
+    float vtemp = (float)(3.3f * (float)val / vmax);
+    temp = (float)(127.0f + ((vtemp - v127) * 1000000.0f / (float)BSP_FEATURE_ADC_TSN_SLOPE));
+    #endif
+    return temp;
+}
+
+float ra_adc_read_fref(void) {
+    uint16_t val = ra_adc_read_ch(ADC_REF);
+    float vmax = (float)(1 << resolution);
+    float vref = (float)(3.3f * (float)val / vmax);
+    return vref;
+}
+
+uint16_t ra_adc_all_read_ch(uint32_t ch) {
+    if (ch < ADC_CH_MAX) {
+        return adc_values[ch];
+    } else {
+        return 0;
+    }
+}
+
+void ra_adc_all(__attribute__((unused)) uint32_t resolution, uint32_t mask) {
+    uint32_t i;
+    uint32_t pin;
+    uint32_t bit;
+    uint16_t value16 = 0;
+    bool badc = ((mask & 0x1fffffff) != 0);
+    bool btemp = ((mask & (1 << ADC_TEMP)) != 0);
+    bool bref = ((mask & (1 << ADC_REF)) != 0);
+    for (i = 0; i < ADC_CH_MAX; i++) {
+        adc_values[i] = 0;
+    }
+    if (badc) {
+        bit = 1;
+        adc_reg->ADANSA[0] = 0;
+        adc_reg->ADANSA[1] = 0;
+        for (i = 0; i < ADC_UNIT0_SCAN_MAX; i++) {
+            if (mask & bit) {
+                if (ra_adc_ch_to_pin((uint8_t)i, &pin)) {
+                    ra_adc_enable(pin);
+                    if (i < 16) {
+                        adc_reg->ADANSA[0] |= (uint16_t)(1 << i);
+                    } else {
+                        adc_reg->ADANSA[1] |= (uint16_t)(1 << (i - 16));
+                    }
+                }
+            }
+            bit <<= 1;
+        }
+        adc_reg->ADCSR_b.ADCS = 0; /* single scan mode */
+        adc_reg->ADCSR_b.ADST = 1; /* start a/d conversion */
+        while (adc_reg->ADCSR_b.ADST) {
+            ; /* ADC in progress*/
+        }
+        bit = 1;
+        for (i = 0; i < ADC_UNIT0_SCAN_MAX; i++) {
+            if (mask & bit) {
+                value16 = (uint16_t)adc_reg->ADDR[i];
+                adc_values[i] = value16;
+            }
+            bit <<= 1;
+        }
+    }
+    if (btemp) {
+        adc_reg->ADANSA[0] = 0;
+        adc_reg->ADANSA[1] = 0;
+        adc_reg->ADEXICR_b.TSSA = 1;
+        #if defined(RA6M1) | defined(RA6M2)
+        tsn_ctrl_reg->TSCR_b.TSEN = 1;
+        while (!tsn_ctrl_reg->TSCR_b.TSEN) {
+            ;
+        }
+        tsn_ctrl_reg->TSCR_b.TSOE = 1;
+        while (!tsn_ctrl_reg->TSCR_b.TSOE) {
+            ;
+        }
+        udelay(30);
+        #endif
+        adc_reg->ADCSR_b.ADCS = 0; /* single scan mode */
+        adc_reg->ADCSR_b.ADST = 1; /* start a/d conversion */
+        while (adc_reg->ADCSR_b.ADST) {
+            ; /* ADC in progress*/
+        }
+        value16 = (uint16_t)adc_reg->ADTSDR;
+        adc_values[ADC_TEMP] = value16;
+        #if defined(RA6M1) | defined(RA6M2)
+        tsn_ctrl_reg->TSCR_b.TSOE = 0;
+        while (tsn_ctrl_reg->TSCR_b.TSOE) {
+            ;
+        }
+        tsn_ctrl_reg->TSCR_b.TSEN = 0;
+        while (tsn_ctrl_reg->TSCR_b.TSEN) {
+            ;
+        }
+        #endif
+    }
+    if (bref) {
+        adc_reg->ADANSA[0] = 0;
+        adc_reg->ADANSA[1] = 0;
+        adc_reg->ADEXICR_b.OCSA = 1;
+        udelay(30);
+        adc_reg->ADCSR_b.ADCS = 0; /* single scan mode */
+        adc_reg->ADCSR_b.ADST = 1; /* start a/d conversion */
+        while (adc_reg->ADCSR_b.ADST) {
+            ; /* ADC in progress*/
+        }
+        value16 = (uint16_t)adc_reg->ADOCDR;
+        adc_values[ADC_REF] = value16;
+    }
+}
+
+bool ra_adc_init(void) {
+    ra_adc0_module_start();
+    #if defined(RA6M1) | defined(RA6M2)
+    ra_adc1_module_start();
+    ra_tsn_module_start();
+    #endif
+    resolution = RA_ADC_DEF_RESOLUTION;
+    ra_adc_set_resolution(resolution);
+    return true;
+}
+
+bool ra_adc_deinit(void) {
+    ra_adc0_module_stop();
+    #if defined(RA6M1) | defined(RA6M2)
+    ra_adc1_module_stop();
+    ra_tsn_module_stop();
+    #endif
+    return true;
+}
+
+__WEAK void adc_scan_end_isr(void) {
+    // dummy
+}
diff --git a/ports/renesas-ra/ra/ra_adc.h b/ports/renesas-ra/ra/ra_adc.h
new file mode 100644
index 0000000000000..4d56243d1eb7a
--- /dev/null
+++ b/ports/renesas-ra/ra/ra_adc.h
@@ -0,0 +1,186 @@
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Renesas Electronics Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#ifndef RA_ADC_H_
+#define RA_ADC_H_
+
+#include <stdint.h>
+#include <stdbool.h>
+
+#if defined(RA4M1) | defined(RA4W1)
+#define ADC_RESOLUTION (14)
+#else
+#define ADC_RESOLUTION (12)
+#endif
+
+enum ADC14_PIN
+{
+    #if defined(RA4M1)
+
+    AN000 = 0,
+    AN001 = 1,
+    AN002 = 2,
+    AN003 = 3,
+    AN004 = 4,
+    AN005 = 5,
+    AN006 = 6,
+    AN007 = 7,
+    AN008 = 8,
+    AN009 = 9,
+    AN010 = 10,
+    AN011 = 11,
+    AN012 = 12,
+    AN013 = 13,
+    AN014 = 14,
+    AN016 = 16,
+    AN017 = 17,
+    AN018 = 18,
+    AN019 = 19,
+    AN020 = 20,
+    AN021 = 21,
+    AN022 = 22,
+    AN023 = 23,
+    AN024 = 24,
+    AN025 = 25,
+
+    #elif defined(RA4W1)
+
+    AN004 = 4,
+    AN005 = 5,
+    AN006 = 6,
+    AN009 = 9,
+    AN010 = 10,
+    AN017 = 17,
+    AN019 = 19,
+    AN020 = 20,
+
+    #elif defined(RA6M1)
+
+    AN000 = 0,
+    AN001 = 1,
+    AN002 = 2,
+    AN003 = 3,
+    AN004 = 4,
+    AN005 = 5,
+    AN006 = 6,
+    AN007 = 7,
+    AN008 = 8,
+    AN009 = 9,
+    AN010 = 10,
+    AN011 = 11,
+    AN012 = 12,
+    AN013 = 13,
+    AN014 = 14,
+    AN015 = 15,
+    AN016 = 16,
+    AN017 = 17,
+    AN018 = 18,
+    AN019 = 19,
+    AN020 = 20,
+    AN021 = 21,
+    AN022 = 22,
+    AN100 = 32,
+    AN101 = 33,
+    AN102 = 34,
+    AN103 = 35,
+    AN104 = 36,
+    AN105 = 37,
+    AN106 = 38,
+    AN107 = 39,
+    AN108 = 40,
+    AN109 = 41,
+    AN110 = 42,
+    AN111 = 43,
+    AN112 = 44,
+    AN113 = 45,
+    AN114 = 46,
+    AN115 = 47,
+    AN116 = 48,
+    AN117 = 49,
+    AN118 = 50,
+    AN119 = 51,
+    AN120 = 52,
+
+    #elif defined(RA6M2)
+    // Unit 0
+    AN000 = 0,
+    AN001 = 1,
+    AN002 = 2,
+    AN003 = 3,
+    AN004 = 4,
+    AN005 = 5,
+    AN006 = 6,
+    AN007 = 7,
+    AN016 = 16,
+    AN017 = 17,
+    AN018 = 18,
+    AN019 = 19,
+    AN020 = 20,
+    // Unit 1
+    AN100 = 32,
+    AN101 = 33,
+    AN102 = 34,
+    AN105 = 37,
+    AN106 = 38,
+    AN107 = 39,
+    AN116 = 48,
+    AN117 = 49,
+    AN118 = 50,
+
+    #else
+    #error "CMSIS MCU Series is not specified."
+    #endif
+    ADC_TEMP = 29,
+    ADC_REF = 30,
+    ADC_NON = 255,
+};
+
+#if defined(RA4M1) | defined(RA4W1)
+#define RA_ADC_DEF_RESOLUTION 14
+#else
+#define RA_ADC_DEF_RESOLUTION 12
+#endif
+
+bool ra_adc_pin_to_ch(uint32_t pin, uint8_t *ch);
+bool ra_adc_ch_to_pin(uint8_t ch, uint32_t *pin);
+uint8_t ra_adc_get_channel(uint32_t pin);
+// static void ra_adc_module_start(void);
+// static void ra_adc_module_stop(void);
+void ra_adc_set_pin(uint32_t pin, bool adc_enable);
+void ra_adc_enable(uint32_t pin);
+void ra_adc_disable(uint32_t pin);
+void ra_adc_set_resolution_set(uint8_t res);
+uint8_t ra_adc_get_resolution(void);
+uint16_t ra_adc_read_ch(uint8_t ch);
+uint16_t ra_adc_read(uint32_t pin);
+int16_t ra_adc_read_itemp(void);
+float ra_adc_read_ftemp(void);
+float ra_adc_read_fref(void);
+void ra_adc_all(uint32_t resolution, uint32_t mask);
+uint16_t ra_adc_all_read_ch(uint32_t ch);
+bool ra_adc_init(void);
+bool ra_adc_deinit(void);
+__attribute__((weak)) void adc_scan_end_isr(void);
+
+#endif /* RA_ADC_H_ */
diff --git a/ports/renesas-ra/ra/ra_config.h b/ports/renesas-ra/ra/ra_config.h
new file mode 100644
index 0000000000000..c02947a47bc41
--- /dev/null
+++ b/ports/renesas-ra/ra/ra_config.h
@@ -0,0 +1,103 @@
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Renesas Electronics Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#ifndef RA_RA_CONFIG_H_
+#define RA_RA_CONFIG_H_
+
+#include <stdint.h>
+
+#if defined(RA4M1) | defined(RA4W1)
+#define SCI_CH_MAX      10
+#define SCI_CH_NUM      4
+#define SCI_TX_BUF_SIZE 128
+#define SCI_RX_BUF_SIZE 256
+#define PCLK         48000000
+#elif defined(RA6M1) | defined(RA6M2)
+#define SCI_CH_MAX   10
+#define SCI_CH_NUM   4
+#define SCI_TX_BUF_SIZE 128
+#define SCI_RX_BUF_SIZE 256
+#define PCLK         120000000
+#else
+#error "CMSIS MCU Series is not specified."
+#endif
+
+#if defined(MICROPY_HW_MCU_PCLK)
+#undef PCLK
+#define PCLK MICROPY_HW_MCU_PCLK
+#endif
+
+#define SCI_DEF_BAUD (115200)
+
+#if !defined(RA_PRI_SYSTICK)
+#define RA_PRI_SYSTICK (0)
+#endif
+#if !defined(RA_PRI_UART)
+#define RA_PRI_UART (1)
+#endif
+#if !defined(RA_PRI_SDIO)
+#define RA_PRI_SDIO (4)
+#endif
+#if !defined(RA_PRI_DMA)
+#define RA_PRI_DMA (5)
+#endif
+#if !defined(RA_PRI_FLASH)
+#define RA_PRI_FLASH (6)
+#endif
+#if !defined(RA_PRI_OTG_FS)
+#define RA_PRI_OTG_FS (6)
+#endif
+#if !defined(RA_PRI_OTG_HS)
+#define RA_PRI_OTG_HS (6)
+#endif
+#if !defined(RA_PRI_TIM5)
+#define RA_PRI_TIM5 (6)
+#endif
+#if !defined(RA_PRI_CAN)
+#define RA_PRI_CAN (7)
+#endif
+#if !defined(RA_PRI_SPI)
+#define RA_PRI_SPI (8)
+#endif
+#if !defined(RA_PRI_I2C)
+#define RA_PRI_I2C (8)
+#endif
+#if !defined(RA_PRI_TIMX)
+#define RA_PRI_TIMX (13)
+#endif
+#if !defined(RA_PRI_EXTINT)
+#define RA_PRI_EXTINT (14)
+#endif
+#if !defined(RA_PRI_PENDSV)
+#define RA_PRI_PENDSV (15)
+#endif
+#if !defined(RA_PRI_RTC_WKUP)
+#define RA_PRI_RTC_WKUP (15)
+#endif
+
+#if !defined(__WEAK)
+#define __WEAK __attribute__((weak))
+#endif
+
+#endif /* RA_RA_CONFIG_H_ */
diff --git a/ports/renesas-ra/ra/ra_flash.c b/ports/renesas-ra/ra/ra_flash.c
new file mode 100644
index 0000000000000..e289f5f924b3c
--- /dev/null
+++ b/ports/renesas-ra/ra/ra_flash.c
@@ -0,0 +1,298 @@
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Renesas Electronics Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include <stdbool.h>
+#include "hal_data.h"
+#include "ra_config.h"
+#include "ra_utils.h"
+#include "ra_flash.h"
+
+#if !defined(USE_FSP_FLASH)
+#define USE_FSP_FLASH
+#endif
+
+#if defined(USE_FSP_FLASH)
+
+#if defined(__GNUC__)
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#pragma GCC diagnostic ignored "-Wmissing-declarations"
+#endif
+
+/* Flags, set from Callback function */
+static volatile _Bool g_b_flash_event_not_blank = false;
+static volatile _Bool g_b_flash_event_blank = false;
+static volatile _Bool g_b_flash_event_erase_complete = false;
+static volatile _Bool g_b_flash_event_write_complete = false;
+
+static uint8_t flash_buf[FLASH_BUF_SIZE] __attribute__((aligned(2)));
+
+void *FLASH_SECTION lmemset(void *dst, int c, size_t len) {
+    char *p;
+    for (p = (char *)dst; len > 0; len--) {
+        *(p++) = (char)c;
+    }
+    return (void *)dst;
+}
+
+void *FLASH_SECTION lmemcpy(void *dst, const void *src, size_t len) {
+    char *d = (char *)dst;
+    const char *s = (const char *)src;
+    for (; len > 0; len--) {
+        *(d++) = *(s++);
+    }
+    return (void *)dst;
+}
+
+int FLASH_SECTION lmemcmp(const void *p1, const void *p2, size_t len) {
+    unsigned char *a, *b;
+    size_t i;
+
+    a = (unsigned char *)p1;
+    b = (unsigned char *)p2;
+    for (i = 0; i < len; i++) {
+        if (*a != *b) {
+            return (*a < *b) ? -1 : 1;
+        }
+        a++;
+        b++;
+    }
+    return (int)0;
+}
+
+#if defined(RA4M1) | defined(RA4M3) | defined(RA4W1)
+
+uint32_t FLASH_SECTION sector_size(uint32_t addr) {
+    return FLASH_SECTOR_SIZE;
+}
+
+uint32_t FLASH_SECTION sector_start(uint32_t addr) {
+    return addr & ~(FLASH_SECTOR_SIZE - 1);
+}
+
+uint32_t FLASH_SECTION sector_index(uint32_t addr) {
+    return (addr - 0x00000000) / FLASH_SECTOR_SIZE;
+}
+
+#elif defined(RA6M1) | defined(RA6M2)
+
+#define REGION1_SECTOR_SIZE 0x8000  // 32K
+#define REGION1_SECTOR_MAX  14
+#define REGION0_SECTOR_SIZE 0x2000  // 8K
+#define REGION0_SECTOR_MAX  8
+
+uint32_t FLASH_SECTION sector_size(uint32_t addr) {
+    if (addr <= 0x00010000) {
+        return REGION0_SECTOR_SIZE;
+    } else {
+        return REGION1_SECTOR_SIZE;
+    }
+}
+
+uint32_t FLASH_SECTION sector_start(uint32_t addr) {
+    if (addr <= 0x00010000) {
+        return addr & ~(REGION0_SECTOR_SIZE - 1);
+    } else {
+        return addr & ~(REGION1_SECTOR_SIZE - 1);
+    }
+}
+
+uint32_t FLASH_SECTION sector_index(uint32_t addr) {
+    if (addr <= 0x00010000) {
+        return (addr - 0x00010000) / REGION0_SECTOR_SIZE;
+    } else {
+        return (addr - 0x000100000) / REGION1_SECTOR_SIZE;
+    }
+}
+
+#else
+#error "CMSIS MCU Series is not specified."
+#endif
+
+bool internal_flash_read(uint8_t *addr, uint32_t NumBytes, uint8_t *pSectorBuff) {
+    CHIP_WORD *startaddr = (CHIP_WORD *)addr;
+    CHIP_WORD *endaddr = (CHIP_WORD *)(addr + NumBytes);
+    while (startaddr < endaddr) {
+        *pSectorBuff++ = *startaddr++;
+    }
+    return true;
+}
+
+bool internal_flash_write(uint8_t *addr, uint32_t NumBytes, uint8_t *pSectorBuff, bool ReadModifyWrite) {
+    return internal_flash_writex(addr, NumBytes, pSectorBuff, ReadModifyWrite, true);
+}
+
+bool internal_flash_writex(uint8_t *addr, uint32_t NumBytes, uint8_t *pSectorBuff, bool ReadModifyWrite, bool fIncrementDataPtr) {
+    fsp_err_t err = FSP_SUCCESS;
+    bool flag;
+    uint32_t count;
+    uint8_t *buf_addr = (uint8_t *)&flash_buf[0];
+    uint32_t startaddr = (uint32_t)addr & FLASH_BUF_ADDR_MASK;
+    uint32_t offset = (uint32_t)addr & FLASH_BUF_OFF_MASK;
+    uint32_t endaddr = (uint32_t)addr + NumBytes;
+    uint32_t error_code = 0;
+    while (startaddr < endaddr) {
+        // copy from dst rom addr to flash buffer to keep current data
+        lmemcpy(flash_buf, (void *)startaddr, FLASH_BUF_SIZE);
+        // memset(flash_buf, 0xff, FLASH_BUF_SIZE);
+        if (NumBytes + offset > FLASH_BUF_SIZE) {
+            count = FLASH_BUF_SIZE - offset;
+            NumBytes -= count;
+        } else {
+            count = NumBytes;
+        }
+        // overwrite data from src addr to flash buffer
+        if (fIncrementDataPtr) {
+            lmemcpy(flash_buf + offset, pSectorBuff, count);
+        } else {
+            lmemset(flash_buf + offset, (int)*pSectorBuff, count);
+        }
+        g_b_flash_event_write_complete = false;
+        uint8_t *flash_addr = (uint8_t *)((uint32_t)startaddr & FLASH_BUF_ADDR_MASK);
+        uint32_t state = ra_disable_irq();
+        #if defined(RA4M1) | defined(RA4M3) | defined(RA4W1)
+        err = R_FLASH_LP_Write(&g_flash0_ctrl, (uint32_t const)buf_addr, (uint32_t)flash_addr, FLASH_SECTOR_SIZE);
+        #elif defined(RA6M1) | defined(RA6M2)
+        err = R_FLASH_HP_Write(&g_flash0_ctrl, (uint32_t const)buf_addr, (uint32_t)flash_addr, FLASH_SECTOR_SIZE);
+        #else
+        #error "CMSIS MCU Series is not specified."
+        #endif
+        ra_enable_irq(state);
+        if (FSP_SUCCESS != err) {
+            error_code = 1;
+            goto WriteX_exit;
+        }
+        if (fIncrementDataPtr) {
+            flag = (lmemcmp((void *)(startaddr + offset), flash_buf + offset, count) == 0);
+            if (!flag) {
+                error_code = 2;
+                break;
+            }
+        }
+        offset = 0;
+        startaddr += FLASH_BUF_SIZE;
+        pSectorBuff += count;
+    }
+WriteX_exit:
+    if (error_code == 0) {
+        return true;
+    }
+    return false;
+}
+
+bool internal_flash_memset(uint8_t *addr, uint8_t Data, uint32_t NumBytes) {
+    return true;
+}
+
+bool internal_flash_isblockerased(uint8_t *addr, uint32_t BlockLength) {
+    fsp_err_t err = FSP_SUCCESS;
+    flash_result_t blankCheck = FLASH_RESULT_BLANK;
+    g_b_flash_event_not_blank = false;
+    g_b_flash_event_blank = false;
+    uint32_t state = ra_disable_irq();
+    #if defined(RA4M1) | defined(RA4M3) | defined(RA4W1)
+    err = R_FLASH_LP_BlankCheck(&g_flash0_ctrl, (uint32_t const)((uint32_t)addr & FLASH_BUF_ADDR_MASK), FLASH_SECTOR_SIZE, &blankCheck);
+    #elif defined(RA6M1) | defined(RA6M2)
+    err = R_FLASH_HP_BlankCheck(&g_flash0_ctrl, (uint32_t const)((uint32_t)addr & FLASH_BUF_ADDR_MASK), FLASH_SECTOR_SIZE, &blankCheck);
+    #else
+    #error "CMSIS MCU Series is not specified."
+    #endif
+    ra_enable_irq(state);
+    if (err == FSP_SUCCESS) {
+        if (FLASH_RESULT_BLANK == blankCheck) {
+            return true;
+        } else {
+            return false;
+        }
+    } else {
+        return false;
+    }
+}
+
+bool internal_flash_eraseblock(uint8_t *addr) {
+    uint32_t error_code = 0;
+    fsp_err_t err = FSP_SUCCESS;
+    g_b_flash_event_erase_complete = false;
+    uint32_t state = ra_disable_irq();
+    #if defined(RA4M1) | defined(RA4M3) | defined(RA4W1)
+    err = R_FLASH_LP_Erase(&g_flash0_ctrl, (uint32_t const)addr, 1);
+    #elif defined(RA6M1) | defined(RA6M2)
+    err = R_FLASH_HP_Erase(&g_flash0_ctrl, (uint32_t const)addr, 1);
+    #else
+    #error "CMSIS MCU Series is not specified."
+    #endif
+    ra_enable_irq(state);
+    if (err == FSP_SUCCESS) {
+        error_code = 0;
+    } else {
+        error_code = 1;
+    }
+    if (error_code == 0) {
+        return true;
+    }
+    return false;
+}
+
+/* Callback function */
+void callback_flash(flash_callback_args_t *p_args) {
+    /* TODO: add your own code here */
+    switch (p_args->event) {
+        case FLASH_EVENT_NOT_BLANK:
+            g_b_flash_event_not_blank = true;
+            break;
+        case FLASH_EVENT_BLANK:
+            g_b_flash_event_blank = true;
+            break;
+        case FLASH_EVENT_ERASE_COMPLETE:
+            g_b_flash_event_erase_complete = true;
+            break;
+        case FLASH_EVENT_WRITE_COMPLETE:
+            g_b_flash_event_write_complete = true;
+            break;
+        default:
+            /* Do nothing */
+            break;
+    }
+}
+
+bool internal_flash_init(void) {
+    fsp_err_t err = FSP_SUCCESS;
+    #if defined(RA4M1) | defined(RA4M3) | defined(RA4W1)
+    err = R_FLASH_LP_Open(&g_flash0_ctrl, &g_flash0_cfg);
+    #elif defined(RA6M1) | defined(RA6M2)
+    err = R_FLASH_HP_Open(&g_flash0_ctrl, &g_flash0_cfg);
+    #else
+    #error "CMSIS MCU Series is not specified."
+    #endif
+    if (err == FSP_SUCCESS) {
+        return true;
+    } else {
+        return false;
+    }
+}
+
+#else
+
+// ToDo: implementation
+
+#endif
diff --git a/ports/renesas-ra/ra/ra_flash.h b/ports/renesas-ra/ra/ra_flash.h
new file mode 100644
index 0000000000000..f9afef2a948f6
--- /dev/null
+++ b/ports/renesas-ra/ra/ra_flash.h
@@ -0,0 +1,57 @@
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Renesas Electronics Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#ifndef RA_FLASH_H_
+#define RA_FLASH_H_
+
+#include <stdio.h>
+#include <stdint.h>
+#include <stdbool.h>
+
+#define FLASH_SECTOR_SIZE   ((uint32_t)2048)
+#define FLASH_NUM_BLOCKS    ((uint32_t)128)
+#define FLASH_BUF_OFF_MASK  (FLASH_SECTOR_SIZE - 1)
+#define FLASH_BUF_ADDR_MASK (~FLASH_BUF_OFF_MASK)
+#define FLASH_BUF_SIZE      FLASH_SECTOR_SIZE
+
+#define FLASH_SECTION __attribute__((section("FLASH_OP")))
+
+typedef uint8_t CHIP_WORD;
+
+void FLASH_SECTION *lmemset(void *dst, int c, size_t len);
+void FLASH_SECTION *lmemcpy(void *dst, const void *src, size_t len);
+int FLASH_SECTION lmemcmp(const void *p1, const void *p2, size_t len);
+
+uint32_t FLASH_SECTION sector_size(uint32_t addr);
+uint32_t FLASH_SECTION sector_start(uint32_t addr);
+uint32_t FLASH_SECTION sector_index(uint32_t addr);
+bool FLASH_SECTION internal_flash_read(uint8_t *addr, uint32_t NumBytes, uint8_t *pSectorBuff);
+bool FLASH_SECTION internal_flash_write(uint8_t *addr, uint32_t NumBytes, uint8_t *pSectorBuff, bool ReadModifyWrite);
+bool FLASH_SECTION internal_flash_writex(uint8_t *addr, uint32_t NumBytes, uint8_t *pSectorBuff, bool ReadModifyWrite, bool fIncrementDataPtr);
+bool FLASH_SECTION internal_flash_memset(uint8_t *addr, uint8_t Data, uint32_t NumBytes);
+bool FLASH_SECTION internal_flash_isblockerased(uint8_t *addr, uint32_t BlockLength);
+bool FLASH_SECTION internal_flash_eraseblock(uint8_t *addr);
+bool FLASH_SECTION internal_flash_init(void);
+
+#endif /* RA_FLASH_H_ */
diff --git a/ports/renesas-ra/ra/ra_gpio.c b/ports/renesas-ra/ra/ra_gpio.c
new file mode 100644
index 0000000000000..598546cb93493
--- /dev/null
+++ b/ports/renesas-ra/ra/ra_gpio.c
@@ -0,0 +1,176 @@
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021,2022 Renesas Electronics Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include <stdint.h>
+#include "hal_data.h"
+#include "ra_config.h"
+#include "ra_gpio.h"
+
+void ra_gpio_config(uint32_t pin, uint32_t mode, uint32_t pull, uint32_t drive, uint32_t alt) {
+    uint32_t port = GPIO_PORT(pin);
+    uint32_t bit = GPIO_BIT(pin);
+    pwpr_unprotect();
+    switch (mode) {
+        case GPIO_MODE_INPUT:
+            _PXXPFS(port, bit) &= ~(PMR_MASK | ASEL_MASK);  // GPIO
+            _PXXPFS(port, bit) &= ~PDR_MASK;    // input
+            if (pull != 0) {
+                _PXXPFS(port, bit) |= PCR_MASK;     // set pullup
+            } else {
+                _PXXPFS(port, bit) &= ~PCR_MASK;    // clear pullup
+            }
+            break;
+        case GPIO_MODE_OUTPUT_PP:
+            _PXXPFS(port, bit) &= ~(PMR_MASK | ASEL_MASK);  // GPIO
+            _PXXPFS(port, bit) |= PDR_MASK;     // output
+            _PXXPFS(port, bit) &= ~PCR_MASK;    // pullup clear
+            break;
+        case GPIO_MODE_OUTPUT_OD:
+            _PXXPFS(port, bit) &= ~(PMR_MASK | ASEL_MASK);  // GPIO
+            _PXXPFS(port, bit) |= (PDR_MASK | NCODR_MASK);
+            break;
+        case GPIO_MODE_AF_PP:
+            _PXXPFS(port, bit) |= (PMR_MASK | PDR_MASK);
+            break;
+        case GPIO_MODE_AF_OD:
+            _PXXPFS(port, bit) |= (PMR_MASK | PDR_MASK | NCODR_MASK);
+            break;
+    }
+    switch (drive) {
+        case GPIO_HIGH_POWER:
+            _PXXPFS(port, bit) |= (DSCR1_MASK | DSCR_MASK);
+            break;
+        case GPIO_MED_POWER:
+            _PXXPFS(port, bit) &= ~DSCR1_MASK;
+            _PXXPFS(port, bit) |= DSCR_MASK;
+            break;
+        case GPIO_LOW_POWER:
+            _PXXPFS(port, bit) &= ~(DSCR1_MASK | DSCR_MASK);
+            break;
+        default: /* GPIO_NOTOUCH_POWER */
+            /* do not modify */
+            break;
+    }
+    _PXXPFS(port, bit) &= ~(uint32_t)(0x1f000000);
+    if (alt != 0) {
+        _PXXPFS(port, bit) |= (alt << 24); // Must set PSEL when PMR is 0
+        _PXXPFS(port, bit) |= PMR_MASK;
+    }
+    pwpr_protect();
+}
+
+void ra_gpio_mode_output(uint32_t pin) {
+    uint32_t port = GPIO_PORT(pin);
+    uint32_t bit = GPIO_BIT(pin);
+    pwpr_unprotect();
+    _PXXPFS(port, bit) &= ~(PMR_MASK | ASEL_MASK | PCR_MASK);   // GPIO
+    _PXXPFS(port, bit) |= PDR_MASK;     // output
+    pwpr_protect();
+}
+
+void ra_gpio_mode_input(uint32_t pin) {
+    uint32_t port = GPIO_PORT(pin);
+    uint32_t bit = GPIO_BIT(pin);
+    pwpr_unprotect();
+    _PXXPFS(port, bit) &= ~(PMR_MASK | ASEL_MASK);  // GPIO
+    _PXXPFS(port, bit) &= ~PDR_MASK;    // input
+    pwpr_protect();
+}
+
+void ra_gpio_toggle(uint32_t pin) {
+    uint32_t port = GPIO_PORT(pin);
+    uint32_t bit = GPIO_BIT(pin);
+    pwpr_unprotect();
+    _PXXPFS(port, bit) &= ~(PMR_MASK | ASEL_MASK);  // GPIO
+    _PXXPFS(port, bit) ^= 1;
+    pwpr_protect();
+}
+
+void ra_gpio_write(uint32_t pin, uint32_t value) {
+    uint32_t port = GPIO_PORT(pin);
+    uint32_t bit = GPIO_BIT(pin);
+    pwpr_unprotect();
+    _PXXPFS(port, bit) &= ~(PMR_MASK | ASEL_MASK);  // GPIO
+    if (value != 0) {
+        _PXXPFS(port, bit) |= 1;
+    } else {
+        _PXXPFS(port, bit) &= ~(uint32_t)1;
+    }
+    pwpr_protect();
+}
+
+uint32_t ra_gpio_read(uint32_t pin) {
+    uint32_t port = GPIO_PORT(pin);
+    uint32_t bit = GPIO_BIT(pin);
+    return ((_PXXPFS(port, bit) &= PIDR_MASK) != 0) ? 1 : 0;
+}
+
+uint32_t ra_gpio_get_mode(uint32_t pin) {
+    uint8_t mode = 0;
+    uint32_t port = GPIO_PORT(pin);
+    uint32_t bit = GPIO_BIT(pin);
+    if ((_PXXPFS(port, bit) &= PDR_MASK) != 0) {
+        mode = GPIO_MODE_OUTPUT_PP;
+    } else {
+        mode = GPIO_MODE_INPUT;
+    }
+    return mode;
+}
+
+uint32_t ra_gpio_get_pull(uint32_t pin) {
+    uint8_t pull = 0;
+    uint32_t port = GPIO_PORT(pin);
+    uint32_t bit = GPIO_BIT(pin);
+    if ((_PXXPFS(port, bit) &= PCR_MASK) != 0) {
+        pull = GPIO_PULLUP;
+    } else {
+        pull = GPIO_NOPULL;
+    }
+    return pull;
+}
+
+uint32_t ra_gpio_get_af(uint32_t pin) {
+    uint32_t port = GPIO_PORT(pin);
+    uint32_t bit = GPIO_BIT(pin);
+    return (_PXXPFS(port, bit) &= PMR_MASK) != 0;
+}
+
+uint32_t ra_gpio_get_drive(uint32_t pin) {
+    uint8_t drive = 0;
+    uint32_t port = GPIO_PORT(pin);
+    uint32_t bit = GPIO_BIT(pin);
+    switch (_PXXPFS(port, bit) &= (DSCR1_MASK | DSCR_MASK)) {
+        case (DSCR1_MASK | DSCR_MASK):
+            drive = GPIO_HIGH_POWER;
+            break;
+        case DSCR_MASK:
+            drive = GPIO_MED_POWER;
+            break;
+        case 0:
+        default:
+            drive = GPIO_LOW_POWER;
+            break;
+    }
+    return drive;
+}
diff --git a/ports/renesas-ra/ra/ra_gpio.h b/ports/renesas-ra/ra/ra_gpio.h
new file mode 100644
index 0000000000000..7b76016635342
--- /dev/null
+++ b/ports/renesas-ra/ra/ra_gpio.h
@@ -0,0 +1,187 @@
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Renesas Electronics Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#ifndef RA_RA_GPIO_H_
+#define RA_RA_GPIO_H_
+
+// clang-format off
+
+#include <stdint.h>
+
+typedef struct ra_af_pin {
+    uint8_t af;
+    uint8_t ch;
+    uint32_t pin;
+} ra_af_pin_t;
+
+enum CPU_PIN {
+    P000 = 0x00, P001, P002, P003, P004, P005, P006, P007, P008, P009, P010, P011, P012, P013, P014, P015,
+    P100 = 0x10, P101, P102, P103, P104, P105, P106, P107, P108, P109, P110, P111, P112, P113, P114, P115,
+    P200 = 0x20, P201, P202, P203, P204, P205, P206, P207, P208, P209, P210, P211, P212, P213, P214, P215,
+    P300 = 0x30, P301, P302, P303, P304, P305, P306, P307, P308, P309, P310, P311, P312, P313, P314, P315,
+    P400 = 0x40, P401, P402, P403, P404, P405, P406, P407, P408, P409, P410, P411, P412, P413, P414, P415,
+    P500 = 0x50, P501, P502, P503, P504, P505, P506, P507, P508, P509, P510, P511, P512, P513, P514, P515,
+    P600 = 0x90, P601, P602, P603, P604, P605, P606, P607, P608, P609, P610, P611, P612, P613, P614, P615,
+    P700 = 0x70, P701, P702, P703, P704, P705, P706, P707, P708, P709, P710, P711, P712, P713, P714, P715,
+    P800 = 0x80, P801, P802, P803, P804, P805, P806, P807, P808, P809, P810, P811, P812, P813, P814, P815,
+    P900 = 0x90, P901, P902, P903, P904, P905, P906, P907, P908, P909, P910, P911, P912, P913, P914, P915,
+    PIN_END = 0xff,
+};
+
+enum AF_INDEX {
+    AF_GPIO = 0,
+    AF_AGT = 1,
+    AF_GPT1 = 2,
+    AF_GPT2 = 3,
+    AF_SCI1 = 4,
+    AF_SCI2 = 5,
+    AF_SPI = 6,
+    AF_I2C = 7,
+    AF_KINT = 8,
+    AF_RTC = 9,
+    AF_CAC = 10,
+    AF_CTSU = 12,
+    AF_SLCDC = 13,
+    AF_CAN = 16,
+    AF_SSIE = 18,
+    AF_USBFS = 19,
+    AF_END = 0xff,
+};
+
+#define  GPIO_MODE_INPUT        1
+#define  GPIO_MODE_OUTPUT_PP    2
+#define  GPIO_MODE_OUTPUT_OD    3
+#define  GPIO_MODE_AF_PP        4
+#define  GPIO_MODE_AF_OD        5
+#define  GPIO_MODE_ANALOG       6
+#define  GPIO_MODE_IT_RISING    7
+#define  GPIO_MODE_IT_FALLING   8
+#define  GPIO_MODE_IT_RISING_FALLING 9
+#define  GPIO_MODE_EVT_RISING   10
+#define  GPIO_MODE_EVT_FALLING  11
+#define  GPIO_MODE_EVT_RISING_FALLING   12
+#define  GPIO_NOPULL            13
+#define  GPIO_PULLUP            14
+#define  GPIO_PULLDOWN          15
+#define  GPIO_PULLHOLD          16
+#define  GPIO_LOW_POWER         17
+#define  GPIO_MED_POWER         18
+#define  GPIO_HIGH_POWER        19
+#define  GPIO_NOTOUCH_POWER     20
+#define  GPIO_IRQ_LOWLEVEL      21
+#define  GPIO_IRQ_HIGHLEVEL     22
+
+#define IS_GPIO_MODE(MODE) (((MODE) == GPIO_MODE_INPUT) || \
+    ((MODE) == GPIO_MODE_OUTPUT_PP) || \
+    ((MODE) == GPIO_MODE_OUTPUT_OD) || \
+    ((MODE) == GPIO_MODE_AF_PP) || \
+    ((MODE) == GPIO_MODE_AF_OD) || \
+    ((MODE) == GPIO_MODE_IT_RISING) || \
+    ((MODE) == GPIO_MODE_IT_FALLING) || \
+    ((MODE) == GPIO_MODE_IT_RISING_FALLING) || \
+    ((MODE) == GPIO_MODE_EVT_RISING) || \
+    ((MODE) == GPIO_MODE_EVT_FALLING) || \
+    ((MODE) == GPIO_MODE_EVT_RISING_FALLING) || \
+    ((MODE) == GPIO_MODE_ANALOG))
+
+#define IS_GPIO_DRIVE(DRIVE) (((DRIVE) == GPIO_LOW_POWER) || \
+    ((DRIVE) == GPIO_MED_POWER) || \
+    ((DRIVE) == GPIO_HIGH_POWER))
+
+#define IS_GPIO_PULL(PULL) (((PULL) == GPIO_NOPULL) || ((PULL) == GPIO_PULLUP))
+
+#define IS_GPIO_AF(AF)   ((AF) <= (uint8_t)0x1F)
+
+#define GPIO_PORT(pin)  ((pin) >> 4)
+#define GPIO_MASK(pin)  (1 << ((pin) & 0xf))
+#define GPIO_BIT(pin)   ((pin) & 0xf)
+
+#define PODR_MASK   (uint32_t)0x00000001
+#define PIDR_MASK   (uint32_t)0x00000002
+#define PDR_MASK    (uint32_t)0x00000004
+#define PCR_MASK    (uint32_t)0x00000010
+#define NCODR_MASK  (uint32_t)0x00000040
+#define DSCR_MASK   (uint32_t)0x00000400
+#define DSCR1_MASK  (uint32_t)0x00000800
+#define EOR_MASK    (uint32_t)0x00001000
+#define EOF_MASK    (uint32_t)0x00002000
+#define ISEL_MASK   (uint32_t)0x00004000
+#define ASEL_MASK   (uint32_t)0x00008000
+#define PMR_MASK    (uint32_t)0x00010000
+#define PSEL_MASK   (uint32_t)0x1f000000
+
+#define _PWPR               (*(volatile uint8_t *)(0x40040D03))
+
+#define _PXXPFS(port, bit)  (*(volatile uint32_t *)(0x40040800 + (0x40 * ((uint32_t)port)) + (0x4 * ((uint32_t)bit))))
+#define _PCNTR1(port)       (*(volatile uint32_t *)(0x40040000 + (0x20 * (port))))
+#define _PODR(port)         (*(volatile uint16_t *)(0x40040000 + (0x20 * (port))))
+#define _PDR(port)          (*(volatile uint16_t *)(0x40040002 + (0x20 * (port))))
+#define _PCNTR2(port)       (*(volatile uint32_t *)(0x40040004 + (0x20 * (port))))
+#define _EIDR(port)         (*(volatile uint16_t *)(0x40040004 + (0x20 * (port))))
+#define _PIDR(port)         (*(volatile uint16_t *)(0x40040006 + (0x20 * (port))))
+#define _PCNTR3(port)       (*(volatile uint32_t *)(0x40040008 + (0x20 * (port))))
+#define _PORR(port)         (*(volatile uint16_t *)(0x40040008 + (0x20 * (port))))
+#define _POSR(port)         (*(volatile uint16_t *)(0x4004000a + (0x20 * (port))))
+#define _PCNTR4(port)       (*(volatile uint32_t *)(0x4004000c + (0x20 * (port))))
+#define _EORR(port)         (*(volatile uint16_t *)(0x4004000c + (0x20 * (port))))
+#define _EOSR(port)         (*(volatile uint16_t *)(0x4004000e + (0x20 * (port))))
+
+#define _PPXXPFS(port, bit)  ((volatile uint32_t *)(0x40040800 + (0x40 * (port)) + (0x4 * (bit))))
+#define _PPCNTR1(port)       ((volatile uint32_t *)(0x40040000 + (0x20 * (port))))
+#define _PPODR(port)         ((volatile uint16_t *)(0x40040000 + (0x20 * (port))))
+#define _PPDR(port)          ((volatile uint16_t *)(0x40040002 + (0x20 * (port))))
+#define _PPCNTR2(port)       ((volatile uint32_t *)(0x40040004 + (0x20 * (port))))
+#define _PEIDR(port)         ((volatile uint16_t *)(0x40040004 + (0x20 * (port))))
+#define _PPIDR(port)         ((volatile uint16_t *)(0x40040006 + (0x20 * (port))))
+#define _PPCNTR3(port)       ((volatile uint32_t *)(0x40040008 + (0x20 * (port))))
+#define _PPORR(port)         ((volatile uint16_t *)(0x40040008 + (0x20 * (port))))
+#define _PPOSR(port)         ((volatile uint16_t *)(0x4004000a + (0x20 * (port))))
+#define _PPCNTR4(port)       ((volatile uint32_t *)(0x4004000c + (0x20 * (port))))
+#define _PEORR(port)         ((volatile uint16_t *)(0x4004000c + (0x20 * (port))))
+#define _PEOSR(port)         ((volatile uint16_t *)(0x4004000e + (0x20 * (port))))
+
+void ra_gpio_config(uint32_t pin, uint32_t mode, uint32_t pull, uint32_t drive, uint32_t alt);
+void ra_gpio_mode_output(uint32_t pin);
+void ra_gpio_mode_input(uint32_t pin);
+void ra_gpio_set(uint32_t pin, uint32_t value);
+uint32_t ra_gpio_get(uint32_t pin);
+void ra_gpio_toggle(uint32_t pin);
+void ra_gpio_write(uint32_t pin, uint32_t value);
+uint32_t ra_gpio_read(uint32_t pin);
+uint32_t ra_gpio_get_mode(uint32_t pin);
+uint32_t ra_gpio_get_pull(uint32_t pin);
+uint32_t ra_gpio_get_af(uint32_t pin);
+uint32_t ra_gpio_get_drive(uint32_t pin);
+
+inline static void pwpr_unprotect(void) {
+    _PWPR &= (uint8_t) ~0x80;
+    _PWPR |= (uint8_t)0x40;
+}
+
+inline static void pwpr_protect(void) {
+    _PWPR &= (uint8_t) ~0x40;
+    _PWPR |= (uint8_t)0x80;
+}
+
+#endif /* RA_RA_GPIO_H_ */
diff --git a/ports/renesas-ra/ra/ra_i2c.c b/ports/renesas-ra/ra/ra_i2c.c
new file mode 100644
index 0000000000000..64bbd6f501b43
--- /dev/null
+++ b/ports/renesas-ra/ra/ra_i2c.c
@@ -0,0 +1,603 @@
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021,2022 Renesas Electronics Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include <stdio.h>
+#include <stdint.h>
+#include "hal_data.h"
+#include "ra_config.h"
+#include "ra_gpio.h"
+#include "ra_icu.h"
+#include "ra_int.h"
+#include "ra_timer.h"
+#include "ra_utils.h"
+#include "ra_i2c.h"
+
+#if !defined(RA_PRI_I2C)
+#define RA_PRI_I2C (8)
+#endif
+
+#if defined(__GNUC__)
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#pragma GCC diagnostic ignored "-Wconversion"
+#pragma GCC diagnostic ignored "-Wimplicit-function-declaration"
+#pragma GCC diagnostic ignored "-Wunused-variable"
+#endif
+
+extern volatile uint32_t uwTick;
+
+static const ra_af_pin_t scl_pins[] = {
+    #if defined(RA4M1)
+
+    { AF_I2C, 0, P204 },
+    { AF_I2C, 0, P400 },
+    { AF_I2C, 0, P408 },
+    { AF_I2C, 1, P100 },
+    { AF_I2C, 1, P205 },
+
+    #elif defined(RA4W1)
+
+    { AF_I2C, 0, P204 },
+    { AF_I2C, 1, P100 },
+    { AF_I2C, 1, P205 },
+
+    #elif defined(RA6M1)
+
+    { AF_I2C, 0, P400 },
+    { AF_I2C, 0, P408 },
+    { AF_I2C, 1, P100 },
+    { AF_I2C, 1, P205 },
+
+    #elif defined(RA6M2)
+
+    { AF_I2C, 0, P204 },
+    { AF_I2C, 0, P400 },
+    { AF_I2C, 0, P408 },
+    { AF_I2C, 1, P100 },
+    { AF_I2C, 1, P205 },
+    { AF_I2C, 2, P512 },
+    #else
+    #error "CMSIS MCU Series is not specified."
+    #endif
+};
+#define SCL_PINS_SIZE sizeof(scl_pins) / sizeof(ra_af_pin_t)
+
+static const ra_af_pin_t sda_pins[] = {
+    #if defined(RA4M1)
+
+    { AF_I2C, 0, P401 },
+    { AF_I2C, 0, P407 },
+    { AF_I2C, 1, P101 },
+    { AF_I2C, 1, P206 },
+
+    #elif defined(RA4W1)
+
+    { AF_I2C, 0, P407 },
+    { AF_I2C, 1, P101 },
+    { AF_I2C, 1, P206 },
+
+    #elif defined(RA6M1)
+
+    { AF_I2C, 0, P401 },
+    { AF_I2C, 0, P407 },
+    { AF_I2C, 1, P101 },
+    { AF_I2C, 1, P206 },
+
+    #elif defined(RA6M2)
+
+    { AF_I2C, 0, P401 },
+    { AF_I2C, 0, P407 },
+    { AF_I2C, 1, P101 },
+    { AF_I2C, 1, P206 },
+    { AF_I2C, 2, P511 },
+
+    #else
+    #error "CMSIS MCU Series is not specified."
+    #endif
+};
+#define SDA_PINS_SIZE sizeof(sda_pins) / sizeof(ra_af_pin_t)
+
+static const uint8_t ra_i2c_ch_to_rxirq[] = {
+    #if defined(VECTOR_NUMBER_IIC0_RXI)
+    VECTOR_NUMBER_IIC0_RXI,
+    #else
+    VECTOR_NUMBER_NONE,
+    #endif
+    #if defined(VECTOR_NUMBER_IIC1_RXI)
+    VECTOR_NUMBER_IIC1_RXI,
+    #else
+    VECTOR_NUMBER_NONE,
+    #endif
+    #if defined(VECTOR_NUMBER_IIC2_RXI)
+    VECTOR_NUMBER_IIC2_RXI,
+    #else
+    VECTOR_NUMBER_NONE,
+    #endif
+};
+static const uint8_t ra_i2c_ch_to_txirq[] = {
+    #if defined(VECTOR_NUMBER_IIC0_TXI)
+    VECTOR_NUMBER_IIC0_TXI,
+    #else
+    VECTOR_NUMBER_NONE,
+    #endif
+    #if defined(VECTOR_NUMBER_IIC1_TXI)
+    VECTOR_NUMBER_IIC1_TXI,
+    #else
+    VECTOR_NUMBER_NONE,
+    #endif
+    #if defined(VECTOR_NUMBER_IIC2_TXI)
+    VECTOR_NUMBER_IIC2_TXI,
+    #else
+    VECTOR_NUMBER_NONE,
+    #endif
+};
+static const uint8_t ra_i2c_ch_to_teirq[] = {
+    #if defined(VECTOR_NUMBER_IIC0_TEI)
+    VECTOR_NUMBER_IIC0_TEI,
+    #else
+    VECTOR_NUMBER_NONE,
+    #endif
+    #if defined(VECTOR_NUMBER_IIC1_TEI)
+    VECTOR_NUMBER_IIC1_TEI,
+    #else
+    VECTOR_NUMBER_NONE,
+    #endif
+    #if defined(VECTOR_NUMBER_IIC2_TEI)
+    VECTOR_NUMBER_IIC2_TEI,
+    #else
+    VECTOR_NUMBER_NONE,
+    #endif
+};
+static const uint8_t ra_i2c_ch_to_erirq[] = {
+    #if defined(VECTOR_NUMBER_IIC0_ERI)
+    VECTOR_NUMBER_IIC0_ERI,
+    #else
+    VECTOR_NUMBER_NONE,
+    #endif
+    #if defined(VECTOR_NUMBER_IIC1_ERI)
+    VECTOR_NUMBER_IIC1_ERI,
+    #else
+    VECTOR_NUMBER_NONE,
+    #endif
+    #if defined(VECTOR_NUMBER_IIC2_ERI)
+    VECTOR_NUMBER_IIC2_ERI,
+    #else
+    VECTOR_NUMBER_NONE,
+    #endif
+};
+
+static xaction_t *current_xaction;
+static xaction_unit_t *current_xaction_unit;
+static bool last_stop;
+static uint8_t pclk_div[8] = {
+    1, 2, 4, 8, 16, 32, 64, 128
+};
+
+static uint32_t R_IIC0_Type_to_ch(R_IIC0_Type *i2c_inst) {
+    if (i2c_inst == R_IIC2) {
+        return 2; /* channel 2 */
+    } else if (i2c_inst == R_IIC1) {
+        return 1; /* channel 1 */
+    } else {
+        return 0; /* channel 0 */
+    }
+}
+
+static R_IIC0_Type *ch_to_R_IIC0_Type(uint32_t ch) {
+    if (ch == 2) {
+        return R_IIC2;
+    } else if (ch == 1) {
+        return R_IIC1;
+    } else {
+        return R_IIC0;
+    }
+}
+
+bool ra_i2c_find_af_ch(uint32_t scl, uint32_t sda, uint8_t *ch) {
+    bool find = false;
+    uint8_t scl_ch;
+    uint8_t sda_ch;
+    find = ra_af_find_ch((ra_af_pin_t *)&scl_pins, SCL_PINS_SIZE, scl, &scl_ch);
+    if (find) {
+        find = ra_af_find_ch((ra_af_pin_t *)&sda_pins, SDA_PINS_SIZE, sda, &sda_ch);
+        if (find) {
+            find = (scl_ch == sda_ch);
+            if (find) {
+                *ch = scl_ch;
+            } else {
+                *ch = 0;
+            }
+        }
+    }
+    return find;
+}
+
+static void ra_i2c_module_start(R_IIC0_Type *i2c_inst) {
+    if (i2c_inst == R_IIC0) {
+        ra_mstpcrb_start(R_MSTP_MSTPCRB_MSTPB9_Msk);
+    } else if (i2c_inst == R_IIC1) {
+        ra_mstpcrb_start(R_MSTP_MSTPCRB_MSTPB8_Msk);
+    } else if (i2c_inst == R_IIC2) {
+        ra_mstpcrb_start(R_MSTP_MSTPCRB_MSTPB7_Msk);
+    }
+}
+
+static void ra_i2c_module_stop(R_IIC0_Type *i2c_inst) {
+    if (i2c_inst == R_IIC0) {
+        ra_mstpcrb_stop(R_MSTP_MSTPCRB_MSTPB9_Msk);
+    } else if (i2c_inst == R_IIC1) {
+        ra_mstpcrb_stop(R_MSTP_MSTPCRB_MSTPB8_Msk);
+    } else if (i2c_inst == R_IIC2) {
+        ra_mstpcrb_stop(R_MSTP_MSTPCRB_MSTPB7_Msk);
+    }
+}
+
+void ra_i2c_irq_enable(R_IIC0_Type *i2c_inst) {
+    uint32_t ch = R_IIC0_Type_to_ch(i2c_inst);
+    R_BSP_IrqEnable((IRQn_Type const)ra_i2c_ch_to_rxirq[ch]);
+    R_BSP_IrqEnable((IRQn_Type const)ra_i2c_ch_to_txirq[ch]);
+    R_BSP_IrqEnable((IRQn_Type const)ra_i2c_ch_to_teirq[ch]);
+    R_BSP_IrqEnable((IRQn_Type const)ra_i2c_ch_to_erirq[ch]);
+}
+
+void ra_i2c_irq_disable(R_IIC0_Type *i2c_inst) {
+    uint32_t ch = R_IIC0_Type_to_ch(i2c_inst);
+    R_BSP_IrqDisable((IRQn_Type const)ra_i2c_ch_to_rxirq[ch]);
+    R_BSP_IrqDisable((IRQn_Type const)ra_i2c_ch_to_txirq[ch]);
+    R_BSP_IrqDisable((IRQn_Type const)ra_i2c_ch_to_teirq[ch]);
+    R_BSP_IrqDisable((IRQn_Type const)ra_i2c_ch_to_erirq[ch]);
+}
+
+void ra_i2c_priority(R_IIC0_Type *i2c_inst, uint32_t ipl) {
+    uint32_t ch = R_IIC0_Type_to_ch(i2c_inst);
+    R_BSP_IrqCfg((IRQn_Type const)ra_i2c_ch_to_rxirq[ch], ipl, (void *)NULL);
+    R_BSP_IrqCfg((IRQn_Type const)ra_i2c_ch_to_txirq[ch], ipl, (void *)NULL);
+    R_BSP_IrqCfg((IRQn_Type const)ra_i2c_ch_to_teirq[ch], ipl, (void *)NULL);
+    R_BSP_IrqCfg((IRQn_Type const)ra_i2c_ch_to_erirq[ch], ipl, (void *)NULL);
+}
+
+void ra_i2c_clear_IR(R_IIC0_Type *i2c_inst) {
+    uint32_t ch = R_IIC0_Type_to_ch(i2c_inst);
+    R_BSP_IrqStatusClear((IRQn_Type const)ra_i2c_ch_to_rxirq[ch]);
+    R_BSP_IrqStatusClear((IRQn_Type const)ra_i2c_ch_to_txirq[ch]);
+    R_BSP_IrqStatusClear((IRQn_Type const)ra_i2c_ch_to_teirq[ch]);
+    R_BSP_IrqStatusClear((IRQn_Type const)ra_i2c_ch_to_erirq[ch]);
+}
+
+// ToDo: need to properly implement
+static void ra_i2c_clock_calc(uint32_t baudrate, uint8_t *cks, uint8_t *brh, uint8_t *brl);
+static void ra_i2c_clock_calc(uint32_t baudrate, uint8_t *cks, uint8_t *brh, uint8_t *brl) {
+    #if defined(RA4M1)
+    if (baudrate >= 400000) {
+        // assume clock is 400000Hz (PCLKB 32MHz)
+        *cks = 1;
+        *brh = 9;
+        *brl = 20;
+    } else {
+        // assume clock is 100000Hz (PCLKB 32MHz)
+        *cks = 3;
+        *brh = 15;
+        *brl = 18;
+    }
+    #elif defined(RA4W1)
+    if (baudrate >= 400000) {
+        // assume clock is 400000Hz (PCLKB 32MHz)
+        *cks = 1;
+        *brh = 9;
+        *brl = 20;
+    } else {
+        // assume clock is 100000Hz (PCLKB 32MHz)
+        *cks = 3;
+        *brh = 15;
+        *brl = 18;
+    }
+    #elif defined(RA6M1)
+    // PCLKB 60MHz SCLE=0
+    if (baudrate >= 1000000) {
+        *cks = 0;
+        *brh = 15;
+        *brl = 29;
+    } else if (baudrate >= 400000) {
+        // assume clock is 400000Hz (PCLKB 32MHz)
+        *cks = 2;
+        *brh = 8;
+        *brl = 19;
+    } else {
+        // assume clock is 100000Hz (PCLKB 32MHz)
+        *cks = 4;
+        *brh = 14;
+        *brl = 17;
+    }
+    #elif defined(RA6M2)
+    // PCLKB 60MHz SCLE=0
+    if (baudrate >= RA_I2C_CLOCK_MAX) {
+        *cks = 0;
+        *brh = 15;
+        *brl = 29;
+    } else if (baudrate >= 400000) {
+        // assume clock is 400000Hz
+        *cks = 2;
+        *brh = 8;
+        *brl = 19;
+    } else {
+        // assume clock is 100000Hz
+        *cks = 4;
+        *brh = 14;
+        *brl = 17;
+    }
+    #else
+    #error "CMSIS MCU Series is not specified."
+    #endif
+}
+
+void ra_i2c_set_baudrate(R_IIC0_Type *i2c_inst, uint32_t baudrate) {
+    uint8_t cks;
+    uint8_t brh;
+    uint8_t brl;
+    ra_i2c_clock_calc(baudrate, &cks, &brh, &brl);
+    i2c_inst->ICMR1_b.CKS = cks;
+    i2c_inst->ICBRH_b.BRH = brh;
+    i2c_inst->ICBRL_b.BRL = brl;
+}
+
+void ra_i2c_init(R_IIC0_Type *i2c_inst, uint32_t scl, uint32_t sda, uint32_t baudrate) {
+    ra_i2c_module_start(i2c_inst);
+    ra_gpio_config(scl, GPIO_MODE_AF_OD, 0, GPIO_NOTOUCH_POWER, AF_I2C);
+    ra_gpio_config(sda, GPIO_MODE_AF_OD, 0, GPIO_NOTOUCH_POWER, AF_I2C);
+    ra_i2c_priority(i2c_inst, RA_PRI_I2C);
+    i2c_inst->ICCR1_b.ICE = 0;     // I2C disable
+    i2c_inst->ICCR1_b.IICRST = 1;  // I2C internal reset
+    i2c_inst->ICIER = 0x00;        // I2C disable all interrupts
+    while (i2c_inst->ICIER != 0) {
+        ;
+    }
+    ra_i2c_clear_IR(i2c_inst);     // clear IR
+    i2c_inst->ICCR1_b.ICE = 1;     // I2C enable
+    ra_i2c_set_baudrate(i2c_inst, baudrate);
+    i2c_inst->ICSER = 0x00;         // I2C reset bus status enable register
+    i2c_inst->ICMR3_b.ACKWP = 0x01; // I2C allow to write ACKBT (transfer acknowledge bit)
+    i2c_inst->ICIER = 0xFF;         // Enable all interrupts
+    i2c_inst->ICCR1_b.IICRST = 0;   // I2C internal reset
+    ra_i2c_irq_enable(i2c_inst);
+    last_stop = true;
+    return;
+}
+
+void ra_i2c_deinit(R_IIC0_Type *i2c_inst) {
+    i2c_inst->ICIER = 0;        // I2C interrupt disable
+    i2c_inst->ICCR1_b.ICE = 0;  // I2C disable
+    ra_i2c_module_stop(i2c_inst);
+    return;
+}
+
+void ra_i2c_xaction_start(R_IIC0_Type *i2c_inst, xaction_t *action, bool repeated_start) {
+    uint32_t timeout;
+
+    if (last_stop == false) {
+        i2c_inst->ICSR2_b.START = 0;
+        i2c_inst->ICCR2_b.RS = 1;
+        return; /* We still keep I2C bus */
+    }
+    timeout = RA_I2C_TIMEOUT_BUS_BUSY;
+    while (i2c_inst->ICCR2_b.BBSY) {
+        if (timeout-- == 0) {
+            action->m_status = RA_I2C_STATUS_Stopped;
+            action->m_error = RA_I2C_ERROR_BUSY;
+            return;
+        }
+    }
+    i2c_inst->ICCR2_b.ST = 1;  // I2C start condition
+}
+
+void ra_i2c_xaction_stop() {
+    last_stop = current_xaction->m_stop;
+}
+
+void ra_i2c_xunit_write_byte(R_IIC0_Type *i2c_inst, xaction_unit_t *unit) {
+    i2c_inst->ICDRT = unit->buf[unit->m_bytes_transferred];
+    ++unit->m_bytes_transferred;
+    --unit->m_bytes_transfer;
+}
+
+void ra_i2c_xunit_read_byte(R_IIC0_Type *i2c_inst, xaction_unit_t *unit) {
+    uint8_t data = i2c_inst->ICDRR;
+    unit->buf[unit->m_bytes_transferred] = data;
+    ++unit->m_bytes_transferred;
+    --unit->m_bytes_transfer;
+}
+
+void ra_i2c_xunit_init(xaction_unit_t *unit, uint8_t *buf, uint32_t size, bool fread, void *next) {
+    unit->m_bytes_transferred = 0;
+    unit->m_bytes_transfer = size;
+    unit->m_fread = fread;
+    unit->buf = buf;
+    unit->next = (void *)next;
+}
+
+void ra_i2c_xaction_init(xaction_t *action, xaction_unit_t *units, uint32_t size, uint32_t address, bool stop) {
+    action->units = units;
+    action->m_num_of_units = size;
+    action->m_current = 0;
+    action->m_address = (((address << 1) & 0xFE) | (units->m_fread ? 0x1 : 0x0));
+    action->m_status = RA_I2C_STATUS_Idle;
+    action->m_error = RA_I2C_ERROR_OK;
+    action->m_stop = stop;
+}
+
+static void ra_i2c_iceri_isr(R_IIC0_Type *i2c_inst) {
+    xaction_t *action = current_xaction;
+    if (i2c_inst->ICSR2_b.TMOF != 0) {
+        action->m_error = RA_I2C_ERROR_TMOF;
+        i2c_inst->ICSR2_b.TMOF = 0;
+        i2c_inst->ICCR2_b.SP = 1; // request stop condition
+    }
+    if (i2c_inst->ICSR2_b.AL != 0) {
+        action->m_error = RA_I2C_ERROR_AL;
+        i2c_inst->ICSR2_b.AL = 0;
+        i2c_inst->ICCR2_b.SP = 1; // request stop condition
+    }
+    // Check Start
+    if (i2c_inst->ICSR2_b.START != 0) {
+        action->m_status = RA_I2C_STATUS_Started;
+        i2c_inst->ICSR2_b.START = 0;
+    }
+    // Check Stop
+    if (i2c_inst->ICSR2_b.STOP != 0) {
+        action->m_status = RA_I2C_STATUS_Stopped;
+        i2c_inst->ICSR2_b.STOP = 0;
+        i2c_inst->ICSR2_b.NACKF = 0; // clear for next transaction
+    }
+    // Check NACK reception
+    if (i2c_inst->ICSR2_b.NACKF != 0) {
+        action->m_error = RA_I2C_ERROR_NACK;
+        i2c_inst->ICSR2_b.NACKF = 0;
+        i2c_inst->ICCR2_b.SP = 1; // request stop condition
+    }
+}
+
+static void ra_i2c_icrxi_isr(R_IIC0_Type *i2c_inst) {
+    xaction_unit_t *unit = current_xaction_unit;
+    xaction_t *action = current_xaction;
+    if (action->m_status == RA_I2C_STATUS_AddrWriteCompleted) {
+        (void)i2c_inst->ICDRR; // dummy read
+        action->m_status = RA_I2C_STATUS_FirstReceiveCompleted;
+        return;
+    }
+    if (unit->m_bytes_transfer > 2) {
+        if (unit->m_bytes_transfer == 3) {
+            i2c_inst->ICMR3_b.WAIT = 1;
+        }
+        ra_i2c_xunit_read_byte(i2c_inst, unit);
+    } else if (unit->m_bytes_transfer == 2) {
+        i2c_inst->ICMR3_b.ACKBT = 1;
+        ra_i2c_xunit_read_byte(i2c_inst, unit);
+    } else {
+        // last data
+        action->m_status = RA_I2C_STATUS_LastReceiveCompleted;
+        if (action->m_stop == true) {
+            i2c_inst->ICCR2_b.SP = 1; // request top condition
+        }
+        ra_i2c_xunit_read_byte(i2c_inst, unit);
+    }
+}
+
+static void ra_i2c_ictxi_isr(R_IIC0_Type *i2c_inst) {
+    xaction_t *action = current_xaction;
+    xaction_unit_t *unit = current_xaction_unit;
+
+    if (action->m_status == RA_I2C_STATUS_Started) {
+        i2c_inst->ICDRT = action->m_address;  // I2C send slave address
+        action->m_status = RA_I2C_STATUS_AddrWriteCompleted;
+        return;
+    }
+    if (action->m_status == RA_I2C_STATUS_AddrWriteCompleted &&
+        unit->m_fread == false) {
+        if (unit->m_bytes_transfer != 0) {
+            ra_i2c_xunit_write_byte(i2c_inst, unit);
+        } else {
+            if (unit->next == (void *)NULL) {
+                action->m_status = RA_I2C_STATUS_DataWriteCompleted;
+            } else {
+                current_xaction_unit = (xaction_unit_t *)unit->next;
+                if (current_xaction_unit->m_bytes_transfer == 0) {
+                    action->m_status = RA_I2C_STATUS_DataWriteCompleted;
+                }
+            }
+        }
+        return;
+    }
+}
+
+static void ra_i2c_ictei_isr(R_IIC0_Type *i2c_inst) {
+    xaction_t *action = current_xaction;
+    i2c_inst->ICSR2_b.TEND = 0;
+    action->m_current++;
+    if (action->m_current == action->m_num_of_units) {
+        // We wrote all data and received transfer end, so request stop condition
+        if (action->m_stop == true) {
+            action->m_status = RA_I2C_STATUS_DataSendCompleted;
+            i2c_inst->ICCR2_b.SP = 1;
+        } else {
+            action->m_status = RA_I2C_STATUS_Stopped; // set Stopped status insted STOP condition
+        }
+    } else {
+        ra_i2c_xaction_start(i2c_inst, action, true);
+    }
+}
+
+void iic_master_rxi_isr(void) {
+    IRQn_Type irq = R_FSP_CurrentIrqGet();
+    uint8_t ch = irq_to_ch[(uint32_t)irq];
+    ra_i2c_icrxi_isr(ch_to_R_IIC0_Type(ch));
+    R_BSP_IrqStatusClear(irq);
+}
+
+void iic_master_txi_isr(void) {
+    IRQn_Type irq = R_FSP_CurrentIrqGet();
+    uint8_t ch = irq_to_ch[(uint32_t)irq];
+    ra_i2c_ictxi_isr(ch_to_R_IIC0_Type(ch));
+    R_BSP_IrqStatusClear(irq);
+}
+
+void iic_master_tei_isr(void) {
+    IRQn_Type irq = R_FSP_CurrentIrqGet();
+    uint8_t ch = irq_to_ch[(uint32_t)irq];
+    ra_i2c_ictei_isr(ch_to_R_IIC0_Type(ch));
+    R_BSP_IrqStatusClear(irq);
+}
+
+void iic_master_eri_isr(void) {
+    IRQn_Type irq = R_FSP_CurrentIrqGet();
+    uint8_t ch = irq_to_ch[(uint32_t)irq];
+    ra_i2c_iceri_isr(ch_to_R_IIC0_Type(ch));
+    R_BSP_IrqStatusClear(irq);
+}
+
+bool ra_i2c_action_execute(R_IIC0_Type *i2c_inst, xaction_t *action, bool repeated_start, uint32_t timeout_ms) {
+    bool flag = false;
+    uint32_t start = uwTick;
+
+    current_xaction = action;
+    current_xaction_unit = action->units;
+
+    ra_i2c_xaction_start(i2c_inst, action, repeated_start);
+    while (true) {
+        if (action->m_status == RA_I2C_STATUS_Stopped) {
+            if (action->m_error == RA_I2C_ERROR_OK) {
+                flag = true;
+            }
+            break;
+        }
+        if (uwTick - start > timeout_ms) {
+            break;
+        }
+    }
+    ra_i2c_xaction_stop();
+    if (last_stop == true) {
+        mp_hal_delay_ms(3);  // avoid device busy of next access.
+    }
+    current_xaction = (xaction_t *)NULL;
+    current_xaction_unit = (xaction_unit_t *)NULL;
+
+    return flag;
+}
diff --git a/ports/renesas-ra/ra/ra_i2c.h b/ports/renesas-ra/ra/ra_i2c.h
new file mode 100644
index 0000000000000..93a170ab8a678
--- /dev/null
+++ b/ports/renesas-ra/ra/ra_i2c.h
@@ -0,0 +1,99 @@
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Renesas Electronics Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#ifndef RA_RA_I2C_H_
+#define RA_RA_I2C_H_
+
+#include <stdint.h>
+#include <stdbool.h>
+
+#define RA_I2C_DEF_TIMEOUT              1000    // 1000 ms
+#define RA_I2C_TIMEOUT_STOP_CONDITION   100000  // counts
+#define RA_I2C_TIMEOUT_BUS_BUSY         100000  // counts
+#define RA_I2C_CLOCK_MAX                1000000 // counts
+
+typedef enum
+{
+    RA_I2C_STATUS_Idle = 1,
+    RA_I2C_STATUS_Started = 2,
+    RA_I2C_STATUS_AddrWriteCompleted = 3,
+    RA_I2C_STATUS_DataWriteCompleted = 4,
+    RA_I2C_STATUS_DataSendCompleted = 5,
+    RA_I2C_STATUS_FirstReceiveCompleted = 5,
+    RA_I2C_STATUS_LastReceiveCompleted = 6,
+    RA_I2C_STATUS_Stopped = 7,
+} xaction_status_t;
+
+typedef enum
+{
+    RA_I2C_ERROR_OK = 0,
+    RA_I2C_ERROR_TMOF = 1,
+    RA_I2C_ERROR_AL = 2,
+    RA_I2C_ERROR_NACK = 3,
+    RA_I2C_ERROR_BUSY = 4,
+} xaction_error_t;
+
+typedef struct {
+    volatile uint32_t m_bytes_transferred;
+    volatile uint32_t m_bytes_transfer;
+    bool m_fread;
+    uint8_t *buf;
+    void *next;
+} xaction_unit_t;
+
+typedef struct {
+    xaction_unit_t *units;
+    uint32_t m_num_of_units;
+    uint32_t m_current;
+    uint32_t m_address;
+    volatile xaction_status_t m_status;
+    xaction_error_t m_error;
+    bool m_stop;
+} xaction_t;
+
+bool ra_i2c_find_af_ch(uint32_t scl, uint32_t sda, uint8_t *ch);
+void ra_i2c_irq_enable(R_IIC0_Type *i2c_inst);
+void ra_i2c_irq_disable(R_IIC0_Type *i2c_inst);
+void ra_i2c_priority(R_IIC0_Type *i2c_inst, uint32_t ipl);
+void ra_i2c_set_baudrate(R_IIC0_Type *i2c_inst, uint32_t baudrate);
+void ra_i2c_clear_IR(R_IIC0_Type *i2c_inst);
+void ra_i2c_init(R_IIC0_Type *i2c_inst, uint32_t scl, uint32_t sda, uint32_t baudrate);
+void ra_i2c_deinit(R_IIC0_Type *i2c_inst);
+void ra_i2c_read_last_byte(R_IIC0_Type *i2c_inst);
+void ra_i2c_stop_condition(R_IIC0_Type *i2c_inst);
+void ra_i2c_abort(R_IIC0_Type *i2c_inst);
+void ra_i2c_xaction_start(R_IIC0_Type *i2c_inst, xaction_t *xaction, bool repeated_start);
+void ra_i2c_xaction_stop(void);
+void ra_i2c_get_clock(uint32_t rateKhz, uint8_t *clockRate, uint8_t *clockRate2);
+void ra_i2c_xunit_write_byte(R_IIC0_Type *i2c_inst, xaction_unit_t *unit);
+void ra_i2c_xunit_read_byte(R_IIC0_Type *i2c_inst, xaction_unit_t *unit);
+void ra_i2c_xunit_init(xaction_unit_t *unit, uint8_t *buf, uint32_t size, bool fread, void *next);
+void ra_i2c_xaction_init(xaction_t *action, xaction_unit_t *units, uint32_t size, uint32_t address, bool stop);
+void iic_master_rxi_isr(void);
+void iic_master_txi_isr(void);
+void iic_master_tei_isr(void);
+void iic_master_eri_isr(void);
+bool ra_i2c_action_execute(R_IIC0_Type *i2c_inst, xaction_t *action, bool repeated_start, uint32_t timeout_ms);
+
+#endif /* RA_RA_I2C_H_ */
diff --git a/ports/renesas-ra/ra/ra_icu.c b/ports/renesas-ra/ra/ra_icu.c
new file mode 100644
index 0000000000000..000667b4c6732
--- /dev/null
+++ b/ports/renesas-ra/ra/ra_icu.c
@@ -0,0 +1,750 @@
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Renesas Electronics Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include <stdio.h>
+#include <stdint.h>
+#include <stdbool.h>
+#include "hal_data.h"
+#include "ra_config.h"
+#include "ra_gpio.h"
+#include "ra_int.h"
+#include "ra_timer.h"
+#include "ra_icu.h"
+
+#define DEFAULT_BOUNCE_PERIOD (200) /* 200ms */
+
+#if !defined(RA_PRI_EXTIT)
+#define RA_PRI_EXTINT (14)
+#endif
+
+static R_ICU_Type *icu_reg = (R_ICU_Type *)0x40006000;
+
+enum
+{
+    #if defined(VECTOR_NUMBER_ICU_IRQ0)
+    IRQ0_IDX,
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ1)
+    IRQ1_IDX,
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ2)
+    IRQ2_IDX,
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ3)
+    IRQ3_IDX,
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ4)
+    IRQ4_IDX,
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ5)
+    IRQ5_IDX,
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ6)
+    IRQ6_IDX,
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ7)
+    IRQ7_IDX,
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ8)
+    IRQ8_IDX,
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ9)
+    IRQ9_IDX,
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ10)
+    IRQ10_IDX,
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ11)
+    IRQ11_IDX,
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ12)
+    IRQ12_IDX,
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ13)
+    IRQ13_IDX,
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ14)
+    IRQ14_IDX,
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ15)
+    IRQ15_IDX,
+    #endif
+    IRQ_IDX_MAX,
+};
+
+static const ra_icu_pin_t ra_irq_pins[] = {
+    #if defined(RA4W1)
+
+    #if defined(VECTOR_NUMBER_ICU_IRQ0)
+    { 0, P105 },
+    { 0, P206 },
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ1)
+    { 1, P101 },
+    { 1, P104 },
+    { 1, P205 },
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ2)
+    { 2, P100 },
+    { 2, P213 },
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ3)
+    { 3, P004 },
+    { 3, P110 },
+    { 3, P212 },
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ4)
+    { 4, P111 },
+    { 4, P402 },
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ6)
+    { 6, P409 },
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ7)
+    { 7, P015 },
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ9)
+    { 9, P414 },
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ11)
+    { 11, P501 },
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ14)
+    { 14, P010 },
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ15)
+    { 15, P011 },
+    #endif
+
+    #elif defined(RA4M1)
+
+    #if defined(VECTOR_NUMBER_ICU_IRQ0)
+    { 0, P105 },
+    { 0, P206 },
+    { 0, P400 },
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ1)
+    { 1, P101 },
+    { 1, P104 },
+    { 1, P205 },
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ2)
+    { 2, P002 },
+    { 2, P100 },
+    { 2, P213 },
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ3)
+    { 3, P004 },
+    { 3, P110 },
+    { 3, P212 },
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ4)
+    { 4, P111 },
+    { 4, P411 },
+    { 4, P402 },
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ5)
+    { 5, P302 },
+    { 5, P410 },
+    { 5, P401 },
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ6)
+    { 6, P000 },
+    { 6, P301 },
+    { 6, P409 },
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ7)
+    { 7, P001 },
+    { 7, P015 },
+    { 7, P408 },
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ8)
+    { 8, P305 },
+    { 8, P415 },
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ9)
+    { 9, P304 },
+    { 9, P414 },
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ10)
+    { 10, P005 },
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ11)
+    { 11, P501 },
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ12)
+    { 12, P502 },
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ14)
+    { 14, P505 },
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ15)
+    { 15, P011 },
+    #endif
+
+    #elif defined(RA6M1)
+
+    #if defined(VECTOR_NUMBER_ICU_IRQ0)
+    { 0, P105 },
+    { 0, P206 }, /* DS */
+    { 0, P400 },
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ1)
+    { 1, P101 },
+    { 1, P104 },
+    { 1, P205 }, /* DS */
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ2)
+    { 2, P100 },
+    { 2, P213 },
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ3)
+    { 3, P110 },
+    { 3, P212 },
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ4)
+    { 4, P111 },
+    { 4, P402 }, /* DS */
+    { 4, P411 },
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ5)
+    { 5, P302 },
+    { 5, P401 }, /* DS */
+    { 5, P410 },
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ6)
+    { 6, P000 }, /* DS */
+    { 6, P301 },
+    { 6, P409 },
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ7)
+    { 7, P001 }, /* DS */
+    { 7, P408 },
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ8)
+    { 8, P002 }, /* DS */
+    { 8, P305 },
+    { 8, P415 },
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ9)
+    { 9, P004 }, /*  DS */
+    { 9, P304 },
+    { 9, P414 },
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ10)
+    { 10, P005 }, /* DS */
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ11)
+    { 11, P006 }, /* DS */
+    { 11, P501 },
+    { 11, P708 },
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ12)
+    { 12, P008 }, /* DS */
+    { 12, P502 },
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ13)
+    { 13, P015 },
+    #endif
+
+    #elif defined(RA6M2)
+
+    #if defined(VECTOR_NUMBER_ICU_IRQ0)
+    { 0, P105 },
+    { 0, P206 }, /* DS */
+    { 0, P400 },
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ1)
+    { 1, P101 },
+    { 1, P104 },
+    { 1, P205 }, /* DS */
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ2)
+    { 2, P100 },
+    { 2, P213 },
+    { 2, P203 }, /* DS */
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ3)
+    { 3, P110 },
+    { 3, P212 },
+    { 3, P202 }, /* DS */
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ4)
+    { 4, P111 },
+    { 4, P402 }, /* DS */
+    { 4, P411 },
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ5)
+    { 5, P302 },
+    { 5, P401 }, /* DS */
+    { 5, P410 },
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ6)
+    { 6, P000 }, /* DS */
+    { 6, P301 },
+    { 6, P409 },
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ7)
+    { 7, P001 }, /* DS */
+    { 7, P408 },
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ8)
+    { 8, P002 }, /* DS */
+    { 8, P305 },
+    { 8, P415 },
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ9)
+    { 9, P004 }, /*  DS */
+    { 9, P304 },
+    { 9, P414 },
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ10)
+    { 10, P005 }, /* DS */
+    { 10, P709 },
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ11)
+    { 11, P006 }, /* DS */
+    { 11, P501 },
+    { 11, P708 },
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ12)
+    { 12, P008 }, /* DS */
+    { 12, P502 },
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ13)
+    { 13, P009 }, /* DS */
+    { 13, P015 },
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ14)
+    { 14, P505 },
+    { 14, P512 },
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ15)
+    { 15, P506 },
+    { 15, P511 },
+    #endif
+
+    #else
+    #error "CMSIS MCU Series is not speficied."
+    #endif
+};
+#define ICU_PINS_SIZE (sizeof(ra_irq_pins) / sizeof(ra_icu_pin_t))
+
+static const uint32_t idx_to_irq_vec[] = {
+    #if defined(VECTOR_NUMBER_ICU_IRQ0)
+    VECTOR_NUMBER_ICU_IRQ0,
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ1)
+    VECTOR_NUMBER_ICU_IRQ1,
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ2)
+    VECTOR_NUMBER_ICU_IRQ2,
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ3)
+    VECTOR_NUMBER_ICU_IRQ3,
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ4)
+    VECTOR_NUMBER_ICU_IRQ4,
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ5)
+    VECTOR_NUMBER_ICU_IRQ5,
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ6)
+    VECTOR_NUMBER_ICU_IRQ6,
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ7)
+    VECTOR_NUMBER_ICU_IRQ7,
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ8)
+    VECTOR_NUMBER_ICU_IRQ8,
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ9)
+    VECTOR_NUMBER_ICU_IRQ9,
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ10)
+    VECTOR_NUMBER_ICU_IRQ10,
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ11)
+    VECTOR_NUMBER_ICU_IRQ11,
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ12)
+    VECTOR_NUMBER_ICU_IRQ12,
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ13)
+    VECTOR_NUMBER_ICU_IRQ13,
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ14)
+    VECTOR_NUMBER_ICU_IRQ14,
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ15)
+    VECTOR_NUMBER_ICU_IRQ15,
+    #endif
+};
+
+static const uint8_t irq_no_to_idx[] = {
+    #if defined(VECTOR_NUMBER_ICU_IRQ0)
+    IRQ0_IDX,
+    #else
+    IRQ_IDX_MAX,
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ1)
+    IRQ1_IDX,
+    #else
+    IRQ_IDX_MAX,
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ2)
+    IRQ2_IDX,
+    #else
+    IRQ_IDX_MAX,
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ3)
+    IRQ3_IDX,
+    #else
+    IRQ_IDX_MAX,
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ4)
+    IRQ4_IDX,
+    #else
+    IRQ_IDX_MAX,
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ5)
+    IRQ5_IDX,
+    #else
+    IRQ_IDX_MAX,
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ6)
+    IRQ6_IDX,
+    #else
+    IRQ_IDX_MAX,
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ7)
+    IRQ7_IDX,
+    #else
+    IRQ_IDX_MAX,
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ8)
+    IRQ8_IDX,
+    #else
+    IRQ_IDX_MAX,
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ9)
+    IRQ9_IDX,
+    #else
+    IRQ_IDX_MAX,
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ10)
+    IRQ10_IDX,
+    #else
+    IRQ_IDX_MAX,
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ11)
+    IRQ11_IDX,
+    #else
+    IRQ_IDX_MAX,
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ12)
+    IRQ12_IDX,
+    #else
+    IRQ_IDX_MAX,
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ13)
+    IRQ13_IDX,
+    #else
+    IRQ_IDX_MAX,
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ14)
+    IRQ14_IDX,
+    #else
+    IRQ_IDX_MAX,
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ15)
+    IRQ15_IDX,
+    #else
+    IRQ_IDX_MAX,
+    #endif
+};
+
+static const uint8_t irq_no_to_irq_vec[] = {
+    #if defined(VECTOR_NUMBER_ICU_IRQ0)
+    VECTOR_NUMBER_ICU_IRQ0,
+    #else
+    VECTOR_NUMBER_NONE,
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ1)
+    VECTOR_NUMBER_ICU_IRQ1,
+    #else
+    VECTOR_NUMBER_NONE,
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ2)
+    VECTOR_NUMBER_ICU_IRQ2,
+    #else
+    VECTOR_NUMBER_NONE,
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ3)
+    VECTOR_NUMBER_ICU_IRQ3,
+    #else
+    VECTOR_NUMBER_NONE,
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ4)
+    VECTOR_NUMBER_ICU_IRQ4,
+    #else
+    VECTOR_NUMBER_NONE,
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ5)
+    VECTOR_NUMBER_ICU_IRQ5,
+    #else
+    VECTOR_NUMBER_NONE,
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ6)
+    VECTOR_NUMBER_ICU_IRQ6,
+    #else
+    VECTOR_NUMBER_NONE,
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ7)
+    VECTOR_NUMBER_ICU_IRQ7,
+    #else
+    VECTOR_NUMBER_NONE,
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ8)
+    VECTOR_NUMBER_ICU_IRQ8,
+    #else
+    VECTOR_NUMBER_NONE,
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ9)
+    VECTOR_NUMBER_ICU_IRQ9,
+    #else
+    VECTOR_NUMBER_NONE,
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ10)
+    VECTOR_NUMBER_ICU_IRQ10,
+    #else
+    VECTOR_NUMBER_NONE,
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ11)
+    VECTOR_NUMBER_ICU_IRQ11,
+    #else
+    VECTOR_NUMBER_NONE,
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ12)
+    VECTOR_NUMBER_ICU_IRQ12,
+    #else
+    VECTOR_NUMBER_NONE,
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ13)
+    VECTOR_NUMBER_ICU_IRQ13,
+    #else
+    VECTOR_NUMBER_NONE,
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ14)
+    VECTOR_NUMBER_ICU_IRQ14,
+    #else
+    VECTOR_NUMBER_NONE,
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ15)
+    VECTOR_NUMBER_ICU_IRQ15,
+    #else
+    VECTOR_NUMBER_NONE,
+    #endif
+};
+static ICU_CB icu_cbs[IRQ_IDX_MAX];
+static void *icu_params[IRQ_IDX_MAX];
+static bool bounce_flag[IRQ_IDX_MAX];
+static uint32_t bounce_period[IRQ_IDX_MAX];
+static uint32_t bounce_start[IRQ_IDX_MAX];
+
+bool ra_icu_find_irq_no(uint32_t pin, uint8_t *irq_no) {
+    ra_icu_pin_t *icu_pin = (ra_icu_pin_t *)&ra_irq_pins;
+    uint32_t size = (uint32_t)ICU_PINS_SIZE;
+    bool find = false;
+    uint32_t i;
+    for (i = 0; i < size; i++) {
+        if (icu_pin->pin == pin) {
+            find = true;
+            *irq_no = icu_pin->irq_no;
+            break;
+        }
+        icu_pin++;
+    }
+    return find;
+}
+
+static void ra_icu_irq_no(uint8_t irq_no, bool enable) {
+    uint8_t irq_vec = irq_no_to_irq_vec[irq_no];
+    if (irq_vec != VECTOR_NUMBER_NONE) {
+        if (enable) {
+            R_BSP_IrqCfg((IRQn_Type const)irq_vec, (uint32_t)RA_PRI_EXTINT, (void *)NULL);
+            R_BSP_IrqEnable((IRQn_Type const)irq_vec);
+        } else {
+            R_BSP_IrqDisable((IRQn_Type const)irq_vec);
+        }
+    }
+}
+
+void ra_icu_set_pin(uint32_t pin, bool irq_enable, bool pullup) {
+    uint32_t port = GPIO_PORT(pin);
+    uint32_t bit = GPIO_BIT(pin);
+    uint32_t pfs = _PXXPFS(port, bit);
+    pwpr_unprotect();
+    pfs &= ~PMR_MASK; /* GPIO */
+    pfs &= ~PDR_MASK; /* input */
+    if (irq_enable) {
+        pfs |= ISEL_MASK; /* set pullup */
+    } else {
+        pfs &= ~ISEL_MASK; /* clear pullup */
+    }
+    if (pullup) {
+        pfs |= PCR_MASK; /* set pullup */
+    } else {
+        pfs &= ~PCR_MASK; /* clear pullup */
+    }
+    _PXXPFS(port, bit) = pfs;
+    pwpr_protect();
+}
+
+static void ra_icu_pin(uint32_t pin, bool enable) {
+    bool find = false;
+    uint8_t irq_no;
+    find = ra_icu_find_irq_no(pin, &irq_no);
+    if (find) {
+        ra_icu_irq_no(irq_no, enable);
+    }
+}
+
+void ra_icu_enable_irq_no(uint8_t irq_no) {
+    ra_icu_irq_no(irq_no, true);
+}
+
+void ra_icu_disable_irq_no(uint8_t irq_no) {
+    ra_icu_irq_no(irq_no, false);
+}
+
+void ra_icu_enable_pin(uint32_t pin) {
+    ra_icu_pin(pin, true);
+}
+
+void ra_icu_disable_pin(uint32_t pin) {
+    ra_icu_pin(pin, false);
+}
+
+void ra_icu_priority_irq_no(uint8_t irq_no, uint32_t ipl) {
+    uint8_t irq_vec = (uint8_t)idx_to_irq_vec[irq_no];
+    R_BSP_IrqCfg((IRQn_Type const)irq_vec, ipl, (void *)NULL);
+}
+
+void ra_icu_priority_pin(uint32_t pin, uint32_t ipl) {
+    bool find = false;
+    uint8_t irq_no;
+    find = ra_icu_find_irq_no(pin, &irq_no);
+    if (find) {
+        ra_icu_priority_irq_no(irq_no, ipl);
+    }
+}
+
+void ra_icu_set_callback(uint8_t irq_no, ICU_CB func, void *param) {
+    uint8_t idx = irq_no_to_idx[irq_no];
+    if (idx != IRQ_IDX_MAX) {
+        icu_cbs[idx] = func;
+        icu_params[idx] = param;
+    }
+}
+
+static void ra_icu_callback(uint8_t irq_no) {
+    uint8_t idx = irq_no_to_idx[irq_no];
+    if (idx != IRQ_IDX_MAX) {
+        if (bounce_flag[idx]) {
+            if ((mtick() - bounce_start[idx]) > bounce_period[idx]) {
+                bounce_flag[idx] = false;
+            } else {
+                return;
+            }
+        }
+        if (icu_cbs[idx] != NULL) {
+            if (!bounce_flag[idx]) {
+                bounce_start[idx] = mtick();
+                bounce_flag[idx] = true;
+                (*icu_cbs[idx])(icu_params[idx]);
+            }
+        }
+    }
+}
+
+/*
+ * pin: cpu pin
+ * irq_no: IRQ number
+ * cond: 0: falling, 1: rising, 2: both edge, 3 low level
+ */
+void ra_icu_trigger_irq_no(uint8_t irq_no, uint32_t cond) {
+    icu_reg->IRQCR_b[irq_no].IRQMD = (uint8_t)cond;
+}
+
+void ra_icu_trigger_pin(uint32_t pin, uint32_t cond) {
+    bool find = false;
+    uint8_t irq_no;
+    find = ra_icu_find_irq_no(pin, &irq_no);
+    if (find) {
+        ra_icu_trigger_irq_no(irq_no, cond);
+    }
+}
+
+void ra_icu_set_bounce(uint8_t irq_no, uint32_t bounce) {
+    uint8_t idx = irq_no_to_idx[irq_no];
+    if (idx != IRQ_IDX_MAX) {
+        bounce_period[idx] = bounce;
+    }
+}
+
+static void ra_icu_bounce_init(void) {
+    uint32_t idx;
+    for (idx = 0; idx < IRQ_IDX_MAX; idx++) {
+        bounce_flag[idx] = false;
+        bounce_period[idx] = DEFAULT_BOUNCE_PERIOD;
+    }
+}
+
+void ra_icu_init(void) {
+    ra_icu_bounce_init();
+}
+
+void ra_icu_deinit(void) {
+    uint32_t idx;
+    for (idx = 0; idx < IRQ_IDX_MAX; idx++) {
+        R_BSP_IrqDisable(idx_to_irq_vec[idx]);
+    }
+}
+
+void ra_icu_swint(uint8_t irq_no) {
+    // RA MCU doesn't support STM32 EXTINT SWINT
+    // just call callback function
+    uint8_t idx = irq_no_to_idx[irq_no];
+    if (icu_cbs[idx] != NULL) {
+        (*icu_cbs[idx])(icu_params[idx]);
+    }
+}
+
+__WEAK void r_icu_isr(void) {
+    IRQn_Type irq = R_FSP_CurrentIrqGet();
+    uint32_t irq_no = (uint32_t)irq_to_ch[(uint32_t)irq];
+    R_BSP_IrqStatusClear(irq);
+    ra_icu_callback(irq_no);
+}
diff --git a/ports/renesas-ra/ra/ra_icu.h b/ports/renesas-ra/ra/ra_icu.h
new file mode 100644
index 0000000000000..589e55c3776fb
--- /dev/null
+++ b/ports/renesas-ra/ra/ra_icu.h
@@ -0,0 +1,58 @@
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Renesas Electronics Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#ifndef RA_RA_ICU_H_
+#define RA_RA_ICU_H_
+
+#include <stdint.h>
+#include <stdbool.h>
+
+// #define IRQ_MAX            (16)
+#define VECTOR_NUMBER_NONE (0xff)
+
+typedef struct ra_irq_pin {
+    uint8_t irq_no;
+    uint32_t pin;
+} ra_icu_pin_t;
+
+typedef void (*ICU_CB)(void *);
+
+bool ra_icu_find_irq_no(uint32_t pin, uint8_t *irq_no);
+void ra_icu_set_pin(uint32_t pin, bool irq_enable, bool pullup);
+void ra_icu_enable_irq_no(uint8_t irq_no);
+void ra_icu_disable_irq_no(uint8_t irq_no);
+void ra_icu_enable_pin(uint32_t pin);
+void ra_icu_disable_pin(uint32_t pin);
+void ra_icu_priority_irq_no(uint8_t irq_no, uint32_t ipl);
+void ra_icu_priority_pin(uint32_t pin, uint32_t ipl);
+void ra_icu_set_callback(uint8_t irq_no, ICU_CB func, void *param);
+void ra_icu_trigger_irq_no(uint8_t irq_no, uint32_t cond);
+void ra_icu_trigger_pin(uint32_t pin, uint32_t cond);
+void ra_icu_set_bounce(uint8_t irq_no, uint32_t bounce);
+void ra_icu_init(void);
+void ra_icu_deinit(void);
+void ra_icu_swint(uint8_t irq_no);
+void r_icu_isr(void);
+
+#endif /* RA_RA_ICU_H_ */
diff --git a/ports/renesas-ra/ra/ra_init.c b/ports/renesas-ra/ra/ra_init.c
new file mode 100644
index 0000000000000..c9b78e0dd17fc
--- /dev/null
+++ b/ports/renesas-ra/ra/ra_init.c
@@ -0,0 +1,39 @@
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Renesas Electronics Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "hal_data.h"
+#include "ra_config.h"
+#include "ra_flash.h"
+#include "ra_int.h"
+#include "ra_init.h"
+
+void ra_init(void) {
+    ra_int_init();
+    SysTick_Config(PCLK / 1000);
+    internal_flash_init();
+}
+
+void ra_deinit(void) {
+    ra_int_init();
+}
diff --git a/ports/renesas-ra/ra/ra_init.h b/ports/renesas-ra/ra/ra_init.h
new file mode 100644
index 0000000000000..cb90e7f237354
--- /dev/null
+++ b/ports/renesas-ra/ra/ra_init.h
@@ -0,0 +1,31 @@
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Renesas Electronics Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#ifndef PORTS_RA_RA_RA_INIT_H_
+#define PORTS_RA_RA_RA_INIT_H_
+
+void ra_init(void);
+void ra_deinit(void);
+
+#endif /* PORTS_RA_RA_RA_INIT_H_ */
diff --git a/ports/renesas-ra/ra/ra_int.c b/ports/renesas-ra/ra/ra_int.c
new file mode 100644
index 0000000000000..2f6449d14e211
--- /dev/null
+++ b/ports/renesas-ra/ra/ra_int.c
@@ -0,0 +1,273 @@
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Renesas Electronics Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "hal_data.h"
+#include "ra_config.h"
+#include "ra_int.h"
+
+/*
+ * store channel no or irq_no for specified irq_type(irq index)
+ */
+uint8_t irq_to_ch[IRQ_MAX];
+
+void ra_int_init(void) {
+    uint32_t i;
+    for (i = 0; i < IRQ_MAX; i++) {
+        irq_to_ch[i] = 0;
+    }
+    #if defined(VECTOR_NUMBER_AGT0_INT)
+    irq_to_ch[VECTOR_NUMBER_AGT0_INT] = 0;
+    #endif
+    #if defined(VECTOR_NUMBER_AGT1_INT)
+    irq_to_ch[VECTOR_NUMBER_AGT1_INT] = 1;
+    #endif
+    #if defined(VECTOR_NUMBER_IIC0_RXI)
+    irq_to_ch[VECTOR_NUMBER_IIC0_RXI] = 0;
+    #endif
+    #if defined(VECTOR_NUMBER_IIC0_TXI)
+    irq_to_ch[VECTOR_NUMBER_IIC0_TXI] = 0;
+    #endif
+    #if defined(VECTOR_NUMBER_IIC0_TEI)
+    irq_to_ch[VECTOR_NUMBER_IIC0_TEI] = 0;
+    #endif
+    #if defined(VECTOR_NUMBER_IIC0_ERI)
+    irq_to_ch[VECTOR_NUMBER_IIC0_ERI] = 0;
+    #endif
+    #if defined(VECTOR_NUMBER_IIC1_RXI)
+    irq_to_ch[VECTOR_NUMBER_IIC1_RXI] = 1;
+    #endif
+    #if defined(VECTOR_NUMBER_IIC1_TXI)
+    irq_to_ch[VECTOR_NUMBER_IIC1_TXI] = 1;
+    #endif
+    #if defined(VECTOR_NUMBER_IIC1_TEI)
+    irq_to_ch[VECTOR_NUMBER_IIC1_TEI] = 1;
+    #endif
+    #if defined(VECTOR_NUMBER_IIC1_ERI)
+    irq_to_ch[VECTOR_NUMBER_IIC1_ERI] = 1;
+    #endif
+    #if defined(VECTOR_NUMBER_IIC2_RXI)
+    irq_to_ch[VECTOR_NUMBER_IIC2_RXI] = 2;
+    #endif
+    #if defined(VECTOR_NUMBER_IIC2_TXI)
+    irq_to_ch[VECTOR_NUMBER_IIC2_TXI] = 2;
+    #endif
+    #if defined(VECTOR_NUMBER_IIC2_TEI)
+    irq_to_ch[VECTOR_NUMBER_IIC2_TEI] = 2;
+    #endif
+    #if defined(VECTOR_NUMBER_IIC2_ERI)
+    irq_to_ch[VECTOR_NUMBER_IIC2_ERI] = 2;
+    #endif
+    #if defined(VECTOR_NUMBER_SPI0_RXI)
+    irq_to_ch[VECTOR_NUMBER_SPI0_RXI] = 0;
+    #endif
+    #if defined(VECTOR_NUMBER_SPI0_TXI)
+    irq_to_ch[VECTOR_NUMBER_SPI0_TXI] = 0;
+    #endif
+    #if defined(VECTOR_NUMBER_SPI0_TEI)
+    irq_to_ch[VECTOR_NUMBER_SPI0_TEI] = 0;
+    #endif
+    #if defined(VECTOR_NUMBER_SPI0_ERI)
+    irq_to_ch[VECTOR_NUMBER_SPI0_ERI] = 0;
+    #endif
+    #if defined(VECTOR_NUMBER_SPI1_RXI)
+    irq_to_ch[VECTOR_NUMBER_SPI1_RXI] = 1;
+    #endif
+    #if defined(VECTOR_NUMBER_SPI1_TXI)
+    irq_to_ch[VECTOR_NUMBER_SPI1_TXI] = 1;
+    #endif
+    #if defined(VECTOR_NUMBER_SPI1_TEI)
+    irq_to_ch[VECTOR_NUMBER_SPI1_TEI] = 1;
+    #endif
+    #if defined(VECTOR_NUMBER_SPI1_ERI)
+    irq_to_ch[VECTOR_NUMBER_SPI1_ERI] = 1;
+    #endif
+    #if defined(VECTOR_NUMBER_SCI0_RXI)
+    irq_to_ch[VECTOR_NUMBER_SCI0_RXI] = 0;
+    #endif
+    #if defined(VECTOR_NUMBER_SCI0_TXI)
+    irq_to_ch[VECTOR_NUMBER_SCI0_TXI] = 0;
+    #endif
+    #if defined(VECTOR_NUMBER_SCI0_TEI)
+    irq_to_ch[VECTOR_NUMBER_SCI0_TEI] = 0;
+    #endif
+    #if defined(VECTOR_NUMBER_SCI0_ERI)
+    irq_to_ch[VECTOR_NUMBER_SCI0_ERI] = 0;
+    #endif
+    #if defined(VECTOR_NUMBER_SCI1_RXI)
+    irq_to_ch[VECTOR_NUMBER_SCI1_RXI] = 1;
+    #endif
+    #if defined(VECTOR_NUMBER_SCI1_TXI)
+    irq_to_ch[VECTOR_NUMBER_SCI1_TXI] = 1;
+    #endif
+    #if defined(VECTOR_NUMBER_SCI1_TEI)
+    irq_to_ch[VECTOR_NUMBER_SCI1_TEI] = 1;
+    #endif
+    #if defined(VECTOR_NUMBER_SCI1_ERI)
+    irq_to_ch[VECTOR_NUMBER_SCI1_ERI] = 1;
+    #endif
+    #if defined(VECTOR_NUMBER_SCI2_RXI)
+    irq_to_ch[VECTOR_NUMBER_SCI2_RXI] = 2;
+    #endif
+    #if defined(VECTOR_NUMBER_SCI2_TXI)
+    irq_to_ch[VECTOR_NUMBER_SCI2_TXI] = 2;
+    #endif
+    #if defined(VECTOR_NUMBER_SCI2_TEI)
+    irq_to_ch[VECTOR_NUMBER_SCI2_TEI] = 2;
+    #endif
+    #if defined(VECTOR_NUMBER_SCI2_ERI)
+    irq_to_ch[VECTOR_NUMBER_SCI2_ERI] = 2;
+    #endif
+    #if defined(VECTOR_NUMBER_SCI3_RXI)
+    irq_to_ch[VECTOR_NUMBER_SCI3_RXI] = 3;
+    #endif
+    #if defined(VECTOR_NUMBER_SCI3_TXI)
+    irq_to_ch[VECTOR_NUMBER_SCI3_TXI] = 3;
+    #endif
+    #if defined(VECTOR_NUMBER_SCI3_TEI)
+    irq_to_ch[VECTOR_NUMBER_SCI3_TEI] = 3;
+    #endif
+    #if defined(VECTOR_NUMBER_SCI3_ERI)
+    irq_to_ch[VECTOR_NUMBER_SCI3_ERI] = 3;
+    #endif
+    #if defined(VECTOR_NUMBER_SCI4_RXI)
+    irq_to_ch[VECTOR_NUMBER_SCI4_RXI] = 4;
+    #endif
+    #if defined(VECTOR_NUMBER_SCI4_TXI)
+    irq_to_ch[VECTOR_NUMBER_SCI4_TXI] = 4;
+    #endif
+    #if defined(VECTOR_NUMBER_SCI4_TEI)
+    irq_to_ch[VECTOR_NUMBER_SCI4_TEI] = 4;
+    #endif
+    #if defined(VECTOR_NUMBER_SCI4_ERI)
+    irq_to_ch[VECTOR_NUMBER_SCI4_ERI] = 4;
+    #endif
+    #if defined(VECTOR_NUMBER_SCI5_RXI)
+    irq_to_ch[VECTOR_NUMBER_SCI5_RXI] = 5;
+    #endif
+    #if defined(VECTOR_NUMBER_SCI5_TXI)
+    irq_to_ch[VECTOR_NUMBER_SCI5_TXI] = 5;
+    #endif
+    #if defined(VECTOR_NUMBER_SCI5_TEI)
+    irq_to_ch[VECTOR_NUMBER_SCI5_TEI] = 5;
+    #endif
+    #if defined(VECTOR_NUMBER_SCI5_ERI)
+    irq_to_ch[VECTOR_NUMBER_SCI5_ERI] = 5;
+    #endif
+    #if defined(VECTOR_NUMBER_SCI6_RXI)
+    irq_to_ch[VECTOR_NUMBER_SCI6_RXI] = 6;
+    #endif
+    #if defined(VECTOR_NUMBER_SCI6_TXI)
+    irq_to_ch[VECTOR_NUMBER_SCI6_TXI] = 6;
+    #endif
+    #if defined(VECTOR_NUMBER_SCI6_TEI)
+    irq_to_ch[VECTOR_NUMBER_SCI6_TEI] = 6;
+    #endif
+    #if defined(VECTOR_NUMBER_SCI6_ERI)
+    irq_to_ch[VECTOR_NUMBER_SCI6_ERI] = 6;
+    #endif
+    #if defined(VECTOR_NUMBER_SCI7_RXI)
+    irq_to_ch[VECTOR_NUMBER_SCI7_RXI] = 7;
+    #endif
+    #if defined(VECTOR_NUMBER_SCI7_TXI)
+    irq_to_ch[VECTOR_NUMBER_SCI7_TXI] = 7;
+    #endif
+    #if defined(VECTOR_NUMBER_SCI7_TEI)
+    irq_to_ch[VECTOR_NUMBER_SCI7_TEI] = 7;
+    #endif
+    #if defined(VECTOR_NUMBER_SCI7_ERI)
+    irq_to_ch[VECTOR_NUMBER_SCI7_ERI] = 7;
+    #endif
+    #if defined(VECTOR_NUMBER_SCI8_RXI)
+    irq_to_ch[VECTOR_NUMBER_SCI8_RXI] = 8;
+    #endif
+    #if defined(VECTOR_NUMBER_SCI8_TXI)
+    irq_to_ch[VECTOR_NUMBER_SCI8_TXI] = 8;
+    #endif
+    #if defined(VECTOR_NUMBER_SCI8_TEI)
+    irq_to_ch[VECTOR_NUMBER_SCI8_TEI] = 8;
+    #endif
+    #if defined(VECTOR_NUMBER_SCI8_ERI)
+    irq_to_ch[VECTOR_NUMBER_SCI8_ERI] = 8;
+    #endif
+    #if defined(VECTOR_NUMBER_SCI9_RXI)
+    irq_to_ch[VECTOR_NUMBER_SCI9_RXI] = 9;
+    #endif
+    #if defined(VECTOR_NUMBER_SCI9_TXI)
+    irq_to_ch[VECTOR_NUMBER_SCI9_TXI] = 9;
+    #endif
+    #if defined(VECTOR_NUMBER_SCI9_TEI)
+    irq_to_ch[VECTOR_NUMBER_SCI9_TEI] = 9;
+    #endif
+    #if defined(VECTOR_NUMBER_SCI9_ERI)
+    irq_to_ch[VECTOR_NUMBER_SCI9_ERI] = 9;
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ0)
+    irq_to_ch[VECTOR_NUMBER_ICU_IRQ0] = 0;
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ1)
+    irq_to_ch[VECTOR_NUMBER_ICU_IRQ1] = 1;
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ2)
+    irq_to_ch[VECTOR_NUMBER_ICU_IRQ2] = 2;
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ3)
+    irq_to_ch[VECTOR_NUMBER_ICU_IRQ3] = 3;
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ4)
+    irq_to_ch[VECTOR_NUMBER_ICU_IRQ4] = 4;
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ5)
+    irq_to_ch[VECTOR_NUMBER_ICU_IRQ5] = 5;
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ6)
+    irq_to_ch[VECTOR_NUMBER_ICU_IRQ6] = 6;
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ7)
+    irq_to_ch[VECTOR_NUMBER_ICU_IRQ7] = 7;
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ8)
+    irq_to_ch[VECTOR_NUMBER_ICU_IRQ8] = 8;
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ9)
+    irq_to_ch[VECTOR_NUMBER_ICU_IRQ9] = 9;
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ10)
+    irq_to_ch[VECTOR_NUMBER_ICU_IRQ10] = 10;
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ11)
+    irq_to_ch[VECTOR_NUMBER_ICU_IRQ11] = 11;
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ12)
+    irq_to_ch[VECTOR_NUMBER_ICU_IRQ12] = 12;
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ13)
+    irq_to_ch[VECTOR_NUMBER_ICU_IRQ13] = 13;
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ14)
+    irq_to_ch[VECTOR_NUMBER_ICU_IRQ14] = 14;
+    #endif
+    #if defined(VECTOR_NUMBER_ICU_IRQ15)
+    irq_to_ch[VECTOR_NUMBER_ICU_IRQ15] = 15;
+    #endif
+}
diff --git a/ports/renesas-ra/ra/ra_int.h b/ports/renesas-ra/ra/ra_int.h
new file mode 100644
index 0000000000000..cd12908bcd75a
--- /dev/null
+++ b/ports/renesas-ra/ra/ra_int.h
@@ -0,0 +1,42 @@
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Renesas Electronics Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#ifndef RA_RA_INT_H_
+#define RA_RA_INT_H_
+
+#include <stdint.h>
+
+#if defined(RA4M1) | defined(RA4W1)
+#define IRQ_MAX 48
+#elif defined(RA6M1) | defined(RA6M2)
+#define IRQ_MAX 128
+#else
+#error "CMSIS MCU Series is not specified."
+#endif
+
+extern uint8_t irq_to_ch[IRQ_MAX];
+
+void ra_int_init(void);
+
+#endif /* RA_RA_INT_H_ */
diff --git a/ports/renesas-ra/ra/ra_rtc.c b/ports/renesas-ra/ra/ra_rtc.c
new file mode 100644
index 0000000000000..f108de568d1b8
--- /dev/null
+++ b/ports/renesas-ra/ra/ra_rtc.c
@@ -0,0 +1,430 @@
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Renesas Electronics Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include <stdio.h>
+#include <stdint.h>
+#include <stdbool.h>
+#include "hal_data.h"
+#include "ra_config.h"
+#include "ra_rtc.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include "hal_data.h"
+#include "ra_rtc.h"
+
+static R_RTC_Type *rtc_reg = (R_RTC_Type *)0x40044000;
+static R_SYSTEM_Type *system_reg = (R_SYSTEM_Type *)0x4001E000;
+
+#if defined(VECTOR_NUMBER_RTC_ALARM)
+ra_rtc_cb_t ra_rtc_func_alarm = NULL;
+void *ra_rtc_param_alarm = NULL;
+#endif
+#if defined(VECTOR_NUMBER_RTC_PERIOD)
+ra_rtc_cb_t ra_rtc_func_period = NULL;
+void *ra_rtc_param_period = NULL;
+#endif
+
+static inline uint8_t int_to_bcd(int num) {
+    return (uint8_t)(((num / 10) << 4) | (num % 10));
+}
+
+static inline int bcd_to_int(uint8_t bcd) {
+    return (int)(((bcd >> 4) * 10) + (bcd & 0x0F));
+}
+
+int ra_rtc_get_year(void) {
+    return bcd_to_int((uint8_t)rtc_reg->RYRCNT) + 2000;
+}
+
+int ra_rtc_get_month(void) {
+    return bcd_to_int((uint8_t)rtc_reg->RMONCNT);
+}
+
+int ra_rtc_get_date(void) {
+    return bcd_to_int((uint8_t)rtc_reg->RDAYCNT);
+}
+
+int ra_rtc_get_hour(void) {
+    return bcd_to_int((uint8_t)(0x3f & rtc_reg->RHRCNT));
+}
+
+int ra_rtc_get_minute(void) {
+    return bcd_to_int((uint8_t)rtc_reg->RMINCNT);
+}
+
+int ra_rtc_get_second(void) {
+    return bcd_to_int((uint8_t)rtc_reg->RSECCNT);
+}
+
+int ra_rtc_get_weekday(void) {
+    return bcd_to_int((uint8_t)rtc_reg->RWKCNT);
+}
+
+#if defined(VECTOR_NUMBER_RTC_PERIOD)
+
+void ra_rtc_period_on() {
+    // Enable periodic interrupt
+    rtc_reg->RCR1_b.PIE = 1;
+    while (!rtc_reg->RCR1_b.PIE) {
+        ;
+    }
+    // Enable NVIC RTC Alarm interrupt
+    R_BSP_IrqCfg((IRQn_Type const)RTC_PERIOD_IRQn, (uint32_t)RA_PRI_RTC_WKUP, (void *)NULL);
+    R_BSP_IrqEnable((IRQn_Type const)RTC_PERIOD_IRQn);
+}
+
+void ra_rtc_period_off() {
+    // Disable NVIC RTC Alarm interrupt
+    R_BSP_IrqDisable((IRQn_Type const)RTC_PERIOD_IRQn);
+    // Disable periodic interrupt
+    rtc_reg->RCR1_b.PIE = 0;
+    while (rtc_reg->RCR1_b.PIE) {
+        ;
+    }
+}
+
+// period
+// 6 : every 1/256(s)
+// 7 : every 1/128(s)
+// 8 : every 1/64(s)
+// 9 : every 1/32(s)
+// 10 : every 1/16(s)
+// 11 : every 1/8(s)
+// 12 : every 1/4(s)
+// 13 : every 1/2(s)
+// 14 : every 1(s)
+// 15 : every 2(s)
+void ra_rtc_set_period_time(uint32_t period) {
+    if ((period < 6) | (period > 15)) {
+        return;
+    }
+    ra_rtc_period_off();
+    uint8_t rcr1 = rtc_reg->RCR1;
+    rcr1 &= (uint8_t) ~R_RTC_RCR1_PES_Msk;
+    rcr1 |= (uint8_t)(period << R_RTC_RCR1_PES_Pos);
+    rtc_reg->RCR1 = rcr1;
+    while (rtc_reg->RCR1 != rcr1) {
+        ;
+    }
+    ra_rtc_period_on();
+}
+
+void ra_rtc_set_period_func(void *cb, void *param) {
+    ra_rtc_period_off();
+    ra_rtc_func_period = (ra_rtc_cb_t)cb;
+    ra_rtc_param_period = param;
+    ra_rtc_period_on();
+}
+
+#endif
+
+#if defined(VECTOR_NUMBER_RTC_ALARM)
+
+void ra_rtc_alarm_on() {
+    // Enable alarm interrupt
+    rtc_reg->RCR1_b.AIE = 1;
+    while (!rtc_reg->RCR1_b.AIE) {
+        ;
+    }
+    // Enable NVIC RTC Alarm interrupt
+    R_BSP_IrqCfg((IRQn_Type const)RTC_ALARM_IRQn, (uint32_t)RA_PRI_RTC_WKUP, (void *)NULL);
+    R_BSP_IrqEnable((IRQn_Type const)RTC_ALARM_IRQn);
+}
+
+void ra_rtc_alarm_off() {
+    // Disable NVIC RTC Alarm interrupt
+    R_BSP_IrqDisable((IRQn_Type const)RTC_ALARM_IRQn);
+    // Disable alarm interrupt
+    rtc_reg->RCR1_b.AIE = 0;
+    while (rtc_reg->RCR1_b.AIE) {
+        ;
+    }
+}
+
+void ra_rtc_set_alarm_time(int hour, int min, int week_flag) {
+    ra_rtc_alarm_off();
+    // Configure the alarm
+    rtc_reg->RMINAR = (uint8_t)int_to_bcd(min);
+    rtc_reg->RHRAR = (uint8_t)int_to_bcd(hour);
+    if (week_flag <= 0x06) {
+        rtc_reg->RWKAR = (uint8_t)week_flag;
+    }
+    rtc_reg->RMINAR_b.ENB = 1;
+    rtc_reg->RHRAR_b.ENB = 1;
+    if (week_flag <= 0x06) {
+        rtc_reg->RWKAR_b.ENB = 1;
+    } else {
+        rtc_reg->RWKAR_b.ENB = 0;
+    }
+    ra_rtc_alarm_on();
+}
+
+void ra_rtc_set_alarm_func(void *cb, void *param) {
+    ra_rtc_period_off();
+    ra_rtc_func_alarm = (ra_rtc_cb_t)cb;
+    ra_rtc_param_alarm = param;
+    ra_rtc_period_on();
+}
+
+#endif
+
+// adj: adjustment bit (number of sub clocks)
+//   0 : no adjustment
+//   0<:
+//   0>:
+// aadjp: specify adjustment period
+//   0: 1 minute (RTC_PERIOD_MINUTE)
+//   1: 10 seconds (RTC_PERIOD_SECOND)
+void ra_rtc_set_adjustment(int adj, int aadjp) {
+    int tmp_int;
+    aadjp &= 1;
+    if (adj == 0) {
+        // no adjustment
+        rtc_reg->RADJ = 0x00;
+        while (rtc_reg->RADJ != 0x00) {
+            ;
+        }
+    } else if (adj > 0) {
+        // plus adjustment
+        rtc_reg->RADJ = 0x00;
+        while (rtc_reg->RADJ != 0x00) {
+            ;
+        }
+        // enable auto adjustment
+        rtc_reg->RCR2_b.AADJE = 1;
+        while (rtc_reg->RCR2_b.AADJE != 1) {
+            ;
+        }
+        rtc_reg->RCR2_b.AADJP =
+            aadjp == RTC_PERIOD_MINUTE ? RTC_PERIOD_MINUTE : RTC_PERIOD_SECOND;
+        while (rtc_reg->RCR2_b.AADJP != aadjp) {
+            ;
+        }
+        tmp_int = 0x40 | (0x3F & adj);
+        rtc_reg->RADJ = (uint8_t)tmp_int;
+        while (rtc_reg->RADJ != (uint8_t)tmp_int) {
+            ;
+        }
+    } else {
+        // minus adjustment
+        rtc_reg->RADJ = 0x00;
+        while (rtc_reg->RADJ != 0x00) {
+            ;
+        }
+        // enable adjustment
+        rtc_reg->RCR2_b.AADJE = 1;
+        while (rtc_reg->RCR2_b.AADJE != 1) {
+            ;
+        }
+        rtc_reg->RCR2_b.AADJP =
+            aadjp == RTC_PERIOD_MINUTE ? RTC_PERIOD_MINUTE : RTC_PERIOD_SECOND;
+        while (rtc_reg->RCR2_b.AADJP != aadjp) {
+            ;
+        }
+        tmp_int = 0x80 | (0x3F & abs(adj));
+        rtc_reg->RADJ = (uint8_t)tmp_int;
+        while (rtc_reg->RADJ != (uint8_t)tmp_int) {
+            ;
+        }
+    }
+}
+
+uint8_t ra_rtc_get_adjustment(void) {
+    return rtc_reg->RADJ;
+}
+
+bool ra_rtc_set_time(ra_rtc_t *time) {
+    // Write 0 to RTC start bit
+    rtc_reg->RCR2_b.START = 0x0;
+    // Wait for start bit to clear
+    while (0 != rtc_reg->RCR2_b.START) {
+        ;
+    }
+    // Alarm enable bits are undefined after a reset,
+    //  disable non-required alarm features
+    rtc_reg->RWKAR_b.ENB = 0;
+    rtc_reg->RDAYAR_b.ENB = 0;
+    rtc_reg->RMONAR_b.ENB = 0;
+    rtc_reg->RYRAREN_b.ENB = 0;
+    // Operate RTC in 24-hr mode
+    rtc_reg->RCR2_b.HR24 = 0x1;
+    rtc_reg->RYRCNT = (uint16_t)int_to_bcd(time->year % 100);
+    rtc_reg->RMONCNT = (uint8_t)int_to_bcd(time->month);
+    rtc_reg->RDAYCNT = (uint8_t)int_to_bcd(time->date);
+    rtc_reg->RHRCNT = (uint8_t)int_to_bcd(time->hour);
+    rtc_reg->RMINCNT = (uint8_t)int_to_bcd(time->minute);
+    rtc_reg->RSECCNT = (uint8_t)int_to_bcd(time->second);
+    rtc_reg->RWKCNT = (uint8_t)int_to_bcd(time->weekday);
+    // Start the clock
+    rtc_reg->RCR2_b.START = 0x1;
+    // Wait until the start bit is set to 1
+    while (1 != rtc_reg->RCR2_b.START) {
+        ;
+    }
+    return true;
+}
+
+bool ra_rtc_get_time(ra_rtc_t *time) {
+    time->year = (uint16_t)(bcd_to_int((uint8_t)rtc_reg->RYRCNT) + 2000);
+    time->month = (uint8_t)bcd_to_int(rtc_reg->RMONCNT);
+    time->date = (uint8_t)bcd_to_int(rtc_reg->RDAYCNT);
+    time->hour = (uint8_t)bcd_to_int((uint8_t)(0x3f & rtc_reg->RHRCNT));
+    time->minute = (uint8_t)bcd_to_int((uint8_t)rtc_reg->RMINCNT);
+    time->second = (uint8_t)bcd_to_int((uint8_t)rtc_reg->RSECCNT);
+    time->weekday = (uint8_t)bcd_to_int((uint8_t)rtc_reg->RWKCNT);
+    return true;
+}
+
+static void wait(volatile int count) {
+    while (count--) {
+        __asm__ __volatile__ ("nop");
+    }
+}
+
+// source
+// 0: subclock
+// 1: LOCO
+static void ra_rtc_set_subclock(uint8_t source) {
+    // Set RTC clock input from sub-clock, and supply to RTC module
+    rtc_reg->RCR4_b.RCKSEL = source;
+    if (0 == source) {
+        R_BSP_SoftwareDelay(100, BSP_DELAY_UNITS_MILLISECONDS);
+    } else {
+        R_BSP_SoftwareDelay(200, BSP_DELAY_UNITS_MICROSECONDS);
+    }
+    // Stop the clock
+    rtc_reg->RCR2_b.START = 0x0;
+    // Wait for start bit to clear
+    while (0 != rtc_reg->RCR2_b.START) {
+        ;
+    }
+    if (source == 1) {
+        rtc_reg->RFRH = 0;
+        rtc_reg->RFRL = (uint16_t)0x00ff;   // assume 32.768khz
+    }
+    rtc_reg->RCR2_b.CNTMD = 0;
+    while (0 != rtc_reg->RCR2_b.CNTMD) {
+        ;
+    }
+    // Reset the RTC unit
+    rtc_reg->RCR2_b.RESET = 0x1;
+    // Wait until reset is complete
+    while (0 != rtc_reg->RCR2_b.RESET) {
+        ;
+    }
+    // Start the clock
+    rtc_reg->RCR2_b.START = 0x1;
+    // Wait until the start bit is set to 1
+    while (1 != rtc_reg->RCR2_b.START) {
+        ;
+    }
+}
+
+bool ra_rtc_init(uint8_t source) {
+    system_reg->PRCR = 0xA503;
+    // Check if the MCU has come from a cold start (power on reset)
+    if (0 == system_reg->RSTSR2_b.CWSF) {
+        // cold start
+        system_reg->VBTCR1_b.BPWSWSTP = 1;
+        // Set the warm start flag
+        system_reg->RSTSR2_b.CWSF = 1;
+        // Disable the sub-clock oscillator
+        system_reg->SOSCCR_b.SOSTP = 1;
+        // Wait for register modification to complete
+        while (1 != system_reg->SOSCCR_b.SOSTP) {
+            ;
+        }
+        // Start sub-clock
+        system_reg->SOSCCR_b.SOSTP = 0;
+        // Perform 8 delay iterations
+        for (uint8_t i = 0; i < 8; i++) {
+            // Wait in while loop for ~0.5 seconds
+            wait(0xFFFFE);
+        }
+    } else {
+        // Start sub-clock
+        system_reg->SOSCCR_b.SOSTP = 0;
+        // Wait for the register modification to complete
+        while (0 != system_reg->SOSCCR_b.SOSTP) {
+            ;
+        }
+    }
+    system_reg->PRCR = 0xA500;
+    // call back
+    #if defined(VECTOR_NUMBER_RTC_ALARM)
+    ra_rtc_func_alarm = NULL;
+    #endif
+    #if defined(VECTOR_NUMBER_RTC_PERIOD)
+    ra_rtc_func_period = NULL;
+    #endif
+    if ((rtc_reg->RCR2_b.START == 0) || (rtc_reg->RCR4_b.RCKSEL != source)) {
+        rtc_reg->RCR1 = 0;
+        rtc_reg->RCR2 = 0;
+        ra_rtc_set_subclock(source);
+    }
+    return true;
+}
+
+bool ra_rtc_deinit(void) {
+    #if defined(VECTOR_NUMBER_RTC_ALARM)
+    ra_rtc_alarm_off();
+    ra_rtc_func_alarm = NULL;
+    ra_rtc_param_alarm = NULL;
+    #endif
+    #if defined(VECTOR_NUMBER_RTC_PERIOD)
+    ra_rtc_period_off();
+    ra_rtc_func_period = NULL;
+    ra_rtc_param_period = NULL;
+    #endif
+    rtc_reg->RCR4_b.RCKSEL = 1;
+    rtc_reg->RCR1 = 0;
+    return true;
+}
+
+void rtc_alarm_periodic_isr(void) {
+    IRQn_Type irq = R_FSP_CurrentIrqGet();
+    #if defined(VECTOR_NUMBER_RTC_PERIOD)
+    if (irq == RTC_PERIOD_IRQn) {
+        if (ra_rtc_func_period) {
+            ra_rtc_func_period(ra_rtc_param_period);
+        }
+    }
+    #endif
+    #if defined(VECTOR_NUMBER_RTC_ALARM)
+    if (irq == RTC_ALARM_IRQn) {
+        if (ra_rtc_func_alarm) {
+            ra_rtc_func_alarm(ra_rtc_param_alarm);
+        }
+    }
+    #endif
+    R_BSP_IrqStatusClear(irq);
+}
+
+#if defined(VECTOR_NUMBER_RTC_CARRY)
+void rtc_carry_isr(void) {
+    IRQn_Type irq = R_FSP_CurrentIrqGet();
+    R_BSP_IrqStatusClear(irq);
+}
+#endif
diff --git a/ports/renesas-ra/ra/ra_rtc.h b/ports/renesas-ra/ra/ra_rtc.h
new file mode 100644
index 0000000000000..0cad5ebd1c171
--- /dev/null
+++ b/ports/renesas-ra/ra/ra_rtc.h
@@ -0,0 +1,70 @@
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Renesas Electronics Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#ifndef RA_RTC_H_
+#define RA_RTC_H_
+
+#include <stdint.h>
+#include <stdbool.h>
+
+#define RTC_PERIOD_MINUTE 0x00
+#define RTC_PERIOD_SECOND 0x01
+
+typedef struct {
+    unsigned short year;
+    unsigned char month;
+    unsigned char date;
+    unsigned char weekday;
+    unsigned char hour;
+    unsigned char minute;
+    unsigned char second;
+} ra_rtc_t;
+
+typedef void (*ra_rtc_cb_t)(void *);
+
+int ra_rtc_get_year(void);
+int ra_rtc_get_month(void);
+int ra_rtc_get_date(void);
+int ra_rtc_get_hour(void);
+int ra_rtc_get_minute(void);
+int ra_rtc_get_second(void);
+int ra_rtc_get_weekday(void);
+void ra_rtc_period_on();
+void ra_rtc_period_off();
+void ra_rtc_set_period_time(uint32_t period);
+void ra_rtc_set_period_func(void *cb, void *param);
+void ra_rtc_alarm_on(void);
+void ra_rtc_alarm_off(void);
+void ra_rtc_set_alarm_time(int hour, int min, int week_flag);
+void ra_rtc_set_alarm_func(void *cb, void *param);
+void ra_rtc_set_adjustment(int adj, int aadjp);
+uint8_t ra_rtc_get_adjustment(void);
+bool ra_rtc_set_time(ra_rtc_t *time);
+bool ra_rtc_get_time(ra_rtc_t *time);
+bool ra_rtc_init(uint8_t source);
+bool ra_rtc_deinit(void);
+void rtc_alarm_periodic_isr(void);
+void rtc_carry_isr(void);
+
+#endif /* RA_RTC_H_ */
diff --git a/ports/renesas-ra/ra/ra_sci.c b/ports/renesas-ra/ra/ra_sci.c
new file mode 100644
index 0000000000000..8cf26680cc6e7
--- /dev/null
+++ b/ports/renesas-ra/ra/ra_sci.c
@@ -0,0 +1,1233 @@
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021,2022 Renesas Electronics Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "hal_data.h"
+#include "ra_config.h"
+#include "ra_gpio.h"
+#include "ra_int.h"
+#include "ra_utils.h"
+#include "ra_sci.h"
+
+#if !defined(RA_PRI_UART)
+#define RA_PRI_UART (1)
+#endif
+
+#if defined(__GNUC__)
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+// #pragma GCC diagnostic ignored "-Wconversion"
+// #pragma GCC diagnostic ignored "-Wshift-negative-value"
+// #pragma GCC diagnostic ignored "-Wunused-but-set-variable"
+// #pragma GCC diagnostic ignored "-Wsequence-point"
+// #pragma GCC diagnostic ignored "-Wunused-function"
+#endif
+
+enum
+{
+    #if defined(VECTOR_NUMBER_SCI0_RXI)
+    SCI0_IDX,
+    #endif
+    #if defined(VECTOR_NUMBER_SCI1_RXI)
+    SCI1_IDX,
+    #endif
+    #if defined(VECTOR_NUMBER_SCI2_RXI)
+    SCI2_IDX,
+    #endif
+    #if defined(VECTOR_NUMBER_SCI3_RXI)
+    SCI3_IDX,
+    #endif
+    #if defined(VECTOR_NUMBER_SCI4_RXI)
+    SCI4_IDX,
+    #endif
+    #if defined(VECTOR_NUMBER_SCI5_RXI)
+    SCI5_IDX,
+    #endif
+    #if defined(VECTOR_NUMBER_SCI6_RXI)
+    SCI6_IDX,
+    #endif
+    #if defined(VECTOR_NUMBER_SCI7_RXI)
+    SCI7_IDX,
+    #endif
+    #if defined(VECTOR_NUMBER_SCI8_RXI)
+    SCI8_IDX,
+    #endif
+    #if defined(VECTOR_NUMBER_SCI9_RXI)
+    SCI9_IDX,
+    #endif
+    SCI_IDX_MAX,
+};
+
+static const IRQn_Type idx_to_rxirq[] = {
+    #if defined(VECTOR_NUMBER_SCI0_RXI)
+    VECTOR_NUMBER_SCI0_RXI,
+    #endif
+    #if defined(VECTOR_NUMBER_SCI1_RXI)
+    VECTOR_NUMBER_SCI1_RXI,
+    #endif
+    #if defined(VECTOR_NUMBER_SCI2_RXI)
+    VECTOR_NUMBER_SCI2_RXI,
+    #endif
+    #if defined(VECTOR_NUMBER_SCI3_RXI)
+    VECTOR_NUMBER_SCI3_RXI,
+    #endif
+    #if defined(VECTOR_NUMBER_SCI4_RXI)
+    VECTOR_NUMBER_SCI4_RXI,
+    #endif
+    #if defined(VECTOR_NUMBER_SCI5_RXI)
+    VECTOR_NUMBER_SCI5_RXI,
+    #endif
+    #if defined(VECTOR_NUMBER_SCI6_RXI)
+    VECTOR_NUMBER_SCI6_RXI,
+    #endif
+    #if defined(VECTOR_NUMBER_SCI7_RXI)
+    VECTOR_NUMBER_SCI7_RXI,
+    #endif
+    #if defined(VECTOR_NUMBER_SCI8_RXI)
+    VECTOR_NUMBER_SCI8_RXI,
+    #endif
+    #if defined(VECTOR_NUMBER_SCI9_RXI)
+    VECTOR_NUMBER_SCI9_RXI,
+    #endif
+};
+
+static const IRQn_Type idx_to_txirq[] = {
+    #if defined(VECTOR_NUMBER_SCI0_TXI)
+    VECTOR_NUMBER_SCI0_TXI,
+    #endif
+    #if defined(VECTOR_NUMBER_SCI1_TXI)
+    VECTOR_NUMBER_SCI1_TXI,
+    #endif
+    #if defined(VECTOR_NUMBER_SCI2_TXI)
+    VECTOR_NUMBER_SCI2_TXI,
+    #endif
+    #if defined(VECTOR_NUMBER_SCI3_TXI)
+    VECTOR_NUMBER_SCI3_TXI,
+    #endif
+    #if defined(VECTOR_NUMBER_SCI4_TXI)
+    VECTOR_NUMBER_SCI4_TXI,
+    #endif
+    #if defined(VECTOR_NUMBER_SCI5_TXI)
+    VECTOR_NUMBER_SCI5_TXI,
+    #endif
+    #if defined(VECTOR_NUMBER_SCI6_TXI)
+    VECTOR_NUMBER_SCI6_TXI,
+    #endif
+    #if defined(VECTOR_NUMBER_SCI7_TXI)
+    VECTOR_NUMBER_SCI7_TXI,
+    #endif
+    #if defined(VECTOR_NUMBER_SCI8_TXI)
+    VECTOR_NUMBER_SCI8_TXI,
+    #endif
+    #if defined(VECTOR_NUMBER_SCI9_TXI)
+    VECTOR_NUMBER_SCI9_TXI,
+    #endif
+};
+
+static const IRQn_Type idx_to_teirq[] = {
+    #if defined(VECTOR_NUMBER_SCI0_TEI)
+    VECTOR_NUMBER_SCI0_TEI,
+    #endif
+    #if defined(VECTOR_NUMBER_SCI1_TEI)
+    VECTOR_NUMBER_SCI1_TEI,
+    #endif
+    #if defined(VECTOR_NUMBER_SCI2_TEI)
+    VECTOR_NUMBER_SCI2_TEI,
+    #endif
+    #if defined(VECTOR_NUMBER_SCI3_TEI)
+    VECTOR_NUMBER_SCI3_TEI,
+    #endif
+    #if defined(VECTOR_NUMBER_SCI4_TEI)
+    VECTOR_NUMBER_SCI4_TEI,
+    #endif
+    #if defined(VECTOR_NUMBER_SCI5_TEI)
+    VECTOR_NUMBER_SCI5_TEI,
+    #endif
+    #if defined(VECTOR_NUMBER_SCI6_TEI)
+    VECTOR_NUMBER_SCI6_TEI,
+    #endif
+    #if defined(VECTOR_NUMBER_SCI7_TEI)
+    VECTOR_NUMBER_SCI7_TEI,
+    #endif
+    #if defined(VECTOR_NUMBER_SCI8_TEI)
+    VECTOR_NUMBER_SCI8_TEI,
+    #endif
+    #if defined(VECTOR_NUMBER_SCI9_TEI)
+    VECTOR_NUMBER_SCI9_TEI,
+    #endif
+};
+
+static const IRQn_Type idx_to_erirq[] = {
+    #if defined(VECTOR_NUMBER_SCI0_ERI)
+    VECTOR_NUMBER_SCI0_ERI,
+    #endif
+    #if defined(VECTOR_NUMBER_SCI1_ERI)
+    VECTOR_NUMBER_SCI1_ERI,
+    #endif
+    #if defined(VECTOR_NUMBER_SCI2_ERI)
+    VECTOR_NUMBER_SCI2_ERI,
+    #endif
+    #if defined(VECTOR_NUMBER_SCI3_ERI)
+    VECTOR_NUMBER_SCI3_ERI,
+    #endif
+    #if defined(VECTOR_NUMBER_SCI4_ERI)
+    VECTOR_NUMBER_SCI4_ERI,
+    #endif
+    #if defined(VECTOR_NUMBER_SCI5_ERI)
+    VECTOR_NUMBER_SCI5_ERI,
+    #endif
+    #if defined(VECTOR_NUMBER_SCI6_ERI)
+    VECTOR_NUMBER_SCI6_ERI,
+    #endif
+    #if defined(VECTOR_NUMBER_SCI7_ERI)
+    VECTOR_NUMBER_SCI7_ERI,
+    #endif
+    #if defined(VECTOR_NUMBER_SCI8_ERI)
+    VECTOR_NUMBER_SCI8_ERI,
+    #endif
+    #if defined(VECTOR_NUMBER_SCI9_ERI)
+    VECTOR_NUMBER_SCI9_ERI,
+    #endif
+};
+
+static uint32_t ch_to_idx[SCI_CH_MAX] = {
+    #if defined(VECTOR_NUMBER_SCI0_RXI)
+    SCI0_IDX,
+    #else
+    0,
+    #endif
+    #if defined(VECTOR_NUMBER_SCI1_RXI)
+    SCI1_IDX,
+    #else
+    0,
+    #endif
+    #if defined(VECTOR_NUMBER_SCI2_RXI)
+    SCI2_IDX,
+    #else
+    0,
+    #endif
+    #if defined(VECTOR_NUMBER_SCI3_RXI)
+    SCI3_IDX,
+    #else
+    0,
+    #endif
+    #if defined(VECTOR_NUMBER_SCI4_RXI)
+    SCI4_IDX,
+    #else
+    0,
+    #endif
+    #if defined(VECTOR_NUMBER_SCI5_RXI)
+    SCI5_IDX,
+    #else
+    0,
+    #endif
+    #if defined(VECTOR_NUMBER_SCI6_RXI)
+    SCI6_IDX,
+    #else
+    0,
+    #endif
+    #if defined(VECTOR_NUMBER_SCI7_RXI)
+    SCI7_IDX,
+    #else
+    0,
+    #endif
+    #if defined(VECTOR_NUMBER_SCI8_RXI)
+    SCI8_IDX,
+    #else
+    0,
+    #endif
+    #if defined(VECTOR_NUMBER_SCI9_RXI)
+    SCI9_IDX,
+    #else
+    0,
+    #endif
+};
+
+static R_SCI0_Type *sci_regs[] = {
+    #if defined(VECTOR_NUMBER_SCI0_RXI)
+    (R_SCI0_Type *)0x40070000,
+    #endif
+    #if defined(VECTOR_NUMBER_SCI1_RXI)
+    (R_SCI0_Type *)0x40070020,
+    #endif
+    #if defined(VECTOR_NUMBER_SCI2_RXI)
+    (R_SCI0_Type *)0x40070040,
+    #endif
+    #if defined(VECTOR_NUMBER_SCI3_RXI)
+    (R_SCI0_Type *)0x40070060,
+    #endif
+    #if defined(VECTOR_NUMBER_SCI4_RXI)
+    (R_SCI0_Type *)0x40070080,
+    #endif
+    #if defined(VECTOR_NUMBER_SCI5_RXI)
+    (R_SCI0_Type *)0x400700a0,
+    #endif
+    #if defined(VECTOR_NUMBER_SCI6_RXI)
+    (R_SCI0_Type *)0x400700c0,
+    #endif
+    #if defined(VECTOR_NUMBER_SCI7_RXI)
+    (R_SCI0_Type *)0x400700e0,
+    #endif
+    #if defined(VECTOR_NUMBER_SCI8_RXI)
+    (R_SCI0_Type *)0x40070100,
+    #endif
+    #if defined(VECTOR_NUMBER_SCI9_RXI)
+    (R_SCI0_Type *)0x40070120,
+    #endif
+};
+
+static uint32_t sci_module_mask[] = {
+    #if defined(VECTOR_NUMBER_SCI0_RXI)
+    R_MSTP_MSTPCRB_MSTPB31_Msk,
+    #endif
+    #if defined(VECTOR_NUMBER_SCI1_RXI)
+    R_MSTP_MSTPCRB_MSTPB30_Msk,
+    #endif
+    #if defined(VECTOR_NUMBER_SCI2_RXI)
+    R_MSTP_MSTPCRB_MSTPB29_Msk,
+    #endif
+    #if defined(VECTOR_NUMBER_SCI3_RXI)
+    R_MSTP_MSTPCRB_MSTPB28_Msk,
+    #endif
+    #if defined(VECTOR_NUMBER_SCI4_RXI)
+    R_MSTP_MSTPCRB_MSTPB27_Msk,
+    #endif
+    #if defined(VECTOR_NUMBER_SCI5_RXI)
+    R_MSTP_MSTPCRB_MSTPB26_Msk,
+    #endif
+    #if defined(VECTOR_NUMBER_SCI6_RXI)
+    R_MSTP_MSTPCRB_MSTPB25_Msk,
+    #endif
+    #if defined(VECTOR_NUMBER_SCI7_RXI)
+    R_MSTP_MSTPCRB_MSTPB24_Msk,
+    #endif
+    #if defined(VECTOR_NUMBER_SCI8_RXI)
+    R_MSTP_MSTPCRB_MSTPB23_Msk,
+    #endif
+    #if defined(VECTOR_NUMBER_SCI9_RXI)
+    R_MSTP_MSTPCRB_MSTPB22_Msk,
+    #endif
+};
+
+static const ra_af_pin_t ra_sci_tx_pins[] = {
+    #if defined(RA4M1)
+
+    { AF_SCI1, 0, P101 },
+    { AF_SCI1, 0, P205 },
+    { AF_SCI1, 0, P411 },
+
+    { AF_SCI2, 1, P213 },
+    { AF_SCI2, 1, P401 },
+    { AF_SCI2, 1, P501 },
+
+    { AF_SCI2, 2, P102 },
+    { AF_SCI1, 2, P112 },
+    { AF_SCI1, 2, P302 },
+
+    { AF_SCI2, 9, P109 },
+    { AF_SCI2, 9, P203 },
+    { AF_SCI2, 9, P409 },
+    { AF_SCI2, 9, P602 },
+
+    #elif defined(RA4W1)
+    { AF_SCI1, 0, P101 },
+
+    { AF_SCI2, 1, P213 },
+
+    { AF_SCI1, 4, P205 },
+
+    { AF_SCI2, 9, P109 },
+
+    #elif defined(RA6M1)
+
+    { AF_SCI1, 0, P101 },
+    { AF_SCI1, 0, P411 },
+
+    { AF_SCI2, 1, P213 },
+
+    { AF_SCI1, 2, P112 },
+    { AF_SCI1, 2, P302 },
+
+    { AF_SCI2, 3, P409 },
+
+    { AF_SCI1, 4, P205 },
+
+    { AF_SCI1, 8, P105 },
+
+    { AF_SCI2, 9, P109 },
+    { AF_SCI2, 9, P602 },
+
+    #elif defined(RA6M2)
+
+    { AF_SCI1, 0, P101 },
+    { AF_SCI1, 0, P411 },
+
+    { AF_SCI1, 1, P213 },
+    { AF_SCI2, 1, P709 },
+
+    { AF_SCI1, 2, P112 },
+    { AF_SCI1, 2, P302 },
+
+    { AF_SCI2, 3, P310 },
+    { AF_SCI2, 3, P409 },
+
+    { AF_SCI1, 4, P205 },
+    { AF_SCI1, 4, P512 },
+
+    { AF_SCI2, 5, P501 },
+
+    { AF_SCI1, 6, P305 },
+    { AF_SCI1, 6, P506 },
+
+    { AF_SCI2, 7, P401 },
+    { AF_SCI2, 7, P613 },
+
+    { AF_SCI1, 8, P105 },
+
+    { AF_SCI2, 9, P109 },
+    { AF_SCI2, 9, P203 },
+    { AF_SCI2, 9, P602 },
+
+    #else
+    #error "CMSIS MCU Series is not specified."
+    #endif
+};
+#define SCI_TX_PINS_SIZE sizeof(ra_sci_tx_pins) / sizeof(ra_af_pin_t)
+
+static const ra_af_pin_t ra_sci_rx_pins[] = {
+    #if defined(RA4M1)
+
+    { AF_SCI1, 0, P100 },
+    { AF_SCI1, 0, P104 },
+    { AF_SCI1, 0, P206 },
+    { AF_SCI1, 0, P410 },
+
+    { AF_SCI2, 1, P212 },
+    { AF_SCI2, 1, P402 },
+    { AF_SCI2, 1, P502 },
+    { AF_SCI2, 1, P708 },
+
+    { AF_SCI1, 2, P301 },
+
+    { AF_SCI2, 9, P110 },
+    { AF_SCI2, 9, P202 },
+    { AF_SCI2, 9, P408 },
+    { AF_SCI2, 9, P601 },
+
+    #elif defined(RA4W1)
+    { AF_SCI1, 0, P100 },
+    { AF_SCI1, 0, P104 },
+
+    { AF_SCI2, 1, P212 },
+    { AF_SCI2, 1, P402 },
+
+    { AF_SCI1, 4, P206 },
+
+    { AF_SCI2, 9, P110 },
+
+    #elif defined(RA6M1)
+
+    { AF_SCI1, 0, P100 },
+    { AF_SCI1, 0, P410 },
+
+    { AF_SCI2, 1, P212 },
+    { AF_SCI2, 1, P708 },
+
+    { AF_SCI1, 2, P113 },
+    { AF_SCI1, 2, P301 },
+
+    { AF_SCI2, 3, P408 },
+
+    { AF_SCI1, 4, P206 },
+
+    { AF_SCI1, 8, P104 },
+
+    { AF_SCI2, 9, P110 },
+    { AF_SCI2, 9, P601 },
+
+    #elif defined(RA6M2)
+
+    { AF_SCI1, 0, P100 },
+    { AF_SCI1, 0, P410 },
+
+    { AF_SCI1, 1, P212 },
+    { AF_SCI2, 1, P708 },
+
+    { AF_SCI1, 2, P113 },
+    { AF_SCI1, 2, P301 },
+
+    { AF_SCI2, 3, P309 },
+    { AF_SCI2, 3, P408 },
+
+    { AF_SCI1, 4, P206 },
+    { AF_SCI1, 4, P511 },
+
+    { AF_SCI2, 5, P502 },
+
+    { AF_SCI1, 6, P304 },
+    { AF_SCI1, 6, P505 },
+
+    { AF_SCI2, 7, P402 },
+    { AF_SCI2, 7, P614 },
+
+    { AF_SCI1, 8, P104 },
+
+    { AF_SCI2, 9, P110 },
+    { AF_SCI2, 9, P202 },
+    { AF_SCI2, 9, P601 },
+
+    #else
+    #error "CMSIS MCU Series is not specified."
+    #endif
+};
+#define SCI_RX_PINS_SIZE sizeof(ra_sci_rx_pins) / sizeof(ra_af_pin_t)
+
+static const ra_af_pin_t ra_sci_cts_pins[] = {
+    #if defined(RA4M1)
+
+    { AF_SCI1, 0, P103 },
+    { AF_SCI1, 0, P401 },
+    { AF_SCI1, 0, P407 },
+    { AF_SCI1, 0, P413 },
+
+    { AF_SCI2, 1, P101 },
+    { AF_SCI2, 1, P403 },
+    { AF_SCI1, 1, P408 },
+    { AF_SCI2, 1, P504 },
+
+    { AF_SCI1, 2, P110 },
+    { AF_SCI1, 2, P203 },
+
+    { AF_SCI2, 9, P108 },
+    { AF_SCI2, 9, P205 },
+    { AF_SCI2, 9, P301 },
+    { AF_SCI2, 9, P603 },
+
+    #elif defined(RA4W1)
+    { AF_SCI1, 0, P103 },
+
+    { AF_SCI2, 1, P101 },
+
+    { AF_SCI1, 4, P407 },
+
+    { AF_SCI2, 9, P108 },
+    { AF_SCI2, 9, P205 },
+
+    #elif defined(RA6M1)
+
+    { AF_SCI1, 0, P103 },
+    { AF_SCI1, 0, P413 },
+
+    { AF_SCI2, 1, P101 },
+
+    { AF_SCI1, 2, P110 },
+
+    { AF_SCI2, 3, P411 },
+
+    { AF_SCI1, 4, P401 },
+    { AF_SCI1, 4, P407 },
+
+    { AF_SCI1, 8, P107 },
+
+    { AF_SCI2, 9, P108 },
+    { AF_SCI2, 9, P301 },
+
+    #elif defined(RA6M2)
+
+    { AF_SCI1, 0, P103 },
+    { AF_SCI1, 0, P413 },
+
+    { AF_SCI2, 1, P101 },
+    { AF_SCI2, 1, P711 },
+
+    { AF_SCI1, 2, P110 },
+    { AF_SCI1, 2, P203 },
+
+    { AF_SCI2, 3, P312 },
+    { AF_SCI2, 3, P411 },
+
+    { AF_SCI1, 4, P401 },
+    { AF_SCI1, 4, P407 },
+
+    { AF_SCI2, 5, P504 },
+
+    { AF_SCI1, 6, P307 },
+    { AF_SCI1, 6, P503 },
+
+    { AF_SCI2, 7, P403 },
+    { AF_SCI2, 7, P611 },
+
+    { AF_SCI1, 8, P107 },
+
+    { AF_SCI2, 9, P108 },
+    { AF_SCI2, 9, P205 },
+    { AF_SCI2, 9, P301 },
+    { AF_SCI2, 9, P603 },
+
+    #else
+    #error "CMSIS MCU Series is not specified."
+    #endif
+};
+#define SCI_CTS_PINS_SIZE sizeof(ra_sci_cts_pins) / sizeof(ra_af_pin_t)
+
+typedef struct _sci_fifo {
+    volatile uint32_t tail, head, len, busy;
+    uint8_t *bufp;
+    uint32_t size;
+} sci_fifo;
+
+static uint32_t ra_sci_init_flag[] = {
+    #if defined(VECTOR_NUMBER_SCI0_RXI)
+    0,
+    #endif
+    #if defined(VECTOR_NUMBER_SCI1_RXI)
+    0,
+    #endif
+    #if defined(VECTOR_NUMBER_SCI2_RXI)
+    0,
+    #endif
+    #if defined(VECTOR_NUMBER_SCI3_RXI)
+    0,
+    #endif
+    #if defined(VECTOR_NUMBER_SCI4_RXI)
+    0,
+    #endif
+    #if defined(VECTOR_NUMBER_SCI5_RXI)
+    0,
+    #endif
+    #if defined(VECTOR_NUMBER_SCI6_RXI)
+    0,
+    #endif
+    #if defined(VECTOR_NUMBER_SCI7_RXI)
+    0,
+    #endif
+    #if defined(VECTOR_NUMBER_SCI8_RXI)
+    0,
+    #endif
+    #if defined(VECTOR_NUMBER_SCI9_RXI)
+    0,
+    #endif
+};
+static SCI_CB sci_cb[] = {
+    #if defined(VECTOR_NUMBER_SCI0_RXI)
+    (SCI_CB)0,
+    #endif
+    #if defined(VECTOR_NUMBER_SCI1_RXI)
+    (SCI_CB)0,
+    #endif
+    #if defined(VECTOR_NUMBER_SCI2_RXI)
+    (SCI_CB)0,
+    #endif
+    #if defined(VECTOR_NUMBER_SCI3_RXI)
+    (SCI_CB)0,
+    #endif
+    #if defined(VECTOR_NUMBER_SCI4_RXI)
+    (SCI_CB)0,
+    #endif
+    #if defined(VECTOR_NUMBER_SCI5_RXI)
+    (SCI_CB)0,
+    #endif
+    #if defined(VECTOR_NUMBER_SCI6_RXI)
+    (SCI_CB)0,
+    #endif
+    #if defined(VECTOR_NUMBER_SCI7_RXI)
+    (SCI_CB)0,
+    #endif
+    #if defined(VECTOR_NUMBER_SCI8_RXI)
+    (SCI_CB)0,
+    #endif
+    #if defined(VECTOR_NUMBER_SCI9_RXI)
+    (SCI_CB)0,
+    #endif
+};
+static uint8_t ch_9bit[] = {
+    #if defined(VECTOR_NUMBER_SCI0_RXI)
+    0,
+    #endif
+    #if defined(VECTOR_NUMBER_SCI1_RXI)
+    0,
+    #endif
+    #if defined(VECTOR_NUMBER_SCI2_RXI)
+    0,
+    #endif
+    #if defined(VECTOR_NUMBER_SCI3_RXI)
+    0,
+    #endif
+    #if defined(VECTOR_NUMBER_SCI4_RXI)
+    0,
+    #endif
+    #if defined(VECTOR_NUMBER_SCI5_RXI)
+    0,
+    #endif
+    #if defined(VECTOR_NUMBER_SCI6_RXI)
+    0,
+    #endif
+    #if defined(VECTOR_NUMBER_SCI7_RXI)
+    0,
+    #endif
+    #if defined(VECTOR_NUMBER_SCI8_RXI)
+    0,
+    #endif
+    #if defined(VECTOR_NUMBER_SCI9_RXI)
+    0,
+    #endif
+};
+static uint8_t tx_buf[SCI_IDX_MAX][SCI_TX_BUF_SIZE];
+static uint8_t rx_buf[SCI_IDX_MAX][SCI_RX_BUF_SIZE];
+static volatile sci_fifo tx_fifo[SCI_IDX_MAX];
+static volatile sci_fifo rx_fifo[SCI_IDX_MAX];
+static uint32_t m_cts_pin[] = {
+    #if defined(VECTOR_NUMBER_SCI0_RXI)
+    PIN_END,
+    #endif
+    #if defined(VECTOR_NUMBER_SCI1_RXI)
+    PIN_END,
+    #endif
+    #if defined(VECTOR_NUMBER_SCI2_RXI)
+    PIN_END,
+    #endif
+    #if defined(VECTOR_NUMBER_SCI3_RXI)
+    PIN_END,
+    #endif
+    #if defined(VECTOR_NUMBER_SCI4_RXI)
+    PIN_END,
+    #endif
+    #if defined(VECTOR_NUMBER_SCI5_RXI)
+    PIN_END,
+    #endif
+    #if defined(VECTOR_NUMBER_SCI6_RXI)
+    PIN_END,
+    #endif
+    #if defined(VECTOR_NUMBER_SCI7_RXI)
+    PIN_END,
+    #endif
+    #if defined(VECTOR_NUMBER_SCI8_RXI)
+    PIN_END,
+    #endif
+    #if defined(VECTOR_NUMBER_SCI9_RXI)
+    PIN_END,
+    #endif
+};
+static uint32_t m_rts_pin[] = {
+    #if defined(VECTOR_NUMBER_SCI0_RXI)
+    PIN_END,
+    #endif
+    #if defined(VECTOR_NUMBER_SCI1_RXI)
+    PIN_END,
+    #endif
+    #if defined(VECTOR_NUMBER_SCI2_RXI)
+    PIN_END,
+    #endif
+    #if defined(VECTOR_NUMBER_SCI3_RXI)
+    PIN_END,
+    #endif
+    #if defined(VECTOR_NUMBER_SCI4_RXI)
+    PIN_END,
+    #endif
+    #if defined(VECTOR_NUMBER_SCI5_RXI)
+    PIN_END,
+    #endif
+    #if defined(VECTOR_NUMBER_SCI6_RXI)
+    PIN_END,
+    #endif
+    #if defined(VECTOR_NUMBER_SCI7_RXI)
+    PIN_END,
+    #endif
+    #if defined(VECTOR_NUMBER_SCI8_RXI)
+    PIN_END,
+    #endif
+    #if defined(VECTOR_NUMBER_SCI9_RXI)
+    PIN_END,
+    #endif
+};
+
+static void delay_us(volatile unsigned int us) {
+    us *= 48;
+    while (us-- > 0) {
+        ;
+    }
+}
+
+bool ra_af_find_ch_af(ra_af_pin_t *af_pin, uint32_t size, uint32_t pin, uint32_t *ch, uint32_t *af) {
+    bool find = false;
+    uint32_t i;
+    for (i = 0; i < size; i++) {
+        if (af_pin->pin == pin) {
+            find = true;
+            *ch = af_pin->ch;
+            *af = af_pin->af;
+            break;
+        }
+        af_pin++;
+    }
+    return find;
+}
+
+static void ra_sci_tx_set_pin(uint32_t pin) {
+    bool find = false;
+    uint32_t ch;
+    uint32_t af;
+    find = ra_af_find_ch_af((ra_af_pin_t *)&ra_sci_tx_pins, SCI_TX_PINS_SIZE, pin, &ch, &af);
+    if (find) {
+        ra_gpio_config(pin, GPIO_MODE_AF_PP, 0, 0, af);
+    }
+}
+
+static void ra_sci_rx_set_pin(uint32_t pin) {
+    bool find = false;
+    uint32_t ch;
+    uint32_t af;
+    find = ra_af_find_ch_af((ra_af_pin_t *)&ra_sci_rx_pins, SCI_RX_PINS_SIZE, pin, &ch, &af);
+    if (find) {
+        ra_gpio_config(pin, GPIO_MODE_INPUT, 1, 0, af);
+    }
+}
+
+static void ra_sci_cts_set_pin(uint32_t pin) {
+    bool find = false;
+    uint32_t ch;
+    uint32_t af;
+    find = ra_af_find_ch_af((ra_af_pin_t *)&ra_sci_cts_pins, SCI_CTS_PINS_SIZE, pin, &ch, &af);
+    if (find) {
+        ra_gpio_config(pin, GPIO_MODE_INPUT, 1, 0, af);
+    }
+}
+
+static void ra_sci_module_start(uint32_t ch) {
+    ra_mstpcrb_start(sci_module_mask[ch_to_idx[ch]]);
+}
+
+static void ra_sci_module_stop(uint32_t ch) {
+    ra_mstpcrb_stop(sci_module_mask[ch_to_idx[ch]]);
+}
+
+void ra_sci_rx_set_callback(int ch, SCI_CB cb) {
+    sci_cb[ch_to_idx[ch]] = cb;
+}
+
+static void ra_sci_irq_disable(uint32_t ch) {
+    uint32_t idx = ch_to_idx[ch];
+    R_BSP_IrqDisable(idx_to_rxirq[idx]);
+    R_BSP_IrqDisable(idx_to_txirq[idx]);
+    R_BSP_IrqDisable(idx_to_teirq[idx]);
+    R_BSP_IrqDisable(idx_to_erirq[idx]);
+    R_BSP_IrqStatusClear(idx_to_rxirq[idx]);
+    R_BSP_IrqStatusClear(idx_to_txirq[idx]);
+    R_BSP_IrqStatusClear(idx_to_teirq[idx]);
+    R_BSP_IrqStatusClear(idx_to_erirq[idx]);
+}
+
+static void ra_sci_irq_enable(uint32_t ch) {
+    uint32_t idx = ch_to_idx[ch];
+    R_BSP_IrqEnable(idx_to_rxirq[idx]);
+    R_BSP_IrqEnable(idx_to_txirq[idx]);
+    R_BSP_IrqEnable(idx_to_teirq[idx]);
+    R_BSP_IrqEnable(idx_to_erirq[idx]);
+}
+
+void ra_sci_rxirq_disable(uint32_t ch) {
+    uint32_t idx = ch_to_idx[ch];
+    R_BSP_IrqDisable(idx_to_rxirq[idx]);
+}
+
+void ra_sci_rxirq_enable(uint32_t ch) {
+    uint32_t idx = ch_to_idx[ch];
+    R_BSP_IrqEnable(idx_to_rxirq[idx]);
+}
+
+bool ra_sci_is_rxirq_enable(uint32_t ch) {
+    uint32_t idx = ch_to_idx[ch];
+    uint32_t _irq = (uint32_t)idx_to_rxirq[idx];
+    return NVIC->ISER[(_irq >> 5UL)] == (uint32_t)(1UL << (_irq & 0x1FUL));
+}
+
+static void ra_sci_irq_priority(uint32_t ch, uint32_t ipl) {
+    uint32_t idx = ch_to_idx[ch];
+    R_BSP_IrqCfg(idx_to_rxirq[idx], ipl, (void *)NULL);
+    R_BSP_IrqCfg(idx_to_txirq[idx], ipl, (void *)NULL);
+    R_BSP_IrqCfg(idx_to_teirq[idx], ipl, (void *)NULL);
+    R_BSP_IrqCfg(idx_to_erirq[idx], ipl, (void *)NULL);
+}
+
+static void ra_sci_isr_rx(uint32_t ch) {
+    IRQn_Type irq = R_FSP_CurrentIrqGet();
+    uint32_t idx = ch_to_idx[ch];
+    uint16_t d;
+    if (ch_9bit[idx]) {
+        d = (uint16_t)sci_regs[idx]->RDRHL;
+    } else {
+        d = (uint16_t)sci_regs[idx]->RDR;
+    }
+    if (sci_cb[idx]) {
+        if ((*sci_cb[idx])(ch, (int)d)) {
+            // goto ra_sci_isr_rx_exit;
+        }
+    }
+    uint32_t size = rx_fifo[idx].size;
+    sci_fifo *rxfifo = (sci_fifo *)&rx_fifo[idx];
+    if (rxfifo->len < size) {
+        uint32_t i = rxfifo->head;
+        if (ch_9bit[idx]) {
+            *(uint16_t *)(rxfifo->bufp + i) = (uint16_t)d;
+            i += 2;
+            rxfifo->len += 2;
+        } else {
+            *(rxfifo->bufp + i) = (uint8_t)d;
+            i++;
+            rxfifo->len++;
+        }
+        rxfifo->head = i % size;
+        if (m_rts_pin[idx] != PIN_END) {
+            if (rxfifo->len > (size - RA_SCI_FLOW_START_NUM)) {
+                ra_gpio_write(m_rts_pin[idx], 1);
+            }
+        }
+    }
+// ra_sci_isr_rx_exit:
+    R_BSP_IrqStatusClear(irq);
+}
+
+static void ra_sci_isr_er(uint32_t ch) {
+    IRQn_Type irq = R_FSP_CurrentIrqGet();
+    R_BSP_IrqStatusClear(irq);
+    uint32_t idx = ch_to_idx[ch];
+    R_SCI0_Type *sci_reg = sci_regs[idx];
+    sci_reg->RDR;
+    while (0 != (sci_reg->SSR & 0x38)) {
+        sci_reg->RDR;
+        sci_reg->SSR = (uint8_t)((sci_reg->SSR & ~0x38) | 0xc0);
+        if (0 != (sci_reg->SSR & 0x38)) {
+            __asm__ __volatile__ ("nop");
+        }
+    }
+}
+
+static void ra_sci_isr_tx(uint32_t ch) {
+    IRQn_Type irq = R_FSP_CurrentIrqGet();
+    uint32_t idx = ch_to_idx[ch];
+    uint32_t size = tx_fifo[idx].size;
+    sci_fifo *txfifo = (sci_fifo *)&tx_fifo[idx];
+    if (txfifo->len != 0) {
+        uint32_t i = txfifo->tail;
+        if (ch_9bit[idx]) {
+            sci_regs[idx]->TDRHL = *(uint16_t *)(txfifo->bufp + i);
+            i += 2;
+            txfifo->len -= 2;
+        } else {
+            sci_regs[idx]->TDR = (uint8_t)*(txfifo->bufp + i);
+            i++;
+            txfifo->len--;
+        }
+        txfifo->tail = i % size;
+    } else {
+        /* tx_fifo[idx].len == 0 */
+        /* after transfer completed */
+        uint8_t scr = sci_regs[idx]->SCR;
+        scr &= (uint8_t) ~0x80; /* TIE disable */
+        scr |= (uint8_t)0x04;  /* TEIE enable */
+        sci_regs[idx]->SCR = scr;
+    }
+    R_BSP_IrqStatusClear(irq);
+}
+
+void ra_sci_isr_te(uint32_t ch) {
+    IRQn_Type irq = R_FSP_CurrentIrqGet();
+    uint32_t idx = ch_to_idx[ch];
+    tx_fifo[idx].busy = 0;
+    sci_regs[idx]->SCR &= (uint8_t) ~0x84; /* TIE and TEIE disable */
+    R_BSP_IrqStatusClear(irq);
+}
+
+int ra_sci_rx_ch(uint32_t ch) {
+    uint16_t c;
+    uint32_t idx = ch_to_idx[ch];
+    uint32_t size = rx_fifo[idx].size;
+    sci_fifo *rxfifo = (sci_fifo *)&rx_fifo[idx];
+    if (rxfifo->len) {
+        uint32_t state = ra_disable_irq();
+        uint32_t i = rxfifo->tail;
+        if (ch_9bit[idx]) {
+            c = *(uint16_t *)(rxfifo->bufp + i);
+            i += 2;
+            rxfifo->len -= 2;
+        } else {
+            c = (uint16_t)*(rxfifo->bufp + i);
+            i++;
+            rxfifo->len--;
+        }
+        rxfifo->tail = i % size;
+        if (m_rts_pin[idx] != PIN_END) {
+            if (rxfifo->len <= (size - RA_SCI_FLOW_START_NUM)) {
+                ra_gpio_write(m_rts_pin[idx], 0);
+            }
+        }
+        ra_enable_irq(state);
+    } else {
+        c = 0;
+    }
+    return (int)c;
+}
+
+int ra_sci_rx_any(uint32_t ch) {
+    uint32_t idx = ch_to_idx[ch];
+    return (int)(rx_fifo[idx].len != 0);
+}
+
+void ra_sci_tx_ch(uint32_t ch, int c) {
+    uint32_t idx = ch_to_idx[ch];
+    uint32_t size = tx_fifo[idx].size;
+    sci_fifo *txfifo = (sci_fifo *)&tx_fifo[idx];
+    while (tx_fifo[idx].len == size) {
+    }
+    uint32_t state = ra_disable_irq();
+    uint32_t i = tx_fifo[idx].head;
+    if (ch_9bit[idx]) {
+        *(uint16_t *)(txfifo->bufp + i) = (uint16_t)c;
+        i += 2;
+        txfifo->len += 2;
+    } else {
+        *(txfifo->bufp + i) = (uint8_t)c;
+        i++;
+        txfifo->len++;
+    }
+    txfifo->head = i % size;
+    if (!txfifo->busy) {
+        txfifo->busy = 1;
+        uint8_t scr = sci_regs[idx]->SCR;
+        if ((scr & 0xa0) != 0) {
+            sci_regs[idx]->SCR &= ~0xa0;
+        }
+        sci_regs[idx]->SCR |= 0xa0; /* TIE and TE enable */
+    }
+    ra_enable_irq(state);
+}
+
+int ra_sci_tx_wait(uint32_t ch) {
+    uint32_t idx = ch_to_idx[ch];
+    return (int)(tx_fifo[idx].len != (tx_fifo[idx].size - 1));
+}
+
+void ra_sci_tx_break(uint32_t ch) {
+    uint32_t idx = ch_to_idx[ch];
+    R_SCI0_Type *sci_reg = sci_regs[idx];
+    uint8_t scr = sci_reg->SCR;
+    uint8_t smr = sci_reg->SMR;
+    sci_reg->SCR = 0;
+    while (sci_reg->SCR != 0) {
+        ;
+    }
+    sci_reg->SMR_b.STOP = 1;
+    sci_reg->SCR = scr;
+    sci_reg->TDR = 0;
+    while (sci_reg->SSR_b.TDRE == 0) {
+        ;
+    }
+    sci_reg->SMR = smr;
+    return;
+}
+
+void ra_sci_tx_str(uint32_t ch, uint8_t *p) {
+    int c;
+    uint32_t idx = ch_to_idx[ch];
+    if (ch_9bit[idx]) {
+        uint16_t *q = (uint16_t *)p;
+        while ((c = *q++) != 0) {
+            ra_sci_tx_ch(ch, (int)c);
+        }
+    } else {
+        while ((c = (int)*p++) != 0) {
+            ra_sci_tx_ch(ch, (int)c);
+        }
+    }
+}
+
+static void ra_sci_fifo_set(sci_fifo *fifo, uint8_t *bufp, uint32_t size) {
+    fifo->head = 0;
+    fifo->tail = 0;
+    fifo->len = 0;
+    fifo->busy = 0;
+    fifo->bufp = bufp;
+    fifo->size = size;
+}
+
+void ra_sci_txfifo_set(uint32_t ch, uint8_t *bufp, uint32_t size) {
+    uint32_t idx = ch_to_idx[ch];
+    sci_fifo *fifo = (sci_fifo *)&tx_fifo[idx];
+    ra_sci_fifo_set(fifo, bufp, size);
+}
+
+void ra_sci_rxfifo_set(uint32_t ch, uint8_t *bufp, uint32_t size) {
+    uint32_t idx = ch_to_idx[ch];
+    sci_fifo *fifo = (sci_fifo *)&rx_fifo[idx];
+    ra_sci_fifo_set(fifo, bufp, size);
+}
+
+static void ra_sci_fifo_init(uint32_t ch) {
+    uint32_t idx = ch_to_idx[ch];
+    ra_sci_txfifo_set(ch, (uint8_t *)&tx_buf[idx][0], SCI_TX_BUF_SIZE);
+    ra_sci_rxfifo_set(ch, (uint8_t *)&rx_buf[idx][0], SCI_RX_BUF_SIZE);
+}
+
+void ra_sci_set_baud(uint32_t ch, uint32_t baud) {
+    uint32_t idx = ch_to_idx[ch];
+    R_SCI0_Type *sci_reg = sci_regs[idx];
+    // Only works for 115200 bps
+    // ToDo: support other bps
+    if (baud == 0) {
+        /* ABCS=1 */
+        sci_reg->SMR_b.CKS = 0; /* PCLKA */
+        sci_reg->BRR = (uint8_t)((int)PCLK / SCI_DEF_BAUD / 16 - 1);
+    } else if (baud > 19200) {
+        /* ABCS=1 */
+        sci_reg->SMR_b.CKS = 0; /* PCLKA */
+        sci_reg->BRR = (uint8_t)((int)PCLK / baud / 16 - 1);
+    } else {
+        /* ABCS=1 */
+        sci_reg->SMR_b.CKS = 2; /* PCLKA/16 */
+        sci_reg->BRR = (uint8_t)((int)PCLK / baud / 256 - 1);
+    }
+}
+
+/*
+ * bits: 7, 8, 9
+ * parity: none:0, odd:1, even:2
+ */
+void ra_sci_init_with_flow(uint32_t ch, uint32_t tx_pin, uint32_t rx_pin, uint32_t baud, uint32_t bits, uint32_t parity, uint32_t stop, uint32_t flow, uint32_t cts_pin, uint32_t rts_pin) {
+    uint8_t smr = 0;
+    uint8_t scmr = (uint8_t)0xf2;
+    uint32_t idx = ch_to_idx[ch];
+    R_SCI0_Type *sci_reg = sci_regs[idx];
+    if (ra_sci_init_flag[idx] == 0) {
+        ra_sci_fifo_init(ch);
+        sci_cb[idx] = 0;
+        ra_sci_init_flag[idx]++;
+    } else {
+        ra_sci_init_flag[idx]++;
+        return;
+    }
+    ra_sci_module_start(ch);
+    ra_sci_tx_set_pin(tx_pin);
+    ra_sci_rx_set_pin(rx_pin);
+    if (flow) {
+        if (cts_pin != (uint32_t)PIN_END) {
+            m_cts_pin[idx] = cts_pin;
+            ra_sci_cts_set_pin(cts_pin);
+        }
+        if (rts_pin != (uint32_t)PIN_END) {
+            m_rts_pin[idx] = rts_pin;
+            ra_gpio_config(rts_pin, GPIO_MODE_OUTPUT_PP, false, 0, 0);
+            ra_gpio_write(rts_pin, 0);
+        }
+    }
+    ra_sci_irq_disable(ch);
+    ra_sci_irq_priority(ch, RA_PRI_UART);
+    uint32_t state = ra_disable_irq();
+    sci_reg->SCR = 0;
+    while (sci_reg->SCR != 0) {
+        ;
+    }
+    if (bits == 7) {
+        smr |= (uint8_t)0x40;
+    } else {
+        smr &= (uint8_t) ~0x40;
+    }
+    if (parity != 0) {
+        smr |= (uint8_t)0x20;
+    } else {
+        smr &= (uint8_t) ~0x20;
+    }
+    if (parity == 1) {
+        smr |= (uint8_t)0x10;
+    } else {
+        smr &= (uint8_t) ~0x10;
+    }
+    if (stop == 2) {
+        smr |= (uint8_t)0x80;
+    } else {
+        smr &= (uint8_t) ~0x80;
+    }
+    sci_reg->SMR = smr;
+    if (bits == 9) {
+        scmr &= (uint8_t) ~0x10;
+        ch_9bit[idx] = 1;
+    } else {
+        scmr |= (uint8_t)0x10;
+        ch_9bit[idx] = 0;
+    }
+    if (flow) {
+        sci_reg->SPMR |= 0x01;
+    }
+    sci_reg->SCMR = scmr;
+    sci_reg->SEMR = (uint8_t)0xc0;
+    ra_sci_set_baud(ch, baud);
+    delay_us(10);
+    sci_reg->SCR = (uint8_t)0x50;
+    ra_sci_irq_enable(ch);
+    ra_enable_irq(state);
+    if (!ra_sci_init_flag[idx]) {
+        ra_sci_init_flag[idx] = true;
+    }
+}
+
+void ra_sci_init(uint32_t ch, uint32_t tx_pin, uint32_t rx_pin, uint32_t baud, uint32_t bits, uint32_t parity, uint32_t stop, uint32_t flow) {
+    ra_sci_init_with_flow(ch, tx_pin, rx_pin, baud, bits, parity, stop, flow, PIN_END, PIN_END);
+}
+
+void ra_sci_deinit(uint32_t ch) {
+    uint32_t idx = ch_to_idx[ch];
+    if (ra_sci_init_flag[idx] != 0) {
+        ra_sci_init_flag[idx]--;
+        if (ra_sci_init_flag[idx] == 0) {
+            ra_sci_irq_disable(ch);
+            ra_sci_module_stop(ch);
+            sci_cb[idx] = 0;
+        }
+    }
+}
+
+/* rx interrupt */
+void sci_uart_rxi_isr(void) {
+    IRQn_Type irq = R_FSP_CurrentIrqGet();
+    uint32_t ch = irq_to_ch[(uint32_t)irq];
+    ra_sci_isr_rx(ch);
+}
+
+/* tx interrupt */
+void sci_uart_txi_isr(void) {
+    IRQn_Type irq = R_FSP_CurrentIrqGet();
+    uint32_t ch = irq_to_ch[(uint32_t)irq];
+    ra_sci_isr_tx(ch);
+}
+
+/* er interrupt */
+void sci_uart_eri_isr(void) {
+    IRQn_Type irq = R_FSP_CurrentIrqGet();
+    uint32_t ch = irq_to_ch[(uint32_t)irq];
+    ra_sci_isr_er(ch);
+}
+
+/* te interrupt */
+void sci_uart_tei_isr(void) {
+    IRQn_Type irq = R_FSP_CurrentIrqGet();
+    uint32_t ch = irq_to_ch[(uint32_t)irq];
+    ra_sci_isr_te(ch);
+}
diff --git a/ports/renesas-ra/ra/ra_sci.h b/ports/renesas-ra/ra/ra_sci.h
new file mode 100644
index 0000000000000..0a672f3672d1c
--- /dev/null
+++ b/ports/renesas-ra/ra/ra_sci.h
@@ -0,0 +1,72 @@
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Renesas Electronics Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#ifndef PORTS_RA_RA_RA_SCI_H_
+#define PORTS_RA_RA_RA_SCI_H_
+
+#include <stdint.h>
+
+#define RA_SCI_FLOW_START_NUM   (16)
+
+typedef int (*SCI_CB)(uint32_t ch, uint32_t d);
+
+// static bool find_irq_to_ch(IRQn_Type *irq_tbl, IRQn_Type irq, uint32_t *ch);
+// static void delay_us(volatile unsigned int us);
+bool ra_af_find_ch_af(ra_af_pin_t *af_pin, uint32_t size, uint32_t pin, uint32_t *ch, uint32_t *af);
+// static void ra_sci_tx_set_pin(uint32_t pin);
+// static void ra_sci_rx_set_pin(uint32_t pin);
+// static void ra_sci_cts_set_pin(uint32_t pin);
+// static void ra_sci_module_start(uint32_t ch);
+// static void ra_sci_module_stop(uint32_t ch);
+void ra_sci_rx_set_callback(int ch, SCI_CB cb);
+// static void ra_sci_irq_disable(uint32_t ch);
+// static void ra_sci_irq_enable(uint32_t ch);
+void ra_sci_rxirq_disable(uint32_t ch);
+void ra_sci_rxirq_enable(uint32_t ch);
+bool ra_sci_is_rxirq_enable(uint32_t ch);
+// static void ra_sci_irq_priority(uint32_t ch, uint32_t ipl);
+// static void ra_sci_isr_rx(uint32_t ch);
+// static void ra_sci_isr_er(uint32_t ch);
+// static void ra_sci_isr_tx(uint32_t ch);
+void ra_sci_isr_te(uint32_t ch);
+int ra_sci_rx_ch(uint32_t ch);
+int ra_sci_rx_any(uint32_t ch);
+void ra_sci_tx_ch(uint32_t ch, int c);
+int ra_sci_tx_wait(uint32_t ch);
+void ra_sci_tx_break(uint32_t ch);
+void ra_sci_tx_str(uint32_t ch, uint8_t *p);
+// static void ra_sci_fifo_set(sci_fifo *fifo, uint8_t *bufp, uint32_t size);
+void ra_sci_txfifo_set(uint32_t ch, uint8_t *bufp, uint32_t size);
+void ra_sci_rxfifo_set(uint32_t ch, uint8_t *bufp, uint32_t size);
+// static void sci_fifo_init(uint32_t ch);
+void ra_sci_set_baud(uint32_t ch, uint32_t baud);
+void ra_sci_init_with_flow(uint32_t ch, uint32_t tx_pin, uint32_t rx_pin, uint32_t baud, uint32_t bits, uint32_t parity, uint32_t stop, uint32_t flow, uint32_t cts_pin, uint32_t rts_pin);
+void ra_sci_init(uint32_t ch, uint32_t tx_pin, uint32_t rx_pin, uint32_t baud, uint32_t bits, uint32_t parity, uint32_t stop, uint32_t flow);
+void ra_sci_deinit(uint32_t ch);
+void sci_uart_rxi_isr(void);
+void sci_uart_txi_isr(void);
+void sci_uart_eri_isr(void);
+void sci_uart_tei_isr(void);
+
+#endif /* PORTS_RA_RA_RA_SCI_H_ */
diff --git a/ports/renesas-ra/ra/ra_spi.c b/ports/renesas-ra/ra/ra_spi.c
new file mode 100644
index 0000000000000..b7f78cd6deadd
--- /dev/null
+++ b/ports/renesas-ra/ra/ra_spi.c
@@ -0,0 +1,457 @@
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021,2022 Renesas Electronics Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "hal_data.h"
+#include "ra_config.h"
+#include "ra_gpio.h"
+#include "ra_utils.h"
+#include "ra_spi.h"
+
+#if defined(__GNUC__)
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#pragma GCC diagnostic ignored "-Wconversion"
+// #pragma GCC diagnostic ignored "-Wshift-negative-value"
+// #pragma GCC diagnostic ignored "-Wunused-but-set-variable"
+// #pragma GCC diagnostic ignored "-Wsequence-point"
+// #pragma GCC diagnostic ignored "-Wunused-function"
+#endif
+
+static R_SPI0_Type *spi_regs[] = {
+    (R_SPI0_Type *)0x40072000,
+    (R_SPI0_Type *)0x40072100,
+};
+
+static const ra_af_pin_t mosi_pins[] = {
+    #if defined(RA4M1)
+
+    { AF_SPI, 0, P101 }, /* MOSIA */
+    { AF_SPI, 0, P411 }, /* MOSIA */
+    { AF_SPI, 1, P109 }, /* MOSIB */
+    { AF_SPI, 1, P203 }, /* MOSIB */
+
+    #elif defined(RA4W1)
+
+    { AF_SPI, 0, P101 }, /* MOSIA */
+    { AF_SPI, 1, P109 }, /* MOSIB */
+
+    #elif defined(RA6M1)
+
+    { AF_SPI, 0, P101 }, /* MOSIA_A */
+    { AF_SPI, 0, P411 }, /* MOSIA_B */
+    { AF_SPI, 1, P109 }, /* MOSIB_B */
+
+    #elif defined(RA6M2)
+
+    { AF_SPI, 0, P101 }, /* MOSIA_A */
+    { AF_SPI, 0, P411 }, /* MOSIA_B */
+    { AF_SPI, 1, P109 }, /* MOSIB_B */
+    { AF_SPI, 1, P203 }, /* MOSIB_A */
+    { AF_SPI, 1, P701 }, /* MOSIB_C */
+
+    #else
+    #error "CMSIS MCU Series is not specified."
+    #endif
+};
+#define MOSI_PINS_SIZE sizeof(mosi_pins) / sizeof(ra_af_pin_t)
+
+static const ra_af_pin_t miso_pins[] = {
+    #if defined(RA4M1)
+
+    { AF_SPI, 0, P100 }, /* MISOA */
+    { AF_SPI, 0, P410 }, /* MISOA */
+    { AF_SPI, 1, P110 }, /* MISOB */
+    { AF_SPI, 1, P202 }, /* MISOB */
+
+    #elif defined(RA4W1)
+
+    { AF_SPI, 0, P100 }, /* MISOA */
+    { AF_SPI, 1, P110 }, /* MISOB */
+
+    #elif defined(RA6M1)
+
+    { AF_SPI, 0, P100 }, /* MISOA_A */
+    { AF_SPI, 0, P410 }, /* MISOA_B */
+    { AF_SPI, 1, P110 }, /* MISOB_B */
+
+    #elif defined(RA6M2)
+
+    { AF_SPI, 0, P100 }, /* MISOA_A */
+    { AF_SPI, 0, P410 }, /* MISOA_B */
+    { AF_SPI, 1, P110 }, /* MISOB_B */
+    { AF_SPI, 1, P202 }, /* MISOB_A */
+    { AF_SPI, 1, P700 }, /* MISOB_C */
+
+    #else
+    #error "CMSIS MCU Series is not specified."
+    #endif
+};
+#define MISO_PINS_SIZE sizeof(miso_pins) / sizeof(ra_af_pin_t)
+
+static const ra_af_pin_t sck_pins[] = {
+    #if defined(RA4M1)
+
+    { AF_SPI, 0, P102 }, /* RSPCKA */
+    { AF_SPI, 0, P412 }, /* RSPCKA */
+    { AF_SPI, 1, P111 }, /* RSPCKB */
+    { AF_SPI, 1, P204 }, /* RSPCKB */
+
+    #elif defined(RA4W1)
+
+    { AF_SPI, 0, P102 }, /* RSPCKA */
+    { AF_SPI, 1, P111 }, /* RSPCKB */
+
+    #elif defined(RA6M1)
+
+    { AF_SPI, 0, P102 }, /* RSPCKA_A */
+    { AF_SPI, 0, P412 }, /* RSPCKA_B */
+    { AF_SPI, 1, P111 }, /* RSPCKB_B */
+
+    #elif defined(RA6M2)
+
+    { AF_SPI, 0, P102 }, /* RSPCKA_A */
+    { AF_SPI, 0, P412 }, /* RSPCKA_B */
+    { AF_SPI, 1, P111 }, /* RSPCKB_B */
+    { AF_SPI, 1, P204 }, /* RSPCKB_A */
+    { AF_SPI, 1, P702 }, /* RSPCKB_C */
+
+    #else
+    #error "CMSIS MCU Series is not specified."
+    #endif
+};
+#define SCK_PINS_SIZE sizeof(sck_pins) / sizeof(ra_af_pin_t)
+
+bool ra_af_find_ch(ra_af_pin_t *af_pin, uint32_t size, uint32_t pin, uint8_t *ch) {
+    bool find = false;
+    uint32_t i;
+    for (i = 0; i < size; i++) {
+        if (af_pin->pin == pin) {
+            find = true;
+            *ch = af_pin->ch;
+            break;
+        }
+        af_pin++;
+    }
+    return find;
+}
+
+bool ra_spi_find_af_ch(uint32_t mosi, uint32_t miso, uint32_t sck, uint8_t *ch) {
+    bool find = false;
+    uint8_t mosi_ch;
+    uint8_t miso_ch;
+    uint8_t sck_ch;
+    find = ra_af_find_ch((ra_af_pin_t *)&mosi_pins, MOSI_PINS_SIZE, mosi, &mosi_ch);
+    if (find) {
+        find = ra_af_find_ch((ra_af_pin_t *)&miso_pins, MISO_PINS_SIZE, miso, &miso_ch);
+        if (find) {
+            find = ra_af_find_ch((ra_af_pin_t *)&sck_pins, SCK_PINS_SIZE, sck, &sck_ch);
+            if (find) {
+                find = (mosi_ch == miso_ch) && (miso_ch == sck_ch);
+                if (find) {
+                    *ch = mosi_ch;
+                } else {
+                    *ch = 0;
+                }
+            }
+        }
+    }
+    return find;
+}
+
+static void ra_spi_module_start(uint32_t ch) {
+    if (ch == 0) {
+        ra_mstpcrb_start(R_MSTP_MSTPCRB_MSTPB19_Msk);
+    } else {
+        ra_mstpcrb_start(R_MSTP_MSTPCRB_MSTPB18_Msk);
+    }
+}
+
+static void ra_spi_module_stop(uint32_t ch) {
+    if (ch == 0) {
+        ra_mstpcrb_stop(R_MSTP_MSTPCRB_MSTPB19_Msk);
+    } else {
+        ra_mstpcrb_stop(R_MSTP_MSTPCRB_MSTPB18_Msk);
+    }
+}
+
+static void ra_spi_set_pin(uint32_t pin, bool miso) {
+    if (miso) {
+        ra_gpio_config(pin, GPIO_MODE_INPUT, 1, 0, AF_SPI);
+    } else {
+        ra_gpio_config(pin, GPIO_MODE_AF_PP, 0, 0, AF_SPI);
+    }
+}
+
+void ra_spi_set_bits(uint32_t ch, uint32_t bits) {
+    R_SPI0_Type *spi_reg = (R_SPI0_Type *)spi_regs[ch];
+    if (bits == 8) {
+        spi_reg->SPDCR_b.SPBYT = 1;
+        spi_reg->SPDCR_b.SPLW = 0;
+        spi_reg->SPCMD_b[0].SPB = 0x7;
+    } else if (bits == 16) {
+        spi_reg->SPDCR_b.SPBYT = 0;
+        spi_reg->SPDCR_b.SPLW = 0;
+        spi_reg->SPCMD_b[0].SPB = 0xf;
+    } else if (bits == 32) {
+        spi_reg->SPDCR_b.SPBYT = 0;
+        spi_reg->SPDCR_b.SPLW = 1;
+        spi_reg->SPCMD_b[0].SPB = 0x3;
+    }
+}
+
+void ra_spi_set_clk(uint32_t ch, uint32_t baud) {
+    R_SPI0_Type *spi_reg = (R_SPI0_Type *)spi_regs[ch];
+    if (baud == 0) {
+        return;
+    }
+    spi_reg->SPCR_b.SPE = 0;
+    spi_reg->SPBR = (PCLK / 2 / baud) - 1;
+    spi_reg->SPCR_b.SPE = 1;
+}
+
+void ra_spi_set_lsb_first(uint32_t ch, uint32_t lsb_first) {
+    R_SPI0_Type *spi_reg = (R_SPI0_Type *)spi_regs[ch];
+    if (lsb_first) {
+        spi_reg->SPCMD_b[0].LSBF = 1;  // LSB first
+    } else {
+        spi_reg->SPCMD_b[0].LSBF = 0;  // MSB first
+    }
+}
+
+void ra_spi_set_mode(uint32_t ch, uint32_t polarity, uint32_t phase) {
+    R_SPI0_Type *spi_reg = (R_SPI0_Type *)spi_regs[ch];
+    if (polarity != 0) {
+        // CPOL(Clock Polarity)
+        spi_reg->SPCMD_b[0].CPOL = 1;
+    } else {
+        spi_reg->SPCMD_b[0].CPOL = 0;
+    }
+    if (phase != 0) {
+        // CPHA(Clock Phase)
+        spi_reg->SPCMD_b[0].CPHA = 1;
+    } else {
+        spi_reg->SPCMD_b[0].CPHA = 0;
+    }
+}
+
+void ra_spi_set_ch(uint32_t ch) {
+    R_SPI0_Type *spi_reg = (R_SPI0_Type *)spi_regs[ch];
+    spi_reg->SPCR = 0x00;        // disable SPI
+    spi_reg->SPSR = 0xa0;
+    spi_reg->SPPCR = 0x00;       // fixed idle value, disable loop-back mode
+    spi_reg->SPSCR = 0x00;       // Disable sequence control
+    spi_reg->SPDCR = 0x40;       // SPBYT=1, SPLW=0 byte access
+    spi_reg->SPCMD[0] = 0xe700;  // LSBF=0, SPB=7, BRDV=0, CPOL=0, CPHA=0
+    spi_reg->SPCR2 = 0x10;
+    spi_reg->SPCR = 0x48;        // Start SPI in master mode
+}
+
+uint8_t ra_spi_write_byte(uint32_t ch, uint8_t b) {
+    R_SPI0_Type *spi_reg = (R_SPI0_Type *)spi_regs[ch];
+    while (spi_reg->SPSR_b.SPTEF == 0) {
+        ;
+    }
+    spi_reg->SPDR_BY = (uint8_t)(b);
+    while (spi_reg->SPSR_b.SPRF == 0) {
+        ;
+    }
+    return (uint8_t)(spi_reg->SPDR_BY);
+}
+
+void ra_spi_write_bytes8(uint32_t ch, uint8_t *buf, uint32_t count) {
+    R_SPI0_Type *spi_reg = (R_SPI0_Type *)spi_regs[ch];
+    ra_spi_set_bits(ch, 8);
+    while (count-- > 0) {
+        while (spi_reg->SPSR_b.SPTEF == 0) {
+            ;
+        }
+        spi_reg->SPDR_BY = (uint8_t)(*buf++);
+        while (spi_reg->SPSR_b.SPRF == 0) {
+            ;
+        }
+        spi_reg->SPDR_BY;
+    }
+}
+
+void ra_spi_read_bytes8(uint32_t ch, uint8_t *buf, uint32_t count) {
+    R_SPI0_Type *spi_reg = (R_SPI0_Type *)spi_regs[ch];
+    ra_spi_set_bits(ch, 8);
+    while (count-- > 0) {
+        while (spi_reg->SPSR_b.SPTEF == 0) {
+            ;
+        }
+        spi_reg->SPDR_BY = (uint8_t)(0);
+        while (spi_reg->SPSR_b.SPRF == 0) {
+            ;
+        }
+        *buf++ = (uint8_t)spi_reg->SPDR_BY;
+    }
+}
+
+void ra_spi_write_bytes16(uint32_t ch, uint16_t *buf, uint32_t count) {
+    R_SPI0_Type *spi_reg = (R_SPI0_Type *)spi_regs[ch];
+    ra_spi_set_bits(ch, 16);
+    while (count-- > 0) {
+        while (spi_reg->SPSR_b.SPTEF == 0) {
+            ;
+        }
+        spi_reg->SPDR_HA = (uint16_t)(*buf++);
+        while (spi_reg->SPSR_b.SPRF == 0) {
+            ;
+        }
+        spi_reg->SPDR_HA;
+    }
+}
+
+void ra_spi_write_bytes32(uint32_t ch, uint32_t *buf, uint32_t count) {
+    R_SPI0_Type *spi_reg = (R_SPI0_Type *)spi_regs[ch];
+    ra_spi_set_bits(ch, 32);
+    while (count-- > 0) {
+        while (spi_reg->SPSR_b.SPTEF == 0) {
+            ;
+        }
+        spi_reg->SPDR = (uint32_t)(*buf++);
+        while (spi_reg->SPSR_b.SPRF == 0) {
+            ;
+        }
+        spi_reg->SPDR;
+    }
+}
+
+void ra_spi_write_bytes(uint32_t ch, uint32_t bits, uint8_t *buf, uint32_t count) {
+    if (bits == 8) {
+        ra_spi_write_bytes8(ch, buf, count);
+    } else if (bits == 16) {
+        ra_spi_write_bytes16(ch, (uint16_t *)buf, count >> 1);
+    } else if (bits == 32) {
+        ra_spi_write_bytes32(ch, (uint32_t *)buf, count >> 2);
+    }
+}
+
+void ra_spi_transfer8(uint32_t ch, uint8_t *dst, uint8_t *src, uint32_t count) {
+    R_SPI0_Type *spi_reg = (R_SPI0_Type *)spi_regs[ch];
+    ra_spi_set_bits(ch, 8);
+    while (count-- > 0) {
+        while (spi_reg->SPSR_b.SPTEF == 0) {
+            ;
+        }
+        spi_reg->SPDR_BY = (uint8_t)(*src++);
+        while (spi_reg->SPSR_b.SPRF == 0) {
+            ;
+        }
+        *dst++ = (uint8_t)(spi_reg->SPDR_BY);
+    }
+}
+
+void ra_spi_transfer16(uint32_t ch, uint16_t *dst, uint16_t *src, uint32_t count) {
+    R_SPI0_Type *spi_reg = (R_SPI0_Type *)spi_regs[ch];
+    ra_spi_set_bits(ch, 16);
+    while (count-- > 0) {
+        while (spi_reg->SPSR_b.SPTEF == 0) {
+            ;
+        }
+        spi_reg->SPDR_HA = (uint16_t)(*src++);
+        while (spi_reg->SPSR_b.SPRF == 0) {
+            ;
+        }
+        *dst++ = (uint16_t)(spi_reg->SPDR_HA);
+    }
+}
+
+void ra_spi_transfer32(uint32_t ch, uint32_t *dst, uint32_t *src, uint32_t count) {
+    R_SPI0_Type *spi_reg = (R_SPI0_Type *)spi_regs[ch];
+    ra_spi_set_bits(ch, 32);
+    while (count-- > 0) {
+        while (spi_reg->SPSR_b.SPTEF == 0) {
+            ;
+        }
+        spi_reg->SPDR = (uint32_t)(*src++);
+        while (spi_reg->SPSR_b.SPRF == 0) {
+            ;
+        }
+        *dst++ = (uint32_t)(spi_reg->SPDR);
+    }
+}
+
+void ra_spi_transfer(uint32_t ch, uint32_t bits, uint8_t *dst, uint8_t *src, uint32_t count, uint32_t timeout) {
+    if (bits == 8) {
+        ra_spi_transfer8(ch, dst, src, count);
+    } else if (bits == 16) {
+        ra_spi_transfer16(ch, (uint16_t *)dst, (uint16_t *)src, count >> 1);
+    } else if (bits == 32) {
+        ra_spi_transfer32(ch, (uint32_t *)dst, (uint32_t *)src, count >> 2);
+    }
+}
+
+void ra_spi_start_xfer(uint32_t ch, uint16_t spcmd, uint8_t spbr) {
+    R_SPI0_Type *spi_reg = (R_SPI0_Type *)spi_regs[ch];
+    spi_reg->SPCR_b.SPE = 0;  // disable
+    spi_reg->SPCMD[0] = spcmd;
+    spi_reg->SPBR = spbr;
+    spi_reg->SPCR_b.SPE = 1;  // enable
+}
+
+void ra_spi_end_xfer(uint32_t ch) {
+    (void)ch;
+}
+
+void ra_spi_get_conf(uint32_t ch, uint16_t *spcmd, uint8_t *spbr) {
+    R_SPI0_Type *spi_reg = (R_SPI0_Type *)spi_regs[ch];
+    *spcmd = spi_reg->SPCMD[0];
+    *spbr = spi_reg->SPBR;
+}
+
+void ra_spi_init(uint32_t ch, uint32_t mosi, uint32_t miso, uint32_t sck, uint32_t cs, uint32_t baud, uint32_t bits, uint32_t polarity, uint32_t phase) {
+    ra_gpio_mode_output(cs);
+    ra_gpio_write(cs, 1);
+    ra_spi_module_start(ch);
+    ra_spi_set_pin(mosi, false);
+    ra_spi_set_pin(miso, true);
+    ra_spi_set_pin(sck, false);
+    ra_spi_set_mode(ch, polarity, phase);
+    ra_spi_set_ch(ch);
+    ra_spi_set_clk(ch, baud);
+    ra_spi_set_bits(ch, bits);
+    ra_spi_set_lsb_first(ch, 0);  // MSB first
+    return;
+}
+
+void ra_spi_deinit(uint32_t ch, uint32_t cs) {
+    ra_spi_module_stop(ch);
+}
+
+__WEAK void spi_rxi_isr(void) {
+    // dummy
+}
+
+__WEAK void spi_txi_isr(void) {
+    // dummy
+}
+
+__WEAK void spi_tei_isr(void) {
+    // dummy
+}
+
+__WEAK void spi_eri_isr(void) {
+    // dummy
+}
diff --git a/ports/renesas-ra/ra/ra_spi.h b/ports/renesas-ra/ra/ra_spi.h
new file mode 100644
index 0000000000000..e75acf8701bb9
--- /dev/null
+++ b/ports/renesas-ra/ra/ra_spi.h
@@ -0,0 +1,63 @@
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Renesas Electronics Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#ifndef RA_RA_SPI_H_
+#define RA_RA_SPI_H_
+
+#include <stdint.h>
+#include <stdbool.h>
+
+#include "ra_config.h"
+#include "ra_gpio.h"
+
+bool ra_af_find_ch(ra_af_pin_t *af_pin, uint32_t size, uint32_t pin, uint8_t *ch);
+bool ra_spi_find_af_ch(uint32_t mosi, uint32_t miso, uint32_t sck, uint8_t *ch);
+
+// static void ra_spi_module_start(uint32_t ch);
+// static void ra_spi_module_stop(uint32_t ch);
+// static void ra_spi_set_pin(uint8_t pin);
+
+void ra_spi_set_bits(uint32_t ch, uint32_t bits);
+void ra_spi_set_clk(uint32_t ch, uint32_t baud);
+void ra_spi_set_lsb_first(uint32_t ch, uint32_t lsb_first);
+void ra_spi_set_mode(uint32_t ch, uint32_t polarity, uint32_t phase);
+void ra_spi_set_ch(uint32_t ch);
+
+uint8_t ra_spi_write_byte(uint32_t ch, uint8_t b);
+void ra_spi_read_bytes8(uint32_t ch, uint8_t *buf, uint32_t count);
+void ra_spi_write_bytes8(uint32_t ch, uint8_t *buf, uint32_t count);
+void ra_spi_write_bytes16(uint32_t ch, uint16_t *buf, uint32_t count);
+void ra_spi_write_bytes32(uint32_t ch, uint32_t *buf, uint32_t count);
+void ra_spi_write_bytes(uint32_t ch, uint32_t bits, uint8_t *buf, uint32_t count);
+void ra_spi_transfer8(uint32_t ch, uint8_t *dst, uint8_t *src, uint32_t count);
+void ra_spi_transfer16(uint32_t ch, uint16_t *dst, uint16_t *src, uint32_t count);
+void ra_spi_transfer32(uint32_t ch, uint32_t *dst, uint32_t *src, uint32_t count);
+void ra_spi_transfer(uint32_t ch, uint32_t bits, uint8_t *dst, uint8_t *src, uint32_t count, uint32_t timeout);
+void ra_spi_start_xfer(uint32_t ch, uint16_t spcmd, uint8_t spbr);
+void ra_spi_end_xfer(uint32_t ch);
+void ra_spi_get_conf(uint32_t ch, uint16_t *spcmd, uint8_t *spbr);
+void ra_spi_init(uint32_t ch, uint32_t mosi, uint32_t miso, uint32_t sck, uint32_t cs, uint32_t baud, uint32_t bits, uint32_t polarity, uint32_t phase);
+void ra_spi_deinit(uint32_t ch, uint32_t cs);
+
+#endif /* RA_RA_SPI_H_ */
diff --git a/ports/renesas-ra/ra/ra_timer.c b/ports/renesas-ra/ra/ra_timer.c
new file mode 100644
index 0000000000000..5f2adcdfab580
--- /dev/null
+++ b/ports/renesas-ra/ra/ra_timer.c
@@ -0,0 +1,155 @@
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Renesas Electronics Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include <stdio.h>
+#include <stdint.h>
+#include <stdbool.h>
+#include "hal_data.h"
+#include "ra_config.h"
+#include "ra_int.h"
+#include "ra_utils.h"
+#include "ra_timer.h"
+
+#define AGT_CH_SIZE 2
+
+enum AGT_SOURCE {
+    AGT_PCLKB = 0,
+    AGT_PCLKB8,
+    AGT_PCLKB2 = 3,
+    AGT_AGTKCLK,
+    AGT_AGT0UNDER,
+    AGT_AGTSCLK
+};
+
+static R_AGT0_Type *agt_regs[AGT_CH_SIZE] = {
+    (R_AGT0_Type *)0x40084000,
+    (R_AGT0_Type *)0x40084100
+};
+
+static uint8_t ch_to_irq[AGT_CH_SIZE] = {
+    #if defined(VECTOR_NUMBER_AGT0_INT)
+    VECTOR_NUMBER_AGT0_INT,
+    #else
+    0,
+    #endif
+    #if defined(VECTOR_NUMBER_AGT1_INT)
+    VECTOR_NUMBER_AGT1_INT,
+    #else
+    0,
+    #endif
+};
+static float ra_agt_freq[AGT_CH_SIZE];
+static volatile uint32_t ra_agt_counter[AGT_CH_SIZE];
+static AGT_TIMER_CB ra_agt_timer_cb[AGT_CH_SIZE];
+static void *ra_agt_timer_param[AGT_CH_SIZE];
+
+void ra_agt_timer_set_callback(uint32_t ch, AGT_TIMER_CB cb, void *param) {
+    ra_agt_timer_cb[ch] = cb;
+    ra_agt_timer_param[ch] = param;
+}
+
+static void ra_agt_timer_chk_callback(uint32_t ch) {
+    ra_agt_counter[ch] += 1;
+    if (ra_agt_timer_cb[ch]) {
+        (*ra_agt_timer_cb[ch])(ra_agt_timer_param[ch]);
+    }
+}
+
+void ra_agt_timer_start(uint32_t ch) {
+    agt_regs[ch]->AGTCR_b.TSTART = 1; /* start counter */
+}
+
+void ra_agt_timer_stop(uint32_t ch) {
+    agt_regs[ch]->AGTCR_b.TSTART = 0; /* stop counter */
+}
+
+void ra_agt_timer_set_freq(uint32_t ch, float freq) {
+    R_AGT0_Type *agt_reg = agt_regs[ch];
+    uint8_t source = 0;
+    uint16_t period = 0;
+    uint8_t cks = 0;
+    ra_agt_counter[ch] = 0;
+    if (freq > (float)(PCLK / 2)) {
+        return;
+    } else if (freq > 1000.0) {
+        source = AGT_PCLKB2;
+        period = (uint16_t)((float)(PCLK / 2) / freq);
+    } else if (freq > 1.0) {
+        source = AGT_AGTSCLK;
+        cks = 2;
+        period = (uint16_t)((float)(32768 / 4) / freq);
+    } else if (freq > 0.01) {
+        source = AGT_AGTSCLK;
+        period = (uint16_t)((float)(32768 / 128) / freq);
+        cks = 7;
+    } else {
+        return;
+    }
+    ra_agt_freq[ch] = freq;
+    agt_reg->AGTCR_b.TSTART = 0;                // stop counter
+    agt_reg->AGTMR2 = cks;
+    agt_reg->AGTMR1 = (uint8_t)(source << 4);   // mode is timer mode
+    agt_reg->AGT = (uint16_t)period;
+}
+
+float ra_agt_timer_get_freq(uint32_t ch) {
+    return ra_agt_freq[ch];
+}
+
+void ra_agt_timer_init(uint32_t ch, float freq) {
+    R_AGT0_Type *agt_reg = agt_regs[ch];
+    if (ch == 0) {
+        ra_mstpcrd_start(R_MSTP_MSTPCRD_MSTPD3_Msk);
+    } else {
+        ra_mstpcrd_start(R_MSTP_MSTPCRD_MSTPD2_Msk);
+    }
+    ra_agt_timer_set_freq(ch, freq);
+    agt_reg->AGTCR_b.TUNDF = 1;                 // underflow interrupt
+    R_BSP_IrqCfgEnable((IRQn_Type const)ch_to_irq[ch], RA_PRI_TIM5, (void *)NULL);
+}
+
+void ra_agt_timer_deinit(uint32_t ch) {
+    NVIC_DisableIRQ((IRQn_Type const)ch_to_irq[ch]);
+    ra_agt_timer_stop(ch);
+    ra_agt_timer_cb[ch] = (AGT_TIMER_CB)0;
+    ra_agt_timer_param[ch] = (void *)0;
+    if (ch == 0) {
+        ra_mstpcrd_stop(R_MSTP_MSTPCRD_MSTPD3_Msk);
+    } else {
+        ra_mstpcrd_stop(R_MSTP_MSTPCRD_MSTPD2_Msk);
+    }
+}
+
+__WEAK void agt_int_isr(void) {
+    IRQn_Type irq = R_FSP_CurrentIrqGet();
+    uint32_t ch = irq_to_ch[(uint32_t)irq];
+    R_BSP_IrqStatusClear(irq);
+    ra_agt_timer_chk_callback(ch);
+}
+
+extern uint32_t uwTick;
+
+uint32_t mtick() {
+    return uwTick;
+}
diff --git a/ports/renesas-ra/ra/ra_timer.h b/ports/renesas-ra/ra/ra_timer.h
new file mode 100644
index 0000000000000..a04ecd709b074
--- /dev/null
+++ b/ports/renesas-ra/ra/ra_timer.h
@@ -0,0 +1,53 @@
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Renesas Electronics Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#ifndef RA_RA_TIMER_H_
+#define RA_RA_TIMER_H_
+
+#include <stdint.h>
+
+void SysTick_Handler(void);
+uint32_t HAL_GetTick(void);
+
+#define DEF_CLKDEV    2
+#define TENUSEC_COUNT (PCLK / DEF_CLKDEV / 100000)
+#define MSEC_COUNT    (PCLK / DEF_CLKDEV / 100)
+
+__attribute__((naked)) void min_delay(__attribute__((unused)) uint32_t loop_cnt);
+
+typedef void (*AGT_TIMER_CB)(void *);
+
+void ra_agt_timer_set_callback(uint32_t ch, AGT_TIMER_CB cb, void *param);
+void ra_agt_int_isr0(void);
+void ra_agt_int_isr1(void);
+void ra_agt_timer_start(uint32_t ch);
+void ra_agt_timer_stop(uint32_t ch);
+void ra_agt_timer_set_freq(uint32_t ch, float freq);
+float ra_agt_timer_get_freq(uint32_t ch);
+void ra_agt_timer_init(uint32_t ch, float freq);
+void ra_agt_timer_deinit(uint32_t ch);
+__WEAK void agt_int_isr(void);
+uint32_t mtick();
+
+#endif /* RA_RA_TIMER_H_ */
diff --git a/ports/renesas-ra/ra/ra_utils.c b/ports/renesas-ra/ra/ra_utils.c
new file mode 100644
index 0000000000000..94e30ded11fcb
--- /dev/null
+++ b/ports/renesas-ra/ra/ra_utils.c
@@ -0,0 +1,90 @@
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Renesas Electronics Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "hal_data.h"
+#include "ra_config.h"
+#include "ra_utils.h"
+
+static R_SYSTEM_Type *system_reg = (R_SYSTEM_Type *)0x4001E000;
+static R_MSTP_Type *mstp_reg = (R_MSTP_Type *)0x40047000;
+
+void ra_mstpcra_stop(uint32_t mod_mask) {
+    system_reg->PRCR = 0xa502;
+    system_reg->MSTPCRA |= mod_mask;
+    system_reg->PRCR = 0xa500;
+}
+
+void ra_mstpcra_start(uint32_t mod_mask) {
+    system_reg->PRCR = 0xa502;
+    system_reg->MSTPCRA &= ~mod_mask;
+    system_reg->PRCR = 0xa500;
+}
+
+void ra_mstpcrb_stop(uint32_t mod_mask) {
+    system_reg->PRCR = 0xa502;
+    mstp_reg->MSTPCRB |= mod_mask;
+    system_reg->PRCR = 0xa500;
+}
+
+void ra_mstpcrb_start(uint32_t mod_mask) {
+    system_reg->PRCR = 0xa502;
+    mstp_reg->MSTPCRB &= ~mod_mask;
+    system_reg->PRCR = 0xa500;
+}
+
+void ra_mstpcrc_stop(uint32_t mod_mask) {
+    system_reg->PRCR = 0xa502;
+    mstp_reg->MSTPCRC |= mod_mask;
+    system_reg->PRCR = 0xa500;
+}
+
+void ra_mstpcrc_start(uint32_t mod_mask) {
+    system_reg->PRCR = 0xa502;
+    mstp_reg->MSTPCRC &= ~mod_mask;
+    system_reg->PRCR = 0xa500;
+}
+
+void ra_mstpcrd_stop(uint32_t mod_mask) {
+    system_reg->PRCR = 0xa502;
+    mstp_reg->MSTPCRD |= mod_mask;
+    system_reg->PRCR = 0xa500;
+}
+
+void ra_mstpcrd_start(uint32_t mod_mask) {
+    system_reg->PRCR = 0xa502;
+    mstp_reg->MSTPCRD &= ~mod_mask;
+    system_reg->PRCR = 0xa500;
+}
+
+__WEAK void ctsu_write_isr(void) {
+    // dummy
+}
+
+__WEAK void ctsu_read_isr(void) {
+    // dummy
+}
+
+__WEAK void ctsu_end_isr(void) {
+    // dummy
+}
diff --git a/ports/renesas-ra/ra/ra_utils.h b/ports/renesas-ra/ra/ra_utils.h
new file mode 100644
index 0000000000000..4da30d06cff3d
--- /dev/null
+++ b/ports/renesas-ra/ra/ra_utils.h
@@ -0,0 +1,56 @@
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Renesas Electronics Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#ifndef RA_RA_UTILS_H_
+#define RA_RA_UTILS_H_
+
+#include <stdint.h>
+#include <stdbool.h>
+
+__attribute__((always_inline)) static inline void ra_enable_irq(__attribute__((unused)) uint32_t state) {
+    __asm__ volatile ("cpsie f"
+        :
+        :
+        : "memory");
+}
+
+__attribute__((always_inline)) static inline uint32_t ra_disable_irq(void) {
+    uint32_t state;
+    __asm__ volatile ("cpsid f"
+        : "=r" (state)
+        :
+        : "memory");
+    return state;
+}
+
+void ra_mstpcra_stop(uint32_t mod_mask);
+void ra_mstpcra_start(uint32_t mod_mask);
+void ra_mstpcrb_stop(uint32_t mod_mask);
+void ra_mstpcrb_start(uint32_t mod_mask);
+void ra_mstpcrc_stop(uint32_t mod_mask);
+void ra_mstpcrc_start(uint32_t mod_mask);
+void ra_mstpcrd_stop(uint32_t mod_mask);
+void ra_mstpcrd_start(uint32_t mod_mask);
+
+#endif /* RA_RA_UTILS_H_ */
diff --git a/ports/renesas-ra/ra_it.c b/ports/renesas-ra/ra_it.c
new file mode 100644
index 0000000000000..de5a4e8daa7cc
--- /dev/null
+++ b/ports/renesas-ra/ra_it.c
@@ -0,0 +1,244 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013, 2014 Damien P. George
+ * Copyright (c) 2021, 2022 Renesas Electronics Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include <stdio.h>
+
+#include "py/obj.h"
+#include "py/mphal.h"
+#include "ra_it.h"
+#include "pendsv.h"
+#include "irq.h"
+#include "powerctrl.h"
+#include "pybthread.h"
+#include "gccollect.h"
+#include "extint.h"
+#include "timer.h"
+#include "uart.h"
+#include "storage.h"
+
+extern void __fatal_error(const char *);
+
+/******************************************************************************/
+/*            Cortex-M4 Processor Exceptions Handlers                         */
+/******************************************************************************/
+
+// Set the following to 1 to get some more information on the Hard Fault
+// More information about decoding the fault registers can be found here:
+// http://infocenter.arm.com/help/index.jsp?topic=/com.arm.doc.dui0646a/Cihdjcfc.html
+
+STATIC char *fmt_hex(uint32_t val, char *buf) {
+    const char *hexDig = "0123456789abcdef";
+
+    buf[0] = hexDig[(val >> 28) & 0x0f];
+    buf[1] = hexDig[(val >> 24) & 0x0f];
+    buf[2] = hexDig[(val >> 20) & 0x0f];
+    buf[3] = hexDig[(val >> 16) & 0x0f];
+    buf[4] = hexDig[(val >> 12) & 0x0f];
+    buf[5] = hexDig[(val >> 8) & 0x0f];
+    buf[6] = hexDig[(val >> 4) & 0x0f];
+    buf[7] = hexDig[(val >> 0) & 0x0f];
+    buf[8] = '\0';
+
+    return buf;
+}
+
+STATIC void print_reg(const char *label, uint32_t val) {
+    char hexStr[9];
+
+    mp_hal_stdout_tx_str(label);
+    mp_hal_stdout_tx_str(fmt_hex(val, hexStr));
+    mp_hal_stdout_tx_str("\r\n");
+}
+
+STATIC void print_hex_hex(const char *label, uint32_t val1, uint32_t val2) {
+    char hex_str[9];
+    mp_hal_stdout_tx_str(label);
+    mp_hal_stdout_tx_str(fmt_hex(val1, hex_str));
+    mp_hal_stdout_tx_str("  ");
+    mp_hal_stdout_tx_str(fmt_hex(val2, hex_str));
+    mp_hal_stdout_tx_str("\r\n");
+}
+
+// The ARMv7M Architecture manual (section B.1.5.6) says that upon entry
+// to an exception, that the registers will be in the following order on the
+// // stack: R0, R1, R2, R3, R12, LR, PC, XPSR
+
+typedef struct {
+    uint32_t r0, r1, r2, r3, r12, lr, pc, xpsr;
+} ExceptionRegisters_t;
+
+int pyb_hard_fault_debug = 0;
+
+void HardFault_C_Handler(ExceptionRegisters_t *regs) {
+    if (!pyb_hard_fault_debug) {
+        powerctrl_mcu_reset();
+    }
+
+    #if MICROPY_HW_ENABLE_USB
+    // We need to disable the USB so it doesn't try to write data out on
+    // the VCP and then block indefinitely waiting for the buffer to drain.
+    pyb_usb_flags = 0;
+    #endif
+
+    mp_hal_stdout_tx_str("HardFault\r\n");
+
+    print_reg("R0    ", regs->r0);
+    print_reg("R1    ", regs->r1);
+    print_reg("R2    ", regs->r2);
+    print_reg("R3    ", regs->r3);
+    print_reg("R12   ", regs->r12);
+    print_reg("SP    ", (uint32_t)regs);
+    print_reg("LR    ", regs->lr);
+    print_reg("PC    ", regs->pc);
+    print_reg("XPSR  ", regs->xpsr);
+
+    #if __CORTEX_M >= 3
+    uint32_t cfsr = SCB->CFSR;
+
+    print_reg("HFSR  ", SCB->HFSR);
+    print_reg("CFSR  ", cfsr);
+    if (cfsr & 0x80) {
+        print_reg("MMFAR ", SCB->MMFAR);
+    }
+    if (cfsr & 0x8000) {
+        print_reg("BFAR  ", SCB->BFAR);
+    }
+    #endif
+
+    if ((void *)&_ram_start <= (void *)regs && (void *)regs < (void *)&_ram_end) {
+        mp_hal_stdout_tx_str("Stack:\r\n");
+        uint32_t *stack_top = &_estack;
+        if ((void *)regs < (void *)&_sstack) {
+            // stack not in static stack area so limit the amount we print
+            stack_top = (uint32_t *)regs + 32;
+        }
+        for (uint32_t *sp = (uint32_t *)regs; sp < stack_top; ++sp) {
+            print_hex_hex("  ", (uint32_t)sp, *sp);
+        }
+    }
+
+    /* Go to infinite loop when Hard Fault exception occurs */
+    while (1) {
+        __fatal_error("HardFault");
+    }
+}
+
+// Naked functions have no compiler generated gunk, so are the best thing to
+// use for asm functions.
+__attribute__((naked))
+void HardFault_Handler(void) {
+
+    // From the ARMv7M Architecture Reference Manual, section B.1.5.6
+    // on entry to the Exception, the LR register contains, amongst other
+    // things, the value of CONTROL.SPSEL. This can be found in bit 3.
+    //
+    // If CONTROL.SPSEL is 0, then the exception was stacked up using the
+    // main stack pointer (aka MSP). If CONTROL.SPSEL is 1, then the exception
+    // was stacked up using the process stack pointer (aka PSP).
+
+    #if __CORTEX_M == 0
+    __asm volatile (
+        " mov r0, lr    \n"
+        " lsr r0, r0, #3 \n"    // Shift Bit 3 into carry to see which stack pointer we should use.
+        " mrs r0, msp   \n"     // Make R0 point to main stack pointer
+        " bcc .use_msp  \n"     // Keep MSP in R0 if SPSEL (carry) is 0
+        " mrs r0, psp   \n"     // Make R0 point to process stack pointer
+        " .use_msp:     \n"
+        " b HardFault_C_Handler \n" // Off to C land
+        );
+    #else
+    __asm volatile (
+        " tst lr, #4    \n"     // Test Bit 3 to see which stack pointer we should use.
+        " ite eq        \n"     // Tell the assembler that the nest 2 instructions are if-then-else
+        " mrseq r0, msp \n"     // Make R0 point to main stack pointer
+        " mrsne r0, psp \n"     // Make R0 point to process stack pointer
+        " b HardFault_C_Handler \n" // Off to C land
+        );
+    #endif
+}
+
+#if 0
+/**
+  * @brief   This function handles NMI exception.
+  * @param  None
+  * @retval None
+  */
+void NMI_Handler(void) {
+}
+#endif
+
+/**
+  * @brief  This function handles Memory Manage exception.
+  * @param  None
+  * @retval None
+  */
+void MemManage_Handler(void) {
+    /* Go to infinite loop when Memory Manage exception occurs */
+    while (1) {
+        __fatal_error("MemManage");
+    }
+}
+
+/**
+  * @brief  This function handles Bus Fault exception.
+  * @param  None
+  * @retval None
+  */
+void BusFault_Handler(void) {
+    /* Go to infinite loop when Bus Fault exception occurs */
+    while (1) {
+        __fatal_error("BusFault");
+    }
+}
+
+/**
+  * @brief  This function handles Usage Fault exception.
+  * @param  None
+  * @retval None
+  */
+void UsageFault_Handler(void) {
+    /* Go to infinite loop when Usage Fault exception occurs */
+    while (1) {
+        __fatal_error("UsageFault");
+    }
+}
+
+/**
+  * @brief  This function handles SVCall exception.
+  * @param  None
+  * @retval None
+  */
+void SVC_Handler(void) {
+}
+
+/**
+  * @brief  This function handles Debug Monitor exception.
+  * @param  None
+  * @retval None
+  */
+void DebugMon_Handler(void) {
+}
diff --git a/ports/renesas-ra/ra_it.h b/ports/renesas-ra/ra_it.h
new file mode 100644
index 0000000000000..beec74f4f9d1b
--- /dev/null
+++ b/ports/renesas-ra/ra_it.h
@@ -0,0 +1,42 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013, 2014 Damien P. George
+ * Copyright (c) 2021,2022 Renesas Electronics Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+#ifndef MICROPY_INCLUDED_RENESAS_RA_IT_H
+#define MICROPY_INCLUDED_RENESAS_RA_IT_H
+
+extern int pyb_hard_fault_debug;
+
+void NMI_Handler(void);
+void HardFault_Handler(void);
+void MemManage_Handler(void);
+void BusFault_Handler(void);
+void UsageFault_Handler(void);
+void SVC_Handler(void);
+void DebugMon_Handler(void);
+void PendSV_Handler(void);
+void SysTick_Handler(void);
+
+#endif // MICROPY_INCLUDED_RENESAS_RA_IT_H
diff --git a/ports/renesas-ra/rtc.h b/ports/renesas-ra/rtc.h
new file mode 100644
index 0000000000000..1aec48aea1162
--- /dev/null
+++ b/ports/renesas-ra/rtc.h
@@ -0,0 +1,69 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013, 2014 Damien P. George
+ * Copyright (c) 2021 Renesas Electronics Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+#ifndef MICROPY_INCLUDED_RA_RTC_H
+#define MICROPY_INCLUDED_RA_RTC_H
+
+#include "py/obj.h"
+extern const mp_obj_type_t pyb_rtc_type;
+
+typedef struct
+{
+    uint8_t Hours;
+    uint8_t Minutes;
+    uint8_t Seconds;
+    uint8_t TimeFormat;
+    uint32_t SubSeconds;
+    uint32_t SecondFraction;
+    uint32_t DayLightSaving;
+    uint32_t StoreOperation;
+} RTC_TimeTypeDef;
+
+/**
+  * @brief  RTC Date structure definition
+  */
+typedef struct
+{
+    uint8_t WeekDay;
+    uint8_t Month;
+    uint8_t Date;
+    uint8_t Year;
+} RTC_DateTypeDef;
+
+#define RTC_FORMAT_BIN                      0x000000000U
+#define RTC_FORMAT_BCD                      0x000000001U
+
+#define DUMMY_DATE {0, 11, 4, 18}
+#define DUMMY_TIME {12, 0, 0, 0, 0, 0, 0, 0}
+
+void rtc_get_time(RTC_TimeTypeDef *time);
+void rtc_get_date(RTC_DateTypeDef *date);
+void rtc_init_start(bool force_init);
+void rtc_init_finalise(void);
+
+mp_obj_t pyb_rtc_wakeup(size_t n_args, const mp_obj_t *args);
+
+#endif // MICROPY_INCLUDED_RA_RTC_H
diff --git a/ports/renesas-ra/softtimer.c b/ports/renesas-ra/softtimer.c
new file mode 100644
index 0000000000000..c9c59cab0eed0
--- /dev/null
+++ b/ports/renesas-ra/softtimer.c
@@ -0,0 +1,148 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2019 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include <stdint.h>
+#include "py/gc.h"
+#include "py/mphal.h"
+#include "py/runtime.h"
+#include "irq.h"
+#include "softtimer.h"
+
+#define TICKS_PERIOD 0x80000000
+#define TICKS_DIFF(t1, t0) ((int32_t)(((t1 - t0 + TICKS_PERIOD / 2) & (TICKS_PERIOD - 1)) - TICKS_PERIOD / 2))
+
+extern __IO uint32_t uwTick;
+
+volatile uint32_t soft_timer_next;
+
+// Pointer to the pairheap of soft timer objects.
+// This may contain bss/data pointers as well as GC-heap pointers,
+// and is explicitly GC traced by soft_timer_gc_mark_all().
+STATIC soft_timer_entry_t *soft_timer_heap;
+
+STATIC int soft_timer_lt(mp_pairheap_t *n1, mp_pairheap_t *n2) {
+    soft_timer_entry_t *e1 = (soft_timer_entry_t *)n1;
+    soft_timer_entry_t *e2 = (soft_timer_entry_t *)n2;
+    return TICKS_DIFF(e1->expiry_ms, e2->expiry_ms) < 0;
+}
+
+STATIC void soft_timer_schedule_systick(uint32_t ticks_ms) {
+    uint32_t irq_state = disable_irq();
+    uint32_t uw_tick = uwTick;
+    if (TICKS_DIFF(ticks_ms, uw_tick) <= 0) {
+        soft_timer_next = uw_tick + 1;
+    } else {
+        soft_timer_next = ticks_ms;
+    }
+    enable_irq(irq_state);
+}
+
+void soft_timer_deinit(void) {
+    // Pop off all the nodes which are allocated on the GC-heap.
+    uint32_t irq_state = raise_irq_pri(IRQ_PRI_PENDSV);
+    soft_timer_entry_t *heap_from = soft_timer_heap;
+    soft_timer_entry_t *heap_to = (soft_timer_entry_t *)mp_pairheap_new(soft_timer_lt);
+    while (heap_from != NULL) {
+        soft_timer_entry_t *entry = (soft_timer_entry_t *)mp_pairheap_peek(soft_timer_lt, &heap_from->pairheap);
+        heap_from = (soft_timer_entry_t *)mp_pairheap_pop(soft_timer_lt, &heap_from->pairheap);
+        if (!(entry->flags & SOFT_TIMER_FLAG_GC_ALLOCATED)) {
+            heap_to = (soft_timer_entry_t *)mp_pairheap_push(soft_timer_lt, &heap_to->pairheap, &entry->pairheap);
+        }
+    }
+    soft_timer_heap = heap_to;
+    restore_irq_pri(irq_state);
+}
+
+// Must be executed at IRQ_PRI_PENDSV
+void soft_timer_handler(void) {
+    uint32_t ticks_ms = uwTick;
+    soft_timer_entry_t *heap = soft_timer_heap;
+    while (heap != NULL && TICKS_DIFF(heap->expiry_ms, ticks_ms) <= 0) {
+        soft_timer_entry_t *entry = heap;
+        heap = (soft_timer_entry_t *)mp_pairheap_pop(soft_timer_lt, &heap->pairheap);
+        if (entry->flags & SOFT_TIMER_FLAG_PY_CALLBACK) {
+            mp_sched_schedule(entry->py_callback, MP_OBJ_FROM_PTR(entry));
+        } else {
+            entry->c_callback(entry);
+        }
+        if (entry->mode == SOFT_TIMER_MODE_PERIODIC) {
+            entry->expiry_ms += entry->delta_ms;
+            heap = (soft_timer_entry_t *)mp_pairheap_push(soft_timer_lt, &heap->pairheap, &entry->pairheap);
+        }
+    }
+    soft_timer_heap = heap;
+    if (heap == NULL) {
+        // No more timers left, set largest delay possible
+        soft_timer_next = uwTick;
+    } else {
+        // Set soft_timer_next so SysTick calls us back at the correct time
+        soft_timer_schedule_systick(heap->expiry_ms);
+    }
+}
+
+void soft_timer_gc_mark_all(void) {
+    // Mark all soft timer nodes that are allocated on the GC-heap.
+    // To avoid deep C recursion, pop and recreate the pairheap as nodes are marked.
+    uint32_t irq_state = raise_irq_pri(IRQ_PRI_PENDSV);
+    soft_timer_entry_t *heap_from = soft_timer_heap;
+    soft_timer_entry_t *heap_to = (soft_timer_entry_t *)mp_pairheap_new(soft_timer_lt);
+    while (heap_from != NULL) {
+        soft_timer_entry_t *entry = (soft_timer_entry_t *)mp_pairheap_peek(soft_timer_lt, &heap_from->pairheap);
+        heap_from = (soft_timer_entry_t *)mp_pairheap_pop(soft_timer_lt, &heap_from->pairheap);
+        if (entry->flags & SOFT_TIMER_FLAG_GC_ALLOCATED) {
+            gc_collect_root((void **)&entry, 1);
+        }
+        heap_to = (soft_timer_entry_t *)mp_pairheap_push(soft_timer_lt, &heap_to->pairheap, &entry->pairheap);
+    }
+    soft_timer_heap = heap_to;
+    restore_irq_pri(irq_state);
+}
+
+void soft_timer_static_init(soft_timer_entry_t *entry, uint16_t mode, uint32_t delta_ms, void (*cb)(soft_timer_entry_t *)) {
+    mp_pairheap_init_node(soft_timer_lt, &entry->pairheap);
+    entry->flags = 0;
+    entry->mode = mode;
+    entry->delta_ms = delta_ms;
+    entry->c_callback = cb;
+}
+
+void soft_timer_insert(soft_timer_entry_t *entry, uint32_t initial_delta_ms) {
+    mp_pairheap_init_node(soft_timer_lt, &entry->pairheap);
+    entry->expiry_ms = mp_hal_ticks_ms() + initial_delta_ms;
+    uint32_t irq_state = raise_irq_pri(IRQ_PRI_PENDSV);
+    soft_timer_heap = (soft_timer_entry_t *)mp_pairheap_push(soft_timer_lt, &soft_timer_heap->pairheap, &entry->pairheap);
+    if (entry == soft_timer_heap) {
+        // This new timer became the earliest one so set soft_timer_next
+        soft_timer_schedule_systick(entry->expiry_ms);
+    }
+    restore_irq_pri(irq_state);
+}
+
+void soft_timer_remove(soft_timer_entry_t *entry) {
+    uint32_t irq_state = raise_irq_pri(IRQ_PRI_PENDSV);
+    soft_timer_heap = (soft_timer_entry_t *)mp_pairheap_delete(soft_timer_lt, &soft_timer_heap->pairheap, &entry->pairheap);
+    restore_irq_pri(irq_state);
+}
diff --git a/ports/renesas-ra/softtimer.h b/ports/renesas-ra/softtimer.h
new file mode 100644
index 0000000000000..aec885c547360
--- /dev/null
+++ b/ports/renesas-ra/softtimer.h
@@ -0,0 +1,66 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2019 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+#ifndef MICROPY_INCLUDED_RENESAS_RA_SOFTTIMER_H
+#define MICROPY_INCLUDED_RENESAS_RA_SOFTTIMER_H
+
+#include "py/pairheap.h"
+
+#define SOFT_TIMER_FLAG_PY_CALLBACK (1)
+#define SOFT_TIMER_FLAG_GC_ALLOCATED (2)
+
+#define SOFT_TIMER_MODE_ONE_SHOT (1)
+#define SOFT_TIMER_MODE_PERIODIC (2)
+
+typedef struct _soft_timer_entry_t {
+    mp_pairheap_t pairheap;
+    uint16_t flags;
+    uint16_t mode;
+    uint32_t expiry_ms;
+    uint32_t delta_ms; // for periodic mode
+    union {
+        void (*c_callback)(struct _soft_timer_entry_t *);
+        mp_obj_t py_callback;
+    };
+} soft_timer_entry_t;
+
+extern volatile uint32_t soft_timer_next;
+
+void soft_timer_deinit(void);
+void soft_timer_handler(void);
+void soft_timer_gc_mark_all(void);
+
+void soft_timer_static_init(soft_timer_entry_t *entry, uint16_t mode, uint32_t delta_ms, void (*cb)(soft_timer_entry_t *));
+void soft_timer_insert(soft_timer_entry_t *entry, uint32_t initial_delta_ms);
+void soft_timer_remove(soft_timer_entry_t *entry);
+
+// The timer will be reinserted into the heap so that it is called after initial_delta_ms milliseconds.
+// After that, if it's periodic, it will continue to be called every entry->delta_ms milliseconds.
+static inline void soft_timer_reinsert(soft_timer_entry_t *entry, uint32_t initial_delta_ms) {
+    soft_timer_remove(entry);
+    soft_timer_insert(entry, initial_delta_ms);
+}
+
+#endif // MICROPY_INCLUDED_RENESAS_RA_SOFTTIMER_H
diff --git a/ports/renesas-ra/spi.h b/ports/renesas-ra/spi.h
new file mode 100644
index 0000000000000..47d9c13567e36
--- /dev/null
+++ b/ports/renesas-ra/spi.h
@@ -0,0 +1,44 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013, 2014 Damien P. George
+ * Copyright (c) 2021, 2022 Renesas Electronics Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#ifndef MICROPY_INCLUDED_RA_SPI_H
+#define MICROPY_INCLUDED_RA_SPI_H
+
+// A transfer of "len" bytes should take len*8*1000/baudrate milliseconds.
+// To simplify the calculation we assume the baudrate is never less than 8kHz
+// and use that value for the baudrate in the formula, plus a small constant.
+#define SPI_TRANSFER_TIMEOUT(len) ((len) + 100)
+
+void spi_init0(void);
+void spi_init(uint32_t ch);
+void spi_deinit(uint32_t ch);
+int spi_find_index(mp_obj_t id);
+void spi_set_params(uint32_t ch, int32_t baudrate,
+    int32_t polarity, int32_t phase, int32_t bits, int32_t firstbit);
+void spi_transfer(uint32_t ch, uint32_t bits, size_t len, const uint8_t *src, uint8_t *dest, uint32_t timeout);
+
+#endif // MICROPY_INCLUDED_RA_SPI_H
diff --git a/ports/renesas-ra/storage.c b/ports/renesas-ra/storage.c
new file mode 100644
index 0000000000000..dad9991885572
--- /dev/null
+++ b/ports/renesas-ra/storage.c
@@ -0,0 +1,429 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013-2018 Damien P. George
+ * Copyright (c) 2021 Renesas Electronics Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include <stdint.h>
+#include <string.h>
+
+#include "py/runtime.h"
+#include "py/mperrno.h"
+#include "extmod/vfs_fat.h"
+
+#include "systick.h"
+#include "led.h"
+#include "storage.h"
+#include "irq.h"
+
+#if MICROPY_HW_ENABLE_STORAGE
+
+#define STORAGE_SYSTICK_MASK    (0x1ff) // 512ms
+#define STORAGE_IDLE_TICK(tick) (((tick) & ~(SYSTICK_DISPATCH_NUM_SLOTS - 1) & STORAGE_SYSTICK_MASK) == 0)
+
+#if defined(MICROPY_HW_BDEV2_IOCTL)
+#define FLASH_PART2_START_BLOCK (FLASH_PART1_START_BLOCK + MICROPY_HW_BDEV2_IOCTL(BDEV_IOCTL_NUM_BLOCKS, 0))
+#endif
+
+static bool storage_is_initialised = false;
+
+// ToDo: check how to implement
+// static void storage_systick_callback(uint32_t ticks_ms);
+
+void storage_init(void) {
+    if (!storage_is_initialised) {
+        storage_is_initialised = true;
+
+        MICROPY_HW_BDEV_IOCTL(BDEV_IOCTL_INIT, 0);
+
+        #if defined(MICROPY_HW_BDEV2_IOCTL)
+        MICROPY_HW_BDEV2_IOCTL(BDEV_IOCTL_INIT, 0);
+        #endif
+    }
+}
+
+uint32_t storage_get_block_size(void) {
+    return FLASH_BLOCK_SIZE;
+}
+
+uint32_t storage_get_block_count(void) {
+    #if defined(MICROPY_HW_BDEV2_IOCTL)
+    return FLASH_PART2_START_BLOCK + MICROPY_HW_BDEV2_IOCTL(BDEV_IOCTL_NUM_BLOCKS, 0);
+    #else
+    return FLASH_PART1_START_BLOCK + MICROPY_HW_BDEV_IOCTL(BDEV_IOCTL_NUM_BLOCKS, 0);
+    #endif
+}
+
+void storage_irq_handler(void) {
+    MICROPY_HW_BDEV_IOCTL(BDEV_IOCTL_IRQ_HANDLER, 0);
+    #if defined(MICROPY_HW_BDEV2_IOCTL)
+    MICROPY_HW_BDEV2_IOCTL(BDEV_IOCTL_IRQ_HANDLER, 0);
+    #endif
+}
+
+void storage_flush(void) {
+    MICROPY_HW_BDEV_IOCTL(BDEV_IOCTL_SYNC, 0);
+    #if defined(MICROPY_HW_BDEV2_IOCTL)
+    MICROPY_HW_BDEV2_IOCTL(BDEV_IOCTL_SYNC, 0);
+    #endif
+}
+
+static void build_partition(uint8_t *buf, int boot, int type, uint32_t start_block, uint32_t num_blocks) {
+    buf[0] = boot;
+
+    if (num_blocks == 0) {
+        buf[1] = 0;
+        buf[2] = 0;
+        buf[3] = 0;
+    } else {
+        buf[1] = 0xff;
+        buf[2] = 0xff;
+        buf[3] = 0xff;
+    }
+
+    buf[4] = type;
+
+    if (num_blocks == 0) {
+        buf[5] = 0;
+        buf[6] = 0;
+        buf[7] = 0;
+    } else {
+        buf[5] = 0xff;
+        buf[6] = 0xff;
+        buf[7] = 0xff;
+    }
+
+    buf[8] = start_block;
+    buf[9] = start_block >> 8;
+    buf[10] = start_block >> 16;
+    buf[11] = start_block >> 24;
+
+    buf[12] = num_blocks;
+    buf[13] = num_blocks >> 8;
+    buf[14] = num_blocks >> 16;
+    buf[15] = num_blocks >> 24;
+}
+
+bool storage_read_block(uint8_t *dest, uint32_t block) {
+    // printf("RD %u\n", block);
+    if (block == 0) {
+        // fake the MBR so we can decide on our own partition table
+
+        for (int i = 0; i < 446; i++) {
+            dest[i] = 0;
+        }
+
+        build_partition(dest + 446, 0, 0x01 /* FAT12 */, FLASH_PART1_START_BLOCK, MICROPY_HW_BDEV_IOCTL(BDEV_IOCTL_NUM_BLOCKS, 0));
+        #if defined(MICROPY_HW_BDEV2_IOCTL)
+        build_partition(dest + 462, 0, 0x01 /* FAT12 */, FLASH_PART2_START_BLOCK, MICROPY_HW_BDEV2_IOCTL(BDEV_IOCTL_NUM_BLOCKS, 0));
+        #else
+        build_partition(dest + 462, 0, 0, 0, 0);
+        #endif
+        build_partition(dest + 478, 0, 0, 0, 0);
+        build_partition(dest + 494, 0, 0, 0, 0);
+
+        dest[510] = 0x55;
+        dest[511] = 0xaa;
+
+        return true;
+
+    #if defined(MICROPY_HW_BDEV_READBLOCK)
+    } else if (FLASH_PART1_START_BLOCK <= block && block < FLASH_PART1_START_BLOCK + MICROPY_HW_BDEV_IOCTL(BDEV_IOCTL_NUM_BLOCKS, 0)) {
+        return MICROPY_HW_BDEV_READBLOCK(dest, block - FLASH_PART1_START_BLOCK);
+    #endif
+    } else {
+        return false;
+    }
+}
+
+bool storage_write_block(const uint8_t *src, uint32_t block) {
+    // printf("WR %u\n", block);
+    if (block == 0) {
+        // can't write MBR, but pretend we did
+        return true;
+    #if defined(MICROPY_HW_BDEV_WRITEBLOCK)
+    } else if (FLASH_PART1_START_BLOCK <= block && block < FLASH_PART1_START_BLOCK + MICROPY_HW_BDEV_IOCTL(BDEV_IOCTL_NUM_BLOCKS, 0)) {
+        return MICROPY_HW_BDEV_WRITEBLOCK(src, block - FLASH_PART1_START_BLOCK);
+    #endif
+    } else {
+        return false;
+    }
+}
+
+int storage_read_blocks(uint8_t *dest, uint32_t block_num, uint32_t num_blocks) {
+    #if defined(MICROPY_HW_BDEV_READBLOCKS)
+    if (FLASH_PART1_START_BLOCK <= block_num && block_num + num_blocks <= FLASH_PART1_START_BLOCK + MICROPY_HW_BDEV_IOCTL(BDEV_IOCTL_NUM_BLOCKS, 0)) {
+        return MICROPY_HW_BDEV_READBLOCKS(dest, block_num - FLASH_PART1_START_BLOCK, num_blocks);
+    }
+    #endif
+
+    #if defined(MICROPY_HW_BDEV2_READBLOCKS)
+    if (FLASH_PART2_START_BLOCK <= block_num && block_num + num_blocks <= FLASH_PART2_START_BLOCK + MICROPY_HW_BDEV2_IOCTL(BDEV_IOCTL_NUM_BLOCKS, 0)) {
+        return MICROPY_HW_BDEV2_READBLOCKS(dest, block_num - FLASH_PART2_START_BLOCK, num_blocks);
+    }
+    #endif
+
+    for (size_t i = 0; i < num_blocks; i++) {
+        if (!storage_read_block(dest + i * FLASH_BLOCK_SIZE, block_num + i)) {
+            return -MP_EIO; // error
+        }
+    }
+    return 0; // success
+}
+
+int storage_write_blocks(const uint8_t *src, uint32_t block_num, uint32_t num_blocks) {
+    #if defined(MICROPY_HW_BDEV_WRITEBLOCKS)
+    if (FLASH_PART1_START_BLOCK <= block_num && block_num + num_blocks <= FLASH_PART1_START_BLOCK + MICROPY_HW_BDEV_IOCTL(BDEV_IOCTL_NUM_BLOCKS, 0)) {
+        return MICROPY_HW_BDEV_WRITEBLOCKS(src, block_num - FLASH_PART1_START_BLOCK, num_blocks);
+    }
+    #endif
+
+    #if defined(MICROPY_HW_BDEV2_WRITEBLOCKS)
+    if (FLASH_PART2_START_BLOCK <= block_num && block_num + num_blocks <= FLASH_PART2_START_BLOCK + MICROPY_HW_BDEV2_IOCTL(BDEV_IOCTL_NUM_BLOCKS, 0)) {
+        return MICROPY_HW_BDEV2_WRITEBLOCKS(src, block_num - FLASH_PART2_START_BLOCK, num_blocks);
+    }
+    #endif
+
+    for (size_t i = 0; i < num_blocks; i++) {
+        if (!storage_write_block(src + i * FLASH_BLOCK_SIZE, block_num + i)) {
+            return -MP_EIO; // error
+        }
+    }
+    return 0; // success
+}
+
+/******************************************************************************/
+// MicroPython bindings
+//
+// Expose the flash as an object with the block protocol.
+
+#if (MICROPY_VFS_LFS1 || MICROPY_VFS_LFS2) && MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE
+// Board uses littlefs and internal flash, so enable extended block protocol on internal flash
+#define PYB_FLASH_NATIVE_BLOCK_SIZE (FLASH_BLOCK_SIZE)
+#define MICROPY_HW_BDEV_READBLOCKS_EXT(dest, bl, off, len) (flash_bdev_readblocks_ext((dest), (bl), (off), (len)))
+#define MICROPY_HW_BDEV_WRITEBLOCKS_EXT(dest, bl, off, len) (flash_bdev_writeblocks_ext((dest), (bl), (off), (len)))
+#endif
+
+#ifndef PYB_FLASH_NATIVE_BLOCK_SIZE
+#define PYB_FLASH_NATIVE_BLOCK_SIZE (FLASH_BLOCK_SIZE)
+#endif
+
+#if defined(MICROPY_HW_BDEV_READBLOCKS_EXT)
+// Size of blocks is PYB_FLASH_NATIVE_BLOCK_SIZE
+int storage_readblocks_ext(uint8_t *dest, uint32_t block, uint32_t offset, uint32_t len) {
+    return MICROPY_HW_BDEV_READBLOCKS_EXT(dest, block, offset, len);
+}
+#endif
+
+typedef struct _pyb_flash_obj_t {
+    mp_obj_base_t base;
+    uint32_t start; // in bytes
+    uint32_t len; // in bytes
+} pyb_flash_obj_t;
+
+// This Flash object represents the entire available flash, with emulated partition table at start
+const pyb_flash_obj_t pyb_flash_obj = {
+    { &pyb_flash_type },
+    -(FLASH_PART1_START_BLOCK * FLASH_BLOCK_SIZE), // to offset FLASH_PART1_START_BLOCK
+    0, // actual size handled in ioctl, MP_BLOCKDEV_IOCTL_BLOCK_COUNT case
+};
+
+STATIC void pyb_flash_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+    pyb_flash_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    if (self == &pyb_flash_obj) {
+        mp_printf(print, "Flash()");
+    } else {
+        mp_printf(print, "Flash(start=%u, len=%u)", self->start, self->len);
+    }
+}
+
+STATIC mp_obj_t pyb_flash_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
+    // Parse arguments
+    enum { ARG_start, ARG_len };
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_start, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} },
+        { MP_QSTR_len,   MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} },
+    };
+    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
+    mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
+
+    if (args[ARG_start].u_int == -1 && args[ARG_len].u_int == -1) {
+        // Default singleton object that accesses entire flash, including virtual partition table
+        return MP_OBJ_FROM_PTR(&pyb_flash_obj);
+    }
+
+    pyb_flash_obj_t *self = m_new_obj(pyb_flash_obj_t);
+    self->base.type = &pyb_flash_type;
+
+    uint32_t bl_len = (storage_get_block_count() - FLASH_PART1_START_BLOCK) * FLASH_BLOCK_SIZE;
+
+    mp_int_t start = args[ARG_start].u_int;
+    if (start == -1) {
+        start = 0;
+    } else if (!(0 <= start && start < bl_len && start % PYB_FLASH_NATIVE_BLOCK_SIZE == 0)) {
+        mp_raise_ValueError(NULL);
+    }
+
+    mp_int_t len = args[ARG_len].u_int;
+    if (len == -1) {
+        len = bl_len - start;
+    } else if (!(0 < len && start + len <= bl_len && len % PYB_FLASH_NATIVE_BLOCK_SIZE == 0)) {
+        mp_raise_ValueError(NULL);
+    }
+
+    self->start = start;
+    self->len = len;
+
+    return MP_OBJ_FROM_PTR(self);
+}
+
+STATIC mp_obj_t pyb_flash_readblocks(size_t n_args, const mp_obj_t *args) {
+    pyb_flash_obj_t *self = MP_OBJ_TO_PTR(args[0]);
+    uint32_t block_num = mp_obj_get_int(args[1]);
+    mp_buffer_info_t bufinfo;
+    mp_get_buffer_raise(args[2], &bufinfo, MP_BUFFER_WRITE);
+    mp_uint_t ret = -MP_EIO;
+    if (n_args == 3) {
+        // Cast self->start to signed in case it's pyb_flash_obj with negative start
+        block_num += FLASH_PART1_START_BLOCK + (int32_t)self->start / FLASH_BLOCK_SIZE;
+        ret = storage_read_blocks(bufinfo.buf, block_num, bufinfo.len / FLASH_BLOCK_SIZE);
+    }
+    #if defined(MICROPY_HW_BDEV_READBLOCKS_EXT)
+    else if (self != &pyb_flash_obj) {
+        // Extended block read on a sub-section of the flash storage
+        uint32_t offset = mp_obj_get_int(args[3]);
+        block_num += self->start / PYB_FLASH_NATIVE_BLOCK_SIZE;
+        ret = MICROPY_HW_BDEV_READBLOCKS_EXT(bufinfo.buf, block_num, offset, bufinfo.len);
+    }
+    #endif
+    return MP_OBJ_NEW_SMALL_INT(ret);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pyb_flash_readblocks_obj, 3, 4, pyb_flash_readblocks);
+
+STATIC mp_obj_t pyb_flash_writeblocks(size_t n_args, const mp_obj_t *args) {
+    pyb_flash_obj_t *self = MP_OBJ_TO_PTR(args[0]);
+    uint32_t block_num = mp_obj_get_int(args[1]);
+    mp_buffer_info_t bufinfo;
+    mp_get_buffer_raise(args[2], &bufinfo, MP_BUFFER_READ);
+    mp_uint_t ret = -MP_EIO;
+    if (n_args == 3) {
+        // Cast self->start to signed in case it's pyb_flash_obj with negative start
+        block_num += FLASH_PART1_START_BLOCK + (int32_t)self->start / FLASH_BLOCK_SIZE;
+        ret = storage_write_blocks(bufinfo.buf, block_num, bufinfo.len / FLASH_BLOCK_SIZE);
+    }
+    #if defined(MICROPY_HW_BDEV_WRITEBLOCKS_EXT)
+    else if (self != &pyb_flash_obj) {
+        // Extended block write on a sub-section of the flash storage
+        uint32_t offset = mp_obj_get_int(args[3]);
+        block_num += self->start / PYB_FLASH_NATIVE_BLOCK_SIZE;
+        ret = MICROPY_HW_BDEV_WRITEBLOCKS_EXT(bufinfo.buf, block_num, offset, bufinfo.len);
+    }
+    #endif
+    return MP_OBJ_NEW_SMALL_INT(ret);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pyb_flash_writeblocks_obj, 3, 4, pyb_flash_writeblocks);
+
+STATIC mp_obj_t pyb_flash_ioctl(mp_obj_t self_in, mp_obj_t cmd_in, mp_obj_t arg_in) {
+    pyb_flash_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    mp_int_t cmd = mp_obj_get_int(cmd_in);
+    switch (cmd) {
+        case MP_BLOCKDEV_IOCTL_INIT: {
+            mp_int_t ret = 0;
+            storage_init();
+            if (mp_obj_get_int(arg_in) == 1) {
+                // Will be using extended block protocol
+                if (self == &pyb_flash_obj) {
+                    ret = -1;
+                }
+            }
+            return MP_OBJ_NEW_SMALL_INT(ret);
+        }
+        case MP_BLOCKDEV_IOCTL_DEINIT:
+            storage_flush();
+            return MP_OBJ_NEW_SMALL_INT(0);                                             // TODO properly
+        case MP_BLOCKDEV_IOCTL_SYNC:
+            storage_flush();
+            return MP_OBJ_NEW_SMALL_INT(0);
+
+        case MP_BLOCKDEV_IOCTL_BLOCK_COUNT: {
+            mp_int_t n;
+            if (self == &pyb_flash_obj) {
+                // Get true size
+                n = storage_get_block_count();
+            } else {
+                n = self->len / FLASH_BLOCK_SIZE;
+            }
+            return MP_OBJ_NEW_SMALL_INT(n);
+        }
+
+        case MP_BLOCKDEV_IOCTL_BLOCK_SIZE: {
+            mp_int_t n = FLASH_BLOCK_SIZE;
+            return MP_OBJ_NEW_SMALL_INT(n);
+        }
+
+        case MP_BLOCKDEV_IOCTL_BLOCK_ERASE: {
+            int ret = 0;
+            return MP_OBJ_NEW_SMALL_INT(ret);
+        }
+
+        default:
+            return mp_const_none;
+    }
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_3(pyb_flash_ioctl_obj, pyb_flash_ioctl);
+
+STATIC const mp_rom_map_elem_t pyb_flash_locals_dict_table[] = {
+    { MP_ROM_QSTR(MP_QSTR_readblocks), MP_ROM_PTR(&pyb_flash_readblocks_obj) },
+    { MP_ROM_QSTR(MP_QSTR_writeblocks), MP_ROM_PTR(&pyb_flash_writeblocks_obj) },
+    { MP_ROM_QSTR(MP_QSTR_ioctl), MP_ROM_PTR(&pyb_flash_ioctl_obj) },
+};
+
+STATIC MP_DEFINE_CONST_DICT(pyb_flash_locals_dict, pyb_flash_locals_dict_table);
+
+const mp_obj_type_t pyb_flash_type = {
+    { &mp_type_type },
+    .name = MP_QSTR_Flash,
+    .print = pyb_flash_print,
+    .make_new = pyb_flash_make_new,
+    .locals_dict = (mp_obj_dict_t *)&pyb_flash_locals_dict,
+};
+
+void pyb_flash_init_vfs(fs_user_mount_t *vfs) {
+    vfs->base.type = &mp_fat_vfs_type;
+    vfs->blockdev.flags |= MP_BLOCKDEV_FLAG_NATIVE | MP_BLOCKDEV_FLAG_HAVE_IOCTL;
+    vfs->fatfs.drv = vfs;
+    #if MICROPY_FATFS_MULTI_PARTITION
+    vfs->fatfs.part = 1; // flash filesystem lives on first partition
+    #endif
+    vfs->blockdev.readblocks[0] = MP_OBJ_FROM_PTR(&pyb_flash_readblocks_obj);
+    vfs->blockdev.readblocks[1] = MP_OBJ_FROM_PTR(&pyb_flash_obj);
+    vfs->blockdev.readblocks[2] = MP_OBJ_FROM_PTR(storage_read_blocks); // native version
+    vfs->blockdev.writeblocks[0] = MP_OBJ_FROM_PTR(&pyb_flash_writeblocks_obj);
+    vfs->blockdev.writeblocks[1] = MP_OBJ_FROM_PTR(&pyb_flash_obj);
+    vfs->blockdev.writeblocks[2] = MP_OBJ_FROM_PTR(storage_write_blocks); // native version
+    vfs->blockdev.u.ioctl[0] = MP_OBJ_FROM_PTR(&pyb_flash_ioctl_obj);
+    vfs->blockdev.u.ioctl[1] = MP_OBJ_FROM_PTR(&pyb_flash_obj);
+}
+
+#endif
diff --git a/ports/renesas-ra/storage.h b/ports/renesas-ra/storage.h
new file mode 100644
index 0000000000000..683ab3de28418
--- /dev/null
+++ b/ports/renesas-ra/storage.h
@@ -0,0 +1,67 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013, 2014 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+#ifndef MICROPY_INCLUDED_RA_STORAGE_H
+#define MICROPY_INCLUDED_RA_STORAGE_H
+
+#include "drivers/memory/spiflash.h"
+
+#define FLASH_BLOCK_SIZE (512)
+#define FLASH_PART1_START_BLOCK (0x100)
+
+// Try to match Python-level VFS block protocol where possible for these constants
+enum {
+    BDEV_IOCTL_INIT = 1,
+    BDEV_IOCTL_SYNC = 3,
+    BDEV_IOCTL_NUM_BLOCKS = 4,
+    BDEV_IOCTL_BLOCK_ERASE = 6,
+    BDEV_IOCTL_IRQ_HANDLER = 7,
+};
+
+void storage_init(void);
+uint32_t storage_get_block_size(void);
+uint32_t storage_get_block_count(void);
+void storage_flush(void);
+bool storage_read_block(uint8_t *dest, uint32_t block);
+bool storage_write_block(const uint8_t *src, uint32_t block);
+
+// these return 0 on success, negative errno on error
+int storage_read_blocks(uint8_t *dest, uint32_t block_num, uint32_t num_blocks);
+int storage_write_blocks(const uint8_t *src, uint32_t block_num, uint32_t num_blocks);
+int storage_readblocks_ext(uint8_t *dest, uint32_t block, uint32_t offset, uint32_t len);
+
+int32_t flash_bdev_ioctl(uint32_t op, uint32_t arg);
+bool flash_bdev_readblock(uint8_t *dest, uint32_t block);
+bool flash_bdev_writeblock(const uint8_t *src, uint32_t block);
+int flash_bdev_readblocks_ext(uint8_t *dest, uint32_t block, uint32_t offset, uint32_t len);
+int flash_bdev_writeblocks_ext(const uint8_t *src, uint32_t block, uint32_t offset, uint32_t len);
+
+extern const struct _mp_obj_type_t pyb_flash_type;
+extern const struct _pyb_flash_obj_t pyb_flash_obj;
+
+struct _fs_user_mount_t;
+void pyb_flash_init_vfs(struct _fs_user_mount_t *vfs);
+
+#endif // MICROPY_INCLUDED_RA_STORAGE_H
diff --git a/ports/renesas-ra/systick.c b/ports/renesas-ra/systick.c
new file mode 100644
index 0000000000000..e88166b110bfb
--- /dev/null
+++ b/ports/renesas-ra/systick.c
@@ -0,0 +1,187 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013, 2014 Damien P. George
+ * Copyright (c) 2021 Renesas Electronics Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "py/runtime.h"
+#include "py/mphal.h"
+#include "irq.h"
+#include "pendsv.h"
+#include "systick.h"
+#include "softtimer.h"
+#include "pybthread.h"
+#include "hal_data.h"
+
+volatile uint32_t uwTick;
+
+uint32_t HAL_GetTick(void) {
+    return uwTick;
+}
+
+systick_dispatch_t systick_dispatch_table[SYSTICK_DISPATCH_NUM_SLOTS];
+
+void SysTick_Handler(void) {
+    // Instead of calling HAL_IncTick we do the increment here of the counter.
+    // This is purely for efficiency, since SysTick is called 1000 times per
+    // second at the highest interrupt priority.
+    uint32_t uw_tick = uwTick + 1;
+    uwTick = uw_tick;
+
+    // Read the systick control regster. This has the side effect of clearing
+    // the COUNTFLAG bit, which makes the logic in mp_hal_ticks_us
+    // work properly.
+    SysTick->CTRL;
+
+    // Dispatch to any registered handlers in a cycle
+    systick_dispatch_t f = systick_dispatch_table[uw_tick & (SYSTICK_DISPATCH_NUM_SLOTS - 1)];
+    if (f != NULL) {
+        f(uw_tick);
+    }
+
+    if (soft_timer_next == uw_tick) {
+        pendsv_schedule_dispatch(PENDSV_DISPATCH_SOFT_TIMER, soft_timer_handler);
+    }
+
+    #if MICROPY_PY_THREAD
+    if (pyb_thread_enabled) {
+        if (pyb_thread_cur->timeslice == 0) {
+            if (pyb_thread_cur->run_next != pyb_thread_cur) {
+                SCB->ICSR = SCB_ICSR_PENDSVSET_Msk;
+            }
+        } else {
+            --pyb_thread_cur->timeslice;
+        }
+    }
+    #endif
+}
+
+// We provide our own version of HAL_Delay that calls __WFI while waiting,
+// and works when interrupts are disabled.  This function is intended to be
+// used only by the ST HAL functions.
+void HAL_Delay(uint32_t Delay) {
+    if (query_irq() == IRQ_STATE_ENABLED) {
+        // IRQs enabled, so can use systick counter to do the delay
+        uint32_t start = uwTick;
+        // Wraparound of tick is taken care of by 2's complement arithmetic.
+        while (uwTick - start < Delay) {
+            // Enter sleep mode, waiting for (at least) the SysTick interrupt.
+            __WFI();
+        }
+    } else {
+        // IRQs disabled, use mp_hal_delay_ms routine.
+        mp_hal_delay_ms(Delay);
+    }
+}
+
+// Core delay function that does an efficient sleep and may switch thread context.
+// If IRQs are enabled then we must have the GIL.
+void mp_hal_delay_ms(mp_uint_t Delay) {
+    if (query_irq() == IRQ_STATE_ENABLED) {
+        // IRQs enabled, so can use systick counter to do the delay
+        uint32_t start = uwTick;
+        // Wraparound of tick is taken care of by 2's complement arithmetic.
+        do {
+            // This macro will execute the necessary idle behaviour.  It may
+            // raise an exception, switch threads or enter sleep mode (waiting for
+            // (at least) the SysTick interrupt).
+            MICROPY_EVENT_POLL_HOOK
+        } while (uwTick - start < Delay);
+    } else {
+        // IRQs disabled, so need to use a busy loop for the delay.
+        // To prevent possible overflow of the counter we use a double loop.
+        volatile uint32_t count_1ms;
+        while (Delay-- > 0) {
+            count_1ms = (MICROPY_HW_MCU_PCLK / 1000 / 10);
+            while (count_1ms-- > 0) {
+                __asm__ __volatile__ ("nop");
+            }
+        }
+    }
+}
+
+// delay for given number of microseconds
+void mp_hal_delay_us(mp_uint_t usec) {
+    if (query_irq() == IRQ_STATE_ENABLED) {
+        // IRQs enabled, so can use systick counter to do the delay
+        uint32_t start = mp_hal_ticks_us();
+        while (mp_hal_ticks_us() - start < usec) {
+        }
+    } else {
+        // IRQs disabled, so need to use a busy loop for the delay
+        volatile uint32_t ucount = (MICROPY_HW_MCU_PCLK / 1000000 / 10) * usec;
+        while (ucount-- > 0) {
+            __asm__ __volatile__ ("nop");
+        }
+    }
+}
+
+bool systick_has_passed(uint32_t start_tick, uint32_t delay_ms) {
+    return HAL_GetTick() - start_tick >= delay_ms;
+}
+
+// waits until at least delay_ms milliseconds have passed from the sampling of
+// startTick. Handles overflow properly. Assumes stc was taken from
+// HAL_GetTick() some time before calling this function.
+void systick_wait_at_least(uint32_t start_tick, uint32_t delay_ms) {
+    while (!systick_has_passed(start_tick, delay_ms)) {
+        __WFI(); // enter sleep mode, waiting for interrupt
+    }
+}
+
+mp_uint_t mp_hal_ticks_ms(void) {
+    return uwTick;
+}
+
+// The SysTick timer counts down at 168 MHz, so we can use that knowledge
+// to grab a microsecond counter.
+//
+// We assume that HAL_GetTickis returns milliseconds.
+mp_uint_t mp_hal_ticks_us(void) {
+    mp_uint_t irq_state = disable_irq();
+    uint32_t counter = SysTick->VAL;
+    uint32_t milliseconds = HAL_GetTick();
+    uint32_t status = SysTick->CTRL;
+    enable_irq(irq_state);
+
+    // It's still possible for the countflag bit to get set if the counter was
+    // reloaded between reading VAL and reading CTRL. With interrupts  disabled
+    // it definitely takes less than 50 HCLK cycles between reading VAL and
+    // reading CTRL, so the test (counter > 50) is to cover the case where VAL
+    // is +ve and very close to zero, and the COUNTFLAG bit is also set.
+    if ((status & SysTick_CTRL_COUNTFLAG_Msk) && counter > 50) {
+        // This means that the HW reloaded VAL between the time we read VAL and the
+        // time we read CTRL, which implies that there is an interrupt pending
+        // to increment the tick counter.
+        milliseconds++;
+    }
+    uint32_t load = SysTick->LOAD;
+    counter = load - counter; // Convert from decrementing to incrementing
+
+    // ((load + 1) / 1000) is the number of counts per microsecond.
+    //
+    // counter / ((load + 1) / 1000) scales from the systick clock to microseconds
+    // and is the same thing as (counter * 1000) / (load + 1)
+    return milliseconds * 1000 + (counter * 1000) / (load + 1);
+}
diff --git a/ports/renesas-ra/systick.h b/ports/renesas-ra/systick.h
new file mode 100644
index 0000000000000..a4ee50dd54a1a
--- /dev/null
+++ b/ports/renesas-ra/systick.h
@@ -0,0 +1,60 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013, 2014 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+#ifndef MICROPY_INCLUDED_RENESAS_RA_SYSTICK_H
+#define MICROPY_INCLUDED_RENESAS_RA_SYSTICK_H
+
+// Works for x between 0 and 16 inclusive
+#define POW2_CEIL(x) ((((x) - 1) | ((x) - 1) >> 1 | ((x) - 1) >> 2 | ((x) - 1) >> 3) + 1)
+
+enum {
+    SYSTICK_DISPATCH_DMA = 0,
+    #if MICROPY_HW_ENABLE_STORAGE
+    SYSTICK_DISPATCH_STORAGE,
+    #endif
+    #if MICROPY_PY_NETWORK && MICROPY_PY_LWIP
+    SYSTICK_DISPATCH_LWIP,
+    #endif
+    SYSTICK_DISPATCH_MAX
+};
+
+#define SYSTICK_DISPATCH_NUM_SLOTS POW2_CEIL(SYSTICK_DISPATCH_MAX)
+
+typedef void (*systick_dispatch_t)(uint32_t);
+
+extern systick_dispatch_t systick_dispatch_table[SYSTICK_DISPATCH_NUM_SLOTS];
+
+static inline void systick_enable_dispatch(size_t slot, systick_dispatch_t f) {
+    systick_dispatch_table[slot] = f;
+}
+
+static inline void systick_disable_dispatch(size_t slot) {
+    systick_dispatch_table[slot] = NULL;
+}
+
+void systick_wait_at_least(uint32_t stc, uint32_t delay_ms);
+bool systick_has_passed(uint32_t stc, uint32_t delay_ms);
+
+#endif // MICROPY_INCLUDED_RENESAS_RA_SYSTICK_H
diff --git a/ports/renesas-ra/timer.c b/ports/renesas-ra/timer.c
new file mode 100644
index 0000000000000..93b378ac3f67f
--- /dev/null
+++ b/ports/renesas-ra/timer.c
@@ -0,0 +1,569 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013, 2014 Damien P. George
+ * Copyright (c) 2021 Renesas Electronics Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include <stdint.h>
+#include <string.h>
+
+#include "py/runtime.h"
+#include "py/gc.h"
+#include "timer.h"
+#include "pin.h"
+#include "irq.h"
+
+#define TIMER_SIZE  2
+
+void timer_irq_handler(void *param);
+STATIC mp_obj_t pyb_timer_freq(size_t n_args, const mp_obj_t *args);
+
+#if defined(TIMER_CHANNEL)
+typedef struct _pyb_timer_channel_obj_t {
+    mp_obj_base_t base;
+    struct _pyb_timer_obj_t *timer;
+    uint8_t channel;
+    mp_obj_t callback;
+    struct _pyb_timer_channel_obj_t *next;
+} pyb_timer_channel_obj_t;
+#endif
+
+typedef struct _pyb_timer_obj_t {
+    mp_obj_base_t base;
+    uint8_t tim_id;
+    mp_obj_t callback;
+    #if defined(TIMER_CHANNEL)
+    pyb_timer_channel_obj_t *channel;
+    #endif
+} pyb_timer_obj_t;
+#define PYB_TIMER_OBJ_ALL_NUM MP_ARRAY_SIZE(MP_STATE_PORT(pyb_timer_obj_all))
+
+STATIC mp_obj_t pyb_timer_deinit(mp_obj_t self_in);
+STATIC mp_obj_t pyb_timer_callback(mp_obj_t self_in, mp_obj_t callback);
+#if defined(TIMER_CHANNEL)
+STATIC mp_obj_t pyb_timer_channel_callback(mp_obj_t self_in, mp_obj_t callback);
+#endif
+static const int ra_agt_timer_ch[TIMER_SIZE] = {1, 2};
+
+void timer_init0(void) {
+    for (uint i = 0; i < PYB_TIMER_OBJ_ALL_NUM; i++) {
+        MP_STATE_PORT(pyb_timer_obj_all)[i] = NULL;
+    }
+}
+
+// unregister all interrupt sources
+void timer_deinit(void) {
+    for (uint i = 0; i < PYB_TIMER_OBJ_ALL_NUM; i++) {
+        pyb_timer_obj_t *tim = MP_STATE_PORT(pyb_timer_obj_all)[i];
+        if (tim != NULL) {
+            pyb_timer_deinit(MP_OBJ_FROM_PTR(tim));
+        }
+    }
+}
+
+/*
+ * Timer Class
+ */
+
+STATIC void pyb_timer_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+    pyb_timer_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    mp_printf(print, "Timer(%u)", self->tim_id);
+}
+
+/// \method init(*, freq, prescaler, period)
+/// Initialise the timer.  Initialisation must be either by frequency (in Hz)
+/// or by prescaler and period:
+///
+///     tim.init(freq=100)                  # set the timer to trigger at 100Hz
+///
+/// Keyword arguments:
+///
+///   - `freq` - specifies the periodic frequency of the timer. You migh also
+///              view this as the frequency with which the timer goes through
+///              one complete cycle.
+//////
+///   - `callback` - as per Timer.callback()
+//////
+///  You must either specify freq.
+STATIC mp_obj_t pyb_timer_init_helper(pyb_timer_obj_t *self, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    // enum { ARG_freq, ARG_prescaler, ARG_period, ARG_tick_hz, ARG_mode, ARG_div, ARG_callback, ARG_deadtime };
+    enum { ARG_freq, ARG_callback };
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_freq,         MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
+        { MP_QSTR_callback,     MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
+    };
+    // parse args
+    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
+    mp_arg_parse_all(n_args, pos_args, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
+
+    // init TIM
+    for (int i = 1; i <= TIMER_SIZE; i++) {
+        ra_agt_timer_set_callback(i - 1, (AGT_TIMER_CB)timer_irq_handler, (void *)&ra_agt_timer_ch[i - 1]);
+    }
+    ra_agt_timer_init(self->tim_id - 1, 1.0f);
+    if (args[ARG_freq].u_obj != mp_const_none) {
+        mp_obj_t freq_args[2];
+        freq_args[0] = self;
+        freq_args[1] = args[ARG_freq].u_obj;
+        pyb_timer_freq(2, (const mp_obj_t *)&freq_args);
+    } else {
+        mp_raise_TypeError(MP_ERROR_TEXT("must specify either freq, period, or prescaler and period"));
+    }
+    // Enable ARPE so that the auto-reload register is buffered.
+    // This allows to smoothly change the frequency of the timer.
+    // Start the timer running
+    if (args[ARG_callback].u_obj == mp_const_none) {
+        // do nothing
+    } else {
+        pyb_timer_callback(MP_OBJ_FROM_PTR(self), args[ARG_callback].u_obj);
+    }
+    return mp_const_none;
+}
+
+/// \classmethod \constructor(id, ...)
+/// Construct a new timer object of the given id.  If additional
+/// arguments are given, then the timer is initialised by `init(...)`.
+/// `id` can be 1 to 14, excluding 3.
+STATIC mp_obj_t pyb_timer_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
+    // check arguments
+    mp_arg_check_num(n_args, n_kw, 1, MP_OBJ_FUN_ARGS_MAX, true);
+
+    // get the timer id
+    mp_int_t tim_id = mp_obj_get_int(args[0]);
+    // create new Timer object
+    pyb_timer_obj_t *tim;
+    if (MP_STATE_PORT(pyb_timer_obj_all)[tim_id - 1] == NULL) {
+        // create new Timer object
+        tim = m_new_obj(pyb_timer_obj_t);
+        memset(tim, 0, sizeof(*tim));
+        tim->base.type = &pyb_timer_type;
+        tim->tim_id = tim_id;
+        tim->callback = mp_const_none;
+        MP_STATE_PORT(pyb_timer_obj_all)[tim_id - 1] = tim;
+    } else {
+        // reference existing Timer object
+        tim = MP_STATE_PORT(pyb_timer_obj_all)[tim_id - 1];
+    }
+    if (n_args > 1 || n_kw > 0) {
+        // start the peripheral
+        mp_map_t kw_args;
+        mp_map_init_fixed_table(&kw_args, n_kw, args + n_args);
+        pyb_timer_init_helper(tim, n_args - 1, args + 1, &kw_args);
+    }
+    return MP_OBJ_FROM_PTR(tim);
+}
+
+STATIC mp_obj_t pyb_timer_init(size_t n_args, const mp_obj_t *args, mp_map_t *kw_args) {
+    return pyb_timer_init_helper(MP_OBJ_TO_PTR(args[0]), n_args - 1, args + 1, kw_args);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_KW(pyb_timer_init_obj, 1, pyb_timer_init);
+
+/// \method deinit()
+/// Deinitialises the timer.
+///
+/// Disables the callback (and the associated irq).
+/// Disables any channel callbacks (and the associated irq).
+/// Stops the timer, and disables the timer peripheral.
+STATIC mp_obj_t pyb_timer_deinit(mp_obj_t self_in) {
+    pyb_timer_obj_t *self = MP_OBJ_TO_PTR(self_in);
+
+    // Disable the base interrupt
+    pyb_timer_callback(self_in, mp_const_none);
+
+    #if defined(TIMER_CHANNEL)
+    pyb_timer_channel_obj_t *chan = self->channel;
+    self->channel = NULL;
+
+    // Disable the channel interrupts
+    while (chan != NULL) {
+        pyb_timer_channel_callback(MP_OBJ_FROM_PTR(chan), mp_const_none);
+        pyb_timer_channel_obj_t *prev_chan = chan;
+        chan = chan->next;
+        prev_chan->next = NULL;
+    }
+    #endif
+
+    ra_agt_timer_deinit(self->tim_id - 1);
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(pyb_timer_deinit_obj, pyb_timer_deinit);
+
+#if defined(TIMER_CHANNEL)
+/// \method channel(channel, mode, ...)
+///
+/// If only a channel number is passed, then a previously initialized channel
+/// object is returned (or `None` if there is no previous channel).
+///
+/// Othwerwise, a TimerChannel object is initialized and returned.
+///
+/// Each channel can be configured to perform pwm, output compare, or
+/// input capture. All channels share the same underlying timer, which means
+/// that they share the same timer clock.
+///
+STATIC mp_obj_t pyb_timer_channel(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_callback,            MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
+        { MP_QSTR_compare,             MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 0} },
+    };
+
+    pyb_timer_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]);
+    mp_int_t channel = mp_obj_get_int(pos_args[1]);
+
+    if (channel < 1 || channel > 4) {
+        mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("invalid channel (%d)"), channel);
+    }
+
+    pyb_timer_channel_obj_t *chan = self->channel;
+    pyb_timer_channel_obj_t *prev_chan = NULL;
+
+    while (chan != NULL) {
+        if (chan->channel == channel) {
+            break;
+        }
+        prev_chan = chan;
+        chan = chan->next;
+    }
+
+    // If only the channel number is given return the previously allocated
+    // channel (or None if no previous channel).
+    if (n_args == 2 && kw_args->used == 0) {
+        if (chan) {
+            return MP_OBJ_FROM_PTR(chan);
+        }
+        return mp_const_none;
+    }
+
+    // If there was already a channel, then remove it from the list. Note that
+    // the order we do things here is important so as to appear atomic to
+    // the IRQ handler.
+    if (chan) {
+        // Turn off any IRQ associated with the channel.
+        pyb_timer_channel_callback(MP_OBJ_FROM_PTR(chan), mp_const_none);
+
+        // Unlink the channel from the list.
+        if (prev_chan) {
+            prev_chan->next = chan->next;
+        }
+        self->channel = chan->next;
+        chan->next = NULL;
+    }
+
+    // Allocate and initialize a new channel
+    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
+    mp_arg_parse_all(n_args - 2, pos_args + 2, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
+
+    chan = m_new_obj(pyb_timer_channel_obj_t);
+    memset(chan, 0, sizeof(*chan));
+    chan->base.type = &pyb_timer_channel_type;
+    chan->timer = self;
+    chan->channel = channel;
+    chan->callback = args[1].u_obj;
+
+    mp_obj_t pin_obj = args[2].u_obj;
+    if (pin_obj != mp_const_none) {
+        // ToDo
+    }
+    // Link the channel to the timer before we turn the channel on.
+    // Note that this needs to appear atomic to the IRQ handler (the write
+    // to self->channel is atomic, so we're good, but I thought I'd mention
+    // in case this was ever changed in the future).
+    chan->next = self->channel;
+    self->channel = chan;
+
+    // ToDo
+    return MP_OBJ_FROM_PTR(chan);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_KW(pyb_timer_channel_obj, 2, pyb_timer_channel);
+#endif
+
+#if TIMER_COUNTER
+// Not implemented
+/// \method counter([value])
+/// Get or set the timer counter.
+STATIC mp_obj_t pyb_timer_counter(size_t n_args, const mp_obj_t *args) {
+    pyb_timer_obj_t *self = MP_OBJ_TO_PTR(args[0]);
+    if (n_args == 1) {
+        // get
+        return mp_obj_new_int((int)ra_agt_timer_get_counter(self->tim_id));
+    } else {
+        // set
+        ra_agt_timer_set_counter((unsigned int)self->tim_id, (unsigned long)mp_obj_get_int(args[1]));
+        return mp_const_none;
+    }
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pyb_timer_counter_obj, 1, 2, pyb_timer_counter);
+#endif
+
+/// \method freq([value])
+/// Get or set the frequency for the timer (changes prescaler and period if set).
+STATIC mp_obj_t pyb_timer_freq(size_t n_args, const mp_obj_t *args) {
+    pyb_timer_obj_t *self = MP_OBJ_TO_PTR(args[0]);
+    int ch = self->tim_id - 1;
+    if (n_args == 1) {
+        // get
+        #if MICROPY_PY_BUILTINS_FLOAT
+        float freq = ra_agt_timer_get_freq(ch);
+        return mp_obj_new_float(freq);
+        #else
+        uint32_t freq = (uint32_t)ra_agt_timer_get_freq(ch);
+        return mp_obj_new_int(freq);
+        #endif
+    } else {
+        // set
+        uint32_t freq;
+        if (0) {
+        #if MICROPY_PY_BUILTINS_FLOAT
+        } else if (mp_obj_is_type(args[1], &mp_type_float)) {
+            freq = (int)mp_obj_get_float(args[1]);
+        #endif
+        } else {
+            freq = mp_obj_get_int(args[1]);
+        }
+        if (freq == 0) {
+            mp_raise_ValueError(MP_ERROR_TEXT("freq must not be 0"));
+        }
+        ra_agt_timer_stop(ch);
+        ra_agt_timer_set_freq(ch, (float)freq);
+        ra_agt_timer_start(ch);
+        return mp_const_none;
+    }
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pyb_timer_freq_obj, 1, 2, pyb_timer_freq);
+
+#if TIMER_PERIOD
+// Not implemented
+/// \method period([value])
+/// Get or set the period of the timer.
+STATIC mp_obj_t pyb_timer_period(size_t n_args, const mp_obj_t *args) {
+    pyb_timer_obj_t *self = MP_OBJ_TO_PTR(args[0]);
+    if (n_args == 1) {
+        // get
+        return mp_obj_new_int((int)ra_agt_timer_get_period(self->tim_id));
+        return mp_const_none;
+    } else {
+        // set
+        ra_agt_timer_set_period((uint32_t)self->tim_id, (uint16_t)mp_obj_get_int(args[1]));
+        return mp_const_none;
+    }
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pyb_timer_period_obj, 1, 2, pyb_timer_period);
+#endif
+
+/// \method callback(fun)
+/// Set the function to be called when the timer triggers.
+/// `fun` is passed 1 argument, the timer object.
+/// If `fun` is `None` then the callback will be disabled.
+STATIC mp_obj_t pyb_timer_callback(mp_obj_t self_in, mp_obj_t callback) {
+    pyb_timer_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    if (callback == mp_const_none) {
+        // stop interrupt (but not timer)
+        // __HAL_TIM_DISABLE_IT(&self->tim, TIM_IT_UPDATE);
+        self->callback = mp_const_none;
+    } else if (mp_obj_is_callable(callback)) {
+        // __HAL_TIM_DISABLE_IT(&self->tim, TIM_IT_UPDATE);
+        self->callback = callback;
+        // start timer, so that it interrupts on overflow, but clear any
+        // pending interrupts which may have been set by initializing it.
+        // __HAL_TIM_CLEAR_FLAG(&self->tim, TIM_IT_UPDATE);
+        // HAL_TIM_Base_Start_IT(&self->tim); // This will re-enable the IRQ
+        // HAL_NVIC_EnableIRQ(self->irqn);
+    } else {
+        mp_raise_ValueError(MP_ERROR_TEXT("callback must be None or a callable object"));
+    }
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(pyb_timer_callback_obj, pyb_timer_callback);
+
+STATIC const mp_rom_map_elem_t pyb_timer_locals_dict_table[] = {
+    // instance methods
+    { MP_ROM_QSTR(MP_QSTR_init), MP_ROM_PTR(&pyb_timer_init_obj) },
+    { MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&pyb_timer_deinit_obj) },
+    #if TIMER_COUNTER
+    { MP_ROM_QSTR(MP_QSTR_counter), MP_ROM_PTR(&pyb_timer_counter_obj) },
+    #endif
+    { MP_ROM_QSTR(MP_QSTR_freq), MP_ROM_PTR(&pyb_timer_freq_obj) },
+    #if TIMER_PERIOD
+    { MP_ROM_QSTR(MP_QSTR_period), MP_ROM_PTR(&pyb_timer_period_obj) },
+    #endif
+    { MP_ROM_QSTR(MP_QSTR_callback), MP_ROM_PTR(&pyb_timer_callback_obj) },
+};
+STATIC MP_DEFINE_CONST_DICT(pyb_timer_locals_dict, pyb_timer_locals_dict_table);
+
+const mp_obj_type_t pyb_timer_type = {
+    { &mp_type_type },
+    .name = MP_QSTR_Timer,
+    .print = pyb_timer_print,
+    .make_new = pyb_timer_make_new,
+    .locals_dict = (mp_obj_dict_t *)&pyb_timer_locals_dict,
+};
+
+#if defined(TIMER_CHANNEL)
+/*
+ * Timer Channel
+ */
+
+/// \moduleref pyb
+/// \class TimerChannel - setup a channel for a timer.
+///
+/// Timer channels are used to generate/capture a signal using a timer.
+///
+/// TimerChannel objects are created using the Timer.channel() method.
+STATIC void pyb_timer_channel_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+    pyb_timer_channel_obj_t *self = MP_OBJ_TO_PTR(self_in);
+
+    mp_printf(print, "TimerChannel(timer=%u, channel=%u",
+        self->timer->tim_id,
+        self->channel);
+}
+
+/// \method capture([value])
+/// Get or set the capture value associated with a channel.
+/// capture, compare, and pulse_width are all aliases for the same function.
+/// capture is the logical name to use when the channel is in input capture mode.
+
+/// \method compare([value])
+/// Get or set the compare value associated with a channel.
+/// capture, compare, and pulse_width are all aliases for the same function.
+/// compare is the logical name to use when the channel is in output compare mode.
+
+/// \method pulse_width([value])
+/// Get or set the pulse width value associated with a channel.
+/// capture, compare, and pulse_width are all aliases for the same function.
+/// pulse_width is the logical name to use when the channel is in PWM mode.
+///
+/// In edge aligned mode, a pulse_width of `period + 1` corresponds to a duty cycle of 100%
+/// In center aligned mode, a pulse width of `period` corresponds to a duty cycle of 100%
+STATIC mp_obj_t pyb_timer_channel_capture_compare(size_t n_args, const mp_obj_t *args) {
+    pyb_timer_channel_obj_t *self = MP_OBJ_TO_PTR(args[0]);
+    if (n_args == 1) {
+        // get
+        return mp_const_none;
+    } else {
+        // set
+        // __HAL_TIM_SET_COMPARE(&self->timer->tim, TIMER_CHANNEL(self), mp_obj_get_int(args[1]) & TIMER_CNT_MASK(self->timer));
+        return mp_const_none;
+    }
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pyb_timer_channel_capture_compare_obj, 1, 2, pyb_timer_channel_capture_compare);
+
+/// \method callback(fun)
+/// Set the function to be called when the timer channel triggers.
+/// `fun` is passed 1 argument, the timer object.
+/// If `fun` is `None` then the callback will be disabled.
+STATIC mp_obj_t pyb_timer_channel_callback(mp_obj_t self_in, mp_obj_t callback) {
+    pyb_timer_channel_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    if (callback == mp_const_none) {
+        // stop interrupt (but not timer)
+        // _HAL_TIM_DISABLE_IT(&self->timer->tim, TIMER_IRQ_MASK(self->channel));
+        self->callback = mp_const_none;
+    } else if (mp_obj_is_callable(callback)) {
+        self->callback = callback;
+        uint8_t tim_id = self->timer->tim_id;
+        // __HAL_TIM_CLEAR_IT(&self->timer->tim, TIMER_IRQ_MASK(self->channel));
+        if (tim_id == 1) {
+            // HAL_NVIC_EnableIRQ(TIM1_CC_IRQn);
+        } else {
+            // HAL_NVIC_EnableIRQ(self->timer->irqn);
+        }
+        // start timer, so that it interrupts on overflow
+    } else {
+        mp_raise_ValueError(MP_ERROR_TEXT("callback must be None or a callable object"));
+    }
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(pyb_timer_channel_callback_obj, pyb_timer_channel_callback);
+
+STATIC const mp_rom_map_elem_t pyb_timer_channel_locals_dict_table[] = {
+    // instance methods
+    { MP_ROM_QSTR(MP_QSTR_callback), MP_ROM_PTR(&pyb_timer_channel_callback_obj) },
+    { MP_ROM_QSTR(MP_QSTR_capture), MP_ROM_PTR(&pyb_timer_channel_capture_compare_obj) },
+    { MP_ROM_QSTR(MP_QSTR_compare), MP_ROM_PTR(&pyb_timer_channel_capture_compare_obj) },
+};
+STATIC MP_DEFINE_CONST_DICT(pyb_timer_channel_locals_dict, pyb_timer_channel_locals_dict_table);
+
+STATIC const mp_obj_type_t pyb_timer_channel_type = {
+    { &mp_type_type },
+    .name = MP_QSTR_TimerChannel,
+    .print = pyb_timer_channel_print,
+    .locals_dict = (mp_obj_dict_t *)&pyb_timer_channel_locals_dict,
+};
+#endif
+
+STATIC void timer_handle_irq_channel(pyb_timer_obj_t *tim, uint8_t channel, mp_obj_t callback) {
+
+    // execute callback if it's set
+    if (callback != mp_const_none) {
+        mp_sched_lock();
+        // When executing code within a handler we must lock the GC to prevent
+        // any memory allocations.  We must also catch any exceptions.
+        gc_lock();
+        nlr_buf_t nlr;
+        if (nlr_push(&nlr) == 0) {
+            mp_call_function_1(callback, MP_OBJ_FROM_PTR(tim));
+            nlr_pop();
+        } else {
+            // Uncaught exception; disable the callback so it doesn't run again.
+            tim->callback = mp_const_none;
+            // __HAL_TIM_DISABLE_IT(&tim->tim, irq_mask);
+            if (channel == 0) {
+                mp_printf(MICROPY_ERROR_PRINTER, "uncaught exception in Timer(%u) interrupt handler\n", tim->tim_id);
+            } else {
+                mp_printf(MICROPY_ERROR_PRINTER, "uncaught exception in Timer(%u) channel %u interrupt handler\n", tim->tim_id, channel);
+            }
+            mp_obj_print_exception(&mp_plat_print, MP_OBJ_FROM_PTR(nlr.ret_val));
+        }
+        gc_unlock();
+        mp_sched_unlock();
+    }
+}
+
+void timer_irq_handler(void *param) {
+    uint tim_id = *(uint *)param;
+    if ((tim_id != 0) && (tim_id - 1 < PYB_TIMER_OBJ_ALL_NUM)) {
+        // get the timer object
+        pyb_timer_obj_t *tim = MP_STATE_PORT(pyb_timer_obj_all)[tim_id - 1];
+
+        if (tim == NULL) {
+            // do nohting
+            return;
+        }
+        timer_handle_irq_channel(tim, 0, tim->callback);
+        // Check to see if a timer channel interrupt was pending
+        #if defined(TIMER_CHANNEL)
+        pyb_timer_channel_obj_t *chan = tim->channel;
+        while (chan != NULL) {
+            timer_handle_irq_channel(tim, chan->channel, chan->callback);
+            // handled |= TIMER_IRQ_MASK(chan->channel);
+            chan = chan->next;
+        }
+        #endif
+        // ToDo
+        // Finally, clear any remaining interrupt sources. Otherwise we'll
+        // just get called continuously.
+        // uint32_t unhandled = 0;
+        // if (unhandled != 0) {
+        //    printf("Unhandled interrupt SR=0x%02x (now disabled)\n", (unsigned int)unhandled);
+        // }
+    }
+}
diff --git a/ports/renesas-ra/timer.h b/ports/renesas-ra/timer.h
new file mode 100644
index 0000000000000..a4bfb63c5cb10
--- /dev/null
+++ b/ports/renesas-ra/timer.h
@@ -0,0 +1,36 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013, 2014 Damien P. George
+ * Copyright (c) 2021 Renesas Electronics Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#ifndef MICROPY_INCLUDED_RA_TIMER_H
+#define MICROPY_INCLUDED_RA_TIMER_H
+
+extern const mp_obj_type_t pyb_timer_type;
+
+void timer_init0(void);
+void timer_deinit(void);
+
+#endif // MICROPY_INCLUDED_RA_TIMER_H
diff --git a/ports/renesas-ra/uart.c b/ports/renesas-ra/uart.c
new file mode 100644
index 0000000000000..ddb77bfd58c2e
--- /dev/null
+++ b/ports/renesas-ra/uart.c
@@ -0,0 +1,514 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013, 2014 Damien P. George
+ * Copyright (c) 2021 Renesas Electronics Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include <stdio.h>
+#include <string.h>
+#include <stdarg.h>
+
+#include "py/runtime.h"
+#include "py/stream.h"
+#include "py/mperrno.h"
+#include "py/mphal.h"
+#include "shared/runtime/interrupt_char.h"
+#include "shared/runtime/mpirq.h"
+#include "uart.h"
+#include "irq.h"
+#include "pendsv.h"
+
+typedef int (*KEYEX_CB)(uint32_t d);
+
+extern void NORETURN __fatal_error(const char *msg);
+#if MICROPY_KBD_EXCEPTION
+extern int mp_interrupt_char;
+static KEYEX_CB keyex_cb[MICROPY_HW_MAX_UART] = {(KEYEX_CB)NULL};
+
+static int chk_kbd_interrupt(int d) {
+    if (d == mp_interrupt_char) {
+        pendsv_kbd_intr();
+        return 1;
+    } else {
+        return 0;
+    }
+}
+
+static void set_kbd_interrupt(uint32_t ch, void *keyex) {
+    ra_sci_rxirq_disable(ch);
+    keyex_cb[ch] = (KEYEX_CB)keyex;
+    ra_sci_rxirq_enable(ch);
+}
+
+#endif
+
+static void uart_rx_cb(uint32_t ch, int d) {
+    pyb_uart_obj_t *self = MP_STATE_PORT(pyb_uart_obj_all)[ch];
+    if (self == NULL) {
+        // UART object has not been set, so we can't do anything, not
+        // even disable the IRQ.  This should never happen.
+        return;
+    }
+    #if MICROPY_KBD_EXCEPTION
+    if (keyex_cb[ch]) {
+        (*keyex_cb[ch])(d);
+    }
+    #endif
+    // Check the flags to see if the user handler should be called
+    if (self->mp_irq_trigger) {
+        mp_irq_handler(self->mp_irq_obj);
+    }
+}
+
+void uart_init0(void) {
+}
+
+// unregister all interrupt sources
+void uart_deinit_all(void) {
+    for (int i = 0; i < MP_ARRAY_SIZE(MP_STATE_PORT(pyb_uart_obj_all)); i++) {
+        pyb_uart_obj_t *uart_obj = MP_STATE_PORT(pyb_uart_obj_all)[i];
+        if (uart_obj != NULL && !uart_obj->is_static) {
+            uart_deinit(uart_obj);
+            MP_STATE_PORT(pyb_uart_obj_all)[i] = NULL;
+        }
+    }
+}
+
+bool uart_exists(int uart_id) {
+    if (uart_id > MP_ARRAY_SIZE(MP_STATE_PORT(pyb_uart_obj_all))) {
+        // safeguard against pyb_uart_obj_all array being configured too small
+        return false;
+    }
+    switch (uart_id) {
+        #if defined(MICROPY_HW_UART0_TX) && defined(MICROPY_HW_UART0_RX)
+        case HW_UART_0:
+            return true;
+        #endif
+
+        #if defined(MICROPY_HW_UART1_TX) && defined(MICROPY_HW_UART1_RX)
+        case HW_UART_1:
+            return true;
+        #endif
+
+        #if defined(MICROPY_HW_UART2_TX) && defined(MICROPY_HW_UART2_RX)
+        case HW_UART_2:
+            return true;
+        #endif
+
+        #if defined(MICROPY_HW_UART3_TX) && defined(MICROPY_HW_UART3_RX)
+        case HW_UART_3:
+            return true;
+        #endif
+
+        #if defined(MICROPY_HW_UART4_TX) && defined(MICROPY_HW_UART4_RX)
+        case HW_UART_4:
+            return true;
+        #endif
+
+        #if defined(MICROPY_HW_UART5_TX) && defined(MICROPY_HW_UART5_RX)
+        case HW_UART_5:
+            return true;
+        #endif
+
+        #if defined(MICROPY_HW_UART6_TX) && defined(MICROPY_HW_UART6_RX)
+        case HW_UART_6:
+            return true;
+        #endif
+
+        #if defined(MICROPY_HW_UART7_TX) && defined(MICROPY_HW_UART7_RX)
+        case HW_UART_7:
+            return true;
+        #endif
+
+        #if defined(MICROPY_HW_UART8_TX) && defined(MICROPY_HW_UART8_RX)
+        case HW_UART_8:
+            return true;
+        #endif
+
+        #if defined(MICROPY_HW_UART9_TX) && defined(MICROPY_HW_UART9_RX)
+        case HW_UART_9:
+            return true;
+        #endif
+
+        default:
+            return false;
+    }
+}
+
+// assumes Init parameters have been set up correctly
+bool uart_init(pyb_uart_obj_t *uart_obj,
+    uint32_t baudrate, uint32_t bits, uint32_t parity, uint32_t stop, uint32_t flow) {
+    uart_obj->baudrate = (uint32_t)baudrate;
+    uart_obj->bits = (uint8_t)bits;
+    uart_obj->parity = (uint8_t)parity;
+    uart_obj->stop = (uint8_t)stop;
+    uart_obj->flow = (uint8_t)flow;
+
+    const machine_pin_obj_t *pins[4] = {0};
+
+    switch (uart_obj->uart_id) {
+        #if defined(MICROPY_HW_UART0_TX) && defined(MICROPY_HW_UART0_RX)
+        case HW_UART_0:
+            pins[0] = MICROPY_HW_UART0_TX;
+            pins[1] = MICROPY_HW_UART0_RX;
+            #if defined(MICROPY_HW_UART0_RTS)
+            if (flow) {
+                pins[2] = MICROPY_HW_UART0_RTS;
+            }
+            #endif
+            #if defined(MICROPY_HW_UART0_CTS)
+            if (flow) {
+                pins[3] = MICROPY_HW_UART0_CTS;
+            }
+            #endif
+            break;
+        #endif
+
+        #if defined(MICROPY_HW_UART1_TX) && defined(MICROPY_HW_UART1_RX)
+        case HW_UART_1:
+            pins[0] = MICROPY_HW_UART1_TX;
+            pins[1] = MICROPY_HW_UART1_RX;
+            #if defined(MICROPY_HW_UART1_RTS)
+            if (flow) {
+                pins[2] = MICROPY_HW_UART1_RTS;
+            }
+            #endif
+            #if defined(MICROPY_HW_UART1_CTS)
+            if (flow) {
+                pins[3] = MICROPY_HW_UART1_CTS;
+            }
+            #endif
+            break;
+        #endif
+
+        #if defined(MICROPY_HW_UART2_TX) && defined(MICROPY_HW_UART2_RX)
+        case HW_UART_2:
+            pins[0] = MICROPY_HW_UART2_TX;
+            pins[1] = MICROPY_HW_UART2_RX;
+            #if defined(MICROPY_HW_UART2_RTS)
+            if (flow) {
+                pins[2] = MICROPY_HW_UART2_RTS;
+            }
+            #endif
+            #if defined(MICROPY_HW_UART2_CTS)
+            if (flow) {
+                pins[3] = MICROPY_HW_UART2_CTS;
+            }
+            #endif
+            break;
+        #endif
+
+        #if defined(MICROPY_HW_UART3_TX) && defined(MICROPY_HW_UART3_RX)
+        case HW_UART_3:
+            pins[0] = MICROPY_HW_UART3_TX;
+            pins[1] = MICROPY_HW_UART3_RX;
+            #if defined(MICROPY_HW_UART3_RTS)
+            if (flow) {
+                pins[2] = MICROPY_HW_UART3_RTS;
+            }
+            #endif
+            #if defined(MICROPY_HW_UART3_CTS)
+            if (flow) {
+                pins[3] = MICROPY_HW_UART3_CTS;
+            }
+            #endif
+            break;
+        #endif
+
+        #if defined(MICROPY_HW_UART4_TX) && defined(MICROPY_HW_UART4_RX)
+        case HW_UART_4:
+            pins[0] = MICROPY_HW_UART4_TX;
+            pins[1] = MICROPY_HW_UART4_RX;
+            #if defined(MICROPY_HW_UART4_RTS)
+            if (flow) {
+                pins[2] = MICROPY_HW_UART4_RTS;
+            }
+            #endif
+            #if defined(MICROPY_HW_UART4_CTS)
+            if (flow) {
+                pins[3] = MICROPY_HW_UART4_CTS;
+            }
+            #endif
+            break;
+        #endif
+
+        #if defined(MICROPY_HW_UART5_TX) && defined(MICROPY_HW_UART5_RX)
+        case HW_UART_5:
+            pins[0] = MICROPY_HW_UART5_TX;
+            pins[1] = MICROPY_HW_UART5_RX;
+            #if defined(MICROPY_HW_UART5_RTS)
+            if (flow) {
+                pins[2] = MICROPY_HW_UART5_RTS;
+            }
+            #endif
+            #if defined(MICROPY_HW_UART5_CTS)
+            if (flow) {
+                pins[3] = MICROPY_HW_UART5_CTS;
+            }
+            #endif
+            break;
+        #endif
+
+        #if defined(MICROPY_HW_UART6_TX) && defined(MICROPY_HW_UART6_RX)
+        case HW_UART_6:
+            pins[0] = MICROPY_HW_UART6_TX;
+            pins[1] = MICROPY_HW_UART6_RX;
+            #if defined(MICROPY_HW_UART6_RTS)
+            if (flow) {
+                pins[2] = MICROPY_HW_UART6_RTS;
+            }
+            #endif
+            #if defined(MICROPY_HW_UART6_CTS)
+            if (flow) {
+                pins[3] = MICROPY_HW_UART6_CTS;
+            }
+            #endif
+            break;
+        #endif
+
+        #if defined(MICROPY_HW_UART7_TX) && defined(MICROPY_HW_UART7_RX)
+        case HW_UART_7:
+            pins[0] = MICROPY_HW_UART7_TX;
+            pins[1] = MICROPY_HW_UART7_RX;
+            #if defined(MICROPY_HW_UART7_RTS)
+            if (flow) {
+                pins[2] = MICROPY_HW_UART7_RTS;
+            }
+            #endif
+            #if defined(MICROPY_HW_UART7_CTS)
+            if (flow) {
+                pins[3] = MICROPY_HW_UART7_CTS;
+            }
+            #endif
+            break;
+        #endif
+
+        #if defined(MICROPY_HW_UART8_TX) && defined(MICROPY_HW_UART8_RX)
+        case HW_UART_8:
+            pins[0] = MICROPY_HW_UART8_TX;
+            pins[1] = MICROPY_HW_UART8_RX;
+            #if defined(MICROPY_HW_UART8_RTS)
+            if (flow) {
+                pins[2] = MICROPY_HW_UART8_RTS;
+            }
+            #endif
+            #if defined(MICROPY_HW_UART8_CTS)
+            if (flow) {
+                pins[3] = MICROPY_HW_UART8_CTS;
+            }
+            #endif
+            break;
+        #endif
+
+        #if defined(MICROPY_HW_UART9_TX) && defined(MICROPY_HW_UART9_RX)
+        case HW_UART_9:
+            pins[0] = MICROPY_HW_UART9_TX;
+            pins[1] = MICROPY_HW_UART9_RX;
+            #if defined(MICROPY_HW_UART9_RTS)
+            if (flow) {
+                pins[2] = MICROPY_HW_UART9_RTS;
+            }
+            #endif
+            #if defined(MICROPY_HW_UART9_CTS)
+            if (flow) {
+                pins[3] = MICROPY_HW_UART9_CTS;
+            }
+            #endif
+            break;
+        #endif
+
+        default:
+            // UART does not exist or is not configured for this board
+            return false;
+    }
+    uart_obj->tx = pins[0];
+    uart_obj->rx = pins[1];
+    uart_obj->rts = pins[2];
+    uart_obj->cts = pins[3];
+
+    if (flow && (uart_obj->rts != 0) && (uart_obj->cts != 0)) {
+        ra_sci_init_with_flow(uart_obj->uart_id, (uint32_t)uart_obj->tx->pin, (uint32_t)uart_obj->rx->pin, baudrate, bits, parity, stop, flow, (uint32_t)uart_obj->rts->pin, (uint32_t)uart_obj->cts->pin);
+    } else {
+        ra_sci_init(uart_obj->uart_id, (uint32_t)uart_obj->tx->pin, (uint32_t)uart_obj->rx->pin, baudrate, bits, parity, stop, flow);
+    }
+    ra_sci_rx_set_callback((int)uart_obj->uart_id, (SCI_CB)uart_rx_cb);
+    uart_obj->is_enabled = true;
+    uart_obj->attached_to_repl = false;
+
+    if (bits == 9 && parity == UART_PARITY_NONE) {
+        uart_obj->char_mask = 0x1ff;
+        uart_obj->char_width = CHAR_WIDTH_9BIT;
+    } else {
+        if (bits == 9 || parity == UART_PARITY_NONE) {
+            uart_obj->char_mask = 0xff;
+        } else {
+            uart_obj->char_mask = 0x7f;
+        }
+        uart_obj->char_width = CHAR_WIDTH_8BIT;
+    }
+
+    uart_obj->mp_irq_trigger = 0;
+    uart_obj->mp_irq_obj = NULL;
+
+    return true;
+}
+
+void uart_irq_config(pyb_uart_obj_t *self, bool enable) {
+    if (self->mp_irq_trigger) {
+        if (enable) {
+            ra_sci_rxirq_enable(self->uart_id);
+        } else {
+            ra_sci_rxirq_disable(self->uart_id);
+        }
+    }
+}
+
+void uart_set_rxbuf(pyb_uart_obj_t *self, size_t len, void *buf) {
+    // len = 0 (no interrupt) is not supported. static buf is used.
+    self->read_buf_len = len;
+    self->read_buf = buf;
+    if (len) {
+        int ch = (int)self->uart_id;
+        ra_sci_rxfifo_set(ch, (uint8_t *)buf, (uint32_t)len);
+    }
+}
+
+void uart_deinit(pyb_uart_obj_t *self) {
+    self->is_enabled = false;
+    ra_sci_deinit(self->uart_id);
+}
+
+void uart_attach_to_repl(pyb_uart_obj_t *self, bool attached) {
+    self->attached_to_repl = attached;
+    #if MICROPY_KBD_EXCEPTION
+    if (attached) {
+        set_kbd_interrupt((int)self->uart_id, (SCI_CB)chk_kbd_interrupt);
+    } else {
+        set_kbd_interrupt((int)self->uart_id, (SCI_CB)NULL);
+    }
+    #endif
+}
+
+mp_uint_t uart_rx_any(pyb_uart_obj_t *self) {
+    int ch = (int)self->uart_id;
+    return ra_sci_rx_any(ch);
+}
+
+mp_uint_t uart_tx_avail(pyb_uart_obj_t *self) {
+    int ch = (int)self->uart_id;
+    return ra_sci_tx_wait(ch);
+}
+
+// Waits at most timeout milliseconds for at least 1 char to become ready for
+// reading (from buf or for direct reading).
+// Returns true if something available, false if not.
+bool uart_rx_wait(pyb_uart_obj_t *self, uint32_t timeout) {
+    int ch = (int)self->uart_id;
+    uint32_t start = HAL_GetTick();
+    for (;;) {
+        if (ra_sci_rx_any(ch)) {
+            return true;
+        }
+        if (HAL_GetTick() - start >= timeout) {
+            return false; // timeout
+        }
+        MICROPY_EVENT_POLL_HOOK
+    }
+}
+
+// assumes there is a character available
+int uart_rx_char(pyb_uart_obj_t *self) {
+    int ch = (int)self->uart_id;
+    return ra_sci_rx_ch(ch);
+}
+
+// Waits at most timeout milliseconds for TX register to become empty.
+// Returns true if can write, false if can't.
+bool uart_tx_wait(pyb_uart_obj_t *self, uint32_t timeout) {
+    uint32_t start = HAL_GetTick();
+    for (;;) {
+        if (uart_tx_avail(self)) {
+            return true;
+        }
+        if (HAL_GetTick() - start >= timeout) {
+            return false; // timeout
+        }
+        MICROPY_EVENT_POLL_HOOK
+    }
+}
+
+// src - a pointer to the data to send (16-bit aligned for 9-bit chars)
+// num_chars - number of characters to send (9-bit chars count for 2 bytes from src)
+// *errcode - returns 0 for success, MP_Exxx on error
+// returns the number of characters sent (valid even if there was an error)
+size_t uart_tx_data(pyb_uart_obj_t *self, const void *src_in, size_t num_chars, int *errcode) {
+    int ch = (int)self->uart_id;
+    uint8_t *d8 = (uint8_t *)src_in;
+    uint16_t *d16 = (uint16_t *)src_in;
+    if (num_chars == 0) {
+        *errcode = 0;
+        return 0;
+    }
+    int i;
+    if (self->char_width == CHAR_WIDTH_9BIT) {
+        for (i = 0; i < (int)num_chars; i++) {
+            ra_sci_tx_ch(ch, (int)*d16++);
+        }
+    } else {
+        for (i = 0; i < (int)num_chars; i++) {
+            ra_sci_tx_ch(ch, (int)*d8++);
+        }
+    }
+
+    *errcode = 0;
+    return (size_t)num_chars;
+}
+
+void uart_tx_strn(pyb_uart_obj_t *uart_obj, const char *str, uint len) {
+    int errcode;
+    uart_tx_data(uart_obj, str, len, &errcode);
+}
+
+STATIC mp_uint_t uart_irq_trigger(mp_obj_t self_in, mp_uint_t new_trigger) {
+    pyb_uart_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    uart_irq_config(self, false);
+    self->mp_irq_trigger = new_trigger;
+    uart_irq_config(self, true);
+    return 0;
+}
+
+STATIC mp_uint_t uart_irq_info(mp_obj_t self_in, mp_uint_t info_type) {
+    pyb_uart_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    if (info_type == MP_IRQ_INFO_FLAGS) {
+        return self->mp_irq_flags;
+    } else if (info_type == MP_IRQ_INFO_TRIGGERS) {
+        return self->mp_irq_trigger;
+    }
+    return 0;
+}
+
+const mp_irq_methods_t uart_irq_methods = {
+    .trigger = uart_irq_trigger,
+    .info = uart_irq_info,
+};
diff --git a/ports/renesas-ra/uart.h b/ports/renesas-ra/uart.h
new file mode 100644
index 0000000000000..01f1bc82d9762
--- /dev/null
+++ b/ports/renesas-ra/uart.h
@@ -0,0 +1,115 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013, 2014 Damien P. George
+ * Copyright (c) 2021 Renesas Electronics Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#ifndef MICROPY_INCLUDED_RA_UART_H
+#define MICROPY_INCLUDED_RA_UART_H
+
+#include "shared/runtime/mpirq.h"
+#include "pin.h"
+
+typedef enum {
+    HW_UART_0 = 0,
+    HW_UART_1 = 1,
+    HW_UART_2 = 2,
+    HW_UART_3 = 3,
+    HW_UART_4 = 4,
+    HW_UART_5 = 5,
+    HW_UART_6 = 6,
+    HW_UART_7 = 7,
+    HW_UART_8 = 8,
+    HW_UART_9 = 9,
+} pyb_uart_t;
+
+#define CHAR_WIDTH_8BIT (0)
+#define CHAR_WIDTH_9BIT (1)
+
+#define UART_WORDLENGTH_8B  (8)
+#define UART_STOPBITS_1     (1)
+#define UART_STOPBITS_2     (2)
+#define UART_PARITY_NONE    (0)
+#define UART_PARITY_ODD     (1)
+#define UART_PARITY_EVEN    (2)
+
+#define UART_HWCONTROL_CTS  (1)
+#define UART_HWCONTROL_RTS  (2)
+
+// OR-ed IRQ flags which are allowed to be used by the user
+#define MP_UART_ALLOWED_FLAGS ((uint32_t)0x00000010)
+
+// OR-ed IRQ flags which should not be touched by the user
+#define MP_UART_RESERVED_FLAGS ((uint16_t)0x0020)
+
+typedef struct _pyb_uart_obj_t {
+    mp_obj_base_t base;
+    pyb_uart_t uart_id : 8;
+    uint32_t baudrate;
+    const machine_pin_obj_t *rx;
+    const machine_pin_obj_t *tx;
+    const machine_pin_obj_t *cts;
+    const machine_pin_obj_t *rts;
+    uint8_t bits;
+    uint8_t parity;
+    uint8_t stop;
+    uint8_t flow;
+    bool is_static : 1;
+    bool is_enabled : 1;
+    bool attached_to_repl;              // whether the UART is attached to REPL
+    byte char_width;                    // 0 for 7,8 bit chars, 1 for 9 bit chars
+    uint16_t char_mask;                 // 0x7f for 7 bit, 0xff for 8 bit, 0x1ff for 9 bit
+    uint16_t timeout;                   // timeout waiting for first char
+    uint16_t timeout_char;              // timeout waiting between chars
+    uint16_t read_buf_len;              // len in chars; buf can hold len-1 chars
+    byte *read_buf;                     // byte or uint16_t, depending on char size
+    uint16_t mp_irq_trigger;            // user IRQ trigger mask
+    uint16_t mp_irq_flags;              // user IRQ active IRQ flags
+    mp_irq_obj_t *mp_irq_obj;           // user IRQ object
+} pyb_uart_obj_t;
+
+extern const mp_obj_type_t pyb_uart_type;
+extern const mp_irq_methods_t uart_irq_methods;
+
+void uart_init0(void);
+void uart_deinit_all(void);
+bool uart_exists(int uart_id);
+bool uart_init(pyb_uart_obj_t *uart_obj,
+    uint32_t baudrate, uint32_t bits, uint32_t parity, uint32_t stop, uint32_t flow);
+void uart_irq_config(pyb_uart_obj_t *self, bool enable);
+void uart_set_rxbuf(pyb_uart_obj_t *self, size_t len, void *buf);
+void uart_deinit(pyb_uart_obj_t *uart_obj);
+// void uart_irq_handler(mp_uint_t uart_id);
+
+void uart_attach_to_repl(pyb_uart_obj_t *self, bool attached);
+uint32_t uart_get_baudrate(pyb_uart_obj_t *self);
+mp_uint_t uart_rx_any(pyb_uart_obj_t *uart_obj);
+mp_uint_t uart_tx_avail(pyb_uart_obj_t *uart_obj);
+bool uart_rx_wait(pyb_uart_obj_t *self, uint32_t timeout);
+int uart_rx_char(pyb_uart_obj_t *uart_obj);
+bool uart_tx_wait(pyb_uart_obj_t *self, uint32_t timeout);
+size_t uart_tx_data(pyb_uart_obj_t *self, const void *src_in, size_t num_chars, int *errcode);
+void uart_tx_strn(pyb_uart_obj_t *uart_obj, const char *str, uint len);
+
+#endif // MICROPY_INCLUDED_RA_UART_H
diff --git a/ports/renesas-ra/usrsw.c b/ports/renesas-ra/usrsw.c
new file mode 100644
index 0000000000000..b0e2396cde466
--- /dev/null
+++ b/ports/renesas-ra/usrsw.c
@@ -0,0 +1,147 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013, 2014 Damien P. George
+ * Copyright (c) 2021 Renesas Electronics Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include <stdio.h>
+
+#include "py/runtime.h"
+#include "py/mphal.h"
+#include "extint.h"
+#include "pin.h"
+#include "usrsw.h"
+
+#if MICROPY_HW_HAS_SWITCH
+
+/// \moduleref pyb
+/// \class Switch - switch object
+///
+/// A Switch object is used to control a push-button switch.
+///
+/// Usage:
+///
+///      sw = pyb.Switch()       # create a switch object
+///      sw()                    # get state (True if pressed, False otherwise)
+///      sw.callback(f)          # register a callback to be called when the
+///                              #   switch is pressed down
+///      sw.callback(None)       # remove the callback
+///
+/// Example:
+///
+///      pyb.Switch().callback(lambda: pyb.LED(1).toggle())
+
+// this function inits the switch GPIO so that it can be used
+void switch_init0(void) {
+    mp_hal_pin_config(MICROPY_HW_USRSW_PIN, MP_HAL_PIN_MODE_INPUT, MICROPY_HW_USRSW_PULL, GPIO_LOW_POWER, 0);
+}
+
+int switch_get(void) {
+    int val = (mp_hal_pin_read(MICROPY_HW_USRSW_PIN) != 0);
+    return val == MICROPY_HW_USRSW_PRESSED;
+}
+
+/******************************************************************************/
+// MicroPython bindings
+
+typedef struct _pyb_switch_obj_t {
+    mp_obj_base_t base;
+} pyb_switch_obj_t;
+
+STATIC const pyb_switch_obj_t pyb_switch_obj = {{&pyb_switch_type}};
+
+void pyb_switch_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+    mp_print_str(print, "Switch()");
+}
+
+/// \classmethod \constructor()
+/// Create and return a switch object.
+STATIC mp_obj_t pyb_switch_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
+    // check arguments
+    mp_arg_check_num(n_args, n_kw, 0, 0, false);
+
+    // No need to clear the callback member: if it's already been set and registered
+    // with extint then we don't want to reset that behaviour.  If it hasn't been set,
+    // then no extint will be called until it is set via the callback method.
+
+    // return static switch object
+    return MP_OBJ_FROM_PTR(&pyb_switch_obj);
+}
+
+/// \method \call()
+/// Return the switch state: `True` if pressed down, `False` otherwise.
+mp_obj_t pyb_switch_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
+    // get switch state
+    mp_arg_check_num(n_args, n_kw, 0, 0, false);
+    return switch_get() ? mp_const_true : mp_const_false;
+}
+
+mp_obj_t pyb_switch_value(mp_obj_t self_in) {
+    (void)self_in;
+    return mp_obj_new_bool(switch_get());
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(pyb_switch_value_obj, pyb_switch_value);
+
+STATIC mp_obj_t switch_callback(mp_obj_t line) {
+    if (MP_STATE_PORT(pyb_switch_callback) != mp_const_none) {
+        mp_call_function_0(MP_STATE_PORT(pyb_switch_callback));
+    }
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(switch_callback_obj, switch_callback);
+
+/// \method callback(fun)
+/// Register the given function to be called when the switch is pressed down.
+/// If `fun` is `None`, then it disables the callback.
+mp_obj_t pyb_switch_callback(mp_obj_t self_in, mp_obj_t callback) {
+    MP_STATE_PORT(pyb_switch_callback) = callback;
+    // Init the EXTI each time this function is called, since the EXTI
+    // may have been disabled by an exception in the interrupt, or the
+    // user disabling the line explicitly.
+    extint_register(MP_OBJ_FROM_PTR(MICROPY_HW_USRSW_PIN),
+        MICROPY_HW_USRSW_EXTI_MODE,
+        MICROPY_HW_USRSW_PULL,
+        callback == mp_const_none ? mp_const_none : MP_OBJ_FROM_PTR(&switch_callback_obj),
+        true);
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(pyb_switch_callback_obj, pyb_switch_callback);
+
+STATIC const mp_rom_map_elem_t pyb_switch_locals_dict_table[] = {
+    { MP_ROM_QSTR(MP_QSTR_value), MP_ROM_PTR(&pyb_switch_value_obj) },
+    { MP_ROM_QSTR(MP_QSTR_callback), MP_ROM_PTR(&pyb_switch_callback_obj) },
+};
+
+STATIC MP_DEFINE_CONST_DICT(pyb_switch_locals_dict, pyb_switch_locals_dict_table);
+
+const mp_obj_type_t pyb_switch_type = {
+    { &mp_type_type },
+    .name = MP_QSTR_Switch,
+    .print = pyb_switch_print,
+    .make_new = pyb_switch_make_new,
+    .call = pyb_switch_call,
+    .locals_dict = (mp_obj_dict_t *)&pyb_switch_locals_dict,
+};
+
+#endif // MICROPY_HW_HAS_SWITCH
diff --git a/ports/renesas-ra/usrsw.h b/ports/renesas-ra/usrsw.h
new file mode 100644
index 0000000000000..ac82719c3ee6d
--- /dev/null
+++ b/ports/renesas-ra/usrsw.h
@@ -0,0 +1,34 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013, 2014 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+#ifndef MICROPY_INCLUDED_RENESAS_RA_USRSW_H
+#define MICROPY_INCLUDED_RENESAS_RA_USRSW_H
+
+void switch_init0(void);
+int switch_get(void);
+
+extern const mp_obj_type_t pyb_switch_type;
+
+#endif // MICROPY_INCLUDED_RENESAS_RA_USRSW_H

From 86e35178e62ca6976afff9bed4318248224f239b Mon Sep 17 00:00:00 2001
From: Takeo Takahashi <takeo.takahashi.xv@renesas.com>
Date: Thu, 28 Apr 2022 22:16:11 +0900
Subject: [PATCH 1976/3533] drivers/dht/dht.py: Change default import module as
 machine.

Signed-off-by: Takeo Takahashi <takeo.takahashi.xv@renesas.com>
---
 drivers/dht/dht.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/dht/dht.py b/drivers/dht/dht.py
index 9be23b3ae0681..411e9a8d28a6b 100644
--- a/drivers/dht/dht.py
+++ b/drivers/dht/dht.py
@@ -9,8 +9,10 @@
     from mimxrt import dht_readinto
 elif sys.platform == "rp2":
     from rp2 import dht_readinto
-else:
+elif sys.platform == "pyboard":
     from pyb import dht_readinto
+else:
+    from machine import dht_readinto
 
 
 class DHTBase:

From e214ae0e644f61b73a71a6dcafe0b018cb102e9f Mon Sep 17 00:00:00 2001
From: Takeo Takahashi <takeo.takahashi.xv@renesas.com>
Date: Thu, 28 Apr 2022 22:18:13 +0900
Subject: [PATCH 1977/3533] github/workflows: Add workflow for renesas-ra port.

Signed-off-by: Takeo Takahashi <takeo.takahashi.xv@renesas.com>
---
 .github/workflows/ports_renesas-ra.yml | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 .github/workflows/ports_renesas-ra.yml

diff --git a/.github/workflows/ports_renesas-ra.yml b/.github/workflows/ports_renesas-ra.yml
new file mode 100644
index 0000000000000..20e068ee75d75
--- /dev/null
+++ b/.github/workflows/ports_renesas-ra.yml
@@ -0,0 +1,24 @@
+name: renesas-ra port
+
+on:
+  push:
+  pull_request:
+    paths:
+      - '.github/workflows/*.yml'
+      - 'tools/**'
+      - 'py/**'
+      - 'extmod/**'
+      - 'lib/**'
+      - 'drivers/**'
+      - 'ports/renesas-ra/**'
+
+jobs:
+  build_renesas_ra_board:
+    runs-on: ubuntu-20.04
+    steps:
+    - uses: actions/checkout@v2
+    - name: Install packages
+      run: source tools/ci.sh && ci_renesas_ra_setup
+    - name: Build
+      run: source tools/ci.sh && ci_renesas_ra_board_build
+

From 3a941cce512529596968d34142e7ec0516b2a460 Mon Sep 17 00:00:00 2001
From: Takeo Takahashi <takeo.takahashi.xv@renesas.com>
Date: Thu, 28 Apr 2022 22:19:18 +0900
Subject: [PATCH 1978/3533] tools/ci.sh: Update for ports/renesas-ra.

Signed-off-by: Takeo Takahashi <takeo.takahashi.xv@renesas.com>
---
 tools/ci.sh | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/tools/ci.sh b/tools/ci.sh
index 7d68709ae4999..3d8cf9741d34b 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -249,6 +249,20 @@ function ci_qemu_arm_build {
     make ${MAKEOPTS} -C ports/qemu-arm -f Makefile.test BOARD=sabrelite test
 }
 
+########################################################################################
+# ports/renesas-ra
+
+function ci_renesas_ra_setup {
+    ci_gcc_arm_setup
+}
+
+function ci_renesas_ra_board_build {
+    make ${MAKEOPTS} -C mpy-cross
+    make ${MAKEOPTS} -C ports/renesas-ra submodules
+    make ${MAKEOPTS} -C ports/renesas-ra BOARD=RA4M1_CLICKER
+    make ${MAKEOPTS} -C ports/renesas-ra BOARD=RA6M2_EK
+}
+
 ########################################################################################
 # ports/rp2
 

From 4753913253072d7d47f7d09540e7c5c210ebb673 Mon Sep 17 00:00:00 2001
From: Takeo Takahashi <takeo.takahashi.xv@renesas.com>
Date: Thu, 28 Apr 2022 22:21:17 +0900
Subject: [PATCH 1979/3533] tests/renesas-ra: Add tests for renesas-ra port.

Signed-off-by: Takeo Takahashi <takeo.takahashi.xv@renesas.com>
---
 tests/renesas-ra/freq.py         | 59 ++++++++++++++++++++++++
 tests/renesas-ra/freq.py.exp     |  1 +
 tests/renesas-ra/i2c.py          | 17 +++++++
 tests/renesas-ra/i2c.py.exp      |  0
 tests/renesas-ra/modtime.py      | 78 ++++++++++++++++++++++++++++++++
 tests/renesas-ra/modtime.py.exp  | 46 +++++++++++++++++++
 tests/renesas-ra/pin.py          | 51 +++++++++++++++++++++
 tests/renesas-ra/pin.py.exp      | 10 ++++
 tests/renesas-ra/rtc_init.py     | 12 +++++
 tests/renesas-ra/rtc_init.py.exp |  2 +
 tests/renesas-ra/spi.py          | 40 ++++++++++++++++
 tests/renesas-ra/spi.py.exp      |  9 ++++
 tests/renesas-ra/uart1.py        | 51 +++++++++++++++++++++
 tests/renesas-ra/uart1.py.exp    |  1 +
 14 files changed, 377 insertions(+)
 create mode 100644 tests/renesas-ra/freq.py
 create mode 100644 tests/renesas-ra/freq.py.exp
 create mode 100644 tests/renesas-ra/i2c.py
 create mode 100644 tests/renesas-ra/i2c.py.exp
 create mode 100644 tests/renesas-ra/modtime.py
 create mode 100644 tests/renesas-ra/modtime.py.exp
 create mode 100644 tests/renesas-ra/pin.py
 create mode 100644 tests/renesas-ra/pin.py.exp
 create mode 100644 tests/renesas-ra/rtc_init.py
 create mode 100644 tests/renesas-ra/rtc_init.py.exp
 create mode 100644 tests/renesas-ra/spi.py
 create mode 100644 tests/renesas-ra/spi.py.exp
 create mode 100644 tests/renesas-ra/uart1.py
 create mode 100644 tests/renesas-ra/uart1.py.exp

diff --git a/tests/renesas-ra/freq.py b/tests/renesas-ra/freq.py
new file mode 100644
index 0000000000000..6fbf6ce09630a
--- /dev/null
+++ b/tests/renesas-ra/freq.py
@@ -0,0 +1,59 @@
+#
+# definitions
+#
+MACHINE_RA4M1_CLICKER = "RA4M1_CLICKER with RA4M1"
+MACHINE_RA4M1_EK = "RA4M1_EK with RA4M1"
+MACHINE_RA4W1_EK = "RA4W1_EK with RA4W1"
+MACHINE_RA6M1_EK = "RA6M1_EK with RA6M1"
+MACHINE_RA6M2_EK = "RA6M2_EK with RA6M2"
+SYSCLK_RA4M1_CLICKER = 48000000
+SYSCLK_RA4M1_EK = 48000000
+SYSCLK_RA4W1_EK = 48000000
+SYSCLK_RA6M1_EK = 120000000
+SYSCLK_RA6M2_EK = 120000000
+
+#
+# machine
+#
+
+import os
+
+try:
+    import machine
+except:
+    print("machine module is not found")
+    raise SystemExit
+
+m = os.uname().machine
+f = machine.freq()
+
+if m == MACHINE_RA4M1_CLICKER:
+    if f == SYSCLK_RA4M1_CLICKER:
+        print("freq: OK")
+    else:
+        print("freq: NG")
+
+
+if m == MACHINE_RA4M1_EK:
+    if f == SYSCLK_RA4M1_EK:
+        print("freq: OK")
+    else:
+        print("freq: NG")
+
+if m == MACHINE_RA4W1_EK:
+    if f == SYSCLK_RA4W1_EK:
+        print("freq: OK")
+    else:
+        print("freq: NG")
+
+if m == MACHINE_RA6M1_EK:
+    if f == SYSCLK_RA6M1_EK:
+        print("freq: OK")
+    else:
+        print("freq: NG")
+
+if m == MACHINE_RA6M2_EK:
+    if f == SYSCLK_RA6M2_EK:
+        print("freq: OK")
+    else:
+        print("freq: NG")
diff --git a/tests/renesas-ra/freq.py.exp b/tests/renesas-ra/freq.py.exp
new file mode 100644
index 0000000000000..7f4b843ee8564
--- /dev/null
+++ b/tests/renesas-ra/freq.py.exp
@@ -0,0 +1 @@
+freq: OK
diff --git a/tests/renesas-ra/i2c.py b/tests/renesas-ra/i2c.py
new file mode 100644
index 0000000000000..bb22509e453ec
--- /dev/null
+++ b/tests/renesas-ra/i2c.py
@@ -0,0 +1,17 @@
+import os
+import time
+
+n = os.uname().machine
+if "RA6M2_EK" in n:
+    i2c_id = 2
+elif "RA6M1_EK" in n:
+    i2c_id = 0
+elif ("RA4M1_CLICKER" in n) or ("RA4M1_EK" in n) or ("RA4W1_EK" in n):
+    print("SKIP")
+    raise SystemExit
+else:
+    i2c_id = 0
+
+from machine import I2C
+
+i2c = I2C(i2c_id)
diff --git a/tests/renesas-ra/i2c.py.exp b/tests/renesas-ra/i2c.py.exp
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/tests/renesas-ra/modtime.py b/tests/renesas-ra/modtime.py
new file mode 100644
index 0000000000000..396f832667bfd
--- /dev/null
+++ b/tests/renesas-ra/modtime.py
@@ -0,0 +1,78 @@
+import time
+
+DAYS_PER_MONTH = [0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31]
+
+
+def is_leap(year):
+    return (year % 4) == 0
+
+
+def test():
+    seconds = 0
+    wday = 5  # Jan 1, 2000 was a Saturday
+    for year in range(2000, 2034):
+        print("Testing %d" % year)
+        yday = 1
+        for month in range(1, 13):
+            if month == 2 and is_leap(year):
+                DAYS_PER_MONTH[2] = 29
+            else:
+                DAYS_PER_MONTH[2] = 28
+            for day in range(1, DAYS_PER_MONTH[month] + 1):
+                secs = time.mktime((year, month, day, 0, 0, 0, 0, 0))
+                if secs != seconds:
+                    print(
+                        "mktime failed for %d-%02d-%02d got %d expected %d"
+                        % (year, month, day, secs, seconds)
+                    )
+                tuple = time.localtime(seconds)
+                secs = time.mktime(tuple)
+                if secs != seconds:
+                    print(
+                        "localtime failed for %d-%02d-%02d got %d expected %d"
+                        % (year, month, day, secs, seconds)
+                    )
+                    return
+                seconds += 86400
+                if yday != tuple[7]:
+                    print(
+                        "locatime for %d-%02d-%02d got yday %d, expecting %d"
+                        % (year, month, day, tuple[7], yday)
+                    )
+                    return
+                if wday != tuple[6]:
+                    print(
+                        "locatime for %d-%02d-%02d got wday %d, expecting %d"
+                        % (year, month, day, tuple[6], wday)
+                    )
+                    return
+                yday += 1
+                wday = (wday + 1) % 7
+
+
+def spot_test(seconds, expected_time):
+    actual_time = time.localtime(seconds)
+    for i in range(len(actual_time)):
+        if actual_time[i] != expected_time[i]:
+            print(
+                "time.localtime(", seconds, ") returned", actual_time, "expecting", expected_time
+            )
+            return
+    print("time.localtime(", seconds, ") returned", actual_time, "(pass)")
+
+
+test()
+# fmt: off
+spot_test(          0,  (2000,  1,  1,  0,  0,  0, 5,   1))
+spot_test(          1,  (2000,  1,  1,  0,  0,  1, 5,   1))
+spot_test(         59,  (2000,  1,  1,  0,  0, 59, 5,   1))
+spot_test(         60,  (2000,  1,  1,  0,  1,  0, 5,   1))
+spot_test(       3599,  (2000,  1,  1,  0, 59, 59, 5,   1))
+spot_test(       3600,  (2000,  1,  1,  1,  0,  0, 5,   1))
+spot_test(         -1,  (1999, 12, 31, 23, 59, 59, 4, 365))
+spot_test(  447549467,  (2014,  3,  7, 23, 17, 47, 4,  66))
+spot_test( -940984933,  (1970,  3,  7, 23, 17, 47, 5,  66))
+spot_test(-1072915199,  (1966,  1,  1,  0,  0,  1, 5,   1))
+spot_test(-1072915200,  (1966,  1,  1,  0,  0,  0, 5,   1))
+spot_test(-1072915201,  (1965, 12, 31, 23, 59, 59, 4, 365))
+# fmt: on
diff --git a/tests/renesas-ra/modtime.py.exp b/tests/renesas-ra/modtime.py.exp
new file mode 100644
index 0000000000000..3e1f6e920c385
--- /dev/null
+++ b/tests/renesas-ra/modtime.py.exp
@@ -0,0 +1,46 @@
+Testing 2000
+Testing 2001
+Testing 2002
+Testing 2003
+Testing 2004
+Testing 2005
+Testing 2006
+Testing 2007
+Testing 2008
+Testing 2009
+Testing 2010
+Testing 2011
+Testing 2012
+Testing 2013
+Testing 2014
+Testing 2015
+Testing 2016
+Testing 2017
+Testing 2018
+Testing 2019
+Testing 2020
+Testing 2021
+Testing 2022
+Testing 2023
+Testing 2024
+Testing 2025
+Testing 2026
+Testing 2027
+Testing 2028
+Testing 2029
+Testing 2030
+Testing 2031
+Testing 2032
+Testing 2033
+time.localtime( 0 ) returned (2000, 1, 1, 0, 0, 0, 5, 1) (pass)
+time.localtime( 1 ) returned (2000, 1, 1, 0, 0, 1, 5, 1) (pass)
+time.localtime( 59 ) returned (2000, 1, 1, 0, 0, 59, 5, 1) (pass)
+time.localtime( 60 ) returned (2000, 1, 1, 0, 1, 0, 5, 1) (pass)
+time.localtime( 3599 ) returned (2000, 1, 1, 0, 59, 59, 5, 1) (pass)
+time.localtime( 3600 ) returned (2000, 1, 1, 1, 0, 0, 5, 1) (pass)
+time.localtime( -1 ) returned (1999, 12, 31, 23, 59, 59, 4, 365) (pass)
+time.localtime( 447549467 ) returned (2014, 3, 7, 23, 17, 47, 4, 66) (pass)
+time.localtime( -940984933 ) returned (1970, 3, 7, 23, 17, 47, 5, 66) (pass)
+time.localtime( -1072915199 ) returned (1966, 1, 1, 0, 0, 1, 5, 1) (pass)
+time.localtime( -1072915200 ) returned (1966, 1, 1, 0, 0, 0, 5, 1) (pass)
+time.localtime( -1072915201 ) returned (1965, 12, 31, 23, 59, 59, 4, 365) (pass)
diff --git a/tests/renesas-ra/pin.py b/tests/renesas-ra/pin.py
new file mode 100644
index 0000000000000..32bad5dfe6f87
--- /dev/null
+++ b/tests/renesas-ra/pin.py
@@ -0,0 +1,51 @@
+from machine import Pin
+import os
+
+n = os.uname().machine
+if "RA4W1_EK" in n:
+    try_pin = "P004"
+    try_s = "Pin(Pin.cpu.P004, mode=Pin.IN, pull=Pin.PULL_NONE, drive=Pin.LOW_POWER)"
+else:
+    try_pin = "P000"
+    try_s = "Pin(Pin.cpu.P000, mode=Pin.IN, pull=Pin.PULL_NONE, drive=Pin.LOW_POWER)"
+
+p = Pin(try_pin, Pin.IN)
+if str(p) == try_s:
+    print("OK")
+else:
+    print("NG")
+    print("exp: " + try_s)
+    print("out: " + str(p))
+
+p = Pin("SW1", Pin.IN, Pin.PULL_UP)
+if p.mode() != 1:
+    print("mode: NG")
+p = Pin("SW1", Pin.IN, pull=Pin.PULL_UP)
+if p.pull() != 14:
+    print("pull: NG")
+p = Pin("SW1", mode=Pin.IN, pull=Pin.PULL_UP)
+
+p.init(p.IN, p.PULL_UP)
+p.init(p.IN, pull=p.PULL_UP)
+p.init(mode=p.IN, pull=p.PULL_UP)
+print(p.value())
+
+p.init(p.OUT)
+p.init(p.OPEN_DRAIN)
+p.low()
+print(p.value())
+p.high()
+print(p.value())
+p.value(0)
+print(p.value())
+p.value(1)
+print(p.value())
+p.value(False)
+print(p.value())
+p.value(True)
+print(p.value())
+p.off()
+print(p.value())
+p.on()
+print(p.value())
+p.off()
diff --git a/tests/renesas-ra/pin.py.exp b/tests/renesas-ra/pin.py.exp
new file mode 100644
index 0000000000000..4c8cc50b0c06f
--- /dev/null
+++ b/tests/renesas-ra/pin.py.exp
@@ -0,0 +1,10 @@
+OK
+1
+0
+1
+0
+1
+0
+1
+0
+1
diff --git a/tests/renesas-ra/rtc_init.py b/tests/renesas-ra/rtc_init.py
new file mode 100644
index 0000000000000..08e36f535e112
--- /dev/null
+++ b/tests/renesas-ra/rtc_init.py
@@ -0,0 +1,12 @@
+import machine
+from machine import RTC
+import time
+
+rtc = RTC()
+rtc.init()
+print(rtc)
+
+# make sure that 1 second passes correctly
+rtc.datetime((2014, 1, 1, 1, 0, 0, 0, 0))
+time.sleep_ms(1002)
+print(rtc.datetime()[:7])
diff --git a/tests/renesas-ra/rtc_init.py.exp b/tests/renesas-ra/rtc_init.py.exp
new file mode 100644
index 0000000000000..d1ea2d9590b0b
--- /dev/null
+++ b/tests/renesas-ra/rtc_init.py.exp
@@ -0,0 +1,2 @@
+<RTC>
+(2014, 1, 1, 1, 0, 0, 1)
diff --git a/tests/renesas-ra/spi.py b/tests/renesas-ra/spi.py
new file mode 100644
index 0000000000000..eb24f3714706a
--- /dev/null
+++ b/tests/renesas-ra/spi.py
@@ -0,0 +1,40 @@
+import os
+from machine import SPI
+
+machine = os.uname().machine
+if (
+    "RA6M1_EK" in machine
+    or "RA4M1_CLICKER" in machine
+    or "RA4M1_EK" in machine
+    or "RA4W1_EK" in machine
+    or "RA6M1_EK" in machine
+):
+    spis = (-1, 0)
+else:
+    spis = (-1, 0, 1)
+
+# test we can correctly create by id
+for bus in spis:
+    try:
+        spi = SPI(bus)
+    except ValueError:
+        print("ValueError", bus)
+
+spi = SPI(0)
+print(spi)
+
+spi = SPI(0)
+spi = SPI(0, baudrate=500000)
+print(spi)
+spi = SPI(0, 500000, polarity=1, phase=0, bits=8)
+print(spi)
+spi.init(baudrate=400000)
+print(spi)
+spi.init(polarity=0)
+print(spi)
+spi.init(phase=1)
+print(spi)
+spi.init(bits=8)
+print(spi)
+
+spi.deinit()
diff --git a/tests/renesas-ra/spi.py.exp b/tests/renesas-ra/spi.py.exp
new file mode 100644
index 0000000000000..b2dd2b0fae184
--- /dev/null
+++ b/tests/renesas-ra/spi.py.exp
@@ -0,0 +1,9 @@
+Warning: SPI(-1, ...) is deprecated, use SoftSPI(...) instead
+ValueError -1
+SPI(0, baudrate=500000, polarity=0, phase=0, bits=8, firstbit=0, sck=P102, mosi=P101, miso=P100)
+SPI(0, baudrate=500000, polarity=0, phase=0, bits=8, firstbit=0, sck=P102, mosi=P101, miso=P100)
+SPI(0, baudrate=500000, polarity=1, phase=0, bits=8, firstbit=0, sck=P102, mosi=P101, miso=P100)
+SPI(0, baudrate=400000, polarity=1, phase=0, bits=8, firstbit=0, sck=P102, mosi=P101, miso=P100)
+SPI(0, baudrate=400000, polarity=0, phase=0, bits=8, firstbit=0, sck=P102, mosi=P101, miso=P100)
+SPI(0, baudrate=400000, polarity=0, phase=1, bits=8, firstbit=0, sck=P102, mosi=P101, miso=P100)
+SPI(0, baudrate=400000, polarity=0, phase=1, bits=8, firstbit=0, sck=P102, mosi=P101, miso=P100)
diff --git a/tests/renesas-ra/uart1.py b/tests/renesas-ra/uart1.py
new file mode 100644
index 0000000000000..bf7b9276022d1
--- /dev/null
+++ b/tests/renesas-ra/uart1.py
@@ -0,0 +1,51 @@
+import os
+from machine import UART
+
+machine = os.uname().machine
+if "RA6M2_EK" in machine:
+    # 0, 7, 9
+    uart_ids = (0, 7, 9)
+    try_id = 7
+    try_s = "UART(7, baudrate=115200, bits=8, parity=None, stop=1, tx=P401, rx=P402, flow=0, rxbuf=259, timeout=0, timeout_char=2)"
+elif "RA4M1_CLICKER" in machine:
+    # 0, 1
+    uart_ids = (0, 1)
+    try_id = 0
+    try_s = "UART(0, baudrate=115200, bits=8, parity=None, stop=1, tx=P411, rx=P410, flow=0, rxbuf=259, timeout=0, timeout_char=2)"
+elif "RA4M1_EK" in machine:
+    # 0, 1, 2, 9
+    # vector for 9 is not registered
+    uart_ids = (0, 1, 2)
+    try_id = 1
+    try_s = "UART(1, baudrate=115200, bits=8, parity=None, stop=1, tx=P401, rx=P402, flow=0, rxbuf=259, timeout=0, timeout_char=2)"
+elif "RA4W1_EK" in machine:
+    # 0, 1, 4, 9
+    # 0 is disabled.
+    uart_ids = (1, 4, 9)
+    try_id = 9
+    try_s = "UART(9, baudrate=115200, bits=8, parity=None, stop=1, tx=P109, rx=P110, flow=0, rxbuf=259, timeout=0, timeout_char=2)"
+elif "RA6M1_EK" in machine:
+    # 0, 1, 2, 3, 4, 8, 9
+    # 1/3/4/9 are disabled
+    uart_ids = (0, 2, 8)
+    try_id = 8
+    try_s = "UART(8, baudrate=115200, bits=8, parity=None, stop=1, tx=P105, rx=P104, flow=0, rxbuf=259, timeout=0, timeout_char=2)"
+else:
+    print("SKIP")
+    raise SystemExit
+
+for ch in uart_ids:
+    try:
+        uart = UART(ch)
+    except ValueError:
+        print("ValueError", bus)
+
+rxbuf_size = 259
+
+ch = UART(try_id, rxbuf=rxbuf_size)
+if str(ch) == try_s:
+    print("OK")
+else:
+    print("NG")
+    print("exp: " + try_s)
+    print("out: " + str(ch))
diff --git a/tests/renesas-ra/uart1.py.exp b/tests/renesas-ra/uart1.py.exp
new file mode 100644
index 0000000000000..d86bac9de59ab
--- /dev/null
+++ b/tests/renesas-ra/uart1.py.exp
@@ -0,0 +1 @@
+OK

From 3717d599e298bcc0654b1ff46cb222c9162a90da Mon Sep 17 00:00:00 2001
From: Takeo Takahashi <takeo.takahashi.xv@renesas.com>
Date: Thu, 28 Apr 2022 22:22:24 +0900
Subject: [PATCH 1980/3533] tests/run-tests.py: Update for renesas-ra port.

Signed-off-by: Takeo Takahashi <takeo.takahashi.xv@renesas.com>
---
 tests/run-tests.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/tests/run-tests.py b/tests/run-tests.py
index 3732e47adaff8..fa2db9d2eb618 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -485,6 +485,10 @@ def run_tests(pyb, tests, args, result_dir, num_threads=1):
             for t in tests:
                 if t.startswith("basics/io_"):
                     skip_tests.add(t)
+        elif args.target == "renesas-ra":
+            skip_tests.add(
+                "extmod/utime_time_ns.py"
+            )  # RA fsp rtc function doesn't support nano sec info
         elif args.target == "qemu-arm":
             skip_tests.add("misc/print_exception.py")  # requires sys stdfiles
 
@@ -803,7 +807,7 @@ def main():
         "unix",
         "qemu-arm",
     )
-    EXTERNAL_TARGETS = ("pyboard", "wipy", "esp8266", "esp32", "minimal", "nrf")
+    EXTERNAL_TARGETS = ("pyboard", "wipy", "esp8266", "esp32", "minimal", "nrf", "renesas-ra")
     if args.target in LOCAL_TARGETS or args.list_tests:
         pyb = None
     elif args.target in EXTERNAL_TARGETS:
@@ -827,6 +831,8 @@ def main():
             if args.target == "pyboard":
                 # run pyboard tests
                 test_dirs += ("float", "stress", "pyb", "pybnative", "inlineasm")
+            elif args.target in ("renesas-ra"):
+                test_dirs += ("float", "inlineasm", "renesas-ra")
             elif args.target in ("esp8266", "esp32", "minimal", "nrf"):
                 test_dirs += ("float",)
             elif args.target == "wipy":

From 1b618005301ab6cff3bde91302c49da32283ed0a Mon Sep 17 00:00:00 2001
From: Takeo Takahashi <takeo.takahashi.xv@renesas.com>
Date: Fri, 29 Apr 2022 10:52:16 +0900
Subject: [PATCH 1981/3533] docs/renesas-ra: Add renesas-ra docs files.

Signed-off-by: Takeo Takahashi <takeo.takahashi.xv@renesas.com>
---
 docs/renesas-ra/general.rst                   |  42 ++
 docs/renesas-ra/img/ek_ra6m2_board.jpg        | Bin 0 -> 181075 bytes
 docs/renesas-ra/quickref.rst                  | 415 ++++++++++++++++++
 .../tutorial/img/ek_ra6m2_how_to_connect.jpg  | Bin 0 -> 120872 bytes
 .../img/ra4m1_clicker_how_to_connect.jpg      | Bin 0 -> 106133 bytes
 docs/renesas-ra/tutorial/index.rst            |  16 +
 docs/renesas-ra/tutorial/intro.rst            |  67 +++
 docs/renesas-ra/tutorial/program_in_flash.rst |  62 +++
 docs/renesas-ra/tutorial/reset.rst            |  61 +++
 docs/renesas-ra/tutorial/troubleshooting.rst  |  18 +
 docs/renesas-ra/tutorial/using_peripheral.rst |  68 +++
 11 files changed, 749 insertions(+)
 create mode 100644 docs/renesas-ra/general.rst
 create mode 100644 docs/renesas-ra/img/ek_ra6m2_board.jpg
 create mode 100644 docs/renesas-ra/quickref.rst
 create mode 100644 docs/renesas-ra/tutorial/img/ek_ra6m2_how_to_connect.jpg
 create mode 100644 docs/renesas-ra/tutorial/img/ra4m1_clicker_how_to_connect.jpg
 create mode 100644 docs/renesas-ra/tutorial/index.rst
 create mode 100644 docs/renesas-ra/tutorial/intro.rst
 create mode 100644 docs/renesas-ra/tutorial/program_in_flash.rst
 create mode 100644 docs/renesas-ra/tutorial/reset.rst
 create mode 100644 docs/renesas-ra/tutorial/troubleshooting.rst
 create mode 100644 docs/renesas-ra/tutorial/using_peripheral.rst

diff --git a/docs/renesas-ra/general.rst b/docs/renesas-ra/general.rst
new file mode 100644
index 0000000000000..c8eea53f8bcef
--- /dev/null
+++ b/docs/renesas-ra/general.rst
@@ -0,0 +1,42 @@
+.. _renesas-ra_general:
+
+General information about Renesas RA port
+=========================================
+
+Overview
+--------
+
+The renesas-ra port supports boards powered by Renesas Electronics's
+the flexible Renesas Advanced (RA) 32-bit microcontrollers (MCUs) family,
+industry-leading 32-bit MCUs with the Arm® Cortex®-M33, -M23 and -M4
+processor cores and PSA certification.
+
+The ported hardware functionalities are Pin, SPI, I2C, UART and RTC at this present.
+Other hardware functionalities such as Timer, PWM, USB, CAN and WDT are not implemented yet.
+
+The following boards are officially supported.
+
+* RA4M1-CLICKER
+
+For the manual and other references for the board and RA Family MCU, please refer to the web page: `EK-RA4M1 CLICKER <https://www.mikroe.com/ra4m1-clicker>`_
+
+* EK-RA6M2
+
+For the manual and other references for the board and RA Family MCU, please refer to the web page: `EK-RA6M2 <https://www.renesas.com/products/microcontrollers-microprocessors/ra-cortex-m-mcus/ek-ra6m2-ra6m2-mcu-group-evaluation-board>`_
+
+The following boards are unofficially supported.
+
+* EK-RA4M1
+
+For the manual and other references for the board and RA Family MCU, please refer to the web page: `EK-RA4M1 <https://www.renesas.com/products/microcontrollers-microprocessors/ra-cortex-m-mcus/ek-ra4m1-ra4m1-mcu-group-evaluation-board>`_
+
+* EK-RA4W1
+
+For the manual and other references for the board and RA Family MCU, please refer to the web page: `EK-RA4W1 <https://www.renesas.com/products/microcontrollers-microprocessors/ra-cortex-m-mcus/ek-ra4w1-ra4w1-mcu-group-evaluation-board>`_
+
+* EK-RA6M1
+
+For the manual and other references for the board and RA Family MCU, please refer to the web page: `EK-RA6M1 <https://www.renesas.com/products/microcontrollers-microprocessors/ra-cortex-m-mcus/ek-ra6m1-ra6m1-mcu-group-evaluation-board>`_
+
+For more information, please visit the web page: `<https://github.com/renesas/micropython/wiki>`_
+
diff --git a/docs/renesas-ra/img/ek_ra6m2_board.jpg b/docs/renesas-ra/img/ek_ra6m2_board.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..85c0305a1c9b264e024cd10b6ad8b04cec1ed59f
GIT binary patch
literal 181075
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%0As^Ybt_>I<K
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%0D8ywx>=P
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
QC6IDq+(aN!2-@iX9{@PNc>n+a

literal 0
HcmV?d00001

diff --git a/docs/renesas-ra/quickref.rst b/docs/renesas-ra/quickref.rst
new file mode 100644
index 0000000000000..23ffab50eb80f
--- /dev/null
+++ b/docs/renesas-ra/quickref.rst
@@ -0,0 +1,415 @@
+.. _renesas-ra_quickref:
+
+Quick reference for the Renesas RA
+==================================
+
+.. image:: img/ek_ra6m2_board.jpg
+   :alt: Renesas Evaluation Kit for RA6M2 MCU Group
+   :width: 640px
+
+The Renesas EK-RA6M2 board.
+
+Below is a quick reference for the Renesas RA boards.  If it is your first time
+working with this board, it may be useful to get an overview of the microcontroller and the board:
+
+.. toctree::
+   :maxdepth: 1
+
+   general.rst
+   tutorial/index.rst
+
+Installing MicroPython
+----------------------
+
+See the corresponding section of tutorial: :ref:`renesas-ra_intro`. It also includes a troubleshooting subsection.
+
+General board control
+---------------------
+
+The MicroPython REPL is accessed via the USB serial port. Tab-completion is useful to find out what methods an object has. Paste mode (ctrl-E) is useful to paste a large slab of Python code into the REPL.  Some of features are not implemented for Renesas RA boards yet, please refer to the tutorial for more details.
+
+The :mod:`machine` module::
+
+    import machine
+
+    machine.freq()    # get the current frequency of the CPU
+
+
+Following functions are supported::
+
+    machine.freq()
+    machine.reset()
+    machine.soft_reset()
+    machine.unique_id()
+
+Following functions are not supported at the present::
+
+    machine.reset_cause()
+    machine.bootloader([value])
+    machine.disable_irq()
+    machine.enable_irq(state)
+    machine.freq([hz])
+    machine.idle()
+    machine.sleep()
+    machine.lightsleep()
+    machine.lightsleep([time_ms])
+    machine.deepsleep()
+    machine.deepsleep([time_ms])
+    machine.wake_reason()
+    machine.time_pulse_us(pin, pulse_level, timeout_us=1000000,/)
+    machine.bitstream(pin, encoding, timing, data, /)
+    machine.rng()
+
+
+Delay and timing
+----------------
+
+Use the :mod:`time <time>` module::
+
+    import time
+
+    time.sleep(1)           # sleep for 1 second
+    time.sleep_ms(500)      # sleep for 500 milliseconds
+    time.sleep_us(10)       # sleep for 10 microseconds
+    start = time.ticks_ms() # get value of millisecond counter
+    delta = time.ticks_diff(time.ticks_ms(), start) # compute time difference
+
+Timers
+------
+
+The RA MCU's system timer peripheral provides a global microsecond timebase and generates interrupts for it. The software timer is available currently and there are unlimited number of them (memory permitting). There is no need to specify the timer id (id=-1 is supported at the moment) as it will default to this.
+
+Use the :mod:`machine.Timer` class::
+
+    from machine import Timer
+
+    tim = Timer(-1)
+    tim.init(period=5000, mode=Timer.ONE_SHOT, callback=lambda t:print(1))
+    tim.init(period=2000, mode=Timer.PERIODIC, callback=lambda t: print(2))
+
+Following functions are not supported at the present::
+    Timer(id)  # hardware timer is not supported.
+
+Pins and GPIO
+-------------
+
+Use the :ref:`machine.Pin <machine.Pin>` class::
+
+    from machine import Pin
+
+    p0 = Pin('P000', Pin.OUT)      # create output pin on P000
+    p0.on()                        # set pin to "on" (high) level
+    p0.off()                       # set pin to "off" (low) level
+    p0.value(1)                    # set pin to on/high
+
+    p2 = Pin(Pin.cpu.P002, Pin.IN) # create input pin on P002
+    print(p2.value())              # get value, 0 or 1
+
+    p4 = Pin('P004', Pin.PULL_UP)      # enable internal pull-up register
+    p5 = Pin('P005', Pin.OUT, value=1) # set pin high on creation
+
+Pin id is available corresponding to the RA MCU's pin name which are Pin.cpu.P106 and 'P106'. The RA MCU has many feature's pins. However, there are some cases that pin feature is fixed or not connected by the board. Please confirm the board manual for the pin mapping.
+
+UART (serial bus)
+-----------------
+
+The RA MCU has some hardware UARTs called SCI (Serial Communication Interface).
+UART id is available corresponding to the RA MCU's SCI number which are UART(0) as SCI0 and UART(1) as SCI1.
+
+See :ref:`machine.UART <machine.UART>`. ::
+
+    from machine import UART
+
+    uart1 = UART(1, 115200)
+    uart1.write('hello')    # write 5 bytes
+    uart1.read(5)           # read up to 5 bytes
+
+
+Available UARTs and pins on the board are fixed and follows. One of these UARTs is used for REPL.
+
+=============  ==============  ==============  ==============
+EK-RA4M1       UART0(REPL)     UART1           UART2
+=============  ==============  ==============  ==============
+tx             P411            P401            P302
+rx             P410            P402            P301
+=============  ==============  ==============  ==============
+
+
+=============  ==============  ==============  ==============
+EK-RA4W1       UART1           UART4(REPL)     UART9
+=============  ==============  ==============  ==============
+tx             P213            P204            P109
+rx             P212            P206            P110
+=============  ==============  ==============  ==============
+
+
+=============  ==============  ==============  ==============
+EK-RA6M1       UART0(REPL)     UART2           UART8
+=============  ==============  ==============  ==============
+tx             P411            P302            P105
+rx             P410            P301            P104
+=============  ==============  ==============  ==============
+
+
+=============  ==============  ==============  ==============
+EK-RA6M2       UART0(REPL)     UART7           UART9
+=============  ==============  ==============  ==============
+tx             P411            P401            P602
+rx             P410            P402            P601
+=============  ==============  ==============  ==============
+
+
+=============  ==============  ==============
+RA4M1-CLICKER  UART0           UART1(REPL)
+=============  ==============  ==============
+tx             P411            P401
+rx             P410            P402
+=============  ==============  ==============
+
+
+Following functions are not supported at the present::
+
+    UART.init(baudrate)   # now only 115200 is confirmed
+    UART.init(cts, rts)   # Pins are fixed.
+    UART.init(invert)
+    UART.init(tx,rx)      # Pins are fixed.
+    UART.init(txbuf)
+    UART.init(flow)
+    UART.irq(handler)
+    UART.irq(trigger=RX_ANY)
+    UART.irq(priority)
+    UART.irq(wake=machine.IDLE)
+
+Real time clock (RTC)
+---------------------
+
+See :ref:`machine.RTC <machine.RTC>` ::
+
+    from machine import RTC
+
+    rtc = RTC()
+    rtc.datetime((2017, 8, 23, 1, 12, 48, 0, 0)) # set a specific date and time
+                                                 # time, eg 2017/8/23 1:12:48
+    rtc.datetime() # get date and time
+
+Following functions are not supported at the present::
+
+    RTC.init(datetime)
+    RTC.now()
+    RTC.deinit()
+    RTC.alarm()
+    RTC.alarm_left()
+    RTC.cancel()
+    RTC.irq()
+
+ADC (analog to digital conversion)
+----------------------------------
+
+See :ref:`machine.ADC <machine.ADC>` ::
+
+    from machine import ADC
+
+    adc = ADC('P000')    # create an ADC object acting on a pin
+    adc.read_u16()       # read a raw analog value in the range 0-65535
+
+Pin id is available corresponding to the RA MCU's pin name which are 'P000' as AN000 (analog channel 000). The RA MCU has many analog channels. However, there are some cases that pin feature is fixed or not available by the board. Please confirm the MCU and board manual for the pin mapping.
+
+Following functions are not supported at the present::
+
+    ADC.init()
+    ADC(sample_ns)
+    ADC(atten)
+    ADC.read_uv()
+    ADC.block()
+
+SPI bus
+-------
+
+The RA MCU has some hardware SPIs (Serial Peripheral Interface).
+SPI id is available corresponding to the RA MCU's SPI number which are SPI(0) as SPI0 and SPI(1) as SPI1. If with no additional parameters, machine.SoftSPI() is called.
+
+See :ref:`machine.SPI <machine.SPI>`. ::
+
+    from machine import SPI, Pin
+
+    spi = SPI(0, baudrate=500000)
+    cs = Pin.cpu.P103
+    cs(0)
+    spi.write(b"12345678")
+    cs(1)
+
+Available SPIs and pins on the board are fixed and follows.
+
+=============  ====
+EK-RA4M1       SPI0
+=============  ====
+sck            P102
+mosi           P101
+miso           P100
+cs             P206
+=============  ====
+
+
+=============  ====
+EK-RA4W1       SPI0
+=============  ====
+sck            P102
+mosi           P101
+miso           P100
+cs             P103
+=============  ====
+
+
+=============  ====
+EK-RA6M1       SPI0
+=============  ====
+sck            P102
+mosi           P101
+miso           P100
+cs             P103
+=============  ====
+
+
+=============  ====   ====
+EK-RA6M2       SPI0   SPI1
+=============  ====   ====
+sck            P102   P702
+mosi           P101   P701
+miso           P100   P700
+cs             P103   P703
+=============  ====   ====
+
+
+=============  ====
+RA4M1-CLICKER  SPI0
+=============  ====
+sck            P102
+mosi           P101
+miso           P100
+cs             P103
+=============  ====
+
+Following functions are not supported at the present::
+
+    SPI.init(firstbit)    # now fixed with SPI.LSB
+    SPI.init(baudrate)    # now confirmed only 500000
+
+I2C bus
+-------
+
+The RA MCU has some hardware IIC (Inter-Integrated Circuit Bus).
+I2C id is available corresponding to the RA MCU's I2C number which are I2C(0) as IIC0 and I2C(1) as IIC1. If with no additional parameters, machine.SoftI2C() is called.
+
+See :ref:`machine.I2C <machine.I2C>` ::
+
+    from machine import I2C
+
+    i2c = I2C(0)
+
+    i2c.scan()         # returns list of slave addresses
+    i2c.readfrom_mem(0x50, 0x10, 2, addrsize=16)  # read 2 bytes from slave 0x50, slave memory 0x10
+
+Available I2Cs and pins on the board are fixed and follows.
+
+=============  =============
+EK-RA4M1             -
+=============  =============
+scl            not supported
+sda            not supported
+=============  =============
+
+=============  ====
+EK-RA4W1       I2C0
+=============  ====
+scl            P204
+sda            P407
+=============  ====
+
+=============  ====
+EK-RA6M1       I2C0
+=============  ====
+scl            P400
+sda            P401
+=============  ====
+
+=============  ====
+EK-RA6M2       I2C2
+=============  ====
+scl            P512
+sda            P511
+=============  ====
+
+=============  ====
+RA4M1-CLICKER  I2C1
+=============  ====
+scl            P205
+sda            P206
+=============  ====
+
+Following functions are not supported at the present::
+
+    I2C.init(freq)    # now confirmed only 400000
+    I2C.deinit()
+    I2C.start()
+    I2C.stop()
+
+PWM (pulse width modulation)
+----------------------------
+
+PWM is not supported.
+
+WDT (Watchdog timer)
+--------------------
+
+WDT is not supported.
+
+SDCard
+------
+
+The frozen sdcard driver (drivers/sdcard/sdcard.py) is available by connecting microSD card device to hardware SPI0 pins.::
+
+    from machine import Pin, SPI
+    import os, sdcard
+
+    spi = SPI(0, baudrate=500000)
+    cs = Pin.cpu.P103
+    sd = sdcard.SDCard(spi, cs)
+    os.mount(sd, '/sd')
+    os.listdir('/')
+    os.chdir('/sd')
+    os.umount('/sd')
+
+OneWire driver
+--------------
+
+The OneWire driver is implemented in software and works on all pins::
+
+    from machine import Pin
+    import onewire
+
+    ow = onewire.OneWire(Pin(P012)) # create a OneWire bus on P012
+    ow.scan()               # return a list of devices on the bus
+    ow.reset()              # reset the bus
+    ow.readbyte()           # read a byte
+    ow.writebyte(0x12)      # write a byte on the bus
+    ow.write('123')         # write bytes on the bus
+    ow.select_rom(b'12345678') # select a specific device by its ROM code
+
+There is a specific driver for DS18S20 and DS18B20 devices::
+
+    import time, ds18x20
+    ds = ds18x20.DS18X20(ow)
+    roms = ds.scan()
+    ds.convert_temp()
+    time.sleep_ms(750)
+    for rom in roms:
+        print(ds.read_temp(rom))
+
+Be sure to put a 4.7k pull-up resistor on the data line.  Note that
+the ``convert_temp()`` method must be called each time you want to
+sample the temperature.
+
+NeoPixel and APA106 driver
+--------------------------
+
+NeoPixel is not supported currently.
diff --git a/docs/renesas-ra/tutorial/img/ek_ra6m2_how_to_connect.jpg b/docs/renesas-ra/tutorial/img/ek_ra6m2_how_to_connect.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..3457e102f5cac82a28916e60633845cfd38b2f7f
GIT binary patch
literal 120872
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
O-$C~NUt;3^{q-NX5Yhwy

literal 0
HcmV?d00001

diff --git a/docs/renesas-ra/tutorial/img/ra4m1_clicker_how_to_connect.jpg b/docs/renesas-ra/tutorial/img/ra4m1_clicker_how_to_connect.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..a37e9c8bc74aa43aa308fac9e167b10caeda9a9e
GIT binary patch
literal 106133
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
K&OKyj<NphShWjP}

literal 0
HcmV?d00001

diff --git a/docs/renesas-ra/tutorial/index.rst b/docs/renesas-ra/tutorial/index.rst
new file mode 100644
index 0000000000000..bde8307b5c638
--- /dev/null
+++ b/docs/renesas-ra/tutorial/index.rst
@@ -0,0 +1,16 @@
+.. _renesas-ra_tutorial:
+
+MicroPython tutorial for Renesas RA port
+========================================
+
+This tutorial is intended to get you started using MicroPython on the Renesas RA port.
+
+.. toctree::
+   :maxdepth: 1
+   :numbered:
+
+   intro.rst
+   using_peripheral.rst
+   program_in_flash.rst
+   reset.rst
+   troubleshooting.rst
diff --git a/docs/renesas-ra/tutorial/intro.rst b/docs/renesas-ra/tutorial/intro.rst
new file mode 100644
index 0000000000000..6c41f43971cdf
--- /dev/null
+++ b/docs/renesas-ra/tutorial/intro.rst
@@ -0,0 +1,67 @@
+.. _renesas-ra_intro:
+
+Getting started with MicroPython on the Renesas RA
+==================================================
+
+This tutorial will guide you through setting up MicroPython,
+getting a prompt, using the hardware peripherals, using internal
+flash file system, reset and boot modes, and Factory reset the
+internal file system.
+
+Requirements
+------------
+
+You need a board. For the information of available boards,
+please refer to the general information about Renesas RA port: :ref:`renesas-ra_general`.
+
+You need a USB-Serial conversion cable to connect the board and your PC.
+Please get a type with separate signal pins so that you can connect to
+the UART TX and RX pins on the board.
+
+Flashing the MicroPython image with J-Link OB
+---------------------------------------------
+
+The board has a builtin programmer interface called J-Link OB.
+Using the J-Link Software, you can flash the binary image "firmware.hex"
+of MicroPython on the board via J-Link OB.
+
+You can download the J-Link Software and Documentation pack from https://www.segger.com/downloads/jlink/.
+
+After installing J-Link Software, start J-Flash-Lite program.  Then specify following device in Device select menu in J-Flash-Lite.
+
+===============  ================
+    Board             Device
+---------------  ----------------
+ EK-RA4M1           R7FA4M1AB
+ EK-RA4W1         R7FA4W1AD2CNG
+ EK-RA6M1           R7FA6M1AD
+ EK-RA6M2           R7FA6M2AF
+ RA4M1 CLICKER      R7FA4M1AB
+===============  ================
+
+Select a firmware hex file in Data File of J-Link-Lite, and push Program Device button to flash the firmware.
+
+Getting a prompt of MicroPython
+-------------------------------
+
+Cross connect USB-Serial conversion cable RX/TX/GND pins to TX/RX/GND pins on the board.
+
+===============  ===============  ===============
+     Board        USB Serial RX    USB Serial TX
+---------------  ---------------  ---------------
+ EK-RA4M1             P411             P410
+ EK-RA4W1             P205             P206
+ EK-RA6M1             P411             P410
+ EK-RA6M2             P411             P410
+ RA4M1 CLICKER        P401             P402
+===============  ===============  ===============
+
+Access the MicroPython REPL (the Python prompt) via USB serial or UART with 115200 baud rate, 1 stop bit and no parity bit using your favorite terminal software, picocom on Linux or Tera Term on Windows.  You can try on Linux::
+
+      $ picocom /dev/ttyACM0
+
+You can see the MicroPython REPL prompt like below::
+
+   MicroPython v1.18-293-g339aa09b8-dirty on 2022-03-26; RA6M2_EK with RA6M2
+   Type "help()" for more information.
+   >>>
diff --git a/docs/renesas-ra/tutorial/program_in_flash.rst b/docs/renesas-ra/tutorial/program_in_flash.rst
new file mode 100644
index 0000000000000..ec276a6125c66
--- /dev/null
+++ b/docs/renesas-ra/tutorial/program_in_flash.rst
@@ -0,0 +1,62 @@
+.. _renesas-ra_program_in_flash:
+
+Write a program in internal file system
+=======================================
+
+Internal file system
+--------------------
+
+The FAT file system is created and initialized in the RA MCU's internal
+flash when the MicroPython starts at the first time on the board.
+The file system is mounted as "/flash", so you can access this flash system
+and create a program file into the /flash directory.
+
+As the factory setting, following size is allocated for the file system:
+
+===============  ===================
+    Board         File System Size
+---------------  -------------------
+ EK-RA4M1           36KB ( 36864B)
+ EK-RA4W1           64KB ( 65536B)
+ EK-RA6M1          128KB (131072B)
+ EK-RA6M2          256KB (262144B)
+ RA4M1 CLICKER      36KB ( 36864B)
+===============  ===================
+
+As the factory setting, following 2 files are created in the file system:
+
+* boot.py : executed first when the system starts
+* main.py : executed after boot.py completes
+
+Write a program in the internal file system
+-------------------------------------------
+
+You can write a program in main.py which is executed automatically
+when the MicroPython starts. For example, you can write LED blinking
+program like below::
+
+    import os
+    os.getcwd()
+    f = open('main.py', 'rw+')
+    print(f.read())
+    f.write('import time\n')
+    f.write('from machine import Pin\n')
+    f.write('led1 = Pin(Pin.cpu.P106)\n')
+    f.write('while True:\n')
+    f.write('    led1.on()\n')
+    f.write('    time.sleep(1)\n')
+    f.write('    led1.off()\n')
+    f.write('    time.sleep(1)\n')
+    f.close()
+    f = open('main.py', 'r')
+    print(f.read())
+    f.close()
+
+Entering CTRL-D for software reset, the MicroPython reboots, displays
+following messages::
+
+    MPY: sync filesystems
+    MPY: soft reboot
+
+and main.py is executed and LED1 blinks per 1 second.
+If you want to stop the program, please enter CTRL-C.
diff --git a/docs/renesas-ra/tutorial/reset.rst b/docs/renesas-ra/tutorial/reset.rst
new file mode 100644
index 0000000000000..de5f4db91b3e0
--- /dev/null
+++ b/docs/renesas-ra/tutorial/reset.rst
@@ -0,0 +1,61 @@
+.. _renesas-ra_reset:
+
+Reset and boot mode
+===================
+
+Resetting the board
+-------------------
+
+If something goes wrong, you can reset the board in two ways. The first is
+to press CTRL-D at the MicroPython prompt, which performs a soft reset.
+You will see a message something like ::
+
+    MPY: sync filesystems
+    MPY: soft reboot
+    MicroPython v1.18-293-g339aa09b8-dirty on 2022-03-26; RA6M2_EK with RA6M2
+    Type "help()" for more information.
+    >>>
+
+If that isn't working you can perform a hard reset (turn-it-off-and-on-again)
+by pressing the RESET button. This will end your session, disconnecting
+whatever program (PuTTY, screen, etc) that you used to connect to the board.
+
+boot mode
+---------
+
+There are 3 boot modes:
+
+  * normal boot mode
+  * safe boot mode
+  * factory filesystem boot mode
+
+boot.py and main.py are executed on "normal boot mode".
+
+boot.py and main.py are *NOT* executed on "safe boot mode".
+
+The file system of internal flash is initialized and *all files are erased* on "factory filesystem boot mode".
+
+For changing boot mode, please push the RESET button with pressing USER SW1
+on the board:
+
+  * For normal boot mode, release the USER SW1 after LED1 flashes 4 times or more
+
+  * For safe boot mode, release the USER SW1 after LED1 flashes 2 times
+
+  * For factory file system boot mode, release the USER SW1 after LED1 flashes 3 times.
+
+You have created the main.py which executes LED1 blinking in the previous part.
+If you change the boot mode to safe boot mode, the MicroPython starts without
+the execution of main.py. Then you can remove the main.py by following
+command or change the boot mode to factory file system boot mode.::
+
+    import os
+    os.remove('main.py')
+
+or change the boot mode to factory file system boot mode.
+
+You can confirm that the initialized file system that there are only boot.py and main.py files.::
+
+    import os
+    os.listdir()
+
diff --git a/docs/renesas-ra/tutorial/troubleshooting.rst b/docs/renesas-ra/tutorial/troubleshooting.rst
new file mode 100644
index 0000000000000..8837d2349f165
--- /dev/null
+++ b/docs/renesas-ra/tutorial/troubleshooting.rst
@@ -0,0 +1,18 @@
+.. _renesas-ra_troubleshooting:
+
+Trouble Shooting
+===================
+
+Flash file system
+-------------------
+
+* MicroPython REPL prompt is not displayed.
+
+  - Re-program the MicroPython image file.
+
+  - Confirm serial port connection.
+    The connection must be crossed that the board TXD pin is connected with
+    USB-serial conversion's RXD signal pin.
+
+  - If the prompt is not displayed suddenly, try to do factory file
+    system boot mode as the final method.  Please note that all files are removed forever.
diff --git a/docs/renesas-ra/tutorial/using_peripheral.rst b/docs/renesas-ra/tutorial/using_peripheral.rst
new file mode 100644
index 0000000000000..c50181b3d681a
--- /dev/null
+++ b/docs/renesas-ra/tutorial/using_peripheral.rst
@@ -0,0 +1,68 @@
+.. _renesas-ra_using_peripheral:
+
+Using peripherals
+=================
+
+For quick help information, please enter::
+
+    help()
+
+You can access RA MCU's peripherals using MicroPython modules.
+To list supported modules, please enter::
+
+    help('modules')
+
+Especially `machine` module and class :ref:`machine.Pin <machine.Pin>` are very important for using
+peripherals. Note that prefix 'u' is added to the module for MicroPython,
+so you can see "umachine" in the list but you can use it like "import machine".
+
+Using "from machine import Pin", Pin name is available corresponding to
+the RA MCU's pin name which are Pin.cpu.P000 and 'P000'.
+In addition, you can use 'LED1', 'LED2', 'SW1', and 'SW2' name if the board
+has these LEDs and switches.
+
+LED blinking
+------------
+
+As simple example, you can enter following program to blink LED1.
+Please enter key 4 times after the input of last time.sleep(1). ::
+
+    import time
+    from machine import Pin
+    led1 = Pin('LED1')
+    print(led1)
+    while True:
+        led1.on()
+        time.sleep(1)
+        led1.off()
+        time.sleep(1)
+
+You can see the LED1 blinking per 1 second.
+
+If you want to stop the program, please enter CTRL-C. ::
+
+    Traceback (most recent call last):
+      File "<stdin>", line 5, in <module>
+    KeyboardInterrupt:
+
+This message is displayed, and the program stops.
+The message means the program was interrupted at line 5 "while" statement.
+
+Using print(led1), you can confirm that LED1 is assigned to Pin.cpu.P106
+on the board.::
+
+     Pin(Pin.cpu.P106, mode=Pin.OUT, pull=Pin.PULL_NONE, drive=Pin.LOW_POWER)
+
+So you can get the same result if Pin(Pin.cpu.P106) is specified
+instead of Pin('LED1'). ::
+
+    import time
+    from machine import Pin
+    led1 = Pin(Pin.cpu.P106)
+    print(led1)
+    while True:
+        led1.on()
+        time.sleep(1)
+        led1.off()
+        time.sleep(1)
+

From 52add7b45c944f5302e2255a848f4c0d3703587b Mon Sep 17 00:00:00 2001
From: Takeo Takahashi <takeo.takahashi.xv@renesas.com>
Date: Fri, 29 Apr 2022 10:52:59 +0900
Subject: [PATCH 1982/3533] docs: Update files for renesas-ra port.

Signed-off-by: Takeo Takahashi <takeo.takahashi.xv@renesas.com>
---
 docs/index.rst               | 1 +
 docs/templates/topindex.html | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/docs/index.rst b/docs/index.rst
index 3bc78e9023500..9a021b3906d46 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -16,3 +16,4 @@ MicroPython documentation and references
     wipy/quickref.rst
     unix/quickref.rst
     zephyr/quickref.rst
+    renesas-ra/quickref.rst
diff --git a/docs/templates/topindex.html b/docs/templates/topindex.html
index 4f78b9613109f..41bcc740dd919 100644
--- a/docs/templates/topindex.html
+++ b/docs/templates/topindex.html
@@ -78,6 +78,10 @@ <h1>MicroPython documentation</h1>
         <a class="biglink" href="{{ pathto("zephyr/quickref") }}">Quick reference for the Zephyr port</a><br/>
         <span class="linkdescr">snippets of useful code and a tutorial</span>
       </p>
+      <p class="biglink">
+        <a class="biglink" href="{{ pathto("renesas-ra/quickref") }}">Quick reference for the Renesas RA</a><br/>
+        <span class="linkdescr">general information for Renesas RA based boards, snippets of useful code, and a tutorial</span>
+      </p>
     </td>
   </tr></table>
 

From a204365df1d5e1adc83bfe557d5b5e3431fbba1e Mon Sep 17 00:00:00 2001
From: Takeo Takahashi <takeo.takahashi.xv@renesas.com>
Date: Mon, 2 May 2022 12:02:32 +0900
Subject: [PATCH 1983/3533] renesas-ra/boards: Change device name information
 to show properly.

* Change device name table to list style to show properly.
* Change the link of cable connection information to the latest.

Signed-off-by: Takeo Takahashi <takeo.takahashi.xv@renesas.com>
---
 ports/renesas-ra/boards/deploy.md | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/ports/renesas-ra/boards/deploy.md b/ports/renesas-ra/boards/deploy.md
index 1d0703999fb91..cbbacd633e621 100644
--- a/ports/renesas-ra/boards/deploy.md
+++ b/ports/renesas-ra/boards/deploy.md
@@ -5,18 +5,14 @@ You can download [J-Link Software and Documentation pack](https://www.segger.com
 A `.hex` file can be flashed using `J-Flash Lite`.
 
 1. Start `J-Flash Lite`.
-2. Select devce name for board.
-
-    |      BOARD	       |      DEVICE NAME       |
-    | :------------------: | :--------------------: |
-    |   RA4M1 Clicker	   |       R7FA4M1AB        |
-    |   EK-RA6M2	       |       R7FA6M2AF        |
-    |   EK-RA4M1	       |       R7FA4M1AB        |
-    |   EK-RA6M1	       |       R7FA6M1AD        |
-    |   EK-RA4W1	       |       R7FA4W1AD2CNG    |
-
-3. press `OK`.  
-4. Select `firmware.hex` file for Data File .
+2. Select device name for board.
+  - EK-RA4M1: R7FA4M1AB
+  - EK-RA4W1: R7FA4W1AD2CNG
+  - EK-RA6M1: R7FA6M1AD
+  - EK-RA6M2: R7FA6M2AF
+  - RA4M1 CLICKER: R7FA4M1AB
+3. press `OK`.
+4. Select `firmware.hex` file for Data File.
 5. Press `Program Device`.
 
-Please refer to the [Renesas MicroPython Wiki](https://github.com/renesas/micropython/wiki) about cable connection between the board and your PC and more information.
\ No newline at end of file
+Please refer to the [Getting started with MicroPython on the Renesas RA](https://docs.micropython.org/en/latest/renesas-ra/tutorial/intro.html) about cable connection between the board and your PC.
\ No newline at end of file

From a21fd7cc21270c8b286129a6fe79025c57b33102 Mon Sep 17 00:00:00 2001
From: Takeo Takahashi <takeo.takahashi.xv@renesas.com>
Date: Mon, 2 May 2022 12:21:15 +0900
Subject: [PATCH 1984/3533] docs/renesas-ra: Remove unused image files.

Signed-off-by: Takeo Takahashi <takeo.takahashi.xv@renesas.com>
---
 .../tutorial/img/ek_ra6m2_how_to_connect.jpg   | Bin 120872 -> 0 bytes
 .../img/ra4m1_clicker_how_to_connect.jpg       | Bin 106133 -> 0 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 docs/renesas-ra/tutorial/img/ek_ra6m2_how_to_connect.jpg
 delete mode 100644 docs/renesas-ra/tutorial/img/ra4m1_clicker_how_to_connect.jpg

diff --git a/docs/renesas-ra/tutorial/img/ek_ra6m2_how_to_connect.jpg b/docs/renesas-ra/tutorial/img/ek_ra6m2_how_to_connect.jpg
deleted file mode 100644
index 3457e102f5cac82a28916e60633845cfd38b2f7f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 120872
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
O-$C~NUt;3^{q-NX5Yhwy

diff --git a/docs/renesas-ra/tutorial/img/ra4m1_clicker_how_to_connect.jpg b/docs/renesas-ra/tutorial/img/ra4m1_clicker_how_to_connect.jpg
deleted file mode 100644
index a37e9c8bc74aa43aa308fac9e167b10caeda9a9e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 106133
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
K&OKyj<NphShWjP}


From 590de399f01cd08aa4825b26b91785e07abcf68c Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 3 May 2022 10:38:15 +1000
Subject: [PATCH 1985/3533] py/emitcommon: Don't implicitly close class vars
 that are assigned to.

When in a class body or at the module level don't implicitly close over
variables that have been assigned to.

Fixes issue #8603.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/emitcommon.c             | 13 +++++--
 py/scope.h                  |  1 +
 tests/basics/scope_class.py | 77 +++++++++++++++++++++++++++++++++++++
 3 files changed, 87 insertions(+), 4 deletions(-)
 create mode 100644 tests/basics/scope_class.py

diff --git a/py/emitcommon.c b/py/emitcommon.c
index c1780d2db9afc..647430232ab44 100644
--- a/py/emitcommon.c
+++ b/py/emitcommon.c
@@ -44,9 +44,14 @@ qstr_short_t mp_emit_common_use_qstr(mp_emit_common_t *emit, qstr qst) {
 void mp_emit_common_get_id_for_modification(scope_t *scope, qstr qst) {
     // name adding/lookup
     id_info_t *id = scope_find_or_add_id(scope, qst, ID_INFO_KIND_GLOBAL_IMPLICIT);
-    if (SCOPE_IS_FUNC_LIKE(scope->kind) && id->kind == ID_INFO_KIND_GLOBAL_IMPLICIT) {
-        // rebind as a local variable
-        id->kind = ID_INFO_KIND_LOCAL;
+    if (id->kind == ID_INFO_KIND_GLOBAL_IMPLICIT) {
+        if (SCOPE_IS_FUNC_LIKE(scope->kind)) {
+            // rebind as a local variable
+            id->kind = ID_INFO_KIND_LOCAL;
+        } else {
+            // mark this as assigned, to prevent it from being closed over
+            id->kind = ID_INFO_KIND_GLOBAL_IMPLICIT_ASSIGNED;
+        }
     }
 }
 
@@ -57,7 +62,7 @@ void mp_emit_common_id_op(emit_t *emit, const mp_emit_method_table_id_ops_t *emi
     assert(id != NULL);
 
     // call the emit backend with the correct code
-    if (id->kind == ID_INFO_KIND_GLOBAL_IMPLICIT) {
+    if (id->kind == ID_INFO_KIND_GLOBAL_IMPLICIT || id->kind == ID_INFO_KIND_GLOBAL_IMPLICIT_ASSIGNED) {
         emit_method_table->global(emit, qst, MP_EMIT_IDOP_GLOBAL_NAME);
     } else if (id->kind == ID_INFO_KIND_GLOBAL_EXPLICIT) {
         emit_method_table->global(emit, qst, MP_EMIT_IDOP_GLOBAL_GLOBAL);
diff --git a/py/scope.h b/py/scope.h
index 5006deadea830..b781dde427146 100644
--- a/py/scope.h
+++ b/py/scope.h
@@ -32,6 +32,7 @@
 typedef enum {
     ID_INFO_KIND_UNDECIDED,
     ID_INFO_KIND_GLOBAL_IMPLICIT,
+    ID_INFO_KIND_GLOBAL_IMPLICIT_ASSIGNED,
     ID_INFO_KIND_GLOBAL_EXPLICIT,
     ID_INFO_KIND_LOCAL, // in a function f, written and only referenced by f
     ID_INFO_KIND_CELL,  // in a function f, read/written by children of f
diff --git a/tests/basics/scope_class.py b/tests/basics/scope_class.py
new file mode 100644
index 0000000000000..9c519695dc61a
--- /dev/null
+++ b/tests/basics/scope_class.py
@@ -0,0 +1,77 @@
+# test scoping rules that involve a class
+
+# the inner A.method should be independent to the local function called method
+def test1():
+    def method():
+        pass
+
+    class A:
+        def method():
+            pass
+
+    print(hasattr(A, "method"))
+    print(hasattr(A(), "method"))
+
+
+test1()
+
+
+# the inner A.method is a closure and overrides the local function called method
+def test2():
+    def method():
+        return "outer"
+
+    class A:
+        nonlocal method
+
+        def method():
+            return "inner"
+
+    print(hasattr(A, "method"))
+    print(hasattr(A(), "method"))
+    return method()  # this is actually A.method
+
+
+print(test2())
+
+
+# a class body will capture external variables by value (not by reference)
+def test3(x):
+    class A:
+        local = x
+
+    x += 1
+    return x, A.local
+
+
+print(test3(42))
+
+
+# assigning to a variable in a class will implicitly prevent it from closing over a variable
+def test4(global_):
+    class A:
+        local = global_  # fetches outer global_
+        global_ = "global2"  # creates class attribute
+
+    global_ += 1  # updates local variable
+    return global_, A.local, A.global_
+
+
+global_ = "global"
+print(test4(42), global_)
+
+
+# methods within a class can close over variables outside the class
+def test5(x):
+    def closure():
+        return x
+
+    class A:
+        def method():
+            return x, closure()
+
+    closure = lambda: x + 1  # change it after A has been created
+    return A
+
+
+print(test5(42).method())

From 709e8328d9812a2e02da6fba65a03f9a873d60a2 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Fri, 22 Apr 2022 15:32:22 +1000
Subject: [PATCH 1986/3533] py/obj: Introduce mp_obj_malloc macro to allocate,
 and set object type.

This is to replace the following:

    mp_foo_obj_t *self = m_new_obj(mp_foo_obj_t);
    self->base.type = &mp_type_foo;

with:

    mp_foo_obj_t *self = mp_obj_malloc(mp_foo_obj_t, &mp_type_foo);

Calling the function is less code than inlining setting the type
everywhere, adds up to ~100 bytes on PYBV11.

It also helps to avoid an easy mistake of forgetting to set the type.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 py/dynruntime.h | 8 ++++++++
 py/obj.c        | 7 +++++++
 py/obj.h        | 6 ++++++
 3 files changed, 21 insertions(+)

diff --git a/py/dynruntime.h b/py/dynruntime.h
index b9dca60d1389d..32ca708b95c74 100644
--- a/py/dynruntime.h
+++ b/py/dynruntime.h
@@ -126,6 +126,8 @@ static inline void *m_realloc_dyn(void *ptr, size_t new_num_bytes) {
 #define mp_obj_get_array(o, len, items)     (mp_obj_get_array_dyn((o), (len), (items)))
 #define mp_obj_list_append(list, item)      (mp_fun_table.list_append((list), (item)))
 
+#define mp_obj_malloc_helper(n, t)          (mp_obj_malloc_helper_dyn(n, t))
+
 static inline mp_obj_t mp_obj_new_str_of_type_dyn(const mp_obj_type_t *type, const byte *data, size_t len) {
     if (type == &mp_type_str) {
         return mp_obj_new_str((const char *)data, len);
@@ -163,6 +165,12 @@ static inline mp_obj_t mp_obj_len_dyn(mp_obj_t o) {
     return mp_fun_table.call_function_n_kw(mp_fun_table.load_name(MP_QSTR_len), 1, &o);
 }
 
+static inline void *mp_obj_malloc_helper_dyn(size_t num_bytes, const mp_obj_type_t *type) {
+    mp_obj_base_t *base = (mp_obj_base_t *)m_malloc(num_bytes);
+    base->type = type;
+    return base;
+}
+
 /******************************************************************************/
 // General runtime functions
 
diff --git a/py/obj.c b/py/obj.c
index 5255e96553343..024de3c96cd05 100644
--- a/py/obj.c
+++ b/py/obj.c
@@ -37,6 +37,13 @@
 #include "py/stackctrl.h"
 #include "py/stream.h" // for mp_obj_print
 
+// Allocates an object and also sets type, for mp_obj_malloc{,_var} macros.
+void *mp_obj_malloc_helper(size_t num_bytes, const mp_obj_type_t *type) {
+    mp_obj_base_t *base = (mp_obj_base_t *)m_malloc(num_bytes);
+    base->type = type;
+    return base;
+}
+
 const mp_obj_type_t *MICROPY_WRAP_MP_OBJ_GET_TYPE(mp_obj_get_type)(mp_const_obj_t o_in) {
     #if MICROPY_OBJ_IMMEDIATE_OBJS && MICROPY_OBJ_REPR == MICROPY_OBJ_REPR_A
 
diff --git a/py/obj.h b/py/obj.h
index 08a35ee6f874b..ead3ce86491aa 100644
--- a/py/obj.h
+++ b/py/obj.h
@@ -732,6 +732,12 @@ extern const struct _mp_obj_exception_t mp_const_GeneratorExit_obj;
 
 // General API for objects
 
+// Helper versions of m_new_obj when you need to immediately set base.type.
+// Implementing this as a call rather than inline saves 8 bytes per usage.
+#define mp_obj_malloc(struct_type, obj_type) ((struct_type *)mp_obj_malloc_helper(sizeof(struct_type), obj_type))
+#define mp_obj_malloc_var(struct_type, var_type, var_num, obj_type) ((struct_type *)mp_obj_malloc_helper(sizeof(struct_type) + sizeof(var_type) * (var_num), obj_type))
+void *mp_obj_malloc_helper(size_t num_bytes, const mp_obj_type_t *type);
+
 // These macros are derived from more primitive ones and are used to
 // check for more specific object types.
 // Note: these are kept as macros because inline functions sometimes use much

From 6a3bc0e1a1f4dc0ad0b71ca0f168ad1a87d28859 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Tue, 3 May 2022 21:19:34 +1000
Subject: [PATCH 1987/3533] py/objfloat: Explain why mp_obj_malloc isn't used.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 py/objfloat.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/py/objfloat.c b/py/objfloat.c
index 8ff2fa16c4c70..0855baac83866 100644
--- a/py/objfloat.c
+++ b/py/objfloat.c
@@ -195,7 +195,8 @@ const mp_obj_type_t mp_type_float = {
 #if MICROPY_OBJ_REPR != MICROPY_OBJ_REPR_C && MICROPY_OBJ_REPR != MICROPY_OBJ_REPR_D
 
 mp_obj_t mp_obj_new_float(mp_float_t value) {
-    mp_obj_float_t *o = m_new(mp_obj_float_t, 1);
+    // Don't use mp_obj_malloc here to avoid extra function call overhead.
+    mp_obj_float_t *o = m_new_obj(mp_obj_float_t);
     o->base.type = &mp_type_float;
     o->value = value;
     return MP_OBJ_FROM_PTR(o);

From 0e7bfc88c6ac6b5d64240f91183a3cfe2ab67ade Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Fri, 22 Apr 2022 17:09:15 +1000
Subject: [PATCH 1988/3533] all: Use mp_obj_malloc everywhere it's applicable.

This replaces occurences of

    foo_t *foo = m_new_obj(foo_t);
    foo->base.type = &foo_type;

with

    foo_t *foo = mp_obj_malloc(foo_t, &foo_type);

Excludes any places where base is a sub-field or when new0/memset is used.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 extmod/machine_i2c.c                           |  3 +--
 extmod/machine_signal.c                        |  3 +--
 extmod/machine_spi.c                           |  3 +--
 extmod/modbluetooth.c                          |  3 +--
 extmod/modbtree.c                              |  3 +--
 extmod/modframebuf.c                           |  6 ++----
 extmod/moduasyncio.c                           |  3 +--
 extmod/moducryptolib.c                         |  3 +--
 extmod/moductypes.c                            | 15 +++++----------
 extmod/moduhashlib.c                           | 18 ++++++------------
 extmod/modure.c                                |  3 +--
 extmod/moduselect.c                            |  3 +--
 extmod/modutimeq.c                             |  3 +--
 extmod/moduwebsocket.c                         |  3 +--
 extmod/moduzlib.c                              |  3 +--
 extmod/modwebrepl.c                            |  3 +--
 extmod/vfs.c                                   |  3 +--
 extmod/vfs_fat.c                               |  6 ++----
 extmod/vfs_lfsx.c                              |  3 +--
 extmod/vfs_posix.c                             |  6 ++----
 ports/cc3200/misc/mpirq.c                      |  3 +--
 ports/cc3200/mods/pybsleep.c                   |  3 +--
 ports/cc3200/mods/pybtimer.c                   |  3 +--
 ports/esp32/esp32_nvs.c                        |  3 +--
 ports/esp32/esp32_partition.c                  |  3 +--
 ports/esp32/machine_i2s.c                      |  3 +--
 ports/esp32/machine_pwm.c                      |  3 +--
 ports/esp32/machine_timer.c                    |  3 +--
 ports/esp32/machine_uart.c                     |  3 +--
 ports/esp8266/machine_hspi.c                   |  3 +--
 ports/esp8266/machine_pwm.c                    |  3 +--
 ports/esp8266/machine_uart.c                   |  3 +--
 ports/esp8266/modmachine.c                     |  3 +--
 ports/mimxrt/machine_adc.c                     |  3 +--
 ports/mimxrt/machine_i2c.c                     |  3 +--
 ports/mimxrt/machine_i2s.c                     |  3 +--
 ports/mimxrt/machine_pwm.c                     |  3 +--
 ports/mimxrt/machine_spi.c                     |  3 +--
 ports/mimxrt/machine_uart.c                    |  3 +--
 ports/nrf/boards/microbit/modules/iters.c      |  3 +--
 .../boards/microbit/modules/microbitimage.c    | 12 ++++--------
 ports/nrf/modules/machine/temp.c               |  4 +---
 ports/nrf/modules/nrf/flashbdev.c              |  3 +--
 .../modules/ubluepy/ubluepy_characteristic.c   |  3 +--
 ports/nrf/modules/ubluepy/ubluepy_delegate.c   |  3 +--
 ports/nrf/modules/ubluepy/ubluepy_descriptor.c |  3 +--
 ports/nrf/modules/ubluepy/ubluepy_peripheral.c | 15 +++++----------
 ports/nrf/modules/ubluepy/ubluepy_scanner.c    |  6 ++----
 ports/nrf/modules/ubluepy/ubluepy_service.c    |  3 +--
 ports/nrf/modules/ubluepy/ubluepy_uuid.c       |  3 +--
 ports/nrf/modules/uos/microbitfs.c             | 10 ++--------
 ports/renesas-ra/extint.c                      |  3 +--
 ports/renesas-ra/machine_adc.c                 |  3 +--
 ports/renesas-ra/storage.c                     |  3 +--
 ports/rp2/machine_adc.c                        |  3 +--
 ports/rp2/machine_i2s.c                        |  3 +--
 ports/stm32/adc.c                              |  3 +--
 ports/stm32/extint.c                           |  3 +--
 ports/stm32/lcd.c                              |  3 +--
 ports/stm32/machine_adc.c                      |  3 +--
 ports/stm32/machine_i2s.c                      |  3 +--
 ports/stm32/pyb_can.c                          |  3 +--
 ports/stm32/storage.c                          |  3 +--
 ports/teensy/servo.c                           |  3 +--
 ports/teensy/uart.c                            |  3 +--
 ports/unix/coverage.c                          |  6 ++----
 ports/unix/modffi.c                            | 12 ++++--------
 ports/unix/modjni.c                            | 15 +++++----------
 ports/unix/moduselect.c                        |  3 +--
 ports/unix/modusocket.c                        |  3 +--
 ports/zephyr/machine_i2c.c                     |  4 +---
 ports/zephyr/machine_spi.c                     |  4 +---
 ports/zephyr/machine_uart.c                    |  3 +--
 ports/zephyr/modzsensor.c                      |  3 +--
 ports/zephyr/zephyr_storage.c                  |  6 ++----
 py/builtinevex.c                               |  3 +--
 py/modio.c                                     |  3 +--
 py/modthread.c                                 |  3 +--
 py/objarray.c                                  |  3 +--
 py/objattrtuple.c                              |  3 +--
 py/objboundmeth.c                              |  3 +--
 py/objcell.c                                   |  3 +--
 py/objclosure.c                                |  3 +--
 py/objcomplex.c                                |  3 +--
 py/objdeque.c                                  |  3 +--
 py/objdict.c                                   |  3 +--
 py/objenumerate.c                              |  6 ++----
 py/objfilter.c                                 |  3 +--
 py/objfun.c                                    |  6 ++----
 py/objgenerator.c                              |  9 ++++-----
 py/objint_longlong.c                           |  9 +++------
 py/objint_mpz.c                                |  3 +--
 py/objmap.c                                    |  3 +--
 py/objobject.c                                 |  3 +--
 py/objproperty.c                               |  3 +--
 py/objrange.c                                  |  6 ++----
 py/objreversed.c                               |  3 +--
 py/objset.c                                    |  6 ++----
 py/objslice.c                                  |  3 +--
 py/objstr.c                                    |  6 ++----
 py/objstringio.c                               |  3 +--
 py/objtuple.c                                  |  3 +--
 py/objtype.c                                   |  3 +--
 py/objzip.c                                    |  3 +--
 py/runtime.c                                   |  3 +--
 105 files changed, 145 insertions(+), 294 deletions(-)

diff --git a/extmod/machine_i2c.c b/extmod/machine_i2c.c
index 2b1275e5bb724..f2c959b95a653 100644
--- a/extmod/machine_i2c.c
+++ b/extmod/machine_i2c.c
@@ -668,8 +668,7 @@ STATIC void mp_machine_soft_i2c_init(mp_obj_base_t *self_in, size_t n_args, cons
 
 STATIC mp_obj_t mp_machine_soft_i2c_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
     // create new soft I2C object
-    machine_i2c_obj_t *self = m_new_obj(machine_i2c_obj_t);
-    self->base.type = &mp_machine_soft_i2c_type;
+    machine_i2c_obj_t *self = mp_obj_malloc(machine_i2c_obj_t, &mp_machine_soft_i2c_type);
     mp_map_t kw_args;
     mp_map_init_fixed_table(&kw_args, n_kw, args + n_args);
     mp_machine_soft_i2c_init(&self->base, n_args, args, &kw_args);
diff --git a/extmod/machine_signal.c b/extmod/machine_signal.c
index f112ddc57c827..cf7550a2e084a 100644
--- a/extmod/machine_signal.c
+++ b/extmod/machine_signal.c
@@ -108,8 +108,7 @@ STATIC mp_obj_t signal_make_new(const mp_obj_type_t *type, size_t n_args, size_t
         }
     }
 
-    machine_signal_t *o = m_new_obj(machine_signal_t);
-    o->base.type = type;
+    machine_signal_t *o = mp_obj_malloc(machine_signal_t, type);
     o->pin = pin;
     o->invert = invert;
     return MP_OBJ_FROM_PTR(o);
diff --git a/extmod/machine_spi.c b/extmod/machine_spi.c
index ae5e6677d265f..f160f97d04b4f 100644
--- a/extmod/machine_spi.c
+++ b/extmod/machine_spi.c
@@ -175,8 +175,7 @@ STATIC mp_obj_t mp_machine_soft_spi_make_new(const mp_obj_type_t *type, size_t n
     mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
 
     // create new object
-    mp_machine_soft_spi_obj_t *self = m_new_obj(mp_machine_soft_spi_obj_t);
-    self->base.type = &mp_machine_soft_spi_type;
+    mp_machine_soft_spi_obj_t *self = mp_obj_malloc(mp_machine_soft_spi_obj_t, &mp_machine_soft_spi_type);
 
     // set parameters
     self->spi.delay_half = baudrate_to_delay_half(args[ARG_baudrate].u_int);
diff --git a/extmod/modbluetooth.c b/extmod/modbluetooth.c
index c4b9675cef530..68656551c7890 100644
--- a/extmod/modbluetooth.c
+++ b/extmod/modbluetooth.c
@@ -97,8 +97,7 @@ STATIC mp_obj_t bluetooth_uuid_make_new(const mp_obj_type_t *type, size_t n_args
 
     mp_arg_check_num(n_args, n_kw, 1, 1, false);
 
-    mp_obj_bluetooth_uuid_t *self = m_new_obj(mp_obj_bluetooth_uuid_t);
-    self->base.type = &mp_type_bluetooth_uuid;
+    mp_obj_bluetooth_uuid_t *self = mp_obj_malloc(mp_obj_bluetooth_uuid_t, &mp_type_bluetooth_uuid);
 
     if (mp_obj_is_int(all_args[0])) {
         self->type = MP_BLUETOOTH_UUID_TYPE_16;
diff --git a/extmod/modbtree.c b/extmod/modbtree.c
index 2dd3a89b89fef..467b68e1dc34e 100644
--- a/extmod/modbtree.c
+++ b/extmod/modbtree.c
@@ -67,8 +67,7 @@ void __dbpanic(DB *db) {
 }
 
 STATIC mp_obj_btree_t *btree_new(DB *db, mp_obj_t stream) {
-    mp_obj_btree_t *o = m_new_obj(mp_obj_btree_t);
-    o->base.type = &btree_type;
+    mp_obj_btree_t *o = mp_obj_malloc(mp_obj_btree_t, &btree_type);
     o->stream = stream;
     o->db = db;
     o->start_key = mp_const_none;
diff --git a/extmod/modframebuf.c b/extmod/modframebuf.c
index 454624dda8cb7..27e9c36254bd6 100644
--- a/extmod/modframebuf.c
+++ b/extmod/modframebuf.c
@@ -266,8 +266,7 @@ STATIC void fill_rect(const mp_obj_framebuf_t *fb, int x, int y, int w, int h, u
 STATIC mp_obj_t framebuf_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
     mp_arg_check_num(n_args, n_kw, 4, 5, false);
 
-    mp_obj_framebuf_t *o = m_new_obj(mp_obj_framebuf_t);
-    o->base.type = type;
+    mp_obj_framebuf_t *o = mp_obj_malloc(mp_obj_framebuf_t, type);
     o->buf_obj = args[0];
 
     mp_buffer_info_t bufinfo;
@@ -628,8 +627,7 @@ STATIC const mp_obj_type_t mp_type_framebuf = {
 
 // this factory function is provided for backwards compatibility with old FrameBuffer1 class
 STATIC mp_obj_t legacy_framebuffer1(size_t n_args, const mp_obj_t *args) {
-    mp_obj_framebuf_t *o = m_new_obj(mp_obj_framebuf_t);
-    o->base.type = &mp_type_framebuf;
+    mp_obj_framebuf_t *o = mp_obj_malloc(mp_obj_framebuf_t, &mp_type_framebuf);
 
     mp_buffer_info_t bufinfo;
     mp_get_buffer_raise(args[0], &bufinfo, MP_BUFFER_WRITE);
diff --git a/extmod/moduasyncio.c b/extmod/moduasyncio.c
index 229a146c1a84e..c4ee897c2e4d7 100644
--- a/extmod/moduasyncio.c
+++ b/extmod/moduasyncio.c
@@ -87,8 +87,7 @@ STATIC int task_lt(mp_pairheap_t *n1, mp_pairheap_t *n2) {
 STATIC mp_obj_t task_queue_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
     (void)args;
     mp_arg_check_num(n_args, n_kw, 0, 0, false);
-    mp_obj_task_queue_t *self = m_new_obj(mp_obj_task_queue_t);
-    self->base.type = type;
+    mp_obj_task_queue_t *self = mp_obj_malloc(mp_obj_task_queue_t, type);
     self->heap = (mp_obj_task_t *)mp_pairheap_new(task_lt);
     return MP_OBJ_FROM_PTR(self);
 }
diff --git a/extmod/moducryptolib.c b/extmod/moducryptolib.c
index 6c89d6d9fe81c..50cdbfa72eda8 100644
--- a/extmod/moducryptolib.c
+++ b/extmod/moducryptolib.c
@@ -228,8 +228,7 @@ STATIC mp_obj_t ucryptolib_aes_make_new(const mp_obj_type_t *type, size_t n_args
             mp_raise_ValueError(MP_ERROR_TEXT("mode"));
     }
 
-    mp_obj_aes_t *o = m_new_obj_var(mp_obj_aes_t, struct ctr_params, !!is_ctr_mode(block_mode));
-    o->base.type = type;
+    mp_obj_aes_t *o = mp_obj_malloc_var(mp_obj_aes_t, struct ctr_params, !!is_ctr_mode(block_mode), type);
 
     o->block_mode = block_mode;
     o->key_type = AES_KEYTYPE_NONE;
diff --git a/extmod/moductypes.c b/extmod/moductypes.c
index 58f0adfa4ba34..7a0cbc39b4572 100644
--- a/extmod/moductypes.c
+++ b/extmod/moductypes.c
@@ -95,8 +95,7 @@ STATIC NORETURN void syntax_error(void) {
 
 STATIC mp_obj_t uctypes_struct_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
     mp_arg_check_num(n_args, n_kw, 2, 3, false);
-    mp_obj_uctypes_struct_t *o = m_new_obj(mp_obj_uctypes_struct_t);
-    o->base.type = type;
+    mp_obj_uctypes_struct_t *o = mp_obj_malloc(mp_obj_uctypes_struct_t, type);
     o->addr = (void *)(uintptr_t)mp_obj_int_get_truncated(args[0]);
     o->desc = args[1];
     o->flags = LAYOUT_NATIVE;
@@ -463,8 +462,7 @@ STATIC mp_obj_t uctypes_struct_attr_op(mp_obj_t self_in, qstr attr, mp_obj_t set
 
     switch (agg_type) {
         case STRUCT: {
-            mp_obj_uctypes_struct_t *o = m_new_obj(mp_obj_uctypes_struct_t);
-            o->base.type = &uctypes_struct_type;
+            mp_obj_uctypes_struct_t *o = mp_obj_malloc(mp_obj_uctypes_struct_t, &uctypes_struct_type);
             o->desc = sub->items[1];
             o->addr = self->addr + offset;
             o->flags = self->flags;
@@ -479,8 +477,7 @@ STATIC mp_obj_t uctypes_struct_attr_op(mp_obj_t self_in, qstr attr, mp_obj_t set
             MP_FALLTHROUGH
         }
         case PTR: {
-            mp_obj_uctypes_struct_t *o = m_new_obj(mp_obj_uctypes_struct_t);
-            o->base.type = &uctypes_struct_type;
+            mp_obj_uctypes_struct_t *o = mp_obj_malloc(mp_obj_uctypes_struct_t, &uctypes_struct_type);
             o->desc = MP_OBJ_FROM_PTR(sub);
             o->addr = self->addr + offset;
             o->flags = self->flags;
@@ -552,8 +549,7 @@ STATIC mp_obj_t uctypes_struct_subscr(mp_obj_t self_in, mp_obj_t index_in, mp_ob
             } else if (value == MP_OBJ_SENTINEL) {
                 mp_uint_t dummy = 0;
                 mp_uint_t size = uctypes_struct_size(t->items[2], self->flags, &dummy);
-                mp_obj_uctypes_struct_t *o = m_new_obj(mp_obj_uctypes_struct_t);
-                o->base.type = &uctypes_struct_type;
+                mp_obj_uctypes_struct_t *o = mp_obj_malloc(mp_obj_uctypes_struct_t, &uctypes_struct_type);
                 o->desc = t->items[2];
                 o->addr = self->addr + size * index;
                 o->flags = self->flags;
@@ -570,8 +566,7 @@ STATIC mp_obj_t uctypes_struct_subscr(mp_obj_t self_in, mp_obj_t index_in, mp_ob
             } else {
                 mp_uint_t dummy = 0;
                 mp_uint_t size = uctypes_struct_size(t->items[1], self->flags, &dummy);
-                mp_obj_uctypes_struct_t *o = m_new_obj(mp_obj_uctypes_struct_t);
-                o->base.type = &uctypes_struct_type;
+                mp_obj_uctypes_struct_t *o = mp_obj_malloc(mp_obj_uctypes_struct_t, &uctypes_struct_type);
                 o->desc = t->items[1];
                 o->addr = p + size * index;
                 o->flags = self->flags;
diff --git a/extmod/moduhashlib.c b/extmod/moduhashlib.c
index e97e8cb75d625..765dd29c1ec07 100644
--- a/extmod/moduhashlib.c
+++ b/extmod/moduhashlib.c
@@ -83,8 +83,7 @@ STATIC mp_obj_t uhashlib_sha256_update(mp_obj_t self_in, mp_obj_t arg);
 
 STATIC mp_obj_t uhashlib_sha256_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
     mp_arg_check_num(n_args, n_kw, 0, 1, false);
-    mp_obj_hash_t *o = m_new_obj_var(mp_obj_hash_t, char, sizeof(mbedtls_sha256_context));
-    o->base.type = type;
+    mp_obj_hash_t *o = mp_obj_malloc_var(mp_obj_hash_t, char, sizeof(mbedtls_sha256_context), type);
     o->final = false;
     mbedtls_sha256_init((mbedtls_sha256_context *)&o->state);
     mbedtls_sha256_starts_ret((mbedtls_sha256_context *)&o->state, 0);
@@ -119,8 +118,7 @@ STATIC mp_obj_t uhashlib_sha256_digest(mp_obj_t self_in) {
 
 STATIC mp_obj_t uhashlib_sha256_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
     mp_arg_check_num(n_args, n_kw, 0, 1, false);
-    mp_obj_hash_t *o = m_new_obj_var(mp_obj_hash_t, char, sizeof(CRYAL_SHA256_CTX));
-    o->base.type = type;
+    mp_obj_hash_t *o = mp_obj_malloc_var(mp_obj_hash_t, char, sizeof(CRYAL_SHA256_CTX), type);
     o->final = false;
     sha256_init((CRYAL_SHA256_CTX *)o->state);
     if (n_args == 1) {
@@ -173,8 +171,7 @@ STATIC mp_obj_t uhashlib_sha1_update(mp_obj_t self_in, mp_obj_t arg);
 #if MICROPY_SSL_AXTLS
 STATIC mp_obj_t uhashlib_sha1_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
     mp_arg_check_num(n_args, n_kw, 0, 1, false);
-    mp_obj_hash_t *o = m_new_obj_var(mp_obj_hash_t, char, sizeof(SHA1_CTX));
-    o->base.type = type;
+    mp_obj_hash_t *o = mp_obj_malloc_var(mp_obj_hash_t, char, sizeof(SHA1_CTX), type);
     o->final = false;
     SHA1_Init((SHA1_CTX *)o->state);
     if (n_args == 1) {
@@ -213,8 +210,7 @@ STATIC mp_obj_t uhashlib_sha1_digest(mp_obj_t self_in) {
 
 STATIC mp_obj_t uhashlib_sha1_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
     mp_arg_check_num(n_args, n_kw, 0, 1, false);
-    mp_obj_hash_t *o = m_new_obj_var(mp_obj_hash_t, char, sizeof(mbedtls_sha1_context));
-    o->base.type = type;
+    mp_obj_hash_t *o = mp_obj_malloc_var(mp_obj_hash_t, char, sizeof(mbedtls_sha1_context), type);
     o->final = false;
     mbedtls_sha1_init((mbedtls_sha1_context *)o->state);
     mbedtls_sha1_starts_ret((mbedtls_sha1_context *)o->state);
@@ -268,8 +264,7 @@ STATIC mp_obj_t uhashlib_md5_update(mp_obj_t self_in, mp_obj_t arg);
 #if MICROPY_SSL_AXTLS
 STATIC mp_obj_t uhashlib_md5_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
     mp_arg_check_num(n_args, n_kw, 0, 1, false);
-    mp_obj_hash_t *o = m_new_obj_var(mp_obj_hash_t, char, sizeof(MD5_CTX));
-    o->base.type = type;
+    mp_obj_hash_t *o = mp_obj_malloc_var(mp_obj_hash_t, char, sizeof(MD5_CTX), type);
     o->final = false;
     MD5_Init((MD5_CTX *)o->state);
     if (n_args == 1) {
@@ -308,8 +303,7 @@ STATIC mp_obj_t uhashlib_md5_digest(mp_obj_t self_in) {
 
 STATIC mp_obj_t uhashlib_md5_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
     mp_arg_check_num(n_args, n_kw, 0, 1, false);
-    mp_obj_hash_t *o = m_new_obj_var(mp_obj_hash_t, char, sizeof(mbedtls_md5_context));
-    o->base.type = type;
+    mp_obj_hash_t *o = mp_obj_malloc_var(mp_obj_hash_t, char, sizeof(mbedtls_md5_context), type);
     o->final = false;
     mbedtls_md5_init((mbedtls_md5_context *)o->state);
     mbedtls_md5_starts_ret((mbedtls_md5_context *)o->state);
diff --git a/extmod/modure.c b/extmod/modure.c
index d9e5451eb58ba..70bc02aa4d5f1 100644
--- a/extmod/modure.c
+++ b/extmod/modure.c
@@ -406,8 +406,7 @@ STATIC mp_obj_t mod_re_compile(size_t n_args, const mp_obj_t *args) {
     if (size == -1) {
         goto error;
     }
-    mp_obj_re_t *o = m_new_obj_var(mp_obj_re_t, char, size);
-    o->base.type = &re_type;
+    mp_obj_re_t *o = mp_obj_malloc_var(mp_obj_re_t, char, size, &re_type);
     #if MICROPY_PY_URE_DEBUG
     int flags = 0;
     if (n_args > 1) {
diff --git a/extmod/moduselect.c b/extmod/moduselect.c
index cf47f02afefa0..27dc04604a7a1 100644
--- a/extmod/moduselect.c
+++ b/extmod/moduselect.c
@@ -346,8 +346,7 @@ STATIC const mp_obj_type_t mp_type_poll = {
 
 // poll()
 STATIC mp_obj_t select_poll(void) {
-    mp_obj_poll_t *poll = m_new_obj(mp_obj_poll_t);
-    poll->base.type = &mp_type_poll;
+    mp_obj_poll_t *poll = mp_obj_malloc(mp_obj_poll_t, &mp_type_poll);
     mp_map_init(&poll->poll_map, 0);
     poll->iter_cnt = 0;
     poll->ret_tuple = MP_OBJ_NULL;
diff --git a/extmod/modutimeq.c b/extmod/modutimeq.c
index c7467f3bf14fc..e92f4d9032611 100644
--- a/extmod/modutimeq.c
+++ b/extmod/modutimeq.c
@@ -77,8 +77,7 @@ STATIC bool time_less_than(struct qentry *item, struct qentry *parent) {
 STATIC mp_obj_t utimeq_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
     mp_arg_check_num(n_args, n_kw, 1, 1, false);
     mp_uint_t alloc = mp_obj_get_int(args[0]);
-    mp_obj_utimeq_t *o = m_new_obj_var(mp_obj_utimeq_t, struct qentry, alloc);
-    o->base.type = type;
+    mp_obj_utimeq_t *o = mp_obj_malloc_var(mp_obj_utimeq_t, struct qentry, alloc, type);
     memset(o->items, 0, sizeof(*o->items) * alloc);
     o->alloc = alloc;
     o->len = 0;
diff --git a/extmod/moduwebsocket.c b/extmod/moduwebsocket.c
index 34b520f33706a..44e77da567313 100644
--- a/extmod/moduwebsocket.c
+++ b/extmod/moduwebsocket.c
@@ -60,8 +60,7 @@ STATIC mp_uint_t websocket_write(mp_obj_t self_in, const void *buf, mp_uint_t si
 STATIC mp_obj_t websocket_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
     mp_arg_check_num(n_args, n_kw, 1, 2, false);
     mp_get_stream_raise(args[0], MP_STREAM_OP_READ | MP_STREAM_OP_WRITE | MP_STREAM_OP_IOCTL);
-    mp_obj_websocket_t *o = m_new_obj(mp_obj_websocket_t);
-    o->base.type = type;
+    mp_obj_websocket_t *o = mp_obj_malloc(mp_obj_websocket_t, type);
     o->sock = args[0];
     o->state = FRAME_HEADER;
     o->to_recv = 2;
diff --git a/extmod/moduzlib.c b/extmod/moduzlib.c
index a6874fb4e3e59..d02404f1cd4c3 100644
--- a/extmod/moduzlib.c
+++ b/extmod/moduzlib.c
@@ -69,8 +69,7 @@ STATIC int read_src_stream(TINF_DATA *data) {
 STATIC mp_obj_t decompio_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
     mp_arg_check_num(n_args, n_kw, 1, 2, false);
     mp_get_stream_raise(args[0], MP_STREAM_OP_READ);
-    mp_obj_decompio_t *o = m_new_obj(mp_obj_decompio_t);
-    o->base.type = type;
+    mp_obj_decompio_t *o = mp_obj_malloc(mp_obj_decompio_t, type);
     memset(&o->decomp, 0, sizeof(o->decomp));
     o->decomp.readSource = read_src_stream;
     o->src_stream = args[0];
diff --git a/extmod/modwebrepl.c b/extmod/modwebrepl.c
index a8430bafb3c8e..63810447fa3f4 100644
--- a/extmod/modwebrepl.c
+++ b/extmod/modwebrepl.c
@@ -97,8 +97,7 @@ STATIC mp_obj_t webrepl_make_new(const mp_obj_type_t *type, size_t n_args, size_
     mp_arg_check_num(n_args, n_kw, 1, 2, false);
     mp_get_stream_raise(args[0], MP_STREAM_OP_READ | MP_STREAM_OP_WRITE | MP_STREAM_OP_IOCTL);
     DEBUG_printf("sizeof(struct webrepl_file) = %lu\n", sizeof(struct webrepl_file));
-    mp_obj_webrepl_t *o = m_new_obj(mp_obj_webrepl_t);
-    o->base.type = type;
+    mp_obj_webrepl_t *o = mp_obj_malloc(mp_obj_webrepl_t, type);
     o->sock = args[0];
     o->hdr_to_recv = sizeof(struct webrepl_file);
     o->data_to_recv = 0;
diff --git a/extmod/vfs.c b/extmod/vfs.c
index 6dcdcfa22d3e6..8e5e036326625 100644
--- a/extmod/vfs.c
+++ b/extmod/vfs.c
@@ -417,8 +417,7 @@ mp_obj_t mp_vfs_ilistdir(size_t n_args, const mp_obj_t *args) {
 
     if (vfs == MP_VFS_ROOT) {
         // list the root directory
-        mp_vfs_ilistdir_it_t *iter = m_new_obj(mp_vfs_ilistdir_it_t);
-        iter->base.type = &mp_type_polymorph_iter;
+        mp_vfs_ilistdir_it_t *iter = mp_obj_malloc(mp_vfs_ilistdir_it_t, &mp_type_polymorph_iter);
         iter->iternext = mp_vfs_ilistdir_it_iternext;
         iter->cur.vfs = MP_STATE_VM(vfs_mount_table);
         iter->is_str = mp_obj_get_type(path_in) == &mp_type_str;
diff --git a/extmod/vfs_fat.c b/extmod/vfs_fat.c
index 41284500b4600..27681ca77012a 100644
--- a/extmod/vfs_fat.c
+++ b/extmod/vfs_fat.c
@@ -66,8 +66,7 @@ STATIC mp_obj_t fat_vfs_make_new(const mp_obj_type_t *type, size_t n_args, size_
     mp_arg_check_num(n_args, n_kw, 1, 1, false);
 
     // create new object
-    fs_user_mount_t *vfs = m_new_obj(fs_user_mount_t);
-    vfs->base.type = type;
+    fs_user_mount_t *vfs = mp_obj_malloc(fs_user_mount_t, type);
     vfs->fatfs.drv = vfs;
 
     // Initialise underlying block device
@@ -177,8 +176,7 @@ STATIC mp_obj_t fat_vfs_ilistdir_func(size_t n_args, const mp_obj_t *args) {
     }
 
     // Create a new iterator object to list the dir
-    mp_vfs_fat_ilistdir_it_t *iter = m_new_obj(mp_vfs_fat_ilistdir_it_t);
-    iter->base.type = &mp_type_polymorph_iter;
+    mp_vfs_fat_ilistdir_it_t *iter = mp_obj_malloc(mp_vfs_fat_ilistdir_it_t, &mp_type_polymorph_iter);
     iter->iternext = mp_vfs_fat_ilistdir_it_iternext;
     iter->is_str = is_str_type;
     FRESULT res = f_opendir(&self->fatfs, &iter->dir, path);
diff --git a/extmod/vfs_lfsx.c b/extmod/vfs_lfsx.c
index e1324f82c73fd..dbd32338cfd9f 100644
--- a/extmod/vfs_lfsx.c
+++ b/extmod/vfs_lfsx.c
@@ -203,8 +203,7 @@ STATIC mp_obj_t MP_VFS_LFSx(ilistdir_func)(size_t n_args, const mp_obj_t *args)
         path = vstr_null_terminated_str(&self->cur_dir);
     }
 
-    MP_VFS_LFSx(ilistdir_it_t) * iter = m_new_obj(MP_VFS_LFSx(ilistdir_it_t));
-    iter->base.type = &mp_type_polymorph_iter;
+    MP_VFS_LFSx(ilistdir_it_t) * iter = mp_obj_malloc(MP_VFS_LFSx(ilistdir_it_t), &mp_type_polymorph_iter);
     iter->iternext = MP_VFS_LFSx(ilistdir_it_iternext);
     iter->is_str = is_str_type;
     iter->vfs = self;
diff --git a/extmod/vfs_posix.c b/extmod/vfs_posix.c
index 5dcc9c03ec826..1ada596d137c1 100644
--- a/extmod/vfs_posix.c
+++ b/extmod/vfs_posix.c
@@ -98,8 +98,7 @@ STATIC mp_import_stat_t mp_vfs_posix_import_stat(void *self_in, const char *path
 STATIC mp_obj_t vfs_posix_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
     mp_arg_check_num(n_args, n_kw, 0, 1, false);
 
-    mp_obj_vfs_posix_t *vfs = m_new_obj(mp_obj_vfs_posix_t);
-    vfs->base.type = type;
+    mp_obj_vfs_posix_t *vfs = mp_obj_malloc(mp_obj_vfs_posix_t, type);
     vstr_init(&vfs->root, 0);
     if (n_args == 1) {
         vstr_add_str(&vfs->root, mp_obj_str_get_str(args[0]));
@@ -229,8 +228,7 @@ STATIC mp_obj_t vfs_posix_ilistdir_it_iternext(mp_obj_t self_in) {
 
 STATIC mp_obj_t vfs_posix_ilistdir(mp_obj_t self_in, mp_obj_t path_in) {
     mp_obj_vfs_posix_t *self = MP_OBJ_TO_PTR(self_in);
-    vfs_posix_ilistdir_it_t *iter = m_new_obj(vfs_posix_ilistdir_it_t);
-    iter->base.type = &mp_type_polymorph_iter;
+    vfs_posix_ilistdir_it_t *iter = mp_obj_malloc(vfs_posix_ilistdir_it_t, &mp_type_polymorph_iter);
     iter->iternext = vfs_posix_ilistdir_it_iternext;
     iter->is_str = mp_obj_get_type(path_in) == &mp_type_str;
     const char *path = vfs_posix_get_path_str(self, path_in);
diff --git a/ports/cc3200/misc/mpirq.c b/ports/cc3200/misc/mpirq.c
index a4144def5a724..de30ebc499683 100644
--- a/ports/cc3200/misc/mpirq.c
+++ b/ports/cc3200/misc/mpirq.c
@@ -62,8 +62,7 @@ void mp_irq_init0 (void) {
 }
 
 mp_obj_t mp_irq_new (mp_obj_t parent, mp_obj_t handler, const mp_irq_methods_t *methods) {
-    mp_irq_obj_t *self = m_new_obj(mp_irq_obj_t);
-    self->base.type = &mp_irq_type;
+    mp_irq_obj_t *self = mp_obj_malloc(mp_irq_obj_t, &mp_irq_type);
     self->handler = handler;
     self->parent = parent;
     self->methods = (mp_irq_methods_t *)methods;
diff --git a/ports/cc3200/mods/pybsleep.c b/ports/cc3200/mods/pybsleep.c
index da2eeff80fa24..2d4b1ca8a9600 100644
--- a/ports/cc3200/mods/pybsleep.c
+++ b/ports/cc3200/mods/pybsleep.c
@@ -210,8 +210,7 @@ void pyb_sleep_signal_soft_reset (void) {
 }
 
 void pyb_sleep_add (const mp_obj_t obj, WakeUpCB_t wakeup) {
-    pyb_sleep_obj_t *sleep_obj = m_new_obj(pyb_sleep_obj_t);
-    sleep_obj->base.type = &pyb_sleep_type;
+    pyb_sleep_obj_t *sleep_obj = mp_obj_malloc(pyb_sleep_obj_t, &pyb_sleep_type);
     sleep_obj->obj = obj;
     sleep_obj->wakeup = wakeup;
     // remove it in case it was already registered
diff --git a/ports/cc3200/mods/pybtimer.c b/ports/cc3200/mods/pybtimer.c
index b5cf594d74e82..55caa6de137b1 100644
--- a/ports/cc3200/mods/pybtimer.c
+++ b/ports/cc3200/mods/pybtimer.c
@@ -406,8 +406,7 @@ STATIC mp_obj_t pyb_timer_channel(size_t n_args, const mp_obj_t *pos_args, mp_ma
     }
 
     // allocate a new timer channel
-    pyb_timer_channel_obj_t *ch = m_new_obj(pyb_timer_channel_obj_t);
-    ch->base.type = &pyb_timer_channel_type;
+    pyb_timer_channel_obj_t *ch = mp_obj_malloc(pyb_timer_channel_obj_t, &pyb_timer_channel_type);
     ch->timer = tim;
     ch->channel = channel_n;
 
diff --git a/ports/esp32/esp32_nvs.c b/ports/esp32/esp32_nvs.c
index d13151d3ce774..42d65be4a63b2 100644
--- a/ports/esp32/esp32_nvs.c
+++ b/ports/esp32/esp32_nvs.c
@@ -44,8 +44,7 @@ typedef struct _esp32_nvs_obj_t {
 
 // *esp32_nvs_new allocates a python NVS object given a handle to an esp-idf namespace C obj.
 STATIC esp32_nvs_obj_t *esp32_nvs_new(nvs_handle_t namespace) {
-    esp32_nvs_obj_t *self = m_new_obj(esp32_nvs_obj_t);
-    self->base.type = &esp32_nvs_type;
+    esp32_nvs_obj_t *self = mp_obj_malloc(esp32_nvs_obj_t, &esp32_nvs_type);
     self->namespace = namespace;
     return self;
 }
diff --git a/ports/esp32/esp32_partition.c b/ports/esp32/esp32_partition.c
index b779cb18c6129..47e769486c9b4 100644
--- a/ports/esp32/esp32_partition.c
+++ b/ports/esp32/esp32_partition.c
@@ -57,8 +57,7 @@ STATIC esp32_partition_obj_t *esp32_partition_new(const esp_partition_t *part, u
     if (part == NULL) {
         mp_raise_OSError(MP_ENOENT);
     }
-    esp32_partition_obj_t *self = m_new_obj(esp32_partition_obj_t);
-    self->base.type = &esp32_partition_type;
+    esp32_partition_obj_t *self = mp_obj_malloc(esp32_partition_obj_t, &esp32_partition_type);
     self->part = part;
     self->block_size = block_size;
     if (self->block_size < NATIVE_BLOCK_SIZE_BYTES) {
diff --git a/ports/esp32/machine_i2s.c b/ports/esp32/machine_i2s.c
index 108caf677b0eb..8832ad5e90733 100644
--- a/ports/esp32/machine_i2s.c
+++ b/ports/esp32/machine_i2s.c
@@ -533,9 +533,8 @@ STATIC mp_obj_t machine_i2s_make_new(const mp_obj_type_t *type, size_t n_pos_arg
 
     machine_i2s_obj_t *self;
     if (MP_STATE_PORT(machine_i2s_obj)[port] == NULL) {
-        self = m_new_obj(machine_i2s_obj_t);
+        self = mp_obj_malloc(machine_i2s_obj_t, &machine_i2s_type);
         MP_STATE_PORT(machine_i2s_obj)[port] = self;
-        self->base.type = &machine_i2s_type;
         self->port = port;
     } else {
         self = MP_STATE_PORT(machine_i2s_obj)[port];
diff --git a/ports/esp32/machine_pwm.c b/ports/esp32/machine_pwm.c
index 5baaa693c6d61..0107187a8c98c 100644
--- a/ports/esp32/machine_pwm.c
+++ b/ports/esp32/machine_pwm.c
@@ -556,8 +556,7 @@ STATIC mp_obj_t mp_machine_pwm_make_new(const mp_obj_type_t *type,
     gpio_num_t pin_id = machine_pin_get_id(args[0]);
 
     // create PWM object from the given pin
-    machine_pwm_obj_t *self = m_new_obj(machine_pwm_obj_t);
-    self->base.type = &machine_pwm_type;
+    machine_pwm_obj_t *self = mp_obj_malloc(machine_pwm_obj_t, &machine_pwm_type);
     self->pin = pin_id;
     self->active = false;
     self->mode = -1;
diff --git a/ports/esp32/machine_timer.c b/ports/esp32/machine_timer.c
index ea8b5965d873a..100b2aa1fb9c8 100644
--- a/ports/esp32/machine_timer.c
+++ b/ports/esp32/machine_timer.c
@@ -105,8 +105,7 @@ STATIC mp_obj_t machine_timer_make_new(const mp_obj_type_t *type, size_t n_args,
         }
     }
 
-    machine_timer_obj_t *self = m_new_obj(machine_timer_obj_t);
-    self->base.type = &machine_timer_type;
+    machine_timer_obj_t *self = mp_obj_malloc(machine_timer_obj_t, &machine_timer_type);
     self->group = group;
     self->index = index;
 
diff --git a/ports/esp32/machine_uart.c b/ports/esp32/machine_uart.c
index 396455666f621..c0eedb80b317e 100644
--- a/ports/esp32/machine_uart.c
+++ b/ports/esp32/machine_uart.c
@@ -315,8 +315,7 @@ STATIC mp_obj_t machine_uart_make_new(const mp_obj_type_t *type, size_t n_args,
     };
 
     // create instance
-    machine_uart_obj_t *self = m_new_obj(machine_uart_obj_t);
-    self->base.type = &machine_uart_type;
+    machine_uart_obj_t *self = mp_obj_malloc(machine_uart_obj_t, &machine_uart_type);
     self->uart_num = uart_num;
     self->bits = 8;
     self->parity = 0;
diff --git a/ports/esp8266/machine_hspi.c b/ports/esp8266/machine_hspi.c
index ff3ba17255358..3ff76f5a02e04 100644
--- a/ports/esp8266/machine_hspi.c
+++ b/ports/esp8266/machine_hspi.c
@@ -159,8 +159,7 @@ mp_obj_t machine_hspi_make_new(const mp_obj_type_t *type, size_t n_args, size_t
         mp_raise_ValueError(NULL);
     }
 
-    machine_hspi_obj_t *self = m_new_obj(machine_hspi_obj_t);
-    self->base.type = &machine_hspi_type;
+    machine_hspi_obj_t *self = mp_obj_malloc(machine_hspi_obj_t, &machine_hspi_type);
     // set defaults
     self->baudrate = 80000000L;
     self->polarity = 0;
diff --git a/ports/esp8266/machine_pwm.c b/ports/esp8266/machine_pwm.c
index f8cd937b80259..00547195f9a9f 100644
--- a/ports/esp8266/machine_pwm.c
+++ b/ports/esp8266/machine_pwm.c
@@ -82,8 +82,7 @@ STATIC mp_obj_t mp_machine_pwm_make_new(const mp_obj_type_t *type, size_t n_args
     pyb_pin_obj_t *pin = mp_obj_get_pin_obj(args[0]);
 
     // create PWM object from the given pin
-    machine_pwm_obj_t *self = m_new_obj(machine_pwm_obj_t);
-    self->base.type = &machine_pwm_type;
+    machine_pwm_obj_t *self = mp_obj_malloc(machine_pwm_obj_t, &machine_pwm_type);
     self->pin = pin;
     self->active = 0;
     self->channel = -1;
diff --git a/ports/esp8266/machine_uart.c b/ports/esp8266/machine_uart.c
index a8ea5e38d3154..b774419d2d321 100644
--- a/ports/esp8266/machine_uart.c
+++ b/ports/esp8266/machine_uart.c
@@ -202,8 +202,7 @@ STATIC mp_obj_t pyb_uart_make_new(const mp_obj_type_t *type, size_t n_args, size
     }
 
     // create instance
-    pyb_uart_obj_t *self = m_new_obj(pyb_uart_obj_t);
-    self->base.type = &pyb_uart_type;
+    pyb_uart_obj_t *self = mp_obj_malloc(pyb_uart_obj_t, &pyb_uart_type);
     self->uart_id = uart_id;
     self->baudrate = 115200;
     self->bits = 8;
diff --git a/ports/esp8266/modmachine.c b/ports/esp8266/modmachine.c
index 39a890f56f172..966f12749f28e 100644
--- a/ports/esp8266/modmachine.c
+++ b/ports/esp8266/modmachine.c
@@ -229,8 +229,7 @@ STATIC void esp_timer_print(const mp_print_t *print, mp_obj_t self_in, mp_print_
 
 STATIC mp_obj_t esp_timer_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
     mp_arg_check_num(n_args, n_kw, 1, 1, false);
-    esp_timer_obj_t *tim = m_new_obj(esp_timer_obj_t);
-    tim->base.type = &esp_timer_type;
+    esp_timer_obj_t *tim = mp_obj_malloc(esp_timer_obj_t, &esp_timer_type);
     return tim;
 }
 
diff --git a/ports/mimxrt/machine_adc.c b/ports/mimxrt/machine_adc.c
index 8bf5e7b9a8adb..aa4cc831e5613 100644
--- a/ports/mimxrt/machine_adc.c
+++ b/ports/mimxrt/machine_adc.c
@@ -80,8 +80,7 @@ STATIC mp_obj_t adc_obj_make_new(const mp_obj_type_t *type, size_t n_args, size_
     ADC_SetChannelConfig(adc_instance, 0UL, &channel_config);  // NOTE: we always choose channel group '0' since we only perform software triggered conversion
 
     // Create ADC Instance
-    machine_adc_obj_t *o = m_new_obj(machine_adc_obj_t);
-    o->base.type = &machine_adc_type;
+    machine_adc_obj_t *o = mp_obj_malloc(machine_adc_obj_t, &machine_adc_type);
     o->adc = adc_instance;
     o->channel = (uint8_t)channel;
     o->channel_group = 0;
diff --git a/ports/mimxrt/machine_i2c.c b/ports/mimxrt/machine_i2c.c
index c64f46ff1b496..a9a027ae23084 100644
--- a/ports/mimxrt/machine_i2c.c
+++ b/ports/mimxrt/machine_i2c.c
@@ -113,8 +113,7 @@ mp_obj_t machine_i2c_make_new(const mp_obj_type_t *type, size_t n_args, size_t n
     }
 
     // Get I2C Object.
-    machine_i2c_obj_t *self = m_new_obj(machine_i2c_obj_t);
-    self->base.type = &machine_i2c_type;
+    machine_i2c_obj_t *self = mp_obj_malloc(machine_i2c_obj_t, &machine_i2c_type);
     self->i2c_id = i2c_id;
     self->i2c_hw_id = i2c_index_table[i2c_id];  // the hw i2c number 1..n
     self->i2c_inst = i2c_base_ptr_table[self->i2c_hw_id];
diff --git a/ports/mimxrt/machine_i2s.c b/ports/mimxrt/machine_i2s.c
index a41dfe94f13f1..c80b60da43022 100644
--- a/ports/mimxrt/machine_i2s.c
+++ b/ports/mimxrt/machine_i2s.c
@@ -953,9 +953,8 @@ STATIC mp_obj_t machine_i2s_make_new(const mp_obj_type_t *type, size_t n_pos_arg
 
     machine_i2s_obj_t *self;
     if (MP_STATE_PORT(machine_i2s_obj)[i2s_id_zero_base] == NULL) {
-        self = m_new_obj(machine_i2s_obj_t);
+        self = mp_obj_malloc(machine_i2s_obj_t, &machine_i2s_type);
         MP_STATE_PORT(machine_i2s_obj)[i2s_id_zero_base] = self;
-        self->base.type = &machine_i2s_type;
         self->i2s_id = i2s_id;
         self->edmaTcd = &edmaTcd[i2s_id_zero_base];
     } else {
diff --git a/ports/mimxrt/machine_pwm.c b/ports/mimxrt/machine_pwm.c
index 9a498fbab8679..d5bb029e689eb 100644
--- a/ports/mimxrt/machine_pwm.c
+++ b/ports/mimxrt/machine_pwm.c
@@ -494,8 +494,7 @@ STATIC mp_obj_t mp_machine_pwm_make_new(const mp_obj_type_t *type, size_t n_args
     }
 
     // Create and populate the PWM object.
-    machine_pwm_obj_t *self = m_new_obj(machine_pwm_obj_t);
-    self->base.type = &machine_pwm_type;
+    machine_pwm_obj_t *self = mp_obj_malloc(machine_pwm_obj_t, &machine_pwm_type);
     self->is_flexpwm = is_flexpwm;
     self->instance = af_obj1->instance;
     self->module = module;
diff --git a/ports/mimxrt/machine_spi.c b/ports/mimxrt/machine_spi.c
index 2235732790888..2d01560d9a314 100644
--- a/ports/mimxrt/machine_spi.c
+++ b/ports/mimxrt/machine_spi.c
@@ -153,8 +153,7 @@ mp_obj_t machine_spi_make_new(const mp_obj_type_t *type, size_t n_args, size_t n
 
     // Get peripheral object.
     uint8_t spi_hw_id = spi_index_table[spi_id];  // the hw spi number 1..n
-    machine_spi_obj_t *self = m_new_obj(machine_spi_obj_t);
-    self->base.type = &machine_spi_type;
+    machine_spi_obj_t *self = mp_obj_malloc(machine_spi_obj_t, &machine_spi_type);
     self->spi_id = spi_id;
     self->spi_inst = spi_base_ptr_table[spi_hw_id];
     self->spi_hw_id = spi_hw_id;
diff --git a/ports/mimxrt/machine_uart.c b/ports/mimxrt/machine_uart.c
index d413778c8c03f..69c1c1ed06c44 100644
--- a/ports/mimxrt/machine_uart.c
+++ b/ports/mimxrt/machine_uart.c
@@ -277,8 +277,7 @@ STATIC mp_obj_t machine_uart_make_new(const mp_obj_type_t *type, size_t n_args,
 
     // Create the UART object and fill it with defaults.
     uint8_t uart_hw_id = uart_index_table[uart_id];  // the hw uart number 1..n
-    machine_uart_obj_t *self = m_new_obj(machine_uart_obj_t);
-    self->base.type = &machine_uart_type;
+    machine_uart_obj_t *self = mp_obj_malloc(machine_uart_obj_t, &machine_uart_type);
     self->id = uart_id;
     self->lpuart = uart_base_ptr_table[uart_hw_id];
     self->invert = false;
diff --git a/ports/nrf/boards/microbit/modules/iters.c b/ports/nrf/boards/microbit/modules/iters.c
index 2c675ffe81b48..8ae4b698fe92e 100644
--- a/ports/nrf/boards/microbit/modules/iters.c
+++ b/ports/nrf/boards/microbit/modules/iters.c
@@ -60,8 +60,7 @@ const mp_obj_type_t microbit_repeat_iterator_type = {
 };
 
 mp_obj_t microbit_repeat_iterator(mp_obj_t iterable) {
-    repeat_iterator_t *result = m_new_obj(repeat_iterator_t);
-    result->base.type = &microbit_repeat_iterator_type;
+    repeat_iterator_t *result = mp_obj_malloc(repeat_iterator_t, &microbit_repeat_iterator_type);
     result->iterable = iterable;
     result->index = -1;
     return result;
diff --git a/ports/nrf/boards/microbit/modules/microbitimage.c b/ports/nrf/boards/microbit/modules/microbitimage.c
index d697a9081f9aa..a028df8282a96 100644
--- a/ports/nrf/boards/microbit/modules/microbitimage.c
+++ b/ports/nrf/boards/microbit/modules/microbitimage.c
@@ -113,8 +113,7 @@ mp_int_t imageHeight(microbit_image_obj_t * p_image) {
 }
 
 STATIC greyscale_t *greyscale_new(mp_int_t w, mp_int_t h) {
-    greyscale_t *result = m_new_obj_var(greyscale_t, uint8_t, (w*h+1)>>1);
-    result->base.type = &microbit_image_type;
+    greyscale_t *result = mp_obj_malloc_var(greyscale_t, uint8_t, (w*h+1)>>1, &microbit_image_type);
     result->five = 0;
     result->width = w;
     result->height = h;
@@ -722,8 +721,7 @@ extern const mp_obj_type_t microbit_scrolling_string_type;
 extern const mp_obj_type_t microbit_scrolling_string_iterator_type;
 
 mp_obj_t scrolling_string_image_iterable(const char* str, mp_uint_t len, mp_obj_t ref, bool monospace, bool repeat) {
-    scrolling_string_t *result = m_new_obj(scrolling_string_t);
-    result->base.type = &microbit_scrolling_string_type;
+    scrolling_string_t *result = mp_obj_malloc(scrolling_string_t, &microbit_scrolling_string_type);
     result->str = str;
     result->len = len;
     result->ref = ref;
@@ -771,8 +769,7 @@ static void restart(scrolling_string_iterator_t *iter) {
 STATIC mp_obj_t get_microbit_scrolling_string_iter(mp_obj_t o_in, mp_obj_iter_buf_t *iter_buf) {
     (void)iter_buf;
     scrolling_string_t *str = (scrolling_string_t *)o_in;
-    scrolling_string_iterator_t *result = m_new_obj(scrolling_string_iterator_t);
-    result->base.type = &microbit_scrolling_string_iterator_type;
+    scrolling_string_iterator_t *result = mp_obj_malloc(scrolling_string_iterator_t, &microbit_scrolling_string_iterator_type);
     result->img = greyscale_new(5,5);
     result->start = str->str;
     result->ref = str->ref;
@@ -923,8 +920,7 @@ typedef struct _facade_iterator_t {
 } facade_iterator_t;
 
 mp_obj_t microbit_string_facade(mp_obj_t string) {
-    string_image_facade_t *result = m_new_obj(string_image_facade_t);
-    result->base.type = &string_image_facade_type;
+    string_image_facade_t *result = mp_obj_malloc(string_image_facade_t, &string_image_facade_type);
     result->string = string;
     result->image = greyscale_new(5,5);
     return result;
diff --git a/ports/nrf/modules/machine/temp.c b/ports/nrf/modules/machine/temp.c
index 82b02d09e9232..1eb38c08d0bdc 100644
--- a/ports/nrf/modules/machine/temp.c
+++ b/ports/nrf/modules/machine/temp.c
@@ -70,9 +70,7 @@ STATIC mp_obj_t machine_temp_make_new(const mp_obj_type_t *type, size_t n_args,
     mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
     mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
 
-    machine_temp_obj_t *self = m_new_obj(machine_temp_obj_t);
-
-    self->base.type = &machine_temp_type;
+    machine_temp_obj_t *self = mp_obj_malloc(machine_temp_obj_t, &machine_temp_type);
 
     return MP_OBJ_FROM_PTR(self);
 }
diff --git a/ports/nrf/modules/nrf/flashbdev.c b/ports/nrf/modules/nrf/flashbdev.c
index 7a1296c5d19f6..f63a9b46b29cf 100644
--- a/ports/nrf/modules/nrf/flashbdev.c
+++ b/ports/nrf/modules/nrf/flashbdev.c
@@ -165,8 +165,7 @@ STATIC mp_obj_t nrf_flashbdev_make_new(const mp_obj_type_t *type, size_t n_args,
         return MP_OBJ_FROM_PTR(&nrf_flash_obj);
     }
 
-    nrf_flash_obj_t *self = m_new_obj(nrf_flash_obj_t);
-    self->base.type = &nrf_flashbdev_type;
+    nrf_flash_obj_t *self = mp_obj_malloc(nrf_flash_obj_t, &nrf_flashbdev_type);
 
     mp_int_t start = args[ARG_start].u_int;
     mp_int_t len = args[ARG_len].u_int;
diff --git a/ports/nrf/modules/ubluepy/ubluepy_characteristic.c b/ports/nrf/modules/ubluepy/ubluepy_characteristic.c
index 9adafaa64efdf..a66483f60dad7 100644
--- a/ports/nrf/modules/ubluepy/ubluepy_characteristic.c
+++ b/ports/nrf/modules/ubluepy/ubluepy_characteristic.c
@@ -50,8 +50,7 @@ STATIC mp_obj_t ubluepy_characteristic_make_new(const mp_obj_type_t *type, size_
     mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
     mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
 
-    ubluepy_characteristic_obj_t *s = m_new_obj(ubluepy_characteristic_obj_t);
-    s->base.type = type;
+    ubluepy_characteristic_obj_t *s = mp_obj_malloc(ubluepy_characteristic_obj_t, type);
 
     mp_obj_t uuid_obj = args[0].u_obj;
 
diff --git a/ports/nrf/modules/ubluepy/ubluepy_delegate.c b/ports/nrf/modules/ubluepy/ubluepy_delegate.c
index 74ad52bbfa35b..736bfbc9dd236 100644
--- a/ports/nrf/modules/ubluepy/ubluepy_delegate.c
+++ b/ports/nrf/modules/ubluepy/ubluepy_delegate.c
@@ -38,8 +38,7 @@ STATIC void ubluepy_delegate_print(const mp_print_t *print, mp_obj_t o, mp_print
 }
 
 STATIC mp_obj_t ubluepy_delegate_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
-    ubluepy_delegate_obj_t *s = m_new_obj(ubluepy_delegate_obj_t);
-    s->base.type = type;
+    ubluepy_delegate_obj_t *s = mp_obj_malloc(ubluepy_delegate_obj_t, type);
 
     return MP_OBJ_FROM_PTR(s);
 }
diff --git a/ports/nrf/modules/ubluepy/ubluepy_descriptor.c b/ports/nrf/modules/ubluepy/ubluepy_descriptor.c
index b15301954d07e..370188f7fc7a8 100644
--- a/ports/nrf/modules/ubluepy/ubluepy_descriptor.c
+++ b/ports/nrf/modules/ubluepy/ubluepy_descriptor.c
@@ -53,8 +53,7 @@ STATIC mp_obj_t ubluepy_descriptor_make_new(const mp_obj_type_t *type, size_t n_
     mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
     mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
 
-    ubluepy_descriptor_obj_t * s = m_new_obj(ubluepy_descriptor_obj_t);
-    s->base.type = type;
+    ubluepy_descriptor_obj_t * s = mp_obj_malloc(ubluepy_descriptor_obj_t, type);
 
     mp_obj_t uuid_obj = args[ARG_NEW_UUID].u_obj;
 
diff --git a/ports/nrf/modules/ubluepy/ubluepy_peripheral.c b/ports/nrf/modules/ubluepy/ubluepy_peripheral.c
index 8f07daa2a3297..05a72b1de63d9 100644
--- a/ports/nrf/modules/ubluepy/ubluepy_peripheral.c
+++ b/ports/nrf/modules/ubluepy/ubluepy_peripheral.c
@@ -114,8 +114,7 @@ STATIC mp_obj_t ubluepy_peripheral_make_new(const mp_obj_type_t *type, size_t n_
     mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
     mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
 
-    ubluepy_peripheral_obj_t *s = m_new_obj(ubluepy_peripheral_obj_t);
-    s->base.type = type;
+    ubluepy_peripheral_obj_t *s = mp_obj_malloc(ubluepy_peripheral_obj_t, type);
 
     s->delegate      = mp_const_none;
     s->conn_handler  = mp_const_none;
@@ -291,11 +290,9 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(ubluepy_peripheral_get_services_obj, peripheral
 #if MICROPY_PY_UBLUEPY_CENTRAL
 
 void static disc_add_service(mp_obj_t self, ble_drv_service_data_t * p_service_data) {
-    ubluepy_service_obj_t * p_service = m_new_obj(ubluepy_service_obj_t);
-    p_service->base.type = &ubluepy_service_type;
+    ubluepy_service_obj_t * p_service = mp_obj_malloc(ubluepy_service_obj_t, &ubluepy_service_type);
 
-    ubluepy_uuid_obj_t * p_uuid = m_new_obj(ubluepy_uuid_obj_t);
-    p_uuid->base.type = &ubluepy_uuid_type;
+    ubluepy_uuid_obj_t * p_uuid = mp_obj_malloc(ubluepy_uuid_obj_t, &ubluepy_uuid_type);
 
     p_service->p_uuid = p_uuid;
 
@@ -314,11 +311,9 @@ void static disc_add_service(mp_obj_t self, ble_drv_service_data_t * p_service_d
 
 void static disc_add_char(mp_obj_t service_in, ble_drv_char_data_t * p_desc_data) {
     ubluepy_service_obj_t        * p_service   = MP_OBJ_TO_PTR(service_in);
-    ubluepy_characteristic_obj_t * p_char = m_new_obj(ubluepy_characteristic_obj_t);
-    p_char->base.type = &ubluepy_characteristic_type;
+    ubluepy_characteristic_obj_t * p_char = mp_obj_malloc(ubluepy_characteristic_obj_t, &ubluepy_characteristic_type);
 
-    ubluepy_uuid_obj_t * p_uuid = m_new_obj(ubluepy_uuid_obj_t);
-    p_uuid->base.type = &ubluepy_uuid_type;
+    ubluepy_uuid_obj_t * p_uuid = mp_obj_malloc(ubluepy_uuid_obj_t, &ubluepy_uuid_type);
 
     p_char->p_uuid = p_uuid;
 
diff --git a/ports/nrf/modules/ubluepy/ubluepy_scanner.c b/ports/nrf/modules/ubluepy/ubluepy_scanner.c
index f5c9a6dca8083..60895a3da93fe 100644
--- a/ports/nrf/modules/ubluepy/ubluepy_scanner.c
+++ b/ports/nrf/modules/ubluepy/ubluepy_scanner.c
@@ -38,8 +38,7 @@
 STATIC void adv_event_handler(mp_obj_t self_in, uint16_t event_id, ble_drv_adv_data_t * data) {
     ubluepy_scanner_obj_t *self = MP_OBJ_TO_PTR(self_in);
 
-    ubluepy_scan_entry_obj_t * item = m_new_obj(ubluepy_scan_entry_obj_t);
-    item->base.type = &ubluepy_scan_entry_type;
+    ubluepy_scan_entry_obj_t * item = mp_obj_malloc(ubluepy_scan_entry_obj_t, &ubluepy_scan_entry_type);
 
     vstr_t vstr;
     vstr_init(&vstr, 17);
@@ -78,8 +77,7 @@ STATIC mp_obj_t ubluepy_scanner_make_new(const mp_obj_type_t *type, size_t n_arg
     mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
     mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
 
-    ubluepy_scanner_obj_t * s = m_new_obj(ubluepy_scanner_obj_t);
-    s->base.type = type;
+    ubluepy_scanner_obj_t * s = mp_obj_malloc(ubluepy_scanner_obj_t, type);
 
     return MP_OBJ_FROM_PTR(s);
 }
diff --git a/ports/nrf/modules/ubluepy/ubluepy_service.c b/ports/nrf/modules/ubluepy/ubluepy_service.c
index 7b51ce3055eba..6dac231779258 100644
--- a/ports/nrf/modules/ubluepy/ubluepy_service.c
+++ b/ports/nrf/modules/ubluepy/ubluepy_service.c
@@ -52,8 +52,7 @@ STATIC mp_obj_t ubluepy_service_make_new(const mp_obj_type_t *type, size_t n_arg
     mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
     mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
 
-    ubluepy_service_obj_t *s = m_new_obj(ubluepy_service_obj_t);
-    s->base.type = type;
+    ubluepy_service_obj_t *s = mp_obj_malloc(ubluepy_service_obj_t, type);
 
     mp_obj_t uuid_obj = args[ARG_NEW_UUID].u_obj;
 
diff --git a/ports/nrf/modules/ubluepy/ubluepy_uuid.c b/ports/nrf/modules/ubluepy/ubluepy_uuid.c
index 7b4a09dba4aba..594d0d9130c3e 100644
--- a/ports/nrf/modules/ubluepy/ubluepy_uuid.c
+++ b/ports/nrf/modules/ubluepy/ubluepy_uuid.c
@@ -57,8 +57,7 @@ STATIC mp_obj_t ubluepy_uuid_make_new(const mp_obj_type_t *type, size_t n_args,
     mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
     mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
 
-    ubluepy_uuid_obj_t *s = m_new_obj(ubluepy_uuid_obj_t);
-    s->base.type = type;
+    ubluepy_uuid_obj_t *s = mp_obj_malloc(ubluepy_uuid_obj_t, type);
 
     mp_obj_t uuid_obj = args[ARG_NEW_UUID].u_obj;
 
diff --git a/ports/nrf/modules/uos/microbitfs.c b/ports/nrf/modules/uos/microbitfs.c
index e8628f4945c20..98752ad9aedf8 100644
--- a/ports/nrf/modules/uos/microbitfs.c
+++ b/ports/nrf/modules/uos/microbitfs.c
@@ -360,12 +360,7 @@ STATIC file_descriptor_obj *microbit_file_open(const char *name, size_t name_len
 }
 
 STATIC file_descriptor_obj *microbit_file_descriptor_new(uint8_t start_chunk, bool write, bool binary) {
-    file_descriptor_obj *res = m_new_obj(file_descriptor_obj);
-    if (binary) {
-        res->base.type = &uos_mbfs_fileio_type;
-    } else {
-        res->base.type = &uos_mbfs_textio_type;
-    }
+    file_descriptor_obj *res = m_new_obj(file_descriptor_obj, binary ? &uos_mbfs_fileio_type : &uos_mbfs_textio_type);
     res->start_chunk = start_chunk;
     res->seek_chunk = start_chunk;
     res->seek_offset = file_system_chunks[start_chunk].header.name_len+2;
@@ -595,8 +590,7 @@ STATIC mp_obj_t uos_mbfs_ilistdir_it_iternext(mp_obj_t self_in) {
 }
 
 STATIC mp_obj_t uos_mbfs_ilistdir(void) {
-    uos_mbfs_ilistdir_it_t *iter = m_new_obj(uos_mbfs_ilistdir_it_t);
-    iter->base.type = &mp_type_polymorph_iter;
+    uos_mbfs_ilistdir_it_t *iter = mp_obj_malloc(uos_mbfs_ilistdir_it_t, &mp_type_polymorph_iter);
     iter->iternext = uos_mbfs_ilistdir_it_iternext;
     iter->index = 1;
 
diff --git a/ports/renesas-ra/extint.c b/ports/renesas-ra/extint.c
index c3ad26ebe5c7c..05e99eb655b49 100644
--- a/ports/renesas-ra/extint.c
+++ b/ports/renesas-ra/extint.c
@@ -352,9 +352,8 @@ STATIC mp_obj_t extint_make_new(const mp_obj_type_t *type, size_t n_args, size_t
     mp_arg_val_t vals[PYB_EXTINT_MAKE_NEW_NUM_ARGS];
     mp_arg_parse_all_kw_array(n_args, n_kw, args, PYB_EXTINT_MAKE_NEW_NUM_ARGS, pyb_extint_make_new_args, vals);
 
-    extint_obj_t *self = m_new_obj(extint_obj_t);
+    extint_obj_t *self = mp_obj_malloc(extint_obj_t, type);
     machine_pin_obj_t *pin = vals[0].u_obj;
-    self->base.type = type;
     self->pin_idx = pin->pin;
     self->irq_no = extint_register(vals[0].u_obj, vals[1].u_int, vals[2].u_int, vals[3].u_obj, false);
 
diff --git a/ports/renesas-ra/machine_adc.c b/ports/renesas-ra/machine_adc.c
index 29e50b8a39f97..adeebeb4c4acd 100644
--- a/ports/renesas-ra/machine_adc.c
+++ b/ports/renesas-ra/machine_adc.c
@@ -88,8 +88,7 @@ STATIC mp_obj_t machine_adc_make_new(const mp_obj_type_t *type, size_t n_args, s
         pin = pin_obj->pin;
     }
     ra_adc_init();
-    machine_adc_obj_t *o = m_new_obj(machine_adc_obj_t);
-    o->base.type = &machine_adc_type;
+    machine_adc_obj_t *o = mp_obj_malloc(machine_adc_obj_t, &machine_adc_type);
     o->adc = (ADC_TypeDef *)NULL;
     o->channel = channel;
     o->pin = pin;
diff --git a/ports/renesas-ra/storage.c b/ports/renesas-ra/storage.c
index dad9991885572..8d94f6fb9c3b6 100644
--- a/ports/renesas-ra/storage.c
+++ b/ports/renesas-ra/storage.c
@@ -273,8 +273,7 @@ STATIC mp_obj_t pyb_flash_make_new(const mp_obj_type_t *type, size_t n_args, siz
         return MP_OBJ_FROM_PTR(&pyb_flash_obj);
     }
 
-    pyb_flash_obj_t *self = m_new_obj(pyb_flash_obj_t);
-    self->base.type = &pyb_flash_type;
+    pyb_flash_obj_t *self = mp_obj_malloc(pyb_flash_obj_t, &pyb_flash_type);
 
     uint32_t bl_len = (storage_get_block_count() - FLASH_PART1_START_BLOCK) * FLASH_BLOCK_SIZE;
 
diff --git a/ports/rp2/machine_adc.c b/ports/rp2/machine_adc.c
index f8925e5aa33a6..5f91392e142df 100644
--- a/ports/rp2/machine_adc.c
+++ b/ports/rp2/machine_adc.c
@@ -93,8 +93,7 @@ STATIC mp_obj_t machine_adc_make_new(const mp_obj_type_t *type, size_t n_args, s
     }
 
     // Create ADC object.
-    machine_adc_obj_t *o = m_new_obj(machine_adc_obj_t);
-    o->base.type = &machine_adc_type;
+    machine_adc_obj_t *o = mp_obj_malloc(machine_adc_obj_t, &machine_adc_type);
     o->channel = channel;
 
     return MP_OBJ_FROM_PTR(o);
diff --git a/ports/rp2/machine_i2s.c b/ports/rp2/machine_i2s.c
index ec64f72ec07f4..988e88d36ffb0 100644
--- a/ports/rp2/machine_i2s.c
+++ b/ports/rp2/machine_i2s.c
@@ -897,9 +897,8 @@ STATIC mp_obj_t machine_i2s_make_new(const mp_obj_type_t *type, size_t n_pos_arg
 
     machine_i2s_obj_t *self;
     if (MP_STATE_PORT(machine_i2s_obj[i2s_id]) == NULL) {
-        self = m_new_obj(machine_i2s_obj_t);
+        self = mp_obj_malloc(machine_i2s_obj_t, &machine_i2s_type);
         MP_STATE_PORT(machine_i2s_obj[i2s_id]) = self;
-        self->base.type = &machine_i2s_type;
         self->i2s_id = i2s_id;
     } else {
         self = MP_STATE_PORT(machine_i2s_obj[i2s_id]);
diff --git a/ports/stm32/adc.c b/ports/stm32/adc.c
index 3b5a8b3646303..fcc7d51e45276 100644
--- a/ports/stm32/adc.c
+++ b/ports/stm32/adc.c
@@ -842,8 +842,7 @@ STATIC mp_obj_t adc_all_make_new(const mp_obj_type_t *type, size_t n_args, size_
     mp_arg_check_num(n_args, n_kw, 1, 2, false);
 
     // make ADCAll object
-    pyb_adc_all_obj_t *o = m_new_obj(pyb_adc_all_obj_t);
-    o->base.type = &pyb_adc_all_type;
+    pyb_adc_all_obj_t *o = mp_obj_malloc(pyb_adc_all_obj_t, &pyb_adc_all_type);
     mp_int_t res = mp_obj_get_int(args[0]);
     uint32_t en_mask = 0xffffffff;
     if (n_args > 1) {
diff --git a/ports/stm32/extint.c b/ports/stm32/extint.c
index 2fc68e1958be3..fd4dca276bbe2 100644
--- a/ports/stm32/extint.c
+++ b/ports/stm32/extint.c
@@ -627,8 +627,7 @@ STATIC mp_obj_t extint_make_new(const mp_obj_type_t *type, size_t n_args, size_t
     mp_arg_val_t vals[PYB_EXTINT_MAKE_NEW_NUM_ARGS];
     mp_arg_parse_all_kw_array(n_args, n_kw, args, PYB_EXTINT_MAKE_NEW_NUM_ARGS, pyb_extint_make_new_args, vals);
 
-    extint_obj_t *self = m_new_obj(extint_obj_t);
-    self->base.type = type;
+    extint_obj_t *self = mp_obj_malloc(extint_obj_t, type);
     self->line = extint_register(vals[0].u_obj, vals[1].u_int, vals[2].u_int, vals[3].u_obj, false);
 
     return MP_OBJ_FROM_PTR(self);
diff --git a/ports/stm32/lcd.c b/ports/stm32/lcd.c
index bfc9a0a5fd635..de967c5f971aa 100644
--- a/ports/stm32/lcd.c
+++ b/ports/stm32/lcd.c
@@ -200,8 +200,7 @@ STATIC mp_obj_t pyb_lcd_make_new(const mp_obj_type_t *type, size_t n_args, size_
     const char *lcd_id = mp_obj_str_get_str(args[0]);
 
     // create lcd object
-    pyb_lcd_obj_t *lcd = m_new_obj(pyb_lcd_obj_t);
-    lcd->base.type = &pyb_lcd_type;
+    pyb_lcd_obj_t *lcd = mp_obj_malloc(pyb_lcd_obj_t, &pyb_lcd_type);
 
     // configure pins
     // TODO accept an SPI object and pin objects for full customisation
diff --git a/ports/stm32/machine_adc.c b/ports/stm32/machine_adc.c
index ca40acf0d25c9..ad7c994ba111d 100644
--- a/ports/stm32/machine_adc.c
+++ b/ports/stm32/machine_adc.c
@@ -461,8 +461,7 @@ STATIC mp_obj_t machine_adc_make_new(const mp_obj_type_t *type, size_t n_args, s
 
     adc_config(adc, 12);
 
-    machine_adc_obj_t *o = m_new_obj(machine_adc_obj_t);
-    o->base.type = &machine_adc_type;
+    machine_adc_obj_t *o = mp_obj_malloc(machine_adc_obj_t, &machine_adc_type);
     o->adc = adc;
     o->channel = channel;
     o->sample_time = sample_time;
diff --git a/ports/stm32/machine_i2s.c b/ports/stm32/machine_i2s.c
index 2bb60a6a8664d..a9d0da43d4426 100644
--- a/ports/stm32/machine_i2s.c
+++ b/ports/stm32/machine_i2s.c
@@ -859,9 +859,8 @@ STATIC mp_obj_t machine_i2s_make_new(const mp_obj_type_t *type, size_t n_pos_arg
 
     machine_i2s_obj_t *self;
     if (MP_STATE_PORT(machine_i2s_obj)[i2s_id_zero_base] == NULL) {
-        self = m_new_obj(machine_i2s_obj_t);
+        self = mp_obj_malloc(machine_i2s_obj_t, &machine_i2s_type);
         MP_STATE_PORT(machine_i2s_obj)[i2s_id_zero_base] = self;
-        self->base.type = &machine_i2s_type;
         self->i2s_id = i2s_id;
     } else {
         self = MP_STATE_PORT(machine_i2s_obj)[i2s_id_zero_base];
diff --git a/ports/stm32/pyb_can.c b/ports/stm32/pyb_can.c
index aa2d83a64e582..3fa0f6baea0d6 100644
--- a/ports/stm32/pyb_can.c
+++ b/ports/stm32/pyb_can.c
@@ -323,8 +323,7 @@ STATIC mp_obj_t pyb_can_make_new(const mp_obj_type_t *type, size_t n_args, size_
 
     pyb_can_obj_t *self;
     if (MP_STATE_PORT(pyb_can_obj_all)[can_idx - 1] == NULL) {
-        self = m_new_obj(pyb_can_obj_t);
-        self->base.type = &pyb_can_type;
+        self = mp_obj_malloc(pyb_can_obj_t, &pyb_can_type);
         self->can_id = can_idx;
         self->is_enabled = false;
         MP_STATE_PORT(pyb_can_obj_all)[can_idx - 1] = self;
diff --git a/ports/stm32/storage.c b/ports/stm32/storage.c
index a043570f1bb57..c33a75f67100c 100644
--- a/ports/stm32/storage.c
+++ b/ports/stm32/storage.c
@@ -302,8 +302,7 @@ STATIC mp_obj_t pyb_flash_make_new(const mp_obj_type_t *type, size_t n_args, siz
         return MP_OBJ_FROM_PTR(&pyb_flash_obj);
     }
 
-    pyb_flash_obj_t *self = m_new_obj(pyb_flash_obj_t);
-    self->base.type = &pyb_flash_type;
+    pyb_flash_obj_t *self = mp_obj_malloc(pyb_flash_obj_t, &pyb_flash_type);
     self->use_native_block_size = false;
 
     uint32_t bl_len = (storage_get_block_count() - FLASH_PART1_START_BLOCK) * FLASH_BLOCK_SIZE;
diff --git a/ports/teensy/servo.c b/ports/teensy/servo.c
index 8c81255f2e2f0..bc9b6fdcfb57a 100644
--- a/ports/teensy/servo.c
+++ b/ports/teensy/servo.c
@@ -197,8 +197,7 @@ static const mp_obj_type_t servo_obj_type = {
 
 mp_obj_t pyb_Servo(void) {
     uint16_t mask;
-    pyb_servo_obj_t *self = m_new_obj(pyb_servo_obj_t);
-    self->base.type = &servo_obj_type;
+    pyb_servo_obj_t *self = mp_obj_malloc(pyb_servo_obj_t, &servo_obj_type);
     self->min_usecs = MIN_PULSE_WIDTH;
     self->max_usecs = MAX_PULSE_WIDTH;
 
diff --git a/ports/teensy/uart.c b/ports/teensy/uart.c
index 6373047b004f6..5b63fcb3cdd54 100644
--- a/ports/teensy/uart.c
+++ b/ports/teensy/uart.c
@@ -314,8 +314,7 @@ STATIC mp_obj_t pyb_uart_make_new(const mp_obj_type_t *type, uint n_args, uint n
     mp_arg_check_num(n_args, n_kw, 1, MP_OBJ_FUN_ARGS_MAX, true);
 
     // create object
-    pyb_uart_obj_t *o = m_new_obj(pyb_uart_obj_t);
-    o->base.type = &pyb_uart_type;
+    pyb_uart_obj_t *o = mp_obj_malloc(pyb_uart_obj_t, &pyb_uart_type);
 
     // work out port
     o->uart_id = 0;
diff --git a/ports/unix/coverage.c b/ports/unix/coverage.c
index a855237200128..7409221efd030 100644
--- a/ports/unix/coverage.c
+++ b/ports/unix/coverage.c
@@ -639,14 +639,12 @@ STATIC mp_obj_t extra_coverage(void) {
 
     mp_printf(&mp_plat_print, "# end coverage.c\n");
 
-    mp_obj_streamtest_t *s = m_new_obj(mp_obj_streamtest_t);
-    s->base.type = &mp_type_stest_fileio;
+    mp_obj_streamtest_t *s = mp_obj_malloc(mp_obj_streamtest_t, &mp_type_stest_fileio);
     s->buf = NULL;
     s->len = 0;
     s->pos = 0;
     s->error_code = 0;
-    mp_obj_streamtest_t *s2 = m_new_obj(mp_obj_streamtest_t);
-    s2->base.type = &mp_type_stest_textio2;
+    mp_obj_streamtest_t *s2 = mp_obj_malloc(mp_obj_streamtest_t, &mp_type_stest_textio2);
 
     // return a tuple of data for testing on the Python side
     mp_obj_t items[] = {(mp_obj_t)&str_no_hash_obj, (mp_obj_t)&bytes_no_hash_obj, MP_OBJ_FROM_PTR(s), MP_OBJ_FROM_PTR(s2)};
diff --git a/ports/unix/modffi.c b/ports/unix/modffi.c
index 0ff37a99f5be3..ec252ef33e51f 100644
--- a/ports/unix/modffi.c
+++ b/ports/unix/modffi.c
@@ -226,8 +226,7 @@ STATIC mp_obj_t make_func(mp_obj_t rettype_in, void *func, mp_obj_t argtypes_in)
     const char *argtypes = mp_obj_str_get_str(argtypes_in);
 
     mp_int_t nparams = MP_OBJ_SMALL_INT_VALUE(mp_obj_len_maybe(argtypes_in));
-    mp_obj_ffifunc_t *o = m_new_obj_var(mp_obj_ffifunc_t, ffi_type *, nparams);
-    o->base.type = &ffifunc_type;
+    mp_obj_ffifunc_t *o = mp_obj_malloc_var(mp_obj_ffifunc_t, ffi_type *, nparams, &ffifunc_type);
 
     o->func = func;
     o->rettype = *rettype;
@@ -334,8 +333,7 @@ STATIC mp_obj_t mod_ffi_callback(size_t n_args, const mp_obj_t *pos_args, mp_map
     const char *rettype = mp_obj_str_get_str(rettype_in);
 
     mp_int_t nparams = MP_OBJ_SMALL_INT_VALUE(mp_obj_len_maybe(paramtypes_in));
-    mp_obj_fficallback_t *o = m_new_obj_var(mp_obj_fficallback_t, ffi_type *, nparams);
-    o->base.type = &fficallback_type;
+    mp_obj_fficallback_t *o = mp_obj_malloc_var(mp_obj_fficallback_t, ffi_type *, nparams, &fficallback_type);
 
     o->clo = ffi_closure_alloc(sizeof(ffi_closure), &o->func);
 
@@ -374,8 +372,7 @@ STATIC mp_obj_t ffimod_var(mp_obj_t self_in, mp_obj_t vartype_in, mp_obj_t symna
     if (sym == NULL) {
         mp_raise_OSError(MP_ENOENT);
     }
-    mp_obj_ffivar_t *o = m_new_obj(mp_obj_ffivar_t);
-    o->base.type = &ffivar_type;
+    mp_obj_ffivar_t *o = mp_obj_malloc(mp_obj_ffivar_t, &ffivar_type);
 
     o->var = sym;
     o->type = *rettype;
@@ -408,8 +405,7 @@ STATIC mp_obj_t ffimod_make_new(const mp_obj_type_t *type, size_t n_args, size_t
     if (mod == NULL) {
         mp_raise_OSError(errno);
     }
-    mp_obj_ffimod_t *o = m_new_obj(mp_obj_ffimod_t);
-    o->base.type = type;
+    mp_obj_ffimod_t *o = mp_obj_malloc(mp_obj_ffimod_t, type);
     o->handle = mod;
     return MP_OBJ_FROM_PTR(o);
 }
diff --git a/ports/unix/modjni.c b/ports/unix/modjni.c
index bd151050eae49..4b95a0c67df8a 100644
--- a/ports/unix/modjni.c
+++ b/ports/unix/modjni.c
@@ -145,8 +145,7 @@ STATIC void jclass_attr(mp_obj_t self_in, qstr attr_in, mp_obj_t *dest) {
         // JJ1(ExceptionDescribe);
         JJ1(ExceptionClear);
 
-        mp_obj_jmethod_t *o = m_new_obj(mp_obj_jmethod_t);
-        o->base.type = &jmethod_type;
+        mp_obj_jmethod_t *o = mp_obj_malloc(mp_obj_jmethod_t, &jmethod_type);
         o->name = attr_in;
         o->meth = NULL;
         o->obj = self->cls;
@@ -183,8 +182,7 @@ STATIC const mp_obj_type_t jclass_type = {
 };
 
 STATIC mp_obj_t new_jclass(jclass jc) {
-    mp_obj_jclass_t *o = m_new_obj(mp_obj_jclass_t);
-    o->base.type = &jclass_type;
+    mp_obj_jclass_t *o = mp_obj_malloc(mp_obj_jclass_t, &jclass_type);
     o->cls = jc;
     return MP_OBJ_FROM_PTR(o);
 }
@@ -223,8 +221,7 @@ STATIC void jobject_attr(mp_obj_t self_in, qstr attr_in, mp_obj_t *dest) {
         // JJ1(ExceptionDescribe);
         JJ1(ExceptionClear);
 
-        mp_obj_jmethod_t *o = m_new_obj(mp_obj_jmethod_t);
-        o->base.type = &jmethod_type;
+        mp_obj_jmethod_t *o = mp_obj_malloc(mp_obj_jmethod_t, &jmethod_type);
         o->name = attr_in;
         o->meth = NULL;
         o->obj = self->obj;
@@ -343,8 +340,7 @@ STATIC mp_obj_t new_jobject(jobject jo) {
     } else if (JJ(IsInstanceOf, jo, Class_class)) {
         return new_jclass(jo);
     } else {
-        mp_obj_jobject_t *o = m_new_obj(mp_obj_jobject_t);
-        o->base.type = &jobject_type;
+        mp_obj_jobject_t *o = mp_obj_malloc(mp_obj_jobject_t, &jobject_type);
         o->obj = jo;
         return MP_OBJ_FROM_PTR(o);
     }
@@ -644,8 +640,7 @@ STATIC mp_obj_t mod_jni_cls(mp_obj_t cls_name_in) {
     }
     jclass cls = JJ(FindClass, cls_name);
 
-    mp_obj_jclass_t *o = m_new_obj(mp_obj_jclass_t);
-    o->base.type = &jclass_type;
+    mp_obj_jclass_t *o = mp_obj_malloc(mp_obj_jclass_t, &jclass_type);
     o->cls = cls;
     return MP_OBJ_FROM_PTR(o);
 }
diff --git a/ports/unix/moduselect.c b/ports/unix/moduselect.c
index a9390a146bd05..c88eb25edb244 100644
--- a/ports/unix/moduselect.c
+++ b/ports/unix/moduselect.c
@@ -324,8 +324,7 @@ STATIC mp_obj_t select_poll(size_t n_args, const mp_obj_t *args) {
     if (n_args > 0) {
         alloc = mp_obj_get_int(args[0]);
     }
-    mp_obj_poll_t *poll = m_new_obj(mp_obj_poll_t);
-    poll->base.type = &mp_type_poll;
+    mp_obj_poll_t *poll = mp_obj_malloc(mp_obj_poll_t, &mp_type_poll);
     poll->entries = m_new(struct pollfd, alloc);
     poll->alloc = alloc;
     poll->len = 0;
diff --git a/ports/unix/modusocket.c b/ports/unix/modusocket.c
index a516ed9c24ef6..adf043dc22b96 100644
--- a/ports/unix/modusocket.c
+++ b/ports/unix/modusocket.c
@@ -80,8 +80,7 @@ static inline mp_obj_t mp_obj_from_sockaddr(const struct sockaddr *addr, socklen
 }
 
 STATIC mp_obj_socket_t *socket_new(int fd) {
-    mp_obj_socket_t *o = m_new_obj(mp_obj_socket_t);
-    o->base.type = &mp_type_socket;
+    mp_obj_socket_t *o = mp_obj_malloc(mp_obj_socket_t, &mp_type_socket);
     o->fd = fd;
     o->blocking = true;
     return o;
diff --git a/ports/zephyr/machine_i2c.c b/ports/zephyr/machine_i2c.c
index 810c3e5a9ea25..86f7fd8e56bf3 100644
--- a/ports/zephyr/machine_i2c.c
+++ b/ports/zephyr/machine_i2c.c
@@ -84,9 +84,7 @@ mp_obj_t machine_hard_i2c_make_new(const mp_obj_type_t *type, size_t n_args, siz
         mp_raise_NotImplementedError(MP_ERROR_TEXT("explicit choice of timeout is not implemented"));
     }
 
-    machine_hard_i2c_obj_t *self = m_new_obj(machine_hard_i2c_obj_t);
-
-    self->base.type = &machine_hard_i2c_type;
+    machine_hard_i2c_obj_t *self = mp_obj_malloc(machine_hard_i2c_obj_t, &machine_hard_i2c_type);
     self->dev = dev;
     self->restart = false;
 
diff --git a/ports/zephyr/machine_spi.c b/ports/zephyr/machine_spi.c
index 2add7ff60b064..c54762aa05d65 100644
--- a/ports/zephyr/machine_spi.c
+++ b/ports/zephyr/machine_spi.c
@@ -106,9 +106,7 @@ mp_obj_t machine_hard_spi_make_new(const mp_obj_type_t *type, size_t n_args, siz
         .cs = NULL
     };
 
-    machine_hard_spi_obj_t *self = m_new_obj(machine_hard_spi_obj_t);
-
-    self->base.type = &machine_hard_spi_type;
+    machine_hard_spi_obj_t *self = mp_obj_malloc(machine_hard_spi_obj_t, &machine_hard_spi_type);
     self->dev = dev;
     self->config = cfg;
 
diff --git a/ports/zephyr/machine_uart.c b/ports/zephyr/machine_uart.c
index 23d7d59443729..95e33bb25b864 100644
--- a/ports/zephyr/machine_uart.c
+++ b/ports/zephyr/machine_uart.c
@@ -77,8 +77,7 @@ STATIC mp_obj_t machine_uart_make_new(const mp_obj_type_t *type, size_t n_args,
     mp_arg_check_num(n_args, n_kw, 1, MP_OBJ_FUN_ARGS_MAX, true);
     GET_STR_DATA_LEN(args[0], name, name_len);
 
-    machine_uart_obj_t *self = m_new_obj(machine_uart_obj_t);
-    self->base.type = &machine_uart_type;
+    machine_uart_obj_t *self = mp_obj_malloc(machine_uart_obj_t, &machine_uart_type);
     self->dev = device_get_binding(name);
     if (!self->dev) {
         mp_raise_ValueError(MP_ERROR_TEXT("Bad device name"));
diff --git a/ports/zephyr/modzsensor.c b/ports/zephyr/modzsensor.c
index 01f05aacd64a0..ba7ba2e8ccc86 100644
--- a/ports/zephyr/modzsensor.c
+++ b/ports/zephyr/modzsensor.c
@@ -40,8 +40,7 @@ typedef struct _mp_obj_sensor_t {
 
 STATIC mp_obj_t sensor_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
     mp_arg_check_num(n_args, n_kw, 1, 1, false);
-    mp_obj_sensor_t *o = m_new_obj(mp_obj_sensor_t);
-    o->base.type = type;
+    mp_obj_sensor_t *o = mp_obj_malloc(mp_obj_sensor_t, type);
     o->dev = device_get_binding(mp_obj_str_get_str(args[0]));
     if (o->dev == NULL) {
         mp_raise_ValueError(MP_ERROR_TEXT("dev not found"));
diff --git a/ports/zephyr/zephyr_storage.c b/ports/zephyr/zephyr_storage.c
index 5934f22813e62..2761dcba801cb 100644
--- a/ports/zephyr/zephyr_storage.c
+++ b/ports/zephyr/zephyr_storage.c
@@ -54,8 +54,7 @@ STATIC void zephyr_disk_access_print(const mp_print_t *print, mp_obj_t self_in,
 
 STATIC mp_obj_t zephyr_disk_access_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
     mp_arg_check_num(n_args, n_kw, 1, 1, false);
-    zephyr_disk_access_obj_t *self = m_new_obj(zephyr_disk_access_obj_t);
-    self->base.type = type;
+    zephyr_disk_access_obj_t *self = mp_obj_malloc(zephyr_disk_access_obj_t, type);
     self->pdrv = mp_obj_str_get_str(args[0]);
 
     if (disk_access_init(self->pdrv) != 0) {
@@ -156,8 +155,7 @@ STATIC void zephyr_flash_area_print(const mp_print_t *print, mp_obj_t self_in, m
 
 STATIC mp_obj_t zephyr_flash_area_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
     mp_arg_check_num(n_args, n_kw, 2, 2, false);
-    zephyr_flash_area_obj_t *self = m_new_obj(zephyr_flash_area_obj_t);
-    self->base.type = type;
+    zephyr_flash_area_obj_t *self = mp_obj_malloc(zephyr_flash_area_obj_t, type);
     self->id = mp_obj_get_int(args[0]);
     self->block_size = mp_obj_get_int(args[1]);
 
diff --git a/py/builtinevex.c b/py/builtinevex.c
index 4e1c6a66d188f..73b77b40b70fd 100644
--- a/py/builtinevex.c
+++ b/py/builtinevex.c
@@ -103,8 +103,7 @@ STATIC mp_obj_t mp_builtin_compile(size_t n_args, const mp_obj_t *args) {
             mp_raise_ValueError(MP_ERROR_TEXT("bad compile mode"));
     }
 
-    mp_obj_code_t *code = m_new_obj(mp_obj_code_t);
-    code->base.type = &mp_type_code;
+    mp_obj_code_t *code = mp_obj_malloc(mp_obj_code_t, &mp_type_code);
     code->module_fun = mp_parse_compile_execute(lex, parse_input_kind, NULL, NULL);
     return MP_OBJ_FROM_PTR(code);
 }
diff --git a/py/modio.c b/py/modio.c
index e79d59e4e5555..3e37231f23318 100644
--- a/py/modio.c
+++ b/py/modio.c
@@ -121,8 +121,7 @@ typedef struct _mp_obj_bufwriter_t {
 STATIC mp_obj_t bufwriter_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
     mp_arg_check_num(n_args, n_kw, 2, 2, false);
     size_t alloc = mp_obj_get_int(args[1]);
-    mp_obj_bufwriter_t *o = m_new_obj_var(mp_obj_bufwriter_t, byte, alloc);
-    o->base.type = type;
+    mp_obj_bufwriter_t *o = mp_obj_malloc_var(mp_obj_bufwriter_t, byte, alloc, type);
     o->stream = args[0];
     o->alloc = alloc;
     o->len = 0;
diff --git a/py/modthread.c b/py/modthread.c
index 29b765493ac3d..d22b1854cda33 100644
--- a/py/modthread.c
+++ b/py/modthread.c
@@ -54,8 +54,7 @@ typedef struct _mp_obj_thread_lock_t {
 } mp_obj_thread_lock_t;
 
 STATIC mp_obj_thread_lock_t *mp_obj_new_thread_lock(void) {
-    mp_obj_thread_lock_t *self = m_new_obj(mp_obj_thread_lock_t);
-    self->base.type = &mp_type_thread_lock;
+    mp_obj_thread_lock_t *self = mp_obj_malloc(mp_obj_thread_lock_t, &mp_type_thread_lock);
     mp_thread_mutex_init(&self->mutex);
     self->locked = false;
     return self;
diff --git a/py/objarray.c b/py/objarray.c
index 16a4d4aac7e25..bff3126a2bc41 100644
--- a/py/objarray.c
+++ b/py/objarray.c
@@ -639,8 +639,7 @@ mp_obj_t mp_obj_new_bytearray(size_t n, void *items) {
 
 // Create bytearray which references specified memory area
 mp_obj_t mp_obj_new_bytearray_by_ref(size_t n, void *items) {
-    mp_obj_array_t *o = m_new_obj(mp_obj_array_t);
-    o->base.type = &mp_type_bytearray;
+    mp_obj_array_t *o = mp_obj_malloc(mp_obj_array_t, &mp_type_bytearray);
     o->typecode = BYTEARRAY_TYPECODE;
     o->free = 0;
     o->len = n;
diff --git a/py/objattrtuple.c b/py/objattrtuple.c
index 3422d0146abb3..13c281aa1c600 100644
--- a/py/objattrtuple.c
+++ b/py/objattrtuple.c
@@ -71,8 +71,7 @@ STATIC void mp_obj_attrtuple_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
 }
 
 mp_obj_t mp_obj_new_attrtuple(const qstr *fields, size_t n, const mp_obj_t *items) {
-    mp_obj_tuple_t *o = m_new_obj_var(mp_obj_tuple_t, mp_obj_t, n + 1);
-    o->base.type = &mp_type_attrtuple;
+    mp_obj_tuple_t *o = mp_obj_malloc_var(mp_obj_tuple_t, mp_obj_t, n + 1, &mp_type_attrtuple);
     o->len = n;
     for (size_t i = 0; i < n; i++) {
         o->items[i] = items[i];
diff --git a/py/objboundmeth.c b/py/objboundmeth.c
index a3e1d302d963f..9936c06e494b2 100644
--- a/py/objboundmeth.c
+++ b/py/objboundmeth.c
@@ -108,8 +108,7 @@ STATIC const mp_obj_type_t mp_type_bound_meth = {
 };
 
 mp_obj_t mp_obj_new_bound_meth(mp_obj_t meth, mp_obj_t self) {
-    mp_obj_bound_meth_t *o = m_new_obj(mp_obj_bound_meth_t);
-    o->base.type = &mp_type_bound_meth;
+    mp_obj_bound_meth_t *o = mp_obj_malloc(mp_obj_bound_meth_t, &mp_type_bound_meth);
     o->meth = meth;
     o->self = self;
     return MP_OBJ_FROM_PTR(o);
diff --git a/py/objcell.c b/py/objcell.c
index be2ae8cd9c769..2702ca5350599 100644
--- a/py/objcell.c
+++ b/py/objcell.c
@@ -64,8 +64,7 @@ STATIC const mp_obj_type_t mp_type_cell = {
 };
 
 mp_obj_t mp_obj_new_cell(mp_obj_t obj) {
-    mp_obj_cell_t *o = m_new_obj(mp_obj_cell_t);
-    o->base.type = &mp_type_cell;
+    mp_obj_cell_t *o = mp_obj_malloc(mp_obj_cell_t, &mp_type_cell);
     o->obj = obj;
     return MP_OBJ_FROM_PTR(o);
 }
diff --git a/py/objclosure.c b/py/objclosure.c
index 054b657896573..9dc3e545321a3 100644
--- a/py/objclosure.c
+++ b/py/objclosure.c
@@ -89,8 +89,7 @@ const mp_obj_type_t mp_type_closure = {
 };
 
 mp_obj_t mp_obj_new_closure(mp_obj_t fun, size_t n_closed_over, const mp_obj_t *closed) {
-    mp_obj_closure_t *o = m_new_obj_var(mp_obj_closure_t, mp_obj_t, n_closed_over);
-    o->base.type = &mp_type_closure;
+    mp_obj_closure_t *o = mp_obj_malloc_var(mp_obj_closure_t, mp_obj_t, n_closed_over, &mp_type_closure);
     o->fun = fun;
     o->n_closed = n_closed_over;
     memcpy(o->closed, closed, n_closed_over * sizeof(mp_obj_t));
diff --git a/py/objcomplex.c b/py/objcomplex.c
index f4c4aeffcb91d..56c8353e905f7 100644
--- a/py/objcomplex.c
+++ b/py/objcomplex.c
@@ -162,8 +162,7 @@ const mp_obj_type_t mp_type_complex = {
 };
 
 mp_obj_t mp_obj_new_complex(mp_float_t real, mp_float_t imag) {
-    mp_obj_complex_t *o = m_new_obj(mp_obj_complex_t);
-    o->base.type = &mp_type_complex;
+    mp_obj_complex_t *o = mp_obj_malloc(mp_obj_complex_t, &mp_type_complex);
     o->real = real;
     o->imag = imag;
     return MP_OBJ_FROM_PTR(o);
diff --git a/py/objdeque.c b/py/objdeque.c
index c95bdeee9e39c..b1c59a81e9f3c 100644
--- a/py/objdeque.c
+++ b/py/objdeque.c
@@ -57,8 +57,7 @@ STATIC mp_obj_t deque_make_new(const mp_obj_type_t *type, size_t n_args, size_t
         mp_raise_ValueError(NULL);
     }
 
-    mp_obj_deque_t *o = m_new_obj(mp_obj_deque_t);
-    o->base.type = type;
+    mp_obj_deque_t *o = mp_obj_malloc(mp_obj_deque_t, type);
     o->alloc = maxlen + 1;
     o->i_get = o->i_put = 0;
     o->items = m_new0(mp_obj_t, o->alloc);
diff --git a/py/objdict.c b/py/objdict.c
index ed4376aa4f0ac..1d8e9059a188d 100644
--- a/py/objdict.c
+++ b/py/objdict.c
@@ -521,8 +521,7 @@ STATIC const mp_obj_type_t mp_type_dict_view = {
 };
 
 STATIC mp_obj_t mp_obj_new_dict_view(mp_obj_t dict, mp_dict_view_kind_t kind) {
-    mp_obj_dict_view_t *o = m_new_obj(mp_obj_dict_view_t);
-    o->base.type = &mp_type_dict_view;
+    mp_obj_dict_view_t *o = mp_obj_malloc(mp_obj_dict_view_t, &mp_type_dict_view);
     o->dict = dict;
     o->kind = kind;
     return MP_OBJ_FROM_PTR(o);
diff --git a/py/objenumerate.c b/py/objenumerate.c
index d1de4add47ba8..241aef30236ff 100644
--- a/py/objenumerate.c
+++ b/py/objenumerate.c
@@ -54,14 +54,12 @@ STATIC mp_obj_t enumerate_make_new(const mp_obj_type_t *type, size_t n_args, siz
         MP_ARRAY_SIZE(allowed_args), allowed_args, (mp_arg_val_t *)&arg_vals);
 
     // create enumerate object
-    mp_obj_enumerate_t *o = m_new_obj(mp_obj_enumerate_t);
-    o->base.type = type;
+    mp_obj_enumerate_t *o = mp_obj_malloc(mp_obj_enumerate_t, type);
     o->iter = mp_getiter(arg_vals.iterable.u_obj, NULL);
     o->cur = arg_vals.start.u_int;
     #else
     mp_arg_check_num(n_args, n_kw, 1, 2, false);
-    mp_obj_enumerate_t *o = m_new_obj(mp_obj_enumerate_t);
-    o->base.type = type;
+    mp_obj_enumerate_t *o = mp_obj_malloc(mp_obj_enumerate_t, type);
     o->iter = mp_getiter(args[0], NULL);
     o->cur = n_args > 1 ? mp_obj_get_int(args[1]) : 0;
     #endif
diff --git a/py/objfilter.c b/py/objfilter.c
index 41b2a3bc5f227..a402d8c648899 100644
--- a/py/objfilter.c
+++ b/py/objfilter.c
@@ -36,8 +36,7 @@ typedef struct _mp_obj_filter_t {
 
 STATIC mp_obj_t filter_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
     mp_arg_check_num(n_args, n_kw, 2, 2, false);
-    mp_obj_filter_t *o = m_new_obj(mp_obj_filter_t);
-    o->base.type = type;
+    mp_obj_filter_t *o = mp_obj_malloc(mp_obj_filter_t, type);
     o->fun = args[0];
     o->iter = mp_getiter(args[1], NULL);
     return MP_OBJ_FROM_PTR(o);
diff --git a/py/objfun.c b/py/objfun.c
index 3542cc0e3f0b8..0053db449371c 100644
--- a/py/objfun.c
+++ b/py/objfun.c
@@ -393,8 +393,7 @@ mp_obj_t mp_obj_new_fun_bc(const mp_obj_t *def_args, const byte *code, const mp_
         def_kw_args = def_args[1];
         n_extra_args += 1;
     }
-    mp_obj_fun_bc_t *o = m_new_obj_var(mp_obj_fun_bc_t, mp_obj_t, n_extra_args);
-    o->base.type = &mp_type_fun_bc;
+    mp_obj_fun_bc_t *o = mp_obj_malloc_var(mp_obj_fun_bc_t, mp_obj_t, n_extra_args, &mp_type_fun_bc);
     o->bytecode = code;
     o->context = context;
     o->child_table = child_table;
@@ -536,8 +535,7 @@ STATIC const mp_obj_type_t mp_type_fun_asm = {
 };
 
 mp_obj_t mp_obj_new_fun_asm(size_t n_args, const void *fun_data, mp_uint_t type_sig) {
-    mp_obj_fun_asm_t *o = m_new_obj(mp_obj_fun_asm_t);
-    o->base.type = &mp_type_fun_asm;
+    mp_obj_fun_asm_t *o = mp_obj_malloc(mp_obj_fun_asm_t, &mp_type_fun_asm);
     o->n_args = n_args;
     o->fun_data = fun_data;
     o->type_sig = type_sig;
diff --git a/py/objgenerator.c b/py/objgenerator.c
index 850de3fb68e5a..c1747a88bc784 100644
--- a/py/objgenerator.c
+++ b/py/objgenerator.c
@@ -59,9 +59,9 @@ STATIC mp_obj_t gen_wrap_call(mp_obj_t self_in, size_t n_args, size_t n_kw, cons
     MP_BC_PRELUDE_SIG_DECODE(ip);
 
     // allocate the generator object, with room for local stack and exception stack
-    mp_obj_gen_instance_t *o = m_new_obj_var(mp_obj_gen_instance_t, byte,
-        n_state * sizeof(mp_obj_t) + n_exc_stack * sizeof(mp_exc_stack_t));
-    o->base.type = &mp_type_gen_instance;
+    mp_obj_gen_instance_t *o = mp_obj_malloc_var(mp_obj_gen_instance_t, byte,
+        n_state * sizeof(mp_obj_t) + n_exc_stack * sizeof(mp_exc_stack_t),
+        &mp_type_gen_instance);
 
     o->pend_exc = mp_const_none;
     o->code_state.fun_bc = self_fun;
@@ -106,8 +106,7 @@ STATIC mp_obj_t native_gen_wrap_call(mp_obj_t self_in, size_t n_args, size_t n_k
     MP_BC_PRELUDE_SIG_DECODE(ip);
 
     // Allocate the generator object, with room for local stack (exception stack not needed).
-    mp_obj_gen_instance_t *o = m_new_obj_var(mp_obj_gen_instance_t, byte, n_state * sizeof(mp_obj_t));
-    o->base.type = &mp_type_gen_instance;
+    mp_obj_gen_instance_t *o = mp_obj_malloc_var(mp_obj_gen_instance_t, byte, n_state * sizeof(mp_obj_t), &mp_type_gen_instance);
 
     // Parse the input arguments and set up the code state
     o->pend_exc = mp_const_none;
diff --git a/py/objint_longlong.c b/py/objint_longlong.c
index f2e88c3ea5643..7fcb5462f804d 100644
--- a/py/objint_longlong.c
+++ b/py/objint_longlong.c
@@ -243,8 +243,7 @@ mp_obj_t mp_obj_new_int_from_uint(mp_uint_t value) {
 }
 
 mp_obj_t mp_obj_new_int_from_ll(long long val) {
-    mp_obj_int_t *o = m_new_obj(mp_obj_int_t);
-    o->base.type = &mp_type_int;
+    mp_obj_int_t *o = mp_obj_malloc(mp_obj_int_t, &mp_type_int);
     o->val = val;
     return o;
 }
@@ -254,8 +253,7 @@ mp_obj_t mp_obj_new_int_from_ull(unsigned long long val) {
     if (val >> (sizeof(unsigned long long) * 8 - 1) != 0) {
         mp_raise_msg(&mp_type_OverflowError, MP_ERROR_TEXT("ulonglong too large"));
     }
-    mp_obj_int_t *o = m_new_obj(mp_obj_int_t);
-    o->base.type = &mp_type_int;
+    mp_obj_int_t *o = mp_obj_malloc(mp_obj_int_t, &mp_type_int);
     o->val = val;
     return o;
 }
@@ -263,8 +261,7 @@ mp_obj_t mp_obj_new_int_from_ull(unsigned long long val) {
 mp_obj_t mp_obj_new_int_from_str_len(const char **str, size_t len, bool neg, unsigned int base) {
     // TODO this does not honor the given length of the string, but it all cases it should anyway be null terminated
     // TODO check overflow
-    mp_obj_int_t *o = m_new_obj(mp_obj_int_t);
-    o->base.type = &mp_type_int;
+    mp_obj_int_t *o = mp_obj_malloc(mp_obj_int_t, &mp_type_int);
     char *endptr;
     o->val = strtoll(*str, &endptr, base);
     *str = endptr;
diff --git a/py/objint_mpz.c b/py/objint_mpz.c
index ef3e017967857..cbc4cb75a782a 100644
--- a/py/objint_mpz.c
+++ b/py/objint_mpz.c
@@ -75,8 +75,7 @@ const mp_obj_int_t mp_sys_maxsize_obj = {
 #endif
 
 mp_obj_int_t *mp_obj_int_new_mpz(void) {
-    mp_obj_int_t *o = m_new_obj(mp_obj_int_t);
-    o->base.type = &mp_type_int;
+    mp_obj_int_t *o = mp_obj_malloc(mp_obj_int_t, &mp_type_int);
     mpz_init_zero(&o->mpz);
     return o;
 }
diff --git a/py/objmap.c b/py/objmap.c
index 78c52c8925782..1f9275854f833 100644
--- a/py/objmap.c
+++ b/py/objmap.c
@@ -38,8 +38,7 @@ typedef struct _mp_obj_map_t {
 
 STATIC mp_obj_t map_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
     mp_arg_check_num(n_args, n_kw, 2, MP_OBJ_FUN_ARGS_MAX, false);
-    mp_obj_map_t *o = m_new_obj_var(mp_obj_map_t, mp_obj_t, n_args - 1);
-    o->base.type = type;
+    mp_obj_map_t *o = mp_obj_malloc_var(mp_obj_map_t, mp_obj_t, n_args - 1, type);
     o->n_iters = n_args - 1;
     o->fun = args[0];
     for (size_t i = 0; i < n_args - 1; i++) {
diff --git a/py/objobject.c b/py/objobject.c
index 00082dfe08708..1652802805bbc 100644
--- a/py/objobject.c
+++ b/py/objobject.c
@@ -36,8 +36,7 @@ typedef struct _mp_obj_object_t {
 STATIC mp_obj_t object_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
     (void)args;
     mp_arg_check_num(n_args, n_kw, 0, 0, false);
-    mp_obj_object_t *o = m_new_obj(mp_obj_object_t);
-    o->base.type = type;
+    mp_obj_object_t *o = mp_obj_malloc(mp_obj_object_t, type);
     return MP_OBJ_FROM_PTR(o);
 }
 
diff --git a/py/objproperty.c b/py/objproperty.c
index 8d2c292c52d76..49327c981e0b5 100644
--- a/py/objproperty.c
+++ b/py/objproperty.c
@@ -47,8 +47,7 @@ STATIC mp_obj_t property_make_new(const mp_obj_type_t *type, size_t n_args, size
     mp_arg_val_t vals[MP_ARRAY_SIZE(allowed_args)];
     mp_arg_parse_all_kw_array(n_args, n_kw, args, MP_ARRAY_SIZE(allowed_args), allowed_args, vals);
 
-    mp_obj_property_t *o = m_new_obj(mp_obj_property_t);
-    o->base.type = type;
+    mp_obj_property_t *o = mp_obj_malloc(mp_obj_property_t, type);
     o->proxy[0] = vals[ARG_fget].u_obj;
     o->proxy[1] = vals[ARG_fset].u_obj;
     o->proxy[2] = vals[ARG_fdel].u_obj;
diff --git a/py/objrange.c b/py/objrange.c
index 1f028eb867a91..5496021892cb1 100644
--- a/py/objrange.c
+++ b/py/objrange.c
@@ -92,8 +92,7 @@ STATIC void range_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind
 STATIC mp_obj_t range_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
     mp_arg_check_num(n_args, n_kw, 1, 3, false);
 
-    mp_obj_range_t *o = m_new_obj(mp_obj_range_t);
-    o->base.type = type;
+    mp_obj_range_t *o = mp_obj_malloc(mp_obj_range_t, type);
     o->start = 0;
     o->step = 1;
 
@@ -168,8 +167,7 @@ STATIC mp_obj_t range_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) {
         if (mp_obj_is_type(index, &mp_type_slice)) {
             mp_bound_slice_t slice;
             mp_seq_get_fast_slice_indexes(len, index, &slice);
-            mp_obj_range_t *o = m_new_obj(mp_obj_range_t);
-            o->base.type = &mp_type_range;
+            mp_obj_range_t *o = mp_obj_malloc(mp_obj_range_t, &mp_type_range);
             o->start = self->start + slice.start * self->step;
             o->stop = self->start + slice.stop * self->step;
             o->step = slice.step * self->step;
diff --git a/py/objreversed.c b/py/objreversed.c
index 4254668e751c8..08961c0d2d899 100644
--- a/py/objreversed.c
+++ b/py/objreversed.c
@@ -47,8 +47,7 @@ STATIC mp_obj_t reversed_make_new(const mp_obj_type_t *type, size_t n_args, size
         return mp_call_method_n_kw(0, 0, dest);
     }
 
-    mp_obj_reversed_t *o = m_new_obj(mp_obj_reversed_t);
-    o->base.type = type;
+    mp_obj_reversed_t *o = mp_obj_malloc(mp_obj_reversed_t, type);
     o->seq = args[0];
     o->cur_index = mp_obj_get_int(mp_obj_len(args[0])); // start at the end of the sequence
 
diff --git a/py/objset.c b/py/objset.c
index d2508bfbf9e3f..26fd74398b8a9 100644
--- a/py/objset.c
+++ b/py/objset.c
@@ -174,8 +174,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(set_clear_obj, set_clear);
 STATIC mp_obj_t set_copy(mp_obj_t self_in) {
     check_set_or_frozenset(self_in);
     mp_obj_set_t *self = MP_OBJ_TO_PTR(self_in);
-    mp_obj_set_t *other = m_new_obj(mp_obj_set_t);
-    other->base.type = self->base.type;
+    mp_obj_set_t *other = mp_obj_malloc(mp_obj_set_t, self->base.type);
     mp_set_init(&other->set, self->set.alloc);
     other->set.used = self->set.used;
     memcpy(other->set.table, self->set.table, self->set.alloc * sizeof(mp_obj_t));
@@ -579,8 +578,7 @@ const mp_obj_type_t mp_type_frozenset = {
 #endif
 
 mp_obj_t mp_obj_new_set(size_t n_args, mp_obj_t *items) {
-    mp_obj_set_t *o = m_new_obj(mp_obj_set_t);
-    o->base.type = &mp_type_set;
+    mp_obj_set_t *o = mp_obj_malloc(mp_obj_set_t, &mp_type_set);
     mp_set_init(&o->set, n_args);
     for (size_t i = 0; i < n_args; i++) {
         mp_set_lookup(&o->set, items[i], MP_MAP_LOOKUP_ADD_IF_NOT_FOUND);
diff --git a/py/objslice.c b/py/objslice.c
index c65c30601be69..0b34516c185a7 100644
--- a/py/objslice.c
+++ b/py/objslice.c
@@ -104,8 +104,7 @@ const mp_obj_type_t mp_type_slice = {
 };
 
 mp_obj_t mp_obj_new_slice(mp_obj_t ostart, mp_obj_t ostop, mp_obj_t ostep) {
-    mp_obj_slice_t *o = m_new_obj(mp_obj_slice_t);
-    o->base.type = &mp_type_slice;
+    mp_obj_slice_t *o = mp_obj_malloc(mp_obj_slice_t, &mp_type_slice);
     o->start = ostart;
     o->stop = ostop;
     o->step = ostep;
diff --git a/py/objstr.c b/py/objstr.c
index 321bb058dc09b..6e5a316d784ad 100644
--- a/py/objstr.c
+++ b/py/objstr.c
@@ -2026,8 +2026,7 @@ const mp_obj_str_t mp_const_empty_bytes_obj = {{&mp_type_bytes}, 0, 0, (const by
 // the data is copied across.  This function should only be used if the type is bytes,
 // or if the type is str and the string data is known to be not interned.
 mp_obj_t mp_obj_new_str_copy(const mp_obj_type_t *type, const byte *data, size_t len) {
-    mp_obj_str_t *o = m_new_obj(mp_obj_str_t);
-    o->base.type = type;
+    mp_obj_str_t *o = mp_obj_malloc(mp_obj_str_t, type);
     o->len = len;
     if (data) {
         o->hash = qstr_compute_hash(data, len);
@@ -2070,8 +2069,7 @@ mp_obj_t mp_obj_new_str_from_vstr(const mp_obj_type_t *type, vstr_t *vstr) {
     }
 
     // make a new str/bytes object
-    mp_obj_str_t *o = m_new_obj(mp_obj_str_t);
-    o->base.type = type;
+    mp_obj_str_t *o = mp_obj_malloc(mp_obj_str_t, type);
     o->len = vstr->len;
     o->hash = qstr_compute_hash((byte *)vstr->buf, vstr->len);
     if (vstr->len + 1 == vstr->alloc) {
diff --git a/py/objstringio.c b/py/objstringio.c
index ef942e74e8f99..8b6c7531d79de 100644
--- a/py/objstringio.c
+++ b/py/objstringio.c
@@ -177,8 +177,7 @@ STATIC mp_obj_t stringio___exit__(size_t n_args, const mp_obj_t *args) {
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(stringio___exit___obj, 4, 4, stringio___exit__);
 
 STATIC mp_obj_stringio_t *stringio_new(const mp_obj_type_t *type) {
-    mp_obj_stringio_t *o = m_new_obj(mp_obj_stringio_t);
-    o->base.type = type;
+    mp_obj_stringio_t *o = mp_obj_malloc(mp_obj_stringio_t, type);
     o->pos = 0;
     o->ref_obj = MP_OBJ_NULL;
     return o;
diff --git a/py/objtuple.c b/py/objtuple.c
index 67d7bc356f4ca..e0cec84473639 100644
--- a/py/objtuple.c
+++ b/py/objtuple.c
@@ -243,8 +243,7 @@ mp_obj_t mp_obj_new_tuple(size_t n, const mp_obj_t *items) {
     if (n == 0) {
         return mp_const_empty_tuple;
     }
-    mp_obj_tuple_t *o = m_new_obj_var(mp_obj_tuple_t, mp_obj_t, n);
-    o->base.type = &mp_type_tuple;
+    mp_obj_tuple_t *o = mp_obj_malloc_var(mp_obj_tuple_t, mp_obj_t, n, &mp_type_tuple);
     o->len = n;
     if (items) {
         for (size_t i = 0; i < n; i++) {
diff --git a/py/objtype.c b/py/objtype.c
index e320adc8bb330..37c1e3bd22d30 100644
--- a/py/objtype.c
+++ b/py/objtype.c
@@ -99,8 +99,7 @@ STATIC
 mp_obj_instance_t *mp_obj_new_instance(const mp_obj_type_t *class, const mp_obj_type_t **native_base) {
     size_t num_native_bases = instance_count_native_bases(class, native_base);
     assert(num_native_bases < 2);
-    mp_obj_instance_t *o = m_new_obj_var(mp_obj_instance_t, mp_obj_t, num_native_bases);
-    o->base.type = class;
+    mp_obj_instance_t *o = mp_obj_malloc_var(mp_obj_instance_t, mp_obj_t, num_native_bases, class);
     mp_map_init(&o->members, 0);
     // Initialise the native base-class slot (should be 1 at most) with a valid
     // object.  It doesn't matter which object, so long as it can be uniquely
diff --git a/py/objzip.c b/py/objzip.c
index 4abc917c3f525..81fa1d587e37a 100644
--- a/py/objzip.c
+++ b/py/objzip.c
@@ -39,8 +39,7 @@ typedef struct _mp_obj_zip_t {
 STATIC mp_obj_t zip_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
     mp_arg_check_num(n_args, n_kw, 0, MP_OBJ_FUN_ARGS_MAX, false);
 
-    mp_obj_zip_t *o = m_new_obj_var(mp_obj_zip_t, mp_obj_t, n_args);
-    o->base.type = type;
+    mp_obj_zip_t *o = mp_obj_malloc_var(mp_obj_zip_t, mp_obj_t, n_args, type);
     o->n_iters = n_args;
     for (size_t i = 0; i < n_args; i++) {
         o->iters[i] = mp_getiter(args[i], NULL);
diff --git a/py/runtime.c b/py/runtime.c
index 02b866d83953b..184de7bc969a5 100644
--- a/py/runtime.c
+++ b/py/runtime.c
@@ -1067,8 +1067,7 @@ STATIC const mp_obj_type_t mp_type_checked_fun = {
 };
 
 STATIC mp_obj_t mp_obj_new_checked_fun(const mp_obj_type_t *type, mp_obj_t fun) {
-    mp_obj_checked_fun_t *o = m_new_obj(mp_obj_checked_fun_t);
-    o->base.type = &mp_type_checked_fun;
+    mp_obj_checked_fun_t *o = mp_obj_malloc(mp_obj_checked_fun_t, &mp_type_checked_fun);
     o->type = type;
     o->fun = fun;
     return MP_OBJ_FROM_PTR(o);

From c90f097519c7342a128848bf9dc5b38ba75d4222 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 3 May 2022 22:39:58 +1000
Subject: [PATCH 1989/3533] tests/extmod: Increase timing on uasyncio tests to
 make more reliable.

Non-real-time systems like Windows, Linux and macOS do not have reliable
timing, so increase the sleep intervals to make these tests more likely to
pass.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/extmod/uasyncio_basic.py         | 10 +++++-----
 tests/extmod/uasyncio_basic.py.exp     |  2 +-
 tests/extmod/uasyncio_gather.py        | 12 ++++++------
 tests/extmod/uasyncio_heaplock.py      |  8 ++++----
 tests/extmod/uasyncio_wait_task.py     |  6 +++---
 tests/extmod/uasyncio_wait_task.py.exp |  2 +-
 6 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/tests/extmod/uasyncio_basic.py b/tests/extmod/uasyncio_basic.py
index c88908d99b320..20c0a82e47a91 100644
--- a/tests/extmod/uasyncio_basic.py
+++ b/tests/extmod/uasyncio_basic.py
@@ -32,18 +32,18 @@ async def main():
     print("after sleep")
 
     t0 = ticks()
-    await delay_print(0.02, "short")
+    await delay_print(0.2, "short")
     t1 = ticks()
-    await delay_print(0.04, "long")
+    await delay_print(0.4, "long")
     t2 = ticks()
     await delay_print(-1, "negative")
     t3 = ticks()
 
     print(
         "took {} {} {}".format(
-            round(ticks_diff(t1, t0), -1),
-            round(ticks_diff(t2, t1), -1),
-            round(ticks_diff(t3, t2), -1),
+            round(ticks_diff(t1, t0), -2),
+            round(ticks_diff(t2, t1), -2),
+            round(ticks_diff(t3, t2), -2),
         )
     )
 
diff --git a/tests/extmod/uasyncio_basic.py.exp b/tests/extmod/uasyncio_basic.py.exp
index 6673978769fbf..478e22abc8ff6 100644
--- a/tests/extmod/uasyncio_basic.py.exp
+++ b/tests/extmod/uasyncio_basic.py.exp
@@ -3,4 +3,4 @@ after sleep
 short
 long
 negative
-took 20 40 0
+took 200 400 0
diff --git a/tests/extmod/uasyncio_gather.py b/tests/extmod/uasyncio_gather.py
index fb47e753f1429..c081221c9fc68 100644
--- a/tests/extmod/uasyncio_gather.py
+++ b/tests/extmod/uasyncio_gather.py
@@ -20,7 +20,7 @@ async def factorial(name, number):
     return f
 
 
-async def task(id, t=0.02):
+async def task(id, t=0.1):
     print("start", id)
     await asyncio.sleep(t)
     print("end", id)
@@ -30,11 +30,11 @@ async def task(id, t=0.02):
 async def task_loop(id):
     print("task_loop start", id)
     while True:
-        await asyncio.sleep(0.02)
+        await asyncio.sleep(0.1)
         print("task_loop loop", id)
 
 
-async def task_raise(id, t=0.02):
+async def task_raise(id, t=0.1):
     print("task_raise start", id)
     await asyncio.sleep(t)
     print("task_raise raise", id)
@@ -75,7 +75,7 @@ async def main():
     print(tasks[0].done(), tasks[1].done())
     for t in tasks:
         t.cancel()
-    await asyncio.sleep(0.04)
+    await asyncio.sleep(0.2)
 
     print("====")
 
@@ -92,9 +92,9 @@ async def main():
 
     # Cancel a multi gather.
     t = asyncio.create_task(gather_task(task(1), task(2)))
-    await asyncio.sleep(0.01)
+    await asyncio.sleep(0.05)
     t.cancel()
-    await asyncio.sleep(0.04)
+    await asyncio.sleep(0.2)
 
     # Test edge cases where the gather is cancelled just as tasks are created and ending.
     for i in range(1, 4):
diff --git a/tests/extmod/uasyncio_heaplock.py b/tests/extmod/uasyncio_heaplock.py
index 3a92d36c9f57b..34a51cd370e52 100644
--- a/tests/extmod/uasyncio_heaplock.py
+++ b/tests/extmod/uasyncio_heaplock.py
@@ -29,15 +29,15 @@ async def task(id, n, t):
 
 
 async def main():
-    t1 = asyncio.create_task(task(1, 4, 20))
-    t2 = asyncio.create_task(task(2, 2, 50))
+    t1 = asyncio.create_task(task(1, 4, 100))
+    t2 = asyncio.create_task(task(2, 2, 250))
 
     micropython.heap_lock()
 
     print("start")
-    await asyncio.sleep_ms(1)
+    await asyncio.sleep_ms(5)
     print("sleep")
-    await asyncio.sleep_ms(70)
+    await asyncio.sleep_ms(350)
     print("finish")
 
     micropython.heap_unlock()
diff --git a/tests/extmod/uasyncio_wait_task.py b/tests/extmod/uasyncio_wait_task.py
index 3c79320c9f5c4..e19e29903ccc3 100644
--- a/tests/extmod/uasyncio_wait_task.py
+++ b/tests/extmod/uasyncio_wait_task.py
@@ -54,8 +54,8 @@ async def main():
     print("----")
 
     # Create 2 tasks
-    ts1 = asyncio.create_task(delay_print(0.04, "hello"))
-    ts2 = asyncio.create_task(delay_print(0.08, "world"))
+    ts1 = asyncio.create_task(delay_print(0.2, "hello"))
+    ts2 = asyncio.create_task(delay_print(0.4, "world"))
 
     # Time how long the tasks take to finish, they should execute in parallel
     print("start")
@@ -64,7 +64,7 @@ async def main():
     t1 = ticks()
     await ts2
     t2 = ticks()
-    print("took {} {}".format(round(ticks_diff(t1, t0), -1), round(ticks_diff(t2, t1), -1)))
+    print("took {} {}".format(round(ticks_diff(t1, t0), -2), round(ticks_diff(t2, t1), -2)))
 
     # Wait on a task that raises an exception
     t = asyncio.create_task(task_raise())
diff --git a/tests/extmod/uasyncio_wait_task.py.exp b/tests/extmod/uasyncio_wait_task.py.exp
index ee4e70fb4eb1e..04be37f48406d 100644
--- a/tests/extmod/uasyncio_wait_task.py.exp
+++ b/tests/extmod/uasyncio_wait_task.py.exp
@@ -5,6 +5,6 @@ task 2
 start
 hello
 world
-took 40 40
+took 200 200
 task_raise
 ValueError

From 8aa79c95bd3960763c94e0ea9e43e2e6bfd20a74 Mon Sep 17 00:00:00 2001
From: stijn <stijn@ignitron.net>
Date: Tue, 1 Mar 2022 11:40:22 +0100
Subject: [PATCH 1990/3533] windows: Consolidate all sleep-related functions
 into windows_mphal.c.

Replace the timer-based sleep with the standard win32 call since the former
has no benefits: even though it allows specifying the time in 100uSec
chunks, the actual resolution is still limited by the OS and is never
better than 1mSec.

For clarity move all of this next to the mp_hal_delay_ms definition so all
related functions are in one place.
---
 ports/windows/Makefile        |  1 -
 ports/windows/init.c          |  3 --
 ports/windows/sleep.c         | 76 -----------------------------------
 ports/windows/sleep.h         |  7 +++-
 ports/windows/windows_mphal.c | 16 +++++++-
 5 files changed, 20 insertions(+), 83 deletions(-)
 delete mode 100644 ports/windows/sleep.c

diff --git a/ports/windows/Makefile b/ports/windows/Makefile
index c9efc2353cd2f..4ffc408fd1724 100644
--- a/ports/windows/Makefile
+++ b/ports/windows/Makefile
@@ -55,7 +55,6 @@ SRC_C = \
 	windows_mphal.c \
 	realpath.c \
 	init.c \
-	sleep.c \
 	fmode.c \
 	$(SRC_MOD) \
 	$(wildcard $(VARIANT_DIR)/*.c)
diff --git a/ports/windows/init.c b/ports/windows/init.c
index 930400fdedcfd..87d581c30493e 100644
--- a/ports/windows/init.c
+++ b/ports/windows/init.c
@@ -30,7 +30,6 @@
 #ifdef _MSC_VER
 #include <crtdbg.h>
 #endif
-#include "sleep.h"
 #include "fmode.h"
 
 extern BOOL WINAPI console_sighandler(DWORD evt);
@@ -54,7 +53,6 @@ void init() {
     _set_invalid_parameter_handler(invalid_param_handler);
     #endif
     SetConsoleCtrlHandler(console_sighandler, TRUE);
-    init_sleep();
     #ifdef __MINGW32__
     putenv("PRINTF_EXPONENT_DIGITS=2");
     #elif _MSC_VER < 1900
@@ -67,5 +65,4 @@ void init() {
 
 void deinit() {
     SetConsoleCtrlHandler(console_sighandler, FALSE);
-    deinit_sleep();
 }
diff --git a/ports/windows/sleep.c b/ports/windows/sleep.c
deleted file mode 100644
index 6043ec7b7b0ca..0000000000000
--- a/ports/windows/sleep.c
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2013, 2014 Damien P. George
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#include <windows.h>
-#include <errno.h>
-#include <limits.h>
-
-HANDLE waitTimer = NULL;
-
-void init_sleep(void) {
-    waitTimer = CreateWaitableTimer(NULL, TRUE, NULL);
-}
-
-void deinit_sleep(void) {
-    if (waitTimer != NULL) {
-        CloseHandle(waitTimer);
-        waitTimer = NULL;
-    }
-}
-
-int usleep_impl(__int64 usec) {
-    if (waitTimer == NULL) {
-        errno = EAGAIN;
-        return -1;
-    }
-    if (usec < 0 || usec > LLONG_MAX / 10) {
-        errno = EINVAL;
-        return -1;
-    }
-
-    LARGE_INTEGER ft;
-    ft.QuadPart = -10 * usec; // 100 nanosecond interval, negative value = relative time
-    if (SetWaitableTimer(waitTimer, &ft, 0, NULL, NULL, 0) == 0) {
-        errno = EINVAL;
-        return -1;
-    }
-    if (WaitForSingleObject(waitTimer, INFINITE) != WAIT_OBJECT_0) {
-        errno = EAGAIN;
-        return -1;
-    }
-    return 0;
-}
-
-#ifdef _MSC_VER // mingw and the likes provide their own usleep()
-int usleep(__int64 usec) {
-    return usleep_impl(usec);
-}
-#endif
-
-void msec_sleep(double msec) {
-    const double usec = msec * 1000.0;
-    usleep_impl(usec > (double)LLONG_MAX ? LLONG_MAX : (__int64)usec);
-}
diff --git a/ports/windows/sleep.h b/ports/windows/sleep.h
index 430ec3a436de0..da76e21978b7e 100644
--- a/ports/windows/sleep.h
+++ b/ports/windows/sleep.h
@@ -26,9 +26,12 @@
 #ifndef MICROPY_INCLUDED_WINDOWS_SLEEP_H
 #define MICROPY_INCLUDED_WINDOWS_SLEEP_H
 
-void init_sleep(void);
-void deinit_sleep(void);
+// The main sleep implementation for the Windows port.
 void msec_sleep(double msec);
+
+// Define usleep() because some of the unix port's code uses that.
+// Mingw and the likes provide a definition of usleep(), note however
+// that it's also just Sleep(usec/1000).
 #ifdef _MSC_VER
 int usleep(__int64 usec);
 #endif
diff --git a/ports/windows/windows_mphal.c b/ports/windows/windows_mphal.c
index 5398e2da51061..7913435f75d4b 100644
--- a/ports/windows/windows_mphal.c
+++ b/ports/windows/windows_mphal.c
@@ -262,6 +262,20 @@ uint64_t mp_hal_time_ns(void) {
     return (uint64_t)tv.tv_sec * 1000000000ULL + (uint64_t)tv.tv_usec * 1000ULL;
 }
 
+void msec_sleep(double msec) {
+    if (msec < 0.0) {
+        msec = 0.0;
+    }
+    SleepEx((DWORD)msec, TRUE);
+}
+
+#ifdef _MSC_VER
+int usleep(__int64 usec) {
+    msec_sleep((double)usec / 1000.0);
+    return 0;
+}
+#endif
+
 void mp_hal_delay_ms(mp_uint_t ms) {
     #ifdef MICROPY_EVENT_POLL_HOOK
     mp_uint_t start = mp_hal_ticks_ms();
@@ -270,6 +284,6 @@ void mp_hal_delay_ms(mp_uint_t ms) {
         MICROPY_EVENT_POLL_HOOK
     }
     #else
-    SleepEx(ms, TRUE);
+    msec_sleep((double)ms);
     #endif
 }

From 20028c7c807d91a1d8ce2195580005068112f9a5 Mon Sep 17 00:00:00 2001
From: stijn <stijn@ignitron.net>
Date: Tue, 1 Mar 2022 11:44:15 +0100
Subject: [PATCH 1991/3533] windows: Avoid busy loop when using scheduler.

---
 ports/windows/mpconfigport.h  | 18 ++++++++++--------
 ports/windows/windows_mphal.c |  1 -
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/ports/windows/mpconfigport.h b/ports/windows/mpconfigport.h
index 4679d135655b6..1d78f00320f65 100644
--- a/ports/windows/mpconfigport.h
+++ b/ports/windows/mpconfigport.h
@@ -228,22 +228,24 @@ extern const struct _mp_obj_module_t mp_module_time;
 
 #define MICROPY_MPHALPORT_H         "windows_mphal.h"
 
+// We need to provide a declaration/definition of alloca()
+#include <malloc.h>
+
+#include "realpath.h"
+#include "init.h"
+#include "sleep.h"
+
 #if MICROPY_ENABLE_SCHEDULER
+// Use 1mSec sleep to make sure there is effectively a wait period:
+// something like usleep(500) truncates and ends up calling Sleep(0).
 #define MICROPY_EVENT_POLL_HOOK \
     do { \
         extern void mp_handle_pending(bool); \
         mp_handle_pending(true); \
-        mp_hal_delay_us(500); \
+        msec_sleep(1.0); \
     } while (0);
 #endif
 
-// We need to provide a declaration/definition of alloca()
-#include <malloc.h>
-
-#include "realpath.h"
-#include "init.h"
-#include "sleep.h"
-
 #ifdef __GNUC__
 #define MP_NOINLINE __attribute__((noinline))
 #endif
diff --git a/ports/windows/windows_mphal.c b/ports/windows/windows_mphal.c
index 7913435f75d4b..17b20c30317ce 100644
--- a/ports/windows/windows_mphal.c
+++ b/ports/windows/windows_mphal.c
@@ -280,7 +280,6 @@ void mp_hal_delay_ms(mp_uint_t ms) {
     #ifdef MICROPY_EVENT_POLL_HOOK
     mp_uint_t start = mp_hal_ticks_ms();
     while (mp_hal_ticks_ms() - start < ms) {
-        // MICROPY_EVENT_POLL_HOOK does mp_hal_delay_us(500) (i.e. usleep(500)).
         MICROPY_EVENT_POLL_HOOK
     }
     #else

From 5f57ec464a7c0dfdaf8e453b1c9c614e5c0db17b Mon Sep 17 00:00:00 2001
From: Takeo Takahashi <takeo.takahashi.xv@renesas.com>
Date: Tue, 3 May 2022 19:14:02 +0900
Subject: [PATCH 1992/3533] renesas-ra: Rename pyb_uart_ to machine_uart_.

Signed-off-by: Takeo Takahashi <takeo.takahashi.xv@renesas.com>
---
 ports/renesas-ra/machine_uart.c | 108 ++++++++++++++++----------------
 ports/renesas-ra/main.c         |  26 ++++----
 ports/renesas-ra/modmachine.c   |   2 +-
 ports/renesas-ra/moduos.c       |   6 +-
 ports/renesas-ra/mpconfigport.h |   4 +-
 ports/renesas-ra/uart.c         |  40 ++++++------
 ports/renesas-ra/uart.h         |  36 +++++------
 7 files changed, 111 insertions(+), 111 deletions(-)

diff --git a/ports/renesas-ra/machine_uart.c b/ports/renesas-ra/machine_uart.c
index 59fa469c3dbf2..d71562f2018bb 100644
--- a/ports/renesas-ra/machine_uart.c
+++ b/ports/renesas-ra/machine_uart.c
@@ -78,8 +78,8 @@ STATIC const char *_parity_name[] = {"None", "ODD", "EVEN"};
 ///
 ///     uart.any()               # returns True if any characters waiting
 
-STATIC void pyb_uart_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
-    pyb_uart_obj_t *self = MP_OBJ_TO_PTR(self_in);
+STATIC void machine_uart_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+    machine_uart_obj_t *self = MP_OBJ_TO_PTR(self_in);
     if (!self->is_enabled) {
         mp_printf(print, "UART(%u)", self->uart_id);
     } else {
@@ -116,7 +116,7 @@ STATIC void pyb_uart_print(const mp_print_t *print, mp_obj_t self_in, mp_print_k
 ///   - `timeout_char` is the timeout in milliseconds to wait between characters.
 ///   - `flow` is RTS | CTS where RTS == 256, CTS == 512
 ///   - `read_buf_len` is the character length of the read buffer (0 to disable).
-STATIC mp_obj_t pyb_uart_init_helper(pyb_uart_obj_t *self, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+STATIC mp_obj_t machine_uart_init_helper(machine_uart_obj_t *self, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_baudrate, MP_ARG_INT | MP_ARG_INT, {.u_int = 0} },
         { MP_QSTR_bits, MP_ARG_INT, {.u_int = 8} },
@@ -256,7 +256,7 @@ STATIC mp_obj_t pyb_uart_init_helper(pyb_uart_obj_t *self, size_t n_args, const
 ///   - `UART(6)` is on `YA`: `(TX, RX) = (Y1, Y2) = (PC6, PC7)`
 ///   - `UART(3)` is on `YB`: `(TX, RX) = (Y9, Y10) = (PB10, PB11)`
 ///   - `UART(2)` is on: `(TX, RX) = (X3, X4) = (PA2, PA3)`
-STATIC mp_obj_t pyb_uart_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
+STATIC mp_obj_t machine_uart_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
     // check arguments
     mp_arg_check_num(n_args, n_kw, 1, MP_OBJ_FUN_ARGS_MAX, true);
 
@@ -320,53 +320,53 @@ STATIC mp_obj_t pyb_uart_make_new(const mp_obj_type_t *type, size_t n_args, size
         mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("UART(%d) is reserved"), uart_id);
     }
 
-    pyb_uart_obj_t *self;
-    if (MP_STATE_PORT(pyb_uart_obj_all)[uart_id] == NULL) {
+    machine_uart_obj_t *self;
+    if (MP_STATE_PORT(machine_uart_obj_all)[uart_id] == NULL) {
         // create new UART object
-        self = m_new0(pyb_uart_obj_t, 1);
-        self->base.type = &pyb_uart_type;
+        self = m_new0(machine_uart_obj_t, 1);
+        self->base.type = &machine_uart_type;
         self->uart_id = uart_id;
-        MP_STATE_PORT(pyb_uart_obj_all)[uart_id] = self;
+        MP_STATE_PORT(machine_uart_obj_all)[uart_id] = self;
     } else {
         // reference existing UART object
-        self = MP_STATE_PORT(pyb_uart_obj_all)[uart_id];
+        self = MP_STATE_PORT(machine_uart_obj_all)[uart_id];
     }
 
     // start the peripheral
     mp_map_t kw_args;
     mp_map_init_fixed_table(&kw_args, n_kw, args + n_args);
-    pyb_uart_init_helper(self, n_args - 1, args + 1, &kw_args);
+    machine_uart_init_helper(self, n_args - 1, args + 1, &kw_args);
 
     return MP_OBJ_FROM_PTR(self);
 }
 
-STATIC mp_obj_t pyb_uart_init(size_t n_args, const mp_obj_t *args, mp_map_t *kw_args) {
-    return pyb_uart_init_helper(MP_OBJ_TO_PTR(args[0]), n_args - 1, args + 1, kw_args);
+STATIC mp_obj_t machine_uart_init(size_t n_args, const mp_obj_t *args, mp_map_t *kw_args) {
+    return machine_uart_init_helper(MP_OBJ_TO_PTR(args[0]), n_args - 1, args + 1, kw_args);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(pyb_uart_init_obj, 1, pyb_uart_init);
+STATIC MP_DEFINE_CONST_FUN_OBJ_KW(machine_uart_init_obj, 1, machine_uart_init);
 
 /// \method deinit()
 /// Turn off the UART bus.
-STATIC mp_obj_t pyb_uart_deinit(mp_obj_t self_in) {
-    pyb_uart_obj_t *self = MP_OBJ_TO_PTR(self_in);
+STATIC mp_obj_t machine_uart_deinit(mp_obj_t self_in) {
+    machine_uart_obj_t *self = MP_OBJ_TO_PTR(self_in);
     uart_deinit(self);
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(pyb_uart_deinit_obj, pyb_uart_deinit);
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_uart_deinit_obj, machine_uart_deinit);
 
 /// \method any()
 /// Return `True` if any characters waiting, else `False`.
-STATIC mp_obj_t pyb_uart_any(mp_obj_t self_in) {
-    pyb_uart_obj_t *self = MP_OBJ_TO_PTR(self_in);
+STATIC mp_obj_t machine_uart_any(mp_obj_t self_in) {
+    machine_uart_obj_t *self = MP_OBJ_TO_PTR(self_in);
     return MP_OBJ_NEW_SMALL_INT(uart_rx_any(self));
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(pyb_uart_any_obj, pyb_uart_any);
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_uart_any_obj, machine_uart_any);
 
 /// \method writechar(char)
 /// Write a single character on the bus.  `char` is an integer to write.
 /// Return value: `None`.
-STATIC mp_obj_t pyb_uart_writechar(mp_obj_t self_in, mp_obj_t char_in) {
-    pyb_uart_obj_t *self = MP_OBJ_TO_PTR(self_in);
+STATIC mp_obj_t machine_uart_writechar(mp_obj_t self_in, mp_obj_t char_in) {
+    machine_uart_obj_t *self = MP_OBJ_TO_PTR(self_in);
 
     // get the character to write (might be 9 bits)
     uint16_t data = mp_obj_get_int(char_in);
@@ -385,13 +385,13 @@ STATIC mp_obj_t pyb_uart_writechar(mp_obj_t self_in, mp_obj_t char_in) {
 
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(pyb_uart_writechar_obj, pyb_uart_writechar);
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(machine_uart_writechar_obj, machine_uart_writechar);
 
 /// \method readchar()
 /// Receive a single character on the bus.
 /// Return value: The character read, as an integer.  Returns -1 on timeout.
-STATIC mp_obj_t pyb_uart_readchar(mp_obj_t self_in) {
-    pyb_uart_obj_t *self = MP_OBJ_TO_PTR(self_in);
+STATIC mp_obj_t machine_uart_readchar(mp_obj_t self_in) {
+    machine_uart_obj_t *self = MP_OBJ_TO_PTR(self_in);
     if (uart_rx_wait(self, self->timeout)) {
         return MP_OBJ_NEW_SMALL_INT(uart_rx_char(self));
     } else {
@@ -399,21 +399,21 @@ STATIC mp_obj_t pyb_uart_readchar(mp_obj_t self_in) {
         return MP_OBJ_NEW_SMALL_INT(-1);
     }
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(pyb_uart_readchar_obj, pyb_uart_readchar);
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_uart_readchar_obj, machine_uart_readchar);
 
 // uart.sendbreak()
-STATIC mp_obj_t pyb_uart_sendbreak(mp_obj_t self_in) {
-    pyb_uart_obj_t *self = MP_OBJ_TO_PTR(self_in);
+STATIC mp_obj_t machine_uart_sendbreak(mp_obj_t self_in) {
+    machine_uart_obj_t *self = MP_OBJ_TO_PTR(self_in);
     ra_sci_tx_break((uint32_t)self->uart_id);
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(pyb_uart_sendbreak_obj, pyb_uart_sendbreak);
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_uart_sendbreak_obj, machine_uart_sendbreak);
 
 // irq(handler, trigger, hard)
-STATIC mp_obj_t pyb_uart_irq(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+STATIC mp_obj_t machine_uart_irq(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     mp_arg_val_t args[MP_IRQ_ARG_INIT_NUM_ARGS];
     mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args, MP_IRQ_ARG_INIT_NUM_ARGS, mp_irq_init_args, args);
-    pyb_uart_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]);
+    machine_uart_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]);
 
     if (self->mp_irq_obj == NULL) {
         self->mp_irq_trigger = 0;
@@ -444,14 +444,14 @@ STATIC mp_obj_t pyb_uart_irq(size_t n_args, const mp_obj_t *pos_args, mp_map_t *
 
     return MP_OBJ_FROM_PTR(self->mp_irq_obj);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(pyb_uart_irq_obj, 1, pyb_uart_irq);
+STATIC MP_DEFINE_CONST_FUN_OBJ_KW(machine_uart_irq_obj, 1, machine_uart_irq);
 
-STATIC const mp_rom_map_elem_t pyb_uart_locals_dict_table[] = {
+STATIC const mp_rom_map_elem_t machine_uart_locals_dict_table[] = {
     // instance methods
 
-    { MP_ROM_QSTR(MP_QSTR_init), MP_ROM_PTR(&pyb_uart_init_obj) },
-    { MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&pyb_uart_deinit_obj) },
-    { MP_ROM_QSTR(MP_QSTR_any), MP_ROM_PTR(&pyb_uart_any_obj) },
+    { MP_ROM_QSTR(MP_QSTR_init), MP_ROM_PTR(&machine_uart_init_obj) },
+    { MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&machine_uart_deinit_obj) },
+    { MP_ROM_QSTR(MP_QSTR_any), MP_ROM_PTR(&machine_uart_any_obj) },
 
     /// \method read([nbytes])
     { MP_ROM_QSTR(MP_QSTR_read), MP_ROM_PTR(&mp_stream_read_obj) },
@@ -461,21 +461,21 @@ STATIC const mp_rom_map_elem_t pyb_uart_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_readinto), MP_ROM_PTR(&mp_stream_readinto_obj) },
     /// \method write(buf)
     { MP_ROM_QSTR(MP_QSTR_write), MP_ROM_PTR(&mp_stream_write_obj) },
-    { MP_ROM_QSTR(MP_QSTR_irq), MP_ROM_PTR(&pyb_uart_irq_obj) },
+    { MP_ROM_QSTR(MP_QSTR_irq), MP_ROM_PTR(&machine_uart_irq_obj) },
 
-    { MP_ROM_QSTR(MP_QSTR_writechar), MP_ROM_PTR(&pyb_uart_writechar_obj) },
-    { MP_ROM_QSTR(MP_QSTR_readchar), MP_ROM_PTR(&pyb_uart_readchar_obj) },
-    { MP_ROM_QSTR(MP_QSTR_sendbreak), MP_ROM_PTR(&pyb_uart_sendbreak_obj) },
+    { MP_ROM_QSTR(MP_QSTR_writechar), MP_ROM_PTR(&machine_uart_writechar_obj) },
+    { MP_ROM_QSTR(MP_QSTR_readchar), MP_ROM_PTR(&machine_uart_readchar_obj) },
+    { MP_ROM_QSTR(MP_QSTR_sendbreak), MP_ROM_PTR(&machine_uart_sendbreak_obj) },
 
     // class constants
     { MP_ROM_QSTR(MP_QSTR_RTS), MP_ROM_INT(UART_HWCONTROL_RTS) },
     { MP_ROM_QSTR(MP_QSTR_CTS), MP_ROM_INT(UART_HWCONTROL_CTS) },
 };
 
-STATIC MP_DEFINE_CONST_DICT(pyb_uart_locals_dict, pyb_uart_locals_dict_table);
+STATIC MP_DEFINE_CONST_DICT(machine_uart_locals_dict, machine_uart_locals_dict_table);
 
-STATIC mp_uint_t pyb_uart_read(mp_obj_t self_in, void *buf_in, mp_uint_t size, int *errcode) {
-    pyb_uart_obj_t *self = MP_OBJ_TO_PTR(self_in);
+STATIC mp_uint_t machine_uart_read(mp_obj_t self_in, void *buf_in, mp_uint_t size, int *errcode) {
+    machine_uart_obj_t *self = MP_OBJ_TO_PTR(self_in);
     byte *buf = buf_in;
 
     // check that size is a multiple of character width
@@ -516,8 +516,8 @@ STATIC mp_uint_t pyb_uart_read(mp_obj_t self_in, void *buf_in, mp_uint_t size, i
     }
 }
 
-STATIC mp_uint_t pyb_uart_write(mp_obj_t self_in, const void *buf_in, mp_uint_t size, int *errcode) {
-    pyb_uart_obj_t *self = MP_OBJ_TO_PTR(self_in);
+STATIC mp_uint_t machine_uart_write(mp_obj_t self_in, const void *buf_in, mp_uint_t size, int *errcode) {
+    machine_uart_obj_t *self = MP_OBJ_TO_PTR(self_in);
     const byte *buf = buf_in;
 
     // check that size is a multiple of character width
@@ -545,8 +545,8 @@ STATIC mp_uint_t pyb_uart_write(mp_obj_t self_in, const void *buf_in, mp_uint_t
     }
 }
 
-STATIC mp_uint_t pyb_uart_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_t arg, int *errcode) {
-    pyb_uart_obj_t *self = MP_OBJ_TO_PTR(self_in);
+STATIC mp_uint_t machine_uart_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_t arg, int *errcode) {
+    machine_uart_obj_t *self = MP_OBJ_TO_PTR(self_in);
     mp_uint_t ret;
     if (request == MP_STREAM_POLL) {
         uintptr_t flags = arg;
@@ -565,19 +565,19 @@ STATIC mp_uint_t pyb_uart_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_t a
 }
 
 STATIC const mp_stream_p_t uart_stream_p = {
-    .read = pyb_uart_read,
-    .write = pyb_uart_write,
-    .ioctl = pyb_uart_ioctl,
+    .read = machine_uart_read,
+    .write = machine_uart_write,
+    .ioctl = machine_uart_ioctl,
     .is_text = false,
 };
 
-const mp_obj_type_t pyb_uart_type = {
+const mp_obj_type_t machine_uart_type = {
     { &mp_type_type },
     .name = MP_QSTR_UART,
-    .print = pyb_uart_print,
-    .make_new = pyb_uart_make_new,
+    .print = machine_uart_print,
+    .make_new = machine_uart_make_new,
     .getiter = mp_identity_getiter,
     .iternext = mp_stream_unbuffered_iter,
     .protocol = &uart_stream_p,
-    .locals_dict = (mp_obj_dict_t *)&pyb_uart_locals_dict,
+    .locals_dict = (mp_obj_dict_t *)&machine_uart_locals_dict,
 };
diff --git a/ports/renesas-ra/main.c b/ports/renesas-ra/main.c
index 82aa6be893d2a..6f4584b6856d2 100644
--- a/ports/renesas-ra/main.c
+++ b/ports/renesas-ra/main.c
@@ -73,8 +73,8 @@ STATIC pyb_thread_t pyb_thread_main;
 #ifndef MICROPY_HW_UART_REPL_RXBUF
 #define MICROPY_HW_UART_REPL_RXBUF (260)
 #endif
-STATIC pyb_uart_obj_t pyb_uart_repl_obj;
-STATIC uint8_t pyb_uart_repl_rxbuf[MICROPY_HW_UART_REPL_RXBUF];
+STATIC machine_uart_obj_t machine_uart_repl_obj;
+STATIC uint8_t machine_uart_repl_rxbuf[MICROPY_HW_UART_REPL_RXBUF];
 #endif
 
 void NORETURN __fatal_error(const char *msg) {
@@ -241,17 +241,17 @@ void ra_main(uint32_t reset_mode) {
 
     #if defined(MICROPY_HW_UART_REPL)
     // Set up a UART REPL using a statically allocated object
-    pyb_uart_repl_obj.base.type = &pyb_uart_type;
-    pyb_uart_repl_obj.uart_id = MICROPY_HW_UART_REPL;
-    pyb_uart_repl_obj.is_static = true;
-    pyb_uart_repl_obj.timeout = 0;
-    pyb_uart_repl_obj.timeout_char = 2;
-    uart_init(&pyb_uart_repl_obj, MICROPY_HW_UART_REPL_BAUD, UART_WORDLENGTH_8B, UART_PARITY_NONE, UART_STOPBITS_1, 0);
-    uart_set_rxbuf(&pyb_uart_repl_obj, sizeof(pyb_uart_repl_rxbuf), pyb_uart_repl_rxbuf);
-    uart_attach_to_repl(&pyb_uart_repl_obj, true);
-    MP_STATE_PORT(pyb_uart_obj_all)[MICROPY_HW_UART_REPL] = &pyb_uart_repl_obj;
+    machine_uart_repl_obj.base.type = &machine_uart_type;
+    machine_uart_repl_obj.uart_id = MICROPY_HW_UART_REPL;
+    machine_uart_repl_obj.is_static = true;
+    machine_uart_repl_obj.timeout = 0;
+    machine_uart_repl_obj.timeout_char = 2;
+    uart_init(&machine_uart_repl_obj, MICROPY_HW_UART_REPL_BAUD, UART_WORDLENGTH_8B, UART_PARITY_NONE, UART_STOPBITS_1, 0);
+    uart_set_rxbuf(&machine_uart_repl_obj, sizeof(machine_uart_repl_rxbuf), machine_uart_repl_rxbuf);
+    uart_attach_to_repl(&machine_uart_repl_obj, true);
+    MP_STATE_PORT(machine_uart_obj_all)[MICROPY_HW_UART_REPL] = &machine_uart_repl_obj;
     #if RA_EARLY_PRINT
-    MP_STATE_PORT(pyb_stdio_uart) = &pyb_uart_repl_obj;
+    MP_STATE_PORT(pyb_stdio_uart) = &machine_uart_repl_obj;
     #endif
     #endif
 
@@ -293,7 +293,7 @@ void ra_main(uint32_t reset_mode) {
     // by boot.py must be set after boot.py is run.
 
     #if defined(MICROPY_HW_UART_REPL)
-    MP_STATE_PORT(pyb_stdio_uart) = &pyb_uart_repl_obj;
+    MP_STATE_PORT(pyb_stdio_uart) = &machine_uart_repl_obj;
     #else
     MP_STATE_PORT(pyb_stdio_uart) = NULL;
     #endif
diff --git a/ports/renesas-ra/modmachine.c b/ports/renesas-ra/modmachine.c
index 7aea7c218b762..852be3dd1ecee 100644
--- a/ports/renesas-ra/modmachine.c
+++ b/ports/renesas-ra/modmachine.c
@@ -285,7 +285,7 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_SPI),                 MP_ROM_PTR(&machine_hard_spi_type) },
     { MP_ROM_QSTR(MP_QSTR_SoftSPI),             MP_ROM_PTR(&mp_machine_soft_spi_type) },
     #endif
-    { MP_ROM_QSTR(MP_QSTR_UART),                MP_ROM_PTR(&pyb_uart_type) },
+    { MP_ROM_QSTR(MP_QSTR_UART),                MP_ROM_PTR(&machine_uart_type) },
     { MP_ROM_QSTR(MP_QSTR_Timer),               MP_ROM_PTR(&machine_timer_type) },
     { MP_ROM_QSTR(MP_QSTR_PWRON_RESET),         MP_ROM_INT(PYB_RESET_POWER_ON) },
     { MP_ROM_QSTR(MP_QSTR_HARD_RESET),          MP_ROM_INT(PYB_RESET_HARD) },
diff --git a/ports/renesas-ra/moduos.c b/ports/renesas-ra/moduos.c
index 218c44a291519..ec1929fef1b58 100644
--- a/ports/renesas-ra/moduos.c
+++ b/ports/renesas-ra/moduos.c
@@ -48,15 +48,15 @@ MP_DEFINE_CONST_FUN_OBJ_0(mp_uos_sync_obj, mp_uos_sync);
 
 bool mp_uos_dupterm_is_builtin_stream(mp_const_obj_t stream) {
     const mp_obj_type_t *type = mp_obj_get_type(stream);
-    return type == &pyb_uart_type;
+    return type == &machine_uart_type;
 }
 
 void mp_uos_dupterm_stream_detached_attached(mp_obj_t stream_detached, mp_obj_t stream_attached) {
-    if (mp_obj_get_type(stream_detached) == &pyb_uart_type) {
+    if (mp_obj_get_type(stream_detached) == &machine_uart_type) {
         uart_attach_to_repl(MP_OBJ_TO_PTR(stream_detached), false);
     }
 
-    if (mp_obj_get_type(stream_attached) == &pyb_uart_type) {
+    if (mp_obj_get_type(stream_attached) == &machine_uart_type) {
         uart_attach_to_repl(MP_OBJ_TO_PTR(stream_attached), true);
     }
 }
diff --git a/ports/renesas-ra/mpconfigport.h b/ports/renesas-ra/mpconfigport.h
index 0301a41d396f2..8d60bc24463c3 100644
--- a/ports/renesas-ra/mpconfigport.h
+++ b/ports/renesas-ra/mpconfigport.h
@@ -220,10 +220,10 @@ extern const struct _mp_obj_module_t mp_module_onewire;
     struct _pyb_timer_obj_t *pyb_timer_obj_all[MICROPY_HW_MAX_TIMER]; \
     \
     /* stdio is repeated on this UART object if it's not null */ \
-    struct _pyb_uart_obj_t *pyb_stdio_uart; \
+    struct _machine_uart_obj_t *pyb_stdio_uart; \
     \
     /* pointers to all UART objects (if they have been created) */ \
-    struct _pyb_uart_obj_t *pyb_uart_obj_all[MICROPY_HW_MAX_UART + MICROPY_HW_MAX_LPUART]; \
+    struct _machine_uart_obj_t *machine_uart_obj_all[MICROPY_HW_MAX_UART + MICROPY_HW_MAX_LPUART]; \
     \
     /* list of registered NICs */ \
     /* mp_obj_list_t mod_network_nic_list; */ \
diff --git a/ports/renesas-ra/uart.c b/ports/renesas-ra/uart.c
index ddb77bfd58c2e..0e2e9004cd41a 100644
--- a/ports/renesas-ra/uart.c
+++ b/ports/renesas-ra/uart.c
@@ -64,7 +64,7 @@ static void set_kbd_interrupt(uint32_t ch, void *keyex) {
 #endif
 
 static void uart_rx_cb(uint32_t ch, int d) {
-    pyb_uart_obj_t *self = MP_STATE_PORT(pyb_uart_obj_all)[ch];
+    machine_uart_obj_t *self = MP_STATE_PORT(machine_uart_obj_all)[ch];
     if (self == NULL) {
         // UART object has not been set, so we can't do anything, not
         // even disable the IRQ.  This should never happen.
@@ -86,18 +86,18 @@ void uart_init0(void) {
 
 // unregister all interrupt sources
 void uart_deinit_all(void) {
-    for (int i = 0; i < MP_ARRAY_SIZE(MP_STATE_PORT(pyb_uart_obj_all)); i++) {
-        pyb_uart_obj_t *uart_obj = MP_STATE_PORT(pyb_uart_obj_all)[i];
+    for (int i = 0; i < MP_ARRAY_SIZE(MP_STATE_PORT(machine_uart_obj_all)); i++) {
+        machine_uart_obj_t *uart_obj = MP_STATE_PORT(machine_uart_obj_all)[i];
         if (uart_obj != NULL && !uart_obj->is_static) {
             uart_deinit(uart_obj);
-            MP_STATE_PORT(pyb_uart_obj_all)[i] = NULL;
+            MP_STATE_PORT(machine_uart_obj_all)[i] = NULL;
         }
     }
 }
 
 bool uart_exists(int uart_id) {
-    if (uart_id > MP_ARRAY_SIZE(MP_STATE_PORT(pyb_uart_obj_all))) {
-        // safeguard against pyb_uart_obj_all array being configured too small
+    if (uart_id > MP_ARRAY_SIZE(MP_STATE_PORT(machine_uart_obj_all))) {
+        // safeguard against machine_uart_obj_all array being configured too small
         return false;
     }
     switch (uart_id) {
@@ -157,7 +157,7 @@ bool uart_exists(int uart_id) {
 }
 
 // assumes Init parameters have been set up correctly
-bool uart_init(pyb_uart_obj_t *uart_obj,
+bool uart_init(machine_uart_obj_t *uart_obj,
     uint32_t baudrate, uint32_t bits, uint32_t parity, uint32_t stop, uint32_t flow) {
     uart_obj->baudrate = (uint32_t)baudrate;
     uart_obj->bits = (uint8_t)bits;
@@ -374,7 +374,7 @@ bool uart_init(pyb_uart_obj_t *uart_obj,
     return true;
 }
 
-void uart_irq_config(pyb_uart_obj_t *self, bool enable) {
+void uart_irq_config(machine_uart_obj_t *self, bool enable) {
     if (self->mp_irq_trigger) {
         if (enable) {
             ra_sci_rxirq_enable(self->uart_id);
@@ -384,7 +384,7 @@ void uart_irq_config(pyb_uart_obj_t *self, bool enable) {
     }
 }
 
-void uart_set_rxbuf(pyb_uart_obj_t *self, size_t len, void *buf) {
+void uart_set_rxbuf(machine_uart_obj_t *self, size_t len, void *buf) {
     // len = 0 (no interrupt) is not supported. static buf is used.
     self->read_buf_len = len;
     self->read_buf = buf;
@@ -394,12 +394,12 @@ void uart_set_rxbuf(pyb_uart_obj_t *self, size_t len, void *buf) {
     }
 }
 
-void uart_deinit(pyb_uart_obj_t *self) {
+void uart_deinit(machine_uart_obj_t *self) {
     self->is_enabled = false;
     ra_sci_deinit(self->uart_id);
 }
 
-void uart_attach_to_repl(pyb_uart_obj_t *self, bool attached) {
+void uart_attach_to_repl(machine_uart_obj_t *self, bool attached) {
     self->attached_to_repl = attached;
     #if MICROPY_KBD_EXCEPTION
     if (attached) {
@@ -410,12 +410,12 @@ void uart_attach_to_repl(pyb_uart_obj_t *self, bool attached) {
     #endif
 }
 
-mp_uint_t uart_rx_any(pyb_uart_obj_t *self) {
+mp_uint_t uart_rx_any(machine_uart_obj_t *self) {
     int ch = (int)self->uart_id;
     return ra_sci_rx_any(ch);
 }
 
-mp_uint_t uart_tx_avail(pyb_uart_obj_t *self) {
+mp_uint_t uart_tx_avail(machine_uart_obj_t *self) {
     int ch = (int)self->uart_id;
     return ra_sci_tx_wait(ch);
 }
@@ -423,7 +423,7 @@ mp_uint_t uart_tx_avail(pyb_uart_obj_t *self) {
 // Waits at most timeout milliseconds for at least 1 char to become ready for
 // reading (from buf or for direct reading).
 // Returns true if something available, false if not.
-bool uart_rx_wait(pyb_uart_obj_t *self, uint32_t timeout) {
+bool uart_rx_wait(machine_uart_obj_t *self, uint32_t timeout) {
     int ch = (int)self->uart_id;
     uint32_t start = HAL_GetTick();
     for (;;) {
@@ -438,14 +438,14 @@ bool uart_rx_wait(pyb_uart_obj_t *self, uint32_t timeout) {
 }
 
 // assumes there is a character available
-int uart_rx_char(pyb_uart_obj_t *self) {
+int uart_rx_char(machine_uart_obj_t *self) {
     int ch = (int)self->uart_id;
     return ra_sci_rx_ch(ch);
 }
 
 // Waits at most timeout milliseconds for TX register to become empty.
 // Returns true if can write, false if can't.
-bool uart_tx_wait(pyb_uart_obj_t *self, uint32_t timeout) {
+bool uart_tx_wait(machine_uart_obj_t *self, uint32_t timeout) {
     uint32_t start = HAL_GetTick();
     for (;;) {
         if (uart_tx_avail(self)) {
@@ -462,7 +462,7 @@ bool uart_tx_wait(pyb_uart_obj_t *self, uint32_t timeout) {
 // num_chars - number of characters to send (9-bit chars count for 2 bytes from src)
 // *errcode - returns 0 for success, MP_Exxx on error
 // returns the number of characters sent (valid even if there was an error)
-size_t uart_tx_data(pyb_uart_obj_t *self, const void *src_in, size_t num_chars, int *errcode) {
+size_t uart_tx_data(machine_uart_obj_t *self, const void *src_in, size_t num_chars, int *errcode) {
     int ch = (int)self->uart_id;
     uint8_t *d8 = (uint8_t *)src_in;
     uint16_t *d16 = (uint16_t *)src_in;
@@ -485,13 +485,13 @@ size_t uart_tx_data(pyb_uart_obj_t *self, const void *src_in, size_t num_chars,
     return (size_t)num_chars;
 }
 
-void uart_tx_strn(pyb_uart_obj_t *uart_obj, const char *str, uint len) {
+void uart_tx_strn(machine_uart_obj_t *uart_obj, const char *str, uint len) {
     int errcode;
     uart_tx_data(uart_obj, str, len, &errcode);
 }
 
 STATIC mp_uint_t uart_irq_trigger(mp_obj_t self_in, mp_uint_t new_trigger) {
-    pyb_uart_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    machine_uart_obj_t *self = MP_OBJ_TO_PTR(self_in);
     uart_irq_config(self, false);
     self->mp_irq_trigger = new_trigger;
     uart_irq_config(self, true);
@@ -499,7 +499,7 @@ STATIC mp_uint_t uart_irq_trigger(mp_obj_t self_in, mp_uint_t new_trigger) {
 }
 
 STATIC mp_uint_t uart_irq_info(mp_obj_t self_in, mp_uint_t info_type) {
-    pyb_uart_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    machine_uart_obj_t *self = MP_OBJ_TO_PTR(self_in);
     if (info_type == MP_IRQ_INFO_FLAGS) {
         return self->mp_irq_flags;
     } else if (info_type == MP_IRQ_INFO_TRIGGERS) {
diff --git a/ports/renesas-ra/uart.h b/ports/renesas-ra/uart.h
index 01f1bc82d9762..9c7aea737dab8 100644
--- a/ports/renesas-ra/uart.h
+++ b/ports/renesas-ra/uart.h
@@ -42,7 +42,7 @@ typedef enum {
     HW_UART_7 = 7,
     HW_UART_8 = 8,
     HW_UART_9 = 9,
-} pyb_uart_t;
+} machine_uart_t;
 
 #define CHAR_WIDTH_8BIT (0)
 #define CHAR_WIDTH_9BIT (1)
@@ -63,9 +63,9 @@ typedef enum {
 // OR-ed IRQ flags which should not be touched by the user
 #define MP_UART_RESERVED_FLAGS ((uint16_t)0x0020)
 
-typedef struct _pyb_uart_obj_t {
+typedef struct _machine_uart_obj_t {
     mp_obj_base_t base;
-    pyb_uart_t uart_id : 8;
+    machine_uart_t uart_id : 8;
     uint32_t baudrate;
     const machine_pin_obj_t *rx;
     const machine_pin_obj_t *tx;
@@ -87,29 +87,29 @@ typedef struct _pyb_uart_obj_t {
     uint16_t mp_irq_trigger;            // user IRQ trigger mask
     uint16_t mp_irq_flags;              // user IRQ active IRQ flags
     mp_irq_obj_t *mp_irq_obj;           // user IRQ object
-} pyb_uart_obj_t;
+} machine_uart_obj_t;
 
-extern const mp_obj_type_t pyb_uart_type;
+extern const mp_obj_type_t machine_uart_type;
 extern const mp_irq_methods_t uart_irq_methods;
 
 void uart_init0(void);
 void uart_deinit_all(void);
 bool uart_exists(int uart_id);
-bool uart_init(pyb_uart_obj_t *uart_obj,
+bool uart_init(machine_uart_obj_t *uart_obj,
     uint32_t baudrate, uint32_t bits, uint32_t parity, uint32_t stop, uint32_t flow);
-void uart_irq_config(pyb_uart_obj_t *self, bool enable);
-void uart_set_rxbuf(pyb_uart_obj_t *self, size_t len, void *buf);
-void uart_deinit(pyb_uart_obj_t *uart_obj);
+void uart_irq_config(machine_uart_obj_t *self, bool enable);
+void uart_set_rxbuf(machine_uart_obj_t *self, size_t len, void *buf);
+void uart_deinit(machine_uart_obj_t *uart_obj);
 // void uart_irq_handler(mp_uint_t uart_id);
 
-void uart_attach_to_repl(pyb_uart_obj_t *self, bool attached);
-uint32_t uart_get_baudrate(pyb_uart_obj_t *self);
-mp_uint_t uart_rx_any(pyb_uart_obj_t *uart_obj);
-mp_uint_t uart_tx_avail(pyb_uart_obj_t *uart_obj);
-bool uart_rx_wait(pyb_uart_obj_t *self, uint32_t timeout);
-int uart_rx_char(pyb_uart_obj_t *uart_obj);
-bool uart_tx_wait(pyb_uart_obj_t *self, uint32_t timeout);
-size_t uart_tx_data(pyb_uart_obj_t *self, const void *src_in, size_t num_chars, int *errcode);
-void uart_tx_strn(pyb_uart_obj_t *uart_obj, const char *str, uint len);
+void uart_attach_to_repl(machine_uart_obj_t *self, bool attached);
+uint32_t uart_get_baudrate(machine_uart_obj_t *self);
+mp_uint_t uart_rx_any(machine_uart_obj_t *uart_obj);
+mp_uint_t uart_tx_avail(machine_uart_obj_t *uart_obj);
+bool uart_rx_wait(machine_uart_obj_t *self, uint32_t timeout);
+int uart_rx_char(machine_uart_obj_t *uart_obj);
+bool uart_tx_wait(machine_uart_obj_t *self, uint32_t timeout);
+size_t uart_tx_data(machine_uart_obj_t *self, const void *src_in, size_t num_chars, int *errcode);
+void uart_tx_strn(machine_uart_obj_t *uart_obj, const char *str, uint len);
 
 #endif // MICROPY_INCLUDED_RA_UART_H

From 965747bd97183a85db56e8d79c15c589df87cdd6 Mon Sep 17 00:00:00 2001
From: Takeo Takahashi <takeo.takahashi.xv@renesas.com>
Date: Tue, 3 May 2022 19:46:03 +0900
Subject: [PATCH 1993/3533] renesas-ra: Rename pyb_rtc_ to machine_rtc_.

Signed-off-by: Takeo Takahashi <takeo.takahashi.xv@renesas.com>
---
 ports/renesas-ra/machine_rtc.c | 50 +++++++++++++++++-----------------
 ports/renesas-ra/modmachine.c  |  6 ++--
 ports/renesas-ra/rtc.h         |  4 +--
 3 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/ports/renesas-ra/machine_rtc.c b/ports/renesas-ra/machine_rtc.c
index 9f698b6bcb57e..9ddc90213774c 100644
--- a/ports/renesas-ra/machine_rtc.c
+++ b/ports/renesas-ra/machine_rtc.c
@@ -150,29 +150,29 @@ uint64_t mp_hal_time_ns(void) {
 /******************************************************************************/
 // MicroPython bindings
 
-typedef struct _pyb_rtc_obj_t {
+typedef struct _machine_rtc_obj_t {
     mp_obj_base_t base;
-} pyb_rtc_obj_t;
+} machine_rtc_obj_t;
 
-STATIC const pyb_rtc_obj_t pyb_rtc_obj = {{&pyb_rtc_type}};
+STATIC const machine_rtc_obj_t machine_rtc_obj = {{&machine_rtc_type}};
 
 /// \classmethod \constructor()
 /// Create an RTC object.
-STATIC mp_obj_t pyb_rtc_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
+STATIC mp_obj_t machine_rtc_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
     // check arguments
     mp_arg_check_num(n_args, n_kw, 0, 0, false);
 
     // return constant object
-    return MP_OBJ_FROM_PTR(&pyb_rtc_obj);
+    return MP_OBJ_FROM_PTR(&machine_rtc_obj);
 }
 
 // force rtc to re-initialise
-mp_obj_t pyb_rtc_init(mp_obj_t self_in) {
+mp_obj_t machine_rtc_init(mp_obj_t self_in) {
     rtc_init_start(true);
     rtc_init_finalise();
     return mp_const_none;
 }
-MP_DEFINE_CONST_FUN_OBJ_1(pyb_rtc_init_obj, pyb_rtc_init);
+MP_DEFINE_CONST_FUN_OBJ_1(machine_rtc_init_obj, machine_rtc_init);
 
 /// \method info()
 /// Get information about the startup time and reset source.
@@ -181,10 +181,10 @@ MP_DEFINE_CONST_FUN_OBJ_1(pyb_rtc_init_obj, pyb_rtc_init);
 ///    start up.
 ///  - Bit 0x10000 is set if a power-on reset occurred.
 ///  - Bit 0x20000 is set if an external reset occurred
-mp_obj_t pyb_rtc_info(mp_obj_t self_in) {
+mp_obj_t machine_rtc_info(mp_obj_t self_in) {
     return mp_obj_new_int(rtc_info);
 }
-MP_DEFINE_CONST_FUN_OBJ_1(pyb_rtc_info_obj, pyb_rtc_info);
+MP_DEFINE_CONST_FUN_OBJ_1(machine_rtc_info_obj, machine_rtc_info);
 
 /// \method datetime([datetimetuple])
 /// Get or set the date and time of the RTC.
@@ -217,7 +217,7 @@ uint32_t rtc_us_to_subsec(uint32_t us) {
 #define rtc_subsec_to_us
 #endif
 
-mp_obj_t pyb_rtc_datetime(size_t n_args, const mp_obj_t *args) {
+mp_obj_t machine_rtc_datetime(size_t n_args, const mp_obj_t *args) {
     rtc_init_finalise();
     if (n_args == 1) {
         ra_rtc_t time;
@@ -249,12 +249,12 @@ mp_obj_t pyb_rtc_datetime(size_t n_args, const mp_obj_t *args) {
         return mp_const_none;
     }
 }
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pyb_rtc_datetime_obj, 1, 2, pyb_rtc_datetime);
+MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_rtc_datetime_obj, 1, 2, machine_rtc_datetime);
 
 // wakeup(None)
 // wakeup(ms, callback=None) - ms should be between 4ms - 2000ms
 // wakeup(wucksel, wut, callback) - not implemented
-mp_obj_t pyb_rtc_wakeup(size_t n_args, const mp_obj_t *args) {
+mp_obj_t machine_rtc_wakeup(size_t n_args, const mp_obj_t *args) {
     bool enable = false;
     mp_int_t ms;
     mp_obj_t callback = mp_const_none;
@@ -307,13 +307,13 @@ mp_obj_t pyb_rtc_wakeup(size_t n_args, const mp_obj_t *args) {
     }
     return mp_const_none;
 }
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pyb_rtc_wakeup_obj, 2, 3, pyb_rtc_wakeup);
+MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_rtc_wakeup_obj, 2, 3, machine_rtc_wakeup);
 
 // calibration(None)
 // calibration(cal)
 // When an integer argument is provided, check that it falls in the range [-63(s) to 63(s)]
 // and set the calibration value; otherwise return calibration value
-mp_obj_t pyb_rtc_calibration(size_t n_args, const mp_obj_t *args) {
+mp_obj_t machine_rtc_calibration(size_t n_args, const mp_obj_t *args) {
     rtc_init_finalise();
     mp_int_t cal;
     if (n_args == 2) {
@@ -330,20 +330,20 @@ mp_obj_t pyb_rtc_calibration(size_t n_args, const mp_obj_t *args) {
         return mp_obj_new_int(cal);
     }
 }
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pyb_rtc_calibration_obj, 1, 2, pyb_rtc_calibration);
+MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_rtc_calibration_obj, 1, 2, machine_rtc_calibration);
 
-STATIC const mp_rom_map_elem_t pyb_rtc_locals_dict_table[] = {
-    { MP_ROM_QSTR(MP_QSTR_init), MP_ROM_PTR(&pyb_rtc_init_obj) },
-    { MP_ROM_QSTR(MP_QSTR_info), MP_ROM_PTR(&pyb_rtc_info_obj) },
-    { MP_ROM_QSTR(MP_QSTR_datetime), MP_ROM_PTR(&pyb_rtc_datetime_obj) },
-    { MP_ROM_QSTR(MP_QSTR_wakeup), MP_ROM_PTR(&pyb_rtc_wakeup_obj) },
-    { MP_ROM_QSTR(MP_QSTR_calibration), MP_ROM_PTR(&pyb_rtc_calibration_obj) },
+STATIC const mp_rom_map_elem_t machine_rtc_locals_dict_table[] = {
+    { MP_ROM_QSTR(MP_QSTR_init), MP_ROM_PTR(&machine_rtc_init_obj) },
+    { MP_ROM_QSTR(MP_QSTR_info), MP_ROM_PTR(&machine_rtc_info_obj) },
+    { MP_ROM_QSTR(MP_QSTR_datetime), MP_ROM_PTR(&machine_rtc_datetime_obj) },
+    { MP_ROM_QSTR(MP_QSTR_wakeup), MP_ROM_PTR(&machine_rtc_wakeup_obj) },
+    { MP_ROM_QSTR(MP_QSTR_calibration), MP_ROM_PTR(&machine_rtc_calibration_obj) },
 };
-STATIC MP_DEFINE_CONST_DICT(pyb_rtc_locals_dict, pyb_rtc_locals_dict_table);
+STATIC MP_DEFINE_CONST_DICT(machine_rtc_locals_dict, machine_rtc_locals_dict_table);
 
-const mp_obj_type_t pyb_rtc_type = {
+const mp_obj_type_t machine_rtc_type = {
     { &mp_type_type },
     .name = MP_QSTR_RTC,
-    .make_new = pyb_rtc_make_new,
-    .locals_dict = (mp_obj_dict_t *)&pyb_rtc_locals_dict,
+    .make_new = machine_rtc_make_new,
+    .locals_dict = (mp_obj_dict_t *)&machine_rtc_locals_dict,
 };
diff --git a/ports/renesas-ra/modmachine.c b/ports/renesas-ra/modmachine.c
index 852be3dd1ecee..4914c7b3a9a72 100644
--- a/ports/renesas-ra/modmachine.c
+++ b/ports/renesas-ra/modmachine.c
@@ -224,7 +224,7 @@ MP_DEFINE_CONST_FUN_OBJ_0(machine_idle_obj, machine_idle);
 STATIC mp_obj_t machine_lightsleep(size_t n_args, const mp_obj_t *args) {
     if (n_args != 0) {
         mp_obj_t args2[2] = {MP_OBJ_NULL, args[0]};
-        pyb_rtc_wakeup(2, args2);
+        machine_rtc_wakeup(2, args2);
     }
     powerctrl_enter_stop_mode();
     return mp_const_none;
@@ -234,7 +234,7 @@ MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_lightsleep_obj, 0, 1, machine_lights
 STATIC mp_obj_t machine_deepsleep(size_t n_args, const mp_obj_t *args) {
     if (n_args != 0) {
         mp_obj_t args2[2] = {MP_OBJ_NULL, args[0]};
-        pyb_rtc_wakeup(2, args2);
+        machine_rtc_wakeup(2, args2);
     }
     powerctrl_enter_standby_mode();
     return mp_const_none;
@@ -273,7 +273,7 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_Pin),                 MP_ROM_PTR(&machine_pin_type) },
     { MP_ROM_QSTR(MP_QSTR_Signal),              MP_ROM_PTR(&machine_signal_type) },
 
-    { MP_ROM_QSTR(MP_QSTR_RTC),                 MP_ROM_PTR(&pyb_rtc_type) },
+    { MP_ROM_QSTR(MP_QSTR_RTC),                 MP_ROM_PTR(&machine_rtc_type) },
     { MP_ROM_QSTR(MP_QSTR_ADC),                 MP_ROM_PTR(&machine_adc_type) },
     #if MICROPY_PY_MACHINE_I2C
     #if MICROPY_HW_ENABLE_HW_I2C
diff --git a/ports/renesas-ra/rtc.h b/ports/renesas-ra/rtc.h
index 1aec48aea1162..793720341861e 100644
--- a/ports/renesas-ra/rtc.h
+++ b/ports/renesas-ra/rtc.h
@@ -28,7 +28,7 @@
 #define MICROPY_INCLUDED_RA_RTC_H
 
 #include "py/obj.h"
-extern const mp_obj_type_t pyb_rtc_type;
+extern const mp_obj_type_t machine_rtc_type;
 
 typedef struct
 {
@@ -64,6 +64,6 @@ void rtc_get_date(RTC_DateTypeDef *date);
 void rtc_init_start(bool force_init);
 void rtc_init_finalise(void);
 
-mp_obj_t pyb_rtc_wakeup(size_t n_args, const mp_obj_t *args);
+mp_obj_t machine_rtc_wakeup(size_t n_args, const mp_obj_t *args);
 
 #endif // MICROPY_INCLUDED_RA_RTC_H

From fca5701f74b784834d1af22d10988a1d0fddddaf Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 4 May 2022 12:12:11 +1000
Subject: [PATCH 1994/3533] py/malloc: Introduce m_tracked_calloc,
 m_tracked_free functions.

Enabled by MICROPY_TRACKED_ALLOC.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/unix/coverage.c                         | 49 ++++++++++
 .../unix/variants/coverage/mpconfigvariant.h  |  1 +
 py/malloc.c                                   | 93 +++++++++++++++++++
 py/misc.h                                     |  7 ++
 py/mpconfig.h                                 |  5 +
 py/mpstate.h                                  |  4 +
 tests/unix/extra_coverage.py.exp              | 19 ++++
 7 files changed, 178 insertions(+)

diff --git a/ports/unix/coverage.c b/ports/unix/coverage.c
index 7409221efd030..cf425ac4334f8 100644
--- a/ports/unix/coverage.c
+++ b/ports/unix/coverage.c
@@ -220,6 +220,55 @@ STATIC mp_obj_t extra_coverage(void) {
         mp_printf(&mp_plat_print, "%p\n", gc_nbytes(NULL));
     }
 
+    // tracked allocation
+    {
+        #define NUM_PTRS (8)
+        #define NUM_BYTES (128)
+        #define FLIP_POINTER(p) ((uint8_t *)((uintptr_t)(p) ^ 0x0f))
+
+        mp_printf(&mp_plat_print, "# tracked allocation\n");
+        mp_printf(&mp_plat_print, "m_tracked_head = %p\n", MP_STATE_VM(m_tracked_head));
+
+        uint8_t *ptrs[NUM_PTRS];
+
+        // allocate memory blocks
+        for (size_t i = 0; i < NUM_PTRS; ++i) {
+            ptrs[i] = m_tracked_calloc(1, NUM_BYTES);
+            bool all_zero = true;
+            for (size_t j = 0; j < NUM_BYTES; ++j) {
+                if (ptrs[i][j] != 0) {
+                    all_zero = false;
+                    break;
+                }
+                ptrs[i][j] = j;
+            }
+            mp_printf(&mp_plat_print, "%d %d\n", i, all_zero);
+
+            // hide the pointer from the GC and collect
+            ptrs[i] = FLIP_POINTER(ptrs[i]);
+            gc_collect();
+        }
+
+        // check the memory blocks have the correct content
+        for (size_t i = 0; i < NUM_PTRS; ++i) {
+            bool correct_contents = true;
+            for (size_t j = 0; j < NUM_BYTES; ++j) {
+                if (FLIP_POINTER(ptrs[i])[j] != j) {
+                    correct_contents = false;
+                    break;
+                }
+            }
+            mp_printf(&mp_plat_print, "%d %d\n", i, correct_contents);
+        }
+
+        // free the memory blocks
+        for (size_t i = 0; i < NUM_PTRS; ++i) {
+            m_tracked_free(FLIP_POINTER(ptrs[i]));
+        }
+
+        mp_printf(&mp_plat_print, "m_tracked_head = %p\n", MP_STATE_VM(m_tracked_head));
+    }
+
     // vstr
     {
         mp_printf(&mp_plat_print, "# vstr\n");
diff --git a/ports/unix/variants/coverage/mpconfigvariant.h b/ports/unix/variants/coverage/mpconfigvariant.h
index 2e36355ca6522..054c07af39228 100644
--- a/ports/unix/variants/coverage/mpconfigvariant.h
+++ b/ports/unix/variants/coverage/mpconfigvariant.h
@@ -38,6 +38,7 @@
 
 // Enable additional features.
 #define MICROPY_DEBUG_PARSE_RULE_NAME  (1)
+#define MICROPY_TRACKED_ALLOC           (1)
 #define MICROPY_FLOAT_HIGH_QUALITY_HASH (1)
 #define MICROPY_REPL_EMACS_WORDS_MOVE  (1)
 #define MICROPY_REPL_EMACS_EXTRA_WORDS_MOVE (1)
diff --git a/py/malloc.c b/py/malloc.c
index c775d5b157312..efdff75396980 100644
--- a/py/malloc.c
+++ b/py/malloc.c
@@ -207,6 +207,99 @@ void m_free(void *ptr)
     #endif
 }
 
+#if MICROPY_TRACKED_ALLOC
+
+#define MICROPY_TRACKED_ALLOC_STORE_SIZE (!MICROPY_ENABLE_GC)
+
+typedef struct _m_tracked_node_t {
+    struct _m_tracked_node_t *prev;
+    struct _m_tracked_node_t *next;
+    #if MICROPY_TRACKED_ALLOC_STORE_SIZE
+    uintptr_t size;
+    #endif
+    uint8_t data[];
+} m_tracked_node_t;
+
+#if MICROPY_DEBUG_VERBOSE
+STATIC size_t m_tracked_count_links(size_t *nb) {
+    m_tracked_node_t *node = MP_STATE_VM(m_tracked_head);
+    size_t n = 0;
+    *nb = 0;
+    while (node != NULL) {
+        ++n;
+        #if MICROPY_TRACKED_ALLOC_STORE_SIZE
+        *nb += node->size;
+        #else
+        *nb += gc_nbytes(node);
+        #endif
+        node = node->next;
+    }
+    return n;
+}
+#endif
+
+void *m_tracked_calloc(size_t nmemb, size_t size) {
+    m_tracked_node_t *node = m_malloc_maybe(sizeof(m_tracked_node_t) + nmemb * size);
+    if (node == NULL) {
+        return NULL;
+    }
+    #if MICROPY_DEBUG_VERBOSE
+    size_t nb;
+    size_t n = m_tracked_count_links(&nb);
+    DEBUG_printf("m_tracked_calloc(%u, %u) -> (%u;%u) %p\n", (int)nmemb, (int)size, (int)n, (int)nb, node);
+    #endif
+    if (MP_STATE_VM(m_tracked_head) != NULL) {
+        MP_STATE_VM(m_tracked_head)->prev = node;
+    }
+    node->prev = NULL;
+    node->next = MP_STATE_VM(m_tracked_head);
+    MP_STATE_VM(m_tracked_head) = node;
+    #if MICROPY_TRACKED_ALLOC_STORE_SIZE
+    node->size = nmemb * size;
+    #endif
+    #if !MICROPY_GC_CONSERVATIVE_CLEAR
+    memset(&node->data[0], 0, nmemb * size);
+    #endif
+    return &node->data[0];
+}
+
+void m_tracked_free(void *ptr_in) {
+    if (ptr_in == NULL) {
+        return;
+    }
+    m_tracked_node_t *node = (m_tracked_node_t *)((uint8_t *)ptr_in - sizeof(m_tracked_node_t));
+    #if MICROPY_DEBUG_VERBOSE
+    size_t data_bytes;
+    #if MICROPY_TRACKED_ALLOC_STORE_SIZE
+    data_bytes = node->size;
+    #else
+    data_bytes = gc_nbytes(node);
+    #endif
+    size_t nb;
+    size_t n = m_tracked_count_links(&nb);
+    DEBUG_printf("m_tracked_free(%p, [%p, %p], nbytes=%u, links=%u;%u)\n", node, node->prev, node->next, (int)data_bytes, (int)n, (int)nb);
+    #endif
+    if (node->next != NULL) {
+        node->next->prev = node->prev;
+    }
+    if (node->prev != NULL) {
+        node->prev->next = node->next;
+    } else {
+        MP_STATE_VM(m_tracked_head) = node->next;
+    }
+    m_free(node
+        #if MICROPY_MALLOC_USES_ALLOCATED_SIZE
+        #if MICROPY_TRACKED_ALLOC_STORE_SIZE
+        , node->size
+        #else
+        , gc_nbytes(node)
+        #endif
+        #endif
+        );
+}
+
+#endif // MICROPY_TRACKED_ALLOC
+
 #if MICROPY_MEM_STATS
 size_t m_get_total_bytes_allocated(void) {
     return MP_STATE_MEM(total_bytes_allocated);
diff --git a/py/misc.h b/py/misc.h
index e1d27dc7b8904..d94afd0b0db77 100644
--- a/py/misc.h
+++ b/py/misc.h
@@ -103,6 +103,13 @@ void m_free(void *ptr);
 #endif
 NORETURN void m_malloc_fail(size_t num_bytes);
 
+#if MICROPY_TRACKED_ALLOC
+// These alloc/free functions track the pointers in a linked list so the GC does not reclaim
+// them.  They can be used by code that requires traditional C malloc/free semantics.
+void *m_tracked_calloc(size_t nmemb, size_t size);
+void m_tracked_free(void *ptr_in);
+#endif
+
 #if MICROPY_MEM_STATS
 size_t m_get_total_bytes_allocated(void);
 size_t m_get_current_bytes_allocated(void);
diff --git a/py/mpconfig.h b/py/mpconfig.h
index b58cef309a317..8814d1f09ca78 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -621,6 +621,11 @@
 #define MICROPY_GC_HOOK_LOOP
 #endif
 
+// Whether to provide m_tracked_calloc, m_tracked_free functions
+#ifndef MICROPY_TRACKED_ALLOC
+#define MICROPY_TRACKED_ALLOC (0)
+#endif
+
 // Whether to enable finalisers in the garbage collector (ie call __del__)
 #ifndef MICROPY_ENABLE_FINALISER
 #define MICROPY_ENABLE_FINALISER (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
diff --git a/py/mpstate.h b/py/mpstate.h
index ab6090e1a2b16..bc1aaf1e09b15 100644
--- a/py/mpstate.h
+++ b/py/mpstate.h
@@ -125,6 +125,10 @@ typedef struct _mp_state_vm_t {
 
     qstr_pool_t *last_pool;
 
+    #if MICROPY_TRACKED_ALLOC
+    struct _m_tracked_node_t *m_tracked_head;
+    #endif
+
     // non-heap memory for creating an exception if we can't allocate RAM
     mp_obj_exception_t mp_emergency_exception_obj;
 
diff --git a/tests/unix/extra_coverage.py.exp b/tests/unix/extra_coverage.py.exp
index f6681f4ac1916..4d6e1e08567d4 100644
--- a/tests/unix/extra_coverage.py.exp
+++ b/tests/unix/extra_coverage.py.exp
@@ -17,6 +17,25 @@ abc
 # GC
 0
 0
+# tracked allocation
+m_tracked_head = 0
+0 1
+1 1
+2 1
+3 1
+4 1
+5 1
+6 1
+7 1
+0 1
+1 1
+2 1
+3 1
+4 1
+5 1
+6 1
+7 1
+m_tracked_head = 0
 # vstr
 tests
 sts

From 39c96b543f282afeb46fb418fe053d52b3f21fd3 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 4 May 2022 12:21:16 +1000
Subject: [PATCH 1995/3533] stm32/mbedtls: Use core-provided tracked alloc
 instead of custom funcs.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/mbedtls/mbedtls_config.h |  8 ++--
 ports/stm32/mbedtls/mbedtls_port.c   | 55 ----------------------------
 ports/stm32/mpconfigport.h           |  8 +---
 3 files changed, 5 insertions(+), 66 deletions(-)

diff --git a/ports/stm32/mbedtls/mbedtls_config.h b/ports/stm32/mbedtls/mbedtls_config.h
index 3fbf36126cda3..2e0cb7651a48b 100644
--- a/ports/stm32/mbedtls/mbedtls_config.h
+++ b/ports/stm32/mbedtls/mbedtls_config.h
@@ -89,10 +89,10 @@
 // Memory allocation hooks
 #include <stdlib.h>
 #include <stdio.h>
-void *m_calloc_mbedtls(size_t nmemb, size_t size);
-void m_free_mbedtls(void *ptr);
-#define MBEDTLS_PLATFORM_STD_CALLOC m_calloc_mbedtls
-#define MBEDTLS_PLATFORM_STD_FREE m_free_mbedtls
+void *m_tracked_calloc(size_t nmemb, size_t size);
+void m_tracked_free(void *ptr);
+#define MBEDTLS_PLATFORM_STD_CALLOC m_tracked_calloc
+#define MBEDTLS_PLATFORM_STD_FREE m_tracked_free
 #define MBEDTLS_PLATFORM_SNPRINTF_MACRO snprintf
 
 #include "mbedtls/check_config.h"
diff --git a/ports/stm32/mbedtls/mbedtls_port.c b/ports/stm32/mbedtls/mbedtls_port.c
index 324abb7a66c04..5c4f8d0f99731 100644
--- a/ports/stm32/mbedtls/mbedtls_port.c
+++ b/ports/stm32/mbedtls/mbedtls_port.c
@@ -24,64 +24,9 @@
  * THE SOFTWARE.
  */
 
-#include "py/runtime.h"
-#include "py/gc.h"
 #include "rng.h"
 #include "mbedtls_config.h"
 
-#define DEBUG (0)
-
-#if DEBUG
-static size_t count_links(uint32_t *nb) {
-    void **p = MP_STATE_PORT(mbedtls_memory);
-    size_t n = 0;
-    *nb = 0;
-    while (p != NULL) {
-        ++n;
-        *nb += gc_nbytes(p);
-        p = (void **)p[1];
-    }
-    return n;
-}
-#endif
-
-void *m_calloc_mbedtls(size_t nmemb, size_t size) {
-    void **ptr = m_malloc0(nmemb * size + 2 * sizeof(uintptr_t));
-    #if DEBUG
-    uint32_t nb;
-    size_t n = count_links(&nb);
-    printf("mbed_alloc(%u, %u) -> (%u;%u) %p\n", nmemb, size, n, (uint)nb, ptr);
-    #endif
-    if (MP_STATE_PORT(mbedtls_memory) != NULL) {
-        MP_STATE_PORT(mbedtls_memory)[0] = ptr;
-    }
-    ptr[0] = NULL;
-    ptr[1] = MP_STATE_PORT(mbedtls_memory);
-    MP_STATE_PORT(mbedtls_memory) = ptr;
-    return &ptr[2];
-}
-
-void m_free_mbedtls(void *ptr_in) {
-    if (ptr_in == NULL) {
-        return;
-    }
-    void **ptr = &((void **)ptr_in)[-2];
-    #if DEBUG
-    uint32_t nb;
-    size_t n = count_links(&nb);
-    printf("mbed_free(%p, [%p, %p], nbytes=%u, links=%u;%u)\n", ptr, ptr[0], ptr[1], gc_nbytes(ptr), n, (uint)nb);
-    #endif
-    if (ptr[1] != NULL) {
-        ((void **)ptr[1])[0] = ptr[0];
-    }
-    if (ptr[0] != NULL) {
-        ((void **)ptr[0])[1] = ptr[1];
-    } else {
-        MP_STATE_PORT(mbedtls_memory) = ptr[1];
-    }
-    m_free(ptr);
-}
-
 int mbedtls_hardware_poll(void *data, unsigned char *output, size_t len, size_t *olen) {
     uint32_t val = 0;
     int n = 0;
diff --git a/ports/stm32/mpconfigport.h b/ports/stm32/mpconfigport.h
index b1bf6da22a5b2..1b6ebf92af76b 100644
--- a/ports/stm32/mpconfigport.h
+++ b/ports/stm32/mpconfigport.h
@@ -65,6 +65,7 @@
 #endif
 
 // Python internal features
+#define MICROPY_TRACKED_ALLOC       (MICROPY_SSL_MBEDTLS)
 #define MICROPY_READER_VFS          (1)
 #define MICROPY_ENABLE_GC           (1)
 #define MICROPY_ENABLE_EMERGENCY_EXCEPTION_BUF (1)
@@ -293,12 +294,6 @@ extern const struct _mod_network_nic_type_t mod_network_nic_type_cc3k;
 
 #define MP_STATE_PORT MP_STATE_VM
 
-#if MICROPY_SSL_MBEDTLS
-#define MICROPY_PORT_ROOT_POINTER_MBEDTLS void **mbedtls_memory;
-#else
-#define MICROPY_PORT_ROOT_POINTER_MBEDTLS
-#endif
-
 #if MICROPY_BLUETOOTH_NIMBLE
 struct _mp_bluetooth_nimble_root_pointers_t;
 struct _mp_bluetooth_nimble_malloc_t;
@@ -354,7 +349,6 @@ struct _mp_bluetooth_btstack_root_pointers_t;
     mp_obj_list_t mod_network_nic_list; \
     \
     /* root pointers for sub-systems */ \
-    MICROPY_PORT_ROOT_POINTER_MBEDTLS \
     MICROPY_PORT_ROOT_POINTER_BLUETOOTH_NIMBLE \
     MICROPY_PORT_ROOT_POINTER_BLUETOOTH_BTSTACK \
     \

From da31ad7aadfee0f334af97a8e256e642d058917f Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 4 May 2022 12:24:43 +1000
Subject: [PATCH 1996/3533] mimxrt/mbedtls: Use core-provided tracked alloc
 instead of custom funcs.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/mimxrt/mbedtls/mbedtls_config.h |  8 ++--
 ports/mimxrt/mbedtls/mbedtls_port.c   | 55 ---------------------------
 ports/mimxrt/mpconfigport.h           | 11 +-----
 3 files changed, 6 insertions(+), 68 deletions(-)

diff --git a/ports/mimxrt/mbedtls/mbedtls_config.h b/ports/mimxrt/mbedtls/mbedtls_config.h
index 1ab748d8e5a94..8e054ed51713a 100644
--- a/ports/mimxrt/mbedtls/mbedtls_config.h
+++ b/ports/mimxrt/mbedtls/mbedtls_config.h
@@ -88,10 +88,10 @@
 // Memory allocation hooks
 #include <stdlib.h>
 #include <stdio.h>
-void *m_calloc_mbedtls(size_t nmemb, size_t size);
-void m_free_mbedtls(void *ptr);
-#define MBEDTLS_PLATFORM_STD_CALLOC m_calloc_mbedtls
-#define MBEDTLS_PLATFORM_STD_FREE m_free_mbedtls
+void *m_tracked_calloc(size_t nmemb, size_t size);
+void m_tracked_free(void *ptr);
+#define MBEDTLS_PLATFORM_STD_CALLOC m_tracked_calloc
+#define MBEDTLS_PLATFORM_STD_FREE m_tracked_free
 #define MBEDTLS_PLATFORM_SNPRINTF_MACRO snprintf
 
 #include "mbedtls/check_config.h"
diff --git a/ports/mimxrt/mbedtls/mbedtls_port.c b/ports/mimxrt/mbedtls/mbedtls_port.c
index 928f12f3f1292..e2002274b1c48 100644
--- a/ports/mimxrt/mbedtls/mbedtls_port.c
+++ b/ports/mimxrt/mbedtls/mbedtls_port.c
@@ -26,64 +26,9 @@
 
 #ifdef MICROPY_SSL_MBEDTLS
 
-#include "py/runtime.h"
-#include "py/gc.h"
 #include "fsl_trng.h"
 #include "mbedtls_config.h"
 
-#define DEBUG (0)
-
-#if DEBUG
-static size_t count_links(uint32_t *nb) {
-    void **p = MP_STATE_PORT(mbedtls_memory);
-    size_t n = 0;
-    *nb = 0;
-    while (p != NULL) {
-        ++n;
-        *nb += gc_nbytes(p);
-        p = (void **)p[1];
-    }
-    return n;
-}
-#endif
-
-void *m_calloc_mbedtls(size_t nmemb, size_t size) {
-    void **ptr = m_malloc0(nmemb * size + 2 * sizeof(uintptr_t));
-    #if DEBUG
-    uint32_t nb;
-    size_t n = count_links(&nb);
-    printf("mbed_alloc(%u, %u) -> (%u;%u) %p\n", nmemb, size, n, (uint)nb, ptr);
-    #endif
-    if (MP_STATE_PORT(mbedtls_memory) != NULL) {
-        MP_STATE_PORT(mbedtls_memory)[0] = ptr;
-    }
-    ptr[0] = NULL;
-    ptr[1] = MP_STATE_PORT(mbedtls_memory);
-    MP_STATE_PORT(mbedtls_memory) = ptr;
-    return &ptr[2];
-}
-
-void m_free_mbedtls(void *ptr_in) {
-    if (ptr_in == NULL) {
-        return;
-    }
-    void **ptr = &((void **)ptr_in)[-2];
-    #if DEBUG
-    uint32_t nb;
-    size_t n = count_links(&nb);
-    printf("mbed_free(%p, [%p, %p], nbytes=%u, links=%u;%u)\n", ptr, ptr[0], ptr[1], gc_nbytes(ptr), n, (uint)nb);
-    #endif
-    if (ptr[1] != NULL) {
-        ((void **)ptr[1])[0] = ptr[0];
-    }
-    if (ptr[0] != NULL) {
-        ((void **)ptr[0])[1] = ptr[1];
-    } else {
-        MP_STATE_PORT(mbedtls_memory) = ptr[1];
-    }
-    m_free(ptr);
-}
-
 int mbedtls_hardware_poll(void *data, unsigned char *output, size_t len, size_t *olen) {
 
     // assumes that TRNG_Init was called during startup
diff --git a/ports/mimxrt/mpconfigport.h b/ports/mimxrt/mpconfigport.h
index 8572f69354842..0fe6e298e24cb 100644
--- a/ports/mimxrt/mpconfigport.h
+++ b/ports/mimxrt/mpconfigport.h
@@ -48,6 +48,7 @@ uint32_t trng_random_u32(void);
 #define MICROPY_OPT_MAP_LOOKUP_CACHE        (1)
 
 // Python internal features
+#define MICROPY_TRACKED_ALLOC               (MICROPY_SSL_MBEDTLS)
 #define MICROPY_READER_VFS                  (1)
 #define MICROPY_ENABLE_GC                   (1)
 #define MICROPY_ENABLE_FINALISER            (1)
@@ -250,12 +251,6 @@ extern const struct _mp_obj_module_t mp_module_network;
 #define SOCKET_BUILTIN_MODULE
 #endif
 
-#if MICROPY_SSL_MBEDTLS
-#define MICROPY_PORT_ROOT_POINTER_MBEDTLS void **mbedtls_memory;
-#else
-#define MICROPY_PORT_ROOT_POINTER_MBEDTLS
-#endif
-
 #if defined(MICROPY_HW_ETH_MDC)
 extern const struct _mp_obj_type_t network_lan_type;
 #define MICROPY_HW_NIC_ETH                  { MP_ROM_QSTR(MP_QSTR_LAN), MP_ROM_PTR(&network_lan_type) },
@@ -290,10 +285,8 @@ extern const struct _mp_obj_type_t network_lan_type;
     void *machine_pin_irq_objects[MICROPY_HW_NUM_PIN_IRQS]; \
     /* list of registered NICs */ \
     mp_obj_list_t mod_network_nic_list; \
-    /* root pointers for sub-systems */ \
-    MICROPY_PORT_ROOT_POINTER_MBEDTLS \
     /* root pointers defined by a board */ \
-        MICROPY_BOARD_ROOT_POINTERS \
+    MICROPY_BOARD_ROOT_POINTERS \
 
 #define MP_STATE_PORT MP_STATE_VM
 

From 1216c9fffa6345e4df9e4311283f88eeb0891cbc Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 5 May 2022 11:02:38 +1000
Subject: [PATCH 1997/3533] py/objmodule: Move stray #include to top of file.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/objmodule.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/py/objmodule.c b/py/objmodule.c
index 0cd10e61f08e8..b109d723a5284 100644
--- a/py/objmodule.c
+++ b/py/objmodule.c
@@ -29,6 +29,7 @@
 #include <string.h>
 #include <assert.h>
 
+#include "py/bc.h"
 #include "py/objmodule.h"
 #include "py/runtime.h"
 #include "py/builtin.h"
@@ -132,7 +133,6 @@ const mp_obj_type_t mp_type_module = {
     .attr = module_attr,
 };
 
-#include "py/bc.h"
 mp_obj_t mp_obj_new_module(qstr module_name) {
     mp_map_t *mp_loaded_modules_map = &MP_STATE_VM(mp_loaded_modules_dict).map;
     mp_map_elem_t *el = mp_map_lookup(mp_loaded_modules_map, MP_OBJ_NEW_QSTR(module_name), MP_MAP_LOOKUP_ADD_IF_NOT_FOUND);

From b0a1b60a9b425cdb24e36d71974e902338ffb059 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 5 May 2022 13:23:32 +1000
Subject: [PATCH 1998/3533] extmod: Move font_petme128_8x8.h from ports/stm32
 to extmod.

And add spaces after commas so it is consistently formatted.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/font_petme128_8x8.h      | 128 ++++++++++++++++++++++++++++++++
 extmod/modframebuf.c            |   2 +-
 ports/stm32/font_petme128_8x8.h | 128 --------------------------------
 ports/stm32/lcd.c               |   2 +-
 4 files changed, 130 insertions(+), 130 deletions(-)
 create mode 100644 extmod/font_petme128_8x8.h
 delete mode 100644 ports/stm32/font_petme128_8x8.h

diff --git a/extmod/font_petme128_8x8.h b/extmod/font_petme128_8x8.h
new file mode 100644
index 0000000000000..0ee897d968908
--- /dev/null
+++ b/extmod/font_petme128_8x8.h
@@ -0,0 +1,128 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013, 2014 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+#ifndef MICROPY_INCLUDED_STM32_FONT_PETME128_8X8_H
+#define MICROPY_INCLUDED_STM32_FONT_PETME128_8X8_H
+
+static const uint8_t font_petme128_8x8[] = {
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 32=
+    0x00, 0x00, 0x00, 0x4f, 0x4f, 0x00, 0x00, 0x00, // 33=!
+    0x00, 0x07, 0x07, 0x00, 0x00, 0x07, 0x07, 0x00, // 34="
+    0x14, 0x7f, 0x7f, 0x14, 0x14, 0x7f, 0x7f, 0x14, // 35=#
+    0x00, 0x24, 0x2e, 0x6b, 0x6b, 0x3a, 0x12, 0x00, // 36=$
+    0x00, 0x63, 0x33, 0x18, 0x0c, 0x66, 0x63, 0x00, // 37=%
+    0x00, 0x32, 0x7f, 0x4d, 0x4d, 0x77, 0x72, 0x50, // 38=&
+    0x00, 0x00, 0x00, 0x04, 0x06, 0x03, 0x01, 0x00, // 39='
+    0x00, 0x00, 0x1c, 0x3e, 0x63, 0x41, 0x00, 0x00, // 40=(
+    0x00, 0x00, 0x41, 0x63, 0x3e, 0x1c, 0x00, 0x00, // 41=)
+    0x08, 0x2a, 0x3e, 0x1c, 0x1c, 0x3e, 0x2a, 0x08, // 42=*
+    0x00, 0x08, 0x08, 0x3e, 0x3e, 0x08, 0x08, 0x00, // 43=+
+    0x00, 0x00, 0x80, 0xe0, 0x60, 0x00, 0x00, 0x00, // 44=,
+    0x00, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x00, // 45=-
+    0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, // 46=.
+    0x00, 0x40, 0x60, 0x30, 0x18, 0x0c, 0x06, 0x02, // 47=/
+    0x00, 0x3e, 0x7f, 0x49, 0x45, 0x7f, 0x3e, 0x00, // 48=0
+    0x00, 0x40, 0x44, 0x7f, 0x7f, 0x40, 0x40, 0x00, // 49=1
+    0x00, 0x62, 0x73, 0x51, 0x49, 0x4f, 0x46, 0x00, // 50=2
+    0x00, 0x22, 0x63, 0x49, 0x49, 0x7f, 0x36, 0x00, // 51=3
+    0x00, 0x18, 0x18, 0x14, 0x16, 0x7f, 0x7f, 0x10, // 52=4
+    0x00, 0x27, 0x67, 0x45, 0x45, 0x7d, 0x39, 0x00, // 53=5
+    0x00, 0x3e, 0x7f, 0x49, 0x49, 0x7b, 0x32, 0x00, // 54=6
+    0x00, 0x03, 0x03, 0x79, 0x7d, 0x07, 0x03, 0x00, // 55=7
+    0x00, 0x36, 0x7f, 0x49, 0x49, 0x7f, 0x36, 0x00, // 56=8
+    0x00, 0x26, 0x6f, 0x49, 0x49, 0x7f, 0x3e, 0x00, // 57=9
+    0x00, 0x00, 0x00, 0x24, 0x24, 0x00, 0x00, 0x00, // 58=:
+    0x00, 0x00, 0x80, 0xe4, 0x64, 0x00, 0x00, 0x00, // 59=;
+    0x00, 0x08, 0x1c, 0x36, 0x63, 0x41, 0x41, 0x00, // 60=<
+    0x00, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x00, // 61==
+    0x00, 0x41, 0x41, 0x63, 0x36, 0x1c, 0x08, 0x00, // 62=>
+    0x00, 0x02, 0x03, 0x51, 0x59, 0x0f, 0x06, 0x00, // 63=?
+    0x00, 0x3e, 0x7f, 0x41, 0x4d, 0x4f, 0x2e, 0x00, // 64=@
+    0x00, 0x7c, 0x7e, 0x0b, 0x0b, 0x7e, 0x7c, 0x00, // 65=A
+    0x00, 0x7f, 0x7f, 0x49, 0x49, 0x7f, 0x36, 0x00, // 66=B
+    0x00, 0x3e, 0x7f, 0x41, 0x41, 0x63, 0x22, 0x00, // 67=C
+    0x00, 0x7f, 0x7f, 0x41, 0x63, 0x3e, 0x1c, 0x00, // 68=D
+    0x00, 0x7f, 0x7f, 0x49, 0x49, 0x41, 0x41, 0x00, // 69=E
+    0x00, 0x7f, 0x7f, 0x09, 0x09, 0x01, 0x01, 0x00, // 70=F
+    0x00, 0x3e, 0x7f, 0x41, 0x49, 0x7b, 0x3a, 0x00, // 71=G
+    0x00, 0x7f, 0x7f, 0x08, 0x08, 0x7f, 0x7f, 0x00, // 72=H
+    0x00, 0x00, 0x41, 0x7f, 0x7f, 0x41, 0x00, 0x00, // 73=I
+    0x00, 0x20, 0x60, 0x41, 0x7f, 0x3f, 0x01, 0x00, // 74=J
+    0x00, 0x7f, 0x7f, 0x1c, 0x36, 0x63, 0x41, 0x00, // 75=K
+    0x00, 0x7f, 0x7f, 0x40, 0x40, 0x40, 0x40, 0x00, // 76=L
+    0x00, 0x7f, 0x7f, 0x06, 0x0c, 0x06, 0x7f, 0x7f, // 77=M
+    0x00, 0x7f, 0x7f, 0x0e, 0x1c, 0x7f, 0x7f, 0x00, // 78=N
+    0x00, 0x3e, 0x7f, 0x41, 0x41, 0x7f, 0x3e, 0x00, // 79=O
+    0x00, 0x7f, 0x7f, 0x09, 0x09, 0x0f, 0x06, 0x00, // 80=P
+    0x00, 0x1e, 0x3f, 0x21, 0x61, 0x7f, 0x5e, 0x00, // 81=Q
+    0x00, 0x7f, 0x7f, 0x19, 0x39, 0x6f, 0x46, 0x00, // 82=R
+    0x00, 0x26, 0x6f, 0x49, 0x49, 0x7b, 0x32, 0x00, // 83=S
+    0x00, 0x01, 0x01, 0x7f, 0x7f, 0x01, 0x01, 0x00, // 84=T
+    0x00, 0x3f, 0x7f, 0x40, 0x40, 0x7f, 0x3f, 0x00, // 85=U
+    0x00, 0x1f, 0x3f, 0x60, 0x60, 0x3f, 0x1f, 0x00, // 86=V
+    0x00, 0x7f, 0x7f, 0x30, 0x18, 0x30, 0x7f, 0x7f, // 87=W
+    0x00, 0x63, 0x77, 0x1c, 0x1c, 0x77, 0x63, 0x00, // 88=X
+    0x00, 0x07, 0x0f, 0x78, 0x78, 0x0f, 0x07, 0x00, // 89=Y
+    0x00, 0x61, 0x71, 0x59, 0x4d, 0x47, 0x43, 0x00, // 90=Z
+    0x00, 0x00, 0x7f, 0x7f, 0x41, 0x41, 0x00, 0x00, // 91=[
+    0x00, 0x02, 0x06, 0x0c, 0x18, 0x30, 0x60, 0x40, // 92='\'
+    0x00, 0x00, 0x41, 0x41, 0x7f, 0x7f, 0x00, 0x00, // 93=]
+    0x00, 0x08, 0x0c, 0x06, 0x06, 0x0c, 0x08, 0x00, // 94=^
+    0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, // 95=_
+    0x00, 0x00, 0x01, 0x03, 0x06, 0x04, 0x00, 0x00, // 96=`
+    0x00, 0x20, 0x74, 0x54, 0x54, 0x7c, 0x78, 0x00, // 97=a
+    0x00, 0x7f, 0x7f, 0x44, 0x44, 0x7c, 0x38, 0x00, // 98=b
+    0x00, 0x38, 0x7c, 0x44, 0x44, 0x6c, 0x28, 0x00, // 99=c
+    0x00, 0x38, 0x7c, 0x44, 0x44, 0x7f, 0x7f, 0x00, // 100=d
+    0x00, 0x38, 0x7c, 0x54, 0x54, 0x5c, 0x58, 0x00, // 101=e
+    0x00, 0x08, 0x7e, 0x7f, 0x09, 0x03, 0x02, 0x00, // 102=f
+    0x00, 0x98, 0xbc, 0xa4, 0xa4, 0xfc, 0x7c, 0x00, // 103=g
+    0x00, 0x7f, 0x7f, 0x04, 0x04, 0x7c, 0x78, 0x00, // 104=h
+    0x00, 0x00, 0x00, 0x7d, 0x7d, 0x00, 0x00, 0x00, // 105=i
+    0x00, 0x40, 0xc0, 0x80, 0x80, 0xfd, 0x7d, 0x00, // 106=j
+    0x00, 0x7f, 0x7f, 0x30, 0x38, 0x6c, 0x44, 0x00, // 107=k
+    0x00, 0x00, 0x41, 0x7f, 0x7f, 0x40, 0x00, 0x00, // 108=l
+    0x00, 0x7c, 0x7c, 0x18, 0x30, 0x18, 0x7c, 0x7c, // 109=m
+    0x00, 0x7c, 0x7c, 0x04, 0x04, 0x7c, 0x78, 0x00, // 110=n
+    0x00, 0x38, 0x7c, 0x44, 0x44, 0x7c, 0x38, 0x00, // 111=o
+    0x00, 0xfc, 0xfc, 0x24, 0x24, 0x3c, 0x18, 0x00, // 112=p
+    0x00, 0x18, 0x3c, 0x24, 0x24, 0xfc, 0xfc, 0x00, // 113=q
+    0x00, 0x7c, 0x7c, 0x04, 0x04, 0x0c, 0x08, 0x00, // 114=r
+    0x00, 0x48, 0x5c, 0x54, 0x54, 0x74, 0x20, 0x00, // 115=s
+    0x04, 0x04, 0x3f, 0x7f, 0x44, 0x64, 0x20, 0x00, // 116=t
+    0x00, 0x3c, 0x7c, 0x40, 0x40, 0x7c, 0x3c, 0x00, // 117=u
+    0x00, 0x1c, 0x3c, 0x60, 0x60, 0x3c, 0x1c, 0x00, // 118=v
+    0x00, 0x1c, 0x7c, 0x30, 0x18, 0x30, 0x7c, 0x1c, // 119=w
+    0x00, 0x44, 0x6c, 0x38, 0x38, 0x6c, 0x44, 0x00, // 120=x
+    0x00, 0x9c, 0xbc, 0xa0, 0xa0, 0xfc, 0x7c, 0x00, // 121=y
+    0x00, 0x44, 0x64, 0x74, 0x5c, 0x4c, 0x44, 0x00, // 122=z
+    0x00, 0x08, 0x08, 0x3e, 0x77, 0x41, 0x41, 0x00, // 123={
+    0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, // 124=|
+    0x00, 0x41, 0x41, 0x77, 0x3e, 0x08, 0x08, 0x00, // 125=}
+    0x00, 0x02, 0x03, 0x01, 0x03, 0x02, 0x03, 0x01, // 126=~
+    0xaa, 0x55, 0xaa, 0x55, 0xaa, 0x55, 0xaa, 0x55, // 127
+};
+
+#endif // MICROPY_INCLUDED_STM32_FONT_PETME128_8X8_H
diff --git a/extmod/modframebuf.c b/extmod/modframebuf.c
index 27e9c36254bd6..fb231362e6efe 100644
--- a/extmod/modframebuf.c
+++ b/extmod/modframebuf.c
@@ -31,7 +31,7 @@
 
 #if MICROPY_PY_FRAMEBUF
 
-#include "ports/stm32/font_petme128_8x8.h"
+#include "extmod/font_petme128_8x8.h"
 
 typedef struct _mp_obj_framebuf_t {
     mp_obj_base_t base;
diff --git a/ports/stm32/font_petme128_8x8.h b/ports/stm32/font_petme128_8x8.h
deleted file mode 100644
index 9963698b17519..0000000000000
--- a/ports/stm32/font_petme128_8x8.h
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2013, 2014 Damien P. George
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-#ifndef MICROPY_INCLUDED_STM32_FONT_PETME128_8X8_H
-#define MICROPY_INCLUDED_STM32_FONT_PETME128_8X8_H
-
-static const uint8_t font_petme128_8x8[] = {
-    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, // 32=
-    0x00,0x00,0x00,0x4f,0x4f,0x00,0x00,0x00, // 33=!
-    0x00,0x07,0x07,0x00,0x00,0x07,0x07,0x00, // 34="
-    0x14,0x7f,0x7f,0x14,0x14,0x7f,0x7f,0x14, // 35=#
-    0x00,0x24,0x2e,0x6b,0x6b,0x3a,0x12,0x00, // 36=$
-    0x00,0x63,0x33,0x18,0x0c,0x66,0x63,0x00, // 37=%
-    0x00,0x32,0x7f,0x4d,0x4d,0x77,0x72,0x50, // 38=&
-    0x00,0x00,0x00,0x04,0x06,0x03,0x01,0x00, // 39='
-    0x00,0x00,0x1c,0x3e,0x63,0x41,0x00,0x00, // 40=(
-    0x00,0x00,0x41,0x63,0x3e,0x1c,0x00,0x00, // 41=)
-    0x08,0x2a,0x3e,0x1c,0x1c,0x3e,0x2a,0x08, // 42=*
-    0x00,0x08,0x08,0x3e,0x3e,0x08,0x08,0x00, // 43=+
-    0x00,0x00,0x80,0xe0,0x60,0x00,0x00,0x00, // 44=,
-    0x00,0x08,0x08,0x08,0x08,0x08,0x08,0x00, // 45=-
-    0x00,0x00,0x00,0x60,0x60,0x00,0x00,0x00, // 46=.
-    0x00,0x40,0x60,0x30,0x18,0x0c,0x06,0x02, // 47=/
-    0x00,0x3e,0x7f,0x49,0x45,0x7f,0x3e,0x00, // 48=0
-    0x00,0x40,0x44,0x7f,0x7f,0x40,0x40,0x00, // 49=1
-    0x00,0x62,0x73,0x51,0x49,0x4f,0x46,0x00, // 50=2
-    0x00,0x22,0x63,0x49,0x49,0x7f,0x36,0x00, // 51=3
-    0x00,0x18,0x18,0x14,0x16,0x7f,0x7f,0x10, // 52=4
-    0x00,0x27,0x67,0x45,0x45,0x7d,0x39,0x00, // 53=5
-    0x00,0x3e,0x7f,0x49,0x49,0x7b,0x32,0x00, // 54=6
-    0x00,0x03,0x03,0x79,0x7d,0x07,0x03,0x00, // 55=7
-    0x00,0x36,0x7f,0x49,0x49,0x7f,0x36,0x00, // 56=8
-    0x00,0x26,0x6f,0x49,0x49,0x7f,0x3e,0x00, // 57=9
-    0x00,0x00,0x00,0x24,0x24,0x00,0x00,0x00, // 58=:
-    0x00,0x00,0x80,0xe4,0x64,0x00,0x00,0x00, // 59=;
-    0x00,0x08,0x1c,0x36,0x63,0x41,0x41,0x00, // 60=<
-    0x00,0x14,0x14,0x14,0x14,0x14,0x14,0x00, // 61==
-    0x00,0x41,0x41,0x63,0x36,0x1c,0x08,0x00, // 62=>
-    0x00,0x02,0x03,0x51,0x59,0x0f,0x06,0x00, // 63=?
-    0x00,0x3e,0x7f,0x41,0x4d,0x4f,0x2e,0x00, // 64=@
-    0x00,0x7c,0x7e,0x0b,0x0b,0x7e,0x7c,0x00, // 65=A
-    0x00,0x7f,0x7f,0x49,0x49,0x7f,0x36,0x00, // 66=B
-    0x00,0x3e,0x7f,0x41,0x41,0x63,0x22,0x00, // 67=C
-    0x00,0x7f,0x7f,0x41,0x63,0x3e,0x1c,0x00, // 68=D
-    0x00,0x7f,0x7f,0x49,0x49,0x41,0x41,0x00, // 69=E
-    0x00,0x7f,0x7f,0x09,0x09,0x01,0x01,0x00, // 70=F
-    0x00,0x3e,0x7f,0x41,0x49,0x7b,0x3a,0x00, // 71=G
-    0x00,0x7f,0x7f,0x08,0x08,0x7f,0x7f,0x00, // 72=H
-    0x00,0x00,0x41,0x7f,0x7f,0x41,0x00,0x00, // 73=I
-    0x00,0x20,0x60,0x41,0x7f,0x3f,0x01,0x00, // 74=J
-    0x00,0x7f,0x7f,0x1c,0x36,0x63,0x41,0x00, // 75=K
-    0x00,0x7f,0x7f,0x40,0x40,0x40,0x40,0x00, // 76=L
-    0x00,0x7f,0x7f,0x06,0x0c,0x06,0x7f,0x7f, // 77=M
-    0x00,0x7f,0x7f,0x0e,0x1c,0x7f,0x7f,0x00, // 78=N
-    0x00,0x3e,0x7f,0x41,0x41,0x7f,0x3e,0x00, // 79=O
-    0x00,0x7f,0x7f,0x09,0x09,0x0f,0x06,0x00, // 80=P
-    0x00,0x1e,0x3f,0x21,0x61,0x7f,0x5e,0x00, // 81=Q
-    0x00,0x7f,0x7f,0x19,0x39,0x6f,0x46,0x00, // 82=R
-    0x00,0x26,0x6f,0x49,0x49,0x7b,0x32,0x00, // 83=S
-    0x00,0x01,0x01,0x7f,0x7f,0x01,0x01,0x00, // 84=T
-    0x00,0x3f,0x7f,0x40,0x40,0x7f,0x3f,0x00, // 85=U
-    0x00,0x1f,0x3f,0x60,0x60,0x3f,0x1f,0x00, // 86=V
-    0x00,0x7f,0x7f,0x30,0x18,0x30,0x7f,0x7f, // 87=W
-    0x00,0x63,0x77,0x1c,0x1c,0x77,0x63,0x00, // 88=X
-    0x00,0x07,0x0f,0x78,0x78,0x0f,0x07,0x00, // 89=Y
-    0x00,0x61,0x71,0x59,0x4d,0x47,0x43,0x00, // 90=Z
-    0x00,0x00,0x7f,0x7f,0x41,0x41,0x00,0x00, // 91=[
-    0x00,0x02,0x06,0x0c,0x18,0x30,0x60,0x40, // 92='\'
-    0x00,0x00,0x41,0x41,0x7f,0x7f,0x00,0x00, // 93=]
-    0x00,0x08,0x0c,0x06,0x06,0x0c,0x08,0x00, // 94=^
-    0xc0,0xc0,0xc0,0xc0,0xc0,0xc0,0xc0,0xc0, // 95=_
-    0x00,0x00,0x01,0x03,0x06,0x04,0x00,0x00, // 96=`
-    0x00,0x20,0x74,0x54,0x54,0x7c,0x78,0x00, // 97=a
-    0x00,0x7f,0x7f,0x44,0x44,0x7c,0x38,0x00, // 98=b
-    0x00,0x38,0x7c,0x44,0x44,0x6c,0x28,0x00, // 99=c
-    0x00,0x38,0x7c,0x44,0x44,0x7f,0x7f,0x00, // 100=d
-    0x00,0x38,0x7c,0x54,0x54,0x5c,0x58,0x00, // 101=e
-    0x00,0x08,0x7e,0x7f,0x09,0x03,0x02,0x00, // 102=f
-    0x00,0x98,0xbc,0xa4,0xa4,0xfc,0x7c,0x00, // 103=g
-    0x00,0x7f,0x7f,0x04,0x04,0x7c,0x78,0x00, // 104=h
-    0x00,0x00,0x00,0x7d,0x7d,0x00,0x00,0x00, // 105=i
-    0x00,0x40,0xc0,0x80,0x80,0xfd,0x7d,0x00, // 106=j
-    0x00,0x7f,0x7f,0x30,0x38,0x6c,0x44,0x00, // 107=k
-    0x00,0x00,0x41,0x7f,0x7f,0x40,0x00,0x00, // 108=l
-    0x00,0x7c,0x7c,0x18,0x30,0x18,0x7c,0x7c, // 109=m
-    0x00,0x7c,0x7c,0x04,0x04,0x7c,0x78,0x00, // 110=n
-    0x00,0x38,0x7c,0x44,0x44,0x7c,0x38,0x00, // 111=o
-    0x00,0xfc,0xfc,0x24,0x24,0x3c,0x18,0x00, // 112=p
-    0x00,0x18,0x3c,0x24,0x24,0xfc,0xfc,0x00, // 113=q
-    0x00,0x7c,0x7c,0x04,0x04,0x0c,0x08,0x00, // 114=r
-    0x00,0x48,0x5c,0x54,0x54,0x74,0x20,0x00, // 115=s
-    0x04,0x04,0x3f,0x7f,0x44,0x64,0x20,0x00, // 116=t
-    0x00,0x3c,0x7c,0x40,0x40,0x7c,0x3c,0x00, // 117=u
-    0x00,0x1c,0x3c,0x60,0x60,0x3c,0x1c,0x00, // 118=v
-    0x00,0x1c,0x7c,0x30,0x18,0x30,0x7c,0x1c, // 119=w
-    0x00,0x44,0x6c,0x38,0x38,0x6c,0x44,0x00, // 120=x
-    0x00,0x9c,0xbc,0xa0,0xa0,0xfc,0x7c,0x00, // 121=y
-    0x00,0x44,0x64,0x74,0x5c,0x4c,0x44,0x00, // 122=z
-    0x00,0x08,0x08,0x3e,0x77,0x41,0x41,0x00, // 123={
-    0x00,0x00,0x00,0xff,0xff,0x00,0x00,0x00, // 124=|
-    0x00,0x41,0x41,0x77,0x3e,0x08,0x08,0x00, // 125=}
-    0x00,0x02,0x03,0x01,0x03,0x02,0x03,0x01, // 126=~
-    0xaa,0x55,0xaa,0x55,0xaa,0x55,0xaa,0x55, // 127
-};
-
-#endif // MICROPY_INCLUDED_STM32_FONT_PETME128_8X8_H
diff --git a/ports/stm32/lcd.c b/ports/stm32/lcd.c
index de967c5f971aa..a0e001d1fdad2 100644
--- a/ports/stm32/lcd.c
+++ b/ports/stm32/lcd.c
@@ -32,10 +32,10 @@
 
 #if MICROPY_HW_HAS_LCD
 
+#include "extmod/font_petme128_8x8.h"
 #include "pin.h"
 #include "bufhelper.h"
 #include "spi.h"
-#include "font_petme128_8x8.h"
 #include "lcd.h"
 
 /// \moduleref pyb

From aec8db3cd120e897e7937d21c724393205d572cf Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 5 May 2022 13:26:34 +1000
Subject: [PATCH 1999/3533] tools/uncrustify: Make sure a space exists after a
 comma.

This will add a space after a comma if it doesn't have one, but will allow
more than one space if the spaces are already there.

Signed-off-by: Damien George <damien@micropython.org>
---
 tools/uncrustify.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/uncrustify.cfg b/tools/uncrustify.cfg
index 88127112e81b4..221fb458e9132 100644
--- a/tools/uncrustify.cfg
+++ b/tools/uncrustify.cfg
@@ -372,7 +372,7 @@ sp_inside_square                = ignore   # ignore/add/remove/force
 sp_inside_square_oc_array       = ignore   # ignore/add/remove/force
 
 # Add or remove space after ',', i.e. 'a,b' vs. 'a, b'.
-sp_after_comma                  = ignore   # ignore/add/remove/force
+sp_after_comma                  = add      # ignore/add/remove/force
 
 # Add or remove space before ','.
 #

From 5b700b0af90591d6b1a2c087bb8de6b7f1bfdd2d Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 5 May 2022 13:28:32 +1000
Subject: [PATCH 2000/3533] all: Reformat remaining C code that doesn't have a
 space after a comma.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp8266/esppwm.c                      | 30 ++++++++++-----------
 ports/esp8266/hspi.h                        |  2 +-
 ports/samd/samd_flash.c                     |  8 +++---
 ports/stm32/boards/NUCLEO_WB55/mboot_keys.h |  4 +--
 ports/stm32/pyb_i2c.c                       |  2 +-
 ports/stm32/ulpi.c                          |  2 +-
 ports/stm32/usbd_msc_interface.c            |  2 +-
 ports/unix/modtime.c                        |  2 +-
 ports/unix/modusocket.c                     |  2 +-
 py/nlr.h                                    |  2 +-
 10 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/ports/esp8266/esppwm.c b/ports/esp8266/esppwm.c
index d5bcea9acd8cc..6164e2fc8b111 100644
--- a/ports/esp8266/esppwm.c
+++ b/ports/esp8266/esppwm.c
@@ -121,9 +121,9 @@ void ICACHE_FLASH_ATTR
 pwm_start(void) {
     uint8 i, j;
     PWM_DBG("--Function pwm_start() is called\n");
-    PWM_DBG("pwm_gpio:%x,pwm_channel_num:%d\n",pwm_gpio,pwm_channel_num);
-    PWM_DBG("pwm_out_io_num[0]:%d,[1]:%d,[2]:%d\n",pwm_out_io_num[0],pwm_out_io_num[1],pwm_out_io_num[2]);
-    PWM_DBG("pwm.period:%d,pwm.duty[0]:%d,[1]:%d,[2]:%d\n",pwm.period,pwm.duty[0],pwm.duty[1],pwm.duty[2]);
+    PWM_DBG("pwm_gpio:%x,pwm_channel_num:%d\n", pwm_gpio, pwm_channel_num);
+    PWM_DBG("pwm_out_io_num[0]:%d,[1]:%d,[2]:%d\n", pwm_out_io_num[0], pwm_out_io_num[1], pwm_out_io_num[2]);
+    PWM_DBG("pwm.period:%d,pwm.duty[0]:%d,[1]:%d,[2]:%d\n", pwm.period, pwm.duty[0], pwm.duty[1], pwm.duty[2]);
 
     LOCK_PWM(critical);   // enter critical
 
@@ -137,7 +137,7 @@ pwm_start(void) {
     for (i = 0; i < pwm_channel_num; i++) {
         uint32 us = pwm.period * pwm.duty[i] / PWM_DEPTH;
         local_single[i].h_time = US_TO_RTC_TIMER_TICKS(us);
-        PWM_DBG("i:%d us:%d ht:%d\n",i,us,local_single[i].h_time);
+        PWM_DBG("i:%d us:%d ht:%d\n", i, us, local_single[i].h_time);
         local_single[i].gpio_set = 0;
         local_single[i].gpio_clear = 1 << pin_num[pwm_out_io_num[i]];
     }
@@ -145,12 +145,12 @@ pwm_start(void) {
     local_single[pwm_channel_num].h_time = US_TO_RTC_TIMER_TICKS(pwm.period);
     local_single[pwm_channel_num].gpio_set = pwm_gpio;
     local_single[pwm_channel_num].gpio_clear = 0;
-    PWM_DBG("i:%d period:%d ht:%d\n",pwm_channel_num,pwm.period,local_single[pwm_channel_num].h_time);
+    PWM_DBG("i:%d period:%d ht:%d\n", pwm_channel_num, pwm.period, local_single[pwm_channel_num].h_time);
     // step 2: sort, small to big
     pwm_insert_sort(local_single, pwm_channel_num + 1);
 
     *local_channel = pwm_channel_num + 1;
-    PWM_DBG("1channel:%d,single[0]:%d,[1]:%d,[2]:%d,[3]:%d\n",*local_channel,local_single[0].h_time,local_single[1].h_time,local_single[2].h_time,local_single[3].h_time);
+    PWM_DBG("1channel:%d,single[0]:%d,[1]:%d,[2]:%d,[3]:%d\n", *local_channel, local_single[0].h_time, local_single[1].h_time, local_single[2].h_time, local_single[3].h_time);
     // step 3: combine same duty channels
     for (i = pwm_channel_num; i > 0; i--) {
         if (local_single[i].h_time == local_single[i - 1].h_time) {
@@ -164,7 +164,7 @@ pwm_start(void) {
             (*local_channel)--;
         }
     }
-    PWM_DBG("2channel:%d,single[0]:%d,[1]:%d,[2]:%d,[3]:%d\n",*local_channel,local_single[0].h_time,local_single[1].h_time,local_single[2].h_time,local_single[3].h_time);
+    PWM_DBG("2channel:%d,single[0]:%d,[1]:%d,[2]:%d,[3]:%d\n", *local_channel, local_single[0].h_time, local_single[1].h_time, local_single[2].h_time, local_single[3].h_time);
     // step 4: cacl delt time
     for (i = *local_channel - 1; i > 0; i--) {
         local_single[i].h_time -= local_single[i - 1].h_time;
@@ -203,7 +203,7 @@ pwm_start(void) {
     }
 
     UNLOCK_PWM(critical);   // leave critical
-    PWM_DBG("3channel:%d,single[0]:%d,[1]:%d,[2]:%d,[3]:%d\n",*local_channel,local_single[0].h_time,local_single[1].h_time,local_single[2].h_time,local_single[3].h_time);
+    PWM_DBG("3channel:%d,single[0]:%d,[1]:%d,[2]:%d,[3]:%d\n", *local_channel, local_single[0].h_time, local_single[1].h_time, local_single[2].h_time, local_single[3].h_time);
 }
 
 /******************************************************************************
@@ -365,9 +365,9 @@ pwm_init(void) {
 int ICACHE_FLASH_ATTR
 pwm_add(uint8_t pin_id, uint32_t pin_mux, uint32_t pin_func) {
     PWM_DBG("--Function pwm_add() is called. channel:%d\n", channel);
-    PWM_DBG("pwm_gpio:%x,pwm_channel_num:%d\n",pwm_gpio,pwm_channel_num);
-    PWM_DBG("pwm_out_io_num[0]:%d,[1]:%d,[2]:%d\n",pwm_out_io_num[0],pwm_out_io_num[1],pwm_out_io_num[2]);
-    PWM_DBG("pwm.duty[0]:%d,[1]:%d,[2]:%d\n",pwm.duty[0],pwm.duty[1],pwm.duty[2]);
+    PWM_DBG("pwm_gpio:%x,pwm_channel_num:%d\n", pwm_gpio, pwm_channel_num);
+    PWM_DBG("pwm_out_io_num[0]:%d,[1]:%d,[2]:%d\n", pwm_out_io_num[0], pwm_out_io_num[1], pwm_out_io_num[2]);
+    PWM_DBG("pwm.duty[0]:%d,[1]:%d,[2]:%d\n", pwm.duty[0], pwm.duty[1], pwm.duty[2]);
     int channel = -1;
     for (int i = 0; i < PWM_CHANNEL; ++i) {
         if (pin_num[i] == pin_id) {
@@ -401,10 +401,10 @@ pwm_add(uint8_t pin_id, uint32_t pin_mux, uint32_t pin_func) {
 bool ICACHE_FLASH_ATTR
 pwm_delete(uint8 channel) {
     PWM_DBG("--Function pwm_delete() is called. channel:%d\n", channel);
-    PWM_DBG("pwm_gpio:%x,pwm_channel_num:%d\n",pwm_gpio,pwm_channel_num);
-    PWM_DBG("pwm_out_io_num[0]:%d,[1]:%d,[2]:%d\n",pwm_out_io_num[0],pwm_out_io_num[1],pwm_out_io_num[2]);
-    PWM_DBG("pwm.duty[0]:%d,[1]:%d,[2]:%d\n",pwm.duty[0],pwm.duty[1],pwm.duty[2]);
-    uint8 i,j;
+    PWM_DBG("pwm_gpio:%x,pwm_channel_num:%d\n", pwm_gpio, pwm_channel_num);
+    PWM_DBG("pwm_out_io_num[0]:%d,[1]:%d,[2]:%d\n", pwm_out_io_num[0], pwm_out_io_num[1], pwm_out_io_num[2]);
+    PWM_DBG("pwm.duty[0]:%d,[1]:%d,[2]:%d\n", pwm.duty[0], pwm.duty[1], pwm.duty[2]);
+    uint8 i, j;
     for (i = 0; i < pwm_channel_num; i++) {
         if (pwm_out_io_num[i] == channel) { // exist
             LOCK_PWM(critical);   // enter critical
diff --git a/ports/esp8266/hspi.h b/ports/esp8266/hspi.h
index f92a13994d522..0f8d788da06dd 100644
--- a/ports/esp8266/hspi.h
+++ b/ports/esp8266/hspi.h
@@ -52,7 +52,7 @@
 // 80 / 20 = 4 MHz
 
 void spi_init(uint8_t spi_no);
-void spi_mode(uint8_t spi_no, uint8_t spi_cpha,uint8_t spi_cpol);
+void spi_mode(uint8_t spi_no, uint8_t spi_cpha, uint8_t spi_cpol);
 void spi_init_gpio(uint8_t spi_no, uint8_t sysclk_as_spiclk);
 void spi_clock(uint8_t spi_no, uint16_t prediv, uint8_t cntdiv);
 void spi_tx_byte_order(uint8_t spi_no, uint8_t byte_order);
diff --git a/ports/samd/samd_flash.c b/ports/samd/samd_flash.c
index 3bccf5577e2c8..530e3d9c8e5b8 100644
--- a/ports/samd/samd_flash.c
+++ b/ports/samd/samd_flash.c
@@ -63,7 +63,7 @@ STATIC samd_flash_obj_t samd_flash_obj = {
 // FLASH stuff
 STATIC mp_obj_t samd_flash_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
     // No args required. bdev=Flash(). Start Addr & Size defined in samd_flash_obj.
-    mp_arg_check_num(n_args, n_kw, 0,0, false);
+    mp_arg_check_num(n_args, n_kw, 0, 0, false);
 
     // Return singleton object.
     return MP_OBJ_FROM_PTR(&samd_flash_obj);
@@ -90,7 +90,7 @@ STATIC mp_obj_t eraseblock(uint32_t sector_in) {
     uint32_t DEST_ADDR = sector_in; // Number of pages to be erased.
     mp_int_t PAGE_SIZE = flash_get_page_size(&flash_desc); // adf4 API call
 
-    flash_erase(&flash_desc,DEST_ADDR,(BLOCK_SIZE / PAGE_SIZE));
+    flash_erase(&flash_desc, DEST_ADDR, (BLOCK_SIZE / PAGE_SIZE));
 
     return mp_const_none;
 }
@@ -121,7 +121,7 @@ STATIC mp_obj_t samd_flash_readblocks(size_t n_args, const mp_obj_t *args) {
     }
 
     // Read data to flash (adf4 API)
-    flash_read(&flash_desc,offset,bufinfo.buf,bufinfo.len);
+    flash_read(&flash_desc, offset, bufinfo.buf, bufinfo.len);
 
     return mp_const_none;
 }
@@ -138,7 +138,7 @@ STATIC mp_obj_t samd_flash_writeblocks(size_t n_args, const mp_obj_t *args) {
         offset += mp_obj_get_int(args[3]);
     }
     // Write data to flash (adf4 API)
-    flash_write(&flash_desc,offset, bufinfo.buf, bufinfo.len);
+    flash_write(&flash_desc, offset, bufinfo.buf, bufinfo.len);
     // TODO check return value
     return mp_const_none;
 }
diff --git a/ports/stm32/boards/NUCLEO_WB55/mboot_keys.h b/ports/stm32/boards/NUCLEO_WB55/mboot_keys.h
index 65952b849a73d..a8e022bdde136 100644
--- a/ports/stm32/boards/NUCLEO_WB55/mboot_keys.h
+++ b/ports/stm32/boards/NUCLEO_WB55/mboot_keys.h
@@ -1,5 +1,5 @@
 // const uint8_t mboot_pack_sign_secret_key[] = {0xf1,0xd8,0x66,0x08,0xbc,0x78,0x39,0x65,0x6a,0xf4,0x88,0xf4,0x43,0x4d,0x10,0xfe,0x4f,0x79,0xb9,0xc3,0x77,0x36,0x23,0xc8,0xcf,0x62,0xa1,0x90,0xf1,0xdc,0xd9,0xbc,0xb2,0x2e,0x59,0x1e,0x53,0x04,0x54,0xd5,0xd1,0x3a,0x6d,0x2e,0x79,0x3e,0xb5,0x70,0xb4,0x9f,0x33,0xff,0x90,0x1d,0xc3,0x54,0x90,0x12,0x96,0x79,0xf4,0xed,0x56,0x75};
-const uint8_t mboot_pack_sign_public_key[] = {0xb2,0x2e,0x59,0x1e,0x53,0x04,0x54,0xd5,0xd1,0x3a,0x6d,0x2e,0x79,0x3e,0xb5,0x70,0xb4,0x9f,0x33,0xff,0x90,0x1d,0xc3,0x54,0x90,0x12,0x96,0x79,0xf4,0xed,0x56,0x75};
-const uint8_t mboot_pack_secretbox_key[] = {0x4a,0xbe,0x9b,0xed,0x55,0x9f,0x74,0xeb,0x1e,0x70,0xde,0xf5,0x19,0x0a,0xeb,0xa5,0x68,0xea,0xb0,0x88,0xe6,0xfe,0x4d,0x10,0x69,0x23,0x06,0x7f,0xdd,0x83,0xf0,0xbf};
+const uint8_t mboot_pack_sign_public_key[] = {0xb2, 0x2e, 0x59, 0x1e, 0x53, 0x04, 0x54, 0xd5, 0xd1, 0x3a, 0x6d, 0x2e, 0x79, 0x3e, 0xb5, 0x70, 0xb4, 0x9f, 0x33, 0xff, 0x90, 0x1d, 0xc3, 0x54, 0x90, 0x12, 0x96, 0x79, 0xf4, 0xed, 0x56, 0x75};
+const uint8_t mboot_pack_secretbox_key[] = {0x4a, 0xbe, 0x9b, 0xed, 0x55, 0x9f, 0x74, 0xeb, 0x1e, 0x70, 0xde, 0xf5, 0x19, 0x0a, 0xeb, 0xa5, 0x68, 0xea, 0xb0, 0x88, 0xe6, 0xfe, 0x4d, 0x10, 0x69, 0x23, 0x06, 0x7f, 0xdd, 0x83, 0xf0, 0xbf};
 
 // The above keys are for demonstration purposes only, do not use them in production!
diff --git a/ports/stm32/pyb_i2c.c b/ports/stm32/pyb_i2c.c
index 9dfa276561147..2ca0793c189e6 100644
--- a/ports/stm32/pyb_i2c.c
+++ b/ports/stm32/pyb_i2c.c
@@ -541,7 +541,7 @@ void i2c_er_irq_handler(mp_uint_t i2c_id) {
     // I2C Acknowledge failure
     if (sr1 & I2C_FLAG_AF) {
         hi2c->ErrorCode |= HAL_I2C_ERROR_AF;
-        SET_BIT(hi2c->Instance->CR1,I2C_CR1_STOP);
+        SET_BIT(hi2c->Instance->CR1, I2C_CR1_STOP);
         __HAL_I2C_CLEAR_FLAG(hi2c, I2C_FLAG_AF);
     }
 
diff --git a/ports/stm32/ulpi.c b/ports/stm32/ulpi.c
index 0493279c1d048..4e961f93e4033 100644
--- a/ports/stm32/ulpi.c
+++ b/ports/stm32/ulpi.c
@@ -31,7 +31,7 @@
 #define USBULPI_TIMEOUT_COUNT   (100)
 
 #define USB_OTG_READ_REG32(reg)  (*(__IO uint32_t *)(reg))
-#define USB_OTG_WRITE_REG32(reg,value) (*(__IO uint32_t *)(reg) = (value))
+#define USB_OTG_WRITE_REG32(reg, value) (*(__IO uint32_t *)(reg) = (value))
 
 /**
   * @brief  Read CR value
diff --git a/ports/stm32/usbd_msc_interface.c b/ports/stm32/usbd_msc_interface.c
index 62fe32bf5a0bb..cb1de96841553 100644
--- a/ports/stm32/usbd_msc_interface.c
+++ b/ports/stm32/usbd_msc_interface.c
@@ -102,7 +102,7 @@ STATIC const int8_t usbd_msc_inquiry_data[36] = {
     'M', 'i', 'c', 'r', 'o', 'P', 'y', ' ', // Manufacturer : 8 bytes
     'p', 'y', 'b', 'o', 'a', 'r', 'd', ' ', // Product      : 16 Bytes
     'F', 'l', 'a', 's', 'h', ' ', ' ', ' ',
-    '1', '.', '0','0',                      // Version      : 4 Bytes
+    '1', '.', '0', '0',                     // Version      : 4 Bytes
 };
 
 // Set the logical units that will be exposed over MSC
diff --git a/ports/unix/modtime.c b/ports/unix/modtime.c
index 91c0a19413092..71257c15ff49a 100644
--- a/ports/unix/modtime.c
+++ b/ports/unix/modtime.c
@@ -45,7 +45,7 @@ static inline int msec_sleep_tv(struct timeval *tv) {
     msec_sleep(tv->tv_sec * 1000.0 + tv->tv_usec / 1000.0);
     return 0;
 }
-#define sleep_select(a,b,c,d,e) msec_sleep_tv((e))
+#define sleep_select(a, b, c, d, e) msec_sleep_tv((e))
 #else
 #define sleep_select select
 #endif
diff --git a/ports/unix/modusocket.c b/ports/unix/modusocket.c
index adf043dc22b96..5edff740f2acc 100644
--- a/ports/unix/modusocket.c
+++ b/ports/unix/modusocket.c
@@ -402,7 +402,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(socket_setblocking_obj, socket_setblocking);
 
 STATIC mp_obj_t socket_settimeout(mp_obj_t self_in, mp_obj_t timeout_in) {
     mp_obj_socket_t *self = MP_OBJ_TO_PTR(self_in);
-    struct timeval tv = {0,};
+    struct timeval tv = {0, };
     bool new_blocking = true;
 
     // Timeout of None means no timeout, which in POSIX is signified with 0 timeout,
diff --git a/py/nlr.h b/py/nlr.h
index 9f12ede9cd3ac..dade10771eec5 100644
--- a/py/nlr.h
+++ b/py/nlr.h
@@ -167,7 +167,7 @@ NORETURN void nlr_jump_fail(void *val);
 
 #if !MICROPY_NLR_SETJMP
 #define nlr_push(val) \
-    assert(MP_STATE_THREAD(nlr_top) != val),nlr_push(val)
+    assert(MP_STATE_THREAD(nlr_top) != val), nlr_push(val)
 
 /*
 #define nlr_push(val) \

From 1e72580fd8236b4b1d5a9139ca1d8ce27f74983e Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 5 May 2022 13:30:27 +1000
Subject: [PATCH 2001/3533] top: Update .git-blame-ignore-revs for latest
 formatting commit.

Signed-off-by: Damien George <damien@micropython.org>
---
 .git-blame-ignore-revs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index 648cdc3bc4065..0ffa4fcfd952a 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -1,3 +1,6 @@
+#all: Reformat remaining C code that doesn't have a space after a comma.
+5b700b0af90591d6b1a2c087bb8de6b7f1bfdd2d
+
 # ports: Reformat more C and Python source code.
 5c32111fa0e31e451b0f1666bdf926be2fdfd82c
 

From e3c880a569aa1364d7e74b451b5cd139444eb33d Mon Sep 17 00:00:00 2001
From: Takeo Takahashi <takeo.takahashi.xv@renesas.com>
Date: Fri, 6 May 2022 17:15:21 +0900
Subject: [PATCH 2002/3533] tools/autobuild: Update for ports/renesas-ra.

* Add build_renesas_ra_boards call in autobuild.sh
* Add build_renesas_ra_boards function to generate firmware.hex.

Signed-off-by: Takeo Takahashi <takeo.takahashi.xv@renesas.com>
---
 tools/autobuild/autobuild.sh    | 2 ++
 tools/autobuild/build-boards.sh | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/tools/autobuild/autobuild.sh b/tools/autobuild/autobuild.sh
index 6ac97373f3acc..569f729d1fc74 100755
--- a/tools/autobuild/autobuild.sh
+++ b/tools/autobuild/autobuild.sh
@@ -74,6 +74,8 @@ cd ../esp32
 (source ${IDF_PATH_V44}/export.sh && build_esp32_boards ${FW_TAG} ${LOCAL_FIRMWARE})
 cd ../mimxrt
 build_mimxrt_boards ${FW_TAG} ${LOCAL_FIRMWARE}
+cd ../renesas-ra
+build_renesas_ra_boards ${FW_TAG} ${LOCAL_FIRMWARE}
 cd ../rp2
 build_rp2_boards ${FW_TAG} ${LOCAL_FIRMWARE}
 cd ../samd
diff --git a/tools/autobuild/build-boards.sh b/tools/autobuild/build-boards.sh
index c6493f8fc1684..9caadc1b07ac0 100755
--- a/tools/autobuild/build-boards.sh
+++ b/tools/autobuild/build-boards.sh
@@ -103,6 +103,10 @@ function build_mimxrt_boards {
     build_boards modmimxrt.c $1 $2 bin hex
 }
 
+function build_renesas_ra_boards {
+    build_boards ra_it.c $1 $2 hex
+}
+
 function build_rp2_boards {
     build_boards modrp2.c $1 $2 uf2
 }

From 8aa254c36970e73b7779d3873a4dc1342f091409 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 17 May 2022 09:42:39 +1000
Subject: [PATCH 2003/3533] tests: Fix tests to use sys.implementation._mpy.

The field was renamed to _mpy in 59c5d4161120db28bc6cbc7653f2e7fdb4a87370

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/basics/sys1.py                      | 4 ++--
 tests/micropython/import_mpy_native_gc.py | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/basics/sys1.py b/tests/basics/sys1.py
index 0947ea1964bf9..a609f54b63621 100644
--- a/tests/basics/sys1.py
+++ b/tests/basics/sys1.py
@@ -22,8 +22,8 @@
     # Effectively skip subtests
     print(True)
 
-if hasattr(sys.implementation, 'mpy'):
-    print(type(sys.implementation.mpy))
+if hasattr(sys.implementation, '_mpy'):
+    print(type(sys.implementation._mpy))
 else:
     # Effectively skip subtests
     print(int)
diff --git a/tests/micropython/import_mpy_native_gc.py b/tests/micropython/import_mpy_native_gc.py
index 6f37b15ab7e2f..44f59426976c4 100644
--- a/tests/micropython/import_mpy_native_gc.py
+++ b/tests/micropython/import_mpy_native_gc.py
@@ -3,7 +3,7 @@
 try:
     import gc, sys, uio, uos
 
-    sys.implementation.mpy
+    sys.implementation._mpy
     uio.IOBase
     uos.mount
 except (ImportError, AttributeError):
@@ -46,7 +46,7 @@ def open(self, path, mode):
 
 
 # Pre-compiled examples/natmod/features0 example for various architectures, keyed
-# by the required value of sys.implementation.mpy.
+# by the required value of sys.implementation._mpy.
 features0_file_contents = {
     # -march=x64
     0xA06: b'M\x06\n\x1f\x01\x004build/features0.native.mpy\x00\x8aB\xe9/\x00\x00\x00SH\x8b\x1d\x83\x00\x00\x00\xbe\x02\x00\x00\x00\xffS\x18\xbf\x01\x00\x00\x00H\x85\xc0u\x0cH\x8bC \xbe\x02\x00\x00\x00[\xff\xe0H\x0f\xaf\xf8H\xff\xc8\xeb\xe6ATUSH\x8b\x1dQ\x00\x00\x00H\x8bG\x08L\x8bc(H\x8bx\x08A\xff\xd4H\x8d5+\x00\x00\x00H\x89\xc5H\x8b\x059\x00\x00\x00\x0f\xb78\xffShH\x89\xefA\xff\xd4H\x8b\x03[]A\\\xc3\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x05\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xa0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x85\x00\x12factorial\x00\x10\r$\x01&\x9f \x01"\xff',
@@ -58,12 +58,12 @@ def open(self, path, mode):
 for arch in (0x1A06, 0x1E06, 0x2206):
     features0_file_contents[arch] = features0_file_contents[0x1606]
 
-if sys.implementation.mpy not in features0_file_contents:
+if sys.implementation._mpy not in features0_file_contents:
     print("SKIP")
     raise SystemExit
 
 # These are the test .mpy files.
-user_files = {"/features0.mpy": features0_file_contents[sys.implementation.mpy]}
+user_files = {"/features0.mpy": features0_file_contents[sys.implementation._mpy]}
 
 # Create and mount a user filesystem.
 uos.mount(UserFS(user_files), "/userfs")

From 2ed4f7a1304446f6ab5784fd348e39dd29a99037 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 17 May 2022 12:51:07 +1000
Subject: [PATCH 2004/3533] tools/mpy_ld.py: Remove obsolete QSTR_WINDOW_SIZE
 constant.

This was made obsolete in f2040bfc7ee033e48acef9f289790f3b4e6b74e5

Signed-off-by: Damien George <damien@micropython.org>
---
 tools/mpy_ld.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tools/mpy_ld.py b/tools/mpy_ld.py
index 0dac69e20834f..a0817500e6a84 100755
--- a/tools/mpy_ld.py
+++ b/tools/mpy_ld.py
@@ -50,7 +50,6 @@
 MP_SCOPE_FLAG_VIPERBSS = 0x40
 MICROPY_PY_BUILTINS_STR_UNICODE = 2
 MP_SMALL_INT_BITS = 31
-QSTR_WINDOW_SIZE = 32
 
 # ELF constants
 R_386_32 = 1

From b295b6f1f3dd529eea564b9e08b75c7ab4f48ce4 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 16 May 2022 19:18:58 +1000
Subject: [PATCH 2005/3533] py/persistentcode: Remove obsolete comment about
 qstr window size.

This was made obsolete in f2040bfc7ee033e48acef9f289790f3b4e6b74e5

Signed-off-by: Damien George <damien@micropython.org>
---
 py/persistentcode.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/py/persistentcode.c b/py/persistentcode.c
index f3d6b7205d6a2..0b5da8077420e 100644
--- a/py/persistentcode.c
+++ b/py/persistentcode.c
@@ -617,7 +617,6 @@ void mp_raw_code_save(mp_compiled_module_t *cm, mp_print_t *print) {
     //  byte  version
     //  byte  feature flags
     //  byte  number of bits in a small int
-    //  uint  size of qstr window
     byte header[4] = {
         'M',
         MPY_VERSION,

From c49d5207e9437755be364639632be31c001955a8 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 16 May 2022 19:20:52 +1000
Subject: [PATCH 2006/3533] py/persistentcode: Remove unicode feature flag from
 .mpy file.

Prior to this commit, even with unicode disabled .py and .mpy files could
contain unicode characters, eg by entering them directly in a string as
utf-8 encoded.

The only thing the compiler disallowed (with unicode disabled) was using
\uxxxx and \Uxxxxxxxx notation to specify a character within a string with
value >= 0x100; that would give a SyntaxError.

With this change mpy-cross will now accept \u and \U notation to insert a
character with value >= 0x100 into a string (because the -mno-unicode
option is now gone, there's no way to forbid this).  The runtime will
happily work with strings with such characters, just like it already works
with strings with characters that were utf-8 encoded directly.

This change simplifies things because there are no longer any feature
flags in .mpy files, and any bytecode .mpy will now run on any target.

Signed-off-by: Damien George <damien@micropython.org>
---
 mpy-cross/main.c                           |  6 ----
 py/lexer.c                                 | 36 ++++++++++------------
 py/mpconfig.h                              |  7 -----
 py/mpstate.h                               |  1 -
 py/persistentcode.h                        | 12 +++-----
 tests/micropython/import_mpy_native_gc.py  |  8 ++---
 tests/micropython/import_mpy_native_x64.py |  6 ++--
 tools/mpy_ld.py                            | 15 +++++----
 8 files changed, 35 insertions(+), 56 deletions(-)

diff --git a/mpy-cross/main.c b/mpy-cross/main.c
index a2daf7b22fd69..6199abd365f40 100644
--- a/mpy-cross/main.c
+++ b/mpy-cross/main.c
@@ -108,7 +108,6 @@ STATIC int usage(char **argv) {
         "\n"
         "Target specific options:\n"
         "-msmall-int-bits=number : set the maximum bits used to encode a small-int\n"
-        "-mno-unicode : don't support unicode in compiled strings\n"
         "-march=<arch> : set architecture for native emitter; x86, x64, armv6, armv7m, armv7em, armv7emsp, armv7emdp, xtensa, xtensawin\n"
         "\n"
         "Implementation specific options:\n", argv[0]
@@ -203,7 +202,6 @@ MP_NOINLINE int main_(int argc, char **argv) {
 
     // set default compiler configuration
     mp_dynamic_compiler.small_int_bits = 31;
-    mp_dynamic_compiler.py_builtins_str_unicode = 1;
     #if defined(__i386__)
     mp_dynamic_compiler.native_arch = MP_NATIVE_ARCH_X86;
     mp_dynamic_compiler.nlr_buf_num_regs = MICROPY_NLR_NUM_REGS_X86;
@@ -261,10 +259,6 @@ MP_NOINLINE int main_(int argc, char **argv) {
                     return usage(argv);
                 }
                 // TODO check that small_int_bits is within range of host's capabilities
-            } else if (strcmp(argv[a], "-mno-unicode") == 0) {
-                mp_dynamic_compiler.py_builtins_str_unicode = 0;
-            } else if (strcmp(argv[a], "-municode") == 0) {
-                mp_dynamic_compiler.py_builtins_str_unicode = 1;
             } else if (strncmp(argv[a], "-march=", sizeof("-march=") - 1) == 0) {
                 const char *arch = argv[a] + sizeof("-march=") - 1;
                 if (strcmp(arch, "x86") == 0) {
diff --git a/py/lexer.c b/py/lexer.c
index ac406bd46943b..39e9662f63e65 100644
--- a/py/lexer.c
+++ b/py/lexer.c
@@ -473,25 +473,23 @@ STATIC void parse_string_literal(mp_lexer_t *lex, bool is_raw, bool is_fstring)
                     }
                 }
                 if (c != MP_LEXER_EOF) {
-                    if (MICROPY_PY_BUILTINS_STR_UNICODE_DYNAMIC) {
-                        if (c < 0x110000 && lex->tok_kind == MP_TOKEN_STRING) {
-                            vstr_add_char(&lex->vstr, c);
-                        } else if (c < 0x100 && lex->tok_kind == MP_TOKEN_BYTES) {
-                            vstr_add_byte(&lex->vstr, c);
-                        } else {
-                            // unicode character out of range
-                            // this raises a generic SyntaxError; could provide more info
-                            lex->tok_kind = MP_TOKEN_INVALID;
-                        }
-                    } else {
-                        // without unicode everything is just added as an 8-bit byte
-                        if (c < 0x100) {
-                            vstr_add_byte(&lex->vstr, c);
-                        } else {
-                            // 8-bit character out of range
-                            // this raises a generic SyntaxError; could provide more info
-                            lex->tok_kind = MP_TOKEN_INVALID;
-                        }
+                    #if MICROPY_PY_BUILTINS_STR_UNICODE
+                    if (c < 0x110000 && lex->tok_kind == MP_TOKEN_STRING) {
+                        // Valid unicode character in a str object.
+                        vstr_add_char(&lex->vstr, c);
+                    } else if (c < 0x100 && lex->tok_kind == MP_TOKEN_BYTES) {
+                        // Valid byte in a bytes object.
+                        vstr_add_byte(&lex->vstr, c);
+                    }
+                    #else
+                    if (c < 0x100) {
+                        // Without unicode everything is just added as an 8-bit byte.
+                        vstr_add_byte(&lex->vstr, c);
+                    }
+                    #endif
+                    else {
+                        // Character out of range; this raises a generic SyntaxError.
+                        lex->tok_kind = MP_TOKEN_INVALID;
                     }
                 }
             } else {
diff --git a/py/mpconfig.h b/py/mpconfig.h
index 8814d1f09ca78..f9894b497c507 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -429,13 +429,6 @@
 #define MICROPY_DYNAMIC_COMPILER (0)
 #endif
 
-// Configure dynamic compiler macros
-#if MICROPY_DYNAMIC_COMPILER
-#define MICROPY_PY_BUILTINS_STR_UNICODE_DYNAMIC (mp_dynamic_compiler.py_builtins_str_unicode)
-#else
-#define MICROPY_PY_BUILTINS_STR_UNICODE_DYNAMIC MICROPY_PY_BUILTINS_STR_UNICODE
-#endif
-
 // Whether to enable constant folding; eg 1+2 rewritten as 3
 #ifndef MICROPY_COMP_CONST_FOLDING
 #define MICROPY_COMP_CONST_FOLDING (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_CORE_FEATURES)
diff --git a/py/mpstate.h b/py/mpstate.h
index bc1aaf1e09b15..98aa9a84989c5 100644
--- a/py/mpstate.h
+++ b/py/mpstate.h
@@ -55,7 +55,6 @@ enum {
 #if MICROPY_DYNAMIC_COMPILER
 typedef struct mp_dynamic_compiler_t {
     uint8_t small_int_bits; // must be <= host small_int_bits
-    bool py_builtins_str_unicode;
     uint8_t native_arch;
     uint8_t nlr_buf_num_regs;
 } mp_dynamic_compiler_t;
diff --git a/py/persistentcode.h b/py/persistentcode.h
index 37263f66b3c3a..55428e73a6ddf 100644
--- a/py/persistentcode.h
+++ b/py/persistentcode.h
@@ -42,15 +42,11 @@
 #define MPY_FEATURE_DECODE_ARCH(feat) ((feat) >> 2)
 
 // The feature flag bits encode the compile-time config options that affect
-// the generate bytecode. Note: position 0 is now unused
-// (formerly MICROPY_OPT_CACHE_MAP_LOOKUP_IN_BYTECODE).
-#define MPY_FEATURE_FLAGS ( \
-    ((MICROPY_PY_BUILTINS_STR_UNICODE) << 1) \
-    )
+// the generate bytecode. Note: no longer used.
+// (formerly MICROPY_OPT_CACHE_MAP_LOOKUP_IN_BYTECODE and MICROPY_PY_BUILTINS_STR_UNICODE).
+#define MPY_FEATURE_FLAGS (0)
 // This is a version of the flags that can be configured at runtime.
-#define MPY_FEATURE_FLAGS_DYNAMIC ( \
-    ((MICROPY_PY_BUILTINS_STR_UNICODE_DYNAMIC) << 1) \
-    )
+#define MPY_FEATURE_FLAGS_DYNAMIC (0)
 
 // Define the host architecture
 #if MICROPY_EMIT_X86
diff --git a/tests/micropython/import_mpy_native_gc.py b/tests/micropython/import_mpy_native_gc.py
index 44f59426976c4..a2012fc1cf0fa 100644
--- a/tests/micropython/import_mpy_native_gc.py
+++ b/tests/micropython/import_mpy_native_gc.py
@@ -49,14 +49,14 @@ def open(self, path, mode):
 # by the required value of sys.implementation._mpy.
 features0_file_contents = {
     # -march=x64
-    0xA06: b'M\x06\n\x1f\x01\x004build/features0.native.mpy\x00\x8aB\xe9/\x00\x00\x00SH\x8b\x1d\x83\x00\x00\x00\xbe\x02\x00\x00\x00\xffS\x18\xbf\x01\x00\x00\x00H\x85\xc0u\x0cH\x8bC \xbe\x02\x00\x00\x00[\xff\xe0H\x0f\xaf\xf8H\xff\xc8\xeb\xe6ATUSH\x8b\x1dQ\x00\x00\x00H\x8bG\x08L\x8bc(H\x8bx\x08A\xff\xd4H\x8d5+\x00\x00\x00H\x89\xc5H\x8b\x059\x00\x00\x00\x0f\xb78\xffShH\x89\xefA\xff\xd4H\x8b\x03[]A\\\xc3\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x05\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xa0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x85\x00\x12factorial\x00\x10\r$\x01&\x9f \x01"\xff',
+    0x806: b'M\x06\b\x1f\x01\x004build/features0.native.mpy\x00\x8aB\xe9/\x00\x00\x00SH\x8b\x1d\x83\x00\x00\x00\xbe\x02\x00\x00\x00\xffS\x18\xbf\x01\x00\x00\x00H\x85\xc0u\x0cH\x8bC \xbe\x02\x00\x00\x00[\xff\xe0H\x0f\xaf\xf8H\xff\xc8\xeb\xe6ATUSH\x8b\x1dQ\x00\x00\x00H\x8bG\x08L\x8bc(H\x8bx\x08A\xff\xd4H\x8d5+\x00\x00\x00H\x89\xc5H\x8b\x059\x00\x00\x00\x0f\xb78\xffShH\x89\xefA\xff\xd4H\x8b\x03[]A\\\xc3\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x05\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xa0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x85\x00\x12factorial\x00\x10\r$\x01&\x9f \x01"\xff',
     # -march=armv7m
-    0x1606: b"M\x06\x16\x1f\x01\x004build/features0.native.mpy\x00\x88B\x1a\xe0\x00\x00\x13\xb5\nK\nJ{D\x9cX\x02!\xe3h\x98G\x03F\x01 3\xb9\x02!#i\x01\x93\x02\xb0\xbd\xe8\x10@\x18GXC\x01;\xf4\xe7\x00\xbfn\x00\x00\x00\x00\x00\x00\x00\xf8\xb5\nN\nK~D\xf4XChgiXh\xb8G\x05F\x07K\x08I\xf2XyD\x10\x88ck\x98G(F\xb8G h\xf8\xbd\x00\xbf:\x00\x00\x00\x00\x00\x00\x00\x04\x00\x00\x00\x1e\x00\x00\x00\x00\x00\x00\x00\x05\x00\x00\x00\x00\x00\x00\x00\x84\x00\x00\x00\x00\x00\x00\x00\x01\x84\x10\x12factorial\x00\x10\r>\x01@\x9f:\x01<\xff",
+    0x1406: b"M\x06\x14\x1f\x01\x004build/features0.native.mpy\x00\x88B\x1a\xe0\x00\x00\x13\xb5\nK\nJ{D\x9cX\x02!\xe3h\x98G\x03F\x01 3\xb9\x02!#i\x01\x93\x02\xb0\xbd\xe8\x10@\x18GXC\x01;\xf4\xe7\x00\xbfn\x00\x00\x00\x00\x00\x00\x00\xf8\xb5\nN\nK~D\xf4XChgiXh\xb8G\x05F\x07K\x08I\xf2XyD\x10\x88ck\x98G(F\xb8G h\xf8\xbd\x00\xbf:\x00\x00\x00\x00\x00\x00\x00\x04\x00\x00\x00\x1e\x00\x00\x00\x00\x00\x00\x00\x05\x00\x00\x00\x00\x00\x00\x00\x84\x00\x00\x00\x00\x00\x00\x00\x01\x84\x10\x12factorial\x00\x10\r>\x01@\x9f:\x01<\xff",
 }
 
 # Populate other armv7m-derived archs based on armv7m.
-for arch in (0x1A06, 0x1E06, 0x2206):
-    features0_file_contents[arch] = features0_file_contents[0x1606]
+for arch in (0x1806, 0x1C06, 0x2006):
+    features0_file_contents[arch] = features0_file_contents[0x1406]
 
 if sys.implementation._mpy not in features0_file_contents:
     print("SKIP")
diff --git a/tests/micropython/import_mpy_native_x64.py b/tests/micropython/import_mpy_native_x64.py
index 3a25df1866708..453d81f25608a 100644
--- a/tests/micropython/import_mpy_native_x64.py
+++ b/tests/micropython/import_mpy_native_x64.py
@@ -52,11 +52,11 @@ def open(self, path, mode):
 # fmt: off
 user_files = {
     # bad architecture
-    '/mod0.mpy': b'M\x06\xfe\x00\x10',
+    '/mod0.mpy': b'M\x06\xfc\x00\x10',
 
     # test loading of viper and asm
     '/mod1.mpy': (
-        b'M\x06\x0a\x1f' # header
+        b'M\x06\x08\x1f' # header
 
         b'\x02' # n_qstr
         b'\x00' # n_obj
@@ -85,7 +85,7 @@ def open(self, path, mode):
 
     # test loading viper with additional scope flags and relocation
     '/mod2.mpy': (
-        b'M\x06\x0a\x1f' # header
+        b'M\x06\x08\x1f' # header
 
         b'\x02' # n_qstr
         b'\x00' # n_obj
diff --git a/tools/mpy_ld.py b/tools/mpy_ld.py
index a0817500e6a84..61894915185e8 100755
--- a/tools/mpy_ld.py
+++ b/tools/mpy_ld.py
@@ -48,7 +48,6 @@
 MP_SCOPE_FLAG_VIPERRELOC = 0x10
 MP_SCOPE_FLAG_VIPERRODATA = 0x20
 MP_SCOPE_FLAG_VIPERBSS = 0x40
-MICROPY_PY_BUILTINS_STR_UNICODE = 2
 MP_SMALL_INT_BITS = 31
 
 # ELF constants
@@ -116,7 +115,7 @@ def __init__(self, name, mpy_feature, qstr_entry_size, word_size, arch_got, asm_
 ARCH_DATA = {
     "x86": ArchData(
         "EM_386",
-        MP_NATIVE_ARCH_X86 << 2 | MICROPY_PY_BUILTINS_STR_UNICODE,
+        MP_NATIVE_ARCH_X86 << 2,
         2,
         4,
         (R_386_PC32, R_386_GOT32, R_386_GOT32X),
@@ -124,7 +123,7 @@ def __init__(self, name, mpy_feature, qstr_entry_size, word_size, arch_got, asm_
     ),
     "x64": ArchData(
         "EM_X86_64",
-        MP_NATIVE_ARCH_X64 << 2 | MICROPY_PY_BUILTINS_STR_UNICODE,
+        MP_NATIVE_ARCH_X64 << 2,
         2,
         8,
         (R_X86_64_GOTPCREL, R_X86_64_REX_GOTPCRELX),
@@ -132,7 +131,7 @@ def __init__(self, name, mpy_feature, qstr_entry_size, word_size, arch_got, asm_
     ),
     "armv7m": ArchData(
         "EM_ARM",
-        MP_NATIVE_ARCH_ARMV7M << 2 | MICROPY_PY_BUILTINS_STR_UNICODE,
+        MP_NATIVE_ARCH_ARMV7M << 2,
         2,
         4,
         (R_ARM_GOT_BREL,),
@@ -140,7 +139,7 @@ def __init__(self, name, mpy_feature, qstr_entry_size, word_size, arch_got, asm_
     ),
     "armv7emsp": ArchData(
         "EM_ARM",
-        MP_NATIVE_ARCH_ARMV7EMSP << 2 | MICROPY_PY_BUILTINS_STR_UNICODE,
+        MP_NATIVE_ARCH_ARMV7EMSP << 2,
         2,
         4,
         (R_ARM_GOT_BREL,),
@@ -148,7 +147,7 @@ def __init__(self, name, mpy_feature, qstr_entry_size, word_size, arch_got, asm_
     ),
     "armv7emdp": ArchData(
         "EM_ARM",
-        MP_NATIVE_ARCH_ARMV7EMDP << 2 | MICROPY_PY_BUILTINS_STR_UNICODE,
+        MP_NATIVE_ARCH_ARMV7EMDP << 2,
         2,
         4,
         (R_ARM_GOT_BREL,),
@@ -156,7 +155,7 @@ def __init__(self, name, mpy_feature, qstr_entry_size, word_size, arch_got, asm_
     ),
     "xtensa": ArchData(
         "EM_XTENSA",
-        MP_NATIVE_ARCH_XTENSA << 2 | MICROPY_PY_BUILTINS_STR_UNICODE,
+        MP_NATIVE_ARCH_XTENSA << 2,
         2,
         4,
         (R_XTENSA_32, R_XTENSA_PLT),
@@ -164,7 +163,7 @@ def __init__(self, name, mpy_feature, qstr_entry_size, word_size, arch_got, asm_
     ),
     "xtensawin": ArchData(
         "EM_XTENSA",
-        MP_NATIVE_ARCH_XTENSAWIN << 2 | MICROPY_PY_BUILTINS_STR_UNICODE,
+        MP_NATIVE_ARCH_XTENSAWIN << 2,
         4,
         4,
         (R_XTENSA_32, R_XTENSA_PLT),

From 2a366e183e94549fe87bbac028d0fe1b1675442d Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 16 May 2022 19:31:15 +1000
Subject: [PATCH 2007/3533] docs/reference/mpyfiles: Remove docs about mpy
 flags and qstr win size.

Signed-off-by: Damien George <damien@micropython.org>
---
 docs/reference/mpyfiles.rst | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/docs/reference/mpyfiles.rst b/docs/reference/mpyfiles.rst
index 9d6388741ecb9..70354c4e1f460 100644
--- a/docs/reference/mpyfiles.rst
+++ b/docs/reference/mpyfiles.rst
@@ -27,18 +27,10 @@ Compatibility is based on the following:
 * Version of the .mpy file: the version of the file must match the version
   supported by the system loading it.
 
-* Bytecode features used in the .mpy file: there are two bytecode features
-  which must match between the file and the system: unicode support and
-  inline caching of map lookups in the bytecode.
-
 * Small integer bits: the .mpy file will require a minimum number of bits in
   a small integer and the system loading it must support at least this many
   bits.
 
-* Qstr compression window size: the .mpy file will require a minimum window
-  size for qstr decompression and the system loading it must have a window
-  greater or equal to this size.
-
 * Native architecture: if the .mpy file contains native machine code then
   it will specify the architecture of that machine code and the system
   loading it must support execution of that architecture's code.
@@ -66,8 +58,6 @@ If importing an .mpy file fails then try the following:
     print('mpy flags:', end='')
     if arch:
         print(' -march=' + arch, end='')
-    if not sys_mpy & 0x200:
-        print(' -mno-unicode', end='')
     print()
 
 * Check the validity of the .mpy file by inspecting the first two bytes of

From d7cf8a3b9d14d8e77062125eae8d99efbcbf7700 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 17 May 2022 13:48:43 +1000
Subject: [PATCH 2008/3533] tests/perf_bench: Update .mpy file header to remove
 old unicode flag.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/perf_bench/core_import_mpy_multi.py  | 2 +-
 tests/perf_bench/core_import_mpy_single.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/perf_bench/core_import_mpy_multi.py b/tests/perf_bench/core_import_mpy_multi.py
index a807aa6d7739c..682c36328a095 100644
--- a/tests/perf_bench/core_import_mpy_multi.py
+++ b/tests/perf_bench/core_import_mpy_multi.py
@@ -23,7 +23,7 @@ def f():
     x = ("const tuple", None, False, True, 1, 2, 3)
 result = 123
 """
-file_data = b'M\x06\x02\x1f\x14\x03\x0etest.py\x00\x0f\x02A\x00\x02f\x00\x0cresult\x00/-5#\x82I\x81{\x81w\x82/\x81\x05\x81\x17Iom\x82\x13\x06arg\x00\x05\x1cthis will be a string object\x00\x06\x1bthis will be a bytes object\x00\n\x07\x05\x0bconst tuple\x00\x01\x02\x03\x07\x011\x07\x012\x07\x013\x81\\\x10\n\x01\x89\x07d`T2\x00\x10\x024\x02\x16\x022\x01\x16\x03"\x80{\x16\x04Qc\x02\x81d\x00\x08\x02(DD\x11\x05\x16\x06\x10\x02\x16\x072\x00\x16\x082\x01\x16\t2\x02\x16\nQc\x03`\x1a\x08\x08\x12\x13@\xb1\xb0\x18\x13Qc@\t\x08\t\x12` Qc@\t\x08\n\x12``Qc\x82@ \x0e\x03\x80\x08+)##\x12\x0b\x12\x0c\x12\r\x12\x0e*\x04Y\x12\x0f\x12\x10\x12\x11*\x03Y#\x00\xc0#\x01\xc0#\x02\xc0Qc'
+file_data = b'M\x06\x00\x1f\x14\x03\x0etest.py\x00\x0f\x02A\x00\x02f\x00\x0cresult\x00/-5#\x82I\x81{\x81w\x82/\x81\x05\x81\x17Iom\x82\x13\x06arg\x00\x05\x1cthis will be a string object\x00\x06\x1bthis will be a bytes object\x00\n\x07\x05\x0bconst tuple\x00\x01\x02\x03\x07\x011\x07\x012\x07\x013\x81\\\x10\n\x01\x89\x07d`T2\x00\x10\x024\x02\x16\x022\x01\x16\x03"\x80{\x16\x04Qc\x02\x81d\x00\x08\x02(DD\x11\x05\x16\x06\x10\x02\x16\x072\x00\x16\x082\x01\x16\t2\x02\x16\nQc\x03`\x1a\x08\x08\x12\x13@\xb1\xb0\x18\x13Qc@\t\x08\t\x12` Qc@\t\x08\n\x12``Qc\x82@ \x0e\x03\x80\x08+)##\x12\x0b\x12\x0c\x12\r\x12\x0e*\x04Y\x12\x0f\x12\x10\x12\x11*\x03Y#\x00\xc0#\x01\xc0#\x02\xc0Qc'
 
 
 class File(uio.IOBase):
diff --git a/tests/perf_bench/core_import_mpy_single.py b/tests/perf_bench/core_import_mpy_single.py
index 87ad995aa6f42..af3f4a29b255e 100644
--- a/tests/perf_bench/core_import_mpy_single.py
+++ b/tests/perf_bench/core_import_mpy_single.py
@@ -78,7 +78,7 @@ def f1():
     x = ("const tuple 9", None, False, True, 1, 2, 3)
 result = 123
 """
-file_data = b"M\x06\x02\x1f\x81=\x1e\x0etest.py\x00\x0f\x04A0\x00\x04A1\x00\x04f0\x00\x04f1\x00\x0cresult\x00/-5\x04a0\x00\x04a1\x00\x04a2\x00\x04a3\x00\x13\x15\x17\x19\x1b\x1d\x1f!#%')+1379;=?ACEGIKMOQSUWY[]_acegikmoqsuwy{}\x7f\x81\x01\x81\x03\x81\x05\x81\x07\x81\t\x81\x0b\x81\r\x81\x0f\x81\x11\x81\x13\x81\x15\x81\x17\x81\x19\x81\x1b\x81\x1d\x81\x1f\x81!\x81#\x81%\x81'\x81)\x81+\x81-\x81/\x811\x813\x815\x817\x819\x81;\x81=\x81?\x81A\x81C\x81E\x81G\x81I\x81K\x81M\x81O\x81Q\x81S\x81U\x81W\x81Y\x81[\x81]\x81_\x81a\x81c\x81e\x81g\x81i\x81k\x81m\x81o\x81q\x81s\x81u\x81w\x81y\x81{\x81}\x81\x7f\x82\x01\x82\x03\x82\x05\x82\x07\x82\t\x82\x0b\x82\r\x82\x0f\x82\x11\x82\x13\x82\x15\x82\x17\x82\x19\x82\x1b\x82\x1d\x82\x1f\x82!\x82#\x82%\x82'\x82)\x82+\x82-\x82/\x821\x823\x825\x827\x829\x82;\x82=\x82?\x82A\x82E\x82G\x82I\x82K\nname0\x00\nname1\x00\nname2\x00\nname3\x00\nname4\x00\nname5\x00\nname6\x00\nname7\x00\nname8\x00\nname9\x00$quite_a_long_name0\x00$quite_a_long_name1\x00$quite_a_long_name2\x00$quite_a_long_name3\x00$quite_a_long_name4\x00$quite_a_long_name5\x00$quite_a_long_name6\x00$quite_a_long_name7\x00$quite_a_long_name8\x00$quite_a_long_name9\x00&quite_a_long_name10\x00&quite_a_long_name11\x00\x05\x1ethis will be a string object 0\x00\x05\x1ethis will be a string object 1\x00\x05\x1ethis will be a string object 2\x00\x05\x1ethis will be a string object 3\x00\x05\x1ethis will be a string object 4\x00\x05\x1ethis will be a string object 5\x00\x05\x1ethis will be a string object 6\x00\x05\x1ethis will be a string object 7\x00\x05\x1ethis will be a string object 8\x00\x05\x1ethis will be a string object 9\x00\x06\x1dthis will be a bytes object 0\x00\x06\x1dthis will be a bytes object 1\x00\x06\x1dthis will be a bytes object 2\x00\x06\x1dthis will be a bytes object 3\x00\x06\x1dthis will be a bytes object 4\x00\x06\x1dthis will be a bytes object 5\x00\x06\x1dthis will be a bytes object 6\x00\x06\x1dthis will be a bytes object 7\x00\x06\x1dthis will be a bytes object 8\x00\x06\x1dthis will be a bytes object 9\x00\n\x07\x05\rconst tuple 0\x00\x01\x02\x03\x07\x011\x07\x012\x07\x013\n\x07\x05\rconst tuple 1\x00\x01\x02\x03\x07\x011\x07\x012\x07\x013\n\x07\x05\rconst tuple 2\x00\x01\x02\x03\x07\x011\x07\x012\x07\x013\n\x07\x05\rconst tuple 3\x00\x01\x02\x03\x07\x011\x07\x012\x07\x013\n\x07\x05\rconst tuple 4\x00\x01\x02\x03\x07\x011\x07\x012\x07\x013\n\x07\x05\rconst tuple 5\x00\x01\x02\x03\x07\x011\x07\x012\x07\x013\n\x07\x05\rconst tuple 6\x00\x01\x02\x03\x07\x011\x07\x012\x07\x013\n\x07\x05\rconst tuple 7\x00\x01\x02\x03\x07\x011\x07\x012\x07\x013\n\x07\x05\rconst tuple 8\x00\x01\x02\x03\x07\x011\x07\x012\x07\x013\n\x07\x05\rconst tuple 9\x00\x01\x02\x03\x07\x011\x07\x012\x07\x013\x82d\x10\x12\x01i@i@\x84\x18\x84\x1fT2\x00\x10\x024\x02\x16\x02T2\x01\x10\x034\x02\x16\x032\x02\x16\x042\x03\x16\x05\"\x80{\x16\x06Qc\x04\x82\x0c\x00\n\x02($$$\x11\x07\x16\x08\x10\x02\x16\t2\x00\x16\n2\x01\x16\x0b2\x02\x16\x0c2\x03\x16\rQc\x04@\t\x08\n\x81\x0b Qc@\t\x08\x0b\x81\x0b@Qc@\t\x08\x0c\x81\x0b`QcH\t\n\r\x81\x0b` Qc\x82\x14\x00\x0c\x03h`$$$\x11\x07\x16\x08\x10\x03\x16\t2\x00\x16\n2\x01\x16\x0b2\x02\x16\x0c2\x03\x16\rQc\x04H\t\n\n\x81\x0b``QcH\t\n\x0b\x81\x0b\x80\x07QcH\t\n\x0c\x81\x0b\x80\x08QcH\t\n\r\x81\x0b\x80\tQc\xa08P:\x04\x80\x0b13///---997799<\x1f%\x1f\"\x1f%)\x1f\"//\x12\x0e\x12\x0f\x12\x10\x12\x11\x12\x12\x12\x13\x12\x14*\x07Y\x12\x15\x12\x16\x12\x17\x12\x18\x12\x19\x12\x1a\x12\x08\x12\x07*\x08Y\x12\x1b\x12\x1c\x12\t\x12\x1d\x12\x1e\x12\x1f*\x06Y\x12 \x12!\x12\"\x12#\x12$\x12%*\x06Y\x12&\x12'\x12(\x12)\x12*\x12+*\x06Y\x12,\x12-\x12.\x12/\x120*\x05Y\x121\x122\x123\x124\x125*\x05Y\x126\x127\x128\x129\x12:*\x05Y\x12;\x12<\x12=\x12>\x12?\x12@\x12A\x12B\x12C\x12D\x12E*\x0bY\x12F\x12G\x12H\x12I\x12J\x12K\x12L\x12M\x12N\x12O\x12P*\x0bY\x12Q\x12R\x12S\x12T\x12U\x12V\x12W\x12X\x12Y\x12Z*\nY\x12[\x12\\\x12]\x12^\x12_\x12`\x12a\x12b\x12c\x12d*\nY\x12e\x12f\x12g\x12h\x12i\x12j\x12k\x12l\x12m\x12n\x12o*\x0bY\x12p\x12q\x12r\x12s\x12t\x12u\x12v\x12w\x12x\x12y\x12z*\x0bY\x12{\x12|\x12}\x12~\x12\x7f\x12\x81\x00\x12\x81\x01\x12\x81\x02\x12\x81\x03\x12\x81\x04*\nY\x12\x81\x05\x12\x81\x06\x12\x81\x07\x12\x81\x08\x12\x81\t\x12\x81\n\x12\x81\x0b\x12\x81\x0c\x12\x81\r\x12\x81\x0e\x12\x81\x0f*\x0bY\x12\x81\x10\x12\x81\x11\x12\x81\x12\x12\x81\x13\x12\x81\x14\x12\x81\x15\x12\x81\x16\x12\x81\x17\x12\x81\x18\x12\x81\x19*\nY\x12\x81\x1a\x12\x81\x1b\x12\x81\x1c\x12\x81\x1d\x12\x81\x1e\x12\x81\x1f\x12\x81 \x12\x81!\x12\x81\"\x12\x81#\x12\x81$*\x0bY\x12\x81%\x12\x81&*\x02Y\x12\x81'\x12\x81(\x12\x81)\x12\x81*\x12\x81+\x12\x81,\x12\x81-\x12\x81.\x12\x81/\x12\x810*\nY\x12\x811\x12\x812\x12\x813\x12\x814*\x04Y\x12\x815\x12\x816\x12\x817\x12\x818*\x04Y\x12\x819\x12\x81:\x12\x81;\x12\x81<*\x04YQc\x87p\x08@\x05\x80###############################\x00\xc0#\x01\xc0#\x02\xc0#\x03\xc0#\x04\xc0#\x05\xc0#\x06\xc0#\x07\xc0#\x08\xc0#\t\xc0#\n\xc0#\x0b\xc0#\x0c\xc0#\r\xc0#\x0e\xc0#\x0f\xc0#\x10\xc0#\x11\xc0#\x12\xc0#\x13\xc0#\x14\xc0#\x15\xc0#\x16\xc0#\x17\xc0#\x18\xc0#\x19\xc0#\x1a\xc0#\x1b\xc0#\x1c\xc0#\x1d\xc0Qc"
+file_data = b"M\x06\x00\x1f\x81=\x1e\x0etest.py\x00\x0f\x04A0\x00\x04A1\x00\x04f0\x00\x04f1\x00\x0cresult\x00/-5\x04a0\x00\x04a1\x00\x04a2\x00\x04a3\x00\x13\x15\x17\x19\x1b\x1d\x1f!#%')+1379;=?ACEGIKMOQSUWY[]_acegikmoqsuwy{}\x7f\x81\x01\x81\x03\x81\x05\x81\x07\x81\t\x81\x0b\x81\r\x81\x0f\x81\x11\x81\x13\x81\x15\x81\x17\x81\x19\x81\x1b\x81\x1d\x81\x1f\x81!\x81#\x81%\x81'\x81)\x81+\x81-\x81/\x811\x813\x815\x817\x819\x81;\x81=\x81?\x81A\x81C\x81E\x81G\x81I\x81K\x81M\x81O\x81Q\x81S\x81U\x81W\x81Y\x81[\x81]\x81_\x81a\x81c\x81e\x81g\x81i\x81k\x81m\x81o\x81q\x81s\x81u\x81w\x81y\x81{\x81}\x81\x7f\x82\x01\x82\x03\x82\x05\x82\x07\x82\t\x82\x0b\x82\r\x82\x0f\x82\x11\x82\x13\x82\x15\x82\x17\x82\x19\x82\x1b\x82\x1d\x82\x1f\x82!\x82#\x82%\x82'\x82)\x82+\x82-\x82/\x821\x823\x825\x827\x829\x82;\x82=\x82?\x82A\x82E\x82G\x82I\x82K\nname0\x00\nname1\x00\nname2\x00\nname3\x00\nname4\x00\nname5\x00\nname6\x00\nname7\x00\nname8\x00\nname9\x00$quite_a_long_name0\x00$quite_a_long_name1\x00$quite_a_long_name2\x00$quite_a_long_name3\x00$quite_a_long_name4\x00$quite_a_long_name5\x00$quite_a_long_name6\x00$quite_a_long_name7\x00$quite_a_long_name8\x00$quite_a_long_name9\x00&quite_a_long_name10\x00&quite_a_long_name11\x00\x05\x1ethis will be a string object 0\x00\x05\x1ethis will be a string object 1\x00\x05\x1ethis will be a string object 2\x00\x05\x1ethis will be a string object 3\x00\x05\x1ethis will be a string object 4\x00\x05\x1ethis will be a string object 5\x00\x05\x1ethis will be a string object 6\x00\x05\x1ethis will be a string object 7\x00\x05\x1ethis will be a string object 8\x00\x05\x1ethis will be a string object 9\x00\x06\x1dthis will be a bytes object 0\x00\x06\x1dthis will be a bytes object 1\x00\x06\x1dthis will be a bytes object 2\x00\x06\x1dthis will be a bytes object 3\x00\x06\x1dthis will be a bytes object 4\x00\x06\x1dthis will be a bytes object 5\x00\x06\x1dthis will be a bytes object 6\x00\x06\x1dthis will be a bytes object 7\x00\x06\x1dthis will be a bytes object 8\x00\x06\x1dthis will be a bytes object 9\x00\n\x07\x05\rconst tuple 0\x00\x01\x02\x03\x07\x011\x07\x012\x07\x013\n\x07\x05\rconst tuple 1\x00\x01\x02\x03\x07\x011\x07\x012\x07\x013\n\x07\x05\rconst tuple 2\x00\x01\x02\x03\x07\x011\x07\x012\x07\x013\n\x07\x05\rconst tuple 3\x00\x01\x02\x03\x07\x011\x07\x012\x07\x013\n\x07\x05\rconst tuple 4\x00\x01\x02\x03\x07\x011\x07\x012\x07\x013\n\x07\x05\rconst tuple 5\x00\x01\x02\x03\x07\x011\x07\x012\x07\x013\n\x07\x05\rconst tuple 6\x00\x01\x02\x03\x07\x011\x07\x012\x07\x013\n\x07\x05\rconst tuple 7\x00\x01\x02\x03\x07\x011\x07\x012\x07\x013\n\x07\x05\rconst tuple 8\x00\x01\x02\x03\x07\x011\x07\x012\x07\x013\n\x07\x05\rconst tuple 9\x00\x01\x02\x03\x07\x011\x07\x012\x07\x013\x82d\x10\x12\x01i@i@\x84\x18\x84\x1fT2\x00\x10\x024\x02\x16\x02T2\x01\x10\x034\x02\x16\x032\x02\x16\x042\x03\x16\x05\"\x80{\x16\x06Qc\x04\x82\x0c\x00\n\x02($$$\x11\x07\x16\x08\x10\x02\x16\t2\x00\x16\n2\x01\x16\x0b2\x02\x16\x0c2\x03\x16\rQc\x04@\t\x08\n\x81\x0b Qc@\t\x08\x0b\x81\x0b@Qc@\t\x08\x0c\x81\x0b`QcH\t\n\r\x81\x0b` Qc\x82\x14\x00\x0c\x03h`$$$\x11\x07\x16\x08\x10\x03\x16\t2\x00\x16\n2\x01\x16\x0b2\x02\x16\x0c2\x03\x16\rQc\x04H\t\n\n\x81\x0b``QcH\t\n\x0b\x81\x0b\x80\x07QcH\t\n\x0c\x81\x0b\x80\x08QcH\t\n\r\x81\x0b\x80\tQc\xa08P:\x04\x80\x0b13///---997799<\x1f%\x1f\"\x1f%)\x1f\"//\x12\x0e\x12\x0f\x12\x10\x12\x11\x12\x12\x12\x13\x12\x14*\x07Y\x12\x15\x12\x16\x12\x17\x12\x18\x12\x19\x12\x1a\x12\x08\x12\x07*\x08Y\x12\x1b\x12\x1c\x12\t\x12\x1d\x12\x1e\x12\x1f*\x06Y\x12 \x12!\x12\"\x12#\x12$\x12%*\x06Y\x12&\x12'\x12(\x12)\x12*\x12+*\x06Y\x12,\x12-\x12.\x12/\x120*\x05Y\x121\x122\x123\x124\x125*\x05Y\x126\x127\x128\x129\x12:*\x05Y\x12;\x12<\x12=\x12>\x12?\x12@\x12A\x12B\x12C\x12D\x12E*\x0bY\x12F\x12G\x12H\x12I\x12J\x12K\x12L\x12M\x12N\x12O\x12P*\x0bY\x12Q\x12R\x12S\x12T\x12U\x12V\x12W\x12X\x12Y\x12Z*\nY\x12[\x12\\\x12]\x12^\x12_\x12`\x12a\x12b\x12c\x12d*\nY\x12e\x12f\x12g\x12h\x12i\x12j\x12k\x12l\x12m\x12n\x12o*\x0bY\x12p\x12q\x12r\x12s\x12t\x12u\x12v\x12w\x12x\x12y\x12z*\x0bY\x12{\x12|\x12}\x12~\x12\x7f\x12\x81\x00\x12\x81\x01\x12\x81\x02\x12\x81\x03\x12\x81\x04*\nY\x12\x81\x05\x12\x81\x06\x12\x81\x07\x12\x81\x08\x12\x81\t\x12\x81\n\x12\x81\x0b\x12\x81\x0c\x12\x81\r\x12\x81\x0e\x12\x81\x0f*\x0bY\x12\x81\x10\x12\x81\x11\x12\x81\x12\x12\x81\x13\x12\x81\x14\x12\x81\x15\x12\x81\x16\x12\x81\x17\x12\x81\x18\x12\x81\x19*\nY\x12\x81\x1a\x12\x81\x1b\x12\x81\x1c\x12\x81\x1d\x12\x81\x1e\x12\x81\x1f\x12\x81 \x12\x81!\x12\x81\"\x12\x81#\x12\x81$*\x0bY\x12\x81%\x12\x81&*\x02Y\x12\x81'\x12\x81(\x12\x81)\x12\x81*\x12\x81+\x12\x81,\x12\x81-\x12\x81.\x12\x81/\x12\x810*\nY\x12\x811\x12\x812\x12\x813\x12\x814*\x04Y\x12\x815\x12\x816\x12\x817\x12\x818*\x04Y\x12\x819\x12\x81:\x12\x81;\x12\x81<*\x04YQc\x87p\x08@\x05\x80###############################\x00\xc0#\x01\xc0#\x02\xc0#\x03\xc0#\x04\xc0#\x05\xc0#\x06\xc0#\x07\xc0#\x08\xc0#\t\xc0#\n\xc0#\x0b\xc0#\x0c\xc0#\r\xc0#\x0e\xc0#\x0f\xc0#\x10\xc0#\x11\xc0#\x12\xc0#\x13\xc0#\x14\xc0#\x15\xc0#\x16\xc0#\x17\xc0#\x18\xc0#\x19\xc0#\x1a\xc0#\x1b\xc0#\x1c\xc0#\x1d\xc0Qc"
 
 
 class File(uio.IOBase):

From 6f68a8c2402dfd6b38363e61998e046735c1ab67 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 17 May 2022 14:00:01 +1000
Subject: [PATCH 2009/3533] tests/run-perfbench.py: Return error code if any
 test fails on target.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/run-perfbench.py | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/tests/run-perfbench.py b/tests/run-perfbench.py
index c143ae32f9e55..05efa83318d80 100755
--- a/tests/run-perfbench.py
+++ b/tests/run-perfbench.py
@@ -88,6 +88,7 @@ def run_benchmark_on_target(target, script):
 def run_benchmarks(target, param_n, param_m, n_average, test_list):
     skip_complex = run_feature_test(target, "complex") != "complex"
     skip_native = run_feature_test(target, "native_check") != "native"
+    target_had_error = False
 
     for test_file in sorted(test_list):
         print(test_file + ": ", end="")
@@ -147,6 +148,8 @@ def run_benchmarks(target, param_n, param_m, n_average, test_list):
                 error = "FAIL truth"
 
         if error is not None:
+            if not error.startswith("SKIP"):
+                target_had_error = True
             print(error)
         else:
             t_avg, t_sd = compute_stats(times)
@@ -162,6 +165,8 @@ def run_benchmarks(target, param_n, param_m, n_average, test_list):
 
         sys.stdout.flush()
 
+    return target_had_error
+
 
 def parse_output(filename):
     with open(filename) as f:
@@ -279,12 +284,15 @@ def main():
 
     print("N={} M={} n_average={}".format(N, M, n_average))
 
-    run_benchmarks(target, N, M, n_average, tests)
+    target_had_error = run_benchmarks(target, N, M, n_average, tests)
 
     if isinstance(target, pyboard.Pyboard):
         target.exit_raw_repl()
         target.close()
 
+    if target_had_error:
+        sys.exit(1)
+
 
 if __name__ == "__main__":
     main()

From 8e1db993cd6bca93c031619e05c465f05c48381c Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 16 May 2022 14:40:24 +1000
Subject: [PATCH 2010/3533] py/asmx64: Support full range of regs in
 asm_x64_lea_disp_to_r64.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/asmx64.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/py/asmx64.c b/py/asmx64.c
index 62df5c6d4ad79..5c923a523ca54 100644
--- a/py/asmx64.c
+++ b/py/asmx64.c
@@ -319,9 +319,7 @@ void asm_x64_mov_mem64_to_r64(asm_x64_t *as, int src_r64, int src_disp, int dest
 
 STATIC void asm_x64_lea_disp_to_r64(asm_x64_t *as, int src_r64, int src_disp, int dest_r64) {
     // use REX prefix for 64 bit operation
-    assert(src_r64 < 8);
-    assert(dest_r64 < 8);
-    asm_x64_write_byte_2(as, REX_PREFIX | REX_W, OPCODE_LEA_MEM_TO_R64);
+    asm_x64_write_byte_2(as, REX_PREFIX | REX_W | REX_R_FROM_R64(dest_r64) | REX_B_FROM_R64(src_r64), OPCODE_LEA_MEM_TO_R64);
     asm_x64_write_r64_disp(as, dest_r64, src_r64, src_disp);
 }
 

From 1762990579ff8ddc285e24492626fe40b6f2621d Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sun, 15 May 2022 13:37:06 +1000
Subject: [PATCH 2011/3533] py/bc: Provide separate code-state setup funcs for
 bytecode and native.

mpy-cross will now generate native code based on the size of
mp_code_state_native_t, and the runtime will use this struct to calculate
the offset of the .state field.  This makes native code generation and
execution (which rely on this struct) independent to the settings
MICROPY_STACKLESS and MICROPY_PY_SYS_SETTRACE, both of which change the
size of the mp_code_state_t struct.

Fixes issue #5059.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/bc.c           | 79 ++++++++++++++++++++++++++++++-----------------
 py/bc.h           | 12 +++++++
 py/emitnative.c   | 18 +++++------
 py/nativeglue.c   |  2 +-
 py/nativeglue.h   |  2 +-
 py/objfun.c       |  1 -
 py/objgenerator.c | 30 +++++++++++++++---
 7 files changed, 98 insertions(+), 46 deletions(-)

diff --git a/py/bc.c b/py/bc.c
index 2a21ffd4b7749..2c26d74895673 100644
--- a/py/bc.c
+++ b/py/bc.c
@@ -122,23 +122,15 @@ STATIC void dump_args(const mp_obj_t *a, size_t sz) {
 // contain the following valid entries:
 //    - code_state->fun_bc should contain a pointer to the function object
 //    - code_state->ip should contain a pointer to the beginning of the prelude
+//    - code_state->sp should be: &code_state->state[0] - 1
 //    - code_state->n_state should be the number of objects in the local state
-void mp_setup_code_state(mp_code_state_t *code_state, size_t n_args, size_t n_kw, const mp_obj_t *args) {
+STATIC void mp_setup_code_state_helper(mp_code_state_t *code_state, size_t n_args, size_t n_kw, const mp_obj_t *args) {
     // This function is pretty complicated.  It's main aim is to be efficient in speed and RAM
     // usage for the common case of positional only args.
 
     // get the function object that we want to set up (could be bytecode or native code)
     mp_obj_fun_bc_t *self = code_state->fun_bc;
 
-    #if MICROPY_STACKLESS
-    code_state->prev = NULL;
-    #endif
-
-    #if MICROPY_PY_SYS_SETTRACE
-    code_state->prev_state = NULL;
-    code_state->frame = NULL;
-    #endif
-
     // Get cached n_state (rather than decode it again)
     size_t n_state = code_state->n_state;
 
@@ -149,16 +141,16 @@ void mp_setup_code_state(mp_code_state_t *code_state, size_t n_args, size_t n_kw
     (void)n_state_unused;
     (void)n_exc_stack_unused;
 
-    code_state->sp = &code_state->state[0] - 1;
+    mp_obj_t *code_state_state = code_state->sp + 1;
     code_state->exc_sp_idx = 0;
 
     // zero out the local stack to begin with
-    memset(code_state->state, 0, n_state * sizeof(*code_state->state));
+    memset(code_state_state, 0, n_state * sizeof(*code_state->state));
 
     const mp_obj_t *kwargs = args + n_args;
 
     // var_pos_kw_args points to the stack where the var-args tuple, and var-kw dict, should go (if they are needed)
-    mp_obj_t *var_pos_kw_args = &code_state->state[n_state - 1 - n_pos_args - n_kwonly_args];
+    mp_obj_t *var_pos_kw_args = &code_state_state[n_state - 1 - n_pos_args - n_kwonly_args];
 
     // check positional arguments
 
@@ -181,7 +173,7 @@ void mp_setup_code_state(mp_code_state_t *code_state, size_t n_args, size_t n_kw
             if (n_args >= (size_t)(n_pos_args - n_def_pos_args)) {
                 // given enough arguments, but may need to use some default arguments
                 for (size_t i = n_args; i < n_pos_args; i++) {
-                    code_state->state[n_state - 1 - i] = self->extra_args[i - (n_pos_args - n_def_pos_args)];
+                    code_state_state[n_state - 1 - i] = self->extra_args[i - (n_pos_args - n_def_pos_args)];
                 }
             } else {
                 fun_pos_args_mismatch(self, n_pos_args - n_def_pos_args, n_args);
@@ -191,14 +183,14 @@ void mp_setup_code_state(mp_code_state_t *code_state, size_t n_args, size_t n_kw
 
     // copy positional args into state
     for (size_t i = 0; i < n_args; i++) {
-        code_state->state[n_state - 1 - i] = args[i];
+        code_state_state[n_state - 1 - i] = args[i];
     }
 
     // check keyword arguments
 
     if (n_kw != 0 || (scope_flags & MP_SCOPE_FLAG_DEFKWARGS) != 0) {
         DEBUG_printf("Initial args: ");
-        dump_args(code_state->state + n_state - n_pos_args - n_kwonly_args, n_pos_args + n_kwonly_args);
+        dump_args(code_state_state + n_state - n_pos_args - n_kwonly_args, n_pos_args + n_kwonly_args);
 
         mp_obj_t dict = MP_OBJ_NULL;
         if ((scope_flags & MP_SCOPE_FLAG_VARKEYWORDS) != 0) {
@@ -220,11 +212,11 @@ void mp_setup_code_state(mp_code_state_t *code_state, size_t n_args, size_t n_kw
                 arg_qstr = self->context->constants.qstr_table[arg_qstr];
                 #endif
                 if (wanted_arg_name == MP_OBJ_NEW_QSTR(arg_qstr)) {
-                    if (code_state->state[n_state - 1 - j] != MP_OBJ_NULL) {
+                    if (code_state_state[n_state - 1 - j] != MP_OBJ_NULL) {
                         mp_raise_msg_varg(&mp_type_TypeError,
                             MP_ERROR_TEXT("function got multiple values for argument '%q'"), MP_OBJ_QSTR_VALUE(wanted_arg_name));
                     }
-                    code_state->state[n_state - 1 - j] = kwargs[2 * i + 1];
+                    code_state_state[n_state - 1 - j] = kwargs[2 * i + 1];
                     goto continue2;
                 }
             }
@@ -242,10 +234,10 @@ void mp_setup_code_state(mp_code_state_t *code_state, size_t n_args, size_t n_kw
         }
 
         DEBUG_printf("Args with kws flattened: ");
-        dump_args(code_state->state + n_state - n_pos_args - n_kwonly_args, n_pos_args + n_kwonly_args);
+        dump_args(code_state_state + n_state - n_pos_args - n_kwonly_args, n_pos_args + n_kwonly_args);
 
         // fill in defaults for positional args
-        mp_obj_t *d = &code_state->state[n_state - n_pos_args];
+        mp_obj_t *d = &code_state_state[n_state - n_pos_args];
         mp_obj_t *s = &self->extra_args[n_def_pos_args - 1];
         for (size_t i = n_def_pos_args; i > 0; i--, d++, s--) {
             if (*d == MP_OBJ_NULL) {
@@ -254,13 +246,13 @@ void mp_setup_code_state(mp_code_state_t *code_state, size_t n_args, size_t n_kw
         }
 
         DEBUG_printf("Args after filling default positional: ");
-        dump_args(code_state->state + n_state - n_pos_args - n_kwonly_args, n_pos_args + n_kwonly_args);
+        dump_args(code_state_state + n_state - n_pos_args - n_kwonly_args, n_pos_args + n_kwonly_args);
 
         // Check that all mandatory positional args are specified
-        while (d < &code_state->state[n_state]) {
+        while (d < &code_state_state[n_state]) {
             if (*d++ == MP_OBJ_NULL) {
                 mp_raise_msg_varg(&mp_type_TypeError,
-                    MP_ERROR_TEXT("function missing required positional argument #%d"), &code_state->state[n_state] - d);
+                    MP_ERROR_TEXT("function missing required positional argument #%d"), &code_state_state[n_state] - d);
             }
         }
 
@@ -275,13 +267,13 @@ void mp_setup_code_state(mp_code_state_t *code_state, size_t n_args, size_t n_kw
             #if MICROPY_EMIT_BYTECODE_USES_QSTR_TABLE
             arg_qstr = self->context->constants.qstr_table[arg_qstr];
             #endif
-            if (code_state->state[n_state - 1 - n_pos_args - i] == MP_OBJ_NULL) {
+            if (code_state_state[n_state - 1 - n_pos_args - i] == MP_OBJ_NULL) {
                 mp_map_elem_t *elem = NULL;
                 if ((scope_flags & MP_SCOPE_FLAG_DEFKWARGS) != 0) {
                     elem = mp_map_lookup(&((mp_obj_dict_t *)MP_OBJ_TO_PTR(self->extra_args[n_def_pos_args]))->map, MP_OBJ_NEW_QSTR(arg_qstr), MP_MAP_LOOKUP);
                 }
                 if (elem != NULL) {
-                    code_state->state[n_state - 1 - n_pos_args - i] = elem->value;
+                    code_state_state[n_state - 1 - n_pos_args - i] = elem->value;
                 } else {
                     mp_raise_msg_varg(&mp_type_TypeError,
                         MP_ERROR_TEXT("function missing required keyword argument '%q'"), arg_qstr);
@@ -305,18 +297,47 @@ void mp_setup_code_state(mp_code_state_t *code_state, size_t n_args, size_t n_kw
     // bytecode prelude: initialise closed over variables
     for (; n_cell; --n_cell) {
         size_t local_num = *ip++;
-        code_state->state[n_state - 1 - local_num] =
-            mp_obj_new_cell(code_state->state[n_state - 1 - local_num]);
+        code_state_state[n_state - 1 - local_num] =
+            mp_obj_new_cell(code_state_state[n_state - 1 - local_num]);
     }
 
     // now that we skipped over the prelude, set the ip for the VM
     code_state->ip = ip;
 
     DEBUG_printf("Calling: n_pos_args=%d, n_kwonly_args=%d\n", n_pos_args, n_kwonly_args);
-    dump_args(code_state->state + n_state - n_pos_args - n_kwonly_args, n_pos_args + n_kwonly_args);
-    dump_args(code_state->state, n_state);
+    dump_args(code_state_state + n_state - n_pos_args - n_kwonly_args, n_pos_args + n_kwonly_args);
+    dump_args(code_state_state, n_state);
 }
 
+// On entry code_state should be allocated somewhere (stack/heap) and
+// contain the following valid entries:
+//    - code_state->fun_bc should contain a pointer to the function object
+//    - code_state->n_state should be the number of objects in the local state
+void mp_setup_code_state(mp_code_state_t *code_state, size_t n_args, size_t n_kw, const mp_obj_t *args) {
+    code_state->ip = code_state->fun_bc->bytecode;
+    code_state->sp = &code_state->state[0] - 1;
+    #if MICROPY_STACKLESS
+    code_state->prev = NULL;
+    #endif
+    #if MICROPY_PY_SYS_SETTRACE
+    code_state->prev_state = NULL;
+    code_state->frame = NULL;
+    #endif
+    mp_setup_code_state_helper(code_state, n_args, n_kw, args);
+}
+
+#if MICROPY_EMIT_NATIVE
+// On entry code_state should be allocated somewhere (stack/heap) and
+// contain the following valid entries:
+//    - code_state->fun_bc should contain a pointer to the function object
+//    - code_state->ip should contain a pointer to the beginning of the prelude
+//    - code_state->n_state should be the number of objects in the local state
+void mp_setup_code_state_native(mp_code_state_native_t *code_state, size_t n_args, size_t n_kw, const mp_obj_t *args) {
+    code_state->sp = &code_state->state[0] - 1;
+    mp_setup_code_state_helper((mp_code_state_t *)code_state, n_args, n_kw, args);
+}
+#endif
+
 #if MICROPY_PERSISTENT_CODE_LOAD || MICROPY_PERSISTENT_CODE_SAVE
 
 // The following table encodes the number of bytes that a specific opcode
diff --git a/py/bc.h b/py/bc.h
index 3b7b625fecfdb..a888164f18649 100644
--- a/py/bc.h
+++ b/py/bc.h
@@ -254,6 +254,17 @@ typedef struct _mp_code_state_t {
     // mp_exc_stack_t exc_state[0];
 } mp_code_state_t;
 
+// State for an executing native function (based on mp_code_state_t).
+typedef struct _mp_code_state_native_t {
+    struct _mp_obj_fun_bc_t *fun_bc;
+    const byte *ip;
+    mp_obj_t *sp;
+    uint16_t n_state;
+    uint16_t exc_sp_idx;
+    mp_obj_dict_t *old_globals;
+    mp_obj_t state[0];
+} mp_code_state_native_t;
+
 // Allocator may return NULL, in which case data is not stored (can be used to compute size).
 typedef uint8_t *(*mp_encode_uint_allocator_t)(void *env, size_t nbytes);
 
@@ -269,6 +280,7 @@ mp_vm_return_kind_t mp_execute_bytecode(mp_code_state_t *code_state,
     mp_obj_t inject_exc);
 mp_code_state_t *mp_obj_fun_bc_prepare_codestate(mp_obj_t func, size_t n_args, size_t n_kw, const mp_obj_t *args);
 void mp_setup_code_state(mp_code_state_t *code_state, size_t n_args, size_t n_kw, const mp_obj_t *args);
+void mp_setup_code_state_native(mp_code_state_native_t *code_state, size_t n_args, size_t n_kw, const mp_obj_t *args);
 void mp_bytecode_print(const mp_print_t *print, const struct _mp_raw_code_t *rc, const mp_module_constants_t *cm);
 void mp_bytecode_print2(const mp_print_t *print, const byte *ip, size_t len, struct _mp_raw_code_t *const *child_table, const mp_module_constants_t *cm);
 const byte *mp_bytecode_print_str(const mp_print_t *print, const byte *ip_start, const byte *ip, struct _mp_raw_code_t *const *child_table, const mp_module_constants_t *cm);
diff --git a/py/emitnative.c b/py/emitnative.c
index 056a1a8a6175c..bfb37ef4f77f4 100644
--- a/py/emitnative.c
+++ b/py/emitnative.c
@@ -63,7 +63,7 @@
 
 // C stack layout for native functions:
 //  0:                          nlr_buf_t [optional]
-//  emit->code_state_start:     mp_code_state_t
+//  emit->code_state_start:     mp_code_state_native_t
 //  emit->stack_start:          Python object stack             | emit->n_state
 //                              locals (reversed, L0 at end)    |
 //
@@ -71,7 +71,7 @@
 //  0=emit->stack_start:        nlr_buf_t
 //
 //  Then REG_GENERATOR_STATE points to:
-//  0=emit->code_state_start:   mp_code_state_t
+//  0=emit->code_state_start:   mp_code_state_native_t
 //  emit->stack_start:          Python object stack             | emit->n_state
 //                              locals (reversed, L0 at end)    |
 //
@@ -88,12 +88,12 @@
 #else
 #define SIZEOF_NLR_BUF (sizeof(nlr_buf_t) / sizeof(uintptr_t))
 #endif
-#define SIZEOF_CODE_STATE (sizeof(mp_code_state_t) / sizeof(uintptr_t))
-#define OFFSETOF_CODE_STATE_STATE (offsetof(mp_code_state_t, state) / sizeof(uintptr_t))
-#define OFFSETOF_CODE_STATE_FUN_BC (offsetof(mp_code_state_t, fun_bc) / sizeof(uintptr_t))
-#define OFFSETOF_CODE_STATE_IP (offsetof(mp_code_state_t, ip) / sizeof(uintptr_t))
-#define OFFSETOF_CODE_STATE_SP (offsetof(mp_code_state_t, sp) / sizeof(uintptr_t))
-#define OFFSETOF_CODE_STATE_N_STATE (offsetof(mp_code_state_t, n_state) / sizeof(uintptr_t))
+#define SIZEOF_CODE_STATE (sizeof(mp_code_state_native_t) / sizeof(uintptr_t))
+#define OFFSETOF_CODE_STATE_STATE (offsetof(mp_code_state_native_t, state) / sizeof(uintptr_t))
+#define OFFSETOF_CODE_STATE_FUN_BC (offsetof(mp_code_state_native_t, fun_bc) / sizeof(uintptr_t))
+#define OFFSETOF_CODE_STATE_IP (offsetof(mp_code_state_native_t, ip) / sizeof(uintptr_t))
+#define OFFSETOF_CODE_STATE_SP (offsetof(mp_code_state_native_t, sp) / sizeof(uintptr_t))
+#define OFFSETOF_CODE_STATE_N_STATE (offsetof(mp_code_state_native_t, n_state) / sizeof(uintptr_t))
 #define OFFSETOF_OBJ_FUN_BC_CONTEXT (offsetof(mp_obj_fun_bc_t, context) / sizeof(uintptr_t))
 #define OFFSETOF_OBJ_FUN_BC_CHILD_TABLE (offsetof(mp_obj_fun_bc_t, child_table) / sizeof(uintptr_t))
 #define OFFSETOF_OBJ_FUN_BC_BYTECODE (offsetof(mp_obj_fun_bc_t, bytecode) / sizeof(uintptr_t))
@@ -412,7 +412,7 @@ STATIC void emit_native_start_pass(emit_t *emit, pass_kind_t pass, scope_t *scop
 
     // generate code for entry to function
 
-    // Work out start of code state (mp_code_state_t or reduced version for viper)
+    // Work out start of code state (mp_code_state_native_t or reduced version for viper)
     emit->code_state_start = 0;
     if (NEED_GLOBAL_EXC_HANDLER(emit)) {
         emit->code_state_start = SIZEOF_NLR_BUF;
diff --git a/py/nativeglue.c b/py/nativeglue.c
index aed6fecddf38e..743ff38ccbbf4 100644
--- a/py/nativeglue.c
+++ b/py/nativeglue.c
@@ -302,7 +302,7 @@ const mp_fun_table_t mp_fun_table = {
     mp_delete_global,
     mp_obj_new_closure,
     mp_arg_check_num_sig,
-    mp_setup_code_state,
+    mp_setup_code_state_native,
     mp_small_int_floor_divide,
     mp_small_int_modulo,
     mp_native_yield_from,
diff --git a/py/nativeglue.h b/py/nativeglue.h
index 49ce665f2d0d8..7b1ccd8d464fa 100644
--- a/py/nativeglue.h
+++ b/py/nativeglue.h
@@ -131,7 +131,7 @@ typedef struct _mp_fun_table_t {
     void (*delete_global)(qstr qst);
     mp_obj_t (*new_closure)(mp_obj_t fun, size_t n_closed_over, const mp_obj_t *closed);
     void (*arg_check_num_sig)(size_t n_args, size_t n_kw, uint32_t sig);
-    void (*setup_code_state)(mp_code_state_t *code_state, size_t n_args, size_t n_kw, const mp_obj_t *args);
+    void (*setup_code_state_native)(mp_code_state_native_t *code_state, size_t n_args, size_t n_kw, const mp_obj_t *args);
     mp_int_t (*small_int_floor_divide)(mp_int_t num, mp_int_t denom);
     mp_int_t (*small_int_modulo)(mp_int_t dividend, mp_int_t divisor);
     bool (*yield_from)(mp_obj_t gen, mp_obj_t send_value, mp_obj_t *ret_value);
diff --git a/py/objfun.c b/py/objfun.c
index 0053db449371c..8f0c3eb6d4d34 100644
--- a/py/objfun.c
+++ b/py/objfun.c
@@ -209,7 +209,6 @@ STATIC void dump_args(const mp_obj_t *a, size_t sz) {
 
 #define INIT_CODESTATE(code_state, _fun_bc, _n_state, n_args, n_kw, args) \
     code_state->fun_bc = _fun_bc; \
-    code_state->ip = _fun_bc->bytecode; \
     code_state->n_state = _n_state; \
     mp_setup_code_state(code_state, n_args, n_kw, args); \
     code_state->old_globals = mp_globals_get();
diff --git a/py/objgenerator.c b/py/objgenerator.c
index c1747a88bc784..12fd81a8bba0e 100644
--- a/py/objgenerator.c
+++ b/py/objgenerator.c
@@ -65,7 +65,6 @@ STATIC mp_obj_t gen_wrap_call(mp_obj_t self_in, size_t n_args, size_t n_kw, cons
 
     o->pend_exc = mp_const_none;
     o->code_state.fun_bc = self_fun;
-    o->code_state.ip = self_fun->bytecode;
     o->code_state.n_state = n_state;
     mp_setup_code_state(&o->code_state, n_args, n_kw, args);
     return MP_OBJ_FROM_PTR(o);
@@ -87,6 +86,13 @@ const mp_obj_type_t mp_type_gen_wrap = {
 
 #if MICROPY_EMIT_NATIVE
 
+// Based on mp_obj_gen_instance_t.
+typedef struct _mp_obj_gen_instance_native_t {
+    mp_obj_base_t base;
+    mp_obj_t pend_exc;
+    mp_code_state_native_t code_state;
+} mp_obj_gen_instance_native_t;
+
 STATIC mp_obj_t native_gen_wrap_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
     // The state for a native generating function is held in the same struct as a bytecode function
     mp_obj_fun_bc_t *self_fun = MP_OBJ_TO_PTR(self_in);
@@ -106,14 +112,15 @@ STATIC mp_obj_t native_gen_wrap_call(mp_obj_t self_in, size_t n_args, size_t n_k
     MP_BC_PRELUDE_SIG_DECODE(ip);
 
     // Allocate the generator object, with room for local stack (exception stack not needed).
-    mp_obj_gen_instance_t *o = mp_obj_malloc_var(mp_obj_gen_instance_t, byte, n_state * sizeof(mp_obj_t), &mp_type_gen_instance);
+    mp_obj_gen_instance_native_t *o = mp_obj_malloc_var(mp_obj_gen_instance_native_t, byte, n_state * sizeof(mp_obj_t), &mp_type_gen_instance);
 
     // Parse the input arguments and set up the code state
     o->pend_exc = mp_const_none;
     o->code_state.fun_bc = self_fun;
     o->code_state.ip = prelude_ptr;
     o->code_state.n_state = n_state;
-    mp_setup_code_state(&o->code_state, n_args, n_kw, args);
+    o->code_state.sp = &o->code_state.state[0] - 1;
+    mp_setup_code_state_native(&o->code_state, n_args, n_kw, args);
 
     // Indicate we are a native function, which doesn't use this variable
     o->code_state.exc_sp_idx = MP_CODE_STATE_EXC_SP_IDX_SENTINEL;
@@ -171,7 +178,13 @@ mp_vm_return_kind_t mp_obj_gen_resume(mp_obj_t self_in, mp_obj_t send_value, mp_
     #endif
 
     // If the generator is started, allow sending a value.
-    if (self->code_state.sp == self->code_state.state - 1) {
+    void *state_start = self->code_state.state - 1;
+    #if MICROPY_EMIT_NATIVE
+    if (self->code_state.exc_sp_idx == MP_CODE_STATE_EXC_SP_IDX_SENTINEL) {
+        state_start = ((mp_obj_gen_instance_native_t *)self)->code_state.state - 1;
+    }
+    #endif
+    if (self->code_state.sp == state_start) {
         if (send_value != mp_const_none) {
             mp_raise_TypeError(MP_ERROR_TEXT("can't send non-None value to a just-started generator"));
         }
@@ -226,7 +239,14 @@ mp_vm_return_kind_t mp_obj_gen_resume(mp_obj_t self_in, mp_obj_t send_value, mp_
 
         case MP_VM_RETURN_EXCEPTION: {
             self->code_state.ip = 0;
-            *ret_val = self->code_state.state[0];
+            #if MICROPY_EMIT_NATIVE
+            if (self->code_state.exc_sp_idx == MP_CODE_STATE_EXC_SP_IDX_SENTINEL) {
+                *ret_val = ((mp_obj_gen_instance_native_t *)self)->code_state.state[0];
+            } else
+            #endif
+            {
+                *ret_val = self->code_state.state[0];
+            }
             // PEP479: if StopIteration is raised inside a generator it is replaced with RuntimeError
             if (mp_obj_is_subclass_fast(MP_OBJ_FROM_PTR(mp_obj_get_type(*ret_val)), MP_OBJ_FROM_PTR(&mp_type_StopIteration))) {
                 *ret_val = mp_obj_new_exception_msg(&mp_type_RuntimeError, MP_ERROR_TEXT("generator raised StopIteration"));

From 5f650b7b7a200a32829fed4efffe606c69f0bc87 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 16 May 2022 08:47:44 +1000
Subject: [PATCH 2012/3533] tests/thread: Use less resources for stress_aes if
 settrace enabled.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/thread/stress_aes.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/tests/thread/stress_aes.py b/tests/thread/stress_aes.py
index 1bf252a807f9a..ebc84d79b3a87 100644
--- a/tests/thread/stress_aes.py
+++ b/tests/thread/stress_aes.py
@@ -267,7 +267,11 @@ def thread_entry(n_loop):
 if __name__ == "__main__":
     import sys
 
-    if sys.platform == "rp2":
+    if hasattr(sys, "settrace"):
+        # Builds with sys.settrace enabled are slow, so make the test short.
+        n_thread = 2
+        n_loop = 2
+    elif sys.platform == "rp2":
         n_thread = 1
         n_loop = 2
     elif sys.platform in ("esp32", "pyboard"):

From ab0a8f30866678ae713d2cf7c8b17e7265dadf8c Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 16 May 2022 08:48:18 +1000
Subject: [PATCH 2013/3533] tests/run-tests.py: Exclude settrace tests when
 using native emitter.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/run-tests.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tests/run-tests.py b/tests/run-tests.py
index fa2db9d2eb618..60c2c3fe198b6 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -529,6 +529,9 @@ def run_tests(pyb, tests, args, result_dir, num_threads=1):
             "misc/print_exception.py"
         )  # because native doesn't have proper traceback info
         skip_tests.add("misc/sys_exc_info.py")  # sys.exc_info() is not supported for native
+        skip_tests.add("misc/sys_settrace_features.py")  # sys.settrace() not supported
+        skip_tests.add("misc/sys_settrace_generator.py")  # sys.settrace() not supported
+        skip_tests.add("misc/sys_settrace_loop.py")  # sys.settrace() not supported
         skip_tests.add(
             "micropython/emg_exc.py"
         )  # because native doesn't have proper traceback info

From acfc3bbdf804eac7b230e1bba1546c86aec4e201 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 16 May 2022 09:27:31 +1000
Subject: [PATCH 2014/3533] tests/multi_net: Skip SSL test if relevant modules
 aren't available.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/multi_net/ssl_data.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/tests/multi_net/ssl_data.py b/tests/multi_net/ssl_data.py
index e5196c81ba3df..036d7738226bb 100644
--- a/tests/multi_net/ssl_data.py
+++ b/tests/multi_net/ssl_data.py
@@ -1,7 +1,11 @@
 # Simple test creating an SSL connection and transferring some data
 # This test won't run under CPython because it requires key/cert
 
-import ubinascii as binascii, usocket as socket, ussl as ssl
+try:
+    import ubinascii as binascii, usocket as socket, ussl as ssl
+except ImportError:
+    print("SKIP")
+    raise SystemExit
 
 PORT = 8000
 

From f8d3956c63edd92934abcf2697c5b98842fbd18c Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sun, 15 May 2022 13:38:44 +1000
Subject: [PATCH 2015/3533] tools/ci.sh: Run full test suite on stackless and
 settrace builds.

Signed-off-by: Damien George <damien@micropython.org>
---
 tools/ci.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/ci.sh b/tools/ci.sh
index 3d8cf9741d34b..31f520a4f31ec 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -546,7 +546,7 @@ function ci_unix_settrace_build {
 }
 
 function ci_unix_settrace_run_tests {
-    ci_unix_run_tests_helper "${CI_UNIX_OPTS_SYS_SETTRACE[@]}"
+    ci_unix_run_tests_full_helper standard "${CI_UNIX_OPTS_SYS_SETTRACE[@]}"
 }
 
 function ci_unix_settrace_stackless_build {
@@ -555,7 +555,7 @@ function ci_unix_settrace_stackless_build {
 }
 
 function ci_unix_settrace_stackless_run_tests {
-    ci_unix_run_tests_helper "${CI_UNIX_OPTS_SYS_SETTRACE_STACKLESS[@]}"
+    ci_unix_run_tests_full_helper standard "${CI_UNIX_OPTS_SYS_SETTRACE_STACKLESS[@]}"
 }
 
 function ci_unix_macos_build {

From 8725a32f41de6c4ea720945f2c81edd08d349895 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 17 May 2022 16:00:49 +1000
Subject: [PATCH 2016/3533] tools/ci.sh: For esp8266 CI install esptool 3.3.1.

Signed-off-by: Damien George <damien@micropython.org>
---
 tools/ci.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/ci.sh b/tools/ci.sh
index 31f520a4f31ec..3d084508ff220 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -149,7 +149,7 @@ function ci_esp32_build {
 # ports/esp8266
 
 function ci_esp8266_setup {
-    sudo pip install pyserial esptool
+    sudo pip install pyserial esptool==3.3.1
     wget https://github.com/jepler/esp-open-sdk/releases/download/2018-06-10/xtensa-lx106-elf-standalone.tar.gz
     zcat xtensa-lx106-elf-standalone.tar.gz | tar x
     # Remove this esptool.py so pip version is used instead

From 1fb01bd6c5dc350f3c617ca8edae8dea9e5516ae Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 10 May 2022 13:56:24 +1000
Subject: [PATCH 2017/3533] py/emitnative: Put a pointer to the native prelude
 in child_table array.

Some architectures (like esp32 xtensa) cannot read byte-wise from
executable memory.  This means the prelude for native functions -- which is
usually located after the machine code for the native function -- must be
placed in separate memory that can be read byte-wise.  Prior to this commit
this was achieved by enabling N_PRELUDE_AS_BYTES_OBJ for the emitter and
MICROPY_EMIT_NATIVE_PRELUDE_AS_BYTES_OBJ for the runtime.  The prelude was
then placed in a bytes object, pointed to by the module's constant table.

This behaviour is changed by this commit so that a pointer to the prelude
is stored either in mp_obj_fun_bc_t.child_table, or in
mp_obj_fun_bc_t.child_table[num_children] if num_children > 0.  The reasons
for doing this are:

1. It decouples the native emitter from runtime requirements, the emitted
   code no longer needs to know if the system it runs on can/can't read
   byte-wise from executable memory.

2. It makes all ports have the same emitter behaviour, there is no longer
   the N_PRELUDE_AS_BYTES_OBJ option.

3. The module's constant table is now used only for actual constants in the
   Python code.  This allows further optimisations to be done with the
   constants (eg constant deduplication).

Code size change for those ports that enable the native emitter:
   unix x64:   +80 +0.015%
      stm32:   +24 +0.004% PYBV10
    esp8266:   +88 +0.013% GENERIC
      esp32:   -20 -0.002% GENERIC[incl -112(data)]
        rp2:   +32 +0.005% PICO

Signed-off-by: Damien George <damien@micropython.org>
---
 py/compile.c        |  8 ----
 py/emitnative.c     | 93 +++++++++++++++++----------------------------
 py/emitnxtensawin.c |  1 -
 py/mpconfig.h       |  6 ++-
 py/objgenerator.c   | 15 ++++----
 py/persistentcode.c | 24 +++++++++++-
 tools/mpy-tool.py   | 29 ++++++++++++--
 7 files changed, 93 insertions(+), 83 deletions(-)

diff --git a/py/compile.c b/py/compile.c
index 6bb601b9252a6..2760d8bfb9a61 100644
--- a/py/compile.c
+++ b/py/compile.c
@@ -3031,14 +3031,6 @@ STATIC bool compile_scope(compiler_t *comp, scope_t *scope, pass_kind_t pass) {
         // they will be computed in this first pass
         scope->stack_size = 0;
         scope->exc_stack_size = 0;
-
-        #if MICROPY_EMIT_NATIVE
-        if (scope->emit_options == MP_EMIT_OPT_NATIVE_PYTHON || scope->emit_options == MP_EMIT_OPT_VIPER) {
-            // allow native code to perfom basic tasks during the pass scope
-            // note: the first argument passed here is mp_emit_common_t, not the native emitter context
-            NATIVE_EMITTER_TABLE->start_pass((void *)&comp->emit_common, comp->pass, scope);
-        }
-        #endif
     }
 
     // compile
diff --git a/py/emitnative.c b/py/emitnative.c
index bfb37ef4f77f4..ddc0b5b97bc96 100644
--- a/py/emitnative.c
+++ b/py/emitnative.c
@@ -231,9 +231,7 @@ struct _emit_t {
     exc_stack_entry_t *exc_stack;
 
     int prelude_offset;
-    #if N_PRELUDE_AS_BYTES_OBJ
-    size_t prelude_const_table_offset;
-    #endif
+    int prelude_ptr_index;
     int start_offset;
     int n_state;
     uint16_t code_state_start;
@@ -349,16 +347,6 @@ STATIC void emit_native_mov_reg_qstr_obj(emit_t *emit, int reg_dest, qstr qst) {
 STATIC void emit_native_start_pass(emit_t *emit, pass_kind_t pass, scope_t *scope) {
     DEBUG_printf("start_pass(pass=%u, scope=%p)\n", pass, scope);
 
-    if (pass == MP_PASS_SCOPE) {
-        // Note: the first argument passed here is mp_emit_common_t, not the native emitter context
-        #if N_PRELUDE_AS_BYTES_OBJ
-        if (scope->emit_options == MP_EMIT_OPT_NATIVE_PYTHON) {
-            mp_emit_common_alloc_const_obj((mp_emit_common_t *)emit, mp_const_none);
-        }
-        #endif
-        return;
-    }
-
     emit->pass = pass;
     emit->do_viper_types = scope->emit_options == MP_EMIT_OPT_VIPER;
     emit->stack_size = 0;
@@ -511,12 +499,7 @@ STATIC void emit_native_start_pass(emit_t *emit, pass_kind_t pass, scope_t *scop
         if (emit->scope->scope_flags & MP_SCOPE_FLAG_GENERATOR) {
             emit->code_state_start = 0;
             emit->stack_start = SIZEOF_CODE_STATE;
-            #if N_PRELUDE_AS_BYTES_OBJ
-            // Load index of prelude bytes object in const_table
-            mp_asm_base_data(&emit->as->base, ASM_WORD_SIZE, (uintptr_t)emit->prelude_const_table_offset);
-            #else
-            mp_asm_base_data(&emit->as->base, ASM_WORD_SIZE, (uintptr_t)emit->prelude_offset);
-            #endif
+            mp_asm_base_data(&emit->as->base, ASM_WORD_SIZE, (uintptr_t)emit->prelude_ptr_index);
             mp_asm_base_data(&emit->as->base, ASM_WORD_SIZE, (uintptr_t)emit->start_offset);
             ASM_ENTRY(emit->as, SIZEOF_NLR_BUF);
 
@@ -562,41 +545,19 @@ STATIC void emit_native_start_pass(emit_t *emit, pass_kind_t pass, scope_t *scop
             // Set code_state.fun_bc
             ASM_MOV_LOCAL_REG(emit->as, LOCAL_IDX_FUN_OBJ(emit), REG_PARENT_ARG_1);
 
-            // Set code_state.ip, a pointer to the beginning of the prelude
+            // Set code_state.ip, a pointer to the beginning of the prelude.  This pointer is found
+            // either directly in mp_obj_fun_bc_t.child_table (if there are no children), or in
+            // mp_obj_fun_bc_t.child_table[num_children] (if num_children > 0).
             // Need to use some locals for this, so assert that they are available for use
             MP_STATIC_ASSERT(REG_LOCAL_3 != REG_PARENT_ARG_1);
             MP_STATIC_ASSERT(REG_LOCAL_3 != REG_PARENT_ARG_2);
             MP_STATIC_ASSERT(REG_LOCAL_3 != REG_PARENT_ARG_3);
             MP_STATIC_ASSERT(REG_LOCAL_3 != REG_PARENT_ARG_4);
-            int code_state_ip_local = emit->code_state_start + OFFSETOF_CODE_STATE_IP;
-            #if N_PRELUDE_AS_BYTES_OBJ
-            // Prelude is a bytes object in const_table[prelude_const_table_offset].
-            ASM_LOAD_REG_REG_OFFSET(emit->as, REG_LOCAL_3, REG_PARENT_ARG_1, OFFSETOF_OBJ_FUN_BC_CONTEXT);
-            ASM_LOAD_REG_REG_OFFSET(emit->as, REG_LOCAL_3, REG_LOCAL_3, OFFSETOF_MODULE_CONTEXT_OBJ_TABLE);
-            ASM_LOAD_REG_REG_OFFSET(emit->as, REG_LOCAL_3, REG_LOCAL_3, emit->prelude_const_table_offset);
-            ASM_LOAD_REG_REG_OFFSET(emit->as, REG_LOCAL_3, REG_LOCAL_3, offsetof(mp_obj_str_t, data) / sizeof(uintptr_t));
-            #else
-            MP_STATIC_ASSERT(REG_LOCAL_2 != REG_PARENT_ARG_1);
-            MP_STATIC_ASSERT(REG_LOCAL_2 != REG_PARENT_ARG_2);
-            MP_STATIC_ASSERT(REG_LOCAL_2 != REG_PARENT_ARG_3);
-            MP_STATIC_ASSERT(REG_LOCAL_2 != REG_PARENT_ARG_4);
-            // Prelude is at the end of the machine code
-            ASM_LOAD_REG_REG_OFFSET(emit->as, REG_LOCAL_3, REG_PARENT_ARG_1, OFFSETOF_OBJ_FUN_BC_BYTECODE);
-            if (emit->pass == MP_PASS_CODE_SIZE) {
-                // Commit to the encoding size based on the value of prelude_offset in this pass.
-                // By using 32768 as the cut-off it is highly unlikely that prelude_offset will
-                // grow beyond 65535 by the end of thiss pass, and so require the larger encoding.
-                emit->prelude_offset_uses_u16_encoding = emit->prelude_offset < 32768;
-            }
-            if (emit->prelude_offset_uses_u16_encoding) {
-                assert(emit->prelude_offset <= 65535);
-                ASM_MOV_REG_IMM_FIX_U16((emit)->as, REG_LOCAL_2, emit->prelude_offset);
-            } else {
-                ASM_MOV_REG_IMM_FIX_WORD((emit)->as, REG_LOCAL_2, emit->prelude_offset);
+            ASM_LOAD_REG_REG_OFFSET(emit->as, REG_LOCAL_3, REG_PARENT_ARG_1, OFFSETOF_OBJ_FUN_BC_CHILD_TABLE);
+            if (emit->prelude_ptr_index != 0) {
+                ASM_LOAD_REG_REG_OFFSET(emit->as, REG_LOCAL_3, REG_LOCAL_3, emit->prelude_ptr_index);
             }
-            ASM_ADD_REG_REG(emit->as, REG_LOCAL_3, REG_LOCAL_2);
-            #endif
-            emit_native_mov_state_reg(emit, code_state_ip_local, REG_LOCAL_3);
+            emit_native_mov_state_reg(emit, emit->code_state_start + OFFSETOF_CODE_STATE_IP, REG_LOCAL_3);
 
             // Set code_state.n_state (only works on little endian targets due to n_state being uint16_t)
             emit_native_mov_state_imm_via(emit, emit->code_state_start + OFFSETOF_CODE_STATE_N_STATE, emit->n_state, REG_ARG_1);
@@ -657,6 +618,7 @@ STATIC bool emit_native_end_pass(emit_t *emit) {
 
     if (!emit->do_viper_types) {
         emit->prelude_offset = mp_asm_base_get_code_pos(&emit->as->base);
+        emit->prelude_ptr_index = emit->emit_common->ct_cur_child;
 
         size_t n_state = emit->n_state;
         size_t n_exc_stack = 0; // exc-stack not needed for native code
@@ -693,16 +655,6 @@ STATIC bool emit_native_end_pass(emit_t *emit) {
         }
         emit->n_cell = mp_asm_base_get_code_pos(&emit->as->base) - cell_start;
 
-        #if N_PRELUDE_AS_BYTES_OBJ
-        // Create the prelude as a bytes object, and store it in the constant table
-        mp_obj_t prelude = mp_const_none;
-        if (emit->pass == MP_PASS_EMIT) {
-            void *buf = emit->as->base.code_base + emit->prelude_offset;
-            size_t n = emit->as->base.code_offset - emit->prelude_offset;
-            prelude = mp_obj_new_bytes(buf, n);
-        }
-        emit->prelude_const_table_offset = mp_emit_common_alloc_const_obj(emit->emit_common, prelude);
-        #endif
     }
 
     ASM_END_PASS(emit->as);
@@ -725,10 +677,33 @@ STATIC bool emit_native_end_pass(emit_t *emit) {
         void *f = mp_asm_base_get_code(&emit->as->base);
         mp_uint_t f_len = mp_asm_base_get_code_size(&emit->as->base);
 
+        mp_raw_code_t **children = emit->emit_common->children;
+        if (!emit->do_viper_types) {
+            #if MICROPY_EMIT_NATIVE_PRELUDE_SEPARATE_FROM_MACHINE_CODE
+            // Executable code cannot be accessed byte-wise on this architecture, so copy
+            // the prelude to a separate memory region that is byte-wise readable.
+            void *buf = emit->as->base.code_base + emit->prelude_offset;
+            size_t n = emit->as->base.code_offset - emit->prelude_offset;
+            const uint8_t *prelude_ptr = memcpy(m_new(uint8_t, n), buf, n);
+            #else
+            // Point to the prelude directly, at the end of the machine code data.
+            const uint8_t *prelude_ptr = (const uint8_t *)f + emit->prelude_offset;
+            #endif
+
+            // Store the pointer to the prelude using the child_table.
+            assert(emit->prelude_ptr_index == emit->emit_common->ct_cur_child);
+            if (emit->prelude_ptr_index == 0) {
+                children = (void *)prelude_ptr;
+            } else {
+                children = m_renew(mp_raw_code_t *, children, emit->prelude_ptr_index, emit->prelude_ptr_index + 1);
+                children[emit->prelude_ptr_index] = (void *)prelude_ptr;
+            }
+        }
+
         mp_emit_glue_assign_native(emit->scope->raw_code,
             emit->do_viper_types ? MP_CODE_NATIVE_VIPER : MP_CODE_NATIVE_PY,
             f, f_len,
-            emit->emit_common->children,
+            children,
             #if MICROPY_PERSISTENT_CODE_SAVE
             emit->emit_common->ct_cur_child,
             emit->prelude_offset,
diff --git a/py/emitnxtensawin.c b/py/emitnxtensawin.c
index 38d5db13ea450..99aac08dc4767 100644
--- a/py/emitnxtensawin.c
+++ b/py/emitnxtensawin.c
@@ -15,7 +15,6 @@
 #define NLR_BUF_IDX_LOCAL_3 (2 + 6) // a6
 
 #define N_NLR_SETJMP (1)
-#define N_PRELUDE_AS_BYTES_OBJ (1)
 #define N_XTENSAWIN (1)
 #define EXPORT_FUN(name) emit_native_xtensawin_##name
 #include "py/emitnative.c"
diff --git a/py/mpconfig.h b/py/mpconfig.h
index f9894b497c507..59ab84cd4c067 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -394,8 +394,10 @@
 // Convenience definition for whether any native emitter is enabled
 #define MICROPY_EMIT_NATIVE (MICROPY_EMIT_X64 || MICROPY_EMIT_X86 || MICROPY_EMIT_THUMB || MICROPY_EMIT_ARM || MICROPY_EMIT_XTENSA || MICROPY_EMIT_XTENSAWIN)
 
-// Select prelude-as-bytes-object for certain emitters
-#define MICROPY_EMIT_NATIVE_PRELUDE_AS_BYTES_OBJ (MICROPY_EMIT_XTENSAWIN)
+// Some architectures cannot read byte-wise from executable memory.  In this case
+// the prelude for a native function (which usually sits after the machine code)
+// must be separated and placed somewhere where it can be read byte-wise.
+#define MICROPY_EMIT_NATIVE_PRELUDE_SEPARATE_FROM_MACHINE_CODE (MICROPY_EMIT_XTENSAWIN)
 
 // Convenience definition for whether any inline assembler emitter is enabled
 #define MICROPY_EMIT_INLINE_ASM (MICROPY_EMIT_INLINE_THUMB || MICROPY_EMIT_INLINE_XTENSA)
diff --git a/py/objgenerator.c b/py/objgenerator.c
index 12fd81a8bba0e..802fd45bbdf6a 100644
--- a/py/objgenerator.c
+++ b/py/objgenerator.c
@@ -98,14 +98,13 @@ STATIC mp_obj_t native_gen_wrap_call(mp_obj_t self_in, size_t n_args, size_t n_k
     mp_obj_fun_bc_t *self_fun = MP_OBJ_TO_PTR(self_in);
 
     // Determine start of prelude.
-    uintptr_t prelude_offset = ((uintptr_t *)self_fun->bytecode)[0];
-    #if MICROPY_EMIT_NATIVE_PRELUDE_AS_BYTES_OBJ
-    // Prelude is in bytes object in const_table, at index prelude_offset
-    mp_obj_str_t *prelude_bytes = MP_OBJ_TO_PTR(self_fun->context->constants.obj_table[prelude_offset]);
-    const uint8_t *prelude_ptr = prelude_bytes->data;
-    #else
-    const uint8_t *prelude_ptr = self_fun->bytecode + prelude_offset;
-    #endif
+    uintptr_t prelude_ptr_index = ((uintptr_t *)self_fun->bytecode)[0];
+    const uint8_t *prelude_ptr;
+    if (prelude_ptr_index == 0) {
+        prelude_ptr = (void *)self_fun->child_table;
+    } else {
+        prelude_ptr = (void *)self_fun->child_table[prelude_ptr_index];
+    }
 
     // Extract n_state from the prelude.
     const uint8_t *ip = prelude_ptr;
diff --git a/py/persistentcode.c b/py/persistentcode.c
index 0b5da8077420e..e23c775d1f0ed 100644
--- a/py/persistentcode.c
+++ b/py/persistentcode.c
@@ -348,7 +348,7 @@ STATIC mp_raw_code_t *load_raw_code(mp_reader_t *reader) {
     // Load children if any.
     if (has_children) {
         n_children = read_uint(reader);
-        children = m_new(mp_raw_code_t *, n_children);
+        children = m_new(mp_raw_code_t *, n_children + (kind == MP_CODE_NATIVE_PY));
         for (size_t i = 0; i < n_children; ++i) {
             children[i] = load_raw_code(reader);
         }
@@ -372,6 +372,17 @@ STATIC mp_raw_code_t *load_raw_code(mp_reader_t *reader) {
 
     #if MICROPY_EMIT_MACHINE_CODE
     } else {
+        const uint8_t *prelude_ptr;
+        #if MICROPY_EMIT_NATIVE_PRELUDE_SEPARATE_FROM_MACHINE_CODE
+        if (kind == MP_CODE_NATIVE_PY) {
+            // Executable code cannot be accessed byte-wise on this architecture, so copy
+            // the prelude to a separate memory region that is byte-wise readable.
+            void *buf = fun_data + prelude_offset;
+            size_t n = fun_data_len - prelude_offset;
+            prelude_ptr = memcpy(m_new(uint8_t, n), buf, n);
+        }
+        #endif
+
         // Relocate and commit code to executable address space
         reloc_info_t ri = {reader, rodata, bss};
         #if defined(MP_PLAT_COMMIT_EXEC)
@@ -395,6 +406,17 @@ STATIC mp_raw_code_t *load_raw_code(mp_reader_t *reader) {
         }
         #endif
 
+        if (kind == MP_CODE_NATIVE_PY) {
+            #if !MICROPY_EMIT_NATIVE_PRELUDE_SEPARATE_FROM_MACHINE_CODE
+            prelude_ptr = fun_data + prelude_offset;
+            #endif
+            if (n_children == 0) {
+                children = (void *)prelude_ptr;
+            } else {
+                children[n_children] = (void *)prelude_ptr;
+            }
+        }
+
         // Assign native code to raw code object
         mp_emit_glue_assign_native(rc, kind,
             fun_data, fun_data_len,
diff --git a/tools/mpy-tool.py b/tools/mpy-tool.py
index 3ebbdd11042ab..2974e357b0fc2 100755
--- a/tools/mpy-tool.py
+++ b/tools/mpy-tool.py
@@ -824,7 +824,7 @@ def disassemble_children(self):
         for rc in self.children:
             rc.disassemble()
 
-    def freeze_children(self):
+    def freeze_children(self, prelude_ptr=None):
         # Freeze children and generate table of children.
         if len(self.children):
             for rc in self.children:
@@ -834,10 +834,12 @@ def freeze_children(self):
             print("static const mp_raw_code_t *const children_%s[] = {" % self.escaped_name)
             for rc in self.children:
                 print("    &raw_code_%s," % rc.escaped_name)
+            if prelude_ptr:
+                print("    (void *)%s," % prelude_ptr)
             print("};")
             print()
 
-    def freeze_raw_code(self, qstr_links=(), type_sig=0):
+    def freeze_raw_code(self, prelude_ptr=None, qstr_links=(), type_sig=0):
         # Generate mp_raw_code_t.
         print("static const mp_raw_code_t raw_code_%s = {" % self.escaped_name)
         print("    .kind = %s," % RawCode.code_kind_str[self.code_kind])
@@ -849,6 +851,8 @@ def freeze_raw_code(self, qstr_links=(), type_sig=0):
         print("    #endif")
         if len(self.children):
             print("    .children = (void *)&children_%s," % self.escaped_name)
+        elif prelude_ptr:
+            print("    .children = (void *)%s," % prelude_ptr)
         else:
             print("    .children = NULL,")
         print("    #if MICROPY_PERSISTENT_CODE_SAVE")
@@ -1112,8 +1116,25 @@ def freeze(self):
 
         print("};")
 
-        self.freeze_children()
-        self.freeze_raw_code(self.qstr_links, self.type_sig)
+        prelude_ptr = None
+        if self.code_kind == MP_CODE_NATIVE_PY:
+            prelude_ptr = "fun_data_%s_prelude_macro" % self.escaped_name
+            print("#if MICROPY_EMIT_NATIVE_PRELUDE_SEPARATE_FROM_MACHINE_CODE")
+            n = len(self.fun_data) - self.prelude_offset
+            print("static const byte fun_data_%s_prelude[%u] = {" % (self.escaped_name, n), end="")
+            for i in range(n):
+                print(" 0x%02x," % self.fun_data[self.prelude_offset + i], end="")
+            print("};")
+            print("#define %s &fun_data_%s_prelude[0]" % (prelude_ptr, self.escaped_name))
+            print("#else")
+            print(
+                "#define %s &fun_data_%s[%u]"
+                % (prelude_ptr, self.escaped_name, self.prelude_offset)
+            )
+            print("#endif")
+
+        self.freeze_children(prelude_ptr)
+        self.freeze_raw_code(prelude_ptr, self.qstr_links, self.type_sig)
 
 
 class MPYSegment:

From 90682f43af4867d508609c0f521fada81935fcf7 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 6 May 2022 22:43:03 +1000
Subject: [PATCH 2018/3533] py/compile: Allow new qstrs to be allocated at all
 compiler passes.

Prior to this commit, all qstrs were required to be allocated (by calling
mp_emit_common_use_qstr) in the MP_PASS_SCOPE pass (the first one).  But
this is an unnecessary restriction, which is lifted by this commit.
Lifting the restriction simplifies the compiler because it can allocate
qstrs in later passes.

This also generates better code, because in some cases (eg when a variable
is closed over) the scope of an identifier is not known until a bit later
and then the identifier no longer needs its qstr allocated in the global
table.

Code size is reduced for all ports with this commit.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/compile.c                       | 20 +++++---------------
 py/emitcommon.c                    |  1 -
 tests/cmdline/cmd_parsetree.py.exp |  6 +++---
 tests/cmdline/cmd_showbc.py.exp    | 28 ++++++++++++++--------------
 4 files changed, 22 insertions(+), 33 deletions(-)

diff --git a/py/compile.c b/py/compile.c
index 2760d8bfb9a61..75cd562a16627 100644
--- a/py/compile.c
+++ b/py/compile.c
@@ -188,7 +188,6 @@ typedef struct _compiler_t {
     mp_emit_common_t emit_common;
 
     emit_t *emit;                                   // current emitter
-    emit_t *emit_bc;
     #if NEED_METHOD_TABLE
     const emit_method_table_t *emit_method_table;   // current emit method table
     #endif
@@ -359,8 +358,7 @@ STATIC void compile_generic_all_nodes(compiler_t *comp, mp_parse_node_struct_t *
 STATIC void compile_load_id(compiler_t *comp, qstr qst) {
     if (comp->pass == MP_PASS_SCOPE) {
         mp_emit_common_get_id_for_load(comp->scope_cur, qst);
-    }
-    {
+    } else {
         #if NEED_METHOD_TABLE
         mp_emit_common_id_op(comp->emit, &comp->emit_method_table->load_id, comp->scope_cur, qst);
         #else
@@ -372,8 +370,7 @@ STATIC void compile_load_id(compiler_t *comp, qstr qst) {
 STATIC void compile_store_id(compiler_t *comp, qstr qst) {
     if (comp->pass == MP_PASS_SCOPE) {
         mp_emit_common_get_id_for_modification(comp->scope_cur, qst);
-    }
-    {
+    } else {
         #if NEED_METHOD_TABLE
         mp_emit_common_id_op(comp->emit, &comp->emit_method_table->store_id, comp->scope_cur, qst);
         #else
@@ -385,8 +382,7 @@ STATIC void compile_store_id(compiler_t *comp, qstr qst) {
 STATIC void compile_delete_id(compiler_t *comp, qstr qst) {
     if (comp->pass == MP_PASS_SCOPE) {
         mp_emit_common_get_id_for_modification(comp->scope_cur, qst);
-    }
-    {
+    } else {
         #if NEED_METHOD_TABLE
         mp_emit_common_id_op(comp->emit, &comp->emit_method_table->delete_id, comp->scope_cur, qst);
         #else
@@ -2154,7 +2150,6 @@ STATIC void compile_lambdef(compiler_t *comp, mp_parse_node_struct_t *pns) {
 STATIC void compile_namedexpr_helper(compiler_t *comp, mp_parse_node_t pn_name, mp_parse_node_t pn_expr) {
     if (!MP_PARSE_NODE_IS_ID(pn_name)) {
         compile_syntax_error(comp, (mp_parse_node_t)pn_name, MP_ERROR_TEXT("can't assign to expression"));
-        return; // because pn_name is not a valid qstr (in compile_store_id below)
     }
     compile_node(comp, pn_expr);
     EMIT(dup_top);
@@ -2858,7 +2853,6 @@ STATIC void compile_scope_func_lambda_param(compiler_t *comp, mp_parse_node_t pn
             // comes before a star, so counts as a positional parameter
             comp->scope_cur->num_pos_args += 1;
         }
-        mp_emit_common_use_qstr(&comp->emit_common, param_name);
     } else {
         assert(MP_PARSE_NODE_IS_STRUCT(pn));
         pns = (mp_parse_node_struct_t *)pn;
@@ -2872,7 +2866,6 @@ STATIC void compile_scope_func_lambda_param(compiler_t *comp, mp_parse_node_t pn
                 // comes before a star, so counts as a positional parameter
                 comp->scope_cur->num_pos_args += 1;
             }
-            mp_emit_common_use_qstr(&comp->emit_common, param_name);
         } else if (MP_PARSE_NODE_STRUCT_KIND(pns) == pn_star) {
             if (comp->have_star) {
                 // more than one star
@@ -3111,7 +3104,6 @@ STATIC bool compile_scope(compiler_t *comp, scope_t *scope, pass_kind_t pass) {
         if (comp->pass == MP_PASS_SCOPE) {
             scope_find_or_add_id(comp->scope_cur, qstr_arg, ID_INFO_KIND_LOCAL);
             scope->num_pos_args = 1;
-            mp_emit_common_use_qstr(&comp->emit_common, MP_QSTR__star_);
         }
 
         // Set the source line number for the start of the comprehension
@@ -3361,7 +3353,7 @@ STATIC void compile_scope_inline_asm(compiler_t *comp, scope_t *scope, pass_kind
 }
 #endif
 
-STATIC void scope_compute_things(scope_t *scope, mp_emit_common_t *emit_common) {
+STATIC void scope_compute_things(scope_t *scope) {
     // in MicroPython we put the *x parameter after all other parameters (except **y)
     if (scope->scope_flags & MP_SCOPE_FLAG_VARARGS) {
         id_info_t *id_param = NULL;
@@ -3450,7 +3442,6 @@ STATIC void scope_compute_things(scope_t *scope, mp_emit_common_t *emit_common)
             }
             scope->num_pos_args += num_free; // free vars are counted as params for passing them into the function
             scope->num_locals += num_free;
-            mp_emit_common_use_qstr(emit_common, MP_QSTR__star_);
         }
     }
 }
@@ -3481,7 +3472,6 @@ mp_compiled_module_t mp_compile_to_raw_code(mp_parse_tree_t *parse_tree, qstr so
 
     // compile MP_PASS_SCOPE
     comp->emit = emit_bc;
-    comp->emit_bc = emit_bc;
     #if MICROPY_EMIT_NATIVE
     comp->emit_method_table = &emit_bc_method_table;
     #endif
@@ -3519,7 +3509,7 @@ mp_compiled_module_t mp_compile_to_raw_code(mp_parse_tree_t *parse_tree, qstr so
         }
         #endif
 
-        scope_compute_things(s, &comp->emit_common);
+        scope_compute_things(s);
     }
 
     // set max number of labels now that it's calculated
diff --git a/py/emitcommon.c b/py/emitcommon.c
index 647430232ab44..02f96f1118b84 100644
--- a/py/emitcommon.c
+++ b/py/emitcommon.c
@@ -34,7 +34,6 @@
 qstr_short_t mp_emit_common_use_qstr(mp_emit_common_t *emit, qstr qst) {
     mp_map_elem_t *elem = mp_map_lookup(&emit->qstr_map, MP_OBJ_NEW_QSTR(qst), MP_MAP_LOOKUP_ADD_IF_NOT_FOUND);
     if (elem->value == MP_OBJ_NULL) {
-        assert(emit->pass == MP_PASS_SCOPE);
         elem->value = MP_OBJ_NEW_SMALL_INT(emit->qstr_map.used - 1);
     }
     return MP_OBJ_SMALL_INT_VALUE(elem->value);
diff --git a/tests/cmdline/cmd_parsetree.py.exp b/tests/cmdline/cmd_parsetree.py.exp
index 7f9aa047e4d56..3049267c0b957 100644
--- a/tests/cmdline/cmd_parsetree.py.exp
+++ b/tests/cmdline/cmd_parsetree.py.exp
@@ -42,9 +42,9 @@
 File cmdline/cmd_parsetree.py, code block '<module>' (descriptor: \.\+, bytecode @\.\+ 62 bytes)
 Raw bytecode (code_info_size=13, bytecode_size=49):
  20 16 01 60 27 22 23 24 24 24 24 24 25 2a 00 5f
- 4b 04 16 02 42 3a 51 16 03 10 04 16 05 23 00 16
- 06 23 01 16 07 23 02 16 08 23 03 16 09 22 80 7b
- 16 0a 23 04 14 0b 11 05 36 01 16 0c 51 63
+ 4b 04 16 04 42 3a 51 16 05 10 02 16 06 23 00 16
+ 07 23 01 16 08 23 02 16 09 23 03 16 0a 22 80 7b
+ 16 0b 23 04 14 03 11 06 36 01 16 0c 51 63
 arg names:
 (N_STATE 5)
 (N_EXC_STACK 0)
diff --git a/tests/cmdline/cmd_showbc.py.exp b/tests/cmdline/cmd_showbc.py.exp
index f3ca2eb634b95..45a1d169b6197 100644
--- a/tests/cmdline/cmd_showbc.py.exp
+++ b/tests/cmdline/cmd_showbc.py.exp
@@ -1,9 +1,9 @@
 File cmdline/cmd_showbc.py, code block '<module>' (descriptor: \.\+, bytecode @\.\+ 63 bytes)
 Raw bytecode (code_info_size=18, bytecode_size=45):
  10 20 01 60 20 84 7d 64 60 88 07 64 60 69 20 62
- 64 20 32 00 16 02 32 01 16 02 81 2a 01 53 33 02
- 16 02 32 03 16 02 54 32 04 10 03 34 02 16 03 19
- 03 32 05 16 02 80 10 04 2a 01 1b 05 69 51 63
+ 64 20 32 00 16 05 32 01 16 05 81 2a 01 53 33 02
+ 16 05 32 03 16 05 54 32 04 10 02 34 02 16 02 19
+ 02 32 05 16 05 80 10 03 2a 01 1b 04 69 51 63
 arg names:
 (N_STATE 3)
 (N_EXC_STACK 0)
@@ -49,7 +49,7 @@ arg names:
 44 RETURN_VALUE
 File cmdline/cmd_showbc.py, code block 'f' (descriptor: \.\+, bytecode @\.\+ 45\[46\] bytes)
 Raw bytecode (code_info_size=8\[46\], bytecode_size=370):
- a8 12 9\[bf\] 03 02 60 60 26 22 24 64 22 24 25 25 24
+ a8 12 9\[bf\] 03 05 60 60 26 22 24 64 22 24 25 25 24
  26 23 63 22 22 25 23 23 2f 6c 25 65 25 25 69 68
  26 65 27 6a 62 20 23 62 2a 29 69 24 25 28 67 26
 ########
@@ -405,7 +405,7 @@ arg names:
 369 RETURN_VALUE
 File cmdline/cmd_showbc.py, code block 'f' (descriptor: \.\+, bytecode @\.\+ 59 bytes)
 Raw bytecode (code_info_size=8, bytecode_size=51):
- a8 10 0a 02 80 82 34 38 81 57 c0 57 c1 57 c2 57
+ a8 10 0a 05 80 82 34 38 81 57 c0 57 c1 57 c2 57
  c3 57 c4 57 c5 57 c6 57 c7 57 c8 c9 82 57 ca 57
  cb 57 cc 57 cd 57 ce 57 cf 57 26 10 57 26 11 57
  26 12 26 13 b9 24 13 f2 59 51 63
@@ -464,7 +464,7 @@ arg names:
 50 RETURN_VALUE
 File cmdline/cmd_showbc.py, code block 'f' (descriptor: \.\+, bytecode @\.\+ 20 bytes)
 Raw bytecode (code_info_size=9, bytecode_size=11):
- a1 01 0b 02 06 80 88 40 00 82 2a 01 53 b0 21 00
+ a1 01 0b 05 06 80 88 40 00 82 2a 01 53 b0 21 00
  01 c1 51 63
 arg names: a
 (N_STATE 5)
@@ -483,7 +483,7 @@ arg names: a
 10 RETURN_VALUE
 File cmdline/cmd_showbc.py, code block 'f' (descriptor: \.\+, bytecode @\.\+ 21 bytes)
 Raw bytecode (code_info_size=8, bytecode_size=13):
- 88 40 0a 02 80 8f 23 23 51 67 59 81 67 59 81 5e
+ 88 40 0a 05 80 8f 23 23 51 67 59 81 67 59 81 5e
  51 68 59 51 63
 arg names:
 (N_STATE 2)
@@ -507,7 +507,7 @@ arg names:
 12 RETURN_VALUE
 File cmdline/cmd_showbc.py, code block 'Class' (descriptor: \.\+, bytecode @\.\+ 1\[56\] bytes)
 Raw bytecode (code_info_size=\[56\], bytecode_size=10):
- 00 \.\+ 11 0c 16 0d 10 03 16 0e 51 63
+ 00 \.\+ 11 0f 16 10 10 02 16 11 51 63
 arg names:
 (N_STATE 1)
 (N_EXC_STACK 0)
@@ -522,7 +522,7 @@ arg names:
 09 RETURN_VALUE
 File cmdline/cmd_showbc.py, code block 'f' (descriptor: \.\+, bytecode @\.\+ 18 bytes)
 Raw bytecode (code_info_size=6, bytecode_size=12):
- 19 08 02 0f 80 9c 12 10 12 11 b0 15 02 36 00 59
+ 19 08 05 12 80 9c 12 13 12 14 b0 15 05 36 00 59
  51 63
 arg names: self
 (N_STATE 4)
@@ -539,7 +539,7 @@ arg names: self
 11 RETURN_VALUE
 File cmdline/cmd_showbc.py, code block '<genexpr>' (descriptor: \.\+, bytecode @\.\+ 28 bytes)
 Raw bytecode (code_info_size=9, bytecode_size=19):
- c3 40 0c 12 04 04 04 80 3b 53 b2 53 53 4b 0b c3
+ c3 40 0c 09 03 03 03 80 3b 53 b2 53 53 4b 0b c3
  25 01 44 39 25 00 67 59 42 33 51 63
 arg names: * * *
 (N_STATE 9)
@@ -562,7 +562,7 @@ arg names: * * *
 18 RETURN_VALUE
 File cmdline/cmd_showbc.py, code block '<listcomp>' (descriptor: \.\+, bytecode @\.\+ 26 bytes)
 Raw bytecode (code_info_size=8, bytecode_size=18):
- 4b 0c 14 04 04 04 80 3c 2b 00 b2 5f 4b 0b c3 25
+ 4b 0c 0a 03 03 03 80 3c 2b 00 b2 5f 4b 0b c3 25
  01 44 39 25 00 2f 14 42 33 63
 arg names: * * *
 (N_STATE 10)
@@ -582,7 +582,7 @@ arg names: * * *
 17 RETURN_VALUE
 File cmdline/cmd_showbc.py, code block '<dictcomp>' (descriptor: \.\+, bytecode @\.\+ 28 bytes)
 Raw bytecode (code_info_size=8, bytecode_size=20):
- 53 0c 15 04 04 04 80 3d 2c 00 b2 5f 4b 0d c3 25
+ 53 0c 0b 03 03 03 80 3d 2c 00 b2 5f 4b 0d c3 25
  01 44 39 25 00 25 00 2f 19 42 31 63
 arg names: * * *
 (N_STATE 11)
@@ -603,7 +603,7 @@ arg names: * * *
 19 RETURN_VALUE
 File cmdline/cmd_showbc.py, code block 'closure' (descriptor: \.\+, bytecode @\.\+ 20 bytes)
 Raw bytecode (code_info_size=8, bytecode_size=12):
- 19 0c 16 04 80 6f 25 23 25 00 81 f2 c1 81 27 00
+ 19 0c 0c 03 80 6f 25 23 25 00 81 f2 c1 81 27 00
  29 00 51 63
 arg names: *
 (N_STATE 4)
@@ -623,7 +623,7 @@ arg names: *
 11 RETURN_VALUE
 File cmdline/cmd_showbc.py, code block 'f' (descriptor: \.\+, bytecode @\.\+ 13 bytes)
 Raw bytecode (code_info_size=8, bytecode_size=5):
- 9a 01 0a 02 04 09 80 8b b1 25 00 f2 63
+ 9a 01 0a 05 03 08 80 8b b1 25 00 f2 63
 arg names: * b
 (N_STATE 4)
 (N_EXC_STACK 0)

From b3d0f5f67ccabb57774b4cf677be1a4cfb36a39a Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 18 May 2022 09:16:33 +1000
Subject: [PATCH 2019/3533] tests/micropython: Fully unlink nested list in
 extreme exc test.

To make sure there are no dangling references to the lists, and the GC can
reclaim heap memory.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/micropython/extreme_exc.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/micropython/extreme_exc.py b/tests/micropython/extreme_exc.py
index 9d2f24745f933..ad819e408fd82 100644
--- a/tests/micropython/extreme_exc.py
+++ b/tests/micropython/extreme_exc.py
@@ -126,8 +126,8 @@ def f():
         )
     except Exception as er:
         e = er
-    lst[0][0] = None
-    lst = None
+    while lst:
+        lst[0], lst = None, lst[0]  # unlink lists to free up heap
     print(repr(e)[:10])
 
     # raise a deep exception with the heap locked

From 8588525868a59a2d4cd53e2fb24aa0d413659df4 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sat, 7 May 2022 15:51:41 +1000
Subject: [PATCH 2020/3533] py/compile: De-duplicate constant objects in
 module's constant table.

The recent rework of bytecode made all constants global with respect to the
module (previously, each function had its own constant table).  That means
the constant table for a module is shared among all functions/methods/etc
within the module.

This commit add support to the compiler to de-duplicate constants in this
module constant table.  So if a constant is used more than once -- eg 1.0
or (None, None) -- then the same object is reused for all instances.

For example, if there is code like `print(1.0, 1.0)` then the parser will
create two independent constants 1.0 and 1.0.  The compiler will then (with
this commit) notice they are the same and only put one of them in the
constant table.  The bytecode will then reuse that constant twice in the
print expression.  That allows the second 1.0 to be reclaimed by the GC,
also means the constant table has one less entry so saves a word.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/compile.c    | 54 +++++++++++++++++--------------------------------
 py/emit.h       | 11 ++--------
 py/emitbc.c     |  3 +--
 py/emitcommon.c | 46 +++++++++++++++++++++++++++++++++++++++++
 py/emitnative.c | 14 +++++++------
 5 files changed, 76 insertions(+), 52 deletions(-)

diff --git a/py/compile.c b/py/compile.c
index 75cd562a16627..7852b68ef1632 100644
--- a/py/compile.c
+++ b/py/compile.c
@@ -185,8 +185,6 @@ typedef struct _compiler_t {
     scope_t *scope_head;
     scope_t *scope_cur;
 
-    mp_emit_common_t emit_common;
-
     emit_t *emit;                                   // current emitter
     #if NEED_METHOD_TABLE
     const emit_method_table_t *emit_method_table;   // current emit method table
@@ -196,6 +194,8 @@ typedef struct _compiler_t {
     emit_inline_asm_t *emit_inline_asm;                                   // current emitter for inline asm
     const emit_inline_asm_method_table_t *emit_inline_asm_method_table;   // current emit method table for inline asm
     #endif
+
+    mp_emit_common_t emit_common;
 } compiler_t;
 
 /******************************************************************************/
@@ -210,15 +210,11 @@ STATIC void mp_emit_common_init(mp_emit_common_t *emit, qstr source_file) {
     mp_map_elem_t *elem = mp_map_lookup(&emit->qstr_map, MP_OBJ_NEW_QSTR(source_file), MP_MAP_LOOKUP_ADD_IF_NOT_FOUND);
     elem->value = MP_OBJ_NEW_SMALL_INT(0);
     #endif
+    mp_obj_list_init(&emit->const_obj_list, 0);
 }
 
 STATIC void mp_emit_common_start_pass(mp_emit_common_t *emit, pass_kind_t pass) {
     emit->pass = pass;
-    if (pass == MP_PASS_STACK_SIZE) {
-        emit->ct_cur_obj_base = emit->ct_cur_obj;
-    } else if (pass > MP_PASS_STACK_SIZE) {
-        emit->ct_cur_obj = emit->ct_cur_obj_base;
-    }
     if (pass == MP_PASS_CODE_SIZE) {
         if (emit->ct_cur_child == 0) {
             emit->children = NULL;
@@ -229,22 +225,10 @@ STATIC void mp_emit_common_start_pass(mp_emit_common_t *emit, pass_kind_t pass)
     emit->ct_cur_child = 0;
 }
 
-STATIC void mp_emit_common_finalise(mp_emit_common_t *emit, bool has_native_code) {
-    emit->ct_cur_obj += has_native_code; // allocate an additional slot for &mp_fun_table
-    emit->const_table = m_new0(mp_uint_t, emit->ct_cur_obj);
-    emit->ct_cur_obj = has_native_code; // reserve slot 0 for &mp_fun_table
-    #if MICROPY_EMIT_NATIVE
-    if (has_native_code) {
-        // store mp_fun_table pointer at the start of the constant table
-        emit->const_table[0] = (mp_uint_t)(uintptr_t)&mp_fun_table;
-    }
-    #endif
-}
-
 STATIC void mp_emit_common_populate_module_context(mp_emit_common_t *emit, qstr source_file, mp_module_context_t *context) {
     #if MICROPY_EMIT_BYTECODE_USES_QSTR_TABLE
     size_t qstr_map_used = emit->qstr_map.used;
-    mp_module_context_alloc_tables(context, qstr_map_used, emit->ct_cur_obj);
+    mp_module_context_alloc_tables(context, qstr_map_used, emit->const_obj_list.len);
     for (size_t i = 0; i < emit->qstr_map.alloc; ++i) {
         if (mp_map_slot_is_filled(&emit->qstr_map, i)) {
             size_t idx = MP_OBJ_SMALL_INT_VALUE(emit->qstr_map.table[i].value);
@@ -253,12 +237,12 @@ STATIC void mp_emit_common_populate_module_context(mp_emit_common_t *emit, qstr
         }
     }
     #else
-    mp_module_context_alloc_tables(context, 0, emit->ct_cur_obj);
+    mp_module_context_alloc_tables(context, 0, emit->const_obj_list.len);
     context->constants.source_file = source_file;
     #endif
 
-    if (emit->ct_cur_obj > 0) {
-        memcpy(context->constants.obj_table, emit->const_table, emit->ct_cur_obj * sizeof(mp_uint_t));
+    for (size_t i = 0; i < emit->const_obj_list.len; ++i) {
+        context->constants.obj_table[i] = emit->const_obj_list.items[i];
     }
 }
 
@@ -3501,23 +3485,13 @@ mp_compiled_module_t mp_compile_to_raw_code(mp_parse_tree_t *parse_tree, qstr so
     }
 
     // compute some things related to scope and identifiers
-    bool has_native_code = false;
     for (scope_t *s = comp->scope_head; s != NULL && comp->compile_error == MP_OBJ_NULL; s = s->next) {
-        #if MICROPY_EMIT_NATIVE
-        if (s->emit_options == MP_EMIT_OPT_NATIVE_PYTHON || s->emit_options == MP_EMIT_OPT_VIPER) {
-            has_native_code = true;
-        }
-        #endif
-
         scope_compute_things(s);
     }
 
     // set max number of labels now that it's calculated
     emit_bc_set_max_num_labels(emit_bc, max_num_labels);
 
-    // finalise and allocate the constant table
-    mp_emit_common_finalise(&comp->emit_common, has_native_code);
-
     // compile MP_PASS_STACK_SIZE, MP_PASS_CODE_SIZE, MP_PASS_EMIT
     #if MICROPY_EMIT_NATIVE
     emit_t *emit_native = NULL;
@@ -3604,9 +3578,19 @@ mp_compiled_module_t mp_compile_to_raw_code(mp_parse_tree_t *parse_tree, qstr so
     cm.rc = module_scope->raw_code;
     cm.context = context;
     #if MICROPY_PERSISTENT_CODE_SAVE
-    cm.has_native = has_native_code;
+    cm.has_native = false;
+    #if MICROPY_EMIT_NATIVE
+    if (emit_native != NULL) {
+        cm.has_native = true;
+    }
+    #endif
+    #if MICROPY_EMIT_INLINE_ASM
+    if (comp->emit_inline_asm != NULL) {
+        cm.has_native = true;
+    }
+    #endif
     cm.n_qstr = comp->emit_common.qstr_map.used;
-    cm.n_obj = comp->emit_common.ct_cur_obj;
+    cm.n_obj = comp->emit_common.const_obj_list.len;
     #endif
     if (comp->compile_error == MP_OBJ_NULL) {
         mp_emit_common_populate_module_context(&comp->emit_common, source_file, context);
diff --git a/py/emit.h b/py/emit.h
index d4aea2e4db433..608734552af49 100644
--- a/py/emit.h
+++ b/py/emit.h
@@ -94,14 +94,12 @@ typedef struct _emit_t emit_t;
 
 typedef struct _mp_emit_common_t {
     pass_kind_t pass;
-    uint16_t ct_cur_obj_base;
-    uint16_t ct_cur_obj;
     uint16_t ct_cur_child;
-    mp_uint_t *const_table;
     mp_raw_code_t **children;
     #if MICROPY_EMIT_BYTECODE_USES_QSTR_TABLE
     mp_map_t qstr_map;
     #endif
+    mp_obj_list_t const_obj_list;
 } mp_emit_common_t;
 
 typedef struct _mp_emit_method_table_id_ops_t {
@@ -181,12 +179,7 @@ static inline qstr_short_t mp_emit_common_use_qstr(mp_emit_common_t *emit, qstr
 }
 #endif
 
-static inline size_t mp_emit_common_alloc_const_obj(mp_emit_common_t *emit, mp_obj_t obj) {
-    if (emit->pass == MP_PASS_EMIT) {
-        emit->const_table[emit->ct_cur_obj] = (mp_uint_t)obj;
-    }
-    return emit->ct_cur_obj++;
-}
+size_t mp_emit_common_use_const_obj(mp_emit_common_t *emit, mp_obj_t const_obj);
 
 static inline size_t mp_emit_common_alloc_const_child(mp_emit_common_t *emit, mp_raw_code_t *rc) {
     if (emit->pass == MP_PASS_EMIT) {
diff --git a/py/emitbc.c b/py/emitbc.c
index a9d5b3799e63e..2007975c5e9b5 100644
--- a/py/emitbc.c
+++ b/py/emitbc.c
@@ -204,8 +204,7 @@ STATIC void emit_write_bytecode_byte_qstr(emit_t *emit, int stack_adj, byte b, q
 }
 
 STATIC void emit_write_bytecode_byte_obj(emit_t *emit, int stack_adj, byte b, mp_obj_t obj) {
-    emit_write_bytecode_byte_const(emit, stack_adj, b,
-        mp_emit_common_alloc_const_obj(emit->emit_common, obj));
+    emit_write_bytecode_byte_const(emit, stack_adj, b, mp_emit_common_use_const_obj(emit->emit_common, obj));
 }
 
 STATIC void emit_write_bytecode_byte_child(emit_t *emit, int stack_adj, byte b, mp_raw_code_t *rc) {
diff --git a/py/emitcommon.c b/py/emitcommon.c
index 02f96f1118b84..679ef1d973b1b 100644
--- a/py/emitcommon.c
+++ b/py/emitcommon.c
@@ -27,6 +27,7 @@
 #include <assert.h>
 
 #include "py/emit.h"
+#include "py/nativeglue.h"
 
 #if MICROPY_ENABLE_COMPILER
 
@@ -40,6 +41,51 @@ qstr_short_t mp_emit_common_use_qstr(mp_emit_common_t *emit, qstr qst) {
 }
 #endif
 
+// Compare two objects for strict equality, including equality of type.  This is
+// different to the semantics of mp_obj_equal which, eg, has (True,) == (1.0,).
+static bool strictly_equal(mp_obj_t a, mp_obj_t b) {
+    if (a == b) {
+        return true;
+    }
+
+    #if MICROPY_EMIT_NATIVE
+    if (a == MP_OBJ_FROM_PTR(&mp_fun_table) || b == MP_OBJ_FROM_PTR(&mp_fun_table)) {
+        return false;
+    }
+    #endif
+
+    const mp_obj_type_t *a_type = mp_obj_get_type(a);
+    const mp_obj_type_t *b_type = mp_obj_get_type(b);
+    if (a_type != b_type) {
+        return false;
+    }
+    if (a_type == &mp_type_tuple) {
+        mp_obj_tuple_t *a_tuple = MP_OBJ_TO_PTR(a);
+        mp_obj_tuple_t *b_tuple = MP_OBJ_TO_PTR(b);
+        if (a_tuple->len != b_tuple->len) {
+            return false;
+        }
+        for (size_t i = 0; i < a_tuple->len; ++i) {
+            if (!strictly_equal(a_tuple->items[i], b_tuple->items[i])) {
+                return false;
+            }
+        }
+        return true;
+    } else {
+        return mp_obj_equal(a, b);
+    }
+}
+
+size_t mp_emit_common_use_const_obj(mp_emit_common_t *emit, mp_obj_t const_obj) {
+    for (size_t i = 0; i < emit->const_obj_list.len; ++i) {
+        if (strictly_equal(emit->const_obj_list.items[i], const_obj)) {
+            return i;
+        }
+    }
+    mp_obj_list_append(MP_OBJ_FROM_PTR(&emit->const_obj_list), const_obj);
+    return emit->const_obj_list.len - 1;
+}
+
 void mp_emit_common_get_id_for_modification(scope_t *scope, qstr qst) {
     // name adding/lookup
     id_info_t *id = scope_find_or_add_id(scope, qst, ID_INFO_KIND_GLOBAL_IMPLICIT);
diff --git a/py/emitnative.c b/py/emitnative.c
index ddc0b5b97bc96..3507d66213967 100644
--- a/py/emitnative.c
+++ b/py/emitnative.c
@@ -99,7 +99,6 @@
 #define OFFSETOF_OBJ_FUN_BC_BYTECODE (offsetof(mp_obj_fun_bc_t, bytecode) / sizeof(uintptr_t))
 #define OFFSETOF_MODULE_CONTEXT_OBJ_TABLE (offsetof(mp_module_context_t, constants.obj_table) / sizeof(uintptr_t))
 #define OFFSETOF_MODULE_CONTEXT_GLOBALS (offsetof(mp_module_context_t, module.globals) / sizeof(uintptr_t))
-#define INDEX_OF_MP_FUN_TABLE_IN_CONST_TABLE (0)
 
 // If not already defined, set parent args to same as child call registers
 #ifndef REG_PARENT_RET
@@ -406,6 +405,8 @@ STATIC void emit_native_start_pass(emit_t *emit, pass_kind_t pass, scope_t *scop
         emit->code_state_start = SIZEOF_NLR_BUF;
     }
 
+    size_t fun_table_off = mp_emit_common_use_const_obj(emit->emit_common, MP_OBJ_FROM_PTR(&mp_fun_table));
+
     if (emit->do_viper_types) {
         // Work out size of state (locals plus stack)
         // n_state counts all stack and locals, even those in registers
@@ -443,7 +444,7 @@ STATIC void emit_native_start_pass(emit_t *emit, pass_kind_t pass, scope_t *scop
         // Load REG_FUN_TABLE with a pointer to mp_fun_table, found in the const_table
         ASM_LOAD_REG_REG_OFFSET(emit->as, REG_FUN_TABLE, REG_PARENT_ARG_1, OFFSETOF_OBJ_FUN_BC_CONTEXT);
         ASM_LOAD_REG_REG_OFFSET(emit->as, REG_FUN_TABLE, REG_FUN_TABLE, OFFSETOF_MODULE_CONTEXT_OBJ_TABLE);
-        ASM_LOAD_REG_REG_OFFSET(emit->as, REG_FUN_TABLE, REG_FUN_TABLE, INDEX_OF_MP_FUN_TABLE_IN_CONST_TABLE);
+        ASM_LOAD_REG_REG_OFFSET(emit->as, REG_FUN_TABLE, REG_FUN_TABLE, fun_table_off);
 
         // Store function object (passed as first arg) to stack if needed
         if (NEED_FUN_OBJ(emit)) {
@@ -520,7 +521,7 @@ STATIC void emit_native_start_pass(emit_t *emit, pass_kind_t pass, scope_t *scop
             ASM_LOAD_REG_REG_OFFSET(emit->as, REG_TEMP0, REG_GENERATOR_STATE, LOCAL_IDX_FUN_OBJ(emit));
             ASM_LOAD_REG_REG_OFFSET(emit->as, REG_TEMP0, REG_TEMP0, OFFSETOF_OBJ_FUN_BC_CONTEXT);
             ASM_LOAD_REG_REG_OFFSET(emit->as, REG_TEMP0, REG_TEMP0, OFFSETOF_MODULE_CONTEXT_OBJ_TABLE);
-            ASM_LOAD_REG_REG_OFFSET(emit->as, REG_FUN_TABLE, REG_TEMP0, INDEX_OF_MP_FUN_TABLE_IN_CONST_TABLE);
+            ASM_LOAD_REG_REG_OFFSET(emit->as, REG_FUN_TABLE, REG_TEMP0, fun_table_off);
         } else {
             // The locals and stack start after the code_state structure
             emit->stack_start = emit->code_state_start + SIZEOF_CODE_STATE;
@@ -540,7 +541,7 @@ STATIC void emit_native_start_pass(emit_t *emit, pass_kind_t pass, scope_t *scop
             // Load REG_FUN_TABLE with a pointer to mp_fun_table, found in the const_table
             ASM_LOAD_REG_REG_OFFSET(emit->as, REG_FUN_TABLE, REG_PARENT_ARG_1, OFFSETOF_OBJ_FUN_BC_CONTEXT);
             ASM_LOAD_REG_REG_OFFSET(emit->as, REG_FUN_TABLE, REG_FUN_TABLE, OFFSETOF_MODULE_CONTEXT_OBJ_TABLE);
-            ASM_LOAD_REG_REG_OFFSET(emit->as, REG_FUN_TABLE, REG_FUN_TABLE, INDEX_OF_MP_FUN_TABLE_IN_CONST_TABLE);
+            ASM_LOAD_REG_REG_OFFSET(emit->as, REG_FUN_TABLE, REG_FUN_TABLE, fun_table_off);
 
             // Set code_state.fun_bc
             ASM_MOV_LOCAL_REG(emit->as, LOCAL_IDX_FUN_OBJ(emit), REG_PARENT_ARG_1);
@@ -1105,7 +1106,7 @@ STATIC exc_stack_entry_t *emit_native_pop_exc_stack(emit_t *emit) {
 }
 
 STATIC void emit_load_reg_with_object(emit_t *emit, int reg, mp_obj_t obj) {
-    size_t table_off = mp_emit_common_alloc_const_obj(emit->emit_common, obj);
+    size_t table_off = mp_emit_common_use_const_obj(emit->emit_common, obj);
     emit_native_mov_reg_state(emit, REG_TEMP0, LOCAL_IDX_FUN_OBJ(emit));
     ASM_LOAD_REG_REG_OFFSET(emit->as, REG_TEMP0, REG_TEMP0, OFFSETOF_OBJ_FUN_BC_CONTEXT);
     ASM_LOAD_REG_REG_OFFSET(emit->as, REG_TEMP0, REG_TEMP0, OFFSETOF_MODULE_CONTEXT_OBJ_TABLE);
@@ -1211,10 +1212,11 @@ STATIC void emit_native_global_exc_entry(emit_t *emit) {
             emit_native_label_assign(emit, global_except_label);
             #if N_NLR_SETJMP
             // Reload REG_FUN_TABLE, since it may be clobbered by longjmp
+            size_t fun_table_off = mp_emit_common_use_const_obj(emit->emit_common, MP_OBJ_FROM_PTR(&mp_fun_table));
             emit_native_mov_reg_state(emit, REG_LOCAL_1, LOCAL_IDX_FUN_OBJ(emit));
             ASM_LOAD_REG_REG_OFFSET(emit->as, REG_LOCAL_1, REG_LOCAL_1, OFFSETOF_OBJ_FUN_BC_CONTEXT);
             ASM_LOAD_REG_REG_OFFSET(emit->as, REG_LOCAL_1, REG_LOCAL_1, OFFSETOF_MODULE_CONTEXT_OBJ_TABLE);
-            ASM_LOAD_REG_REG_OFFSET(emit->as, REG_FUN_TABLE, REG_LOCAL_1, emit->scope->num_pos_args + emit->scope->num_kwonly_args);
+            ASM_LOAD_REG_REG_OFFSET(emit->as, REG_FUN_TABLE, REG_LOCAL_1, fun_table_off);
             #endif
             ASM_MOV_REG_LOCAL(emit->as, REG_LOCAL_1, LOCAL_IDX_EXC_HANDLER_PC(emit));
             ASM_JUMP_IF_REG_NONZERO(emit->as, REG_LOCAL_1, nlr_label, false);

From 80938839c1513370d50d3aa6c9fc66a8b3ca1162 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 17 May 2022 19:45:06 +1000
Subject: [PATCH 2021/3533] tests/extmod: Use bytearray instead of bytes for
 uctypes test.

Because the test modifies the (now) bytearray object, and if it's a bytes
object it's not guaranteed that it can be modified, or that this constant
object isn't used elsewhere.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/extmod/uctypes_32bit_intbig.py     |  4 ++--
 tests/extmod/uctypes_32bit_intbig.py.exp | 20 ++++++++++----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/tests/extmod/uctypes_32bit_intbig.py b/tests/extmod/uctypes_32bit_intbig.py
index eed36e87742af..27d33817cf618 100644
--- a/tests/extmod/uctypes_32bit_intbig.py
+++ b/tests/extmod/uctypes_32bit_intbig.py
@@ -6,7 +6,7 @@
     print("SKIP")
     raise SystemExit
 
-buf = b"12345678abcd"
+buf = bytearray(b"12345678abcd")
 struct = uctypes.struct(
     uctypes.addressof(buf),
     {"f32": uctypes.UINT32 | 0, "f64": uctypes.UINT64 | 4},
@@ -30,7 +30,7 @@
 
 print("=")
 
-buf = b"12345678abcd"
+buf = bytearray(b"12345678abcd")
 struct = uctypes.struct(
     uctypes.addressof(buf),
     {"f32": uctypes.UINT32 | 0, "f64": uctypes.UINT64 | 4},
diff --git a/tests/extmod/uctypes_32bit_intbig.py.exp b/tests/extmod/uctypes_32bit_intbig.py.exp
index d1fc1fe350453..1b16ddbc3211b 100644
--- a/tests/extmod/uctypes_32bit_intbig.py.exp
+++ b/tests/extmod/uctypes_32bit_intbig.py.exp
@@ -1,11 +1,11 @@
-b'\xff\xff\xff\x7f5678abcd'
-b'\x00\x00\x00\x805678abcd'
-b'\x03\x02\x01\xff5678abcd'
-b'\x03\x02\x01\xff\x00\x00\x00\x80\x00\x00\x00\x00'
-b'\x03\x02\x01\xff\x00\x00\x00\x00\x01\x00\x00\x00'
+bytearray(b'\xff\xff\xff\x7f5678abcd')
+bytearray(b'\x00\x00\x00\x805678abcd')
+bytearray(b'\x03\x02\x01\xff5678abcd')
+bytearray(b'\x03\x02\x01\xff\x00\x00\x00\x80\x00\x00\x00\x00')
+bytearray(b'\x03\x02\x01\xff\x00\x00\x00\x00\x01\x00\x00\x00')
 =
-b'\x7f\xff\xff\xff5678abcd'
-b'\x80\x00\x00\x005678abcd'
-b'\xff\x01\x02\x035678abcd'
-b'\xff\x01\x02\x03\x00\x00\x00\x00\x80\x00\x00\x00'
-b'\xff\x01\x02\x03\x00\x00\x00\x01\x00\x00\x00\x00'
+bytearray(b'\x7f\xff\xff\xff5678abcd')
+bytearray(b'\x80\x00\x00\x005678abcd')
+bytearray(b'\xff\x01\x02\x035678abcd')
+bytearray(b'\xff\x01\x02\x03\x00\x00\x00\x00\x80\x00\x00\x00')
+bytearray(b'\xff\x01\x02\x03\x00\x00\x00\x01\x00\x00\x00\x00')

From 761d2f67415ba43f64c7b04b6ea72fd4b65afc50 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 18 May 2022 15:22:22 +1000
Subject: [PATCH 2022/3533] tests/micropython: Add more test cases for native
 generators.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/micropython/native_gen.py     | 31 +++++++++++++++++++++++++++++
 tests/micropython/native_gen.py.exp |  6 ++++++
 2 files changed, 37 insertions(+)

diff --git a/tests/micropython/native_gen.py b/tests/micropython/native_gen.py
index fb42f9e25eded..62c324634d372 100644
--- a/tests/micropython/native_gen.py
+++ b/tests/micropython/native_gen.py
@@ -23,3 +23,34 @@ def gen2(x):
 
 
 print(list(gen2(3)))
+
+
+# catching an exception from .throw()
+@micropython.native
+def gen3():
+    try:
+        yield 1
+        yield 2
+    except Exception as er:
+        print("caught", repr(er))
+        yield 3
+
+
+g = gen3()
+print(next(g))
+print(g.throw(ValueError(42)))
+
+
+# responding to .close()
+@micropython.native
+def gen4():
+    try:
+        yield 1
+    except:
+        print("raising GeneratorExit")
+        raise GeneratorExit
+
+
+g = gen4()
+print(next(g))
+print(g.close())
diff --git a/tests/micropython/native_gen.py.exp b/tests/micropython/native_gen.py.exp
index cc09e309f2aa0..fba4e558ccc8e 100644
--- a/tests/micropython/native_gen.py.exp
+++ b/tests/micropython/native_gen.py.exp
@@ -2,3 +2,9 @@
 4
 5
 [0, 1, 2]
+1
+caught ValueError(42,)
+3
+1
+raising GeneratorExit
+None

From 079f3e5e5bc03f8e7af34a5e6e8db8bf2c570ba7 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 15 Apr 2022 00:45:25 +1000
Subject: [PATCH 2023/3533] py/parse: Allow all constant objects to be used in
 "X = const(o)".

Now that constant tuples are supported in the parser, eg (1, True, "str"),
it's a small step to allow anything that is a constant to be used with the
pattern:

    from micropython import const

    X = const(obj)

This commit makes the required changes to allow the following types of
constants:

    from micropython import const

    _INT = const(123)
    _FLOAT = const(1.2)
    _COMPLEX = const(3.4j)
    _STR = const("str")
    _BYTES = const(b"bytes")
    _TUPLE = const((_INT, _STR, _BYTES))
    _TUPLE2 = const((None, False, True, ..., (), _TUPLE))

Prior to this, only integers could be used in const(...).

Signed-off-by: Damien George <damien@micropython.org>
---
 docs/reference/constrained.rst          |  3 ++-
 py/parse.c                              | 20 +++++++++----------
 tests/micropython/const_alltypes.py     | 26 +++++++++++++++++++++++++
 tests/micropython/const_alltypes.py.exp | 12 ++++++++++++
 4 files changed, 50 insertions(+), 11 deletions(-)
 create mode 100644 tests/micropython/const_alltypes.py
 create mode 100644 tests/micropython/const_alltypes.py.exp

diff --git a/docs/reference/constrained.rst b/docs/reference/constrained.rst
index 8d3ba0e3af46b..8b64fd98fc447 100644
--- a/docs/reference/constrained.rst
+++ b/docs/reference/constrained.rst
@@ -112,7 +112,8 @@ with an underscore as in ``_COLS``: this symbol is not visible outside the
 module so will not occupy RAM.
 
 The argument to ``const()`` may be anything which, at compile time, evaluates
-to an integer e.g. ``0x100`` or ``1 << 8``. It can even include other const
+to a constant e.g. ``0x100``, ``1 << 8`` or ``(True, "string", b"bytes")``
+(see section below for details).  It can even include other const
 symbols that have already been defined, e.g. ``1 << BIT``.
 
 **Constant data structures**
diff --git a/py/parse.c b/py/parse.c
index b8a40f4bb5062..3972893cbb475 100644
--- a/py/parse.c
+++ b/py/parse.c
@@ -357,7 +357,7 @@ bool mp_parse_node_get_int_maybe(mp_parse_node_t pn, mp_obj_t *o) {
     }
 }
 
-#if MICROPY_COMP_CONST_TUPLE
+#if MICROPY_COMP_CONST_TUPLE || MICROPY_COMP_CONST
 STATIC bool mp_parse_node_is_const(mp_parse_node_t pn) {
     if (MP_PARSE_NODE_IS_SMALL_INT(pn)) {
         // Small integer.
@@ -545,9 +545,9 @@ STATIC mp_parse_node_t make_node_const_object(parser_t *parser, size_t src_line,
     return (mp_parse_node_t)pn;
 }
 
-// Create a parse node represeting a constant integer value, possibly optimising
-// it by putting the (small) integer value directly in the parse node itself.
-STATIC mp_parse_node_t make_node_const_int(parser_t *parser, size_t src_line, mp_obj_t obj) {
+// Create a parse node represeting a constant object, possibly optimising the case of
+// an integer, by putting the (small) integer value directly in the parse node itself.
+STATIC mp_parse_node_t make_node_const_object_optimised(parser_t *parser, size_t src_line, mp_obj_t obj) {
     if (mp_obj_is_small_int(obj)) {
         mp_int_t val = MP_OBJ_SMALL_INT_VALUE(obj);
         #if MICROPY_OBJ_REPR == MICROPY_OBJ_REPR_D
@@ -579,7 +579,7 @@ STATIC void push_result_token(parser_t *parser, uint8_t rule_id) {
         mp_map_elem_t *elem;
         if (rule_id == RULE_atom
             && (elem = mp_map_lookup(&parser->consts, MP_OBJ_NEW_QSTR(id), MP_MAP_LOOKUP)) != NULL) {
-            pn = make_node_const_int(parser, lex->tok_line, elem->value);
+            pn = make_node_const_object_optimised(parser, lex->tok_line, elem->value);
         } else {
             pn = mp_parse_node_new_leaf(MP_PARSE_NODE_ID, id);
         }
@@ -589,7 +589,7 @@ STATIC void push_result_token(parser_t *parser, uint8_t rule_id) {
         #endif
     } else if (lex->tok_kind == MP_TOKEN_INTEGER) {
         mp_obj_t o = mp_parse_num_integer(lex->vstr.buf, lex->vstr.len, 0, lex);
-        pn = make_node_const_int(parser, lex->tok_line, o);
+        pn = make_node_const_object_optimised(parser, lex->tok_line, o);
     } else if (lex->tok_kind == MP_TOKEN_FLOAT_OR_IMAG) {
         mp_obj_t o = mp_parse_num_decimal(lex->vstr.buf, lex->vstr.len, true, false, lex);
         pn = make_node_const_object(parser, lex->tok_line, o);
@@ -803,14 +803,14 @@ STATIC bool fold_constants(parser_t *parser, uint8_t rule_id, size_t num_args) {
 
                 // get the value
                 mp_parse_node_t pn_value = ((mp_parse_node_struct_t *)((mp_parse_node_struct_t *)pn1)->nodes[1])->nodes[0];
-                mp_obj_t value;
-                if (!mp_parse_node_get_int_maybe(pn_value, &value)) {
+                if (!mp_parse_node_is_const(pn_value)) {
                     mp_obj_t exc = mp_obj_new_exception_msg(&mp_type_SyntaxError,
-                        MP_ERROR_TEXT("constant must be an integer"));
+                        MP_ERROR_TEXT("not a constant"));
                     mp_obj_exception_add_traceback(exc, parser->lexer->source_name,
                         ((mp_parse_node_struct_t *)pn1)->source_line, MP_QSTRnull);
                     nlr_raise(exc);
                 }
+                mp_obj_t value = mp_parse_node_convert_to_obj(pn_value);
 
                 // store the value in the table of dynamic constants
                 mp_map_elem_t *elem = mp_map_lookup(&parser->consts, MP_OBJ_NEW_QSTR(id), MP_MAP_LOOKUP_ADD_IF_NOT_FOUND);
@@ -872,7 +872,7 @@ STATIC bool fold_constants(parser_t *parser, uint8_t rule_id, size_t num_args) {
     for (size_t i = num_args; i > 0; i--) {
         pop_result(parser);
     }
-    push_result_node(parser, make_node_const_int(parser, 0, arg0));
+    push_result_node(parser, make_node_const_object_optimised(parser, 0, arg0));
 
     return true;
 }
diff --git a/tests/micropython/const_alltypes.py b/tests/micropython/const_alltypes.py
new file mode 100644
index 0000000000000..b5f36edc4fc33
--- /dev/null
+++ b/tests/micropython/const_alltypes.py
@@ -0,0 +1,26 @@
+# Test constant optimisation, with full range of const types.
+# This test will only work when MICROPY_COMP_CONST and MICROPY_COMP_CONST_TUPLE are enabled.
+
+from micropython import const
+
+_INT = const(123)
+_STR = const("str")
+_BYTES = const(b"bytes")
+_TUPLE = const((_INT, _STR, _BYTES))
+_TUPLE2 = const((None, False, True, ..., (), _TUPLE))
+
+print(_INT)
+print(_STR)
+print(_BYTES)
+print(_TUPLE)
+print(_TUPLE2)
+
+x = _TUPLE
+print(x is _TUPLE)
+print(x is (_INT, _STR, _BYTES))
+
+print(hasattr(globals(), "_INT"))
+print(hasattr(globals(), "_STR"))
+print(hasattr(globals(), "_BYTES"))
+print(hasattr(globals(), "_TUPLE"))
+print(hasattr(globals(), "_TUPLE2"))
diff --git a/tests/micropython/const_alltypes.py.exp b/tests/micropython/const_alltypes.py.exp
new file mode 100644
index 0000000000000..77aeffffab6ac
--- /dev/null
+++ b/tests/micropython/const_alltypes.py.exp
@@ -0,0 +1,12 @@
+123
+str
+b'bytes'
+(123, 'str', b'bytes')
+(None, False, True, Ellipsis, (), (123, 'str', b'bytes'))
+True
+True
+False
+False
+False
+False
+False

From bc42db44963a7c7eb59b826a71895f388cd75781 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Wed, 6 Jan 2021 14:36:13 +1100
Subject: [PATCH 2024/3533] github/ISSUE_TEMPLATE: Add GitHub issue templates
 and external links.

When opening a new issue the following selection is now shown:
- Bug reports
- Feature requests
- Security issue
- Documentation issue
- Link to forum
- Link to docs
- Link to downloads
---
 .github/ISSUE_TEMPLATE/bug_report.md      | 25 +++++++++++++++++++++++
 .github/ISSUE_TEMPLATE/config.yml         | 11 ++++++++++
 .github/ISSUE_TEMPLATE/documentation.md   | 16 +++++++++++++++
 .github/ISSUE_TEMPLATE/feature_request.md | 24 ++++++++++++++++++++++
 .github/ISSUE_TEMPLATE/security.md        | 16 +++++++++++++++
 5 files changed, 92 insertions(+)
 create mode 100644 .github/ISSUE_TEMPLATE/bug_report.md
 create mode 100644 .github/ISSUE_TEMPLATE/config.yml
 create mode 100644 .github/ISSUE_TEMPLATE/documentation.md
 create mode 100644 .github/ISSUE_TEMPLATE/feature_request.md
 create mode 100644 .github/ISSUE_TEMPLATE/security.md

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 0000000000000..adddd3346834b
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,25 @@
+---
+name: Bug report
+about: Report an issue
+title: ''
+labels: bug
+assignees: ''
+
+---
+
+* Remove all placeholder text below before submitting.
+
+* Please search existing issues before raising a new issue. For questions about MicroPython or for help using MicroPython, please see the MicroPython Forum -- https://forum.micropython.org/
+
+* In your issue, please include a clear and concise description of what the bug is, the expected output, and how to replicate it.
+
+* If this issue involves external hardware, please include links to relevant datasheets and schematics.
+
+* If you are seeing code being executed incorrectly, please provide a minimal example and expected output (e.g. comparison to CPython).
+
+* For build issues, please include full details of your environment, compiler versions, command lines, and build output.
+
+* Please provide as much information as possible about the version of MicroPython you're running, such as:
+ - firmware file name
+ - git commit hash and port/board
+ - version information shown in the REPL (hit Ctrl-B to see the startup message)
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 0000000000000..318d9416ee74a
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,11 @@
+blank_issues_enabled: false
+contact_links:
+  - name: MicroPython Forum
+    url: https://forum.micropython.org/
+    about: Community discussion about all things MicroPython. This is the best place to start if you have questions about using MicroPython or getting started with MicroPython development.
+  - name: MicroPython Documentation
+    url: https://docs.micropython.org/
+    about: Documentation for using and working with MicroPython and libraries.
+  - name: MicroPython Downloads
+    url: https://micropython.org/download/
+    about: Pre-built firmware and information for most supported boards.
diff --git a/.github/ISSUE_TEMPLATE/documentation.md b/.github/ISSUE_TEMPLATE/documentation.md
new file mode 100644
index 0000000000000..84ff2ba6f18ab
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/documentation.md
@@ -0,0 +1,16 @@
+---
+name: Documentation issue
+about: Report areas of the documentation or examples that need improvement
+title: 'docs: '
+labels: documentation
+assignees: ''
+
+---
+
+* Remove all placeholder text below before submitting.
+
+* Please search existing issues before raising a new issue. For questions about MicroPython or for help using MicroPython, please see the MicroPython Forum -- https://forum.micropython.org/
+
+* Describe what was missing from the documentation and/or what was incorrect/incomplete.
+
+* If possible, please link to the relevant page on https://docs.micropython.org/
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 0000000000000..1ac2055e01598
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,24 @@
+---
+name: Feature request
+about: Request a feature or improvement
+title: ''
+labels: enhancement
+assignees: ''
+
+---
+
+* Remove all placeholder text below before submitting.
+
+* Please search existing issues before raising a new issue. For questions about MicroPython or for help using MicroPython, please see the MicroPython Forum -- https://forum.micropython.org/
+
+* Describe the feature you'd like to see added to MicroPython. In particular, what does this feature enable and why is it useful. MicroPython aims to strike a balance between functionality and code size, so please consider whether this feature can be optionally enabled and whether it can be provided in other ways (e.g. pure-Python library).
+
+* For core Python features, where possible please include a link to the relevant PEP.
+
+* For new architectures / ports / boards, please provide links to relevant documentation, specifications, and toolchains. Any information about the popularity and unique features about this hardware would also be useful.
+
+* For features for existing ports (e.g. new peripherals or microcontroller features), please describe which port(s) it applies too, and whether this is could be an extension to the machine API or a port-specific module?
+
+* For drivers (e.g. for external hardware), please link to datasheets and/or existing drivers from other sources.
+
+* Who do you expect will implement the feature you are requesting? Would you be willing to sponsor this work?
diff --git a/.github/ISSUE_TEMPLATE/security.md b/.github/ISSUE_TEMPLATE/security.md
new file mode 100644
index 0000000000000..fe60875f700e9
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/security.md
@@ -0,0 +1,16 @@
+---
+name: Security report
+about: Report a security issue or vunerability in MicroPython
+title: ''
+labels: security
+assignees: ''
+
+---
+
+* Remove all placeholder text before submitting the new issue.
+
+* If you need to raise this issue privately with the MicroPython team, please email contact@micropython.org instead.
+
+* Include a clear and concise description of what the security issue is.
+
+* What does this issue allow an attacker to do?

From 469450171f8d467d467a178f67cda53d962d17d0 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Wed, 20 Apr 2022 16:05:44 +1000
Subject: [PATCH 2025/3533] py/makemoduledefs.py: Allow multiple ways to
 register a module.

For example, ussl can come from axtls or mbedtls. If neither are enabled
then don't try and set an empty definition twice, and only include it
once in MICROPY_REGISTERED_MODULES.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 py/makemoduledefs.py | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/py/makemoduledefs.py b/py/makemoduledefs.py
index 612f3d29a3660..521245bdc6f95 100644
--- a/py/makemoduledefs.py
+++ b/py/makemoduledefs.py
@@ -59,18 +59,21 @@ def generate_module_table_header(modules):
     """
 
     # Print header file for all external modules.
-    mod_defs = []
+    mod_defs = set()
     print("// Automatically generated by makemoduledefs.py.\n")
     for module_name, obj_module, enabled_define in modules:
         mod_def = "MODULE_DEF_{}".format(module_name.upper())
-        mod_defs.append(mod_def)
+        mod_defs.add(mod_def)
         print(
             (
                 "#if ({enabled_define})\n"
                 "    extern const struct _mp_obj_module_t {obj_module};\n"
+                "    #undef {mod_def}\n"
                 "    #define {mod_def} {{ MP_ROM_QSTR({module_name}), MP_ROM_PTR(&{obj_module}) }},\n"
                 "#else\n"
-                "    #define {mod_def}\n"
+                "    #ifndef {mod_def}\n"
+                "        #define {mod_def}\n"
+                "    #endif\n"
                 "#endif\n"
             ).format(
                 module_name=module_name,
@@ -82,7 +85,7 @@ def generate_module_table_header(modules):
 
     print("\n#define MICROPY_REGISTERED_MODULES \\")
 
-    for mod_def in mod_defs:
+    for mod_def in sorted(mod_defs):
         print("    {mod_def} \\".format(mod_def=mod_def))
 
     print("// MICROPY_REGISTERED_MODULES")

From 4eab44a1ec19f71e01b2c4f0747b95da0d34da77 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Wed, 20 Apr 2022 16:06:22 +1000
Subject: [PATCH 2026/3533] extmod: Make extmod modules use MP_REGISTER_MODULE.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 extmod/modbluetooth.c                  |  2 +
 extmod/modbtree.c                      |  2 +
 extmod/modframebuf.c                   |  2 +
 extmod/modlwip.c                       |  2 +
 extmod/moduasyncio.c                   |  2 +
 extmod/modubinascii.c                  |  2 +
 extmod/moducryptolib.c                 |  2 +
 extmod/moductypes.c                    |  2 +
 extmod/moduhashlib.c                   |  2 +
 extmod/moduheapq.c                     |  2 +
 extmod/modujson.c                      |  2 +
 extmod/moduos.c                        |  2 +
 extmod/moduplatform.c                  |  2 +
 extmod/modurandom.c                    |  2 +
 extmod/modure.c                        |  2 +
 extmod/moduselect.c                    |  2 +
 extmod/modussl_axtls.c                 |  4 +-
 extmod/modussl_mbedtls.c               |  4 +-
 extmod/modutimeq.c                     |  1 +
 extmod/moduwebsocket.c                 |  2 +
 extmod/moduzlib.c                      |  3 ++
 extmod/modwebrepl.c                    |  2 +
 ports/cc3200/mods/modmachine.c         |  2 +
 ports/esp32/modmachine.c               |  2 +
 ports/esp8266/modmachine.c             |  2 +
 ports/mimxrt/modmachine.c              |  2 +
 ports/nrf/modules/machine/modmachine.c |  1 +
 ports/qemu-arm/modmachine.c            |  2 +
 ports/rp2/modmachine.c                 |  2 +
 ports/samd/modmachine.c                |  2 +
 ports/stm32/modmachine.c               |  2 +
 ports/unix/modmachine.c                |  2 +
 ports/zephyr/modmachine.c              |  2 +
 py/moduerrno.c                         |  2 +
 py/objmodule.c                         | 72 --------------------------
 35 files changed, 69 insertions(+), 74 deletions(-)

diff --git a/extmod/modbluetooth.c b/extmod/modbluetooth.c
index 68656551c7890..aecf48fd41ee9 100644
--- a/extmod/modbluetooth.c
+++ b/extmod/modbluetooth.c
@@ -1004,6 +1004,8 @@ const mp_obj_module_t mp_module_ubluetooth = {
     .globals = (mp_obj_dict_t *)&mp_module_bluetooth_globals,
 };
 
+MP_REGISTER_MODULE(MP_QSTR_ubluetooth, mp_module_ubluetooth, MICROPY_PY_BLUETOOTH);
+
 // Helpers
 
 #if !MICROPY_PY_BLUETOOTH_USE_SYNC_EVENTS
diff --git a/extmod/modbtree.c b/extmod/modbtree.c
index 467b68e1dc34e..df33d765e07b7 100644
--- a/extmod/modbtree.c
+++ b/extmod/modbtree.c
@@ -379,6 +379,8 @@ const mp_obj_module_t mp_module_btree = {
     .base = { &mp_type_module },
     .globals = (mp_obj_dict_t *)&mp_module_btree_globals,
 };
+
+MP_REGISTER_MODULE(MP_QSTR_btree, mp_module_btree, MICROPY_PY_BTREE);
 #endif
 
 #endif // MICROPY_PY_BTREE
diff --git a/extmod/modframebuf.c b/extmod/modframebuf.c
index fb231362e6efe..4dfdb7eea5625 100644
--- a/extmod/modframebuf.c
+++ b/extmod/modframebuf.c
@@ -667,6 +667,8 @@ const mp_obj_module_t mp_module_framebuf = {
     .base = { &mp_type_module },
     .globals = (mp_obj_dict_t *)&framebuf_module_globals,
 };
+
+MP_REGISTER_MODULE(MP_QSTR_framebuf, mp_module_framebuf, MICROPY_PY_FRAMEBUF);
 #endif
 
 #endif // MICROPY_PY_FRAMEBUF
diff --git a/extmod/modlwip.c b/extmod/modlwip.c
index 4d4ffc1e0787d..53bead2a323de 100644
--- a/extmod/modlwip.c
+++ b/extmod/modlwip.c
@@ -1778,4 +1778,6 @@ const mp_obj_module_t mp_module_lwip = {
     .globals = (mp_obj_dict_t *)&mp_module_lwip_globals,
 };
 
+MP_REGISTER_MODULE(MP_QSTR_lwip, mp_module_lwip, MICROPY_PY_LWIP);
+
 #endif // MICROPY_PY_LWIP
diff --git a/extmod/moduasyncio.c b/extmod/moduasyncio.c
index c4ee897c2e4d7..b09b8d67b08c8 100644
--- a/extmod/moduasyncio.c
+++ b/extmod/moduasyncio.c
@@ -310,4 +310,6 @@ const mp_obj_module_t mp_module_uasyncio = {
     .globals = (mp_obj_dict_t *)&mp_module_uasyncio_globals,
 };
 
+MP_REGISTER_MODULE(MP_QSTR__uasyncio, mp_module_uasyncio, MICROPY_PY_UASYNCIO);
+
 #endif // MICROPY_PY_UASYNCIO
diff --git a/extmod/modubinascii.c b/extmod/modubinascii.c
index b34f232c62936..a362a2d6eb9c8 100644
--- a/extmod/modubinascii.c
+++ b/extmod/modubinascii.c
@@ -258,4 +258,6 @@ const mp_obj_module_t mp_module_ubinascii = {
     .globals = (mp_obj_dict_t *)&mp_module_binascii_globals,
 };
 
+MP_REGISTER_MODULE(MP_QSTR_ubinascii, mp_module_ubinascii, MICROPY_PY_UBINASCII);
+
 #endif // MICROPY_PY_UBINASCII
diff --git a/extmod/moducryptolib.c b/extmod/moducryptolib.c
index 50cdbfa72eda8..ba04a7bde3bcf 100644
--- a/extmod/moducryptolib.c
+++ b/extmod/moducryptolib.c
@@ -374,4 +374,6 @@ const mp_obj_module_t mp_module_ucryptolib = {
     .globals = (mp_obj_dict_t *)&mp_module_ucryptolib_globals,
 };
 
+MP_REGISTER_MODULE(MP_QSTR_ucryptolib, mp_module_ucryptolib, MICROPY_PY_UCRYPTOLIB);
+
 #endif // MICROPY_PY_UCRYPTOLIB
diff --git a/extmod/moductypes.c b/extmod/moductypes.c
index 7a0cbc39b4572..a6ebd92ebc406 100644
--- a/extmod/moductypes.c
+++ b/extmod/moductypes.c
@@ -717,4 +717,6 @@ const mp_obj_module_t mp_module_uctypes = {
     .globals = (mp_obj_dict_t *)&mp_module_uctypes_globals,
 };
 
+MP_REGISTER_MODULE(MP_QSTR_uctypes, mp_module_uctypes, MICROPY_PY_UCTYPES);
+
 #endif
diff --git a/extmod/moduhashlib.c b/extmod/moduhashlib.c
index 765dd29c1ec07..ded9972ca24c7 100644
--- a/extmod/moduhashlib.c
+++ b/extmod/moduhashlib.c
@@ -371,4 +371,6 @@ const mp_obj_module_t mp_module_uhashlib = {
     .globals = (mp_obj_dict_t *)&mp_module_uhashlib_globals,
 };
 
+MP_REGISTER_MODULE(MP_QSTR_uhashlib, mp_module_uhashlib, MICROPY_PY_UHASHLIB);
+
 #endif // MICROPY_PY_UHASHLIB
diff --git a/extmod/moduheapq.c b/extmod/moduheapq.c
index 073ce516b996d..42871f2c06710 100644
--- a/extmod/moduheapq.c
+++ b/extmod/moduheapq.c
@@ -117,6 +117,8 @@ const mp_obj_module_t mp_module_uheapq = {
     .base = { &mp_type_module },
     .globals = (mp_obj_dict_t *)&mp_module_uheapq_globals,
 };
+
+MP_REGISTER_MODULE(MP_QSTR_uheapq, mp_module_uheapq, MICROPY_PY_UHEAPQ);
 #endif
 
 #endif // MICROPY_PY_UHEAPQ
diff --git a/extmod/modujson.c b/extmod/modujson.c
index e5bfb0d966399..befa351f1c380 100644
--- a/extmod/modujson.c
+++ b/extmod/modujson.c
@@ -381,4 +381,6 @@ const mp_obj_module_t mp_module_ujson = {
     .globals = (mp_obj_dict_t *)&mp_module_ujson_globals,
 };
 
+MP_REGISTER_MODULE(MP_QSTR_ujson, mp_module_ujson, MICROPY_PY_UJSON);
+
 #endif // MICROPY_PY_UJSON
diff --git a/extmod/moduos.c b/extmod/moduos.c
index ed278dd545820..2b902eb214a4f 100644
--- a/extmod/moduos.c
+++ b/extmod/moduos.c
@@ -176,4 +176,6 @@ const mp_obj_module_t mp_module_uos = {
     .globals = (mp_obj_dict_t *)&os_module_globals,
 };
 
+MP_REGISTER_MODULE(MP_QSTR_uos, mp_module_uos, MICROPY_PY_UOS);
+
 #endif // MICROPY_PY_UOS
diff --git a/extmod/moduplatform.c b/extmod/moduplatform.c
index fa59c9227d088..16e45078f303d 100644
--- a/extmod/moduplatform.c
+++ b/extmod/moduplatform.c
@@ -75,4 +75,6 @@ const mp_obj_module_t mp_module_uplatform = {
     .globals = (mp_obj_dict_t *)&modplatform_globals,
 };
 
+MP_REGISTER_MODULE(MP_QSTR_uplatform, mp_module_uplatform, MICROPY_PY_UPLATFORM);
+
 #endif // MICROPY_PY_UPLATFORM
diff --git a/extmod/modurandom.c b/extmod/modurandom.c
index 21fbac694221d..6e5f99de76869 100644
--- a/extmod/modurandom.c
+++ b/extmod/modurandom.c
@@ -254,6 +254,8 @@ const mp_obj_module_t mp_module_urandom = {
     .base = { &mp_type_module },
     .globals = (mp_obj_dict_t *)&mp_module_urandom_globals,
 };
+
+MP_REGISTER_MODULE(MP_QSTR_urandom, mp_module_urandom, MICROPY_PY_URANDOM);
 #endif
 
 #endif // MICROPY_PY_URANDOM
diff --git a/extmod/modure.c b/extmod/modure.c
index 70bc02aa4d5f1..1d9d82c7ba134 100644
--- a/extmod/modure.c
+++ b/extmod/modure.c
@@ -447,6 +447,8 @@ const mp_obj_module_t mp_module_ure = {
     .base = { &mp_type_module },
     .globals = (mp_obj_dict_t *)&mp_module_re_globals,
 };
+
+MP_REGISTER_MODULE(MP_QSTR_ure, mp_module_ure, MICROPY_PY_URE);
 #endif
 
 // Source files #include'd here to make sure they're compiled in
diff --git a/extmod/moduselect.c b/extmod/moduselect.c
index 27dc04604a7a1..296d38a5d4534 100644
--- a/extmod/moduselect.c
+++ b/extmod/moduselect.c
@@ -373,4 +373,6 @@ const mp_obj_module_t mp_module_uselect = {
     .globals = (mp_obj_dict_t *)&mp_module_select_globals,
 };
 
+MP_REGISTER_MODULE(MP_QSTR_uselect, mp_module_uselect, MICROPY_PY_USELECT);
+
 #endif // MICROPY_PY_USELECT
diff --git a/extmod/modussl_axtls.c b/extmod/modussl_axtls.c
index 9d5934206749a..c9ce629b61351 100644
--- a/extmod/modussl_axtls.c
+++ b/extmod/modussl_axtls.c
@@ -358,4 +358,6 @@ const mp_obj_module_t mp_module_ussl = {
     .globals = (mp_obj_dict_t *)&mp_module_ssl_globals,
 };
 
-#endif // MICROPY_PY_USSL
+MP_REGISTER_MODULE(MP_QSTR_ussl, mp_module_ussl, MICROPY_PY_USSL && MICROPY_SSL_AXTLS);
+
+#endif // MICROPY_PY_USSL && MICROPY_SSL_AXTLS
diff --git a/extmod/modussl_mbedtls.c b/extmod/modussl_mbedtls.c
index 277af37c7cfd6..8496642d02b67 100644
--- a/extmod/modussl_mbedtls.c
+++ b/extmod/modussl_mbedtls.c
@@ -418,4 +418,6 @@ const mp_obj_module_t mp_module_ussl = {
     .globals = (mp_obj_dict_t *)&mp_module_ssl_globals,
 };
 
-#endif // MICROPY_PY_USSL
+MP_REGISTER_MODULE(MP_QSTR_ussl, mp_module_ussl, MICROPY_PY_USSL && MICROPY_SSL_MBEDTLS);
+
+#endif // MICROPY_PY_USSL && MICROPY_SSL_MBEDTLS
diff --git a/extmod/modutimeq.c b/extmod/modutimeq.c
index e92f4d9032611..93a9d09b044d9 100644
--- a/extmod/modutimeq.c
+++ b/extmod/modutimeq.c
@@ -229,4 +229,5 @@ const mp_obj_module_t mp_module_utimeq = {
     .globals = (mp_obj_dict_t *)&mp_module_utimeq_globals,
 };
 
+MP_REGISTER_MODULE(MP_QSTR_utimeq, mp_module_utimeq, MICROPY_PY_UTIMEQ);
 #endif // MICROPY_PY_UTIMEQ
diff --git a/extmod/moduwebsocket.c b/extmod/moduwebsocket.c
index 44e77da567313..48f4cc78ef785 100644
--- a/extmod/moduwebsocket.c
+++ b/extmod/moduwebsocket.c
@@ -310,4 +310,6 @@ const mp_obj_module_t mp_module_uwebsocket = {
     .globals = (mp_obj_dict_t *)&uwebsocket_module_globals,
 };
 
+MP_REGISTER_MODULE(MP_QSTR_uwebsocket, mp_module_uwebsocket, MICROPY_PY_UWEBSOCKET);
+
 #endif // MICROPY_PY_UWEBSOCKET
diff --git a/extmod/moduzlib.c b/extmod/moduzlib.c
index d02404f1cd4c3..b74c6b7b1a794 100644
--- a/extmod/moduzlib.c
+++ b/extmod/moduzlib.c
@@ -221,6 +221,9 @@ const mp_obj_module_t mp_module_uzlib = {
     .base = { &mp_type_module },
     .globals = (mp_obj_dict_t *)&mp_module_uzlib_globals,
 };
+
+
+MP_REGISTER_MODULE(MP_QSTR_uzlib, mp_module_uzlib, MICROPY_PY_UZLIB);
 #endif
 
 // Source files #include'd here to make sure they're compiled in
diff --git a/extmod/modwebrepl.c b/extmod/modwebrepl.c
index 63810447fa3f4..e5fa5128c9769 100644
--- a/extmod/modwebrepl.c
+++ b/extmod/modwebrepl.c
@@ -363,4 +363,6 @@ const mp_obj_module_t mp_module_webrepl = {
     .globals = (mp_obj_dict_t *)&webrepl_module_globals,
 };
 
+MP_REGISTER_MODULE(MP_QSTR__webrepl, mp_module_webrepl, MICROPY_PY_WEBREPL);
+
 #endif // MICROPY_PY_WEBREPL
diff --git a/ports/cc3200/mods/modmachine.c b/ports/cc3200/mods/modmachine.c
index ee76d6e51658e..be8b7d6b52714 100644
--- a/ports/cc3200/mods/modmachine.c
+++ b/ports/cc3200/mods/modmachine.c
@@ -213,3 +213,5 @@ const mp_obj_module_t mp_module_machine = {
     .base = { &mp_type_module },
     .globals = (mp_obj_dict_t*)&machine_module_globals,
 };
+
+MP_REGISTER_MODULE(MP_QSTR_umachine, mp_module_machine, MICROPY_PY_MACHINE);
diff --git a/ports/esp32/modmachine.c b/ports/esp32/modmachine.c
index dfe2435ec2f3e..f1e261634d074 100644
--- a/ports/esp32/modmachine.c
+++ b/ports/esp32/modmachine.c
@@ -337,4 +337,6 @@ const mp_obj_module_t mp_module_machine = {
     .globals = (mp_obj_dict_t *)&machine_module_globals,
 };
 
+MP_REGISTER_MODULE(MP_QSTR_umachine, mp_module_machine, MICROPY_PY_MACHINE);
+
 #endif // MICROPY_PY_MACHINE
diff --git a/ports/esp8266/modmachine.c b/ports/esp8266/modmachine.c
index 966f12749f28e..ef1b50f6381ce 100644
--- a/ports/esp8266/modmachine.c
+++ b/ports/esp8266/modmachine.c
@@ -453,4 +453,6 @@ const mp_obj_module_t mp_module_machine = {
     .globals = (mp_obj_dict_t *)&machine_module_globals,
 };
 
+MP_REGISTER_MODULE(MP_QSTR_umachine, mp_module_machine, MICROPY_PY_MACHINE);
+
 #endif // MICROPY_PY_MACHINE
diff --git a/ports/mimxrt/modmachine.c b/ports/mimxrt/modmachine.c
index d2358c5069d25..fd83ebaad4b1e 100644
--- a/ports/mimxrt/modmachine.c
+++ b/ports/mimxrt/modmachine.c
@@ -159,3 +159,5 @@ const mp_obj_module_t mp_module_machine = {
     .base = { &mp_type_module },
     .globals = (mp_obj_dict_t *)&machine_module_globals,
 };
+
+MP_REGISTER_MODULE(MP_QSTR_umachine, mp_module_machine, MICROPY_PY_MACHINE);
diff --git a/ports/nrf/modules/machine/modmachine.c b/ports/nrf/modules/machine/modmachine.c
index 3d4cda8e45e72..65297548a490c 100644
--- a/ports/nrf/modules/machine/modmachine.c
+++ b/ports/nrf/modules/machine/modmachine.c
@@ -249,3 +249,4 @@ const mp_obj_module_t mp_module_machine = {
     .globals = (mp_obj_dict_t*)&machine_module_globals,
 };
 
+MP_REGISTER_MODULE(MP_QSTR_umachine, mp_module_machine, MICROPY_PY_MACHINE);
diff --git a/ports/qemu-arm/modmachine.c b/ports/qemu-arm/modmachine.c
index 728fd4fa31b09..1168e74a133d6 100644
--- a/ports/qemu-arm/modmachine.c
+++ b/ports/qemu-arm/modmachine.c
@@ -45,3 +45,5 @@ const mp_obj_module_t mp_module_machine = {
     .base = { &mp_type_module },
     .globals = (mp_obj_dict_t *)&machine_module_globals,
 };
+
+MP_REGISTER_MODULE(MP_QSTR_umachine, mp_module_machine, MICROPY_PY_MACHINE);
diff --git a/ports/rp2/modmachine.c b/ports/rp2/modmachine.c
index 9d6178a0f2b64..d6941bcfe49d5 100644
--- a/ports/rp2/modmachine.c
+++ b/ports/rp2/modmachine.c
@@ -187,3 +187,5 @@ const mp_obj_module_t mp_module_machine = {
     .base = { &mp_type_module },
     .globals = (mp_obj_dict_t *)&machine_module_globals,
 };
+
+MP_REGISTER_MODULE(MP_QSTR_umachine, mp_module_machine, MICROPY_PY_MACHINE);
diff --git a/ports/samd/modmachine.c b/ports/samd/modmachine.c
index 0ebb5581cdd0c..8da83b7d2b333 100644
--- a/ports/samd/modmachine.c
+++ b/ports/samd/modmachine.c
@@ -128,3 +128,5 @@ const mp_obj_module_t mp_module_machine = {
     .base = { &mp_type_module },
     .globals = (mp_obj_dict_t *)&machine_module_globals,
 };
+
+MP_REGISTER_MODULE(MP_QSTR_umachine, mp_module_machine, MICROPY_PY_MACHINE);
diff --git a/ports/stm32/modmachine.c b/ports/stm32/modmachine.c
index 3a24e08f4885d..20140ed101857 100644
--- a/ports/stm32/modmachine.c
+++ b/ports/stm32/modmachine.c
@@ -480,3 +480,5 @@ const mp_obj_module_t mp_module_machine = {
     .base = { &mp_type_module },
     .globals = (mp_obj_dict_t *)&machine_module_globals,
 };
+
+MP_REGISTER_MODULE(MP_QSTR_umachine, mp_module_machine, MICROPY_PY_MACHINE);
diff --git a/ports/unix/modmachine.c b/ports/unix/modmachine.c
index 5b462a3b1534b..3d4d9eebcacf4 100644
--- a/ports/unix/modmachine.c
+++ b/ports/unix/modmachine.c
@@ -110,4 +110,6 @@ const mp_obj_module_t mp_module_machine = {
     .globals = (mp_obj_dict_t *)&machine_module_globals,
 };
 
+MP_REGISTER_MODULE(MP_QSTR_umachine, mp_module_machine, MICROPY_PY_MACHINE);
+
 #endif // MICROPY_PY_MACHINE
diff --git a/ports/zephyr/modmachine.c b/ports/zephyr/modmachine.c
index bc984d1b631c7..c8b07c023bb5d 100644
--- a/ports/zephyr/modmachine.c
+++ b/ports/zephyr/modmachine.c
@@ -89,4 +89,6 @@ const mp_obj_module_t mp_module_machine = {
     .globals = (mp_obj_dict_t *)&machine_module_globals,
 };
 
+MP_REGISTER_MODULE(MP_QSTR_umachine, mp_module_machine, MICROPY_PY_MACHINE);
+
 #endif // MICROPY_PY_MACHINE
diff --git a/py/moduerrno.c b/py/moduerrno.c
index d9affd9b20c7a..4b61e0bda2844 100644
--- a/py/moduerrno.c
+++ b/py/moduerrno.c
@@ -99,6 +99,8 @@ const mp_obj_module_t mp_module_uerrno = {
     .globals = (mp_obj_dict_t *)&mp_module_uerrno_globals,
 };
 
+MP_REGISTER_MODULE(MP_QSTR_uerrno, mp_module_uerrno, MICROPY_PY_UERRNO);
+
 qstr mp_errno_to_str(mp_obj_t errno_val) {
     #if MICROPY_PY_UERRNO_ERRORCODE
     // We have the errorcode dict so can do a lookup using the hash map
diff --git a/py/objmodule.c b/py/objmodule.c
index b109d723a5284..d550e775569f0 100644
--- a/py/objmodule.c
+++ b/py/objmodule.c
@@ -193,78 +193,6 @@ STATIC const mp_rom_map_elem_t mp_builtin_module_table[] = {
     { MP_ROM_QSTR(MP_QSTR__thread), MP_ROM_PTR(&mp_module_thread) },
     #endif
 
-    // extmod modules
-
-    #if MICROPY_PY_UASYNCIO
-    { MP_ROM_QSTR(MP_QSTR__uasyncio), MP_ROM_PTR(&mp_module_uasyncio) },
-    #endif
-    #if MICROPY_PY_UERRNO
-    { MP_ROM_QSTR(MP_QSTR_uerrno), MP_ROM_PTR(&mp_module_uerrno) },
-    #endif
-    #if MICROPY_PY_UCTYPES
-    { MP_ROM_QSTR(MP_QSTR_uctypes), MP_ROM_PTR(&mp_module_uctypes) },
-    #endif
-    #if MICROPY_PY_UZLIB
-    { MP_ROM_QSTR(MP_QSTR_uzlib), MP_ROM_PTR(&mp_module_uzlib) },
-    #endif
-    #if MICROPY_PY_UJSON
-    { MP_ROM_QSTR(MP_QSTR_ujson), MP_ROM_PTR(&mp_module_ujson) },
-    #endif
-    #if MICROPY_PY_UOS
-    { MP_ROM_QSTR(MP_QSTR_uos), MP_ROM_PTR(&mp_module_uos) },
-    #endif
-    #if MICROPY_PY_URE
-    { MP_ROM_QSTR(MP_QSTR_ure), MP_ROM_PTR(&mp_module_ure) },
-    #endif
-    #if MICROPY_PY_UHEAPQ
-    { MP_ROM_QSTR(MP_QSTR_uheapq), MP_ROM_PTR(&mp_module_uheapq) },
-    #endif
-    #if MICROPY_PY_UTIMEQ
-    { MP_ROM_QSTR(MP_QSTR_utimeq), MP_ROM_PTR(&mp_module_utimeq) },
-    #endif
-    #if MICROPY_PY_UHASHLIB
-    { MP_ROM_QSTR(MP_QSTR_uhashlib), MP_ROM_PTR(&mp_module_uhashlib) },
-    #endif
-    #if MICROPY_PY_UCRYPTOLIB
-    { MP_ROM_QSTR(MP_QSTR_ucryptolib), MP_ROM_PTR(&mp_module_ucryptolib) },
-    #endif
-    #if MICROPY_PY_UBINASCII
-    { MP_ROM_QSTR(MP_QSTR_ubinascii), MP_ROM_PTR(&mp_module_ubinascii) },
-    #endif
-    #if MICROPY_PY_URANDOM
-    { MP_ROM_QSTR(MP_QSTR_urandom), MP_ROM_PTR(&mp_module_urandom) },
-    #endif
-    #if MICROPY_PY_USELECT
-    { MP_ROM_QSTR(MP_QSTR_uselect), MP_ROM_PTR(&mp_module_uselect) },
-    #endif
-    #if MICROPY_PY_USSL
-    { MP_ROM_QSTR(MP_QSTR_ussl), MP_ROM_PTR(&mp_module_ussl) },
-    #endif
-    #if MICROPY_PY_LWIP
-    { MP_ROM_QSTR(MP_QSTR_lwip), MP_ROM_PTR(&mp_module_lwip) },
-    #endif
-    #if MICROPY_PY_MACHINE
-    { MP_ROM_QSTR(MP_QSTR_umachine), MP_ROM_PTR(&mp_module_machine) },
-    #endif
-    #if MICROPY_PY_UWEBSOCKET
-    { MP_ROM_QSTR(MP_QSTR_uwebsocket), MP_ROM_PTR(&mp_module_uwebsocket) },
-    #endif
-    #if MICROPY_PY_WEBREPL
-    { MP_ROM_QSTR(MP_QSTR__webrepl), MP_ROM_PTR(&mp_module_webrepl) },
-    #endif
-    #if MICROPY_PY_FRAMEBUF
-    { MP_ROM_QSTR(MP_QSTR_framebuf), MP_ROM_PTR(&mp_module_framebuf) },
-    #endif
-    #if MICROPY_PY_BTREE
-    { MP_ROM_QSTR(MP_QSTR_btree), MP_ROM_PTR(&mp_module_btree) },
-    #endif
-    #if MICROPY_PY_BLUETOOTH
-    { MP_ROM_QSTR(MP_QSTR_ubluetooth), MP_ROM_PTR(&mp_module_ubluetooth) },
-    #endif
-    #if MICROPY_PY_UPLATFORM
-    { MP_ROM_QSTR(MP_QSTR_uplatform), MP_ROM_PTR(&mp_module_uplatform) },
-    #endif
-
     // extra builtin modules as defined by a port
     MICROPY_PORT_BUILTIN_MODULES
 

From d8d3e6ae787718fffacde2eb22b7eb32fb759484 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Wed, 20 Apr 2022 16:14:22 +1000
Subject: [PATCH 2027/3533] py: Make builtin modules use MP_REGISTER_MODULE.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 py/modbuiltins.c    |  2 ++
 py/modcmath.c       |  4 +++-
 py/modcollections.c |  2 ++
 py/modgc.c          |  2 ++
 py/modio.c          |  2 ++
 py/modmath.c        |  2 ++
 py/modmicropython.c |  2 ++
 py/modstruct.c      |  2 ++
 py/modsys.c         |  2 ++
 py/modthread.c      |  2 ++
 py/objmodule.c      | 32 --------------------------------
 py/runtime.c        |  2 ++
 12 files changed, 23 insertions(+), 33 deletions(-)

diff --git a/py/modbuiltins.c b/py/modbuiltins.c
index 26a84f57b3d55..5631798fb62fd 100644
--- a/py/modbuiltins.c
+++ b/py/modbuiltins.c
@@ -784,3 +784,5 @@ const mp_obj_module_t mp_module_builtins = {
     .base = { &mp_type_module },
     .globals = (mp_obj_dict_t *)&mp_module_builtins_globals,
 };
+
+MP_REGISTER_MODULE(MP_QSTR_builtins, mp_module_builtins, 1);
diff --git a/py/modcmath.c b/py/modcmath.c
index fb1f2a8fc267d..44a4736e095e1 100644
--- a/py/modcmath.c
+++ b/py/modcmath.c
@@ -149,4 +149,6 @@ const mp_obj_module_t mp_module_cmath = {
     .globals = (mp_obj_dict_t *)&mp_module_cmath_globals,
 };
 
-#endif // MICROPY_PY_BUILTINS_FLOAT && MICROPY_PY_CMATH
+MP_REGISTER_MODULE(MP_QSTR_cmath, mp_module_cmath, MICROPY_PY_BUILTINS_FLOAT && MICROPY_PY_BUILTINS_COMPLEX && MICROPY_PY_CMATH);
+
+#endif // MICROPY_PY_BUILTINS_FLOAT && MICROPY_PY_BUILTINS_COMPLEX && MICROPY_PY_CMATH
diff --git a/py/modcollections.c b/py/modcollections.c
index c145f12cc6e16..0c008579f85dc 100644
--- a/py/modcollections.c
+++ b/py/modcollections.c
@@ -46,4 +46,6 @@ const mp_obj_module_t mp_module_collections = {
     .globals = (mp_obj_dict_t *)&mp_module_collections_globals,
 };
 
+MP_REGISTER_MODULE(MP_QSTR_ucollections, mp_module_collections, MICROPY_PY_COLLECTIONS);
+
 #endif // MICROPY_PY_COLLECTIONS
diff --git a/py/modgc.c b/py/modgc.c
index 534a711c16ee5..0ae3a84ae8247 100644
--- a/py/modgc.c
+++ b/py/modgc.c
@@ -115,4 +115,6 @@ const mp_obj_module_t mp_module_gc = {
     .globals = (mp_obj_dict_t *)&mp_module_gc_globals,
 };
 
+MP_REGISTER_MODULE(MP_QSTR_gc, mp_module_gc, MICROPY_PY_GC && MICROPY_ENABLE_GC);
+
 #endif
diff --git a/py/modio.c b/py/modio.c
index 3e37231f23318..72e633bd9fdae 100644
--- a/py/modio.c
+++ b/py/modio.c
@@ -233,4 +233,6 @@ const mp_obj_module_t mp_module_io = {
     .globals = (mp_obj_dict_t *)&mp_module_io_globals,
 };
 
+MP_REGISTER_MODULE(MP_QSTR_uio, mp_module_io, MICROPY_PY_IO);
+
 #endif
diff --git a/py/modmath.c b/py/modmath.c
index 8fc821c9d5911..764f59e1cb58c 100644
--- a/py/modmath.c
+++ b/py/modmath.c
@@ -435,4 +435,6 @@ const mp_obj_module_t mp_module_math = {
     .globals = (mp_obj_dict_t *)&mp_module_math_globals,
 };
 
+MP_REGISTER_MODULE(MP_QSTR_math, mp_module_math, MICROPY_PY_BUILTINS_FLOAT && MICROPY_PY_MATH);
+
 #endif // MICROPY_PY_BUILTINS_FLOAT && MICROPY_PY_MATH
diff --git a/py/modmicropython.c b/py/modmicropython.c
index 180f7f186c69a..a2faa9a9f0cbb 100644
--- a/py/modmicropython.c
+++ b/py/modmicropython.c
@@ -209,3 +209,5 @@ const mp_obj_module_t mp_module_micropython = {
     .base = { &mp_type_module },
     .globals = (mp_obj_dict_t *)&mp_module_micropython_globals,
 };
+
+MP_REGISTER_MODULE(MP_QSTR_micropython, mp_module_micropython, 1);
diff --git a/py/modstruct.c b/py/modstruct.c
index 4cbcad6d496a8..2cbf691afbed8 100644
--- a/py/modstruct.c
+++ b/py/modstruct.c
@@ -266,4 +266,6 @@ const mp_obj_module_t mp_module_ustruct = {
     .globals = (mp_obj_dict_t *)&mp_module_struct_globals,
 };
 
+MP_REGISTER_MODULE(MP_QSTR_ustruct, mp_module_ustruct, MICROPY_PY_STRUCT);
+
 #endif
diff --git a/py/modsys.c b/py/modsys.c
index 4ddc27fc51d29..e3fb697eb1b3e 100644
--- a/py/modsys.c
+++ b/py/modsys.c
@@ -284,4 +284,6 @@ const mp_obj_module_t mp_module_sys = {
     .globals = (mp_obj_dict_t *)&mp_module_sys_globals,
 };
 
+MP_REGISTER_MODULE(MP_QSTR_usys, mp_module_sys, MICROPY_PY_SYS);
+
 #endif
diff --git a/py/modthread.c b/py/modthread.c
index d22b1854cda33..11d0405e710f0 100644
--- a/py/modthread.c
+++ b/py/modthread.c
@@ -300,4 +300,6 @@ const mp_obj_module_t mp_module_thread = {
     .globals = (mp_obj_dict_t *)&mp_module_thread_globals,
 };
 
+MP_REGISTER_MODULE(MP_QSTR__thread, mp_module_thread, MICROPY_PY_THREAD);
+
 #endif // MICROPY_PY_THREAD
diff --git a/py/objmodule.c b/py/objmodule.c
index d550e775569f0..f93669a11cdbe 100644
--- a/py/objmodule.c
+++ b/py/objmodule.c
@@ -161,38 +161,6 @@ mp_obj_t mp_obj_new_module(qstr module_name) {
 // Global module table and related functions
 
 STATIC const mp_rom_map_elem_t mp_builtin_module_table[] = {
-    { MP_ROM_QSTR(MP_QSTR___main__), MP_ROM_PTR(&mp_module___main__) },
-    { MP_ROM_QSTR(MP_QSTR_builtins), MP_ROM_PTR(&mp_module_builtins) },
-    { MP_ROM_QSTR(MP_QSTR_micropython), MP_ROM_PTR(&mp_module_micropython) },
-
-    #if MICROPY_PY_IO
-    { MP_ROM_QSTR(MP_QSTR_uio), MP_ROM_PTR(&mp_module_io) },
-    #endif
-    #if MICROPY_PY_COLLECTIONS
-    { MP_ROM_QSTR(MP_QSTR_ucollections), MP_ROM_PTR(&mp_module_collections) },
-    #endif
-    #if MICROPY_PY_STRUCT
-    { MP_ROM_QSTR(MP_QSTR_ustruct), MP_ROM_PTR(&mp_module_ustruct) },
-    #endif
-
-    #if MICROPY_PY_BUILTINS_FLOAT
-    #if MICROPY_PY_MATH
-    { MP_ROM_QSTR(MP_QSTR_math), MP_ROM_PTR(&mp_module_math) },
-    #endif
-    #if MICROPY_PY_BUILTINS_COMPLEX && MICROPY_PY_CMATH
-    { MP_ROM_QSTR(MP_QSTR_cmath), MP_ROM_PTR(&mp_module_cmath) },
-    #endif
-    #endif
-    #if MICROPY_PY_SYS
-    { MP_ROM_QSTR(MP_QSTR_usys), MP_ROM_PTR(&mp_module_sys) },
-    #endif
-    #if MICROPY_PY_GC && MICROPY_ENABLE_GC
-    { MP_ROM_QSTR(MP_QSTR_gc), MP_ROM_PTR(&mp_module_gc) },
-    #endif
-    #if MICROPY_PY_THREAD
-    { MP_ROM_QSTR(MP_QSTR__thread), MP_ROM_PTR(&mp_module_thread) },
-    #endif
-
     // extra builtin modules as defined by a port
     MICROPY_PORT_BUILTIN_MODULES
 
diff --git a/py/runtime.c b/py/runtime.c
index 184de7bc969a5..8c857fec27e6c 100644
--- a/py/runtime.c
+++ b/py/runtime.c
@@ -59,6 +59,8 @@ const mp_obj_module_t mp_module___main__ = {
     .globals = (mp_obj_dict_t *)&MP_STATE_VM(dict_main),
 };
 
+MP_REGISTER_MODULE(MP_QSTR___main__, mp_module___main__, 1);
+
 void mp_init(void) {
     qstr_init();
 

From bb794f05b7fef75696118ea1eb03a769a9fac40d Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Wed, 20 Apr 2022 17:17:39 +1000
Subject: [PATCH 2028/3533] extmod: Make port-included extmod modules use
 MP_REGISTER_MODULES.

_onewire, socket, and network were previously added by the port rather
than objmodule.c.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 extmod/modlwip.c             |  3 +++
 extmod/modnetwork.c          |  2 ++
 extmod/modonewire.c          |  2 ++
 extmod/modusocket.c          |  2 ++
 ports/esp32/modnetwork.c     |  4 ++++
 ports/esp32/modsocket.c      |  5 +++++
 ports/esp32/mpconfigport.h   |  6 ------
 ports/esp8266/modnetwork.c   |  4 ++++
 ports/esp8266/mpconfigport.h |  6 ------
 ports/mimxrt/mpconfigport.h  | 23 -----------------------
 ports/rp2/mpconfigport.h     | 13 -------------
 ports/stm32/mpconfigport.h   | 26 --------------------------
 12 files changed, 22 insertions(+), 74 deletions(-)

diff --git a/extmod/modlwip.c b/extmod/modlwip.c
index 53bead2a323de..e20ade139beaa 100644
--- a/extmod/modlwip.c
+++ b/extmod/modlwip.c
@@ -1780,4 +1780,7 @@ const mp_obj_module_t mp_module_lwip = {
 
 MP_REGISTER_MODULE(MP_QSTR_lwip, mp_module_lwip, MICROPY_PY_LWIP);
 
+// On LWIP-ports, this is the usocket module (replaces extmod/modusocket.c).
+MP_REGISTER_MODULE(MP_QSTR_socket, mp_module_lwip, MICROPY_PY_LWIP);
+
 #endif // MICROPY_PY_LWIP
diff --git a/extmod/modnetwork.c b/extmod/modnetwork.c
index 1f242de86976f..f63f708a2b2a9 100644
--- a/extmod/modnetwork.c
+++ b/extmod/modnetwork.c
@@ -102,6 +102,8 @@ const mp_obj_module_t mp_module_network = {
     .globals = (mp_obj_dict_t *)&mp_module_network_globals,
 };
 
+MP_REGISTER_MODULE(MP_QSTR_network, mp_module_network, MICROPY_PY_NETWORK);
+
 /*******************************************************************************/
 // Implementations of network methods that can be used by any interface
 
diff --git a/extmod/modonewire.c b/extmod/modonewire.c
index 8b34268157dea..1cfddc830dead 100644
--- a/extmod/modonewire.c
+++ b/extmod/modonewire.c
@@ -163,4 +163,6 @@ const mp_obj_module_t mp_module_onewire = {
     .globals = (mp_obj_dict_t *)&onewire_module_globals,
 };
 
+MP_REGISTER_MODULE(MP_QSTR__onewire, mp_module_onewire, MICROPY_PY_ONEWIRE);
+
 #endif // MICROPY_PY_ONEWIRE
diff --git a/extmod/modusocket.c b/extmod/modusocket.c
index bd11e70c1e9aa..c4bf6342a4981 100644
--- a/extmod/modusocket.c
+++ b/extmod/modusocket.c
@@ -588,4 +588,6 @@ const mp_obj_module_t mp_module_usocket = {
     .globals = (mp_obj_dict_t *)&mp_module_usocket_globals,
 };
 
+MP_REGISTER_MODULE(MP_QSTR_socket, mp_module_usocket, MICROPY_PY_NETWORK && MICROPY_PY_USOCKET && !MICROPY_PY_LWIP);
+
 #endif // MICROPY_PY_NETWORK && MICROPY_PY_USOCKET && !MICROPY_PY_LWIP
diff --git a/ports/esp32/modnetwork.c b/ports/esp32/modnetwork.c
index e025f0293a08a..199836e365cc4 100644
--- a/ports/esp32/modnetwork.c
+++ b/ports/esp32/modnetwork.c
@@ -295,3 +295,7 @@ const mp_obj_module_t mp_module_network = {
     .base = { &mp_type_module },
     .globals = (mp_obj_dict_t *)&mp_module_network_globals,
 };
+
+// Note: This port doesn't define MICROPY_PY_NETWORK so this will not conflict
+// with the common implementation provided by extmod/modnetwork.c.
+MP_REGISTER_MODULE(MP_QSTR_network, mp_module_network, 1);
diff --git a/ports/esp32/modsocket.c b/ports/esp32/modsocket.c
index 9d4bfb37c45ab..aa3a8d1b6d209 100644
--- a/ports/esp32/modsocket.c
+++ b/ports/esp32/modsocket.c
@@ -867,3 +867,8 @@ const mp_obj_module_t mp_module_usocket = {
     .base = { &mp_type_module },
     .globals = (mp_obj_dict_t *)&mp_module_socket_globals,
 };
+
+// Note: This port doesn't define MICROPY_PY_USOCKET or MICROPY_PY_LWIP so
+// this will not conflict with the common implementation provided by
+// extmod/mod{lwip,usocket}.c.
+MP_REGISTER_MODULE(MP_QSTR_usocket, mp_module_usocket, 1);
diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h
index ffc155360a847..32dea05b4fbff 100644
--- a/ports/esp32/mpconfigport.h
+++ b/ports/esp32/mpconfigport.h
@@ -140,17 +140,11 @@
 extern const struct _mp_obj_module_t esp_module;
 extern const struct _mp_obj_module_t esp32_module;
 extern const struct _mp_obj_module_t utime_module;
-extern const struct _mp_obj_module_t mp_module_usocket;
-extern const struct _mp_obj_module_t mp_module_network;
-extern const struct _mp_obj_module_t mp_module_onewire;
 
 #define MICROPY_PORT_BUILTIN_MODULES \
     { MP_OBJ_NEW_QSTR(MP_QSTR_esp), (mp_obj_t)&esp_module }, \
     { MP_OBJ_NEW_QSTR(MP_QSTR_esp32), (mp_obj_t)&esp32_module }, \
     { MP_OBJ_NEW_QSTR(MP_QSTR_utime), (mp_obj_t)&utime_module }, \
-    { MP_OBJ_NEW_QSTR(MP_QSTR_usocket), (mp_obj_t)&mp_module_usocket }, \
-    { MP_OBJ_NEW_QSTR(MP_QSTR_network), (mp_obj_t)&mp_module_network }, \
-    { MP_OBJ_NEW_QSTR(MP_QSTR__onewire), (mp_obj_t)&mp_module_onewire }, \
 
 #define MP_STATE_PORT MP_STATE_VM
 
diff --git a/ports/esp8266/modnetwork.c b/ports/esp8266/modnetwork.c
index 6988e09bd12af..d24bc147e6bbe 100644
--- a/ports/esp8266/modnetwork.c
+++ b/ports/esp8266/modnetwork.c
@@ -545,3 +545,7 @@ const mp_obj_module_t network_module = {
     .base = { &mp_type_module },
     .globals = (mp_obj_dict_t *)&mp_module_network_globals,
 };
+
+// Note: This port doesn't define MICROPY_PY_NETWORK so this will not conflict
+// with the common implementation provided by extmod/modnetwork.c.
+MP_REGISTER_MODULE(MP_QSTR_network, network_module, 1);
diff --git a/ports/esp8266/mpconfigport.h b/ports/esp8266/mpconfigport.h
index 0f1da51671a6b..63577e7b080f1 100644
--- a/ports/esp8266/mpconfigport.h
+++ b/ports/esp8266/mpconfigport.h
@@ -161,17 +161,11 @@ extern const struct _mp_print_t mp_debug_print;
 
 // extra built in modules to add to the list of known ones
 extern const struct _mp_obj_module_t esp_module;
-extern const struct _mp_obj_module_t network_module;
 extern const struct _mp_obj_module_t utime_module;
-extern const struct _mp_obj_module_t mp_module_lwip;
-extern const struct _mp_obj_module_t mp_module_onewire;
 
 #define MICROPY_PORT_BUILTIN_MODULES \
     { MP_ROM_QSTR(MP_QSTR_esp), MP_ROM_PTR(&esp_module) }, \
-    { MP_ROM_QSTR(MP_QSTR_usocket), MP_ROM_PTR(&mp_module_lwip) }, \
-    { MP_ROM_QSTR(MP_QSTR_network), MP_ROM_PTR(&network_module) }, \
     { MP_ROM_QSTR(MP_QSTR_utime), MP_ROM_PTR(&utime_module) }, \
-    { MP_ROM_QSTR(MP_QSTR__onewire), MP_ROM_PTR(&mp_module_onewire) }, \
 
 #define MP_STATE_PORT MP_STATE_VM
 
diff --git a/ports/mimxrt/mpconfigport.h b/ports/mimxrt/mpconfigport.h
index 0fe6e298e24cb..1569268cd915c 100644
--- a/ports/mimxrt/mpconfigport.h
+++ b/ports/mimxrt/mpconfigport.h
@@ -229,27 +229,7 @@ static inline void restore_irq_pri(uint32_t basepri) {
     { MP_ROM_QSTR(MP_QSTR_open), MP_ROM_PTR(&mp_builtin_open_obj) },
 
 extern const struct _mp_obj_module_t mp_module_mimxrt;
-extern const struct _mp_obj_module_t mp_module_onewire;
 extern const struct _mp_obj_module_t mp_module_utime;
-extern const struct _mp_obj_module_t mp_module_usocket;
-extern const struct _mp_obj_module_t mp_module_network;
-
-#if MICROPY_PY_NETWORK
-#define NETWORK_BUILTIN_MODULE              { MP_ROM_QSTR(MP_QSTR_network), MP_ROM_PTR(&mp_module_network) },
-#else
-#define NETWORK_BUILTIN_MODULE
-#endif
-
-#if MICROPY_PY_USOCKET && MICROPY_PY_LWIP
-// usocket implementation provided by lwIP
-#define SOCKET_BUILTIN_MODULE               { MP_ROM_QSTR(MP_QSTR_usocket), MP_ROM_PTR(&mp_module_lwip) },
-#elif MICROPY_PY_USOCKET
-// usocket implementation provided by skeleton wrapper
-#define SOCKET_BUILTIN_MODULE               { MP_ROM_QSTR(MP_QSTR_usocket), MP_ROM_PTR(&mp_module_usocket) },
-#else
-// no usocket module
-#define SOCKET_BUILTIN_MODULE
-#endif
 
 #if defined(MICROPY_HW_ETH_MDC)
 extern const struct _mp_obj_type_t network_lan_type;
@@ -261,9 +241,6 @@ extern const struct _mp_obj_type_t network_lan_type;
 #define MICROPY_PORT_BUILTIN_MODULES \
     { MP_ROM_QSTR(MP_QSTR_mimxrt), (mp_obj_t)&mp_module_mimxrt }, \
     { MP_ROM_QSTR(MP_QSTR_utime), MP_ROM_PTR(&mp_module_utime) }, \
-    { MP_ROM_QSTR(MP_QSTR__onewire), MP_ROM_PTR(&mp_module_onewire) }, \
-    SOCKET_BUILTIN_MODULE \
-    NETWORK_BUILTIN_MODULE \
 
 #ifndef MICROPY_BOARD_NETWORK_INTERFACES
 #define MICROPY_BOARD_NETWORK_INTERFACES
diff --git a/ports/rp2/mpconfigport.h b/ports/rp2/mpconfigport.h
index 0ca704755a7af..6c7a1e60e1937 100644
--- a/ports/rp2/mpconfigport.h
+++ b/ports/rp2/mpconfigport.h
@@ -134,22 +134,12 @@
 #define MICROPY_PORT_BUILTINS \
     { MP_ROM_QSTR(MP_QSTR_open), MP_ROM_PTR(&mp_builtin_open_obj) },
 
-extern const struct _mp_obj_module_t mp_module_network;
-extern const struct _mp_obj_module_t mp_module_onewire;
 extern const struct _mp_obj_module_t mp_module_rp2;
-extern const struct _mp_obj_module_t mp_module_usocket;
 extern const struct _mp_obj_module_t mp_module_utime;
 
-#if MICROPY_PY_USOCKET
-#define SOCKET_BUILTIN_MODULE               { MP_ROM_QSTR(MP_QSTR_usocket), MP_ROM_PTR(&mp_module_usocket) },
-#else
-#define SOCKET_BUILTIN_MODULE
-#endif
 #if MICROPY_PY_NETWORK
-#define NETWORK_BUILTIN_MODULE              { MP_ROM_QSTR(MP_QSTR_network), MP_ROM_PTR(&mp_module_network) },
 #define NETWORK_ROOT_POINTERS               mp_obj_list_t mod_network_nic_list;
 #else
-#define NETWORK_BUILTIN_MODULE
 #define NETWORK_ROOT_POINTERS
 #endif
 
@@ -182,11 +172,8 @@ extern const struct _mod_network_nic_type_t mod_network_nic_type_nina;
 #endif
 
 #define MICROPY_PORT_BUILTIN_MODULES \
-    { MP_OBJ_NEW_QSTR(MP_QSTR__onewire), (mp_obj_t)&mp_module_onewire }, \
     { MP_OBJ_NEW_QSTR(MP_QSTR__rp2), (mp_obj_t)&mp_module_rp2 }, \
     { MP_ROM_QSTR(MP_QSTR_utime), MP_ROM_PTR(&mp_module_utime) }, \
-    SOCKET_BUILTIN_MODULE \
-    NETWORK_BUILTIN_MODULE \
 
 #ifndef MICROPY_BOARD_NETWORK_INTERFACES
 #define MICROPY_BOARD_NETWORK_INTERFACES
diff --git a/ports/stm32/mpconfigport.h b/ports/stm32/mpconfigport.h
index 1b6ebf92af76b..4bb1fcee3969d 100644
--- a/ports/stm32/mpconfigport.h
+++ b/ports/stm32/mpconfigport.h
@@ -212,29 +212,6 @@ extern const struct _mp_obj_module_t mp_module_onewire;
 #define UTIME_BUILTIN_MODULE
 #endif
 
-#if MICROPY_PY_USOCKET && MICROPY_PY_LWIP
-// usocket implementation provided by lwIP
-#define SOCKET_BUILTIN_MODULE               { MP_ROM_QSTR(MP_QSTR_usocket), MP_ROM_PTR(&mp_module_lwip) },
-#elif MICROPY_PY_USOCKET
-// usocket implementation provided by skeleton wrapper
-#define SOCKET_BUILTIN_MODULE               { MP_ROM_QSTR(MP_QSTR_usocket), MP_ROM_PTR(&mp_module_usocket) },
-#else
-// no usocket module
-#define SOCKET_BUILTIN_MODULE
-#endif
-
-#if MICROPY_PY_NETWORK
-#define NETWORK_BUILTIN_MODULE              { MP_ROM_QSTR(MP_QSTR_network), MP_ROM_PTR(&mp_module_network) },
-#else
-#define NETWORK_BUILTIN_MODULE
-#endif
-
-#if MICROPY_PY_ONEWIRE
-#define ONEWIRE_BUILTIN_MODULE              { MP_ROM_QSTR(MP_QSTR__onewire), MP_ROM_PTR(&mp_module_onewire) },
-#else
-#define ONEWIRE_BUILTIN_MODULE
-#endif
-
 #if defined(MICROPY_HW_ETH_MDC)
 extern const struct _mp_obj_type_t network_lan_type;
 #define MICROPY_HW_NIC_ETH                  { MP_ROM_QSTR(MP_QSTR_LAN), MP_ROM_PTR(&network_lan_type) },
@@ -271,9 +248,6 @@ extern const struct _mod_network_nic_type_t mod_network_nic_type_cc3k;
     PYB_BUILTIN_MODULE \
     STM_BUILTIN_MODULE \
     UTIME_BUILTIN_MODULE \
-    SOCKET_BUILTIN_MODULE \
-    NETWORK_BUILTIN_MODULE \
-    ONEWIRE_BUILTIN_MODULE \
 
 // extra constants
 #define MICROPY_PORT_CONSTANTS \

From 0a92469c10542d57ef0ea6b6cf2ed0cae9491dbe Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Wed, 20 Apr 2022 17:18:35 +1000
Subject: [PATCH 2029/3533] stm32: Make port-specific modules use
 MP_REGISTER_MODULE.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/stm32/modpyb.c       |  2 ++
 ports/stm32/modstm.c       |  2 ++
 ports/stm32/modutime.c     |  2 ++
 ports/stm32/mpconfigport.h | 41 ++++++++++----------------------------
 4 files changed, 16 insertions(+), 31 deletions(-)

diff --git a/ports/stm32/modpyb.c b/ports/stm32/modpyb.c
index a44465488848f..d23065e4bb289 100644
--- a/ports/stm32/modpyb.c
+++ b/ports/stm32/modpyb.c
@@ -265,3 +265,5 @@ const mp_obj_module_t pyb_module = {
     .base = { &mp_type_module },
     .globals = (mp_obj_dict_t *)&pyb_module_globals,
 };
+
+MP_REGISTER_MODULE(MP_QSTR_pyb, pyb_module, MICROPY_PY_PYB);
diff --git a/ports/stm32/modstm.c b/ports/stm32/modstm.c
index 3f4f33979afd5..185ec1a2fef6a 100644
--- a/ports/stm32/modstm.c
+++ b/ports/stm32/modstm.c
@@ -60,4 +60,6 @@ const mp_obj_module_t stm_module = {
     .globals = (mp_obj_dict_t *)&stm_module_globals,
 };
 
+MP_REGISTER_MODULE(MP_QSTR_stm, stm_module, MICROPY_PY_STM);
+
 #endif // MICROPY_PY_STM
diff --git a/ports/stm32/modutime.c b/ports/stm32/modutime.c
index 1a22c34b6ba7e..d8ac156de6184 100644
--- a/ports/stm32/modutime.c
+++ b/ports/stm32/modutime.c
@@ -153,3 +153,5 @@ const mp_obj_module_t mp_module_utime = {
     .base = { &mp_type_module },
     .globals = (mp_obj_dict_t *)&time_module_globals,
 };
+
+MP_REGISTER_MODULE(MP_QSTR_utime, mp_module_utime, MICROPY_PY_UTIME);
diff --git a/ports/stm32/mpconfigport.h b/ports/stm32/mpconfigport.h
index 4bb1fcee3969d..484dd842c4d7c 100644
--- a/ports/stm32/mpconfigport.h
+++ b/ports/stm32/mpconfigport.h
@@ -172,30 +172,20 @@
 #define MICROPY_PORT_BUILTINS \
     { MP_ROM_QSTR(MP_QSTR_open), MP_ROM_PTR(&mp_builtin_open_obj) },
 
-// extra built in modules to add to the list of known ones
-extern const struct _mp_obj_module_t pyb_module;
-extern const struct _mp_obj_module_t stm_module;
-extern const struct _mp_obj_module_t mp_module_ubinascii;
-extern const struct _mp_obj_module_t mp_module_ure;
-extern const struct _mp_obj_module_t mp_module_uzlib;
-extern const struct _mp_obj_module_t mp_module_ujson;
-extern const struct _mp_obj_module_t mp_module_uheapq;
-extern const struct _mp_obj_module_t mp_module_uhashlib;
-extern const struct _mp_obj_module_t mp_module_utime;
-extern const struct _mp_obj_module_t mp_module_usocket;
-extern const struct _mp_obj_module_t mp_module_network;
-extern const struct _mp_obj_module_t mp_module_onewire;
-
 #if MICROPY_PY_PYB
-#define PYB_BUILTIN_MODULE                  { MP_ROM_QSTR(MP_QSTR_pyb), MP_ROM_PTR(&pyb_module) },
+extern const struct _mp_obj_module_t pyb_module;
+#define PYB_BUILTIN_MODULE_CONSTANTS \
+    { MP_ROM_QSTR(MP_QSTR_pyb), MP_ROM_PTR(&pyb_module) },
 #else
-#define PYB_BUILTIN_MODULE
+#define PYB_BUILTIN_MODULE_CONSTANTS
 #endif
 
 #if MICROPY_PY_STM
-#define STM_BUILTIN_MODULE                  { MP_ROM_QSTR(MP_QSTR_stm), MP_ROM_PTR(&stm_module) },
+extern const struct _mp_obj_module_t stm_module;
+#define STM_BUILTIN_MODULE_CONSTANTS \
+    { MP_ROM_QSTR(MP_QSTR_stm), MP_ROM_PTR(&stm_module) },
 #else
-#define STM_BUILTIN_MODULE
+#define STM_BUILTIN_MODULE_CONSTANTS
 #endif
 
 #if MICROPY_PY_MACHINE
@@ -206,12 +196,6 @@ extern const struct _mp_obj_module_t mp_module_onewire;
 #define MACHINE_BUILTIN_MODULE_CONSTANTS
 #endif
 
-#if MICROPY_PY_UTIME
-#define UTIME_BUILTIN_MODULE                { MP_ROM_QSTR(MP_QSTR_utime), MP_ROM_PTR(&mp_module_utime) },
-#else
-#define UTIME_BUILTIN_MODULE
-#endif
-
 #if defined(MICROPY_HW_ETH_MDC)
 extern const struct _mp_obj_type_t network_lan_type;
 #define MICROPY_HW_NIC_ETH                  { MP_ROM_QSTR(MP_QSTR_LAN), MP_ROM_PTR(&network_lan_type) },
@@ -244,16 +228,11 @@ extern const struct _mod_network_nic_type_t mod_network_nic_type_cc3k;
 #define MICROPY_HW_NIC_CC3K
 #endif
 
-#define MICROPY_PORT_BUILTIN_MODULES \
-    PYB_BUILTIN_MODULE \
-    STM_BUILTIN_MODULE \
-    UTIME_BUILTIN_MODULE \
-
 // extra constants
 #define MICROPY_PORT_CONSTANTS \
     MACHINE_BUILTIN_MODULE_CONSTANTS \
-    PYB_BUILTIN_MODULE \
-    STM_BUILTIN_MODULE \
+    PYB_BUILTIN_MODULE_CONSTANTS \
+    STM_BUILTIN_MODULE_CONSTANTS \
 
 #ifndef MICROPY_BOARD_NETWORK_INTERFACES
 #define MICROPY_BOARD_NETWORK_INTERFACES

From 24127a4ac4a4beabe89815b2d3ecd04311f96634 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Wed, 20 Apr 2022 17:21:05 +1000
Subject: [PATCH 2030/3533] esp32: Make port-specific modules use
 MP_REGISTER_MODULE.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/esp32/modesp.c       |  2 ++
 ports/esp32/modesp32.c     |  2 ++
 ports/esp32/modutime.c     |  2 ++
 ports/esp32/mpconfigport.h | 10 ----------
 4 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/ports/esp32/modesp.c b/ports/esp32/modesp.c
index b5beaf50538a7..fc9b0ec084b02 100644
--- a/ports/esp32/modesp.c
+++ b/ports/esp32/modesp.c
@@ -142,3 +142,5 @@ const mp_obj_module_t esp_module = {
     .base = { &mp_type_module },
     .globals = (mp_obj_dict_t *)&esp_module_globals,
 };
+
+MP_REGISTER_MODULE(MP_QSTR_esp, esp_module, 1);
diff --git a/ports/esp32/modesp32.c b/ports/esp32/modesp32.c
index 4579c5de11582..1cdf234f41972 100644
--- a/ports/esp32/modesp32.c
+++ b/ports/esp32/modesp32.c
@@ -224,3 +224,5 @@ const mp_obj_module_t esp32_module = {
     .base = { &mp_type_module },
     .globals = (mp_obj_dict_t *)&esp32_module_globals,
 };
+
+MP_REGISTER_MODULE(MP_QSTR_esp32, esp32_module, 1);
diff --git a/ports/esp32/modutime.c b/ports/esp32/modutime.c
index f864df678f404..ca0d6b8274e9b 100644
--- a/ports/esp32/modutime.c
+++ b/ports/esp32/modutime.c
@@ -106,3 +106,5 @@ const mp_obj_module_t utime_module = {
     .base = { &mp_type_module },
     .globals = (mp_obj_dict_t *)&time_module_globals,
 };
+
+MP_REGISTER_MODULE(MP_QSTR_utime, utime_module, 1);
diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h
index 32dea05b4fbff..a3e4acf0656d8 100644
--- a/ports/esp32/mpconfigport.h
+++ b/ports/esp32/mpconfigport.h
@@ -136,16 +136,6 @@
     { MP_OBJ_NEW_QSTR(MP_QSTR_input), (mp_obj_t)&mp_builtin_input_obj }, \
     { MP_OBJ_NEW_QSTR(MP_QSTR_open), (mp_obj_t)&mp_builtin_open_obj },
 
-// extra built in modules to add to the list of known ones
-extern const struct _mp_obj_module_t esp_module;
-extern const struct _mp_obj_module_t esp32_module;
-extern const struct _mp_obj_module_t utime_module;
-
-#define MICROPY_PORT_BUILTIN_MODULES \
-    { MP_OBJ_NEW_QSTR(MP_QSTR_esp), (mp_obj_t)&esp_module }, \
-    { MP_OBJ_NEW_QSTR(MP_QSTR_esp32), (mp_obj_t)&esp32_module }, \
-    { MP_OBJ_NEW_QSTR(MP_QSTR_utime), (mp_obj_t)&utime_module }, \
-
 #define MP_STATE_PORT MP_STATE_VM
 
 struct _machine_timer_obj_t;

From 4274b34d6be19874d2868e385e38e5655f83bd32 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Wed, 20 Apr 2022 17:22:57 +1000
Subject: [PATCH 2031/3533] esp8266: Make port-specific modules use
 MP_REGISTER_MODULE.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/esp8266/modesp.c       | 2 ++
 ports/esp8266/modutime.c     | 2 ++
 ports/esp8266/mpconfigport.h | 8 --------
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/ports/esp8266/modesp.c b/ports/esp8266/modesp.c
index 0e2acaf5ffd48..a6084e48bca78 100644
--- a/ports/esp8266/modesp.c
+++ b/ports/esp8266/modesp.c
@@ -379,3 +379,5 @@ const mp_obj_module_t esp_module = {
     .base = { &mp_type_module },
     .globals = (mp_obj_dict_t *)&esp_module_globals,
 };
+
+MP_REGISTER_MODULE(MP_QSTR_esp, esp_module, 1);
diff --git a/ports/esp8266/modutime.c b/ports/esp8266/modutime.c
index 1d4ecc05f2ada..7f498ef1ed105 100644
--- a/ports/esp8266/modutime.c
+++ b/ports/esp8266/modutime.c
@@ -129,3 +129,5 @@ const mp_obj_module_t utime_module = {
     .base = { &mp_type_module },
     .globals = (mp_obj_dict_t *)&time_module_globals,
 };
+
+MP_REGISTER_MODULE(MP_QSTR_utime, utime_module, 1);
diff --git a/ports/esp8266/mpconfigport.h b/ports/esp8266/mpconfigport.h
index 63577e7b080f1..a64bc8f86d1f7 100644
--- a/ports/esp8266/mpconfigport.h
+++ b/ports/esp8266/mpconfigport.h
@@ -159,14 +159,6 @@ extern const struct _mp_print_t mp_debug_print;
 #define MICROPY_PORT_BUILTINS \
     { MP_ROM_QSTR(MP_QSTR_open), MP_ROM_PTR(&mp_builtin_open_obj) },
 
-// extra built in modules to add to the list of known ones
-extern const struct _mp_obj_module_t esp_module;
-extern const struct _mp_obj_module_t utime_module;
-
-#define MICROPY_PORT_BUILTIN_MODULES \
-    { MP_ROM_QSTR(MP_QSTR_esp), MP_ROM_PTR(&esp_module) }, \
-    { MP_ROM_QSTR(MP_QSTR_utime), MP_ROM_PTR(&utime_module) }, \
-
 #define MP_STATE_PORT MP_STATE_VM
 
 #define MICROPY_PORT_ROOT_POINTERS \

From 7d79fd7e8b4a53d93b690a4a7023d64f5a81599f Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Wed, 20 Apr 2022 17:25:03 +1000
Subject: [PATCH 2032/3533] mimxrt: Make port-specific modules use
 MP_REGISTER_MODULE.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/mimxrt/modmimxrt.c    | 2 ++
 ports/mimxrt/modutime.c     | 2 ++
 ports/mimxrt/mpconfigport.h | 7 -------
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/ports/mimxrt/modmimxrt.c b/ports/mimxrt/modmimxrt.c
index 041a72f7f7de4..0091c36ffbf50 100644
--- a/ports/mimxrt/modmimxrt.c
+++ b/ports/mimxrt/modmimxrt.c
@@ -41,3 +41,5 @@ const mp_obj_module_t mp_module_mimxrt = {
     .base = { &mp_type_module },
     .globals = (mp_obj_dict_t *)&mimxrt_module_globals,
 };
+
+MP_REGISTER_MODULE(MP_QSTR_mimxrt, mp_module_mimxrt, 1);
diff --git a/ports/mimxrt/modutime.c b/ports/mimxrt/modutime.c
index 822e2771d25aa..f24ce43c0ffb4 100644
--- a/ports/mimxrt/modutime.c
+++ b/ports/mimxrt/modutime.c
@@ -134,3 +134,5 @@ const mp_obj_module_t mp_module_utime = {
     .base = { &mp_type_module },
     .globals = (mp_obj_dict_t *)&time_module_globals,
 };
+
+MP_REGISTER_MODULE(MP_QSTR_utime, mp_module_utime, 1);
diff --git a/ports/mimxrt/mpconfigport.h b/ports/mimxrt/mpconfigport.h
index 1569268cd915c..05de0306b447d 100644
--- a/ports/mimxrt/mpconfigport.h
+++ b/ports/mimxrt/mpconfigport.h
@@ -228,9 +228,6 @@ static inline void restore_irq_pri(uint32_t basepri) {
 #define MICROPY_PORT_BUILTINS \
     { MP_ROM_QSTR(MP_QSTR_open), MP_ROM_PTR(&mp_builtin_open_obj) },
 
-extern const struct _mp_obj_module_t mp_module_mimxrt;
-extern const struct _mp_obj_module_t mp_module_utime;
-
 #if defined(MICROPY_HW_ETH_MDC)
 extern const struct _mp_obj_type_t network_lan_type;
 #define MICROPY_HW_NIC_ETH                  { MP_ROM_QSTR(MP_QSTR_LAN), MP_ROM_PTR(&network_lan_type) },
@@ -238,10 +235,6 @@ extern const struct _mp_obj_type_t network_lan_type;
 #define MICROPY_HW_NIC_ETH
 #endif
 
-#define MICROPY_PORT_BUILTIN_MODULES \
-    { MP_ROM_QSTR(MP_QSTR_mimxrt), (mp_obj_t)&mp_module_mimxrt }, \
-    { MP_ROM_QSTR(MP_QSTR_utime), MP_ROM_PTR(&mp_module_utime) }, \
-
 #ifndef MICROPY_BOARD_NETWORK_INTERFACES
 #define MICROPY_BOARD_NETWORK_INTERFACES
 #endif

From f67ac90fa96210f89435cbfffa3f2a31b09f425e Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Wed, 20 Apr 2022 17:34:30 +1000
Subject: [PATCH 2033/3533] nrf: Make port-specific modules use
 MP_REGISTER_MODULE.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 .../boards/microbit/modules/boardmodules.h    |  5 --
 .../nrf/boards/microbit/modules/modmicrobit.c |  2 +
 ports/nrf/modules/ble/modble.c                |  2 +
 ports/nrf/modules/board/modboard.c            |  2 +
 ports/nrf/modules/music/modmusic.c            |  2 +
 ports/nrf/modules/nrf/modnrf.c                |  2 +
 ports/nrf/modules/ubluepy/modubluepy.c        |  2 +
 ports/nrf/modules/uos/moduos.c                |  2 +
 ports/nrf/modules/utime/modutime.c            |  2 +
 ports/nrf/mpconfigport.h                      | 55 -------------------
 10 files changed, 16 insertions(+), 60 deletions(-)

diff --git a/ports/nrf/boards/microbit/modules/boardmodules.h b/ports/nrf/boards/microbit/modules/boardmodules.h
index 58df653e9163b..da50395280392 100644
--- a/ports/nrf/boards/microbit/modules/boardmodules.h
+++ b/ports/nrf/boards/microbit/modules/boardmodules.h
@@ -29,9 +29,4 @@
 
 #include "modmicrobit.h"
 
-extern const struct _mp_obj_module_t microbit_module;
-
-#define BOARD_MODULES \
-    { MP_ROM_QSTR(MP_QSTR_microbit), MP_ROM_PTR(&microbit_module) }, \
-
 #endif // MICROPY_INCLUDED_NRF_BOARD_MICROBIT_BOARD_MODULES_H
diff --git a/ports/nrf/boards/microbit/modules/modmicrobit.c b/ports/nrf/boards/microbit/modules/modmicrobit.c
index b4cd3b4f185b4..bb721357dee18 100644
--- a/ports/nrf/boards/microbit/modules/modmicrobit.c
+++ b/ports/nrf/boards/microbit/modules/modmicrobit.c
@@ -156,3 +156,5 @@ const mp_obj_module_t microbit_module = {
     .base = { &mp_type_module },
     .globals = (mp_obj_dict_t*)&microbit_module_globals,
 };
+
+MP_REGISTER_MODULE(MP_QSTR_microbit, microbit_module, 1);
diff --git a/ports/nrf/modules/ble/modble.c b/ports/nrf/modules/ble/modble.c
index 2b6dd6e2236cf..6726c63c486a1 100644
--- a/ports/nrf/modules/ble/modble.c
+++ b/ports/nrf/modules/ble/modble.c
@@ -102,4 +102,6 @@ const mp_obj_module_t ble_module = {
     .globals = (mp_obj_dict_t*)&ble_module_globals,
 };
 
+MP_REGISTER_MODULE(MP_QSTR_ble, ble_module, MICROPY_PY_BLE);
+
 #endif // MICROPY_PY_BLE
diff --git a/ports/nrf/modules/board/modboard.c b/ports/nrf/modules/board/modboard.c
index 647af5035bc30..45dd9f30eefe7 100644
--- a/ports/nrf/modules/board/modboard.c
+++ b/ports/nrf/modules/board/modboard.c
@@ -53,3 +53,5 @@ const mp_obj_module_t board_module = {
     .base = { &mp_type_module },
     .globals = (mp_obj_dict_t*)&board_module_globals,
 };
+
+MP_REGISTER_MODULE(MP_QSTR_board, board_module, 1);
diff --git a/ports/nrf/modules/music/modmusic.c b/ports/nrf/modules/music/modmusic.c
index e7e351f859ff1..c8c6775de84fc 100644
--- a/ports/nrf/modules/music/modmusic.c
+++ b/ports/nrf/modules/music/modmusic.c
@@ -509,4 +509,6 @@ const mp_obj_module_t music_module = {
     .globals = (mp_obj_dict_t*)&microbit_music_locals_dict,
 };
 
+MP_REGISTER_MODULE(MP_QSTR_music, music_module, MICROPY_PY_MUSIC);
+
 #endif // MICROPY_PY_MUSIC
diff --git a/ports/nrf/modules/nrf/modnrf.c b/ports/nrf/modules/nrf/modnrf.c
index fc217b1d7eeeb..ab7d043f46e45 100644
--- a/ports/nrf/modules/nrf/modnrf.c
+++ b/ports/nrf/modules/nrf/modnrf.c
@@ -95,4 +95,6 @@ const mp_obj_module_t nrf_module = {
     .globals = (mp_obj_dict_t *)&nrf_module_globals,
 };
 
+MP_REGISTER_MODULE(MP_QSTR_nrf, nrf_module, MICROPY_PY_NRF);
+
 #endif // MICROPY_PY_NRF
diff --git a/ports/nrf/modules/ubluepy/modubluepy.c b/ports/nrf/modules/ubluepy/modubluepy.c
index b306c065b2906..d888b6dd5193a 100644
--- a/ports/nrf/modules/ubluepy/modubluepy.c
+++ b/ports/nrf/modules/ubluepy/modubluepy.c
@@ -67,4 +67,6 @@ const mp_obj_module_t mp_module_ubluepy = {
     .globals = (mp_obj_dict_t*)&mp_module_ubluepy_globals,
 };
 
+MP_REGISTER_MODULE(MP_QSTR_ubluepy, mp_module_ubluepy, MICROPY_PY_UBLUEPY);
+
 #endif // MICROPY_PY_UBLUEPY
diff --git a/ports/nrf/modules/uos/moduos.c b/ports/nrf/modules/uos/moduos.c
index e8a3790dacce6..ea60df7a66cba 100644
--- a/ports/nrf/modules/uos/moduos.c
+++ b/ports/nrf/modules/uos/moduos.c
@@ -196,3 +196,5 @@ const mp_obj_module_t mp_module_uos = {
     .base = { &mp_type_module },
     .globals = (mp_obj_dict_t*)&os_module_globals,
 };
+
+MP_REGISTER_MODULE(MP_QSTR_uos, mp_module_uos, 1);
diff --git a/ports/nrf/modules/utime/modutime.c b/ports/nrf/modules/utime/modutime.c
index bb29141011eab..6fe2da4746897 100644
--- a/ports/nrf/modules/utime/modutime.c
+++ b/ports/nrf/modules/utime/modutime.c
@@ -54,3 +54,5 @@ const mp_obj_module_t mp_module_utime = {
     .base = { &mp_type_module },
     .globals = (mp_obj_dict_t*)&time_module_globals,
 };
+
+MP_REGISTER_MODULE(MP_QSTR_utime, mp_module_utime, 1);
diff --git a/ports/nrf/mpconfigport.h b/ports/nrf/mpconfigport.h
index 7a6e282e86f36..05e35956d9a6a 100644
--- a/ports/nrf/mpconfigport.h
+++ b/ports/nrf/mpconfigport.h
@@ -226,65 +226,10 @@ extern const struct _mp_obj_module_t mp_module_uos;
 extern const struct _mp_obj_module_t mp_module_ubluepy;
 extern const struct _mp_obj_module_t music_module;
 
-#if MICROPY_PY_NRF
-#define NRF_MODULE                          { MP_ROM_QSTR(MP_QSTR_nrf), MP_ROM_PTR(&nrf_module) },
-#else
-#define NRF_MODULE
-#endif
-
-#if MICROPY_PY_UBLUEPY
-#define UBLUEPY_MODULE                      { MP_ROM_QSTR(MP_QSTR_ubluepy), MP_ROM_PTR(&mp_module_ubluepy) },
-#else
-#define UBLUEPY_MODULE
-#endif
-
-#if MICROPY_PY_MUSIC
-#define MUSIC_MODULE                        { MP_ROM_QSTR(MP_QSTR_music), MP_ROM_PTR(&music_module) },
-#else
-#define MUSIC_MODULE
-#endif
-
 #if BOARD_SPECIFIC_MODULES
 #include "boardmodules.h"
-#define MICROPY_BOARD_BUILTINS BOARD_MODULES
-#else
-#define MICROPY_BOARD_BUILTINS
 #endif // BOARD_SPECIFIC_MODULES
 
-#if BLUETOOTH_SD
-
-#if MICROPY_PY_BLE
-extern const struct _mp_obj_module_t ble_module;
-#define BLE_MODULE                        { MP_ROM_QSTR(MP_QSTR_ble), MP_ROM_PTR(&ble_module) },
-#else
-#define BLE_MODULE
-#endif
-
-#define MICROPY_PORT_BUILTIN_MODULES \
-    { MP_ROM_QSTR(MP_QSTR_board), MP_ROM_PTR(&board_module) }, \
-    { MP_ROM_QSTR(MP_QSTR_utime), MP_ROM_PTR(&mp_module_utime) }, \
-    { MP_ROM_QSTR(MP_QSTR_time), MP_ROM_PTR(&mp_module_utime) }, \
-    { MP_ROM_QSTR(MP_QSTR_uos), MP_ROM_PTR(&mp_module_uos) }, \
-    BLE_MODULE \
-    MUSIC_MODULE \
-    UBLUEPY_MODULE \
-    MICROPY_BOARD_BUILTINS \
-    NRF_MODULE \
-
-
-#else
-extern const struct _mp_obj_module_t ble_module;
-#define MICROPY_PORT_BUILTIN_MODULES \
-    { MP_ROM_QSTR(MP_QSTR_board), MP_ROM_PTR(&board_module) }, \
-    { MP_ROM_QSTR(MP_QSTR_utime), MP_ROM_PTR(&mp_module_utime) }, \
-    { MP_ROM_QSTR(MP_QSTR_uos), MP_ROM_PTR(&mp_module_uos) }, \
-    MUSIC_MODULE \
-    MICROPY_BOARD_BUILTINS \
-    NRF_MODULE \
-
-
-#endif // BLUETOOTH_SD
-
 // extra built in names to add to the global namespace
 #define MICROPY_PORT_BUILTINS \
     { MP_ROM_QSTR(MP_QSTR_help), MP_ROM_PTR(&mp_builtin_help_obj) }, \

From 60c5968f99393506cf97fe6bf5a3d3d0d39723f3 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Wed, 20 Apr 2022 21:14:47 +1000
Subject: [PATCH 2034/3533] pic16bit: Make port-specific modules use
 MP_REGISTER_MODULE.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/pic16bit/modpyb.c       | 2 ++
 ports/pic16bit/mpconfigport.h | 5 -----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/ports/pic16bit/modpyb.c b/ports/pic16bit/modpyb.c
index a18b37700c44e..61955509e8461 100644
--- a/ports/pic16bit/modpyb.c
+++ b/ports/pic16bit/modpyb.c
@@ -68,3 +68,5 @@ const mp_obj_module_t pyb_module = {
     .base = { &mp_type_module },
     .globals = (mp_obj_dict_t *)&pyb_module_globals,
 };
+
+MP_REGISTER_MODULE(MP_QSTR_pyb, pyb_module, 1);
diff --git a/ports/pic16bit/mpconfigport.h b/ports/pic16bit/mpconfigport.h
index 43300d1760283..52b1701ea3e5d 100644
--- a/ports/pic16bit/mpconfigport.h
+++ b/ports/pic16bit/mpconfigport.h
@@ -88,11 +88,6 @@ typedef int mp_off_t;
 #define MICROPY_PORT_BUILTINS \
     { MP_ROM_QSTR(MP_QSTR_open), MP_ROM_PTR(&mp_builtin_open_obj) },
 
-// extra builtin modules to add to the list of known ones
-extern const struct _mp_obj_module_t pyb_module;
-#define MICROPY_PORT_BUILTIN_MODULES \
-    { MP_ROM_QSTR(MP_QSTR_pyb), MP_ROM_PTR(&pyb_module) }, \
-
 #define MP_STATE_PORT MP_STATE_VM
 
 #define MICROPY_PORT_ROOT_POINTERS \

From 62f00a43d51e76ee64c0b127eec07f22c1dee5e9 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Wed, 20 Apr 2022 21:17:46 +1000
Subject: [PATCH 2035/3533] rp2: Make port-specific modules use
 MP_REGISTER_MODULE.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/rp2/modrp2.c       | 2 ++
 ports/rp2/modutime.c     | 2 ++
 ports/rp2/mpconfigport.h | 7 -------
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/ports/rp2/modrp2.c b/ports/rp2/modrp2.c
index 15c61911d3331..9c5223587a1ce 100644
--- a/ports/rp2/modrp2.c
+++ b/ports/rp2/modrp2.c
@@ -42,3 +42,5 @@ const mp_obj_module_t mp_module_rp2 = {
     .base = { &mp_type_module },
     .globals = (mp_obj_dict_t *)&rp2_module_globals,
 };
+
+MP_REGISTER_MODULE(MP_QSTR__rp2, mp_module_rp2, 1);
diff --git a/ports/rp2/modutime.c b/ports/rp2/modutime.c
index a5860731015c6..b73eacf87e447 100644
--- a/ports/rp2/modutime.c
+++ b/ports/rp2/modutime.c
@@ -125,3 +125,5 @@ const mp_obj_module_t mp_module_utime = {
     .base = { &mp_type_module },
     .globals = (mp_obj_dict_t *)&mp_module_time_globals,
 };
+
+MP_REGISTER_MODULE(MP_QSTR_utime, mp_module_utime, 1);
diff --git a/ports/rp2/mpconfigport.h b/ports/rp2/mpconfigport.h
index 6c7a1e60e1937..704247dfbe022 100644
--- a/ports/rp2/mpconfigport.h
+++ b/ports/rp2/mpconfigport.h
@@ -134,9 +134,6 @@
 #define MICROPY_PORT_BUILTINS \
     { MP_ROM_QSTR(MP_QSTR_open), MP_ROM_PTR(&mp_builtin_open_obj) },
 
-extern const struct _mp_obj_module_t mp_module_rp2;
-extern const struct _mp_obj_module_t mp_module_utime;
-
 #if MICROPY_PY_NETWORK
 #define NETWORK_ROOT_POINTERS               mp_obj_list_t mod_network_nic_list;
 #else
@@ -171,10 +168,6 @@ extern const struct _mod_network_nic_type_t mod_network_nic_type_nina;
 #define MICROPY_PORT_ROOT_POINTER_NINAW10
 #endif
 
-#define MICROPY_PORT_BUILTIN_MODULES \
-    { MP_OBJ_NEW_QSTR(MP_QSTR__rp2), (mp_obj_t)&mp_module_rp2 }, \
-    { MP_ROM_QSTR(MP_QSTR_utime), MP_ROM_PTR(&mp_module_utime) }, \
-
 #ifndef MICROPY_BOARD_NETWORK_INTERFACES
 #define MICROPY_BOARD_NETWORK_INTERFACES
 #endif

From c3f7424a5736fcae94c5855230eb029877c75c36 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Wed, 20 Apr 2022 21:19:03 +1000
Subject: [PATCH 2036/3533] samd: Make port-specific modules use
 MP_REGISTER_MODULE.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/samd/modsamd.c      | 2 ++
 ports/samd/modutime.c     | 2 ++
 ports/samd/mpconfigport.h | 7 -------
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/ports/samd/modsamd.c b/ports/samd/modsamd.c
index 1f914980803c3..387ced5cf50b3 100644
--- a/ports/samd/modsamd.c
+++ b/ports/samd/modsamd.c
@@ -39,3 +39,5 @@ const mp_obj_module_t mp_module_samd = {
     .base = { &mp_type_module },
     .globals = (mp_obj_dict_t *)&samd_module_globals,
 };
+
+MP_REGISTER_MODULE(MP_QSTR_samd, mp_module_samd, 1);
diff --git a/ports/samd/modutime.c b/ports/samd/modutime.c
index 2d5ed0776d044..0b872a297a779 100644
--- a/ports/samd/modutime.c
+++ b/ports/samd/modutime.c
@@ -99,3 +99,5 @@ const mp_obj_module_t mp_module_utime = {
     .base = { &mp_type_module },
     .globals = (mp_obj_dict_t *)&time_module_globals,
 };
+
+MP_REGISTER_MODULE(MP_QSTR_utime, mp_module_utime, 1);
diff --git a/ports/samd/mpconfigport.h b/ports/samd/mpconfigport.h
index 54018f111e517..613b8cd5a91e0 100644
--- a/ports/samd/mpconfigport.h
+++ b/ports/samd/mpconfigport.h
@@ -108,13 +108,6 @@
 #define MICROPY_PORT_BUILTINS \
     { MP_ROM_QSTR(MP_QSTR_open), MP_ROM_PTR(&mp_builtin_open_obj) },
 
-extern const struct _mp_obj_module_t mp_module_samd;
-extern const struct _mp_obj_module_t mp_module_utime;
-
-#define MICROPY_PORT_BUILTIN_MODULES \
-    { MP_ROM_QSTR(MP_QSTR_samd), MP_ROM_PTR(&mp_module_samd) }, \
-    { MP_ROM_QSTR(MP_QSTR_utime), MP_ROM_PTR(&mp_module_utime) }, \
-
 #define MICROPY_PORT_ROOT_POINTERS \
     const char *readline_hist[8];
 

From d0307e79bbdf060a1f7958d6c1e975ac8c061a32 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Wed, 20 Apr 2022 21:20:39 +1000
Subject: [PATCH 2037/3533] teensy: Make port-specific modules use
 MP_REGISTER_MODULE.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/teensy/modpyb.c       | 2 ++
 ports/teensy/mpconfigport.h | 8 +-------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/ports/teensy/modpyb.c b/ports/teensy/modpyb.c
index f5bb3ea7b8227..b8fcfaaa5d093 100644
--- a/ports/teensy/modpyb.c
+++ b/ports/teensy/modpyb.c
@@ -360,3 +360,5 @@ const mp_obj_module_t pyb_module = {
     .base = { &mp_type_module },
     .globals = (mp_obj_dict_t *)&pyb_module_globals,
 };
+
+MP_REGISTER_MODULE(MP_QSTR_pyb, pyb_module, 1);
diff --git a/ports/teensy/mpconfigport.h b/ports/teensy/mpconfigport.h
index 3acedcf0248c9..0ee83ba4003a0 100644
--- a/ports/teensy/mpconfigport.h
+++ b/ports/teensy/mpconfigport.h
@@ -34,14 +34,8 @@
 // extra built in names to add to the global namespace
 #define MICROPY_PORT_BUILTINS \
 
-// extra built in modules to add to the list of known ones
-extern const struct _mp_obj_module_t os_module;
-extern const struct _mp_obj_module_t pyb_module;
-extern const struct _mp_obj_module_t time_module;
-#define MICROPY_PORT_BUILTIN_MODULES \
-    { MP_ROM_QSTR(MP_QSTR_pyb), MP_ROM_PTR(&pyb_module) }, \
-
 // extra constants
+extern const struct _mp_obj_module_t pyb_module;
 #define MICROPY_PORT_CONSTANTS \
     { MP_ROM_QSTR(MP_QSTR_pyb), MP_ROM_PTR(&pyb_module) }, \
 

From 63431a55367a2de774323557d1917a31cb9a774d Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Wed, 20 Apr 2022 21:24:01 +1000
Subject: [PATCH 2038/3533] unix: Make port-specific modules use
 MP_REGISTER_MODULE.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/unix/modffi.c          |  2 ++
 ports/unix/modjni.c          |  2 ++
 ports/unix/modtermios.c      |  2 ++
 ports/unix/modtime.c         |  2 ++
 ports/unix/moduselect.c      |  2 ++
 ports/unix/modusocket.c      |  2 ++
 ports/unix/mpconfigport.h    | 46 ------------------------------------
 ports/windows/mpconfigport.h |  4 ----
 8 files changed, 12 insertions(+), 50 deletions(-)

diff --git a/ports/unix/modffi.c b/ports/unix/modffi.c
index ec252ef33e51f..b692af4df1a59 100644
--- a/ports/unix/modffi.c
+++ b/ports/unix/modffi.c
@@ -631,3 +631,5 @@ const mp_obj_module_t mp_module_ffi = {
     .base = { &mp_type_module },
     .globals = (mp_obj_dict_t *)&mp_module_ffi_globals,
 };
+
+MP_REGISTER_MODULE(MP_QSTR_ffi, mp_module_ffi, MICROPY_PY_FFI);
diff --git a/ports/unix/modjni.c b/ports/unix/modjni.c
index 4b95a0c67df8a..5d2beaa8dc283 100644
--- a/ports/unix/modjni.c
+++ b/ports/unix/modjni.c
@@ -712,3 +712,5 @@ const mp_obj_module_t mp_module_jni = {
     .base = { &mp_type_module },
     .globals = (mp_obj_dict_t *)&mp_module_jni_globals,
 };
+
+MP_REGISTER_MODULE(MP_QSTR_jni, mp_module_jni, MICROPY_PY_JNI);
diff --git a/ports/unix/modtermios.c b/ports/unix/modtermios.c
index 7a578becb9cc1..cce8c28ab38bb 100644
--- a/ports/unix/modtermios.c
+++ b/ports/unix/modtermios.c
@@ -148,3 +148,5 @@ const mp_obj_module_t mp_module_termios = {
     .base = { &mp_type_module },
     .globals = (mp_obj_dict_t *)&mp_module_termios_globals,
 };
+
+MP_REGISTER_MODULE(MP_QSTR_termios, mp_module_termios, MICROPY_PY_TERMIOS);
diff --git a/ports/unix/modtime.c b/ports/unix/modtime.c
index 71257c15ff49a..00b3f94367131 100644
--- a/ports/unix/modtime.c
+++ b/ports/unix/modtime.c
@@ -232,4 +232,6 @@ const mp_obj_module_t mp_module_time = {
     .globals = (mp_obj_dict_t *)&mp_module_time_globals,
 };
 
+MP_REGISTER_MODULE(MP_QSTR_utime, mp_module_time, MICROPY_PY_UTIME);
+
 #endif // MICROPY_PY_UTIME
diff --git a/ports/unix/moduselect.c b/ports/unix/moduselect.c
index c88eb25edb244..d3e0eff03818c 100644
--- a/ports/unix/moduselect.c
+++ b/ports/unix/moduselect.c
@@ -351,4 +351,6 @@ const mp_obj_module_t mp_module_uselect = {
     .globals = (mp_obj_dict_t *)&mp_module_select_globals,
 };
 
+MP_REGISTER_MODULE(MP_QSTR_uselect, mp_module_uselect, MICROPY_PY_USELECT_POSIX);
+
 #endif // MICROPY_PY_USELECT_POSIX
diff --git a/ports/unix/modusocket.c b/ports/unix/modusocket.c
index 5edff740f2acc..7526d9679da21 100644
--- a/ports/unix/modusocket.c
+++ b/ports/unix/modusocket.c
@@ -701,3 +701,5 @@ const mp_obj_module_t mp_module_socket = {
     .base = { &mp_type_module },
     .globals = (mp_obj_dict_t *)&mp_module_socket_globals,
 };
+
+MP_REGISTER_MODULE(MP_QSTR_usocket, mp_module_socket, MICROPY_PY_SOCKET);
diff --git a/ports/unix/mpconfigport.h b/ports/unix/mpconfigport.h
index ef7c820e7e1b3..524b165231384 100644
--- a/ports/unix/mpconfigport.h
+++ b/ports/unix/mpconfigport.h
@@ -219,52 +219,6 @@ extern const struct _mp_print_t mp_stderr_print;
 #define mp_type_fileio mp_type_vfs_posix_fileio
 #define mp_type_textio mp_type_vfs_posix_textio
 
-extern const struct _mp_obj_module_t mp_module_uselect;
-extern const struct _mp_obj_module_t mp_module_time;
-extern const struct _mp_obj_module_t mp_module_termios;
-extern const struct _mp_obj_module_t mp_module_socket;
-extern const struct _mp_obj_module_t mp_module_ffi;
-extern const struct _mp_obj_module_t mp_module_jni;
-
-#if MICROPY_PY_FFI
-#define MICROPY_PY_FFI_DEF { MP_ROM_QSTR(MP_QSTR_ffi), MP_ROM_PTR(&mp_module_ffi) },
-#else
-#define MICROPY_PY_FFI_DEF
-#endif
-#if MICROPY_PY_JNI
-#define MICROPY_PY_JNI_DEF { MP_ROM_QSTR(MP_QSTR_jni), MP_ROM_PTR(&mp_module_jni) },
-#else
-#define MICROPY_PY_JNI_DEF
-#endif
-#if MICROPY_PY_UTIME
-#define MICROPY_PY_UTIME_DEF { MP_ROM_QSTR(MP_QSTR_utime), MP_ROM_PTR(&mp_module_time) },
-#else
-#define MICROPY_PY_UTIME_DEF
-#endif
-#if MICROPY_PY_TERMIOS
-#define MICROPY_PY_TERMIOS_DEF { MP_ROM_QSTR(MP_QSTR_termios), MP_ROM_PTR(&mp_module_termios) },
-#else
-#define MICROPY_PY_TERMIOS_DEF
-#endif
-#if MICROPY_PY_SOCKET
-#define MICROPY_PY_SOCKET_DEF { MP_ROM_QSTR(MP_QSTR_usocket), MP_ROM_PTR(&mp_module_socket) },
-#else
-#define MICROPY_PY_SOCKET_DEF
-#endif
-#if MICROPY_PY_USELECT_POSIX
-#define MICROPY_PY_USELECT_DEF { MP_ROM_QSTR(MP_QSTR_uselect), MP_ROM_PTR(&mp_module_uselect) },
-#else
-#define MICROPY_PY_USELECT_DEF
-#endif
-
-#define MICROPY_PORT_BUILTIN_MODULES \
-    MICROPY_PY_FFI_DEF \
-    MICROPY_PY_JNI_DEF \
-    MICROPY_PY_UTIME_DEF \
-    MICROPY_PY_SOCKET_DEF \
-    MICROPY_PY_USELECT_DEF \
-    MICROPY_PY_TERMIOS_DEF \
-
 // type definitions for the specific machine
 
 // For size_t and ssize_t
diff --git a/ports/windows/mpconfigport.h b/ports/windows/mpconfigport.h
index 1d78f00320f65..ecaa520e81c2e 100644
--- a/ports/windows/mpconfigport.h
+++ b/ports/windows/mpconfigport.h
@@ -215,10 +215,6 @@ typedef long mp_off_t;
 #define MICROPY_PORT_BUILTINS \
     { MP_ROM_QSTR(MP_QSTR_open), MP_ROM_PTR(&mp_builtin_open_obj) },
 
-extern const struct _mp_obj_module_t mp_module_time;
-#define MICROPY_PORT_BUILTIN_MODULES \
-    { MP_ROM_QSTR(MP_QSTR_utime), MP_ROM_PTR(&mp_module_time) }, \
-
 #if MICROPY_USE_READLINE == 1
 #define MICROPY_PORT_ROOT_POINTERS \
     char *readline_hist[50];

From ec2fe5d6ca30cec6162e27e154d3e2deaf83bf93 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Wed, 20 Apr 2022 21:27:10 +1000
Subject: [PATCH 2039/3533] zephyr: Make port-specific modules use
 MP_REGISTER_MODULE.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/zephyr/modusocket.c   |  2 ++
 ports/zephyr/modutime.c     |  2 ++
 ports/zephyr/modzephyr.c    |  2 ++
 ports/zephyr/modzsensor.c   |  2 ++
 ports/zephyr/mpconfigport.h | 35 -----------------------------------
 5 files changed, 8 insertions(+), 35 deletions(-)

diff --git a/ports/zephyr/modusocket.c b/ports/zephyr/modusocket.c
index 8f39347e37522..fbcd7e87ae9ef 100644
--- a/ports/zephyr/modusocket.c
+++ b/ports/zephyr/modusocket.c
@@ -472,4 +472,6 @@ const mp_obj_module_t mp_module_usocket = {
     .globals = (mp_obj_dict_t *)&mp_module_usocket_globals,
 };
 
+MP_REGISTER_MODULE(MP_QSTR_usocket, mp_module_usocket, MICROPY_PY_USOCKET);
+
 #endif // MICROPY_PY_USOCKET
diff --git a/ports/zephyr/modutime.c b/ports/zephyr/modutime.c
index ba9e1d8f1ff64..c9864a4432b13 100644
--- a/ports/zephyr/modutime.c
+++ b/ports/zephyr/modutime.c
@@ -64,4 +64,6 @@ const mp_obj_module_t mp_module_time = {
     .globals = (mp_obj_dict_t *)&mp_module_time_globals,
 };
 
+MP_REGISTER_MODULE(MP_QSTR_utime, mp_module_time, MICROPY_PY_UTIME);
+
 #endif // MICROPY_PY_UTIME
diff --git a/ports/zephyr/modzephyr.c b/ports/zephyr/modzephyr.c
index 52449ea381c42..fc883ddc49801 100644
--- a/ports/zephyr/modzephyr.c
+++ b/ports/zephyr/modzephyr.c
@@ -89,4 +89,6 @@ const mp_obj_module_t mp_module_zephyr = {
     .globals = (mp_obj_dict_t *)&mp_module_time_globals,
 };
 
+MP_REGISTER_MODULE(MP_QSTR_zephyr, mp_module_zephyr, MICROPY_PY_ZEPHYR);
+
 #endif // MICROPY_PY_ZEPHYR
diff --git a/ports/zephyr/modzsensor.c b/ports/zephyr/modzsensor.c
index ba7ba2e8ccc86..2286a46fd87cf 100644
--- a/ports/zephyr/modzsensor.c
+++ b/ports/zephyr/modzsensor.c
@@ -142,4 +142,6 @@ const mp_obj_module_t mp_module_zsensor = {
     .globals = (mp_obj_dict_t *)&mp_module_zsensor_globals,
 };
 
+MP_REGISTER_MODULE(MP_QSTR_zsensor, mp_module_zsensor, MICROPY_PY_ZSENSOR);
+
 #endif // MICROPY_PY_UHASHLIB
diff --git a/ports/zephyr/mpconfigport.h b/ports/zephyr/mpconfigport.h
index fa1cb56ae6da8..44231e1fc8813 100644
--- a/ports/zephyr/mpconfigport.h
+++ b/ports/zephyr/mpconfigport.h
@@ -138,41 +138,6 @@ typedef long mp_off_t;
     void *machine_pin_irq_list; /* Linked list of pin irq objects */ \
     struct _mp_bluetooth_zephyr_root_pointers_t *bluetooth_zephyr_root_pointers;
 
-extern const struct _mp_obj_module_t mp_module_time;
-extern const struct _mp_obj_module_t mp_module_usocket;
-extern const struct _mp_obj_module_t mp_module_zephyr;
-extern const struct _mp_obj_module_t mp_module_zsensor;
-
-#if MICROPY_PY_USOCKET
-#define MICROPY_PY_USOCKET_DEF { MP_ROM_QSTR(MP_QSTR_usocket), MP_ROM_PTR(&mp_module_usocket) },
-#else
-#define MICROPY_PY_USOCKET_DEF
-#endif
-
-#if MICROPY_PY_UTIME
-#define MICROPY_PY_UTIME_DEF { MP_ROM_QSTR(MP_QSTR_utime), MP_ROM_PTR(&mp_module_time) },
-#else
-#define MICROPY_PY_UTIME_DEF
-#endif
-
-#if MICROPY_PY_ZEPHYR
-#define MICROPY_PY_ZEPHYR_DEF { MP_ROM_QSTR(MP_QSTR_zephyr), MP_ROM_PTR(&mp_module_zephyr) },
-#else
-#define MICROPY_PY_ZEPHYR_DEF
-#endif
-
-#if MICROPY_PY_ZSENSOR
-#define MICROPY_PY_ZSENSOR_DEF { MP_ROM_QSTR(MP_QSTR_zsensor), MP_ROM_PTR(&mp_module_zsensor) },
-#else
-#define MICROPY_PY_ZSENSOR_DEF
-#endif
-
-#define MICROPY_PORT_BUILTIN_MODULES \
-    MICROPY_PY_USOCKET_DEF \
-    MICROPY_PY_UTIME_DEF \
-    MICROPY_PY_ZEPHYR_DEF \
-    MICROPY_PY_ZSENSOR_DEF \
-
 // extra built in names to add to the global namespace
 #define MICROPY_PORT_BUILTINS \
     { MP_ROM_QSTR(MP_QSTR_open), MP_ROM_PTR(&mp_builtin_open_obj) },

From 9e4da2320aa68206456e50e44dffd19465f47e26 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Wed, 20 Apr 2022 21:28:20 +1000
Subject: [PATCH 2040/3533] javascript: Make port-specific modules use
 MP_REGISTER_MODULE.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/javascript/modutime.c     | 2 ++
 ports/javascript/mpconfigport.h | 5 -----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/ports/javascript/modutime.c b/ports/javascript/modutime.c
index 05ff8b22f37b7..92ddd4729dde1 100644
--- a/ports/javascript/modutime.c
+++ b/ports/javascript/modutime.c
@@ -54,3 +54,5 @@ const mp_obj_module_t mp_module_utime = {
     .base = { &mp_type_module },
     .globals = (mp_obj_dict_t *)&time_module_globals,
 };
+
+MP_REGISTER_MODULE(MP_QSTR_utime, mp_module_utime, 1);
diff --git a/ports/javascript/mpconfigport.h b/ports/javascript/mpconfigport.h
index d1bfbbd6011e5..1d356a0a25957 100644
--- a/ports/javascript/mpconfigport.h
+++ b/ports/javascript/mpconfigport.h
@@ -126,11 +126,6 @@
 
 #define MP_SSIZE_MAX (0x7fffffff)
 
-extern const struct _mp_obj_module_t mp_module_utime;
-
-#define MICROPY_PORT_BUILTIN_MODULES \
-    { MP_ROM_QSTR(MP_QSTR_utime), MP_ROM_PTR(&mp_module_utime) }, \
-
 // #define MICROPY_EVENT_POLL_HOOK {ets_event_poll();}
 #if MICROPY_PY_THREAD
 #define MICROPY_EVENT_POLL_HOOK \

From 1d33ceb0d0235d657afac69ba27ab08c6477df4f Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Wed, 20 Apr 2022 21:33:45 +1000
Subject: [PATCH 2041/3533] cc3200: Make port-specific modules use
 MP_REGISTER_MODULE.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/cc3200/mods/modnetwork.c |  2 ++
 ports/cc3200/mods/moduos.c     |  2 ++
 ports/cc3200/mods/modusocket.c |  2 ++
 ports/cc3200/mods/modussl.c    |  1 +
 ports/cc3200/mods/modutime.c   |  2 ++
 ports/cc3200/mods/modwipy.c    |  2 ++
 ports/cc3200/mpconfigport.h    | 22 ----------------------
 7 files changed, 11 insertions(+), 22 deletions(-)

diff --git a/ports/cc3200/mods/modnetwork.c b/ports/cc3200/mods/modnetwork.c
index e8a70e0a84dad..61996feb57039 100644
--- a/ports/cc3200/mods/modnetwork.c
+++ b/ports/cc3200/mods/modnetwork.c
@@ -159,6 +159,8 @@ const mp_obj_module_t mp_module_network = {
     .globals = (mp_obj_dict_t*)&mp_module_network_globals,
 };
 
+MP_REGISTER_MODULE(MP_QSTR_network, mp_module_network, 1);
+
 #if (MICROPY_PORT_HAS_TELNET || MICROPY_PORT_HAS_FTP)
 STATIC const mp_rom_map_elem_t network_server_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_init),                MP_ROM_PTR(&network_server_init_obj) },
diff --git a/ports/cc3200/mods/moduos.c b/ports/cc3200/mods/moduos.c
index 8c3dcf696aafa..5825ca691a2ad 100644
--- a/ports/cc3200/mods/moduos.c
+++ b/ports/cc3200/mods/moduos.c
@@ -179,3 +179,5 @@ const mp_obj_module_t mp_module_uos = {
     .base = { &mp_type_module },
     .globals = (mp_obj_dict_t*)&os_module_globals,
 };
+
+MP_REGISTER_MODULE(MP_QSTR_uos, mp_module_uos, 1);
diff --git a/ports/cc3200/mods/modusocket.c b/ports/cc3200/mods/modusocket.c
index 99b78c88372d3..65fc3ae296e82 100644
--- a/ports/cc3200/mods/modusocket.c
+++ b/ports/cc3200/mods/modusocket.c
@@ -816,3 +816,5 @@ const mp_obj_module_t mp_module_usocket = {
     .base = { &mp_type_module },
     .globals = (mp_obj_dict_t*)&mp_module_usocket_globals,
 };
+
+MP_REGISTER_MODULE(MP_QSTR_usocket, mp_module_usocket, 1);
diff --git a/ports/cc3200/mods/modussl.c b/ports/cc3200/mods/modussl.c
index 09a1a3185700c..7bfb02b1d041a 100644
--- a/ports/cc3200/mods/modussl.c
+++ b/ports/cc3200/mods/modussl.c
@@ -161,3 +161,4 @@ const mp_obj_module_t mp_module_ussl = {
     .globals = (mp_obj_dict_t*)&mp_module_ussl_globals,
 };
 
+MP_REGISTER_MODULE(MP_QSTR_ussl, mp_module_ussl, 1);
diff --git a/ports/cc3200/mods/modutime.c b/ports/cc3200/mods/modutime.c
index c5ff6072f59a4..4f4c363403eba 100644
--- a/ports/cc3200/mods/modutime.c
+++ b/ports/cc3200/mods/modutime.c
@@ -155,3 +155,5 @@ const mp_obj_module_t mp_module_utime = {
     .base = { &mp_type_module },
     .globals = (mp_obj_dict_t*)&time_module_globals,
 };
+
+MP_REGISTER_MODULE(MP_QSTR_utime, mp_module_utime, 1);
diff --git a/ports/cc3200/mods/modwipy.c b/ports/cc3200/mods/modwipy.c
index 0f16e73018b1d..c85958375b7de 100644
--- a/ports/cc3200/mods/modwipy.c
+++ b/ports/cc3200/mods/modwipy.c
@@ -28,3 +28,5 @@ const mp_obj_module_t wipy_module = {
     .base = { &mp_type_module },
     .globals = (mp_obj_dict_t*)&wipy_module_globals,
 };
+
+MP_REGISTER_MODULE(MP_QSTR_wipy, wipy_module, 1);
diff --git a/ports/cc3200/mpconfigport.h b/ports/cc3200/mpconfigport.h
index 28192e9b3ead9..a3af89674a144 100644
--- a/ports/cc3200/mpconfigport.h
+++ b/ports/cc3200/mpconfigport.h
@@ -144,28 +144,6 @@
 #define MICROPY_PORT_BUILTINS \
     { MP_ROM_QSTR(MP_QSTR_open),  MP_ROM_PTR(&mp_builtin_open_obj) },   \
 
-// extra built in modules to add to the list of known ones
-extern const struct _mp_obj_module_t wipy_module;
-extern const struct _mp_obj_module_t mp_module_ure;
-extern const struct _mp_obj_module_t mp_module_ujson;
-extern const struct _mp_obj_module_t mp_module_uos;
-extern const struct _mp_obj_module_t mp_module_utime;
-extern const struct _mp_obj_module_t mp_module_uselect;
-extern const struct _mp_obj_module_t mp_module_usocket;
-extern const struct _mp_obj_module_t mp_module_network;
-extern const struct _mp_obj_module_t mp_module_ubinascii;
-extern const struct _mp_obj_module_t mp_module_ussl;
-
-#define MICROPY_PORT_BUILTIN_MODULES \
-    { MP_ROM_QSTR(MP_QSTR_wipy),        MP_ROM_PTR(&wipy_module) },         \
-    { MP_ROM_QSTR(MP_QSTR_uos),         MP_ROM_PTR(&mp_module_uos) },       \
-    { MP_ROM_QSTR(MP_QSTR_utime),       MP_ROM_PTR(&mp_module_utime) },     \
-    { MP_ROM_QSTR(MP_QSTR_uselect),     MP_ROM_PTR(&mp_module_uselect) },   \
-    { MP_ROM_QSTR(MP_QSTR_usocket),     MP_ROM_PTR(&mp_module_usocket) },   \
-    { MP_ROM_QSTR(MP_QSTR_network),     MP_ROM_PTR(&mp_module_network) },   \
-    { MP_ROM_QSTR(MP_QSTR_ubinascii),   MP_ROM_PTR(&mp_module_ubinascii) }, \
-    { MP_ROM_QSTR(MP_QSTR_ussl),        MP_ROM_PTR(&mp_module_ussl) },      \
-
 // extra constants
 #define MICROPY_PORT_CONSTANTS \
     { MP_ROM_QSTR(MP_QSTR_umachine),     MP_ROM_PTR(&mp_module_machine) },  \

From c2d889fc1e21aa39f15c8432dda643e41fe1f3ad Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Fri, 13 May 2022 16:29:22 +1000
Subject: [PATCH 2042/3533] renesas-ra: Make port-specific modules use
 MP_REGISTER_MODULE.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/renesas-ra/modutime.c     |  2 ++
 ports/renesas-ra/mpconfigport.h | 26 --------------------------
 2 files changed, 2 insertions(+), 26 deletions(-)

diff --git a/ports/renesas-ra/modutime.c b/ports/renesas-ra/modutime.c
index bff76035e3f8a..2bd0adfa236ef 100644
--- a/ports/renesas-ra/modutime.c
+++ b/ports/renesas-ra/modutime.c
@@ -156,3 +156,5 @@ const mp_obj_module_t mp_module_utime = {
     .base = { &mp_type_module },
     .globals = (mp_obj_dict_t *)&time_module_globals,
 };
+
+MP_REGISTER_MODULE(MP_QSTR_utime, mp_module_utime, MICROPY_PY_UTIME);
diff --git a/ports/renesas-ra/mpconfigport.h b/ports/renesas-ra/mpconfigport.h
index 8d60bc24463c3..e66ca6b1842d6 100644
--- a/ports/renesas-ra/mpconfigport.h
+++ b/ports/renesas-ra/mpconfigport.h
@@ -158,16 +158,6 @@
 #define MICROPY_PORT_BUILTINS \
     { MP_ROM_QSTR(MP_QSTR_open), MP_ROM_PTR(&mp_builtin_open_obj) },
 
-// extra built in modules to add to the list of known ones
-extern const struct _mp_obj_module_t mp_module_ubinascii;
-extern const struct _mp_obj_module_t mp_module_ure;
-extern const struct _mp_obj_module_t mp_module_uzlib;
-extern const struct _mp_obj_module_t mp_module_ujson;
-extern const struct _mp_obj_module_t mp_module_uheapq;
-extern const struct _mp_obj_module_t mp_module_uhashlib;
-extern const struct _mp_obj_module_t mp_module_utime;
-extern const struct _mp_obj_module_t mp_module_onewire;
-
 #if MICROPY_PY_MACHINE
 #define MACHINE_BUILTIN_MODULE_CONSTANTS \
     { MP_ROM_QSTR(MP_QSTR_umachine), MP_ROM_PTR(&mp_module_machine) }, \
@@ -176,22 +166,6 @@ extern const struct _mp_obj_module_t mp_module_onewire;
 #define MACHINE_BUILTIN_MODULE_CONSTANTS
 #endif
 
-#if MICROPY_PY_UTIME
-#define UTIME_BUILTIN_MODULE                { MP_ROM_QSTR(MP_QSTR_utime), MP_ROM_PTR(&mp_module_utime) },
-#else
-#define UTIME_BUILTIN_MODULE
-#endif
-
-#if MICROPY_PY_ONEWIRE
-#define ONEWIRE_BUILTIN_MODULE              { MP_ROM_QSTR(MP_QSTR__onewire), MP_ROM_PTR(&mp_module_onewire) },
-#else
-#define ONEWIRE_BUILTIN_MODULE
-#endif
-
-#define MICROPY_PORT_BUILTIN_MODULES \
-    UTIME_BUILTIN_MODULE \
-    ONEWIRE_BUILTIN_MODULE \
-
 // extra constants
 #define MICROPY_PORT_CONSTANTS \
     MACHINE_BUILTIN_MODULE_CONSTANTS \

From 8b201dc4c326cb932a9d3cd0fc9adc993305701d Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Wed, 20 Apr 2022 21:35:10 +1000
Subject: [PATCH 2043/3533] py: Remove support for
 MICROPY_PORT_BUILTIN_MODULES.

This functionality is now replaced with MP_REGISTER_MODULE.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 py/mpconfig.h  | 5 -----
 py/objmodule.c | 3 ---
 2 files changed, 8 deletions(-)

diff --git a/py/mpconfig.h b/py/mpconfig.h
index 59ab84cd4c067..bac6362d176fc 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -1649,11 +1649,6 @@ typedef double mp_float_t;
 #define MICROPY_PORT_EXTRA_BUILTINS
 #endif
 
-// Additional builtin module definitions - see objmodule.c:mp_builtin_module_table for format.
-#ifndef MICROPY_PORT_BUILTIN_MODULES
-#define MICROPY_PORT_BUILTIN_MODULES
-#endif
-
 // Additional constant definitions for the compiler - see compile.c:mp_constants_table.
 #ifndef MICROPY_PORT_CONSTANTS
 #define MICROPY_PORT_CONSTANTS
diff --git a/py/objmodule.c b/py/objmodule.c
index f93669a11cdbe..4f5ae89906a31 100644
--- a/py/objmodule.c
+++ b/py/objmodule.c
@@ -161,9 +161,6 @@ mp_obj_t mp_obj_new_module(qstr module_name) {
 // Global module table and related functions
 
 STATIC const mp_rom_map_elem_t mp_builtin_module_table[] = {
-    // extra builtin modules as defined by a port
-    MICROPY_PORT_BUILTIN_MODULES
-
     #ifdef MICROPY_REGISTERED_MODULES
     // builtin modules declared with MP_REGISTER_MODULE()
     MICROPY_REGISTERED_MODULES

From ea1c0557e5866ad7b84f18de18d0bf82e422e279 Mon Sep 17 00:00:00 2001
From: Christian Zietz <czietz@gmx.net>
Date: Wed, 4 May 2022 19:09:05 +0200
Subject: [PATCH 2044/3533] esp8266/machine_wdt: Remove deinit method for
 watchdog.

Reasons for removal:
- It did not work properly because it stopped the hardware watchdog
  timer while keeping the software watchdog running (issue #8597).
- There isn't a deinit method for the WDT in any other port.
- "The watchdog is not intended to be stopped. That is a feature."
  (See #8600.)
---
 ports/esp8266/machine_wdt.c | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/ports/esp8266/machine_wdt.c b/ports/esp8266/machine_wdt.c
index b64830e7d6733..b06e752277288 100644
--- a/ports/esp8266/machine_wdt.c
+++ b/ports/esp8266/machine_wdt.c
@@ -64,16 +64,8 @@ STATIC mp_obj_t machine_wdt_feed(mp_obj_t self_in) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_wdt_feed_obj, machine_wdt_feed);
 
-STATIC mp_obj_t machine_wdt_deinit(mp_obj_t self_in) {
-    (void)self_in;
-    ets_wdt_disable();
-    return mp_const_none;
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_wdt_deinit_obj, machine_wdt_deinit);
-
 STATIC const mp_rom_map_elem_t machine_wdt_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_feed), MP_ROM_PTR(&machine_wdt_feed_obj) },
-    { MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&machine_wdt_deinit_obj) },
 };
 STATIC MP_DEFINE_CONST_DICT(machine_wdt_locals_dict, machine_wdt_locals_dict_table);
 

From e92c22a839dbe90ef549ec12b4d82f2406b76114 Mon Sep 17 00:00:00 2001
From: Christian Zietz <czietz@gmx.net>
Date: Wed, 4 May 2022 20:01:17 +0200
Subject: [PATCH 2045/3533] esp8266/etshal.h: Remove unneeded function
 declaration.

---
 ports/esp8266/etshal.h | 2 --
 1 file changed, 2 deletions(-)

diff --git a/ports/esp8266/etshal.h b/ports/esp8266/etshal.h
index 7d0855a2ae08a..b7e23e8309bdb 100644
--- a/ports/esp8266/etshal.h
+++ b/ports/esp8266/etshal.h
@@ -9,8 +9,6 @@
 void ets_isr_mask(uint32_t mask);
 void ets_isr_unmask(uint32_t mask);
 
-void ets_wdt_disable(void);
-
 // Opaque structure
 #ifndef MD5_CTX
 typedef char MD5_CTX[88];

From a1abf51a9de41b907e33e426a8fce58174e3698b Mon Sep 17 00:00:00 2001
From: Michael Himing <git@michaelhiming.com>
Date: Thu, 28 Apr 2022 20:44:03 +1000
Subject: [PATCH 2046/3533] esp32/boards/UM_FEATHERS3: Use correct
 sdkconfig.board.

---
 ports/esp32/boards/UM_FEATHERS3/mpconfigboard.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/esp32/boards/UM_FEATHERS3/mpconfigboard.cmake b/ports/esp32/boards/UM_FEATHERS3/mpconfigboard.cmake
index 6c7f34009e432..63d1af1da76ca 100644
--- a/ports/esp32/boards/UM_FEATHERS3/mpconfigboard.cmake
+++ b/ports/esp32/boards/UM_FEATHERS3/mpconfigboard.cmake
@@ -6,7 +6,7 @@ set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.ble
     boards/sdkconfig.240mhz
     boards/sdkconfig.spiram_sx
-    boards/UM_TINYS3/sdkconfig.board
+    boards/UM_FEATHERS3/sdkconfig.board
 )
 
 set(MICROPY_FROZEN_MANIFEST ${MICROPY_BOARD_DIR}/manifest.py)

From 5dac142a1a332f641042bf6a6f775a705227ea38 Mon Sep 17 00:00:00 2001
From: Algy Tynan <algy@tynan.io>
Date: Wed, 11 May 2022 11:46:13 +1000
Subject: [PATCH 2047/3533] esp32/boards/LILYGO_TTGO_LORA32: Remove ID from
 TTGO Lora32 board json.

Generic ID creates an incorrect link on the MicroPython download page.
Remove the ID to fix the link.

Signed-off-by: Algy Tynan <algy@tynan.io>
---
 ports/esp32/boards/LILYGO_TTGO_LORA32/board.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ports/esp32/boards/LILYGO_TTGO_LORA32/board.json b/ports/esp32/boards/LILYGO_TTGO_LORA32/board.json
index 7f4b227abfc1b..9dd76b5792376 100644
--- a/ports/esp32/boards/LILYGO_TTGO_LORA32/board.json
+++ b/ports/esp32/boards/LILYGO_TTGO_LORA32/board.json
@@ -11,7 +11,6 @@
         "USB-MICRO",
         "WiFi"
     ],
-    "id": "esp32",
     "images": [
         "lilygo-ttgo-lora-32-v1-6.jpg"
     ],

From ef16796f4941fb650cb87a8c29dfa663313e1049 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20van=20de=20Giessen?= <daniel@dvdgiessen.nl>
Date: Thu, 28 Apr 2022 16:20:08 +0200
Subject: [PATCH 2048/3533] esp32/machine_pin: Fix ESP32C3 IDFv4.4.1 build.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Use new constants as seen in ESP-IDF commit b25fb1.

Signed-off-by: Daniël van de Giessen <daniel@dvdgiessen.nl>
---
 ports/esp32/machine_pin.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/esp32/machine_pin.c b/ports/esp32/machine_pin.c
index edfa4d5cae183..2238c6e5fa174 100644
--- a/ports/esp32/machine_pin.c
+++ b/ports/esp32/machine_pin.c
@@ -41,7 +41,7 @@
 #include "modesp32.h"
 
 #if CONFIG_IDF_TARGET_ESP32C3
-#include "hal/gpio_ll.h"
+#include "soc/usb_serial_jtag_reg.h"
 #endif
 
 // Used to implement a range of pull capabilities
@@ -290,7 +290,7 @@ STATIC mp_obj_t machine_pin_obj_init_helper(const machine_pin_obj_t *self, size_
 
     #if CONFIG_IDF_TARGET_ESP32C3
     if (self->id == 18 || self->id == 19) {
-        CLEAR_PERI_REG_MASK(USB_DEVICE_CONF0_REG, USB_DEVICE_USB_PAD_ENABLE);
+        CLEAR_PERI_REG_MASK(USB_SERIAL_JTAG_CONF0_REG, USB_SERIAL_JTAG_USB_PAD_ENABLE);
     }
     #endif
 

From 1786dacc839e5229298bedf23c3b4d8c53d43a5e Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 19 May 2022 14:54:06 +1000
Subject: [PATCH 2049/3533] tests/run-tests.py: Allow running tests via
 mpy-cross on remote targets.

This adds support for the `--via-mpy` and `--emit native` options when
running tests on remote targets (via pyboard.py).  It's now possible to do:

    $ ./run-tests.py --target pyboard --via-mpy
    $ ./run-tests.py --target pyboard --via-mpy --emit native

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/run-tests.py | 104 ++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 94 insertions(+), 10 deletions(-)

diff --git a/tests/run-tests.py b/tests/run-tests.py
index 60c2c3fe198b6..35e28aac9b488 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -48,6 +48,37 @@ def base_path(*p):
 # Set PYTHONIOENCODING so that CPython will use utf-8 on systems which set another encoding in the locale
 os.environ["PYTHONIOENCODING"] = "utf-8"
 
+# Code to allow a target MicroPython to import an .mpy from RAM
+injected_import_hook_code = """\
+import usys, uos, uio
+class __File(uio.IOBase):
+  def __init__(self):
+    self.off = 0
+  def ioctl(self, request, arg):
+    return 0
+  def readinto(self, buf):
+    buf[:] = memoryview(__buf)[self.off:self.off + len(buf)]
+    self.off += len(buf)
+    return len(buf)
+class __FS:
+  def mount(self, readonly, mkfs):
+    pass
+  def umount(self):
+    pass
+  def chdir(self, path):
+    pass
+  def stat(self, path):
+    if path == '__injected_test.mpy':
+      return tuple(0 for _ in range(10))
+    else:
+      raise OSError(-2) # ENOENT
+  def open(self, path, mode):
+    return __File()
+uos.mount(__FS(), '/__vfstest')
+uos.chdir('/__vfstest')
+__import__('__injected_test')
+"""
+
 
 def rm_f(fname):
     if os.path.exists(fname):
@@ -74,6 +105,59 @@ def convert_regex_escapes(line):
     return bytes("".join(cs), "utf8")
 
 
+def prepare_script_for_target(args, *, script_filename=None, script_text=None, force_plain=False):
+    if force_plain or (not args.via_mpy and args.emit == "bytecode"):
+        if script_filename is not None:
+            with open(script_filename, "rb") as f:
+                script_text = f.read()
+    elif args.via_mpy:
+        tempname = tempfile.mktemp(dir="")
+        mpy_filename = tempname + ".mpy"
+
+        if script_filename is None:
+            script_filename = tempname + ".py"
+            cleanup_script_filename = True
+            with open(script_filename, "wb") as f:
+                f.write(script_text)
+        else:
+            cleanup_script_filename = False
+
+        subprocess.check_output(
+            [MPYCROSS]
+            + args.mpy_cross_flags.split()
+            + ["-o", mpy_filename, "-X", "emit=" + args.emit, script_filename]
+        )
+
+        with open(mpy_filename, "rb") as f:
+            script_text = b"__buf=" + bytes(repr(f.read()), "ascii") + b"\n"
+
+        rm_f(mpy_filename)
+        if cleanup_script_filename:
+            rm_f(script_filename)
+
+        script_text += bytes(injected_import_hook_code, "ascii")
+    else:
+        print("error: using emit={} must go via .mpy".format(args.emit))
+        sys.exit(1)
+
+    return script_text
+
+
+def run_script_on_remote_target(pyb, args, test_file, is_special):
+    script = prepare_script_for_target(args, script_filename=test_file, force_plain=is_special)
+    try:
+        had_crash = False
+        pyb.enter_raw_repl()
+        output_mupy = pyb.exec_(script)
+    except pyboard.PyboardError as e:
+        had_crash = True
+        if not is_special and e.args[0] == "exception":
+            output_mupy = e.args[1] + e.args[2] + b"CRASH"
+        else:
+            output_mupy = bytes(e.args[0], "ascii") + b"\nCRASH"
+    return had_crash, output_mupy
+
+
 def run_micropython(pyb, args, test_file, is_special=False):
     special_tests = (
         "micropython/meminfo.py",
@@ -196,16 +280,8 @@ def send_get(what):
                 rm_f(mpy_filename)
 
     else:
-        # run on pyboard
-        pyb.enter_raw_repl()
-        try:
-            output_mupy = pyb.execfile(test_file)
-        except pyboard.PyboardError as e:
-            had_crash = True
-            if not is_special and e.args[0] == "exception":
-                output_mupy = e.args[1] + e.args[2] + b"CRASH"
-            else:
-                output_mupy = bytes(e.args[0], "ascii") + b"\nCRASH"
+        # run via pyboard interface
+        had_crash, output_mupy = run_script_on_remote_target(pyb, args, test_file, is_special)
 
     # canonical form for all ports/platforms is to use \n for end-of-line
     output_mupy = output_mupy.replace(b"\r\n", b"\n")
@@ -818,6 +894,14 @@ def main():
         sys.path.append(base_path("../tools"))
         import pyboard
 
+        if not args.mpy_cross_flags:
+            if args.target == "esp8266":
+                args.mpy_cross_flags = "-march=xtensa"
+            elif args.target == "esp32":
+                args.mpy_cross_flags = "-march=xtensawin"
+            else:
+                args.mpy_cross_flags = "-march=armv7m"
+
         pyb = pyboard.Pyboard(args.device, args.baudrate, args.user, args.password)
         pyb.enter_raw_repl()
     else:

From 54ab9d23e973bdd02326eba68ea89078429e5bce Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 19 May 2022 15:02:33 +1000
Subject: [PATCH 2050/3533] tests/run-perfbench.py: Allow running tests via mpy
 and native emitter.

The performance benchmark tests now support `--via-mpy` and `--emit native`
on remote targets.  For example:

    $ ./run-perfbench.py -p --via-mpy --emit native 100 100

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/run-perfbench.py | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/tests/run-perfbench.py b/tests/run-perfbench.py
index 05efa83318d80..22ad6308fbdd6 100755
--- a/tests/run-perfbench.py
+++ b/tests/run-perfbench.py
@@ -13,6 +13,8 @@
 sys.path.append("../tools")
 import pyboard
 
+prepare_script_for_target = __import__("run-tests").prepare_script_for_target
+
 # Paths for host executables
 if os.name == "nt":
     CPYTHON3 = os.getenv("MICROPY_CPYTHON3", "python3.exe")
@@ -85,7 +87,7 @@ def run_benchmark_on_target(target, script):
         return -1, -1, "CRASH: %r" % err
 
 
-def run_benchmarks(target, param_n, param_m, n_average, test_list):
+def run_benchmarks(args, target, param_n, param_m, n_average, test_list):
     skip_complex = run_feature_test(target, "complex") != "complex"
     skip_native = run_feature_test(target, "native_check") != "native"
     target_had_error = False
@@ -116,13 +118,19 @@ def run_benchmarks(target, param_n, param_m, n_average, test_list):
             with open("%s.full" % test_file, "wb") as f:
                 f.write(test_script)
 
+        # Process script through mpy-cross if needed
+        if isinstance(target, pyboard.Pyboard) or args.via_mpy:
+            test_script_target = prepare_script_for_target(args, script_text=test_script)
+        else:
+            test_script_target = test_script
+
         # Run MicroPython a given number of times
         times = []
         scores = []
         error = None
         result_out = None
         for _ in range(n_average):
-            time, norm, result = run_benchmark_on_target(target, test_script)
+            time, norm, result = run_benchmark_on_target(target, test_script_target)
             if time < 0 or norm < 0:
                 error = result
                 break
@@ -247,6 +255,8 @@ def main():
     cmd_parser.add_argument(
         "--emit", default="bytecode", help="MicroPython emitter to use (bytecode or native)"
     )
+    cmd_parser.add_argument("--via-mpy", action="store_true", help="compile code to .mpy first")
+    cmd_parser.add_argument("--mpy-cross-flags", default="", help="flags to pass to mpy-cross")
     cmd_parser.add_argument("N", nargs=1, help="N parameter (approximate target CPU frequency)")
     cmd_parser.add_argument("M", nargs=1, help="M parameter (approximate target heap in kbytes)")
     cmd_parser.add_argument("files", nargs="*", help="input test files")
@@ -264,6 +274,8 @@ def main():
     n_average = int(args.average)
 
     if args.pyboard:
+        if not args.mpy_cross_flags:
+            args.mpy_cross_flags = "-march=armv7m"
         target = pyboard.Pyboard(args.device)
         target.enter_raw_repl()
     else:
@@ -284,7 +296,7 @@ def main():
 
     print("N={} M={} n_average={}".format(N, M, n_average))
 
-    target_had_error = run_benchmarks(target, N, M, n_average, tests)
+    target_had_error = run_benchmarks(args, target, N, M, n_average, tests)
 
     if isinstance(target, pyboard.Pyboard):
         target.exit_raw_repl()

From c70f96f1c57456031c5b3fc9bd89a564106e345b Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 19 May 2022 15:04:52 +1000
Subject: [PATCH 2051/3533] esp32: Track allocated iRAM and free it on soft
 reset.

This makes sure all iRAM allocated for native code is freed on soft reset.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/main.c         | 16 ++++++++++++++++
 ports/esp32/mpconfigport.h |  1 +
 2 files changed, 17 insertions(+)

diff --git a/ports/esp32/main.c b/ports/esp32/main.c
index f833c95018002..14b7e14c62ff1 100644
--- a/ports/esp32/main.c
+++ b/ports/esp32/main.c
@@ -152,6 +152,8 @@ void mp_task(void *pvParameter) {
     mp_obj_list_append(mp_sys_path, MP_OBJ_NEW_QSTR(MP_QSTR__slash_lib));
     readline_init0();
 
+    MP_STATE_PORT(native_code_pointers) = MP_OBJ_NULL;
+
     // initialise peripherals
     machine_pins_init();
     #if MICROPY_PY_MACHINE_I2S
@@ -194,6 +196,16 @@ void mp_task(void *pvParameter) {
     mp_thread_deinit();
     #endif
 
+    // Free any native code pointers that point to iRAM.
+    if (MP_STATE_PORT(native_code_pointers) != MP_OBJ_NULL) {
+        size_t len;
+        mp_obj_t *items;
+        mp_obj_list_get(MP_STATE_PORT(native_code_pointers), &len, &items);
+        for (size_t i = 0; i < len; ++i) {
+            heap_caps_free(MP_OBJ_TO_PTR(items[i]));
+        }
+    }
+
     gc_sweep_all();
 
     mp_hal_stdout_tx_str("MPY: soft reboot\r\n");
@@ -243,6 +255,10 @@ void *esp_native_code_commit(void *buf, size_t len, void *reloc) {
     if (p == NULL) {
         m_malloc_fail(len);
     }
+    if (MP_STATE_PORT(native_code_pointers) == MP_OBJ_NULL) {
+        MP_STATE_PORT(native_code_pointers) = mp_obj_new_list(0, NULL);
+    }
+    mp_obj_list_append(MP_STATE_PORT(native_code_pointers), MP_OBJ_TO_PTR(p));
     if (reloc) {
         mp_native_relocate(reloc, buf, (uintptr_t)p);
     }
diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h
index a3e4acf0656d8..a64d6de995757 100644
--- a/ports/esp32/mpconfigport.h
+++ b/ports/esp32/mpconfigport.h
@@ -152,6 +152,7 @@ struct mp_bluetooth_nimble_root_pointers_t;
     mp_obj_t machine_pin_irq_handler[40]; \
     struct _machine_timer_obj_t *machine_timer_obj_head; \
     struct _machine_i2s_obj_t *machine_i2s_obj[I2S_NUM_MAX]; \
+    mp_obj_t native_code_pointers; \
     MICROPY_PORT_ROOT_POINTER_BLUETOOTH_NIMBLE
 
 // type definitions for the specific machine

From 56f2d3c2e5b9a9c0f0470f3850216c3191a59b67 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 19 May 2022 15:05:32 +1000
Subject: [PATCH 2052/3533] py/asmthumb: Fix PC relative load by sign extending
 the constant.

PC relative offsets can be negative, in which case the movw result must be
sign extended.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/asmthumb.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/py/asmthumb.c b/py/asmthumb.c
index db4520ce123cf..04fb823309130 100644
--- a/py/asmthumb.c
+++ b/py/asmthumb.c
@@ -430,8 +430,9 @@ void asm_thumb_mov_reg_pcrel(asm_thumb_t *as, uint rlo_dest, uint label) {
     mp_int_t rel = dest - as->base.code_offset;
     rel |= 1; // to stay in Thumb state when jumping to this address
     #if MICROPY_EMIT_THUMB_ARMV7M
-    rel -= 4 + 4; // adjust for mov_reg_i16 and then PC+4 prefetch of add_reg_reg
+    rel -= 6 + 4; // adjust for mov_reg_i16, sxth_rlo_rlo and then PC+4 prefetch of add_reg_reg
     asm_thumb_mov_reg_i16(as, ASM_THUMB_OP_MOVW, rlo_dest, rel); // 4 bytes
+    asm_thumb_sxth_rlo_rlo(as, rlo_dest, rlo_dest); // 2 bytes
     #else
     rel -= 8 + 4; // adjust for four instructions and then PC+4 prefetch of add_reg_reg
     // 6 bytes

From b6089648041c8899eff0b8e5d0f5620593d4c38c Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 19 May 2022 15:07:31 +1000
Subject: [PATCH 2053/3533] py/emitnative: Simplify generation of code that
 loads prelude pointer.

It's possible to use REG_PARENT_ARG_1 instead of REG_LOCAL_3.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/emitnative.c | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/py/emitnative.c b/py/emitnative.c
index 3507d66213967..6e54bad626f7c 100644
--- a/py/emitnative.c
+++ b/py/emitnative.c
@@ -549,16 +549,11 @@ STATIC void emit_native_start_pass(emit_t *emit, pass_kind_t pass, scope_t *scop
             // Set code_state.ip, a pointer to the beginning of the prelude.  This pointer is found
             // either directly in mp_obj_fun_bc_t.child_table (if there are no children), or in
             // mp_obj_fun_bc_t.child_table[num_children] (if num_children > 0).
-            // Need to use some locals for this, so assert that they are available for use
-            MP_STATIC_ASSERT(REG_LOCAL_3 != REG_PARENT_ARG_1);
-            MP_STATIC_ASSERT(REG_LOCAL_3 != REG_PARENT_ARG_2);
-            MP_STATIC_ASSERT(REG_LOCAL_3 != REG_PARENT_ARG_3);
-            MP_STATIC_ASSERT(REG_LOCAL_3 != REG_PARENT_ARG_4);
-            ASM_LOAD_REG_REG_OFFSET(emit->as, REG_LOCAL_3, REG_PARENT_ARG_1, OFFSETOF_OBJ_FUN_BC_CHILD_TABLE);
+            ASM_LOAD_REG_REG_OFFSET(emit->as, REG_PARENT_ARG_1, REG_PARENT_ARG_1, OFFSETOF_OBJ_FUN_BC_CHILD_TABLE);
             if (emit->prelude_ptr_index != 0) {
-                ASM_LOAD_REG_REG_OFFSET(emit->as, REG_LOCAL_3, REG_LOCAL_3, emit->prelude_ptr_index);
+                ASM_LOAD_REG_REG_OFFSET(emit->as, REG_PARENT_ARG_1, REG_PARENT_ARG_1, emit->prelude_ptr_index);
             }
-            emit_native_mov_state_reg(emit, emit->code_state_start + OFFSETOF_CODE_STATE_IP, REG_LOCAL_3);
+            emit_native_mov_state_reg(emit, emit->code_state_start + OFFSETOF_CODE_STATE_IP, REG_PARENT_ARG_1);
 
             // Set code_state.n_state (only works on little endian targets due to n_state being uint16_t)
             emit_native_mov_state_imm_via(emit, emit->code_state_start + OFFSETOF_CODE_STATE_N_STATE, emit->n_state, REG_ARG_1);

From 7883ae413ddfa6181d784533b236658658383d0c Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 19 May 2022 15:08:45 +1000
Subject: [PATCH 2054/3533] py/emitnative: Provide dedicated local for
 exception unwind handler ptr.

This eliminates the need to save and restore the exception unwind handler
pointer when calling nlr_push.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/emitnative.c | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/py/emitnative.c b/py/emitnative.c
index 6e54bad626f7c..17ad71d3a945e 100644
--- a/py/emitnative.c
+++ b/py/emitnative.c
@@ -63,12 +63,14 @@
 
 // C stack layout for native functions:
 //  0:                          nlr_buf_t [optional]
+//                              exc_handler_unwind [optional word]
 //  emit->code_state_start:     mp_code_state_native_t
 //  emit->stack_start:          Python object stack             | emit->n_state
 //                              locals (reversed, L0 at end)    |
 //
 // C stack layout for native generator functions:
 //  0=emit->stack_start:        nlr_buf_t
+//                              exc_handler_unwind [optional word]
 //
 //  Then REG_GENERATOR_STATE points to:
 //  0=emit->code_state_start:   mp_code_state_native_t
@@ -77,6 +79,7 @@
 //
 // C stack layout for viper functions:
 //  0:                          nlr_buf_t [optional]
+//                              exc_handler_unwind [optional word]
 //  emit->code_state_start:     fun_obj, old_globals [optional]
 //  emit->stack_start:          Python object stack             | emit->n_state
 //                              locals (reversed, L0 at end)    |
@@ -120,6 +123,9 @@
 #define NEED_GLOBAL_EXC_HANDLER(emit) ((emit)->scope->exc_stack_size > 0 \
     || ((emit)->scope->scope_flags & (MP_SCOPE_FLAG_GENERATOR | MP_SCOPE_FLAG_REFGLOBALS)))
 
+// Whether a slot is needed to store LOCAL_IDX_EXC_HANDLER_UNWIND
+#define NEED_EXC_HANDLER_UNWIND(emit) ((emit)->scope->exc_stack_size > 0)
+
 // Whether registers can be used to store locals (only true if there are no
 // exception handlers, because otherwise an nlr_jump will restore registers to
 // their state at the start of the function and updates to locals will be lost)
@@ -128,7 +134,7 @@
 // Indices within the local C stack for various variables
 #define LOCAL_IDX_EXC_VAL(emit) (NLR_BUF_IDX_RET_VAL)
 #define LOCAL_IDX_EXC_HANDLER_PC(emit) (NLR_BUF_IDX_LOCAL_1)
-#define LOCAL_IDX_EXC_HANDLER_UNWIND(emit) (NLR_BUF_IDX_LOCAL_2)
+#define LOCAL_IDX_EXC_HANDLER_UNWIND(emit) (SIZEOF_NLR_BUF) // this needs a dedicated variable outside nlr_buf_t
 #define LOCAL_IDX_RET_VAL(emit) (NLR_BUF_IDX_LOCAL_3)
 #define LOCAL_IDX_FUN_OBJ(emit) ((emit)->code_state_start + OFFSETOF_CODE_STATE_FUN_BC)
 #define LOCAL_IDX_OLD_GLOBALS(emit) ((emit)->code_state_start + OFFSETOF_CODE_STATE_IP)
@@ -403,6 +409,9 @@ STATIC void emit_native_start_pass(emit_t *emit, pass_kind_t pass, scope_t *scop
     emit->code_state_start = 0;
     if (NEED_GLOBAL_EXC_HANDLER(emit)) {
         emit->code_state_start = SIZEOF_NLR_BUF;
+        if (NEED_EXC_HANDLER_UNWIND(emit)) {
+            emit->code_state_start += 1;
+        }
     }
 
     size_t fun_table_off = mp_emit_common_use_const_obj(emit->emit_common, MP_OBJ_FROM_PTR(&mp_fun_table));
@@ -498,11 +507,13 @@ STATIC void emit_native_start_pass(emit_t *emit, pass_kind_t pass, scope_t *scop
         emit->n_state = scope->num_locals + scope->stack_size;
 
         if (emit->scope->scope_flags & MP_SCOPE_FLAG_GENERATOR) {
-            emit->code_state_start = 0;
-            emit->stack_start = SIZEOF_CODE_STATE;
             mp_asm_base_data(&emit->as->base, ASM_WORD_SIZE, (uintptr_t)emit->prelude_ptr_index);
             mp_asm_base_data(&emit->as->base, ASM_WORD_SIZE, (uintptr_t)emit->start_offset);
-            ASM_ENTRY(emit->as, SIZEOF_NLR_BUF);
+            ASM_ENTRY(emit->as, emit->code_state_start);
+
+            // Reset the state size for the state pointed to by REG_GENERATOR_STATE
+            emit->code_state_start = 0;
+            emit->stack_start = SIZEOF_CODE_STATE;
 
             // Put address of code_state into REG_GENERATOR_STATE
             #if N_X86
@@ -1188,14 +1199,12 @@ STATIC void emit_native_global_exc_entry(emit_t *emit) {
 
             // Wrap everything in an nlr context
             emit_native_label_assign(emit, nlr_label);
-            ASM_MOV_REG_LOCAL(emit->as, REG_LOCAL_2, LOCAL_IDX_EXC_HANDLER_UNWIND(emit));
             ASM_MOV_REG_LOCAL_ADDR(emit->as, REG_ARG_1, 0);
             emit_call(emit, MP_F_NLR_PUSH);
             #if N_NLR_SETJMP
             ASM_MOV_REG_LOCAL_ADDR(emit->as, REG_ARG_1, 2);
             emit_call(emit, MP_F_SETJMP);
             #endif
-            ASM_MOV_LOCAL_REG(emit->as, LOCAL_IDX_EXC_HANDLER_UNWIND(emit), REG_LOCAL_2);
             ASM_JUMP_IF_REG_NONZERO(emit->as, REG_RET, global_except_label, true);
 
             // Clear PC of current code block, and jump there to resume execution

From 689138d484dce1e41720c73b1bba3f2758a39c57 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 23 May 2022 10:55:42 +1000
Subject: [PATCH 2055/3533] py/asmthumb: Fix offset variable name in ldr, ldrh
 and strh functions.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/asmthumb.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/py/asmthumb.h b/py/asmthumb.h
index 1a01d20c6914f..6648a80fb9b03 100644
--- a/py/asmthumb.h
+++ b/py/asmthumb.h
@@ -263,8 +263,8 @@ static inline void asm_thumb_str_rlo_rlo_i5(asm_thumb_t *as, uint rlo_src, uint
 static inline void asm_thumb_strb_rlo_rlo_i5(asm_thumb_t *as, uint rlo_src, uint rlo_base, uint byte_offset) {
     asm_thumb_format_9_10(as, ASM_THUMB_FORMAT_9_STR | ASM_THUMB_FORMAT_9_BYTE_TRANSFER, rlo_src, rlo_base, byte_offset);
 }
-static inline void asm_thumb_strh_rlo_rlo_i5(asm_thumb_t *as, uint rlo_src, uint rlo_base, uint byte_offset) {
-    asm_thumb_format_9_10(as, ASM_THUMB_FORMAT_10_STRH, rlo_src, rlo_base, byte_offset);
+static inline void asm_thumb_strh_rlo_rlo_i5(asm_thumb_t *as, uint rlo_src, uint rlo_base, uint uint16_offset) {
+    asm_thumb_format_9_10(as, ASM_THUMB_FORMAT_10_STRH, rlo_src, rlo_base, uint16_offset);
 }
 static inline void asm_thumb_ldr_rlo_rlo_i5(asm_thumb_t *as, uint rlo_dest, uint rlo_base, uint word_offset) {
     asm_thumb_format_9_10(as, ASM_THUMB_FORMAT_9_LDR | ASM_THUMB_FORMAT_9_WORD_TRANSFER, rlo_dest, rlo_base, word_offset);
@@ -272,8 +272,8 @@ static inline void asm_thumb_ldr_rlo_rlo_i5(asm_thumb_t *as, uint rlo_dest, uint
 static inline void asm_thumb_ldrb_rlo_rlo_i5(asm_thumb_t *as, uint rlo_dest, uint rlo_base, uint byte_offset) {
     asm_thumb_format_9_10(as, ASM_THUMB_FORMAT_9_LDR | ASM_THUMB_FORMAT_9_BYTE_TRANSFER, rlo_dest, rlo_base, byte_offset);
 }
-static inline void asm_thumb_ldrh_rlo_rlo_i5(asm_thumb_t *as, uint rlo_dest, uint rlo_base, uint byte_offset) {
-    asm_thumb_format_9_10(as, ASM_THUMB_FORMAT_10_LDRH, rlo_dest, rlo_base, byte_offset);
+static inline void asm_thumb_ldrh_rlo_rlo_i5(asm_thumb_t *as, uint rlo_dest, uint rlo_base, uint uint16_offset) {
+    asm_thumb_format_9_10(as, ASM_THUMB_FORMAT_10_LDRH, rlo_dest, rlo_base, uint16_offset);
 }
 static inline void asm_thumb_lsl_rlo_rlo_i5(asm_thumb_t *as, uint rlo_dest, uint rlo_src, uint shift) {
     asm_thumb_format_1(as, ASM_THUMB_FORMAT_1_LSL, rlo_dest, rlo_src, shift);
@@ -327,7 +327,7 @@ void asm_thumb_mov_reg_local(asm_thumb_t *as, uint rlo_dest, int local_num); //
 void asm_thumb_mov_reg_local_addr(asm_thumb_t *as, uint rlo_dest, int local_num); // convenience
 void asm_thumb_mov_reg_pcrel(asm_thumb_t *as, uint rlo_dest, uint label);
 
-void asm_thumb_ldr_reg_reg_i12_optimised(asm_thumb_t *as, uint reg_dest, uint reg_base, uint byte_offset); // convenience
+void asm_thumb_ldr_reg_reg_i12_optimised(asm_thumb_t *as, uint reg_dest, uint reg_base, uint word_offset); // convenience
 
 void asm_thumb_b_label(asm_thumb_t *as, uint label); // convenience: picks narrow or wide branch
 void asm_thumb_bcc_label(asm_thumb_t *as, int cc, uint label); // convenience: picks narrow or wide branch

From 94ae0231367fe9a63aed10564084ac7d84089216 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 20 May 2022 14:30:09 +1000
Subject: [PATCH 2056/3533] py/asmthumb: Add
 asm_thumb_ldrh_reg_reg_i12_optimised() helper func.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/asmthumb.c | 80 +++++++++++++++++++++++++++++++++------------------
 py/asmthumb.h |  1 +
 2 files changed, 53 insertions(+), 28 deletions(-)

diff --git a/py/asmthumb.c b/py/asmthumb.c
index 04fb823309130..5257884b5cb4b 100644
--- a/py/asmthumb.c
+++ b/py/asmthumb.c
@@ -55,6 +55,9 @@
 
 #define OP_LDR_W_HI(reg_base) (0xf8d0 | (reg_base))
 #define OP_LDR_W_LO(reg_dest, imm12) ((reg_dest) << 12 | (imm12))
+
+#define OP_LDRH_W_HI(reg_base) (0xf8b0 | (reg_base))
+#define OP_LDRH_W_LO(reg_dest, imm12) ((reg_dest) << 12 | (imm12))
 #endif
 
 static inline byte *asm_thumb_get_cur_to_write_bytes(asm_thumb_t *as, int n) {
@@ -449,6 +452,35 @@ static inline void asm_thumb_ldr_reg_reg_i12(asm_thumb_t *as, uint reg_dest, uin
 }
 #endif
 
+#if !MICROPY_EMIT_THUMB_ARMV7M
+// emits code for: reg_dest = reg_base + offset << offset_shift
+static void asm_thumb_add_reg_reg_offset(asm_thumb_t *as, uint reg_dest, uint reg_base, uint offset, uint offset_shift) {
+    if (reg_dest < ASM_THUMB_REG_R8 && reg_base < ASM_THUMB_REG_R8) {
+        if (offset << offset_shift < 256) {
+            if (reg_dest != reg_base) {
+                asm_thumb_mov_reg_reg(as, reg_dest, reg_base);
+            }
+            asm_thumb_add_rlo_i8(as, reg_dest, offset << offset_shift);
+        } else if (UNSIGNED_FIT8(offset) && reg_dest != reg_base) {
+            asm_thumb_mov_rlo_i8(as, reg_dest, offset);
+            asm_thumb_lsl_rlo_rlo_i5(as, reg_dest, reg_dest, offset_shift);
+            asm_thumb_add_rlo_rlo_rlo(as, reg_dest, reg_dest, reg_base);
+        } else if (reg_dest != reg_base) {
+            asm_thumb_mov_rlo_i16(as, reg_dest, offset << offset_shift);
+            asm_thumb_add_rlo_rlo_rlo(as, reg_dest, reg_dest, reg_dest);
+        } else {
+            uint reg_other = reg_dest ^ 7;
+            asm_thumb_op16(as, OP_PUSH_RLIST((1 << reg_other)));
+            asm_thumb_mov_rlo_i16(as, reg_other, offset << offset_shift);
+            asm_thumb_add_rlo_rlo_rlo(as, reg_dest, reg_dest, reg_other);
+            asm_thumb_op16(as, OP_POP_RLIST((1 << reg_other)));
+        }
+    } else {
+        assert(0); // should never be called for ARMV6M
+    }
+}
+#endif
+
 void asm_thumb_ldr_reg_reg_i12_optimised(asm_thumb_t *as, uint reg_dest, uint reg_base, uint word_offset) {
     if (reg_dest < ASM_THUMB_REG_R8 && reg_base < ASM_THUMB_REG_R8 && UNSIGNED_FIT5(word_offset)) {
         asm_thumb_ldr_rlo_rlo_i5(as, reg_dest, reg_base, word_offset);
@@ -456,39 +488,31 @@ void asm_thumb_ldr_reg_reg_i12_optimised(asm_thumb_t *as, uint reg_dest, uint re
         #if MICROPY_EMIT_THUMB_ARMV7M
         asm_thumb_ldr_reg_reg_i12(as, reg_dest, reg_base, word_offset);
         #else
-        word_offset -= 31;
-        if (reg_dest < ASM_THUMB_REG_R8 && reg_base < ASM_THUMB_REG_R8) {
-            if (UNSIGNED_FIT8(word_offset) && (word_offset < 64 || reg_dest != reg_base)) {
-                if (word_offset < 64) {
-                    if (reg_dest != reg_base) {
-                        asm_thumb_mov_reg_reg(as, reg_dest, reg_base);
-                    }
-                    asm_thumb_add_rlo_i8(as, reg_dest, word_offset * 4);
-                } else {
-                    asm_thumb_mov_rlo_i8(as, reg_dest, word_offset);
-                    asm_thumb_lsl_rlo_rlo_i5(as, reg_dest, reg_dest, 2);
-                    asm_thumb_add_rlo_rlo_rlo(as, reg_dest, reg_dest, reg_base);
-                }
-            } else {
-                if (reg_dest != reg_base) {
-                    asm_thumb_mov_rlo_i16(as, reg_dest, word_offset * 4);
-                    asm_thumb_add_rlo_rlo_rlo(as, reg_dest, reg_dest, reg_dest);
-                } else {
-                    uint reg_other = reg_dest ^ 7;
-                    asm_thumb_op16(as, OP_PUSH_RLIST((1 << reg_other)));
-                    asm_thumb_mov_rlo_i16(as, reg_other, word_offset * 4);
-                    asm_thumb_add_rlo_rlo_rlo(as, reg_dest, reg_dest, reg_other);
-                    asm_thumb_op16(as, OP_POP_RLIST((1 << reg_other)));
-                }
-            }
-        } else {
-            assert(0); // should never be called for ARMV6M
-        }
+        asm_thumb_add_reg_reg_offset(as, reg_dest, reg_base, word_offset - 31, 2);
         asm_thumb_ldr_rlo_rlo_i5(as, reg_dest, reg_dest, 31);
         #endif
     }
 }
 
+#if MICROPY_EMIT_THUMB_ARMV7M
+static inline void asm_thumb_ldrh_reg_reg_i12(asm_thumb_t *as, uint reg_dest, uint reg_base, uint uint16_offset) {
+    asm_thumb_op32(as, OP_LDRH_W_HI(reg_base), OP_LDRH_W_LO(reg_dest, uint16_offset * 2));
+}
+#endif
+
+void asm_thumb_ldrh_reg_reg_i12_optimised(asm_thumb_t *as, uint reg_dest, uint reg_base, uint uint16_offset) {
+    if (reg_dest < ASM_THUMB_REG_R8 && reg_base < ASM_THUMB_REG_R8 && UNSIGNED_FIT5(uint16_offset)) {
+        asm_thumb_ldrh_rlo_rlo_i5(as, reg_dest, reg_base, uint16_offset);
+    } else {
+        #if MICROPY_EMIT_THUMB_ARMV7M
+        asm_thumb_ldrh_reg_reg_i12(as, reg_dest, reg_base, uint16_offset);
+        #else
+        asm_thumb_add_reg_reg_offset(as, reg_dest, reg_base, uint16_offset - 31, 1);
+        asm_thumb_ldrh_rlo_rlo_i5(as, reg_dest, reg_dest, 31);
+        #endif
+    }
+}
+
 // this could be wrong, because it should have a range of +/- 16MiB...
 #define OP_BW_HI(byte_offset) (0xf000 | (((byte_offset) >> 12) & 0x07ff))
 #define OP_BW_LO(byte_offset) (0xb800 | (((byte_offset) >> 1) & 0x07ff))
diff --git a/py/asmthumb.h b/py/asmthumb.h
index 6648a80fb9b03..3ef0eb443cafc 100644
--- a/py/asmthumb.h
+++ b/py/asmthumb.h
@@ -328,6 +328,7 @@ void asm_thumb_mov_reg_local_addr(asm_thumb_t *as, uint rlo_dest, int local_num)
 void asm_thumb_mov_reg_pcrel(asm_thumb_t *as, uint rlo_dest, uint label);
 
 void asm_thumb_ldr_reg_reg_i12_optimised(asm_thumb_t *as, uint reg_dest, uint reg_base, uint word_offset); // convenience
+void asm_thumb_ldrh_reg_reg_i12_optimised(asm_thumb_t *as, uint reg_dest, uint reg_base, uint uint16_offset); // convenience
 
 void asm_thumb_b_label(asm_thumb_t *as, uint label); // convenience: picks narrow or wide branch
 void asm_thumb_bcc_label(asm_thumb_t *as, int cc, uint label); // convenience: picks narrow or wide branch

From 8af5e2551fb2605c03e36400003feccb6d1acafd Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 20 May 2022 16:18:09 +1000
Subject: [PATCH 2057/3533] py/asmarm: Add asm_arm_ldrh_reg_reg_offset() helper
 func.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/asmarm.c | 5 +++++
 py/asmarm.h | 1 +
 2 files changed, 6 insertions(+)

diff --git a/py/asmarm.c b/py/asmarm.c
index 4ba93d0806eaa..42724e4d4b37c 100644
--- a/py/asmarm.c
+++ b/py/asmarm.c
@@ -304,6 +304,11 @@ void asm_arm_ldrh_reg_reg(asm_arm_t *as, uint rd, uint rn) {
     emit_al(as, 0x1d000b0 | (rn << 16) | (rd << 12));
 }
 
+void asm_arm_ldrh_reg_reg_offset(asm_arm_t *as, uint rd, uint rn, uint byte_offset) {
+    // ldrh rd, [rn, #off]
+    emit_al(as, 0x1f000b0 | (rn << 16) | (rd << 12) | ((byte_offset & 0xf0) << 4) | (byte_offset & 0xf));
+}
+
 void asm_arm_ldrb_reg_reg(asm_arm_t *as, uint rd, uint rn) {
     // ldrb rd, [rn]
     emit_al(as, 0x5d00000 | (rn << 16) | (rd << 12));
diff --git a/py/asmarm.h b/py/asmarm.h
index 0e029f20e9d74..272684bc66936 100644
--- a/py/asmarm.h
+++ b/py/asmarm.h
@@ -109,6 +109,7 @@ void asm_arm_asr_reg_reg(asm_arm_t *as, uint rd, uint rs);
 // memory
 void asm_arm_ldr_reg_reg(asm_arm_t *as, uint rd, uint rn, uint byte_offset);
 void asm_arm_ldrh_reg_reg(asm_arm_t *as, uint rd, uint rn);
+void asm_arm_ldrh_reg_reg_offset(asm_arm_t *as, uint rd, uint rn, uint byte_offset);
 void asm_arm_ldrb_reg_reg(asm_arm_t *as, uint rd, uint rn);
 void asm_arm_str_reg_reg(asm_arm_t *as, uint rd, uint rm, uint byte_offset);
 void asm_arm_strh_reg_reg(asm_arm_t *as, uint rd, uint rm);

From 94955e8e3d7c6ca264c72218fdfc8e4716bb693f Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 20 May 2022 14:30:30 +1000
Subject: [PATCH 2058/3533] py/asm: Add ASM_LOAD16_REG_REG_OFFSET macro for
 load-u16 with offset.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/asmarm.h    | 1 +
 py/asmthumb.h  | 1 +
 py/asmx64.h    | 1 +
 py/asmx86.h    | 1 +
 py/asmxtensa.h | 1 +
 5 files changed, 5 insertions(+)

diff --git a/py/asmarm.h b/py/asmarm.h
index 272684bc66936..561d69a4b10a7 100644
--- a/py/asmarm.h
+++ b/py/asmarm.h
@@ -204,6 +204,7 @@ void asm_arm_bx_reg(asm_arm_t *as, uint reg_src);
 #define ASM_LOAD_REG_REG_OFFSET(as, reg_dest, reg_base, word_offset) asm_arm_ldr_reg_reg((as), (reg_dest), (reg_base), 4 * (word_offset))
 #define ASM_LOAD8_REG_REG(as, reg_dest, reg_base) asm_arm_ldrb_reg_reg((as), (reg_dest), (reg_base))
 #define ASM_LOAD16_REG_REG(as, reg_dest, reg_base) asm_arm_ldrh_reg_reg((as), (reg_dest), (reg_base))
+#define ASM_LOAD16_REG_REG_OFFSET(as, reg_dest, reg_base, uint16_offset) asm_arm_ldrh_reg_reg_offset((as), (reg_dest), (reg_base), 2 * (uint16_offset))
 #define ASM_LOAD32_REG_REG(as, reg_dest, reg_base) asm_arm_ldr_reg_reg((as), (reg_dest), (reg_base), 0)
 
 #define ASM_STORE_REG_REG(as, reg_value, reg_base) asm_arm_str_reg_reg((as), (reg_value), (reg_base), 0)
diff --git a/py/asmthumb.h b/py/asmthumb.h
index 3ef0eb443cafc..32086199984df 100644
--- a/py/asmthumb.h
+++ b/py/asmthumb.h
@@ -415,6 +415,7 @@ void asm_thumb_b_rel12(asm_thumb_t *as, int rel);
 #define ASM_LOAD_REG_REG_OFFSET(as, reg_dest, reg_base, word_offset) asm_thumb_ldr_reg_reg_i12_optimised((as), (reg_dest), (reg_base), (word_offset))
 #define ASM_LOAD8_REG_REG(as, reg_dest, reg_base) asm_thumb_ldrb_rlo_rlo_i5((as), (reg_dest), (reg_base), 0)
 #define ASM_LOAD16_REG_REG(as, reg_dest, reg_base) asm_thumb_ldrh_rlo_rlo_i5((as), (reg_dest), (reg_base), 0)
+#define ASM_LOAD16_REG_REG_OFFSET(as, reg_dest, reg_base, uint16_offset) asm_thumb_ldrh_reg_reg_i12_optimised((as), (reg_dest), (reg_base), (uint16_offset))
 #define ASM_LOAD32_REG_REG(as, reg_dest, reg_base) asm_thumb_ldr_rlo_rlo_i5((as), (reg_dest), (reg_base), 0)
 
 #define ASM_STORE_REG_REG(as, reg_src, reg_base) asm_thumb_str_rlo_rlo_i5((as), (reg_src), (reg_base), 0)
diff --git a/py/asmx64.h b/py/asmx64.h
index 1a4987f5cbbaf..d132ee193cf7d 100644
--- a/py/asmx64.h
+++ b/py/asmx64.h
@@ -207,6 +207,7 @@ void asm_x64_call_ind(asm_x64_t *as, size_t fun_id, int temp_r32);
 #define ASM_LOAD_REG_REG_OFFSET(as, reg_dest, reg_base, word_offset) asm_x64_mov_mem64_to_r64((as), (reg_base), 8 * (word_offset), (reg_dest))
 #define ASM_LOAD8_REG_REG(as, reg_dest, reg_base) asm_x64_mov_mem8_to_r64zx((as), (reg_base), 0, (reg_dest))
 #define ASM_LOAD16_REG_REG(as, reg_dest, reg_base) asm_x64_mov_mem16_to_r64zx((as), (reg_base), 0, (reg_dest))
+#define ASM_LOAD16_REG_REG_OFFSET(as, reg_dest, reg_base, uint16_offset) asm_x64_mov_mem16_to_r64zx((as), (reg_base), 2 * (uint16_offset), (reg_dest))
 #define ASM_LOAD32_REG_REG(as, reg_dest, reg_base) asm_x64_mov_mem32_to_r64zx((as), (reg_base), 0, (reg_dest))
 
 #define ASM_STORE_REG_REG(as, reg_src, reg_base) asm_x64_mov_r64_to_mem64((as), (reg_src), (reg_base), 0)
diff --git a/py/asmx86.h b/py/asmx86.h
index 8f1b06d220e83..e02e6c95457c2 100644
--- a/py/asmx86.h
+++ b/py/asmx86.h
@@ -202,6 +202,7 @@ void asm_x86_call_ind(asm_x86_t *as, size_t fun_id, mp_uint_t n_args, int temp_r
 #define ASM_LOAD_REG_REG_OFFSET(as, reg_dest, reg_base, word_offset) asm_x86_mov_mem32_to_r32((as), (reg_base), 4 * (word_offset), (reg_dest))
 #define ASM_LOAD8_REG_REG(as, reg_dest, reg_base) asm_x86_mov_mem8_to_r32zx((as), (reg_base), 0, (reg_dest))
 #define ASM_LOAD16_REG_REG(as, reg_dest, reg_base) asm_x86_mov_mem16_to_r32zx((as), (reg_base), 0, (reg_dest))
+#define ASM_LOAD16_REG_REG_OFFSET(as, reg_dest, reg_base, uint16_offset) asm_x86_mov_mem16_to_r32zx((as), (reg_base), 2 * (uint16_offset), (reg_dest))
 #define ASM_LOAD32_REG_REG(as, reg_dest, reg_base) asm_x86_mov_mem32_to_r32((as), (reg_base), 0, (reg_dest))
 
 #define ASM_STORE_REG_REG(as, reg_src, reg_base) asm_x86_mov_r32_to_mem32((as), (reg_src), (reg_base), 0)
diff --git a/py/asmxtensa.h b/py/asmxtensa.h
index 16a59c0ee0244..5aa86d3b24411 100644
--- a/py/asmxtensa.h
+++ b/py/asmxtensa.h
@@ -398,6 +398,7 @@ void asm_xtensa_call_ind_win(asm_xtensa_t *as, uint idx);
 #define ASM_LOAD_REG_REG_OFFSET(as, reg_dest, reg_base, word_offset) asm_xtensa_l32i_optimised((as), (reg_dest), (reg_base), (word_offset))
 #define ASM_LOAD8_REG_REG(as, reg_dest, reg_base) asm_xtensa_op_l8ui((as), (reg_dest), (reg_base), 0)
 #define ASM_LOAD16_REG_REG(as, reg_dest, reg_base) asm_xtensa_op_l16ui((as), (reg_dest), (reg_base), 0)
+#define ASM_LOAD16_REG_REG_OFFSET(as, reg_dest, reg_base, uint16_offset) asm_xtensa_op_l16ui((as), (reg_dest), (reg_base), (uint16_offset))
 #define ASM_LOAD32_REG_REG(as, reg_dest, reg_base) asm_xtensa_op_l32i_n((as), (reg_dest), (reg_base), 0)
 
 #define ASM_STORE_REG_REG_OFFSET(as, reg_dest, reg_base, word_offset) asm_xtensa_s32i_optimised((as), (reg_dest), (reg_base), (word_offset))

From d4d53e9e114d779523e382c4ea38f0398e880aae Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 20 May 2022 14:31:56 +1000
Subject: [PATCH 2059/3533] py/emitnative: Access qstr values using indirection
 table qstr_table.

This changes the native emitter to access qstr values using the qstr
indirection table qstr_table, but only when generating native code that
will be saved to a .mpy file.  This makes the resulting native code fully
static, ie it does not require any fix-ups or rewriting when it is
imported.

The performance of native code is more or less unchanged.  Benchmark
results on PYBv1.0 (using --via-mpy and --emit native) are:

N=100 M=100          baseline -> this-commit     diff      diff% (error%)
bm_chaos.py            407.16 ->     411.85 :   +4.69 =  +1.152% (+/-0.01%)
bm_fannkuch.py         100.89 ->     101.20 :   +0.31 =  +0.307% (+/-0.01%)
bm_fft.py             3521.17 ->    3441.72 :  -79.45 =  -2.256% (+/-0.00%)
bm_float.py           6707.29 ->    6644.83 :  -62.46 =  -0.931% (+/-0.00%)
bm_hexiom.py            55.91 ->      55.41 :   -0.50 =  -0.894% (+/-0.00%)
bm_nqueens.py         5343.54 ->    5326.17 :  -17.37 =  -0.325% (+/-0.00%)
bm_pidigits.py         603.89 ->     632.79 :  +28.90 =  +4.786% (+/-0.33%)
core_qstr.py            64.18 ->      64.09 :   -0.09 =  -0.140% (+/-0.01%)
core_yield_from.py     313.61 ->     311.11 :   -2.50 =  -0.797% (+/-0.03%)
misc_aes.py            654.29 ->     659.75 :   +5.46 =  +0.834% (+/-0.02%)
misc_mandel.py        4205.10 ->    4272.08 :  +66.98 =  +1.593% (+/-0.01%)
misc_pystone.py       3077.79 ->    3128.39 :  +50.60 =  +1.644% (+/-0.01%)
misc_raytrace.py       388.45 ->     393.71 :   +5.26 =  +1.354% (+/-0.01%)
viper_call0.py         576.83 ->     566.76 :  -10.07 =  -1.746% (+/-0.05%)
viper_call1a.py        550.39 ->     540.12 :  -10.27 =  -1.866% (+/-0.11%)
viper_call1b.py        438.32 ->     432.09 :   -6.23 =  -1.421% (+/-0.11%)
viper_call1c.py        442.96 ->     436.11 :   -6.85 =  -1.546% (+/-0.08%)
viper_call2a.py        536.31 ->     527.37 :   -8.94 =  -1.667% (+/-0.04%)
viper_call2b.py        378.99 ->     377.50 :   -1.49 =  -0.393% (+/-0.08%)

Signed-off-by: Damien George <damien@micropython.org>
---
 py/compile.c        |   2 +-
 py/emitglue.c       |   3 --
 py/emitglue.h       |   8 ---
 py/emitnarm.c       |   2 -
 py/emitnative.c     | 125 +++++++++++++++++++++++---------------------
 py/emitnthumb.c     |   2 -
 py/emitnx64.c       |   2 -
 py/emitnx86.c       |   2 -
 py/emitnxtensa.c    |   2 -
 py/emitnxtensawin.c |   2 -
 py/persistentcode.c |  42 +--------------
 tools/mpy-tool.py   |  69 ++++--------------------
 12 files changed, 75 insertions(+), 186 deletions(-)

diff --git a/py/compile.c b/py/compile.c
index 7852b68ef1632..4dee9eff79b6d 100644
--- a/py/compile.c
+++ b/py/compile.c
@@ -3323,7 +3323,7 @@ STATIC void compile_scope_inline_asm(compiler_t *comp, scope_t *scope, pass_kind
                 NULL,
                 #if MICROPY_PERSISTENT_CODE_SAVE
                 0,
-                0, 0, NULL,
+                0,
                 #endif
                 0, comp->scope_cur->num_pos_args, type_sig);
         }
diff --git a/py/emitglue.c b/py/emitglue.c
index cd902838af7af..95be7f661abed 100644
--- a/py/emitglue.c
+++ b/py/emitglue.c
@@ -101,7 +101,6 @@ void mp_emit_glue_assign_native(mp_raw_code_t *rc, mp_raw_code_kind_t kind, void
     #if MICROPY_PERSISTENT_CODE_SAVE
     size_t n_children,
     uint16_t prelude_offset,
-    uint16_t n_qstr, mp_qstr_link_entry_t *qstr_link,
     #endif
     mp_uint_t scope_flags, mp_uint_t n_pos_args, mp_uint_t type_sig) {
 
@@ -144,8 +143,6 @@ void mp_emit_glue_assign_native(mp_raw_code_t *rc, mp_raw_code_kind_t kind, void
     #if MICROPY_PERSISTENT_CODE_SAVE
     rc->n_children = n_children;
     rc->prelude_offset = prelude_offset;
-    rc->n_qstr = n_qstr;
-    rc->qstr_link = qstr_link;
     #endif
 
     // These two entries are only needed for MP_CODE_NATIVE_ASM.
diff --git a/py/emitglue.h b/py/emitglue.h
index 9a22a9321874d..4ddf74011fa70 100644
--- a/py/emitglue.h
+++ b/py/emitglue.h
@@ -49,11 +49,6 @@ typedef enum {
     MP_CODE_NATIVE_ASM,
 } mp_raw_code_kind_t;
 
-typedef struct _mp_qstr_link_entry_t {
-    uint16_t off;
-    uint16_t qst;
-} mp_qstr_link_entry_t;
-
 // compiled bytecode: instance in RAM, referenced by outer scope, usually freed after first (and only) use
 // mpy file: instance in RAM, created when .mpy file is loaded (same comments as above)
 // frozen: instance in ROM
@@ -78,8 +73,6 @@ typedef struct _mp_raw_code_t {
     #endif
     #if MICROPY_EMIT_MACHINE_CODE
     uint16_t prelude_offset;
-    uint16_t n_qstr;
-    mp_qstr_link_entry_t *qstr_link;
     #endif
     #endif
     #if MICROPY_EMIT_MACHINE_CODE
@@ -104,7 +97,6 @@ void mp_emit_glue_assign_native(mp_raw_code_t *rc, mp_raw_code_kind_t kind, void
     #if MICROPY_PERSISTENT_CODE_SAVE
     size_t n_children,
     uint16_t prelude_offset,
-    uint16_t n_qstr, mp_qstr_link_entry_t *qstr_link,
     #endif
     mp_uint_t scope_flags, mp_uint_t n_pos_args, mp_uint_t type_sig);
 
diff --git a/py/emitnarm.c b/py/emitnarm.c
index 8297ad61921a8..59075b6074a6a 100644
--- a/py/emitnarm.c
+++ b/py/emitnarm.c
@@ -10,8 +10,6 @@
 
 // Word indices of REG_LOCAL_x in nlr_buf_t
 #define NLR_BUF_IDX_LOCAL_1 (3) // r4
-#define NLR_BUF_IDX_LOCAL_2 (4) // r5
-#define NLR_BUF_IDX_LOCAL_3 (5) // r6
 
 #define N_ARM (1)
 #define EXPORT_FUN(name) emit_native_arm_##name
diff --git a/py/emitnative.c b/py/emitnative.c
index 17ad71d3a945e..5effda9a8981c 100644
--- a/py/emitnative.c
+++ b/py/emitnative.c
@@ -63,6 +63,7 @@
 
 // C stack layout for native functions:
 //  0:                          nlr_buf_t [optional]
+//                              return_value [optional word]
 //                              exc_handler_unwind [optional word]
 //  emit->code_state_start:     mp_code_state_native_t
 //  emit->stack_start:          Python object stack             | emit->n_state
@@ -70,6 +71,7 @@
 //
 // C stack layout for native generator functions:
 //  0=emit->stack_start:        nlr_buf_t
+//                              return_value
 //                              exc_handler_unwind [optional word]
 //
 //  Then REG_GENERATOR_STATE points to:
@@ -79,6 +81,7 @@
 //
 // C stack layout for viper functions:
 //  0:                          nlr_buf_t [optional]
+//                              return_value [optional word]
 //                              exc_handler_unwind [optional word]
 //  emit->code_state_start:     fun_obj, old_globals [optional]
 //  emit->stack_start:          Python object stack             | emit->n_state
@@ -100,6 +103,7 @@
 #define OFFSETOF_OBJ_FUN_BC_CONTEXT (offsetof(mp_obj_fun_bc_t, context) / sizeof(uintptr_t))
 #define OFFSETOF_OBJ_FUN_BC_CHILD_TABLE (offsetof(mp_obj_fun_bc_t, child_table) / sizeof(uintptr_t))
 #define OFFSETOF_OBJ_FUN_BC_BYTECODE (offsetof(mp_obj_fun_bc_t, bytecode) / sizeof(uintptr_t))
+#define OFFSETOF_MODULE_CONTEXT_QSTR_TABLE (offsetof(mp_module_context_t, constants.qstr_table) / sizeof(uintptr_t))
 #define OFFSETOF_MODULE_CONTEXT_OBJ_TABLE (offsetof(mp_module_context_t, constants.obj_table) / sizeof(uintptr_t))
 #define OFFSETOF_MODULE_CONTEXT_GLOBALS (offsetof(mp_module_context_t, module.globals) / sizeof(uintptr_t))
 
@@ -134,14 +138,41 @@
 // Indices within the local C stack for various variables
 #define LOCAL_IDX_EXC_VAL(emit) (NLR_BUF_IDX_RET_VAL)
 #define LOCAL_IDX_EXC_HANDLER_PC(emit) (NLR_BUF_IDX_LOCAL_1)
-#define LOCAL_IDX_EXC_HANDLER_UNWIND(emit) (SIZEOF_NLR_BUF) // this needs a dedicated variable outside nlr_buf_t
-#define LOCAL_IDX_RET_VAL(emit) (NLR_BUF_IDX_LOCAL_3)
+#define LOCAL_IDX_EXC_HANDLER_UNWIND(emit) (SIZEOF_NLR_BUF + 1) // this needs a dedicated variable outside nlr_buf_t
+#define LOCAL_IDX_RET_VAL(emit) (SIZEOF_NLR_BUF) // needed when NEED_GLOBAL_EXC_HANDLER is true
 #define LOCAL_IDX_FUN_OBJ(emit) ((emit)->code_state_start + OFFSETOF_CODE_STATE_FUN_BC)
 #define LOCAL_IDX_OLD_GLOBALS(emit) ((emit)->code_state_start + OFFSETOF_CODE_STATE_IP)
 #define LOCAL_IDX_GEN_PC(emit) ((emit)->code_state_start + OFFSETOF_CODE_STATE_IP)
 #define LOCAL_IDX_LOCAL_VAR(emit, local_num) ((emit)->stack_start + (emit)->n_state - 1 - (local_num))
 
+#if MICROPY_PERSISTENT_CODE_SAVE
+
+// When building with the ability to save native code to .mpy files:
+//  - Qstrs are indirect via qstr_table, and REG_LOCAL_3 always points to qstr_table.
+//  - In a generator no registers are used to store locals, and REG_LOCAL_2 points to the generator state.
+//  - At most 2 registers hold local variables (see CAN_USE_REGS_FOR_LOCALS for when this is possible).
+
+#define REG_GENERATOR_STATE (REG_LOCAL_2)
+#define REG_QSTR_TABLE (REG_LOCAL_3)
+#define MAX_REGS_FOR_LOCAL_VARS (2)
+
+STATIC const uint8_t reg_local_table[MAX_REGS_FOR_LOCAL_VARS] = {REG_LOCAL_1, REG_LOCAL_2};
+
+#else
+
+// When building without the ability to save native code to .mpy files:
+//  - Qstrs values are written directly into the machine code.
+//  - In a generator no registers are used to store locals, and REG_LOCAL_3 points to the generator state.
+//  - At most 3 registers hold local variables (see CAN_USE_REGS_FOR_LOCALS for when this is possible).
+
 #define REG_GENERATOR_STATE (REG_LOCAL_3)
+#define MAX_REGS_FOR_LOCAL_VARS (3)
+
+STATIC const uint8_t reg_local_table[MAX_REGS_FOR_LOCAL_VARS] = {REG_LOCAL_1, REG_LOCAL_2, REG_LOCAL_3};
+
+#endif
+
+#define REG_LOCAL_LAST (reg_local_table[MAX_REGS_FOR_LOCAL_VARS - 1])
 
 #define EMIT_NATIVE_VIPER_TYPE_ERROR(emit, ...) do { \
         *emit->error_slot = mp_obj_new_exception_msg_varg(&mp_type_ViperTypeError, __VA_ARGS__); \
@@ -245,11 +276,6 @@ struct _emit_t {
     uint16_t n_info;
     uint16_t n_cell;
 
-    #if MICROPY_PERSISTENT_CODE_SAVE
-    uint16_t qstr_link_cur;
-    mp_qstr_link_entry_t *qstr_link;
-    #endif
-
     bool last_emit_was_return_value;
 
     scope_t *scope;
@@ -257,8 +283,7 @@ struct _emit_t {
     ASM_T *as;
 };
 
-STATIC const uint8_t reg_local_table[REG_LOCAL_NUM] = {REG_LOCAL_1, REG_LOCAL_2, REG_LOCAL_3};
-
+STATIC void emit_load_reg_with_object(emit_t *emit, int reg, mp_obj_t obj);
 STATIC void emit_native_global_exc_entry(emit_t *emit);
 STATIC void emit_native_global_exc_exit(emit_t *emit);
 STATIC void emit_native_load_const_obj(emit_t *emit, mp_obj_t obj);
@@ -319,12 +344,7 @@ STATIC void emit_native_mov_reg_state_addr(emit_t *emit, int reg_dest, int local
 
 STATIC void emit_native_mov_reg_qstr(emit_t *emit, int arg_reg, qstr qst) {
     #if MICROPY_PERSISTENT_CODE_SAVE
-    size_t loc = ASM_MOV_REG_IMM_FIX_U16(emit->as, arg_reg, qst);
-    size_t link_idx = emit->qstr_link_cur++;
-    if (emit->pass == MP_PASS_EMIT) {
-        emit->qstr_link[link_idx].off = loc << 2 | 1;
-        emit->qstr_link[link_idx].qst = qst;
-    }
+    ASM_LOAD16_REG_REG_OFFSET(emit->as, arg_reg, REG_QSTR_TABLE, mp_emit_common_use_qstr(emit->emit_common, qst));
     #else
     ASM_MOV_REG_IMM(emit->as, arg_reg, qst);
     #endif
@@ -332,12 +352,7 @@ STATIC void emit_native_mov_reg_qstr(emit_t *emit, int arg_reg, qstr qst) {
 
 STATIC void emit_native_mov_reg_qstr_obj(emit_t *emit, int reg_dest, qstr qst) {
     #if MICROPY_PERSISTENT_CODE_SAVE
-    size_t loc = ASM_MOV_REG_IMM_FIX_WORD(emit->as, reg_dest, (mp_uint_t)MP_OBJ_NEW_QSTR(qst));
-    size_t link_idx = emit->qstr_link_cur++;
-    if (emit->pass == MP_PASS_EMIT) {
-        emit->qstr_link[link_idx].off = loc << 2 | 2;
-        emit->qstr_link[link_idx].qst = qst;
-    }
+    emit_load_reg_with_object(emit, reg_dest, MP_OBJ_NEW_QSTR(qst));
     #else
     ASM_MOV_REG_IMM(emit->as, reg_dest, (mp_uint_t)MP_OBJ_NEW_QSTR(qst));
     #endif
@@ -355,9 +370,6 @@ STATIC void emit_native_start_pass(emit_t *emit, pass_kind_t pass, scope_t *scop
     emit->pass = pass;
     emit->do_viper_types = scope->emit_options == MP_EMIT_OPT_VIPER;
     emit->stack_size = 0;
-    #if MICROPY_PERSISTENT_CODE_SAVE
-    emit->qstr_link_cur = 0;
-    #endif
     emit->last_emit_was_return_value = false;
     emit->scope = scope;
 
@@ -408,7 +420,8 @@ STATIC void emit_native_start_pass(emit_t *emit, pass_kind_t pass, scope_t *scop
     // Work out start of code state (mp_code_state_native_t or reduced version for viper)
     emit->code_state_start = 0;
     if (NEED_GLOBAL_EXC_HANDLER(emit)) {
-        emit->code_state_start = SIZEOF_NLR_BUF;
+        emit->code_state_start = SIZEOF_NLR_BUF; // for nlr_buf_t
+        emit->code_state_start += 1;  // for return_value
         if (NEED_EXC_HANDLER_UNWIND(emit)) {
             emit->code_state_start += 1;
         }
@@ -423,11 +436,11 @@ STATIC void emit_native_start_pass(emit_t *emit, pass_kind_t pass, scope_t *scop
         int num_locals_in_regs = 0;
         if (CAN_USE_REGS_FOR_LOCALS(emit)) {
             num_locals_in_regs = scope->num_locals;
-            if (num_locals_in_regs > REG_LOCAL_NUM) {
-                num_locals_in_regs = REG_LOCAL_NUM;
+            if (num_locals_in_regs > MAX_REGS_FOR_LOCAL_VARS) {
+                num_locals_in_regs = MAX_REGS_FOR_LOCAL_VARS;
             }
-            // Need a spot for REG_LOCAL_3 if 4 or more args (see below)
-            if (scope->num_pos_args >= 4) {
+            // Need a spot for REG_LOCAL_LAST (see below)
+            if (scope->num_pos_args >= MAX_REGS_FOR_LOCAL_VARS + 1) {
                 --num_locals_in_regs;
             }
         }
@@ -452,6 +465,9 @@ STATIC void emit_native_start_pass(emit_t *emit, pass_kind_t pass, scope_t *scop
 
         // Load REG_FUN_TABLE with a pointer to mp_fun_table, found in the const_table
         ASM_LOAD_REG_REG_OFFSET(emit->as, REG_FUN_TABLE, REG_PARENT_ARG_1, OFFSETOF_OBJ_FUN_BC_CONTEXT);
+        #if MICROPY_PERSISTENT_CODE_SAVE
+        ASM_LOAD_REG_REG_OFFSET(emit->as, REG_QSTR_TABLE, REG_FUN_TABLE, OFFSETOF_MODULE_CONTEXT_QSTR_TABLE);
+        #endif
         ASM_LOAD_REG_REG_OFFSET(emit->as, REG_FUN_TABLE, REG_FUN_TABLE, OFFSETOF_MODULE_CONTEXT_OBJ_TABLE);
         ASM_LOAD_REG_REG_OFFSET(emit->as, REG_FUN_TABLE, REG_FUN_TABLE, fun_table_off);
 
@@ -460,15 +476,15 @@ STATIC void emit_native_start_pass(emit_t *emit, pass_kind_t pass, scope_t *scop
             ASM_MOV_LOCAL_REG(emit->as, LOCAL_IDX_FUN_OBJ(emit), REG_PARENT_ARG_1);
         }
 
-        // Put n_args in REG_ARG_1, n_kw in REG_ARG_2, args array in REG_LOCAL_3
+        // Put n_args in REG_ARG_1, n_kw in REG_ARG_2, args array in REG_LOCAL_LAST
         #if N_X86
         asm_x86_mov_arg_to_r32(emit->as, 1, REG_ARG_1);
         asm_x86_mov_arg_to_r32(emit->as, 2, REG_ARG_2);
-        asm_x86_mov_arg_to_r32(emit->as, 3, REG_LOCAL_3);
+        asm_x86_mov_arg_to_r32(emit->as, 3, REG_LOCAL_LAST);
         #else
         ASM_MOV_REG_REG(emit->as, REG_ARG_1, REG_PARENT_ARG_2);
         ASM_MOV_REG_REG(emit->as, REG_ARG_2, REG_PARENT_ARG_3);
-        ASM_MOV_REG_REG(emit->as, REG_LOCAL_3, REG_PARENT_ARG_4);
+        ASM_MOV_REG_REG(emit->as, REG_LOCAL_LAST, REG_PARENT_ARG_4);
         #endif
 
         // Check number of args matches this function, and call mp_arg_check_num_sig if not
@@ -483,21 +499,21 @@ STATIC void emit_native_start_pass(emit_t *emit, pass_kind_t pass, scope_t *scop
         // Store arguments into locals (reg or stack), converting to native if needed
         for (int i = 0; i < emit->scope->num_pos_args; i++) {
             int r = REG_ARG_1;
-            ASM_LOAD_REG_REG_OFFSET(emit->as, REG_ARG_1, REG_LOCAL_3, i);
+            ASM_LOAD_REG_REG_OFFSET(emit->as, REG_ARG_1, REG_LOCAL_LAST, i);
             if (emit->local_vtype[i] != VTYPE_PYOBJ) {
                 emit_call_with_imm_arg(emit, MP_F_CONVERT_OBJ_TO_NATIVE, emit->local_vtype[i], REG_ARG_2);
                 r = REG_RET;
             }
-            // REG_LOCAL_3 points to the args array so be sure not to overwrite it if it's still needed
-            if (i < REG_LOCAL_NUM && CAN_USE_REGS_FOR_LOCALS(emit) && (i != 2 || emit->scope->num_pos_args == 3)) {
+            // REG_LOCAL_LAST points to the args array so be sure not to overwrite it if it's still needed
+            if (i < MAX_REGS_FOR_LOCAL_VARS && CAN_USE_REGS_FOR_LOCALS(emit) && (i != MAX_REGS_FOR_LOCAL_VARS - 1 || emit->scope->num_pos_args == MAX_REGS_FOR_LOCAL_VARS)) {
                 ASM_MOV_REG_REG(emit->as, reg_local_table[i], r);
             } else {
                 emit_native_mov_state_reg(emit, LOCAL_IDX_LOCAL_VAR(emit, i), r);
             }
         }
-        // Get 3rd local from the stack back into REG_LOCAL_3 if this reg couldn't be written to above
-        if (emit->scope->num_pos_args >= 4 && CAN_USE_REGS_FOR_LOCALS(emit)) {
-            ASM_MOV_REG_LOCAL(emit->as, REG_LOCAL_3, LOCAL_IDX_LOCAL_VAR(emit, 2));
+        // Get local from the stack back into REG_LOCAL_LAST if this reg couldn't be written to above
+        if (emit->scope->num_pos_args >= MAX_REGS_FOR_LOCAL_VARS + 1 && CAN_USE_REGS_FOR_LOCALS(emit)) {
+            ASM_MOV_REG_LOCAL(emit->as, REG_LOCAL_LAST, LOCAL_IDX_LOCAL_VAR(emit, MAX_REGS_FOR_LOCAL_VARS - 1));
         }
 
         emit_native_global_exc_entry(emit);
@@ -531,6 +547,9 @@ STATIC void emit_native_start_pass(emit_t *emit, pass_kind_t pass, scope_t *scop
             // Load REG_FUN_TABLE with a pointer to mp_fun_table, found in the const_table
             ASM_LOAD_REG_REG_OFFSET(emit->as, REG_TEMP0, REG_GENERATOR_STATE, LOCAL_IDX_FUN_OBJ(emit));
             ASM_LOAD_REG_REG_OFFSET(emit->as, REG_TEMP0, REG_TEMP0, OFFSETOF_OBJ_FUN_BC_CONTEXT);
+            #if MICROPY_PERSISTENT_CODE_SAVE
+            ASM_LOAD_REG_REG_OFFSET(emit->as, REG_QSTR_TABLE, REG_TEMP0, OFFSETOF_MODULE_CONTEXT_QSTR_TABLE);
+            #endif
             ASM_LOAD_REG_REG_OFFSET(emit->as, REG_TEMP0, REG_TEMP0, OFFSETOF_MODULE_CONTEXT_OBJ_TABLE);
             ASM_LOAD_REG_REG_OFFSET(emit->as, REG_FUN_TABLE, REG_TEMP0, fun_table_off);
         } else {
@@ -551,6 +570,9 @@ STATIC void emit_native_start_pass(emit_t *emit, pass_kind_t pass, scope_t *scop
 
             // Load REG_FUN_TABLE with a pointer to mp_fun_table, found in the const_table
             ASM_LOAD_REG_REG_OFFSET(emit->as, REG_FUN_TABLE, REG_PARENT_ARG_1, OFFSETOF_OBJ_FUN_BC_CONTEXT);
+            #if MICROPY_PERSISTENT_CODE_SAVE
+            ASM_LOAD_REG_REG_OFFSET(emit->as, REG_QSTR_TABLE, REG_FUN_TABLE, OFFSETOF_MODULE_CONTEXT_QSTR_TABLE);
+            #endif
             ASM_LOAD_REG_REG_OFFSET(emit->as, REG_FUN_TABLE, REG_FUN_TABLE, OFFSETOF_MODULE_CONTEXT_OBJ_TABLE);
             ASM_LOAD_REG_REG_OFFSET(emit->as, REG_FUN_TABLE, REG_FUN_TABLE, fun_table_off);
 
@@ -597,7 +619,7 @@ STATIC void emit_native_start_pass(emit_t *emit, pass_kind_t pass, scope_t *scop
 
         // cache some locals in registers, but only if no exception handlers
         if (CAN_USE_REGS_FOR_LOCALS(emit)) {
-            for (int i = 0; i < REG_LOCAL_NUM && i < scope->num_locals; ++i) {
+            for (int i = 0; i < MAX_REGS_FOR_LOCAL_VARS && i < scope->num_locals; ++i) {
                 ASM_MOV_REG_LOCAL(emit->as, reg_local_table[i], LOCAL_IDX_LOCAL_VAR(emit, i));
             }
         }
@@ -670,16 +692,6 @@ STATIC bool emit_native_end_pass(emit_t *emit) {
     assert(emit->stack_size == 0);
     assert(emit->exc_stack_size == 0);
 
-    #if MICROPY_PERSISTENT_CODE_SAVE
-    // Allocate qstr_link table if needed
-    if (emit->pass == MP_PASS_CODE_SIZE) {
-        size_t qstr_link_alloc = emit->qstr_link_cur;
-        if (qstr_link_alloc > 0) {
-            emit->qstr_link = m_new(mp_qstr_link_entry_t, qstr_link_alloc);
-        }
-    }
-    #endif
-
     if (emit->pass == MP_PASS_EMIT) {
         void *f = mp_asm_base_get_code(&emit->as->base);
         mp_uint_t f_len = mp_asm_base_get_code_size(&emit->as->base);
@@ -714,7 +726,6 @@ STATIC bool emit_native_end_pass(emit_t *emit) {
             #if MICROPY_PERSISTENT_CODE_SAVE
             emit->emit_common->ct_cur_child,
             emit->prelude_offset,
-            emit->qstr_link_cur, emit->qstr_link,
             #endif
             emit->scope->scope_flags, 0, 0);
     }
@@ -1112,6 +1123,7 @@ STATIC exc_stack_entry_t *emit_native_pop_exc_stack(emit_t *emit) {
 }
 
 STATIC void emit_load_reg_with_object(emit_t *emit, int reg, mp_obj_t obj) {
+    emit->scope->scope_flags |= MP_SCOPE_FLAG_HASCONSTS;
     size_t table_off = mp_emit_common_use_const_obj(emit->emit_common, obj);
     emit_native_mov_reg_state(emit, REG_TEMP0, LOCAL_IDX_FUN_OBJ(emit));
     ASM_LOAD_REG_REG_OFFSET(emit->as, REG_TEMP0, REG_TEMP0, OFFSETOF_OBJ_FUN_BC_CONTEXT);
@@ -1214,14 +1226,6 @@ STATIC void emit_native_global_exc_entry(emit_t *emit) {
 
             // Global exception handler: check for valid exception handler
             emit_native_label_assign(emit, global_except_label);
-            #if N_NLR_SETJMP
-            // Reload REG_FUN_TABLE, since it may be clobbered by longjmp
-            size_t fun_table_off = mp_emit_common_use_const_obj(emit->emit_common, MP_OBJ_FROM_PTR(&mp_fun_table));
-            emit_native_mov_reg_state(emit, REG_LOCAL_1, LOCAL_IDX_FUN_OBJ(emit));
-            ASM_LOAD_REG_REG_OFFSET(emit->as, REG_LOCAL_1, REG_LOCAL_1, OFFSETOF_OBJ_FUN_BC_CONTEXT);
-            ASM_LOAD_REG_REG_OFFSET(emit->as, REG_LOCAL_1, REG_LOCAL_1, OFFSETOF_MODULE_CONTEXT_OBJ_TABLE);
-            ASM_LOAD_REG_REG_OFFSET(emit->as, REG_FUN_TABLE, REG_LOCAL_1, fun_table_off);
-            #endif
             ASM_MOV_REG_LOCAL(emit->as, REG_LOCAL_1, LOCAL_IDX_EXC_HANDLER_PC(emit));
             ASM_JUMP_IF_REG_NONZERO(emit->as, REG_LOCAL_1, nlr_label, false);
         }
@@ -1385,7 +1389,6 @@ STATIC void emit_native_load_const_str(emit_t *emit, qstr qst) {
 }
 
 STATIC void emit_native_load_const_obj(emit_t *emit, mp_obj_t obj) {
-    emit->scope->scope_flags |= MP_SCOPE_FLAG_HASCONSTS;
     emit_native_pre(emit);
     need_reg_single(emit, REG_RET, 0);
     emit_load_reg_with_object(emit, REG_RET, obj);
@@ -1404,7 +1407,7 @@ STATIC void emit_native_load_fast(emit_t *emit, qstr qst, mp_uint_t local_num) {
         EMIT_NATIVE_VIPER_TYPE_ERROR(emit, MP_ERROR_TEXT("local '%q' used before type known"), qst);
     }
     emit_native_pre(emit);
-    if (local_num < REG_LOCAL_NUM && CAN_USE_REGS_FOR_LOCALS(emit)) {
+    if (local_num < MAX_REGS_FOR_LOCAL_VARS && CAN_USE_REGS_FOR_LOCALS(emit)) {
         emit_post_push_reg(emit, vtype, reg_local_table[local_num]);
     } else {
         need_reg_single(emit, REG_TEMP0, 0);
@@ -1625,7 +1628,7 @@ STATIC void emit_native_load_subscr(emit_t *emit) {
 
 STATIC void emit_native_store_fast(emit_t *emit, qstr qst, mp_uint_t local_num) {
     vtype_kind_t vtype;
-    if (local_num < REG_LOCAL_NUM && CAN_USE_REGS_FOR_LOCALS(emit)) {
+    if (local_num < MAX_REGS_FOR_LOCAL_VARS && CAN_USE_REGS_FOR_LOCALS(emit)) {
         emit_pre_pop_reg(emit, &vtype, reg_local_table[local_num]);
     } else {
         emit_pre_pop_reg(emit, &vtype, REG_TEMP0);
diff --git a/py/emitnthumb.c b/py/emitnthumb.c
index 1c33e7a68b59e..844a73ffa8c92 100644
--- a/py/emitnthumb.c
+++ b/py/emitnthumb.c
@@ -10,8 +10,6 @@
 
 // Word indices of REG_LOCAL_x in nlr_buf_t
 #define NLR_BUF_IDX_LOCAL_1 (3) // r4
-#define NLR_BUF_IDX_LOCAL_2 (4) // r5
-#define NLR_BUF_IDX_LOCAL_3 (5) // r6
 
 #define N_THUMB (1)
 #define EXPORT_FUN(name) emit_native_thumb_##name
diff --git a/py/emitnx64.c b/py/emitnx64.c
index 4abb3ecad3a32..1b32286d27be9 100644
--- a/py/emitnx64.c
+++ b/py/emitnx64.c
@@ -10,8 +10,6 @@
 
 // Word indices of REG_LOCAL_x in nlr_buf_t
 #define NLR_BUF_IDX_LOCAL_1 (5) // rbx
-#define NLR_BUF_IDX_LOCAL_2 (6) // r12
-#define NLR_BUF_IDX_LOCAL_3 (7) // r13
 
 #define N_X64 (1)
 #define EXPORT_FUN(name) emit_native_x64_##name
diff --git a/py/emitnx86.c b/py/emitnx86.c
index d990ef5a9ea66..a9050c65d4036 100644
--- a/py/emitnx86.c
+++ b/py/emitnx86.c
@@ -11,8 +11,6 @@
 
 // Word indices of REG_LOCAL_x in nlr_buf_t
 #define NLR_BUF_IDX_LOCAL_1 (5) // ebx
-#define NLR_BUF_IDX_LOCAL_2 (7) // esi
-#define NLR_BUF_IDX_LOCAL_3 (6) // edi
 
 // x86 needs a table to know how many args a given function has
 STATIC byte mp_f_n_args[MP_F_NUMBER_OF] = {
diff --git a/py/emitnxtensa.c b/py/emitnxtensa.c
index 34089e90dc27b..c89b029023028 100644
--- a/py/emitnxtensa.c
+++ b/py/emitnxtensa.c
@@ -10,8 +10,6 @@
 
 // Word indices of REG_LOCAL_x in nlr_buf_t
 #define NLR_BUF_IDX_LOCAL_1 (8) // a12
-#define NLR_BUF_IDX_LOCAL_2 (9) // a13
-#define NLR_BUF_IDX_LOCAL_3 (10) // a14
 
 #define N_XTENSA (1)
 #define EXPORT_FUN(name) emit_native_xtensa_##name
diff --git a/py/emitnxtensawin.c b/py/emitnxtensawin.c
index 99aac08dc4767..f6eeff8455b97 100644
--- a/py/emitnxtensawin.c
+++ b/py/emitnxtensawin.c
@@ -11,8 +11,6 @@
 
 // Word indices of REG_LOCAL_x in nlr_buf_t
 #define NLR_BUF_IDX_LOCAL_1 (2 + 4) // a4
-#define NLR_BUF_IDX_LOCAL_2 (2 + 5) // a5
-#define NLR_BUF_IDX_LOCAL_3 (2 + 6) // a6
 
 #define N_NLR_SETJMP (1)
 #define N_XTENSAWIN (1)
diff --git a/py/persistentcode.c b/py/persistentcode.c
index e23c775d1f0ed..d19a817aa5bf2 100644
--- a/py/persistentcode.c
+++ b/py/persistentcode.c
@@ -75,38 +75,6 @@ typedef struct _reloc_info_t {
     uint8_t *bss;
 } reloc_info_t;
 
-#if MICROPY_EMIT_THUMB
-STATIC void asm_thumb_rewrite_mov(uint8_t *pc, uint16_t val) {
-    // high part
-    *(uint16_t *)pc = (*(uint16_t *)pc & 0xfbf0) | (val >> 1 & 0x0400) | (val >> 12);
-    // low part
-    *(uint16_t *)(pc + 2) = (*(uint16_t *)(pc + 2) & 0x0f00) | (val << 4 & 0x7000) | (val & 0x00ff);
-
-}
-#endif
-
-STATIC void arch_link_qstr(uint8_t *pc, bool is_obj, qstr qst) {
-    mp_uint_t val = qst;
-    if (is_obj) {
-        val = (mp_uint_t)MP_OBJ_NEW_QSTR(qst);
-    }
-    #if MICROPY_EMIT_X86 || MICROPY_EMIT_X64 || MICROPY_EMIT_ARM || MICROPY_EMIT_XTENSA || MICROPY_EMIT_XTENSAWIN
-    pc[0] = val & 0xff;
-    pc[1] = (val >> 8) & 0xff;
-    pc[2] = (val >> 16) & 0xff;
-    pc[3] = (val >> 24) & 0xff;
-    #elif MICROPY_EMIT_THUMB
-    if (is_obj) {
-        // qstr object, movw and movt
-        asm_thumb_rewrite_mov(pc, val); // movw
-        asm_thumb_rewrite_mov(pc + 4, val >> 16); // movt
-    } else {
-        // qstr number, movw instruction
-        asm_thumb_rewrite_mov(pc, val); // movw
-    }
-    #endif
-}
-
 void mp_native_relocate(void *ri_in, uint8_t *text, uintptr_t reloc_text) {
     // Relocate native code
     reloc_info_t *ri = ri_in;
@@ -285,9 +253,6 @@ STATIC mp_raw_code_t *load_raw_code(mp_reader_t *reader) {
                 } else if ((off & 3) == 3) {
                     // Generic, aligned qstr-object link
                     *(mp_obj_t *)dest = MP_OBJ_NEW_QSTR(qst);
-                } else {
-                    // Architecture-specific link
-                    arch_link_qstr(dest, (off & 3) == 2, qst);
                 }
             }
         }
@@ -424,7 +389,6 @@ STATIC mp_raw_code_t *load_raw_code(mp_reader_t *reader) {
             #if MICROPY_PERSISTENT_CODE_SAVE
             n_children,
             prelude_offset,
-            0, NULL,
             #endif
             native_scope_flags, native_n_pos_args, native_type_sig
             );
@@ -605,11 +569,7 @@ STATIC void save_raw_code(mp_print_t *print, const mp_raw_code_t *rc) {
     #if MICROPY_EMIT_MACHINE_CODE
     if (rc->kind == MP_CODE_NATIVE_PY || rc->kind == MP_CODE_NATIVE_VIPER) {
         // Save qstr link table for native code
-        mp_print_uint(print, rc->n_qstr);
-        for (size_t i = 0; i < rc->n_qstr; ++i) {
-            mp_print_uint(print, rc->qstr_link[i].off);
-            save_qstr(print, rc->qstr_link[i].qst);
-        }
+        mp_print_uint(print, 0);
     }
 
     if (rc->kind == MP_CODE_NATIVE_PY) {
diff --git a/tools/mpy-tool.py b/tools/mpy-tool.py
index 2974e357b0fc2..cbe456a803ac1 100755
--- a/tools/mpy-tool.py
+++ b/tools/mpy-tool.py
@@ -839,7 +839,7 @@ def freeze_children(self, prelude_ptr=None):
             print("};")
             print()
 
-    def freeze_raw_code(self, prelude_ptr=None, qstr_links=(), type_sig=0):
+    def freeze_raw_code(self, prelude_ptr=None, type_sig=0):
         # Generate mp_raw_code_t.
         print("static const mp_raw_code_t raw_code_%s = {" % self.escaped_name)
         print("    .kind = %s," % RawCode.code_kind_str[self.code_kind])
@@ -879,8 +879,6 @@ def freeze_raw_code(self, prelude_ptr=None, qstr_links=(), type_sig=0):
             print("    #endif")
         print("    #if MICROPY_EMIT_MACHINE_CODE")
         print("    .prelude_offset = %u," % self.prelude_offset)
-        print("    .n_qstr = %u," % len(qstr_links))
-        print("    .qstr_link = NULL,")  # TODO
         print("    #endif")
         print("    #endif")
         print("    #if MICROPY_EMIT_MACHINE_CODE")
@@ -1038,47 +1036,6 @@ def disassemble(self):
             ip += sz
         self.disassemble_children()
 
-    def _asm_thumb_rewrite_mov(self, pc, val):
-        print("    (%u & 0xf0) | (%s >> 12)," % (self.fun_data[pc], val), end="")
-        print(" (%u & 0xfb) | (%s >> 9 & 0x04)," % (self.fun_data[pc + 1], val), end="")
-        print(" (%s & 0xff)," % (val,), end="")
-        print(" (%u & 0x07) | (%s >> 4 & 0x70)," % (self.fun_data[pc + 3], val))
-
-    def _link_qstr(self, pc, kind, qst):
-        if kind == 0:
-            # Generic 16-bit link
-            print("    %s & 0xff, %s >> 8," % (qst, qst))
-            return 2
-        else:
-            # Architecture-specific link
-            is_obj = kind == 2
-            if is_obj:
-                qst = "((uintptr_t)MP_OBJ_NEW_QSTR(%s))" % qst
-            if config.native_arch in (
-                MP_NATIVE_ARCH_X86,
-                MP_NATIVE_ARCH_X64,
-                MP_NATIVE_ARCH_ARMV6,
-                MP_NATIVE_ARCH_XTENSA,
-                MP_NATIVE_ARCH_XTENSAWIN,
-            ):
-                print(
-                    "    %s & 0xff, (%s >> 8) & 0xff, (%s >> 16) & 0xff, %s >> 24,"
-                    % (qst, qst, qst, qst)
-                )
-                return 4
-            elif MP_NATIVE_ARCH_ARMV6M <= config.native_arch <= MP_NATIVE_ARCH_ARMV7EMDP:
-                if is_obj:
-                    # qstr object, movw and movt
-                    self._asm_thumb_rewrite_mov(pc, qst)
-                    self._asm_thumb_rewrite_mov(pc + 4, "(%s >> 16)" % qst)
-                    return 8
-                else:
-                    # qstr number, movw instruction
-                    self._asm_thumb_rewrite_mov(pc, qst)
-                    return 4
-            else:
-                assert 0
-
     def freeze(self):
         if self.scope_flags & ~0x0F:
             raise FreezeError("unable to freeze code with relocations")
@@ -1098,21 +1055,13 @@ def freeze(self):
         i = 0
         qi = 0
         while i < i_top:
-            if qi < len(self.qstr_links) and i == self.qstr_links[qi][0]:
-                # link qstr
-                qi_off, qi_kind, qi_val = self.qstr_links[qi]
-                i += self._link_qstr(i, qi_kind, qi_val.qstr_id)
-                qi += 1
-            else:
-                # copy machine code (max 16 bytes)
-                i16 = min(i + 16, i_top)
-                if qi < len(self.qstr_links):
-                    i16 = min(i16, self.qstr_links[qi][0])
-                print("   ", end="")
-                for ii in range(i, i16):
-                    print(" 0x%02x," % self.fun_data[ii], end="")
-                print()
-                i = i16
+            # copy machine code (max 16 bytes)
+            i16 = min(i + 16, i_top)
+            print("   ", end="")
+            for ii in range(i, i16):
+                print(" 0x%02x," % self.fun_data[ii], end="")
+            print()
+            i = i16
 
         print("};")
 
@@ -1134,7 +1083,7 @@ def freeze(self):
             print("#endif")
 
         self.freeze_children(prelude_ptr)
-        self.freeze_raw_code(prelude_ptr, self.qstr_links, self.type_sig)
+        self.freeze_raw_code(prelude_ptr, self.type_sig)
 
 
 class MPYSegment:

From a8492253c126be9bef69110c6a6862872868dfbc Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 23 May 2022 10:57:42 +1000
Subject: [PATCH 2060/3533] tests/basics: Unlock heap if skipping nanbox
 small-int test.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/basics/nanbox_smallint.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/basics/nanbox_smallint.py b/tests/basics/nanbox_smallint.py
index 642ca77b375ef..167b196010a2d 100644
--- a/tests/basics/nanbox_smallint.py
+++ b/tests/basics/nanbox_smallint.py
@@ -9,6 +9,7 @@
     float(123)
     micropython.heap_unlock()
 except:
+    micropython.heap_unlock()
     print("SKIP")
     raise SystemExit
 

From 7d3204783a3550ab8a5a848901e0e512d54a4163 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 23 May 2022 11:10:37 +1000
Subject: [PATCH 2061/3533] tests/run-tests.py: Handle case where mpy-cross
 fails to compile script.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/run-perfbench.py |  5 ++++-
 tests/run-tests.py     | 23 ++++++++++++++++-------
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/tests/run-perfbench.py b/tests/run-perfbench.py
index 22ad6308fbdd6..a2e9e8079ad59 100755
--- a/tests/run-perfbench.py
+++ b/tests/run-perfbench.py
@@ -120,7 +120,10 @@ def run_benchmarks(args, target, param_n, param_m, n_average, test_list):
 
         # Process script through mpy-cross if needed
         if isinstance(target, pyboard.Pyboard) or args.via_mpy:
-            test_script_target = prepare_script_for_target(args, script_text=test_script)
+            crash, test_script_target = prepare_script_for_target(args, script_text=test_script)
+            if crash:
+                print("CRASH:", test_script_target)
+                continue
         else:
             test_script_target = test_script
 
diff --git a/tests/run-tests.py b/tests/run-tests.py
index 35e28aac9b488..1fc857601490f 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -122,11 +122,15 @@ def prepare_script_for_target(args, *, script_filename=None, script_text=None, f
         else:
             cleanup_script_filename = False
 
-        subprocess.check_output(
-            [MPYCROSS]
-            + args.mpy_cross_flags.split()
-            + ["-o", mpy_filename, "-X", "emit=" + args.emit, script_filename]
-        )
+        try:
+            subprocess.check_output(
+                [MPYCROSS]
+                + args.mpy_cross_flags.split()
+                + ["-o", mpy_filename, "-X", "emit=" + args.emit, script_filename],
+                stderr=subprocess.STDOUT,
+            )
+        except subprocess.CalledProcessError as er:
+            return True, b"mpy-cross crash\n" + er.output
 
         with open(mpy_filename, "rb") as f:
             script_text = b"__buf=" + bytes(repr(f.read()), "ascii") + b"\n"
@@ -140,11 +144,16 @@ def prepare_script_for_target(args, *, script_filename=None, script_text=None, f
         print("error: using emit={} must go via .mpy".format(args.emit))
         sys.exit(1)
 
-    return script_text
+    return False, script_text
 
 
 def run_script_on_remote_target(pyb, args, test_file, is_special):
-    script = prepare_script_for_target(args, script_filename=test_file, force_plain=is_special)
+    had_crash, script = prepare_script_for_target(
+        args, script_filename=test_file, force_plain=is_special
+    )
+    if had_crash:
+        return True, script
+
     try:
         had_crash = False
         pyb.enter_raw_repl()

From a5324a10747dfba921bb363ed904f05ebb6de010 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 23 May 2022 17:57:33 +1000
Subject: [PATCH 2062/3533] py/asmthumb: Make ARMv7-M instruction use
 dynamically selectable.

This commit adjusts the asm_thumb_xxx functions so they can be dynamically
configured to use ARMv7-M instructions or not.  This is available when
MICROPY_DYNAMIC_COMPILER is enabled, and then controlled by the value of
mp_dynamic_compiler.native_arch.

If MICROPY_DYNAMIC_COMPILER is disabled the previous behaviour is retained:
the functions emit ARMv7-M instructions only if MICROPY_EMIT_THUMB_ARMV7M
is enabled.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/asmthumb.c   | 199 +++++++++++++++++++++---------------------------
 py/asmthumb.h   |  28 ++++---
 py/emitnative.c |  84 ++++++++++----------
 3 files changed, 147 insertions(+), 164 deletions(-)

diff --git a/py/asmthumb.c b/py/asmthumb.c
index 5257884b5cb4b..8d47575e96ccb 100644
--- a/py/asmthumb.c
+++ b/py/asmthumb.c
@@ -34,7 +34,6 @@
 #if MICROPY_EMIT_THUMB || MICROPY_EMIT_INLINE_THUMB
 
 #include "py/mpstate.h"
-#include "py/persistentcode.h"
 #include "py/asmthumb.h"
 
 #define UNSIGNED_FIT5(x) ((uint32_t)(x) < 32)
@@ -46,7 +45,6 @@
 #define SIGNED_FIT12(x) (((x) & 0xfffff800) == 0) || (((x) & 0xfffff800) == 0xfffff800)
 #define SIGNED_FIT23(x) (((x) & 0xffc00000) == 0) || (((x) & 0xffc00000) == 0xffc00000)
 
-#if MICROPY_EMIT_THUMB_ARMV7M
 // Note: these actually take an imm12 but the high-bit is not encoded here
 #define OP_ADD_W_RRI_HI(reg_src) (0xf200 | (reg_src))
 #define OP_ADD_W_RRI_LO(reg_dest, imm11) ((imm11 << 4 & 0x7000) | reg_dest << 8 | (imm11 & 0xff))
@@ -58,7 +56,6 @@
 
 #define OP_LDRH_W_HI(reg_base) (0xf8b0 | (reg_base))
 #define OP_LDRH_W_LO(reg_dest, imm12) ((reg_dest) << 12 | (imm12))
-#endif
 
 static inline byte *asm_thumb_get_cur_to_write_bytes(asm_thumb_t *as, int n) {
     return mp_asm_base_get_cur_to_write_bytes(&as->base, n);
@@ -161,21 +158,21 @@ void asm_thumb_entry(asm_thumb_t *as, int num_locals) {
     }
     asm_thumb_op16(as, OP_PUSH_RLIST_LR(reglist));
     if (stack_adjust > 0) {
-        #if MICROPY_EMIT_THUMB_ARMV7M
-        if (UNSIGNED_FIT7(stack_adjust)) {
-            asm_thumb_op16(as, OP_SUB_SP(stack_adjust));
+        if (asm_thumb_allow_armv7m(as)) {
+            if (UNSIGNED_FIT7(stack_adjust)) {
+                asm_thumb_op16(as, OP_SUB_SP(stack_adjust));
+            } else {
+                asm_thumb_op32(as, OP_SUB_W_RRI_HI(ASM_THUMB_REG_SP), OP_SUB_W_RRI_LO(ASM_THUMB_REG_SP, stack_adjust * 4));
+            }
         } else {
-            asm_thumb_op32(as, OP_SUB_W_RRI_HI(ASM_THUMB_REG_SP), OP_SUB_W_RRI_LO(ASM_THUMB_REG_SP, stack_adjust * 4));
-        }
-        #else
-        int adj = stack_adjust;
-        // we don't expect the stack_adjust to be massive
-        while (!UNSIGNED_FIT7(adj)) {
-            asm_thumb_op16(as, OP_SUB_SP(127));
-            adj -= 127;
+            int adj = stack_adjust;
+            // we don't expect the stack_adjust to be massive
+            while (!UNSIGNED_FIT7(adj)) {
+                asm_thumb_op16(as, OP_SUB_SP(127));
+                adj -= 127;
+            }
+            asm_thumb_op16(as, OP_SUB_SP(adj));
         }
-        asm_thumb_op16(as, OP_SUB_SP(adj));
-        #endif
     }
     as->push_reglist = reglist;
     as->stack_adjust = stack_adjust;
@@ -183,21 +180,21 @@ void asm_thumb_entry(asm_thumb_t *as, int num_locals) {
 
 void asm_thumb_exit(asm_thumb_t *as) {
     if (as->stack_adjust > 0) {
-        #if MICROPY_EMIT_THUMB_ARMV7M
-        if (UNSIGNED_FIT7(as->stack_adjust)) {
-            asm_thumb_op16(as, OP_ADD_SP(as->stack_adjust));
+        if (asm_thumb_allow_armv7m(as)) {
+            if (UNSIGNED_FIT7(as->stack_adjust)) {
+                asm_thumb_op16(as, OP_ADD_SP(as->stack_adjust));
+            } else {
+                asm_thumb_op32(as, OP_ADD_W_RRI_HI(ASM_THUMB_REG_SP), OP_ADD_W_RRI_LO(ASM_THUMB_REG_SP, as->stack_adjust * 4));
+            }
         } else {
-            asm_thumb_op32(as, OP_ADD_W_RRI_HI(ASM_THUMB_REG_SP), OP_ADD_W_RRI_LO(ASM_THUMB_REG_SP, as->stack_adjust * 4));
-        }
-        #else
-        int adj = as->stack_adjust;
-        // we don't expect the stack_adjust to be massive
-        while (!UNSIGNED_FIT7(adj)) {
-            asm_thumb_op16(as, OP_ADD_SP(127));
-            adj -= 127;
+            int adj = as->stack_adjust;
+            // we don't expect the stack_adjust to be massive
+            while (!UNSIGNED_FIT7(adj)) {
+                asm_thumb_op16(as, OP_ADD_SP(127));
+                adj -= 127;
+            }
+            asm_thumb_op16(as, OP_ADD_SP(adj));
         }
-        asm_thumb_op16(as, OP_ADD_SP(adj));
-        #endif
     }
     asm_thumb_op16(as, OP_POP_RLIST_PC(as->push_reglist));
 }
@@ -251,27 +248,19 @@ void asm_thumb_mov_reg_reg(asm_thumb_t *as, uint reg_dest, uint reg_src) {
     asm_thumb_op16(as, 0x4600 | op_lo);
 }
 
-#if MICROPY_EMIT_THUMB_ARMV7M
-
 // if loading lo half with movw, the i16 value will be zero extended into the r32 register!
-size_t asm_thumb_mov_reg_i16(asm_thumb_t *as, uint mov_op, uint reg_dest, int i16_src) {
+void asm_thumb_mov_reg_i16(asm_thumb_t *as, uint mov_op, uint reg_dest, int i16_src) {
     assert(reg_dest < ASM_THUMB_REG_R15);
-    size_t loc = mp_asm_base_get_code_pos(&as->base);
     // mov[wt] reg_dest, #i16_src
     asm_thumb_op32(as, mov_op | ((i16_src >> 1) & 0x0400) | ((i16_src >> 12) & 0xf), ((i16_src << 4) & 0x7000) | (reg_dest << 8) | (i16_src & 0xff));
-    return loc;
 }
 
-#else
-
-void asm_thumb_mov_rlo_i16(asm_thumb_t *as, uint rlo_dest, int i16_src) {
+static void asm_thumb_mov_rlo_i16(asm_thumb_t *as, uint rlo_dest, int i16_src) {
     asm_thumb_mov_rlo_i8(as, rlo_dest, (i16_src >> 8) & 0xff);
     asm_thumb_lsl_rlo_rlo_i5(as, rlo_dest, rlo_dest, 8);
     asm_thumb_add_rlo_i8(as, rlo_dest, i16_src & 0xff);
 }
 
-#endif
-
 #define OP_B_N(byte_offset) (0xe000 | (((byte_offset) >> 1) & 0x07ff))
 
 bool asm_thumb_b_n_label(asm_thumb_t *as, uint label) {
@@ -295,14 +284,12 @@ bool asm_thumb_bcc_nw_label(asm_thumb_t *as, int cond, uint label, bool wide) {
     if (!wide) {
         asm_thumb_op16(as, OP_BCC_N(cond, rel));
         return as->base.pass != MP_ASM_PASS_EMIT || SIGNED_FIT9(rel);
-    } else {
-        #if MICROPY_EMIT_THUMB_ARMV7M
+    } else if (asm_thumb_allow_armv7m(as)) {
         asm_thumb_op32(as, OP_BCC_W_HI(cond, rel), OP_BCC_W_LO(rel));
         return true;
-        #else
+    } else {
         // this method should not be called for ARMV6M
         return false;
-        #endif
     }
 }
 
@@ -323,30 +310,30 @@ size_t asm_thumb_mov_reg_i32(asm_thumb_t *as, uint reg_dest, mp_uint_t i32) {
 
     size_t loc = mp_asm_base_get_code_pos(&as->base);
 
-    #if MICROPY_EMIT_THUMB_ARMV7M
-    asm_thumb_mov_reg_i16(as, ASM_THUMB_OP_MOVW, reg_dest, i32);
-    asm_thumb_mov_reg_i16(as, ASM_THUMB_OP_MOVT, reg_dest, i32 >> 16);
-    #else
-    // should only be called with lo reg for ARMV6M
-    assert(reg_dest < ASM_THUMB_REG_R8);
-
-    // sanity check that generated code is aligned
-    assert(!as->base.code_base || !(3u & (uintptr_t)as->base.code_base));
-
-    // basically:
-    //        (nop)
-    //        ldr reg_dest, _data
-    //        b 1f
-    // _data: .word i32
-    //  1:
-    if (as->base.code_offset & 2u) {
-        asm_thumb_op16(as, ASM_THUMB_OP_NOP);
+    if (asm_thumb_allow_armv7m(as)) {
+        asm_thumb_mov_reg_i16(as, ASM_THUMB_OP_MOVW, reg_dest, i32);
+        asm_thumb_mov_reg_i16(as, ASM_THUMB_OP_MOVT, reg_dest, i32 >> 16);
+    } else {
+        // should only be called with lo reg for ARMV6M
+        assert(reg_dest < ASM_THUMB_REG_R8);
+
+        // sanity check that generated code is aligned
+        assert(!as->base.code_base || !(3u & (uintptr_t)as->base.code_base));
+
+        // basically:
+        //        (nop)
+        //        ldr reg_dest, _data
+        //        b 1f
+        // _data: .word i32
+        //  1:
+        if (as->base.code_offset & 2u) {
+            asm_thumb_op16(as, ASM_THUMB_OP_NOP);
+        }
+        asm_thumb_ldr_rlo_pcrel_i8(as, reg_dest, 0);
+        asm_thumb_op16(as, OP_B_N(2));
+        asm_thumb_op16(as, i32 & 0xffff);
+        asm_thumb_op16(as, i32 >> 16);
     }
-    asm_thumb_ldr_rlo_pcrel_i8(as, reg_dest, 0);
-    asm_thumb_op16(as, OP_B_N(2));
-    asm_thumb_op16(as, i32 & 0xffff);
-    asm_thumb_op16(as, i32 >> 16);
-    #endif
 
     return loc;
 }
@@ -354,14 +341,13 @@ size_t asm_thumb_mov_reg_i32(asm_thumb_t *as, uint reg_dest, mp_uint_t i32) {
 void asm_thumb_mov_reg_i32_optimised(asm_thumb_t *as, uint reg_dest, int i32) {
     if (reg_dest < 8 && UNSIGNED_FIT8(i32)) {
         asm_thumb_mov_rlo_i8(as, reg_dest, i32);
-    } else {
-        #if MICROPY_EMIT_THUMB_ARMV7M
+    } else if (asm_thumb_allow_armv7m(as)) {
         if (UNSIGNED_FIT16(i32)) {
             asm_thumb_mov_reg_i16(as, ASM_THUMB_OP_MOVW, reg_dest, i32);
         } else {
             asm_thumb_mov_reg_i32(as, reg_dest, i32);
         }
-        #else
+    } else {
         uint rlo_dest = reg_dest;
         assert(rlo_dest < ASM_THUMB_REG_R8); // should never be called for ARMV6M
 
@@ -389,7 +375,6 @@ void asm_thumb_mov_reg_i32_optimised(asm_thumb_t *as, uint reg_dest, int i32) {
         if (negate) {
             asm_thumb_neg_rlo_rlo(as, rlo_dest, rlo_dest);
         }
-        #endif
     }
 }
 
@@ -432,27 +417,25 @@ void asm_thumb_mov_reg_pcrel(asm_thumb_t *as, uint rlo_dest, uint label) {
     mp_uint_t dest = get_label_dest(as, label);
     mp_int_t rel = dest - as->base.code_offset;
     rel |= 1; // to stay in Thumb state when jumping to this address
-    #if MICROPY_EMIT_THUMB_ARMV7M
-    rel -= 6 + 4; // adjust for mov_reg_i16, sxth_rlo_rlo and then PC+4 prefetch of add_reg_reg
-    asm_thumb_mov_reg_i16(as, ASM_THUMB_OP_MOVW, rlo_dest, rel); // 4 bytes
-    asm_thumb_sxth_rlo_rlo(as, rlo_dest, rlo_dest); // 2 bytes
-    #else
-    rel -= 8 + 4; // adjust for four instructions and then PC+4 prefetch of add_reg_reg
-    // 6 bytes
-    asm_thumb_mov_rlo_i16(as, rlo_dest, rel);
-    // 2 bytes - not always needed, but we want to keep the size the same
-    asm_thumb_sxth_rlo_rlo(as, rlo_dest, rlo_dest);
-    #endif
+    if (asm_thumb_allow_armv7m(as)) {
+        rel -= 6 + 4; // adjust for mov_reg_i16, sxth_rlo_rlo and then PC+4 prefetch of add_reg_reg
+        asm_thumb_mov_reg_i16(as, ASM_THUMB_OP_MOVW, rlo_dest, rel); // 4 bytes
+        asm_thumb_sxth_rlo_rlo(as, rlo_dest, rlo_dest); // 2 bytes
+    } else {
+        rel -= 8 + 4; // adjust for four instructions and then PC+4 prefetch of add_reg_reg
+        // 6 bytes
+        asm_thumb_mov_rlo_i16(as, rlo_dest, rel);
+        // 2 bytes - not always needed, but we want to keep the size the same
+        asm_thumb_sxth_rlo_rlo(as, rlo_dest, rlo_dest);
+    }
     asm_thumb_add_reg_reg(as, rlo_dest, ASM_THUMB_REG_R15); // 2 bytes
 }
 
-#if MICROPY_EMIT_THUMB_ARMV7M
+// ARMv7-M only
 static inline void asm_thumb_ldr_reg_reg_i12(asm_thumb_t *as, uint reg_dest, uint reg_base, uint word_offset) {
     asm_thumb_op32(as, OP_LDR_W_HI(reg_base), OP_LDR_W_LO(reg_dest, word_offset * 4));
 }
-#endif
 
-#if !MICROPY_EMIT_THUMB_ARMV7M
 // emits code for: reg_dest = reg_base + offset << offset_shift
 static void asm_thumb_add_reg_reg_offset(asm_thumb_t *as, uint reg_dest, uint reg_base, uint offset, uint offset_shift) {
     if (reg_dest < ASM_THUMB_REG_R8 && reg_base < ASM_THUMB_REG_R8) {
@@ -479,37 +462,31 @@ static void asm_thumb_add_reg_reg_offset(asm_thumb_t *as, uint reg_dest, uint re
         assert(0); // should never be called for ARMV6M
     }
 }
-#endif
 
 void asm_thumb_ldr_reg_reg_i12_optimised(asm_thumb_t *as, uint reg_dest, uint reg_base, uint word_offset) {
     if (reg_dest < ASM_THUMB_REG_R8 && reg_base < ASM_THUMB_REG_R8 && UNSIGNED_FIT5(word_offset)) {
         asm_thumb_ldr_rlo_rlo_i5(as, reg_dest, reg_base, word_offset);
-    } else {
-        #if MICROPY_EMIT_THUMB_ARMV7M
+    } else if (asm_thumb_allow_armv7m(as)) {
         asm_thumb_ldr_reg_reg_i12(as, reg_dest, reg_base, word_offset);
-        #else
+    } else {
         asm_thumb_add_reg_reg_offset(as, reg_dest, reg_base, word_offset - 31, 2);
         asm_thumb_ldr_rlo_rlo_i5(as, reg_dest, reg_dest, 31);
-        #endif
     }
 }
 
-#if MICROPY_EMIT_THUMB_ARMV7M
+// ARMv7-M only
 static inline void asm_thumb_ldrh_reg_reg_i12(asm_thumb_t *as, uint reg_dest, uint reg_base, uint uint16_offset) {
     asm_thumb_op32(as, OP_LDRH_W_HI(reg_base), OP_LDRH_W_LO(reg_dest, uint16_offset * 2));
 }
-#endif
 
 void asm_thumb_ldrh_reg_reg_i12_optimised(asm_thumb_t *as, uint reg_dest, uint reg_base, uint uint16_offset) {
     if (reg_dest < ASM_THUMB_REG_R8 && reg_base < ASM_THUMB_REG_R8 && UNSIGNED_FIT5(uint16_offset)) {
         asm_thumb_ldrh_rlo_rlo_i5(as, reg_dest, reg_base, uint16_offset);
-    } else {
-        #if MICROPY_EMIT_THUMB_ARMV7M
+    } else if (asm_thumb_allow_armv7m(as)) {
         asm_thumb_ldrh_reg_reg_i12(as, reg_dest, reg_base, uint16_offset);
-        #else
+    } else {
         asm_thumb_add_reg_reg_offset(as, reg_dest, reg_base, uint16_offset - 31, 1);
         asm_thumb_ldrh_rlo_rlo_i5(as, reg_dest, reg_dest, 31);
-        #endif
     }
 }
 
@@ -521,20 +498,21 @@ void asm_thumb_b_label(asm_thumb_t *as, uint label) {
     mp_uint_t dest = get_label_dest(as, label);
     mp_int_t rel = dest - as->base.code_offset;
     rel -= 4; // account for instruction prefetch, PC is 4 bytes ahead of this instruction
+
     if (dest != (mp_uint_t)-1 && rel <= -4) {
         // is a backwards jump, so we know the size of the jump on the first pass
         // calculate rel assuming 12 bit relative jump
         if (SIGNED_FIT12(rel)) {
             asm_thumb_op16(as, OP_B_N(rel));
-        } else {
-            goto large_jump;
+            return;
         }
-    } else {
-        // is a forwards jump, so need to assume it's large
-    large_jump:
-        #if MICROPY_EMIT_THUMB_ARMV7M
+    }
+
+    // is a large backwards jump, or a forwards jump (that must be assumed large)
+
+    if (asm_thumb_allow_armv7m(as)) {
         asm_thumb_op32(as, OP_BW_HI(rel), OP_BW_LO(rel));
-        #else
+    } else {
         if (SIGNED_FIT12(rel)) {
             // this code path has to be the same number of instructions irrespective of rel
             asm_thumb_op16(as, OP_B_N(rel));
@@ -545,7 +523,6 @@ void asm_thumb_b_label(asm_thumb_t *as, uint label) {
                 mp_raise_NotImplementedError(MP_ERROR_TEXT("native method too big"));
             }
         }
-        #endif
     }
 }
 
@@ -553,24 +530,24 @@ void asm_thumb_bcc_label(asm_thumb_t *as, int cond, uint label) {
     mp_uint_t dest = get_label_dest(as, label);
     mp_int_t rel = dest - as->base.code_offset;
     rel -= 4; // account for instruction prefetch, PC is 4 bytes ahead of this instruction
+
     if (dest != (mp_uint_t)-1 && rel <= -4) {
         // is a backwards jump, so we know the size of the jump on the first pass
         // calculate rel assuming 9 bit relative jump
         if (SIGNED_FIT9(rel)) {
             asm_thumb_op16(as, OP_BCC_N(cond, rel));
-        } else {
-            goto large_jump;
+            return;
         }
-    } else {
-        // is a forwards jump, so need to assume it's large
-    large_jump:
-        #if MICROPY_EMIT_THUMB_ARMV7M
+    }
+
+    // is a large backwards jump, or a forwards jump (that must be assumed large)
+
+    if (asm_thumb_allow_armv7m(as)) {
         asm_thumb_op32(as, OP_BCC_W_HI(cond, rel), OP_BCC_W_LO(rel));
-        #else
+    } else {
         // reverse the sense of the branch to jump over a longer branch
         asm_thumb_op16(as, OP_BCC_N(cond ^ 1, 0));
         asm_thumb_b_label(as, label);
-        #endif
     }
 }
 
diff --git a/py/asmthumb.h b/py/asmthumb.h
index 32086199984df..86b81665757eb 100644
--- a/py/asmthumb.h
+++ b/py/asmthumb.h
@@ -29,6 +29,7 @@
 #include <assert.h>
 #include "py/misc.h"
 #include "py/asmbase.h"
+#include "py/persistentcode.h"
 
 #define ASM_THUMB_REG_R0  (0)
 #define ASM_THUMB_REG_R1  (1)
@@ -70,6 +71,21 @@ typedef struct _asm_thumb_t {
     uint32_t stack_adjust;
 } asm_thumb_t;
 
+#if MICROPY_DYNAMIC_COMPILER
+
+static inline bool asm_thumb_allow_armv7m(asm_thumb_t *as) {
+    return MP_NATIVE_ARCH_ARMV7M <= mp_dynamic_compiler.native_arch
+           && mp_dynamic_compiler.native_arch <= MP_NATIVE_ARCH_ARMV7EMDP;
+}
+
+#else
+
+static inline bool asm_thumb_allow_armv7m(asm_thumb_t *as) {
+    return MICROPY_EMIT_THUMB_ARMV7M;
+}
+
+#endif
+
 static inline void asm_thumb_end_pass(asm_thumb_t *as) {
     (void)as;
 }
@@ -308,12 +324,7 @@ static inline void asm_thumb_sxth_rlo_rlo(asm_thumb_t *as, uint rlo_dest, uint r
 #define ASM_THUMB_OP_MOVT (0xf2c0)
 
 void asm_thumb_mov_reg_reg(asm_thumb_t *as, uint reg_dest, uint reg_src);
-
-#if MICROPY_EMIT_THUMB_ARMV7M
-size_t asm_thumb_mov_reg_i16(asm_thumb_t *as, uint mov_op, uint reg_dest, int i16_src);
-#else
-void asm_thumb_mov_rlo_i16(asm_thumb_t *as, uint rlo_dest, int i16_src);
-#endif
+void asm_thumb_mov_reg_i16(asm_thumb_t *as, uint mov_op, uint reg_dest, int i16_src);
 
 // these return true if the destination is in range, false otherwise
 bool asm_thumb_b_n_label(asm_thumb_t *as, uint label);
@@ -390,11 +401,6 @@ void asm_thumb_b_rel12(asm_thumb_t *as, int rel);
 
 #define ASM_MOV_LOCAL_REG(as, local_num, reg) asm_thumb_mov_local_reg((as), (local_num), (reg))
 #define ASM_MOV_REG_IMM(as, reg_dest, imm) asm_thumb_mov_reg_i32_optimised((as), (reg_dest), (imm))
-#if MICROPY_EMIT_THUMB_ARMV7M
-#define ASM_MOV_REG_IMM_FIX_U16(as, reg_dest, imm) asm_thumb_mov_reg_i16((as), ASM_THUMB_OP_MOVW, (reg_dest), (imm))
-#else
-#define ASM_MOV_REG_IMM_FIX_U16(as, reg_dest, imm) asm_thumb_mov_rlo_i16((as), (reg_dest), (imm))
-#endif
 #define ASM_MOV_REG_IMM_FIX_WORD(as, reg_dest, imm) asm_thumb_mov_reg_i32((as), (reg_dest), (imm))
 #define ASM_MOV_REG_LOCAL(as, reg_dest, local_num) asm_thumb_mov_reg_local((as), (reg_dest), (local_num))
 #define ASM_MOV_REG_REG(as, reg_dest, reg_src) asm_thumb_mov_reg_reg((as), (reg_dest), (reg_src))
diff --git a/py/emitnative.c b/py/emitnative.c
index 5effda9a8981c..6683ea420260f 100644
--- a/py/emitnative.c
+++ b/py/emitnative.c
@@ -2421,48 +2421,48 @@ STATIC void emit_native_binary_op(emit_t *emit, mp_binary_op_t op) {
             asm_x86_setcc_r8(emit->as, ops[op_idx], REG_RET);
             #elif N_THUMB
             asm_thumb_cmp_rlo_rlo(emit->as, REG_ARG_2, reg_rhs);
-            #if MICROPY_EMIT_THUMB_ARMV7M
-            static uint16_t ops[6 + 6] = {
-                // unsigned
-                ASM_THUMB_OP_ITE_CC,
-                ASM_THUMB_OP_ITE_HI,
-                ASM_THUMB_OP_ITE_EQ,
-                ASM_THUMB_OP_ITE_LS,
-                ASM_THUMB_OP_ITE_CS,
-                ASM_THUMB_OP_ITE_NE,
-                // signed
-                ASM_THUMB_OP_ITE_LT,
-                ASM_THUMB_OP_ITE_GT,
-                ASM_THUMB_OP_ITE_EQ,
-                ASM_THUMB_OP_ITE_LE,
-                ASM_THUMB_OP_ITE_GE,
-                ASM_THUMB_OP_ITE_NE,
-            };
-            asm_thumb_op16(emit->as, ops[op_idx]);
-            asm_thumb_mov_rlo_i8(emit->as, REG_RET, 1);
-            asm_thumb_mov_rlo_i8(emit->as, REG_RET, 0);
-            #else
-            static uint16_t ops[6 + 6] = {
-                // unsigned
-                ASM_THUMB_CC_CC,
-                ASM_THUMB_CC_HI,
-                ASM_THUMB_CC_EQ,
-                ASM_THUMB_CC_LS,
-                ASM_THUMB_CC_CS,
-                ASM_THUMB_CC_NE,
-                // signed
-                ASM_THUMB_CC_LT,
-                ASM_THUMB_CC_GT,
-                ASM_THUMB_CC_EQ,
-                ASM_THUMB_CC_LE,
-                ASM_THUMB_CC_GE,
-                ASM_THUMB_CC_NE,
-            };
-            asm_thumb_bcc_rel9(emit->as, ops[op_idx], 6);
-            asm_thumb_mov_rlo_i8(emit->as, REG_RET, 0);
-            asm_thumb_b_rel12(emit->as, 4);
-            asm_thumb_mov_rlo_i8(emit->as, REG_RET, 1);
-            #endif
+            if (asm_thumb_allow_armv7m(emit->as)) {
+                static uint16_t ops[6 + 6] = {
+                    // unsigned
+                    ASM_THUMB_OP_ITE_CC,
+                    ASM_THUMB_OP_ITE_HI,
+                    ASM_THUMB_OP_ITE_EQ,
+                    ASM_THUMB_OP_ITE_LS,
+                    ASM_THUMB_OP_ITE_CS,
+                    ASM_THUMB_OP_ITE_NE,
+                    // signed
+                    ASM_THUMB_OP_ITE_LT,
+                    ASM_THUMB_OP_ITE_GT,
+                    ASM_THUMB_OP_ITE_EQ,
+                    ASM_THUMB_OP_ITE_LE,
+                    ASM_THUMB_OP_ITE_GE,
+                    ASM_THUMB_OP_ITE_NE,
+                };
+                asm_thumb_op16(emit->as, ops[op_idx]);
+                asm_thumb_mov_rlo_i8(emit->as, REG_RET, 1);
+                asm_thumb_mov_rlo_i8(emit->as, REG_RET, 0);
+            } else {
+                static uint16_t ops[6 + 6] = {
+                    // unsigned
+                    ASM_THUMB_CC_CC,
+                    ASM_THUMB_CC_HI,
+                    ASM_THUMB_CC_EQ,
+                    ASM_THUMB_CC_LS,
+                    ASM_THUMB_CC_CS,
+                    ASM_THUMB_CC_NE,
+                    // signed
+                    ASM_THUMB_CC_LT,
+                    ASM_THUMB_CC_GT,
+                    ASM_THUMB_CC_EQ,
+                    ASM_THUMB_CC_LE,
+                    ASM_THUMB_CC_GE,
+                    ASM_THUMB_CC_NE,
+                };
+                asm_thumb_bcc_rel9(emit->as, ops[op_idx], 6);
+                asm_thumb_mov_rlo_i8(emit->as, REG_RET, 0);
+                asm_thumb_b_rel12(emit->as, 4);
+                asm_thumb_mov_rlo_i8(emit->as, REG_RET, 1);
+            }
             #elif N_ARM
             asm_arm_cmp_reg_reg(emit->as, REG_ARG_2, reg_rhs);
             static uint ccs[6 + 6] = {

From 17ac68770caa4f60141fa89e233829744a24cba8 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 23 May 2022 17:58:30 +1000
Subject: [PATCH 2063/3533] py/persistentcode: Select ARMV6M as maximum when
 __thumb2__ not defined.

If __thumb2__ is defined by the compiler then .mpy files marked as ARMV6M
and above (up to ARMV7EMDP) are supported.  If it's not defined then only
ARMV6M .mpy files are supported.  This makes sure that on CPUs like
Cortex-M0+ (where __thumb2__ is not defined) only .mpy files marked as
ARMV6M can be imported.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/persistentcode.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/py/persistentcode.h b/py/persistentcode.h
index 55428e73a6ddf..29ccce4a3d968 100644
--- a/py/persistentcode.h
+++ b/py/persistentcode.h
@@ -63,7 +63,7 @@
             #define MPY_FEATURE_ARCH (MP_NATIVE_ARCH_ARMV7EM)
         #endif
     #else
-        #define MPY_FEATURE_ARCH (MP_NATIVE_ARCH_ARMV7M)
+        #define MPY_FEATURE_ARCH (MP_NATIVE_ARCH_ARMV6M)
     #endif
     #define MPY_FEATURE_ARCH_TEST(x) (MP_NATIVE_ARCH_ARMV6M <= (x) && (x) <= MPY_FEATURE_ARCH)
 #elif MICROPY_EMIT_ARM

From 0e28a1f0e5e229f14b199a30d1796770b232f5a1 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 23 May 2022 17:59:33 +1000
Subject: [PATCH 2064/3533] mpy-cross: Add armv6m architecture option.

Signed-off-by: Damien George <damien@micropython.org>
---
 mpy-cross/main.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/mpy-cross/main.c b/mpy-cross/main.c
index 6199abd365f40..390689fcbeee4 100644
--- a/mpy-cross/main.c
+++ b/mpy-cross/main.c
@@ -108,7 +108,7 @@ STATIC int usage(char **argv) {
         "\n"
         "Target specific options:\n"
         "-msmall-int-bits=number : set the maximum bits used to encode a small-int\n"
-        "-march=<arch> : set architecture for native emitter; x86, x64, armv6, armv7m, armv7em, armv7emsp, armv7emdp, xtensa, xtensawin\n"
+        "-march=<arch> : set architecture for native emitter; x86, x64, armv6, armv6m, armv7m, armv7em, armv7emsp, armv7emdp, xtensa, xtensawin\n"
         "\n"
         "Implementation specific options:\n", argv[0]
         );
@@ -270,6 +270,9 @@ MP_NOINLINE int main_(int argc, char **argv) {
                 } else if (strcmp(arch, "armv6") == 0) {
                     mp_dynamic_compiler.native_arch = MP_NATIVE_ARCH_ARMV6;
                     mp_dynamic_compiler.nlr_buf_num_regs = MICROPY_NLR_NUM_REGS_ARM_THUMB_FP;
+                } else if (strcmp(arch, "armv6m") == 0) {
+                    mp_dynamic_compiler.native_arch = MP_NATIVE_ARCH_ARMV6M;
+                    mp_dynamic_compiler.nlr_buf_num_regs = MICROPY_NLR_NUM_REGS_ARM_THUMB_FP; // need to be conservative so this code can run on armv7emdp
                 } else if (strcmp(arch, "armv7m") == 0) {
                     mp_dynamic_compiler.native_arch = MP_NATIVE_ARCH_ARMV7M;
                     mp_dynamic_compiler.nlr_buf_num_regs = MICROPY_NLR_NUM_REGS_ARM_THUMB_FP;

From c1b9d2259e77548053cba4a1f2cab726e6429a97 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 23 May 2022 22:50:34 +1000
Subject: [PATCH 2065/3533] py/dynruntime.mk: Add basic support for armv6m
 architecture.

The examples/natmod features0 and features1 examples now build and run on
ARMv6-M platforms.  More complicated examples are not yet supported because
the compiler emits references to built-in functions like __aeabi_uidiv.

Signed-off-by: Damien George <damien@micropython.org>
---
 docs/develop/natmod.rst |  3 ++-
 py/dynruntime.mk        |  7 +++++++
 tools/mpy_ld.py         | 24 ++++++++++++++++++++----
 3 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/docs/develop/natmod.rst b/docs/develop/natmod.rst
index 8ffe49591cc69..6d15f867bcfe8 100644
--- a/docs/develop/natmod.rst
+++ b/docs/develop/natmod.rst
@@ -34,6 +34,7 @@ options for the ``ARCH`` variable, see below):
 
 * ``x86`` (32 bit)
 * ``x64`` (64 bit x86)
+* ``armv6m`` (ARM Thumb, eg Cortex-M0)
 * ``armv7m`` (ARM Thumb 2, eg Cortex-M3)
 * ``armv7emsp`` (ARM Thumb 2, single precision float, eg Cortex-M4F, Cortex-M7)
 * ``armv7emdp`` (ARM Thumb 2, double precision float, eg Cortex-M7)
@@ -171,7 +172,7 @@ The file ``Makefile`` contains:
     # Source files (.c or .py)
     SRC = factorial.c
 
-    # Architecture to build for (x86, x64, armv7m, xtensa, xtensawin)
+    # Architecture to build for (x86, x64, armv6m, armv7m, xtensa, xtensawin)
     ARCH = x64
 
     # Include to get the rules for compiling and linking the module
diff --git a/py/dynruntime.mk b/py/dynruntime.mk
index db06d41e73767..09cbb2dd37cbb 100644
--- a/py/dynruntime.mk
+++ b/py/dynruntime.mk
@@ -55,6 +55,13 @@ CROSS =
 CFLAGS += -fno-stack-protector
 MICROPY_FLOAT_IMPL ?= double
 
+else ifeq ($(ARCH),armv6m)
+
+# thumb
+CROSS = arm-none-eabi-
+CFLAGS += -mthumb -mcpu=cortex-m0
+MICROPY_FLOAT_IMPL ?= none
+
 else ifeq ($(ARCH),armv7m)
 
 # thumb
diff --git a/tools/mpy_ld.py b/tools/mpy_ld.py
index 61894915185e8..b8652462d441d 100755
--- a/tools/mpy_ld.py
+++ b/tools/mpy_ld.py
@@ -38,6 +38,7 @@
 MPY_VERSION = 6
 MP_NATIVE_ARCH_X86 = 1
 MP_NATIVE_ARCH_X64 = 2
+MP_NATIVE_ARCH_ARMV6M = 4
 MP_NATIVE_ARCH_ARMV7M = 5
 MP_NATIVE_ARCH_ARMV7EMSP = 7
 MP_NATIVE_ARCH_ARMV7EMDP = 8
@@ -82,7 +83,14 @@ def asm_jump_x86(entry):
     return struct.pack("<BI", 0xE9, entry - 5)
 
 
-def asm_jump_arm(entry):
+def asm_jump_thumb(entry):
+    # Only signed values that fit in 12 bits are supported
+    b_off = entry - 4
+    assert b_off >> 11 == 0 or b_off >> 11 == -1, b_off
+    return struct.pack("<H", 0xE000 | (b_off >> 1 & 0x07FF))
+
+
+def asm_jump_thumb2(entry):
     b_off = entry - 4
     if b_off >> 11 == 0 or b_off >> 11 == -1:
         # Signed value fits in 12 bits
@@ -129,13 +137,21 @@ def __init__(self, name, mpy_feature, qstr_entry_size, word_size, arch_got, asm_
         (R_X86_64_GOTPCREL, R_X86_64_REX_GOTPCRELX),
         asm_jump_x86,
     ),
+    "armv6m": ArchData(
+        "EM_ARM",
+        MP_NATIVE_ARCH_ARMV6M << 2,
+        2,
+        4,
+        (R_ARM_GOT_BREL,),
+        asm_jump_thumb,
+    ),
     "armv7m": ArchData(
         "EM_ARM",
         MP_NATIVE_ARCH_ARMV7M << 2,
         2,
         4,
         (R_ARM_GOT_BREL,),
-        asm_jump_arm,
+        asm_jump_thumb2,
     ),
     "armv7emsp": ArchData(
         "EM_ARM",
@@ -143,7 +159,7 @@ def __init__(self, name, mpy_feature, qstr_entry_size, word_size, arch_got, asm_
         2,
         4,
         (R_ARM_GOT_BREL,),
-        asm_jump_arm,
+        asm_jump_thumb2,
     ),
     "armv7emdp": ArchData(
         "EM_ARM",
@@ -151,7 +167,7 @@ def __init__(self, name, mpy_feature, qstr_entry_size, word_size, arch_got, asm_
         2,
         4,
         (R_ARM_GOT_BREL,),
-        asm_jump_arm,
+        asm_jump_thumb2,
     ),
     "xtensa": ArchData(
         "EM_XTENSA",

From 75efb3267c7ec54f7131906d6ab1a3ab5185a185 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Fri, 20 May 2022 20:38:23 +1000
Subject: [PATCH 2066/3533] extmod: Revert accidental usocket->socket rename.

The registration of the usocket module was accidentally changed to socket
in moving to MP_REGISTER_MODULE in bb794f05b7fef75696118ea1eb03a769a9fac40d
---
 extmod/modlwip.c    | 2 +-
 extmod/modusocket.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/extmod/modlwip.c b/extmod/modlwip.c
index e20ade139beaa..47d5bcdbb9ea8 100644
--- a/extmod/modlwip.c
+++ b/extmod/modlwip.c
@@ -1781,6 +1781,6 @@ const mp_obj_module_t mp_module_lwip = {
 MP_REGISTER_MODULE(MP_QSTR_lwip, mp_module_lwip, MICROPY_PY_LWIP);
 
 // On LWIP-ports, this is the usocket module (replaces extmod/modusocket.c).
-MP_REGISTER_MODULE(MP_QSTR_socket, mp_module_lwip, MICROPY_PY_LWIP);
+MP_REGISTER_MODULE(MP_QSTR_usocket, mp_module_lwip, MICROPY_PY_LWIP);
 
 #endif // MICROPY_PY_LWIP
diff --git a/extmod/modusocket.c b/extmod/modusocket.c
index c4bf6342a4981..5f07d4f789223 100644
--- a/extmod/modusocket.c
+++ b/extmod/modusocket.c
@@ -588,6 +588,6 @@ const mp_obj_module_t mp_module_usocket = {
     .globals = (mp_obj_dict_t *)&mp_module_usocket_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_socket, mp_module_usocket, MICROPY_PY_NETWORK && MICROPY_PY_USOCKET && !MICROPY_PY_LWIP);
+MP_REGISTER_MODULE(MP_QSTR_usocket, mp_module_usocket, MICROPY_PY_NETWORK && MICROPY_PY_USOCKET && !MICROPY_PY_LWIP);
 
 #endif // MICROPY_PY_NETWORK && MICROPY_PY_USOCKET && !MICROPY_PY_LWIP

From be5657b64ff718bfeeab8f60d8ae12b31bbcbb89 Mon Sep 17 00:00:00 2001
From: David Lechner <david@lechnology.com>
Date: Tue, 3 May 2022 22:03:43 -0500
Subject: [PATCH 2067/3533] ports: Rename thread_t to mp_thread_t.

This adds the `mp_` prefix to the `thread_t` type.  The name `thread_t`
conflicts with the same in `mach/mach_types.h` on macOS.

Signed-off-by: David Lechner <david@lechnology.com>
---
 ports/cc3200/mpthreadport.c | 18 +++++++++---------
 ports/esp32/mpthreadport.c  | 24 ++++++++++++------------
 ports/unix/mpthreadport.c   | 22 +++++++++++-----------
 3 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/ports/cc3200/mpthreadport.c b/ports/cc3200/mpthreadport.c
index d35dab2d158c0..4b6f27d578066 100644
--- a/ports/cc3200/mpthreadport.c
+++ b/ports/cc3200/mpthreadport.c
@@ -37,19 +37,19 @@
 #if MICROPY_PY_THREAD
 
 // this structure forms a linked list, one node per active thread
-typedef struct _thread_t {
+typedef struct _mp_thread_t {
     TaskHandle_t id;        // system id of thread
     int ready;              // whether the thread is ready and running
     void *arg;              // thread Python args, a GC root pointer
     void *stack;            // pointer to the stack
     size_t stack_len;       // number of words in the stack
-    struct _thread_t *next;
-} thread_t;
+    struct _mp_thread_t *next;
+} mp_thread_t;
 
 // the mutex controls access to the linked list
 STATIC mp_thread_mutex_t thread_mutex;
-STATIC thread_t thread_entry0;
-STATIC thread_t *thread; // root pointer, handled bp mp_thread_gc_others
+STATIC mp_thread_t thread_entry0;
+STATIC mp_thread_t *thread; // root pointer, handled bp mp_thread_gc_others
 
 void mp_thread_init(void) {
     mp_thread_mutex_init(&thread_mutex);
@@ -67,7 +67,7 @@ void mp_thread_init(void) {
 
 void mp_thread_gc_others(void) {
     mp_thread_mutex_lock(&thread_mutex, 1);
-    for (thread_t *th = thread; th != NULL; th = th->next) {
+    for (mp_thread_t *th = thread; th != NULL; th = th->next) {
         gc_collect_root((void **)&th, 1);
         gc_collect_root(&th->arg, 1); // probably not needed
         if (th->id == xTaskGetCurrentTaskHandle()) {
@@ -91,7 +91,7 @@ void mp_thread_set_state(mp_state_thread_t *state) {
 
 void mp_thread_start(void) {
     mp_thread_mutex_lock(&thread_mutex, 1);
-    for (thread_t *th = thread; th != NULL; th = th->next) {
+    for (mp_thread_t *th = thread; th != NULL; th = th->next) {
         if (th->id == xTaskGetCurrentTaskHandle()) {
             th->ready = 1;
             break;
@@ -124,7 +124,7 @@ void mp_thread_create(void *(*entry)(void *), void *arg, size_t *stack_size) {
     // allocate TCB, stack and linked-list node (must be outside thread_mutex lock)
     StaticTask_t *tcb = m_new(StaticTask_t, 1);
     StackType_t *stack = m_new(StackType_t, *stack_size / sizeof(StackType_t));
-    thread_t *th = m_new_obj(thread_t);
+    mp_thread_t *th = m_new_obj(mp_thread_t);
 
     mp_thread_mutex_lock(&thread_mutex, 1);
 
@@ -153,7 +153,7 @@ void mp_thread_create(void *(*entry)(void *), void *arg, size_t *stack_size) {
 void mp_thread_finish(void) {
     mp_thread_mutex_lock(&thread_mutex, 1);
     // TODO unlink from list
-    for (thread_t *th = thread; th != NULL; th = th->next) {
+    for (mp_thread_t *th = thread; th != NULL; th = th->next) {
         if (th->id == xTaskGetCurrentTaskHandle()) {
             th->ready = 0;
             break;
diff --git a/ports/esp32/mpthreadport.c b/ports/esp32/mpthreadport.c
index 9d1c4a758c523..e6c7e9bc80eb2 100644
--- a/ports/esp32/mpthreadport.c
+++ b/ports/esp32/mpthreadport.c
@@ -42,19 +42,19 @@
 #define MP_THREAD_PRIORITY                              (ESP_TASK_PRIO_MIN + 1)
 
 // this structure forms a linked list, one node per active thread
-typedef struct _thread_t {
+typedef struct _mp_thread_t {
     TaskHandle_t id;        // system id of thread
     int ready;              // whether the thread is ready and running
     void *arg;              // thread Python args, a GC root pointer
     void *stack;            // pointer to the stack
     size_t stack_len;       // number of words in the stack
-    struct _thread_t *next;
-} thread_t;
+    struct _mp_thread_t *next;
+} mp_thread_t;
 
 // the mutex controls access to the linked list
 STATIC mp_thread_mutex_t thread_mutex;
-STATIC thread_t thread_entry0;
-STATIC thread_t *thread = NULL; // root pointer, handled by mp_thread_gc_others
+STATIC mp_thread_t thread_entry0;
+STATIC mp_thread_t *thread = NULL; // root pointer, handled by mp_thread_gc_others
 
 void mp_thread_init(void *stack, uint32_t stack_len) {
     mp_thread_set_state(&mp_state_ctx.thread);
@@ -76,7 +76,7 @@ void mp_thread_init(void *stack, uint32_t stack_len) {
 
 void mp_thread_gc_others(void) {
     mp_thread_mutex_lock(&thread_mutex, 1);
-    for (thread_t *th = thread; th != NULL; th = th->next) {
+    for (mp_thread_t *th = thread; th != NULL; th = th->next) {
         gc_collect_root((void **)&th, 1);
         gc_collect_root(&th->arg, 1); // probably not needed
         if (th->id == xTaskGetCurrentTaskHandle()) {
@@ -100,7 +100,7 @@ void mp_thread_set_state(mp_state_thread_t *state) {
 
 void mp_thread_start(void) {
     mp_thread_mutex_lock(&thread_mutex, 1);
-    for (thread_t *th = thread; th != NULL; th = th->next) {
+    for (mp_thread_t *th = thread; th != NULL; th = th->next) {
         if (th->id == xTaskGetCurrentTaskHandle()) {
             th->ready = 1;
             break;
@@ -131,7 +131,7 @@ void mp_thread_create_ex(void *(*entry)(void *), void *arg, size_t *stack_size,
     }
 
     // Allocate linked-list node (must be outside thread_mutex lock)
-    thread_t *th = m_new_obj(thread_t);
+    mp_thread_t *th = m_new_obj(mp_thread_t);
 
     mp_thread_mutex_lock(&thread_mutex, 1);
 
@@ -162,7 +162,7 @@ void mp_thread_create(void *(*entry)(void *), void *arg, size_t *stack_size) {
 
 void mp_thread_finish(void) {
     mp_thread_mutex_lock(&thread_mutex, 1);
-    for (thread_t *th = thread; th != NULL; th = th->next) {
+    for (mp_thread_t *th = thread; th != NULL; th = th->next) {
         if (th->id == xTaskGetCurrentTaskHandle()) {
             th->ready = 0;
             break;
@@ -178,9 +178,9 @@ void vPortCleanUpTCB(void *tcb) {
         // threading not yet initialised
         return;
     }
-    thread_t *prev = NULL;
+    mp_thread_t *prev = NULL;
     mp_thread_mutex_lock(&thread_mutex, 1);
-    for (thread_t *th = thread; th != NULL; prev = th, th = th->next) {
+    for (mp_thread_t *th = thread; th != NULL; prev = th, th = th->next) {
         // unlink the node from the list
         if ((void *)th->id == tcb) {
             if (prev != NULL) {
@@ -216,7 +216,7 @@ void mp_thread_deinit(void) {
         // Find a task to delete
         TaskHandle_t id = NULL;
         mp_thread_mutex_lock(&thread_mutex, 1);
-        for (thread_t *th = thread; th != NULL; th = th->next) {
+        for (mp_thread_t *th = thread; th != NULL; th = th->next) {
             // Don't delete the current task
             if (th->id != xTaskGetCurrentTaskHandle()) {
                 id = th->id;
diff --git a/ports/unix/mpthreadport.c b/ports/unix/mpthreadport.c
index 63aac1da38520..2ec7e65d3bb1d 100644
--- a/ports/unix/mpthreadport.c
+++ b/ports/unix/mpthreadport.c
@@ -53,12 +53,12 @@
 #define THREAD_STACK_OVERFLOW_MARGIN (8192)
 
 // this structure forms a linked list, one node per active thread
-typedef struct _thread_t {
+typedef struct _mp_thread_t {
     pthread_t id;           // system id of thread
     int ready;              // whether the thread is ready and running
     void *arg;              // thread Python args, a GC root pointer
-    struct _thread_t *next;
-} thread_t;
+    struct _mp_thread_t *next;
+} mp_thread_t;
 
 STATIC pthread_key_t tls_key;
 
@@ -66,7 +66,7 @@ STATIC pthread_key_t tls_key;
 // Specifically for thread management, access to the linked list is one example.
 // But also, e.g. scheduler state.
 STATIC pthread_mutex_t thread_mutex;
-STATIC thread_t *thread;
+STATIC mp_thread_t *thread;
 
 // this is used to synchronise the signal handler of the thread
 // it's needed because we can't use any pthread calls in a signal handler
@@ -119,7 +119,7 @@ void mp_thread_init(void) {
     pthread_mutex_init(&thread_mutex, &thread_mutex_attr);
 
     // create first entry in linked list of all threads
-    thread = malloc(sizeof(thread_t));
+    thread = malloc(sizeof(mp_thread_t));
     thread->id = pthread_self();
     thread->ready = 1;
     thread->arg = NULL;
@@ -143,7 +143,7 @@ void mp_thread_init(void) {
 void mp_thread_deinit(void) {
     mp_thread_unix_begin_atomic_section();
     while (thread->next != NULL) {
-        thread_t *th = thread;
+        mp_thread_t *th = thread;
         thread = thread->next;
         pthread_cancel(th->id);
         free(th);
@@ -165,7 +165,7 @@ void mp_thread_deinit(void) {
 // garbage collection and tracing these pointers.
 void mp_thread_gc_others(void) {
     mp_thread_unix_begin_atomic_section();
-    for (thread_t *th = thread; th != NULL; th = th->next) {
+    for (mp_thread_t *th = thread; th != NULL; th = th->next) {
         gc_collect_root(&th->arg, 1);
         if (th->id == pthread_self()) {
             continue;
@@ -194,7 +194,7 @@ void mp_thread_set_state(mp_state_thread_t *state) {
 void mp_thread_start(void) {
     pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, NULL);
     mp_thread_unix_begin_atomic_section();
-    for (thread_t *th = thread; th != NULL; th = th->next) {
+    for (mp_thread_t *th = thread; th != NULL; th = th->next) {
         if (th->id == pthread_self()) {
             th->ready = 1;
             break;
@@ -249,7 +249,7 @@ void mp_thread_create(void *(*entry)(void *), void *arg, size_t *stack_size) {
     *stack_size -= THREAD_STACK_OVERFLOW_MARGIN;
 
     // add thread to linked list of all threads
-    thread_t *th = malloc(sizeof(thread_t));
+    mp_thread_t *th = malloc(sizeof(mp_thread_t));
     th->id = id;
     th->ready = 0;
     th->arg = arg;
@@ -266,8 +266,8 @@ void mp_thread_create(void *(*entry)(void *), void *arg, size_t *stack_size) {
 
 void mp_thread_finish(void) {
     mp_thread_unix_begin_atomic_section();
-    thread_t *prev = NULL;
-    for (thread_t *th = thread; th != NULL; th = th->next) {
+    mp_thread_t *prev = NULL;
+    for (mp_thread_t *th = thread; th != NULL; th = th->next) {
         if (th->id == pthread_self()) {
             if (prev == NULL) {
                 thread = th->next;

From c012318d74fed232b1c872a1a0cacf91ebcb1b6d Mon Sep 17 00:00:00 2001
From: David Lechner <david@lechnology.com>
Date: Tue, 3 May 2022 22:26:29 -0500
Subject: [PATCH 2068/3533] unix: Implement `-X realtime` command-line option
 on macOS.

This adds a new command line option to the unix port `-X realtime` to
enable realtime priority on threads.  This enables high precision timers
for applications that need more accurate timers.

Related docs:
https://developer.apple.com/library/archive/technotes/tn2169/_index.html

Fixes issue #8621.

Signed-off-by: David Lechner <david@pybricks.com>
---
 docs/unix/quickref.rst    |  2 ++
 ports/unix/main.c         | 13 ++++++++++++
 ports/unix/mpthreadport.c | 43 +++++++++++++++++++++++++++++++++++++++
 ports/unix/mpthreadport.h |  7 +++++++
 4 files changed, 65 insertions(+)

diff --git a/docs/unix/quickref.rst b/docs/unix/quickref.rst
index ec5312a53515b..2eac1edc79786 100644
--- a/docs/unix/quickref.rst
+++ b/docs/unix/quickref.rst
@@ -73,6 +73,8 @@ General options:
     - ``-X heapsize=<n>[w][K|M]`` sets the heap size for the garbage collector.
       The suffix ``w`` means words instead of bytes. ``K`` means x1024 and ``M``
       means x1024x1024.
+    - ``-X realtime`` sets thread priority to realtime. This can be used to
+      improve timer precision. Only available on macOS.
 
 
 
diff --git a/ports/unix/main.c b/ports/unix/main.c
index 8d7fcf4843a60..0e00db7fa2094 100644
--- a/ports/unix/main.c
+++ b/ports/unix/main.c
@@ -328,6 +328,10 @@ STATIC void print_help(char **argv) {
         , heap_size);
     impl_opts_cnt++;
     #endif
+    #if defined(__APPLE__)
+    printf("  realtime -- set thread priority to realtime\n");
+    impl_opts_cnt++;
+    #endif
 
     if (impl_opts_cnt == 0) {
         printf("  (none)\n");
@@ -399,6 +403,15 @@ STATIC void pre_process_options(int argc, char **argv) {
                         goto invalid_arg;
                     }
                 #endif
+                #if defined(__APPLE__)
+                } else if (strcmp(argv[a + 1], "realtime") == 0) {
+                    #if MICROPY_PY_THREAD
+                    mp_thread_is_realtime_enabled = true;
+                    #endif
+                    // main thread was already intialized before the option
+                    // was parsed, so we have to enable realtime here.
+                    mp_thread_set_realtime();
+                #endif
                 } else {
                 invalid_arg:
                     exit(invalid_args());
diff --git a/ports/unix/mpthreadport.c b/ports/unix/mpthreadport.c
index 2ec7e65d3bb1d..6a267e723635c 100644
--- a/ports/unix/mpthreadport.c
+++ b/ports/unix/mpthreadport.c
@@ -192,6 +192,13 @@ void mp_thread_set_state(mp_state_thread_t *state) {
 }
 
 void mp_thread_start(void) {
+    // enable realtime priority if `-X realtime` command line parameter was set
+    #if defined(__APPLE__)
+    if (mp_thread_is_realtime_enabled) {
+        mp_thread_set_realtime();
+    }
+    #endif
+
     pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, NULL);
     mp_thread_unix_begin_atomic_section();
     for (mp_thread_t *th = thread; th != NULL; th = th->next) {
@@ -310,3 +317,39 @@ void mp_thread_mutex_unlock(mp_thread_mutex_t *mutex) {
 }
 
 #endif // MICROPY_PY_THREAD
+
+// this is used even when MICROPY_PY_THREAD is disabled
+
+#if defined(__APPLE__)
+#include <mach/mach_error.h>
+#include <mach/mach_time.h>
+#include <mach/thread_act.h>
+#include <mach/thread_policy.h>
+
+bool mp_thread_is_realtime_enabled;
+
+// based on https://developer.apple.com/library/archive/technotes/tn2169/_index.html
+void mp_thread_set_realtime(void) {
+    mach_timebase_info_data_t timebase_info;
+
+    mach_timebase_info(&timebase_info);
+
+    const uint64_t NANOS_PER_MSEC = 1000000ULL;
+    double clock2abs = ((double)timebase_info.denom / (double)timebase_info.numer) * NANOS_PER_MSEC;
+
+    thread_time_constraint_policy_data_t policy;
+    policy.period = 0;
+    policy.computation = (uint32_t)(5 * clock2abs); // 5 ms of work
+    policy.constraint = (uint32_t)(10 * clock2abs);
+    policy.preemptible = FALSE;
+
+    int kr = thread_policy_set(pthread_mach_thread_np(pthread_self()),
+        THREAD_TIME_CONSTRAINT_POLICY,
+        (thread_policy_t)&policy,
+        THREAD_TIME_CONSTRAINT_POLICY_COUNT);
+
+    if (kr != KERN_SUCCESS) {
+        mach_error("thread_policy_set:", kr);
+    }
+}
+#endif
diff --git a/ports/unix/mpthreadport.h b/ports/unix/mpthreadport.h
index a7dbe08c4943d..b365f200edf97 100644
--- a/ports/unix/mpthreadport.h
+++ b/ports/unix/mpthreadport.h
@@ -25,6 +25,7 @@
  */
 
 #include <pthread.h>
+#include <stdbool.h>
 
 typedef pthread_mutex_t mp_thread_mutex_t;
 
@@ -36,3 +37,9 @@ void mp_thread_gc_others(void);
 // Functions as a port-global lock for any code that must be serialised.
 void mp_thread_unix_begin_atomic_section(void);
 void mp_thread_unix_end_atomic_section(void);
+
+// for `-X realtime` command line option
+#if defined(__APPLE__)
+extern bool mp_thread_is_realtime_enabled;
+void mp_thread_set_realtime(void);
+#endif

From d42d35f56d836dca843de30df4c2d069911dc9da Mon Sep 17 00:00:00 2001
From: David Lechner <david@pybricks.com>
Date: Fri, 20 May 2022 19:45:07 -0500
Subject: [PATCH 2069/3533] tests/run-tests.py: Enable `-X realtime` option for
 macOS tests.

This enables the new `-X realtime` runtime option when running tests on
macOS.  This causes MicroPython to configure all threads to be high
priority so that they are allowed to use high precision timers.  This
makes tests that depend on the passage of time more likely to succeed.

CI tests that were disabled because of this are now enabled again.

Signed-off-by: David Lechner <david@pybricks.com>
---
 tests/run-tests.py | 2 ++
 tools/ci.sh        | 3 +--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/tests/run-tests.py b/tests/run-tests.py
index 1fc857601490f..0cfd50f5c4e9a 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -258,6 +258,8 @@ def send_get(what):
             cmdlist = [MICROPYTHON, "-X", "emit=" + args.emit]
             if args.heapsize is not None:
                 cmdlist.extend(["-X", "heapsize=" + args.heapsize])
+            if sys.platform == "darwin":
+                cmdlist.extend(["-X", "realtime"])
 
             # if running via .mpy, first compile the .py file
             if args.via_mpy:
diff --git a/tools/ci.sh b/tools/ci.sh
index 3d084508ff220..67be9dad72731 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -572,10 +572,9 @@ function ci_unix_macos_build {
 
 function ci_unix_macos_run_tests {
     # Issues with macOS tests:
-    # - OSX has poor time resolution and these uasyncio tests do not have correct output
     # - import_pkg7 has a problem with relative imports
     # - urandom_basic has a problem with getrandbits(0)
-    (cd tests && ./run-tests.py --exclude 'uasyncio_(basic|gather|heaplock|lock|wait_task)' --exclude 'import_pkg7.py' --exclude 'urandom_basic.py')
+    (cd tests && ./run-tests.py --exclude 'import_pkg7.py' --exclude 'urandom_basic.py')
 }
 
 function ci_unix_qemu_mips_setup {

From 115a23da2413e2161418864ad1f699aec8797062 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 17 May 2022 16:30:24 +1000
Subject: [PATCH 2070/3533] lib/littlefs: Update littlefs2 to v2.5.0.

At commit 40dba4a556e0d81dfbe64301a6aa4e18ceca896c

Signed-off-by: Damien George <damien@micropython.org>
---
 lib/littlefs/lfs2.c      | 1367 +++++++++++++++++++++++++-------------
 lib/littlefs/lfs2.h      |   52 +-
 lib/littlefs/lfs2_util.c |    1 +
 lib/littlefs/lfs2_util.h |   11 +
 4 files changed, 941 insertions(+), 490 deletions(-)

diff --git a/lib/littlefs/lfs2.c b/lib/littlefs/lfs2.c
index 1f8c9d2d93d63..b708196d04cda 100644
--- a/lib/littlefs/lfs2.c
+++ b/lib/littlefs/lfs2.c
@@ -1,16 +1,33 @@
 /*
  * The little filesystem
  *
+ * Copyright (c) 2022, The littlefs authors.
  * Copyright (c) 2017, Arm Limited. All rights reserved.
  * SPDX-License-Identifier: BSD-3-Clause
  */
 #include "lfs2.h"
 #include "lfs2_util.h"
 
+
+// some constants used throughout the code
 #define LFS2_BLOCK_NULL ((lfs2_block_t)-1)
 #define LFS2_BLOCK_INLINE ((lfs2_block_t)-2)
 
+enum {
+    LFS2_OK_RELOCATED = 1,
+    LFS2_OK_DROPPED   = 2,
+    LFS2_OK_ORPHANED  = 3,
+};
+
+enum {
+    LFS2_CMP_EQ = 0,
+    LFS2_CMP_LT = 1,
+    LFS2_CMP_GT = 2,
+};
+
+
 /// Caching block device operations ///
+
 static inline void lfs2_cache_drop(lfs2_t *lfs2, lfs2_cache_t *rcache) {
     // do not zero, cheaper if cache is readonly or only going to be
     // written with identical data (during relocates)
@@ -107,12 +124,6 @@ static int lfs2_bd_read(lfs2_t *lfs2,
     return 0;
 }
 
-enum {
-    LFS2_CMP_EQ = 0,
-    LFS2_CMP_LT = 1,
-    LFS2_CMP_GT = 2,
-};
-
 static int lfs2_bd_cmp(lfs2_t *lfs2,
         const lfs2_cache_t *pcache, lfs2_cache_t *rcache, lfs2_size_t hint,
         lfs2_block_t block, lfs2_off_t off,
@@ -268,22 +279,26 @@ static inline int lfs2_pair_cmp(
              paira[0] == pairb[1] || paira[1] == pairb[0]);
 }
 
+#ifndef LFS2_READONLY
 static inline bool lfs2_pair_sync(
         const lfs2_block_t paira[2],
         const lfs2_block_t pairb[2]) {
     return (paira[0] == pairb[0] && paira[1] == pairb[1]) ||
            (paira[0] == pairb[1] && paira[1] == pairb[0]);
 }
+#endif
 
 static inline void lfs2_pair_fromle32(lfs2_block_t pair[2]) {
     pair[0] = lfs2_fromle32(pair[0]);
     pair[1] = lfs2_fromle32(pair[1]);
 }
 
+#ifndef LFS2_READONLY
 static inline void lfs2_pair_tole32(lfs2_block_t pair[2]) {
     pair[0] = lfs2_tole32(pair[0]);
     pair[1] = lfs2_tole32(pair[1]);
 }
+#endif
 
 // operations on 32-bit entry tags
 typedef uint32_t lfs2_tag_t;
@@ -365,6 +380,7 @@ static inline bool lfs2_gstate_iszero(const lfs2_gstate_t *a) {
     return true;
 }
 
+#ifndef LFS2_READONLY
 static inline bool lfs2_gstate_hasorphans(const lfs2_gstate_t *a) {
     return lfs2_tag_size(a->tag);
 }
@@ -376,6 +392,7 @@ static inline uint8_t lfs2_gstate_getorphans(const lfs2_gstate_t *a) {
 static inline bool lfs2_gstate_hasmove(const lfs2_gstate_t *a) {
     return lfs2_tag_type1(a->tag);
 }
+#endif
 
 static inline bool lfs2_gstate_hasmovehere(const lfs2_gstate_t *a,
         const lfs2_block_t *pair) {
@@ -388,11 +405,13 @@ static inline void lfs2_gstate_fromle32(lfs2_gstate_t *a) {
     a->pair[1] = lfs2_fromle32(a->pair[1]);
 }
 
+#ifndef LFS2_READONLY
 static inline void lfs2_gstate_tole32(lfs2_gstate_t *a) {
     a->tag     = lfs2_tole32(a->tag);
     a->pair[0] = lfs2_tole32(a->pair[0]);
     a->pair[1] = lfs2_tole32(a->pair[1]);
 }
+#endif
 
 // other endianness operations
 static void lfs2_ctz_fromle32(struct lfs2_ctz *ctz) {
@@ -416,6 +435,7 @@ static inline void lfs2_superblock_fromle32(lfs2_superblock_t *superblock) {
     superblock->attr_max    = lfs2_fromle32(superblock->attr_max);
 }
 
+#ifndef LFS2_READONLY
 static inline void lfs2_superblock_tole32(lfs2_superblock_t *superblock) {
     superblock->version     = lfs2_tole32(superblock->version);
     superblock->block_size  = lfs2_tole32(superblock->block_size);
@@ -424,9 +444,10 @@ static inline void lfs2_superblock_tole32(lfs2_superblock_t *superblock) {
     superblock->file_max    = lfs2_tole32(superblock->file_max);
     superblock->attr_max    = lfs2_tole32(superblock->attr_max);
 }
+#endif
 
 #ifndef LFS2_NO_ASSERT
-static inline bool lfs2_mlist_isopen(struct lfs2_mlist *head,
+static bool lfs2_mlist_isopen(struct lfs2_mlist *head,
         struct lfs2_mlist *node) {
     for (struct lfs2_mlist **p = &head; *p; p = &(*p)->next) {
         if (*p == (struct lfs2_mlist*)node) {
@@ -438,7 +459,7 @@ static inline bool lfs2_mlist_isopen(struct lfs2_mlist *head,
 }
 #endif
 
-static inline void lfs2_mlist_remove(lfs2_t *lfs2, struct lfs2_mlist *mlist) {
+static void lfs2_mlist_remove(lfs2_t *lfs2, struct lfs2_mlist *mlist) {
     for (struct lfs2_mlist **p = &lfs2->mlist; *p; p = &(*p)->next) {
         if (*p == mlist) {
             *p = (*p)->next;
@@ -447,7 +468,7 @@ static inline void lfs2_mlist_remove(lfs2_t *lfs2, struct lfs2_mlist *mlist) {
     }
 }
 
-static inline void lfs2_mlist_append(lfs2_t *lfs2, struct lfs2_mlist *mlist) {
+static void lfs2_mlist_append(lfs2_t *lfs2, struct lfs2_mlist *mlist) {
     mlist->next = lfs2->mlist;
     lfs2->mlist = mlist;
 }
@@ -460,22 +481,22 @@ static int lfs2_dir_commit(lfs2_t *lfs2, lfs2_mdir_t *dir,
 static int lfs2_dir_compact(lfs2_t *lfs2,
         lfs2_mdir_t *dir, const struct lfs2_mattr *attrs, int attrcount,
         lfs2_mdir_t *source, uint16_t begin, uint16_t end);
-
+static lfs2_ssize_t lfs2_file_flushedwrite(lfs2_t *lfs2, lfs2_file_t *file,
+        const void *buffer, lfs2_size_t size);
 static lfs2_ssize_t lfs2_file_rawwrite(lfs2_t *lfs2, lfs2_file_t *file,
         const void *buffer, lfs2_size_t size);
 static int lfs2_file_rawsync(lfs2_t *lfs2, lfs2_file_t *file);
 static int lfs2_file_outline(lfs2_t *lfs2, lfs2_file_t *file);
 static int lfs2_file_flush(lfs2_t *lfs2, lfs2_file_t *file);
 
-static void lfs2_fs_preporphans(lfs2_t *lfs2, int8_t orphans);
+static int lfs2_fs_deorphan(lfs2_t *lfs2, bool powerloss);
+static int lfs2_fs_preporphans(lfs2_t *lfs2, int8_t orphans);
 static void lfs2_fs_prepmove(lfs2_t *lfs2,
         uint16_t id, const lfs2_block_t pair[2]);
 static int lfs2_fs_pred(lfs2_t *lfs2, const lfs2_block_t dir[2],
         lfs2_mdir_t *pdir);
 static lfs2_stag_t lfs2_fs_parent(lfs2_t *lfs2, const lfs2_block_t dir[2],
         lfs2_mdir_t *parent);
-static int lfs2_fs_relocate(lfs2_t *lfs2,
-        const lfs2_block_t oldpair[2], lfs2_block_t newpair[2]);
 static int lfs2_fs_forceconsistency(lfs2_t *lfs2);
 #endif
 
@@ -486,6 +507,8 @@ static int lfs21_traverse(lfs2_t *lfs2,
 
 static int lfs2_dir_rawrewind(lfs2_t *lfs2, lfs2_dir_t *dir);
 
+static lfs2_ssize_t lfs2_file_flushedread(lfs2_t *lfs2, lfs2_file_t *file,
+        void *buffer, lfs2_size_t size);
 static lfs2_ssize_t lfs2_file_rawread(lfs2_t *lfs2, lfs2_file_t *file,
         void *buffer, lfs2_size_t size);
 static int lfs2_file_rawclose(lfs2_t *lfs2, lfs2_file_t *file);
@@ -726,6 +749,7 @@ static int lfs2_dir_traverse_filter(void *p,
             (LFS2_MKTAG(0x7ff, 0x3ff, 0) & tag) == (
                 LFS2_MKTAG(LFS2_TYPE_DELETE, 0, 0) |
                     (LFS2_MKTAG(0, 0x3ff, 0) & *filtertag))) {
+        *filtertag = LFS2_MKTAG(LFS2_FROM_NOOP, 0, 0);
         return true;
     }
 
@@ -740,98 +764,232 @@ static int lfs2_dir_traverse_filter(void *p,
 #endif
 
 #ifndef LFS2_READONLY
+// maximum recursive depth of lfs2_dir_traverse, the deepest call:
+//
+// traverse with commit
+// '-> traverse with move
+//     '-> traverse with filter
+//
+#define LFS2_DIR_TRAVERSE_DEPTH 3
+
+struct lfs2_dir_traverse {
+    const lfs2_mdir_t *dir;
+    lfs2_off_t off;
+    lfs2_tag_t ptag;
+    const struct lfs2_mattr *attrs;
+    int attrcount;
+
+    lfs2_tag_t tmask;
+    lfs2_tag_t ttag;
+    uint16_t begin;
+    uint16_t end;
+    int16_t diff;
+
+    int (*cb)(void *data, lfs2_tag_t tag, const void *buffer);
+    void *data;
+
+    lfs2_tag_t tag;
+    const void *buffer;
+    struct lfs2_diskoff disk;
+};
+
 static int lfs2_dir_traverse(lfs2_t *lfs2,
         const lfs2_mdir_t *dir, lfs2_off_t off, lfs2_tag_t ptag,
         const struct lfs2_mattr *attrs, int attrcount,
         lfs2_tag_t tmask, lfs2_tag_t ttag,
         uint16_t begin, uint16_t end, int16_t diff,
         int (*cb)(void *data, lfs2_tag_t tag, const void *buffer), void *data) {
+    // This function in inherently recursive, but bounded. To allow tool-based
+    // analysis without unnecessary code-cost we use an explicit stack
+    struct lfs2_dir_traverse stack[LFS2_DIR_TRAVERSE_DEPTH-1];
+    unsigned sp = 0;
+    int res;
+
     // iterate over directory and attrs
+    lfs2_tag_t tag;
+    const void *buffer;
+    struct lfs2_diskoff disk;
     while (true) {
-        lfs2_tag_t tag;
-        const void *buffer;
-        struct lfs2_diskoff disk;
-        if (off+lfs2_tag_dsize(ptag) < dir->off) {
-            off += lfs2_tag_dsize(ptag);
-            int err = lfs2_bd_read(lfs2,
-                    NULL, &lfs2->rcache, sizeof(tag),
-                    dir->pair[0], off, &tag, sizeof(tag));
-            if (err) {
-                return err;
-            }
-
-            tag = (lfs2_frombe32(tag) ^ ptag) | 0x80000000;
-            disk.block = dir->pair[0];
-            disk.off = off+sizeof(lfs2_tag_t);
-            buffer = &disk;
-            ptag = tag;
-        } else if (attrcount > 0) {
-            tag = attrs[0].tag;
-            buffer = attrs[0].buffer;
-            attrs += 1;
-            attrcount -= 1;
-        } else {
-            return 0;
-        }
-
-        lfs2_tag_t mask = LFS2_MKTAG(0x7ff, 0, 0);
-        if ((mask & tmask & tag) != (mask & tmask & ttag)) {
-            continue;
-        }
+        {
+            if (off+lfs2_tag_dsize(ptag) < dir->off) {
+                off += lfs2_tag_dsize(ptag);
+                int err = lfs2_bd_read(lfs2,
+                        NULL, &lfs2->rcache, sizeof(tag),
+                        dir->pair[0], off, &tag, sizeof(tag));
+                if (err) {
+                    return err;
+                }
 
-        // do we need to filter? inlining the filtering logic here allows
-        // for some minor optimizations
-        if (lfs2_tag_id(tmask) != 0) {
-            // scan for duplicates and update tag based on creates/deletes
-            int filter = lfs2_dir_traverse(lfs2,
-                    dir, off, ptag, attrs, attrcount,
-                    0, 0, 0, 0, 0,
-                    lfs2_dir_traverse_filter, &tag);
-            if (filter < 0) {
-                return filter;
+                tag = (lfs2_frombe32(tag) ^ ptag) | 0x80000000;
+                disk.block = dir->pair[0];
+                disk.off = off+sizeof(lfs2_tag_t);
+                buffer = &disk;
+                ptag = tag;
+            } else if (attrcount > 0) {
+                tag = attrs[0].tag;
+                buffer = attrs[0].buffer;
+                attrs += 1;
+                attrcount -= 1;
+            } else {
+                // finished traversal, pop from stack?
+                res = 0;
+                break;
             }
 
-            if (filter) {
+            // do we need to filter?
+            lfs2_tag_t mask = LFS2_MKTAG(0x7ff, 0, 0);
+            if ((mask & tmask & tag) != (mask & tmask & ttag)) {
                 continue;
             }
 
-            // in filter range?
-            if (!(lfs2_tag_id(tag) >= begin && lfs2_tag_id(tag) < end)) {
+            if (lfs2_tag_id(tmask) != 0) {
+                LFS2_ASSERT(sp < LFS2_DIR_TRAVERSE_DEPTH);
+                // recurse, scan for duplicates, and update tag based on
+                // creates/deletes
+                stack[sp] = (struct lfs2_dir_traverse){
+                    .dir        = dir,
+                    .off        = off,
+                    .ptag       = ptag,
+                    .attrs      = attrs,
+                    .attrcount  = attrcount,
+                    .tmask      = tmask,
+                    .ttag       = ttag,
+                    .begin      = begin,
+                    .end        = end,
+                    .diff       = diff,
+                    .cb         = cb,
+                    .data       = data,
+                    .tag        = tag,
+                    .buffer     = buffer,
+                    .disk       = disk,
+                };
+                sp += 1;
+
+                dir = dir;
+                off = off;
+                ptag = ptag;
+                attrs = attrs;
+                attrcount = attrcount;
+                tmask = 0;
+                ttag = 0;
+                begin = 0;
+                end = 0;
+                diff = 0;
+                cb = lfs2_dir_traverse_filter;
+                data = &stack[sp-1].tag;
                 continue;
             }
         }
 
+popped:
+        // in filter range?
+        if (lfs2_tag_id(tmask) != 0 &&
+                !(lfs2_tag_id(tag) >= begin && lfs2_tag_id(tag) < end)) {
+            continue;
+        }
+
         // handle special cases for mcu-side operations
         if (lfs2_tag_type3(tag) == LFS2_FROM_NOOP) {
             // do nothing
         } else if (lfs2_tag_type3(tag) == LFS2_FROM_MOVE) {
+            // Without this condition, lfs2_dir_traverse can exhibit an
+            // extremely expensive O(n^3) of nested loops when renaming.
+            // This happens because lfs2_dir_traverse tries to filter tags by
+            // the tags in the source directory, triggering a second
+            // lfs2_dir_traverse with its own filter operation.
+            //
+            // traverse with commit
+            // '-> traverse with filter
+            //     '-> traverse with move
+            //         '-> traverse with filter
+            //
+            // However we don't actually care about filtering the second set of
+            // tags, since duplicate tags have no effect when filtering.
+            //
+            // This check skips this unnecessary recursive filtering explicitly,
+            // reducing this runtime from O(n^3) to O(n^2).
+            if (cb == lfs2_dir_traverse_filter) {
+                continue;
+            }
+
+            // recurse into move
+            stack[sp] = (struct lfs2_dir_traverse){
+                .dir        = dir,
+                .off        = off,
+                .ptag       = ptag,
+                .attrs      = attrs,
+                .attrcount  = attrcount,
+                .tmask      = tmask,
+                .ttag       = ttag,
+                .begin      = begin,
+                .end        = end,
+                .diff       = diff,
+                .cb         = cb,
+                .data       = data,
+                .tag        = LFS2_MKTAG(LFS2_FROM_NOOP, 0, 0),
+            };
+            sp += 1;
+
             uint16_t fromid = lfs2_tag_size(tag);
             uint16_t toid = lfs2_tag_id(tag);
-            int err = lfs2_dir_traverse(lfs2,
-                    buffer, 0, 0xffffffff, NULL, 0,
-                    LFS2_MKTAG(0x600, 0x3ff, 0),
-                    LFS2_MKTAG(LFS2_TYPE_STRUCT, 0, 0),
-                    fromid, fromid+1, toid-fromid+diff,
-                    cb, data);
-            if (err) {
-                return err;
-            }
+            dir = buffer;
+            off = 0;
+            ptag = 0xffffffff;
+            attrs = NULL;
+            attrcount = 0;
+            tmask = LFS2_MKTAG(0x600, 0x3ff, 0);
+            ttag = LFS2_MKTAG(LFS2_TYPE_STRUCT, 0, 0);
+            begin = fromid;
+            end = fromid+1;
+            diff = toid-fromid+diff;
         } else if (lfs2_tag_type3(tag) == LFS2_FROM_USERATTRS) {
             for (unsigned i = 0; i < lfs2_tag_size(tag); i++) {
                 const struct lfs2_attr *a = buffer;
-                int err = cb(data, LFS2_MKTAG(LFS2_TYPE_USERATTR + a[i].type,
+                res = cb(data, LFS2_MKTAG(LFS2_TYPE_USERATTR + a[i].type,
                         lfs2_tag_id(tag) + diff, a[i].size), a[i].buffer);
-                if (err) {
-                    return err;
+                if (res < 0) {
+                    return res;
+                }
+
+                if (res) {
+                    break;
                 }
             }
         } else {
-            int err = cb(data, tag + LFS2_MKTAG(0, diff, 0), buffer);
-            if (err) {
-                return err;
+            res = cb(data, tag + LFS2_MKTAG(0, diff, 0), buffer);
+            if (res < 0) {
+                return res;
+            }
+
+            if (res) {
+                break;
             }
         }
     }
+
+    if (sp > 0) {
+        // pop from the stack and return, fortunately all pops share
+        // a destination
+        dir         = stack[sp-1].dir;
+        off         = stack[sp-1].off;
+        ptag        = stack[sp-1].ptag;
+        attrs       = stack[sp-1].attrs;
+        attrcount   = stack[sp-1].attrcount;
+        tmask       = stack[sp-1].tmask;
+        ttag        = stack[sp-1].ttag;
+        begin       = stack[sp-1].begin;
+        end         = stack[sp-1].end;
+        diff        = stack[sp-1].diff;
+        cb          = stack[sp-1].cb;
+        data        = stack[sp-1].data;
+        tag         = stack[sp-1].tag;
+        buffer      = stack[sp-1].buffer;
+        disk        = stack[sp-1].disk;
+        sp -= 1;
+        goto popped;
+    } else {
+        return res;
+    }
 }
 #endif
 
@@ -1449,7 +1607,7 @@ static int lfs2_dir_alloc(lfs2_t *lfs2, lfs2_mdir_t *dir) {
         }
     }
 
-    // zero for reproducability in case initial block is unreadable
+    // zero for reproducibility in case initial block is unreadable
     dir->rev = 0;
 
     // rather than clobbering one of the blocks we just pretend
@@ -1508,8 +1666,7 @@ static int lfs2_dir_drop(lfs2_t *lfs2, lfs2_mdir_t *dir, lfs2_mdir_t *tail) {
 static int lfs2_dir_split(lfs2_t *lfs2,
         lfs2_mdir_t *dir, const struct lfs2_mattr *attrs, int attrcount,
         lfs2_mdir_t *source, uint16_t split, uint16_t end) {
-    // create tail directory
-    lfs2_alloc_ack(lfs2);
+    // create tail metadata pair
     lfs2_mdir_t tail;
     int err = lfs2_dir_alloc(lfs2, &tail);
     if (err) {
@@ -1520,9 +1677,10 @@ static int lfs2_dir_split(lfs2_t *lfs2,
     tail.tail[0] = dir->tail[0];
     tail.tail[1] = dir->tail[1];
 
-    err = lfs2_dir_compact(lfs2, &tail, attrs, attrcount, source, split, end);
-    if (err) {
-        return err;
+    // note we don't care about LFS2_OK_RELOCATED
+    int res = lfs2_dir_compact(lfs2, &tail, attrs, attrcount, source, split, end);
+    if (res < 0) {
+        return res;
     }
 
     dir->tail[0] = tail.pair[0];
@@ -1563,106 +1721,45 @@ static int lfs2_dir_commit_commit(void *p, lfs2_tag_t tag, const void *buffer) {
 }
 #endif
 
+#ifndef LFS2_READONLY
+static bool lfs2_dir_needsrelocation(lfs2_t *lfs2, lfs2_mdir_t *dir) {
+    // If our revision count == n * block_cycles, we should force a relocation,
+    // this is how littlefs wear-levels at the metadata-pair level. Note that we
+    // actually use (block_cycles+1)|1, this is to avoid two corner cases:
+    // 1. block_cycles = 1, which would prevent relocations from terminating
+    // 2. block_cycles = 2n, which, due to aliasing, would only ever relocate
+    //    one metadata block in the pair, effectively making this useless
+    return (lfs2->cfg->block_cycles > 0
+            && ((dir->rev + 1) % ((lfs2->cfg->block_cycles+1)|1) == 0));
+}
+#endif
+
 #ifndef LFS2_READONLY
 static int lfs2_dir_compact(lfs2_t *lfs2,
         lfs2_mdir_t *dir, const struct lfs2_mattr *attrs, int attrcount,
         lfs2_mdir_t *source, uint16_t begin, uint16_t end) {
     // save some state in case block is bad
-    const lfs2_block_t oldpair[2] = {dir->pair[0], dir->pair[1]};
     bool relocated = false;
-    bool tired = false;
-
-    // should we split?
-    while (end - begin > 1) {
-        // find size
-        lfs2_size_t size = 0;
-        int err = lfs2_dir_traverse(lfs2,
-                source, 0, 0xffffffff, attrs, attrcount,
-                LFS2_MKTAG(0x400, 0x3ff, 0),
-                LFS2_MKTAG(LFS2_TYPE_NAME, 0, 0),
-                begin, end, -begin,
-                lfs2_dir_commit_size, &size);
-        if (err) {
-            return err;
-        }
-
-        // space is complicated, we need room for tail, crc, gstate,
-        // cleanup delete, and we cap at half a block to give room
-        // for metadata updates.
-        if (end - begin < 0xff &&
-                size <= lfs2_min(lfs2->cfg->block_size - 36,
-                    lfs2_alignup(lfs2->cfg->block_size/2,
-                        lfs2->cfg->prog_size))) {
-            break;
-        }
-
-        // can't fit, need to split, we should really be finding the
-        // largest size that fits with a small binary search, but right now
-        // it's not worth the code size
-        uint16_t split = (end - begin) / 2;
-        err = lfs2_dir_split(lfs2, dir, attrs, attrcount,
-                source, begin+split, end);
-        if (err) {
-            // if we fail to split, we may be able to overcompact, unless
-            // we're too big for even the full block, in which case our
-            // only option is to error
-            if (err == LFS2_ERR_NOSPC && size <= lfs2->cfg->block_size - 36) {
-                break;
-            }
-            return err;
-        }
-
-        end = begin + split;
-    }
+    bool tired = lfs2_dir_needsrelocation(lfs2, dir);
 
     // increment revision count
     dir->rev += 1;
-    // If our revision count == n * block_cycles, we should force a relocation,
-    // this is how littlefs wear-levels at the metadata-pair level. Note that we
-    // actually use (block_cycles+1)|1, this is to avoid two corner cases:
-    // 1. block_cycles = 1, which would prevent relocations from terminating
-    // 2. block_cycles = 2n, which, due to aliasing, would only ever relocate
-    //    one metadata block in the pair, effectively making this useless
-    if (lfs2->cfg->block_cycles > 0 &&
-            (dir->rev % ((lfs2->cfg->block_cycles+1)|1) == 0)) {
-        if (lfs2_pair_cmp(dir->pair, (const lfs2_block_t[2]){0, 1}) == 0) {
-            // oh no! we're writing too much to the superblock,
-            // should we expand?
-            lfs2_ssize_t res = lfs2_fs_rawsize(lfs2);
-            if (res < 0) {
-                return res;
-            }
 
-            // do we have extra space? littlefs can't reclaim this space
-            // by itself, so expand cautiously
-            if ((lfs2_size_t)res < lfs2->cfg->block_count/2) {
-                LFS2_DEBUG("Expanding superblock at rev %"PRIu32, dir->rev);
-                int err = lfs2_dir_split(lfs2, dir, attrs, attrcount,
-                        source, begin, end);
-                if (err && err != LFS2_ERR_NOSPC) {
-                    return err;
-                }
-
-                // welp, we tried, if we ran out of space there's not much
-                // we can do, we'll error later if we've become frozen
-                if (!err) {
-                    end = begin;
-                }
-            }
+    // do not proactively relocate blocks during migrations, this
+    // can cause a number of failure states such: clobbering the
+    // v1 superblock if we relocate root, and invalidating directory
+    // pointers if we relocate the head of a directory. On top of
+    // this, relocations increase the overall complexity of
+    // lfs2_migration, which is already a delicate operation.
 #ifdef LFS2_MIGRATE
-        } else if (lfs2->lfs21) {
-            // do not proactively relocate blocks during migrations, this
-            // can cause a number of failure states such: clobbering the
-            // v1 superblock if we relocate root, and invalidating directory
-            // pointers if we relocate the head of a directory. On top of
-            // this, relocations increase the overall complexity of
-            // lfs2_migration, which is already a delicate operation.
+    if (lfs2->lfs21) {
+        tired = false;
+    }
 #endif
-        } else {
-            // we're writing too much, time to relocate
-            tired = true;
-            goto relocate;
-        }
+
+    if (tired && lfs2_pair_cmp(dir->pair, (const lfs2_block_t[2]){0, 1}) != 0) {
+        // we're writing too much, time to relocate
+        goto relocate;
     }
 
     // begin loop to commit compaction to blocks until a compact sticks
@@ -1676,7 +1773,8 @@ static int lfs2_dir_compact(lfs2_t *lfs2,
                 .crc = 0xffffffff,
 
                 .begin = 0,
-                .end = lfs2->cfg->block_size - 8,
+                .end = (lfs2->cfg->metadata_max ?
+                    lfs2->cfg->metadata_max : lfs2->cfg->block_size) - 8,
             };
 
             // erase block to write to
@@ -1805,44 +1903,114 @@ static int lfs2_dir_compact(lfs2_t *lfs2,
         continue;
     }
 
-    if (relocated) {
-        // update references if we relocated
-        LFS2_DEBUG("Relocating {0x%"PRIx32", 0x%"PRIx32"} "
-                    "-> {0x%"PRIx32", 0x%"PRIx32"}",
-                oldpair[0], oldpair[1], dir->pair[0], dir->pair[1]);
-        int err = lfs2_fs_relocate(lfs2, oldpair, dir->pair);
-        if (err) {
-            return err;
-        }
-    }
-
-    return 0;
+    return relocated ? LFS2_OK_RELOCATED : 0;
 }
 #endif
 
 #ifndef LFS2_READONLY
-static int lfs2_dir_commit(lfs2_t *lfs2, lfs2_mdir_t *dir,
-        const struct lfs2_mattr *attrs, int attrcount) {
-    // check for any inline files that aren't RAM backed and
-    // forcefully evict them, needed for filesystem consistency
-    for (lfs2_file_t *f = (lfs2_file_t*)lfs2->mlist; f; f = f->next) {
-        if (dir != &f->m && lfs2_pair_cmp(f->m.pair, dir->pair) == 0 &&
-                f->type == LFS2_TYPE_REG && (f->flags & LFS2_F_INLINE) &&
-                f->ctz.size > lfs2->cfg->cache_size) {
-            int err = lfs2_file_outline(lfs2, f);
+static int lfs2_dir_splittingcompact(lfs2_t *lfs2, lfs2_mdir_t *dir,
+        const struct lfs2_mattr *attrs, int attrcount,
+        lfs2_mdir_t *source, uint16_t begin, uint16_t end) {
+    while (true) {
+        // find size of first split, we do this by halving the split until
+        // the metadata is guaranteed to fit
+        //
+        // Note that this isn't a true binary search, we never increase the
+        // split size. This may result in poorly distributed metadata but isn't
+        // worth the extra code size or performance hit to fix.
+        lfs2_size_t split = begin;
+        while (end - split > 1) {
+            lfs2_size_t size = 0;
+            int err = lfs2_dir_traverse(lfs2,
+                    source, 0, 0xffffffff, attrs, attrcount,
+                    LFS2_MKTAG(0x400, 0x3ff, 0),
+                    LFS2_MKTAG(LFS2_TYPE_NAME, 0, 0),
+                    split, end, -split,
+                    lfs2_dir_commit_size, &size);
             if (err) {
                 return err;
             }
 
-            err = lfs2_file_flush(lfs2, f);
-            if (err) {
+            // space is complicated, we need room for tail, crc, gstate,
+            // cleanup delete, and we cap at half a block to give room
+            // for metadata updates.
+            if (end - split < 0xff
+                    && size <= lfs2_min(lfs2->cfg->block_size - 36,
+                        lfs2_alignup(
+                            (lfs2->cfg->metadata_max
+                                ? lfs2->cfg->metadata_max
+                                : lfs2->cfg->block_size)/2,
+                            lfs2->cfg->prog_size))) {
+                break;
+            }
+
+            split = split + ((end - split) / 2);
+        }
+
+        if (split == begin) {
+            // no split needed
+            break;
+        }
+
+        // split into two metadata pairs and continue
+        int err = lfs2_dir_split(lfs2, dir, attrs, attrcount,
+                source, split, end);
+        if (err && err != LFS2_ERR_NOSPC) {
+            return err;
+        }
+
+        if (err) {
+            // we can't allocate a new block, try to compact with degraded
+            // performance
+            LFS2_WARN("Unable to split {0x%"PRIx32", 0x%"PRIx32"}",
+                    dir->pair[0], dir->pair[1]);
+            break;
+        } else {
+            end = split;
+        }
+    }
+
+    if (lfs2_dir_needsrelocation(lfs2, dir)
+            && lfs2_pair_cmp(dir->pair, (const lfs2_block_t[2]){0, 1}) == 0) {
+        // oh no! we're writing too much to the superblock,
+        // should we expand?
+        lfs2_ssize_t size = lfs2_fs_rawsize(lfs2);
+        if (size < 0) {
+            return size;
+        }
+
+        // do we have extra space? littlefs can't reclaim this space
+        // by itself, so expand cautiously
+        if ((lfs2_size_t)size < lfs2->cfg->block_count/2) {
+            LFS2_DEBUG("Expanding superblock at rev %"PRIu32, dir->rev);
+            int err = lfs2_dir_split(lfs2, dir, attrs, attrcount,
+                    source, begin, end);
+            if (err && err != LFS2_ERR_NOSPC) {
                 return err;
             }
+
+            if (err) {
+                // welp, we tried, if we ran out of space there's not much
+                // we can do, we'll error later if we've become frozen
+                LFS2_WARN("Unable to expand superblock");
+            } else {
+                end = begin;
+            }
         }
     }
 
+    return lfs2_dir_compact(lfs2, dir, attrs, attrcount, source, begin, end);
+}
+#endif
+
+#ifndef LFS2_READONLY
+static int lfs2_dir_relocatingcommit(lfs2_t *lfs2, lfs2_mdir_t *dir,
+        const lfs2_block_t pair[2],
+        const struct lfs2_mattr *attrs, int attrcount,
+        lfs2_mdir_t *pdir) {
+    int state = 0;
+
     // calculate changes to the directory
-    lfs2_mdir_t olddir = *dir;
     bool hasdelete = false;
     for (int i = 0; i < attrcount; i++) {
         if (lfs2_tag_type3(attrs[i].tag) == LFS2_TYPE_CREATE) {
@@ -1861,23 +2029,19 @@ static int lfs2_dir_commit(lfs2_t *lfs2, lfs2_mdir_t *dir,
 
     // should we actually drop the directory block?
     if (hasdelete && dir->count == 0) {
-        lfs2_mdir_t pdir;
-        int err = lfs2_fs_pred(lfs2, dir->pair, &pdir);
+        LFS2_ASSERT(pdir);
+        int err = lfs2_fs_pred(lfs2, dir->pair, pdir);
         if (err && err != LFS2_ERR_NOENT) {
-            *dir = olddir;
             return err;
         }
 
-        if (err != LFS2_ERR_NOENT && pdir.split) {
-            err = lfs2_dir_drop(lfs2, &pdir, dir);
-            if (err) {
-                *dir = olddir;
-                return err;
-            }
+        if (err != LFS2_ERR_NOENT && pdir->split) {
+            state = LFS2_OK_DROPPED;
+            goto fixmlist;
         }
     }
 
-    if (dir->erased || dir->count >= 0xff) {
+    if (dir->erased) {
         // try to commit
         struct lfs2_commit commit = {
             .block = dir->pair[0],
@@ -1886,7 +2050,8 @@ static int lfs2_dir_commit(lfs2_t *lfs2, lfs2_mdir_t *dir,
             .crc = 0xffffffff,
 
             .begin = dir->off,
-            .end = lfs2->cfg->block_size - 8,
+            .end = (lfs2->cfg->metadata_max ?
+                lfs2->cfg->metadata_max : lfs2->cfg->block_size) - 8,
         };
 
         // traverse attrs that need to be written out
@@ -1901,7 +2066,6 @@ static int lfs2_dir_commit(lfs2_t *lfs2, lfs2_mdir_t *dir,
             if (err == LFS2_ERR_NOSPC || err == LFS2_ERR_CORRUPT) {
                 goto compact;
             }
-            *dir = olddir;
             return err;
         }
 
@@ -1914,7 +2078,6 @@ static int lfs2_dir_commit(lfs2_t *lfs2, lfs2_mdir_t *dir,
         if (!lfs2_gstate_iszero(&delta)) {
             err = lfs2_dir_getgstate(lfs2, dir, &delta);
             if (err) {
-                *dir = olddir;
                 return err;
             }
 
@@ -1926,7 +2089,6 @@ static int lfs2_dir_commit(lfs2_t *lfs2, lfs2_mdir_t *dir,
                 if (err == LFS2_ERR_NOSPC || err == LFS2_ERR_CORRUPT) {
                     goto compact;
                 }
-                *dir = olddir;
                 return err;
             }
         }
@@ -1937,7 +2099,6 @@ static int lfs2_dir_commit(lfs2_t *lfs2, lfs2_mdir_t *dir,
             if (err == LFS2_ERR_NOSPC || err == LFS2_ERR_CORRUPT) {
                 goto compact;
             }
-            *dir = olddir;
             return err;
         }
 
@@ -1948,19 +2109,23 @@ static int lfs2_dir_commit(lfs2_t *lfs2, lfs2_mdir_t *dir,
         // and update gstate
         lfs2->gdisk = lfs2->gstate;
         lfs2->gdelta = (lfs2_gstate_t){0};
-    } else {
+
+        goto fixmlist;
+    }
+
 compact:
-        // fall back to compaction
-        lfs2_cache_drop(lfs2, &lfs2->pcache);
+    // fall back to compaction
+    lfs2_cache_drop(lfs2, &lfs2->pcache);
 
-        int err = lfs2_dir_compact(lfs2, dir, attrs, attrcount,
-                dir, 0, dir->count);
-        if (err) {
-            *dir = olddir;
-            return err;
-        }
+    state = lfs2_dir_splittingcompact(lfs2, dir, attrs, attrcount,
+            dir, 0, dir->count);
+    if (state < 0) {
+        return state;
     }
 
+    goto fixmlist;
+
+fixmlist:;
     // this complicated bit of logic is for fixing up any active
     // metadata-pairs that we may have affected
     //
@@ -1968,33 +2133,32 @@ static int lfs2_dir_commit(lfs2_t *lfs2, lfs2_mdir_t *dir,
     // lfs2_dir_commit could also be in this list, and even then
     // we need to copy the pair so they don't get clobbered if we refetch
     // our mdir.
+    lfs2_block_t oldpair[2] = {pair[0], pair[1]};
     for (struct lfs2_mlist *d = lfs2->mlist; d; d = d->next) {
-        if (&d->m != dir && lfs2_pair_cmp(d->m.pair, olddir.pair) == 0) {
+        if (lfs2_pair_cmp(d->m.pair, oldpair) == 0) {
             d->m = *dir;
-            for (int i = 0; i < attrcount; i++) {
-                if (lfs2_tag_type3(attrs[i].tag) == LFS2_TYPE_DELETE &&
-                        d->id == lfs2_tag_id(attrs[i].tag)) {
-                    d->m.pair[0] = LFS2_BLOCK_NULL;
-                    d->m.pair[1] = LFS2_BLOCK_NULL;
-                } else if (lfs2_tag_type3(attrs[i].tag) == LFS2_TYPE_DELETE &&
-                        d->id > lfs2_tag_id(attrs[i].tag)) {
-                    d->id -= 1;
-                    if (d->type == LFS2_TYPE_DIR) {
-                        ((lfs2_dir_t*)d)->pos -= 1;
-                    }
-                } else if (lfs2_tag_type3(attrs[i].tag) == LFS2_TYPE_CREATE &&
-                        d->id >= lfs2_tag_id(attrs[i].tag)) {
-                    d->id += 1;
-                    if (d->type == LFS2_TYPE_DIR) {
-                        ((lfs2_dir_t*)d)->pos += 1;
+            if (d->m.pair != pair) {
+                for (int i = 0; i < attrcount; i++) {
+                    if (lfs2_tag_type3(attrs[i].tag) == LFS2_TYPE_DELETE &&
+                            d->id == lfs2_tag_id(attrs[i].tag)) {
+                        d->m.pair[0] = LFS2_BLOCK_NULL;
+                        d->m.pair[1] = LFS2_BLOCK_NULL;
+                    } else if (lfs2_tag_type3(attrs[i].tag) == LFS2_TYPE_DELETE &&
+                            d->id > lfs2_tag_id(attrs[i].tag)) {
+                        d->id -= 1;
+                        if (d->type == LFS2_TYPE_DIR) {
+                            ((lfs2_dir_t*)d)->pos -= 1;
+                        }
+                    } else if (lfs2_tag_type3(attrs[i].tag) == LFS2_TYPE_CREATE &&
+                            d->id >= lfs2_tag_id(attrs[i].tag)) {
+                        d->id += 1;
+                        if (d->type == LFS2_TYPE_DIR) {
+                            ((lfs2_dir_t*)d)->pos += 1;
+                        }
                     }
                 }
             }
-        }
-    }
 
-    for (struct lfs2_mlist *d = lfs2->mlist; d; d = d->next) {
-        if (lfs2_pair_cmp(d->m.pair, olddir.pair) == 0) {
             while (d->id >= d->m.count && d->m.split) {
                 // we split and id is on tail now
                 d->id -= d->m.count;
@@ -2006,6 +2170,221 @@ static int lfs2_dir_commit(lfs2_t *lfs2, lfs2_mdir_t *dir,
         }
     }
 
+    return state;
+}
+#endif
+
+#ifndef LFS2_READONLY
+static int lfs2_dir_orphaningcommit(lfs2_t *lfs2, lfs2_mdir_t *dir,
+        const struct lfs2_mattr *attrs, int attrcount) {
+    // check for any inline files that aren't RAM backed and
+    // forcefully evict them, needed for filesystem consistency
+    for (lfs2_file_t *f = (lfs2_file_t*)lfs2->mlist; f; f = f->next) {
+        if (dir != &f->m && lfs2_pair_cmp(f->m.pair, dir->pair) == 0 &&
+                f->type == LFS2_TYPE_REG && (f->flags & LFS2_F_INLINE) &&
+                f->ctz.size > lfs2->cfg->cache_size) {
+            int err = lfs2_file_outline(lfs2, f);
+            if (err) {
+                return err;
+            }
+
+            err = lfs2_file_flush(lfs2, f);
+            if (err) {
+                return err;
+            }
+        }
+    }
+
+    lfs2_block_t lpair[2] = {dir->pair[0], dir->pair[1]};
+    lfs2_mdir_t ldir = *dir;
+    lfs2_mdir_t pdir;
+    int state = lfs2_dir_relocatingcommit(lfs2, &ldir, dir->pair,
+            attrs, attrcount, &pdir);
+    if (state < 0) {
+        return state;
+    }
+
+    // update if we're not in mlist, note we may have already been
+    // updated if we are in mlist
+    if (lfs2_pair_cmp(dir->pair, lpair) == 0) {
+        *dir = ldir;
+    }
+
+    // commit was successful, but may require other changes in the
+    // filesystem, these would normally be tail recursive, but we have
+    // flattened them here avoid unbounded stack usage
+
+    // need to drop?
+    if (state == LFS2_OK_DROPPED) {
+        // steal state
+        int err = lfs2_dir_getgstate(lfs2, dir, &lfs2->gdelta);
+        if (err) {
+            return err;
+        }
+
+        // steal tail, note that this can't create a recursive drop
+        lpair[0] = pdir.pair[0];
+        lpair[1] = pdir.pair[1];
+        lfs2_pair_tole32(dir->tail);
+        state = lfs2_dir_relocatingcommit(lfs2, &pdir, lpair, LFS2_MKATTRS(
+                    {LFS2_MKTAG(LFS2_TYPE_TAIL + dir->split, 0x3ff, 8),
+                        dir->tail}),
+                NULL);
+        lfs2_pair_fromle32(dir->tail);
+        if (state < 0) {
+            return state;
+        }
+
+        ldir = pdir;
+    }
+
+    // need to relocate?
+    bool orphans = false;
+    while (state == LFS2_OK_RELOCATED) {
+        LFS2_DEBUG("Relocating {0x%"PRIx32", 0x%"PRIx32"} "
+                    "-> {0x%"PRIx32", 0x%"PRIx32"}",
+                lpair[0], lpair[1], ldir.pair[0], ldir.pair[1]);
+        state = 0;
+
+        // update internal root
+        if (lfs2_pair_cmp(lpair, lfs2->root) == 0) {
+            lfs2->root[0] = ldir.pair[0];
+            lfs2->root[1] = ldir.pair[1];
+        }
+
+        // update internally tracked dirs
+        for (struct lfs2_mlist *d = lfs2->mlist; d; d = d->next) {
+            if (lfs2_pair_cmp(lpair, d->m.pair) == 0) {
+                d->m.pair[0] = ldir.pair[0];
+                d->m.pair[1] = ldir.pair[1];
+            }
+
+            if (d->type == LFS2_TYPE_DIR &&
+                    lfs2_pair_cmp(lpair, ((lfs2_dir_t*)d)->head) == 0) {
+                ((lfs2_dir_t*)d)->head[0] = ldir.pair[0];
+                ((lfs2_dir_t*)d)->head[1] = ldir.pair[1];
+            }
+        }
+
+        // find parent
+        lfs2_stag_t tag = lfs2_fs_parent(lfs2, lpair, &pdir);
+        if (tag < 0 && tag != LFS2_ERR_NOENT) {
+            return tag;
+        }
+
+        bool hasparent = (tag != LFS2_ERR_NOENT);
+        if (tag != LFS2_ERR_NOENT) {
+            // note that if we have a parent, we must have a pred, so this will
+            // always create an orphan
+            int err = lfs2_fs_preporphans(lfs2, +1);
+            if (err) {
+                return err;
+            }
+
+            // fix pending move in this pair? this looks like an optimization but
+            // is in fact _required_ since relocating may outdate the move.
+            uint16_t moveid = 0x3ff;
+            if (lfs2_gstate_hasmovehere(&lfs2->gstate, pdir.pair)) {
+                moveid = lfs2_tag_id(lfs2->gstate.tag);
+                LFS2_DEBUG("Fixing move while relocating "
+                        "{0x%"PRIx32", 0x%"PRIx32"} 0x%"PRIx16"\n",
+                        pdir.pair[0], pdir.pair[1], moveid);
+                lfs2_fs_prepmove(lfs2, 0x3ff, NULL);
+                if (moveid < lfs2_tag_id(tag)) {
+                    tag -= LFS2_MKTAG(0, 1, 0);
+                }
+            }
+
+            lfs2_block_t ppair[2] = {pdir.pair[0], pdir.pair[1]};
+            lfs2_pair_tole32(ldir.pair);
+            state = lfs2_dir_relocatingcommit(lfs2, &pdir, ppair, LFS2_MKATTRS(
+                        {LFS2_MKTAG_IF(moveid != 0x3ff,
+                            LFS2_TYPE_DELETE, moveid, 0), NULL},
+                        {tag, ldir.pair}),
+                    NULL);
+            lfs2_pair_fromle32(ldir.pair);
+            if (state < 0) {
+                return state;
+            }
+
+            if (state == LFS2_OK_RELOCATED) {
+                lpair[0] = ppair[0];
+                lpair[1] = ppair[1];
+                ldir = pdir;
+                orphans = true;
+                continue;
+            }
+        }
+
+        // find pred
+        int err = lfs2_fs_pred(lfs2, lpair, &pdir);
+        if (err && err != LFS2_ERR_NOENT) {
+            return err;
+        }
+        LFS2_ASSERT(!(hasparent && err == LFS2_ERR_NOENT));
+
+        // if we can't find dir, it must be new
+        if (err != LFS2_ERR_NOENT) {
+            if (lfs2_gstate_hasorphans(&lfs2->gstate)) {
+                // next step, clean up orphans
+                err = lfs2_fs_preporphans(lfs2, -hasparent);
+                if (err) {
+                    return err;
+                }
+            }
+
+            // fix pending move in this pair? this looks like an optimization
+            // but is in fact _required_ since relocating may outdate the move.
+            uint16_t moveid = 0x3ff;
+            if (lfs2_gstate_hasmovehere(&lfs2->gstate, pdir.pair)) {
+                moveid = lfs2_tag_id(lfs2->gstate.tag);
+                LFS2_DEBUG("Fixing move while relocating "
+                        "{0x%"PRIx32", 0x%"PRIx32"} 0x%"PRIx16"\n",
+                        pdir.pair[0], pdir.pair[1], moveid);
+                lfs2_fs_prepmove(lfs2, 0x3ff, NULL);
+            }
+
+            // replace bad pair, either we clean up desync, or no desync occured
+            lpair[0] = pdir.pair[0];
+            lpair[1] = pdir.pair[1];
+            lfs2_pair_tole32(ldir.pair);
+            state = lfs2_dir_relocatingcommit(lfs2, &pdir, lpair, LFS2_MKATTRS(
+                        {LFS2_MKTAG_IF(moveid != 0x3ff,
+                            LFS2_TYPE_DELETE, moveid, 0), NULL},
+                        {LFS2_MKTAG(LFS2_TYPE_TAIL + pdir.split, 0x3ff, 8),
+                            ldir.pair}),
+                    NULL);
+            lfs2_pair_fromle32(ldir.pair);
+            if (state < 0) {
+                return state;
+            }
+
+            ldir = pdir;
+        }
+    }
+
+    return orphans ? LFS2_OK_ORPHANED : 0;
+}
+#endif
+
+#ifndef LFS2_READONLY
+static int lfs2_dir_commit(lfs2_t *lfs2, lfs2_mdir_t *dir,
+        const struct lfs2_mattr *attrs, int attrcount) {
+    int orphans = lfs2_dir_orphaningcommit(lfs2, dir, attrs, attrcount);
+    if (orphans < 0) {
+        return orphans;
+    }
+
+    if (orphans) {
+        // make sure we've removed all orphans, this is a noop if there
+        // are none, but if we had nested blocks failures we may have
+        // created some
+        int err = lfs2_fs_deorphan(lfs2, false);
+        if (err) {
+            return err;
+        }
+    }
+
     return 0;
 }
 #endif
@@ -2060,10 +2439,13 @@ static int lfs2_rawmkdir(lfs2_t *lfs2, const char *path) {
         return err;
     }
 
-    // current block end of list?
+    // current block not end of list?
     if (cwd.m.split) {
         // update tails, this creates a desync
-        lfs2_fs_preporphans(lfs2, +1);
+        err = lfs2_fs_preporphans(lfs2, +1);
+        if (err) {
+            return err;
+        }
 
         // it's possible our predecessor has to be relocated, and if
         // our parent is our predecessor's predecessor, this could have
@@ -2083,7 +2465,10 @@ static int lfs2_rawmkdir(lfs2_t *lfs2, const char *path) {
         }
 
         lfs2->mlist = cwd.next;
-        lfs2_fs_preporphans(lfs2, -1);
+        err = lfs2_fs_preporphans(lfs2, -1);
+        if (err) {
+            return err;
+        }
     }
 
     // now insert into our parent block
@@ -2504,8 +2889,11 @@ static int lfs2_file_rawopencfg(lfs2_t *lfs2, lfs2_file_t *file,
                 {LFS2_MKTAG(LFS2_TYPE_CREATE, file->id, 0), NULL},
                 {LFS2_MKTAG(LFS2_TYPE_REG, file->id, nlen), path},
                 {LFS2_MKTAG(LFS2_TYPE_INLINESTRUCT, file->id, 0), NULL}));
+
+        // it may happen that the file name doesn't fit in the metadata blocks, e.g., a 256 byte file name will
+        // not fit in a 128 byte block.
+        err = (err == LFS2_ERR_NOSPC) ? LFS2_ERR_NAMETOOLONG : err;
         if (err) {
-            err = LFS2_ERR_NAMETOOLONG;
             goto cleanup;
         }
 
@@ -2721,7 +3109,6 @@ static int lfs2_file_outline(lfs2_t *lfs2, lfs2_file_t *file) {
 }
 #endif
 
-#ifndef LFS2_READONLY
 static int lfs2_file_flush(lfs2_t *lfs2, lfs2_file_t *file) {
     if (file->flags & LFS2_F_READING) {
         if (!(file->flags & LFS2_F_INLINE)) {
@@ -2730,6 +3117,7 @@ static int lfs2_file_flush(lfs2_t *lfs2, lfs2_file_t *file) {
         file->flags &= ~LFS2_F_READING;
     }
 
+#ifndef LFS2_READONLY
     if (file->flags & LFS2_F_WRITING) {
         lfs2_off_t pos = file->pos;
 
@@ -2748,12 +3136,12 @@ static int lfs2_file_flush(lfs2_t *lfs2, lfs2_file_t *file) {
                 // copy over a byte at a time, leave it up to caching
                 // to make this efficient
                 uint8_t data;
-                lfs2_ssize_t res = lfs2_file_rawread(lfs2, &orig, &data, 1);
+                lfs2_ssize_t res = lfs2_file_flushedread(lfs2, &orig, &data, 1);
                 if (res < 0) {
                     return res;
                 }
 
-                res = lfs2_file_rawwrite(lfs2, file, &data, 1);
+                res = lfs2_file_flushedwrite(lfs2, file, &data, 1);
                 if (res < 0) {
                     return res;
                 }
@@ -2796,10 +3184,10 @@ static int lfs2_file_flush(lfs2_t *lfs2, lfs2_file_t *file) {
 
         file->pos = pos;
     }
+#endif
 
     return 0;
 }
-#endif
 
 #ifndef LFS2_READONLY
 static int lfs2_file_rawsync(lfs2_t *lfs2, lfs2_file_t *file) {
@@ -2854,23 +3242,11 @@ static int lfs2_file_rawsync(lfs2_t *lfs2, lfs2_file_t *file) {
 }
 #endif
 
-static lfs2_ssize_t lfs2_file_rawread(lfs2_t *lfs2, lfs2_file_t *file,
+static lfs2_ssize_t lfs2_file_flushedread(lfs2_t *lfs2, lfs2_file_t *file,
         void *buffer, lfs2_size_t size) {
-    LFS2_ASSERT((file->flags & LFS2_O_RDONLY) == LFS2_O_RDONLY);
-
     uint8_t *data = buffer;
     lfs2_size_t nsize = size;
 
-#ifndef LFS2_READONLY
-    if (file->flags & LFS2_F_WRITING) {
-        // flush out any writes
-        int err = lfs2_file_flush(lfs2, file);
-        if (err) {
-            return err;
-        }
-    }
-#endif
-
     if (file->pos >= file->ctz.size) {
         // eof if past end
         return 0;
@@ -2927,48 +3303,36 @@ static lfs2_ssize_t lfs2_file_rawread(lfs2_t *lfs2, lfs2_file_t *file,
     return size;
 }
 
-#ifndef LFS2_READONLY
-static lfs2_ssize_t lfs2_file_rawwrite(lfs2_t *lfs2, lfs2_file_t *file,
-        const void *buffer, lfs2_size_t size) {
-    LFS2_ASSERT((file->flags & LFS2_O_WRONLY) == LFS2_O_WRONLY);
-
-    const uint8_t *data = buffer;
-    lfs2_size_t nsize = size;
+static lfs2_ssize_t lfs2_file_rawread(lfs2_t *lfs2, lfs2_file_t *file,
+        void *buffer, lfs2_size_t size) {
+    LFS2_ASSERT((file->flags & LFS2_O_RDONLY) == LFS2_O_RDONLY);
 
-    if (file->flags & LFS2_F_READING) {
-        // drop any reads
+#ifndef LFS2_READONLY
+    if (file->flags & LFS2_F_WRITING) {
+        // flush out any writes
         int err = lfs2_file_flush(lfs2, file);
         if (err) {
             return err;
         }
     }
+#endif
 
-    if ((file->flags & LFS2_O_APPEND) && file->pos < file->ctz.size) {
-        file->pos = file->ctz.size;
-    }
-
-    if (file->pos + size > lfs2->file_max) {
-        // Larger than file limit?
-        return LFS2_ERR_FBIG;
-    }
+    return lfs2_file_flushedread(lfs2, file, buffer, size);
+}
 
-    if (!(file->flags & LFS2_F_WRITING) && file->pos > file->ctz.size) {
-        // fill with zeros
-        lfs2_off_t pos = file->pos;
-        file->pos = file->ctz.size;
 
-        while (file->pos < pos) {
-            lfs2_ssize_t res = lfs2_file_rawwrite(lfs2, file, &(uint8_t){0}, 1);
-            if (res < 0) {
-                return res;
-            }
-        }
-    }
+#ifndef LFS2_READONLY
+static lfs2_ssize_t lfs2_file_flushedwrite(lfs2_t *lfs2, lfs2_file_t *file,
+        const void *buffer, lfs2_size_t size) {
+    const uint8_t *data = buffer;
+    lfs2_size_t nsize = size;
 
     if ((file->flags & LFS2_F_INLINE) &&
             lfs2_max(file->pos+nsize, file->ctz.size) >
             lfs2_min(0x3fe, lfs2_min(
-                lfs2->cfg->cache_size, lfs2->cfg->block_size/8))) {
+                lfs2->cfg->cache_size,
+                (lfs2->cfg->metadata_max ?
+                    lfs2->cfg->metadata_max : lfs2->cfg->block_size) / 8))) {
         // inline file doesn't fit anymore
         int err = lfs2_file_outline(lfs2, file);
         if (err) {
@@ -3043,29 +3407,72 @@ static lfs2_ssize_t lfs2_file_rawwrite(lfs2_t *lfs2, lfs2_file_t *file,
         lfs2_alloc_ack(lfs2);
     }
 
-    file->flags &= ~LFS2_F_ERRED;
     return size;
 }
-#endif
 
-static lfs2_soff_t lfs2_file_rawseek(lfs2_t *lfs2, lfs2_file_t *file,
-        lfs2_soff_t off, int whence) {
-#ifndef LFS2_READONLY
-    // write out everything beforehand, may be noop if rdonly
-    int err = lfs2_file_flush(lfs2, file);
-    if (err) {
-        return err;
+static lfs2_ssize_t lfs2_file_rawwrite(lfs2_t *lfs2, lfs2_file_t *file,
+        const void *buffer, lfs2_size_t size) {
+    LFS2_ASSERT((file->flags & LFS2_O_WRONLY) == LFS2_O_WRONLY);
+
+    if (file->flags & LFS2_F_READING) {
+        // drop any reads
+        int err = lfs2_file_flush(lfs2, file);
+        if (err) {
+            return err;
+        }
+    }
+
+    if ((file->flags & LFS2_O_APPEND) && file->pos < file->ctz.size) {
+        file->pos = file->ctz.size;
+    }
+
+    if (file->pos + size > lfs2->file_max) {
+        // Larger than file limit?
+        return LFS2_ERR_FBIG;
+    }
+
+    if (!(file->flags & LFS2_F_WRITING) && file->pos > file->ctz.size) {
+        // fill with zeros
+        lfs2_off_t pos = file->pos;
+        file->pos = file->ctz.size;
+
+        while (file->pos < pos) {
+            lfs2_ssize_t res = lfs2_file_flushedwrite(lfs2, file, &(uint8_t){0}, 1);
+            if (res < 0) {
+                return res;
+            }
+        }
+    }
+
+    lfs2_ssize_t nsize = lfs2_file_flushedwrite(lfs2, file, buffer, size);
+    if (nsize < 0) {
+        return nsize;
     }
+
+    file->flags &= ~LFS2_F_ERRED;
+    return nsize;
+}
 #endif
 
+static lfs2_soff_t lfs2_file_rawseek(lfs2_t *lfs2, lfs2_file_t *file,
+        lfs2_soff_t off, int whence) {
     // find new pos
     lfs2_off_t npos = file->pos;
     if (whence == LFS2_SEEK_SET) {
         npos = off;
     } else if (whence == LFS2_SEEK_CUR) {
-        npos = file->pos + off;
+        if ((lfs2_soff_t)file->pos + off < 0) {
+            return LFS2_ERR_INVAL;
+        } else {
+            npos = file->pos + off;
+        }
     } else if (whence == LFS2_SEEK_END) {
-        npos = file->ctz.size + off;
+        lfs2_soff_t res = lfs2_file_rawsize(lfs2, file) + off;
+        if (res < 0) {
+            return LFS2_ERR_INVAL;
+        } else {
+            npos = res;
+        }
     }
 
     if (npos > lfs2->file_max) {
@@ -3073,6 +3480,38 @@ static lfs2_soff_t lfs2_file_rawseek(lfs2_t *lfs2, lfs2_file_t *file,
         return LFS2_ERR_INVAL;
     }
 
+    if (file->pos == npos) {
+        // noop - position has not changed
+        return npos;
+    }
+
+    // if we're only reading and our new offset is still in the file's cache
+    // we can avoid flushing and needing to reread the data
+    if (
+#ifndef LFS2_READONLY
+        !(file->flags & LFS2_F_WRITING)
+#else
+        true
+#endif
+            ) {
+        int oindex = lfs2_ctz_index(lfs2, &(lfs2_off_t){file->pos});
+        lfs2_off_t noff = npos;
+        int nindex = lfs2_ctz_index(lfs2, &noff);
+        if (oindex == nindex
+                && noff >= file->cache.off
+                && noff < file->cache.off + file->cache.size) {
+            file->pos = npos;
+            file->off = noff;
+            return npos;
+        }
+    }
+
+    // write out everything beforehand, may be noop if rdonly
+    int err = lfs2_file_flush(lfs2, file);
+    if (err) {
+        return err;
+    }
+
     // update pos
     file->pos = npos;
     return npos;
@@ -3103,21 +3542,22 @@ static int lfs2_file_rawtruncate(lfs2_t *lfs2, lfs2_file_t *file, lfs2_off_t siz
             return err;
         }
 
+        // need to set pos/block/off consistently so seeking back to
+        // the old position does not get confused
+        file->pos = size;
         file->ctz.head = file->block;
         file->ctz.size = size;
         file->flags |= LFS2_F_DIRTY | LFS2_F_READING;
     } else if (size > oldsize) {
         // flush+seek if not already at end
-        if (file->pos != oldsize) {
-            lfs2_soff_t res = lfs2_file_rawseek(lfs2, file, 0, LFS2_SEEK_END);
-            if (res < 0) {
-                return (int)res;
-            }
+        lfs2_soff_t res = lfs2_file_rawseek(lfs2, file, 0, LFS2_SEEK_END);
+        if (res < 0) {
+            return (int)res;
         }
 
         // fill with zeros
         while (file->pos < size) {
-            lfs2_ssize_t res = lfs2_file_rawwrite(lfs2, file, &(uint8_t){0}, 1);
+            res = lfs2_file_rawwrite(lfs2, file, &(uint8_t){0}, 1);
             if (res < 0) {
                 return (int)res;
             }
@@ -3208,7 +3648,10 @@ static int lfs2_rawremove(lfs2_t *lfs2, const char *path) {
         }
 
         // mark fs as orphaned
-        lfs2_fs_preporphans(lfs2, +1);
+        err = lfs2_fs_preporphans(lfs2, +1);
+        if (err) {
+            return err;
+        }
 
         // I know it's crazy but yes, dir can be changed by our parent's
         // commit (if predecessor is child)
@@ -3228,7 +3671,10 @@ static int lfs2_rawremove(lfs2_t *lfs2, const char *path) {
     lfs2->mlist = dir.next;
     if (lfs2_tag_type3(tag) == LFS2_TYPE_DIR) {
         // fix orphan
-        lfs2_fs_preporphans(lfs2, -1);
+        err = lfs2_fs_preporphans(lfs2, -1);
+        if (err) {
+            return err;
+        }
 
         err = lfs2_fs_pred(lfs2, dir.m.pair, &cwd);
         if (err) {
@@ -3314,7 +3760,10 @@ static int lfs2_rawrename(lfs2_t *lfs2, const char *oldpath, const char *newpath
         }
 
         // mark fs as orphaned
-        lfs2_fs_preporphans(lfs2, +1);
+        err = lfs2_fs_preporphans(lfs2, +1);
+        if (err) {
+            return err;
+        }
 
         // I know it's crazy but yes, dir can be changed by our parent's
         // commit (if predecessor is child)
@@ -3355,9 +3804,13 @@ static int lfs2_rawrename(lfs2_t *lfs2, const char *oldpath, const char *newpath
     }
 
     lfs2->mlist = prevdir.next;
-    if (prevtag != LFS2_ERR_NOENT && lfs2_tag_type3(prevtag) == LFS2_TYPE_DIR) {
+    if (prevtag != LFS2_ERR_NOENT
+            && lfs2_tag_type3(prevtag) == LFS2_TYPE_DIR) {
         // fix orphan
-        lfs2_fs_preporphans(lfs2, -1);
+        err = lfs2_fs_preporphans(lfs2, -1);
+        if (err) {
+            return err;
+        }
 
         err = lfs2_fs_pred(lfs2, prevdir.m.pair, &newcwd);
         if (err) {
@@ -3538,6 +3991,8 @@ static int lfs2_init(lfs2_t *lfs2, const struct lfs2_config *cfg) {
         lfs2->attr_max = LFS2_ATTR_MAX;
     }
 
+    LFS2_ASSERT(lfs2->cfg->metadata_max <= lfs2->cfg->block_size);
+
     // setup default state
     lfs2->root[0] = LFS2_BLOCK_NULL;
     lfs2->root[1] = LFS2_BLOCK_NULL;
@@ -3618,12 +4073,6 @@ static int lfs2_rawformat(lfs2_t *lfs2, const struct lfs2_config *cfg) {
             goto cleanup;
         }
 
-        // sanity check that fetch works
-        err = lfs2_dir_fetch(lfs2, &root, (const lfs2_block_t[2]){0, 1});
-        if (err) {
-            goto cleanup;
-        }
-
         // force compaction to prevent accidentally mounting any
         // older version of littlefs that may live on disk
         root.erased = false;
@@ -3631,6 +4080,12 @@ static int lfs2_rawformat(lfs2_t *lfs2, const struct lfs2_config *cfg) {
         if (err) {
             goto cleanup;
         }
+
+        // sanity check that fetch works
+        err = lfs2_dir_fetch(lfs2, &root, (const lfs2_block_t[2]){0, 1});
+        if (err) {
+            goto cleanup;
+        }
     }
 
 cleanup:
@@ -3730,6 +4185,20 @@ static int lfs2_rawmount(lfs2_t *lfs2, const struct lfs2_config *cfg) {
 
                 lfs2->attr_max = superblock.attr_max;
             }
+
+            if (superblock.block_count != lfs2->cfg->block_count) {
+                LFS2_ERROR("Invalid block count (%"PRIu32" != %"PRIu32")",
+                        superblock.block_count, lfs2->cfg->block_count);
+                err = LFS2_ERR_INVAL;
+                goto cleanup;
+            }
+
+            if (superblock.block_size != lfs2->cfg->block_size) {
+                LFS2_ERROR("Invalid block size (%"PRIu32" != %"PRIu32")",
+                        superblock.block_count, lfs2->cfg->block_count);
+                err = LFS2_ERR_INVAL;
+                goto cleanup;
+            }
         }
 
         // has gstate?
@@ -3831,7 +4300,7 @@ int lfs2_fs_rawtraverse(lfs2_t *lfs2,
                 if (err) {
                     return err;
                 }
-            } else if (includeorphans && 
+            } else if (includeorphans &&
                     lfs2_tag_type3(tag) == LFS2_TYPE_DIRSTRUCT) {
                 for (int i = 0; i < 2; i++) {
                     err = cb(data, (&ctz.head)[i]);
@@ -3957,108 +4426,13 @@ static lfs2_stag_t lfs2_fs_parent(lfs2_t *lfs2, const lfs2_block_t pair[2],
 #endif
 
 #ifndef LFS2_READONLY
-static int lfs2_fs_relocate(lfs2_t *lfs2,
-        const lfs2_block_t oldpair[2], lfs2_block_t newpair[2]) {
-    // update internal root
-    if (lfs2_pair_cmp(oldpair, lfs2->root) == 0) {
-        lfs2->root[0] = newpair[0];
-        lfs2->root[1] = newpair[1];
-    }
-
-    // update internally tracked dirs
-    for (struct lfs2_mlist *d = lfs2->mlist; d; d = d->next) {
-        if (lfs2_pair_cmp(oldpair, d->m.pair) == 0) {
-            d->m.pair[0] = newpair[0];
-            d->m.pair[1] = newpair[1];
-        }
-
-        if (d->type == LFS2_TYPE_DIR &&
-                lfs2_pair_cmp(oldpair, ((lfs2_dir_t*)d)->head) == 0) {
-            ((lfs2_dir_t*)d)->head[0] = newpair[0];
-            ((lfs2_dir_t*)d)->head[1] = newpair[1];
-        }
-    }
-
-    // find parent
-    lfs2_mdir_t parent;
-    lfs2_stag_t tag = lfs2_fs_parent(lfs2, oldpair, &parent);
-    if (tag < 0 && tag != LFS2_ERR_NOENT) {
-        return tag;
-    }
-
-    if (tag != LFS2_ERR_NOENT) {
-        // update disk, this creates a desync
-        lfs2_fs_preporphans(lfs2, +1);
-
-        // fix pending move in this pair? this looks like an optimization but
-        // is in fact _required_ since relocating may outdate the move.
-        uint16_t moveid = 0x3ff;
-        if (lfs2_gstate_hasmovehere(&lfs2->gstate, parent.pair)) {
-            moveid = lfs2_tag_id(lfs2->gstate.tag);
-            LFS2_DEBUG("Fixing move while relocating "
-                    "{0x%"PRIx32", 0x%"PRIx32"} 0x%"PRIx16"\n",
-                    parent.pair[0], parent.pair[1], moveid);
-            lfs2_fs_prepmove(lfs2, 0x3ff, NULL);
-            if (moveid < lfs2_tag_id(tag)) {
-                tag -= LFS2_MKTAG(0, 1, 0);
-            }
-        }
-
-        lfs2_pair_tole32(newpair);
-        int err = lfs2_dir_commit(lfs2, &parent, LFS2_MKATTRS(
-                {LFS2_MKTAG_IF(moveid != 0x3ff,
-                    LFS2_TYPE_DELETE, moveid, 0), NULL},
-                {tag, newpair}));
-        lfs2_pair_fromle32(newpair);
-        if (err) {
-            return err;
-        }
-
-        // next step, clean up orphans
-        lfs2_fs_preporphans(lfs2, -1);
-    }
-
-    // find pred
-    int err = lfs2_fs_pred(lfs2, oldpair, &parent);
-    if (err && err != LFS2_ERR_NOENT) {
-        return err;
-    }
-
-    // if we can't find dir, it must be new
-    if (err != LFS2_ERR_NOENT) {
-        // fix pending move in this pair? this looks like an optimization but
-        // is in fact _required_ since relocating may outdate the move.
-        uint16_t moveid = 0x3ff;
-        if (lfs2_gstate_hasmovehere(&lfs2->gstate, parent.pair)) {
-            moveid = lfs2_tag_id(lfs2->gstate.tag);
-            LFS2_DEBUG("Fixing move while relocating "
-                    "{0x%"PRIx32", 0x%"PRIx32"} 0x%"PRIx16"\n",
-                    parent.pair[0], parent.pair[1], moveid);
-            lfs2_fs_prepmove(lfs2, 0x3ff, NULL);
-        }
-
-        // replace bad pair, either we clean up desync, or no desync occured
-        lfs2_pair_tole32(newpair);
-        err = lfs2_dir_commit(lfs2, &parent, LFS2_MKATTRS(
-                {LFS2_MKTAG_IF(moveid != 0x3ff,
-                    LFS2_TYPE_DELETE, moveid, 0), NULL},
-                {LFS2_MKTAG(LFS2_TYPE_TAIL + parent.split, 0x3ff, 8), newpair}));
-        lfs2_pair_fromle32(newpair);
-        if (err) {
-            return err;
-        }
-    }
-
-    return 0;
-}
-#endif
-
-#ifndef LFS2_READONLY
-static void lfs2_fs_preporphans(lfs2_t *lfs2, int8_t orphans) {
+static int lfs2_fs_preporphans(lfs2_t *lfs2, int8_t orphans) {
     LFS2_ASSERT(lfs2_tag_size(lfs2->gstate.tag) > 0 || orphans >= 0);
     lfs2->gstate.tag += orphans;
     lfs2->gstate.tag = ((lfs2->gstate.tag & ~LFS2_MKTAG(0x800, 0, 0)) |
             ((uint32_t)lfs2_gstate_hasorphans(&lfs2->gstate) << 31));
+
+    return 0;
 }
 #endif
 
@@ -4105,78 +4479,129 @@ static int lfs2_fs_demove(lfs2_t *lfs2) {
 #endif
 
 #ifndef LFS2_READONLY
-static int lfs2_fs_deorphan(lfs2_t *lfs2) {
+static int lfs2_fs_deorphan(lfs2_t *lfs2, bool powerloss) {
     if (!lfs2_gstate_hasorphans(&lfs2->gstate)) {
         return 0;
     }
 
-    // Fix any orphans
-    lfs2_mdir_t pdir = {.split = true, .tail = {0, 1}};
-    lfs2_mdir_t dir;
-
-    // iterate over all directory directory entries
-    while (!lfs2_pair_isnull(pdir.tail)) {
-        int err = lfs2_dir_fetch(lfs2, &dir, pdir.tail);
-        if (err) {
-            return err;
-        }
+    int8_t found = 0;
+restart:
+    {
+        // Fix any orphans
+        lfs2_mdir_t pdir = {.split = true, .tail = {0, 1}};
+        lfs2_mdir_t dir;
 
-        // check head blocks for orphans
-        if (!pdir.split) {
-            // check if we have a parent
-            lfs2_mdir_t parent;
-            lfs2_stag_t tag = lfs2_fs_parent(lfs2, pdir.tail, &parent);
-            if (tag < 0 && tag != LFS2_ERR_NOENT) {
-                return tag;
+        // iterate over all directory directory entries
+        while (!lfs2_pair_isnull(pdir.tail)) {
+            int err = lfs2_dir_fetch(lfs2, &dir, pdir.tail);
+            if (err) {
+                return err;
             }
 
-            if (tag == LFS2_ERR_NOENT) {
-                // we are an orphan
-                LFS2_DEBUG("Fixing orphan {0x%"PRIx32", 0x%"PRIx32"}",
-                        pdir.tail[0], pdir.tail[1]);
-
-                err = lfs2_dir_drop(lfs2, &pdir, &dir);
-                if (err) {
-                    return err;
+            // check head blocks for orphans
+            if (!pdir.split) {
+                // check if we have a parent
+                lfs2_mdir_t parent;
+                lfs2_stag_t tag = lfs2_fs_parent(lfs2, pdir.tail, &parent);
+                if (tag < 0 && tag != LFS2_ERR_NOENT) {
+                    return tag;
                 }
 
-                // refetch tail
-                continue;
-            }
+                // note we only check for full orphans if we may have had a
+                // power-loss, otherwise orphans are created intentionally
+                // during operations such as lfs2_mkdir
+                if (tag == LFS2_ERR_NOENT && powerloss) {
+                    // we are an orphan
+                    LFS2_DEBUG("Fixing orphan {0x%"PRIx32", 0x%"PRIx32"}",
+                            pdir.tail[0], pdir.tail[1]);
 
-            lfs2_block_t pair[2];
-            lfs2_stag_t res = lfs2_dir_get(lfs2, &parent,
-                    LFS2_MKTAG(0x7ff, 0x3ff, 0), tag, pair);
-            if (res < 0) {
-                return res;
-            }
-            lfs2_pair_fromle32(pair);
-
-            if (!lfs2_pair_sync(pair, pdir.tail)) {
-                // we have desynced
-                LFS2_DEBUG("Fixing half-orphan {0x%"PRIx32", 0x%"PRIx32"} "
-                            "-> {0x%"PRIx32", 0x%"PRIx32"}",
-                        pdir.tail[0], pdir.tail[1], pair[0], pair[1]);
-
-                lfs2_pair_tole32(pair);
-                err = lfs2_dir_commit(lfs2, &pdir, LFS2_MKATTRS(
-                        {LFS2_MKTAG(LFS2_TYPE_SOFTTAIL, 0x3ff, 8), pair}));
-                lfs2_pair_fromle32(pair);
-                if (err) {
-                    return err;
+                    // steal state
+                    err = lfs2_dir_getgstate(lfs2, &dir, &lfs2->gdelta);
+                    if (err) {
+                        return err;
+                    }
+
+                    // steal tail
+                    lfs2_pair_tole32(dir.tail);
+                    int state = lfs2_dir_orphaningcommit(lfs2, &pdir, LFS2_MKATTRS(
+                            {LFS2_MKTAG(LFS2_TYPE_TAIL + dir.split, 0x3ff, 8),
+                                dir.tail}));
+                    lfs2_pair_fromle32(dir.tail);
+                    if (state < 0) {
+                        return state;
+                    }
+
+                    found += 1;
+
+                    // did our commit create more orphans?
+                    if (state == LFS2_OK_ORPHANED) {
+                        goto restart;
+                    }
+
+                    // refetch tail
+                    continue;
                 }
 
-                // refetch tail
-                continue;
+                if (tag != LFS2_ERR_NOENT) {
+                    lfs2_block_t pair[2];
+                    lfs2_stag_t state = lfs2_dir_get(lfs2, &parent,
+                            LFS2_MKTAG(0x7ff, 0x3ff, 0), tag, pair);
+                    if (state < 0) {
+                        return state;
+                    }
+                    lfs2_pair_fromle32(pair);
+
+                    if (!lfs2_pair_sync(pair, pdir.tail)) {
+                        // we have desynced
+                        LFS2_DEBUG("Fixing half-orphan "
+                                "{0x%"PRIx32", 0x%"PRIx32"} "
+                                "-> {0x%"PRIx32", 0x%"PRIx32"}",
+                                pdir.tail[0], pdir.tail[1], pair[0], pair[1]);
+
+                        // fix pending move in this pair? this looks like an
+                        // optimization but is in fact _required_ since
+                        // relocating may outdate the move.
+                        uint16_t moveid = 0x3ff;
+                        if (lfs2_gstate_hasmovehere(&lfs2->gstate, pdir.pair)) {
+                            moveid = lfs2_tag_id(lfs2->gstate.tag);
+                            LFS2_DEBUG("Fixing move while fixing orphans "
+                                    "{0x%"PRIx32", 0x%"PRIx32"} 0x%"PRIx16"\n",
+                                    pdir.pair[0], pdir.pair[1], moveid);
+                            lfs2_fs_prepmove(lfs2, 0x3ff, NULL);
+                        }
+
+                        lfs2_pair_tole32(pair);
+                        state = lfs2_dir_orphaningcommit(lfs2, &pdir, LFS2_MKATTRS(
+                                {LFS2_MKTAG_IF(moveid != 0x3ff,
+                                    LFS2_TYPE_DELETE, moveid, 0), NULL},
+                                {LFS2_MKTAG(LFS2_TYPE_SOFTTAIL, 0x3ff, 8),
+                                    pair}));
+                        lfs2_pair_fromle32(pair);
+                        if (state < 0) {
+                            return state;
+                        }
+
+                        found += 1;
+
+                        // did our commit create more orphans?
+                        if (state == LFS2_OK_ORPHANED) {
+                            goto restart;
+                        }
+
+                        // refetch tail
+                        continue;
+                    }
+                }
             }
-        }
 
-        pdir = dir;
+            pdir = dir;
+        }
     }
 
     // mark orphans as fixed
-    lfs2_fs_preporphans(lfs2, -lfs2_gstate_getorphans(&lfs2->gstate));
-    return 0;
+    return lfs2_fs_preporphans(lfs2, -lfs2_min(
+            lfs2_gstate_getorphans(&lfs2->gstate),
+            found));
 }
 #endif
 
@@ -4187,7 +4612,7 @@ static int lfs2_fs_forceconsistency(lfs2_t *lfs2) {
         return err;
     }
 
-    err = lfs2_fs_deorphan(lfs2);
+    err = lfs2_fs_deorphan(lfs2, true);
     if (err) {
         return err;
     }
@@ -4725,7 +5150,7 @@ static int lfs2_rawmigrate(lfs2_t *lfs2, const struct lfs2_config *cfg) {
 
                 lfs21_entry_tole32(&entry1.d);
                 err = lfs2_dir_commit(lfs2, &dir2, LFS2_MKATTRS(
-                        {LFS2_MKTAG(LFS2_TYPE_CREATE, id, 0)},
+                        {LFS2_MKTAG(LFS2_TYPE_CREATE, id, 0), NULL},
                         {LFS2_MKTAG_IF_ELSE(isdir,
                             LFS2_TYPE_DIR, id, entry1.d.nlen,
                             LFS2_TYPE_REG, id, entry1.d.nlen),
@@ -4830,7 +5255,7 @@ static int lfs2_rawmigrate(lfs2_t *lfs2, const struct lfs2_config *cfg) {
 
         lfs2_superblock_tole32(&superblock);
         err = lfs2_dir_commit(lfs2, &dir2, LFS2_MKATTRS(
-                {LFS2_MKTAG(LFS2_TYPE_CREATE, 0, 0)},
+                {LFS2_MKTAG(LFS2_TYPE_CREATE, 0, 0), NULL},
                 {LFS2_MKTAG(LFS2_TYPE_SUPERBLOCK, 0, 8), "littlefs"},
                 {LFS2_MKTAG(LFS2_TYPE_INLINESTRUCT, 0, sizeof(superblock)),
                     &superblock}));
@@ -5044,6 +5469,7 @@ int lfs2_removeattr(lfs2_t *lfs2, const char *path, uint8_t type) {
 }
 #endif
 
+#ifndef LFS2_NO_MALLOC
 int lfs2_file_open(lfs2_t *lfs2, lfs2_file_t *file, const char *path, int flags) {
     int err = LFS2_LOCK(lfs2->cfg);
     if (err) {
@@ -5059,6 +5485,7 @@ int lfs2_file_open(lfs2_t *lfs2, lfs2_file_t *file, const char *path, int flags)
     LFS2_UNLOCK(lfs2->cfg);
     return err;
 }
+#endif
 
 int lfs2_file_opencfg(lfs2_t *lfs2, lfs2_file_t *file,
         const char *path, int flags,
diff --git a/lib/littlefs/lfs2.h b/lib/littlefs/lfs2.h
index e2afc7792ce4f..715764f7ce982 100644
--- a/lib/littlefs/lfs2.h
+++ b/lib/littlefs/lfs2.h
@@ -1,6 +1,7 @@
 /*
  * The little filesystem
  *
+ * Copyright (c) 2022, The littlefs authors.
  * Copyright (c) 2017, Arm Limited. All rights reserved.
  * SPDX-License-Identifier: BSD-3-Clause
  */
@@ -22,7 +23,7 @@ extern "C"
 // Software library version
 // Major (top-nibble), incremented on backwards incompatible changes
 // Minor (bottom-nibble), incremented on feature additions
-#define LFS2_VERSION 0x00020003
+#define LFS2_VERSION 0x00020005
 #define LFS2_VERSION_MAJOR (0xffff & (LFS2_VERSION >> 16))
 #define LFS2_VERSION_MINOR (0xffff & (LFS2_VERSION >>  0))
 
@@ -159,55 +160,55 @@ struct lfs2_config {
     // information to the block device operations
     void *context;
 
-    // Read a region in a block. Negative error codes are propogated
+    // Read a region in a block. Negative error codes are propagated
     // to the user.
     int (*read)(const struct lfs2_config *c, lfs2_block_t block,
             lfs2_off_t off, void *buffer, lfs2_size_t size);
 
     // Program a region in a block. The block must have previously
-    // been erased. Negative error codes are propogated to the user.
+    // been erased. Negative error codes are propagated to the user.
     // May return LFS2_ERR_CORRUPT if the block should be considered bad.
     int (*prog)(const struct lfs2_config *c, lfs2_block_t block,
             lfs2_off_t off, const void *buffer, lfs2_size_t size);
 
     // Erase a block. A block must be erased before being programmed.
     // The state of an erased block is undefined. Negative error codes
-    // are propogated to the user.
+    // are propagated to the user.
     // May return LFS2_ERR_CORRUPT if the block should be considered bad.
     int (*erase)(const struct lfs2_config *c, lfs2_block_t block);
 
     // Sync the state of the underlying block device. Negative error codes
-    // are propogated to the user.
+    // are propagated to the user.
     int (*sync)(const struct lfs2_config *c);
 
 #ifdef LFS2_THREADSAFE
     // Lock the underlying block device. Negative error codes
-    // are propogated to the user.
+    // are propagated to the user.
     int (*lock)(const struct lfs2_config *c);
 
     // Unlock the underlying block device. Negative error codes
-    // are propogated to the user.
+    // are propagated to the user.
     int (*unlock)(const struct lfs2_config *c);
 #endif
 
-    // Minimum size of a block read. All read operations will be a
+    // Minimum size of a block read in bytes. All read operations will be a
     // multiple of this value.
     lfs2_size_t read_size;
 
-    // Minimum size of a block program. All program operations will be a
-    // multiple of this value.
+    // Minimum size of a block program in bytes. All program operations will be
+    // a multiple of this value.
     lfs2_size_t prog_size;
 
-    // Size of an erasable block. This does not impact ram consumption and
-    // may be larger than the physical erase size. However, non-inlined files
-    // take up at minimum one block. Must be a multiple of the read
-    // and program sizes.
+    // Size of an erasable block in bytes. This does not impact ram consumption
+    // and may be larger than the physical erase size. However, non-inlined
+    // files take up at minimum one block. Must be a multiple of the read and
+    // program sizes.
     lfs2_size_t block_size;
 
     // Number of erasable blocks on the device.
     lfs2_size_t block_count;
 
-    // Number of erase cycles before littlefs evicts metadata logs and moves 
+    // Number of erase cycles before littlefs evicts metadata logs and moves
     // the metadata to another block. Suggested values are in the
     // range 100-1000, with large values having better performance at the cost
     // of less consistent wear distribution.
@@ -215,11 +216,11 @@ struct lfs2_config {
     // Set to -1 to disable block-level wear-leveling.
     int32_t block_cycles;
 
-    // Size of block caches. Each cache buffers a portion of a block in RAM.
-    // The littlefs needs a read cache, a program cache, and one additional
+    // Size of block caches in bytes. Each cache buffers a portion of a block in
+    // RAM. The littlefs needs a read cache, a program cache, and one additional
     // cache per file. Larger caches can improve performance by storing more
-    // data and reducing the number of disk accesses. Must be a multiple of
-    // the read and program sizes, and a factor of the block size.
+    // data and reducing the number of disk accesses. Must be a multiple of the
+    // read and program sizes, and a factor of the block size.
     lfs2_size_t cache_size;
 
     // Size of the lookahead buffer in bytes. A larger lookahead buffer
@@ -256,6 +257,12 @@ struct lfs2_config {
     // larger attributes size but must be <= LFS2_ATTR_MAX. Defaults to
     // LFS2_ATTR_MAX when zero.
     lfs2_size_t attr_max;
+
+    // Optional upper limit on total space given to metadata pairs in bytes. On
+    // devices with large blocks (e.g. 128kB) setting this to a low size (2-8kB)
+    // can help bound the metadata compaction time. Must be <= block_size.
+    // Defaults to block_size when zero.
+    lfs2_size_t metadata_max;
 };
 
 // File info structure
@@ -479,7 +486,7 @@ int lfs2_stat(lfs2_t *lfs2, const char *path, struct lfs2_info *info);
 // Returns the size of the attribute, or a negative error code on failure.
 // Note, the returned size is the size of the attribute on disk, irrespective
 // of the size of the buffer. This can be used to dynamically allocate a buffer
-// or check for existance.
+// or check for existence.
 lfs2_ssize_t lfs2_getattr(lfs2_t *lfs2, const char *path,
         uint8_t type, void *buffer, lfs2_size_t size);
 
@@ -507,6 +514,7 @@ int lfs2_removeattr(lfs2_t *lfs2, const char *path, uint8_t type);
 
 /// File operations ///
 
+#ifndef LFS2_NO_MALLOC
 // Open a file
 //
 // The mode that the file is opened in is determined by the flags, which
@@ -516,6 +524,10 @@ int lfs2_removeattr(lfs2_t *lfs2, const char *path, uint8_t type);
 int lfs2_file_open(lfs2_t *lfs2, lfs2_file_t *file,
         const char *path, int flags);
 
+// if LFS2_NO_MALLOC is defined, lfs2_file_open() will fail with LFS2_ERR_NOMEM
+// thus use lfs2_file_opencfg() with config.buffer set.
+#endif
+
 // Open a file with extra configuration
 //
 // The mode that the file is opened in is determined by the flags, which
diff --git a/lib/littlefs/lfs2_util.c b/lib/littlefs/lfs2_util.c
index 083a99c36cf1e..c9850e78869c3 100644
--- a/lib/littlefs/lfs2_util.c
+++ b/lib/littlefs/lfs2_util.c
@@ -1,6 +1,7 @@
 /*
  * lfs2 util functions
  *
+ * Copyright (c) 2022, The littlefs authors.
  * Copyright (c) 2017, Arm Limited. All rights reserved.
  * SPDX-License-Identifier: BSD-3-Clause
  */
diff --git a/lib/littlefs/lfs2_util.h b/lib/littlefs/lfs2_util.h
index 70bca717c93ce..6a4c8ffb50471 100644
--- a/lib/littlefs/lfs2_util.h
+++ b/lib/littlefs/lfs2_util.h
@@ -1,6 +1,7 @@
 /*
  * lfs2 utility functions
  *
+ * Copyright (c) 2022, The littlefs authors.
  * Copyright (c) 2017, Arm Limited. All rights reserved.
  * SPDX-License-Identifier: BSD-3-Clause
  */
@@ -49,6 +50,7 @@ extern "C"
 // code footprint
 
 // Logging functions
+#ifndef LFS2_TRACE
 #ifdef LFS2_YES_TRACE
 #define LFS2_TRACE_(fmt, ...) \
     printf("%s:%d:trace: " fmt "%s\n", __FILE__, __LINE__, __VA_ARGS__)
@@ -56,7 +58,9 @@ extern "C"
 #else
 #define LFS2_TRACE(...)
 #endif
+#endif
 
+#ifndef LFS2_DEBUG
 #ifndef LFS2_NO_DEBUG
 #define LFS2_DEBUG_(fmt, ...) \
     printf("%s:%d:debug: " fmt "%s\n", __FILE__, __LINE__, __VA_ARGS__)
@@ -64,7 +68,9 @@ extern "C"
 #else
 #define LFS2_DEBUG(...)
 #endif
+#endif
 
+#ifndef LFS2_WARN
 #ifndef LFS2_NO_WARN
 #define LFS2_WARN_(fmt, ...) \
     printf("%s:%d:warn: " fmt "%s\n", __FILE__, __LINE__, __VA_ARGS__)
@@ -72,7 +78,9 @@ extern "C"
 #else
 #define LFS2_WARN(...)
 #endif
+#endif
 
+#ifndef LFS2_ERROR
 #ifndef LFS2_NO_ERROR
 #define LFS2_ERROR_(fmt, ...) \
     printf("%s:%d:error: " fmt "%s\n", __FILE__, __LINE__, __VA_ARGS__)
@@ -80,13 +88,16 @@ extern "C"
 #else
 #define LFS2_ERROR(...)
 #endif
+#endif
 
 // Runtime assertions
+#ifndef LFS2_ASSERT
 #ifndef LFS2_NO_ASSERT
 #define LFS2_ASSERT(test) assert(test)
 #else
 #define LFS2_ASSERT(test)
 #endif
+#endif
 
 
 // Builtin functions, these may be replaced by more efficient

From 3a544b832b392abbb05c085b296a6cc1a7328397 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 17 May 2022 16:37:33 +1000
Subject: [PATCH 2071/3533] lib/littlefs: Guard lfs2_file_rawopen with
 LFS2_NO_MALLOC.

To prevent warnings about this function being unused when malloc is
disabled.

Signed-off-by: Damien George <damien@micropython.org>
---
 lib/littlefs/lfs2.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/littlefs/lfs2.c b/lib/littlefs/lfs2.c
index b708196d04cda..10f1691c425b4 100644
--- a/lib/littlefs/lfs2.c
+++ b/lib/littlefs/lfs2.c
@@ -2998,12 +2998,14 @@ static int lfs2_file_rawopencfg(lfs2_t *lfs2, lfs2_file_t *file,
     return err;
 }
 
+#ifndef LFS2_NO_MALLOC
 static int lfs2_file_rawopen(lfs2_t *lfs2, lfs2_file_t *file,
         const char *path, int flags) {
     static const struct lfs2_file_config defaults = {0};
     int err = lfs2_file_rawopencfg(lfs2, file, path, flags, &defaults);
     return err;
 }
+#endif
 
 static int lfs2_file_rawclose(lfs2_t *lfs2, lfs2_file_t *file) {
 #ifndef LFS2_READONLY

From 926983522605523ca74981143b78a3826d53b3e8 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 23 May 2022 12:05:10 +1000
Subject: [PATCH 2072/3533] lib/littlefs: Remove assignment of variables to
 themselves.

To prevent compiler warnings (eg on clang).

Signed-off-by: Damien George <damien@micropython.org>
---
 lib/littlefs/lfs2.c | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/lib/littlefs/lfs2.c b/lib/littlefs/lfs2.c
index 10f1691c425b4..a9fcffafd818a 100644
--- a/lib/littlefs/lfs2.c
+++ b/lib/littlefs/lfs2.c
@@ -865,11 +865,6 @@ static int lfs2_dir_traverse(lfs2_t *lfs2,
                 };
                 sp += 1;
 
-                dir = dir;
-                off = off;
-                ptag = ptag;
-                attrs = attrs;
-                attrcount = attrcount;
                 tmask = 0;
                 ttag = 0;
                 begin = 0;

From 5fa8ea1b8b1c3e130ffdb6136ab0e7675fc41b46 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 23 May 2022 11:52:45 +1000
Subject: [PATCH 2073/3533] tests/extmod: Change expected errno code from 36 to
 30 in VfsLfs2 test.

Errno 30 is EROFS, which is now the correct value reported by littlefs 2.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/extmod/vfs_lfs_mount.py.exp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/extmod/vfs_lfs_mount.py.exp b/tests/extmod/vfs_lfs_mount.py.exp
index 68561b4807350..defaad0580761 100644
--- a/tests/extmod/vfs_lfs_mount.py.exp
+++ b/tests/extmod/vfs_lfs_mount.py.exp
@@ -13,4 +13,4 @@ package
 hello from lfs
 lfsmod2.py: print("hello from lfs")
 
-OSError(36,)
+OSError(30,)

From 6b6ceafe1aae23d1973c8b7a6169c05f0a400d28 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Sat, 14 May 2022 15:00:20 +0200
Subject: [PATCH 2074/3533] extmod/webrepl: Fix setting password in foreground
 mode and factor code.

The password was not being set when running in foreground mode.  Duplicate
code has been removed.
---
 extmod/webrepl/webrepl.py | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/extmod/webrepl/webrepl.py b/extmod/webrepl/webrepl.py
index 8ddf56143f3ae..0de813cda18c7 100644
--- a/extmod/webrepl/webrepl.py
+++ b/extmod/webrepl/webrepl.py
@@ -59,24 +59,28 @@ def stop():
         listen_s.close()
 
 
-def start(port=8266, password=None):
+def start(port=8266, password=None, accept_handler=accept_conn):
     stop()
-    if password is None:
+    webrepl_pass = password
+    if webrepl_pass is None:
         try:
             import webrepl_cfg
 
-            _webrepl.password(webrepl_cfg.PASS)
-            setup_conn(port, accept_conn)
-            print("Started webrepl in normal mode")
+            webrepl_pass = webrepl_cfg.PASS
         except:
             print("WebREPL is not configured, run 'import webrepl_setup'")
+
+    _webrepl.password(webrepl_pass)
+    s = setup_conn(port, accept_handler)
+
+    if accept_handler is None:
+        print("Starting webrepl in foreground mode")
+        accept_conn(s)
+    elif password is None:
+        print("Started webrepl in normal mode")
     else:
-        _webrepl.password(password)
-        setup_conn(port, accept_conn)
         print("Started webrepl in manual override mode")
 
 
-def start_foreground(port=8266):
-    stop()
-    s = setup_conn(port, None)
-    accept_conn(s)
+def start_foreground(port=8266, password=None):
+    start(port, password, None)

From beeb250d58b70b60a01dae3e2fac2741f56381f5 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Tue, 17 May 2022 15:42:01 +0200
Subject: [PATCH 2075/3533] tests/multi_net: Fix TCP accept test when using
 system error numbers.

If a port is not using internal error numbers, which match both lwIP and
Linux error numbers, ENTOCONN from standard libraries errno.h equals 128,
not 107.
---
 tests/multi_net/tcp_accept_recv.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/multi_net/tcp_accept_recv.py b/tests/multi_net/tcp_accept_recv.py
index f93ede3bf40ad..dee14e3b9774c 100644
--- a/tests/multi_net/tcp_accept_recv.py
+++ b/tests/multi_net/tcp_accept_recv.py
@@ -17,7 +17,7 @@ def instance0():
     try:
         print("recv", s.recv(10))  # should raise Errno 107 ENOTCONN
     except OSError as er:
-        print(er.errno)
+        print(er.errno in (107, 128))
     s.close()
 
 

From dd35f76db330851bdf937585219d5cae21222fa3 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Thu, 19 May 2022 21:09:41 +0200
Subject: [PATCH 2076/3533] tests/run-multitests.py: Use LAN for IP address if
 WLAN doesn't exist.

This allows running the test on boards with just a LAN interface.

Fixes issue #8681.
---
 tests/run-multitests.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tests/run-multitests.py b/tests/run-multitests.py
index f55d52b6e910f..bb3ef185dacc1 100755
--- a/tests/run-multitests.py
+++ b/tests/run-multitests.py
@@ -64,7 +64,10 @@ def globals(**gs):
     def get_network_ip():
         try:
             import network
-            ip = network.WLAN().ifconfig()[0]
+            if hasattr(network, "WLAN"):
+                ip = network.WLAN().ifconfig()[0]
+            else:
+                ip = network.LAN().ifconfig()[0]
         except:
             ip = HOST_IP
         return ip

From aa53d2f84a2171b53bd43459b84a1b5348241b43 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 24 May 2022 13:37:56 +1000
Subject: [PATCH 2077/3533] py/asmthumb: Provide implementations of clz/ctz for
 msvc.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/asmthumb.c | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/py/asmthumb.c b/py/asmthumb.c
index 8d47575e96ccb..49574c43a7f1c 100644
--- a/py/asmthumb.c
+++ b/py/asmthumb.c
@@ -36,6 +36,23 @@
 #include "py/mpstate.h"
 #include "py/asmthumb.h"
 
+#ifdef _MSC_VER
+#include <intrin.h>
+
+static uint32_t mp_clz(uint32_t x) {
+    unsigned long lz = 0;
+    return _BitScanReverse(&lz, x) ? (sizeof(x) * 8 - 1) - lz : 0;
+}
+
+static uint32_t mp_ctz(uint32_t x) {
+    unsigned long tz = 0;
+    return _BitScanForward(&tz, x) ? tz : 0;
+}
+#else
+#define mp_clz(x) __builtin_clz(x)
+#define mp_ctz(x) __builtin_ctz(x)
+#endif
+
 #define UNSIGNED_FIT5(x) ((uint32_t)(x) < 32)
 #define UNSIGNED_FIT7(x) ((uint32_t)(x) < 128)
 #define UNSIGNED_FIT8(x) (((x) & 0xffffff00) == 0)
@@ -356,8 +373,8 @@ void asm_thumb_mov_reg_i32_optimised(asm_thumb_t *as, uint reg_dest, int i32) {
             i32 = -i32;
         }
 
-        uint clz = __builtin_clz(i32);
-        uint ctz = i32 ? __builtin_ctz(i32) : 0;
+        uint clz = mp_clz(i32);
+        uint ctz = i32 ? mp_ctz(i32) : 0;
         assert(clz + ctz <= 32);
         if (clz + ctz >= 24) {
             asm_thumb_mov_rlo_i8(as, rlo_dest, (i32 >> ctz) & 0xff);

From 79f3b8731b3b5fd0c187011af12ca8745a03418e Mon Sep 17 00:00:00 2001
From: Takeo Takahashi <takeo.takahashi.xv@renesas.com>
Date: Tue, 24 May 2022 11:48:27 +0900
Subject: [PATCH 2078/3533] renesas-ra/modmachine: Add missing
 MP_REGISTER_MODULE for umachine.

Fix the issue that umachine is not available.

Signed-off-by: Takeo Takahashi <takeo.takahashi.xv@renesas.com>
---
 ports/renesas-ra/modmachine.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ports/renesas-ra/modmachine.c b/ports/renesas-ra/modmachine.c
index 4914c7b3a9a72..e505a49ff57d7 100644
--- a/ports/renesas-ra/modmachine.c
+++ b/ports/renesas-ra/modmachine.c
@@ -302,3 +302,5 @@ const mp_obj_module_t mp_module_machine = {
     .base = { &mp_type_module },
     .globals = (mp_obj_dict_t *)&machine_module_globals,
 };
+
+MP_REGISTER_MODULE(MP_QSTR_umachine, mp_module_machine, MICROPY_PY_MACHINE);

From 7b4147dd0b9df469bbae642b3aa02dd74a853685 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Thu, 12 May 2022 12:58:45 +0200
Subject: [PATCH 2079/3533] extmod/modusocket: Fix polling of a new socket.

New sockets should return HUP and WR when polled, following modlwip.
---
 extmod/modusocket.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/extmod/modusocket.c b/extmod/modusocket.c
index 5f07d4f789223..9b1eb8cd7ac4e 100644
--- a/extmod/modusocket.c
+++ b/extmod/modusocket.c
@@ -451,7 +451,8 @@ mp_uint_t socket_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_t arg, int *
     }
     if (self->nic == MP_OBJ_NULL) {
         if (request == MP_STREAM_POLL) {
-            return MP_STREAM_POLL_NVAL;
+            // New sockets are writable and not connected.
+            return MP_STREAM_POLL_HUP | MP_STREAM_POLL_WR;
         }
         *errcode = MP_EINVAL;
         return MP_STREAM_ERROR;

From 6136c7644a4a64612ef80c0681b44c11a710ab48 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Thu, 12 May 2022 13:01:22 +0200
Subject: [PATCH 2080/3533] extmod/modusocket: Bind unconnected socket to
 default NIC in setsockopt.

Bind socket to default NIC if setsockopt is called before the socket is
bound, to allow setting SO_REUSEADDR before calling socket_bind().

Fixes issue #8653.
---
 extmod/modusocket.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/extmod/modusocket.c b/extmod/modusocket.c
index 9b1eb8cd7ac4e..eae113f7c420d 100644
--- a/extmod/modusocket.c
+++ b/extmod/modusocket.c
@@ -310,8 +310,9 @@ STATIC mp_obj_t socket_setsockopt(size_t n_args, const mp_obj_t *args) {
     mod_network_socket_obj_t *self = MP_OBJ_TO_PTR(args[0]);
 
     if (self->nic == MP_OBJ_NULL) {
-        // not connected
-        return mp_const_none;
+        // bind to default NIC.
+        uint8_t ip[4] = {0, 0, 0, 0};
+        socket_select_nic(self, ip);
     }
 
     mp_int_t level = mp_obj_get_int(args[1]);

From eb957b0c955c50e839c312bda0446eddee19d33f Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Wed, 11 May 2022 11:05:19 +0200
Subject: [PATCH 2081/3533] extmod/modusocket: Fix errcode returned from socket
 read/write.

Drivers should ensure a positive errcode is returned from read/write.
---
 extmod/modusocket.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/extmod/modusocket.c b/extmod/modusocket.c
index eae113f7c420d..318988a69ac12 100644
--- a/extmod/modusocket.c
+++ b/extmod/modusocket.c
@@ -423,7 +423,6 @@ mp_uint_t socket_read(mp_obj_t self_in, void *buf, mp_uint_t size, int *errcode)
     mp_int_t ret = self->nic_type->recv(self, (byte *)buf, size, errcode);
     if (ret < 0) {
         ret = MP_STREAM_ERROR;
-        *errcode = -(*errcode); // expects a positive error code
     }
     return ret;
 }
@@ -436,7 +435,6 @@ mp_uint_t socket_write(mp_obj_t self_in, const void *buf, mp_uint_t size, int *e
     mp_int_t ret = self->nic_type->send(self, buf, size, errcode);
     if (ret < 0) {
         ret = MP_STREAM_ERROR;
-        *errcode = -(*errcode); // expects a positive error code
     }
     return ret;
 }

From fc1f876175ba3859afd155b1fd02a12961bb8b7a Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Fri, 13 May 2022 16:22:12 +0200
Subject: [PATCH 2082/3533] extmod/modusocket: Add socket type print function.

---
 extmod/modusocket.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/extmod/modusocket.c b/extmod/modusocket.c
index 318988a69ac12..429750bf80e10 100644
--- a/extmod/modusocket.c
+++ b/extmod/modusocket.c
@@ -42,6 +42,12 @@
 
 STATIC const mp_obj_type_t socket_type;
 
+STATIC void socket_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+    mod_network_socket_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    mp_printf(print, "<socket fd=%d timeout=%d domain=%d type=%d proto=%d bound=%b>",
+        self->fileno, self->timeout, self->domain, self->type, self->proto, self->bound);
+}
+
 // constructor socket(family=AF_INET, type=SOCK_STREAM, proto=0, fileno=None)
 STATIC mp_obj_t socket_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
     mp_arg_check_num(n_args, n_kw, 0, 4, false);
@@ -469,6 +475,7 @@ STATIC const mp_stream_p_t socket_stream_p = {
 STATIC const mp_obj_type_t socket_type = {
     { &mp_type_type },
     .name = MP_QSTR_socket,
+    .print = socket_print,
     .make_new = socket_make_new,
     .protocol = &socket_stream_p,
     .locals_dict = (mp_obj_dict_t *)&socket_locals_dict,

From 3438e800608cc43abab2af8d239fef0d9a187df2 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Sat, 14 May 2022 14:30:15 +0200
Subject: [PATCH 2083/3533] extmod/modusocket: Add support for socket events
 callback.

Add support for the special sockopt 20.
---
 extmod/modusocket.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/extmod/modusocket.c b/extmod/modusocket.c
index 429750bf80e10..cedb2cc9a966f 100644
--- a/extmod/modusocket.c
+++ b/extmod/modusocket.c
@@ -331,6 +331,12 @@ STATIC mp_obj_t socket_setsockopt(size_t n_args, const mp_obj_t *args) {
         val = mp_obj_get_int_truncated(args[3]);
         optval = &val;
         optlen = sizeof(val);
+    } else if (opt == 20 && args[3] == mp_const_none) {
+        optval = MP_OBJ_NULL;
+        optlen = 0;
+    } else if (opt == 20 && mp_obj_is_callable(args[3])) {
+        optval = args[3];
+        optlen = sizeof(optval);
     } else {
         mp_buffer_info_t bufinfo;
         mp_get_buffer_raise(args[3], &bufinfo, MP_BUFFER_READ);

From 6841fecbb25ca547947e70c5441c2dbb8ec08dd1 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Mon, 16 May 2022 16:00:35 +0200
Subject: [PATCH 2084/3533] extmod/modusocket: Fix socket_make_new argument
 parsing.

---
 extmod/modusocket.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/extmod/modusocket.c b/extmod/modusocket.c
index cedb2cc9a966f..97b26d73a8e84 100644
--- a/extmod/modusocket.c
+++ b/extmod/modusocket.c
@@ -48,9 +48,9 @@ STATIC void socket_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kin
         self->fileno, self->timeout, self->domain, self->type, self->proto, self->bound);
 }
 
-// constructor socket(family=AF_INET, type=SOCK_STREAM, proto=0, fileno=None)
+// constructor socket(domain=AF_INET, type=SOCK_STREAM, proto=0)
 STATIC mp_obj_t socket_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
-    mp_arg_check_num(n_args, n_kw, 0, 4, false);
+    mp_arg_check_num(n_args, n_kw, 0, 3, false);
 
     // create socket object (not bound to any NIC yet)
     mod_network_socket_obj_t *s = m_new_obj_with_finaliser(mod_network_socket_obj_t);
@@ -62,12 +62,12 @@ STATIC mp_obj_t socket_make_new(const mp_obj_type_t *type, size_t n_args, size_t
     s->proto = 0;
     s->bound = false;
     s->fileno = -1;
-    if (n_args >= 1) {
+    if (n_args > 0) {
         s->domain = mp_obj_get_int(args[0]);
-        if (n_args >= 2) {
+        if (n_args > 1) {
             s->type = mp_obj_get_int(args[1]);
-            if (n_args >= 4) {
-                s->fileno = mp_obj_get_int(args[3]);
+            if (n_args > 2) {
+                s->proto = mp_obj_get_int(args[2]);
             }
         }
     }

From b9d2f1e8441538790335721ede8ae02d5551c089 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Thu, 19 May 2022 08:11:45 +0200
Subject: [PATCH 2085/3533] extmod/modusocket: Add timeout and callback to
 socket object.

---
 extmod/modnetwork.h | 3 ++-
 extmod/modusocket.c | 7 ++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/extmod/modnetwork.h b/extmod/modnetwork.h
index b95760897aa10..a4d86a71c12d5 100644
--- a/extmod/modnetwork.h
+++ b/extmod/modnetwork.h
@@ -86,9 +86,10 @@ typedef struct _mod_network_socket_obj_t {
     uint32_t proto  : 5;
     uint32_t bound  : 1;
     int32_t fileno  : 16;
+    int32_t timeout;
+    mp_obj_t callback;
     #if MICROPY_PY_USOCKET_EXTENDED_STATE
     // Extended socket state for NICs/ports that need it.
-    int32_t timeout;
     void *state;
     #endif
 } mod_network_socket_obj_t;
diff --git a/extmod/modusocket.c b/extmod/modusocket.c
index 97b26d73a8e84..403791935c14c 100644
--- a/extmod/modusocket.c
+++ b/extmod/modusocket.c
@@ -71,9 +71,9 @@ STATIC mp_obj_t socket_make_new(const mp_obj_type_t *type, size_t n_args, size_t
             }
         }
     }
-
-    #if MICROPY_PY_USOCKET_EXTENDED_STATE
     s->timeout = -1;
+    s->callback = MP_OBJ_NULL;
+    #if MICROPY_PY_USOCKET_EXTENDED_STATE
     s->state = NULL;
     #endif
 
@@ -169,8 +169,9 @@ STATIC mp_obj_t socket_accept(mp_obj_t self_in) {
     socket2->proto = self->proto;
     socket2->bound = false;
     socket2->fileno = -1;
-    #if MICROPY_PY_USOCKET_EXTENDED_STATE
     socket2->timeout = -1;
+    socket2->callback = MP_OBJ_NULL;
+    #if MICROPY_PY_USOCKET_EXTENDED_STATE
     socket2->state = NULL;
     #endif
 

From edf41d2bf834bbf9807374c90e16d92c2a305a3f Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Mon, 16 May 2022 16:58:02 +0200
Subject: [PATCH 2086/3533] extmod/modusocket: Add sendall function.

---
 extmod/modusocket.c | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/extmod/modusocket.c b/extmod/modusocket.c
index 403791935c14c..c5db80f3785cc 100644
--- a/extmod/modusocket.c
+++ b/extmod/modusocket.c
@@ -235,6 +235,40 @@ STATIC mp_obj_t socket_send(mp_obj_t self_in, mp_obj_t buf_in) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_2(socket_send_obj, socket_send);
 
+STATIC mp_obj_t socket_sendall(mp_obj_t self_in, mp_obj_t buf_in) {
+    mod_network_socket_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    if (self->nic == MP_OBJ_NULL) {
+        // not connected
+        mp_raise_OSError(MP_EPIPE);
+    }
+    mp_buffer_info_t bufinfo;
+    mp_get_buffer_raise(buf_in, &bufinfo, MP_BUFFER_READ);
+
+    int _errno;
+    mp_uint_t ret = 0;
+    if (self->timeout == 0) {
+        ret = self->nic_type->send(self, bufinfo.buf, bufinfo.len, &_errno);
+        if (ret == -1) {
+            mp_raise_OSError(_errno);
+        } else if (bufinfo.len > ret) {
+            mp_raise_OSError(MP_EAGAIN);
+        }
+    } else {
+        // TODO: In CPython3.5, socket timeout should apply to the
+        // entire sendall() operation, not to individual send() chunks.
+        while (bufinfo.len != 0) {
+            ret = self->nic_type->send(self, bufinfo.buf, bufinfo.len, &_errno);
+            if (ret == -1) {
+                mp_raise_OSError(_errno);
+            }
+            bufinfo.len -= ret;
+            bufinfo.buf = (char *)bufinfo.buf + ret;
+        }
+    }
+    return mp_obj_new_int_from_uint(ret);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(socket_sendall_obj, socket_sendall);
+
 // method socket.recv(bufsize)
 STATIC mp_obj_t socket_recv(mp_obj_t self_in, mp_obj_t len_in) {
     mod_network_socket_obj_t *self = MP_OBJ_TO_PTR(self_in);
@@ -412,6 +446,7 @@ STATIC const mp_rom_map_elem_t socket_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_accept), MP_ROM_PTR(&socket_accept_obj) },
     { MP_ROM_QSTR(MP_QSTR_connect), MP_ROM_PTR(&socket_connect_obj) },
     { MP_ROM_QSTR(MP_QSTR_send), MP_ROM_PTR(&socket_send_obj) },
+    { MP_ROM_QSTR(MP_QSTR_sendall), MP_ROM_PTR(&socket_sendall_obj) },
     { MP_ROM_QSTR(MP_QSTR_recv), MP_ROM_PTR(&socket_recv_obj) },
     { MP_ROM_QSTR(MP_QSTR_sendto), MP_ROM_PTR(&socket_sendto_obj) },
     { MP_ROM_QSTR(MP_QSTR_recvfrom), MP_ROM_PTR(&socket_recvfrom_obj) },

From 26b1d31eda292d9cd5cfc68f14ce8055256fade8 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 25 May 2022 11:00:42 +1000
Subject: [PATCH 2087/3533] Revert "stm32/rfcore: Intercept addr-resolution HCI
 cmd to work arou..."

This reverts commit 2668337f36deef7fdd97f35e2efc68a5d2102192.

The issue with potential breaking of the BLE RX path in the radio is fixed
since WS v1.12.0.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/rfcore.c | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/ports/stm32/rfcore.c b/ports/stm32/rfcore.c
index 67b63679a72a6..302f55d7e20d4 100644
--- a/ports/stm32/rfcore.c
+++ b/ports/stm32/rfcore.c
@@ -611,24 +611,6 @@ void rfcore_ble_hci_cmd(size_t len, const uint8_t *src) {
     tl_list_node_t *n;
     uint32_t ch;
     if (src[0] == HCI_KIND_BT_CMD) {
-        // The STM32WB has a problem when address resolution is enabled: under certain
-        // conditions the MCU can get into a state where it draws an additional 10mA
-        // or so and eventually ends up with a broken BLE RX path in the silicon.  A
-        // simple way to reproduce this is to enable address resolution (which is the
-        // default for NimBLE) and start the device advertising.  If there is enough
-        // BLE activity in the vicinity then the device will at some point enter the
-        // bad state and, if left long enough, will have permanent BLE RX damage.
-        //
-        // STMicroelectronics are aware of this issue.  The only known workaround at
-        // this stage is to not enable address resolution.  We do that here by
-        // intercepting any command that enables address resolution and convert it
-        // into a command that disables address resolution.
-        //
-        // OGF=0x08 OCF=0x002d HCI_LE_Set_Address_Resolution_Enable
-        if (len == 5 && memcmp(src + 1, "\x2d\x20\x01\x01", 4) == 0) {
-            src = (const uint8_t *)"\x01\x2d\x20\x01\x00";
-        }
-
         n = (tl_list_node_t *)&ipcc_membuf_ble_cmd_buf[0];
         ch = IPCC_CH_BLE;
     } else if (src[0] == HCI_KIND_BT_ACL) {

From 5956466c0ee08f7a08d274de65ff2d0ffc901137 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 25 May 2022 12:04:27 +1000
Subject: [PATCH 2088/3533] py/builtin: Clean up and simplify import_stat and
 builtin_open config.

The following changes are made:

- If MICROPY_VFS is enabled then mp_vfs_import_stat and mp_vfs_open are
  automatically used for mp_import_stat and mp_builtin_open respectively.

- If MICROPY_PY_IO is enabled then "open" is automatically included in the
  set of builtins, and points to mp_builtin_open_obj.

This helps to clean up and simplify the most common port configuration.

Signed-off-by: Damien George <damien@micropython.org>
---
 examples/embedding/hello-embed.c   |  1 +
 extmod/vfs.h                       |  2 +-
 mpy-cross/main.c                   |  1 +
 ports/esp8266/main.c               |  1 +
 ports/javascript/main.c            |  1 +
 ports/minimal/main.c               |  1 +
 ports/nrf/modules/uos/microbitfs.h |  1 +
 ports/powerpc/main.c               |  1 +
 ports/qemu-arm/test_main.c         |  2 +-
 ports/teensy/lexerfrozen.c         |  1 +
 ports/zephyr/main.c                |  1 +
 py/builtin.h                       | 39 +++++++++++++++++++++++++++---
 py/frozenmod.h                     |  2 +-
 py/lexer.h                         | 19 ++++-----------
 py/modbuiltins.c                   |  3 +++
 15 files changed, 56 insertions(+), 20 deletions(-)

diff --git a/examples/embedding/hello-embed.c b/examples/embedding/hello-embed.c
index 9a90288cf6d77..0b778986b3a5d 100644
--- a/examples/embedding/hello-embed.c
+++ b/examples/embedding/hello-embed.c
@@ -28,6 +28,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+#include "py/builtin.h"
 #include "py/compile.h"
 #include "py/runtime.h"
 #include "py/gc.h"
diff --git a/extmod/vfs.h b/extmod/vfs.h
index 23f2eac8932b4..f577d3e337c87 100644
--- a/extmod/vfs.h
+++ b/extmod/vfs.h
@@ -26,7 +26,7 @@
 #ifndef MICROPY_INCLUDED_EXTMOD_VFS_H
 #define MICROPY_INCLUDED_EXTMOD_VFS_H
 
-#include "py/lexer.h"
+#include "py/builtin.h"
 #include "py/obj.h"
 
 // return values of mp_vfs_lookup_path
diff --git a/mpy-cross/main.c b/mpy-cross/main.c
index 390689fcbeee4..f3ffff61fdf80 100644
--- a/mpy-cross/main.c
+++ b/mpy-cross/main.c
@@ -29,6 +29,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 
+#include "py/builtin.h"
 #include "py/compile.h"
 #include "py/persistentcode.h"
 #include "py/runtime.h"
diff --git a/ports/esp8266/main.c b/ports/esp8266/main.c
index 1ae3f85bff8fa..ded5e58abf7ab 100644
--- a/ports/esp8266/main.c
+++ b/ports/esp8266/main.c
@@ -28,6 +28,7 @@
 #include <stdio.h>
 #include <string.h>
 
+#include "py/builtin.h"
 #include "py/compile.h"
 #include "py/runtime.h"
 #include "py/stackctrl.h"
diff --git a/ports/javascript/main.c b/ports/javascript/main.c
index 04a853f66cf4c..36ea9e98bead5 100644
--- a/ports/javascript/main.c
+++ b/ports/javascript/main.c
@@ -29,6 +29,7 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "py/builtin.h"
 #include "py/compile.h"
 #include "py/runtime.h"
 #include "py/repl.h"
diff --git a/ports/minimal/main.c b/ports/minimal/main.c
index 006ca0a4d0cc2..dbde33915a7e2 100644
--- a/ports/minimal/main.c
+++ b/ports/minimal/main.c
@@ -2,6 +2,7 @@
 #include <stdio.h>
 #include <string.h>
 
+#include "py/builtin.h"
 #include "py/compile.h"
 #include "py/runtime.h"
 #include "py/repl.h"
diff --git a/ports/nrf/modules/uos/microbitfs.h b/ports/nrf/modules/uos/microbitfs.h
index 4157e8c33d257..d9efaabf10ae2 100644
--- a/ports/nrf/modules/uos/microbitfs.h
+++ b/ports/nrf/modules/uos/microbitfs.h
@@ -27,6 +27,7 @@
 #ifndef __MICROPY_INCLUDED_FILESYSTEM_H__
 #define __MICROPY_INCLUDED_FILESYSTEM_H__
 
+#include "py/builtin.h"
 #include "py/obj.h"
 #include "py/lexer.h"
 
diff --git a/ports/powerpc/main.c b/ports/powerpc/main.c
index a66d737c1391e..ed82c517ebc16 100644
--- a/ports/powerpc/main.c
+++ b/ports/powerpc/main.c
@@ -26,6 +26,7 @@
 
 #include <stdio.h>
 
+#include "py/builtin.h"
 #include "py/compile.h"
 #include "py/runtime.h"
 #include "py/repl.h"
diff --git a/ports/qemu-arm/test_main.c b/ports/qemu-arm/test_main.c
index 284b287311ccd..3a89b3f13124c 100644
--- a/ports/qemu-arm/test_main.c
+++ b/ports/qemu-arm/test_main.c
@@ -5,7 +5,7 @@
 #include <malloc.h>
 #include <setjmp.h>
 
-#include "py/obj.h"
+#include "py/builtin.h"
 #include "py/compile.h"
 #include "py/runtime.h"
 #include "py/stackctrl.h"
diff --git a/ports/teensy/lexerfrozen.c b/ports/teensy/lexerfrozen.c
index 21e978dc796f0..672a0ce08bc44 100644
--- a/ports/teensy/lexerfrozen.c
+++ b/ports/teensy/lexerfrozen.c
@@ -1,5 +1,6 @@
 #include <stdio.h>
 
+#include "py/builtin.h"
 #include "py/lexer.h"
 #include "py/runtime.h"
 #include "py/mperrno.h"
diff --git a/ports/zephyr/main.c b/ports/zephyr/main.c
index 1275a49739e6b..ed1ac560e1718 100644
--- a/ports/zephyr/main.c
+++ b/ports/zephyr/main.c
@@ -41,6 +41,7 @@
 #include <storage/flash_map.h>
 
 #include "py/mperrno.h"
+#include "py/builtin.h"
 #include "py/compile.h"
 #include "py/runtime.h"
 #include "py/repl.h"
diff --git a/py/builtin.h b/py/builtin.h
index 162fed77cc0e7..a6f824ca20f30 100644
--- a/py/builtin.h
+++ b/py/builtin.h
@@ -28,8 +28,43 @@
 
 #include "py/obj.h"
 
-mp_obj_t mp_builtin___import__(size_t n_args, const mp_obj_t *args);
+typedef enum {
+    MP_IMPORT_STAT_NO_EXIST,
+    MP_IMPORT_STAT_DIR,
+    MP_IMPORT_STAT_FILE,
+} mp_import_stat_t;
+
+#if MICROPY_VFS
+
+// Delegate to the VFS for import stat and builtin open.
+
+#define mp_builtin_open_obj mp_vfs_open_obj
+
+mp_import_stat_t mp_vfs_import_stat(const char *path);
+mp_obj_t mp_vfs_open(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs);
+
+MP_DECLARE_CONST_FUN_OBJ_KW(mp_vfs_open_obj);
+
+static inline mp_import_stat_t mp_import_stat(const char *path) {
+    return mp_vfs_import_stat(path);
+}
+
+static inline mp_obj_t mp_builtin_open(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs) {
+    return mp_vfs_open(n_args, args, kwargs);
+}
+
+#else
+
+// A port can provide implementations of these functions.
+mp_import_stat_t mp_import_stat(const char *path);
 mp_obj_t mp_builtin_open(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs);
+
+// A port can provide this object.
+MP_DECLARE_CONST_FUN_OBJ_KW(mp_builtin_open_obj);
+
+#endif
+
+mp_obj_t mp_builtin___import__(size_t n_args, const mp_obj_t *args);
 mp_obj_t mp_micropython_mem_info(size_t n_args, const mp_obj_t *args);
 
 MP_DECLARE_CONST_FUN_OBJ_VAR(mp_builtin___build_class___obj);
@@ -76,9 +111,7 @@ MP_DECLARE_CONST_FUN_OBJ_1(mp_builtin_repr_obj);
 MP_DECLARE_CONST_FUN_OBJ_VAR_BETWEEN(mp_builtin_round_obj);
 MP_DECLARE_CONST_FUN_OBJ_KW(mp_builtin_sorted_obj);
 MP_DECLARE_CONST_FUN_OBJ_VAR_BETWEEN(mp_builtin_sum_obj);
-// Defined by a port, but declared here for simplicity
 MP_DECLARE_CONST_FUN_OBJ_VAR_BETWEEN(mp_builtin_input_obj);
-MP_DECLARE_CONST_FUN_OBJ_KW(mp_builtin_open_obj);
 
 MP_DECLARE_CONST_FUN_OBJ_2(mp_namedtuple_obj);
 
diff --git a/py/frozenmod.h b/py/frozenmod.h
index be735e85bdc3d..cff6c8616c755 100644
--- a/py/frozenmod.h
+++ b/py/frozenmod.h
@@ -27,7 +27,7 @@
 #ifndef MICROPY_INCLUDED_PY_FROZENMOD_H
 #define MICROPY_INCLUDED_PY_FROZENMOD_H
 
-#include "py/lexer.h"
+#include "py/builtin.h"
 
 enum {
     MP_FROZEN_NONE,
diff --git a/py/lexer.h b/py/lexer.h
index e16b9a8ce864c..8295dec0f715d 100644
--- a/py/lexer.h
+++ b/py/lexer.h
@@ -189,24 +189,15 @@ typedef struct _mp_lexer_t {
 mp_lexer_t *mp_lexer_new(qstr src_name, mp_reader_t reader);
 mp_lexer_t *mp_lexer_new_from_str_len(qstr src_name, const char *str, size_t len, size_t free_len);
 
-void mp_lexer_free(mp_lexer_t *lex);
-void mp_lexer_to_next(mp_lexer_t *lex);
-
-/******************************************************************/
-// platform specific import function; must be implemented for a specific port
-// TODO tidy up, rename, or put elsewhere
-
-typedef enum {
-    MP_IMPORT_STAT_NO_EXIST,
-    MP_IMPORT_STAT_DIR,
-    MP_IMPORT_STAT_FILE,
-} mp_import_stat_t;
-
-mp_import_stat_t mp_import_stat(const char *path);
+// If MICROPY_READER_POSIX or MICROPY_READER_VFS aren't enabled then
+// this function must be implemented by the port.
 mp_lexer_t *mp_lexer_new_from_file(const char *filename);
 
 #if MICROPY_HELPER_LEXER_UNIX
 mp_lexer_t *mp_lexer_new_from_fd(qstr filename, int fd, bool close_fd);
 #endif
 
+void mp_lexer_free(mp_lexer_t *lex);
+void mp_lexer_to_next(mp_lexer_t *lex);
+
 #endif // MICROPY_INCLUDED_PY_LEXER_H
diff --git a/py/modbuiltins.c b/py/modbuiltins.c
index 5631798fb62fd..adb9ea40ad89d 100644
--- a/py/modbuiltins.c
+++ b/py/modbuiltins.c
@@ -729,6 +729,9 @@ STATIC const mp_rom_map_elem_t mp_module_builtins_globals_table[] = {
     #endif
     { MP_ROM_QSTR(MP_QSTR_next), MP_ROM_PTR(&mp_builtin_next_obj) },
     { MP_ROM_QSTR(MP_QSTR_oct), MP_ROM_PTR(&mp_builtin_oct_obj) },
+    #if MICROPY_PY_IO
+    { MP_ROM_QSTR(MP_QSTR_open), MP_ROM_PTR(&mp_builtin_open_obj) },
+    #endif
     { MP_ROM_QSTR(MP_QSTR_ord), MP_ROM_PTR(&mp_builtin_ord_obj) },
     { MP_ROM_QSTR(MP_QSTR_pow), MP_ROM_PTR(&mp_builtin_pow_obj) },
     { MP_ROM_QSTR(MP_QSTR_print), MP_ROM_PTR(&mp_builtin_print_obj) },

From 6e71cde6aad2b2ed3d431d8d94c9bd2ee52e319d Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 25 May 2022 12:13:02 +1000
Subject: [PATCH 2089/3533] ports: Use default VFS config for import_stat and
 builtin_open.

For ports with MICROPY_VFS and MICROPY_PY_IO enabled their configuration
can now be simplified to use the defaults for mp_import_stat and
mp_builtin_open.

This commit makes no functional change, except for the following minor
points:
- the built-in "open" is removed from the minimal port (it previously did
  nothing)
- the duplicate built-in "input" is removed from the esp32 port
- qemu-arm now delegates to VFS import/open

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/cc3200/mpconfigport.h                   |  9 ---------
 ports/esp32/mpconfigport.h                    | 10 ----------
 ports/esp8266/mpconfigport.h                  |  9 ---------
 ports/javascript/mpconfigport.h               |  4 ----
 ports/mimxrt/mpconfigport.h                   |  8 --------
 ports/minimal/main.c                          |  5 -----
 ports/minimal/mpconfigport.h                  |  4 ----
 ports/nrf/mpconfigport.h                      |  7 -------
 ports/qemu-arm/main.c                         |  9 ---------
 ports/qemu-arm/mpconfigport.h                 |  4 ----
 ports/qemu-arm/test_main.c                    | 10 ----------
 ports/renesas-ra/mpconfigport.h               |  9 ---------
 ports/rp2/mpconfigport.h                      |  9 ---------
 ports/samd/main.c                             | 17 -----------------
 ports/samd/mpconfigport.h                     |  9 ---------
 ports/stm32/mpconfigport.h                    |  9 ---------
 ports/unix/mpconfigport.h                     |  5 -----
 ports/unix/variants/minimal/mpconfigvariant.h |  1 -
 ports/windows/mpconfigport.h                  |  5 -----
 ports/zephyr/main.c                           | 10 ++--------
 20 files changed, 2 insertions(+), 151 deletions(-)

diff --git a/ports/cc3200/mpconfigport.h b/ports/cc3200/mpconfigport.h
index a3af89674a144..58ec80a9f5cf5 100644
--- a/ports/cc3200/mpconfigport.h
+++ b/ports/cc3200/mpconfigport.h
@@ -135,15 +135,6 @@
 #define mp_type_fileio mp_type_vfs_fat_fileio
 #define mp_type_textio mp_type_vfs_fat_textio
 
-// use vfs's functions for import stat and builtin open
-#define mp_import_stat mp_vfs_import_stat
-#define mp_builtin_open mp_vfs_open
-#define mp_builtin_open_obj mp_vfs_open_obj
-
-// extra built in names to add to the global namespace
-#define MICROPY_PORT_BUILTINS \
-    { MP_ROM_QSTR(MP_QSTR_open),  MP_ROM_PTR(&mp_builtin_open_obj) },   \
-
 // extra constants
 #define MICROPY_PORT_CONSTANTS \
     { MP_ROM_QSTR(MP_QSTR_umachine),     MP_ROM_PTR(&mp_module_machine) },  \
diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h
index a64d6de995757..6f4241330579f 100644
--- a/ports/esp32/mpconfigport.h
+++ b/ports/esp32/mpconfigport.h
@@ -126,16 +126,6 @@
 #define mp_type_fileio                      mp_type_vfs_fat_fileio
 #define mp_type_textio                      mp_type_vfs_fat_textio
 
-// use vfs's functions for import stat and builtin open
-#define mp_import_stat mp_vfs_import_stat
-#define mp_builtin_open mp_vfs_open
-#define mp_builtin_open_obj mp_vfs_open_obj
-
-// extra built in names to add to the global namespace
-#define MICROPY_PORT_BUILTINS \
-    { MP_OBJ_NEW_QSTR(MP_QSTR_input), (mp_obj_t)&mp_builtin_input_obj }, \
-    { MP_OBJ_NEW_QSTR(MP_QSTR_open), (mp_obj_t)&mp_builtin_open_obj },
-
 #define MP_STATE_PORT MP_STATE_VM
 
 struct _machine_timer_obj_t;
diff --git a/ports/esp8266/mpconfigport.h b/ports/esp8266/mpconfigport.h
index a64bc8f86d1f7..583d3648af8d2 100644
--- a/ports/esp8266/mpconfigport.h
+++ b/ports/esp8266/mpconfigport.h
@@ -150,15 +150,6 @@ extern const struct _mp_print_t mp_debug_print;
 #define mp_type_textio mp_type_vfs_lfs2_textio
 #endif
 
-// use vfs's functions for import stat and builtin open
-#define mp_import_stat mp_vfs_import_stat
-#define mp_builtin_open mp_vfs_open
-#define mp_builtin_open_obj mp_vfs_open_obj
-
-// extra built in names to add to the global namespace
-#define MICROPY_PORT_BUILTINS \
-    { MP_ROM_QSTR(MP_QSTR_open), MP_ROM_PTR(&mp_builtin_open_obj) },
-
 #define MP_STATE_PORT MP_STATE_VM
 
 #define MICROPY_PORT_ROOT_POINTERS \
diff --git a/ports/javascript/mpconfigport.h b/ports/javascript/mpconfigport.h
index 1d356a0a25957..4a6cb458838bd 100644
--- a/ports/javascript/mpconfigport.h
+++ b/ports/javascript/mpconfigport.h
@@ -175,10 +175,6 @@ typedef int mp_int_t; // must be pointer size
 typedef unsigned mp_uint_t; // must be pointer size
 typedef long mp_off_t;
 
-// extra built in names to add to the global namespace
-#define MICROPY_PORT_BUILTINS \
-    { MP_ROM_QSTR(MP_QSTR_open), MP_ROM_PTR(&mp_builtin_open_obj) },
-
 // We need to provide a declaration/definition of alloca()
 #include <alloca.h>
 
diff --git a/ports/mimxrt/mpconfigport.h b/ports/mimxrt/mpconfigport.h
index 05de0306b447d..1dcaccad4795f 100644
--- a/ports/mimxrt/mpconfigport.h
+++ b/ports/mimxrt/mpconfigport.h
@@ -188,11 +188,6 @@ uint32_t trng_random_u32(void);
 #define mp_type_fileio mp_type_vfs_lfs2_fileio
 #define mp_type_textio mp_type_vfs_lfs2_textio
 
-// Use VFS's functions for import stat and builtin open
-#define mp_import_stat mp_vfs_import_stat
-#define mp_builtin_open mp_vfs_open
-#define mp_builtin_open_obj mp_vfs_open_obj
-
 // Hooks to add builtins
 
 __attribute__((always_inline)) static inline void enable_irq(uint32_t state) {
@@ -225,9 +220,6 @@ static inline void restore_irq_pri(uint32_t basepri) {
 #define MICROPY_BEGIN_ATOMIC_SECTION()     disable_irq()
 #define MICROPY_END_ATOMIC_SECTION(state)  enable_irq(state)
 
-#define MICROPY_PORT_BUILTINS \
-    { MP_ROM_QSTR(MP_QSTR_open), MP_ROM_PTR(&mp_builtin_open_obj) },
-
 #if defined(MICROPY_HW_ETH_MDC)
 extern const struct _mp_obj_type_t network_lan_type;
 #define MICROPY_HW_NIC_ETH                  { MP_ROM_QSTR(MP_QSTR_LAN), MP_ROM_PTR(&network_lan_type) },
diff --git a/ports/minimal/main.c b/ports/minimal/main.c
index dbde33915a7e2..2893276586269 100644
--- a/ports/minimal/main.c
+++ b/ports/minimal/main.c
@@ -81,11 +81,6 @@ mp_import_stat_t mp_import_stat(const char *path) {
     return MP_IMPORT_STAT_NO_EXIST;
 }
 
-mp_obj_t mp_builtin_open(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs) {
-    return mp_const_none;
-}
-MP_DEFINE_CONST_FUN_OBJ_KW(mp_builtin_open_obj, 1, mp_builtin_open);
-
 void nlr_jump_fail(void *val) {
     while (1) {
         ;
diff --git a/ports/minimal/mpconfigport.h b/ports/minimal/mpconfigport.h
index c9f3998762e81..7d6a3adedcebe 100644
--- a/ports/minimal/mpconfigport.h
+++ b/ports/minimal/mpconfigport.h
@@ -25,10 +25,6 @@ typedef intptr_t mp_int_t; // must be pointer size
 typedef uintptr_t mp_uint_t; // must be pointer size
 typedef long mp_off_t;
 
-// extra built in names to add to the global namespace
-#define MICROPY_PORT_BUILTINS \
-    { MP_ROM_QSTR(MP_QSTR_open), MP_ROM_PTR(&mp_builtin_open_obj) },
-
 // We need to provide a declaration/definition of alloca()
 #include <alloca.h>
 
diff --git a/ports/nrf/mpconfigport.h b/ports/nrf/mpconfigport.h
index 05e35956d9a6a..874748c2e4943 100644
--- a/ports/nrf/mpconfigport.h
+++ b/ports/nrf/mpconfigport.h
@@ -85,13 +85,6 @@
 #define mp_type_fileio fatfs_type_fileio
 #define mp_type_textio fatfs_type_textio
 
-// use vfs's functions for import stat and builtin open
-#if MICROPY_VFS
-#define mp_import_stat mp_vfs_import_stat
-#define mp_builtin_open mp_vfs_open
-#define mp_builtin_open_obj mp_vfs_open_obj
-#endif
-
 // Enable micro:bit filesystem by default.
 #ifndef MICROPY_MBFS
 #define MICROPY_MBFS (1)
diff --git a/ports/qemu-arm/main.c b/ports/qemu-arm/main.c
index 8c49d0c780c66..45da65f2a44aa 100644
--- a/ports/qemu-arm/main.c
+++ b/ports/qemu-arm/main.c
@@ -45,15 +45,6 @@ mp_lexer_t *mp_lexer_new_from_file(const char *filename) {
     mp_raise_OSError(MP_ENOENT);
 }
 
-mp_import_stat_t mp_import_stat(const char *path) {
-    return MP_IMPORT_STAT_NO_EXIST;
-}
-
-mp_obj_t mp_builtin_open(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs) {
-    return mp_const_none;
-}
-MP_DEFINE_CONST_FUN_OBJ_KW(mp_builtin_open_obj, 1, mp_builtin_open);
-
 void nlr_jump_fail(void *val) {
     printf("uncaught NLR\n");
     exit(1);
diff --git a/ports/qemu-arm/mpconfigport.h b/ports/qemu-arm/mpconfigport.h
index 879ad7eaaf56f..8809d17154fd0 100644
--- a/ports/qemu-arm/mpconfigport.h
+++ b/ports/qemu-arm/mpconfigport.h
@@ -61,10 +61,6 @@ typedef int32_t mp_int_t; // must be pointer size
 typedef uint32_t mp_uint_t; // must be pointer size
 typedef long mp_off_t;
 
-// extra built in names to add to the global namespace
-#define MICROPY_PORT_BUILTINS \
-    { MP_ROM_QSTR(MP_QSTR_open), MP_ROM_PTR(&mp_builtin_open_obj) },
-
 // We need to provide a declaration/definition of alloca()
 #include <alloca.h>
 
diff --git a/ports/qemu-arm/test_main.c b/ports/qemu-arm/test_main.c
index 3a89b3f13124c..673311d1e5bb7 100644
--- a/ports/qemu-arm/test_main.c
+++ b/ports/qemu-arm/test_main.c
@@ -5,7 +5,6 @@
 #include <malloc.h>
 #include <setjmp.h>
 
-#include "py/builtin.h"
 #include "py/compile.h"
 #include "py/runtime.h"
 #include "py/stackctrl.h"
@@ -39,15 +38,6 @@ mp_lexer_t *mp_lexer_new_from_file(const char *filename) {
     mp_raise_OSError(MP_ENOENT);
 }
 
-mp_import_stat_t mp_import_stat(const char *path) {
-    return MP_IMPORT_STAT_NO_EXIST;
-}
-
-mp_obj_t mp_builtin_open(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs) {
-    return mp_const_none;
-}
-MP_DEFINE_CONST_FUN_OBJ_KW(mp_builtin_open_obj, 1, mp_builtin_open);
-
 void nlr_jump_fail(void *val) {
     printf("uncaught NLR\n");
     exit(1);
diff --git a/ports/renesas-ra/mpconfigport.h b/ports/renesas-ra/mpconfigport.h
index e66ca6b1842d6..02292a1188411 100644
--- a/ports/renesas-ra/mpconfigport.h
+++ b/ports/renesas-ra/mpconfigport.h
@@ -149,15 +149,6 @@
 #define mp_type_textio mp_type_vfs_lfs2_textio
 #endif
 
-// use vfs's functions for import stat and builtin open
-#define mp_import_stat mp_vfs_import_stat
-#define mp_builtin_open mp_vfs_open
-#define mp_builtin_open_obj mp_vfs_open_obj
-
-// extra built in names to add to the global namespace
-#define MICROPY_PORT_BUILTINS \
-    { MP_ROM_QSTR(MP_QSTR_open), MP_ROM_PTR(&mp_builtin_open_obj) },
-
 #if MICROPY_PY_MACHINE
 #define MACHINE_BUILTIN_MODULE_CONSTANTS \
     { MP_ROM_QSTR(MP_QSTR_umachine), MP_ROM_PTR(&mp_module_machine) }, \
diff --git a/ports/rp2/mpconfigport.h b/ports/rp2/mpconfigport.h
index 704247dfbe022..f71ddce7c52e3 100644
--- a/ports/rp2/mpconfigport.h
+++ b/ports/rp2/mpconfigport.h
@@ -125,15 +125,6 @@
 #define mp_type_textio mp_type_vfs_lfs2_textio
 #endif
 
-// Use VFS's functions for import stat and builtin open
-#define mp_import_stat mp_vfs_import_stat
-#define mp_builtin_open_obj mp_vfs_open_obj
-
-// Hooks to add builtins
-
-#define MICROPY_PORT_BUILTINS \
-    { MP_ROM_QSTR(MP_QSTR_open), MP_ROM_PTR(&mp_builtin_open_obj) },
-
 #if MICROPY_PY_NETWORK
 #define NETWORK_ROOT_POINTERS               mp_obj_list_t mod_network_nic_list;
 #else
diff --git a/ports/samd/main.c b/ports/samd/main.c
index 63fe4013a443a..d8c1c596c5b06 100644
--- a/ports/samd/main.c
+++ b/ports/samd/main.c
@@ -73,23 +73,6 @@ void gc_collect(void) {
     gc_collect_end();
 }
 
-/*
-mp_lexer_t *mp_lexer_new_from_file(const char *filename) {
-    mp_raise_OSError(MP_ENOENT);
-}
-*/
-
-#if !MICROPY_VFS
-mp_import_stat_t mp_import_stat(const char *path) {
-    return MP_IMPORT_STAT_NO_EXIST;
-}
-
-mp_obj_t mp_builtin_open(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs) {
-    return mp_const_none;
-}
-MP_DEFINE_CONST_FUN_OBJ_KW(mp_builtin_open_obj, 1, mp_builtin_open);
-#endif
-
 void nlr_jump_fail(void *val) {
     for (;;) {
     }
diff --git a/ports/samd/mpconfigport.h b/ports/samd/mpconfigport.h
index 613b8cd5a91e0..1625496a2e14a 100644
--- a/ports/samd/mpconfigport.h
+++ b/ports/samd/mpconfigport.h
@@ -99,15 +99,6 @@
 #define mp_type_fileio mp_type_vfs_lfs1_fileio
 #define mp_type_textio mp_type_vfs_lfs1_textio
 
-// Use VFS's functions for import stat and builtin open
-#define mp_import_stat mp_vfs_import_stat
-#define mp_builtin_open_obj mp_vfs_open_obj
-
-// Hooks to add builtins
-
-#define MICROPY_PORT_BUILTINS \
-    { MP_ROM_QSTR(MP_QSTR_open), MP_ROM_PTR(&mp_builtin_open_obj) },
-
 #define MICROPY_PORT_ROOT_POINTERS \
     const char *readline_hist[8];
 
diff --git a/ports/stm32/mpconfigport.h b/ports/stm32/mpconfigport.h
index 484dd842c4d7c..00b60b983324e 100644
--- a/ports/stm32/mpconfigport.h
+++ b/ports/stm32/mpconfigport.h
@@ -163,15 +163,6 @@
 #define mp_type_textio mp_type_vfs_lfs2_textio
 #endif
 
-// use vfs's functions for import stat and builtin open
-#define mp_import_stat mp_vfs_import_stat
-#define mp_builtin_open mp_vfs_open
-#define mp_builtin_open_obj mp_vfs_open_obj
-
-// extra built in names to add to the global namespace
-#define MICROPY_PORT_BUILTINS \
-    { MP_ROM_QSTR(MP_QSTR_open), MP_ROM_PTR(&mp_builtin_open_obj) },
-
 #if MICROPY_PY_PYB
 extern const struct _mp_obj_module_t pyb_module;
 #define PYB_BUILTIN_MODULE_CONSTANTS \
diff --git a/ports/unix/mpconfigport.h b/ports/unix/mpconfigport.h
index 524b165231384..ca050b414b767 100644
--- a/ports/unix/mpconfigport.h
+++ b/ports/unix/mpconfigport.h
@@ -214,8 +214,6 @@ extern const struct _mp_print_t mp_stderr_print;
 #define MICROPY_EMERGENCY_EXCEPTION_BUF_SIZE  (256)
 #define MICROPY_ASYNC_KBD_INTR      (1)
 
-#define mp_import_stat mp_vfs_import_stat
-#define mp_builtin_open_obj mp_vfs_open_obj
 #define mp_type_fileio mp_type_vfs_posix_fileio
 #define mp_type_textio mp_type_vfs_posix_textio
 
@@ -273,9 +271,6 @@ void mp_unix_mark_exec(void);
 #endif
 #endif
 
-#define MICROPY_PORT_BUILTINS \
-    { MP_ROM_QSTR(MP_QSTR_open), MP_ROM_PTR(&mp_builtin_open_obj) },
-
 #define MP_STATE_PORT MP_STATE_VM
 
 #if MICROPY_PY_BLUETOOTH
diff --git a/ports/unix/variants/minimal/mpconfigvariant.h b/ports/unix/variants/minimal/mpconfigvariant.h
index f6be44692051c..60d194b6a1f03 100644
--- a/ports/unix/variants/minimal/mpconfigvariant.h
+++ b/ports/unix/variants/minimal/mpconfigvariant.h
@@ -109,7 +109,6 @@
 
 #define MICROPY_PORT_ROOT_POINTERS \
 
-#define mp_import_stat mp_vfs_import_stat
 #define mp_type_fileio mp_type_vfs_posix_fileio
 #define mp_type_textio mp_type_vfs_posix_textio
 
diff --git a/ports/windows/mpconfigport.h b/ports/windows/mpconfigport.h
index ecaa520e81c2e..47292b3bb6bc8 100644
--- a/ports/windows/mpconfigport.h
+++ b/ports/windows/mpconfigport.h
@@ -171,8 +171,6 @@ extern const struct _mp_print_t mp_stderr_print;
 #define MICROPY_EMERGENCY_EXCEPTION_BUF_SIZE     (256)
 #define MICROPY_KBD_EXCEPTION       (1)
 
-#define mp_import_stat mp_vfs_import_stat
-#define mp_builtin_open_obj mp_vfs_open_obj
 #define mp_type_fileio mp_type_vfs_posix_fileio
 #define mp_type_textio mp_type_vfs_posix_textio
 
@@ -212,9 +210,6 @@ typedef long long mp_off_t;
 typedef long mp_off_t;
 #endif
 
-#define MICROPY_PORT_BUILTINS \
-    { MP_ROM_QSTR(MP_QSTR_open), MP_ROM_PTR(&mp_builtin_open_obj) },
-
 #if MICROPY_USE_READLINE == 1
 #define MICROPY_PORT_ROOT_POINTERS \
     char *readline_hist[50];
diff --git a/ports/zephyr/main.c b/ports/zephyr/main.c
index ed1ac560e1718..4f735b671fff2 100644
--- a/ports/zephyr/main.c
+++ b/ports/zephyr/main.c
@@ -195,22 +195,16 @@ mp_lexer_t *mp_lexer_new_from_file(const char *filename) {
 }
 #endif
 
+#if !MICROPY_VFS
 mp_import_stat_t mp_import_stat(const char *path) {
-    #if MICROPY_VFS
-    return mp_vfs_import_stat(path);
-    #else
     return MP_IMPORT_STAT_NO_EXIST;
-    #endif
 }
 
 mp_obj_t mp_builtin_open(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs) {
-    #if MICROPY_VFS
-    return mp_vfs_open(n_args, args, kwargs);
-    #else
     return mp_const_none;
-    #endif
 }
 MP_DEFINE_CONST_FUN_OBJ_KW(mp_builtin_open_obj, 1, mp_builtin_open);
+#endif
 
 NORETURN void nlr_jump_fail(void *val) {
     while (1) {

From d037e759910c5309759026d2ef7bded11df9ebe1 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Wed, 25 May 2022 10:52:22 +0200
Subject: [PATCH 2090/3533] rp2/mpconfigport.h: Enable static scheduler nodes.

---
 ports/rp2/mpconfigport.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/rp2/mpconfigport.h b/ports/rp2/mpconfigport.h
index f71ddce7c52e3..aafa374628c68 100644
--- a/ports/rp2/mpconfigport.h
+++ b/ports/rp2/mpconfigport.h
@@ -68,6 +68,7 @@
 #define MICROPY_FLOAT_IMPL                      (MICROPY_FLOAT_IMPL_FLOAT)
 #define MICROPY_USE_INTERNAL_ERRNO              (1)
 #define MICROPY_SCHEDULER_DEPTH                 (8)
+#define MICROPY_SCHEDULER_STATIC_NODES          (1)
 
 // Fine control over Python builtins, classes, modules, etc
 #define MICROPY_PY_BUILTINS_HELP_TEXT           rp2_help_text

From 4bcffbd1c6fbcf3de02d4d4a07e71ff0ca48db67 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Tue, 17 May 2022 12:02:23 +0200
Subject: [PATCH 2091/3533] rp2/mpconfigport.h: Allow boards to override
 internal errno config.

---
 ports/rp2/mpconfigport.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ports/rp2/mpconfigport.h b/ports/rp2/mpconfigport.h
index aafa374628c68..63faf36ea0cae 100644
--- a/ports/rp2/mpconfigport.h
+++ b/ports/rp2/mpconfigport.h
@@ -66,9 +66,11 @@
 #define MICROPY_ENABLE_EMERGENCY_EXCEPTION_BUF  (1)
 #define MICROPY_LONGINT_IMPL                    (MICROPY_LONGINT_IMPL_MPZ)
 #define MICROPY_FLOAT_IMPL                      (MICROPY_FLOAT_IMPL_FLOAT)
-#define MICROPY_USE_INTERNAL_ERRNO              (1)
 #define MICROPY_SCHEDULER_DEPTH                 (8)
 #define MICROPY_SCHEDULER_STATIC_NODES          (1)
+#ifndef MICROPY_USE_INTERNAL_ERRNO
+#define MICROPY_USE_INTERNAL_ERRNO              (1)
+#endif
 
 // Fine control over Python builtins, classes, modules, etc
 #define MICROPY_PY_BUILTINS_HELP_TEXT           rp2_help_text

From a22d0bda521230f601a146ca11550543fd126233 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Tue, 17 May 2022 12:03:05 +0200
Subject: [PATCH 2092/3533] rp2/boards/ARDUINO_NANO_RP2040_CONNECT: Disable
 internal errno.

* Internal errno can't be used with Nina module due to an issue
with esp-idf config.
---
 ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/mpconfigboard.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/mpconfigboard.h b/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/mpconfigboard.h
index 25eca725ab526..2b9b1471ef7c3 100644
--- a/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/mpconfigboard.h
+++ b/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/mpconfigboard.h
@@ -8,6 +8,9 @@
 #define MICROPY_PY_NETWORK              (1)
 #define MICROPY_PY_USOCKET              (1)
 
+// Disable internal error numbers.
+#define MICROPY_USE_INTERNAL_ERRNO      (0)
+
 // Enable USB Mass Storage with FatFS filesystem.
 #define MICROPY_HW_USB_MSC              (1)
 #define MICROPY_HW_USB_VID              (0x2341)

From 875caca504490fb4d95230c06d009502860dc8c3 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Sat, 14 May 2022 15:01:33 +0200
Subject: [PATCH 2093/3533] rp2/boards/ARDUINO_NANO_RP2040_CONNECT: Enable
 webrepl.

---
 ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/manifest.py     | 1 +
 ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/mpconfigboard.h | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/manifest.py b/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/manifest.py
index a9c81576dadde..1becb3dfe1186 100644
--- a/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/manifest.py
+++ b/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/manifest.py
@@ -1,4 +1,5 @@
 include("$(PORT_DIR)/boards/manifest.py")
+include("$(MPY_DIR)/extmod/webrepl/manifest.py")
 freeze("$(MPY_DIR)/drivers/lsm6dsox/", "lsm6dsox.py")
 include(
     "$(MPY_LIB_DIR)/micropython/bluetooth/aioble/manifest.py",
diff --git a/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/mpconfigboard.h b/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/mpconfigboard.h
index 2b9b1471ef7c3..ed1d2cdcf469b 100644
--- a/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/mpconfigboard.h
+++ b/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/mpconfigboard.h
@@ -7,6 +7,10 @@
 // Enable networking and sockets.
 #define MICROPY_PY_NETWORK              (1)
 #define MICROPY_PY_USOCKET              (1)
+#define MICROPY_PY_WEBREPL              (1)
+#define MICROPY_PY_UWEBSOCKET           (1)
+#define MICROPY_PY_UHASHLIB_SHA1        (1)
+#define MICROPY_PY_OS_DUPTERM           (1)
 
 // Disable internal error numbers.
 #define MICROPY_USE_INTERNAL_ERRNO      (0)

From be83bdf9ecec2395545357c75bfc4625631e27d5 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Tue, 26 Apr 2022 14:55:31 +0200
Subject: [PATCH 2094/3533] drivers/ninaw10: Update driver to support firmware
 1.5.0.

* Firmware 1.5.0 introduces a new BSD-like sockets ABI,
which improves the integration with MicroPython.
---
 drivers/ninaw10/nina_wifi_bsp.c |   2 +-
 drivers/ninaw10/nina_wifi_drv.c | 372 +++++++++++++-------------------
 drivers/ninaw10/nina_wifi_drv.h |  40 ++--
 extmod/network_ninaw10.c        | 318 ++++++++++++++++++---------
 4 files changed, 389 insertions(+), 343 deletions(-)

diff --git a/drivers/ninaw10/nina_wifi_bsp.c b/drivers/ninaw10/nina_wifi_bsp.c
index c5a9b9b10abf4..6d04f46efdf7b 100644
--- a/drivers/ninaw10/nina_wifi_bsp.c
+++ b/drivers/ninaw10/nina_wifi_bsp.c
@@ -97,7 +97,7 @@ int nina_bsp_read_irq(void) {
 int nina_bsp_spi_slave_select(uint32_t timeout) {
     // Wait for ACK to go low.
     for (mp_uint_t start = mp_hal_ticks_ms(); mp_hal_pin_read(MICROPY_HW_NINA_ACK) == 1; mp_hal_delay_ms(1)) {
-        if ((mp_hal_ticks_ms() - start) >= timeout) {
+        if (timeout && ((mp_hal_ticks_ms() - start) >= timeout)) {
             return -1;
         }
     }
diff --git a/drivers/ninaw10/nina_wifi_drv.c b/drivers/ninaw10/nina_wifi_drv.c
index e811650b95c55..0131476a0a48a 100644
--- a/drivers/ninaw10/nina_wifi_drv.c
+++ b/drivers/ninaw10/nina_wifi_drv.c
@@ -60,8 +60,7 @@
 #define NINA_ARGS(...)          (nina_args_t []) {__VA_ARGS__}
 #define NINA_VALS(...)          (nina_vals_t []) {__VA_ARGS__}
 
-#define NINA_SSELECT_TIMEOUT    (10000)
-#define NINA_RESPONSE_TIMEOUT   (1000)
+#define NINA_SSELECT_TIMEOUT    (1000)
 #define NINA_CONNECT_TIMEOUT    (10000)
 
 #if NINA_DEBUG
@@ -130,18 +129,24 @@ typedef enum {
     NINA_CMD_GET_MAC_ADDR           = 0x22,
 
     // Sockets commands.
-    NINA_CMD_SOCKET_OPEN            = 0x3F,
-    NINA_CMD_SOCKET_CLOSE           = 0x2E,
-    NINA_CMD_SOCKET_CONNECT         = 0x2D,
-    NINA_CMD_SOCKET_AVAIL           = 0x2B,
-    NINA_CMD_SOCKET_BIND            = 0x28,
-    NINA_CMD_SOCKET_STATE           = 0x2F,
     NINA_CMD_SOCKET_REMOTE_ADDR     = 0x3A,
 
-    // TCP commands
-    NINA_CMD_TCP_SEND               = 0x44,
-    NINA_CMD_TCP_RECV               = 0x45,
-    NINA_CMD_TCP_ACK                = 0x2A,
+    NINA_CMD_SOCKET_SOCKET          = 0x70,
+    NINA_CMD_SOCKET_CLOSE           = 0x71,
+    NINA_CMD_SOCKET_ERRNO           = 0x72,
+    NINA_CMD_SOCKET_BIND            = 0x73,
+    NINA_CMD_SOCKET_LISTEN          = 0x74,
+    NINA_CMD_SOCKET_ACCEPT          = 0x75,
+    NINA_CMD_SOCKET_CONNECT         = 0x76,
+    NINA_CMD_SOCKET_SEND            = 0x77,
+    NINA_CMD_SOCKET_RECV            = 0x78,
+    NINA_CMD_SOCKET_SENDTO          = 0x79,
+    NINA_CMD_SOCKET_RECVFROM        = 0x7A,
+    NINA_CMD_SOCKET_IOCTL           = 0x7B,
+    NINA_CMD_SOCKET_POLL            = 0x7C,
+    NINA_CMD_SOCKET_SETSOCKOPT      = 0x7D,
+    NINA_CMD_SOCKET_GETSOCKOPT      = 0x7E,
+    NINA_CMD_SOCKET_GETPEERNAME     = 0x7F,
 
     // UDP commands.
     NINA_CMD_UDP_SEND               = 0x46,
@@ -201,28 +206,15 @@ static uint8_t nina_bsp_spi_read_byte(void) {
     return byte;
 }
 
-static int nina_wait_for_cmd(uint8_t cmd, uint32_t timeout) {
-    uint8_t buf = 0;
-    for (mp_uint_t start = mp_hal_ticks_ms(); ;) {
-        buf = nina_bsp_spi_read_byte();
-        if (buf == CMD_ERROR || buf == cmd
-            || ((mp_hal_ticks_ms() - start) >= timeout)) {
-            break;
-        }
-        mp_hal_delay_ms(1);
-    }
-
-    return (buf == cmd) ? 0 : -1;
-}
-
 static int nina_send_command(uint32_t cmd, uint32_t nargs, uint32_t width, nina_args_t *args) {
     int ret = -1;
     uint32_t length = 4; // 3 bytes header + 1 end byte
 
     debug_printf("nina_send_command (cmd 0x%x nargs %d width %d): ", cmd, nargs, width);
 
+    nina_bsp_spi_slave_deselect();
     if (nina_bsp_spi_slave_select(NINA_SSELECT_TIMEOUT) != 0) {
-        return -1;
+        goto error_out;
     }
 
     // Send command header.
@@ -265,29 +257,31 @@ static int nina_send_command(uint32_t cmd, uint32_t nargs, uint32_t width, nina_
 
 static int nina_read_response(uint32_t cmd, uint32_t nvals, uint32_t width, nina_vals_t *vals) {
     int ret = -1;
+    uint32_t length = 3; // 3 bytes response header
+    uint8_t header[3] = {0, 0, 0};
 
     debug_printf("nina_read_response(cmd 0x%x nvals %d width %d): ", cmd, nvals, width);
 
     // Read reply
-    if (nina_bsp_spi_slave_select(NINA_SSELECT_TIMEOUT) != 0) {
-        return -1;
-    }
-
-    // Wait for CMD_START
-    if (nina_wait_for_cmd(CMD_START, NINA_RESPONSE_TIMEOUT) != 0) {
+    nina_bsp_spi_slave_deselect();
+    if (nina_bsp_spi_slave_select(0) != 0) {
         goto error_out;
     }
 
-    // Should return CMD + REPLY flag.
-    if (nina_bsp_spi_read_byte() != (cmd | CMD_REPLY)) {
+    if (nina_bsp_spi_transfer(NULL, header, sizeof(header)) != 0
+        || header[1] != (cmd | CMD_REPLY)) {
+        // Read padding.
+        uint8_t header_padding = nina_bsp_spi_read_byte();
+        (void)header_padding;
+        debug_printf("nina_read_response() hdr 0x%x 0x%x 0x%x 0x%x\n",
+            header[0], header[1], header[2], header_padding);
         goto error_out;
     }
 
     // Sanity check the number of returned values.
     // NOTE: This is to handle the special case for the scan command.
-    uint32_t rvals = nina_bsp_spi_read_byte();
-    if (nvals > rvals) {
-        nvals = rvals;
+    if (nvals > header[2]) {
+        nvals = header[2];
     }
 
     // Read return value(s).
@@ -310,9 +304,12 @@ static int nina_read_response(uint32_t cmd, uint32_t nvals, uint32_t width, nina
 
         // Set the size.
         *(vals[i].size) = bytes;
+        length += bytes + width;
     }
 
-    if (nina_bsp_spi_read_byte() != CMD_END) {
+    // Read CMD_END and padding.
+    uint8_t rspbuf_end[4];
+    if (nina_bsp_spi_transfer(NULL, rspbuf_end, ((length + 1) % 4) + 1) != 0 || rspbuf_end[0] != CMD_END) {
         goto error_out;
     }
 
@@ -337,7 +334,6 @@ static int nina_send_command_read_ack(uint32_t cmd, uint32_t nargs, uint32_t wid
 
 static int nina_send_command_read_vals(uint32_t cmd, uint32_t nargs,
     uint32_t argsw, nina_args_t *args, uint32_t nvals, uint32_t valsw, nina_vals_t *vals) {
-
     if (nina_send_command(cmd, nargs, argsw, args) != 0 ||
         nina_read_response(cmd, nvals, valsw, vals) != 0) {
         return -1;
@@ -367,16 +363,6 @@ static int nina_connection_status() {
     return nina_send_command_read_ack(NINA_CMD_CONN_STATUS, 0, ARG_8BITS, NULL);
 }
 
-static int nina_socket_status(uint8_t fd) {
-    return nina_send_command_read_ack(NINA_CMD_SOCKET_STATE,
-        1, ARG_8BITS, NINA_ARGS(ARG_BYTE(fd)));
-}
-
-static int nina_server_socket_status(uint8_t fd) {
-    return nina_send_command_read_ack(NINA_CMD_SOCKET_STATE & 0xF9,
-        1, ARG_8BITS, NINA_ARGS(ARG_BYTE(fd)));
-}
-
 int nina_connect(const char *ssid, uint8_t security, const char *key, uint16_t channel) {
     uint8_t status = NINA_STATUS_CONNECT_FAILED;
 
@@ -476,10 +462,6 @@ int nina_connected_sta(uint32_t *sta_ip) {
     return -1;
 }
 
-int nina_wait_for_sta(uint32_t *sta_ip, uint32_t timeout) {
-    return -MP_ETIMEDOUT;
-}
-
 int nina_ifconfig(nina_ifconfig_t *ifconfig, bool set) {
     uint16_t ip_len = NINA_IPV4_ADDR_LEN;
     uint16_t sub_len = NINA_IPV4_ADDR_LEN;
@@ -724,257 +706,213 @@ int nina_ioctl(uint32_t cmd, size_t len, uint8_t *buf, uint32_t iface) {
     return 0;
 }
 
-int nina_socket_socket(uint8_t type) {
+int nina_socket_socket(uint8_t type, uint8_t proto) {
     uint16_t size = 1;
     uint8_t sock = 0;
 
-    if (nina_send_command_read_vals(NINA_CMD_SOCKET_OPEN,
-        0, ARG_8BITS, NULL,
+    if (nina_send_command_read_vals(NINA_CMD_SOCKET_SOCKET,
+        2, ARG_8BITS, NINA_ARGS(ARG_BYTE(type), ARG_BYTE(proto)),
         1, ARG_8BITS, NINA_VALS({&size, &sock})) != 0) {
         return -1;
     }
-    return sock;
+    return (sock == NO_SOCKET_AVAIL) ? -1 : sock;
 }
 
 int nina_socket_close(int fd) {
-    if (fd > 0 && fd < 255) {
-        if (nina_send_command_read_ack(NINA_CMD_SOCKET_CLOSE,
-            1, ARG_8BITS, NINA_ARGS(ARG_BYTE(fd))) != SPI_ACK) {
-            return -1;
-        }
-        for (mp_uint_t start = mp_hal_ticks_ms(); ; mp_hal_delay_ms(10)) {
-            if (nina_socket_status(fd) == SOCKET_STATE_CLOSED) {
-                break;
-            }
-            if ((mp_hal_ticks_ms() - start) >= 5000) {
-                return -MP_ETIMEDOUT;
-            }
-        }
+    if (nina_send_command_read_ack(NINA_CMD_SOCKET_CLOSE,
+        1, ARG_8BITS, NINA_ARGS(ARG_BYTE(fd))) != SPI_ACK) {
+        return -1;
     }
     return 0;
 }
 
-int nina_socket_bind(int fd, uint8_t *ip, uint16_t port, int type) {
-    if (nina_send_command_read_ack(NINA_CMD_SOCKET_BIND,
-        3, ARG_8BITS,
-        NINA_ARGS(
-            ARG_SHORT(__REVSH(port)),
-            ARG_BYTE(fd),
-            ARG_BYTE(type))) != SPI_ACK) {
+int nina_socket_errno(int *_errno) {
+    uint16_t size = 1;
+    *_errno = 0;
+    if (nina_send_command_read_vals(NINA_CMD_SOCKET_ERRNO,
+        0, ARG_8BITS, NULL,
+        1, ARG_8BITS, NINA_VALS({&size, _errno})) != 0) {
         return -1;
     }
+    return 0;
+}
 
-    // Only TCP sockets' states should be checked.
-    if (type == NINA_SOCKET_TYPE_TCP &&
-        nina_server_socket_status(fd) != SOCKET_STATE_LISTEN) {
+int nina_socket_bind(int fd, uint8_t *ip, uint16_t port) {
+    if (nina_send_command_read_ack(NINA_CMD_SOCKET_BIND,
+        2, ARG_8BITS,
+        NINA_ARGS(
+            ARG_BYTE(fd),
+            ARG_SHORT(__REVSH(port)))) != SPI_ACK) {
         return -1;
     }
     return 0;
 }
 
 int nina_socket_listen(int fd, uint32_t backlog) {
-    return 0; // No listen ?
-}
-
-int nina_socket_avail(int fd, int type, uint16_t *data) {
-    uint16_t size = 2;
-
-    if (nina_send_command_read_vals(NINA_CMD_SOCKET_AVAIL,
-        1, ARG_8BITS, NINA_ARGS(ARG_BYTE(fd)),
-        1, ARG_8BITS, NINA_VALS({&size, data})) != 0) {
+    if (nina_send_command_read_ack(NINA_CMD_SOCKET_LISTEN,
+        2, ARG_8BITS,
+        NINA_ARGS(
+            ARG_BYTE(fd),
+            ARG_BYTE(backlog))) != SPI_ACK) {
         return -1;
     }
-
-    // For TCP sockets in listen state, return 0 if there's no accepted socket.
-    if (*data == NO_SOCKET_AVAIL && type == NINA_SOCKET_TYPE_TCP
-        && nina_server_socket_status(fd) == SOCKET_STATE_LISTEN) {
-        *data = 0;
-    }
-
     return 0;
 }
 
-int nina_socket_accept(int fd, uint8_t *ip, uint16_t *port, int *fd_out, int32_t timeout) {
-    uint16_t sock = 0;
-
-    if (nina_server_socket_status(fd) != SOCKET_STATE_LISTEN) {
-        return -1;
-    }
-
-    for (mp_uint_t start = mp_hal_ticks_ms(); ; mp_hal_delay_ms(10)) {
-        if (nina_socket_avail(fd, NINA_SOCKET_TYPE_TCP, &sock) != 0) {
-            return -1;
-        }
-        if (sock != 0) {
-            break;
-        }
-        if (timeout == 0 || (timeout > 0 && (mp_hal_ticks_ms() - start) >= timeout)) {
-            return -MP_ETIMEDOUT;
-        }
-    }
-
+int nina_socket_accept(int fd, uint8_t *ip, uint16_t *port, int *fd_out) {
+    uint16_t fd_len = 1;
     uint16_t port_len = 2;
     uint16_t ip_len = NINA_IPV4_ADDR_LEN;
-    if (nina_send_command_read_vals(NINA_CMD_SOCKET_REMOTE_ADDR,
-        1, ARG_8BITS, NINA_ARGS(ARG_BYTE(sock)),
-        2, ARG_8BITS, NINA_VALS({&ip_len, ip}, {&port_len, port})) != 0) {
+    *fd_out = 0;
+    if (nina_send_command_read_vals(NINA_CMD_SOCKET_ACCEPT,
+        1, ARG_8BITS, NINA_ARGS(ARG_BYTE(fd)),
+        3, ARG_8BITS, NINA_VALS({&fd_len, fd_out}, {&ip_len, ip}, {&port_len, port})) != 0) {
         return -1;
     }
-    *fd_out = sock;
-    *port = __REVSH(*port);
-    return 0;
+    return (*fd_out == NO_SOCKET_AVAIL) ? -1 : 0;
 }
 
-int nina_socket_connect(int fd, uint8_t *ip, uint16_t port, int32_t timeout) {
+int nina_socket_connect(int fd, uint8_t *ip, uint16_t port) {
     if (nina_send_command_read_ack(NINA_CMD_SOCKET_CONNECT,
-        4, ARG_8BITS,
+        3, ARG_8BITS,
         NINA_ARGS(
-            ARG_WORD((*(uint32_t *)ip)),
-            ARG_SHORT(__REVSH(port)),
             ARG_BYTE(fd),
-            ARG_BYTE(NINA_SOCKET_TYPE_TCP))) != SPI_ACK) {
+            ARG_WORD((*(uint32_t *)ip)),
+            ARG_SHORT(__REVSH(port)))) != SPI_ACK) {
         return -1;
     }
-
-    for (mp_uint_t start = mp_hal_ticks_ms(); ; mp_hal_delay_ms(10)) {
-        int state = nina_socket_status(fd);
-        if (state == -1) {
-            return -1;
-        }
-
-        if (state == SOCKET_STATE_ESTABLISHED) {
-            break;
-        }
-
-        if (timeout == 0 || (timeout > 0 && (mp_hal_ticks_ms() - start) >= timeout)) {
-            return -MP_ETIMEDOUT;
-        }
-    }
-
     return 0;
 }
 
-int nina_socket_send(int fd, const uint8_t *buf, uint32_t len, int32_t timeout) {
+int nina_socket_send(int fd, const uint8_t *buf, uint32_t len) {
     uint16_t size = 2;
     uint16_t bytes = 0;
 
-    if (nina_socket_status(fd) != SOCKET_STATE_ESTABLISHED) {
-        return -MP_ENOTCONN;
-    }
-
-    if (nina_send_command_read_vals(NINA_CMD_TCP_SEND,
+    if (nina_send_command_read_vals(NINA_CMD_SOCKET_SEND,
         2, ARG_16BITS, NINA_ARGS(ARG_BYTE(fd), {len, buf}),
-        1, ARG_8BITS, NINA_VALS({&size, &bytes})) != 0 || bytes <= 0) {
+        1, ARG_8BITS, NINA_VALS({&size, &bytes})) != 0) {
         return -1;
     }
 
-    for (mp_uint_t start = mp_hal_ticks_ms(); ;) {
-        int resp = nina_send_command_read_ack(NINA_CMD_TCP_ACK,
-            1, ARG_8BITS, NINA_ARGS(ARG_BYTE(fd)));
+    // Only args sizes (not args themselves) are reversed in read_response().
+    bytes = __REVSH(bytes);
 
-        if (resp == -1) {
+    if (bytes == 0) {
+        int _errno = 0;
+        if (nina_socket_errno(&_errno) != 0 || _errno != 0) {
             return -1;
         }
-
-        if (resp == SPI_ACK) {
-            break;
-        }
-
-        if (timeout == 0 || (timeout > 0 && (mp_hal_ticks_ms() - start) >= timeout)) {
-            return -MP_ETIMEDOUT;
-        }
-        mp_hal_delay_ms(1);
     }
 
     return bytes;
 }
 
-int nina_socket_recv(int fd, uint8_t *buf, uint32_t len, int32_t timeout) {
-    uint16_t bytes = 0;
+int nina_socket_recv(int fd, uint8_t *buf, uint32_t len) {
+    uint16_t bytes = len;
 
-    if (nina_socket_status(fd) != SOCKET_STATE_ESTABLISHED) {
-        return -MP_ENOTCONN;
+    if (nina_send_command_read_vals(NINA_CMD_SOCKET_RECV,
+        2, ARG_8BITS, NINA_ARGS(ARG_BYTE(fd), ARG_SHORT(bytes)),
+        1, ARG_16BITS, NINA_VALS({&bytes, buf})) != 0) {
+        return -1;
     }
 
-    for (mp_uint_t start = mp_hal_ticks_ms(); bytes == 0; mp_hal_delay_ms(1)) {
-        bytes = len;
-        if (nina_send_command_read_vals(NINA_CMD_TCP_RECV,
-            2, ARG_16BITS, NINA_ARGS(ARG_BYTE(fd), ARG_SHORT(bytes)),
-            1, ARG_16BITS, NINA_VALS({&bytes, buf})) != 0) {
+    if (bytes == 0) {
+        int _errno = 0;
+        if (nina_socket_errno(&_errno) != 0 || _errno != 0) {
             return -1;
         }
-
-        if (bytes != 0) {
-            break;
-        }
-
-        if (timeout == 0 || (timeout > 0 && (mp_hal_ticks_ms() - start) >= timeout)) {
-            return -MP_ETIMEDOUT;
-        }
     }
+
     return bytes;
 }
 
 // Check from the upper layer if the socket is bound, if not then auto-bind it first.
-int nina_socket_sendto(int fd, const uint8_t *buf, uint32_t len, uint8_t *ip, uint16_t port, int32_t timeout) {
-    // TODO do we need to split the packet somewhere?
-    if (nina_send_command_read_ack(NINA_CMD_SOCKET_CONNECT,
-        4, ARG_8BITS,
-        NINA_ARGS(
-            ARG_WORD((*(uint32_t *)ip)),
-            ARG_SHORT(__REVSH(port)),
-            ARG_BYTE(fd),
-            ARG_BYTE(NINA_SOCKET_TYPE_UDP))) != SPI_ACK) {
-        return -1;
-    }
+int nina_socket_sendto(int fd, const uint8_t *buf, uint32_t len, uint8_t *ip, uint16_t port) {
+    uint16_t size = 2;
+    uint16_t bytes = 0;
 
-    // Buffer length and socket number are passed as 16bits.
-    if (nina_send_command_read_ack(NINA_CMD_UDP_SEND,
-        2, ARG_16BITS, NINA_ARGS(ARG_BYTE(fd), {len, buf})) != SPI_ACK) {
+    if (nina_send_command_read_vals(NINA_CMD_SOCKET_SENDTO,
+        4, ARG_16BITS, NINA_ARGS(ARG_BYTE(fd), ARG_WORD((*(uint32_t *)ip)), ARG_SHORT(__REVSH(port)), {len, buf}),
+        1, ARG_8BITS, NINA_VALS({&size, &bytes})) != 0) {
         return -1;
     }
 
-    if (nina_send_command_read_ack(NINA_CMD_UDP_ACK,
-        1, ARG_8BITS, NINA_ARGS(ARG_BYTE(fd))) != SPI_ACK) {
-        return -1;
+    // Only args sizes (not args themselves) are reversed in read_response().
+    bytes = __REVSH(bytes);
+
+    if (bytes == 0) {
+        int _errno = 0;
+        if (nina_socket_errno(&_errno) != 0 || _errno != 0) {
+            return -1;
+        }
     }
 
-    return 0;
+    return bytes;
 }
 
 // Check from the upper layer if the socket is bound, if not then auto-bind it first.
-int nina_socket_recvfrom(int fd, uint8_t *buf, uint32_t len, uint8_t *ip, uint16_t *port, int32_t timeout) {
-    uint16_t bytes = 0;
+int nina_socket_recvfrom(int fd, uint8_t *buf, uint32_t len, uint8_t *ip, uint16_t *port) {
+    uint16_t bytes = len;
     uint16_t port_len = 2;
     uint16_t ip_len = NINA_IPV4_ADDR_LEN;
 
-    for (mp_uint_t start = mp_hal_ticks_ms(); bytes == 0; mp_hal_delay_ms(1)) {
-        bytes = len;
-        if (nina_send_command_read_vals(NINA_CMD_UDP_RECV,
-            2, ARG_16BITS, NINA_ARGS(ARG_BYTE(fd), ARG_SHORT(bytes)),
-            1, ARG_16BITS, NINA_VALS({&bytes, buf})) != 0) {
-            return -1;
-        }
+    if (nina_send_command_read_vals(NINA_CMD_SOCKET_RECVFROM,
+        2, ARG_8BITS, NINA_ARGS(ARG_BYTE(fd), ARG_SHORT(bytes)),
+        3, ARG_16BITS, NINA_VALS({&ip_len, ip}, {&port_len, port}, {&bytes, buf})) != 0) {
+        return -1;
+    }
 
-        if (bytes != 0) {
-            break;
+    if (bytes == 0) {
+        int _errno = 0;
+        if (nina_socket_errno(&_errno) != 0 || _errno != 0) {
+            return -1;
         }
+    }
+    return bytes;
+}
 
-        if (timeout == 0 || (timeout > 0 && (mp_hal_ticks_ms() - start) >= timeout)) {
-            return -MP_ETIMEDOUT;
-        }
+int nina_socket_ioctl(int fd, uint32_t cmd, void *argval, uint32_t arglen) {
+    uint16_t len = arglen;
+    if (nina_send_command_read_vals(NINA_CMD_SOCKET_IOCTL,
+        3, ARG_8BITS, NINA_ARGS(ARG_BYTE(fd), ARG_WORD(cmd), {len, argval}),
+        1, ARG_8BITS, NINA_VALS({&len, argval})) != 0 || arglen == 0) {
+        return -1;
     }
-    if (nina_send_command_read_vals(NINA_CMD_SOCKET_REMOTE_ADDR,
+    return 0;
+}
+
+int nina_socket_poll(int fd, uint8_t *flags) {
+    uint16_t flags_len = 1;
+    if (nina_send_command_read_vals(NINA_CMD_SOCKET_POLL,
         1, ARG_8BITS, NINA_ARGS(ARG_BYTE(fd)),
-        2, ARG_8BITS, NINA_VALS({&ip_len, ip}, {&port_len, port})) != 0) {
+        1, ARG_8BITS, NINA_VALS({&flags_len, flags})) != 0) {
         return -1;
     }
+    if (*flags & 0x80) {
+        // lwip_select() failed.
+        return -1;
+    }
+    return 0;
+}
 
-    return bytes;
+int nina_socket_setsockopt(int fd, uint32_t level, uint32_t optname, const void *optval, uint16_t optlen) {
+    if (nina_send_command_read_ack(
+        NINA_CMD_SOCKET_SETSOCKOPT,
+        3, ARG_8BITS,
+        NINA_ARGS(ARG_BYTE(fd), ARG_WORD(optname), {optlen, optval})) != SPI_ACK) {
+        return -1;
+    }
+    return 0;
 }
 
-int nina_socket_setsockopt(int fd, uint32_t level, uint32_t opt, const void *optval, uint32_t optlen) {
-    return -1;
+int nina_socket_getsockopt(int fd, uint32_t level, uint32_t optname, void *optval, uint16_t optlen) {
+    if (nina_send_command_read_vals(
+        NINA_CMD_SOCKET_GETSOCKOPT,
+        3, ARG_8BITS, NINA_ARGS(ARG_BYTE(fd), ARG_WORD(optname), ARG_BYTE(optlen)),
+        1, ARG_8BITS, NINA_VALS({&optlen, optval})) != 0 || optlen == 0) {
+        return -1;
+    }
+    return 0;
 }
 
 #endif // MICROPY_PY_NINAW10
diff --git a/drivers/ninaw10/nina_wifi_drv.h b/drivers/ninaw10/nina_wifi_drv.h
index 4fe701eba1dc4..22163c7286e9e 100644
--- a/drivers/ninaw10/nina_wifi_drv.h
+++ b/drivers/ninaw10/nina_wifi_drv.h
@@ -38,9 +38,9 @@
 #define NINA_MAX_NETWORK_LIST   (10)
 #define NINA_MAX_SOCKET         (10)
 
-#define NINA_FW_VER_MAJOR       (1)
-#define NINA_FW_VER_MINOR       (4)
-#define NINA_FW_VER_PATCH       (8)
+#define NINA_FW_VER_MIN_MAJOR   (1)
+#define NINA_FW_VER_MIN_MINOR   (5)
+#define NINA_FW_VER_MIN_PATCH   (0)
 
 #define NINA_FW_VER_MAJOR_OFFS  (0)
 #define NINA_FW_VER_MINOR_OFFS  (2)
@@ -54,11 +54,9 @@ typedef enum {
 } nina_security_t;
 
 typedef enum {
-    NINA_SOCKET_TYPE_TCP = 0,
-    NINA_SOCKET_TYPE_UDP,
-    NINA_SOCKET_TYPE_TLS,
-    NINA_SOCKET_TYPE_UDP_MULTICAST,
-    NINA_SOCKET_TYPE_TLS_BEARSSL
+    NINA_SOCKET_TYPE_TCP = 1,
+    NINA_SOCKET_TYPE_UDP = 2,
+    NINA_SOCKET_TYPE_RAW = 3,
 } nina_socket_type_t;
 
 typedef struct {
@@ -92,7 +90,6 @@ int nina_start_ap(const char *ssid, uint8_t security, const char *key, uint16_t
 int nina_disconnect(void);
 int nina_isconnected(void);
 int nina_connected_sta(uint32_t *sta_ip);
-int nina_wait_for_sta(uint32_t *sta_ip, uint32_t timeout);
 int nina_ifconfig(nina_ifconfig_t *ifconfig, bool set);
 int nina_netinfo(nina_netinfo_t *netinfo);
 int nina_scan(nina_scan_callback_t scan_callback, void *arg, uint32_t timeout);
@@ -101,17 +98,20 @@ int nina_fw_version(uint8_t *fw_ver);
 int nina_set_hostname(const char *name);
 int nina_gethostbyname(const char *name, uint8_t *out_ip);
 int nina_ioctl(uint32_t cmd, size_t len, uint8_t *buf, uint32_t iface);
-int nina_socket_socket(uint8_t type);
+int nina_socket_socket(uint8_t type, uint8_t proto);
 int nina_socket_close(int fd);
-int nina_socket_bind(int fd, uint8_t *ip, uint16_t port, int type);
+int nina_socket_errno(int *_errno);
+int nina_socket_bind(int fd, uint8_t *ip, uint16_t port);
 int nina_socket_listen(int fd, uint32_t backlog);
-int nina_socket_avail(int fd, int type, uint16_t *data);
-int nina_socket_accept(int fd, uint8_t *ip, uint16_t *port, int *fd_out, int32_t timeout);
-int nina_socket_connect(int fd, uint8_t *ip, uint16_t port, int32_t timeout);
-int nina_socket_send(int fd, const uint8_t *buf, uint32_t len, int32_t timeout);
-int nina_socket_recv(int fd, uint8_t *buf, uint32_t len, int32_t timeout);
-int nina_socket_sendto(int fd, const uint8_t *buf, uint32_t len, uint8_t *ip, uint16_t port, int32_t timeout);
-int nina_socket_recvfrom(int fd, uint8_t *buf, uint32_t len, uint8_t *ip, uint16_t *port, int32_t timeout);
-int nina_socket_setsockopt(int fd, uint32_t level, uint32_t opt, const void *optval, uint32_t optlen);
-
+int nina_socket_accept(int fd, uint8_t *ip, uint16_t *port, int *fd_out);
+int nina_socket_connect(int fd, uint8_t *ip, uint16_t port);
+int nina_socket_send(int fd, const uint8_t *buf, uint32_t len);
+int nina_socket_recv(int fd, uint8_t *buf, uint32_t len);
+int nina_socket_sendto(int fd, const uint8_t *buf, uint32_t len, uint8_t *ip, uint16_t port);
+int nina_socket_recvfrom(int fd, uint8_t *buf, uint32_t len, uint8_t *ip, uint16_t *port);
+int nina_socket_ioctl(int fd, uint32_t cmd, void *argval, uint32_t arglen);
+int nina_socket_poll(int fd, uint8_t *flags);
+int nina_socket_setsockopt(int fd, uint32_t level, uint32_t opt, const void *optval, uint16_t optlen);
+int nina_socket_getsockopt(int fd, uint32_t level, uint32_t opt, void *optval, uint16_t optlen);
+int nina_socket_getpeername(int fd, uint8_t *ip, uint16_t *port);
 #endif // MICROPY_INCLUDED_DRIVERS_NINAW10_NINA_WIFI_DRV_H
diff --git a/extmod/network_ninaw10.c b/extmod/network_ninaw10.c
index 034076307384e..64b73d608432f 100644
--- a/extmod/network_ninaw10.c
+++ b/extmod/network_ninaw10.c
@@ -53,8 +53,24 @@ typedef struct _nina_obj_t {
 } nina_obj_t;
 
 // For auto-binding UDP sockets
-#define BIND_PORT_RANGE_MIN (65000)
-#define BIND_PORT_RANGE_MAX (65535)
+#define BIND_PORT_RANGE_MIN     (65000)
+#define BIND_PORT_RANGE_MAX     (65535)
+
+#define SOCKET_IOCTL_FIONREAD   (0x4004667F)
+#define SOCKET_IOCTL_FIONBIO    (0x8004667E)
+
+#define SOCKET_POLL_RD          (0x01)
+#define SOCKET_POLL_WR          (0x02)
+#define SOCKET_POLL_ERR         (0x04)
+
+#define SO_ACCEPTCONN           (0x0002)
+#define SO_ERROR                (0x1007)
+#define SO_TYPE                 (0x1008)
+#define SO_NO_CHECK             (0x100a)
+
+#define is_nonblocking_error(errno) ((errno) == MP_EAGAIN || (errno) == MP_EWOULDBLOCK || (errno) == MP_EINPROGRESS)
+
+#define debug_printf(...)   // mp_printf(&mp_plat_print, __VA_ARGS__)
 
 static uint16_t bind_port = BIND_PORT_RANGE_MIN;
 const mod_network_nic_type_t mod_network_nic_type_nina;
@@ -85,22 +101,26 @@ STATIC mp_obj_t network_ninaw10_active(size_t n_args, const mp_obj_t *args) {
                     MP_ERROR_TEXT("Failed to initialize Nina-W10 module, error: %d\n"), error);
             }
             // check firmware version
-            uint8_t fw_ver[NINA_FW_VER_LEN];
-            if (nina_fw_version(fw_ver) != 0) {
+            uint8_t semver[NINA_FW_VER_LEN];
+            if (nina_fw_version(semver) != 0) {
                 nina_deinit();
                 mp_raise_msg_varg(&mp_type_OSError,
                     MP_ERROR_TEXT("Failed to read firmware version, error: %d\n"), error);
             }
-            // Check fw version matches the driver.
-            if ((fw_ver[NINA_FW_VER_MAJOR_OFFS] - 48) != NINA_FW_VER_MAJOR ||
-                (fw_ver[NINA_FW_VER_MINOR_OFFS] - 48) != NINA_FW_VER_MINOR ||
-                (fw_ver[NINA_FW_VER_PATCH_OFFS] - 48) != NINA_FW_VER_PATCH) {
-                mp_printf(&mp_plat_print,
-                    "Warning: firmware version mismatch, expected %d.%d.%d found: %d.%d.%d\n",
-                    NINA_FW_VER_MAJOR, NINA_FW_VER_MINOR, NINA_FW_VER_PATCH,
-                    fw_ver[NINA_FW_VER_MAJOR_OFFS] - 48,
-                    fw_ver[NINA_FW_VER_MINOR_OFFS] - 48,
-                    fw_ver[NINA_FW_VER_PATCH_OFFS] - 48);
+            // Check the minimum supported firmware version.
+            uint32_t fwmin = (NINA_FW_VER_MIN_MAJOR * 100) +
+                (NINA_FW_VER_MIN_MINOR * 10) +
+                (NINA_FW_VER_MIN_PATCH * 1);
+
+            uint32_t fwver = (semver[NINA_FW_VER_MAJOR_OFFS] - 48) * 100 +
+                (semver[NINA_FW_VER_MINOR_OFFS] - 48) * 10 +
+                (semver[NINA_FW_VER_PATCH_OFFS] - 48) * 1;
+
+            if (fwver < fwmin) {
+                mp_raise_msg_varg(&mp_type_OSError,
+                    MP_ERROR_TEXT("Firmware version mismatch. Minimum supported firmware is v%d.%d.%d found v%d.%d.%d\n"),
+                    NINA_FW_VER_MIN_MAJOR, NINA_FW_VER_MIN_MINOR, NINA_FW_VER_MIN_PATCH, semver[NINA_FW_VER_MAJOR_OFFS] - 48,
+                    semver[NINA_FW_VER_MINOR_OFFS] - 48, semver[NINA_FW_VER_PATCH_OFFS] - 48);
             }
         } else {
             nina_deinit();
@@ -318,6 +338,7 @@ STATIC mp_obj_t network_ninaw10_status(size_t n_args, const mp_obj_t *args) {
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(network_ninaw10_status_obj, 1, 2, network_ninaw10_status);
 
 STATIC mp_obj_t network_ninaw10_ioctl(mp_obj_t self_in, mp_obj_t cmd_in, mp_obj_t buf_in) {
+    debug_printf("ioctl(%d)\n", mp_obj_get_int(cmd_in));
     nina_obj_t *self = MP_OBJ_TO_PTR(self_in);
     mp_buffer_info_t buf;
     mp_get_buffer_raise(buf_in, &buf, MP_BUFFER_READ | MP_BUFFER_WRITE);
@@ -327,45 +348,79 @@ STATIC mp_obj_t network_ninaw10_ioctl(mp_obj_t self_in, mp_obj_t cmd_in, mp_obj_
 STATIC MP_DEFINE_CONST_FUN_OBJ_3(network_ninaw10_ioctl_obj, network_ninaw10_ioctl);
 
 STATIC int network_ninaw10_gethostbyname(mp_obj_t nic, const char *name, mp_uint_t len, uint8_t *out_ip) {
+    debug_printf("gethostbyname(%s)\n", name);
     return nina_gethostbyname(name, out_ip);
 }
 
-STATIC int network_ninaw10_socket_socket(mod_network_socket_obj_t *socket, int *_errno) {
-    uint8_t type;
+STATIC int network_ninaw10_socket_poll(mod_network_socket_obj_t *socket, uint32_t rwf, int *_errno) {
+    uint8_t flags = 0;
+    debug_printf("socket_polling_rw(%d, %d)\n", socket->fileno, rwf);
+    if (socket->timeout == 0) {
+        // Non-blocking socket, next socket function will return EAGAIN
+        return 0;
+    }
+    mp_uint_t start = mp_hal_ticks_ms();
+    while (!(flags & rwf)) {
+        if (nina_socket_poll(socket->fileno, &flags) < 0 || (flags & SOCKET_POLL_ERR)) {
+            nina_socket_errno(_errno);
+            debug_printf("socket_poll() -> errno %d\n", *_errno);
+            return -1;
+        }
+        if (!(flags & rwf) && socket->timeout != -1 &&
+            mp_hal_ticks_ms() - start > socket->timeout) {
+            *_errno = MP_ETIMEDOUT;
+            return -1;
+        }
+    }
+    return 0;
+}
 
-    if (socket->domain != MOD_NETWORK_AF_INET) {
-        *_errno = MP_EAFNOSUPPORT;
+STATIC int network_ninaw10_socket_setblocking(mod_network_socket_obj_t *socket, bool blocking, int *_errno) {
+    uint32_t nonblocking = !blocking;
+    // set socket in non-blocking mode
+    if (nina_socket_ioctl(socket->fileno, SOCKET_IOCTL_FIONBIO, &nonblocking, sizeof(nonblocking)) < 0) {
+        nina_socket_errno(_errno);
+        nina_socket_close(socket->fileno);
         return -1;
     }
+    return 0;
+}
 
-    switch (socket->type) {
-        case MOD_NETWORK_SOCK_STREAM:
-            type = NINA_SOCKET_TYPE_TCP;
-            break;
+STATIC int network_ninaw10_socket_listening(mod_network_socket_obj_t *socket, int *_errno) {
+    int listening = 0;
+    if (nina_socket_getsockopt(socket->fileno, MOD_NETWORK_SOL_SOCKET,
+        SO_ACCEPTCONN, &listening, sizeof(listening)) < 0) {
+        nina_socket_errno(_errno);
+        debug_printf("socket_getsockopt() -> errno %d\n", *_errno);
+        return -1;
+    }
+    return listening;
+}
 
-        case MOD_NETWORK_SOCK_DGRAM:
-            type = NINA_SOCKET_TYPE_UDP;
-            break;
+STATIC int network_ninaw10_socket_socket(mod_network_socket_obj_t *socket, int *_errno) {
+    debug_printf("socket_socket(%d %d %d)\n", socket->domain, socket->type, socket->proto);
 
-        default:
-            *_errno = MP_EINVAL;
-            return -1;
+    if (socket->domain != MOD_NETWORK_AF_INET) {
+        *_errno = MP_EAFNOSUPPORT;
+        return -1;
     }
 
     // open socket
-    int fd = nina_socket_socket(type);
+    int fd = nina_socket_socket(socket->type, socket->proto);
     if (fd < 0) {
-        *_errno = fd;
+        nina_socket_errno(_errno);
+        debug_printf("socket_socket() -> errno %d\n", *_errno);
         return -1;
     }
 
     // set socket state
     socket->fileno = fd;
     socket->bound = false;
-    return 0;
+    return network_ninaw10_socket_setblocking(socket, false, _errno);
 }
 
 STATIC void network_ninaw10_socket_close(mod_network_socket_obj_t *socket) {
+    debug_printf("socket_close(%d)\n", socket->fileno);
     if (socket->fileno >= 0) {
         nina_socket_close(socket->fileno);
         socket->fileno = -1; // Mark socket FD as invalid
@@ -373,6 +428,7 @@ STATIC void network_ninaw10_socket_close(mod_network_socket_obj_t *socket) {
 }
 
 STATIC int network_ninaw10_socket_bind(mod_network_socket_obj_t *socket, byte *ip, mp_uint_t port, int *_errno) {
+    debug_printf("socket_bind(%d, %d)\n", socket->fileno, port);
     uint8_t type;
     switch (socket->type) {
         case MOD_NETWORK_SOCK_STREAM:
@@ -388,10 +444,11 @@ STATIC int network_ninaw10_socket_bind(mod_network_socket_obj_t *socket, byte *i
             return -1;
     }
 
-    int ret = nina_socket_bind(socket->fileno, ip, port, type);
+    int ret = nina_socket_bind(socket->fileno, ip, port);
     if (ret < 0) {
-        *_errno = ret;
+        nina_socket_errno(_errno);
         network_ninaw10_socket_close(socket);
+        debug_printf("socket_bind(%d, %d) -> errno: %d\n", socket->fileno, port, *_errno);
         return -1;
     }
 
@@ -401,10 +458,12 @@ STATIC int network_ninaw10_socket_bind(mod_network_socket_obj_t *socket, byte *i
 }
 
 STATIC int network_ninaw10_socket_listen(mod_network_socket_obj_t *socket, mp_int_t backlog, int *_errno) {
+    debug_printf("socket_listen(%d, %d)\n", socket->fileno, backlog);
     int ret = nina_socket_listen(socket->fileno, backlog);
     if (ret < 0) {
-        *_errno = ret;
+        nina_socket_errno(_errno);
         network_ninaw10_socket_close(socket);
+        debug_printf("socket_listen() -> errno %d\n", *_errno);
         return -1;
     }
     return 0;
@@ -412,73 +471,109 @@ STATIC int network_ninaw10_socket_listen(mod_network_socket_obj_t *socket, mp_in
 
 STATIC int network_ninaw10_socket_accept(mod_network_socket_obj_t *socket,
     mod_network_socket_obj_t *socket2, byte *ip, mp_uint_t *port, int *_errno) {
+    debug_printf("socket_accept(%d)\n", socket->fileno);
+
+    if (network_ninaw10_socket_poll(socket, SOCKET_POLL_RD, _errno) != 0) {
+        return -1;
+    }
+
+    *port = 0;
     int fd = 0;
-    // Call accept.
-    int ret = nina_socket_accept(socket->fileno, ip, (uint16_t *)port, &fd, socket->timeout);
+    int ret = nina_socket_accept(socket->fileno, ip, (uint16_t *)port, &fd);
     if (ret < 0) {
-        *_errno = -ret;
-        // Close socket if not a timeout error.
-        if (*_errno != MP_ETIMEDOUT) {
+        nina_socket_errno(_errno);
+        // Close socket if not a nonblocking error.
+        if (!is_nonblocking_error(*_errno)) {
             network_ninaw10_socket_close(socket);
         }
+        debug_printf("socket_accept() -> errno %d\n", *_errno);
         return -1;
     }
 
     // set socket state
     socket2->fileno = fd;
     socket2->bound = false;
-    return 0;
+    return network_ninaw10_socket_setblocking(socket2, false, _errno);
 }
 
 STATIC int network_ninaw10_socket_connect(mod_network_socket_obj_t *socket, byte *ip, mp_uint_t port, int *_errno) {
-    int ret = nina_socket_connect(socket->fileno, ip, port, socket->timeout);
+    debug_printf("socket_connect(%d)\n", socket->fileno);
+
+    int ret = nina_socket_connect(socket->fileno, ip, port);
     if (ret < 0) {
-        *_errno = -ret;
-        // Close socket if not a timeout error.
-        if (*_errno != MP_ETIMEDOUT) {
+        nina_socket_errno(_errno);
+        debug_printf("socket_connect() -> errno %d\n", *_errno);
+
+        // Close socket if not a nonblocking error.
+        if (!is_nonblocking_error(*_errno)) {
             network_ninaw10_socket_close(socket);
+            return -1;
+        }
+
+        // Poll for write.
+        if (socket->timeout == 0 ||
+            network_ninaw10_socket_poll(socket, SOCKET_POLL_WR, _errno) != 0) {
+            return -1;
         }
-        return -1;
     }
     return 0;
 }
 
 STATIC mp_uint_t network_ninaw10_socket_send(mod_network_socket_obj_t *socket, const byte *buf, mp_uint_t len, int *_errno) {
-    int ret = nina_socket_send(socket->fileno, buf, len, socket->timeout);
+    debug_printf("socket_send(%d, %d)\n", socket->fileno, len);
+
+    if (network_ninaw10_socket_poll(socket, SOCKET_POLL_WR, _errno) != 0) {
+        return -1;
+    }
+
+    int ret = nina_socket_send(socket->fileno, buf, len);
     if (ret < 0) {
-        *_errno = -ret;
-        // Close socket if not a timeout error.
-        if (*_errno != MP_ETIMEDOUT) {
+        nina_socket_errno(_errno);
+        // Close socket if not a nonblocking error.
+        if (!is_nonblocking_error(*_errno)) {
             network_ninaw10_socket_close(socket);
         }
+        debug_printf("socket_send() -> errno %d\n", *_errno);
         return -1;
     }
     return ret;
 }
 
 STATIC mp_uint_t network_ninaw10_socket_recv(mod_network_socket_obj_t *socket, byte *buf, mp_uint_t len, int *_errno) {
-    int ret = 0;
-    if (socket->type == MOD_NETWORK_SOCK_DGRAM) {
-        byte ip[4];
-        uint16_t port;
-        ret = nina_socket_recvfrom(socket->fileno, buf, len, ip, &port, socket->timeout);
-    } else {
-        ret = nina_socket_recv(socket->fileno, buf, len, socket->timeout);
+    debug_printf("socket_recv(%d)\n", socket->fileno);
+    // check if socket in listening state.
+    if (network_ninaw10_socket_listening(socket, _errno) == 1) {
+        *_errno = MP_ENOTCONN;
+        return -1;
+    }
+
+    if (network_ninaw10_socket_poll(socket, SOCKET_POLL_RD, _errno) != 0) {
+        return -1;
     }
+
+    int ret = nina_socket_recv(socket->fileno, buf, len);
     if (ret < 0) {
-        *_errno = -ret;
-        // Close socket if not a timeout error.
-        if (*_errno != MP_ETIMEDOUT) {
+        nina_socket_errno(_errno);
+        if (*_errno == MP_ENOTCONN) {
+            *_errno = 0;
+            return 0;
+        }
+        // Close socket if not a nonblocking error.
+        if (!is_nonblocking_error(*_errno)) {
             network_ninaw10_socket_close(socket);
         }
+        debug_printf("socket_recv() -> errno %d\n", *_errno);
         return -1;
     }
     return ret;
 }
 
 STATIC mp_uint_t network_ninaw10_socket_auto_bind(mod_network_socket_obj_t *socket, int *_errno) {
-    if (socket->bound == false) {
+    debug_printf("socket_autobind(%d)\n", socket->fileno);
+    if (socket->bound == false && socket->type != MOD_NETWORK_SOCK_RAW) {
         if (network_ninaw10_socket_bind(socket, NULL, bind_port, _errno) != 0) {
+            nina_socket_errno(_errno);
+            debug_printf("socket_bind() -> errno %d\n", *_errno);
             return -1;
         }
         bind_port++;
@@ -489,16 +584,21 @@ STATIC mp_uint_t network_ninaw10_socket_auto_bind(mod_network_socket_obj_t *sock
 
 STATIC mp_uint_t network_ninaw10_socket_sendto(mod_network_socket_obj_t *socket,
     const byte *buf, mp_uint_t len, byte *ip, mp_uint_t port, int *_errno) {
+    debug_printf("socket_sendto(%d)\n", socket->fileno);
     // Auto-bind the socket first if the socket is unbound.
     if (network_ninaw10_socket_auto_bind(socket, _errno) != 0) {
         return -1;
     }
 
-    int ret = nina_socket_sendto(socket->fileno, buf, len, ip, port, socket->timeout);
+    if (network_ninaw10_socket_poll(socket, SOCKET_POLL_WR, _errno) != 0) {
+        return -1;
+    }
+
+    int ret = nina_socket_sendto(socket->fileno, buf, len, ip, port);
     if (ret < 0) {
-        *_errno = -ret;
-        // Close socket if not a timeout error.
-        if (*_errno != MP_ETIMEDOUT) {
+        nina_socket_errno(_errno);
+        // Close socket if not a nonblocking error.
+        if (!is_nonblocking_error(*_errno)) {
             network_ninaw10_socket_close(socket);
         }
         return -1;
@@ -508,24 +608,25 @@ STATIC mp_uint_t network_ninaw10_socket_sendto(mod_network_socket_obj_t *socket,
 
 STATIC mp_uint_t network_ninaw10_socket_recvfrom(mod_network_socket_obj_t *socket,
     byte *buf, mp_uint_t len, byte *ip, mp_uint_t *port, int *_errno) {
-    int ret = 0;
-    if (socket->type == MOD_NETWORK_SOCK_STREAM) {
-        *port = 0;
-        *((uint32_t *)ip) = 0;
-        ret = nina_socket_recv(socket->fileno, buf, len, socket->timeout);
-    } else {
-        // Auto-bind the socket first if the socket is unbound.
-        if (network_ninaw10_socket_auto_bind(socket, _errno) != 0) {
-            return -1;
-        }
-        ret = nina_socket_recvfrom(socket->fileno, buf, len, ip, (uint16_t *)port, socket->timeout);
+    debug_printf("socket_recvfrom(%d)\n", socket->fileno);
+    // Auto-bind the socket first if the socket is unbound.
+    if (network_ninaw10_socket_auto_bind(socket, _errno) != 0) {
+        return -1;
     }
+
+    if (network_ninaw10_socket_poll(socket, SOCKET_POLL_RD, _errno) != 0) {
+        return -1;
+    }
+
+    *port = 0;
+    int ret = nina_socket_recvfrom(socket->fileno, buf, len, ip, (uint16_t *)port);
     if (ret < 0) {
-        *_errno = -ret;
-        // Close socket if not a timeout error.
-        if (*_errno != MP_ETIMEDOUT) {
+        nina_socket_errno(_errno);
+        // Close socket if not a nonblocking error.
+        if (!is_nonblocking_error(*_errno)) {
             network_ninaw10_socket_close(socket);
         }
+        debug_printf("socket_recvfrom() -> errno %d\n", *_errno);
         return -1;
     }
     return ret;
@@ -533,53 +634,60 @@ STATIC mp_uint_t network_ninaw10_socket_recvfrom(mod_network_socket_obj_t *socke
 
 STATIC int network_ninaw10_socket_setsockopt(mod_network_socket_obj_t *socket, mp_uint_t
     level, mp_uint_t opt, const void *optval, mp_uint_t optlen, int *_errno) {
+    debug_printf("socket_setsockopt(%d, %d)\n", socket->fileno, opt);
     int ret = nina_socket_setsockopt(socket->fileno, level, opt, optval, optlen);
     if (ret < 0) {
-        *_errno = ret;
+        nina_socket_errno(_errno);
         network_ninaw10_socket_close(socket);
+        debug_printf("socket_setsockopt() -> errno %d\n", *_errno);
         return -1;
     }
     return 0;
 }
 
 STATIC int network_ninaw10_socket_settimeout(mod_network_socket_obj_t *socket, mp_uint_t timeout_ms, int *_errno) {
+    debug_printf("socket_settimeout(%d, %d)\n", socket->fileno, timeout_ms);
+    #if 0
+    if (timeout_ms == 0 || timeout_ms == UINT32_MAX) {
+        // blocking/nonblocking mode
+        uint32_t nonblocking = (timeout_ms == 0);
+        ret |= nina_socket_ioctl(socket->fileno, SOCKET_IOCTL_FIONBIO, &nonblocking, sizeof(nonblocking));
+    } else {
+        // timeout provided
+        uint32_t tv[2] = {
+            (timeout_ms / 1000),
+            (timeout_ms % 1000) * 1000,
+        };
+        ret |= nina_socket_setsockopt(socket->fileno, MOD_NETWORK_SOL_SOCKET, MOD_NETWORK_SO_SNDTIMEO, tv, sizeof(tv));
+        ret |= nina_socket_setsockopt(socket->fileno, MOD_NETWORK_SOL_SOCKET, MOD_NETWORK_SO_RCVTIMEO, tv, sizeof(tv));
+    }
+    if (ret < 0) {
+        nina_socket_errno(_errno);
+        debug_printf("socket_settimeout() -> errno %d\n", *_errno);
+    }
+    #endif
     socket->timeout = timeout_ms;
     return 0;
 }
 
 STATIC int network_ninaw10_socket_ioctl(mod_network_socket_obj_t *socket, mp_uint_t request, mp_uint_t arg, int *_errno) {
     mp_uint_t ret = 0;
-    uint8_t type;
-
-    switch (socket->type) {
-        case MOD_NETWORK_SOCK_STREAM:
-            type = NINA_SOCKET_TYPE_TCP;
-            break;
-
-        case MOD_NETWORK_SOCK_DGRAM:
-            type = NINA_SOCKET_TYPE_UDP;
-            break;
-
-        default:
-            *_errno = MP_EINVAL;
-            return MP_STREAM_ERROR;
-    }
-
+    debug_printf("socket_ioctl(%d, %d)\n", socket->fileno, request);
     if (request == MP_STREAM_POLL) {
-        if (arg & MP_STREAM_POLL_RD) {
-            uint16_t avail = 0;
-            if (nina_socket_avail(socket->fileno, type, &avail) != 0) {
-                *_errno = MP_EIO;
-                ret = MP_STREAM_ERROR;
-            } else if (avail) {
-                // Readable or accepted socket ready.
-                ret |= MP_STREAM_POLL_RD;
-            }
+        uint8_t flags = 0;
+        if (nina_socket_poll(socket->fileno, &flags) < 0) {
+            nina_socket_errno(_errno);
+            ret = MP_STREAM_ERROR;
+            debug_printf("socket_ioctl() -> errno %d\n", *_errno);
+        }
+        if ((arg & MP_STREAM_POLL_RD) && (flags & SOCKET_POLL_RD)) {
+            ret |= MP_STREAM_POLL_RD;
         }
-        if (arg & MP_STREAM_POLL_WR) {
+        if ((arg & MP_STREAM_POLL_WR) && (flags & SOCKET_POLL_WR)) {
             ret |= MP_STREAM_POLL_WR;
         }
     } else {
+        // NOTE: FIONREAD and FIONBIO are supported as well.
         *_errno = MP_EINVAL;
         ret = MP_STREAM_ERROR;
     }

From 0bdfceacbe7e0c27c585579feb9c21d6be747974 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Sat, 14 May 2022 14:39:19 +0200
Subject: [PATCH 2095/3533] extmod/network_ninaw10: Add support for socket
 events callback.

---
 drivers/ninaw10/nina_bsp.h      |  2 +
 drivers/ninaw10/nina_wifi_bsp.c | 14 +++++++
 drivers/ninaw10/nina_wifi_drv.c | 11 ++++--
 extmod/network_ninaw10.c        | 67 +++++++++++++++++++++++++++++++--
 ports/rp2/mpconfigport.h        |  2 +-
 5 files changed, 88 insertions(+), 8 deletions(-)

diff --git a/drivers/ninaw10/nina_bsp.h b/drivers/ninaw10/nina_bsp.h
index 362583843fa5d..76c9b5b82b04f 100644
--- a/drivers/ninaw10/nina_bsp.h
+++ b/drivers/ninaw10/nina_bsp.h
@@ -31,6 +31,8 @@
 
 int nina_bsp_init(void);
 int nina_bsp_deinit(void);
+int nina_bsp_atomic_enter(void);
+int nina_bsp_atomic_exit(void);
 int nina_bsp_read_irq(void);
 int nina_bsp_spi_slave_select(uint32_t timeout);
 int nina_bsp_spi_slave_deselect(void);
diff --git a/drivers/ninaw10/nina_wifi_bsp.c b/drivers/ninaw10/nina_wifi_bsp.c
index 6d04f46efdf7b..a65ef7fd86448 100644
--- a/drivers/ninaw10/nina_wifi_bsp.c
+++ b/drivers/ninaw10/nina_wifi_bsp.c
@@ -90,6 +90,20 @@ int nina_bsp_deinit(void) {
     return 0;
 }
 
+int nina_bsp_atomic_enter(void) {
+    #if MICROPY_ENABLE_SCHEDULER
+    mp_sched_lock();
+    #endif
+    return 0;
+}
+
+int nina_bsp_atomic_exit(void) {
+    #if MICROPY_ENABLE_SCHEDULER
+    mp_sched_unlock();
+    #endif
+    return 0;
+}
+
 int nina_bsp_read_irq(void) {
     return mp_hal_pin_read(MICROPY_HW_NINA_GPIO0);
 }
diff --git a/drivers/ninaw10/nina_wifi_drv.c b/drivers/ninaw10/nina_wifi_drv.c
index 0131476a0a48a..7a1167b2c94c0 100644
--- a/drivers/ninaw10/nina_wifi_drv.c
+++ b/drivers/ninaw10/nina_wifi_drv.c
@@ -325,20 +325,25 @@ static int nina_read_response(uint32_t cmd, uint32_t nvals, uint32_t width, nina
 static int nina_send_command_read_ack(uint32_t cmd, uint32_t nargs, uint32_t width, nina_args_t *args) {
     uint16_t size = 1;
     uint8_t rval = SPI_ERR;
+    nina_bsp_atomic_enter();
     if (nina_send_command(cmd, nargs, width, args) != 0 ||
         nina_read_response(cmd, 1, ARG_8BITS, NINA_VALS({&size, &rval})) != 0) {
-        return -1;
+        rval = -1;
     }
+    nina_bsp_atomic_exit();
     return rval;
 }
 
 static int nina_send_command_read_vals(uint32_t cmd, uint32_t nargs,
     uint32_t argsw, nina_args_t *args, uint32_t nvals, uint32_t valsw, nina_vals_t *vals) {
+    int ret = 0;
+    nina_bsp_atomic_enter();
     if (nina_send_command(cmd, nargs, argsw, args) != 0 ||
         nina_read_response(cmd, nvals, valsw, vals) != 0) {
-        return -1;
+        ret = -1;
     }
-    return 0;
+    nina_bsp_atomic_exit();
+    return ret;
 }
 
 static void nina_fix_mac_addr(uint8_t *mac) {
diff --git a/extmod/network_ninaw10.c b/extmod/network_ninaw10.c
index 64b73d608432f..6921ed3f27618 100644
--- a/extmod/network_ninaw10.c
+++ b/extmod/network_ninaw10.c
@@ -43,6 +43,7 @@
 #include "py/mperrno.h"
 #include "shared/netutils/netutils.h"
 #include "extmod/modnetwork.h"
+#include "modmachine.h"
 
 #include "nina_wifi_drv.h"
 
@@ -70,12 +71,41 @@ typedef struct _nina_obj_t {
 
 #define is_nonblocking_error(errno) ((errno) == MP_EAGAIN || (errno) == MP_EWOULDBLOCK || (errno) == MP_EINPROGRESS)
 
-#define debug_printf(...)   // mp_printf(&mp_plat_print, __VA_ARGS__)
+#define debug_printf(...) // mp_printf(&mp_plat_print, __VA_ARGS__)
 
 static uint16_t bind_port = BIND_PORT_RANGE_MIN;
 const mod_network_nic_type_t mod_network_nic_type_nina;
 static nina_obj_t network_nina_wl_sta = {{(mp_obj_type_t *)&mod_network_nic_type_nina}, false, MOD_NETWORK_STA_IF};
 static nina_obj_t network_nina_wl_ap = {{(mp_obj_type_t *)&mod_network_nic_type_nina}, false, MOD_NETWORK_AP_IF};
+static mp_sched_node_t mp_wifi_sockpoll_node;
+
+STATIC void network_ninaw10_poll_sockets(mp_sched_node_t *node) {
+    (void)node;
+    for (mp_uint_t i = 0; i < MP_STATE_PORT(mp_wifi_sockpoll_list)->len; i++) {
+        mod_network_socket_obj_t *socket = MP_STATE_PORT(mp_wifi_sockpoll_list)->items[i];
+        uint8_t flags = 0;
+        if (socket->callback == MP_OBJ_NULL || nina_socket_poll(socket->fileno, &flags) < 0) {
+            // remove from poll list on error.
+            socket->callback = MP_OBJ_NULL;
+            mp_obj_list_remove(MP_STATE_PORT(mp_wifi_sockpoll_list), socket);
+        } else if (flags) {
+            mp_call_function_1(socket->callback, MP_OBJ_FROM_PTR(socket));
+            if (flags & SOCKET_POLL_ERR) {
+                // remove from poll list on error.
+                socket->callback = MP_OBJ_NULL;
+                mp_obj_list_remove(MP_STATE_PORT(mp_wifi_sockpoll_list), socket);
+            }
+        }
+    }
+}
+
+STATIC mp_obj_t network_ninaw10_timer_callback(mp_obj_t none_in) {
+    if (MP_STATE_PORT(mp_wifi_sockpoll_list) != MP_OBJ_NULL && MP_STATE_PORT(mp_wifi_sockpoll_list)->len) {
+        mp_sched_schedule_node(&mp_wifi_sockpoll_node, network_ninaw10_poll_sockets);
+    }
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(network_ninaw10_timer_callback_obj, network_ninaw10_timer_callback);
 
 STATIC mp_obj_t network_ninaw10_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
     mp_arg_check_num(n_args, n_kw, 0, 1, false);
@@ -122,8 +152,19 @@ STATIC mp_obj_t network_ninaw10_active(size_t n_args, const mp_obj_t *args) {
                     NINA_FW_VER_MIN_MAJOR, NINA_FW_VER_MIN_MINOR, NINA_FW_VER_MIN_PATCH, semver[NINA_FW_VER_MAJOR_OFFS] - 48,
                     semver[NINA_FW_VER_MINOR_OFFS] - 48, semver[NINA_FW_VER_PATCH_OFFS] - 48);
             }
+            MP_STATE_PORT(mp_wifi_sockpoll_list) = mp_obj_new_list(0, NULL);
+            if (MP_STATE_PORT(mp_wifi_timer) == MP_OBJ_NULL) {
+                // Start sockets poll timer
+                mp_obj_t timer_args[] = {
+                    MP_OBJ_NEW_QSTR(MP_QSTR_freq), MP_OBJ_NEW_SMALL_INT(10),
+                    MP_OBJ_NEW_QSTR(MP_QSTR_callback), MP_OBJ_FROM_PTR(&network_ninaw10_timer_callback_obj),
+                };
+                MP_STATE_PORT(mp_wifi_timer) = machine_timer_type.make_new((mp_obj_t)&machine_timer_type, 0, 2, timer_args);
+            }
         } else {
             nina_deinit();
+            MP_STATE_PORT(mp_wifi_timer) = MP_OBJ_NULL;
+            MP_STATE_PORT(mp_wifi_sockpoll_list) = MP_OBJ_NULL;
         }
         self->active = active;
         return mp_const_none;
@@ -354,16 +395,16 @@ STATIC int network_ninaw10_gethostbyname(mp_obj_t nic, const char *name, mp_uint
 
 STATIC int network_ninaw10_socket_poll(mod_network_socket_obj_t *socket, uint32_t rwf, int *_errno) {
     uint8_t flags = 0;
-    debug_printf("socket_polling_rw(%d, %d)\n", socket->fileno, rwf);
+    debug_printf("socket_polling_rw(%d, %d, %d)\n", socket->fileno, socket->timeout, rwf);
     if (socket->timeout == 0) {
         // Non-blocking socket, next socket function will return EAGAIN
         return 0;
     }
     mp_uint_t start = mp_hal_ticks_ms();
-    while (!(flags & rwf)) {
+    for (; !(flags & rwf); mp_hal_delay_ms(5)) {
         if (nina_socket_poll(socket->fileno, &flags) < 0 || (flags & SOCKET_POLL_ERR)) {
             nina_socket_errno(_errno);
-            debug_printf("socket_poll() -> errno %d\n", *_errno);
+            debug_printf("socket_poll(%d) -> errno %d flags %d\n", socket->fileno, *_errno, flags);
             return -1;
         }
         if (!(flags & rwf) && socket->timeout != -1 &&
@@ -416,11 +457,18 @@ STATIC int network_ninaw10_socket_socket(mod_network_socket_obj_t *socket, int *
     // set socket state
     socket->fileno = fd;
     socket->bound = false;
+    socket->callback = MP_OBJ_NULL;
     return network_ninaw10_socket_setblocking(socket, false, _errno);
 }
 
 STATIC void network_ninaw10_socket_close(mod_network_socket_obj_t *socket) {
     debug_printf("socket_close(%d)\n", socket->fileno);
+    if (socket->callback != MP_OBJ_NULL) {
+        mp_sched_lock();
+        socket->callback = MP_OBJ_NULL;
+        mp_obj_list_remove(MP_STATE_PORT(mp_wifi_sockpoll_list), socket);
+        mp_sched_unlock();
+    }
     if (socket->fileno >= 0) {
         nina_socket_close(socket->fileno);
         socket->fileno = -1; // Mark socket FD as invalid
@@ -493,6 +541,8 @@ STATIC int network_ninaw10_socket_accept(mod_network_socket_obj_t *socket,
     // set socket state
     socket2->fileno = fd;
     socket2->bound = false;
+    socket2->timeout = -1;
+    socket2->callback = MP_OBJ_NULL;
     return network_ninaw10_socket_setblocking(socket2, false, _errno);
 }
 
@@ -635,6 +685,15 @@ STATIC mp_uint_t network_ninaw10_socket_recvfrom(mod_network_socket_obj_t *socke
 STATIC int network_ninaw10_socket_setsockopt(mod_network_socket_obj_t *socket, mp_uint_t
     level, mp_uint_t opt, const void *optval, mp_uint_t optlen, int *_errno) {
     debug_printf("socket_setsockopt(%d, %d)\n", socket->fileno, opt);
+    if (opt == 20) {
+        mp_sched_lock();
+        socket->callback = (void *)optval;
+        if (socket->callback != MP_OBJ_NULL) {
+            mp_obj_list_append(MP_STATE_PORT(mp_wifi_sockpoll_list), socket);
+        }
+        mp_sched_unlock();
+        return 0;
+    }
     int ret = nina_socket_setsockopt(socket->fileno, level, opt, optval, optlen);
     if (ret < 0) {
         nina_socket_errno(_errno);
diff --git a/ports/rp2/mpconfigport.h b/ports/rp2/mpconfigport.h
index 63faf36ea0cae..3ded45fa10af3 100644
--- a/ports/rp2/mpconfigport.h
+++ b/ports/rp2/mpconfigport.h
@@ -154,7 +154,7 @@ struct _mp_bluetooth_nimble_malloc_t;
 #define MICROPY_PY_USOCKET_EXTENDED_STATE   (1)
 #endif
 // It also requires an additional root pointer for the SPI object.
-#define MICROPY_PORT_ROOT_POINTER_NINAW10   struct _machine_spi_obj_t *mp_wifi_spi;
+#define MICROPY_PORT_ROOT_POINTER_NINAW10   struct _machine_spi_obj_t *mp_wifi_spi; struct _machine_timer_obj_t *mp_wifi_timer; struct _mp_obj_list_t *mp_wifi_sockpoll_list;
 extern const struct _mod_network_nic_type_t mod_network_nic_type_nina;
 #define MICROPY_HW_NIC_NINAW10              { MP_ROM_QSTR(MP_QSTR_WLAN), MP_ROM_PTR(&mod_network_nic_type_nina) },
 #else

From 4946dc5f8cf3c74fac91ffde5cb879d6c2f00bce Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Wed, 25 May 2022 12:09:37 +0200
Subject: [PATCH 2096/3533] teensy/mpconfigport.h: Remove obsolete macros.

---
 ports/teensy/mpconfigport.h | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/ports/teensy/mpconfigport.h b/ports/teensy/mpconfigport.h
index 0ee83ba4003a0..db1f56757a215 100644
--- a/ports/teensy/mpconfigport.h
+++ b/ports/teensy/mpconfigport.h
@@ -105,10 +105,6 @@ __attribute__((always_inline)) static inline mp_uint_t disable_irq(void) {
 #define MICROPY_HW_ENABLE_TIMER     (0)
 #define MICROPY_HW_ENABLE_SERVO     (0)
 #define MICROPY_HW_ENABLE_DAC       (0)
-#define MICROPY_HW_ENABLE_I2C1      (0)
-#define MICROPY_HW_ENABLE_SPI1      (0)
-#define MICROPY_HW_ENABLE_SPI3      (0)
-#define MICROPY_HW_ENABLE_CC3K      (0)
 
 #define MICROPY_HW_LED1             (pin_C5)
 #define MICROPY_HW_LED_OTYPE        (GPIO_MODE_OUTPUT_PP)

From 1d047617bb15e5d26013eab365f96a814841f092 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 26 May 2022 11:43:46 +1000
Subject: [PATCH 2097/3533] tools/mpy-tool.py: Remove obsolete unicode flag in
 .mpy header.

This was removed in c49d5207e9437755be364639632be31c001955a8

Signed-off-by: Damien George <damien@micropython.org>
---
 tools/mpy-tool.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tools/mpy-tool.py b/tools/mpy-tool.py
index cbe456a803ac1..6a22f5a404e98 100755
--- a/tools/mpy-tool.py
+++ b/tools/mpy-tool.py
@@ -1278,7 +1278,6 @@ def read_mpy(filename):
         if header[1] != config.MPY_VERSION:
             raise MPYReadError(filename, "incompatible .mpy version")
         feature_byte = header[2]
-        config.MICROPY_PY_BUILTINS_STR_UNICODE = (feature_byte & 2) != 0
         mpy_native_arch = feature_byte >> 2
         if mpy_native_arch != MP_NATIVE_ARCH_NONE:
             if config.native_arch == MP_NATIVE_ARCH_NONE:
@@ -1537,7 +1536,7 @@ def merge_mpy(raw_codes, output_file):
         header = bytearray(4)
         header[0] = ord("M")
         header[1] = config.MPY_VERSION
-        header[2] = config.native_arch << 2 | config.MICROPY_PY_BUILTINS_STR_UNICODE << 1
+        header[2] = config.native_arch << 2
         header[3] = config.mp_small_int_bits
         merged_mpy.extend(header)
 

From cca08922d9ce78afba419a8303d88b5c123f0baa Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 26 May 2022 11:54:48 +1000
Subject: [PATCH 2098/3533] py/emitinlinethumb: Make ARMv7-M instruction use
 dynamically selectable.

This follows on from a5324a10747dfba921bb363ed904f05ebb6de010 and allows
mpy-cross to dynamically select whether ARMv7-M instructions are supported
in @micropython.asm_thumb functions.

The config option MICROPY_EMIT_INLINE_THUMB_ARMV7M is no longer needed, it
is now controlled by MICROPY_EMIT_THUMB_ARMV7M.

Signed-off-by: Damien George <damien@micropython.org>
---
 mpy-cross/mpconfigport.h |  1 -
 ports/rp2/mpconfigport.h |  1 -
 py/emitinlinethumb.c     | 12 +++++-------
 py/mpconfig.h            |  5 -----
 4 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/mpy-cross/mpconfigport.h b/mpy-cross/mpconfigport.h
index 4c10afe9bb1fa..11aeaeeab7369 100644
--- a/mpy-cross/mpconfigport.h
+++ b/mpy-cross/mpconfigport.h
@@ -42,7 +42,6 @@
 #define MICROPY_EMIT_X86            (1)
 #define MICROPY_EMIT_THUMB          (1)
 #define MICROPY_EMIT_INLINE_THUMB   (1)
-#define MICROPY_EMIT_INLINE_THUMB_ARMV7M (1)
 #define MICROPY_EMIT_INLINE_THUMB_FLOAT (1)
 #define MICROPY_EMIT_ARM            (1)
 #define MICROPY_EMIT_XTENSA         (1)
diff --git a/ports/rp2/mpconfigport.h b/ports/rp2/mpconfigport.h
index 3ded45fa10af3..a733f750d4b01 100644
--- a/ports/rp2/mpconfigport.h
+++ b/ports/rp2/mpconfigport.h
@@ -55,7 +55,6 @@
 #define MICROPY_EMIT_THUMB_ARMV7M               (0)
 #define MICROPY_EMIT_INLINE_THUMB               (1)
 #define MICROPY_EMIT_INLINE_THUMB_FLOAT         (0)
-#define MICROPY_EMIT_INLINE_THUMB_ARMV7M        (0)
 
 // Optimisations
 #define MICROPY_OPT_COMPUTED_GOTO               (1)
diff --git a/py/emitinlinethumb.c b/py/emitinlinethumb.c
index 1a9c06a2adbc8..40f002895428a 100644
--- a/py/emitinlinethumb.c
+++ b/py/emitinlinethumb.c
@@ -423,7 +423,7 @@ STATIC const format_vfp_op_t format_vfp_op_table[] = {
 #endif
 
 // shorthand alias for whether we allow ARMv7-M instructions
-#define ARMV7M MICROPY_EMIT_INLINE_THUMB_ARMV7M
+#define ARMV7M asm_thumb_allow_armv7m(&emit->as)
 
 STATIC void emit_inline_thumb_op(emit_inline_asm_t *emit, qstr op, mp_uint_t n_args, mp_parse_node_t *pn_args) {
     // TODO perhaps make two tables:
@@ -715,24 +715,23 @@ STATIC void emit_inline_thumb_op(emit_inline_asm_t *emit, qstr op, mp_uint_t n_a
             } else if (op == MP_QSTR_sub) {
                 op_code = ASM_THUMB_FORMAT_3_SUB;
                 goto op_format_3;
-            #if ARMV7M
-            } else if (op == MP_QSTR_movw) {
+            } else if (ARMV7M && op == MP_QSTR_movw) {
                 op_code = ASM_THUMB_OP_MOVW;
                 mp_uint_t reg_dest;
             op_movw_movt:
                 reg_dest = get_arg_reg(emit, op_str, pn_args[0], 15);
                 int i_src = get_arg_i(emit, op_str, pn_args[1], 0xffff);
                 asm_thumb_mov_reg_i16(&emit->as, op_code, reg_dest, i_src);
-            } else if (op == MP_QSTR_movt) {
+            } else if (ARMV7M && op == MP_QSTR_movt) {
                 op_code = ASM_THUMB_OP_MOVT;
                 goto op_movw_movt;
-            } else if (op == MP_QSTR_movwt) {
+            } else if (ARMV7M && op == MP_QSTR_movwt) {
                 // this is a convenience instruction
                 mp_uint_t reg_dest = get_arg_reg(emit, op_str, pn_args[0], 15);
                 uint32_t i_src = get_arg_i(emit, op_str, pn_args[1], 0xffffffff);
                 asm_thumb_mov_reg_i16(&emit->as, ASM_THUMB_OP_MOVW, reg_dest, i_src & 0xffff);
                 asm_thumb_mov_reg_i16(&emit->as, ASM_THUMB_OP_MOVT, reg_dest, (i_src >> 16) & 0xffff);
-            } else if (op == MP_QSTR_ldrex) {
+            } else if (ARMV7M && op == MP_QSTR_ldrex) {
                 mp_uint_t r_dest = get_arg_reg(emit, op_str, pn_args[0], 15);
                 mp_parse_node_t pn_base, pn_offset;
                 if (get_arg_addr(emit, op_str, pn_args[1], &pn_base, &pn_offset)) {
@@ -740,7 +739,6 @@ STATIC void emit_inline_thumb_op(emit_inline_asm_t *emit, qstr op, mp_uint_t n_a
                     mp_uint_t i8 = get_arg_i(emit, op_str, pn_offset, 0xff) >> 2;
                     asm_thumb_op32(&emit->as, 0xe850 | r_base, 0x0f00 | (r_dest << 12) | i8);
                 }
-            #endif
             } else {
                 // search table for ldr/str instructions
                 for (mp_uint_t i = 0; i < MP_ARRAY_SIZE(format_9_10_op_table); i++) {
diff --git a/py/mpconfig.h b/py/mpconfig.h
index bac6362d176fc..00890942bba67 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -361,11 +361,6 @@
 #define MICROPY_EMIT_INLINE_THUMB (0)
 #endif
 
-// Whether to enable ARMv7-M instruction support in the Thumb2 inline assembler
-#ifndef MICROPY_EMIT_INLINE_THUMB_ARMV7M
-#define MICROPY_EMIT_INLINE_THUMB_ARMV7M (1)
-#endif
-
 // Whether to enable float support in the Thumb2 inline assembler
 #ifndef MICROPY_EMIT_INLINE_THUMB_FLOAT
 #define MICROPY_EMIT_INLINE_THUMB_FLOAT (1)

From 4290d51320144c5de5dade73adc8d4c12e339b77 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 26 May 2022 12:22:07 +1000
Subject: [PATCH 2099/3533] py/emitinlinethumb: Make float instruction use
 dynamically selectable.

This allows mpy-cross to dynamically select whether ARMv7-M float
instructions are supported in @micropython.asm_thumb functions.

Signed-off-by: Damien George <damien@micropython.org>
---
 mpy-cross/mpconfigport.h |  1 -
 py/emitinlinethumb.c     | 28 +++++++++++++++++++---------
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/mpy-cross/mpconfigport.h b/mpy-cross/mpconfigport.h
index 11aeaeeab7369..95922d04ff7b5 100644
--- a/mpy-cross/mpconfigport.h
+++ b/mpy-cross/mpconfigport.h
@@ -42,7 +42,6 @@
 #define MICROPY_EMIT_X86            (1)
 #define MICROPY_EMIT_THUMB          (1)
 #define MICROPY_EMIT_INLINE_THUMB   (1)
-#define MICROPY_EMIT_INLINE_THUMB_FLOAT (1)
 #define MICROPY_EMIT_ARM            (1)
 #define MICROPY_EMIT_XTENSA         (1)
 #define MICROPY_EMIT_INLINE_XTENSA  (1)
diff --git a/py/emitinlinethumb.c b/py/emitinlinethumb.c
index 40f002895428a..29487f10483f9 100644
--- a/py/emitinlinethumb.c
+++ b/py/emitinlinethumb.c
@@ -59,6 +59,21 @@ struct _emit_inline_asm_t {
     qstr *label_lookup;
 };
 
+#if MICROPY_DYNAMIC_COMPILER
+
+static inline bool emit_inline_thumb_allow_float(emit_inline_asm_t *emit) {
+    return MP_NATIVE_ARCH_ARMV7EMSP <= mp_dynamic_compiler.native_arch
+           && mp_dynamic_compiler.native_arch <= MP_NATIVE_ARCH_ARMV7EMDP;
+}
+
+#else
+
+static inline bool emit_inline_thumb_allow_float(emit_inline_asm_t *emit) {
+    return MICROPY_EMIT_INLINE_THUMB_FLOAT;
+}
+
+#endif
+
 STATIC void emit_inline_thumb_error_msg(emit_inline_asm_t *emit, mp_rom_error_text_t msg) {
     *emit->error_slot = mp_obj_new_exception_msg(&mp_type_SyntaxError, msg);
 }
@@ -216,7 +231,6 @@ STATIC mp_uint_t get_arg_special_reg(emit_inline_asm_t *emit, const char *op, mp
     return 0;
 }
 
-#if MICROPY_EMIT_INLINE_THUMB_FLOAT
 STATIC mp_uint_t get_arg_vfpreg(emit_inline_asm_t *emit, const char *op, mp_parse_node_t pn) {
     const char *reg_str = get_arg_str(pn);
     if (reg_str[0] == 's' && reg_str[1] != '\0') {
@@ -243,7 +257,6 @@ STATIC mp_uint_t get_arg_vfpreg(emit_inline_asm_t *emit, const char *op, mp_pars
             MP_ERROR_TEXT("'%s' expects an FPU register"), op));
     return 0;
 }
-#endif
 
 STATIC mp_uint_t get_arg_reglist(emit_inline_asm_t *emit, const char *op, mp_parse_node_t pn) {
     // a register list looks like {r0, r1, r2} and is parsed as a Python set
@@ -409,10 +422,10 @@ STATIC const format_9_10_op_t format_9_10_op_table[] = {
 };
 #undef X
 
-#if MICROPY_EMIT_INLINE_THUMB_FLOAT
 // actual opcodes are: 0xee00 | op.hi_nibble, 0x0a00 | op.lo_nibble
-typedef struct _format_vfp_op_t { byte op;
-                                  char name[3];
+typedef struct _format_vfp_op_t {
+    byte op;
+    char name[3];
 } format_vfp_op_t;
 STATIC const format_vfp_op_t format_vfp_op_table[] = {
     { 0x30, "add" },
@@ -420,7 +433,6 @@ STATIC const format_vfp_op_t format_vfp_op_table[] = {
     { 0x20, "mul" },
     { 0x80, "div" },
 };
-#endif
 
 // shorthand alias for whether we allow ARMv7-M instructions
 #define ARMV7M asm_thumb_allow_armv7m(&emit->as)
@@ -439,8 +451,7 @@ STATIC void emit_inline_thumb_op(emit_inline_asm_t *emit, qstr op, mp_uint_t n_a
     size_t op_len;
     const char *op_str = (const char *)qstr_data(op, &op_len);
 
-    #if MICROPY_EMIT_INLINE_THUMB_FLOAT
-    if (op_str[0] == 'v') {
+    if (emit_inline_thumb_allow_float(emit) && op_str[0] == 'v') {
         // floating point operations
         if (n_args == 2) {
             mp_uint_t op_code = 0x0ac0, op_code_hi;
@@ -535,7 +546,6 @@ STATIC void emit_inline_thumb_op(emit_inline_asm_t *emit, qstr op, mp_uint_t n_a
         }
         return;
     }
-    #endif
 
     if (n_args == 0) {
         if (op == MP_QSTR_nop) {

From 3180113aefb024fe10aa5afd952ecea4d15035ed Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 26 May 2022 12:23:49 +1000
Subject: [PATCH 2100/3533] tests/micropython: Make import_mpy_native_gc run on
 ARMv6-M and above.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/micropython/import_mpy_native_gc.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tests/micropython/import_mpy_native_gc.py b/tests/micropython/import_mpy_native_gc.py
index a2012fc1cf0fa..aac3375af46e2 100644
--- a/tests/micropython/import_mpy_native_gc.py
+++ b/tests/micropython/import_mpy_native_gc.py
@@ -50,13 +50,13 @@ def open(self, path, mode):
 features0_file_contents = {
     # -march=x64
     0x806: b'M\x06\b\x1f\x01\x004build/features0.native.mpy\x00\x8aB\xe9/\x00\x00\x00SH\x8b\x1d\x83\x00\x00\x00\xbe\x02\x00\x00\x00\xffS\x18\xbf\x01\x00\x00\x00H\x85\xc0u\x0cH\x8bC \xbe\x02\x00\x00\x00[\xff\xe0H\x0f\xaf\xf8H\xff\xc8\xeb\xe6ATUSH\x8b\x1dQ\x00\x00\x00H\x8bG\x08L\x8bc(H\x8bx\x08A\xff\xd4H\x8d5+\x00\x00\x00H\x89\xc5H\x8b\x059\x00\x00\x00\x0f\xb78\xffShH\x89\xefA\xff\xd4H\x8b\x03[]A\\\xc3\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x05\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xa0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x85\x00\x12factorial\x00\x10\r$\x01&\x9f \x01"\xff',
-    # -march=armv7m
-    0x1406: b"M\x06\x14\x1f\x01\x004build/features0.native.mpy\x00\x88B\x1a\xe0\x00\x00\x13\xb5\nK\nJ{D\x9cX\x02!\xe3h\x98G\x03F\x01 3\xb9\x02!#i\x01\x93\x02\xb0\xbd\xe8\x10@\x18GXC\x01;\xf4\xe7\x00\xbfn\x00\x00\x00\x00\x00\x00\x00\xf8\xb5\nN\nK~D\xf4XChgiXh\xb8G\x05F\x07K\x08I\xf2XyD\x10\x88ck\x98G(F\xb8G h\xf8\xbd\x00\xbf:\x00\x00\x00\x00\x00\x00\x00\x04\x00\x00\x00\x1e\x00\x00\x00\x00\x00\x00\x00\x05\x00\x00\x00\x00\x00\x00\x00\x84\x00\x00\x00\x00\x00\x00\x00\x01\x84\x10\x12factorial\x00\x10\r>\x01@\x9f:\x01<\xff",
+    # -march=armv6m
+    0x1006: b'M\x06\x10\x1f\x01\x004build/features0.native.mpy\x00\x88"\x18\xe0\x00\x00\x10\xb5\tK\tJ{D\x9cX\x02!\xe3h\x98G\x03\x00\x01 \x00+\x02\xd0XC\x01;\xfa\xe7\x02!#i\x98G\x10\xbd\xc0Fj\x00\x00\x00\x00\x00\x00\x00\xf8\xb5\nN\nK~D\xf4XChgiXh\xb8G\x05\x00\x07K\x08I\xf3XyD\x18\x88ck\x98G(\x00\xb8G h\xf8\xbd\xc0F:\x00\x00\x00\x00\x00\x00\x00\x04\x00\x00\x00\x1e\x00\x00\x00\x00\x00\x00\x00\x05\x00\x00\x00\x00\x00\x00\x00\x80\x00\x00\x00\x00\x00\x00\x00\x01\x84\x00\x12factorial\x00\x10\r<\x01>\x9f8\x01:\xff',
 }
 
-# Populate other armv7m-derived archs based on armv7m.
-for arch in (0x1806, 0x1C06, 0x2006):
-    features0_file_contents[arch] = features0_file_contents[0x1406]
+# Populate armv7m-derived archs based on armv6m.
+for arch in (0x1406, 0x1806, 0x1C06, 0x2006):
+    features0_file_contents[arch] = features0_file_contents[0x1006]
 
 if sys.implementation._mpy not in features0_file_contents:
     print("SKIP")

From 80a86c48e33afc4d1f964c407f0441161eeed71d Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 26 May 2022 12:24:46 +1000
Subject: [PATCH 2101/3533] tests/micropython: Make import_mpy_native test run
 on all architectures.

Signed-off-by: Damien George <damien@micropython.org>
---
 ...t_mpy_native_x64.py => import_mpy_native.py} | 17 ++++++++---------
 ...tive_x64.py.exp => import_mpy_native.py.exp} |  0
 2 files changed, 8 insertions(+), 9 deletions(-)
 rename tests/micropython/{import_mpy_native_x64.py => import_mpy_native.py} (91%)
 rename tests/micropython/{import_mpy_native_x64.py.exp => import_mpy_native.py.exp} (100%)

diff --git a/tests/micropython/import_mpy_native_x64.py b/tests/micropython/import_mpy_native.py
similarity index 91%
rename from tests/micropython/import_mpy_native_x64.py
rename to tests/micropython/import_mpy_native.py
index 453d81f25608a..d7da16581b9ff 100644
--- a/tests/micropython/import_mpy_native_x64.py
+++ b/tests/micropython/import_mpy_native.py
@@ -1,15 +1,17 @@
-# test importing of .mpy files with native code (x64 only)
+# test importing of .mpy files with native code
 
 try:
     import usys, uio, uos
 
+    usys.implementation._mpy
     uio.IOBase
     uos.mount
 except (ImportError, AttributeError):
     print("SKIP")
     raise SystemExit
 
-if not (usys.platform == "linux" and usys.maxsize > 2**32):
+mpy_arch = usys.implementation._mpy >> 8
+if mpy_arch == 0:
     print("SKIP")
     raise SystemExit
 
@@ -49,15 +51,14 @@ def open(self, path, mode):
 
 
 # these are the test .mpy files
+valid_header = bytes([77, 6, mpy_arch, 31])
 # fmt: off
 user_files = {
     # bad architecture
-    '/mod0.mpy': b'M\x06\xfc\x00\x10',
+    '/mod0.mpy': b'M\x06\xfc\x1f',
 
     # test loading of viper and asm
-    '/mod1.mpy': (
-        b'M\x06\x08\x1f' # header
-
+    '/mod1.mpy': valid_header + (
         b'\x02' # n_qstr
         b'\x00' # n_obj
 
@@ -84,9 +85,7 @@ def open(self, path, mode):
     ),
 
     # test loading viper with additional scope flags and relocation
-    '/mod2.mpy': (
-        b'M\x06\x08\x1f' # header
-
+    '/mod2.mpy': valid_header + (
         b'\x02' # n_qstr
         b'\x00' # n_obj
 
diff --git a/tests/micropython/import_mpy_native_x64.py.exp b/tests/micropython/import_mpy_native.py.exp
similarity index 100%
rename from tests/micropython/import_mpy_native_x64.py.exp
rename to tests/micropython/import_mpy_native.py.exp

From 20d9f3409a9b2fdd4079e05acb4d24b2877fb5c5 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 26 May 2022 12:27:04 +1000
Subject: [PATCH 2102/3533] tests/run-tests.py: Add rp2 test target.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/run-tests.py | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/tests/run-tests.py b/tests/run-tests.py
index 0cfd50f5c4e9a..5b08ad2bb487f 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -897,7 +897,16 @@ def main():
         "unix",
         "qemu-arm",
     )
-    EXTERNAL_TARGETS = ("pyboard", "wipy", "esp8266", "esp32", "minimal", "nrf", "renesas-ra")
+    EXTERNAL_TARGETS = (
+        "pyboard",
+        "wipy",
+        "esp8266",
+        "esp32",
+        "minimal",
+        "nrf",
+        "renesas-ra",
+        "rp2",
+    )
     if args.target in LOCAL_TARGETS or args.list_tests:
         pyb = None
     elif args.target in EXTERNAL_TARGETS:
@@ -910,6 +919,10 @@ def main():
                 args.mpy_cross_flags = "-march=xtensa"
             elif args.target == "esp32":
                 args.mpy_cross_flags = "-march=xtensawin"
+            elif args.target == "rp2":
+                args.mpy_cross_flags = "-march=armv6m"
+            elif args.target == "pyboard":
+                args.mpy_cross_flags = "-march=armv7emsp"
             else:
                 args.mpy_cross_flags = "-march=armv7m"
 
@@ -931,6 +944,8 @@ def main():
                 test_dirs += ("float", "stress", "pyb", "pybnative", "inlineasm")
             elif args.target in ("renesas-ra"):
                 test_dirs += ("float", "inlineasm", "renesas-ra")
+            elif args.target == "rp2":
+                test_dirs += ("float", "stress", "inlineasm")
             elif args.target in ("esp8266", "esp32", "minimal", "nrf"):
                 test_dirs += ("float",)
             elif args.target == "wipy":

From 065df5568c258a9f20a9f02b10be9b16dc95da6f Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 26 May 2022 12:31:31 +1000
Subject: [PATCH 2103/3533] tests: Move native while test from pybnative to
 micropython.

And make it so this test can run on any target.

LED and time testing has been removed from this test, that can now be
tested using: ./run-tests.py --via-mpy --emit native.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/micropython/native_while.py               | 13 +++++++++++++
 .../native_while.py.exp}                        |  0
 tests/pybnative/while.py                        | 17 -----------------
 tests/run-tests.py                              |  2 +-
 4 files changed, 14 insertions(+), 18 deletions(-)
 create mode 100644 tests/micropython/native_while.py
 rename tests/{pybnative/while.py.exp => micropython/native_while.py.exp} (100%)
 delete mode 100644 tests/pybnative/while.py

diff --git a/tests/micropython/native_while.py b/tests/micropython/native_while.py
new file mode 100644
index 0000000000000..ccf0ae0e03515
--- /dev/null
+++ b/tests/micropython/native_while.py
@@ -0,0 +1,13 @@
+# test native while loop
+
+
+@micropython.native
+def f(n):
+    i = 0
+    while i < n:
+        print(i)
+        i += 1
+
+
+f(2)
+f(4)
diff --git a/tests/pybnative/while.py.exp b/tests/micropython/native_while.py.exp
similarity index 100%
rename from tests/pybnative/while.py.exp
rename to tests/micropython/native_while.py.exp
diff --git a/tests/pybnative/while.py b/tests/pybnative/while.py
deleted file mode 100644
index 10625e8717247..0000000000000
--- a/tests/pybnative/while.py
+++ /dev/null
@@ -1,17 +0,0 @@
-import time, pyb
-
-
-@micropython.native
-def f(led, n, d):
-    led.off()
-    i = 0
-    while i < n:
-        print(i)
-        led.toggle()
-        time.sleep_ms(d)
-        i += 1
-    led.off()
-
-
-f(pyb.LED(1), 2, 150)
-f(pyb.LED(2), 4, 50)
diff --git a/tests/run-tests.py b/tests/run-tests.py
index 5b08ad2bb487f..7377e8ae2c8b0 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -941,7 +941,7 @@ def main():
             )
             if args.target == "pyboard":
                 # run pyboard tests
-                test_dirs += ("float", "stress", "pyb", "pybnative", "inlineasm")
+                test_dirs += ("float", "stress", "pyb", "inlineasm")
             elif args.target in ("renesas-ra"):
                 test_dirs += ("float", "inlineasm", "renesas-ra")
             elif args.target == "rp2":

From eda52e4d73136ca79487bb787d3c7ff2d10dc4d3 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Fri, 8 Apr 2022 12:03:50 +0200
Subject: [PATCH 2104/3533] docs/mimxrt: Add i.MX RT1015 to general.rst, and a
 few clarifications.

---
 docs/mimxrt/general.rst | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/docs/mimxrt/general.rst b/docs/mimxrt/general.rst
index d08e180e7ffe5..35cf8e50eca2a 100644
--- a/docs/mimxrt/general.rst
+++ b/docs/mimxrt/general.rst
@@ -44,6 +44,8 @@ Supported MCUs
 +-------------+--------------------+-------------------------+
 | i.MX RT1020 | Cortex-M7 @500 MHz | 256 kB SRAM             |
 +-------------+--------------------+-------------------------+
+| i.MX RT1015 | Cortex-M7 @500 MHz | 128 kB SRAM             |
++-------------+--------------------+-------------------------+
 | i.MX RT1010 | Cortex-M7 @500 MHz | 128 kB SRAM             |
 +-------------+--------------------+-------------------------+
 
@@ -72,7 +74,7 @@ For your convenience, a few technical specifications are provided below:
 * CPU frequency: up to 600MHz
 * Total RAM available: up to 1 MByte (see table)
 * BootROM: 96KB
-* External FlashROM: code and data, via SPI Flash; usual size 2 - 8 MB
+* External FlashROM: code and data, via SPI Flash; usual size 2 - 16 MB
   Some boards provide additional external RAM and SPI flash.
 * GPIO: up to 124 (GPIOs are multiplexed with other functions, including
   external FlashROM, UART, etc.)
@@ -80,9 +82,9 @@ For your convenience, a few technical specifications are provided below:
   but the boards used for testing do not expose the signals.
 * SPI: 2 or 4 low power SPI interfaces (software implementation available on every pin)
 * I2C: 2 or 4 low power I2C interfaces (software implementation available on every pin)
-* I2S: 3 I2S interfaces
+* I2S: 1 to 3 I2S interfaces
 * ADC: one or two 12-bit SAR ADC converters
-* Ethernet controller
+* Ethernet controller (except i.MX RT1010/-1015)
 * Programming: using BootROM bootloader from USB - due to external FlashROM
   and always-available BootROM bootloader, the MIMXRT is not brickable
 

From f795d5bc381bc941148a80f1ca6797242dcc1430 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Fri, 8 Apr 2022 14:20:44 +0200
Subject: [PATCH 2105/3533] docs/mimxrt: Move the pinout tables to a separate
 document.

This shortens the quickref.  Also change the note about the hardware SPI
frequeny limits.
---
 docs/mimxrt/pinout.rst   | 380 +++++++++++++++++++++++++++++++++++++++
 docs/mimxrt/quickref.rst | 352 ++----------------------------------
 2 files changed, 397 insertions(+), 335 deletions(-)
 create mode 100644 docs/mimxrt/pinout.rst

diff --git a/docs/mimxrt/pinout.rst b/docs/mimxrt/pinout.rst
new file mode 100644
index 0000000000000..b82c153fc3ea4
--- /dev/null
+++ b/docs/mimxrt/pinout.rst
@@ -0,0 +1,380 @@
+.. _mimxrt_pinout:
+
+Pinout for the i.MXRT machine modules
+=====================================
+
+.. _mimxrt_uart_pinout:
+
+|
+
+UART pin assignment
+-------------------
+
+The pin assignment of UARTs to pins is fixed.
+The UARTs are numbered 0..8.  The rx/tx pins are assigned according to the
+tables below:
+
+================  ===========  ===========  ===========  ===========
+Board / Pin           UART0        UART1        UART2        UART3
+================  ===========  ===========  ===========  ===========
+Teensy 4.0             -            0/1          7/8         14/15
+Teensy 4.1             -            0/1          7/8         14/15
+MIMXRT1010-EVK     Debug USB      D0/D1        D7/D6           -
+MIMXRT1015-EVK     Debug USB      D0/D1        D7/A1           -
+MIMXRT1020-EVK     Debug USB      D0/D1        D9/D6       D10/D13
+MIMXRT1050-EVK     Debug USB      D0/D1        D7/D6        D8/D9
+MIMXRT1050-EVKB    Debug USB      D0/D1        D7/D6        D8/D9
+MIMXRT1060-EVK     Debug USB      D0/D1        D7/D6        D8/D9
+MIMXRT1064-EVK     Debug USB      D0/D1        D7/D6        D8/D9
+MIMXRT1170-EVK     Debug USB      D0/D1       D12/D11      D10/D13
+Olimex RT1010Py       -          RxD/TxD       D5/D6           -
+Seeed ARCH MIX        -        J3_19/J3_20  J4_16/J4_17  J4_06/J4_07
+================  ===========  ===========  ===========  ===========
+
+|
+
+================  ===========  ===========  =======  =======  =====
+Board / Pin           UART4        UART5      UART6   UART7   UART8
+================  ===========  ===========  =======  =======  =====
+Teensy 4.0            16/17        21/20     25/24    28/29      -
+Teensy 4.1            16/17        21/20     25/24    28/29    34/35
+MIMXRT1010-EVK         -            -         -        -        -
+MIMXRT1015-EVK         -            -         -        -        -
+MIMXRT1020-EVK      D15/D14       A1/A0       -        -        -
+MIMXRT1050-EVK       A1/A0          -         -        -        -
+MIMXRT1050-EVKB      A1/A0          -         -        -        -
+MIMXRT1060-EVK       A1/A0          -         -        -        -
+MIMXRT1064-EVK       A1/A0          -         -        -        -
+MIMXRT1170-EVK      D15/D14      D25/D26    D33/D34  D35/D36    -
+Olimex RT1010Py        -            -         -        -        -
+Seeed ARCH MIX    J4_10/J4_11  J5_08/J5_12    -        -        -
+================  ===========  ===========  =======  =======  =====
+
+.. _mimxrt_pwm_pinout:
+
+|
+|
+
+PWM pin assignment
+------------------
+
+Pins are specified in the same way as for the Pin class.  The following tables show
+the assignment of the board Pins to PWM modules:
+
+===========   ==========   ==========   ======    ==============   ======
+Pin/ MIMXRT   1010         1015         1020      1050/1060/1064   1170
+===========   ==========   ==========   ======    ==============   ======
+D0            -            Q1/1         F1/1/B    -                -
+D1            -            Q1/0         F1/1/A    -                -
+D2            F1/3/B       F1/3/A       -         F1/3/B           -
+D3            F1/3/A       F1/0/A       F2/3/B    F4/0/A           F1/2/A
+D4            F1/3/A (*)   Q1/2         Q2/1      F2/3/A           Q4/2
+D5            F1/0/B (*)   F1/0/B       F2/3/A    F1/3/A           F1/2/B
+D6            -            F1/2/B       F2/0/A    Q3/2             F1/0/A
+D7            -            -            F1/0/A    Q3/3             -
+D8            F1/0/A       F1/1/B       F1/0/B    F1/1/X           Q4/3
+D9            F1/1/B (*)   F1/2/A       F2/0/B    F1/0/X           F1/0/B
+D10           F1/3/B       -            F2/2/B    F1/0/B (*)       F2/2/B
+D11           F1/2/A       -            F2/1/A    F1/1/A (*)       -
+D12           F1/2/B       -            F2/1/B    F1/1/B (*)       -
+D13           F1/3/A       -            F2/2/A    F1/0/A (*)       F2/2/A
+D14           F1/0/B       -            -         F2/3/B           -
+D15           F1/0/A       -            -         F2/3/A           -
+A0            -            -            F1/2/A    -                -
+A1            F1/3/X       F1/3/B       F1/2/B    -                -
+A2            F1/2/X       F1/3/A       F1/3/A    -                -
+A3            -            F1/2/A       F1/3/B    -                -
+A4            -            -            -         Q3/1             -
+A5            -            -            -         Q3/0             -
+D31           -            -            -         -                F1/2/B
+D32           -            -            -         -                F1/2/A
+D33           -            -            -         -                F1/1/B
+D34           -            -            -         -                F1/1/A
+D35           -            -            -         -                F1/0/B
+D36           -            -            -         -                F1/0/A
+===========   ==========   ==========   ======    ==============   ======
+
+Pins denoted with (*) are by default not wired at the board.
+
+====   ==========  ====   ==========
+Pin    Teensy 4.0  Pin    Teensy 4.1
+====   ==========  ====   ==========
+0      F1/1/X      0      F1/1/X
+1      F1/0/X      1      F1/0/X
+2      F4/2/A      2      F4/2/A
+3      F4/2/B      3      F4/2/B
+4      F2/0/A      4      F2/0/A
+5      F2/1/A      5      F2/1/A
+6      F2/2/A      6      F2/2/A
+7      F1/3/B      7      F1/3/B
+8      F1/3/A      8      F1/3/A
+9      F2/2/B      9      F2/2/B
+10     Q1/0        10     Q1/0
+11     Q1/2        11     Q1/2
+12     Q1/1        12     Q1/1
+13     Q2/0        13     Q2/0
+14     Q3/2        14     Q3/2
+15     Q3/3        15     Q3/3
+18     Q3/1        18     Q3/1
+19     Q3/0        19     Q3/0
+22     F4/0/A      22     F4/0/A
+23     F4/1/A      23     F4/1/A
+24     F1/2/X      24     F1/2/X
+25     F1/3/X      25     F1/3/X
+28     F3/1/B      28     F3/1/B
+29     F3/1/A      29     F3/1/A
+33     F2/0/B      33     F2/0/B
+-      -           36     F2/3/A
+-      -           37     F2/3/B
+DAT1   F1/1/B      42     F1/1/B
+DAT0   F1/1/A      43     F1/1/A
+CLK    F1/0/B      44     F1/0/B
+CMD    F1/0/A      45     F1/0/A
+DAT2   F1/2/A      46     F1/2/A
+DAT3   F1/2/B      47     F1/2/B
+-      -           48     F1/0/B
+-      -           49     F1/2/A
+-      -           50     F1/2/B
+-      -           51     F3/3/B
+-      -           52     F1/1/B
+-      -           53     F1/1/A
+-      -           54     F3/0/A
+====   ==========  ====   ==========
+
+|
+
+=========  ==============
+Pin        Seeed ARCH MIX
+=========  ==============
+J3_04      Q4/3
+J3_10      Q1/3
+J3_12      Q2/3
+J3_13      Q3/3
+J3_16      Q3/0
+J3_17      Q3/1
+J3_19      F1/3/X
+J3_20      F1/2/X
+J4_08      F4/0/A
+J4_09      F4/1/A
+J4_16      Q3/2
+J4_17      Q3/3
+J5_32      Q1/0
+J5_28      Q1/1
+J5_29      Q1/2
+J5_30      Q2/0
+J5_04      Q2/1
+J5_05      Q2/3
+J5_06      F2/0/A
+J5_07      F2/0/B
+J5_08      F2/1/A
+J5_12      F2/1/B
+J5_13      F2/2/A
+J5_14      F2/2/B
+J5_23      F1/3/A
+J5_24      F1/3/B
+J5_25      F2/3/A
+J5_26      F2/3/B
+J5_42      Q3/0
+J5_43      Q3/1
+J5_50      F1/0/X
+LED_RED    F2/3/A
+LED_GREEN  F1/3/A
+LED_BLUE   F1/3/B
+=========  ==============
+
+|
+
+=========  ===============
+Pin        Olimex RT1010PY
+=========  ===============
+D0           -
+D1         F1/0/B
+D2         F1/0/A
+D3         F1/1/B
+D4         F1/1/A
+D5         F1/2/B
+D6         F1/2/A
+D7         F1/3/B
+D8         F1/3/A
+D9            -
+D10        F1/0/B
+D11        F1/0/A
+D12        F1/1/B
+D13        F1/1/A
+D14           -
+A0            -
+A1         F1/2/B
+A2         F1/2/A
+A3         F1/3/B
+A4         F1/3/A
+SDI        F1/3/X
+SDO        F1/2/X
+CS0        F1/1/X
+SCK        F1/0/X
+=========  ===============
+
+Legend:
+
+* Qm/n:    QTMR module m, channel n
+* Fm/n/l:  FLEXPWM module m, submodule n, channel l. The pulse at a X channel
+  is always aligned to the period start.
+
+Pins without a PWM signal are not listed.  A signal may be available at more
+than one Pin.  FlexPWM pins may also be pure CPU pin, not assigned to a board
+signal.  In that case the PWM output is disabled.  The PWM channel of a submodule
+0 may still be used as synchronization source for other channels of the same
+module, unless used by another peripheral.
+
+Submodule 0 pins for i.MX RT1011:
+
+==================  =======
+Pin                 Channel
+==================  =======
+Pin.cpu.GPIO_01     B
+Pin.cpu.GPIO_02     A
+Pin.cpu.GPIO_AD_12  X
+Pin.cpu.GPIO_SD_01  B
+Pin.cpu.GPIO_SD_02  A
+==================  =======
+
+Submodule 0 pins for i.MX RT1021:
+
+=====================  ==================
+Pin                    Module & Channel
+=====================  ==================
+Pin.cpu.GPIO_AD_B1_06  FLEXPWM1 Channel A
+Pin.cpu.GPIO_AD_B1_07  FLEXPWM1 Channel B
+Pin.cpu.GPIO_EMC_26    FLEXPWM1 Channel A
+Pin.cpu.GPIO_EMC_27    FLEXPWM1 Channel B
+Pin.cpu.GPIO_AD_B0_14  FLEXPWM2 Channel A
+Pin.cpu.GPIO_AD_B0_15  FLEXPWM2 Channel B
+Pin.cpu.GPIO_EMC_10    FLEXPWM2 Channel X
+Pin.cpu.GPIO_EMC_38    FLEXPWM2 Channel A
+Pin.cpu.GPIO_EMC_39    FLEXPWM2 Channel B
+=====================  ==================
+
+Submodule 0 pins for i.MX RT1052, i.MX RT1062 and i.MX RT1064:
+
+=====================  ==================
+Pin                    Module & Channel
+=====================  ==================
+Pin.cpu.GPIO_AD_B0_02  FLEXPWM1 Channel X
+Pin.cpu.GPIO_EMC_23    FLEXPWM1 Channel A
+Pin.cpu.GPIO_EMC_24    FLEXPWM1 Channel B
+Pin.cpu.GPIO_SD_B0_00  FLEXPWM1 Channel A
+Pin.cpu.GPIO_SD_B0_01  FLEXPWM1 Channel B
+Pin.cpu.GPIO_B0_06     FLEXPWM2 Channel A
+Pin.cpu.GPIO_B0_07     FLEXPWM2 Channel B
+Pin.cpu.GPIO_EMC_06    FLEXPWM2 Channel A
+Pin.cpu.GPIO_EMC_07    FLEXPWM2 Channel B
+Pin.cpu.GPIO_EMC_29    FLEXPWM3 Channel A
+Pin.cpu.GPIO_EMC_30    FLEXPWM3 Channel B
+Pin.cpu.GPIO_AD_B1_08  FLEXPWM4 Channel A
+Pin.cpu.GPIO_EMC_00    FLEXPWM4 Channel A
+Pin.cpu.GPIO_EMC_01    FLEXPWM4 Channel B
+=====================  ==================
+
+Submodule 0 pins for i.MX RT1176
+
+======================  ======================
+Pin                     Module & Channel
+======================  ======================
+Pin.cpu.GPIO_EMC_B1_00  FLEXPWM4 Channel A (*)
+Pin.cpu.GPIO_EMC_B1_01  FLEXPWM4 Channel B (*)
+Pin.cpu.GPIO_EMC_B1_06  FLEXPWM2 Channel A (*)
+Pin.cpu.GPIO_EMC_B1_07  FLEXPWM2 Channel B (*)
+Pin.cpu.GPIO_EMC_B1_23  FLEXPWM1 Channel A (*)
+Pin.cpu.GPIO_EMC_B1_24  FLEXPWM1 Channel B (*)
+Pin.cpu.GPIO_EMC_B1_29  FLEXPWM3 Channel A (*)
+Pin.cpu.GPIO_EMC_B1_30  FLEXPWM3 Channel B (*)
+Pin.cpu.GPIO_AD_00      FLEXPWM1 Channel A
+Pin.cpu.GPIO_AD_01      FLEXPWM1 Channel B
+Pin.cpu.GPIO_AD_24      FLEXPWM2 Channel A
+Pin.cpu.GPIO_AD_25      FLEXPWM2 Channel B
+======================  ======================
+
+.. _mimxrt_spi_pinout:
+
+|
+|
+
+Hardware SPI pin assignment
+---------------------------
+
+The SPI signals have fixed assignments to GPIO pins.
+It depends on the board design, which SPI's signals are exposed to the user, as
+detailed in the table below.  The signal order in the table is: CS0, CS1, MOSI, MISO, CLK.
+
+=================  =========================  =======================  ===============
+Board / Pin        SPI0                       SPI1                     SPI2
+=================  =========================  =======================  ===============
+Teensy 4.0         10/-/11/12/13              0/-/26/1/27                    -
+Teensy 4.1         10/37/11/12/13             0/-/26/1/27              -/29/50/54/49
+MIXMXRT1010-EVK    D10/D7/D11/D12/D13                -                       -
+MIXMXRT1015-EVK    D10/-/D11/D12/D13                 -                       -
+MIXMXRT1020-EVK    D10/-/D11/D12/D13          A3/D0/A5/A4/A0                 -
+MIXMXRT1050-EVK    D10/-/D11/D12/D13 (*)            -                        -
+MIXMXRT1050-EVKB   D10/-/D11/D12/D13 (*)            -                        -
+MIXMXRT1060-EVK    D10/-/D11/D12/D13 (*)            -                        -
+MIXMXRT1064-EVK    D10/-/D11/D12/D13 (*)            -                        -
+MIXMXRT1170-EVK    D10/-/D11/D12/D13          D28/-/D25/D24/D26        -/-/D14/D15/D24
+Olimex RT1010Py             -                 CS0/-/SDO/SDI/SCK        SDCARD with CS1
+Seeed ARCH MIX     J4_12/-/J4_14/J4_13/J4_15  J3_09/J3_05/J3_08_J3_11
+=================  =========================  =======================  ===============
+
+Pins denoted with (*) are by default not wired at the board.
+
+.. _mimxrt_i2c_pinout:
+
+|
+|
+
+Hardware I2C pin assignment
+---------------------------
+
+The I2C signals have fixed assignments to GPIO pins.
+It depends on the board design, which I2C's signals are exposed to the user, as
+detailed in the table below.  The signal order in the table is: SDA, SCL.
+
+=================  ===========  ===========  ===========  =======  =======
+Board / Pin        I2C 0        I2C 1        I2C 2        I2C 3    I2C 4
+=================  ===========  ===========  ===========  =======  =======
+Teensy 4.0         18/19        17/16        25/24         -        -
+Teensy 4.1         18/19        17/16        25/24         -        -
+MIXMXRT1010-EVK    D14/D15      D0/D1         -            -        -
+MIXMXRT1015-EVK    D14/D15       -            -            -        -
+MIXMXRT1020-EVK    D14/D15      A4/A5        D0/D1         -        -
+MIXMXRT1050-EVK    A4/A5        D1/D0         -            -        -
+MIXMXRT1050-EVKB   A4/A5        D1/D0         -            -        -
+MIXMXRT1060-EVK    A4/A5        D1/D0         -            -        -
+MIXMXRT1064-EVK    A4/A5        D1/D0         -            -        -
+MIXMXRT1170-EVK    D14/D15      D1/D0        A4/A5        D26/D25  D19/D18
+Olimex RT1010Py      -          SDA1/SCL1    SDA2/SCL2     -        -
+Seeed ARCH MIX     J3_17/J3_16  J4_06/J4_07  J5_05/J5_04   -        -
+=================  ===========  ===========  ===========  =======  =======
+
+.. _mimxrt_i2s_pinout:
+
+|
+|
+
+Hardware I2S pin assignment
+---------------------------
+
+Pin assignments for a few MIMXRT boards:
+
+===============  ==  =====  ======== ======= ======= ======== ======= =======
+Board            ID  MCK    SCK_TX   WS_TX   SD_TX   SCK_RX   WS_RX   SD_RX
+===============  ==  =====  ======== ======= ======= ======== ======= =======
+Teensy 4.0       1   23     26       27      7       21       20      8
+Teensy 4.0       2   33     4        3       2       -        -       5
+Teensy 4.1       1   23     26       27      7       21       20      8
+Teensy 4.1       2   33     4        3       2       -        -       5
+Seeed Arch MIX   1   J4_09  J4_14    J4_15   J14_13  J4_11    J4_10   J4_10
+Olimex RT1010Py  1   D8     D6       D7      D4      D1       D2      D3
+Olimex RT1010Py  3   -      D10      D9      D11     -        -       -
+MIMXRT_DEV       1   "MCK"  "SCK_TX" "WS_TX" "SD_TX" "SCK_RX" "WS_RX" "SD_RX"
+===============  ==  =====  ======== ======= ======= ======== ======= =======
+
+Symbolic pin names are provided for the MIMXRT_10xx_DEV boards.
+These are provided for the other boards as well.
\ No newline at end of file
diff --git a/docs/mimxrt/quickref.rst b/docs/mimxrt/quickref.rst
index b87a343bd8d98..0a14c632aafe5 100644
--- a/docs/mimxrt/quickref.rst
+++ b/docs/mimxrt/quickref.rst
@@ -17,6 +17,7 @@ working with this board it may be useful to get an overview of the microcontroll
 
    general.rst
    tutorial/intro.rst
+   pinout.rst
 
 
 Installing MicroPython
@@ -128,43 +129,8 @@ See :ref:`machine.UART <machine.UART>`. ::
     uart1.read(5)         # read up to 5 bytes
 
 The i.MXRT has up to eight hardware UARTs, but not every board exposes all
-TX and RX pins for users.  The pin assignment of UARTs to pins is fixed.
-The UARTs are numbered 1..8.  The rx/tx pins are assigned according to the
-tables below:
-
-================  ===========  ===========  ===========  ===========
-Board / Pin           UART0        UART1        UART2        UART3
-================  ===========  ===========  ===========  ===========
-Teensy 4.0             -            0/1          7/8         14/15
-Teensy 4.1             -            0/1          7/8         14/15
-MIMXRT1010-EVK     Debug USB      D0/D1        D7/D6           -
-MIMXRT1015-EVK     Debug USB      D0/D1        D7/A1           -
-MIMXRT1020-EVK     Debug USB      D0/D1        D9/D6       D10/D13
-MIMXRT1050-EVK     Debug USB      D0/D1        D7/D6        D8/D9
-MIMXRT1050-EVKB    Debug USB      D0/D1        D7/D6        D8/D9
-MIMXRT1060-EVK     Debug USB      D0/D1        D7/D6        D8/D9
-MIMXRT1064-EVK     Debug USB      D0/D1        D7/D6        D8/D9
-MIMXRT1170-EVK     Debug USB      D0/D1       D12/D11      D10/D13
-Olimex RT1010Py       -          RxD/TxD       D5/D6           -
-Seeed ARCH MIX        -        J3_19/J3_20  J4_16/J4_17  J4_06/J4_07
-================  ===========  ===========  ===========  ===========
-
-================  ===========  ===========  =======  =======  =====
-Board / Pin           UART4        UART5      UART6    UART7   UART8
-================  ===========  ===========  =======  =======  =====
-Teensy 4.0            16/17        21/20     25/24    28/29      -
-Teensy 4.1            16/17        21/20     25/24    28/29    34/35
-MIMXRT1010-EVK         -            -         -        -        -
-MIMXRT1015-EVK         -            -         -        -        -
-MIMXRT1020-EVK      D15/D14       A1/A0       -        -        -
-MIMXRT1050-EVK       A1/A0          -         -        -        -
-MIMXRT1050-EVKB      A1/A0          -         -        -        -
-MIMXRT1060-EVK       A1/A0          -         -        -        -
-MIMXRT1064-EVK       A1/A0          -         -        -        -
-MIMXRT1170-EVK      D15/D14      D25/D26    D33/D34  D35/D36    -
-Olimex RT1010Py        -            -         -        -        -
-Seeed ARCH MIX    J4_10/J4_11  J5_08/J5_12    -        -        -
-================  ===========  ===========  =======  =======  =====
+TX and RX pins for users. For the assignment of Pins to UART signals,
+refer to the :ref:`UART pinout <mimxrt_uart_pinout>`.
 
 PWM (pulse width modulation)
 ----------------------------
@@ -279,238 +245,8 @@ signal.
 PWM Pin Assignment
 ``````````````````
 
-Pins are specified in the same way as for the Pin class.  The following tables show
-the assignment of the board Pins to PWM modules:
-
-===========   ==========   ==========   ======    ==============   ======
-Pin/ MIMXRT   1010         1015         1020      1050/1060/1064   1170
-===========   ==========   ==========   ======    ==============   ======
-D0            -            Q1/1         F1/1/B    -                -
-D1            -            Q1/0         F1/1/A    -                -
-D2            F1/3/B       F1/3/A       -         F1/3/B           -
-D3            F1/3/A       F1/0/A       F2/3/B    F4/0/A           F1/2/A
-D4            F1/3/A (*)   Q1/2         Q2/1      F2/3/A           Q4/2
-D5            F1/0/B (*)   F1/0/B       F2/3/A    F1/3/A           F1/2/B
-D6            -            F1/2/B       F2/0/A    Q3/2             F1/0/A
-D7            -            -            F1/0/A    Q3/3             -
-D8            F1/0/A       F1/1/B       F1/0/B    F1/1/X           Q4/3
-D9            F1/1/B (*)   F1/2/A       F2/0/B    F1/0/X           F1/0/B
-D10           F1/3/B       -            F2/2/B    F1/0/B (*)       F2/2/B
-D11           F1/2/A       -            F2/1/A    F1/1/A (*)       -
-D12           F1/2/B       -            F2/1/B    F1/1/B (*)       -
-D13           F1/3/A       -            F2/2/A    F1/0/A (*)       F2/2/A
-D14           F1/0/B       -            -         F2/3/B           -
-D15           F1/0/A       -            -         F2/3/A           -
-A0            -            -            F1/2/A    -                -
-A1            F1/3/X       F1/3/B       F1/2/B    -                -
-A2            F1/2/X       F1/3/A       F1/3/A    -                -
-A3            -            F1/2/A       F1/3/B    -                -
-A4            -            -            -         Q3/1             -
-A5            -            -            -         Q3/0             -
-D31           -            -            -         -                F1/2/B
-D32           -            -            -         -                F1/2/A
-D33           -            -            -         -                F1/1/B
-D34           -            -            -         -                F1/1/A
-D35           -            -            -         -                F1/0/B
-D36           -            -            -         -                F1/0/A
-===========   ==========   ==========   ======    ==============   ======
-
-Pins denoted with (*) are by default not wired at the board.
-
-====   ==========  ====   ==========
-Pin    Teensy 4.0  Pin    Teensy 4.1
-====   ==========  ====   ==========
-0      F1/1/X      0      F1/1/X
-1      F1/0/X      1      F1/0/X
-2      F4/2/A      2      F4/2/A
-3      F4/2/B      3      F4/2/B
-4      F2/0/A      4      F2/0/A
-5      F2/1/A      5      F2/1/A
-6      F2/2/A      6      F2/2/A
-7      F1/3/B      7      F1/3/B
-8      F1/3/A      8      F1/3/A
-9      F2/2/B      9      F2/2/B
-10     Q1/0        10     Q1/0
-11     Q1/2        11     Q1/2
-12     Q1/1        12     Q1/1
-13     Q2/0        13     Q2/0
-14     Q3/2        14     Q3/2
-15     Q3/3        15     Q3/3
-18     Q3/1        18     Q3/1
-19     Q3/0        19     Q3/0
-22     F4/0/A      22     F4/0/A
-23     F4/1/A      23     F4/1/A
-24     F1/2/X      24     F1/2/X
-25     F1/3/X      25     F1/3/X
-28     F3/1/B      28     F3/1/B
-29     F3/1/A      29     F3/1/A
-33     F2/0/B      33     F2/0/B
--      -           36     F2/3/A
--      -           37     F2/3/B
-DAT1   F1/1/B      42     F1/1/B
-DAT0   F1/1/A      43     F1/1/A
-CLK    F1/0/B      44     F1/0/B
-CMD    F1/0/A      45     F1/0/A
-DAT2   F1/2/A      46     F1/2/A
-DAT3   F1/2/B      47     F1/2/B
--      -           48     F1/0/B
--      -           49     F1/2/A
--      -           50     F1/2/B
--      -           51     F3/3/B
--      -           52     F1/1/B
--      -           53     F1/1/A
--      -           54     F3/0/A
-====   ==========  ====   ==========
-
-=========  ==============
-Pin        Seeed ARCH MIX
-=========  ==============
-J3_04      Q4/3
-J3_10      Q1/3
-J3_12      Q2/3
-J3_13      Q3/3
-J3_16      Q3/0
-J3_17      Q3/1
-J3_19      F1/3/X
-J3_20      F1/2/X
-J4_08      F4/0/A
-J4_09      F4/1/A
-J4_16      Q3/2
-J4_17      Q3/3
-J5_32      Q1/0
-J5_28      Q1/1
-J5_29      Q1/2
-J5_30      Q2/0
-J5_04      Q2/1
-J5_05      Q2/3
-J5_06      F2/0/A
-J5_07      F2/0/B
-J5_08      F2/1/A
-J5_12      F2/1/B
-J5_13      F2/2/A
-J5_14      F2/2/B
-J5_23      F1/3/A
-J5_24      F1/3/B
-J5_25      F2/3/A
-J5_26      F2/3/B
-J5_42      Q3/0
-J5_43      Q3/1
-J5_50      F1/0/X
-LED_RED    F2/3/A
-LED_GREEN  F1/3/A
-LED_BLUE   F1/3/B
-=========  ==============
-
-=========  ===============
-Pin        Olimex RT1010PY
-=========  ===============
-D0           -
-D1         F1/0/B
-D2         F1/0/A
-D3         F1/1/B
-D4         F1/1/A
-D5         F1/2/B
-D6         F1/2/A
-D7         F1/3/B
-D8         F1/3/A
-D9            -
-D10        F1/0/B
-D11        F1/0/A
-D12        F1/1/B
-D13        F1/1/A
-D14           -
-A0            -
-A1         F1/2/B
-A2         F1/2/A
-A3         F1/3/B
-A4         F1/3/A
-SDI        F1/3/X
-SDO        F1/2/X
-CS0        F1/1/X
-SCK        F1/0/X
-=========  ===============
-
-Legend:
-
-* Qm/n:    QTMR module m, channel n
-* Fm/n/l:  FLEXPWM module m, submodule n, channel l. The pulse at a X channel
-  is always aligned to the period start.
-
-Pins without a PWM signal are not listed.  A signal may be available at more
-than one Pin.  FlexPWM pins may also be pure CPU pin, not assigned to a board
-signal.  In that case the PWM output is disabled.  The PWM channel of a submodule
-0 may still be used as synchronization source for other channels of the same
-module, unless used by another peripheral.
-
-Submodule 0 pins for i.MX RT1011:
-
-==================  =======
-Pin                 Channel
-==================  =======
-Pin.cpu.GPIO_01     B
-Pin.cpu.GPIO_02     A
-Pin.cpu.GPIO_AD_12  X
-Pin.cpu.GPIO_SD_01  B
-Pin.cpu.GPIO_SD_02  A
-==================  =======
-
-Submodule 0 pins for i.MX RT1021:
-
-=====================  ==================
-Pin                    Module & Channel
-=====================  ==================
-Pin.cpu.GPIO_AD_B1_06  FLEXPWM1 Channel A
-Pin.cpu.GPIO_AD_B1_07  FLEXPWM1 Channel B
-Pin.cpu.GPIO_EMC_26    FLEXPWM1 Channel A
-Pin.cpu.GPIO_EMC_27    FLEXPWM1 Channel B
-Pin.cpu.GPIO_AD_B0_14  FLEXPWM2 Channel A
-Pin.cpu.GPIO_AD_B0_15  FLEXPWM2 Channel B
-Pin.cpu.GPIO_EMC_10    FLEXPWM2 Channel X
-Pin.cpu.GPIO_EMC_38    FLEXPWM2 Channel A
-Pin.cpu.GPIO_EMC_39    FLEXPWM2 Channel B
-=====================  ==================
-
-Submodule 0 pins for i.MX RT1052, i.MX RT1062 and i.MX RT1064:
-
-=====================  ==================
-Pin                    Module & Channel
-=====================  ==================
-Pin.cpu.GPIO_AD_B0_02  FLEXPWM1 Channel X
-Pin.cpu.GPIO_EMC_23    FLEXPWM1 Channel A
-Pin.cpu.GPIO_EMC_24    FLEXPWM1 Channel B
-Pin.cpu.GPIO_SD_B0_00  FLEXPWM1 Channel A
-Pin.cpu.GPIO_SD_B0_01  FLEXPWM1 Channel B
-Pin.cpu.GPIO_B0_06     FLEXPWM2 Channel A
-Pin.cpu.GPIO_B0_07     FLEXPWM2 Channel B
-Pin.cpu.GPIO_EMC_06    FLEXPWM2 Channel A
-Pin.cpu.GPIO_EMC_07    FLEXPWM2 Channel B
-Pin.cpu.GPIO_EMC_29    FLEXPWM3 Channel A
-Pin.cpu.GPIO_EMC_30    FLEXPWM3 Channel B
-Pin.cpu.GPIO_AD_B1_08  FLEXPWM4 Channel A
-Pin.cpu.GPIO_EMC_00    FLEXPWM4 Channel A
-Pin.cpu.GPIO_EMC_01    FLEXPWM4 Channel B
-=====================  ==================
-
-Submodule 0 pins for i.MX RT1176
-
-======================  ======================
-Pin                     Module & Channel
-======================  ======================
-Pin.cpu.GPIO_EMC_B1_00  FLEXPWM4 Channel A (*)
-Pin.cpu.GPIO_EMC_B1_01  FLEXPWM4 Channel B (*)
-Pin.cpu.GPIO_EMC_B1_06  FLEXPWM2 Channel A (*)
-Pin.cpu.GPIO_EMC_B1_07  FLEXPWM2 Channel B (*)
-Pin.cpu.GPIO_EMC_B1_23  FLEXPWM1 Channel A (*)
-Pin.cpu.GPIO_EMC_B1_24  FLEXPWM1 Channel B (*)
-Pin.cpu.GPIO_EMC_B1_29  FLEXPWM3 Channel A (*)
-Pin.cpu.GPIO_EMC_B1_30  FLEXPWM3 Channel B (*)
-Pin.cpu.GPIO_AD_00      FLEXPWM1 Channel A
-Pin.cpu.GPIO_AD_01      FLEXPWM1 Channel B
-Pin.cpu.GPIO_AD_24      FLEXPWM2 Channel A
-Pin.cpu.GPIO_AD_25      FLEXPWM2 Channel B
-======================  ======================
-
-(*) Pin used for SDRAM
+Pins are specified in the same way as for the Pin class.  For the assignment of Pins
+to PWM signals, refer to the :ref:`PWM pinout <mimxrt_pwm_pinout>`.
 
 ADC (analog to digital conversion)
 ----------------------------------
@@ -562,45 +298,25 @@ Hardware SPI bus
 ----------------
 
 There are up to four hardware SPI channels that allow faster transmission
-rates (up to 90Mhz).  The SPI signals have fixed assignments to GPIO pins.
-It depends on the board design, which SPI's signals are exposed to the user, as
-detailed in the table below.  The signal order in the table is: CS0, CS1, MOSI, MISO, CLK.
-
-=================  =========================  =======================  ===============
-Board / Pin        SPI0                       SPI1                     SPI2
-=================  =========================  =======================  ===============
-Teensy 4.0         10/-/11/12/13              0/-/26/1/27                    -
-Teensy 4.1         10/37/11/12/13             0/-/26/1/27              -/29/50/54/49
-MIXMXRT1010-EVK    D10/D7/D11/D12/D13                -                       -
-MIXMXRT1015-EVK    D10/-/D11/D12/D13                 -                       -
-MIXMXRT1020-EVK    D10/-/D11/D12/D13          A3/D0/A5/A4/A0                 -
-MIXMXRT1050-EVK    D10/-/D11/D12/D13 (*)            -                        -
-MIXMXRT1050-EVKB   D10/-/D11/D12/D13 (*)            -                        -
-MIXMXRT1060-EVK    D10/-/D11/D12/D13 (*)            -                        -
-MIXMXRT1064-EVK    D10/-/D11/D12/D13 (*)            -                        -
-MIXMXRT1170-EVK    D10/-/D11/D12/D13          D28/-/D25/D24/D26        -/-/D14/D15/D24
-Olimex RT1010Py             -                 CS0/-/SDO/SDI/SCK        SDCARD with CS1
-Seeed ARCH MIX     J4_12/-/J4_14/J4_13/J4_15  J3_09/J3_05/J3_08_J3_11
-=================  =========================  =======================  ===============
-
-Pins denoted with (*) are by default not wired at the board.
-
-Hardware SPI is accessed via the :ref:`machine.SPI <machine.SPI>` class and
-has the same methods as software SPI above::
+rates (up to 30Mhz).  Hardware SPI is accessed via the
+:ref:`machine.SPI <machine.SPI>` class and has the same methods as software SPI above::
 
     from machine import SPI
 
     spi = SPI(0, 10000000)
     spi.write('Hello World')
 
+For the assignment of Pins to SPI signals, refer to
+:ref:`Hardware SPI pinout <mimxrt_spi_pinout>`.
+
 Notes:
 
-1. Even if the highest supported baud rate at the moment is 90 Mhz,
+1. Even if the highest reliable baud rate at the moment is about 30 Mhz,
    setting a baud rate will not always result in exactly that
    frequency, especially at high baud rates.
 
-2. Sending at 90 MHz is possible, but in the tests receiving
-   only worked up to 60 MHz.
+2. Sending at higher baud rate is possible. In the tests receiving
+   worked up to 60 MHz, sending up to 90 MHz.
 
 Software I2C bus
 ----------------
@@ -627,25 +343,7 @@ Hardware I2C bus
 
 There are up to four hardware I2C channels that allow faster transmission rates
 and support the full I2C protocol.  The I2C signals have fixed assignments to GPIO pins.
-It depends on the board design, which I2C's signals are exposed to the user, as
-detailed in the table below.  The signal order in the table is: SDA, SCL.
-
-=================  ===========  ===========  ===========  =======  =======
-Board / Pin        I2C 0        I2C 1        I2C 2        I2C 3    I2C 4
-=================  ===========  ===========  ===========  =======  =======
-Teensy 4.0         18/19        17/16        25/24         -        -
-Teensy 4.1         18/19        17/16        25/24         -        -
-MIXMXRT1010-EVK    D14/D15      D0/D1         -            -        -
-MIXMXRT1015-EVK    D14/D15       -            -            -        -
-MIXMXRT1020-EVK    D14/D15      A4/A5        D0/D1         -        -
-MIXMXRT1050-EVK    A4/A5        D1/D0         -            -        -
-MIXMXRT1050-EVKB   A4/A5        D1/D0         -            -        -
-MIXMXRT1060-EVK    A4/A5        D1/D0         -            -        -
-MIXMXRT1064-EVK    A4/A5        D1/D0         -            -        -
-MIXMXRT1170-EVK    D14/D15      D1/D0        A4/A5        D26/D25  D19/D18
-Olimex RT1010Py      -          SDA1/SCL1    SDA2/SCL2     -        -
-Seeed ARCH MIX     J3_17/J3_16  J4_06/J4_07  J5_05/J5_04   -        -
-=================  ===========  ===========  ===========  =======  =======
+For the assignment of Pins to I2C signals, refer to :ref:`Hardware I2C pinout <mimxrt_i2c_pinout>`.
 
 Hardware I2C is accessed via the :ref:`machine.I2C <machine.I2C>` class and
 has the same methods as software SPI above::
@@ -716,25 +414,9 @@ essential since MCK is needed for its I2C operation and is provided by the I2S
 controller.
 
 MIMXRT boards may have 1 or 2 I2S buses available at the board connectors.
-On MIMXRT1010 devices the bus numbers are 1 and 3.
-
-Pin assignments for a few MIMXRT boards:
-
-===============  ==  =====  ======== ======= ======= ======== ======= =======
-Board            ID  MCK    SCK_TX   WS_TX   SD_TX   SCK_RX   WS_RX   SD_RX
-===============  ==  =====  ======== ======= ======= ======== ======= =======
-Teensy 4.0       1   23     26       27      7       21       20      8
-Teensy 4.0       2   33     4        3       2       -        -       5
-Teensy 4.1       1   23     26       27      7       21       20      8
-Teensy 4.1       2   33     4        3       2       -        -       5
-Seeed Arch MIX   1   J4_09  J4_14    J4_15   J14_13  J4_11    J4_10   J4_10
-Olimex RT1010Py  1   D8     D6       D7      D4      D1       D2      D3
-Olimex RT1010Py  3   -      D10      D9      D11     -        -       -
-MIMXRT_DEV       1   "MCK"  "SCK_TX" "WS_TX" "SD_TX" "SCK_RX" "WS_RX" "SD_RX"
-===============  ==  =====  ======== ======= ======= ======== ======= =======
-
-Symbolic pin names are provided for the MIMXRT_10xx_DEV boards.
-These are provided for the other boards as well.
+On MIMXRT1010 devices the bus numbers are 1 and 3. The I2S signals have
+fixed assignments to GPIO pins. For the assignment of Pins to I2S signals,
+refer to :ref:`I2S pinout <mimxrt_i2s_pinout>`.
 
 Real time clock (RTC)
 ---------------------

From c7accf766606294a9782b946ced20d3718c7632a Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Fri, 15 Apr 2022 14:38:09 +0200
Subject: [PATCH 2106/3533] mimxrt/boards/OLIMEX_RT1010: Document the initial
 deploy procedure.

The procedure given here will work whether or not the DevKit motherboard is
used and is equipped with the support MCU.  It is laborious but works.
---
 ports/mimxrt/boards/OLIMEX_RT1010/board.json  |  2 +-
 .../boards/OLIMEX_RT1010/deploy_olimex.md     | 39 +++++++++++++++++++
 2 files changed, 40 insertions(+), 1 deletion(-)
 create mode 100644 ports/mimxrt/boards/OLIMEX_RT1010/deploy_olimex.md

diff --git a/ports/mimxrt/boards/OLIMEX_RT1010/board.json b/ports/mimxrt/boards/OLIMEX_RT1010/board.json
index 648114db5cf89..1778725658630 100644
--- a/ports/mimxrt/boards/OLIMEX_RT1010/board.json
+++ b/ports/mimxrt/boards/OLIMEX_RT1010/board.json
@@ -1,6 +1,6 @@
 {
     "deploy": [
-        "../deploy_mimxrt.md"
+        "deploy_olimex.md"
     ],
     "docs": "",
     "features": [
diff --git a/ports/mimxrt/boards/OLIMEX_RT1010/deploy_olimex.md b/ports/mimxrt/boards/OLIMEX_RT1010/deploy_olimex.md
new file mode 100644
index 0000000000000..1238ded848c0a
--- /dev/null
+++ b/ports/mimxrt/boards/OLIMEX_RT1010/deploy_olimex.md
@@ -0,0 +1,39 @@
+For initial deployment of the firmware a few preparation steps are required, which
+have to be done once.
+
+1. Get the files ufconv.py and uf2families.json from the micropython/tools directory,
+e.g. at https://github.com/micropython/micropython/tree/master/tools.
+
+2. Get the NXP program sdphost for your operating system, e.g. from
+https://github.com/adafruit/tinyuf2/tree/master/ports/mimxrt10xx/sdphost.
+You can also get them from the NXP web sites.
+
+3. Get the UF2 boot-loader package https://github.com/adafruit/tinyuf2/releases/download/0.9.0/tinyuf2-imxrt1010_evk-0.9.0.zip
+and extract the file tinyuf2-imxrt1010_evk-0.9.0.bin.
+
+Now you have all files at hand that you will need for updating.
+
+1. Get the firmware you want to upload from the MicroPython download page.
+
+2. Push and hold the "Boot" button, then press "Reset", and release both buttons.
+
+3. Run the commands: 
+
+```
+sudo ./sdphost -u 0x1fc9,0x0145 -- write-file 0x20206400 tinyuf2-imxrt1010_evk-0.9.0.bin 
+sudo ./sdphost -u 0x1fc9,0x0145 -- jump-address 0x20207000 
+```
+Wait until a drive icon appears on the computer (or mount it explicitly), and then run:
+```
+python3 uf2conv.py <firmware_xx.yy.zz.hex> --base 0x60000400 -f 0x4fb2d5bd
+```
+You can put all of that in a script. Just add a short wait before the 3rd command to let the drive connect.
+
+4. Once the upload is finished, push Reset again.
+
+Using sudo is Linux specific. You may not need it at all, if the access rights are set properly,
+and you will not need it for Windows. 
+
+Once the generic boot-loader is available, this procedure is only required for the first
+firmware load or in case the flash is corrupted and the existing firmware is not functioning
+any more.

From 1df7678674d0cb4d64afef00c8c6537c729e7b47 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sun, 24 Apr 2022 20:33:47 +0200
Subject: [PATCH 2107/3533] mimxrt/boards: Extend the deploy_teensy.md
 instructions.

---
 ports/mimxrt/boards/deploy_teensy.md | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/ports/mimxrt/boards/deploy_teensy.md b/ports/mimxrt/boards/deploy_teensy.md
index f4815449009b6..28da092493dd3 100644
--- a/ports/mimxrt/boards/deploy_teensy.md
+++ b/ports/mimxrt/boards/deploy_teensy.md
@@ -11,4 +11,9 @@ or for Teensy 4.1:
 teensy_loader_cli --mcu=imxrt1062 -v -w TEENSY41-<date_version_tag>.hex
 ```
 
-When loading the firmware the PJRC boot loader will erase the content of the board file system.
+Instead of imxrt1062 with the --mcu option, you can as well use the board specic names
+TEENSY40, TEENSY41 or TEENSY_MICROMOD. When loading the firmware the PJRC boot loader
+will erase the board file system.
+
+Note: If the Teensy board is equipped with Teensy bootloader v1.07 and up, the first attempt to
+upload the firmware may fail. In that case try again.

From ea9a904b7250ece017144c0d25a1569714a792b6 Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew@alelec.net>
Date: Fri, 1 Apr 2022 14:28:35 +1100
Subject: [PATCH 2108/3533] docs/reference/manifest: Add link to details about
 opt-level for freeze.

---
 docs/reference/manifest.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/reference/manifest.rst b/docs/reference/manifest.rst
index 078c4c7cf66c0..b756de47ed032 100644
--- a/docs/reference/manifest.rst
+++ b/docs/reference/manifest.rst
@@ -57,7 +57,7 @@ Freezing source code
     directory then all files in that directory will be frozen.
 
     *opt* is the optimisation level to pass to mpy-cross when compiling ``.py``
-    to ``.mpy``.
+    to ``.mpy``.  These levels are described in :func:`micropython.opt_level`.
 
 .. function:: freeze_as_str(path)
 

From 4a1ae99ac384878ffaddb30e9f8139f7b07aabae Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 1 Jun 2022 11:57:20 +1000
Subject: [PATCH 2109/3533] extmod/machine_i2c: Add optional support for
 write-then-read transfers.

This option is useful for ports where it's more efficient to do a full I2C
transfer in one go.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/machine_i2c.c | 17 +++++++++++++++++
 extmod/machine_i2c.h |  5 +++++
 py/mpconfig.h        |  5 +++++
 3 files changed, 27 insertions(+)

diff --git a/extmod/machine_i2c.c b/extmod/machine_i2c.c
index f2c959b95a653..7d0628a2d43c2 100644
--- a/extmod/machine_i2c.c
+++ b/extmod/machine_i2c.c
@@ -514,6 +514,21 @@ STATIC int read_mem(mp_obj_t self_in, uint16_t addr, uint32_t memaddr, uint8_t a
     uint8_t memaddr_buf[4];
     size_t memaddr_len = fill_memaddr_buf(&memaddr_buf[0], memaddr, addrsize);
 
+    #if MICROPY_PY_MACHINE_I2C_TRANSFER_WRITE1
+
+    // Create partial write and read buffers
+    mp_machine_i2c_buf_t bufs[2] = {
+        {.len = memaddr_len, .buf = memaddr_buf},
+        {.len = len, .buf = buf},
+    };
+
+    // Do write+read I2C transfer
+    mp_machine_i2c_p_t *i2c_p = (mp_machine_i2c_p_t *)self->type->protocol;
+    return i2c_p->transfer(self, addr, 2, bufs,
+        MP_MACHINE_I2C_FLAG_WRITE1 | MP_MACHINE_I2C_FLAG_READ | MP_MACHINE_I2C_FLAG_STOP);
+
+    #else
+
     int ret = mp_machine_i2c_writeto(self, addr, memaddr_buf, memaddr_len, false);
     if (ret != memaddr_len) {
         // must generate STOP
@@ -521,6 +536,8 @@ STATIC int read_mem(mp_obj_t self_in, uint16_t addr, uint32_t memaddr, uint8_t a
         return ret;
     }
     return mp_machine_i2c_readfrom(self, addr, buf, len, true);
+
+    #endif
 }
 
 STATIC int write_mem(mp_obj_t self_in, uint16_t addr, uint32_t memaddr, uint8_t addrsize, const uint8_t *buf, size_t len) {
diff --git a/extmod/machine_i2c.h b/extmod/machine_i2c.h
index 9e43747323840..a211aef527a18 100644
--- a/extmod/machine_i2c.h
+++ b/extmod/machine_i2c.h
@@ -45,6 +45,11 @@
 #define MP_MACHINE_I2C_FLAG_READ (0x01) // if not set then it's a write
 #define MP_MACHINE_I2C_FLAG_STOP (0x02)
 
+#if MICROPY_PY_MACHINE_I2C_TRANSFER_WRITE1
+// If set, the first mp_machine_i2c_buf_t in a transfer is a write.
+#define MP_MACHINE_I2C_FLAG_WRITE1 (0x04)
+#endif
+
 typedef struct _mp_machine_i2c_buf_t {
     size_t len;
     uint8_t *buf;
diff --git a/py/mpconfig.h b/py/mpconfig.h
index 00890942bba67..ea03ad1408845 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -1585,6 +1585,11 @@ typedef double mp_float_t;
 #define MICROPY_PY_MACHINE_I2C (0)
 #endif
 
+// Whether the low-level I2C transfer function supports a separate write as the first transfer
+#ifndef MICROPY_PY_MACHINE_I2C_TRANSFER_WRITE1
+#define MICROPY_PY_MACHINE_I2C_TRANSFER_WRITE1 (0)
+#endif
+
 // Whether to provide the "machine.SoftI2C" class
 #ifndef MICROPY_PY_MACHINE_SOFTI2C
 #define MICROPY_PY_MACHINE_SOFTI2C (0)

From 6bda80d81147217a1d830b99b93d2e35d372e8f9 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 1 Jun 2022 11:58:30 +1000
Subject: [PATCH 2110/3533] esp32/machine_i2c: Implement write-then-read I2C
 transfers.

I2C transfers are much more efficient if they are combined, instead of
doing separate writes and reads.

Fixes issue #7134.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/machine_i2c.c  | 12 +++++++++++-
 ports/esp32/mpconfigport.h |  1 +
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/ports/esp32/machine_i2c.c b/ports/esp32/machine_i2c.c
index d9003f45b5bed..b037202e8da61 100644
--- a/ports/esp32/machine_i2c.c
+++ b/ports/esp32/machine_i2c.c
@@ -79,10 +79,20 @@ int machine_hw_i2c_transfer(mp_obj_base_t *self_in, uint16_t addr, size_t n, mp_
     machine_hw_i2c_obj_t *self = MP_OBJ_TO_PTR(self_in);
 
     i2c_cmd_handle_t cmd = i2c_cmd_link_create();
+    int data_len = 0;
+
+    if (flags & MP_MACHINE_I2C_FLAG_WRITE1) {
+        i2c_master_start(cmd);
+        i2c_master_write_byte(cmd, addr << 1, true);
+        i2c_master_write(cmd, bufs->buf, bufs->len, true);
+        data_len += bufs->len;
+        --n;
+        ++bufs;
+    }
+
     i2c_master_start(cmd);
     i2c_master_write_byte(cmd, addr << 1 | (flags & MP_MACHINE_I2C_FLAG_READ), true);
 
-    int data_len = 0;
     for (; n--; ++bufs) {
         if (flags & MP_MACHINE_I2C_FLAG_READ) {
             i2c_master_read(cmd, bufs->buf, bufs->len, n == 0 ? I2C_MASTER_LAST_NACK : I2C_MASTER_ACK);
diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h
index 6f4241330579f..fd810e07b82a7 100644
--- a/ports/esp32/mpconfigport.h
+++ b/ports/esp32/mpconfigport.h
@@ -87,6 +87,7 @@
 #define MICROPY_PY_MACHINE_PWM_DUTY_U16_NS  (1)
 #define MICROPY_PY_MACHINE_PWM_INCLUDEFILE  "ports/esp32/machine_pwm.c"
 #define MICROPY_PY_MACHINE_I2C              (1)
+#define MICROPY_PY_MACHINE_I2C_TRANSFER_WRITE1 (1)
 #define MICROPY_PY_MACHINE_SOFTI2C          (1)
 #define MICROPY_PY_MACHINE_SPI              (1)
 #define MICROPY_PY_MACHINE_SPI_MSB          (0)

From 2f4aca0381ba2755e4a95bb816b08a919db607d8 Mon Sep 17 00:00:00 2001
From: Jared Hancock <jared.hancock@centeredsolutions.com>
Date: Mon, 30 May 2022 11:05:39 -0400
Subject: [PATCH 2111/3533] mimxrt/mphalport: Fix strict aliasing error with
 unique id.

---
 ports/mimxrt/mphalport.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/ports/mimxrt/mphalport.c b/ports/mimxrt/mphalport.c
index 46349d3a37f63..87741e0b5cf98 100644
--- a/ports/mimxrt/mphalport.c
+++ b/ports/mimxrt/mphalport.c
@@ -140,8 +140,8 @@ uint64_t mp_hal_time_ns(void) {
 // MAC address
 
 void mp_hal_get_unique_id(uint8_t id[]) {
-    *(uint32_t *)&id[0] = OCOTP->CFG0;
-    *(uint32_t *)&id[4] = OCOTP->CFG1;
+    *(uint32_t *)id = OCOTP->CFG0;
+    *(uint32_t *)(id + 4) = OCOTP->CFG1;
 }
 
 // Generate a random locally administered MAC address (LAA)
@@ -150,12 +150,12 @@ void mp_hal_generate_laa_mac(int idx, uint8_t buf[6]) {
     unsigned char id[8];
     mp_hal_get_unique_id(id);
 
-    uint32_t pt1 = *(uint32_t *)&id[0];
-    uint32_t pt2 = *(uint32_t *)&id[4];
+    uint32_t *pt1 = (uint32_t *)id;
+    uint32_t *pt2 = (uint32_t *)(id + 4);
 
     buf[0] = 0x02; // Locally Administered MAC
-    *(uint32_t *)&buf[1] = pt1 ^ (pt1 >> 8);
-    *(uint16_t *)&buf[4] = (uint16_t)(pt2 ^ pt2 >> 16);
+    *(uint32_t *)&buf[1] = *pt1 ^ (*pt1 >> 8);
+    *(uint16_t *)&buf[4] = (uint16_t)(*pt2 ^ *pt2 >> 16);
     buf[5] ^= (uint8_t)idx;
 }
 

From 54f1694ab67f72fb92061ce535bc2483aae46bf4 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 1 Jun 2022 18:50:43 +1000
Subject: [PATCH 2112/3533] drivers/bus: Rename MP_SPI_ADDR_IS_32B to
 MICROPY_HW_SPI_ADDR_IS_32BIT.

And allow it to be configured externally, if needed.

Signed-off-by: Damien George <damien@micropython.org>
---
 drivers/bus/qspi.h        | 6 ++++--
 drivers/memory/spiflash.c | 8 ++++----
 ports/stm32/qspi.c        | 4 ++--
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/drivers/bus/qspi.h b/drivers/bus/qspi.h
index c82796fac5013..7dfaaf3d40c63 100644
--- a/drivers/bus/qspi.h
+++ b/drivers/bus/qspi.h
@@ -28,7 +28,9 @@
 
 #include "py/mphal.h"
 
-#define MP_SPI_ADDR_IS_32B(addr) (addr & 0xff000000)
+#ifndef MICROPY_HW_SPI_ADDR_IS_32BIT
+#define MICROPY_HW_SPI_ADDR_IS_32BIT(addr) (addr & 0xff000000)
+#endif
 
 enum {
     MP_QSPI_IOCTL_INIT,
@@ -57,7 +59,7 @@ typedef struct _mp_soft_qspi_obj_t {
 extern const mp_qspi_proto_t mp_soft_qspi_proto;
 
 static inline uint8_t mp_spi_set_addr_buff(uint8_t *buf, uint32_t addr) {
-    if (MP_SPI_ADDR_IS_32B(addr)) {
+    if (MICROPY_HW_SPI_ADDR_IS_32BIT(addr)) {
         buf[0] = addr >> 24;
         buf[1] = addr >> 16;
         buf[2] = addr >> 8;
diff --git a/drivers/memory/spiflash.c b/drivers/memory/spiflash.c
index bb15bd6252519..9f8dc29a734de 100644
--- a/drivers/memory/spiflash.c
+++ b/drivers/memory/spiflash.c
@@ -123,9 +123,9 @@ STATIC void mp_spiflash_read_data(mp_spiflash_t *self, uint32_t addr, size_t len
     const mp_spiflash_config_t *c = self->config;
     uint8_t cmd;
     if (c->bus_kind == MP_SPIFLASH_BUS_SPI) {
-        cmd = MP_SPI_ADDR_IS_32B(addr) ? CMD_READ_32 : CMD_READ;
+        cmd = MICROPY_HW_SPI_ADDR_IS_32BIT(addr) ? CMD_READ_32 : CMD_READ;
     } else {
-        cmd = MP_SPI_ADDR_IS_32B(addr) ? CMD_C4READ_32 : CMD_C4READ;
+        cmd = MICROPY_HW_SPI_ADDR_IS_32BIT(addr) ? CMD_C4READ_32 : CMD_C4READ;
     }
     mp_spiflash_transfer_cmd_addr_data(self, cmd, addr, len, NULL, dest);
 }
@@ -218,7 +218,7 @@ STATIC int mp_spiflash_erase_block_internal(mp_spiflash_t *self, uint32_t addr)
     }
 
     // erase the sector
-    uint8_t cmd = MP_SPI_ADDR_IS_32B(addr) ? CMD_SEC_ERASE_32 : CMD_SEC_ERASE;
+    uint8_t cmd = MICROPY_HW_SPI_ADDR_IS_32BIT(addr) ? CMD_SEC_ERASE_32 : CMD_SEC_ERASE;
     mp_spiflash_transfer_cmd_addr_data(self, cmd, addr, 0, NULL, NULL);
 
     // wait WIP=0
@@ -236,7 +236,7 @@ STATIC int mp_spiflash_write_page(mp_spiflash_t *self, uint32_t addr, size_t len
     }
 
     // write the page
-    uint8_t cmd = MP_SPI_ADDR_IS_32B(addr) ? CMD_WRITE_32 : CMD_WRITE;
+    uint8_t cmd = MICROPY_HW_SPI_ADDR_IS_32BIT(addr) ? CMD_WRITE_32 : CMD_WRITE;
     mp_spiflash_transfer_cmd_addr_data(self, cmd, addr, len, src, NULL);
 
     // wait WIP=0
diff --git a/ports/stm32/qspi.c b/ports/stm32/qspi.c
index d32bd4dcf4a99..04e226697eeab 100644
--- a/ports/stm32/qspi.c
+++ b/ports/stm32/qspi.c
@@ -246,7 +246,7 @@ STATIC void qspi_write_cmd_data(void *self_in, uint8_t cmd, size_t len, uint32_t
 STATIC void qspi_write_cmd_addr_data(void *self_in, uint8_t cmd, uint32_t addr, size_t len, const uint8_t *src) {
     (void)self_in;
 
-    uint8_t adsize = MP_SPI_ADDR_IS_32B(addr) ? 3 : 2;
+    uint8_t adsize = MICROPY_HW_SPI_ADDR_IS_32BIT(addr) ? 3 : 2;
 
     QUADSPI->FCR = QUADSPI_FCR_CTCF; // clear TC flag
 
@@ -331,7 +331,7 @@ STATIC uint32_t qspi_read_cmd(void *self_in, uint8_t cmd, size_t len) {
 STATIC void qspi_read_cmd_qaddr_qdata(void *self_in, uint8_t cmd, uint32_t addr, size_t len, uint8_t *dest) {
     (void)self_in;
 
-    uint8_t adsize = MP_SPI_ADDR_IS_32B(addr) ? 3 : 2;
+    uint8_t adsize = MICROPY_HW_SPI_ADDR_IS_32BIT(addr) ? 3 : 2;
 
     QUADSPI->FCR = QUADSPI_FCR_CTCF; // clear TC flag
 

From 1296a01f4c351eba13a1f436a29e66e35b470028 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 1 Jun 2022 20:53:48 +1000
Subject: [PATCH 2113/3533] stm32/mboot: Move remaining led_state_all call into
 mboot_state_change.

This was missed in b2deea67628b7069ed4e5d0cde84005738463514

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/mboot/fsload.c | 2 +-
 ports/stm32/mboot/mboot.h  | 1 +
 ports/stm32/mboot/ui.c     | 4 ++++
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ports/stm32/mboot/fsload.c b/ports/stm32/mboot/fsload.c
index 231b07afa5bc4..f3ea57c89fda2 100644
--- a/ports/stm32/mboot/fsload.c
+++ b/ports/stm32/mboot/fsload.c
@@ -198,7 +198,7 @@ static int fsload_program_file(bool write_to_flash) {
 static int fsload_validate_and_program_file(void *stream, const stream_methods_t *meth, const char *fname) {
     // First pass verifies the file, second pass programs it
     for (unsigned int pass = 0; pass <= 1; ++pass) {
-        led_state_all(pass == 0 ? 2 : 4);
+        mboot_state_change(MBOOT_STATE_FSLOAD_PASS_START, pass);
         int res = meth->open(stream, fname);
         if (res == 0) {
             res = input_stream_init(stream, meth->read);
diff --git a/ports/stm32/mboot/mboot.h b/ports/stm32/mboot/mboot.h
index db90e07a0ebe1..d8531f19badf4 100644
--- a/ports/stm32/mboot/mboot.h
+++ b/ports/stm32/mboot/mboot.h
@@ -64,6 +64,7 @@ typedef enum {
     MBOOT_STATE_DFU_END,            // arg: unused
     MBOOT_STATE_FSLOAD_START,       // arg: unused
     MBOOT_STATE_FSLOAD_END,         // arg: result of fsload operation
+    MBOOT_STATE_FSLOAD_PASS_START,  // arg: pass number, 0 or 1 (verify and write respectively)
     MBOOT_STATE_FSLOAD_PROGRESS,    // arg: total bytes processed so far, high bit set when doing write pass
     MBOOT_STATE_ERASE_START,        // arg: address of erase
     MBOOT_STATE_ERASE_END,          // arg: result of erase
diff --git a/ports/stm32/mboot/ui.c b/ports/stm32/mboot/ui.c
index 840803829ed9b..aa62d31a0ae27 100644
--- a/ports/stm32/mboot/ui.c
+++ b/ports/stm32/mboot/ui.c
@@ -228,6 +228,10 @@ void mboot_state_change(mboot_state_t state, uint32_t arg) {
             }
             break;
 
+        case MBOOT_STATE_FSLOAD_PASS_START:
+            led_state_all(arg == 0 ? 2 : 4);
+            break;
+
         case MBOOT_STATE_FSLOAD_PROGRESS:
             break;
 

From 9246099935642d28d2d4b1024bc7becb6a8a8b23 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 1 Jun 2022 20:55:38 +1000
Subject: [PATCH 2114/3533] stm32/mboot: Add update_app_elements to return
 mboot fsload elements.

In case the elements should not be passed directly to machine.bootloader.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/mboot/fwupdate.py | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/ports/stm32/mboot/fwupdate.py b/ports/stm32/mboot/fwupdate.py
index 3e2535137044d..ba36b7965bd3b 100644
--- a/ports/stm32/mboot/fwupdate.py
+++ b/ports/stm32/mboot/fwupdate.py
@@ -225,7 +225,7 @@ def _create_element(kind, body):
     return bytes([kind, len(body)]) + body
 
 
-def update_mpy(
+def update_app_elements(
     filename, fs_base, fs_len, fs_type=VFS_FAT, fs_blocksize=0, status_addr=None, addr_64bit=False
 ):
     # Check firmware is of .dfu or .dfu.gz type
@@ -237,7 +237,7 @@ def update_mpy(
             hdr = f.read(6)
     if hdr != b"DfuSe\x01":
         print("Firmware must be a .dfu(.gz) file.")
-        return
+        return ()
 
     if fs_type in (VFS_LFS1, VFS_LFS2) and not fs_blocksize:
         raise Exception("littlefs requires fs_blocksize parameter")
@@ -256,4 +256,10 @@ def update_mpy(
         machine.mem32[status_addr] = 1
         elems += _create_element(_ELEM_TYPE_STATUS, struct.pack("<L", status_addr))
     elems += _create_element(_ELEM_TYPE_END, b"")
-    machine.bootloader(elems)
+    return elems
+
+
+def update_mpy(*args, **kwargs):
+    elems = update_app_elements(*args, **kwargs)
+    if elems:
+        machine.bootloader(elems)

From e64947dc906bffd7bb2099c598386e74007463d0 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 1 Jun 2022 20:57:44 +1000
Subject: [PATCH 2115/3533] stm32/mboot: Make 0x70ad0000 values named constants
 with macros.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/mboot/main.c  | 4 ++--
 ports/stm32/mboot/mboot.h | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/ports/stm32/mboot/main.c b/ports/stm32/mboot/main.c
index 1420f13fbed7f..62f80a54e88eb 100644
--- a/ports/stm32/mboot/main.c
+++ b/ports/stm32/mboot/main.c
@@ -1357,7 +1357,7 @@ void stm32_main(uint32_t initial_r0) {
     }
     #endif
 
-    if ((initial_r0 & 0xffffff00) == 0x70ad0000) {
+    if ((initial_r0 & 0xffffff00) == MBOOT_INITIAL_R0_KEY) {
         goto enter_bootloader;
     }
 
@@ -1401,7 +1401,7 @@ void stm32_main(uint32_t initial_r0) {
     mboot_pack_init();
     #endif
 
-    if ((initial_r0 & 0xffffff80) == 0x70ad0080) {
+    if ((initial_r0 & 0xffffff80) == MBOOT_INITIAL_R0_KEY_FSLOAD) {
         mboot_state_change(MBOOT_STATE_FSLOAD_START, 0);
         int ret = -1;
         #if MBOOT_FSLOAD
diff --git a/ports/stm32/mboot/mboot.h b/ports/stm32/mboot/mboot.h
index d8531f19badf4..336d536823e38 100644
--- a/ports/stm32/mboot/mboot.h
+++ b/ports/stm32/mboot/mboot.h
@@ -46,6 +46,10 @@
 #define MBOOT_ADDRESS_SPACE_64BIT (0)
 #endif
 
+// These values are used in initial_r0 to enter mboot programatically.
+#define MBOOT_INITIAL_R0_KEY (0x70ad0000)
+#define MBOOT_INITIAL_R0_KEY_FSLOAD (MBOOT_INITIAL_R0_KEY | 0x80)
+
 // These are for led_state_all() and can be or'd together.
 #define MBOOT_LED_STATE_LED0 (0x01)
 #define MBOOT_LED_STATE_LED1 (0x02)

From 87fbceef2649b15d40cc8aaf4e5957af537ce9af Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 1 Jun 2022 20:59:11 +1000
Subject: [PATCH 2116/3533] stm32/mboot: Pass initial_r0 to early-init and
 get-reset-mode funcs.

This allows a board to modify initial_r0 if needed.

Also make default board behaviour functions always available, named as
mboot_get_reset_mode_default and mboot_state_change_default.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/boards/LEGO_HUB_NO6/board_init.c  |  2 +-
 .../stm32/boards/LEGO_HUB_NO6/mpconfigboard.h |  4 +--
 ports/stm32/boards/PYBD_SF2/mpconfigboard.h   |  2 +-
 ports/stm32/mboot/main.c                      |  6 ++--
 ports/stm32/mboot/mboot.h                     | 33 +++++++++++--------
 ports/stm32/mboot/ui.c                        | 10 ++----
 6 files changed, 29 insertions(+), 28 deletions(-)

diff --git a/ports/stm32/boards/LEGO_HUB_NO6/board_init.c b/ports/stm32/boards/LEGO_HUB_NO6/board_init.c
index 3f22bfc8fce2b..0e5bc7118cb1e 100644
--- a/ports/stm32/boards/LEGO_HUB_NO6/board_init.c
+++ b/ports/stm32/boards/LEGO_HUB_NO6/board_init.c
@@ -133,7 +133,7 @@ void board_mboot_led_state(int led, int state) {
     hub_display_update();
 }
 
-int board_mboot_get_reset_mode(void) {
+int board_mboot_get_reset_mode(uint32_t *initial_r0) {
     board_button_init();
     int reset_mode = BOARDCTRL_RESET_MODE_NORMAL;
     if (board_button_state()) {
diff --git a/ports/stm32/boards/LEGO_HUB_NO6/mpconfigboard.h b/ports/stm32/boards/LEGO_HUB_NO6/mpconfigboard.h
index 188cd67af5c83..2cfb420ef8da1 100644
--- a/ports/stm32/boards/LEGO_HUB_NO6/mpconfigboard.h
+++ b/ports/stm32/boards/LEGO_HUB_NO6/mpconfigboard.h
@@ -127,7 +127,7 @@ extern struct _spi_bdev_t spi_bdev;
 #define MBOOT_BOARD_LED_INIT                     board_mboot_led_init
 #define MBOOT_BOARD_LED_STATE                    board_mboot_led_state
 
-#define MBOOT_BOARD_EARLY_INIT                   board_init
+#define MBOOT_BOARD_EARLY_INIT(initial_r0)       board_init()
 #define MBOOT_BOARD_CLEANUP                      board_mboot_cleanup
 #define MBOOT_BOARD_GET_RESET_MODE               board_mboot_get_reset_mode
 
@@ -138,5 +138,5 @@ void board_init(void);
 void board_mboot_cleanup(int reset_mode);
 void board_mboot_led_init(void);
 void board_mboot_led_state(int led, int state);
-int board_mboot_get_reset_mode(void);
+int board_mboot_get_reset_mode(uint32_t *initial_r0);
 void *btstack_chipset_cc256x_instance(void);
diff --git a/ports/stm32/boards/PYBD_SF2/mpconfigboard.h b/ports/stm32/boards/PYBD_SF2/mpconfigboard.h
index a3e1ab398028a..6dfb8c38d23a2 100644
--- a/ports/stm32/boards/PYBD_SF2/mpconfigboard.h
+++ b/ports/stm32/boards/PYBD_SF2/mpconfigboard.h
@@ -221,5 +221,5 @@ extern struct _spi_bdev_t spi_bdev2;
 #define MBOOT_SPIFLASH2_SPIFLASH    (&spi_bdev2.spiflash)
 #define MBOOT_SPIFLASH2_CONFIG      (&spiflash2_config)
 
-#define MBOOT_BOARD_EARLY_INIT mboot_board_early_init
+#define MBOOT_BOARD_EARLY_INIT(initial_r0) mboot_board_early_init()
 void mboot_board_early_init(void);
diff --git a/ports/stm32/mboot/main.c b/ports/stm32/mboot/main.c
index 62f80a54e88eb..8bd5e86fe7e5d 100644
--- a/ports/stm32/mboot/main.c
+++ b/ports/stm32/mboot/main.c
@@ -1346,9 +1346,7 @@ void stm32_main(uint32_t initial_r0) {
     SCB_EnableDCache();
     #endif
 
-    #if defined(MBOOT_BOARD_EARLY_INIT)
-    MBOOT_BOARD_EARLY_INIT();
-    #endif
+    MBOOT_BOARD_EARLY_INIT(&initial_r0);
 
     #ifdef MBOOT_BOOTPIN_PIN
     mp_hal_pin_config(MBOOT_BOOTPIN_PIN, MP_HAL_PIN_MODE_INPUT, MBOOT_BOOTPIN_PULL, 0);
@@ -1361,7 +1359,7 @@ void stm32_main(uint32_t initial_r0) {
         goto enter_bootloader;
     }
 
-    int reset_mode = mboot_get_reset_mode();
+    int reset_mode = MBOOT_BOARD_GET_RESET_MODE(&initial_r0);
     if (reset_mode != BOARDCTRL_RESET_MODE_BOOTLOADER) {
         // Bootloader mode was not selected so try to enter the application,
         // passing through the reset_mode.  This will return if the application
diff --git a/ports/stm32/mboot/mboot.h b/ports/stm32/mboot/mboot.h
index 336d536823e38..9f47811537a95 100644
--- a/ports/stm32/mboot/mboot.h
+++ b/ports/stm32/mboot/mboot.h
@@ -38,8 +38,20 @@
 #define NORETURN __attribute__((noreturn))
 #define MP_ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0]))
 
+#ifndef MBOOT_BOARD_EARLY_INIT
+#define MBOOT_BOARD_EARLY_INIT(initial_r0)
+#endif
+
 #ifndef MBOOT_BOARD_ENTRY_INIT
-#define MBOOT_BOARD_ENTRY_INIT mboot_entry_init
+#define MBOOT_BOARD_ENTRY_INIT(initial_r0) mboot_entry_init_default()
+#endif
+
+#ifndef MBOOT_BOARD_GET_RESET_MODE
+#define MBOOT_BOARD_GET_RESET_MODE(initial_r0) mboot_get_reset_mode_default()
+#endif
+
+#ifndef MBOOT_BOARD_STATE_CHANGE
+#define MBOOT_BOARD_STATE_CHANGE(state, arg) mboot_state_change_default((state), (arg))
 #endif
 
 #ifndef MBOOT_ADDRESS_SPACE_64BIT
@@ -154,7 +166,7 @@ int do_write(uint32_t addr, const uint8_t *src8, size_t len, bool dry_run);
 const uint8_t *elem_search(const uint8_t *elem, uint8_t elem_id);
 int fsload_process(void);
 
-static inline void mboot_entry_init(uint32_t *initial_r0) {
+static inline void mboot_entry_init_default(void) {
     // Init subsystems (mboot_get_reset_mode() may call these, calling them again is ok)
     led_init();
 
@@ -167,20 +179,15 @@ static inline void mboot_entry_init(uint32_t *initial_r0) {
     #endif
 }
 
-#if defined(MBOOT_BOARD_GET_RESET_MODE)
-static inline int mboot_get_reset_mode(void) {
-    return MBOOT_BOARD_GET_RESET_MODE();
-}
-#else
-int mboot_get_reset_mode(void);
-#endif
+int mboot_get_reset_mode_default(void);
+void mboot_state_change_default(mboot_state_t state, uint32_t arg);
 
-#if defined(MBOOT_BOARD_STATE_CHANGE)
 static inline void mboot_state_change(mboot_state_t state, uint32_t arg) {
+    #if defined(MBOOT_BOARD_STATE_CHANGE)
     return MBOOT_BOARD_STATE_CHANGE(state, arg);
+    #else
+    return mboot_state_change_default(state, arg);
+    #endif
 }
-#else
-void mboot_state_change(mboot_state_t state, uint32_t arg);
-#endif
 
 #endif // MICROPY_INCLUDED_STM32_MBOOT_MBOOT_H
diff --git a/ports/stm32/mboot/ui.c b/ports/stm32/mboot/ui.c
index aa62d31a0ae27..db1bcc8b78317 100644
--- a/ports/stm32/mboot/ui.c
+++ b/ports/stm32/mboot/ui.c
@@ -136,7 +136,7 @@ void led0_update(void) {
 /******************************************************************************/
 // User button
 
-#if !defined(MBOOT_BOARD_GET_RESET_MODE)
+#ifdef MICROPY_HW_USRSW_PIN
 
 #define RESET_MODE_NUM_STATES (4)
 #define RESET_MODE_TIMEOUT_CYCLES (8)
@@ -158,7 +158,7 @@ static int usrbtn_state(void) {
     return mp_hal_pin_read(MICROPY_HW_USRSW_PIN) == MICROPY_HW_USRSW_PRESSED;
 }
 
-int mboot_get_reset_mode(void) {
+int mboot_get_reset_mode_default(void) {
     usrbtn_init();
     int reset_mode = BOARDCTRL_RESET_MODE_NORMAL;
     if (usrbtn_state()) {
@@ -198,9 +198,7 @@ int mboot_get_reset_mode(void) {
 /******************************************************************************/
 // State change
 
-#if !defined(MBOOT_BOARD_STATE_CHANGE)
-
-void mboot_state_change(mboot_state_t state, uint32_t arg) {
+void mboot_state_change_default(mboot_state_t state, uint32_t arg) {
     switch (state) {
         case MBOOT_STATE_DFU_START:
             led_state_all(0);
@@ -255,5 +253,3 @@ void mboot_state_change(mboot_state_t state, uint32_t arg) {
             break;
     }
 }
-
-#endif

From 36211baf0eaa36416d262c9ed505dc0e55f1c11d Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 2 Jun 2022 13:25:25 +1000
Subject: [PATCH 2117/3533] stm32/boards/LEGO_HUB_NO6: Make all SPI flash
 transfers use 32-bit addr.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/boards/LEGO_HUB_NO6/bdev.c          | 14 --------------
 ports/stm32/boards/LEGO_HUB_NO6/mpconfigboard.h | 11 ++++++++---
 2 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/ports/stm32/boards/LEGO_HUB_NO6/bdev.c b/ports/stm32/boards/LEGO_HUB_NO6/bdev.c
index a68b812ed34ff..2f450dcb0f876 100644
--- a/ports/stm32/boards/LEGO_HUB_NO6/bdev.c
+++ b/ports/stm32/boards/LEGO_HUB_NO6/bdev.c
@@ -28,8 +28,6 @@
 #include "storage.h"
 #include "spi.h"
 
-#define CMD_EXIT_4_BYTE_ADDRESS_MODE (0xE9)
-
 STATIC const spi_proto_cfg_t spi_bus = {
     .spi = &spi_obj[1], // SPI2 hardware peripheral
     .baudrate = 25000000,
@@ -50,15 +48,3 @@ const mp_spiflash_config_t spiflash_config = {
 };
 
 spi_bdev_t spi_bdev;
-
-int32_t board_bdev_ioctl(void) {
-    int32_t ret = spi_bdev_ioctl(&spi_bdev, BDEV_IOCTL_INIT, (uint32_t)&spiflash_config);
-
-    // Exit 4-byte address mode
-    uint8_t cmd = CMD_EXIT_4_BYTE_ADDRESS_MODE;
-    mp_hal_pin_write(MICROPY_HW_SPIFLASH_CS, 0);
-    spi_proto.transfer(MP_OBJ_FROM_PTR(&spi_bus), 1, &cmd, NULL);
-    mp_hal_pin_write(MICROPY_HW_SPIFLASH_CS, 1);
-
-    return ret;
-}
diff --git a/ports/stm32/boards/LEGO_HUB_NO6/mpconfigboard.h b/ports/stm32/boards/LEGO_HUB_NO6/mpconfigboard.h
index 2cfb420ef8da1..4ee5207a63b03 100644
--- a/ports/stm32/boards/LEGO_HUB_NO6/mpconfigboard.h
+++ b/ports/stm32/boards/LEGO_HUB_NO6/mpconfigboard.h
@@ -78,6 +78,10 @@
 #define MICROPY_HW_BLE_UART_BAUDRATE_SECONDARY   (921600)
 #define MICROPY_HW_BLE_BTSTACK_CHIPSET_INSTANCE  btstack_chipset_cc256x_instance()
 
+// External SPI flash starts in 32-bit addressing mode, so make all SPI flash
+// transfers use the explicit 32-bit addressing instructions.
+#define MICROPY_HW_SPI_ADDR_IS_32BIT(addr)       (1)
+
 // SPI flash, for R/W storage
 // The first 1MiB is skipped because it's used by the built-in bootloader
 // Note: MICROPY_HW_SPIFLASH_OFFSET_BYTES must be a multiple of MP_SPIFLASH_ERASE_BLOCK_SIZE
@@ -92,11 +96,9 @@
 #define MICROPY_HW_SPIFLASH_MOSI                 (MICROPY_HW_SPI2_MOSI)
 
 // SPI flash, block device config
-extern int32_t board_bdev_ioctl(void);
-extern struct _spi_bdev_t spi_bdev;
 #define MICROPY_HW_BDEV_IOCTL(op, arg) ( \
     (op) == BDEV_IOCTL_NUM_BLOCKS ? (MICROPY_HW_SPIFLASH_SIZE_BITS / 8 / FLASH_BLOCK_SIZE) : \
-    (op) == BDEV_IOCTL_INIT ? board_bdev_ioctl() : \
+    (op) == BDEV_IOCTL_INIT ? spi_bdev_ioctl(&spi_bdev, (op), (uint32_t)&spiflash_config) : \
     spi_bdev_ioctl(&spi_bdev, (op), (arg)) \
     )
 
@@ -134,6 +136,9 @@ extern struct _spi_bdev_t spi_bdev;
 /******************************************************************************/
 // Function declarations
 
+extern const struct _mp_spiflash_config_t spiflash_config;
+extern struct _spi_bdev_t spi_bdev;
+
 void board_init(void);
 void board_mboot_cleanup(int reset_mode);
 void board_mboot_led_init(void);

From fae92055949a6368f965d7f980803b7e158bd097 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 2 Jun 2022 13:29:30 +1000
Subject: [PATCH 2118/3533] stm32/boards/LEGO_HUB_NO6: Add support for mboot to
 access SPI flash.

The following changes are made:
- Use software SPI for external SPI flash access when building mboot.
- Enable the mboot filesystem-loading feature, with FAT FS support.
- Increase the frequency of the CPU when in mboot to 96MHz, to increase the
  speed of SPI flash accesses and programming.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/boards/LEGO_HUB_NO6/bdev.c        | 28 ++++++++++++++++++-
 .../stm32/boards/LEGO_HUB_NO6/mpconfigboard.h | 21 ++++++++++++++
 2 files changed, 48 insertions(+), 1 deletion(-)

diff --git a/ports/stm32/boards/LEGO_HUB_NO6/bdev.c b/ports/stm32/boards/LEGO_HUB_NO6/bdev.c
index 2f450dcb0f876..c90614a0289a0 100644
--- a/ports/stm32/boards/LEGO_HUB_NO6/bdev.c
+++ b/ports/stm32/boards/LEGO_HUB_NO6/bdev.c
@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2021 Damien P. George
+ * Copyright (c) 2021-2022 Damien P. George
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -28,6 +28,30 @@
 #include "storage.h"
 #include "spi.h"
 
+#if BUILDING_MBOOT
+
+// Mboot doesn't support hardware SPI, so use software SPI instead.
+
+STATIC const mp_soft_spi_obj_t soft_spi_bus = {
+    .delay_half = MICROPY_HW_SOFTSPI_MIN_DELAY,
+    .polarity = 0,
+    .phase = 0,
+    .sck = MICROPY_HW_SPIFLASH_SCK,
+    .mosi = MICROPY_HW_SPIFLASH_MOSI,
+    .miso = MICROPY_HW_SPIFLASH_MISO,
+};
+
+const mp_spiflash_config_t board_mboot_spiflash_config = {
+    .bus_kind = MP_SPIFLASH_BUS_SPI,
+    .bus.u_spi.cs = MICROPY_HW_SPIFLASH_CS,
+    .bus.u_spi.data = (void *)&soft_spi_bus,
+    .bus.u_spi.proto = &mp_soft_spi_proto,
+};
+
+mp_spiflash_t board_mboot_spiflash;
+
+#else
+
 STATIC const spi_proto_cfg_t spi_bus = {
     .spi = &spi_obj[1], // SPI2 hardware peripheral
     .baudrate = 25000000,
@@ -48,3 +72,5 @@ const mp_spiflash_config_t spiflash_config = {
 };
 
 spi_bdev_t spi_bdev;
+
+#endif
diff --git a/ports/stm32/boards/LEGO_HUB_NO6/mpconfigboard.h b/ports/stm32/boards/LEGO_HUB_NO6/mpconfigboard.h
index 4ee5207a63b03..c681b092cf919 100644
--- a/ports/stm32/boards/LEGO_HUB_NO6/mpconfigboard.h
+++ b/ports/stm32/boards/LEGO_HUB_NO6/mpconfigboard.h
@@ -123,8 +123,27 @@
 /******************************************************************************/
 // Bootloader configuration
 
+// Configure CPU frequency to 96MHz, to make updates from SPI flash faster
+#define MBOOT_CLK_PLLM                           (MICROPY_HW_CLK_VALUE / 1000000)
+#define MBOOT_CLK_PLLN                           (192)
+#define MBOOT_CLK_PLLP                           (RCC_PLLP_DIV2)
+#define MBOOT_CLK_PLLQ                           (4)
+#define MBOOT_CLK_AHB_DIV                        (RCC_SYSCLK_DIV1)
+#define MBOOT_CLK_APB1_DIV                       (RCC_HCLK_DIV4)
+#define MBOOT_CLK_APB2_DIV                       (RCC_HCLK_DIV2)
+#define MBOOT_FLASH_LATENCY                      FLASH_LATENCY_3
+
+#define MBOOT_FSLOAD                             (1)
+#define MBOOT_VFS_FAT                            (1)
 #define MBOOT_LEAVE_BOOTLOADER_VIA_RESET         (0)
 
+#define MBOOT_SPIFLASH_ADDR                      (0x80000000)
+#define MBOOT_SPIFLASH_BYTE_SIZE                 (32 * 1024 * 1024)
+#define MBOOT_SPIFLASH_LAYOUT                    "/0x80000000/8192*4Kg"
+#define MBOOT_SPIFLASH_ERASE_BLOCKS_PER_PAGE     (1)
+#define MBOOT_SPIFLASH_SPIFLASH                  (&board_mboot_spiflash)
+#define MBOOT_SPIFLASH_CONFIG                    (&board_mboot_spiflash_config)
+
 #define MBOOT_LED1                               0
 #define MBOOT_BOARD_LED_INIT                     board_mboot_led_init
 #define MBOOT_BOARD_LED_STATE                    board_mboot_led_state
@@ -138,6 +157,8 @@
 
 extern const struct _mp_spiflash_config_t spiflash_config;
 extern struct _spi_bdev_t spi_bdev;
+extern const struct _mp_spiflash_config_t board_mboot_spiflash_config;
+extern struct _mp_spiflash_t board_mboot_spiflash;
 
 void board_init(void);
 void board_mboot_cleanup(int reset_mode);

From d84ebc31f7f00edb47dd417dff6adfd47a880c1e Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 2 Jun 2022 13:32:10 +1000
Subject: [PATCH 2119/3533] stm32/boards/LEGO_HUB_NO6: Use multi-colour LED for
 mboot status.

This gives more information to the user when doing updates from SPI flash.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/boards/LEGO_HUB_NO6/board_init.c    | 8 ++++----
 ports/stm32/boards/LEGO_HUB_NO6/mpconfigboard.h | 2 ++
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/ports/stm32/boards/LEGO_HUB_NO6/board_init.c b/ports/stm32/boards/LEGO_HUB_NO6/board_init.c
index 0e5bc7118cb1e..8b2c0ce1ba4b5 100644
--- a/ports/stm32/boards/LEGO_HUB_NO6/board_init.c
+++ b/ports/stm32/boards/LEGO_HUB_NO6/board_init.c
@@ -124,11 +124,11 @@ void board_mboot_led_init(void) {
 
 void board_mboot_led_state(int led, int state) {
     if (state) {
-        hub_display_set(28, 0x7fff);
-        hub_display_set(31, 0x7fff);
+        hub_display_set(28 + led, 0x7fff);
+        hub_display_set(31 + led, 0x7fff);
     } else {
-        hub_display_set(28, 0);
-        hub_display_set(31, 0);
+        hub_display_set(28 + led, 0);
+        hub_display_set(31 + led, 0);
     }
     hub_display_update();
 }
diff --git a/ports/stm32/boards/LEGO_HUB_NO6/mpconfigboard.h b/ports/stm32/boards/LEGO_HUB_NO6/mpconfigboard.h
index c681b092cf919..8aa9da951b0e9 100644
--- a/ports/stm32/boards/LEGO_HUB_NO6/mpconfigboard.h
+++ b/ports/stm32/boards/LEGO_HUB_NO6/mpconfigboard.h
@@ -145,6 +145,8 @@
 #define MBOOT_SPIFLASH_CONFIG                    (&board_mboot_spiflash_config)
 
 #define MBOOT_LED1                               0
+#define MBOOT_LED2                               1
+#define MBOOT_LED3                               2
 #define MBOOT_BOARD_LED_INIT                     board_mboot_led_init
 #define MBOOT_BOARD_LED_STATE                    board_mboot_led_state
 

From 87ca431f3fa3fc87094526e33b77c50d6f968100 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 2 Jun 2022 13:43:46 +1000
Subject: [PATCH 2120/3533] stm32/boards/LEGO_HUB_NO6: Implement robust
 filesystem-load updates.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/boards/LEGO_HUB_NO6/board_init.c  | 38 ++++++++++++++++++-
 .../stm32/boards/LEGO_HUB_NO6/mpconfigboard.h |  2 +
 2 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/ports/stm32/boards/LEGO_HUB_NO6/board_init.c b/ports/stm32/boards/LEGO_HUB_NO6/board_init.c
index 8b2c0ce1ba4b5..37a80bc91f17f 100644
--- a/ports/stm32/boards/LEGO_HUB_NO6/board_init.c
+++ b/ports/stm32/boards/LEGO_HUB_NO6/board_init.c
@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2021 Damien P. George
+ * Copyright (c) 2021-2022 Damien P. George
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -75,6 +75,7 @@ void board_init(void) {
 
 #if BUILDING_MBOOT
 
+#include "drivers/memory/spiflash.h"
 #include "mboot/mboot.h"
 #include "boardctrl.h"
 #include "adc.h"
@@ -88,6 +89,14 @@ void board_init(void) {
 #define PATTERN_N (0x01296ad2)
 #define PATTERN_S (0x0064104c)
 
+// Location and value for the SPI flash update key.  If this key exists at the defined
+// location then mboot will attempt to do a filesystem-load update of the main firmware.
+// This makes the update robust to power failures: if the update does not complete then
+// it will be restarted the next time it powers up.  Only when it fully completes will
+// this key be erased, and then the application can run.
+#define SPIFLASH_UPDATE_KEY_ADDR (1020 * 1024)
+#define SPIFLASH_UPDATE_KEY_VALUE (0x12345678)
+
 static void board_led_pattern(int reset_mode, uint16_t brightness) {
     static const uint32_t pixels[] = {
         0,
@@ -162,9 +171,36 @@ int board_mboot_get_reset_mode(uint32_t *initial_r0) {
             mp_hal_delay_ms(50);
         }
         mp_hal_delay_ms(300);
+    } else {
+        // Button not pressed, check flash for update key and start an update if the key exists.
+
+        // Initialise the external SPI flash.
+        MBOOT_SPIFLASH_SPIFLASH->config = MBOOT_SPIFLASH_CONFIG;
+        mp_spiflash_init(MBOOT_SPIFLASH_SPIFLASH);
+
+        // Read in the key.
+        uint32_t buf;
+        mp_spiflash_read(MBOOT_SPIFLASH_SPIFLASH, SPIFLASH_UPDATE_KEY_ADDR, 4, (uint8_t *)&buf);
+
+        if (buf == SPIFLASH_UPDATE_KEY_VALUE) {
+            // The key has the correct value, so read in the FS-load elements and enter the bootloader.
+            mp_spiflash_read(MBOOT_SPIFLASH_SPIFLASH, SPIFLASH_UPDATE_KEY_ADDR + 4, ELEM_DATA_SIZE, ELEM_DATA_START);
+            *initial_r0 = MBOOT_INITIAL_R0_KEY_FSLOAD;
+            reset_mode = BOARDCTRL_RESET_MODE_BOOTLOADER;
+        }
     }
     board_led_pattern(0, 0);
     return reset_mode;
 }
 
+void board_mboot_state_change(int state, uint32_t arg) {
+    if (state == MBOOT_STATE_FSLOAD_END) {
+        // The FS-load update completed (either with success or failure), so erase the
+        // update key and write the result of the FS-load operation into flash.
+        mp_spiflash_erase_block(MBOOT_SPIFLASH_SPIFLASH, SPIFLASH_UPDATE_KEY_ADDR);
+        mp_spiflash_write(MBOOT_SPIFLASH_SPIFLASH, SPIFLASH_UPDATE_KEY_ADDR + 4, 4, (const uint8_t *)&arg);
+    }
+    mboot_state_change_default(state, arg);
+}
+
 #endif
diff --git a/ports/stm32/boards/LEGO_HUB_NO6/mpconfigboard.h b/ports/stm32/boards/LEGO_HUB_NO6/mpconfigboard.h
index 8aa9da951b0e9..cab46fa02d57c 100644
--- a/ports/stm32/boards/LEGO_HUB_NO6/mpconfigboard.h
+++ b/ports/stm32/boards/LEGO_HUB_NO6/mpconfigboard.h
@@ -153,6 +153,7 @@
 #define MBOOT_BOARD_EARLY_INIT(initial_r0)       board_init()
 #define MBOOT_BOARD_CLEANUP                      board_mboot_cleanup
 #define MBOOT_BOARD_GET_RESET_MODE               board_mboot_get_reset_mode
+#define MBOOT_BOARD_STATE_CHANGE                 board_mboot_state_change
 
 /******************************************************************************/
 // Function declarations
@@ -167,4 +168,5 @@ void board_mboot_cleanup(int reset_mode);
 void board_mboot_led_init(void);
 void board_mboot_led_state(int led, int state);
 int board_mboot_get_reset_mode(uint32_t *initial_r0);
+void board_mboot_state_change(int state, uint32_t arg);
 void *btstack_chipset_cc256x_instance(void);

From 340872cfdd724b7acc6768a22d90a84834b0e7b5 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 2 Jun 2022 14:09:08 +1000
Subject: [PATCH 2121/3533] stm32/boards/LEGO_HUB_NO6: Add helper scripts to
 update app firmware.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/boards/LEGO_HUB_NO6/README.md     | 29 ++++++++
 ports/stm32/boards/LEGO_HUB_NO6/appupdate.py  | 37 ++++++++++
 ports/stm32/boards/LEGO_HUB_NO6/manifest.py   |  5 ++
 .../boards/LEGO_HUB_NO6/mpconfigboard.mk      |  3 +
 ports/stm32/boards/LEGO_HUB_NO6/spiflash.py   | 74 +++++++++++++++++++
 5 files changed, 148 insertions(+)
 create mode 100644 ports/stm32/boards/LEGO_HUB_NO6/appupdate.py
 create mode 100644 ports/stm32/boards/LEGO_HUB_NO6/manifest.py
 create mode 100644 ports/stm32/boards/LEGO_HUB_NO6/spiflash.py

diff --git a/ports/stm32/boards/LEGO_HUB_NO6/README.md b/ports/stm32/boards/LEGO_HUB_NO6/README.md
index 0b88cd837bf70..7d5f2a416c5b2 100644
--- a/ports/stm32/boards/LEGO_HUB_NO6/README.md
+++ b/ports/stm32/boards/LEGO_HUB_NO6/README.md
@@ -97,3 +97,32 @@ To scan for BLE devices:
     >>> ble.gap_scan(2000, 625, 625)
 
 Use help("modules") to see available built-in modules.
+
+Updating MicroPython from the Hub's filesystem
+----------------------------------------------
+
+You can update the MicroPython application firmware using the instructions above
+for installing the firmware for the first time.  The Hub also supports updating
+the application firmware from within MicroPython itself, using the on-board
+filesystem.
+
+To use this feature, build the firmware (see above for details) then gzip it and
+copy the resulting file to the Hub (eg using mpremote):
+
+    $ make BOARD=LEGO_HUB_NO6
+    $ gzip boards/LEGO_HUB_NO6/firmware.dfu
+    $ mpremote cp boards/LEGO_HUB_NO6/firmware.dfu.gz :
+
+Then get a REPL on the Hub and execute:
+
+    >>> import appupdate
+    >>> appupdate.update_app("firmware.dfu.gz")
+
+You can alternatively run this REPL command using mpremote:
+
+    $ mpremote exec --no-follow "import appupdate; appupdate.update_app('firmware.dfu.gz')"
+
+At that point the Hub should restart and the LED on the central button will flash
+different colours.  Once the update is complete the LED will stop flashing and the
+Hub will appear again as a USB device.  The application firmware is now updated
+and you can remove the firmware.dfu.gz file if desired.
diff --git a/ports/stm32/boards/LEGO_HUB_NO6/appupdate.py b/ports/stm32/boards/LEGO_HUB_NO6/appupdate.py
new file mode 100644
index 0000000000000..65954454a5821
--- /dev/null
+++ b/ports/stm32/boards/LEGO_HUB_NO6/appupdate.py
@@ -0,0 +1,37 @@
+# Application firmware update funcion for LEGO_HUB_NO6.
+# MIT license; Copyright (c) 2022 Damien P. George
+
+from micropython import const
+import struct, machine, fwupdate, spiflash
+
+_SPIFLASH_UPDATE_KEY_ADDR = const(1020 * 1024)
+_SPIFLASH_UPDATE_KEY_VALUE = const(0x12345678)
+
+_FILESYSTEM_ADDR = const(0x8000_0000 + 1024 * 1024)
+_FILESYSTEM_LEN = const(31 * 1024 * 1024)
+
+
+def update_app(filename):
+    print(f"Updating application firmware from {filename}")
+
+    # Create the elements for the mboot filesystem-load operation.
+    elems = fwupdate.update_app_elements(filename, _FILESYSTEM_ADDR, _FILESYSTEM_LEN)
+    if not elems:
+        return
+
+    # Create the update key.
+    key = struct.pack("<I", _SPIFLASH_UPDATE_KEY_VALUE)
+
+    # Create a SPI flash object.
+    spi = machine.SoftSPI(sck="B13", mosi="C3", miso="C2", baudrate=50_000_000)
+    cs = machine.Pin("B12", machine.Pin.OUT, value=1)
+    flash = spiflash.SPIFlash(spi, cs)
+
+    # Write the update key and elements to the SPI flash.
+    flash.erase_block(_SPIFLASH_UPDATE_KEY_ADDR)
+    flash.write(_SPIFLASH_UPDATE_KEY_ADDR, key + elems)
+
+    # Enter mboot with a request to do a filesystem-load update.
+    # If there is a power failure during the update (eg battery removed) then
+    # mboot will read the SPI flash update key and elements and retry.
+    machine.bootloader(elems)
diff --git a/ports/stm32/boards/LEGO_HUB_NO6/manifest.py b/ports/stm32/boards/LEGO_HUB_NO6/manifest.py
new file mode 100644
index 0000000000000..dc09d04c9f2bf
--- /dev/null
+++ b/ports/stm32/boards/LEGO_HUB_NO6/manifest.py
@@ -0,0 +1,5 @@
+include("$(PORT_DIR)/boards/manifest.py")
+
+# Modules for application firmware update.
+freeze("$(PORT_DIR)/mboot", "fwupdate.py", opt=3)
+freeze("$(BOARD_DIR)", ("spiflash.py", "appupdate.py"), opt=3)
diff --git a/ports/stm32/boards/LEGO_HUB_NO6/mpconfigboard.mk b/ports/stm32/boards/LEGO_HUB_NO6/mpconfigboard.mk
index 8f8695a9cff11..e80a213e862ea 100644
--- a/ports/stm32/boards/LEGO_HUB_NO6/mpconfigboard.mk
+++ b/ports/stm32/boards/LEGO_HUB_NO6/mpconfigboard.mk
@@ -13,6 +13,9 @@ MICROPY_BLUETOOTH_NIMBLE ?= 0
 MICROPY_BLUETOOTH_BTSTACK ?= 1
 MICROPY_VFS_LFS2 ?= 1
 
+# Board specific frozen modules
+FROZEN_MANIFEST ?= $(BOARD_DIR)/manifest.py
+
 ifneq ($(BUILDING_MBOOT),1)
 LIB_SRC_C += lib/btstack/chipset/cc256x/btstack_chipset_cc256x.c
 endif
diff --git a/ports/stm32/boards/LEGO_HUB_NO6/spiflash.py b/ports/stm32/boards/LEGO_HUB_NO6/spiflash.py
new file mode 100644
index 0000000000000..e052f7738b70b
--- /dev/null
+++ b/ports/stm32/boards/LEGO_HUB_NO6/spiflash.py
@@ -0,0 +1,74 @@
+# MicroPython driver for SPI flash
+# MIT license; Copyright (c) 2022 Damien P. George
+
+from micropython import const
+
+_PAGE_SIZE = const(256)  # maximum bytes writable in one SPI transfer
+_CMD_RDSR = const(0x05)
+_CMD_WREN = const(0x06)
+_CMD_WRITE_32 = const(0x12)
+_CMD_READ_32 = const(0x13)
+_CMD_SEC_ERASE_32 = const(0x21)
+_CMD_C4READ_32 = const(0xEC)
+
+
+class SPIFlash:
+    def __init__(self, spi, cs):
+        self.spi = spi
+        self.cs = cs
+
+    def _wait_wel1(self):
+        # wait WEL=1
+        self.cs(0)
+        self.spi.write(bytearray([_CMD_RDSR]))
+        buf = bytearray(1)
+        while True:
+            self.spi.readinto(buf)
+            if buf[0] & 2:
+                break
+        self.cs(1)
+
+    def _wait_wip0(self):
+        # wait WIP=0
+        self.cs(0)
+        self.spi.write(bytearray([_CMD_RDSR]))
+        buf = bytearray(1)
+        while True:
+            self.spi.readinto(buf)
+            if not (buf[0] & 1):
+                break
+        self.cs(1)
+
+    def _flash_modify(self, cmd, addr, buf):
+        self.cs(0)
+        self.spi.write(bytearray([_CMD_WREN]))
+        self.cs(1)
+        self._wait_wel1()
+        self.cs(0)
+        self.spi.write(bytearray([cmd, addr >> 24, addr >> 16, addr >> 8, addr]))
+        if buf:
+            self.spi.write(buf)
+        self.cs(1)
+        self._wait_wip0()
+
+    def erase_block(self, addr):
+        self._flash_modify(_CMD_SEC_ERASE_32, addr, None)
+
+    def readinto(self, addr, buf):
+        self.cs(0)
+        self.spi.write(bytearray([_CMD_READ_32, addr >> 16, addr >> 8, addr]))
+        self.spi.readinto(buf)
+        self.cs(1)
+
+    def write(self, addr, buf):
+        offset = addr & (_PAGE_SIZE - 1)
+        remain = len(buf)
+        buf = memoryview(buf)
+        buf_offset = 0
+        while remain:
+            l = min(_PAGE_SIZE - offset, remain)
+            self._flash_modify(_CMD_WRITE_32, addr, buf[buf_offset : buf_offset + l])
+            remain -= l
+            addr += l
+            buf_offset += l
+            offset = 0

From 47f634300c5572571816817f16836113c98814ae Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 31 May 2022 17:10:14 +1000
Subject: [PATCH 2122/3533] py: Change makemoduledefs process so it uses output
 of qstr extraction.

This cleans up the parsing of MP_REGISTER_MODULE() and generation of
genhdr/moduledefs.h so that it uses the same process as compressed error
string messages, using the output of qstr extraction.

This makes sure all MP_REGISTER_MODULE()'s that are part of the build are
correctly picked up.  Previously the extraction would miss some (eg if you
had a mod.c file in the board directory for an stm32 board).

Build speed is more or less unchanged.

Thanks to @stinos for the ports/windows/msvc/genhdr.targets changes.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/cc3200/bootmgr/bootloader.mk |  4 +++
 ports/windows/msvc/genhdr.targets  | 15 ++++-----
 py/makemoduledefs.py               | 49 +++++-------------------------
 py/makeqstrdefs.py                 | 11 +++++--
 py/mkrules.cmake                   | 41 ++++++++++++++++++-------
 py/mkrules.mk                      | 15 ++++++++-
 py/obj.h                           |  2 ++
 py/objmodule.c                     |  6 ++--
 py/py.mk                           |  4 +--
 9 files changed, 81 insertions(+), 66 deletions(-)

diff --git a/ports/cc3200/bootmgr/bootloader.mk b/ports/cc3200/bootmgr/bootloader.mk
index 1dc2f8286057d..e5b817391d2fc 100644
--- a/ports/cc3200/bootmgr/bootloader.mk
+++ b/ports/cc3200/bootmgr/bootloader.mk
@@ -130,3 +130,7 @@ $(HEADER_BUILD)/qstrdefs.generated.h: | $(HEADER_BUILD)
 # Create an empty "mpversion.h" needed by py/mkrules.mk
 $(HEADER_BUILD)/mpversion.h: | $(HEADER_BUILD)
 	touch $@
+
+# Create an empty "moduledefs.h" needed by py/mkrules.mk
+$(HEADER_BUILD)/moduledefs.h: | $(HEADER_BUILD)
+	touch $@
diff --git a/ports/windows/msvc/genhdr.targets b/ports/windows/msvc/genhdr.targets
index b53894f21dbbf..84520078f09fd 100644
--- a/ports/windows/msvc/genhdr.targets
+++ b/ports/windows/msvc/genhdr.targets
@@ -14,6 +14,7 @@
     <PyQstrDefs>$(PySrcDir)qstrdefs.h</PyQstrDefs>
     <QstrDefsCollected>$(DestDir)qstrdefscollected.h</QstrDefsCollected>
     <QstrGen>$(DestDir)qstrdefs.generated.h</QstrGen>
+    <ModuleDefsCollected>$(DestDir)/moduledefs.collected</ModuleDefsCollected>
     <PyPython Condition="'$(PyPython)' == ''">$(MICROPY_CPYTHON3)</PyPython>
     <PyPython Condition="'$(PyPython)' == ''">python</PyPython>
     <CLToolExe Condition="'$(CLToolExe)' == ''">cl.exe</CLToolExe>
@@ -99,17 +100,17 @@ using(var outFile = System.IO.File.CreateText(OutputFile)) {
     <Exec Command="$(PyPython) $(PySrcDir)makeqstrdefs.py cat qstr _ $(DestDir)qstr $(QstrDefsCollected)"/>
   </Target>
 
-  <Target Name="MakeModuleDefs" DependsOnTargets="MakeDestDir">
+  <Target Name="CollectModuleDefs" DependsOnTargets="MakeQstrDefs" Inputs="$(DestDir)qstr.i.last" Outputs="$(ModuleDefsCollected)">
+    <Exec Command="$(PyPython) $(PySrcDir)makeqstrdefs.py split module $(DestDir)qstr.i.last $(DestDir)module _"/>
+    <Exec Command="$(PyPython) $(PySrcDir)makeqstrdefs.py cat module _ $(DestDir)module $(ModuleDefsCollected)"/>
+  </Target>
+
+  <Target Name="MakeModuleDefs" DependsOnTargets="CollectModuleDefs" Inputs="$(ModuleDefsCollected)" Outputs="$(DestDir)moduledefs.h">
     <PropertyGroup>
       <DestFile>$(DestDir)moduledefs.h</DestFile>
       <TmpFile>$(DestFile).tmp</TmpFile>
     </PropertyGroup>
-    <ItemGroup>
-      <PyUserModuleFiles Include="@(ClCompile)">
-        <Path>$([System.String]::new('%(FullPath)').Replace('$(PyBaseDir)', ''))</Path>
-      </PyUserModuleFiles>
-    </ItemGroup>
-    <Exec Command="$(PyPython) $(PySrcDir)makemoduledefs.py --vpath=&quot;., $(PyBaseDir), $(PyUserCModules)&quot; @(PyUserModuleFiles->'%(Path)', ' ') > $(TmpFile)"/>
+    <Exec Command="$(PyPython) $(PySrcDir)makemoduledefs.py $(ModuleDefsCollected) > $(TmpFile)"/>
     <MSBuild Projects="$(MSBuildThisFileFullPath)" Targets="CopyFileIfDifferent" Properties="SourceFile=$(TmpFile);DestFile=$(DestFile)"/>
   </Target>
 
diff --git a/py/makemoduledefs.py b/py/makemoduledefs.py
index 521245bdc6f95..8d045c0d029c5 100644
--- a/py/makemoduledefs.py
+++ b/py/makemoduledefs.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-# This pre-processor parses provided objects' c files for
+# This pre-processor parses a single file containing a list of
 # MP_REGISTER_MODULE(module_name, obj_module, enabled_define)
 # These are used to generate a header with the required entries for
 # "mp_rom_map_elem_t mp_builtin_module_table[]" in py/objmodule.c
@@ -9,45 +9,21 @@
 
 import re
 import io
-import os
 import argparse
 
 
-pattern = re.compile(r"[\n;]\s*MP_REGISTER_MODULE\((.*?),\s*(.*?),\s*(.*?)\);", flags=re.DOTALL)
+pattern = re.compile(r"\s*MP_REGISTER_MODULE\((.*?),\s*(.*?),\s*(.*?)\);", flags=re.DOTALL)
 
 
-def find_c_file(obj_file, vpath):
-    """Search vpaths for the c file that matches the provided object_file.
+def find_module_registrations(filename):
+    """Find any MP_REGISTER_MODULE definitions in the provided file.
 
-    :param str obj_file: object file to find the matching c file for
-    :param List[str] vpath: List of base paths, similar to gcc vpath
-    :return: str path to c file or None
-    """
-    c_file = None
-    relative_c_file = os.path.splitext(obj_file)[0] + ".c"
-    relative_c_file = relative_c_file.lstrip("/\\")
-    for p in vpath:
-        possible_c_file = os.path.join(p, relative_c_file)
-        if os.path.exists(possible_c_file):
-            c_file = possible_c_file
-            break
-
-    return c_file
-
-
-def find_module_registrations(c_file):
-    """Find any MP_REGISTER_MODULE definitions in the provided c file.
-
-    :param str c_file: path to c file to check
+    :param str filename: path to file to check
     :return: List[(module_name, obj_module, enabled_define)]
     """
     global pattern
 
-    if c_file is None:
-        # No c file to match the object file, skip
-        return set()
-
-    with io.open(c_file, encoding="utf-8") as c_file_obj:
+    with io.open(filename, encoding="utf-8") as c_file_obj:
         return set(re.findall(pattern, c_file_obj.read()))
 
 
@@ -93,19 +69,10 @@ def generate_module_table_header(modules):
 
 def main():
     parser = argparse.ArgumentParser()
-    parser.add_argument(
-        "--vpath", default=".", help="comma separated list of folders to search for c files in"
-    )
-    parser.add_argument("files", nargs="*", help="list of c files to search")
+    parser.add_argument("file", nargs=1, help="file with MP_REGISTER_MODULE definitions")
     args = parser.parse_args()
 
-    vpath = [p.strip() for p in args.vpath.split(",")]
-
-    modules = set()
-    for obj_file in args.files:
-        c_file = find_c_file(obj_file, vpath)
-        modules |= find_module_registrations(c_file)
-
+    modules = find_module_registrations(args.file[0])
     generate_module_table_header(sorted(modules))
 
 
diff --git a/py/makeqstrdefs.py b/py/makeqstrdefs.py
index 1a63bd39a942a..85e04b94492ac 100644
--- a/py/makeqstrdefs.py
+++ b/py/makeqstrdefs.py
@@ -21,6 +21,9 @@
 # Extract MP_COMPRESSED_ROM_TEXT("") macros.  (Which come from MP_ERROR_TEXT)
 _MODE_COMPRESS = "compress"
 
+# Extract MP_REGISTER_MODULE(...) macros.
+_MODE_MODULE = "module"
+
 
 def is_c_source(fname):
     return os.path.splitext(fname)[1] in [".c"]
@@ -85,6 +88,8 @@ def process_file(f):
         re_match = re.compile(r"MP_QSTR_[_a-zA-Z0-9]+")
     elif args.mode == _MODE_COMPRESS:
         re_match = re.compile(r'MP_COMPRESSED_ROM_TEXT\("([^"]*)"\)')
+    elif args.mode == _MODE_MODULE:
+        re_match = re.compile(r"MP_REGISTER_MODULE\(.*?,\s*.*?,\s*.*?\);")
     output = []
     last_fname = None
     for line in f:
@@ -106,7 +111,7 @@ def process_file(f):
             if args.mode == _MODE_QSTR:
                 name = match.replace("MP_QSTR_", "")
                 output.append("Q(" + name + ")")
-            elif args.mode == _MODE_COMPRESS:
+            elif args.mode in (_MODE_COMPRESS, _MODE_MODULE):
                 output.append(match)
 
     if last_fname:
@@ -141,6 +146,8 @@ def cat_together():
     mode_full = "QSTR"
     if args.mode == _MODE_COMPRESS:
         mode_full = "Compressed data"
+    elif args.mode == _MODE_MODULE:
+        mode_full = "Module registrations"
     if old_hash != new_hash:
         print(mode_full, "updated")
         try:
@@ -201,7 +208,7 @@ class Args:
     args.output_dir = sys.argv[4]
     args.output_file = None if len(sys.argv) == 5 else sys.argv[5]  # Unused for command=split
 
-    if args.mode not in (_MODE_QSTR, _MODE_COMPRESS):
+    if args.mode not in (_MODE_QSTR, _MODE_COMPRESS, _MODE_MODULE):
         print("error: mode %s unrecognised" % sys.argv[2])
         sys.exit(2)
 
diff --git a/py/mkrules.cmake b/py/mkrules.cmake
index cb5fdabf6b933..261e153690d90 100644
--- a/py/mkrules.cmake
+++ b/py/mkrules.cmake
@@ -2,13 +2,15 @@
 
 set(MICROPY_GENHDR_DIR "${CMAKE_BINARY_DIR}/genhdr")
 set(MICROPY_MPVERSION "${MICROPY_GENHDR_DIR}/mpversion.h")
-set(MICROPY_MODULEDEFS "${MICROPY_GENHDR_DIR}/moduledefs.h")
 set(MICROPY_QSTRDEFS_PY "${MICROPY_PY_DIR}/qstrdefs.h")
 set(MICROPY_QSTRDEFS_LAST "${MICROPY_GENHDR_DIR}/qstr.i.last")
 set(MICROPY_QSTRDEFS_SPLIT "${MICROPY_GENHDR_DIR}/qstr.split")
 set(MICROPY_QSTRDEFS_COLLECTED "${MICROPY_GENHDR_DIR}/qstrdefs.collected.h")
 set(MICROPY_QSTRDEFS_PREPROCESSED "${MICROPY_GENHDR_DIR}/qstrdefs.preprocessed.h")
 set(MICROPY_QSTRDEFS_GENERATED "${MICROPY_GENHDR_DIR}/qstrdefs.generated.h")
+set(MICROPY_MODULEDEFS_SPLIT "${MICROPY_GENHDR_DIR}/moduledefs.split")
+set(MICROPY_MODULEDEFS_COLLECTED "${MICROPY_GENHDR_DIR}/moduledefs.collected")
+set(MICROPY_MODULEDEFS "${MICROPY_GENHDR_DIR}/moduledefs.h")
 
 # Need to do this before extracting MICROPY_CPP_DEF below. Rest of frozen
 # manifest handling is at the end of this file.
@@ -43,6 +45,7 @@ find_package(Python3 REQUIRED COMPONENTS Interpreter)
 target_sources(${MICROPY_TARGET} PRIVATE
     ${MICROPY_MPVERSION}
     ${MICROPY_QSTRDEFS_GENERATED}
+    ${MICROPY_MODULEDEFS}
 )
 
 # Command to force the build of another command
@@ -62,15 +65,6 @@ add_custom_command(
     DEPENDS MICROPY_FORCE_BUILD
 )
 
-# Generate moduledefs.h
-
-add_custom_command(
-    OUTPUT ${MICROPY_MODULEDEFS}
-    COMMAND ${Python3_EXECUTABLE} ${MICROPY_PY_DIR}/makemoduledefs.py --vpath="/" ${MICROPY_SOURCE_QSTR} > ${MICROPY_MODULEDEFS}
-    DEPENDS ${MICROPY_MPVERSION}
-        ${MICROPY_SOURCE_QSTR}
-)
-
 # Generate qstrs
 
 # If any of the dependencies in this rule change then the C-preprocessor step must be run.
@@ -79,7 +73,7 @@ add_custom_command(
 add_custom_command(
     OUTPUT ${MICROPY_QSTRDEFS_LAST}
     COMMAND ${Python3_EXECUTABLE} ${MICROPY_PY_DIR}/makeqstrdefs.py pp ${CMAKE_C_COMPILER} -E output ${MICROPY_GENHDR_DIR}/qstr.i.last cflags ${MICROPY_CPP_FLAGS} -DNO_QSTR cxxflags ${MICROPY_CPP_FLAGS} -DNO_QSTR sources ${MICROPY_SOURCE_QSTR}
-    DEPENDS ${MICROPY_MODULEDEFS}
+    DEPENDS ${MICROPY_MPVERSION}
         ${MICROPY_SOURCE_QSTR}
     VERBATIM
     COMMAND_EXPAND_LISTS
@@ -120,6 +114,31 @@ add_custom_command(
     COMMAND_EXPAND_LISTS
 )
 
+# Generate moduledefs.h
+
+add_custom_command(
+    OUTPUT ${MICROPY_MODULEDEFS_SPLIT}
+    COMMAND ${Python3_EXECUTABLE} ${MICROPY_PY_DIR}/makeqstrdefs.py split module ${MICROPY_GENHDR_DIR}/qstr.i.last ${MICROPY_GENHDR_DIR}/module _
+    COMMAND touch ${MICROPY_MODULEDEFS_SPLIT}
+    DEPENDS ${MICROPY_QSTRDEFS_LAST}
+    VERBATIM
+    COMMAND_EXPAND_LISTS
+)
+
+add_custom_command(
+    OUTPUT ${MICROPY_MODULEDEFS_COLLECTED}
+    COMMAND ${Python3_EXECUTABLE} ${MICROPY_PY_DIR}/makeqstrdefs.py cat module _ ${MICROPY_GENHDR_DIR}/module ${MICROPY_MODULEDEFS_COLLECTED}
+    DEPENDS ${MICROPY_MODULEDEFS_SPLIT}
+    VERBATIM
+    COMMAND_EXPAND_LISTS
+)
+
+add_custom_command(
+    OUTPUT ${MICROPY_MODULEDEFS}
+    COMMAND ${Python3_EXECUTABLE} ${MICROPY_PY_DIR}/makemoduledefs.py ${MICROPY_MODULEDEFS_COLLECTED} > ${MICROPY_MODULEDEFS}
+    DEPENDS ${MICROPY_MODULEDEFS_COLLECTED}
+)
+
 # Build frozen code if enabled
 
 if(MICROPY_FROZEN_MANIFEST)
diff --git a/py/mkrules.mk b/py/mkrules.mk
index 963d70c2c38b4..fa1aad881bae9 100644
--- a/py/mkrules.mk
+++ b/py/mkrules.mk
@@ -7,6 +7,9 @@ endif
 # Extra deps that need to happen before object compilation.
 OBJ_EXTRA_ORDER_DEPS =
 
+# Generate moduledefs.h.
+OBJ_EXTRA_ORDER_DEPS += $(HEADER_BUILD)/moduledefs.h
+
 ifeq ($(MICROPY_ROM_TEXT_COMPRESSION),1)
 # If compression is enabled, trigger the build of compressed.data.h...
 OBJ_EXTRA_ORDER_DEPS += $(HEADER_BUILD)/compressed.data.h
@@ -100,7 +103,7 @@ $(OBJ): | $(HEADER_BUILD)/qstrdefs.generated.h $(HEADER_BUILD)/mpversion.h $(OBJ
 # - else, if list of newer prerequisites ($?) is not empty, then process just these ($?)
 # - else, process all source files ($^) [this covers "make -B" which can set $? to empty]
 # See more information about this process in docs/develop/qstr.rst.
-$(HEADER_BUILD)/qstr.i.last: $(SRC_QSTR) $(QSTR_GLOBAL_DEPENDENCIES) $(HEADER_BUILD)/moduledefs.h | $(QSTR_GLOBAL_REQUIREMENTS)
+$(HEADER_BUILD)/qstr.i.last: $(SRC_QSTR) $(QSTR_GLOBAL_DEPENDENCIES) | $(QSTR_GLOBAL_REQUIREMENTS)
 	$(ECHO) "GEN $@"
 	$(Q)$(PYTHON) $(PY_SRC)/makeqstrdefs.py pp $(CPP) output $(HEADER_BUILD)/qstr.i.last cflags $(QSTR_GEN_CFLAGS) cxxflags $(QSTR_GEN_CXXFLAGS) sources $^ dependencies $(QSTR_GLOBAL_DEPENDENCIES) changed_sources $?
 
@@ -113,6 +116,16 @@ $(QSTR_DEFS_COLLECTED): $(HEADER_BUILD)/qstr.split
 	$(ECHO) "GEN $@"
 	$(Q)$(PYTHON) $(PY_SRC)/makeqstrdefs.py cat qstr _ $(HEADER_BUILD)/qstr $@
 
+# Module definitions via MP_REGISTER_MODULE.
+$(HEADER_BUILD)/moduledefs.split: $(HEADER_BUILD)/qstr.i.last
+	$(ECHO) "GEN $@"
+	$(Q)$(PYTHON) $(PY_SRC)/makeqstrdefs.py split module $< $(HEADER_BUILD)/module _
+	$(Q)$(TOUCH) $@
+
+$(HEADER_BUILD)/moduledefs.collected: $(HEADER_BUILD)/moduledefs.split
+	$(ECHO) "GEN $@"
+	$(Q)$(PYTHON) $(PY_SRC)/makeqstrdefs.py cat module _ $(HEADER_BUILD)/module $@
+
 # Compressed error strings.
 $(HEADER_BUILD)/compressed.split: $(HEADER_BUILD)/qstr.i.last
 	$(ECHO) "GEN $@"
diff --git a/py/obj.h b/py/obj.h
index ead3ce86491aa..aa5ed179bdcf1 100644
--- a/py/obj.h
+++ b/py/obj.h
@@ -421,7 +421,9 @@ typedef struct _mp_rom_obj_t { mp_const_obj_t o; } mp_rom_obj_t;
 // param obj_module: mp_obj_module_t instance
 // prarm enabled_define: used as `#if (enabled_define) around entry`
 
+#ifndef NO_QSTR
 #define MP_REGISTER_MODULE(module_name, obj_module, enabled_define)
+#endif
 
 // Underlying map/hash table implementation (not dict object or map function)
 
diff --git a/py/objmodule.c b/py/objmodule.c
index 4f5ae89906a31..783d6b050868b 100644
--- a/py/objmodule.c
+++ b/py/objmodule.c
@@ -34,7 +34,11 @@
 #include "py/runtime.h"
 #include "py/builtin.h"
 
+#ifndef NO_QSTR
+// Only include module definitions when not doing qstr extraction, because the
+// qstr extraction stage also generates this module definition header file.
 #include "genhdr/moduledefs.h"
+#endif
 
 #if MICROPY_MODULE_BUILTIN_INIT
 STATIC void mp_module_call_init(mp_obj_t module_name, mp_obj_t module_obj);
@@ -161,10 +165,8 @@ mp_obj_t mp_obj_new_module(qstr module_name) {
 // Global module table and related functions
 
 STATIC const mp_rom_map_elem_t mp_builtin_module_table[] = {
-    #ifdef MICROPY_REGISTERED_MODULES
     // builtin modules declared with MP_REGISTER_MODULE()
     MICROPY_REGISTERED_MODULES
-    #endif
 };
 
 MP_DEFINE_CONST_MAP(mp_builtin_module_map, mp_builtin_module_table);
diff --git a/py/py.mk b/py/py.mk
index 518cd0a2256b4..57fdb6d9b5d4a 100644
--- a/py/py.mk
+++ b/py/py.mk
@@ -259,9 +259,9 @@ $(HEADER_BUILD)/compressed.data.h: $(HEADER_BUILD)/compressed.collected
 	$(Q)$(PYTHON) $(PY_SRC)/makecompresseddata.py $< > $@
 
 # build a list of registered modules for py/objmodule.c.
-$(HEADER_BUILD)/moduledefs.h: $(SRC_QSTR) $(QSTR_GLOBAL_DEPENDENCIES) | $(HEADER_BUILD)/mpversion.h
+$(HEADER_BUILD)/moduledefs.h: $(HEADER_BUILD)/moduledefs.collected
 	@$(ECHO) "GEN $@"
-	$(Q)$(PYTHON) $(PY_SRC)/makemoduledefs.py --vpath="., $(TOP), $(USER_C_MODULES)" $(SRC_QSTR) > $@
+	$(Q)$(PYTHON) $(PY_SRC)/makemoduledefs.py $< > $@
 
 # Standard C functions like memset need to be compiled with special flags so
 # the compiler does not optimise these functions in terms of themselves.

From efe23aca7154d21a9e8f283313c7a1ac29e05d86 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 31 May 2022 22:56:11 +1000
Subject: [PATCH 2123/3533] all: Remove third argument to MP_REGISTER_MODULE.

It's no longer needed because this macro is now processed after
preprocessing the source code via cpp (in the qstr extraction stage), which
means unused MP_REGISTER_MODULE's are filtered out by the preprocessor.

Signed-off-by: Damien George <damien@micropython.org>
---
 docs/develop/cmodules.rst                     | 12 ++++++----
 docs/develop/library.rst                      |  2 +-
 docs/develop/porting.rst                      |  7 +-----
 examples/usercmodule/cexample/examplemodule.c |  5 +---
 .../usercmodule/cppexample/examplemodule.c    |  5 +---
 extmod/modbluetooth.c                         |  2 +-
 extmod/modbtree.c                             |  2 +-
 extmod/modframebuf.c                          |  2 +-
 extmod/modlwip.c                              |  4 ++--
 extmod/modnetwork.c                           |  2 +-
 extmod/modonewire.c                           |  2 +-
 extmod/moduasyncio.c                          |  2 +-
 extmod/modubinascii.c                         |  2 +-
 extmod/moducryptolib.c                        |  2 +-
 extmod/moductypes.c                           |  2 +-
 extmod/moduhashlib.c                          |  2 +-
 extmod/moduheapq.c                            |  2 +-
 extmod/modujson.c                             |  2 +-
 extmod/moduos.c                               |  2 +-
 extmod/moduplatform.c                         |  2 +-
 extmod/modurandom.c                           |  2 +-
 extmod/modure.c                               |  2 +-
 extmod/moduselect.c                           |  2 +-
 extmod/modusocket.c                           |  2 +-
 extmod/modussl_axtls.c                        |  2 +-
 extmod/modussl_mbedtls.c                      |  2 +-
 extmod/modutimeq.c                            |  3 ++-
 extmod/moduwebsocket.c                        |  2 +-
 extmod/moduzlib.c                             |  2 +-
 extmod/modwebrepl.c                           |  2 +-
 ports/cc3200/mods/modmachine.c                |  2 +-
 ports/cc3200/mods/modnetwork.c                |  2 +-
 ports/cc3200/mods/moduos.c                    |  2 +-
 ports/cc3200/mods/modusocket.c                |  2 +-
 ports/cc3200/mods/modussl.c                   |  2 +-
 ports/cc3200/mods/modutime.c                  |  2 +-
 ports/cc3200/mods/modwipy.c                   |  2 +-
 ports/esp32/modesp.c                          |  2 +-
 ports/esp32/modesp32.c                        |  2 +-
 ports/esp32/modmachine.c                      |  2 +-
 ports/esp32/modnetwork.c                      |  2 +-
 ports/esp32/modsocket.c                       |  2 +-
 ports/esp32/modutime.c                        |  2 +-
 ports/esp8266/modesp.c                        |  2 +-
 ports/esp8266/modmachine.c                    |  2 +-
 ports/esp8266/modnetwork.c                    |  2 +-
 ports/esp8266/modutime.c                      |  2 +-
 ports/javascript/modutime.c                   |  2 +-
 ports/mimxrt/modmachine.c                     |  6 ++++-
 ports/mimxrt/modmimxrt.c                      |  2 +-
 ports/mimxrt/modutime.c                       |  2 +-
 .../nrf/boards/microbit/modules/modmicrobit.c |  2 +-
 ports/nrf/modules/ble/modble.c                |  2 +-
 ports/nrf/modules/board/modboard.c            |  2 +-
 ports/nrf/modules/machine/modmachine.c        |  6 ++++-
 ports/nrf/modules/music/modmusic.c            |  2 +-
 ports/nrf/modules/nrf/modnrf.c                |  2 +-
 ports/nrf/modules/ubluepy/modubluepy.c        |  2 +-
 ports/nrf/modules/uos/moduos.c                |  2 +-
 ports/nrf/modules/utime/modutime.c            |  2 +-
 ports/pic16bit/modpyb.c                       |  2 +-
 ports/qemu-arm/modmachine.c                   |  6 ++++-
 ports/renesas-ra/modmachine.c                 |  5 +++-
 ports/renesas-ra/modutime.c                   |  6 ++++-
 ports/rp2/modmachine.c                        |  6 ++++-
 ports/rp2/modrp2.c                            |  2 +-
 ports/rp2/modutime.c                          |  2 +-
 ports/samd/modmachine.c                       |  6 ++++-
 ports/samd/modsamd.c                          |  2 +-
 ports/samd/modutime.c                         |  2 +-
 ports/stm32/modmachine.c                      |  6 ++++-
 ports/stm32/modpyb.c                          |  6 ++++-
 ports/stm32/modstm.c                          |  2 +-
 ports/stm32/modutime.c                        |  6 ++++-
 ports/teensy/modpyb.c                         |  2 +-
 ports/unix/modffi.c                           |  6 ++++-
 ports/unix/modjni.c                           |  6 ++++-
 ports/unix/modmachine.c                       |  2 +-
 ports/unix/modtermios.c                       |  6 ++++-
 ports/unix/modtime.c                          |  2 +-
 ports/unix/moduselect.c                       |  2 +-
 ports/unix/modusocket.c                       |  6 ++++-
 ports/zephyr/modmachine.c                     |  2 +-
 ports/zephyr/modusocket.c                     |  2 +-
 ports/zephyr/modutime.c                       |  2 +-
 ports/zephyr/modzephyr.c                      |  2 +-
 ports/zephyr/modzsensor.c                     |  2 +-
 py/makemoduledefs.py                          | 23 +++++++------------
 py/makeqstrdefs.py                            |  2 +-
 py/modarray.c                                 |  2 +-
 py/modbuiltins.c                              |  2 +-
 py/modcmath.c                                 |  2 +-
 py/modcollections.c                           |  2 +-
 py/modgc.c                                    |  2 +-
 py/modio.c                                    |  2 +-
 py/modmath.c                                  |  2 +-
 py/modmicropython.c                           |  2 +-
 py/modstruct.c                                |  2 +-
 py/modsys.c                                   |  2 +-
 py/modthread.c                                |  2 +-
 py/moduerrno.c                                |  2 +-
 py/obj.h                                      |  3 +--
 py/runtime.c                                  |  2 +-
 103 files changed, 173 insertions(+), 134 deletions(-)

diff --git a/docs/develop/cmodules.rst b/docs/develop/cmodules.rst
index 38225e8686a7b..143057f7f1e06 100644
--- a/docs/develop/cmodules.rst
+++ b/docs/develop/cmodules.rst
@@ -221,23 +221,25 @@ as described above.
 If a module is not enabled by default then the corresponding C preprocessor macro
 must be enabled.  This macro name can be found by searching for the ``MP_REGISTER_MODULE``
 line in the module's source code (it usually appears at the end of the main source file).
-The third argument to ``MP_REGISTER_MODULE`` is the macro name, and this must be set
-to 1 using ``CFLAGS_EXTRA`` to make the module available.  If the third argument is just
-the number 1 then the module is enabled by default.
+This macro should be surrounded by a ``#if X`` / ``#endif`` pair, and the configuration
+option ``X`` must be set to 1 using ``CFLAGS_EXTRA`` to make the module available.  If
+there is no ``#if X`` / ``#endif`` pair then the module is enabled by default.
 
 For example, the ``examples/usercmodule/cexample`` module is enabled by default so
 has the following line in its source code:
 
   .. code-block:: c
 
-      MP_REGISTER_MODULE(MP_QSTR_cexample, example_user_cmodule, 1);
+      MP_REGISTER_MODULE(MP_QSTR_cexample, example_user_cmodule);
 
 Alternatively, to make this module disabled by default but selectable through
 a preprocessor configuration option, it would be:
 
   .. code-block:: c
 
-      MP_REGISTER_MODULE(MP_QSTR_cexample, example_user_cmodule, MODULE_CEXAMPLE_ENABLED);
+      #if MODULE_CEXAMPLE_ENABLED
+      MP_REGISTER_MODULE(MP_QSTR_cexample, example_user_cmodule);
+      #endif
 
 In this case the module is enabled by adding ``CFLAGS_EXTRA=-DMODULE_CEXAMPLE_ENABLED=1``
 to the ``make`` command, or editing ``mpconfigport.h`` or ``mpconfigboard.h`` to add
diff --git a/docs/develop/library.rst b/docs/develop/library.rst
index 47ea2dc8d2431..c2a86ea1699bc 100644
--- a/docs/develop/library.rst
+++ b/docs/develop/library.rst
@@ -64,7 +64,7 @@ hypothetical new module ``subsystem`` in the file ``modsubsystem.c``:
        .globals = (mp_obj_dict_t *)&mp_module_subsystem_globals,
    };
 
-   MP_REGISTER_MODULE(MP_QSTR_subsystem, mp_module_subsystem, MICROPY_PY_SUBSYSTEM);
+   MP_REGISTER_MODULE(MP_QSTR_subsystem, mp_module_subsystem);
 
    #endif
 
diff --git a/docs/develop/porting.rst b/docs/develop/porting.rst
index d08fd74e43156..bc25f47ed87ab 100644
--- a/docs/develop/porting.rst
+++ b/docs/develop/porting.rst
@@ -280,12 +280,7 @@ To add a custom module like ``myport``, first add the module definition in a fil
        .globals = (mp_obj_dict_t *)&myport_module_globals,
    };
 
-   MP_REGISTER_MODULE(MP_QSTR_myport, myport_module, 1);
-
-Note: the "1" as the third argument in ``MP_REGISTER_MODULE`` enables this new module
-unconditionally. To allow it to be conditionally enabled, replace the "1" by
-``MICROPY_PY_MYPORT`` and then add ``#define MICROPY_PY_MYPORT (1)`` in ``mpconfigport.h``
-accordingly.
+   MP_REGISTER_MODULE(MP_QSTR_myport, myport_module);
 
 You will also need to edit the Makefile to add ``modmyport.c`` to the ``SRC_C`` list, and
 a new line adding the same file to ``SRC_QSTR`` (so qstrs are searched for in this new file),
diff --git a/examples/usercmodule/cexample/examplemodule.c b/examples/usercmodule/cexample/examplemodule.c
index 49ebc7aaaf9d2..93a58be2ed280 100644
--- a/examples/usercmodule/cexample/examplemodule.c
+++ b/examples/usercmodule/cexample/examplemodule.c
@@ -31,7 +31,4 @@ const mp_obj_module_t example_user_cmodule = {
 };
 
 // Register the module to make it available in Python.
-// Note: the "1" in the third argument means this module is always enabled.
-// This "1" can be optionally replaced with a macro like MODULE_CEXAMPLE_ENABLED
-// which can then be used to conditionally enable this module.
-MP_REGISTER_MODULE(MP_QSTR_cexample, example_user_cmodule, 1);
+MP_REGISTER_MODULE(MP_QSTR_cexample, example_user_cmodule);
diff --git a/examples/usercmodule/cppexample/examplemodule.c b/examples/usercmodule/cppexample/examplemodule.c
index dfb7856837613..5c84eccd7996f 100644
--- a/examples/usercmodule/cppexample/examplemodule.c
+++ b/examples/usercmodule/cppexample/examplemodule.c
@@ -22,7 +22,4 @@ const mp_obj_module_t cppexample_user_cmodule = {
 };
 
 // Register the module to make it available in Python.
-// Note: the "1" in the third argument means this module is always enabled.
-// This "1" can be optionally replaced with a macro like MODULE_CPPEXAMPLE_ENABLED
-// which can then be used to conditionally enable this module.
-MP_REGISTER_MODULE(MP_QSTR_cppexample, cppexample_user_cmodule, 1);
+MP_REGISTER_MODULE(MP_QSTR_cppexample, cppexample_user_cmodule);
diff --git a/extmod/modbluetooth.c b/extmod/modbluetooth.c
index aecf48fd41ee9..6bdea1616f050 100644
--- a/extmod/modbluetooth.c
+++ b/extmod/modbluetooth.c
@@ -1004,7 +1004,7 @@ const mp_obj_module_t mp_module_ubluetooth = {
     .globals = (mp_obj_dict_t *)&mp_module_bluetooth_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_ubluetooth, mp_module_ubluetooth, MICROPY_PY_BLUETOOTH);
+MP_REGISTER_MODULE(MP_QSTR_ubluetooth, mp_module_ubluetooth);
 
 // Helpers
 
diff --git a/extmod/modbtree.c b/extmod/modbtree.c
index df33d765e07b7..60a5beec68147 100644
--- a/extmod/modbtree.c
+++ b/extmod/modbtree.c
@@ -380,7 +380,7 @@ const mp_obj_module_t mp_module_btree = {
     .globals = (mp_obj_dict_t *)&mp_module_btree_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_btree, mp_module_btree, MICROPY_PY_BTREE);
+MP_REGISTER_MODULE(MP_QSTR_btree, mp_module_btree);
 #endif
 
 #endif // MICROPY_PY_BTREE
diff --git a/extmod/modframebuf.c b/extmod/modframebuf.c
index 4dfdb7eea5625..5b6575d5a6503 100644
--- a/extmod/modframebuf.c
+++ b/extmod/modframebuf.c
@@ -668,7 +668,7 @@ const mp_obj_module_t mp_module_framebuf = {
     .globals = (mp_obj_dict_t *)&framebuf_module_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_framebuf, mp_module_framebuf, MICROPY_PY_FRAMEBUF);
+MP_REGISTER_MODULE(MP_QSTR_framebuf, mp_module_framebuf);
 #endif
 
 #endif // MICROPY_PY_FRAMEBUF
diff --git a/extmod/modlwip.c b/extmod/modlwip.c
index 47d5bcdbb9ea8..ec5f3bfd6394c 100644
--- a/extmod/modlwip.c
+++ b/extmod/modlwip.c
@@ -1778,9 +1778,9 @@ const mp_obj_module_t mp_module_lwip = {
     .globals = (mp_obj_dict_t *)&mp_module_lwip_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_lwip, mp_module_lwip, MICROPY_PY_LWIP);
+MP_REGISTER_MODULE(MP_QSTR_lwip, mp_module_lwip);
 
 // On LWIP-ports, this is the usocket module (replaces extmod/modusocket.c).
-MP_REGISTER_MODULE(MP_QSTR_usocket, mp_module_lwip, MICROPY_PY_LWIP);
+MP_REGISTER_MODULE(MP_QSTR_usocket, mp_module_lwip);
 
 #endif // MICROPY_PY_LWIP
diff --git a/extmod/modnetwork.c b/extmod/modnetwork.c
index f63f708a2b2a9..87e155e091543 100644
--- a/extmod/modnetwork.c
+++ b/extmod/modnetwork.c
@@ -102,7 +102,7 @@ const mp_obj_module_t mp_module_network = {
     .globals = (mp_obj_dict_t *)&mp_module_network_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_network, mp_module_network, MICROPY_PY_NETWORK);
+MP_REGISTER_MODULE(MP_QSTR_network, mp_module_network);
 
 /*******************************************************************************/
 // Implementations of network methods that can be used by any interface
diff --git a/extmod/modonewire.c b/extmod/modonewire.c
index 1cfddc830dead..f440f75a82ac8 100644
--- a/extmod/modonewire.c
+++ b/extmod/modonewire.c
@@ -163,6 +163,6 @@ const mp_obj_module_t mp_module_onewire = {
     .globals = (mp_obj_dict_t *)&onewire_module_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR__onewire, mp_module_onewire, MICROPY_PY_ONEWIRE);
+MP_REGISTER_MODULE(MP_QSTR__onewire, mp_module_onewire);
 
 #endif // MICROPY_PY_ONEWIRE
diff --git a/extmod/moduasyncio.c b/extmod/moduasyncio.c
index b09b8d67b08c8..6e3603fa18a47 100644
--- a/extmod/moduasyncio.c
+++ b/extmod/moduasyncio.c
@@ -310,6 +310,6 @@ const mp_obj_module_t mp_module_uasyncio = {
     .globals = (mp_obj_dict_t *)&mp_module_uasyncio_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR__uasyncio, mp_module_uasyncio, MICROPY_PY_UASYNCIO);
+MP_REGISTER_MODULE(MP_QSTR__uasyncio, mp_module_uasyncio);
 
 #endif // MICROPY_PY_UASYNCIO
diff --git a/extmod/modubinascii.c b/extmod/modubinascii.c
index a362a2d6eb9c8..c0e2c587fdd9d 100644
--- a/extmod/modubinascii.c
+++ b/extmod/modubinascii.c
@@ -258,6 +258,6 @@ const mp_obj_module_t mp_module_ubinascii = {
     .globals = (mp_obj_dict_t *)&mp_module_binascii_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_ubinascii, mp_module_ubinascii, MICROPY_PY_UBINASCII);
+MP_REGISTER_MODULE(MP_QSTR_ubinascii, mp_module_ubinascii);
 
 #endif // MICROPY_PY_UBINASCII
diff --git a/extmod/moducryptolib.c b/extmod/moducryptolib.c
index ba04a7bde3bcf..c58abaada67e0 100644
--- a/extmod/moducryptolib.c
+++ b/extmod/moducryptolib.c
@@ -374,6 +374,6 @@ const mp_obj_module_t mp_module_ucryptolib = {
     .globals = (mp_obj_dict_t *)&mp_module_ucryptolib_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_ucryptolib, mp_module_ucryptolib, MICROPY_PY_UCRYPTOLIB);
+MP_REGISTER_MODULE(MP_QSTR_ucryptolib, mp_module_ucryptolib);
 
 #endif // MICROPY_PY_UCRYPTOLIB
diff --git a/extmod/moductypes.c b/extmod/moductypes.c
index a6ebd92ebc406..547453c48e9fd 100644
--- a/extmod/moductypes.c
+++ b/extmod/moductypes.c
@@ -717,6 +717,6 @@ const mp_obj_module_t mp_module_uctypes = {
     .globals = (mp_obj_dict_t *)&mp_module_uctypes_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_uctypes, mp_module_uctypes, MICROPY_PY_UCTYPES);
+MP_REGISTER_MODULE(MP_QSTR_uctypes, mp_module_uctypes);
 
 #endif
diff --git a/extmod/moduhashlib.c b/extmod/moduhashlib.c
index ded9972ca24c7..39488788f2712 100644
--- a/extmod/moduhashlib.c
+++ b/extmod/moduhashlib.c
@@ -371,6 +371,6 @@ const mp_obj_module_t mp_module_uhashlib = {
     .globals = (mp_obj_dict_t *)&mp_module_uhashlib_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_uhashlib, mp_module_uhashlib, MICROPY_PY_UHASHLIB);
+MP_REGISTER_MODULE(MP_QSTR_uhashlib, mp_module_uhashlib);
 
 #endif // MICROPY_PY_UHASHLIB
diff --git a/extmod/moduheapq.c b/extmod/moduheapq.c
index 42871f2c06710..bfa6ba608d33f 100644
--- a/extmod/moduheapq.c
+++ b/extmod/moduheapq.c
@@ -118,7 +118,7 @@ const mp_obj_module_t mp_module_uheapq = {
     .globals = (mp_obj_dict_t *)&mp_module_uheapq_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_uheapq, mp_module_uheapq, MICROPY_PY_UHEAPQ);
+MP_REGISTER_MODULE(MP_QSTR_uheapq, mp_module_uheapq);
 #endif
 
 #endif // MICROPY_PY_UHEAPQ
diff --git a/extmod/modujson.c b/extmod/modujson.c
index befa351f1c380..bee432db255ff 100644
--- a/extmod/modujson.c
+++ b/extmod/modujson.c
@@ -381,6 +381,6 @@ const mp_obj_module_t mp_module_ujson = {
     .globals = (mp_obj_dict_t *)&mp_module_ujson_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_ujson, mp_module_ujson, MICROPY_PY_UJSON);
+MP_REGISTER_MODULE(MP_QSTR_ujson, mp_module_ujson);
 
 #endif // MICROPY_PY_UJSON
diff --git a/extmod/moduos.c b/extmod/moduos.c
index 2b902eb214a4f..87a611148d1cf 100644
--- a/extmod/moduos.c
+++ b/extmod/moduos.c
@@ -176,6 +176,6 @@ const mp_obj_module_t mp_module_uos = {
     .globals = (mp_obj_dict_t *)&os_module_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_uos, mp_module_uos, MICROPY_PY_UOS);
+MP_REGISTER_MODULE(MP_QSTR_uos, mp_module_uos);
 
 #endif // MICROPY_PY_UOS
diff --git a/extmod/moduplatform.c b/extmod/moduplatform.c
index 16e45078f303d..1b35b08aa7214 100644
--- a/extmod/moduplatform.c
+++ b/extmod/moduplatform.c
@@ -75,6 +75,6 @@ const mp_obj_module_t mp_module_uplatform = {
     .globals = (mp_obj_dict_t *)&modplatform_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_uplatform, mp_module_uplatform, MICROPY_PY_UPLATFORM);
+MP_REGISTER_MODULE(MP_QSTR_uplatform, mp_module_uplatform);
 
 #endif // MICROPY_PY_UPLATFORM
diff --git a/extmod/modurandom.c b/extmod/modurandom.c
index 6e5f99de76869..2e29f7ca65005 100644
--- a/extmod/modurandom.c
+++ b/extmod/modurandom.c
@@ -255,7 +255,7 @@ const mp_obj_module_t mp_module_urandom = {
     .globals = (mp_obj_dict_t *)&mp_module_urandom_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_urandom, mp_module_urandom, MICROPY_PY_URANDOM);
+MP_REGISTER_MODULE(MP_QSTR_urandom, mp_module_urandom);
 #endif
 
 #endif // MICROPY_PY_URANDOM
diff --git a/extmod/modure.c b/extmod/modure.c
index 1d9d82c7ba134..6bd89898431ff 100644
--- a/extmod/modure.c
+++ b/extmod/modure.c
@@ -448,7 +448,7 @@ const mp_obj_module_t mp_module_ure = {
     .globals = (mp_obj_dict_t *)&mp_module_re_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_ure, mp_module_ure, MICROPY_PY_URE);
+MP_REGISTER_MODULE(MP_QSTR_ure, mp_module_ure);
 #endif
 
 // Source files #include'd here to make sure they're compiled in
diff --git a/extmod/moduselect.c b/extmod/moduselect.c
index 296d38a5d4534..70a1de2e40998 100644
--- a/extmod/moduselect.c
+++ b/extmod/moduselect.c
@@ -373,6 +373,6 @@ const mp_obj_module_t mp_module_uselect = {
     .globals = (mp_obj_dict_t *)&mp_module_select_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_uselect, mp_module_uselect, MICROPY_PY_USELECT);
+MP_REGISTER_MODULE(MP_QSTR_uselect, mp_module_uselect);
 
 #endif // MICROPY_PY_USELECT
diff --git a/extmod/modusocket.c b/extmod/modusocket.c
index c5db80f3785cc..ebddb1ec79c97 100644
--- a/extmod/modusocket.c
+++ b/extmod/modusocket.c
@@ -637,6 +637,6 @@ const mp_obj_module_t mp_module_usocket = {
     .globals = (mp_obj_dict_t *)&mp_module_usocket_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_usocket, mp_module_usocket, MICROPY_PY_NETWORK && MICROPY_PY_USOCKET && !MICROPY_PY_LWIP);
+MP_REGISTER_MODULE(MP_QSTR_usocket, mp_module_usocket);
 
 #endif // MICROPY_PY_NETWORK && MICROPY_PY_USOCKET && !MICROPY_PY_LWIP
diff --git a/extmod/modussl_axtls.c b/extmod/modussl_axtls.c
index c9ce629b61351..9ba613a3e89e0 100644
--- a/extmod/modussl_axtls.c
+++ b/extmod/modussl_axtls.c
@@ -358,6 +358,6 @@ const mp_obj_module_t mp_module_ussl = {
     .globals = (mp_obj_dict_t *)&mp_module_ssl_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_ussl, mp_module_ussl, MICROPY_PY_USSL && MICROPY_SSL_AXTLS);
+MP_REGISTER_MODULE(MP_QSTR_ussl, mp_module_ussl);
 
 #endif // MICROPY_PY_USSL && MICROPY_SSL_AXTLS
diff --git a/extmod/modussl_mbedtls.c b/extmod/modussl_mbedtls.c
index 8496642d02b67..0d5d4197ccb75 100644
--- a/extmod/modussl_mbedtls.c
+++ b/extmod/modussl_mbedtls.c
@@ -418,6 +418,6 @@ const mp_obj_module_t mp_module_ussl = {
     .globals = (mp_obj_dict_t *)&mp_module_ssl_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_ussl, mp_module_ussl, MICROPY_PY_USSL && MICROPY_SSL_MBEDTLS);
+MP_REGISTER_MODULE(MP_QSTR_ussl, mp_module_ussl);
 
 #endif // MICROPY_PY_USSL && MICROPY_SSL_MBEDTLS
diff --git a/extmod/modutimeq.c b/extmod/modutimeq.c
index 93a9d09b044d9..1dde90bd1b026 100644
--- a/extmod/modutimeq.c
+++ b/extmod/modutimeq.c
@@ -229,5 +229,6 @@ const mp_obj_module_t mp_module_utimeq = {
     .globals = (mp_obj_dict_t *)&mp_module_utimeq_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_utimeq, mp_module_utimeq, MICROPY_PY_UTIMEQ);
+MP_REGISTER_MODULE(MP_QSTR_utimeq, mp_module_utimeq);
+
 #endif // MICROPY_PY_UTIMEQ
diff --git a/extmod/moduwebsocket.c b/extmod/moduwebsocket.c
index 48f4cc78ef785..a9ad0c22e3a51 100644
--- a/extmod/moduwebsocket.c
+++ b/extmod/moduwebsocket.c
@@ -310,6 +310,6 @@ const mp_obj_module_t mp_module_uwebsocket = {
     .globals = (mp_obj_dict_t *)&uwebsocket_module_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_uwebsocket, mp_module_uwebsocket, MICROPY_PY_UWEBSOCKET);
+MP_REGISTER_MODULE(MP_QSTR_uwebsocket, mp_module_uwebsocket);
 
 #endif // MICROPY_PY_UWEBSOCKET
diff --git a/extmod/moduzlib.c b/extmod/moduzlib.c
index b74c6b7b1a794..0161b9f49cdd8 100644
--- a/extmod/moduzlib.c
+++ b/extmod/moduzlib.c
@@ -223,7 +223,7 @@ const mp_obj_module_t mp_module_uzlib = {
 };
 
 
-MP_REGISTER_MODULE(MP_QSTR_uzlib, mp_module_uzlib, MICROPY_PY_UZLIB);
+MP_REGISTER_MODULE(MP_QSTR_uzlib, mp_module_uzlib);
 #endif
 
 // Source files #include'd here to make sure they're compiled in
diff --git a/extmod/modwebrepl.c b/extmod/modwebrepl.c
index e5fa5128c9769..1a2a718acfab5 100644
--- a/extmod/modwebrepl.c
+++ b/extmod/modwebrepl.c
@@ -363,6 +363,6 @@ const mp_obj_module_t mp_module_webrepl = {
     .globals = (mp_obj_dict_t *)&webrepl_module_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR__webrepl, mp_module_webrepl, MICROPY_PY_WEBREPL);
+MP_REGISTER_MODULE(MP_QSTR__webrepl, mp_module_webrepl);
 
 #endif // MICROPY_PY_WEBREPL
diff --git a/ports/cc3200/mods/modmachine.c b/ports/cc3200/mods/modmachine.c
index be8b7d6b52714..782ccc55a1d2f 100644
--- a/ports/cc3200/mods/modmachine.c
+++ b/ports/cc3200/mods/modmachine.c
@@ -214,4 +214,4 @@ const mp_obj_module_t mp_module_machine = {
     .globals = (mp_obj_dict_t*)&machine_module_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_umachine, mp_module_machine, MICROPY_PY_MACHINE);
+MP_REGISTER_MODULE(MP_QSTR_umachine, mp_module_machine);
diff --git a/ports/cc3200/mods/modnetwork.c b/ports/cc3200/mods/modnetwork.c
index 61996feb57039..d6ccc7c6a04d7 100644
--- a/ports/cc3200/mods/modnetwork.c
+++ b/ports/cc3200/mods/modnetwork.c
@@ -159,7 +159,7 @@ const mp_obj_module_t mp_module_network = {
     .globals = (mp_obj_dict_t*)&mp_module_network_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_network, mp_module_network, 1);
+MP_REGISTER_MODULE(MP_QSTR_network, mp_module_network);
 
 #if (MICROPY_PORT_HAS_TELNET || MICROPY_PORT_HAS_FTP)
 STATIC const mp_rom_map_elem_t network_server_locals_dict_table[] = {
diff --git a/ports/cc3200/mods/moduos.c b/ports/cc3200/mods/moduos.c
index 5825ca691a2ad..cd01b59b35d5c 100644
--- a/ports/cc3200/mods/moduos.c
+++ b/ports/cc3200/mods/moduos.c
@@ -180,4 +180,4 @@ const mp_obj_module_t mp_module_uos = {
     .globals = (mp_obj_dict_t*)&os_module_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_uos, mp_module_uos, 1);
+MP_REGISTER_MODULE(MP_QSTR_uos, mp_module_uos);
diff --git a/ports/cc3200/mods/modusocket.c b/ports/cc3200/mods/modusocket.c
index 65fc3ae296e82..32849c51d47c6 100644
--- a/ports/cc3200/mods/modusocket.c
+++ b/ports/cc3200/mods/modusocket.c
@@ -817,4 +817,4 @@ const mp_obj_module_t mp_module_usocket = {
     .globals = (mp_obj_dict_t*)&mp_module_usocket_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_usocket, mp_module_usocket, 1);
+MP_REGISTER_MODULE(MP_QSTR_usocket, mp_module_usocket);
diff --git a/ports/cc3200/mods/modussl.c b/ports/cc3200/mods/modussl.c
index 7bfb02b1d041a..cd2c62dcb82e3 100644
--- a/ports/cc3200/mods/modussl.c
+++ b/ports/cc3200/mods/modussl.c
@@ -161,4 +161,4 @@ const mp_obj_module_t mp_module_ussl = {
     .globals = (mp_obj_dict_t*)&mp_module_ussl_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_ussl, mp_module_ussl, 1);
+MP_REGISTER_MODULE(MP_QSTR_ussl, mp_module_ussl);
diff --git a/ports/cc3200/mods/modutime.c b/ports/cc3200/mods/modutime.c
index 4f4c363403eba..237a80065057a 100644
--- a/ports/cc3200/mods/modutime.c
+++ b/ports/cc3200/mods/modutime.c
@@ -156,4 +156,4 @@ const mp_obj_module_t mp_module_utime = {
     .globals = (mp_obj_dict_t*)&time_module_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_utime, mp_module_utime, 1);
+MP_REGISTER_MODULE(MP_QSTR_utime, mp_module_utime);
diff --git a/ports/cc3200/mods/modwipy.c b/ports/cc3200/mods/modwipy.c
index c85958375b7de..110c3cfd3622f 100644
--- a/ports/cc3200/mods/modwipy.c
+++ b/ports/cc3200/mods/modwipy.c
@@ -29,4 +29,4 @@ const mp_obj_module_t wipy_module = {
     .globals = (mp_obj_dict_t*)&wipy_module_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_wipy, wipy_module, 1);
+MP_REGISTER_MODULE(MP_QSTR_wipy, wipy_module);
diff --git a/ports/esp32/modesp.c b/ports/esp32/modesp.c
index fc9b0ec084b02..0c6429be7f1ed 100644
--- a/ports/esp32/modesp.c
+++ b/ports/esp32/modesp.c
@@ -143,4 +143,4 @@ const mp_obj_module_t esp_module = {
     .globals = (mp_obj_dict_t *)&esp_module_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_esp, esp_module, 1);
+MP_REGISTER_MODULE(MP_QSTR_esp, esp_module);
diff --git a/ports/esp32/modesp32.c b/ports/esp32/modesp32.c
index 1cdf234f41972..0dbd7efda33b0 100644
--- a/ports/esp32/modesp32.c
+++ b/ports/esp32/modesp32.c
@@ -225,4 +225,4 @@ const mp_obj_module_t esp32_module = {
     .globals = (mp_obj_dict_t *)&esp32_module_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_esp32, esp32_module, 1);
+MP_REGISTER_MODULE(MP_QSTR_esp32, esp32_module);
diff --git a/ports/esp32/modmachine.c b/ports/esp32/modmachine.c
index f1e261634d074..aee3be0e747fd 100644
--- a/ports/esp32/modmachine.c
+++ b/ports/esp32/modmachine.c
@@ -337,6 +337,6 @@ const mp_obj_module_t mp_module_machine = {
     .globals = (mp_obj_dict_t *)&machine_module_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_umachine, mp_module_machine, MICROPY_PY_MACHINE);
+MP_REGISTER_MODULE(MP_QSTR_umachine, mp_module_machine);
 
 #endif // MICROPY_PY_MACHINE
diff --git a/ports/esp32/modnetwork.c b/ports/esp32/modnetwork.c
index 199836e365cc4..45231c42307c8 100644
--- a/ports/esp32/modnetwork.c
+++ b/ports/esp32/modnetwork.c
@@ -298,4 +298,4 @@ const mp_obj_module_t mp_module_network = {
 
 // Note: This port doesn't define MICROPY_PY_NETWORK so this will not conflict
 // with the common implementation provided by extmod/modnetwork.c.
-MP_REGISTER_MODULE(MP_QSTR_network, mp_module_network, 1);
+MP_REGISTER_MODULE(MP_QSTR_network, mp_module_network);
diff --git a/ports/esp32/modsocket.c b/ports/esp32/modsocket.c
index aa3a8d1b6d209..819ea26e98006 100644
--- a/ports/esp32/modsocket.c
+++ b/ports/esp32/modsocket.c
@@ -871,4 +871,4 @@ const mp_obj_module_t mp_module_usocket = {
 // Note: This port doesn't define MICROPY_PY_USOCKET or MICROPY_PY_LWIP so
 // this will not conflict with the common implementation provided by
 // extmod/mod{lwip,usocket}.c.
-MP_REGISTER_MODULE(MP_QSTR_usocket, mp_module_usocket, 1);
+MP_REGISTER_MODULE(MP_QSTR_usocket, mp_module_usocket);
diff --git a/ports/esp32/modutime.c b/ports/esp32/modutime.c
index ca0d6b8274e9b..631d0fe2997d3 100644
--- a/ports/esp32/modutime.c
+++ b/ports/esp32/modutime.c
@@ -107,4 +107,4 @@ const mp_obj_module_t utime_module = {
     .globals = (mp_obj_dict_t *)&time_module_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_utime, utime_module, 1);
+MP_REGISTER_MODULE(MP_QSTR_utime, utime_module);
diff --git a/ports/esp8266/modesp.c b/ports/esp8266/modesp.c
index a6084e48bca78..645de7fe9b0a5 100644
--- a/ports/esp8266/modesp.c
+++ b/ports/esp8266/modesp.c
@@ -380,4 +380,4 @@ const mp_obj_module_t esp_module = {
     .globals = (mp_obj_dict_t *)&esp_module_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_esp, esp_module, 1);
+MP_REGISTER_MODULE(MP_QSTR_esp, esp_module);
diff --git a/ports/esp8266/modmachine.c b/ports/esp8266/modmachine.c
index ef1b50f6381ce..1dd87b9af8f74 100644
--- a/ports/esp8266/modmachine.c
+++ b/ports/esp8266/modmachine.c
@@ -453,6 +453,6 @@ const mp_obj_module_t mp_module_machine = {
     .globals = (mp_obj_dict_t *)&machine_module_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_umachine, mp_module_machine, MICROPY_PY_MACHINE);
+MP_REGISTER_MODULE(MP_QSTR_umachine, mp_module_machine);
 
 #endif // MICROPY_PY_MACHINE
diff --git a/ports/esp8266/modnetwork.c b/ports/esp8266/modnetwork.c
index d24bc147e6bbe..dc1b435fb98c1 100644
--- a/ports/esp8266/modnetwork.c
+++ b/ports/esp8266/modnetwork.c
@@ -548,4 +548,4 @@ const mp_obj_module_t network_module = {
 
 // Note: This port doesn't define MICROPY_PY_NETWORK so this will not conflict
 // with the common implementation provided by extmod/modnetwork.c.
-MP_REGISTER_MODULE(MP_QSTR_network, network_module, 1);
+MP_REGISTER_MODULE(MP_QSTR_network, network_module);
diff --git a/ports/esp8266/modutime.c b/ports/esp8266/modutime.c
index 7f498ef1ed105..08508f8818a6c 100644
--- a/ports/esp8266/modutime.c
+++ b/ports/esp8266/modutime.c
@@ -130,4 +130,4 @@ const mp_obj_module_t utime_module = {
     .globals = (mp_obj_dict_t *)&time_module_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_utime, utime_module, 1);
+MP_REGISTER_MODULE(MP_QSTR_utime, utime_module);
diff --git a/ports/javascript/modutime.c b/ports/javascript/modutime.c
index 92ddd4729dde1..76fe8df37455c 100644
--- a/ports/javascript/modutime.c
+++ b/ports/javascript/modutime.c
@@ -55,4 +55,4 @@ const mp_obj_module_t mp_module_utime = {
     .globals = (mp_obj_dict_t *)&time_module_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_utime, mp_module_utime, 1);
+MP_REGISTER_MODULE(MP_QSTR_utime, mp_module_utime);
diff --git a/ports/mimxrt/modmachine.c b/ports/mimxrt/modmachine.c
index fd83ebaad4b1e..ad4e4a59412e8 100644
--- a/ports/mimxrt/modmachine.c
+++ b/ports/mimxrt/modmachine.c
@@ -39,6 +39,8 @@
 #include "fsl_clock.h"
 #include "fsl_wdog.h"
 
+#if MICROPY_PY_MACHINE
+
 #include CPU_HEADER_H
 
 typedef enum {
@@ -160,4 +162,6 @@ const mp_obj_module_t mp_module_machine = {
     .globals = (mp_obj_dict_t *)&machine_module_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_umachine, mp_module_machine, MICROPY_PY_MACHINE);
+MP_REGISTER_MODULE(MP_QSTR_umachine, mp_module_machine);
+
+#endif // MICROPY_PY_MACHINE
diff --git a/ports/mimxrt/modmimxrt.c b/ports/mimxrt/modmimxrt.c
index 0091c36ffbf50..9dd38ee07f307 100644
--- a/ports/mimxrt/modmimxrt.c
+++ b/ports/mimxrt/modmimxrt.c
@@ -42,4 +42,4 @@ const mp_obj_module_t mp_module_mimxrt = {
     .globals = (mp_obj_dict_t *)&mimxrt_module_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_mimxrt, mp_module_mimxrt, 1);
+MP_REGISTER_MODULE(MP_QSTR_mimxrt, mp_module_mimxrt);
diff --git a/ports/mimxrt/modutime.c b/ports/mimxrt/modutime.c
index f24ce43c0ffb4..b1defff77b295 100644
--- a/ports/mimxrt/modutime.c
+++ b/ports/mimxrt/modutime.c
@@ -135,4 +135,4 @@ const mp_obj_module_t mp_module_utime = {
     .globals = (mp_obj_dict_t *)&time_module_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_utime, mp_module_utime, 1);
+MP_REGISTER_MODULE(MP_QSTR_utime, mp_module_utime);
diff --git a/ports/nrf/boards/microbit/modules/modmicrobit.c b/ports/nrf/boards/microbit/modules/modmicrobit.c
index bb721357dee18..c6aa445b1c9a4 100644
--- a/ports/nrf/boards/microbit/modules/modmicrobit.c
+++ b/ports/nrf/boards/microbit/modules/modmicrobit.c
@@ -157,4 +157,4 @@ const mp_obj_module_t microbit_module = {
     .globals = (mp_obj_dict_t*)&microbit_module_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_microbit, microbit_module, 1);
+MP_REGISTER_MODULE(MP_QSTR_microbit, microbit_module);
diff --git a/ports/nrf/modules/ble/modble.c b/ports/nrf/modules/ble/modble.c
index 6726c63c486a1..3a9c6b20da790 100644
--- a/ports/nrf/modules/ble/modble.c
+++ b/ports/nrf/modules/ble/modble.c
@@ -102,6 +102,6 @@ const mp_obj_module_t ble_module = {
     .globals = (mp_obj_dict_t*)&ble_module_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_ble, ble_module, MICROPY_PY_BLE);
+MP_REGISTER_MODULE(MP_QSTR_ble, ble_module);
 
 #endif // MICROPY_PY_BLE
diff --git a/ports/nrf/modules/board/modboard.c b/ports/nrf/modules/board/modboard.c
index 45dd9f30eefe7..1fe3dcc5c9817 100644
--- a/ports/nrf/modules/board/modboard.c
+++ b/ports/nrf/modules/board/modboard.c
@@ -54,4 +54,4 @@ const mp_obj_module_t board_module = {
     .globals = (mp_obj_dict_t*)&board_module_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_board, board_module, 1);
+MP_REGISTER_MODULE(MP_QSTR_board, board_module);
diff --git a/ports/nrf/modules/machine/modmachine.c b/ports/nrf/modules/machine/modmachine.c
index 65297548a490c..1378ba8f4be35 100644
--- a/ports/nrf/modules/machine/modmachine.c
+++ b/ports/nrf/modules/machine/modmachine.c
@@ -55,6 +55,8 @@
 #include "rtcounter.h"
 #endif
 
+#if MICROPY_PY_MACHINE
+
 #define PYB_RESET_HARD      (0)
 #define PYB_RESET_WDT       (1)
 #define PYB_RESET_SOFT      (2)
@@ -249,4 +251,6 @@ const mp_obj_module_t mp_module_machine = {
     .globals = (mp_obj_dict_t*)&machine_module_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_umachine, mp_module_machine, MICROPY_PY_MACHINE);
+MP_REGISTER_MODULE(MP_QSTR_umachine, mp_module_machine);
+
+#endif // MICROPY_PY_MACHINE
diff --git a/ports/nrf/modules/music/modmusic.c b/ports/nrf/modules/music/modmusic.c
index c8c6775de84fc..a950b03920c2f 100644
--- a/ports/nrf/modules/music/modmusic.c
+++ b/ports/nrf/modules/music/modmusic.c
@@ -509,6 +509,6 @@ const mp_obj_module_t music_module = {
     .globals = (mp_obj_dict_t*)&microbit_music_locals_dict,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_music, music_module, MICROPY_PY_MUSIC);
+MP_REGISTER_MODULE(MP_QSTR_music, music_module);
 
 #endif // MICROPY_PY_MUSIC
diff --git a/ports/nrf/modules/nrf/modnrf.c b/ports/nrf/modules/nrf/modnrf.c
index ab7d043f46e45..6533fa121e506 100644
--- a/ports/nrf/modules/nrf/modnrf.c
+++ b/ports/nrf/modules/nrf/modnrf.c
@@ -95,6 +95,6 @@ const mp_obj_module_t nrf_module = {
     .globals = (mp_obj_dict_t *)&nrf_module_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_nrf, nrf_module, MICROPY_PY_NRF);
+MP_REGISTER_MODULE(MP_QSTR_nrf, nrf_module);
 
 #endif // MICROPY_PY_NRF
diff --git a/ports/nrf/modules/ubluepy/modubluepy.c b/ports/nrf/modules/ubluepy/modubluepy.c
index d888b6dd5193a..fd42c4940bb75 100644
--- a/ports/nrf/modules/ubluepy/modubluepy.c
+++ b/ports/nrf/modules/ubluepy/modubluepy.c
@@ -67,6 +67,6 @@ const mp_obj_module_t mp_module_ubluepy = {
     .globals = (mp_obj_dict_t*)&mp_module_ubluepy_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_ubluepy, mp_module_ubluepy, MICROPY_PY_UBLUEPY);
+MP_REGISTER_MODULE(MP_QSTR_ubluepy, mp_module_ubluepy);
 
 #endif // MICROPY_PY_UBLUEPY
diff --git a/ports/nrf/modules/uos/moduos.c b/ports/nrf/modules/uos/moduos.c
index ea60df7a66cba..184f833ef5df9 100644
--- a/ports/nrf/modules/uos/moduos.c
+++ b/ports/nrf/modules/uos/moduos.c
@@ -197,4 +197,4 @@ const mp_obj_module_t mp_module_uos = {
     .globals = (mp_obj_dict_t*)&os_module_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_uos, mp_module_uos, 1);
+MP_REGISTER_MODULE(MP_QSTR_uos, mp_module_uos);
diff --git a/ports/nrf/modules/utime/modutime.c b/ports/nrf/modules/utime/modutime.c
index 6fe2da4746897..efbae3f58adbb 100644
--- a/ports/nrf/modules/utime/modutime.c
+++ b/ports/nrf/modules/utime/modutime.c
@@ -55,4 +55,4 @@ const mp_obj_module_t mp_module_utime = {
     .globals = (mp_obj_dict_t*)&time_module_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_utime, mp_module_utime, 1);
+MP_REGISTER_MODULE(MP_QSTR_utime, mp_module_utime);
diff --git a/ports/pic16bit/modpyb.c b/ports/pic16bit/modpyb.c
index 61955509e8461..9774105d66ae5 100644
--- a/ports/pic16bit/modpyb.c
+++ b/ports/pic16bit/modpyb.c
@@ -69,4 +69,4 @@ const mp_obj_module_t pyb_module = {
     .globals = (mp_obj_dict_t *)&pyb_module_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_pyb, pyb_module, 1);
+MP_REGISTER_MODULE(MP_QSTR_pyb, pyb_module);
diff --git a/ports/qemu-arm/modmachine.c b/ports/qemu-arm/modmachine.c
index 1168e74a133d6..515452f41d2c3 100644
--- a/ports/qemu-arm/modmachine.c
+++ b/ports/qemu-arm/modmachine.c
@@ -28,6 +28,8 @@
 #include "extmod/machine_pinbase.h"
 #include "extmod/machine_signal.h"
 
+#if MICROPY_PY_MACHINE
+
 STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_umachine) },
 
@@ -46,4 +48,6 @@ const mp_obj_module_t mp_module_machine = {
     .globals = (mp_obj_dict_t *)&machine_module_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_umachine, mp_module_machine, MICROPY_PY_MACHINE);
+MP_REGISTER_MODULE(MP_QSTR_umachine, mp_module_machine);
+
+#endif // MICROPY_PY_MACHINE
diff --git a/ports/renesas-ra/modmachine.c b/ports/renesas-ra/modmachine.c
index e505a49ff57d7..cd6e750340cf8 100644
--- a/ports/renesas-ra/modmachine.c
+++ b/ports/renesas-ra/modmachine.c
@@ -55,6 +55,7 @@
 #include "spi.h"
 #include "uart.h"
 
+#if MICROPY_PY_MACHINE
 
 #define PYB_RESET_SOFT      (0)
 #define PYB_RESET_POWER_ON  (1)
@@ -303,4 +304,6 @@ const mp_obj_module_t mp_module_machine = {
     .globals = (mp_obj_dict_t *)&machine_module_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_umachine, mp_module_machine, MICROPY_PY_MACHINE);
+MP_REGISTER_MODULE(MP_QSTR_umachine, mp_module_machine);
+
+#endif // MICROPY_PY_MACHINE
diff --git a/ports/renesas-ra/modutime.c b/ports/renesas-ra/modutime.c
index 2bd0adfa236ef..d0b670df45b35 100644
--- a/ports/renesas-ra/modutime.c
+++ b/ports/renesas-ra/modutime.c
@@ -35,6 +35,8 @@
 #include "systick.h"
 #include "rtc.h"
 
+#if MICROPY_PY_UTIME
+
 /// \module time - time related functions
 ///
 /// The `time` module provides functions for getting the current time and date,
@@ -157,4 +159,6 @@ const mp_obj_module_t mp_module_utime = {
     .globals = (mp_obj_dict_t *)&time_module_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_utime, mp_module_utime, MICROPY_PY_UTIME);
+MP_REGISTER_MODULE(MP_QSTR_utime, mp_module_utime);
+
+#endif // MICROPY_PY_UTIME
diff --git a/ports/rp2/modmachine.c b/ports/rp2/modmachine.c
index d6941bcfe49d5..fbaf29ee1641f 100644
--- a/ports/rp2/modmachine.c
+++ b/ports/rp2/modmachine.c
@@ -43,6 +43,8 @@
 #include "pico/stdlib.h"
 #include "pico/unique_id.h"
 
+#if MICROPY_PY_MACHINE
+
 #define RP2_RESET_PWRON (1)
 #define RP2_RESET_WDT (3)
 
@@ -188,4 +190,6 @@ const mp_obj_module_t mp_module_machine = {
     .globals = (mp_obj_dict_t *)&machine_module_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_umachine, mp_module_machine, MICROPY_PY_MACHINE);
+MP_REGISTER_MODULE(MP_QSTR_umachine, mp_module_machine);
+
+#endif // MICROPY_PY_MACHINE
diff --git a/ports/rp2/modrp2.c b/ports/rp2/modrp2.c
index 9c5223587a1ce..5dc066d651fc8 100644
--- a/ports/rp2/modrp2.c
+++ b/ports/rp2/modrp2.c
@@ -43,4 +43,4 @@ const mp_obj_module_t mp_module_rp2 = {
     .globals = (mp_obj_dict_t *)&rp2_module_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR__rp2, mp_module_rp2, 1);
+MP_REGISTER_MODULE(MP_QSTR__rp2, mp_module_rp2);
diff --git a/ports/rp2/modutime.c b/ports/rp2/modutime.c
index b73eacf87e447..ac291c8937ec8 100644
--- a/ports/rp2/modutime.c
+++ b/ports/rp2/modutime.c
@@ -126,4 +126,4 @@ const mp_obj_module_t mp_module_utime = {
     .globals = (mp_obj_dict_t *)&mp_module_time_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_utime, mp_module_utime, 1);
+MP_REGISTER_MODULE(MP_QSTR_utime, mp_module_utime);
diff --git a/ports/samd/modmachine.c b/ports/samd/modmachine.c
index 8da83b7d2b333..74e3571759420 100644
--- a/ports/samd/modmachine.c
+++ b/ports/samd/modmachine.c
@@ -35,6 +35,8 @@
 #include "hpl_gclk_base.h"
 #include "hpl_pm_base.h"
 
+#if MICROPY_PY_MACHINE
+
 #if defined(MCU_SAMD21)
 #define DBL_TAP_ADDR ((volatile uint32_t *)(0x20000000 + 32 * 1024 - 4))
 #elif defined(MCU_SAMD51)
@@ -129,4 +131,6 @@ const mp_obj_module_t mp_module_machine = {
     .globals = (mp_obj_dict_t *)&machine_module_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_umachine, mp_module_machine, MICROPY_PY_MACHINE);
+MP_REGISTER_MODULE(MP_QSTR_umachine, mp_module_machine);
+
+#endif // MICROPY_PY_MACHINE
diff --git a/ports/samd/modsamd.c b/ports/samd/modsamd.c
index 387ced5cf50b3..68fd6b53e56d4 100644
--- a/ports/samd/modsamd.c
+++ b/ports/samd/modsamd.c
@@ -40,4 +40,4 @@ const mp_obj_module_t mp_module_samd = {
     .globals = (mp_obj_dict_t *)&samd_module_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_samd, mp_module_samd, 1);
+MP_REGISTER_MODULE(MP_QSTR_samd, mp_module_samd);
diff --git a/ports/samd/modutime.c b/ports/samd/modutime.c
index 0b872a297a779..bbeedcfda070f 100644
--- a/ports/samd/modutime.c
+++ b/ports/samd/modutime.c
@@ -100,4 +100,4 @@ const mp_obj_module_t mp_module_utime = {
     .globals = (mp_obj_dict_t *)&time_module_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_utime, mp_module_utime, 1);
+MP_REGISTER_MODULE(MP_QSTR_utime, mp_module_utime);
diff --git a/ports/stm32/modmachine.c b/ports/stm32/modmachine.c
index 20140ed101857..5fca9b3e04c62 100644
--- a/ports/stm32/modmachine.c
+++ b/ports/stm32/modmachine.c
@@ -396,6 +396,8 @@ STATIC mp_obj_t machine_reset_cause(void) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_0(machine_reset_cause_obj, machine_reset_cause);
 
+#if MICROPY_PY_MACHINE
+
 STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__),            MP_ROM_QSTR(MP_QSTR_umachine) },
     { MP_ROM_QSTR(MP_QSTR_info),                MP_ROM_PTR(&machine_info_obj) },
@@ -481,4 +483,6 @@ const mp_obj_module_t mp_module_machine = {
     .globals = (mp_obj_dict_t *)&machine_module_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_umachine, mp_module_machine, MICROPY_PY_MACHINE);
+MP_REGISTER_MODULE(MP_QSTR_umachine, mp_module_machine);
+
+#endif // MICROPY_PY_MACHINE
diff --git a/ports/stm32/modpyb.c b/ports/stm32/modpyb.c
index d23065e4bb289..96e719c6bf9d2 100644
--- a/ports/stm32/modpyb.c
+++ b/ports/stm32/modpyb.c
@@ -58,6 +58,8 @@
 
 char pyb_country_code[2];
 
+#if MICROPY_PY_PYB
+
 STATIC mp_obj_t pyb_fault_debug(mp_obj_t value) {
     pyb_hard_fault_debug = mp_obj_is_true(value);
     return mp_const_none;
@@ -266,4 +268,6 @@ const mp_obj_module_t pyb_module = {
     .globals = (mp_obj_dict_t *)&pyb_module_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_pyb, pyb_module, MICROPY_PY_PYB);
+MP_REGISTER_MODULE(MP_QSTR_pyb, pyb_module);
+
+#endif // MICROPY_PY_PYB
diff --git a/ports/stm32/modstm.c b/ports/stm32/modstm.c
index 185ec1a2fef6a..94d56d4d082b5 100644
--- a/ports/stm32/modstm.c
+++ b/ports/stm32/modstm.c
@@ -60,6 +60,6 @@ const mp_obj_module_t stm_module = {
     .globals = (mp_obj_dict_t *)&stm_module_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_stm, stm_module, MICROPY_PY_STM);
+MP_REGISTER_MODULE(MP_QSTR_stm, stm_module);
 
 #endif // MICROPY_PY_STM
diff --git a/ports/stm32/modutime.c b/ports/stm32/modutime.c
index d8ac156de6184..72a2be303ae0b 100644
--- a/ports/stm32/modutime.c
+++ b/ports/stm32/modutime.c
@@ -129,6 +129,8 @@ STATIC mp_obj_t time_time(void) {
 }
 MP_DEFINE_CONST_FUN_OBJ_0(time_time_obj, time_time);
 
+#if MICROPY_PY_UTIME
+
 STATIC const mp_rom_map_elem_t time_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_utime) },
 
@@ -154,4 +156,6 @@ const mp_obj_module_t mp_module_utime = {
     .globals = (mp_obj_dict_t *)&time_module_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_utime, mp_module_utime, MICROPY_PY_UTIME);
+MP_REGISTER_MODULE(MP_QSTR_utime, mp_module_utime);
+
+#endif // MICROPY_PY_UTIME
diff --git a/ports/teensy/modpyb.c b/ports/teensy/modpyb.c
index b8fcfaaa5d093..3939607ad06ca 100644
--- a/ports/teensy/modpyb.c
+++ b/ports/teensy/modpyb.c
@@ -361,4 +361,4 @@ const mp_obj_module_t pyb_module = {
     .globals = (mp_obj_dict_t *)&pyb_module_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_pyb, pyb_module, 1);
+MP_REGISTER_MODULE(MP_QSTR_pyb, pyb_module);
diff --git a/ports/unix/modffi.c b/ports/unix/modffi.c
index b692af4df1a59..d82d5270fa34f 100644
--- a/ports/unix/modffi.c
+++ b/ports/unix/modffi.c
@@ -38,6 +38,8 @@
 #include "py/objint.h"
 #include "py/gc.h"
 
+#if MICROPY_PY_FFI
+
 /*
  * modffi uses character codes to encode a value type, based on "struct"
  * module type codes, with some extensions and overridings.
@@ -632,4 +634,6 @@ const mp_obj_module_t mp_module_ffi = {
     .globals = (mp_obj_dict_t *)&mp_module_ffi_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_ffi, mp_module_ffi, MICROPY_PY_FFI);
+MP_REGISTER_MODULE(MP_QSTR_ffi, mp_module_ffi);
+
+#endif // MICROPY_PY_FFI
diff --git a/ports/unix/modjni.c b/ports/unix/modjni.c
index 5d2beaa8dc283..c86f30653c81a 100644
--- a/ports/unix/modjni.c
+++ b/ports/unix/modjni.c
@@ -35,6 +35,8 @@
 
 #include <jni.h>
 
+#if MICROPY_PY_JNI
+
 #define JJ(call, ...) (*env)->call(env, __VA_ARGS__)
 #define JJ1(call) (*env)->call(env)
 #define MATCH(s, static) (!strncmp(s, static, sizeof(static) - 1))
@@ -713,4 +715,6 @@ const mp_obj_module_t mp_module_jni = {
     .globals = (mp_obj_dict_t *)&mp_module_jni_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_jni, mp_module_jni, MICROPY_PY_JNI);
+MP_REGISTER_MODULE(MP_QSTR_jni, mp_module_jni);
+
+#endif // MICROPY_PY_JNI
diff --git a/ports/unix/modmachine.c b/ports/unix/modmachine.c
index 3d4d9eebcacf4..542ff50025fbc 100644
--- a/ports/unix/modmachine.c
+++ b/ports/unix/modmachine.c
@@ -110,6 +110,6 @@ const mp_obj_module_t mp_module_machine = {
     .globals = (mp_obj_dict_t *)&machine_module_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_umachine, mp_module_machine, MICROPY_PY_MACHINE);
+MP_REGISTER_MODULE(MP_QSTR_umachine, mp_module_machine);
 
 #endif // MICROPY_PY_MACHINE
diff --git a/ports/unix/modtermios.c b/ports/unix/modtermios.c
index cce8c28ab38bb..687bf1abf13c0 100644
--- a/ports/unix/modtermios.c
+++ b/ports/unix/modtermios.c
@@ -33,6 +33,8 @@
 #include "py/runtime.h"
 #include "py/mphal.h"
 
+#if MICROPY_PY_TERMIOS
+
 STATIC mp_obj_t mod_termios_tcgetattr(mp_obj_t fd_in) {
     struct termios term;
     int fd = mp_obj_get_int(fd_in);
@@ -149,4 +151,6 @@ const mp_obj_module_t mp_module_termios = {
     .globals = (mp_obj_dict_t *)&mp_module_termios_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_termios, mp_module_termios, MICROPY_PY_TERMIOS);
+MP_REGISTER_MODULE(MP_QSTR_termios, mp_module_termios);
+
+#endif // MICROPY_PY_TERMIOS
diff --git a/ports/unix/modtime.c b/ports/unix/modtime.c
index 00b3f94367131..c9eb09c15bdd8 100644
--- a/ports/unix/modtime.c
+++ b/ports/unix/modtime.c
@@ -232,6 +232,6 @@ const mp_obj_module_t mp_module_time = {
     .globals = (mp_obj_dict_t *)&mp_module_time_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_utime, mp_module_time, MICROPY_PY_UTIME);
+MP_REGISTER_MODULE(MP_QSTR_utime, mp_module_time);
 
 #endif // MICROPY_PY_UTIME
diff --git a/ports/unix/moduselect.c b/ports/unix/moduselect.c
index d3e0eff03818c..2de4a316edb99 100644
--- a/ports/unix/moduselect.c
+++ b/ports/unix/moduselect.c
@@ -351,6 +351,6 @@ const mp_obj_module_t mp_module_uselect = {
     .globals = (mp_obj_dict_t *)&mp_module_select_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_uselect, mp_module_uselect, MICROPY_PY_USELECT_POSIX);
+MP_REGISTER_MODULE(MP_QSTR_uselect, mp_module_uselect);
 
 #endif // MICROPY_PY_USELECT_POSIX
diff --git a/ports/unix/modusocket.c b/ports/unix/modusocket.c
index 7526d9679da21..03d069cb89ce9 100644
--- a/ports/unix/modusocket.c
+++ b/ports/unix/modusocket.c
@@ -49,6 +49,8 @@
 #include "extmod/vfs.h"
 #include <poll.h>
 
+#if MICROPY_PY_SOCKET
+
 /*
   The idea of this module is to implement reasonable minimum of
   socket-related functions to write typical clients and servers.
@@ -702,4 +704,6 @@ const mp_obj_module_t mp_module_socket = {
     .globals = (mp_obj_dict_t *)&mp_module_socket_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_usocket, mp_module_socket, MICROPY_PY_SOCKET);
+MP_REGISTER_MODULE(MP_QSTR_usocket, mp_module_socket);
+
+#endif // MICROPY_PY_SOCKET
diff --git a/ports/zephyr/modmachine.c b/ports/zephyr/modmachine.c
index c8b07c023bb5d..f4b1c0849f99d 100644
--- a/ports/zephyr/modmachine.c
+++ b/ports/zephyr/modmachine.c
@@ -89,6 +89,6 @@ const mp_obj_module_t mp_module_machine = {
     .globals = (mp_obj_dict_t *)&machine_module_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_umachine, mp_module_machine, MICROPY_PY_MACHINE);
+MP_REGISTER_MODULE(MP_QSTR_umachine, mp_module_machine);
 
 #endif // MICROPY_PY_MACHINE
diff --git a/ports/zephyr/modusocket.c b/ports/zephyr/modusocket.c
index fbcd7e87ae9ef..29240ad15290f 100644
--- a/ports/zephyr/modusocket.c
+++ b/ports/zephyr/modusocket.c
@@ -472,6 +472,6 @@ const mp_obj_module_t mp_module_usocket = {
     .globals = (mp_obj_dict_t *)&mp_module_usocket_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_usocket, mp_module_usocket, MICROPY_PY_USOCKET);
+MP_REGISTER_MODULE(MP_QSTR_usocket, mp_module_usocket);
 
 #endif // MICROPY_PY_USOCKET
diff --git a/ports/zephyr/modutime.c b/ports/zephyr/modutime.c
index c9864a4432b13..16ac9af6ee80e 100644
--- a/ports/zephyr/modutime.c
+++ b/ports/zephyr/modutime.c
@@ -64,6 +64,6 @@ const mp_obj_module_t mp_module_time = {
     .globals = (mp_obj_dict_t *)&mp_module_time_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_utime, mp_module_time, MICROPY_PY_UTIME);
+MP_REGISTER_MODULE(MP_QSTR_utime, mp_module_time);
 
 #endif // MICROPY_PY_UTIME
diff --git a/ports/zephyr/modzephyr.c b/ports/zephyr/modzephyr.c
index fc883ddc49801..541dfe0b309a2 100644
--- a/ports/zephyr/modzephyr.c
+++ b/ports/zephyr/modzephyr.c
@@ -89,6 +89,6 @@ const mp_obj_module_t mp_module_zephyr = {
     .globals = (mp_obj_dict_t *)&mp_module_time_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_zephyr, mp_module_zephyr, MICROPY_PY_ZEPHYR);
+MP_REGISTER_MODULE(MP_QSTR_zephyr, mp_module_zephyr);
 
 #endif // MICROPY_PY_ZEPHYR
diff --git a/ports/zephyr/modzsensor.c b/ports/zephyr/modzsensor.c
index 2286a46fd87cf..6e8a5ca07442d 100644
--- a/ports/zephyr/modzsensor.c
+++ b/ports/zephyr/modzsensor.c
@@ -142,6 +142,6 @@ const mp_obj_module_t mp_module_zsensor = {
     .globals = (mp_obj_dict_t *)&mp_module_zsensor_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_zsensor, mp_module_zsensor, MICROPY_PY_ZSENSOR);
+MP_REGISTER_MODULE(MP_QSTR_zsensor, mp_module_zsensor);
 
 #endif // MICROPY_PY_UHASHLIB
diff --git a/py/makemoduledefs.py b/py/makemoduledefs.py
index 8d045c0d029c5..657809db4b5a2 100644
--- a/py/makemoduledefs.py
+++ b/py/makemoduledefs.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
 # This pre-processor parses a single file containing a list of
-# MP_REGISTER_MODULE(module_name, obj_module, enabled_define)
+# MP_REGISTER_MODULE(module_name, obj_module)
 # These are used to generate a header with the required entries for
 # "mp_rom_map_elem_t mp_builtin_module_table[]" in py/objmodule.c
 
@@ -12,14 +12,14 @@
 import argparse
 
 
-pattern = re.compile(r"\s*MP_REGISTER_MODULE\((.*?),\s*(.*?),\s*(.*?)\);", flags=re.DOTALL)
+pattern = re.compile(r"\s*MP_REGISTER_MODULE\((.*?),\s*(.*?)\);", flags=re.DOTALL)
 
 
 def find_module_registrations(filename):
     """Find any MP_REGISTER_MODULE definitions in the provided file.
 
     :param str filename: path to file to check
-    :return: List[(module_name, obj_module, enabled_define)]
+    :return: List[(module_name, obj_module)]
     """
     global pattern
 
@@ -30,31 +30,24 @@ def find_module_registrations(filename):
 def generate_module_table_header(modules):
     """Generate header with module table entries for builtin modules.
 
-    :param List[(module_name, obj_module, enabled_define)] modules: module defs
+    :param List[(module_name, obj_module)] modules: module defs
     :return: None
     """
 
     # Print header file for all external modules.
     mod_defs = set()
     print("// Automatically generated by makemoduledefs.py.\n")
-    for module_name, obj_module, enabled_define in modules:
+    for module_name, obj_module in modules:
         mod_def = "MODULE_DEF_{}".format(module_name.upper())
         mod_defs.add(mod_def)
         print(
             (
-                "#if ({enabled_define})\n"
-                "    extern const struct _mp_obj_module_t {obj_module};\n"
-                "    #undef {mod_def}\n"
-                "    #define {mod_def} {{ MP_ROM_QSTR({module_name}), MP_ROM_PTR(&{obj_module}) }},\n"
-                "#else\n"
-                "    #ifndef {mod_def}\n"
-                "        #define {mod_def}\n"
-                "    #endif\n"
-                "#endif\n"
+                "extern const struct _mp_obj_module_t {obj_module};\n"
+                "#undef {mod_def}\n"
+                "#define {mod_def} {{ MP_ROM_QSTR({module_name}), MP_ROM_PTR(&{obj_module}) }},\n"
             ).format(
                 module_name=module_name,
                 obj_module=obj_module,
-                enabled_define=enabled_define,
                 mod_def=mod_def,
             )
         )
diff --git a/py/makeqstrdefs.py b/py/makeqstrdefs.py
index 85e04b94492ac..4c416a874a6ed 100644
--- a/py/makeqstrdefs.py
+++ b/py/makeqstrdefs.py
@@ -89,7 +89,7 @@ def process_file(f):
     elif args.mode == _MODE_COMPRESS:
         re_match = re.compile(r'MP_COMPRESSED_ROM_TEXT\("([^"]*)"\)')
     elif args.mode == _MODE_MODULE:
-        re_match = re.compile(r"MP_REGISTER_MODULE\(.*?,\s*.*?,\s*.*?\);")
+        re_match = re.compile(r"MP_REGISTER_MODULE\(.*?,\s*.*?\);")
     output = []
     last_fname = None
     for line in f:
diff --git a/py/modarray.c b/py/modarray.c
index 9ab1795f8b883..d9f7a0452886d 100644
--- a/py/modarray.c
+++ b/py/modarray.c
@@ -40,6 +40,6 @@ const mp_obj_module_t mp_module_uarray = {
     .globals = (mp_obj_dict_t *)&mp_module_array_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_uarray, mp_module_uarray, MICROPY_PY_ARRAY);
+MP_REGISTER_MODULE(MP_QSTR_uarray, mp_module_uarray);
 
 #endif
diff --git a/py/modbuiltins.c b/py/modbuiltins.c
index adb9ea40ad89d..f3caccbc83e16 100644
--- a/py/modbuiltins.c
+++ b/py/modbuiltins.c
@@ -788,4 +788,4 @@ const mp_obj_module_t mp_module_builtins = {
     .globals = (mp_obj_dict_t *)&mp_module_builtins_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_builtins, mp_module_builtins, 1);
+MP_REGISTER_MODULE(MP_QSTR_builtins, mp_module_builtins);
diff --git a/py/modcmath.c b/py/modcmath.c
index 44a4736e095e1..1418362ad9b1e 100644
--- a/py/modcmath.c
+++ b/py/modcmath.c
@@ -149,6 +149,6 @@ const mp_obj_module_t mp_module_cmath = {
     .globals = (mp_obj_dict_t *)&mp_module_cmath_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_cmath, mp_module_cmath, MICROPY_PY_BUILTINS_FLOAT && MICROPY_PY_BUILTINS_COMPLEX && MICROPY_PY_CMATH);
+MP_REGISTER_MODULE(MP_QSTR_cmath, mp_module_cmath);
 
 #endif // MICROPY_PY_BUILTINS_FLOAT && MICROPY_PY_BUILTINS_COMPLEX && MICROPY_PY_CMATH
diff --git a/py/modcollections.c b/py/modcollections.c
index 0c008579f85dc..8c62f34db7ef3 100644
--- a/py/modcollections.c
+++ b/py/modcollections.c
@@ -46,6 +46,6 @@ const mp_obj_module_t mp_module_collections = {
     .globals = (mp_obj_dict_t *)&mp_module_collections_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_ucollections, mp_module_collections, MICROPY_PY_COLLECTIONS);
+MP_REGISTER_MODULE(MP_QSTR_ucollections, mp_module_collections);
 
 #endif // MICROPY_PY_COLLECTIONS
diff --git a/py/modgc.c b/py/modgc.c
index 0ae3a84ae8247..c11bcaecd7ddf 100644
--- a/py/modgc.c
+++ b/py/modgc.c
@@ -115,6 +115,6 @@ const mp_obj_module_t mp_module_gc = {
     .globals = (mp_obj_dict_t *)&mp_module_gc_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_gc, mp_module_gc, MICROPY_PY_GC && MICROPY_ENABLE_GC);
+MP_REGISTER_MODULE(MP_QSTR_gc, mp_module_gc);
 
 #endif
diff --git a/py/modio.c b/py/modio.c
index 72e633bd9fdae..50af0b6a4795e 100644
--- a/py/modio.c
+++ b/py/modio.c
@@ -233,6 +233,6 @@ const mp_obj_module_t mp_module_io = {
     .globals = (mp_obj_dict_t *)&mp_module_io_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_uio, mp_module_io, MICROPY_PY_IO);
+MP_REGISTER_MODULE(MP_QSTR_uio, mp_module_io);
 
 #endif
diff --git a/py/modmath.c b/py/modmath.c
index 764f59e1cb58c..72b5dde517591 100644
--- a/py/modmath.c
+++ b/py/modmath.c
@@ -435,6 +435,6 @@ const mp_obj_module_t mp_module_math = {
     .globals = (mp_obj_dict_t *)&mp_module_math_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_math, mp_module_math, MICROPY_PY_BUILTINS_FLOAT && MICROPY_PY_MATH);
+MP_REGISTER_MODULE(MP_QSTR_math, mp_module_math);
 
 #endif // MICROPY_PY_BUILTINS_FLOAT && MICROPY_PY_MATH
diff --git a/py/modmicropython.c b/py/modmicropython.c
index a2faa9a9f0cbb..eafff90c60eba 100644
--- a/py/modmicropython.c
+++ b/py/modmicropython.c
@@ -210,4 +210,4 @@ const mp_obj_module_t mp_module_micropython = {
     .globals = (mp_obj_dict_t *)&mp_module_micropython_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_micropython, mp_module_micropython, 1);
+MP_REGISTER_MODULE(MP_QSTR_micropython, mp_module_micropython);
diff --git a/py/modstruct.c b/py/modstruct.c
index 2cbf691afbed8..69c7279e370e6 100644
--- a/py/modstruct.c
+++ b/py/modstruct.c
@@ -266,6 +266,6 @@ const mp_obj_module_t mp_module_ustruct = {
     .globals = (mp_obj_dict_t *)&mp_module_struct_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_ustruct, mp_module_ustruct, MICROPY_PY_STRUCT);
+MP_REGISTER_MODULE(MP_QSTR_ustruct, mp_module_ustruct);
 
 #endif
diff --git a/py/modsys.c b/py/modsys.c
index e3fb697eb1b3e..a090f1212d37c 100644
--- a/py/modsys.c
+++ b/py/modsys.c
@@ -284,6 +284,6 @@ const mp_obj_module_t mp_module_sys = {
     .globals = (mp_obj_dict_t *)&mp_module_sys_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_usys, mp_module_sys, MICROPY_PY_SYS);
+MP_REGISTER_MODULE(MP_QSTR_usys, mp_module_sys);
 
 #endif
diff --git a/py/modthread.c b/py/modthread.c
index 11d0405e710f0..bad94fbf2f088 100644
--- a/py/modthread.c
+++ b/py/modthread.c
@@ -300,6 +300,6 @@ const mp_obj_module_t mp_module_thread = {
     .globals = (mp_obj_dict_t *)&mp_module_thread_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR__thread, mp_module_thread, MICROPY_PY_THREAD);
+MP_REGISTER_MODULE(MP_QSTR__thread, mp_module_thread);
 
 #endif // MICROPY_PY_THREAD
diff --git a/py/moduerrno.c b/py/moduerrno.c
index 4b61e0bda2844..1b16fd9d9ed71 100644
--- a/py/moduerrno.c
+++ b/py/moduerrno.c
@@ -99,7 +99,7 @@ const mp_obj_module_t mp_module_uerrno = {
     .globals = (mp_obj_dict_t *)&mp_module_uerrno_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_uerrno, mp_module_uerrno, MICROPY_PY_UERRNO);
+MP_REGISTER_MODULE(MP_QSTR_uerrno, mp_module_uerrno);
 
 qstr mp_errno_to_str(mp_obj_t errno_val) {
     #if MICROPY_PY_UERRNO_ERRORCODE
diff --git a/py/obj.h b/py/obj.h
index aa5ed179bdcf1..29cd1855c17c1 100644
--- a/py/obj.h
+++ b/py/obj.h
@@ -419,10 +419,9 @@ typedef struct _mp_rom_obj_t { mp_const_obj_t o; } mp_rom_obj_t;
 // Declare a module as a builtin, processed by makemoduledefs.py
 // param module_name: MP_QSTR_<module name>
 // param obj_module: mp_obj_module_t instance
-// prarm enabled_define: used as `#if (enabled_define) around entry`
 
 #ifndef NO_QSTR
-#define MP_REGISTER_MODULE(module_name, obj_module, enabled_define)
+#define MP_REGISTER_MODULE(module_name, obj_module)
 #endif
 
 // Underlying map/hash table implementation (not dict object or map function)
diff --git a/py/runtime.c b/py/runtime.c
index 8c857fec27e6c..e6d8c68070e5c 100644
--- a/py/runtime.c
+++ b/py/runtime.c
@@ -59,7 +59,7 @@ const mp_obj_module_t mp_module___main__ = {
     .globals = (mp_obj_dict_t *)&MP_STATE_VM(dict_main),
 };
 
-MP_REGISTER_MODULE(MP_QSTR___main__, mp_module___main__, 1);
+MP_REGISTER_MODULE(MP_QSTR___main__, mp_module___main__);
 
 void mp_init(void) {
     qstr_init();

From a1afb337d2629a781cf4e171b7db7f05eeacc78f Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 1 Jun 2022 14:52:38 +1000
Subject: [PATCH 2124/3533] extmod/uasyncio: Fix edge case for cancellation of
 wait_for.

This fixes the cases where the task being waited on finishes just before or
just after the wait_for itself is cancelled.

Fixes issue #8717.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/uasyncio/funcs.py              | 46 ++++++++++++++-------------
 tests/extmod/uasyncio_wait_for.py     | 15 +++++++++
 tests/extmod/uasyncio_wait_for.py.exp | 27 ++++++++++++++++
 3 files changed, 66 insertions(+), 22 deletions(-)

diff --git a/extmod/uasyncio/funcs.py b/extmod/uasyncio/funcs.py
index 258948f73e6d7..a1d38fbcbf975 100644
--- a/extmod/uasyncio/funcs.py
+++ b/extmod/uasyncio/funcs.py
@@ -1,49 +1,51 @@
 # MicroPython uasyncio module
-# MIT license; Copyright (c) 2019-2020 Damien P. George
+# MIT license; Copyright (c) 2019-2022 Damien P. George
 
 from . import core
 
 
+def _run(waiter, aw):
+    try:
+        result = await aw
+        status = True
+    except BaseException as er:
+        result = None
+        status = er
+    if waiter.data is None:
+        # The waiter is still waiting, cancel it.
+        if waiter.cancel():
+            # Waiter was cancelled by us, change its CancelledError to an instance of
+            # CancelledError that contains the status and result of waiting on aw.
+            # If the wait_for task subsequently gets cancelled externally then this
+            # instance will be reset to a CancelledError instance without arguments.
+            waiter.data = core.CancelledError(status, result)
+
+
 async def wait_for(aw, timeout, sleep=core.sleep):
     aw = core._promote_to_task(aw)
     if timeout is None:
         return await aw
 
-    def runner(waiter, aw):
-        nonlocal status, result
-        try:
-            result = await aw
-            s = True
-        except BaseException as er:
-            s = er
-        if status is None:
-            # The waiter is still waiting, set status for it and cancel it.
-            status = s
-            waiter.cancel()
-
     # Run aw in a separate runner task that manages its exceptions.
-    status = None
-    result = None
-    runner_task = core.create_task(runner(core.cur_task, aw))
+    runner_task = core.create_task(_run(core.cur_task, aw))
 
     try:
         # Wait for the timeout to elapse.
         await sleep(timeout)
     except core.CancelledError as er:
-        if status is True:
-            # aw completed successfully and cancelled the sleep, so return aw's result.
-            return result
-        elif status is None:
+        status = er.value
+        if status is None:
             # This wait_for was cancelled externally, so cancel aw and re-raise.
-            status = True
             runner_task.cancel()
             raise er
+        elif status is True:
+            # aw completed successfully and cancelled the sleep, so return aw's result.
+            return er.args[1]
         else:
             # aw raised an exception, propagate it out to the caller.
             raise status
 
     # The sleep finished before aw, so cancel aw and raise TimeoutError.
-    status = True
     runner_task.cancel()
     await runner_task
     raise core.TimeoutError
diff --git a/tests/extmod/uasyncio_wait_for.py b/tests/extmod/uasyncio_wait_for.py
index 9612d16204043..c636c7dd747ad 100644
--- a/tests/extmod/uasyncio_wait_for.py
+++ b/tests/extmod/uasyncio_wait_for.py
@@ -111,6 +111,21 @@ async def main():
     await asyncio.sleep(0.01)
     print(sep)
 
+    # When wait_for gets cancelled and the task it's waiting on finishes around the
+    # same time as the cancellation of the wait_for
+    for num_sleep in range(1, 5):
+        t = asyncio.create_task(task_wait_for_cancel(4 + num_sleep, 0, 2))
+        for _ in range(num_sleep):
+            await asyncio.sleep(0)
+        assert not t.done()
+        print("cancel wait_for")
+        t.cancel()
+        try:
+            await t
+        except asyncio.CancelledError as er:
+            print(repr(er))
+        print(sep)
+
     print("finish")
 
 
diff --git a/tests/extmod/uasyncio_wait_for.py.exp b/tests/extmod/uasyncio_wait_for.py.exp
index a4201d31ffdb8..1bbe3d0658f84 100644
--- a/tests/extmod/uasyncio_wait_for.py.exp
+++ b/tests/extmod/uasyncio_wait_for.py.exp
@@ -32,4 +32,31 @@ task_wait_for_cancel_ignore cancelled
 ignore cancel
 task_catch done
 ----------
+task_wait_for_cancel start
+cancel wait_for
+task start 5
+task_wait_for_cancel cancelled
+CancelledError()
+----------
+task_wait_for_cancel start
+task start 6
+cancel wait_for
+task end 6
+task_wait_for_cancel cancelled
+CancelledError()
+----------
+task_wait_for_cancel start
+task start 7
+task end 7
+cancel wait_for
+task_wait_for_cancel cancelled
+CancelledError()
+----------
+task_wait_for_cancel start
+task start 8
+task end 8
+cancel wait_for
+task_wait_for_cancel cancelled
+CancelledError()
+----------
 finish

From 364569d25f9db4ab8f170e20489daaebe36502a1 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Thu, 26 May 2022 10:16:45 +0200
Subject: [PATCH 2125/3533] drivers/lsm6dsox: Add support for SPI mode.

---
 drivers/lsm6dsox/lsm6dsox.py       | 53 +++++++++++++++++++++++++-----
 drivers/lsm6dsox/lsm6dsox_basic.py |  2 ++
 2 files changed, 47 insertions(+), 8 deletions(-)

diff --git a/drivers/lsm6dsox/lsm6dsox.py b/drivers/lsm6dsox/lsm6dsox.py
index 56a3abcbe4459..98e19fa4ca7b3 100644
--- a/drivers/lsm6dsox/lsm6dsox.py
+++ b/drivers/lsm6dsox/lsm6dsox.py
@@ -5,7 +5,7 @@
 The MIT License (MIT)
 
 Copyright (c) 2021 Damien P. George
-Copyright (c) 2021 Ibrahim Abdelkader <iabdalkader@openmv.io>
+Copyright (c) 2021-2022 Ibrahim Abdelkader <iabdalkader@openmv.io>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -30,15 +30,20 @@
 import time
 from lsm6dsox import LSM6DSOX
 
-from machine import Pin, I2C
+from machine import Pin, SPI, I2C
+# Init in I2C mode.
 lsm = LSM6DSOX(I2C(0, scl=Pin(13), sda=Pin(12)))
 
+# Or init in SPI mode.
+#lsm = LSM6DSOX(SPI(5), cs_pin=Pin(10))
+
 while (True):
     print('Accelerometer: x:{:>8.3f} y:{:>8.3f} z:{:>8.3f}'.format(*lsm.read_accel()))
     print('Gyroscope:     x:{:>8.3f} y:{:>8.3f} z:{:>8.3f}'.format(*lsm.read_gyro()))
     print("")
     time.sleep_ms(100)
 """
+
 import array
 from micropython import const
 
@@ -73,7 +78,8 @@ class LSM6DSOX:
 
     def __init__(
         self,
-        i2c,
+        bus,
+        cs_pin=None,
         address=_DEFAULT_ADDR,
         gyro_odr=104,
         accel_odr=104,
@@ -88,8 +94,13 @@ def __init__(
         accel_scale: (+/-2g, +/-4g, +/-8g, +-16g)
         ucf: MLC program to load.
         """
-        self.i2c = i2c
+        self.bus = bus
+        self.cs_pin = cs_pin
         self.address = address
+        self._use_i2c = hasattr(self.bus, "readfrom_mem")
+
+        if not self._use_i2c and cs_pin is None:
+            raise ValueError("A CS pin must be provided in SPI mode")
 
         # check the id of the Accelerometer/Gyro
         if self.__read_reg(_WHO_AM_I_REG) != 108:
@@ -149,13 +160,39 @@ def __init__(
         self.accel_scale = 32768 / accel_scale
 
     def __read_reg(self, reg, size=1):
-        buf = self.i2c.readfrom_mem(self.address, reg, size)
+        if self._use_i2c:
+            buf = self.bus.readfrom_mem(self.address, reg, size)
+        else:
+            try:
+                self.cs_pin(0)
+                self.bus.write(bytes([reg | 0x80]))
+                buf = self.bus.read(size)
+            finally:
+                self.cs_pin(1)
         if size == 1:
             return int(buf[0])
         return [int(x) for x in buf]
 
     def __write_reg(self, reg, val):
-        self.i2c.writeto_mem(self.address, reg, bytes([val]))
+        if self._use_i2c:
+            self.bus.writeto_mem(self.address, reg, bytes([val]))
+        else:
+            try:
+                self.cs_pin(0)
+                self.bus.write(bytes([reg, val]))
+            finally:
+                self.cs_pin(1)
+
+    def __read_reg_into(self, reg, buf):
+        if self._use_i2c:
+            self.bus.readfrom_mem_into(self.address, reg, buf)
+        else:
+            try:
+                self.cs_pin(0)
+                self.bus.write(bytes([reg | 0x80]))
+                self.bus.readinto(buf)
+            finally:
+                self.cs_pin(1)
 
     def reset(self):
         self.__write_reg(_CTRL3_C, self.__read_reg(_CTRL3_C) | 0x1)
@@ -223,12 +260,12 @@ def read_gyro(self):
         """Returns gyroscope vector in degrees/sec."""
         mv = memoryview(self.scratch_int)
         f = self.gyro_scale
-        self.i2c.readfrom_mem_into(self.address, _OUTX_L_G, mv)
+        self.__read_reg_into(_OUTX_L_G, mv)
         return (mv[0] / f, mv[1] / f, mv[2] / f)
 
     def read_accel(self):
         """Returns acceleration vector in gravity units (9.81m/s^2)."""
         mv = memoryview(self.scratch_int)
         f = self.accel_scale
-        self.i2c.readfrom_mem_into(self.address, _OUTX_L_XL, mv)
+        self.__read_reg_into(_OUTX_L_XL, mv)
         return (mv[0] / f, mv[1] / f, mv[2] / f)
diff --git a/drivers/lsm6dsox/lsm6dsox_basic.py b/drivers/lsm6dsox/lsm6dsox_basic.py
index 6c747ae55c0e6..0ffe9e92b7689 100644
--- a/drivers/lsm6dsox/lsm6dsox_basic.py
+++ b/drivers/lsm6dsox/lsm6dsox_basic.py
@@ -5,6 +5,8 @@
 from machine import Pin, I2C
 
 lsm = LSM6DSOX(I2C(0, scl=Pin(13), sda=Pin(12)))
+# Or init in SPI mode.
+# lsm = LSM6DSOX(SPI(5), cs_pin=Pin(10))
 
 while True:
     print("Accelerometer: x:{:>8.3f} y:{:>8.3f} z:{:>8.3f}".format(*lsm.read_accel()))

From dbe8b0c0ca20d6610c6d2b9b760485a55cacd72d Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sat, 1 Jan 2022 14:00:37 +0100
Subject: [PATCH 2126/3533] lib/nxp_driver: Update nxp_driver to v2.10.

---
 lib/nxp_driver | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/nxp_driver b/lib/nxp_driver
index b618cb1d521cc..fa5a554c7944d 160000
--- a/lib/nxp_driver
+++ b/lib/nxp_driver
@@ -1 +1 @@
-Subproject commit b618cb1d521cc9e133bdcd0fca154dee2d925dfe
+Subproject commit fa5a554c7944d2a196626f8d3631e44943f9abcc

From a0432ed9cb1a786db1e52ca1b3224d479c6f5f22 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sat, 1 Jan 2022 14:00:37 +0100
Subject: [PATCH 2127/3533] mimxrt: Update port to work with new nxp_driver
 v2.10.

The nxp_driver v2.10 allows for/requires some changes to the code:

- Remove some part of pwm_backlog.*, which is provided by the lib now.
- Change eth.c: the newer versions have additional parameters of the
  library versions.
- Change sdcard.c: use TransferBlocking instead of TransferNonblocking.
- Add some support for the MIMXRT1176 device.
- Set the clocks for UART, I2C, Timer.
- Integrate the I2S module and fix a rebase error.
- Use blocking transfer only for SPI.  It's faster and interferes less with
  other modules.
- Use the clock_config.c files of library v2.8.5.  The mimxrt files keeps
  the clock_config.c files from Verson 2.8.5.  With clock_config.c from
  v2.10, the boards do not work.  Refactoring of the clock set-up is on the
  to-do list.
- Enable expiry timers for UART, I2C and SPI, avoiding a stall in library
  code.
- The clock_config.* files are moved from the board-specific directories to
  the boards directory and given a MCU related name.
---
 ports/mimxrt/Makefile                         |   5 +-
 ports/mimxrt/board_init.c                     |   2 +-
 ports/mimxrt/boards/MIMXRT1011_clock_config.c | 342 ++++++++++++
 ...ock_config.h => MIMXRT1011_clock_config.h} |   0
 ports/mimxrt/boards/MIMXRT1015_clock_config.c | 359 +++++++++++++
 ...ock_config.h => MIMXRT1015_clock_config.h} |   0
 ports/mimxrt/boards/MIMXRT1021_clock_config.c | 417 +++++++++++++++
 ...ock_config.h => MIMXRT1021_clock_config.h} |   0
 ports/mimxrt/boards/MIMXRT1052_clock_config.c | 468 +++++++++++++++++
 ...ock_config.h => MIMXRT1052_clock_config.h} |   0
 ports/mimxrt/boards/MIMXRT1062_clock_config.c | 490 ++++++++++++++++++
 ...ock_config.h => MIMXRT1062_clock_config.h} |   0
 ports/mimxrt/boards/MIMXRT1064_clock_config.c | 490 ++++++++++++++++++
 ...ock_config.h => MIMXRT1064_clock_config.h} |   0
 .../boards/OLIMEX_RT1010/clock_config.h       | 104 ----
 .../boards/SEEED_ARCH_MIX/clock_config.h      | 119 -----
 ports/mimxrt/boards/TEENSY40/clock_config.h   | 122 -----
 ports/mimxrt/boards/TEENSY41/clock_config.h   | 122 -----
 ports/mimxrt/eth.c                            |  20 +-
 ports/mimxrt/hal/board.h                      |   2 +-
 .../mimxrt/hal/phy/mdio/enet/fsl_enet_mdio.c  |   2 +-
 ports/mimxrt/hal/pwm_backport.c               |  23 -
 ports/mimxrt/hal/pwm_backport.h               |   8 -
 ports/mimxrt/machine_i2c.c                    |  12 +-
 ports/mimxrt/machine_i2s.c                    |   2 +-
 ports/mimxrt/machine_spi.c                    | 134 +----
 ports/mimxrt/machine_timer.c                  |   4 +-
 ports/mimxrt/machine_uart.c                   |  15 +-
 ports/mimxrt/sdcard.c                         |  82 ++-
 29 files changed, 2693 insertions(+), 651 deletions(-)
 create mode 100644 ports/mimxrt/boards/MIMXRT1011_clock_config.c
 rename ports/mimxrt/boards/{MIMXRT1010_EVK/clock_config.h => MIMXRT1011_clock_config.h} (100%)
 create mode 100644 ports/mimxrt/boards/MIMXRT1015_clock_config.c
 rename ports/mimxrt/boards/{MIMXRT1015_EVK/clock_config.h => MIMXRT1015_clock_config.h} (100%)
 create mode 100644 ports/mimxrt/boards/MIMXRT1021_clock_config.c
 rename ports/mimxrt/boards/{MIMXRT1020_EVK/clock_config.h => MIMXRT1021_clock_config.h} (100%)
 create mode 100644 ports/mimxrt/boards/MIMXRT1052_clock_config.c
 rename ports/mimxrt/boards/{MIMXRT1050_EVK/clock_config.h => MIMXRT1052_clock_config.h} (100%)
 create mode 100644 ports/mimxrt/boards/MIMXRT1062_clock_config.c
 rename ports/mimxrt/boards/{MIMXRT1060_EVK/clock_config.h => MIMXRT1062_clock_config.h} (100%)
 create mode 100644 ports/mimxrt/boards/MIMXRT1064_clock_config.c
 rename ports/mimxrt/boards/{MIMXRT1064_EVK/clock_config.h => MIMXRT1064_clock_config.h} (100%)
 delete mode 100644 ports/mimxrt/boards/OLIMEX_RT1010/clock_config.h
 delete mode 100644 ports/mimxrt/boards/SEEED_ARCH_MIX/clock_config.h
 delete mode 100644 ports/mimxrt/boards/TEENSY40/clock_config.h
 delete mode 100644 ports/mimxrt/boards/TEENSY41/clock_config.h

diff --git a/ports/mimxrt/Makefile b/ports/mimxrt/Makefile
index 985ece0845df1..cfcdb9f7d5212 100644
--- a/ports/mimxrt/Makefile
+++ b/ports/mimxrt/Makefile
@@ -88,9 +88,12 @@ CFLAGS += -DXIP_EXTERNAL_FLASH=1 \
 	-D__STARTUP_INITIALIZE_RAMFUNCTION \
 	-D__START=main \
 	-DCPU_HEADER_H='<$(MCU_SERIES).h>' \
+	-DCLOCK_CONFIG_H='<boards/$(MCU_SERIES)_clock_config.h>' \
 	-DBOARD_FLASH_SIZE=$(MICROPY_HW_FLASH_SIZE) \
 	-DMICROPY_HW_FLASH_SIZE=$(MICROPY_HW_FLASH_SIZE) \
 
+CFLAGS += -DI2C_RETRY_TIMES=1000000 -DSPI_RETRY_TIMES=1000000 -DUART_RETRY_TIMES=1000000
+
 ifeq ($(MICROPY_PY_MACHINE_SDCARD),1)
 CFLAGS += -DMICROPY_PY_MACHINE_SDCARD=1
 endif
@@ -194,7 +197,6 @@ SRC_HAL_IMX_C += \
 	$(MCU_DIR)/drivers/fsl_snvs_lp.c \
 	$(MCU_DIR)/drivers/fsl_trng.c \
 	$(MCU_DIR)/drivers/fsl_wdog.c \
-	$(MCU_DIR)/project_template/clock_config.c \
 	$(MCU_DIR)/system_$(MCU_SERIES).c \
 	$(MCU_DIR)/xip/fsl_flexspi_nor_boot.c \
 
@@ -213,6 +215,7 @@ endif
 
 SRC_C += \
 	board_init.c \
+	boards/$(MCU_SERIES)_clock_config.c \
 	dma_manager.c \
 	drivers/bus/softspi.c \
 	drivers/dht/dht.c \
diff --git a/ports/mimxrt/board_init.c b/ports/mimxrt/board_init.c
index 398fafc6c3772..c3dbb652bc06c 100644
--- a/ports/mimxrt/board_init.c
+++ b/ports/mimxrt/board_init.c
@@ -37,7 +37,7 @@
 #include "fsl_clock.h"
 #include "fsl_lpuart.h"
 
-#include "clock_config.h"
+#include CLOCK_CONFIG_H
 #include "modmachine.h"
 
 
diff --git a/ports/mimxrt/boards/MIMXRT1011_clock_config.c b/ports/mimxrt/boards/MIMXRT1011_clock_config.c
new file mode 100644
index 0000000000000..cc889d314a920
--- /dev/null
+++ b/ports/mimxrt/boards/MIMXRT1011_clock_config.c
@@ -0,0 +1,342 @@
+/*
+ * Copyright 2019 NXP
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+/*
+ * How to setup clock using clock driver functions:
+ *
+ * 1. Call CLOCK_InitXXXPLL() to configure corresponding PLL clock.
+ *
+ * 2. Call CLOCK_InitXXXpfd() to configure corresponding PLL pfd clock.
+ *
+ * 3. Call CLOCK_SetMux() to configure corresponding clock source for target clock out.
+ *
+ * 4. Call CLOCK_SetDiv() to configure corresponding clock divider for target clock out.
+ *
+ * 5. Call CLOCK_SetXtalFreq() to set XTAL frequency based on board settings.
+ *
+ */
+
+/* TEXT BELOW IS USED AS SETTING FOR TOOLS *************************************
+!!GlobalInfo
+product: Clocks v6.0
+processor: MIMXRT1011xxxxx
+package_id: MIMXRT1011DAE5A
+mcu_data: ksdk2_0
+processor_version: 0.0.1
+board: MIMXRT1010-EVK
+ * BE CAREFUL MODIFYING THIS COMMENT - IT IS YAML SETTINGS FOR TOOLS **********/
+
+#include CLOCK_CONFIG_H
+#include "fsl_iomuxc.h"
+
+/*******************************************************************************
+ * Definitions
+ ******************************************************************************/
+
+/*******************************************************************************
+ * Variables
+ ******************************************************************************/
+/* System clock frequency. */
+extern uint32_t SystemCoreClock;
+
+/*******************************************************************************
+ ************************ BOARD_InitBootClocks function ************************
+ ******************************************************************************/
+void BOARD_InitBootClocks(void) {
+    BOARD_BootClockRUN();
+}
+
+/*******************************************************************************
+ ********************** Configuration BOARD_BootClockRUN ***********************
+ ******************************************************************************/
+/* TEXT BELOW IS USED AS SETTING FOR TOOLS *************************************
+!!Configuration
+name: BOARD_BootClockRUN
+called_from_default_init: true
+outputs:
+- {id: ADC_ALT_CLK.outFreq, value: 40 MHz}
+- {id: CKIL_SYNC_CLK_ROOT.outFreq, value: 32.768 kHz}
+- {id: CLK_1M.outFreq, value: 1 MHz}
+- {id: CLK_24M.outFreq, value: 24 MHz}
+- {id: CORE_CLK_ROOT.outFreq, value: 500 MHz}
+- {id: ENET_500M_REF_CLK.outFreq, value: 500 MHz}
+- {id: FLEXIO1_CLK_ROOT.outFreq, value: 30 MHz}
+- {id: FLEXSPI_CLK_ROOT.outFreq, value: 132 MHz}
+- {id: GPT1_ipg_clk_highfreq.outFreq, value: 62.5 MHz}
+- {id: GPT2_ipg_clk_highfreq.outFreq, value: 62.5 MHz}
+- {id: IPG_CLK_ROOT.outFreq, value: 125 MHz}
+- {id: LPI2C_CLK_ROOT.outFreq, value: 60 MHz}
+- {id: LPSPI_CLK_ROOT.outFreq, value: 105.6 MHz}
+- {id: MQS_MCLK.outFreq, value: 1080/17 MHz}
+- {id: PERCLK_CLK_ROOT.outFreq, value: 62.5 MHz}
+- {id: SAI1_CLK_ROOT.outFreq, value: 1080/17 MHz}
+- {id: SAI1_MCLK1.outFreq, value: 1080/17 MHz}
+- {id: SAI1_MCLK2.outFreq, value: 1080/17 MHz}
+- {id: SAI1_MCLK3.outFreq, value: 30 MHz}
+- {id: SAI3_CLK_ROOT.outFreq, value: 1080/17 MHz}
+- {id: SAI3_MCLK1.outFreq, value: 1080/17 MHz}
+- {id: SAI3_MCLK3.outFreq, value: 30 MHz}
+- {id: SPDIF0_CLK_ROOT.outFreq, value: 30 MHz}
+- {id: TRACE_CLK_ROOT.outFreq, value: 352/3 MHz}
+- {id: UART_CLK_ROOT.outFreq, value: 80 MHz}
+settings:
+- {id: CCM.ADC_ACLK_PODF.scale, value: '12', locked: true}
+- {id: CCM.AHB_PODF.scale, value: '1', locked: true}
+- {id: CCM.FLEXSPI_PODF.scale, value: '4', locked: true}
+- {id: CCM.IPG_PODF.scale, value: '4'}
+- {id: CCM.LPSPI_PODF.scale, value: '5', locked: true}
+- {id: CCM.PERCLK_PODF.scale, value: '2', locked: true}
+- {id: CCM.PRE_PERIPH_CLK_SEL.sel, value: CCM_ANALOG.ENET_500M_REF_CLK}
+- {id: CCM.SAI1_CLK_SEL.sel, value: CCM_ANALOG.PLL3_PFD2_CLK}
+- {id: CCM.SAI3_CLK_SEL.sel, value: CCM_ANALOG.PLL3_PFD2_CLK}
+- {id: CCM.TRACE_PODF.scale, value: '3', locked: true}
+- {id: CCM_ANALOG.PLL2.denom, value: '1'}
+- {id: CCM_ANALOG.PLL2.div, value: '22'}
+- {id: CCM_ANALOG.PLL2.num, value: '0'}
+- {id: CCM_ANALOG.PLL2_BYPASS.sel, value: CCM_ANALOG.PLL2_OUT_CLK}
+- {id: CCM_ANALOG.PLL2_PFD0_BYPASS.sel, value: CCM_ANALOG.PLL2_PFD0}
+- {id: CCM_ANALOG.PLL2_PFD1_BYPASS.sel, value: CCM_ANALOG.PLL2_PFD1}
+- {id: CCM_ANALOG.PLL2_PFD2_BYPASS.sel, value: CCM_ANALOG.PLL2_PFD2}
+- {id: CCM_ANALOG.PLL2_PFD2_DIV.scale, value: '18', locked: true}
+- {id: CCM_ANALOG.PLL2_PFD2_MUL.scale, value: '18', locked: true}
+- {id: CCM_ANALOG.PLL2_PFD3_BYPASS.sel, value: CCM_ANALOG.PLL2_PFD3}
+- {id: CCM_ANALOG.PLL2_PFD3_DIV.scale, value: '18', locked: true}
+- {id: CCM_ANALOG.PLL2_PFD3_MUL.scale, value: '18', locked: true}
+- {id: CCM_ANALOG.PLL3_BYPASS.sel, value: CCM_ANALOG.PLL3}
+- {id: CCM_ANALOG.PLL3_PFD0_BYPASS.sel, value: CCM_ANALOG.PLL3_PFD0}
+- {id: CCM_ANALOG.PLL3_PFD0_DIV.scale, value: '22', locked: true}
+- {id: CCM_ANALOG.PLL3_PFD0_MUL.scale, value: '18', locked: true}
+- {id: CCM_ANALOG.PLL3_PFD1_BYPASS.sel, value: CCM_ANALOG.PLL3_PFD1}
+- {id: CCM_ANALOG.PLL3_PFD2_BYPASS.sel, value: CCM_ANALOG.PLL3_PFD2}
+- {id: CCM_ANALOG.PLL3_PFD3_BYPASS.sel, value: CCM_ANALOG.PLL3_PFD3}
+- {id: CCM_ANALOG.PLL3_PFD3_DIV.scale, value: '18', locked: true}
+- {id: CCM_ANALOG.PLL3_PFD3_MUL.scale, value: '18', locked: true}
+- {id: CCM_ANALOG.PLL6_BYPASS.sel, value: CCM_ANALOG.PLL6}
+- {id: CCM_ANALOG_PLL_USB1_POWER_CFG, value: 'Yes'}
+sources:
+- {id: XTALOSC24M.OSC.outFreq, value: 24 MHz, enabled: true}
+- {id: XTALOSC24M.RTC_OSC.outFreq, value: 32.768 kHz, enabled: true}
+ * BE CAREFUL MODIFYING THIS COMMENT - IT IS YAML SETTINGS FOR TOOLS **********/
+
+/*******************************************************************************
+ * Variables for BOARD_BootClockRUN configuration
+ ******************************************************************************/
+const clock_sys_pll_config_t sysPllConfig_BOARD_BootClockRUN = {
+    .loopDivider = 1, /* PLL loop divider, Fout = Fin * ( 20 + loopDivider*2 + numerator / denominator ) */
+    .numerator = 0,   /* 30 bit numerator of fractional loop divider */
+    .denominator = 1, /* 30 bit denominator of fractional loop divider */
+    .src = 0,         /* Bypass clock source, 0 - OSC 24M, 1 - CLK1_P and CLK1_N */
+};
+const clock_usb_pll_config_t usb1PllConfig_BOARD_BootClockRUN = {
+    .loopDivider = 0, /* PLL loop divider, Fout = Fin * 20 */
+    .src = 0,         /* Bypass clock source, 0 - OSC 24M, 1 - CLK1_P and CLK1_N */
+};
+const clock_enet_pll_config_t enetPllConfig_BOARD_BootClockRUN = {
+    .enableClkOutput500M = true, /* Enable the PLL providing the ENET 500MHz reference clock */
+    .src = 0,                    /* Bypass clock source, 0 - OSC 24M, 1 - CLK1_P and CLK1_N */
+};
+/*******************************************************************************
+ * Code for BOARD_BootClockRUN configuration
+ ******************************************************************************/
+void BOARD_BootClockRUN(void) {
+    /* Init RTC OSC clock frequency. */
+    CLOCK_SetRtcXtalFreq(32768U);
+    /* Enable 1MHz clock output. */
+    XTALOSC24M->OSC_CONFIG2 |= XTALOSC24M_OSC_CONFIG2_ENABLE_1M_MASK;
+    /* Use free 1MHz clock output. */
+    XTALOSC24M->OSC_CONFIG2 &= ~XTALOSC24M_OSC_CONFIG2_MUX_1M_MASK;
+    /* Set XTAL 24MHz clock frequency. */
+    CLOCK_SetXtalFreq(24000000U);
+    /* Enable XTAL 24MHz clock source. */
+    CLOCK_InitExternalClk(0);
+    /* Enable internal RC. */
+    CLOCK_InitRcOsc24M();
+    /* Switch clock source to external OSC. */
+    CLOCK_SwitchOsc(kCLOCK_XtalOsc);
+    /* Set Oscillator ready counter value. */
+    CCM->CCR = (CCM->CCR & (~CCM_CCR_OSCNT_MASK)) | CCM_CCR_OSCNT(127);
+    /* Setting PeriphClk2Mux and PeriphMux to provide stable clock before PLLs are initialed */
+    CLOCK_SetMux(kCLOCK_PeriphClk2Mux, 1); /* Set PERIPH_CLK2 MUX to OSC */
+    CLOCK_SetMux(kCLOCK_PeriphMux, 1);     /* Set PERIPH_CLK MUX to PERIPH_CLK2 */
+    /* Setting the VDD_SOC to 1.5V. It is necessary to config CORE to 500Mhz. */
+    DCDC->REG3 = (DCDC->REG3 & (~DCDC_REG3_TRG_MASK)) | DCDC_REG3_TRG(0x12);
+    /* Waiting for DCDC_STS_DC_OK bit is asserted */
+    while (DCDC_REG0_STS_DC_OK_MASK != (DCDC_REG0_STS_DC_OK_MASK & DCDC->REG0)) {
+    }
+    /* Set AHB_PODF. */
+    CLOCK_SetDiv(kCLOCK_AhbDiv, 0);
+    /* Disable IPG clock gate. */
+    CLOCK_DisableClock(kCLOCK_Adc1);
+    CLOCK_DisableClock(kCLOCK_Xbar1);
+    /* Set IPG_PODF. */
+    CLOCK_SetDiv(kCLOCK_IpgDiv, 3);
+    /* Disable PERCLK clock gate. */
+    CLOCK_DisableClock(kCLOCK_Gpt1);
+    CLOCK_DisableClock(kCLOCK_Gpt1S);
+    CLOCK_DisableClock(kCLOCK_Gpt2);
+    CLOCK_DisableClock(kCLOCK_Gpt2S);
+    CLOCK_DisableClock(kCLOCK_Pit);
+    /* Set PERCLK_PODF. */
+    CLOCK_SetDiv(kCLOCK_PerclkDiv, 1);
+    /* In SDK projects, external flash (configured by FLEXSPI) will be initialized by dcd.
+     * With this macro XIP_EXTERNAL_FLASH, usb1 pll (selected to be FLEXSPI clock source in SDK projects) will be left
+     * unchanged. Note: If another clock source is selected for FLEXSPI, user may want to avoid changing that clock as
+     * well.*/
+    #if !(defined(XIP_EXTERNAL_FLASH) && (XIP_EXTERNAL_FLASH == 1))
+    /* Disable Flexspi clock gate. */
+    CLOCK_DisableClock(kCLOCK_FlexSpi);
+    /* Set FLEXSPI_PODF. */
+    CLOCK_SetDiv(kCLOCK_FlexspiDiv, 3);
+    /* Set Flexspi clock source. */
+    CLOCK_SetMux(kCLOCK_FlexspiMux, 0);
+    CLOCK_SetMux(kCLOCK_FlexspiSrcMux, 0);
+    #endif
+    /* Disable ADC_ACLK_EN clock gate. */
+    CCM->CSCMR2 &= ~CCM_CSCMR2_ADC_ACLK_EN_MASK;
+    /* Set ADC_ACLK_PODF. */
+    CLOCK_SetDiv(kCLOCK_AdcDiv, 11);
+    /* Disable LPSPI clock gate. */
+    CLOCK_DisableClock(kCLOCK_Lpspi1);
+    CLOCK_DisableClock(kCLOCK_Lpspi2);
+    /* Set LPSPI_PODF. */
+    CLOCK_SetDiv(kCLOCK_LpspiDiv, 4);
+    /* Set Lpspi clock source. */
+    CLOCK_SetMux(kCLOCK_LpspiMux, 2);
+    /* Disable TRACE clock gate. */
+    CLOCK_DisableClock(kCLOCK_Trace);
+    /* Set TRACE_PODF. */
+    CLOCK_SetDiv(kCLOCK_TraceDiv, 2);
+    /* Set Trace clock source. */
+    CLOCK_SetMux(kCLOCK_TraceMux, 2);
+    /* Disable SAI1 clock gate. */
+    CLOCK_DisableClock(kCLOCK_Sai1);
+    /* Set SAI1_CLK_PRED. */
+    CLOCK_SetDiv(kCLOCK_Sai1PreDiv, 3);
+    /* Set SAI1_CLK_PODF. */
+    CLOCK_SetDiv(kCLOCK_Sai1Div, 1);
+    /* Set Sai1 clock source. */
+    CLOCK_SetMux(kCLOCK_Sai1Mux, 0);
+    /* Disable SAI3 clock gate. */
+    CLOCK_DisableClock(kCLOCK_Sai3);
+    /* Set SAI3_CLK_PRED. */
+    CLOCK_SetDiv(kCLOCK_Sai3PreDiv, 3);
+    /* Set SAI3_CLK_PODF. */
+    CLOCK_SetDiv(kCLOCK_Sai3Div, 1);
+    /* Set Sai3 clock source. */
+    CLOCK_SetMux(kCLOCK_Sai3Mux, 0);
+    /* Disable Lpi2c clock gate. */
+    CLOCK_DisableClock(kCLOCK_Lpi2c1);
+    CLOCK_DisableClock(kCLOCK_Lpi2c2);
+    /* Set LPI2C_CLK_PODF. */
+    CLOCK_SetDiv(kCLOCK_Lpi2cDiv, 0);
+    /* Set Lpi2c clock source. */
+    CLOCK_SetMux(kCLOCK_Lpi2cMux, 0);
+    /* Disable UART clock gate. */
+    CLOCK_DisableClock(kCLOCK_Lpuart1);
+    CLOCK_DisableClock(kCLOCK_Lpuart2);
+    CLOCK_DisableClock(kCLOCK_Lpuart3);
+    CLOCK_DisableClock(kCLOCK_Lpuart4);
+    /* Set UART_CLK_PODF. */
+    CLOCK_SetDiv(kCLOCK_UartDiv, 0);
+    /* Set Uart clock source. */
+    CLOCK_SetMux(kCLOCK_UartMux, 0);
+    /* Disable SPDIF clock gate. */
+    CLOCK_DisableClock(kCLOCK_Spdif);
+    /* Set SPDIF0_CLK_PRED. */
+    CLOCK_SetDiv(kCLOCK_Spdif0PreDiv, 1);
+    /* Set SPDIF0_CLK_PODF. */
+    CLOCK_SetDiv(kCLOCK_Spdif0Div, 7);
+    /* Set Spdif clock source. */
+    CLOCK_SetMux(kCLOCK_SpdifMux, 3);
+    /* Disable Flexio1 clock gate. */
+    CLOCK_DisableClock(kCLOCK_Flexio1);
+    /* Set FLEXIO1_CLK_PRED. */
+    CLOCK_SetDiv(kCLOCK_Flexio1PreDiv, 1);
+    /* Set FLEXIO1_CLK_PODF. */
+    CLOCK_SetDiv(kCLOCK_Flexio1Div, 7);
+    /* Set Flexio1 clock source. */
+    CLOCK_SetMux(kCLOCK_Flexio1Mux, 3);
+    /* Set Pll3 sw clock source. */
+    CLOCK_SetMux(kCLOCK_Pll3SwMux, 0);
+    /* Init System PLL. */
+    CLOCK_InitSysPll(&sysPllConfig_BOARD_BootClockRUN);
+    /* Init System pfd0. */
+    CLOCK_InitSysPfd(kCLOCK_Pfd0, 27);
+    /* Init System pfd1. */
+    CLOCK_InitSysPfd(kCLOCK_Pfd1, 16);
+    /* Init System pfd2. */
+    CLOCK_InitSysPfd(kCLOCK_Pfd2, 18);
+    /* Init System pfd3. */
+    CLOCK_InitSysPfd(kCLOCK_Pfd3, 18);
+    /* In SDK projects, external flash (configured by FLEXSPI) will be initialized by dcd.
+     * With this macro XIP_EXTERNAL_FLASH, usb1 pll (selected to be FLEXSPI clock source in SDK projects) will be left
+     * unchanged. Note: If another clock source is selected for FLEXSPI, user may want to avoid changing that clock as
+     * well.*/
+    #if !(defined(XIP_EXTERNAL_FLASH) && (XIP_EXTERNAL_FLASH == 1))
+    /* Init Usb1 PLL. */
+    CLOCK_InitUsb1Pll(&usb1PllConfig_BOARD_BootClockRUN);
+    /* Init Usb1 pfd0. */
+    CLOCK_InitUsb1Pfd(kCLOCK_Pfd0, 22);
+    /* Init Usb1 pfd1. */
+    CLOCK_InitUsb1Pfd(kCLOCK_Pfd1, 16);
+    /* Init Usb1 pfd2. */
+    CLOCK_InitUsb1Pfd(kCLOCK_Pfd2, 17);
+    /* Init Usb1 pfd3. */
+    CLOCK_InitUsb1Pfd(kCLOCK_Pfd3, 18);
+    /* Disable Usb1 PLL output for USBPHY1. */
+    CCM_ANALOG->PLL_USB1 &= ~CCM_ANALOG_PLL_USB1_EN_USB_CLKS_MASK;
+    #endif
+    /* DeInit Audio PLL. */
+    CLOCK_DeinitAudioPll();
+    /* Bypass Audio PLL. */
+    CLOCK_SetPllBypass(CCM_ANALOG, kCLOCK_PllAudio, 1);
+    /* Set divider for Audio PLL. */
+    CCM_ANALOG->MISC2 &= ~CCM_ANALOG_MISC2_AUDIO_DIV_LSB_MASK;
+    CCM_ANALOG->MISC2 &= ~CCM_ANALOG_MISC2_AUDIO_DIV_MSB_MASK;
+    /* Enable Audio PLL output. */
+    CCM_ANALOG->PLL_AUDIO |= CCM_ANALOG_PLL_AUDIO_ENABLE_MASK;
+    /* Init Enet PLL. */
+    CLOCK_InitEnetPll(&enetPllConfig_BOARD_BootClockRUN);
+    /* Set preperiph clock source. */
+    CLOCK_SetMux(kCLOCK_PrePeriphMux, 3);
+    /* Set periph clock source. */
+    CLOCK_SetMux(kCLOCK_PeriphMux, 0);
+    /* Set periph clock2 clock source. */
+    CLOCK_SetMux(kCLOCK_PeriphClk2Mux, 0);
+    /* Set per clock source. */
+    CLOCK_SetMux(kCLOCK_PerclkMux, 0);
+    /* Set clock out1 divider. */
+    CCM->CCOSR = (CCM->CCOSR & (~CCM_CCOSR_CLKO1_DIV_MASK)) | CCM_CCOSR_CLKO1_DIV(0);
+    /* Set clock out1 source. */
+    CCM->CCOSR = (CCM->CCOSR & (~CCM_CCOSR_CLKO1_SEL_MASK)) | CCM_CCOSR_CLKO1_SEL(1);
+    /* Set clock out2 divider. */
+    CCM->CCOSR = (CCM->CCOSR & (~CCM_CCOSR_CLKO2_DIV_MASK)) | CCM_CCOSR_CLKO2_DIV(0);
+    /* Set clock out2 source. */
+    CCM->CCOSR = (CCM->CCOSR & (~CCM_CCOSR_CLKO2_SEL_MASK)) | CCM_CCOSR_CLKO2_SEL(18);
+    /* Set clock out1 drives clock out1. */
+    CCM->CCOSR &= ~CCM_CCOSR_CLK_OUT_SEL_MASK;
+    /* Disable clock out1. */
+    CCM->CCOSR &= ~CCM_CCOSR_CLKO1_EN_MASK;
+    /* Disable clock out2. */
+    CCM->CCOSR &= ~CCM_CCOSR_CLKO2_EN_MASK;
+    /* Set SAI1 MCLK1 clock source. */
+    IOMUXC_SetSaiMClkClockSource(IOMUXC_GPR, kIOMUXC_GPR_SAI1MClk1Sel, 0);
+    /* Set SAI1 MCLK2 clock source. */
+    IOMUXC_SetSaiMClkClockSource(IOMUXC_GPR, kIOMUXC_GPR_SAI1MClk2Sel, 0);
+    /* Set SAI1 MCLK3 clock source. */
+    IOMUXC_SetSaiMClkClockSource(IOMUXC_GPR, kIOMUXC_GPR_SAI1MClk3Sel, 0);
+    /* Set SAI3 MCLK3 clock source. */
+    IOMUXC_SetSaiMClkClockSource(IOMUXC_GPR, kIOMUXC_GPR_SAI3MClk3Sel, 0);
+    /* Set MQS configuration. */
+    IOMUXC_MQSConfig(IOMUXC_GPR, kIOMUXC_MqsPwmOverSampleRate32, 0);
+    /* Set GPT1 High frequency reference clock source. */
+    IOMUXC_GPR->GPR5 &= ~IOMUXC_GPR_GPR5_VREF_1M_CLK_GPT1_MASK;
+    /* Set GPT2 High frequency reference clock source. */
+    IOMUXC_GPR->GPR5 &= ~IOMUXC_GPR_GPR5_VREF_1M_CLK_GPT2_MASK;
+    /* Set SystemCoreClock variable. */
+    SystemCoreClock = BOARD_BOOTCLOCKRUN_CORE_CLOCK;
+}
diff --git a/ports/mimxrt/boards/MIMXRT1010_EVK/clock_config.h b/ports/mimxrt/boards/MIMXRT1011_clock_config.h
similarity index 100%
rename from ports/mimxrt/boards/MIMXRT1010_EVK/clock_config.h
rename to ports/mimxrt/boards/MIMXRT1011_clock_config.h
diff --git a/ports/mimxrt/boards/MIMXRT1015_clock_config.c b/ports/mimxrt/boards/MIMXRT1015_clock_config.c
new file mode 100644
index 0000000000000..7cc91f95111df
--- /dev/null
+++ b/ports/mimxrt/boards/MIMXRT1015_clock_config.c
@@ -0,0 +1,359 @@
+/*
+ * Copyright 2018-2019 NXP
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+/*
+ * How to setup clock using clock driver functions:
+ *
+ * 1. Call CLOCK_InitXXXPLL() to configure corresponding PLL clock.
+ *
+ * 2. Call CLOCK_InitXXXpfd() to configure corresponding PLL pfd clock.
+ *
+ * 3. Call CLOCK_SetMux() to configure corresponding clock source for target clock out.
+ *
+ * 4. Call CLOCK_SetDiv() to configure corresponding clock divider for target clock out.
+ *
+ * 5. Call CLOCK_SetXtalFreq() to set XTAL frequency based on board settings.
+ *
+ */
+
+/* TEXT BELOW IS USED AS SETTING FOR TOOLS *************************************
+!!GlobalInfo
+product: Clocks v5.0
+processor: MIMXRT1015xxxxx
+package_id: MIMXRT1015DAF5A
+mcu_data: ksdk2_0
+processor_version: 0.0.0
+board: MIMXRT1015-EVK
+ * BE CAREFUL MODIFYING THIS COMMENT - IT IS YAML SETTINGS FOR TOOLS **********/
+
+#include CLOCK_CONFIG_H
+#include "fsl_iomuxc.h"
+
+/*******************************************************************************
+ * Definitions
+ ******************************************************************************/
+
+/*******************************************************************************
+ * Variables
+ ******************************************************************************/
+/* System clock frequency. */
+extern uint32_t SystemCoreClock;
+
+/*******************************************************************************
+ ************************ BOARD_InitBootClocks function ************************
+ ******************************************************************************/
+void BOARD_InitBootClocks(void) {
+    BOARD_BootClockRUN();
+}
+
+/*******************************************************************************
+ ********************** Configuration BOARD_BootClockRUN ***********************
+ ******************************************************************************/
+/* TEXT BELOW IS USED AS SETTING FOR TOOLS *************************************
+!!Configuration
+name: BOARD_BootClockRUN
+called_from_default_init: true
+outputs:
+- {id: AHB_CLK_ROOT.outFreq, value: 500 MHz}
+- {id: CKIL_SYNC_CLK_ROOT.outFreq, value: 32.768 kHz}
+- {id: CLK_1M.outFreq, value: 1 MHz}
+- {id: CLK_24M.outFreq, value: 24 MHz}
+- {id: ENET_500M_REF_CLK.outFreq, value: 500 MHz}
+- {id: FLEXIO1_CLK_ROOT.outFreq, value: 30 MHz}
+- {id: FLEXSPI_CLK_ROOT.outFreq, value: 125 MHz}
+- {id: GPT1_ipg_clk_highfreq.outFreq, value: 62.5 MHz}
+- {id: GPT2_ipg_clk_highfreq.outFreq, value: 62.5 MHz}
+- {id: IPG_CLK_ROOT.outFreq, value: 125 MHz}
+- {id: LPI2C_CLK_ROOT.outFreq, value: 60 MHz}
+- {id: LPSPI_CLK_ROOT.outFreq, value: 105.6 MHz}
+- {id: MQS_MCLK.outFreq, value: 1080/17 MHz}
+- {id: PERCLK_CLK_ROOT.outFreq, value: 62.5 MHz}
+- {id: SAI1_CLK_ROOT.outFreq, value: 1080/17 MHz}
+- {id: SAI1_MCLK1.outFreq, value: 1080/17 MHz}
+- {id: SAI1_MCLK2.outFreq, value: 1080/17 MHz}
+- {id: SAI1_MCLK3.outFreq, value: 30 MHz}
+- {id: SAI2_CLK_ROOT.outFreq, value: 1080/17 MHz}
+- {id: SAI2_MCLK1.outFreq, value: 1080/17 MHz}
+- {id: SAI2_MCLK3.outFreq, value: 30 MHz}
+- {id: SAI3_CLK_ROOT.outFreq, value: 1080/17 MHz}
+- {id: SAI3_MCLK1.outFreq, value: 1080/17 MHz}
+- {id: SAI3_MCLK3.outFreq, value: 30 MHz}
+- {id: SPDIF0_CLK_ROOT.outFreq, value: 30 MHz}
+- {id: TRACE_CLK_ROOT.outFreq, value: 352/3 MHz}
+- {id: UART_CLK_ROOT.outFreq, value: 80 MHz}
+settings:
+- {id: CCM.AHB_PODF.scale, value: '1', locked: true}
+- {id: CCM.ARM_PODF.scale, value: '1', locked: true}
+- {id: CCM.CLKO2_SEL.sel, value: CCM.LPI2C_CLK_ROOT}
+- {id: CCM.FLEXSPI_PODF.scale, value: '2', locked: true}
+- {id: CCM.IPG_PODF.scale, value: '4'}
+- {id: CCM.LPSPI_PODF.scale, value: '5', locked: true}
+- {id: CCM.PERCLK_PODF.scale, value: '2', locked: true}
+- {id: CCM.PRE_PERIPH_CLK_SEL.sel, value: CCM.ARM_PODF}
+- {id: CCM.SEMC_PODF.scale, value: '2'}
+- {id: CCM.TRACE_PODF.scale, value: '3', locked: true}
+- {id: CCM_ANALOG.PLL2.denom, value: '1', locked: true}
+- {id: CCM_ANALOG.PLL2.num, value: '0', locked: true}
+- {id: CCM_ANALOG.PLL2_BYPASS.sel, value: CCM_ANALOG.PLL2_OUT_CLK}
+- {id: CCM_ANALOG.PLL2_PFD0_BYPASS.sel, value: CCM_ANALOG.PLL2_PFD0}
+- {id: CCM_ANALOG.PLL2_PFD1_BYPASS.sel, value: CCM_ANALOG.PLL2_PFD1}
+- {id: CCM_ANALOG.PLL2_PFD2_BYPASS.sel, value: CCM_ANALOG.PLL2_PFD2}
+- {id: CCM_ANALOG.PLL2_PFD2_DIV.scale, value: '18', locked: true}
+- {id: CCM_ANALOG.PLL2_PFD2_MUL.scale, value: '18', locked: true}
+- {id: CCM_ANALOG.PLL2_PFD3_BYPASS.sel, value: CCM_ANALOG.PLL2_PFD3}
+- {id: CCM_ANALOG.PLL2_PFD3_DIV.scale, value: '18', locked: true}
+- {id: CCM_ANALOG.PLL2_PFD3_MUL.scale, value: '18', locked: true}
+- {id: CCM_ANALOG.PLL3_BYPASS.sel, value: CCM_ANALOG.PLL3}
+- {id: CCM_ANALOG.PLL3_PFD0_BYPASS.sel, value: CCM_ANALOG.PLL3_PFD0}
+- {id: CCM_ANALOG.PLL3_PFD0_DIV.scale, value: '22', locked: true}
+- {id: CCM_ANALOG.PLL3_PFD0_MUL.scale, value: '18', locked: true}
+- {id: CCM_ANALOG.PLL3_PFD1_BYPASS.sel, value: CCM_ANALOG.PLL3_PFD1}
+- {id: CCM_ANALOG.PLL3_PFD2_BYPASS.sel, value: CCM_ANALOG.PLL3_PFD2}
+- {id: CCM_ANALOG.PLL3_PFD3_BYPASS.sel, value: CCM_ANALOG.PLL3_PFD3}
+- {id: CCM_ANALOG.PLL3_PFD3_DIV.scale, value: '18', locked: true}
+- {id: CCM_ANALOG.PLL3_PFD3_MUL.scale, value: '18', locked: true}
+- {id: CCM_ANALOG.PLL4.denom, value: '50'}
+- {id: CCM_ANALOG.PLL4.div, value: '47'}
+- {id: CCM_ANALOG.PLL6_BYPASS.sel, value: CCM_ANALOG.PLL6}
+- {id: CCM_ANALOG_PLL_USB1_POWER_CFG, value: 'Yes'}
+sources:
+- {id: XTALOSC24M.OSC.outFreq, value: 24 MHz, enabled: true}
+- {id: XTALOSC24M.RTC_OSC.outFreq, value: 32.768 kHz, enabled: true}
+ * BE CAREFUL MODIFYING THIS COMMENT - IT IS YAML SETTINGS FOR TOOLS **********/
+
+/*******************************************************************************
+ * Variables for BOARD_BootClockRUN configuration
+ ******************************************************************************/
+const clock_sys_pll_config_t sysPllConfig_BOARD_BootClockRUN = {
+    .loopDivider = 1,                             /* PLL loop divider, Fout = Fin * ( 20 + loopDivider*2 + numerator / denominator ) */
+    .numerator = 0,                               /* 30 bit numerator of fractional loop divider */
+    .denominator = 1,                             /* 30 bit denominator of fractional loop divider */
+    .src = 0,                                     /* Bypass clock source, 0 - OSC 24M, 1 - CLK1_P and CLK1_N */
+};
+const clock_usb_pll_config_t usb1PllConfig_BOARD_BootClockRUN = {
+    .loopDivider = 0,                             /* PLL loop divider, Fout = Fin * 20 */
+    .src = 0,                                     /* Bypass clock source, 0 - OSC 24M, 1 - CLK1_P and CLK1_N */
+};
+const clock_enet_pll_config_t enetPllConfig_BOARD_BootClockRUN = {
+    .enableClkOutput500M = true,                  /* Enable the PLL providing the ENET 500MHz reference clock */
+    .src = 0,                                     /* Bypass clock source, 0 - OSC 24M, 1 - CLK1_P and CLK1_N */
+};
+/*******************************************************************************
+ * Code for BOARD_BootClockRUN configuration
+ ******************************************************************************/
+void BOARD_BootClockRUN(void) {
+    /* Init RTC OSC clock frequency. */
+    CLOCK_SetRtcXtalFreq(32768U);
+    /* Enable 1MHz clock output. */
+    XTALOSC24M->OSC_CONFIG2 |= XTALOSC24M_OSC_CONFIG2_ENABLE_1M_MASK;
+    /* Use free 1MHz clock output. */
+    XTALOSC24M->OSC_CONFIG2 &= ~XTALOSC24M_OSC_CONFIG2_MUX_1M_MASK;
+    /* Set XTAL 24MHz clock frequency. */
+    CLOCK_SetXtalFreq(24000000U);
+    /* Enable XTAL 24MHz clock source. */
+    CLOCK_InitExternalClk(0);
+    /* Enable internal RC. */
+    CLOCK_InitRcOsc24M();
+    /* Switch clock source to external OSC. */
+    CLOCK_SwitchOsc(kCLOCK_XtalOsc);
+    /* Set Oscillator ready counter value. */
+    CCM->CCR = (CCM->CCR & (~CCM_CCR_OSCNT_MASK)) | CCM_CCR_OSCNT(127);
+    /* Setting PeriphClk2Mux and PeriphMux to provide stable clock before PLLs are initialed */
+    CLOCK_SetMux(kCLOCK_PeriphClk2Mux, 1); /* Set PERIPH_CLK2 MUX to OSC */
+    CLOCK_SetMux(kCLOCK_PeriphMux, 1);     /* Set PERIPH_CLK MUX to PERIPH_CLK2 */
+    /* Setting the VDD_SOC to 1.5V. It is necessary to config AHB to 500Mhz. */
+    DCDC->REG3 = (DCDC->REG3 & (~DCDC_REG3_TRG_MASK)) | DCDC_REG3_TRG(0x12);
+    /* Waiting for DCDC_STS_DC_OK bit is asserted */
+    while (DCDC_REG0_STS_DC_OK_MASK != (DCDC_REG0_STS_DC_OK_MASK & DCDC->REG0)) {
+    }
+    /* Set AHB_PODF. */
+    CLOCK_SetDiv(kCLOCK_AhbDiv, 0);
+    /* Disable IPG clock gate. */
+    CLOCK_DisableClock(kCLOCK_Adc1);
+    CLOCK_DisableClock(kCLOCK_Xbar1);
+    CLOCK_DisableClock(kCLOCK_Xbar2);
+    /* Set IPG_PODF. */
+    CLOCK_SetDiv(kCLOCK_IpgDiv, 3);
+    /* Set ARM_PODF. */
+    CLOCK_SetDiv(kCLOCK_ArmDiv, 0);
+    /* Set PERIPH_CLK2_PODF. */
+    CLOCK_SetDiv(kCLOCK_PeriphClk2Div, 0);
+    /* Disable PERCLK clock gate. */
+    CLOCK_DisableClock(kCLOCK_Gpt1);
+    CLOCK_DisableClock(kCLOCK_Gpt1S);
+    CLOCK_DisableClock(kCLOCK_Gpt2);
+    CLOCK_DisableClock(kCLOCK_Gpt2S);
+    CLOCK_DisableClock(kCLOCK_Pit);
+    /* Set PERCLK_PODF. */
+    CLOCK_SetDiv(kCLOCK_PerclkDiv, 1);
+    /* Set SEMC_PODF. */
+    CLOCK_SetDiv(kCLOCK_SemcDiv, 1);
+    /* Set Semc alt clock source. */
+    CLOCK_SetMux(kCLOCK_SemcAltMux, 0);
+    /* Set Semc clock source. */
+    CLOCK_SetMux(kCLOCK_SemcMux, 0);
+    /* In SDK projects, external flash (configured by FLEXSPI) will be initialized by dcd.
+     * With this macro XIP_EXTERNAL_FLASH, usb1 pll (selected to be FLEXSPI clock source in SDK projects) will be left unchanged.
+     * Note: If another clock source is selected for FLEXSPI, user may want to avoid changing that clock as well.*/
+    #if !(defined(XIP_EXTERNAL_FLASH) && (XIP_EXTERNAL_FLASH == 1))
+    /* Disable Flexspi clock gate. */
+    CLOCK_DisableClock(kCLOCK_FlexSpi);
+    /* Set FLEXSPI_PODF. */
+    CLOCK_SetDiv(kCLOCK_FlexspiDiv, 1);
+    /* Set Flexspi clock source. */
+    CLOCK_SetMux(kCLOCK_FlexspiMux, 0);
+    #endif
+    /* Disable LPSPI clock gate. */
+    CLOCK_DisableClock(kCLOCK_Lpspi1);
+    CLOCK_DisableClock(kCLOCK_Lpspi2);
+    /* Set LPSPI_PODF. */
+    CLOCK_SetDiv(kCLOCK_LpspiDiv, 4);
+    /* Set Lpspi clock source. */
+    CLOCK_SetMux(kCLOCK_LpspiMux, 2);
+    /* Disable TRACE clock gate. */
+    CLOCK_DisableClock(kCLOCK_Trace);
+    /* Set TRACE_PODF. */
+    CLOCK_SetDiv(kCLOCK_TraceDiv, 2);
+    /* Set Trace clock source. */
+    CLOCK_SetMux(kCLOCK_TraceMux, 2);
+    /* Disable SAI1 clock gate. */
+    CLOCK_DisableClock(kCLOCK_Sai1);
+    /* Set SAI1_CLK_PRED. */
+    CLOCK_SetDiv(kCLOCK_Sai1PreDiv, 3);
+    /* Set SAI1_CLK_PODF. */
+    CLOCK_SetDiv(kCLOCK_Sai1Div, 1);
+    /* Set Sai1 clock source. */
+    CLOCK_SetMux(kCLOCK_Sai1Mux, 0);
+    /* Disable SAI2 clock gate. */
+    CLOCK_DisableClock(kCLOCK_Sai2);
+    /* Set SAI2_CLK_PRED. */
+    CLOCK_SetDiv(kCLOCK_Sai2PreDiv, 3);
+    /* Set SAI2_CLK_PODF. */
+    CLOCK_SetDiv(kCLOCK_Sai2Div, 1);
+    /* Set Sai2 clock source. */
+    CLOCK_SetMux(kCLOCK_Sai2Mux, 0);
+    /* Disable SAI3 clock gate. */
+    CLOCK_DisableClock(kCLOCK_Sai3);
+    /* Set SAI3_CLK_PRED. */
+    CLOCK_SetDiv(kCLOCK_Sai3PreDiv, 3);
+    /* Set SAI3_CLK_PODF. */
+    CLOCK_SetDiv(kCLOCK_Sai3Div, 1);
+    /* Set Sai3 clock source. */
+    CLOCK_SetMux(kCLOCK_Sai3Mux, 0);
+    /* Disable Lpi2c clock gate. */
+    CLOCK_DisableClock(kCLOCK_Lpi2c1);
+    CLOCK_DisableClock(kCLOCK_Lpi2c2);
+    /* Set LPI2C_CLK_PODF. */
+    CLOCK_SetDiv(kCLOCK_Lpi2cDiv, 0);
+    /* Set Lpi2c clock source. */
+    CLOCK_SetMux(kCLOCK_Lpi2cMux, 0);
+    /* Disable UART clock gate. */
+    CLOCK_DisableClock(kCLOCK_Lpuart1);
+    CLOCK_DisableClock(kCLOCK_Lpuart2);
+    CLOCK_DisableClock(kCLOCK_Lpuart3);
+    CLOCK_DisableClock(kCLOCK_Lpuart4);
+    /* Set UART_CLK_PODF. */
+    CLOCK_SetDiv(kCLOCK_UartDiv, 0);
+    /* Set Uart clock source. */
+    CLOCK_SetMux(kCLOCK_UartMux, 0);
+    /* Disable SPDIF clock gate. */
+    CLOCK_DisableClock(kCLOCK_Spdif);
+    /* Set SPDIF0_CLK_PRED. */
+    CLOCK_SetDiv(kCLOCK_Spdif0PreDiv, 1);
+    /* Set SPDIF0_CLK_PODF. */
+    CLOCK_SetDiv(kCLOCK_Spdif0Div, 7);
+    /* Set Spdif clock source. */
+    CLOCK_SetMux(kCLOCK_SpdifMux, 3);
+    /* Disable Flexio1 clock gate. */
+    CLOCK_DisableClock(kCLOCK_Flexio1);
+    /* Set FLEXIO1_CLK_PRED. */
+    CLOCK_SetDiv(kCLOCK_Flexio1PreDiv, 1);
+    /* Set FLEXIO1_CLK_PODF. */
+    CLOCK_SetDiv(kCLOCK_Flexio1Div, 7);
+    /* Set Flexio1 clock source. */
+    CLOCK_SetMux(kCLOCK_Flexio1Mux, 3);
+    /* Set Pll3 sw clock source. */
+    CLOCK_SetMux(kCLOCK_Pll3SwMux, 0);
+    /* Init System PLL. */
+    CLOCK_InitSysPll(&sysPllConfig_BOARD_BootClockRUN);
+    /* Init System pfd0. */
+    CLOCK_InitSysPfd(kCLOCK_Pfd0, 27);
+    /* Init System pfd1. */
+    CLOCK_InitSysPfd(kCLOCK_Pfd1, 16);
+    /* Init System pfd2. */
+    CLOCK_InitSysPfd(kCLOCK_Pfd2, 18);
+    /* Init System pfd3. */
+    CLOCK_InitSysPfd(kCLOCK_Pfd3, 18);
+    /* In SDK projects, external flash (configured by FLEXSPI) will be initialized by dcd.
+     * With this macro XIP_EXTERNAL_FLASH, usb1 pll (selected to be FLEXSPI clock source in SDK projects) will be left unchanged.
+     * Note: If another clock source is selected for FLEXSPI, user may want to avoid changing that clock as well.*/
+    #if !(defined(XIP_EXTERNAL_FLASH) && (XIP_EXTERNAL_FLASH == 1))
+    /* Init Usb1 PLL. */
+    CLOCK_InitUsb1Pll(&usb1PllConfig_BOARD_BootClockRUN);
+    /* Init Usb1 pfd0. */
+    CLOCK_InitUsb1Pfd(kCLOCK_Pfd0, 22);
+    /* Init Usb1 pfd1. */
+    CLOCK_InitUsb1Pfd(kCLOCK_Pfd1, 16);
+    /* Init Usb1 pfd2. */
+    CLOCK_InitUsb1Pfd(kCLOCK_Pfd2, 17);
+    /* Init Usb1 pfd3. */
+    CLOCK_InitUsb1Pfd(kCLOCK_Pfd3, 18);
+    /* Disable Usb1 PLL output for USBPHY1. */
+    CCM_ANALOG->PLL_USB1 &= ~CCM_ANALOG_PLL_USB1_EN_USB_CLKS_MASK;
+    #endif
+    /* DeInit Audio PLL. */
+    CLOCK_DeinitAudioPll();
+    /* Bypass Audio PLL. */
+    CLOCK_SetPllBypass(CCM_ANALOG, kCLOCK_PllAudio, 1);
+    /* Set divider for Audio PLL. */
+    CCM_ANALOG->MISC2 &= ~CCM_ANALOG_MISC2_AUDIO_DIV_LSB_MASK;
+    CCM_ANALOG->MISC2 &= ~CCM_ANALOG_MISC2_AUDIO_DIV_MSB_MASK;
+    /* Enable Audio PLL output. */
+    CCM_ANALOG->PLL_AUDIO |= CCM_ANALOG_PLL_AUDIO_ENABLE_MASK;
+    /* Init Enet PLL. */
+    CLOCK_InitEnetPll(&enetPllConfig_BOARD_BootClockRUN);
+    /* Set preperiph clock source. */
+    CLOCK_SetMux(kCLOCK_PrePeriphMux, 3);
+    /* Set periph clock source. */
+    CLOCK_SetMux(kCLOCK_PeriphMux, 0);
+    /* Set periph clock2 clock source. */
+    CLOCK_SetMux(kCLOCK_PeriphClk2Mux, 0);
+    /* Set per clock source. */
+    CLOCK_SetMux(kCLOCK_PerclkMux, 0);
+    /* Set clock out1 divider. */
+    CCM->CCOSR = (CCM->CCOSR & (~CCM_CCOSR_CLKO1_DIV_MASK)) | CCM_CCOSR_CLKO1_DIV(0);
+    /* Set clock out1 source. */
+    CCM->CCOSR = (CCM->CCOSR & (~CCM_CCOSR_CLKO1_SEL_MASK)) | CCM_CCOSR_CLKO1_SEL(1);
+    /* Set clock out2 divider. */
+    CCM->CCOSR = (CCM->CCOSR & (~CCM_CCOSR_CLKO2_DIV_MASK)) | CCM_CCOSR_CLKO2_DIV(0);
+    /* Set clock out2 source. */
+    CCM->CCOSR = (CCM->CCOSR & (~CCM_CCOSR_CLKO2_SEL_MASK)) | CCM_CCOSR_CLKO2_SEL(6);
+    /* Set clock out1 drives clock out1. */
+    CCM->CCOSR &= ~CCM_CCOSR_CLK_OUT_SEL_MASK;
+    /* Disable clock out1. */
+    CCM->CCOSR &= ~CCM_CCOSR_CLKO1_EN_MASK;
+    /* Disable clock out2. */
+    CCM->CCOSR &= ~CCM_CCOSR_CLKO2_EN_MASK;
+    /* Set SAI1 MCLK1 clock source. */
+    IOMUXC_SetSaiMClkClockSource(IOMUXC_GPR, kIOMUXC_GPR_SAI1MClk1Sel, 0);
+    /* Set SAI1 MCLK2 clock source. */
+    IOMUXC_SetSaiMClkClockSource(IOMUXC_GPR, kIOMUXC_GPR_SAI1MClk2Sel, 0);
+    /* Set SAI1 MCLK3 clock source. */
+    IOMUXC_SetSaiMClkClockSource(IOMUXC_GPR, kIOMUXC_GPR_SAI1MClk3Sel, 0);
+    /* Set SAI2 MCLK3 clock source. */
+    IOMUXC_SetSaiMClkClockSource(IOMUXC_GPR, kIOMUXC_GPR_SAI2MClk3Sel, 0);
+    /* Set SAI3 MCLK3 clock source. */
+    IOMUXC_SetSaiMClkClockSource(IOMUXC_GPR, kIOMUXC_GPR_SAI3MClk3Sel, 0);
+    /* Set MQS configuration. */
+    IOMUXC_MQSConfig(IOMUXC_GPR, kIOMUXC_MqsPwmOverSampleRate32, 0);
+    /* Set GPT1 High frequency reference clock source. */
+    IOMUXC_GPR->GPR5 &= ~IOMUXC_GPR_GPR5_VREF_1M_CLK_GPT1_MASK;
+    /* Set GPT2 High frequency reference clock source. */
+    IOMUXC_GPR->GPR5 &= ~IOMUXC_GPR_GPR5_VREF_1M_CLK_GPT2_MASK;
+    /* Set SystemCoreClock variable. */
+    SystemCoreClock = BOARD_BOOTCLOCKRUN_CORE_CLOCK;
+}
diff --git a/ports/mimxrt/boards/MIMXRT1015_EVK/clock_config.h b/ports/mimxrt/boards/MIMXRT1015_clock_config.h
similarity index 100%
rename from ports/mimxrt/boards/MIMXRT1015_EVK/clock_config.h
rename to ports/mimxrt/boards/MIMXRT1015_clock_config.h
diff --git a/ports/mimxrt/boards/MIMXRT1021_clock_config.c b/ports/mimxrt/boards/MIMXRT1021_clock_config.c
new file mode 100644
index 0000000000000..1b8792dd2de0c
--- /dev/null
+++ b/ports/mimxrt/boards/MIMXRT1021_clock_config.c
@@ -0,0 +1,417 @@
+/*
+ * Copyright 2018-2019 NXP
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+/*
+ * How to setup clock using clock driver functions:
+ *
+ * 1. Call CLOCK_InitXXXPLL() to configure corresponding PLL clock.
+ *
+ * 2. Call CLOCK_InitXXXpfd() to configure corresponding PLL pfd clock.
+ *
+ * 3. Call CLOCK_SetMux() to configure corresponding clock source for target clock out.
+ *
+ * 4. Call CLOCK_SetDiv() to configure corresponding clock divider for target clock out.
+ *
+ * 5. Call CLOCK_SetXtalFreq() to set XTAL frequency based on board settings.
+ *
+ */
+
+/* TEXT BELOW IS USED AS SETTING FOR TOOLS *************************************
+!!GlobalInfo
+product: Clocks v5.0
+processor: MIMXRT1021xxxxx
+package_id: MIMXRT1021DAG5A
+mcu_data: ksdk2_0
+processor_version: 0.0.0
+board: MIMXRT1020-EVK
+ * BE CAREFUL MODIFYING THIS COMMENT - IT IS YAML SETTINGS FOR TOOLS **********/
+
+#include CLOCK_CONFIG_H
+#include "fsl_iomuxc.h"
+
+/*******************************************************************************
+ * Definitions
+ ******************************************************************************/
+
+/*******************************************************************************
+ * Variables
+ ******************************************************************************/
+/* System clock frequency. */
+extern uint32_t SystemCoreClock;
+
+/*******************************************************************************
+ ************************ BOARD_InitBootClocks function ************************
+ ******************************************************************************/
+void BOARD_InitBootClocks(void) {
+    BOARD_BootClockRUN();
+}
+
+/*******************************************************************************
+ ********************** Configuration BOARD_BootClockRUN ***********************
+ ******************************************************************************/
+/* TEXT BELOW IS USED AS SETTING FOR TOOLS *************************************
+!!Configuration
+name: BOARD_BootClockRUN
+called_from_default_init: true
+outputs:
+- {id: AHB_CLK_ROOT.outFreq, value: 500 MHz}
+- {id: CAN_CLK_ROOT.outFreq, value: 40 MHz}
+- {id: CKIL_SYNC_CLK_ROOT.outFreq, value: 32.768 kHz}
+- {id: CLK_1M.outFreq, value: 1 MHz}
+- {id: CLK_24M.outFreq, value: 24 MHz}
+- {id: ENET_500M_REF_CLK.outFreq, value: 500 MHz}
+- {id: FLEXIO1_CLK_ROOT.outFreq, value: 30 MHz}
+- {id: FLEXSPI_CLK_ROOT.outFreq, value: 132 MHz}
+- {id: GPT1_ipg_clk_highfreq.outFreq, value: 62.5 MHz}
+- {id: GPT2_ipg_clk_highfreq.outFreq, value: 62.5 MHz}
+- {id: IPG_CLK_ROOT.outFreq, value: 125 MHz}
+- {id: LPI2C_CLK_ROOT.outFreq, value: 60 MHz}
+- {id: LPSPI_CLK_ROOT.outFreq, value: 105.6 MHz}
+- {id: MQS_MCLK.outFreq, value: 1080/17 MHz}
+- {id: PERCLK_CLK_ROOT.outFreq, value: 62.5 MHz}
+- {id: SAI1_CLK_ROOT.outFreq, value: 1080/17 MHz}
+- {id: SAI1_MCLK1.outFreq, value: 1080/17 MHz}
+- {id: SAI1_MCLK2.outFreq, value: 1080/17 MHz}
+- {id: SAI1_MCLK3.outFreq, value: 30 MHz}
+- {id: SAI2_CLK_ROOT.outFreq, value: 1080/17 MHz}
+- {id: SAI2_MCLK1.outFreq, value: 1080/17 MHz}
+- {id: SAI2_MCLK3.outFreq, value: 30 MHz}
+- {id: SAI3_CLK_ROOT.outFreq, value: 1080/17 MHz}
+- {id: SAI3_MCLK1.outFreq, value: 1080/17 MHz}
+- {id: SAI3_MCLK3.outFreq, value: 30 MHz}
+- {id: SEMC_CLK_ROOT.outFreq, value: 62.5 MHz}
+- {id: SPDIF0_CLK_ROOT.outFreq, value: 30 MHz}
+- {id: TRACE_CLK_ROOT.outFreq, value: 352/3 MHz}
+- {id: UART_CLK_ROOT.outFreq, value: 80 MHz}
+- {id: USDHC1_CLK_ROOT.outFreq, value: 176 MHz}
+- {id: USDHC2_CLK_ROOT.outFreq, value: 176 MHz}
+settings:
+- {id: CCM.AHB_PODF.scale, value: '1', locked: true}
+- {id: CCM.ARM_PODF.scale, value: '1', locked: true}
+- {id: CCM.FLEXSPI_PODF.scale, value: '4', locked: true}
+- {id: CCM.FLEXSPI_SEL.sel, value: CCM_ANALOG.PLL2_PFD2_CLK}
+- {id: CCM.IPG_PODF.scale, value: '4'}
+- {id: CCM.LPSPI_PODF.scale, value: '5', locked: true}
+- {id: CCM.PERCLK_PODF.scale, value: '2', locked: true}
+- {id: CCM.PRE_PERIPH_CLK_SEL.sel, value: CCM.ARM_PODF}
+- {id: CCM.SEMC_PODF.scale, value: '8'}
+- {id: CCM.TRACE_PODF.scale, value: '3', locked: true}
+- {id: CCM.USDHC1_PODF.scale, value: '3', locked: true}
+- {id: CCM.USDHC2_PODF.scale, value: '3', locked: true}
+- {id: CCM_ANALOG.PLL2.denom, value: '1', locked: true}
+- {id: CCM_ANALOG.PLL2.num, value: '0', locked: true}
+- {id: CCM_ANALOG.PLL2_BYPASS.sel, value: CCM_ANALOG.PLL2_OUT_CLK}
+- {id: CCM_ANALOG.PLL2_PFD0_BYPASS.sel, value: CCM_ANALOG.PLL2_PFD0}
+- {id: CCM_ANALOG.PLL2_PFD1_BYPASS.sel, value: CCM_ANALOG.PLL2_PFD1}
+- {id: CCM_ANALOG.PLL2_PFD2_BYPASS.sel, value: CCM_ANALOG.PLL2_PFD2}
+- {id: CCM_ANALOG.PLL2_PFD2_DIV.scale, value: '18', locked: true}
+- {id: CCM_ANALOG.PLL2_PFD2_MUL.scale, value: '18', locked: true}
+- {id: CCM_ANALOG.PLL2_PFD3_BYPASS.sel, value: CCM_ANALOG.PLL2_PFD3}
+- {id: CCM_ANALOG.PLL2_PFD3_DIV.scale, value: '18', locked: true}
+- {id: CCM_ANALOG.PLL2_PFD3_MUL.scale, value: '18', locked: true}
+- {id: CCM_ANALOG.PLL3_BYPASS.sel, value: CCM_ANALOG.PLL3}
+- {id: CCM_ANALOG.PLL3_PFD0_BYPASS.sel, value: CCM_ANALOG.PLL3_PFD0}
+- {id: CCM_ANALOG.PLL3_PFD0_DIV.scale, value: '22', locked: true}
+- {id: CCM_ANALOG.PLL3_PFD0_MUL.scale, value: '18', locked: true}
+- {id: CCM_ANALOG.PLL3_PFD1_BYPASS.sel, value: CCM_ANALOG.PLL3_PFD1}
+- {id: CCM_ANALOG.PLL3_PFD2_BYPASS.sel, value: CCM_ANALOG.PLL3_PFD2}
+- {id: CCM_ANALOG.PLL3_PFD3_BYPASS.sel, value: CCM_ANALOG.PLL3_PFD3}
+- {id: CCM_ANALOG.PLL3_PFD3_DIV.scale, value: '18', locked: true}
+- {id: CCM_ANALOG.PLL3_PFD3_MUL.scale, value: '18', locked: true}
+- {id: CCM_ANALOG.PLL4.denom, value: '50'}
+- {id: CCM_ANALOG.PLL4.div, value: '47'}
+- {id: CCM_ANALOG.PLL6_BYPASS.sel, value: CCM_ANALOG.PLL6}
+- {id: CCM_ANALOG_PLL_ENET_ENABLE_CFG, value: Disabled}
+- {id: CCM_ANALOG_PLL_ENET_ENET_25M_REF_EN_CFG, value: Disabled}
+- {id: CCM_ANALOG_PLL_USB1_POWER_CFG, value: 'Yes'}
+sources:
+- {id: XTALOSC24M.OSC.outFreq, value: 24 MHz, enabled: true}
+- {id: XTALOSC24M.RTC_OSC.outFreq, value: 32.768 kHz, enabled: true}
+ * BE CAREFUL MODIFYING THIS COMMENT - IT IS YAML SETTINGS FOR TOOLS **********/
+
+/*******************************************************************************
+ * Variables for BOARD_BootClockRUN configuration
+ ******************************************************************************/
+const clock_sys_pll_config_t sysPllConfig_BOARD_BootClockRUN = {
+    .loopDivider = 1, /* PLL loop divider, Fout = Fin * ( 20 + loopDivider*2 + numerator / denominator ) */
+    .numerator = 0,   /* 30 bit numerator of fractional loop divider */
+    .denominator = 1, /* 30 bit denominator of fractional loop divider */
+    .src = 0,         /* Bypass clock source, 0 - OSC 24M, 1 - CLK1_P and CLK1_N */
+};
+const clock_usb_pll_config_t usb1PllConfig_BOARD_BootClockRUN = {
+    .loopDivider = 0, /* PLL loop divider, Fout = Fin * 20 */
+    .src = 0,         /* Bypass clock source, 0 - OSC 24M, 1 - CLK1_P and CLK1_N */
+};
+const clock_enet_pll_config_t enetPllConfig_BOARD_BootClockRUN = {
+    .enableClkOutput = false,     /* Disable the PLL providing the ENET 125MHz reference clock */
+    .enableClkOutput500M = true,  /* Enable the PLL providing the ENET 500MHz reference clock */
+    .enableClkOutput25M = false,  /* Disable the PLL providing the ENET 25MHz reference clock */
+    .loopDivider = 1,             /* Set frequency of ethernet reference clock to 50 MHz */
+    .src = 0,                     /* Bypass clock source, 0 - OSC 24M, 1 - CLK1_P and CLK1_N */
+};
+/*******************************************************************************
+ * Code for BOARD_BootClockRUN configuration
+ ******************************************************************************/
+void BOARD_BootClockRUN(void) {
+    /* Init RTC OSC clock frequency. */
+    CLOCK_SetRtcXtalFreq(32768U);
+    /* Enable 1MHz clock output. */
+    XTALOSC24M->OSC_CONFIG2 |= XTALOSC24M_OSC_CONFIG2_ENABLE_1M_MASK;
+    /* Use free 1MHz clock output. */
+    XTALOSC24M->OSC_CONFIG2 &= ~XTALOSC24M_OSC_CONFIG2_MUX_1M_MASK;
+    /* Set XTAL 24MHz clock frequency. */
+    CLOCK_SetXtalFreq(24000000U);
+    /* Enable XTAL 24MHz clock source. */
+    CLOCK_InitExternalClk(0);
+    /* Enable internal RC. */
+    CLOCK_InitRcOsc24M();
+    /* Switch clock source to external OSC. */
+    CLOCK_SwitchOsc(kCLOCK_XtalOsc);
+    /* Set Oscillator ready counter value. */
+    CCM->CCR = (CCM->CCR & (~CCM_CCR_OSCNT_MASK)) | CCM_CCR_OSCNT(127);
+    /* Setting PeriphClk2Mux and PeriphMux to provide stable clock before PLLs are initialed */
+    CLOCK_SetMux(kCLOCK_PeriphClk2Mux, 1); /* Set PERIPH_CLK2 MUX to OSC */
+    CLOCK_SetMux(kCLOCK_PeriphMux, 1);     /* Set PERIPH_CLK MUX to PERIPH_CLK2 */
+    /* Setting the VDD_SOC to 1.5V. It is necessary to config AHB to 500Mhz. */
+    DCDC->REG3 = (DCDC->REG3 & (~DCDC_REG3_TRG_MASK)) | DCDC_REG3_TRG(0x12);
+    /* Waiting for DCDC_STS_DC_OK bit is asserted */
+    while (DCDC_REG0_STS_DC_OK_MASK != (DCDC_REG0_STS_DC_OK_MASK & DCDC->REG0)) {
+    }
+    /* Set AHB_PODF. */
+    CLOCK_SetDiv(kCLOCK_AhbDiv, 0);
+    /* Disable IPG clock gate. */
+    CLOCK_DisableClock(kCLOCK_Adc1);
+    CLOCK_DisableClock(kCLOCK_Adc2);
+    CLOCK_DisableClock(kCLOCK_Xbar1);
+    CLOCK_DisableClock(kCLOCK_Xbar2);
+    /* Set IPG_PODF. */
+    CLOCK_SetDiv(kCLOCK_IpgDiv, 3);
+    /* Set ARM_PODF. */
+    CLOCK_SetDiv(kCLOCK_ArmDiv, 0);
+    /* Set PERIPH_CLK2_PODF. */
+    CLOCK_SetDiv(kCLOCK_PeriphClk2Div, 0);
+    /* Disable PERCLK clock gate. */
+    CLOCK_DisableClock(kCLOCK_Gpt1);
+    CLOCK_DisableClock(kCLOCK_Gpt1S);
+    CLOCK_DisableClock(kCLOCK_Gpt2);
+    CLOCK_DisableClock(kCLOCK_Gpt2S);
+    CLOCK_DisableClock(kCLOCK_Pit);
+    /* Set PERCLK_PODF. */
+    CLOCK_SetDiv(kCLOCK_PerclkDiv, 1);
+    /* Disable USDHC1 clock gate. */
+    CLOCK_DisableClock(kCLOCK_Usdhc1);
+    /* Set USDHC1_PODF. */
+    CLOCK_SetDiv(kCLOCK_Usdhc1Div, 2);
+    /* Set Usdhc1 clock source. */
+    CLOCK_SetMux(kCLOCK_Usdhc1Mux, 0);
+    /* Disable USDHC2 clock gate. */
+    CLOCK_DisableClock(kCLOCK_Usdhc2);
+    /* Set USDHC2_PODF. */
+    CLOCK_SetDiv(kCLOCK_Usdhc2Div, 2);
+    /* Set Usdhc2 clock source. */
+    CLOCK_SetMux(kCLOCK_Usdhc2Mux, 0);
+    /* In SDK projects, SDRAM (configured by SEMC) will be initialized in either debug script or dcd.
+     * With this macro SKIP_SYSCLK_INIT, system pll (selected to be SEMC source clock in SDK projects) will be left
+     * unchanged. Note: If another clock source is selected for SEMC, user may want to avoid changing that clock as
+     * well.*/
+    #ifndef SKIP_SYSCLK_INIT
+    /* Disable Semc clock gate. */
+    CLOCK_DisableClock(kCLOCK_Semc);
+    /* Set SEMC_PODF. */
+    CLOCK_SetDiv(kCLOCK_SemcDiv, 7);
+    /* Set Semc alt clock source. */
+    CLOCK_SetMux(kCLOCK_SemcAltMux, 0);
+    /* Set Semc clock source. */
+    CLOCK_SetMux(kCLOCK_SemcMux, 0);
+    #endif
+    /* In SDK projects, external flash (configured by FLEXSPI) will be initialized by dcd.
+     * With this macro XIP_EXTERNAL_FLASH, usb1 pll (selected to be FLEXSPI clock source in SDK projects) will be left
+     * unchanged. Note: If another clock source is selected for FLEXSPI, user may want to avoid changing that clock as
+     * well.*/
+    #if !(defined(XIP_EXTERNAL_FLASH) && (XIP_EXTERNAL_FLASH == 1))
+    /* Disable Flexspi clock gate. */
+    CLOCK_DisableClock(kCLOCK_FlexSpi);
+    /* Set FLEXSPI_PODF. */
+    CLOCK_SetDiv(kCLOCK_FlexspiDiv, 3);
+    /* Set Flexspi clock source. */
+    CLOCK_SetMux(kCLOCK_FlexspiMux, 2);
+    #endif
+    /* Disable LPSPI clock gate. */
+    CLOCK_DisableClock(kCLOCK_Lpspi1);
+    CLOCK_DisableClock(kCLOCK_Lpspi2);
+    CLOCK_DisableClock(kCLOCK_Lpspi3);
+    CLOCK_DisableClock(kCLOCK_Lpspi4);
+    /* Set LPSPI_PODF. */
+    CLOCK_SetDiv(kCLOCK_LpspiDiv, 4);
+    /* Set Lpspi clock source. */
+    CLOCK_SetMux(kCLOCK_LpspiMux, 2);
+    /* Disable TRACE clock gate. */
+    CLOCK_DisableClock(kCLOCK_Trace);
+    /* Set TRACE_PODF. */
+    CLOCK_SetDiv(kCLOCK_TraceDiv, 2);
+    /* Set Trace clock source. */
+    CLOCK_SetMux(kCLOCK_TraceMux, 2);
+    /* Disable SAI1 clock gate. */
+    CLOCK_DisableClock(kCLOCK_Sai1);
+    /* Set SAI1_CLK_PRED. */
+    CLOCK_SetDiv(kCLOCK_Sai1PreDiv, 3);
+    /* Set SAI1_CLK_PODF. */
+    CLOCK_SetDiv(kCLOCK_Sai1Div, 1);
+    /* Set Sai1 clock source. */
+    CLOCK_SetMux(kCLOCK_Sai1Mux, 0);
+    /* Disable SAI2 clock gate. */
+    CLOCK_DisableClock(kCLOCK_Sai2);
+    /* Set SAI2_CLK_PRED. */
+    CLOCK_SetDiv(kCLOCK_Sai2PreDiv, 3);
+    /* Set SAI2_CLK_PODF. */
+    CLOCK_SetDiv(kCLOCK_Sai2Div, 1);
+    /* Set Sai2 clock source. */
+    CLOCK_SetMux(kCLOCK_Sai2Mux, 0);
+    /* Disable SAI3 clock gate. */
+    CLOCK_DisableClock(kCLOCK_Sai3);
+    /* Set SAI3_CLK_PRED. */
+    CLOCK_SetDiv(kCLOCK_Sai3PreDiv, 3);
+    /* Set SAI3_CLK_PODF. */
+    CLOCK_SetDiv(kCLOCK_Sai3Div, 1);
+    /* Set Sai3 clock source. */
+    CLOCK_SetMux(kCLOCK_Sai3Mux, 0);
+    /* Disable Lpi2c clock gate. */
+    CLOCK_DisableClock(kCLOCK_Lpi2c1);
+    CLOCK_DisableClock(kCLOCK_Lpi2c2);
+    CLOCK_DisableClock(kCLOCK_Lpi2c3);
+    /* Set LPI2C_CLK_PODF. */
+    CLOCK_SetDiv(kCLOCK_Lpi2cDiv, 0);
+    /* Set Lpi2c clock source. */
+    CLOCK_SetMux(kCLOCK_Lpi2cMux, 0);
+    /* Disable CAN clock gate. */
+    CLOCK_DisableClock(kCLOCK_Can1);
+    CLOCK_DisableClock(kCLOCK_Can2);
+    CLOCK_DisableClock(kCLOCK_Can1S);
+    CLOCK_DisableClock(kCLOCK_Can2S);
+    /* Set CAN_CLK_PODF. */
+    CLOCK_SetDiv(kCLOCK_CanDiv, 1);
+    /* Set Can clock source. */
+    CLOCK_SetMux(kCLOCK_CanMux, 2);
+    /* Disable UART clock gate. */
+    CLOCK_DisableClock(kCLOCK_Lpuart1);
+    CLOCK_DisableClock(kCLOCK_Lpuart2);
+    CLOCK_DisableClock(kCLOCK_Lpuart3);
+    CLOCK_DisableClock(kCLOCK_Lpuart4);
+    CLOCK_DisableClock(kCLOCK_Lpuart5);
+    CLOCK_DisableClock(kCLOCK_Lpuart6);
+    CLOCK_DisableClock(kCLOCK_Lpuart7);
+    CLOCK_DisableClock(kCLOCK_Lpuart8);
+    /* Set UART_CLK_PODF. */
+    CLOCK_SetDiv(kCLOCK_UartDiv, 0);
+    /* Set Uart clock source. */
+    CLOCK_SetMux(kCLOCK_UartMux, 0);
+    /* Disable SPDIF clock gate. */
+    CLOCK_DisableClock(kCLOCK_Spdif);
+    /* Set SPDIF0_CLK_PRED. */
+    CLOCK_SetDiv(kCLOCK_Spdif0PreDiv, 1);
+    /* Set SPDIF0_CLK_PODF. */
+    CLOCK_SetDiv(kCLOCK_Spdif0Div, 7);
+    /* Set Spdif clock source. */
+    CLOCK_SetMux(kCLOCK_SpdifMux, 3);
+    /* Disable Flexio1 clock gate. */
+    CLOCK_DisableClock(kCLOCK_Flexio1);
+    /* Set FLEXIO1_CLK_PRED. */
+    CLOCK_SetDiv(kCLOCK_Flexio1PreDiv, 1);
+    /* Set FLEXIO1_CLK_PODF. */
+    CLOCK_SetDiv(kCLOCK_Flexio1Div, 7);
+    /* Set Flexio1 clock source. */
+    CLOCK_SetMux(kCLOCK_Flexio1Mux, 3);
+    /* Set Pll3 sw clock source. */
+    CLOCK_SetMux(kCLOCK_Pll3SwMux, 0);
+    /* In SDK projects, SDRAM (configured by SEMC) will be initialized in either debug script or dcd.
+     * With this macro SKIP_SYSCLK_INIT, system pll (selected to be SEMC source clock in SDK projects) will be left
+     * unchanged. Note: If another clock source is selected for SEMC, user may want to avoid changing that clock as
+     * well.*/
+    #ifndef SKIP_SYSCLK_INIT
+    /* Init System PLL. */
+    CLOCK_InitSysPll(&sysPllConfig_BOARD_BootClockRUN);
+    /* Init System pfd0. */
+    CLOCK_InitSysPfd(kCLOCK_Pfd0, 27);
+    /* Init System pfd1. */
+    CLOCK_InitSysPfd(kCLOCK_Pfd1, 16);
+    /* Init System pfd2. */
+    CLOCK_InitSysPfd(kCLOCK_Pfd2, 18);
+    /* Init System pfd3. */
+    CLOCK_InitSysPfd(kCLOCK_Pfd3, 18);
+    #endif
+    /* In SDK projects, external flash (configured by FLEXSPI) will be initialized by dcd.
+     * With this macro XIP_EXTERNAL_FLASH, usb1 pll (selected to be FLEXSPI clock source in SDK projects) will be left
+     * unchanged. Note: If another clock source is selected for FLEXSPI, user may want to avoid changing that clock as
+     * well.*/
+    #if !(defined(XIP_EXTERNAL_FLASH) && (XIP_EXTERNAL_FLASH == 1))
+    /* Init Usb1 PLL. */
+    CLOCK_InitUsb1Pll(&usb1PllConfig_BOARD_BootClockRUN);
+    /* Init Usb1 pfd0. */
+    CLOCK_InitUsb1Pfd(kCLOCK_Pfd0, 22);
+    /* Init Usb1 pfd1. */
+    CLOCK_InitUsb1Pfd(kCLOCK_Pfd1, 16);
+    /* Init Usb1 pfd2. */
+    CLOCK_InitUsb1Pfd(kCLOCK_Pfd2, 17);
+    /* Init Usb1 pfd3. */
+    CLOCK_InitUsb1Pfd(kCLOCK_Pfd3, 18);
+    /* Disable Usb1 PLL output for USBPHY1. */
+    CCM_ANALOG->PLL_USB1 &= ~CCM_ANALOG_PLL_USB1_EN_USB_CLKS_MASK;
+    #endif
+    /* DeInit Audio PLL. */
+    CLOCK_DeinitAudioPll();
+    /* Bypass Audio PLL. */
+    CLOCK_SetPllBypass(CCM_ANALOG, kCLOCK_PllAudio, 1);
+    /* Set divider for Audio PLL. */
+    CCM_ANALOG->MISC2 &= ~CCM_ANALOG_MISC2_AUDIO_DIV_LSB_MASK;
+    CCM_ANALOG->MISC2 &= ~CCM_ANALOG_MISC2_AUDIO_DIV_MSB_MASK;
+    /* Enable Audio PLL output. */
+    CCM_ANALOG->PLL_AUDIO |= CCM_ANALOG_PLL_AUDIO_ENABLE_MASK;
+    /* Init Enet PLL. */
+    CLOCK_InitEnetPll(&enetPllConfig_BOARD_BootClockRUN);
+    /* Set preperiph clock source. */
+    CLOCK_SetMux(kCLOCK_PrePeriphMux, 3);
+    /* Set periph clock source. */
+    CLOCK_SetMux(kCLOCK_PeriphMux, 0);
+    /* Set periph clock2 clock source. */
+    CLOCK_SetMux(kCLOCK_PeriphClk2Mux, 0);
+    /* Set per clock source. */
+    CLOCK_SetMux(kCLOCK_PerclkMux, 0);
+    /* Set clock out1 divider. */
+    CCM->CCOSR = (CCM->CCOSR & (~CCM_CCOSR_CLKO1_DIV_MASK)) | CCM_CCOSR_CLKO1_DIV(0);
+    /* Set clock out1 source. */
+    CCM->CCOSR = (CCM->CCOSR & (~CCM_CCOSR_CLKO1_SEL_MASK)) | CCM_CCOSR_CLKO1_SEL(1);
+    /* Set clock out2 divider. */
+    CCM->CCOSR = (CCM->CCOSR & (~CCM_CCOSR_CLKO2_DIV_MASK)) | CCM_CCOSR_CLKO2_DIV(0);
+    /* Set clock out2 source. */
+    CCM->CCOSR = (CCM->CCOSR & (~CCM_CCOSR_CLKO2_SEL_MASK)) | CCM_CCOSR_CLKO2_SEL(3);
+    /* Set clock out1 drives clock out1. */
+    CCM->CCOSR &= ~CCM_CCOSR_CLK_OUT_SEL_MASK;
+    /* Disable clock out1. */
+    CCM->CCOSR &= ~CCM_CCOSR_CLKO1_EN_MASK;
+    /* Disable clock out2. */
+    CCM->CCOSR &= ~CCM_CCOSR_CLKO2_EN_MASK;
+    /* Set SAI1 MCLK1 clock source. */
+    IOMUXC_SetSaiMClkClockSource(IOMUXC_GPR, kIOMUXC_GPR_SAI1MClk1Sel, 0);
+    /* Set SAI1 MCLK2 clock source. */
+    IOMUXC_SetSaiMClkClockSource(IOMUXC_GPR, kIOMUXC_GPR_SAI1MClk2Sel, 0);
+    /* Set SAI1 MCLK3 clock source. */
+    IOMUXC_SetSaiMClkClockSource(IOMUXC_GPR, kIOMUXC_GPR_SAI1MClk3Sel, 0);
+    /* Set SAI2 MCLK3 clock source. */
+    IOMUXC_SetSaiMClkClockSource(IOMUXC_GPR, kIOMUXC_GPR_SAI2MClk3Sel, 0);
+    /* Set SAI3 MCLK3 clock source. */
+    IOMUXC_SetSaiMClkClockSource(IOMUXC_GPR, kIOMUXC_GPR_SAI3MClk3Sel, 0);
+    /* Set MQS configuration. */
+    IOMUXC_MQSConfig(IOMUXC_GPR, kIOMUXC_MqsPwmOverSampleRate32, 0);
+    /* Set ENET Tx clock source. */
+    IOMUXC_EnableMode(IOMUXC_GPR, kIOMUXC_GPR_ENET1RefClkMode, false);
+    /* Set GPT1 High frequency reference clock source. */
+    IOMUXC_GPR->GPR5 &= ~IOMUXC_GPR_GPR5_VREF_1M_CLK_GPT1_MASK;
+    /* Set GPT2 High frequency reference clock source. */
+    IOMUXC_GPR->GPR5 &= ~IOMUXC_GPR_GPR5_VREF_1M_CLK_GPT2_MASK;
+    /* Set SystemCoreClock variable. */
+    SystemCoreClock = BOARD_BOOTCLOCKRUN_CORE_CLOCK;
+}
diff --git a/ports/mimxrt/boards/MIMXRT1020_EVK/clock_config.h b/ports/mimxrt/boards/MIMXRT1021_clock_config.h
similarity index 100%
rename from ports/mimxrt/boards/MIMXRT1020_EVK/clock_config.h
rename to ports/mimxrt/boards/MIMXRT1021_clock_config.h
diff --git a/ports/mimxrt/boards/MIMXRT1052_clock_config.c b/ports/mimxrt/boards/MIMXRT1052_clock_config.c
new file mode 100644
index 0000000000000..93492812977ab
--- /dev/null
+++ b/ports/mimxrt/boards/MIMXRT1052_clock_config.c
@@ -0,0 +1,468 @@
+/*
+ * Copyright 2017-2019 NXP
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+/*
+ * How to setup clock using clock driver functions:
+ *
+ * 1. Call CLOCK_InitXXXPLL() to configure corresponding PLL clock.
+ *
+ * 2. Call CLOCK_InitXXXpfd() to configure corresponding PLL pfd clock.
+ *
+ * 3. Call CLOCK_SetMux() to configure corresponding clock source for target clock out.
+ *
+ * 4. Call CLOCK_SetDiv() to configure corresponding clock divider for target clock out.
+ *
+ * 5. Call CLOCK_SetXtalFreq() to set XTAL frequency based on board settings.
+ *
+ */
+
+/* TEXT BELOW IS USED AS SETTING FOR TOOLS *************************************
+!!GlobalInfo
+product: Clocks v5.0
+processor: MIMXRT1052xxxxB
+package_id: MIMXRT1052DVL6B
+mcu_data: ksdk2_0
+processor_version: 0.0.0
+board: IMXRT1050-EVKB
+ * BE CAREFUL MODIFYING THIS COMMENT - IT IS YAML SETTINGS FOR TOOLS **********/
+
+#include CLOCK_CONFIG_H
+#include "fsl_iomuxc.h"
+
+/*******************************************************************************
+ * Definitions
+ ******************************************************************************/
+
+/*******************************************************************************
+ * Variables
+ ******************************************************************************/
+/* System clock frequency. */
+extern uint32_t SystemCoreClock;
+
+/*******************************************************************************
+ ************************ BOARD_InitBootClocks function ************************
+ ******************************************************************************/
+void BOARD_InitBootClocks(void) {
+    BOARD_BootClockRUN();
+}
+
+/*******************************************************************************
+ ********************** Configuration BOARD_BootClockRUN ***********************
+ ******************************************************************************/
+/* TEXT BELOW IS USED AS SETTING FOR TOOLS *************************************
+!!Configuration
+name: BOARD_BootClockRUN
+called_from_default_init: true
+outputs:
+- {id: AHB_CLK_ROOT.outFreq, value: 600 MHz}
+- {id: CAN_CLK_ROOT.outFreq, value: 40 MHz}
+- {id: CKIL_SYNC_CLK_ROOT.outFreq, value: 32.768 kHz}
+- {id: CLK_1M.outFreq, value: 1 MHz}
+- {id: CLK_24M.outFreq, value: 24 MHz}
+- {id: CSI_CLK_ROOT.outFreq, value: 12 MHz}
+- {id: ENET1_TX_CLK.outFreq, value: 2.4 MHz}
+- {id: ENET_125M_CLK.outFreq, value: 2.4 MHz}
+- {id: ENET_25M_REF_CLK.outFreq, value: 1.2 MHz}
+- {id: FLEXIO1_CLK_ROOT.outFreq, value: 30 MHz}
+- {id: FLEXIO2_CLK_ROOT.outFreq, value: 30 MHz}
+- {id: FLEXSPI_CLK_ROOT.outFreq, value: 160 MHz}
+- {id: GPT1_ipg_clk_highfreq.outFreq, value: 75 MHz}
+- {id: GPT2_ipg_clk_highfreq.outFreq, value: 75 MHz}
+- {id: IPG_CLK_ROOT.outFreq, value: 150 MHz}
+- {id: LCDIF_CLK_ROOT.outFreq, value: 67.5 MHz}
+- {id: LPI2C_CLK_ROOT.outFreq, value: 60 MHz}
+- {id: LPSPI_CLK_ROOT.outFreq, value: 105.6 MHz}
+- {id: LVDS1_CLK.outFreq, value: 1.2 GHz}
+- {id: MQS_MCLK.outFreq, value: 1080/17 MHz}
+- {id: PERCLK_CLK_ROOT.outFreq, value: 75 MHz}
+- {id: PLL7_MAIN_CLK.outFreq, value: 24 MHz}
+- {id: SAI1_CLK_ROOT.outFreq, value: 1080/17 MHz}
+- {id: SAI1_MCLK1.outFreq, value: 1080/17 MHz}
+- {id: SAI1_MCLK2.outFreq, value: 1080/17 MHz}
+- {id: SAI1_MCLK3.outFreq, value: 30 MHz}
+- {id: SAI2_CLK_ROOT.outFreq, value: 1080/17 MHz}
+- {id: SAI2_MCLK1.outFreq, value: 1080/17 MHz}
+- {id: SAI2_MCLK3.outFreq, value: 30 MHz}
+- {id: SAI3_CLK_ROOT.outFreq, value: 1080/17 MHz}
+- {id: SAI3_MCLK1.outFreq, value: 1080/17 MHz}
+- {id: SAI3_MCLK3.outFreq, value: 30 MHz}
+- {id: SEMC_CLK_ROOT.outFreq, value: 75 MHz}
+- {id: SPDIF0_CLK_ROOT.outFreq, value: 30 MHz}
+- {id: TRACE_CLK_ROOT.outFreq, value: 352/3 MHz}
+- {id: UART_CLK_ROOT.outFreq, value: 80 MHz}
+- {id: USDHC1_CLK_ROOT.outFreq, value: 198 MHz}
+- {id: USDHC2_CLK_ROOT.outFreq, value: 198 MHz}
+settings:
+- {id: CCM.AHB_PODF.scale, value: '1', locked: true}
+- {id: CCM.ARM_PODF.scale, value: '2', locked: true}
+- {id: CCM.FLEXSPI_PODF.scale, value: '3', locked: true}
+- {id: CCM.FLEXSPI_SEL.sel, value: CCM.PLL3_SW_CLK_SEL}
+- {id: CCM.LPSPI_PODF.scale, value: '5', locked: true}
+- {id: CCM.PERCLK_PODF.scale, value: '2', locked: true}
+- {id: CCM.SEMC_PODF.scale, value: '8'}
+- {id: CCM.TRACE_PODF.scale, value: '3', locked: true}
+- {id: CCM_ANALOG.PLL1_BYPASS.sel, value: CCM_ANALOG.PLL1}
+- {id: CCM_ANALOG.PLL1_PREDIV.scale, value: '1', locked: true}
+- {id: CCM_ANALOG.PLL1_VDIV.scale, value: '50', locked: true}
+- {id: CCM_ANALOG.PLL2.denom, value: '1', locked: true}
+- {id: CCM_ANALOG.PLL2.num, value: '0', locked: true}
+- {id: CCM_ANALOG.PLL2_BYPASS.sel, value: CCM_ANALOG.PLL2_OUT_CLK}
+- {id: CCM_ANALOG.PLL2_PFD0_BYPASS.sel, value: CCM_ANALOG.PLL2_PFD0}
+- {id: CCM_ANALOG.PLL2_PFD1_BYPASS.sel, value: CCM_ANALOG.PLL2_PFD1}
+- {id: CCM_ANALOG.PLL2_PFD2_BYPASS.sel, value: CCM_ANALOG.PLL2_PFD2}
+- {id: CCM_ANALOG.PLL2_PFD3_BYPASS.sel, value: CCM_ANALOG.PLL2_PFD3}
+- {id: CCM_ANALOG.PLL3_BYPASS.sel, value: CCM_ANALOG.PLL3}
+- {id: CCM_ANALOG.PLL3_PFD0_BYPASS.sel, value: CCM_ANALOG.PLL3_PFD0}
+- {id: CCM_ANALOG.PLL3_PFD0_DIV.scale, value: '33', locked: true}
+- {id: CCM_ANALOG.PLL3_PFD0_MUL.scale, value: '18', locked: true}
+- {id: CCM_ANALOG.PLL3_PFD1_BYPASS.sel, value: CCM_ANALOG.PLL3_PFD1}
+- {id: CCM_ANALOG.PLL3_PFD2_BYPASS.sel, value: CCM_ANALOG.PLL3_PFD2}
+- {id: CCM_ANALOG.PLL3_PFD3_BYPASS.sel, value: CCM_ANALOG.PLL3_PFD3}
+- {id: CCM_ANALOG.PLL4.denom, value: '50'}
+- {id: CCM_ANALOG.PLL4.div, value: '47'}
+- {id: CCM_ANALOG.PLL5.denom, value: '1'}
+- {id: CCM_ANALOG.PLL5.div, value: '40'}
+- {id: CCM_ANALOG.PLL5.num, value: '0'}
+- {id: CCM_ANALOG_PLL_ENET_POWERDOWN_CFG, value: 'Yes'}
+- {id: CCM_ANALOG_PLL_USB1_POWER_CFG, value: 'Yes'}
+sources:
+- {id: XTALOSC24M.OSC.outFreq, value: 24 MHz, enabled: true}
+- {id: XTALOSC24M.RTC_OSC.outFreq, value: 32.768 kHz, enabled: true}
+ * BE CAREFUL MODIFYING THIS COMMENT - IT IS YAML SETTINGS FOR TOOLS **********/
+
+/*******************************************************************************
+ * Variables for BOARD_BootClockRUN configuration
+ ******************************************************************************/
+const clock_arm_pll_config_t armPllConfig_BOARD_BootClockRUN = {
+    .loopDivider = 100, /* PLL loop divider, Fout = Fin * 50 */
+    .src = 0,           /* Bypass clock source, 0 - OSC 24M, 1 - CLK1_P and CLK1_N */
+};
+const clock_sys_pll_config_t sysPllConfig_BOARD_BootClockRUN = {
+    .loopDivider = 1, /* PLL loop divider, Fout = Fin * ( 20 + loopDivider*2 + numerator / denominator ) */
+    .numerator = 0,   /* 30 bit numerator of fractional loop divider */
+    .denominator = 1, /* 30 bit denominator of fractional loop divider */
+    .src = 0,         /* Bypass clock source, 0 - OSC 24M, 1 - CLK1_P and CLK1_N */
+};
+const clock_usb_pll_config_t usb1PllConfig_BOARD_BootClockRUN = {
+    .loopDivider = 0, /* PLL loop divider, Fout = Fin * 20 */
+    .src = 0,         /* Bypass clock source, 0 - OSC 24M, 1 - CLK1_P and CLK1_N */
+};
+/*******************************************************************************
+ * Code for BOARD_BootClockRUN configuration
+ ******************************************************************************/
+void BOARD_BootClockRUN(void) {
+    /* Init RTC OSC clock frequency. */
+    CLOCK_SetRtcXtalFreq(32768U);
+    /* Enable 1MHz clock output. */
+    XTALOSC24M->OSC_CONFIG2 |= XTALOSC24M_OSC_CONFIG2_ENABLE_1M_MASK;
+    /* Use free 1MHz clock output. */
+    XTALOSC24M->OSC_CONFIG2 &= ~XTALOSC24M_OSC_CONFIG2_MUX_1M_MASK;
+    /* Set XTAL 24MHz clock frequency. */
+    CLOCK_SetXtalFreq(24000000U);
+    /* Enable XTAL 24MHz clock source. */
+    CLOCK_InitExternalClk(0);
+    /* Enable internal RC. */
+    CLOCK_InitRcOsc24M();
+    /* Switch clock source to external OSC. */
+    CLOCK_SwitchOsc(kCLOCK_XtalOsc);
+    /* Set Oscillator ready counter value. */
+    CCM->CCR = (CCM->CCR & (~CCM_CCR_OSCNT_MASK)) | CCM_CCR_OSCNT(127);
+    /* Setting PeriphClk2Mux and PeriphMux to provide stable clock before PLLs are initialed */
+    CLOCK_SetMux(kCLOCK_PeriphClk2Mux, 1); /* Set PERIPH_CLK2 MUX to OSC */
+    CLOCK_SetMux(kCLOCK_PeriphMux, 1);     /* Set PERIPH_CLK MUX to PERIPH_CLK2 */
+    /* Setting the VDD_SOC to 1.275V. It is necessary to config AHB to 600Mhz. */
+    DCDC->REG3 = (DCDC->REG3 & (~DCDC_REG3_TRG_MASK)) | DCDC_REG3_TRG(0x13);
+    /* Waiting for DCDC_STS_DC_OK bit is asserted */
+    while (DCDC_REG0_STS_DC_OK_MASK != (DCDC_REG0_STS_DC_OK_MASK & DCDC->REG0)) {
+    }
+    /* Set AHB_PODF. */
+    CLOCK_SetDiv(kCLOCK_AhbDiv, 0);
+    /* Disable IPG clock gate. */
+    CLOCK_DisableClock(kCLOCK_Adc1);
+    CLOCK_DisableClock(kCLOCK_Adc2);
+    CLOCK_DisableClock(kCLOCK_Xbar1);
+    CLOCK_DisableClock(kCLOCK_Xbar2);
+    CLOCK_DisableClock(kCLOCK_Xbar3);
+    /* Set IPG_PODF. */
+    CLOCK_SetDiv(kCLOCK_IpgDiv, 3);
+    /* Set ARM_PODF. */
+    CLOCK_SetDiv(kCLOCK_ArmDiv, 1);
+    /* Set PERIPH_CLK2_PODF. */
+    CLOCK_SetDiv(kCLOCK_PeriphClk2Div, 0);
+    /* Disable PERCLK clock gate. */
+    CLOCK_DisableClock(kCLOCK_Gpt1);
+    CLOCK_DisableClock(kCLOCK_Gpt1S);
+    CLOCK_DisableClock(kCLOCK_Gpt2);
+    CLOCK_DisableClock(kCLOCK_Gpt2S);
+    CLOCK_DisableClock(kCLOCK_Pit);
+    /* Set PERCLK_PODF. */
+    CLOCK_SetDiv(kCLOCK_PerclkDiv, 1);
+    /* Disable USDHC1 clock gate. */
+    CLOCK_DisableClock(kCLOCK_Usdhc1);
+    /* Set USDHC1_PODF. */
+    CLOCK_SetDiv(kCLOCK_Usdhc1Div, 1);
+    /* Set Usdhc1 clock source. */
+    CLOCK_SetMux(kCLOCK_Usdhc1Mux, 0);
+    /* Disable USDHC2 clock gate. */
+    CLOCK_DisableClock(kCLOCK_Usdhc2);
+    /* Set USDHC2_PODF. */
+    CLOCK_SetDiv(kCLOCK_Usdhc2Div, 1);
+    /* Set Usdhc2 clock source. */
+    CLOCK_SetMux(kCLOCK_Usdhc2Mux, 0);
+/* In SDK projects, SDRAM (configured by SEMC) will be initialized in either debug script or dcd.
+ * With this macro SKIP_SYSCLK_INIT, system pll (selected to be SEMC source clock in SDK projects) will be left
+ * unchanged.
+ * Note: If another clock source is selected for SEMC, user may want to avoid changing that clock as well.*/
+    #ifndef SKIP_SYSCLK_INIT
+    /* Disable Semc clock gate. */
+    CLOCK_DisableClock(kCLOCK_Semc);
+    /* Set SEMC_PODF. */
+    CLOCK_SetDiv(kCLOCK_SemcDiv, 7);
+    /* Set Semc alt clock source. */
+    CLOCK_SetMux(kCLOCK_SemcAltMux, 0);
+    /* Set Semc clock source. */
+    CLOCK_SetMux(kCLOCK_SemcMux, 0);
+    #endif
+/* In SDK projects, external flash (configured by FLEXSPI) will be initialized by dcd.
+ * With this macro XIP_EXTERNAL_FLASH, usb1 pll (selected to be FLEXSPI clock source in SDK projects) will be left
+ * unchanged.
+ * Note: If another clock source is selected for FLEXSPI, user may want to avoid changing that clock as well.*/
+    #if !(defined(XIP_EXTERNAL_FLASH) && (XIP_EXTERNAL_FLASH == 1))
+    /* Disable Flexspi clock gate. */
+    CLOCK_DisableClock(kCLOCK_FlexSpi);
+    /* Set FLEXSPI_PODF. */
+    CLOCK_SetDiv(kCLOCK_FlexspiDiv, 2);
+    /* Set Flexspi clock source. */
+    CLOCK_SetMux(kCLOCK_FlexspiMux, 1);
+    #endif
+    /* Disable CSI clock gate. */
+    CLOCK_DisableClock(kCLOCK_Csi);
+    /* Set CSI_PODF. */
+    CLOCK_SetDiv(kCLOCK_CsiDiv, 1);
+    /* Set Csi clock source. */
+    CLOCK_SetMux(kCLOCK_CsiMux, 0);
+    /* Disable LPSPI clock gate. */
+    CLOCK_DisableClock(kCLOCK_Lpspi1);
+    CLOCK_DisableClock(kCLOCK_Lpspi2);
+    CLOCK_DisableClock(kCLOCK_Lpspi3);
+    CLOCK_DisableClock(kCLOCK_Lpspi4);
+    /* Set LPSPI_PODF. */
+    CLOCK_SetDiv(kCLOCK_LpspiDiv, 4);
+    /* Set Lpspi clock source. */
+    CLOCK_SetMux(kCLOCK_LpspiMux, 2);
+    /* Disable TRACE clock gate. */
+    CLOCK_DisableClock(kCLOCK_Trace);
+    /* Set TRACE_PODF. */
+    CLOCK_SetDiv(kCLOCK_TraceDiv, 2);
+    /* Set Trace clock source. */
+    CLOCK_SetMux(kCLOCK_TraceMux, 2);
+    /* Disable SAI1 clock gate. */
+    CLOCK_DisableClock(kCLOCK_Sai1);
+    /* Set SAI1_CLK_PRED. */
+    CLOCK_SetDiv(kCLOCK_Sai1PreDiv, 3);
+    /* Set SAI1_CLK_PODF. */
+    CLOCK_SetDiv(kCLOCK_Sai1Div, 1);
+    /* Set Sai1 clock source. */
+    CLOCK_SetMux(kCLOCK_Sai1Mux, 0);
+    /* Disable SAI2 clock gate. */
+    CLOCK_DisableClock(kCLOCK_Sai2);
+    /* Set SAI2_CLK_PRED. */
+    CLOCK_SetDiv(kCLOCK_Sai2PreDiv, 3);
+    /* Set SAI2_CLK_PODF. */
+    CLOCK_SetDiv(kCLOCK_Sai2Div, 1);
+    /* Set Sai2 clock source. */
+    CLOCK_SetMux(kCLOCK_Sai2Mux, 0);
+    /* Disable SAI3 clock gate. */
+    CLOCK_DisableClock(kCLOCK_Sai3);
+    /* Set SAI3_CLK_PRED. */
+    CLOCK_SetDiv(kCLOCK_Sai3PreDiv, 3);
+    /* Set SAI3_CLK_PODF. */
+    CLOCK_SetDiv(kCLOCK_Sai3Div, 1);
+    /* Set Sai3 clock source. */
+    CLOCK_SetMux(kCLOCK_Sai3Mux, 0);
+    /* Disable Lpi2c clock gate. */
+    CLOCK_DisableClock(kCLOCK_Lpi2c1);
+    CLOCK_DisableClock(kCLOCK_Lpi2c2);
+    CLOCK_DisableClock(kCLOCK_Lpi2c3);
+    /* Set LPI2C_CLK_PODF. */
+    CLOCK_SetDiv(kCLOCK_Lpi2cDiv, 0);
+    /* Set Lpi2c clock source. */
+    CLOCK_SetMux(kCLOCK_Lpi2cMux, 0);
+    /* Disable CAN clock gate. */
+    CLOCK_DisableClock(kCLOCK_Can1);
+    CLOCK_DisableClock(kCLOCK_Can2);
+    CLOCK_DisableClock(kCLOCK_Can1S);
+    CLOCK_DisableClock(kCLOCK_Can2S);
+    /* Set CAN_CLK_PODF. */
+    CLOCK_SetDiv(kCLOCK_CanDiv, 1);
+    /* Set Can clock source. */
+    CLOCK_SetMux(kCLOCK_CanMux, 2);
+    /* Disable UART clock gate. */
+    CLOCK_DisableClock(kCLOCK_Lpuart1);
+    CLOCK_DisableClock(kCLOCK_Lpuart2);
+    CLOCK_DisableClock(kCLOCK_Lpuart3);
+    CLOCK_DisableClock(kCLOCK_Lpuart4);
+    CLOCK_DisableClock(kCLOCK_Lpuart5);
+    CLOCK_DisableClock(kCLOCK_Lpuart6);
+    CLOCK_DisableClock(kCLOCK_Lpuart7);
+    CLOCK_DisableClock(kCLOCK_Lpuart8);
+    /* Set UART_CLK_PODF. */
+    CLOCK_SetDiv(kCLOCK_UartDiv, 0);
+    /* Set Uart clock source. */
+    CLOCK_SetMux(kCLOCK_UartMux, 0);
+    /* Disable LCDIF clock gate. */
+    CLOCK_DisableClock(kCLOCK_LcdPixel);
+    /* Set LCDIF_PRED. */
+    CLOCK_SetDiv(kCLOCK_LcdifPreDiv, 1);
+    /* Set LCDIF_CLK_PODF. */
+    CLOCK_SetDiv(kCLOCK_LcdifDiv, 3);
+    /* Set Lcdif pre clock source. */
+    CLOCK_SetMux(kCLOCK_LcdifPreMux, 5);
+    /* Disable SPDIF clock gate. */
+    CLOCK_DisableClock(kCLOCK_Spdif);
+    /* Set SPDIF0_CLK_PRED. */
+    CLOCK_SetDiv(kCLOCK_Spdif0PreDiv, 1);
+    /* Set SPDIF0_CLK_PODF. */
+    CLOCK_SetDiv(kCLOCK_Spdif0Div, 7);
+    /* Set Spdif clock source. */
+    CLOCK_SetMux(kCLOCK_SpdifMux, 3);
+    /* Disable Flexio1 clock gate. */
+    CLOCK_DisableClock(kCLOCK_Flexio1);
+    /* Set FLEXIO1_CLK_PRED. */
+    CLOCK_SetDiv(kCLOCK_Flexio1PreDiv, 1);
+    /* Set FLEXIO1_CLK_PODF. */
+    CLOCK_SetDiv(kCLOCK_Flexio1Div, 7);
+    /* Set Flexio1 clock source. */
+    CLOCK_SetMux(kCLOCK_Flexio1Mux, 3);
+    /* Disable Flexio2 clock gate. */
+    CLOCK_DisableClock(kCLOCK_Flexio2);
+    /* Set FLEXIO2_CLK_PRED. */
+    CLOCK_SetDiv(kCLOCK_Flexio2PreDiv, 1);
+    /* Set FLEXIO2_CLK_PODF. */
+    CLOCK_SetDiv(kCLOCK_Flexio2Div, 7);
+    /* Set Flexio2 clock source. */
+    CLOCK_SetMux(kCLOCK_Flexio2Mux, 3);
+    /* Set Pll3 sw clock source. */
+    CLOCK_SetMux(kCLOCK_Pll3SwMux, 0);
+    /* Init ARM PLL. */
+    CLOCK_InitArmPll(&armPllConfig_BOARD_BootClockRUN);
+    /* In SDK projects, SDRAM (configured by SEMC) will be initialized in either debug script or dcd.
+     * With this macro SKIP_SYSCLK_INIT, system pll (selected to be SEMC source clock in SDK projects) will be left
+     * unchanged. Note: If another clock source is selected for SEMC, user may want to avoid changing that clock as
+     * well.*/
+    #ifndef SKIP_SYSCLK_INIT
+    /* Init System PLL. */
+    CLOCK_InitSysPll(&sysPllConfig_BOARD_BootClockRUN);
+    /* Init System pfd0. */
+    CLOCK_InitSysPfd(kCLOCK_Pfd0, 27);
+    /* Init System pfd1. */
+    CLOCK_InitSysPfd(kCLOCK_Pfd1, 16);
+    /* Init System pfd2. */
+    CLOCK_InitSysPfd(kCLOCK_Pfd2, 24);
+    /* Init System pfd3. */
+    CLOCK_InitSysPfd(kCLOCK_Pfd3, 16);
+    /* Disable pfd offset. */
+    CCM_ANALOG->PLL_SYS &= ~CCM_ANALOG_PLL_SYS_PFD_OFFSET_EN_MASK;
+    #endif
+    /* In SDK projects, external flash (configured by FLEXSPI) will be initialized by dcd.
+     * With this macro XIP_EXTERNAL_FLASH, usb1 pll (selected to be FLEXSPI clock source in SDK projects) will be left
+     * unchanged. Note: If another clock source is selected for FLEXSPI, user may want to avoid changing that clock as
+     * well.*/
+    #if !(defined(XIP_EXTERNAL_FLASH) && (XIP_EXTERNAL_FLASH == 1))
+    /* Init Usb1 PLL. */
+    CLOCK_InitUsb1Pll(&usb1PllConfig_BOARD_BootClockRUN);
+    /* Init Usb1 pfd0. */
+    CLOCK_InitUsb1Pfd(kCLOCK_Pfd0, 33);
+    /* Init Usb1 pfd1. */
+    CLOCK_InitUsb1Pfd(kCLOCK_Pfd1, 16);
+    /* Init Usb1 pfd2. */
+    CLOCK_InitUsb1Pfd(kCLOCK_Pfd2, 17);
+    /* Init Usb1 pfd3. */
+    CLOCK_InitUsb1Pfd(kCLOCK_Pfd3, 19);
+    /* Disable Usb1 PLL output for USBPHY1. */
+    CCM_ANALOG->PLL_USB1 &= ~CCM_ANALOG_PLL_USB1_EN_USB_CLKS_MASK;
+    #endif
+    /* DeInit Audio PLL. */
+    CLOCK_DeinitAudioPll();
+    /* Bypass Audio PLL. */
+    CLOCK_SetPllBypass(CCM_ANALOG, kCLOCK_PllAudio, 1);
+    /* Set divider for Audio PLL. */
+    CCM_ANALOG->MISC2 &= ~CCM_ANALOG_MISC2_AUDIO_DIV_LSB_MASK;
+    CCM_ANALOG->MISC2 &= ~CCM_ANALOG_MISC2_AUDIO_DIV_MSB_MASK;
+    /* Enable Audio PLL output. */
+    CCM_ANALOG->PLL_AUDIO |= CCM_ANALOG_PLL_AUDIO_ENABLE_MASK;
+    /* DeInit Video PLL. */
+    CLOCK_DeinitVideoPll();
+    /* Bypass Video PLL. */
+    CCM_ANALOG->PLL_VIDEO |= CCM_ANALOG_PLL_VIDEO_BYPASS_MASK;
+    /* Set divider for Video PLL. */
+    CCM_ANALOG->MISC2 = (CCM_ANALOG->MISC2 & (~CCM_ANALOG_MISC2_VIDEO_DIV_MASK)) | CCM_ANALOG_MISC2_VIDEO_DIV(0);
+    /* Enable Video PLL output. */
+    CCM_ANALOG->PLL_VIDEO |= CCM_ANALOG_PLL_VIDEO_ENABLE_MASK;
+    /* DeInit Enet PLL. */
+    CLOCK_DeinitEnetPll();
+    /* Bypass Enet PLL. */
+    CLOCK_SetPllBypass(CCM_ANALOG, kCLOCK_PllEnet, 1);
+    /* Set Enet output divider. */
+    CCM_ANALOG->PLL_ENET =
+        (CCM_ANALOG->PLL_ENET & (~CCM_ANALOG_PLL_ENET_DIV_SELECT_MASK)) | CCM_ANALOG_PLL_ENET_DIV_SELECT(1);
+    /* Enable Enet output. */
+    CCM_ANALOG->PLL_ENET |= CCM_ANALOG_PLL_ENET_ENABLE_MASK;
+    /* Enable Enet25M output. */
+    CCM_ANALOG->PLL_ENET |= CCM_ANALOG_PLL_ENET_ENET_25M_REF_EN_MASK;
+    /* DeInit Usb2 PLL. */
+    CLOCK_DeinitUsb2Pll();
+    /* Bypass Usb2 PLL. */
+    CLOCK_SetPllBypass(CCM_ANALOG, kCLOCK_PllUsb2, 1);
+    /* Enable Usb2 PLL output. */
+    CCM_ANALOG->PLL_USB2 |= CCM_ANALOG_PLL_USB2_ENABLE_MASK;
+    /* Set preperiph clock source. */
+    CLOCK_SetMux(kCLOCK_PrePeriphMux, 3);
+    /* Set periph clock source. */
+    CLOCK_SetMux(kCLOCK_PeriphMux, 0);
+    /* Set periph clock2 clock source. */
+    CLOCK_SetMux(kCLOCK_PeriphClk2Mux, 0);
+    /* Set per clock source. */
+    CLOCK_SetMux(kCLOCK_PerclkMux, 0);
+    /* Set lvds1 clock source. */
+    CCM_ANALOG->MISC1 =
+        (CCM_ANALOG->MISC1 & (~CCM_ANALOG_MISC1_LVDS1_CLK_SEL_MASK)) | CCM_ANALOG_MISC1_LVDS1_CLK_SEL(0);
+    /* Set clock out1 divider. */
+    CCM->CCOSR = (CCM->CCOSR & (~CCM_CCOSR_CLKO1_DIV_MASK)) | CCM_CCOSR_CLKO1_DIV(0);
+    /* Set clock out1 source. */
+    CCM->CCOSR = (CCM->CCOSR & (~CCM_CCOSR_CLKO1_SEL_MASK)) | CCM_CCOSR_CLKO1_SEL(1);
+    /* Set clock out2 divider. */
+    CCM->CCOSR = (CCM->CCOSR & (~CCM_CCOSR_CLKO2_DIV_MASK)) | CCM_CCOSR_CLKO2_DIV(0);
+    /* Set clock out2 source. */
+    CCM->CCOSR = (CCM->CCOSR & (~CCM_CCOSR_CLKO2_SEL_MASK)) | CCM_CCOSR_CLKO2_SEL(18);
+    /* Set clock out1 drives clock out1. */
+    CCM->CCOSR &= ~CCM_CCOSR_CLK_OUT_SEL_MASK;
+    /* Disable clock out1. */
+    CCM->CCOSR &= ~CCM_CCOSR_CLKO1_EN_MASK;
+    /* Disable clock out2. */
+    CCM->CCOSR &= ~CCM_CCOSR_CLKO2_EN_MASK;
+    /* Set SAI1 MCLK1 clock source. */
+    IOMUXC_SetSaiMClkClockSource(IOMUXC_GPR, kIOMUXC_GPR_SAI1MClk1Sel, 0);
+    /* Set SAI1 MCLK2 clock source. */
+    IOMUXC_SetSaiMClkClockSource(IOMUXC_GPR, kIOMUXC_GPR_SAI1MClk2Sel, 0);
+    /* Set SAI1 MCLK3 clock source. */
+    IOMUXC_SetSaiMClkClockSource(IOMUXC_GPR, kIOMUXC_GPR_SAI1MClk3Sel, 0);
+    /* Set SAI2 MCLK3 clock source. */
+    IOMUXC_SetSaiMClkClockSource(IOMUXC_GPR, kIOMUXC_GPR_SAI2MClk3Sel, 0);
+    /* Set SAI3 MCLK3 clock source. */
+    IOMUXC_SetSaiMClkClockSource(IOMUXC_GPR, kIOMUXC_GPR_SAI3MClk3Sel, 0);
+    /* Set MQS configuration. */
+    IOMUXC_MQSConfig(IOMUXC_GPR, kIOMUXC_MqsPwmOverSampleRate32, 0);
+    /* Set ENET Tx clock source. */
+    IOMUXC_EnableMode(IOMUXC_GPR, kIOMUXC_GPR_ENET1RefClkMode, false);
+    /* Set GPT1 High frequency reference clock source. */
+    IOMUXC_GPR->GPR5 &= ~IOMUXC_GPR_GPR5_VREF_1M_CLK_GPT1_MASK;
+    /* Set GPT2 High frequency reference clock source. */
+    IOMUXC_GPR->GPR5 &= ~IOMUXC_GPR_GPR5_VREF_1M_CLK_GPT2_MASK;
+    /* Set SystemCoreClock variable. */
+    SystemCoreClock = BOARD_BOOTCLOCKRUN_CORE_CLOCK;
+}
diff --git a/ports/mimxrt/boards/MIMXRT1050_EVK/clock_config.h b/ports/mimxrt/boards/MIMXRT1052_clock_config.h
similarity index 100%
rename from ports/mimxrt/boards/MIMXRT1050_EVK/clock_config.h
rename to ports/mimxrt/boards/MIMXRT1052_clock_config.h
diff --git a/ports/mimxrt/boards/MIMXRT1062_clock_config.c b/ports/mimxrt/boards/MIMXRT1062_clock_config.c
new file mode 100644
index 0000000000000..05474167bd85b
--- /dev/null
+++ b/ports/mimxrt/boards/MIMXRT1062_clock_config.c
@@ -0,0 +1,490 @@
+/*
+ * Copyright 2018-2019 NXP
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+/*
+ * How to setup clock using clock driver functions:
+ *
+ * 1. Call CLOCK_InitXXXPLL() to configure corresponding PLL clock.
+ *
+ * 2. Call CLOCK_InitXXXpfd() to configure corresponding PLL pfd clock.
+ *
+ * 3. Call CLOCK_SetMux() to configure corresponding clock source for target clock out.
+ *
+ * 4. Call CLOCK_SetDiv() to configure corresponding clock divider for target clock out.
+ *
+ * 5. Call CLOCK_SetXtalFreq() to set XTAL frequency based on board settings.
+ *
+ */
+
+/* TEXT BELOW IS USED AS SETTING FOR TOOLS *************************************
+!!GlobalInfo
+product: Clocks v5.0
+processor: MIMXRT1062xxxxA
+package_id: MIMXRT1062DVL6A
+mcu_data: ksdk2_0
+processor_version: 0.0.0
+board: MIMXRT1060-EVK
+ * BE CAREFUL MODIFYING THIS COMMENT - IT IS YAML SETTINGS FOR TOOLS **********/
+
+#include CLOCK_CONFIG_H
+#include "fsl_iomuxc.h"
+
+/*******************************************************************************
+ * Definitions
+ ******************************************************************************/
+
+/*******************************************************************************
+ * Variables
+ ******************************************************************************/
+/* System clock frequency. */
+extern uint32_t SystemCoreClock;
+
+/*******************************************************************************
+ ************************ BOARD_InitBootClocks function ************************
+ ******************************************************************************/
+void BOARD_InitBootClocks(void) {
+    BOARD_BootClockRUN();
+}
+
+/*******************************************************************************
+ ********************** Configuration BOARD_BootClockRUN ***********************
+ ******************************************************************************/
+/* TEXT BELOW IS USED AS SETTING FOR TOOLS *************************************
+!!Configuration
+name: BOARD_BootClockRUN
+called_from_default_init: true
+outputs:
+- {id: AHB_CLK_ROOT.outFreq, value: 600 MHz}
+- {id: CAN_CLK_ROOT.outFreq, value: 40 MHz}
+- {id: CKIL_SYNC_CLK_ROOT.outFreq, value: 32.768 kHz}
+- {id: CLK_1M.outFreq, value: 1 MHz}
+- {id: CLK_24M.outFreq, value: 24 MHz}
+- {id: CSI_CLK_ROOT.outFreq, value: 12 MHz}
+- {id: ENET1_TX_CLK.outFreq, value: 2.4 MHz}
+- {id: ENET2_125M_CLK.outFreq, value: 1.2 MHz}
+- {id: ENET2_TX_CLK.outFreq, value: 1.2 MHz}
+- {id: ENET_125M_CLK.outFreq, value: 2.4 MHz}
+- {id: ENET_25M_REF_CLK.outFreq, value: 1.2 MHz}
+- {id: FLEXIO1_CLK_ROOT.outFreq, value: 30 MHz}
+- {id: FLEXIO2_CLK_ROOT.outFreq, value: 30 MHz}
+- {id: FLEXSPI2_CLK_ROOT.outFreq, value: 1440/11 MHz}
+- {id: FLEXSPI_CLK_ROOT.outFreq, value: 1440/11 MHz}
+- {id: GPT1_ipg_clk_highfreq.outFreq, value: 75 MHz}
+- {id: GPT2_ipg_clk_highfreq.outFreq, value: 75 MHz}
+- {id: IPG_CLK_ROOT.outFreq, value: 150 MHz}
+- {id: LCDIF_CLK_ROOT.outFreq, value: 67.5/7 MHz}
+- {id: LPI2C_CLK_ROOT.outFreq, value: 60 MHz}
+- {id: LPSPI_CLK_ROOT.outFreq, value: 105.6 MHz}
+- {id: LVDS1_CLK.outFreq, value: 1.2 GHz}
+- {id: MQS_MCLK.outFreq, value: 1080/17 MHz}
+- {id: PERCLK_CLK_ROOT.outFreq, value: 75 MHz}
+- {id: PLL7_MAIN_CLK.outFreq, value: 24 MHz}
+- {id: SAI1_CLK_ROOT.outFreq, value: 1080/17 MHz}
+- {id: SAI1_MCLK1.outFreq, value: 1080/17 MHz}
+- {id: SAI1_MCLK2.outFreq, value: 1080/17 MHz}
+- {id: SAI1_MCLK3.outFreq, value: 30 MHz}
+- {id: SAI2_CLK_ROOT.outFreq, value: 1080/17 MHz}
+- {id: SAI2_MCLK1.outFreq, value: 1080/17 MHz}
+- {id: SAI2_MCLK3.outFreq, value: 30 MHz}
+- {id: SAI3_CLK_ROOT.outFreq, value: 1080/17 MHz}
+- {id: SAI3_MCLK1.outFreq, value: 1080/17 MHz}
+- {id: SAI3_MCLK3.outFreq, value: 30 MHz}
+- {id: SEMC_CLK_ROOT.outFreq, value: 75 MHz}
+- {id: SPDIF0_CLK_ROOT.outFreq, value: 30 MHz}
+- {id: TRACE_CLK_ROOT.outFreq, value: 352/3 MHz}
+- {id: UART_CLK_ROOT.outFreq, value: 80 MHz}
+- {id: USDHC1_CLK_ROOT.outFreq, value: 198 MHz}
+- {id: USDHC2_CLK_ROOT.outFreq, value: 198 MHz}
+settings:
+- {id: CCM.AHB_PODF.scale, value: '1', locked: true}
+- {id: CCM.ARM_PODF.scale, value: '2', locked: true}
+- {id: CCM.FLEXSPI2_PODF.scale, value: '2', locked: true}
+- {id: CCM.FLEXSPI2_SEL.sel, value: CCM_ANALOG.PLL3_PFD0_CLK}
+- {id: CCM.FLEXSPI_PODF.scale, value: '2', locked: true}
+- {id: CCM.FLEXSPI_SEL.sel, value: CCM_ANALOG.PLL3_PFD0_CLK}
+- {id: CCM.LPSPI_PODF.scale, value: '5', locked: true}
+- {id: CCM.PERCLK_PODF.scale, value: '2', locked: true}
+- {id: CCM.SEMC_PODF.scale, value: '8'}
+- {id: CCM.TRACE_PODF.scale, value: '3', locked: true}
+- {id: CCM_ANALOG.PLL1_BYPASS.sel, value: CCM_ANALOG.PLL1}
+- {id: CCM_ANALOG.PLL1_PREDIV.scale, value: '1', locked: true}
+- {id: CCM_ANALOG.PLL1_VDIV.scale, value: '50', locked: true}
+- {id: CCM_ANALOG.PLL2.denom, value: '1', locked: true}
+- {id: CCM_ANALOG.PLL2.num, value: '0', locked: true}
+- {id: CCM_ANALOG.PLL2_BYPASS.sel, value: CCM_ANALOG.PLL2_OUT_CLK}
+- {id: CCM_ANALOG.PLL2_PFD0_BYPASS.sel, value: CCM_ANALOG.PLL2_PFD0}
+- {id: CCM_ANALOG.PLL2_PFD1_BYPASS.sel, value: CCM_ANALOG.PLL2_PFD1}
+- {id: CCM_ANALOG.PLL2_PFD2_BYPASS.sel, value: CCM_ANALOG.PLL2_PFD2}
+- {id: CCM_ANALOG.PLL2_PFD3_BYPASS.sel, value: CCM_ANALOG.PLL2_PFD3}
+- {id: CCM_ANALOG.PLL3_BYPASS.sel, value: CCM_ANALOG.PLL3}
+- {id: CCM_ANALOG.PLL3_PFD0_BYPASS.sel, value: CCM_ANALOG.PLL3_PFD0}
+- {id: CCM_ANALOG.PLL3_PFD0_DIV.scale, value: '33', locked: true}
+- {id: CCM_ANALOG.PLL3_PFD0_MUL.scale, value: '18', locked: true}
+- {id: CCM_ANALOG.PLL3_PFD1_BYPASS.sel, value: CCM_ANALOG.PLL3_PFD1}
+- {id: CCM_ANALOG.PLL3_PFD2_BYPASS.sel, value: CCM_ANALOG.PLL3_PFD2}
+- {id: CCM_ANALOG.PLL3_PFD3_BYPASS.sel, value: CCM_ANALOG.PLL3_PFD3}
+- {id: CCM_ANALOG.PLL4.denom, value: '50'}
+- {id: CCM_ANALOG.PLL4.div, value: '47'}
+- {id: CCM_ANALOG.PLL5.denom, value: '1'}
+- {id: CCM_ANALOG.PLL5.div, value: '40'}
+- {id: CCM_ANALOG.PLL5.num, value: '0'}
+- {id: CCM_ANALOG_PLL_ENET_POWERDOWN_CFG, value: 'Yes'}
+- {id: CCM_ANALOG_PLL_USB1_POWER_CFG, value: 'Yes'}
+sources:
+- {id: XTALOSC24M.OSC.outFreq, value: 24 MHz, enabled: true}
+- {id: XTALOSC24M.RTC_OSC.outFreq, value: 32.768 kHz, enabled: true}
+ * BE CAREFUL MODIFYING THIS COMMENT - IT IS YAML SETTINGS FOR TOOLS **********/
+
+/*******************************************************************************
+ * Variables for BOARD_BootClockRUN configuration
+ ******************************************************************************/
+const clock_arm_pll_config_t armPllConfig_BOARD_BootClockRUN = {
+    .loopDivider = 100, /* PLL loop divider, Fout = Fin * 50 */
+    .src = 0,           /* Bypass clock source, 0 - OSC 24M, 1 - CLK1_P and CLK1_N */
+};
+const clock_sys_pll_config_t sysPllConfig_BOARD_BootClockRUN = {
+    .loopDivider = 1, /* PLL loop divider, Fout = Fin * ( 20 + loopDivider*2 + numerator / denominator ) */
+    .numerator = 0,   /* 30 bit numerator of fractional loop divider */
+    .denominator = 1, /* 30 bit denominator of fractional loop divider */
+    .src = 0,         /* Bypass clock source, 0 - OSC 24M, 1 - CLK1_P and CLK1_N */
+};
+const clock_usb_pll_config_t usb1PllConfig_BOARD_BootClockRUN = {
+    .loopDivider = 0, /* PLL loop divider, Fout = Fin * 20 */
+    .src = 0,         /* Bypass clock source, 0 - OSC 24M, 1 - CLK1_P and CLK1_N */
+};
+/*******************************************************************************
+ * Code for BOARD_BootClockRUN configuration
+ ******************************************************************************/
+void BOARD_BootClockRUN(void) {
+    /* Init RTC OSC clock frequency. */
+    CLOCK_SetRtcXtalFreq(32768U);
+    /* Enable 1MHz clock output. */
+    XTALOSC24M->OSC_CONFIG2 |= XTALOSC24M_OSC_CONFIG2_ENABLE_1M_MASK;
+    /* Use free 1MHz clock output. */
+    XTALOSC24M->OSC_CONFIG2 &= ~XTALOSC24M_OSC_CONFIG2_MUX_1M_MASK;
+    /* Set XTAL 24MHz clock frequency. */
+    CLOCK_SetXtalFreq(24000000U);
+    /* Enable XTAL 24MHz clock source. */
+    CLOCK_InitExternalClk(0);
+    /* Enable internal RC. */
+    CLOCK_InitRcOsc24M();
+    /* Switch clock source to external OSC. */
+    CLOCK_SwitchOsc(kCLOCK_XtalOsc);
+    /* Set Oscillator ready counter value. */
+    CCM->CCR = (CCM->CCR & (~CCM_CCR_OSCNT_MASK)) | CCM_CCR_OSCNT(127);
+    /* Setting PeriphClk2Mux and PeriphMux to provide stable clock before PLLs are initialed */
+    CLOCK_SetMux(kCLOCK_PeriphClk2Mux, 1); /* Set PERIPH_CLK2 MUX to OSC */
+    CLOCK_SetMux(kCLOCK_PeriphMux, 1);     /* Set PERIPH_CLK MUX to PERIPH_CLK2 */
+    /* Setting the VDD_SOC to 1.275V. It is necessary to config AHB to 600Mhz. */
+    DCDC->REG3 = (DCDC->REG3 & (~DCDC_REG3_TRG_MASK)) | DCDC_REG3_TRG(0x13);
+    /* Waiting for DCDC_STS_DC_OK bit is asserted */
+    while (DCDC_REG0_STS_DC_OK_MASK != (DCDC_REG0_STS_DC_OK_MASK & DCDC->REG0)) {
+    }
+    /* Set AHB_PODF. */
+    CLOCK_SetDiv(kCLOCK_AhbDiv, 0);
+    /* Disable IPG clock gate. */
+    CLOCK_DisableClock(kCLOCK_Adc1);
+    CLOCK_DisableClock(kCLOCK_Adc2);
+    CLOCK_DisableClock(kCLOCK_Xbar1);
+    CLOCK_DisableClock(kCLOCK_Xbar2);
+    CLOCK_DisableClock(kCLOCK_Xbar3);
+    /* Set IPG_PODF. */
+    CLOCK_SetDiv(kCLOCK_IpgDiv, 3);
+    /* Set ARM_PODF. */
+    CLOCK_SetDiv(kCLOCK_ArmDiv, 1);
+    /* Set PERIPH_CLK2_PODF. */
+    CLOCK_SetDiv(kCLOCK_PeriphClk2Div, 0);
+    /* Disable PERCLK clock gate. */
+    CLOCK_DisableClock(kCLOCK_Gpt1);
+    CLOCK_DisableClock(kCLOCK_Gpt1S);
+    CLOCK_DisableClock(kCLOCK_Gpt2);
+    CLOCK_DisableClock(kCLOCK_Gpt2S);
+    CLOCK_DisableClock(kCLOCK_Pit);
+    /* Set PERCLK_PODF. */
+    CLOCK_SetDiv(kCLOCK_PerclkDiv, 1);
+    /* Disable USDHC1 clock gate. */
+    CLOCK_DisableClock(kCLOCK_Usdhc1);
+    /* Set USDHC1_PODF. */
+    CLOCK_SetDiv(kCLOCK_Usdhc1Div, 1);
+    /* Set Usdhc1 clock source. */
+    CLOCK_SetMux(kCLOCK_Usdhc1Mux, 0);
+    /* Disable USDHC2 clock gate. */
+    CLOCK_DisableClock(kCLOCK_Usdhc2);
+    /* Set USDHC2_PODF. */
+    CLOCK_SetDiv(kCLOCK_Usdhc2Div, 1);
+    /* Set Usdhc2 clock source. */
+    CLOCK_SetMux(kCLOCK_Usdhc2Mux, 0);
+    /* In SDK projects, SDRAM (configured by SEMC) will be initialized in either debug script or dcd.
+     * With this macro SKIP_SYSCLK_INIT, system pll (selected to be SEMC source clock in SDK projects) will be left
+     * unchanged. Note: If another clock source is selected for SEMC, user may want to avoid changing that clock as
+     * well.*/
+    #ifndef SKIP_SYSCLK_INIT
+    /* Disable Semc clock gate. */
+    CLOCK_DisableClock(kCLOCK_Semc);
+    /* Set SEMC_PODF. */
+    CLOCK_SetDiv(kCLOCK_SemcDiv, 7);
+    /* Set Semc alt clock source. */
+    CLOCK_SetMux(kCLOCK_SemcAltMux, 0);
+    /* Set Semc clock source. */
+    CLOCK_SetMux(kCLOCK_SemcMux, 0);
+    #endif
+    /* In SDK projects, external flash (configured by FLEXSPI) will be initialized by dcd.
+     * With this macro XIP_EXTERNAL_FLASH, usb1 pll (selected to be FLEXSPI clock source in SDK projects) will be left
+     * unchanged. Note: If another clock source is selected for FLEXSPI, user may want to avoid changing that clock as
+     * well.*/
+    #if !(defined(XIP_EXTERNAL_FLASH) && (XIP_EXTERNAL_FLASH == 1))
+    /* Disable Flexspi clock gate. */
+    CLOCK_DisableClock(kCLOCK_FlexSpi);
+    /* Set FLEXSPI_PODF. */
+    CLOCK_SetDiv(kCLOCK_FlexspiDiv, 1);
+    /* Set Flexspi clock source. */
+    CLOCK_SetMux(kCLOCK_FlexspiMux, 3);
+    #endif
+    /* Disable Flexspi2 clock gate. */
+    CLOCK_DisableClock(kCLOCK_FlexSpi2);
+    /* Set FLEXSPI2_PODF. */
+    CLOCK_SetDiv(kCLOCK_Flexspi2Div, 1);
+    /* Set Flexspi2 clock source. */
+    CLOCK_SetMux(kCLOCK_Flexspi2Mux, 1);
+    /* Disable CSI clock gate. */
+    CLOCK_DisableClock(kCLOCK_Csi);
+    /* Set CSI_PODF. */
+    CLOCK_SetDiv(kCLOCK_CsiDiv, 1);
+    /* Set Csi clock source. */
+    CLOCK_SetMux(kCLOCK_CsiMux, 0);
+    /* Disable LPSPI clock gate. */
+    CLOCK_DisableClock(kCLOCK_Lpspi1);
+    CLOCK_DisableClock(kCLOCK_Lpspi2);
+    CLOCK_DisableClock(kCLOCK_Lpspi3);
+    CLOCK_DisableClock(kCLOCK_Lpspi4);
+    /* Set LPSPI_PODF. */
+    CLOCK_SetDiv(kCLOCK_LpspiDiv, 4);
+    /* Set Lpspi clock source. */
+    CLOCK_SetMux(kCLOCK_LpspiMux, 2);
+    /* Disable TRACE clock gate. */
+    CLOCK_DisableClock(kCLOCK_Trace);
+    /* Set TRACE_PODF. */
+    CLOCK_SetDiv(kCLOCK_TraceDiv, 2);
+    /* Set Trace clock source. */
+    CLOCK_SetMux(kCLOCK_TraceMux, 2);
+    /* Disable SAI1 clock gate. */
+    CLOCK_DisableClock(kCLOCK_Sai1);
+    /* Set SAI1_CLK_PRED. */
+    CLOCK_SetDiv(kCLOCK_Sai1PreDiv, 3);
+    /* Set SAI1_CLK_PODF. */
+    CLOCK_SetDiv(kCLOCK_Sai1Div, 1);
+    /* Set Sai1 clock source. */
+    CLOCK_SetMux(kCLOCK_Sai1Mux, 0);
+    /* Disable SAI2 clock gate. */
+    CLOCK_DisableClock(kCLOCK_Sai2);
+    /* Set SAI2_CLK_PRED. */
+    CLOCK_SetDiv(kCLOCK_Sai2PreDiv, 3);
+    /* Set SAI2_CLK_PODF. */
+    CLOCK_SetDiv(kCLOCK_Sai2Div, 1);
+    /* Set Sai2 clock source. */
+    CLOCK_SetMux(kCLOCK_Sai2Mux, 0);
+    /* Disable SAI3 clock gate. */
+    CLOCK_DisableClock(kCLOCK_Sai3);
+    /* Set SAI3_CLK_PRED. */
+    CLOCK_SetDiv(kCLOCK_Sai3PreDiv, 3);
+    /* Set SAI3_CLK_PODF. */
+    CLOCK_SetDiv(kCLOCK_Sai3Div, 1);
+    /* Set Sai3 clock source. */
+    CLOCK_SetMux(kCLOCK_Sai3Mux, 0);
+    /* Disable Lpi2c clock gate. */
+    CLOCK_DisableClock(kCLOCK_Lpi2c1);
+    CLOCK_DisableClock(kCLOCK_Lpi2c2);
+    CLOCK_DisableClock(kCLOCK_Lpi2c3);
+    /* Set LPI2C_CLK_PODF. */
+    CLOCK_SetDiv(kCLOCK_Lpi2cDiv, 0);
+    /* Set Lpi2c clock source. */
+    CLOCK_SetMux(kCLOCK_Lpi2cMux, 0);
+    /* Disable CAN clock gate. */
+    CLOCK_DisableClock(kCLOCK_Can1);
+    CLOCK_DisableClock(kCLOCK_Can2);
+    CLOCK_DisableClock(kCLOCK_Can3);
+    CLOCK_DisableClock(kCLOCK_Can1S);
+    CLOCK_DisableClock(kCLOCK_Can2S);
+    CLOCK_DisableClock(kCLOCK_Can3S);
+    /* Set CAN_CLK_PODF. */
+    CLOCK_SetDiv(kCLOCK_CanDiv, 1);
+    /* Set Can clock source. */
+    CLOCK_SetMux(kCLOCK_CanMux, 2);
+    /* Disable UART clock gate. */
+    CLOCK_DisableClock(kCLOCK_Lpuart1);
+    CLOCK_DisableClock(kCLOCK_Lpuart2);
+    CLOCK_DisableClock(kCLOCK_Lpuart3);
+    CLOCK_DisableClock(kCLOCK_Lpuart4);
+    CLOCK_DisableClock(kCLOCK_Lpuart5);
+    CLOCK_DisableClock(kCLOCK_Lpuart6);
+    CLOCK_DisableClock(kCLOCK_Lpuart7);
+    CLOCK_DisableClock(kCLOCK_Lpuart8);
+    /* Set UART_CLK_PODF. */
+    CLOCK_SetDiv(kCLOCK_UartDiv, 0);
+    /* Set Uart clock source. */
+    CLOCK_SetMux(kCLOCK_UartMux, 0);
+    /* Disable LCDIF clock gate. */
+    CLOCK_DisableClock(kCLOCK_LcdPixel);
+    /* Set LCDIF_PRED. */
+    CLOCK_SetDiv(kCLOCK_LcdifPreDiv, 1);
+    /* Set LCDIF_CLK_PODF. */
+    CLOCK_SetDiv(kCLOCK_LcdifDiv, 3);
+    /* Set Lcdif pre clock source. */
+    CLOCK_SetMux(kCLOCK_LcdifPreMux, 5);
+    /* Disable SPDIF clock gate. */
+    CLOCK_DisableClock(kCLOCK_Spdif);
+    /* Set SPDIF0_CLK_PRED. */
+    CLOCK_SetDiv(kCLOCK_Spdif0PreDiv, 1);
+    /* Set SPDIF0_CLK_PODF. */
+    CLOCK_SetDiv(kCLOCK_Spdif0Div, 7);
+    /* Set Spdif clock source. */
+    CLOCK_SetMux(kCLOCK_SpdifMux, 3);
+    /* Disable Flexio1 clock gate. */
+    CLOCK_DisableClock(kCLOCK_Flexio1);
+    /* Set FLEXIO1_CLK_PRED. */
+    CLOCK_SetDiv(kCLOCK_Flexio1PreDiv, 1);
+    /* Set FLEXIO1_CLK_PODF. */
+    CLOCK_SetDiv(kCLOCK_Flexio1Div, 7);
+    /* Set Flexio1 clock source. */
+    CLOCK_SetMux(kCLOCK_Flexio1Mux, 3);
+    /* Disable Flexio2 clock gate. */
+    CLOCK_DisableClock(kCLOCK_Flexio2);
+    /* Set FLEXIO2_CLK_PRED. */
+    CLOCK_SetDiv(kCLOCK_Flexio2PreDiv, 1);
+    /* Set FLEXIO2_CLK_PODF. */
+    CLOCK_SetDiv(kCLOCK_Flexio2Div, 7);
+    /* Set Flexio2 clock source. */
+    CLOCK_SetMux(kCLOCK_Flexio2Mux, 3);
+    /* Set Pll3 sw clock source. */
+    CLOCK_SetMux(kCLOCK_Pll3SwMux, 0);
+    /* Init ARM PLL. */
+    CLOCK_InitArmPll(&armPllConfig_BOARD_BootClockRUN);
+    /* In SDK projects, SDRAM (configured by SEMC) will be initialized in either debug script or dcd.
+     * With this macro SKIP_SYSCLK_INIT, system pll (selected to be SEMC source clock in SDK projects) will be left
+     * unchanged. Note: If another clock source is selected for SEMC, user may want to avoid changing that clock as
+     * well.*/
+    #ifndef SKIP_SYSCLK_INIT
+    /* Init System PLL. */
+    CLOCK_InitSysPll(&sysPllConfig_BOARD_BootClockRUN);
+    /* Init System pfd0. */
+    CLOCK_InitSysPfd(kCLOCK_Pfd0, 27);
+    /* Init System pfd1. */
+    CLOCK_InitSysPfd(kCLOCK_Pfd1, 16);
+    /* Init System pfd2. */
+    CLOCK_InitSysPfd(kCLOCK_Pfd2, 24);
+    /* Init System pfd3. */
+    CLOCK_InitSysPfd(kCLOCK_Pfd3, 16);
+    #endif
+    /* In SDK projects, external flash (configured by FLEXSPI) will be initialized by dcd.
+     * With this macro XIP_EXTERNAL_FLASH, usb1 pll (selected to be FLEXSPI clock source in SDK projects) will be left
+     * unchanged. Note: If another clock source is selected for FLEXSPI, user may want to avoid changing that clock as
+     * well.*/
+    #if !(defined(XIP_EXTERNAL_FLASH) && (XIP_EXTERNAL_FLASH == 1))
+    /* Init Usb1 PLL. */
+    CLOCK_InitUsb1Pll(&usb1PllConfig_BOARD_BootClockRUN);
+    /* Init Usb1 pfd0. */
+    CLOCK_InitUsb1Pfd(kCLOCK_Pfd0, 33);
+    /* Init Usb1 pfd1. */
+    CLOCK_InitUsb1Pfd(kCLOCK_Pfd1, 16);
+    /* Init Usb1 pfd2. */
+    CLOCK_InitUsb1Pfd(kCLOCK_Pfd2, 17);
+    /* Init Usb1 pfd3. */
+    CLOCK_InitUsb1Pfd(kCLOCK_Pfd3, 19);
+    /* Disable Usb1 PLL output for USBPHY1. */
+    CCM_ANALOG->PLL_USB1 &= ~CCM_ANALOG_PLL_USB1_EN_USB_CLKS_MASK;
+    #endif
+    /* DeInit Audio PLL. */
+    CLOCK_DeinitAudioPll();
+    /* Bypass Audio PLL. */
+    CLOCK_SetPllBypass(CCM_ANALOG, kCLOCK_PllAudio, 1);
+    /* Set divider for Audio PLL. */
+    CCM_ANALOG->MISC2 &= ~CCM_ANALOG_MISC2_AUDIO_DIV_LSB_MASK;
+    CCM_ANALOG->MISC2 &= ~CCM_ANALOG_MISC2_AUDIO_DIV_MSB_MASK;
+    /* Enable Audio PLL output. */
+    CCM_ANALOG->PLL_AUDIO |= CCM_ANALOG_PLL_AUDIO_ENABLE_MASK;
+    /* DeInit Video PLL. */
+    CLOCK_DeinitVideoPll();
+    /* Bypass Video PLL. */
+    CCM_ANALOG->PLL_VIDEO |= CCM_ANALOG_PLL_VIDEO_BYPASS_MASK;
+    /* Set divider for Video PLL. */
+    CCM_ANALOG->MISC2 = (CCM_ANALOG->MISC2 & (~CCM_ANALOG_MISC2_VIDEO_DIV_MASK)) | CCM_ANALOG_MISC2_VIDEO_DIV(0);
+    /* Enable Video PLL output. */
+    CCM_ANALOG->PLL_VIDEO |= CCM_ANALOG_PLL_VIDEO_ENABLE_MASK;
+    /* DeInit Enet PLL. */
+    CLOCK_DeinitEnetPll();
+    /* Bypass Enet PLL. */
+    CLOCK_SetPllBypass(CCM_ANALOG, kCLOCK_PllEnet, 1);
+    /* Set Enet output divider. */
+    CCM_ANALOG->PLL_ENET =
+        (CCM_ANALOG->PLL_ENET & (~CCM_ANALOG_PLL_ENET_DIV_SELECT_MASK)) | CCM_ANALOG_PLL_ENET_DIV_SELECT(1);
+    /* Enable Enet output. */
+    CCM_ANALOG->PLL_ENET |= CCM_ANALOG_PLL_ENET_ENABLE_MASK;
+    /* Set Enet2 output divider. */
+    CCM_ANALOG->PLL_ENET =
+        (CCM_ANALOG->PLL_ENET & (~CCM_ANALOG_PLL_ENET_ENET2_DIV_SELECT_MASK)) | CCM_ANALOG_PLL_ENET_ENET2_DIV_SELECT(0);
+    /* Enable Enet2 output. */
+    CCM_ANALOG->PLL_ENET |= CCM_ANALOG_PLL_ENET_ENET2_REF_EN_MASK;
+    /* Enable Enet25M output. */
+    CCM_ANALOG->PLL_ENET |= CCM_ANALOG_PLL_ENET_ENET_25M_REF_EN_MASK;
+    /* DeInit Usb2 PLL. */
+    CLOCK_DeinitUsb2Pll();
+    /* Bypass Usb2 PLL. */
+    CLOCK_SetPllBypass(CCM_ANALOG, kCLOCK_PllUsb2, 1);
+    /* Enable Usb2 PLL output. */
+    CCM_ANALOG->PLL_USB2 |= CCM_ANALOG_PLL_USB2_ENABLE_MASK;
+    /* Set preperiph clock source. */
+    CLOCK_SetMux(kCLOCK_PrePeriphMux, 3);
+    /* Set periph clock source. */
+    CLOCK_SetMux(kCLOCK_PeriphMux, 0);
+    /* Set periph clock2 clock source. */
+    CLOCK_SetMux(kCLOCK_PeriphClk2Mux, 0);
+    /* Set per clock source. */
+    CLOCK_SetMux(kCLOCK_PerclkMux, 0);
+    /* Set lvds1 clock source. */
+    CCM_ANALOG->MISC1 =
+        (CCM_ANALOG->MISC1 & (~CCM_ANALOG_MISC1_LVDS1_CLK_SEL_MASK)) | CCM_ANALOG_MISC1_LVDS1_CLK_SEL(0);
+    /* Set clock out1 divider. */
+    CCM->CCOSR = (CCM->CCOSR & (~CCM_CCOSR_CLKO1_DIV_MASK)) | CCM_CCOSR_CLKO1_DIV(0);
+    /* Set clock out1 source. */
+    CCM->CCOSR = (CCM->CCOSR & (~CCM_CCOSR_CLKO1_SEL_MASK)) | CCM_CCOSR_CLKO1_SEL(1);
+    /* Set clock out2 divider. */
+    CCM->CCOSR = (CCM->CCOSR & (~CCM_CCOSR_CLKO2_DIV_MASK)) | CCM_CCOSR_CLKO2_DIV(0);
+    /* Set clock out2 source. */
+    CCM->CCOSR = (CCM->CCOSR & (~CCM_CCOSR_CLKO2_SEL_MASK)) | CCM_CCOSR_CLKO2_SEL(18);
+    /* Set clock out1 drives clock out1. */
+    CCM->CCOSR &= ~CCM_CCOSR_CLK_OUT_SEL_MASK;
+    /* Disable clock out1. */
+    CCM->CCOSR &= ~CCM_CCOSR_CLKO1_EN_MASK;
+    /* Disable clock out2. */
+    CCM->CCOSR &= ~CCM_CCOSR_CLKO2_EN_MASK;
+    /* Set SAI1 MCLK1 clock source. */
+    IOMUXC_SetSaiMClkClockSource(IOMUXC_GPR, kIOMUXC_GPR_SAI1MClk1Sel, 0);
+    /* Set SAI1 MCLK2 clock source. */
+    IOMUXC_SetSaiMClkClockSource(IOMUXC_GPR, kIOMUXC_GPR_SAI1MClk2Sel, 0);
+    /* Set SAI1 MCLK3 clock source. */
+    IOMUXC_SetSaiMClkClockSource(IOMUXC_GPR, kIOMUXC_GPR_SAI1MClk3Sel, 0);
+    /* Set SAI2 MCLK3 clock source. */
+    IOMUXC_SetSaiMClkClockSource(IOMUXC_GPR, kIOMUXC_GPR_SAI2MClk3Sel, 0);
+    /* Set SAI3 MCLK3 clock source. */
+    IOMUXC_SetSaiMClkClockSource(IOMUXC_GPR, kIOMUXC_GPR_SAI3MClk3Sel, 0);
+    /* Set MQS configuration. */
+    IOMUXC_MQSConfig(IOMUXC_GPR, kIOMUXC_MqsPwmOverSampleRate32, 0);
+    /* Set ENET1 Tx clock source. */
+    IOMUXC_EnableMode(IOMUXC_GPR, kIOMUXC_GPR_ENET1RefClkMode, false);
+    /* Set ENET2 Tx clock source. */
+    #if defined(FSL_IOMUXC_DRIVER_VERSION) && (FSL_IOMUXC_DRIVER_VERSION != (MAKE_VERSION(2, 0, 0)))
+    IOMUXC_EnableMode(IOMUXC_GPR, kIOMUXC_GPR_ENET2RefClkMode, false);
+    #else
+    IOMUXC_EnableMode(IOMUXC_GPR, IOMUXC_GPR_GPR1_ENET2_CLK_SEL_MASK, false);
+    #endif
+    /* Set GPT1 High frequency reference clock source. */
+    IOMUXC_GPR->GPR5 &= ~IOMUXC_GPR_GPR5_VREF_1M_CLK_GPT1_MASK;
+    /* Set GPT2 High frequency reference clock source. */
+    IOMUXC_GPR->GPR5 &= ~IOMUXC_GPR_GPR5_VREF_1M_CLK_GPT2_MASK;
+    /* Set SystemCoreClock variable. */
+    SystemCoreClock = BOARD_BOOTCLOCKRUN_CORE_CLOCK;
+}
diff --git a/ports/mimxrt/boards/MIMXRT1060_EVK/clock_config.h b/ports/mimxrt/boards/MIMXRT1062_clock_config.h
similarity index 100%
rename from ports/mimxrt/boards/MIMXRT1060_EVK/clock_config.h
rename to ports/mimxrt/boards/MIMXRT1062_clock_config.h
diff --git a/ports/mimxrt/boards/MIMXRT1064_clock_config.c b/ports/mimxrt/boards/MIMXRT1064_clock_config.c
new file mode 100644
index 0000000000000..5e49a2fff80e3
--- /dev/null
+++ b/ports/mimxrt/boards/MIMXRT1064_clock_config.c
@@ -0,0 +1,490 @@
+/*
+ * Copyright 2018-2019 NXP
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+/*
+ * How to setup clock using clock driver functions:
+ *
+ * 1. Call CLOCK_InitXXXPLL() to configure corresponding PLL clock.
+ *
+ * 2. Call CLOCK_InitXXXpfd() to configure corresponding PLL pfd clock.
+ *
+ * 3. Call CLOCK_SetMux() to configure corresponding clock source for target clock out.
+ *
+ * 4. Call CLOCK_SetDiv() to configure corresponding clock divider for target clock out.
+ *
+ * 5. Call CLOCK_SetXtalFreq() to set XTAL frequency based on board settings.
+ *
+ */
+
+/* TEXT BELOW IS USED AS SETTING FOR TOOLS *************************************
+!!GlobalInfo
+product: Clocks v5.0
+processor: MIMXRT1064xxxxA
+package_id: MIMXRT1064DVL6A
+mcu_data: ksdk2_0
+processor_version: 0.0.0
+board: MIMXRT1064-EVK
+ * BE CAREFUL MODIFYING THIS COMMENT - IT IS YAML SETTINGS FOR TOOLS **********/
+
+#include CLOCK_CONFIG_H
+#include "fsl_iomuxc.h"
+
+/*******************************************************************************
+ * Definitions
+ ******************************************************************************/
+
+/*******************************************************************************
+ * Variables
+ ******************************************************************************/
+/* System clock frequency. */
+extern uint32_t SystemCoreClock;
+
+/*******************************************************************************
+ ************************ BOARD_InitBootClocks function ************************
+ ******************************************************************************/
+void BOARD_InitBootClocks(void) {
+    BOARD_BootClockRUN();
+}
+
+/*******************************************************************************
+ ********************** Configuration BOARD_BootClockRUN ***********************
+ ******************************************************************************/
+/* TEXT BELOW IS USED AS SETTING FOR TOOLS *************************************
+!!Configuration
+name: BOARD_BootClockRUN
+called_from_default_init: true
+outputs:
+- {id: AHB_CLK_ROOT.outFreq, value: 600 MHz}
+- {id: CAN_CLK_ROOT.outFreq, value: 40 MHz}
+- {id: CKIL_SYNC_CLK_ROOT.outFreq, value: 32.768 kHz}
+- {id: CLK_1M.outFreq, value: 1 MHz}
+- {id: CLK_24M.outFreq, value: 24 MHz}
+- {id: CSI_CLK_ROOT.outFreq, value: 12 MHz}
+- {id: ENET1_TX_CLK.outFreq, value: 2.4 MHz}
+- {id: ENET2_125M_CLK.outFreq, value: 1.2 MHz}
+- {id: ENET2_TX_CLK.outFreq, value: 1.2 MHz}
+- {id: ENET_125M_CLK.outFreq, value: 2.4 MHz}
+- {id: ENET_25M_REF_CLK.outFreq, value: 1.2 MHz}
+- {id: FLEXIO1_CLK_ROOT.outFreq, value: 30 MHz}
+- {id: FLEXIO2_CLK_ROOT.outFreq, value: 30 MHz}
+- {id: FLEXSPI2_CLK_ROOT.outFreq, value: 1440/11 MHz}
+- {id: FLEXSPI_CLK_ROOT.outFreq, value: 1440/11 MHz}
+- {id: GPT1_ipg_clk_highfreq.outFreq, value: 75 MHz}
+- {id: GPT2_ipg_clk_highfreq.outFreq, value: 75 MHz}
+- {id: IPG_CLK_ROOT.outFreq, value: 150 MHz}
+- {id: LCDIF_CLK_ROOT.outFreq, value: 67.5 MHz}
+- {id: LPI2C_CLK_ROOT.outFreq, value: 60 MHz}
+- {id: LPSPI_CLK_ROOT.outFreq, value: 105.6 MHz}
+- {id: LVDS1_CLK.outFreq, value: 1.2 GHz}
+- {id: MQS_MCLK.outFreq, value: 1080/17 MHz}
+- {id: PERCLK_CLK_ROOT.outFreq, value: 75 MHz}
+- {id: PLL7_MAIN_CLK.outFreq, value: 24 MHz}
+- {id: SAI1_CLK_ROOT.outFreq, value: 1080/17 MHz}
+- {id: SAI1_MCLK1.outFreq, value: 1080/17 MHz}
+- {id: SAI1_MCLK2.outFreq, value: 1080/17 MHz}
+- {id: SAI1_MCLK3.outFreq, value: 30 MHz}
+- {id: SAI2_CLK_ROOT.outFreq, value: 1080/17 MHz}
+- {id: SAI2_MCLK1.outFreq, value: 1080/17 MHz}
+- {id: SAI2_MCLK3.outFreq, value: 30 MHz}
+- {id: SAI3_CLK_ROOT.outFreq, value: 1080/17 MHz}
+- {id: SAI3_MCLK1.outFreq, value: 1080/17 MHz}
+- {id: SAI3_MCLK3.outFreq, value: 30 MHz}
+- {id: SEMC_CLK_ROOT.outFreq, value: 75 MHz}
+- {id: SPDIF0_CLK_ROOT.outFreq, value: 30 MHz}
+- {id: TRACE_CLK_ROOT.outFreq, value: 352/3 MHz}
+- {id: UART_CLK_ROOT.outFreq, value: 80 MHz}
+- {id: USDHC1_CLK_ROOT.outFreq, value: 198 MHz}
+- {id: USDHC2_CLK_ROOT.outFreq, value: 198 MHz}
+settings:
+- {id: CCM.AHB_PODF.scale, value: '1', locked: true}
+- {id: CCM.ARM_PODF.scale, value: '2', locked: true}
+- {id: CCM.FLEXSPI2_PODF.scale, value: '2', locked: true}
+- {id: CCM.FLEXSPI2_SEL.sel, value: CCM_ANALOG.PLL3_PFD0_CLK}
+- {id: CCM.FLEXSPI_PODF.scale, value: '2', locked: true}
+- {id: CCM.FLEXSPI_SEL.sel, value: CCM_ANALOG.PLL3_PFD0_CLK}
+- {id: CCM.LPSPI_PODF.scale, value: '5', locked: true}
+- {id: CCM.PERCLK_PODF.scale, value: '2', locked: true}
+- {id: CCM.SEMC_PODF.scale, value: '8'}
+- {id: CCM.TRACE_PODF.scale, value: '3', locked: true}
+- {id: CCM_ANALOG.PLL1_BYPASS.sel, value: CCM_ANALOG.PLL1}
+- {id: CCM_ANALOG.PLL1_PREDIV.scale, value: '1', locked: true}
+- {id: CCM_ANALOG.PLL1_VDIV.scale, value: '50', locked: true}
+- {id: CCM_ANALOG.PLL2.denom, value: '1', locked: true}
+- {id: CCM_ANALOG.PLL2.num, value: '0', locked: true}
+- {id: CCM_ANALOG.PLL2_BYPASS.sel, value: CCM_ANALOG.PLL2_OUT_CLK}
+- {id: CCM_ANALOG.PLL2_PFD0_BYPASS.sel, value: CCM_ANALOG.PLL2_PFD0}
+- {id: CCM_ANALOG.PLL2_PFD1_BYPASS.sel, value: CCM_ANALOG.PLL2_PFD1}
+- {id: CCM_ANALOG.PLL2_PFD2_BYPASS.sel, value: CCM_ANALOG.PLL2_PFD2}
+- {id: CCM_ANALOG.PLL2_PFD3_BYPASS.sel, value: CCM_ANALOG.PLL2_PFD3}
+- {id: CCM_ANALOG.PLL3_BYPASS.sel, value: CCM_ANALOG.PLL3}
+- {id: CCM_ANALOG.PLL3_PFD0_BYPASS.sel, value: CCM_ANALOG.PLL3_PFD0}
+- {id: CCM_ANALOG.PLL3_PFD0_DIV.scale, value: '33', locked: true}
+- {id: CCM_ANALOG.PLL3_PFD0_MUL.scale, value: '18', locked: true}
+- {id: CCM_ANALOG.PLL3_PFD1_BYPASS.sel, value: CCM_ANALOG.PLL3_PFD1}
+- {id: CCM_ANALOG.PLL3_PFD2_BYPASS.sel, value: CCM_ANALOG.PLL3_PFD2}
+- {id: CCM_ANALOG.PLL3_PFD3_BYPASS.sel, value: CCM_ANALOG.PLL3_PFD3}
+- {id: CCM_ANALOG.PLL4.denom, value: '50'}
+- {id: CCM_ANALOG.PLL4.div, value: '47'}
+- {id: CCM_ANALOG.PLL5.denom, value: '1'}
+- {id: CCM_ANALOG.PLL5.div, value: '40'}
+- {id: CCM_ANALOG.PLL5.num, value: '0'}
+- {id: CCM_ANALOG_PLL_ENET_POWERDOWN_CFG, value: 'Yes'}
+- {id: CCM_ANALOG_PLL_USB1_POWER_CFG, value: 'Yes'}
+sources:
+- {id: XTALOSC24M.OSC.outFreq, value: 24 MHz, enabled: true}
+- {id: XTALOSC24M.RTC_OSC.outFreq, value: 32.768 kHz, enabled: true}
+ * BE CAREFUL MODIFYING THIS COMMENT - IT IS YAML SETTINGS FOR TOOLS **********/
+
+/*******************************************************************************
+ * Variables for BOARD_BootClockRUN configuration
+ ******************************************************************************/
+const clock_arm_pll_config_t armPllConfig_BOARD_BootClockRUN = {
+    .loopDivider = 100, /* PLL loop divider, Fout = Fin * 50 */
+    .src = 0,           /* Bypass clock source, 0 - OSC 24M, 1 - CLK1_P and CLK1_N */
+};
+const clock_sys_pll_config_t sysPllConfig_BOARD_BootClockRUN = {
+    .loopDivider = 1, /* PLL loop divider, Fout = Fin * ( 20 + loopDivider*2 + numerator / denominator ) */
+    .numerator = 0,   /* 30 bit numerator of fractional loop divider */
+    .denominator = 1, /* 30 bit denominator of fractional loop divider */
+    .src = 0,         /* Bypass clock source, 0 - OSC 24M, 1 - CLK1_P and CLK1_N */
+};
+const clock_usb_pll_config_t usb1PllConfig_BOARD_BootClockRUN = {
+    .loopDivider = 0, /* PLL loop divider, Fout = Fin * 20 */
+    .src = 0,         /* Bypass clock source, 0 - OSC 24M, 1 - CLK1_P and CLK1_N */
+};
+/*******************************************************************************
+ * Code for BOARD_BootClockRUN configuration
+ ******************************************************************************/
+void BOARD_BootClockRUN(void) {
+    /* Init RTC OSC clock frequency. */
+    CLOCK_SetRtcXtalFreq(32768U);
+    /* Enable 1MHz clock output. */
+    XTALOSC24M->OSC_CONFIG2 |= XTALOSC24M_OSC_CONFIG2_ENABLE_1M_MASK;
+    /* Use free 1MHz clock output. */
+    XTALOSC24M->OSC_CONFIG2 &= ~XTALOSC24M_OSC_CONFIG2_MUX_1M_MASK;
+    /* Set XTAL 24MHz clock frequency. */
+    CLOCK_SetXtalFreq(24000000U);
+    /* Enable XTAL 24MHz clock source. */
+    CLOCK_InitExternalClk(0);
+    /* Enable internal RC. */
+    CLOCK_InitRcOsc24M();
+    /* Switch clock source to external OSC. */
+    CLOCK_SwitchOsc(kCLOCK_XtalOsc);
+    /* Set Oscillator ready counter value. */
+    CCM->CCR = (CCM->CCR & (~CCM_CCR_OSCNT_MASK)) | CCM_CCR_OSCNT(127);
+    /* Setting PeriphClk2Mux and PeriphMux to provide stable clock before PLLs are initialed */
+    CLOCK_SetMux(kCLOCK_PeriphClk2Mux, 1); /* Set PERIPH_CLK2 MUX to OSC */
+    CLOCK_SetMux(kCLOCK_PeriphMux, 1);     /* Set PERIPH_CLK MUX to PERIPH_CLK2 */
+    /* Setting the VDD_SOC to 1.275V. It is necessary to config AHB to 600Mhz. */
+    DCDC->REG3 = (DCDC->REG3 & (~DCDC_REG3_TRG_MASK)) | DCDC_REG3_TRG(0x13);
+    /* Waiting for DCDC_STS_DC_OK bit is asserted */
+    while (DCDC_REG0_STS_DC_OK_MASK != (DCDC_REG0_STS_DC_OK_MASK & DCDC->REG0)) {
+    }
+    /* Set AHB_PODF. */
+    CLOCK_SetDiv(kCLOCK_AhbDiv, 0);
+    /* Disable IPG clock gate. */
+    CLOCK_DisableClock(kCLOCK_Adc1);
+    CLOCK_DisableClock(kCLOCK_Adc2);
+    CLOCK_DisableClock(kCLOCK_Xbar1);
+    CLOCK_DisableClock(kCLOCK_Xbar2);
+    CLOCK_DisableClock(kCLOCK_Xbar3);
+    /* Set IPG_PODF. */
+    CLOCK_SetDiv(kCLOCK_IpgDiv, 3);
+    /* Set ARM_PODF. */
+    CLOCK_SetDiv(kCLOCK_ArmDiv, 1);
+    /* Set PERIPH_CLK2_PODF. */
+    CLOCK_SetDiv(kCLOCK_PeriphClk2Div, 0);
+    /* Disable PERCLK clock gate. */
+    CLOCK_DisableClock(kCLOCK_Gpt1);
+    CLOCK_DisableClock(kCLOCK_Gpt1S);
+    CLOCK_DisableClock(kCLOCK_Gpt2);
+    CLOCK_DisableClock(kCLOCK_Gpt2S);
+    CLOCK_DisableClock(kCLOCK_Pit);
+    /* Set PERCLK_PODF. */
+    CLOCK_SetDiv(kCLOCK_PerclkDiv, 1);
+    /* Disable USDHC1 clock gate. */
+    CLOCK_DisableClock(kCLOCK_Usdhc1);
+    /* Set USDHC1_PODF. */
+    CLOCK_SetDiv(kCLOCK_Usdhc1Div, 1);
+    /* Set Usdhc1 clock source. */
+    CLOCK_SetMux(kCLOCK_Usdhc1Mux, 0);
+    /* Disable USDHC2 clock gate. */
+    CLOCK_DisableClock(kCLOCK_Usdhc2);
+    /* Set USDHC2_PODF. */
+    CLOCK_SetDiv(kCLOCK_Usdhc2Div, 1);
+    /* Set Usdhc2 clock source. */
+    CLOCK_SetMux(kCLOCK_Usdhc2Mux, 0);
+    /* In SDK projects, SDRAM (configured by SEMC) will be initialized in either debug script or dcd.
+     * With this macro SKIP_SYSCLK_INIT, system pll (selected to be SEMC source clock in SDK projects) will be left
+     * unchanged. Note: If another clock source is selected for SEMC, user may want to avoid changing that clock as
+     * well.*/
+    #ifndef SKIP_SYSCLK_INIT
+    /* Disable Semc clock gate. */
+    CLOCK_DisableClock(kCLOCK_Semc);
+    /* Set SEMC_PODF. */
+    CLOCK_SetDiv(kCLOCK_SemcDiv, 7);
+    /* Set Semc alt clock source. */
+    CLOCK_SetMux(kCLOCK_SemcAltMux, 0);
+    /* Set Semc clock source. */
+    CLOCK_SetMux(kCLOCK_SemcMux, 0);
+    #endif
+    /* Disable Flexspi clock gate. */
+    CLOCK_DisableClock(kCLOCK_FlexSpi);
+    /* Set FLEXSPI_PODF. */
+    CLOCK_SetDiv(kCLOCK_FlexspiDiv, 1);
+    /* Set Flexspi clock source. */
+    CLOCK_SetMux(kCLOCK_FlexspiMux, 3);
+    /* In SDK projects, external flash (configured by FLEXSPI2) will be initialized by dcd.
+     * With this macro XIP_EXTERNAL_FLASH, usb1 pll (selected to be FLEXSPI2 clock source in SDK projects) will be left
+     * unchanged.
+     * Note: If another clock source is selected for FLEXSPI2, user may want to avoid changing that clock as well.*/
+    #if !(defined(XIP_EXTERNAL_FLASH) && (XIP_EXTERNAL_FLASH == 1))
+    /* Disable Flexspi2 clock gate. */
+    CLOCK_DisableClock(kCLOCK_FlexSpi2);
+    /* Set FLEXSPI2_PODF. */
+    CLOCK_SetDiv(kCLOCK_Flexspi2Div, 1);
+    /* Set Flexspi2 clock source. */
+    CLOCK_SetMux(kCLOCK_Flexspi2Mux, 1);
+    #endif
+    /* Disable CSI clock gate. */
+    CLOCK_DisableClock(kCLOCK_Csi);
+    /* Set CSI_PODF. */
+    CLOCK_SetDiv(kCLOCK_CsiDiv, 1);
+    /* Set Csi clock source. */
+    CLOCK_SetMux(kCLOCK_CsiMux, 0);
+    /* Disable LPSPI clock gate. */
+    CLOCK_DisableClock(kCLOCK_Lpspi1);
+    CLOCK_DisableClock(kCLOCK_Lpspi2);
+    CLOCK_DisableClock(kCLOCK_Lpspi3);
+    CLOCK_DisableClock(kCLOCK_Lpspi4);
+    /* Set LPSPI_PODF. */
+    CLOCK_SetDiv(kCLOCK_LpspiDiv, 4);
+    /* Set Lpspi clock source. */
+    CLOCK_SetMux(kCLOCK_LpspiMux, 2);
+    /* Disable TRACE clock gate. */
+    CLOCK_DisableClock(kCLOCK_Trace);
+    /* Set TRACE_PODF. */
+    CLOCK_SetDiv(kCLOCK_TraceDiv, 2);
+    /* Set Trace clock source. */
+    CLOCK_SetMux(kCLOCK_TraceMux, 2);
+    /* Disable SAI1 clock gate. */
+    CLOCK_DisableClock(kCLOCK_Sai1);
+    /* Set SAI1_CLK_PRED. */
+    CLOCK_SetDiv(kCLOCK_Sai1PreDiv, 3);
+    /* Set SAI1_CLK_PODF. */
+    CLOCK_SetDiv(kCLOCK_Sai1Div, 1);
+    /* Set Sai1 clock source. */
+    CLOCK_SetMux(kCLOCK_Sai1Mux, 0);
+    /* Disable SAI2 clock gate. */
+    CLOCK_DisableClock(kCLOCK_Sai2);
+    /* Set SAI2_CLK_PRED. */
+    CLOCK_SetDiv(kCLOCK_Sai2PreDiv, 3);
+    /* Set SAI2_CLK_PODF. */
+    CLOCK_SetDiv(kCLOCK_Sai2Div, 1);
+    /* Set Sai2 clock source. */
+    CLOCK_SetMux(kCLOCK_Sai2Mux, 0);
+    /* Disable SAI3 clock gate. */
+    CLOCK_DisableClock(kCLOCK_Sai3);
+    /* Set SAI3_CLK_PRED. */
+    CLOCK_SetDiv(kCLOCK_Sai3PreDiv, 3);
+    /* Set SAI3_CLK_PODF. */
+    CLOCK_SetDiv(kCLOCK_Sai3Div, 1);
+    /* Set Sai3 clock source. */
+    CLOCK_SetMux(kCLOCK_Sai3Mux, 0);
+    /* Disable Lpi2c clock gate. */
+    CLOCK_DisableClock(kCLOCK_Lpi2c1);
+    CLOCK_DisableClock(kCLOCK_Lpi2c2);
+    CLOCK_DisableClock(kCLOCK_Lpi2c3);
+    /* Set LPI2C_CLK_PODF. */
+    CLOCK_SetDiv(kCLOCK_Lpi2cDiv, 0);
+    /* Set Lpi2c clock source. */
+    CLOCK_SetMux(kCLOCK_Lpi2cMux, 0);
+    /* Disable CAN clock gate. */
+    CLOCK_DisableClock(kCLOCK_Can1);
+    CLOCK_DisableClock(kCLOCK_Can2);
+    CLOCK_DisableClock(kCLOCK_Can3);
+    CLOCK_DisableClock(kCLOCK_Can1S);
+    CLOCK_DisableClock(kCLOCK_Can2S);
+    CLOCK_DisableClock(kCLOCK_Can3S);
+    /* Set CAN_CLK_PODF. */
+    CLOCK_SetDiv(kCLOCK_CanDiv, 1);
+    /* Set Can clock source. */
+    CLOCK_SetMux(kCLOCK_CanMux, 2);
+    /* Disable UART clock gate. */
+    CLOCK_DisableClock(kCLOCK_Lpuart1);
+    CLOCK_DisableClock(kCLOCK_Lpuart2);
+    CLOCK_DisableClock(kCLOCK_Lpuart3);
+    CLOCK_DisableClock(kCLOCK_Lpuart4);
+    CLOCK_DisableClock(kCLOCK_Lpuart5);
+    CLOCK_DisableClock(kCLOCK_Lpuart6);
+    CLOCK_DisableClock(kCLOCK_Lpuart7);
+    CLOCK_DisableClock(kCLOCK_Lpuart8);
+    /* Set UART_CLK_PODF. */
+    CLOCK_SetDiv(kCLOCK_UartDiv, 0);
+    /* Set Uart clock source. */
+    CLOCK_SetMux(kCLOCK_UartMux, 0);
+    /* Disable LCDIF clock gate. */
+    CLOCK_DisableClock(kCLOCK_LcdPixel);
+    /* Set LCDIF_PRED. */
+    CLOCK_SetDiv(kCLOCK_LcdifPreDiv, 1);
+    /* Set LCDIF_CLK_PODF. */
+    CLOCK_SetDiv(kCLOCK_LcdifDiv, 3);
+    /* Set Lcdif pre clock source. */
+    CLOCK_SetMux(kCLOCK_LcdifPreMux, 5);
+    /* Disable SPDIF clock gate. */
+    CLOCK_DisableClock(kCLOCK_Spdif);
+    /* Set SPDIF0_CLK_PRED. */
+    CLOCK_SetDiv(kCLOCK_Spdif0PreDiv, 1);
+    /* Set SPDIF0_CLK_PODF. */
+    CLOCK_SetDiv(kCLOCK_Spdif0Div, 7);
+    /* Set Spdif clock source. */
+    CLOCK_SetMux(kCLOCK_SpdifMux, 3);
+    /* Disable Flexio1 clock gate. */
+    CLOCK_DisableClock(kCLOCK_Flexio1);
+    /* Set FLEXIO1_CLK_PRED. */
+    CLOCK_SetDiv(kCLOCK_Flexio1PreDiv, 1);
+    /* Set FLEXIO1_CLK_PODF. */
+    CLOCK_SetDiv(kCLOCK_Flexio1Div, 7);
+    /* Set Flexio1 clock source. */
+    CLOCK_SetMux(kCLOCK_Flexio1Mux, 3);
+    /* Disable Flexio2 clock gate. */
+    CLOCK_DisableClock(kCLOCK_Flexio2);
+    /* Set FLEXIO2_CLK_PRED. */
+    CLOCK_SetDiv(kCLOCK_Flexio2PreDiv, 1);
+    /* Set FLEXIO2_CLK_PODF. */
+    CLOCK_SetDiv(kCLOCK_Flexio2Div, 7);
+    /* Set Flexio2 clock source. */
+    CLOCK_SetMux(kCLOCK_Flexio2Mux, 3);
+    /* Set Pll3 sw clock source. */
+    CLOCK_SetMux(kCLOCK_Pll3SwMux, 0);
+    /* Init ARM PLL. */
+    CLOCK_InitArmPll(&armPllConfig_BOARD_BootClockRUN);
+    /* In SDK projects, SDRAM (configured by SEMC) will be initialized in either debug script or dcd.
+     * With this macro SKIP_SYSCLK_INIT, system pll (selected to be SEMC source clock in SDK projects) will be left
+     * unchanged. Note: If another clock source is selected for SEMC, user may want to avoid changing that clock as
+     * well.*/
+    #ifndef SKIP_SYSCLK_INIT
+    /* Init System PLL. */
+    CLOCK_InitSysPll(&sysPllConfig_BOARD_BootClockRUN);
+    /* Init System pfd0. */
+    CLOCK_InitSysPfd(kCLOCK_Pfd0, 27);
+    /* Init System pfd1. */
+    CLOCK_InitSysPfd(kCLOCK_Pfd1, 16);
+    /* Init System pfd2. */
+    CLOCK_InitSysPfd(kCLOCK_Pfd2, 24);
+    /* Init System pfd3. */
+    CLOCK_InitSysPfd(kCLOCK_Pfd3, 16);
+    #endif
+    /* In SDK projects, external flash (configured by FLEXSPI2) will be initialized by dcd.
+     * With this macro XIP_EXTERNAL_FLASH, usb1 pll (selected to be FLEXSPI2 clock source in SDK projects) will be left
+     * unchanged.
+     * Note: If another clock source is selected for FLEXSPI2, user may want to avoid changing that clock as well.*/
+    #if !(defined(XIP_EXTERNAL_FLASH) && (XIP_EXTERNAL_FLASH == 1))
+    /* Init Usb1 PLL. */
+    CLOCK_InitUsb1Pll(&usb1PllConfig_BOARD_BootClockRUN);
+    /* Init Usb1 pfd0. */
+    CLOCK_InitUsb1Pfd(kCLOCK_Pfd0, 33);
+    /* Init Usb1 pfd1. */
+    CLOCK_InitUsb1Pfd(kCLOCK_Pfd1, 16);
+    /* Init Usb1 pfd2. */
+    CLOCK_InitUsb1Pfd(kCLOCK_Pfd2, 17);
+    /* Init Usb1 pfd3. */
+    CLOCK_InitUsb1Pfd(kCLOCK_Pfd3, 19);
+    /* Disable Usb1 PLL output for USBPHY1. */
+    CCM_ANALOG->PLL_USB1 &= ~CCM_ANALOG_PLL_USB1_EN_USB_CLKS_MASK;
+    #endif
+    /* DeInit Audio PLL. */
+    CLOCK_DeinitAudioPll();
+    /* Bypass Audio PLL. */
+    CLOCK_SetPllBypass(CCM_ANALOG, kCLOCK_PllAudio, 1);
+    /* Set divider for Audio PLL. */
+    CCM_ANALOG->MISC2 &= ~CCM_ANALOG_MISC2_AUDIO_DIV_LSB_MASK;
+    CCM_ANALOG->MISC2 &= ~CCM_ANALOG_MISC2_AUDIO_DIV_MSB_MASK;
+    /* Enable Audio PLL output. */
+    CCM_ANALOG->PLL_AUDIO |= CCM_ANALOG_PLL_AUDIO_ENABLE_MASK;
+    /* DeInit Video PLL. */
+    CLOCK_DeinitVideoPll();
+    /* Bypass Video PLL. */
+    CCM_ANALOG->PLL_VIDEO |= CCM_ANALOG_PLL_VIDEO_BYPASS_MASK;
+    /* Set divider for Video PLL. */
+    CCM_ANALOG->MISC2 = (CCM_ANALOG->MISC2 & (~CCM_ANALOG_MISC2_VIDEO_DIV_MASK)) | CCM_ANALOG_MISC2_VIDEO_DIV(0);
+    /* Enable Video PLL output. */
+    CCM_ANALOG->PLL_VIDEO |= CCM_ANALOG_PLL_VIDEO_ENABLE_MASK;
+    /* DeInit Enet PLL. */
+    CLOCK_DeinitEnetPll();
+    /* Bypass Enet PLL. */
+    CLOCK_SetPllBypass(CCM_ANALOG, kCLOCK_PllEnet, 1);
+    /* Set Enet output divider. */
+    CCM_ANALOG->PLL_ENET =
+        (CCM_ANALOG->PLL_ENET & (~CCM_ANALOG_PLL_ENET_DIV_SELECT_MASK)) | CCM_ANALOG_PLL_ENET_DIV_SELECT(1);
+    /* Enable Enet output. */
+    CCM_ANALOG->PLL_ENET |= CCM_ANALOG_PLL_ENET_ENABLE_MASK;
+    /* Set Enet2 output divider. */
+    CCM_ANALOG->PLL_ENET =
+        (CCM_ANALOG->PLL_ENET & (~CCM_ANALOG_PLL_ENET_ENET2_DIV_SELECT_MASK)) | CCM_ANALOG_PLL_ENET_ENET2_DIV_SELECT(0);
+    /* Enable Enet2 output. */
+    CCM_ANALOG->PLL_ENET |= CCM_ANALOG_PLL_ENET_ENET2_REF_EN_MASK;
+    /* Enable Enet25M output. */
+    CCM_ANALOG->PLL_ENET |= CCM_ANALOG_PLL_ENET_ENET_25M_REF_EN_MASK;
+    /* DeInit Usb2 PLL. */
+    CLOCK_DeinitUsb2Pll();
+    /* Bypass Usb2 PLL. */
+    CLOCK_SetPllBypass(CCM_ANALOG, kCLOCK_PllUsb2, 1);
+    /* Enable Usb2 PLL output. */
+    CCM_ANALOG->PLL_USB2 |= CCM_ANALOG_PLL_USB2_ENABLE_MASK;
+    /* Set preperiph clock source. */
+    CLOCK_SetMux(kCLOCK_PrePeriphMux, 3);
+    /* Set periph clock source. */
+    CLOCK_SetMux(kCLOCK_PeriphMux, 0);
+    /* Set periph clock2 clock source. */
+    CLOCK_SetMux(kCLOCK_PeriphClk2Mux, 0);
+    /* Set per clock source. */
+    CLOCK_SetMux(kCLOCK_PerclkMux, 0);
+    /* Set lvds1 clock source. */
+    CCM_ANALOG->MISC1 =
+        (CCM_ANALOG->MISC1 & (~CCM_ANALOG_MISC1_LVDS1_CLK_SEL_MASK)) | CCM_ANALOG_MISC1_LVDS1_CLK_SEL(0);
+    /* Set clock out1 divider. */
+    CCM->CCOSR = (CCM->CCOSR & (~CCM_CCOSR_CLKO1_DIV_MASK)) | CCM_CCOSR_CLKO1_DIV(0);
+    /* Set clock out1 source. */
+    CCM->CCOSR = (CCM->CCOSR & (~CCM_CCOSR_CLKO1_SEL_MASK)) | CCM_CCOSR_CLKO1_SEL(1);
+    /* Set clock out2 divider. */
+    CCM->CCOSR = (CCM->CCOSR & (~CCM_CCOSR_CLKO2_DIV_MASK)) | CCM_CCOSR_CLKO2_DIV(0);
+    /* Set clock out2 source. */
+    CCM->CCOSR = (CCM->CCOSR & (~CCM_CCOSR_CLKO2_SEL_MASK)) | CCM_CCOSR_CLKO2_SEL(18);
+    /* Set clock out1 drives clock out1. */
+    CCM->CCOSR &= ~CCM_CCOSR_CLK_OUT_SEL_MASK;
+    /* Disable clock out1. */
+    CCM->CCOSR &= ~CCM_CCOSR_CLKO1_EN_MASK;
+    /* Disable clock out2. */
+    CCM->CCOSR &= ~CCM_CCOSR_CLKO2_EN_MASK;
+    /* Set SAI1 MCLK1 clock source. */
+    IOMUXC_SetSaiMClkClockSource(IOMUXC_GPR, kIOMUXC_GPR_SAI1MClk1Sel, 0);
+    /* Set SAI1 MCLK2 clock source. */
+    IOMUXC_SetSaiMClkClockSource(IOMUXC_GPR, kIOMUXC_GPR_SAI1MClk2Sel, 0);
+    /* Set SAI1 MCLK3 clock source. */
+    IOMUXC_SetSaiMClkClockSource(IOMUXC_GPR, kIOMUXC_GPR_SAI1MClk3Sel, 0);
+    /* Set SAI2 MCLK3 clock source. */
+    IOMUXC_SetSaiMClkClockSource(IOMUXC_GPR, kIOMUXC_GPR_SAI2MClk3Sel, 0);
+    /* Set SAI3 MCLK3 clock source. */
+    IOMUXC_SetSaiMClkClockSource(IOMUXC_GPR, kIOMUXC_GPR_SAI3MClk3Sel, 0);
+    /* Set MQS configuration. */
+    IOMUXC_MQSConfig(IOMUXC_GPR, kIOMUXC_MqsPwmOverSampleRate32, 0);
+    /* Set ENET1 Tx clock source. */
+    IOMUXC_EnableMode(IOMUXC_GPR, kIOMUXC_GPR_ENET1RefClkMode, false);
+    /* Set ENET2 Tx clock source. */
+    #if defined(FSL_IOMUXC_DRIVER_VERSION) && (FSL_IOMUXC_DRIVER_VERSION != (MAKE_VERSION(2, 0, 0)))
+    IOMUXC_EnableMode(IOMUXC_GPR, kIOMUXC_GPR_ENET2RefClkMode, false);
+    #else
+    IOMUXC_EnableMode(IOMUXC_GPR, IOMUXC_GPR_GPR1_ENET2_CLK_SEL_MASK, false);
+    #endif
+    /* Set GPT1 High frequency reference clock source. */
+    IOMUXC_GPR->GPR5 &= ~IOMUXC_GPR_GPR5_VREF_1M_CLK_GPT1_MASK;
+    /* Set GPT2 High frequency reference clock source. */
+    IOMUXC_GPR->GPR5 &= ~IOMUXC_GPR_GPR5_VREF_1M_CLK_GPT2_MASK;
+    /* Set SystemCoreClock variable. */
+    SystemCoreClock = BOARD_BOOTCLOCKRUN_CORE_CLOCK;
+}
diff --git a/ports/mimxrt/boards/MIMXRT1064_EVK/clock_config.h b/ports/mimxrt/boards/MIMXRT1064_clock_config.h
similarity index 100%
rename from ports/mimxrt/boards/MIMXRT1064_EVK/clock_config.h
rename to ports/mimxrt/boards/MIMXRT1064_clock_config.h
diff --git a/ports/mimxrt/boards/OLIMEX_RT1010/clock_config.h b/ports/mimxrt/boards/OLIMEX_RT1010/clock_config.h
deleted file mode 100644
index 76f3df422f9d0..0000000000000
--- a/ports/mimxrt/boards/OLIMEX_RT1010/clock_config.h
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * Copyright 2019 NXP
- * All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-#ifndef _CLOCK_CONFIG_H_
-#define _CLOCK_CONFIG_H_
-
-#include "fsl_common.h"
-
-/*******************************************************************************
- * Definitions
- ******************************************************************************/
-#define BOARD_XTAL0_CLK_HZ 24000000U /*!< Board xtal0 frequency in Hz */
-
-#define BOARD_XTAL32K_CLK_HZ 32768U /*!< Board xtal32k frequency in Hz */
-/*******************************************************************************
- ************************ BOARD_InitBootClocks function ************************
- ******************************************************************************/
-
-#if defined(__cplusplus)
-extern "C" {
-#endif /* __cplusplus*/
-
-/*!
- * @brief This function executes default configuration of clocks.
- *
- */
-void BOARD_InitBootClocks(void);
-
-#if defined(__cplusplus)
-}
-#endif /* __cplusplus*/
-
-/*******************************************************************************
- ********************** Configuration BOARD_BootClockRUN ***********************
- ******************************************************************************/
-/*******************************************************************************
- * Definitions for BOARD_BootClockRUN configuration
- ******************************************************************************/
-#define BOARD_BOOTCLOCKRUN_CORE_CLOCK 500000000U /*!< Core clock frequency: 500000000Hz */
-
-/* Clock outputs (values are in Hz): */
-#define BOARD_BOOTCLOCKRUN_ADC_ALT_CLK 40000000UL
-#define BOARD_BOOTCLOCKRUN_CKIL_SYNC_CLK_ROOT 32768UL
-#define BOARD_BOOTCLOCKRUN_CLKO1_CLK 0UL
-#define BOARD_BOOTCLOCKRUN_CLKO2_CLK 0UL
-#define BOARD_BOOTCLOCKRUN_CLK_1M 1000000UL
-#define BOARD_BOOTCLOCKRUN_CLK_24M 24000000UL
-#define BOARD_BOOTCLOCKRUN_CORE_CLK_ROOT 500000000UL
-#define BOARD_BOOTCLOCKRUN_ENET_500M_REF_CLK 500000000UL
-#define BOARD_BOOTCLOCKRUN_FLEXIO1_CLK_ROOT 30000000UL
-#define BOARD_BOOTCLOCKRUN_FLEXSPI_CLK_ROOT 132000000UL
-#define BOARD_BOOTCLOCKRUN_GPT1_IPG_CLK_HIGHFREQ 62500000UL
-#define BOARD_BOOTCLOCKRUN_GPT2_IPG_CLK_HIGHFREQ 62500000UL
-#define BOARD_BOOTCLOCKRUN_IPG_CLK_ROOT 125000000UL
-#define BOARD_BOOTCLOCKRUN_LPI2C_CLK_ROOT 60000000UL
-#define BOARD_BOOTCLOCKRUN_LPSPI_CLK_ROOT 105600000UL
-#define BOARD_BOOTCLOCKRUN_MQS_MCLK 63529411UL
-#define BOARD_BOOTCLOCKRUN_PERCLK_CLK_ROOT 62500000UL
-#define BOARD_BOOTCLOCKRUN_SAI1_CLK_ROOT 63529411UL
-#define BOARD_BOOTCLOCKRUN_SAI1_MCLK1 63529411UL
-#define BOARD_BOOTCLOCKRUN_SAI1_MCLK2 63529411UL
-#define BOARD_BOOTCLOCKRUN_SAI1_MCLK3 30000000UL
-#define BOARD_BOOTCLOCKRUN_SAI3_CLK_ROOT 63529411UL
-#define BOARD_BOOTCLOCKRUN_SAI3_MCLK1 63529411UL
-#define BOARD_BOOTCLOCKRUN_SAI3_MCLK2 0UL
-#define BOARD_BOOTCLOCKRUN_SAI3_MCLK3 30000000UL
-#define BOARD_BOOTCLOCKRUN_SPDIF0_CLK_ROOT 30000000UL
-#define BOARD_BOOTCLOCKRUN_SPDIF0_EXTCLK_OUT 0UL
-#define BOARD_BOOTCLOCKRUN_TRACE_CLK_ROOT 117333333UL
-#define BOARD_BOOTCLOCKRUN_UART_CLK_ROOT 80000000UL
-#define BOARD_BOOTCLOCKRUN_USBPHY_CLK 0UL
-
-/*! @brief Usb1 PLL set for BOARD_BootClockRUN configuration.
- */
-extern const clock_usb_pll_config_t usb1PllConfig_BOARD_BootClockRUN;
-/*! @brief Sys PLL for BOARD_BootClockRUN configuration.
- */
-extern const clock_sys_pll_config_t sysPllConfig_BOARD_BootClockRUN;
-/*! @brief Enet PLL set for BOARD_BootClockRUN configuration.
- */
-extern const clock_enet_pll_config_t enetPllConfig_BOARD_BootClockRUN;
-
-/*******************************************************************************
- * API for BOARD_BootClockRUN configuration
- ******************************************************************************/
-#if defined(__cplusplus)
-extern "C" {
-#endif /* __cplusplus*/
-
-/*!
- * @brief This function executes configuration of clocks.
- *
- */
-void BOARD_BootClockRUN(void);
-
-#if defined(__cplusplus)
-}
-#endif /* __cplusplus*/
-
-#endif /* _CLOCK_CONFIG_H_ */
diff --git a/ports/mimxrt/boards/SEEED_ARCH_MIX/clock_config.h b/ports/mimxrt/boards/SEEED_ARCH_MIX/clock_config.h
deleted file mode 100644
index f213ac7e238dd..0000000000000
--- a/ports/mimxrt/boards/SEEED_ARCH_MIX/clock_config.h
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * Copyright 2017-2019 NXP
- * All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-#ifndef _CLOCK_CONFIG_H_
-#define _CLOCK_CONFIG_H_
-
-#include "fsl_common.h"
-
-/*******************************************************************************
- * Definitions
- ******************************************************************************/
-#define BOARD_XTAL0_CLK_HZ 24000000U /*!< Board xtal0 frequency in Hz */
-
-#define BOARD_XTAL32K_CLK_HZ 32768U /*!< Board xtal32k frequency in Hz */
-/*******************************************************************************
- ************************ BOARD_InitBootClocks function ************************
- ******************************************************************************/
-
-#if defined(__cplusplus)
-extern "C" {
-#endif /* __cplusplus*/
-
-/*!
- * @brief This function executes default configuration of clocks.
- *
- */
-void BOARD_InitBootClocks(void);
-
-#if defined(__cplusplus)
-}
-#endif /* __cplusplus*/
-
-/*******************************************************************************
- ********************** Configuration BOARD_BootClockRUN ***********************
- ******************************************************************************/
-/*******************************************************************************
- * Definitions for BOARD_BootClockRUN configuration
- ******************************************************************************/
-#define BOARD_BOOTCLOCKRUN_CORE_CLOCK 600000000U /*!< Core clock frequency: 600000000Hz */
-
-/* Clock outputs (values are in Hz): */
-#define BOARD_BOOTCLOCKRUN_AHB_CLK_ROOT 600000000UL
-#define BOARD_BOOTCLOCKRUN_CAN_CLK_ROOT 40000000UL
-#define BOARD_BOOTCLOCKRUN_CKIL_SYNC_CLK_ROOT 32768UL
-#define BOARD_BOOTCLOCKRUN_CLKO1_CLK 0UL
-#define BOARD_BOOTCLOCKRUN_CLKO2_CLK 0UL
-#define BOARD_BOOTCLOCKRUN_CLK_1M 1000000UL
-#define BOARD_BOOTCLOCKRUN_CLK_24M 24000000UL
-#define BOARD_BOOTCLOCKRUN_CSI_CLK_ROOT 12000000UL
-#define BOARD_BOOTCLOCKRUN_ENET1_TX_CLK 2400000UL
-#define BOARD_BOOTCLOCKRUN_ENET_125M_CLK 2400000UL
-#define BOARD_BOOTCLOCKRUN_ENET_25M_REF_CLK 1200000UL
-#define BOARD_BOOTCLOCKRUN_FLEXIO1_CLK_ROOT 30000000UL
-#define BOARD_BOOTCLOCKRUN_FLEXIO2_CLK_ROOT 30000000UL
-#define BOARD_BOOTCLOCKRUN_FLEXSPI_CLK_ROOT 160000000UL
-#define BOARD_BOOTCLOCKRUN_GPT1_IPG_CLK_HIGHFREQ 75000000UL
-#define BOARD_BOOTCLOCKRUN_GPT2_IPG_CLK_HIGHFREQ 75000000UL
-#define BOARD_BOOTCLOCKRUN_IPG_CLK_ROOT 150000000UL
-#define BOARD_BOOTCLOCKRUN_LCDIF_CLK_ROOT 9642857UL
-#define BOARD_BOOTCLOCKRUN_LPI2C_CLK_ROOT 60000000UL
-#define BOARD_BOOTCLOCKRUN_LPSPI_CLK_ROOT 105600000UL
-#define BOARD_BOOTCLOCKRUN_LVDS1_CLK 1200000000UL
-#define BOARD_BOOTCLOCKRUN_MQS_MCLK 63529411UL
-#define BOARD_BOOTCLOCKRUN_PERCLK_CLK_ROOT 75000000UL
-#define BOARD_BOOTCLOCKRUN_PLL7_MAIN_CLK 24000000UL
-#define BOARD_BOOTCLOCKRUN_SAI1_CLK_ROOT 63529411UL
-#define BOARD_BOOTCLOCKRUN_SAI1_MCLK1 63529411UL
-#define BOARD_BOOTCLOCKRUN_SAI1_MCLK2 63529411UL
-#define BOARD_BOOTCLOCKRUN_SAI1_MCLK3 30000000UL
-#define BOARD_BOOTCLOCKRUN_SAI2_CLK_ROOT 63529411UL
-#define BOARD_BOOTCLOCKRUN_SAI2_MCLK1 63529411UL
-#define BOARD_BOOTCLOCKRUN_SAI2_MCLK2 0UL
-#define BOARD_BOOTCLOCKRUN_SAI2_MCLK3 30000000UL
-#define BOARD_BOOTCLOCKRUN_SAI3_CLK_ROOT 63529411UL
-#define BOARD_BOOTCLOCKRUN_SAI3_MCLK1 63529411UL
-#define BOARD_BOOTCLOCKRUN_SAI3_MCLK2 0UL
-#define BOARD_BOOTCLOCKRUN_SAI3_MCLK3 30000000UL
-#define BOARD_BOOTCLOCKRUN_SEMC_CLK_ROOT 75000000UL
-#define BOARD_BOOTCLOCKRUN_SPDIF0_CLK_ROOT 30000000UL
-#define BOARD_BOOTCLOCKRUN_SPDIF0_EXTCLK_OUT 0UL
-#define BOARD_BOOTCLOCKRUN_TRACE_CLK_ROOT 117333333UL
-#define BOARD_BOOTCLOCKRUN_UART_CLK_ROOT 80000000UL
-#define BOARD_BOOTCLOCKRUN_USBPHY1_CLK 0UL
-#define BOARD_BOOTCLOCKRUN_USBPHY2_CLK 0UL
-#define BOARD_BOOTCLOCKRUN_USDHC1_CLK_ROOT 198000000UL
-#define BOARD_BOOTCLOCKRUN_USDHC2_CLK_ROOT 198000000UL
-
-/*! @brief Arm PLL set for BOARD_BootClockRUN configuration.
- */
-extern const clock_arm_pll_config_t armPllConfig_BOARD_BootClockRUN;
-/*! @brief Usb1 PLL set for BOARD_BootClockRUN configuration.
- */
-extern const clock_usb_pll_config_t usb1PllConfig_BOARD_BootClockRUN;
-/*! @brief Sys PLL for BOARD_BootClockRUN configuration.
- */
-extern const clock_sys_pll_config_t sysPllConfig_BOARD_BootClockRUN;
-
-/*******************************************************************************
- * API for BOARD_BootClockRUN configuration
- ******************************************************************************/
-#if defined(__cplusplus)
-extern "C" {
-#endif /* __cplusplus*/
-
-/*!
- * @brief This function executes configuration of clocks.
- *
- */
-void BOARD_BootClockRUN(void);
-
-#if defined(__cplusplus)
-}
-#endif /* __cplusplus*/
-
-#endif /* _CLOCK_CONFIG_H_ */
diff --git a/ports/mimxrt/boards/TEENSY40/clock_config.h b/ports/mimxrt/boards/TEENSY40/clock_config.h
deleted file mode 100644
index 0822024847717..0000000000000
--- a/ports/mimxrt/boards/TEENSY40/clock_config.h
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * Copyright 2018-2019 NXP
- * All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-#ifndef _CLOCK_CONFIG_H_
-#define _CLOCK_CONFIG_H_
-
-#include "fsl_common.h"
-
-/*******************************************************************************
- * Definitions
- ******************************************************************************/
-#define BOARD_XTAL0_CLK_HZ 24000000U /*!< Board xtal0 frequency in Hz */
-
-#define BOARD_XTAL32K_CLK_HZ 32768U /*!< Board xtal32k frequency in Hz */
-/*******************************************************************************
- ************************ BOARD_InitBootClocks function ************************
- ******************************************************************************/
-
-#if defined(__cplusplus)
-extern "C" {
-#endif /* __cplusplus*/
-
-/*!
- * @brief This function executes default configuration of clocks.
- *
- */
-void BOARD_InitBootClocks(void);
-
-#if defined(__cplusplus)
-}
-#endif /* __cplusplus*/
-
-/*******************************************************************************
- ********************** Configuration BOARD_BootClockRUN ***********************
- ******************************************************************************/
-/*******************************************************************************
- * Definitions for BOARD_BootClockRUN configuration
- ******************************************************************************/
-#define BOARD_BOOTCLOCKRUN_CORE_CLOCK 600000000U /*!< Core clock frequency: 600000000Hz */
-
-/* Clock outputs (values are in Hz): */
-#define BOARD_BOOTCLOCKRUN_AHB_CLK_ROOT 600000000UL
-#define BOARD_BOOTCLOCKRUN_CAN_CLK_ROOT 40000000UL
-#define BOARD_BOOTCLOCKRUN_CKIL_SYNC_CLK_ROOT 32768UL
-#define BOARD_BOOTCLOCKRUN_CLKO1_CLK 0UL
-#define BOARD_BOOTCLOCKRUN_CLKO2_CLK 0UL
-#define BOARD_BOOTCLOCKRUN_CLK_1M 1000000UL
-#define BOARD_BOOTCLOCKRUN_CLK_24M 24000000UL
-#define BOARD_BOOTCLOCKRUN_CSI_CLK_ROOT 12000000UL
-#define BOARD_BOOTCLOCKRUN_ENET1_TX_CLK 2400000UL
-#define BOARD_BOOTCLOCKRUN_ENET2_125M_CLK 1200000UL
-#define BOARD_BOOTCLOCKRUN_ENET2_TX_CLK 1200000UL
-#define BOARD_BOOTCLOCKRUN_ENET_125M_CLK 2400000UL
-#define BOARD_BOOTCLOCKRUN_ENET_25M_REF_CLK 1200000UL
-#define BOARD_BOOTCLOCKRUN_FLEXIO1_CLK_ROOT 30000000UL
-#define BOARD_BOOTCLOCKRUN_FLEXIO2_CLK_ROOT 30000000UL
-#define BOARD_BOOTCLOCKRUN_FLEXSPI2_CLK_ROOT 130909090UL
-#define BOARD_BOOTCLOCKRUN_FLEXSPI_CLK_ROOT 130909090UL
-#define BOARD_BOOTCLOCKRUN_GPT1_IPG_CLK_HIGHFREQ 75000000UL
-#define BOARD_BOOTCLOCKRUN_GPT2_IPG_CLK_HIGHFREQ 75000000UL
-#define BOARD_BOOTCLOCKRUN_IPG_CLK_ROOT 150000000UL
-#define BOARD_BOOTCLOCKRUN_LCDIF_CLK_ROOT 9642857UL
-#define BOARD_BOOTCLOCKRUN_LPI2C_CLK_ROOT 60000000UL
-#define BOARD_BOOTCLOCKRUN_LPSPI_CLK_ROOT 105600000UL
-#define BOARD_BOOTCLOCKRUN_LVDS1_CLK 1200000000UL
-#define BOARD_BOOTCLOCKRUN_MQS_MCLK 63529411UL
-#define BOARD_BOOTCLOCKRUN_PERCLK_CLK_ROOT 75000000UL
-#define BOARD_BOOTCLOCKRUN_PLL7_MAIN_CLK 24000000UL
-#define BOARD_BOOTCLOCKRUN_SAI1_CLK_ROOT 63529411UL
-#define BOARD_BOOTCLOCKRUN_SAI1_MCLK1 63529411UL
-#define BOARD_BOOTCLOCKRUN_SAI1_MCLK2 63529411UL
-#define BOARD_BOOTCLOCKRUN_SAI1_MCLK3 30000000UL
-#define BOARD_BOOTCLOCKRUN_SAI2_CLK_ROOT 63529411UL
-#define BOARD_BOOTCLOCKRUN_SAI2_MCLK1 63529411UL
-#define BOARD_BOOTCLOCKRUN_SAI2_MCLK2 0UL
-#define BOARD_BOOTCLOCKRUN_SAI2_MCLK3 30000000UL
-#define BOARD_BOOTCLOCKRUN_SAI3_CLK_ROOT 63529411UL
-#define BOARD_BOOTCLOCKRUN_SAI3_MCLK1 63529411UL
-#define BOARD_BOOTCLOCKRUN_SAI3_MCLK2 0UL
-#define BOARD_BOOTCLOCKRUN_SAI3_MCLK3 30000000UL
-#define BOARD_BOOTCLOCKRUN_SEMC_CLK_ROOT 75000000UL
-#define BOARD_BOOTCLOCKRUN_SPDIF0_CLK_ROOT 30000000UL
-#define BOARD_BOOTCLOCKRUN_SPDIF0_EXTCLK_OUT 0UL
-#define BOARD_BOOTCLOCKRUN_TRACE_CLK_ROOT 117333333UL
-#define BOARD_BOOTCLOCKRUN_UART_CLK_ROOT 80000000UL
-#define BOARD_BOOTCLOCKRUN_USBPHY1_CLK 0UL
-#define BOARD_BOOTCLOCKRUN_USBPHY2_CLK 0UL
-#define BOARD_BOOTCLOCKRUN_USDHC1_CLK_ROOT 198000000UL
-#define BOARD_BOOTCLOCKRUN_USDHC2_CLK_ROOT 198000000UL
-
-/*! @brief Arm PLL set for BOARD_BootClockRUN configuration.
- */
-extern const clock_arm_pll_config_t armPllConfig_BOARD_BootClockRUN;
-/*! @brief Usb1 PLL set for BOARD_BootClockRUN configuration.
- */
-extern const clock_usb_pll_config_t usb1PllConfig_BOARD_BootClockRUN;
-/*! @brief Sys PLL for BOARD_BootClockRUN configuration.
- */
-extern const clock_sys_pll_config_t sysPllConfig_BOARD_BootClockRUN;
-
-/*******************************************************************************
- * API for BOARD_BootClockRUN configuration
- ******************************************************************************/
-#if defined(__cplusplus)
-extern "C" {
-#endif /* __cplusplus*/
-
-/*!
- * @brief This function executes configuration of clocks.
- *
- */
-void BOARD_BootClockRUN(void);
-
-#if defined(__cplusplus)
-}
-#endif /* __cplusplus*/
-
-#endif /* _CLOCK_CONFIG_H_ */
diff --git a/ports/mimxrt/boards/TEENSY41/clock_config.h b/ports/mimxrt/boards/TEENSY41/clock_config.h
deleted file mode 100644
index 0822024847717..0000000000000
--- a/ports/mimxrt/boards/TEENSY41/clock_config.h
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * Copyright 2018-2019 NXP
- * All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-#ifndef _CLOCK_CONFIG_H_
-#define _CLOCK_CONFIG_H_
-
-#include "fsl_common.h"
-
-/*******************************************************************************
- * Definitions
- ******************************************************************************/
-#define BOARD_XTAL0_CLK_HZ 24000000U /*!< Board xtal0 frequency in Hz */
-
-#define BOARD_XTAL32K_CLK_HZ 32768U /*!< Board xtal32k frequency in Hz */
-/*******************************************************************************
- ************************ BOARD_InitBootClocks function ************************
- ******************************************************************************/
-
-#if defined(__cplusplus)
-extern "C" {
-#endif /* __cplusplus*/
-
-/*!
- * @brief This function executes default configuration of clocks.
- *
- */
-void BOARD_InitBootClocks(void);
-
-#if defined(__cplusplus)
-}
-#endif /* __cplusplus*/
-
-/*******************************************************************************
- ********************** Configuration BOARD_BootClockRUN ***********************
- ******************************************************************************/
-/*******************************************************************************
- * Definitions for BOARD_BootClockRUN configuration
- ******************************************************************************/
-#define BOARD_BOOTCLOCKRUN_CORE_CLOCK 600000000U /*!< Core clock frequency: 600000000Hz */
-
-/* Clock outputs (values are in Hz): */
-#define BOARD_BOOTCLOCKRUN_AHB_CLK_ROOT 600000000UL
-#define BOARD_BOOTCLOCKRUN_CAN_CLK_ROOT 40000000UL
-#define BOARD_BOOTCLOCKRUN_CKIL_SYNC_CLK_ROOT 32768UL
-#define BOARD_BOOTCLOCKRUN_CLKO1_CLK 0UL
-#define BOARD_BOOTCLOCKRUN_CLKO2_CLK 0UL
-#define BOARD_BOOTCLOCKRUN_CLK_1M 1000000UL
-#define BOARD_BOOTCLOCKRUN_CLK_24M 24000000UL
-#define BOARD_BOOTCLOCKRUN_CSI_CLK_ROOT 12000000UL
-#define BOARD_BOOTCLOCKRUN_ENET1_TX_CLK 2400000UL
-#define BOARD_BOOTCLOCKRUN_ENET2_125M_CLK 1200000UL
-#define BOARD_BOOTCLOCKRUN_ENET2_TX_CLK 1200000UL
-#define BOARD_BOOTCLOCKRUN_ENET_125M_CLK 2400000UL
-#define BOARD_BOOTCLOCKRUN_ENET_25M_REF_CLK 1200000UL
-#define BOARD_BOOTCLOCKRUN_FLEXIO1_CLK_ROOT 30000000UL
-#define BOARD_BOOTCLOCKRUN_FLEXIO2_CLK_ROOT 30000000UL
-#define BOARD_BOOTCLOCKRUN_FLEXSPI2_CLK_ROOT 130909090UL
-#define BOARD_BOOTCLOCKRUN_FLEXSPI_CLK_ROOT 130909090UL
-#define BOARD_BOOTCLOCKRUN_GPT1_IPG_CLK_HIGHFREQ 75000000UL
-#define BOARD_BOOTCLOCKRUN_GPT2_IPG_CLK_HIGHFREQ 75000000UL
-#define BOARD_BOOTCLOCKRUN_IPG_CLK_ROOT 150000000UL
-#define BOARD_BOOTCLOCKRUN_LCDIF_CLK_ROOT 9642857UL
-#define BOARD_BOOTCLOCKRUN_LPI2C_CLK_ROOT 60000000UL
-#define BOARD_BOOTCLOCKRUN_LPSPI_CLK_ROOT 105600000UL
-#define BOARD_BOOTCLOCKRUN_LVDS1_CLK 1200000000UL
-#define BOARD_BOOTCLOCKRUN_MQS_MCLK 63529411UL
-#define BOARD_BOOTCLOCKRUN_PERCLK_CLK_ROOT 75000000UL
-#define BOARD_BOOTCLOCKRUN_PLL7_MAIN_CLK 24000000UL
-#define BOARD_BOOTCLOCKRUN_SAI1_CLK_ROOT 63529411UL
-#define BOARD_BOOTCLOCKRUN_SAI1_MCLK1 63529411UL
-#define BOARD_BOOTCLOCKRUN_SAI1_MCLK2 63529411UL
-#define BOARD_BOOTCLOCKRUN_SAI1_MCLK3 30000000UL
-#define BOARD_BOOTCLOCKRUN_SAI2_CLK_ROOT 63529411UL
-#define BOARD_BOOTCLOCKRUN_SAI2_MCLK1 63529411UL
-#define BOARD_BOOTCLOCKRUN_SAI2_MCLK2 0UL
-#define BOARD_BOOTCLOCKRUN_SAI2_MCLK3 30000000UL
-#define BOARD_BOOTCLOCKRUN_SAI3_CLK_ROOT 63529411UL
-#define BOARD_BOOTCLOCKRUN_SAI3_MCLK1 63529411UL
-#define BOARD_BOOTCLOCKRUN_SAI3_MCLK2 0UL
-#define BOARD_BOOTCLOCKRUN_SAI3_MCLK3 30000000UL
-#define BOARD_BOOTCLOCKRUN_SEMC_CLK_ROOT 75000000UL
-#define BOARD_BOOTCLOCKRUN_SPDIF0_CLK_ROOT 30000000UL
-#define BOARD_BOOTCLOCKRUN_SPDIF0_EXTCLK_OUT 0UL
-#define BOARD_BOOTCLOCKRUN_TRACE_CLK_ROOT 117333333UL
-#define BOARD_BOOTCLOCKRUN_UART_CLK_ROOT 80000000UL
-#define BOARD_BOOTCLOCKRUN_USBPHY1_CLK 0UL
-#define BOARD_BOOTCLOCKRUN_USBPHY2_CLK 0UL
-#define BOARD_BOOTCLOCKRUN_USDHC1_CLK_ROOT 198000000UL
-#define BOARD_BOOTCLOCKRUN_USDHC2_CLK_ROOT 198000000UL
-
-/*! @brief Arm PLL set for BOARD_BootClockRUN configuration.
- */
-extern const clock_arm_pll_config_t armPllConfig_BOARD_BootClockRUN;
-/*! @brief Usb1 PLL set for BOARD_BootClockRUN configuration.
- */
-extern const clock_usb_pll_config_t usb1PllConfig_BOARD_BootClockRUN;
-/*! @brief Sys PLL for BOARD_BootClockRUN configuration.
- */
-extern const clock_sys_pll_config_t sysPllConfig_BOARD_BootClockRUN;
-
-/*******************************************************************************
- * API for BOARD_BootClockRUN configuration
- ******************************************************************************/
-#if defined(__cplusplus)
-extern "C" {
-#endif /* __cplusplus*/
-
-/*!
- * @brief This function executes configuration of clocks.
- *
- */
-void BOARD_BootClockRUN(void);
-
-#if defined(__cplusplus)
-}
-#endif /* __cplusplus*/
-
-#endif /* _CLOCK_CONFIG_H_ */
diff --git a/ports/mimxrt/eth.c b/ports/mimxrt/eth.c
index 288aafb6b3d96..50e1cbb0fe822 100644
--- a/ports/mimxrt/eth.c
+++ b/ports/mimxrt/eth.c
@@ -84,6 +84,11 @@ enet_buffer_config_t buffConfig[] = {{
                                          &g_txBuffDescrip[0],
                                          &g_rxDataBuff[0][0],
                                          &g_txDataBuff[0][0],
+                                         #if FSL_ENET_DRIVER_VERSION >= 0x020300
+                                         0,
+                                         0,
+                                         NULL
+                                         #endif
                                      }};
 
 static uint8_t hw_addr[6]; // The MAC address field
@@ -119,7 +124,6 @@ static const iomux_table_t iomux_table_enet[] = {
 #define TRACE_ETH_RX (0x0004)
 #define TRACE_ETH_FULL (0x0008)
 
-
 STATIC void eth_trace(eth_t *self, size_t len, const void *data, unsigned int flags) {
     if (((flags & NETUTILS_TRACE_IS_TX) && (self->trace_flags & TRACE_ETH_TX))
         || (!(flags & NETUTILS_TRACE_IS_TX) && (self->trace_flags & TRACE_ETH_RX))) {
@@ -156,7 +160,11 @@ STATIC void eth_process_frame(eth_t *self, uint8_t *buf, size_t length) {
     }
 }
 
-void eth_irq_handler(ENET_Type *base, enet_handle_t *handle, enet_event_t event, void *userData) {
+void eth_irq_handler(ENET_Type *base, enet_handle_t *handle,
+    #if FSL_FEATURE_ENET_QUEUE > 1
+    uint32_t ringId,
+    #endif /* FSL_FEATURE_ENET_QUEUE > 1 */
+    enet_event_t event, enet_frame_info_t *frameInfo, void *userData) {
     eth_t *self = (eth_t *)userData;
     uint8_t g_rx_frame[ENET_FRAME_MAX_FRAMELEN + 14];
     uint32_t length = 0;
@@ -164,13 +172,13 @@ void eth_irq_handler(ENET_Type *base, enet_handle_t *handle, enet_event_t event,
 
     if (event == kENET_RxEvent) {
         do {
-            status = ENET_GetRxFrameSize(handle, &length);
+            status = ENET_GetRxFrameSize(handle, &length, 0);
             if (status == kStatus_Success) {
                 // Get the data
-                ENET_ReadFrame(base, handle, g_rx_frame, length);
+                ENET_ReadFrame(base, handle, g_rx_frame, length, 0, NULL);
                 eth_process_frame(self, g_rx_frame, length);
             } else if (status == kStatus_ENET_RxFrameError) {
-                ENET_ReadFrame(base, handle, NULL, 0);
+                ENET_ReadFrame(base, handle, NULL, 0, 0, NULL);
             }
         } while (status != kStatus_ENET_RxFrameEmpty);
     } else {
@@ -320,7 +328,7 @@ STATIC err_t eth_send_frame_blocking(ENET_Type *base, enet_handle_t *handle, uin
 
     // Try a few times to send the frame
     for (i = XMIT_LOOP; i > 0; i--) {
-        status = ENET_SendFrame(base, handle, buffer, len);
+        status = ENET_SendFrame(base, handle, buffer, len, 0, false, NULL);
         if (status != kStatus_ENET_TxFrameBusy) {
             break;
         }
diff --git a/ports/mimxrt/hal/board.h b/ports/mimxrt/hal/board.h
index ce5e047976f28..1a611e10f9f7a 100644
--- a/ports/mimxrt/hal/board.h
+++ b/ports/mimxrt/hal/board.h
@@ -27,7 +27,7 @@
 #ifndef MICROPY_INCLUDED_MIMXRT_BOARD_H
 #define MICROPY_INCLUDED_MIMXRT_BOARD_H
 
-#include "clock_config.h"
+#include CLOCK_CONFIG_H
 #include "fsl_common.h"
 
 #endif /* MICROPY_INCLUDED_MIMXRT_BOARD_H */
diff --git a/ports/mimxrt/hal/phy/mdio/enet/fsl_enet_mdio.c b/ports/mimxrt/hal/phy/mdio/enet/fsl_enet_mdio.c
index 8e679cd989a8f..73f97882741f7 100644
--- a/ports/mimxrt/hal/phy/mdio/enet/fsl_enet_mdio.c
+++ b/ports/mimxrt/hal/phy/mdio/enet/fsl_enet_mdio.c
@@ -21,7 +21,7 @@ static status_t ENET_MDIO_Write(mdio_handle_t *handle, uint32_t phyAddr, uint32_
 static status_t ENET_MDIO_Read(mdio_handle_t *handle, uint32_t phyAddr, uint32_t devAddr, uint32_t *dataPtr);
 
 uint32_t ENET_GetInstance(ENET_Type *base);
-extern clock_ip_name_t s_enetClock[];
+extern const clock_ip_name_t s_enetClock[];
 
 /*******************************************************************************
  * Variables
diff --git a/ports/mimxrt/hal/pwm_backport.c b/ports/mimxrt/hal/pwm_backport.c
index a4663df4f1a3d..018f8f62792e3 100644
--- a/ports/mimxrt/hal/pwm_backport.c
+++ b/ports/mimxrt/hal/pwm_backport.c
@@ -103,29 +103,6 @@ void PWM_SetupPwmx_u16(PWM_Type *base, pwm_submodule_t subModule,
     base->OUTEN |= (1U << subModule);
 }
 
-void PWM_SetupFaultDisableMap(PWM_Type *base, pwm_submodule_t subModule,
-    pwm_channels_t pwmChannel, pwm_fault_channels_t pwm_fault_channels, uint16_t value) {
-    uint16_t reg = base->SM[subModule].DISMAP[pwm_fault_channels];
-    switch (pwmChannel) {
-        case kPWM_PwmA:
-            reg &= ~((uint16_t)PWM_DISMAP_DIS0A_MASK);
-            reg |= (((uint16_t)(value) << (uint16_t)PWM_DISMAP_DIS0A_SHIFT) & (uint16_t)PWM_DISMAP_DIS0A_MASK);
-            break;
-        case kPWM_PwmB:
-            reg &= ~((uint16_t)PWM_DISMAP_DIS0B_MASK);
-            reg |= (((uint16_t)(value) << (uint16_t)PWM_DISMAP_DIS0B_SHIFT) & (uint16_t)PWM_DISMAP_DIS0B_MASK);
-            break;
-        case kPWM_PwmX:
-            reg &= ~((uint16_t)PWM_DISMAP_DIS0X_MASK);
-            reg |= (((uint16_t)(value) << (uint16_t)PWM_DISMAP_DIS0X_SHIFT) & (uint16_t)PWM_DISMAP_DIS0X_MASK);
-            break;
-        default:
-            assert(false);
-            break;
-    }
-    base->SM[subModule].DISMAP[pwm_fault_channels] = reg;
-}
-
 #ifdef FSL_FEATURE_SOC_TMR_COUNT
 status_t QTMR_SetupPwm_u16(TMR_Type *base, qtmr_channel_selection_t channel, uint32_t pwmFreqHz,
     uint16_t dutyCycleU16, bool outputPolarity, uint32_t srcClock_Hz, bool is_init) {
diff --git a/ports/mimxrt/hal/pwm_backport.h b/ports/mimxrt/hal/pwm_backport.h
index cd4bdb1f8ef72..516726961ca46 100644
--- a/ports/mimxrt/hal/pwm_backport.h
+++ b/ports/mimxrt/hal/pwm_backport.h
@@ -24,11 +24,6 @@ typedef struct _pwm_signal_param_u16
     uint16_t deadtimeValue;    // The deadtime value; only used if channel pair is operating in complementary mode
 } pwm_signal_param_u16_t;
 
-typedef enum _pwm_fault_channels {
-    kPWM_faultchannel_0 = 0U,
-    kPWM_faultchannel_1
-} pwm_fault_channels_t;
-
 #define PWM_FULL_SCALE  (65536UL)
 
 void PWM_UpdatePwmDutycycle_u16(PWM_Type *base, pwm_submodule_t subModule,
@@ -40,9 +35,6 @@ void PWM_SetupPwm_u16(PWM_Type *base, pwm_submodule_t subModule, pwm_signal_para
 void PWM_SetupPwmx_u16(PWM_Type *base, pwm_submodule_t subModule,
     uint32_t pwmFreq_Hz, uint16_t duty_cycle, uint8_t invert, uint32_t srcClock_Hz);
 
-void PWM_SetupFaultDisableMap(PWM_Type *base, pwm_submodule_t subModule,
-    pwm_channels_t pwmChannel, pwm_fault_channels_t pwm_fault_channels, uint16_t value);
-
 #ifdef FSL_FEATURE_SOC_TMR_COUNT
 status_t QTMR_SetupPwm_u16(TMR_Type *base, qtmr_channel_selection_t channel, uint32_t pwmFreqHz,
     uint16_t dutyCycleU16, bool outputPolarity, uint32_t srcClock_Hz, bool is_init);
diff --git a/ports/mimxrt/machine_i2c.c b/ports/mimxrt/machine_i2c.c
index a9a027ae23084..c10fcaddbe38c 100644
--- a/ports/mimxrt/machine_i2c.c
+++ b/ports/mimxrt/machine_i2c.c
@@ -29,6 +29,7 @@
 #include "py/mperrno.h"
 #include "extmod/machine_i2c.h"
 #include "modmachine.h"
+#include CLOCK_CONFIG_H
 
 #include "fsl_iomuxc.h"
 #include "fsl_lpi2c.h"
@@ -100,8 +101,6 @@ mp_obj_t machine_i2c_make_new(const mp_obj_type_t *type, size_t n_args, size_t n
         { MP_QSTR_drive, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = DEFAULT_I2C_DRIVE} },
     };
 
-    static bool clk_init = true;
-
     // Parse args.
     mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
     mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
@@ -123,20 +122,13 @@ mp_obj_t machine_i2c_make_new(const mp_obj_type_t *type, size_t n_args, size_t n
         drive = DEFAULT_I2C_DRIVE;
     }
 
-    if (clk_init) {
-        clk_init = false;
-        // Set clock source for LPI2C
-        CLOCK_SetMux(kCLOCK_Lpi2cMux, LPI2C_CLOCK_SOURCE_SELECT); // USB1 PLL (480 MHz)
-        CLOCK_SetDiv(kCLOCK_Lpi2cDiv, LPI2C_CLOCK_SOURCE_DIVIDER);
-    }
-
     // Initialise the I2C peripheral if any arguments given, or it was not initialised previously.
     lpi2c_set_iomux(self->i2c_hw_id, drive);
     self->master_config = m_new_obj(lpi2c_master_config_t);
     LPI2C_MasterGetDefaultConfig(self->master_config);
     // Initialise the I2C peripheral.
     self->master_config->baudRate_Hz = args[ARG_freq].u_int;
-    LPI2C_MasterInit(self->i2c_inst, self->master_config, LPI2C_CLOCK_FREQUENCY);
+    LPI2C_MasterInit(self->i2c_inst, self->master_config, BOARD_BOOTCLOCKRUN_LPI2C_CLK_ROOT);
 
     return MP_OBJ_FROM_PTR(self);
 }
diff --git a/ports/mimxrt/machine_i2s.c b/ports/mimxrt/machine_i2s.c
index c80b60da43022..11a203baea16b 100644
--- a/ports/mimxrt/machine_i2s.c
+++ b/ports/mimxrt/machine_i2s.c
@@ -40,7 +40,7 @@
 #include "modmachine.h"
 #include "dma_manager.h"
 
-#include "clock_config.h"
+#include CLOCK_CONFIG_H
 #include "fsl_iomuxc.h"
 #include "fsl_dmamux.h"
 #include "fsl_edma.h"
diff --git a/ports/mimxrt/machine_spi.c b/ports/mimxrt/machine_spi.c
index 2d01560d9a314..805ed9a0ac540 100644
--- a/ports/mimxrt/machine_spi.c
+++ b/ports/mimxrt/machine_spi.c
@@ -30,7 +30,7 @@
 #include "py/mperrno.h"
 #include "extmod/machine_spi.h"
 #include "modmachine.h"
-#include "dma_manager.h"
+#include CLOCK_CONFIG_H
 
 #include "fsl_cache.h"
 #include "fsl_dmamux.h"
@@ -45,8 +45,6 @@
 #define DEFAULT_SPI_FIRSTBIT    (kLPSPI_MsbFirst)
 #define DEFAULT_SPI_DRIVE       (6)
 
-#define CLOCK_DIVIDER           (1)
-
 #define MICROPY_HW_SPI_NUM MP_ARRAY_SIZE(spi_index_table)
 
 #define SCK (iomux_table[index])
@@ -79,9 +77,6 @@ static const iomux_table_t iomux_table[] = {
     IOMUX_TABLE_SPI
 };
 
-static uint16_t dma_req_src_rx[] = DMA_REQ_SRC_RX;
-static uint16_t dma_req_src_tx[] = DMA_REQ_SRC_TX;
-
 bool lpspi_set_iomux(int8_t spi, uint8_t drive, uint8_t cs) {
     int index = (spi - 1) * 5;
 
@@ -139,8 +134,6 @@ mp_obj_t machine_spi_make_new(const mp_obj_type_t *type, size_t n_args, size_t n
         { MP_QSTR_cs,       MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 0} },
     };
 
-    static bool clk_init = true;
-
     // Parse the arguments.
     mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
     mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
@@ -163,12 +156,6 @@ mp_obj_t machine_spi_make_new(const mp_obj_type_t *type, size_t n_args, size_t n
         drive = DEFAULT_SPI_DRIVE;
     }
 
-    if (clk_init) {
-        clk_init = false;
-        /*Set clock source for LPSPI*/
-        CLOCK_SetMux(kCLOCK_LpspiMux, 1);  // Clock source is kCLOCK_Usb1PllPfd1Clk
-        CLOCK_SetDiv(kCLOCK_LpspiDiv, CLOCK_DIVIDER);
-    }
     LPSPI_Reset(self->spi_inst);
     LPSPI_Enable(self->spi_inst, false);  // Disable first before new settings are applies
 
@@ -184,11 +171,13 @@ mp_obj_t machine_spi_make_new(const mp_obj_type_t *type, size_t n_args, size_t n
     if (args[ARG_gap_ns].u_int != -1) {
         self->master_config->betweenTransferDelayInNanoSec = args[ARG_gap_ns].u_int;
     }
+    self->master_config->lastSckToPcsDelayInNanoSec = self->master_config->betweenTransferDelayInNanoSec;
+    self->master_config->pcsToSckDelayInNanoSec = self->master_config->betweenTransferDelayInNanoSec;
     uint8_t cs = args[ARG_cs].u_int;
     if (cs <= 1) {
         self->master_config->whichPcs = cs;
     }
-    LPSPI_MasterInit(self->spi_inst, self->master_config, CLOCK_GetFreq(kCLOCK_Usb1PllPfd0Clk) / (CLOCK_DIVIDER + 1));
+    LPSPI_MasterInit(self->spi_inst, self->master_config, BOARD_BOOTCLOCKRUN_LPSPI_CLK_ROOT);
     lpspi_set_iomux(spi_index_table[spi_id], drive, cs);
 
     return MP_OBJ_FROM_PTR(self);
@@ -231,113 +220,26 @@ STATIC void machine_spi_init(mp_obj_base_t *self_in, size_t n_args, const mp_obj
     if (args[ARG_gap_ns].u_int != -1) {
         self->master_config->betweenTransferDelayInNanoSec = args[ARG_gap_ns].u_int;
     }
+    self->master_config->lastSckToPcsDelayInNanoSec = self->master_config->betweenTransferDelayInNanoSec;
+    self->master_config->pcsToSckDelayInNanoSec = self->master_config->betweenTransferDelayInNanoSec;
     LPSPI_Enable(self->spi_inst, false);  // Disable first before new settings are applies
-    LPSPI_MasterInit(self->spi_inst, self->master_config, CLOCK_GetFreq(kCLOCK_Usb1PllPfd0Clk) / (CLOCK_DIVIDER + 1));
-}
-
-void LPSPI_EDMAMasterCallback(LPSPI_Type *base, lpspi_master_edma_handle_t *handle, status_t status, void *self_in) {
-    machine_spi_obj_t *self = (machine_spi_obj_t *)self_in;
-    self->transfer_busy = false;
+    LPSPI_MasterInit(self->spi_inst, self->master_config, BOARD_BOOTCLOCKRUN_LPSPI_CLK_ROOT);
 }
 
 STATIC void machine_spi_transfer(mp_obj_base_t *self_in, size_t len, const uint8_t *src, uint8_t *dest) {
     machine_spi_obj_t *self = (machine_spi_obj_t *)self_in;
-    // Use DMA for large transfers if channels are available
-    const size_t dma_min_size_threshold = FSL_FEATURE_LPSPI_FIFO_SIZEn(0);  // The Macro argument is ignored
-
-    int chan_tx = -1;
-    int chan_rx = -1;
-    if (len >= dma_min_size_threshold) {
-        // Use two DMA channels to service the two FIFOs
-        chan_rx = allocate_dma_channel();
-        chan_tx = allocate_dma_channel();
-    }
-    bool use_dma = chan_rx >= 0 && chan_tx >= 0;
-
-    if (use_dma) {
-        /* DMA MUX init*/
-        DMAMUX_Init(DMAMUX);
-
-        DMAMUX_SetSource(DMAMUX, chan_rx, dma_req_src_rx[self->spi_hw_id]); // ## SPIn source
-        DMAMUX_EnableChannel(DMAMUX, chan_rx);
-
-        DMAMUX_SetSource(DMAMUX, chan_tx, dma_req_src_tx[self->spi_hw_id]);
-        DMAMUX_EnableChannel(DMAMUX, chan_tx);
-
-        dma_init();
-
-        lpspi_master_edma_handle_t g_master_edma_handle;
-        edma_handle_t lpspiEdmaMasterRxRegToRxDataHandle;
-        edma_handle_t lpspiEdmaMasterTxDataToTxRegHandle;
-
-        // Set up lpspi EDMA master
-        EDMA_CreateHandle(&(lpspiEdmaMasterRxRegToRxDataHandle), DMA0, chan_rx);
-        EDMA_CreateHandle(&(lpspiEdmaMasterTxDataToTxRegHandle), DMA0, chan_tx);
-        LPSPI_MasterTransferCreateHandleEDMA(self->spi_inst, &g_master_edma_handle, LPSPI_EDMAMasterCallback, self,
-            &lpspiEdmaMasterRxRegToRxDataHandle,
-            &lpspiEdmaMasterTxDataToTxRegHandle);
-
-        // Wait a short while for a previous transfer to finish, but not forever
-        for (volatile int j = 0; (j < 5000) && ((LPSPI_GetStatusFlags(self->spi_inst) & kLPSPI_ModuleBusyFlag) != 0); j++) {}
-
-        // Start master transfer
-        lpspi_transfer_t masterXfer;
-        masterXfer.txData = (uint8_t *)src;
-        masterXfer.rxData = (uint8_t *)dest;
-        masterXfer.dataSize = len;
-        masterXfer.configFlags = (self->master_config->whichPcs << LPSPI_MASTER_PCS_SHIFT) | kLPSPI_MasterPcsContinuous | kLPSPI_MasterByteSwap;
-
-        // Reconfigure the TCR, required after switch between DMA vs. non-DMA
-        LPSPI_Enable(self->spi_inst, false);  // Disable first before new settings are applied
-        self->spi_inst->TCR = LPSPI_TCR_CPOL(self->master_config->cpol) | LPSPI_TCR_CPHA(self->master_config->cpha) |
-            LPSPI_TCR_LSBF(self->master_config->direction) | LPSPI_TCR_FRAMESZ(self->master_config->bitsPerFrame - 1) |
-            (self->spi_inst->TCR & LPSPI_TCR_PRESCALE_MASK) | LPSPI_TCR_PCS(self->master_config->whichPcs);
-        LPSPI_Enable(self->spi_inst, true);
-
-        self->transfer_busy = true;
-        if (dest) {
-            L1CACHE_DisableDCache();
-        } else if (src) {
-            DCACHE_CleanByRange((uint32_t)src, len);
-        }
-        if (LPSPI_MasterTransferEDMA(self->spi_inst, &g_master_edma_handle, &masterXfer) != kStatus_Success) {
-            L1CACHE_EnableDCache();
-            mp_raise_OSError(EIO);
-        } else {
-            while (self->transfer_busy) {
-                MICROPY_EVENT_POLL_HOOK
-            }
-            L1CACHE_EnableDCache();
-        }
-    }
-    // Release DMA channels, even if never allocated.
-    if (chan_rx >= 0) {
-        free_dma_channel(chan_rx);
-    }
-    if (chan_tx >= 0) {
-        free_dma_channel(chan_tx);
-    }
 
-    if (!use_dma) {
-        // Wait a short while for a previous transfer to finish, but not forever
-        for (volatile int j = 0; (j < 5000) && ((LPSPI_GetStatusFlags(self->spi_inst) & kLPSPI_ModuleBusyFlag) != 0); j++) {}
-
-        // Reconfigure the TCR, required after switch between DMA vs. non-DMA
-        LPSPI_Enable(self->spi_inst, false);  // Disable first before new settings are applied
-        self->spi_inst->TCR = LPSPI_TCR_CPOL(self->master_config->cpol) | LPSPI_TCR_CPHA(self->master_config->cpha) |
-            LPSPI_TCR_LSBF(self->master_config->direction) | LPSPI_TCR_FRAMESZ(self->master_config->bitsPerFrame - 1) |
-            (self->spi_inst->TCR & LPSPI_TCR_PRESCALE_MASK) | LPSPI_TCR_PCS(self->master_config->whichPcs);
-        LPSPI_Enable(self->spi_inst, true);
-
-        lpspi_transfer_t masterXfer;
-        masterXfer.txData = (uint8_t *)src;
-        masterXfer.rxData = (uint8_t *)dest;
-        masterXfer.dataSize = len;
-        masterXfer.configFlags = (self->master_config->whichPcs << LPSPI_MASTER_PCS_SHIFT) | kLPSPI_MasterPcsContinuous | kLPSPI_MasterByteSwap;
-
-        if (LPSPI_MasterTransferBlocking(self->spi_inst, &masterXfer) != kStatus_Success) {
-            mp_raise_OSError(EIO);
-        }
+    // Wait a short while for the previous transfer to finish, but not forever
+    for (volatile int j = 0; (j < 5000) && ((self->spi_inst->SR & kLPSPI_ModuleBusyFlag) != 0); j++) {}
+
+    lpspi_transfer_t masterXfer;
+    masterXfer.txData = (uint8_t *)src;
+    masterXfer.rxData = (uint8_t *)dest;
+    masterXfer.dataSize = len;
+    masterXfer.configFlags = (self->master_config->whichPcs << LPSPI_MASTER_PCS_SHIFT) | kLPSPI_MasterPcsContinuous | kLPSPI_MasterByteSwap;
+
+    if (LPSPI_MasterTransferBlocking(self->spi_inst, &masterXfer) != kStatus_Success) {
+        mp_raise_OSError(EIO);
     }
 }
 
diff --git a/ports/mimxrt/machine_timer.c b/ports/mimxrt/machine_timer.c
index 334a020c15cc1..c47d9dca24c6c 100644
--- a/ports/mimxrt/machine_timer.c
+++ b/ports/mimxrt/machine_timer.c
@@ -30,13 +30,13 @@
 #include "py/mphal.h"
 #include "fsl_pit.h"
 #include "modmachine.h"
+#include CLOCK_CONFIG_H
 
 #define TIMER_MODE_ONE_SHOT (0)
 #define TIMER_MODE_PERIODIC (1)
 #define TIMER_MIN_PERIOD 1
 
 #define alarm_callback PIT_IRQHandler
-#define PIT_SOURCE_CLOCK CLOCK_GetIpgFreq()
 #define PIT_IRQ_ID PIT_IRQn
 
 typedef struct _machine_timer_obj_t {
@@ -115,7 +115,7 @@ STATIC mp_obj_t machine_timer_init_helper(machine_timer_obj_t *self, size_t n_ar
     self->callback = args[ARG_callback].u_obj;
 
     // Set timer period for channel id
-    PIT_SetTimerPeriod(PIT, self->channel, USEC_TO_COUNT(self->delta_us, PIT_SOURCE_CLOCK));
+    PIT_SetTimerPeriod(PIT, self->channel, USEC_TO_COUNT(self->delta_us, BOARD_BOOTCLOCKRUN_IPG_CLK_ROOT));
 
     // Enable timer interrupts for the channel
     PIT_EnableInterrupts(PIT, self->channel, kPIT_TimerInterruptEnable);
diff --git a/ports/mimxrt/machine_uart.c b/ports/mimxrt/machine_uart.c
index 69c1c1ed06c44..5b1f285d8d41a 100644
--- a/ports/mimxrt/machine_uart.c
+++ b/ports/mimxrt/machine_uart.c
@@ -32,6 +32,7 @@
 #include "fsl_common.h"
 #include "fsl_lpuart.h"
 #include "fsl_iomuxc.h"
+#include CLOCK_CONFIG_H
 
 #define DEFAULT_UART_BAUDRATE (115200)
 #define DEFAULT_BUFFER_SIZE (256)
@@ -96,18 +97,6 @@ bool lpuart_set_iomux(int8_t uart) {
     }
 }
 
-uint32_t UART_SrcFreq(void) {
-    uint32_t freq;
-    // To make it simple, we assume default PLL and divider settings, and the
-    // only variable from application is use PLL3 source or OSC source.
-    if (CLOCK_GetMux(kCLOCK_UartMux) == 0) { // PLL3 div6 80M
-        freq = (CLOCK_GetPllFreq(kCLOCK_PllUsb1) / 6U) / (CLOCK_GetDiv(kCLOCK_UartDiv) + 1U);
-    } else {
-        freq = CLOCK_GetOscFreq() / (CLOCK_GetDiv(kCLOCK_UartDiv) + 1U);
-    }
-    return freq;
-}
-
 void LPUART_UserCallback(LPUART_Type *base, lpuart_handle_t *handle, status_t status, void *userData) {
     machine_uart_obj_t *self = userData;
     if (kStatus_LPUART_TxIdle == status) {
@@ -232,7 +221,7 @@ STATIC mp_obj_t machine_uart_init_helper(machine_uart_obj_t *self, size_t n_args
             self->timeout_char = min_timeout_char;
         }
 
-        LPUART_Init(self->lpuart, &self->config, UART_SrcFreq()); // ??
+        LPUART_Init(self->lpuart, &self->config, BOARD_BOOTCLOCKRUN_UART_CLK_ROOT); // ??
         LPUART_TransferCreateHandle(self->lpuart, &self->handle,  LPUART_UserCallback, self);
         uint8_t *buffer = m_new(uint8_t, rxbuf_len + 1);
         LPUART_TransferStartRingBuffer(self->lpuart, &self->handle, buffer, rxbuf_len);
diff --git a/ports/mimxrt/sdcard.c b/ports/mimxrt/sdcard.c
index 31853b400ebe7..20f76cc88f313 100644
--- a/ports/mimxrt/sdcard.c
+++ b/ports/mimxrt/sdcard.c
@@ -29,6 +29,11 @@
 #include "sdcard.h"
 #include "ticks.h"
 #include "fsl_iomuxc.h"
+#include "pin.h"
+
+#if FSL_USDHC_DRIVER_VERSION == 0x020208
+#define USHDC_USE_TRANSFER_NONBLOCKING_10XX  (1)
+#endif
 
 #define SDCARD_VOLTAGE_WINDOW_SD                (0x80100000U)
 #define SDCARD_HIGH_CAPACITY                    (0x40000000U)
@@ -281,28 +286,55 @@ void sdcard_card_removed_callback(USDHC_Type *base, void *userData) {
     USDHC_ClearInterruptStatusFlags(base, kUSDHC_CardRemovalFlag);
 }
 
+#if USHDC_USE_TRANSFER_NONBLOCKING_10XX
+
 void sdcard_transfer_complete_callback(USDHC_Type *base, usdhc_handle_t *handle, status_t status, void *userData) {
     sdcard_transfer_status = status;
     sdcard_transfer_done = true;
     USDHC_ClearInterruptStatusFlags(base, kUSDHC_CommandCompleteFlag | kUSDHC_DataCompleteFlag);
 }
 
+#endif
+
 void sdcard_dummy_callback(USDHC_Type *base, void *userData) {
     return;
 }
 
+static void sdcard_error_recovery(USDHC_Type *base) {
+    uint32_t status = 0U;
+    /* get host present status */
+    status = USDHC_GetPresentStatusFlags(base);
+    /* check command inhibit status flag */
+    if ((status & (uint32_t)kUSDHC_CommandInhibitFlag) != 0U) {
+        /* reset command line */
+        (void)USDHC_Reset(base, kUSDHC_ResetCommand, 100U);
+    }
+    /* check data inhibit status flag */
+    if (((status & (uint32_t)kUSDHC_DataInhibitFlag) != 0U) || (USDHC_GetAdmaErrorStatusFlags(base) != 0U)) {
+        /* reset data line */
+        (void)USDHC_Reset(base, kUSDHC_ResetData, 100U);
+    }
+}
+
 static status_t sdcard_transfer_blocking(USDHC_Type *base, usdhc_handle_t *handle, usdhc_transfer_t *transfer, uint32_t timeout_ms) {
-    uint32_t retry_ctr = 0UL;
     status_t status;
 
     usdhc_adma_config_t dma_config;
 
     (void)memset(&dma_config, 0, sizeof(usdhc_adma_config_t));
     dma_config.dmaMode = kUSDHC_DmaModeAdma2;
+
+    #if !(defined(FSL_FEATURE_USDHC_HAS_NO_RW_BURST_LEN) && FSL_FEATURE_USDHC_HAS_NO_RW_BURST_LEN)
     dma_config.burstLen = kUSDHC_EnBurstLenForINCR;
+    #endif
+
     dma_config.admaTable = sdcard_adma_descriptor_table;
     dma_config.admaTableWords = DMA_DESCRIPTOR_BUFFER_SIZE;
 
+    #if USHDC_USE_TRANSFER_NONBLOCKING_10XX
+
+    uint32_t retry_ctr = 0UL;
+
     do {
         status = USDHC_TransferNonBlocking(base, handle, &dma_config, transfer);
         retry_ctr++;
@@ -318,8 +350,29 @@ static status_t sdcard_transfer_blocking(USDHC_Type *base, usdhc_handle_t *handl
         }
         return kStatus_Timeout;
     } else {
+        sdcard_error_recovery(base);
         return status;
     }
+
+    #else // USHDC_USE_TRANSFER_NONBLOCKING_10XX
+
+    // Wait while the card is busy before a transfer
+    status = kStatus_Timeout;
+    for (int i = 0; i < timeout_ms * 100; i++) {
+        // Wait until Data0 is low any more. Low indicates "Busy".
+        if ((transfer->data->txData == NULL) || (USDHC_GetPresentStatusFlags(base) & (uint32_t)kUSDHC_Data0LineLevelFlag) != 0) {
+            // Not busy anymore or no TX-Data
+            status = USDHC_TransferBlocking(base, &dma_config, transfer);
+            if (status != kStatus_Success) {
+                sdcard_error_recovery(base);
+            }
+            break;
+        }
+        ticks_delay_us64(10);
+    }
+    return status;
+
+    #endif // USHDC_USE_TRANSFER_NONBLOCKING_11XX
 }
 
 static void sdcard_decode_csd(mimxrt_sdcard_obj_t *card, csd_t *csd) {
@@ -670,6 +723,22 @@ static bool sdcard_reset(mimxrt_sdcard_obj_t *card) {
 }
 
 void sdcard_init(mimxrt_sdcard_obj_t *card, uint32_t base_clk) {
+    #ifdef MIMXRT117x_SERIES
+    clock_root_config_t rootCfg = {0};
+    /* SYS PLL2 528MHz. */
+    const clock_sys_pll2_config_t sysPll2Config = {
+        .ssEnable = false,
+    };
+
+    CLOCK_InitSysPll2(&sysPll2Config);
+    CLOCK_InitPfd(kCLOCK_PllSys2, kCLOCK_Pfd2, 24);
+
+    rootCfg.mux = 4;
+    rootCfg.div = 2;
+    CLOCK_SetRootClock(kCLOCK_Root_Usdhc1, &rootCfg);
+
+    #else
+
     // Configure PFD0 of PLL2 (system PLL) fractional divider to 24 resulting in:
     //  with PFD0_clk = PLL2_clk * 18 / N
     //       PFD0_clk = 528MHz   * 18 / 24 = 396MHz
@@ -687,6 +756,8 @@ void sdcard_init(mimxrt_sdcard_obj_t *card, uint32_t base_clk) {
     CLOCK_SetMux(kCLOCK_Usdhc2Mux, 1U);  // Select PFD0 as clock input for USDHC
     #endif
 
+    #endif // MIMXRT117x_SERIES
+
     // Initialize USDHC
     const usdhc_config_t config = {
         .endianMode = kUSDHC_EndianModeLittle,
@@ -699,6 +770,7 @@ void sdcard_init(mimxrt_sdcard_obj_t *card, uint32_t base_clk) {
     (void)sdcard_reset(card);
     card->base_clk = base_clk;
 
+    #if USHDC_USE_TRANSFER_NONBLOCKING_10XX
     usdhc_transfer_callback_t callbacks = {
         .CardInserted = sdcard_card_inserted_callback,
         .CardRemoved = sdcard_card_removed_callback,
@@ -709,6 +781,7 @@ void sdcard_init(mimxrt_sdcard_obj_t *card, uint32_t base_clk) {
     };
 
     USDHC_TransferCreateHandle(card->usdhc_inst, &card->handle, &callbacks, NULL);
+    #endif // USHDC_USE_TRANSFER_NONBLOCKING_10XX
 }
 
 void sdcard_deinit(mimxrt_sdcard_obj_t *card) {
@@ -979,6 +1052,8 @@ bool sdcard_power_off(mimxrt_sdcard_obj_t *card) {
 bool sdcard_detect(mimxrt_sdcard_obj_t *card) {
     bool detect = false;
 
+    #if USHDC_USE_TRANSFER_NONBLOCKING_10XX
+
     #if defined MICROPY_USDHC1 && USDHC1_AVAIL
     if ((card->usdhc_inst == USDHC1) && (sdcard_usdhc1_state.inserted == true)) {
         return true;
@@ -990,12 +1065,17 @@ bool sdcard_detect(mimxrt_sdcard_obj_t *card) {
     }
     #endif
 
+    #endif // USHDC_USE_TRANSFER_NONBLOCKING_10XX
+
     if (card->pins->cd_b.pin) {
         detect = USDHC_DetectCardInsert(card->usdhc_inst);
     } else {
         USDHC_CardDetectByData3(card->usdhc_inst, true);
         detect = (USDHC_GetPresentStatusFlags(card->usdhc_inst) & USDHC_PRES_STATE_DLSL(8)) != 0;
     }
+    /* enable card detect interrupt */
+    USDHC_EnableInterruptStatus(card->usdhc_inst, kUSDHC_CardInsertionFlag);
+    USDHC_EnableInterruptStatus(card->usdhc_inst, kUSDHC_CardRemovalFlag);
 
     // Update card state when detected via pin state
     #if defined MICROPY_USDHC1 && USDHC1_AVAIL

From dd83f48fb28b925cfc2c5e5722f129378d30aed9 Mon Sep 17 00:00:00 2001
From: Takeo Takahashi <takeo.takahashi.xv@renesas.com>
Date: Mon, 30 May 2022 11:52:15 +0900
Subject: [PATCH 2128/3533] renesas-ra/machine_pin: Remove code for unsupported
 Pin features.

Signed-off-by: Takeo Takahashi <takeo.takahashi.xv@renesas.com>
---
 ports/renesas-ra/boards/ra_pin_prefix.c |  13 --
 ports/renesas-ra/machine_pin.c          | 246 ------------------------
 ports/renesas-ra/mpconfigport.h         |   3 -
 3 files changed, 262 deletions(-)

diff --git a/ports/renesas-ra/boards/ra_pin_prefix.c b/ports/renesas-ra/boards/ra_pin_prefix.c
index 78b7878ddafe5..c9aa3d8882a5e 100644
--- a/ports/renesas-ra/boards/ra_pin_prefix.c
+++ b/ports/renesas-ra/boards/ra_pin_prefix.c
@@ -6,19 +6,6 @@
 #include "py/mphal.h"
 #include "pin.h"
 
-#if 0
-#define AF(af_idx, af_fn, af_unit, af_type, af_ptr) \
-    { \
-        { &pin_af_type }, \
-        .name = MP_QSTR_AF##af_idx##_##af_fn##af_unit, \
-        .idx = (af_idx), \
-        .fn = AF_FN_##af_fn, \
-        .unit = (af_unit), \
-        .type = AF_PIN_TYPE_##af_fn##_##af_type, \
-        .af_fn = (af_ptr) \
-    }
-#endif
-
 #define PIN_AD(p_name, p_pin, ad_bit, ad_channel) \
     { \
         { &machine_pin_type }, \
diff --git a/ports/renesas-ra/machine_pin.c b/ports/renesas-ra/machine_pin.c
index e07794e4b25ae..6e852e9cbf1d6 100644
--- a/ports/renesas-ra/machine_pin.c
+++ b/ports/renesas-ra/machine_pin.c
@@ -38,13 +38,7 @@
 #include "pin.h"
 #include "extint.h"
 
-// Pin class variables
-STATIC bool pin_class_debug;
-
 void machine_pin_init(void) {
-    MP_STATE_PORT(pin_class_mapper) = mp_const_none;
-    MP_STATE_PORT(pin_class_map_dict) = mp_const_none;
-    pin_class_debug = false;
 }
 
 void machine_pin_deinit(void) {
@@ -57,72 +51,18 @@ const machine_pin_obj_t *machine_pin_find(mp_obj_t user_obj) {
     // If a pin was provided, then use it
     if (mp_obj_is_type(user_obj, &machine_pin_type)) {
         pin_obj = MP_OBJ_TO_PTR(user_obj);
-        if (pin_class_debug) {
-            printf("Pin map passed pin ");
-            mp_obj_print(MP_OBJ_FROM_PTR(pin_obj), PRINT_STR);
-            printf("\n");
-        }
         return pin_obj;
     }
 
-    if (MP_STATE_PORT(pin_class_mapper) != mp_const_none) {
-        mp_obj_t o = mp_call_function_1(MP_STATE_PORT(pin_class_mapper), user_obj);
-        if (o != mp_const_none) {
-            if (!mp_obj_is_type(o, &machine_pin_type)) {
-                mp_raise_ValueError(MP_ERROR_TEXT("Pin.mapper didn't return a Pin object"));
-            }
-            if (pin_class_debug) {
-                printf("Pin.mapper maps ");
-                mp_obj_print(user_obj, PRINT_REPR);
-                printf(" to ");
-                mp_obj_print(o, PRINT_STR);
-                printf("\n");
-            }
-            return MP_OBJ_TO_PTR(o);
-        }
-        // The pin mapping function returned mp_const_none, fall through to
-        // other lookup methods.
-    }
-
-    if (MP_STATE_PORT(pin_class_map_dict) != mp_const_none) {
-        mp_map_t *pin_map_map = mp_obj_dict_get_map(MP_STATE_PORT(pin_class_map_dict));
-        mp_map_elem_t *elem = mp_map_lookup(pin_map_map, user_obj, MP_MAP_LOOKUP);
-        if (elem != NULL && elem->value != MP_OBJ_NULL) {
-            mp_obj_t o = elem->value;
-            if (pin_class_debug) {
-                printf("Pin.map_dict maps ");
-                mp_obj_print(user_obj, PRINT_REPR);
-                printf(" to ");
-                mp_obj_print(o, PRINT_STR);
-                printf("\n");
-            }
-            return MP_OBJ_TO_PTR(o);
-        }
-    }
-
     // See if the pin name matches a board pin
     pin_obj = pin_find_named_pin(&pin_board_pins_locals_dict, user_obj);
     if (pin_obj) {
-        if (pin_class_debug) {
-            printf("Pin.board maps ");
-            mp_obj_print(user_obj, PRINT_REPR);
-            printf(" to ");
-            mp_obj_print(MP_OBJ_FROM_PTR(pin_obj), PRINT_STR);
-            printf("\n");
-        }
         return pin_obj;
     }
 
     // See if the pin name matches a cpu pin
     pin_obj = pin_find_named_pin(&pin_cpu_pins_locals_dict, user_obj);
     if (pin_obj) {
-        if (pin_class_debug) {
-            printf("Pin.cpu maps ");
-            mp_obj_print(user_obj, PRINT_REPR);
-            printf(" to ");
-            mp_obj_print(MP_OBJ_FROM_PTR(pin_obj), PRINT_STR);
-            printf("\n");
-        }
         return pin_obj;
     }
 
@@ -276,58 +216,6 @@ STATIC mp_obj_t machine_pin_call(mp_obj_t self_in, size_t n_args, size_t n_kw, c
     }
 }
 
-/// \classmethod mapper([fun])
-/// Get or set the pin mapper function.
-STATIC mp_obj_t pin_mapper(size_t n_args, const mp_obj_t *args) {
-    if (n_args > 1) {
-        MP_STATE_PORT(pin_class_mapper) = args[1];
-        return mp_const_none;
-    }
-    return MP_STATE_PORT(pin_class_mapper);
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pin_mapper_fun_obj, 1, 2, pin_mapper);
-STATIC MP_DEFINE_CONST_CLASSMETHOD_OBJ(pin_mapper_obj, MP_ROM_PTR(&pin_mapper_fun_obj));
-
-/// \classmethod dict([dict])
-/// Get or set the pin mapper dictionary.
-STATIC mp_obj_t pin_map_dict(size_t n_args, const mp_obj_t *args) {
-    if (n_args > 1) {
-        MP_STATE_PORT(pin_class_map_dict) = args[1];
-        return mp_const_none;
-    }
-    return MP_STATE_PORT(pin_class_map_dict);
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pin_map_dict_fun_obj, 1, 2, pin_map_dict);
-STATIC MP_DEFINE_CONST_CLASSMETHOD_OBJ(pin_map_dict_obj, MP_ROM_PTR(&pin_map_dict_fun_obj));
-
-#if 0
-/// \classmethod af_list()
-/// Returns an array of alternate functions available for this pin.
-STATIC mp_obj_t pin_af_list(mp_obj_t self_in) {
-    machine_pin_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    mp_obj_t result = mp_obj_new_list(0, NULL);
-
-    const pin_af_obj_t *af = self->af;
-    for (mp_uint_t i = 0; i < self->num_af; i++, af++) {
-        mp_obj_list_append(result, MP_OBJ_FROM_PTR(af));
-    }
-    return result;
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(pin_af_list_obj, pin_af_list);
-#endif
-
-/// \classmethod debug([state])
-/// Get or set the debugging state (`True` or `False` for on or off).
-STATIC mp_obj_t pin_debug(size_t n_args, const mp_obj_t *args) {
-    if (n_args > 1) {
-        pin_class_debug = mp_obj_is_true(args[1]);
-        return mp_const_none;
-    }
-    return mp_obj_new_bool(pin_class_debug);
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pin_debug_fun_obj, 1, 2, pin_debug);
-STATIC MP_DEFINE_CONST_CLASSMETHOD_OBJ(pin_debug_obj, MP_ROM_PTR(&pin_debug_fun_obj));
-
 // pin.init(mode, pull)
 STATIC mp_obj_t machine_pin_obj_init(size_t n_args, const mp_obj_t *args, mp_map_t *kw_args) {
     return machine_pin_obj_init_helper(args[0], n_args - 1, args + 1, kw_args);
@@ -356,33 +244,6 @@ STATIC mp_obj_t machine_pin_high(mp_obj_t self_in) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_pin_high_obj, machine_pin_high);
 
-// pin.mode()
-STATIC mp_obj_t machine_pin_mode(mp_obj_t self_in) {
-    return MP_OBJ_NEW_SMALL_INT(pin_get_mode(MP_OBJ_TO_PTR(self_in)));
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_pin_mode_obj, machine_pin_mode);
-
-// pin.pull()
-STATIC mp_obj_t machine_pin_pull(mp_obj_t self_in) {
-    return MP_OBJ_NEW_SMALL_INT(pin_get_pull(MP_OBJ_TO_PTR(self_in)));
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_pin_pull_obj, machine_pin_pull);
-
-// pin.drive()
-STATIC mp_obj_t machine_pin_drive(mp_obj_t self_in) {
-    mp_raise_NotImplementedError(MP_ERROR_TEXT("Pin.drive() is not supported yet"));
-    return mp_const_none;
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_pin_drive_obj, machine_pin_drive);
-
-// pin.toggle()
-STATIC mp_obj_t machine_pin_toggle(mp_obj_t self_in) {
-    machine_pin_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    mp_hal_pin_toggle(self);
-    return mp_const_none;
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_pin_toggle_obj, machine_pin_toggle);
-
 // pin.irq(handler=None, trigger=IRQ_FALLING|IRQ_RISING, hard=False)
 STATIC mp_obj_t machine_pin_irq(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_handler, ARG_trigger, ARG_hard };
@@ -406,15 +267,6 @@ STATIC mp_obj_t machine_pin_irq(size_t n_args, const mp_obj_t *pos_args, mp_map_
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_KW(machine_pin_irq_obj, 1, machine_pin_irq);
 
-/// \method af()
-/// Returns the currently configured alternate-function of the pin. The
-/// integer returned will match one of the allowed constants for the af
-/// argument to the init function.
-STATIC mp_obj_t machine_pin_af(mp_obj_t self_in) {
-    return MP_OBJ_NEW_SMALL_INT(pin_get_af(MP_OBJ_TO_PTR(self_in)));
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_pin_af_obj, machine_pin_af);
-
 STATIC const mp_rom_map_elem_t machine_pin_locals_dict_table[] = {
     // instance methods
     { MP_ROM_QSTR(MP_QSTR_init), MP_ROM_PTR(&machine_pin_init_obj) },
@@ -424,25 +276,11 @@ STATIC const mp_rom_map_elem_t machine_pin_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_irq), MP_ROM_PTR(&machine_pin_irq_obj) },
     { MP_ROM_QSTR(MP_QSTR_low), MP_ROM_PTR(&machine_pin_low_obj) },
     { MP_ROM_QSTR(MP_QSTR_high), MP_ROM_PTR(&machine_pin_high_obj) },
-    { MP_ROM_QSTR(MP_QSTR_mode), MP_ROM_PTR(&machine_pin_mode_obj) },
-    { MP_ROM_QSTR(MP_QSTR_pull), MP_ROM_PTR(&machine_pin_pull_obj) },
-    { MP_ROM_QSTR(MP_QSTR_drive), MP_ROM_PTR(&machine_pin_drive_obj) },
-    { MP_ROM_QSTR(MP_QSTR_toggle), MP_ROM_PTR(&machine_pin_toggle_obj) },
-    #if 0
-    { MP_ROM_QSTR(MP_QSTR_af_list), MP_ROM_PTR(&pin_af_list) },
-    #endif
-    { MP_ROM_QSTR(MP_QSTR_af),      MP_ROM_PTR(&machine_pin_af_obj) },
-
-    // class methods
-    { MP_ROM_QSTR(MP_QSTR_mapper),  MP_ROM_PTR(&pin_mapper_obj) },
-    { MP_ROM_QSTR(MP_QSTR_dict),    MP_ROM_PTR(&pin_map_dict_obj) },
-    { MP_ROM_QSTR(MP_QSTR_debug),   MP_ROM_PTR(&pin_debug_obj) },
 
     // class attributes
     { MP_ROM_QSTR(MP_QSTR_board),   MP_ROM_PTR(&pin_board_pins_obj_type) },
     { MP_ROM_QSTR(MP_QSTR_cpu),     MP_ROM_PTR(&pin_cpu_pins_obj_type) },
 
-
     // class constants
     { MP_ROM_QSTR(MP_QSTR_IN), MP_ROM_INT(GPIO_MODE_INPUT) },
     { MP_ROM_QSTR(MP_QSTR_OUT), MP_ROM_INT(GPIO_MODE_OUTPUT_PP) },
@@ -547,16 +385,6 @@ const machine_pin_obj_t *pin_find_named_pin(const mp_obj_dict_t *named_pins, mp_
     return NULL;
 }
 
-const pin_af_obj_t *pin_find_af(const machine_pin_obj_t *pin, uint8_t fn, uint8_t unit) {
-    const pin_af_obj_t *af = pin->af;
-    for (mp_uint_t i = 0; i < pin->num_af; i++, af++) {
-        if (af->fn == fn && af->unit == unit) {
-            return af;
-        }
-    }
-    return NULL;
-}
-
 const pin_af_obj_t *pin_find_af_by_index(const machine_pin_obj_t *pin, mp_uint_t af_idx) {
     const pin_af_obj_t *af = pin->af;
     for (mp_uint_t i = 0; i < pin->num_af; i++, af++) {
@@ -566,77 +394,3 @@ const pin_af_obj_t *pin_find_af_by_index(const machine_pin_obj_t *pin, mp_uint_t
     }
     return NULL;
 }
-
-// ====================================================================
-// PinAF
-// ====================================================================
-
-/// \moduleref pyb
-/// \class PinAF - Pin Alternate Functions
-///
-/// A Pin represents a physical pin on the microcprocessor. Each pin
-/// can have a variety of functions (GPIO, I2C SDA, etc). Each PinAF
-/// object represents a particular function for a pin.
-///
-/// Usage Model:
-///
-///     x3 = pyb.Pin.board.X3
-///     x3_af = x3.af_list()
-///
-/// x3_af will now contain an array of PinAF objects which are availble on
-/// pin X3.
-///
-/// For the pyboard, x3_af would contain:
-///     [Pin.AF1_TIM2, Pin.AF2_TIM5, Pin.AF3_TIM9, Pin.AF7_USART2]
-///
-/// Normally, each peripheral would configure the af automatically, but sometimes
-/// the same function is available on multiple pins, and having more control
-/// is desired.
-///
-/// To configure X3 to expose TIM2_CH3, you could use:
-///    pin = pyb.Pin(pyb.Pin.board.X3, mode=pyb.Pin.AF_PP, af=pyb.Pin.AF1_TIM2)
-/// or:
-///    pin = pyb.Pin(pyb.Pin.board.X3, mode=pyb.Pin.AF_PP, af=1)
-
-/// \method __str__()
-/// Return a string describing the alternate function.
-STATIC void pin_af_obj_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
-    pin_af_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    mp_printf(print, "Pin.%q", self->name);
-}
-
-/// \method index()
-/// Return the alternate function index.
-STATIC mp_obj_t pin_af_index(mp_obj_t self_in) {
-    pin_af_obj_t *af = MP_OBJ_TO_PTR(self_in);
-    return MP_OBJ_NEW_SMALL_INT(af->idx);
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(pin_af_index_obj, pin_af_index);
-
-/// \method name()
-/// Return the name of the alternate function.
-STATIC mp_obj_t pin_af_name(mp_obj_t self_in) {
-    pin_af_obj_t *af = MP_OBJ_TO_PTR(self_in);
-    return MP_OBJ_NEW_QSTR(af->name);
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(pin_af_name_obj, pin_af_name);
-
-STATIC mp_obj_t pin_af_reg(mp_obj_t self_in) {
-    pin_af_obj_t *af = MP_OBJ_TO_PTR(self_in);
-    return MP_OBJ_NEW_SMALL_INT((uintptr_t)af->reg);
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(pin_af_reg_obj, pin_af_reg);
-
-STATIC const mp_rom_map_elem_t pin_af_locals_dict_table[] = {
-    { MP_ROM_QSTR(MP_QSTR_index), MP_ROM_PTR(&pin_af_index_obj) },
-    { MP_ROM_QSTR(MP_QSTR_name), MP_ROM_PTR(&pin_af_name_obj) },
-    { MP_ROM_QSTR(MP_QSTR_reg), MP_ROM_PTR(&pin_af_reg_obj) },
-};
-STATIC MP_DEFINE_CONST_DICT(pin_af_locals_dict, pin_af_locals_dict_table);
-
-const mp_obj_type_t pin_af_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_PinAF,
-    .print = pin_af_obj_print,
-    .locals_dict = (mp_obj_dict_t *)&pin_af_locals_dict,
-};
diff --git a/ports/renesas-ra/mpconfigport.h b/ports/renesas-ra/mpconfigport.h
index 02292a1188411..64caa69fd26a4 100644
--- a/ports/renesas-ra/mpconfigport.h
+++ b/ports/renesas-ra/mpconfigport.h
@@ -176,9 +176,6 @@
     \
     mp_obj_t pyb_switch_callback; \
     \
-    mp_obj_t pin_class_mapper; \
-    mp_obj_t pin_class_map_dict; \
-    \
     mp_obj_t pyb_extint_callback[PYB_EXTI_NUM_VECTORS]; \
     \
     /* pointers to all Timer objects (if they have been created) */ \

From 19c680ff579c5d250d8929959b392f236286bb66 Mon Sep 17 00:00:00 2001
From: Takeo Takahashi <takeo.takahashi.xv@renesas.com>
Date: Mon, 30 May 2022 11:53:01 +0900
Subject: [PATCH 2129/3533] test/renesas-ra: Remove unsupported feature test of
 Pin.

Signed-off-by: Takeo Takahashi <takeo.takahashi.xv@renesas.com>
---
 tests/renesas-ra/pin.py | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/tests/renesas-ra/pin.py b/tests/renesas-ra/pin.py
index 32bad5dfe6f87..61d76cca7c748 100644
--- a/tests/renesas-ra/pin.py
+++ b/tests/renesas-ra/pin.py
@@ -17,14 +17,6 @@
     print("exp: " + try_s)
     print("out: " + str(p))
 
-p = Pin("SW1", Pin.IN, Pin.PULL_UP)
-if p.mode() != 1:
-    print("mode: NG")
-p = Pin("SW1", Pin.IN, pull=Pin.PULL_UP)
-if p.pull() != 14:
-    print("pull: NG")
-p = Pin("SW1", mode=Pin.IN, pull=Pin.PULL_UP)
-
 p.init(p.IN, p.PULL_UP)
 p.init(p.IN, pull=p.PULL_UP)
 p.init(mode=p.IN, pull=p.PULL_UP)

From 91fb9e7888d5babb6e52427eeb67fcd052a30a10 Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Wed, 25 May 2022 12:41:51 +1000
Subject: [PATCH 2130/3533] extmod/nimble: Add support for reading whole HCI
 UART packets.

This can improve efficiency for Bluetooth systems that already process
whole packets at the lower layers.
---
 extmod/mpbthci.h             | 11 ++++++++++-
 extmod/nimble/hal/hal_uart.c | 27 ++++++++++++++++++++++-----
 2 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/extmod/mpbthci.h b/extmod/mpbthci.h
index 699723803357b..c10f99c3dfd7c 100644
--- a/extmod/mpbthci.h
+++ b/extmod/mpbthci.h
@@ -27,6 +27,9 @@
 #ifndef MICROPY_INCLUDED_EXTMOD_MPBTHCI_H
 #define MICROPY_INCLUDED_EXTMOD_MPBTHCI_H
 
+#define MICROPY_PY_BLUETOOTH_HCI_READ_MODE_BYTE  (0)
+#define MICROPY_PY_BLUETOOTH_HCI_READ_MODE_PACKET  (1)
+
 // --- Optionally can be implemented by the driver. ---------------------------
 
 // Start/stop the HCI controller.
@@ -46,7 +49,13 @@ int mp_bluetooth_hci_uart_init(uint32_t port, uint32_t baudrate);
 int mp_bluetooth_hci_uart_deinit(void);
 int mp_bluetooth_hci_uart_set_baudrate(uint32_t baudrate);
 int mp_bluetooth_hci_uart_any(void);
-int mp_bluetooth_hci_uart_readchar(void);
 int mp_bluetooth_hci_uart_write(const uint8_t *buf, size_t len);
 
+// Used for mode: MICROPY_PY_BLUETOOTH_HCI_READ_MODE_BYTE
+int mp_bluetooth_hci_uart_readchar(void);
+
+// Used for mode: MICROPY_PY_BLUETOOTH_HCI_READ_MODE_PACKET
+typedef void (*mp_bluetooth_hci_uart_readchar_t)(uint8_t chr);
+int mp_bluetooth_hci_uart_readpacket(mp_bluetooth_hci_uart_readchar_t handler);
+
 #endif // MICROPY_INCLUDED_EXTMOD_MPBTHCI_H
diff --git a/extmod/nimble/hal/hal_uart.c b/extmod/nimble/hal/hal_uart.c
index 84a964fde9ebc..6c17da0860714 100644
--- a/extmod/nimble/hal/hal_uart.c
+++ b/extmod/nimble/hal/hal_uart.c
@@ -34,6 +34,10 @@
 
 #if MICROPY_PY_BLUETOOTH && MICROPY_BLUETOOTH_NIMBLE
 
+#ifndef MICROPY_PY_BLUETOOTH_HCI_READ_MODE
+#define MICROPY_PY_BLUETOOTH_HCI_READ_MODE MICROPY_PY_BLUETOOTH_HCI_READ_MODE_BYTE
+#endif
+
 #define HCI_TRACE (0)
 
 static hal_uart_tx_cb_t hal_uart_tx_cb;
@@ -86,15 +90,28 @@ int hal_uart_close(uint32_t port) {
     return 0; // success
 }
 
+STATIC void mp_bluetooth_hci_uart_char_cb(uint8_t chr) {
+    #if HCI_TRACE
+    printf("> %02x\n", chr);
+    #endif
+    hal_uart_rx_cb(hal_uart_rx_arg, chr);
+}
+
 void mp_bluetooth_nimble_hci_uart_process(bool run_events) {
     bool host_wake = mp_bluetooth_hci_controller_woken();
 
-    int chr;
-    while ((chr = mp_bluetooth_hci_uart_readchar()) >= 0) {
-        #if HCI_TRACE
-        printf("> %02x\n", chr);
+    for (;;) {
+        #if MICROPY_PY_BLUETOOTH_HCI_READ_MODE == MICROPY_PY_BLUETOOTH_HCI_READ_MODE_BYTE
+        int chr = mp_bluetooth_hci_uart_readchar();
+        if (chr < 0) {
+            break;
+        }
+        mp_bluetooth_hci_uart_char_cb(chr);
+        #elif MICROPY_PY_BLUETOOTH_HCI_READ_MODE == MICROPY_PY_BLUETOOTH_HCI_READ_MODE_PACKET
+        if (mp_bluetooth_hci_uart_readpacket(mp_bluetooth_hci_uart_char_cb) < 0) {
+            break;
+        }
         #endif
-        hal_uart_rx_cb(hal_uart_rx_arg, chr);
 
         // Incoming data may result in events being enqueued. If we're in
         // scheduler context then we can run those events immediately.

From 8fb01be6cf33ffd20f9de935dec221fe11b0f609 Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Wed, 25 May 2022 12:41:51 +1000
Subject: [PATCH 2131/3533] stm32/rfcore: Remove extra layer of buffering on
 BLE IPCC.

Whole packets are now pushed up to the higher layer of the BLE stack,
instead of buffering the packets so individual bytes can be requested.
---
 ports/stm32/mpbthciport.c  | 35 +++++++++--------------------------
 ports/stm32/mpconfigport.h |  6 ++++++
 ports/stm32/rfcore.c       | 19 ++++++++++++-------
 ports/stm32/rfcore.h       |  4 +++-
 4 files changed, 30 insertions(+), 34 deletions(-)

diff --git a/ports/stm32/mpbthciport.c b/ports/stm32/mpbthciport.c
index 89b04a5405caf..d3ddb40421e56 100644
--- a/ports/stm32/mpbthciport.c
+++ b/ports/stm32/mpbthciport.c
@@ -24,6 +24,7 @@
  * THE SOFTWARE.
  */
 
+#include <stdio.h>
 #include "py/runtime.h"
 #include "py/mphal.h"
 #include "extmod/mpbthci.h"
@@ -99,10 +100,6 @@ void mp_bluetooth_hci_poll_now_default(void) {
 #include <string.h>
 #include "rfcore.h"
 
-STATIC uint16_t hci_uart_rx_buf_cur;
-STATIC uint16_t hci_uart_rx_buf_len;
-STATIC uint8_t hci_uart_rx_buf_data[256];
-
 int mp_bluetooth_hci_uart_init(uint32_t port, uint32_t baudrate) {
     (void)port;
     (void)baudrate;
@@ -110,8 +107,6 @@ int mp_bluetooth_hci_uart_init(uint32_t port, uint32_t baudrate) {
     DEBUG_printf("mp_bluetooth_hci_uart_init (stm32 rfcore)\n");
 
     rfcore_ble_init();
-    hci_uart_rx_buf_cur = 0;
-    hci_uart_rx_buf_len = 0;
 
     // Start the HCI polling to process any initial events/packets.
     mp_bluetooth_hci_start_polling();
@@ -137,29 +132,17 @@ int mp_bluetooth_hci_uart_write(const uint8_t *buf, size_t len) {
     return 0;
 }
 
-// Callback to copy data into local hci_uart_rx_buf_data buffer for subsequent use.
-STATIC int mp_bluetooth_hci_uart_msg_cb(void *env, const uint8_t *buf, size_t len) {
-    (void)env;
-    if (hci_uart_rx_buf_len + len > MP_ARRAY_SIZE(hci_uart_rx_buf_data)) {
-        len = MP_ARRAY_SIZE(hci_uart_rx_buf_data) - hci_uart_rx_buf_len;
+// Callback to forward data from rfcore to the bluetooth hci handler.
+STATIC void mp_bluetooth_hci_uart_msg_cb(void *env, const uint8_t *buf, size_t len) {
+    mp_bluetooth_hci_uart_readchar_t handler = (mp_bluetooth_hci_uart_readchar_t)env;
+    for (size_t i = 0; i < len; ++i) {
+        handler(buf[i]);
     }
-    memcpy(hci_uart_rx_buf_data + hci_uart_rx_buf_len, buf, len);
-    hci_uart_rx_buf_len += len;
-    return 0;
 }
 
-int mp_bluetooth_hci_uart_readchar(void) {
-    if (hci_uart_rx_buf_cur >= hci_uart_rx_buf_len) {
-        hci_uart_rx_buf_cur = 0;
-        hci_uart_rx_buf_len = 0;
-        rfcore_ble_check_msg(mp_bluetooth_hci_uart_msg_cb, NULL);
-    }
-
-    if (hci_uart_rx_buf_cur < hci_uart_rx_buf_len) {
-        return hci_uart_rx_buf_data[hci_uart_rx_buf_cur++];
-    } else {
-        return -1;
-    }
+int mp_bluetooth_hci_uart_readpacket(mp_bluetooth_hci_uart_readchar_t handler) {
+    size_t len = rfcore_ble_check_msg(mp_bluetooth_hci_uart_msg_cb, (void *)handler);
+    return (len > 0) ? len : -1;
 }
 
 #else
diff --git a/ports/stm32/mpconfigport.h b/ports/stm32/mpconfigport.h
index 00b60b983324e..eb2344d073f5f 100644
--- a/ports/stm32/mpconfigport.h
+++ b/ports/stm32/mpconfigport.h
@@ -384,6 +384,12 @@ static inline mp_uint_t disable_irq(void) {
 #define MICROPY_PY_BLUETOOTH_EXIT  MICROPY_PY_PENDSV_EXIT
 #endif
 
+#if defined(STM32WB)
+#define MICROPY_PY_BLUETOOTH_HCI_READ_MODE MICROPY_PY_BLUETOOTH_HCI_READ_MODE_PACKET
+#else
+#define MICROPY_PY_BLUETOOTH_HCI_READ_MODE MICROPY_PY_BLUETOOTH_HCI_READ_MODE_BYTE
+#endif
+
 // We need an implementation of the log2 function which is not a macro
 #define MP_NEED_LOG2 (1)
 
diff --git a/ports/stm32/rfcore.c b/ports/stm32/rfcore.c
index 302f55d7e20d4..55d6d17ad1b12 100644
--- a/ports/stm32/rfcore.c
+++ b/ports/stm32/rfcore.c
@@ -105,7 +105,7 @@ typedef struct _tl_list_node_t {
 } tl_list_node_t;
 
 typedef struct _parse_hci_info_t {
-    int (*cb_fun)(void *, const uint8_t *, size_t);
+    rfcore_ble_msg_callback_t cb_fun;
     void *cb_env;
     bool was_hci_reset_evt;
 } parse_hci_info_t;
@@ -408,11 +408,12 @@ STATIC size_t tl_parse_hci_msg(const uint8_t *buf, parse_hci_info_t *parse) {
     return len;
 }
 
-STATIC void tl_process_msg(volatile tl_list_node_t *head, unsigned int ch, parse_hci_info_t *parse) {
+STATIC size_t tl_process_msg(volatile tl_list_node_t *head, unsigned int ch, parse_hci_info_t *parse) {
     volatile tl_list_node_t *cur = head->next;
     bool added_to_free_queue = false;
+    size_t len = 0;
     while (cur != head) {
-        tl_parse_hci_msg((uint8_t *)cur->body, parse);
+        len += tl_parse_hci_msg((uint8_t *)cur->body, parse);
 
         volatile tl_list_node_t *next = tl_list_unlink(cur);
 
@@ -436,13 +437,15 @@ STATIC void tl_process_msg(volatile tl_list_node_t *head, unsigned int ch, parse
         // Notify change in free pool.
         LL_C1_IPCC_SetFlag_CHx(IPCC, IPCC_CH_MM);
     }
+    return len;
 }
 
 // Only call this when IRQs are disabled on this channel.
-STATIC void tl_check_msg(volatile tl_list_node_t *head, unsigned int ch, parse_hci_info_t *parse) {
+STATIC size_t tl_check_msg(volatile tl_list_node_t *head, unsigned int ch, parse_hci_info_t *parse) {
+    size_t len = 0;
     if (LL_C2_IPCC_IsActiveFlag_CHx(IPCC, ch)) {
         // Process new data.
-        tl_process_msg(head, ch, parse);
+        len = tl_process_msg(head, ch, parse);
 
         // Clear receive channel (allows RF core to send more data to us).
         LL_C1_IPCC_ClearFlag_CHx(IPCC, ch);
@@ -452,6 +455,7 @@ STATIC void tl_check_msg(volatile tl_list_node_t *head, unsigned int ch, parse_h
             LL_C1_IPCC_EnableReceiveChannel(IPCC, IPCC_CH_BLE);
         }
     }
+    return len;
 }
 
 STATIC void tl_hci_cmd(uint8_t *cmd, unsigned int ch, uint8_t hdr, uint16_t opcode, const uint8_t *buf, size_t len) {
@@ -643,9 +647,9 @@ void rfcore_ble_hci_cmd(size_t len, const uint8_t *src) {
     LL_C1_IPCC_SetFlag_CHx(IPCC, ch);
 }
 
-void rfcore_ble_check_msg(int (*cb)(void *, const uint8_t *, size_t), void *env) {
+size_t rfcore_ble_check_msg(rfcore_ble_msg_callback_t cb, void *env) {
     parse_hci_info_t parse = { cb, env, false };
-    tl_check_msg(&ipcc_mem_ble_evt_queue, IPCC_CH_BLE, &parse);
+    size_t len = tl_check_msg(&ipcc_mem_ble_evt_queue, IPCC_CH_BLE, &parse);
 
     // Intercept HCI_Reset events and reconfigure the controller following the reset
     if (parse.was_hci_reset_evt) {
@@ -660,6 +664,7 @@ void rfcore_ble_check_msg(int (*cb)(void *, const uint8_t *, size_t), void *env)
         SWAP_UINT8(buf[4], buf[5]);
         tl_ble_hci_cmd_resp(HCI_OPCODE(OGF_VENDOR, OCF_WRITE_CONFIG), buf, 8); // set BDADDR
     }
+    return len;
 }
 
 // "level" is 0x00-0x1f, ranging from -40 dBm to +6 dBm (not linear).
diff --git a/ports/stm32/rfcore.h b/ports/stm32/rfcore.h
index fe29ac612ccc6..5c67f194e2e27 100644
--- a/ports/stm32/rfcore.h
+++ b/ports/stm32/rfcore.h
@@ -28,11 +28,13 @@
 
 #include <stdint.h>
 
+typedef void (*rfcore_ble_msg_callback_t)(void *, const uint8_t *, size_t);
+
 void rfcore_init(void);
 
 void rfcore_ble_init(void);
 void rfcore_ble_hci_cmd(size_t len, const uint8_t *src);
-void rfcore_ble_check_msg(int (*cb)(void *, const uint8_t *, size_t), void *env);
+size_t rfcore_ble_check_msg(rfcore_ble_msg_callback_t cb, void *env);
 void rfcore_ble_set_txpower(uint8_t level);
 
 void rfcore_start_flash_erase(void);

From 13f5d38f2eadcdf1199fe401fef6473ad0a1828b Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Sun, 3 Apr 2022 09:36:10 +1000
Subject: [PATCH 2132/3533] nrf/mpconfigport: Set MICROPY_CONFIG_ROM_LEVEL
 defines for each MCU.

This commit is a no-op change to simplify existing config.
---
 ports/nrf/mpconfigdevice_nrf51822.h |  97 ------------------
 ports/nrf/mpconfigdevice_nrf52832.h |  65 ------------
 ports/nrf/mpconfigdevice_nrf52840.h |  75 --------------
 ports/nrf/mpconfigdevice_nrf9160.h  |  75 --------------
 ports/nrf/mpconfigport.h            | 147 ++++++++++++++++++++++++++--
 ports/nrf/nrfx_config.h             |   2 +-
 6 files changed, 138 insertions(+), 323 deletions(-)
 delete mode 100644 ports/nrf/mpconfigdevice_nrf51822.h
 delete mode 100644 ports/nrf/mpconfigdevice_nrf52832.h
 delete mode 100644 ports/nrf/mpconfigdevice_nrf52840.h
 delete mode 100644 ports/nrf/mpconfigdevice_nrf9160.h

diff --git a/ports/nrf/mpconfigdevice_nrf51822.h b/ports/nrf/mpconfigdevice_nrf51822.h
deleted file mode 100644
index 67a81d2509894..0000000000000
--- a/ports/nrf/mpconfigdevice_nrf51822.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2020 Glenn Ruben Bakke
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-// Board overridable build configuration.
-
-#ifndef MICROPY_MBFS
-#if defined(BLUETOOTH_SD)
-#define MICROPY_MBFS                       (1)
-#else
-#define MICROPY_MBFS                       (0)
-#endif
-#endif
-
-#ifndef MICROPY_VFS
-#if defined(BLUETOOTH_SD)
-#define MICROPY_VFS                        (0)
-#else
-#define MICROPY_VFS                        (1)
-#endif
-#endif
-
-// Board overridable feature configuration.
-
-#ifndef MICROPY_ENABLE_SOURCE_LINE
-#if defined(BLUETOOTH_SD)
-#define MICROPY_ENABLE_SOURCE_LINE         (0)
-#else
-#define MICROPY_ENABLE_SOURCE_LINE         (1)
-#endif
-#endif
-
-#ifndef MICROPY_PY_ARRAY_SLICE_ASSIGN
-#if defined(BLUETOOTH_SD)
-#define MICROPY_PY_ARRAY_SLICE_ASSIGN      (0)
-#else
-#define MICROPY_PY_ARRAY_SLICE_ASSIGN      (1)
-#endif
-#endif
-
-#ifndef MICROPY_PY_SYS_STDFILES
-#if defined(BLUETOOTH_SD)
-#define MICROPY_PY_SYS_STDFILES            (0)
-#else
-#define MICROPY_PY_SYS_STDFILES            (1)
-#endif
-#endif
-
-#ifndef MICROPY_PY_UBINASCII
-#if defined(BLUETOOTH_SD)
-#define MICROPY_PY_UBINASCII               (0)
-#else
-#define MICROPY_PY_UBINASCII               (1)
-#endif
-#endif
-
-// Board overridable port specific feature configuration.
-
-#ifndef MICROPY_PY_NRF
-#if defined(BLUETOOTH_SD)
-#define MICROPY_PY_NRF                     (0)
-#else
-#define MICROPY_PY_NRF                     (1)
-#endif
-#endif
-
-// Board overridable hardware configuration.
-
-#ifndef MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE
-#if defined(BLUETOOTH_SD)
-#define MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE (0)
-#else
-#define MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE (1)
-#endif
-#endif
diff --git a/ports/nrf/mpconfigdevice_nrf52832.h b/ports/nrf/mpconfigdevice_nrf52832.h
deleted file mode 100644
index fa9258f2ac03c..0000000000000
--- a/ports/nrf/mpconfigdevice_nrf52832.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2020 Glenn Ruben Bakke
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-// Board overridable build configuration.
-
-#ifndef MICROPY_MBFS
-#define MICROPY_MBFS                       (0)
-#endif
-
-#ifndef MICROPY_VFS
-#define MICROPY_VFS                        (1)
-#endif
-
-// Board overridable feature configuration.
-
-#ifndef MICROPY_ENABLE_SOURCE_LINE
-#define MICROPY_ENABLE_SOURCE_LINE         (1)
-#endif
-
-#ifndef MICROPY_PY_ARRAY_SLICE_ASSIGN
-#define MICROPY_PY_ARRAY_SLICE_ASSIGN      (1)
-#endif
-
-#ifndef MICROPY_PY_SYS_STDFILES
-#define MICROPY_PY_SYS_STDFILES            (1)
-#endif
-
-#ifndef MICROPY_PY_UBINASCII
-#define MICROPY_PY_UBINASCII               (1)
-#endif
-
-// Board overridable port specific feature configuration.
-
-#ifndef MICROPY_PY_NRF
-#define MICROPY_PY_NRF                     (1)
-#endif
-
-// Board overridable hardware configuration.
-
-#ifndef MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE
-#define MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE (1)
-#endif
diff --git a/ports/nrf/mpconfigdevice_nrf52840.h b/ports/nrf/mpconfigdevice_nrf52840.h
deleted file mode 100644
index 581c52ea81159..0000000000000
--- a/ports/nrf/mpconfigdevice_nrf52840.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2020 Glenn Ruben Bakke
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-// Board overridable build configuration.
-
-#ifndef MICROPY_MBFS
-#define MICROPY_MBFS                       (0)
-#endif
-
-#ifndef MICROPY_VFS
-#define MICROPY_VFS                        (1)
-#endif
-
-// Board overridable emitter configuration.
-
-#ifndef MICROPY_EMIT_THUMB
-#define MICROPY_EMIT_THUMB          (1)
-#endif
-
-#ifndef MICROPY_EMIT_INLINE_THUMB
-#define MICROPY_EMIT_INLINE_THUMB   (1)
-#endif
-
-// Board overridable feature configuration.
-
-#ifndef MICROPY_ENABLE_SOURCE_LINE
-#define MICROPY_ENABLE_SOURCE_LINE         (1)
-#endif
-
-#ifndef MICROPY_PY_ARRAY_SLICE_ASSIGN
-#define MICROPY_PY_ARRAY_SLICE_ASSIGN      (1)
-#endif
-
-#ifndef MICROPY_PY_SYS_STDFILES
-#define MICROPY_PY_SYS_STDFILES            (1)
-#endif
-
-#ifndef MICROPY_PY_UBINASCII
-#define MICROPY_PY_UBINASCII               (1)
-#endif
-
-// Board overridable port specific feature configuration.
-
-#ifndef MICROPY_PY_NRF
-#define MICROPY_PY_NRF                     (1)
-#endif
-
-// Board overridable hardware configuration.
-
-#ifndef MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE
-#define MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE (1)
-#endif
diff --git a/ports/nrf/mpconfigdevice_nrf9160.h b/ports/nrf/mpconfigdevice_nrf9160.h
deleted file mode 100644
index 581c52ea81159..0000000000000
--- a/ports/nrf/mpconfigdevice_nrf9160.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2020 Glenn Ruben Bakke
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-// Board overridable build configuration.
-
-#ifndef MICROPY_MBFS
-#define MICROPY_MBFS                       (0)
-#endif
-
-#ifndef MICROPY_VFS
-#define MICROPY_VFS                        (1)
-#endif
-
-// Board overridable emitter configuration.
-
-#ifndef MICROPY_EMIT_THUMB
-#define MICROPY_EMIT_THUMB          (1)
-#endif
-
-#ifndef MICROPY_EMIT_INLINE_THUMB
-#define MICROPY_EMIT_INLINE_THUMB   (1)
-#endif
-
-// Board overridable feature configuration.
-
-#ifndef MICROPY_ENABLE_SOURCE_LINE
-#define MICROPY_ENABLE_SOURCE_LINE         (1)
-#endif
-
-#ifndef MICROPY_PY_ARRAY_SLICE_ASSIGN
-#define MICROPY_PY_ARRAY_SLICE_ASSIGN      (1)
-#endif
-
-#ifndef MICROPY_PY_SYS_STDFILES
-#define MICROPY_PY_SYS_STDFILES            (1)
-#endif
-
-#ifndef MICROPY_PY_UBINASCII
-#define MICROPY_PY_UBINASCII               (1)
-#endif
-
-// Board overridable port specific feature configuration.
-
-#ifndef MICROPY_PY_NRF
-#define MICROPY_PY_NRF                     (1)
-#endif
-
-// Board overridable hardware configuration.
-
-#ifndef MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE
-#define MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE (1)
-#endif
diff --git a/ports/nrf/mpconfigport.h b/ports/nrf/mpconfigport.h
index 874748c2e4943..00ec956d1369b 100644
--- a/ports/nrf/mpconfigport.h
+++ b/ports/nrf/mpconfigport.h
@@ -26,22 +26,79 @@
 
 #include <mpconfigboard.h>
 
+#ifndef MICROPY_CONFIG_ROM_LEVEL
+
+// Set default feature levels for each processor
+
 #if defined(NRF51822)
-  #include "mpconfigdevice_nrf51822.h"
+#if defined(BLUETOOTH_SD)
+// If SoftDevice is used there is less flash/ram available for application
+#define MICROPY_CONFIG_ROM_LEVEL (MICROPY_CONFIG_ROM_LEVEL_MINIMUM)
+#else
+#define MICROPY_CONFIG_ROM_LEVEL (MICROPY_CONFIG_ROM_LEVEL_CORE_FEATURES)
+#endif
+
 #elif defined(NRF52832)
-  #include "mpconfigdevice_nrf52832.h"
+  #define MICROPY_CONFIG_ROM_LEVEL (MICROPY_CONFIG_ROM_LEVEL_BASIC_FEATURES)
+
 #elif defined(NRF52840)
-  #include "mpconfigdevice_nrf52840.h"
+#define MICROPY_CONFIG_ROM_LEVEL (MICROPY_CONFIG_ROM_LEVEL_EXTRA_FEATURES)
+
 #elif defined(NRF9160)
-  #include "mpconfigdevice_nrf9160.h"
+#define MICROPY_CONFIG_ROM_LEVEL (MICROPY_CONFIG_ROM_LEVEL_EXTRA_FEATURES)
+
 #else
   #pragma error "Device not defined"
 #endif
 
+#endif // MICROPY_CONFIG_ROM_LEVEL
+
+// pre-defined shortcuts to use below in #if queries or define values
+#define CORE_FEAT (MICROPY_CONFIG_ROM_LEVEL >= MICROPY_CONFIG_ROM_LEVEL_CORE_FEATURES)
+#define EXTRA_FEAT (MICROPY_CONFIG_ROM_LEVEL >= MICROPY_CONFIG_ROM_LEVEL_EXTRA_FEATURES)
+
 // options to control how MicroPython is built
+
 #ifndef MICROPY_VFS
-#define MICROPY_VFS                 (0)
+#define MICROPY_VFS                        (CORE_FEAT)
 #endif
+
+#ifndef MICROPY_MBFS
+#define MICROPY_MBFS                       (!MICROPY_VFS)
+#endif
+
+#ifndef MICROPY_ENABLE_SOURCE_LINE
+#define MICROPY_ENABLE_SOURCE_LINE         (CORE_FEAT)
+#endif
+
+#ifndef MICROPY_PY_ARRAY_SLICE_ASSIGN
+#define MICROPY_PY_ARRAY_SLICE_ASSIGN      (CORE_FEAT)
+#endif
+
+#ifndef MICROPY_PY_SYS_STDFILES
+#define MICROPY_PY_SYS_STDFILES            (CORE_FEAT)
+#endif
+
+#ifndef MICROPY_PY_UBINASCII
+#define MICROPY_PY_UBINASCII               (CORE_FEAT)
+#endif
+
+#ifndef MICROPY_PY_NRF
+#define MICROPY_PY_NRF                     (CORE_FEAT)
+#endif
+
+#ifndef MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE
+#define MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE (CORE_FEAT)
+#endif
+
+#ifndef MICROPY_EMIT_THUMB
+#define MICROPY_EMIT_THUMB          (EXTRA_FEAT)
+#endif
+
+#ifndef MICROPY_EMIT_INLINE_THUMB
+#define MICROPY_EMIT_INLINE_THUMB   (EXTRA_FEAT)
+#endif
+
 #define MICROPY_ALLOC_PATH_MAX      (512)
 #define MICROPY_PERSISTENT_CODE_LOAD (1)
 #define MICROPY_COMP_MODULE_CONST   (0)
@@ -177,16 +234,51 @@
 #define MICROPY_PY_TIME_TICKS       (1)
 #endif
 
-#ifndef MICROPY_PY_NRF
-#define MICROPY_PY_NRF              (0)
-#endif
-
 #define MICROPY_ENABLE_EMERGENCY_EXCEPTION_BUF   (1)
 #define MICROPY_EMERGENCY_EXCEPTION_BUF_SIZE  (0)
 
-// if sdk is in use, import configuration
+// if sdk is in use, import configuration and enable some core features
 #if BLUETOOTH_SD
 #include "bluetooth_conf.h"
+#define MICROPY_BUILTIN_METHOD_CHECK_SELF_ARG (1)
+#define MICROPY_COMP_CONST                    (1)
+#define MICROPY_COMP_CONST_FOLDING            (1)
+#define MICROPY_COMP_CONST_LITERAL            (1)
+#define MICROPY_COMP_DOUBLE_TUPLE_ASSIGN      (1)
+#define MICROPY_CPYTHON_COMPAT                (1)
+#define MICROPY_ENABLE_COMPILER               (1)
+#define MICROPY_ENABLE_EXTERNAL_IMPORT        (1)
+#define MICROPY_ERROR_REPORTING               (2)
+#define MICROPY_FULL_CHECKS                   (1)
+#define MICROPY_GC_ALLOC_THRESHOLD            (1)
+#define MICROPY_MODULE_GETATTR                (1)
+#define MICROPY_MULTIPLE_INHERITANCE          (1)
+#define MICROPY_PY_ARRAY                      (1)
+#define MICROPY_PY_ASSIGN_EXPR                (1)
+#define MICROPY_PY_ASYNC_AWAIT                (1)
+#define MICROPY_PY_ATTRTUPLE                  (1)
+#define MICROPY_PY_BUILTINS_BYTEARRAY         (1)
+#define MICROPY_PY_BUILTINS_DICT_FROMKEYS     (1)
+#define MICROPY_PY_BUILTINS_ENUMERATE         (1)
+#define MICROPY_PY_BUILTINS_EVAL_EXEC         (1)
+#define MICROPY_PY_BUILTINS_FILTER            (1)
+#define MICROPY_PY_BUILTINS_MIN_MAX           (1)
+#define MICROPY_PY_BUILTINS_PROPERTY          (1)
+#define MICROPY_PY_BUILTINS_RANGE_ATTRS       (1)
+#define MICROPY_PY_BUILTINS_REVERSED          (1)
+#define MICROPY_PY_BUILTINS_SET               (1)
+#define MICROPY_PY_BUILTINS_SLICE             (1)
+#define MICROPY_PY_BUILTINS_STR_COUNT         (1)
+#define MICROPY_PY_BUILTINS_STR_OP_MODULO     (1)
+#define MICROPY_PY_COLLECTIONS                (1)
+#define MICROPY_PY_GC                         (1)
+#define MICROPY_PY_GENERATOR_PEND_THROW       (1)
+#define MICROPY_PY_MATH                       (1)
+#define MICROPY_PY_STRUCT                     (1)
+#define MICROPY_PY_SYS                        (1)
+#define MICROPY_PY_SYS_PATH_ARGV_DEFAULTS     (1)
+#define MICROPY_PY___FILE__                   (1)
+#define MICROPY_QSTR_BYTES_IN_HASH            (2)
 #endif
 
 #ifndef MICROPY_PY_UBLUEPY
@@ -287,3 +379,38 @@ extern const struct _mp_obj_module_t music_module;
 #ifndef MP_NEED_LOG2
 #define MP_NEED_LOG2                (1)
 #endif
+
+// Disable extra features enabled by EXTRA on NRF52840 & NRF9160
+// to initially preserve existing feature set
+#if (EXTRA_FEAT)
+#define MICROPY_COMP_RETURN_IF_EXPR (0)
+#define MICROPY_ENABLE_SCHEDULER (0)
+#define MICROPY_MODULE_ATTR_DELEGATION (0)
+#define MICROPY_OPT_LOAD_ATTR_FAST_PATH (0)
+#define MICROPY_OPT_MAP_LOOKUP_CACHE (0)
+#define MICROPY_OPT_MATH_FACTORIAL (0)
+#define MICROPY_PY_BUILTINS_INPUT (0)
+#define MICROPY_PY_BUILTINS_NOTIMPLEMENTED (0)
+#define MICROPY_PY_BUILTINS_POW3 (0)
+#define MICROPY_PY_BUILTINS_ROUND_INT (0)
+#define MICROPY_PY_BUILTINS_SLICE_INDICES (0)
+#define MICROPY_PY_COLLECTIONS_DEQUE (0)
+#define MICROPY_PY_DELATTR_SETATTR (0)
+#define MICROPY_PY_DESCRIPTORS (0)
+#define MICROPY_PY_FSTRINGS (0)
+#define MICROPY_PY_IO_IOBASE (0)
+#define MICROPY_PY_MATH_CONSTANTS (0)
+#define MICROPY_PY_MATH_FACTORIAL (0)
+#define MICROPY_PY_MATH_ISCLOSE (0)
+#define MICROPY_PY_REVERSE_SPECIAL_METHODS (0)
+#define MICROPY_PY_SYS_ATTR_DELEGATION (0)
+#define MICROPY_PY_SYS_PS1_PS2 (0)
+#define MICROPY_PY_UASYNCIO (0)
+#define MICROPY_PY_UBINASCII_CRC32 (0)
+#define MICROPY_PY_UERRNO (0)
+#define MICROPY_PY_UHASHLIB (0)
+#define MICROPY_PY_UOS (0)
+#define MICROPY_PY_UOS_STATVFS (0)
+#define MICROPY_PY_URE_SUB (0)
+#define MICROPY_PY_USELECT (0)
+#endif
diff --git a/ports/nrf/nrfx_config.h b/ports/nrf/nrfx_config.h
index beb6b34ab368d..2b0555dda077d 100644
--- a/ports/nrf/nrfx_config.h
+++ b/ports/nrf/nrfx_config.h
@@ -28,7 +28,7 @@
 #ifndef NRFX_CONFIG_H
 #define NRFX_CONFIG_H
 
-#include "mpconfigport.h"
+#include "py/mpconfig.h"
 #include "nrf.h"
 
 // Port specific defines

From c5878dd1f96c083593a6f63ac3f03fbcb339c6a4 Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Sun, 3 Apr 2022 09:36:53 +1000
Subject: [PATCH 2133/3533] nrf/mpconfigport: Enable extra features as defined
 by ROM levels.

This commit enables extra features from the ROM levels and further
simplifies mpconfigport.h.  The changes are:

- NRF51822 & BLUETOOTH_SD -> MICROPY_CONFIG_ROM_LEVEL_MINIMUM
    - no changes

- NRF51822 -> MICROPY_CONFIG_ROM_LEVEL_CORE_FEATURES
    - MICROPY_PY_IO = 1

- NRF52832 -> MICROPY_CONFIG_ROM_LEVEL_BASIC_FEATURES
    - MICROPY_PY_IO = 1

- NRF52840, NRF9160 -> MICROPY_CONFIG_ROM_LEVEL_EXTRA_FEATURES
    - MICROPY_COMP_MODULE_CONST = 1
    - MICROPY_COMP_TRIPLE_TUPLE_ASSIGN = 1
    - MICROPY_OPT_MPZ_BITWISE = 1
    - MICROPY_PY_ALL_SPECIAL_METHODS = 1
    - MICROPY_PY_BUILTINS_EXECFILE = 1
    - MICROPY_PY_BUILTINS_SLICE_ATTRS = 1
    - MICROPY_PY_BUILTINS_STR_CENTER = 1
    - MICROPY_PY_BUILTINS_STR_PARTITION = 1
    - MICROPY_PY_BUILTINS_STR_SPLITLINES = 1
    - MICROPY_PY_CMATH = 1
    - MICROPY_PY_COLLECTIONS_ORDEREDDICT = 1
    - MICROPY_PY_FRAMEBUF = 1
    - MICROPY_PY_IO = 1
    - MICROPY_PY_MATH_SPECIAL_FUNCTIONS = 1
    - MICROPY_PY_SYS_STDIO_BUFFER = 1
    - MICROPY_PY_UCTYPES = 1
    - MICROPY_PY_UHEAPQ = 1
    - MICROPY_PY_UJSON = 1
    - MICROPY_PY_URE = 1
    - MICROPY_PY_UZLIB = 1
    - MICROPY_REPL_EMACS_KEYS = 1
---
 ports/nrf/mpconfigport.h | 67 ++--------------------------------------
 1 file changed, 3 insertions(+), 64 deletions(-)

diff --git a/ports/nrf/mpconfigport.h b/ports/nrf/mpconfigport.h
index 00ec956d1369b..e357f01caff06 100644
--- a/ports/nrf/mpconfigport.h
+++ b/ports/nrf/mpconfigport.h
@@ -63,6 +63,7 @@
 #define MICROPY_VFS                        (CORE_FEAT)
 #endif
 
+// micro:bit filesystem
 #ifndef MICROPY_MBFS
 #define MICROPY_MBFS                       (!MICROPY_VFS)
 #endif
@@ -101,15 +102,12 @@
 
 #define MICROPY_ALLOC_PATH_MAX      (512)
 #define MICROPY_PERSISTENT_CODE_LOAD (1)
-#define MICROPY_COMP_MODULE_CONST   (0)
-#define MICROPY_COMP_TRIPLE_TUPLE_ASSIGN (0)
 #define MICROPY_READER_VFS          (MICROPY_VFS)
 #define MICROPY_ENABLE_GC           (1)
 #define MICROPY_ENABLE_FINALISER    (1)
 #define MICROPY_STACK_CHECK         (1)
 #define MICROPY_HELPER_REPL         (1)
 #define MICROPY_REPL_INFO           (1)
-#define MICROPY_REPL_EMACS_KEYS     (0)
 #define MICROPY_REPL_AUTO_INDENT    (1)
 #define MICROPY_KBD_EXCEPTION       (1)
 #define MICROPY_LONGINT_IMPL        (MICROPY_LONGINT_IMPL_MPZ)
@@ -122,9 +120,6 @@
 #define MICROPY_ALLOC_GC_STACK_SIZE (32)
 #endif
 
-#define MICROPY_OPT_COMPUTED_GOTO   (0)
-#define MICROPY_OPT_MPZ_BITWISE     (0)
-
 // fatfs configuration used in ffconf.h
 #define MICROPY_FATFS_ENABLE_LFN       (1)
 #define MICROPY_FATFS_LFN_CODE_PAGE    437 /* 1=SFN/ANSI 437=LFN/U.S.(OEM) */
@@ -142,10 +137,8 @@
 #define mp_type_fileio fatfs_type_fileio
 #define mp_type_textio fatfs_type_textio
 
-// Enable micro:bit filesystem by default.
-#ifndef MICROPY_MBFS
-#define MICROPY_MBFS (1)
-#endif
+// Use port specific uos module rather than extmod variant.
+#define MICROPY_PY_UOS              (0)
 
 #define MICROPY_STREAMS_NON_BLOCK   (1)
 #define MICROPY_MODULE_WEAK_LINKS   (1)
@@ -153,42 +146,24 @@
 #define MICROPY_USE_INTERNAL_ERRNO  (1)
 #define MICROPY_PY_FUNCTION_ATTRS   (1)
 #define MICROPY_PY_BUILTINS_STR_UNICODE (1)
-#define MICROPY_PY_BUILTINS_STR_CENTER (0)
-#define MICROPY_PY_BUILTINS_STR_PARTITION (0)
-#define MICROPY_PY_BUILTINS_STR_SPLITLINES (0)
 #define MICROPY_PY_BUILTINS_MEMORYVIEW (1)
 #define MICROPY_PY_BUILTINS_FROZENSET (1)
-#define MICROPY_PY_BUILTINS_EXECFILE (0)
 #define MICROPY_PY_BUILTINS_COMPILE (1)
 #define MICROPY_PY_BUILTINS_HELP    (1)
 #define MICROPY_PY_BUILTINS_HELP_TEXT nrf5_help_text
 #define MICROPY_PY_BUILTINS_HELP_MODULES (1)
 #define MICROPY_MODULE_BUILTIN_INIT (1)
-#define MICROPY_PY_ALL_SPECIAL_METHODS (0)
 #define MICROPY_PY_MICROPYTHON_MEM_INFO (1)
-#define MICROPY_PY_BUILTINS_SLICE_ATTRS (0)
-#define MICROPY_PY_SYS_EXIT         (1)
 #define MICROPY_PY_SYS_MAXSIZE      (1)
-#define MICROPY_PY_SYS_STDIO_BUFFER (0)
-#define MICROPY_PY_COLLECTIONS_ORDEREDDICT (0)
-#define MICROPY_PY_MATH_SPECIAL_FUNCTIONS (0)
-#define MICROPY_PY_CMATH            (0)
-#define MICROPY_PY_IO               (0)
 #define MICROPY_PY_IO_FILEIO        (MICROPY_VFS_FAT || MICROPY_VFS_LFS1 || MICROPY_VFS_LFS2)
 #define MICROPY_PY_URANDOM          (1)
 #define MICROPY_PY_URANDOM_EXTRA_FUNCS (1)
-#define MICROPY_PY_UCTYPES          (0)
-#define MICROPY_PY_UZLIB            (0)
-#define MICROPY_PY_UJSON            (0)
-#define MICROPY_PY_URE              (0)
-#define MICROPY_PY_UHEAPQ           (0)
 #define MICROPY_PY_UTIME_MP_HAL     (1)
 #define MICROPY_PY_MACHINE          (1)
 #define MICROPY_PY_MACHINE_PULSE    (0)
 #define MICROPY_PY_MACHINE_SOFTI2C  (MICROPY_PY_MACHINE_I2C)
 #define MICROPY_PY_MACHINE_SPI      (0)
 #define MICROPY_PY_MACHINE_SPI_MIN_DELAY (0)
-#define MICROPY_PY_FRAMEBUF         (0)
 
 #ifndef MICROPY_HW_LED_COUNT
 #define MICROPY_HW_LED_COUNT        (0)
@@ -324,7 +299,6 @@ extern const struct _mp_obj_module_t music_module;
 #define MICROPY_PORT_CONSTANTS \
     { MP_ROM_QSTR(MP_QSTR_board), MP_ROM_PTR(&board_module) }, \
     { MP_ROM_QSTR(MP_QSTR_machine), MP_ROM_PTR(&mp_module_machine) }, \
-    BLE_MODULE \
 
 #define MP_STATE_PORT MP_STATE_VM
 
@@ -379,38 +353,3 @@ extern const struct _mp_obj_module_t music_module;
 #ifndef MP_NEED_LOG2
 #define MP_NEED_LOG2                (1)
 #endif
-
-// Disable extra features enabled by EXTRA on NRF52840 & NRF9160
-// to initially preserve existing feature set
-#if (EXTRA_FEAT)
-#define MICROPY_COMP_RETURN_IF_EXPR (0)
-#define MICROPY_ENABLE_SCHEDULER (0)
-#define MICROPY_MODULE_ATTR_DELEGATION (0)
-#define MICROPY_OPT_LOAD_ATTR_FAST_PATH (0)
-#define MICROPY_OPT_MAP_LOOKUP_CACHE (0)
-#define MICROPY_OPT_MATH_FACTORIAL (0)
-#define MICROPY_PY_BUILTINS_INPUT (0)
-#define MICROPY_PY_BUILTINS_NOTIMPLEMENTED (0)
-#define MICROPY_PY_BUILTINS_POW3 (0)
-#define MICROPY_PY_BUILTINS_ROUND_INT (0)
-#define MICROPY_PY_BUILTINS_SLICE_INDICES (0)
-#define MICROPY_PY_COLLECTIONS_DEQUE (0)
-#define MICROPY_PY_DELATTR_SETATTR (0)
-#define MICROPY_PY_DESCRIPTORS (0)
-#define MICROPY_PY_FSTRINGS (0)
-#define MICROPY_PY_IO_IOBASE (0)
-#define MICROPY_PY_MATH_CONSTANTS (0)
-#define MICROPY_PY_MATH_FACTORIAL (0)
-#define MICROPY_PY_MATH_ISCLOSE (0)
-#define MICROPY_PY_REVERSE_SPECIAL_METHODS (0)
-#define MICROPY_PY_SYS_ATTR_DELEGATION (0)
-#define MICROPY_PY_SYS_PS1_PS2 (0)
-#define MICROPY_PY_UASYNCIO (0)
-#define MICROPY_PY_UBINASCII_CRC32 (0)
-#define MICROPY_PY_UERRNO (0)
-#define MICROPY_PY_UHASHLIB (0)
-#define MICROPY_PY_UOS (0)
-#define MICROPY_PY_UOS_STATVFS (0)
-#define MICROPY_PY_URE_SUB (0)
-#define MICROPY_PY_USELECT (0)
-#endif

From 494e8ba7229e343a5b6fbd8992e17e2dad9ca8b3 Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Tue, 1 Mar 2022 15:17:16 +1100
Subject: [PATCH 2134/3533] nrf/mpconfigport: Fix MICROPY_VFS IO build support.

---
 ports/nrf/mpconfigport.h | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/ports/nrf/mpconfigport.h b/ports/nrf/mpconfigport.h
index e357f01caff06..29bdd3f80ca4e 100644
--- a/ports/nrf/mpconfigport.h
+++ b/ports/nrf/mpconfigport.h
@@ -133,9 +133,22 @@
     #define MICROPY_FATFS_MAX_SS       (4096)
 #endif
 
-// TODO these should be generic, not bound to fatfs
+#if MICROPY_VFS
+// TODO these should be generic, not bound to a particular FS implementation
+#if MICROPY_VFS_FAT
+#define mp_type_fileio mp_type_vfs_fat_fileio
+#define mp_type_textio mp_type_vfs_fat_textio
+#elif MICROPY_VFS_LFS1
+#define mp_type_fileio mp_type_vfs_lfs1_fileio
+#define mp_type_textio mp_type_vfs_lfs1_textio
+#elif MICROPY_VFS_LFS2
+#define mp_type_fileio mp_type_vfs_lfs2_fileio
+#define mp_type_textio mp_type_vfs_lfs2_textio
+#endif
+#else // !MICROPY_VFS_FAT
 #define mp_type_fileio fatfs_type_fileio
 #define mp_type_textio fatfs_type_textio
+#endif
 
 // Use port specific uos module rather than extmod variant.
 #define MICROPY_PY_UOS              (0)

From 9bd6169b7293d4b996ecbb1a53b6079a508d826a Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew@alelec.net>
Date: Thu, 5 May 2022 12:50:15 +1000
Subject: [PATCH 2135/3533] rp2/mbedtls: Add support for ssl module with
 MICROPY_SSL_MBEDTLS.

Signed-off-by: Andrew Leech <andrew@alelec.net>
---
 ports/rp2/CMakeLists.txt           |  9 +++
 ports/rp2/mbedtls/mbedtls_config.h | 99 ++++++++++++++++++++++++++++++
 ports/rp2/mbedtls/mbedtls_port.c   | 42 +++++++++++++
 ports/rp2/mpconfigport.h           |  1 +
 4 files changed, 151 insertions(+)
 create mode 100644 ports/rp2/mbedtls/mbedtls_config.h
 create mode 100644 ports/rp2/mbedtls/mbedtls_port.c

diff --git a/ports/rp2/CMakeLists.txt b/ports/rp2/CMakeLists.txt
index a5e421734736f..f25725f881ed9 100644
--- a/ports/rp2/CMakeLists.txt
+++ b/ports/rp2/CMakeLists.txt
@@ -66,6 +66,7 @@ set(MICROPY_SOURCE_LIB
     ${MICROPY_DIR}/lib/littlefs/lfs1_util.c
     ${MICROPY_DIR}/lib/littlefs/lfs2.c
     ${MICROPY_DIR}/lib/littlefs/lfs2_util.c
+    ${MICROPY_DIR}/lib/mbedtls_errors/mp_mbedtls_errors.c
     ${MICROPY_DIR}/lib/oofatfs/ff.c
     ${MICROPY_DIR}/lib/oofatfs/ffunicode.c
     ${MICROPY_DIR}/shared/netutils/netutils.c
@@ -108,6 +109,7 @@ set(MICROPY_SOURCE_PORT
     tusb_port.c
     uart.c
     msc_disk.c
+    mbedtls/mbedtls_port.c
 )
 
 set(MICROPY_SOURCE_QSTR
@@ -238,6 +240,13 @@ target_sources(${MICROPY_TARGET} PRIVATE
 )
 
 target_link_libraries(${MICROPY_TARGET} micropy_lib_mbedtls)
+
+# Filter out library/error.c as we're using mp_mbedtls_errors.c instead.
+set_source_files_properties(${MICROPY_LIB_MBEDTLS_DIR}/library/error.c
+    TARGET_DIRECTORY micropy_lib_mbedtls
+    PROPERTIES HEADER_FILE_ONLY ON
+)
+
 target_link_libraries(${MICROPY_TARGET} usermod)
 
 target_include_directories(${MICROPY_TARGET} PRIVATE
diff --git a/ports/rp2/mbedtls/mbedtls_config.h b/ports/rp2/mbedtls/mbedtls_config.h
new file mode 100644
index 0000000000000..8e054ed51713a
--- /dev/null
+++ b/ports/rp2/mbedtls/mbedtls_config.h
@@ -0,0 +1,99 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2018-2019 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+#ifndef MICROPY_INCLUDED_MBEDTLS_CONFIG_H
+#define MICROPY_INCLUDED_MBEDTLS_CONFIG_H
+
+// Set mbedtls configuration
+#define MBEDTLS_PLATFORM_MEMORY
+#define MBEDTLS_PLATFORM_NO_STD_FUNCTIONS
+#define MBEDTLS_DEPRECATED_REMOVED
+#define MBEDTLS_ENTROPY_HARDWARE_ALT
+#define MBEDTLS_AES_ROM_TABLES
+#define MBEDTLS_CIPHER_MODE_CBC
+#define MBEDTLS_ECP_DP_SECP192R1_ENABLED
+#define MBEDTLS_ECP_DP_SECP224R1_ENABLED
+#define MBEDTLS_ECP_DP_SECP256R1_ENABLED
+#define MBEDTLS_ECP_DP_SECP384R1_ENABLED
+#define MBEDTLS_ECP_DP_SECP521R1_ENABLED
+#define MBEDTLS_ECP_DP_SECP192K1_ENABLED
+#define MBEDTLS_ECP_DP_SECP224K1_ENABLED
+#define MBEDTLS_ECP_DP_SECP256K1_ENABLED
+#define MBEDTLS_ECP_DP_BP256R1_ENABLED
+#define MBEDTLS_ECP_DP_BP384R1_ENABLED
+#define MBEDTLS_ECP_DP_BP512R1_ENABLED
+#define MBEDTLS_ECP_DP_CURVE25519_ENABLED
+#define MBEDTLS_KEY_EXCHANGE_RSA_ENABLED
+#define MBEDTLS_NO_PLATFORM_ENTROPY
+#define MBEDTLS_PKCS1_V15
+#define MBEDTLS_SHA256_SMALLER
+#define MBEDTLS_SSL_PROTO_TLS1
+#define MBEDTLS_SSL_PROTO_TLS1_1
+#define MBEDTLS_SSL_PROTO_TLS1_2
+#define MBEDTLS_SSL_SERVER_NAME_INDICATION
+
+// Use a smaller output buffer to reduce size of SSL context
+#define MBEDTLS_SSL_MAX_CONTENT_LEN (16384)
+#define MBEDTLS_SSL_IN_CONTENT_LEN  (MBEDTLS_SSL_MAX_CONTENT_LEN)
+#define MBEDTLS_SSL_OUT_CONTENT_LEN (4096)
+
+// Enable mbedtls modules
+#define MBEDTLS_AES_C
+#define MBEDTLS_ASN1_PARSE_C
+#define MBEDTLS_BIGNUM_C
+#define MBEDTLS_CIPHER_C
+#define MBEDTLS_CTR_DRBG_C
+// #define MBEDTLS_ECP_C
+#define MBEDTLS_ENTROPY_C
+#define MBEDTLS_ERROR_C
+#define MBEDTLS_MD_C
+#define MBEDTLS_MD5_C
+#define MBEDTLS_OID_C
+#define MBEDTLS_PKCS5_C
+#define MBEDTLS_PK_C
+#define MBEDTLS_PK_PARSE_C
+#define MBEDTLS_PLATFORM_C
+#define MBEDTLS_RSA_C
+#define MBEDTLS_SHA1_C
+#define MBEDTLS_SHA256_C
+#define MBEDTLS_SHA512_C
+#define MBEDTLS_SSL_CLI_C
+#define MBEDTLS_SSL_SRV_C
+#define MBEDTLS_SSL_TLS_C
+#define MBEDTLS_X509_CRT_PARSE_C
+#define MBEDTLS_X509_USE_C
+
+// Memory allocation hooks
+#include <stdlib.h>
+#include <stdio.h>
+void *m_tracked_calloc(size_t nmemb, size_t size);
+void m_tracked_free(void *ptr);
+#define MBEDTLS_PLATFORM_STD_CALLOC m_tracked_calloc
+#define MBEDTLS_PLATFORM_STD_FREE m_tracked_free
+#define MBEDTLS_PLATFORM_SNPRINTF_MACRO snprintf
+
+#include "mbedtls/check_config.h"
+
+#endif /* MICROPY_INCLUDED_MBEDTLS_CONFIG_H */
diff --git a/ports/rp2/mbedtls/mbedtls_port.c b/ports/rp2/mbedtls/mbedtls_port.c
new file mode 100644
index 0000000000000..aa0f9a36e0eaa
--- /dev/null
+++ b/ports/rp2/mbedtls/mbedtls_port.c
@@ -0,0 +1,42 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2019 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+#include <py/mpconfig.h>
+
+#ifdef MICROPY_SSL_MBEDTLS
+
+#include "mbedtls_config.h"
+
+extern uint8_t rosc_random_u8(size_t cycles);
+
+int mbedtls_hardware_poll(void *data, unsigned char *output, size_t len, size_t *olen) {
+    *olen = len;
+    for (size_t i = 0; i < len; i++) {
+        output[i] = rosc_random_u8(8);
+    }
+    return 0;
+}
+
+#endif
diff --git a/ports/rp2/mpconfigport.h b/ports/rp2/mpconfigport.h
index a733f750d4b01..2ce8b88f3f8da 100644
--- a/ports/rp2/mpconfigport.h
+++ b/ports/rp2/mpconfigport.h
@@ -60,6 +60,7 @@
 #define MICROPY_OPT_COMPUTED_GOTO               (1)
 
 // Python internal features
+#define MICROPY_TRACKED_ALLOC                   (MICROPY_SSL_MBEDTLS)
 #define MICROPY_READER_VFS                      (1)
 #define MICROPY_ENABLE_GC                       (1)
 #define MICROPY_ENABLE_EMERGENCY_EXCEPTION_BUF  (1)

From 05f927b624474d3f89639ed8a93e98da9f49ba11 Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew@alelec.net>
Date: Sat, 30 Apr 2022 12:45:43 +1000
Subject: [PATCH 2136/3533] rp2/machine_pin: Add mp_hal_pin_interrupt C
 interface.

So C can can easily configure a pin interrupt and callback.

Signed-off-by: Andrew Leech <andrew@alelec.net>
---
 ports/rp2/machine_pin.c | 70 ++++++++++++++++++++++++-----------------
 ports/rp2/mphalport.h   | 10 ++++++
 2 files changed, 51 insertions(+), 29 deletions(-)

diff --git a/ports/rp2/machine_pin.c b/ports/rp2/machine_pin.c
index aa3cad6ef0404..ca8de6ce253fe 100644
--- a/ports/rp2/machine_pin.c
+++ b/ports/rp2/machine_pin.c
@@ -313,50 +313,62 @@ STATIC mp_obj_t machine_pin_toggle(mp_obj_t self_in) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_pin_toggle_obj, machine_pin_toggle);
 
-// pin.irq(handler=None, trigger=IRQ_FALLING|IRQ_RISING, hard=False)
-STATIC mp_obj_t machine_pin_irq(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
-    enum { ARG_handler, ARG_trigger, ARG_hard };
-    static const mp_arg_t allowed_args[] = {
-        { MP_QSTR_handler, MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
-        { MP_QSTR_trigger, MP_ARG_INT, {.u_int = GPIO_IRQ_EDGE_FALL | GPIO_IRQ_EDGE_RISE} },
-        { MP_QSTR_hard, MP_ARG_BOOL, {.u_bool = false} },
-    };
-    machine_pin_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]);
-    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
-    mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
-
+STATIC machine_pin_irq_obj_t *machine_pin_get_irq(mp_hal_pin_obj_t pin) {
     // Get the IRQ object.
-    machine_pin_irq_obj_t *irq = MP_STATE_PORT(machine_pin_irq_obj[self->id]);
+    machine_pin_irq_obj_t *irq = MP_STATE_PORT(machine_pin_irq_obj[pin]);
 
     // Allocate the IRQ object if it doesn't already exist.
     if (irq == NULL) {
         irq = m_new_obj(machine_pin_irq_obj_t);
         irq->base.base.type = &mp_irq_type;
         irq->base.methods = (mp_irq_methods_t *)&machine_pin_irq_methods;
-        irq->base.parent = MP_OBJ_FROM_PTR(self);
+        irq->base.parent = MP_OBJ_FROM_PTR(&machine_pin_obj[pin]);
         irq->base.handler = mp_const_none;
         irq->base.ishard = false;
-        MP_STATE_PORT(machine_pin_irq_obj[self->id]) = irq;
+        MP_STATE_PORT(machine_pin_irq_obj[pin]) = irq;
     }
+    return irq;
+}
 
-    if (n_args > 1 || kw_args->used != 0) {
-        // Configure IRQ.
+void mp_hal_pin_interrupt(mp_hal_pin_obj_t pin, mp_obj_t handler, mp_uint_t trigger, bool hard) {
+    machine_pin_irq_obj_t *irq = machine_pin_get_irq(pin);
 
-        // Disable all IRQs while data is updated.
-        gpio_set_irq_enabled(self->id, GPIO_IRQ_ALL, false);
+    // Disable all IRQs while data is updated.
+    gpio_set_irq_enabled(pin, GPIO_IRQ_ALL, false);
 
-        // Update IRQ data.
-        irq->base.handler = args[ARG_handler].u_obj;
-        irq->base.ishard = args[ARG_hard].u_bool;
-        irq->flags = 0;
-        irq->trigger = args[ARG_trigger].u_int;
-
-        // Enable IRQ if a handler is given.
-        if (args[ARG_handler].u_obj != mp_const_none) {
-            gpio_set_irq_enabled(self->id, args[ARG_trigger].u_int, true);
-        }
+    // Update IRQ data.
+    irq->base.handler = handler;
+    irq->base.ishard = hard;
+    irq->flags = 0;
+    irq->trigger = trigger;
+
+    // Enable IRQ if a handler is given.
+    if (handler != mp_const_none && trigger != MP_HAL_PIN_TRIGGER_NONE) {
+        gpio_set_irq_enabled(pin, trigger, true);
     }
+}
 
+// pin.irq(handler=None, trigger=IRQ_FALLING|IRQ_RISING, hard=False)
+STATIC mp_obj_t machine_pin_irq(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    enum { ARG_handler, ARG_trigger, ARG_hard };
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_handler, MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
+        { MP_QSTR_trigger, MP_ARG_INT, {.u_int = MP_HAL_PIN_TRIGGER_FALL | MP_HAL_PIN_TRIGGER_RISE} },
+        { MP_QSTR_hard, MP_ARG_BOOL, {.u_bool = false} },
+    };
+    machine_pin_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]);
+    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
+    mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
+
+    machine_pin_irq_obj_t *irq = machine_pin_get_irq(self->id);
+
+    if (n_args > 1 || kw_args->used != 0) {
+        // Update IRQ data.
+        mp_obj_t handler = args[ARG_handler].u_obj;
+        mp_uint_t trigger = args[ARG_trigger].u_int;
+        bool hard = args[ARG_hard].u_bool;
+        mp_hal_pin_interrupt(self->id, handler, trigger, hard);
+    }
     return MP_OBJ_FROM_PTR(irq);
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_KW(machine_pin_irq_obj, 1, machine_pin_irq);
diff --git a/ports/rp2/mphalport.h b/ports/rp2/mphalport.h
index 458d9a9a16165..0aebf7d74724e 100644
--- a/ports/rp2/mphalport.h
+++ b/ports/rp2/mphalport.h
@@ -126,4 +126,14 @@ static inline void mp_hal_pin_high(mp_hal_pin_obj_t pin) {
     gpio_set_mask(1 << pin);
 }
 
+enum mp_hal_pin_interrupt_trigger {
+    MP_HAL_PIN_TRIGGER_NONE,
+    MP_HAL_PIN_TRIGGER_LOW = GPIO_IRQ_LEVEL_LOW,
+    MP_HAL_PIN_TRIGGER_HIGH = GPIO_IRQ_LEVEL_HIGH,
+    MP_HAL_PIN_TRIGGER_FALL = GPIO_IRQ_EDGE_FALL,
+    MP_HAL_PIN_TRIGGER_RISE = GPIO_IRQ_EDGE_RISE,
+};
+
+void mp_hal_pin_interrupt(mp_hal_pin_obj_t pin, mp_obj_t handler, mp_uint_t trigger, bool hard);
+
 #endif // MICROPY_INCLUDED_RP2_MPHALPORT_H

From cb436e357ffe2959a8cfea36b61777a9edbd21d6 Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew@alelec.net>
Date: Mon, 25 Apr 2022 20:09:50 +1000
Subject: [PATCH 2137/3533] lib/wiznet5k: Add submodule for Wiznet Ethernet
 drivers.

Signed-off-by: Andrew Leech <andrew@alelec.net>
---
 .gitmodules  | 5 +++++
 lib/wiznet5k | 1 +
 2 files changed, 6 insertions(+)
 create mode 160000 lib/wiznet5k

diff --git a/.gitmodules b/.gitmodules
index 2d28230a8394a..118e023debf8d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -45,3 +45,8 @@
 [submodule "lib/fsp"]
 	path = lib/fsp
 	url = https://github.com/renesas/fsp.git
+[submodule "lib/wiznet"]
+	path = lib/wiznet5k
+	url = https://github.com/andrewleech/wiznet_ioLibrary_Driver.git
+	# Requires https://github.com/Wiznet/ioLibrary_Driver/pull/120
+	# url = https://github.com/Wiznet/ioLibrary_Driver.git
diff --git a/lib/wiznet5k b/lib/wiznet5k
new file mode 160000
index 0000000000000..0803fc519ad72
--- /dev/null
+++ b/lib/wiznet5k
@@ -0,0 +1 @@
+Subproject commit 0803fc519ad7227e841287fb3638d6c8b2f111a1

From 21b3a396de4dd193e97c5576060cfd2b23bc48e1 Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew@alelec.net>
Date: Thu, 5 May 2022 16:12:15 +1000
Subject: [PATCH 2138/3533] extmod/network_wiznet5k: Add Wiznet Ethernet
 network interface.

Originally based on both stm32/network_wiznet5k and stm32/modnwwiznet5k.

If MICROPY_PY_LWIP is enabled it uses the lwIP TCP stack in MicroPython,
communicating with the Wiznet controller in MACRAW mode.  In this mode it
supports using the INTN pin from Wiznet controller to receive data from an
interrupt trigger.

If lwIP is not enabled, it runs in modnetwork/socket mode providing an
interface to the TCP stack running on the Wiznet controller chip.  In this
mode it includes some updates by @irinakim12 from #8021, most notably
bringing in DHCP support.

Supports defining hardware pins in board config or dynamically set at
runtime.  Sets a default MAC address in the random namespace from board
unique-id.

Signed-off-by: Andrew Leech <andrew@alelec.net>
---
 extmod/network_wiznet5k.c | 1042 +++++++++++++++++++++++++++++++++++++
 1 file changed, 1042 insertions(+)
 create mode 100644 extmod/network_wiznet5k.c

diff --git a/extmod/network_wiznet5k.c b/extmod/network_wiznet5k.c
new file mode 100644
index 0000000000000..e14d8bdd6a0f5
--- /dev/null
+++ b/extmod/network_wiznet5k.c
@@ -0,0 +1,1042 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2014 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include <stdio.h>
+#include <stdint.h>
+#include <string.h>
+#include <stdlib.h>
+
+#include "py/runtime.h"
+#include "py/stream.h"
+#include "py/mperrno.h"
+#include "py/mphal.h"
+#include "shared/netutils/netutils.h"
+#include "extmod/modnetwork.h"
+#include "extmod/machine_spi.h"
+#include "extmod/virtpin.h"
+#include "modmachine.h"
+#include "drivers/bus/spi.h"
+
+#if MICROPY_PY_WIZNET5K
+
+#include "lib/wiznet5k/Ethernet/wizchip_conf.h"
+
+// The WIZNET5K module supports two usage modes:
+// * Raw ethernet transport with LwIP integrated in micropython
+// * Provided TCP Stack on controller presented as modnetwork / socket interface
+
+#define WIZNET5K_WITH_LWIP_STACK (MICROPY_PY_LWIP)
+#define WIZNET5K_PROVIDED_STACK (!MICROPY_PY_LWIP)
+
+#if WIZNET5K_WITH_LWIP_STACK
+// Uses LwIP for TCP Stack with Wiznet in MACRAW mode
+
+#include "shared/netutils/netutils.h"
+#include "lib/wiznet5k/Ethernet/wizchip_conf.h"
+#include "lib/wiznet5k/Ethernet/socket.h"
+#include "lwip/err.h"
+#include "lwip/dns.h"
+#include "lwip/dhcp.h"
+#include "netif/etharp.h"
+
+#define TRACE_ETH_TX (0x0002)
+#define TRACE_ETH_RX (0x0004)
+
+#else // WIZNET5K_PROVIDED_STACK
+// Uses TCP Stack provided in Wiznet controller
+// TODO: Not all micropython modnetwork / socket features are provided
+
+#include "lib/wiznet5k/Ethernet/socket.h"
+#include "lib/wiznet5k/Internet/DNS/dns.h"
+#include "lib/wiznet5k/Internet/DHCP/dhcp.h"
+
+#endif
+
+#ifndef printf
+#define printf(...) mp_printf(MP_PYTHON_PRINTER, __VA_ARGS__)
+#endif
+
+#ifndef MICROPY_HW_WIZNET_SPI_BAUDRATE
+#define MICROPY_HW_WIZNET_SPI_BAUDRATE  (2000000)
+#endif
+
+#ifndef WIZCHIP_SREG_ADDR
+#if (_WIZCHIP_ == 5500)
+#define WIZCHIP_SREG_ADDR(sn, addr)    (_W5500_IO_BASE_ + (addr << 8) + (WIZCHIP_SREG_BLOCK(sn) << 3))
+#else
+#define WIZCHIP_SREG_ADDR(sn, addr)    (_WIZCHIP_IO_BASE_ + WIZCHIP_SREG_BLOCK(sn) + (addr))
+#endif
+#endif
+
+extern struct _machine_spi_obj_t *spi_from_mp_obj(mp_obj_t o);
+
+typedef struct _wiznet5k_obj_t {
+    mp_obj_base_t base;
+    mp_uint_t cris_state;
+    struct _machine_spi_obj_t *spi;
+    mp_hal_pin_obj_t cs;
+    mp_hal_pin_obj_t rst;
+    #if WIZNET5K_WITH_LWIP_STACK
+    mp_hal_pin_obj_t pin_intn;
+    bool use_interrupt;
+    uint8_t eth_frame[1514];
+    uint32_t trace_flags;
+    struct netif netif;
+    struct dhcp dhcp_struct;
+    #else // WIZNET5K_PROVIDED_STACK
+    wiz_NetInfo netinfo;
+    uint8_t socket_used;
+    bool active;
+    #endif
+} wiznet5k_obj_t;
+
+#if WIZNET5K_WITH_LWIP_STACK
+#define IS_ACTIVE(self) (self->netif.flags & NETIF_FLAG_UP)
+#else // WIZNET5K_PROVIDED_STACK
+#define IS_ACTIVE(self) (self->active)
+#endif
+
+// Global object holding the Wiznet5k state
+STATIC wiznet5k_obj_t wiznet5k_obj;
+
+STATIC void wiz_cris_enter(void) {
+    wiznet5k_obj.cris_state = MICROPY_BEGIN_ATOMIC_SECTION();
+}
+
+STATIC void wiz_cris_exit(void) {
+    MICROPY_END_ATOMIC_SECTION(wiznet5k_obj.cris_state);
+}
+
+STATIC void wiz_cs_select(void) {
+    mp_hal_pin_low(wiznet5k_obj.cs);
+}
+
+STATIC void wiz_cs_deselect(void) {
+    mp_hal_pin_high(wiznet5k_obj.cs);
+}
+
+void mpy_wiznet_yield(void) {
+    // Used in socket.c via -DWIZCHIP_YIELD=mpy_wiznet_yield in make/cmake
+    #if MICROPY_PY_THREAD
+    MICROPY_THREAD_YIELD();
+    #else
+    mp_handle_pending(true);
+    #endif
+}
+
+STATIC void wiz_spi_read(uint8_t *buf, uint16_t len) {
+    ((mp_machine_spi_p_t *)machine_spi_type.protocol)->transfer((mp_obj_base_t *)wiznet5k_obj.spi, len, buf, buf);
+}
+
+STATIC void wiz_spi_write(const uint8_t *buf, uint16_t len) {
+    ((mp_machine_spi_p_t *)machine_spi_type.protocol)->transfer((mp_obj_base_t *)wiznet5k_obj.spi, len, buf, NULL);
+}
+
+STATIC uint8_t wiz_spi_readbyte() {
+    uint8_t buf = 0;
+    ((mp_machine_spi_p_t *)machine_spi_type.protocol)->transfer((mp_obj_base_t *)wiznet5k_obj.spi, 1, &buf, &buf);
+    return buf;
+}
+
+STATIC void wiz_spi_writebyte(const uint8_t buf) {
+    ((mp_machine_spi_p_t *)machine_spi_type.protocol)->transfer((mp_obj_base_t *)wiznet5k_obj.spi, 1, &buf, NULL);
+}
+
+STATIC void wiznet5k_get_mac_address(wiznet5k_obj_t *self, uint8_t mac[6]) {
+    (void)self;
+    getSHAR(mac);
+}
+
+#if WIZNET5K_WITH_LWIP_STACK
+
+void wiznet5k_try_poll(void);
+STATIC void wiznet5k_lwip_init(wiznet5k_obj_t *self);
+
+STATIC mp_obj_t mpy_wiznet_read_int(mp_obj_t none_in) {
+    (void)none_in;
+    wizchip_clrinterrupt(IK_SOCK_0);
+    setSn_IR(0, Sn_IR_RECV);
+
+    // Handle incoming data
+    wiznet5k_try_poll();
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(mpy_wiznet_read_int_obj, mpy_wiznet_read_int);
+
+STATIC void wiznet5k_config_interrupt(bool enabled) {
+    if (!wiznet5k_obj.use_interrupt) {
+        return;
+    }
+    mp_hal_pin_interrupt(
+        wiznet5k_obj.pin_intn,
+        MP_OBJ_FROM_PTR(&mpy_wiznet_read_int_obj),
+        (enabled)? MP_HAL_PIN_TRIGGER_FALL : MP_HAL_PIN_TRIGGER_NONE,
+        true
+        );
+}
+
+STATIC void wiznet5k_init(void) {
+    // Configure wiznet for raw ethernet frame usage.
+
+    // Configure 16k buffers for fast MACRAW
+    uint8_t sn_size[16] = {16, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 0, 0, 0, 0};
+    ctlwizchip(CW_INIT_WIZCHIP, sn_size);
+
+    if (wiznet5k_obj.use_interrupt) {
+        // Enable Wiznet interrupts for socket 0
+        wizchip_setinterruptmask(IK_SOCK_0);
+        // Enable data receive interrupt
+        setSn_IMR(0, Sn_IR_RECV);
+        #if _WIZCHIP_ == W5100S
+        // Enable interrupt pin
+        setMR(MR2_G_IEN);
+        #endif
+
+        mp_hal_pin_input(wiznet5k_obj.pin_intn);
+        wiznet5k_config_interrupt(true);
+    }
+
+    // Hook the Wiznet into lwIP
+    wiznet5k_lwip_init(&wiznet5k_obj);
+
+    netif_set_link_up(&wiznet5k_obj.netif);
+    netif_set_up(&wiznet5k_obj.netif);
+}
+
+void wiznet5k_deinit(void) {
+    for (struct netif *netif = netif_list; netif != NULL; netif = netif->next) {
+        if (netif == &wiznet5k_obj.netif) {
+            netif_remove(netif);
+            netif->flags = 0;
+            break;
+        }
+    }
+}
+
+STATIC void wiznet5k_send_ethernet(wiznet5k_obj_t *self, size_t len, const uint8_t *buf) {
+    uint8_t ip[4] = {1, 1, 1, 1}; // dummy
+    int ret = WIZCHIP_EXPORT(sendto)(0, (byte *)buf, len, ip, 11); // dummy port
+    if (ret != len) {
+        printf("wiznet5k_send_ethernet: fatal error %d\n", ret);
+        netif_set_link_down(&self->netif);
+        netif_set_down(&self->netif);
+    }
+}
+
+// Stores the frame in self->eth_frame and returns number of bytes in the frame, 0 for no frame
+STATIC uint16_t wiznet5k_recv_ethernet(wiznet5k_obj_t *self) {
+    uint16_t len = getSn_RX_RSR(0);
+    if (len == 0) {
+        return 0;
+    }
+
+    byte ip[4];
+    uint16_t port;
+    int ret = WIZCHIP_EXPORT(recvfrom)(0, self->eth_frame, 1514, ip, &port);
+    if (ret <= 0) {
+        printf("wiznet5k_recv_ethernet: fatal error len=%u ret=%d\n", len, ret);
+        netif_set_link_down(&self->netif);
+        netif_set_down(&self->netif);
+        return 0;
+    }
+
+    return ret;
+}
+
+/*******************************************************************************/
+// Wiznet5k lwIP interface
+
+STATIC err_t wiznet5k_netif_output(struct netif *netif, struct pbuf *p) {
+    wiznet5k_obj_t *self = netif->state;
+    pbuf_copy_partial(p, self->eth_frame, p->tot_len, 0);
+    if (self->trace_flags & TRACE_ETH_TX) {
+        netutils_ethernet_trace(MP_PYTHON_PRINTER, p->tot_len, self->eth_frame, NETUTILS_TRACE_IS_TX | NETUTILS_TRACE_NEWLINE);
+    }
+    wiznet5k_send_ethernet(self, p->tot_len, self->eth_frame);
+    return ERR_OK;
+}
+
+STATIC err_t wiznet5k_netif_init(struct netif *netif) {
+    netif->linkoutput = wiznet5k_netif_output;
+    netif->output = etharp_output;
+    netif->mtu = 1500;
+    netif->flags = NETIF_FLAG_BROADCAST | NETIF_FLAG_ETHARP | NETIF_FLAG_ETHERNET | NETIF_FLAG_IGMP;
+    wiznet5k_get_mac_address(netif->state, netif->hwaddr);
+    netif->hwaddr_len = sizeof(netif->hwaddr);
+    int ret = WIZCHIP_EXPORT(socket)(0, Sn_MR_MACRAW, 0, 0);
+    if (ret != 0) {
+        printf("WIZNET fatal error in netifinit: %d\n", ret);
+        return ERR_IF;
+    }
+
+    // Enable MAC filtering so we only get frames destined for us, to reduce load on lwIP
+    setSn_MR(0, getSn_MR(0) | Sn_MR_MFEN);
+
+    return ERR_OK;
+}
+
+STATIC void wiznet5k_lwip_init(wiznet5k_obj_t *self) {
+    ip_addr_t ipconfig[4];
+    ipconfig[0].addr = 0;
+    ipconfig[1].addr = 0;
+    ipconfig[2].addr = 0;
+    ipconfig[3].addr = 0;
+    netif_add(&self->netif, &ipconfig[0], &ipconfig[1], &ipconfig[2], self, wiznet5k_netif_init, ethernet_input);
+    self->netif.name[0] = 'e';
+    self->netif.name[1] = '0';
+    netif_set_default(&self->netif);
+    dns_setserver(0, &ipconfig[3]);
+    dhcp_set_struct(&self->netif, &self->dhcp_struct);
+    // Setting NETIF_FLAG_UP then clearing it is a workaround for dhcp_start and the
+    // LWIP_DHCP_CHECK_LINK_UP option, so that the DHCP client schedules itself to
+    // automatically start when the interface later goes up.
+    self->netif.flags |= NETIF_FLAG_UP;
+    dhcp_start(&self->netif);
+    self->netif.flags &= ~NETIF_FLAG_UP;
+}
+
+void wiznet5k_poll(void) {
+    wiznet5k_obj_t *self = &wiznet5k_obj;
+    if (!(self->netif.flags & NETIF_FLAG_UP) ||
+        !(self->netif.flags & NETIF_FLAG_LINK_UP)) {
+        return;
+    }
+    uint16_t len;
+    while ((len = wiznet5k_recv_ethernet(self)) > 0) {
+        if (self->trace_flags & TRACE_ETH_RX) {
+            netutils_ethernet_trace(MP_PYTHON_PRINTER, len, self->eth_frame, NETUTILS_TRACE_NEWLINE);
+        }
+        struct pbuf *p = pbuf_alloc(PBUF_RAW, len, PBUF_POOL);
+        if (p != NULL) {
+            pbuf_take(p, self->eth_frame, len);
+            if (self->netif.input(p, &self->netif) != ERR_OK) {
+                pbuf_free(p);
+            }
+        }
+    }
+}
+
+#endif // MICROPY_PY_LWIP
+
+#if WIZNET5K_PROVIDED_STACK
+
+STATIC void wiz_dhcp_assign(void) {
+    getIPfromDHCP(wiznet5k_obj.netinfo.ip);
+    getGWfromDHCP(wiznet5k_obj.netinfo.gw);
+    getSNfromDHCP(wiznet5k_obj.netinfo.sn);
+    getDNSfromDHCP(wiznet5k_obj.netinfo.dns);
+    ctlnetwork(CN_SET_NETINFO, (void *)&wiznet5k_obj.netinfo);
+}
+
+STATIC void wiz_dhcp_update(void) {
+    ;
+}
+
+
+STATIC void wiz_dhcp_conflict(void) {
+    ;
+}
+
+STATIC void wiznet5k_init(void) {
+    // Configure wiznet provided TCP / socket interface
+
+    reg_dhcp_cbfunc(wiz_dhcp_assign, wiz_dhcp_update, wiz_dhcp_conflict);
+
+    uint8_t sn_size[16] = {2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2};         // 2k buffer for each socket
+    ctlwizchip(CW_INIT_WIZCHIP, sn_size);
+
+    ctlnetwork(CN_SET_NETINFO, (void *)&wiznet5k_obj.netinfo);
+
+    // set some sensible default values; they are configurable using ifconfig method
+    wiz_NetInfo netinfo = {
+        .mac = {0, 0, 0, 0, 0, 0},
+        .ip = {192, 168, 0, 18},
+        .sn = {255, 255, 255, 0},
+        .gw = {192, 168, 0, 1},
+        .dns = {8, 8, 8, 8}, // Google public DNS
+        .dhcp = NETINFO_STATIC,
+    };
+    wiznet5k_obj.netinfo = netinfo;
+
+    // register with network module
+    mod_network_register_nic(&wiznet5k_obj);
+
+    wiznet5k_obj.active = true;
+}
+
+STATIC int wiznet5k_gethostbyname(mp_obj_t nic, const char *name, mp_uint_t len, uint8_t *out_ip) {
+    uint8_t dns_ip[MOD_NETWORK_IPADDR_BUF_SIZE] = {8, 8, 8, 8};
+    uint8_t *buf = m_new(uint8_t, MAX_DNS_BUF_SIZE);
+    DNS_init(2, buf);
+    mp_int_t ret = DNS_run(dns_ip, (uint8_t *)name, out_ip);
+    m_del(uint8_t, buf, MAX_DNS_BUF_SIZE);
+    if (ret == 1) {
+        // success
+        return 0;
+    } else {
+        // failure
+        return -2;
+    }
+}
+
+STATIC int wiznet5k_socket_socket(mod_network_socket_obj_t *socket, int *_errno) {
+    if (socket->domain != MOD_NETWORK_AF_INET) {
+        *_errno = MP_EAFNOSUPPORT;
+        return -1;
+    }
+
+    switch (socket->type) {
+        case MOD_NETWORK_SOCK_STREAM:
+            socket->type = Sn_MR_TCP;
+            break;
+        case MOD_NETWORK_SOCK_DGRAM:
+            socket->type = Sn_MR_UDP;
+            break;
+        default:
+            *_errno = MP_EINVAL;
+            return -1;
+    }
+
+    if (socket->fileno == -1) {
+        // get first unused socket number
+        for (mp_uint_t sn = 0; sn < _WIZCHIP_SOCK_NUM_; sn++) {
+            if ((wiznet5k_obj.socket_used & (1 << sn)) == 0) {
+                wiznet5k_obj.socket_used |= (1 << sn);
+                socket->fileno = sn;
+                break;
+            }
+        }
+        if (socket->fileno == -1) {
+            // too many open sockets
+            *_errno = MP_EMFILE;
+            return -1;
+        }
+    }
+
+    // WIZNET does not have a concept of pure "open socket".  You need to know
+    // if it's a server or client at the time of creation of the socket.
+    // So, we defer the open until we know what kind of socket we want.
+
+    // use "domain" to indicate that this socket has not yet been opened
+    socket->domain = 0;
+
+    return 0;
+}
+
+STATIC void wiznet5k_socket_close(mod_network_socket_obj_t *socket) {
+    uint8_t sn = (uint8_t)socket->fileno;
+    if (sn < _WIZCHIP_SOCK_NUM_) {
+        wiznet5k_obj.socket_used &= ~(1 << sn);
+        WIZCHIP_EXPORT(close)(sn);
+    }
+}
+
+STATIC int wiznet5k_socket_bind(mod_network_socket_obj_t *socket, byte *ip, mp_uint_t port, int *_errno) {
+    // open the socket in server mode (if port != 0)
+    mp_int_t ret = WIZCHIP_EXPORT(socket)(socket->fileno, socket->type, port, 0);
+    if (ret < 0) {
+        wiznet5k_socket_close(socket);
+        *_errno = -ret;
+        return -1;
+    }
+
+    // indicate that this socket has been opened
+    socket->domain = 1;
+
+    // success
+    return 0;
+}
+
+STATIC int wiznet5k_socket_listen(mod_network_socket_obj_t *socket, mp_int_t backlog, int *_errno) {
+    mp_int_t ret = WIZCHIP_EXPORT(listen)(socket->fileno);
+    if (ret < 0) {
+        wiznet5k_socket_close(socket);
+        *_errno = -ret;
+        return -1;
+    }
+    return 0;
+}
+
+STATIC int wiznet5k_socket_accept(mod_network_socket_obj_t *socket, mod_network_socket_obj_t *socket2, byte *ip, mp_uint_t *port, int *_errno) {
+    for (;;) {
+        int sr = getSn_SR((uint8_t)socket->fileno);
+        if (sr == SOCK_ESTABLISHED) {
+            socket2->domain = socket->domain;
+            socket2->type = socket->type;
+            socket2->fileno = socket->fileno;
+            getSn_DIPR((uint8_t)socket2->fileno, ip);
+            *port = getSn_PORT(socket2->fileno);
+
+            // WIZnet turns the listening socket into the client socket, so we
+            // need to re-bind and re-listen on another socket for the server.
+            // TODO handle errors, especially no-more-sockets error
+            socket->domain = MOD_NETWORK_AF_INET;
+            socket->fileno = -1;
+            int _errno2;
+            if (wiznet5k_socket_socket(socket, &_errno2) != 0) {
+                // printf("(bad resocket %d)\n", _errno2);
+            } else if (wiznet5k_socket_bind(socket, NULL, *port, &_errno2) != 0) {
+                // printf("(bad rebind %d)\n", _errno2);
+            } else if (wiznet5k_socket_listen(socket, 0, &_errno2) != 0) {
+                // printf("(bad relisten %d)\n", _errno2);
+            }
+
+            return 0;
+        }
+        if (sr == SOCK_CLOSED || sr == SOCK_CLOSE_WAIT) {
+            wiznet5k_socket_close(socket);
+            *_errno = MP_ENOTCONN; // ??
+            return -1;
+        }
+        mp_hal_delay_ms(1);
+    }
+}
+
+STATIC int wiznet5k_socket_connect(mod_network_socket_obj_t *socket, byte *ip, mp_uint_t port, int *_errno) {
+    // use "bind" function to open the socket in client mode
+    if (wiznet5k_socket_bind(socket, ip, 0, _errno) != 0) {
+        return -1;
+    }
+
+    // now connect
+    MP_THREAD_GIL_EXIT();
+    mp_int_t ret = WIZCHIP_EXPORT(connect)(socket->fileno, ip, port);
+    MP_THREAD_GIL_ENTER();
+
+    if (ret < 0) {
+        wiznet5k_socket_close(socket);
+        *_errno = -ret;
+        return -1;
+    }
+
+    // success
+    return 0;
+}
+
+STATIC mp_uint_t wiznet5k_socket_send(mod_network_socket_obj_t *socket, const byte *buf, mp_uint_t len, int *_errno) {
+    MP_THREAD_GIL_EXIT();
+    mp_int_t ret = WIZCHIP_EXPORT(send)(socket->fileno, (byte *)buf, len);
+    MP_THREAD_GIL_ENTER();
+
+    // TODO convert Wiz errno's to POSIX ones
+    if (ret < 0) {
+        wiznet5k_socket_close(socket);
+        *_errno = -ret;
+        return -1;
+    }
+    return ret;
+}
+
+STATIC mp_uint_t wiznet5k_socket_recv(mod_network_socket_obj_t *socket, byte *buf, mp_uint_t len, int *_errno) {
+    MP_THREAD_GIL_EXIT();
+    mp_int_t ret = WIZCHIP_EXPORT(recv)(socket->fileno, buf, len);
+    MP_THREAD_GIL_ENTER();
+
+    // TODO convert Wiz errno's to POSIX ones
+    if (ret < 0) {
+        wiznet5k_socket_close(socket);
+        *_errno = -ret;
+        return -1;
+    }
+    return ret;
+}
+
+STATIC mp_uint_t wiznet5k_socket_sendto(mod_network_socket_obj_t *socket, const byte *buf, mp_uint_t len, byte *ip, mp_uint_t port, int *_errno) {
+    if (socket->domain == 0) {
+        // socket not opened; use "bind" function to open the socket in client mode
+        if (wiznet5k_socket_bind(socket, ip, 0, _errno) != 0) {
+            return -1;
+        }
+    }
+
+    MP_THREAD_GIL_EXIT();
+    mp_int_t ret = WIZCHIP_EXPORT(sendto)(socket->fileno, (byte *)buf, len, ip, port);
+    MP_THREAD_GIL_ENTER();
+
+    if (ret < 0) {
+        wiznet5k_socket_close(socket);
+        *_errno = -ret;
+        return -1;
+    }
+    return ret;
+}
+
+STATIC mp_uint_t wiznet5k_socket_recvfrom(mod_network_socket_obj_t *socket, byte *buf, mp_uint_t len, byte *ip, mp_uint_t *port, int *_errno) {
+    uint16_t port2;
+    MP_THREAD_GIL_EXIT();
+    mp_int_t ret = WIZCHIP_EXPORT(recvfrom)(socket->fileno, buf, len, ip, &port2);
+    MP_THREAD_GIL_ENTER();
+    *port = port2;
+    if (ret < 0) {
+        wiznet5k_socket_close(socket);
+        *_errno = -ret;
+        return -1;
+    }
+    return ret;
+}
+
+STATIC int wiznet5k_socket_setsockopt(mod_network_socket_obj_t *socket, mp_uint_t level, mp_uint_t opt, const void *optval, mp_uint_t optlen, int *_errno) {
+    // TODO
+    *_errno = MP_EINVAL;
+    return -1;
+}
+
+STATIC int wiznet5k_socket_settimeout(mod_network_socket_obj_t *socket, mp_uint_t timeout_ms, int *_errno) {
+    // TODO
+    *_errno = MP_EINVAL;
+    return -1;
+
+    /*
+    if (timeout_ms == 0) {
+        // set non-blocking mode
+        uint8_t arg = SOCK_IO_NONBLOCK;
+        WIZCHIP_EXPORT(ctlsocket)(socket->fileno, CS_SET_IOMODE, &arg);
+    }
+    */
+}
+
+STATIC int wiznet5k_socket_ioctl(mod_network_socket_obj_t *socket, mp_uint_t request, mp_uint_t arg, int *_errno) {
+    if (request == MP_STREAM_POLL) {
+        int ret = 0;
+        if (arg & MP_STREAM_POLL_RD && getSn_RX_RSR(socket->fileno) != 0) {
+            ret |= MP_STREAM_POLL_RD;
+        }
+        if (arg & MP_STREAM_POLL_WR && getSn_TX_FSR(socket->fileno) != 0) {
+            ret |= MP_STREAM_POLL_WR;
+        }
+        return ret;
+    } else {
+        *_errno = MP_EINVAL;
+        return MP_STREAM_ERROR;
+    }
+}
+
+STATIC void wiznet5k_dhcp_init(wiznet5k_obj_t *self) {
+    uint8_t test_buf[2048];
+    uint8_t ret = 0;
+    uint8_t dhcp_retry = 0;
+
+    while (ret != DHCP_IP_LEASED) {
+        mp_uint_t timeout = mp_hal_ticks_ms() + 3000;
+        DHCP_init(1, test_buf);
+
+        while (1) {
+            ret = DHCP_run();
+            if (ret == DHCP_IP_LEASED) {
+                break;
+            } else if (ret == DHCP_FAILED || mp_hal_ticks_ms() > timeout) {
+                dhcp_retry++;
+                break;
+            }
+            mpy_wiznet_yield();
+        }
+
+        if (dhcp_retry > 3) {
+            mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("timeout waiting for DHCP to get IP address"));
+            break;
+        }
+    }
+
+    if (ret == DHCP_IP_LEASED) {
+        ctlnetwork(CN_GET_NETINFO, &self->netinfo);
+    }
+}
+
+#endif // WIZNET5K_PROVIDED_STACK
+
+/*******************************************************************************/
+// MicroPython bindings
+
+// WIZNET5K(spi, pin_cs, pin_rst[, pin_intn])
+// Create and return a WIZNET5K object.
+STATIC mp_obj_t wiznet5k_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
+    struct _machine_spi_obj_t *spi;
+    mp_hal_pin_obj_t cs;
+    mp_hal_pin_obj_t rst;
+
+    #if WIZNET5K_WITH_LWIP_STACK
+    mp_hal_pin_obj_t pin_intn = (mp_hal_pin_obj_t)NULL;
+    bool use_interrupt = false;
+
+    // Bring down interface while configuring
+    wiznet5k_obj.netif.flags = 0;
+    #endif
+
+    #ifdef MICROPY_HW_WIZNET_SPI_ID
+    // check arguments
+    mp_arg_check_num(n_args, n_kw, 0, 3, false);
+    // Allow auto-configuration of SPI if defined for board and no args passed
+    if (n_args == 0) {
+        // Initialize SPI.
+        mp_obj_t spi_obj = MP_OBJ_NEW_SMALL_INT(MICROPY_HW_WIZNET_SPI_SCK);
+        mp_obj_t miso_obj = MP_OBJ_NEW_SMALL_INT(MICROPY_HW_WIZNET_SPI_MISO);
+        mp_obj_t mosi_obj = MP_OBJ_NEW_SMALL_INT(MICROPY_HW_WIZNET_SPI_MOSI);
+        mp_obj_t args[] = {
+            MP_OBJ_NEW_SMALL_INT(MICROPY_HW_WIZNET_SPI_ID),
+            MP_OBJ_NEW_SMALL_INT(MICROPY_HW_WIZNET_SPI_BAUDRATE),
+            MP_ROM_QSTR(MP_QSTR_sck), mp_pin_make_new(NULL, 1, 0, &spi_obj),
+            MP_ROM_QSTR(MP_QSTR_miso), mp_pin_make_new(NULL, 1, 0, &miso_obj),
+            MP_ROM_QSTR(MP_QSTR_mosi), mp_pin_make_new(NULL, 1, 0, &mosi_obj),
+        };
+        spi = machine_spi_type.make_new((mp_obj_t)&machine_spi_type, 2, 3, args);
+
+        cs = mp_hal_get_pin_obj(mp_pin_make_new(NULL, 1, 0, (mp_obj_t[]) {MP_OBJ_NEW_SMALL_INT(MICROPY_HW_WIZNET_PIN_CS)}));
+        rst = mp_hal_get_pin_obj(mp_pin_make_new(NULL, 1, 0, (mp_obj_t[]) {MP_OBJ_NEW_SMALL_INT(MICROPY_HW_WIZNET_PIN_RST)}));
+        #if WIZNET5K_WITH_LWIP_STACK && defined(MICROPY_HW_WIZNET_PIN_INTN)
+        pin_intn = mp_hal_get_pin_obj(mp_pin_make_new(NULL, 1, 0, (mp_obj_t[]) {MP_OBJ_NEW_SMALL_INT(MICROPY_HW_WIZNET_PIN_INTN)}));
+        use_interrupt = true;
+        #endif
+
+    } else
+    #endif
+    {
+        // If passing in args, must supply spi, pin_cs, pin_rst and optionally pin_intn
+        #if WIZNET5K_WITH_LWIP_STACK
+        mp_arg_check_num(n_args, n_kw, 3, 4, false);
+        #else
+        mp_arg_check_num(n_args, n_kw, 3, 3, false);
+        #endif
+        spi = spi_from_mp_obj(args[0]);
+        cs = mp_hal_get_pin_obj(args[1]);
+        rst = mp_hal_get_pin_obj(args[2]);
+        #if WIZNET5K_WITH_LWIP_STACK
+        if (n_args > 3) {
+            pin_intn = mp_hal_get_pin_obj(args[3]);
+            use_interrupt = true;
+        }
+        #endif
+    }
+
+    mp_hal_pin_output(cs);
+    mp_hal_pin_output(rst);
+
+    // Init the wiznet5k object
+    wiznet5k_obj.base.type = (mp_obj_type_t *)&mod_network_nic_type_wiznet5k;
+    wiznet5k_obj.cris_state = 0;
+    wiznet5k_obj.spi = spi;
+    wiznet5k_obj.cs = cs;
+    wiznet5k_obj.rst = rst;
+    #if WIZNET5K_WITH_LWIP_STACK
+    wiznet5k_obj.pin_intn = pin_intn;
+    wiznet5k_obj.use_interrupt = use_interrupt;
+    wiznet5k_obj.trace_flags = 0;
+    #else // WIZNET5K_PROVIDED_STACK
+    wiznet5k_obj.active = false;
+    wiznet5k_obj.socket_used = 0;
+    #endif
+
+    // Return wiznet5k object
+    return MP_OBJ_FROM_PTR(&wiznet5k_obj);
+}
+
+// regs()
+// Dump WIZNET5K registers.
+STATIC mp_obj_t wiznet5k_regs(mp_obj_t self_in) {
+    (void)self_in;
+    printf("Wiz CREG:");
+    for (int i = 0; i < 0x50; ++i) {
+        if (i % 16 == 0) {
+            printf("\n  %04x:", i);
+        }
+        #if _WIZCHIP_ == 5500
+        uint32_t reg = _W5500_IO_BASE_ | i << 8;
+        #else
+        uint32_t reg = i;
+        #endif
+        printf(" %02x", WIZCHIP_READ(reg));
+    }
+    for (int sn = 0; sn < 4; ++sn) {
+        printf("\nWiz SREG[%d]:", sn);
+        for (int i = 0; i < 0x30; ++i) {
+            if (i % 16 == 0) {
+                printf("\n  %04x:", i);
+            }
+            #if _WIZCHIP_ == 5500
+            uint32_t reg = _W5500_IO_BASE_ | i << 8 | WIZCHIP_SREG_BLOCK(sn) << 3;
+            #else
+            uint32_t reg = WIZCHIP_SREG_ADDR(sn, i);
+            #endif
+            printf(" %02x", WIZCHIP_READ(reg));
+        }
+    }
+    printf("\n");
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(wiznet5k_regs_obj, wiznet5k_regs);
+
+STATIC mp_obj_t wiznet5k_isconnected(mp_obj_t self_in) {
+    wiznet5k_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    return mp_obj_new_bool(
+        wizphy_getphylink() == PHY_LINK_ON
+        && IS_ACTIVE(self)
+        #if WIZNET5K_WITH_LWIP_STACK
+        && self->netif.ip_addr.addr != 0
+        #endif
+        );
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(wiznet5k_isconnected_obj, wiznet5k_isconnected);
+
+STATIC mp_obj_t wiznet5k_active(size_t n_args, const mp_obj_t *args) {
+    wiznet5k_obj_t *self = MP_OBJ_TO_PTR(args[0]);
+    if (n_args == 1) {
+        return mp_obj_new_bool(IS_ACTIVE(self));
+    } else {
+        if (mp_obj_is_true(args[1])) {
+            if (!IS_ACTIVE(self)) {
+                /*!< Wiznet initialisation */
+                // Reset the chip
+                mp_hal_pin_low(wiznet5k_obj.rst);
+                mp_hal_delay_ms(1); // datasheet says 2us
+                mp_hal_pin_high(wiznet5k_obj.rst);
+                mp_hal_delay_ms(160); // datasheet says 150ms
+
+                // Set physical interface callbacks
+                reg_wizchip_cris_cbfunc(wiz_cris_enter, wiz_cris_exit);
+                reg_wizchip_cs_cbfunc(wiz_cs_select, wiz_cs_deselect);
+                reg_wizchip_spi_cbfunc(wiz_spi_readbyte, wiz_spi_writebyte);
+                reg_wizchip_spiburst_cbfunc(wiz_spi_read, wiz_spi_write);
+
+                // Configure lwip/provided specific settings
+                wiznet5k_init();
+
+                // If the device doesn't have a MAC address then set one
+                #if WIZNET5K_WITH_LWIP_STACK
+                uint8_t *mac = self->netif.hwaddr;
+                #else // WIZNET5K_PROVIDED_STACK
+                uint8_t *mac = wiznet5k_obj.netinfo.mac;
+                #endif
+                getSHAR(mac);
+                if ((mac[0] | mac[1] | mac[2] | mac[3] | mac[4] | mac[5]) == 0) {
+                    mp_hal_get_mac(MP_HAL_MAC_ETH0, mac);
+                    setSHAR(mac);
+                }
+
+                // seems we need a small delay after init
+                mp_hal_delay_ms(250);
+
+            }
+        } else {
+            #if WIZNET5K_WITH_LWIP_STACK
+            netif_set_down(&self->netif);
+            netif_set_link_down(&self->netif);
+            wiznet5k_deinit();
+            #else // WIZNET5K_PROVIDED_STACK
+            self->active = false;
+            wizchip_sw_reset();
+            #endif
+        }
+        return mp_const_none;
+    }
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(wiznet5k_active_obj, 1, 2, wiznet5k_active);
+
+#if WIZNET5K_PROVIDED_STACK
+// ifconfig([(ip, subnet, gateway, dns)])
+// Get/set IP address, subnet mask, gateway and DNS.
+STATIC mp_obj_t wiznet5k_ifconfig(size_t n_args, const mp_obj_t *args) {
+    wiz_NetInfo netinfo;
+    wiznet5k_obj_t *self = MP_OBJ_TO_PTR(args[0]);
+    ctlnetwork(CN_GET_NETINFO, &netinfo);
+    if (n_args == 1) {
+        // Get IP addresses
+        mp_obj_t tuple[4] = {
+            netutils_format_ipv4_addr(netinfo.ip, NETUTILS_BIG),
+            netutils_format_ipv4_addr(netinfo.sn, NETUTILS_BIG),
+            netutils_format_ipv4_addr(netinfo.gw, NETUTILS_BIG),
+            netutils_format_ipv4_addr(netinfo.dns, NETUTILS_BIG),
+        };
+        return mp_obj_new_tuple(4, tuple);
+    } else if (args[1] == MP_OBJ_NEW_QSTR(MP_QSTR_dhcp)) {
+        // Start the DHCP client
+        self->netinfo.dhcp = NETINFO_DHCP;
+        wiznet5k_dhcp_init((void *)self);
+        mp_obj_t tuple[4] = {
+            netutils_format_ipv4_addr(self->netinfo.ip, NETUTILS_BIG),
+            netutils_format_ipv4_addr(self->netinfo.sn, NETUTILS_BIG),
+            netutils_format_ipv4_addr(self->netinfo.gw, NETUTILS_BIG),
+            netutils_format_ipv4_addr(self->netinfo.dns, NETUTILS_BIG),
+
+        };
+        return mp_obj_new_tuple(4, tuple);
+
+    } else {
+        // Set static IP addresses
+        self->netinfo.dhcp = NETINFO_STATIC;
+        mp_obj_t *items;
+        mp_obj_get_array_fixed_n(args[1], 4, &items);
+        netutils_parse_ipv4_addr(items[0], netinfo.ip, NETUTILS_BIG);
+        netutils_parse_ipv4_addr(items[1], netinfo.sn, NETUTILS_BIG);
+        netutils_parse_ipv4_addr(items[2], netinfo.gw, NETUTILS_BIG);
+        netutils_parse_ipv4_addr(items[3], netinfo.dns, NETUTILS_BIG);
+        ctlnetwork(CN_SET_NETINFO, &netinfo);
+        return mp_const_none;
+    }
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(wiznet5k_ifconfig_obj, 1, 2, wiznet5k_ifconfig);
+#endif // WIZNET5K_PROVIDED_STACK
+
+#if WIZNET5K_WITH_LWIP_STACK
+
+STATIC mp_obj_t wiznet5k_ifconfig(size_t n_args, const mp_obj_t *args) {
+    wiznet5k_obj_t *self = MP_OBJ_TO_PTR(args[0]);
+    return mod_network_nic_ifconfig(&self->netif, n_args - 1, args + 1);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(wiznet5k_ifconfig_obj, 1, 2, wiznet5k_ifconfig);
+
+STATIC mp_obj_t send_ethernet_wrapper(mp_obj_t self_in, mp_obj_t buf_in) {
+    wiznet5k_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    mp_buffer_info_t buf;
+    mp_get_buffer_raise(buf_in, &buf, MP_BUFFER_READ);
+    wiznet5k_send_ethernet(self, buf.len, buf.buf);
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(send_ethernet_obj, send_ethernet_wrapper);
+
+#endif // MICROPY_PY_LWIP
+
+STATIC mp_obj_t wiznet5k_status(size_t n_args, const mp_obj_t *args) {
+    wiznet5k_obj_t *self = MP_OBJ_TO_PTR(args[0]);
+    (void)self;
+
+    if (n_args == 1) {
+        // No arguments: return link status
+        if (wizphy_getphylink() == PHY_LINK_ON) {
+            if (IS_ACTIVE(self)) {
+                return MP_OBJ_NEW_SMALL_INT(2);
+            } else {
+                return MP_OBJ_NEW_SMALL_INT(1);
+            }
+        } else {
+            return MP_OBJ_NEW_SMALL_INT(0);
+        }
+    }
+    mp_raise_ValueError(MP_ERROR_TEXT("unknown status param"));
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(wiznet5k_status_obj, 1, 2, wiznet5k_status);
+
+STATIC mp_obj_t wiznet5k_config(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs) {
+    wiznet5k_obj_t *self = MP_OBJ_TO_PTR(args[0]);
+
+    if (kwargs->used == 0) {
+        // Get config value
+        if (n_args != 2) {
+            mp_raise_TypeError(MP_ERROR_TEXT("must query one param"));
+        }
+
+        switch (mp_obj_str_get_qstr(args[1])) {
+            case MP_QSTR_mac: {
+                uint8_t buf[6];
+                wiznet5k_get_mac_address(self, buf);
+                return mp_obj_new_bytes(buf, 6);
+            }
+            default:
+                mp_raise_ValueError(MP_ERROR_TEXT("unknown config param"));
+        }
+    } else {
+        // Set config value(s)
+        if (n_args != 1) {
+            mp_raise_TypeError(MP_ERROR_TEXT("can't specify pos and kw args"));
+        }
+
+        for (size_t i = 0; i < kwargs->alloc; ++i) {
+            if (MP_MAP_SLOT_IS_FILLED(kwargs, i)) {
+                mp_map_elem_t *e = &kwargs->table[i];
+                switch (mp_obj_str_get_qstr(e->key)) {
+                    case MP_QSTR_mac: {
+                        mp_buffer_info_t buf;
+                        mp_get_buffer_raise(e->value, &buf, MP_BUFFER_READ);
+                        if (buf.len != 6) {
+                            mp_raise_ValueError(NULL);
+                        }
+                        setSHAR(buf.buf);
+                        #if WIZNET5K_WITH_LWIP_STACK
+                        memcpy(self->netif.hwaddr, buf.buf, 6);
+                        #endif
+                        break;
+                    }
+                    #if WIZNET5K_WITH_LWIP_STACK
+                    case MP_QSTR_trace: {
+                        self->trace_flags = mp_obj_get_int(e->value);
+                        break;
+                    }
+                    #endif
+                    default:
+                        mp_raise_ValueError(MP_ERROR_TEXT("unknown config param"));
+                }
+            }
+        }
+
+        return mp_const_none;
+    }
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_KW(wiznet5k_config_obj, 1, wiznet5k_config);
+
+STATIC const mp_rom_map_elem_t wiznet5k_locals_dict_table[] = {
+    { MP_ROM_QSTR(MP_QSTR_regs), MP_ROM_PTR(&wiznet5k_regs_obj) },
+    { MP_ROM_QSTR(MP_QSTR_isconnected), MP_ROM_PTR(&wiznet5k_isconnected_obj) },
+    { MP_ROM_QSTR(MP_QSTR_active), MP_ROM_PTR(&wiznet5k_active_obj) },
+    { MP_ROM_QSTR(MP_QSTR_ifconfig), MP_ROM_PTR(&wiznet5k_ifconfig_obj) },
+    { MP_ROM_QSTR(MP_QSTR_status), MP_ROM_PTR(&wiznet5k_status_obj) },
+    { MP_ROM_QSTR(MP_QSTR_config), MP_ROM_PTR(&wiznet5k_config_obj) },
+    #if WIZNET5K_WITH_LWIP_STACK
+    { MP_ROM_QSTR(MP_QSTR_send_ethernet), MP_ROM_PTR(&send_ethernet_obj) },
+    #endif
+};
+STATIC MP_DEFINE_CONST_DICT(wiznet5k_locals_dict, wiznet5k_locals_dict_table);
+
+#if WIZNET5K_WITH_LWIP_STACK
+const mp_obj_type_t mod_network_nic_type_wiznet5k = {
+    { &mp_type_type },
+    .name = MP_QSTR_WIZNET5K,
+    .make_new = wiznet5k_make_new,
+    .locals_dict = (mp_obj_dict_t *)&wiznet5k_locals_dict,
+};
+#else // WIZNET5K_PROVIDED_STACK
+const mod_network_nic_type_t mod_network_nic_type_wiznet5k = {
+    .base = {
+        { &mp_type_type },
+        .name = MP_QSTR_WIZNET5K,
+        .make_new = wiznet5k_make_new,
+        .locals_dict = (mp_obj_dict_t *)&wiznet5k_locals_dict,
+    },
+    .gethostbyname = wiznet5k_gethostbyname,
+    .socket = wiznet5k_socket_socket,
+    .close = wiznet5k_socket_close,
+    .bind = wiznet5k_socket_bind,
+    .listen = wiznet5k_socket_listen,
+    .accept = wiznet5k_socket_accept,
+    .connect = wiznet5k_socket_connect,
+    .send = wiznet5k_socket_send,
+    .recv = wiznet5k_socket_recv,
+    .sendto = wiznet5k_socket_sendto,
+    .recvfrom = wiznet5k_socket_recvfrom,
+    .setsockopt = wiznet5k_socket_setsockopt,
+    .settimeout = wiznet5k_socket_settimeout,
+    .ioctl = wiznet5k_socket_ioctl,
+};
+#endif
+
+#endif // MICROPY_PY_WIZNET5K

From 7d9cc69645c48e67fd404c494cebad1b90c5757d Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew@alelec.net>
Date: Fri, 29 Apr 2022 05:49:20 +1000
Subject: [PATCH 2139/3533] rp2/Makefile: Use cmake for "make submodules" task
 when needed.

Because the submodule list can be updated by cmake files.

Signed-off-by: Andrew Leech <andrew@alelec.net>
---
 ports/rp2/Makefile | 10 +++++++++-
 py/mkrules.cmake   |  7 +++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/ports/rp2/Makefile b/ports/rp2/Makefile
index 461a27acad890..a41bda7603072 100644
--- a/ports/rp2/Makefile
+++ b/ports/rp2/Makefile
@@ -19,7 +19,7 @@ CMAKE_ARGS += -DMICROPY_FROZEN_MANIFEST=${FROZEN_MANIFEST}
 endif
 
 all:
-	[ -d $(BUILD) ] || cmake -S . -B $(BUILD) -DPICO_BUILD_DOCS=0 ${CMAKE_ARGS}
+	[ -e $(BUILD)/CMakeCache.txt ] || cmake -S . -B $(BUILD) -DPICO_BUILD_DOCS=0 ${CMAKE_ARGS}
 	$(MAKE) $(MAKESILENT) -C $(BUILD)
 
 clean:
@@ -28,4 +28,12 @@ clean:
 GIT_SUBMODULES += lib/mbedtls lib/pico-sdk lib/tinyusb
 
 submodules:
+ifeq ($(BOARD),PICO)
+	# Run the standard submodules target with minimum required submodules above
 	$(MAKE) -f ../../py/mkrules.mk GIT_SUBMODULES="$(GIT_SUBMODULES)" submodules
+else
+	# Run submodules task through cmake interface to pick up any board specific dependencies.
+	GIT_SUBMODULES=$$(cmake -B $(BUILD)/submodules -DECHO_SUBMODULES=1 -DGIT_SUBMODULES="$(GIT_SUBMODULES)" ${CMAKE_ARGS} -S . 2>&1 | \
+	    grep 'GIT_SUBMODULES=' | cut -d= -f2); \
+	$(MAKE) -f ../../py/mkrules.mk GIT_SUBMODULES="$${GIT_SUBMODULES}" submodules
+endif
diff --git a/py/mkrules.cmake b/py/mkrules.cmake
index 261e153690d90..d0dc0196253ac 100644
--- a/py/mkrules.cmake
+++ b/py/mkrules.cmake
@@ -178,3 +178,10 @@ if(MICROPY_FROZEN_MANIFEST)
         VERBATIM
     )
 endif()
+
+# Update submodules
+if(ECHO_SUBMODULES)
+    # If cmake is run with GIT_SUBMODULES defined on command line, process the port / board
+    # settings then print the final GIT_SUBMODULES variable as a fatal error and exit.
+    message(FATAL_ERROR "GIT_SUBMODULES=${GIT_SUBMODULES}")
+endif()

From 15fea3a1ff9b7437e0fed54bd4a16c1708faf321 Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew@alelec.net>
Date: Thu, 5 May 2022 12:32:22 +1000
Subject: [PATCH 2140/3533] rp2: Integrate lwIP network stack.

Signed-off-by: Andrew Leech <andrew@alelec.net>
---
 extmod/extmod.cmake                | 56 +++++++++++++++++++
 extmod/modnetwork.h                |  1 +
 ports/rp2/CMakeLists.txt           | 23 ++++++++
 ports/rp2/lwip_inc/arch/cc.h       | 10 ++++
 ports/rp2/lwip_inc/arch/sys_arch.h |  1 +
 ports/rp2/lwip_inc/lwipopts.h      | 56 +++++++++++++++++++
 ports/rp2/main.c                   | 27 ++++++++-
 ports/rp2/mpconfigport.h           |  8 +++
 ports/rp2/mpnetworkport.c          | 90 ++++++++++++++++++++++++++++++
 9 files changed, 271 insertions(+), 1 deletion(-)
 create mode 100644 ports/rp2/lwip_inc/arch/cc.h
 create mode 100644 ports/rp2/lwip_inc/arch/sys_arch.h
 create mode 100644 ports/rp2/lwip_inc/lwipopts.h
 create mode 100644 ports/rp2/mpnetworkport.c

diff --git a/extmod/extmod.cmake b/extmod/extmod.cmake
index adaa04f131909..2d943f814cc4f 100644
--- a/extmod/extmod.cmake
+++ b/extmod/extmod.cmake
@@ -191,3 +191,59 @@ if(EXISTS "${MICROPY_LIB_MBEDTLS_DIR}/library/aes.c")
         "${MICROPY_LIB_MBEDTLS_DIR}/include"
     )
 endif()
+
+# Library for lwIP network stack
+
+set(MICROPY_LIB_LWIP_DIR "${MICROPY_DIR}/lib/lwip/src")
+
+if(EXISTS "${MICROPY_LIB_LWIP_DIR}/core/def.c")
+    add_library(micropy_lib_lwip INTERFACE)
+
+    target_include_directories(micropy_lib_lwip INTERFACE
+        ${MICROPY_LIB_LWIP_DIR}/include
+    )
+
+    target_sources(micropy_lib_lwip INTERFACE
+        ${MICROPY_DIR}/shared/netutils/netutils.c
+        ${MICROPY_LIB_LWIP_DIR}/apps/mdns/mdns.c
+        ${MICROPY_LIB_LWIP_DIR}/core/def.c
+        ${MICROPY_LIB_LWIP_DIR}/core/dns.c
+        ${MICROPY_LIB_LWIP_DIR}/core/inet_chksum.c
+        ${MICROPY_LIB_LWIP_DIR}/core/init.c
+        ${MICROPY_LIB_LWIP_DIR}/core/ip.c
+        ${MICROPY_LIB_LWIP_DIR}/core/ipv4/autoip.c
+        ${MICROPY_LIB_LWIP_DIR}/core/ipv4/dhcp.c
+        ${MICROPY_LIB_LWIP_DIR}/core/ipv4/etharp.c
+        ${MICROPY_LIB_LWIP_DIR}/core/ipv4/icmp.c
+        ${MICROPY_LIB_LWIP_DIR}/core/ipv4/igmp.c
+        ${MICROPY_LIB_LWIP_DIR}/core/ipv4/ip4.c
+        ${MICROPY_LIB_LWIP_DIR}/core/ipv4/ip4_addr.c
+        ${MICROPY_LIB_LWIP_DIR}/core/ipv4/ip4_frag.c
+        ${MICROPY_LIB_LWIP_DIR}/core/ipv6/dhcp6.c
+        ${MICROPY_LIB_LWIP_DIR}/core/ipv6/ethip6.c
+        ${MICROPY_LIB_LWIP_DIR}/core/ipv6/icmp6.c
+        ${MICROPY_LIB_LWIP_DIR}/core/ipv6/inet6.c
+        ${MICROPY_LIB_LWIP_DIR}/core/ipv6/ip6.c
+        ${MICROPY_LIB_LWIP_DIR}/core/ipv6/ip6_addr.c
+        ${MICROPY_LIB_LWIP_DIR}/core/ipv6/ip6_frag.c
+        ${MICROPY_LIB_LWIP_DIR}/core/ipv6/mld6.c
+        ${MICROPY_LIB_LWIP_DIR}/core/ipv6/nd6.c
+        ${MICROPY_LIB_LWIP_DIR}/core/mem.c
+        ${MICROPY_LIB_LWIP_DIR}/core/memp.c
+        ${MICROPY_LIB_LWIP_DIR}/core/netif.c
+        ${MICROPY_LIB_LWIP_DIR}/core/pbuf.c
+        ${MICROPY_LIB_LWIP_DIR}/core/raw.c
+        ${MICROPY_LIB_LWIP_DIR}/core/stats.c
+        ${MICROPY_LIB_LWIP_DIR}/core/sys.c
+        ${MICROPY_LIB_LWIP_DIR}/core/tcp.c
+        ${MICROPY_LIB_LWIP_DIR}/core/tcp_in.c
+        ${MICROPY_LIB_LWIP_DIR}/core/tcp_out.c
+        ${MICROPY_LIB_LWIP_DIR}/core/timeouts.c
+        ${MICROPY_LIB_LWIP_DIR}/core/udp.c
+        ${MICROPY_LIB_LWIP_DIR}/netif/ethernet.c
+    )
+
+    list(APPEND MICROPY_INC_CORE
+        ${MICROPY_LIB_LWIP_DIR}/include
+    )
+endif()
diff --git a/extmod/modnetwork.h b/extmod/modnetwork.h
index a4d86a71c12d5..0177df67d4483 100644
--- a/extmod/modnetwork.h
+++ b/extmod/modnetwork.h
@@ -49,6 +49,7 @@
 
 #if MICROPY_PY_LWIP
 struct netif;
+void mod_network_lwip_init(void);
 void mod_network_lwip_poll_wrapper(uint32_t ticks_ms);
 mp_obj_t mod_network_nic_ifconfig(struct netif *netif, size_t n_args, const mp_obj_t *args);
 #else
diff --git a/ports/rp2/CMakeLists.txt b/ports/rp2/CMakeLists.txt
index f25725f881ed9..d9e485f70238a 100644
--- a/ports/rp2/CMakeLists.txt
+++ b/ports/rp2/CMakeLists.txt
@@ -70,6 +70,7 @@ set(MICROPY_SOURCE_LIB
     ${MICROPY_DIR}/lib/oofatfs/ff.c
     ${MICROPY_DIR}/lib/oofatfs/ffunicode.c
     ${MICROPY_DIR}/shared/netutils/netutils.c
+    ${MICROPY_DIR}/shared/netutils/trace.c
     ${MICROPY_DIR}/shared/readline/readline.c
     ${MICROPY_DIR}/shared/runtime/gchelper_m0.s
     ${MICROPY_DIR}/shared/runtime/gchelper_native.c
@@ -169,6 +170,28 @@ set(PICO_SDK_COMPONENTS
     tinyusb_device
 )
 
+if (MICROPY_PY_LWIP)
+    target_link_libraries(${MICROPY_TARGET} micropy_lib_lwip)
+
+    target_include_directories(${MICROPY_TARGET} PRIVATE
+        lwip_inc
+    )
+    target_compile_definitions(${MICROPY_TARGET} PRIVATE
+        MICROPY_PY_LWIP=1
+    )
+
+    list(APPEND MICROPY_SOURCE_PORT
+        ${MICROPY_EXTMOD_DIR}/modlwip.c
+        mpnetworkport.c
+    )
+
+    list(APPEND MICROPY_SOURCE_QSTR
+        ${MICROPY_EXTMOD_DIR}/modlwip.c
+    )
+
+    string(CONCAT GIT_SUBMODULES "${GIT_SUBMODULES} " lib/lwip)
+endif()
+
 if(MICROPY_PY_BLUETOOTH)
     list(APPEND MICROPY_SOURCE_PORT mpbthciport.c)
     target_compile_definitions(${MICROPY_TARGET} PRIVATE
diff --git a/ports/rp2/lwip_inc/arch/cc.h b/ports/rp2/lwip_inc/arch/cc.h
new file mode 100644
index 0000000000000..c31e54e9d69b7
--- /dev/null
+++ b/ports/rp2/lwip_inc/arch/cc.h
@@ -0,0 +1,10 @@
+#ifndef MICROPY_INCLUDED_RP2_LWIP_ARCH_CC_H
+#define MICROPY_INCLUDED_RP2_LWIP_ARCH_CC_H
+
+#include <assert.h>
+#define LWIP_PLATFORM_DIAG(x)
+#define LWIP_PLATFORM_ASSERT(x)  { assert(1); }
+
+#define LWIP_NO_CTYPE_H 1
+
+#endif // MICROPY_INCLUDED_RP2_LWIP_ARCH_CC_H
diff --git a/ports/rp2/lwip_inc/arch/sys_arch.h b/ports/rp2/lwip_inc/arch/sys_arch.h
new file mode 100644
index 0000000000000..8b1a393741c96
--- /dev/null
+++ b/ports/rp2/lwip_inc/arch/sys_arch.h
@@ -0,0 +1 @@
+// empty
diff --git a/ports/rp2/lwip_inc/lwipopts.h b/ports/rp2/lwip_inc/lwipopts.h
new file mode 100644
index 0000000000000..55926af7e53de
--- /dev/null
+++ b/ports/rp2/lwip_inc/lwipopts.h
@@ -0,0 +1,56 @@
+#ifndef MICROPY_INCLUDED_RP2_LWIP_LWIPOPTS_H
+#define MICROPY_INCLUDED_RP2_LWIP_LWIPOPTS_H
+
+#include <stdint.h>
+
+// This protection is not needed, instead protect lwIP code with flags
+#define SYS_ARCH_DECL_PROTECT(lev) do { } while (0)
+#define SYS_ARCH_PROTECT(lev) do { } while (0)
+#define SYS_ARCH_UNPROTECT(lev) do { } while (0)
+
+#define NO_SYS                          1
+#define SYS_LIGHTWEIGHT_PROT            1
+#define MEM_ALIGNMENT                   4
+
+#define LWIP_CHKSUM_ALGORITHM           3
+// The checksum flags are set in eth.c
+#define LWIP_CHECKSUM_CTRL_PER_NETIF    1
+
+#define LWIP_ARP                        1
+#define LWIP_ETHERNET                   1
+#define LWIP_RAW                        1
+#define LWIP_NETCONN                    0
+#define LWIP_SOCKET                     0
+#define LWIP_STATS                      0
+#define LWIP_NETIF_HOSTNAME             1
+#define LWIP_NETIF_EXT_STATUS_CALLBACK  1
+
+#define LWIP_IPV6                       0
+#define LWIP_DHCP                       1
+#define LWIP_DHCP_CHECK_LINK_UP         1
+#define DHCP_DOES_ARP_CHECK             0 // to speed DHCP up
+#define LWIP_DNS                        1
+#define LWIP_DNS_SUPPORT_MDNS_QUERIES   1
+#define LWIP_MDNS_RESPONDER             1
+#define LWIP_IGMP                       1
+
+#define LWIP_NUM_NETIF_CLIENT_DATA      LWIP_MDNS_RESPONDER
+#define MEMP_NUM_UDP_PCB                (4 + LWIP_MDNS_RESPONDER)
+#define MEMP_NUM_SYS_TIMEOUT            (LWIP_NUM_SYS_TIMEOUT_INTERNAL + LWIP_MDNS_RESPONDER)
+
+#define SO_REUSE                        1
+#define TCP_LISTEN_BACKLOG              1
+
+extern uint32_t rosc_random_u32(void);
+#define LWIP_RAND() rosc_random_u32()
+
+// lwip takes 26700 bytes
+#define MEM_SIZE (8000)
+#define TCP_MSS (800)
+#define TCP_WND (8 * TCP_MSS)
+#define TCP_SND_BUF (8 * TCP_MSS)
+#define MEMP_NUM_TCP_SEG (32)
+
+typedef uint32_t sys_prot_t;
+
+#endif // MICROPY_INCLUDED_RP2_LWIP_LWIPOPTS_H
diff --git a/ports/rp2/main.c b/ports/rp2/main.c
index 02bfb6dae25de..da21e0b394793 100644
--- a/ports/rp2/main.c
+++ b/ports/rp2/main.c
@@ -48,9 +48,21 @@
 #include "pico/binary_info.h"
 #include "hardware/rtc.h"
 #include "hardware/structs/rosc.h"
+#if MICROPY_PY_LWIP
+#include "lwip/init.h"
+#include "lwip/apps/mdns.h"
+#endif
+
+#ifndef MICROPY_GC_HEAP_SIZE
+#if MICROPY_PY_LWIP
+#define MICROPY_GC_HEAP_SIZE 166 * 1024
+#else
+#define MICROPY_GC_HEAP_SIZE 192 * 1024
+#endif
+#endif
 
 extern uint8_t __StackTop, __StackBottom;
-static char gc_heap[192 * 1024];
+static char gc_heap[MICROPY_GC_HEAP_SIZE];
 
 // Embed version info in the binary in machine readable form
 bi_decl(bi_program_version_string(MICROPY_GIT_TAG));
@@ -96,6 +108,16 @@ int main(int argc, char **argv) {
     mp_stack_set_limit(&__StackTop - &__StackBottom - 256);
     gc_init(&gc_heap[0], &gc_heap[MP_ARRAY_SIZE(gc_heap)]);
 
+    #if MICROPY_PY_LWIP
+    // lwIP doesn't allow to reinitialise itself by subsequent calls to this function
+    // because the system timeout list (next_timeout) is only ever reset by BSS clearing.
+    // So for now we only init the lwIP stack once on power-up.
+    lwip_init();
+    #if LWIP_MDNS_RESPONDER
+    mdns_resp_init();
+    #endif
+    #endif
+
     for (;;) {
 
         // Initialise MicroPython runtime.
@@ -114,6 +136,9 @@ int main(int argc, char **argv) {
         #if MICROPY_PY_NETWORK
         mod_network_init();
         #endif
+        #if MICROPY_PY_LWIP
+        mod_network_lwip_init();
+        #endif
 
         // Execute _boot.py to set up the filesystem.
         #if MICROPY_VFS_FAT && MICROPY_HW_USB_MSC
diff --git a/ports/rp2/mpconfigport.h b/ports/rp2/mpconfigport.h
index 2ce8b88f3f8da..4cadc261749cd 100644
--- a/ports/rp2/mpconfigport.h
+++ b/ports/rp2/mpconfigport.h
@@ -106,6 +106,7 @@
 #define MICROPY_VFS_LFS2                        (1)
 #define MICROPY_VFS_FAT                         (1)
 #define MICROPY_SSL_MBEDTLS                     (1)
+#define MICROPY_PY_LWIP_SOCK_RAW                (MICROPY_PY_LWIP)
 
 // fatfs configuration
 #define MICROPY_FATFS_ENABLE_LFN                (1)
@@ -196,6 +197,11 @@ extern const struct _mod_network_nic_type_t mod_network_nic_type_nina;
 #define MICROPY_BEGIN_ATOMIC_SECTION()     save_and_disable_interrupts()
 #define MICROPY_END_ATOMIC_SECTION(state)  restore_interrupts(state)
 
+// Prevent the "lwIP task" from running when unsafe to do so.
+#define MICROPY_PY_LWIP_ENTER   lwip_lock_acquire();
+#define MICROPY_PY_LWIP_REENTER lwip_lock_acquire();
+#define MICROPY_PY_LWIP_EXIT    lwip_lock_release();
+
 #if MICROPY_HW_ENABLE_USBDEV
 #define MICROPY_HW_USBDEV_TASK_HOOK extern void tud_task(void); tud_task();
 #define MICROPY_VM_HOOK_COUNT (10)
@@ -233,3 +239,5 @@ typedef intptr_t mp_off_t;
 #define MICROPY_FROZEN_LIST_ITEM(name, file) bi_decl(bi_string(BINARY_INFO_TAG_MICROPYTHON, BINARY_INFO_ID_MP_FROZEN, name))
 
 extern uint32_t rosc_random_u32(void);
+extern void lwip_lock_acquire(void);
+extern void lwip_lock_release(void);
diff --git a/ports/rp2/mpnetworkport.c b/ports/rp2/mpnetworkport.c
new file mode 100644
index 0000000000000..1f59e28ea58db
--- /dev/null
+++ b/ports/rp2/mpnetworkport.c
@@ -0,0 +1,90 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2014 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "py/runtime.h"
+#include "py/mphal.h"
+
+#if MICROPY_PY_LWIP
+
+#include "lwip/timeouts.h"
+#include "pico/time.h"
+
+// Poll lwIP every 64ms by default
+#define LWIP_TICK_RATE_MS 64
+
+static alarm_id_t lwip_alarm_id = -1;
+static bool lwip_can_poll = true;
+static bool lwip_poll_pending = false;
+
+u32_t sys_now(void) {
+    // Used by LwIP
+    return mp_hal_ticks_ms();
+}
+
+STATIC uint32_t lwip_poll(void) {
+    // Run the lwIP internal updates
+    sys_check_timeouts();
+
+    return MAX(5, MIN(sys_timeouts_sleeptime(), LWIP_TICK_RATE_MS));
+}
+
+void lwip_lock_acquire(void) {
+    lwip_can_poll = false;
+}
+
+void lwip_lock_release(void) {
+    lwip_can_poll = false;
+    if (lwip_poll_pending) {
+        lwip_poll();
+        lwip_poll_pending = false;
+    }
+    lwip_can_poll = true;
+}
+
+uint32_t lwip_try_poll(void) {
+    uint32_t ret = LWIP_TICK_RATE_MS;
+    if (lwip_can_poll) {
+        lwip_can_poll = false;
+        ret = lwip_poll();
+        lwip_can_poll = true;
+    } else {
+        lwip_poll_pending = true;
+    }
+    return ret;
+}
+
+STATIC int64_t alarm_callback(alarm_id_t id, void *user_data) {
+    return lwip_try_poll();
+}
+
+void mod_network_lwip_init(void) {
+    if (lwip_alarm_id != -1) {
+        cancel_alarm(lwip_alarm_id);
+    }
+    lwip_alarm_id = add_alarm_in_ms(LWIP_TICK_RATE_MS, alarm_callback, mp_const_true, true);
+}
+
+#endif // MICROPY_PY_LWIP

From bca816f5ac36609212ab087789ee028d1d5d534d Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew@alelec.net>
Date: Thu, 5 May 2022 17:26:16 +1000
Subject: [PATCH 2141/3533] rp2: Add support for using Wiznet hardware as an
 Ethernet NIC.

Uses the extmod/network_wiznet5k driver to provide network connectivity.

Signed-off-by: Andrew Leech <andrew@alelec.net>
---
 ports/rp2/CMakeLists.txt  | 47 +++++++++++++++++++++++++++++++++++++++
 ports/rp2/machine_spi.c   |  9 ++++++++
 ports/rp2/modmachine.h    |  2 ++
 ports/rp2/mpconfigport.h  | 13 +++++++++++
 ports/rp2/mphalport.c     | 18 +++++++++++++++
 ports/rp2/mphalport.h     |  9 ++++++++
 ports/rp2/mpnetworkport.c | 32 ++++++++++++++++++++++++++
 7 files changed, 130 insertions(+)

diff --git a/ports/rp2/CMakeLists.txt b/ports/rp2/CMakeLists.txt
index d9e485f70238a..31284c8405fb2 100644
--- a/ports/rp2/CMakeLists.txt
+++ b/ports/rp2/CMakeLists.txt
@@ -244,6 +244,53 @@ if (MICROPY_PY_NETWORK_NINAW10)
     )
 endif()
 
+if (MICROPY_PY_WIZNET5K)
+    target_compile_definitions(${MICROPY_TARGET} PRIVATE
+        MICROPY_PY_WIZNET5K=1
+        WIZCHIP_PREFIXED_EXPORTS=1
+        _WIZCHIP_=${MICROPY_PY_WIZNET5K}
+        WIZCHIP_YIELD=mpy_wiznet_yield
+    )
+
+    if (MICROPY_PY_LWIP)
+        target_compile_definitions(${MICROPY_TARGET} PRIVATE
+            # When using MACRAW mode (with lwIP), maximum buffer space must be used for the raw socket
+            WIZCHIP_USE_MAX_BUFFER=1
+        )
+    endif()
+
+    target_include_directories(${MICROPY_TARGET} PRIVATE
+        ${MICROPY_DIR}/lib/wiznet5k/
+        ${MICROPY_DIR}/lib/wiznet5k/Ethernet/
+    )
+
+    list(APPEND MICROPY_SOURCE_LIB
+        ${MICROPY_DIR}/lib/wiznet5k/Ethernet/W5100/w5100.c
+        ${MICROPY_DIR}/lib/wiznet5k/Ethernet/W5100S/w5100s.c
+        ${MICROPY_DIR}/lib/wiznet5k/Ethernet/W5200/w5200.c
+        ${MICROPY_DIR}/lib/wiznet5k/Ethernet/W5300/w5300.c
+        ${MICROPY_DIR}/lib/wiznet5k/Ethernet/W5500/w5500.c
+        ${MICROPY_DIR}/lib/wiznet5k/Ethernet/socket.c
+        ${MICROPY_DIR}/lib/wiznet5k/Ethernet/wizchip_conf.c
+        ${MICROPY_DIR}/lib/wiznet5k/Internet/DNS/dns.c
+        ${MICROPY_DIR}/lib/wiznet5k/Internet/DHCP/dhcp.c
+    )
+
+    list(APPEND MICROPY_SOURCE_EXTMOD
+        ${MICROPY_DIR}/extmod/modnetwork.c
+        ${MICROPY_DIR}/extmod/modusocket.c
+        ${MICROPY_DIR}/extmod/network_wiznet5k.c
+    )
+
+    list(APPEND MICROPY_SOURCE_QSTR
+        ${MICROPY_DIR}/extmod/modnetwork.c
+        ${MICROPY_DIR}/extmod/modusocket.c
+        ${MICROPY_DIR}/extmod/network_wiznet5k.c
+    )
+
+    string(CONCAT GIT_SUBMODULES "${GIT_SUBMODULES} " lib/wiznet5k)
+endif()
+
 # Define mpy-cross flags
 set(MICROPY_CROSS_FLAGS -march=armv7m)
 
diff --git a/ports/rp2/machine_spi.c b/ports/rp2/machine_spi.c
index 332f44694548d..742a3cfddf44d 100644
--- a/ports/rp2/machine_spi.c
+++ b/ports/rp2/machine_spi.c
@@ -269,6 +269,15 @@ STATIC void machine_spi_transfer(mp_obj_base_t *self_in, size_t len, const uint8
     }
 }
 
+machine_spi_obj_t *spi_from_mp_obj(mp_obj_t o) {
+    if (mp_obj_is_type(o, &machine_spi_type)) {
+        machine_spi_obj_t *self = MP_OBJ_TO_PTR(o);
+        return self;
+    } else {
+        mp_raise_TypeError(MP_ERROR_TEXT("expecting an SPI object"));
+    }
+}
+
 STATIC const mp_machine_spi_p_t machine_spi_p = {
     .init = machine_spi_init,
     .transfer = machine_spi_transfer,
diff --git a/ports/rp2/modmachine.h b/ports/rp2/modmachine.h
index af02cd193dff2..0635ff248706f 100644
--- a/ports/rp2/modmachine.h
+++ b/ports/rp2/modmachine.h
@@ -17,4 +17,6 @@ void machine_pin_init(void);
 void machine_pin_deinit(void);
 void machine_i2s_init0(void);
 
+struct _machine_spi_obj_t *spi_from_mp_obj(mp_obj_t o);
+
 #endif // MICROPY_INCLUDED_RP2_MODMACHINE_H
diff --git a/ports/rp2/mpconfigport.h b/ports/rp2/mpconfigport.h
index 4cadc261749cd..e2d0ffd2246ee 100644
--- a/ports/rp2/mpconfigport.h
+++ b/ports/rp2/mpconfigport.h
@@ -77,6 +77,7 @@
 #define MICROPY_PY_SYS_PLATFORM                 "rp2"
 #define MICROPY_PY_THREAD                       (1)
 #define MICROPY_PY_THREAD_GIL                   (0)
+#define MICROPY_THREAD_YIELD()                  mp_handle_pending(true)
 
 // Extended modules
 #define MICROPY_EPOCH_IS_1970                   (1)
@@ -163,12 +164,24 @@ extern const struct _mod_network_nic_type_t mod_network_nic_type_nina;
 #define MICROPY_PORT_ROOT_POINTER_NINAW10
 #endif
 
+#if MICROPY_PY_WIZNET5K
+#if MICROPY_PY_LWIP
+extern const struct _mp_obj_type_t mod_network_nic_type_wiznet5k;
+#else
+extern const struct _mod_network_nic_type_t mod_network_nic_type_wiznet5k;
+#endif
+#define MICROPY_HW_NIC_WIZNET5K             { MP_ROM_QSTR(MP_QSTR_WIZNET5K), MP_ROM_PTR(&mod_network_nic_type_wiznet5k) },
+#else
+#define MICROPY_HW_NIC_WIZNET5K
+#endif
+
 #ifndef MICROPY_BOARD_NETWORK_INTERFACES
 #define MICROPY_BOARD_NETWORK_INTERFACES
 #endif
 
 #define MICROPY_PORT_NETWORK_INTERFACES \
     MICROPY_HW_NIC_NINAW10  \
+    MICROPY_HW_NIC_WIZNET5K \
     MICROPY_BOARD_NETWORK_INTERFACES \
 
 #ifndef MICROPY_BOARD_ROOT_POINTERS
diff --git a/ports/rp2/mphalport.c b/ports/rp2/mphalport.c
index 4a5221caec99d..4ed648de07514 100644
--- a/ports/rp2/mphalport.c
+++ b/ports/rp2/mphalport.c
@@ -33,6 +33,7 @@
 #include "tusb.h"
 #include "uart.h"
 #include "hardware/rtc.h"
+#include "pico/unique_id.h"
 
 #if MICROPY_HW_ENABLE_UART_REPL || MICROPY_HW_ENABLE_USBDEV
 
@@ -164,3 +165,20 @@ uint64_t mp_hal_time_ns(void) {
     uint64_t s = timeutils_seconds_since_epoch(t.year, t.month, t.day, t.hour, t.min, t.sec);
     return s * 1000000000ULL;
 }
+
+// Generate a random locally administered MAC address (LAA)
+void mp_hal_generate_laa_mac(int idx, uint8_t buf[6]) {
+    pico_unique_board_id_t pid;
+    pico_get_unique_board_id(&pid);
+    buf[0] = 0x02; // LAA range
+    buf[1] = (pid.id[7] << 4) | (pid.id[6] & 0xf);
+    buf[2] = (pid.id[5] << 4) | (pid.id[4] & 0xf);
+    buf[3] = (pid.id[3] << 4) | (pid.id[2] & 0xf);
+    buf[4] = pid.id[1];
+    buf[5] = (pid.id[0] << 2) | idx;
+}
+
+// A board can override this if needed
+MP_WEAK void mp_hal_get_mac(int idx, uint8_t buf[6]) {
+    mp_hal_generate_laa_mac(idx, buf);
+}
diff --git a/ports/rp2/mphalport.h b/ports/rp2/mphalport.h
index 0aebf7d74724e..88eef1308dcd6 100644
--- a/ports/rp2/mphalport.h
+++ b/ports/rp2/mphalport.h
@@ -136,4 +136,13 @@ enum mp_hal_pin_interrupt_trigger {
 
 void mp_hal_pin_interrupt(mp_hal_pin_obj_t pin, mp_obj_t handler, mp_uint_t trigger, bool hard);
 
+enum {
+    MP_HAL_MAC_WLAN0 = 0,
+    MP_HAL_MAC_BDADDR,
+    MP_HAL_MAC_ETH0,
+};
+
+void mp_hal_get_mac(int idx, uint8_t buf[6]);
+void mp_hal_generate_laa_mac(int idx, uint8_t buf[6]);
+
 #endif // MICROPY_INCLUDED_RP2_MPHALPORT_H
diff --git a/ports/rp2/mpnetworkport.c b/ports/rp2/mpnetworkport.c
index 1f59e28ea58db..7ee10bb03e0fd 100644
--- a/ports/rp2/mpnetworkport.c
+++ b/ports/rp2/mpnetworkport.c
@@ -39,6 +39,13 @@ static alarm_id_t lwip_alarm_id = -1;
 static bool lwip_can_poll = true;
 static bool lwip_poll_pending = false;
 
+#if MICROPY_PY_WIZNET5K
+static bool wiznet_poll_pending = false;
+
+void wiznet5k_poll(void);
+void wiznet5k_deinit(void);
+#endif
+
 u32_t sys_now(void) {
     // Used by LwIP
     return mp_hal_ticks_ms();
@@ -57,6 +64,13 @@ void lwip_lock_acquire(void) {
 
 void lwip_lock_release(void) {
     lwip_can_poll = false;
+    #if MICROPY_PY_WIZNET5K
+    if (wiznet_poll_pending) {
+        wiznet5k_poll();
+        wiznet_poll_pending = false;
+    }
+    #endif
+
     if (lwip_poll_pending) {
         lwip_poll();
         lwip_poll_pending = false;
@@ -76,11 +90,29 @@ uint32_t lwip_try_poll(void) {
     return ret;
 }
 
+#if MICROPY_PY_WIZNET5K
+void wiznet5k_try_poll(void) {
+    if (lwip_can_poll) {
+        lwip_can_poll = false;
+        wiznet5k_poll();
+        lwip_can_poll = true;
+    } else {
+        wiznet_poll_pending = true;
+    }
+}
+#endif
+
 STATIC int64_t alarm_callback(alarm_id_t id, void *user_data) {
+    #if MICROPY_PY_WIZNET5K
+    wiznet5k_try_poll();
+    #endif
     return lwip_try_poll();
 }
 
 void mod_network_lwip_init(void) {
+    #if MICROPY_PY_WIZNET5K
+    wiznet5k_deinit();
+    #endif
     if (lwip_alarm_id != -1) {
         cancel_alarm(lwip_alarm_id);
     }

From 1b80aa9ce3d283e2fd8ebfd34f377c60c24217e0 Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew@alelec.net>
Date: Fri, 29 Apr 2022 15:43:18 +1000
Subject: [PATCH 2142/3533] rp2/boards/W5100S_EVB_PICO: Add Wiznet
 W5100S-EVB-Pico board.

Signed-off-by: Andrew Leech <andrew@alelec.net>
---
 ports/rp2/boards/W5100S_EVB_PICO/board.json   | 20 ++++++++++++++++++
 .../W5100S_EVB_PICO/mpconfigboard.cmake       |  4 ++++
 .../boards/W5100S_EVB_PICO/mpconfigboard.h    | 21 +++++++++++++++++++
 ports/rp2/boards/W5100S_EVB_PICO/readme.md    | 15 +++++++++++++
 4 files changed, 60 insertions(+)
 create mode 100644 ports/rp2/boards/W5100S_EVB_PICO/board.json
 create mode 100644 ports/rp2/boards/W5100S_EVB_PICO/mpconfigboard.cmake
 create mode 100644 ports/rp2/boards/W5100S_EVB_PICO/mpconfigboard.h
 create mode 100644 ports/rp2/boards/W5100S_EVB_PICO/readme.md

diff --git a/ports/rp2/boards/W5100S_EVB_PICO/board.json b/ports/rp2/boards/W5100S_EVB_PICO/board.json
new file mode 100644
index 0000000000000..4091b78433e4a
--- /dev/null
+++ b/ports/rp2/boards/W5100S_EVB_PICO/board.json
@@ -0,0 +1,20 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [
+        "Breadboard Friendly",
+        "Castellated Pads",
+        "Ethernet",
+        "Micro USB"
+    ],
+    "images": [
+        "W5100S-EVB-Pico.jpg"
+    ],
+    "mcu": "rp2040",
+    "product": "Wiznet W5100S-EVB-Pico",
+    "thumbnail": "",
+    "url": "https://www.wiznet.io/product-item/w5100s-evb-pico/",
+    "vendor": "Wiznet"
+}
diff --git a/ports/rp2/boards/W5100S_EVB_PICO/mpconfigboard.cmake b/ports/rp2/boards/W5100S_EVB_PICO/mpconfigboard.cmake
new file mode 100644
index 0000000000000..fc5db6e4af2e5
--- /dev/null
+++ b/ports/rp2/boards/W5100S_EVB_PICO/mpconfigboard.cmake
@@ -0,0 +1,4 @@
+# cmake file for Wiznet W5100S-EVB-Pico.
+set(PICO_BOARD pico)
+set(MICROPY_PY_WIZNET5K W5100S)
+set(MICROPY_PY_LWIP 1)
diff --git a/ports/rp2/boards/W5100S_EVB_PICO/mpconfigboard.h b/ports/rp2/boards/W5100S_EVB_PICO/mpconfigboard.h
new file mode 100644
index 0000000000000..3816e40138b78
--- /dev/null
+++ b/ports/rp2/boards/W5100S_EVB_PICO/mpconfigboard.h
@@ -0,0 +1,21 @@
+// Board config for Wiznet W5100S-EVB-Pico.
+
+// Board and hardware specific configuration
+#define MICROPY_HW_BOARD_NAME             "W5100S-EVB-Pico"
+#define MICROPY_HW_FLASH_STORAGE_BYTES    (1408 * 1024)
+
+// Enable networking and sockets.
+#define MICROPY_PY_NETWORK                (1)
+#define MICROPY_PY_USOCKET                (1)
+#define MICROPY_PY_USSL                   (1)
+
+// Wiznet HW config.
+#define MICROPY_HW_WIZNET_SPI_ID          (0)
+#define MICROPY_HW_WIZNET_SPI_BAUDRATE    (20 * 1000 * 1000)
+#define MICROPY_HW_WIZNET_SPI_SCK         (18)
+#define MICROPY_HW_WIZNET_SPI_MOSI        (19)
+#define MICROPY_HW_WIZNET_SPI_MISO        (16)
+#define MICROPY_HW_WIZNET_PIN_CS          (17)
+#define MICROPY_HW_WIZNET_PIN_RST         (20)
+// Connecting the INTN pin enables RECV interrupt handling of incoming data.
+#define MICROPY_HW_WIZNET_PIN_INTN        (21)
diff --git a/ports/rp2/boards/W5100S_EVB_PICO/readme.md b/ports/rp2/boards/W5100S_EVB_PICO/readme.md
new file mode 100644
index 0000000000000..991627e997636
--- /dev/null
+++ b/ports/rp2/boards/W5100S_EVB_PICO/readme.md
@@ -0,0 +1,15 @@
+# Wiznet W5100S-EVB-Pico
+
+## Network Example
+
+To use network / socket based code, connect ethernet port to network with DHCP running:
+
+```
+>>> import network
+>>> nic = network.WIZNET5K()
+>>> nic.ifconfig()
+('192.168.0.18', '255.255.255.0', '192.168.0.1', '8.8.8.8')
+>>> nic.dhcp(True)
+('192.168.0.10', '255.255.255.0', '192.168.0.1', '192.168.0.1')
+```
+At this point standard network communications libraries should work.

From ffe5f2efe22562736428ccbd1b91943b18422527 Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew@alelec.net>
Date: Wed, 27 Apr 2022 18:43:26 +1000
Subject: [PATCH 2143/3533] rp2/Makefile: Build in debug mode with "make
 DEBUG=1".

Signed-off-by: Andrew Leech <andrew@alelec.net>
---
 ports/rp2/Makefile | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ports/rp2/Makefile b/ports/rp2/Makefile
index a41bda7603072..c2138a340a1fa 100644
--- a/ports/rp2/Makefile
+++ b/ports/rp2/Makefile
@@ -18,6 +18,10 @@ ifneq ($(FROZEN_MANIFEST),)
 CMAKE_ARGS += -DMICROPY_FROZEN_MANIFEST=${FROZEN_MANIFEST}
 endif
 
+ifeq ($(DEBUG),1)
+CMAKE_ARGS += -DCMAKE_BUILD_TYPE=Debug
+endif
+
 all:
 	[ -e $(BUILD)/CMakeCache.txt ] || cmake -S . -B $(BUILD) -DPICO_BUILD_DOCS=0 ${CMAKE_ARGS}
 	$(MAKE) $(MAKESILENT) -C $(BUILD)

From 4188bbd3d3fb52518994a5570fc10fe7549071ad Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew@alelec.net>
Date: Fri, 29 Apr 2022 20:24:19 +1000
Subject: [PATCH 2144/3533] extmod/modussl_mbedtls: Poll EVENT_POLL_HOOK in ssl
 handshake loop.

Otherwise this is essentially an infinite loop on ports that do not use
interrupts to service network interfaces.

Signed-off-by: Andrew Leech <andrew@alelec.net>
---
 extmod/modussl_mbedtls.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/extmod/modussl_mbedtls.c b/extmod/modussl_mbedtls.c
index 0d5d4197ccb75..44668ae63bbad 100644
--- a/extmod/modussl_mbedtls.c
+++ b/extmod/modussl_mbedtls.c
@@ -242,6 +242,9 @@ STATIC mp_obj_ssl_socket_t *socket_new(mp_obj_t sock, struct ssl_args *args) {
             if (ret != MBEDTLS_ERR_SSL_WANT_READ && ret != MBEDTLS_ERR_SSL_WANT_WRITE) {
                 goto cleanup;
             }
+            #ifdef MICROPY_EVENT_POLL_HOOK
+            MICROPY_EVENT_POLL_HOOK
+            #endif
         }
     }
 

From 73a1ea881231e544ae7bc1f2b56064d61ed296e7 Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew@alelec.net>
Date: Fri, 29 Apr 2022 21:54:53 +1000
Subject: [PATCH 2145/3533] tests/net_inet: Remove broken api.telegram.org from
 tests.

Signed-off-by: Andrew Leech <andrew@alelec.net>
---
 tests/net_inet/test_tls_nonblock.py  | 1 -
 tests/net_inet/test_tls_sites.py     | 1 -
 tests/net_inet/test_tls_sites.py.exp | 1 -
 3 files changed, 3 deletions(-)

diff --git a/tests/net_inet/test_tls_nonblock.py b/tests/net_inet/test_tls_nonblock.py
index 54abc6966fc05..b4f2ef4ed2708 100644
--- a/tests/net_inet/test_tls_nonblock.py
+++ b/tests/net_inet/test_tls_nonblock.py
@@ -94,7 +94,6 @@ def test_one(site, opts):
     {"host": "www.google.com"},
     "micropython.org",
     "pypi.org",
-    "api.telegram.org",
     {"host": "api.pushbullet.com", "sni": True},
 ]
 
diff --git a/tests/net_inet/test_tls_sites.py b/tests/net_inet/test_tls_sites.py
index 3f945efb83150..fabe4b43c9cee 100644
--- a/tests/net_inet/test_tls_sites.py
+++ b/tests/net_inet/test_tls_sites.py
@@ -40,7 +40,6 @@ def test_one(site, opts):
     "www.google.com",
     "micropython.org",
     "pypi.org",
-    "api.telegram.org",
     {"host": "api.pushbullet.com", "sni": True},
 ]
 
diff --git a/tests/net_inet/test_tls_sites.py.exp b/tests/net_inet/test_tls_sites.py.exp
index bc4a8dbd115db..09faa336a7151 100644
--- a/tests/net_inet/test_tls_sites.py.exp
+++ b/tests/net_inet/test_tls_sites.py.exp
@@ -2,5 +2,4 @@ google.com ok
 www.google.com ok
 micropython.org ok
 pypi.org ok
-api.telegram.org ok
 api.pushbullet.com ok

From b7a39ad2d19a5be4b5a1a16c184e08be0d602b1a Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew@alelec.net>
Date: Fri, 29 Apr 2022 22:47:58 +1000
Subject: [PATCH 2146/3533] tests/run-multitests.py: Read IP address from boot
 nic if available.

This works if your network is pre-configured in boot.py as an object called
"nic".  Without this, multitests expects to access the WLAN/LAN class which
isn't always correct.

Signed-off-by: Andrew Leech <andrew@alelec.net>
---
 tests/run-multitests.py | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/tests/run-multitests.py b/tests/run-multitests.py
index bb3ef185dacc1..d8a4a48fa755a 100755
--- a/tests/run-multitests.py
+++ b/tests/run-multitests.py
@@ -63,13 +63,16 @@ def globals(**gs):
     @staticmethod
     def get_network_ip():
         try:
-            import network
-            if hasattr(network, "WLAN"):
-                ip = network.WLAN().ifconfig()[0]
-            else:
-                ip = network.LAN().ifconfig()[0]
+            ip = nic.ifconfig()[0]
         except:
-            ip = HOST_IP
+            try:
+                import network
+                if hasattr(network, "WLAN"):
+                    ip = network.WLAN().ifconfig()[0]
+                else:
+                    ip = network.LAN().ifconfig()[0]
+            except:
+                ip = HOST_IP
         return ip
 
 {}

From b92e51efe740dc7704bbb0ea47c4fb12be25672d Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew@alelec.net>
Date: Thu, 26 May 2022 13:21:55 +1000
Subject: [PATCH 2147/3533] tools/ci.sh: Add build of W5100S_EVB_PICO board to
 rp2 CI.

This exercises the inclusion of a number of libraries in the rp2 port
including mbedtls and lwip.

Signed-off-by: Andrew Leech <andrew@alelec.net>
---
 tools/ci.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tools/ci.sh b/tools/ci.sh
index 67be9dad72731..546f9781fd2bc 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -276,6 +276,8 @@ function ci_rp2_build {
     make ${MAKEOPTS} -C ports/rp2
     make ${MAKEOPTS} -C ports/rp2 clean
     make ${MAKEOPTS} -C ports/rp2 USER_C_MODULES=../../examples/usercmodule/micropython.cmake
+    make ${MAKEOPTS} -C ports/rp2 BOARD=W5100S_EVB_PICO submodules
+    make ${MAKEOPTS} -C ports/rp2 BOARD=W5100S_EVB_PICO
 }
 
 ########################################################################################

From 2111ca0b8fdcbef6177a8d37fde53085de2a798a Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Fri, 22 Apr 2022 14:37:11 +0200
Subject: [PATCH 2148/3533] rp2/boards/ARDUINO_NANO_RP2040_CONNECT: Update USB
 PID.

This PID is allocated for the Arduino Nano RP2040 running MicroPython.
---
 ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/mpconfigboard.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/mpconfigboard.h b/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/mpconfigboard.h
index ed1d2cdcf469b..6d04e3e1d06b4 100644
--- a/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/mpconfigboard.h
+++ b/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/mpconfigboard.h
@@ -18,7 +18,7 @@
 // Enable USB Mass Storage with FatFS filesystem.
 #define MICROPY_HW_USB_MSC              (1)
 #define MICROPY_HW_USB_VID              (0x2341)
-#define MICROPY_HW_USB_PID              (0x015e)
+#define MICROPY_HW_USB_PID              (0x025e)
 
 // UART 1 config.
 #define MICROPY_HW_UART1_TX             (8)

From b37b57821476d9ea80cdcc89d325dcabded3ffb7 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 26 May 2022 10:51:29 +1000
Subject: [PATCH 2149/3533] py/persistentcode: Remove remaining native qstr
 linking support.

Support for architecture-specific qstr linking was removed in
d4d53e9e114d779523e382c4ea38f0398e880aae, where native code was changed to
access qstr values via qstr_table.  The only remaining use for the special
qstr link table in persistentcode.c is to support native module written in
C, linked via mpy_ld.py.  But native modules can also use the standard
module-level qstr_table (and obj_table) which was introduced in the .mpy
file reworking in f2040bfc7ee033e48acef9f289790f3b4e6b74e5.

This commit removes the remaining native qstr liking support in
persistentcode.c's load_raw_code function, and adds two new relocation
options for constants.qstr_table and constants.obj_table.  mpy_ld.py is
updated to use these relocations options instead of the native qstr link
table.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/persistentcode.c                       | 40 +++-------
 tests/micropython/import_mpy_native.py    |  5 +-
 tests/micropython/import_mpy_native_gc.py |  4 +-
 tools/mpy-tool.py                         | 12 ---
 tools/mpy_ld.py                           | 91 ++++++++++-------------
 5 files changed, 56 insertions(+), 96 deletions(-)

diff --git a/py/persistentcode.c b/py/persistentcode.c
index d19a817aa5bf2..6304d1ff08481 100644
--- a/py/persistentcode.c
+++ b/py/persistentcode.c
@@ -71,6 +71,7 @@ STATIC size_t read_uint(mp_reader_t *reader);
 
 typedef struct _reloc_info_t {
     mp_reader_t *reader;
+    mp_module_context_t *context;
     uint8_t *rodata;
     uint8_t *bss;
 } reloc_info_t;
@@ -112,11 +113,17 @@ void mp_native_relocate(void *ri_in, uint8_t *text, uintptr_t reloc_text) {
                 dest = (uintptr_t)ri->bss;
             }
         } else if (op == 6) {
+            // Destination is qstr_table
+            dest = (uintptr_t)ri->context->constants.qstr_table;
+        } else if (op == 7) {
+            // Destination is obj_table
+            dest = (uintptr_t)ri->context->constants.obj_table;
+        } else if (op == 8) {
             // Destination is mp_fun_table itself
             dest = (uintptr_t)&mp_fun_table;
         } else {
             // Destination is an entry in mp_fun_table
-            dest = ((uintptr_t *)&mp_fun_table)[op - 7];
+            dest = ((uintptr_t *)&mp_fun_table)[op - 9];
         }
         while (n--) {
             *addr_to_adjust++ += dest;
@@ -205,7 +212,7 @@ STATIC mp_obj_t load_obj(mp_reader_t *reader) {
     }
 }
 
-STATIC mp_raw_code_t *load_raw_code(mp_reader_t *reader) {
+STATIC mp_raw_code_t *load_raw_code(mp_reader_t *reader, mp_module_context_t *context) {
     // Load function kind and data length
     size_t kind_len = read_uint(reader);
     int kind = (kind_len & 3) + MP_CODE_BYTECODE;
@@ -239,24 +246,6 @@ STATIC mp_raw_code_t *load_raw_code(mp_reader_t *reader) {
         MP_PLAT_ALLOC_EXEC(fun_data_len, (void **)&fun_data, &fun_alloc);
         read_bytes(reader, fun_data, fun_data_len);
 
-        if (kind == MP_CODE_NATIVE_PY || kind == MP_CODE_NATIVE_VIPER) {
-            // Parse qstr link table and link native code
-            size_t n_qstr_link = read_uint(reader);
-            for (size_t i = 0; i < n_qstr_link; ++i) {
-                size_t off = read_uint(reader);
-                qstr qst = load_qstr(reader);
-                uint8_t *dest = fun_data + (off >> 2);
-                if ((off & 3) == 0) {
-                    // Generic 16-bit link
-                    dest[0] = qst & 0xff;
-                    dest[1] = (qst >> 8) & 0xff;
-                } else if ((off & 3) == 3) {
-                    // Generic, aligned qstr-object link
-                    *(mp_obj_t *)dest = MP_OBJ_NEW_QSTR(qst);
-                }
-            }
-        }
-
         if (kind == MP_CODE_NATIVE_PY) {
             // Read prelude offset within fun_data, and extract scope flags.
             prelude_offset = read_uint(reader);
@@ -315,7 +304,7 @@ STATIC mp_raw_code_t *load_raw_code(mp_reader_t *reader) {
         n_children = read_uint(reader);
         children = m_new(mp_raw_code_t *, n_children + (kind == MP_CODE_NATIVE_PY));
         for (size_t i = 0; i < n_children; ++i) {
-            children[i] = load_raw_code(reader);
+            children[i] = load_raw_code(reader, context);
         }
     }
 
@@ -349,7 +338,7 @@ STATIC mp_raw_code_t *load_raw_code(mp_reader_t *reader) {
         #endif
 
         // Relocate and commit code to executable address space
-        reloc_info_t ri = {reader, rodata, bss};
+        reloc_info_t ri = {reader, context, rodata, bss};
         #if defined(MP_PLAT_COMMIT_EXEC)
         void *opt_ri = (native_scope_flags & MP_SCOPE_FLAG_VIPERRELOC) ? &ri : NULL;
         fun_data = MP_PLAT_COMMIT_EXEC(fun_data, fun_data_len, opt_ri);
@@ -429,7 +418,7 @@ mp_compiled_module_t mp_raw_code_load(mp_reader_t *reader, mp_module_context_t *
 
     // Load top-level module.
     mp_compiled_module_t cm2;
-    cm2.rc = load_raw_code(reader);
+    cm2.rc = load_raw_code(reader, context);
     cm2.context = context;
 
     #if MICROPY_PERSISTENT_CODE_SAVE
@@ -567,11 +556,6 @@ STATIC void save_raw_code(mp_print_t *print, const mp_raw_code_t *rc) {
     mp_print_bytes(print, rc->fun_data, rc->fun_data_len);
 
     #if MICROPY_EMIT_MACHINE_CODE
-    if (rc->kind == MP_CODE_NATIVE_PY || rc->kind == MP_CODE_NATIVE_VIPER) {
-        // Save qstr link table for native code
-        mp_print_uint(print, 0);
-    }
-
     if (rc->kind == MP_CODE_NATIVE_PY) {
         // Save prelude size
         mp_print_uint(print, rc->prelude_offset);
diff --git a/tests/micropython/import_mpy_native.py b/tests/micropython/import_mpy_native.py
index d7da16581b9ff..449371ddac06a 100644
--- a/tests/micropython/import_mpy_native.py
+++ b/tests/micropython/import_mpy_native.py
@@ -74,9 +74,7 @@ def open(self, path, mode):
         b'\x02' # 2 children
 
             b'\x42' # 8 bytes, no children, viper code
-                b'\x00\x00\x00\x00\x00\x00' # dummy machine code
-                b'\x00\x00' # slot for qstr0
-                b'\x01\x0c\x0aprint\x00' # n_qstr=1, qstr0
+                b'\x00\x00\x00\x00\x00\x00\x00\x00' # dummy machine code
                 b'\x00' # scope_flags
 
             b'\x43' # 8 bytes, no children, asm code
@@ -102,7 +100,6 @@ def open(self, path, mode):
 
             b'\x22' # 4 bytes, no children, viper code
                 b'\x00\x00\x00\x00' # dummy machine code
-                b'\x00' # n_qstr=0
                 b'\x70' # scope_flags: VIPERBSS | VIPERRODATA | VIPERRELOC
                 b'\x06\x04' # rodata=6 bytes, bss=4 bytes
                 b'rodata' # rodata content
diff --git a/tests/micropython/import_mpy_native_gc.py b/tests/micropython/import_mpy_native_gc.py
index aac3375af46e2..bc8dcafdc7637 100644
--- a/tests/micropython/import_mpy_native_gc.py
+++ b/tests/micropython/import_mpy_native_gc.py
@@ -49,9 +49,9 @@ def open(self, path, mode):
 # by the required value of sys.implementation._mpy.
 features0_file_contents = {
     # -march=x64
-    0x806: b'M\x06\b\x1f\x01\x004build/features0.native.mpy\x00\x8aB\xe9/\x00\x00\x00SH\x8b\x1d\x83\x00\x00\x00\xbe\x02\x00\x00\x00\xffS\x18\xbf\x01\x00\x00\x00H\x85\xc0u\x0cH\x8bC \xbe\x02\x00\x00\x00[\xff\xe0H\x0f\xaf\xf8H\xff\xc8\xeb\xe6ATUSH\x8b\x1dQ\x00\x00\x00H\x8bG\x08L\x8bc(H\x8bx\x08A\xff\xd4H\x8d5+\x00\x00\x00H\x89\xc5H\x8b\x059\x00\x00\x00\x0f\xb78\xffShH\x89\xefA\xff\xd4H\x8b\x03[]A\\\xc3\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x05\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xa0\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x85\x00\x12factorial\x00\x10\r$\x01&\x9f \x01"\xff',
+    0x806: b'M\x06\x08\x1f\x02\x004build/features0.native.mpy\x00\x12factorial\x00\x8a\x02\xe9/\x00\x00\x00SH\x8b\x1d\x83\x00\x00\x00\xbe\x02\x00\x00\x00\xffS\x18\xbf\x01\x00\x00\x00H\x85\xc0u\x0cH\x8bC \xbe\x02\x00\x00\x00[\xff\xe0H\x0f\xaf\xf8H\xff\xc8\xeb\xe6ATUSH\x8b\x1dQ\x00\x00\x00H\x8bG\x08L\x8bc(H\x8bx\x08A\xff\xd4H\x8d5+\x00\x00\x00H\x89\xc5H\x8b\x059\x00\x00\x00\x0f\xb7x\x02\xffShH\x89\xefA\xff\xd4H\x8b\x03[]A\\\xc3\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x05\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x10\x11$\r&\xa3 \x01"\xff',
     # -march=armv6m
-    0x1006: b'M\x06\x10\x1f\x01\x004build/features0.native.mpy\x00\x88"\x18\xe0\x00\x00\x10\xb5\tK\tJ{D\x9cX\x02!\xe3h\x98G\x03\x00\x01 \x00+\x02\xd0XC\x01;\xfa\xe7\x02!#i\x98G\x10\xbd\xc0Fj\x00\x00\x00\x00\x00\x00\x00\xf8\xb5\nN\nK~D\xf4XChgiXh\xb8G\x05\x00\x07K\x08I\xf3XyD\x18\x88ck\x98G(\x00\xb8G h\xf8\xbd\xc0F:\x00\x00\x00\x00\x00\x00\x00\x04\x00\x00\x00\x1e\x00\x00\x00\x00\x00\x00\x00\x05\x00\x00\x00\x00\x00\x00\x00\x80\x00\x00\x00\x00\x00\x00\x00\x01\x84\x00\x12factorial\x00\x10\r<\x01>\x9f8\x01:\xff',
+    0x1006: b"M\x06\x10\x1f\x02\x004build/features0.native.mpy\x00\x12factorial\x00\x88\x02\x18\xe0\x00\x00\x10\xb5\tK\tJ{D\x9cX\x02!\xe3h\x98G\x03\x00\x01 \x00+\x02\xd0XC\x01;\xfa\xe7\x02!#i\x98G\x10\xbd\xc0Fj\x00\x00\x00\x00\x00\x00\x00\xf8\xb5\nN\nK~D\xf4XChgiXh\xb8G\x05\x00\x07K\x08I\xf3XyDX\x88ck\x98G(\x00\xb8G h\xf8\xbd\xc0F:\x00\x00\x00\x00\x00\x00\x00\x04\x00\x00\x00\x1e\x00\x00\x00\x00\x00\x00\x00\x05\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x10\x11<\r>\xa38\x01:\xff",
 }
 
 # Populate armv7m-derived archs based on armv6m.
diff --git a/tools/mpy-tool.py b/tools/mpy-tool.py
index 6a22f5a404e98..20ccc87d43116 100755
--- a/tools/mpy-tool.py
+++ b/tools/mpy-tool.py
@@ -976,7 +976,6 @@ def __init__(
         kind,
         fun_data,
         prelude_offset,
-        qstr_links,
         scope_flags,
         n_pos_args,
         type_sig,
@@ -989,7 +988,6 @@ def __init__(
             self.scope_flags = scope_flags
             self.n_pos_args = n_pos_args
 
-        self.qstr_links = qstr_links
         self.type_sig = type_sig
         if config.native_arch in (
             MP_NATIVE_ARCH_X86,
@@ -1196,15 +1194,6 @@ def read_raw_code(reader, cm_escaped_name, qstr_table, obj_table, segments):
         rc = RawCodeBytecode(cm_escaped_name, qstr_table, obj_table, fun_data)
     else:
         # Create native raw code.
-        qstr_links = []
-        if kind in (MP_CODE_NATIVE_PY, MP_CODE_NATIVE_VIPER):
-            # Read qstr link table.
-            n_qstr_link = reader.read_uint()
-            for _ in range(n_qstr_link):
-                off = reader.read_uint()
-                qst = read_qstr(reader, segments)
-                qstr_links.append((off >> 2, off & 3, qst))
-
         native_scope_flags = 0
         native_n_pos_args = 0
         native_type_sig = 0
@@ -1242,7 +1231,6 @@ def read_raw_code(reader, cm_escaped_name, qstr_table, obj_table, segments):
             kind,
             fun_data,
             prelude_offset,
-            qstr_links,
             native_scope_flags,
             native_n_pos_args,
             native_type_sig,
diff --git a/tools/mpy_ld.py b/tools/mpy_ld.py
index b8652462d441d..9fda49826f677 100755
--- a/tools/mpy_ld.py
+++ b/tools/mpy_ld.py
@@ -36,6 +36,8 @@
 
 # MicroPython constants
 MPY_VERSION = 6
+MP_CODE_BYTECODE = 2
+MP_CODE_NATIVE_VIPER = 4
 MP_NATIVE_ARCH_X86 = 1
 MP_NATIVE_ARCH_X64 = 2
 MP_NATIVE_ARCH_ARMV6M = 4
@@ -44,8 +46,7 @@
 MP_NATIVE_ARCH_ARMV7EMDP = 8
 MP_NATIVE_ARCH_XTENSA = 9
 MP_NATIVE_ARCH_XTENSAWIN = 10
-MP_CODE_BYTECODE = 2
-MP_CODE_NATIVE_VIPER = 4
+MP_PERSISTENT_OBJ_STR = 5
 MP_SCOPE_FLAG_VIPERRELOC = 0x10
 MP_SCOPE_FLAG_VIPERRODATA = 0x20
 MP_SCOPE_FLAG_VIPERBSS = 0x40
@@ -110,21 +111,20 @@ def asm_jump_xtensa(entry):
 
 
 class ArchData:
-    def __init__(self, name, mpy_feature, qstr_entry_size, word_size, arch_got, asm_jump):
+    def __init__(self, name, mpy_feature, word_size, arch_got, asm_jump, *, separate_rodata=False):
         self.name = name
         self.mpy_feature = mpy_feature
-        self.qstr_entry_size = qstr_entry_size
+        self.qstr_entry_size = 2
         self.word_size = word_size
         self.arch_got = arch_got
         self.asm_jump = asm_jump
-        self.separate_rodata = name == "EM_XTENSA" and qstr_entry_size == 4
+        self.separate_rodata = separate_rodata
 
 
 ARCH_DATA = {
     "x86": ArchData(
         "EM_386",
         MP_NATIVE_ARCH_X86 << 2,
-        2,
         4,
         (R_386_PC32, R_386_GOT32, R_386_GOT32X),
         asm_jump_x86,
@@ -132,7 +132,6 @@ def __init__(self, name, mpy_feature, qstr_entry_size, word_size, arch_got, asm_
     "x64": ArchData(
         "EM_X86_64",
         MP_NATIVE_ARCH_X64 << 2,
-        2,
         8,
         (R_X86_64_GOTPCREL, R_X86_64_REX_GOTPCRELX),
         asm_jump_x86,
@@ -140,7 +139,6 @@ def __init__(self, name, mpy_feature, qstr_entry_size, word_size, arch_got, asm_
     "armv6m": ArchData(
         "EM_ARM",
         MP_NATIVE_ARCH_ARMV6M << 2,
-        2,
         4,
         (R_ARM_GOT_BREL,),
         asm_jump_thumb,
@@ -148,7 +146,6 @@ def __init__(self, name, mpy_feature, qstr_entry_size, word_size, arch_got, asm_
     "armv7m": ArchData(
         "EM_ARM",
         MP_NATIVE_ARCH_ARMV7M << 2,
-        2,
         4,
         (R_ARM_GOT_BREL,),
         asm_jump_thumb2,
@@ -156,7 +153,6 @@ def __init__(self, name, mpy_feature, qstr_entry_size, word_size, arch_got, asm_
     "armv7emsp": ArchData(
         "EM_ARM",
         MP_NATIVE_ARCH_ARMV7EMSP << 2,
-        2,
         4,
         (R_ARM_GOT_BREL,),
         asm_jump_thumb2,
@@ -164,7 +160,6 @@ def __init__(self, name, mpy_feature, qstr_entry_size, word_size, arch_got, asm_
     "armv7emdp": ArchData(
         "EM_ARM",
         MP_NATIVE_ARCH_ARMV7EMDP << 2,
-        2,
         4,
         (R_ARM_GOT_BREL,),
         asm_jump_thumb2,
@@ -172,7 +167,6 @@ def __init__(self, name, mpy_feature, qstr_entry_size, word_size, arch_got, asm_
     "xtensa": ArchData(
         "EM_XTENSA",
         MP_NATIVE_ARCH_XTENSA << 2,
-        2,
         4,
         (R_XTENSA_32, R_XTENSA_PLT),
         asm_jump_xtensa,
@@ -181,9 +175,9 @@ def __init__(self, name, mpy_feature, qstr_entry_size, word_size, arch_got, asm_
         "EM_XTENSA",
         MP_NATIVE_ARCH_XTENSAWIN << 2,
         4,
-        4,
         (R_XTENSA_32, R_XTENSA_PLT),
         asm_jump_xtensa,
+        separate_rodata=True,
     ),
 }
 
@@ -435,8 +429,8 @@ def populate_got(env):
 
     # Create a relocation for each GOT entry
     for got_entry in got_list:
-        if got_entry.name == "mp_fun_table":
-            dest = "mp_fun_table"
+        if got_entry.name in ("mp_native_qstr_table", "mp_native_obj_table", "mp_fun_table"):
+            dest = got_entry.name
         elif got_entry.name.startswith("mp_fun_table+0x"):
             dest = int(got_entry.name.split("+")[1], 16) // env.arch.word_size
         elif got_entry.sec_name.startswith(".text"):
@@ -754,19 +748,19 @@ def link_objects(env, native_qstr_vals_len, native_qstr_objs_len):
         env.lit_section = Section("LIT", bytearray(lit_size), env.arch.word_size)
         env.sections.insert(1, env.lit_section)
 
-    # Create section to contain mp_native_qstr_val_table
-    env.qstr_val_section = Section(
-        ".text.QSTR_VAL",
+    # Create section to contain mp_native_qstr_table
+    env.qstr_table_section = Section(
+        ".external.qstr_table",
         bytearray(native_qstr_vals_len * env.arch.qstr_entry_size),
         env.arch.qstr_entry_size,
     )
-    env.sections.append(env.qstr_val_section)
 
-    # Create section to contain mp_native_qstr_obj_table
-    env.qstr_obj_section = Section(
-        ".text.QSTR_OBJ", bytearray(native_qstr_objs_len * env.arch.word_size), env.arch.word_size
+    # Create section to contain mp_native_obj_table
+    env.obj_table_section = Section(
+        ".external.obj_table",
+        bytearray(native_qstr_objs_len * env.arch.word_size),
+        env.arch.word_size,
     )
-    env.sections.append(env.qstr_obj_section)
 
     # Resolve unknown symbols
     mp_fun_table_sec = Section(".external.mp_fun_table", b"", 0)
@@ -796,10 +790,10 @@ def link_objects(env, native_qstr_vals_len, native_qstr_objs_len):
             pass
         elif sym.name == "mp_fun_table":
             sym.section = Section(".external", b"", 0)
-        elif sym.name == "mp_native_qstr_val_table":
-            sym.section = env.qstr_val_section
-        elif sym.name == "mp_native_qstr_obj_table":
-            sym.section = env.qstr_obj_section
+        elif sym.name == "mp_native_qstr_table":
+            sym.section = env.qstr_table_section
+        elif sym.name == "mp_native_obj_table":
+            sym.section = env.obj_table_section
         elif sym.name in env.known_syms:
             sym.resolved = env.known_syms[sym.name]
         else:
@@ -923,13 +917,21 @@ def build_mpy(env, entry_offset, fmpy, native_qstr_vals, native_qstr_objs):
     out.write_bytes(bytearray([ord("M"), MPY_VERSION, env.arch.mpy_feature, MP_SMALL_INT_BITS]))
 
     # MPY: n_qstr
-    out.write_uint(1)
+    out.write_uint(1 + len(native_qstr_vals))
 
     # MPY: n_obj
-    out.write_uint(0)
+    out.write_uint(len(native_qstr_objs))
 
     # MPY: qstr table
     out.write_qstr(fmpy)  # filename
+    for q in native_qstr_vals:
+        out.write_qstr(q)
+
+    # MPY: object table
+    for q in native_qstr_objs:
+        out.write_bytes(bytearray([MP_PERSISTENT_OBJ_STR]))
+        out.write_uint(len(q))
+        out.write_bytes(bytes(q, "utf8") + b"\x00")
 
     # MPY: kind/len
     out.write_uint(len(env.full_text) << 3 | (MP_CODE_NATIVE_VIPER - MP_CODE_BYTECODE))
@@ -937,17 +939,6 @@ def build_mpy(env, entry_offset, fmpy, native_qstr_vals, native_qstr_objs):
     # MPY: machine code
     out.write_bytes(env.full_text)
 
-    # MPY: n_qstr_link (assumes little endian)
-    out.write_uint(len(native_qstr_vals) + len(native_qstr_objs))
-    for q in range(len(native_qstr_vals)):
-        off = env.qstr_val_section.addr + q * env.arch.qstr_entry_size
-        out.write_uint(off << 2)
-        out.write_qstr(native_qstr_vals[q])
-    for q in range(len(native_qstr_objs)):
-        off = env.qstr_obj_section.addr + q * env.arch.word_size
-        out.write_uint(off << 2 | 3)
-        out.write_qstr(native_qstr_objs[q])
-
     # MPY: scope_flags
     scope_flags = MP_SCOPE_FLAG_VIPERRELOC
     if len(env.full_rodata):
@@ -978,10 +969,14 @@ def build_mpy(env, entry_offset, fmpy, native_qstr_vals, native_qstr_objs):
                 kind = 0
         elif isinstance(kind, str) and kind.startswith(".bss"):
             kind = bss_const_table_idx
-        elif kind == "mp_fun_table":
+        elif kind == "mp_native_qstr_table":
             kind = 6
+        elif kind == "mp_native_obj_table":
+            kind = 7
+        elif kind == "mp_fun_table":
+            kind = 8
         else:
-            kind = 7 + kind
+            kind = 9 + kind
         assert addr % env.arch.word_size == 0, addr
         offset = addr // env.arch.word_size
         if kind == prev_kind and base == prev_base and offset == prev_offset + 1:
@@ -1023,18 +1018,14 @@ def do_preprocess(args):
         for i, q in enumerate(static_qstrs):
             print("#define %s (%u)" % (q, i + 1), file=f)
         for i, q in enumerate(sorted(qstr_vals)):
-            print("#define %s (mp_native_qstr_val_table[%d])" % (q, i), file=f)
+            print("#define %s (mp_native_qstr_table[%d])" % (q, i + 1), file=f)
         for i, q in enumerate(sorted(qstr_objs)):
             print(
-                "#define MP_OBJ_NEW_QSTR_%s ((mp_obj_t)mp_native_qstr_obj_table[%d])" % (q, i),
+                "#define MP_OBJ_NEW_QSTR_%s ((mp_obj_t)mp_native_obj_table[%d])" % (q, i),
                 file=f,
             )
-        if args.arch == "xtensawin":
-            qstr_type = "uint32_t"  # esp32 can only read 32-bit values from IRAM
-        else:
-            qstr_type = "uint16_t"
-        print("extern const {} mp_native_qstr_val_table[];".format(qstr_type), file=f)
-        print("extern const mp_uint_t mp_native_qstr_obj_table[];", file=f)
+        print("extern const uint16_t mp_native_qstr_table[];", file=f)
+        print("extern const mp_uint_t mp_native_obj_table[];", file=f)
 
 
 def do_link(args):

From f506bf342af5994a2b8aa0f005e2a8fbf06b60b5 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 30 May 2022 11:08:54 +1000
Subject: [PATCH 2150/3533] py/bc: Remove unused mp_opcode_format function.

This was made redundant by f2040bfc7ee033e48acef9f289790f3b4e6b74e5, which
also did not update this function for the change to qstr-opcode encoding,
so it does not work correctly anyway.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/bc.c           | 32 --------------------------------
 py/bc.h           |  6 ------
 tools/mpy-tool.py | 24 ------------------------
 3 files changed, 62 deletions(-)

diff --git a/py/bc.c b/py/bc.c
index 2c26d74895673..e002bca262d31 100644
--- a/py/bc.c
+++ b/py/bc.c
@@ -337,35 +337,3 @@ void mp_setup_code_state_native(mp_code_state_native_t *code_state, size_t n_arg
     mp_setup_code_state_helper((mp_code_state_t *)code_state, n_args, n_kw, args);
 }
 #endif
-
-#if MICROPY_PERSISTENT_CODE_LOAD || MICROPY_PERSISTENT_CODE_SAVE
-
-// The following table encodes the number of bytes that a specific opcode
-// takes up.  Some opcodes have an extra byte, defined by MP_BC_MASK_EXTRA_BYTE.
-uint mp_opcode_format(const byte *ip, size_t *opcode_size, bool count_var_uint) {
-    uint f = MP_BC_FORMAT(*ip);
-    const byte *ip_start = ip;
-    if (f == MP_BC_FORMAT_QSTR) {
-        ip += 3;
-    } else {
-        int extra_byte = (*ip & MP_BC_MASK_EXTRA_BYTE) == 0;
-        ip += 1;
-        if (f == MP_BC_FORMAT_VAR_UINT) {
-            if (count_var_uint) {
-                while ((*ip++ & 0x80) != 0) {
-                }
-            }
-        } else if (f == MP_BC_FORMAT_OFFSET) {
-            if ((*ip & 0x80) == 0) {
-                ip += 1;
-            } else {
-                ip += 2;
-            }
-        }
-        ip += extra_byte;
-    }
-    *opcode_size = ip - ip_start;
-    return f;
-}
-
-#endif // MICROPY_PERSISTENT_CODE_LOAD || MICROPY_PERSISTENT_CODE_SAVE
diff --git a/py/bc.h b/py/bc.h
index a888164f18649..6350eee52e669 100644
--- a/py/bc.h
+++ b/py/bc.h
@@ -292,12 +292,6 @@ const byte *mp_bytecode_print_str(const mp_print_t *print, const byte *ip_start,
 #define MP_TAGPTR_TAG1(x) ((uintptr_t)(x) & 2)
 #define MP_TAGPTR_MAKE(ptr, tag) ((void *)((uintptr_t)(ptr) | (tag)))
 
-#if MICROPY_PERSISTENT_CODE_LOAD || MICROPY_PERSISTENT_CODE_SAVE
-
-uint mp_opcode_format(const byte *ip, size_t *opcode_size, bool count_var_uint);
-
-#endif
-
 static inline void mp_module_context_alloc_tables(mp_module_context_t *context, size_t n_qstr, size_t n_obj) {
     #if MICROPY_EMIT_BYTECODE_USES_QSTR_TABLE
     size_t nq = (n_qstr * sizeof(qstr_short_t) + sizeof(mp_uint_t) - 1) / sizeof(mp_uint_t);
diff --git a/tools/mpy-tool.py b/tools/mpy-tool.py
index 20ccc87d43116..fb18eb8cbd831 100755
--- a/tools/mpy-tool.py
+++ b/tools/mpy-tool.py
@@ -326,30 +326,6 @@ def mp_small_int_fits(i):
     return -0x2000 <= i <= 0x1FFF
 
 
-# this function mirrors that in py/bc.c
-def mp_opcode_format(bytecode, ip, count_var_uint):
-    opcode = bytecode[ip]
-    ip_start = ip
-    f = (0x000003A4 >> (2 * ((opcode) >> 4))) & 3
-    if f == MP_BC_FORMAT_QSTR:
-        ip += 3
-    else:
-        extra_byte = (opcode & MP_BC_MASK_EXTRA_BYTE) == 0
-        ip += 1
-        if f == MP_BC_FORMAT_VAR_UINT:
-            if count_var_uint:
-                while bytecode[ip] & 0x80 != 0:
-                    ip += 1
-                ip += 1
-        elif f == MP_BC_FORMAT_OFFSET:
-            if bytecode[ip] & 0x80 == 0:
-                ip += 1
-            else:
-                ip += 2
-        ip += extra_byte
-    return f, ip - ip_start
-
-
 def mp_opcode_decode(bytecode, ip):
     opcode = bytecode[ip]
     ip_start = ip

From 599a22e56975a1a0d753eae5fd1432d4a85c5189 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 31 May 2022 00:17:38 +1000
Subject: [PATCH 2151/3533] tools/mpy-tool.py: Rework .mpy merging feature.

Now that the native qstr link table is gone, merging a native .mpy file
with a bytecode .mpy file is not as simple as concatenating the .mpy data.
The qstr_table and obj_table tables from all merged .mpy files must now be
joined together, because they are global to the .mpy file (and hence global
to the merged .mpy file).  This means the bytecode needs to be be decoded,
qstr_table and obj_table indices updated to point to the correct entries in
the new tables, and then the bytecode re-encoded.

This commit makes this change to the merging feature in mpy-tool.py.  This
can now merge an arbitrary number of bytecode .mpy files, and up to one
native .mpy file.

Signed-off-by: Damien George <damien@micropython.org>
---
 tools/mpy-tool.py | 319 ++++++++++++++++++++++++++++++++++++----------
 1 file changed, 252 insertions(+), 67 deletions(-)

diff --git a/tools/mpy-tool.py b/tools/mpy-tool.py
index fb18eb8cbd831..cc30eafecdb56 100755
--- a/tools/mpy-tool.py
+++ b/tools/mpy-tool.py
@@ -182,7 +182,7 @@ class Config:
 )
 
 
-class Opcodes:
+class Opcode:
     # fmt: off
     # Load, Store, Delete, Import, Make, Build, Unpack, Call, Jump, Exception, For, sTack, Return, Yield, Op
     MP_BC_BASE_RESERVED               = (0x00) # ----------------
@@ -318,6 +318,13 @@ class Opcodes:
     for i in range(MP_BC_BINARY_OP_MULTI_NUM):
         mapping[MP_BC_BINARY_OP_MULTI + i] = "BINARY_OP %d %s" % (i, mp_binary_op_method_name[i])
 
+    def __init__(self, offset, fmt, opcode_byte, arg, extra_arg):
+        self.offset = offset
+        self.fmt = fmt
+        self.opcode_byte = opcode_byte
+        self.arg = arg
+        self.extra_arg = extra_arg
+
 
 # This definition of a small int covers all possible targets, in the sense that every
 # target can encode as a small int, an integer that passes this test.  The minimum is set
@@ -326,15 +333,31 @@ def mp_small_int_fits(i):
     return -0x2000 <= i <= 0x1FFF
 
 
+def mp_encode_uint(val, signed=False):
+    encoded = bytearray([val & 0x7F])
+    val >>= 7
+    while val != 0 and val != -1:
+        encoded.insert(0, 0x80 | (val & 0x7F))
+        val >>= 7
+    if signed:
+        if val == -1 and encoded[0] & 0x40 == 0:
+            encoded.insert(0, 0xFF)
+        elif val == 0 and encoded[0] & 0x40 != 0:
+            encoded.insert(0, 0x80)
+    return encoded
+
+
 def mp_opcode_decode(bytecode, ip):
     opcode = bytecode[ip]
     ip_start = ip
     f = (0x000003A4 >> (2 * ((opcode) >> 4))) & 3
-    extra_byte = (opcode & MP_BC_MASK_EXTRA_BYTE) == 0
     ip += 1
-    arg = 0
+    arg = None
+    extra_arg = None
     if f in (MP_BC_FORMAT_QSTR, MP_BC_FORMAT_VAR_UINT):
         arg = bytecode[ip] & 0x7F
+        if opcode == Opcode.MP_BC_LOAD_CONST_SMALL_INT and arg & 0x40 != 0:
+            arg |= -1 << 7
         while bytecode[ip] & 0x80 != 0:
             ip += 1
             arg = arg << 7 | bytecode[ip] & 0x7F
@@ -343,15 +366,50 @@ def mp_opcode_decode(bytecode, ip):
         if bytecode[ip] & 0x80 == 0:
             arg = bytecode[ip]
             ip += 1
-            if opcode in Opcodes.ALL_OFFSET_SIGNED:
+            if opcode in Opcode.ALL_OFFSET_SIGNED:
                 arg -= 0x40
         else:
             arg = bytecode[ip] & 0x7F | bytecode[ip + 1] << 7
             ip += 2
-            if opcode in Opcodes.ALL_OFFSET_SIGNED:
+            if opcode in Opcode.ALL_OFFSET_SIGNED:
                 arg -= 0x4000
-    ip += extra_byte
-    return f, ip - ip_start, arg
+    if opcode & MP_BC_MASK_EXTRA_BYTE == 0:
+        extra_arg = bytecode[ip]
+        ip += 1
+    return f, ip - ip_start, arg, extra_arg
+
+
+def mp_opcode_encode(opcode):
+    overflow = False
+    encoded = bytearray([opcode.opcode_byte])
+    if opcode.fmt in (MP_BC_FORMAT_QSTR, MP_BC_FORMAT_VAR_UINT):
+        signed = opcode.opcode_byte == Opcode.MP_BC_LOAD_CONST_SMALL_INT
+        encoded.extend(mp_encode_uint(opcode.arg, signed))
+    elif opcode.fmt == MP_BC_FORMAT_OFFSET:
+        is_signed = opcode.opcode_byte in Opcode.ALL_OFFSET_SIGNED
+
+        # The -2 accounts for this jump opcode taking 2 bytes (at least).
+        bytecode_offset = opcode.target.offset - opcode.offset - 2
+
+        # Check if the bytecode_offset is small enough to use a 1-byte encoding.
+        if (is_signed and -64 <= bytecode_offset <= 63) or (
+            not is_signed and bytecode_offset <= 127
+        ):
+            # Use a 1-byte jump offset.
+            if is_signed:
+                bytecode_offset += 0x40
+            overflow = not (0 <= bytecode_offset <= 0x7F)
+            encoded.append(bytecode_offset & 0x7F)
+        else:
+            bytecode_offset -= 1
+            if is_signed:
+                bytecode_offset += 0x4000
+            overflow = not (0 <= bytecode_offset <= 0x7FFF)
+            encoded.append(0x80 | (bytecode_offset & 0x7F))
+            encoded.append((bytecode_offset >> 7) & 0xFF)
+    if opcode.extra_arg is not None:
+        encoded.append(opcode.extra_arg)
+    return overflow, encoded
 
 
 def read_prelude_sig(read_byte):
@@ -393,6 +451,21 @@ def read_prelude_size(read_byte):
     return I, C
 
 
+# See py/bc.h:MP_BC_PRELUDE_SIZE_ENCODE macro.
+def encode_prelude_size(I, C):
+    # Encode bit-wise as: xIIIIIIC
+    encoded = bytearray()
+    while True:
+        z = (I & 0x3F) << 1 | (C & 1)
+        C >>= 1
+        I >>= 6
+        if C | I:
+            z |= 0x80
+        encoded.append(z)
+        if not C | I:
+            return encoded
+
+
 def extract_prelude(bytecode, ip):
     def local_read_byte():
         b = bytecode[ip_ref[0]]
@@ -400,6 +473,8 @@ def local_read_byte():
         return b
 
     ip_ref = [ip]  # to close over ip in Python 2 and 3
+
+    # Read prelude signature.
     (
         n_state,
         n_exc_stack,
@@ -409,13 +484,12 @@ def local_read_byte():
         n_def_pos_args,
     ) = read_prelude_sig(local_read_byte)
 
+    offset_prelude_size = ip_ref[0]
+
+    # Read prelude size.
     n_info, n_cell = read_prelude_size(local_read_byte)
-    ip = ip_ref[0]
 
-    ip2 = ip
-    ip = ip2 + n_info + n_cell
-    # ip now points to first opcode
-    # ip2 points to simple_name qstr
+    offset_source_info = ip_ref[0]
 
     # Extract simple_name and argument qstrs (var uints).
     args = []
@@ -428,11 +502,18 @@ def local_read_byte():
                 break
         args.append(value)
 
+    offset_line_info = ip_ref[0]
+    offset_closure_info = offset_source_info + n_info
+    offset_opcodes = offset_source_info + n_info + n_cell
+
     return (
-        ip2,
-        ip,
-        ip_ref[0],
+        offset_prelude_size,
+        offset_source_info,
+        offset_line_info,
+        offset_closure_info,
+        offset_opcodes,
         (n_state, n_exc_stack, scope_flags, n_pos_args, n_kwonly_args, n_def_pos_args),
+        (n_info, n_cell),
         args,
     )
 
@@ -480,6 +561,8 @@ def __init__(
         qstr_table,
         obj_table,
         raw_code,
+        qstr_table_file_offset,
+        obj_table_file_offset,
         raw_code_file_offset,
         escaped_name,
     ):
@@ -489,8 +572,10 @@ def __init__(
         self.header = header
         self.qstr_table = qstr_table
         self.obj_table = obj_table
-        self.raw_code_file_offset = raw_code_file_offset
         self.raw_code = raw_code
+        self.qstr_table_file_offset = qstr_table_file_offset
+        self.obj_table_file_offset = obj_table_file_offset
+        self.raw_code_file_offset = raw_code_file_offset
         self.escaped_name = escaped_name
 
     def hexdump(self):
@@ -772,14 +857,17 @@ def __init__(self, cm_escaped_name, qstr_table, fun_data, prelude_offset, code_k
 
         if code_kind in (MP_CODE_BYTECODE, MP_CODE_NATIVE_PY):
             (
-                self.offset_names,
-                self.offset_opcodes,
+                self.offset_prelude_size,
+                self.offset_source_info,
                 self.offset_line_info,
-                self.prelude,
+                self.offset_closure_info,
+                self.offset_opcodes,
+                self.prelude_signature,
+                self.prelude_size,
                 self.names,
             ) = extract_prelude(self.fun_data, prelude_offset)
-            self.scope_flags = self.prelude[2]
-            self.n_pos_args = self.prelude[3]
+            self.scope_flags = self.prelude_signature[2]
+            self.n_pos_args = self.prelude_signature[3]
             self.simple_name = self.qstr_table[self.names[0]]
         else:
             self.simple_name = self.qstr_table[0]
@@ -836,12 +924,12 @@ def freeze_raw_code(self, prelude_ptr=None, type_sig=0):
         if self.code_kind == MP_CODE_BYTECODE:
             print("    #if MICROPY_PY_SYS_SETTRACE")
             print("    .prelude = {")
-            print("        .n_state = %u," % self.prelude[0])
-            print("        .n_exc_stack = %u," % self.prelude[1])
-            print("        .scope_flags = %u," % self.prelude[2])
-            print("        .n_pos_args = %u," % self.prelude[3])
-            print("        .n_kwonly_args = %u," % self.prelude[4])
-            print("        .n_def_pos_args = %u," % self.prelude[5])
+            print("        .n_state = %u," % self.prelude_signature[0])
+            print("        .n_exc_stack = %u," % self.prelude_signature[1])
+            print("        .scope_flags = %u," % self.prelude_signature[2])
+            print("        .n_pos_args = %u," % self.prelude_signature[3])
+            print("        .n_kwonly_args = %u," % self.prelude_signature[4])
+            print("        .n_def_pos_args = %u," % self.prelude_signature[5])
             print("        .qstr_block_name_idx = %u," % self.names[0])
             print(
                 "        .line_info = fun_data_%s + %u,"
@@ -878,13 +966,13 @@ def disassemble(self):
         bc = self.fun_data
         print("simple_name:", self.simple_name.str)
         print("  raw bytecode:", len(bc), hexlify_to_str(bc))
-        print("  prelude:", self.prelude)
+        print("  prelude:", self.prelude_signature)
         print("  args:", [self.qstr_table[i].str for i in self.names[1:]])
         print("  line info:", hexlify_to_str(bc[self.offset_line_info : self.offset_opcodes]))
         ip = self.offset_opcodes
         while ip < len(bc):
-            fmt, sz, arg = mp_opcode_decode(bc, ip)
-            if bc[ip] == Opcodes.MP_BC_LOAD_CONST_OBJ:
+            fmt, sz, arg, _ = mp_opcode_decode(bc, ip)
+            if bc[ip] == Opcode.MP_BC_LOAD_CONST_OBJ:
                 arg = repr(self.obj_table[arg])
             if fmt == MP_BC_FORMAT_QSTR:
                 arg = self.qstr_table[arg].str
@@ -893,7 +981,7 @@ def disassemble(self):
             else:
                 arg = ""
             print(
-                "  %-11s %s %s" % (hexlify_to_str(bc[ip : ip + sz]), Opcodes.mapping[bc[ip]], arg)
+                "  %-11s %s %s" % (hexlify_to_str(bc[ip : ip + sz]), Opcode.mapping[bc[ip]], arg)
             )
             ip += sz
         self.disassemble_children()
@@ -908,12 +996,12 @@ def freeze(self):
         print("static const byte fun_data_%s[%u] = {" % (self.escaped_name, len(bc)))
 
         print("    ", end="")
-        for b in bc[: self.offset_names]:
+        for b in bc[: self.offset_source_info]:
             print("0x%02x," % b, end="")
         print(" // prelude")
 
         print("    ", end="")
-        for b in bc[self.offset_names : self.offset_line_info]:
+        for b in bc[self.offset_source_info : self.offset_line_info]:
             print("0x%02x," % b, end="")
         print(" // names: %s" % ", ".join(self.qstr_table[i].str for i in self.names))
 
@@ -924,8 +1012,8 @@ def freeze(self):
 
         ip = self.offset_opcodes
         while ip < len(bc):
-            fmt, sz, arg = mp_opcode_decode(bc, ip)
-            opcode_name = Opcodes.mapping[bc[ip]]
+            fmt, sz, arg, _ = mp_opcode_decode(bc, ip)
+            opcode_name = Opcode.mapping[bc[ip]]
             if fmt == MP_BC_FORMAT_QSTR:
                 opcode_name += " " + repr(self.qstr_table[arg].str)
             elif fmt in (MP_BC_FORMAT_VAR_UINT, MP_BC_FORMAT_OFFSET):
@@ -1000,7 +1088,7 @@ def disassemble(self):
         )
         if self.code_kind != MP_CODE_NATIVE_PY:
             return
-        print("  prelude:", self.prelude)
+        print("  prelude:", self.prelude_signature)
         print("  args:", [self.qstr_table[i].str for i in self.names[1:]])
         print("  line info:", fun_data[self.offset_line_info : self.offset_opcodes])
         ip = 0
@@ -1255,11 +1343,13 @@ def read_mpy(filename):
         n_obj = reader.read_uint()
 
         # Read qstrs and construct qstr table.
+        qstr_table_file_offset = reader.tell()
         qstr_table = []
         for i in range(n_qstr):
             qstr_table.append(read_qstr(reader, segments))
 
         # Read objects and construct object table.
+        obj_table_file_offset = reader.tell()
         obj_table = []
         for i in range(n_obj):
             obj_table.append(read_obj(reader, segments))
@@ -1279,6 +1369,8 @@ def read_mpy(filename):
         qstr_table,
         obj_table,
         raw_code,
+        qstr_table_file_offset,
+        obj_table_file_offset,
         raw_code_file_offset,
         cm_escaped_name,
     )
@@ -1477,25 +1569,100 @@ def freeze_mpy(base_qstrs, compiled_modules):
     print("*/")
 
 
-def merge_mpy(raw_codes, output_file):
-    assert len(raw_codes) <= 2  # so var-uints all fit in 1 byte
+def adjust_bytecode_qstr_obj_indices(bytecode_in, qstr_table_base, obj_table_base):
+    # Expand bytcode to a list of opcodes.
+    opcodes = []
+    labels = {}
+    ip = 0
+    while ip < len(bytecode_in):
+        fmt, sz, arg, extra_arg = mp_opcode_decode(bytecode_in, ip)
+        opcode = Opcode(ip, fmt, bytecode_in[ip], arg, extra_arg)
+        labels[ip] = opcode
+        opcodes.append(opcode)
+        ip += sz
+        if fmt == MP_BC_FORMAT_OFFSET:
+            opcode.arg += ip
+
+    # Link jump opcodes to their destination.
+    for opcode in opcodes:
+        if opcode.fmt == MP_BC_FORMAT_OFFSET:
+            opcode.target = labels[opcode.arg]
+
+    # Adjust bytcode as required.
+    for opcode in opcodes:
+        if opcode.fmt == MP_BC_FORMAT_QSTR:
+            opcode.arg += qstr_table_base
+        elif opcode.opcode_byte == Opcode.MP_BC_LOAD_CONST_OBJ:
+            opcode.arg += obj_table_base
+
+    # Write out new bytecode.
+    offset_changed = True
+    while offset_changed:
+        offset_changed = False
+        overflow = False
+        bytecode_out = b""
+        for opcode in opcodes:
+            ip = len(bytecode_out)
+            if opcode.offset != ip:
+                offset_changed = True
+                opcode.offset = ip
+            opcode_overflow, encoded_opcode = mp_opcode_encode(opcode)
+            if opcode_overflow:
+                overflow = True
+            bytecode_out += encoded_opcode
+
+    if overflow:
+        raise Exception("bytecode overflow")
+
+    return bytecode_out
+
+
+def rewrite_raw_code(rc, qstr_table_base, obj_table_base):
+    if rc.code_kind != MP_CODE_BYTECODE:
+        raise Exception("can only rewrite bytecode")
+
+    source_info = bytearray()
+    for arg in rc.names:
+        source_info.extend(mp_encode_uint(qstr_table_base + arg))
+
+    closure_info = rc.fun_data[rc.offset_closure_info : rc.offset_opcodes]
+
+    bytecode_in = memoryview(rc.fun_data)[rc.offset_opcodes :]
+    bytecode_out = adjust_bytecode_qstr_obj_indices(bytecode_in, qstr_table_base, obj_table_base)
+
+    prelude_signature = rc.fun_data[: rc.offset_prelude_size]
+    prelude_size = encode_prelude_size(len(source_info), len(closure_info))
+
+    fun_data = prelude_signature + prelude_size + source_info + closure_info + bytecode_out
+
+    output = mp_encode_uint(len(fun_data) << 3 | bool(len(rc.children)) << 2)
+    output += fun_data
+
+    if rc.children:
+        output += mp_encode_uint(len(rc.children))
+        for child in rc.children:
+            output += rewrite_raw_code(child, qstr_table_base, obj_table_base)
+
+    return output
+
+
+def merge_mpy(compiled_modules, output_file):
     merged_mpy = bytearray()
 
-    if len(raw_codes) == 1:
-        with open(raw_codes[0].mpy_source_file, "rb") as f:
+    if len(compiled_modules) == 1:
+        with open(compiled_modules[0].mpy_source_file, "rb") as f:
             merged_mpy.extend(f.read())
     else:
-        main_rc = None
-        for rc in raw_codes:
-            if len(rc.qstr_table) > 1 or len(rc.obj_table) > 0:
+        main_cm_idx = None
+        for idx, cm in enumerate(compiled_modules):
+            if cm.header[2]:
                 # Must use qstr_table and obj_table from this raw_code
-                if main_rc is not None:
-                    raise Exception(
-                        "can't merge files when more than one has a populated qstr or obj table"
-                    )
-                main_rc = rc
-        if main_rc is None:
-            main_rc = raw_codes[0]
+                if main_cm_idx is not None:
+                    raise Exception("can't merge files when more than one contains native code")
+                main_cm_idx = idx
+        if main_cm_idx is not None:
+            # Shift main_cm to front of list.
+            compiled_modules.insert(0, compiled_modules.pop(main_cm_idx))
 
         header = bytearray(4)
         header[0] = ord("M")
@@ -1504,32 +1671,50 @@ def merge_mpy(raw_codes, output_file):
         header[3] = config.mp_small_int_bits
         merged_mpy.extend(header)
 
-        # Copy n_qstr, n_obj, qstr_table, obj_table from main_rc.
-        with open(main_rc.mpy_source_file, "rb") as f:
-            data = f.read(main_rc.raw_code_file_offset)
-            merged_mpy.extend(data[4:])
+        n_qstr = 0
+        n_obj = 0
+        for cm in compiled_modules:
+            n_qstr += len(cm.qstr_table)
+            n_obj += len(cm.obj_table)
+        merged_mpy.extend(mp_encode_uint(n_qstr))
+        merged_mpy.extend(mp_encode_uint(n_obj))
+
+        # Copy verbatim the qstr and object tables from all compiled modules.
+        def copy_section(file, offset, offset2):
+            with open(file, "rb") as f:
+                f.seek(offset)
+                merged_mpy.extend(f.read(offset2 - offset))
+
+        for cm in compiled_modules:
+            copy_section(cm.mpy_source_file, cm.qstr_table_file_offset, cm.obj_table_file_offset)
+        for cm in compiled_modules:
+            copy_section(cm.mpy_source_file, cm.obj_table_file_offset, cm.raw_code_file_offset)
 
         bytecode = bytearray()
-        bytecode_len = 3 + len(raw_codes) * 5 + 2
-        bytecode.append(bytecode_len << 3 | 1 << 2)  # kind, has_children and length
-        bytecode.append(0b00000000)  # signature prelude
-        bytecode.append(0b00000010)  # size prelude; n_info=1
+        bytecode.append(0b00000000)  # prelude signature
+        bytecode.append(0b00000010)  # prelude size (n_info=1, n_cell=0)
         bytecode.extend(b"\x00")  # simple_name: qstr index 0 (will use source filename)
-        for idx in range(len(raw_codes)):
+        for idx in range(len(compiled_modules)):
             bytecode.append(0x32)  # MP_BC_MAKE_FUNCTION
             bytecode.append(idx)  # index raw code
             bytecode.extend(b"\x34\x00\x59")  # MP_BC_CALL_FUNCTION, 0 args, MP_BC_POP_TOP
         bytecode.extend(b"\x51\x63")  # MP_BC_LOAD_NONE, MP_BC_RETURN_VALUE
 
+        merged_mpy.extend(mp_encode_uint(len(bytecode) << 3 | 1 << 2))  # length, has_children
         merged_mpy.extend(bytecode)
-
-        merged_mpy.append(len(raw_codes))  # n_children
-
-        for rc in raw_codes:
-            with open(rc.mpy_source_file, "rb") as f:
-                f.seek(rc.raw_code_file_offset)
-                data = f.read()  # read rest of mpy file
-                merged_mpy.extend(data)
+        merged_mpy.extend(mp_encode_uint(len(compiled_modules)))  # n_children
+
+        qstr_table_base = 0
+        obj_table_base = 0
+        for cm in compiled_modules:
+            if qstr_table_base == 0 and obj_table_base == 0:
+                with open(cm.mpy_source_file, "rb") as f:
+                    f.seek(cm.raw_code_file_offset)
+                    merged_mpy.extend(f.read())
+            else:
+                merged_mpy.extend(rewrite_raw_code(cm.raw_code, qstr_table_base, obj_table_base))
+            qstr_table_base += len(cm.qstr_table)
+            obj_table_base += len(cm.obj_table)
 
     if output_file is None:
         sys.stdout.buffer.write(merged_mpy)

From bf92b0cbf28ad58c908d7d151a717042473d985f Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 3 Jun 2022 01:11:59 +1000
Subject: [PATCH 2152/3533] tools/ci.sh: Add test for mpy-tool's merging
 feature.

Signed-off-by: Damien George <damien@micropython.org>
---
 .github/workflows/ports_unix.yml |  2 ++
 tools/ci.sh                      | 24 ++++++++++++++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/.github/workflows/ports_unix.yml b/.github/workflows/ports_unix.yml
index dbd213cdff82f..63cc1c0faa921 100644
--- a/.github/workflows/ports_unix.yml
+++ b/.github/workflows/ports_unix.yml
@@ -71,6 +71,8 @@ jobs:
       run: source tools/ci.sh && ci_unix_coverage_build
     - name: Run main test suite
       run: source tools/ci.sh && ci_unix_coverage_run_tests
+    - name: Test merging .mpy files
+      run: source tools/ci.sh && ci_unix_coverage_run_mpy_merge_tests
     - name: Build native mpy modules
       run: source tools/ci.sh && ci_native_mpy_modules_build
     - name: Test importing .mpy generated by mpy_ld.py
diff --git a/tools/ci.sh b/tools/ci.sh
index 546f9781fd2bc..f8890adced9eb 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -468,6 +468,30 @@ function ci_unix_coverage_run_tests {
     ci_unix_run_tests_full_helper coverage
 }
 
+function ci_unix_coverage_run_mpy_merge_tests {
+    mptop=$(pwd)
+    outdir=$(mktemp -d)
+    allmpy=()
+
+    # Compile a selection of tests to .mpy and execute them, collecting the output.
+    # None of the tests should SKIP.
+    for inpy in $mptop/tests/basics/[acdel]*.py; do
+        test=$(basename $inpy .py)
+        echo $test
+        outmpy=$outdir/$test.mpy
+        $mptop/mpy-cross/mpy-cross -o $outmpy $inpy
+        (cd $outdir && $mptop/ports/unix/micropython-coverage -m $test >> out-individual)
+        allmpy+=($outmpy)
+    done
+
+    # Merge all the tests into one .mpy file, and then execute it.
+    python3 $mptop/tools/mpy-tool.py --merge -o $outdir/merged.mpy ${allmpy[@]}
+    (cd $outdir && $mptop/ports/unix/micropython-coverage -m merged > out-merged)
+
+    # Make sure the outputs match.
+    diff $outdir/out-individual $outdir/out-merged && /bin/rm -rf $outdir
+}
+
 function ci_unix_coverage_run_native_mpy_tests {
     MICROPYPATH=examples/natmod/features2 ./ports/unix/micropython-coverage -m features2
     (cd tests && ./run-natmodtests.py "$@" extmod/{btree*,framebuf*,uheapq*,urandom*,ure*,uzlib*}.py)

From c58dc7f091b6809de83064e8c2444757ad7c962a Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 7 Jun 2022 14:15:51 +1000
Subject: [PATCH 2153/3533] pic16bit: Use 1 byte for qstr hash len and include
 header to fix build.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/pic16bit/main.c         | 1 +
 ports/pic16bit/mpconfigport.h | 1 +
 2 files changed, 2 insertions(+)

diff --git a/ports/pic16bit/main.c b/ports/pic16bit/main.c
index adb9276071dad..e6481bafb6960 100644
--- a/ports/pic16bit/main.c
+++ b/ports/pic16bit/main.c
@@ -29,6 +29,7 @@
 #include <string.h>
 #include <p33Fxxxx.h>
 
+#include "py/builtin.h"
 #include "py/compile.h"
 #include "py/runtime.h"
 #include "py/gc.h"
diff --git a/ports/pic16bit/mpconfigport.h b/ports/pic16bit/mpconfigport.h
index 52b1701ea3e5d..e97a465028283 100644
--- a/ports/pic16bit/mpconfigport.h
+++ b/ports/pic16bit/mpconfigport.h
@@ -29,6 +29,7 @@
 // options to control how MicroPython is built
 #define MICROPY_OBJ_REPR            (MICROPY_OBJ_REPR_B)
 #define MICROPY_ALLOC_PATH_MAX      (64)
+#define MICROPY_QSTR_BYTES_IN_HASH  (1)
 #define MICROPY_EMIT_X64            (0)
 #define MICROPY_EMIT_THUMB          (0)
 #define MICROPY_EMIT_INLINE_THUMB   (0)

From a446a7bdef86c2e4fef673e0d1f07e5a35672831 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 7 Jun 2022 14:19:22 +1000
Subject: [PATCH 2154/3533] rp2/mpnetworkport: Fix lwip alarm callback timing
 to use microseconds.

The callback passed to add_alarm_in_ms must return microseconds, even
though the initial delay is in milliseconds.  Fix this use, and to avoid
further confusion use the add_alarm_in_us function instead.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/rp2/mpnetworkport.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/rp2/mpnetworkport.c b/ports/rp2/mpnetworkport.c
index 7ee10bb03e0fd..b481abba23234 100644
--- a/ports/rp2/mpnetworkport.c
+++ b/ports/rp2/mpnetworkport.c
@@ -106,7 +106,7 @@ STATIC int64_t alarm_callback(alarm_id_t id, void *user_data) {
     #if MICROPY_PY_WIZNET5K
     wiznet5k_try_poll();
     #endif
-    return lwip_try_poll();
+    return (int64_t)lwip_try_poll() * 1000;
 }
 
 void mod_network_lwip_init(void) {
@@ -116,7 +116,7 @@ void mod_network_lwip_init(void) {
     if (lwip_alarm_id != -1) {
         cancel_alarm(lwip_alarm_id);
     }
-    lwip_alarm_id = add_alarm_in_ms(LWIP_TICK_RATE_MS, alarm_callback, mp_const_true, true);
+    lwip_alarm_id = add_alarm_in_us(LWIP_TICK_RATE_MS * 1000, alarm_callback, mp_const_true, true);
 }
 
 #endif // MICROPY_PY_LWIP

From 66dfe17b181101bbee9ff22ebd30b7f05787b439 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 7 Jun 2022 14:33:09 +1000
Subject: [PATCH 2155/3533] rp2/CMakeLists: Simplify qstr sources when enabling
 extmod components.

Also remove redundant modusocket.c and modnetwork.c sources, they are
already added by extmod/extmod.cmake.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/rp2/CMakeLists.txt | 28 ++++++++--------------------
 1 file changed, 8 insertions(+), 20 deletions(-)

diff --git a/ports/rp2/CMakeLists.txt b/ports/rp2/CMakeLists.txt
index 31284c8405fb2..7749d95ca5696 100644
--- a/ports/rp2/CMakeLists.txt
+++ b/ports/rp2/CMakeLists.txt
@@ -104,6 +104,7 @@ set(MICROPY_SOURCE_PORT
     modrp2.c
     modutime.c
     mphalport.c
+    mpnetworkport.c
     mpthreadport.c
     rp2_flash.c
     rp2_pio.c
@@ -115,8 +116,6 @@ set(MICROPY_SOURCE_PORT
 
 set(MICROPY_SOURCE_QSTR
     ${MICROPY_SOURCE_PY}
-    ${MICROPY_SOURCE_EXTMOD}
-    ${MICROPY_SOURCE_USERMOD}
     ${MICROPY_DIR}/shared/runtime/mpirq.c
     ${MICROPY_DIR}/shared/runtime/sys_stdio_mphal.c
     ${PROJECT_SOURCE_DIR}/machine_adc.c
@@ -180,12 +179,7 @@ if (MICROPY_PY_LWIP)
         MICROPY_PY_LWIP=1
     )
 
-    list(APPEND MICROPY_SOURCE_PORT
-        ${MICROPY_EXTMOD_DIR}/modlwip.c
-        mpnetworkport.c
-    )
-
-    list(APPEND MICROPY_SOURCE_QSTR
+    list(APPEND MICROPY_SOURCE_EXTMOD
         ${MICROPY_EXTMOD_DIR}/modlwip.c
     )
 
@@ -238,10 +232,6 @@ if (MICROPY_PY_NETWORK_NINAW10)
     list(APPEND MICROPY_SOURCE_EXTMOD
         ${MICROPY_DIR}/extmod/network_ninaw10.c
     )
-
-    list(APPEND MICROPY_SOURCE_QSTR
-        ${MICROPY_DIR}/extmod/network_ninaw10.c
-    )
 endif()
 
 if (MICROPY_PY_WIZNET5K)
@@ -277,20 +267,18 @@ if (MICROPY_PY_WIZNET5K)
     )
 
     list(APPEND MICROPY_SOURCE_EXTMOD
-        ${MICROPY_DIR}/extmod/modnetwork.c
-        ${MICROPY_DIR}/extmod/modusocket.c
-        ${MICROPY_DIR}/extmod/network_wiznet5k.c
-    )
-
-    list(APPEND MICROPY_SOURCE_QSTR
-        ${MICROPY_DIR}/extmod/modnetwork.c
-        ${MICROPY_DIR}/extmod/modusocket.c
         ${MICROPY_DIR}/extmod/network_wiznet5k.c
     )
 
     string(CONCAT GIT_SUBMODULES "${GIT_SUBMODULES} " lib/wiznet5k)
 endif()
 
+# Add qstr sources for extmod and usermod, in case they are modified by components above.
+list(APPEND MICROPY_SOURCE_QSTR
+    ${MICROPY_SOURCE_EXTMOD}
+    ${MICROPY_SOURCE_USERMOD}
+)
+
 # Define mpy-cross flags
 set(MICROPY_CROSS_FLAGS -march=armv7m)
 

From 9670a156dabc1c751a6b02ef280daccf5a0ed213 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 7 Jun 2022 14:41:25 +1000
Subject: [PATCH 2156/3533] all: Rename MICROPY_PY_WIZNET5K to
 MICROPY_PY_NETWORK_WIZNET5K.

To match MICROPY_PY_NETWORK_CYW43 and MICROPY_PY_NETWORK_NINAW10.

Signed-off-by: Damien George <damien@micropython.org>
---
 docs/library/network.WIZNET5K.rst                    |  2 +-
 extmod/network_wiznet5k.c                            |  4 ++--
 ports/rp2/CMakeLists.txt                             |  6 +++---
 ports/rp2/boards/W5100S_EVB_PICO/mpconfigboard.cmake |  2 +-
 ports/rp2/mpconfigport.h                             |  2 +-
 ports/rp2/mpnetworkport.c                            | 10 +++++-----
 ports/stm32/Makefile                                 |  6 +++---
 ports/stm32/modnwwiznet5k.c                          |  8 ++++----
 ports/stm32/mpconfigport.h                           |  2 +-
 ports/stm32/mpconfigport.mk                          |  2 +-
 ports/stm32/mpnetworkport.c                          |  4 ++--
 ports/stm32/network_wiznet5k.c                       |  8 ++++----
 tools/autobuild/build-stm32-extra.sh                 |  8 ++++----
 tools/ci.sh                                          |  2 +-
 14 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/docs/library/network.WIZNET5K.rst b/docs/library/network.WIZNET5K.rst
index 9e2c40f7f3932..c13d43a376ece 100644
--- a/docs/library/network.WIZNET5K.rst
+++ b/docs/library/network.WIZNET5K.rst
@@ -6,7 +6,7 @@ class WIZNET5K -- control WIZnet5x00 Ethernet modules
 
 This class allows you to control WIZnet5x00 Ethernet adaptors based on
 the W5200 and W5500 chipsets.  The particular chipset that is supported
-by the firmware is selected at compile-time via the MICROPY_PY_WIZNET5K
+by the firmware is selected at compile-time via the MICROPY_PY_NETWORK_WIZNET5K
 option.
 
 Example usage::
diff --git a/extmod/network_wiznet5k.c b/extmod/network_wiznet5k.c
index e14d8bdd6a0f5..f328276a5b269 100644
--- a/extmod/network_wiznet5k.c
+++ b/extmod/network_wiznet5k.c
@@ -40,7 +40,7 @@
 #include "modmachine.h"
 #include "drivers/bus/spi.h"
 
-#if MICROPY_PY_WIZNET5K
+#if MICROPY_PY_NETWORK_WIZNET5K
 
 #include "lib/wiznet5k/Ethernet/wizchip_conf.h"
 
@@ -1039,4 +1039,4 @@ const mod_network_nic_type_t mod_network_nic_type_wiznet5k = {
 };
 #endif
 
-#endif // MICROPY_PY_WIZNET5K
+#endif // MICROPY_PY_NETWORK_WIZNET5K
diff --git a/ports/rp2/CMakeLists.txt b/ports/rp2/CMakeLists.txt
index 7749d95ca5696..d5793fc625f35 100644
--- a/ports/rp2/CMakeLists.txt
+++ b/ports/rp2/CMakeLists.txt
@@ -234,11 +234,11 @@ if (MICROPY_PY_NETWORK_NINAW10)
     )
 endif()
 
-if (MICROPY_PY_WIZNET5K)
+if (MICROPY_PY_NETWORK_WIZNET5K)
     target_compile_definitions(${MICROPY_TARGET} PRIVATE
-        MICROPY_PY_WIZNET5K=1
+        MICROPY_PY_NETWORK_WIZNET5K=1
         WIZCHIP_PREFIXED_EXPORTS=1
-        _WIZCHIP_=${MICROPY_PY_WIZNET5K}
+        _WIZCHIP_=${MICROPY_PY_NETWORK_WIZNET5K}
         WIZCHIP_YIELD=mpy_wiznet_yield
     )
 
diff --git a/ports/rp2/boards/W5100S_EVB_PICO/mpconfigboard.cmake b/ports/rp2/boards/W5100S_EVB_PICO/mpconfigboard.cmake
index fc5db6e4af2e5..bc5d1ea65e8bf 100644
--- a/ports/rp2/boards/W5100S_EVB_PICO/mpconfigboard.cmake
+++ b/ports/rp2/boards/W5100S_EVB_PICO/mpconfigboard.cmake
@@ -1,4 +1,4 @@
 # cmake file for Wiznet W5100S-EVB-Pico.
 set(PICO_BOARD pico)
-set(MICROPY_PY_WIZNET5K W5100S)
+set(MICROPY_PY_NETWORK_WIZNET5K W5100S)
 set(MICROPY_PY_LWIP 1)
diff --git a/ports/rp2/mpconfigport.h b/ports/rp2/mpconfigport.h
index e2d0ffd2246ee..d681a04af89fd 100644
--- a/ports/rp2/mpconfigport.h
+++ b/ports/rp2/mpconfigport.h
@@ -164,7 +164,7 @@ extern const struct _mod_network_nic_type_t mod_network_nic_type_nina;
 #define MICROPY_PORT_ROOT_POINTER_NINAW10
 #endif
 
-#if MICROPY_PY_WIZNET5K
+#if MICROPY_PY_NETWORK_WIZNET5K
 #if MICROPY_PY_LWIP
 extern const struct _mp_obj_type_t mod_network_nic_type_wiznet5k;
 #else
diff --git a/ports/rp2/mpnetworkport.c b/ports/rp2/mpnetworkport.c
index b481abba23234..124907f53870f 100644
--- a/ports/rp2/mpnetworkport.c
+++ b/ports/rp2/mpnetworkport.c
@@ -39,7 +39,7 @@ static alarm_id_t lwip_alarm_id = -1;
 static bool lwip_can_poll = true;
 static bool lwip_poll_pending = false;
 
-#if MICROPY_PY_WIZNET5K
+#if MICROPY_PY_NETWORK_WIZNET5K
 static bool wiznet_poll_pending = false;
 
 void wiznet5k_poll(void);
@@ -64,7 +64,7 @@ void lwip_lock_acquire(void) {
 
 void lwip_lock_release(void) {
     lwip_can_poll = false;
-    #if MICROPY_PY_WIZNET5K
+    #if MICROPY_PY_NETWORK_WIZNET5K
     if (wiznet_poll_pending) {
         wiznet5k_poll();
         wiznet_poll_pending = false;
@@ -90,7 +90,7 @@ uint32_t lwip_try_poll(void) {
     return ret;
 }
 
-#if MICROPY_PY_WIZNET5K
+#if MICROPY_PY_NETWORK_WIZNET5K
 void wiznet5k_try_poll(void) {
     if (lwip_can_poll) {
         lwip_can_poll = false;
@@ -103,14 +103,14 @@ void wiznet5k_try_poll(void) {
 #endif
 
 STATIC int64_t alarm_callback(alarm_id_t id, void *user_data) {
-    #if MICROPY_PY_WIZNET5K
+    #if MICROPY_PY_NETWORK_WIZNET5K
     wiznet5k_try_poll();
     #endif
     return (int64_t)lwip_try_poll() * 1000;
 }
 
 void mod_network_lwip_init(void) {
-    #if MICROPY_PY_WIZNET5K
+    #if MICROPY_PY_NETWORK_WIZNET5K
     wiznet5k_deinit();
     #endif
     if (lwip_alarm_id != -1) {
diff --git a/ports/stm32/Makefile b/ports/stm32/Makefile
index 10e4e15d9f801..1a4616f022583 100644
--- a/ports/stm32/Makefile
+++ b/ports/stm32/Makefile
@@ -449,17 +449,17 @@ DRIVERS_SRC_C += drivers/cyw43/cyw43_ctrl.c drivers/cyw43/cyw43_lwip.c
 LIBS += $(TOP)/drivers/cyw43/libcyw43.a
 endif
 
-ifneq ($(MICROPY_PY_WIZNET5K),0)
+ifneq ($(MICROPY_PY_NETWORK_WIZNET5K),0)
 WIZNET5K_DIR=drivers/wiznet5k
 INC += -I$(TOP)/$(WIZNET5K_DIR)
-CFLAGS_MOD += -DMICROPY_PY_WIZNET5K=$(MICROPY_PY_WIZNET5K) -D_WIZCHIP_=$(MICROPY_PY_WIZNET5K)
+CFLAGS_MOD += -DMICROPY_PY_WIZNET5K=$(MICROPY_PY_NETWORK_WIZNET5K) -D_WIZCHIP_=$(MICROPY_PY_NETWORK_WIZNET5K)
 ifeq ($(MICROPY_PY_LWIP),1)
 # When using MACRAW mode (with lwIP), maximum buffer space must be used for the raw socket
 CFLAGS_MOD += -DWIZCHIP_USE_MAX_BUFFER
 endif
 SRC_MOD += network_wiznet5k.c modnwwiznet5k.c
 SRC_MOD += $(addprefix $(WIZNET5K_DIR)/,\
-	ethernet/w$(MICROPY_PY_WIZNET5K)/w$(MICROPY_PY_WIZNET5K).c \
+	ethernet/w$(MICROPY_PY_NETWORK_WIZNET5K)/w$(MICROPY_PY_NETWORK_WIZNET5K).c \
 	ethernet/wizchip_conf.c \
 	ethernet/socket.c \
 	internet/dns/dns.c \
diff --git a/ports/stm32/modnwwiznet5k.c b/ports/stm32/modnwwiznet5k.c
index f7adad3f317c6..2d5044d5246b1 100644
--- a/ports/stm32/modnwwiznet5k.c
+++ b/ports/stm32/modnwwiznet5k.c
@@ -38,7 +38,7 @@
 #include "pin.h"
 #include "spi.h"
 
-#if MICROPY_PY_WIZNET5K && !MICROPY_PY_LWIP
+#if MICROPY_PY_NETWORK_WIZNET5K && !MICROPY_PY_LWIP
 
 #include "ethernet/wizchip_conf.h"
 #include "ethernet/socket.h"
@@ -419,7 +419,7 @@ STATIC mp_obj_t wiznet5k_regs(mp_obj_t self_in) {
         if (i % 16 == 0) {
             printf("\n  %04x:", i);
         }
-        #if MICROPY_PY_WIZNET5K == 5200
+        #if MICROPY_PY_NETWORK_WIZNET5K == 5200
         uint32_t reg = i;
         #else
         uint32_t reg = _W5500_IO_BASE_ | i << 8;
@@ -432,7 +432,7 @@ STATIC mp_obj_t wiznet5k_regs(mp_obj_t self_in) {
             if (i % 16 == 0) {
                 printf("\n  %04x:", i);
             }
-            #if MICROPY_PY_WIZNET5K == 5200
+            #if MICROPY_PY_NETWORK_WIZNET5K == 5200
             uint32_t reg = WIZCHIP_SREG_ADDR(sn, i);
             #else
             uint32_t reg = _W5500_IO_BASE_ | i << 8 | WIZCHIP_SREG_BLOCK(sn) << 3;
@@ -510,4 +510,4 @@ const mod_network_nic_type_t mod_network_nic_type_wiznet5k = {
     .ioctl = wiznet5k_socket_ioctl,
 };
 
-#endif // MICROPY_PY_WIZNET5K && !MICROPY_PY_LWIP
+#endif // MICROPY_PY_NETWORK_WIZNET5K && !MICROPY_PY_LWIP
diff --git a/ports/stm32/mpconfigport.h b/ports/stm32/mpconfigport.h
index eb2344d073f5f..a87fe3768f179 100644
--- a/ports/stm32/mpconfigport.h
+++ b/ports/stm32/mpconfigport.h
@@ -201,7 +201,7 @@ extern const struct _mp_obj_type_t mp_network_cyw43_type;
 #define MICROPY_HW_NIC_CYW43
 #endif
 
-#if MICROPY_PY_WIZNET5K
+#if MICROPY_PY_NETWORK_WIZNET5K
 #if MICROPY_PY_LWIP
 extern const struct _mp_obj_type_t mod_network_nic_type_wiznet5k;
 #else
diff --git a/ports/stm32/mpconfigport.mk b/ports/stm32/mpconfigport.mk
index 98ae93d20b997..830ccf03123a3 100644
--- a/ports/stm32/mpconfigport.mk
+++ b/ports/stm32/mpconfigport.mk
@@ -4,7 +4,7 @@
 #   0    : no Wiznet support
 #   5200 : support for W5200 module
 #   5500 : support for W5500 module
-MICROPY_PY_WIZNET5K ?= 0
+MICROPY_PY_NETWORK_WIZNET5K ?= 0
 
 # cc3k module for wifi support
 MICROPY_PY_CC3K ?= 0
diff --git a/ports/stm32/mpnetworkport.c b/ports/stm32/mpnetworkport.c
index c879c5005546c..2f49328e110ee 100644
--- a/ports/stm32/mpnetworkport.c
+++ b/ports/stm32/mpnetworkport.c
@@ -48,7 +48,7 @@
 // Poll lwIP every 128ms
 #define LWIP_TICK(tick) (((tick) & ~(SYSTICK_DISPATCH_NUM_SLOTS - 1) & 0x7f) == 0)
 
-#if MICROPY_PY_WIZNET5K
+#if MICROPY_PY_NETWORK_WIZNET5K
 void wiznet5k_poll(void);
 #endif
 
@@ -57,7 +57,7 @@ u32_t sys_now(void) {
 }
 
 STATIC void pyb_lwip_poll(void) {
-    #if MICROPY_PY_WIZNET5K
+    #if MICROPY_PY_NETWORK_WIZNET5K
     // Poll the NIC for incoming data
     wiznet5k_poll();
     #endif
diff --git a/ports/stm32/network_wiznet5k.c b/ports/stm32/network_wiznet5k.c
index a529191557ba9..4675f3c2c2a1e 100644
--- a/ports/stm32/network_wiznet5k.c
+++ b/ports/stm32/network_wiznet5k.c
@@ -32,7 +32,7 @@
 #include "extmod/modnetwork.h"
 #include "spi.h"
 
-#if MICROPY_PY_WIZNET5K && MICROPY_PY_LWIP
+#if MICROPY_PY_NETWORK_WIZNET5K && MICROPY_PY_LWIP
 
 #include "shared/netutils/netutils.h"
 #include "drivers/wiznet5k/ethernet/socket.h"
@@ -295,7 +295,7 @@ STATIC mp_obj_t wiznet5k_regs(mp_obj_t self_in) {
         if (i % 16 == 0) {
             printf("\n  %04x:", i);
         }
-        #if MICROPY_PY_WIZNET5K == 5200
+        #if MICROPY_PY_NETWORK_WIZNET5K == 5200
         uint32_t reg = i;
         #else
         uint32_t reg = _W5500_IO_BASE_ | i << 8;
@@ -308,7 +308,7 @@ STATIC mp_obj_t wiznet5k_regs(mp_obj_t self_in) {
             if (i % 16 == 0) {
                 printf("\n  %04x:", i);
             }
-            #if MICROPY_PY_WIZNET5K == 5200
+            #if MICROPY_PY_NETWORK_WIZNET5K == 5200
             uint32_t reg = WIZCHIP_SREG_ADDR(sn, i);
             #else
             uint32_t reg = _W5500_IO_BASE_ | i << 8 | WIZCHIP_SREG_BLOCK(sn) << 3;
@@ -462,4 +462,4 @@ const mp_obj_type_t mod_network_nic_type_wiznet5k = {
     .locals_dict = (mp_obj_dict_t *)&wiznet5k_locals_dict,
 };
 
-#endif // MICROPY_PY_WIZNET5K && MICROPY_PY_LWIP
+#endif // MICROPY_PY_NETWORK_WIZNET5K && MICROPY_PY_LWIP
diff --git a/tools/autobuild/build-stm32-extra.sh b/tools/autobuild/build-stm32-extra.sh
index 43842d6c90741..80c6f42f5e6c7 100755
--- a/tools/autobuild/build-stm32-extra.sh
+++ b/tools/autobuild/build-stm32-extra.sh
@@ -32,16 +32,16 @@ fi
 
 # build the versions
 do_build pybv3 PYBV3
-do_build pybv3-network PYBV3 MICROPY_PY_WIZNET5K=5200 MICROPY_PY_CC3K=1
+do_build pybv3-network PYBV3 MICROPY_PY_NETWORK_WIZNET5K=5200 MICROPY_PY_CC3K=1
 do_build pybv10-dp PYBV10 MICROPY_FLOAT_IMPL=double
 do_build pybv10-thread PYBV10 CFLAGS_EXTRA='-DMICROPY_PY_THREAD=1'
 do_build pybv10-dp-thread PYBV10 MICROPY_FLOAT_IMPL=double CFLAGS_EXTRA='-DMICROPY_PY_THREAD=1'
-do_build pybv10-network PYBV10 MICROPY_PY_WIZNET5K=5200 MICROPY_PY_CC3K=1
+do_build pybv10-network PYBV10 MICROPY_PY_NETWORK_WIZNET5K=5200 MICROPY_PY_CC3K=1
 do_build pybv11-dp PYBV11 MICROPY_FLOAT_IMPL=double
 do_build pybv11-thread PYBV11 CFLAGS_EXTRA='-DMICROPY_PY_THREAD=1'
 do_build pybv11-dp-thread PYBV11 MICROPY_FLOAT_IMPL=double CFLAGS_EXTRA='-DMICROPY_PY_THREAD=1'
-do_build pybv11-network PYBV11 MICROPY_PY_WIZNET5K=5200 MICROPY_PY_CC3K=1
+do_build pybv11-network PYBV11 MICROPY_PY_NETWORK_WIZNET5K=5200 MICROPY_PY_CC3K=1
 do_build pyblitev10-dp PYBLITEV10 MICROPY_FLOAT_IMPL=double
 do_build pyblitev10-thread PYBLITEV10 CFLAGS_EXTRA='-DMICROPY_PY_THREAD=1'
 do_build pyblitev10-dp-thread PYBLITEV10 MICROPY_FLOAT_IMPL=double CFLAGS_EXTRA='-DMICROPY_PY_THREAD=1'
-do_build pyblitev10-network PYBLITEV10 MICROPY_PY_WIZNET5K=5200 MICROPY_PY_CC3K=1
+do_build pyblitev10-network PYBLITEV10 MICROPY_PY_NETWORK_WIZNET5K=5200 MICROPY_PY_CC3K=1
diff --git a/tools/ci.sh b/tools/ci.sh
index f8890adced9eb..4670a9211401d 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -305,7 +305,7 @@ function ci_stm32_pyb_build {
     make ${MAKEOPTS} -C ports/stm32 submodules
     git submodule update --init lib/btstack
     git submodule update --init lib/mynewt-nimble
-    make ${MAKEOPTS} -C ports/stm32 BOARD=PYBV11 MICROPY_PY_WIZNET5K=5200 MICROPY_PY_CC3K=1 USER_C_MODULES=../../examples/usercmodule
+    make ${MAKEOPTS} -C ports/stm32 BOARD=PYBV11 MICROPY_PY_NETWORK_WIZNET5K=5200 MICROPY_PY_CC3K=1 USER_C_MODULES=../../examples/usercmodule
     make ${MAKEOPTS} -C ports/stm32 BOARD=PYBD_SF2
     make ${MAKEOPTS} -C ports/stm32 BOARD=PYBD_SF6 NANBOX=1 MICROPY_BLUETOOTH_NIMBLE=0 MICROPY_BLUETOOTH_BTSTACK=1
     make ${MAKEOPTS} -C ports/stm32/mboot BOARD=PYBV10 CFLAGS_EXTRA='-DMBOOT_FSLOAD=1 -DMBOOT_VFS_LFS2=1'

From 1d143cec63f8dabfac5fed50fe4cfdabd414385e Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 7 Jun 2022 14:44:24 +1000
Subject: [PATCH 2157/3533] tests/basics: Add .exp file for sys.tracebacklimit
 test.

The sys.tracebacklimit feature has changed semantics a bit from CPython 3.7
(in the way it modifies the output), so provide a .exp file for the test so
it doesn't rely on CPython.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/basics/sys_tracebacklimit.py.exp | 42 ++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 tests/basics/sys_tracebacklimit.py.exp

diff --git a/tests/basics/sys_tracebacklimit.py.exp b/tests/basics/sys_tracebacklimit.py.exp
new file mode 100644
index 0000000000000..3647280584dde
--- /dev/null
+++ b/tests/basics/sys_tracebacklimit.py.exp
@@ -0,0 +1,42 @@
+Traceback (most recent call last):
+  File  , line 62, in ftop
+  File  , line 57, in f3
+  File  , line 53, in f2
+  File  , line 49, in f1
+  File  , line 45, in f0
+ValueError: value
+
+limit 4
+Traceback (most recent call last):
+  File  , line 62, in ftop
+  File  , line 57, in f3
+  File  , line 53, in f2
+  File  , line 49, in f1
+ValueError: value
+
+limit 3
+Traceback (most recent call last):
+  File  , line 62, in ftop
+  File  , line 57, in f3
+  File  , line 53, in f2
+ValueError: value
+
+limit 2
+Traceback (most recent call last):
+  File  , line 62, in ftop
+  File  , line 57, in f3
+ValueError: value
+
+limit 1
+Traceback (most recent call last):
+  File  , line 62, in ftop
+ValueError: value
+
+limit 0
+ValueError: value
+
+limit -1
+ValueError: value
+
+True
+False

From 2fb413b265436087a64c63d4bc1a003c010a037e Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 7 Jun 2022 15:00:00 +1000
Subject: [PATCH 2158/3533] tools/mpy-tool.py: Improve generated frozen
 identifiers.

Frozen identifiers now include their full name hierarchy, eg their class
name.  This makes it easier to understand the generated code.

Signed-off-by: Damien George <damien@micropython.org>
---
 tools/mpy-tool.py | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/tools/mpy-tool.py b/tools/mpy-tool.py
index cc30eafecdb56..31212fd5bdda8 100755
--- a/tools/mpy-tool.py
+++ b/tools/mpy-tool.py
@@ -849,7 +849,7 @@ class RawCode(object):
         MP_CODE_NATIVE_ASM: "MP_CODE_NATIVE_ASM",
     }
 
-    def __init__(self, cm_escaped_name, qstr_table, fun_data, prelude_offset, code_kind):
+    def __init__(self, parent_name, qstr_table, fun_data, prelude_offset, code_kind):
         self.qstr_table = qstr_table
         self.fun_data = fun_data
         self.prelude_offset = prelude_offset
@@ -872,7 +872,7 @@ def __init__(self, cm_escaped_name, qstr_table, fun_data, prelude_offset, code_k
         else:
             self.simple_name = self.qstr_table[0]
 
-        escaped_name = cm_escaped_name + "_" + self.simple_name.qstr_esc
+        escaped_name = parent_name + "_" + self.simple_name.qstr_esc
 
         # make sure the escaped name is unique
         i = 2
@@ -956,10 +956,10 @@ def freeze_raw_code(self, prelude_ptr=None, type_sig=0):
 
 
 class RawCodeBytecode(RawCode):
-    def __init__(self, cm_escaped_name, qstr_table, obj_table, fun_data):
+    def __init__(self, parent_name, qstr_table, obj_table, fun_data):
         self.obj_table = obj_table
         super(RawCodeBytecode, self).__init__(
-            cm_escaped_name, qstr_table, fun_data, 0, MP_CODE_BYTECODE
+            parent_name, qstr_table, fun_data, 0, MP_CODE_BYTECODE
         )
 
     def disassemble(self):
@@ -1035,7 +1035,7 @@ def freeze(self):
 class RawCodeNative(RawCode):
     def __init__(
         self,
-        cm_escaped_name,
+        parent_name,
         qstr_table,
         kind,
         fun_data,
@@ -1045,7 +1045,7 @@ def __init__(
         type_sig,
     ):
         super(RawCodeNative, self).__init__(
-            cm_escaped_name, qstr_table, fun_data, prelude_offset, kind
+            parent_name, qstr_table, fun_data, prelude_offset, kind
         )
 
         if kind in (MP_CODE_NATIVE_VIPER, MP_CODE_NATIVE_ASM):
@@ -1241,7 +1241,7 @@ def read_obj(reader, segments):
         return obj
 
 
-def read_raw_code(reader, cm_escaped_name, qstr_table, obj_table, segments):
+def read_raw_code(reader, parent_name, qstr_table, obj_table, segments):
     # Read raw code header.
     kind_len = reader.read_uint()
     kind = (kind_len & 3) + MP_CODE_BYTECODE
@@ -1255,7 +1255,7 @@ def read_raw_code(reader, cm_escaped_name, qstr_table, obj_table, segments):
 
     if kind == MP_CODE_BYTECODE:
         # Create bytecode raw code.
-        rc = RawCodeBytecode(cm_escaped_name, qstr_table, obj_table, fun_data)
+        rc = RawCodeBytecode(parent_name, qstr_table, obj_table, fun_data)
     else:
         # Create native raw code.
         native_scope_flags = 0
@@ -1290,7 +1290,7 @@ def read_raw_code(reader, cm_escaped_name, qstr_table, obj_table, segments):
                 native_type_sig = reader.read_uint()
 
         rc = RawCodeNative(
-            cm_escaped_name,
+            parent_name,
             qstr_table,
             kind,
             fun_data,
@@ -1309,11 +1309,14 @@ def read_raw_code(reader, cm_escaped_name, qstr_table, obj_table, segments):
     # Read children, if there are any.
     rc.children = []
     if has_children:
+        # Make a pretty parent name (otherwise all identifiers will include _lt_module_gt_).
+        if not rc.escaped_name.endswith("_lt_module_gt_"):
+            parent_name = rc.escaped_name
+
+        # Read all the child raw codes.
         n_children = reader.read_uint()
         for _ in range(n_children):
-            rc.children.append(
-                read_raw_code(reader, cm_escaped_name, qstr_table, obj_table, segments)
-            )
+            rc.children.append(read_raw_code(reader, parent_name, qstr_table, obj_table, segments))
 
     return rc
 

From a0dae1dda21fc22517dccce3834af03714dadba4 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 7 Jun 2022 15:06:12 +1000
Subject: [PATCH 2159/3533] stm32/flash: Remove FLASH_OPTR_DBANK condition in
 L4, H7 get_bank func.

This was added by mistake in 8f68e26f79ee325669fb7dc7bbd092fccd5b038f when
adding support for G4 MCUs, which does not using this get_bank() function.

FLASH_OPTR_DBANK is only defined on G4 and L4 MCUs, so on H7 this
FLASH_BANK_2 code was being wrongly excluded.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/flash.c | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/ports/stm32/flash.c b/ports/stm32/flash.c
index 2644e0f58ae06..de537aba212de 100644
--- a/ports/stm32/flash.c
+++ b/ports/stm32/flash.c
@@ -140,20 +140,12 @@ static uint32_t get_bank(uint32_t addr) {
         if (addr < (FLASH_BASE + FLASH_BANK_SIZE)) {
             return FLASH_BANK_1;
         } else {
-            #if defined(FLASH_OPTR_DBANK)
             return FLASH_BANK_2;
-            #else
-            return 0;
-            #endif
         }
     } else {
         // bank swap
         if (addr < (FLASH_BASE + FLASH_BANK_SIZE)) {
-            #if defined(FLASH_OPTR_DBANK)
             return FLASH_BANK_2;
-            #else
-            return 0;
-            #endif
         } else {
             return FLASH_BANK_1;
         }

From 14105ff5b168acdefba4b5f0b9079c7eb757bded Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 7 Jun 2022 15:16:03 +1000
Subject: [PATCH 2160/3533] stm32/machine_i2c: Enable timingr constructor
 keyword on H7 MCUs.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/machine_i2c.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/stm32/machine_i2c.c b/ports/stm32/machine_i2c.c
index 0976c18c812ef..262944585aaac 100644
--- a/ports/stm32/machine_i2c.c
+++ b/ports/stm32/machine_i2c.c
@@ -186,7 +186,7 @@ STATIC void machine_hard_i2c_init(machine_hard_i2c_obj_t *self, uint32_t freq, u
 /******************************************************************************/
 /* MicroPython bindings for machine API                                       */
 
-#if defined(STM32F0) || defined(STM32F7)
+#if defined(STM32F0) || defined(STM32F7) || defined(STM32H7)
 #define MACHINE_I2C_TIMINGR (1)
 #else
 #define MACHINE_I2C_TIMINGR (0)

From 0d8d911950703ea7b2efea7a40a73c942aa84b37 Mon Sep 17 00:00:00 2001
From: Clayton Mills <clayton.mills@planetinnovation.com.au>
Date: Thu, 26 May 2022 17:57:17 +1000
Subject: [PATCH 2161/3533] stm32/powerctrl: Disable sys tick interrupt in stop
 mode on some STM32s.

According to ST Errata ES0206 Rev 18, Section 2.2.1, on STM32F427x,
STM32F437x, STM32F429x and STM32F439x.

If the system tick interrupt is enabled during stop mode while certain
bits are set in the DBGMCU_CR, then the system will immediately wake
from stop mode.

Suggested workaround is to disable system tick timer interrupt when
entering stop mode.

According to ST Errate ES0394 Rev 11, Section 2.2.17, on STM32WB55Cx and
STM32WB35Cx.

If the system tick interrupt is enabled during stop 0, stop 1 or stop 2
while certain bits are set in DBGMCU_CR, then system will immediately
wake from stop mode but the system remains in low power state. The CPU
therefore fetches incorrect data from inactive Flash, which can cause a
hard fault.

Suggested workaround is to disable system tick timer interrupt when
entering stop mode.
---
 ports/stm32/powerctrl.c | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/ports/stm32/powerctrl.c b/ports/stm32/powerctrl.c
index cf06f3e18eac7..3b4a2d86e1e1e 100644
--- a/ports/stm32/powerctrl.c
+++ b/ports/stm32/powerctrl.c
@@ -685,10 +685,17 @@ void powerctrl_enter_stop_mode(void) {
     // executed until after the clocks are reconfigured
     uint32_t irq_state = disable_irq();
 
-    #if defined(STM32H7)
+    #if defined(STM32H7) || \
+    defined(STM32F427xx) || defined(STM32F437xx) || \
+    defined(STM32F429xx) || defined(STM32F439xx) || \
+    defined(STM32WB55xx) || defined(STM32WB35xx)
     // Disable SysTick Interrupt
     // Note: This seems to be required at least on the H7 REV Y,
     // otherwise the MCU will leave stop mode immediately on entry.
+    // Note: According to ST Errata ES0206 Rev 18, Section 2.2.1 this is needed
+    // for STM32F427xx, STM32F437xx, STM32F429xx and STM32F439xx
+    // Note: According to ST Errata ES0394 Rev 11, Section 2.2.17 this is needed
+    // for STM32WB55xx and STM32WB35xx
     SysTick->CTRL &= ~SysTick_CTRL_TICKINT_Msk;
     #endif
 
@@ -849,7 +856,10 @@ void powerctrl_enter_stop_mode(void) {
     MICROPY_BOARD_LEAVE_STOP
     #endif
 
-    #if defined(STM32H7)
+    #if defined(STM32H7) || \
+    defined(STM32F427xx) || defined(STM32F437xx) || \
+    defined(STM32F429xx) || defined(STM32F439xx) || \
+    defined(STM32WB55xx) || defined(STM32WB35xx)
     // Enable SysTick Interrupt
     SysTick->CTRL |= SysTick_CTRL_TICKINT_Msk;
     #endif

From 767f2ce9a77606d438652edc5ac32d1ce4544907 Mon Sep 17 00:00:00 2001
From: Clayton Mills <clayton.mills@planetinnovation.com.au>
Date: Tue, 7 Jun 2022 11:44:36 +1000
Subject: [PATCH 2162/3533] stm32/usbd_conf: Remove disable of SYSCFG clock.

System config block contains hardware unrelated to USB.  So calling
`__SYSCFG_CLK_DISABLE()` during `HAL_PCD_MspDeInit()` has an adverse effect
on other system functionality.

Removing call to `__SYSCFG_CLK_DISABLE()` to rectify this issue.

This call was there since the beginning of the USB CDC code, added in
b30c02afa078f7713faa14087ae28433dee49027.
---
 ports/stm32/usbd_conf.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/ports/stm32/usbd_conf.c b/ports/stm32/usbd_conf.c
index 1fb2777831301..d0f519d456701 100644
--- a/ports/stm32/usbd_conf.c
+++ b/ports/stm32/usbd_conf.c
@@ -215,7 +215,6 @@ void HAL_PCD_MspDeInit(PCD_HandleTypeDef *hpcd) {
     if (hpcd->Instance == USB_OTG_FS) {
         /* Disable USB FS Clocks */
         __USB_OTG_FS_CLK_DISABLE();
-        __SYSCFG_CLK_DISABLE();
         return;
     }
     #endif
@@ -224,7 +223,6 @@ void HAL_PCD_MspDeInit(PCD_HandleTypeDef *hpcd) {
     if (hpcd->Instance == USB_OTG_HS) {
         /* Disable USB FS Clocks */
         __USB_OTG_HS_CLK_DISABLE();
-        __SYSCFG_CLK_DISABLE();
     }
     #endif
 

From 5cc2dd4f5d708ded1ceb05d7755c004e4fec7295 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sun, 8 May 2022 07:58:51 +0200
Subject: [PATCH 2163/3533] mimxrt/machine_uart: Fix an inconsistency for
 UART.init() arg handling.

With keyword arguments only or just a single non-keyword argument,
UART.init() did not perform the settings.
---
 ports/mimxrt/machine_uart.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/mimxrt/machine_uart.c b/ports/mimxrt/machine_uart.c
index 5b1f285d8d41a..115d9226bf8be 100644
--- a/ports/mimxrt/machine_uart.c
+++ b/ports/mimxrt/machine_uart.c
@@ -208,7 +208,7 @@ STATIC mp_obj_t machine_uart_init_helper(machine_uart_obj_t *self, size_t n_args
     }
 
     // Initialise the UART peripheral if any arguments given, or it was not initialised previously.
-    if (n_args > 1 || self->new) {
+    if (n_args > 0 || kw_args->used > 0 || self->new) {
         self->new = false;
         // may be obsolete
         if (self->config.baudRate_Bps == 0) {

From 646fcdadbfc03c8ab3c0720ef1e656786345f258 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 7 Jun 2022 23:22:04 +1000
Subject: [PATCH 2164/3533] tools/mpremote: Add command to print the version.

Signed-off-by: Damien George <damien@micropython.org>
---
 tools/mpremote/LICENSE              |  2 +-
 tools/mpremote/mpremote/__init__.py |  2 +-
 tools/mpremote/mpremote/main.py     | 13 ++++++++++++-
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/tools/mpremote/LICENSE b/tools/mpremote/LICENSE
index 5ec904cca10b1..a9ea6c27efd9d 100644
--- a/tools/mpremote/LICENSE
+++ b/tools/mpremote/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2021 Damien P. George
+Copyright (c) 2021-2022 Damien P. George
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/tools/mpremote/mpremote/__init__.py b/tools/mpremote/mpremote/__init__.py
index 1bb8bf6d7fd4c..d3ec452c319b4 100644
--- a/tools/mpremote/mpremote/__init__.py
+++ b/tools/mpremote/mpremote/__init__.py
@@ -1 +1 @@
-# empty
+__version__ = "0.2.0"
diff --git a/tools/mpremote/mpremote/main.py b/tools/mpremote/mpremote/main.py
index ccf174bb5b327..4d74743aa349a 100644
--- a/tools/mpremote/mpremote/main.py
+++ b/tools/mpremote/mpremote/main.py
@@ -1,6 +1,6 @@
 """
 MicroPython Remote - Interaction and automation tool for MicroPython
-MIT license; Copyright (c) 2019-2021 Damien P. George
+MIT license; Copyright (c) 2019-2022 Damien P. George
 
 This program provides a set of utilities to interact with and automate a
 MicroPython device over a serial connection.  Commands supported are:
@@ -68,6 +68,7 @@
     "run": (True, True, 1, "run the given local script"),
     "fs": (True, True, 1, "execute filesystem commands on the device"),
     "help": (False, False, 0, "print help and exit"),
+    "version": (False, False, 0, "print version and exit"),
 }
 
 _BUILTIN_COMMAND_EXPANSIONS = {
@@ -109,6 +110,7 @@
         "import machine; machine.RTC().datetime((2020, 1, 1, 0, 10, 0, 0, 0))",
     ],
     "--help": "help",
+    "--version": "version",
 }
 
 for port_num in range(4):
@@ -465,6 +467,12 @@ def print_commands_help(cmds, help_idx):
     print_commands_help(_command_expansions, 2)
 
 
+def print_version():
+    from . import __version__
+
+    print(f"{_PROG} {__version__}")
+
+
 def main():
     config = load_user_config()
     prepare_command_expansions(config)
@@ -498,6 +506,9 @@ def main():
             elif cmd == "help":
                 print_help()
                 sys.exit(0)
+            elif cmd == "version":
+                print_version()
+                sys.exit(0)
             elif cmd == "resume":
                 auto_soft_reset = False
                 continue

From 5290bfaefe1973bf36e246aad85a585ba74f44cf Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 7 Jun 2022 23:23:14 +1000
Subject: [PATCH 2165/3533] tools/mpremote: Bump version to 0.3.0.

Signed-off-by: Damien George <damien@micropython.org>
---
 tools/mpremote/mpremote/__init__.py | 2 +-
 tools/mpremote/setup.cfg            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/mpremote/mpremote/__init__.py b/tools/mpremote/mpremote/__init__.py
index d3ec452c319b4..493f7415d73d5 100644
--- a/tools/mpremote/mpremote/__init__.py
+++ b/tools/mpremote/mpremote/__init__.py
@@ -1 +1 @@
-__version__ = "0.2.0"
+__version__ = "0.3.0"
diff --git a/tools/mpremote/setup.cfg b/tools/mpremote/setup.cfg
index 2bde6a8ebcf6b..16880d77f895c 100644
--- a/tools/mpremote/setup.cfg
+++ b/tools/mpremote/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = mpremote
-version = 0.2.0
+version = 0.3.0
 author = Damien George
 author_email = damien@micropython.org
 description = Tool for interacting remotely with MicroPython

From 5bb2a85d74bfb7fc2cd322777e0e020f20561583 Mon Sep 17 00:00:00 2001
From: stijn <stijn@ignitron.net>
Date: Tue, 7 Jun 2022 11:24:42 +0200
Subject: [PATCH 2166/3533] windows: Use BCryptGenRandom to implement
 os.urandom.

Fix urandom not working on windows (there's no /dev/urandom) by using
a proper cryptographic random function (same one as CPython >= 3.11).
---
 ports/unix/moduos.c             | 12 ++++++++++++
 ports/windows/Makefile          |  2 +-
 ports/windows/msvc/common.props |  1 +
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/ports/unix/moduos.c b/ports/unix/moduos.c
index 1262cd2e29ac8..c7cd19ca38307 100644
--- a/ports/unix/moduos.c
+++ b/ports/unix/moduos.c
@@ -39,6 +39,11 @@
 #endif
 #endif
 
+#if _WIN32
+#include <windows.h>
+#include <bcrypt.h>
+#endif
+
 STATIC mp_obj_t mp_uos_getenv(mp_obj_t var_in) {
     const char *s = getenv(mp_obj_str_get_str(var_in));
     if (s == NULL) {
@@ -100,6 +105,12 @@ STATIC mp_obj_t mp_uos_urandom(mp_obj_t num) {
     mp_int_t n = mp_obj_get_int(num);
     vstr_t vstr;
     vstr_init_len(&vstr, n);
+    #if _WIN32
+    NTSTATUS result = BCryptGenRandom(NULL, (unsigned char *)vstr.buf, n, BCRYPT_USE_SYSTEM_PREFERRED_RNG);
+    if (!BCRYPT_SUCCESS(result)) {
+        mp_raise_OSError(errno);
+    }
+    #else
     #ifdef _HAVE_GETRANDOM
     RAISE_ERRNO(getrandom(vstr.buf, n, 0), errno);
     #else
@@ -108,6 +119,7 @@ STATIC mp_obj_t mp_uos_urandom(mp_obj_t num) {
     RAISE_ERRNO(read(fd, vstr.buf, n), errno);
     close(fd);
     #endif
+    #endif
     return mp_obj_new_str_from_vstr(&mp_type_bytes, &vstr);
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_uos_urandom_obj, mp_uos_urandom);
diff --git a/ports/windows/Makefile b/ports/windows/Makefile
index 4ffc408fd1724..3b89ef51efcd9 100644
--- a/ports/windows/Makefile
+++ b/ports/windows/Makefile
@@ -33,7 +33,7 @@ INC += -I$(VARIANT_DIR)
 
 # compiler settings
 CFLAGS = $(INC) -Wall -Wpointer-arith -Wdouble-promotion -Werror -std=gnu99 -DUNIX -D__USE_MINGW_ANSI_STDIO=1 $(CFLAGS_MOD) $(COPT) $(CFLAGS_EXTRA)
-LDFLAGS = $(LDFLAGS_MOD) -lm $(LDFLAGS_EXTRA)
+LDFLAGS = $(LDFLAGS_MOD) -lm -lbcrypt $(LDFLAGS_EXTRA)
 
 # Debugging/Optimization
 ifdef DEBUG
diff --git a/ports/windows/msvc/common.props b/ports/windows/msvc/common.props
index 7d608a3798daa..7700d9f0945b3 100644
--- a/ports/windows/msvc/common.props
+++ b/ports/windows/msvc/common.props
@@ -32,6 +32,7 @@
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <GenerateMapFile>true</GenerateMapFile>
+      <AdditionalDependencies>Bcrypt.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>

From d2f018bff1deb78c35fcfb4cee508d4899e03dff Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 2 Jun 2022 17:05:57 +1000
Subject: [PATCH 2167/3533] unix,windows: Factor out code that generates random
 bytes to a new func.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/unix/moduos.c           | 29 +----------------------------
 ports/unix/mphalport.h        |  2 ++
 ports/unix/unix_mphal.c       | 19 +++++++++++++++++++
 ports/windows/windows_mphal.c |  8 ++++++++
 4 files changed, 30 insertions(+), 28 deletions(-)

diff --git a/ports/unix/moduos.c b/ports/unix/moduos.c
index c7cd19ca38307..848a3612d115d 100644
--- a/ports/unix/moduos.c
+++ b/ports/unix/moduos.c
@@ -25,25 +25,12 @@
  * THE SOFTWARE.
  */
 
-#include <fcntl.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include "py/runtime.h"
 #include "py/mphal.h"
 
-#if defined(__GLIBC__) && defined(__GLIBC_PREREQ)
-#if __GLIBC_PREREQ(2, 25)
-#include <sys/random.h>
-#define _HAVE_GETRANDOM
-#endif
-#endif
-
-#if _WIN32
-#include <windows.h>
-#include <bcrypt.h>
-#endif
-
 STATIC mp_obj_t mp_uos_getenv(mp_obj_t var_in) {
     const char *s = getenv(mp_obj_str_get_str(var_in));
     if (s == NULL) {
@@ -105,21 +92,7 @@ STATIC mp_obj_t mp_uos_urandom(mp_obj_t num) {
     mp_int_t n = mp_obj_get_int(num);
     vstr_t vstr;
     vstr_init_len(&vstr, n);
-    #if _WIN32
-    NTSTATUS result = BCryptGenRandom(NULL, (unsigned char *)vstr.buf, n, BCRYPT_USE_SYSTEM_PREFERRED_RNG);
-    if (!BCRYPT_SUCCESS(result)) {
-        mp_raise_OSError(errno);
-    }
-    #else
-    #ifdef _HAVE_GETRANDOM
-    RAISE_ERRNO(getrandom(vstr.buf, n, 0), errno);
-    #else
-    int fd = open("/dev/urandom", O_RDONLY);
-    RAISE_ERRNO(fd, errno);
-    RAISE_ERRNO(read(fd, vstr.buf, n), errno);
-    close(fd);
-    #endif
-    #endif
+    mp_hal_get_random(n, vstr.buf);
     return mp_obj_new_str_from_vstr(&mp_type_bytes, &vstr);
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_uos_urandom_obj, mp_uos_urandom);
diff --git a/ports/unix/mphalport.h b/ports/unix/mphalport.h
index 510f9d939d653..724fc8af5f28f 100644
--- a/ports/unix/mphalport.h
+++ b/ports/unix/mphalport.h
@@ -91,6 +91,8 @@ static inline void mp_hal_delay_us(mp_uint_t us) {
     { if (err_flag == -1) \
       { mp_raise_OSError(error_val); } }
 
+void mp_hal_get_random(size_t n, void *buf);
+
 #if MICROPY_PY_BLUETOOTH
 enum {
     MP_HAL_MAC_BDADDR,
diff --git a/ports/unix/unix_mphal.c b/ports/unix/unix_mphal.c
index 1d3c52bf16a99..80a7d1c8f66f7 100644
--- a/ports/unix/unix_mphal.c
+++ b/ports/unix/unix_mphal.c
@@ -29,12 +29,20 @@
 #include <string.h>
 #include <time.h>
 #include <sys/time.h>
+#include <fcntl.h>
 
 #include "py/mphal.h"
 #include "py/mpthread.h"
 #include "py/runtime.h"
 #include "extmod/misc.h"
 
+#if defined(__GLIBC__) && defined(__GLIBC_PREREQ)
+#if __GLIBC_PREREQ(2, 25)
+#include <sys/random.h>
+#define _HAVE_GETRANDOM
+#endif
+#endif
+
 #ifndef _WIN32
 #include <signal.h>
 
@@ -234,3 +242,14 @@ void mp_hal_delay_ms(mp_uint_t ms) {
     usleep(ms * 1000);
     #endif
 }
+
+void mp_hal_get_random(size_t n, void *buf) {
+    #ifdef _HAVE_GETRANDOM
+    RAISE_ERRNO(getrandom(buf, n, 0), errno);
+    #else
+    int fd = open("/dev/urandom", O_RDONLY);
+    RAISE_ERRNO(fd, errno);
+    RAISE_ERRNO(read(fd, buf, n), errno);
+    close(fd);
+    #endif
+}
diff --git a/ports/windows/windows_mphal.c b/ports/windows/windows_mphal.c
index 17b20c30317ce..d1bbb931af380 100644
--- a/ports/windows/windows_mphal.c
+++ b/ports/windows/windows_mphal.c
@@ -32,6 +32,7 @@
 #include <sys/time.h>
 #include <windows.h>
 #include <unistd.h>
+#include <bcrypt.h>
 
 HANDLE std_in = NULL;
 HANDLE con_out = NULL;
@@ -286,3 +287,10 @@ void mp_hal_delay_ms(mp_uint_t ms) {
     msec_sleep((double)ms);
     #endif
 }
+
+void mp_hal_get_random(size_t n, void *buf) {
+    NTSTATUS result = BCryptGenRandom(NULL, (unsigned char *)buf, n, BCRYPT_USE_SYSTEM_PREFERRED_RNG);
+    if (!BCRYPT_SUCCESS(result)) {
+        mp_raise_OSError(errno);
+    }
+}

From ac3fb974bc1b1a3e202b11c9e68a1c3422372182 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 2 Jun 2022 17:13:03 +1000
Subject: [PATCH 2168/3533] unix/variants: Enable seeding random module on
 import in dev, coverage.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/unix/mpconfigport.h                      | 11 +++++++++++
 ports/unix/variants/coverage/mpconfigvariant.h |  2 +-
 ports/unix/variants/dev/mpconfigvariant.h      |  2 +-
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/ports/unix/mpconfigport.h b/ports/unix/mpconfigport.h
index ca050b414b767..a483c3e0860dd 100644
--- a/ports/unix/mpconfigport.h
+++ b/ports/unix/mpconfigport.h
@@ -253,6 +253,17 @@ void mp_unix_mark_exec(void);
 #define MICROPY_FORCE_PLAT_ALLOC_EXEC (1)
 #endif
 
+#ifdef MICROPY_PY_URANDOM_SEED_INIT_FUNC
+// Support for seeding the random module on import.
+#include <stddef.h>
+void mp_hal_get_random(size_t n, void *buf);
+static inline unsigned long mp_urandom_seed_init(void) {
+    unsigned long r;
+    mp_hal_get_random(sizeof(r), &r);
+    return r;
+}
+#endif
+
 #ifdef __linux__
 // Can access physical memory using /dev/mem
 #define MICROPY_PLAT_DEV_MEM  (1)
diff --git a/ports/unix/variants/coverage/mpconfigvariant.h b/ports/unix/variants/coverage/mpconfigvariant.h
index 054c07af39228..bf68dcb63ae2e 100644
--- a/ports/unix/variants/coverage/mpconfigvariant.h
+++ b/ports/unix/variants/coverage/mpconfigvariant.h
@@ -31,7 +31,6 @@
 #define MICROPY_CONFIG_ROM_LEVEL (MICROPY_CONFIG_ROM_LEVEL_EXTRA_FEATURES)
 
 // Disable some features that come enabled by default with the feature level.
-#define MICROPY_MODULE_BUILTIN_INIT             (0)
 #define MICROPY_PY_BUILTINS_EXECFILE            (0)
 #define MICROPY_PY_SYS_STDIO_BUFFER             (0)
 #define MICROPY_PY_USELECT                      (0)
@@ -50,6 +49,7 @@
 #define MICROPY_PY_SYS_GETSIZEOF       (1)
 #define MICROPY_PY_SYS_TRACEBACKLIMIT  (1)
 #define MICROPY_PY_IO_BUFFEREDWRITER (1)
+#define MICROPY_PY_URANDOM_SEED_INIT_FUNC (mp_urandom_seed_init())
 #define MICROPY_PY_URE_DEBUG           (1)
 #define MICROPY_PY_URE_MATCH_GROUPS    (1)
 #define MICROPY_PY_URE_MATCH_SPAN_START_END (1)
diff --git a/ports/unix/variants/dev/mpconfigvariant.h b/ports/unix/variants/dev/mpconfigvariant.h
index 87e89dc2a19b0..61092394cd738 100644
--- a/ports/unix/variants/dev/mpconfigvariant.h
+++ b/ports/unix/variants/dev/mpconfigvariant.h
@@ -28,7 +28,6 @@
 #define MICROPY_CONFIG_ROM_LEVEL (MICROPY_CONFIG_ROM_LEVEL_EXTRA_FEATURES)
 
 // Disable some features that come enabled by default with the feature level.
-#define MICROPY_MODULE_BUILTIN_INIT             (0)
 #define MICROPY_PY_BUILTINS_EXECFILE            (0)
 #define MICROPY_PY_SYS_STDIO_BUFFER             (0)
 #define MICROPY_PY_USELECT                      (0)
@@ -37,3 +36,4 @@
 #define MICROPY_REPL_EMACS_WORDS_MOVE           (1)
 #define MICROPY_REPL_EMACS_EXTRA_WORDS_MOVE     (1)
 #define MICROPY_PY_SYS_SETTRACE                 (1)
+#define MICROPY_PY_URANDOM_SEED_INIT_FUNC       (mp_urandom_seed_init())

From e8e8c7c3548623e586f44ff208ba3f7699b7f3c2 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 2 Jun 2022 17:04:24 +1000
Subject: [PATCH 2169/3533] extmod/modurandom: Fix missing void in empty
 argument list.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/modurandom.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extmod/modurandom.c b/extmod/modurandom.c
index 2e29f7ca65005..b66162719034b 100644
--- a/extmod/modurandom.c
+++ b/extmod/modurandom.c
@@ -216,7 +216,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_urandom_uniform_obj, mod_urandom_uniform);
 #endif // MICROPY_PY_URANDOM_EXTRA_FUNCS
 
 #if SEED_ON_IMPORT
-STATIC mp_obj_t mod_urandom___init__() {
+STATIC mp_obj_t mod_urandom___init__(void) {
     // This module may be imported by more than one name so need to ensure
     // that it's only ever seeded once.
     static bool seeded = false;

From bd375df02cfacff82b8c74f4adabeb0cade9a496 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 8 Jun 2022 12:21:51 +1000
Subject: [PATCH 2170/3533] extmod/extmod.cmake: Require components to be
 explicitly enabled.

Otherwise include directories are added unconditionally to the build
variables if the component (submodule) is checked out.  This can lead to,
eg, the esp32 build using lib/lwip header files, instead of lwip header
files from the IDF.

Fixes issue #8727.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/extmod.cmake             | 16 ++++++++--------
 ports/esp32/main/CMakeLists.txt |  4 ++++
 ports/rp2/CMakeLists.txt        |  4 ++++
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/extmod/extmod.cmake b/extmod/extmod.cmake
index 2d943f814cc4f..862743c1e77d0 100644
--- a/extmod/extmod.cmake
+++ b/extmod/extmod.cmake
@@ -54,9 +54,9 @@ set(MICROPY_SOURCE_EXTMOD
 
 # Library for btree module and associated code
 
-set(MICROPY_LIB_BERKELEY_DIR "${MICROPY_DIR}/lib/berkeley-db-1.xx")
+if(MICROPY_PY_BTREE)
+    set(MICROPY_LIB_BERKELEY_DIR "${MICROPY_DIR}/lib/berkeley-db-1.xx")
 
-if(EXISTS "${MICROPY_LIB_BERKELEY_DIR}/btree/bt_close.c")
     add_library(micropy_extmod_btree OBJECT
         ${MICROPY_LIB_BERKELEY_DIR}/btree/bt_close.c
         ${MICROPY_LIB_BERKELEY_DIR}/btree/bt_conv.c
@@ -100,11 +100,11 @@ endif()
 
 # Library for mbedtls
 
-set(MICROPY_LIB_MBEDTLS_DIR "${MICROPY_DIR}/lib/mbedtls")
-
-if(EXISTS "${MICROPY_LIB_MBEDTLS_DIR}/library/aes.c")
+if(MICROPY_SSL_MBEDTLS)
     add_library(micropy_lib_mbedtls INTERFACE)
 
+    set(MICROPY_LIB_MBEDTLS_DIR "${MICROPY_DIR}/lib/mbedtls")
+
     target_include_directories(micropy_lib_mbedtls INTERFACE
         ${MICROPY_LIB_MBEDTLS_DIR}/include
     )
@@ -194,11 +194,11 @@ endif()
 
 # Library for lwIP network stack
 
-set(MICROPY_LIB_LWIP_DIR "${MICROPY_DIR}/lib/lwip/src")
-
-if(EXISTS "${MICROPY_LIB_LWIP_DIR}/core/def.c")
+if(MICROPY_PY_LWIP)
     add_library(micropy_lib_lwip INTERFACE)
 
+    set(MICROPY_LIB_LWIP_DIR "${MICROPY_DIR}/lib/lwip/src")
+
     target_include_directories(micropy_lib_lwip INTERFACE
         ${MICROPY_LIB_LWIP_DIR}/include
     )
diff --git a/ports/esp32/main/CMakeLists.txt b/ports/esp32/main/CMakeLists.txt
index ab333c329024c..9ac6537f86be1 100644
--- a/ports/esp32/main/CMakeLists.txt
+++ b/ports/esp32/main/CMakeLists.txt
@@ -7,6 +7,10 @@ endif()
 include(${MICROPY_DIR}/py/py.cmake)
 
 if(NOT CMAKE_BUILD_EARLY_EXPANSION)
+    # Enable extmod components that will be configured by extmod.cmake.
+    # A board may also have enabled additional components.
+    set(MICROPY_PY_BTREE ON)
+
     include(${MICROPY_DIR}/py/usermod.cmake)
     include(${MICROPY_DIR}/extmod/extmod.cmake)
 endif()
diff --git a/ports/rp2/CMakeLists.txt b/ports/rp2/CMakeLists.txt
index d5793fc625f35..a7a192ea33699 100644
--- a/ports/rp2/CMakeLists.txt
+++ b/ports/rp2/CMakeLists.txt
@@ -43,6 +43,10 @@ if(NOT PICO_BOARD)
     string(TOLOWER ${MICROPY_BOARD} PICO_BOARD)
 endif()
 
+# Enable extmod components that will be configured by extmod.cmake.
+# A board may also have enabled additional components.
+set(MICROPY_SSL_MBEDTLS ON)
+
 # Include component cmake fragments
 include(${MICROPY_DIR}/py/py.cmake)
 include(${MICROPY_DIR}/extmod/extmod.cmake)

From 70bf6ab6fb72db1a2768c4ec429df5b53938e5c8 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Tue, 7 Jun 2022 17:23:59 +0200
Subject: [PATCH 2171/3533] extmod/modusocket: Add socket state to track
 new/listening/conn/closed.

---
 extmod/modnetwork.h |  8 +++++++-
 extmod/modusocket.c | 13 +++++++++++--
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/extmod/modnetwork.h b/extmod/modnetwork.h
index 0177df67d4483..3481cc6dcc575 100644
--- a/extmod/modnetwork.h
+++ b/extmod/modnetwork.h
@@ -47,6 +47,11 @@
 #define MOD_NETWORK_SO_SNDTIMEO     (0x1005)
 #define MOD_NETWORK_SO_RCVTIMEO     (0x1006)
 
+#define MOD_NETWORK_SS_NEW          (0)
+#define MOD_NETWORK_SS_LISTENING    (1)
+#define MOD_NETWORK_SS_CONNECTED    (2)
+#define MOD_NETWORK_SS_CLOSED       (3)
+
 #if MICROPY_PY_LWIP
 struct netif;
 void mod_network_lwip_init(void);
@@ -89,9 +94,10 @@ typedef struct _mod_network_socket_obj_t {
     int32_t fileno  : 16;
     int32_t timeout;
     mp_obj_t callback;
+    int32_t state   : 8;
     #if MICROPY_PY_USOCKET_EXTENDED_STATE
     // Extended socket state for NICs/ports that need it.
-    void *state;
+    void *_private;
     #endif
 } mod_network_socket_obj_t;
 
diff --git a/extmod/modusocket.c b/extmod/modusocket.c
index ebddb1ec79c97..f15c98fc05225 100644
--- a/extmod/modusocket.c
+++ b/extmod/modusocket.c
@@ -73,8 +73,9 @@ STATIC mp_obj_t socket_make_new(const mp_obj_type_t *type, size_t n_args, size_t
     }
     s->timeout = -1;
     s->callback = MP_OBJ_NULL;
+    s->state = MOD_NETWORK_SS_NEW;
     #if MICROPY_PY_USOCKET_EXTENDED_STATE
-    s->state = NULL;
+    s->_private = NULL;
     #endif
 
     return MP_OBJ_FROM_PTR(s);
@@ -143,6 +144,9 @@ STATIC mp_obj_t socket_listen(size_t n_args, const mp_obj_t *args) {
         mp_raise_OSError(_errno);
     }
 
+    // set socket state
+    self->state = MOD_NETWORK_SS_LISTENING;
+
     return mp_const_none;
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(socket_listen_obj, 1, 2, socket_listen);
@@ -171,8 +175,9 @@ STATIC mp_obj_t socket_accept(mp_obj_t self_in) {
     socket2->fileno = -1;
     socket2->timeout = -1;
     socket2->callback = MP_OBJ_NULL;
+    socket2->state = MOD_NETWORK_SS_NEW;
     #if MICROPY_PY_USOCKET_EXTENDED_STATE
-    socket2->state = NULL;
+    socket2->_private = NULL;
     #endif
 
     // accept incoming connection
@@ -213,6 +218,9 @@ STATIC mp_obj_t socket_connect(mp_obj_t self_in, mp_obj_t addr_in) {
         mp_raise_OSError(_errno);
     }
 
+    // set socket state
+    self->state = MOD_NETWORK_SS_CONNECTED;
+
     return mp_const_none;
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_2(socket_connect_obj, socket_connect);
@@ -493,6 +501,7 @@ mp_uint_t socket_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_t arg, int *
         if (self->nic != MP_OBJ_NULL) {
             self->nic_type->close(self);
             self->nic = MP_OBJ_NULL;
+            self->state = MOD_NETWORK_SS_CLOSED;
         }
         return 0;
     }

From a4eef90b2274d2e34486b6990191687500cb3893 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Tue, 7 Jun 2022 17:36:28 +0200
Subject: [PATCH 2172/3533] extmod/modusocket: Fix polling of closed sockets.

Unbound sockets in NEW state should return HUP|WR when polled, and return
NVAL when in CLOSED state.
---
 extmod/modusocket.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/extmod/modusocket.c b/extmod/modusocket.c
index f15c98fc05225..638ab0cf28c0a 100644
--- a/extmod/modusocket.c
+++ b/extmod/modusocket.c
@@ -501,14 +501,19 @@ mp_uint_t socket_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_t arg, int *
         if (self->nic != MP_OBJ_NULL) {
             self->nic_type->close(self);
             self->nic = MP_OBJ_NULL;
-            self->state = MOD_NETWORK_SS_CLOSED;
         }
+        self->state = MOD_NETWORK_SS_CLOSED;
         return 0;
     }
     if (self->nic == MP_OBJ_NULL) {
         if (request == MP_STREAM_POLL) {
-            // New sockets are writable and not connected.
-            return MP_STREAM_POLL_HUP | MP_STREAM_POLL_WR;
+            if (self->state == MOD_NETWORK_SS_NEW) {
+                // New sockets are writable and not connected.
+                return MP_STREAM_POLL_HUP | MP_STREAM_POLL_WR;
+            } else if (self->state == MOD_NETWORK_SS_CLOSED) {
+                // Closed socket, return invalid.
+                return MP_STREAM_POLL_NVAL;
+            }
         }
         *errcode = MP_EINVAL;
         return MP_STREAM_ERROR;

From cbad5593668fa011a22d0816e27b6f8992ac7015 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 8 Jun 2022 14:43:02 +1000
Subject: [PATCH 2173/3533] py/compile: Give the compiler a hint about num
 nodes being non-zero.

Without this, newer versions of gcc (eg 11.2.0) used with -O2 can warn
about `q_ptr` being maybe uninitialized, because it doesn't know that there
is at least one qstr being written in to this (alloca'd) memory.

As part of this, change the type of `n` to `size_t` so the compiler knows
it's unsigned and can generate better code.

Code size change for this commit:

       bare-arm:   -28 -0.049%
    minimal x86:    -4 -0.002%
       unix x64:    +0 +0.000%
    unix nanbox:   -16 -0.003%
          stm32:   -24 -0.006% PYBV10
         cc3200:   -32 -0.017%
        esp8266:    +8 +0.001% GENERIC
          esp32:   -52 -0.003% GENERIC
            nrf:   -24 -0.013% pca10040
            rp2:   -32 -0.006% PICO
           samd:   -28 -0.020% ADAFRUIT_ITSYBITSY_M4_EXPRESS

Signed-off-by: Damien George <damien@micropython.org>
---
 py/compile.c | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/py/compile.c b/py/compile.c
index 4dee9eff79b6d..9cca5df4010cf 100644
--- a/py/compile.c
+++ b/py/compile.c
@@ -1115,14 +1115,19 @@ STATIC void do_import_name(compiler_t *comp, mp_parse_node_t pn, qstr *q_base) {
             if (!is_as) {
                 *q_base = MP_PARSE_NODE_LEAF_ARG(pns->nodes[0]);
             }
-            int n = MP_PARSE_NODE_STRUCT_NUM_NODES(pns);
-            int len = n - 1;
-            for (int i = 0; i < n; i++) {
+            size_t n = MP_PARSE_NODE_STRUCT_NUM_NODES(pns);
+            if (n == 0) {
+                // There must be at least one node in this PN_dotted_name.
+                // Let the compiler know this so it doesn't warn, and can generate better code.
+                MP_UNREACHABLE;
+            }
+            size_t len = n - 1;
+            for (size_t i = 0; i < n; i++) {
                 len += qstr_len(MP_PARSE_NODE_LEAF_ARG(pns->nodes[i]));
             }
             char *q_ptr = mp_local_alloc(len);
             char *str_dest = q_ptr;
-            for (int i = 0; i < n; i++) {
+            for (size_t i = 0; i < n; i++) {
                 if (i > 0) {
                     *str_dest++ = '.';
                 }
@@ -1135,7 +1140,7 @@ STATIC void do_import_name(compiler_t *comp, mp_parse_node_t pn, qstr *q_base) {
             mp_local_free(q_ptr);
             EMIT_ARG(import, q_full, MP_EMIT_IMPORT_NAME);
             if (is_as) {
-                for (int i = 1; i < n; i++) {
+                for (size_t i = 1; i < n; i++) {
                     EMIT_ARG(attr, MP_PARSE_NODE_LEAF_ARG(pns->nodes[i]), MP_EMIT_ATTR_LOAD);
                 }
             }

From c7271a86caf0418c180164f8d87cf57cf8ac416b Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 8 Jun 2022 14:47:21 +1000
Subject: [PATCH 2174/3533] py/makemoduledefs.py: Remove shebang line and
 adjust style of comment.

This file is not executable so shouldn't have the shebang line.  This line
can cause issues when building on Windows msvc when the PyPython variable
is set to something other than "python", because it reverts back to using
the shebang line.

The top comment is also changed to """ style which matches all other
preprocessing scripts in the py/ directory.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/makemoduledefs.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/py/makemoduledefs.py b/py/makemoduledefs.py
index 657809db4b5a2..5a19e687ae631 100644
--- a/py/makemoduledefs.py
+++ b/py/makemoduledefs.py
@@ -1,9 +1,9 @@
-#!/usr/bin/env python
-
-# This pre-processor parses a single file containing a list of
-# MP_REGISTER_MODULE(module_name, obj_module)
-# These are used to generate a header with the required entries for
-# "mp_rom_map_elem_t mp_builtin_module_table[]" in py/objmodule.c
+"""
+This pre-processor parses a single file containing a list of
+MP_REGISTER_MODULE(module_name, obj_module)
+These are used to generate a header with the required entries for
+"mp_rom_map_elem_t mp_builtin_module_table[]" in py/objmodule.c
+"""
 
 from __future__ import print_function
 

From 182256dc13479223160c2b463abf9d6539504503 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 8 Jun 2022 14:51:19 +1000
Subject: [PATCH 2175/3533] tests/stress: Adjust bytecode_limit test so it can
 SKIP if no memory.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/stress/bytecode_limit.py     | 17 ++++++++++-------
 tests/stress/bytecode_limit.py.exp |  2 +-
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/tests/stress/bytecode_limit.py b/tests/stress/bytecode_limit.py
index 49f7cd2caf37c..8cca413cf2777 100644
--- a/tests/stress/bytecode_limit.py
+++ b/tests/stress/bytecode_limit.py
@@ -2,6 +2,16 @@
 
 body = " with f()()() as a:\n  try:\n   f()()()\n  except Exception:\n   pass\n"
 
+# Test overflow of jump offset.
+for n in (430, 431, 432, 433):
+    try:
+        exec("cond = 0\nif cond:\n" + body * n + "else:\n print('cond false')\n")
+    except MemoryError:
+        print("SKIP")
+        raise SystemExit
+    except RuntimeError:
+        print("RuntimeError")
+
 # Test changing size of code info (source line/bytecode mapping) due to changing
 # bytecode size in the final passes.  This test is very specific to how the
 # code info is encoded, and how jump offsets shrink in the final passes.  This
@@ -24,10 +34,3 @@
 print(x)
 """
 )
-
-# Test overflow of jump offset.
-for n in (430, 431, 432, 433):
-    try:
-        exec("cond = 0\nif cond:\n" + body * n + "else:\n print('cond false')\n")
-    except RuntimeError:
-        print("RuntimeError")
diff --git a/tests/stress/bytecode_limit.py.exp b/tests/stress/bytecode_limit.py.exp
index b2d9737d803ec..74ab06c09b674 100644
--- a/tests/stress/bytecode_limit.py.exp
+++ b/tests/stress/bytecode_limit.py.exp
@@ -1,5 +1,5 @@
-[123]
 cond false
 cond false
 RuntimeError
 RuntimeError
+[123]

From 6a1dbaad1ca7a8e065ee69e4107497e507afdea6 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 8 Jun 2022 14:51:48 +1000
Subject: [PATCH 2176/3533] tools/ci.sh: Build NUCLEO_H743ZI with -O2
 optimisation level.

This tests the build when -O2 is used, which can lead to additional
compiler analysis and warnings.

Signed-off-by: Damien George <damien@micropython.org>
---
 tools/ci.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/ci.sh b/tools/ci.sh
index 4670a9211401d..4490099b6b8f0 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -320,7 +320,7 @@ function ci_stm32_nucleo_build {
 
     # Test building various MCU families, some with additional options.
     make ${MAKEOPTS} -C ports/stm32 BOARD=NUCLEO_F091RC
-    make ${MAKEOPTS} -C ports/stm32 BOARD=NUCLEO_H743ZI CFLAGS_EXTRA='-DMICROPY_PY_THREAD=1'
+    make ${MAKEOPTS} -C ports/stm32 BOARD=NUCLEO_H743ZI COPT=-O2 CFLAGS_EXTRA='-DMICROPY_PY_THREAD=1'
     make ${MAKEOPTS} -C ports/stm32 BOARD=NUCLEO_L073RZ
     make ${MAKEOPTS} -C ports/stm32 BOARD=NUCLEO_L476RG DEBUG=1
 

From 85597aa68e116c4af9652ea006fac0f33cb78a78 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 8 Jun 2022 18:29:01 +1000
Subject: [PATCH 2177/3533] esp32/machine_pin: Only expose IO20 on esp32 for
 IDF 4.3.2 and above.

This IO was enabled in IDF commit 68f8b999bb69563f2f3d1d897bc073968f41f3bf,
which is available in IDF release v4.3.2 and above.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/machine_pin.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/esp32/machine_pin.c b/ports/esp32/machine_pin.c
index 2238c6e5fa174..865face96f2ad 100644
--- a/ports/esp32/machine_pin.c
+++ b/ports/esp32/machine_pin.c
@@ -92,7 +92,7 @@ STATIC const machine_pin_obj_t machine_pin_obj[] = {
     #endif
     {{&machine_pin_type}, GPIO_NUM_18},
     {{&machine_pin_type}, GPIO_NUM_19},
-    #if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(4, 1, 0)
+    #if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(4, 3, 2)
     {{&machine_pin_type}, GPIO_NUM_20},
     #else
     {{NULL}, -1},
@@ -572,7 +572,7 @@ STATIC const machine_pin_irq_obj_t machine_pin_irq_object[] = {
     #endif
     {{&machine_pin_irq_type}, GPIO_NUM_18},
     {{&machine_pin_irq_type}, GPIO_NUM_19},
-    #if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(4, 1, 0)
+    #if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(4, 3, 2)
     {{&machine_pin_irq_type}, GPIO_NUM_20},
     #else
     {{NULL}, -1},

From abb38503987f2523726d05819e87977e3cdd65b5 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 9 Jun 2022 11:57:22 +1000
Subject: [PATCH 2178/3533] tools/mpy_ld.py: Support R_XTENSA_PDIFF32
 relocation.

Newer versions of the ESP-IDF's toolchain use this relocation.

Fixes issue #8436.

Signed-off-by: Damien George <damien@micropython.org>
---
 tools/mpy_ld.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tools/mpy_ld.py b/tools/mpy_ld.py
index 9fda49826f677..4cceaa56dfcd4 100755
--- a/tools/mpy_ld.py
+++ b/tools/mpy_ld.py
@@ -75,6 +75,7 @@
 R_X86_64_GOTPCREL = 9
 R_X86_64_REX_GOTPCRELX = 42
 R_386_GOT32X = 43
+R_XTENSA_PDIFF32 = 59
 
 ################################################################################
 # Architecture configuration
@@ -572,9 +573,9 @@ def do_relocation_text(env, text_addr, r):
         reloc = addr - r_offset
         reloc_type = "xtensa_l32r"
 
-    elif env.arch.name == "EM_XTENSA" and r_info_type == R_XTENSA_DIFF32:
+    elif env.arch.name == "EM_XTENSA" and r_info_type in (R_XTENSA_DIFF32, R_XTENSA_PDIFF32):
         if s.section.name.startswith(".text"):
-            # it looks like R_XTENSA_DIFF32 into .text is already correctly relocated
+            # it looks like R_XTENSA_[P]DIFF32 into .text is already correctly relocated
             return
         assert 0
 

From 313f082896bbf969dd91497151419efa6c42c148 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 9 Jun 2022 11:59:09 +1000
Subject: [PATCH 2179/3533] tools/ci.sh: Build native .mpy examples for
 armv7emsp, xtensawin in CI.

Signed-off-by: Damien George <damien@micropython.org>
---
 tools/ci.sh | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/tools/ci.sh b/tools/ci.sh
index 4490099b6b8f0..345aea84a0eb2 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -100,6 +100,7 @@ function ci_cc3200_build {
 # ports/esp32
 
 function ci_esp32_setup_helper {
+    pip3 install pyelftools
     git clone https://github.com/espressif/esp-idf.git
     git -C esp-idf checkout $1
     git -C esp-idf submodule update --init \
@@ -143,6 +144,9 @@ function ci_esp32_build {
     if [ -d $IDF_PATH/components/esp32s3 ]; then
         make ${MAKEOPTS} -C ports/esp32 BOARD=GENERIC_S3
     fi
+
+    # Test building native .mpy with xtensawin architecture.
+    ci_native_mpy_modules_build xtensawin
 }
 
 ########################################################################################
@@ -297,6 +301,7 @@ function ci_samd_build {
 
 function ci_stm32_setup {
     ci_gcc_arm_setup
+    pip3 install pyelftools
     pip3 install pyhy
 }
 
@@ -311,6 +316,10 @@ function ci_stm32_pyb_build {
     make ${MAKEOPTS} -C ports/stm32/mboot BOARD=PYBV10 CFLAGS_EXTRA='-DMBOOT_FSLOAD=1 -DMBOOT_VFS_LFS2=1'
     make ${MAKEOPTS} -C ports/stm32/mboot BOARD=PYBD_SF6
     make ${MAKEOPTS} -C ports/stm32/mboot BOARD=STM32F769DISC CFLAGS_EXTRA='-DMBOOT_ADDRESS_SPACE_64BIT=1 -DMBOOT_SDCARD_ADDR=0x100000000ULL -DMBOOT_SDCARD_BYTE_SIZE=0x400000000ULL -DMBOOT_FSLOAD=1 -DMBOOT_VFS_FAT=1'
+
+    # Test building native .mpy with armv7emsp architecture.
+    git submodule update --init lib/berkeley-db-1.xx
+    ci_native_mpy_modules_build armv7emsp
 }
 
 function ci_stm32_nucleo_build {

From bd5152c928a4a0809eaa340e0f8ae788a949daea Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 9 Jun 2022 12:20:42 +1000
Subject: [PATCH 2180/3533] stm32/mboot: Add board-configurable SysTick hook.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/mboot/main.c  | 4 ++--
 ports/stm32/mboot/mboot.h | 6 +++++-
 ports/stm32/mboot/ui.c    | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/ports/stm32/mboot/main.c b/ports/stm32/mboot/main.c
index 8bd5e86fe7e5d..734c6a3b7d4ef 100644
--- a/ports/stm32/mboot/main.c
+++ b/ports/stm32/mboot/main.c
@@ -1518,9 +1518,9 @@ void SysTick_Handler(void) {
     // work properly.
     SysTick->CTRL;
 
-    // Update the LED0 state from here to ensure it's consistent regardless of
+    // Run any board-specific code that needs to be done regardless of
     // other processing going on in interrupts or main.
-    led0_update();
+    MBOOT_BOARD_SYSTICK();
 }
 
 #if defined(MBOOT_I2C_SCL)
diff --git a/ports/stm32/mboot/mboot.h b/ports/stm32/mboot/mboot.h
index 9f47811537a95..208a80d57dcd4 100644
--- a/ports/stm32/mboot/mboot.h
+++ b/ports/stm32/mboot/mboot.h
@@ -54,6 +54,10 @@
 #define MBOOT_BOARD_STATE_CHANGE(state, arg) mboot_state_change_default((state), (arg))
 #endif
 
+#ifndef MBOOT_BOARD_SYSTICK
+#define MBOOT_BOARD_SYSTICK() mboot_ui_systick()
+#endif
+
 #ifndef MBOOT_ADDRESS_SPACE_64BIT
 #define MBOOT_ADDRESS_SPACE_64BIT (0)
 #endif
@@ -148,7 +152,7 @@ extern uint8_t _estack[ELEM_DATA_SIZE];
 
 void systick_init(void);
 void led_init(void);
-void led0_update(void);
+void mboot_ui_systick(void);
 void SystemClock_Config(void);
 
 uint32_t get_le32(const uint8_t *b);
diff --git a/ports/stm32/mboot/ui.c b/ports/stm32/mboot/ui.c
index db1bcc8b78317..9924ecd0ba0f7 100644
--- a/ports/stm32/mboot/ui.c
+++ b/ports/stm32/mboot/ui.c
@@ -122,7 +122,7 @@ void led0_state(led0_state_t state) {
     }
 }
 
-void led0_update(void) {
+void mboot_ui_systick(void) {
     if (led0_cur_state != LED0_STATE_OFF && systick_ms - led0_ms_interval > 50) {
         uint8_t rate = (led0_cur_state >> 2) & 0x1f;
         led0_ms_interval += 50;

From 45a0c6da5b4170402a3491d39a1d75b5025526e2 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 9 Jun 2022 12:21:18 +1000
Subject: [PATCH 2181/3533] stm32/mboot: Remove MP_WEAK on led funcs and make
 some of them static.

Both led_init and led_state are configurable via MBOOT_BOARD_LED_INIT and
MBOOT_BOARD_LED_STATE respectively, so don't need to be MP_WEAK.

Furthermore, led_state and led0_state are private to ui.c so can be made
static.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/mboot/ui.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ports/stm32/mboot/ui.c b/ports/stm32/mboot/ui.c
index 9924ecd0ba0f7..c1fea55da50a5 100644
--- a/ports/stm32/mboot/ui.c
+++ b/ports/stm32/mboot/ui.c
@@ -67,7 +67,7 @@ static led0_state_t led0_cur_state = LED0_STATE_OFF;
 static uint32_t led0_ms_interval = 0;
 static int led0_toggle_count = 0;
 
-MP_WEAK void led_init(void) {
+void led_init(void) {
     #if defined(MBOOT_BOARD_LED_INIT)
     // Custom LED init function provided by the board.
     MBOOT_BOARD_LED_INIT();
@@ -88,7 +88,7 @@ MP_WEAK void led_init(void) {
     led0_cur_state = LED0_STATE_OFF;
 }
 
-MP_WEAK void led_state(uint32_t led, int val) {
+static void led_state(uint32_t led, int val) {
     #if defined(MBOOT_BOARD_LED_STATE)
     // Custom LED state function provided by the board.
     return MBOOT_BOARD_LED_STATE(led, val);
@@ -115,7 +115,7 @@ void led_state_all(unsigned int mask) {
     #endif
 }
 
-void led0_state(led0_state_t state) {
+static void led0_state(led0_state_t state) {
     led0_cur_state = state;
     if (state == LED0_STATE_OFF || state == LED0_STATE_ON) {
         led_state(LED0, state);

From 3452ee58d36a1d6ae2c156c84903b84131d00a8b Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 9 Jun 2022 12:23:07 +1000
Subject: [PATCH 2182/3533] stm32/boards/LEGO_HUB_NO6: Add comment to readme
 about powering off.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/boards/LEGO_HUB_NO6/README.md | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/ports/stm32/boards/LEGO_HUB_NO6/README.md b/ports/stm32/boards/LEGO_HUB_NO6/README.md
index 7d5f2a416c5b2..376d0f2b0e445 100644
--- a/ports/stm32/boards/LEGO_HUB_NO6/README.md
+++ b/ports/stm32/boards/LEGO_HUB_NO6/README.md
@@ -33,7 +33,8 @@ Backing up original Hub firmware
 
 Before install MicroPython it is advised to backup the original LEGO firmware that
 the Hub comes installed with.  To do this, enter the built-in bootloader by holding
-down the Bluetooth button for 5 seconds while powering up the Hub via USB.  Then
+down the Bluetooth button for 5 seconds while powering up the Hub via USB (you may
+need to take out the battery and disconnect USB to power off the Hub first).  Then
 run the following command from the root of this repository:
 
     $ cd ports/stm32
@@ -58,7 +59,8 @@ the root of this repository run:
     $ make BOARD=LEGO_HUB_NO6
 
 Now enter the built-in bootloader by holding down the Bluetooth button for 5
-seconds while powering up the Hub via USB.  Then run:
+seconds while powering up the Hub via USB (you may need to take out the battery
+and disconnect USB to power off the Hub first).  Then run:
 
     $ make BOARD=LEGO_HUB_NO6 deploy
 

From f63b4f85aae1e0ade7a7c9f908debb5905cc144d Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 9 Jun 2022 12:36:45 +1000
Subject: [PATCH 2183/3533] py/parse: Work around xtensa esp-2020r3 compiler
 bug.

This commit works around a bug in xtensa-esp32-elf-gcc version esp-2020r3.

The bug is in generation of loop constructs.  The below code is generated
by the xtensa-esp32 compiler.  The first extract is the buggy machine code
and the second extract is the corrected machine code.  The test
`basics/logic_constfolding.py` fails with the first code and succeeds with
the second.

Disassembly of section .text.push_result_rule:

00000000 <push_result_rule>:
  ...
  d6:   209770       or      a9, a7, a7
  d9:   178976       loop    a9, f4 <push_result_rule+0xf4>
                     d9: R_XTENSA_SLOT0_OP   .text.push_result_rule+0xf4
  dc:   030190       rsr.lend        a9
  df:   130090       wsr.lbeg        a9
  e2:   a8c992       addi    a9, a9, -88
  e5:   06d992       addmi   a9, a9, 0x600
  e8:   130190       wsr.lend        a9
  eb:   002000       isync
  ee:   030290       rsr.lcount      a9
  f1:   01c992       addi    a9, a9, 1
  f4:   1494e7       bne     a4, a14, 10c <push_result_rule+0x10c>
                     f4: R_XTENSA_SLOT0_OP   .text.push_result_rule+0x10c

Disassembly of section .text.push_result_rule:

00000000 <push_result_rule>:
  ...
  d6:   209770       or      a9, a7, a7
  d9:   178976       loop    a9, f4 <push_result_rule+0xf4>
                     d9: R_XTENSA_SLOT0_OP   .text.push_result_rule+0xf4
  dc:   030190       rsr.lend        a9
  df:   130090       wsr.lbeg        a9
  e2:   000091       l32r    a9, fffc00e4 <push_result_rule+0xfffc00e4>
                     e2: R_XTENSA_SLOT0_OP   .literal.push_result_rule+0x18
  e5:   0020f0       nop
  e8:   130190       wsr.lend        a9
  eb:   002000       isync
  ee:   030290       rsr.lcount      a9
  f1:   01c992       addi    a9, a9, 1
  f4:   1494e7       bne     a4, a14, 10c <push_result_rule+0x10c>
                     f4: R_XTENSA_SLOT0_OP   .text.push_result_rule+0x10c

Work done in collaboration with @jimmo.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/mpconfigport.h | 7 +++++++
 py/parse.c                 | 5 +++++
 2 files changed, 12 insertions(+)

diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h
index fd810e07b82a7..1877a01437f1c 100644
--- a/ports/esp32/mpconfigport.h
+++ b/ports/esp32/mpconfigport.h
@@ -30,6 +30,13 @@
 #define MICROPY_EMIT_XTENSAWIN              (1)
 #endif
 
+// workaround for xtensa-esp32-elf-gcc esp-2020r3, which can generate wrong code for loops
+// see https://github.com/espressif/esp-idf/issues/9130
+// this was fixed in newer versions of the compiler by:
+//   "gas: use literals/const16 for xtensa loop relaxation"
+//   https://github.com/jcmvbkbc/binutils-gdb-xtensa/commit/403b0b61f6d4358aee8493cb1d11814e368942c9
+#define MICROPY_COMP_CONST_FOLDING_COMPILER_WORKAROUND (1)
+
 // optimisations
 #define MICROPY_OPT_COMPUTED_GOTO           (1)
 
diff --git a/py/parse.c b/py/parse.c
index 3972893cbb475..14f5f6c105039 100644
--- a/py/parse.c
+++ b/py/parse.c
@@ -639,6 +639,11 @@ STATIC MP_DEFINE_CONST_MAP(mp_constants_map, mp_constants_table);
 STATIC void push_result_rule(parser_t *parser, size_t src_line, uint8_t rule_id, size_t num_args);
 
 #if MICROPY_COMP_CONST_FOLDING
+#if MICROPY_COMP_CONST_FOLDING_COMPILER_WORKAROUND
+// Some versions of the xtensa-esp32-elf-gcc compiler generate wrong code if this
+// function is static, so provide a hook for them to work around this problem.
+MP_NOINLINE
+#endif
 STATIC bool fold_logical_constants(parser_t *parser, uint8_t rule_id, size_t *num_args) {
     if (rule_id == RULE_or_test
         || rule_id == RULE_and_test) {

From ab6ad867935ea18c67368f5f0f9716421f201af4 Mon Sep 17 00:00:00 2001
From: Yukai Li <yukaili.geek@gmail.com>
Date: Tue, 12 Apr 2022 22:51:00 -0600
Subject: [PATCH 2184/3533] drivers/sdcard: Fix CSD version 1.0 device size
 calculation.

Signed-off-by: Yukai Li <yukaili.geek@gmail.com>
---
 drivers/sdcard/sdcard.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/sdcard/sdcard.py b/drivers/sdcard/sdcard.py
index 2c3e99d3c06d6..57800a43bd005 100644
--- a/drivers/sdcard/sdcard.py
+++ b/drivers/sdcard/sdcard.py
@@ -100,9 +100,10 @@ def init_card(self, baudrate):
         if csd[0] & 0xC0 == 0x40:  # CSD version 2.0
             self.sectors = ((csd[8] << 8 | csd[9]) + 1) * 1024
         elif csd[0] & 0xC0 == 0x00:  # CSD version 1.0 (old, <=2GB)
-            c_size = csd[6] & 0b11 | csd[7] << 2 | (csd[8] & 0b11000000) << 4
-            c_size_mult = ((csd[9] & 0b11) << 1) | csd[10] >> 7
-            self.sectors = (c_size + 1) * (2 ** (c_size_mult + 2))
+            c_size = (csd[6] & 0b11) << 10 | csd[7] << 2 | csd[8] >> 6
+            c_size_mult = (csd[9] & 0b11) << 1 | csd[10] >> 7
+            read_bl_len = csd[5] & 0b1111
+            self.sectors = (c_size + 1) * (2 ** (c_size_mult + 2)) * (2**read_bl_len)
         else:
             raise OSError("SD card CSD format not supported")
         # print('sectors', self.sectors)

From 203b98c42b535a9c76f914b18dec4e221294b78c Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 10 Jun 2022 12:48:14 +1000
Subject: [PATCH 2185/3533] drivers/sdcard: Make ioctl(4), ioctl(5) return num
 blocks, block size.

For CSD v1.0 the computed size is in bytes, so convert it to number of
512-byte blocks, and then ioctl(4) will return the correct value.

Also implement ioctl(5) to return the block size, which is always 512.

Signed-off-by: Damien George <damien@micropython.org>
---
 drivers/sdcard/sdcard.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/sdcard/sdcard.py b/drivers/sdcard/sdcard.py
index 57800a43bd005..edcf14cad8271 100644
--- a/drivers/sdcard/sdcard.py
+++ b/drivers/sdcard/sdcard.py
@@ -103,7 +103,8 @@ def init_card(self, baudrate):
             c_size = (csd[6] & 0b11) << 10 | csd[7] << 2 | csd[8] >> 6
             c_size_mult = (csd[9] & 0b11) << 1 | csd[10] >> 7
             read_bl_len = csd[5] & 0b1111
-            self.sectors = (c_size + 1) * (2 ** (c_size_mult + 2)) * (2**read_bl_len)
+            capacity = (c_size + 1) * (2 ** (c_size_mult + 2)) * (2**read_bl_len)
+            self.sectors = capacity // 512
         else:
             raise OSError("SD card CSD format not supported")
         # print('sectors', self.sectors)
@@ -282,3 +283,5 @@ def writeblocks(self, block_num, buf):
     def ioctl(self, op, arg):
         if op == 4:  # get number of blocks
             return self.sectors
+        if op == 5:  # get block size in bytes
+            return 512

From ee9feacc00cf08536f57f39605060028e57a6515 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 10 Jun 2022 12:51:51 +1000
Subject: [PATCH 2186/3533] drivers/sdcard: Fix address calculation on v2 SDSC
 cards.

For v2 cards that are standard capacity the read/write/erase commands take
byte address values.  Use the result of CMD58 to distinguish SDSC from
SDHC/SDXC.

Signed-off-by: Damien George <damien@micropython.org>
---
 drivers/sdcard/sdcard.py | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/drivers/sdcard/sdcard.py b/drivers/sdcard/sdcard.py
index edcf14cad8271..f4520acbb5379 100644
--- a/drivers/sdcard/sdcard.py
+++ b/drivers/sdcard/sdcard.py
@@ -120,6 +120,7 @@ def init_card_v1(self):
         for i in range(_CMD_TIMEOUT):
             self.cmd(55, 0, 0)
             if self.cmd(41, 0, 0) == 0:
+                # SDSC card, uses byte addressing in read/write/erase commands
                 self.cdv = 512
                 # print("[SDCard] v1 card")
                 return
@@ -131,8 +132,14 @@ def init_card_v2(self):
             self.cmd(58, 0, 0, 4)
             self.cmd(55, 0, 0)
             if self.cmd(41, 0x40000000, 0) == 0:
-                self.cmd(58, 0, 0, 4)
-                self.cdv = 1
+                self.cmd(58, 0, 0, -4)  # 4-byte response, negative means keep the first byte
+                ocr = self.tokenbuf[0]  # get first byte of response, which is OCR
+                if not ocr & 0x40:
+                    # SDSC card, uses byte addressing in read/write/erase commands
+                    self.cdv = 512
+                else:
+                    # SDHC/SDXC card, uses block addressing in read/write/erase commands
+                    self.cdv = 1
                 # print("[SDCard] v2 card")
                 return
         raise OSError("timeout waiting for v2 card")
@@ -159,6 +166,10 @@ def cmd(self, cmd, arg, crc, final=0, release=True, skip1=False):
             response = self.tokenbuf[0]
             if not (response & 0x80):
                 # this could be a big-endian integer that we are getting here
+                # if final<0 then store the first byte to tokenbuf and discard the rest
+                if final < 0:
+                    self.spi.readinto(self.tokenbuf, 0xFF)
+                    final = -1 - final
                 for j in range(final):
                     self.spi.write(b"\xff")
                 if release:

From 17a0d65ee4eaa445a638d44dc9edc30d1ddbbac6 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 10 Jun 2022 16:38:20 +1000
Subject: [PATCH 2187/3533] tools/mpy_ld.py: Support GOT entries that reference
 inside mp_fun_table.

Signed-off-by: Damien George <damien@micropython.org>
---
 tools/mpy_ld.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tools/mpy_ld.py b/tools/mpy_ld.py
index 4cceaa56dfcd4..09ea90dcd1106 100755
--- a/tools/mpy_ld.py
+++ b/tools/mpy_ld.py
@@ -434,6 +434,8 @@ def populate_got(env):
             dest = got_entry.name
         elif got_entry.name.startswith("mp_fun_table+0x"):
             dest = int(got_entry.name.split("+")[1], 16) // env.arch.word_size
+        elif got_entry.sec_name == ".external.mp_fun_table":
+            dest = got_entry.sym.mp_fun_table_offset
         elif got_entry.sec_name.startswith(".text"):
             dest = ".text"
         elif got_entry.sec_name.startswith(".rodata"):

From 148d12252b54d330c66ccac4bbbe6d804a8d1e8f Mon Sep 17 00:00:00 2001
From: Jeremy Herbert <jeremy.006@gmail.com>
Date: Fri, 14 Feb 2020 20:52:55 +1000
Subject: [PATCH 2188/3533] py/dynruntime: Add macros to create a new dict and
 store to dicts.

---
 py/dynruntime.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/py/dynruntime.h b/py/dynruntime.h
index 32ca708b95c74..9205cfd21c1cd 100644
--- a/py/dynruntime.h
+++ b/py/dynruntime.h
@@ -111,6 +111,7 @@ static inline void *m_realloc_dyn(void *ptr, size_t new_num_bytes) {
 #define mp_obj_new_bytearray_by_ref(n, i)   (mp_fun_table.obj_new_bytearray_by_ref((n), (i)))
 #define mp_obj_new_tuple(n, items)          (mp_fun_table.new_tuple((n), (items)))
 #define mp_obj_new_list(n, items)           (mp_fun_table.new_list((n), (items)))
+#define mp_obj_new_dict(n)                  (mp_fun_table.new_dict((n)))
 
 #define mp_obj_get_type(o)                  (mp_fun_table.obj_get_type((o)))
 #define mp_obj_cast_to_native_base(o, t)    (mp_obj_cast_to_native_base_dyn((o), (t)))
@@ -125,6 +126,7 @@ static inline void *m_realloc_dyn(void *ptr, size_t new_num_bytes) {
 #define mp_obj_subscr(base, index, val)     (mp_fun_table.obj_subscr((base), (index), (val)))
 #define mp_obj_get_array(o, len, items)     (mp_obj_get_array_dyn((o), (len), (items)))
 #define mp_obj_list_append(list, item)      (mp_fun_table.list_append((list), (item)))
+#define mp_obj_dict_store(dict, key, val)   (mp_fun_table.dict_store((dict), (key), (val)))
 
 #define mp_obj_malloc_helper(n, t)          (mp_obj_malloc_helper_dyn(n, t))
 

From 0e556f22a22ff26cedcacf08a2e273e916b76c30 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 10 Jun 2022 13:35:42 +1000
Subject: [PATCH 2189/3533] py/dynruntime: Add macros to access more types and
 mp_const_empty_bytes.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/dynruntime.h | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/py/dynruntime.h b/py/dynruntime.h
index 9205cfd21c1cd..e3200a271954e 100644
--- a/py/dynruntime.h
+++ b/py/dynruntime.h
@@ -44,6 +44,7 @@
 #undef mp_const_none
 #undef mp_const_false
 #undef mp_const_true
+#undef mp_const_empty_bytes
 #undef mp_const_empty_tuple
 #undef nlr_raise
 
@@ -81,7 +82,11 @@ static inline void *m_realloc_dyn(void *ptr, size_t new_num_bytes) {
 #define MP_OBJ_NEW_QSTR(x) MP_OBJ_NEW_QSTR_##x
 
 #define mp_type_type                        (*mp_fun_table.type_type)
+#define mp_type_NoneType                    (*mp_obj_get_type(mp_const_none))
+#define mp_type_bool                        (*mp_obj_get_type(mp_const_false))
+#define mp_type_int                         (*(mp_obj_type_t *)(mp_load_global(MP_QSTR_int)))
 #define mp_type_str                         (*mp_fun_table.type_str)
+#define mp_type_bytes                       (*(mp_obj_type_t *)(mp_load_global(MP_QSTR_bytes)))
 #define mp_type_tuple                       (*((mp_obj_base_t *)mp_const_empty_tuple)->type)
 #define mp_type_list                        (*mp_fun_table.type_list)
 #define mp_type_EOFError                    (*(mp_obj_type_t *)(mp_load_global(MP_QSTR_EOFError)))
@@ -100,6 +105,7 @@ static inline void *m_realloc_dyn(void *ptr, size_t new_num_bytes) {
 #define mp_const_none                       ((mp_obj_t)mp_fun_table.const_none)
 #define mp_const_false                      ((mp_obj_t)mp_fun_table.const_false)
 #define mp_const_true                       ((mp_obj_t)mp_fun_table.const_true)
+#define mp_const_empty_bytes                (mp_type_bytes.make_new(NULL, 0, 0, NULL))
 #define mp_const_empty_tuple                (mp_fun_table.new_tuple(0, NULL))
 
 #define mp_obj_new_bool(b)                  ((b) ? (mp_obj_t)mp_fun_table.const_true : (mp_obj_t)mp_fun_table.const_false)

From 1f1afae622a26a0484c8187b02c46db3eb0b053d Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 10 Jun 2022 13:58:39 +1000
Subject: [PATCH 2190/3533] examples/natmod/features3: Add example to test more
 natmod features.

Signed-off-by: Damien George <damien@micropython.org>
---
 examples/natmod/features3/Makefile    | 14 +++++++
 examples/natmod/features3/features3.c | 60 +++++++++++++++++++++++++++
 tools/ci.sh                           |  1 +
 3 files changed, 75 insertions(+)
 create mode 100644 examples/natmod/features3/Makefile
 create mode 100644 examples/natmod/features3/features3.c

diff --git a/examples/natmod/features3/Makefile b/examples/natmod/features3/Makefile
new file mode 100644
index 0000000000000..4a5f71b8f255b
--- /dev/null
+++ b/examples/natmod/features3/Makefile
@@ -0,0 +1,14 @@
+# Location of top-level MicroPython directory
+MPY_DIR = ../../..
+
+# Name of module
+MOD = features3
+
+# Source files (.c or .py)
+SRC = features3.c
+
+# Architecture to build for (x86, x64, armv7m, xtensa, xtensawin)
+ARCH = x64
+
+# Include to get the rules for compiling and linking the module
+include $(MPY_DIR)/py/dynruntime.mk
diff --git a/examples/natmod/features3/features3.c b/examples/natmod/features3/features3.c
new file mode 100644
index 0000000000000..20efd67cdcefd
--- /dev/null
+++ b/examples/natmod/features3/features3.c
@@ -0,0 +1,60 @@
+/* This example demonstrates the following features in a native module:
+    - using types
+    - using constant objects
+    - creating dictionaries
+*/
+
+// Include the header file to get access to the MicroPython API.
+#include "py/dynruntime.h"
+
+// A function that returns a tuple of object types.
+STATIC mp_obj_t get_types(void) {
+    return mp_obj_new_tuple(9, ((mp_obj_t []) {
+        MP_OBJ_FROM_PTR(&mp_type_type),
+        MP_OBJ_FROM_PTR(&mp_type_NoneType),
+        MP_OBJ_FROM_PTR(&mp_type_bool),
+        MP_OBJ_FROM_PTR(&mp_type_int),
+        MP_OBJ_FROM_PTR(&mp_type_str),
+        MP_OBJ_FROM_PTR(&mp_type_bytes),
+        MP_OBJ_FROM_PTR(&mp_type_tuple),
+        MP_OBJ_FROM_PTR(&mp_type_list),
+        MP_OBJ_FROM_PTR(&mp_type_dict),
+    }));
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(get_types_obj, get_types);
+
+// A function that returns a tuple of constant objects.
+STATIC mp_obj_t get_const_objects(void) {
+    return mp_obj_new_tuple(5, ((mp_obj_t []) {
+        mp_const_none,
+        mp_const_false,
+        mp_const_true,
+        mp_const_empty_bytes,
+        mp_const_empty_tuple,
+    }));
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(get_const_objects_obj, get_const_objects);
+
+// A function that creates a dictionary from the given arguments.
+STATIC mp_obj_t make_dict(size_t n_args, const mp_obj_t *args) {
+    mp_obj_t dict = mp_obj_new_dict(n_args / 2);
+    for (; n_args >= 2; n_args -= 2, args += 2) {
+        mp_obj_dict_store(dict, args[0], args[1]);
+    }
+    return dict;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(make_dict_obj, 0, MP_OBJ_FUN_ARGS_MAX, make_dict);
+
+// This is the entry point and is called when the module is imported.
+mp_obj_t mpy_init(mp_obj_fun_bc_t *self, size_t n_args, size_t n_kw, mp_obj_t *args) {
+    // This must be first, it sets up the globals dict and other things.
+    MP_DYNRUNTIME_INIT_ENTRY
+
+    // Make the functions available in the module's namespace.
+    mp_store_global(MP_QSTR_make_dict, MP_OBJ_FROM_PTR(&make_dict_obj));
+    mp_store_global(MP_QSTR_get_types, MP_OBJ_FROM_PTR(&get_types_obj));
+    mp_store_global(MP_QSTR_get_const_objects, MP_OBJ_FROM_PTR(&get_const_objects_obj));
+
+    // This must be last, it restores the globals dict.
+    MP_DYNRUNTIME_INIT_EXIT
+}
diff --git a/tools/ci.sh b/tools/ci.sh
index 345aea84a0eb2..f92db66d700d1 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -424,6 +424,7 @@ function ci_native_mpy_modules_build {
     fi
     make -C examples/natmod/features1 ARCH=$arch
     make -C examples/natmod/features2 ARCH=$arch
+    make -C examples/natmod/features3 ARCH=$arch
     make -C examples/natmod/btree ARCH=$arch
     make -C examples/natmod/framebuf ARCH=$arch
     make -C examples/natmod/uheapq ARCH=$arch

From cf7d962cf38db296d1ac419fc4d5302b64c59644 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 10 Jun 2022 14:36:22 +1000
Subject: [PATCH 2191/3533] docs/reference/mpyfiles: Update .mpy description to
 match latest format.

Signed-off-by: Damien George <damien@micropython.org>
---
 docs/reference/mpyfiles.rst | 62 +++++++++++++++++++++++++++----------
 1 file changed, 45 insertions(+), 17 deletions(-)

diff --git a/docs/reference/mpyfiles.rst b/docs/reference/mpyfiles.rst
index 70354c4e1f460..fcb49965652f4 100644
--- a/docs/reference/mpyfiles.rst
+++ b/docs/reference/mpyfiles.rst
@@ -80,7 +80,8 @@ and .mpy version.
 =================== ============
 MicroPython release .mpy version
 =================== ============
-v1.12 and up        5
+v1.19 and up        6
+v1.12 - v1.18       5
 v1.11               4
 v1.9.3 - v1.10      3
 v1.9 - v1.9.2       2
@@ -93,6 +94,7 @@ MicroPython repository at which the .mpy version was changed.
 =================== ========================================
 .mpy version change Git commit
 =================== ========================================
+5 to 6              f2040bfc7ee033e48acef9f289790f3b4e6b74e5
 4 to 5              5716c5cf65e9b2cb46c2906f40302401bdd27517
 3 to 4              9a5f92ea72754c01cc03e5efcdfe94021120531e
 2 to 3              ff93fd4f50321c6190e1659b19e64fef3045a484
@@ -104,21 +106,31 @@ initial version 0   d8c834c95d506db979ec871417de90b7951edc30
 Binary encoding of .mpy files
 -----------------------------
 
-MicroPython .mpy files are a binary container format with code objects
-stored internally in a nested hierarchy.  To keep files small while still
+MicroPython .mpy files are a binary container format with code objects (bytecode
+and native machine code) stored internally in a nested hierarchy.  The code for
+the outer module is stored first, and then its children follow.  Each child may
+have further children, for example in the case of a class having methods, or a
+function defining a lambda or comprehension.  To keep files small while still
 providing a large range of possible values it uses the concept of a
 variably-encoded-unsigned-integer (vuint) in many places.  Similar to utf-8
 encoding, this encoding stores 7 bits per byte with the 8th bit (MSB) set
 if one or more bytes follow.  The bits of the unsigned integer are stored
 in the vuint in LSB form.
 
-The top-level of an .mpy file consists of two parts:
+The top-level of an .mpy file consists of three parts:
 
 * The header.
 
+* The global qstr and constant tables.
+
 * The raw-code for the outer scope of the module.
   This outer scope is executed when the .mpy file is imported.
 
+You can inspect the contents of a .mpy file by using ``mpy-tool.py``, for
+example (run from the root of the main MicroPython repository)::
+
+    $ ./tools/mpy-tool.py -xd myfile.mpy
+
 The header
 ~~~~~~~~~~
 
@@ -131,7 +143,26 @@ byte    value 0x4d (ASCII 'M')
 byte    .mpy version number
 byte    feature flags
 byte    number of bits in a small int
-vuint   size of qstr window
+======  ================================
+
+The global qstr and constant tables
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+An .mpy file contains a single qstr table, and a single constant object table.
+These are global to the .mpy file, they are referenced by all nested raw-code
+objects.  The qstr table maps internal qstr number (internal to the .mpy file)
+to the resolved qstr number of the runtime that the .mpy file is imported into.
+This links the .mpy file with the rest of the system that it executes within.
+The constant object table is populated with references to all constant objects
+that the .mpy file needs.
+
+======  ================================
+size    field
+======  ================================
+vuint   number of qstrs
+vuint   number of constant objects
+...     qstr data
+...     encoded constant objects
 ======  ================================
 
 Raw code elements
@@ -143,24 +174,21 @@ contents are:
 ======  ================================
 size    field
 ======  ================================
-vuint   type and size
+vuint   type, size and whether there are sub-raw-code elements
 ...     code (bytecode or machine code)
-vuint   number of constant objects
-vuint   number of sub-raw-code elements
-...     constant objects
+vuint   number of sub-raw-code elements (only if non-zero)
 ...     sub-raw-code elements
 ======  ================================
 
 The first vuint in a raw-code element encodes the type of code stored in this
-element (the two least-significant bits), and the decompressed length of the code
-(the amount of RAM to allocate for it).
-
-Following the vuint comes the code itself.  In the case of bytecode it also contains
-compressed qstr values.
+element (the two least-significant bits), whether this raw-code has any
+children (the third least-significant bit), and the length of the code that
+follows (the amount of RAM to allocate for it).
 
-Following the code comes a vuint counting the number of constant objects, and
-another vuint counting the number of sub-raw-code elements.
+Following the vuint comes the code itself.  Unless the code type is viper code
+with relocations, this code is constant data and does not need to be modified.
 
-The constant objects are then stored next.
+If this raw-code has any children (as indicated by a bit in the first vuint),
+following the code comes a vuint counting the number of sub-raw-code elements.
 
 Finally any sub-raw-code elements are stored, recursively.

From 58b35c9abd3aee9b0a79ec69db778c7bad45aee2 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Wed, 8 Jun 2022 16:36:06 +0200
Subject: [PATCH 2192/3533] extmod/extmod.cmake: Fix hard-coded mbedtls config
 file path.

* The mbedtls config file path is hard-coded to the config file in
the stm32 port. Any port using this cmake fragment is not actually
using its own config file.
---
 extmod/extmod.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extmod/extmod.cmake b/extmod/extmod.cmake
index 862743c1e77d0..551dec714c6ef 100644
--- a/extmod/extmod.cmake
+++ b/extmod/extmod.cmake
@@ -184,7 +184,7 @@ if(MICROPY_SSL_MBEDTLS)
     )
 
     target_compile_definitions(micropy_lib_mbedtls INTERFACE
-        MBEDTLS_CONFIG_FILE="ports/stm32/mbedtls/mbedtls_config.h"
+        MBEDTLS_CONFIG_FILE="${MICROPY_PORT_DIR}/mbedtls/mbedtls_config.h"
     )
 
     list(APPEND MICROPY_INC_CORE

From 99d3a73d590d9e2a15e7e2bcf908e87abb6f24f6 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Thu, 9 Jun 2022 11:58:00 +0200
Subject: [PATCH 2193/3533] nrf/modules/uos/microbitfs: Fix MICROPY_MBFS build
 to use mp_obj_malloc.

Changes introduced in 0e7bfc88c6ac6b5d64240f91183a3cfe2ab67ade missed
changing this call to mp_obj_malloc.
---
 ports/nrf/modules/uos/microbitfs.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/nrf/modules/uos/microbitfs.c b/ports/nrf/modules/uos/microbitfs.c
index 98752ad9aedf8..6c8ffb0925d0e 100644
--- a/ports/nrf/modules/uos/microbitfs.c
+++ b/ports/nrf/modules/uos/microbitfs.c
@@ -360,7 +360,7 @@ STATIC file_descriptor_obj *microbit_file_open(const char *name, size_t name_len
 }
 
 STATIC file_descriptor_obj *microbit_file_descriptor_new(uint8_t start_chunk, bool write, bool binary) {
-    file_descriptor_obj *res = m_new_obj(file_descriptor_obj, binary ? &uos_mbfs_fileio_type : &uos_mbfs_textio_type);
+    file_descriptor_obj *res = mp_obj_malloc(file_descriptor_obj, binary ? &uos_mbfs_fileio_type : &uos_mbfs_textio_type);
     res->start_chunk = start_chunk;
     res->seek_chunk = start_chunk;
     res->seek_offset = file_system_chunks[start_chunk].header.name_len+2;

From cedb93c179f92f8d122453205950ba97a58a307b Mon Sep 17 00:00:00 2001
From: Andrew Scheller <github@loowis.durge.org>
Date: Sun, 12 Jun 2022 12:12:31 +0100
Subject: [PATCH 2194/3533] docs: Update Raspberry Pi URLs from .org to .com.

---
 docs/library/rp2.rst             | 2 +-
 docs/rp2/general.rst             | 2 +-
 ports/rp2/boards/PICO/board.json | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/library/rp2.rst b/docs/library/rp2.rst
index 05d3b80f3a0f8..06affaae8cac5 100644
--- a/docs/library/rp2.rst
+++ b/docs/library/rp2.rst
@@ -10,7 +10,7 @@ The ``rp2`` module contains functions and classes specific to the RP2040, as
 used in the Raspberry Pi Pico.
 
 See the `RP2040 Python datasheet
-<https://datasheets.raspberrypi.org/pico/raspberry-pi-pico-python-sdk.pdf>`_
+<https://datasheets.raspberrypi.com/pico/raspberry-pi-pico-python-sdk.pdf>`_
 for more information, and `pico-micropython-examples
 <https://github.com/raspberrypi/pico-micropython-examples/tree/master/pio>`_
 for example code.
diff --git a/docs/rp2/general.rst b/docs/rp2/general.rst
index 9a31d20671b48..6a8958d172a84 100644
--- a/docs/rp2/general.rst
+++ b/docs/rp2/general.rst
@@ -11,7 +11,7 @@ Technical specifications and SoC datasheets
 -------------------------------------------
 
 For detailed technical specifications, please refer to the `datasheets
-<https://datasheets.raspberrypi.org/rp2040/rp2040-datasheet.pdf>`_
+<https://datasheets.raspberrypi.com/rp2040/rp2040-datasheet.pdf>`_
 
 The RP2040 microcontroller is manufactured on a 40 nm silicon process in a 7x7mm
 QFN-56 SMD package. The key features include:
diff --git a/ports/rp2/boards/PICO/board.json b/ports/rp2/boards/PICO/board.json
index b8ccb3ba53292..9abf505e54355 100644
--- a/ports/rp2/boards/PICO/board.json
+++ b/ports/rp2/boards/PICO/board.json
@@ -15,6 +15,6 @@
     "mcu": "rp2040",
     "product": "Pico",
     "thumbnail": "",
-    "url": "https://www.raspberrypi.org/products/raspberry-pi-pico/",
+    "url": "https://www.raspberrypi.com/products/raspberry-pi-pico/",
     "vendor": "Raspberry Pi"
 }

From 37d5114cec93258b719fcb7e8ec125dfe8b676e9 Mon Sep 17 00:00:00 2001
From: Phil Howard <phil@gadgetoid.com>
Date: Tue, 14 Jun 2022 11:17:03 +0100
Subject: [PATCH 2195/3533] py/makemoduledefs.py: Emit useful error for legacy
 MP_REGISTER_MODULE.

Catch calls to legacy:

MP_REGISTER_MODULE(name, module, enable)

Emit a friendly error suggesting they be rewritten to:

MP_REGISTER_MODULE(name, module).

Signed-off-by: Phil Howard <phil@pimoroni.com>
---
 py/makemoduledefs.py | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/py/makemoduledefs.py b/py/makemoduledefs.py
index 5a19e687ae631..9061cd890be82 100644
--- a/py/makemoduledefs.py
+++ b/py/makemoduledefs.py
@@ -7,6 +7,7 @@
 
 from __future__ import print_function
 
+import sys
 import re
 import io
 import argparse
@@ -40,6 +41,14 @@ def generate_module_table_header(modules):
     for module_name, obj_module in modules:
         mod_def = "MODULE_DEF_{}".format(module_name.upper())
         mod_defs.add(mod_def)
+        if "," in obj_module:
+            print(
+                "ERROR: Call to MP_REGISTER_MODULE({}, {}) should be MP_REGISTER_MODULE({}, {})\n".format(
+                    module_name, obj_module, module_name, obj_module.split(",")[0]
+                ),
+                file=sys.stderr,
+            )
+            sys.exit(1)
         print(
             (
                 "extern const struct _mp_obj_module_t {obj_module};\n"

From d75892c0b07e8561e58fa0fe3dffb1e4939ec0f5 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 15 Jun 2022 11:38:09 +1000
Subject: [PATCH 2196/3533] zephyr/modusocket: Fix function object wrapper for
 listen method.

This was missed by 919f696ad254bcc39effe7ce7fddae8cf406c954

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/zephyr/modusocket.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/zephyr/modusocket.c b/ports/zephyr/modusocket.c
index 29240ad15290f..40d4aaac5bbf6 100644
--- a/ports/zephyr/modusocket.c
+++ b/ports/zephyr/modusocket.c
@@ -201,7 +201,7 @@ STATIC mp_obj_t socket_listen(size_t n_args, const mp_obj_t *args) {
 
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(socket_listen_obj, socket_listen);
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(socket_listen_obj, 1, 2, socket_listen);
 
 STATIC mp_obj_t socket_accept(mp_obj_t self_in) {
     socket_obj_t *socket = self_in;

From 096954337f4ae06edf9dbe8c7b8156dcbbafbdf6 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 16 Jun 2022 11:05:26 +1000
Subject: [PATCH 2197/3533] stm32/mboot: Only include UI code if at least one
 board LED is defined.

Otherwise the board must provide dummy definitions of MBOOT_LED1.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/mboot/mboot.h | 22 ++++++++++++++++++++++
 ports/stm32/mboot/ui.c    |  4 ++++
 2 files changed, 26 insertions(+)

diff --git a/ports/stm32/mboot/mboot.h b/ports/stm32/mboot/mboot.h
index 208a80d57dcd4..d45f4c1efd156 100644
--- a/ports/stm32/mboot/mboot.h
+++ b/ports/stm32/mboot/mboot.h
@@ -26,6 +26,7 @@
 #ifndef MICROPY_INCLUDED_STM32_MBOOT_MBOOT_H
 #define MICROPY_INCLUDED_STM32_MBOOT_MBOOT_H
 
+#include "py/mpconfig.h"
 #include "py/mphal.h"
 
 // Use this to tag global static data in RAM that doesn't need to be zeroed on startup
@@ -38,6 +39,13 @@
 #define NORETURN __attribute__((noreturn))
 #define MP_ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0]))
 
+// The default UI code in ui.c only works if there is at least one LED configured.
+#if defined(MBOOT_LED1) || defined(MICROPY_HW_LED1)
+#define MBOOT_ENABLE_DEFAULT_UI (1)
+#else
+#define MBOOT_ENABLE_DEFAULT_UI (0)
+#endif
+
 #ifndef MBOOT_BOARD_EARLY_INIT
 #define MBOOT_BOARD_EARLY_INIT(initial_r0)
 #endif
@@ -47,15 +55,27 @@
 #endif
 
 #ifndef MBOOT_BOARD_GET_RESET_MODE
+#if MBOOT_ENABLE_DEFAULT_UI
 #define MBOOT_BOARD_GET_RESET_MODE(initial_r0) mboot_get_reset_mode_default()
+#else
+#define MBOOT_BOARD_GET_RESET_MODE(initial_r0) BOARDCTRL_RESET_MODE_NORMAL
+#endif
 #endif
 
 #ifndef MBOOT_BOARD_STATE_CHANGE
+#if MBOOT_ENABLE_DEFAULT_UI
 #define MBOOT_BOARD_STATE_CHANGE(state, arg) mboot_state_change_default((state), (arg))
+#else
+#define MBOOT_BOARD_STATE_CHANGE(state, arg)
+#endif
 #endif
 
 #ifndef MBOOT_BOARD_SYSTICK
+#if MBOOT_ENABLE_DEFAULT_UI
 #define MBOOT_BOARD_SYSTICK() mboot_ui_systick()
+#else
+#define MBOOT_BOARD_SYSTICK()
+#endif
 #endif
 
 #ifndef MBOOT_ADDRESS_SPACE_64BIT
@@ -171,8 +191,10 @@ const uint8_t *elem_search(const uint8_t *elem, uint8_t elem_id);
 int fsload_process(void);
 
 static inline void mboot_entry_init_default(void) {
+    #if MBOOT_ENABLE_DEFAULT_UI
     // Init subsystems (mboot_get_reset_mode() may call these, calling them again is ok)
     led_init();
+    #endif
 
     // set the system clock to be HSE
     SystemClock_Config();
diff --git a/ports/stm32/mboot/ui.c b/ports/stm32/mboot/ui.c
index c1fea55da50a5..15bf1ba3ec21c 100644
--- a/ports/stm32/mboot/ui.c
+++ b/ports/stm32/mboot/ui.c
@@ -27,6 +27,8 @@
 #include "mboot.h"
 #include "ports/stm32/boardctrl.h"
 
+#if MBOOT_ENABLE_DEFAULT_UI
+
 /******************************************************************************/
 // LED
 
@@ -253,3 +255,5 @@ void mboot_state_change_default(mboot_state_t state, uint32_t arg) {
             break;
     }
 }
+
+#endif // MBOOT_ENABLE_DEFAULT_UI

From d7919ea71e7b7cc203ca984cc2f4a55019634835 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 16 Jun 2022 15:11:02 +1000
Subject: [PATCH 2198/3533] all: Bump version to 1.19.

Signed-off-by: Damien George <damien@micropython.org>
---
 docs/conf.py  | 2 +-
 py/mpconfig.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/conf.py b/docs/conf.py
index 741f8b34396fa..a21e8d5f6804f 100755
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -74,7 +74,7 @@
 #
 # We don't follow "The short X.Y version" vs "The full version, including alpha/beta/rc tags"
 # breakdown, so use the same version identifier for both to avoid confusion.
-version = release = '1.18'
+version = release = '1.19'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/py/mpconfig.h b/py/mpconfig.h
index ea03ad1408845..bf5c0e643f907 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -28,7 +28,7 @@
 
 // Current version of MicroPython
 #define MICROPY_VERSION_MAJOR 1
-#define MICROPY_VERSION_MINOR 18
+#define MICROPY_VERSION_MINOR 19
 #define MICROPY_VERSION_MICRO 0
 
 // Combined version as a 32-bit number for convenience

From 5233fb3a3d3245bd4c5dfb781e3fcbc8a3fbfd6a Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 17 Jun 2022 11:57:57 +1000
Subject: [PATCH 2199/3533] extmod/machine_i2c: Only use WRITE1 option if
 transfer supports it.

When MICROPY_PY_MACHINE_I2C_TRANSFER_WRITE1 is enabled the port's hardware
I2C transfer functions should support the MP_MACHINE_I2C_FLAG_WRITE1
option, but software I2C will not.  So add a flag to the I2C protocol
struct so each individual protocol can indicate whether it supports this
option or not.

Fixes issue #8765.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/machine_i2c.c      | 25 ++++++++++++-------------
 extmod/machine_i2c.h      |  3 +++
 ports/esp32/machine_i2c.c |  1 +
 3 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/extmod/machine_i2c.c b/extmod/machine_i2c.c
index 7d0628a2d43c2..452f07a2ebdb8 100644
--- a/extmod/machine_i2c.c
+++ b/extmod/machine_i2c.c
@@ -515,19 +515,20 @@ STATIC int read_mem(mp_obj_t self_in, uint16_t addr, uint32_t memaddr, uint8_t a
     size_t memaddr_len = fill_memaddr_buf(&memaddr_buf[0], memaddr, addrsize);
 
     #if MICROPY_PY_MACHINE_I2C_TRANSFER_WRITE1
-
-    // Create partial write and read buffers
-    mp_machine_i2c_buf_t bufs[2] = {
-        {.len = memaddr_len, .buf = memaddr_buf},
-        {.len = len, .buf = buf},
-    };
-
-    // Do write+read I2C transfer
+    // The I2C transfer function may support the MP_MACHINE_I2C_FLAG_WRITE1 option
     mp_machine_i2c_p_t *i2c_p = (mp_machine_i2c_p_t *)self->type->protocol;
-    return i2c_p->transfer(self, addr, 2, bufs,
-        MP_MACHINE_I2C_FLAG_WRITE1 | MP_MACHINE_I2C_FLAG_READ | MP_MACHINE_I2C_FLAG_STOP);
+    if (i2c_p->transfer_supports_write1) {
+        // Create partial write and read buffers
+        mp_machine_i2c_buf_t bufs[2] = {
+            {.len = memaddr_len, .buf = memaddr_buf},
+            {.len = len, .buf = buf},
+        };
 
-    #else
+        // Do write+read I2C transfer
+        return i2c_p->transfer(self, addr, 2, bufs,
+            MP_MACHINE_I2C_FLAG_WRITE1 | MP_MACHINE_I2C_FLAG_READ | MP_MACHINE_I2C_FLAG_STOP);
+    }
+    #endif
 
     int ret = mp_machine_i2c_writeto(self, addr, memaddr_buf, memaddr_len, false);
     if (ret != memaddr_len) {
@@ -536,8 +537,6 @@ STATIC int read_mem(mp_obj_t self_in, uint16_t addr, uint32_t memaddr, uint8_t a
         return ret;
     }
     return mp_machine_i2c_readfrom(self, addr, buf, len, true);
-
-    #endif
 }
 
 STATIC int write_mem(mp_obj_t self_in, uint16_t addr, uint32_t memaddr, uint8_t addrsize, const uint8_t *buf, size_t len) {
diff --git a/extmod/machine_i2c.h b/extmod/machine_i2c.h
index a211aef527a18..a3363d4c341c5 100644
--- a/extmod/machine_i2c.h
+++ b/extmod/machine_i2c.h
@@ -61,6 +61,9 @@ typedef struct _mp_machine_i2c_buf_t {
 // - transfer must be non-NULL
 // - transfer_single only needs to be set if transfer=mp_machine_i2c_transfer_adaptor
 typedef struct _mp_machine_i2c_p_t {
+    #if MICROPY_PY_MACHINE_I2C_TRANSFER_WRITE1
+    bool transfer_supports_write1;
+    #endif
     void (*init)(mp_obj_base_t *obj, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args);
     int (*start)(mp_obj_base_t *obj);
     int (*stop)(mp_obj_base_t *obj);
diff --git a/ports/esp32/machine_i2c.c b/ports/esp32/machine_i2c.c
index b037202e8da61..e25cad0b60a52 100644
--- a/ports/esp32/machine_i2c.c
+++ b/ports/esp32/machine_i2c.c
@@ -188,6 +188,7 @@ mp_obj_t machine_hw_i2c_make_new(const mp_obj_type_t *type, size_t n_args, size_
 }
 
 STATIC const mp_machine_i2c_p_t machine_hw_i2c_p = {
+    .transfer_supports_write1 = true,
     .transfer = machine_hw_i2c_transfer,
 };
 

From 9b486340da22931cde82872f79e1c34db959548b Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 17 Jun 2022 12:57:59 +1000
Subject: [PATCH 2200/3533] all: Bump version to 1.19.1.

Signed-off-by: Damien George <damien@micropython.org>
---
 docs/conf.py  | 2 +-
 py/mpconfig.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/conf.py b/docs/conf.py
index a21e8d5f6804f..d0c989eeaae41 100755
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -74,7 +74,7 @@
 #
 # We don't follow "The short X.Y version" vs "The full version, including alpha/beta/rc tags"
 # breakdown, so use the same version identifier for both to avoid confusion.
-version = release = '1.19'
+version = release = '1.19.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/py/mpconfig.h b/py/mpconfig.h
index bf5c0e643f907..d70d39ae97e85 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -29,7 +29,7 @@
 // Current version of MicroPython
 #define MICROPY_VERSION_MAJOR 1
 #define MICROPY_VERSION_MINOR 19
-#define MICROPY_VERSION_MICRO 0
+#define MICROPY_VERSION_MICRO 1
 
 // Combined version as a 32-bit number for convenience
 #define MICROPY_VERSION ( \

From 921dd94676815f794190484038ccacf001e68ea0 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Wed, 6 Jan 2021 20:19:29 +0200
Subject: [PATCH 2201/3533] nrf/main: Add startup and early-init board hook
 macros.

Following stm32 for naming and location of the hooks.  Also allow a board
to provide custom .c files to implement code for these hooks.
---
 ports/nrf/Makefile       | 1 +
 ports/nrf/main.c         | 5 +++++
 ports/nrf/mpconfigport.h | 8 ++++++++
 3 files changed, 14 insertions(+)

diff --git a/ports/nrf/Makefile b/ports/nrf/Makefile
index c32e09d2c9ce8..55cce1906d2c3 100644
--- a/ports/nrf/Makefile
+++ b/ports/nrf/Makefile
@@ -274,6 +274,7 @@ SRC_C += \
 	drivers/ticker.c \
 	drivers/bluetooth/ble_drv.c \
 	drivers/bluetooth/ble_uart.c \
+	$(wildcard $(BOARD_DIR)/*.c) \
 
 ifeq ($(MCU_SUB_VARIANT), nrf52840)
 
diff --git a/ports/nrf/main.c b/ports/nrf/main.c
index 2ec16194cb571..091aa73f450f1 100644
--- a/ports/nrf/main.c
+++ b/ports/nrf/main.c
@@ -107,9 +107,14 @@ extern uint32_t _heap_start;
 extern uint32_t _heap_end;
 
 int main(int argc, char **argv) {
+    // Hook for a board to run code at start up, for example check if a
+    // bootloader should be entered instead of the main application.
+    MICROPY_BOARD_STARTUP();
 
+    MICROPY_BOARD_EARLY_INIT();
 
 soft_reset:
+
     #if MICROPY_PY_TIME_TICKS
     rtc1_init_time_ticks();
     #endif
diff --git a/ports/nrf/mpconfigport.h b/ports/nrf/mpconfigport.h
index 29bdd3f80ca4e..04bd5b4c265b2 100644
--- a/ports/nrf/mpconfigport.h
+++ b/ports/nrf/mpconfigport.h
@@ -366,3 +366,11 @@ extern const struct _mp_obj_module_t music_module;
 #ifndef MP_NEED_LOG2
 #define MP_NEED_LOG2                (1)
 #endif
+
+#ifndef MICROPY_BOARD_STARTUP
+#define MICROPY_BOARD_STARTUP()
+#endif
+
+#ifndef MICROPY_BOARD_EARLY_INIT
+#define MICROPY_BOARD_EARLY_INIT()
+#endif

From 0adf0dd3d7108404fa2a62f0db637baaddaf0da9 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Wed, 27 Apr 2022 10:58:09 +0200
Subject: [PATCH 2202/3533] stm32/modmachine: Allow boards to provide custom
 bootloader code.

And expose the machine_bootloader() C function so it can be used elsewhere.
---
 ports/stm32/boardctrl.h                                | 4 ++++
 ports/stm32/boards/ARDUINO_PORTENTA_H7/mpconfigboard.h | 2 +-
 ports/stm32/modmachine.c                               | 5 ++++-
 ports/stm32/modmachine.h                               | 1 +
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/ports/stm32/boardctrl.h b/ports/stm32/boardctrl.h
index 0878a453b3db1..bc901f1c37c6b 100644
--- a/ports/stm32/boardctrl.h
+++ b/ports/stm32/boardctrl.h
@@ -37,6 +37,10 @@
 #define MICROPY_BOARD_STARTUP powerctrl_check_enter_bootloader
 #endif
 
+#ifndef MICROPY_BOARD_ENTER_BOOTLOADER
+#define MICROPY_BOARD_ENTER_BOOTLOADER(nargs, args)
+#endif
+
 #ifndef MICROPY_BOARD_EARLY_INIT
 #define MICROPY_BOARD_EARLY_INIT()
 #endif
diff --git a/ports/stm32/boards/ARDUINO_PORTENTA_H7/mpconfigboard.h b/ports/stm32/boards/ARDUINO_PORTENTA_H7/mpconfigboard.h
index 30c909913c41a..31e19c9eb51ab 100644
--- a/ports/stm32/boards/ARDUINO_PORTENTA_H7/mpconfigboard.h
+++ b/ports/stm32/boards/ARDUINO_PORTENTA_H7/mpconfigboard.h
@@ -38,7 +38,7 @@ void PORTENTA_board_startup(void);
 #define MICROPY_BOARD_EARLY_INIT    PORTENTA_board_early_init
 void PORTENTA_board_early_init(void);
 
-#define MICROPY_BOARD_ENTER_BOOTLOADER PORTENTA_board_enter_bootloader
+#define MICROPY_BOARD_ENTER_BOOTLOADER(nargs, args) PORTENTA_board_enter_bootloader()
 void PORTENTA_board_enter_bootloader(void);
 
 void PORTENTA_board_low_power(int mode);
diff --git a/ports/stm32/modmachine.c b/ports/stm32/modmachine.c
index 5fca9b3e04c62..91061a3109b9b 100644
--- a/ports/stm32/modmachine.c
+++ b/ports/stm32/modmachine.c
@@ -46,6 +46,7 @@
 #include "gccollect.h"
 #include "irq.h"
 #include "powerctrl.h"
+#include "boardctrl.h"
 #include "pybthread.h"
 #include "rng.h"
 #include "storage.h"
@@ -270,7 +271,7 @@ STATIC mp_obj_t machine_soft_reset(void) {
 MP_DEFINE_CONST_FUN_OBJ_0(machine_soft_reset_obj, machine_soft_reset);
 
 // Activate the bootloader without BOOT* pins.
-STATIC NORETURN mp_obj_t machine_bootloader(size_t n_args, const mp_obj_t *args) {
+NORETURN mp_obj_t machine_bootloader(size_t n_args, const mp_obj_t *args) {
     #if MICROPY_HW_ENABLE_USB
     pyb_usb_dev_deinit();
     #endif
@@ -280,6 +281,8 @@ STATIC NORETURN mp_obj_t machine_bootloader(size_t n_args, const mp_obj_t *args)
 
     __disable_irq();
 
+    MICROPY_BOARD_ENTER_BOOTLOADER(n_args, args);
+
     #if MICROPY_HW_USES_BOOTLOADER
     if (n_args == 0 || !mp_obj_is_true(args[0])) {
         // By default, with no args given, we enter the custom bootloader (mboot)
diff --git a/ports/stm32/modmachine.h b/ports/stm32/modmachine.h
index 0e6c000a801f6..9fa7851582e1a 100644
--- a/ports/stm32/modmachine.h
+++ b/ports/stm32/modmachine.h
@@ -36,6 +36,7 @@ extern const mp_obj_type_t machine_i2s_type;
 void machine_init(void);
 void machine_deinit(void);
 void machine_i2s_init0();
+NORETURN mp_obj_t machine_bootloader(size_t n_args, const mp_obj_t *args);
 
 MP_DECLARE_CONST_FUN_OBJ_VAR_BETWEEN(machine_info_obj);
 MP_DECLARE_CONST_FUN_OBJ_0(machine_unique_id_obj);

From d8f56695322da9201d837c6348683fe3ee81b0af Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Wed, 27 Apr 2022 11:03:51 +0200
Subject: [PATCH 2203/3533] nrf/modmachine: Add machine.bootloader() and make
 it customisable.

---
 ports/nrf/modules/machine/modmachine.c | 8 ++++++++
 ports/nrf/modules/machine/modmachine.h | 1 +
 ports/nrf/mpconfigport.h               | 4 ++++
 3 files changed, 13 insertions(+)

diff --git a/ports/nrf/modules/machine/modmachine.c b/ports/nrf/modules/machine/modmachine.c
index 1378ba8f4be35..af659521e0096 100644
--- a/ports/nrf/modules/machine/modmachine.c
+++ b/ports/nrf/modules/machine/modmachine.c
@@ -153,6 +153,13 @@ STATIC mp_obj_t machine_soft_reset(void) {
 }
 MP_DEFINE_CONST_FUN_OBJ_0(machine_soft_reset_obj, machine_soft_reset);
 
+NORETURN mp_obj_t machine_bootloader(size_t n_args, const mp_obj_t *args) {
+    MICROPY_BOARD_ENTER_BOOTLOADER(n_args, args);
+    for (;;) {
+    }
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_bootloader_obj, 0, 1, machine_bootloader);
+
 STATIC mp_obj_t machine_lightsleep(void) {
     __WFE();
     return mp_const_none;
@@ -196,6 +203,7 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_info),               MP_ROM_PTR(&machine_info_obj) },
     { MP_ROM_QSTR(MP_QSTR_reset),              MP_ROM_PTR(&machine_reset_obj) },
     { MP_ROM_QSTR(MP_QSTR_soft_reset),         MP_ROM_PTR(&machine_soft_reset_obj) },
+    { MP_ROM_QSTR(MP_QSTR_bootloader),         MP_ROM_PTR(&machine_bootloader_obj) },
     { MP_ROM_QSTR(MP_QSTR_enable_irq),         MP_ROM_PTR(&machine_enable_irq_obj) },
     { MP_ROM_QSTR(MP_QSTR_disable_irq),        MP_ROM_PTR(&machine_disable_irq_obj) },
     { MP_ROM_QSTR(MP_QSTR_sleep),              MP_ROM_PTR(&machine_lightsleep_obj) },
diff --git a/ports/nrf/modules/machine/modmachine.h b/ports/nrf/modules/machine/modmachine.h
index 1ea6959eababa..e5412673f8228 100644
--- a/ports/nrf/modules/machine/modmachine.h
+++ b/ports/nrf/modules/machine/modmachine.h
@@ -38,5 +38,6 @@ MP_DECLARE_CONST_FUN_OBJ_VAR_BETWEEN(machine_info_obj);
 MP_DECLARE_CONST_FUN_OBJ_0(machine_reset_obj);
 MP_DECLARE_CONST_FUN_OBJ_0(machine_lightsleep_obj);
 MP_DECLARE_CONST_FUN_OBJ_0(machine_deepsleep_obj);
+NORETURN mp_obj_t machine_bootloader(size_t n_args, const mp_obj_t *args);
 
 #endif // __MICROPY_INCLUDED_NRF5_MODMACHINE_H__
diff --git a/ports/nrf/mpconfigport.h b/ports/nrf/mpconfigport.h
index 04bd5b4c265b2..102be3eaaf64c 100644
--- a/ports/nrf/mpconfigport.h
+++ b/ports/nrf/mpconfigport.h
@@ -371,6 +371,10 @@ extern const struct _mp_obj_module_t music_module;
 #define MICROPY_BOARD_STARTUP()
 #endif
 
+#ifndef MICROPY_BOARD_ENTER_BOOTLOADER
+#define MICROPY_BOARD_ENTER_BOOTLOADER(nargs, args)
+#endif
+
 #ifndef MICROPY_BOARD_EARLY_INIT
 #define MICROPY_BOARD_EARLY_INIT()
 #endif

From f522aabab2c78697d5f178d7e60454781a7d1dbc Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Wed, 27 Apr 2022 11:11:24 +0200
Subject: [PATCH 2204/3533] rp2/modmachine: Allow boards to provide custom
 bootloader code.

And expose the machine_bootloader() C function so it can be used elsewhere.
---
 ports/rp2/modmachine.c   | 8 +++++---
 ports/rp2/modmachine.h   | 1 +
 ports/rp2/mpconfigport.h | 4 ++++
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/ports/rp2/modmachine.c b/ports/rp2/modmachine.c
index fbaf29ee1641f..b988afdf305d2 100644
--- a/ports/rp2/modmachine.c
+++ b/ports/rp2/modmachine.c
@@ -81,11 +81,13 @@ STATIC mp_obj_t machine_reset_cause(void) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_0(machine_reset_cause_obj, machine_reset_cause);
 
-STATIC mp_obj_t machine_bootloader(void) {
+NORETURN mp_obj_t machine_bootloader(size_t n_args, const mp_obj_t *args) {
+    MICROPY_BOARD_ENTER_BOOTLOADER(n_args, args);
     reset_usb_boot(0, 0);
-    return mp_const_none;
+    for (;;) {
+    }
 }
-MP_DEFINE_CONST_FUN_OBJ_0(machine_bootloader_obj, machine_bootloader);
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_bootloader_obj, 0, 1, machine_bootloader);
 
 STATIC mp_obj_t machine_freq(size_t n_args, const mp_obj_t *args) {
     if (n_args == 0) {
diff --git a/ports/rp2/modmachine.h b/ports/rp2/modmachine.h
index 0635ff248706f..503c1ca86c8ab 100644
--- a/ports/rp2/modmachine.h
+++ b/ports/rp2/modmachine.h
@@ -18,5 +18,6 @@ void machine_pin_deinit(void);
 void machine_i2s_init0(void);
 
 struct _machine_spi_obj_t *spi_from_mp_obj(mp_obj_t o);
+NORETURN mp_obj_t machine_bootloader(size_t n_args, const mp_obj_t *args);
 
 #endif // MICROPY_INCLUDED_RP2_MODMACHINE_H
diff --git a/ports/rp2/mpconfigport.h b/ports/rp2/mpconfigport.h
index d681a04af89fd..62388c6bcecd3 100644
--- a/ports/rp2/mpconfigport.h
+++ b/ports/rp2/mpconfigport.h
@@ -130,6 +130,10 @@
 #define mp_type_textio mp_type_vfs_lfs2_textio
 #endif
 
+#ifndef MICROPY_BOARD_ENTER_BOOTLOADER
+#define MICROPY_BOARD_ENTER_BOOTLOADER(nargs, args)
+#endif
+
 #if MICROPY_PY_NETWORK
 #define NETWORK_ROOT_POINTERS               mp_obj_list_t mod_network_nic_list;
 #else

From c5d26ee5e72331edf3c3ece342a577cbfe114310 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Tue, 7 Jun 2022 19:13:08 +0200
Subject: [PATCH 2205/3533] renesas-ra/modmachine: Allow boards to provide
 custom bootloader code.

And expose the machine_bootloader() C function so it can be used elsewhere.
---
 ports/renesas-ra/boardctrl.h  | 4 ++++
 ports/renesas-ra/modmachine.c | 5 ++++-
 ports/renesas-ra/modmachine.h | 1 +
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/ports/renesas-ra/boardctrl.h b/ports/renesas-ra/boardctrl.h
index cc7918c35f90b..1fc572a34ec30 100644
--- a/ports/renesas-ra/boardctrl.h
+++ b/ports/renesas-ra/boardctrl.h
@@ -37,6 +37,10 @@
 #define MICROPY_BOARD_STARTUP powerctrl_check_enter_bootloader
 #endif
 
+#ifndef MICROPY_BOARD_ENTER_BOOTLOADER
+#define MICROPY_BOARD_ENTER_BOOTLOADER(nargs, args)
+#endif
+
 #ifndef MICROPY_BOARD_EARLY_INIT
 #define MICROPY_BOARD_EARLY_INIT()
 #endif
diff --git a/ports/renesas-ra/modmachine.c b/ports/renesas-ra/modmachine.c
index cd6e750340cf8..e6f78747fdbac 100644
--- a/ports/renesas-ra/modmachine.c
+++ b/ports/renesas-ra/modmachine.c
@@ -47,6 +47,7 @@
 #include "gccollect.h"
 #include "irq.h"
 #include "powerctrl.h"
+#include "boardctrl.h"
 #include "pybthread.h"
 #include "storage.h"
 #include "pin.h"
@@ -182,13 +183,15 @@ STATIC mp_obj_t machine_soft_reset(void) {
 MP_DEFINE_CONST_FUN_OBJ_0(machine_soft_reset_obj, machine_soft_reset);
 
 // Activate the bootloader without BOOT* pins.
-STATIC NORETURN mp_obj_t machine_bootloader(size_t n_args, const mp_obj_t *args) {
+NORETURN mp_obj_t machine_bootloader(size_t n_args, const mp_obj_t *args) {
     #if MICROPY_HW_ENABLE_STORAGE
     storage_flush();
     #endif
 
     __disable_irq();
 
+    MICROPY_BOARD_ENTER_BOOTLOADER(n_args, args);
+
     #if MICROPY_HW_USES_BOOTLOADER
     // ToDo: need to review how to implement
 
diff --git a/ports/renesas-ra/modmachine.h b/ports/renesas-ra/modmachine.h
index 65077220df5ea..de421c5db81ff 100644
--- a/ports/renesas-ra/modmachine.h
+++ b/ports/renesas-ra/modmachine.h
@@ -49,6 +49,7 @@ void machine_deinit(void);
 void machine_pin_init(void);
 void machine_pin_deinit(void);
 void machine_i2s_init0(void);
+NORETURN mp_obj_t machine_bootloader(size_t n_args, const mp_obj_t *args);
 
 MP_DECLARE_CONST_FUN_OBJ_VAR_BETWEEN(machine_info_obj);
 MP_DECLARE_CONST_FUN_OBJ_0(machine_unique_id_obj);

From d8e7ecd23123247a6fc6f7d28833351e5b9d1fb6 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 17 Jun 2022 13:57:47 +1000
Subject: [PATCH 2206/3533] stm32/modmachine: Factor out mboot enter code to a
 function.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/boardctrl.c  | 22 ++++++++++++++++++++++
 ports/stm32/boardctrl.h  |  5 +++++
 ports/stm32/modmachine.c | 17 -----------------
 3 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/ports/stm32/boardctrl.c b/ports/stm32/boardctrl.c
index 922f218e92f90..02a375999129f 100644
--- a/ports/stm32/boardctrl.c
+++ b/ports/stm32/boardctrl.c
@@ -25,9 +25,11 @@
  */
 
 #include "py/runtime.h"
+#include "py/objstr.h"
 #include "py/mphal.h"
 #include "shared/runtime/pyexec.h"
 #include "boardctrl.h"
+#include "powerctrl.h"
 #include "led.h"
 #include "usrsw.h"
 
@@ -43,6 +45,26 @@ STATIC void flash_error(int n) {
     led_state(PYB_LED_GREEN, 0);
 }
 
+#if MICROPY_HW_USES_BOOTLOADER
+void boardctrl_maybe_enter_mboot(size_t n_args, const void *args_in) {
+    const mp_obj_t *args = args_in;
+
+    if (n_args == 0 || !mp_obj_is_true(args[0])) {
+        // By default, with no args given, we enter the custom bootloader (mboot)
+        powerctrl_enter_bootloader(0x70ad0000, MBOOT_VTOR);
+    }
+
+    if (n_args == 1 && mp_obj_is_str_or_bytes(args[0])) {
+        // With a string/bytes given, pass its data to the custom bootloader
+        size_t len;
+        const char *data = mp_obj_str_get_data(args[0], &len);
+        void *mboot_region = (void *)*((volatile uint32_t *)MBOOT_VTOR);
+        memmove(mboot_region, data, len);
+        powerctrl_enter_bootloader(0x70ad0080, MBOOT_VTOR);
+    }
+}
+#endif
+
 #if !MICROPY_HW_USES_BOOTLOADER
 STATIC uint update_reset_mode(uint reset_mode) {
     #if MICROPY_HW_HAS_SWITCH
diff --git a/ports/stm32/boardctrl.h b/ports/stm32/boardctrl.h
index bc901f1c37c6b..afd4ab8510b11 100644
--- a/ports/stm32/boardctrl.h
+++ b/ports/stm32/boardctrl.h
@@ -38,8 +38,12 @@
 #endif
 
 #ifndef MICROPY_BOARD_ENTER_BOOTLOADER
+#if MICROPY_HW_USES_BOOTLOADER
+#define MICROPY_BOARD_ENTER_BOOTLOADER(nargs, args) boardctrl_maybe_enter_mboot(nargs, args)
+#else
 #define MICROPY_BOARD_ENTER_BOOTLOADER(nargs, args)
 #endif
+#endif
 
 #ifndef MICROPY_BOARD_EARLY_INIT
 #define MICROPY_BOARD_EARLY_INIT()
@@ -106,6 +110,7 @@ typedef struct _boardctrl_state_t {
     bool log_soft_reset;
 } boardctrl_state_t;
 
+void boardctrl_maybe_enter_mboot(size_t n_args, const void *args);
 void boardctrl_before_soft_reset_loop(boardctrl_state_t *state);
 void boardctrl_top_soft_reset_loop(boardctrl_state_t *state);
 int boardctrl_run_boot_py(boardctrl_state_t *state);
diff --git a/ports/stm32/modmachine.c b/ports/stm32/modmachine.c
index 91061a3109b9b..34e78d26167fc 100644
--- a/ports/stm32/modmachine.c
+++ b/ports/stm32/modmachine.c
@@ -30,7 +30,6 @@
 #include "modmachine.h"
 #include "py/gc.h"
 #include "py/runtime.h"
-#include "py/objstr.h"
 #include "py/mperrno.h"
 #include "py/mphal.h"
 #include "extmod/machine_bitstream.h"
@@ -283,22 +282,6 @@ NORETURN mp_obj_t machine_bootloader(size_t n_args, const mp_obj_t *args) {
 
     MICROPY_BOARD_ENTER_BOOTLOADER(n_args, args);
 
-    #if MICROPY_HW_USES_BOOTLOADER
-    if (n_args == 0 || !mp_obj_is_true(args[0])) {
-        // By default, with no args given, we enter the custom bootloader (mboot)
-        powerctrl_enter_bootloader(0x70ad0000, MBOOT_VTOR);
-    }
-
-    if (n_args == 1 && mp_obj_is_str_or_bytes(args[0])) {
-        // With a string/bytes given, pass its data to the custom bootloader
-        size_t len;
-        const char *data = mp_obj_str_get_data(args[0], &len);
-        void *mboot_region = (void *)*((volatile uint32_t *)MBOOT_VTOR);
-        memmove(mboot_region, data, len);
-        powerctrl_enter_bootloader(0x70ad0080, MBOOT_VTOR);
-    }
-    #endif
-
     #if defined(STM32F7) || defined(STM32H7)
     powerctrl_enter_bootloader(0, 0x1ff00000);
     #else

From dea1ba33090589a195d9a6e83ff40bb7ec70d752 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 17 Jun 2022 14:57:58 +1000
Subject: [PATCH 2207/3533] tools/metrics.py: Add mimxrt and renesas-ra to list
 of available ports.

Signed-off-by: Damien George <damien@micropython.org>
---
 tools/metrics.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tools/metrics.py b/tools/metrics.py
index c857d0733eef8..c79b998e18468 100755
--- a/tools/metrics.py
+++ b/tools/metrics.py
@@ -66,6 +66,8 @@ def __init__(self, name, dir, output, make_flags=None):
     "c": PortData("cc3200", "cc3200", "build/WIPY/release/application.axf", "BTARGET=application"),
     "8": PortData("esp8266", "esp8266", "build-GENERIC/firmware.elf"),
     "3": PortData("esp32", "esp32", "build-GENERIC/micropython.elf"),
+    "x": PortData("mimxrt", "mimxrt", "build-TEENSY40/firmware.elf"),
+    "e": PortData("renesas-ra", "renesas-ra", "build-RA6M2_EK/firmware.elf"),
     "r": PortData("nrf", "nrf", "build-pca10040/firmware.elf"),
     "p": PortData("rp2", "rp2", "build-PICO/firmware.elf"),
     "d": PortData("samd", "samd", "build-ADAFRUIT_ITSYBITSY_M4_EXPRESS/firmware.elf"),

From 49c23ac08f21ab1b412083d64b4d0a704bf8973c Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 17 Jun 2022 14:58:42 +1000
Subject: [PATCH 2208/3533] renesas-ra/machine_i2c: Remove unnecessary
 start/stop dummy functions.

The code in extmod/machine_i2c.c will check for NULL slots and raise an
appropriate exception.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/renesas-ra/machine_i2c.c | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/ports/renesas-ra/machine_i2c.c b/ports/renesas-ra/machine_i2c.c
index 5f385f363e6d4..bc1cea0cd93b8 100644
--- a/ports/renesas-ra/machine_i2c.c
+++ b/ports/renesas-ra/machine_i2c.c
@@ -150,22 +150,10 @@ STATIC int machine_i2c_transfer_single(mp_obj_base_t *self_in, uint16_t addr, si
     return ret;
 }
 
-STATIC int machine_i2c_start(mp_obj_base_t *self) {
-    mp_raise_NotImplementedError(MP_ERROR_TEXT("start is not supported."));
-    return 0;
-}
-
-STATIC int machine_i2c_stop(mp_obj_base_t *self) {
-    mp_raise_NotImplementedError(MP_ERROR_TEXT("start is not supported."));
-    return 0;
-}
-
 STATIC const mp_machine_i2c_p_t machine_i2c_p = {
     .init = machine_i2c_init,
     .transfer = mp_machine_i2c_transfer_adaptor,
     .transfer_single = machine_i2c_transfer_single,
-    .start = machine_i2c_start,
-    .stop = machine_i2c_stop,
 };
 
 const mp_obj_type_t machine_i2c_type = {

From 4fd54a475661953946e9e3c3f962b20619c82240 Mon Sep 17 00:00:00 2001
From: Maureen Helm <maureen.helm@intel.com>
Date: Mon, 23 May 2022 14:43:13 -0500
Subject: [PATCH 2209/3533] zephyr: Update include paths to use the zephyr
 namespace.

Zephyr v3.1.0 moved all public headers to include/zephyr.

Signed-off-by: Maureen Helm <maureen.helm@intel.com>
---
 ports/zephyr/machine_i2c.c        |  4 ++--
 ports/zephyr/machine_pin.c        |  4 ++--
 ports/zephyr/machine_spi.c        |  4 ++--
 ports/zephyr/machine_uart.c       |  4 ++--
 ports/zephyr/main.c               |  8 ++++----
 ports/zephyr/modmachine.c         |  2 +-
 ports/zephyr/modusocket.c         | 10 +++++-----
 ports/zephyr/modutime.c           |  2 +-
 ports/zephyr/modzephyr.c          |  8 ++++----
 ports/zephyr/modzsensor.c         |  4 ++--
 ports/zephyr/mpconfigport.h       |  4 ++--
 ports/zephyr/mphalport.h          |  2 +-
 ports/zephyr/src/zephyr_getchar.c |  8 ++++----
 ports/zephyr/src/zephyr_start.c   |  4 ++--
 ports/zephyr/uart_core.c          |  4 ++--
 ports/zephyr/zephyr_storage.c     |  4 ++--
 16 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/ports/zephyr/machine_i2c.c b/ports/zephyr/machine_i2c.c
index 86f7fd8e56bf3..9bb63229ddb5d 100644
--- a/ports/zephyr/machine_i2c.c
+++ b/ports/zephyr/machine_i2c.c
@@ -29,8 +29,8 @@
 #include <stdint.h>
 #include <string.h>
 
-#include <zephyr.h>
-#include <drivers/i2c.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/drivers/i2c.h>
 
 #include "py/runtime.h"
 #include "py/gc.h"
diff --git a/ports/zephyr/machine_pin.c b/ports/zephyr/machine_pin.c
index f9da2433c03f9..dee66a5c69de1 100644
--- a/ports/zephyr/machine_pin.c
+++ b/ports/zephyr/machine_pin.c
@@ -29,8 +29,8 @@
 #include <stdint.h>
 #include <string.h>
 
-#include <zephyr.h>
-#include <drivers/gpio.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/drivers/gpio.h>
 
 #include "py/runtime.h"
 #include "py/gc.h"
diff --git a/ports/zephyr/machine_spi.c b/ports/zephyr/machine_spi.c
index c54762aa05d65..2b0911c5917e5 100644
--- a/ports/zephyr/machine_spi.c
+++ b/ports/zephyr/machine_spi.c
@@ -28,8 +28,8 @@
 #include <stdint.h>
 #include <string.h>
 
-#include <zephyr.h>
-#include <drivers/spi.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/drivers/spi.h>
 
 #include "py/runtime.h"
 #include "py/gc.h"
diff --git a/ports/zephyr/machine_uart.c b/ports/zephyr/machine_uart.c
index 95e33bb25b864..47ca0945a5e6f 100644
--- a/ports/zephyr/machine_uart.c
+++ b/ports/zephyr/machine_uart.c
@@ -29,8 +29,8 @@
 #include <stdint.h>
 #include <string.h>
 
-#include <zephyr.h>
-#include <drivers/uart.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/drivers/uart.h>
 
 #include "py/runtime.h"
 #include "py/stream.h"
diff --git a/ports/zephyr/main.c b/ports/zephyr/main.c
index 4f735b671fff2..c638f389206e5 100644
--- a/ports/zephyr/main.c
+++ b/ports/zephyr/main.c
@@ -29,16 +29,16 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #ifdef CONFIG_NETWORKING
-#include <net/net_context.h>
+#include <zephyr/net/net_context.h>
 #endif
 
 #ifdef CONFIG_USB_DEVICE_STACK
-#include <usb/usb_device.h>
+#include <zephyr/usb/usb_device.h>
 #endif
 
-#include <storage/flash_map.h>
+#include <zephyr/storage/flash_map.h>
 
 #include "py/mperrno.h"
 #include "py/builtin.h"
diff --git a/ports/zephyr/modmachine.c b/ports/zephyr/modmachine.c
index f4b1c0849f99d..63bd3369897dd 100644
--- a/ports/zephyr/modmachine.c
+++ b/ports/zephyr/modmachine.c
@@ -28,7 +28,7 @@
 
 #include <stdint.h>
 #include <stdio.h>
-#include <sys/reboot.h>
+#include <zephyr/sys/reboot.h>
 
 #include "py/obj.h"
 #include "py/runtime.h"
diff --git a/ports/zephyr/modusocket.c b/ports/zephyr/modusocket.c
index 40d4aaac5bbf6..2b6adf4773343 100644
--- a/ports/zephyr/modusocket.c
+++ b/ports/zephyr/modusocket.c
@@ -31,14 +31,14 @@
 #include "py/stream.h"
 
 #include <stdio.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 // Zephyr's generated version header
 #include <version.h>
-#include <net/net_context.h>
-#include <net/net_pkt.h>
-#include <net/dns_resolve.h>
+#include <zephyr/net/net_context.h>
+#include <zephyr/net/net_pkt.h>
+#include <zephyr/net/dns_resolve.h>
 #ifdef CONFIG_NET_SOCKETS
-#include <net/socket.h>
+#include <zephyr/net/socket.h>
 #endif
 
 #define DEBUG_PRINT 0
diff --git a/ports/zephyr/modutime.c b/ports/zephyr/modutime.c
index 16ac9af6ee80e..c1c2be1c07c75 100644
--- a/ports/zephyr/modutime.c
+++ b/ports/zephyr/modutime.c
@@ -28,7 +28,7 @@
 #include "py/mpconfig.h"
 #if MICROPY_PY_UTIME
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 
 #include "py/runtime.h"
 #include "py/smallint.h"
diff --git a/ports/zephyr/modzephyr.c b/ports/zephyr/modzephyr.c
index 541dfe0b309a2..f87e2e33f3c78 100644
--- a/ports/zephyr/modzephyr.c
+++ b/ports/zephyr/modzephyr.c
@@ -29,10 +29,10 @@
 #if MICROPY_PY_ZEPHYR
 
 #include <stdio.h>
-#include <zephyr.h>
-#include <debug/thread_analyzer.h>
-#include <shell/shell.h>
-#include <shell/shell_uart.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/debug/thread_analyzer.h>
+#include <zephyr/shell/shell.h>
+#include <zephyr/shell/shell_uart.h>
 
 #include "modzephyr.h"
 #include "py/runtime.h"
diff --git a/ports/zephyr/modzsensor.c b/ports/zephyr/modzsensor.c
index 6e8a5ca07442d..ba6717046fa42 100644
--- a/ports/zephyr/modzsensor.c
+++ b/ports/zephyr/modzsensor.c
@@ -28,8 +28,8 @@
 
 #include "py/runtime.h"
 
-#include <zephyr.h>
-#include <drivers/sensor.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/drivers/sensor.h>
 
 #if MICROPY_PY_ZSENSOR
 
diff --git a/ports/zephyr/mpconfigport.h b/ports/zephyr/mpconfigport.h
index 44231e1fc8813..26610ccced45c 100644
--- a/ports/zephyr/mpconfigport.h
+++ b/ports/zephyr/mpconfigport.h
@@ -28,8 +28,8 @@
 // Include Zephyr's autoconf.h, which should be made first by Zephyr makefiles
 #include "autoconf.h"
 // Included here to get basic Zephyr environment (macros, etc.)
-#include <zephyr.h>
-#include <drivers/spi.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/drivers/spi.h>
 
 // Usually passed from Makefile
 #ifndef MICROPY_HEAP_SIZE
diff --git a/ports/zephyr/mphalport.h b/ports/zephyr/mphalport.h
index ffe68da246a36..615859391167a 100644
--- a/ports/zephyr/mphalport.h
+++ b/ports/zephyr/mphalport.h
@@ -1,4 +1,4 @@
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 #include "shared/runtime/interrupt_char.h"
 
 void mp_hal_init(void);
diff --git a/ports/zephyr/src/zephyr_getchar.c b/ports/zephyr/src/zephyr_getchar.c
index 218fb18646345..5bbf1a9f68e7d 100644
--- a/ports/zephyr/src/zephyr_getchar.c
+++ b/ports/zephyr/src/zephyr_getchar.c
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-#include <zephyr.h>
-#include <drivers/uart.h>
-#include <drivers/console/uart_console.h>
-#include <sys/printk.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/drivers/uart.h>
+#include <zephyr/drivers/console/uart_console.h>
+#include <zephyr/sys/printk.h>
 #include "zephyr_getchar.h"
 
 extern int mp_interrupt_char;
diff --git a/ports/zephyr/src/zephyr_start.c b/ports/zephyr/src/zephyr_start.c
index 7806eeeea32e9..b24e501c33363 100644
--- a/ports/zephyr/src/zephyr_start.c
+++ b/ports/zephyr/src/zephyr_start.c
@@ -23,8 +23,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#include <zephyr.h>
-#include <console/console.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/console/console.h>
 #include "zephyr_getchar.h"
 
 int real_main(void);
diff --git a/ports/zephyr/uart_core.c b/ports/zephyr/uart_core.c
index 1313a51ae20f3..1d37f220935c1 100644
--- a/ports/zephyr/uart_core.c
+++ b/ports/zephyr/uart_core.c
@@ -27,8 +27,8 @@
 #include "py/mpconfig.h"
 #include "src/zephyr_getchar.h"
 // Zephyr headers
-#include <drivers/uart.h>
-#include <console/console.h>
+#include <zephyr/drivers/uart.h>
+#include <zephyr/console/console.h>
 
 /*
  * Core UART functions to implement for a port
diff --git a/ports/zephyr/zephyr_storage.c b/ports/zephyr/zephyr_storage.c
index 2761dcba801cb..1179c3fda809b 100644
--- a/ports/zephyr/zephyr_storage.c
+++ b/ports/zephyr/zephyr_storage.c
@@ -32,11 +32,11 @@
 #endif
 
 #ifdef CONFIG_DISK_ACCESS
-#include <storage/disk_access.h>
+#include <zephyr/storage/disk_access.h>
 #endif
 
 #ifdef CONFIG_FLASH_MAP
-#include <storage/flash_map.h>
+#include <zephyr/storage/flash_map.h>
 #endif
 
 #ifdef CONFIG_DISK_ACCESS

From bada8b3cada2990d73e6402b029cfb699f3d9438 Mon Sep 17 00:00:00 2001
From: Maureen Helm <maureen.helm@intel.com>
Date: Thu, 16 Jun 2022 13:51:09 -0500
Subject: [PATCH 2210/3533] zephyr: Upgrade to Zephyr v3.1.0.

Updates the Zephyr port build instructions and CI to use the latest Zephyr
release tag.

Tested on frdm_k64f.

Signed-off-by: Maureen Helm <maureen.helm@intel.com>
---
 docs/zephyr/tutorial/repl.rst | 4 ++--
 ports/zephyr/README.md        | 6 +++---
 tools/ci.sh                   | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/docs/zephyr/tutorial/repl.rst b/docs/zephyr/tutorial/repl.rst
index 6e11c04cb3a0a..8cd57c9435bf4 100644
--- a/docs/zephyr/tutorial/repl.rst
+++ b/docs/zephyr/tutorial/repl.rst
@@ -31,8 +31,8 @@ With your serial program open (PuTTY, screen, picocom, etc) you may see a
 blank screen with a flashing cursor. Press Enter (or reset the board) and
 you should be presented with the following text::
 
-        *** Booting Zephyr OS build zephyr-v3.0.0  ***
-        MicroPython v1.18-169-g665f0e2a6-dirty on 2022-03-02; zephyr-frdm_k64f with mk64f12
+        *** Booting Zephyr OS build zephyr-v3.1.0  ***
+        MicroPython v1.19.1-9-g4fd54a475 on 2022-06-17; zephyr-frdm_k64f with mk64f12
         Type "help()" for more information.
         >>>
 
diff --git a/ports/zephyr/README.md b/ports/zephyr/README.md
index 6b2b54fa29ca7..f9bd45344b322 100644
--- a/ports/zephyr/README.md
+++ b/ports/zephyr/README.md
@@ -4,7 +4,7 @@ MicroPython port to Zephyr RTOS
 This is a work-in-progress port of MicroPython to Zephyr RTOS
 (http://zephyrproject.org).
 
-This port requires Zephyr version v3.0.0, and may also work on higher
+This port requires Zephyr version v3.1.0, and may also work on higher
 versions.  All boards supported
 by Zephyr (with standard level of features support, like UART console)
 should work with MicroPython (but not all were tested).
@@ -39,13 +39,13 @@ setup is correct.
 If you already have Zephyr installed but are having issues building the
 MicroPython port then try installing the correct version of Zephyr via:
 
-    $ west init zephyrproject -m https://github.com/zephyrproject-rtos/zephyr --mr v3.0.0
+    $ west init zephyrproject -m https://github.com/zephyrproject-rtos/zephyr --mr v3.1.0
 
 Alternatively, you don't have to redo the Zephyr installation to just
 switch from master to a tagged release, you can instead do:
 
     $ cd zephyrproject/zephyr
-    $ git checkout v3.0.0
+    $ git checkout v3.1.0
     $ west update
 
 With Zephyr installed you may then need to configure your environment,
diff --git a/tools/ci.sh b/tools/ci.sh
index f92db66d700d1..5d9f8d479385c 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -670,7 +670,7 @@ function ci_windows_build {
 
 ZEPHYR_DOCKER_VERSION=v0.21.0
 ZEPHYR_SDK_VERSION=0.13.2
-ZEPHYR_VERSION=v3.0.0
+ZEPHYR_VERSION=v3.1.0
 
 function ci_zephyr_setup {
     docker pull zephyrprojectrtos/ci:${ZEPHYR_DOCKER_VERSION}

From 17f0297c1ac274b4e9f1040e8282a592715e8cb8 Mon Sep 17 00:00:00 2001
From: David Lechner <david@pybricks.com>
Date: Wed, 8 Jun 2022 11:32:17 -0500
Subject: [PATCH 2211/3533] tools/ci.sh: Drop ppa requirement for code
 formatting CI.

The CI scripts were using a PPA to get a backported version of uncrustify
on Ubuntu 20.04.  However, this causes CI to intermittently fail due to
connection issues to launchpad.net or the key server.

Ubuntu 22.04 has a newer version of uncrustify removing the need for the
PPA.  Ubuntu 22.04 is now in beta on GitHub actions, so it can be used.

Signed-off-by: David Lechner <david@pybricks.com>
---
 .github/workflows/code_formatting.yml | 2 +-
 tools/ci.sh                           | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/code_formatting.yml b/.github/workflows/code_formatting.yml
index aab347d78e97d..5c0196d2edbfa 100644
--- a/.github/workflows/code_formatting.yml
+++ b/.github/workflows/code_formatting.yml
@@ -4,7 +4,7 @@ on: [push, pull_request]
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
     - uses: actions/checkout@v2
     - uses: actions/setup-python@v1
diff --git a/tools/ci.sh b/tools/ci.sh
index 5d9f8d479385c..6c3914b1449d2 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -18,7 +18,6 @@ function ci_gcc_arm_setup {
 # code formatting
 
 function ci_code_formatting_setup {
-    sudo apt-add-repository --yes --update ppa:pybricks/ppa
     sudo apt-get install uncrustify
     pip3 install black
     uncrustify --version

From fdbca3c1435910b23ad96d751a226f27e24b5aee Mon Sep 17 00:00:00 2001
From: chrismas9 <c.mason@inchipdesign.com.au>
Date: Mon, 13 Jun 2022 21:31:16 +1000
Subject: [PATCH 2212/3533] stm32/boards/stm32f091xc.ld: Allocate space for a
 small filesystem.

Signed-off-by: Chris Mason <c.mason@inchipdesign.com.au>
---
 ports/stm32/boards/stm32f091xc.ld | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/ports/stm32/boards/stm32f091xc.ld b/ports/stm32/boards/stm32f091xc.ld
index 5bcc4c7275de6..a8f0d3316ebf6 100644
--- a/ports/stm32/boards/stm32f091xc.ld
+++ b/ports/stm32/boards/stm32f091xc.ld
@@ -5,8 +5,8 @@
 /* Specify the memory areas */
 MEMORY
 {
-    FLASH (rx)      : ORIGIN = 0x08000000, LENGTH = 256K
-    FLASH_TEXT (rx) : ORIGIN = 0x08000000, LENGTH = 256K
+    FLASH (rx)      : ORIGIN = 0x08000000, LENGTH = 236K /* sectors 0-117 */
+    FLASH_FS (r)    : ORIGIN = 0x0803B000, LENGTH = 20K /* sectors 118-127 */
     RAM (xrw)       : ORIGIN = 0x20000000, LENGTH = 32K
 }
 
@@ -14,13 +14,21 @@ MEMORY
 _minimum_stack_size = 2K;
 _minimum_heap_size = 16K;
 
-/* Define the stack.  The stack is full descending so begins just above last byte above last byte
-   of RAM.  Note that EABI requires the stack to be 8-byte aligned for a call. */
-_estack = ORIGIN(RAM) + LENGTH(RAM) - _estack_reserve;
-_sstack = _estack - 6K; /* tunable */
+/* Define the stack.  The stack is full descending so begins just above last byte of RAM,
+   or bottom of FS cache.  Note that EABI requires the stack to be 8-byte aligned for a call. */
 
 /* RAM extents for the garbage collector */
 _ram_start = ORIGIN(RAM);
 _ram_end = ORIGIN(RAM) + LENGTH(RAM);
+
+_micropy_hw_internal_flash_storage_ram_cache_end = _ram_end;
+_micropy_hw_internal_flash_storage_ram_cache_start = _micropy_hw_internal_flash_storage_ram_cache_end - 2K; /* fs cache = 2K */
+
+_estack = _micropy_hw_internal_flash_storage_ram_cache_start - _estack_reserve;
+_sstack = _estack - 6K; /* tunable */
+
 _heap_start = _ebss; /* heap starts just after statically allocated memory */
 _heap_end = _sstack;
+
+_micropy_hw_internal_flash_storage_start = ORIGIN(FLASH_FS);
+_micropy_hw_internal_flash_storage_end   = ORIGIN(FLASH_FS) + LENGTH(FLASH_FS);

From 868f23b362171ee131bd6bfa784911fb8fc66202 Mon Sep 17 00:00:00 2001
From: chrismas9 <c.mason@inchipdesign.com.au>
Date: Mon, 13 Jun 2022 21:33:55 +1000
Subject: [PATCH 2213/3533] stm32/boards/NUCLEO_F091RC: Enable LFS1 filesystem.

And disable some less common features to make space for it.

Signed-off-by: Chris Mason <c.mason@inchipdesign.com.au>
---
 ports/stm32/boards/NUCLEO_F091RC/mpconfigboard.h  | 6 +++++-
 ports/stm32/boards/NUCLEO_F091RC/mpconfigboard.mk | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ports/stm32/boards/NUCLEO_F091RC/mpconfigboard.h b/ports/stm32/boards/NUCLEO_F091RC/mpconfigboard.h
index 38fcb2f28e336..a68b939939c17 100644
--- a/ports/stm32/boards/NUCLEO_F091RC/mpconfigboard.h
+++ b/ports/stm32/boards/NUCLEO_F091RC/mpconfigboard.h
@@ -4,17 +4,21 @@
 #define MICROPY_EMIT_THUMB          (0)
 #define MICROPY_EMIT_INLINE_THUMB   (0)
 #define MICROPY_OPT_COMPUTED_GOTO   (0)
+#define MICROPY_PY_BUILTINS_COMPLEX (0)
 #define MICROPY_PY_IO_FILEIO        (0)
 #define MICROPY_PY_USOCKET          (0)
 #define MICROPY_PY_NETWORK          (0)
 #define MICROPY_PY_STM              (0)
 #define MICROPY_PY_PYB_LEGACY       (0)
+#define MICROPY_PY_UHEAPQ           (0)
+#define MICROPY_PY_UTIMEQ           (0)
+#define MICROPY_PY_FRAMEBUF         (0)
 
-#define MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE (0)
 #define MICROPY_HW_ENABLE_RTC       (1)
 #define MICROPY_HW_ENABLE_ADC       (1)
 #define MICROPY_HW_ENABLE_DAC       (1)
 #define MICROPY_HW_HAS_SWITCH       (1)
+#define MICROPY_HW_HAS_FLASH        (1)
 
 // For system clock, enable one source:
 // #define MICROPY_HW_CLK_USE_HSI      (1) // internal 8MHz -> PLL = 48MHz.
diff --git a/ports/stm32/boards/NUCLEO_F091RC/mpconfigboard.mk b/ports/stm32/boards/NUCLEO_F091RC/mpconfigboard.mk
index 984fe2f900540..4416188816f4f 100644
--- a/ports/stm32/boards/NUCLEO_F091RC/mpconfigboard.mk
+++ b/ports/stm32/boards/NUCLEO_F091RC/mpconfigboard.mk
@@ -5,6 +5,7 @@ LD_FILES = boards/stm32f091xc.ld boards/common_basic.ld
 
 # MicroPython settings
 MICROPY_VFS_FAT = 0
+MICROPY_VFS_LFS1 ?= 1
 
 # Don't include default frozen modules because MCU is tight on flash space
 FROZEN_MANIFEST ?=

From c502cf73e0e0df685723a828ecac1562e3be1cf0 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Sat, 4 Jun 2022 12:07:30 +0200
Subject: [PATCH 2214/3533] extmod/network_cyw43: Rename WLAN keyword args to
 ssid/security/key.

Rename WLAN keyword args to scan(), connect() and config() to be more
consistent across ports and WLAN drivers.  This change is backwards
compatible and will support obsolete keyword args, except for positional
"essid" which is now deprecated in favor of "ssid".

The changed argument names are
- "essid" changed to "ssid"
- "auth" or "authmode" changed to "security"
- "password" changed to "key"

Addresses issue #8083.
---
 extmod/network_cyw43.c | 30 +++++++++++++++++++++++-------
 1 file changed, 23 insertions(+), 7 deletions(-)

diff --git a/extmod/network_cyw43.c b/extmod/network_cyw43.c
index d2383c7187358..ea2fbbd45ea52 100644
--- a/extmod/network_cyw43.c
+++ b/extmod/network_cyw43.c
@@ -163,9 +163,10 @@ STATIC int network_cyw43_scan_cb(void *env, const cyw43_ev_scan_result_t *res) {
 }
 
 STATIC mp_obj_t network_cyw43_scan(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
-    enum { ARG_passive, ARG_essid, ARG_bssid };
+    enum { ARG_passive, ARG_ssid, ARG_essid, ARG_bssid };
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_passive, MP_ARG_KW_ONLY | MP_ARG_BOOL, {.u_bool = false} },
+        { MP_QSTR_ssid, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
         { MP_QSTR_essid, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
         { MP_QSTR_bssid, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
     };
@@ -174,13 +175,18 @@ STATIC mp_obj_t network_cyw43_scan(size_t n_args, const mp_obj_t *pos_args, mp_m
     mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
     mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
 
+    // Deprecated kwarg
+    if (args[ARG_essid].u_obj != mp_const_none) {
+        args[ARG_ssid].u_obj = args[ARG_essid].u_obj;
+    }
+
     cyw43_wifi_scan_options_t opts;
     opts.scan_type = args[ARG_passive].u_bool ? 1 : 0;
-    if (args[ARG_essid].u_obj == mp_const_none) {
+    if (args[ARG_ssid].u_obj == mp_const_none) {
         opts.ssid_len = 0;
     } else {
         mp_buffer_info_t ssid;
-        mp_get_buffer_raise(args[ARG_essid].u_obj, &ssid, MP_BUFFER_READ);
+        mp_get_buffer_raise(args[ARG_ssid].u_obj, &ssid, MP_BUFFER_READ);
         opts.ssid_len = MIN(ssid.len, sizeof(opts.ssid));
         memcpy(opts.ssid, ssid.buf, opts.ssid_len);
     }
@@ -210,11 +216,12 @@ STATIC mp_obj_t network_cyw43_scan(size_t n_args, const mp_obj_t *pos_args, mp_m
 STATIC MP_DEFINE_CONST_FUN_OBJ_KW(network_cyw43_scan_obj, 1, network_cyw43_scan);
 
 STATIC mp_obj_t network_cyw43_connect(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
-    enum { ARG_essid, ARG_key, ARG_auth, ARG_bssid, ARG_channel };
+    enum { ARG_ssid, ARG_key, ARG_auth, ARG_security, ARG_bssid, ARG_channel };
     static const mp_arg_t allowed_args[] = {
-        { MP_QSTR_essid, MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
+        { MP_QSTR_ssid, MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
         { MP_QSTR_key, MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
         { MP_QSTR_auth, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} },
+        { MP_QSTR_security, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} },
         { MP_QSTR_bssid, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
         { MP_QSTR_channel, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} },
     };
@@ -223,8 +230,13 @@ STATIC mp_obj_t network_cyw43_connect(size_t n_args, const mp_obj_t *pos_args, m
     mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
     mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
 
+    // Deprecated kwarg
+    if (args[ARG_auth].u_int != -1) {
+        args[ARG_security] = args[ARG_auth];
+    }
+
     mp_buffer_info_t ssid;
-    mp_get_buffer_raise(args[ARG_essid].u_obj, &ssid, MP_BUFFER_READ);
+    mp_get_buffer_raise(args[ARG_ssid].u_obj, &ssid, MP_BUFFER_READ);
     mp_buffer_info_t key;
     key.buf = NULL;
     if (args[ARG_key].u_obj != mp_const_none) {
@@ -238,7 +250,8 @@ STATIC mp_obj_t network_cyw43_connect(size_t n_args, const mp_obj_t *pos_args, m
             mp_raise_ValueError(NULL);
         }
     }
-    int ret = cyw43_wifi_join(self->cyw, ssid.len, ssid.buf, key.len, key.buf, args[ARG_auth].u_int, bssid.buf, args[ARG_channel].u_int);
+    int ret = cyw43_wifi_join(self->cyw, ssid.len, ssid.buf, key.len, key.buf,
+        args[ARG_security].u_int, bssid.buf, args[ARG_channel].u_int);
     if (ret != 0) {
         mp_raise_OSError(-ret);
     }
@@ -330,6 +343,7 @@ STATIC mp_obj_t network_cyw43_config(size_t n_args, const mp_obj_t *args, mp_map
                 cyw43_ioctl(self->cyw, CYW43_IOCTL_GET_CHANNEL, 4, buf, self->itf);
                 return MP_OBJ_NEW_SMALL_INT(nw_get_le32(buf));
             }
+            case MP_QSTR_ssid:
             case MP_QSTR_essid: {
                 if (self->itf == CYW43_ITF_STA) {
                     uint8_t buf[36];
@@ -376,6 +390,7 @@ STATIC mp_obj_t network_cyw43_config(size_t n_args, const mp_obj_t *args, mp_map
                         cyw43_wifi_ap_set_channel(self->cyw, mp_obj_get_int(e->value));
                         break;
                     }
+                    case MP_QSTR_ssid:
                     case MP_QSTR_essid: {
                         size_t len;
                         const char *str = mp_obj_str_get_data(e->value, &len);
@@ -397,6 +412,7 @@ STATIC mp_obj_t network_cyw43_config(size_t n_args, const mp_obj_t *args, mp_map
                         }
                         break;
                     }
+                    case MP_QSTR_key:
                     case MP_QSTR_password: {
                         size_t len;
                         const char *str = mp_obj_str_get_data(e->value, &len);

From efa73ca8339a9ef67e8640c58c39ddac973c4744 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Fri, 17 Jun 2022 11:58:18 +0200
Subject: [PATCH 2215/3533] extmod/network_ninaw10: Rename WLAN connect
 argument from essid to ssid.

Addresses issue #8083.
---
 extmod/network_ninaw10.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/extmod/network_ninaw10.c b/extmod/network_ninaw10.c
index 6921ed3f27618..622e29ba68431 100644
--- a/extmod/network_ninaw10.c
+++ b/extmod/network_ninaw10.c
@@ -196,9 +196,9 @@ STATIC mp_obj_t network_ninaw10_scan(mp_obj_t self_in) {
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(network_ninaw10_scan_obj, network_ninaw10_scan);
 
 STATIC mp_obj_t network_ninaw10_connect(mp_uint_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
-    enum { ARG_essid, ARG_key, ARG_security, ARG_channel };
+    enum { ARG_ssid, ARG_key, ARG_security, ARG_channel };
     static const mp_arg_t allowed_args[] = {
-        { MP_QSTR_essid,    MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
+        { MP_QSTR_ssid,     MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
         { MP_QSTR_key,      MP_ARG_OBJ, {.u_obj = mp_const_none} },
         { MP_QSTR_security, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = NINA_SEC_WPA_PSK} },
         { MP_QSTR_channel,  MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 1} },
@@ -210,7 +210,7 @@ STATIC mp_obj_t network_ninaw10_connect(mp_uint_t n_args, const mp_obj_t *pos_ar
     mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
 
     // get ssid
-    const char *ssid = mp_obj_str_get_str(args[ARG_essid].u_obj);
+    const char *ssid = mp_obj_str_get_str(args[ARG_ssid].u_obj);
 
     if (strlen(ssid) == 0) {
         mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("SSID can't be empty!"));
@@ -304,7 +304,7 @@ STATIC mp_obj_t network_ninaw10_config(size_t n_args, const mp_obj_t *args, mp_m
         }
 
         switch (mp_obj_str_get_qstr(args[1])) {
-            case MP_QSTR_essid: {
+            case MP_QSTR_ssid: {
                 nina_netinfo_t netinfo;
                 nina_netinfo(&netinfo);
                 return mp_obj_new_str(netinfo.ssid, strlen(netinfo.ssid));

From a7c7febe0ba939e1f3b06920d590d317c9100ae9 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Sat, 4 Jun 2022 12:22:55 +0200
Subject: [PATCH 2216/3533] esp32/network_wlan: Rename WLAN keyword args to
 ssid/security/key.

The WLAN.config() method now supports "ssid", "security" and "key" as
aliases to the existing "essid", "authmode" and "password", which are now
deprecated.

Addresses issue #8083.
---
 ports/esp32/network_wlan.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/ports/esp32/network_wlan.c b/ports/esp32/network_wlan.c
index 58c898d9a46ef..91099419eccf7 100644
--- a/ports/esp32/network_wlan.c
+++ b/ports/esp32/network_wlan.c
@@ -218,7 +218,7 @@ STATIC mp_obj_t network_wlan_active(size_t n_args, const mp_obj_t *args) {
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(network_wlan_active_obj, 1, 2, network_wlan_active);
 
 STATIC mp_obj_t network_wlan_connect(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
-    enum { ARG_ssid, ARG_password, ARG_bssid };
+    enum { ARG_ssid, ARG_key, ARG_bssid };
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_, MP_ARG_OBJ, {.u_obj = mp_const_none} },
         { MP_QSTR_, MP_ARG_OBJ, {.u_obj = mp_const_none} },
@@ -239,8 +239,8 @@ STATIC mp_obj_t network_wlan_connect(size_t n_args, const mp_obj_t *pos_args, mp
             p = mp_obj_str_get_data(args[ARG_ssid].u_obj, &len);
             memcpy(wifi_sta_config.sta.ssid, p, MIN(len, sizeof(wifi_sta_config.sta.ssid)));
         }
-        if (args[ARG_password].u_obj != mp_const_none) {
-            p = mp_obj_str_get_data(args[ARG_password].u_obj, &len);
+        if (args[ARG_key].u_obj != mp_const_none) {
+            p = mp_obj_str_get_data(args[ARG_key].u_obj, &len);
             memcpy(wifi_sta_config.sta.password, p, MIN(len, sizeof(wifi_sta_config.sta.password)));
         }
         if (args[ARG_bssid].u_obj != mp_const_none) {
@@ -410,6 +410,7 @@ STATIC mp_obj_t network_wlan_config(size_t n_args, const mp_obj_t *args, mp_map_
                         esp_exceptions(esp_wifi_set_mac(self->if_id, bufinfo.buf));
                         break;
                     }
+                    case MP_QSTR_ssid:
                     case MP_QSTR_essid: {
                         req_if = WIFI_IF_AP;
                         size_t len;
@@ -424,11 +425,13 @@ STATIC mp_obj_t network_wlan_config(size_t n_args, const mp_obj_t *args, mp_map_
                         cfg.ap.ssid_hidden = mp_obj_is_true(kwargs->table[i].value);
                         break;
                     }
+                    case MP_QSTR_security:
                     case MP_QSTR_authmode: {
                         req_if = WIFI_IF_AP;
                         cfg.ap.authmode = mp_obj_get_int(kwargs->table[i].value);
                         break;
                     }
+                    case MP_QSTR_key:
                     case MP_QSTR_password: {
                         req_if = WIFI_IF_AP;
                         size_t len;
@@ -503,6 +506,7 @@ STATIC mp_obj_t network_wlan_config(size_t n_args, const mp_obj_t *args, mp_map_
                     goto unknown;
             }
         }
+        case MP_QSTR_ssid:
         case MP_QSTR_essid:
             switch (self->if_id) {
                 case WIFI_IF_STA:
@@ -519,6 +523,7 @@ STATIC mp_obj_t network_wlan_config(size_t n_args, const mp_obj_t *args, mp_map_
             req_if = WIFI_IF_AP;
             val = mp_obj_new_bool(cfg.ap.ssid_hidden);
             break;
+        case MP_QSTR_security:
         case MP_QSTR_authmode:
             req_if = WIFI_IF_AP;
             val = MP_OBJ_NEW_SMALL_INT(cfg.ap.authmode);

From 82b8a2d193657f67cf7a301acc5804b946d662ad Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Sat, 4 Jun 2022 12:29:56 +0200
Subject: [PATCH 2217/3533] esp8266/modnetwork: Rename WLAN keyword args to
 ssid/security/key.

The WLAN.config() method now supports "ssid", "security" and "key" as
aliases to the existing "essid", "authmode" and "password", which are now
deprecated.  The help text and setup helper are also updated.

Addresses issue #8083.
---
 ports/esp8266/help.c              |  4 ++--
 ports/esp8266/modnetwork.c        | 11 ++++++++---
 ports/esp8266/modules/inisetup.py |  4 ++--
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/ports/esp8266/help.c b/ports/esp8266/help.c
index 4dd586c1a8bbe..a755a10a76173 100644
--- a/ports/esp8266/help.c
+++ b/ports/esp8266/help.c
@@ -37,11 +37,11 @@ const char esp_help_text[] =
     "import network\n"
     "sta_if = network.WLAN(network.STA_IF); sta_if.active(True)\n"
     "sta_if.scan()                             # Scan for available access points\n"
-    "sta_if.connect(\"<AP_name>\", \"<password>\") # Connect to an AP\n"
+    "sta_if.connect(\"<AP_name>\", \"<key>\") # Connect to an AP\n"
     "sta_if.isconnected()                      # Check for successful connection\n"
     "# Change name/password of ESP8266's AP:\n"
     "ap_if = network.WLAN(network.AP_IF)\n"
-    "ap_if.config(essid=\"<AP_NAME>\", authmode=network.AUTH_WPA_WPA2_PSK, password=\"<password>\")\n"
+    "ap_if.config(ssid=\"<AP_NAME>\", security=network.AUTH_WPA_WPA2_PSK, key=\"<key>\")\n"
     "\n"
     "Control commands:\n"
     "  CTRL-A        -- on a blank line, enter raw REPL mode\n"
diff --git a/ports/esp8266/modnetwork.c b/ports/esp8266/modnetwork.c
index dc1b435fb98c1..e32a0ff0c9176 100644
--- a/ports/esp8266/modnetwork.c
+++ b/ports/esp8266/modnetwork.c
@@ -109,7 +109,7 @@ STATIC mp_obj_t esp_active(size_t n_args, const mp_obj_t *args) {
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(esp_active_obj, 1, 2, esp_active);
 
 STATIC mp_obj_t esp_connect(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
-    enum { ARG_ssid, ARG_password, ARG_bssid };
+    enum { ARG_ssid, ARG_key, ARG_bssid };
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_, MP_ARG_OBJ, {.u_obj = mp_const_none} },
         { MP_QSTR_, MP_ARG_OBJ, {.u_obj = mp_const_none} },
@@ -133,8 +133,8 @@ STATIC mp_obj_t esp_connect(size_t n_args, const mp_obj_t *pos_args, mp_map_t *k
         memcpy(config.ssid, p, len);
         set_config = true;
     }
-    if (args[ARG_password].u_obj != mp_const_none) {
-        p = mp_obj_str_get_data(args[ARG_password].u_obj, &len);
+    if (args[ARG_key].u_obj != mp_const_none) {
+        p = mp_obj_str_get_data(args[ARG_key].u_obj, &len);
         len = MIN(len, sizeof(config.password));
         memcpy(config.password, p, len);
         set_config = true;
@@ -361,6 +361,7 @@ STATIC mp_obj_t esp_config(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs
                         wifi_set_macaddr(self->if_id, bufinfo.buf);
                         break;
                     }
+                    case MP_QSTR_ssid:
                     case MP_QSTR_essid: {
                         req_if = SOFTAP_IF;
                         size_t len;
@@ -375,11 +376,13 @@ STATIC mp_obj_t esp_config(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs
                         cfg.ap.ssid_hidden = mp_obj_is_true(kwargs->table[i].value);
                         break;
                     }
+                    case MP_QSTR_security:
                     case MP_QSTR_authmode: {
                         req_if = SOFTAP_IF;
                         cfg.ap.authmode = mp_obj_get_int(kwargs->table[i].value);
                         break;
                     }
+                    case MP_QSTR_key:
                     case MP_QSTR_password: {
                         req_if = SOFTAP_IF;
                         size_t len;
@@ -437,6 +440,7 @@ STATIC mp_obj_t esp_config(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs
             wifi_get_macaddr(self->if_id, mac);
             return mp_obj_new_bytes(mac, sizeof(mac));
         }
+        case MP_QSTR_ssid:
         case MP_QSTR_essid:
             if (self->if_id == STATION_IF) {
                 val = mp_obj_new_str((char *)cfg.sta.ssid, strlen((char *)cfg.sta.ssid));
@@ -448,6 +452,7 @@ STATIC mp_obj_t esp_config(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs
             req_if = SOFTAP_IF;
             val = mp_obj_new_bool(cfg.ap.ssid_hidden);
             break;
+        case MP_QSTR_security:
         case MP_QSTR_authmode:
             req_if = SOFTAP_IF;
             val = MP_OBJ_NEW_SMALL_INT(cfg.ap.authmode);
diff --git a/ports/esp8266/modules/inisetup.py b/ports/esp8266/modules/inisetup.py
index 9500b8048c9d8..e5ce00138eccb 100644
--- a/ports/esp8266/modules/inisetup.py
+++ b/ports/esp8266/modules/inisetup.py
@@ -7,8 +7,8 @@ def wifi():
     import ubinascii
 
     ap_if = network.WLAN(network.AP_IF)
-    essid = b"MicroPython-%s" % ubinascii.hexlify(ap_if.config("mac")[-3:])
-    ap_if.config(essid=essid, authmode=network.AUTH_WPA_WPA2_PSK, password=b"micropythoN")
+    ssid = b"MicroPython-%s" % ubinascii.hexlify(ap_if.config("mac")[-3:])
+    ap_if.config(ssid=ssid, security=network.AUTH_WPA_WPA2_PSK, key=b"micropythoN")
 
 
 def check_bootsec():

From 6e868d47dc5dd7a90444f1173118b7d57e1e4df7 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Sat, 4 Jun 2022 12:32:08 +0200
Subject: [PATCH 2218/3533] docs: Update to use new WLAN argument names for
 ssid/security/key.

Addresses issue #8083.
---
 docs/esp32/quickref.rst                  |  6 +++---
 docs/esp8266/quickref.rst                |  6 +++---
 docs/esp8266/tutorial/network_basics.rst |  4 ++--
 docs/library/network.WLAN.rst            | 24 ++++++++++++------------
 docs/library/network.rst                 |  8 ++++----
 5 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/docs/esp32/quickref.rst b/docs/esp32/quickref.rst
index 894508f4c200e..3cbb673c04b52 100644
--- a/docs/esp32/quickref.rst
+++ b/docs/esp32/quickref.rst
@@ -76,12 +76,12 @@ The :mod:`network` module::
     wlan.active(True)       # activate the interface
     wlan.scan()             # scan for access points
     wlan.isconnected()      # check if the station is connected to an AP
-    wlan.connect('essid', 'password') # connect to an AP
+    wlan.connect('ssid', 'key') # connect to an AP
     wlan.config('mac')      # get the interface's MAC address
     wlan.ifconfig()         # get the interface's IP/netmask/gw/DNS addresses
 
     ap = network.WLAN(network.AP_IF) # create access-point interface
-    ap.config(essid='ESP-AP') # set the ESSID of the access point
+    ap.config(ssid='ESP-AP') # set the SSID of the access point
     ap.config(max_clients=10) # set how many clients can connect to the network
     ap.active(True)         # activate the interface
 
@@ -93,7 +93,7 @@ A useful function for connecting to your local WiFi network is::
         wlan.active(True)
         if not wlan.isconnected():
             print('connecting to network...')
-            wlan.connect('essid', 'password')
+            wlan.connect('ssid', 'key')
             while not wlan.isconnected():
                 pass
         print('network config:', wlan.ifconfig())
diff --git a/docs/esp8266/quickref.rst b/docs/esp8266/quickref.rst
index 4e00a92260c25..ed2199737099a 100644
--- a/docs/esp8266/quickref.rst
+++ b/docs/esp8266/quickref.rst
@@ -57,13 +57,13 @@ The :mod:`network` module::
     wlan.active(True)       # activate the interface
     wlan.scan()             # scan for access points
     wlan.isconnected()      # check if the station is connected to an AP
-    wlan.connect('essid', 'password') # connect to an AP
+    wlan.connect('ssid', 'key') # connect to an AP
     wlan.config('mac')      # get the interface's MAC address
     wlan.ifconfig()         # get the interface's IP/netmask/gw/DNS addresses
 
     ap = network.WLAN(network.AP_IF) # create access-point interface
     ap.active(True)         # activate the interface
-    ap.config(essid='ESP-AP') # set the ESSID of the access point
+    ap.config(ssid='ESP-AP') # set the SSID of the access point
 
 A useful function for connecting to your local WiFi network is::
 
@@ -73,7 +73,7 @@ A useful function for connecting to your local WiFi network is::
         wlan.active(True)
         if not wlan.isconnected():
             print('connecting to network...')
-            wlan.connect('essid', 'password')
+            wlan.connect('ssid', 'key')
             while not wlan.isconnected():
                 pass
         print('network config:', wlan.ifconfig())
diff --git a/docs/esp8266/tutorial/network_basics.rst b/docs/esp8266/tutorial/network_basics.rst
index 95d8cba4f9fe0..dc3cd3dd5e070 100644
--- a/docs/esp8266/tutorial/network_basics.rst
+++ b/docs/esp8266/tutorial/network_basics.rst
@@ -37,7 +37,7 @@ First activate the station interface::
 
 Then connect to your WiFi network::
 
-    >>> sta_if.connect('<your ESSID>', '<your password>')
+    >>> sta_if.connect('<your SSID>', '<your key>')
 
 To check if the connection is established use::
 
@@ -61,7 +61,7 @@ connect to your WiFi network::
         if not sta_if.isconnected():
             print('connecting to network...')
             sta_if.active(True)
-            sta_if.connect('<essid>', '<password>')
+            sta_if.connect('<ssid>', '<key>')
             while not sta_if.isconnected():
                 pass
         print('network config:', sta_if.ifconfig())
diff --git a/docs/library/network.WLAN.rst b/docs/library/network.WLAN.rst
index 274681f178a0e..bc416d1c2edde 100644
--- a/docs/library/network.WLAN.rst
+++ b/docs/library/network.WLAN.rst
@@ -10,7 +10,7 @@ This class provides a driver for WiFi network processors.  Example usage::
     # enable station interface and connect to WiFi access point
     nic = network.WLAN(network.STA_IF)
     nic.active(True)
-    nic.connect('your-ssid', 'your-password')
+    nic.connect('your-ssid', 'your-key')
     # now use sockets as usual
 
 Constructors
@@ -32,9 +32,9 @@ Methods
     argument is passed. Otherwise, query current state if no argument is
     provided. Most other methods require active interface.
 
-.. method:: WLAN.connect(ssid=None, password=None, *, bssid=None)
+.. method:: WLAN.connect(ssid=None, key=None, *, bssid=None)
 
-    Connect to the specified wireless network, using the specified password.
+    Connect to the specified wireless network, using the specified key.
     If *bssid* is given then the connection will be restricted to the
     access-point with that MAC address (the *ssid* must also be specified
     in this case).
@@ -52,12 +52,12 @@ Methods
     Scanning is only possible on STA interface. Returns list of tuples with
     the information about WiFi access points:
 
-        (ssid, bssid, channel, RSSI, authmode, hidden)
+        (ssid, bssid, channel, RSSI, security, hidden)
 
     *bssid* is hardware address of an access point, in binary form, returned as
     bytes object. You can use `binascii.hexlify()` to convert it to ASCII form.
 
-    There are five values for authmode:
+    There are five values for security:
 
         * 0 -- open
         * 1 -- WEP
@@ -112,10 +112,10 @@ Methods
    multiple parameters can be set at once. For querying, parameters name should
    be quoted as a string, and only one parameter can be queries at time::
 
-    # Set WiFi access point name (formally known as ESSID) and WiFi channel
-    ap.config(essid='My AP', channel=11)
+    # Set WiFi access point name (formally known as SSID) and WiFi channel
+    ap.config(ssid='My AP', channel=11)
     # Query params one by one
-    print(ap.config('essid'))
+    print(ap.config('ssid'))
     print(ap.config('channel'))
 
    Following are commonly supported parameters (availability of a specific parameter
@@ -125,11 +125,11 @@ Methods
    Parameter      Description
    =============  ===========
    mac            MAC address (bytes)
-   essid          WiFi access point name (string)
+   ssid           WiFi access point name (string)
    channel        WiFi channel (integer)
-   hidden         Whether ESSID is hidden (boolean)
-   authmode       Authentication mode supported (enumeration, see module constants)
-   password       Access password (string)
+   hidden         Whether SSID is hidden (boolean)
+   security       Security protocol supported (enumeration, see module constants)
+   key            Access key (string)
    dhcp_hostname  The DHCP hostname to use
    reconnects     Number of reconnect attempts to make (integer, 0=none, -1=unlimited)
    txpower        Maximum transmit power in dBm (integer or float)
diff --git a/docs/library/network.rst b/docs/library/network.rst
index 361e664b548cb..6742a2e0733db 100644
--- a/docs/library/network.rst
+++ b/docs/library/network.rst
@@ -89,7 +89,7 @@ parameter should be `id`.
        network media, there are different variants of predefined/
        recommended tuple formats, among them:
 
-       * WiFi: (ssid, bssid, channel, RSSI, authmode, hidden). There
+       * WiFi: (ssid, bssid, channel, RSSI, security, hidden). There
          may be further fields, specific to a particular device.
 
        The function may accept additional keyword arguments to filter scan
@@ -133,10 +133,10 @@ parameter should be `id`.
        querying, a parameter name should be quoted as a string, and only one
        parameter can be queried at a time::
 
-        # Set WiFi access point name (formally known as ESSID) and WiFi channel
-        ap.config(essid='My AP', channel=11)
+        # Set WiFi access point name (formally known as SSID) and WiFi channel
+        ap.config(ssid='My AP', channel=11)
         # Query params one by one
-        print(ap.config('essid'))
+        print(ap.config('ssid'))
         print(ap.config('channel'))
 
 Specific network class implementations

From 794773cdf26799e1ec2441d0a97c0b2a9da20f03 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Mon, 20 Jun 2022 13:05:53 +1000
Subject: [PATCH 2219/3533] github/ISSUE_TEMPLATE: Make minor improvements to
 placeholder text.

Move the "delete placeholder" to the end, so it's not the first thing the
reader does.  And add extra text calling out "how do I?" questions.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 .github/ISSUE_TEMPLATE/bug_report.md      | 6 +++---
 .github/ISSUE_TEMPLATE/documentation.md   | 6 +++---
 .github/ISSUE_TEMPLATE/feature_request.md | 6 +++---
 .github/ISSUE_TEMPLATE/security.md        | 4 ++--
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index adddd3346834b..ac9d97041a505 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -7,9 +7,7 @@ assignees: ''
 
 ---
 
-* Remove all placeholder text below before submitting.
-
-* Please search existing issues before raising a new issue. For questions about MicroPython or for help using MicroPython, please see the MicroPython Forum -- https://forum.micropython.org/
+* Please search existing issues before raising a new issue. For questions about MicroPython or for help using MicroPython, or any sort of "how do I?" requests, please see the MicroPython Forum (https://forum.micropython.org/) or raise a documentation request instead.
 
 * In your issue, please include a clear and concise description of what the bug is, the expected output, and how to replicate it.
 
@@ -23,3 +21,5 @@ assignees: ''
  - firmware file name
  - git commit hash and port/board
  - version information shown in the REPL (hit Ctrl-B to see the startup message)
+
+* Remove all placeholder text above before submitting.
diff --git a/.github/ISSUE_TEMPLATE/documentation.md b/.github/ISSUE_TEMPLATE/documentation.md
index 84ff2ba6f18ab..c86c1ec2b8ed6 100644
--- a/.github/ISSUE_TEMPLATE/documentation.md
+++ b/.github/ISSUE_TEMPLATE/documentation.md
@@ -7,10 +7,10 @@ assignees: ''
 
 ---
 
-* Remove all placeholder text below before submitting.
-
-* Please search existing issues before raising a new issue. For questions about MicroPython or for help using MicroPython, please see the MicroPython Forum -- https://forum.micropython.org/
+* Please search existing issues before raising a new issue. For questions about MicroPython or for help using MicroPython, or any sort of "how do I?" requests, please see the MicroPython Forum -- https://forum.micropython.org/
 
 * Describe what was missing from the documentation and/or what was incorrect/incomplete.
 
 * If possible, please link to the relevant page on https://docs.micropython.org/
+
+* Remove all placeholder text above before submitting.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index 1ac2055e01598..3976699b28ed6 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -7,9 +7,7 @@ assignees: ''
 
 ---
 
-* Remove all placeholder text below before submitting.
-
-* Please search existing issues before raising a new issue. For questions about MicroPython or for help using MicroPython, please see the MicroPython Forum -- https://forum.micropython.org/
+* Please search existing issues before raising a new issue. For questions about MicroPython or for help using MicroPython, or any sort of "how do I?" requests, please see the MicroPython Forum (https://forum.micropython.org/) or raise a documentation request instead.
 
 * Describe the feature you'd like to see added to MicroPython. In particular, what does this feature enable and why is it useful. MicroPython aims to strike a balance between functionality and code size, so please consider whether this feature can be optionally enabled and whether it can be provided in other ways (e.g. pure-Python library).
 
@@ -22,3 +20,5 @@ assignees: ''
 * For drivers (e.g. for external hardware), please link to datasheets and/or existing drivers from other sources.
 
 * Who do you expect will implement the feature you are requesting? Would you be willing to sponsor this work?
+
+* Remove all placeholder text above before submitting.
diff --git a/.github/ISSUE_TEMPLATE/security.md b/.github/ISSUE_TEMPLATE/security.md
index fe60875f700e9..2bbfede6ce069 100644
--- a/.github/ISSUE_TEMPLATE/security.md
+++ b/.github/ISSUE_TEMPLATE/security.md
@@ -7,10 +7,10 @@ assignees: ''
 
 ---
 
-* Remove all placeholder text before submitting the new issue.
-
 * If you need to raise this issue privately with the MicroPython team, please email contact@micropython.org instead.
 
 * Include a clear and concise description of what the security issue is.
 
 * What does this issue allow an attacker to do?
+
+* Remove all placeholder text above before submitting.

From 0db046b67b8ed171f4898e851c3da39aab297ce9 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 17 Jun 2022 23:01:55 +1000
Subject: [PATCH 2220/3533] py/vm: Change comparison for finally handler search
 from > to >=.

The search in these cases should include all finally handlers that are
after the current ip.  If a handler starts at exactly ip then it is
considered "after" the ip.  This can happen when END_FINALLY is followed
immediately by a finally handler (from a different finally).

Consider the function:

    def f():
        try:
            return 0
        finally:
            print(1)

The current bytecode emitter generates the following code:

    00 SETUP_FINALLY 5
    02 LOAD_CONST_SMALL_INT 0
    03 RETURN_VALUE
    04 LOAD_CONST_NONE              ****
    05 LOAD_GLOBAL print
    07 LOAD_CONST_SMALL_INT 1
    08 CALL_FUNCTION n=1 nkw=0
    10 POP_TOP
    11 END_FINALLY
    12 LOAD_CONST_NONE
    13 RETURN_VALUE

The LOAD_CONST_NONE marked with **** is dead code because it follows a
RETURN_VALUE, and nothing jumps to this LOAD_CONST_NONE.  If the emitter
could remove this this dead code it would produce:

    00 SETUP_FINALLY 4
    02 LOAD_CONST_SMALL_INT 0
    03 RETURN_VALUE
    04 LOAD_GLOBAL print
    06 LOAD_CONST_SMALL_INT 1
    07 CALL_FUNCTION n=1 nkw=0
    09 POP_TOP
    10 END_FINALLY
    11 LOAD_CONST_NONE
    12 RETURN_VALUE

In this case the finally block (which starts at offset 4) immediately
follows the RETURN_VALUE.  When RETURN_VALUE executes ip will point to
offset 4 in the bytecode (because the dispatch of the opcode does *ip++)
and so the finally handler will only be found if a >= comparison is used.

It's a similar story for break/continue:

    while True:
        try:
            break
        finally:
            print(1)

Although technically in this case the > comparison still works because the
extra byte from the UNWIND_JUMP (encoding the number of exception handlers
to unwind) doesn't have a *ip++ (just a *ip) so ip remains pointing within
the UNWIND_JUMP opcode, and not at the start of the following finally
handler.  Nevertheless, the change is made to use >= for consistency with
the RETURN_VALUE change.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/vm.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/py/vm.c b/py/vm.c
index 02f8bc88c953e..5a624e91f3ebc 100644
--- a/py/vm.c
+++ b/py/vm.c
@@ -658,7 +658,7 @@ unwind_jump:;
                         assert(exc_sp >= exc_stack);
 
                         if (MP_TAGPTR_TAG1(exc_sp->val_sp)) {
-                            if (exc_sp->handler > ip) {
+                            if (exc_sp->handler >= ip) {
                                 // Found a finally handler that isn't active; run it.
                                 // Getting here the stack looks like:
                                 //     (..., X, dest_ip)
@@ -1079,7 +1079,7 @@ unwind_jump:;
                     // Search for and execute finally handlers that aren't already active
                     while (exc_sp >= exc_stack) {
                         if (MP_TAGPTR_TAG1(exc_sp->val_sp)) {
-                            if (exc_sp->handler > ip) {
+                            if (exc_sp->handler >= ip) {
                                 // Found a finally handler that isn't active; run it.
                                 // Getting here the stack looks like:
                                 //     (..., X, [iter0, iter1, ...,] ret_val)

From e85a096302e8b186b82c74e7da4e1a29ef62d9c6 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 17 Jun 2022 23:06:24 +1000
Subject: [PATCH 2221/3533] py/emit: Remove logic to detect
 last-emit-was-return-value.

This optimisation to remove dead code is not as good as it could be.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/compile.c                    | 24 ++++++------------------
 py/emit.h                       |  2 --
 py/emitbc.c                     |  9 ---------
 py/emitnative.c                 | 15 +--------------
 tests/cmdline/cmd_showbc.py.exp | 14 +++++++++-----
 5 files changed, 16 insertions(+), 48 deletions(-)

diff --git a/py/compile.c b/py/compile.c
index 9cca5df4010cf..ff3e5ffc6db30 100644
--- a/py/compile.c
+++ b/py/compile.c
@@ -1330,12 +1330,8 @@ STATIC void compile_if_stmt(compiler_t *comp, mp_parse_node_struct_t *pns) {
             goto done;
         }
 
-        if (
-            // optimisation: don't jump over non-existent elif/else blocks
-            !(MP_PARSE_NODE_IS_NULL(pns->nodes[2]) && MP_PARSE_NODE_IS_NULL(pns->nodes[3]))
-            // optimisation: don't jump if last instruction was return
-            && !EMIT(last_emit_was_return_value)
-            ) {
+        // optimisation: don't jump over non-existent elif/else blocks
+        if (!(MP_PARSE_NODE_IS_NULL(pns->nodes[2]) && MP_PARSE_NODE_IS_NULL(pns->nodes[3]))) {
             // jump over elif/else blocks
             EMIT_ARG(jump, l_end);
         }
@@ -1362,10 +1358,7 @@ STATIC void compile_if_stmt(compiler_t *comp, mp_parse_node_struct_t *pns) {
                 goto done;
             }
 
-            // optimisation: don't jump if last instruction was return
-            if (!EMIT(last_emit_was_return_value)) {
-                EMIT_ARG(jump, l_end);
-            }
+            EMIT_ARG(jump, l_end);
             EMIT_ARG(label_assign, l_fail);
         }
     }
@@ -1580,9 +1573,7 @@ STATIC void compile_for_stmt(compiler_t *comp, mp_parse_node_struct_t *pns) {
     EMIT_ARG(for_iter, pop_label);
     c_assign(comp, pns->nodes[0], ASSIGN_STORE); // variable
     compile_node(comp, pns->nodes[2]); // body
-    if (!EMIT(last_emit_was_return_value)) {
-        EMIT_ARG(jump, continue_label);
-    }
+    EMIT_ARG(jump, continue_label);
     EMIT_ARG(label_assign, pop_label);
     EMIT(for_iter_end);
 
@@ -3048,11 +3039,8 @@ STATIC bool compile_scope(compiler_t *comp, scope_t *scope, pass_kind_t pass) {
         }
 
         compile_node(comp, pns->nodes[3]); // 3 is function body
-        // emit return if it wasn't the last opcode
-        if (!EMIT(last_emit_was_return_value)) {
-            EMIT_ARG(load_const_tok, MP_TOKEN_KW_NONE);
-            EMIT(return_value);
-        }
+        EMIT_ARG(load_const_tok, MP_TOKEN_KW_NONE);
+        EMIT(return_value);
     } else if (scope->kind == SCOPE_LAMBDA) {
         assert(MP_PARSE_NODE_IS_STRUCT(scope->pn));
         mp_parse_node_struct_t *pns = (mp_parse_node_struct_t *)scope->pn;
diff --git a/py/emit.h b/py/emit.h
index 608734552af49..4e8a55e77aa4f 100644
--- a/py/emit.h
+++ b/py/emit.h
@@ -115,7 +115,6 @@ typedef struct _emit_method_table_t {
 
     void (*start_pass)(emit_t *emit, pass_kind_t pass, scope_t *scope);
     bool (*end_pass)(emit_t *emit);
-    bool (*last_emit_was_return_value)(emit_t *emit);
     void (*adjust_stack_size)(emit_t *emit, mp_int_t delta);
     void (*set_source_line)(emit_t *emit, mp_uint_t line);
 
@@ -227,7 +226,6 @@ void emit_native_xtensawin_free(emit_t *emit);
 
 void mp_emit_bc_start_pass(emit_t *emit, pass_kind_t pass, scope_t *scope);
 bool mp_emit_bc_end_pass(emit_t *emit);
-bool mp_emit_bc_last_emit_was_return_value(emit_t *emit);
 void mp_emit_bc_adjust_stack_size(emit_t *emit, mp_int_t delta);
 void mp_emit_bc_set_source_line(emit_t *emit, mp_uint_t line);
 
diff --git a/py/emitbc.c b/py/emitbc.c
index 2007975c5e9b5..9c0d78d790e1b 100644
--- a/py/emitbc.c
+++ b/py/emitbc.c
@@ -47,7 +47,6 @@ struct _emit_t {
     byte dummy_data[DUMMY_DATA_SIZE];
 
     pass_kind_t pass : 8;
-    mp_uint_t last_emit_was_return_value : 8;
 
     int stack_size;
 
@@ -272,7 +271,6 @@ STATIC void emit_write_bytecode_byte_label(emit_t *emit, int stack_adj, byte b1,
 void mp_emit_bc_start_pass(emit_t *emit, pass_kind_t pass, scope_t *scope) {
     emit->pass = pass;
     emit->stack_size = 0;
-    emit->last_emit_was_return_value = false;
     emit->scope = scope;
     emit->last_source_line_offset = 0;
     emit->last_source_line = 1;
@@ -397,10 +395,6 @@ bool mp_emit_bc_end_pass(emit_t *emit) {
     return true;
 }
 
-bool mp_emit_bc_last_emit_was_return_value(emit_t *emit) {
-    return emit->last_emit_was_return_value;
-}
-
 void mp_emit_bc_adjust_stack_size(emit_t *emit, mp_int_t delta) {
     if (emit->pass == MP_PASS_SCOPE) {
         return;
@@ -410,7 +404,6 @@ void mp_emit_bc_adjust_stack_size(emit_t *emit, mp_int_t delta) {
     if (emit->stack_size > emit->scope->stack_size) {
         emit->scope->stack_size = emit->stack_size;
     }
-    emit->last_emit_was_return_value = false;
 }
 
 void mp_emit_bc_set_source_line(emit_t *emit, mp_uint_t source_line) {
@@ -773,7 +766,6 @@ void mp_emit_bc_call_method(emit_t *emit, mp_uint_t n_positional, mp_uint_t n_ke
 
 void mp_emit_bc_return_value(emit_t *emit) {
     emit_write_bytecode_byte(emit, -1, MP_BC_RETURN_VALUE);
-    emit->last_emit_was_return_value = true;
 }
 
 void mp_emit_bc_raise_varargs(emit_t *emit, mp_uint_t n_args) {
@@ -806,7 +798,6 @@ const emit_method_table_t emit_bc_method_table = {
 
     mp_emit_bc_start_pass,
     mp_emit_bc_end_pass,
-    mp_emit_bc_last_emit_was_return_value,
     mp_emit_bc_adjust_stack_size,
     mp_emit_bc_set_source_line,
 
diff --git a/py/emitnative.c b/py/emitnative.c
index 6683ea420260f..5b695a22a7fd7 100644
--- a/py/emitnative.c
+++ b/py/emitnative.c
@@ -276,8 +276,6 @@ struct _emit_t {
     uint16_t n_info;
     uint16_t n_cell;
 
-    bool last_emit_was_return_value;
-
     scope_t *scope;
 
     ASM_T *as;
@@ -370,7 +368,6 @@ STATIC void emit_native_start_pass(emit_t *emit, pass_kind_t pass, scope_t *scop
     emit->pass = pass;
     emit->do_viper_types = scope->emit_options == MP_EMIT_OPT_VIPER;
     emit->stack_size = 0;
-    emit->last_emit_was_return_value = false;
     emit->scope = scope;
 
     // allocate memory for keeping track of the types of locals
@@ -733,10 +730,6 @@ STATIC bool emit_native_end_pass(emit_t *emit) {
     return true;
 }
 
-STATIC bool emit_native_last_emit_was_return_value(emit_t *emit) {
-    return emit->last_emit_was_return_value;
-}
-
 STATIC void ensure_extra_stack(emit_t *emit, size_t delta) {
     if (emit->stack_size + delta > emit->stack_info_alloc) {
         size_t new_alloc = (emit->stack_size + delta + 8) & ~3;
@@ -793,7 +786,7 @@ STATIC void emit_native_set_source_line(emit_t *emit, mp_uint_t source_line) {
 
 // this must be called at start of emit functions
 STATIC void emit_native_pre(emit_t *emit) {
-    emit->last_emit_was_return_value = false;
+    (void)emit;
 }
 
 // depth==0 is top, depth==1 is before top, etc
@@ -917,7 +910,6 @@ STATIC void emit_fold_stack_top(emit_t *emit, int reg_dest) {
 // If stacked value is in a register and the register is not r1 or r2, then
 // *reg_dest is set to that register.  Otherwise the value is put in *reg_dest.
 STATIC void emit_pre_pop_reg_flexible(emit_t *emit, vtype_kind_t *vtype, int *reg_dest, int not_r1, int not_r2) {
-    emit->last_emit_was_return_value = false;
     stack_info_t *si = peek_stack(emit, 0);
     if (si->kind == STACK_REG && si->data.u_reg != not_r1 && si->data.u_reg != not_r2) {
         *vtype = si->vtype;
@@ -930,12 +922,10 @@ STATIC void emit_pre_pop_reg_flexible(emit_t *emit, vtype_kind_t *vtype, int *re
 }
 
 STATIC void emit_pre_pop_discard(emit_t *emit) {
-    emit->last_emit_was_return_value = false;
     adjust_stack(emit, -1);
 }
 
 STATIC void emit_pre_pop_reg(emit_t *emit, vtype_kind_t *vtype, int reg_dest) {
-    emit->last_emit_was_return_value = false;
     emit_access_stack(emit, 1, vtype, reg_dest);
     adjust_stack(emit, -1);
 }
@@ -2771,7 +2761,6 @@ STATIC void emit_native_return_value(emit_t *emit) {
 
         // Do the unwinding jump to get to the return handler
         emit_native_unwind_jump(emit, emit->exit_label, emit->exc_stack_size);
-        emit->last_emit_was_return_value = true;
         return;
     }
 
@@ -2809,7 +2798,6 @@ STATIC void emit_native_return_value(emit_t *emit) {
         ASM_MOV_LOCAL_REG(emit->as, LOCAL_IDX_RET_VAL(emit), REG_PARENT_RET);
     }
     emit_native_unwind_jump(emit, emit->exit_label, emit->exc_stack_size);
-    emit->last_emit_was_return_value = true;
 }
 
 STATIC void emit_native_raise_varargs(emit_t *emit, mp_uint_t n_args) {
@@ -2928,7 +2916,6 @@ const emit_method_table_t EXPORT_FUN(method_table) = {
 
     emit_native_start_pass,
     emit_native_end_pass,
-    emit_native_last_emit_was_return_value,
     emit_native_adjust_stack_size,
     emit_native_set_source_line,
 
diff --git a/tests/cmdline/cmd_showbc.py.exp b/tests/cmdline/cmd_showbc.py.exp
index 45a1d169b6197..2eeb8eadd0a36 100644
--- a/tests/cmdline/cmd_showbc.py.exp
+++ b/tests/cmdline/cmd_showbc.py.exp
@@ -48,12 +48,12 @@ arg names:
 43 LOAD_CONST_NONE
 44 RETURN_VALUE
 File cmdline/cmd_showbc.py, code block 'f' (descriptor: \.\+, bytecode @\.\+ 45\[46\] bytes)
-Raw bytecode (code_info_size=8\[46\], bytecode_size=370):
+Raw bytecode (code_info_size=8\[46\], bytecode_size=372):
  a8 12 9\[bf\] 03 05 60 60 26 22 24 64 22 24 25 25 24
  26 23 63 22 22 25 23 23 2f 6c 25 65 25 25 69 68
  26 65 27 6a 62 20 23 62 2a 29 69 24 25 28 67 26
 ########
-\.\+81 63
+\.\+51 63
 arg names:
 (N_STATE 22)
 (N_EXC_STACK 2)
@@ -403,6 +403,8 @@ arg names:
 367 RETURN_VALUE
 368 LOAD_CONST_SMALL_INT 1
 369 RETURN_VALUE
+370 LOAD_CONST_NONE
+371 RETURN_VALUE
 File cmdline/cmd_showbc.py, code block 'f' (descriptor: \.\+, bytecode @\.\+ 59 bytes)
 Raw bytecode (code_info_size=8, bytecode_size=51):
  a8 10 0a 05 80 82 34 38 81 57 c0 57 c1 57 c2 57
@@ -621,9 +623,9 @@ arg names: *
 08 DELETE_DEREF 0
 10 LOAD_CONST_NONE
 11 RETURN_VALUE
-File cmdline/cmd_showbc.py, code block 'f' (descriptor: \.\+, bytecode @\.\+ 13 bytes)
-Raw bytecode (code_info_size=8, bytecode_size=5):
- 9a 01 0a 05 03 08 80 8b b1 25 00 f2 63
+File cmdline/cmd_showbc.py, code block 'f' (descriptor: \.\+, bytecode @\.\+ 15 bytes)
+Raw bytecode (code_info_size=8, bytecode_size=7):
+ 9a 01 0a 05 03 08 80 8b b1 25 00 f2 63 51 63
 arg names: * b
 (N_STATE 4)
 (N_EXC_STACK 0)
@@ -633,6 +635,8 @@ arg names: * b
 01 LOAD_DEREF 0
 03 BINARY_OP 27 __add__
 04 RETURN_VALUE
+05 LOAD_CONST_NONE
+06 RETURN_VALUE
 mem: total=\\d\+, current=\\d\+, peak=\\d\+
 stack: \\d\+ out of \\d\+
 GC: total: \\d\+, used: \\d\+, free: \\d\+

From a506335524a69fbccad245d486f5f641a0cf8919 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 17 Jun 2022 23:14:32 +1000
Subject: [PATCH 2222/3533] py/emit: Suppress unreachable bytecode/native code
 that follows jump.

This new logic tracks when an unconditional jump/raise occurs in the
emitted code stream (bytecode or native machine code) and suppresses all
subsequent code, until a label is assigned.  This eliminates a lot of
cases of dead code, with relatively simple logic.

This commit combined with the previous one (that removed the existing
dead-code finding logic) has the following code size change:

       bare-arm:   -16 -0.028%
    minimal x86:   -60 -0.036%
       unix x64:  -368 -0.070%
    unix nanbox:   -80 -0.017%
          stm32:  -204 -0.052% PYBV10
         cc3200:    +0 +0.000%
        esp8266:  -232 -0.033% GENERIC
          esp32:  -224 -0.015% GENERIC[incl -40(data)]
         mimxrt:  -192 -0.054% TEENSY40
     renesas-ra:  -200 -0.032% RA6M2_EK
            nrf:   +28 +0.015% pca10040
            rp2:  -256 -0.050% PICO
           samd:   -12 -0.009% ADAFRUIT_ITSYBITSY_M4_EXPRESS

Signed-off-by: Damien George <damien@micropython.org>
---
 py/asmbase.c                        |  10 +++
 py/asmbase.h                        |  11 ++-
 py/emitbc.c                         |  22 +++++
 py/emitnative.c                     |   2 +
 tests/cmdline/cmd_showbc.py         |   8 +-
 tests/cmdline/cmd_showbc.py.exp     | 126 ++++++++++++++--------------
 tests/cmdline/cmd_showbc_opt.py     |  33 ++++++++
 tests/cmdline/cmd_showbc_opt.py.exp | 122 +++++++++++++++++++++++++++
 8 files changed, 268 insertions(+), 66 deletions(-)
 create mode 100644 tests/cmdline/cmd_showbc_opt.py
 create mode 100644 tests/cmdline/cmd_showbc_opt.py.exp

diff --git a/py/asmbase.c b/py/asmbase.c
index 4a3fd089cb241..da4273506a6d4 100644
--- a/py/asmbase.c
+++ b/py/asmbase.c
@@ -55,15 +55,20 @@ void mp_asm_base_start_pass(mp_asm_base_t *as, int pass) {
         assert(as->code_base != NULL);
     }
     as->pass = pass;
+    as->suppress = false;
     as->code_offset = 0;
 }
 
 // all functions must go through this one to emit bytes
 // if as->pass < MP_ASM_PASS_EMIT, then this function just counts the number
 // of bytes needed and returns NULL, and callers should not store any data
+// It also returns NULL if generated code should be suppressed at this point.
 uint8_t *mp_asm_base_get_cur_to_write_bytes(void *as_in, size_t num_bytes_to_write) {
     mp_asm_base_t *as = as_in;
     uint8_t *c = NULL;
+    if (as->suppress) {
+        return c;
+    }
     if (as->pass == MP_ASM_PASS_EMIT) {
         assert(as->code_offset + num_bytes_to_write <= as->code_size);
         c = as->code_base + as->code_offset;
@@ -74,6 +79,11 @@ uint8_t *mp_asm_base_get_cur_to_write_bytes(void *as_in, size_t num_bytes_to_wri
 
 void mp_asm_base_label_assign(mp_asm_base_t *as, size_t label) {
     assert(label < as->max_num_labels);
+
+    // Assiging a label ends any dead-code region, and all following machine
+    // code should be emitted (until another mp_asm_base_suppress_code() call).
+    as->suppress = false;
+
     if (as->pass < MP_ASM_PASS_EMIT) {
         // assign label offset
         assert(as->label_offsets[label] == (size_t)-1);
diff --git a/py/asmbase.h b/py/asmbase.h
index 960be7685f5d4..352d2f54cc810 100644
--- a/py/asmbase.h
+++ b/py/asmbase.h
@@ -33,7 +33,12 @@
 #define MP_ASM_PASS_EMIT    (2)
 
 typedef struct _mp_asm_base_t {
-    int pass;
+    uint8_t pass;
+
+    // Set to true using mp_asm_base_suppress_code() if the code generator
+    // should suppress emitted code due to it being dead code.
+    bool suppress;
+
     size_t code_offset;
     size_t code_size;
     uint8_t *code_base;
@@ -50,6 +55,10 @@ void mp_asm_base_label_assign(mp_asm_base_t *as, size_t label);
 void mp_asm_base_align(mp_asm_base_t *as, unsigned int align);
 void mp_asm_base_data(mp_asm_base_t *as, unsigned int bytesize, uintptr_t val);
 
+static inline void mp_asm_base_suppress_code(mp_asm_base_t *as) {
+    as->suppress = true;
+}
+
 static inline size_t mp_asm_base_get_code_pos(mp_asm_base_t *as) {
     return as->code_offset;
 }
diff --git a/py/emitbc.c b/py/emitbc.c
index 9c0d78d790e1b..70a4d8b12e18a 100644
--- a/py/emitbc.c
+++ b/py/emitbc.c
@@ -48,6 +48,11 @@ struct _emit_t {
 
     pass_kind_t pass : 8;
 
+    // Set to true if the code generator should suppress emitted code due to it
+    // being dead code.  This can happen when opcodes immediately follow an
+    // unconditional flow control (eg jump or raise).
+    bool suppress;
+
     int stack_size;
 
     mp_emit_common_t *emit_common;
@@ -140,6 +145,9 @@ STATIC void emit_write_code_info_bytes_lines(emit_t *emit, mp_uint_t bytes_to_sk
 // all functions must go through this one to emit byte code
 STATIC uint8_t *emit_get_cur_to_write_bytecode(void *emit_in, size_t num_bytes_to_write) {
     emit_t *emit = emit_in;
+    if (emit->suppress) {
+        return emit->dummy_data;
+    }
     if (emit->pass < MP_PASS_EMIT) {
         emit->bytecode_offset += num_bytes_to_write;
         return emit->dummy_data;
@@ -222,6 +230,10 @@ STATIC void emit_write_bytecode_byte_child(emit_t *emit, int stack_adj, byte b,
 STATIC void emit_write_bytecode_byte_label(emit_t *emit, int stack_adj, byte b1, mp_uint_t label) {
     mp_emit_bc_adjust_stack_size(emit, stack_adj);
 
+    if (emit->suppress) {
+        return;
+    }
+
     // Determine if the jump offset is signed or unsigned, based on the opcode.
     const bool is_signed = b1 <= MP_BC_POP_JUMP_IF_FALSE;
 
@@ -271,6 +283,7 @@ STATIC void emit_write_bytecode_byte_label(emit_t *emit, int stack_adj, byte b1,
 void mp_emit_bc_start_pass(emit_t *emit, pass_kind_t pass, scope_t *scope) {
     emit->pass = pass;
     emit->stack_size = 0;
+    emit->suppress = false;
     emit->scope = scope;
     emit->last_source_line_offset = 0;
     emit->last_source_line = 1;
@@ -426,6 +439,10 @@ void mp_emit_bc_set_source_line(emit_t *emit, mp_uint_t source_line) {
 }
 
 void mp_emit_bc_label_assign(emit_t *emit, mp_uint_t l) {
+    // Assiging a label ends any dead-code region, and all following opcodes
+    // should be emitted (until another unconditional flow control).
+    emit->suppress = false;
+
     mp_emit_bc_adjust_stack_size(emit, 0);
     if (emit->pass == MP_PASS_SCOPE) {
         return;
@@ -589,6 +606,7 @@ void mp_emit_bc_rot_three(emit_t *emit) {
 
 void mp_emit_bc_jump(emit_t *emit, mp_uint_t label) {
     emit_write_bytecode_byte_label(emit, 0, MP_BC_JUMP, label);
+    emit->suppress = true;
 }
 
 void mp_emit_bc_pop_jump_if(emit_t *emit, bool cond, mp_uint_t label) {
@@ -622,6 +640,7 @@ void mp_emit_bc_unwind_jump(emit_t *emit, mp_uint_t label, mp_uint_t except_dept
         emit_write_bytecode_byte_label(emit, 0, MP_BC_UNWIND_JUMP, label & ~MP_EMIT_BREAK_FROM_FOR);
         emit_write_bytecode_raw_byte(emit, ((label & MP_EMIT_BREAK_FROM_FOR) ? 0x80 : 0) | except_depth);
     }
+    emit->suppress = true;
 }
 
 void mp_emit_bc_setup_block(emit_t *emit, mp_uint_t label, int kind) {
@@ -663,6 +682,7 @@ void mp_emit_bc_for_iter_end(emit_t *emit) {
 void mp_emit_bc_pop_except_jump(emit_t *emit, mp_uint_t label, bool within_exc_handler) {
     (void)within_exc_handler;
     emit_write_bytecode_byte_label(emit, 0, MP_BC_POP_EXCEPT_JUMP, label);
+    emit->suppress = true;
 }
 
 void mp_emit_bc_unary_op(emit_t *emit, mp_unary_op_t op) {
@@ -766,6 +786,7 @@ void mp_emit_bc_call_method(emit_t *emit, mp_uint_t n_positional, mp_uint_t n_ke
 
 void mp_emit_bc_return_value(emit_t *emit) {
     emit_write_bytecode_byte(emit, -1, MP_BC_RETURN_VALUE);
+    emit->suppress = true;
 }
 
 void mp_emit_bc_raise_varargs(emit_t *emit, mp_uint_t n_args) {
@@ -773,6 +794,7 @@ void mp_emit_bc_raise_varargs(emit_t *emit, mp_uint_t n_args) {
     MP_STATIC_ASSERT(MP_BC_RAISE_LAST + 2 == MP_BC_RAISE_FROM);
     assert(n_args <= 2);
     emit_write_bytecode_byte(emit, -n_args, MP_BC_RAISE_LAST + n_args);
+    emit->suppress = true;
 }
 
 void mp_emit_bc_yield(emit_t *emit, int kind) {
diff --git a/py/emitnative.c b/py/emitnative.c
index 5b695a22a7fd7..957e713fdd387 100644
--- a/py/emitnative.c
+++ b/py/emitnative.c
@@ -1966,6 +1966,7 @@ STATIC void emit_native_jump(emit_t *emit, mp_uint_t label) {
     need_stack_settled(emit);
     ASM_JUMP(emit->as, label);
     emit_post(emit);
+    mp_asm_base_suppress_code(&emit->as->base);
 }
 
 STATIC void emit_native_jump_helper(emit_t *emit, bool cond, mp_uint_t label, bool pop) {
@@ -2810,6 +2811,7 @@ STATIC void emit_native_raise_varargs(emit_t *emit, mp_uint_t n_args) {
     }
     // TODO probably make this 1 call to the runtime (which could even call convert, native_raise(obj, type))
     emit_call(emit, MP_F_NATIVE_RAISE);
+    mp_asm_base_suppress_code(&emit->as->base);
 }
 
 STATIC void emit_native_yield(emit_t *emit, int kind) {
diff --git a/tests/cmdline/cmd_showbc.py b/tests/cmdline/cmd_showbc.py
index e5874f990ab90..4a2e6500aa37c 100644
--- a/tests/cmdline/cmd_showbc.py
+++ b/tests/cmdline/cmd_showbc.py
@@ -119,12 +119,12 @@ def closure():
     #from sys import * # tested at module scope
 
     # raise
-    raise
-    raise 1
+    if a: raise
+    if a: raise 1
 
     # return
-    return
-    return 1
+    if a: return
+    if a: return 1
 
 # function with lots of locals
 def f():
diff --git a/tests/cmdline/cmd_showbc.py.exp b/tests/cmdline/cmd_showbc.py.exp
index 2eeb8eadd0a36..db06de9237178 100644
--- a/tests/cmdline/cmd_showbc.py.exp
+++ b/tests/cmdline/cmd_showbc.py.exp
@@ -47,8 +47,8 @@ arg names:
 42 IMPORT_STAR
 43 LOAD_CONST_NONE
 44 RETURN_VALUE
-File cmdline/cmd_showbc.py, code block 'f' (descriptor: \.\+, bytecode @\.\+ 45\[46\] bytes)
-Raw bytecode (code_info_size=8\[46\], bytecode_size=372):
+File cmdline/cmd_showbc.py, code block 'f' (descriptor: \.\+, bytecode @\.\+ 46\[68\] bytes)
+Raw bytecode (code_info_size=8\[46\], bytecode_size=382):
  a8 12 9\[bf\] 03 05 60 60 26 22 24 64 22 24 25 25 24
  26 23 63 22 22 25 23 23 2f 6c 25 65 25 25 69 68
  26 65 27 6a 62 20 23 62 2a 29 69 24 25 28 67 26
@@ -126,19 +126,18 @@ arg names:
   bc=313 line=100
   bc=315 line=101
 ########
-  bc=321 line=103
-  bc=327 line=106
-  bc=331 line=107
-  bc=337 line=110
-  bc=340 line=111
-  bc=346 line=114
-  bc=346 line=117
-  bc=351 line=118
-  bc=363 line=121
-  bc=363 line=122
-  bc=364 line=123
-  bc=366 line=126
-  bc=368 line=127
+  bc=325 line=106
+  bc=329 line=107
+  bc=335 line=110
+  bc=338 line=111
+  bc=344 line=114
+  bc=344 line=117
+  bc=349 line=118
+  bc=361 line=121
+  bc=361 line=122
+  bc=365 line=123
+  bc=370 line=126
+  bc=375 line=127
 00 LOAD_CONST_NONE
 01 LOAD_CONST_FALSE
 02 BINARY_OP 27 __add__
@@ -363,48 +362,55 @@ arg names:
 308 LOAD_FAST 1
 309 POP_TOP
 310 END_FINALLY
-311 JUMP 324
-313 SETUP_EXCEPT 320
-315 UNWIND_JUMP 327 1
-318 POP_EXCEPT_JUMP 324
-320 POP_TOP
-321 POP_EXCEPT_JUMP 324
-323 END_FINALLY
-324 LOAD_FAST 0
-325 POP_JUMP_IF_TRUE 313
-327 LOAD_FAST 0
-328 SETUP_WITH 335
-330 POP_TOP
-331 LOAD_DEREF 14
-333 POP_TOP
-334 LOAD_CONST_NONE
-335 WITH_CLEANUP
-336 END_FINALLY
-337 LOAD_CONST_SMALL_INT 1
-338 STORE_DEREF 16
-340 LOAD_FAST_N 16
-342 MAKE_CLOSURE \.\+ 1
-345 STORE_FAST 13
-346 LOAD_CONST_SMALL_INT 0
-347 LOAD_CONST_NONE
-348 IMPORT_NAME 'a'
-350 STORE_FAST 0
-351 LOAD_CONST_SMALL_INT 0
-352 LOAD_CONST_STRING 'b'
-354 BUILD_TUPLE 1
-356 IMPORT_NAME 'a'
-358 IMPORT_FROM 'b'
-360 STORE_DEREF 14
-362 POP_TOP
-363 RAISE_LAST
-364 LOAD_CONST_SMALL_INT 1
-365 RAISE_OBJ
-366 LOAD_CONST_NONE
-367 RETURN_VALUE
+311 JUMP 322
+313 SETUP_EXCEPT 318
+315 UNWIND_JUMP 325 1
+318 POP_TOP
+319 POP_EXCEPT_JUMP 322
+321 END_FINALLY
+322 LOAD_FAST 0
+323 POP_JUMP_IF_TRUE 313
+325 LOAD_FAST 0
+326 SETUP_WITH 333
+328 POP_TOP
+329 LOAD_DEREF 14
+331 POP_TOP
+332 LOAD_CONST_NONE
+333 WITH_CLEANUP
+334 END_FINALLY
+335 LOAD_CONST_SMALL_INT 1
+336 STORE_DEREF 16
+338 LOAD_FAST_N 16
+340 MAKE_CLOSURE \.\+ 1
+343 STORE_FAST 13
+344 LOAD_CONST_SMALL_INT 0
+345 LOAD_CONST_NONE
+346 IMPORT_NAME 'a'
+348 STORE_FAST 0
+349 LOAD_CONST_SMALL_INT 0
+350 LOAD_CONST_STRING 'b'
+352 BUILD_TUPLE 1
+354 IMPORT_NAME 'a'
+356 IMPORT_FROM 'b'
+358 STORE_DEREF 14
+360 POP_TOP
+361 LOAD_FAST 0
+362 POP_JUMP_IF_FALSE 365
+364 RAISE_LAST
+365 LOAD_FAST 0
+366 POP_JUMP_IF_FALSE 370
 368 LOAD_CONST_SMALL_INT 1
-369 RETURN_VALUE
-370 LOAD_CONST_NONE
-371 RETURN_VALUE
+369 RAISE_OBJ
+370 LOAD_FAST 0
+371 POP_JUMP_IF_FALSE 375
+373 LOAD_CONST_NONE
+374 RETURN_VALUE
+375 LOAD_FAST 0
+376 POP_JUMP_IF_FALSE 380
+378 LOAD_CONST_SMALL_INT 1
+379 RETURN_VALUE
+380 LOAD_CONST_NONE
+381 RETURN_VALUE
 File cmdline/cmd_showbc.py, code block 'f' (descriptor: \.\+, bytecode @\.\+ 59 bytes)
 Raw bytecode (code_info_size=8, bytecode_size=51):
  a8 10 0a 05 80 82 34 38 81 57 c0 57 c1 57 c2 57
@@ -623,9 +629,9 @@ arg names: *
 08 DELETE_DEREF 0
 10 LOAD_CONST_NONE
 11 RETURN_VALUE
-File cmdline/cmd_showbc.py, code block 'f' (descriptor: \.\+, bytecode @\.\+ 15 bytes)
-Raw bytecode (code_info_size=8, bytecode_size=7):
- 9a 01 0a 05 03 08 80 8b b1 25 00 f2 63 51 63
+File cmdline/cmd_showbc.py, code block 'f' (descriptor: \.\+, bytecode @\.\+ 13 bytes)
+Raw bytecode (code_info_size=8, bytecode_size=5):
+ 9a 01 0a 05 03 08 80 8b b1 25 00 f2 63
 arg names: * b
 (N_STATE 4)
 (N_EXC_STACK 0)
@@ -635,8 +641,6 @@ arg names: * b
 01 LOAD_DEREF 0
 03 BINARY_OP 27 __add__
 04 RETURN_VALUE
-05 LOAD_CONST_NONE
-06 RETURN_VALUE
 mem: total=\\d\+, current=\\d\+, peak=\\d\+
 stack: \\d\+ out of \\d\+
 GC: total: \\d\+, used: \\d\+, free: \\d\+
diff --git a/tests/cmdline/cmd_showbc_opt.py b/tests/cmdline/cmd_showbc_opt.py
new file mode 100644
index 0000000000000..02785860d9eee
--- /dev/null
+++ b/tests/cmdline/cmd_showbc_opt.py
@@ -0,0 +1,33 @@
+# cmdline: -v -v
+# test printing of bytecode when it's optimised away
+
+
+def f0():
+    return 0
+    print(1)
+
+
+def f1(x):
+    if x:
+        return
+        print(1)
+    print(2)
+
+
+def f2(x):
+    raise Exception
+    print(1)
+
+
+def f3(x):
+    while x:
+        break
+        print(1)
+    print(2)
+
+
+def f4(x):
+    while x:
+        continue
+        print(1)
+    print(2)
diff --git a/tests/cmdline/cmd_showbc_opt.py.exp b/tests/cmdline/cmd_showbc_opt.py.exp
new file mode 100644
index 0000000000000..9e4e4fae10cfa
--- /dev/null
+++ b/tests/cmdline/cmd_showbc_opt.py.exp
@@ -0,0 +1,122 @@
+File cmdline/cmd_showbc_opt.py, code block '<module>' (descriptor: \.\+, bytecode @\.\+ 35 bytes)
+Raw bytecode (code_info_size=13, bytecode_size=22):
+ 00 16 01 60 20 64 40 84 07 64 40 84 07 32 00 16
+ 02 32 01 16 03 32 02 16 04 32 03 16 05 32 04 16
+ 06 51 63
+arg names:
+(N_STATE 1)
+(N_EXC_STACK 0)
+  bc=0 line=1
+  bc=0 line=4
+  bc=0 line=5
+  bc=4 line=8
+  bc=4 line=10
+  bc=8 line=17
+  bc=12 line=20
+  bc=12 line=22
+  bc=16 line=29
+00 MAKE_FUNCTION \.\+
+02 STORE_NAME f0
+04 MAKE_FUNCTION \.\+
+06 STORE_NAME f1
+08 MAKE_FUNCTION \.\+
+10 STORE_NAME f2
+12 MAKE_FUNCTION \.\+
+14 STORE_NAME f3
+16 MAKE_FUNCTION \.\+
+18 STORE_NAME f4
+20 LOAD_CONST_NONE
+21 RETURN_VALUE
+File cmdline/cmd_showbc_opt.py, code block 'f0' (descriptor: \.\+, bytecode @\.\+ 8 bytes)
+Raw bytecode (code_info_size=6, bytecode_size=2):
+ 08 08 02 60 40 22 80 63
+arg names:
+(N_STATE 2)
+(N_EXC_STACK 0)
+  bc=0 line=1
+  bc=0 line=4
+  bc=0 line=6
+  bc=2 line=7
+00 LOAD_CONST_SMALL_INT 0
+01 RETURN_VALUE
+File cmdline/cmd_showbc_opt.py, code block 'f1' (descriptor: \.\+, bytecode @\.\+ 22 bytes)
+Raw bytecode (code_info_size=9, bytecode_size=13):
+ 11 0e 03 08 80 0a 23 22 20 b0 44 42 51 63 12 07
+ 82 34 01 59 51 63
+arg names: x
+(N_STATE 3)
+(N_EXC_STACK 0)
+  bc=0 line=1
+  bc=0 line=11
+  bc=3 line=12
+  bc=5 line=13
+  bc=5 line=14
+00 LOAD_FAST 0
+01 POP_JUMP_IF_FALSE 5
+03 LOAD_CONST_NONE
+04 RETURN_VALUE
+05 LOAD_GLOBAL print
+07 LOAD_CONST_SMALL_INT 2
+08 CALL_FUNCTION n=1 nkw=0
+10 POP_TOP
+11 LOAD_CONST_NONE
+12 RETURN_VALUE
+File cmdline/cmd_showbc_opt.py, code block 'f2' (descriptor: \.\+, bytecode @\.\+ 10 bytes)
+Raw bytecode (code_info_size=7, bytecode_size=3):
+ 11 0a 04 08 80 11 23 12 09 65
+arg names: x
+(N_STATE 3)
+(N_EXC_STACK 0)
+  bc=0 line=1
+  bc=0 line=18
+  bc=3 line=19
+00 LOAD_GLOBAL Exception
+02 RAISE_OBJ
+File cmdline/cmd_showbc_opt.py, code block 'f3' (descriptor: \.\+, bytecode @\.\+ 24 bytes)
+Raw bytecode (code_info_size=9, bytecode_size=15):
+ 11 0e 05 08 80 16 22 22 23 42 42 42 43 b0 43 3b
+ 12 07 82 34 01 59 51 63
+arg names: x
+(N_STATE 3)
+(N_EXC_STACK 0)
+  bc=0 line=1
+  bc=0 line=23
+  bc=2 line=24
+  bc=4 line=25
+  bc=7 line=26
+00 JUMP 4
+02 JUMP 7
+04 LOAD_FAST 0
+05 POP_JUMP_IF_TRUE 2
+07 LOAD_GLOBAL print
+09 LOAD_CONST_SMALL_INT 2
+10 CALL_FUNCTION n=1 nkw=0
+12 POP_TOP
+13 LOAD_CONST_NONE
+14 RETURN_VALUE
+File cmdline/cmd_showbc_opt.py, code block 'f4' (descriptor: \.\+, bytecode @\.\+ 24 bytes)
+Raw bytecode (code_info_size=9, bytecode_size=15):
+ 11 0e 06 08 80 1d 22 22 23 42 42 42 40 b0 43 3b
+ 12 07 82 34 01 59 51 63
+arg names: x
+(N_STATE 3)
+(N_EXC_STACK 0)
+  bc=0 line=1
+  bc=0 line=30
+  bc=2 line=31
+  bc=4 line=32
+  bc=7 line=33
+00 JUMP 4
+02 JUMP 4
+04 LOAD_FAST 0
+05 POP_JUMP_IF_TRUE 2
+07 LOAD_GLOBAL print
+09 LOAD_CONST_SMALL_INT 2
+10 CALL_FUNCTION n=1 nkw=0
+12 POP_TOP
+13 LOAD_CONST_NONE
+14 RETURN_VALUE
+mem: total=\\d\+, current=\\d\+, peak=\\d\+
+stack: \\d\+ out of \\d\+
+GC: total: \\d\+, used: \\d\+, free: \\d\+
+ No. of 1-blocks: \\d\+, 2-blocks: \\d\+, max blk sz: \\d\+, max free sz: \\d\+

From 5d3a0bb59c08c201c3e9e89db7c9e9386193dea9 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sun, 19 Jun 2022 00:54:40 +1000
Subject: [PATCH 2223/3533] py/objcell: Make cell get/set funcs static-inline
 to reduce code size.

Change in code size is:

       bare-arm:   -36 -0.062%
    minimal x86:   -92 -0.056%
       unix x64:   -72 -0.014%
    unix nanbox:  -276 -0.060%
          stm32:    +0 +0.000% PYBV10
          stm32:   -40 +0.021% NUCLEO_L073RZ
         cc3200:   -16 -0.009%
        esp8266:  +176 +0.025% GENERIC
          esp32:   -28 -0.002% GENERIC
         mimxrt:   -56 -0.016% TEENSY40
     renesas-ra:    +0 +0.000% RA6M2_EK
            nrf:    +0 +0.000% pca10040
            rp2:   -64 -0.013% PICO
           samd:   -32 -0.023% ADAFRUIT_ITSYBITSY_M4_EXPRESS

Ports like stm32 that build the VM with -O3 have no change because the
savings from the inlining are offset by additional gcc performance
optimisations in the VM.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/obj.h     | 17 +++++++++++++++--
 py/objcell.c | 15 ---------------
 2 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/py/obj.h b/py/obj.h
index 29cd1855c17c1..84ca94213ceff 100644
--- a/py/obj.h
+++ b/py/obj.h
@@ -838,8 +838,21 @@ mp_obj_t mp_obj_subscr(mp_obj_t base, mp_obj_t index, mp_obj_t val);
 mp_obj_t mp_generic_unary_op(mp_unary_op_t op, mp_obj_t o_in);
 
 // cell
-mp_obj_t mp_obj_cell_get(mp_obj_t self_in);
-void mp_obj_cell_set(mp_obj_t self_in, mp_obj_t obj);
+
+typedef struct _mp_obj_cell_t {
+    mp_obj_base_t base;
+    mp_obj_t obj;
+} mp_obj_cell_t;
+
+static inline mp_obj_t mp_obj_cell_get(mp_obj_t self_in) {
+    mp_obj_cell_t *self = (mp_obj_cell_t *)MP_OBJ_TO_PTR(self_in);
+    return self->obj;
+}
+
+static inline void mp_obj_cell_set(mp_obj_t self_in, mp_obj_t obj) {
+    mp_obj_cell_t *self = (mp_obj_cell_t *)MP_OBJ_TO_PTR(self_in);
+    self->obj = obj;
+}
 
 // int
 // For long int, returns value truncated to mp_int_t
diff --git a/py/objcell.c b/py/objcell.c
index 2702ca5350599..cab0d0b030ee7 100644
--- a/py/objcell.c
+++ b/py/objcell.c
@@ -26,21 +26,6 @@
 
 #include "py/obj.h"
 
-typedef struct _mp_obj_cell_t {
-    mp_obj_base_t base;
-    mp_obj_t obj;
-} mp_obj_cell_t;
-
-mp_obj_t mp_obj_cell_get(mp_obj_t self_in) {
-    mp_obj_cell_t *self = MP_OBJ_TO_PTR(self_in);
-    return self->obj;
-}
-
-void mp_obj_cell_set(mp_obj_t self_in, mp_obj_t obj) {
-    mp_obj_cell_t *self = MP_OBJ_TO_PTR(self_in);
-    self->obj = obj;
-}
-
 #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_DETAILED
 STATIC void cell_print(const mp_print_t *print, mp_obj_t o_in, mp_print_kind_t kind) {
     (void)kind;

From 1842efbdd9fce3a6ea68ee640e1377bd7ba4441e Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sun, 19 Jun 2022 01:16:24 +1000
Subject: [PATCH 2224/3533] stm32/Makefile: Set CSUPEROPT to -Os for F0 and G0
 MCUs to save space.

Saves 1804 bytes on NUCLEO_F091RC, and 1080 bytes on NUCLEO_G0B1RE.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/Makefile | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/ports/stm32/Makefile b/ports/stm32/Makefile
index 1a4616f022583..d6d379b387a7d 100644
--- a/ports/stm32/Makefile
+++ b/ports/stm32/Makefile
@@ -325,11 +325,8 @@ SRC_O += \
 	$(STARTUP_FILE) \
 	$(SYSTEM_FILE)
     
-ifeq ($(MCU_SERIES),l0)
-CSUPEROPT = -Os # save some code space
-endif
-
 ifeq ($(MCU_SERIES),$(filter $(MCU_SERIES),f0 g0 l0))
+CSUPEROPT = -Os # save some code space
 SRC_O += \
 	resethandler_m0.o \
 	shared/runtime/gchelper_m0.o

From f5769698e5fca8fbae5b86c649204e915b22b19f Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sun, 19 Jun 2022 01:29:41 +1000
Subject: [PATCH 2225/3533] extmod/modlwip: Clean up inclusion of modlwip in
 build process.

The following changes are made:

- Guard entire file with MICROPY_PY_LWIP, so it can be included in the
  build while still being disabled (for consistency with other extmod
  modules).

- Add modlwip.c to list of all extmod source in py/py.mk and
  extmod/extmod.cmake so all ports can easily use it.

- Move generic modlwip GIT_SUBMODULES build configuration code from
  ports/rp2/CMakeLists.txt to extmod/extmod.cmake, so it can be reused by
  other ports.

- Remove now unnecessary inclusion of modlwip.c in EXTMOD_SRC_C in esp8266
  port, and in SRC_QSTR in mimxrt port.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/extmod.cmake      | 3 +++
 extmod/extmod.mk         | 2 +-
 extmod/modlwip.c         | 4 ++--
 ports/esp8266/Makefile   | 1 -
 ports/mimxrt/Makefile    | 1 -
 ports/rp2/CMakeLists.txt | 6 ------
 py/py.mk                 | 1 +
 7 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/extmod/extmod.cmake b/extmod/extmod.cmake
index 551dec714c6ef..966511fac5676 100644
--- a/extmod/extmod.cmake
+++ b/extmod/extmod.cmake
@@ -16,6 +16,7 @@ set(MICROPY_SOURCE_EXTMOD
     ${MICROPY_EXTMOD_DIR}/modbluetooth.c
     ${MICROPY_EXTMOD_DIR}/modbtree.c
     ${MICROPY_EXTMOD_DIR}/modframebuf.c
+    ${MICROPY_EXTMOD_DIR}/modlwip.c
     ${MICROPY_EXTMOD_DIR}/modnetwork.c
     ${MICROPY_EXTMOD_DIR}/modonewire.c
     ${MICROPY_EXTMOD_DIR}/moduasyncio.c
@@ -246,4 +247,6 @@ if(MICROPY_PY_LWIP)
     list(APPEND MICROPY_INC_CORE
         ${MICROPY_LIB_LWIP_DIR}/include
     )
+
+    string(CONCAT GIT_SUBMODULES "${GIT_SUBMODULES} " lib/lwip)
 endif()
diff --git a/extmod/extmod.mk b/extmod/extmod.mk
index ff24a549a9a07..60f59183d5013 100644
--- a/extmod/extmod.mk
+++ b/extmod/extmod.mk
@@ -153,7 +153,7 @@ LWIP_DIR = lib/lwip/src
 INC += -I$(TOP)/$(LWIP_DIR)/include
 CFLAGS_MOD += -DMICROPY_PY_LWIP=1
 $(BUILD)/$(LWIP_DIR)/core/ipv4/dhcp.o: CFLAGS_MOD += -Wno-address
-SRC_MOD += extmod/modlwip.c shared/netutils/netutils.c
+SRC_MOD += shared/netutils/netutils.c
 SRC_MOD += $(addprefix $(LWIP_DIR)/,\
 	apps/mdns/mdns.c \
 	core/def.c \
diff --git a/extmod/modlwip.c b/extmod/modlwip.c
index ec5f3bfd6394c..bbfd3a2253cb8 100644
--- a/extmod/modlwip.c
+++ b/extmod/modlwip.c
@@ -35,6 +35,8 @@
 #include "py/mperrno.h"
 #include "py/mphal.h"
 
+#if MICROPY_PY_LWIP
+
 #include "shared/netutils/netutils.h"
 
 #include "lwip/init.h"
@@ -1741,8 +1743,6 @@ STATIC mp_obj_t lwip_print_pcbs() {
 }
 MP_DEFINE_CONST_FUN_OBJ_0(lwip_print_pcbs_obj, lwip_print_pcbs);
 
-#if MICROPY_PY_LWIP
-
 STATIC const mp_rom_map_elem_t mp_module_lwip_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_lwip) },
     { MP_ROM_QSTR(MP_QSTR_reset), MP_ROM_PTR(&mod_lwip_reset_obj) },
diff --git a/ports/esp8266/Makefile b/ports/esp8266/Makefile
index 705f4f1eeb710..96dff46e3e4f3 100644
--- a/ports/esp8266/Makefile
+++ b/ports/esp8266/Makefile
@@ -109,7 +109,6 @@ SRC_C = \
 	$(SRC_MOD)
 
 EXTMOD_SRC_C = $(addprefix extmod/,\
-	modlwip.c \
 	modonewire.c \
         )
 
diff --git a/ports/mimxrt/Makefile b/ports/mimxrt/Makefile
index cfcdb9f7d5212..bb6d4d865320f 100644
--- a/ports/mimxrt/Makefile
+++ b/ports/mimxrt/Makefile
@@ -150,7 +150,6 @@ SRC_ETH_C += \
 	$(MCU_DIR)/drivers/fsl_enet.c \
 
 SRC_QSTR += \
-	extmod/modlwip.c \
 	extmod/modnetwork.c \
 	extmod/moduwebsocket.c \
 	extmod/modusocket.c \
diff --git a/ports/rp2/CMakeLists.txt b/ports/rp2/CMakeLists.txt
index a7a192ea33699..d6a428c91ceb7 100644
--- a/ports/rp2/CMakeLists.txt
+++ b/ports/rp2/CMakeLists.txt
@@ -182,12 +182,6 @@ if (MICROPY_PY_LWIP)
     target_compile_definitions(${MICROPY_TARGET} PRIVATE
         MICROPY_PY_LWIP=1
     )
-
-    list(APPEND MICROPY_SOURCE_EXTMOD
-        ${MICROPY_EXTMOD_DIR}/modlwip.c
-    )
-
-    string(CONCAT GIT_SUBMODULES "${GIT_SUBMODULES} " lib/lwip)
 endif()
 
 if(MICROPY_PY_BLUETOOTH)
diff --git a/py/py.mk b/py/py.mk
index 57fdb6d9b5d4a..49b94b279a984 100644
--- a/py/py.mk
+++ b/py/py.mk
@@ -194,6 +194,7 @@ PY_EXTMOD_O_BASENAME = \
 	extmod/machine_i2c.o \
 	extmod/machine_spi.o \
 	extmod/modbluetooth.o \
+	extmod/modlwip.o \
 	extmod/modussl_axtls.o \
 	extmod/modussl_mbedtls.o \
 	extmod/moduplatform.o\

From 4802b6d3af42918aec842ce4117a667523b1ab25 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sun, 19 Jun 2022 22:44:34 +1000
Subject: [PATCH 2226/3533] extmod/extmod.cmake: Only include modbtree in build
 if it's enabled.

Following how it's done in extmod.mk.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/extmod.cmake | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/extmod/extmod.cmake b/extmod/extmod.cmake
index 966511fac5676..8fe83a0ada347 100644
--- a/extmod/extmod.cmake
+++ b/extmod/extmod.cmake
@@ -14,7 +14,6 @@ set(MICROPY_SOURCE_EXTMOD
     ${MICROPY_EXTMOD_DIR}/machine_signal.c
     ${MICROPY_EXTMOD_DIR}/machine_spi.c
     ${MICROPY_EXTMOD_DIR}/modbluetooth.c
-    ${MICROPY_EXTMOD_DIR}/modbtree.c
     ${MICROPY_EXTMOD_DIR}/modframebuf.c
     ${MICROPY_EXTMOD_DIR}/modlwip.c
     ${MICROPY_EXTMOD_DIR}/modnetwork.c
@@ -97,6 +96,10 @@ if(MICROPY_PY_BTREE)
         __DBINTERFACE_PRIVATE=1
         "virt_fd_t=void*"
     )
+
+    list(APPEND MICROPY_SOURCE_EXTMOD
+        ${MICROPY_EXTMOD_DIR}/modbtree.c
+    )
 endif()
 
 # Library for mbedtls

From c118b5d0e428094bd64a003d97b078c2d7c7500d Mon Sep 17 00:00:00 2001
From: David Lechner <david@pybricks.com>
Date: Fri, 17 Jun 2022 11:11:30 -0500
Subject: [PATCH 2227/3533] extmod/extmod.mk: Separate out extmod file list
 from py.mk to extmod.mk.

This separates extmod source files from `py.mk`.  Previously, `py.mk`
assumed that every consumer of the py/ directory also wanted to include
extmod/.  However, this is not the case.  For example, building mpy-cross
uses py/ but doesn't need extmod/.

This commit moves all extmod-specific items from `py.mk` to `extmod.mk` and
explicitly includes `extmod.mk` in ports that use it.

Signed-off-by: David Lechner <david@pybricks.com>
---
 docs/develop/porting.rst           |  1 +
 examples/embedding/Makefile.upylib |  1 +
 extmod/extmod.mk                   | 53 +++++++++++++++++++++++++++++-
 ports/cc3200/Makefile              |  1 +
 ports/esp8266/Makefile             |  1 +
 ports/javascript/Makefile          |  1 +
 ports/mimxrt/Makefile              |  1 +
 ports/nrf/Makefile                 |  1 +
 ports/pic16bit/Makefile            |  1 +
 ports/powerpc/Makefile             |  1 +
 ports/qemu-arm/Makefile            |  1 +
 ports/renesas-ra/Makefile          |  1 +
 ports/samd/Makefile                |  1 +
 ports/stm32/Makefile               |  1 +
 ports/teensy/Makefile              |  1 +
 ports/unix/Makefile                |  1 +
 ports/windows/Makefile             |  1 +
 py/py.mk                           | 53 ++----------------------------
 18 files changed, 70 insertions(+), 52 deletions(-)

diff --git a/docs/develop/porting.rst b/docs/develop/porting.rst
index bc25f47ed87ab..3d0553205c11a 100644
--- a/docs/develop/porting.rst
+++ b/docs/develop/porting.rst
@@ -95,6 +95,7 @@ We also need a Makefile at this point for the port:
 
    # Include py core make definitions.
    include $(TOP)/py/py.mk
+   include $(TOP)/extmod/extmod.mk
 
    # Set CFLAGS and libraries.
    CFLAGS = -I. -I$(BUILD) -I$(TOP)
diff --git a/examples/embedding/Makefile.upylib b/examples/embedding/Makefile.upylib
index 80f7eed159bcc..217f2643c9d6a 100644
--- a/examples/embedding/Makefile.upylib
+++ b/examples/embedding/Makefile.upylib
@@ -9,6 +9,7 @@ UNAME_S := $(shell uname -s)
 
 # include py core make definitions
 include $(MPTOP)/py/py.mk
+include $(MPTOP)/extmod/extmod.mk
 
 INC +=  -I.
 INC +=  -I..
diff --git a/extmod/extmod.mk b/extmod/extmod.mk
index 60f59183d5013..93b2a11766cf1 100644
--- a/extmod/extmod.mk
+++ b/extmod/extmod.mk
@@ -1,4 +1,55 @@
-# This makefile fragment provides rules to build 3rd-party components for extmod modules
+# This makefile fragment adds the source code files for the core extmod modules
+# and provides rules to build 3rd-party components for extmod modules.
+
+PY_EXTMOD_O_BASENAME = \
+	extmod/moduasyncio.o \
+	extmod/moductypes.o \
+	extmod/modujson.o \
+	extmod/moduos.o \
+	extmod/modure.o \
+	extmod/moduzlib.o \
+	extmod/moduheapq.o \
+	extmod/modutimeq.o \
+	extmod/moduhashlib.o \
+	extmod/moducryptolib.o \
+	extmod/modubinascii.o \
+	extmod/virtpin.o \
+	extmod/machine_bitstream.o \
+	extmod/machine_mem.o \
+	extmod/machine_pinbase.o \
+	extmod/machine_signal.o \
+	extmod/machine_pulse.o \
+	extmod/machine_pwm.o \
+	extmod/machine_i2c.o \
+	extmod/machine_spi.o \
+	extmod/modbluetooth.o \
+	extmod/modlwip.o \
+	extmod/modussl_axtls.o \
+	extmod/modussl_mbedtls.o \
+	extmod/moduplatform.o\
+	extmod/modurandom.o \
+	extmod/moduselect.o \
+	extmod/moduwebsocket.o \
+	extmod/modwebrepl.o \
+	extmod/modframebuf.o \
+	extmod/vfs.o \
+	extmod/vfs_blockdev.o \
+	extmod/vfs_reader.o \
+	extmod/vfs_posix.o \
+	extmod/vfs_posix_file.o \
+	extmod/vfs_fat.o \
+	extmod/vfs_fat_diskio.o \
+	extmod/vfs_fat_file.o \
+	extmod/vfs_lfs.o \
+	extmod/utime_mphal.o \
+	extmod/uos_dupterm.o \
+	shared/libc/abort_.o \
+	shared/libc/printf.o \
+
+PY_EXTMOD_O = $(addprefix $(BUILD)/, $(PY_EXTMOD_O_BASENAME))
+
+PY_O += $(PY_EXTMOD_O)
+SRC_QSTR += $(PY_EXTMOD_O_BASENAME:.o=.c)
 
 ################################################################################
 # VFS FAT FS
diff --git a/ports/cc3200/Makefile b/ports/cc3200/Makefile
index 560fc8e96def5..90be4529d87fa 100644
--- a/ports/cc3200/Makefile
+++ b/ports/cc3200/Makefile
@@ -39,6 +39,7 @@ MICROPY_ROM_TEXT_COMPRESSION ?= 1
 
 # include MicroPython make definitions
 include $(TOP)/py/py.mk
+include $(TOP)/extmod/extmod.mk
 include application.mk
 else
 ifeq ($(BTARGET), bootloader)
diff --git a/ports/esp8266/Makefile b/ports/esp8266/Makefile
index 96dff46e3e4f3..f70fbd2284063 100644
--- a/ports/esp8266/Makefile
+++ b/ports/esp8266/Makefile
@@ -30,6 +30,7 @@ FROZEN_MANIFEST ?= boards/manifest.py
 
 # include py core make definitions
 include $(TOP)/py/py.mk
+include $(TOP)/extmod/extmod.mk
 
 GIT_SUBMODULES = lib/axtls lib/berkeley-db-1.xx
 
diff --git a/ports/javascript/Makefile b/ports/javascript/Makefile
index ba2680b2a85aa..aea9d6ec37031 100644
--- a/ports/javascript/Makefile
+++ b/ports/javascript/Makefile
@@ -5,6 +5,7 @@ CROSS = 0
 QSTR_DEFS = qstrdefsport.h
 
 include $(TOP)/py/py.mk
+include $(TOP)/extmod/extmod.mk
 
 CC = emcc
 LD = emcc
diff --git a/ports/mimxrt/Makefile b/ports/mimxrt/Makefile
index bb6d4d865320f..759fb5c459b97 100644
--- a/ports/mimxrt/Makefile
+++ b/ports/mimxrt/Makefile
@@ -42,6 +42,7 @@ MICROPY_VFS_FAT ?= 1
 
 # Include py core make definitions
 include $(TOP)/py/py.mk
+include $(TOP)/extmod/extmod.mk
 
 GIT_SUBMODULES = lib/tinyusb lib/nxp_driver lib/lwip lib/mbedtls
 
diff --git a/ports/nrf/Makefile b/ports/nrf/Makefile
index 55cce1906d2c3..25b8c03d1acd4 100644
--- a/ports/nrf/Makefile
+++ b/ports/nrf/Makefile
@@ -56,6 +56,7 @@ FROZEN_MANIFEST ?= modules/manifest.py
 
 # include py core make definitions
 include ../../py/py.mk
+include ../../extmod/extmod.mk
 
 GIT_SUBMODULES = lib/nrfx lib/tinyusb
 
diff --git a/ports/pic16bit/Makefile b/ports/pic16bit/Makefile
index f0d55ec875e35..392196cbc2609 100644
--- a/ports/pic16bit/Makefile
+++ b/ports/pic16bit/Makefile
@@ -5,6 +5,7 @@ QSTR_DEFS = qstrdefsport.h
 
 # include py core make definitions
 include $(TOP)/py/py.mk
+include $(TOP)/extmod/extmod.mk
 
 XCVERSION ?= 1.35
 XC16 ?= /opt/microchip/xc16/v$(XCVERSION)
diff --git a/ports/powerpc/Makefile b/ports/powerpc/Makefile
index cca170dc022df..a1e6fa4daca2c 100644
--- a/ports/powerpc/Makefile
+++ b/ports/powerpc/Makefile
@@ -5,6 +5,7 @@ QSTR_DEFS = qstrdefsport.h
 
 # include py core make definitions
 include $(TOP)/py/py.mk
+include $(TOP)/extmod/extmod.mk
 
 # potato or lpc_serial
 UART ?= potato
diff --git a/ports/qemu-arm/Makefile b/ports/qemu-arm/Makefile
index 08c2d82498f23..7ae7955cf4749 100644
--- a/ports/qemu-arm/Makefile
+++ b/ports/qemu-arm/Makefile
@@ -9,6 +9,7 @@ MICROPY_ROM_TEXT_COMPRESSION ?= 1
 
 # include py core make definitions
 include $(TOP)/py/py.mk
+include $(TOP)/extmod/extmod.mk
 
 BOARD ?= mps2-an385
 
diff --git a/ports/renesas-ra/Makefile b/ports/renesas-ra/Makefile
index efbcb5f70f070..832b7db9fabb0 100644
--- a/ports/renesas-ra/Makefile
+++ b/ports/renesas-ra/Makefile
@@ -67,6 +67,7 @@ FROZEN_MANIFEST ?= boards/manifest.py
 
 # include py core make definitions
 include $(TOP)/py/py.mk
+include $(TOP)/extmod/extmod.mk
 
 GIT_SUBMODULES += lib/fsp
 
diff --git a/ports/samd/Makefile b/ports/samd/Makefile
index ab74b80c161f5..17dd811690f9c 100644
--- a/ports/samd/Makefile
+++ b/ports/samd/Makefile
@@ -22,6 +22,7 @@ FROZEN_MANIFEST ?= boards/manifest.py
 
 # Include py core make definitions
 include $(TOP)/py/py.mk
+include $(TOP)/extmod/extmod.mk
 
 GIT_SUBMODULES = lib/asf4 lib/tinyusb
 
diff --git a/ports/stm32/Makefile b/ports/stm32/Makefile
index d6d379b387a7d..5cde84e67c38e 100644
--- a/ports/stm32/Makefile
+++ b/ports/stm32/Makefile
@@ -33,6 +33,7 @@ MBOOT_TEXT0_ADDR ?= 0x08000000
 
 # include py core make definitions
 include $(TOP)/py/py.mk
+include $(TOP)/extmod/extmod.mk
 
 GIT_SUBMODULES += lib/libhydrogen lib/lwip lib/mbedtls lib/stm32lib
 
diff --git a/ports/teensy/Makefile b/ports/teensy/Makefile
index fe46b0e061a23..745f530d7a31d 100644
--- a/ports/teensy/Makefile
+++ b/ports/teensy/Makefile
@@ -44,6 +44,7 @@ endif # USE_FROZEN
 
 # include py core make definitions
 include $(TOP)/py/py.mk
+include $(TOP)/extmod/extmod.mk
 
 # If you set USE_ARDUINO_TOOLCHAIN=1 then this makefile will attempt to use
 # the toolchain that comes with Teensyduino
diff --git a/ports/unix/Makefile b/ports/unix/Makefile
index d93cdf5d7f574..1067c9c055a58 100644
--- a/ports/unix/Makefile
+++ b/ports/unix/Makefile
@@ -28,6 +28,7 @@ UNAME_S := $(shell uname -s)
 
 # include py core make definitions
 include $(TOP)/py/py.mk
+include $(TOP)/extmod/extmod.mk
 
 GIT_SUBMODULES += lib/axtls lib/berkeley-db-1.xx lib/libffi
 
diff --git a/ports/windows/Makefile b/ports/windows/Makefile
index 3b89ef51efcd9..45d61b0b50ac0 100644
--- a/ports/windows/Makefile
+++ b/ports/windows/Makefile
@@ -25,6 +25,7 @@ QSTR_GLOBAL_DEPENDENCIES = $(VARIANT_DIR)/mpconfigvariant.h
 
 # include py core make definitions
 include $(TOP)/py/py.mk
+include $(TOP)/extmod/extmod.mk
 
 INC += -I.
 INC += -I$(TOP)
diff --git a/py/py.mk b/py/py.mk
index 49b94b279a984..dacfa1bd0680a 100644
--- a/py/py.mk
+++ b/py/py.mk
@@ -172,57 +172,11 @@ PY_CORE_O_BASENAME = $(addprefix py/,\
 	frozenmod.o \
 	)
 
-PY_EXTMOD_O_BASENAME = \
-	extmod/moduasyncio.o \
-	extmod/moductypes.o \
-	extmod/modujson.o \
-	extmod/moduos.o \
-	extmod/modure.o \
-	extmod/moduzlib.o \
-	extmod/moduheapq.o \
-	extmod/modutimeq.o \
-	extmod/moduhashlib.o \
-	extmod/moducryptolib.o \
-	extmod/modubinascii.o \
-	extmod/virtpin.o \
-	extmod/machine_bitstream.o \
-	extmod/machine_mem.o \
-	extmod/machine_pinbase.o \
-	extmod/machine_signal.o \
-	extmod/machine_pulse.o \
-	extmod/machine_pwm.o \
-	extmod/machine_i2c.o \
-	extmod/machine_spi.o \
-	extmod/modbluetooth.o \
-	extmod/modlwip.o \
-	extmod/modussl_axtls.o \
-	extmod/modussl_mbedtls.o \
-	extmod/moduplatform.o\
-	extmod/modurandom.o \
-	extmod/moduselect.o \
-	extmod/moduwebsocket.o \
-	extmod/modwebrepl.o \
-	extmod/modframebuf.o \
-	extmod/vfs.o \
-	extmod/vfs_blockdev.o \
-	extmod/vfs_reader.o \
-	extmod/vfs_posix.o \
-	extmod/vfs_posix_file.o \
-	extmod/vfs_fat.o \
-	extmod/vfs_fat_diskio.o \
-	extmod/vfs_fat_file.o \
-	extmod/vfs_lfs.o \
-	extmod/utime_mphal.o \
-	extmod/uos_dupterm.o \
-	shared/libc/abort_.o \
-	shared/libc/printf.o \
-
 # prepend the build destination prefix to the py object files
 PY_CORE_O = $(addprefix $(BUILD)/, $(PY_CORE_O_BASENAME))
-PY_EXTMOD_O = $(addprefix $(BUILD)/, $(PY_EXTMOD_O_BASENAME))
 
 # this is a convenience variable for ports that want core, extmod and frozen code
-PY_O = $(PY_CORE_O) $(PY_EXTMOD_O)
+PY_O += $(PY_CORE_O)
 
 # object file for frozen code specified via a manifest
 ifneq ($(FROZEN_MANIFEST),)
@@ -231,7 +185,7 @@ endif
 
 # Sources that may contain qstrings
 SRC_QSTR_IGNORE = py/nlr%
-SRC_QSTR += $(SRC_MOD) $(filter-out $(SRC_QSTR_IGNORE),$(PY_CORE_O_BASENAME:.o=.c)) $(PY_EXTMOD_O_BASENAME:.o=.c)
+SRC_QSTR += $(SRC_MOD) $(filter-out $(SRC_QSTR_IGNORE),$(PY_CORE_O_BASENAME:.o=.c))
 
 # Anything that depends on FORCE will be considered out-of-date
 FORCE:
@@ -286,6 +240,3 @@ $(PY_BUILD)/vm.o: CFLAGS += $(CSUPEROPT)
 # http://hg.python.org/cpython/file/b127046831e2/Python/ceval.c#l828
 # http://www.emulators.com/docs/nx25_nostradamus.htm
 #-fno-crossjumping
-
-# Include rules for extmod related code
-include $(TOP)/extmod/extmod.mk

From a565811f23c675ccbeed636c065828cdaf5fa96a Mon Sep 17 00:00:00 2001
From: David Lechner <david@pybricks.com>
Date: Fri, 10 Jun 2022 12:28:56 -0500
Subject: [PATCH 2228/3533] extmod/modbtree: Use buffer protocol for
 keys/values.

This changes the btree implementation to use the buffer protocol for
reading key/values in all methods.  `str` and `bytes` objects are not the
only bytes-like objects that could be used.

Documentation and tests are also updated.

Addresses issue #8748.

Signed-off-by: David Lechner <david@pybricks.com>
---
 docs/library/btree.rst |  5 +++--
 extmod/modbtree.c      | 29 ++++++++++++++++++-----------
 tests/extmod/btree1.py |  7 +++++--
 3 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/docs/library/btree.rst b/docs/library/btree.rst
index c093f970fabaa..9d1dcf1110dc7 100644
--- a/docs/library/btree.rst
+++ b/docs/library/btree.rst
@@ -11,8 +11,9 @@ value, a database also supports efficient ordered range scans (retrieval
 of values with the keys in a given range). On the application interface
 side, BTree database work as close a possible to a way standard `dict`
 type works, one notable difference is that both keys and values must
-be `bytes` objects (so, if you want to store objects of other types, you
-need to serialize them to `bytes` first).
+be `bytes`-like objects (so, if you want to store objects of other types, you
+need to first serialize them to `str` or `bytes` or another type that supports
+the buffer protocol).
 
 The module is based on the well-known BerkelyDB library, version 1.xx.
 
diff --git a/extmod/modbtree.c b/extmod/modbtree.c
index 60a5beec68147..7a1daacb41669 100644
--- a/extmod/modbtree.c
+++ b/extmod/modbtree.c
@@ -76,6 +76,13 @@ STATIC mp_obj_btree_t *btree_new(DB *db, mp_obj_t stream) {
     return o;
 }
 
+STATIC void buf_to_dbt(mp_obj_t obj, DBT *dbt) {
+    mp_buffer_info_t bufinfo;
+    mp_get_buffer_raise(obj, &bufinfo, MP_BUFFER_READ);
+    dbt->data = bufinfo.buf;
+    dbt->size = bufinfo.len;
+}
+
 STATIC void btree_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     (void)kind;
     mp_obj_btree_t *self = MP_OBJ_TO_PTR(self_in);
@@ -98,8 +105,8 @@ STATIC mp_obj_t btree_put(size_t n_args, const mp_obj_t *args) {
     (void)n_args;
     mp_obj_btree_t *self = MP_OBJ_TO_PTR(args[0]);
     DBT key, val;
-    key.data = (void *)mp_obj_str_get_data(args[1], &key.size);
-    val.data = (void *)mp_obj_str_get_data(args[2], &val.size);
+    buf_to_dbt(args[1], &key);
+    buf_to_dbt(args[2], &val);
     return MP_OBJ_NEW_SMALL_INT(__bt_put(self->db, &key, &val, 0));
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(btree_put_obj, 3, 4, btree_put);
@@ -107,7 +114,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(btree_put_obj, 3, 4, btree_put);
 STATIC mp_obj_t btree_get(size_t n_args, const mp_obj_t *args) {
     mp_obj_btree_t *self = MP_OBJ_TO_PTR(args[0]);
     DBT key, val;
-    key.data = (void *)mp_obj_str_get_data(args[1], &key.size);
+    buf_to_dbt(args[1], &key);
     int res = __bt_get(self->db, &key, &val, 0);
     if (res == RET_SPECIAL) {
         if (n_args > 2) {
@@ -126,7 +133,7 @@ STATIC mp_obj_t btree_seq(size_t n_args, const mp_obj_t *args) {
     int flags = MP_OBJ_SMALL_INT_VALUE(args[1]);
     DBT key, val;
     if (n_args > 2) {
-        key.data = (void *)mp_obj_str_get_data(args[2], &key.size);
+        buf_to_dbt(args[2], &key);
     }
 
     int res = __bt_seq(self->db, &key, &val, flags);
@@ -201,7 +208,7 @@ STATIC mp_obj_t btree_iternext(mp_obj_t self_in) {
     if (self->start_key != MP_OBJ_NULL) {
         int flags = R_FIRST;
         if (self->start_key != mp_const_none) {
-            key.data = (void *)mp_obj_str_get_data(self->start_key, &key.size);
+            buf_to_dbt(self->start_key, &key);
             flags = R_CURSOR;
         } else if (desc) {
             flags = R_LAST;
@@ -219,7 +226,7 @@ STATIC mp_obj_t btree_iternext(mp_obj_t self_in) {
 
     if (self->end_key != mp_const_none) {
         DBT end_key;
-        end_key.data = (void *)mp_obj_str_get_data(self->end_key, &end_key.size);
+        buf_to_dbt(self->end_key, &end_key);
         BTREE *t = self->db->internal;
         int cmp = t->bt_cmp(&key, &end_key);
         if (desc) {
@@ -254,7 +261,7 @@ STATIC mp_obj_t btree_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) {
     if (value == MP_OBJ_NULL) {
         // delete
         DBT key;
-        key.data = (void *)mp_obj_str_get_data(index, &key.size);
+        buf_to_dbt(index, &key);
         int res = __bt_delete(self->db, &key, 0);
         if (res == RET_SPECIAL) {
             mp_raise_type(&mp_type_KeyError);
@@ -264,7 +271,7 @@ STATIC mp_obj_t btree_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) {
     } else if (value == MP_OBJ_SENTINEL) {
         // load
         DBT key, val;
-        key.data = (void *)mp_obj_str_get_data(index, &key.size);
+        buf_to_dbt(index, &key);
         int res = __bt_get(self->db, &key, &val, 0);
         if (res == RET_SPECIAL) {
             mp_raise_type(&mp_type_KeyError);
@@ -274,8 +281,8 @@ STATIC mp_obj_t btree_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) {
     } else {
         // store
         DBT key, val;
-        key.data = (void *)mp_obj_str_get_data(index, &key.size);
-        val.data = (void *)mp_obj_str_get_data(value, &val.size);
+        buf_to_dbt(index, &key);
+        buf_to_dbt(value, &val);
         int res = __bt_put(self->db, &key, &val, 0);
         CHECK_ERROR(res);
         return mp_const_none;
@@ -287,7 +294,7 @@ STATIC mp_obj_t btree_binary_op(mp_binary_op_t op, mp_obj_t lhs_in, mp_obj_t rhs
     switch (op) {
         case MP_BINARY_OP_CONTAINS: {
             DBT key, val;
-            key.data = (void *)mp_obj_str_get_data(rhs_in, &key.size);
+            buf_to_dbt(rhs_in, &key);
             int res = __bt_get(self->db, &key, &val, 0);
             CHECK_ERROR(res);
             return mp_obj_new_bool(res != RET_SPECIAL);
diff --git a/tests/extmod/btree1.py b/tests/extmod/btree1.py
index 1f4853eaa365e..876bce4f8757a 100644
--- a/tests/extmod/btree1.py
+++ b/tests/extmod/btree1.py
@@ -10,10 +10,13 @@
 f = uio.BytesIO()
 db = btree.open(f, pagesize=512)
 
+mv = memoryview(b"bar1foo1")
+
 db[b"foo3"] = b"bar3"
 db[b"foo1"] = b"bar1"
-db[b"foo2"] = b"bar2"
-db[b"bar1"] = b"foo1"
+# any type that implements buffer protocol works for key and value
+db["foo2"] = "bar2"
+db[mv[:4]] = mv[4:]
 
 dbstr = str(db)
 print(dbstr[:7], dbstr[-1:])

From 89e1e67748e681da5f414dc597e89eaee8822817 Mon Sep 17 00:00:00 2001
From: Howard Lovatt <howard.lovatt@gmail.com>
Date: Sat, 10 Oct 2020 08:35:50 +1100
Subject: [PATCH 2229/3533] docs/library/pyb.Timer: Document `brk` argument and
 its constants.

---
 docs/library/pyb.Timer.rst | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/docs/library/pyb.Timer.rst b/docs/library/pyb.Timer.rst
index cc7a01f580a87..639ae1dcd1b0d 100644
--- a/docs/library/pyb.Timer.rst
+++ b/docs/library/pyb.Timer.rst
@@ -62,7 +62,7 @@ Constructors
 Methods
 -------
 
-.. method:: Timer.init(*, freq, prescaler, period, mode=Timer.UP, div=1, callback=None, deadtime=0)
+.. method:: Timer.init(*, freq, prescaler, period, mode=Timer.UP, div=1, callback=None, deadtime=0, brk=Timer.BRK_OFF)
 
    Initialise the timer.  Initialisation must be either by frequency (in Hz)
    or by prescaler and period::
@@ -107,6 +107,12 @@ Methods
        measures ticks of ``source_freq`` divided by ``div`` clock ticks.
        ``deadtime`` is only available on timers 1 and 8.
 
+     - ``brk`` - specifies if the break mode is used to kill the output of
+       the PWM when the ``BRK_IN`` input is asserted. The value of this
+       argument determines if break is enabled and what the polarity is, and
+       can be one of ``Timer.BRK_OFF``, ``Timer.BRK_LOW`` or
+       ``Timer.BRK_HIGH``.
+
     You must either specify freq or both of period and prescaler.
 
 .. method:: Timer.deinit()
@@ -271,3 +277,9 @@ Constants
           Timer.CENTER
 
    Configures the timer to count Up, Down, or from 0 to ARR and then back down to 0.
+
+.. data:: Timer.BRK_OFF
+          Timer.BRK_LOW
+          Timer.BRK_HIGH
+
+   Configures the break mode when passed to the ``brk`` keyword argument.

From 9175482f29264b017534902bb65e23a2d6485006 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 21 Jun 2022 14:33:23 +1000
Subject: [PATCH 2230/3533] docs/library: Remove unnecessary "pyb." prefix on
 class names.

Otherwise these classes are refered to with a double prefix, like
pyb.pyb.ADC.

Signed-off-by: Damien George <damien@micropython.org>
---
 docs/library/pyb.ADC.rst     | 2 +-
 docs/library/pyb.Accel.rst   | 2 +-
 docs/library/pyb.CAN.rst     | 2 +-
 docs/library/pyb.DAC.rst     | 2 +-
 docs/library/pyb.ExtInt.rst  | 2 +-
 docs/library/pyb.Flash.rst   | 4 ++--
 docs/library/pyb.I2C.rst     | 2 +-
 docs/library/pyb.LCD.rst     | 2 +-
 docs/library/pyb.LED.rst     | 2 +-
 docs/library/pyb.Pin.rst     | 2 +-
 docs/library/pyb.RTC.rst     | 2 +-
 docs/library/pyb.SPI.rst     | 2 +-
 docs/library/pyb.Servo.rst   | 2 +-
 docs/library/pyb.Switch.rst  | 2 +-
 docs/library/pyb.Timer.rst   | 2 +-
 docs/library/pyb.UART.rst    | 2 +-
 docs/library/pyb.USB_HID.rst | 2 +-
 docs/library/pyb.USB_VCP.rst | 2 +-
 18 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/docs/library/pyb.ADC.rst b/docs/library/pyb.ADC.rst
index 1b16e0c2fcccb..9410e5194bf89 100644
--- a/docs/library/pyb.ADC.rst
+++ b/docs/library/pyb.ADC.rst
@@ -23,7 +23,7 @@ Usage::
 Constructors
 ------------
 
-.. class:: pyb.ADC(pin)
+.. class:: ADC(pin)
 
    Create an ADC object associated with the given pin.
    This allows you to then read analog values on that pin.
diff --git a/docs/library/pyb.Accel.rst b/docs/library/pyb.Accel.rst
index d5c0ca8634598..7f5c60f4cea5f 100644
--- a/docs/library/pyb.Accel.rst
+++ b/docs/library/pyb.Accel.rst
@@ -16,7 +16,7 @@ Raw values are between -32 and 31.
 Constructors
 ------------
 
-.. class:: pyb.Accel()
+.. class:: Accel()
 
    Create and return an accelerometer object.
 
diff --git a/docs/library/pyb.CAN.rst b/docs/library/pyb.CAN.rst
index 69704d09b2579..54377091db2b1 100644
--- a/docs/library/pyb.CAN.rst
+++ b/docs/library/pyb.CAN.rst
@@ -31,7 +31,7 @@ for both classic and FD CAN controllers, unless otherwise stated.
 Constructors
 ------------
 
-.. class:: pyb.CAN(bus, ...)
+.. class:: CAN(bus, ...)
 
    Construct a CAN object on the given bus.  *bus* can be 1-2, or ``'YA'`` or ``'YB'``.
    With no additional parameters, the CAN object is created but not
diff --git a/docs/library/pyb.DAC.rst b/docs/library/pyb.DAC.rst
index 0eb469bef4129..aa79342895eb3 100644
--- a/docs/library/pyb.DAC.rst
+++ b/docs/library/pyb.DAC.rst
@@ -49,7 +49,7 @@ To output a continuous sine-wave at 12-bit resolution::
 Constructors
 ------------
 
-.. class:: pyb.DAC(port, bits=8, *, buffering=None)
+.. class:: DAC(port, bits=8, *, buffering=None)
 
    Construct a new DAC object.
 
diff --git a/docs/library/pyb.ExtInt.rst b/docs/library/pyb.ExtInt.rst
index 7741cc51e2381..f49fbb1a14913 100644
--- a/docs/library/pyb.ExtInt.rst
+++ b/docs/library/pyb.ExtInt.rst
@@ -51,7 +51,7 @@ usrsw.h for an example of using this.
 Constructors
 ------------
 
-.. class:: pyb.ExtInt(pin, mode, pull, callback)
+.. class:: ExtInt(pin, mode, pull, callback)
 
    Create an ExtInt object:
 
diff --git a/docs/library/pyb.Flash.rst b/docs/library/pyb.Flash.rst
index 01b3a0ac9e0a3..984e13f4583a4 100644
--- a/docs/library/pyb.Flash.rst
+++ b/docs/library/pyb.Flash.rst
@@ -15,7 +15,7 @@ application.
 Constructors
 ------------
 
-.. class:: pyb.Flash()
+.. class:: Flash()
 
    Create and return a block device that represents the flash device presented
    to the USB mass storage interface.
@@ -25,7 +25,7 @@ Constructors
 
    This constructor is deprecated and will be removed in a future version of MicroPython.
 
-.. class:: pyb.Flash(*, start=-1, len=-1)
+.. class:: Flash(*, start=-1, len=-1)
    :noindex:
 
    Create and return a block device that accesses the flash at the specified offset. The length defaults to the remaining size of the device.
diff --git a/docs/library/pyb.I2C.rst b/docs/library/pyb.I2C.rst
index f60b506861c3a..24b9cb8c3aaf3 100644
--- a/docs/library/pyb.I2C.rst
+++ b/docs/library/pyb.I2C.rst
@@ -56,7 +56,7 @@ Master also has other methods::
 Constructors
 ------------
 
-.. class:: pyb.I2C(bus, ...)
+.. class:: I2C(bus, ...)
 
    Construct an I2C object on the given bus.  ``bus`` can be 1 or 2, 'X' or
    'Y'. With no additional parameters, the I2C object is created but not
diff --git a/docs/library/pyb.LCD.rst b/docs/library/pyb.LCD.rst
index 018902ca6896a..ba394d36a8318 100644
--- a/docs/library/pyb.LCD.rst
+++ b/docs/library/pyb.LCD.rst
@@ -41,7 +41,7 @@ For example, to make a bouncing dot, try::
 Constructors
 ------------
 
-.. class:: pyb.LCD(skin_position)
+.. class:: LCD(skin_position)
 
    Construct an LCD object in the given skin position.  ``skin_position`` can be 'X' or 'Y', and
    should match the position where the LCD pyskin is plugged in.
diff --git a/docs/library/pyb.LED.rst b/docs/library/pyb.LED.rst
index d3ab965e7e7c8..de07c7d1c3454 100644
--- a/docs/library/pyb.LED.rst
+++ b/docs/library/pyb.LED.rst
@@ -10,7 +10,7 @@ The LED object controls an individual LED (Light Emitting Diode).
 Constructors
 ------------
 
-.. class:: pyb.LED(id)
+.. class:: LED(id)
 
    Create an LED object associated with the given LED:
 
diff --git a/docs/library/pyb.Pin.rst b/docs/library/pyb.Pin.rst
index 33b994e390dc2..d13cb9741cd22 100644
--- a/docs/library/pyb.Pin.rst
+++ b/docs/library/pyb.Pin.rst
@@ -74,7 +74,7 @@ gpio pins.
 Constructors
 ------------
 
-.. class:: pyb.Pin(id, ...)
+.. class:: Pin(id, ...)
 
    Create a new Pin object associated with the id.  If additional arguments are given,
    they are used to initialise the pin.  See :meth:`pin.init`.
diff --git a/docs/library/pyb.RTC.rst b/docs/library/pyb.RTC.rst
index c477e7f035c87..040b1fe6b25ea 100644
--- a/docs/library/pyb.RTC.rst
+++ b/docs/library/pyb.RTC.rst
@@ -17,7 +17,7 @@ Example usage::
 Constructors
 ------------
 
-.. class:: pyb.RTC()
+.. class:: RTC()
 
    Create an RTC object.
 
diff --git a/docs/library/pyb.SPI.rst b/docs/library/pyb.SPI.rst
index 14b90a2240f7e..4903a2c33f534 100644
--- a/docs/library/pyb.SPI.rst
+++ b/docs/library/pyb.SPI.rst
@@ -28,7 +28,7 @@ Additional methods for SPI::
 Constructors
 ------------
 
-.. class:: pyb.SPI(bus, ...)
+.. class:: SPI(bus, ...)
 
    Construct an SPI object on the given bus.  ``bus`` can be 1 or 2, or
    'X' or 'Y'. With no additional parameters, the SPI object is created but
diff --git a/docs/library/pyb.Servo.rst b/docs/library/pyb.Servo.rst
index b3ce71d11ac80..c52ee705f6f6c 100644
--- a/docs/library/pyb.Servo.rst
+++ b/docs/library/pyb.Servo.rst
@@ -30,7 +30,7 @@ Example usage::
 Constructors
 ------------
 
-.. class:: pyb.Servo(id)
+.. class:: Servo(id)
 
    Create a servo object.  ``id`` is 1-4, and corresponds to pins X1 through X4.
 
diff --git a/docs/library/pyb.Switch.rst b/docs/library/pyb.Switch.rst
index 1edcbf8488a14..9ddf8c4170a3b 100644
--- a/docs/library/pyb.Switch.rst
+++ b/docs/library/pyb.Switch.rst
@@ -23,7 +23,7 @@ Example::
 Constructors
 ------------
 
-.. class:: pyb.Switch()
+.. class:: Switch()
 
    Create and return a switch object.
 
diff --git a/docs/library/pyb.Timer.rst b/docs/library/pyb.Timer.rst
index 639ae1dcd1b0d..53213666ba87b 100644
--- a/docs/library/pyb.Timer.rst
+++ b/docs/library/pyb.Timer.rst
@@ -53,7 +53,7 @@ limitation.
 Constructors
 ------------
 
-.. class:: pyb.Timer(id, ...)
+.. class:: Timer(id, ...)
 
    Construct a new timer object of the given id.  If additional
    arguments are given, then the timer is initialised by ``init(...)``.
diff --git a/docs/library/pyb.UART.rst b/docs/library/pyb.UART.rst
index e1735403c44a8..2bd9c6b34ef9a 100644
--- a/docs/library/pyb.UART.rst
+++ b/docs/library/pyb.UART.rst
@@ -46,7 +46,7 @@ Earlier versions use ``uart.send`` and ``uart.recv``.
 Constructors
 ------------
 
-.. class:: pyb.UART(bus, ...)
+.. class:: UART(bus, ...)
 
    Construct a UART object on the given bus.
    For Pyboard ``bus`` can be 1-4, 6, 'XA', 'XB', 'YA', or 'YB'.
diff --git a/docs/library/pyb.USB_HID.rst b/docs/library/pyb.USB_HID.rst
index 7e23d1313d0da..80162cc56554c 100644
--- a/docs/library/pyb.USB_HID.rst
+++ b/docs/library/pyb.USB_HID.rst
@@ -13,7 +13,7 @@ Before you can use this class, you need to use :meth:`pyb.usb_mode()` to set the
 Constructors
 ------------
 
-.. class:: pyb.USB_HID()
+.. class:: USB_HID()
 
    Create a new USB_HID object.
 
diff --git a/docs/library/pyb.USB_VCP.rst b/docs/library/pyb.USB_VCP.rst
index 1cca8dcadf6fc..17d2ecff4a6d7 100644
--- a/docs/library/pyb.USB_VCP.rst
+++ b/docs/library/pyb.USB_VCP.rst
@@ -12,7 +12,7 @@ the connected host.
 Constructors
 ------------
 
-.. class:: pyb.USB_VCP(id=0)
+.. class:: USB_VCP(id=0)
 
    Create a new USB_VCP object.  The *id* argument specifies which USB VCP port to
    use.

From f12754af06c83f06f2651f50109b84a9b700e12a Mon Sep 17 00:00:00 2001
From: "Stewart C. Russell" <scruss@scruss.com>
Date: Sun, 17 Jan 2021 22:56:29 -0500
Subject: [PATCH 2231/3533] docs: Set LaTeX engine to XeLaTeX for PDF
 generation.

Also added to suggested packages list for PDF build.

See comment in Sphinx project for (some) details:
https://github.com/sphinx-doc/sphinx/pull/5693#pullrequestreview-180444650
---
 docs/README.md | 6 +++---
 docs/conf.py   | 2 ++
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/docs/README.md b/docs/README.md
index 1591911c34560..892726ba17ffe 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -47,7 +47,7 @@ This can be achieved with:
 
     make latexpdf
 
-but require rather complete install of LaTeX with various extensions. On
-Debian/Ubuntu, try (500MB+ download):
+but requires a rather complete install of LaTeX with various extensions. On
+Debian/Ubuntu, try (1GB+ download):
 
-    apt-get install texlive-latex-recommended texlive-latex-extra
+    apt install texlive-latex-recommended texlive-latex-extra texlive-xetex texlive-fonts-extra cm-super xindy
diff --git a/docs/conf.py b/docs/conf.py
index d0c989eeaae41..a7a4ab08c5b03 100755
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -259,6 +259,8 @@
 # If false, no module index is generated.
 #latex_domain_indices = True
 
+# Enable better Unicode support so that `make latexpdf` doesn't fail
+latex_engine = "xelatex"
 
 # -- Options for manual page output ---------------------------------------
 

From 3d58bb23c28394fedd26151ab69cc4ba793043f1 Mon Sep 17 00:00:00 2001
From: Patrick Joy <74940387+ThinkTransit@users.noreply.github.com>
Date: Wed, 13 Apr 2022 21:32:13 +1000
Subject: [PATCH 2232/3533] docs/library/machine: Add note on interrupts being
 critical to system.

---
 docs/library/machine.rst | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/docs/library/machine.rst b/docs/library/machine.rst
index d66423d0d4532..c3bf43896136b 100644
--- a/docs/library/machine.rst
+++ b/docs/library/machine.rst
@@ -48,6 +48,23 @@ Reset related functions
 Interrupt related functions
 ---------------------------
 
+The following functions allow control over interrupts.  Some systems require
+interrupts to operate correctly so disabling them for long periods may
+compromise core functionality, for example watchdog timers may trigger
+unexpectedly.  Interrupts should only be disabled for a minimum amount of time
+and then re-enabled to their previous state.  For example::
+
+    import machine
+
+    # Disable interrupts
+    state = machine.disable_irq()
+
+    # Do a small amount of time-critical work here
+
+    # Enable interrupts
+    machine.enable_irq(state)
+
+
 .. function:: disable_irq()
 
    Disable interrupt requests.

From 7861eddd0fe7c9e290cdbc4586dde24d10b68c96 Mon Sep 17 00:00:00 2001
From: Luiz Brandao <fromvega@gmail.com>
Date: Thu, 14 Apr 2022 12:24:35 -0400
Subject: [PATCH 2233/3533] docs/library/uasyncio: Consistently use "uasyncio"
 instead of "asyncio".

---
 docs/library/uasyncio.rst | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/library/uasyncio.rst b/docs/library/uasyncio.rst
index a842cc64d403b..0c71702420257 100644
--- a/docs/library/uasyncio.rst
+++ b/docs/library/uasyncio.rst
@@ -71,9 +71,9 @@ Additional functions
     than *timeout* seconds.  If *awaitable* is not a task then a task will be
     created from it.
 
-    If a timeout occurs, it cancels the task and raises ``asyncio.TimeoutError``:
+    If a timeout occurs, it cancels the task and raises ``uasyncio.TimeoutError``:
     this should be trapped by the caller.  The task receives
-    ``asyncio.CancelledError`` which may be ignored or trapped using ``try...except``
+    ``uasyncio.CancelledError`` which may be ignored or trapped using ``try...except``
     or ``try...finally`` to run cleanup code.
 
     Returns the return value of *awaitable*.
@@ -108,7 +108,7 @@ class Task
 
 .. method:: Task.cancel()
 
-    Cancel the task by injecting ``asyncio.CancelledError`` into it.  The task may
+    Cancel the task by injecting ``uasyncio.CancelledError`` into it.  The task may
     ignore this exception.  Cleanup code may be run by trapping it, or via
     ``try ... finally``.
 
@@ -148,7 +148,7 @@ class ThreadSafeFlag
 .. class:: ThreadSafeFlag()
 
     Create a new flag which can be used to synchronise a task with code running
-    outside the asyncio loop, such as other threads, IRQs, or scheduler
+    outside the uasyncio loop, such as other threads, IRQs, or scheduler
     callbacks.  Flags start in the cleared state.
 
 .. method:: ThreadSafeFlag.set()

From 0172292762649db91f588107b2163ab6449dc7ca Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Sat, 7 Aug 2021 02:16:59 +1000
Subject: [PATCH 2234/3533] py/parsenum: Support parsing complex numbers of the
 form "a+bj".

To conform with CPython.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 py/parsenum.c           | 37 ++++++++++++++++++++++++++++++++-----
 tests/float/complex1.py | 12 ++++++++++++
 2 files changed, 44 insertions(+), 5 deletions(-)

diff --git a/py/parsenum.c b/py/parsenum.c
index 1cfe842577011..848a7732d9cc2 100644
--- a/py/parsenum.c
+++ b/py/parsenum.c
@@ -166,6 +166,12 @@ mp_obj_t mp_parse_num_integer(const char *restrict str_, size_t len, int base, m
     }
 }
 
+enum {
+    REAL_IMAG_STATE_START = 0,
+    REAL_IMAG_STATE_HAVE_REAL = 1,
+    REAL_IMAG_STATE_HAVE_IMAG = 2,
+};
+
 typedef enum {
     PARSE_DEC_IN_INTG,
     PARSE_DEC_IN_FRAC,
@@ -196,7 +202,12 @@ mp_obj_t mp_parse_num_decimal(const char *str, size_t len, bool allow_imag, bool
     const char *top = str + len;
     mp_float_t dec_val = 0;
     bool dec_neg = false;
-    bool imag = false;
+    unsigned int real_imag_state = REAL_IMAG_STATE_START;
+
+    #if MICROPY_PY_BUILTINS_COMPLEX
+    mp_float_t dec_real = 0;
+parse_start:
+    #endif
 
     // skip leading space
     for (; str < top && unichar_isspace(*str); str++) {
@@ -281,7 +292,7 @@ mp_obj_t mp_parse_num_decimal(const char *str, size_t len, bool allow_imag, bool
                     goto value_error;
                 }
             } else if (allow_imag && (dig | 0x20) == 'j') {
-                imag = true;
+                real_imag_state |= REAL_IMAG_STATE_HAVE_IMAG;
                 break;
             } else if (dig == '_') {
                 continue;
@@ -332,18 +343,34 @@ mp_obj_t mp_parse_num_decimal(const char *str, size_t len, bool allow_imag, bool
 
     // check we reached the end of the string
     if (str != top) {
+        #if MICROPY_PY_BUILTINS_COMPLEX
+        if (force_complex && real_imag_state == REAL_IMAG_STATE_START) {
+            // If we've only seen a real so far, keep parsing for the imaginary part.
+            dec_real = dec_val;
+            dec_val = 0;
+            real_imag_state |= REAL_IMAG_STATE_HAVE_REAL;
+            goto parse_start;
+        }
+        #endif
         goto value_error;
     }
 
+    #if MICROPY_PY_BUILTINS_COMPLEX
+    if (real_imag_state == REAL_IMAG_STATE_HAVE_REAL) {
+        // We're on the second part, but didn't get the expected imaginary number.
+        goto value_error;
+    }
+    #endif
+
     // return the object
     #if MICROPY_PY_BUILTINS_COMPLEX
-    if (imag) {
-        return mp_obj_new_complex(0, dec_val);
+    if (real_imag_state != REAL_IMAG_STATE_START) {
+        return mp_obj_new_complex(dec_real, dec_val);
     } else if (force_complex) {
         return mp_obj_new_complex(dec_val, 0);
     }
     #else
-    if (imag || force_complex) {
+    if (real_imag_state != REAL_IMAG_STATE_START || force_complex) {
         raise_exc(mp_obj_new_exception_msg(&mp_type_ValueError, MP_ERROR_TEXT("complex values not supported")), lex);
     }
     #endif
diff --git a/tests/float/complex1.py b/tests/float/complex1.py
index 139bb0c50923c..feede0eab332a 100644
--- a/tests/float/complex1.py
+++ b/tests/float/complex1.py
@@ -7,6 +7,11 @@
 print(complex("1"))
 print(complex("1.2"))
 print(complex("1.2j"))
+print(complex("1+2j"))
+print(complex("-1-2j"))
+print(complex("+1-2j"))
+print(complex(" -1-2j "))
+print(complex(" +1-2j "))
 print(complex(1, 2))
 print(complex(1j, 2j))
 
@@ -72,6 +77,13 @@
 print(float("inf") * (1 + 1j))
 print(float("-inf") * (1 + 1j))
 
+# malformed complex strings
+for test in ("1+2", "1j+2", "1+2j+3", "1+2+3j", "1 + 2j"):
+    try:
+        complex(test)
+    except ValueError:
+        print("ValueError", test)
+
 # can't assign to attributes
 try:
     (1j).imag = 0

From 61ce260ff73b1191a9190c8cac7a7a1bd5b2f274 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 21 Jun 2022 23:45:27 +1000
Subject: [PATCH 2235/3533] py/parsenum: Fix parsing of complex "j" and also
 "nanj", "infj".

Prior to this commit, complex("j") would return 0j, and complex("nanj")
would return nan+0j.  This commit makes sure "j" is tested for after
parsing the number (nan, inf or a decimal), and also supports the case of
"j" on its own.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/parsenum.c           | 12 +++++++++---
 tests/float/complex1.py |  5 +++++
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/py/parsenum.c b/py/parsenum.c
index 848a7732d9cc2..b90dfaaafbf30 100644
--- a/py/parsenum.c
+++ b/py/parsenum.c
@@ -291,9 +291,6 @@ mp_obj_t mp_parse_num_decimal(const char *str, size_t len, bool allow_imag, bool
                 if (str == top) {
                     goto value_error;
                 }
-            } else if (allow_imag && (dig | 0x20) == 'j') {
-                real_imag_state |= REAL_IMAG_STATE_HAVE_IMAG;
-                break;
             } else if (dig == '_') {
                 continue;
             } else {
@@ -327,6 +324,15 @@ mp_obj_t mp_parse_num_decimal(const char *str, size_t len, bool allow_imag, bool
         }
     }
 
+    if (allow_imag && str < top && (*str | 0x20) == 'j') {
+        if (str == str_val_start) {
+            // Convert "j" to "1j".
+            dec_val = 1;
+        }
+        ++str;
+        real_imag_state |= REAL_IMAG_STATE_HAVE_IMAG;
+    }
+
     // negate value if needed
     if (dec_neg) {
         dec_val = -dec_val;
diff --git a/tests/float/complex1.py b/tests/float/complex1.py
index feede0eab332a..f4107a1390fee 100644
--- a/tests/float/complex1.py
+++ b/tests/float/complex1.py
@@ -4,14 +4,19 @@
 print(complex(1))
 print(complex(1.2))
 print(complex(1.2j))
+print(complex("j"))
+print(complex("J"))
 print(complex("1"))
 print(complex("1.2"))
 print(complex("1.2j"))
+print(complex("1+j"))
 print(complex("1+2j"))
 print(complex("-1-2j"))
 print(complex("+1-2j"))
 print(complex(" -1-2j "))
 print(complex(" +1-2j "))
+print(complex("nanj"))
+print(complex("nan-infj"))
 print(complex(1, 2))
 print(complex(1j, 2j))
 

From 627ba381545b73a383b9e56a4b29c03ac5914a4d Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 22 Jun 2022 10:37:48 +1000
Subject: [PATCH 2236/3533] py/parsenum: Optimise when building with complex
 disabled.

To reduce code size when MICROPY_PY_BUILTINS_COMPLEX is disabled.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/modujson.c   |  2 +-
 py/objcomplex.c     |  2 +-
 py/objfloat.c       |  2 +-
 py/parse.c          |  2 +-
 py/parsenum.c       | 23 ++++++++++++++---------
 py/parsenum.h       | 14 ++++++++++++++
 py/persistentcode.c |  2 +-
 7 files changed, 33 insertions(+), 14 deletions(-)

diff --git a/extmod/modujson.c b/extmod/modujson.c
index bee432db255ff..9a73e4501e7c0 100644
--- a/extmod/modujson.c
+++ b/extmod/modujson.c
@@ -270,7 +270,7 @@ STATIC mp_obj_t mod_ujson_load(mp_obj_t stream_obj) {
                     S_NEXT(s);
                 }
                 if (flt) {
-                    next = mp_parse_num_decimal(vstr.buf, vstr.len, false, false, NULL);
+                    next = mp_parse_num_float(vstr.buf, vstr.len, false, NULL);
                 } else {
                     next = mp_parse_num_integer(vstr.buf, vstr.len, 10, NULL);
                 }
diff --git a/py/objcomplex.c b/py/objcomplex.c
index 56c8353e905f7..157617e156774 100644
--- a/py/objcomplex.c
+++ b/py/objcomplex.c
@@ -83,7 +83,7 @@ STATIC mp_obj_t complex_make_new(const mp_obj_type_t *type_in, size_t n_args, si
                 // a string, parse it
                 size_t l;
                 const char *s = mp_obj_str_get_data(args[0], &l);
-                return mp_parse_num_decimal(s, l, true, true, NULL);
+                return mp_parse_num_complex(s, l, NULL);
             } else if (mp_obj_is_type(args[0], &mp_type_complex)) {
                 // a complex, just return it
                 return args[0];
diff --git a/py/objfloat.c b/py/objfloat.c
index 0855baac83866..8e89b3da37beb 100644
--- a/py/objfloat.c
+++ b/py/objfloat.c
@@ -137,7 +137,7 @@ STATIC mp_obj_t float_make_new(const mp_obj_type_t *type_in, size_t n_args, size
             mp_buffer_info_t bufinfo;
             if (mp_get_buffer(args[0], &bufinfo, MP_BUFFER_READ)) {
                 // a textual representation, parse it
-                return mp_parse_num_decimal(bufinfo.buf, bufinfo.len, false, false, NULL);
+                return mp_parse_num_float(bufinfo.buf, bufinfo.len, false, NULL);
             } else if (mp_obj_is_float(args[0])) {
                 // a float, just return it
                 return args[0];
diff --git a/py/parse.c b/py/parse.c
index 14f5f6c105039..d58098af2e165 100644
--- a/py/parse.c
+++ b/py/parse.c
@@ -591,7 +591,7 @@ STATIC void push_result_token(parser_t *parser, uint8_t rule_id) {
         mp_obj_t o = mp_parse_num_integer(lex->vstr.buf, lex->vstr.len, 0, lex);
         pn = make_node_const_object_optimised(parser, lex->tok_line, o);
     } else if (lex->tok_kind == MP_TOKEN_FLOAT_OR_IMAG) {
-        mp_obj_t o = mp_parse_num_decimal(lex->vstr.buf, lex->vstr.len, true, false, lex);
+        mp_obj_t o = mp_parse_num_float(lex->vstr.buf, lex->vstr.len, true, lex);
         pn = make_node_const_object(parser, lex->tok_line, o);
     } else if (lex->tok_kind == MP_TOKEN_STRING) {
         // Don't automatically intern all strings.  Doc strings (which are usually large)
diff --git a/py/parsenum.c b/py/parsenum.c
index b90dfaaafbf30..5e8e5dfe8c0f9 100644
--- a/py/parsenum.c
+++ b/py/parsenum.c
@@ -178,7 +178,12 @@ typedef enum {
     PARSE_DEC_IN_EXP,
 } parse_dec_in_t;
 
-mp_obj_t mp_parse_num_decimal(const char *str, size_t len, bool allow_imag, bool force_complex, mp_lexer_t *lex) {
+#if MICROPY_PY_BUILTINS_COMPLEX
+mp_obj_t mp_parse_num_decimal(const char *str, size_t len, bool allow_imag, bool force_complex, mp_lexer_t *lex)
+#else
+mp_obj_t mp_parse_num_float(const char *str, size_t len, bool allow_imag, mp_lexer_t *lex)
+#endif
+{
     #if MICROPY_PY_BUILTINS_FLOAT
 
 // DEC_VAL_MAX only needs to be rough and is used to retain precision while not overflowing
@@ -202,9 +207,9 @@ mp_obj_t mp_parse_num_decimal(const char *str, size_t len, bool allow_imag, bool
     const char *top = str + len;
     mp_float_t dec_val = 0;
     bool dec_neg = false;
-    unsigned int real_imag_state = REAL_IMAG_STATE_START;
 
     #if MICROPY_PY_BUILTINS_COMPLEX
+    unsigned int real_imag_state = REAL_IMAG_STATE_START;
     mp_float_t dec_real = 0;
 parse_start:
     #endif
@@ -325,12 +330,16 @@ mp_obj_t mp_parse_num_decimal(const char *str, size_t len, bool allow_imag, bool
     }
 
     if (allow_imag && str < top && (*str | 0x20) == 'j') {
+        #if MICROPY_PY_BUILTINS_COMPLEX
         if (str == str_val_start) {
             // Convert "j" to "1j".
             dec_val = 1;
         }
         ++str;
         real_imag_state |= REAL_IMAG_STATE_HAVE_IMAG;
+        #else
+        raise_exc(mp_obj_new_exception_msg(&mp_type_ValueError, MP_ERROR_TEXT("complex values not supported")), lex);
+        #endif
     }
 
     // negate value if needed
@@ -369,20 +378,16 @@ mp_obj_t mp_parse_num_decimal(const char *str, size_t len, bool allow_imag, bool
     #endif
 
     // return the object
+
     #if MICROPY_PY_BUILTINS_COMPLEX
     if (real_imag_state != REAL_IMAG_STATE_START) {
         return mp_obj_new_complex(dec_real, dec_val);
     } else if (force_complex) {
         return mp_obj_new_complex(dec_val, 0);
     }
-    #else
-    if (real_imag_state != REAL_IMAG_STATE_START || force_complex) {
-        raise_exc(mp_obj_new_exception_msg(&mp_type_ValueError, MP_ERROR_TEXT("complex values not supported")), lex);
-    }
     #endif
-    else {
-        return mp_obj_new_float(dec_val);
-    }
+
+    return mp_obj_new_float(dec_val);
 
 value_error:
     raise_exc(mp_obj_new_exception_msg(&mp_type_ValueError, MP_ERROR_TEXT("invalid syntax for number")), lex);
diff --git a/py/parsenum.h b/py/parsenum.h
index a5bed731d24f0..f444632d23021 100644
--- a/py/parsenum.h
+++ b/py/parsenum.h
@@ -31,7 +31,21 @@
 #include "py/obj.h"
 
 // these functions raise a SyntaxError if lex!=NULL, else a ValueError
+
 mp_obj_t mp_parse_num_integer(const char *restrict str, size_t len, int base, mp_lexer_t *lex);
+
+#if MICROPY_PY_BUILTINS_COMPLEX
 mp_obj_t mp_parse_num_decimal(const char *str, size_t len, bool allow_imag, bool force_complex, mp_lexer_t *lex);
 
+static inline mp_obj_t mp_parse_num_float(const char *str, size_t len, bool allow_imag, mp_lexer_t *lex) {
+    return mp_parse_num_decimal(str, len, allow_imag, false, lex);
+}
+
+static inline mp_obj_t mp_parse_num_complex(const char *str, size_t len, mp_lexer_t *lex) {
+    return mp_parse_num_decimal(str, len, true, true, lex);
+}
+#else
+mp_obj_t mp_parse_num_float(const char *str, size_t len, bool allow_imag, mp_lexer_t *lex);
+#endif
+
 #endif // MICROPY_INCLUDED_PY_PARSENUM_H
diff --git a/py/persistentcode.c b/py/persistentcode.c
index 6304d1ff08481..fbef0b2c0f916 100644
--- a/py/persistentcode.c
+++ b/py/persistentcode.c
@@ -207,7 +207,7 @@ STATIC mp_obj_t load_obj(mp_reader_t *reader) {
             return mp_parse_num_integer(vstr.buf, vstr.len, 10, NULL);
         } else {
             assert(obj_type == MP_PERSISTENT_OBJ_FLOAT || obj_type == MP_PERSISTENT_OBJ_COMPLEX);
-            return mp_parse_num_decimal(vstr.buf, vstr.len, obj_type == MP_PERSISTENT_OBJ_COMPLEX, false, NULL);
+            return mp_parse_num_float(vstr.buf, vstr.len, obj_type == MP_PERSISTENT_OBJ_COMPLEX, NULL);
         }
     }
 }

From ad7b98c8290ba5f4235fe0cd8fbf542e5bcace54 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 23 Jun 2022 12:58:11 +1000
Subject: [PATCH 2237/3533] esp8266/mpconfigport: Switch to ROM feature level
 configuration.

This is a no-op in terms of board configuration.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp8266/boards/GENERIC/mpconfigboard.h  |  8 --
 .../esp8266/boards/GENERIC_1M/mpconfigboard.h |  8 +-
 .../boards/GENERIC_512K/mpconfigboard.h       |  8 ++
 ports/esp8266/mpconfigport.h                  | 75 +++++++++----------
 4 files changed, 46 insertions(+), 53 deletions(-)

diff --git a/ports/esp8266/boards/GENERIC/mpconfigboard.h b/ports/esp8266/boards/GENERIC/mpconfigboard.h
index e4991ba970901..1d9b8e6f70dd3 100644
--- a/ports/esp8266/boards/GENERIC/mpconfigboard.h
+++ b/ports/esp8266/boards/GENERIC/mpconfigboard.h
@@ -11,12 +11,4 @@
 #define MICROPY_READER_VFS              (MICROPY_VFS)
 #define MICROPY_VFS                     (1)
 
-#define MICROPY_PY_FSTRINGS             (1)
-#define MICROPY_PY_BUILTINS_SLICE_ATTRS (1)
-#define MICROPY_PY_ALL_SPECIAL_METHODS  (1)
-#define MICROPY_PY_IO_FILEIO            (1)
-#define MICROPY_PY_SYS_STDIO_BUFFER     (1)
-#define MICROPY_PY_UASYNCIO             (1)
-#define MICROPY_PY_URE_SUB              (1)
 #define MICROPY_PY_UCRYPTOLIB           (1)
-#define MICROPY_PY_FRAMEBUF             (1)
diff --git a/ports/esp8266/boards/GENERIC_1M/mpconfigboard.h b/ports/esp8266/boards/GENERIC_1M/mpconfigboard.h
index ed50729936b71..10e8adcda7ecc 100644
--- a/ports/esp8266/boards/GENERIC_1M/mpconfigboard.h
+++ b/ports/esp8266/boards/GENERIC_1M/mpconfigboard.h
@@ -11,10 +11,6 @@
 #define MICROPY_READER_VFS              (MICROPY_VFS)
 #define MICROPY_VFS                     (1)
 
-#define MICROPY_PY_BUILTINS_SLICE_ATTRS (1)
-#define MICROPY_PY_ALL_SPECIAL_METHODS  (1)
-#define MICROPY_PY_IO_FILEIO            (1)
-#define MICROPY_PY_SYS_STDIO_BUFFER     (1)
-#define MICROPY_PY_URE_SUB              (1)
+#define MICROPY_PY_FSTRINGS             (0)
+#define MICROPY_PY_UASYNCIO             (0)
 #define MICROPY_PY_UCRYPTOLIB           (1)
-#define MICROPY_PY_FRAMEBUF             (1)
diff --git a/ports/esp8266/boards/GENERIC_512K/mpconfigboard.h b/ports/esp8266/boards/GENERIC_512K/mpconfigboard.h
index 0693232aa1fb6..ef37e22fb6c71 100644
--- a/ports/esp8266/boards/GENERIC_512K/mpconfigboard.h
+++ b/ports/esp8266/boards/GENERIC_512K/mpconfigboard.h
@@ -2,3 +2,11 @@
 #define MICROPY_HW_MCU_NAME "ESP8266"
 
 #define MICROPY_ERROR_REPORTING         (MICROPY_ERROR_REPORTING_TERSE)
+
+#define MICROPY_PY_FSTRINGS             (0)
+#define MICROPY_PY_BUILTINS_SLICE_ATTRS (0)
+#define MICROPY_PY_ALL_SPECIAL_METHODS  (0)
+#define MICROPY_PY_SYS_STDIO_BUFFER     (0)
+#define MICROPY_PY_UASYNCIO             (0)
+#define MICROPY_PY_URE_SUB              (0)
+#define MICROPY_PY_FRAMEBUF             (0)
diff --git a/ports/esp8266/mpconfigport.h b/ports/esp8266/mpconfigport.h
index 583d3648af8d2..365327aa4c802 100644
--- a/ports/esp8266/mpconfigport.h
+++ b/ports/esp8266/mpconfigport.h
@@ -6,6 +6,42 @@
 
 #include <stdint.h>
 
+// Set the rom feature level.
+#define MICROPY_CONFIG_ROM_LEVEL (MICROPY_CONFIG_ROM_LEVEL_EXTRA_FEATURES)
+
+// Disable items from the extra level that are not wanted.
+#define MICROPY_COMP_MODULE_CONST               (0)
+#define MICROPY_COMP_TRIPLE_TUPLE_ASSIGN        (0)
+#define MICROPY_COMP_RETURN_IF_EXPR             (0)
+#define MICROPY_OPT_LOAD_ATTR_FAST_PATH         (0)
+#define MICROPY_OPT_MAP_LOOKUP_CACHE            (0)
+#define MICROPY_OPT_MPZ_BITWISE                 (0)
+#define MICROPY_OPT_MATH_FACTORIAL              (0)
+#define MICROPY_REPL_EMACS_KEYS                 (0)
+#define MICROPY_PY_BUILTINS_COMPLEX             (0)
+#define MICROPY_MODULE_ATTR_DELEGATION          (0)
+#define MICROPY_PY_FUNCTION_ATTRS               (0)
+#define MICROPY_PY_DELATTR_SETATTR              (0)
+#define MICROPY_PY_BUILTINS_STR_CENTER          (0)
+#define MICROPY_PY_BUILTINS_STR_PARTITION       (0)
+#define MICROPY_PY_BUILTINS_STR_SPLITLINES      (0)
+#define MICROPY_PY_BUILTINS_SLICE_INDICES       (0)
+#define MICROPY_PY_REVERSE_SPECIAL_METHODS      (0)
+#define MICROPY_PY_BUILTINS_COMPILE             (0)
+#define MICROPY_PY_BUILTINS_EXECFILE            (0)
+#define MICROPY_PY_BUILTINS_NOTIMPLEMENTED      (0)
+#define MICROPY_PY_BUILTINS_POW3                (0)
+#define MICROPY_PY___FILE__                     (0)
+#define MICROPY_PY_MATH_CONSTANTS               (0)
+#define MICROPY_PY_MATH_SPECIAL_FUNCTIONS       (0)
+#define MICROPY_PY_MATH_FACTORIAL               (0)
+#define MICROPY_PY_MATH_ISCLOSE                 (0)
+#define MICROPY_PY_IO_FILEIO                    (MICROPY_VFS)
+#define MICROPY_PY_SYS_PS1_PS2                  (0)
+#define MICROPY_PY_UBINASCII_CRC32              (0)
+#define MICROPY_PY_URANDOM_EXTRA_FUNCS          (0)
+
+// Configure other options.
 #define MICROPY_OBJ_REPR            (MICROPY_OBJ_REPR_C)
 #define MICROPY_GC_STACK_ENTRY_TYPE uint16_t
 #define MICROPY_ALLOC_PATH_MAX      (128)
@@ -16,50 +52,14 @@
 #define MICROPY_ALLOC_PARSE_CHUNK_INIT  (64)
 #define MICROPY_DEBUG_PRINTER       (&mp_debug_print)
 #define MICROPY_ENABLE_GC           (1)
-#define MICROPY_ENABLE_FINALISER    (1)
-#define MICROPY_STACK_CHECK         (1)
 #define MICROPY_ENABLE_EMERGENCY_EXCEPTION_BUF (1)
-#define MICROPY_KBD_EXCEPTION       (1)
 #define MICROPY_REPL_EVENT_DRIVEN   (0)
-#define MICROPY_REPL_AUTO_INDENT    (1)
-#define MICROPY_HELPER_REPL         (1)
-#define MICROPY_ENABLE_SOURCE_LINE  (1)
-#define MICROPY_MODULE_BUILTIN_INIT (1)
-#define MICROPY_MODULE_WEAK_LINKS   (1)
-#define MICROPY_CAN_OVERRIDE_BUILTINS (1)
 #define MICROPY_USE_INTERNAL_ERRNO  (1)
-#define MICROPY_ENABLE_SCHEDULER    (1)
-#define MICROPY_PY_DESCRIPTORS      (1)
-#define MICROPY_PY_BUILTINS_COMPLEX (0)
-#define MICROPY_PY_BUILTINS_STR_UNICODE (1)
-#define MICROPY_PY_BUILTINS_MEMORYVIEW (1)
-#define MICROPY_PY_BUILTINS_FROZENSET (1)
-#define MICROPY_PY_BUILTINS_ROUND_INT (1)
-#define MICROPY_PY_BUILTINS_INPUT   (1)
-#define MICROPY_PY_BUILTINS_HELP    (1)
 #define MICROPY_PY_BUILTINS_HELP_TEXT esp_help_text
-#define MICROPY_PY_BUILTINS_HELP_MODULES (1)
-#define MICROPY_PY___FILE__         (0)
-#define MICROPY_PY_ARRAY_SLICE_ASSIGN (1)
-#define MICROPY_PY_COLLECTIONS_DEQUE (1)
-#define MICROPY_PY_COLLECTIONS_ORDEREDDICT (1)
-#define MICROPY_PY_IO_IOBASE        (1)
-#define MICROPY_PY_SYS_MAXSIZE      (1)
-#define MICROPY_PY_SYS_STDFILES     (1)
-#define MICROPY_PY_UERRNO           (1)
-#define MICROPY_PY_UBINASCII        (1)
-#define MICROPY_PY_UCTYPES          (1)
-#define MICROPY_PY_UHASHLIB         (1)
 #define MICROPY_PY_UHASHLIB_SHA1    (MICROPY_PY_USSL && MICROPY_SSL_AXTLS)
-#define MICROPY_PY_UHEAPQ           (1)
 #define MICROPY_PY_UTIMEQ           (1)
-#define MICROPY_PY_UJSON            (1)
-#define MICROPY_PY_URANDOM          (1)
 #define MICROPY_PY_URANDOM_SEED_INIT_FUNC (*WDEV_HWRNG)
-#define MICROPY_PY_URE              (1)
-#define MICROPY_PY_USELECT          (1)
 #define MICROPY_PY_UTIME_MP_HAL     (1)
-#define MICROPY_PY_UZLIB            (1)
 #define MICROPY_PY_LWIP             (1)
 #define MICROPY_PY_LWIP_SOCK_RAW    (1)
 #define MICROPY_PY_MACHINE          (1)
@@ -79,8 +79,6 @@
 #define MICROPY_PY_WEBREPL          (1)
 #define MICROPY_PY_WEBREPL_DELAY    (20)
 #define MICROPY_PY_WEBREPL_STATIC_FILEBUF (1)
-#define MICROPY_PY_MICROPYTHON_MEM_INFO (1)
-#define MICROPY_PY_UOS              (1)
 #define MICROPY_PY_UOS_INCLUDEFILE  "ports/esp8266/moduos.c"
 #define MICROPY_PY_OS_DUPTERM       (2)
 #define MICROPY_PY_UOS_DUPTERM_NOTIFY (1)
@@ -92,7 +90,6 @@
 #define MICROPY_FLOAT_IMPL          (MICROPY_FLOAT_IMPL_FLOAT)
 #define MICROPY_WARNINGS            (1)
 #define MICROPY_PY_STR_BYTES_CMP_WARN (1)
-#define MICROPY_STREAMS_NON_BLOCK   (1)
 #define MICROPY_STREAMS_POSIX_API   (1)
 #define MICROPY_MODULE_FROZEN_LEXER mp_lexer_new_from_str32
 

From 226b2d77ee14ca488cbd34c90491aa6dd291c9e0 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 23 Jun 2022 13:05:56 +1000
Subject: [PATCH 2238/3533] esp8266/mpconfigport: Disable MICROPY_PY_UTIMEQ.

This is no longer needed with new uasyncio v3, and disabling it saves 900
bytes.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp8266/mpconfigport.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ports/esp8266/mpconfigport.h b/ports/esp8266/mpconfigport.h
index 365327aa4c802..c78ae3ce0bb9e 100644
--- a/ports/esp8266/mpconfigport.h
+++ b/ports/esp8266/mpconfigport.h
@@ -57,7 +57,6 @@
 #define MICROPY_USE_INTERNAL_ERRNO  (1)
 #define MICROPY_PY_BUILTINS_HELP_TEXT esp_help_text
 #define MICROPY_PY_UHASHLIB_SHA1    (MICROPY_PY_USSL && MICROPY_SSL_AXTLS)
-#define MICROPY_PY_UTIMEQ           (1)
 #define MICROPY_PY_URANDOM_SEED_INIT_FUNC (*WDEV_HWRNG)
 #define MICROPY_PY_UTIME_MP_HAL     (1)
 #define MICROPY_PY_LWIP             (1)

From 6c1495b5fedb6034dd067b654cf437c34f5fe98b Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Thu, 21 Apr 2022 15:57:32 +0200
Subject: [PATCH 2239/3533] stm32/usbd_cdc_interface: Add support for Arduino
 1200bps touch.

If the serial port is closed with baudrate at 1200 then the board will
enter its bootloader.
---
 ports/stm32/usbd_cdc_interface.c | 37 ++++++++++++++++++++------------
 ports/stm32/usbd_cdc_interface.h |  1 +
 2 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/ports/stm32/usbd_cdc_interface.c b/ports/stm32/usbd_cdc_interface.c
index b369524ca7efe..474aced7abf23 100644
--- a/ports/stm32/usbd_cdc_interface.c
+++ b/ports/stm32/usbd_cdc_interface.c
@@ -42,9 +42,11 @@
 #include "usbd_cdc_interface.h"
 #include "pendsv.h"
 
-#include "py/obj.h"
+#include "py/runtime.h"
+#include "py/mphal.h"
 #include "shared/runtime/interrupt_char.h"
 #include "irq.h"
+#include "modmachine.h"
 
 #if MICROPY_HW_ENABLE_USB
 
@@ -62,6 +64,14 @@
 // Used to control the connect_state variable when USB host opens the serial port
 static uint8_t usbd_cdc_connect_tx_timer;
 
+#if MICROPY_HW_USB_CDC_1200BPS_TOUCH
+static mp_sched_node_t mp_bootloader_sched_node;
+STATIC void usbd_cdc_run_bootloader_task(mp_sched_node_t *node) {
+    mp_hal_delay_ms(250);
+    machine_bootloader(0, NULL);
+}
+#endif
+
 uint8_t *usbd_cdc_init(usbd_cdc_state_t *cdc_in) {
     usbd_cdc_itf_t *cdc = (usbd_cdc_itf_t *)cdc_in;
 
@@ -81,6 +91,7 @@ uint8_t *usbd_cdc_init(usbd_cdc_state_t *cdc_in) {
     } else {
         cdc->flow |= USBD_CDC_FLOWCONTROL_CTS;
     }
+    cdc->bitrate = 0;
 
     // Return the buffer to place the first USB OUT packet
     return cdc->rx_packet_buf;
@@ -121,22 +132,14 @@ int8_t usbd_cdc_control(usbd_cdc_state_t *cdc_in, uint8_t cmd, uint8_t *pbuf, ui
             break;
 
         case CDC_SET_LINE_CODING:
-            #if 0
-            LineCoding.bitrate = (uint32_t)(pbuf[0] | (pbuf[1] << 8) | \
-                (pbuf[2] << 16) | (pbuf[3] << 24));
-            LineCoding.format = pbuf[4];
-            LineCoding.paritytype = pbuf[5];
-            LineCoding.datatype = pbuf[6];
-            /* Set the new configuration */
-            #endif
+            cdc->bitrate = *((uint32_t *)pbuf);
             break;
 
         case CDC_GET_LINE_CODING:
-            /* Add your code here */
-            pbuf[0] = (uint8_t)(115200);
-            pbuf[1] = (uint8_t)(115200 >> 8);
-            pbuf[2] = (uint8_t)(115200 >> 16);
-            pbuf[3] = (uint8_t)(115200 >> 24);
+            pbuf[0] = (uint8_t)(cdc->bitrate);
+            pbuf[1] = (uint8_t)(cdc->bitrate >> 8);
+            pbuf[2] = (uint8_t)(cdc->bitrate >> 16);
+            pbuf[3] = (uint8_t)(cdc->bitrate >> 24);
             pbuf[4] = 0; // stop bits (1)
             pbuf[5] = 0; // parity (none)
             pbuf[6] = 8; // number of bits (8)
@@ -157,6 +160,12 @@ int8_t usbd_cdc_control(usbd_cdc_state_t *cdc_in, uint8_t cmd, uint8_t *pbuf, ui
                 #endif
             } else {
                 cdc->connect_state = USBD_CDC_CONNECT_STATE_DISCONNECTED;
+                #if MICROPY_HW_USB_CDC_1200BPS_TOUCH
+                if (cdc->bitrate == 1200) {
+                    // Delay bootloader jump to allow the USB stack to service endpoints.
+                    mp_sched_schedule_node(&mp_bootloader_sched_node, usbd_cdc_run_bootloader_task);
+                }
+                #endif
             }
             break;
         }
diff --git a/ports/stm32/usbd_cdc_interface.h b/ports/stm32/usbd_cdc_interface.h
index 76b5c9e79bb4a..2daa43a521a24 100644
--- a/ports/stm32/usbd_cdc_interface.h
+++ b/ports/stm32/usbd_cdc_interface.h
@@ -62,6 +62,7 @@ typedef struct _usbd_cdc_itf_t {
     volatile uint8_t connect_state; // indicates if we are connected
     uint8_t attached_to_repl; // indicates if interface is connected to REPL
     uint8_t flow; // USBD_CDC_FLOWCONTROL_* setting flags
+    uint32_t bitrate;
 } usbd_cdc_itf_t;
 
 // This is implemented in usb.c

From 9f6f8b2fdd0a90394b9fcc9b0d9198d32aee2cf5 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Fri, 17 Jun 2022 15:34:50 +0200
Subject: [PATCH 2240/3533] shared/runtime/tinyusb_helpers: Add TinyUSB helper
 functions.

Currently this file only includes a CDC jump-to-bootloader helper function.
---
 shared/runtime/tinyusb_helpers.c | 54 ++++++++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)
 create mode 100644 shared/runtime/tinyusb_helpers.c

diff --git a/shared/runtime/tinyusb_helpers.c b/shared/runtime/tinyusb_helpers.c
new file mode 100644
index 0000000000000..00b72e74b7768
--- /dev/null
+++ b/shared/runtime/tinyusb_helpers.c
@@ -0,0 +1,54 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2022 Ibrahim Abdelkader <iabdalkader@openmv.io>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "py/runtime.h"
+#include "py/mphal.h"
+#include "modmachine.h"
+
+#if MICROPY_HW_USB_CDC_1200BPS_TOUCH
+
+#include "tusb.h"
+
+static mp_sched_node_t mp_bootloader_sched_node;
+
+STATIC void usbd_cdc_run_bootloader_task(mp_sched_node_t *node) {
+    mp_hal_delay_ms(250);
+    machine_bootloader(0, NULL);
+}
+
+void tud_cdc_line_state_cb(uint8_t itf, bool dtr, bool rts) {
+    if (dtr == false && rts == false) {
+        // Device is disconnected.
+        cdc_line_coding_t line_coding;
+        tud_cdc_n_get_line_coding(itf, &line_coding);
+        if (line_coding.bit_rate == 1200) {
+            // Delay bootloader jump to allow the USB stack to service endpoints.
+            mp_sched_schedule_node(&mp_bootloader_sched_node, usbd_cdc_run_bootloader_task);
+        }
+    }
+}
+
+#endif

From de823e7741bcb817df7c231620103cc30beab0ba Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Thu, 21 Apr 2022 16:04:19 +0200
Subject: [PATCH 2241/3533] rp2/boards/ARDUINO_NANO_RP2040_CONNECT: Enable
 Arduino 1200bps touch.

---
 ports/rp2/CMakeLists.txt                                     | 1 +
 ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/mpconfigboard.h | 1 +
 2 files changed, 2 insertions(+)

diff --git a/ports/rp2/CMakeLists.txt b/ports/rp2/CMakeLists.txt
index d6a428c91ceb7..0088ba2c6d672 100644
--- a/ports/rp2/CMakeLists.txt
+++ b/ports/rp2/CMakeLists.txt
@@ -83,6 +83,7 @@ set(MICROPY_SOURCE_LIB
     ${MICROPY_DIR}/shared/runtime/pyexec.c
     ${MICROPY_DIR}/shared/runtime/stdout_helpers.c
     ${MICROPY_DIR}/shared/runtime/sys_stdio_mphal.c
+    ${MICROPY_DIR}/shared/runtime/tinyusb_helpers.c
     ${MICROPY_DIR}/shared/timeutils/timeutils.c
 )
 
diff --git a/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/mpconfigboard.h b/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/mpconfigboard.h
index 6d04e3e1d06b4..3f18596155beb 100644
--- a/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/mpconfigboard.h
+++ b/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/mpconfigboard.h
@@ -19,6 +19,7 @@
 #define MICROPY_HW_USB_MSC              (1)
 #define MICROPY_HW_USB_VID              (0x2341)
 #define MICROPY_HW_USB_PID              (0x025e)
+#define MICROPY_HW_USB_CDC_1200BPS_TOUCH (1)
 
 // UART 1 config.
 #define MICROPY_HW_UART1_TX             (8)

From 425d8fc0d652a58f1a6e81d953281beb5784e18b Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Thu, 21 Apr 2022 16:35:59 +0200
Subject: [PATCH 2242/3533] nrf: Enable optional support for Arduino 1200bps
 touch.

Individual boards must enable it via MICROPY_HW_USB_CDC_1200BPS_TOUCH.
---
 ports/nrf/Makefile       | 1 +
 ports/nrf/mpconfigport.h | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/ports/nrf/Makefile b/ports/nrf/Makefile
index 25b8c03d1acd4..d022892641309 100644
--- a/ports/nrf/Makefile
+++ b/ports/nrf/Makefile
@@ -232,6 +232,7 @@ SRC_LIB += $(addprefix shared/,\
 	runtime/pyexec.c \
 	runtime/sys_stdio_mphal.c \
 	runtime/interrupt_char.c \
+	runtime/tinyusb_helpers.c \
 	timeutils/timeutils.c \
 	)
 
diff --git a/ports/nrf/mpconfigport.h b/ports/nrf/mpconfigport.h
index 102be3eaaf64c..243c30809a206 100644
--- a/ports/nrf/mpconfigport.h
+++ b/ports/nrf/mpconfigport.h
@@ -157,6 +157,10 @@
 #define MICROPY_MODULE_WEAK_LINKS   (1)
 #define MICROPY_CAN_OVERRIDE_BUILTINS (1)
 #define MICROPY_USE_INTERNAL_ERRNO  (1)
+#if MICROPY_HW_USB_CDC_1200BPS_TOUCH
+#define MICROPY_ENABLE_SCHEDULER    (1)
+#define MICROPY_SCHEDULER_STATIC_NODES (1)
+#endif
 #define MICROPY_PY_FUNCTION_ATTRS   (1)
 #define MICROPY_PY_BUILTINS_STR_UNICODE (1)
 #define MICROPY_PY_BUILTINS_MEMORYVIEW (1)

From 5f4539b0ca5c3d832122b3a44c5a075d4ceb6203 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sun, 19 Jun 2022 08:44:13 +0200
Subject: [PATCH 2243/3533] esp32/machine_uart: Implement the functionality of
 timeout_char arg.

Using it for the rx-timeout.  The value is given as ms, which is then
converted to character times.  A value of less than a character time will
cause the rx call to return immediately after 1 character, which may be
inefficient at high transmission rates.

Addresses #8778.
---
 ports/esp32/machine_uart.c | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/ports/esp32/machine_uart.c b/ports/esp32/machine_uart.c
index c0eedb80b317e..49ce78b1b24c9 100644
--- a/ports/esp32/machine_uart.c
+++ b/ports/esp32/machine_uart.c
@@ -267,12 +267,18 @@ STATIC void machine_uart_init_helper(machine_uart_obj_t *self, size_t n_args, co
     }
 
     // set timeout_char
-    // make sure it is at least as long as a whole character (13 bits to be safe)
+    // make sure it is at least as long as a whole character (12 bits here)
     if (args[ARG_timeout_char].u_int != -1) {
         self->timeout_char = args[ARG_timeout_char].u_int;
-        uint32_t min_timeout_char = 13000 / baudrate + 1;
-        if (self->timeout_char < min_timeout_char) {
-            self->timeout_char = min_timeout_char;
+        uint32_t char_time_ms = 12000 / baudrate + 1;
+        uint32_t rx_timeout = self->timeout_char / char_time_ms;
+        if (rx_timeout < 1) {
+            #if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(4, 1, 0)
+            uart_set_rx_full_threshold(self->uart_num, 1);
+            #endif
+            uart_set_rx_timeout(self->uart_num, 1);
+        } else {
+            uart_set_rx_timeout(self->uart_num, rx_timeout);
         }
     }
 

From cf550ad9d1f15d862d7e9fb3526cd57e1ea69057 Mon Sep 17 00:00:00 2001
From: Christian Walther <cwalther@gmx.ch>
Date: Sat, 28 May 2022 23:01:04 +0200
Subject: [PATCH 2244/3533] esp32/boards: Increase 512 bytes limit on ULP
 programs to 2040.

Allow esp32.ULP.load_binary() to use the maximum amount of memory available
again, which is 2040 bytes unless MICROPY_HW_RTC_USER_MEM_MAX is
customized.

This value regressed in 3d49b157b89a59774fc4958dcaacd2c96ba6eaa4
---
 ports/esp32/boards/sdkconfig.base | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/esp32/boards/sdkconfig.base b/ports/esp32/boards/sdkconfig.base
index 4b29013434c78..6b891aa006b1b 100644
--- a/ports/esp32/boards/sdkconfig.base
+++ b/ports/esp32/boards/sdkconfig.base
@@ -49,6 +49,7 @@ CONFIG_MBEDTLS_ASYMMETRIC_CONTENT_LEN=y
 
 # ULP coprocessor support
 CONFIG_ESP32_ULP_COPROC_ENABLED=y
+CONFIG_ESP32_ULP_COPROC_RESERVE_MEM=2040
 
 # For cmake build
 CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y

From ba21f76f89d05150b7d6ec2dfac45476ffc4866c Mon Sep 17 00:00:00 2001
From: Christian Walther <cwalther@gmx.ch>
Date: Thu, 26 May 2022 16:29:26 +0200
Subject: [PATCH 2245/3533] esp32/modesp32: Add wake_on_ulp() so ULP can wake
 CPU from deepsleep.

Add esp32.wake_on_ulp() to give access to esp_sleep_enable_ulp_wakeup(),
which is needed to allow the ULP co-processor to wake the main CPU from
deep sleep.
---
 docs/library/esp32.rst    |  5 +++++
 ports/esp32/machine_rtc.h |  1 +
 ports/esp32/modesp32.c    | 10 ++++++++++
 ports/esp32/modmachine.c  |  6 ++++++
 4 files changed, 22 insertions(+)

diff --git a/docs/library/esp32.rst b/docs/library/esp32.rst
index 3348003499787..f0f0c8ef1f56e 100644
--- a/docs/library/esp32.rst
+++ b/docs/library/esp32.rst
@@ -18,6 +18,11 @@ Functions
     Configure whether or not a touch will wake the device from sleep.
     *wake* should be a boolean value.
 
+.. function:: wake_on_ulp(wake)
+
+    Configure whether or not the Ultra-Low-Power co-processor can wake the
+    device from sleep. *wake* should be a boolean value.
+
 .. function:: wake_on_ext0(pin, level)
 
     Configure how EXT0 wakes the device from sleep.  *pin* can be ``None``
diff --git a/ports/esp32/machine_rtc.h b/ports/esp32/machine_rtc.h
index 6e70f7438501c..ce2a5482a2241 100644
--- a/ports/esp32/machine_rtc.h
+++ b/ports/esp32/machine_rtc.h
@@ -34,6 +34,7 @@ typedef struct {
     uint64_t ext1_pins; // set bit == pin#
     int8_t ext0_pin;   // just the pin#, -1 == None
     bool wake_on_touch : 1;
+    bool wake_on_ulp : 1;
     bool ext0_level : 1;
     wake_type_t ext0_wake_types;
     bool ext1_level : 1;
diff --git a/ports/esp32/modesp32.c b/ports/esp32/modesp32.c
index 0dbd7efda33b0..017db36e22adf 100644
--- a/ports/esp32/modesp32.c
+++ b/ports/esp32/modesp32.c
@@ -131,6 +131,15 @@ STATIC mp_obj_t esp32_wake_on_ext1(size_t n_args, const mp_obj_t *pos_args, mp_m
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_KW(esp32_wake_on_ext1_obj, 0, esp32_wake_on_ext1);
 
+STATIC mp_obj_t esp32_wake_on_ulp(const mp_obj_t wake) {
+    if (machine_rtc_config.ext0_pin != -1) {
+        mp_raise_ValueError(MP_ERROR_TEXT("no resources"));
+    }
+    machine_rtc_config.wake_on_ulp = mp_obj_is_true(wake);
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(esp32_wake_on_ulp_obj, esp32_wake_on_ulp);
+
 STATIC mp_obj_t esp32_gpio_deep_sleep_hold(const mp_obj_t enable) {
     if (mp_obj_is_true(enable)) {
         gpio_deep_sleep_hold_en();
@@ -197,6 +206,7 @@ STATIC const mp_rom_map_elem_t esp32_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_wake_on_touch), MP_ROM_PTR(&esp32_wake_on_touch_obj) },
     { MP_ROM_QSTR(MP_QSTR_wake_on_ext0), MP_ROM_PTR(&esp32_wake_on_ext0_obj) },
     { MP_ROM_QSTR(MP_QSTR_wake_on_ext1), MP_ROM_PTR(&esp32_wake_on_ext1_obj) },
+    { MP_ROM_QSTR(MP_QSTR_wake_on_ulp), MP_ROM_PTR(&esp32_wake_on_ulp_obj) },
     { MP_ROM_QSTR(MP_QSTR_gpio_deep_sleep_hold), MP_ROM_PTR(&esp32_gpio_deep_sleep_hold_obj) },
     #if CONFIG_IDF_TARGET_ESP32
     { MP_ROM_QSTR(MP_QSTR_raw_temperature), MP_ROM_PTR(&esp32_raw_temperature_obj) },
diff --git a/ports/esp32/modmachine.c b/ports/esp32/modmachine.c
index aee3be0e747fd..db77becf87693 100644
--- a/ports/esp32/modmachine.c
+++ b/ports/esp32/modmachine.c
@@ -144,6 +144,12 @@ STATIC mp_obj_t machine_sleep_helper(wake_type_t wake_type, size_t n_args, const
         }
     }
 
+    if (machine_rtc_config.wake_on_ulp) {
+        if (esp_sleep_enable_ulp_wakeup() != ESP_OK) {
+            mp_raise_msg(&mp_type_RuntimeError, MP_ERROR_TEXT("esp_sleep_enable_ulp_wakeup() failed"));
+        }
+    }
+
     #endif
 
     switch (wake_type) {

From c21452a1d23a7cf70fdd6b2c069d460c1a5a7be8 Mon Sep 17 00:00:00 2001
From: Thorsten von Eicken <tve@voneicken.com>
Date: Tue, 21 Apr 2020 13:18:55 -0700
Subject: [PATCH 2246/3533] extmod/uasyncio: Attempt to write immediately in
 Stream.write method.

The main aim of this change is to reduce the number of heap allocations
when writing data to a stream.  This is done in two ways:

1. Eliminate appending of data when .write() is called multiple times
   before calling .drain().  With this commit, the data is written out
   immediately if the underlying stream is not blocked, so there is no
   accumulation of the data in a temporary buffer.

2. Eliminate copying of non-bytes objects passed to .write().  Prior to
   this commit, passing a bytearray or memoryview to .write() would always
   result in a copy of it being made and turned into a bytes object.  That
   won't happen now if the underlying stream is not blocked.

Also, this change makes .write () more closely implement the CPython
documented semantics: "The method attempts to write the data to the
underlying socket immediately.  If that fails, the data is queued in an
internal write buffer until it can be sent."
---
 extmod/uasyncio/stream.py | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/extmod/uasyncio/stream.py b/extmod/uasyncio/stream.py
index af3b8feab3588..750d8e974067b 100644
--- a/extmod/uasyncio/stream.py
+++ b/extmod/uasyncio/stream.py
@@ -56,9 +56,19 @@ async def readline(self):
                 return l
 
     def write(self, buf):
+        if not self.out_buf:
+            # Try to write immediately to the underlying stream.
+            ret = self.s.write(buf)
+            if ret == len(buf):
+                return
+            if ret is not None:
+                buf = buf[ret:]
         self.out_buf += buf
 
     async def drain(self):
+        if not self.out_buf:
+            # Drain must always yield, so a tight loop of write+drain can't block the scheduler.
+            return await core.sleep_ms(0)
         mv = memoryview(self.out_buf)
         off = 0
         while off < len(mv):

From 2a2589738c7bcc0a318f9054562de9a62575d8cc Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 24 Jun 2022 16:39:45 +1000
Subject: [PATCH 2247/3533] tests/extmod: Add heap-lock test for stream
 writing.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/extmod/uasyncio_heaplock.py     | 32 +++++++++++++++++++++++++--
 tests/extmod/uasyncio_heaplock.py.exp |  3 +++
 2 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/tests/extmod/uasyncio_heaplock.py b/tests/extmod/uasyncio_heaplock.py
index 34a51cd370e52..a6b4a0819c0e0 100644
--- a/tests/extmod/uasyncio_heaplock.py
+++ b/tests/extmod/uasyncio_heaplock.py
@@ -1,4 +1,8 @@
-# test that basic scheduling of tasks, and uasyncio.sleep_ms, does not use the heap
+# test that the following do not use the heap:
+# - basic scheduling of tasks
+# - uasyncio.sleep_ms
+# - StreamWriter.write, stream is blocked and data to write is a bytes object
+# - StreamWriter.write, when stream is not blocked
 
 import micropython
 
@@ -22,6 +26,17 @@
         raise SystemExit
 
 
+class TestStream:
+    def __init__(self, blocked):
+        self.blocked = blocked
+
+    def write(self, data):
+        print("TestStream.write", data)
+        if self.blocked:
+            return None
+        return len(data)
+
+
 async def task(id, n, t):
     for i in range(n):
         print(id, i)
@@ -32,14 +47,27 @@ async def main():
     t1 = asyncio.create_task(task(1, 4, 100))
     t2 = asyncio.create_task(task(2, 2, 250))
 
+    # test scheduling tasks, and calling sleep_ms
     micropython.heap_lock()
-
     print("start")
     await asyncio.sleep_ms(5)
     print("sleep")
     await asyncio.sleep_ms(350)
     print("finish")
+    micropython.heap_unlock()
 
+    # test writing to a stream, when the underlying stream is blocked
+    s = asyncio.StreamWriter(TestStream(True), None)
+    micropython.heap_lock()
+    s.write(b"12")
+    micropython.heap_unlock()
+
+    # test writing to a stream, when the underlying stream is not blocked
+    buf = bytearray(b"56")
+    s = asyncio.StreamWriter(TestStream(False), None)
+    micropython.heap_lock()
+    s.write(b"34")
+    s.write(buf)
     micropython.heap_unlock()
 
 
diff --git a/tests/extmod/uasyncio_heaplock.py.exp b/tests/extmod/uasyncio_heaplock.py.exp
index 68c6366c6f1bf..5c7b4e3dbae74 100644
--- a/tests/extmod/uasyncio_heaplock.py.exp
+++ b/tests/extmod/uasyncio_heaplock.py.exp
@@ -7,3 +7,6 @@ sleep
 2 1
 1 3
 finish
+TestStream.write b'12'
+TestStream.write b'34'
+TestStream.write bytearray(b'56')

From db7682e02d3ffd3338f20effc9ad4735a48bf774 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sat, 22 Aug 2020 16:39:15 +1000
Subject: [PATCH 2248/3533] extmod/uasyncio: Implement stream read(-1) to read
 all data up to EOF.

Fixes issue #6355.

Signed-off-by: Damien George <damien@micropython.org>
---
 docs/library/uasyncio.rst                   |  6 ++-
 extmod/uasyncio/stream.py                   | 14 +++--
 tests/multi_net/uasyncio_tcp_readall.py     | 60 +++++++++++++++++++++
 tests/multi_net/uasyncio_tcp_readall.py.exp |  8 +++
 4 files changed, 83 insertions(+), 5 deletions(-)
 create mode 100644 tests/multi_net/uasyncio_tcp_readall.py
 create mode 100644 tests/multi_net/uasyncio_tcp_readall.py.exp

diff --git a/docs/library/uasyncio.rst b/docs/library/uasyncio.rst
index 0c71702420257..0abbf8dd8d7d2 100644
--- a/docs/library/uasyncio.rst
+++ b/docs/library/uasyncio.rst
@@ -237,9 +237,11 @@ TCP stream connections
 
     This is a coroutine.
 
-.. method:: Stream.read(n)
+.. method:: Stream.read(n=-1)
 
-    Read up to *n* bytes and return them.
+    Read up to *n* bytes and return them.  If *n* is not provided or -1 then read all
+    bytes until EOF.  The returned value will be an empty bytes object if EOF is
+    encountered before any bytes are read.
 
     This is a coroutine.
 
diff --git a/extmod/uasyncio/stream.py b/extmod/uasyncio/stream.py
index 750d8e974067b..785e43555ddd9 100644
--- a/extmod/uasyncio/stream.py
+++ b/extmod/uasyncio/stream.py
@@ -26,9 +26,17 @@ async def wait_closed(self):
         # TODO yield?
         self.s.close()
 
-    async def read(self, n):
-        yield core._io_queue.queue_read(self.s)
-        return self.s.read(n)
+    async def read(self, n=-1):
+        r = b""
+        while True:
+            yield core._io_queue.queue_read(self.s)
+            r2 = self.s.read(n)
+            if r2 is not None:
+                if n >= 0:
+                    return r2
+                if not len(r2):
+                    return r
+                r += r2
 
     async def readinto(self, buf):
         yield core._io_queue.queue_read(self.s)
diff --git a/tests/multi_net/uasyncio_tcp_readall.py b/tests/multi_net/uasyncio_tcp_readall.py
new file mode 100644
index 0000000000000..c411f1c69d658
--- /dev/null
+++ b/tests/multi_net/uasyncio_tcp_readall.py
@@ -0,0 +1,60 @@
+# Test uasyncio stream read(-1) method using TCP server/client
+
+try:
+    import uasyncio as asyncio
+except ImportError:
+    try:
+        import asyncio
+    except ImportError:
+        print("SKIP")
+        raise SystemExit
+
+PORT = 8000
+
+
+async def handle_connection(reader, writer):
+    writer.write(b"a")
+    await writer.drain()
+
+    # Split the first 2 bytes up so the client must wait for the second one
+    await asyncio.sleep(0.1)
+
+    writer.write(b"b")
+    await writer.drain()
+
+    writer.write(b"c")
+    await writer.drain()
+
+    print("close")
+    writer.close()
+    await writer.wait_closed()
+
+    print("done")
+    ev.set()
+
+
+async def tcp_server():
+    global ev
+    ev = asyncio.Event()
+    server = await asyncio.start_server(handle_connection, "0.0.0.0", PORT)
+    print("server running")
+    multitest.next()
+    async with server:
+        await asyncio.wait_for(ev.wait(), 2)
+
+
+async def tcp_client():
+    reader, writer = await asyncio.open_connection(IP, PORT)
+    print(await reader.read())
+    print(await reader.read())  # should be empty
+    print(await reader.read(1))  # should be empty
+
+
+def instance0():
+    multitest.globals(IP=multitest.get_network_ip())
+    asyncio.run(tcp_server())
+
+
+def instance1():
+    multitest.next()
+    asyncio.run(tcp_client())
diff --git a/tests/multi_net/uasyncio_tcp_readall.py.exp b/tests/multi_net/uasyncio_tcp_readall.py.exp
new file mode 100644
index 0000000000000..0bf3dcba60203
--- /dev/null
+++ b/tests/multi_net/uasyncio_tcp_readall.py.exp
@@ -0,0 +1,8 @@
+--- instance0 ---
+server running
+close
+done
+--- instance1 ---
+b'abc'
+b''
+b''

From fbc50196ad60fa548e79f8d1e5d87c3fa93c7848 Mon Sep 17 00:00:00 2001
From: Philipp Ebensberger <philipp.ebensberger@3bricks-software.de>
Date: Sun, 19 Jun 2022 23:00:38 +0200
Subject: [PATCH 2249/3533] mimxrt/Makefile: Refactor Makefile and divide it
 into sections.

Reworks grouping of Makefile variables and reorders variable values in
alphabetic order.
---
 ports/mimxrt/Makefile | 363 ++++++++++++++++++++++++++----------------
 1 file changed, 226 insertions(+), 137 deletions(-)

diff --git a/ports/mimxrt/Makefile b/ports/mimxrt/Makefile
index 759fb5c459b97..7f93a6826d34a 100644
--- a/ports/mimxrt/Makefile
+++ b/ports/mimxrt/Makefile
@@ -1,72 +1,61 @@
+# =============================================================================
+# Parameter Configuration
+# =============================================================================
+
 BOARD ?= TEENSY40
 BOARD_DIR ?= boards/$(BOARD)
 BUILD ?= build-$(BOARD)
-
 PORT ?= /dev/ttyACM0
-
 CROSS_COMPILE ?= arm-none-eabi-
+GIT_SUBMODULES = lib/tinyusb lib/nxp_driver lib/lwip lib/mbedtls
 
-ifeq ($(wildcard $(BOARD_DIR)/.),)
-$(error Invalid BOARD specified: $(BOARD_DIR))
-endif
-
-include ../../py/mkenv.mk
-include $(BOARD_DIR)/mpconfigboard.mk
+# MicroPython feature configurations
+FROZEN_MANIFEST ?= boards/manifest.py
+MICROPY_VFS_LFS2 ?= 1
+MICROPY_VFS_FAT ?= 1
 
-LD_MEMORY_CONFIG_DEFINES += \
-	MICROPY_HW_FLASH_TYPE=$(MICROPY_HW_FLASH_TYPE) \
-	MICROPY_HW_FLASH_SIZE=$(MICROPY_HW_FLASH_SIZE)
+# qstr definitions (must come before including py.mk)
+QSTR_DEFS = qstrdefsport.h
+QSTR_GLOBAL_DEPENDENCIES = $(BOARD_DIR)/mpconfigboard.h
 
-ifdef MICROPY_HW_FLASH_RESERVED
-LD_MEMORY_CONFIG_DEFINES += MICROPY_HW_FLASH_RESERVED=$(MICROPY_HW_FLASH_RESERVED)
-endif
+# Generation scripts
+MAKE_PINS = boards/make-pins.py
+MAKE_FLEXRAM_LD = boards/make-flexram-config.py
 
-ifdef MICROPY_HW_SDRAM_AVAIL
-CFLAGS += \
-	-DMICROPY_HW_SDRAM_AVAIL=$(MICROPY_HW_SDRAM_AVAIL) \
-	-DMICROPY_HW_SDRAM_SIZE=$(MICROPY_HW_SDRAM_SIZE)
+# Include py make environment
+include ../../py/mkenv.mk
 
-LD_MEMORY_CONFIG_DEFINES += \
-	MICROPY_HW_SDRAM_AVAIL=$(MICROPY_HW_SDRAM_AVAIL) \
-	MICROPY_HW_SDRAM_SIZE=$(MICROPY_HW_SDRAM_SIZE)
+# Include micropython configuration board makefile
+ifeq ($(wildcard $(BOARD_DIR)/.),)
+$(error Invalid BOARD specified: $(BOARD_DIR))
 endif
-
-# Qstr definitions (must come before including py.mk)
-QSTR_DEFS = qstrdefsport.h
-QSTR_GLOBAL_DEPENDENCIES = $(BOARD_DIR)/mpconfigboard.h
-
-# MicroPython feature configurations
-FROZEN_MANIFEST ?= boards/manifest.py
-MICROPY_VFS_LFS2 ?= 1
-MICROPY_VFS_FAT ?= 1
+include $(BOARD_DIR)/mpconfigboard.mk
 
 # Include py core make definitions
 include $(TOP)/py/py.mk
 include $(TOP)/extmod/extmod.mk
 
-GIT_SUBMODULES = lib/tinyusb lib/nxp_driver lib/lwip lib/mbedtls
-
+# Set SDK directory based on MCU_SERIES
 MCU_DIR = lib/nxp_driver/sdk/devices/$(MCU_SERIES)
+
+# Select linker scripts based on MCU_SERIES
 LD_FILES = boards/$(MCU_SERIES).ld boards/common.ld
 
-MAKE_PINS = boards/make-pins.py
-MAKE_FLEXRAM_LD = boards/make-flexram-config.py
-BOARD_PINS = $(BOARD_DIR)/pins.csv
+# Parameter configurations for generation
 AF_FILE = boards/$(MCU_SERIES)_af.csv
+BOARD_PINS = $(BOARD_DIR)/pins.csv
 PREFIX_FILE = boards/mimxrt_prefix.c
-GEN_PINS_SRC = $(BUILD)/pins_gen.c
-GEN_PINS_HDR = $(HEADER_BUILD)/pins.h
-GEN_PINS_QSTR = $(BUILD)/pins_qstr.h
+GEN_FLEXRAM_CONFIG_SRC = $(BUILD)/flexram_config.s
 GEN_PINS_AF_CONST = $(HEADER_BUILD)/pins_af_const.h
 GEN_PINS_AF_PY = $(BUILD)/pins_af.py
-GEN_FLEXRAM_CONFIG_SRC = $(BUILD)/flexram_config.s
+GEN_PINS_HDR = $(HEADER_BUILD)/pins.h
+GEN_PINS_QSTR = $(BUILD)/pins_qstr.h
+GEN_PINS_SRC = $(BUILD)/pins_gen.c
 
-# mcu driver cause following warnings
-#CFLAGS += -Wno-error=float-equal -Wno-error=nested-externs
-CFLAGS += -Wno-error=unused-parameter
+# =============================================================================
+# Includes
+# =============================================================================
 
-INC += -I.
-INC += -Ihal
 INC += -I$(BOARD_DIR)
 INC += -I$(BUILD)
 INC += -I$(TOP)
@@ -77,90 +66,19 @@ INC += -I$(TOP)/lib/oofatfs
 INC += -I$(TOP)/lib/tinyusb/hw
 INC += -I$(TOP)/lib/tinyusb/hw/bsp/teensy_40
 INC += -I$(TOP)/lib/tinyusb/src
-
-CFLAGS_MCU = -mtune=cortex-m7 -mcpu=cortex-m7
-CFLAGS += $(INC) -Wall -Werror -Wdouble-promotion -Wfloat-conversion -std=c99 -nostdlib -mthumb $(CFLAGS_MCU)
-CFLAGS += -DCPU_$(MCU_SERIES) -DCPU_$(MCU_VARIANT) -DBOARD_$(BOARD)
-CFLAGS += -DXIP_EXTERNAL_FLASH=1 \
-	-DXIP_BOOT_HEADER_ENABLE=1 \
-	-DFSL_SDK_ENABLE_DRIVER_CACHE_CONTROL=1 \
-	-DCFG_TUSB_MCU=OPT_MCU_MIMXRT10XX \
-	-D__STARTUP_CLEAR_BSS \
-	-D__STARTUP_INITIALIZE_RAMFUNCTION \
-	-D__START=main \
-	-DCPU_HEADER_H='<$(MCU_SERIES).h>' \
-	-DCLOCK_CONFIG_H='<boards/$(MCU_SERIES)_clock_config.h>' \
-	-DBOARD_FLASH_SIZE=$(MICROPY_HW_FLASH_SIZE) \
-	-DMICROPY_HW_FLASH_SIZE=$(MICROPY_HW_FLASH_SIZE) \
-
-CFLAGS += -DI2C_RETRY_TIMES=1000000 -DSPI_RETRY_TIMES=1000000 -DUART_RETRY_TIMES=1000000
-
-ifeq ($(MICROPY_PY_MACHINE_SDCARD),1)
-CFLAGS += -DMICROPY_PY_MACHINE_SDCARD=1
-endif
-
-CFLAGS += $(CFLAGS_MOD) $(CFLAGS_EXTRA)
-
-# Configure floating point support
-ifeq ($(MICROPY_FLOAT_IMPL),double)
-CFLAGS += -DMICROPY_FLOAT_IMPL=MICROPY_FLOAT_IMPL_DOUBLE
-CFLAGS_MCU += -mfloat-abi=hard  -mfpu=fpv5-d16
-else
-ifeq ($(MICROPY_FLOAT_IMPL),none)
-CFLAGS += -DMICROPY_FLOAT_IMPL=MICROPY_FLOAT_IMPL_NONE
-else
-CFLAGS += -DMICROPY_FLOAT_IMPL=MICROPY_FLOAT_IMPL_FLOAT
-CFLAGS += -fsingle-precision-constant
-CFLAGS_MCU += -mfloat-abi=softfp -mfpu=fpv5-sp-d16
-endif
-endif
-
-SUPPORTS_HARDWARE_FP_SINGLE = 0
-SUPPORTS_HARDWARE_FP_DOUBLE = 0
-
-LDFLAGS = -Map=$@.map --cref --print-memory-usage
-LDDEFINES = $(addprefix -D, $(LD_MEMORY_CONFIG_DEFINES))
-LIBS = $(shell $(CC) $(CFLAGS) -print-libgcc-file-name)
-
-# Tune for Debugging or Optimization
-ifeq ($(DEBUG),1)
-CFLAGS += -Og -ggdb
-LDFLAGS += --gc-sections
-CFLAGS += -fdata-sections -ffunction-sections
-else
-CFLAGS += -Os -DNDEBUG
-LDFLAGS += --gc-sections
-CFLAGS += -fdata-sections -ffunction-sections
-endif
+INC += -I.
+INC += -Ihal
 
 # All settings for Ethernet support are controller by the value of MICROPY_PY_LWIP
 ifeq ($(MICROPY_PY_LWIP), 1)
-
 INC += -Ilwip_inc
 INC += -Ihal/phy
-
-SRC_MOD := $(filter-out %/mbedtls/library/error.c, $(SRC_MOD))
-
-SRC_ETH_C += \
-	hal/phy/mdio/enet/fsl_enet_mdio.c \
-	hal/phy/device/phydp83825/fsl_phydp83825.c \
-	hal/phy/device/phydp83848/fsl_phydp83848.c \
-	hal/phy/device/phyksz8081/fsl_phyksz8081.c \
-	hal/phy/device/phylan8720/fsl_phylan8720.c \
-	lib/mbedtls_errors/mp_mbedtls_errors.c \
-	$(MCU_DIR)/drivers/fsl_enet.c \
-
-SRC_QSTR += \
-	extmod/modnetwork.c \
-	extmod/moduwebsocket.c \
-	extmod/modusocket.c \
-	network_lan.c \
-
-CFLAGS += -DFSL_FEATURE_PHYKSZ8081_USE_RMII50M_MODE=1 \
-	-DMBEDTLS_CONFIG_FILE='"mbedtls/mbedtls_config.h"'
-
 endif
 
+# =============================================================================
+# Sources
+# =============================================================================
+
 # TinyUSB Stack source
 SRC_TINYUSB_C += \
 	lib/tinyusb/src/class/cdc/cdc_device.c \
@@ -176,6 +94,20 @@ SRC_TINYUSB_C += \
 	lib/tinyusb/src/portable/nxp/transdimension/dcd_transdimension.c \
 	lib/tinyusb/src/tusb.c
 
+# All settings for Ethernet support are controller by the value of MICROPY_PY_LWIP
+ifeq ($(MICROPY_PY_LWIP), 1)
+SRC_MOD := $(filter-out %/mbedtls/library/error.c, $(SRC_MOD))
+SRC_ETH_C += \
+	$(MCU_DIR)/drivers/fsl_enet.c \
+	hal/phy/device/phydp83825/fsl_phydp83825.c \
+	hal/phy/device/phydp83848/fsl_phydp83848.c \
+	hal/phy/device/phyksz8081/fsl_phyksz8081.c \
+	hal/phy/device/phylan8720/fsl_phylan8720.c \
+	hal/phy/mdio/enet/fsl_enet_mdio.c \
+	lib/mbedtls_errors/mp_mbedtls_errors.c
+endif
+
+# NXP SDK sources
 SRC_HAL_IMX_C += \
 	$(MCU_DIR)/drivers/fsl_adc.c \
 	$(MCU_DIR)/drivers/fsl_cache.c \
@@ -213,6 +145,7 @@ SRC_HAL_IMX_C += \
 	$(MCU_DIR)/drivers/fsl_qtmr.c
 endif
 
+# C source files
 SRC_C += \
 	board_init.c \
 	boards/$(MCU_SERIES)_clock_config.c \
@@ -254,9 +187,9 @@ SRC_C += \
 	sdcard.c \
 	shared/libc/printf.c \
 	shared/libc/string0.c \
+	shared/netutils/dhcpserver.c \
 	shared/netutils/netutils.c \
 	shared/netutils/trace.c \
-	shared/netutils/dhcpserver.c \
 	shared/readline/readline.c \
 	shared/runtime/gchelper_native.c \
 	shared/runtime/interrupt_char.c \
@@ -273,33 +206,28 @@ SRC_C += \
 	$(SRC_ETH_C) \
 
 ifeq ($(MICROPY_HW_FLASH_TYPE), qspi_nor)
-CFLAGS += -DBOARD_FLASH_OPS_HEADER_H=\"hal/flexspi_nor_flash.h\"
 SRC_C += hal/flexspi_nor_flash.c
 
 ifeq ($(MICROPY_HW_BOARD_FLASH_FILES), 1)
-CFLAGS += -DBOARD_FLASH_CONFIG_HEADER_H=\"$(BOARD)_flexspi_flash_config.h\"
 SRC_C += $(BOARD_DIR)/qspi_nor_flash_config.c
 else
-CFLAGS += -DBOARD_FLASH_CONFIG_HEADER_H=\"hal/flexspi_flash_config.h\"
 SRC_C += hal/qspi_nor_flash_config.c
-endif
+endif  # qspi_nor
 #
 else ifeq ($(MICROPY_HW_FLASH_TYPE), hyperflash)
-CFLAGS += -DBOARD_FLASH_OPS_HEADER_H=\"hal/flexspi_hyper_flash.h\"
 SRC_C += hal/flexspi_hyper_flash.c
 
 ifeq ($(MICROPY_HW_BOARD_FLASH_FILES), 1)
-CFLAGS += -DBOARD_FLASH_CONFIG_HEADER_H=\"$(BOARD)_flexspi_flash_config.h\"
 SRC_C += $(BOARD_DIR)/qspi_hyper_flash_config.c
 else
-CFLAGS += -DBOARD_FLASH_CONFIG_HEADER_H=\"hal/flexspi_flash_config.h\"
 SRC_C += hal/qspi_hyper_flash_config.c
-endif
+endif  # hyperflash
 #
 else
 $(error Error: Unknown board flash type $(MICROPY_HW_FLASH_TYPE))
 endif
 
+# Math library source files
 ifeq ($(MICROPY_FLOAT_IMPL),double)
 LIBM_SRC_C += $(addprefix lib/libm_dbl/,\
 	__cos.c \
@@ -386,19 +314,31 @@ LIBM_SRC_C += lib/libm/ef_sqrt.c
 endif
 endif
 
-LIBM_O = $(addprefix $(BUILD)/, $(LIBM_SRC_C:.c=.o))
-
-# Too many warnings in libm_dbl, disable for now.
-ifeq ($(MICROPY_FLOAT_IMPL),double)
-$(LIBM_O): CFLAGS := $(filter-out -Wdouble-promotion -Wfloat-conversion, $(CFLAGS))
-endif
+# Reset variables
+SUPPORTS_HARDWARE_FP_SINGLE = 0
+SUPPORTS_HARDWARE_FP_DOUBLE = 0
 
+# Assembly source files
 SRC_SS = \
 	$(MCU_DIR)/gcc/startup_$(MCU_SERIES).S \
 	hal/resethandler_MIMXRT10xx.S
 
 SRC_S += shared/runtime/gchelper_m3.s \
 
+# =============================================================================
+# QSTR Sources
+# =============================================================================
+
+# All settings for Ethernet support are controller by the value of MICROPY_PY_LWIP
+ifeq ($(MICROPY_PY_LWIP), 1)
+SRC_QSTR += \
+	extmod/modlwip.c \
+	extmod/modnetwork.c \
+	extmod/modusocket.c \
+	extmod/moduwebsocket.c \
+	network_lan.c
+endif
+
 # List of sources for qstr extraction
 SRC_QSTR += \
 	extmod/modonewire.c \
@@ -421,7 +361,150 @@ SRC_QSTR += \
 	pin.c \
 	shared/runtime/mpirq.c \
 	shared/runtime/sys_stdio_mphal.c \
-	$(GEN_PINS_SRC) \
+	$(GEN_PINS_SRC)
+
+# =============================================================================
+# Compiler Flags
+# =============================================================================
+
+ifeq ($(DEBUG),1)
+CFLAGS += -Og -ggdb
+else
+CFLAGS += -Os -DNDEBUG
+endif
+
+# Configure default compiler flags
+CFLAGS += \
+	$(INC) \
+	-D__START=main \
+	-D__STARTUP_CLEAR_BSS \
+	-D__STARTUP_INITIALIZE_RAMFUNCTION \
+	-DBOARD_$(BOARD) \
+	-DBOARD_FLASH_SIZE=$(MICROPY_HW_FLASH_SIZE) \
+	-DCFG_TUSB_MCU=OPT_MCU_MIMXRT10XX \
+	-DCLOCK_CONFIG_H='<boards/$(MCU_SERIES)_clock_config.h>' \
+	-DCPU_$(MCU_SERIES) \
+	-DCPU_$(MCU_VARIANT) \
+	-DCPU_HEADER_H='<$(MCU_SERIES).h>' \
+	-DFSL_SDK_ENABLE_DRIVER_CACHE_CONTROL=1 \
+	-DI2C_RETRY_TIMES=1000000 \
+	-DMICROPY_HW_FLASH_SIZE=$(MICROPY_HW_FLASH_SIZE) \
+	-DSPI_RETRY_TIMES=1000000 \
+	-DUART_RETRY_TIMES=1000000 \
+	-DXIP_BOOT_HEADER_ENABLE=1 \
+	-DXIP_EXTERNAL_FLASH=1 \
+	-fdata-sections \
+	-ffunction-sections \
+	-mcpu=cortex-m7 \
+	-mthumb \
+	-mtune=cortex-m7 \
+	-nostdlib \
+	-std=c99 \
+	-Wall \
+	-Wdouble-promotion \
+	-Werror \
+	-Wfloat-conversion \
+	-Wno-error=unused-parameter
+
+ifeq ($(MICROPY_HW_FLASH_TYPE), qspi_nor)
+CFLAGS += -DBOARD_FLASH_OPS_HEADER_H=\"hal/flexspi_nor_flash.h\"
+
+ifeq ($(MICROPY_HW_BOARD_FLASH_FILES), 1)
+CFLAGS += -DBOARD_FLASH_CONFIG_HEADER_H=\"$(BOARD)_flexspi_flash_config.h\"
+else
+CFLAGS += -DBOARD_FLASH_CONFIG_HEADER_H=\"hal/flexspi_flash_config.h\"
+endif  # qspi_nor
+#
+else ifeq ($(MICROPY_HW_FLASH_TYPE), hyperflash)
+CFLAGS += -DBOARD_FLASH_OPS_HEADER_H=\"hal/flexspi_hyper_flash.h\"
+
+ifeq ($(MICROPY_HW_BOARD_FLASH_FILES), 1)
+CFLAGS += -DBOARD_FLASH_CONFIG_HEADER_H=\"$(BOARD)_flexspi_flash_config.h\"
+else
+CFLAGS += -DBOARD_FLASH_CONFIG_HEADER_H=\"hal/flexspi_flash_config.h\"
+endif  # hyperflash
+#
+else
+$(error Error: Unknown board flash type $(MICROPY_HW_FLASH_TYPE))
+endif
+
+# Configure floating point support
+ifeq ($(MICROPY_FLOAT_IMPL),double)
+CFLAGS += \
+	-DMICROPY_FLOAT_IMPL=MICROPY_FLOAT_IMPL_DOUBLE \
+	-mfloat-abi=hard \
+	-mfpu=fpv5-d16
+else
+ifeq ($(MICROPY_FLOAT_IMPL),none)
+CFLAGS += -DMICROPY_FLOAT_IMPL=MICROPY_FLOAT_IMPL_NONE
+else
+CFLAGS += \
+	-DMICROPY_FLOAT_IMPL=MICROPY_FLOAT_IMPL_FLOAT \
+	-fsingle-precision-constant \
+	-mfloat-abi=softfp \
+	-mfpu=fpv5-sp-d16
+endif
+endif
+
+# Configure feature specific compiler flags
+ifeq ($(MICROPY_PY_MACHINE_SDCARD),1)
+CFLAGS += -DMICROPY_PY_MACHINE_SDCARD=1
+endif
+
+# All settings for Ethernet support are controller by the value of MICROPY_PY_LWIP
+ifeq ($(MICROPY_PY_LWIP), 1)
+CFLAGS += \
+	-DFSL_FEATURE_PHYKSZ8081_USE_RMII50M_MODE=1 \
+	-DMBEDTLS_CONFIG_FILE='"mbedtls/mbedtls_config.h"'
+endif
+
+ifdef MICROPY_HW_SDRAM_AVAIL
+CFLAGS += \
+	-DMICROPY_HW_SDRAM_AVAIL=$(MICROPY_HW_SDRAM_AVAIL) \
+	-DMICROPY_HW_SDRAM_SIZE=$(MICROPY_HW_SDRAM_SIZE)
+endif
+
+CFLAGS += $(CFLAGS_MOD) $(CFLAGS_EXTRA)
+
+# =============================================================================
+# Linker Flags
+# =============================================================================
+
+LDFLAGS = \
+	--cref \
+	--gc-sections \
+	--print-memory-usage \
+	-Map=$@.map
+
+# LDDEFINES are used for link time adaptation of linker scripts, utilizing
+#	the C preprocessor. Therefore keep LDDEFINES separated from LDFLAGS!
+
+LDDEFINES = \
+	-DMICROPY_HW_FLASH_TYPE=$(MICROPY_HW_FLASH_TYPE) \
+	-DMICROPY_HW_FLASH_SIZE=$(MICROPY_HW_FLASH_SIZE)
+
+ifdef MICROPY_HW_FLASH_RESERVED
+LDDEFINES += -DMICROPY_HW_FLASH_RESERVED=$(MICROPY_HW_FLASH_RESERVED)
+endif
+
+ifdef MICROPY_HW_SDRAM_AVAIL
+LDDEFINES += \
+	-DMICROPY_HW_SDRAM_AVAIL=$(MICROPY_HW_SDRAM_AVAIL) \
+	-DMICROPY_HW_SDRAM_SIZE=$(MICROPY_HW_SDRAM_SIZE)
+endif
+
+# =============================================================================
+# Library and Object files
+# =============================================================================
+
+LIBS = $(shell $(CC) $(CFLAGS) -print-libgcc-file-name)
+LIBM_O = $(addprefix $(BUILD)/, $(LIBM_SRC_C:.c=.o))
+
+# Too many warnings in libm_dbl, disable for now.
+ifeq ($(MICROPY_FLOAT_IMPL),double)
+$(LIBM_O): CFLAGS := $(filter-out -Wdouble-promotion -Wfloat-conversion, $(CFLAGS))
+endif
+
 
 OBJ += $(PY_O)
 OBJ += $(LIBM_O)
@@ -434,8 +517,14 @@ OBJ += $(BUILD)/pins_gen.o
 # Workaround for bug in older gcc, warning on "static usbd_device_t _usbd_dev = { 0 };"
 $(BUILD)/lib/tinyusb/src/device/usbd.o: CFLAGS += -Wno-missing-braces
 
+# =============================================================================
+# Build targets
+# =============================================================================
+
 all: $(BUILD)/firmware.hex $(BUILD)/firmware.bin
 
+# Process linker scripts with C preprocessor to exchange LDDEFINES and
+#	aggregate output of preprocessor in a single linker script `link.ld`
 $(BUILD)/firmware.elf: $(OBJ)
 	$(ECHO) "PREPROCESS LINK $@"
 	$(Q)$(CC) -E -x c $(LDDEFINES) $(LD_FILES) | grep -v '^#' > $(BUILD)/link.ld

From b1aec393b132b69bab94ec88ea1fdc4ace081313 Mon Sep 17 00:00:00 2001
From: Philipp Ebensberger <philipp.ebensberger@3bricks-software.de>
Date: Wed, 22 Jun 2022 20:39:23 +0200
Subject: [PATCH 2250/3533] mimxrt/Makefile: Modify handling of SDRAM option.

Replaces preprocessor macro for SDRAM option from #ifdef to #if in order to
allow always setting the define `MICROPY_HW_SDRAM_AVAIL` just with the
appropriate value 0/1.  This eliminates one `if` in the Makefile.
---
 ports/mimxrt/Makefile             | 12 ++++++------
 ports/mimxrt/board_init.c         |  2 +-
 ports/mimxrt/boards/MIMXRT1021.ld |  4 ++--
 ports/mimxrt/boards/MIMXRT1052.ld |  4 ++--
 ports/mimxrt/boards/MIMXRT1062.ld |  4 ++--
 ports/mimxrt/boards/MIMXRT1064.ld |  4 ++--
 ports/mimxrt/boards/common.ld     |  4 ++--
 7 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/ports/mimxrt/Makefile b/ports/mimxrt/Makefile
index 7f93a6826d34a..ed7cc0630a5c0 100644
--- a/ports/mimxrt/Makefile
+++ b/ports/mimxrt/Makefile
@@ -373,6 +373,10 @@ else
 CFLAGS += -Os -DNDEBUG
 endif
 
+# Set default values for optional variables
+MICROPY_HW_SDRAM_AVAIL ?= 0
+MICROPY_HW_SDRAM_SIZE ?= 0
+
 # Configure default compiler flags
 CFLAGS += \
 	$(INC) \
@@ -389,6 +393,8 @@ CFLAGS += \
 	-DFSL_SDK_ENABLE_DRIVER_CACHE_CONTROL=1 \
 	-DI2C_RETRY_TIMES=1000000 \
 	-DMICROPY_HW_FLASH_SIZE=$(MICROPY_HW_FLASH_SIZE) \
+	-DMICROPY_HW_SDRAM_AVAIL=$(MICROPY_HW_SDRAM_AVAIL) \
+	-DMICROPY_HW_SDRAM_SIZE=$(MICROPY_HW_SDRAM_SIZE) \
 	-DSPI_RETRY_TIMES=1000000 \
 	-DUART_RETRY_TIMES=1000000 \
 	-DXIP_BOOT_HEADER_ENABLE=1 \
@@ -458,12 +464,6 @@ CFLAGS += \
 	-DMBEDTLS_CONFIG_FILE='"mbedtls/mbedtls_config.h"'
 endif
 
-ifdef MICROPY_HW_SDRAM_AVAIL
-CFLAGS += \
-	-DMICROPY_HW_SDRAM_AVAIL=$(MICROPY_HW_SDRAM_AVAIL) \
-	-DMICROPY_HW_SDRAM_SIZE=$(MICROPY_HW_SDRAM_SIZE)
-endif
-
 CFLAGS += $(CFLAGS_MOD) $(CFLAGS_EXTRA)
 
 # =============================================================================
diff --git a/ports/mimxrt/board_init.c b/ports/mimxrt/board_init.c
index c3dbb652bc06c..12496890ac4a3 100644
--- a/ports/mimxrt/board_init.c
+++ b/ports/mimxrt/board_init.c
@@ -52,7 +52,7 @@ void board_init(void) {
     CLOCK_EnableClock(kCLOCK_Iomuxc);
 
     // ------------- SDRAM ------------ //
-    #ifdef MICROPY_HW_SDRAM_AVAIL
+    #if MICROPY_HW_SDRAM_AVAIL
     mimxrt_sdram_init();
     #endif
 
diff --git a/ports/mimxrt/boards/MIMXRT1021.ld b/ports/mimxrt/boards/MIMXRT1021.ld
index 1263cd336c52e..60557f1bbf8a6 100644
--- a/ports/mimxrt/boards/MIMXRT1021.ld
+++ b/ports/mimxrt/boards/MIMXRT1021.ld
@@ -27,7 +27,7 @@ dtcm_size           = 0x00018000;
 ocrm_start          = 0x20200000;
 ocrm_size           = 0x00018000;
 
-#ifdef MICROPY_HW_SDRAM_AVAIL
+#if MICROPY_HW_SDRAM_AVAIL
 sdram_start         = 0x80000000;
 sdram_size          = MICROPY_HW_SDRAM_SIZE;
 #endif
@@ -37,7 +37,7 @@ __stack_size__ = 0x6000;
 _estack = __StackTop;
 _sstack = __StackLimit;
 
-#ifdef MICROPY_HW_SDRAM_AVAIL
+#if MICROPY_HW_SDRAM_AVAIL
 _gc_heap_start = ORIGIN(m_sdram);
 _gc_heap_end = ORIGIN(m_sdram) + LENGTH(m_sdram);
 #else
diff --git a/ports/mimxrt/boards/MIMXRT1052.ld b/ports/mimxrt/boards/MIMXRT1052.ld
index f7c60d24f4d19..3e5739acf58fd 100644
--- a/ports/mimxrt/boards/MIMXRT1052.ld
+++ b/ports/mimxrt/boards/MIMXRT1052.ld
@@ -29,7 +29,7 @@ dtcm_size           = 0x00020000;
 ocrm_start          = 0x20200000;
 ocrm_size           = 0x00040000;
 
-#ifdef MICROPY_HW_SDRAM_AVAIL
+#if MICROPY_HW_SDRAM_AVAIL
 sdram_start         = 0x80000000;
 sdram_size          = MICROPY_HW_SDRAM_SIZE;
 #endif
@@ -39,7 +39,7 @@ __stack_size__ = 0x6000;
 _estack = __StackTop;
 _sstack = __StackLimit;
 
-#ifdef MICROPY_HW_SDRAM_AVAIL
+#if MICROPY_HW_SDRAM_AVAIL
 _gc_heap_start = ORIGIN(m_sdram);
 _gc_heap_end = ORIGIN(m_sdram) + LENGTH(m_sdram);
 #else
diff --git a/ports/mimxrt/boards/MIMXRT1062.ld b/ports/mimxrt/boards/MIMXRT1062.ld
index f588e5bd9e237..fc4eb20c07c6a 100644
--- a/ports/mimxrt/boards/MIMXRT1062.ld
+++ b/ports/mimxrt/boards/MIMXRT1062.ld
@@ -29,7 +29,7 @@ dtcm_size           = 0x00020000;
 ocrm_start          = 0x20200000;
 ocrm_size           = 0x000C0000;
 
-#ifdef MICROPY_HW_SDRAM_AVAIL
+#if MICROPY_HW_SDRAM_AVAIL
 sdram_start         = 0x80000000;
 sdram_size          = MICROPY_HW_SDRAM_SIZE;
 #endif
@@ -39,7 +39,7 @@ __stack_size__ = 0x8000;
 _estack = __StackTop;
 _sstack = __StackLimit;
 
-#ifdef MICROPY_HW_SDRAM_AVAIL
+#if MICROPY_HW_SDRAM_AVAIL
 _gc_heap_start = ORIGIN(m_sdram);
 _gc_heap_end = ORIGIN(m_sdram) + LENGTH(m_sdram);
 #else
diff --git a/ports/mimxrt/boards/MIMXRT1064.ld b/ports/mimxrt/boards/MIMXRT1064.ld
index b36c52845343d..148f1f23e27e7 100644
--- a/ports/mimxrt/boards/MIMXRT1064.ld
+++ b/ports/mimxrt/boards/MIMXRT1064.ld
@@ -31,7 +31,7 @@ dtcm_size           = 0x00020000;
 ocrm_start          = 0x20200000;
 ocrm_size           = 0x000C0000;
 
-#ifdef MICROPY_HW_SDRAM_AVAIL
+#if MICROPY_HW_SDRAM_AVAIL
 sdram_start         = 0x80000000;
 sdram_size          = MICROPY_HW_SDRAM_SIZE;
 #endif
@@ -41,7 +41,7 @@ __stack_size__ = 0x6000;
 _estack = __StackTop;
 _sstack = __StackLimit;
 
-#ifdef MICROPY_HW_SDRAM_AVAIL
+#if MICROPY_HW_SDRAM_AVAIL
 _gc_heap_start = ORIGIN(m_sdram);
 _gc_heap_end = ORIGIN(m_sdram) + LENGTH(m_sdram);
 #else
diff --git a/ports/mimxrt/boards/common.ld b/ports/mimxrt/boards/common.ld
index 7aee66e2e8e11..fbc99da3ddb0e 100644
--- a/ports/mimxrt/boards/common.ld
+++ b/ports/mimxrt/boards/common.ld
@@ -46,7 +46,7 @@ MEMORY
   m_dtcm         (RW) : ORIGIN = dtcm_start,            LENGTH = dtcm_size
   m_ocrm         (RW) : ORIGIN = ocrm_start,            LENGTH = ocrm_size
 
-  #ifdef MICROPY_HW_SDRAM_AVAIL
+  #if MICROPY_HW_SDRAM_AVAIL
   m_sdram        (RX) : ORIGIN = sdram_start,           LENGTH = sdram_size
   #endif
 }
@@ -55,7 +55,7 @@ MEMORY
 SECTIONS
 {
   __flash_start = flash_start;
-  #ifdef MICROPY_HW_SDRAM_AVAIL
+  #if MICROPY_HW_SDRAM_AVAIL
   __sdram_start = sdram_start;
   #endif
   __vfs_start = ORIGIN(m_vfs);

From 84339aa8ec7839e803147d022533a68e3bdd532a Mon Sep 17 00:00:00 2001
From: Philipp Ebensberger <philipp.ebensberger@3bricks-software.de>
Date: Wed, 22 Jun 2022 20:43:27 +0200
Subject: [PATCH 2251/3533] mimxrt/Makefile: Modify handling of SDCARD option.

Removes separate `if` case in Makefile for setting SDCARD option define.
---
 ports/mimxrt/Makefile | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/ports/mimxrt/Makefile b/ports/mimxrt/Makefile
index ed7cc0630a5c0..ee8281dd684b4 100644
--- a/ports/mimxrt/Makefile
+++ b/ports/mimxrt/Makefile
@@ -376,6 +376,7 @@ endif
 # Set default values for optional variables
 MICROPY_HW_SDRAM_AVAIL ?= 0
 MICROPY_HW_SDRAM_SIZE ?= 0
+MICROPY_PY_MACHINE_SDCARD ?= 0
 
 # Configure default compiler flags
 CFLAGS += \
@@ -395,6 +396,7 @@ CFLAGS += \
 	-DMICROPY_HW_FLASH_SIZE=$(MICROPY_HW_FLASH_SIZE) \
 	-DMICROPY_HW_SDRAM_AVAIL=$(MICROPY_HW_SDRAM_AVAIL) \
 	-DMICROPY_HW_SDRAM_SIZE=$(MICROPY_HW_SDRAM_SIZE) \
+	-DMICROPY_PY_MACHINE_SDCARD=$(MICROPY_PY_MACHINE_SDCARD) \
 	-DSPI_RETRY_TIMES=1000000 \
 	-DUART_RETRY_TIMES=1000000 \
 	-DXIP_BOOT_HEADER_ENABLE=1 \
@@ -452,11 +454,6 @@ CFLAGS += \
 endif
 endif
 
-# Configure feature specific compiler flags
-ifeq ($(MICROPY_PY_MACHINE_SDCARD),1)
-CFLAGS += -DMICROPY_PY_MACHINE_SDCARD=1
-endif
-
 # All settings for Ethernet support are controller by the value of MICROPY_PY_LWIP
 ifeq ($(MICROPY_PY_LWIP), 1)
 CFLAGS += \

From bec0524dbf75bc9a90b0331ab52cdf6c5f6d9121 Mon Sep 17 00:00:00 2001
From: Philipp Ebensberger <philipp.ebensberger@3bricks-software.de>
Date: Wed, 22 Jun 2022 21:26:54 +0200
Subject: [PATCH 2252/3533] mimxrt/Makefile: Rework board flash type handling.

Reworks handling and configuration of different board flash types in the
Makefile, linker scripts and board makefile fragments.
---
 ports/mimxrt/Makefile                         | 66 ++++++++-----------
 .../boards/MIMXRT1010_EVK/mpconfigboard.mk    |  2 +-
 ports/mimxrt/boards/MIMXRT1011.ld             |  2 +-
 ports/mimxrt/boards/MIMXRT1015.ld             |  2 +-
 .../boards/MIMXRT1015_EVK/mpconfigboard.mk    |  2 +-
 .../boards/MIMXRT1020_EVK/mpconfigboard.mk    |  2 +-
 ports/mimxrt/boards/MIMXRT1021.ld             |  2 +-
 .../boards/MIMXRT1050_EVK/mpconfigboard.mk    |  2 +-
 ports/mimxrt/boards/MIMXRT1052.ld             |  4 +-
 .../boards/MIMXRT1060_EVK/mpconfigboard.mk    |  2 +-
 ports/mimxrt/boards/MIMXRT1062.ld             |  4 +-
 ports/mimxrt/boards/MIMXRT1064.ld             |  6 +-
 .../boards/MIMXRT1064_EVK/mpconfigboard.mk    |  2 +-
 .../boards/OLIMEX_RT1010/mpconfigboard.mk     |  2 +-
 .../boards/SEEED_ARCH_MIX/mpconfigboard.mk    |  2 +-
 ports/mimxrt/boards/TEENSY40/mpconfigboard.mk |  2 +-
 ports/mimxrt/boards/TEENSY41/mpconfigboard.mk |  2 +-
 17 files changed, 46 insertions(+), 60 deletions(-)

diff --git a/ports/mimxrt/Makefile b/ports/mimxrt/Makefile
index ee8281dd684b4..32861c26aed89 100644
--- a/ports/mimxrt/Makefile
+++ b/ports/mimxrt/Makefile
@@ -203,28 +203,21 @@ SRC_C += \
 	tusb_port.c \
 	$(SRC_TINYUSB_C) \
 	$(SRC_HAL_IMX_C) \
-	$(SRC_ETH_C) \
-
-ifeq ($(MICROPY_HW_FLASH_TYPE), qspi_nor)
-SRC_C += hal/flexspi_nor_flash.c
-
-ifeq ($(MICROPY_HW_BOARD_FLASH_FILES), 1)
-SRC_C += $(BOARD_DIR)/qspi_nor_flash_config.c
-else
-SRC_C += hal/qspi_nor_flash_config.c
-endif  # qspi_nor
-#
-else ifeq ($(MICROPY_HW_FLASH_TYPE), hyperflash)
-SRC_C += hal/flexspi_hyper_flash.c
-
-ifeq ($(MICROPY_HW_BOARD_FLASH_FILES), 1)
-SRC_C += $(BOARD_DIR)/qspi_hyper_flash_config.c
-else
-SRC_C += hal/qspi_hyper_flash_config.c
-endif  # hyperflash
-#
+	$(SRC_ETH_C)
+
+# Add sources for respective board flash type
+ifeq ($(MICROPY_HW_FLASH_TYPE),$(filter $(MICROPY_HW_FLASH_TYPE),qspi_nor_flash qspi_hyper_flash))
+    # Add hal/flexspi_nor_flash.c or hal/flashspi_hyper_flash.c respectively
+    SRC_C += hal/flexspi_$(subst qspi_,,$(MICROPY_HW_FLASH_TYPE)).c
+    #
+    # Add custom (board specific) or default configuration
+    ifeq ($(MICROPY_HW_BOARD_FLASH_FILES), 1)
+        SRC_C += $(BOARD_DIR)/$(MICROPY_HW_FLASH_TYPE)_config.c
+    else
+        SRC_C += hal/$(MICROPY_HW_FLASH_TYPE)_config.c
+    endif
 else
-$(error Error: Unknown board flash type $(MICROPY_HW_FLASH_TYPE))
+    $(error Error: Unknown board flash type $(MICROPY_HW_FLASH_TYPE))
 endif
 
 # Math library source files
@@ -414,26 +407,19 @@ CFLAGS += \
 	-Wfloat-conversion \
 	-Wno-error=unused-parameter
 
-ifeq ($(MICROPY_HW_FLASH_TYPE), qspi_nor)
-CFLAGS += -DBOARD_FLASH_OPS_HEADER_H=\"hal/flexspi_nor_flash.h\"
-
-ifeq ($(MICROPY_HW_BOARD_FLASH_FILES), 1)
-CFLAGS += -DBOARD_FLASH_CONFIG_HEADER_H=\"$(BOARD)_flexspi_flash_config.h\"
-else
-CFLAGS += -DBOARD_FLASH_CONFIG_HEADER_H=\"hal/flexspi_flash_config.h\"
-endif  # qspi_nor
-#
-else ifeq ($(MICROPY_HW_FLASH_TYPE), hyperflash)
-CFLAGS += -DBOARD_FLASH_OPS_HEADER_H=\"hal/flexspi_hyper_flash.h\"
-
-ifeq ($(MICROPY_HW_BOARD_FLASH_FILES), 1)
-CFLAGS += -DBOARD_FLASH_CONFIG_HEADER_H=\"$(BOARD)_flexspi_flash_config.h\"
-else
-CFLAGS += -DBOARD_FLASH_CONFIG_HEADER_H=\"hal/flexspi_flash_config.h\"
-endif  # hyperflash
-#
+# Configure respective board flash type
+ifeq ($(MICROPY_HW_FLASH_TYPE),$(filter $(MICROPY_HW_FLASH_TYPE),qspi_nor_flash qspi_hyper_flash))
+    # Add hal/flexspi_nor_flash.h or hal/flexspi_hyper_flash.h respectively
+    CFLAGS += -DBOARD_FLASH_OPS_HEADER_H=\"hal/flexspi_$(subst qspi_,,$(MICROPY_HW_FLASH_TYPE)).h\"
+    #
+    # Add custom (board specific) or default configuration
+    ifeq ($(MICROPY_HW_BOARD_FLASH_FILES), 1)
+        CFLAGS += -DBOARD_FLASH_CONFIG_HEADER_H=\"$(BOARD)_flexspi_flash_config.h\"
+    else
+        CFLAGS += -DBOARD_FLASH_CONFIG_HEADER_H=\"hal/flexspi_flash_config.h\"
+    endif
 else
-$(error Error: Unknown board flash type $(MICROPY_HW_FLASH_TYPE))
+    $(error Error: Unknown board flash type $(MICROPY_HW_FLASH_TYPE))
 endif
 
 # Configure floating point support
diff --git a/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.mk b/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.mk
index c2a50d722be1f..af705e0b9090b 100644
--- a/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.mk
+++ b/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.mk
@@ -3,7 +3,7 @@ MCU_VARIANT = MIMXRT1011DAE5A
 
 MICROPY_FLOAT_IMPL = single
 MICROPY_PY_MACHINE_SDCARD = 0
-MICROPY_HW_FLASH_TYPE ?= qspi_nor
+MICROPY_HW_FLASH_TYPE ?= qspi_nor_flash
 MICROPY_HW_FLASH_SIZE ?= 0x1000000  # 16MB
 
 JLINK_PATH ?= /media/RT1010-EVK/
diff --git a/ports/mimxrt/boards/MIMXRT1011.ld b/ports/mimxrt/boards/MIMXRT1011.ld
index 19bbc27701657..908eefffd643f 100644
--- a/ports/mimxrt/boards/MIMXRT1011.ld
+++ b/ports/mimxrt/boards/MIMXRT1011.ld
@@ -3,7 +3,7 @@
 reserved_size = MICROPY_HW_FLASH_RESERVED;
 #endif
 
-#if MICROPY_HW_FLASH_TYPE==qspi_nor
+#if MICROPY_HW_FLASH_TYPE == qspi_nor_flash
 flash_start         = 0x60000000;
 #else
 #error Unknown MICROPY_HW_FLASH_TYPE
diff --git a/ports/mimxrt/boards/MIMXRT1015.ld b/ports/mimxrt/boards/MIMXRT1015.ld
index 6d34200a9f78c..90336a2437127 100644
--- a/ports/mimxrt/boards/MIMXRT1015.ld
+++ b/ports/mimxrt/boards/MIMXRT1015.ld
@@ -3,7 +3,7 @@
 reserved_size = MICROPY_HW_FLASH_RESERVED;
 #endif
 
-#if MICROPY_HW_FLASH_TYPE == qspi_nor
+#if MICROPY_HW_FLASH_TYPE == qspi_nor_flash
 flash_start         = 0x60000000;
 #else
 #error Unknown MICROPY_HW_FLASH_TYPE
diff --git a/ports/mimxrt/boards/MIMXRT1015_EVK/mpconfigboard.mk b/ports/mimxrt/boards/MIMXRT1015_EVK/mpconfigboard.mk
index 5d959b31d4546..a2661a4897596 100644
--- a/ports/mimxrt/boards/MIMXRT1015_EVK/mpconfigboard.mk
+++ b/ports/mimxrt/boards/MIMXRT1015_EVK/mpconfigboard.mk
@@ -3,7 +3,7 @@ MCU_VARIANT = MIMXRT1015DAF5A
 
 MICROPY_FLOAT_IMPL = single
 MICROPY_PY_MACHINE_SDCARD = 0
-MICROPY_HW_FLASH_TYPE ?= qspi_nor
+MICROPY_HW_FLASH_TYPE ?= qspi_nor_flash
 MICROPY_HW_FLASH_SIZE ?= 0x1000000  # 16MB
 
 MICROPY_BOOT_BUFFER_SIZE = (32 * 1024)
diff --git a/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.mk b/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.mk
index c1e1678e59923..98262e2370e73 100644
--- a/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.mk
+++ b/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.mk
@@ -3,7 +3,7 @@ MCU_VARIANT = MIMXRT1021DAG5A
 
 MICROPY_FLOAT_IMPL = double
 MICROPY_PY_MACHINE_SDCARD = 1
-MICROPY_HW_FLASH_TYPE ?= qspi_nor
+MICROPY_HW_FLASH_TYPE ?= qspi_nor_flash
 MICROPY_HW_FLASH_SIZE ?= 0x800000  # 8MB
 
 MICROPY_HW_SDRAM_AVAIL = 1
diff --git a/ports/mimxrt/boards/MIMXRT1021.ld b/ports/mimxrt/boards/MIMXRT1021.ld
index 60557f1bbf8a6..bef0c13df5505 100644
--- a/ports/mimxrt/boards/MIMXRT1021.ld
+++ b/ports/mimxrt/boards/MIMXRT1021.ld
@@ -3,7 +3,7 @@
 reserved_size = MICROPY_HW_FLASH_RESERVED;
 #endif
 
-#if MICROPY_HW_FLASH_TYPE == qspi_nor
+#if MICROPY_HW_FLASH_TYPE == qspi_nor_flash
 flash_start         = 0x60000000;
 #else
 #error Unknown MICROPY_HW_FLASH_TYPE
diff --git a/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.mk b/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.mk
index 65e3d30963d3e..4cdf18b62b378 100644
--- a/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.mk
+++ b/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.mk
@@ -3,7 +3,7 @@ MCU_VARIANT = MIMXRT1052DVL6B
 
 MICROPY_FLOAT_IMPL = double
 MICROPY_PY_MACHINE_SDCARD = 1
-MICROPY_HW_FLASH_TYPE ?= hyperflash
+MICROPY_HW_FLASH_TYPE ?= qspi_hyper_flash
 MICROPY_HW_FLASH_SIZE ?= 0x4000000  # 64MB
 
 MICROPY_HW_SDRAM_AVAIL = 1
diff --git a/ports/mimxrt/boards/MIMXRT1052.ld b/ports/mimxrt/boards/MIMXRT1052.ld
index 3e5739acf58fd..ca656711a5a77 100644
--- a/ports/mimxrt/boards/MIMXRT1052.ld
+++ b/ports/mimxrt/boards/MIMXRT1052.ld
@@ -3,9 +3,9 @@
 reserved_size = MICROPY_HW_FLASH_RESERVED;
 #endif
 
-#if MICROPY_HW_FLASH_TYPE==qspi_nor
+#if MICROPY_HW_FLASH_TYPE == qspi_nor_flash
 flash_start         = 0x60000000;
-#elif MICROPY_HW_FLASH_TYPE==hyperflash
+#elif MICROPY_HW_FLASH_TYPE == qspi_hyper_flash
 flash_start         = 0x60000000;
 #else
 #error Unknown MICROPY_HW_FLASH_TYPE
diff --git a/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.mk b/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.mk
index 56ccba6e5929c..ecdd7ec0cb03d 100644
--- a/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.mk
+++ b/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.mk
@@ -3,7 +3,7 @@ MCU_VARIANT = MIMXRT1062DVJ6A
 
 MICROPY_FLOAT_IMPL = double
 MICROPY_PY_MACHINE_SDCARD = 1
-MICROPY_HW_FLASH_TYPE ?= qspi_nor
+MICROPY_HW_FLASH_TYPE ?= qspi_nor_flash
 MICROPY_HW_FLASH_SIZE ?= 0x800000  # 8MB
 
 MICROPY_HW_SDRAM_AVAIL = 1
diff --git a/ports/mimxrt/boards/MIMXRT1062.ld b/ports/mimxrt/boards/MIMXRT1062.ld
index fc4eb20c07c6a..5b91550d97d60 100644
--- a/ports/mimxrt/boards/MIMXRT1062.ld
+++ b/ports/mimxrt/boards/MIMXRT1062.ld
@@ -3,9 +3,9 @@
 reserved_size = MICROPY_HW_FLASH_RESERVED;
 #endif
 
-#if MICROPY_HW_FLASH_TYPE==qspi_nor
+#if MICROPY_HW_FLASH_TYPE == qspi_nor_flash
 flash_start         = 0x60000000;
-#elif MICROPY_HW_FLASH_TYPE==hyperflash
+#elif MICROPY_HW_FLASH_TYPE == qspi_hyper_flash
 flash_start         = 0x60000000;
 #else
 #error Unknown MICROPY_HW_FLASH_TYPE
diff --git a/ports/mimxrt/boards/MIMXRT1064.ld b/ports/mimxrt/boards/MIMXRT1064.ld
index 148f1f23e27e7..1fbc855fa13f5 100644
--- a/ports/mimxrt/boards/MIMXRT1064.ld
+++ b/ports/mimxrt/boards/MIMXRT1064.ld
@@ -3,11 +3,11 @@
 reserved_size = MICROPY_HW_FLASH_RESERVED;
 #endif
 
-#if MICROPY_HW_FLASH_TYPE==qspi_nor
+#if MICROPY_HW_FLASH_TYPE == qspi_nor_flash
 flash_start         = 0x60000000;
-#elif MICROPY_HW_FLASH_TYPE==hyperflash
+#elif MICROPY_HW_FLASH_TYPE == qspi_hyper_flash
 flash_start         = 0x60000000;
-#elif MICROPY_HW_FLASH_TYPE==internal
+#elif MICROPY_HW_FLASH_TYPE == internal
 flash_start         = 0x70000000;
 #else
 #error Unknown MICROPY_HW_FLASH_TYPE
diff --git a/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.mk b/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.mk
index 5cd7d49abd58a..f524a81e60b01 100644
--- a/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.mk
+++ b/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.mk
@@ -3,7 +3,7 @@ MCU_VARIANT = MIMXRT1064DVL6A
 
 MICROPY_FLOAT_IMPL = double
 MICROPY_PY_MACHINE_SDCARD = 1
-MICROPY_HW_FLASH_TYPE ?= hyperflash
+MICROPY_HW_FLASH_TYPE ?= qspi_hyper_flash
 MICROPY_HW_FLASH_SIZE ?= 0x4000000  # 64MB
 
 MICROPY_HW_SDRAM_AVAIL = 1
diff --git a/ports/mimxrt/boards/OLIMEX_RT1010/mpconfigboard.mk b/ports/mimxrt/boards/OLIMEX_RT1010/mpconfigboard.mk
index e4f904903de7d..96aaa57764f17 100644
--- a/ports/mimxrt/boards/OLIMEX_RT1010/mpconfigboard.mk
+++ b/ports/mimxrt/boards/OLIMEX_RT1010/mpconfigboard.mk
@@ -3,7 +3,7 @@ MCU_VARIANT = MIMXRT1011DAE5A
 
 MICROPY_FLOAT_IMPL = single
 MICROPY_PY_MACHINE_SDCARD ?= 0
-MICROPY_HW_FLASH_TYPE ?= qspi_nor
+MICROPY_HW_FLASH_TYPE ?= qspi_nor_flash
 MICROPY_HW_FLASH_SIZE ?= 0x200000  # 2MB
 MICROPY_HW_FLASH_RESERVED ?= 0x1000  # 4KB
 
diff --git a/ports/mimxrt/boards/SEEED_ARCH_MIX/mpconfigboard.mk b/ports/mimxrt/boards/SEEED_ARCH_MIX/mpconfigboard.mk
index 90edc5d517821..7a87496b9418a 100644
--- a/ports/mimxrt/boards/SEEED_ARCH_MIX/mpconfigboard.mk
+++ b/ports/mimxrt/boards/SEEED_ARCH_MIX/mpconfigboard.mk
@@ -3,7 +3,7 @@ MCU_VARIANT = MIMXRT1052DVL6B
 
 MICROPY_FLOAT_IMPL = double
 MICROPY_PY_MACHINE_SDCARD = 1
-MICROPY_HW_FLASH_TYPE ?= qspi_nor
+MICROPY_HW_FLASH_TYPE ?= qspi_nor_flash
 MICROPY_HW_FLASH_SIZE ?= 0x800000  # 8MB
 	
 MICROPY_HW_SDRAM_AVAIL = 1
diff --git a/ports/mimxrt/boards/TEENSY40/mpconfigboard.mk b/ports/mimxrt/boards/TEENSY40/mpconfigboard.mk
index 94e427cc168a9..aa903a0604fd4 100644
--- a/ports/mimxrt/boards/TEENSY40/mpconfigboard.mk
+++ b/ports/mimxrt/boards/TEENSY40/mpconfigboard.mk
@@ -3,7 +3,7 @@ MCU_VARIANT = MIMXRT1062DVJ6A
 
 MICROPY_FLOAT_IMPL = double
 MICROPY_PY_MACHINE_SDCARD = 1
-MICROPY_HW_FLASH_TYPE ?= qspi_nor
+MICROPY_HW_FLASH_TYPE ?= qspi_nor_flash
 MICROPY_HW_FLASH_SIZE ?= 0x200000  # 2MB
 MICROPY_HW_FLASH_RESERVED ?= 0x1000  # 4KB
 
diff --git a/ports/mimxrt/boards/TEENSY41/mpconfigboard.mk b/ports/mimxrt/boards/TEENSY41/mpconfigboard.mk
index a012444caaa96..454967f04f02c 100755
--- a/ports/mimxrt/boards/TEENSY41/mpconfigboard.mk
+++ b/ports/mimxrt/boards/TEENSY41/mpconfigboard.mk
@@ -3,7 +3,7 @@ MCU_VARIANT = MIMXRT1062DVJ6A
 
 MICROPY_FLOAT_IMPL = double
 MICROPY_PY_MACHINE_SDCARD = 1
-MICROPY_HW_FLASH_TYPE ?= qspi_nor
+MICROPY_HW_FLASH_TYPE ?= qspi_nor_flash
 MICROPY_HW_FLASH_SIZE ?= 0x800000  # 8MB
 MICROPY_HW_FLASH_RESERVED ?= 0x1000  # 4KB
 

From c957c76f4db6244add47494a8a679652b85acff8 Mon Sep 17 00:00:00 2001
From: Philipp Ebensberger <philipp.ebensberger@3bricks-software.de>
Date: Wed, 22 Jun 2022 21:41:42 +0200
Subject: [PATCH 2253/3533] mimxrt/Makefile: Rework floating point config.

Reworks source file and compile flags selection for floating point support.
---
 ports/mimxrt/Makefile | 132 ++++++++++++------------------------------
 1 file changed, 36 insertions(+), 96 deletions(-)

diff --git a/ports/mimxrt/Makefile b/ports/mimxrt/Makefile
index 32861c26aed89..745aa1d3f3e62 100644
--- a/ports/mimxrt/Makefile
+++ b/ports/mimxrt/Makefile
@@ -222,89 +222,27 @@ endif
 
 # Math library source files
 ifeq ($(MICROPY_FLOAT_IMPL),double)
-LIBM_SRC_C += $(addprefix lib/libm_dbl/,\
-	__cos.c \
-	__expo2.c \
-	__fpclassify.c \
-	__rem_pio2.c \
-	__rem_pio2_large.c \
-	__signbit.c \
-	__sin.c \
-	__tan.c \
-	acos.c \
-	acosh.c \
-	asin.c \
-	asinh.c \
-	atan.c \
-	atan2.c \
-	atanh.c \
-	ceil.c \
-	copysign.c \
-	cos.c \
-	cosh.c \
-	erf.c \
-	exp.c \
-	expm1.c \
-	floor.c \
-	fmod.c \
-	frexp.c \
-	ldexp.c \
-	lgamma.c \
-	log.c \
-	log10.c \
-	log1p.c \
-	modf.c \
-	nearbyint.c \
-	pow.c \
-	rint.c \
-	round.c \
-	scalbn.c \
-	sin.c \
-	sinh.c \
-	tan.c \
-	tanh.c \
-	tgamma.c \
-	trunc.c \
-	)
-ifeq ($(SUPPORTS_HARDWARE_FP_DOUBLE),1)
-LIBM_SRC_C += lib/libm_dbl/thumb_vfp_sqrt.c
-else
-LIBM_SRC_C += lib/libm_dbl/sqrt.c
-endif
-else
-LIBM_SRC_C += $(addprefix lib/libm/,\
-	acoshf.c \
-	asinfacosf.c \
-	asinhf.c \
-	atan2f.c \
-	atanf.c \
-	atanhf.c \
-	ef_rem_pio2.c \
-	erf_lgamma.c \
-	fmodf.c \
-	kf_cos.c \
-	kf_rem_pio2.c \
-	kf_sin.c \
-	kf_tan.c \
-	log1pf.c \
-	math.c \
-	nearbyintf.c \
-	roundf.c \
-	sf_cos.c \
-	sf_erf.c \
-	sf_frexp.c \
-	sf_ldexp.c \
-	sf_modf.c \
-	sf_sin.c \
-	sf_tan.c \
-	wf_lgamma.c \
-	wf_tgamma.c \
-	)
-ifeq ($(SUPPORTS_HARDWARE_FP_SINGLE),1)
-LIBM_SRC_C += lib/libm/thumb_vfp_sqrtf.c
+    LIBM_SRC_C += $(addprefix lib/libm_dbl/,\
+        __cos.c __expo2.c __fpclassify.c __rem_pio2.c __rem_pio2_large.c __signbit.c __sin.c __tan.c acos.c acosh.c \
+        asin.c asinh.c atan.c atan2.c atanh.c ceil.c copysign.c cos.c cosh.c erf.c exp.c expm1.c floor.c fmod.c \
+        frexp.c ldexp.c lgamma.c log.c log10.c log1p.c modf.c nearbyint.c pow.c rint.c round.c scalbn.c sin.c \
+        sinh.c tan.c tanh.c tgamma.c trunc.c)
+    #
+    ifeq ($(SUPPORTS_HARDWARE_FP_DOUBLE),1)
+        LIBM_SRC_C += lib/libm_dbl/thumb_vfp_sqrt.c
+    else
+        LIBM_SRC_C += lib/libm_dbl/sqrt.c
+    endif
 else
-LIBM_SRC_C += lib/libm/ef_sqrt.c
-endif
+    LIBM_SRC_C += $(addprefix lib/libm/,\
+        acoshf.c asinfacosf.c asinhf.c atan2f.c atanf.c atanhf.c ef_rem_pio2.c erf_lgamma.c fmodf.c kf_cos.c \
+        kf_rem_pio2.c kf_sin.c kf_tan.c log1pf.c math.c nearbyintf.c roundf.c sf_cos.c sf_erf.c sf_frexp.c sf_ldexp.c \
+        sf_modf.c sf_sin.c sf_tan.c wf_lgamma.c wf_tgamma.c)
+    ifeq ($(SUPPORTS_HARDWARE_FP_SINGLE),1)
+        LIBM_SRC_C += lib/libm/thumb_vfp_sqrtf.c
+    else
+        LIBM_SRC_C += lib/libm/ef_sqrt.c
+    endif
 endif
 
 # Reset variables
@@ -423,23 +361,25 @@ else
 endif
 
 # Configure floating point support
-ifeq ($(MICROPY_FLOAT_IMPL),double)
-CFLAGS += \
-	-DMICROPY_FLOAT_IMPL=MICROPY_FLOAT_IMPL_DOUBLE \
-	-mfloat-abi=hard \
-	-mfpu=fpv5-d16
-else
-ifeq ($(MICROPY_FLOAT_IMPL),none)
-CFLAGS += -DMICROPY_FLOAT_IMPL=MICROPY_FLOAT_IMPL_NONE
+ifeq ($(MICROPY_FLOAT_IMPL),single)
+    CFLAGS += \
+        -DMICROPY_FLOAT_IMPL=MICROPY_FLOAT_IMPL_FLOAT \
+        -fsingle-precision-constant \
+        -mfloat-abi=softfp \
+        -mfpu=fpv5-sp-d16
+else ifeq ($(MICROPY_FLOAT_IMPL),double)
+    CFLAGS += \
+        -DMICROPY_FLOAT_IMPL=MICROPY_FLOAT_IMPL_DOUBLE \
+        -mfloat-abi=hard \
+        -mfpu=fpv5-d16
+else ifeq ($(MICROPY_FLOAT_IMPL),none)
+    CFLAGS += \
+        -DMICROPY_FLOAT_IMPL=MICROPY_FLOAT_IMPL_NONE
 else
-CFLAGS += \
-	-DMICROPY_FLOAT_IMPL=MICROPY_FLOAT_IMPL_FLOAT \
-	-fsingle-precision-constant \
-	-mfloat-abi=softfp \
-	-mfpu=fpv5-sp-d16
-endif
+    $(error Error: Unknown floating point implementation $(MICROPY_FLOAT_IMPL))
 endif
 
+
 # All settings for Ethernet support are controller by the value of MICROPY_PY_LWIP
 ifeq ($(MICROPY_PY_LWIP), 1)
 CFLAGS += \

From 434974ec7707e20faab5ac9752bb70525966ff5c Mon Sep 17 00:00:00 2001
From: Philipp Ebensberger <philipp.ebensberger@3bricks-software.de>
Date: Wed, 22 Jun 2022 21:44:04 +0200
Subject: [PATCH 2254/3533] mimxrt/Makefile: Fix some minor formatting
 inconsistencies.

---
 ports/mimxrt/Makefile | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/ports/mimxrt/Makefile b/ports/mimxrt/Makefile
index 745aa1d3f3e62..7ae3f918371b3 100644
--- a/ports/mimxrt/Makefile
+++ b/ports/mimxrt/Makefile
@@ -27,7 +27,7 @@ include ../../py/mkenv.mk
 
 # Include micropython configuration board makefile
 ifeq ($(wildcard $(BOARD_DIR)/.),)
-$(error Invalid BOARD specified: $(BOARD_DIR))
+    $(error Invalid BOARD specified: $(BOARD_DIR))
 endif
 include $(BOARD_DIR)/mpconfigboard.mk
 
@@ -70,7 +70,7 @@ INC += -I.
 INC += -Ihal
 
 # All settings for Ethernet support are controller by the value of MICROPY_PY_LWIP
-ifeq ($(MICROPY_PY_LWIP), 1)
+ifeq ($(MICROPY_PY_LWIP),1)
 INC += -Ilwip_inc
 INC += -Ihal/phy
 endif
@@ -95,7 +95,7 @@ SRC_TINYUSB_C += \
 	lib/tinyusb/src/tusb.c
 
 # All settings for Ethernet support are controller by the value of MICROPY_PY_LWIP
-ifeq ($(MICROPY_PY_LWIP), 1)
+ifeq ($(MICROPY_PY_LWIP),1)
 SRC_MOD := $(filter-out %/mbedtls/library/error.c, $(SRC_MOD))
 SRC_ETH_C += \
 	$(MCU_DIR)/drivers/fsl_enet.c \
@@ -132,7 +132,7 @@ SRC_HAL_IMX_C += \
 	$(MCU_DIR)/system_$(MCU_SERIES).c \
 	$(MCU_DIR)/xip/fsl_flexspi_nor_boot.c \
 
-ifeq ($(MICROPY_HW_SDRAM_AVAIL), 1)
+ifeq ($(MICROPY_HW_SDRAM_AVAIL),1)
 SRC_HAL_IMX_C += $(MCU_DIR)/drivers/fsl_semc.c
 endif
 
@@ -211,7 +211,7 @@ ifeq ($(MICROPY_HW_FLASH_TYPE),$(filter $(MICROPY_HW_FLASH_TYPE),qspi_nor_flash
     SRC_C += hal/flexspi_$(subst qspi_,,$(MICROPY_HW_FLASH_TYPE)).c
     #
     # Add custom (board specific) or default configuration
-    ifeq ($(MICROPY_HW_BOARD_FLASH_FILES), 1)
+    ifeq ($(MICROPY_HW_BOARD_FLASH_FILES),1)
         SRC_C += $(BOARD_DIR)/$(MICROPY_HW_FLASH_TYPE)_config.c
     else
         SRC_C += hal/$(MICROPY_HW_FLASH_TYPE)_config.c
@@ -261,7 +261,7 @@ SRC_S += shared/runtime/gchelper_m3.s \
 # =============================================================================
 
 # All settings for Ethernet support are controller by the value of MICROPY_PY_LWIP
-ifeq ($(MICROPY_PY_LWIP), 1)
+ifeq ($(MICROPY_PY_LWIP),1)
 SRC_QSTR += \
 	extmod/modlwip.c \
 	extmod/modnetwork.c \
@@ -351,7 +351,7 @@ ifeq ($(MICROPY_HW_FLASH_TYPE),$(filter $(MICROPY_HW_FLASH_TYPE),qspi_nor_flash
     CFLAGS += -DBOARD_FLASH_OPS_HEADER_H=\"hal/flexspi_$(subst qspi_,,$(MICROPY_HW_FLASH_TYPE)).h\"
     #
     # Add custom (board specific) or default configuration
-    ifeq ($(MICROPY_HW_BOARD_FLASH_FILES), 1)
+    ifeq ($(MICROPY_HW_BOARD_FLASH_FILES),1)
         CFLAGS += -DBOARD_FLASH_CONFIG_HEADER_H=\"$(BOARD)_flexspi_flash_config.h\"
     else
         CFLAGS += -DBOARD_FLASH_CONFIG_HEADER_H=\"hal/flexspi_flash_config.h\"
@@ -381,7 +381,7 @@ endif
 
 
 # All settings for Ethernet support are controller by the value of MICROPY_PY_LWIP
-ifeq ($(MICROPY_PY_LWIP), 1)
+ifeq ($(MICROPY_PY_LWIP),1)
 CFLAGS += \
 	-DFSL_FEATURE_PHYKSZ8081_USE_RMII50M_MODE=1 \
 	-DMBEDTLS_CONFIG_FILE='"mbedtls/mbedtls_config.h"'

From 4ce1adab3153bb0dd5afcd0ddefc219b91d1a13e Mon Sep 17 00:00:00 2001
From: Philipp Ebensberger <philipp.ebensberger@3bricks-software.de>
Date: Thu, 23 Jun 2022 19:00:54 +0200
Subject: [PATCH 2255/3533] mimxrt/boards: Remove conditional assignment of
 flash type/size.

Removes conditional assignment because respective variables should only be
set in board makefile fragments.  Hence no conditional assignment needed.
---
 ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.mk | 4 ++--
 ports/mimxrt/boards/MIMXRT1015_EVK/mpconfigboard.mk | 4 ++--
 ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.mk | 4 ++--
 ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.mk | 4 ++--
 ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.mk | 4 ++--
 ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.mk | 4 ++--
 ports/mimxrt/boards/OLIMEX_RT1010/mpconfigboard.mk  | 4 ++--
 ports/mimxrt/boards/SEEED_ARCH_MIX/mpconfigboard.mk | 4 ++--
 ports/mimxrt/boards/TEENSY40/mpconfigboard.mk       | 4 ++--
 ports/mimxrt/boards/TEENSY41/mpconfigboard.mk       | 4 ++--
 10 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.mk b/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.mk
index af705e0b9090b..19db53c3f8710 100644
--- a/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.mk
+++ b/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.mk
@@ -3,8 +3,8 @@ MCU_VARIANT = MIMXRT1011DAE5A
 
 MICROPY_FLOAT_IMPL = single
 MICROPY_PY_MACHINE_SDCARD = 0
-MICROPY_HW_FLASH_TYPE ?= qspi_nor_flash
-MICROPY_HW_FLASH_SIZE ?= 0x1000000  # 16MB
+MICROPY_HW_FLASH_TYPE = qspi_nor_flash
+MICROPY_HW_FLASH_SIZE = 0x1000000  # 16MB
 
 JLINK_PATH ?= /media/RT1010-EVK/
 JLINK_COMMANDER_SCRIPT = $(BUILD)/script.jlink
diff --git a/ports/mimxrt/boards/MIMXRT1015_EVK/mpconfigboard.mk b/ports/mimxrt/boards/MIMXRT1015_EVK/mpconfigboard.mk
index a2661a4897596..ba7d61f6d4f0f 100644
--- a/ports/mimxrt/boards/MIMXRT1015_EVK/mpconfigboard.mk
+++ b/ports/mimxrt/boards/MIMXRT1015_EVK/mpconfigboard.mk
@@ -3,7 +3,7 @@ MCU_VARIANT = MIMXRT1015DAF5A
 
 MICROPY_FLOAT_IMPL = single
 MICROPY_PY_MACHINE_SDCARD = 0
-MICROPY_HW_FLASH_TYPE ?= qspi_nor_flash
-MICROPY_HW_FLASH_SIZE ?= 0x1000000  # 16MB
+MICROPY_HW_FLASH_TYPE = qspi_nor_flash
+MICROPY_HW_FLASH_SIZE = 0x1000000  # 16MB
 
 MICROPY_BOOT_BUFFER_SIZE = (32 * 1024)
diff --git a/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.mk b/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.mk
index 98262e2370e73..e8922e4b7abfb 100644
--- a/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.mk
+++ b/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.mk
@@ -3,8 +3,8 @@ MCU_VARIANT = MIMXRT1021DAG5A
 
 MICROPY_FLOAT_IMPL = double
 MICROPY_PY_MACHINE_SDCARD = 1
-MICROPY_HW_FLASH_TYPE ?= qspi_nor_flash
-MICROPY_HW_FLASH_SIZE ?= 0x800000  # 8MB
+MICROPY_HW_FLASH_TYPE = qspi_nor_flash
+MICROPY_HW_FLASH_SIZE = 0x800000  # 8MB
 
 MICROPY_HW_SDRAM_AVAIL = 1
 MICROPY_HW_SDRAM_SIZE  = 0x2000000  # 32MB
diff --git a/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.mk b/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.mk
index 4cdf18b62b378..00843350494a7 100644
--- a/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.mk
+++ b/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.mk
@@ -3,8 +3,8 @@ MCU_VARIANT = MIMXRT1052DVL6B
 
 MICROPY_FLOAT_IMPL = double
 MICROPY_PY_MACHINE_SDCARD = 1
-MICROPY_HW_FLASH_TYPE ?= qspi_hyper_flash
-MICROPY_HW_FLASH_SIZE ?= 0x4000000  # 64MB
+MICROPY_HW_FLASH_TYPE = qspi_hyper_flash
+MICROPY_HW_FLASH_SIZE = 0x4000000  # 64MB
 
 MICROPY_HW_SDRAM_AVAIL = 1
 MICROPY_HW_SDRAM_SIZE  = 0x2000000  # 32MB
diff --git a/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.mk b/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.mk
index ecdd7ec0cb03d..96afe276f706d 100644
--- a/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.mk
+++ b/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.mk
@@ -3,8 +3,8 @@ MCU_VARIANT = MIMXRT1062DVJ6A
 
 MICROPY_FLOAT_IMPL = double
 MICROPY_PY_MACHINE_SDCARD = 1
-MICROPY_HW_FLASH_TYPE ?= qspi_nor_flash
-MICROPY_HW_FLASH_SIZE ?= 0x800000  # 8MB
+MICROPY_HW_FLASH_TYPE = qspi_nor_flash
+MICROPY_HW_FLASH_SIZE = 0x800000  # 8MB
 
 MICROPY_HW_SDRAM_AVAIL = 1
 MICROPY_HW_SDRAM_SIZE  = 0x2000000  # 32MB
diff --git a/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.mk b/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.mk
index f524a81e60b01..ceb1e9796e01b 100644
--- a/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.mk
+++ b/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.mk
@@ -3,8 +3,8 @@ MCU_VARIANT = MIMXRT1064DVL6A
 
 MICROPY_FLOAT_IMPL = double
 MICROPY_PY_MACHINE_SDCARD = 1
-MICROPY_HW_FLASH_TYPE ?= qspi_hyper_flash
-MICROPY_HW_FLASH_SIZE ?= 0x4000000  # 64MB
+MICROPY_HW_FLASH_TYPE = qspi_hyper_flash
+MICROPY_HW_FLASH_SIZE = 0x4000000  # 64MB
 
 MICROPY_HW_SDRAM_AVAIL = 1
 MICROPY_HW_SDRAM_SIZE  = 0x2000000  # 32MB
diff --git a/ports/mimxrt/boards/OLIMEX_RT1010/mpconfigboard.mk b/ports/mimxrt/boards/OLIMEX_RT1010/mpconfigboard.mk
index 96aaa57764f17..135c43257c95e 100644
--- a/ports/mimxrt/boards/OLIMEX_RT1010/mpconfigboard.mk
+++ b/ports/mimxrt/boards/OLIMEX_RT1010/mpconfigboard.mk
@@ -3,8 +3,8 @@ MCU_VARIANT = MIMXRT1011DAE5A
 
 MICROPY_FLOAT_IMPL = single
 MICROPY_PY_MACHINE_SDCARD ?= 0
-MICROPY_HW_FLASH_TYPE ?= qspi_nor_flash
-MICROPY_HW_FLASH_SIZE ?= 0x200000  # 2MB
+MICROPY_HW_FLASH_TYPE = qspi_nor_flash
+MICROPY_HW_FLASH_SIZE = 0x200000  # 2MB
 MICROPY_HW_FLASH_RESERVED ?= 0x1000  # 4KB
 
 CFLAGS += -DMICROPY_HW_FLASH_DQS=kFlexSPIReadSampleClk_LoopbackInternally
diff --git a/ports/mimxrt/boards/SEEED_ARCH_MIX/mpconfigboard.mk b/ports/mimxrt/boards/SEEED_ARCH_MIX/mpconfigboard.mk
index 7a87496b9418a..2312d11311e50 100644
--- a/ports/mimxrt/boards/SEEED_ARCH_MIX/mpconfigboard.mk
+++ b/ports/mimxrt/boards/SEEED_ARCH_MIX/mpconfigboard.mk
@@ -3,8 +3,8 @@ MCU_VARIANT = MIMXRT1052DVL6B
 
 MICROPY_FLOAT_IMPL = double
 MICROPY_PY_MACHINE_SDCARD = 1
-MICROPY_HW_FLASH_TYPE ?= qspi_nor_flash
-MICROPY_HW_FLASH_SIZE ?= 0x800000  # 8MB
+MICROPY_HW_FLASH_TYPE = qspi_nor_flash
+MICROPY_HW_FLASH_SIZE = 0x800000  # 8MB
 	
 MICROPY_HW_SDRAM_AVAIL = 1
 MICROPY_HW_SDRAM_SIZE  = 0x2000000  # 32MB
diff --git a/ports/mimxrt/boards/TEENSY40/mpconfigboard.mk b/ports/mimxrt/boards/TEENSY40/mpconfigboard.mk
index aa903a0604fd4..4482c629f7dcc 100644
--- a/ports/mimxrt/boards/TEENSY40/mpconfigboard.mk
+++ b/ports/mimxrt/boards/TEENSY40/mpconfigboard.mk
@@ -3,8 +3,8 @@ MCU_VARIANT = MIMXRT1062DVJ6A
 
 MICROPY_FLOAT_IMPL = double
 MICROPY_PY_MACHINE_SDCARD = 1
-MICROPY_HW_FLASH_TYPE ?= qspi_nor_flash
-MICROPY_HW_FLASH_SIZE ?= 0x200000  # 2MB
+MICROPY_HW_FLASH_TYPE = qspi_nor_flash
+MICROPY_HW_FLASH_SIZE = 0x200000  # 2MB
 MICROPY_HW_FLASH_RESERVED ?= 0x1000  # 4KB
 
 deploy: $(BUILD)/firmware.hex
diff --git a/ports/mimxrt/boards/TEENSY41/mpconfigboard.mk b/ports/mimxrt/boards/TEENSY41/mpconfigboard.mk
index 454967f04f02c..601a2cfe8606c 100755
--- a/ports/mimxrt/boards/TEENSY41/mpconfigboard.mk
+++ b/ports/mimxrt/boards/TEENSY41/mpconfigboard.mk
@@ -3,8 +3,8 @@ MCU_VARIANT = MIMXRT1062DVJ6A
 
 MICROPY_FLOAT_IMPL = double
 MICROPY_PY_MACHINE_SDCARD = 1
-MICROPY_HW_FLASH_TYPE ?= qspi_nor_flash
-MICROPY_HW_FLASH_SIZE ?= 0x800000  # 8MB
+MICROPY_HW_FLASH_TYPE = qspi_nor_flash
+MICROPY_HW_FLASH_SIZE = 0x800000  # 8MB
 MICROPY_HW_FLASH_RESERVED ?= 0x1000  # 4KB
 
 MICROPY_PY_LWIP = 1

From 3ce21945b1e80ed754b4278efb8dccacdfe9cfa5 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Fri, 24 Jun 2022 13:02:44 +1000
Subject: [PATCH 2256/3533] docs/library/bluetooth: Add link to aioble.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 docs/library/bluetooth.rst | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docs/library/bluetooth.rst b/docs/library/bluetooth.rst
index 7663199e916af..052f7a5c78039 100644
--- a/docs/library/bluetooth.rst
+++ b/docs/library/bluetooth.rst
@@ -13,6 +13,9 @@ concurrently. Pairing (and bonding) is supported on some ports.
 This API is intended to match the low-level Bluetooth protocol and provide
 building-blocks for higher-level abstractions such as specific device types.
 
+.. note:: For most applications, we recommend using the higher-level
+          `aioble library <https://github.com/micropython/micropython-lib/tree/master/micropython/bluetooth/aioble>`_.
+
 .. note:: This module is still under development and its classes, functions,
           methods and constants are subject to change.
 

From 432b65f17849fdc94a96df4fd7db490257bd0a2c Mon Sep 17 00:00:00 2001
From: Koen De Vleeschauwer <kdv@kdvelectronics.eu>
Date: Thu, 15 Oct 2020 12:51:52 +0200
Subject: [PATCH 2257/3533] stm32/usb: Expose USB HID device instance via
 usbd_hid_get().

This is needed to implement a HID device in user C modules.
---
 ports/stm32/usb.c                | 18 ++++++++++++++++++
 ports/stm32/usbd_hid_interface.h |  2 ++
 2 files changed, 20 insertions(+)

diff --git a/ports/stm32/usb.c b/ports/stm32/usb.c
index 9a9600f89d6c8..cf9faed11286e 100644
--- a/ports/stm32/usb.c
+++ b/ports/stm32/usb.c
@@ -367,6 +367,24 @@ usbd_cdc_itf_t *usb_vcp_get(int idx) {
     return &usb_device.usbd_cdc_itf[idx];
 }
 
+#if MICROPY_HW_USB_HID
+
+// return hid interface if hid is configured, NULL otherwise
+usbd_hid_itf_t *usbd_hid_get(void) {
+    #if defined(USE_HOST_MODE)
+    return NULL;
+    #else
+    uint8_t usb_mode = USBD_GetMode(&usb_device.usbd_cdc_msc_hid_state) & USBD_MODE_IFACE_MASK;
+    if (usb_mode == USBD_MODE_HID || usb_mode == USBD_MODE_CDC_HID || usb_mode == USBD_MODE_MSC_HID) {
+        return &usb_device.usbd_hid_itf;
+    } else {
+        return NULL;
+    }
+    #endif
+}
+
+#endif
+
 /******************************************************************************/
 // MicroPython bindings for USB
 
diff --git a/ports/stm32/usbd_hid_interface.h b/ports/stm32/usbd_hid_interface.h
index 5d2c9ad870f15..b97d273f15283 100644
--- a/ports/stm32/usbd_hid_interface.h
+++ b/ports/stm32/usbd_hid_interface.h
@@ -16,6 +16,8 @@ typedef struct _usbd_hid_itf_t {
     uint8_t report_in_buf[HID_DATA_FS_MAX_PACKET_SIZE];
 } usbd_hid_itf_t;
 
+usbd_hid_itf_t *usbd_hid_get(void);
+
 static inline int usbd_hid_rx_num(usbd_hid_itf_t *hid) {
     return hid->report_in_len != USBD_HID_REPORT_INVALID;
 }

From d68532558d0f60737ccd5a38ae33f719333520a4 Mon Sep 17 00:00:00 2001
From: Michael Bentley <mikebentley15@gmail.com>
Date: Sun, 3 Oct 2021 00:05:27 -0600
Subject: [PATCH 2258/3533] py/objclosure: Forward function attributes for
 closures.

Add .attr attribute which forwards to self->fun.

A closure is intended to wrap around a function object, so forward any
requested attributes to the wrapped function object.

Signed-off-by: Michael Bentley <mikebentley15@gmail.com>
---
 py/objclosure.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/py/objclosure.c b/py/objclosure.c
index 9dc3e545321a3..5b9923a44bc77 100644
--- a/py/objclosure.c
+++ b/py/objclosure.c
@@ -78,6 +78,14 @@ STATIC void closure_print(const mp_print_t *print, mp_obj_t o_in, mp_print_kind_
 }
 #endif
 
+#if MICROPY_PY_FUNCTION_ATTRS
+STATIC void mp_obj_closure_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
+    // forward to self_in->fun
+    mp_obj_closure_t *o = MP_OBJ_TO_PTR(self_in);
+    mp_load_method_maybe(o->fun, attr, dest);
+}
+#endif
+
 const mp_obj_type_t mp_type_closure = {
     { &mp_type_type },
     .flags = MP_TYPE_FLAG_BINDS_SELF,
@@ -86,6 +94,9 @@ const mp_obj_type_t mp_type_closure = {
     .print = closure_print,
     #endif
     .call = closure_call,
+    #if MICROPY_PY_FUNCTION_ATTRS
+    .attr = mp_obj_closure_attr,
+    #endif
 };
 
 mp_obj_t mp_obj_new_closure(mp_obj_t fun, size_t n_closed_over, const mp_obj_t *closed) {

From 268ec1e3eb818c92f2ad0015902afef4c4c59ba5 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 24 Jun 2022 23:34:15 +1000
Subject: [PATCH 2259/3533] tests/basics: Add tests for __name__ and
 __globals__ attrs on closures.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/basics/fun_globals.py | 15 +++++++++++++++
 tests/basics/fun_name.py    |  2 ++
 2 files changed, 17 insertions(+)

diff --git a/tests/basics/fun_globals.py b/tests/basics/fun_globals.py
index 3f32e8bdb05b5..69f8638e8d876 100644
--- a/tests/basics/fun_globals.py
+++ b/tests/basics/fun_globals.py
@@ -19,3 +19,18 @@ def foo():
     foo.__globals__ = None
 except AttributeError:
     print("AttributeError")
+
+# test closures have the __globals__ attribute
+
+
+def outer():
+    x = 1
+
+    def inner():
+        return x
+
+    return inner
+
+
+print(outer.__globals__ is globals())
+print(outer().__globals__ is globals())
diff --git a/tests/basics/fun_name.py b/tests/basics/fun_name.py
index bb1f14992f70f..b2642280a2a65 100644
--- a/tests/basics/fun_name.py
+++ b/tests/basics/fun_name.py
@@ -24,9 +24,11 @@ def Fun(self):
     pass
 
 # name of a function that has closed over variables
+# and also the name of the inner closure
 def outer():
     x = 1
     def inner():
         return x
     return inner
 print(outer.__name__)
+print(outer().__name__)

From e22b7fb4afbf62a9ca3162539c2d0236aefd8945 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sat, 25 Jun 2022 00:05:39 +1000
Subject: [PATCH 2260/3533] py/objfun: Support function attributes on native
 functions.

Native functions can just reuse the bytecode function attribute code.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/objfun.c                               |  6 ++++++
 tests/micropython/native_fun_attrs.py     | 25 +++++++++++++++++++++++
 tests/micropython/native_fun_attrs.py.exp |  4 ++++
 tests/run-tests.py                        |  1 +
 4 files changed, 36 insertions(+)
 create mode 100644 tests/micropython/native_fun_attrs.py
 create mode 100644 tests/micropython/native_fun_attrs.py.exp

diff --git a/py/objfun.c b/py/objfun.c
index 8f0c3eb6d4d34..37c1eaa549064 100644
--- a/py/objfun.c
+++ b/py/objfun.c
@@ -421,8 +421,14 @@ STATIC const mp_obj_type_t mp_type_fun_native = {
     { &mp_type_type },
     .flags = MP_TYPE_FLAG_BINDS_SELF,
     .name = MP_QSTR_function,
+    #if MICROPY_CPYTHON_COMPAT
+    .print = fun_bc_print,
+    #endif
     .call = fun_native_call,
     .unary_op = mp_generic_unary_op,
+    #if MICROPY_PY_FUNCTION_ATTRS
+    .attr = mp_obj_fun_bc_attr,
+    #endif
 };
 
 mp_obj_t mp_obj_new_fun_native(const mp_obj_t *def_args, const void *fun_data, const mp_module_context_t *mc, struct _mp_raw_code_t *const *child_table) {
diff --git a/tests/micropython/native_fun_attrs.py b/tests/micropython/native_fun_attrs.py
new file mode 100644
index 0000000000000..e61c869755403
--- /dev/null
+++ b/tests/micropython/native_fun_attrs.py
@@ -0,0 +1,25 @@
+# test native function attributes
+
+
+def f():
+    pass
+
+
+if not hasattr(f, "__name__"):
+    print("SKIP")
+    raise SystemExit
+
+
+@micropython.native
+def native_f():
+    pass
+
+
+print(type(native_f.__name__))
+print(type(native_f.__globals__))
+print(native_f.__globals__ is globals())
+
+try:
+    native_f.__name__ = None
+except AttributeError:
+    print("AttributeError")
diff --git a/tests/micropython/native_fun_attrs.py.exp b/tests/micropython/native_fun_attrs.py.exp
new file mode 100644
index 0000000000000..8be35e2f697e2
--- /dev/null
+++ b/tests/micropython/native_fun_attrs.py.exp
@@ -0,0 +1,4 @@
+<class 'str'>
+<class 'dict'>
+True
+AttributeError
diff --git a/tests/run-tests.py b/tests/run-tests.py
index 7377e8ae2c8b0..2d6dbaaf1cd84 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -603,6 +603,7 @@ def run_tests(pyb, tests, args, result_dir, num_threads=1):
         skip_tests.add("basics/del_deref.py")  # requires checking for unbound local
         skip_tests.add("basics/del_local.py")  # requires checking for unbound local
         skip_tests.add("basics/exception_chain.py")  # raise from is not supported
+        skip_tests.add("basics/fun_name.py")  # requires proper names for native functions
         skip_tests.add("basics/scope_implicit.py")  # requires checking for unbound local
         skip_tests.add("basics/sys_tracebacklimit.py")  # requires traceback info
         skip_tests.add("basics/try_finally_return2.py")  # requires raise_varargs

From 5b66d086090e16134e58db62160257d7ca109be4 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 27 Jun 2022 10:37:28 +1000
Subject: [PATCH 2261/3533] py/builtin: Remove unnecessary module declarations.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/builtin.h | 35 +++--------------------------------
 1 file changed, 3 insertions(+), 32 deletions(-)

diff --git a/py/builtin.h b/py/builtin.h
index a6f824ca20f30..fb11627841227 100644
--- a/py/builtin.h
+++ b/py/builtin.h
@@ -120,45 +120,16 @@ MP_DECLARE_CONST_FUN_OBJ_2(mp_op_getitem_obj);
 MP_DECLARE_CONST_FUN_OBJ_3(mp_op_setitem_obj);
 MP_DECLARE_CONST_FUN_OBJ_2(mp_op_delitem_obj);
 
+// Modules needed by the runtime.
+extern const mp_obj_dict_t mp_module_builtins_globals;
 extern const mp_obj_module_t mp_module___main__;
 extern const mp_obj_module_t mp_module_builtins;
-extern const mp_obj_module_t mp_module_uarray;
-extern const mp_obj_module_t mp_module_collections;
-extern const mp_obj_module_t mp_module_io;
-extern const mp_obj_module_t mp_module_math;
-extern const mp_obj_module_t mp_module_cmath;
-extern const mp_obj_module_t mp_module_micropython;
-extern const mp_obj_module_t mp_module_ustruct;
 extern const mp_obj_module_t mp_module_sys;
-extern const mp_obj_module_t mp_module_gc;
-extern const mp_obj_module_t mp_module_thread;
-
-extern const mp_obj_dict_t mp_module_builtins_globals;
 
-// extmod modules
-extern const mp_obj_module_t mp_module_uasyncio;
+// Modules needed by the parser when MICROPY_COMP_MODULE_CONST is enabled.
 extern const mp_obj_module_t mp_module_uerrno;
 extern const mp_obj_module_t mp_module_uctypes;
-extern const mp_obj_module_t mp_module_uzlib;
-extern const mp_obj_module_t mp_module_ujson;
-extern const mp_obj_module_t mp_module_uos;
-extern const mp_obj_module_t mp_module_ure;
-extern const mp_obj_module_t mp_module_uheapq;
-extern const mp_obj_module_t mp_module_uhashlib;
-extern const mp_obj_module_t mp_module_ucryptolib;
-extern const mp_obj_module_t mp_module_ubinascii;
-extern const mp_obj_module_t mp_module_urandom;
-extern const mp_obj_module_t mp_module_uselect;
-extern const mp_obj_module_t mp_module_ussl;
-extern const mp_obj_module_t mp_module_utimeq;
 extern const mp_obj_module_t mp_module_machine;
-extern const mp_obj_module_t mp_module_lwip;
-extern const mp_obj_module_t mp_module_uwebsocket;
-extern const mp_obj_module_t mp_module_webrepl;
-extern const mp_obj_module_t mp_module_framebuf;
-extern const mp_obj_module_t mp_module_btree;
-extern const mp_obj_module_t mp_module_ubluetooth;
-extern const mp_obj_module_t mp_module_uplatform;
 
 extern const char MICROPY_PY_BUILTINS_HELP_TEXT[];
 

From 2c015375d1e795b4c1a996e50b27234e07f3f638 Mon Sep 17 00:00:00 2001
From: Angus Gratton <gus@projectgus.com>
Date: Tue, 7 Jun 2022 17:44:21 +1000
Subject: [PATCH 2262/3533] stm32: Use a separate symbol name for the
 bootloader state pointer.

Prerequisite for enabling Link Time Optimisation.

The _bl_state address is the same as _estack, but _estack is referred to as
a uint32_t elsewhere in the code. LTO doesn't like it when the same symbol
has two different types.

Signed-off-by: Angus Gratton <gus@projectgus.com>
---
 ports/stm32/boards/common_bss_heap_stack.ld | 4 ++++
 ports/stm32/powerctrl.c                     | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/ports/stm32/boards/common_bss_heap_stack.ld b/ports/stm32/boards/common_bss_heap_stack.ld
index 1bb2249e96c9b..b079313c444b9 100644
--- a/ports/stm32/boards/common_bss_heap_stack.ld
+++ b/ports/stm32/boards/common_bss_heap_stack.ld
@@ -26,3 +26,7 @@
     . = . + _minimum_stack_size;
     . = ALIGN(4);
 } >RAM
+
+/* _bl_state symbol is used by MICROPY_HW_ENTER_BOOTLOADER_VIA_RESET, this is
+   the end of stack address but is accessed as a different type. */
+_bl_state = _estack;
diff --git a/ports/stm32/powerctrl.c b/ports/stm32/powerctrl.c
index 3b4a2d86e1e1e..f3f1837ece651 100644
--- a/ports/stm32/powerctrl.c
+++ b/ports/stm32/powerctrl.c
@@ -78,7 +78,7 @@
 // Location in RAM of bootloader state (just after the top of the stack).
 // STM32H7 has ECC and writes to RAM must be 64-bit so they are fully committed
 // to actual SRAM before a system reset occurs.
-#define BL_STATE_PTR                ((uint64_t *)&_estack)
+#define BL_STATE_PTR                ((uint64_t *)&_bl_state)
 #define BL_STATE_KEY                (0x5a5)
 #define BL_STATE_KEY_MASK           (0xfff)
 #define BL_STATE_KEY_SHIFT          (32)
@@ -87,7 +87,7 @@
 #define BL_STATE_GET_REG(s)         ((s) & 0xffffffff)
 #define BL_STATE_GET_KEY(s)         (((s) >> BL_STATE_KEY_SHIFT) & BL_STATE_KEY_MASK)
 #define BL_STATE_GET_ADDR(s)        (((s) >> BL_STATE_KEY_SHIFT) & ~BL_STATE_KEY_MASK)
-extern uint64_t _estack[];
+extern uint64_t _bl_state[];
 #endif
 
 static inline void powerctrl_disable_hsi_if_unused(void) {

From e76d88b531ec42a75833800d04962e0dc660cef0 Mon Sep 17 00:00:00 2001
From: Angus Gratton <gus@projectgus.com>
Date: Tue, 7 Jun 2022 17:34:40 +1000
Subject: [PATCH 2263/3533] stm32/Makefile: Enable link-time-optimisation via
 LTO=1 make option.

When tested, this reduces default MP binary sizes by approx 2-2.5%, and
very marginally increases performance in benchmarks. Build times seem very
similar to non-LTO when using gcc 12.

See #8733 for further discussion.

Signed-off-by: Angus Gratton <gus@projectgus.com>
---
 ports/stm32/Makefile | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/ports/stm32/Makefile b/ports/stm32/Makefile
index 5cde84e67c38e..53d1bb4ac47d6 100644
--- a/ports/stm32/Makefile
+++ b/ports/stm32/Makefile
@@ -96,13 +96,22 @@ CFLAGS += -fsingle-precision-constant
 endif
 endif
 
-LDFLAGS = -nostdlib -L $(LD_DIR) $(addprefix -T,$(LD_FILES)) -Map=$(@:.elf=.map) --cref
-LDFLAGS += --defsym=_estack_reserve=8
+LDFLAGS = -nostdlib -L $(LD_DIR) $(addprefix -T,$(LD_FILES)) -Wl,-Map=$(@:.elf=.map) -Wl,--cref
+LDFLAGS += -Wl,--defsym=_estack_reserve=8
 LIBS += "$(shell $(CC) $(CFLAGS) -print-libgcc-file-name)"
 
 # Remove uncalled code from the final image.
 CFLAGS += -fdata-sections -ffunction-sections
-LDFLAGS += --gc-sections
+LDFLAGS += -Wl,--gc-sections
+
+ifeq ($(LTO),1)
+CFLAGS += -flto=auto
+# LTO requires passing compiler flags to the linker as it will run the assembler.
+# To avoid risk of missing something relevant, pass all flags except for preprocessor args
+LDFLAGS += $(filter-out -I%,$(filter-out -D%,$(CFLAGS)))
+
+$(BUILD)/stm32_it.o $(BUILD)/pendsv.o: CFLAGS += -fno-lto
+endif
 
 # Debugging/Optimization
 ifeq ($(DEBUG), 1)
@@ -592,7 +601,7 @@ endef
 
 define GENERATE_ELF
 	$(ECHO) "LINK $(1)"
-	$(Q)$(LD) $(LDFLAGS) -o $(1) $(2) $(LDFLAGS_MOD) $(LIBS)
+	$(Q)$(CC) $(LDFLAGS) -o $(1) $(2) $(LDFLAGS_MOD) $(LIBS)
 	$(Q)$(SIZE) $(1)
 	$(if $(filter-out $(TEXT0_ADDR),0x08000000), \
 		$(ECHO) "INFO: this build requires mboot to be installed first")

From 5568c324bad71018a9480a22e1e4d60f5ea8c6d5 Mon Sep 17 00:00:00 2001
From: Angus Gratton <gus@projectgus.com>
Date: Tue, 7 Jun 2022 17:46:08 +1000
Subject: [PATCH 2264/3533] tests/perf_bench: Add some configurations for N=32,
 M=10.

For STM32L072 and similar, very low end targets.

The other perf_bench tests run out of memory, crash, or fail on
prerequisite features.

Signed-off-by: Angus Gratton <gus@projectgus.com>
---
 tests/perf_bench/bm_fannkuch.py           | 1 +
 tests/perf_bench/bm_nqueens.py            | 2 +-
 tests/perf_bench/bm_pidigits.py           | 1 +
 tests/perf_bench/core_import_mpy_multi.py | 2 +-
 tests/perf_bench/core_qstr.py             | 2 +-
 tests/run-perfbench.py                    | 4 +++-
 6 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/tests/perf_bench/bm_fannkuch.py b/tests/perf_bench/bm_fannkuch.py
index 9f7ae797f0bc1..49ab05d1e924d 100644
--- a/tests/perf_bench/bm_fannkuch.py
+++ b/tests/perf_bench/bm_fannkuch.py
@@ -51,6 +51,7 @@ def fannkuch(n):
 # Benchmark interface
 
 bm_params = {
+    (32, 10): (3,),
     (50, 10): (5,),
     (100, 10): (6,),
     (500, 10): (7,),
diff --git a/tests/perf_bench/bm_nqueens.py b/tests/perf_bench/bm_nqueens.py
index 773dd3f7edd8f..c5a91bf30494d 100644
--- a/tests/perf_bench/bm_nqueens.py
+++ b/tests/perf_bench/bm_nqueens.py
@@ -46,7 +46,7 @@ def n_queens(queen_count):
 # Benchmark interface
 
 bm_params = {
-    (50, 25): (1, 5),
+    (32, 10): (1, 5),
     (100, 25): (1, 6),
     (1000, 100): (1, 7),
     (5000, 100): (1, 8),
diff --git a/tests/perf_bench/bm_pidigits.py b/tests/perf_bench/bm_pidigits.py
index 5949b930633f9..bdaa73cec7e9f 100644
--- a/tests/perf_bench/bm_pidigits.py
+++ b/tests/perf_bench/bm_pidigits.py
@@ -36,6 +36,7 @@ def gen_pi_digits(n):
 # Benchmark interface
 
 bm_params = {
+    (32, 10): (1, 20),
     (50, 25): (1, 35),
     (100, 100): (1, 65),
     (1000, 1000): (2, 250),
diff --git a/tests/perf_bench/core_import_mpy_multi.py b/tests/perf_bench/core_import_mpy_multi.py
index 682c36328a095..99c4721d29d68 100644
--- a/tests/perf_bench/core_import_mpy_multi.py
+++ b/tests/perf_bench/core_import_mpy_multi.py
@@ -73,7 +73,7 @@ def test(r):
 # Benchmark interface
 
 bm_params = {
-    (100, 10): (50,),
+    (32, 10): (50,),
     (1000, 10): (500,),
     (5000, 10): (5000,),
 }
diff --git a/tests/perf_bench/core_qstr.py b/tests/perf_bench/core_qstr.py
index b87e2c065855a..64d6c59e926fe 100644
--- a/tests/perf_bench/core_qstr.py
+++ b/tests/perf_bench/core_qstr.py
@@ -10,7 +10,7 @@ def test(r):
 # Benchmark interface
 
 bm_params = {
-    (100, 10): (400,),
+    (32, 10): (400,),
     (1000, 10): (4000,),
     (5000, 10): (40000,),
 }
diff --git a/tests/run-perfbench.py b/tests/run-perfbench.py
index a2e9e8079ad59..f76aa511ad971 100755
--- a/tests/run-perfbench.py
+++ b/tests/run-perfbench.py
@@ -260,7 +260,9 @@ def main():
     )
     cmd_parser.add_argument("--via-mpy", action="store_true", help="compile code to .mpy first")
     cmd_parser.add_argument("--mpy-cross-flags", default="", help="flags to pass to mpy-cross")
-    cmd_parser.add_argument("N", nargs=1, help="N parameter (approximate target CPU frequency)")
+    cmd_parser.add_argument(
+        "N", nargs=1, help="N parameter (approximate target CPU frequency in MHz)"
+    )
     cmd_parser.add_argument("M", nargs=1, help="M parameter (approximate target heap in kbytes)")
     cmd_parser.add_argument("files", nargs="*", help="input test files")
     args = cmd_parser.parse_args()

From dd77dbd4f72734da2b11ff52c553d636d1eee614 Mon Sep 17 00:00:00 2001
From: Angus Gratton <gus@projectgus.com>
Date: Fri, 24 Jun 2022 12:04:47 +1000
Subject: [PATCH 2265/3533] stm32/boards: Enable LTO by default on boards with
 smaller flash size.

Signed-off-by: Angus Gratton <gus@projectgus.com>
---
 ports/stm32/README.md                           | 17 +++++++++++++++++
 .../boards/B_L072Z_LRWAN1/mpconfigboard.mk      |  3 +++
 .../stm32/boards/NUCLEO_F091RC/mpconfigboard.mk |  3 +++
 .../stm32/boards/NUCLEO_G0B1RE/mpconfigboard.mk |  3 +++
 .../stm32/boards/NUCLEO_L073RZ/mpconfigboard.mk |  3 +++
 .../stm32/boards/NUCLEO_L432KC/mpconfigboard.mk |  3 +++
 6 files changed, 32 insertions(+)

diff --git a/ports/stm32/README.md b/ports/stm32/README.md
index 6b5f096d73a50..15025c5ae15cc 100644
--- a/ports/stm32/README.md
+++ b/ports/stm32/README.md
@@ -68,6 +68,23 @@ can be built via:
 
 For more information about mboot see mboot/README.md.
 
+### Link Time Optimization
+
+Link Time Optimization (LTO) reduces the firmware binary size when enabled
+(typically 2-3% smaller). However it may make build time longer, particularly on
+older GCC versions.
+
+Currently LTO is enabled by default for some smaller STM32 boards with less
+flash, but disabled on other boards.
+
+To enable LTO, pass `LTO=1` on the command line:
+
+    $ make BOARD=boardname LTO=1
+
+To disable LTO, pass `LTO=0` in the same way.
+
+Note that `make clean BOARD=boardname` will be needed before changing the `LTO`
+setting of a firmware that is already built.
 
 ### Flashing the Firmware using DFU mode
 
diff --git a/ports/stm32/boards/B_L072Z_LRWAN1/mpconfigboard.mk b/ports/stm32/boards/B_L072Z_LRWAN1/mpconfigboard.mk
index 03561f90ade3b..708c3cf1336ca 100644
--- a/ports/stm32/boards/B_L072Z_LRWAN1/mpconfigboard.mk
+++ b/ports/stm32/boards/B_L072Z_LRWAN1/mpconfigboard.mk
@@ -9,3 +9,6 @@ MICROPY_VFS_FAT = 0
 
 # Don't include default frozen modules because MCU is tight on flash space
 FROZEN_MANIFEST ?=
+
+# LTO reduces final binary size, may be slower to build depending on gcc version and hardware
+LTO ?= 1
diff --git a/ports/stm32/boards/NUCLEO_F091RC/mpconfigboard.mk b/ports/stm32/boards/NUCLEO_F091RC/mpconfigboard.mk
index 4416188816f4f..bb7142d1b3e20 100644
--- a/ports/stm32/boards/NUCLEO_F091RC/mpconfigboard.mk
+++ b/ports/stm32/boards/NUCLEO_F091RC/mpconfigboard.mk
@@ -9,3 +9,6 @@ MICROPY_VFS_LFS1 ?= 1
 
 # Don't include default frozen modules because MCU is tight on flash space
 FROZEN_MANIFEST ?=
+
+# LTO reduces final binary size, may be slower to build depending on gcc version and hardware
+LTO ?= 1
diff --git a/ports/stm32/boards/NUCLEO_G0B1RE/mpconfigboard.mk b/ports/stm32/boards/NUCLEO_G0B1RE/mpconfigboard.mk
index 371e10d154cbc..b8bbfb453439b 100644
--- a/ports/stm32/boards/NUCLEO_G0B1RE/mpconfigboard.mk
+++ b/ports/stm32/boards/NUCLEO_G0B1RE/mpconfigboard.mk
@@ -2,3 +2,6 @@ MCU_SERIES = g0
 CMSIS_MCU = STM32G0B1xx
 AF_FILE = boards/stm32g0b1_af.csv
 LD_FILES = boards/stm32g0b1xe.ld boards/common_basic.ld
+
+# LTO reduces final binary size, may be slower to build depending on gcc version and hardware
+LTO ?= 1
diff --git a/ports/stm32/boards/NUCLEO_L073RZ/mpconfigboard.mk b/ports/stm32/boards/NUCLEO_L073RZ/mpconfigboard.mk
index f3673f00601f0..72b13a70b215c 100644
--- a/ports/stm32/boards/NUCLEO_L073RZ/mpconfigboard.mk
+++ b/ports/stm32/boards/NUCLEO_L073RZ/mpconfigboard.mk
@@ -8,3 +8,6 @@ MICROPY_VFS_FAT = 0
 
 # Don't include default frozen modules because MCU is tight on flash space
 FROZEN_MANIFEST ?=
+
+# LTO reduces final binary size, may be slower to build depending on gcc version and hardware
+LTO ?= 1
diff --git a/ports/stm32/boards/NUCLEO_L432KC/mpconfigboard.mk b/ports/stm32/boards/NUCLEO_L432KC/mpconfigboard.mk
index a87b4710e74ac..c3fff81002517 100644
--- a/ports/stm32/boards/NUCLEO_L432KC/mpconfigboard.mk
+++ b/ports/stm32/boards/NUCLEO_L432KC/mpconfigboard.mk
@@ -10,3 +10,6 @@ MICROPY_VFS_LFS1 ?= 1
 
 # Don't include default frozen modules because MCU is tight on flash space
 FROZEN_MANIFEST ?=
+
+# LTO reduces final binary size, may be slower to build depending on gcc version and hardware
+LTO ?= 1

From ccaf1978072a1d8e63b5e2ee350f15d875dfc1fd Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 28 Jun 2022 13:15:10 +1000
Subject: [PATCH 2266/3533] esp32/network_wlan: Don't raise exception when scan
 returns no results.

Prior to this commit, running scan() without any APs available would give:

    >>> wl.scan()
    Traceback (most recent call last):
      File "<stdin>", line 1, in <module>
    RuntimeError: Wifi Unknown Error 0x0102

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/network_wlan.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/ports/esp32/network_wlan.c b/ports/esp32/network_wlan.c
index 91099419eccf7..48b398c8f023d 100644
--- a/ports/esp32/network_wlan.c
+++ b/ports/esp32/network_wlan.c
@@ -345,6 +345,12 @@ STATIC mp_obj_t network_wlan_scan(mp_obj_t self_in) {
     if (status == 0) {
         uint16_t count = 0;
         esp_exceptions(esp_wifi_scan_get_ap_num(&count));
+        if (count == 0) {
+            // esp_wifi_scan_get_ap_records must be called to free internal buffers from the scan.
+            // But it returns an error if wifi_ap_records==NULL.  So allocate at least 1 AP entry.
+            // esp_wifi_scan_get_ap_records will then return the actual number of APs in count.
+            count = 1;
+        }
         wifi_ap_record_t *wifi_ap_records = calloc(count, sizeof(wifi_ap_record_t));
         esp_exceptions(esp_wifi_scan_get_ap_records(&count, wifi_ap_records));
         for (uint16_t i = 0; i < count; i++) {

From ad308bc32285f27725299aa329ca0d00cb3805e7 Mon Sep 17 00:00:00 2001
From: Angus Gratton <gus@projectgus.com>
Date: Fri, 24 Jun 2022 13:23:10 +1000
Subject: [PATCH 2267/3533] tests: Add an explanation of run-perfbench.py.

Also changes this file to a Markdown file.

Signed-off-by: Angus Gratton <gus@projectgus.com>
---
 tests/README    |  27 ---------
 tests/README.md | 149 ++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 149 insertions(+), 27 deletions(-)
 delete mode 100644 tests/README
 create mode 100644 tests/README.md

diff --git a/tests/README b/tests/README
deleted file mode 100644
index 8794202e15fde..0000000000000
--- a/tests/README
+++ /dev/null
@@ -1,27 +0,0 @@
-This directory contains tests for various functionality areas of MicroPython.
-To run all stable tests, run "run-tests.py" script in this directory.
-
-Tests of capabilities not supported on all platforms should be written
-to check for the capability being present. If it is not, the test
-should merely output 'SKIP' followed by the line terminator, and call
-sys.exit() to raise SystemExit, instead of attempting to test the
-missing capability. The testing framework (run-tests.py in this
-directory, test_main.c in qemu_arm) recognizes this as a skipped test.
-
-There are a few features for which this mechanism cannot be used to
-condition a test. The run-tests.py script uses small scripts in the
-feature_check directory to check whether each such feature is present,
-and skips the relevant tests if not.
-
-Tests are generally verified by running the test both in MicroPython and
-in CPython and comparing the outputs. If the output differs the test fails
-and the outputs are saved in a .out and a .exp file respectively.
-For tests that cannot be run in CPython, for example because they use
-the machine module, a .exp file can be provided next to the test's .py
-file. A convenient way to generate that is to run the test, let it fail
-(because CPython cannot run it) and then copy the .out file (but not
-before checking it manually!)
-
-When creating new tests, anything that relies on float support should go in the
-float/ subdirectory.  Anything that relies on import x, where x is not a built-in
-module, should go in the import/ subdirectory.
diff --git a/tests/README.md b/tests/README.md
new file mode 100644
index 0000000000000..b0bff4872edf3
--- /dev/null
+++ b/tests/README.md
@@ -0,0 +1,149 @@
+# MicroPython Test Suite
+
+This directory contains tests for various functionality areas of MicroPython.
+To run all stable tests, run "run-tests.py" script in this directory.
+
+Tests of capabilities not supported on all platforms should be written
+to check for the capability being present. If it is not, the test
+should merely output 'SKIP' followed by the line terminator, and call
+sys.exit() to raise SystemExit, instead of attempting to test the
+missing capability. The testing framework (run-tests.py in this
+directory, test_main.c in qemu_arm) recognizes this as a skipped test.
+
+There are a few features for which this mechanism cannot be used to
+condition a test. The run-tests.py script uses small scripts in the
+feature_check directory to check whether each such feature is present,
+and skips the relevant tests if not.
+
+Tests are generally verified by running the test both in MicroPython and
+in CPython and comparing the outputs. If the output differs the test fails
+and the outputs are saved in a .out and a .exp file respectively.
+For tests that cannot be run in CPython, for example because they use
+the machine module, a .exp file can be provided next to the test's .py
+file. A convenient way to generate that is to run the test, let it fail
+(because CPython cannot run it) and then copy the .out file (but not
+before checking it manually!)
+
+When creating new tests, anything that relies on float support should go in the
+float/ subdirectory.  Anything that relies on import x, where x is not a built-in
+module, should go in the import/ subdirectory.
+
+## perf_bench
+
+The `perf_bench` directory contains some performance benchmarks that can be used
+to benchmark different MicroPython firmwares or host ports.
+
+The runner utility is `run-perfbench,py`. Execute `./run-perfbench.py --help`
+for a full list of command line options.
+
+### Benchmarking a target
+
+To run tests on a firmware target using `pyboard.py`, run the command line like
+this:
+
+```
+./run-perfbench.py -p -d /dev/ttyACM0 168 100
+```
+
+* `-p` indicates running on a remote target via pyboard.py, not the host.
+* `-d PORTNAME` is the serial port, `/dev/ttyACM0` is the default if not
+  provided.
+* `168` is value `N`, the approximate CPU frequency in MHz (in this case Pyboard
+  V1.1 is 168MHz). It's possible to choose other values as well: lower values
+  like `10` will run much the tests much quicker, higher values like `1000` will
+  run much longer.
+* `100` is value `M`, the approximate heap size in kilobytes (can get this from
+  `import micropython; micropython.mem_info()` or estimate it). It's possible to
+  choose other values here too: lower values like `10` will run shorter/smaller
+  tests, and higher values will run bigger tests. The maximum value of `M` is
+  limited by available heap, and the tests are written so the "recommended"
+  value is approximately the upper limit.
+
+### Benchmarking the host
+
+To benchmark the host build (unix/Windows), run like this:
+
+```
+./run-perfbench.py 2000 10000
+```
+
+The output of perfbench is a list of tests and times/scores, like this:
+
+```
+N=2000 M=10000 n_average=8
+perf_bench/bm_chaos.py: SKIP
+perf_bench/bm_fannkuch.py: 94550.38 2.9145 84.68 2.8499
+perf_bench/bm_fft.py: 79920.38 10.0771 129269.74 8.8205
+perf_bench/bm_float.py: 43844.62 17.8229 353219.64 17.7693
+perf_bench/bm_hexiom.py: 32959.12 15.0243 775.77 14.8893
+perf_bench/bm_nqueens.py: 40855.00 10.7297 247776.15 11.3647
+perf_bench/bm_pidigits.py: 64547.75 2.5609 7751.36 2.5996
+perf_bench/core_import_mpy_multi.py: 15433.38 14.2733 33065.45 14.2368
+perf_bench/core_import_mpy_single.py: 263.00 11.3910 3858.35 12.9021
+perf_bench/core_qstr.py: 4929.12 1.8434 8117.71 1.7921
+perf_bench/core_yield_from.py: 16274.25 6.2584 12334.13 5.8125
+perf_bench/misc_aes.py: 57425.25 5.5226 17888.60 5.7482
+perf_bench/misc_mandel.py: 40809.25 8.2007 158107.00 9.8864
+perf_bench/misc_pystone.py: 39821.75 6.4145 100867.62 6.5043
+perf_bench/misc_raytrace.py: 36293.75 6.8501 26906.93 6.8402
+perf_bench/viper_call0.py: 15573.00 14.9931 19644.99 13.1550
+perf_bench/viper_call1a.py: 16725.75 9.8205 18099.96 9.2752
+perf_bench/viper_call1b.py: 20752.62 8.3372 14565.60 9.0663
+perf_bench/viper_call1c.py: 20849.88 5.8783 14444.80 6.6295
+perf_bench/viper_call2a.py: 16156.25 11.2956 18818.59 11.7959
+perf_bench/viper_call2b.py: 22047.38 8.9484 13725.73 9.6800
+```
+
+The numbers across each line are times and scores for the test:
+
+* Runtime average (microseconds, lower is better)
+* Runtime standard deviation as a percentage
+* Score average (units depend on the benchmark, higher is better)
+* Score standard deviation as a percentage
+
+### Comparing performance
+
+Usually you want to know if something is faster or slower than a reference. To
+do this, copy the output of each `run-perfbench.py` run to a text file.
+
+This can be done multiple ways, but one way on Linux/macOS is with the `tee`
+utility: `./run-perfbench.py -p 168 100 | tee pyb-run1.txt`
+
+Once you have two files with output from two different runs (maybe with
+different code or configuration), compare the runtimes with `./run-perfbench.py
+-t pybv-run1.txt pybv-run2.txt` or compare scores with `./run-perfbench.py -s
+pybv-run1.txt pybv-run2.txt`:
+
+```
+> ./run-perfbench.py -s pyb-run1.txt pyb-run2.txt
+diff of scores (higher is better)
+N=168 M=100                pyb-run1.txt -> pyb-run2.txt         diff      diff% (error%)
+bm_chaos.py                    352.90 ->     352.63 :      -0.27 =  -0.077% (+/-0.00%)
+bm_fannkuch.py                  77.52 ->      77.45 :      -0.07 =  -0.090% (+/-0.01%)
+bm_fft.py                     2516.80 ->    2519.74 :      +2.94 =  +0.117% (+/-0.00%)
+bm_float.py                   5749.27 ->    5749.65 :      +0.38 =  +0.007% (+/-0.00%)
+bm_hexiom.py                    42.22 ->      42.30 :      +0.08 =  +0.189% (+/-0.00%)
+bm_nqueens.py                 4407.55 ->    4414.44 :      +6.89 =  +0.156% (+/-0.00%)
+bm_pidigits.py                 638.09 ->     632.14 :      -5.95 =  -0.932% (+/-0.25%)
+core_import_mpy_multi.py       477.74 ->     477.57 :      -0.17 =  -0.036% (+/-0.00%)
+core_import_mpy_single.py       58.74 ->      58.72 :      -0.02 =  -0.034% (+/-0.00%)
+core_qstr.py                    63.11 ->      63.11 :      +0.00 =  +0.000% (+/-0.01%)
+core_yield_from.py             357.57 ->     357.57 :      +0.00 =  +0.000% (+/-0.00%)
+misc_aes.py                    397.27 ->     396.47 :      -0.80 =  -0.201% (+/-0.00%)
+misc_mandel.py                3375.70 ->    3375.84 :      +0.14 =  +0.004% (+/-0.00%)
+misc_pystone.py               2265.36 ->    2265.97 :      +0.61 =  +0.027% (+/-0.01%)
+misc_raytrace.py               367.61 ->     368.15 :      +0.54 =  +0.147% (+/-0.01%)
+viper_call0.py                 605.92 ->     605.92 :      +0.00 =  +0.000% (+/-0.00%)
+viper_call1a.py                576.78 ->     576.78 :      +0.00 =  +0.000% (+/-0.00%)
+viper_call1b.py                452.45 ->     452.46 :      +0.01 =  +0.002% (+/-0.01%)
+viper_call1c.py                457.39 ->     457.39 :      +0.00 =  +0.000% (+/-0.00%)
+viper_call2a.py                561.37 ->     561.37 :      +0.00 =  +0.000% (+/-0.00%)
+viper_call2b.py                389.49 ->     389.50 :      +0.01 =  +0.003% (+/-0.01%)
+```
+
+Note in particular the error percentages at the end of each line. If these are
+high relative to the percentage difference then it indicates high variability in
+the test runs, and the absolute difference value is unreliable. High error
+percentages are particularly common on PC builds, where the host OS may
+influence test run times. Increasing the `N` value may help average this out by
+running each test longer.

From e024a4c59cb4af6a8d05104df161c61702c2ce4b Mon Sep 17 00:00:00 2001
From: Angus Gratton <gus@projectgus.com>
Date: Fri, 24 Jun 2022 13:27:25 +1000
Subject: [PATCH 2268/3533] tests: Fix run-perfbench parsing "no matching
 params" case.

Signed-off-by: Angus Gratton <gus@projectgus.com>
---
 tests/perf_bench/benchrun.py | 2 +-
 tests/run-perfbench.py       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/perf_bench/benchrun.py b/tests/perf_bench/benchrun.py
index 90c303dd29cb6..ed43297d15fdc 100644
--- a/tests/perf_bench/benchrun.py
+++ b/tests/perf_bench/benchrun.py
@@ -15,7 +15,7 @@ def bm_run(N, M):
             cur_nm = nm
             param = p
     if param is None:
-        print(-1, -1, "no matching params")
+        print(-1, -1, "SKIP: no matching params")
         return
 
     # Run and time benchmark
diff --git a/tests/run-perfbench.py b/tests/run-perfbench.py
index f76aa511ad971..d70b996937373 100755
--- a/tests/run-perfbench.py
+++ b/tests/run-perfbench.py
@@ -187,7 +187,7 @@ def parse_output(filename):
         m = int(m.split("=")[1])
         data = []
         for l in f:
-            if l.find(": ") != -1 and l.find(": SKIP") == -1 and l.find("CRASH: ") == -1:
+            if ": " in l and ": SKIP" not in l and "CRASH: " not in l:
                 name, values = l.strip().split(": ")
                 values = tuple(float(v) for v in values.split())
                 data.append((name,) + values)

From 6e83bb47ebeed8f8334925755bed5fea5b3f2475 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 28 Jun 2022 16:31:43 +1000
Subject: [PATCH 2269/3533] py/builtinhelp: Don't show help for an
 MP_MODULE_ATTR_DELEGATION_ENTRY.

Otherwise it can lead to a crash.

Fixes issue #8816.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/builtinhelp.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/py/builtinhelp.c b/py/builtinhelp.c
index 84d69caf35bed..94f8beaff23c8 100644
--- a/py/builtinhelp.c
+++ b/py/builtinhelp.c
@@ -149,8 +149,14 @@ STATIC void mp_help_print_obj(const mp_obj_t obj) {
     }
     if (map != NULL) {
         for (uint i = 0; i < map->alloc; i++) {
-            if (map->table[i].key != MP_OBJ_NULL) {
-                mp_help_print_info_about_object(map->table[i].key, map->table[i].value);
+            mp_obj_t key = map->table[i].key;
+            if (key != MP_OBJ_NULL
+                #if MICROPY_MODULE_ATTR_DELEGATION
+                // MP_MODULE_ATTR_DELEGATION_ENTRY entries have MP_QSTRnull as qstr key.
+                && key != MP_OBJ_NEW_QSTR(MP_QSTRnull)
+                #endif
+                ) {
+                mp_help_print_info_about_object(key, map->table[i].value);
             }
         }
     }

From fe55d3e0166b6c6ff189fb7a854847bad4fcd6b6 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 29 Jun 2022 12:08:12 +1000
Subject: [PATCH 2270/3533] unix/variants: Move setting of MICROPY_PY_USELECT
 to port config file.

The default is the same as before: MICROPY_PY_USELECT=0 and
MICROPY_PY_USELECT_POSIX=1.  But now this can be easily overridden at the
make command-line using, eg:

    make VARIANT=dev CFLAGS_EXTRA=-DMICROPY_PY_USELECT=1

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/unix/mpconfigport.h                      | 5 ++++-
 ports/unix/variants/coverage/mpconfigvariant.h | 1 -
 ports/unix/variants/dev/mpconfigvariant.h      | 1 -
 ports/unix/variants/standard/mpconfigvariant.h | 1 -
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ports/unix/mpconfigport.h b/ports/unix/mpconfigport.h
index a483c3e0860dd..232bfb857cc4a 100644
--- a/ports/unix/mpconfigport.h
+++ b/ports/unix/mpconfigport.h
@@ -179,8 +179,11 @@
 #define MICROPY_PY_UHASHLIB_SHA1    (1)
 #define MICROPY_PY_UCRYPTOLIB       (1)
 #endif
+#ifndef MICROPY_PY_USELECT
+#define MICROPY_PY_USELECT          (0)
+#endif
 #ifndef MICROPY_PY_USELECT_POSIX
-#define MICROPY_PY_USELECT_POSIX    (1)
+#define MICROPY_PY_USELECT_POSIX    (!MICROPY_PY_USELECT)
 #endif
 #define MICROPY_PY_UWEBSOCKET       (1)
 #define MICROPY_PY_MACHINE          (1)
diff --git a/ports/unix/variants/coverage/mpconfigvariant.h b/ports/unix/variants/coverage/mpconfigvariant.h
index bf68dcb63ae2e..47ed4bc46cbf3 100644
--- a/ports/unix/variants/coverage/mpconfigvariant.h
+++ b/ports/unix/variants/coverage/mpconfigvariant.h
@@ -33,7 +33,6 @@
 // Disable some features that come enabled by default with the feature level.
 #define MICROPY_PY_BUILTINS_EXECFILE            (0)
 #define MICROPY_PY_SYS_STDIO_BUFFER             (0)
-#define MICROPY_PY_USELECT                      (0)
 
 // Enable additional features.
 #define MICROPY_DEBUG_PARSE_RULE_NAME  (1)
diff --git a/ports/unix/variants/dev/mpconfigvariant.h b/ports/unix/variants/dev/mpconfigvariant.h
index 61092394cd738..06033942473d8 100644
--- a/ports/unix/variants/dev/mpconfigvariant.h
+++ b/ports/unix/variants/dev/mpconfigvariant.h
@@ -30,7 +30,6 @@
 // Disable some features that come enabled by default with the feature level.
 #define MICROPY_PY_BUILTINS_EXECFILE            (0)
 #define MICROPY_PY_SYS_STDIO_BUFFER             (0)
-#define MICROPY_PY_USELECT                      (0)
 
 // Enable some additional features.
 #define MICROPY_REPL_EMACS_WORDS_MOVE           (1)
diff --git a/ports/unix/variants/standard/mpconfigvariant.h b/ports/unix/variants/standard/mpconfigvariant.h
index 1ec46ef92d352..31618652e961b 100644
--- a/ports/unix/variants/standard/mpconfigvariant.h
+++ b/ports/unix/variants/standard/mpconfigvariant.h
@@ -38,7 +38,6 @@
 #define MICROPY_PY_MATH_FACTORIAL               (0)
 #define MICROPY_PY_SYS_PS1_PS2                  (0)
 #define MICROPY_PY_SYS_STDIO_BUFFER             (0)
-#define MICROPY_PY_USELECT                      (0)
 #define MICROPY_PY_UASYNCIO                     (0)
 #define MICROPY_PY_URE_SUB                      (0)
 #define MICROPY_PY_URANDOM_EXTRA_FUNCS          (0)

From fad978ae5f2dbb939b0ce82a8a77f4b757557f4e Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 29 Jun 2022 12:19:05 +1000
Subject: [PATCH 2271/3533] unix/variants: Enable remaining options on
 dev,coverage from ROM extra.

So that the default configuration for the dev and coverage variants
includes all options set by MICROPY_CONFIG_ROM_LEVEL_EXTRA_FEATURES.

Note that enabling MICROPY_PY_SYS_STDIO_BUFFER on unix doesn't do anything
because unix doesn't use shared/runtime/sys_stdio_mphal.c.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/unix/variants/coverage/mpconfigvariant.h | 4 ----
 ports/unix/variants/dev/mpconfigvariant.h      | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/ports/unix/variants/coverage/mpconfigvariant.h b/ports/unix/variants/coverage/mpconfigvariant.h
index 47ed4bc46cbf3..9c98ca2f626d7 100644
--- a/ports/unix/variants/coverage/mpconfigvariant.h
+++ b/ports/unix/variants/coverage/mpconfigvariant.h
@@ -30,10 +30,6 @@
 // Set base feature level.
 #define MICROPY_CONFIG_ROM_LEVEL (MICROPY_CONFIG_ROM_LEVEL_EXTRA_FEATURES)
 
-// Disable some features that come enabled by default with the feature level.
-#define MICROPY_PY_BUILTINS_EXECFILE            (0)
-#define MICROPY_PY_SYS_STDIO_BUFFER             (0)
-
 // Enable additional features.
 #define MICROPY_DEBUG_PARSE_RULE_NAME  (1)
 #define MICROPY_TRACKED_ALLOC           (1)
diff --git a/ports/unix/variants/dev/mpconfigvariant.h b/ports/unix/variants/dev/mpconfigvariant.h
index 06033942473d8..0084d00dd622b 100644
--- a/ports/unix/variants/dev/mpconfigvariant.h
+++ b/ports/unix/variants/dev/mpconfigvariant.h
@@ -27,10 +27,6 @@
 // Set base feature level.
 #define MICROPY_CONFIG_ROM_LEVEL (MICROPY_CONFIG_ROM_LEVEL_EXTRA_FEATURES)
 
-// Disable some features that come enabled by default with the feature level.
-#define MICROPY_PY_BUILTINS_EXECFILE            (0)
-#define MICROPY_PY_SYS_STDIO_BUFFER             (0)
-
 // Enable some additional features.
 #define MICROPY_REPL_EMACS_WORDS_MOVE           (1)
 #define MICROPY_REPL_EMACS_EXTRA_WORDS_MOVE     (1)

From 510bea9383b1baa5b22431e98d054f739dfe5d52 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 29 Jun 2022 12:42:04 +1000
Subject: [PATCH 2272/3533] unix/variants/coverage: Change config to use ROM
 level everything.

This ROM level is not yet fully defined, but it at least enables
MICROPY_PY_SYS_TRACEBACKLIMIT.  The coverage build should have everything
enabled, so it makes sense to use this ROM level for it.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/unix/variants/coverage/mpconfigvariant.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/ports/unix/variants/coverage/mpconfigvariant.h b/ports/unix/variants/coverage/mpconfigvariant.h
index 9c98ca2f626d7..30e3a4e5d209f 100644
--- a/ports/unix/variants/coverage/mpconfigvariant.h
+++ b/ports/unix/variants/coverage/mpconfigvariant.h
@@ -28,7 +28,7 @@
 // for coverage testing.
 
 // Set base feature level.
-#define MICROPY_CONFIG_ROM_LEVEL (MICROPY_CONFIG_ROM_LEVEL_EXTRA_FEATURES)
+#define MICROPY_CONFIG_ROM_LEVEL (MICROPY_CONFIG_ROM_LEVEL_EVERYTHING)
 
 // Enable additional features.
 #define MICROPY_DEBUG_PARSE_RULE_NAME  (1)
@@ -42,7 +42,6 @@
 #define MICROPY_PY_BUILTINS_NEXT2      (1)
 #define MICROPY_PY_BUILTINS_RANGE_BINOP (1)
 #define MICROPY_PY_SYS_GETSIZEOF       (1)
-#define MICROPY_PY_SYS_TRACEBACKLIMIT  (1)
 #define MICROPY_PY_IO_BUFFEREDWRITER (1)
 #define MICROPY_PY_URANDOM_SEED_INIT_FUNC (mp_urandom_seed_init())
 #define MICROPY_PY_URE_DEBUG           (1)

From afa4d0a4b75bc8d21ae95cc76627952d61df93d0 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 29 Jun 2022 12:47:14 +1000
Subject: [PATCH 2273/3533] unix/variants/dev: Allow all config options to be
 overridden.

They can be overridden on the make command line, for example.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/unix/variants/dev/mpconfigvariant.h  | 6 ++++++
 ports/unix/variants/dev/mpconfigvariant.mk | 6 +++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/ports/unix/variants/dev/mpconfigvariant.h b/ports/unix/variants/dev/mpconfigvariant.h
index 0084d00dd622b..2522f1861fdc3 100644
--- a/ports/unix/variants/dev/mpconfigvariant.h
+++ b/ports/unix/variants/dev/mpconfigvariant.h
@@ -28,7 +28,13 @@
 #define MICROPY_CONFIG_ROM_LEVEL (MICROPY_CONFIG_ROM_LEVEL_EXTRA_FEATURES)
 
 // Enable some additional features.
+#ifndef MICROPY_REPL_EMACS_WORDS_MOVE
 #define MICROPY_REPL_EMACS_WORDS_MOVE           (1)
+#endif
+#ifndef MICROPY_REPL_EMACS_EXTRA_WORDS_MOVE
 #define MICROPY_REPL_EMACS_EXTRA_WORDS_MOVE     (1)
+#endif
+#ifndef MICROPY_PY_SYS_SETTRACE
 #define MICROPY_PY_SYS_SETTRACE                 (1)
+#endif
 #define MICROPY_PY_URANDOM_SEED_INIT_FUNC       (mp_urandom_seed_init())
diff --git a/ports/unix/variants/dev/mpconfigvariant.mk b/ports/unix/variants/dev/mpconfigvariant.mk
index 91bd28da9bd85..78588d379bcde 100644
--- a/ports/unix/variants/dev/mpconfigvariant.mk
+++ b/ports/unix/variants/dev/mpconfigvariant.mk
@@ -3,8 +3,8 @@ PROG ?= micropython-dev
 FROZEN_MANIFEST ?= $(VARIANT_DIR)/manifest.py
 
 MICROPY_ROM_TEXT_COMPRESSION = 1
-MICROPY_VFS_FAT = 1
-MICROPY_VFS_LFS1 = 1
-MICROPY_VFS_LFS2 = 1
+MICROPY_VFS_FAT ?= 1
+MICROPY_VFS_LFS1 ?= 1
+MICROPY_VFS_LFS2 ?= 1
 
 MICROPY_PY_BLUETOOTH ?= 1

From 932556d5fc09a196139170fe52436ea8a02020c1 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 29 Jun 2022 12:48:42 +1000
Subject: [PATCH 2274/3533] tests/micropython: Add test for builtin execfile()
 function.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/micropython/builtin_execfile.py     | 70 +++++++++++++++++++++++
 tests/micropython/builtin_execfile.py.exp |  6 ++
 2 files changed, 76 insertions(+)
 create mode 100644 tests/micropython/builtin_execfile.py
 create mode 100644 tests/micropython/builtin_execfile.py.exp

diff --git a/tests/micropython/builtin_execfile.py b/tests/micropython/builtin_execfile.py
new file mode 100644
index 0000000000000..8a8ce79f784c9
--- /dev/null
+++ b/tests/micropython/builtin_execfile.py
@@ -0,0 +1,70 @@
+# Test builtin execfile function using VFS.
+
+try:
+    import uio, uos
+
+    execfile
+    uio.IOBase
+    uos.mount
+except (ImportError, NameError, AttributeError):
+    print("SKIP")
+    raise SystemExit
+
+
+class File(uio.IOBase):
+    def __init__(self, data):
+        self.data = data
+        self.off = 0
+
+    def ioctl(self, request, arg):
+        return 0
+
+    def readinto(self, buf):
+        buf[:] = memoryview(self.data)[self.off : self.off + len(buf)]
+        self.off += len(buf)
+        return len(buf)
+
+
+class Filesystem:
+    def __init__(self, files):
+        self.files = files
+
+    def mount(self, readonly, mkfs):
+        print("mount", readonly, mkfs)
+
+    def umount(self):
+        print("umount")
+
+    def open(self, file, mode):
+        print("open", file, mode)
+        if file not in self.files:
+            raise OSError(2)  # ENOENT
+        return File(self.files[file])
+
+
+# First umount any existing mount points the target may have.
+try:
+    uos.umount("/")
+except OSError:
+    pass
+for path in uos.listdir("/"):
+    uos.umount("/" + path)
+
+# Create and mount the VFS object.
+files = {
+    "/test.py": "print(123)",
+}
+fs = Filesystem(files)
+uos.mount(fs, "/test_mnt")
+
+# Test execfile with a file that doesn't exist.
+try:
+    execfile("/test_mnt/noexist.py")
+except OSError:
+    print("OSError")
+
+# Test execfile with a file that does exist.
+execfile("/test_mnt/test.py")
+
+# Unmount the VFS object.
+uos.umount(fs)
diff --git a/tests/micropython/builtin_execfile.py.exp b/tests/micropython/builtin_execfile.py.exp
new file mode 100644
index 0000000000000..1d5d8ee571e75
--- /dev/null
+++ b/tests/micropython/builtin_execfile.py.exp
@@ -0,0 +1,6 @@
+mount False False
+open /noexist.py rb
+OSError
+open /test.py rb
+123
+umount

From b004e7e397577d95404fd31aec68a5c54904a48c Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 29 Jun 2022 00:22:49 +1000
Subject: [PATCH 2275/3533] rp2/modmachine: Implement lightsleep() with
 optional sleep period.

This gets basic machine.lightsleep([n]) behaviour working on the rp2 port.
It supports:

- Calling lightsleep without a specified period, in which case it uses xosc
  dormant mode.  There's currently no way to wake it up from this state,
  unless you write to raw registers to enable a GPIO wake up source.

- Calling lightsleep with a period n in milliseconds.  This period must be
  less than about 72 minutes and uses timer alarm3 to wake it up.

The RTC continues to run during lightsleep, but other peripherals have
their clock turned off during the sleep.

It doesn't yet support longer periods than 72 minutes, or waking up from
GPIO IRQ.

Measured current consumption from the USB port on a PICO board is about
1.5mA when doing machine.lightsleep(5000), and about 0.9mA when doing
machine.lightsleep().

Addresses issue #8770.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/rp2/CMakeLists.txt |  2 ++
 ports/rp2/modmachine.c   | 78 +++++++++++++++++++++++++++++++++++++---
 2 files changed, 76 insertions(+), 4 deletions(-)

diff --git a/ports/rp2/CMakeLists.txt b/ports/rp2/CMakeLists.txt
index 0088ba2c6d672..9f71f65840797 100644
--- a/ports/rp2/CMakeLists.txt
+++ b/ports/rp2/CMakeLists.txt
@@ -150,6 +150,7 @@ set(PICO_SDK_COMPONENTS
     hardware_i2c
     hardware_irq
     hardware_pio
+    hardware_pll
     hardware_pwm
     hardware_regs
     hardware_rtc
@@ -159,6 +160,7 @@ set(PICO_SDK_COMPONENTS
     hardware_timer
     hardware_uart
     hardware_watchdog
+    hardware_xosc
     pico_base_headers
     pico_binary_info
     pico_bootrom
diff --git a/ports/rp2/modmachine.c b/ports/rp2/modmachine.c
index b988afdf305d2..3c8922c417210 100644
--- a/ports/rp2/modmachine.c
+++ b/ports/rp2/modmachine.c
@@ -38,7 +38,12 @@
 #include "modmachine.h"
 #include "uart.h"
 #include "hardware/clocks.h"
+#include "hardware/pll.h"
+#include "hardware/structs/rosc.h"
+#include "hardware/structs/scb.h"
+#include "hardware/structs/syscfg.h"
 #include "hardware/watchdog.h"
+#include "hardware/xosc.h"
 #include "pico/bootrom.h"
 #include "pico/stdlib.h"
 #include "pico/unique_id.h"
@@ -83,6 +88,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_0(machine_reset_cause_obj, machine_reset_cause);
 
 NORETURN mp_obj_t machine_bootloader(size_t n_args, const mp_obj_t *args) {
     MICROPY_BOARD_ENTER_BOOTLOADER(n_args, args);
+    rosc_hw->ctrl = ROSC_CTRL_ENABLE_VALUE_ENABLE << ROSC_CTRL_ENABLE_LSB;
     reset_usb_boot(0, 0);
     for (;;) {
     }
@@ -113,13 +119,77 @@ STATIC mp_obj_t machine_idle(void) {
 STATIC MP_DEFINE_CONST_FUN_OBJ_0(machine_idle_obj, machine_idle);
 
 STATIC mp_obj_t machine_lightsleep(size_t n_args, const mp_obj_t *args) {
-    if (n_args == 0) {
-        for (;;) {
-            MICROPY_EVENT_POLL_HOOK
+    mp_int_t delay_ms = 0;
+    bool use_timer_alarm = false;
+
+    if (n_args == 1) {
+        delay_ms = mp_obj_get_int(args[0]);
+        if (delay_ms <= 1) {
+            // Sleep is too small, just use standard delay.
+            mp_hal_delay_ms(delay_ms);
+            return mp_const_none;
+        }
+        use_timer_alarm = delay_ms < (1ULL << 32) / 1000;
+        if (use_timer_alarm) {
+            // Use timer alarm to wake.
+        } else {
+            // TODO: Use RTC alarm to wake.
+            mp_raise_ValueError(MP_ERROR_TEXT("sleep too long"));
         }
+    }
+
+    const uint32_t xosc_hz = XOSC_MHZ * 1000000;
+
+    // Disable USB and ADC clocks.
+    clock_stop(clk_usb);
+    clock_stop(clk_adc);
+
+    // CLK_REF = XOSC
+    clock_configure(clk_ref, CLOCKS_CLK_REF_CTRL_SRC_VALUE_XOSC_CLKSRC, 0, xosc_hz, xosc_hz);
+
+    // CLK_SYS = CLK_REF
+    clock_configure(clk_sys, CLOCKS_CLK_SYS_CTRL_SRC_VALUE_CLK_REF, 0, xosc_hz, xosc_hz);
+
+    // CLK_RTC = XOSC / 256
+    clock_configure(clk_rtc, 0, CLOCKS_CLK_RTC_CTRL_AUXSRC_VALUE_XOSC_CLKSRC, xosc_hz, xosc_hz / 256);
+
+    // CLK_PERI = CLK_SYS
+    clock_configure(clk_peri, 0, CLOCKS_CLK_PERI_CTRL_AUXSRC_VALUE_CLK_SYS, xosc_hz, xosc_hz);
+
+    // Disable PLLs.
+    pll_deinit(pll_sys);
+    pll_deinit(pll_usb);
+
+    // Disable ROSC.
+    rosc_hw->ctrl = ROSC_CTRL_ENABLE_VALUE_DISABLE << ROSC_CTRL_ENABLE_LSB;
+
+    if (n_args == 0) {
+        xosc_dormant();
     } else {
-        mp_hal_delay_ms(mp_obj_get_int(args[0]));
+        uint32_t sleep_en0 = clocks_hw->sleep_en0;
+        uint32_t sleep_en1 = clocks_hw->sleep_en1;
+        clocks_hw->sleep_en0 = CLOCKS_SLEEP_EN0_CLK_RTC_RTC_BITS;
+        if (use_timer_alarm) {
+            // Use timer alarm to wake.
+            clocks_hw->sleep_en1 = CLOCKS_SLEEP_EN1_CLK_SYS_TIMER_BITS;
+            timer_hw->alarm[3] = timer_hw->timerawl + delay_ms * 1000;
+        } else {
+            // TODO: Use RTC alarm to wake.
+            clocks_hw->sleep_en1 = 0;
+        }
+        scb_hw->scr |= M0PLUS_SCR_SLEEPDEEP_BITS;
+        __wfi();
+        scb_hw->scr &= ~M0PLUS_SCR_SLEEPDEEP_BITS;
+        clocks_hw->sleep_en0 = sleep_en0;
+        clocks_hw->sleep_en1 = sleep_en1;
     }
+
+    // Enable ROSC.
+    rosc_hw->ctrl = ROSC_CTRL_ENABLE_VALUE_ENABLE << ROSC_CTRL_ENABLE_LSB;
+
+    // Bring back all clocks.
+    clocks_init();
+
     return mp_const_none;
 }
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_lightsleep_obj, 0, 1, machine_lightsleep);

From 797a83ac3ef8f9bbf67faf59da665b5509db428b Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Wed, 29 Jun 2022 13:56:12 +1000
Subject: [PATCH 2276/3533] rp2/mpthreadport: Ensure core1 doesn't hold gc lock
 in deinit.

Prior to this commit the following code would lock up the device when
Ctrl-D is entered at the REPL:

    import gc, _thread

    def collect_thread():
        while True:
            gc.collect()

    _thread.start_new_thread(collect_thread, [])

Fixes part of #8494.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/rp2/mpthreadport.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/ports/rp2/mpthreadport.c b/ports/rp2/mpthreadport.c
index cdb5945d2198f..187f74bb57ef2 100644
--- a/ports/rp2/mpthreadport.c
+++ b/ports/rp2/mpthreadport.c
@@ -47,8 +47,13 @@ void mp_thread_init(void) {
 }
 
 void mp_thread_deinit(void) {
+    assert(get_core_num() == 0);
+    // Must ensure that core1 is not currently holding the GC lock, otherwise
+    // it will be terminated while holding the lock.
+    mp_thread_mutex_lock(&MP_STATE_MEM(gc_mutex), 1);
     multicore_reset_core1();
     core1_entry = NULL;
+    mp_thread_mutex_unlock(&MP_STATE_MEM(gc_mutex));
 }
 
 void mp_thread_gc_others(void) {

From f1b5761ced7f19676b744ef24c201fb0ff084c2a Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 30 Jun 2022 13:49:47 +1000
Subject: [PATCH 2277/3533] py/mkrules.cmake: Improve printing of
 git-submodules error.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/mkrules.cmake | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/py/mkrules.cmake b/py/mkrules.cmake
index d0dc0196253ac..4d0bbd22ad189 100644
--- a/py/mkrules.cmake
+++ b/py/mkrules.cmake
@@ -182,6 +182,9 @@ endif()
 # Update submodules
 if(ECHO_SUBMODULES)
     # If cmake is run with GIT_SUBMODULES defined on command line, process the port / board
-    # settings then print the final GIT_SUBMODULES variable as a fatal error and exit.
-    message(FATAL_ERROR "GIT_SUBMODULES=${GIT_SUBMODULES}")
+    # settings then print the final GIT_SUBMODULES variable and exit.
+    # Note: the GIT_SUBMODULES is done via echo rather than message, as message splits
+    # the output onto multiple lines
+    execute_process(COMMAND ${CMAKE_COMMAND} -E echo "GIT_SUBMODULES=${GIT_SUBMODULES}")
+    message(FATAL_ERROR "Done")
 endif()

From f75e61105457732db355788e5ec1b734c348e4e0 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 30 Jun 2022 13:54:50 +1000
Subject: [PATCH 2278/3533] extmod/vfs: Prevent uninitialized variable warning
 for path_out.

The warning can appear when building in Release mode on the rp2 port.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/vfs.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/extmod/vfs.c b/extmod/vfs.c
index 8e5e036326625..8bcead190d664 100644
--- a/extmod/vfs.c
+++ b/extmod/vfs.c
@@ -100,6 +100,8 @@ STATIC mp_vfs_mount_t *lookup_path(mp_obj_t path_in, mp_obj_t *path_out) {
     if (vfs != MP_VFS_NONE && vfs != MP_VFS_ROOT) {
         *path_out = mp_obj_new_str_of_type(mp_obj_get_type(path_in),
             (const byte *)p_out, strlen(p_out));
+    } else {
+        *path_out = MP_OBJ_NULL;
     }
     return vfs;
 }

From 7dd818052e62a6fffeec3e566063c424dad6af25 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 30 Jun 2022 14:10:58 +1000
Subject: [PATCH 2279/3533] extmod/network_cyw43: Support new cyw43-driver.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/network_cyw43.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/extmod/network_cyw43.c b/extmod/network_cyw43.c
index ea2fbbd45ea52..8823e3fa255ac 100644
--- a/extmod/network_cyw43.c
+++ b/extmod/network_cyw43.c
@@ -33,10 +33,15 @@
 #if MICROPY_PY_NETWORK_CYW43
 
 #include "lwip/netif.h"
-#include "drivers/cyw43/cyw43.h"
 #include "extmod/network_cyw43.h"
 #include "modnetwork.h"
 
+#if MICROPY_PY_NETWORK_CYW43_USE_LIB_DRIVER
+#include "lib/cyw43-driver/src/cyw43.h"
+#else
+#include "drivers/cyw43/cyw43.h"
+#endif
+
 typedef struct _network_cyw43_obj_t {
     mp_obj_base_t base;
     cyw43_t *cyw;
@@ -119,7 +124,11 @@ STATIC mp_obj_t network_cyw43_active(size_t n_args, const mp_obj_t *args) {
     if (n_args == 1) {
         return mp_obj_new_bool(cyw43_tcpip_link_status(self->cyw, self->itf));
     } else {
+        #if MICROPY_PY_NETWORK_CYW43_USE_LIB_DRIVER
+        cyw43_wifi_set_up(self->cyw, self->itf, mp_obj_is_true(args[1]), MICROPY_CYW43_COUNTRY);
+        #else
         cyw43_wifi_set_up(self->cyw, self->itf, mp_obj_is_true(args[1]));
+        #endif
         return mp_const_none;
     }
 }

From 4f30c60dcbfabb86ae5711a69445c913a5652304 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 30 Jun 2022 14:48:47 +1000
Subject: [PATCH 2280/3533] extmod/modnetwork: Include cyw43-driver header if
 it's enabled.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/modnetwork.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/extmod/modnetwork.c b/extmod/modnetwork.c
index 87e155e091543..e05bfdb11da96 100644
--- a/extmod/modnetwork.c
+++ b/extmod/modnetwork.c
@@ -44,6 +44,11 @@
 #include "lwip/apps/mdns.h"
 #endif
 
+#if MICROPY_PY_NETWORK_CYW43 && MICROPY_PY_NETWORK_CYW43_USE_LIB_DRIVER
+// So that CYW43_LINK_xxx constants are available to MICROPY_PORT_NETWORK_INTERFACES.
+#include "lib/cyw43-driver/src/cyw43.h"
+#endif
+
 /// \module network - network configuration
 ///
 /// This module provides network drivers and routing configuration.

From 18a010b5b1b50df34ffaab6d48404a19242f1930 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 30 Jun 2022 15:58:19 +1000
Subject: [PATCH 2281/3533] lib/cyw43-driver: Add new submodule for CYW43xx
 WiFi driver.

Signed-off-by: Damien George <damien@micropython.org>
---
 .gitmodules      | 3 +++
 lib/cyw43-driver | 1 +
 2 files changed, 4 insertions(+)
 create mode 160000 lib/cyw43-driver

diff --git a/.gitmodules b/.gitmodules
index 118e023debf8d..3d1e2fea745e7 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -50,3 +50,6 @@
 	url = https://github.com/andrewleech/wiznet_ioLibrary_Driver.git
 	# Requires https://github.com/Wiznet/ioLibrary_Driver/pull/120
 	# url = https://github.com/Wiznet/ioLibrary_Driver.git
+[submodule "lib/cyw43-driver"]
+	path = lib/cyw43-driver
+	url = https://github.com/georgerobotics/cyw43-driver.git
diff --git a/lib/cyw43-driver b/lib/cyw43-driver
new file mode 160000
index 0000000000000..195dfcc10bb6f
--- /dev/null
+++ b/lib/cyw43-driver
@@ -0,0 +1 @@
+Subproject commit 195dfcc10bb6f379e3dea45147590db2203d3c7b

From f525e17793d29fec0cc545dfaf290c75b12e8411 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 30 Jun 2022 14:15:13 +1000
Subject: [PATCH 2282/3533] lib/pico-sdk: Update to version 1.4.0.

Signed-off-by: Damien George <damien@micropython.org>
---
 lib/pico-sdk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/pico-sdk b/lib/pico-sdk
index 2062372d203b3..2e6142b15b8a7 160000
--- a/lib/pico-sdk
+++ b/lib/pico-sdk
@@ -1 +1 @@
-Subproject commit 2062372d203b372849d573f252cf7c6dc2800c0a
+Subproject commit 2e6142b15b8a75c1227dd3edbe839193b2bf9041

From 11f920f8adeaa012a1f893160850c33ad72f6e33 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 30 Jun 2022 14:23:30 +1000
Subject: [PATCH 2283/3533] rp2/mbedtls: Enable some more mbedtls options.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/rp2/mbedtls/mbedtls_config.h | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/ports/rp2/mbedtls/mbedtls_config.h b/ports/rp2/mbedtls/mbedtls_config.h
index 8e054ed51713a..4bf606f5ea23b 100644
--- a/ports/rp2/mbedtls/mbedtls_config.h
+++ b/ports/rp2/mbedtls/mbedtls_config.h
@@ -26,6 +26,10 @@
 #ifndef MICROPY_INCLUDED_MBEDTLS_CONFIG_H
 #define MICROPY_INCLUDED_MBEDTLS_CONFIG_H
 
+// If you want to debug MBEDTLS uncomment the following and
+// Pass 3 to mbedtls_debug_set_threshold in socket_new
+// #define MBEDTLS_DEBUG_C
+
 // Set mbedtls configuration
 #define MBEDTLS_PLATFORM_MEMORY
 #define MBEDTLS_PLATFORM_NO_STD_FUNCTIONS
@@ -45,6 +49,8 @@
 #define MBEDTLS_ECP_DP_BP384R1_ENABLED
 #define MBEDTLS_ECP_DP_BP512R1_ENABLED
 #define MBEDTLS_ECP_DP_CURVE25519_ENABLED
+#define MBEDTLS_ECP_NIST_OPTIM
+#define MBEDTLS_KEY_EXCHANGE_ECDHE_RSA_ENABLED
 #define MBEDTLS_KEY_EXCHANGE_RSA_ENABLED
 #define MBEDTLS_NO_PLATFORM_ENTROPY
 #define MBEDTLS_PKCS1_V15
@@ -65,9 +71,11 @@
 #define MBEDTLS_BIGNUM_C
 #define MBEDTLS_CIPHER_C
 #define MBEDTLS_CTR_DRBG_C
-// #define MBEDTLS_ECP_C
+#define MBEDTLS_ECDH_C
+#define MBEDTLS_ECP_C
 #define MBEDTLS_ENTROPY_C
 #define MBEDTLS_ERROR_C
+#define MBEDTLS_GCM_C
 #define MBEDTLS_MD_C
 #define MBEDTLS_MD5_C
 #define MBEDTLS_OID_C
@@ -82,6 +90,7 @@
 #define MBEDTLS_SSL_CLI_C
 #define MBEDTLS_SSL_SRV_C
 #define MBEDTLS_SSL_TLS_C
+#define MBEDTLS_TLS_DEFAULT_ALLOW_SHA1_IN_KEY_EXCHANGE
 #define MBEDTLS_X509_CRT_PARSE_C
 #define MBEDTLS_X509_USE_C
 

From c95f99105af3ca5c27ea63d5672c790c531faf89 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 30 Jun 2022 14:24:57 +1000
Subject: [PATCH 2284/3533] rp2/lwip_inc: Enable lwIP status callback.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/rp2/lwip_inc/lwipopts.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/rp2/lwip_inc/lwipopts.h b/ports/rp2/lwip_inc/lwipopts.h
index 55926af7e53de..691b228db5c93 100644
--- a/ports/rp2/lwip_inc/lwipopts.h
+++ b/ports/rp2/lwip_inc/lwipopts.h
@@ -24,6 +24,7 @@
 #define LWIP_STATS                      0
 #define LWIP_NETIF_HOSTNAME             1
 #define LWIP_NETIF_EXT_STATUS_CALLBACK  1
+#define LWIP_NETIF_STATUS_CALLBACK      1
 
 #define LWIP_IPV6                       0
 #define LWIP_DHCP                       1

From 7cdad05e54397969c4416737042659541dfc5d17 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 30 Jun 2022 14:27:13 +1000
Subject: [PATCH 2285/3533] rp2/rp2_flash: Add asserts for size of flash
 filesystem partition.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/rp2/rp2_flash.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/ports/rp2/rp2_flash.c b/ports/rp2/rp2_flash.c
index 80bc1dc1df121..db6b9f3bfe757 100644
--- a/ports/rp2/rp2_flash.c
+++ b/ports/rp2/rp2_flash.c
@@ -37,6 +37,7 @@
 #ifndef MICROPY_HW_FLASH_STORAGE_BYTES
 #define MICROPY_HW_FLASH_STORAGE_BYTES (1408 * 1024)
 #endif
+static_assert(MICROPY_HW_FLASH_STORAGE_BYTES % 4096 == 0, "Flash storage size must be a multiple of 4K");
 
 #ifndef MICROPY_HW_FLASH_STORAGE_BASE
 #define MICROPY_HW_FLASH_STORAGE_BASE (PICO_FLASH_SIZE_BYTES - MICROPY_HW_FLASH_STORAGE_BYTES)
@@ -72,6 +73,11 @@ STATIC mp_obj_t rp2_flash_make_new(const mp_obj_type_t *type, size_t n_args, siz
     // Check args.
     mp_arg_check_num(n_args, n_kw, 0, 0, false);
 
+    #ifndef NDEBUG
+    extern char __flash_binary_end;
+    assert((uintptr_t)&__flash_binary_end - XIP_BASE <= MICROPY_HW_FLASH_STORAGE_BASE);
+    #endif
+
     // Return singleton object.
     return MP_OBJ_FROM_PTR(&rp2_flash_obj);
 }

From c001cfa603ef0dcb95196f1942ce2e4d5bd6385b Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 30 Jun 2022 14:53:05 +1000
Subject: [PATCH 2286/3533] rp2/mpnetworkport: Convert network task scheduling
 to use PendSV IRQ.

It is more reliable and scales better when more components need it.

Work done in collaboration with Graham Sanderson and Peter Harper.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/rp2/CMakeLists.txt  |  2 ++
 ports/rp2/mpnetworkport.c | 60 ++++++++-------------------------
 ports/rp2/pendsv.c        | 70 +++++++++++++++++++++++++++++++++++++++
 ports/rp2/pendsv.h        | 49 +++++++++++++++++++++++++++
 4 files changed, 134 insertions(+), 47 deletions(-)
 create mode 100644 ports/rp2/pendsv.c
 create mode 100644 ports/rp2/pendsv.h

diff --git a/ports/rp2/CMakeLists.txt b/ports/rp2/CMakeLists.txt
index 9f71f65840797..50afa55a97663 100644
--- a/ports/rp2/CMakeLists.txt
+++ b/ports/rp2/CMakeLists.txt
@@ -111,6 +111,7 @@ set(MICROPY_SOURCE_PORT
     mphalport.c
     mpnetworkport.c
     mpthreadport.c
+    pendsv.c
     rp2_flash.c
     rp2_pio.c
     tusb_port.c
@@ -141,6 +142,7 @@ set(MICROPY_SOURCE_QSTR
 )
 
 set(PICO_SDK_COMPONENTS
+    cmsis_core
     hardware_adc
     hardware_base
     hardware_clocks
diff --git a/ports/rp2/mpnetworkport.c b/ports/rp2/mpnetworkport.c
index 124907f53870f..2b01b62192d0c 100644
--- a/ports/rp2/mpnetworkport.c
+++ b/ports/rp2/mpnetworkport.c
@@ -26,6 +26,7 @@
 
 #include "py/runtime.h"
 #include "py/mphal.h"
+#include "pendsv.h"
 
 #if MICROPY_PY_LWIP
 
@@ -36,14 +37,14 @@
 #define LWIP_TICK_RATE_MS 64
 
 static alarm_id_t lwip_alarm_id = -1;
-static bool lwip_can_poll = true;
-static bool lwip_poll_pending = false;
 
 #if MICROPY_PY_NETWORK_WIZNET5K
-static bool wiznet_poll_pending = false;
-
 void wiznet5k_poll(void);
 void wiznet5k_deinit(void);
+
+void wiznet5k_try_poll(void) {
+    pendsv_schedule_dispatch(PENDSV_DISPATCH_WIZNET, wiznet5k_poll);
+}
 #endif
 
 u32_t sys_now(void) {
@@ -51,62 +52,27 @@ u32_t sys_now(void) {
     return mp_hal_ticks_ms();
 }
 
-STATIC uint32_t lwip_poll(void) {
+STATIC void lwip_poll(void) {
     // Run the lwIP internal updates
     sys_check_timeouts();
-
-    return MAX(5, MIN(sys_timeouts_sleeptime(), LWIP_TICK_RATE_MS));
 }
 
 void lwip_lock_acquire(void) {
-    lwip_can_poll = false;
+    // Prevent PendSV from running.
+    pendsv_suspend();
 }
 
 void lwip_lock_release(void) {
-    lwip_can_poll = false;
-    #if MICROPY_PY_NETWORK_WIZNET5K
-    if (wiznet_poll_pending) {
-        wiznet5k_poll();
-        wiznet_poll_pending = false;
-    }
-    #endif
-
-    if (lwip_poll_pending) {
-        lwip_poll();
-        lwip_poll_pending = false;
-    }
-    lwip_can_poll = true;
+    // Allow PendSV to run again.
+    pendsv_resume();
 }
 
-uint32_t lwip_try_poll(void) {
-    uint32_t ret = LWIP_TICK_RATE_MS;
-    if (lwip_can_poll) {
-        lwip_can_poll = false;
-        ret = lwip_poll();
-        lwip_can_poll = true;
-    } else {
-        lwip_poll_pending = true;
-    }
-    return ret;
-}
-
-#if MICROPY_PY_NETWORK_WIZNET5K
-void wiznet5k_try_poll(void) {
-    if (lwip_can_poll) {
-        lwip_can_poll = false;
-        wiznet5k_poll();
-        lwip_can_poll = true;
-    } else {
-        wiznet_poll_pending = true;
-    }
-}
-#endif
-
 STATIC int64_t alarm_callback(alarm_id_t id, void *user_data) {
+    pendsv_schedule_dispatch(PENDSV_DISPATCH_LWIP, lwip_poll);
     #if MICROPY_PY_NETWORK_WIZNET5K
-    wiznet5k_try_poll();
+    pendsv_schedule_dispatch(PENDSV_DISPATCH_WIZNET, wiznet5k_poll);
     #endif
-    return (int64_t)lwip_try_poll() * 1000;
+    return LWIP_TICK_RATE_MS * 1000;
 }
 
 void mod_network_lwip_init(void) {
diff --git a/ports/rp2/pendsv.c b/ports/rp2/pendsv.c
new file mode 100644
index 0000000000000..006303d46fbf6
--- /dev/null
+++ b/ports/rp2/pendsv.c
@@ -0,0 +1,70 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2022 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include <assert.h>
+#include "pendsv.h"
+#include "RP2040.h"
+
+static pendsv_dispatch_t pendsv_dispatch_table[PENDSV_DISPATCH_NUM_SLOTS];
+static int pendsv_lock;
+
+void pendsv_suspend(void) {
+    pendsv_lock++;
+}
+
+void pendsv_resume(void) {
+    pendsv_lock--;
+    assert(pendsv_lock >= 0);
+    // Run pendsv if needed.  Find an entry with a dispatch and call pendsv dispatch
+    // with it.  If pendsv runs it will service all slots.
+    int count = PENDSV_DISPATCH_NUM_SLOTS;
+    while (count--) {
+        if (pendsv_dispatch_table[count]) {
+            pendsv_schedule_dispatch(count, pendsv_dispatch_table[count]);
+            break;
+        }
+    }
+}
+
+void pendsv_schedule_dispatch(size_t slot, pendsv_dispatch_t f) {
+    assert(pendsv_lock >= 0);
+    pendsv_dispatch_table[slot] = f;
+    if (pendsv_lock == 0) {
+        SCB->ICSR = SCB_ICSR_PENDSVSET_Msk;
+    }
+}
+
+// PendSV interrupt handler to perform background processing.
+void PendSV_Handler(void) {
+    assert(pendsv_lock == 0);
+    for (size_t i = 0; i < PENDSV_DISPATCH_NUM_SLOTS; ++i) {
+        if (pendsv_dispatch_table[i] != NULL) {
+            pendsv_dispatch_t f = pendsv_dispatch_table[i];
+            pendsv_dispatch_table[i] = NULL;
+            f();
+        }
+    }
+}
diff --git a/ports/rp2/pendsv.h b/ports/rp2/pendsv.h
new file mode 100644
index 0000000000000..7bb43208ab8ad
--- /dev/null
+++ b/ports/rp2/pendsv.h
@@ -0,0 +1,49 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2022 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+#ifndef MICROPY_INCLUDED_RP2_PENDSV_H
+#define MICROPY_INCLUDED_RP2_PENDSV_H
+
+#include <stddef.h>
+
+enum {
+    #if MICROPY_PY_LWIP
+    PENDSV_DISPATCH_LWIP,
+    #endif
+    #if MICROPY_PY_NETWORK_WIZNET5K
+    PENDSV_DISPATCH_WIZNET,
+    #endif
+    PENDSV_DISPATCH_MAX
+};
+
+#define PENDSV_DISPATCH_NUM_SLOTS PENDSV_DISPATCH_MAX
+
+typedef void (*pendsv_dispatch_t)(void);
+
+void pendsv_suspend(void);
+void pendsv_resume(void);
+void pendsv_schedule_dispatch(size_t slot, pendsv_dispatch_t f);
+
+#endif // MICROPY_INCLUDED_RP2_PENDSV_H

From 50e46552c0c83b0c8570aba098a0ba4e68ae9eac Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 30 Jun 2022 16:01:02 +1000
Subject: [PATCH 2287/3533] rp2: Integrate CYW43xx WiFi driver.

This includes:
- Configuration file for the cyw43-driver.
- Integration of cyw43-driver into the build, using lwIP.
- Enhancements to machine.Pin to support extension IO pins provided by the
  CYW43xx.
- More mp-hal pin helper functions.
- mp_hal_get_mac_ascii MAC address helper function.
- Addition of rp2.country() function to set the country code.

A board can enable this driver by setting MICROPY_PY_NETWORK_CYW43 in their
cmake snippet.

Work done in collaboration with Graham Sanderson and Peter Harper.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/rp2/CMakeLists.txt     |  29 +++
 ports/rp2/Makefile           |   4 +-
 ports/rp2/README.md          |   7 +
 ports/rp2/cyw43_configport.h |  98 ++++++++++
 ports/rp2/machine_pin.c      | 354 ++++++++++++++++++++++++++++-------
 ports/rp2/main.c             |  29 +++
 ports/rp2/modrp2.c           |  26 +++
 ports/rp2/mpconfigport.h     |  22 +++
 ports/rp2/mphalport.c        |  23 +++
 ports/rp2/mphalport.h        |  13 ++
 ports/rp2/mpnetworkport.c    |  35 ++++
 ports/rp2/pendsv.c           |  13 ++
 ports/rp2/pendsv.h           |   3 +
 ports/rp2/rp2_pio.c          |   5 +
 14 files changed, 597 insertions(+), 64 deletions(-)
 create mode 100644 ports/rp2/cyw43_configport.h

diff --git a/ports/rp2/CMakeLists.txt b/ports/rp2/CMakeLists.txt
index 50afa55a97663..9185c7d649989 100644
--- a/ports/rp2/CMakeLists.txt
+++ b/ports/rp2/CMakeLists.txt
@@ -16,6 +16,10 @@ endif()
 
 # Use the local tinyusb instead of the one in pico-sdk
 set(PICO_TINYUSB_PATH ${MICROPY_DIR}/lib/tinyusb)
+# Use the local cyw43_driver instead of the one in pico-sdk
+set(PICO_CYW43_DRIVER_PATH ${MICROPY_DIR}/lib/cyw43-driver)
+# Use the local lwip instead of the one in pico-sdk
+set(PICO_LWIP_PATH ${MICROPY_DIR}/lib/lwip)
 
 # Set the location of this port's directory.
 set(MICROPY_PORT_DIR ${CMAKE_SOURCE_DIR})
@@ -73,6 +77,7 @@ set(MICROPY_SOURCE_LIB
     ${MICROPY_DIR}/lib/mbedtls_errors/mp_mbedtls_errors.c
     ${MICROPY_DIR}/lib/oofatfs/ff.c
     ${MICROPY_DIR}/lib/oofatfs/ffunicode.c
+    ${MICROPY_DIR}/shared/netutils/dhcpserver.c
     ${MICROPY_DIR}/shared/netutils/netutils.c
     ${MICROPY_DIR}/shared/netutils/trace.c
     ${MICROPY_DIR}/shared/readline/readline.c
@@ -216,6 +221,30 @@ if(MICROPY_BLUETOOTH_NIMBLE)
     list(APPEND MICROPY_INC_CORE ${NIMBLE_INCLUDE})
 endif()
 
+if (MICROPY_PY_NETWORK_CYW43)
+    string(CONCAT GIT_SUBMODULES "${GIT_SUBMODULES} " lib/cyw43-driver)
+
+    target_compile_definitions(${MICROPY_TARGET} PRIVATE
+        MICROPY_PY_NETWORK_CYW43=1
+        MICROPY_PY_NETWORK_CYW43_USE_LIB_DRIVER=1
+        MICROPY_PY_SOCKET_DEFAULT_TIMEOUT_MS=30000 # default socket timeout
+    )
+    if (CMAKE_BUILD_TYPE MATCHES Debug)
+    target_compile_definitions(${MICROPY_TARGET} PRIVATE
+        CYW43_USE_STATS=1
+    )
+    endif()
+
+    list(APPEND MICROPY_SOURCE_EXTMOD
+        ${MICROPY_DIR}/extmod/network_cyw43.c
+    )
+
+    target_link_libraries(${MICROPY_TARGET}
+        cyw43_driver_picow
+        cmsis_core
+    )
+endif()
+
 if (MICROPY_PY_NETWORK_NINAW10)
     target_compile_definitions(${MICROPY_TARGET} PRIVATE
         MICROPY_PY_NETWORK_NINAW10=1
diff --git a/ports/rp2/Makefile b/ports/rp2/Makefile
index c2138a340a1fa..87c1d650e0977 100644
--- a/ports/rp2/Makefile
+++ b/ports/rp2/Makefile
@@ -29,9 +29,11 @@ all:
 clean:
 	$(RM) -rf $(BUILD)
 
-GIT_SUBMODULES += lib/mbedtls lib/pico-sdk lib/tinyusb
+GIT_SUBMODULES += lib/mbedtls lib/tinyusb
 
 submodules:
+	# lib/pico-sdk is required for the cmake build to function (as used for boards other than PICO below)
+	$(MAKE) -f ../../py/mkrules.mk GIT_SUBMODULES="lib/pico-sdk" submodules
 ifeq ($(BOARD),PICO)
 	# Run the standard submodules target with minimum required submodules above
 	$(MAKE) -f ../../py/mkrules.mk GIT_SUBMODULES="$(GIT_SUBMODULES)" submodules
diff --git a/ports/rp2/README.md b/ports/rp2/README.md
index 5836ac0cd84e3..078919ce81940 100644
--- a/ports/rp2/README.md
+++ b/ports/rp2/README.md
@@ -37,6 +37,13 @@ You can also build the standard CMake way.  The final firmware is found in
 the top-level of the CMake build directory (`build` by default) and is
 called `firmware.uf2`.
 
+If you are using a different board other than a Rasoberry Pi Pico, then you should
+pass the board name to the build; e.g. for Raspberry Pi Pico W:
+
+    $ make BOARD=PICO_W submodules
+    $ make BOARD=PICO_W clean
+    $ make BOARD=PICO_W
+
 ## Deploying firmware to the device
 
 Firmware can be deployed to the device by putting it into bootloader mode
diff --git a/ports/rp2/cyw43_configport.h b/ports/rp2/cyw43_configport.h
new file mode 100644
index 0000000000000..6173964cb2bef
--- /dev/null
+++ b/ports/rp2/cyw43_configport.h
@@ -0,0 +1,98 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2022 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+#ifndef MICROPY_INCLUDED_RP2_CYW43_CONFIGPORT_H
+#define MICROPY_INCLUDED_RP2_CYW43_CONFIGPORT_H
+
+// The board-level config will be included here, so it can set some CYW43 values.
+#include "py/mpconfig.h"
+#include "py/mperrno.h"
+#include "py/mphal.h"
+#include "pendsv.h"
+
+#define CYW43_IOCTL_TIMEOUT_US          (1000000)
+#define CYW43_SLEEP_MAX                 (10)
+#define CYW43_NETUTILS                  (1)
+#define CYW43_USE_OTP_MAC               (1)
+
+#define CYW43_EPERM                     MP_EPERM // Operation not permitted
+#define CYW43_EIO                       MP_EIO // I/O error
+#define CYW43_EINVAL                    MP_EINVAL // Invalid argument
+#define CYW43_ETIMEDOUT                 MP_ETIMEDOUT // Connection timed out
+
+#define CYW43_THREAD_ENTER              MICROPY_PY_LWIP_ENTER
+#define CYW43_THREAD_EXIT               MICROPY_PY_LWIP_EXIT
+#define CYW43_THREAD_LOCK_CHECK
+
+#define CYW43_SDPCM_SEND_COMMON_WAIT    __WFI();
+#define CYW43_DO_IOCTL_WAIT             __WFI();
+
+#define CYW43_ARRAY_SIZE(a)             MP_ARRAY_SIZE(a)
+
+#define CYW43_HAL_PIN_MODE_INPUT        MP_HAL_PIN_MODE_INPUT
+#define CYW43_HAL_PIN_MODE_OUTPUT       MP_HAL_PIN_MODE_OUTPUT
+#define CYW43_HAL_PIN_PULL_NONE         MP_HAL_PIN_PULL_NONE
+#define CYW43_HAL_PIN_PULL_UP           MP_HAL_PIN_PULL_UP
+#define CYW43_HAL_PIN_PULL_DOWN         MP_HAL_PIN_PULL_DOWN
+
+#define CYW43_HAL_MAC_WLAN0             MP_HAL_MAC_WLAN0
+
+// set in SDK board header
+#define CYW43_NUM_GPIOS                 CYW43_WL_GPIO_COUNT
+
+#define CYW43_POST_POLL_HOOK            cyw43_post_poll_hook();
+
+#define cyw43_hal_ticks_us              mp_hal_ticks_us
+#define cyw43_hal_ticks_ms              mp_hal_ticks_ms
+
+#define cyw43_hal_pin_obj_t             mp_hal_pin_obj_t
+#define cyw43_hal_pin_config            mp_hal_pin_config
+#define cyw43_hal_pin_read              mp_hal_pin_read
+#define cyw43_hal_pin_low               mp_hal_pin_low
+#define cyw43_hal_pin_high              mp_hal_pin_high
+
+#define cyw43_hal_get_mac               mp_hal_get_mac
+#define cyw43_hal_get_mac_ascii         mp_hal_get_mac_ascii
+#define cyw43_hal_generate_laa_mac      mp_hal_generate_laa_mac
+
+#define cyw43_schedule_internal_poll_dispatch(func) pendsv_schedule_dispatch(PENDSV_DISPATCH_CYW43, func)
+
+void cyw43_post_poll_hook(void);
+
+static inline void cyw43_delay_us(uint32_t us) {
+    uint32_t start = mp_hal_ticks_us();
+    while (mp_hal_ticks_us() - start < us) {
+    }
+}
+
+static inline void cyw43_delay_ms(uint32_t ms) {
+    uint32_t us = ms * 1000;
+    int32_t start = mp_hal_ticks_us();
+    while (mp_hal_ticks_us() - start < us) {
+        __WFI();
+    }
+}
+
+#endif // MICROPY_INCLUDED_RP2_CYW43_CONFIGPORT_H
diff --git a/ports/rp2/machine_pin.c b/ports/rp2/machine_pin.c
index ca8de6ce253fe..a0c5dead9067e 100644
--- a/ports/rp2/machine_pin.c
+++ b/ports/rp2/machine_pin.c
@@ -58,9 +58,18 @@
 // Open drain behaviour is simulated.
 #define GPIO_IS_OPEN_DRAIN(id) (machine_pin_open_drain_mask & (1 << (id)))
 
+#ifndef MICROPY_HW_PIN_RESERVED
+#define MICROPY_HW_PIN_RESERVED(i) (0)
+#endif
+
 typedef struct _machine_pin_obj_t {
     mp_obj_base_t base;
-    uint32_t id;
+    uint8_t id;
+    #if MICROPY_HW_PIN_CYW43_COUNT
+    bool is_cyw43;
+    bool is_output;
+    bool last_output_value;
+    #endif
 } machine_pin_obj_t;
 
 typedef struct _machine_pin_irq_obj_t {
@@ -104,9 +113,60 @@ STATIC const machine_pin_obj_t machine_pin_obj[NUM_BANK0_GPIOS] = {
     {{&machine_pin_type}, 29},
 };
 
+#if MICROPY_HW_PIN_CYW43_COUNT
+#include "lib/cyw43-driver/src/cyw43.h"
+#define CYW43_PIN_NAME_PREFIX "WL_GPIO"
+STATIC machine_pin_obj_t cyw43_pin_obj[MICROPY_HW_PIN_CYW43_COUNT];
+#endif
+
+#define LED_PIN_NAME "LED"
+
+#ifndef MICROPY_HW_PIN_ENABLE_LED_PIN
+#if defined(MICROPY_HW_PIN_CYW43_LED_PIN_NUM) || defined(PICO_DEFAULT_LED_PIN)
+#define MICROPY_HW_PIN_ENABLE_LED_PIN 1
+#endif
+#endif
+
+#ifdef MICROPY_HW_PIN_ENABLE_LED_PIN
+#ifdef MICROPY_HW_PIN_CYW43_LED_PIN_NUM
+STATIC machine_pin_obj_t *led_pin_obj = &cyw43_pin_obj[MICROPY_HW_PIN_CYW43_LED_PIN_NUM];
+#elif defined(MICROPY_HW_PIN_LED_PIN_NUM)
+STATIC machine_pin_obj_t *led_pin_obj = &machine_pin_obj[MICROPY_HW_PIN_LED_PIN_NUM];
+#elif defined(PICO_DEFAULT_LED_PIN)
+STATIC const machine_pin_obj_t *led_pin_obj = &machine_pin_obj[PICO_DEFAULT_LED_PIN];
+#else
+#error MICROPY_HW_PIN_ENABLE_LED_PIN defined but there is no LED pin
+#endif
+#endif
+
 // Mask with "1" indicating that the corresponding pin is in simulated open-drain mode.
 uint32_t machine_pin_open_drain_mask;
 
+#if MICROPY_HW_PIN_CYW43_COUNT
+STATIC inline bool is_cyw43_pin(__unused const machine_pin_obj_t *self) {
+    return self->is_cyw43;
+}
+#else
+#define is_cyw43_pin(x) false
+#endif
+
+#if MICROPY_HW_PIN_CYW43_COUNT
+STATIC inline void update_cyw43_value(__unused machine_pin_obj_t *self, bool value) {
+    if (value != self->last_output_value || !self->is_output) {
+        cyw43_gpio_set(&cyw43_state, self->id, value);
+    }
+    self->last_output_value = value;
+}
+#endif
+
+#if MICROPY_HW_PIN_CYW43_COUNT
+STATIC inline bool get_cyw43_value(__unused machine_pin_obj_t *self) {
+    bool value = false;
+    cyw43_gpio_get(&cyw43_state, self->id, &value);
+    return value;
+}
+#endif
+
 STATIC void gpio_irq(void) {
     for (int i = 0; i < 4; ++i) {
         uint32_t intr = iobank0_hw->intr[i];
@@ -129,15 +189,24 @@ STATIC void gpio_irq(void) {
 
 void machine_pin_init(void) {
     memset(MP_STATE_PORT(machine_pin_irq_obj), 0, sizeof(MP_STATE_PORT(machine_pin_irq_obj)));
-    irq_set_exclusive_handler(IO_IRQ_BANK0, gpio_irq);
+    irq_add_shared_handler(IO_IRQ_BANK0, gpio_irq, PICO_SHARED_IRQ_HANDLER_DEFAULT_ORDER_PRIORITY);
     irq_set_enabled(IO_IRQ_BANK0, true);
+    #if MICROPY_HW_PIN_CYW43_COUNT
+    for (uint i = 0; i < count_of(cyw43_pin_obj); i++) {
+        cyw43_pin_obj[i].id = i;
+        cyw43_pin_obj[i].base.type = &machine_pin_type;
+        cyw43_pin_obj[i].is_cyw43 = true;
+    }
+    #endif
 }
 
 void machine_pin_deinit(void) {
     for (int i = 0; i < NUM_BANK0_GPIOS; ++i) {
+        if (MICROPY_HW_PIN_RESERVED(i)) {
+            continue;
+        }
         gpio_set_irq_enabled(i, GPIO_IRQ_ALL, false);
     }
-    irq_set_enabled(IO_IRQ_BANK0, false);
     irq_remove_handler(IO_IRQ_BANK0, gpio_irq);
 }
 
@@ -145,45 +214,112 @@ STATIC void machine_pin_print(const mp_print_t *print, mp_obj_t self_in, mp_prin
     machine_pin_obj_t *self = self_in;
     uint funcsel = GPIO_GET_FUNCSEL(self->id);
     qstr mode_qst;
-    if (funcsel == GPIO_FUNC_SIO) {
-        if (GPIO_IS_OPEN_DRAIN(self->id)) {
-            mode_qst = MP_QSTR_OPEN_DRAIN;
-        } else if (GPIO_IS_OUT(self->id)) {
-            mode_qst = MP_QSTR_OUT;
+    if (!is_cyw43_pin(self)) {
+        if (funcsel == GPIO_FUNC_SIO) {
+            if (GPIO_IS_OPEN_DRAIN(self->id)) {
+                mode_qst = MP_QSTR_OPEN_DRAIN;
+            } else if (GPIO_IS_OUT(self->id)) {
+                mode_qst = MP_QSTR_OUT;
+            } else {
+                mode_qst = MP_QSTR_IN;
+            }
         } else {
-            mode_qst = MP_QSTR_IN;
+            mode_qst = MP_QSTR_ALT;
+        }
+        mp_printf(print, "Pin(%u, mode=%q", self->id, mode_qst);
+        bool pull_up = false;
+        if (GPIO_IS_PULL_UP(self->id)) {
+            mp_printf(print, ", pull=%q", MP_QSTR_PULL_UP);
+            pull_up = true;
+        }
+        if (GPIO_IS_PULL_DOWN(self->id)) {
+            if (pull_up) {
+                mp_printf(print, "|%q", MP_QSTR_PULL_DOWN);
+            } else {
+                mp_printf(print, ", pull=%q", MP_QSTR_PULL_DOWN);
+            }
+        }
+        if (funcsel != GPIO_FUNC_SIO) {
+            mp_printf(print, ", alt=%u", funcsel);
         }
     } else {
-        mode_qst = MP_QSTR_ALT;
+        #if MICROPY_HW_PIN_CYW43_COUNT
+        mode_qst = self->is_output ? MP_QSTR_OUT : MP_QSTR_IN;
+        mp_printf(print, "Pin(%s%u, mode=%q", CYW43_PIN_NAME_PREFIX,  self->id, mode_qst);
+        #endif
+    }
+    mp_printf(print, ")");
+}
+
+enum {
+    ARG_mode, ARG_pull, ARG_value, ARG_alt
+};
+static const mp_arg_t allowed_args[] = {
+    {MP_QSTR_mode,  MP_ARG_OBJ,                  {.u_rom_obj = MP_ROM_NONE}},
+    {MP_QSTR_pull,  MP_ARG_OBJ,                  {.u_rom_obj = MP_ROM_NONE}},
+    {MP_QSTR_value, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE}},
+    {MP_QSTR_alt,   MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = GPIO_FUNC_SIO}},
+};
+
+#if MICROPY_HW_PIN_CYW43_COUNT
+// pin.init(mode, pull=None, *, value=None, alt=FUNC_SIO)
+STATIC mp_obj_t machine_pin_cyw43_obj_init_helper(machine_pin_obj_t *self, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
+    mp_arg_parse_all(n_args, pos_args, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
+
+    if (args[ARG_pull].u_obj != mp_const_none) {
+        int pull = mp_obj_get_int(args[ARG_pull].u_obj);
+        if (pull) {
+            mp_raise_ValueError("Pulls are not supported for this pin");
+        }
+    }
+
+    if (args[ARG_alt].u_int != GPIO_FUNC_SIO) {
+        mp_raise_ValueError("Alternate functions are not supported for this pin");
     }
-    mp_printf(print, "Pin(%u, mode=%q", self->id, mode_qst);
-    bool pull_up = false;
-    if (GPIO_IS_PULL_UP(self->id)) {
-        mp_printf(print, ", pull=%q", MP_QSTR_PULL_UP);
-        pull_up = true;
+
+    int value = -1;
+    if (args[ARG_value].u_obj != mp_const_none) {
+        value = mp_obj_is_true(args[ARG_value].u_obj);
     }
-    if (GPIO_IS_PULL_DOWN(self->id)) {
-        if (pull_up) {
-            mp_printf(print, "|%q", MP_QSTR_PULL_DOWN);
+
+    if (args[ARG_mode].u_obj != mp_const_none) {
+        mp_int_t mode = mp_obj_get_int(args[ARG_mode].u_obj);
+        if (mode == GPIO_MODE_IN) {
+            if (self->is_output) {
+                // todo need to disable output
+            }
+            self->is_output = false;
+        } else if (mode == GPIO_MODE_OUT) {
+            if (!self->is_output) {
+                // todo need to enable output
+                // for now we just set the value
+                if (value == -1) {
+                    value = self->last_output_value;
+                }
+                self->last_output_value = !self->last_output_value; // defeat shortcircuit
+                update_cyw43_value(self, value);
+                self->is_output = true;
+            }
         } else {
-            mp_printf(print, ", pull=%q", MP_QSTR_PULL_DOWN);
+            mp_raise_ValueError("only Pin.OUT and Pin.IN are supported for this pin");
         }
     }
-    if (funcsel != GPIO_FUNC_SIO) {
-        mp_printf(print, ", alt=%u", funcsel);
+
+    if (value != -1) {
+        if (self->is_output) {
+            update_cyw43_value(self, value);
+        } else {
+            // figure if you pass a value to IN it should still remember it (this is what regular GPIO does)
+            self->last_output_value = value;
+        }
     }
-    mp_printf(print, ")");
+
+    return mp_const_none;
 }
+#endif
 
-// pin.init(mode, pull=None, *, value=None, alt=FUNC_SIO)
 STATIC mp_obj_t machine_pin_obj_init_helper(const machine_pin_obj_t *self, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
-    enum { ARG_mode, ARG_pull, ARG_value, ARG_alt };
-    static const mp_arg_t allowed_args[] = {
-        { MP_QSTR_mode, MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE}},
-        { MP_QSTR_pull, MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE}},
-        { MP_QSTR_value, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE}},
-        { MP_QSTR_alt, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = GPIO_FUNC_SIO}},
-    };
 
     // parse args
     mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
@@ -216,7 +352,6 @@ STATIC mp_obj_t machine_pin_obj_init_helper(const machine_pin_obj_t *self, size_
         pull = mp_obj_get_int(args[ARG_pull].u_obj);
     }
     gpio_set_pulls(self->id, pull & GPIO_PULL_UP, pull & GPIO_PULL_DOWN);
-
     return mp_const_none;
 }
 
@@ -224,21 +359,57 @@ STATIC mp_obj_t machine_pin_obj_init_helper(const machine_pin_obj_t *self, size_
 mp_obj_t mp_pin_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
     mp_arg_check_num(n_args, n_kw, 1, MP_OBJ_FUN_ARGS_MAX, true);
 
-    // get the wanted pin object
-    int wanted_pin = mp_obj_get_int(args[0]);
-    if (!(0 <= wanted_pin && wanted_pin < MP_ARRAY_SIZE(machine_pin_obj))) {
-        mp_raise_ValueError("invalid pin");
-    }
-    const machine_pin_obj_t *self = &machine_pin_obj[wanted_pin];
 
+    const machine_pin_obj_t *self = NULL;
+    if (mp_obj_is_str(args[0])) {
+        const char *name = mp_obj_str_get_str(args[0]);
+        #if MICROPY_HW_PIN_ENABLE_LED_PIN
+        if (!strcmp(name, LED_PIN_NAME)) {
+            self = led_pin_obj;
+        }
+        #endif
+        #if MICROPY_HW_PIN_CYW43_COUNT
+        static_assert(MICROPY_HW_PIN_CYW43_COUNT < 10, ""); // makes parsing name easy!
+        if (!self && !strncmp(name, CYW43_PIN_NAME_PREFIX, strlen(CYW43_PIN_NAME_PREFIX)) && strlen(name) == strlen(CYW43_PIN_NAME_PREFIX) + 1) {
+            int num = name[strlen(CYW43_PIN_NAME_PREFIX)] - '0';
+            if (num < MICROPY_HW_PIN_CYW43_COUNT) {
+                self = &cyw43_pin_obj[num];
+            }
+        }
+        #endif
+        if (!self) {
+            mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("Unknown named pin \"%s\""), name);
+        }
+    }
+    if (!self) {
+        // get the wanted pin object
+        int wanted_pin = mp_obj_get_int(args[0]);
+        if (!(0 <= wanted_pin && wanted_pin < MP_ARRAY_SIZE(machine_pin_obj))) {
+            mp_raise_ValueError("invalid pin");
+        }
+        self = &machine_pin_obj[wanted_pin];
+    }
+    // note we have different init args based on the type of pin. so Pin("LED", Pin.OUT) may not always make sense
+    if (!is_cyw43_pin(self)) {
+        if (n_args > 1 || n_kw > 0) {
+            // pin mode given, so configure this GPIO
+            mp_map_t kw_args;
+            mp_map_init_fixed_table(&kw_args, n_kw, args + n_args);
+            machine_pin_obj_init_helper(self, n_args - 1, args + 1, &kw_args);
+        }
+        return MP_OBJ_FROM_PTR(self);
+    }
+    #if MICROPY_HW_PIN_CYW43_COUNT
     if (n_args > 1 || n_kw > 0) {
         // pin mode given, so configure this GPIO
         mp_map_t kw_args;
         mp_map_init_fixed_table(&kw_args, n_kw, args + n_args);
-        machine_pin_obj_init_helper(self, n_args - 1, args + 1, &kw_args);
+        // The regular Pins are const, but the CYW43 pins are mutable.
+        machine_pin_obj_t *mutable_self = (machine_pin_obj_t *)self;
+        machine_pin_cyw43_obj_init_helper(mutable_self, n_args - 1, args + 1, &kw_args);
     }
-
     return MP_OBJ_FROM_PTR(self);
+    #endif
 }
 
 // fast method for getting/setting pin value
@@ -247,23 +418,39 @@ STATIC mp_obj_t machine_pin_call(mp_obj_t self_in, size_t n_args, size_t n_kw, c
     machine_pin_obj_t *self = self_in;
     if (n_args == 0) {
         // get pin
-        return MP_OBJ_NEW_SMALL_INT(gpio_get(self->id));
+        if (!is_cyw43_pin(self)) {
+            return MP_OBJ_NEW_SMALL_INT(gpio_get(self->id));
+        }
+        #if MICROPY_HW_PIN_CYW43_COUNT
+        return MP_OBJ_NEW_SMALL_INT(get_cyw43_value(self));
+        #endif
     } else {
         // set pin
         bool value = mp_obj_is_true(args[0]);
-        if (GPIO_IS_OPEN_DRAIN(self->id)) {
-            MP_STATIC_ASSERT(GPIO_IN == 0 && GPIO_OUT == 1);
-            gpio_set_dir(self->id, 1 - value);
-        } else {
-            gpio_put(self->id, value);
+        if (!is_cyw43_pin(self)) {
+            if (GPIO_IS_OPEN_DRAIN(self->id)) {
+                MP_STATIC_ASSERT(GPIO_IN == 0 && GPIO_OUT == 1);
+                gpio_set_dir(self->id, 1 - value);
+            } else {
+                gpio_put(self->id, value);
+            }
+            return mp_const_none;
         }
-        return mp_const_none;
+        #if MICROPY_HW_PIN_CYW43_COUNT
+        update_cyw43_value(self, value);
+        #endif
     }
+    return mp_const_none;
 }
 
 // pin.init(mode, pull)
 STATIC mp_obj_t machine_pin_obj_init(size_t n_args, const mp_obj_t *args, mp_map_t *kw_args) {
-    return machine_pin_obj_init_helper(args[0], n_args - 1, args + 1, kw_args);
+    if (!is_cyw43_pin(args[0])) {
+        return machine_pin_obj_init_helper(args[0], n_args - 1, args + 1, kw_args);
+    }
+    #if MICROPY_HW_PIN_CYW43_COUNT
+    return machine_pin_cyw43_obj_init_helper(args[0], n_args - 1, args + 1, kw_args);
+    #endif
 }
 MP_DEFINE_CONST_FUN_OBJ_KW(machine_pin_init_obj, 1, machine_pin_obj_init);
 
@@ -276,40 +463,59 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_pin_value_obj, 1, 2, machine_
 // pin.low()
 STATIC mp_obj_t machine_pin_low(mp_obj_t self_in) {
     machine_pin_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    if (GPIO_IS_OPEN_DRAIN(self->id)) {
-        gpio_set_dir(self->id, GPIO_OUT);
-    } else {
-        gpio_clr_mask(1u << self->id);
+    if (!is_cyw43_pin(self)) {
+        if (GPIO_IS_OPEN_DRAIN(self->id)) {
+            gpio_set_dir(self->id, GPIO_OUT);
+        } else {
+            gpio_clr_mask(1u << self->id);
+        }
+        return mp_const_none;
     }
+    #if MICROPY_HW_PIN_CYW43_COUNT
+    update_cyw43_value(self, 0);
     return mp_const_none;
+    #endif
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_pin_low_obj, machine_pin_low);
 
 // pin.high()
 STATIC mp_obj_t machine_pin_high(mp_obj_t self_in) {
     machine_pin_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    if (GPIO_IS_OPEN_DRAIN(self->id)) {
-        gpio_set_dir(self->id, GPIO_IN);
-    } else {
-        gpio_set_mask(1u << self->id);
+    if (!is_cyw43_pin(self)) {
+        if (GPIO_IS_OPEN_DRAIN(self->id)) {
+            gpio_set_dir(self->id, GPIO_IN);
+        } else {
+            gpio_set_mask(1u << self->id);
+        }
+        return mp_const_none;
     }
+    #if MICROPY_HW_PIN_CYW43_COUNT
+    update_cyw43_value(self, 1);
     return mp_const_none;
+    #endif
 }
+
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_pin_high_obj, machine_pin_high);
 
 // pin.toggle()
 STATIC mp_obj_t machine_pin_toggle(mp_obj_t self_in) {
     machine_pin_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    if (GPIO_IS_OPEN_DRAIN(self->id)) {
-        if (GPIO_IS_OUT(self->id)) {
-            gpio_set_dir(self->id, GPIO_IN);
+    if (!is_cyw43_pin(self)) {
+        if (GPIO_IS_OPEN_DRAIN(self->id)) {
+            if (GPIO_IS_OUT(self->id)) {
+                gpio_set_dir(self->id, GPIO_IN);
+            } else {
+                gpio_set_dir(self->id, GPIO_OUT);
+            }
         } else {
-            gpio_set_dir(self->id, GPIO_OUT);
+            gpio_xor_mask(1u << self->id);
         }
-    } else {
-        gpio_xor_mask(1u << self->id);
+        return mp_const_none;
     }
+    #if MICROPY_HW_PIN_CYW43_COUNT
+    update_cyw43_value(self, self->last_output_value ^ 1);
     return mp_const_none;
+    #endif
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_pin_toggle_obj, machine_pin_toggle);
 
@@ -357,6 +563,10 @@ STATIC mp_obj_t machine_pin_irq(size_t n_args, const mp_obj_t *pos_args, mp_map_
         { MP_QSTR_hard, MP_ARG_BOOL, {.u_bool = false} },
     };
     machine_pin_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]);
+    if (is_cyw43_pin(self)) {
+        mp_raise_ValueError(MP_ERROR_TEXT("expecting a regular GPIO Pin"));
+    }
+
     mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
     mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
 
@@ -400,16 +610,31 @@ STATIC mp_uint_t pin_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_t arg, i
     (void)errcode;
     machine_pin_obj_t *self = self_in;
 
+    if (!is_cyw43_pin(self)) {
+        switch (request) {
+            case MP_PIN_READ: {
+                return gpio_get(self->id);
+            }
+            case MP_PIN_WRITE: {
+                gpio_put(self->id, arg);
+                return 0;
+            }
+        }
+        return -1;
+    }
+
+    #if MICROPY_HW_PIN_CYW43_COUNT
     switch (request) {
         case MP_PIN_READ: {
-            return gpio_get(self->id);
+            return get_cyw43_value(self);
         }
         case MP_PIN_WRITE: {
-            gpio_put(self->id, arg);
+            update_cyw43_value(self, arg);
             return 0;
         }
     }
     return -1;
+    #endif
 }
 
 STATIC const mp_pin_p_t pin_pin_p = {
@@ -457,5 +682,8 @@ mp_hal_pin_obj_t mp_hal_get_pin_obj(mp_obj_t obj) {
         mp_raise_ValueError(MP_ERROR_TEXT("expecting a Pin"));
     }
     machine_pin_obj_t *pin = MP_OBJ_TO_PTR(obj);
+    if (is_cyw43_pin(pin)) {
+        mp_raise_ValueError(MP_ERROR_TEXT("expecting a regular GPIO Pin"));
+    }
     return pin->id;
 }
diff --git a/ports/rp2/main.c b/ports/rp2/main.c
index da21e0b394793..664bb181094f7 100644
--- a/ports/rp2/main.c
+++ b/ports/rp2/main.c
@@ -46,12 +46,16 @@
 
 #include "pico/stdlib.h"
 #include "pico/binary_info.h"
+#include "pico/unique_id.h"
 #include "hardware/rtc.h"
 #include "hardware/structs/rosc.h"
 #if MICROPY_PY_LWIP
 #include "lwip/init.h"
 #include "lwip/apps/mdns.h"
 #endif
+#if MICROPY_PY_NETWORK_CYW43
+#include "lib/cyw43-driver/src/cyw43.h"
+#endif
 
 #ifndef MICROPY_GC_HEAP_SIZE
 #if MICROPY_PY_LWIP
@@ -90,6 +94,10 @@ int main(int argc, char **argv) {
     mp_thread_init();
     #endif
 
+    #ifndef NDEBUG
+    stdio_init_all();
+    #endif
+
     // Start and initialise the RTC
     datetime_t t = {
         .year = 2021,
@@ -118,6 +126,27 @@ int main(int argc, char **argv) {
     #endif
     #endif
 
+    #if MICROPY_PY_NETWORK_CYW43
+    {
+        cyw43_init(&cyw43_state);
+        cyw43_irq_init();
+        cyw43_post_poll_hook(); // enable the irq
+        uint8_t buf[8];
+        memcpy(&buf[0], "PICO", 4);
+
+        // MAC isn't loaded from OTP yet, so use unique id to generate the default AP ssid.
+        const char hexchr[16] = "0123456789ABCDEF";
+        pico_unique_board_id_t pid;
+        pico_get_unique_board_id(&pid);
+        buf[4] = hexchr[pid.id[7] >> 4];
+        buf[5] = hexchr[pid.id[6] & 0xf];
+        buf[6] = hexchr[pid.id[5] >> 4];
+        buf[7] = hexchr[pid.id[4] & 0xf];
+        cyw43_wifi_ap_set_ssid(&cyw43_state, 8, buf);
+        cyw43_wifi_ap_set_password(&cyw43_state, 8, (const uint8_t *)"picoW123");
+    }
+    #endif
+
     for (;;) {
 
         // Initialise MicroPython runtime.
diff --git a/ports/rp2/modrp2.c b/ports/rp2/modrp2.c
index 5dc066d651fc8..19c7ad6083a71 100644
--- a/ports/rp2/modrp2.c
+++ b/ports/rp2/modrp2.c
@@ -28,6 +28,28 @@
 #include "drivers/dht/dht.h"
 #include "modrp2.h"
 
+#if MICROPY_PY_NETWORK_CYW43
+#include "lib/cyw43-driver/src/cyw43_country.h"
+
+extern uint32_t cyw43_country_code;
+
+STATIC mp_obj_t rp2_country(size_t n_args, const mp_obj_t *args) {
+    if (n_args == 0) {
+        char code[2] = {cyw43_country_code, cyw43_country_code >> 8};
+        return mp_obj_new_str(code, 2);
+    } else {
+        size_t len;
+        const char *str = mp_obj_str_get_data(args[0], &len);
+        if (len != 2) {
+            mp_raise_ValueError(NULL);
+        }
+        cyw43_country_code = CYW43_COUNTRY(str[0], str[1], 0);
+        return mp_const_none;
+    }
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(rp2_country_obj, 0, 1, rp2_country);
+#endif
+
 STATIC const mp_rom_map_elem_t rp2_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__),            MP_ROM_QSTR(MP_QSTR_rp2) },
     { MP_ROM_QSTR(MP_QSTR_Flash),               MP_ROM_PTR(&rp2_flash_type) },
@@ -35,6 +57,10 @@ STATIC const mp_rom_map_elem_t rp2_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_StateMachine),        MP_ROM_PTR(&rp2_state_machine_type) },
 
     { MP_ROM_QSTR(MP_QSTR_dht_readinto),        MP_ROM_PTR(&dht_readinto_obj) },
+
+    #if MICROPY_PY_NETWORK_CYW43
+    { MP_ROM_QSTR(MP_QSTR_country), MP_ROM_PTR(&rp2_country_obj) },
+    #endif
 };
 STATIC MP_DEFINE_CONST_DICT(rp2_module_globals, rp2_module_globals_table);
 
diff --git a/ports/rp2/mpconfigport.h b/ports/rp2/mpconfigport.h
index 62388c6bcecd3..9143b5f6c5cbd 100644
--- a/ports/rp2/mpconfigport.h
+++ b/ports/rp2/mpconfigport.h
@@ -154,6 +154,20 @@ struct _mp_bluetooth_nimble_malloc_t;
 #define MICROPY_PORT_ROOT_POINTER_BLUETOOTH_NIMBLE
 #endif
 
+#if MICROPY_PY_NETWORK_CYW43
+extern const struct _mp_obj_type_t mp_network_cyw43_type;
+#define MICROPY_HW_NIC_CYW43 \
+    { MP_ROM_QSTR(MP_QSTR_WLAN), MP_ROM_PTR(&mp_network_cyw43_type) }, \
+    { MP_ROM_QSTR(MP_QSTR_STAT_IDLE), MP_ROM_INT(CYW43_LINK_DOWN) }, \
+    { MP_ROM_QSTR(MP_QSTR_STAT_CONNECTING), MP_ROM_INT(CYW43_LINK_JOIN) }, \
+    { MP_ROM_QSTR(MP_QSTR_STAT_WRONG_PASSWORD), MP_ROM_INT(CYW43_LINK_BADAUTH) }, \
+    { MP_ROM_QSTR(MP_QSTR_STAT_NO_AP_FOUND), MP_ROM_INT(CYW43_LINK_NONET) }, \
+    { MP_ROM_QSTR(MP_QSTR_STAT_CONNECT_FAIL), MP_ROM_INT(CYW43_LINK_FAIL) }, \
+    { MP_ROM_QSTR(MP_QSTR_STAT_GOT_IP), MP_ROM_INT(CYW43_LINK_UP) },
+#else
+#define MICROPY_HW_NIC_CYW43
+#endif
+
 #if MICROPY_PY_NETWORK_NINAW10
 // This Network interface requires the extended socket state.
 #ifndef MICROPY_PY_USOCKET_EXTENDED_STATE
@@ -184,6 +198,7 @@ extern const struct _mod_network_nic_type_t mod_network_nic_type_wiznet5k;
 #endif
 
 #define MICROPY_PORT_NETWORK_INTERFACES \
+    MICROPY_HW_NIC_CYW43 \
     MICROPY_HW_NIC_NINAW10  \
     MICROPY_HW_NIC_WIZNET5K \
     MICROPY_BOARD_NETWORK_INTERFACES \
@@ -258,3 +273,10 @@ typedef intptr_t mp_off_t;
 extern uint32_t rosc_random_u32(void);
 extern void lwip_lock_acquire(void);
 extern void lwip_lock_release(void);
+
+extern uint32_t cyw43_country_code;
+extern void cyw43_irq_init(void);
+extern void cyw43_post_poll_hook(void);
+
+#define CYW43_POST_POLL_HOOK cyw43_post_poll_hook();
+#define MICROPY_CYW43_COUNTRY cyw43_country_code
diff --git a/ports/rp2/mphalport.c b/ports/rp2/mphalport.c
index 4ed648de07514..aec4a967240f2 100644
--- a/ports/rp2/mphalport.c
+++ b/ports/rp2/mphalport.c
@@ -35,6 +35,10 @@
 #include "hardware/rtc.h"
 #include "pico/unique_id.h"
 
+#if MICROPY_PY_NETWORK_CYW43
+#include "lib/cyw43-driver/src/cyw43.h"
+#endif
+
 #if MICROPY_HW_ENABLE_UART_REPL || MICROPY_HW_ENABLE_USBDEV
 
 #ifndef MICROPY_HW_STDIN_BUFFER_LEN
@@ -168,6 +172,9 @@ uint64_t mp_hal_time_ns(void) {
 
 // Generate a random locally administered MAC address (LAA)
 void mp_hal_generate_laa_mac(int idx, uint8_t buf[6]) {
+    #ifndef NDEBUG
+    printf("Warning: No MAC in OTP, generating MAC from board id\n");
+    #endif
     pico_unique_board_id_t pid;
     pico_get_unique_board_id(&pid);
     buf[0] = 0x02; // LAA range
@@ -180,5 +187,21 @@ void mp_hal_generate_laa_mac(int idx, uint8_t buf[6]) {
 
 // A board can override this if needed
 MP_WEAK void mp_hal_get_mac(int idx, uint8_t buf[6]) {
+    #if MICROPY_PY_NETWORK_CYW43
+    // The mac should come from cyw43 otp when CYW43_USE_OTP_MAC is defined
+    // This is loaded into the state after the driver is initialised
+    // cyw43_hal_generate_laa_mac is only called by the driver to generate a mac if otp is not set
+    memcpy(buf, cyw43_state.mac, 6);
+    #else
     mp_hal_generate_laa_mac(idx, buf);
+    #endif
+}
+
+void mp_hal_get_mac_ascii(int idx, size_t chr_off, size_t chr_len, char *dest) {
+    static const char hexchr[16] = "0123456789ABCDEF";
+    uint8_t mac[6];
+    mp_hal_get_mac(idx, mac);
+    for (; chr_len; ++chr_off, --chr_len) {
+        *dest++ = hexchr[mac[chr_off >> 1] >> (4 * (1 - (chr_off & 1))) & 0xf];
+    }
 }
diff --git a/ports/rp2/mphalport.h b/ports/rp2/mphalport.h
index 88eef1308dcd6..88683d9360a4e 100644
--- a/ports/rp2/mphalport.h
+++ b/ports/rp2/mphalport.h
@@ -30,6 +30,7 @@
 #include "pico/time.h"
 #include "hardware/clocks.h"
 #include "hardware/structs/systick.h"
+#include "RP2040.h" // cmsis, for __WFI
 
 #define SYSTICK_MAX (0xffffff)
 
@@ -74,6 +75,11 @@ static inline mp_uint_t mp_hal_get_cpu_freq(void) {
 
 #define MP_HAL_PIN_FMT "%u"
 #define mp_hal_pin_obj_t uint
+#define MP_HAL_PIN_MODE_INPUT           (GPIO_IN)
+#define MP_HAL_PIN_MODE_OUTPUT          (GPIO_OUT)
+#define MP_HAL_PIN_PULL_NONE            (0)
+#define MP_HAL_PIN_PULL_UP              (1)
+#define MP_HAL_PIN_PULL_DOWN            (2)
 
 extern uint32_t machine_pin_open_drain_mask;
 
@@ -102,6 +108,12 @@ static inline void mp_hal_pin_open_drain(mp_hal_pin_obj_t pin) {
     machine_pin_open_drain_mask |= 1 << pin;
 }
 
+static inline void mp_hal_pin_config(mp_hal_pin_obj_t pin, uint32_t mode, uint32_t pull, uint32_t alt) {
+    assert((mode == MP_HAL_PIN_MODE_INPUT || mode == MP_HAL_PIN_MODE_OUTPUT) && alt == 0);
+    gpio_set_dir(pin, mode);
+    gpio_set_pulls(pin, pull == MP_HAL_PIN_PULL_UP, pull == MP_HAL_PIN_PULL_DOWN);
+}
+
 static inline int mp_hal_pin_read(mp_hal_pin_obj_t pin) {
     return gpio_get(pin);
 }
@@ -143,6 +155,7 @@ enum {
 };
 
 void mp_hal_get_mac(int idx, uint8_t buf[6]);
+void mp_hal_get_mac_ascii(int idx, size_t chr_off, size_t chr_len, char *dest);
 void mp_hal_generate_laa_mac(int idx, uint8_t buf[6]);
 
 #endif // MICROPY_INCLUDED_RP2_MPHALPORT_H
diff --git a/ports/rp2/mpnetworkport.c b/ports/rp2/mpnetworkport.c
index 2b01b62192d0c..0cd6eb14ceb3e 100644
--- a/ports/rp2/mpnetworkport.c
+++ b/ports/rp2/mpnetworkport.c
@@ -38,6 +38,41 @@
 
 static alarm_id_t lwip_alarm_id = -1;
 
+#if MICROPY_PY_NETWORK_CYW43
+#include "lib/cyw43-driver/src/cyw43.h"
+#include "lib/cyw43-driver/src/cyw43_country.h"
+#include "lib/cyw43-driver/src/cyw43_stats.h"
+#include "hardware/irq.h"
+
+#define CYW43_IRQ_LEVEL GPIO_IRQ_LEVEL_HIGH
+#define CYW43_SHARED_IRQ_HANDLER_PRIORITY PICO_SHARED_IRQ_HANDLER_HIGHEST_ORDER_PRIORITY
+
+uint32_t cyw43_country_code = CYW43_COUNTRY_WORLDWIDE;
+
+static void gpio_irq_handler(void) {
+    uint32_t events = gpio_get_irq_event_mask(CYW43_PIN_WL_HOST_WAKE);
+    if (events & CYW43_IRQ_LEVEL) {
+        // As we use a high level interrupt, it will go off forever until it's serviced.
+        // So disable the interrupt until this is done.  It's re-enabled again by
+        // CYW43_POST_POLL_HOOK which is called at the end of cyw43_poll_func.
+        gpio_set_irq_enabled(CYW43_PIN_WL_HOST_WAKE, CYW43_IRQ_LEVEL, false);
+        pendsv_schedule_dispatch(PENDSV_DISPATCH_CYW43, cyw43_poll);
+        CYW43_STAT_INC(IRQ_COUNT);
+    }
+}
+
+void cyw43_irq_init(void) {
+    gpio_add_raw_irq_handler_with_order_priority(IO_IRQ_BANK0, gpio_irq_handler, CYW43_SHARED_IRQ_HANDLER_PRIORITY);
+    irq_set_enabled(IO_IRQ_BANK0, true);
+    NVIC_SetPriority(PendSV_IRQn, PICO_LOWEST_IRQ_PRIORITY);
+}
+
+void cyw43_post_poll_hook(void) {
+    gpio_set_irq_enabled(CYW43_PIN_WL_HOST_WAKE, CYW43_IRQ_LEVEL, true);
+}
+
+#endif
+
 #if MICROPY_PY_NETWORK_WIZNET5K
 void wiznet5k_poll(void);
 void wiznet5k_deinit(void);
diff --git a/ports/rp2/pendsv.c b/ports/rp2/pendsv.c
index 006303d46fbf6..91b133c069232 100644
--- a/ports/rp2/pendsv.c
+++ b/ports/rp2/pendsv.c
@@ -28,6 +28,10 @@
 #include "pendsv.h"
 #include "RP2040.h"
 
+#if MICROPY_PY_NETWORK_CYW43
+#include "lib/cyw43-driver/src/cyw43_stats.h"
+#endif
+
 static pendsv_dispatch_t pendsv_dispatch_table[PENDSV_DISPATCH_NUM_SLOTS];
 static int pendsv_lock;
 
@@ -54,12 +58,21 @@ void pendsv_schedule_dispatch(size_t slot, pendsv_dispatch_t f) {
     pendsv_dispatch_table[slot] = f;
     if (pendsv_lock == 0) {
         SCB->ICSR = SCB_ICSR_PENDSVSET_Msk;
+    } else {
+        #if MICROPY_PY_NETWORK_CYW43
+        CYW43_STAT_INC(PENDSV_DISABLED_COUNT);
+        #endif
     }
 }
 
 // PendSV interrupt handler to perform background processing.
 void PendSV_Handler(void) {
     assert(pendsv_lock == 0);
+
+    #if MICROPY_PY_NETWORK_CYW43
+    CYW43_STAT_INC(PENDSV_RUN_COUNT);
+    #endif
+
     for (size_t i = 0; i < PENDSV_DISPATCH_NUM_SLOTS; ++i) {
         if (pendsv_dispatch_table[i] != NULL) {
             pendsv_dispatch_t f = pendsv_dispatch_table[i];
diff --git a/ports/rp2/pendsv.h b/ports/rp2/pendsv.h
index 7bb43208ab8ad..1da3d22e53fdd 100644
--- a/ports/rp2/pendsv.h
+++ b/ports/rp2/pendsv.h
@@ -32,6 +32,9 @@ enum {
     #if MICROPY_PY_LWIP
     PENDSV_DISPATCH_LWIP,
     #endif
+    #if MICROPY_PY_NETWORK_CYW43
+    PENDSV_DISPATCH_CYW43,
+    #endif
     #if MICROPY_PY_NETWORK_WIZNET5K
     PENDSV_DISPATCH_WIZNET,
     #endif
diff --git a/ports/rp2/rp2_pio.c b/ports/rp2/rp2_pio.c
index fe09ebe249e5f..9955cc544042f 100644
--- a/ports/rp2/rp2_pio.c
+++ b/ports/rp2/rp2_pio.c
@@ -103,8 +103,13 @@ STATIC void pio1_irq0(void) {
 
 void rp2_pio_init(void) {
     // Reset all PIO instruction memory.
+    #if MICROPY_PY_NETWORK_CYW43
+    // TODO: cannot reset PIO memory when CYW43 driver is enabled and active
+    // because it uses a PIO for the bus interface.
+    #else
     pio_clear_instruction_memory(pio0);
     pio_clear_instruction_memory(pio1);
+    #endif
 
     // Set up interrupts.
     memset(MP_STATE_PORT(rp2_pio_irq_obj), 0, sizeof(MP_STATE_PORT(rp2_pio_irq_obj)));

From 99c25897783122003550d58f8d31b4a8fecc8611 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 30 Jun 2022 16:01:25 +1000
Subject: [PATCH 2288/3533] rp2/boards/PICO_W: Add new Pico W board, an RP2040
 with WiFi.

Work done in collaboration with Graham Sanderson and Peter Harper.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/rp2/boards/PICO_W/board.json          | 21 +++++++++++++++++
 ports/rp2/boards/PICO_W/manifest.py         |  7 ++++++
 ports/rp2/boards/PICO_W/mpconfigboard.cmake |  8 +++++++
 ports/rp2/boards/PICO_W/mpconfigboard.h     | 26 +++++++++++++++++++++
 4 files changed, 62 insertions(+)
 create mode 100644 ports/rp2/boards/PICO_W/board.json
 create mode 100644 ports/rp2/boards/PICO_W/manifest.py
 create mode 100644 ports/rp2/boards/PICO_W/mpconfigboard.cmake
 create mode 100644 ports/rp2/boards/PICO_W/mpconfigboard.h

diff --git a/ports/rp2/boards/PICO_W/board.json b/ports/rp2/boards/PICO_W/board.json
new file mode 100644
index 0000000000000..755ba1037011e
--- /dev/null
+++ b/ports/rp2/boards/PICO_W/board.json
@@ -0,0 +1,21 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [
+        "Breadboard friendly",
+        "Castellated Pads",
+        "Micro USB",
+        "WiFi"
+    ],
+    "id": "rp2-pico-w",
+    "images": [
+        "rp2-pico-w.jpg"
+    ],
+    "mcu": "rp2040",
+    "product": "Pico W",
+    "thumbnail": "",
+    "url": "https://www.raspberrypi.com/products/raspberry-pi-pico/",
+    "vendor": "Raspberry Pi"
+}
diff --git a/ports/rp2/boards/PICO_W/manifest.py b/ports/rp2/boards/PICO_W/manifest.py
new file mode 100644
index 0000000000000..1953d5cbd0693
--- /dev/null
+++ b/ports/rp2/boards/PICO_W/manifest.py
@@ -0,0 +1,7 @@
+include("../manifest.py")
+
+freeze("$(MPY_DIR)/tools", "upip.py")
+freeze("$(MPY_DIR)/tools", "upip_utarfile.py")
+
+if os.path.isdir(convert_path("$(MPY_LIB_DIR)")):
+    freeze("$(MPY_LIB_DIR)/python-ecosys/urequests", "urequests.py")
diff --git a/ports/rp2/boards/PICO_W/mpconfigboard.cmake b/ports/rp2/boards/PICO_W/mpconfigboard.cmake
new file mode 100644
index 0000000000000..d3fbce6993276
--- /dev/null
+++ b/ports/rp2/boards/PICO_W/mpconfigboard.cmake
@@ -0,0 +1,8 @@
+# cmake file for Raspberry Pi Pico W
+set(MICROPY_BOARD PICO_W)
+
+set(MICROPY_PY_LWIP ON)
+set(MICROPY_PY_NETWORK_CYW43 ON)
+
+# Board specific version of the frozen manifest
+set(MICROPY_FROZEN_MANIFEST ${CMAKE_SOURCE_DIR}/boards/PICO_W/manifest.py)
diff --git a/ports/rp2/boards/PICO_W/mpconfigboard.h b/ports/rp2/boards/PICO_W/mpconfigboard.h
new file mode 100644
index 0000000000000..f467234fbea5b
--- /dev/null
+++ b/ports/rp2/boards/PICO_W/mpconfigboard.h
@@ -0,0 +1,26 @@
+// Board and hardware specific configuration
+#define MICROPY_HW_BOARD_NAME                   "Raspberry Pi Pico W"
+
+// todo: We need something to check our binary size
+#define MICROPY_HW_FLASH_STORAGE_BYTES          (848 * 1024)
+
+#define MICROPY_PY_NETWORK 1
+#define MICROPY_PY_USOCKET 1
+#define MICROPY_PY_USSL 1
+
+// CYW43 driver configuration.
+#define CYW43_USE_SPI (1)
+#define CYW43_LWIP (1)
+#define CYW43_GPIO (1)
+#define CYW43_SPI_PIO (1)
+
+// For debugging mbedtls - also set
+// Debug level (0-4) 1=warning, 2=info, 3=debug, 4=verbose
+// #define MODUSSL_MBEDTLS_DEBUG_LEVEL 1
+
+#define MICROPY_HW_PIN_CYW43_COUNT CYW43_WL_GPIO_COUNT
+#ifdef CYW43_WL_GPIO_LED_PIN
+#define MICROPY_HW_PIN_CYW43_LED_PIN_NUM CYW43_WL_GPIO_LED_PIN
+#endif
+
+#define MICROPY_HW_PIN_RESERVED(i) ((i) == CYW43_PIN_WL_HOST_WAKE || (i) == CYW43_PIN_WL_REG_ON)

From 6519b1b95e44e471cb6a8ac60c31bfac482f0e5a Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Fri, 1 Jul 2022 09:57:13 +1000
Subject: [PATCH 2289/3533] stm32/Makefile: Fix setting of define that enables
 WIZNET5K driver.

Commit 9670a156dabc1c751a6b02ef280daccf5a0ed213 missed one renaming of
MICROPY_PY_WIZNET5K to MICROPY_PY_NETWORK_WIZNET5K which prevented the
Wiznet interface from being enabled.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/stm32/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/stm32/Makefile b/ports/stm32/Makefile
index 53d1bb4ac47d6..f1c22c2a9a19a 100644
--- a/ports/stm32/Makefile
+++ b/ports/stm32/Makefile
@@ -459,7 +459,7 @@ endif
 ifneq ($(MICROPY_PY_NETWORK_WIZNET5K),0)
 WIZNET5K_DIR=drivers/wiznet5k
 INC += -I$(TOP)/$(WIZNET5K_DIR)
-CFLAGS_MOD += -DMICROPY_PY_WIZNET5K=$(MICROPY_PY_NETWORK_WIZNET5K) -D_WIZCHIP_=$(MICROPY_PY_NETWORK_WIZNET5K)
+CFLAGS_MOD += -DMICROPY_PY_NETWORK_WIZNET5K=$(MICROPY_PY_NETWORK_WIZNET5K) -D_WIZCHIP_=$(MICROPY_PY_NETWORK_WIZNET5K)
 ifeq ($(MICROPY_PY_LWIP),1)
 # When using MACRAW mode (with lwIP), maximum buffer space must be used for the raw socket
 CFLAGS_MOD += -DWIZCHIP_USE_MAX_BUFFER

From 3d76292f37ee099ecf460ed0620360fb87a21fdc Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 5 Jul 2022 09:45:44 +1000
Subject: [PATCH 2290/3533] rp2/boards/GARATRONIC_PYBSTICK26_RP2040: Change
 pico-sdk board name.

This follows a similar renaming in pico-sdk.

Signed-off-by: Damien George <damien@micropython.org>
---
 .../rp2/boards/GARATRONIC_PYBSTICK26_RP2040/mpconfigboard.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/rp2/boards/GARATRONIC_PYBSTICK26_RP2040/mpconfigboard.cmake b/ports/rp2/boards/GARATRONIC_PYBSTICK26_RP2040/mpconfigboard.cmake
index 9add51a78b430..311e114b2914e 100644
--- a/ports/rp2/boards/GARATRONIC_PYBSTICK26_RP2040/mpconfigboard.cmake
+++ b/ports/rp2/boards/GARATRONIC_PYBSTICK26_RP2040/mpconfigboard.cmake
@@ -1,3 +1,3 @@
 # cmake file
 
-set(PICO_BOARD pybstick26_rp2040)
+set(PICO_BOARD garatronic_pybstick26_rp2040)

From f4e69ab103a650a0737537b3899130089f152ed4 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 5 Jul 2022 11:04:20 +1000
Subject: [PATCH 2291/3533] lib/cyw43-driver: Update cyw43-driver to fix
 ap_auth mode setting.

Signed-off-by: Damien George <damien@micropython.org>
---
 lib/cyw43-driver | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/cyw43-driver b/lib/cyw43-driver
index 195dfcc10bb6f..5614e2750e019 160000
--- a/lib/cyw43-driver
+++ b/lib/cyw43-driver
@@ -1 +1 @@
-Subproject commit 195dfcc10bb6f379e3dea45147590db2203d3c7b
+Subproject commit 5614e2750e019b0ffa14a50e3c92045b952e2634

From d660a0c3d13a5354c8cb10cff90988cff75a33bb Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 5 Jul 2022 11:05:13 +1000
Subject: [PATCH 2292/3533] extmod/network_cyw43: Add "security" config option
 to get/set auth mode.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/network_cyw43.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/extmod/network_cyw43.c b/extmod/network_cyw43.c
index 8823e3fa255ac..c131fbb109ee5 100644
--- a/extmod/network_cyw43.c
+++ b/extmod/network_cyw43.c
@@ -365,6 +365,11 @@ STATIC mp_obj_t network_cyw43_config(size_t n_args, const mp_obj_t *args, mp_map
                     return mp_obj_new_str((const char *)buf, len);
                 }
             }
+            #if MICROPY_PY_NETWORK_CYW43_USE_LIB_DRIVER
+            case MP_QSTR_security: {
+                return MP_OBJ_NEW_SMALL_INT(cyw43_wifi_ap_get_auth(self->cyw));
+            }
+            #endif
             case MP_QSTR_mac: {
                 uint8_t buf[6];
                 cyw43_wifi_get_mac(self->cyw, self->itf, buf);
@@ -421,6 +426,10 @@ STATIC mp_obj_t network_cyw43_config(size_t n_args, const mp_obj_t *args, mp_map
                         }
                         break;
                     }
+                    case MP_QSTR_security: {
+                        cyw43_wifi_ap_set_auth(self->cyw, mp_obj_get_int(e->value));
+                        break;
+                    }
                     case MP_QSTR_key:
                     case MP_QSTR_password: {
                         size_t len;

From 4b9a2abbdec0e905fbc08f247513e43fb6bff39e Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 5 Jul 2022 11:07:16 +1000
Subject: [PATCH 2293/3533] rp2/main: Set default AP auth mode to WPA2_AES_PSK.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/rp2/main.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/rp2/main.c b/ports/rp2/main.c
index 664bb181094f7..d976464de1cc5 100644
--- a/ports/rp2/main.c
+++ b/ports/rp2/main.c
@@ -143,6 +143,7 @@ int main(int argc, char **argv) {
         buf[6] = hexchr[pid.id[5] >> 4];
         buf[7] = hexchr[pid.id[4] & 0xf];
         cyw43_wifi_ap_set_ssid(&cyw43_state, 8, buf);
+        cyw43_wifi_ap_set_auth(&cyw43_state, CYW43_AUTH_WPA2_AES_PSK);
         cyw43_wifi_ap_set_password(&cyw43_state, 8, (const uint8_t *)"picoW123");
     }
     #endif

From 85be3d3da889af76219c8bbfff041e8a4faab0c8 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 5 Jul 2022 16:11:42 +1000
Subject: [PATCH 2294/3533] rp2/mpconfigport: Factor core event handling to
 EVENT_POLL_HOOK_FAST.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/rp2/mpconfigport.h | 9 +++++++--
 ports/rp2/mphalport.c    | 3 +--
 ports/rp2/rp2_pio.c      | 6 ++----
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/ports/rp2/mpconfigport.h b/ports/rp2/mpconfigport.h
index 9143b5f6c5cbd..53437d6c98e96 100644
--- a/ports/rp2/mpconfigport.h
+++ b/ports/rp2/mpconfigport.h
@@ -248,12 +248,17 @@ extern const struct _mod_network_nic_type_t mod_network_nic_type_wiznet5k;
 #define MICROPY_HW_USBDEV_TASK_HOOK
 #endif
 
-#define MICROPY_EVENT_POLL_HOOK \
+#define MICROPY_EVENT_POLL_HOOK_FAST \
     do { \
+        MICROPY_HW_USBDEV_TASK_HOOK \
         extern void mp_handle_pending(bool); \
         mp_handle_pending(true); \
+    } while (0)
+
+#define MICROPY_EVENT_POLL_HOOK \
+    do { \
+        MICROPY_EVENT_POLL_HOOK_FAST; \
         best_effort_wfe_or_timeout(make_timeout_time_ms(1)); \
-        MICROPY_HW_USBDEV_TASK_HOOK \
     } while (0);
 
 #define MICROPY_MAKE_POINTER_CALLABLE(p) ((void *)((mp_uint_t)(p) | 1))
diff --git a/ports/rp2/mphalport.c b/ports/rp2/mphalport.c
index aec4a967240f2..d3824d8f917cd 100644
--- a/ports/rp2/mphalport.c
+++ b/ports/rp2/mphalport.c
@@ -157,9 +157,8 @@ void mp_hal_stdout_tx_strn(const char *str, mp_uint_t len) {
 void mp_hal_delay_ms(mp_uint_t ms) {
     absolute_time_t t = make_timeout_time_ms(ms);
     while (!time_reached(t)) {
-        mp_handle_pending(true);
+        MICROPY_EVENT_POLL_HOOK_FAST;
         best_effort_wfe_or_timeout(t);
-        MICROPY_HW_USBDEV_TASK_HOOK
     }
 }
 
diff --git a/ports/rp2/rp2_pio.c b/ports/rp2/rp2_pio.c
index 9955cc544042f..99006169665ad 100644
--- a/ports/rp2/rp2_pio.c
+++ b/ports/rp2/rp2_pio.c
@@ -657,8 +657,7 @@ STATIC mp_obj_t rp2_state_machine_get(size_t n_args, const mp_obj_t *args) {
     for (;;) {
         while (pio_sm_is_rx_fifo_empty(self->pio, self->sm)) {
             // This delay must be fast.
-            mp_handle_pending(true);
-            MICROPY_HW_USBDEV_TASK_HOOK
+            MICROPY_EVENT_POLL_HOOK_FAST;
         }
         uint32_t value = pio_sm_get(self->pio, self->sm) >> shift;
         if (dest == NULL) {
@@ -716,8 +715,7 @@ STATIC mp_obj_t rp2_state_machine_put(size_t n_args, const mp_obj_t *args) {
         }
         while (pio_sm_is_tx_fifo_full(self->pio, self->sm)) {
             // This delay must be fast.
-            mp_handle_pending(true);
-            MICROPY_HW_USBDEV_TASK_HOOK
+            MICROPY_EVENT_POLL_HOOK_FAST;
         }
         pio_sm_put(self->pio, self->sm, value << shift);
     }

From 651b3704845bff116334993d2a4752d78d23a068 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Mon, 4 Jul 2022 11:14:47 +1000
Subject: [PATCH 2295/3533] rp2/Makefile: Regenerate cmake if generated
 Makefile missing.

`CMakeCache.txt` can exist even if cmake failed. Use `Makefile` instead.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/rp2/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/rp2/Makefile b/ports/rp2/Makefile
index 87c1d650e0977..6f8c621c2a4a0 100644
--- a/ports/rp2/Makefile
+++ b/ports/rp2/Makefile
@@ -23,7 +23,7 @@ CMAKE_ARGS += -DCMAKE_BUILD_TYPE=Debug
 endif
 
 all:
-	[ -e $(BUILD)/CMakeCache.txt ] || cmake -S . -B $(BUILD) -DPICO_BUILD_DOCS=0 ${CMAKE_ARGS}
+	[ -e $(BUILD)/Makefile ] || cmake -S . -B $(BUILD) -DPICO_BUILD_DOCS=0 ${CMAKE_ARGS}
 	$(MAKE) $(MAKESILENT) -C $(BUILD)
 
 clean:

From 5f4143dd40ceb120db3edd3e4446f01b4240313d Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Mon, 4 Jul 2022 11:16:20 +1000
Subject: [PATCH 2296/3533] rp2/CMakeLists: Give error if required submodules
 are missing.

Ensure that nimble and cyw43-driver are initialised when the board requires
it.  Also make these work with `make submodules`.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/rp2/CMakeLists.txt | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/ports/rp2/CMakeLists.txt b/ports/rp2/CMakeLists.txt
index 9185c7d649989..198512f885f9b 100644
--- a/ports/rp2/CMakeLists.txt
+++ b/ports/rp2/CMakeLists.txt
@@ -206,6 +206,11 @@ if(MICROPY_PY_BLUETOOTH)
 endif()
 
 if(MICROPY_BLUETOOTH_NIMBLE)
+    string(CONCAT GIT_SUBMODULES "${GIT_SUBMODULES} " lib/mynewt-nimble)
+    if(NOT (${ECHO_SUBMODULES}) AND NOT EXISTS ${MICROPY_DIR}/lib/mynewt-nimble/nimble/host/include/host/ble_hs.h)
+        message(FATAL_ERROR " mynewt-nimble not initialized.\n Run 'make BOARD=${MICROPY_BOARD} submodules'")
+    endif()
+
     list(APPEND MICROPY_SOURCE_PORT mpnimbleport.c)
     target_compile_definitions(${MICROPY_TARGET} PRIVATE
         MICROPY_BLUETOOTH_NIMBLE=1
@@ -223,6 +228,9 @@ endif()
 
 if (MICROPY_PY_NETWORK_CYW43)
     string(CONCAT GIT_SUBMODULES "${GIT_SUBMODULES} " lib/cyw43-driver)
+    if((NOT (${ECHO_SUBMODULES})) AND NOT EXISTS ${MICROPY_DIR}/lib/cyw43-driver/src/cyw43.h)
+        message(FATAL_ERROR " cyw43-driver not initialized.\n Run 'make BOARD=${MICROPY_BOARD} submodules'")
+    endif()
 
     target_compile_definitions(${MICROPY_TARGET} PRIVATE
         MICROPY_PY_NETWORK_CYW43=1

From 11ef618bbc8b7d9afba5e8ab85e82e2a7b9326b6 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Mon, 4 Jul 2022 11:21:58 +1000
Subject: [PATCH 2297/3533] rp2/CMakeLists: Don't override cyw43-driver unless
 necessary.

This supresses a warning from pico-sdk when the board isn't using this
driver.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/rp2/CMakeLists.txt | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/ports/rp2/CMakeLists.txt b/ports/rp2/CMakeLists.txt
index 198512f885f9b..6314bfb44ddda 100644
--- a/ports/rp2/CMakeLists.txt
+++ b/ports/rp2/CMakeLists.txt
@@ -16,8 +16,6 @@ endif()
 
 # Use the local tinyusb instead of the one in pico-sdk
 set(PICO_TINYUSB_PATH ${MICROPY_DIR}/lib/tinyusb)
-# Use the local cyw43_driver instead of the one in pico-sdk
-set(PICO_CYW43_DRIVER_PATH ${MICROPY_DIR}/lib/cyw43-driver)
 # Use the local lwip instead of the one in pico-sdk
 set(PICO_LWIP_PATH ${MICROPY_DIR}/lib/lwip)
 
@@ -51,6 +49,11 @@ endif()
 # A board may also have enabled additional components.
 set(MICROPY_SSL_MBEDTLS ON)
 
+# Use the local cyw43_driver instead of the one in pico-sdk
+if (MICROPY_PY_NETWORK_CYW43)
+    set(PICO_CYW43_DRIVER_PATH ${MICROPY_DIR}/lib/cyw43-driver)
+endif()
+
 # Include component cmake fragments
 include(${MICROPY_DIR}/py/py.cmake)
 include(${MICROPY_DIR}/extmod/extmod.cmake)

From 2efaebc8995d1d73dd6f0d3af448b385b0fa38c8 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Mon, 4 Jul 2022 11:35:16 +1000
Subject: [PATCH 2298/3533] rp2/boards/ARDUINO_NANO_RP2040_CONNECT: Add
 urequests module.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/manifest.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/manifest.py b/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/manifest.py
index 1becb3dfe1186..0448aa89a11e4 100644
--- a/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/manifest.py
+++ b/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/manifest.py
@@ -8,3 +8,5 @@
     l2cap=True,
     security=True,
 )
+if os.path.isdir(convert_path("$(MPY_LIB_DIR)")):
+    freeze("$(MPY_LIB_DIR)/python-ecosys/urequests", "urequests.py")

From 1ea82b6dcc7dd5f0ad051db414ff91d8f04d20e0 Mon Sep 17 00:00:00 2001
From: IhorNehrutsa <Ihor.Nehrutsa@gmail.com>
Date: Tue, 28 Jun 2022 16:38:45 +0300
Subject: [PATCH 2299/3533] esp32,esp8266: Rename WLAN dhcp_hostname config to
 hostname.

But retain old name for backwards compatibility.
---
 docs/library/network.WLAN.rst | 2 +-
 ports/esp32/network_wlan.c    | 2 ++
 ports/esp8266/modnetwork.c    | 2 ++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/docs/library/network.WLAN.rst b/docs/library/network.WLAN.rst
index bc416d1c2edde..c673194700e59 100644
--- a/docs/library/network.WLAN.rst
+++ b/docs/library/network.WLAN.rst
@@ -130,7 +130,7 @@ Methods
    hidden         Whether SSID is hidden (boolean)
    security       Security protocol supported (enumeration, see module constants)
    key            Access key (string)
-   dhcp_hostname  The DHCP hostname to use
+   hostname       The hostname that will be sent to DHCP (STA interfaces) and mDNS (if supported, both STA and AP)
    reconnects     Number of reconnect attempts to make (integer, 0=none, -1=unlimited)
    txpower        Maximum transmit power in dBm (integer or float)
    =============  ===========
diff --git a/ports/esp32/network_wlan.c b/ports/esp32/network_wlan.c
index 48b398c8f023d..9b2200e4ff9ce 100644
--- a/ports/esp32/network_wlan.c
+++ b/ports/esp32/network_wlan.c
@@ -452,6 +452,7 @@ STATIC mp_obj_t network_wlan_config(size_t n_args, const mp_obj_t *args, mp_map_
                         cfg.ap.channel = mp_obj_get_int(kwargs->table[i].value);
                         break;
                     }
+                    case MP_QSTR_hostname:
                     case MP_QSTR_dhcp_hostname: {
                         const char *s = mp_obj_str_get_str(kwargs->table[i].value);
                         esp_exceptions(tcpip_adapter_set_hostname(self->if_id, s));
@@ -538,6 +539,7 @@ STATIC mp_obj_t network_wlan_config(size_t n_args, const mp_obj_t *args, mp_map_
             req_if = WIFI_IF_AP;
             val = MP_OBJ_NEW_SMALL_INT(cfg.ap.channel);
             break;
+        case MP_QSTR_hostname:
         case MP_QSTR_dhcp_hostname: {
             const char *s;
             esp_exceptions(tcpip_adapter_get_hostname(self->if_id, &s));
diff --git a/ports/esp8266/modnetwork.c b/ports/esp8266/modnetwork.c
index e32a0ff0c9176..dbc12f74d4ae9 100644
--- a/ports/esp8266/modnetwork.c
+++ b/ports/esp8266/modnetwork.c
@@ -397,6 +397,7 @@ STATIC mp_obj_t esp_config(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs
                         cfg.ap.channel = mp_obj_get_int(kwargs->table[i].value);
                         break;
                     }
+                    case MP_QSTR_hostname:
                     case MP_QSTR_dhcp_hostname: {
                         req_if = STATION_IF;
                         if (self->if_id == STATION_IF) {
@@ -461,6 +462,7 @@ STATIC mp_obj_t esp_config(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs
             req_if = SOFTAP_IF;
             val = MP_OBJ_NEW_SMALL_INT(cfg.ap.channel);
             break;
+        case MP_QSTR_hostname:
         case MP_QSTR_dhcp_hostname: {
             req_if = STATION_IF;
             char *s = wifi_station_get_hostname();

From 5ab7dfe6db96e3cc7f9358b30eb04b27411fcb07 Mon Sep 17 00:00:00 2001
From: David Lechner <david@pybricks.com>
Date: Thu, 30 Jun 2022 19:02:18 -0500
Subject: [PATCH 2300/3533] unix/moduos: Include errno.h.

The file `ports/unix/moduos.c` uses `errno` so it needs to include
`errno.h`, otherwise a compiler error can occur.

Signed-off-by: David Lechner <david@pybricks.com>
---
 ports/unix/moduos.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/unix/moduos.c b/ports/unix/moduos.c
index 848a3612d115d..b577dbd297f71 100644
--- a/ports/unix/moduos.c
+++ b/ports/unix/moduos.c
@@ -25,6 +25,7 @@
  * THE SOFTWARE.
  */
 
+#include <errno.h>
 #include <stdlib.h>
 #include <string.h>
 

From d27e58449b6b0b50ac1e0c78cb9fb189a190c666 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 5 Jul 2022 23:47:54 +1000
Subject: [PATCH 2301/3533] stm32/mboot: Remove redundant code in
 mboot_state_change function.

This code was made redundant in 87fbceef2649b15d40cc8aaf4e5957af537ce9af

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/mboot/mboot.h | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/ports/stm32/mboot/mboot.h b/ports/stm32/mboot/mboot.h
index d45f4c1efd156..d86fe57303fbd 100644
--- a/ports/stm32/mboot/mboot.h
+++ b/ports/stm32/mboot/mboot.h
@@ -209,11 +209,7 @@ int mboot_get_reset_mode_default(void);
 void mboot_state_change_default(mboot_state_t state, uint32_t arg);
 
 static inline void mboot_state_change(mboot_state_t state, uint32_t arg) {
-    #if defined(MBOOT_BOARD_STATE_CHANGE)
     return MBOOT_BOARD_STATE_CHANGE(state, arg);
-    #else
-    return mboot_state_change_default(state, arg);
-    #endif
 }
 
 #endif // MICROPY_INCLUDED_STM32_MBOOT_MBOOT_H

From 07cae9178fd409e8269d55d0b614612a7db49bef Mon Sep 17 00:00:00 2001
From: David Lechner <david@pybricks.com>
Date: Sat, 2 Jul 2022 14:42:16 -0500
Subject: [PATCH 2302/3533] nrf/Makefile: Drop unused MPY_CROSS and MPY_TOOL
 variables.

These variables are no longer used in the nrf Makefile and can be removed.

Signed-off-by: David Lechner <david@pybricks.com>
---
 ports/nrf/Makefile | 2 --
 1 file changed, 2 deletions(-)

diff --git a/ports/nrf/Makefile b/ports/nrf/Makefile
index d022892641309..47653ae716831 100644
--- a/ports/nrf/Makefile
+++ b/ports/nrf/Makefile
@@ -61,8 +61,6 @@ include ../../extmod/extmod.mk
 GIT_SUBMODULES = lib/nrfx lib/tinyusb
 
 MICROPY_VFS_FAT ?= 0
-MPY_CROSS = ../../mpy-cross/mpy-cross
-MPY_TOOL = ../../tools/mpy-tool.py
 
 CROSS_COMPILE ?= arm-none-eabi-
 

From fc6d989f8cca61b33715fcf2e8f1eaa0d0ed67ec Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Tue, 5 Jul 2022 22:13:17 +0200
Subject: [PATCH 2303/3533] drivers/hts221: Add HTS221 humidity sensor driver.

---
 drivers/hts221/hts221.py | 91 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 91 insertions(+)
 create mode 100644 drivers/hts221/hts221.py

diff --git a/drivers/hts221/hts221.py b/drivers/hts221/hts221.py
new file mode 100644
index 0000000000000..fec52a7389a98
--- /dev/null
+++ b/drivers/hts221/hts221.py
@@ -0,0 +1,91 @@
+"""
+The MIT License (MIT)
+
+Copyright (c) 2013-2022 Ibrahim Abdelkader <iabdalkader@openmv.io>
+Copyright (c) 2013-2022 Kwabena W. Agyeman <kwagyeman@openmv.io>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+HTS221 driver driver for MicroPython.
+Original source: https://github.com/ControlEverythingCommunity/HTS221/blob/master/Python/HTS221.py
+
+Example usage:
+
+import time
+import hts221
+from machine import Pin, I2C
+
+bus = I2C(1, scl=Pin(15), sda=Pin(14))
+hts = hts221.HTS221(bus)
+
+while (True):
+    rH   = hts.humidity()
+    temp = hts.temperature()
+    print ("rH: %.2f%% T: %.2fC" %(rH, temp))
+    time.sleep_ms(100)
+"""
+
+import struct
+
+
+class HTS221:
+    def __init__(self, i2c, data_rate=1, address=0x5F):
+        self.bus = i2c
+        self.odr = data_rate
+        self.slv_addr = address
+
+        # Set configuration register
+        # Humidity and temperature average configuration
+        self.bus.writeto_mem(self.slv_addr, 0x10, b"\x1B")
+
+        # Set control register
+        # PD | BDU | ODR
+        cfg = 0x80 | 0x04 | (self.odr & 0x3)
+        self.bus.writeto_mem(self.slv_addr, 0x20, bytes([cfg]))
+
+        # Read Calibration values from non-volatile memory of the device
+        # Humidity Calibration values
+        self.H0 = self._read_reg(0x30, 1) / 2
+        self.H1 = self._read_reg(0x31, 1) / 2
+        self.H2 = self._read_reg(0x36, 2)
+        self.H3 = self._read_reg(0x3A, 2)
+
+        # Temperature Calibration values
+        raw = self._read_reg(0x35, 1)
+        self.T0 = ((raw & 0x03) * 256) + self._read_reg(0x32, 1)
+        self.T1 = ((raw & 0x0C) * 64) + self._read_reg(0x33, 1)
+        self.T2 = self._read_reg(0x3C, 2)
+        self.T3 = self._read_reg(0x3E, 2)
+
+    def _read_reg(self, reg_addr, size):
+        fmt = "B" if size == 1 else "H"
+        reg_addr = reg_addr if size == 1 else reg_addr | 0x80
+        return struct.unpack(fmt, self.bus.readfrom_mem(self.slv_addr, reg_addr, size))[0]
+
+    def humidity(self):
+        rH = self._read_reg(0x28, 2)
+        return (self.H1 - self.H0) * (rH - self.H2) / (self.H3 - self.H2) + self.H0
+
+    def temperature(self):
+        temp = self._read_reg(0x2A, 2)
+        if temp > 32767:
+            temp -= 65536
+        return ((self.T1 - self.T0) / 8.0) * (temp - self.T2) / (self.T3 - self.T2) + (
+            self.T0 / 8.0
+        )

From 6c07e9eb2701b617534c0a74647b2d1e0c4eff9e Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Tue, 5 Jul 2022 22:14:10 +0200
Subject: [PATCH 2304/3533] drivers/lsm9ds1: Add LSM9DS1 IMU driver.

---
 drivers/lsm9ds1/lsm9ds1.py | 189 +++++++++++++++++++++++++++++++++++++
 1 file changed, 189 insertions(+)
 create mode 100644 drivers/lsm9ds1/lsm9ds1.py

diff --git a/drivers/lsm9ds1/lsm9ds1.py b/drivers/lsm9ds1/lsm9ds1.py
new file mode 100644
index 0000000000000..5d9942a7b3469
--- /dev/null
+++ b/drivers/lsm9ds1/lsm9ds1.py
@@ -0,0 +1,189 @@
+"""
+The MIT License (MIT)
+
+Copyright (c) 2013, 2014 Damien P. George
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+
+LSM9DS1 - 9DOF inertial sensor of STMicro driver for MicroPython.
+The sensor contains an accelerometer / gyroscope / magnetometer
+Uses the internal FIFO to store up to 16 gyro/accel data, use the iter_accel_gyro generator to access it.
+
+Example usage:
+
+import time
+from lsm9ds1 import LSM9DS1
+from machine import Pin, I2C
+
+lsm = LSM9DS1(I2C(1, scl=Pin(15), sda=Pin(14)))
+
+while (True):
+    #for g,a in lsm.iter_accel_gyro(): print(g,a)    # using fifo
+    print('Accelerometer: x:{:>8.3f} y:{:>8.3f} z:{:>8.3f}'.format(*lsm.accel()))
+    print('Magnetometer:  x:{:>8.3f} y:{:>8.3f} z:{:>8.3f}'.format(*lsm.magnet()))
+    print('Gyroscope:     x:{:>8.3f} y:{:>8.3f} z:{:>8.3f}'.format(*lsm.gyro()))
+    print("")
+    time.sleep_ms(100)
+"""
+import array
+
+
+_WHO_AM_I = const(0xF)
+_CTRL_REG1_G = const(0x10)
+_INT_GEN_SRC_G = const(0x14)
+_OUT_TEMP = const(0x15)
+_OUT_G = const(0x18)
+_CTRL_REG4_G = const(0x1E)
+_STATUS_REG = const(0x27)
+_OUT_XL = const(0x28)
+_FIFO_CTRL_REG = const(0x2E)
+_FIFO_SRC = const(0x2F)
+_OFFSET_REG_X_M = const(0x05)
+_CTRL_REG1_M = const(0x20)
+_OUT_M = const(0x28)
+_SCALE_GYRO = const(((245, 0), (500, 1), (2000, 3)))
+_SCALE_ACCEL = const(((2, 0), (4, 2), (8, 3), (16, 1)))
+
+
+class LSM9DS1:
+    def __init__(self, i2c, address_gyro=0x6B, address_magnet=0x1E):
+        self.i2c = i2c
+        self.address_gyro = address_gyro
+        self.address_magnet = address_magnet
+        # check id's of accelerometer/gyro and magnetometer
+        if (self.magent_id() != b"=") or (self.gyro_id() != b"h"):
+            raise OSError(
+                "Invalid LSM9DS1 device, using address {}/{}".format(address_gyro, address_magnet)
+            )
+        # allocate scratch buffer for efficient conversions and memread op's
+        self.scratch = array.array("B", [0, 0, 0, 0, 0, 0])
+        self.scratch_int = array.array("h", [0, 0, 0])
+        self.init_gyro_accel()
+        self.init_magnetometer()
+
+    def init_gyro_accel(self, sample_rate=6, scale_gyro=0, scale_accel=0):
+        """Initalizes Gyro and Accelerator.
+        sample rate: 0-6 (off, 14.9Hz, 59.5Hz, 119Hz, 238Hz, 476Hz, 952Hz)
+        scale_gyro: 0-2 (245dps, 500dps, 2000dps )
+        scale_accel: 0-3 (+/-2g, +/-4g, +/-8g, +-16g)
+        """
+        assert sample_rate <= 6, "invalid sampling rate: %d" % sample_rate
+        assert scale_gyro <= 2, "invalid gyro scaling: %d" % scale_gyro
+        assert scale_accel <= 3, "invalid accelerometer scaling: %d" % scale_accel
+
+        i2c = self.i2c
+        addr = self.address_gyro
+        mv = memoryview(self.scratch)
+        # angular control registers 1-3 / Orientation
+        mv[0] = ((sample_rate & 0x07) << 5) | ((_SCALE_GYRO[scale_gyro][1] & 0x3) << 3)
+        mv[1:4] = b"\x00\x00\x00"
+        i2c.writeto_mem(addr, _CTRL_REG1_G, mv[:5])
+        # ctrl4 - enable x,y,z, outputs, no irq latching, no 4D
+        # ctrl5 - enable all axes, no decimation
+        # ctrl6 - set scaling and sample rate of accel
+        # ctrl7,8 - leave at default values
+        # ctrl9 - FIFO enabled
+        mv[0] = mv[1] = 0x38
+        mv[2] = ((sample_rate & 7) << 5) | ((_SCALE_ACCEL[scale_accel][1] & 0x3) << 3)
+        mv[3] = 0x00
+        mv[4] = 0x4
+        mv[5] = 0x2
+        i2c.writeto_mem(addr, _CTRL_REG4_G, mv[:6])
+
+        # fifo: use continous mode (overwrite old data if overflow)
+        i2c.writeto_mem(addr, _FIFO_CTRL_REG, b"\x00")
+        i2c.writeto_mem(addr, _FIFO_CTRL_REG, b"\xc0")
+
+        self.scale_gyro = 32768 / _SCALE_GYRO[scale_gyro][0]
+        self.scale_accel = 32768 / _SCALE_ACCEL[scale_accel][0]
+
+    def init_magnetometer(self, sample_rate=7, scale_magnet=0):
+        """
+        sample rates = 0-7 (0.625, 1.25, 2.5, 5, 10, 20, 40, 80Hz)
+        scaling = 0-3 (+/-4, +/-8, +/-12, +/-16 Gauss)
+        """
+        assert sample_rate < 8, "invalid sample rate: %d (0-7)" % sample_rate
+        assert scale_magnet < 4, "invalid scaling: %d (0-3)" % scale_magnet
+        i2c = self.i2c
+        addr = self.address_magnet
+        mv = memoryview(self.scratch)
+        mv[0] = 0x40 | (sample_rate << 2)  # ctrl1: high performance mode
+        mv[1] = scale_magnet << 5  # ctrl2: scale, normal mode, no reset
+        mv[2] = 0x00  # ctrl3: continous conversion, no low power, I2C
+        mv[3] = 0x08  # ctrl4: high performance z-axis
+        mv[4] = 0x00  # ctr5: no fast read, no block update
+        i2c.writeto_mem(addr, _CTRL_REG1_M, mv[:5])
+        self.scale_factor_magnet = 32768 / ((scale_magnet + 1) * 4)
+
+    def calibrate_magnet(self, offset):
+        """
+        offset is a magnet vecor that will be substracted by the magnetometer
+        for each measurement. It is written to the magnetometer's offset register
+        """
+        offset = [int(i * self.scale_factor_magnet) for i in offset]
+        mv = memoryview(self.scratch)
+        mv[0] = offset[0] & 0xFF
+        mv[1] = offset[0] >> 8
+        mv[2] = offset[1] & 0xFF
+        mv[3] = offset[1] >> 8
+        mv[4] = offset[2] & 0xFF
+        mv[5] = offset[2] >> 8
+        self.i2c.writeto_mem(self.address_magnet, _OFFSET_REG_X_M, mv[:6])
+
+    def gyro_id(self):
+        return self.i2c.readfrom_mem(self.address_gyro, _WHO_AM_I, 1)
+
+    def magent_id(self):
+        return self.i2c.readfrom_mem(self.address_magnet, _WHO_AM_I, 1)
+
+    def magnet(self):
+        """Returns magnetometer vector in gauss.
+        raw_values: if True, the non-scaled adc values are returned
+        """
+        mv = memoryview(self.scratch_int)
+        f = self.scale_factor_magnet
+        self.i2c.readfrom_mem_into(self.address_magnet, _OUT_M | 0x80, mv)
+        return (mv[0] / f, mv[1] / f, mv[2] / f)
+
+    def gyro(self):
+        """Returns gyroscope vector in degrees/sec."""
+        mv = memoryview(self.scratch_int)
+        f = self.scale_gyro
+        self.i2c.readfrom_mem_into(self.address_gyro, _OUT_G | 0x80, mv)
+        return (mv[0] / f, mv[1] / f, mv[2] / f)
+
+    def accel(self):
+        """Returns acceleration vector in gravity units (9.81m/s^2)."""
+        mv = memoryview(self.scratch_int)
+        f = self.scale_accel
+        self.i2c.readfrom_mem_into(self.address_gyro, _OUT_XL | 0x80, mv)
+        return (mv[0] / f, mv[1] / f, mv[2] / f)
+
+    def iter_accel_gyro(self):
+        """A generator that returns tuples of (gyro,accelerometer) data from the fifo."""
+        while True:
+            fifo_state = int.from_bytes(
+                self.i2c.readfrom_mem(self.address_gyro, _FIFO_SRC, 1), "big"
+            )
+            if fifo_state & 0x3F:
+                # print("Available samples=%d" % (fifo_state & 0x1f))
+                yield self.gyro(), self.accel()
+            else:
+                break

From 7d32b770f284bebe388629b62623262245b6b185 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Tue, 5 Jul 2022 22:14:48 +0200
Subject: [PATCH 2305/3533] drivers/lps22h: Add LPS22HB/HH pressure sensor
 driver.

---
 drivers/lps22h/lps22h.py | 117 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 117 insertions(+)
 create mode 100644 drivers/lps22h/lps22h.py

diff --git a/drivers/lps22h/lps22h.py b/drivers/lps22h/lps22h.py
new file mode 100644
index 0000000000000..8d90b29178677
--- /dev/null
+++ b/drivers/lps22h/lps22h.py
@@ -0,0 +1,117 @@
+"""
+The MIT License (MIT)
+
+Copyright (c) 2016-2019 shaoziyang <shaoziyang@micropython.org.cn>
+Copyright (c) 2022 Ibrahim Abdelkader <iabdalkader@openmv.io>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+LPS22HB/HH pressure sensor driver for MicroPython.
+
+Example usage:
+
+import time
+from lps22h import LPS22H
+from machine import Pin, I2C
+
+bus = I2C(1, scl=Pin(15), sda=Pin(14))
+lps = LPS22H(bus, oneshot=False)
+
+while (True):
+    print("Pressure: %.2f hPa Temperature: %.2f C"%(lps.pressure(), lps.temperature()))
+    time.sleep_ms(10)
+"""
+import machine
+
+_LPS22_CTRL_REG1 = const(0x10)
+_LPS22_CTRL_REG2 = const(0x11)
+_LPS22_STATUS = const(0x27)
+_LPS22_TEMP_OUT_L = const(0x2B)
+_LPS22_PRESS_OUT_XL = const(0x28)
+_LPS22_PRESS_OUT_L = const(0x29)
+
+
+class LPS22H:
+    def __init__(self, i2c, address=0x5C, oneshot=False):
+        self.i2c = i2c
+        self.addr = address
+        self.oneshot = oneshot
+        self.buf = bytearray(1)
+
+        if hasattr(machine, "idle"):
+            self._go_idle = machine.idle()
+        else:
+            import time
+
+            self._go_idle = lambda: time.sleep_ms(1)
+
+        # ODR=1 EN_LPFP=1 BDU=1
+        self._write_reg(_LPS22_CTRL_REG1, 0x1A)
+        self.set_oneshot_mode(self.oneshot)
+
+    def _int16(self, d):
+        return d if d < 0x8000 else d - 0x10000
+
+    def _write_reg(self, reg, dat):
+        self.buf[0] = dat
+        self.i2c.writeto_mem(self.addr, reg, self.buf)
+
+    def _read_reg(self, reg, width=8):
+        self.i2c.readfrom_mem_into(self.addr, reg, self.buf)
+        val = self.buf[0]
+        if width == 16:
+            val |= self._read_reg(reg + 1) << 8
+        return val
+
+    def _tigger_oneshot(self, b):
+        if self.oneshot:
+            self._write_reg(_LPS22_CTRL_REG2, self._read_reg(_LPS22_CTRL_REG2) | 0x01)
+            self._read_reg(0x28 + b * 2)
+            while True:
+                if self._read_reg(_LPS22_STATUS) & b:
+                    return
+                self._go_idle()
+
+    def set_oneshot_mode(self, oneshot):
+        self._read_reg(_LPS22_CTRL_REG1)
+        self.oneshot = oneshot
+        if oneshot:
+            self.buf[0] &= 0x0F
+        else:
+            self.buf[0] |= 0x10
+        self._write_reg(_LPS22_CTRL_REG1, self.buf[0])
+
+    def pressure(self):
+        if self.oneshot:
+            self._tigger_oneshot(1)
+        return (
+            self._read_reg(_LPS22_PRESS_OUT_XL) + self._read_reg(_LPS22_PRESS_OUT_L, 16) * 256
+        ) / 4096
+
+    def temperature(self):
+        if self.oneshot:
+            self._tigger_oneshot(2)
+        return self._int16(self._read_reg(_LPS22_TEMP_OUT_L, 16)) / 100
+
+    def altitude(self):
+        return (
+            (((1013.25 / self.pressure()) ** (1 / 5.257)) - 1.0)
+            * (self.temperature() + 273.15)
+            / 0.0065
+        )

From 5c31a6c0235b25dd2199825e378f4e18f8db1bc0 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Thu, 21 Apr 2022 11:49:12 +0200
Subject: [PATCH 2306/3533] nrf/boards/arduino_nano_33_ble: Add Arduino Nano 33
 BLE sense board.

---
 .../boards/arduino_nano_33_ble_sense/board.c  | 67 +++++++++++++++++
 .../arduino_nano_33_ble_sense/board.json      | 25 +++++++
 .../arduino_nano_33_ble_sense/deploy.md       | 23 ++++++
 .../arduino_nano_33_ble_sense/manifest.py     |  4 +
 .../arduino_nano_33_ble_sense/mpconfigboard.h | 75 +++++++++++++++++++
 .../mpconfigboard.mk                          | 12 +++
 .../nano_bootloader.ld                        |  1 +
 .../boards/arduino_nano_33_ble_sense/pins.csv | 50 +++++++++++++
 8 files changed, 257 insertions(+)
 create mode 100644 ports/nrf/boards/arduino_nano_33_ble_sense/board.c
 create mode 100644 ports/nrf/boards/arduino_nano_33_ble_sense/board.json
 create mode 100644 ports/nrf/boards/arduino_nano_33_ble_sense/deploy.md
 create mode 100644 ports/nrf/boards/arduino_nano_33_ble_sense/manifest.py
 create mode 100644 ports/nrf/boards/arduino_nano_33_ble_sense/mpconfigboard.h
 create mode 100644 ports/nrf/boards/arduino_nano_33_ble_sense/mpconfigboard.mk
 create mode 100644 ports/nrf/boards/arduino_nano_33_ble_sense/nano_bootloader.ld
 create mode 100644 ports/nrf/boards/arduino_nano_33_ble_sense/pins.csv

diff --git a/ports/nrf/boards/arduino_nano_33_ble_sense/board.c b/ports/nrf/boards/arduino_nano_33_ble_sense/board.c
new file mode 100644
index 0000000000000..954639756bc27
--- /dev/null
+++ b/ports/nrf/boards/arduino_nano_33_ble_sense/board.c
@@ -0,0 +1,67 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2022 Arduino SA
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "nrf.h"
+#include "nrf_gpio.h"
+#include "nrf_rtc.h"
+
+#define PIN_ENABLE_SENSORS_3V3     (22u)
+#define PIN_ENABLE_I2C_PULLUP      (32u)
+#define DFU_MAGIC_SERIAL_ONLY_RESET (0xb0)
+
+void NANO33_board_early_init(void) {
+    // Errata Nano33BLE - I2C pullup is on SWO line, need to disable TRACE
+    // was being enabled by nrfx_clock_anomaly_132
+    CoreDebug->DEMCR = 0;
+    NRF_CLOCK->TRACECONFIG = 0;
+
+    // Bootloader enables interrupt on COMPARE[0], which we don't handle
+    // Disable it here to avoid getting stuck when OVERFLOW irq is triggered
+    nrf_rtc_event_disable(NRF_RTC1, NRF_RTC_INT_COMPARE0_MASK);
+    nrf_rtc_int_disable(NRF_RTC1, NRF_RTC_INT_COMPARE0_MASK);
+
+    // Always enable I2C pullup and power on startup
+    // Change for maximum powersave
+    nrf_gpio_cfg_output(PIN_ENABLE_SENSORS_3V3);
+    nrf_gpio_cfg_output(PIN_ENABLE_I2C_PULLUP);
+
+    nrf_gpio_pin_set(PIN_ENABLE_SENSORS_3V3);
+    nrf_gpio_pin_set(PIN_ENABLE_I2C_PULLUP);
+}
+
+void NANO33_board_deinit(void) {
+    nrf_gpio_cfg_output(PIN_ENABLE_SENSORS_3V3);
+    nrf_gpio_cfg_output(PIN_ENABLE_I2C_PULLUP);
+
+    nrf_gpio_pin_clear(PIN_ENABLE_SENSORS_3V3);
+    nrf_gpio_pin_clear(PIN_ENABLE_I2C_PULLUP);
+}
+
+void NANO33_board_enter_bootloader(void) {
+    __disable_irq();
+    NRF_POWER->GPREGRET = DFU_MAGIC_SERIAL_ONLY_RESET;
+    NVIC_SystemReset();
+}
diff --git a/ports/nrf/boards/arduino_nano_33_ble_sense/board.json b/ports/nrf/boards/arduino_nano_33_ble_sense/board.json
new file mode 100644
index 0000000000000..9488c75f8419e
--- /dev/null
+++ b/ports/nrf/boards/arduino_nano_33_ble_sense/board.json
@@ -0,0 +1,25 @@
+{
+    "deploy": [
+        "./deploy.md"
+    ],
+    "docs": "",
+    "features": [
+        "Bluetooth 5.0",
+        "IMU LSM9DS1",
+        "Humidity sensor HTS221",
+        "Pressure sensor LPS22H",
+        "Proximity, Light, RGB sensor APDS-9960",
+        "Microphone MPM3610",
+        "Crypto IC ARM CC310",
+        "USB-MICRO",
+        "Breadboard Friendly"
+    ],
+    "images": [
+        "ABX00031_01.iso_998x749.jpg"
+    ],
+    "mcu": "nRF52840",
+    "product": "Arduino Nano 33 BLE Sense",
+    "thumbnail": "",
+    "url": "https://store.arduino.cc/products/arduino-nano-33-ble-sense",
+    "vendor": "Arduino"
+}
diff --git a/ports/nrf/boards/arduino_nano_33_ble_sense/deploy.md b/ports/nrf/boards/arduino_nano_33_ble_sense/deploy.md
new file mode 100644
index 0000000000000..a2d08f2c81328
--- /dev/null
+++ b/ports/nrf/boards/arduino_nano_33_ble_sense/deploy.md
@@ -0,0 +1,23 @@
+### Update the bootloader
+
+Before deploying any firmware, make sure you have the updated Arduino Nano 33 BLE bootloader, which relocates the bootloader so the softdevice doesn't overwrite it. Please see:
+
+https://docs.arduino.cc/tutorials/nano-33-ble/getting-started-omv
+
+### Via Arduino bootloader and BOSSA
+
+Download BOSSA from https://github.com/shumatech/BOSSA/ and double tap reset button to enter the Arduino bootloader
+
+```bash
+bossac -e -w --offset=0x16000 --port=ttyACM0 -i -d -U -R build-arduino_nano_33_ble_sense-s140/firmware.bin
+```
+
+Alternatively, a Linux binary can be found here: https://github.com/openmv/openmv/blob/master/tools/bossac
+
+### Via nrfprog
+
+This board can also be programmed via nrfjprog (with Jlink for example), from MicroPython source repository:
+
+```bash
+make -j8 BOARD=arduino_nano_33_ble_sense SD=s140 deploy
+```
diff --git a/ports/nrf/boards/arduino_nano_33_ble_sense/manifest.py b/ports/nrf/boards/arduino_nano_33_ble_sense/manifest.py
new file mode 100644
index 0000000000000..dbc8104dc24fc
--- /dev/null
+++ b/ports/nrf/boards/arduino_nano_33_ble_sense/manifest.py
@@ -0,0 +1,4 @@
+include("$(PORT_DIR)/modules/manifest.py")
+freeze("$(MPY_DIR)/drivers/hts221", "hts221.py")
+freeze("$(MPY_DIR)/drivers/lps22h", "lps22h.py")
+freeze("$(MPY_DIR)/drivers/lsm9ds1", "lsm9ds1.py")
diff --git a/ports/nrf/boards/arduino_nano_33_ble_sense/mpconfigboard.h b/ports/nrf/boards/arduino_nano_33_ble_sense/mpconfigboard.h
new file mode 100644
index 0000000000000..4a16b6110bc9c
--- /dev/null
+++ b/ports/nrf/boards/arduino_nano_33_ble_sense/mpconfigboard.h
@@ -0,0 +1,75 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ * The MIT License (MIT)
+ * Copyright (c) 2022 Arduino SA
+ */
+
+#define MICROPY_HW_BOARD_NAME           "Arduino Nano 33 BLE Sense"
+#define MICROPY_HW_MCU_NAME             "NRF52840"
+
+#define MICROPY_MBFS                    (1)
+
+#define MICROPY_BOARD_EARLY_INIT        NANO33_board_early_init
+#define MICROPY_BOARD_DEINIT            NANO33_board_deinit
+#define MICROPY_BOARD_ENTER_BOOTLOADER(nargs, args) NANO33_board_enter_bootloader()
+
+#define MICROPY_PY_MACHINE_UART         (1)
+#define MICROPY_PY_MACHINE_HW_PWM       (1)
+#define MICROPY_PY_MACHINE_HW_SPI       (1)
+#define MICROPY_PY_MACHINE_TIMER        (1)
+#define MICROPY_PY_MACHINE_RTCOUNTER    (1)
+#define MICROPY_PY_MACHINE_I2C          (1)
+#define MICROPY_PY_MACHINE_ADC          (1)
+#define MICROPY_PY_MACHINE_TEMP         (1)
+
+#define MICROPY_HW_USB_CDC              (1)
+#define MICROPY_HW_HAS_LED              (1)
+#define MICROPY_HW_HAS_SWITCH           (0)
+#define MICROPY_HW_HAS_FLASH            (0)
+#define MICROPY_HW_HAS_SDCARD           (0)
+#define MICROPY_HW_HAS_MMA7660          (0)
+#define MICROPY_HW_HAS_LIS3DSH          (0)
+#define MICROPY_HW_HAS_LCD              (0)
+#define MICROPY_HW_ENABLE_RNG           (1)
+#define MICROPY_HW_ENABLE_RTC           (1)
+#define MICROPY_HW_ENABLE_TIMER         (0)
+#define MICROPY_HW_ENABLE_SERVO         (0)
+#define MICROPY_HW_ENABLE_DAC           (0)
+#define MICROPY_HW_ENABLE_CAN           (0)
+
+// LEDs config
+#define MICROPY_HW_LED_COUNT            (4)     // 3 RGB + 1 Yellow
+#define MICROPY_HW_LED_PULLUP           (1)     // RGB LED is active low
+#define MICROPY_HW_LED4_PULLUP          (0)     // Yellow is active high
+#define MICROPY_HW_LED1                 (24)    // RED
+#define MICROPY_HW_LED2                 (16)    // GREEN
+#define MICROPY_HW_LED3                 (6)     // BLUE
+#define MICROPY_HW_LED4                 (13)    // Yellow
+#define HELP_TEXT_BOARD_LED             "1,2,3,4"
+
+// UART config
+#define MICROPY_HW_UART1_TX             (32 + 3)
+#define MICROPY_HW_UART1_RX             (32 + 10)
+// #define MICROPY_HW_UART1_CTS            (7)
+// #define MICROPY_HW_UART1_RTS            (5)
+// #define MICROPY_HW_UART1_HWFC           (1)
+
+// SPI0 config
+#define MICROPY_HW_SPI0_NAME            "SPI0"
+#define MICROPY_HW_SPI0_SCK             (13)
+#define MICROPY_HW_SPI0_MOSI            (32 + 1)
+#define MICROPY_HW_SPI0_MISO            (32 + 8)
+
+// PWM config
+#define MICROPY_HW_PWM0_NAME            "PWM0"
+#define MICROPY_HW_PWM1_NAME            "PWM1"
+#define MICROPY_HW_PWM2_NAME            "PWM2"
+#define MICROPY_HW_PWM3_NAME            "PWM3"
+
+#define MICROPY_HW_USB_VID              (0x2341)
+#define MICROPY_HW_USB_PID              (0x025A)
+#define MICROPY_HW_USB_CDC_1200BPS_TOUCH (1)
+
+void NANO33_board_early_init(void);
+void NANO33_board_deinit(void);
+void NANO33_board_enter_bootloader(void);
diff --git a/ports/nrf/boards/arduino_nano_33_ble_sense/mpconfigboard.mk b/ports/nrf/boards/arduino_nano_33_ble_sense/mpconfigboard.mk
new file mode 100644
index 0000000000000..cb2ff5c6b81cd
--- /dev/null
+++ b/ports/nrf/boards/arduino_nano_33_ble_sense/mpconfigboard.mk
@@ -0,0 +1,12 @@
+MCU_SERIES = m4
+MCU_VARIANT = nrf52
+MCU_SUB_VARIANT = nrf52840
+SOFTDEV_VERSION = 6.1.1
+SD=s140
+
+LD_FILES += boards/arduino_nano_33_ble_sense/nano_bootloader.ld boards/nrf52840_1M_256k.ld
+
+NRF_DEFINES += -DNRF52840_XXAA
+
+MICROPY_VFS_LFS2 = 1
+FROZEN_MANIFEST ?= $(BOARD_DIR)/manifest.py
diff --git a/ports/nrf/boards/arduino_nano_33_ble_sense/nano_bootloader.ld b/ports/nrf/boards/arduino_nano_33_ble_sense/nano_bootloader.ld
new file mode 100644
index 0000000000000..209a1d447afb1
--- /dev/null
+++ b/ports/nrf/boards/arduino_nano_33_ble_sense/nano_bootloader.ld
@@ -0,0 +1 @@
+_flash_start = 0xe0000;
diff --git a/ports/nrf/boards/arduino_nano_33_ble_sense/pins.csv b/ports/nrf/boards/arduino_nano_33_ble_sense/pins.csv
new file mode 100644
index 0000000000000..9d931634f627d
--- /dev/null
+++ b/ports/nrf/boards/arduino_nano_33_ble_sense/pins.csv
@@ -0,0 +1,50 @@
+P0,P0
+P1,P1
+P2,P2,ADC0_IN0
+P3,P3,ADC0_IN1
+P4,P4,ADC0_IN2
+P5,P5,ADC0_IN3
+P6,P6
+P7,P7
+P8,P8
+P9,P9
+P10,P10
+P11,P11
+P12,P12
+P13,P13
+P14,P14
+P15,P15
+P16,P16
+P17,P17
+P18,P18
+P19,P19
+P20,P20
+P21,P21
+P22,P22
+P23,P23
+P24,P24
+P25,P25
+P26,P26
+P27,P27
+P28,P28,ADC0_IN4
+P29,P29,ADC0_IN5
+P30,P30,ADC0_IN6
+P31,P31,ADC0_IN7
+P32,P32
+P33,P33
+P34,P34
+P35,P35
+P36,P36
+P37,P37
+P38,P38
+P39,P39
+P40,P40
+P41,P41
+P42,P42
+P43,P43
+P44,P44
+P45,P45
+P46,P46
+P47,P47
+I2C_SCL,P2
+I2C_SDA,P31

From 6753c5331832e8741e416f9c13e1abb9dbbb33ad Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Thu, 7 Jul 2022 16:56:45 +0200
Subject: [PATCH 2307/3533] nrf/modmachine: Add machine.idle() function.

This improves the compatibility of the nrf port machine module with common
drivers, by adding a machine.idle() alias for lightsleep.
---
 ports/nrf/modules/machine/modmachine.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/nrf/modules/machine/modmachine.c b/ports/nrf/modules/machine/modmachine.c
index af659521e0096..d322e450671f9 100644
--- a/ports/nrf/modules/machine/modmachine.c
+++ b/ports/nrf/modules/machine/modmachine.c
@@ -206,6 +206,7 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_bootloader),         MP_ROM_PTR(&machine_bootloader_obj) },
     { MP_ROM_QSTR(MP_QSTR_enable_irq),         MP_ROM_PTR(&machine_enable_irq_obj) },
     { MP_ROM_QSTR(MP_QSTR_disable_irq),        MP_ROM_PTR(&machine_disable_irq_obj) },
+    { MP_ROM_QSTR(MP_QSTR_idle),               MP_ROM_PTR(&machine_lightsleep_obj) },
     { MP_ROM_QSTR(MP_QSTR_sleep),              MP_ROM_PTR(&machine_lightsleep_obj) },
     { MP_ROM_QSTR(MP_QSTR_lightsleep),         MP_ROM_PTR(&machine_lightsleep_obj) },
     { MP_ROM_QSTR(MP_QSTR_deepsleep),          MP_ROM_PTR(&machine_deepsleep_obj) },

From 474c47d5958f2a445cd28654297d418f7cc15400 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Thu, 7 Jul 2022 17:00:09 +0200
Subject: [PATCH 2308/3533] drivers/lps22h: Use machine.idle for power saving.

All machine modules should have an idle function.
---
 drivers/lps22h/lps22h.py | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/drivers/lps22h/lps22h.py b/drivers/lps22h/lps22h.py
index 8d90b29178677..ca29efce2d6f8 100644
--- a/drivers/lps22h/lps22h.py
+++ b/drivers/lps22h/lps22h.py
@@ -53,14 +53,6 @@ def __init__(self, i2c, address=0x5C, oneshot=False):
         self.addr = address
         self.oneshot = oneshot
         self.buf = bytearray(1)
-
-        if hasattr(machine, "idle"):
-            self._go_idle = machine.idle()
-        else:
-            import time
-
-            self._go_idle = lambda: time.sleep_ms(1)
-
         # ODR=1 EN_LPFP=1 BDU=1
         self._write_reg(_LPS22_CTRL_REG1, 0x1A)
         self.set_oneshot_mode(self.oneshot)
@@ -86,7 +78,7 @@ def _tigger_oneshot(self, b):
             while True:
                 if self._read_reg(_LPS22_STATUS) & b:
                     return
-                self._go_idle()
+                machine.idle()
 
     def set_oneshot_mode(self, oneshot):
         self._read_reg(_LPS22_CTRL_REG1)

From 7e5137e0ae6a393571c94427c2d168202941002f Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 8 Jul 2022 22:26:41 +1000
Subject: [PATCH 2309/3533] tools/pyboard.py: Add verbose option to
 filesystem_command.

Signed-off-by: Damien George <damien@micropython.org>
---
 tools/pyboard.py | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/tools/pyboard.py b/tools/pyboard.py
index a9a4cbff87155..7d0ab6bcd703c 100755
--- a/tools/pyboard.py
+++ b/tools/pyboard.py
@@ -558,7 +558,7 @@ def execfile(filename, device="/dev/ttyACM0", baudrate=115200, user="micro", pas
     pyb.close()
 
 
-def filesystem_command(pyb, args, progress_callback=None):
+def filesystem_command(pyb, args, progress_callback=None, verbose=False):
     def fname_remote(src):
         if src.startswith(":"):
             src = src[1:]
@@ -590,7 +590,8 @@ def fname_cp_dest(src, dest):
             for src in srcs:
                 src = fname_remote(src)
                 dest2 = fname_cp_dest(src, dest)
-                print(fmt % (src, dest2))
+                if verbose:
+                    print(fmt % (src, dest2))
                 op(src, dest2, progress_callback=progress_callback)
         else:
             op = {
@@ -604,7 +605,8 @@ def fname_cp_dest(src, dest):
                 args = [""]
             for src in args:
                 src = fname_remote(src)
-                print("%s :%s" % (cmd, src))
+                if verbose:
+                    print("%s :%s" % (cmd, src))
                 op(src)
     except PyboardError as er:
         print(str(er.args[2], "ascii"))
@@ -756,7 +758,7 @@ def execbuffer(buf):
 
         # do filesystem commands, if given
         if args.filesystem:
-            filesystem_command(pyb, args.files)
+            filesystem_command(pyb, args.files, verbose=True)
             del args.files[:]
 
         # run the command, if given

From 80bc9b3dee310de86c6ca88db0edf55d8337f2c1 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 8 Jul 2022 22:28:26 +1000
Subject: [PATCH 2310/3533] tools/mpremote: Don't be verbose when using cat
 command.

Fixes issue #8828.

Signed-off-by: Damien George <damien@micropython.org>
---
 tools/mpremote/mpremote/main.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/tools/mpremote/mpremote/main.py b/tools/mpremote/mpremote/main.py
index 4d74743aa349a..e0266fd71901c 100644
--- a/tools/mpremote/mpremote/main.py
+++ b/tools/mpremote/mpremote/main.py
@@ -308,6 +308,9 @@ def _list_recursive(files, path):
         else:
             files.append(os.path.split(path))
 
+    # Don't be verbose when using cat, so output can be redirected to something.
+    verbose = args[0] != "cat"
+
     if args[0] == "cp" and args[1] == "-r":
         args.pop(0)
         args.pop(0)
@@ -329,9 +332,10 @@ def _list_recursive(files, path):
                 pyb,
                 ["cp", "/".join((dir, file)), ":" + dir + "/"],
                 progress_callback=show_progress_bar,
+                verbose=verbose,
             )
     else:
-        pyboard.filesystem_command(pyb, args, progress_callback=show_progress_bar)
+        pyboard.filesystem_command(pyb, args, progress_callback=show_progress_bar, verbose=verbose)
     args.clear()
 
 

From d7a162516e0a85ae9aa571813bb78428db56a93e Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 8 Jul 2022 22:46:51 +1000
Subject: [PATCH 2311/3533] esp32/modmachine: Fix machine.freq to allow maximum
 160MHz on ESP32-C3.

Fixes issue #8824.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/modmachine.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/ports/esp32/modmachine.c b/ports/esp32/modmachine.c
index db77becf87693..a70f2fbedb59c 100644
--- a/ports/esp32/modmachine.c
+++ b/ports/esp32/modmachine.c
@@ -82,8 +82,16 @@ STATIC mp_obj_t machine_freq(size_t n_args, const mp_obj_t *args) {
     } else {
         // set
         mp_int_t freq = mp_obj_get_int(args[0]) / 1000000;
-        if (freq != 20 && freq != 40 && freq != 80 && freq != 160 && freq != 240) {
+        if (freq != 20 && freq != 40 && freq != 80 && freq != 160
+            #if !CONFIG_IDF_TARGET_ESP32C3
+            && freq != 240
+            #endif
+            ) {
+            #if CONFIG_IDF_TARGET_ESP32C3
+            mp_raise_ValueError(MP_ERROR_TEXT("frequency must be 20MHz, 40MHz, 80Mhz or 160MHz"));
+            #else
             mp_raise_ValueError(MP_ERROR_TEXT("frequency must be 20MHz, 40MHz, 80Mhz, 160MHz or 240MHz"));
+            #endif
         }
         #if CONFIG_IDF_TARGET_ESP32
         esp_pm_config_esp32_t pm;

From 9f8087b448890417d5aa86551957a2100616bb8e Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 8 Jul 2022 23:04:01 +1000
Subject: [PATCH 2312/3533] esp8266/boards: Enable reverse-special-methods on
 GENERIC board.

It increases the firmware size by 292 bytes.

Addresses issue #5897.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp8266/boards/GENERIC_1M/mpconfigboard.h   | 1 +
 ports/esp8266/boards/GENERIC_512K/mpconfigboard.h | 1 +
 ports/esp8266/mpconfigport.h                      | 1 -
 3 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/ports/esp8266/boards/GENERIC_1M/mpconfigboard.h b/ports/esp8266/boards/GENERIC_1M/mpconfigboard.h
index 10e8adcda7ecc..cf5127686cc2d 100644
--- a/ports/esp8266/boards/GENERIC_1M/mpconfigboard.h
+++ b/ports/esp8266/boards/GENERIC_1M/mpconfigboard.h
@@ -12,5 +12,6 @@
 #define MICROPY_VFS                     (1)
 
 #define MICROPY_PY_FSTRINGS             (0)
+#define MICROPY_PY_REVERSE_SPECIAL_METHODS (0)
 #define MICROPY_PY_UASYNCIO             (0)
 #define MICROPY_PY_UCRYPTOLIB           (1)
diff --git a/ports/esp8266/boards/GENERIC_512K/mpconfigboard.h b/ports/esp8266/boards/GENERIC_512K/mpconfigboard.h
index ef37e22fb6c71..b0adb7081c99c 100644
--- a/ports/esp8266/boards/GENERIC_512K/mpconfigboard.h
+++ b/ports/esp8266/boards/GENERIC_512K/mpconfigboard.h
@@ -6,6 +6,7 @@
 #define MICROPY_PY_FSTRINGS             (0)
 #define MICROPY_PY_BUILTINS_SLICE_ATTRS (0)
 #define MICROPY_PY_ALL_SPECIAL_METHODS  (0)
+#define MICROPY_PY_REVERSE_SPECIAL_METHODS (0)
 #define MICROPY_PY_SYS_STDIO_BUFFER     (0)
 #define MICROPY_PY_UASYNCIO             (0)
 #define MICROPY_PY_URE_SUB              (0)
diff --git a/ports/esp8266/mpconfigport.h b/ports/esp8266/mpconfigport.h
index c78ae3ce0bb9e..7727f7845aa7f 100644
--- a/ports/esp8266/mpconfigport.h
+++ b/ports/esp8266/mpconfigport.h
@@ -26,7 +26,6 @@
 #define MICROPY_PY_BUILTINS_STR_PARTITION       (0)
 #define MICROPY_PY_BUILTINS_STR_SPLITLINES      (0)
 #define MICROPY_PY_BUILTINS_SLICE_INDICES       (0)
-#define MICROPY_PY_REVERSE_SPECIAL_METHODS      (0)
 #define MICROPY_PY_BUILTINS_COMPILE             (0)
 #define MICROPY_PY_BUILTINS_EXECFILE            (0)
 #define MICROPY_PY_BUILTINS_NOTIMPLEMENTED      (0)

From 9af6a275dd2bbb8a815e27e1e61c3f4547a44da0 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 6 Jul 2022 21:26:42 +1000
Subject: [PATCH 2313/3533] stm32/boardctrl: Allow boards to override
 fatal-error handler.

To override it a board must define MICROPY_BOARD_FATAL_ERROR to a function
that takes a string message and does not return.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/boardctrl.c    | 22 ++++++++++++++++++++++
 ports/stm32/boardctrl.h    |  5 +++++
 ports/stm32/main.c         | 26 +++-----------------------
 ports/stm32/modmachine.c   |  3 +--
 ports/stm32/pybthread.c    |  7 +++----
 ports/stm32/sdram.c        |  9 ++++-----
 ports/stm32/stm32_it.c     |  9 ++++-----
 ports/stm32/system_stm32.c | 17 ++++++++---------
 ports/stm32/uart.c         |  4 +---
 9 files changed, 51 insertions(+), 51 deletions(-)

diff --git a/ports/stm32/boardctrl.c b/ports/stm32/boardctrl.c
index 02a375999129f..406a98381419c 100644
--- a/ports/stm32/boardctrl.c
+++ b/ports/stm32/boardctrl.c
@@ -24,6 +24,8 @@
  * THE SOFTWARE.
  */
 
+#include <string.h>
+
 #include "py/runtime.h"
 #include "py/objstr.h"
 #include "py/mphal.h"
@@ -33,6 +35,26 @@
 #include "led.h"
 #include "usrsw.h"
 
+NORETURN void boardctrl_fatal_error(const char *msg) {
+    for (volatile uint delay = 0; delay < 10000000; delay++) {
+    }
+    led_state(1, 1);
+    led_state(2, 1);
+    led_state(3, 1);
+    led_state(4, 1);
+    mp_hal_stdout_tx_strn("\nFATAL ERROR:\n", 14);
+    mp_hal_stdout_tx_strn(msg, strlen(msg));
+    for (uint i = 0;;) {
+        led_toggle(((i++) & 3) + 1);
+        for (volatile uint delay = 0; delay < 10000000; delay++) {
+        }
+        if (i >= 16) {
+            // to conserve power
+            __WFI();
+        }
+    }
+}
+
 STATIC void flash_error(int n) {
     for (int i = 0; i < n; i++) {
         led_state(PYB_LED_RED, 1);
diff --git a/ports/stm32/boardctrl.h b/ports/stm32/boardctrl.h
index afd4ab8510b11..8f4ce30eff80a 100644
--- a/ports/stm32/boardctrl.h
+++ b/ports/stm32/boardctrl.h
@@ -33,6 +33,10 @@
 #define MICROPY_BOARD_PENDSV_ENTRIES
 #endif
 
+#ifndef MICROPY_BOARD_FATAL_ERROR
+#define MICROPY_BOARD_FATAL_ERROR boardctrl_fatal_error
+#endif
+
 #ifndef MICROPY_BOARD_STARTUP
 #define MICROPY_BOARD_STARTUP powerctrl_check_enter_bootloader
 #endif
@@ -110,6 +114,7 @@ typedef struct _boardctrl_state_t {
     bool log_soft_reset;
 } boardctrl_state_t;
 
+NORETURN void boardctrl_fatal_error(const char *msg);
 void boardctrl_maybe_enter_mboot(size_t n_args, const void *args);
 void boardctrl_before_soft_reset_loop(boardctrl_state_t *state);
 void boardctrl_top_soft_reset_loop(boardctrl_state_t *state);
diff --git a/ports/stm32/main.c b/ports/stm32/main.c
index 875584be8a24b..54d9b05be12da 100644
--- a/ports/stm32/main.c
+++ b/ports/stm32/main.c
@@ -97,41 +97,21 @@ STATIC pyb_uart_obj_t pyb_uart_repl_obj;
 STATIC uint8_t pyb_uart_repl_rxbuf[MICROPY_HW_UART_REPL_RXBUF];
 #endif
 
-void NORETURN __fatal_error(const char *msg) {
-    for (volatile uint delay = 0; delay < 10000000; delay++) {
-    }
-    led_state(1, 1);
-    led_state(2, 1);
-    led_state(3, 1);
-    led_state(4, 1);
-    mp_hal_stdout_tx_strn("\nFATAL ERROR:\n", 14);
-    mp_hal_stdout_tx_strn(msg, strlen(msg));
-    for (uint i = 0;;) {
-        led_toggle(((i++) & 3) + 1);
-        for (volatile uint delay = 0; delay < 10000000; delay++) {
-        }
-        if (i >= 16) {
-            // to conserve power
-            __WFI();
-        }
-    }
-}
-
 void nlr_jump_fail(void *val) {
     printf("FATAL: uncaught exception %p\n", val);
     mp_obj_print_exception(&mp_plat_print, MP_OBJ_FROM_PTR(val));
-    __fatal_error("");
+    MICROPY_BOARD_FATAL_ERROR("");
 }
 
 void abort(void) {
-    __fatal_error("abort");
+    MICROPY_BOARD_FATAL_ERROR("abort");
 }
 
 #ifndef NDEBUG
 void MP_WEAK __assert_func(const char *file, int line, const char *func, const char *expr) {
     (void)func;
     printf("Assertion '%s' failed, at file %s:%d\n", expr, file, line);
-    __fatal_error("");
+    MICROPY_BOARD_FATAL_ERROR("");
 }
 #endif
 
diff --git a/ports/stm32/modmachine.c b/ports/stm32/modmachine.c
index 34e78d26167fc..acedac7a599a7 100644
--- a/ports/stm32/modmachine.c
+++ b/ports/stm32/modmachine.c
@@ -339,8 +339,7 @@ STATIC mp_obj_t machine_freq(size_t n_args, const mp_obj_t *args) {
         if (ret == -MP_EINVAL) {
             mp_raise_ValueError(MP_ERROR_TEXT("invalid freq"));
         } else if (ret < 0) {
-            void NORETURN __fatal_error(const char *msg);
-            __fatal_error("can't change freq");
+            MICROPY_BOARD_FATAL_ERROR("can't change freq");
         }
         return mp_const_none;
         #endif
diff --git a/ports/stm32/pybthread.c b/ports/stm32/pybthread.c
index 603bc2e4ec090..3af0112fad251 100644
--- a/ports/stm32/pybthread.c
+++ b/ports/stm32/pybthread.c
@@ -28,6 +28,7 @@
 #include <stdio.h>
 
 #include "py/obj.h"
+#include "boardctrl.h"
 #include "gccollect.h"
 #include "irq.h"
 #include "pybthread.h"
@@ -42,8 +43,6 @@
 #define RAISE_IRQ_PRI() raise_irq_pri(IRQ_PRI_PENDSV)
 #define RESTORE_IRQ_PRI(state) restore_irq_pri(state)
 
-extern void __fatal_error(const char *);
-
 volatile int pyb_thread_enabled;
 pyb_thread_t *volatile pyb_thread_all;
 pyb_thread_t *volatile pyb_thread_cur;
@@ -57,7 +56,7 @@ static inline void pyb_thread_add_to_runable(pyb_thread_t *thread) {
 
 static inline void pyb_thread_remove_from_runable(pyb_thread_t *thread) {
     if (thread->run_next == thread) {
-        __fatal_error("deadlock");
+        MICROPY_BOARD_FATAL_ERROR("deadlock");
     }
     thread->run_prev->run_next = thread->run_next;
     thread->run_next->run_prev = thread->run_prev;
@@ -112,7 +111,7 @@ STATIC void pyb_thread_terminate(void) {
     SCB->ICSR = SCB_ICSR_PENDSVSET_Msk;
     enable_irq(irq_state);
     // should not return
-    __fatal_error("could not terminate");
+    MICROPY_BOARD_FATAL_ERROR("could not terminate");
 }
 
 uint32_t pyb_thread_new(pyb_thread_t *thread, void *stack, size_t stack_len, void *entry, void *arg) {
diff --git a/ports/stm32/sdram.c b/ports/stm32/sdram.c
index 4ca79f270c6c2..65a949770e779 100644
--- a/ports/stm32/sdram.c
+++ b/ports/stm32/sdram.c
@@ -50,7 +50,6 @@
 #ifdef FMC_SDRAM_BANK
 
 static void sdram_init_seq(SDRAM_HandleTypeDef *hsdram, FMC_SDRAM_CommandTypeDef *command);
-extern void __fatal_error(const char *msg);
 
 bool sdram_init(void) {
     SDRAM_HandleTypeDef hsdram;
@@ -325,7 +324,7 @@ bool __attribute__((optimize("Os"))) sdram_test(bool exhaustive) {
             snprintf(error_buffer, sizeof(error_buffer),
                 "Data bus test failed at 0x%p expected 0x%x found 0x%lx",
                 &mem_base[0], (1 << i), ((volatile uint32_t *)mem_base)[0]);
-            __fatal_error(error_buffer);
+            MICROPY_BOARD_FATAL_ERROR(error_buffer);
             #endif
             return false;
         }
@@ -340,7 +339,7 @@ bool __attribute__((optimize("Os"))) sdram_test(bool exhaustive) {
             snprintf(error_buffer, sizeof(error_buffer),
                 "Address bus test failed at 0x%p expected 0x%x found 0x%x",
                 &mem_base[i], pattern, mem_base[i]);
-            __fatal_error(error_buffer);
+            MICROPY_BOARD_FATAL_ERROR(error_buffer);
             #endif
             return false;
         }
@@ -355,7 +354,7 @@ bool __attribute__((optimize("Os"))) sdram_test(bool exhaustive) {
             snprintf(error_buffer, sizeof(error_buffer),
                 "Address bus overlap at 0x%p expected 0x%x found 0x%x",
                 &mem_base[i], pattern, mem_base[i]);
-            __fatal_error(error_buffer);
+            MICROPY_BOARD_FATAL_ERROR(error_buffer);
             #endif
             return false;
         }
@@ -376,7 +375,7 @@ bool __attribute__((optimize("Os"))) sdram_test(bool exhaustive) {
                 snprintf(error_buffer, sizeof(error_buffer),
                     "Address bus slow test failed at 0x%p expected 0x%x found 0x%x",
                     &mem_base[i], ((i % 2) ? pattern : antipattern), mem_base[i]);
-                __fatal_error(error_buffer);
+                MICROPY_BOARD_FATAL_ERROR(error_buffer);
                 #endif
                 return false;
             }
diff --git a/ports/stm32/stm32_it.c b/ports/stm32/stm32_it.c
index 55c772efb4e80..2f89f67deb539 100644
--- a/ports/stm32/stm32_it.c
+++ b/ports/stm32/stm32_it.c
@@ -83,7 +83,6 @@
 #include "i2c.h"
 #include "usb.h"
 
-extern void __fatal_error(const char *);
 #if defined(MICROPY_HW_USB_FS)
 extern PCD_HandleTypeDef pcd_fs_handle;
 #endif
@@ -192,7 +191,7 @@ void HardFault_C_Handler(ExceptionRegisters_t *regs) {
 
     /* Go to infinite loop when Hard Fault exception occurs */
     while (1) {
-        __fatal_error("HardFault");
+        MICROPY_BOARD_FATAL_ERROR("HardFault");
     }
 }
 
@@ -246,7 +245,7 @@ void NMI_Handler(void) {
 void MemManage_Handler(void) {
     /* Go to infinite loop when Memory Manage exception occurs */
     while (1) {
-        __fatal_error("MemManage");
+        MICROPY_BOARD_FATAL_ERROR("MemManage");
     }
 }
 
@@ -258,7 +257,7 @@ void MemManage_Handler(void) {
 void BusFault_Handler(void) {
     /* Go to infinite loop when Bus Fault exception occurs */
     while (1) {
-        __fatal_error("BusFault");
+        MICROPY_BOARD_FATAL_ERROR("BusFault");
     }
 }
 
@@ -270,7 +269,7 @@ void BusFault_Handler(void) {
 void UsageFault_Handler(void) {
     /* Go to infinite loop when Usage Fault exception occurs */
     while (1) {
-        __fatal_error("UsageFault");
+        MICROPY_BOARD_FATAL_ERROR("UsageFault");
     }
 }
 
diff --git a/ports/stm32/system_stm32.c b/ports/stm32/system_stm32.c
index e67c32738c281..08f071cd27937 100644
--- a/ports/stm32/system_stm32.c
+++ b/ports/stm32/system_stm32.c
@@ -76,12 +76,11 @@
   */
 
 #include "py/mphal.h"
+#include "boardctrl.h"
 #include "powerctrl.h"
 
 #if defined(STM32F4) || defined(STM32F7) || defined(STM32G4) || defined(STM32H7) || defined(STM32L4)
 
-void __fatal_error(const char *msg);
-
 /**
   * @brief  System Clock Configuration
   *
@@ -390,7 +389,7 @@ MP_WEAK void SystemClock_Config(void) {
     #endif
 
     if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) {
-        __fatal_error("HAL_RCC_OscConfig");
+        MICROPY_BOARD_FATAL_ERROR("HAL_RCC_OscConfig");
     }
 
     #if defined(MICROPY_HW_CLK_PLL2M)
@@ -478,20 +477,20 @@ MP_WEAK void SystemClock_Config(void) {
     #endif
 
     if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) {
-        __fatal_error("HAL_RCCEx_PeriphCLKConfig");
+        MICROPY_BOARD_FATAL_ERROR("HAL_RCCEx_PeriphCLKConfig");
     }
     #endif  // defined(STM32H7)
 
     #if defined(STM32F7)
     /* Activate the OverDrive to reach the 200 MHz Frequency */
     if (HAL_PWREx_EnableOverDrive() != HAL_OK) {
-        __fatal_error("HAL_PWREx_EnableOverDrive");
+        MICROPY_BOARD_FATAL_ERROR("HAL_PWREx_EnableOverDrive");
     }
     #endif
 
     #if defined(STM32G4)
     if (HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_8) != HAL_OK) {
-        __fatal_error("HAL_RCC_ClockConfig");
+        MICROPY_BOARD_FATAL_ERROR("HAL_RCC_ClockConfig");
     }
     PeriphClkInitStruct.PeriphClockSelection = RCC_PERIPHCLK_RTC | RCC_PERIPHCLK_LPUART1
         | RCC_PERIPHCLK_RNG | RCC_PERIPHCLK_ADC12
@@ -503,14 +502,14 @@ MP_WEAK void SystemClock_Config(void) {
     PeriphClkInitStruct.Adc12ClockSelection = RCC_ADC12CLKSOURCE_SYSCLK;
     PeriphClkInitStruct.RTCClockSelection = RCC_RTCCLKSOURCE_LSE;
     if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) {
-        __fatal_error("HAL_RCCEx_PeriphCLKConfig");
+        MICROPY_BOARD_FATAL_ERROR("HAL_RCCEx_PeriphCLKConfig");
     }
     #else
     uint32_t vco_out = RCC_OscInitStruct.PLL.PLLN * (MICROPY_HW_CLK_VALUE / 1000000) / RCC_OscInitStruct.PLL.PLLM;
     uint32_t sysclk_mhz = vco_out / RCC_OscInitStruct.PLL.PLLP;
     bool need_pll48 = vco_out % 48 != 0;
     if (powerctrl_rcc_clock_config_pll(&RCC_ClkInitStruct, sysclk_mhz, need_pll48) != 0) {
-        __fatal_error("HAL_RCC_ClockConfig");
+        MICROPY_BOARD_FATAL_ERROR("HAL_RCC_ClockConfig");
     }
     #endif
 
@@ -572,7 +571,7 @@ MP_WEAK void SystemClock_Config(void) {
         | RCC_PLLSAI1_ADC1CLK;
 
     if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct) != HAL_OK) {
-        __fatal_error("HAL_RCCEx_PeriphCLKConfig");
+        MICROPY_BOARD_FATAL_ERROR("HAL_RCCEx_PeriphCLKConfig");
     }
 
     __PWR_CLK_ENABLE();
diff --git a/ports/stm32/uart.c b/ports/stm32/uart.c
index adcbe883686e2..34d8246d5fa16 100644
--- a/ports/stm32/uart.c
+++ b/ports/stm32/uart.c
@@ -112,8 +112,6 @@
 
 #endif
 
-extern void NORETURN __fatal_error(const char *msg);
-
 typedef struct _pyb_uart_irq_map_t {
     uint16_t irq_en;
     uint16_t flag;
@@ -152,7 +150,7 @@ void uart_init0(void) {
     RCC_PeriphClkInit.Usart16ClockSelection = RCC_USART16CLKSOURCE_D2PCLK2;
     RCC_PeriphClkInit.Usart234578ClockSelection = RCC_USART234578CLKSOURCE_D2PCLK1;
     if (HAL_RCCEx_PeriphCLKConfig(&RCC_PeriphClkInit) != HAL_OK) {
-        __fatal_error("HAL_RCCEx_PeriphCLKConfig");
+        MICROPY_BOARD_FATAL_ERROR("HAL_RCCEx_PeriphCLKConfig");
     }
     #endif
 }

From 1329155b969386623200feff776e87336bf8e2e7 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 11 Jul 2022 14:47:46 +1000
Subject: [PATCH 2314/3533] stm32/sdram: Include boardctrl.h for fatal-error
 handler.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/sdram.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/stm32/sdram.c b/ports/stm32/sdram.c
index 65a949770e779..a94b802ea49fb 100644
--- a/ports/stm32/sdram.c
+++ b/ports/stm32/sdram.c
@@ -11,6 +11,7 @@
 #include <string.h>
 #include "py/runtime.h"
 #include "py/mphal.h"
+#include "boardctrl.h"
 #include "pin.h"
 #include "pin_static_af.h"
 #include "mpu.h"

From 8db99f11a7da84e29c2e9b37e9f224ab424d73e1 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Fri, 1 Jul 2022 11:22:24 +1000
Subject: [PATCH 2315/3533] py/scheduler: De-inline and fix race with pending
 exception / scheduler.

The optimisation that allows a single check in the VM for either a pending
exception or non-empty scheduler queue doesn't work when threading is
enabled, as one thread can clear the sched_state if it has no pending
exception, meaning the thread with the pending exception will never see it.

This removes that optimisation for threaded builds.

Also fixes a race in non-scheduler builds where get-and-clear of the
pending exception is not protected by the atomic section.

Also removes the bulk of the inlining of pending exceptions and scheduler
handling from the VM. This just costs code size and complexity at no
performance benefit.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 py/runtime.h   |  1 -
 py/scheduler.c | 83 ++++++++++++++++++++++++++++----------------------
 py/vm.c        | 48 +++++++++++++----------------
 3 files changed, 68 insertions(+), 64 deletions(-)

diff --git a/py/runtime.h b/py/runtime.h
index 4393fbfa82d19..779b66f2bd25c 100644
--- a/py/runtime.h
+++ b/py/runtime.h
@@ -76,7 +76,6 @@ void mp_deinit(void);
 void mp_sched_exception(mp_obj_t exc);
 void mp_sched_keyboard_interrupt(void);
 void mp_handle_pending(bool raise_exc);
-void mp_handle_pending_tail(mp_uint_t atomic_state);
 
 #if MICROPY_ENABLE_SCHEDULER
 void mp_sched_lock(void);
diff --git a/py/scheduler.c b/py/scheduler.c
index 3966da2975197..e8ad4e4f170cb 100644
--- a/py/scheduler.c
+++ b/py/scheduler.c
@@ -32,7 +32,11 @@
 // sources such as interrupts and UNIX signal handlers).
 void MICROPY_WRAP_MP_SCHED_EXCEPTION(mp_sched_exception)(mp_obj_t exc) {
     MP_STATE_MAIN_THREAD(mp_pending_exception) = exc;
-    #if MICROPY_ENABLE_SCHEDULER
+
+    #if MICROPY_ENABLE_SCHEDULER && !MICROPY_PY_THREAD
+    // Optimisation for the case where we have scheduler but no threading.
+    // Allows the VM to do a single check to exclude both pending exception
+    // and queued tasks.
     if (MP_STATE_VM(sched_state) == MP_SCHED_IDLE) {
         MP_STATE_VM(sched_state) = MP_SCHED_PENDING;
     }
@@ -62,33 +66,17 @@ static inline bool mp_sched_empty(void) {
     return mp_sched_num_pending() == 0;
 }
 
-// A variant of this is inlined in the VM at the pending exception check
-void mp_handle_pending(bool raise_exc) {
-    if (MP_STATE_VM(sched_state) == MP_SCHED_PENDING) {
-        mp_uint_t atomic_state = MICROPY_BEGIN_ATOMIC_SECTION();
-        // Re-check state is still pending now that we're in the atomic section.
-        if (MP_STATE_VM(sched_state) == MP_SCHED_PENDING) {
-            mp_obj_t obj = MP_STATE_THREAD(mp_pending_exception);
-            if (obj != MP_OBJ_NULL) {
-                MP_STATE_THREAD(mp_pending_exception) = MP_OBJ_NULL;
-                if (!mp_sched_num_pending()) {
-                    MP_STATE_VM(sched_state) = MP_SCHED_IDLE;
-                }
-                if (raise_exc) {
-                    MICROPY_END_ATOMIC_SECTION(atomic_state);
-                    nlr_raise(obj);
-                }
-            }
-            mp_handle_pending_tail(atomic_state);
-        } else {
-            MICROPY_END_ATOMIC_SECTION(atomic_state);
-        }
+static inline void mp_sched_run_pending(void) {
+    mp_uint_t atomic_state = MICROPY_BEGIN_ATOMIC_SECTION();
+    if (MP_STATE_VM(sched_state) != MP_SCHED_PENDING) {
+        // Something else (e.g. hard IRQ) locked the scheduler while we
+        // acquired the lock.
+        MICROPY_END_ATOMIC_SECTION(atomic_state);
+        return;
     }
-}
 
-// This function should only be called by mp_handle_pending,
-// or by the VM's inlined version of that function.
-void mp_handle_pending_tail(mp_uint_t atomic_state) {
+    // Equivalent to mp_sched_lock(), but we're already in the atomic
+    // section and know that we're pending.
     MP_STATE_VM(sched_state) = MP_SCHED_LOCKED;
 
     #if MICROPY_SCHEDULER_STATIC_NODES
@@ -118,14 +106,21 @@ void mp_handle_pending_tail(mp_uint_t atomic_state) {
         MICROPY_END_ATOMIC_SECTION(atomic_state);
     }
 
+    // Restore MP_STATE_VM(sched_state) to idle (or pending if there are still
+    // tasks in the queue).
     mp_sched_unlock();
 }
 
+// Locking the scheduler prevents tasks from executing (does not prevent new
+// tasks from being added). We lock the scheduler while executing scheduled
+// tasks and also in hard interrupts or GC finalisers.
 void mp_sched_lock(void) {
     mp_uint_t atomic_state = MICROPY_BEGIN_ATOMIC_SECTION();
     if (MP_STATE_VM(sched_state) < 0) {
+        // Already locked, increment lock (recursive lock).
         --MP_STATE_VM(sched_state);
     } else {
+        // Pending or idle.
         MP_STATE_VM(sched_state) = MP_SCHED_LOCKED;
     }
     MICROPY_END_ATOMIC_SECTION(atomic_state);
@@ -135,12 +130,17 @@ void mp_sched_unlock(void) {
     mp_uint_t atomic_state = MICROPY_BEGIN_ATOMIC_SECTION();
     assert(MP_STATE_VM(sched_state) < 0);
     if (++MP_STATE_VM(sched_state) == 0) {
-        // vm became unlocked
-        if (MP_STATE_THREAD(mp_pending_exception) != MP_OBJ_NULL
+        // Scheduler became unlocked. Check if there are still tasks in the
+        // queue and set sched_state accordingly.
+        if (
+            #if !MICROPY_PY_THREAD
+            // See optimisation in mp_sched_exception.
+            MP_STATE_THREAD(mp_pending_exception) != MP_OBJ_NULL ||
+            #endif
             #if MICROPY_SCHEDULER_STATIC_NODES
-            || MP_STATE_VM(sched_head) != NULL
+            MP_STATE_VM(sched_head) != NULL ||
             #endif
-            || mp_sched_num_pending()) {
+            mp_sched_num_pending()) {
             MP_STATE_VM(sched_state) = MP_SCHED_PENDING;
         } else {
             MP_STATE_VM(sched_state) = MP_SCHED_IDLE;
@@ -196,17 +196,26 @@ bool mp_sched_schedule_node(mp_sched_node_t *node, mp_sched_callback_t callback)
 }
 #endif
 
-#else // MICROPY_ENABLE_SCHEDULER
+#endif // MICROPY_ENABLE_SCHEDULER
 
-// A variant of this is inlined in the VM at the pending exception check
+// Called periodically from the VM or from "waiting" code (e.g. sleep) to
+// process background tasks and pending exceptions (e.g. KeyboardInterrupt).
 void mp_handle_pending(bool raise_exc) {
     if (MP_STATE_THREAD(mp_pending_exception) != MP_OBJ_NULL) {
+        mp_uint_t atomic_state = MICROPY_BEGIN_ATOMIC_SECTION();
         mp_obj_t obj = MP_STATE_THREAD(mp_pending_exception);
-        MP_STATE_THREAD(mp_pending_exception) = MP_OBJ_NULL;
-        if (raise_exc) {
-            nlr_raise(obj);
+        if (obj != MP_OBJ_NULL) {
+            MP_STATE_THREAD(mp_pending_exception) = MP_OBJ_NULL;
+            if (raise_exc) {
+                MICROPY_END_ATOMIC_SECTION(atomic_state);
+                nlr_raise(obj);
+            }
         }
+        MICROPY_END_ATOMIC_SECTION(atomic_state);
     }
+    #if MICROPY_ENABLE_SCHEDULER
+    if (MP_STATE_VM(sched_state) == MP_SCHED_PENDING) {
+        mp_sched_run_pending();
+    }
+    #endif
 }
-
-#endif // MICROPY_ENABLE_SCHEDULER
diff --git a/py/vm.c b/py/vm.c
index 5a624e91f3ebc..ce1e2931862de 100644
--- a/py/vm.c
+++ b/py/vm.c
@@ -1295,41 +1295,37 @@ unwind_jump:;
 #endif
 
 pending_exception_check:
+                // We've just done a branch, use this as a convenient point to
+                // run periodic code/checks and/or bounce the GIL.. i.e.
+                // not _every_ instruction but on average a branch should
+                // occur every few instructions.
                 MICROPY_VM_HOOK_LOOP
 
+                // Check for pending exceptions or scheduled tasks to run.
+                // Note: it's safe to just call mp_handle_pending(true), but
+                // we can inline the check for the common case where there is
+                // neither.
+                if (
                 #if MICROPY_ENABLE_SCHEDULER
-                // This is an inlined variant of mp_handle_pending
-                if (MP_STATE_VM(sched_state) == MP_SCHED_PENDING) {
-                    mp_uint_t atomic_state = MICROPY_BEGIN_ATOMIC_SECTION();
-                    // Re-check state is still pending now that we're in the atomic section.
-                    if (MP_STATE_VM(sched_state) == MP_SCHED_PENDING) {
-                        MARK_EXC_IP_SELECTIVE();
-                        mp_obj_t obj = MP_STATE_THREAD(mp_pending_exception);
-                        if (obj != MP_OBJ_NULL) {
-                            MP_STATE_THREAD(mp_pending_exception) = MP_OBJ_NULL;
-                            if (!mp_sched_num_pending()) {
-                                MP_STATE_VM(sched_state) = MP_SCHED_IDLE;
-                            }
-                            MICROPY_END_ATOMIC_SECTION(atomic_state);
-                            RAISE(obj);
-                        }
-                        mp_handle_pending_tail(atomic_state);
-                    } else {
-                        MICROPY_END_ATOMIC_SECTION(atomic_state);
-                    }
-                }
+                #if MICROPY_PY_THREAD
+                    // Scheduler + threading: Scheduler and pending exceptions are independent, check both.
+                    MP_STATE_VM(sched_state) == MP_SCHED_PENDING || MP_STATE_THREAD(mp_pending_exception) != MP_OBJ_NULL
                 #else
-                // This is an inlined variant of mp_handle_pending
-                if (MP_STATE_THREAD(mp_pending_exception) != MP_OBJ_NULL) {
+                    // Scheduler + non-threading: Optimisation: pending exception sets sched_state, only check sched_state.
+                    MP_STATE_VM(sched_state) == MP_SCHED_PENDING
+                #endif
+                #else
+                    // No scheduler: Just check pending exception.
+                    MP_STATE_THREAD(mp_pending_exception) != MP_OBJ_NULL
+                #endif
+                ) {
                     MARK_EXC_IP_SELECTIVE();
-                    mp_obj_t obj = MP_STATE_THREAD(mp_pending_exception);
-                    MP_STATE_THREAD(mp_pending_exception) = MP_OBJ_NULL;
-                    RAISE(obj);
+                    mp_handle_pending(true);
                 }
-                #endif
 
                 #if MICROPY_PY_THREAD_GIL
                 #if MICROPY_PY_THREAD_GIL_VM_DIVISOR
+                // Don't bounce the GIL too frequently (default every 32 branches).
                 if (--gil_divisor == 0)
                 #endif
                 {

From 158f1794e87e7860f500622762ec14403ac32f03 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Wed, 6 Jul 2022 16:03:16 +1000
Subject: [PATCH 2316/3533] py/vm: Document internal SELECTIVE_EXC_IP option.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 py/vm.c | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/py/vm.c b/py/vm.c
index ce1e2931862de..d70ae39dc9498 100644
--- a/py/vm.c
+++ b/py/vm.c
@@ -202,14 +202,30 @@
 //  MP_VM_RETURN_YIELD, ip, sp valid, yielded value in *sp
 //  MP_VM_RETURN_EXCEPTION, exception in state[0]
 mp_vm_return_kind_t MICROPY_WRAP_MP_EXECUTE_BYTECODE(mp_execute_bytecode)(mp_code_state_t *code_state, volatile mp_obj_t inject_exc) {
+
 #define SELECTIVE_EXC_IP (0)
+// When disabled, code_state->ip is updated unconditionally during op
+// dispatch, and this is subsequently used in the exception handler
+// (either NLR jump or direct RAISE). This is good for code size because it
+// happens in a single place but is more work than necessary, as many opcodes
+// cannot raise. Enabling SELECTIVE_EXC_IP means that code_state->ip
+// is "selectively" updated only during handling of opcodes that might raise.
+// This costs about 360 bytes on PYBV11 for a 1-3% performance gain (e.g. 3%
+// in bm_fft.py). On rp2040, there is zero code size diff for a 0-1% gain.
+// (Both with computed goto enabled).
 #if SELECTIVE_EXC_IP
-#define MARK_EXC_IP_SELECTIVE() { code_state->ip = ip; } /* stores ip 1 byte past last opcode */
+// Note: Because ip has already been advanced by one byte in the dispatch, the
+// value of ip here is one byte past the last opcode.
+#define MARK_EXC_IP_SELECTIVE() { code_state->ip = ip; }
+// No need to update in dispatch.
 #define MARK_EXC_IP_GLOBAL()
 #else
 #define MARK_EXC_IP_SELECTIVE()
-#define MARK_EXC_IP_GLOBAL() { code_state->ip = ip; } /* stores ip pointing to last opcode */
+// Immediately before dispatch, save the current ip, which will be the opcode
+// about to be dispatched.
+#define MARK_EXC_IP_GLOBAL() { code_state->ip = ip; }
 #endif
+
 #if MICROPY_OPT_COMPUTED_GOTO
     #include "py/vmentrytable.h"
     #define DISPATCH() do { \

From daff597753e699bb9f485e69dea98f58b0c1432d Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Wed, 29 Jun 2022 14:40:41 +1000
Subject: [PATCH 2317/3533] rp2: Run USB stack task exclusively from core 0.

The goal is to avoid a situation where core 1 is shut down while holding
the tinyusb spinlock, which could happen during soft reset if
mp_thread_deinit is called while core1 is running tud_task().

This also fixes a latent race where the two cores are competing to
decrement and compare `vm_hook_divisor` with no mem fence or atomic
protection -- only core0 will now do this.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/rp2/mpconfigport.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/rp2/mpconfigport.h b/ports/rp2/mpconfigport.h
index 53437d6c98e96..ef1e6008247ce 100644
--- a/ports/rp2/mpconfigport.h
+++ b/ports/rp2/mpconfigport.h
@@ -238,7 +238,7 @@ extern const struct _mod_network_nic_type_t mod_network_nic_type_wiznet5k;
 #define MICROPY_HW_USBDEV_TASK_HOOK extern void tud_task(void); tud_task();
 #define MICROPY_VM_HOOK_COUNT (10)
 #define MICROPY_VM_HOOK_INIT static uint vm_hook_divisor = MICROPY_VM_HOOK_COUNT;
-#define MICROPY_VM_HOOK_POLL if (--vm_hook_divisor == 0) { \
+#define MICROPY_VM_HOOK_POLL if (get_core_num() == 0 && --vm_hook_divisor == 0) { \
         vm_hook_divisor = MICROPY_VM_HOOK_COUNT; \
         MICROPY_HW_USBDEV_TASK_HOOK \
 }
@@ -250,7 +250,7 @@ extern const struct _mod_network_nic_type_t mod_network_nic_type_wiznet5k;
 
 #define MICROPY_EVENT_POLL_HOOK_FAST \
     do { \
-        MICROPY_HW_USBDEV_TASK_HOOK \
+        if (get_core_num() == 0) { MICROPY_HW_USBDEV_TASK_HOOK } \
         extern void mp_handle_pending(bool); \
         mp_handle_pending(true); \
     } while (0)

From 662dc8602bf0ab99332748d178b0e950189df9e7 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Thu, 30 Jun 2022 11:42:20 +1000
Subject: [PATCH 2318/3533] rp2: Make atomic sections suspend the other core
 (if active).

When a flash write/erase is in progress, we need to ensure that the
other core cannot be using XIP.

This also implements MICROPY_BEGIN_ATOMIC_SECTION as a full mutex, which
is necessary as it's used to syncronise access to things like the scheduler
queue.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/rp2/mpconfigport.h |  9 ++++++---
 ports/rp2/mpthreadport.c | 40 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 46 insertions(+), 3 deletions(-)

diff --git a/ports/rp2/mpconfigport.h b/ports/rp2/mpconfigport.h
index ef1e6008247ce..d022c7a2890e1 100644
--- a/ports/rp2/mpconfigport.h
+++ b/ports/rp2/mpconfigport.h
@@ -30,6 +30,7 @@
 #include "hardware/spi.h"
 #include "hardware/sync.h"
 #include "pico/binary_info.h"
+#include "pico/multicore.h"
 #include "mpconfigboard.h"
 #if MICROPY_HW_USB_MSC
 #include "hardware/flash.h"
@@ -225,9 +226,11 @@ extern const struct _mod_network_nic_type_t mod_network_nic_type_wiznet5k;
 
 // Miscellaneous settings
 
-// TODO need to look and see if these could/should be spinlock/mutex
-#define MICROPY_BEGIN_ATOMIC_SECTION()     save_and_disable_interrupts()
-#define MICROPY_END_ATOMIC_SECTION(state)  restore_interrupts(state)
+// Entering a critical section.
+extern uint32_t mp_thread_begin_atomic_section(void);
+extern void mp_thread_end_atomic_section(uint32_t);
+#define MICROPY_BEGIN_ATOMIC_SECTION()     mp_thread_begin_atomic_section()
+#define MICROPY_END_ATOMIC_SECTION(state)  mp_thread_end_atomic_section(state)
 
 // Prevent the "lwIP task" from running when unsafe to do so.
 #define MICROPY_PY_LWIP_ENTER   lwip_lock_acquire();
diff --git a/ports/rp2/mpthreadport.c b/ports/rp2/mpthreadport.c
index 187f74bb57ef2..252f7b01fa887 100644
--- a/ports/rp2/mpthreadport.c
+++ b/ports/rp2/mpthreadport.c
@@ -36,16 +36,52 @@ extern uint8_t __StackTop, __StackBottom;
 
 void *core_state[2];
 
+// This will be non-NULL while Python code is execting.
 STATIC void *(*core1_entry)(void *) = NULL;
+
 STATIC void *core1_arg = NULL;
 STATIC uint32_t *core1_stack = NULL;
 STATIC size_t core1_stack_num_words = 0;
 
+// Thread mutex.
+STATIC mp_thread_mutex_t atomic_mutex;
+
+uint32_t mp_thread_begin_atomic_section(void) {
+    if (core1_entry) {
+        // When both cores are executing, we also need to provide
+        // full mutual exclusion.
+        mp_thread_mutex_lock(&atomic_mutex, 1);
+        // In case this atomic section is for flash access, then
+        // suspend the other core.
+        multicore_lockout_start_blocking();
+    }
+
+    return save_and_disable_interrupts();
+}
+
+void mp_thread_end_atomic_section(uint32_t state) {
+    restore_interrupts(state);
+
+    if (core1_entry) {
+        multicore_lockout_end_blocking();
+        mp_thread_mutex_unlock(&atomic_mutex);
+    }
+}
+
+// Initialise threading support.
 void mp_thread_init(void) {
+    assert(get_core_num() == 0);
+
+    mp_thread_mutex_init(&atomic_mutex);
+
+    // Allow MICROPY_BEGIN_ATOMIC_SECTION to be invoked from core1.
+    multicore_lockout_victim_init();
+
     mp_thread_set_state(&mp_state_ctx.thread);
     core1_entry = NULL;
 }
 
+// Shutdown threading support -- stops the second thread.
 void mp_thread_deinit(void) {
     assert(get_core_num() == 0);
     // Must ensure that core1 is not currently holding the GC lock, otherwise
@@ -69,9 +105,13 @@ void mp_thread_gc_others(void) {
 }
 
 STATIC void core1_entry_wrapper(void) {
+    // Allow MICROPY_BEGIN_ATOMIC_SECTION to be invoked from core0.
+    multicore_lockout_victim_init();
+
     if (core1_entry) {
         core1_entry(core1_arg);
     }
+
     core1_entry = NULL;
     // returning from here will loop the core forever (WFI)
 }

From c5563aa024c60c6da1ebe79e97f2307b49999499 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Mon, 11 Jul 2022 10:45:04 +1000
Subject: [PATCH 2319/3533] rp2/mpconfigport: Make networking options
 consistent across boards.

Enable the same set of networking features on boards with wifi/ethernet.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 .../mpconfigboard.h                           |  7 +-----
 ports/rp2/boards/PICO_W/mpconfigboard.h       |  3 +--
 .../boards/W5100S_EVB_PICO/mpconfigboard.h    |  4 +---
 ports/rp2/mpconfigport.h                      | 22 +++++++++++++++++++
 4 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/mpconfigboard.h b/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/mpconfigboard.h
index 3f18596155beb..87b9187659a42 100644
--- a/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/mpconfigboard.h
+++ b/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/mpconfigboard.h
@@ -4,13 +4,8 @@
 #define MICROPY_HW_BOARD_NAME           "Arduino Nano RP2040 Connect"
 #define MICROPY_HW_FLASH_STORAGE_BYTES  (8 * 1024 * 1024)
 
-// Enable networking and sockets.
+// Enable networking.
 #define MICROPY_PY_NETWORK              (1)
-#define MICROPY_PY_USOCKET              (1)
-#define MICROPY_PY_WEBREPL              (1)
-#define MICROPY_PY_UWEBSOCKET           (1)
-#define MICROPY_PY_UHASHLIB_SHA1        (1)
-#define MICROPY_PY_OS_DUPTERM           (1)
 
 // Disable internal error numbers.
 #define MICROPY_USE_INTERNAL_ERRNO      (0)
diff --git a/ports/rp2/boards/PICO_W/mpconfigboard.h b/ports/rp2/boards/PICO_W/mpconfigboard.h
index f467234fbea5b..43a9fbafa7d36 100644
--- a/ports/rp2/boards/PICO_W/mpconfigboard.h
+++ b/ports/rp2/boards/PICO_W/mpconfigboard.h
@@ -4,9 +4,8 @@
 // todo: We need something to check our binary size
 #define MICROPY_HW_FLASH_STORAGE_BYTES          (848 * 1024)
 
+// Enable networking.
 #define MICROPY_PY_NETWORK 1
-#define MICROPY_PY_USOCKET 1
-#define MICROPY_PY_USSL 1
 
 // CYW43 driver configuration.
 #define CYW43_USE_SPI (1)
diff --git a/ports/rp2/boards/W5100S_EVB_PICO/mpconfigboard.h b/ports/rp2/boards/W5100S_EVB_PICO/mpconfigboard.h
index 3816e40138b78..ca2f7d0cea94d 100644
--- a/ports/rp2/boards/W5100S_EVB_PICO/mpconfigboard.h
+++ b/ports/rp2/boards/W5100S_EVB_PICO/mpconfigboard.h
@@ -4,10 +4,8 @@
 #define MICROPY_HW_BOARD_NAME             "W5100S-EVB-Pico"
 #define MICROPY_HW_FLASH_STORAGE_BYTES    (1408 * 1024)
 
-// Enable networking and sockets.
+// Enable networking.
 #define MICROPY_PY_NETWORK                (1)
-#define MICROPY_PY_USOCKET                (1)
-#define MICROPY_PY_USSL                   (1)
 
 // Wiznet HW config.
 #define MICROPY_HW_WIZNET_SPI_ID          (0)
diff --git a/ports/rp2/mpconfigport.h b/ports/rp2/mpconfigport.h
index d022c7a2890e1..1a63476c7c146 100644
--- a/ports/rp2/mpconfigport.h
+++ b/ports/rp2/mpconfigport.h
@@ -155,6 +155,28 @@ struct _mp_bluetooth_nimble_malloc_t;
 #define MICROPY_PORT_ROOT_POINTER_BLUETOOTH_NIMBLE
 #endif
 
+// By default networking should include sockets, ssl, websockets, webrepl, dupterm.
+#if MICROPY_PY_NETWORK
+#ifndef MICROPY_PY_USOCKET
+#define MICROPY_PY_USOCKET              (1)
+#endif
+#ifndef MICROPY_PY_USSL
+#define MICROPY_PY_USSL                 (1)
+#endif
+#ifndef MICROPY_PY_UWEBSOCKET
+#define MICROPY_PY_UWEBSOCKET           (1)
+#endif
+#ifndef MICROPY_PY_UHASHLIB_SHA1
+#define MICROPY_PY_UHASHLIB_SHA1        (1)
+#endif
+#ifndef MICROPY_PY_WEBREPL
+#define MICROPY_PY_WEBREPL              (1)
+#endif
+#ifndef MICROPY_PY_OS_DUPTERM
+#define MICROPY_PY_OS_DUPTERM           (1)
+#endif
+#endif
+
 #if MICROPY_PY_NETWORK_CYW43
 extern const struct _mp_obj_type_t mp_network_cyw43_type;
 #define MICROPY_HW_NIC_CYW43 \

From 9f0f7e34c7fa718c9d40897f2ba6ffabc62a1480 Mon Sep 17 00:00:00 2001
From: Peter Harper <peter.harper@raspberrypi.com>
Date: Thu, 30 Jun 2022 15:35:23 +0100
Subject: [PATCH 2320/3533] rp2/mphalport: Fix missing storage_read_blocks
 symbol in debug build.

When building `make BOARD=PICO_W DEBUG=1` the cyw43-driver requires
storage_read_blocks().

Signed-off-by: Peter Harper <peter.harper@raspberrypi.com>
---
 ports/rp2/mphalport.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/ports/rp2/mphalport.c b/ports/rp2/mphalport.c
index d3824d8f917cd..63ff76f5d9bf8 100644
--- a/ports/rp2/mphalport.c
+++ b/ports/rp2/mphalport.c
@@ -204,3 +204,8 @@ void mp_hal_get_mac_ascii(int idx, size_t chr_off, size_t chr_len, char *dest) {
         *dest++ = hexchr[mac[chr_off >> 1] >> (4 * (1 - (chr_off & 1))) & 0xf];
     }
 }
+
+// Shouldn't be used, needed by cyw43-driver in debug build.
+uint32_t storage_read_blocks(uint8_t *dest, uint32_t block_num, uint32_t num_blocks) {
+    panic_unsupported();
+}

From e1282556e82ed470941a845af447065502a2c5ad Mon Sep 17 00:00:00 2001
From: Phil Howard <phil@gadgetoid.com>
Date: Thu, 7 Jul 2022 16:35:45 +0100
Subject: [PATCH 2321/3533] shared/netutils/dhcpserver: Match default DNS to
 server IP.

Change the default DNS to match the gateway IP of a board running in access
point mode (or otherwise acting as a "server").

This fixes the rather meaningless use of "8.8.8.8" as the default DNS
server address offered up to access point clients via the DHCP server.
Since most devices wont be able to proxy access to the real "8.8.8.8".

It allows for a DNS responder to run and provide a catchall response for
captive portal functionality, or just a quality-of-life response to a
friendly URL for access-point based configuration and other applications.

Signed-off-by: Phil Howard <phil@gadgetoid.com>
---
 shared/netutils/dhcpserver.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shared/netutils/dhcpserver.c b/shared/netutils/dhcpserver.c
index 9db42b3fd9d2d..ea5718d11475c 100644
--- a/shared/netutils/dhcpserver.c
+++ b/shared/netutils/dhcpserver.c
@@ -65,7 +65,7 @@
 #define PORT_DHCP_SERVER (67)
 #define PORT_DHCP_CLIENT (68)
 
-#define DEFAULT_DNS MAKE_IP4(8, 8, 8, 8)
+#define DEFAULT_DNS MAKE_IP4(192, 168, 4, 1)
 #define DEFAULT_LEASE_TIME_S (24 * 60 * 60) // in seconds
 
 #define MAC_LEN (6)

From 9714a0ead5c74649d676986836ee27fb418aac9e Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Sat, 9 Jul 2022 00:05:59 +1000
Subject: [PATCH 2322/3533] py/emitnative: Fix STORE_ATTR viper code-gen when
 value is not a pyobj.

There was a missing call to MP_F_CONVERT_NATIVE_TO_OBJ.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 py/emitnative.c                          | 14 ++++++++++---
 tests/micropython/viper_storeattr.py     | 25 ++++++++++++++++++++++++
 tests/micropython/viper_storeattr.py.exp |  4 ++++
 3 files changed, 40 insertions(+), 3 deletions(-)
 create mode 100644 tests/micropython/viper_storeattr.py
 create mode 100644 tests/micropython/viper_storeattr.py.exp

diff --git a/py/emitnative.c b/py/emitnative.c
index 957e713fdd387..7e98ba1556073 100644
--- a/py/emitnative.c
+++ b/py/emitnative.c
@@ -1683,10 +1683,18 @@ STATIC void emit_native_store_global(emit_t *emit, qstr qst, int kind) {
 }
 
 STATIC void emit_native_store_attr(emit_t *emit, qstr qst) {
-    vtype_kind_t vtype_base, vtype_val;
-    emit_pre_pop_reg_reg(emit, &vtype_base, REG_ARG_1, &vtype_val, REG_ARG_3); // arg1 = base, arg3 = value
+    vtype_kind_t vtype_base;
+    vtype_kind_t vtype_val = peek_vtype(emit, 1);
+    if (vtype_val == VTYPE_PYOBJ) {
+        emit_pre_pop_reg_reg(emit, &vtype_base, REG_ARG_1, &vtype_val, REG_ARG_3); // arg1 = base, arg3 = value
+    } else {
+        emit_access_stack(emit, 2, &vtype_val, REG_ARG_1); // arg1 = value
+        emit_call_with_imm_arg(emit, MP_F_CONVERT_NATIVE_TO_OBJ, vtype_val, REG_ARG_2); // arg2 = type
+        ASM_MOV_REG_REG(emit->as, REG_ARG_3, REG_RET); // arg3 = value (converted)
+        emit_pre_pop_reg(emit, &vtype_base, REG_ARG_1); // arg1 = base
+        adjust_stack(emit, -1); // pop value
+    }
     assert(vtype_base == VTYPE_PYOBJ);
-    assert(vtype_val == VTYPE_PYOBJ);
     emit_call_with_qstr_arg(emit, MP_F_STORE_ATTR, qst, REG_ARG_2); // arg2 = attribute name
     emit_post(emit);
 }
diff --git a/tests/micropython/viper_storeattr.py b/tests/micropython/viper_storeattr.py
new file mode 100644
index 0000000000000..65f68b6e22eec
--- /dev/null
+++ b/tests/micropython/viper_storeattr.py
@@ -0,0 +1,25 @@
+# test storing an attribute with a value of different viper types
+
+
+class X:
+    def __str__(self):
+        return "X"
+
+
+x = X()
+
+
+@micropython.viper
+def a():
+    x.i0 = 0
+    x.i7 = 7
+    x.s = "hello"
+    x.o = x
+
+
+a()
+
+print(x.i0)
+print(x.i7)
+print(x.s)
+print(x.o)
diff --git a/tests/micropython/viper_storeattr.py.exp b/tests/micropython/viper_storeattr.py.exp
new file mode 100644
index 0000000000000..8e6a6cfda9533
--- /dev/null
+++ b/tests/micropython/viper_storeattr.py.exp
@@ -0,0 +1,4 @@
+0
+7
+hello
+X

From 093c4b6b2681951a277c71453598a9e0e2a82f52 Mon Sep 17 00:00:00 2001
From: David Lechner <david@pybricks.com>
Date: Thu, 10 Feb 2022 13:15:14 -0600
Subject: [PATCH 2323/3533] unix/main: Restore tty settings on nlr_jump_fail().

Since nlr_jump_fail() exits the process, it can leave the terminal in raw
mode which means characters are not echoed.  Fix this by restoring the
original terminal mode.

Signed-off-by: David Lechner <david@pybricks.com>
---
 ports/unix/main.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ports/unix/main.c b/ports/unix/main.c
index 0e00db7fa2094..e7048dd712b81 100644
--- a/ports/unix/main.c
+++ b/ports/unix/main.c
@@ -737,6 +737,9 @@ MP_NOINLINE int main_(int argc, char **argv) {
 }
 
 void nlr_jump_fail(void *val) {
+    #if MICROPY_USE_READLINE == 1
+    mp_hal_stdio_mode_orig();
+    #endif
     fprintf(stderr, "FATAL: uncaught NLR %p\n", val);
     exit(1);
 }

From d84220b8c62003b4714e0fa514a46ff5139148dc Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 21 Jun 2022 18:11:19 +1000
Subject: [PATCH 2324/3533] py/vm: Remove check for ip being NULL when handling
 StopIteration.

This check for code_state->ip being NULL was added in
a7c02c4538bb2b986efb1999e00da4d76345767d with a commit message that "When
generator raises exception, it is automatically terminated (by setting its
code_state.ip to 0)".  It was also added without any tests to test for this
particular case.  (The commit did mention that CPython's test_pep380.py
triggered a bug, but upon re-running this test it did not show any need for
this NULL check of code_state->ip.)

It is true that generators that have completed (either by running to their
end or raising an exception) set "code_state.ip = 0".  But there is an
explicit check at the start of mp_obj_gen_resume() to return immediately
for any attempt to resume an already-stopped generator.  So the VM can
never execute a generator with NULL ip (and this was true at the time of
the above-referenced commit).

Furthermore, the other parts of the VM just before and after this piece
of code do require (or at least assume) code_state->ip is non-NULL.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/vm.c | 30 ++++++++++++++----------------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/py/vm.c b/py/vm.c
index d70ae39dc9498..9157fc7d1ee46 100644
--- a/py/vm.c
+++ b/py/vm.c
@@ -1375,22 +1375,20 @@ unwind_jump:;
             #endif
 
             if (mp_obj_is_subclass_fast(MP_OBJ_FROM_PTR(((mp_obj_base_t*)nlr.ret_val)->type), MP_OBJ_FROM_PTR(&mp_type_StopIteration))) {
-                if (code_state->ip) {
-                    // check if it's a StopIteration within a for block
-                    if (*code_state->ip == MP_BC_FOR_ITER) {
-                        const byte *ip = code_state->ip + 1;
-                        DECODE_ULABEL; // the jump offset if iteration finishes; for labels are always forward
-                        code_state->ip = ip + ulab; // jump to after for-block
-                        code_state->sp -= MP_OBJ_ITER_BUF_NSLOTS; // pop the exhausted iterator
-                        goto outer_dispatch_loop; // continue with dispatch loop
-                    } else if (*code_state->ip == MP_BC_YIELD_FROM) {
-                        // StopIteration inside yield from call means return a value of
-                        // yield from, so inject exception's value as yield from's result
-                        // (Instead of stack pop then push we just replace exhausted gen with value)
-                        *code_state->sp = mp_obj_exception_get_value(MP_OBJ_FROM_PTR(nlr.ret_val));
-                        code_state->ip++; // yield from is over, move to next instruction
-                        goto outer_dispatch_loop; // continue with dispatch loop
-                    }
+                // check if it's a StopIteration within a for block
+                if (*code_state->ip == MP_BC_FOR_ITER) {
+                    const byte *ip = code_state->ip + 1;
+                    DECODE_ULABEL; // the jump offset if iteration finishes; for labels are always forward
+                    code_state->ip = ip + ulab; // jump to after for-block
+                    code_state->sp -= MP_OBJ_ITER_BUF_NSLOTS; // pop the exhausted iterator
+                    goto outer_dispatch_loop; // continue with dispatch loop
+                } else if (*code_state->ip == MP_BC_YIELD_FROM) {
+                    // StopIteration inside yield from call means return a value of
+                    // yield from, so inject exception's value as yield from's result
+                    // (Instead of stack pop then push we just replace exhausted gen with value)
+                    *code_state->sp = mp_obj_exception_get_value(MP_OBJ_FROM_PTR(nlr.ret_val));
+                    code_state->ip++; // yield from is over, move to next instruction
+                    goto outer_dispatch_loop; // continue with dispatch loop
                 }
             }
 

From 893a5c83412d75c1da8c429d4809650660c2ee94 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 12 Jul 2022 22:41:10 +1000
Subject: [PATCH 2325/3533] py/vm: In YIELD_FROM opcode, expand helper macros
 and remove them.

The GENERATOR_EXIT_IF_NEEDED macro is only used once and it's easier to
read and understand the code if this macro body is written in the code.
Then the comment just before it makes more sense.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/vm.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/py/vm.c b/py/vm.c
index 9157fc7d1ee46..80e271845fe22 100644
--- a/py/vm.c
+++ b/py/vm.c
@@ -1188,9 +1188,6 @@ unwind_jump:;
 
                 ENTRY(MP_BC_YIELD_FROM): {
                     MARK_EXC_IP_SELECTIVE();
-//#define EXC_MATCH(exc, type) mp_obj_is_type(exc, type)
-#define EXC_MATCH(exc, type) mp_obj_exception_match(exc, type)
-#define GENERATOR_EXIT_IF_NEEDED(t) if (t != MP_OBJ_NULL && EXC_MATCH(t, MP_OBJ_FROM_PTR(&mp_type_GeneratorExit))) { mp_obj_t raise_t = mp_make_raise_obj(t); RAISE(raise_t); }
                     mp_vm_return_kind_t ret_kind;
                     mp_obj_t send_value = POP();
                     mp_obj_t t_exc = MP_OBJ_NULL;
@@ -1214,11 +1211,14 @@ unwind_jump:;
                         SET_TOP(ret_value);
                         // If we injected GeneratorExit downstream, then even
                         // if it was swallowed, we re-raise GeneratorExit
-                        GENERATOR_EXIT_IF_NEEDED(t_exc);
+                        if (t_exc != MP_OBJ_NULL && mp_obj_exception_match(t_exc, MP_OBJ_FROM_PTR(&mp_type_GeneratorExit))) {
+                            mp_obj_t raise_t = mp_make_raise_obj(t_exc);
+                            RAISE(raise_t);
+                        }
                         DISPATCH();
                     } else {
                         assert(ret_kind == MP_VM_RETURN_EXCEPTION);
-                        assert(!EXC_MATCH(ret_value, MP_OBJ_FROM_PTR(&mp_type_StopIteration)));
+                        assert(!mp_obj_exception_match(ret_value, MP_OBJ_FROM_PTR(&mp_type_StopIteration)));
                         // Pop exhausted gen
                         sp--;
                         RAISE(ret_value);

From b878fc042f6441d4a10af6f6cee897330f89d8d9 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 12 Jul 2022 22:46:35 +1000
Subject: [PATCH 2326/3533] py/vm: Consistently indent #if guards to match the
 code they surround.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/vm.c | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/py/vm.c b/py/vm.c
index 80e271845fe22..9273dda02eead 100644
--- a/py/vm.c
+++ b/py/vm.c
@@ -307,14 +307,14 @@ FRAME_SETUP();
             // loop to execute byte code
             for (;;) {
 dispatch_loop:
-#if MICROPY_OPT_COMPUTED_GOTO
+                #if MICROPY_OPT_COMPUTED_GOTO
                 DISPATCH();
-#else
+                #else
                 TRACE(ip);
                 MARK_EXC_IP_GLOBAL();
                 TRACE_TICK(ip, sp, false);
                 switch (*ip++) {
-#endif
+                #endif
 
                 ENTRY(MP_BC_LOAD_CONST_FALSE):
                     PUSH(mp_const_false);
@@ -831,7 +831,7 @@ unwind_jump:;
                     mp_obj_dict_store(sp[0], sp[2], sp[1]);
                     DISPATCH();
 
-#if MICROPY_PY_BUILTINS_SET
+                #if MICROPY_PY_BUILTINS_SET
                 ENTRY(MP_BC_BUILD_SET): {
                     MARK_EXC_IP_SELECTIVE();
                     DECODE_UINT;
@@ -839,9 +839,9 @@ unwind_jump:;
                     SET_TOP(mp_obj_new_set(unum, sp));
                     DISPATCH();
                 }
-#endif
+                #endif
 
-#if MICROPY_PY_BUILTINS_SLICE
+                #if MICROPY_PY_BUILTINS_SLICE
                 ENTRY(MP_BC_BUILD_SLICE): {
                     MARK_EXC_IP_SELECTIVE();
                     mp_obj_t step = mp_const_none;
@@ -854,7 +854,7 @@ unwind_jump:;
                     SET_TOP(mp_obj_new_slice(start, stop, step));
                     DISPATCH();
                 }
-#endif
+                #endif
 
                 ENTRY(MP_BC_STORE_COMP): {
                     MARK_EXC_IP_SELECTIVE();
@@ -1248,7 +1248,7 @@ unwind_jump:;
                     mp_import_all(POP());
                     DISPATCH();
 
-#if MICROPY_OPT_COMPUTED_GOTO
+                #if MICROPY_OPT_COMPUTED_GOTO
                 ENTRY(MP_BC_LOAD_CONST_SMALL_INT_MULTI):
                     PUSH(MP_OBJ_NEW_SMALL_INT((mp_int_t)ip[-1] - MP_BC_LOAD_CONST_SMALL_INT_MULTI - MP_BC_LOAD_CONST_SMALL_INT_MULTI_EXCESS));
                     DISPATCH();
@@ -1276,7 +1276,7 @@ unwind_jump:;
 
                 ENTRY_DEFAULT:
                     MARK_EXC_IP_SELECTIVE();
-#else
+                #else
                 ENTRY_DEFAULT:
                     if (ip[-1] < MP_BC_LOAD_CONST_SMALL_INT_MULTI + MP_BC_LOAD_CONST_SMALL_INT_MULTI_NUM) {
                         PUSH(MP_OBJ_NEW_SMALL_INT((mp_int_t)ip[-1] - MP_BC_LOAD_CONST_SMALL_INT_MULTI - MP_BC_LOAD_CONST_SMALL_INT_MULTI_EXCESS));
@@ -1296,9 +1296,8 @@ unwind_jump:;
                         SET_TOP(mp_binary_op(ip[-1] - MP_BC_BINARY_OP_MULTI, lhs, rhs));
                         DISPATCH();
                     } else
-#endif
+                #endif // MICROPY_OPT_COMPUTED_GOTO
                 {
-
                     mp_obj_t obj = mp_obj_new_exception_msg(&mp_type_NotImplementedError, MP_ERROR_TEXT("opcode"));
                     nlr_pop();
                     code_state->state[0] = obj;
@@ -1306,9 +1305,9 @@ unwind_jump:;
                     return MP_VM_RETURN_EXCEPTION;
                 }
 
-#if !MICROPY_OPT_COMPUTED_GOTO
+                #if !MICROPY_OPT_COMPUTED_GOTO
                 } // switch
-#endif
+                #endif
 
 pending_exception_check:
                 // We've just done a branch, use this as a convenient point to

From 74794d42b8870d9f3990b18816aedce85402e106 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Tue, 12 Jul 2022 21:26:31 +1000
Subject: [PATCH 2327/3533] rp2/CMakeLists: Use armv6m mpy-cross arch for rp2.

Commit 0e28a1f0e5e229f14b199a30d1796770b232f5a1 made it possible to set
-march=armv6m.  It needs to be used when freezing for rp2.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/rp2/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/rp2/CMakeLists.txt b/ports/rp2/CMakeLists.txt
index 6314bfb44ddda..202261f9c1fc2 100644
--- a/ports/rp2/CMakeLists.txt
+++ b/ports/rp2/CMakeLists.txt
@@ -323,7 +323,7 @@ list(APPEND MICROPY_SOURCE_QSTR
 )
 
 # Define mpy-cross flags
-set(MICROPY_CROSS_FLAGS -march=armv7m)
+set(MICROPY_CROSS_FLAGS -march=armv6m)
 
 # Set the frozen manifest file
 if (MICROPY_USER_FROZEN_MANIFEST)

From 2076f2efccfd86977f63de15958c142365c31f3b Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Tue, 12 Jul 2022 22:48:39 +0200
Subject: [PATCH 2328/3533] tools/autobuild: Add nrf port to autobuild scripts.

---
 tools/autobuild/autobuild.sh    | 2 ++
 tools/autobuild/build-boards.sh | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/tools/autobuild/autobuild.sh b/tools/autobuild/autobuild.sh
index 569f729d1fc74..209460151664d 100755
--- a/tools/autobuild/autobuild.sh
+++ b/tools/autobuild/autobuild.sh
@@ -74,6 +74,8 @@ cd ../esp32
 (source ${IDF_PATH_V44}/export.sh && build_esp32_boards ${FW_TAG} ${LOCAL_FIRMWARE})
 cd ../mimxrt
 build_mimxrt_boards ${FW_TAG} ${LOCAL_FIRMWARE}
+cd ../nrf
+build_nrf_boards ${FW_TAG} ${LOCAL_FIRMWARE}
 cd ../renesas-ra
 build_renesas_ra_boards ${FW_TAG} ${LOCAL_FIRMWARE}
 cd ../rp2
diff --git a/tools/autobuild/build-boards.sh b/tools/autobuild/build-boards.sh
index 9caadc1b07ac0..b3d2f8c4c55aa 100755
--- a/tools/autobuild/build-boards.sh
+++ b/tools/autobuild/build-boards.sh
@@ -103,6 +103,10 @@ function build_mimxrt_boards {
     build_boards modmimxrt.c $1 $2 bin hex
 }
 
+function build_nrf_boards {
+    build_boards nrfx_glue.h $1 $2 bin hex
+}
+
 function build_renesas_ra_boards {
     build_boards ra_it.c $1 $2 hex
 }

From 5bf3765631e645412dbd62a616cfdadeca5ea0c3 Mon Sep 17 00:00:00 2001
From: Lars Haulin <lars.haulin@gmail.com>
Date: Fri, 8 Jul 2022 17:48:40 +0200
Subject: [PATCH 2329/3533] py/objnamedtuple: Fix segfault with empty
 namedtuple.

The empty tuple is usually a constant object, but named tuples must be
allocated to allow modification.  Added explicit allocation to fix this.

Also added a regression test to verify creating an empty named tuple works.

Fixes issue #7870.

Signed-off-by: Lars Haulin <lars.haulin@gmail.com>
---
 py/objnamedtuple.c          | 7 ++++---
 tests/basics/namedtuple1.py | 5 +++++
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/py/objnamedtuple.c b/py/objnamedtuple.c
index 214cad2572d7d..b2129935067c1 100644
--- a/py/objnamedtuple.c
+++ b/py/objnamedtuple.c
@@ -108,9 +108,10 @@ STATIC mp_obj_t namedtuple_make_new(const mp_obj_type_t *type_in, size_t n_args,
         #endif
     }
 
-    // Create a tuple and set the type to this namedtuple
-    mp_obj_tuple_t *tuple = MP_OBJ_TO_PTR(mp_obj_new_tuple(num_fields, NULL));
-    tuple->base.type = type_in;
+    // Create a namedtuple with explicit malloc. Calling mp_obj_new_tuple
+    // with num_fields=0 returns a read-only object.
+    mp_obj_tuple_t *tuple = mp_obj_malloc_var(mp_obj_tuple_t, mp_obj_t, num_fields, type_in);
+    tuple->len = num_fields;
 
     // Copy the positional args into the first slots of the namedtuple
     memcpy(&tuple->items[0], args, sizeof(mp_obj_t) * n_args);
diff --git a/tests/basics/namedtuple1.py b/tests/basics/namedtuple1.py
index 47c0360eb9bee..e8247e4d6e130 100644
--- a/tests/basics/namedtuple1.py
+++ b/tests/basics/namedtuple1.py
@@ -85,3 +85,8 @@
 # Not implemented so far
 #T2 = namedtuple("TupComma", "foo,bar")
 #t = T2(1, 2)
+
+# Creating an empty namedtuple should not segfault
+T5 = namedtuple("TupEmpty", [])
+t = T5()
+print(t)

From 262f4a48554358d3d5866ddbcc23169ffb202f68 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Thu, 14 Jul 2022 21:10:58 +0200
Subject: [PATCH 2330/3533] nrf/mpconfigport: Remove obsolete module
 declarations.

External module declarations are no longer used/needed after the
introduction of MP_REGISTER_MODULE.
---
 ports/nrf/mpconfigport.h | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/ports/nrf/mpconfigport.h b/ports/nrf/mpconfigport.h
index 243c30809a206..dc7c3b1ea468a 100644
--- a/ports/nrf/mpconfigport.h
+++ b/ports/nrf/mpconfigport.h
@@ -295,14 +295,6 @@ typedef int mp_int_t; // must be pointer size
 typedef unsigned int mp_uint_t; // must be pointer size
 typedef long mp_off_t;
 
-// extra built in modules to add to the list of known ones
-extern const struct _mp_obj_module_t board_module;
-extern const struct _mp_obj_module_t nrf_module;
-extern const struct _mp_obj_module_t mp_module_utime;
-extern const struct _mp_obj_module_t mp_module_uos;
-extern const struct _mp_obj_module_t mp_module_ubluepy;
-extern const struct _mp_obj_module_t music_module;
-
 #if BOARD_SPECIFIC_MODULES
 #include "boardmodules.h"
 #endif // BOARD_SPECIFIC_MODULES
@@ -314,7 +306,6 @@ extern const struct _mp_obj_module_t music_module;
 
 // extra constants
 #define MICROPY_PORT_CONSTANTS \
-    { MP_ROM_QSTR(MP_QSTR_board), MP_ROM_PTR(&board_module) }, \
     { MP_ROM_QSTR(MP_QSTR_machine), MP_ROM_PTR(&mp_module_machine) }, \
 
 #define MP_STATE_PORT MP_STATE_VM

From 30c7f1790b26b3b156d3143d30c37bd4c992a810 Mon Sep 17 00:00:00 2001
From: Stuart Langridge <sil@kryogenix.org>
Date: Thu, 27 Jan 2022 16:56:58 +0000
Subject: [PATCH 2331/3533] nrf/drivers/bluetooth: Handle PHY_UPDATE messages,
 used in Bluetooth 5.

Some devices, such as the LightBlue BTLE app on iOS, try to use Bluetooth 5
when connecting to a device.  This means that they will send a
BLE_GAP_EVT_PHY_UPDATE_REQUEST message to shift to a new physical layer.
If this event isn't handled, LightBlue (and likely other Bluetooth 5.0
central devices) will try to connect and then fail, staying in
"Connecting..." state forever.  This message should be replied to with
sd_ble_gap_phy_update, as documented in
drivers/bluetooth/s140_nrf52_6.1.1/s140_nrf52_6.1.1_API/include/ble_gap.h.

This commit handles the event.  LightBlue can now successfully connect to a
BTLE device on a P10059 nRF52840 dongle running MicroPython.  Two other
related events have logging added in case they are needed in the future.
---
 ports/nrf/drivers/bluetooth/ble_drv.c | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/ports/nrf/drivers/bluetooth/ble_drv.c b/ports/nrf/drivers/bluetooth/ble_drv.c
index 0040580933315..173d3eda0152b 100644
--- a/ports/nrf/drivers/bluetooth/ble_drv.c
+++ b/ports/nrf/drivers/bluetooth/ble_drv.c
@@ -1136,6 +1136,24 @@ static void ble_evt_handler(ble_evt_t * p_ble_evt) {
             sd_ble_gap_data_length_update(p_ble_evt->evt.gap_evt.conn_handle, NULL, NULL);
             break;
 
+        case BLE_GAP_EVT_PHY_UPDATE_REQUEST:
+            BLE_DRIVER_LOG("BLE_GAP_EVT_PHY_UPDATE_REQUEST\n");
+            ble_gap_phys_t const phys =
+            {
+                BLE_GAP_PHY_AUTO,
+                BLE_GAP_PHY_AUTO,
+            };
+            sd_ble_gap_phy_update(p_ble_evt->evt.gap_evt.conn_handle, &phys);
+            break;
+
+        case BLE_GAP_EVT_PHY_UPDATE:
+            BLE_DRIVER_LOG("BLE_GAP_EVT_PHY_UPDATE -- unhandled!\n");
+            break;
+
+        case BLE_GAP_EVT_DATA_LENGTH_UPDATE:
+            BLE_DRIVER_LOG("BLE_GAP_EVT_DATA_LENGTH_UPDATE -- unhandled!\n");
+            break;
+
 #endif // (BLUETOOTH_SD == 132) || (BLUETOOTH_SD == 140)
 
         default:

From 60539ea162a15d38d974ee58f7c5430c565cf0eb Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Thu, 7 Jul 2022 21:19:28 +0200
Subject: [PATCH 2332/3533] nrf/drivers/usb: Probe for interrupt char in USB
 CDC task.

And ensure that the input queue is empty when scheduling the interrupt.
---
 ports/nrf/drivers/bluetooth/ble_uart.c |  2 +-
 ports/nrf/drivers/usb/usb_cdc.c        | 10 +++++++++-
 ports/nrf/modules/machine/uart.c       |  2 ++
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/ports/nrf/drivers/bluetooth/ble_uart.c b/ports/nrf/drivers/bluetooth/ble_uart.c
index c3712fe8c978f..3020f1af6267d 100644
--- a/ports/nrf/drivers/bluetooth/ble_uart.c
+++ b/ports/nrf/drivers/bluetooth/ble_uart.c
@@ -193,9 +193,9 @@ STATIC void gatts_event_handler(mp_obj_t self_in, uint16_t event_id, uint16_t at
             for (uint16_t i = 0; i < length; i++) {
                 #if MICROPY_KBD_EXCEPTION
                 if (data[i] == mp_interrupt_char) {
-                    mp_sched_keyboard_interrupt();
                     m_rx_ring_buffer.start = 0;
                     m_rx_ring_buffer.end = 0;
+                    mp_sched_keyboard_interrupt();
                 } else
                 #endif
                 {
diff --git a/ports/nrf/drivers/usb/usb_cdc.c b/ports/nrf/drivers/usb/usb_cdc.c
index a1d411a256f1c..eda933b89fee2 100644
--- a/ports/nrf/drivers/usb/usb_cdc.c
+++ b/ports/nrf/drivers/usb/usb_cdc.c
@@ -35,6 +35,8 @@
 #include "nrfx_uart.h"
 #include "py/ringbuf.h"
 #include "py/stream.h"
+#include "py/runtime.h"
+#include "shared/runtime/interrupt_char.h"
 
 #ifdef BLUETOOTH_SD
 #include "nrf_sdm.h"
@@ -127,7 +129,13 @@ static void cdc_task(void)
             int c;
             uint32_t count = tud_cdc_read(&c, 1);
             (void)count;
-            ringbuf_put((ringbuf_t*)&rx_ringbuf, c);
+            if (c == mp_interrupt_char) {
+                rx_ringbuf.iget = 0;
+                rx_ringbuf.iput = 0;
+                mp_sched_keyboard_interrupt();
+            } else {
+                ringbuf_put((ringbuf_t*)&rx_ringbuf, c);
+            }
         }
 
         int chars = 0;
diff --git a/ports/nrf/modules/machine/uart.c b/ports/nrf/modules/machine/uart.c
index 2cc421aa1f333..e8c82e57dd162 100644
--- a/ports/nrf/modules/machine/uart.c
+++ b/ports/nrf/modules/machine/uart.c
@@ -128,6 +128,8 @@ STATIC void uart_event_handler(nrfx_uart_event_t const *p_event, void *p_context
         nrfx_uart_rx(self->p_uart, &self->buf->rx_buf[0], 1);
         #if !MICROPY_PY_BLE_NUS && MICROPY_KBD_EXCEPTION
         if (chr == mp_interrupt_char) {
+            self->buf->rx_ringbuf.iget = 0;
+            self->buf->rx_ringbuf.iput = 0;
             mp_sched_keyboard_interrupt();
         } else
         #endif

From c985a0b5148cf51c400a53b692f570daf89d9810 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Fri, 8 Jul 2022 14:26:53 +0200
Subject: [PATCH 2333/3533] nrf/drivers/usb: Add a tud_cdc_rx_cb() callback to
 check interrupt char.

---
 ports/nrf/drivers/usb/usb_cdc.c | 32 +++++++++++++++++++-------------
 1 file changed, 19 insertions(+), 13 deletions(-)

diff --git a/ports/nrf/drivers/usb/usb_cdc.c b/ports/nrf/drivers/usb/usb_cdc.c
index eda933b89fee2..06071fe119e82 100644
--- a/ports/nrf/drivers/usb/usb_cdc.c
+++ b/ports/nrf/drivers/usb/usb_cdc.c
@@ -46,7 +46,7 @@
 
 extern void tusb_hal_nrf_power_event(uint32_t event);
 
-static void cdc_task(void);
+static void cdc_task(bool tx);
 
 static uint8_t rx_ringbuf_array[1024];
 static uint8_t tx_ringbuf_array[1024];
@@ -121,7 +121,7 @@ static int cdc_tx_char(void) {
     return ringbuf_get((ringbuf_t*)&tx_ringbuf);
 }
 
-static void cdc_task(void)
+static void cdc_task(bool tx)
 {
     if ( tud_cdc_connected() ) {
         // connected and there are data available
@@ -138,24 +138,30 @@ static void cdc_task(void)
             }
         }
 
-        int chars = 0;
-        while (cdc_tx_any()) {
-            if (chars < 64) {
-               tud_cdc_write_char(cdc_tx_char());
-               chars++;
-            } else {
-               chars = 0;
-               tud_cdc_write_flush();
+        if (tx) {
+            int chars = 0;
+            while (cdc_tx_any()) {
+                if (chars < 64) {
+                    tud_cdc_write_char(cdc_tx_char());
+                    chars++;
+                } else {
+                    chars = 0;
+                    tud_cdc_write_flush();
+                }
             }
-        }
 
-        tud_cdc_write_flush();
+            tud_cdc_write_flush();
+        }
     }
 }
 
 static void usb_cdc_loop(void) {
     tud_task();
-    cdc_task();
+    cdc_task(true);
+}
+
+void tud_cdc_rx_cb(uint8_t itf) {
+    cdc_task(false);
 }
 
 int usb_cdc_init(void)

From be6f0f3b3b99820d8aef835a8c2af1a1baaed049 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sat, 9 Jul 2022 08:54:29 +0200
Subject: [PATCH 2334/3533] nrf/mpconfigport: Call tud_task() in
 MICROPY_EVENT_POLL_HOOK.

So that the interrupt character can interrupt a long-running loop, like a
sleep.
---
 ports/nrf/mpconfigport.h | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/ports/nrf/mpconfigport.h b/ports/nrf/mpconfigport.h
index dc7c3b1ea468a..0698a52cefa60 100644
--- a/ports/nrf/mpconfigport.h
+++ b/ports/nrf/mpconfigport.h
@@ -346,8 +346,15 @@ typedef long mp_off_t;
     /* micro:bit root pointers */ \
     void *async_data[2]; \
 
+#if MICROPY_HW_USB_CDC
+#define MICROPY_HW_USBDEV_TASK_HOOK extern void tud_task(void); tud_task();
+#else
+#define MICROPY_HW_USBDEV_TASK_HOOK ;
+#endif
+
 #define MICROPY_EVENT_POLL_HOOK \
     do { \
+        MICROPY_HW_USBDEV_TASK_HOOK \
         extern void mp_handle_pending(bool); \
         mp_handle_pending(true); \
         __WFI(); \

From cca2305211688df0e13a14f67f1eaf67d9cb267e Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Tue, 12 Jul 2022 22:51:32 +0200
Subject: [PATCH 2335/3533] nrf/drivers/usb: Fix reading of a single USB CDC
 character.

---
 ports/nrf/drivers/usb/usb_cdc.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/ports/nrf/drivers/usb/usb_cdc.c b/ports/nrf/drivers/usb/usb_cdc.c
index 06071fe119e82..16d69fff66a39 100644
--- a/ports/nrf/drivers/usb/usb_cdc.c
+++ b/ports/nrf/drivers/usb/usb_cdc.c
@@ -126,9 +126,7 @@ static void cdc_task(bool tx)
     if ( tud_cdc_connected() ) {
         // connected and there are data available
         while (tud_cdc_available()) {
-            int c;
-            uint32_t count = tud_cdc_read(&c, 1);
-            (void)count;
+            int c = tud_cdc_read_char();
             if (c == mp_interrupt_char) {
                 rx_ringbuf.iget = 0;
                 rx_ringbuf.iput = 0;

From 6670281472aa3c931b08e623488a02c335aeda20 Mon Sep 17 00:00:00 2001
From: Yonatan Goldschmidt <yon.goldschmidt@gmail.com>
Date: Sat, 16 Jul 2022 16:47:41 +0300
Subject: [PATCH 2336/3533] py/misc: Add MP_STATIC_ASSERT_NOT_MSC().

To be used in cases where the condition of the assert does not compile
under msvc.

Signed-off-by: Yonatan Goldschmidt <yon.goldschmidt@gmail.com>
---
 py/misc.h | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/py/misc.h b/py/misc.h
index d94afd0b0db77..b7b6146abcce6 100644
--- a/py/misc.h
+++ b/py/misc.h
@@ -52,6 +52,11 @@ typedef unsigned int uint;
 
 // Static assertion macro
 #define MP_STATIC_ASSERT(cond) ((void)sizeof(char[1 - 2 * !(cond)]))
+#if defined(_MSC_VER)
+#define MP_STATIC_ASSERT_NOT_MSC(cond) (1)
+#else
+#define MP_STATIC_ASSERT_NOT_MSC(cond) MP_STATIC_ASSERT(cond)
+#endif
 
 // Round-up integer division
 #define MP_CEIL_DIVIDE(a, b) (((a) + (b) - 1) / (b))

From 2a6ba47110be88ff1e1f5abd1bd76c353447884c Mon Sep 17 00:00:00 2001
From: Yonatan Goldschmidt <yon.goldschmidt@gmail.com>
Date: Wed, 22 Jan 2020 13:34:19 +0100
Subject: [PATCH 2337/3533] py/obj: Add static safety checks to
 mp_obj_is_type().

Commit d96cfd13e3a464862c introduced a regression by breaking existing
users of mp_obj_is_type(.., &mp_obj_bool).  This function (and associated
helpers like mp_obj_is_int()) have some specific nuances, and mistakes like
this one can happen again.

This commit adds mp_obj_is_exact_type() which behaves like the the old
mp_obj_is_type().  The new mp_obj_is_type() has the same prototype but it
attempts to statically assert that it's not called with types which should
be checked using mp_obj_is_type().  If called with any of these types: int,
str, bool, NoneType - it will cause a compilation error.  Additional
checked types (e.g function types) can be added in the future.

Existing users of mp_obj_is_type() with the now "invalid" types, were
translated to use mp_obj_is_exact_type().

The use of MP_STATIC_ASSERT() is not bulletproof - usually GCC (and other
compilers) can't statically check conditions that are only known during
link-time (like variables' addresses comparison).  However, in this case,
GCC is able to statically detect these conditions, probably because it's
the exact same object - `&mp_type_int == &mp_type_int` is detected.
Misuses of this function with runtime-chosen types (e.g:
`mp_obj_type_t *x = ...; mp_obj_is_type(..., x);` won't be detected.  MSC
is unable to detect this, so we use MP_STATIC_ASSERT_NOT_MSC().

Compiling with this commit and without the fix for d96cfd13e3a464862c shows
that it detects the problem.

Signed-off-by: Yonatan Goldschmidt <yon.goldschmidt@gmail.com>
---
 py/binary.c          |  4 ++--
 py/map.c             |  2 +-
 py/obj.c             |  8 ++++----
 py/obj.h             | 22 ++++++++++++++++++----
 py/objexcept.c       |  2 +-
 py/objfun.c          |  2 +-
 py/objint.c          |  2 +-
 py/objint_longlong.c |  8 ++++----
 py/objint_mpz.c      | 10 +++++-----
 py/objstr.c          |  2 +-
 10 files changed, 38 insertions(+), 24 deletions(-)

diff --git a/py/binary.c b/py/binary.c
index 05e658c952411..f59e89ca48226 100644
--- a/py/binary.c
+++ b/py/binary.c
@@ -334,7 +334,7 @@ void mp_binary_set_val(char struct_type, char val_type, mp_obj_t val_in, byte *p
         #endif
         default:
             #if MICROPY_LONGINT_IMPL != MICROPY_LONGINT_IMPL_NONE
-            if (mp_obj_is_type(val_in, &mp_type_int)) {
+            if (mp_obj_is_exact_type(val_in, &mp_type_int)) {
                 mp_obj_int_to_bytes_impl(val_in, struct_type == '>', size, p);
                 return;
             }
@@ -371,7 +371,7 @@ void mp_binary_set_val_array(char typecode, void *p, size_t index, mp_obj_t val_
             break;
         default:
             #if MICROPY_LONGINT_IMPL != MICROPY_LONGINT_IMPL_NONE
-            if (mp_obj_is_type(val_in, &mp_type_int)) {
+            if (mp_obj_is_exact_type(val_in, &mp_type_int)) {
                 size_t size = mp_binary_get_size('@', typecode, NULL);
                 mp_obj_int_to_bytes_impl(val_in, MP_ENDIANNESS_BIG,
                     size, (uint8_t *)p + index * size);
diff --git a/py/map.c b/py/map.c
index b194250cb4f59..7a6f2233e6000 100644
--- a/py/map.c
+++ b/py/map.c
@@ -174,7 +174,7 @@ mp_map_elem_t *MICROPY_WRAP_MP_MAP_LOOKUP(mp_map_lookup)(mp_map_t * map, mp_obj_
     if (compare_only_ptrs) {
         if (mp_obj_is_qstr(index)) {
             // Index is a qstr, so can just do ptr comparison.
-        } else if (mp_obj_is_type(index, &mp_type_str)) {
+        } else if (mp_obj_is_exact_type(index, &mp_type_str)) {
             // Index is a non-interned string.
             // We can either intern the string, or force a full equality comparison.
             // We chose the latter, since interning costs time and potentially RAM,
diff --git a/py/obj.c b/py/obj.c
index 024de3c96cd05..51f6d85defb79 100644
--- a/py/obj.c
+++ b/py/obj.c
@@ -304,7 +304,7 @@ mp_int_t mp_obj_get_int(mp_const_obj_t arg) {
         return 1;
     } else if (mp_obj_is_small_int(arg)) {
         return MP_OBJ_SMALL_INT_VALUE(arg);
-    } else if (mp_obj_is_type(arg, &mp_type_int)) {
+    } else if (mp_obj_is_exact_type(arg, &mp_type_int)) {
         return mp_obj_int_get_checked(arg);
     } else {
         mp_obj_t res = mp_unary_op(MP_UNARY_OP_INT, (mp_obj_t)arg);
@@ -330,7 +330,7 @@ bool mp_obj_get_int_maybe(mp_const_obj_t arg, mp_int_t *value) {
         *value = 1;
     } else if (mp_obj_is_small_int(arg)) {
         *value = MP_OBJ_SMALL_INT_VALUE(arg);
-    } else if (mp_obj_is_type(arg, &mp_type_int)) {
+    } else if (mp_obj_is_exact_type(arg, &mp_type_int)) {
         *value = mp_obj_int_get_checked(arg);
     } else {
         return false;
@@ -349,7 +349,7 @@ bool mp_obj_get_float_maybe(mp_obj_t arg, mp_float_t *value) {
     } else if (mp_obj_is_small_int(arg)) {
         val = (mp_float_t)MP_OBJ_SMALL_INT_VALUE(arg);
     #if MICROPY_LONGINT_IMPL != MICROPY_LONGINT_IMPL_NONE
-    } else if (mp_obj_is_type(arg, &mp_type_int)) {
+    } else if (mp_obj_is_exact_type(arg, &mp_type_int)) {
         val = mp_obj_int_as_float_impl(arg);
     #endif
     } else if (mp_obj_is_float(arg)) {
@@ -389,7 +389,7 @@ bool mp_obj_get_complex_maybe(mp_obj_t arg, mp_float_t *real, mp_float_t *imag)
         *real = (mp_float_t)MP_OBJ_SMALL_INT_VALUE(arg);
         *imag = 0;
     #if MICROPY_LONGINT_IMPL != MICROPY_LONGINT_IMPL_NONE
-    } else if (mp_obj_is_type(arg, &mp_type_int)) {
+    } else if (mp_obj_is_exact_type(arg, &mp_type_int)) {
         *real = mp_obj_int_as_float_impl(arg);
         *imag = 0;
     #endif
diff --git a/py/obj.h b/py/obj.h
index 84ca94213ceff..ea3d2db706f18 100644
--- a/py/obj.h
+++ b/py/obj.h
@@ -743,15 +743,29 @@ void *mp_obj_malloc_helper(size_t num_bytes, const mp_obj_type_t *type);
 // check for more specific object types.
 // Note: these are kept as macros because inline functions sometimes use much
 // more code space than the equivalent macros, depending on the compiler.
-#define mp_obj_is_type(o, t) (mp_obj_is_obj(o) && (((mp_obj_base_t *)MP_OBJ_TO_PTR(o))->type == (t))) // this does not work for checking int, str or fun; use below macros for that
+// don't use mp_obj_is_exact_type directly; use mp_obj_is_type which provides additional safety checks.
+// use the former only if you need to bypass these checks (because you've already checked everything else)
+#define mp_obj_is_exact_type(o, t) (mp_obj_is_obj(o) && (((mp_obj_base_t *)MP_OBJ_TO_PTR(o))->type == (t)))
+
+// Type checks are split to a separate, constant result macro. This is so it doesn't hinder the compilers's
+// optimizations (other tricks like using ({ expr; exper; }) or (exp, expr, expr) in mp_obj_is_type() result
+// in missed optimizations)
+#define mp_type_assert_not_bool_int_str_nonetype(t) (         \
+     MP_STATIC_ASSERT_NOT_MSC((t) != &mp_type_bool),          \
+     MP_STATIC_ASSERT_NOT_MSC((t) != &mp_type_int),           \
+     MP_STATIC_ASSERT_NOT_MSC((t) != &mp_type_str),           \
+     MP_STATIC_ASSERT_NOT_MSC((t) != &mp_type_NoneType),      \
+     1)
+
+#define mp_obj_is_type(o, t) (mp_type_assert_not_bool_int_str_nonetype(t) && mp_obj_is_exact_type(o, t))
 #if MICROPY_OBJ_IMMEDIATE_OBJS
 // bool's are immediates, not real objects, so test for the 2 possible values.
 #define mp_obj_is_bool(o) ((o) == mp_const_false || (o) == mp_const_true)
 #else
-#define mp_obj_is_bool(o) mp_obj_is_type(o, &mp_type_bool)
+#define mp_obj_is_bool(o) mp_obj_is_exact_type(o, &mp_type_bool)
 #endif
-#define mp_obj_is_int(o) (mp_obj_is_small_int(o) || mp_obj_is_type(o, &mp_type_int))
-#define mp_obj_is_str(o) (mp_obj_is_qstr(o) || mp_obj_is_type(o, &mp_type_str))
+#define mp_obj_is_int(o) (mp_obj_is_small_int(o) || mp_obj_is_exact_type(o, &mp_type_int))
+#define mp_obj_is_str(o) (mp_obj_is_qstr(o) || mp_obj_is_exact_type(o, &mp_type_str))
 #define mp_obj_is_str_or_bytes(o) (mp_obj_is_qstr(o) || (mp_obj_is_obj(o) && ((mp_obj_base_t *)MP_OBJ_TO_PTR(o))->type->binary_op == mp_obj_str_binary_op))
 #define mp_obj_is_dict_or_ordereddict(o) (mp_obj_is_obj(o) && ((mp_obj_base_t *)MP_OBJ_TO_PTR(o))->type->make_new == mp_obj_dict_make_new)
 #define mp_obj_is_fun(o) (mp_obj_is_obj(o) && (((mp_obj_base_t *)MP_OBJ_TO_PTR(o))->type->name == MP_QSTR_function))
diff --git a/py/objexcept.c b/py/objexcept.c
index dca287bb6ed12..028b73fd8b217 100644
--- a/py/objexcept.c
+++ b/py/objexcept.c
@@ -122,7 +122,7 @@ STATIC mp_obj_exception_t *get_native_exception(mp_obj_t self_in) {
 
 STATIC void decompress_error_text_maybe(mp_obj_exception_t *o) {
     #if MICROPY_ROM_TEXT_COMPRESSION
-    if (o->args->len == 1 && mp_obj_is_type(o->args->items[0], &mp_type_str)) {
+    if (o->args->len == 1 && mp_obj_is_exact_type(o->args->items[0], &mp_type_str)) {
         mp_obj_str_t *o_str = MP_OBJ_TO_PTR(o->args->items[0]);
         if (MP_IS_COMPRESSED_ROM_STRING(o_str->data)) {
             byte *buf = m_new_maybe(byte, MP_MAX_UNCOMPRESSED_TEXT_LEN + 1);
diff --git a/py/objfun.c b/py/objfun.c
index 37c1eaa549064..5fa9d71ddaf42 100644
--- a/py/objfun.c
+++ b/py/objfun.c
@@ -468,7 +468,7 @@ STATIC mp_uint_t convert_obj_for_inline_asm(mp_obj_t obj) {
         return 0;
     } else if (obj == mp_const_true) {
         return 1;
-    } else if (mp_obj_is_type(obj, &mp_type_int)) {
+    } else if (mp_obj_is_exact_type(obj, &mp_type_int)) {
         return mp_obj_int_get_truncated(obj);
     } else if (mp_obj_is_str(obj)) {
         // pointer to the string (it's probably constant though!)
diff --git a/py/objint.c b/py/objint.c
index 5ff5e7de4b574..740e7ea948df8 100644
--- a/py/objint.c
+++ b/py/objint.c
@@ -232,7 +232,7 @@ char *mp_obj_int_formatted(char **buf, size_t *buf_size, size_t *fmt_size, mp_co
         // A small int; get the integer value to format.
         num = MP_OBJ_SMALL_INT_VALUE(self_in);
     } else {
-        assert(mp_obj_is_type(self_in, &mp_type_int));
+        assert(mp_obj_is_exact_type(self_in, &mp_type_int));
         // Not a small int.
         #if MICROPY_LONGINT_IMPL == MICROPY_LONGINT_IMPL_LONGLONG
         const mp_obj_int_t *self = self_in;
diff --git a/py/objint_longlong.c b/py/objint_longlong.c
index 7fcb5462f804d..1c07588367f95 100644
--- a/py/objint_longlong.c
+++ b/py/objint_longlong.c
@@ -58,7 +58,7 @@ mp_obj_t mp_obj_int_from_bytes_impl(bool big_endian, size_t len, const byte *buf
 }
 
 void mp_obj_int_to_bytes_impl(mp_obj_t self_in, bool big_endian, size_t len, byte *buf) {
-    assert(mp_obj_is_type(self_in, &mp_type_int));
+    assert(mp_obj_is_exact_type(self_in, &mp_type_int));
     mp_obj_int_t *self = self_in;
     long long val = self->val;
     if (big_endian) {
@@ -131,13 +131,13 @@ mp_obj_t mp_obj_int_binary_op(mp_binary_op_t op, mp_obj_t lhs_in, mp_obj_t rhs_i
     if (mp_obj_is_small_int(lhs_in)) {
         lhs_val = MP_OBJ_SMALL_INT_VALUE(lhs_in);
     } else {
-        assert(mp_obj_is_type(lhs_in, &mp_type_int));
+        assert(mp_obj_is_exact_type(lhs_in, &mp_type_int));
         lhs_val = ((mp_obj_int_t *)lhs_in)->val;
     }
 
     if (mp_obj_is_small_int(rhs_in)) {
         rhs_val = MP_OBJ_SMALL_INT_VALUE(rhs_in);
-    } else if (mp_obj_is_type(rhs_in, &mp_type_int)) {
+    } else if (mp_obj_is_exact_type(rhs_in, &mp_type_int)) {
         rhs_val = ((mp_obj_int_t *)rhs_in)->val;
     } else {
         // delegate to generic function to check for extra cases
@@ -284,7 +284,7 @@ mp_int_t mp_obj_int_get_checked(mp_const_obj_t self_in) {
 
 #if MICROPY_PY_BUILTINS_FLOAT
 mp_float_t mp_obj_int_as_float_impl(mp_obj_t self_in) {
-    assert(mp_obj_is_type(self_in, &mp_type_int));
+    assert(mp_obj_is_exact_type(self_in, &mp_type_int));
     mp_obj_int_t *self = self_in;
     return self->val;
 }
diff --git a/py/objint_mpz.c b/py/objint_mpz.c
index cbc4cb75a782a..2811bcf2aab21 100644
--- a/py/objint_mpz.c
+++ b/py/objint_mpz.c
@@ -91,7 +91,7 @@ mp_obj_int_t *mp_obj_int_new_mpz(void) {
 // This particular routine should only be called for the mpz representation of the int.
 char *mp_obj_int_formatted_impl(char **buf, size_t *buf_size, size_t *fmt_size, mp_const_obj_t self_in,
     int base, const char *prefix, char base_char, char comma) {
-    assert(mp_obj_is_type(self_in, &mp_type_int));
+    assert(mp_obj_is_exact_type(self_in, &mp_type_int));
     const mp_obj_int_t *self = MP_OBJ_TO_PTR(self_in);
 
     size_t needed_size = mp_int_format_size(mpz_max_num_bits(&self->mpz), base, prefix, comma);
@@ -113,7 +113,7 @@ mp_obj_t mp_obj_int_from_bytes_impl(bool big_endian, size_t len, const byte *buf
 }
 
 void mp_obj_int_to_bytes_impl(mp_obj_t self_in, bool big_endian, size_t len, byte *buf) {
-    assert(mp_obj_is_type(self_in, &mp_type_int));
+    assert(mp_obj_is_exact_type(self_in, &mp_type_int));
     mp_obj_int_t *self = MP_OBJ_TO_PTR(self_in);
     mpz_as_bytes(&self->mpz, big_endian, len, buf);
 }
@@ -181,7 +181,7 @@ mp_obj_t mp_obj_int_binary_op(mp_binary_op_t op, mp_obj_t lhs_in, mp_obj_t rhs_i
         mpz_init_fixed_from_int(&z_int, z_int_dig, MPZ_NUM_DIG_FOR_INT, MP_OBJ_SMALL_INT_VALUE(lhs_in));
         zlhs = &z_int;
     } else {
-        assert(mp_obj_is_type(lhs_in, &mp_type_int));
+        assert(mp_obj_is_exact_type(lhs_in, &mp_type_int));
         zlhs = &((mp_obj_int_t *)MP_OBJ_TO_PTR(lhs_in))->mpz;
     }
 
@@ -189,7 +189,7 @@ mp_obj_t mp_obj_int_binary_op(mp_binary_op_t op, mp_obj_t lhs_in, mp_obj_t rhs_i
     if (mp_obj_is_small_int(rhs_in)) {
         mpz_init_fixed_from_int(&z_int, z_int_dig, MPZ_NUM_DIG_FOR_INT, MP_OBJ_SMALL_INT_VALUE(rhs_in));
         zrhs = &z_int;
-    } else if (mp_obj_is_type(rhs_in, &mp_type_int)) {
+    } else if (mp_obj_is_exact_type(rhs_in, &mp_type_int)) {
         zrhs = &((mp_obj_int_t *)MP_OBJ_TO_PTR(rhs_in))->mpz;
     #if MICROPY_PY_BUILTINS_FLOAT
     } else if (mp_obj_is_float(rhs_in)) {
@@ -447,7 +447,7 @@ mp_uint_t mp_obj_int_get_uint_checked(mp_const_obj_t self_in) {
 
 #if MICROPY_PY_BUILTINS_FLOAT
 mp_float_t mp_obj_int_as_float_impl(mp_obj_t self_in) {
-    assert(mp_obj_is_type(self_in, &mp_type_int));
+    assert(mp_obj_is_exact_type(self_in, &mp_type_int));
     mp_obj_int_t *self = MP_OBJ_TO_PTR(self_in);
     return mpz_as_float(&self->mpz);
 }
diff --git a/py/objstr.c b/py/objstr.c
index 6e5a316d784ad..f15a2d974458b 100644
--- a/py/objstr.c
+++ b/py/objstr.c
@@ -2144,7 +2144,7 @@ STATIC NORETURN void bad_implicit_conversion(mp_obj_t self_in) {
 qstr mp_obj_str_get_qstr(mp_obj_t self_in) {
     if (mp_obj_is_qstr(self_in)) {
         return MP_OBJ_QSTR_VALUE(self_in);
-    } else if (mp_obj_is_type(self_in, &mp_type_str)) {
+    } else if (mp_obj_is_exact_type(self_in, &mp_type_str)) {
         mp_obj_str_t *self = MP_OBJ_TO_PTR(self_in);
         return qstr_from_strn((char *)self->data, self->len);
     } else {

From a8d78cc39839aaf4a77bef05377c457c7ba75ead Mon Sep 17 00:00:00 2001
From: Yonatan Goldschmidt <yon.goldschmidt@gmail.com>
Date: Wed, 22 Jan 2020 22:21:20 +0100
Subject: [PATCH 2338/3533] py/obj: Add debug-only runtime checks to
 mp_obj_is_type().

Zero effect on non debug builds, and also usually optimized out even in
debug builds as mp_obj_is_type() is called with a compile-time known type.
I'm not sure we even have dynamic uses of mp_obj_is_type() at the moment,
but if we ever will they will be protected from now on.

Signed-off-by: Yonatan Goldschmidt <yon.goldschmidt@gmail.com>
---
 py/obj.h | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/py/obj.h b/py/obj.h
index ea3d2db706f18..c94d09afabbef 100644
--- a/py/obj.h
+++ b/py/obj.h
@@ -750,12 +750,12 @@ void *mp_obj_malloc_helper(size_t num_bytes, const mp_obj_type_t *type);
 // Type checks are split to a separate, constant result macro. This is so it doesn't hinder the compilers's
 // optimizations (other tricks like using ({ expr; exper; }) or (exp, expr, expr) in mp_obj_is_type() result
 // in missed optimizations)
-#define mp_type_assert_not_bool_int_str_nonetype(t) (         \
-     MP_STATIC_ASSERT_NOT_MSC((t) != &mp_type_bool),          \
-     MP_STATIC_ASSERT_NOT_MSC((t) != &mp_type_int),           \
-     MP_STATIC_ASSERT_NOT_MSC((t) != &mp_type_str),           \
-     MP_STATIC_ASSERT_NOT_MSC((t) != &mp_type_NoneType),      \
-     1)
+#define mp_type_assert_not_bool_int_str_nonetype(t) (                                     \
+    MP_STATIC_ASSERT_NOT_MSC((t) != &mp_type_bool), assert((t) != &mp_type_bool),         \
+    MP_STATIC_ASSERT_NOT_MSC((t) != &mp_type_int), assert((t) != &mp_type_int),           \
+    MP_STATIC_ASSERT_NOT_MSC((t) != &mp_type_str), assert((t) != &mp_type_str),           \
+    MP_STATIC_ASSERT_NOT_MSC((t) != &mp_type_NoneType), assert((t) != &mp_type_NoneType), \
+    1)
 
 #define mp_obj_is_type(o, t) (mp_type_assert_not_bool_int_str_nonetype(t) && mp_obj_is_exact_type(o, t))
 #if MICROPY_OBJ_IMMEDIATE_OBJS

From fc3d7ae11be11a7f05709ebfd439061fce9ee555 Mon Sep 17 00:00:00 2001
From: David Lechner <david@pybricks.com>
Date: Fri, 1 Jul 2022 12:29:08 -0500
Subject: [PATCH 2339/3533] py/make_root_pointers: Add MP_REGISTER_ROOT_POINTER
 parser/generator.

This adds new compile-time infrastructure to parse source code files for
`MP_REGISTER_ROOT_POINTER()` and generates a new `root_pointers.h` header
file containing the collected declarations.  This works the same as the
existing `MP_REGISTER_MODULE()` feature.

Signed-off-by: David Lechner <david@pybricks.com>
---
 ports/cc3200/bootmgr/bootloader.mk |  4 +++
 ports/stm32/mboot/Makefile         |  6 +++-
 ports/windows/msvc/genhdr.targets  | 21 ++++++++++--
 py/make_root_pointers.py           | 55 ++++++++++++++++++++++++++++++
 py/makeqstrdefs.py                 | 11 ++++--
 py/mkrules.cmake                   | 30 ++++++++++++++++
 py/mkrules.mk                      | 16 +++++++--
 py/mpstate.h                       |  7 ++++
 py/obj.h                           | 11 ++++--
 py/py.mk                           |  5 +++
 10 files changed, 154 insertions(+), 12 deletions(-)
 create mode 100644 py/make_root_pointers.py

diff --git a/ports/cc3200/bootmgr/bootloader.mk b/ports/cc3200/bootmgr/bootloader.mk
index e5b817391d2fc..3aeda062ce422 100644
--- a/ports/cc3200/bootmgr/bootloader.mk
+++ b/ports/cc3200/bootmgr/bootloader.mk
@@ -134,3 +134,7 @@ $(HEADER_BUILD)/mpversion.h: | $(HEADER_BUILD)
 # Create an empty "moduledefs.h" needed by py/mkrules.mk
 $(HEADER_BUILD)/moduledefs.h: | $(HEADER_BUILD)
 	touch $@
+
+# Create an empty "root_pointers.h" needed by py/mkrules.mk
+$(HEADER_BUILD)/root_pointers.h: | $(HEADER_BUILD)
+	touch $@
diff --git a/ports/stm32/mboot/Makefile b/ports/stm32/mboot/Makefile
index db39daf8820d8..4c903b4ff603e 100755
--- a/ports/stm32/mboot/Makefile
+++ b/ports/stm32/mboot/Makefile
@@ -213,6 +213,7 @@ PREFIX_FILE = ../boards/stm32f4xx_prefix.c
 BOARD_PINS = $(BOARD_DIR)/pins.csv
 HEADER_BUILD = $(BUILD)/genhdr
 GEN_QSTRDEFS_GENERATED = $(HEADER_BUILD)/qstrdefs.generated.h
+GEN_ROOT_POINTERS = $(HEADER_BUILD)/root_pointers.h
 GEN_PINS_SRC = $(BUILD)/pins_$(BOARD).c
 GEN_PINS_HDR = $(HEADER_BUILD)/pins.h
 GEN_PINS_QSTR = $(HEADER_BUILD)/pins_qstr.h
@@ -220,7 +221,7 @@ GEN_PINS_AF_CONST = $(HEADER_BUILD)/pins_af_const.h
 GEN_PINS_AF_DEFS = $(HEADER_BUILD)/pins_af_defs.h
 GEN_PINS_AF_PY = $(BUILD)/pins_af.py
 
-$(OBJ): $(GEN_QSTRDEFS_GENERATED) $(GEN_PINS_AF_DEFS)
+$(OBJ): $(GEN_QSTRDEFS_GENERATED) $(GEN_ROOT_POINTERS) $(GEN_PINS_AF_DEFS)
 
 $(HEADER_BUILD):
 	$(MKDIR) -p $(BUILD)/genhdr
@@ -228,6 +229,9 @@ $(HEADER_BUILD):
 $(GEN_QSTRDEFS_GENERATED): | $(HEADER_BUILD)
 	$(Q)echo "// empty" > $@
 
+$(GEN_ROOT_POINTERS): | $(HEADER_BUILD)
+	$(Q)echo "// empty" > $@
+
 $(GEN_PINS_AF_DEFS): $(BOARD_PINS) $(MAKE_PINS) ../$(AF_FILE) $(PREFIX_FILE) | $(HEADER_BUILD)
 	$(ECHO) "GEN $@"
 	$(Q)$(PYTHON) $(MAKE_PINS) --board $(BOARD_PINS) --af ../$(AF_FILE) \
diff --git a/ports/windows/msvc/genhdr.targets b/ports/windows/msvc/genhdr.targets
index 84520078f09fd..11c5eae8aea8c 100644
--- a/ports/windows/msvc/genhdr.targets
+++ b/ports/windows/msvc/genhdr.targets
@@ -4,7 +4,7 @@
   <Import Project="paths.props" Condition="'$(PyPathsIncluded)' != 'True'"/>
 
   <!--Generate qstrdefs.generated.h and mpversion.h similar to what is done in py/mkrules.mk and py/py.mk-->
-  <Target Name="GenerateHeaders" DependsOnTargets="MakeVersionHdr;MakeModuleDefs;MakeQstrData">
+  <Target Name="GenerateHeaders" DependsOnTargets="MakeVersionHdr;MakeModuleDefs;MakeRootPointers;MakeQstrData">
   </Target>
 
   <PropertyGroup>
@@ -15,6 +15,7 @@
     <QstrDefsCollected>$(DestDir)qstrdefscollected.h</QstrDefsCollected>
     <QstrGen>$(DestDir)qstrdefs.generated.h</QstrGen>
     <ModuleDefsCollected>$(DestDir)/moduledefs.collected</ModuleDefsCollected>
+    <RootPointersCollected>$(DestDir)/root_pointers.collected</RootPointersCollected>
     <PyPython Condition="'$(PyPython)' == ''">$(MICROPY_CPYTHON3)</PyPython>
     <PyPython Condition="'$(PyPython)' == ''">python</PyPython>
     <CLToolExe Condition="'$(CLToolExe)' == ''">cl.exe</CLToolExe>
@@ -45,7 +46,7 @@
 using(var outFile = System.IO.File.CreateText(OutputFile)) {
   foreach(var inFile in InputFiles)
     foreach(var line in System.IO.File.ReadAllLines(inFile))
-      if((line.Contains(".c") && line.StartsWith("#line")) || line.Contains("MP_QSTR"))
+      if((line.Contains(".c") && line.StartsWith("#line")) || line.Contains("MP_QSTR") || line.Contains("MP_REGISTER"))
         outFile.WriteLine( line );
 }
         ]]>
@@ -114,6 +115,20 @@ using(var outFile = System.IO.File.CreateText(OutputFile)) {
     <MSBuild Projects="$(MSBuildThisFileFullPath)" Targets="CopyFileIfDifferent" Properties="SourceFile=$(TmpFile);DestFile=$(DestFile)"/>
   </Target>
 
+  <Target Name="CollectRootPointers" DependsOnTargets="MakeQstrDefs" Inputs="$(DestDir)qstr.i.last" Outputs="$(RootPointersCollected)">
+    <Exec Command="$(PyPython) $(PySrcDir)makeqstrdefs.py split root_pointer $(DestDir)qstr.i.last $(DestDir)root_pointer _"/>
+    <Exec Command="$(PyPython) $(PySrcDir)makeqstrdefs.py cat root_pointer _ $(DestDir)root_pointer $(RootPointersCollected)"/>
+  </Target>
+
+  <Target Name="MakeRootPointers" DependsOnTargets="CollectRootPointers" Inputs="$(PySrcDir)make_root_pointers.py;$(RootPointersCollected)" Outputs="$(DestDir)root_pointers.h">
+    <PropertyGroup>
+      <DestFile>$(DestDir)root_pointers.h</DestFile>
+      <TmpFile>$(DestFile).tmp</TmpFile>
+    </PropertyGroup>
+    <Exec Command="$(PyPython) $(PySrcDir)make_root_pointers.py $(RootPointersCollected) > $(TmpFile)"/>
+    <MSBuild Projects="$(MSBuildThisFileFullPath)" Targets="CopyFileIfDifferent" Properties="SourceFile=$(TmpFile);DestFile=$(DestFile)"/>
+  </Target>
+
   <Target Name="MakeQstrData" DependsOnTargets="MakeQstrDefs" Inputs="$(QstrDefsCollected);$(PyQstrDefs);$(QstrDefs)" Outputs="$(QstrGen)">
     <PropertyGroup>
       <TmpFile>$(QstrGen).tmp</TmpFile>
@@ -132,7 +147,7 @@ using(var outFile = System.IO.File.CreateText(OutputFile)) {
     <MSBuild Projects="$(MSBuildThisFileFullPath)" Targets="CopyFileIfDifferent" Properties="SourceFile=$(TmpFile);DestFile=$(DestFile)"/>
   </Target>
 
-  <Target Name="FreezeModules" Condition="'$(FrozenManifest)' != ''" DependsOnTargets="MakeQstrData" Inputs="$(FrozenManifest)" Outputs="$(PyBuildDir)frozen_content.c">
+  <Target Name="FreezeModules" Condition="'$(FrozenManifest)' != ''" DependsOnTargets="MakeQstrData;MakeRootPointers" Inputs="$(FrozenManifest)" Outputs="$(PyBuildDir)frozen_content.c">
     <ItemGroup>
       <ClCompile Include="$(PyBuildDir)frozen_content.c"/>
       <ClCompile>
diff --git a/py/make_root_pointers.py b/py/make_root_pointers.py
new file mode 100644
index 0000000000000..efe398b8227ca
--- /dev/null
+++ b/py/make_root_pointers.py
@@ -0,0 +1,55 @@
+"""
+This pre-processor parses a single file containing a list of
+MP_REGISTER_ROOT_POINTER(variable declaration) items.
+
+These are used to generate a header with the required entries for
+"struct _mp_state_vm_t" in py/mpstate.h
+"""
+
+from __future__ import print_function
+
+import argparse
+import io
+import re
+
+
+PATTERN = re.compile(r"MP_REGISTER_ROOT_POINTER\((.*?)\);")
+
+
+def find_root_pointer_registrations(filename):
+    """Find any MP_REGISTER_ROOT_POINTER definitions in the provided file.
+
+    :param str filename: path to file to check
+    :return: List[variable_declaration]
+    """
+    with io.open(filename, encoding="utf-8") as c_file_obj:
+        return set(re.findall(PATTERN, c_file_obj.read()))
+
+
+def generate_root_pointer_header(root_pointers):
+    """Generate header with root pointer entries.
+
+    :param List[variable_declaration] root_pointers: root pointer declarations
+    :return: None
+    """
+
+    # Print header file for all external modules.
+    print("// Automatically generated by make_root_pointers.py.")
+    print()
+
+    for item in root_pointers:
+        print(item, end=";")
+        print()
+
+
+def main():
+    parser = argparse.ArgumentParser()
+    parser.add_argument("file", nargs=1, help="file with MP_REGISTER_ROOT_POINTER definitions")
+    args = parser.parse_args()
+
+    root_pointers = find_root_pointer_registrations(args.file[0])
+    generate_root_pointer_header(sorted(root_pointers))
+
+
+if __name__ == "__main__":
+    main()
diff --git a/py/makeqstrdefs.py b/py/makeqstrdefs.py
index 4c416a874a6ed..c445d6d1fe0cc 100644
--- a/py/makeqstrdefs.py
+++ b/py/makeqstrdefs.py
@@ -24,6 +24,9 @@
 # Extract MP_REGISTER_MODULE(...) macros.
 _MODE_MODULE = "module"
 
+# Extract MP_REGISTER_ROOT_POINTER(...) macros.
+_MODE_ROOT_POINTER = "root_pointer"
+
 
 def is_c_source(fname):
     return os.path.splitext(fname)[1] in [".c"]
@@ -90,6 +93,8 @@ def process_file(f):
         re_match = re.compile(r'MP_COMPRESSED_ROM_TEXT\("([^"]*)"\)')
     elif args.mode == _MODE_MODULE:
         re_match = re.compile(r"MP_REGISTER_MODULE\(.*?,\s*.*?\);")
+    elif args.mode == _MODE_ROOT_POINTER:
+        re_match = re.compile(r"MP_REGISTER_ROOT_POINTER\(.*?\);")
     output = []
     last_fname = None
     for line in f:
@@ -111,7 +116,7 @@ def process_file(f):
             if args.mode == _MODE_QSTR:
                 name = match.replace("MP_QSTR_", "")
                 output.append("Q(" + name + ")")
-            elif args.mode in (_MODE_COMPRESS, _MODE_MODULE):
+            elif args.mode in (_MODE_COMPRESS, _MODE_MODULE, _MODE_ROOT_POINTER):
                 output.append(match)
 
     if last_fname:
@@ -148,6 +153,8 @@ def cat_together():
         mode_full = "Compressed data"
     elif args.mode == _MODE_MODULE:
         mode_full = "Module registrations"
+    elif args.mode == _MODE_ROOT_POINTER:
+        mode_full = "Root pointer registrations"
     if old_hash != new_hash:
         print(mode_full, "updated")
         try:
@@ -208,7 +215,7 @@ class Args:
     args.output_dir = sys.argv[4]
     args.output_file = None if len(sys.argv) == 5 else sys.argv[5]  # Unused for command=split
 
-    if args.mode not in (_MODE_QSTR, _MODE_COMPRESS, _MODE_MODULE):
+    if args.mode not in (_MODE_QSTR, _MODE_COMPRESS, _MODE_MODULE, _MODE_ROOT_POINTER):
         print("error: mode %s unrecognised" % sys.argv[2])
         sys.exit(2)
 
diff --git a/py/mkrules.cmake b/py/mkrules.cmake
index 4d0bbd22ad189..d7be0f934b158 100644
--- a/py/mkrules.cmake
+++ b/py/mkrules.cmake
@@ -11,6 +11,9 @@ set(MICROPY_QSTRDEFS_GENERATED "${MICROPY_GENHDR_DIR}/qstrdefs.generated.h")
 set(MICROPY_MODULEDEFS_SPLIT "${MICROPY_GENHDR_DIR}/moduledefs.split")
 set(MICROPY_MODULEDEFS_COLLECTED "${MICROPY_GENHDR_DIR}/moduledefs.collected")
 set(MICROPY_MODULEDEFS "${MICROPY_GENHDR_DIR}/moduledefs.h")
+set(MICROPY_ROOT_POINTERS_SPLIT "${MICROPY_GENHDR_DIR}/root_pointers.split")
+set(MICROPY_ROOT_POINTERS_COLLECTED "${MICROPY_GENHDR_DIR}/root_pointers.collected")
+set(MICROPY_ROOT_POINTERS "${MICROPY_GENHDR_DIR}/root_pointers.h")
 
 # Need to do this before extracting MICROPY_CPP_DEF below. Rest of frozen
 # manifest handling is at the end of this file.
@@ -46,6 +49,7 @@ target_sources(${MICROPY_TARGET} PRIVATE
     ${MICROPY_MPVERSION}
     ${MICROPY_QSTRDEFS_GENERATED}
     ${MICROPY_MODULEDEFS}
+    ${MICROPY_ROOT_POINTERS}
 )
 
 # Command to force the build of another command
@@ -139,6 +143,31 @@ add_custom_command(
     DEPENDS ${MICROPY_MODULEDEFS_COLLECTED}
 )
 
+# Generate root_pointers.h
+
+add_custom_command(
+    OUTPUT ${MICROPY_ROOT_POINTERS_SPLIT}
+    COMMAND ${Python3_EXECUTABLE} ${MICROPY_PY_DIR}/makeqstrdefs.py split root_pointer ${MICROPY_GENHDR_DIR}/qstr.i.last ${MICROPY_GENHDR_DIR}/root_pointer _
+    COMMAND touch ${MICROPY_ROOT_POINTERS_SPLIT}
+    DEPENDS ${MICROPY_QSTRDEFS_LAST}
+    VERBATIM
+    COMMAND_EXPAND_LISTS
+)
+
+add_custom_command(
+    OUTPUT ${MICROPY_ROOT_POINTERS_COLLECTED}
+    COMMAND ${Python3_EXECUTABLE} ${MICROPY_PY_DIR}/makeqstrdefs.py cat root_pointer _ ${MICROPY_GENHDR_DIR}/root_pointer ${MICROPY_ROOT_POINTERS_COLLECTED}
+    DEPENDS ${MICROPY_ROOT_POINTERS_SPLIT}
+    VERBATIM
+    COMMAND_EXPAND_LISTS
+)
+
+add_custom_command(
+    OUTPUT ${MICROPY_ROOT_POINTERS}
+    COMMAND ${Python3_EXECUTABLE} ${MICROPY_PY_DIR}/make_root_pointers.py ${MICROPY_ROOT_POINTERS_COLLECTED} > ${MICROPY_ROOT_POINTERS}
+    DEPENDS ${MICROPY_ROOT_POINTERS_COLLECTED} ${MICROPY_PY_DIR}/make_root_pointers.py
+)
+
 # Build frozen code if enabled
 
 if(MICROPY_FROZEN_MANIFEST)
@@ -174,6 +203,7 @@ if(MICROPY_FROZEN_MANIFEST)
         COMMAND ${Python3_EXECUTABLE} ${MICROPY_DIR}/tools/makemanifest.py -o ${MICROPY_FROZEN_CONTENT} -v "MPY_DIR=${MICROPY_DIR}" -v "MPY_LIB_DIR=${MICROPY_LIB_DIR}" -v "PORT_DIR=${MICROPY_PORT_DIR}" -v "BOARD_DIR=${MICROPY_BOARD_DIR}" -b "${CMAKE_BINARY_DIR}" -f${MICROPY_CROSS_FLAGS} ${MICROPY_FROZEN_MANIFEST}
         DEPENDS MICROPY_FORCE_BUILD
             ${MICROPY_QSTRDEFS_GENERATED}
+            ${MICROPY_ROOT_POINTERS}
             ${MICROPY_MPYCROSS_DEPENDENCY}
         VERBATIM
     )
diff --git a/py/mkrules.mk b/py/mkrules.mk
index fa1aad881bae9..a7c437386f8eb 100644
--- a/py/mkrules.mk
+++ b/py/mkrules.mk
@@ -7,8 +7,8 @@ endif
 # Extra deps that need to happen before object compilation.
 OBJ_EXTRA_ORDER_DEPS =
 
-# Generate moduledefs.h.
-OBJ_EXTRA_ORDER_DEPS += $(HEADER_BUILD)/moduledefs.h
+# Generate header files.
+OBJ_EXTRA_ORDER_DEPS += $(HEADER_BUILD)/moduledefs.h $(HEADER_BUILD)/root_pointers.h
 
 ifeq ($(MICROPY_ROM_TEXT_COMPRESSION),1)
 # If compression is enabled, trigger the build of compressed.data.h...
@@ -126,6 +126,16 @@ $(HEADER_BUILD)/moduledefs.collected: $(HEADER_BUILD)/moduledefs.split
 	$(ECHO) "GEN $@"
 	$(Q)$(PYTHON) $(PY_SRC)/makeqstrdefs.py cat module _ $(HEADER_BUILD)/module $@
 
+# Module definitions via MP_REGISTER_ROOT_POINTER.
+$(HEADER_BUILD)/root_pointers.split: $(HEADER_BUILD)/qstr.i.last
+	$(ECHO) "GEN $@"
+	$(Q)$(PYTHON) $(PY_SRC)/makeqstrdefs.py split root_pointer $< $(HEADER_BUILD)/root_pointer _
+	$(Q)$(TOUCH) $@
+
+$(HEADER_BUILD)/root_pointers.collected: $(HEADER_BUILD)/root_pointers.split
+	$(ECHO) "GEN $@"
+	$(Q)$(PYTHON) $(PY_SRC)/makeqstrdefs.py cat root_pointer _ $(HEADER_BUILD)/root_pointer $@
+
 # Compressed error strings.
 $(HEADER_BUILD)/compressed.split: $(HEADER_BUILD)/qstr.i.last
 	$(ECHO) "GEN $@"
@@ -165,7 +175,7 @@ endif
 
 ifneq ($(FROZEN_MANIFEST),)
 # to build frozen_content.c from a manifest
-$(BUILD)/frozen_content.c: FORCE $(BUILD)/genhdr/qstrdefs.generated.h | $(MICROPY_MPYCROSS_DEPENDENCY)
+$(BUILD)/frozen_content.c: FORCE $(BUILD)/genhdr/qstrdefs.generated.h $(BUILD)/genhdr/root_pointers.h | $(MICROPY_MPYCROSS_DEPENDENCY)
 	$(Q)$(MAKE_MANIFEST) -o $@ -v "MPY_DIR=$(TOP)" -v "MPY_LIB_DIR=$(MPY_LIB_DIR)" -v "PORT_DIR=$(shell pwd)" -v "BOARD_DIR=$(BOARD_DIR)" -b "$(BUILD)" $(if $(MPY_CROSS_FLAGS),-f"$(MPY_CROSS_FLAGS)",) --mpy-tool-flags="$(MPY_TOOL_FLAGS)" $(FROZEN_MANIFEST)
 endif
 
diff --git a/py/mpstate.h b/py/mpstate.h
index 98aa9a84989c5..07a4f386093f5 100644
--- a/py/mpstate.h
+++ b/py/mpstate.h
@@ -192,6 +192,13 @@ typedef struct _mp_state_vm_t {
     // include any root pointers defined by a port
     MICROPY_PORT_ROOT_POINTERS
 
+    // Include any root pointers registered with MP_REGISTER_ROOT_POINTER().
+    #ifndef NO_QSTR
+    // Only include root pointer definitions when not doing qstr extraction, because
+    // the qstr extraction stage also generates the root pointers header file.
+    #include "genhdr/root_pointers.h"
+    #endif
+
     // root pointers for extmod
 
     #if MICROPY_REPL_EVENT_DRIVEN
diff --git a/py/obj.h b/py/obj.h
index c94d09afabbef..7ba4c0a5f2892 100644
--- a/py/obj.h
+++ b/py/obj.h
@@ -416,13 +416,18 @@ typedef struct _mp_rom_obj_t { mp_const_obj_t o; } mp_rom_obj_t;
 #define MP_DEFINE_CONST_STATICMETHOD_OBJ(obj_name, fun_name) const mp_rom_obj_static_class_method_t obj_name = {{&mp_type_staticmethod}, fun_name}
 #define MP_DEFINE_CONST_CLASSMETHOD_OBJ(obj_name, fun_name) const mp_rom_obj_static_class_method_t obj_name = {{&mp_type_classmethod}, fun_name}
 
+#ifndef NO_QSTR
+
 // Declare a module as a builtin, processed by makemoduledefs.py
 // param module_name: MP_QSTR_<module name>
 // param obj_module: mp_obj_module_t instance
-
-#ifndef NO_QSTR
 #define MP_REGISTER_MODULE(module_name, obj_module)
-#endif
+
+// Declare a root pointer (to avoid garbage collection of a global static variable).
+// param variable_declaration: a valid C variable declaration
+#define MP_REGISTER_ROOT_POINTER(variable_declaration)
+
+#endif // NO_QSTR
 
 // Underlying map/hash table implementation (not dict object or map function)
 
diff --git a/py/py.mk b/py/py.mk
index dacfa1bd0680a..8aac460b478a0 100644
--- a/py/py.mk
+++ b/py/py.mk
@@ -218,6 +218,11 @@ $(HEADER_BUILD)/moduledefs.h: $(HEADER_BUILD)/moduledefs.collected
 	@$(ECHO) "GEN $@"
 	$(Q)$(PYTHON) $(PY_SRC)/makemoduledefs.py $< > $@
 
+# build a list of registered root pointers for py/mpstate.h.
+$(HEADER_BUILD)/root_pointers.h: $(HEADER_BUILD)/root_pointers.collected $(PY_SRC)/make_root_pointers.py
+	@$(ECHO) "GEN $@"
+	$(Q)$(PYTHON) $(PY_SRC)/make_root_pointers.py $< > $@
+
 # Standard C functions like memset need to be compiled with special flags so
 # the compiler does not optimise these functions in terms of themselves.
 CFLAGS_BUILTIN ?= -ffreestanding -fno-builtin -fno-lto

From 81dbea1ce3c27a609a9b27caadd12cceef86a907 Mon Sep 17 00:00:00 2001
From: David Lechner <david@pybricks.com>
Date: Fri, 1 Jul 2022 14:06:10 -0500
Subject: [PATCH 2340/3533] shared/readline: Use MP_REGISTER_ROOT_POINTER().

This uses MP_REGISTER_ROOT_POINTER() to register the readline_history root
pointer array used by shared/readline.c and removes the registration from
all mpconfigport.h files.

This also required adding a new MICROPY_READLINE_HISTORY_SIZE config option
since not all ports used the same sized array.

Signed-off-by: David Lechner <david@pybricks.com>
---
 docs/develop/porting.rst                  |  3 ---
 examples/embedding/mpconfigport_minimal.h |  2 --
 ports/cc3200/mpconfigport.h               |  1 -
 ports/esp32/mpconfigport.h                |  1 -
 ports/esp8266/mpconfigport.h              |  1 -
 ports/javascript/Makefile                 |  2 +-
 ports/javascript/mpconfigport.h           |  3 ---
 ports/mimxrt/Makefile                     |  1 +
 ports/mimxrt/mpconfigport.h               |  1 -
 ports/minimal/Makefile                    |  1 +
 ports/minimal/mpconfigport.h              |  3 ---
 ports/nrf/mpconfigport.h                  |  1 -
 ports/pic16bit/mpconfigport.h             |  1 -
 ports/powerpc/Makefile                    |  2 ++
 ports/powerpc/mpconfigport.h              |  3 ---
 ports/renesas-ra/mpconfigport.h           |  2 --
 ports/rp2/CMakeLists.txt                  |  1 +
 ports/rp2/mpconfigport.h                  |  1 -
 ports/samd/Makefile                       |  1 +
 ports/samd/mpconfigport.h                 |  3 ---
 ports/stm32/mpconfigport.h                |  2 --
 ports/teensy/mpconfigport.h               |  1 -
 ports/unix/mpconfigport.h                 |  4 +++-
 ports/windows/mpconfigport.h              | 12 ++++++------
 ports/zephyr/mpconfigport.h               |  1 -
 ports/zephyr/mpconfigport_minimal.h       |  3 ---
 py/mpconfig.h                             |  5 +++++
 shared/readline/readline.c                | 15 ++++++++++-----
 28 files changed, 31 insertions(+), 46 deletions(-)

diff --git a/docs/develop/porting.rst b/docs/develop/porting.rst
index 3d0553205c11a..0511f5d276d80 100644
--- a/docs/develop/porting.rst
+++ b/docs/develop/porting.rst
@@ -174,9 +174,6 @@ The following is an example of an ``mpconfigport.h`` file:
 
    #define MP_STATE_PORT MP_STATE_VM
 
-   #define MICROPY_PORT_ROOT_POINTERS \
-       const char *readline_hist[8];
-
 This configuration file contains machine-specific configurations including aspects like if different
 MicroPython features should be enabled e.g. ``#define MICROPY_ENABLE_GC (1)``. Making this Setting
 ``(0)`` disables the feature.
diff --git a/examples/embedding/mpconfigport_minimal.h b/examples/embedding/mpconfigport_minimal.h
index 6cc84dcbc1e41..91b194bc7bc3f 100644
--- a/examples/embedding/mpconfigport_minimal.h
+++ b/examples/embedding/mpconfigport_minimal.h
@@ -87,8 +87,6 @@
 #define MICROPY_PY_UHASHLIB         (0)
 #define MICROPY_PY_UBINASCII        (0)
 
-#define MICROPY_PORT_ROOT_POINTERS \
-
 //////////////////////////////////////////
 // Do not change anything beyond this line
 //////////////////////////////////////////
diff --git a/ports/cc3200/mpconfigport.h b/ports/cc3200/mpconfigport.h
index 58ec80a9f5cf5..ce708cb3f486b 100644
--- a/ports/cc3200/mpconfigport.h
+++ b/ports/cc3200/mpconfigport.h
@@ -142,7 +142,6 @@
 // vm state and root pointers for the gc
 #define MP_STATE_PORT MP_STATE_VM
 #define MICROPY_PORT_ROOT_POINTERS                                        \
-    const char *readline_hist[8];                                         \
     mp_obj_t mp_const_user_interrupt;                                     \
     mp_obj_t machine_config_main;                                         \
     mp_obj_list_t pyb_sleep_obj_list;                                     \
diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h
index 1877a01437f1c..a374d81203a14 100644
--- a/ports/esp32/mpconfigport.h
+++ b/ports/esp32/mpconfigport.h
@@ -146,7 +146,6 @@ struct mp_bluetooth_nimble_root_pointers_t;
 #endif
 
 #define MICROPY_PORT_ROOT_POINTERS \
-    const char *readline_hist[8]; \
     mp_obj_t machine_pin_irq_handler[40]; \
     struct _machine_timer_obj_t *machine_timer_obj_head; \
     struct _machine_i2s_obj_t *machine_i2s_obj[I2S_NUM_MAX]; \
diff --git a/ports/esp8266/mpconfigport.h b/ports/esp8266/mpconfigport.h
index 7727f7845aa7f..3f1db723a5410 100644
--- a/ports/esp8266/mpconfigport.h
+++ b/ports/esp8266/mpconfigport.h
@@ -148,7 +148,6 @@ extern const struct _mp_print_t mp_debug_print;
 #define MP_STATE_PORT MP_STATE_VM
 
 #define MICROPY_PORT_ROOT_POINTERS \
-    const char *readline_hist[8]; \
     mp_obj_t pin_irq_handler[16]; \
     byte *uart0_rxbuf; \
 
diff --git a/ports/javascript/Makefile b/ports/javascript/Makefile
index aea9d6ec37031..046d303336a95 100644
--- a/ports/javascript/Makefile
+++ b/ports/javascript/Makefile
@@ -30,7 +30,7 @@ SRC_C = \
 	mphalport.c \
 	modutime.c \
 
-SRC_QSTR += $(SRC_C)
+SRC_QSTR += $(SRC_C) $(SRC_SHARED)
 
 OBJ += $(PY_O)
 OBJ += $(addprefix $(BUILD)/, $(SRC_SHARED:.c=.o))
diff --git a/ports/javascript/mpconfigport.h b/ports/javascript/mpconfigport.h
index 4a6cb458838bd..01a61e391d00b 100644
--- a/ports/javascript/mpconfigport.h
+++ b/ports/javascript/mpconfigport.h
@@ -182,6 +182,3 @@ typedef long mp_off_t;
 #define MICROPY_HW_MCU_NAME "Emscripten"
 
 #define MP_STATE_PORT MP_STATE_VM
-
-#define MICROPY_PORT_ROOT_POINTERS \
-    const char *readline_hist[8];
diff --git a/ports/mimxrt/Makefile b/ports/mimxrt/Makefile
index 7ae3f918371b3..be1c95ba95759 100644
--- a/ports/mimxrt/Makefile
+++ b/ports/mimxrt/Makefile
@@ -290,6 +290,7 @@ SRC_QSTR += \
 	modmimxrt.c \
 	modutime.c \
 	pin.c \
+	shared/readline/readline.c \
 	shared/runtime/mpirq.c \
 	shared/runtime/sys_stdio_mphal.c \
 	$(GEN_PINS_SRC)
diff --git a/ports/mimxrt/mpconfigport.h b/ports/mimxrt/mpconfigport.h
index 1dcaccad4795f..3bff3e474d934 100644
--- a/ports/mimxrt/mpconfigport.h
+++ b/ports/mimxrt/mpconfigport.h
@@ -242,7 +242,6 @@ extern const struct _mp_obj_type_t network_lan_type;
 #endif
 
 #define MICROPY_PORT_ROOT_POINTERS \
-    const char *readline_hist[8]; \
     struct _machine_timer_obj_t *timer_table[MICROPY_HW_PIT_NUM_CHANNELS]; \
     void *machine_pin_irq_objects[MICROPY_HW_NUM_PIN_IRQS]; \
     /* list of registered NICs */ \
diff --git a/ports/minimal/Makefile b/ports/minimal/Makefile
index fc3730e700b02..ac74925b5752e 100644
--- a/ports/minimal/Makefile
+++ b/ports/minimal/Makefile
@@ -68,6 +68,7 @@ SRC_C += $(SRC_MOD)
 
 SRC_CXX += $(SRC_MOD_CXX)
 
+SRC_QSTR += shared/readline/readline.c
 SRC_QSTR += $(SRC_MOD) $(SRC_MOD_CXX)
 
 OBJ += $(PY_CORE_O) $(addprefix $(BUILD)/, $(SRC_C:.c=.o))
diff --git a/ports/minimal/mpconfigport.h b/ports/minimal/mpconfigport.h
index 7d6a3adedcebe..02312e2e400e8 100644
--- a/ports/minimal/mpconfigport.h
+++ b/ports/minimal/mpconfigport.h
@@ -41,6 +41,3 @@ typedef long mp_off_t;
 #endif
 
 #define MP_STATE_PORT MP_STATE_VM
-
-#define MICROPY_PORT_ROOT_POINTERS \
-    const char *readline_hist[8];
diff --git a/ports/nrf/mpconfigport.h b/ports/nrf/mpconfigport.h
index 0698a52cefa60..fcbe71c5a06a9 100644
--- a/ports/nrf/mpconfigport.h
+++ b/ports/nrf/mpconfigport.h
@@ -332,7 +332,6 @@ typedef long mp_off_t;
 #endif
 
 #define MICROPY_PORT_ROOT_POINTERS \
-    const char *readline_hist[8]; \
     mp_obj_t pin_class_mapper; \
     mp_obj_t pin_class_map_dict; \
     mp_obj_t pin_irq_handlers[NUM_OF_PINS]; \
diff --git a/ports/pic16bit/mpconfigport.h b/ports/pic16bit/mpconfigport.h
index e97a465028283..e03fb81a6a3a0 100644
--- a/ports/pic16bit/mpconfigport.h
+++ b/ports/pic16bit/mpconfigport.h
@@ -92,7 +92,6 @@ typedef int mp_off_t;
 #define MP_STATE_PORT MP_STATE_VM
 
 #define MICROPY_PORT_ROOT_POINTERS \
-    char *readline_hist[8]; \
     mp_obj_t keyboard_interrupt_obj; \
 
 #define MICROPY_MPHALPORT_H "pic16bit_mphal.h"
diff --git a/ports/powerpc/Makefile b/ports/powerpc/Makefile
index a1e6fa4daca2c..f1ebd6764cfd5 100644
--- a/ports/powerpc/Makefile
+++ b/ports/powerpc/Makefile
@@ -42,6 +42,8 @@ SRC_C = \
 	shared/runtime/stdout_helpers.c \
 	$(BUILD)/_frozen_mpy.c \
 
+SRC_QSTR += shared/readline/readline.c
+
 OBJ = $(PY_CORE_O)
 OBJ += $(addprefix $(BUILD)/, $(SRC_C:.c=.o))
 OBJ += $(BUILD)/head.o
diff --git a/ports/powerpc/mpconfigport.h b/ports/powerpc/mpconfigport.h
index 0b868e3dafabf..084a461a4a738 100644
--- a/ports/powerpc/mpconfigport.h
+++ b/ports/powerpc/mpconfigport.h
@@ -112,9 +112,6 @@ typedef long mp_off_t;
 
 #define MP_STATE_PORT MP_STATE_VM
 
-#define MICROPY_PORT_ROOT_POINTERS \
-    const char *readline_hist[8];
-
 // powerpc64 gcc doesn't seem to define these
 // These are pointers, so make them 64 bit types
 typedef long intptr_t;
diff --git a/ports/renesas-ra/mpconfigport.h b/ports/renesas-ra/mpconfigport.h
index 64caa69fd26a4..11b106999a9d2 100644
--- a/ports/renesas-ra/mpconfigport.h
+++ b/ports/renesas-ra/mpconfigport.h
@@ -168,8 +168,6 @@
 #endif
 
 #define MICROPY_PORT_ROOT_POINTERS \
-    const char *readline_hist[8]; \
-    \
     mp_obj_t pyb_hid_report_desc; \
     \
     mp_obj_t pyb_config_main; \
diff --git a/ports/rp2/CMakeLists.txt b/ports/rp2/CMakeLists.txt
index 202261f9c1fc2..8f7895459eb75 100644
--- a/ports/rp2/CMakeLists.txt
+++ b/ports/rp2/CMakeLists.txt
@@ -130,6 +130,7 @@ set(MICROPY_SOURCE_PORT
 
 set(MICROPY_SOURCE_QSTR
     ${MICROPY_SOURCE_PY}
+    ${MICROPY_DIR}/shared/readline/readline.c
     ${MICROPY_DIR}/shared/runtime/mpirq.c
     ${MICROPY_DIR}/shared/runtime/sys_stdio_mphal.c
     ${PROJECT_SOURCE_DIR}/machine_adc.c
diff --git a/ports/rp2/mpconfigport.h b/ports/rp2/mpconfigport.h
index 1a63476c7c146..1e851048443cf 100644
--- a/ports/rp2/mpconfigport.h
+++ b/ports/rp2/mpconfigport.h
@@ -231,7 +231,6 @@ extern const struct _mod_network_nic_type_t mod_network_nic_type_wiznet5k;
 #endif
 
 #define MICROPY_PORT_ROOT_POINTERS \
-    const char *readline_hist[8]; \
     void *machine_pin_irq_obj[30]; \
     void *rp2_pio_irq_obj[2]; \
     void *rp2_state_machine_irq_obj[8]; \
diff --git a/ports/samd/Makefile b/ports/samd/Makefile
index 17dd811690f9c..b3d6d8b228fda 100644
--- a/ports/samd/Makefile
+++ b/ports/samd/Makefile
@@ -127,6 +127,7 @@ SRC_QSTR += \
 	machine_led.c \
 	modsamd.c \
 	samd_flash.c \
+	shared/readline/readline.c \
 
 SRC_QSTR += $(SRC_MOD) $(SRC_CXX)
 
diff --git a/ports/samd/mpconfigport.h b/ports/samd/mpconfigport.h
index 1625496a2e14a..96d34bf4da048 100644
--- a/ports/samd/mpconfigport.h
+++ b/ports/samd/mpconfigport.h
@@ -99,9 +99,6 @@
 #define mp_type_fileio mp_type_vfs_lfs1_fileio
 #define mp_type_textio mp_type_vfs_lfs1_textio
 
-#define MICROPY_PORT_ROOT_POINTERS \
-    const char *readline_hist[8];
-
 #define MP_STATE_PORT MP_STATE_VM
 
 // Miscellaneous settings
diff --git a/ports/stm32/mpconfigport.h b/ports/stm32/mpconfigport.h
index a87fe3768f179..4afad339bd4e7 100644
--- a/ports/stm32/mpconfigport.h
+++ b/ports/stm32/mpconfigport.h
@@ -258,8 +258,6 @@ struct _mp_bluetooth_btstack_root_pointers_t;
 #endif
 
 #define MICROPY_PORT_ROOT_POINTERS \
-    const char *readline_hist[8]; \
-    \
     mp_obj_t pyb_hid_report_desc; \
     \
     mp_obj_t pyb_config_main; \
diff --git a/ports/teensy/mpconfigport.h b/ports/teensy/mpconfigport.h
index db1f56757a215..b870263dfc8b7 100644
--- a/ports/teensy/mpconfigport.h
+++ b/ports/teensy/mpconfigport.h
@@ -42,7 +42,6 @@ extern const struct _mp_obj_module_t pyb_module;
 #define MP_STATE_PORT MP_STATE_VM
 
 #define MICROPY_PORT_ROOT_POINTERS \
-    const char *readline_hist[8]; \
     mp_obj_t pin_class_mapper; \
     mp_obj_t pin_class_map_dict; \
     struct _pyb_uart_obj_t *pyb_stdio_uart; \
diff --git a/ports/unix/mpconfigport.h b/ports/unix/mpconfigport.h
index 232bfb857cc4a..4594b8be9dc28 100644
--- a/ports/unix/mpconfigport.h
+++ b/ports/unix/mpconfigport.h
@@ -129,6 +129,9 @@
 #define MICROPY_READER_POSIX        (1)
 #define MICROPY_READER_VFS          (1)
 #define MICROPY_USE_READLINE_HISTORY (1)
+#ifndef MICROPY_READLINE_HISTORY_SIZE
+#define MICROPY_READLINE_HISTORY_SIZE 50
+#endif
 #define MICROPY_HELPER_LEXER_UNIX   (1)
 #ifndef MICROPY_FLOAT_IMPL
 #define MICROPY_FLOAT_IMPL          (MICROPY_FLOAT_IMPL_DOUBLE)
@@ -302,7 +305,6 @@ struct _mp_bluetooth_nimble_malloc_t;
 #endif
 
 #define MICROPY_PORT_ROOT_POINTERS \
-    const char *readline_hist[50]; \
     void *mmap_region_head; \
     MICROPY_BLUETOOTH_ROOT_POINTERS \
 
diff --git a/ports/windows/mpconfigport.h b/ports/windows/mpconfigport.h
index 47292b3bb6bc8..39f8c0059c616 100644
--- a/ports/windows/mpconfigport.h
+++ b/ports/windows/mpconfigport.h
@@ -33,6 +33,12 @@
 #ifndef MICROPY_USE_READLINE
 #define MICROPY_USE_READLINE        (1)
 #endif
+#ifndef MICROPY_USE_READLINE_HISTORY
+#define MICROPY_USE_READLINE_HISTORY (1)
+#endif
+#ifndef MICROPY_READLINE_HISTORY_SIZE
+#define MICROPY_READLINE_HISTORY_SIZE (50)
+#endif
 
 #define MICROPY_ALLOC_PATH_MAX      (260) // see minwindef.h for msvc or limits.h for mingw
 #define MICROPY_PERSISTENT_CODE_LOAD (1)
@@ -52,7 +58,6 @@
 #define MICROPY_DEBUG_PRINTERS      (1)
 #define MICROPY_READER_POSIX        (1)
 #define MICROPY_READER_VFS          (1)
-#define MICROPY_USE_READLINE_HISTORY (1)
 #define MICROPY_HELPER_REPL         (1)
 #define MICROPY_REPL_EMACS_KEYS     (1)
 #define MICROPY_REPL_AUTO_INDENT    (1)
@@ -210,11 +215,6 @@ typedef long long mp_off_t;
 typedef long mp_off_t;
 #endif
 
-#if MICROPY_USE_READLINE == 1
-#define MICROPY_PORT_ROOT_POINTERS \
-    char *readline_hist[50];
-#endif
-
 #define MP_STATE_PORT               MP_STATE_VM
 
 #define MICROPY_MPHALPORT_H         "windows_mphal.h"
diff --git a/ports/zephyr/mpconfigport.h b/ports/zephyr/mpconfigport.h
index 26610ccced45c..1be755baabfdb 100644
--- a/ports/zephyr/mpconfigport.h
+++ b/ports/zephyr/mpconfigport.h
@@ -134,7 +134,6 @@ typedef long mp_off_t;
 #define MP_STATE_PORT MP_STATE_VM
 
 #define MICROPY_PORT_ROOT_POINTERS \
-    const char *readline_hist[8]; \
     void *machine_pin_irq_list; /* Linked list of pin irq objects */ \
     struct _mp_bluetooth_zephyr_root_pointers_t *bluetooth_zephyr_root_pointers;
 
diff --git a/ports/zephyr/mpconfigport_minimal.h b/ports/zephyr/mpconfigport_minimal.h
index f0e57d7566382..e819d5cf41ca0 100644
--- a/ports/zephyr/mpconfigport_minimal.h
+++ b/ports/zephyr/mpconfigport_minimal.h
@@ -83,6 +83,3 @@ typedef unsigned mp_uint_t; // must be pointer size
 typedef long mp_off_t;
 
 #define MP_STATE_PORT MP_STATE_VM
-
-#define MICROPY_PORT_ROOT_POINTERS \
-    const char *readline_hist[8];
diff --git a/py/mpconfig.h b/py/mpconfig.h
index d70d39ae97e85..adaa3ec1fbae0 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -699,6 +699,11 @@
 #define MICROPY_REPL_EVENT_DRIVEN (0)
 #endif
 
+// The number of items to keep in the readline history.
+#ifndef MICROPY_READLINE_HISTORY_SIZE
+#define MICROPY_READLINE_HISTORY_SIZE (8)
+#endif
+
 // Whether to include lexer helper function for unix
 #ifndef MICROPY_HELPER_LEXER_UNIX
 #define MICROPY_HELPER_LEXER_UNIX (0)
diff --git a/shared/readline/readline.c b/shared/readline/readline.c
index 9b8961712d0d8..b85bbd5bea85a 100644
--- a/shared/readline/readline.c
+++ b/shared/readline/readline.c
@@ -40,16 +40,19 @@
 #define DEBUG_printf(...) (void)0
 #endif
 
-#define READLINE_HIST_SIZE (MP_ARRAY_SIZE(MP_STATE_PORT(readline_hist)))
-
 // flags for readline_t.auto_indent_state
 #define AUTO_INDENT_ENABLED (0x01)
 #define AUTO_INDENT_JUST_ADDED (0x02)
 
 enum { ESEQ_NONE, ESEQ_ESC, ESEQ_ESC_BRACKET, ESEQ_ESC_BRACKET_DIGIT, ESEQ_ESC_O };
 
+#ifdef _MSC_VER
+// work around MSVC compiler bug: https://stackoverflow.com/q/62259834/1976323
+#pragma warning(disable : 4090)
+#endif
+
 void readline_init0(void) {
-    memset(MP_STATE_PORT(readline_hist), 0, READLINE_HIST_SIZE * sizeof(const char*));
+    memset(MP_STATE_PORT(readline_hist), 0, MICROPY_READLINE_HISTORY_SIZE * sizeof(const char*));
 }
 
 STATIC char *str_dup_maybe(const char *str) {
@@ -334,7 +337,7 @@ int readline_process_char(int c) {
 up_arrow_key:
 #endif
                 // up arrow
-                if (rl.hist_cur + 1 < (int)READLINE_HIST_SIZE && MP_STATE_PORT(readline_hist)[rl.hist_cur + 1] != NULL) {
+                if (rl.hist_cur + 1 < MICROPY_READLINE_HISTORY_SIZE && MP_STATE_PORT(readline_hist)[rl.hist_cur + 1] != NULL) {
                     // increase hist num
                     rl.hist_cur += 1;
                     // set line to history
@@ -570,10 +573,12 @@ void readline_push_history(const char *line) {
         // so update the history
         char *most_recent_hist = str_dup_maybe(line);
         if (most_recent_hist != NULL) {
-            for (int i = READLINE_HIST_SIZE - 1; i > 0; i--) {
+            for (int i = MICROPY_READLINE_HISTORY_SIZE - 1; i > 0; i--) {
                 MP_STATE_PORT(readline_hist)[i] = MP_STATE_PORT(readline_hist)[i - 1];
             }
             MP_STATE_PORT(readline_hist)[0] = most_recent_hist;
         }
     }
 }
+
+MP_REGISTER_ROOT_POINTER(const char *readline_hist[MICROPY_READLINE_HISTORY_SIZE]);

From e5631d959517fcdd8752c60a1c5d07e8e86fbfa5 Mon Sep 17 00:00:00 2001
From: David Lechner <david@pybricks.com>
Date: Fri, 1 Jul 2022 14:10:39 -0500
Subject: [PATCH 2341/3533] unix/alloc: Use MP_REGISTER_ROOT_POINTER() for
 mmap_region_head.

This uses MP_REGISTER_ROOT_POINTER() to register mmap_region_head and
removes the same from mpconfigport.h.

Signed-off-by: David Lechner <david@pybricks.com>
---
 ports/unix/alloc.c        | 2 ++
 ports/unix/mpconfigport.h | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/ports/unix/alloc.c b/ports/unix/alloc.c
index 7fe7b4dba4e71..e9cf521583d99 100644
--- a/ports/unix/alloc.c
+++ b/ports/unix/alloc.c
@@ -104,4 +104,6 @@ void ffi_closure_free(void *ptr) {
 }
 #endif
 
+MP_REGISTER_ROOT_POINTER(void *mmap_region_head);
+
 #endif // MICROPY_EMIT_NATIVE || (MICROPY_PY_FFI && MICROPY_FORCE_PLAT_ALLOC_EXEC)
diff --git a/ports/unix/mpconfigport.h b/ports/unix/mpconfigport.h
index 4594b8be9dc28..eb2da23938f86 100644
--- a/ports/unix/mpconfigport.h
+++ b/ports/unix/mpconfigport.h
@@ -305,7 +305,6 @@ struct _mp_bluetooth_nimble_malloc_t;
 #endif
 
 #define MICROPY_PORT_ROOT_POINTERS \
-    void *mmap_region_head; \
     MICROPY_BLUETOOTH_ROOT_POINTERS \
 
 // We need to provide a declaration/definition of alloca()

From ac86e8449afebdef38b02af7acfc0ed535db9d94 Mon Sep 17 00:00:00 2001
From: David Lechner <david@pybricks.com>
Date: Fri, 1 Jul 2022 15:37:12 -0500
Subject: [PATCH 2342/3533] drivers/ninaw10/nina_wifi_bsp: Use
 MP_REGISTER_ROOT_POINTER().

This uses MP_REGISTER_ROOT_POINTER() to register mp_wifi_spi, mp_wifi_timer
and mp_wifi_sockpoll_list and removes the same from all mpconfigport.h.

Signed-off-by: David Lechner <david@pybricks.com>
---
 drivers/ninaw10/nina_wifi_bsp.c | 4 ++++
 ports/rp2/mpconfigport.h        | 3 ---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/ninaw10/nina_wifi_bsp.c b/drivers/ninaw10/nina_wifi_bsp.c
index a65ef7fd86448..d11e139705f8d 100644
--- a/drivers/ninaw10/nina_wifi_bsp.c
+++ b/drivers/ninaw10/nina_wifi_bsp.c
@@ -150,4 +150,8 @@ int nina_bsp_spi_transfer(const uint8_t *tx_buf, uint8_t *rx_buf, uint32_t size)
     return 0;
 }
 
+MP_REGISTER_ROOT_POINTER(struct _machine_spi_obj_t *mp_wifi_spi);
+MP_REGISTER_ROOT_POINTER(struct _machine_timer_obj_t *mp_wifi_timer);
+MP_REGISTER_ROOT_POINTER(struct _mp_obj_list_t *mp_wifi_sockpoll_list);
+
 #endif // MICROPY_PY_NETWORK_NINAW10
diff --git a/ports/rp2/mpconfigport.h b/ports/rp2/mpconfigport.h
index 1e851048443cf..87bddbeb7757a 100644
--- a/ports/rp2/mpconfigport.h
+++ b/ports/rp2/mpconfigport.h
@@ -197,12 +197,10 @@ extern const struct _mp_obj_type_t mp_network_cyw43_type;
 #define MICROPY_PY_USOCKET_EXTENDED_STATE   (1)
 #endif
 // It also requires an additional root pointer for the SPI object.
-#define MICROPY_PORT_ROOT_POINTER_NINAW10   struct _machine_spi_obj_t *mp_wifi_spi; struct _machine_timer_obj_t *mp_wifi_timer; struct _mp_obj_list_t *mp_wifi_sockpoll_list;
 extern const struct _mod_network_nic_type_t mod_network_nic_type_nina;
 #define MICROPY_HW_NIC_NINAW10              { MP_ROM_QSTR(MP_QSTR_WLAN), MP_ROM_PTR(&mod_network_nic_type_nina) },
 #else
 #define MICROPY_HW_NIC_NINAW10
-#define MICROPY_PORT_ROOT_POINTER_NINAW10
 #endif
 
 #if MICROPY_PY_NETWORK_WIZNET5K
@@ -239,7 +237,6 @@ extern const struct _mod_network_nic_type_t mod_network_nic_type_wiznet5k;
     void *machine_i2s_obj[2]; \
     NETWORK_ROOT_POINTERS \
     MICROPY_BOARD_ROOT_POINTERS \
-    MICROPY_PORT_ROOT_POINTER_NINAW10 \
     MICROPY_PORT_ROOT_POINTER_BLUETOOTH \
         MICROPY_PORT_ROOT_POINTER_BLUETOOTH_NIMBLE \
 

From 8fa6191f955c81678ac4ec3b45f92a72c641f0b1 Mon Sep 17 00:00:00 2001
From: David Lechner <david@pybricks.com>
Date: Fri, 1 Jul 2022 14:18:09 -0500
Subject: [PATCH 2343/3533] extmod/btstack: Use MP_REGISTER_ROOT_POINTER().

This uses MP_REGISTER_ROOT_POINTER() to register
bluetooth_btstack_root_pointers and removes the same from all
mpconfigport.h.

Signed-off-by: David Lechner <david@pybricks.com>
---
 extmod/btstack/modbluetooth_btstack.c | 2 ++
 ports/stm32/mpconfigport.h            | 8 --------
 ports/unix/mpconfigport.h             | 4 ----
 3 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/extmod/btstack/modbluetooth_btstack.c b/extmod/btstack/modbluetooth_btstack.c
index e56e488b1c284..c07cc8c10c7dd 100644
--- a/extmod/btstack/modbluetooth_btstack.c
+++ b/extmod/btstack/modbluetooth_btstack.c
@@ -1460,4 +1460,6 @@ int mp_bluetooth_l2cap_recvinto(uint16_t conn_handle, uint16_t cid, uint8_t *buf
 
 #endif // MICROPY_PY_BLUETOOTH_ENABLE_L2CAP_CHANNELS
 
+MP_REGISTER_ROOT_POINTER(struct _mp_bluetooth_btstack_root_pointers_t *bluetooth_btstack_root_pointers);
+
 #endif // MICROPY_PY_BLUETOOTH && MICROPY_BLUETOOTH_BTSTACK
diff --git a/ports/stm32/mpconfigport.h b/ports/stm32/mpconfigport.h
index 4afad339bd4e7..9c719b8d06eea 100644
--- a/ports/stm32/mpconfigport.h
+++ b/ports/stm32/mpconfigport.h
@@ -246,13 +246,6 @@ struct _mp_bluetooth_nimble_malloc_t;
 #define MICROPY_PORT_ROOT_POINTER_BLUETOOTH_NIMBLE
 #endif
 
-#if MICROPY_BLUETOOTH_BTSTACK
-struct _mp_bluetooth_btstack_root_pointers_t;
-#define MICROPY_PORT_ROOT_POINTER_BLUETOOTH_BTSTACK struct _mp_bluetooth_btstack_root_pointers_t *bluetooth_btstack_root_pointers;
-#else
-#define MICROPY_PORT_ROOT_POINTER_BLUETOOTH_BTSTACK
-#endif
-
 #ifndef MICROPY_BOARD_ROOT_POINTERS
 #define MICROPY_BOARD_ROOT_POINTERS
 #endif
@@ -292,7 +285,6 @@ struct _mp_bluetooth_btstack_root_pointers_t;
     \
     /* root pointers for sub-systems */ \
     MICROPY_PORT_ROOT_POINTER_BLUETOOTH_NIMBLE \
-    MICROPY_PORT_ROOT_POINTER_BLUETOOTH_BTSTACK \
     \
     /* root pointers defined by a board */ \
         MICROPY_BOARD_ROOT_POINTERS \
diff --git a/ports/unix/mpconfigport.h b/ports/unix/mpconfigport.h
index eb2da23938f86..e020e54bf5dab 100644
--- a/ports/unix/mpconfigport.h
+++ b/ports/unix/mpconfigport.h
@@ -291,10 +291,6 @@ static inline unsigned long mp_urandom_seed_init(void) {
 #define MP_STATE_PORT MP_STATE_VM
 
 #if MICROPY_PY_BLUETOOTH
-#if MICROPY_BLUETOOTH_BTSTACK
-struct _mp_bluetooth_btstack_root_pointers_t;
-#define MICROPY_BLUETOOTH_ROOT_POINTERS struct _mp_bluetooth_btstack_root_pointers_t *bluetooth_btstack_root_pointers;
-#endif
 #if MICROPY_BLUETOOTH_NIMBLE
 struct _mp_bluetooth_nimble_root_pointers_t;
 struct _mp_bluetooth_nimble_malloc_t;

From e531b72b56cfac9a309f79cd242070d675d6ee0e Mon Sep 17 00:00:00 2001
From: David Lechner <david@pybricks.com>
Date: Fri, 1 Jul 2022 14:24:16 -0500
Subject: [PATCH 2344/3533] extmod/nimble: Use MP_REGISTER_ROOT_POINTER().

This uses MP_REGISTER_ROOT_POINTER() to register bluetooth_nimble_memory
and bluetooth_nimble_root_pointers and removes the same from all
mpconfigport.h.

Signed-off-by: David Lechner <david@pybricks.com>
---
 extmod/nimble/modbluetooth_nimble.c |  5 +++++
 ports/esp32/mpconfigport.h          |  8 --------
 ports/rp2/mpconfigport.h            |  9 ---------
 ports/stm32/mpconfigport.h          | 11 -----------
 ports/unix/mpconfigport.h           | 13 -------------
 5 files changed, 5 insertions(+), 41 deletions(-)

diff --git a/extmod/nimble/modbluetooth_nimble.c b/extmod/nimble/modbluetooth_nimble.c
index fce99bcdf5bf6..c26c09e61a2cb 100644
--- a/extmod/nimble/modbluetooth_nimble.c
+++ b/extmod/nimble/modbluetooth_nimble.c
@@ -1966,4 +1966,9 @@ STATIC int ble_secret_store_delete(int obj_type, const union ble_store_key *key)
 
 #endif // MICROPY_PY_BLUETOOTH_ENABLE_PAIRING_BONDING
 
+#if !MICROPY_BLUETOOTH_NIMBLE_BINDINGS_ONLY
+MP_REGISTER_ROOT_POINTER(struct _mp_bluetooth_nimble_malloc_t *bluetooth_nimble_memory);
+#endif
+MP_REGISTER_ROOT_POINTER(struct _mp_bluetooth_nimble_root_pointers_t *bluetooth_nimble_root_pointers);
+
 #endif // MICROPY_PY_BLUETOOTH && MICROPY_BLUETOOTH_NIMBLE
diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h
index a374d81203a14..7cfce49d3778a 100644
--- a/ports/esp32/mpconfigport.h
+++ b/ports/esp32/mpconfigport.h
@@ -138,19 +138,11 @@
 
 struct _machine_timer_obj_t;
 
-#if MICROPY_BLUETOOTH_NIMBLE
-struct mp_bluetooth_nimble_root_pointers_t;
-#define MICROPY_PORT_ROOT_POINTER_BLUETOOTH_NIMBLE struct _mp_bluetooth_nimble_root_pointers_t *bluetooth_nimble_root_pointers;
-#else
-#define MICROPY_PORT_ROOT_POINTER_BLUETOOTH_NIMBLE
-#endif
-
 #define MICROPY_PORT_ROOT_POINTERS \
     mp_obj_t machine_pin_irq_handler[40]; \
     struct _machine_timer_obj_t *machine_timer_obj_head; \
     struct _machine_i2s_obj_t *machine_i2s_obj[I2S_NUM_MAX]; \
     mp_obj_t native_code_pointers; \
-    MICROPY_PORT_ROOT_POINTER_BLUETOOTH_NIMBLE
 
 // type definitions for the specific machine
 
diff --git a/ports/rp2/mpconfigport.h b/ports/rp2/mpconfigport.h
index 87bddbeb7757a..8b7cb7ca42dcd 100644
--- a/ports/rp2/mpconfigport.h
+++ b/ports/rp2/mpconfigport.h
@@ -147,14 +147,6 @@
 #define MICROPY_PORT_ROOT_POINTER_BLUETOOTH
 #endif
 
-#if MICROPY_BLUETOOTH_NIMBLE
-struct _mp_bluetooth_nimble_root_pointers_t;
-struct _mp_bluetooth_nimble_malloc_t;
-#define MICROPY_PORT_ROOT_POINTER_BLUETOOTH_NIMBLE struct _mp_bluetooth_nimble_malloc_t *bluetooth_nimble_memory; struct _mp_bluetooth_nimble_root_pointers_t *bluetooth_nimble_root_pointers;
-#else
-#define MICROPY_PORT_ROOT_POINTER_BLUETOOTH_NIMBLE
-#endif
-
 // By default networking should include sockets, ssl, websockets, webrepl, dupterm.
 #if MICROPY_PY_NETWORK
 #ifndef MICROPY_PY_USOCKET
@@ -238,7 +230,6 @@ extern const struct _mod_network_nic_type_t mod_network_nic_type_wiznet5k;
     NETWORK_ROOT_POINTERS \
     MICROPY_BOARD_ROOT_POINTERS \
     MICROPY_PORT_ROOT_POINTER_BLUETOOTH \
-        MICROPY_PORT_ROOT_POINTER_BLUETOOTH_NIMBLE \
 
 #define MP_STATE_PORT MP_STATE_VM
 
diff --git a/ports/stm32/mpconfigport.h b/ports/stm32/mpconfigport.h
index 9c719b8d06eea..bf7183a81d833 100644
--- a/ports/stm32/mpconfigport.h
+++ b/ports/stm32/mpconfigport.h
@@ -238,14 +238,6 @@ extern const struct _mod_network_nic_type_t mod_network_nic_type_cc3k;
 
 #define MP_STATE_PORT MP_STATE_VM
 
-#if MICROPY_BLUETOOTH_NIMBLE
-struct _mp_bluetooth_nimble_root_pointers_t;
-struct _mp_bluetooth_nimble_malloc_t;
-#define MICROPY_PORT_ROOT_POINTER_BLUETOOTH_NIMBLE struct _mp_bluetooth_nimble_malloc_t *bluetooth_nimble_memory; struct _mp_bluetooth_nimble_root_pointers_t *bluetooth_nimble_root_pointers;
-#else
-#define MICROPY_PORT_ROOT_POINTER_BLUETOOTH_NIMBLE
-#endif
-
 #ifndef MICROPY_BOARD_ROOT_POINTERS
 #define MICROPY_BOARD_ROOT_POINTERS
 #endif
@@ -283,9 +275,6 @@ struct _mp_bluetooth_nimble_malloc_t;
     /* list of registered NICs */ \
     mp_obj_list_t mod_network_nic_list; \
     \
-    /* root pointers for sub-systems */ \
-    MICROPY_PORT_ROOT_POINTER_BLUETOOTH_NIMBLE \
-    \
     /* root pointers defined by a board */ \
         MICROPY_BOARD_ROOT_POINTERS \
 
diff --git a/ports/unix/mpconfigport.h b/ports/unix/mpconfigport.h
index e020e54bf5dab..97846f81f0068 100644
--- a/ports/unix/mpconfigport.h
+++ b/ports/unix/mpconfigport.h
@@ -290,19 +290,6 @@ static inline unsigned long mp_urandom_seed_init(void) {
 
 #define MP_STATE_PORT MP_STATE_VM
 
-#if MICROPY_PY_BLUETOOTH
-#if MICROPY_BLUETOOTH_NIMBLE
-struct _mp_bluetooth_nimble_root_pointers_t;
-struct _mp_bluetooth_nimble_malloc_t;
-#define MICROPY_BLUETOOTH_ROOT_POINTERS struct _mp_bluetooth_nimble_malloc_t *bluetooth_nimble_memory; struct _mp_bluetooth_nimble_root_pointers_t *bluetooth_nimble_root_pointers;
-#endif
-#else
-#define MICROPY_BLUETOOTH_ROOT_POINTERS
-#endif
-
-#define MICROPY_PORT_ROOT_POINTERS \
-    MICROPY_BLUETOOTH_ROOT_POINTERS \
-
 // We need to provide a declaration/definition of alloca()
 // unless support for it is disabled.
 #if !defined(MICROPY_NO_ALLOCA) || MICROPY_NO_ALLOCA == 0

From a3703584fea25854616265c9accc2aab70cf2c97 Mon Sep 17 00:00:00 2001
From: David Lechner <david@pybricks.com>
Date: Fri, 1 Jul 2022 15:01:38 -0500
Subject: [PATCH 2345/3533] extmod/modnetwork: Use MP_REGISTER_ROOT_POINTER().

This uses MP_REGISTER_ROOT_POINTER() to register mod_network_nic_list and
removes the same from all mpconfigport.h.

Signed-off-by: David Lechner <david@pybricks.com>
---
 extmod/modnetwork.c             | 2 ++
 ports/mimxrt/mpconfigport.h     | 2 --
 ports/renesas-ra/mpconfigport.h | 3 ---
 ports/rp2/mpconfigport.h        | 7 -------
 ports/stm32/mpconfigport.h      | 3 ---
 5 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/extmod/modnetwork.c b/extmod/modnetwork.c
index e05bfdb11da96..b698ee4cf45e4 100644
--- a/extmod/modnetwork.c
+++ b/extmod/modnetwork.c
@@ -163,4 +163,6 @@ mp_obj_t mod_network_nic_ifconfig(struct netif *netif, size_t n_args, const mp_o
 
 #endif
 
+MP_REGISTER_ROOT_POINTER(mp_obj_list_t mod_network_nic_list);
+
 #endif  // MICROPY_PY_NETWORK
diff --git a/ports/mimxrt/mpconfigport.h b/ports/mimxrt/mpconfigport.h
index 3bff3e474d934..0603d82166407 100644
--- a/ports/mimxrt/mpconfigport.h
+++ b/ports/mimxrt/mpconfigport.h
@@ -244,8 +244,6 @@ extern const struct _mp_obj_type_t network_lan_type;
 #define MICROPY_PORT_ROOT_POINTERS \
     struct _machine_timer_obj_t *timer_table[MICROPY_HW_PIT_NUM_CHANNELS]; \
     void *machine_pin_irq_objects[MICROPY_HW_NUM_PIN_IRQS]; \
-    /* list of registered NICs */ \
-    mp_obj_list_t mod_network_nic_list; \
     /* root pointers defined by a board */ \
     MICROPY_BOARD_ROOT_POINTERS \
 
diff --git a/ports/renesas-ra/mpconfigport.h b/ports/renesas-ra/mpconfigport.h
index 11b106999a9d2..badcce8e6f1b3 100644
--- a/ports/renesas-ra/mpconfigport.h
+++ b/ports/renesas-ra/mpconfigport.h
@@ -185,9 +185,6 @@
     /* pointers to all UART objects (if they have been created) */ \
     struct _machine_uart_obj_t *machine_uart_obj_all[MICROPY_HW_MAX_UART + MICROPY_HW_MAX_LPUART]; \
     \
-    /* list of registered NICs */ \
-    /* mp_obj_list_t mod_network_nic_list; */ \
-    \
     /* root pointers for sub-systems */ \
     \
     /* root pointers defined by a board */ \
diff --git a/ports/rp2/mpconfigport.h b/ports/rp2/mpconfigport.h
index 8b7cb7ca42dcd..182a3db02dc0e 100644
--- a/ports/rp2/mpconfigport.h
+++ b/ports/rp2/mpconfigport.h
@@ -135,12 +135,6 @@
 #define MICROPY_BOARD_ENTER_BOOTLOADER(nargs, args)
 #endif
 
-#if MICROPY_PY_NETWORK
-#define NETWORK_ROOT_POINTERS               mp_obj_list_t mod_network_nic_list;
-#else
-#define NETWORK_ROOT_POINTERS
-#endif
-
 #if MICROPY_PY_BLUETOOTH
 #define MICROPY_PORT_ROOT_POINTER_BLUETOOTH struct _machine_uart_obj_t *mp_bthci_uart;
 #else
@@ -227,7 +221,6 @@ extern const struct _mod_network_nic_type_t mod_network_nic_type_wiznet5k;
     void *rp2_uart_rx_buffer[2]; \
     void *rp2_uart_tx_buffer[2]; \
     void *machine_i2s_obj[2]; \
-    NETWORK_ROOT_POINTERS \
     MICROPY_BOARD_ROOT_POINTERS \
     MICROPY_PORT_ROOT_POINTER_BLUETOOTH \
 
diff --git a/ports/stm32/mpconfigport.h b/ports/stm32/mpconfigport.h
index bf7183a81d833..83986296c96ba 100644
--- a/ports/stm32/mpconfigport.h
+++ b/ports/stm32/mpconfigport.h
@@ -272,9 +272,6 @@ extern const struct _mod_network_nic_type_t mod_network_nic_type_cc3k;
     /* USB_VCP IRQ callbacks (if they have been set) */ \
     mp_obj_t pyb_usb_vcp_irq[MICROPY_HW_USB_CDC_NUM]; \
     \
-    /* list of registered NICs */ \
-    mp_obj_list_t mod_network_nic_list; \
-    \
     /* root pointers defined by a board */ \
         MICROPY_BOARD_ROOT_POINTERS \
 

From 095ad87adf934511e9aaa0beb6f2ae1accc262a7 Mon Sep 17 00:00:00 2001
From: David Lechner <david@pybricks.com>
Date: Fri, 1 Jul 2022 14:26:38 -0500
Subject: [PATCH 2346/3533] cc3200/mpconfigport: Remove
 mp_const_user_interrupt.

mp_const_user_interrupt was listed as a root pointer but not used anywhere
in the code base, so it can be removed.

Signed-off-by: David Lechner <david@pybricks.com>
---
 ports/cc3200/mpconfigport.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ports/cc3200/mpconfigport.h b/ports/cc3200/mpconfigport.h
index ce708cb3f486b..a9daca88b5d34 100644
--- a/ports/cc3200/mpconfigport.h
+++ b/ports/cc3200/mpconfigport.h
@@ -142,7 +142,6 @@
 // vm state and root pointers for the gc
 #define MP_STATE_PORT MP_STATE_VM
 #define MICROPY_PORT_ROOT_POINTERS                                        \
-    mp_obj_t mp_const_user_interrupt;                                     \
     mp_obj_t machine_config_main;                                         \
     mp_obj_list_t pyb_sleep_obj_list;                                     \
     mp_obj_list_t mp_irq_obj_list;                                        \

From 226e969ad339678404a4ad9153cf9a40a31fc1da Mon Sep 17 00:00:00 2001
From: David Lechner <david@pybricks.com>
Date: Fri, 1 Jul 2022 14:28:58 -0500
Subject: [PATCH 2347/3533] cc3200: Use MP_REGISTER_ROOT_POINTER().

This uses MP_REGISTER_ROOT_POINTER() to register all port-specific root
pointers for the cc3200 port.

Signed-off-by: David Lechner <david@pybricks.com>
---
 ports/cc3200/application.mk    | 2 +-
 ports/cc3200/hal/cc3200_hal.c  | 2 ++
 ports/cc3200/misc/mpirq.c      | 1 +
 ports/cc3200/mods/modmachine.c | 1 +
 ports/cc3200/mods/pybsleep.c   | 1 +
 ports/cc3200/mods/pybtimer.c   | 1 +
 ports/cc3200/mods/pybuart.c    | 2 ++
 ports/cc3200/mpconfigport.h    | 9 ---------
 8 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/ports/cc3200/application.mk b/ports/cc3200/application.mk
index 25a9925ea00ea..428367d66adf6 100644
--- a/ports/cc3200/application.mk
+++ b/ports/cc3200/application.mk
@@ -166,7 +166,7 @@ OBJ += $(BUILD)/shared/runtime/gchelper_m3.o
 OBJ += $(BUILD)/pins.o
 
 # List of sources for qstr extraction
-SRC_QSTR += $(APP_MODS_SRC_C) $(APP_MISC_SRC_C) $(APP_STM_SRC_C) $(APP_SHARED_SRC_C)
+SRC_QSTR += $(APP_MODS_SRC_C) $(APP_MISC_SRC_C) $(APP_STM_SRC_C) $(APP_SHARED_SRC_C) $(APP_HAL_SRC_C)
 # Append any auto-generated sources that are needed by sources listed in
 # SRC_QSTR
 SRC_QSTR_AUTO_DEPS +=
diff --git a/ports/cc3200/hal/cc3200_hal.c b/ports/cc3200/hal/cc3200_hal.c
index 3a35e39e1f55e..4694235eebf62 100644
--- a/ports/cc3200/hal/cc3200_hal.c
+++ b/ports/cc3200/hal/cc3200_hal.c
@@ -195,3 +195,5 @@ static void hal_TickInit (void) {
     MAP_SysTickEnable();
 }
 #endif
+
+MP_REGISTER_ROOT_POINTER(struct _os_term_dup_obj_t *os_term_dup_obj);
diff --git a/ports/cc3200/misc/mpirq.c b/ports/cc3200/misc/mpirq.c
index de30ebc499683..eb93e5eef0cc3 100644
--- a/ports/cc3200/misc/mpirq.c
+++ b/ports/cc3200/misc/mpirq.c
@@ -197,3 +197,4 @@ const mp_obj_type_t mp_irq_type = {
     .locals_dict = (mp_obj_t)&mp_irq_locals_dict,
 };
 
+MP_REGISTER_ROOT_POINTER(mp_obj_list_t mp_irq_obj_list);
diff --git a/ports/cc3200/mods/modmachine.c b/ports/cc3200/mods/modmachine.c
index 782ccc55a1d2f..3e483e0a23d2d 100644
--- a/ports/cc3200/mods/modmachine.c
+++ b/ports/cc3200/mods/modmachine.c
@@ -215,3 +215,4 @@ const mp_obj_module_t mp_module_machine = {
 };
 
 MP_REGISTER_MODULE(MP_QSTR_umachine, mp_module_machine);
+MP_REGISTER_ROOT_POINTER(mp_obj_t machine_config_main);
diff --git a/ports/cc3200/mods/pybsleep.c b/ports/cc3200/mods/pybsleep.c
index 2d4b1ca8a9600..76fe0849a4bc2 100644
--- a/ports/cc3200/mods/pybsleep.c
+++ b/ports/cc3200/mods/pybsleep.c
@@ -652,3 +652,4 @@ STATIC bool setup_timer_hibernate_wake (void) {
     return false;
 }
 
+MP_REGISTER_ROOT_POINTER(mp_obj_list_t pyb_sleep_obj_list);
diff --git a/ports/cc3200/mods/pybtimer.c b/ports/cc3200/mods/pybtimer.c
index 55caa6de137b1..b2725ae166537 100644
--- a/ports/cc3200/mods/pybtimer.c
+++ b/ports/cc3200/mods/pybtimer.c
@@ -728,3 +728,4 @@ STATIC const mp_obj_type_t pyb_timer_channel_type = {
     .locals_dict = (mp_obj_t)&pyb_timer_channel_locals_dict,
 };
 
+MP_REGISTER_ROOT_POINTER(mp_obj_list_t pyb_timer_channel_obj_list);
diff --git a/ports/cc3200/mods/pybuart.c b/ports/cc3200/mods/pybuart.c
index b8e8cbb682fab..6e774b70d9a9f 100644
--- a/ports/cc3200/mods/pybuart.c
+++ b/ports/cc3200/mods/pybuart.c
@@ -666,3 +666,5 @@ const mp_obj_type_t pyb_uart_type = {
     .protocol = &uart_stream_p,
     .locals_dict = (mp_obj_t)&pyb_uart_locals_dict,
 };
+
+MP_REGISTER_ROOT_POINTER(struct _pyb_uart_obj_t *pyb_uart_objs[2]);
diff --git a/ports/cc3200/mpconfigport.h b/ports/cc3200/mpconfigport.h
index a9daca88b5d34..8059daeec7c63 100644
--- a/ports/cc3200/mpconfigport.h
+++ b/ports/cc3200/mpconfigport.h
@@ -139,16 +139,7 @@
 #define MICROPY_PORT_CONSTANTS \
     { MP_ROM_QSTR(MP_QSTR_umachine),     MP_ROM_PTR(&mp_module_machine) },  \
 
-// vm state and root pointers for the gc
 #define MP_STATE_PORT MP_STATE_VM
-#define MICROPY_PORT_ROOT_POINTERS                                        \
-    mp_obj_t machine_config_main;                                         \
-    mp_obj_list_t pyb_sleep_obj_list;                                     \
-    mp_obj_list_t mp_irq_obj_list;                                        \
-    mp_obj_list_t pyb_timer_channel_obj_list;                             \
-    struct _pyb_uart_obj_t *pyb_uart_objs[2];                             \
-    struct _os_term_dup_obj_t *os_term_dup_obj;                           \
-
 
 // type definitions for the specific machine
 #define MICROPY_MAKE_POINTER_CALLABLE(p)            ((void *)((mp_uint_t)(p) | 1))

From b63282c36194b6388e97df66122ac05f973fe7ca Mon Sep 17 00:00:00 2001
From: David Lechner <david@pybricks.com>
Date: Fri, 1 Jul 2022 14:41:27 -0500
Subject: [PATCH 2348/3533] esp32: Use MP_REGISTER_ROOT_POINTER().

This uses MP_REGISTER_ROOT_POINTER() to register all root pointers in the
esp32 port.

Signed-off-by: David Lechner <david@pybricks.com>
---
 ports/esp32/machine_i2s.c   | 2 ++
 ports/esp32/machine_pin.c   | 2 ++
 ports/esp32/machine_timer.c | 2 ++
 ports/esp32/main.c          | 2 ++
 ports/esp32/mpconfigport.h  | 8 --------
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/ports/esp32/machine_i2s.c b/ports/esp32/machine_i2s.c
index 8832ad5e90733..933e68684b9e2 100644
--- a/ports/esp32/machine_i2s.c
+++ b/ports/esp32/machine_i2s.c
@@ -840,4 +840,6 @@ const mp_obj_type_t machine_i2s_type = {
     .locals_dict = (mp_obj_dict_t *)&machine_i2s_locals_dict,
 };
 
+MP_REGISTER_ROOT_POINTER(struct _machine_i2s_obj_t *machine_i2s_obj[I2S_NUM_MAX]);
+
 #endif // MICROPY_PY_MACHINE_I2S
diff --git a/ports/esp32/machine_pin.c b/ports/esp32/machine_pin.c
index 865face96f2ad..b57562633878d 100644
--- a/ports/esp32/machine_pin.c
+++ b/ports/esp32/machine_pin.c
@@ -729,3 +729,5 @@ STATIC const mp_obj_type_t machine_pin_irq_type = {
     .call = machine_pin_irq_call,
     .locals_dict = (mp_obj_dict_t *)&machine_pin_irq_locals_dict,
 };
+
+MP_REGISTER_ROOT_POINTER(mp_obj_t machine_pin_irq_handler[40]);
diff --git a/ports/esp32/machine_timer.c b/ports/esp32/machine_timer.c
index 100b2aa1fb9c8..8541bcbfdb486 100644
--- a/ports/esp32/machine_timer.c
+++ b/ports/esp32/machine_timer.c
@@ -272,3 +272,5 @@ const mp_obj_type_t machine_timer_type = {
     .make_new = machine_timer_make_new,
     .locals_dict = (mp_obj_t)&machine_timer_locals_dict,
 };
+
+MP_REGISTER_ROOT_POINTER(struct _machine_timer_obj_t *machine_timer_obj_head);
diff --git a/ports/esp32/main.c b/ports/esp32/main.c
index 14b7e14c62ff1..c543c5b645d5f 100644
--- a/ports/esp32/main.c
+++ b/ports/esp32/main.c
@@ -265,3 +265,5 @@ void *esp_native_code_commit(void *buf, size_t len, void *reloc) {
     memcpy(p, buf, len);
     return p;
 }
+
+MP_REGISTER_ROOT_POINTER(mp_obj_t native_code_pointers);
diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h
index 7cfce49d3778a..8dc3537e59d4a 100644
--- a/ports/esp32/mpconfigport.h
+++ b/ports/esp32/mpconfigport.h
@@ -136,14 +136,6 @@
 
 #define MP_STATE_PORT MP_STATE_VM
 
-struct _machine_timer_obj_t;
-
-#define MICROPY_PORT_ROOT_POINTERS \
-    mp_obj_t machine_pin_irq_handler[40]; \
-    struct _machine_timer_obj_t *machine_timer_obj_head; \
-    struct _machine_i2s_obj_t *machine_i2s_obj[I2S_NUM_MAX]; \
-    mp_obj_t native_code_pointers; \
-
 // type definitions for the specific machine
 
 #define MICROPY_MAKE_POINTER_CALLABLE(p) ((void *)((mp_uint_t)(p)))

From e2d4db96dac0d8316287e5fc60d3eeb57b28f259 Mon Sep 17 00:00:00 2001
From: David Lechner <david@pybricks.com>
Date: Fri, 1 Jul 2022 14:55:33 -0500
Subject: [PATCH 2349/3533] esp8266: Use MP_REGISTER_ROOT_POINTER().

This uses MP_REGISTER_ROOT_POINTER() to register all port-specific root
pointers in the esp2866 port.

Signed-off-by: David Lechner <david@pybricks.com>
---
 ports/esp8266/machine_pin.c  | 2 ++
 ports/esp8266/machine_uart.c | 2 ++
 ports/esp8266/mpconfigport.h | 4 ----
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ports/esp8266/machine_pin.c b/ports/esp8266/machine_pin.c
index 419ee87a7332b..8171b8a8a3e35 100644
--- a/ports/esp8266/machine_pin.c
+++ b/ports/esp8266/machine_pin.c
@@ -515,3 +515,5 @@ STATIC const mp_obj_type_t pin_irq_type = {
     .call = pin_irq_call,
     .locals_dict = (mp_obj_dict_t *)&pin_irq_locals_dict,
 };
+
+MP_REGISTER_ROOT_POINTER(mp_obj_t pin_irq_handler[16]);
diff --git a/ports/esp8266/machine_uart.c b/ports/esp8266/machine_uart.c
index b774419d2d321..4e88eee162d8b 100644
--- a/ports/esp8266/machine_uart.c
+++ b/ports/esp8266/machine_uart.c
@@ -329,3 +329,5 @@ const mp_obj_type_t pyb_uart_type = {
     .protocol = &uart_stream_p,
     .locals_dict = (mp_obj_dict_t *)&pyb_uart_locals_dict,
 };
+
+MP_REGISTER_ROOT_POINTER(byte * uart0_rxbuf);
diff --git a/ports/esp8266/mpconfigport.h b/ports/esp8266/mpconfigport.h
index 3f1db723a5410..779767311cdfd 100644
--- a/ports/esp8266/mpconfigport.h
+++ b/ports/esp8266/mpconfigport.h
@@ -147,10 +147,6 @@ extern const struct _mp_print_t mp_debug_print;
 
 #define MP_STATE_PORT MP_STATE_VM
 
-#define MICROPY_PORT_ROOT_POINTERS \
-    mp_obj_t pin_irq_handler[16]; \
-    byte *uart0_rxbuf; \
-
 // We need an implementation of the log2 function which is not a macro
 #define MP_NEED_LOG2 (1)
 

From a316a8fdb37fa80bce761840133946e827a4d33d Mon Sep 17 00:00:00 2001
From: David Lechner <david@pybricks.com>
Date: Fri, 1 Jul 2022 14:46:44 -0500
Subject: [PATCH 2350/3533] mimxrt: Use MP_REGISTER_ROOT_POINTER().

This uses MP_REGISTER_ROOT_POINTER() to register all port-specific root
pointers in the mimxrt port.

Signed-off-by: David Lechner <david@pybricks.com>
---
 ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.h | 3 ---
 ports/mimxrt/boards/MIMXRT1015_EVK/mpconfigboard.h | 3 ---
 ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.h | 3 ---
 ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.h | 3 ---
 ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.h | 3 ---
 ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.h | 3 ---
 ports/mimxrt/boards/OLIMEX_RT1010/mpconfigboard.h  | 4 ----
 ports/mimxrt/boards/SEEED_ARCH_MIX/mpconfigboard.h | 3 ---
 ports/mimxrt/boards/TEENSY40/mpconfigboard.h       | 3 ---
 ports/mimxrt/boards/TEENSY41/mpconfigboard.h       | 3 ---
 ports/mimxrt/machine_i2s.c                         | 2 ++
 ports/mimxrt/machine_pin.c                         | 2 ++
 ports/mimxrt/machine_timer.c                       | 2 ++
 ports/mimxrt/mpconfigport.h                        | 2 --
 14 files changed, 6 insertions(+), 33 deletions(-)

diff --git a/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.h b/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.h
index 75fda0cad1f54..6c9aaff96ab53 100644
--- a/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.h
+++ b/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.h
@@ -74,6 +74,3 @@
         I2S_GPIO(1, WS, TX, GPIO_07, IOMUXC_GPIO_07_SAI1_TX_SYNC),  \
         I2S_GPIO(1, SD, TX, GPIO_04, IOMUXC_GPIO_04_SAI1_TX_DATA00),  \
     }
-
-#define MICROPY_BOARD_ROOT_POINTERS \
-    struct _machine_i2s_obj_t *machine_i2s_obj[MICROPY_HW_I2S_NUM];
diff --git a/ports/mimxrt/boards/MIMXRT1015_EVK/mpconfigboard.h b/ports/mimxrt/boards/MIMXRT1015_EVK/mpconfigboard.h
index 17326cb4853dc..adb97fd24e9f9 100644
--- a/ports/mimxrt/boards/MIMXRT1015_EVK/mpconfigboard.h
+++ b/ports/mimxrt/boards/MIMXRT1015_EVK/mpconfigboard.h
@@ -79,6 +79,3 @@
         I2S_GPIO(1, WS, TX, GPIO_EMC_27, IOMUXC_GPIO_EMC_27_SAI1_TX_SYNC),  \
         I2S_GPIO(1, SD, TX, GPIO_EMC_25, IOMUXC_GPIO_EMC_25_SAI1_TX_DATA00), \
     }
-
-#define MICROPY_BOARD_ROOT_POINTERS \
-    struct _machine_i2s_obj_t *machine_i2s_obj[MICROPY_HW_I2S_NUM];
diff --git a/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.h b/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.h
index 1dfe02b651f89..762499f6c2f21 100644
--- a/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.h
+++ b/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.h
@@ -172,6 +172,3 @@
     { IOMUXC_GPIO_AD_B0_15_ENET_TDATA01, 0, 0xB0E9u }, \
     { IOMUXC_GPIO_EMC_40_ENET_MDIO, 0, 0xB0E9u }, \
     { IOMUXC_GPIO_EMC_41_ENET_MDC, 0, 0xB0E9u },
-
-#define MICROPY_BOARD_ROOT_POINTERS \
-    struct _machine_i2s_obj_t *machine_i2s_obj[MICROPY_HW_I2S_NUM];
diff --git a/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.h b/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.h
index 613095e67fca3..f2a7b0b78b432 100644
--- a/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.h
+++ b/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.h
@@ -162,6 +162,3 @@
     { IOMUXC_GPIO_B1_11_ENET_RX_ER, 0, 0xB0E9u }, \
     { IOMUXC_GPIO_EMC_41_ENET_MDIO, 0, 0xB0E9u }, \
     { IOMUXC_GPIO_EMC_40_ENET_MDC, 0, 0xB0E9u },
-
-#define MICROPY_BOARD_ROOT_POINTERS \
-    struct _machine_i2s_obj_t *machine_i2s_obj[MICROPY_HW_I2S_NUM];
diff --git a/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.h b/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.h
index a3f0062389ddf..5670902d11a5c 100644
--- a/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.h
+++ b/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.h
@@ -160,6 +160,3 @@
     { IOMUXC_GPIO_B1_11_ENET_RX_ER, 0, 0xB0E9u }, \
     { IOMUXC_GPIO_EMC_41_ENET_MDIO, 0, 0xB0E9u }, \
     { IOMUXC_GPIO_EMC_40_ENET_MDC, 0, 0xB0E9u },
-
-#define MICROPY_BOARD_ROOT_POINTERS \
-    struct _machine_i2s_obj_t *machine_i2s_obj[MICROPY_HW_I2S_NUM];
diff --git a/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.h b/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.h
index fe1fb532b8c27..0f4eaf246da12 100644
--- a/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.h
+++ b/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.h
@@ -160,6 +160,3 @@
     { IOMUXC_GPIO_B1_11_ENET_RX_ER, 0, 0xB0E9u }, \
     { IOMUXC_GPIO_EMC_41_ENET_MDIO, 0, 0xB0E9u }, \
     { IOMUXC_GPIO_EMC_40_ENET_MDC, 0, 0xB0E9u },
-
-#define MICROPY_BOARD_ROOT_POINTERS \
-    struct _machine_i2s_obj_t *machine_i2s_obj[MICROPY_HW_I2S_NUM];
diff --git a/ports/mimxrt/boards/OLIMEX_RT1010/mpconfigboard.h b/ports/mimxrt/boards/OLIMEX_RT1010/mpconfigboard.h
index c30caa0470754..8c6d159fb7aec 100644
--- a/ports/mimxrt/boards/OLIMEX_RT1010/mpconfigboard.h
+++ b/ports/mimxrt/boards/OLIMEX_RT1010/mpconfigboard.h
@@ -80,7 +80,3 @@
         I2S_GPIO(3, WS, TX, GPIO_SD_00, IOMUXC_GPIO_SD_00_SAI3_TX_SYNC), /* pin D9 */ \
         I2S_GPIO(3, SD, TX, GPIO_SD_02, IOMUXC_GPIO_SD_02_SAI3_TX_DATA) /* pin D11 */ \
     }
-
-
-#define MICROPY_BOARD_ROOT_POINTERS \
-    struct _machine_i2s_obj_t *machine_i2s_obj[MICROPY_HW_I2S_NUM];
diff --git a/ports/mimxrt/boards/SEEED_ARCH_MIX/mpconfigboard.h b/ports/mimxrt/boards/SEEED_ARCH_MIX/mpconfigboard.h
index a6502d3353d8b..d366b4535d702 100644
--- a/ports/mimxrt/boards/SEEED_ARCH_MIX/mpconfigboard.h
+++ b/ports/mimxrt/boards/SEEED_ARCH_MIX/mpconfigboard.h
@@ -173,6 +173,3 @@
 #define MIMXRT_IOMUXC_SEMC_WE IOMUXC_GPIO_EMC_28_SEMC_WE
 
 #define MIMXRT_IOMUXC_SEMC_CS0 IOMUXC_GPIO_EMC_29_SEMC_CS0
-
-#define MICROPY_BOARD_ROOT_POINTERS \
-    struct _machine_i2s_obj_t *machine_i2s_obj[MICROPY_HW_I2S_NUM];
diff --git a/ports/mimxrt/boards/TEENSY40/mpconfigboard.h b/ports/mimxrt/boards/TEENSY40/mpconfigboard.h
index f2ea86bd0ec66..877573d038658 100644
--- a/ports/mimxrt/boards/TEENSY40/mpconfigboard.h
+++ b/ports/mimxrt/boards/TEENSY40/mpconfigboard.h
@@ -104,6 +104,3 @@
         .data2 = { GPIO_SD_B0_04_USDHC1_DATA2 }, \
         .data3 = { GPIO_SD_B0_05_USDHC1_DATA3 }, \
     }
-
-#define MICROPY_BOARD_ROOT_POINTERS \
-    struct _machine_i2s_obj_t *machine_i2s_obj[MICROPY_HW_I2S_NUM];
diff --git a/ports/mimxrt/boards/TEENSY41/mpconfigboard.h b/ports/mimxrt/boards/TEENSY41/mpconfigboard.h
index 7d75f62f36cf9..3c6a05185da4c 100644
--- a/ports/mimxrt/boards/TEENSY41/mpconfigboard.h
+++ b/ports/mimxrt/boards/TEENSY41/mpconfigboard.h
@@ -127,6 +127,3 @@
     { IOMUXC_GPIO_B1_11_ENET_RX_ER, 0, 0xB0E9u }, \
     { IOMUXC_GPIO_B1_15_ENET_MDIO, 0, 0xB0E9u }, \
     { IOMUXC_GPIO_B1_14_ENET_MDC, 0, 0xB0E9u },
-
-#define MICROPY_BOARD_ROOT_POINTERS \
-    struct _machine_i2s_obj_t *machine_i2s_obj[MICROPY_HW_I2S_NUM];
diff --git a/ports/mimxrt/machine_i2s.c b/ports/mimxrt/machine_i2s.c
index 11a203baea16b..a5446c7ac3efa 100644
--- a/ports/mimxrt/machine_i2s.c
+++ b/ports/mimxrt/machine_i2s.c
@@ -1224,4 +1224,6 @@ const mp_obj_type_t machine_i2s_type = {
     .locals_dict = (mp_obj_dict_t *)&machine_i2s_locals_dict,
 };
 
+MP_REGISTER_ROOT_POINTER(struct _machine_i2s_obj_t *machine_i2s_obj[MICROPY_HW_I2S_NUM]);
+
 #endif // MICROPY_PY_MACHINE_I2S
diff --git a/ports/mimxrt/machine_pin.c b/ports/mimxrt/machine_pin.c
index 2424088f02efb..64066af0e16ce 100644
--- a/ports/mimxrt/machine_pin.c
+++ b/ports/mimxrt/machine_pin.c
@@ -469,3 +469,5 @@ STATIC const mp_irq_methods_t machine_pin_irq_methods = {
     .trigger = machine_pin_irq_trigger,
     .info = machine_pin_irq_info,
 };
+
+MP_REGISTER_ROOT_POINTER(void *machine_pin_irq_objects[MICROPY_HW_NUM_PIN_IRQS]);
diff --git a/ports/mimxrt/machine_timer.c b/ports/mimxrt/machine_timer.c
index c47d9dca24c6c..62a560ebbfc4c 100644
--- a/ports/mimxrt/machine_timer.c
+++ b/ports/mimxrt/machine_timer.c
@@ -218,3 +218,5 @@ const mp_obj_type_t machine_timer_type = {
     .make_new = machine_timer_make_new,
     .locals_dict = (mp_obj_dict_t *)&machine_timer_locals_dict,
 };
+
+MP_REGISTER_ROOT_POINTER(struct _machine_timer_obj_t *timer_table[MICROPY_HW_PIT_NUM_CHANNELS]);
diff --git a/ports/mimxrt/mpconfigport.h b/ports/mimxrt/mpconfigport.h
index 0603d82166407..2c7446e360c4d 100644
--- a/ports/mimxrt/mpconfigport.h
+++ b/ports/mimxrt/mpconfigport.h
@@ -242,8 +242,6 @@ extern const struct _mp_obj_type_t network_lan_type;
 #endif
 
 #define MICROPY_PORT_ROOT_POINTERS \
-    struct _machine_timer_obj_t *timer_table[MICROPY_HW_PIT_NUM_CHANNELS]; \
-    void *machine_pin_irq_objects[MICROPY_HW_NUM_PIN_IRQS]; \
     /* root pointers defined by a board */ \
     MICROPY_BOARD_ROOT_POINTERS \
 

From 8a69c54211663157b68438e4b93d11a064c9078a Mon Sep 17 00:00:00 2001
From: David Lechner <david@pybricks.com>
Date: Fri, 1 Jul 2022 15:04:40 -0500
Subject: [PATCH 2351/3533] nrf: Use MP_REGISTER_ROOT_POINTER().

This uses MP_REGISTER_ROOT_POINTER() to register all port-specific root
pointers for the nrf port.

Signed-off-by: David Lechner <david@pybricks.com>
---
 .../boards/microbit/modules/microbitdisplay.c |  2 ++
 ports/nrf/drivers/softpwm.c                   |  3 ++
 ports/nrf/modules/machine/pin.c               | 10 ++++++
 ports/nrf/modules/music/modmusic.c            |  3 +-
 ports/nrf/mpconfigport.h                      | 35 -------------------
 ports/nrf/mphalport.c                         |  2 ++
 6 files changed, 19 insertions(+), 36 deletions(-)

diff --git a/ports/nrf/boards/microbit/modules/microbitdisplay.c b/ports/nrf/boards/microbit/modules/microbitdisplay.c
index a0508886d796c..b35703ad6f9a7 100644
--- a/ports/nrf/boards/microbit/modules/microbitdisplay.c
+++ b/ports/nrf/boards/microbit/modules/microbitdisplay.c
@@ -574,3 +574,5 @@ void microbit_display_init(void) {
         nrf_gpio_cfg_output(i);
     }
 }
+
+MP_REGISTER_ROOT_POINTER(void *async_data[2]);
diff --git a/ports/nrf/drivers/softpwm.c b/ports/nrf/drivers/softpwm.c
index 517880c8c9da8..6acdf7aa76d53 100644
--- a/ports/nrf/drivers/softpwm.c
+++ b/ports/nrf/drivers/softpwm.c
@@ -255,4 +255,7 @@ void pwm_release(int32_t pin) {
     nrf_gpio_pin_clear(pin);
 }
 
+MP_REGISTER_ROOT_POINTER(const struct _pwm_events *pwm_active_events);
+MP_REGISTER_ROOT_POINTER(const struct _pwm_events *pwm_pending_events);
+
 #endif // MICROPY_PY_MACHINE_SOFT_PWM
diff --git a/ports/nrf/modules/machine/pin.c b/ports/nrf/modules/machine/pin.c
index 170caf6dde4c6..3a45c22d18ef2 100644
--- a/ports/nrf/modules/machine/pin.c
+++ b/ports/nrf/modules/machine/pin.c
@@ -37,6 +37,12 @@
 #include "nrf_gpio.h"
 #include "nrfx_gpiote.h"
 
+#if defined(NRF52840_XXAA)
+#define NUM_OF_PINS 48
+#else
+#define NUM_OF_PINS 32
+#endif
+
 extern const pin_obj_t machine_board_pin_obj[];
 extern const uint8_t machine_pin_num_of_board_pins;
 
@@ -671,3 +677,7 @@ const mp_obj_type_t pin_af_type = {
     .print = pin_af_obj_print,
     .locals_dict = (mp_obj_dict_t*)&pin_af_locals_dict,
 };
+
+MP_REGISTER_ROOT_POINTER(mp_obj_t pin_class_mapper);
+MP_REGISTER_ROOT_POINTER(mp_obj_t pin_class_map_dict);
+MP_REGISTER_ROOT_POINTER(mp_obj_t pin_irq_handlers[NUM_OF_PINS]);
diff --git a/ports/nrf/modules/music/modmusic.c b/ports/nrf/modules/music/modmusic.c
index a950b03920c2f..a0ae7f7c8e860 100644
--- a/ports/nrf/modules/music/modmusic.c
+++ b/ports/nrf/modules/music/modmusic.c
@@ -70,7 +70,7 @@ enum {
     ASYNC_MUSIC_STATE_ARTICULATE,
 };
 
-#define music_data MP_STATE_PORT(music_data)
+#define music_data MP_STATE_PORT(modmusic_music_data)
 
 extern volatile uint32_t ticks;
 
@@ -510,5 +510,6 @@ const mp_obj_module_t music_module = {
 };
 
 MP_REGISTER_MODULE(MP_QSTR_music, music_module);
+MP_REGISTER_ROOT_POINTER(struct _music_data_t *modmusic_music_data);
 
 #endif // MICROPY_PY_MUSIC
diff --git a/ports/nrf/mpconfigport.h b/ports/nrf/mpconfigport.h
index fcbe71c5a06a9..b3a95614a4adc 100644
--- a/ports/nrf/mpconfigport.h
+++ b/ports/nrf/mpconfigport.h
@@ -310,41 +310,6 @@ typedef long mp_off_t;
 
 #define MP_STATE_PORT MP_STATE_VM
 
-#if MICROPY_PY_MUSIC
-#define ROOT_POINTERS_MUSIC \
-    struct _music_data_t *music_data;
-#else
-#define ROOT_POINTERS_MUSIC
-#endif
-
-#if MICROPY_PY_MACHINE_SOFT_PWM
-#define ROOT_POINTERS_SOFTPWM \
-    const struct _pwm_events *pwm_active_events; \
-    const struct _pwm_events *pwm_pending_events;
-#else
-#define ROOT_POINTERS_SOFTPWM
-#endif
-
-#if defined(NRF52840_XXAA)
-#define NUM_OF_PINS 48
-#else
-#define NUM_OF_PINS 32
-#endif
-
-#define MICROPY_PORT_ROOT_POINTERS \
-    mp_obj_t pin_class_mapper; \
-    mp_obj_t pin_class_map_dict; \
-    mp_obj_t pin_irq_handlers[NUM_OF_PINS]; \
-    \
-    /* stdio is repeated on this UART object if it's not null */ \
-    struct _machine_hard_uart_obj_t *board_stdio_uart; \
-    \
-    ROOT_POINTERS_MUSIC \
-    ROOT_POINTERS_SOFTPWM \
-    \
-    /* micro:bit root pointers */ \
-    void *async_data[2]; \
-
 #if MICROPY_HW_USB_CDC
 #define MICROPY_HW_USBDEV_TASK_HOOK extern void tud_task(void); tud_task();
 #else
diff --git a/ports/nrf/mphalport.c b/ports/nrf/mphalport.c
index 1b31ad5accdf4..9405cb2e3abd7 100644
--- a/ports/nrf/mphalport.c
+++ b/ports/nrf/mphalport.c
@@ -374,3 +374,5 @@ const char *nrfx_error_code_lookup(uint32_t err_code) {
 }
 
 #endif // NRFX_LOG_ENABLED
+
+MP_REGISTER_ROOT_POINTER(struct _machine_hard_uart_obj_t *board_stdio_uart);

From c09e31dabbac1324b396f47274f83174dc1bfd68 Mon Sep 17 00:00:00 2001
From: David Lechner <david@pybricks.com>
Date: Fri, 1 Jul 2022 15:20:14 -0500
Subject: [PATCH 2352/3533] pic16bit/pic16bit_mphal: Use
 MP_REGISTER_ROOT_POINTER().

This uses MP_REGISTER_ROOT_POINTER() to register keyboard_interrupt_obj
and removes the same from mpconfigport.h.

Signed-off-by: David Lechner <david@pybricks.com>
---
 ports/pic16bit/mpconfigport.h   | 3 ---
 ports/pic16bit/pic16bit_mphal.c | 2 ++
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/ports/pic16bit/mpconfigport.h b/ports/pic16bit/mpconfigport.h
index e03fb81a6a3a0..f1bfa4cd6f16d 100644
--- a/ports/pic16bit/mpconfigport.h
+++ b/ports/pic16bit/mpconfigport.h
@@ -91,9 +91,6 @@ typedef int mp_off_t;
 
 #define MP_STATE_PORT MP_STATE_VM
 
-#define MICROPY_PORT_ROOT_POINTERS \
-    mp_obj_t keyboard_interrupt_obj; \
-
 #define MICROPY_MPHALPORT_H "pic16bit_mphal.h"
 #define MICROPY_HW_BOARD_NAME "dsPICSK"
 #define MICROPY_HW_MCU_NAME "dsPIC33"
diff --git a/ports/pic16bit/pic16bit_mphal.c b/ports/pic16bit/pic16bit_mphal.c
index adab3819348bc..48e8af87decb4 100644
--- a/ports/pic16bit/pic16bit_mphal.c
+++ b/ports/pic16bit/pic16bit_mphal.c
@@ -86,3 +86,5 @@ void mp_hal_stdout_tx_strn_cooked(const char *str, size_t len) {
         uart_tx_char(*str++);
     }
 }
+
+MP_REGISTER_ROOT_POINTER(mp_obj_t keyboard_interrupt_obj);

From f8805e24166a61b7a3eab8f049480e942623463f Mon Sep 17 00:00:00 2001
From: David Lechner <david@pybricks.com>
Date: Fri, 1 Jul 2022 15:22:19 -0500
Subject: [PATCH 2353/3533] renesas-ra/mpconfigport: Drop pyb_hid_report_desc
 root pointer.

pyb_hid_report_desc is not used anywhere in the renesas-ra port (probably
was copied from stm32 port).

Signed-off-by: David Lechner <david@pybricks.com>
---
 ports/renesas-ra/mpconfigport.h | 2 --
 1 file changed, 2 deletions(-)

diff --git a/ports/renesas-ra/mpconfigport.h b/ports/renesas-ra/mpconfigport.h
index badcce8e6f1b3..9a8c0255902d4 100644
--- a/ports/renesas-ra/mpconfigport.h
+++ b/ports/renesas-ra/mpconfigport.h
@@ -168,8 +168,6 @@
 #endif
 
 #define MICROPY_PORT_ROOT_POINTERS \
-    mp_obj_t pyb_hid_report_desc; \
-    \
     mp_obj_t pyb_config_main; \
     \
     mp_obj_t pyb_switch_callback; \

From 575fa61c6dc85662ce9ae4d81ef7c5cf740758c8 Mon Sep 17 00:00:00 2001
From: David Lechner <david@pybricks.com>
Date: Fri, 1 Jul 2022 15:24:28 -0500
Subject: [PATCH 2354/3533] renesas-ra: Use MP_REGISTER_ROOT_POINTER().

This uses MP_REGISTER_ROOT_POINTER() to register all port-specific root
pointers in the renesas-ra port.

Signed-off-by: David Lechner <david@pybricks.com>
---
 ports/renesas-ra/extint.c       |  2 ++
 ports/renesas-ra/machine_uart.c |  2 ++
 ports/renesas-ra/main.c         |  2 ++
 ports/renesas-ra/mpconfigport.h | 17 -----------------
 ports/renesas-ra/mphalport.c    |  2 ++
 ports/renesas-ra/timer.c        |  2 ++
 ports/renesas-ra/usrsw.c        |  2 ++
 7 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/ports/renesas-ra/extint.c b/ports/renesas-ra/extint.c
index 05e99eb655b49..19caa7a3b3fef 100644
--- a/ports/renesas-ra/extint.c
+++ b/ports/renesas-ra/extint.c
@@ -399,3 +399,5 @@ void extint_init0(void) {
         MP_STATE_PORT(pyb_extint_callback)[i] = mp_const_none;
     }
 }
+
+MP_REGISTER_ROOT_POINTER(mp_obj_t pyb_extint_callback[PYB_EXTI_NUM_VECTORS]);
diff --git a/ports/renesas-ra/machine_uart.c b/ports/renesas-ra/machine_uart.c
index d71562f2018bb..4b4aa3396b622 100644
--- a/ports/renesas-ra/machine_uart.c
+++ b/ports/renesas-ra/machine_uart.c
@@ -581,3 +581,5 @@ const mp_obj_type_t machine_uart_type = {
     .protocol = &uart_stream_p,
     .locals_dict = (mp_obj_dict_t *)&machine_uart_locals_dict,
 };
+
+MP_REGISTER_ROOT_POINTER(struct _machine_uart_obj_t *machine_uart_obj_all[MICROPY_HW_MAX_UART + MICROPY_HW_MAX_LPUART]);
diff --git a/ports/renesas-ra/main.c b/ports/renesas-ra/main.c
index 6f4584b6856d2..78af1a9639576 100644
--- a/ports/renesas-ra/main.c
+++ b/ports/renesas-ra/main.c
@@ -397,3 +397,5 @@ void ra_main(uint32_t reset_mode) {
 
     goto soft_reset;
 }
+
+MP_REGISTER_ROOT_POINTER(mp_obj_t pyb_config_main);
diff --git a/ports/renesas-ra/mpconfigport.h b/ports/renesas-ra/mpconfigport.h
index 9a8c0255902d4..0f1d5930334a1 100644
--- a/ports/renesas-ra/mpconfigport.h
+++ b/ports/renesas-ra/mpconfigport.h
@@ -168,23 +168,6 @@
 #endif
 
 #define MICROPY_PORT_ROOT_POINTERS \
-    mp_obj_t pyb_config_main; \
-    \
-    mp_obj_t pyb_switch_callback; \
-    \
-    mp_obj_t pyb_extint_callback[PYB_EXTI_NUM_VECTORS]; \
-    \
-    /* pointers to all Timer objects (if they have been created) */ \
-    struct _pyb_timer_obj_t *pyb_timer_obj_all[MICROPY_HW_MAX_TIMER]; \
-    \
-    /* stdio is repeated on this UART object if it's not null */ \
-    struct _machine_uart_obj_t *pyb_stdio_uart; \
-    \
-    /* pointers to all UART objects (if they have been created) */ \
-    struct _machine_uart_obj_t *machine_uart_obj_all[MICROPY_HW_MAX_UART + MICROPY_HW_MAX_LPUART]; \
-    \
-    /* root pointers for sub-systems */ \
-    \
     /* root pointers defined by a board */ \
     MICROPY_BOARD_ROOT_POINTERS \
 
diff --git a/ports/renesas-ra/mphalport.c b/ports/renesas-ra/mphalport.c
index 6a416f431adb5..6e6a83aa2648f 100644
--- a/ports/renesas-ra/mphalport.c
+++ b/ports/renesas-ra/mphalport.c
@@ -118,3 +118,5 @@ void mp_hal_get_mac_ascii(int idx, size_t chr_off, size_t chr_len, char *dest) {
         *dest++ = hexchr[mac[chr_off >> 1] >> (4 * (1 - (chr_off & 1))) & 0xf];
     }
 }
+
+MP_REGISTER_ROOT_POINTER(struct _machine_uart_obj_t *pyb_stdio_uart);
diff --git a/ports/renesas-ra/timer.c b/ports/renesas-ra/timer.c
index 93b378ac3f67f..1ae936525eaff 100644
--- a/ports/renesas-ra/timer.c
+++ b/ports/renesas-ra/timer.c
@@ -567,3 +567,5 @@ void timer_irq_handler(void *param) {
         // }
     }
 }
+
+MP_REGISTER_ROOT_POINTER(struct _pyb_timer_obj_t *pyb_timer_obj_all[MICROPY_HW_MAX_TIMER]);
diff --git a/ports/renesas-ra/usrsw.c b/ports/renesas-ra/usrsw.c
index b0e2396cde466..5e11f48e63929 100644
--- a/ports/renesas-ra/usrsw.c
+++ b/ports/renesas-ra/usrsw.c
@@ -144,4 +144,6 @@ const mp_obj_type_t pyb_switch_type = {
     .locals_dict = (mp_obj_dict_t *)&pyb_switch_locals_dict,
 };
 
+MP_REGISTER_ROOT_POINTER(mp_obj_t pyb_switch_callback);
+
 #endif // MICROPY_HW_HAS_SWITCH

From ffa22b8f97dcd4696d1e7628c56f9fe2d93f3049 Mon Sep 17 00:00:00 2001
From: David Lechner <david@pybricks.com>
Date: Fri, 1 Jul 2022 14:47:42 -0500
Subject: [PATCH 2355/3533] rp2: Use MP_REGISTER_ROOT_POINTER().

This uses MP_REGISTER_ROOT_POINTER() to register all port-specific root
pointers in the rp2 port.

Signed-off-by: David Lechner <david@pybricks.com>
---
 ports/rp2/machine_i2s.c  |  2 ++
 ports/rp2/machine_pin.c  |  2 ++
 ports/rp2/machine_uart.c |  3 +++
 ports/rp2/mpbthciport.c  |  2 ++
 ports/rp2/mpconfigport.h | 13 -------------
 ports/rp2/rp2_pio.c      |  3 +++
 6 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/ports/rp2/machine_i2s.c b/ports/rp2/machine_i2s.c
index 988e88d36ffb0..1015ba10179aa 100644
--- a/ports/rp2/machine_i2s.c
+++ b/ports/rp2/machine_i2s.c
@@ -1147,3 +1147,5 @@ const mp_obj_type_t machine_i2s_type = {
     .make_new = machine_i2s_make_new,
     .locals_dict = (mp_obj_dict_t *)&machine_i2s_locals_dict,
 };
+
+MP_REGISTER_ROOT_POINTER(void *machine_i2s_obj[2]);
diff --git a/ports/rp2/machine_pin.c b/ports/rp2/machine_pin.c
index a0c5dead9067e..705f61242c259 100644
--- a/ports/rp2/machine_pin.c
+++ b/ports/rp2/machine_pin.c
@@ -687,3 +687,5 @@ mp_hal_pin_obj_t mp_hal_get_pin_obj(mp_obj_t obj) {
     }
     return pin->id;
 }
+
+MP_REGISTER_ROOT_POINTER(void *machine_pin_irq_obj[30]);
diff --git a/ports/rp2/machine_uart.c b/ports/rp2/machine_uart.c
index fafa3c1b5678d..77ccdb5f50f2a 100644
--- a/ports/rp2/machine_uart.c
+++ b/ports/rp2/machine_uart.c
@@ -562,3 +562,6 @@ const mp_obj_type_t machine_uart_type = {
     .protocol = &uart_stream_p,
     .locals_dict = (mp_obj_dict_t *)&machine_uart_locals_dict,
 };
+
+MP_REGISTER_ROOT_POINTER(void *rp2_uart_rx_buffer[2]);
+MP_REGISTER_ROOT_POINTER(void *rp2_uart_tx_buffer[2]);
diff --git a/ports/rp2/mpbthciport.c b/ports/rp2/mpbthciport.c
index 58639fd5b004b..cd41da017a63a 100644
--- a/ports/rp2/mpbthciport.c
+++ b/ports/rp2/mpbthciport.c
@@ -197,4 +197,6 @@ MP_WEAK int mp_bluetooth_hci_controller_wakeup(void) {
     return 0;
 }
 
+MP_REGISTER_ROOT_POINTER(struct _machine_uart_obj_t *mp_bthci_uart);
+
 #endif // MICROPY_PY_BLUETOOTH
diff --git a/ports/rp2/mpconfigport.h b/ports/rp2/mpconfigport.h
index 182a3db02dc0e..82e8de14dbc20 100644
--- a/ports/rp2/mpconfigport.h
+++ b/ports/rp2/mpconfigport.h
@@ -135,12 +135,6 @@
 #define MICROPY_BOARD_ENTER_BOOTLOADER(nargs, args)
 #endif
 
-#if MICROPY_PY_BLUETOOTH
-#define MICROPY_PORT_ROOT_POINTER_BLUETOOTH struct _machine_uart_obj_t *mp_bthci_uart;
-#else
-#define MICROPY_PORT_ROOT_POINTER_BLUETOOTH
-#endif
-
 // By default networking should include sockets, ssl, websockets, webrepl, dupterm.
 #if MICROPY_PY_NETWORK
 #ifndef MICROPY_PY_USOCKET
@@ -215,14 +209,7 @@ extern const struct _mod_network_nic_type_t mod_network_nic_type_wiznet5k;
 #endif
 
 #define MICROPY_PORT_ROOT_POINTERS \
-    void *machine_pin_irq_obj[30]; \
-    void *rp2_pio_irq_obj[2]; \
-    void *rp2_state_machine_irq_obj[8]; \
-    void *rp2_uart_rx_buffer[2]; \
-    void *rp2_uart_tx_buffer[2]; \
-    void *machine_i2s_obj[2]; \
     MICROPY_BOARD_ROOT_POINTERS \
-    MICROPY_PORT_ROOT_POINTER_BLUETOOTH \
 
 #define MP_STATE_PORT MP_STATE_VM
 
diff --git a/ports/rp2/rp2_pio.c b/ports/rp2/rp2_pio.c
index 99006169665ad..072644eba6acc 100644
--- a/ports/rp2/rp2_pio.c
+++ b/ports/rp2/rp2_pio.c
@@ -839,3 +839,6 @@ STATIC const mp_irq_methods_t rp2_state_machine_irq_methods = {
     .trigger = rp2_state_machine_irq_trigger,
     .info = rp2_state_machine_irq_info,
 };
+
+MP_REGISTER_ROOT_POINTER(void *rp2_pio_irq_obj[2]);
+MP_REGISTER_ROOT_POINTER(void *rp2_state_machine_irq_obj[8]);

From 816e4537f27ce6e1737225dbfaece0ec75150913 Mon Sep 17 00:00:00 2001
From: David Lechner <david@pybricks.com>
Date: Fri, 1 Jul 2022 14:48:59 -0500
Subject: [PATCH 2356/3533] stm32: Use MP_REGISTER_ROOT_POINTER().

This uses MP_REGISTER_ROOT_POINTER() to register all port-specific root
pointers in the stm32 port.

Signed-off-by: David Lechner <david@pybricks.com>
---
 ports/stm32/extint.c       |  2 ++
 ports/stm32/machine_i2s.c  |  2 ++
 ports/stm32/main.c         |  2 ++
 ports/stm32/mpconfigport.h | 29 -----------------------------
 ports/stm32/mphalport.c    |  2 ++
 ports/stm32/pin.c          |  3 +++
 ports/stm32/pyb_can.c      |  2 ++
 ports/stm32/timer.c        |  2 ++
 ports/stm32/uart.c         |  2 ++
 ports/stm32/usb.c          |  5 +++++
 ports/stm32/usrsw.c        |  2 ++
 11 files changed, 24 insertions(+), 29 deletions(-)

diff --git a/ports/stm32/extint.c b/ports/stm32/extint.c
index fd4dca276bbe2..d68275bf19c4e 100644
--- a/ports/stm32/extint.c
+++ b/ports/stm32/extint.c
@@ -720,3 +720,5 @@ void Handle_EXTI_Irq(uint32_t line) {
         }
     }
 }
+
+MP_REGISTER_ROOT_POINTER(mp_obj_t pyb_extint_callback[PYB_EXTI_NUM_VECTORS]);
diff --git a/ports/stm32/machine_i2s.c b/ports/stm32/machine_i2s.c
index a9d0da43d4426..4f583a53e87bf 100644
--- a/ports/stm32/machine_i2s.c
+++ b/ports/stm32/machine_i2s.c
@@ -1125,4 +1125,6 @@ const mp_obj_type_t machine_i2s_type = {
     .locals_dict = (mp_obj_dict_t *)&machine_i2s_locals_dict,
 };
 
+MP_REGISTER_ROOT_POINTER(struct _machine_i2s_obj_t *machine_i2s_obj[MICROPY_HW_MAX_I2S]);
+
 #endif // MICROPY_HW_ENABLE_I2S
diff --git a/ports/stm32/main.c b/ports/stm32/main.c
index 54d9b05be12da..44732cef9e0c1 100644
--- a/ports/stm32/main.c
+++ b/ports/stm32/main.c
@@ -659,3 +659,5 @@ void stm32_main(uint32_t reset_mode) {
 
     goto soft_reset;
 }
+
+MP_REGISTER_ROOT_POINTER(mp_obj_t pyb_config_main);
diff --git a/ports/stm32/mpconfigport.h b/ports/stm32/mpconfigport.h
index 83986296c96ba..bb73b83371c9d 100644
--- a/ports/stm32/mpconfigport.h
+++ b/ports/stm32/mpconfigport.h
@@ -243,35 +243,6 @@ extern const struct _mod_network_nic_type_t mod_network_nic_type_cc3k;
 #endif
 
 #define MICROPY_PORT_ROOT_POINTERS \
-    mp_obj_t pyb_hid_report_desc; \
-    \
-    mp_obj_t pyb_config_main; \
-    \
-    mp_obj_t pyb_switch_callback; \
-    \
-    mp_obj_t pin_class_mapper; \
-    mp_obj_t pin_class_map_dict; \
-    \
-    mp_obj_t pyb_extint_callback[PYB_EXTI_NUM_VECTORS]; \
-    \
-    /* pointers to all Timer objects (if they have been created) */ \
-    struct _pyb_timer_obj_t *pyb_timer_obj_all[MICROPY_HW_MAX_TIMER]; \
-    \
-    /* stdio is repeated on this UART object if it's not null */ \
-    struct _pyb_uart_obj_t *pyb_stdio_uart; \
-    \
-    /* pointers to all UART objects (if they have been created) */ \
-    struct _pyb_uart_obj_t *pyb_uart_obj_all[MICROPY_HW_MAX_UART + MICROPY_HW_MAX_LPUART]; \
-    \
-    /* pointers to all CAN objects (if they have been created) */ \
-    struct _pyb_can_obj_t *pyb_can_obj_all[MICROPY_HW_MAX_CAN]; \
-    \
-    /* pointers to all I2S objects (if they have been created) */ \
-    struct _machine_i2s_obj_t *machine_i2s_obj[MICROPY_HW_MAX_I2S]; \
-    \
-    /* USB_VCP IRQ callbacks (if they have been set) */ \
-    mp_obj_t pyb_usb_vcp_irq[MICROPY_HW_USB_CDC_NUM]; \
-    \
     /* root pointers defined by a board */ \
         MICROPY_BOARD_ROOT_POINTERS \
 
diff --git a/ports/stm32/mphalport.c b/ports/stm32/mphalport.c
index 477192330bae0..619bde69bf064 100644
--- a/ports/stm32/mphalport.c
+++ b/ports/stm32/mphalport.c
@@ -177,3 +177,5 @@ void mp_hal_get_mac_ascii(int idx, size_t chr_off, size_t chr_len, char *dest) {
         *dest++ = hexchr[mac[chr_off >> 1] >> (4 * (1 - (chr_off & 1))) & 0xf];
     }
 }
+
+MP_REGISTER_ROOT_POINTER(struct _pyb_uart_obj_t *pyb_stdio_uart);
diff --git a/ports/stm32/pin.c b/ports/stm32/pin.c
index b490a09b7faa7..af6bafc43f219 100644
--- a/ports/stm32/pin.c
+++ b/ports/stm32/pin.c
@@ -675,3 +675,6 @@ const mp_obj_type_t pin_af_type = {
     .print = pin_af_obj_print,
     .locals_dict = (mp_obj_dict_t *)&pin_af_locals_dict,
 };
+
+MP_REGISTER_ROOT_POINTER(mp_obj_t pin_class_mapper);
+MP_REGISTER_ROOT_POINTER(mp_obj_t pin_class_map_dict);
diff --git a/ports/stm32/pyb_can.c b/ports/stm32/pyb_can.c
index 3fa0f6baea0d6..ff41de31868da 100644
--- a/ports/stm32/pyb_can.c
+++ b/ports/stm32/pyb_can.c
@@ -1081,4 +1081,6 @@ const mp_obj_type_t pyb_can_type = {
     .locals_dict = (mp_obj_dict_t *)&pyb_can_locals_dict,
 };
 
+MP_REGISTER_ROOT_POINTER(struct _pyb_can_obj_t *pyb_can_obj_all[MICROPY_HW_MAX_CAN]);
+
 #endif // MICROPY_HW_ENABLE_CAN
diff --git a/ports/stm32/timer.c b/ports/stm32/timer.c
index 8181885e2ed77..0cef60cb62c87 100644
--- a/ports/stm32/timer.c
+++ b/ports/stm32/timer.c
@@ -1684,3 +1684,5 @@ void timer_irq_handler(uint tim_id) {
         }
     }
 }
+
+MP_REGISTER_ROOT_POINTER(struct _pyb_timer_obj_t *pyb_timer_obj_all[MICROPY_HW_MAX_TIMER]);
diff --git a/ports/stm32/uart.c b/ports/stm32/uart.c
index 34d8246d5fa16..cea49f4ba1c9b 100644
--- a/ports/stm32/uart.c
+++ b/ports/stm32/uart.c
@@ -1202,3 +1202,5 @@ const mp_irq_methods_t uart_irq_methods = {
     .trigger = uart_irq_trigger,
     .info = uart_irq_info,
 };
+
+MP_REGISTER_ROOT_POINTER(struct _pyb_uart_obj_t *pyb_uart_obj_all[MICROPY_HW_MAX_UART + MICROPY_HW_MAX_LPUART]);
diff --git a/ports/stm32/usb.c b/ports/stm32/usb.c
index cf9faed11286e..2a669b2a28a86 100644
--- a/ports/stm32/usb.c
+++ b/ports/stm32/usb.c
@@ -1152,4 +1152,9 @@ void USR_KEYBRD_ProcessData(uint8_t pbuf) {
 
 #endif // USE_HOST_MODE
 
+#if MICROPY_HW_USB_HID
+MP_REGISTER_ROOT_POINTER(mp_obj_t pyb_hid_report_desc);
+#endif
+MP_REGISTER_ROOT_POINTER(mp_obj_t pyb_usb_vcp_irq[MICROPY_HW_USB_CDC_NUM]);
+
 #endif // MICROPY_HW_ENABLE_USB
diff --git a/ports/stm32/usrsw.c b/ports/stm32/usrsw.c
index 596efba0530a7..60aae1c8839da 100644
--- a/ports/stm32/usrsw.c
+++ b/ports/stm32/usrsw.c
@@ -143,4 +143,6 @@ const mp_obj_type_t pyb_switch_type = {
     .locals_dict = (mp_obj_dict_t *)&pyb_switch_locals_dict,
 };
 
+MP_REGISTER_ROOT_POINTER(mp_obj_t pyb_switch_callback);
+
 #endif // MICROPY_HW_HAS_SWITCH

From 2d8589f1a5a04b9f3f2c96b5f99f9b8e740af594 Mon Sep 17 00:00:00 2001
From: David Lechner <david@pybricks.com>
Date: Fri, 1 Jul 2022 16:02:10 -0500
Subject: [PATCH 2357/3533] teensy/mpconfigport: Drop unused root pointers.

pin_class_mapper and pin_class_map_dict are not used in the teensy port and
can be removed.

Signed-off-by: David Lechner <david@pybricks.com>
---
 ports/teensy/mpconfigport.h | 2 --
 1 file changed, 2 deletions(-)

diff --git a/ports/teensy/mpconfigport.h b/ports/teensy/mpconfigport.h
index b870263dfc8b7..e57fae15e9956 100644
--- a/ports/teensy/mpconfigport.h
+++ b/ports/teensy/mpconfigport.h
@@ -42,8 +42,6 @@ extern const struct _mp_obj_module_t pyb_module;
 #define MP_STATE_PORT MP_STATE_VM
 
 #define MICROPY_PORT_ROOT_POINTERS \
-    mp_obj_t pin_class_mapper; \
-    mp_obj_t pin_class_map_dict; \
     struct _pyb_uart_obj_t *pyb_stdio_uart; \
 
 // type definitions for the specific machine

From 186be074a7e5ac7a78da2fa78aa4cacca7a3fe89 Mon Sep 17 00:00:00 2001
From: David Lechner <david@pybricks.com>
Date: Fri, 1 Jul 2022 15:51:12 -0500
Subject: [PATCH 2358/3533] teensy/teensy_hal: Use MP_REGISTER_ROOT_POINTER().

This uses MP_REGISTER_ROOT_POINTER() to register pyb_stdio_uart and removes
the same from mpconfigport.h.

Signed-off-by: David Lechner <david@pybricks.com>
---
 ports/teensy/mpconfigport.h | 3 ---
 ports/teensy/teensy_hal.c   | 2 ++
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/ports/teensy/mpconfigport.h b/ports/teensy/mpconfigport.h
index e57fae15e9956..f67eb66fab48e 100644
--- a/ports/teensy/mpconfigport.h
+++ b/ports/teensy/mpconfigport.h
@@ -41,9 +41,6 @@ extern const struct _mp_obj_module_t pyb_module;
 
 #define MP_STATE_PORT MP_STATE_VM
 
-#define MICROPY_PORT_ROOT_POINTERS \
-    struct _pyb_uart_obj_t *pyb_stdio_uart; \
-
 // type definitions for the specific machine
 
 #define UINT_FMT "%u"
diff --git a/ports/teensy/teensy_hal.c b/ports/teensy/teensy_hal.c
index 342e7c6501dd8..93103319b5850 100644
--- a/ports/teensy/teensy_hal.c
+++ b/ports/teensy/teensy_hal.c
@@ -77,3 +77,5 @@ void mp_hal_gpio_clock_enable(GPIO_TypeDef *gpio) {
 void extint_register_pin(const void *pin, uint32_t mode, int hard_irq, mp_obj_t callback_obj) {
     mp_raise_NotImplementedError(NULL);
 }
+
+MP_REGISTER_ROOT_POINTER(struct _pyb_uart_obj_t *pyb_stdio_uart);

From ccda7686a436f4d172325cce1fbf1d49165e31fd Mon Sep 17 00:00:00 2001
From: David Lechner <david@pybricks.com>
Date: Fri, 1 Jul 2022 15:51:12 -0500
Subject: [PATCH 2359/3533] zephyr: Use MP_REGISTER_ROOT_POINTER().

This uses MP_REGISTER_ROOT_POINTER() to register port-specific root
pointers for the zephyr port.

Signed-off-by: David Lechner <david@pybricks.com>
---
 ports/zephyr/machine_pin.c         | 3 +++
 ports/zephyr/modbluetooth_zephyr.c | 2 ++
 ports/zephyr/mpconfigport.h        | 4 ----
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/ports/zephyr/machine_pin.c b/ports/zephyr/machine_pin.c
index dee66a5c69de1..aa55c04104e46 100644
--- a/ports/zephyr/machine_pin.c
+++ b/ports/zephyr/machine_pin.c
@@ -322,4 +322,7 @@ STATIC const mp_irq_methods_t machine_pin_irq_methods = {
     .info = machine_pin_irq_info,
 };
 
+/* Linked list of pin irq objects */
+MP_REGISTER_ROOT_POINTER(void *machine_pin_irq_list);
+
 #endif // MICROPY_PY_MACHINE
diff --git a/ports/zephyr/modbluetooth_zephyr.c b/ports/zephyr/modbluetooth_zephyr.c
index ba13064f3348a..4d4b19a1d98c5 100644
--- a/ports/zephyr/modbluetooth_zephyr.c
+++ b/ports/zephyr/modbluetooth_zephyr.c
@@ -418,4 +418,6 @@ int mp_bluetooth_gap_peripheral_connect_cancel(void) {
 
 #endif // MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE
 
+MP_REGISTER_ROOT_POINTER(struct _mp_bluetooth_zephyr_root_pointers_t *bluetooth_zephyr_root_pointers);
+
 #endif // MICROPY_PY_BLUETOOTH
diff --git a/ports/zephyr/mpconfigport.h b/ports/zephyr/mpconfigport.h
index 1be755baabfdb..586b0ec916972 100644
--- a/ports/zephyr/mpconfigport.h
+++ b/ports/zephyr/mpconfigport.h
@@ -133,10 +133,6 @@ typedef long mp_off_t;
 
 #define MP_STATE_PORT MP_STATE_VM
 
-#define MICROPY_PORT_ROOT_POINTERS \
-    void *machine_pin_irq_list; /* Linked list of pin irq objects */ \
-    struct _mp_bluetooth_zephyr_root_pointers_t *bluetooth_zephyr_root_pointers;
-
 // extra built in names to add to the global namespace
 #define MICROPY_PORT_BUILTINS \
     { MP_ROM_QSTR(MP_QSTR_open), MP_ROM_PTR(&mp_builtin_open_obj) },

From 7e4b205cb00013b272e4cf9fac128866bf0e1f21 Mon Sep 17 00:00:00 2001
From: David Lechner <david@pybricks.com>
Date: Fri, 1 Jul 2022 16:08:57 -0500
Subject: [PATCH 2360/3533] py/mpstate: Drop MICROPY_PORT_ROOT_POINTERS from
 mp_state_vm_t.

All in-tree uses of MICROPY_PORT_ROOT_POINTERS have been replaced with
MP_REGISTER_ROOT_POINTER(), so now we can remove both
MICROPY_PORT_ROOT_POINTERS and MICROPY_BOARD_ROOT_POINTERS from the code
and remaining config files.

Signed-off-by: David Lechner <david@pybricks.com>
---
 ports/mimxrt/mpconfigport.h                   | 8 --------
 ports/renesas-ra/mpconfigport.h               | 8 --------
 ports/rp2/mpconfigport.h                      | 7 -------
 ports/stm32/mpconfigport.h                    | 8 --------
 ports/unix/variants/minimal/mpconfigvariant.h | 2 --
 py/mpconfig.h                                 | 5 -----
 py/mpstate.h                                  | 3 ---
 7 files changed, 41 deletions(-)

diff --git a/ports/mimxrt/mpconfigport.h b/ports/mimxrt/mpconfigport.h
index 2c7446e360c4d..676e563c7be41 100644
--- a/ports/mimxrt/mpconfigport.h
+++ b/ports/mimxrt/mpconfigport.h
@@ -237,14 +237,6 @@ extern const struct _mp_obj_type_t network_lan_type;
 
 #define MICROPY_HW_PIT_NUM_CHANNELS 3
 
-#ifndef MICROPY_BOARD_ROOT_POINTERS
-#define MICROPY_BOARD_ROOT_POINTERS
-#endif
-
-#define MICROPY_PORT_ROOT_POINTERS \
-    /* root pointers defined by a board */ \
-    MICROPY_BOARD_ROOT_POINTERS \
-
 #define MP_STATE_PORT MP_STATE_VM
 
 // Miscellaneous settings
diff --git a/ports/renesas-ra/mpconfigport.h b/ports/renesas-ra/mpconfigport.h
index 0f1d5930334a1..8ecc17fcb4acd 100644
--- a/ports/renesas-ra/mpconfigport.h
+++ b/ports/renesas-ra/mpconfigport.h
@@ -163,14 +163,6 @@
 
 #define MP_STATE_PORT MP_STATE_VM
 
-#ifndef MICROPY_BOARD_ROOT_POINTERS
-#define MICROPY_BOARD_ROOT_POINTERS
-#endif
-
-#define MICROPY_PORT_ROOT_POINTERS \
-    /* root pointers defined by a board */ \
-    MICROPY_BOARD_ROOT_POINTERS \
-
 // type definitions for the specific machine
 
 #define MICROPY_MAKE_POINTER_CALLABLE(p) ((void *)((uint32_t)(p) | 1))
diff --git a/ports/rp2/mpconfigport.h b/ports/rp2/mpconfigport.h
index 82e8de14dbc20..3f332b6a820e7 100644
--- a/ports/rp2/mpconfigport.h
+++ b/ports/rp2/mpconfigport.h
@@ -204,13 +204,6 @@ extern const struct _mod_network_nic_type_t mod_network_nic_type_wiznet5k;
     MICROPY_HW_NIC_WIZNET5K \
     MICROPY_BOARD_NETWORK_INTERFACES \
 
-#ifndef MICROPY_BOARD_ROOT_POINTERS
-#define MICROPY_BOARD_ROOT_POINTERS
-#endif
-
-#define MICROPY_PORT_ROOT_POINTERS \
-    MICROPY_BOARD_ROOT_POINTERS \
-
 #define MP_STATE_PORT MP_STATE_VM
 
 // Miscellaneous settings
diff --git a/ports/stm32/mpconfigport.h b/ports/stm32/mpconfigport.h
index bb73b83371c9d..e44fa2260cacd 100644
--- a/ports/stm32/mpconfigport.h
+++ b/ports/stm32/mpconfigport.h
@@ -238,14 +238,6 @@ extern const struct _mod_network_nic_type_t mod_network_nic_type_cc3k;
 
 #define MP_STATE_PORT MP_STATE_VM
 
-#ifndef MICROPY_BOARD_ROOT_POINTERS
-#define MICROPY_BOARD_ROOT_POINTERS
-#endif
-
-#define MICROPY_PORT_ROOT_POINTERS \
-    /* root pointers defined by a board */ \
-        MICROPY_BOARD_ROOT_POINTERS \
-
 // type definitions for the specific machine
 
 #define MICROPY_MAKE_POINTER_CALLABLE(p) ((void *)((uint32_t)(p) | 1))
diff --git a/ports/unix/variants/minimal/mpconfigvariant.h b/ports/unix/variants/minimal/mpconfigvariant.h
index 60d194b6a1f03..1e378e94d7d2b 100644
--- a/ports/unix/variants/minimal/mpconfigvariant.h
+++ b/ports/unix/variants/minimal/mpconfigvariant.h
@@ -107,8 +107,6 @@
 #define MICROPY_PY_UHASHLIB         (0)
 #define MICROPY_PY_UBINASCII        (0)
 
-#define MICROPY_PORT_ROOT_POINTERS \
-
 #define mp_type_fileio mp_type_vfs_posix_fileio
 #define mp_type_textio mp_type_vfs_posix_textio
 
diff --git a/py/mpconfig.h b/py/mpconfig.h
index adaa3ec1fbae0..ee0123be34ea3 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -1659,11 +1659,6 @@ typedef double mp_float_t;
 #define MICROPY_PORT_CONSTANTS
 #endif
 
-// Any root pointers for GC scanning - see mpstate.c
-#ifndef MICROPY_PORT_ROOT_POINTERS
-#define MICROPY_PORT_ROOT_POINTERS
-#endif
-
 /*****************************************************************************/
 /* Hooks for a port to wrap functions with attributes                        */
 
diff --git a/py/mpstate.h b/py/mpstate.h
index 07a4f386093f5..b51e72cd84b21 100644
--- a/py/mpstate.h
+++ b/py/mpstate.h
@@ -189,9 +189,6 @@ typedef struct _mp_state_vm_t {
     mp_obj_t track_reloc_code_list;
     #endif
 
-    // include any root pointers defined by a port
-    MICROPY_PORT_ROOT_POINTERS
-
     // Include any root pointers registered with MP_REGISTER_ROOT_POINTER().
     #ifndef NO_QSTR
     // Only include root pointer definitions when not doing qstr extraction, because

From 68f46342aa4c20f263cc688cc86d03d03207921e Mon Sep 17 00:00:00 2001
From: David Lechner <david@pybricks.com>
Date: Sat, 2 Jul 2022 15:05:41 -0500
Subject: [PATCH 2361/3533] shared/runtime/pyexec: Use
 MP_REGISTER_ROOT_POINTER().

This uses MP_REGISTER_ROOT_POINTER() to register repl_line
instead of using a conditional inside of mp_state_vm_t.

Signed-off-by: David Lechner <david@pybricks.com>
---
 ports/minimal/Makefile  | 2 +-
 ports/powerpc/Makefile  | 2 +-
 py/mpstate.h            | 4 ----
 shared/runtime/pyexec.c | 2 ++
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/ports/minimal/Makefile b/ports/minimal/Makefile
index ac74925b5752e..4a17df6803e18 100644
--- a/ports/minimal/Makefile
+++ b/ports/minimal/Makefile
@@ -68,7 +68,7 @@ SRC_C += $(SRC_MOD)
 
 SRC_CXX += $(SRC_MOD_CXX)
 
-SRC_QSTR += shared/readline/readline.c
+SRC_QSTR += shared/readline/readline.c shared/runtime/pyexec.c
 SRC_QSTR += $(SRC_MOD) $(SRC_MOD_CXX)
 
 OBJ += $(PY_CORE_O) $(addprefix $(BUILD)/, $(SRC_C:.c=.o))
diff --git a/ports/powerpc/Makefile b/ports/powerpc/Makefile
index f1ebd6764cfd5..12ae485bb8f04 100644
--- a/ports/powerpc/Makefile
+++ b/ports/powerpc/Makefile
@@ -42,7 +42,7 @@ SRC_C = \
 	shared/runtime/stdout_helpers.c \
 	$(BUILD)/_frozen_mpy.c \
 
-SRC_QSTR += shared/readline/readline.c
+SRC_QSTR += shared/readline/readline.c shared/runtime/pyexec.c
 
 OBJ = $(PY_CORE_O)
 OBJ += $(addprefix $(BUILD)/, $(SRC_C:.c=.o))
diff --git a/py/mpstate.h b/py/mpstate.h
index b51e72cd84b21..67146d282bd0f 100644
--- a/py/mpstate.h
+++ b/py/mpstate.h
@@ -198,10 +198,6 @@ typedef struct _mp_state_vm_t {
 
     // root pointers for extmod
 
-    #if MICROPY_REPL_EVENT_DRIVEN
-    vstr_t *repl_line;
-    #endif
-
     #if MICROPY_PY_OS_DUPTERM
     mp_obj_t dupterm_objs[MICROPY_PY_OS_DUPTERM];
     #endif
diff --git a/shared/runtime/pyexec.c b/shared/runtime/pyexec.c
index 2763319c01b75..2c9f1e80ff649 100644
--- a/shared/runtime/pyexec.c
+++ b/shared/runtime/pyexec.c
@@ -488,6 +488,8 @@ int pyexec_event_repl_process_char(int c) {
     return res;
 }
 
+MP_REGISTER_ROOT_POINTER(vstr_t * repl_line);
+
 #else // MICROPY_REPL_EVENT_DRIVEN
 
 int pyexec_raw_repl(void) {

From 631b692177ef1e6ba2832ee224e2680ac9982dbf Mon Sep 17 00:00:00 2001
From: David Lechner <david@pybricks.com>
Date: Sat, 2 Jul 2022 15:05:41 -0500
Subject: [PATCH 2362/3533] extmod/uos_dupterm: Use MP_REGISTER_ROOT_POINTER().

This uses MP_REGISTER_ROOT_POINTER() to register dupterm_objs
instead of using a conditional inside of mp_state_vm_t.

Signed-off-by: David Lechner <david@pybricks.com>
---
 extmod/uos_dupterm.c | 4 +++-
 py/mpstate.h         | 4 ----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/extmod/uos_dupterm.c b/extmod/uos_dupterm.c
index e18d133b913a2..826bf1715df3f 100644
--- a/extmod/uos_dupterm.c
+++ b/extmod/uos_dupterm.c
@@ -201,4 +201,6 @@ STATIC mp_obj_t mp_uos_dupterm(size_t n_args, const mp_obj_t *args) {
 }
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_uos_dupterm_obj, 1, 2, mp_uos_dupterm);
 
-#endif
+MP_REGISTER_ROOT_POINTER(mp_obj_t dupterm_objs[MICROPY_PY_OS_DUPTERM]);
+
+#endif // MICROPY_PY_OS_DUPTERM
diff --git a/py/mpstate.h b/py/mpstate.h
index 67146d282bd0f..53bb882ceb775 100644
--- a/py/mpstate.h
+++ b/py/mpstate.h
@@ -198,10 +198,6 @@ typedef struct _mp_state_vm_t {
 
     // root pointers for extmod
 
-    #if MICROPY_PY_OS_DUPTERM
-    mp_obj_t dupterm_objs[MICROPY_PY_OS_DUPTERM];
-    #endif
-
     #if MICROPY_PY_LWIP_SLIP
     mp_obj_t lwip_slip_stream;
     #endif

From d532c55e3b8ee7955bea99fc79ccd74d9a35f757 Mon Sep 17 00:00:00 2001
From: David Lechner <david@pybricks.com>
Date: Sat, 2 Jul 2022 15:05:41 -0500
Subject: [PATCH 2363/3533] extmod/modlwip: Use MP_REGISTER_ROOT_POINTER().

This uses MP_REGISTER_ROOT_POINTER() to register lwip_slip_stream
instead of using a conditional inside of mp_state_vm_t.

Signed-off-by: David Lechner <david@pybricks.com>
---
 extmod/modlwip.c | 2 ++
 py/mpstate.h     | 4 ----
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/extmod/modlwip.c b/extmod/modlwip.c
index bbfd3a2253cb8..25669228dffd6 100644
--- a/extmod/modlwip.c
+++ b/extmod/modlwip.c
@@ -1783,4 +1783,6 @@ MP_REGISTER_MODULE(MP_QSTR_lwip, mp_module_lwip);
 // On LWIP-ports, this is the usocket module (replaces extmod/modusocket.c).
 MP_REGISTER_MODULE(MP_QSTR_usocket, mp_module_lwip);
 
+MP_REGISTER_ROOT_POINTER(mp_obj_t lwip_slip_stream);
+
 #endif // MICROPY_PY_LWIP
diff --git a/py/mpstate.h b/py/mpstate.h
index 53bb882ceb775..7ad9d6b293cea 100644
--- a/py/mpstate.h
+++ b/py/mpstate.h
@@ -198,10 +198,6 @@ typedef struct _mp_state_vm_t {
 
     // root pointers for extmod
 
-    #if MICROPY_PY_LWIP_SLIP
-    mp_obj_t lwip_slip_stream;
-    #endif
-
     #if MICROPY_VFS
     struct _mp_vfs_mount_t *vfs_cur;
     struct _mp_vfs_mount_t *vfs_mount_table;

From 32e32bd761e91b9aa21f98b4f4fd4d96c723fdb6 Mon Sep 17 00:00:00 2001
From: David Lechner <david@pybricks.com>
Date: Sat, 2 Jul 2022 15:05:41 -0500
Subject: [PATCH 2364/3533] extmod/vfs: Use MP_REGISTER_ROOT_POINTER().

This uses MP_REGISTER_ROOT_POINTER() to register vfs_cur and
vfs_mount_table instead of using a conditional inside of mp_state_vm_t.

Signed-off-by: David Lechner <david@pybricks.com>
---
 extmod/vfs.c | 3 +++
 py/mpstate.h | 5 -----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/extmod/vfs.c b/extmod/vfs.c
index 8bcead190d664..2799622b389b2 100644
--- a/extmod/vfs.c
+++ b/extmod/vfs.c
@@ -547,4 +547,7 @@ int mp_vfs_mount_and_chdir_protected(mp_obj_t bdev, mp_obj_t mount_point) {
     return ret;
 }
 
+MP_REGISTER_ROOT_POINTER(struct _mp_vfs_mount_t *vfs_cur);
+MP_REGISTER_ROOT_POINTER(struct _mp_vfs_mount_t *vfs_mount_table);
+
 #endif // MICROPY_VFS
diff --git a/py/mpstate.h b/py/mpstate.h
index 7ad9d6b293cea..784eff0a262ca 100644
--- a/py/mpstate.h
+++ b/py/mpstate.h
@@ -198,11 +198,6 @@ typedef struct _mp_state_vm_t {
 
     // root pointers for extmod
 
-    #if MICROPY_VFS
-    struct _mp_vfs_mount_t *vfs_cur;
-    struct _mp_vfs_mount_t *vfs_mount_table;
-    #endif
-
     #if MICROPY_PY_BLUETOOTH
     mp_obj_t bluetooth;
     #endif

From 2c728c533059a09635a99facfcce18bda8768497 Mon Sep 17 00:00:00 2001
From: David Lechner <david@pybricks.com>
Date: Sat, 2 Jul 2022 15:05:41 -0500
Subject: [PATCH 2365/3533] extmod/modbluetooth: Use
 MP_REGISTER_ROOT_POINTER().

This uses MP_REGISTER_ROOT_POINTER() to register `bluetooth`
instead of using a conditional inside of mp_state_vm_t.

Signed-off-by: David Lechner <david@pybricks.com>
---
 extmod/modbluetooth.c | 2 ++
 py/mpstate.h          | 6 ------
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/extmod/modbluetooth.c b/extmod/modbluetooth.c
index 6bdea1616f050..9956671863109 100644
--- a/extmod/modbluetooth.c
+++ b/extmod/modbluetooth.c
@@ -1675,4 +1675,6 @@ int mp_bluetooth_gatts_db_resize(mp_gatts_db_t db, uint16_t handle, size_t len,
     return entry ? 0 : MP_EINVAL;
 }
 
+MP_REGISTER_ROOT_POINTER(mp_obj_t bluetooth);
+
 #endif // MICROPY_PY_BLUETOOTH
diff --git a/py/mpstate.h b/py/mpstate.h
index 784eff0a262ca..a268e8685b362 100644
--- a/py/mpstate.h
+++ b/py/mpstate.h
@@ -196,12 +196,6 @@ typedef struct _mp_state_vm_t {
     #include "genhdr/root_pointers.h"
     #endif
 
-    // root pointers for extmod
-
-    #if MICROPY_PY_BLUETOOTH
-    mp_obj_t bluetooth;
-    #endif
-
     //
     // END ROOT POINTER SECTION
     ////////////////////////////////////////////////////////////

From a98aa66df64e2676a311139f43dee9d13bae2c42 Mon Sep 17 00:00:00 2001
From: David Lechner <david@pybricks.com>
Date: Sat, 2 Jul 2022 15:05:41 -0500
Subject: [PATCH 2366/3533] py/persistentcode: Use MP_REGISTER_ROOT_POINTER().

This uses MP_REGISTER_ROOT_POINTER() to register track_reloc_code_list
instead of using a conditional inside of mp_state_vm_t.

Signed-off-by: David Lechner <david@pybricks.com>
---
 py/mpstate.h        | 5 -----
 py/persistentcode.c | 5 +++++
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/py/mpstate.h b/py/mpstate.h
index a268e8685b362..87d367769e59f 100644
--- a/py/mpstate.h
+++ b/py/mpstate.h
@@ -184,11 +184,6 @@ typedef struct _mp_state_vm_t {
     mp_obj_dict_t *mp_module_builtins_override_dict;
     #endif
 
-    #if MICROPY_PERSISTENT_CODE_TRACK_RELOC_CODE
-    // An mp_obj_list_t that tracks relocated native code to prevent the GC from reclaiming them.
-    mp_obj_t track_reloc_code_list;
-    #endif
-
     // Include any root pointers registered with MP_REGISTER_ROOT_POINTER().
     #ifndef NO_QSTR
     // Only include root pointer definitions when not doing qstr extraction, because
diff --git a/py/persistentcode.c b/py/persistentcode.c
index fbef0b2c0f916..a8e74295504e0 100644
--- a/py/persistentcode.c
+++ b/py/persistentcode.c
@@ -644,3 +644,8 @@ void mp_raw_code_save_file(mp_compiled_module_t *cm, const char *filename) {
 #endif // MICROPY_PERSISTENT_CODE_SAVE_FILE
 
 #endif // MICROPY_PERSISTENT_CODE_SAVE
+
+#if MICROPY_PERSISTENT_CODE_TRACK_RELOC_CODE
+// An mp_obj_list_t that tracks relocated native code to prevent the GC from reclaiming them.
+MP_REGISTER_ROOT_POINTER(mp_obj_t track_reloc_code_list);
+#endif

From 85b4f36100aceeddd246f8b3a64436adc8dff867 Mon Sep 17 00:00:00 2001
From: David Lechner <david@pybricks.com>
Date: Sat, 2 Jul 2022 15:05:41 -0500
Subject: [PATCH 2367/3533] py/modsys: Use MP_REGISTER_ROOT_POINTER().

This uses MP_REGISTER_ROOT_POINTER() to register cur_exception,
sys_exitfunc, mp_sys_path_obj, mp_sys_argv_obj and sys_mutable
instead of using a conditional inside of mp_state_vm_t.

Signed-off-by: David Lechner <david@pybricks.com>
---
 py/modsys.c  | 20 ++++++++++++++++++++
 py/mpstate.h | 22 ----------------------
 2 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/py/modsys.c b/py/modsys.c
index a090f1212d37c..56e83029c465b 100644
--- a/py/modsys.c
+++ b/py/modsys.c
@@ -286,4 +286,24 @@ const mp_obj_module_t mp_module_sys = {
 
 MP_REGISTER_MODULE(MP_QSTR_usys, mp_module_sys);
 
+// If MICROPY_PY_SYS_PATH_ARGV_DEFAULTS is not enabled then these two lists
+// must be initialised after the call to mp_init.
+MP_REGISTER_ROOT_POINTER(mp_obj_list_t mp_sys_path_obj);
+MP_REGISTER_ROOT_POINTER(mp_obj_list_t mp_sys_argv_obj);
+
+#if MICROPY_PY_SYS_EXC_INFO
+// current exception being handled, for sys.exc_info()
+MP_REGISTER_ROOT_POINTER(mp_obj_base_t * cur_exception);
+#endif
+
+#if MICROPY_PY_SYS_ATEXIT
+// exposed through sys.atexit function
+MP_REGISTER_ROOT_POINTER(mp_obj_t sys_exitfunc);
 #endif
+
+#if MICROPY_PY_SYS_ATTR_DELEGATION
+// Contains mutable sys attributes.
+MP_REGISTER_ROOT_POINTER(mp_obj_t sys_mutable[MP_SYS_MUTABLE_NUM]);
+#endif
+
+#endif // MICROPY_PY_SYS
diff --git a/py/mpstate.h b/py/mpstate.h
index 87d367769e59f..b7c41c81fc99c 100644
--- a/py/mpstate.h
+++ b/py/mpstate.h
@@ -154,31 +154,9 @@ typedef struct _mp_state_vm_t {
     mp_sched_item_t sched_queue[MICROPY_SCHEDULER_DEPTH];
     #endif
 
-    // current exception being handled, for sys.exc_info()
-    #if MICROPY_PY_SYS_EXC_INFO
-    mp_obj_base_t *cur_exception;
-    #endif
-
-    #if MICROPY_PY_SYS_ATEXIT
-    // exposed through sys.atexit function
-    mp_obj_t sys_exitfunc;
-    #endif
-
     // dictionary for the __main__ module
     mp_obj_dict_t dict_main;
 
-    #if MICROPY_PY_SYS
-    // If MICROPY_PY_SYS_PATH_ARGV_DEFAULTS is not enabled then these two lists
-    // must be initialised after the call to mp_init.
-    mp_obj_list_t mp_sys_path_obj;
-    mp_obj_list_t mp_sys_argv_obj;
-
-    #if MICROPY_PY_SYS_ATTR_DELEGATION
-    // Contains mutable sys attributes.
-    mp_obj_t sys_mutable[MP_SYS_MUTABLE_NUM];
-    #endif
-    #endif
-
     // dictionary for overridden builtins
     #if MICROPY_CAN_OVERRIDE_BUILTINS
     mp_obj_dict_t *mp_module_builtins_override_dict;

From a1ef5ac65db8c7509bef5d3db9ba6de9fbb4ef40 Mon Sep 17 00:00:00 2001
From: David Lechner <david@pybricks.com>
Date: Sat, 2 Jul 2022 15:05:41 -0500
Subject: [PATCH 2368/3533] py/scheduler: Use MP_REGISTER_ROOT_POINTER().

This uses MP_REGISTER_ROOT_POINTER() to register sched_queue
instead of using a conditional inside of mp_state_vm_t.

Signed-off-by: David Lechner <david@pybricks.com>
---
 py/mpstate.h   | 4 ----
 py/scheduler.c | 2 ++
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/py/mpstate.h b/py/mpstate.h
index b7c41c81fc99c..1b6e623ca9f63 100644
--- a/py/mpstate.h
+++ b/py/mpstate.h
@@ -150,10 +150,6 @@ typedef struct _mp_state_vm_t {
     // dictionary with loaded modules (may be exposed as sys.modules)
     mp_obj_dict_t mp_loaded_modules_dict;
 
-    #if MICROPY_ENABLE_SCHEDULER
-    mp_sched_item_t sched_queue[MICROPY_SCHEDULER_DEPTH];
-    #endif
-
     // dictionary for the __main__ module
     mp_obj_dict_t dict_main;
 
diff --git a/py/scheduler.c b/py/scheduler.c
index e8ad4e4f170cb..db090b09911ce 100644
--- a/py/scheduler.c
+++ b/py/scheduler.c
@@ -196,6 +196,8 @@ bool mp_sched_schedule_node(mp_sched_node_t *node, mp_sched_callback_t callback)
 }
 #endif
 
+MP_REGISTER_ROOT_POINTER(mp_sched_item_t sched_queue[MICROPY_SCHEDULER_DEPTH]);
+
 #endif // MICROPY_ENABLE_SCHEDULER
 
 // Called periodically from the VM or from "waiting" code (e.g. sleep) to

From 1d23c01dd6d2bcf64dec86ceed77db7ecac8a8d9 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Fri, 15 Jul 2022 15:13:42 +1000
Subject: [PATCH 2369/3533] stm32/Makefile: Workaround LTO linker order bug in
 binutils <2.35.

Assembly files with weak symbols need to be linked first to avoid issues
with the weak symbols being incorrectly linked instead of strong ones.

See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=83967 and
https://bugs.launchpad.net/gcc-arm-embedded/+bug/1747966

This is the workaround suggested in comment 10 of the gcc-arm-embedded bug.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/stm32/Makefile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ports/stm32/Makefile b/ports/stm32/Makefile
index f1c22c2a9a19a..bab62eaae9332 100644
--- a/ports/stm32/Makefile
+++ b/ports/stm32/Makefile
@@ -534,6 +534,9 @@ endif
 
 endif
 
+# SRC_O should be placed first to work around this LTO bug with binutils <2.35:
+# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=83967
+OBJ += $(addprefix $(BUILD)/, $(SRC_O))
 OBJ += $(PY_O)
 OBJ += $(addprefix $(BUILD)/, $(LIB_SRC_C:.c=.o))
 OBJ += $(LIBM_O)
@@ -544,7 +547,6 @@ OBJ += $(addprefix $(BUILD)/, $(HAL_SRC_C:.c=.o))
 OBJ += $(addprefix $(BUILD)/, $(USBDEV_SRC_C:.c=.o))
 OBJ += $(addprefix $(BUILD)/, $(SRC_C:.c=.o))
 OBJ += $(addprefix $(BUILD)/, $(SRC_CXX:.cpp=.o))
-OBJ += $(addprefix $(BUILD)/, $(SRC_O))
 OBJ += $(addprefix $(BUILD)/, $(SRC_MOD:.c=.o))
 OBJ += $(BUILD)/pins_$(BOARD).o
 

From 18ecc29bb8eedcc1f4fd999310467f0942eeaaac Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sun, 17 Jul 2022 00:48:41 +1000
Subject: [PATCH 2370/3533] tests/extmod/ussl_basic: Make test run on axtls and
 mbedtls.

Fixes issue #4364.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/extmod/ussl_basic.py     | 51 ++++++++++++++++++++--------------
 tests/extmod/ussl_basic.py.exp | 13 +++++----
 2 files changed, 37 insertions(+), 27 deletions(-)

diff --git a/tests/extmod/ussl_basic.py b/tests/extmod/ussl_basic.py
index 9e1821dca9981..dd3b6f0b91e94 100644
--- a/tests/extmod/ussl_basic.py
+++ b/tests/extmod/ussl_basic.py
@@ -7,40 +7,49 @@
     print("SKIP")
     raise SystemExit
 
+
+class TestSocket(io.IOBase):
+    def write(self, buf):
+        return len(buf)
+
+    def readinto(self, buf):
+        return 0
+
+    def ioctl(self, cmd, arg):
+        print("TestSocket.ioctl", cmd, arg)
+        return 0
+
+    def setblocking(self, value):
+        print("TestSocket.setblocking({})".format(value))
+
+
 # create in client mode
 try:
-    ss = ssl.wrap_socket(io.BytesIO(), server_hostname="test.example.com")
+    ss = ssl.wrap_socket(TestSocket(), server_hostname="test.example.com")
 except OSError as er:
-    print("wrap_socket:", repr(er))
+    print("OSError: client")
 
 # create in server mode (can use this object for further tests)
-socket = io.BytesIO()
-ss = ssl.wrap_socket(socket, server_side=1)
+ss = ssl.wrap_socket(TestSocket(), server_side=1, do_handshake=0)
 
 # print
 print(repr(ss)[:12])
 
-# setblocking() propagates call to the underlying stream object, and
-# io.BytesIO doesn't have setblocking() (in CPython too).
-# try:
-#    ss.setblocking(False)
-# except NotImplementedError:
-#    print('setblocking: NotImplementedError')
-# ss.setblocking(True)
+# setblocking() propagates call to the underlying stream object
+ss.setblocking(False)
+ss.setblocking(True)
 
 # write
-print(ss.write(b"aaaa"))
+try:
+    ss.write(b"aaaa")
+except OSError:
+    pass
 
 # read (underlying socket has no data)
-print(ss.read(8))
-
-# read (underlying socket has data, but it's bad data)
-socket.write(b"aaaaaaaaaaaaaaaa")
-socket.seek(0)
 try:
     ss.read(8)
-except OSError as er:
-    print("read:", repr(er))
+except OSError:
+    pass
 
 # close
 ss.close()
@@ -51,10 +60,10 @@
 try:
     ss.read(10)
 except OSError as er:
-    print("read:", repr(er))
+    print("OSError: read")
 
 # write on closed socket
 try:
     ss.write(b"aaaa")
 except OSError as er:
-    print("write:", repr(er))
+    print("OSError: write")
diff --git a/tests/extmod/ussl_basic.py.exp b/tests/extmod/ussl_basic.py.exp
index eb7df855aa099..34355c5183188 100644
--- a/tests/extmod/ussl_basic.py.exp
+++ b/tests/extmod/ussl_basic.py.exp
@@ -1,7 +1,8 @@
-wrap_socket: OSError(-256, 'CONN_LOST')
+OSError: client
 <_SSLSocket 
-4
-b''
-read: OSError(-261,)
-read: OSError(9,)
-write: OSError(9,)
+TestSocket.setblocking(False)
+TestSocket.setblocking(True)
+TestSocket.ioctl 4 0
+TestSocket.ioctl 4 0
+OSError: read
+OSError: write

From e30e7ced6fa73605cd6ea5d943725e69e8501356 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 15 Jul 2022 12:12:57 +1000
Subject: [PATCH 2371/3533] unix/mpconfigport: Make MICROPY_EVENT_POLL_HOOK
 call usleep directly.

So that MICROPY_EVENT_POLL_HOOK can be used without including py/mphal.h.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/unix/mpconfigport.h | 2 +-
 ports/unix/unix_mphal.c   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/unix/mpconfigport.h b/ports/unix/mpconfigport.h
index 97846f81f0068..6397bcfbf6d36 100644
--- a/ports/unix/mpconfigport.h
+++ b/ports/unix/mpconfigport.h
@@ -328,7 +328,7 @@ static inline unsigned long mp_urandom_seed_init(void) {
     do { \
         extern void mp_handle_pending(bool); \
         mp_handle_pending(true); \
-        mp_hal_delay_us(500); \
+        usleep(500); /* equivalent to mp_hal_delay_us(500) */ \
     } while (0);
 
 #include <sched.h>
diff --git a/ports/unix/unix_mphal.c b/ports/unix/unix_mphal.c
index 80a7d1c8f66f7..c224f78700c0a 100644
--- a/ports/unix/unix_mphal.c
+++ b/ports/unix/unix_mphal.c
@@ -233,7 +233,7 @@ void mp_hal_delay_ms(mp_uint_t ms) {
     #ifdef MICROPY_EVENT_POLL_HOOK
     mp_uint_t start = mp_hal_ticks_ms();
     while (mp_hal_ticks_ms() - start < ms) {
-        // MICROPY_EVENT_POLL_HOOK does mp_hal_delay_us(500) (i.e. usleep(500)).
+        // MICROPY_EVENT_POLL_HOOK does usleep(500).
         MICROPY_EVENT_POLL_HOOK
     }
     #else

From 26dec1fafb0c3fb45d9f3e21b98a1bb268008f2f Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 15 Jul 2022 12:27:23 +1000
Subject: [PATCH 2372/3533] unix/mbedtls: Add custom config for mbedtls.

Based on existing bare-metal config from stm32.  Also uses shorter error
messages from lib/mbedtls_errors.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/unix/Makefile                 | 10 +++
 ports/unix/mbedtls/mbedtls_config.h | 94 +++++++++++++++++++++++++++++
 2 files changed, 104 insertions(+)
 create mode 100644 ports/unix/mbedtls/mbedtls_config.h

diff --git a/ports/unix/Makefile b/ports/unix/Makefile
index 1067c9c055a58..dc44744dae457 100644
--- a/ports/unix/Makefile
+++ b/ports/unix/Makefile
@@ -133,6 +133,16 @@ CFLAGS_MOD += -DMICROPY_PY_THREAD=1 -DMICROPY_PY_THREAD_GIL=0
 LDFLAGS_MOD += $(LIBPTHREAD)
 endif
 
+ifeq ($(MICROPY_PY_USSL),1)
+ifeq ($(MICROPY_SSL_MBEDTLS),1)
+GIT_SUBMODULES += lib/mbedtls
+CFLAGS_MOD += -DMBEDTLS_CONFIG_FILE='"mbedtls/mbedtls_config.h"'
+# replace mbedtls' error.c by ours
+SRC_MOD := $(filter-out %/mbedtls/library/error.c, $(SRC_MOD))
+LIB_SRC_C += lib/mbedtls_errors/mp_mbedtls_errors.c
+endif
+endif
+
 # If the variant enables it, enable modbluetooth.
 ifeq ($(MICROPY_PY_BLUETOOTH),1)
 
diff --git a/ports/unix/mbedtls/mbedtls_config.h b/ports/unix/mbedtls/mbedtls_config.h
new file mode 100644
index 0000000000000..b119d09092f0a
--- /dev/null
+++ b/ports/unix/mbedtls/mbedtls_config.h
@@ -0,0 +1,94 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2018-2019 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+#ifndef MICROPY_INCLUDED_MBEDTLS_CONFIG_H
+#define MICROPY_INCLUDED_MBEDTLS_CONFIG_H
+
+// If you want to debug MBEDTLS uncomment the following and
+// Pass 3 to mbedtls_debug_set_threshold in socket_new
+// #define MBEDTLS_DEBUG_C
+
+// Set mbedtls configuration
+#define MBEDTLS_DEPRECATED_REMOVED
+#define MBEDTLS_AES_ROM_TABLES
+#define MBEDTLS_CIPHER_MODE_CBC
+#define MBEDTLS_CIPHER_MODE_CTR // needed for MICROPY_PY_UCRYPTOLIB_CTR
+#define MBEDTLS_ECP_DP_SECP192R1_ENABLED
+#define MBEDTLS_ECP_DP_SECP224R1_ENABLED
+#define MBEDTLS_ECP_DP_SECP256R1_ENABLED
+#define MBEDTLS_ECP_DP_SECP384R1_ENABLED
+#define MBEDTLS_ECP_DP_SECP521R1_ENABLED
+#define MBEDTLS_ECP_DP_SECP192K1_ENABLED
+#define MBEDTLS_ECP_DP_SECP224K1_ENABLED
+#define MBEDTLS_ECP_DP_SECP256K1_ENABLED
+#define MBEDTLS_ECP_DP_BP256R1_ENABLED
+#define MBEDTLS_ECP_DP_BP384R1_ENABLED
+#define MBEDTLS_ECP_DP_BP512R1_ENABLED
+#define MBEDTLS_ECP_DP_CURVE25519_ENABLED
+#define MBEDTLS_KEY_EXCHANGE_RSA_ENABLED
+#define MBEDTLS_NO_PLATFORM_ENTROPY
+#define MBEDTLS_PKCS1_V15
+#define MBEDTLS_SHA256_SMALLER
+#define MBEDTLS_SSL_PROTO_TLS1
+#define MBEDTLS_SSL_PROTO_TLS1_1
+#define MBEDTLS_SSL_PROTO_TLS1_2
+#define MBEDTLS_SSL_SERVER_NAME_INDICATION
+
+// Use a smaller output buffer to reduce size of SSL context
+#define MBEDTLS_SSL_MAX_CONTENT_LEN (16384)
+#define MBEDTLS_SSL_IN_CONTENT_LEN  (MBEDTLS_SSL_MAX_CONTENT_LEN)
+#define MBEDTLS_SSL_OUT_CONTENT_LEN (4096)
+
+// Enable mbedtls modules
+#define MBEDTLS_AES_C
+#define MBEDTLS_ASN1_PARSE_C
+#define MBEDTLS_BIGNUM_C
+#define MBEDTLS_CIPHER_C
+#define MBEDTLS_CTR_DRBG_C
+#define MBEDTLS_ENTROPY_C
+#define MBEDTLS_ERROR_C
+#define MBEDTLS_HAVEGE_C
+#define MBEDTLS_MD_C
+#define MBEDTLS_MD5_C
+#define MBEDTLS_OID_C
+#define MBEDTLS_PKCS5_C
+#define MBEDTLS_PK_C
+#define MBEDTLS_PK_PARSE_C
+#define MBEDTLS_PLATFORM_C
+#define MBEDTLS_RSA_C
+#define MBEDTLS_SHA1_C
+#define MBEDTLS_SHA256_C
+#define MBEDTLS_SHA512_C
+#define MBEDTLS_SSL_CLI_C
+#define MBEDTLS_SSL_SRV_C
+#define MBEDTLS_SSL_TLS_C
+#define MBEDTLS_TIMING_C
+#define MBEDTLS_TLS_DEFAULT_ALLOW_SHA1_IN_KEY_EXCHANGE
+#define MBEDTLS_X509_CRT_PARSE_C
+#define MBEDTLS_X509_USE_C
+
+#include "mbedtls/check_config.h"
+
+#endif /* MICROPY_INCLUDED_MBEDTLS_CONFIG_H */

From 13c78ab6fef333c913d54bafaf628c121fe1e58d Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 15 Jul 2022 12:27:33 +1000
Subject: [PATCH 2373/3533] unix/mpconfigport: Switch ussl from axtls to
 mbedtls.

The reasons to make this switch are:
- The axtls library is not being maintained/updated, mbedtls is.
- So CI and tests can run against mbedtls, which is now the main TLS
  library used by the ports (eg stm32, rp2, mimxrt, esp32). Only esp8266
  uses axtls.

Increases unix standard build on x86-64 by about 89000 bytes.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/unix/mpconfigport.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/unix/mpconfigport.mk b/ports/unix/mpconfigport.mk
index 3a66d997b2f45..fe9eec18dc331 100644
--- a/ports/unix/mpconfigport.mk
+++ b/ports/unix/mpconfigport.mk
@@ -27,10 +27,10 @@ MICROPY_PY_FFI = 1
 MICROPY_PY_USSL = 1
 # axTLS has minimal size but implements only a subset of modern TLS
 # functionality, so may have problems with some servers.
-MICROPY_SSL_AXTLS = 1
+MICROPY_SSL_AXTLS = 0
 # mbedTLS is more up to date and complete implementation, but also
 # more bloated.
-MICROPY_SSL_MBEDTLS = 0
+MICROPY_SSL_MBEDTLS = 1
 
 # jni module requires JVM/JNI
 MICROPY_PY_JNI = 0

From b87f796ef5c8cd7a02e04052913c67a47d057fc5 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 18 Jul 2022 22:44:45 +1000
Subject: [PATCH 2374/3533] unix/Makefile: Only include axtls in GIT_SUBMODULES
 list when enabled.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/unix/Makefile | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/ports/unix/Makefile b/ports/unix/Makefile
index dc44744dae457..05b8d9bff6927 100644
--- a/ports/unix/Makefile
+++ b/ports/unix/Makefile
@@ -30,7 +30,7 @@ UNAME_S := $(shell uname -s)
 include $(TOP)/py/py.mk
 include $(TOP)/extmod/extmod.mk
 
-GIT_SUBMODULES += lib/axtls lib/berkeley-db-1.xx lib/libffi
+GIT_SUBMODULES += lib/berkeley-db-1.xx lib/libffi
 
 INC +=  -I.
 INC +=  -I$(TOP)
@@ -134,6 +134,9 @@ LDFLAGS_MOD += $(LIBPTHREAD)
 endif
 
 ifeq ($(MICROPY_PY_USSL),1)
+ifeq ($(MICROPY_SSL_AXTLS),1)
+GIT_SUBMODULES += lib/axtls
+endif
 ifeq ($(MICROPY_SSL_MBEDTLS),1)
 GIT_SUBMODULES += lib/mbedtls
 CFLAGS_MOD += -DMBEDTLS_CONFIG_FILE='"mbedtls/mbedtls_config.h"'
@@ -325,7 +328,7 @@ else
 CROSS_COMPILE_HOST =
 endif
 
-deplibs: libffi axtls
+deplibs: libffi
 
 libffi: $(BUILD)/lib/libffi/include/ffi.h
 
@@ -339,12 +342,6 @@ $(BUILD)/lib/libffi/include/ffi.h: $(TOP)/lib/libffi/configure
 	$(abspath $(TOP))/lib/libffi/configure $(CROSS_COMPILE_HOST) --prefix=$$PWD/out --disable-structs CC="$(CC)" CXX="$(CXX)" LD="$(LD)" CFLAGS="-Os -fomit-frame-pointer -fstrict-aliasing -ffast-math -fno-exceptions"; \
 	$(MAKE) install-exec-recursive; $(MAKE) -C include install-data-am
 
-axtls: $(TOP)/lib/axtls/README
-
-$(TOP)/lib/axtls/README:
-	@echo "You cloned without --recursive, fetching submodules for you."
-	(cd $(TOP); git submodule update --init --recursive)
-
 PREFIX = /usr/local
 BINDIR = $(DESTDIR)$(PREFIX)/bin
 

From b89422ceaa8746a9e8441426bb9c0d5eb5a6e040 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 18 Jul 2022 22:55:22 +1000
Subject: [PATCH 2375/3533] extmod: Always use custom mbedtls error message
 code.

All ports that use mbedtls use the custom error messages in
mp_mbedtls_errors.c.  This commit simplifies the build so that ports don't
need to explicitly add this file, it's now used by default when mbedtls is
enabled.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/extmod.cmake      | 2 +-
 extmod/extmod.mk         | 2 +-
 ports/mimxrt/Makefile    | 4 +---
 ports/rp2/CMakeLists.txt | 7 -------
 ports/stm32/Makefile     | 3 ---
 ports/unix/Makefile      | 3 ---
 6 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/extmod/extmod.cmake b/extmod/extmod.cmake
index 8fe83a0ada347..954bfc7e96e1f 100644
--- a/extmod/extmod.cmake
+++ b/extmod/extmod.cmake
@@ -114,6 +114,7 @@ if(MICROPY_SSL_MBEDTLS)
     )
 
     target_sources(micropy_lib_mbedtls INTERFACE
+        ${MICROPY_DIR}/lib/mbedtls_errors/mp_mbedtls_errors.c
         ${MICROPY_LIB_MBEDTLS_DIR}/library/aes.c
         ${MICROPY_LIB_MBEDTLS_DIR}/library/aesni.c
         ${MICROPY_LIB_MBEDTLS_DIR}/library/arc4.c
@@ -141,7 +142,6 @@ if(MICROPY_SSL_MBEDTLS)
         ${MICROPY_LIB_MBEDTLS_DIR}/library/ecp_curves.c
         ${MICROPY_LIB_MBEDTLS_DIR}/library/entropy.c
         ${MICROPY_LIB_MBEDTLS_DIR}/library/entropy_poll.c
-        ${MICROPY_LIB_MBEDTLS_DIR}/library/error.c
         ${MICROPY_LIB_MBEDTLS_DIR}/library/gcm.c
         ${MICROPY_LIB_MBEDTLS_DIR}/library/havege.c
         ${MICROPY_LIB_MBEDTLS_DIR}/library/hmac_drbg.c
diff --git a/extmod/extmod.mk b/extmod/extmod.mk
index 93b2a11766cf1..ae3e45bd55cb7 100644
--- a/extmod/extmod.mk
+++ b/extmod/extmod.mk
@@ -119,6 +119,7 @@ SRC_MOD += $(addprefix $(AXTLS_DIR)/,\
 else ifeq ($(MICROPY_SSL_MBEDTLS),1)
 MBEDTLS_DIR = lib/mbedtls
 CFLAGS_MOD += -DMICROPY_SSL_MBEDTLS=1 -I$(TOP)/$(MBEDTLS_DIR)/include
+SRC_MOD += lib/mbedtls_errors/mp_mbedtls_errors.c
 SRC_MOD += $(addprefix $(MBEDTLS_DIR)/library/,\
 	aes.c \
 	aesni.c \
@@ -147,7 +148,6 @@ SRC_MOD += $(addprefix $(MBEDTLS_DIR)/library/,\
 	ecp_curves.c \
 	entropy.c \
 	entropy_poll.c \
-	error.c \
 	gcm.c \
 	havege.c \
 	hmac_drbg.c \
diff --git a/ports/mimxrt/Makefile b/ports/mimxrt/Makefile
index be1c95ba95759..150727577fd9d 100644
--- a/ports/mimxrt/Makefile
+++ b/ports/mimxrt/Makefile
@@ -96,15 +96,13 @@ SRC_TINYUSB_C += \
 
 # All settings for Ethernet support are controller by the value of MICROPY_PY_LWIP
 ifeq ($(MICROPY_PY_LWIP),1)
-SRC_MOD := $(filter-out %/mbedtls/library/error.c, $(SRC_MOD))
 SRC_ETH_C += \
 	$(MCU_DIR)/drivers/fsl_enet.c \
 	hal/phy/device/phydp83825/fsl_phydp83825.c \
 	hal/phy/device/phydp83848/fsl_phydp83848.c \
 	hal/phy/device/phyksz8081/fsl_phyksz8081.c \
 	hal/phy/device/phylan8720/fsl_phylan8720.c \
-	hal/phy/mdio/enet/fsl_enet_mdio.c \
-	lib/mbedtls_errors/mp_mbedtls_errors.c
+	hal/phy/mdio/enet/fsl_enet_mdio.c
 endif
 
 # NXP SDK sources
diff --git a/ports/rp2/CMakeLists.txt b/ports/rp2/CMakeLists.txt
index 8f7895459eb75..f9a9efe62a8c8 100644
--- a/ports/rp2/CMakeLists.txt
+++ b/ports/rp2/CMakeLists.txt
@@ -77,7 +77,6 @@ set(MICROPY_SOURCE_LIB
     ${MICROPY_DIR}/lib/littlefs/lfs1_util.c
     ${MICROPY_DIR}/lib/littlefs/lfs2.c
     ${MICROPY_DIR}/lib/littlefs/lfs2_util.c
-    ${MICROPY_DIR}/lib/mbedtls_errors/mp_mbedtls_errors.c
     ${MICROPY_DIR}/lib/oofatfs/ff.c
     ${MICROPY_DIR}/lib/oofatfs/ffunicode.c
     ${MICROPY_DIR}/shared/netutils/dhcpserver.c
@@ -343,12 +342,6 @@ target_sources(${MICROPY_TARGET} PRIVATE
 
 target_link_libraries(${MICROPY_TARGET} micropy_lib_mbedtls)
 
-# Filter out library/error.c as we're using mp_mbedtls_errors.c instead.
-set_source_files_properties(${MICROPY_LIB_MBEDTLS_DIR}/library/error.c
-    TARGET_DIRECTORY micropy_lib_mbedtls
-    PROPERTIES HEADER_FILE_ONLY ON
-)
-
 target_link_libraries(${MICROPY_TARGET} usermod)
 
 target_include_directories(${MICROPY_TARGET} PRIVATE
diff --git a/ports/stm32/Makefile b/ports/stm32/Makefile
index bab62eaae9332..75a1abeabd23f 100644
--- a/ports/stm32/Makefile
+++ b/ports/stm32/Makefile
@@ -499,9 +499,6 @@ endif
 ifeq ($(MICROPY_SSL_MBEDTLS),1)
 CFLAGS_MOD += -DMBEDTLS_CONFIG_FILE='"mbedtls/mbedtls_config.h"'
 SRC_MOD += mbedtls/mbedtls_port.c
-# replace mbedtls' error.c by ours
-SRC_MOD := $(filter-out %/mbedtls/library/error.c, $(SRC_MOD))
-LIB_SRC_C += lib/mbedtls_errors/mp_mbedtls_errors.c
 endif
 
 ifeq ($(MICROPY_PY_BLUETOOTH),1)
diff --git a/ports/unix/Makefile b/ports/unix/Makefile
index 05b8d9bff6927..04d2242a27f27 100644
--- a/ports/unix/Makefile
+++ b/ports/unix/Makefile
@@ -140,9 +140,6 @@ endif
 ifeq ($(MICROPY_SSL_MBEDTLS),1)
 GIT_SUBMODULES += lib/mbedtls
 CFLAGS_MOD += -DMBEDTLS_CONFIG_FILE='"mbedtls/mbedtls_config.h"'
-# replace mbedtls' error.c by ours
-SRC_MOD := $(filter-out %/mbedtls/library/error.c, $(SRC_MOD))
-LIB_SRC_C += lib/mbedtls_errors/mp_mbedtls_errors.c
 endif
 endif
 

From 5e20dcf925e89c75ad7ba7c947211db6d55a7274 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 18 Jul 2022 23:00:51 +1000
Subject: [PATCH 2376/3533] examples/embedding: Remove obsolete axtls build
 target.

axtls is now built as part of the standard make process, using rules in
extmod/extmod.mk.

Signed-off-by: Damien George <damien@micropython.org>
---
 examples/embedding/Makefile.upylib | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/examples/embedding/Makefile.upylib b/examples/embedding/Makefile.upylib
index 217f2643c9d6a..a8e2b91d56105 100644
--- a/examples/embedding/Makefile.upylib
+++ b/examples/embedding/Makefile.upylib
@@ -172,7 +172,7 @@ else
 CROSS_COMPILE_HOST =
 endif
 
-deplibs: libffi axtls
+deplibs: libffi
 
 # install-exec-recursive & install-data-am targets are used to avoid building
 # docs and depending on makeinfo
@@ -182,13 +182,3 @@ libffi:
 	mkdir -p $(MPTOP)/lib/libffi/build_dir; cd $(MPTOP)/lib/libffi/build_dir; \
 	../configure $(CROSS_COMPILE_HOST) --prefix=$$PWD/out CC="$(CC)" CXX="$(CXX)" LD="$(LD)"; \
 	make install-exec-recursive; make -C include install-data-am
-
-axtls: $(MPTOP)/lib/axtls/README
-	cd $(MPTOP)/lib/axtls; cp config/upyconfig config/.config
-	cd $(MPTOP)/lib/axtls; make oldconfig -B
-	cd $(MPTOP)/lib/axtls; make clean
-	cd $(MPTOP)/lib/axtls; make all CC="$(CC)" LD="$(LD)"
-
-$(MPTOP)/lib/axtls/README:
-	@echo "You cloned without --recursive, fetching submodules for you."
-	(cd $(MPTOP); git submodule update --init --recursive)

From c4adeb2e0873c32a14e49a62023cd99ccdf3d78f Mon Sep 17 00:00:00 2001
From: stijn <stijn@ignitron.net>
Date: Thu, 23 Jun 2022 16:01:12 +0200
Subject: [PATCH 2377/3533] windows: Provide a definition for MP_ALWAYSINLINE.

---
 mpy-cross/mpconfigport.h     | 1 +
 ports/windows/mpconfigport.h | 1 +
 2 files changed, 2 insertions(+)

diff --git a/mpy-cross/mpconfigport.h b/mpy-cross/mpconfigport.h
index 95922d04ff7b5..9d455c0af1f3b 100644
--- a/mpy-cross/mpconfigport.h
+++ b/mpy-cross/mpconfigport.h
@@ -135,6 +135,7 @@ typedef long mp_off_t;
 #define MP_ENDIANNESS_LITTLE        (1)
 #define NORETURN                    __declspec(noreturn)
 #define MP_NOINLINE                 __declspec(noinline)
+#define MP_ALWAYSINLINE             __forceinline
 #define MP_LIKELY(x)                (x)
 #define MP_UNLIKELY(x)              (x)
 #define MICROPY_PORT_CONSTANTS      { MP_ROM_QSTR(MP_QSTR_dummy), MP_ROM_PTR(NULL) }
diff --git a/ports/windows/mpconfigport.h b/ports/windows/mpconfigport.h
index 39f8c0059c616..71814e21476a7 100644
--- a/ports/windows/mpconfigport.h
+++ b/ports/windows/mpconfigport.h
@@ -256,6 +256,7 @@ typedef long mp_off_t;
 #define NORETURN                    __declspec(noreturn)
 #define MP_WEAK
 #define MP_NOINLINE                 __declspec(noinline)
+#define MP_ALWAYSINLINE             __forceinline
 #define MP_LIKELY(x)                (x)
 #define MP_UNLIKELY(x)              (x)
 #define MICROPY_PORT_CONSTANTS      { MP_ROM_QSTR(MP_QSTR_dummy), MP_ROM_PTR(NULL) } // can't have zero-sized array

From 1f16d682daa822a209127b432097113cfcf308d9 Mon Sep 17 00:00:00 2001
From: stijn <stijn@ignitron.net>
Date: Thu, 23 Jun 2022 16:02:59 +0200
Subject: [PATCH 2378/3533] py/misc: Fix msvc compilation with compressed error
 messages.

---
 py/misc.h | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/py/misc.h b/py/misc.h
index b7b6146abcce6..e642598c56d03 100644
--- a/py/misc.h
+++ b/py/misc.h
@@ -293,15 +293,16 @@ typedef union _mp_float_union_t {
 
 // Force usage of the MP_ERROR_TEXT macro by requiring an opaque type.
 typedef struct {
-    #ifdef __clang__
-    // Fix "error: empty struct has size 0 in C, size 1 in C++".
+    #if defined(__clang__) || defined(_MSC_VER)
+    // Fix "error: empty struct has size 0 in C, size 1 in C++", and the msvc counterpart
+    // "C requires that a struct or union have at least one member"
     char dummy;
     #endif
 } *mp_rom_error_text_t;
 
 #include <string.h>
 
-inline __attribute__((always_inline)) const char *MP_COMPRESSED_ROM_TEXT(const char *msg) {
+inline MP_ALWAYSINLINE const char *MP_COMPRESSED_ROM_TEXT(const char *msg) {
     // "genhdr/compressed.data.h" contains an invocation of the MP_MATCH_COMPRESSED macro for each compressed string.
     // The giant if(strcmp) tree is optimized by the compiler, which turns this into a direct return of the compressed data.
     #define MP_MATCH_COMPRESSED(a, b) if (strcmp(msg, a) == 0) { return b; } else

From d05377c060f40c9287804d9cc0897d69eaae11a5 Mon Sep 17 00:00:00 2001
From: stijn <stijn@ignitron.net>
Date: Thu, 23 Jun 2022 16:05:08 +0200
Subject: [PATCH 2379/3533] windows/msvc: Support compressed ROM text for error
 messages.

Enable it in the dev variant as well for consistency with the
makefile-based dev variant.
---
 ports/windows/msvc/genhdr.targets             | 20 +++++++++++++++++--
 .../variants/dev/mpconfigvariant.props        |  5 +++++
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/ports/windows/msvc/genhdr.targets b/ports/windows/msvc/genhdr.targets
index 11c5eae8aea8c..aa796088efeca 100644
--- a/ports/windows/msvc/genhdr.targets
+++ b/ports/windows/msvc/genhdr.targets
@@ -4,7 +4,7 @@
   <Import Project="paths.props" Condition="'$(PyPathsIncluded)' != 'True'"/>
 
   <!--Generate qstrdefs.generated.h and mpversion.h similar to what is done in py/mkrules.mk and py/py.mk-->
-  <Target Name="GenerateHeaders" DependsOnTargets="MakeVersionHdr;MakeModuleDefs;MakeRootPointers;MakeQstrData">
+  <Target Name="GenerateHeaders" DependsOnTargets="MakeVersionHdr;MakeModuleDefs;MakeRootPointers;MakeCompressedData;MakeQstrData">
   </Target>
 
   <PropertyGroup>
@@ -16,6 +16,7 @@
     <QstrGen>$(DestDir)qstrdefs.generated.h</QstrGen>
     <ModuleDefsCollected>$(DestDir)/moduledefs.collected</ModuleDefsCollected>
     <RootPointersCollected>$(DestDir)/root_pointers.collected</RootPointersCollected>
+    <CompressedCollected>$(DestDir)/compressed.collected</CompressedCollected>
     <PyPython Condition="'$(PyPython)' == ''">$(MICROPY_CPYTHON3)</PyPython>
     <PyPython Condition="'$(PyPython)' == ''">python</PyPython>
     <CLToolExe Condition="'$(CLToolExe)' == ''">cl.exe</CLToolExe>
@@ -46,7 +47,8 @@
 using(var outFile = System.IO.File.CreateText(OutputFile)) {
   foreach(var inFile in InputFiles)
     foreach(var line in System.IO.File.ReadAllLines(inFile))
-      if((line.Contains(".c") && line.StartsWith("#line")) || line.Contains("MP_QSTR") || line.Contains("MP_REGISTER"))
+      if((line.Contains(".c") && line.StartsWith("#line")) || line.Contains("MP_QSTR") ||
+          line.Contains("MP_REGISTER") || line.Contains("MP_COMPRESSED_ROM_TEXT"))
         outFile.WriteLine( line );
 }
         ]]>
@@ -101,6 +103,11 @@ using(var outFile = System.IO.File.CreateText(OutputFile)) {
     <Exec Command="$(PyPython) $(PySrcDir)makeqstrdefs.py cat qstr _ $(DestDir)qstr $(QstrDefsCollected)"/>
   </Target>
 
+  <Target Name="CollectCompressedData" DependsOnTargets="MakeQstrDefs" Inputs="$(DestDir)qstr.i.last" Outputs="$(CompressedCollected)">
+    <Exec Command="$(PyPython) $(PySrcDir)makeqstrdefs.py split compress $(DestDir)qstr.i.last $(DestDir)compress _"/>
+    <Exec Command="$(PyPython) $(PySrcDir)makeqstrdefs.py cat compress _ $(DestDir)compress $(CompressedCollected)"/>
+  </Target>
+
   <Target Name="CollectModuleDefs" DependsOnTargets="MakeQstrDefs" Inputs="$(DestDir)qstr.i.last" Outputs="$(ModuleDefsCollected)">
     <Exec Command="$(PyPython) $(PySrcDir)makeqstrdefs.py split module $(DestDir)qstr.i.last $(DestDir)module _"/>
     <Exec Command="$(PyPython) $(PySrcDir)makeqstrdefs.py cat module _ $(DestDir)module $(ModuleDefsCollected)"/>
@@ -129,6 +136,15 @@ using(var outFile = System.IO.File.CreateText(OutputFile)) {
     <MSBuild Projects="$(MSBuildThisFileFullPath)" Targets="CopyFileIfDifferent" Properties="SourceFile=$(TmpFile);DestFile=$(DestFile)"/>
   </Target>
 
+  <Target Name="MakeCompressedData" DependsOnTargets="CollectCompressedData" Inputs="$(CompressedCollected)" Outputs="$(DestDir)compressed.data.h">
+    <PropertyGroup>
+      <DestFile>$(DestDir)compressed.data.h</DestFile>
+      <TmpFile>$(DestFile).tmp</TmpFile>
+    </PropertyGroup>
+    <Exec Command="$(PyPython) $(PySrcDir)makecompresseddata.py $(CompressedCollected) > $(TmpFile)"/>
+    <MSBuild Projects="$(MSBuildThisFileFullPath)" Targets="CopyFileIfDifferent" Properties="SourceFile=$(TmpFile);DestFile=$(DestFile)"/>
+  </Target>
+
   <Target Name="MakeQstrData" DependsOnTargets="MakeQstrDefs" Inputs="$(QstrDefsCollected);$(PyQstrDefs);$(QstrDefs)" Outputs="$(QstrGen)">
     <PropertyGroup>
       <TmpFile>$(QstrGen).tmp</TmpFile>
diff --git a/ports/windows/variants/dev/mpconfigvariant.props b/ports/windows/variants/dev/mpconfigvariant.props
index 5f78d6e62a154..0f7abf7815609 100644
--- a/ports/windows/variants/dev/mpconfigvariant.props
+++ b/ports/windows/variants/dev/mpconfigvariant.props
@@ -3,4 +3,9 @@
   <PropertyGroup>
     <PyProg>micropython-dev</PyProg>
   </PropertyGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions);MICROPY_ROM_TEXT_COMPRESSION=1</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
 </Project>

From e82aa2abc46f93abcbed2843c4f23f1838abb844 Mon Sep 17 00:00:00 2001
From: stijn <stijn@ignitron.net>
Date: Thu, 14 Jul 2022 15:24:27 +0200
Subject: [PATCH 2380/3533] py/qstr: Make mp_decompress_rom_string decl and def
 the same.

Fixes MSVC warning about mismatching argument types.
---
 py/qstr.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/py/qstr.h b/py/qstr.h
index fa634f90b0ebb..a463b67a1836c 100644
--- a/py/qstr.h
+++ b/py/qstr.h
@@ -93,7 +93,7 @@ void qstr_pool_info(size_t *n_pool, size_t *n_qstr, size_t *n_str_data_bytes, si
 void qstr_dump_data(void);
 
 #if MICROPY_ROM_TEXT_COMPRESSION
-void mp_decompress_rom_string(byte *dst, mp_rom_error_text_t src);
+void mp_decompress_rom_string(byte *dst, const mp_rom_error_text_t src);
 #define MP_IS_COMPRESSED_ROM_STRING(s) (*(byte *)(s) == 0xff)
 #endif
 

From c947c2529427fedea2b6d7b1dead8b61f6e8a28d Mon Sep 17 00:00:00 2001
From: David Lechner <david@pybricks.com>
Date: Mon, 18 Jul 2022 11:40:27 -0500
Subject: [PATCH 2381/3533] unix/Makefile: Only checkout libffi submodule when
 used.

This moves the libffi submodule variable modifier inside of the if
statement where it is actually used so that the submodule will only be
checked out if it is actually being used.

A new DEPLIBS variable is also introduced to prevent building the libffi
submodule when not needed.

Signed-off-by: David Lechner <david@pybricks.com>
---
 ports/unix/Makefile | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/ports/unix/Makefile b/ports/unix/Makefile
index 04d2242a27f27..3b339c3d3f79f 100644
--- a/ports/unix/Makefile
+++ b/ports/unix/Makefile
@@ -30,7 +30,7 @@ UNAME_S := $(shell uname -s)
 include $(TOP)/py/py.mk
 include $(TOP)/extmod/extmod.mk
 
-GIT_SUBMODULES += lib/berkeley-db-1.xx lib/libffi
+GIT_SUBMODULES += lib/berkeley-db-1.xx
 
 INC +=  -I.
 INC +=  -I$(TOP)
@@ -202,6 +202,9 @@ endif
 ifeq ($(MICROPY_PY_FFI),1)
 
 ifeq ($(MICROPY_STANDALONE),1)
+# Build libffi from source.
+GIT_SUBMODULES += lib/libffi
+DEPLIBS += libffi
 LIBFFI_CFLAGS_MOD := -I$(shell ls -1d $(BUILD)/lib/libffi/out/lib/libffi-*/include)
  ifeq ($(MICROPY_FORCE_32BIT),1)
   LIBFFI_LDFLAGS_MOD = $(BUILD)/lib/libffi/out/lib32/libffi.a
@@ -209,6 +212,7 @@ LIBFFI_CFLAGS_MOD := -I$(shell ls -1d $(BUILD)/lib/libffi/out/lib/libffi-*/inclu
   LIBFFI_LDFLAGS_MOD = $(BUILD)/lib/libffi/out/lib/libffi.a
  endif
 else
+# Use system version of libffi.
 LIBFFI_CFLAGS_MOD := $(shell pkg-config --cflags libffi)
 LIBFFI_LDFLAGS_MOD := $(shell pkg-config --libs libffi)
 endif
@@ -325,7 +329,7 @@ else
 CROSS_COMPILE_HOST =
 endif
 
-deplibs: libffi
+deplibs: $(DEPLIBS)
 
 libffi: $(BUILD)/lib/libffi/include/ffi.h
 

From 03fb6718339fb77022a84b25875cc1daf804ac9a Mon Sep 17 00:00:00 2001
From: David Lechner <david@pybricks.com>
Date: Mon, 7 Feb 2022 13:37:37 -0600
Subject: [PATCH 2382/3533] unix/mpconfigport: Allow overriding
 MICROPY_EVENT_POLL_HOOK.

This allows variants to supply their own `MICROPY_EVENT_POLL_HOOK`.

Signed-off-by: David Lechner <david@pybricks.com>
---
 ports/unix/mpconfigport.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ports/unix/mpconfigport.h b/ports/unix/mpconfigport.h
index 6397bcfbf6d36..312c0cce8fbbf 100644
--- a/ports/unix/mpconfigport.h
+++ b/ports/unix/mpconfigport.h
@@ -324,12 +324,14 @@ static inline unsigned long mp_urandom_seed_init(void) {
 #define MICROPY_END_ATOMIC_SECTION(x) (void)x; mp_thread_unix_end_atomic_section()
 #endif
 
+#ifndef MICROPY_EVENT_POLL_HOOK
 #define MICROPY_EVENT_POLL_HOOK \
     do { \
         extern void mp_handle_pending(bool); \
         mp_handle_pending(true); \
         usleep(500); /* equivalent to mp_hal_delay_us(500) */ \
     } while (0);
+#endif
 
 #include <sched.h>
 #define MICROPY_UNIX_MACHINE_IDLE sched_yield();

From d1ef3815e6041c4fd569bb19f88080a0c55b20c6 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Mon, 18 Jul 2022 15:36:04 +0200
Subject: [PATCH 2383/3533] lib/tinyusb: Update to the most recent master.

---
 lib/tinyusb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/tinyusb b/lib/tinyusb
index 4bfab30c02279..868f2bcda092b 160000
--- a/lib/tinyusb
+++ b/lib/tinyusb
@@ -1 +1 @@
-Subproject commit 4bfab30c02279a0530e1a56f4a7c539f2d35a293
+Subproject commit 868f2bcda092b0b8d5f7ac55ffaef2c81316d35e

From 80339f1a33faadfe85d0276a2e22701ec9a5b82e Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Mon, 18 Jul 2022 15:38:04 +0200
Subject: [PATCH 2384/3533] ports: Adapt mimxrt, nrf and rp2 ports to work with
 latest TinyUSB.

rp2: change tud_task() to tud_task_ext().

mimxrt: use lib/tinyusb/src/portable/chipidea/ci_hs/dcd_ci_hs.c instead of
lib/tinyusb/src/portable/nxp/transdimension/dcd_transdimension.c.

nrf: add a definition for the changed tud_task().  tud_task() is changed
to tud_task_ext(), and the #define for backward compatibility is in
src/device/usbd.h.

The items I know which are fixed with this version:
- Fix for the SAMD USB lock-up.
- Support the MIMXRT11XX series of MCUs.
- Fix a wrong pin definition for MIMXRT1050_EVKB.

Tested with the MIMXRT boards, rp2 Pico, SAMD boards, nrf board.
---
 ports/mimxrt/Makefile    | 2 +-
 ports/nrf/mpconfigport.h | 1 +
 ports/rp2/mpconfigport.h | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/ports/mimxrt/Makefile b/ports/mimxrt/Makefile
index 150727577fd9d..de560bdb66a6b 100644
--- a/ports/mimxrt/Makefile
+++ b/ports/mimxrt/Makefile
@@ -91,7 +91,7 @@ SRC_TINYUSB_C += \
 	lib/tinyusb/src/common/tusb_fifo.c \
 	lib/tinyusb/src/device/usbd.c \
 	lib/tinyusb/src/device/usbd_control.c \
-	lib/tinyusb/src/portable/nxp/transdimension/dcd_transdimension.c \
+	lib/tinyusb/src/portable/chipidea/ci_hs/dcd_ci_hs.c \
 	lib/tinyusb/src/tusb.c
 
 # All settings for Ethernet support are controller by the value of MICROPY_PY_LWIP
diff --git a/ports/nrf/mpconfigport.h b/ports/nrf/mpconfigport.h
index b3a95614a4adc..8a2478d27d0f8 100644
--- a/ports/nrf/mpconfigport.h
+++ b/ports/nrf/mpconfigport.h
@@ -311,6 +311,7 @@ typedef long mp_off_t;
 #define MP_STATE_PORT MP_STATE_VM
 
 #if MICROPY_HW_USB_CDC
+#include "device/usbd.h"
 #define MICROPY_HW_USBDEV_TASK_HOOK extern void tud_task(void); tud_task();
 #else
 #define MICROPY_HW_USBDEV_TASK_HOOK ;
diff --git a/ports/rp2/mpconfigport.h b/ports/rp2/mpconfigport.h
index 3f332b6a820e7..14748a763d1a0 100644
--- a/ports/rp2/mpconfigport.h
+++ b/ports/rp2/mpconfigport.h
@@ -220,7 +220,7 @@ extern void mp_thread_end_atomic_section(uint32_t);
 #define MICROPY_PY_LWIP_EXIT    lwip_lock_release();
 
 #if MICROPY_HW_ENABLE_USBDEV
-#define MICROPY_HW_USBDEV_TASK_HOOK extern void tud_task(void); tud_task();
+#define MICROPY_HW_USBDEV_TASK_HOOK extern void tud_task_ext(uint32_t, bool); tud_task_ext(0, false);
 #define MICROPY_VM_HOOK_COUNT (10)
 #define MICROPY_VM_HOOK_INIT static uint vm_hook_divisor = MICROPY_VM_HOOK_COUNT;
 #define MICROPY_VM_HOOK_POLL if (get_core_num() == 0 && --vm_hook_divisor == 0) { \

From 2e2202993cc84db022c0e6980b0bd9d3e18cbd7e Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Mon, 18 Jul 2022 16:42:32 +0200
Subject: [PATCH 2385/3533] shared/runtime/softtimer: Move softtimer.[ch] to
 shared/runtime.

And change the include lock to the naming scheme of that place.

This comes from ports/stm32/softtimer.[ch].
---
 shared/runtime/softtimer.c | 148 +++++++++++++++++++++++++++++++++++++
 shared/runtime/softtimer.h |  66 +++++++++++++++++
 2 files changed, 214 insertions(+)
 create mode 100644 shared/runtime/softtimer.c
 create mode 100644 shared/runtime/softtimer.h

diff --git a/shared/runtime/softtimer.c b/shared/runtime/softtimer.c
new file mode 100644
index 0000000000000..c9c59cab0eed0
--- /dev/null
+++ b/shared/runtime/softtimer.c
@@ -0,0 +1,148 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2019 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include <stdint.h>
+#include "py/gc.h"
+#include "py/mphal.h"
+#include "py/runtime.h"
+#include "irq.h"
+#include "softtimer.h"
+
+#define TICKS_PERIOD 0x80000000
+#define TICKS_DIFF(t1, t0) ((int32_t)(((t1 - t0 + TICKS_PERIOD / 2) & (TICKS_PERIOD - 1)) - TICKS_PERIOD / 2))
+
+extern __IO uint32_t uwTick;
+
+volatile uint32_t soft_timer_next;
+
+// Pointer to the pairheap of soft timer objects.
+// This may contain bss/data pointers as well as GC-heap pointers,
+// and is explicitly GC traced by soft_timer_gc_mark_all().
+STATIC soft_timer_entry_t *soft_timer_heap;
+
+STATIC int soft_timer_lt(mp_pairheap_t *n1, mp_pairheap_t *n2) {
+    soft_timer_entry_t *e1 = (soft_timer_entry_t *)n1;
+    soft_timer_entry_t *e2 = (soft_timer_entry_t *)n2;
+    return TICKS_DIFF(e1->expiry_ms, e2->expiry_ms) < 0;
+}
+
+STATIC void soft_timer_schedule_systick(uint32_t ticks_ms) {
+    uint32_t irq_state = disable_irq();
+    uint32_t uw_tick = uwTick;
+    if (TICKS_DIFF(ticks_ms, uw_tick) <= 0) {
+        soft_timer_next = uw_tick + 1;
+    } else {
+        soft_timer_next = ticks_ms;
+    }
+    enable_irq(irq_state);
+}
+
+void soft_timer_deinit(void) {
+    // Pop off all the nodes which are allocated on the GC-heap.
+    uint32_t irq_state = raise_irq_pri(IRQ_PRI_PENDSV);
+    soft_timer_entry_t *heap_from = soft_timer_heap;
+    soft_timer_entry_t *heap_to = (soft_timer_entry_t *)mp_pairheap_new(soft_timer_lt);
+    while (heap_from != NULL) {
+        soft_timer_entry_t *entry = (soft_timer_entry_t *)mp_pairheap_peek(soft_timer_lt, &heap_from->pairheap);
+        heap_from = (soft_timer_entry_t *)mp_pairheap_pop(soft_timer_lt, &heap_from->pairheap);
+        if (!(entry->flags & SOFT_TIMER_FLAG_GC_ALLOCATED)) {
+            heap_to = (soft_timer_entry_t *)mp_pairheap_push(soft_timer_lt, &heap_to->pairheap, &entry->pairheap);
+        }
+    }
+    soft_timer_heap = heap_to;
+    restore_irq_pri(irq_state);
+}
+
+// Must be executed at IRQ_PRI_PENDSV
+void soft_timer_handler(void) {
+    uint32_t ticks_ms = uwTick;
+    soft_timer_entry_t *heap = soft_timer_heap;
+    while (heap != NULL && TICKS_DIFF(heap->expiry_ms, ticks_ms) <= 0) {
+        soft_timer_entry_t *entry = heap;
+        heap = (soft_timer_entry_t *)mp_pairheap_pop(soft_timer_lt, &heap->pairheap);
+        if (entry->flags & SOFT_TIMER_FLAG_PY_CALLBACK) {
+            mp_sched_schedule(entry->py_callback, MP_OBJ_FROM_PTR(entry));
+        } else {
+            entry->c_callback(entry);
+        }
+        if (entry->mode == SOFT_TIMER_MODE_PERIODIC) {
+            entry->expiry_ms += entry->delta_ms;
+            heap = (soft_timer_entry_t *)mp_pairheap_push(soft_timer_lt, &heap->pairheap, &entry->pairheap);
+        }
+    }
+    soft_timer_heap = heap;
+    if (heap == NULL) {
+        // No more timers left, set largest delay possible
+        soft_timer_next = uwTick;
+    } else {
+        // Set soft_timer_next so SysTick calls us back at the correct time
+        soft_timer_schedule_systick(heap->expiry_ms);
+    }
+}
+
+void soft_timer_gc_mark_all(void) {
+    // Mark all soft timer nodes that are allocated on the GC-heap.
+    // To avoid deep C recursion, pop and recreate the pairheap as nodes are marked.
+    uint32_t irq_state = raise_irq_pri(IRQ_PRI_PENDSV);
+    soft_timer_entry_t *heap_from = soft_timer_heap;
+    soft_timer_entry_t *heap_to = (soft_timer_entry_t *)mp_pairheap_new(soft_timer_lt);
+    while (heap_from != NULL) {
+        soft_timer_entry_t *entry = (soft_timer_entry_t *)mp_pairheap_peek(soft_timer_lt, &heap_from->pairheap);
+        heap_from = (soft_timer_entry_t *)mp_pairheap_pop(soft_timer_lt, &heap_from->pairheap);
+        if (entry->flags & SOFT_TIMER_FLAG_GC_ALLOCATED) {
+            gc_collect_root((void **)&entry, 1);
+        }
+        heap_to = (soft_timer_entry_t *)mp_pairheap_push(soft_timer_lt, &heap_to->pairheap, &entry->pairheap);
+    }
+    soft_timer_heap = heap_to;
+    restore_irq_pri(irq_state);
+}
+
+void soft_timer_static_init(soft_timer_entry_t *entry, uint16_t mode, uint32_t delta_ms, void (*cb)(soft_timer_entry_t *)) {
+    mp_pairheap_init_node(soft_timer_lt, &entry->pairheap);
+    entry->flags = 0;
+    entry->mode = mode;
+    entry->delta_ms = delta_ms;
+    entry->c_callback = cb;
+}
+
+void soft_timer_insert(soft_timer_entry_t *entry, uint32_t initial_delta_ms) {
+    mp_pairheap_init_node(soft_timer_lt, &entry->pairheap);
+    entry->expiry_ms = mp_hal_ticks_ms() + initial_delta_ms;
+    uint32_t irq_state = raise_irq_pri(IRQ_PRI_PENDSV);
+    soft_timer_heap = (soft_timer_entry_t *)mp_pairheap_push(soft_timer_lt, &soft_timer_heap->pairheap, &entry->pairheap);
+    if (entry == soft_timer_heap) {
+        // This new timer became the earliest one so set soft_timer_next
+        soft_timer_schedule_systick(entry->expiry_ms);
+    }
+    restore_irq_pri(irq_state);
+}
+
+void soft_timer_remove(soft_timer_entry_t *entry) {
+    uint32_t irq_state = raise_irq_pri(IRQ_PRI_PENDSV);
+    soft_timer_heap = (soft_timer_entry_t *)mp_pairheap_delete(soft_timer_lt, &soft_timer_heap->pairheap, &entry->pairheap);
+    restore_irq_pri(irq_state);
+}
diff --git a/shared/runtime/softtimer.h b/shared/runtime/softtimer.h
new file mode 100644
index 0000000000000..8603ea13f0707
--- /dev/null
+++ b/shared/runtime/softtimer.h
@@ -0,0 +1,66 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2019 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+#ifndef MICROPY_INCLUDED_SHARED_RUNTIME_SOFTTIMER_H
+#define MICROPY_INCLUDED_SHARED_RUNTIME_SOFTTIMER_H
+
+#include "py/pairheap.h"
+
+#define SOFT_TIMER_FLAG_PY_CALLBACK (1)
+#define SOFT_TIMER_FLAG_GC_ALLOCATED (2)
+
+#define SOFT_TIMER_MODE_ONE_SHOT (1)
+#define SOFT_TIMER_MODE_PERIODIC (2)
+
+typedef struct _soft_timer_entry_t {
+    mp_pairheap_t pairheap;
+    uint16_t flags;
+    uint16_t mode;
+    uint32_t expiry_ms;
+    uint32_t delta_ms; // for periodic mode
+    union {
+        void (*c_callback)(struct _soft_timer_entry_t *);
+        mp_obj_t py_callback;
+    };
+} soft_timer_entry_t;
+
+extern volatile uint32_t soft_timer_next;
+
+void soft_timer_deinit(void);
+void soft_timer_handler(void);
+void soft_timer_gc_mark_all(void);
+
+void soft_timer_static_init(soft_timer_entry_t *entry, uint16_t mode, uint32_t delta_ms, void (*cb)(soft_timer_entry_t *));
+void soft_timer_insert(soft_timer_entry_t *entry, uint32_t initial_delta_ms);
+void soft_timer_remove(soft_timer_entry_t *entry);
+
+// The timer will be reinserted into the heap so that it is called after initial_delta_ms milliseconds.
+// After that, if it's periodic, it will continue to be called every entry->delta_ms milliseconds.
+static inline void soft_timer_reinsert(soft_timer_entry_t *entry, uint32_t initial_delta_ms) {
+    soft_timer_remove(entry);
+    soft_timer_insert(entry, initial_delta_ms);
+}
+
+#endif // MICROPY_INCLUDED_SHARED_RUNTIME_SOFTTIMER_H

From c781899438e3a0c1241ddd0d550555562c2a53d4 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Mon, 18 Jul 2022 16:44:31 +0200
Subject: [PATCH 2386/3533] stm32/softtimer: Switch to use softtimer code from
 shared/runtime.

---
 ports/stm32/Makefile        |   2 +-
 ports/stm32/gccollect.c     |   2 +-
 ports/stm32/machine_timer.c |   2 +-
 ports/stm32/main.c          |   2 +-
 ports/stm32/mpbthciport.c   |   2 +-
 ports/stm32/softtimer.c     | 148 ------------------------------------
 ports/stm32/softtimer.h     |  66 ----------------
 ports/stm32/systick.c       |   2 +-
 8 files changed, 6 insertions(+), 220 deletions(-)
 delete mode 100644 ports/stm32/softtimer.c
 delete mode 100644 ports/stm32/softtimer.h

diff --git a/ports/stm32/Makefile b/ports/stm32/Makefile
index 75a1abeabd23f..652dff19fe1da 100644
--- a/ports/stm32/Makefile
+++ b/ports/stm32/Makefile
@@ -144,6 +144,7 @@ SHARED_SRC_C += $(addprefix shared/,\
 	runtime/interrupt_char.c \
 	runtime/mpirq.c \
 	runtime/pyexec.c \
+	runtime/softtimer.c  \
 	runtime/stdout_helpers.c \
 	runtime/sys_stdio_mphal.c \
 	timeutils/timeutils.c \
@@ -270,7 +271,6 @@ SRC_C += \
 	irq.c \
 	pendsv.c \
 	systick.c  \
-	softtimer.c  \
 	powerctrl.c \
 	powerctrlboot.c \
 	rfcore.c \
diff --git a/ports/stm32/gccollect.c b/ports/stm32/gccollect.c
index bd697a2af3b5a..667bbc43277ae 100644
--- a/ports/stm32/gccollect.c
+++ b/ports/stm32/gccollect.c
@@ -31,8 +31,8 @@
 #include "py/gc.h"
 #include "py/mpthread.h"
 #include "shared/runtime/gchelper.h"
+#include "shared/runtime/softtimer.h"
 #include "gccollect.h"
-#include "softtimer.h"
 #include "systick.h"
 
 void gc_collect(void) {
diff --git a/ports/stm32/machine_timer.c b/ports/stm32/machine_timer.c
index c94532218773f..c387d35117d82 100644
--- a/ports/stm32/machine_timer.c
+++ b/ports/stm32/machine_timer.c
@@ -26,7 +26,7 @@
 
 #include "py/runtime.h"
 #include "py/mphal.h"
-#include "softtimer.h"
+#include "shared/runtime/softtimer.h"
 
 typedef soft_timer_entry_t machine_timer_obj_t;
 
diff --git a/ports/stm32/main.c b/ports/stm32/main.c
index 44732cef9e0c1..c001234704482 100644
--- a/ports/stm32/main.c
+++ b/ports/stm32/main.c
@@ -34,6 +34,7 @@
 #include "py/mphal.h"
 #include "shared/readline/readline.h"
 #include "shared/runtime/pyexec.h"
+#include "shared/runtime/softtimer.h"
 #include "lib/oofatfs/ff.h"
 #include "lib/littlefs/lfs1.h"
 #include "lib/littlefs/lfs1_util.h"
@@ -65,7 +66,6 @@
 #include "gccollect.h"
 #include "factoryreset.h"
 #include "modmachine.h"
-#include "softtimer.h"
 #include "i2c.h"
 #include "spi.h"
 #include "uart.h"
diff --git a/ports/stm32/mpbthciport.c b/ports/stm32/mpbthciport.c
index d3ddb40421e56..d73aa50c3731f 100644
--- a/ports/stm32/mpbthciport.c
+++ b/ports/stm32/mpbthciport.c
@@ -29,8 +29,8 @@
 #include "py/mphal.h"
 #include "extmod/mpbthci.h"
 #include "extmod/modbluetooth.h"
+#include "shared/runtime/softtimer.h"
 #include "mpbthciport.h"
-#include "softtimer.h"
 #include "pendsv.h"
 #include "shared/runtime/mpirq.h"
 
diff --git a/ports/stm32/softtimer.c b/ports/stm32/softtimer.c
deleted file mode 100644
index c9c59cab0eed0..0000000000000
--- a/ports/stm32/softtimer.c
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2019 Damien P. George
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#include <stdint.h>
-#include "py/gc.h"
-#include "py/mphal.h"
-#include "py/runtime.h"
-#include "irq.h"
-#include "softtimer.h"
-
-#define TICKS_PERIOD 0x80000000
-#define TICKS_DIFF(t1, t0) ((int32_t)(((t1 - t0 + TICKS_PERIOD / 2) & (TICKS_PERIOD - 1)) - TICKS_PERIOD / 2))
-
-extern __IO uint32_t uwTick;
-
-volatile uint32_t soft_timer_next;
-
-// Pointer to the pairheap of soft timer objects.
-// This may contain bss/data pointers as well as GC-heap pointers,
-// and is explicitly GC traced by soft_timer_gc_mark_all().
-STATIC soft_timer_entry_t *soft_timer_heap;
-
-STATIC int soft_timer_lt(mp_pairheap_t *n1, mp_pairheap_t *n2) {
-    soft_timer_entry_t *e1 = (soft_timer_entry_t *)n1;
-    soft_timer_entry_t *e2 = (soft_timer_entry_t *)n2;
-    return TICKS_DIFF(e1->expiry_ms, e2->expiry_ms) < 0;
-}
-
-STATIC void soft_timer_schedule_systick(uint32_t ticks_ms) {
-    uint32_t irq_state = disable_irq();
-    uint32_t uw_tick = uwTick;
-    if (TICKS_DIFF(ticks_ms, uw_tick) <= 0) {
-        soft_timer_next = uw_tick + 1;
-    } else {
-        soft_timer_next = ticks_ms;
-    }
-    enable_irq(irq_state);
-}
-
-void soft_timer_deinit(void) {
-    // Pop off all the nodes which are allocated on the GC-heap.
-    uint32_t irq_state = raise_irq_pri(IRQ_PRI_PENDSV);
-    soft_timer_entry_t *heap_from = soft_timer_heap;
-    soft_timer_entry_t *heap_to = (soft_timer_entry_t *)mp_pairheap_new(soft_timer_lt);
-    while (heap_from != NULL) {
-        soft_timer_entry_t *entry = (soft_timer_entry_t *)mp_pairheap_peek(soft_timer_lt, &heap_from->pairheap);
-        heap_from = (soft_timer_entry_t *)mp_pairheap_pop(soft_timer_lt, &heap_from->pairheap);
-        if (!(entry->flags & SOFT_TIMER_FLAG_GC_ALLOCATED)) {
-            heap_to = (soft_timer_entry_t *)mp_pairheap_push(soft_timer_lt, &heap_to->pairheap, &entry->pairheap);
-        }
-    }
-    soft_timer_heap = heap_to;
-    restore_irq_pri(irq_state);
-}
-
-// Must be executed at IRQ_PRI_PENDSV
-void soft_timer_handler(void) {
-    uint32_t ticks_ms = uwTick;
-    soft_timer_entry_t *heap = soft_timer_heap;
-    while (heap != NULL && TICKS_DIFF(heap->expiry_ms, ticks_ms) <= 0) {
-        soft_timer_entry_t *entry = heap;
-        heap = (soft_timer_entry_t *)mp_pairheap_pop(soft_timer_lt, &heap->pairheap);
-        if (entry->flags & SOFT_TIMER_FLAG_PY_CALLBACK) {
-            mp_sched_schedule(entry->py_callback, MP_OBJ_FROM_PTR(entry));
-        } else {
-            entry->c_callback(entry);
-        }
-        if (entry->mode == SOFT_TIMER_MODE_PERIODIC) {
-            entry->expiry_ms += entry->delta_ms;
-            heap = (soft_timer_entry_t *)mp_pairheap_push(soft_timer_lt, &heap->pairheap, &entry->pairheap);
-        }
-    }
-    soft_timer_heap = heap;
-    if (heap == NULL) {
-        // No more timers left, set largest delay possible
-        soft_timer_next = uwTick;
-    } else {
-        // Set soft_timer_next so SysTick calls us back at the correct time
-        soft_timer_schedule_systick(heap->expiry_ms);
-    }
-}
-
-void soft_timer_gc_mark_all(void) {
-    // Mark all soft timer nodes that are allocated on the GC-heap.
-    // To avoid deep C recursion, pop and recreate the pairheap as nodes are marked.
-    uint32_t irq_state = raise_irq_pri(IRQ_PRI_PENDSV);
-    soft_timer_entry_t *heap_from = soft_timer_heap;
-    soft_timer_entry_t *heap_to = (soft_timer_entry_t *)mp_pairheap_new(soft_timer_lt);
-    while (heap_from != NULL) {
-        soft_timer_entry_t *entry = (soft_timer_entry_t *)mp_pairheap_peek(soft_timer_lt, &heap_from->pairheap);
-        heap_from = (soft_timer_entry_t *)mp_pairheap_pop(soft_timer_lt, &heap_from->pairheap);
-        if (entry->flags & SOFT_TIMER_FLAG_GC_ALLOCATED) {
-            gc_collect_root((void **)&entry, 1);
-        }
-        heap_to = (soft_timer_entry_t *)mp_pairheap_push(soft_timer_lt, &heap_to->pairheap, &entry->pairheap);
-    }
-    soft_timer_heap = heap_to;
-    restore_irq_pri(irq_state);
-}
-
-void soft_timer_static_init(soft_timer_entry_t *entry, uint16_t mode, uint32_t delta_ms, void (*cb)(soft_timer_entry_t *)) {
-    mp_pairheap_init_node(soft_timer_lt, &entry->pairheap);
-    entry->flags = 0;
-    entry->mode = mode;
-    entry->delta_ms = delta_ms;
-    entry->c_callback = cb;
-}
-
-void soft_timer_insert(soft_timer_entry_t *entry, uint32_t initial_delta_ms) {
-    mp_pairheap_init_node(soft_timer_lt, &entry->pairheap);
-    entry->expiry_ms = mp_hal_ticks_ms() + initial_delta_ms;
-    uint32_t irq_state = raise_irq_pri(IRQ_PRI_PENDSV);
-    soft_timer_heap = (soft_timer_entry_t *)mp_pairheap_push(soft_timer_lt, &soft_timer_heap->pairheap, &entry->pairheap);
-    if (entry == soft_timer_heap) {
-        // This new timer became the earliest one so set soft_timer_next
-        soft_timer_schedule_systick(entry->expiry_ms);
-    }
-    restore_irq_pri(irq_state);
-}
-
-void soft_timer_remove(soft_timer_entry_t *entry) {
-    uint32_t irq_state = raise_irq_pri(IRQ_PRI_PENDSV);
-    soft_timer_heap = (soft_timer_entry_t *)mp_pairheap_delete(soft_timer_lt, &soft_timer_heap->pairheap, &entry->pairheap);
-    restore_irq_pri(irq_state);
-}
diff --git a/ports/stm32/softtimer.h b/ports/stm32/softtimer.h
deleted file mode 100644
index 9c14f16d615cd..0000000000000
--- a/ports/stm32/softtimer.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2019 Damien P. George
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-#ifndef MICROPY_INCLUDED_STM32_SOFTTIMER_H
-#define MICROPY_INCLUDED_STM32_SOFTTIMER_H
-
-#include "py/pairheap.h"
-
-#define SOFT_TIMER_FLAG_PY_CALLBACK (1)
-#define SOFT_TIMER_FLAG_GC_ALLOCATED (2)
-
-#define SOFT_TIMER_MODE_ONE_SHOT (1)
-#define SOFT_TIMER_MODE_PERIODIC (2)
-
-typedef struct _soft_timer_entry_t {
-    mp_pairheap_t pairheap;
-    uint16_t flags;
-    uint16_t mode;
-    uint32_t expiry_ms;
-    uint32_t delta_ms; // for periodic mode
-    union {
-        void (*c_callback)(struct _soft_timer_entry_t *);
-        mp_obj_t py_callback;
-    };
-} soft_timer_entry_t;
-
-extern volatile uint32_t soft_timer_next;
-
-void soft_timer_deinit(void);
-void soft_timer_handler(void);
-void soft_timer_gc_mark_all(void);
-
-void soft_timer_static_init(soft_timer_entry_t *entry, uint16_t mode, uint32_t delta_ms, void (*cb)(soft_timer_entry_t *));
-void soft_timer_insert(soft_timer_entry_t *entry, uint32_t initial_delta_ms);
-void soft_timer_remove(soft_timer_entry_t *entry);
-
-// The timer will be reinserted into the heap so that it is called after initial_delta_ms milliseconds.
-// After that, if it's periodic, it will continue to be called every entry->delta_ms milliseconds.
-static inline void soft_timer_reinsert(soft_timer_entry_t *entry, uint32_t initial_delta_ms) {
-    soft_timer_remove(entry);
-    soft_timer_insert(entry, initial_delta_ms);
-}
-
-#endif // MICROPY_INCLUDED_STM32_SOFTTIMER_H
diff --git a/ports/stm32/systick.c b/ports/stm32/systick.c
index 7d1e318ac0545..76944d312afc6 100644
--- a/ports/stm32/systick.c
+++ b/ports/stm32/systick.c
@@ -26,10 +26,10 @@
 
 #include "py/runtime.h"
 #include "py/mphal.h"
+#include "shared/runtime/softtimer.h"
 #include "irq.h"
 #include "pendsv.h"
 #include "systick.h"
-#include "softtimer.h"
 #include "pybthread.h"
 
 extern __IO uint32_t uwTick;

From 678cb5a5857d86b4552554e579ab65317c969aa2 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Mon, 18 Jul 2022 16:59:24 +0200
Subject: [PATCH 2387/3533] renesas-ra/softtimer: Switch to use softtimer code
 from shared/runtime.

---
 ports/renesas-ra/Makefile        |   2 +-
 ports/renesas-ra/gccollect.c     |   2 +-
 ports/renesas-ra/machine_timer.c |   2 +-
 ports/renesas-ra/main.c          |   2 +-
 ports/renesas-ra/softtimer.c     | 148 -------------------------------
 ports/renesas-ra/softtimer.h     |  66 --------------
 ports/renesas-ra/systick.c       |   2 +-
 7 files changed, 5 insertions(+), 219 deletions(-)
 delete mode 100644 ports/renesas-ra/softtimer.c
 delete mode 100644 ports/renesas-ra/softtimer.h

diff --git a/ports/renesas-ra/Makefile b/ports/renesas-ra/Makefile
index 832b7db9fabb0..d326c81e7858b 100644
--- a/ports/renesas-ra/Makefile
+++ b/ports/renesas-ra/Makefile
@@ -179,6 +179,7 @@ SHARED_SRC_C += $(addprefix shared/,\
 	runtime/interrupt_char.c \
 	runtime/mpirq.c \
 	runtime/pyexec.c \
+	runtime/softtimer.c \
 	runtime/stdout_helpers.c \
 	runtime/sys_stdio_mphal.c \
 	timeutils/timeutils.c \
@@ -297,7 +298,6 @@ SRC_C += \
 	irq.c \
 	pendsv.c \
 	systick.c  \
-	softtimer.c  \
 	powerctrl.c \
 	powerctrlboot.c \
 	pybthread.c \
diff --git a/ports/renesas-ra/gccollect.c b/ports/renesas-ra/gccollect.c
index bd697a2af3b5a..667bbc43277ae 100644
--- a/ports/renesas-ra/gccollect.c
+++ b/ports/renesas-ra/gccollect.c
@@ -31,8 +31,8 @@
 #include "py/gc.h"
 #include "py/mpthread.h"
 #include "shared/runtime/gchelper.h"
+#include "shared/runtime/softtimer.h"
 #include "gccollect.h"
-#include "softtimer.h"
 #include "systick.h"
 
 void gc_collect(void) {
diff --git a/ports/renesas-ra/machine_timer.c b/ports/renesas-ra/machine_timer.c
index c94532218773f..c387d35117d82 100644
--- a/ports/renesas-ra/machine_timer.c
+++ b/ports/renesas-ra/machine_timer.c
@@ -26,7 +26,7 @@
 
 #include "py/runtime.h"
 #include "py/mphal.h"
-#include "softtimer.h"
+#include "shared/runtime/softtimer.h"
 
 typedef soft_timer_entry_t machine_timer_obj_t;
 
diff --git a/ports/renesas-ra/main.c b/ports/renesas-ra/main.c
index 78af1a9639576..a87ddbd868040 100644
--- a/ports/renesas-ra/main.c
+++ b/ports/renesas-ra/main.c
@@ -35,6 +35,7 @@
 #include "py/mphal.h"
 #include "shared/readline/readline.h"
 #include "shared/runtime/pyexec.h"
+#include "shared/runtime/softtimer.h"
 #include "lib/oofatfs/ff.h"
 #include "lib/littlefs/lfs1.h"
 #include "lib/littlefs/lfs1_util.h"
@@ -52,7 +53,6 @@
 #include "gccollect.h"
 #include "factoryreset.h"
 #include "modmachine.h"
-#include "softtimer.h"
 #include "spi.h"
 #include "uart.h"
 #include "timer.h"
diff --git a/ports/renesas-ra/softtimer.c b/ports/renesas-ra/softtimer.c
deleted file mode 100644
index c9c59cab0eed0..0000000000000
--- a/ports/renesas-ra/softtimer.c
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2019 Damien P. George
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#include <stdint.h>
-#include "py/gc.h"
-#include "py/mphal.h"
-#include "py/runtime.h"
-#include "irq.h"
-#include "softtimer.h"
-
-#define TICKS_PERIOD 0x80000000
-#define TICKS_DIFF(t1, t0) ((int32_t)(((t1 - t0 + TICKS_PERIOD / 2) & (TICKS_PERIOD - 1)) - TICKS_PERIOD / 2))
-
-extern __IO uint32_t uwTick;
-
-volatile uint32_t soft_timer_next;
-
-// Pointer to the pairheap of soft timer objects.
-// This may contain bss/data pointers as well as GC-heap pointers,
-// and is explicitly GC traced by soft_timer_gc_mark_all().
-STATIC soft_timer_entry_t *soft_timer_heap;
-
-STATIC int soft_timer_lt(mp_pairheap_t *n1, mp_pairheap_t *n2) {
-    soft_timer_entry_t *e1 = (soft_timer_entry_t *)n1;
-    soft_timer_entry_t *e2 = (soft_timer_entry_t *)n2;
-    return TICKS_DIFF(e1->expiry_ms, e2->expiry_ms) < 0;
-}
-
-STATIC void soft_timer_schedule_systick(uint32_t ticks_ms) {
-    uint32_t irq_state = disable_irq();
-    uint32_t uw_tick = uwTick;
-    if (TICKS_DIFF(ticks_ms, uw_tick) <= 0) {
-        soft_timer_next = uw_tick + 1;
-    } else {
-        soft_timer_next = ticks_ms;
-    }
-    enable_irq(irq_state);
-}
-
-void soft_timer_deinit(void) {
-    // Pop off all the nodes which are allocated on the GC-heap.
-    uint32_t irq_state = raise_irq_pri(IRQ_PRI_PENDSV);
-    soft_timer_entry_t *heap_from = soft_timer_heap;
-    soft_timer_entry_t *heap_to = (soft_timer_entry_t *)mp_pairheap_new(soft_timer_lt);
-    while (heap_from != NULL) {
-        soft_timer_entry_t *entry = (soft_timer_entry_t *)mp_pairheap_peek(soft_timer_lt, &heap_from->pairheap);
-        heap_from = (soft_timer_entry_t *)mp_pairheap_pop(soft_timer_lt, &heap_from->pairheap);
-        if (!(entry->flags & SOFT_TIMER_FLAG_GC_ALLOCATED)) {
-            heap_to = (soft_timer_entry_t *)mp_pairheap_push(soft_timer_lt, &heap_to->pairheap, &entry->pairheap);
-        }
-    }
-    soft_timer_heap = heap_to;
-    restore_irq_pri(irq_state);
-}
-
-// Must be executed at IRQ_PRI_PENDSV
-void soft_timer_handler(void) {
-    uint32_t ticks_ms = uwTick;
-    soft_timer_entry_t *heap = soft_timer_heap;
-    while (heap != NULL && TICKS_DIFF(heap->expiry_ms, ticks_ms) <= 0) {
-        soft_timer_entry_t *entry = heap;
-        heap = (soft_timer_entry_t *)mp_pairheap_pop(soft_timer_lt, &heap->pairheap);
-        if (entry->flags & SOFT_TIMER_FLAG_PY_CALLBACK) {
-            mp_sched_schedule(entry->py_callback, MP_OBJ_FROM_PTR(entry));
-        } else {
-            entry->c_callback(entry);
-        }
-        if (entry->mode == SOFT_TIMER_MODE_PERIODIC) {
-            entry->expiry_ms += entry->delta_ms;
-            heap = (soft_timer_entry_t *)mp_pairheap_push(soft_timer_lt, &heap->pairheap, &entry->pairheap);
-        }
-    }
-    soft_timer_heap = heap;
-    if (heap == NULL) {
-        // No more timers left, set largest delay possible
-        soft_timer_next = uwTick;
-    } else {
-        // Set soft_timer_next so SysTick calls us back at the correct time
-        soft_timer_schedule_systick(heap->expiry_ms);
-    }
-}
-
-void soft_timer_gc_mark_all(void) {
-    // Mark all soft timer nodes that are allocated on the GC-heap.
-    // To avoid deep C recursion, pop and recreate the pairheap as nodes are marked.
-    uint32_t irq_state = raise_irq_pri(IRQ_PRI_PENDSV);
-    soft_timer_entry_t *heap_from = soft_timer_heap;
-    soft_timer_entry_t *heap_to = (soft_timer_entry_t *)mp_pairheap_new(soft_timer_lt);
-    while (heap_from != NULL) {
-        soft_timer_entry_t *entry = (soft_timer_entry_t *)mp_pairheap_peek(soft_timer_lt, &heap_from->pairheap);
-        heap_from = (soft_timer_entry_t *)mp_pairheap_pop(soft_timer_lt, &heap_from->pairheap);
-        if (entry->flags & SOFT_TIMER_FLAG_GC_ALLOCATED) {
-            gc_collect_root((void **)&entry, 1);
-        }
-        heap_to = (soft_timer_entry_t *)mp_pairheap_push(soft_timer_lt, &heap_to->pairheap, &entry->pairheap);
-    }
-    soft_timer_heap = heap_to;
-    restore_irq_pri(irq_state);
-}
-
-void soft_timer_static_init(soft_timer_entry_t *entry, uint16_t mode, uint32_t delta_ms, void (*cb)(soft_timer_entry_t *)) {
-    mp_pairheap_init_node(soft_timer_lt, &entry->pairheap);
-    entry->flags = 0;
-    entry->mode = mode;
-    entry->delta_ms = delta_ms;
-    entry->c_callback = cb;
-}
-
-void soft_timer_insert(soft_timer_entry_t *entry, uint32_t initial_delta_ms) {
-    mp_pairheap_init_node(soft_timer_lt, &entry->pairheap);
-    entry->expiry_ms = mp_hal_ticks_ms() + initial_delta_ms;
-    uint32_t irq_state = raise_irq_pri(IRQ_PRI_PENDSV);
-    soft_timer_heap = (soft_timer_entry_t *)mp_pairheap_push(soft_timer_lt, &soft_timer_heap->pairheap, &entry->pairheap);
-    if (entry == soft_timer_heap) {
-        // This new timer became the earliest one so set soft_timer_next
-        soft_timer_schedule_systick(entry->expiry_ms);
-    }
-    restore_irq_pri(irq_state);
-}
-
-void soft_timer_remove(soft_timer_entry_t *entry) {
-    uint32_t irq_state = raise_irq_pri(IRQ_PRI_PENDSV);
-    soft_timer_heap = (soft_timer_entry_t *)mp_pairheap_delete(soft_timer_lt, &soft_timer_heap->pairheap, &entry->pairheap);
-    restore_irq_pri(irq_state);
-}
diff --git a/ports/renesas-ra/softtimer.h b/ports/renesas-ra/softtimer.h
deleted file mode 100644
index aec885c547360..0000000000000
--- a/ports/renesas-ra/softtimer.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2019 Damien P. George
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-#ifndef MICROPY_INCLUDED_RENESAS_RA_SOFTTIMER_H
-#define MICROPY_INCLUDED_RENESAS_RA_SOFTTIMER_H
-
-#include "py/pairheap.h"
-
-#define SOFT_TIMER_FLAG_PY_CALLBACK (1)
-#define SOFT_TIMER_FLAG_GC_ALLOCATED (2)
-
-#define SOFT_TIMER_MODE_ONE_SHOT (1)
-#define SOFT_TIMER_MODE_PERIODIC (2)
-
-typedef struct _soft_timer_entry_t {
-    mp_pairheap_t pairheap;
-    uint16_t flags;
-    uint16_t mode;
-    uint32_t expiry_ms;
-    uint32_t delta_ms; // for periodic mode
-    union {
-        void (*c_callback)(struct _soft_timer_entry_t *);
-        mp_obj_t py_callback;
-    };
-} soft_timer_entry_t;
-
-extern volatile uint32_t soft_timer_next;
-
-void soft_timer_deinit(void);
-void soft_timer_handler(void);
-void soft_timer_gc_mark_all(void);
-
-void soft_timer_static_init(soft_timer_entry_t *entry, uint16_t mode, uint32_t delta_ms, void (*cb)(soft_timer_entry_t *));
-void soft_timer_insert(soft_timer_entry_t *entry, uint32_t initial_delta_ms);
-void soft_timer_remove(soft_timer_entry_t *entry);
-
-// The timer will be reinserted into the heap so that it is called after initial_delta_ms milliseconds.
-// After that, if it's periodic, it will continue to be called every entry->delta_ms milliseconds.
-static inline void soft_timer_reinsert(soft_timer_entry_t *entry, uint32_t initial_delta_ms) {
-    soft_timer_remove(entry);
-    soft_timer_insert(entry, initial_delta_ms);
-}
-
-#endif // MICROPY_INCLUDED_RENESAS_RA_SOFTTIMER_H
diff --git a/ports/renesas-ra/systick.c b/ports/renesas-ra/systick.c
index e88166b110bfb..95ca8083011ad 100644
--- a/ports/renesas-ra/systick.c
+++ b/ports/renesas-ra/systick.c
@@ -27,10 +27,10 @@
 
 #include "py/runtime.h"
 #include "py/mphal.h"
+#include "shared/runtime/softtimer.h"
 #include "irq.h"
 #include "pendsv.h"
 #include "systick.h"
-#include "softtimer.h"
 #include "pybthread.h"
 #include "hal_data.h"
 

From 93a17b9581418c932d8cb3312040fdbaa04da5e0 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Mon, 18 Jul 2022 17:09:04 +0200
Subject: [PATCH 2388/3533] shared/runtime/softtimer: Remove obsolete #include
 statement.

---
 shared/runtime/softtimer.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/shared/runtime/softtimer.c b/shared/runtime/softtimer.c
index c9c59cab0eed0..8bc9621b3d048 100644
--- a/shared/runtime/softtimer.c
+++ b/shared/runtime/softtimer.c
@@ -28,7 +28,6 @@
 #include "py/gc.h"
 #include "py/mphal.h"
 #include "py/runtime.h"
-#include "irq.h"
 #include "softtimer.h"
 
 #define TICKS_PERIOD 0x80000000

From b41cfea02ab9f566785da5e5e0863d009f3ac527 Mon Sep 17 00:00:00 2001
From: Carlosgg <carlosgilglez@gmail.com>
Date: Fri, 28 Jan 2022 04:42:46 +0000
Subject: [PATCH 2389/3533] extmod/modussl_mbedtls: Implement cert_reqs and
 cadata arguments.

Add cert_reqs and cadata keyword-args to ssl.wrap_socket() and
ssl.CERT_NONE, ssl.CERT_OPTIONAL, ssl.CERT_REQUIRED constants to allow
certificate validation.

CPython doesn't accept cadata in ssl.wrap_socket(), but it does in
SSLContext.load_verify_locations(), so we use this name to at least match
the same name in load_verify_locations().

Add docs for these new arguments, as well as docs for the existing
server_hostname argument which is important for certificate validation.

Tests are added as well.

Signed-off-by: Carlos Gil <carlosgilglez@gmail.com>
---
 docs/library/ssl.rst                |  13 ++-
 extmod/modussl_mbedtls.c            |  22 +++-
 tests/multi_net/ssl_cert_rsa.py     | 152 ++++++++++++++++++++++++++++
 tests/multi_net/ssl_cert_rsa.py.exp |   4 +
 tests/net_inet/ssl_cert.py          |  68 +++++++++++++
 tests/net_inet/ssl_cert.py.exp      |   1 +
 6 files changed, 258 insertions(+), 2 deletions(-)
 create mode 100644 tests/multi_net/ssl_cert_rsa.py
 create mode 100644 tests/multi_net/ssl_cert_rsa.py.exp
 create mode 100644 tests/net_inet/ssl_cert.py
 create mode 100644 tests/net_inet/ssl_cert.py.exp

diff --git a/docs/library/ssl.rst b/docs/library/ssl.rst
index 4726daa59b4ae..924b03b3541b3 100644
--- a/docs/library/ssl.rst
+++ b/docs/library/ssl.rst
@@ -13,7 +13,7 @@ facilities for network sockets, both client-side and server-side.
 Functions
 ---------
 
-.. function:: ssl.wrap_socket(sock, server_side=False, keyfile=None, certfile=None, cert_reqs=CERT_NONE, ca_certs=None, do_handshake=True)
+.. function:: ssl.wrap_socket(sock, server_side=False, keyfile=None, certfile=None, cert_reqs=CERT_NONE, cadata=None, server_hostname=None, do_handshake=True)
 
    Takes a `stream` *sock* (usually socket.socket instance of ``SOCK_STREAM`` type),
    and returns an instance of ssl.SSLSocket, which wraps the underlying stream in
@@ -31,6 +31,17 @@ Functions
      until it completes. Note that in AXTLS the handshake can be deferred until the first
      read or write but it then blocks until completion.
 
+   - *cert_reqs* determines whether the peer (server or client) must present a valid certificate.
+     Note that for mbedtls based ports, ``ssl.CERT_NONE`` and ``ssl.CERT_OPTIONAL`` will not
+     validate any certificate, only ``ssl.CERT_REQUIRED`` will.
+
+   - *cadata* is a bytes object containing the CA certificate chain (in DER format) that will
+     validate the peer's certificate.  Currently only a single DER-encoded certificate is supported.
+
+   - *server_hostname* is for use as a client, and sets the hostname to check against the received
+     server certificate.  It also sets the name for Server Name Indication (SNI), allowing the server
+     to present the proper certificate.
+
    Depending on the underlying module implementation in a particular
    :term:`MicroPython port`, some or all keyword arguments above may be not supported.
 
diff --git a/extmod/modussl_mbedtls.c b/extmod/modussl_mbedtls.c
index 44668ae63bbad..8365c7a4a4d2e 100644
--- a/extmod/modussl_mbedtls.c
+++ b/extmod/modussl_mbedtls.c
@@ -63,6 +63,8 @@ struct ssl_args {
     mp_arg_val_t cert;
     mp_arg_val_t server_side;
     mp_arg_val_t server_hostname;
+    mp_arg_val_t cert_reqs;
+    mp_arg_val_t cadata;
     mp_arg_val_t do_handshake;
 };
 
@@ -191,7 +193,7 @@ STATIC mp_obj_ssl_socket_t *socket_new(mp_obj_t sock, struct ssl_args *args) {
         goto cleanup;
     }
 
-    mbedtls_ssl_conf_authmode(&o->conf, MBEDTLS_SSL_VERIFY_NONE);
+    mbedtls_ssl_conf_authmode(&o->conf, args->cert_reqs.u_int);
     mbedtls_ssl_conf_rng(&o->conf, mbedtls_ctr_drbg_random, &o->ctr_drbg);
     #ifdef MBEDTLS_DEBUG_C
     mbedtls_ssl_conf_dbg(&o->conf, mbedtls_debug, NULL);
@@ -237,6 +239,19 @@ STATIC mp_obj_ssl_socket_t *socket_new(mp_obj_t sock, struct ssl_args *args) {
         }
     }
 
+    if (args->cadata.u_obj != mp_const_none) {
+        size_t cacert_len;
+        const byte *cacert = (const byte *)mp_obj_str_get_data(args->cadata.u_obj, &cacert_len);
+        // len should include terminating null
+        ret = mbedtls_x509_crt_parse(&o->cacert, cacert, cacert_len + 1);
+        if (ret != 0) {
+            ret = MBEDTLS_ERR_X509_BAD_INPUT_DATA; // use general error for all cert errors
+            goto cleanup;
+        }
+
+        mbedtls_ssl_conf_ca_chain(&o->conf, &o->cacert, NULL);
+    }
+
     if (args->do_handshake.u_bool) {
         while ((ret = mbedtls_ssl_handshake(&o->ssl)) != 0) {
             if (ret != MBEDTLS_ERR_SSL_WANT_READ && ret != MBEDTLS_ERR_SSL_WANT_WRITE) {
@@ -395,6 +410,8 @@ STATIC mp_obj_t mod_ssl_wrap_socket(size_t n_args, const mp_obj_t *pos_args, mp_
         { MP_QSTR_cert, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
         { MP_QSTR_server_side, MP_ARG_KW_ONLY | MP_ARG_BOOL, {.u_bool = false} },
         { MP_QSTR_server_hostname, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
+        { MP_QSTR_cert_reqs, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = MBEDTLS_SSL_VERIFY_NONE}},
+        { MP_QSTR_cadata, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
         { MP_QSTR_do_handshake, MP_ARG_KW_ONLY | MP_ARG_BOOL, {.u_bool = true} },
     };
 
@@ -412,6 +429,9 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_KW(mod_ssl_wrap_socket_obj, 1, mod_ssl_wrap_socke
 STATIC const mp_rom_map_elem_t mp_module_ssl_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_ussl) },
     { MP_ROM_QSTR(MP_QSTR_wrap_socket), MP_ROM_PTR(&mod_ssl_wrap_socket_obj) },
+    { MP_ROM_QSTR(MP_QSTR_CERT_NONE), MP_ROM_INT(MBEDTLS_SSL_VERIFY_NONE) },
+    { MP_ROM_QSTR(MP_QSTR_CERT_OPTIONAL), MP_ROM_INT(MBEDTLS_SSL_VERIFY_OPTIONAL) },
+    { MP_ROM_QSTR(MP_QSTR_CERT_REQUIRED), MP_ROM_INT(MBEDTLS_SSL_VERIFY_REQUIRED) },
 };
 
 STATIC MP_DEFINE_CONST_DICT(mp_module_ssl_globals, mp_module_ssl_globals_table);
diff --git a/tests/multi_net/ssl_cert_rsa.py b/tests/multi_net/ssl_cert_rsa.py
new file mode 100644
index 0000000000000..f0f3a554e86a5
--- /dev/null
+++ b/tests/multi_net/ssl_cert_rsa.py
@@ -0,0 +1,152 @@
+# Simple test creating an SSL connection and transferring some data
+# This test won't run under CPython because CPython doesn't have key/cert
+
+try:
+    import ubinascii as binascii, usocket as socket, ussl as ssl
+except ImportError:
+    print("SKIP")
+    raise SystemExit
+
+PORT = 8000
+
+
+# This self-signed key/cert pair is randomly generated and to be used for
+# testing/demonstration only.  You should always generate your own key/cert.
+
+# To generate a new self-signed key/cert pair with openssl do:
+# $ openssl req -x509 -newkey rsa:4096 -keyout rsa_key.pem -out rsa_cert.pem -days 365 -node
+#
+# Convert them to DER format:
+# $ openssl rsa -in rsa_key.pem -out rsa_key.der -outform DER
+# $ openssl x509 -in rsa_cert.pem -out rsa_key.der -outform DER
+#
+# Then convert to hex format, eg using binascii.hexlify(data).
+
+cert = binascii.unhexlify(
+    b"308205d7308203bfa003020102020900bc63b48a700c3d49300d06092a864886f70d01010b050030"
+    b"8181310b3009060355040613024155310c300a06035504080c03466f6f310c300a06035504070c03"
+    b"42617231143012060355040a0c0b4d6963726f507974686f6e310c300a060355040b0c03666f6f31"
+    b"16301406035504030c0d657370686f6d652e6c6f63616c311a301806092a864886f70d010901160b"
+    b"666f6f406261722e636f6d301e170d3232303731323138303031335a170d32333037313231383030"
+    b"31335a308181310b3009060355040613024155310c300a06035504080c03466f6f310c300a060355"
+    b"04070c0342617231143012060355040a0c0b4d6963726f507974686f6e310c300a060355040b0c03"
+    b"666f6f3116301406035504030c0d657370686f6d652e6c6f63616c311a301806092a864886f70d01"
+    b"0901160b666f6f406261722e636f6d30820222300d06092a864886f70d01010105000382020f0030"
+    b"82020a0282020100ce3c0f730ab34432ce605ab44d4ac0aafd8a6243133eab0dcc9d444ab7d9ff66"
+    b"a6815a101d2d3cbd72140afc34f8c3caedce16e9528350f3e0e56343f248507d82e41b51abb515cb"
+    b"f60e5a619f2dbca8684d174c3b0951e2c7ba576c7fb06453a3597755810a6a4c45eb0925c855ab53"
+    b"7785df46bf29145871330ff0641a101a24f0830c20bae865ba8bb32606caac4555812acf19f59553"
+    b"349ce70fb7ff63512f0444f8f41b973183eabf9679903087c6cd69dc3adcbe754dd0207ea57c50e9"
+    b"2d800bce6258d1618bb749d3fc01239b6d1af6d3f9cada3acbb312a1d85a59cfabd28b2e572c56a4"
+    b"818ce170ca2b781a04749c6239206c64ad9e057484143a4c52bdef6189c46405c1a9642489cb640a"
+    b"937adfc2687578dfa2b40ebafa05213642a1ccbc265557cd40de53324cff1bfba6f5c215f657b8f9"
+    b"f2260ab6293625d0e203bba975bc7ac6dff3e604c9b0d2a2a4ba5941c0dc8d2e0e9439c56447b404"
+    b"8c0e6cfb03517742ff6f7c2140a05954aa1e29247d1ae8bfd7db0db8dd45d095710fb78284ede285"
+    b"0fc0c21235406af83e6044addf9385316403e2a25442b9ffbfc7b01c6c9292e5a3531e6a48496c01"
+    b"6de1373334a52f01b7c6a0ece1261936788d2161c53a8985a0946d6d319225b230d96d055ea4692f"
+    b"eb71fdaf4b775ac9fbc38e1b943e6617cf61d33e930ab288a3ea4730b4f2784a8018e0dfc8a11e73"
+    b"0203010001a350304e301d0603551d0e04160414bc6048fe3cd278257e8b7c90dedbbce8369b20b8"
+    b"301f0603551d23041830168014bc6048fe3cd278257e8b7c90dedbbce8369b20b8300c0603551d13"
+    b"040530030101ff300d06092a864886f70d01010b0500038202010009238354b43379a3d2b56e928c"
+    b"ac8ea28e2c01cf8148e54c0bbd4055e2e57d578697d1e2c392f1fe3bc9211d4f27ed1be631e7547a"
+    b"6390d7f121a9e20a195fdda73f755188b16cf39714924a9686dd7cc749421335038c0640c2c6b15d"
+    b"f44d74d94a97285ee2a7b075ccc9d9d632e2a5906030cf59bde14ab10660b7cf47ec9d7ae2f35963"
+    b"454f76735a3dac12a4a4c907183e9ccf3e07d59484c182e67edc7c35ce15c7e1072fae8c9965a126"
+    b"1a1f31147d4af8d1ebf8ee7c142badfe67e31fb324a79a29bc94e89370b70d8cf7cd2b2aa427a49f"
+    b"77849891e7c4d5911f6fda52733a3c169b0188c2d9918f296dd8e234f8962f0db5e47c6159448045"
+    b"4e2d9a5850d4c696a0fb3b66534a4591c49dda8cc6f1b0008c625aa5e0091ecfbd51d9715c60b85e"
+    b"4e89d4a6cfabb2acdf81518eb61403b8f8767c5c00216f730e08f22959dff695a081cc726c4ab35a"
+    b"e3f6538a231f831a6e91206f3b691a94bdf95343ec02ef7aac42da2a70846cd5f13dd2955a5f1737"
+    b"a4c3c6c03b041d334c1dadd1e305f07c83b4b4e0509ec1d23e95f820290942eaaf8bea304cd5a505"
+    b"8fc0d4624ff1ffe1348e7bc54c756a12acb258eb5e7426fb062a82b88ec274c9c13b3eff8b010947"
+    b"62e166f490cd25b14e762db708785859a337d8fd0008fe602a90e2933cded3359e98ce3fbc041208"
+    b"66bd4d96d6b6f7f53def854d40021196b7a06b"
+)
+
+key = binascii.unhexlify(
+    b"308209290201000282020100ce3c0f730ab34432ce605ab44d4ac0aafd8a6243133eab0dcc9d444a"
+    b"b7d9ff66a6815a101d2d3cbd72140afc34f8c3caedce16e9528350f3e0e56343f248507d82e41b51"
+    b"abb515cbf60e5a619f2dbca8684d174c3b0951e2c7ba576c7fb06453a3597755810a6a4c45eb0925"
+    b"c855ab537785df46bf29145871330ff0641a101a24f0830c20bae865ba8bb32606caac4555812acf"
+    b"19f59553349ce70fb7ff63512f0444f8f41b973183eabf9679903087c6cd69dc3adcbe754dd0207e"
+    b"a57c50e92d800bce6258d1618bb749d3fc01239b6d1af6d3f9cada3acbb312a1d85a59cfabd28b2e"
+    b"572c56a4818ce170ca2b781a04749c6239206c64ad9e057484143a4c52bdef6189c46405c1a96424"
+    b"89cb640a937adfc2687578dfa2b40ebafa05213642a1ccbc265557cd40de53324cff1bfba6f5c215"
+    b"f657b8f9f2260ab6293625d0e203bba975bc7ac6dff3e604c9b0d2a2a4ba5941c0dc8d2e0e9439c5"
+    b"6447b4048c0e6cfb03517742ff6f7c2140a05954aa1e29247d1ae8bfd7db0db8dd45d095710fb782"
+    b"84ede2850fc0c21235406af83e6044addf9385316403e2a25442b9ffbfc7b01c6c9292e5a3531e6a"
+    b"48496c016de1373334a52f01b7c6a0ece1261936788d2161c53a8985a0946d6d319225b230d96d05"
+    b"5ea4692feb71fdaf4b775ac9fbc38e1b943e6617cf61d33e930ab288a3ea4730b4f2784a8018e0df"
+    b"c8a11e73020301000102820201008efa0e8fe81c2e2cb6ed10152dfca4242750581d3e6b54f56524"
+    b"a6a2d2613cf2727efcec6cfddebd4c285f1148bc2a2936c28919cb0da502dea8c92fe2f9856bee61"
+    b"ac1aebdac838b5e66f7c7c799df07716f30ef362dbb5485884a180c8ce5539cb1db35699dce5f217"
+    b"27295d811f1ce7a115111c1823b5c90ce880f5352872a7a76282f6f1fd8a015136ab274c3d30783d"
+    b"eb6ad7096e33d826eafdf7c70398d5eab4d28f91cd3913c69c7a7ade9ef692b9f8292959be64dec4"
+    b"6ab2c291b41a6464004b5ddd4b93bfe41b37eedeef4ba2d16dcbb9c28b96f57fb96c20ed4a9471ff"
+    b"ae643b254f100f8c9702b5f67af6369e8d887f285e5d520c5aa5d3a79e5de96432e6d2e3dea68e58"
+    b"208c075fb119c6d3d4149b7e1247208d6b337c70272befc41d57f278618f1a82de337173346dc135"
+    b"4d80a7c9075af99dbb2a14733c06b71600c6677a6bb28c0e4fc63db622228047a2cb7474dc8141c3"
+    b"5f3a597c3e2bca9911d28eb9fd1a0c915e9f9c1cfd643d4fd8cac867f215380168ec37b8cfa28564"
+    b"e6288ab04a7d67ca44b4c8375214a7ffaa1e6be92c4b138fcfd6beaba251b31a50a6e2ef241c9554"
+    b"a1dc710b4acb63e749f5849e53d3f4915c6eb2a9a009bab04e932841ab34ae29eb000a08777d6399"
+    b"169c2dc3d7952df5bc2d06e90a32139c6a2793d3817e4feadac2ccac554d383a8d41569140c29168"
+    b"89220d3a5e410282010100fd603d18feef7aac61bda3b674a57ab38748bcde5c3efdba2279638f8e"
+    b"a413cc26b9dda0375c116a8798a295b2c283aaaad7cca0dbd9bb3322a9a815f6d0aa5fc4f9aff8fb"
+    b"da8ff914091ede7aefdb07a119c9b2e2b2bda776ac497060b8e88a82eb20c62f26f343566697726e"
+    b"71aa46fd4efad6f42fc8a478856324d72cbf5eb3918317162d6fc2cfd775969a2077759fa2c8220d"
+    b"acdc2ebb03ec39feed3f2b415449cbf40a7126bcf01d1068e3a45ec01181f2c68d7e05b4720bfe4a"
+    b"308e1648123c91214a5f8dfce58727c4cd9396a8b403b733a717449b2f1970db97a3b8467271ffa6"
+    b"e8c7cc9e2e1c0f789284ae9efe77eaac01131463c9c1329a1ba3530282010100d05ed6ab9b9fbdf7"
+    b"a0f5f91f68dc3bac5789332d6ece46103fb1ef109fc972fdc99edf3107a23d66d1cdfe6bdddfd1bb"
+    b"3952ccd10b5c20ad1b3e0aa6a51271ecf3a7ef2a65e029f5d77f238d1235b52a9dca3451c165d70a"
+    b"99cbaea5c610e5455979696db769191e7cf2db21f641959e4ba1c5c0aae260c724962b6ac2621d92"
+    b"e9df7adeb82b522d37b42cb454003bbe60d9915bf7737aeccf88c7ed1263a22f431a734e61fe7173"
+    b"a937ddf76ad2a79994c05238defc15f6846858e9edf27ae2a567c7c5c735ea5d2fbef65a2195bc05"
+    b"d82cbf06a477b29c84c92e8054c2bb25d8c6f19d43ef5fd1fce13c2cdbc361c39baec37b399200b3"
+    b"2d4a6798ba0b546102820101008e41492c4e7daff7368d1d6c64034067a94dca5461a0301e201add"
+    b"2e0d5ccb8cb435685bfa98e362572cf8236a10d191b187a568aee688b6c60050d1bc181d7fd57c86"
+    b"33195bf5b7576b637c6fb358dae8b52ccc15815affb99e334137dcb91a833475db2f4004164b5d20"
+    b"2c6c1bbf094a50dc7e70ec9f0ed067bb6944b1e7e3c897aaecfc53984add1c4ff5b525034cf3ca95"
+    b"e8a09aeba804f1c7e02be391b2bc641166c3e654eef5e72dba37d98f406f3fa520e41f2ea10f5574"
+    b"ac5984f75145378fefbfac1d07fff3f234fec698d55e746b1da18f6f7de24ec84ed7cb446d428820"
+    b"bef33c00693e6a0ef114b5d66e9fefa8ee059238df1ac37c87e7841ae7028201000721a7d139c34e"
+    b"da21cd295894db2cc3aa3f4cdc1a35bf1a2143f2bdabea56202f7d5b802f15b36a4875f76633b2cc"
+    b"57cf0f71691a2d6e04deb0d1e68031d06a5eb079b406c6944910b60e3e6ec81dca369a4c0e1c4363"
+    b"07bed9c4c171b4f453da4b187ba3d25a04bc1c07b9f2d6adcb3c256e4238d7049eec36a387c4dd5c"
+    b"cbc16b5fa62dc175cf8c5f83442cb7d153a3b6ee8daa3b6e929a4bc123f1042df1d6271a992d2b6b"
+    b"309d33074ac7822c304a72069e61ab590915e10862013dd24cdd825ec8fb17724cfc2c59fc1db825"
+    b"3641fece0ee9241b9dd5c198f0d575d0b7ebe26b3489b5b09edc3bcd366fd3110e83ce886c383d31"
+    b"feefe6e302cc2345210282010008f77a33d0081e9be3c1b1ac8b8e0eebb72df2eb69b95d2ed74935"
+    b"b9dab8e17023cc38465354023c5183b51a6a20288fbb2181172be1c2fdb8b444419454e5b37f7f3b"
+    b"df11e28cf4746b25534eb62f7e87bbbf28eda37024368b3897fbc661b40a93e04a183db9219c04a8"
+    b"7643edf5d8b5dbfe3d424e91d558d5e3e2fa02ce1984ee69fb8518470eee2e7db0e1df5ac4571f78"
+    b"a7a2529bc1fef5e32d46994869a8d8cc47869e174d84e7976be8ebb88f2ccb71a603a8bdb06af3eb"
+    b"2ddbd62082f40d7987e47f2e321eb5eb2a28fefab263409f89dc97ebc723a1b751418cdd3ea684ba"
+    b"8b17a330a306a6fbcf51ba83563aed85a4f886fff1a22423748d83798c"
+)
+
+# Server
+def instance0():
+    multitest.globals(IP=multitest.get_network_ip())
+    s = socket.socket()
+    s.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
+    s.bind(socket.getaddrinfo("0.0.0.0", PORT)[0][-1])
+    s.listen(1)
+    multitest.next()
+    s2, _ = s.accept()
+    s2 = ssl.wrap_socket(s2, server_side=True, key=key, cert=cert)
+    print(s2.read(16))
+    s2.write(b"server to client")
+    s2.close()
+    s.close()
+
+
+# Client
+def instance1():
+    multitest.next()
+    s = socket.socket()
+    s.connect(socket.getaddrinfo(IP, PORT)[0][-1])
+    s = ssl.wrap_socket(s, cert_reqs=ssl.CERT_REQUIRED, cadata=cert)
+    s.write(b"client to server")
+    print(s.read(16))
+    s.close()
diff --git a/tests/multi_net/ssl_cert_rsa.py.exp b/tests/multi_net/ssl_cert_rsa.py.exp
new file mode 100644
index 0000000000000..909c496d019e1
--- /dev/null
+++ b/tests/multi_net/ssl_cert_rsa.py.exp
@@ -0,0 +1,4 @@
+--- instance0 ---
+b'client to server'
+--- instance1 ---
+b'server to client'
diff --git a/tests/net_inet/ssl_cert.py b/tests/net_inet/ssl_cert.py
new file mode 100644
index 0000000000000..d2d437e381b17
--- /dev/null
+++ b/tests/net_inet/ssl_cert.py
@@ -0,0 +1,68 @@
+import ubinascii as binascii
+import usocket as socket
+import ussl as ssl
+
+
+# This certificate was obtained from micropython.org using openssl:
+# $ openssl s_client -showcerts -connect micropython.org:443 </dev/null 2>/dev/null
+# The certificate is from Let's Encrypt:
+# 1 s:/C=US/O=Let's Encrypt/CN=R3
+#   i:/C=US/O=Internet Security Research Group/CN=ISRG Root X1
+# Validity
+#            Not Before: Sep  4 00:00:00 2020 GMT
+#            Not After : Sep 15 16:00:00 2025 GMT
+# Copy PEM content to a file (certmpy.pem) and convert to DER e.g.
+# $ openssl x509 -in certmpy.pem -out certmpy.der -outform DER
+# Then convert to hex format, eg using binascii.hexlify(data).
+
+ca_cert_chain = binascii.unhexlify(
+    b"30820516308202fea003020102021100912b084acf0c18a753f6d62e25a75f5a300d06092a864886"
+    b"f70d01010b0500304f310b300906035504061302555331293027060355040a1320496e7465726e65"
+    b"742053656375726974792052657365617263682047726f7570311530130603550403130c49535247"
+    b"20526f6f74205831301e170d3230303930343030303030305a170d3235303931353136303030305a"
+    b"3032310b300906035504061302555331163014060355040a130d4c6574277320456e637279707431"
+    b"0b300906035504031302523330820122300d06092a864886f70d01010105000382010f003082010a"
+    b"0282010100bb021528ccf6a094d30f12ec8d5592c3f882f199a67a4288a75d26aab52bb9c54cb1af"
+    b"8e6bf975c8a3d70f4794145535578c9ea8a23919f5823c42a94e6ef53bc32edb8dc0b05cf35938e7"
+    b"edcf69f05a0b1bbec094242587fa3771b313e71cace19befdbe43b45524596a9c153ce34c852eeb5"
+    b"aeed8fde6070e2a554abb66d0e97a540346b2bd3bc66eb66347cfa6b8b8f572999f830175dba726f"
+    b"fb81c5add286583d17c7e709bbf12bf786dcc1da715dd446e3ccad25c188bc60677566b3f118f7a2"
+    b"5ce653ff3a88b647a5ff1318ea9809773f9d53f9cf01e5f5a6701714af63a4ff99b3939ddc53a706"
+    b"fe48851da169ae2575bb13cc5203f5ed51a18bdb150203010001a382010830820104300e0603551d"
+    b"0f0101ff040403020186301d0603551d250416301406082b0601050507030206082b060105050703"
+    b"0130120603551d130101ff040830060101ff020100301d0603551d0e04160414142eb317b75856cb"
+    b"ae500940e61faf9d8b14c2c6301f0603551d2304183016801479b459e67bb6e5e40173800888c81a"
+    b"58f6e99b6e303206082b0601050507010104263024302206082b060105050730028616687474703a"
+    b"2f2f78312e692e6c656e63722e6f72672f30270603551d1f0420301e301ca01aa018861668747470"
+    b"3a2f2f78312e632e6c656e63722e6f72672f30220603551d20041b30193008060667810c01020130"
+    b"0d060b2b0601040182df13010101300d06092a864886f70d01010b0500038202010085ca4e473ea3"
+    b"f7854485bcd56778b29863ad754d1e963d336572542d81a0eac3edf820bf5fccb77000b76e3bf65e"
+    b"94dee4209fa6ef8bb203e7a2b5163c91ceb4ed3902e77c258a47e6656e3f46f4d9f0ce942bee54ce"
+    b"12bc8c274bb8c1982fa2afcd71914a08b7c8b8237b042d08f908573e83d904330a472178098227c3"
+    b"2ac89bb9ce5cf264c8c0be79c04f8e6d440c5e92bb2ef78b10e1e81d4429db5920ed63b921f81226"
+    b"949357a01d6504c10a22ae100d4397a1181f7ee0e08637b55ab1bd30bf876e2b2aff214e1b05c3f5"
+    b"1897f05eacc3a5b86af02ebc3b33b9ee4bdeccfce4af840b863fc0554336f668e136176a8e99d1ff"
+    b"a540a734b7c0d063393539756ef2ba76c89302e9a94b6c17ce0c02d9bd81fb9fb768d40665b3823d"
+    b"7753f88e7903ad0a3107752a43d8559772c4290ef7c45d4ec8ae468430d7f2855f18a179bbe75e70"
+    b"8b07e18693c3b98fdc6171252aafdfed255052688b92dce5d6b5e3da7dd0876c842131ae82f5fbb9"
+    b"abc889173de14ce5380ef6bd2bbd968114ebd5db3d20a77e59d3e2f858f95bb848cdfe5c4f1629fe"
+    b"1e5523afc811b08dea7c9390172ffdaca20947463ff0e9b0b7ff284d6832d6675e1e69a393b8f59d"
+    b"8b2f0bd25243a66f3257654d3281df3853855d7e5d6629eab8dde495b5cdb5561242cdc44ec62538"
+    b"44506decce005518fee94964d44eca979cb45bc073a8abb847c2"
+)
+
+
+def main(use_stream=True):
+    s = socket.socket()
+    ai = socket.getaddrinfo("micropython.org", 443)
+    addr = ai[0][-1]
+    s.connect(addr)
+    s = ssl.wrap_socket(
+        s, cert_reqs=ssl.CERT_REQUIRED, cadata=ca_cert_chain, server_hostname="micropython.org"
+    )
+    s.write(b"GET / HTTP/1.0\r\n\r\n")
+    print(s.read(17))
+    s.close()
+
+
+main()
diff --git a/tests/net_inet/ssl_cert.py.exp b/tests/net_inet/ssl_cert.py.exp
new file mode 100644
index 0000000000000..fb69ecf1a66aa
--- /dev/null
+++ b/tests/net_inet/ssl_cert.py.exp
@@ -0,0 +1 @@
+b'HTTP/1.1 200 OK\r\n'

From bdad63eda2ddcf8cc6ac51bb463ecb695f12c86c Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 15 Jul 2022 11:23:23 +1000
Subject: [PATCH 2390/3533] extmod/btstack: Fix descriptor discovery handle
 range and events.

This fixes two problems with the BTstack implementation of descriptor
discovery:

- The call to gatt_client_discover_characteristic_descriptors needs to have
  value_handle set to the starting handle (actually characteristic handle)
  to start the search from.

- The BTstack event for a descriptor query result is
  GATT_EVENT_ALL_CHARACTERISTIC_DESCRIPTORS_QUERY_RESULT.

With this change the test tests/multi_bluetooth/ble_subscribe.py now passes
when BTstack is instance1 (for BTstack to pass as instance0 requires
gatts_write to support sending an update on BTstack).

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/btstack/modbluetooth_btstack.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/extmod/btstack/modbluetooth_btstack.c b/extmod/btstack/modbluetooth_btstack.c
index c07cc8c10c7dd..d41c671d68a32 100644
--- a/extmod/btstack/modbluetooth_btstack.c
+++ b/extmod/btstack/modbluetooth_btstack.c
@@ -451,7 +451,7 @@ STATIC void btstack_packet_handler(uint8_t packet_type, uint8_t *packet, uint8_t
         gatt_event_characteristic_query_result_get_characteristic(packet, &characteristic);
         mp_obj_bluetooth_uuid_t characteristic_uuid = create_mp_uuid(characteristic.uuid16, characteristic.uuid128);
         mp_bluetooth_gattc_on_characteristic_result(conn_handle, characteristic.start_handle, characteristic.value_handle, characteristic.properties, &characteristic_uuid);
-    } else if (event_type == GATT_EVENT_CHARACTERISTIC_DESCRIPTOR_QUERY_RESULT) {
+    } else if (event_type == GATT_EVENT_ALL_CHARACTERISTIC_DESCRIPTORS_QUERY_RESULT) {
         DEBUG_printf("  --> gatt descriptor query result\n");
         uint16_t conn_handle = gatt_event_all_characteristic_descriptors_query_result_get_handle(packet);
         gatt_client_characteristic_descriptor_t descriptor;
@@ -1358,9 +1358,9 @@ int mp_bluetooth_gattc_discover_descriptors(uint16_t conn_handle, uint16_t start
     }
 
     gatt_client_characteristic_t characteristic = {
-        // Only start/end handles needed for gatt_client_discover_characteristic_descriptors.
-        .start_handle = start_handle,
-        .value_handle = 0,
+        // Only value/end handles needed for gatt_client_discover_characteristic_descriptors.
+        .start_handle = 0,
+        .value_handle = start_handle,
         .end_handle = end_handle,
         .properties = 0,
         .uuid16 = 0,

From 768cbea507c57891371a428073df9781d410142e Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Tue, 19 Jul 2022 18:17:55 +0200
Subject: [PATCH 2391/3533] nrf/boards/arduino_nano_33_ble_sense: Update deploy
 instructions.

---
 .../boards/arduino_nano_33_ble_sense/deploy.md   | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/ports/nrf/boards/arduino_nano_33_ble_sense/deploy.md b/ports/nrf/boards/arduino_nano_33_ble_sense/deploy.md
index a2d08f2c81328..0d94a537bbad0 100644
--- a/ports/nrf/boards/arduino_nano_33_ble_sense/deploy.md
+++ b/ports/nrf/boards/arduino_nano_33_ble_sense/deploy.md
@@ -1,19 +1,23 @@
 ### Update the bootloader
 
-Before deploying any firmware, make sure you have the updated Arduino Nano 33 BLE bootloader, which relocates the bootloader so the softdevice doesn't overwrite it. Please see:
-
-https://docs.arduino.cc/tutorials/nano-33-ble/getting-started-omv
+Before deploying any firmware images, make sure the board is running the
+updated Arduino Nano 33 BLE bootloader (which is relocated to the end of
+the flash), otherwise the bootloader will be overwritten by the softdevice.
+For more information on how to update the bootloader, see the
+[Getting Started with OpenMV/MicroPython](https://docs.arduino.cc/tutorials/nano-33-ble/getting-started-omv) tutorial.
 
 ### Via Arduino bootloader and BOSSA
 
-Download BOSSA from https://github.com/shumatech/BOSSA/ and double tap reset button to enter the Arduino bootloader
+Download the latest BOSSA flash programmer from the
+[Arduino BOSSA fork](https://github.com/arduino/BOSSA/releases/latest).
+Note this version adds support for nRF devices, and must be used with the
+Nano 33 BLE. Double tap the reset button to enter the bootloader, and run
+the following command:
 
 ```bash
 bossac -e -w --offset=0x16000 --port=ttyACM0 -i -d -U -R build-arduino_nano_33_ble_sense-s140/firmware.bin
 ```
 
-Alternatively, a Linux binary can be found here: https://github.com/openmv/openmv/blob/master/tools/bossac
-
 ### Via nrfprog
 
 This board can also be programmed via nrfjprog (with Jlink for example), from MicroPython source repository:

From 2e2fc8f60f68d03a593286a3e946e12c962c9b0c Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Wed, 20 Jul 2022 08:08:24 +0200
Subject: [PATCH 2392/3533] nrf/main: Call usb_cdc_init() before executing
 boot.py and main.py.

Otherwise, there is no USB available when running main.py, and main.py
cannot be interrupted with Ctrl-C.
---
 ports/nrf/main.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ports/nrf/main.c b/ports/nrf/main.c
index 091aa73f450f1..83466626fca07 100644
--- a/ports/nrf/main.c
+++ b/ports/nrf/main.c
@@ -257,16 +257,16 @@ int main(int argc, char **argv) {
 
     led_state(1, 0);
 
+    #if MICROPY_HW_USB_CDC
+    usb_cdc_init();
+    #endif
+
     #if MICROPY_VFS || MICROPY_MBFS || MICROPY_MODULE_FROZEN
     // run boot.py and main.py if they exist.
     pyexec_file_if_exists("boot.py");
     pyexec_file_if_exists("main.py");
     #endif
 
-    #if MICROPY_HW_USB_CDC
-    usb_cdc_init();
-    #endif
-
     for (;;) {
         if (pyexec_mode_kind == PYEXEC_MODE_RAW_REPL) {
             if (pyexec_raw_repl() != 0) {

From 8b4298a4bf4c5b6cf56021385661739744f0037c Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Wed, 20 Jul 2022 17:16:36 +1000
Subject: [PATCH 2393/3533] rp2/mpbthciport: Remove mp_bthci_uart from set of
 root pointers.

This is a statically-allocated UART (see machine_uart.c), and doesn't
contain any heap pointers other than the ringbufs (which are already root
pointers), so no need to track it additionally.

Saves needing to add mpbthciport.c to the QSTR sources.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/rp2/mpbthciport.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ports/rp2/mpbthciport.c b/ports/rp2/mpbthciport.c
index cd41da017a63a..91c908b164fc8 100644
--- a/ports/rp2/mpbthciport.c
+++ b/ports/rp2/mpbthciport.c
@@ -100,8 +100,10 @@ int mp_bluetooth_hci_uart_init(uint32_t port, uint32_t baudrate) {
         MP_OBJ_NEW_QSTR(MP_QSTR_timeout), MP_OBJ_NEW_SMALL_INT(1000),
     };
 
+    // This is a statically-allocated UART (see machine_uart.c), and doesn't
+    // contain any heap pointers other than the ringbufs (which are already
+    // root pointers), so no need to track this as a root pointer.
     mp_bthci_uart = machine_uart_type.make_new((mp_obj_t)&machine_uart_type, 2, 2, args);
-    MP_STATE_PORT(mp_bthci_uart) = mp_bthci_uart;
 
     // Start the HCI polling to process any initial events/packets.
     mp_bluetooth_hci_start_polling();
@@ -197,6 +199,4 @@ MP_WEAK int mp_bluetooth_hci_controller_wakeup(void) {
     return 0;
 }
 
-MP_REGISTER_ROOT_POINTER(struct _machine_uart_obj_t *mp_bthci_uart);
-
 #endif // MICROPY_PY_BLUETOOTH

From a0538270841987b87f44164548d6c2696a05fdee Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Wed, 20 Jul 2022 17:17:34 +1000
Subject: [PATCH 2394/3533] extmod/network_ninaw10: Move ninaw10 root pointer
 registrations here.

Originally in drivers/ninaw10/nina_wifi_bsp.c but that isn't a QSTR source.

Also remove outdated commment about root pointers in mpconfigport.h.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 drivers/ninaw10/nina_wifi_bsp.c | 4 ----
 extmod/network_ninaw10.c        | 4 ++++
 ports/rp2/mpconfigport.h        | 1 -
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/drivers/ninaw10/nina_wifi_bsp.c b/drivers/ninaw10/nina_wifi_bsp.c
index d11e139705f8d..a65ef7fd86448 100644
--- a/drivers/ninaw10/nina_wifi_bsp.c
+++ b/drivers/ninaw10/nina_wifi_bsp.c
@@ -150,8 +150,4 @@ int nina_bsp_spi_transfer(const uint8_t *tx_buf, uint8_t *rx_buf, uint32_t size)
     return 0;
 }
 
-MP_REGISTER_ROOT_POINTER(struct _machine_spi_obj_t *mp_wifi_spi);
-MP_REGISTER_ROOT_POINTER(struct _machine_timer_obj_t *mp_wifi_timer);
-MP_REGISTER_ROOT_POINTER(struct _mp_obj_list_t *mp_wifi_sockpoll_list);
-
 #endif // MICROPY_PY_NETWORK_NINAW10
diff --git a/extmod/network_ninaw10.c b/extmod/network_ninaw10.c
index 622e29ba68431..4014a71c1acfa 100644
--- a/extmod/network_ninaw10.c
+++ b/extmod/network_ninaw10.c
@@ -797,4 +797,8 @@ const mod_network_nic_type_t mod_network_nic_type_nina = {
     .ioctl = network_ninaw10_socket_ioctl,
 };
 
+MP_REGISTER_ROOT_POINTER(struct _machine_spi_obj_t *mp_wifi_spi);
+MP_REGISTER_ROOT_POINTER(struct _machine_timer_obj_t *mp_wifi_timer);
+MP_REGISTER_ROOT_POINTER(struct _mp_obj_list_t *mp_wifi_sockpoll_list);
+
 #endif // #if MICROPY_PY_BLUETOOTH && MICROPY_PY_NETWORK_NINAW10
diff --git a/ports/rp2/mpconfigport.h b/ports/rp2/mpconfigport.h
index 14748a763d1a0..d07c1015e7f59 100644
--- a/ports/rp2/mpconfigport.h
+++ b/ports/rp2/mpconfigport.h
@@ -176,7 +176,6 @@ extern const struct _mp_obj_type_t mp_network_cyw43_type;
 #ifndef MICROPY_PY_USOCKET_EXTENDED_STATE
 #define MICROPY_PY_USOCKET_EXTENDED_STATE   (1)
 #endif
-// It also requires an additional root pointer for the SPI object.
 extern const struct _mod_network_nic_type_t mod_network_nic_type_nina;
 #define MICROPY_HW_NIC_NINAW10              { MP_ROM_QSTR(MP_QSTR_WLAN), MP_ROM_PTR(&mod_network_nic_type_nina) },
 #else

From 4cf9928902a1e4bca4edc433eeab6b8fdb1a5245 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Wed, 20 Jul 2022 17:30:16 +1000
Subject: [PATCH 2395/3533] cc3200: Fix various array-based compiler warnings.

1. Add -Wno-array-bounds to avoid false positive on gcc 12.1; see related
   issue #8685.
2. Remove always-true not-NULL-check (Msg.Rsp.Args.Common.Bssid is an array
   not a pointer).
3. Fix pointer-to-freed-stack in wlan_set_security.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 drivers/cc3100/src/wlan.c   | 5 +----
 ports/cc3200/Makefile       | 3 +++
 ports/cc3200/mods/modwlan.c | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/cc3100/src/wlan.c b/drivers/cc3100/src/wlan.c
index 59adf02f02288..22be4d7ddf55e 100644
--- a/drivers/cc3100/src/wlan.c
+++ b/drivers/cc3100/src/wlan.c
@@ -536,10 +536,7 @@ _i16 sl_WlanProfileGet(const _i16 Index,_i8*  pName, _i16 *pNameLen, _u8 *pMacAd
     *pNameLen  = Msg.Rsp.Args.Common.SsidLen;      
     *pPriority = Msg.Rsp.Args.Common.Priority;       
 
-    if (NULL != Msg.Rsp.Args.Common.Bssid)
-    {
-        sl_Memcpy(pMacAddr, Msg.Rsp.Args.Common.Bssid, sizeof(Msg.Rsp.Args.Common.Bssid));
-    }
+    sl_Memcpy(pMacAddr, Msg.Rsp.Args.Common.Bssid, sizeof(Msg.Rsp.Args.Common.Bssid));
 
     sl_Memcpy(pName, EAP_PROFILE_SSID_STRING(&Msg), *pNameLen);
 
diff --git a/ports/cc3200/Makefile b/ports/cc3200/Makefile
index 90be4529d87fa..b880ad646bb39 100644
--- a/ports/cc3200/Makefile
+++ b/ports/cc3200/Makefile
@@ -25,6 +25,9 @@ CFLAGS += -g -ffunction-sections -fdata-sections -fno-common -fsigned-char -mno-
 CFLAGS += -Iboards/$(BOARD)
 CFLAGS += $(CFLAGS_MOD)
 
+# Workaround gcc 12.1 bug.
+CFLAGS += -Wno-array-bounds
+
 LDFLAGS = -Wl,-nostdlib -Wl,--gc-sections -Wl,-Map=$@.map
 
 FLASH_SIZE_WIPY = 2M
diff --git a/ports/cc3200/mods/modwlan.c b/ports/cc3200/mods/modwlan.c
index 920079b589ae6..3b686932e81da 100644
--- a/ports/cc3200/mods/modwlan.c
+++ b/ports/cc3200/mods/modwlan.c
@@ -641,8 +641,8 @@ STATIC void wlan_set_security (uint8_t auth, const char *key, uint8_t len) {
     if (key != NULL) {
         memcpy(&wlan_obj.key, key, len);
         wlan_obj.key[len] = '\0';
+        _u8 wep_key[32];
         if (auth == SL_SEC_TYPE_WEP) {
-            _u8 wep_key[32];
             wlan_wep_key_unhexlify(key, (char *)&wep_key);
             key = (const char *)&wep_key;
             len /= 2;

From e05d0a6335be6a45f29f5d987091b858ad378cfa Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 17 Mar 2021 12:34:49 +1100
Subject: [PATCH 2396/3533] extmod/modbluetooth: Add support for running sync
 irq on system thread.

If the Bluetooth stack runs on another OS thread then synchronous BLE irq
callbacks, which block the Bluetooth stack until the callback to Python is
complete, must coordinate with the main thread and configure the
MicroPython thread-local-state.

This commit adds MICROPY_PY_BLUETOOTH_USE_SYNC_EVENTS_WITH_INTERLOCK which
can be enabled if the system has these requirements.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/modbluetooth.c | 73 ++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 72 insertions(+), 1 deletion(-)

diff --git a/extmod/modbluetooth.c b/extmod/modbluetooth.c
index 9956671863109..4645ae6c98691 100644
--- a/extmod/modbluetooth.c
+++ b/extmod/modbluetooth.c
@@ -34,6 +34,7 @@
 #include "py/objarray.h"
 #include "py/qstr.h"
 #include "py/runtime.h"
+#include "py/stackctrl.h"
 #include "extmod/modbluetooth.h"
 #include <string.h>
 
@@ -1135,7 +1136,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(bluetooth_ble_invoke_irq_obj, bluetooth_ble_inv
 
 #if MICROPY_PY_BLUETOOTH_USE_SYNC_EVENTS
 
-STATIC mp_obj_t invoke_irq_handler(uint16_t event,
+STATIC mp_obj_t invoke_irq_handler_run(uint16_t event,
     const mp_int_t *numeric, size_t n_unsigned, size_t n_signed,
     const uint8_t *addr,
     const mp_obj_bluetooth_uuid_t *uuid,
@@ -1185,6 +1186,76 @@ STATIC mp_obj_t invoke_irq_handler(uint16_t event,
     return result;
 }
 
+#if MICROPY_PY_BLUETOOTH_USE_SYNC_EVENTS_WITH_INTERLOCK
+
+// On some systems the BLE event callbacks may occur on a system thread which is not
+// a MicroPython thread.  In such cases the callback must set up relevant MicroPython
+// state and obtain the GIL, to synchronised with the rest of the runtime.
+
+#if MICROPY_ENABLE_PYSTACK
+#error not supported
+#endif
+
+STATIC mp_obj_t invoke_irq_handler(uint16_t event,
+    const mp_int_t *numeric, size_t n_unsigned, size_t n_signed,
+    const uint8_t *addr,
+    const mp_obj_bluetooth_uuid_t *uuid,
+    const uint8_t **data, size_t *data_len, size_t n_data) {
+
+    // This code may run on an existing MicroPython thread, or a non-MicroPython thread
+    // that's not using the mp_thread_get_state() value.  In the former case the state
+    // must be restored once this callback finishes.
+    mp_state_thread_t *ts_orig = mp_thread_get_state();
+
+    mp_state_thread_t ts;
+    if (ts_orig == NULL) {
+        mp_thread_set_state(&ts);
+        mp_stack_set_top(&ts + 1); // need to include ts in root-pointer scan
+        mp_stack_set_limit(MICROPY_PY_BLUETOOTH_SYNC_EVENT_STACK_SIZE - 1024);
+        ts.gc_lock_depth = 0;
+        ts.mp_pending_exception = MP_OBJ_NULL;
+        mp_locals_set(mp_state_ctx.thread.dict_locals); // set from the outer context
+        mp_globals_set(mp_state_ctx.thread.dict_globals); // set from the outer context
+        MP_THREAD_GIL_ENTER();
+    }
+
+    mp_obj_t result = mp_const_none;
+    nlr_buf_t nlr;
+    if (nlr_push(&nlr) == 0) {
+        mp_sched_lock();
+        result = invoke_irq_handler_run(event, numeric, n_unsigned, n_signed, addr, uuid, data, data_len, n_data);
+        mp_sched_unlock();
+        nlr_pop();
+    } else {
+        // Uncaught exception, print it out.
+        mp_sched_unlock();
+        mp_printf(MICROPY_ERROR_PRINTER, "Unhandled exception in IRQ callback handler\n");
+        mp_obj_print_exception(MICROPY_ERROR_PRINTER, MP_OBJ_FROM_PTR(nlr.ret_val));
+    }
+
+    if (ts_orig == NULL) {
+        MP_THREAD_GIL_EXIT();
+        mp_thread_set_state(ts_orig);
+    }
+
+    return result;
+}
+
+#else
+
+// BLE event callbacks are called directly from the MicroPython runtime, so additional
+// synchronisation is not needed, and BLE event handlers can be called directly.
+
+STATIC mp_obj_t invoke_irq_handler(uint16_t event,
+    const mp_int_t *numeric, size_t n_unsigned, size_t n_signed,
+    const uint8_t *addr,
+    const mp_obj_bluetooth_uuid_t *uuid,
+    const uint8_t **data, size_t *data_len, size_t n_data) {
+    return invoke_irq_handler_run(event, numeric, n_unsigned, n_signed, addr, uuid, data, data_len, n_data);
+}
+
+#endif
+
 #define NULL_NUMERIC NULL
 #define NULL_ADDR NULL
 #define NULL_UUID NULL

From 5dbb822ca4a809ac5cb4513afb0411b4eb8dc3cf Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 17 Mar 2021 12:35:59 +1100
Subject: [PATCH 2397/3533] esp32/mpconfigport: Enable BLE synchronous events
 and pairing/bonding.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/main/CMakeLists.txt | 6 +++++-
 ports/esp32/mpconfigport.h      | 4 ++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/ports/esp32/main/CMakeLists.txt b/ports/esp32/main/CMakeLists.txt
index 9ac6537f86be1..fccfd6b7c7a9f 100644
--- a/ports/esp32/main/CMakeLists.txt
+++ b/ports/esp32/main/CMakeLists.txt
@@ -198,11 +198,15 @@ target_compile_options(${MICROPY_TARGET} PUBLIC
     -Wno-missing-field-initializers
 )
 
+# Additional include directories needed for private NimBLE headers.
+target_include_directories(${MICROPY_TARGET} PUBLIC
+    ${IDF_PATH}/components/bt/host/nimble/nimble
+)
+
 # Add additional extmod and usermod components.
 target_link_libraries(${MICROPY_TARGET} micropy_extmod_btree)
 target_link_libraries(${MICROPY_TARGET} usermod)
 
-
 # Collect all of the include directories and compile definitions for the IDF components.
 foreach(comp ${IDF_COMPONENTS})
     micropy_gather_target_properties(__idf_${comp})
diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h
index 8dc3537e59d4a..dfa577d2bc693 100644
--- a/ports/esp32/mpconfigport.h
+++ b/ports/esp32/mpconfigport.h
@@ -70,7 +70,11 @@
 // extended modules
 #ifndef MICROPY_PY_BLUETOOTH
 #define MICROPY_PY_BLUETOOTH                (1)
+#define MICROPY_PY_BLUETOOTH_USE_SYNC_EVENTS (1)
+#define MICROPY_PY_BLUETOOTH_USE_SYNC_EVENTS_WITH_INTERLOCK (1)
+#define MICROPY_PY_BLUETOOTH_SYNC_EVENT_STACK_SIZE (CONFIG_BT_NIMBLE_TASK_STACK_SIZE)
 #define MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE (1)
+#define MICROPY_PY_BLUETOOTH_ENABLE_PAIRING_BONDING (1)
 #define MICROPY_BLUETOOTH_NIMBLE            (1)
 #define MICROPY_BLUETOOTH_NIMBLE_BINDINGS_ONLY (1)
 #endif

From bcc827d695e20b644ff4626bd529e3d8706716d7 Mon Sep 17 00:00:00 2001
From: Ayke van Laethem <aykevanlaethem@gmail.com>
Date: Wed, 24 Jan 2018 02:09:58 +0100
Subject: [PATCH 2398/3533] py/gc: Allow the GC heap to be split over multiple
 memory areas.

This commit adds a new option MICROPY_GC_SPLIT_HEAP (disabled by default)
which, when enabled, allows the GC heap to be split over multiple memory
areas/regions.  The first area is added with gc_init() and subsequent areas
can be added with gc_add().  New areas can be added at runtime.  Areas are
stored internally as a linked list, and calls to gc_alloc() can be
satisfied from any area.

This feature has the following use-cases (among others):
- The ESP32 has a fragmented OS heap, so to use all (or more) of it the
  GC heap must be split.
- Other MCUs may have disjoint RAM regions and are now able to use them
  all for the GC heap.
- The user could explicitly increase the size of the GC heap.
- Support a dynamic heap while running on an OS, adding more heap when
  necessary.
---
 py/gc.c       | 761 ++++++++++++++++++++++++++++++--------------------
 py/gc.h       |   6 +
 py/mpconfig.h |   5 +
 py/mpstate.h  |  39 ++-
 4 files changed, 493 insertions(+), 318 deletions(-)

diff --git a/py/gc.c b/py/gc.c
index 0c1f3961df3b4..93e83aaad5b89 100644
--- a/py/gc.c
+++ b/py/gc.c
@@ -74,17 +74,22 @@
 #define ATB_2_IS_FREE(a) (((a) & ATB_MASK_2) == 0)
 #define ATB_3_IS_FREE(a) (((a) & ATB_MASK_3) == 0)
 
+#if MICROPY_GC_SPLIT_HEAP
+#define NEXT_AREA(area) (area->next)
+#else
+#define NEXT_AREA(area) (NULL)
+#endif
+
 #define BLOCK_SHIFT(block) (2 * ((block) & (BLOCKS_PER_ATB - 1)))
-#define ATB_GET_KIND(block) ((MP_STATE_MEM(gc_alloc_table_start)[(block) / BLOCKS_PER_ATB] >> BLOCK_SHIFT(block)) & 3)
-#define ATB_ANY_TO_FREE(block) do { MP_STATE_MEM(gc_alloc_table_start)[(block) / BLOCKS_PER_ATB] &= (~(AT_MARK << BLOCK_SHIFT(block))); } while (0)
-#define ATB_FREE_TO_HEAD(block) do { MP_STATE_MEM(gc_alloc_table_start)[(block) / BLOCKS_PER_ATB] |= (AT_HEAD << BLOCK_SHIFT(block)); } while (0)
-#define ATB_FREE_TO_TAIL(block) do { MP_STATE_MEM(gc_alloc_table_start)[(block) / BLOCKS_PER_ATB] |= (AT_TAIL << BLOCK_SHIFT(block)); } while (0)
-#define ATB_HEAD_TO_MARK(block) do { MP_STATE_MEM(gc_alloc_table_start)[(block) / BLOCKS_PER_ATB] |= (AT_MARK << BLOCK_SHIFT(block)); } while (0)
-#define ATB_MARK_TO_HEAD(block) do { MP_STATE_MEM(gc_alloc_table_start)[(block) / BLOCKS_PER_ATB] &= (~(AT_TAIL << BLOCK_SHIFT(block))); } while (0)
+#define ATB_GET_KIND(area, block) (((area)->gc_alloc_table_start[(block) / BLOCKS_PER_ATB] >> BLOCK_SHIFT(block)) & 3)
+#define ATB_ANY_TO_FREE(area, block) do { area->gc_alloc_table_start[(block) / BLOCKS_PER_ATB] &= (~(AT_MARK << BLOCK_SHIFT(block))); } while (0)
+#define ATB_FREE_TO_HEAD(area, block) do { area->gc_alloc_table_start[(block) / BLOCKS_PER_ATB] |= (AT_HEAD << BLOCK_SHIFT(block)); } while (0)
+#define ATB_FREE_TO_TAIL(area, block) do { area->gc_alloc_table_start[(block) / BLOCKS_PER_ATB] |= (AT_TAIL << BLOCK_SHIFT(block)); } while (0)
+#define ATB_HEAD_TO_MARK(area, block) do { area->gc_alloc_table_start[(block) / BLOCKS_PER_ATB] |= (AT_MARK << BLOCK_SHIFT(block)); } while (0)
+#define ATB_MARK_TO_HEAD(area, block) do { area->gc_alloc_table_start[(block) / BLOCKS_PER_ATB] &= (~(AT_TAIL << BLOCK_SHIFT(block))); } while (0)
 
-#define BLOCK_FROM_PTR(ptr) (((byte *)(ptr) - MP_STATE_MEM(gc_pool_start)) / BYTES_PER_BLOCK)
-#define PTR_FROM_BLOCK(block) (((block) * BYTES_PER_BLOCK + (uintptr_t)MP_STATE_MEM(gc_pool_start)))
-#define ATB_FROM_BLOCK(bl) ((bl) / BLOCKS_PER_ATB)
+#define BLOCK_FROM_PTR(area, ptr) (((byte *)(ptr) - area->gc_pool_start) / BYTES_PER_BLOCK)
+#define PTR_FROM_BLOCK(area, block) (((block) * BYTES_PER_BLOCK + (uintptr_t)area->gc_pool_start))
 
 #if MICROPY_ENABLE_FINALISER
 // FTB = finaliser table byte
@@ -92,9 +97,9 @@
 
 #define BLOCKS_PER_FTB (8)
 
-#define FTB_GET(block) ((MP_STATE_MEM(gc_finaliser_table_start)[(block) / BLOCKS_PER_FTB] >> ((block) & 7)) & 1)
-#define FTB_SET(block) do { MP_STATE_MEM(gc_finaliser_table_start)[(block) / BLOCKS_PER_FTB] |= (1 << ((block) & 7)); } while (0)
-#define FTB_CLEAR(block) do { MP_STATE_MEM(gc_finaliser_table_start)[(block) / BLOCKS_PER_FTB] &= (~(1 << ((block) & 7))); } while (0)
+#define FTB_GET(area, block) ((area->gc_finaliser_table_start[(block) / BLOCKS_PER_FTB] >> ((block) & 7)) & 1)
+#define FTB_SET(area, block) do { area->gc_finaliser_table_start[(block) / BLOCKS_PER_FTB] |= (1 << ((block) & 7)); } while (0)
+#define FTB_CLEAR(area, block) do { area->gc_finaliser_table_start[(block) / BLOCKS_PER_FTB] &= (~(1 << ((block) & 7))); } while (0)
 #endif
 
 #if MICROPY_PY_THREAD && !MICROPY_PY_THREAD_GIL
@@ -106,11 +111,7 @@
 #endif
 
 // TODO waste less memory; currently requires that all entries in alloc_table have a corresponding block in pool
-void gc_init(void *start, void *end) {
-    // align end pointer on block boundary
-    end = (void *)((uintptr_t)end & (~(BYTES_PER_BLOCK - 1)));
-    DEBUG_printf("Initializing GC heap: %p..%p = " UINT_FMT " bytes\n", start, end, (byte *)end - (byte *)start);
-
+STATIC void gc_setup_area(mp_state_mem_area_t *area, void *start, void *end) {
     // calculate parameters for GC (T=total, A=alloc table, F=finaliser table, P=pool; all in bytes):
     // T = A + F + P
     //     F = A * BLOCKS_PER_ATB / BLOCKS_PER_FTB
@@ -118,36 +119,52 @@ void gc_init(void *start, void *end) {
     // => T = A * (1 + BLOCKS_PER_ATB / BLOCKS_PER_FTB + BLOCKS_PER_ATB * BYTES_PER_BLOCK)
     size_t total_byte_len = (byte *)end - (byte *)start;
     #if MICROPY_ENABLE_FINALISER
-    MP_STATE_MEM(gc_alloc_table_byte_len) = total_byte_len * MP_BITS_PER_BYTE / (MP_BITS_PER_BYTE + MP_BITS_PER_BYTE * BLOCKS_PER_ATB / BLOCKS_PER_FTB + MP_BITS_PER_BYTE * BLOCKS_PER_ATB * BYTES_PER_BLOCK);
+    area->gc_alloc_table_byte_len = total_byte_len * MP_BITS_PER_BYTE / (MP_BITS_PER_BYTE + MP_BITS_PER_BYTE * BLOCKS_PER_ATB / BLOCKS_PER_FTB + MP_BITS_PER_BYTE * BLOCKS_PER_ATB * BYTES_PER_BLOCK);
     #else
-    MP_STATE_MEM(gc_alloc_table_byte_len) = total_byte_len / (1 + MP_BITS_PER_BYTE / 2 * BYTES_PER_BLOCK);
+    area->gc_alloc_table_byte_len = total_byte_len / (1 + MP_BITS_PER_BYTE / 2 * BYTES_PER_BLOCK);
     #endif
 
-    MP_STATE_MEM(gc_alloc_table_start) = (byte *)start;
+    area->gc_alloc_table_start = (byte *)start;
 
     #if MICROPY_ENABLE_FINALISER
-    size_t gc_finaliser_table_byte_len = (MP_STATE_MEM(gc_alloc_table_byte_len) * BLOCKS_PER_ATB + BLOCKS_PER_FTB - 1) / BLOCKS_PER_FTB;
-    MP_STATE_MEM(gc_finaliser_table_start) = MP_STATE_MEM(gc_alloc_table_start) + MP_STATE_MEM(gc_alloc_table_byte_len);
+    size_t gc_finaliser_table_byte_len = (area->gc_alloc_table_byte_len * BLOCKS_PER_ATB + BLOCKS_PER_FTB - 1) / BLOCKS_PER_FTB;
+    area->gc_finaliser_table_start = area->gc_alloc_table_start + area->gc_alloc_table_byte_len;
     #endif
 
-    size_t gc_pool_block_len = MP_STATE_MEM(gc_alloc_table_byte_len) * BLOCKS_PER_ATB;
-    MP_STATE_MEM(gc_pool_start) = (byte *)end - gc_pool_block_len * BYTES_PER_BLOCK;
-    MP_STATE_MEM(gc_pool_end) = end;
+    size_t gc_pool_block_len = area->gc_alloc_table_byte_len * BLOCKS_PER_ATB;
+    area->gc_pool_start = (byte *)end - gc_pool_block_len * BYTES_PER_BLOCK;
+    area->gc_pool_end = end;
 
     #if MICROPY_ENABLE_FINALISER
-    assert(MP_STATE_MEM(gc_pool_start) >= MP_STATE_MEM(gc_finaliser_table_start) + gc_finaliser_table_byte_len);
+    assert(area->gc_pool_start >= area->gc_finaliser_table_start + gc_finaliser_table_byte_len);
     #endif
 
     // clear ATBs
-    memset(MP_STATE_MEM(gc_alloc_table_start), 0, MP_STATE_MEM(gc_alloc_table_byte_len));
+    memset(area->gc_alloc_table_start, 0, area->gc_alloc_table_byte_len);
 
     #if MICROPY_ENABLE_FINALISER
     // clear FTBs
-    memset(MP_STATE_MEM(gc_finaliser_table_start), 0, gc_finaliser_table_byte_len);
+    memset(area->gc_finaliser_table_start, 0, gc_finaliser_table_byte_len);
     #endif
 
+    area->gc_last_free_atb_index = 0;
+
+    #if MICROPY_GC_SPLIT_HEAP
+    area->next = NULL;
+    #endif
+}
+
+void gc_init(void *start, void *end) {
+    // align end pointer on block boundary
+    end = (void *)((uintptr_t)end & (~(BYTES_PER_BLOCK - 1)));
+    DEBUG_printf("Initializing GC heap: %p..%p = " UINT_FMT " bytes\n", start, end, (byte *)end - (byte *)start);
+
+    gc_setup_area(&MP_STATE_MEM(area), start, end);
+
     // set last free ATB index to start of heap
-    MP_STATE_MEM(gc_last_free_atb_index) = 0;
+    #if MICROPY_GC_SPLIT_HEAP
+    MP_STATE_MEM(gc_last_free_area) = &MP_STATE_MEM(area);
+    #endif
 
     // unlock the GC
     MP_STATE_THREAD(gc_lock_depth) = 0;
@@ -173,6 +190,29 @@ void gc_init(void *start, void *end) {
     DEBUG_printf("  pool at %p, length " UINT_FMT " bytes, " UINT_FMT " blocks\n", MP_STATE_MEM(gc_pool_start), gc_pool_block_len * BYTES_PER_BLOCK, gc_pool_block_len);
 }
 
+#if MICROPY_GC_SPLIT_HEAP
+void gc_add(void *start, void *end) {
+    // Place the area struct at the start of the area.
+    mp_state_mem_area_t *area = (mp_state_mem_area_t *)start;
+    start = (void *)((uintptr_t)start + sizeof(mp_state_mem_area_t));
+
+    end = (void *)((uintptr_t)end & (~(BYTES_PER_BLOCK - 1)));
+    DEBUG_printf("Adding GC heap: %p..%p = " UINT_FMT " bytes\n", start, end, (byte *)end - (byte *)start);
+
+    // Init this area
+    gc_setup_area(area, start, end);
+
+    // Find the last registered area in the linked list
+    mp_state_mem_area_t *prev_area = &MP_STATE_MEM(area);
+    while (prev_area->next != NULL) {
+        prev_area = prev_area->next;
+    }
+
+    // Add this area to the linked list
+    prev_area->next = area;
+}
+#endif
+
 void gc_lock(void) {
     // This does not need to be atomic or have the GC mutex because:
     // - each thread has its own gc_lock_depth so there are no races between threads;
@@ -190,12 +230,20 @@ bool gc_is_locked(void) {
     return MP_STATE_THREAD(gc_lock_depth) != 0;
 }
 
-// ptr should be of type void*
-#define VERIFY_PTR(ptr) ( \
-    ((uintptr_t)(ptr) & (BYTES_PER_BLOCK - 1)) == 0          /* must be aligned on a block */ \
-    && ptr >= (void *)MP_STATE_MEM(gc_pool_start)        /* must be above start of pool */ \
-    && ptr < (void *)MP_STATE_MEM(gc_pool_end)           /* must be below end of pool */ \
-    )
+// Returns the area to which this pointer belongs, or NULL if it isn't
+// allocated on the GC-managed heap.
+STATIC inline mp_state_mem_area_t *gc_get_ptr_area(const void *ptr) {
+    if (((uintptr_t)(ptr) & (BYTES_PER_BLOCK - 1)) != 0) {   // must be aligned on a block
+        return NULL;
+    }
+    for (mp_state_mem_area_t *area = &MP_STATE_MEM(area); area != NULL; area = NEXT_AREA(area)) {
+        if (ptr >= (void *)area->gc_pool_start   // must be above start of pool
+            && ptr < (void *)area->gc_pool_end) {   // must be below end of pool
+            return area;
+        }
+    }
+    return NULL;
+}
 
 #ifndef TRACE_MARK
 #if DEBUG_PRINT
@@ -209,45 +257,64 @@ bool gc_is_locked(void) {
 // children: mark the unmarked child blocks and put those newly marked
 // blocks on the stack. When all children have been checked, pop off the
 // topmost block on the stack and repeat with that one.
-STATIC void gc_mark_subtree(size_t block) {
-    // Start with the block passed in the argument.
+STATIC void gc_mark_subtree(mp_gc_stack_item_t item) {
+    // Start with the item passed in the argument.
     size_t sp = 0;
     for (;;) {
         MICROPY_GC_HOOK_LOOP
+
+        #if MICROPY_GC_SPLIT_HEAP
+        mp_state_mem_area_t *area = item.area;
+        #else
+        mp_state_mem_area_t *area = &MP_STATE_MEM(area);
+        #endif
+        size_t block = item.block;
+
         // work out number of consecutive blocks in the chain starting with this one
         size_t n_blocks = 0;
         do {
             n_blocks += 1;
-        } while (ATB_GET_KIND(block + n_blocks) == AT_TAIL);
+        } while (ATB_GET_KIND(area, block + n_blocks) == AT_TAIL);
 
         // check this block's children
-        void **ptrs = (void **)PTR_FROM_BLOCK(block);
+        void **ptrs = (void **)PTR_FROM_BLOCK(area, block);
         for (size_t i = n_blocks * BYTES_PER_BLOCK / sizeof(void *); i > 0; i--, ptrs++) {
             MICROPY_GC_HOOK_LOOP
             void *ptr = *ptrs;
-            if (VERIFY_PTR(ptr)) {
-                // Mark and push this pointer
-                size_t childblock = BLOCK_FROM_PTR(ptr);
-                if (ATB_GET_KIND(childblock) == AT_HEAD) {
-                    // an unmarked head, mark it, and push it on gc stack
-                    TRACE_MARK(childblock, ptr);
-                    ATB_HEAD_TO_MARK(childblock);
-                    if (sp < MICROPY_ALLOC_GC_STACK_SIZE) {
-                        MP_STATE_MEM(gc_stack)[sp++] = childblock;
-                    } else {
-                        MP_STATE_MEM(gc_stack_overflow) = 1;
-                    }
-                }
+            // If this is a heap pointer that hasn't been marked, mark it and push
+            // it's children to the stack.
+            mp_state_mem_area_t *ptr_area = gc_get_ptr_area(ptr);
+            if (!ptr_area) {
+                // Not a heap-allocated pointer (might even be random data).
+                continue;
+            }
+            size_t ptr_block = BLOCK_FROM_PTR(ptr_area, ptr);
+            if (ATB_GET_KIND(ptr_area, ptr_block) != AT_HEAD) {
+                // This block is already marked.
+                continue;
+            }
+            // An unmarked head. Mark it, and push it on gc stack.
+            TRACE_MARK(ptr_block, ptr);
+            ATB_HEAD_TO_MARK(ptr_area, ptr_block);
+            if (sp < MICROPY_ALLOC_GC_STACK_SIZE) {
+                #if MICROPY_GC_SPLIT_HEAP
+                mp_gc_stack_item_t ptr_item = {ptr_area, ptr_block};
+                #else
+                mp_gc_stack_item_t ptr_item = {ptr_block};
+                #endif
+                MP_STATE_MEM(gc_stack)[sp++] = ptr_item;
+            } else {
+                MP_STATE_MEM(gc_stack_overflow) = 1;
             }
         }
 
-        // Are there any blocks on the stack?
+        // Are there any items on the stack?
         if (sp == 0) {
             break; // No, stack is empty, we're done.
         }
 
-        // pop the next block off the stack
-        block = MP_STATE_MEM(gc_stack)[--sp];
+        // pop the next item off the stack
+        item = MP_STATE_MEM(gc_stack)[--sp];
     }
 }
 
@@ -256,11 +323,20 @@ STATIC void gc_deal_with_stack_overflow(void) {
         MP_STATE_MEM(gc_stack_overflow) = 0;
 
         // scan entire memory looking for blocks which have been marked but not their children
-        for (size_t block = 0; block < MP_STATE_MEM(gc_alloc_table_byte_len) * BLOCKS_PER_ATB; block++) {
-            MICROPY_GC_HOOK_LOOP
-            // trace (again) if mark bit set
-            if (ATB_GET_KIND(block) == AT_MARK) {
-                gc_mark_subtree(block);
+        for (mp_state_mem_area_t *area = &MP_STATE_MEM(area); area != NULL; area = NEXT_AREA(area)) {
+            for (size_t block = 0; block < area->gc_alloc_table_byte_len * BLOCKS_PER_ATB; block++) {
+                MICROPY_GC_HOOK_LOOP
+                // trace (again) if mark bit set
+                if (ATB_GET_KIND(area, block) == AT_MARK) {
+                    #if MICROPY_GC_SPLIT_HEAP
+                    mp_gc_stack_item_t item = {area, block};
+                    #else
+                    mp_gc_stack_item_t item = {block};
+                    #endif
+                    // *MP_STATE_MEM(gc_sp)++ = item;
+                    // gc_drain_stack();
+                    gc_mark_subtree(item);
+                }
             }
         }
     }
@@ -272,53 +348,55 @@ STATIC void gc_sweep(void) {
     #endif
     // free unmarked heads and their tails
     int free_tail = 0;
-    for (size_t block = 0; block < MP_STATE_MEM(gc_alloc_table_byte_len) * BLOCKS_PER_ATB; block++) {
-        MICROPY_GC_HOOK_LOOP
-        switch (ATB_GET_KIND(block)) {
-            case AT_HEAD:
-                #if MICROPY_ENABLE_FINALISER
-                if (FTB_GET(block)) {
-                    mp_obj_base_t *obj = (mp_obj_base_t *)PTR_FROM_BLOCK(block);
-                    if (obj->type != NULL) {
-                        // if the object has a type then see if it has a __del__ method
-                        mp_obj_t dest[2];
-                        mp_load_method_maybe(MP_OBJ_FROM_PTR(obj), MP_QSTR___del__, dest);
-                        if (dest[0] != MP_OBJ_NULL) {
-                            // load_method returned a method, execute it in a protected environment
-                            #if MICROPY_ENABLE_SCHEDULER
-                            mp_sched_lock();
-                            #endif
-                            mp_call_function_1_protected(dest[0], dest[1]);
-                            #if MICROPY_ENABLE_SCHEDULER
-                            mp_sched_unlock();
-                            #endif
+    for (mp_state_mem_area_t *area = &MP_STATE_MEM(area); area != NULL; area = NEXT_AREA(area)) {
+        for (size_t block = 0; block < area->gc_alloc_table_byte_len * BLOCKS_PER_ATB; block++) {
+            MICROPY_GC_HOOK_LOOP
+            switch (ATB_GET_KIND(area, block)) {
+                case AT_HEAD:
+                    #if MICROPY_ENABLE_FINALISER
+                    if (FTB_GET(area, block)) {
+                        mp_obj_base_t *obj = (mp_obj_base_t *)PTR_FROM_BLOCK(area, block);
+                        if (obj->type != NULL) {
+                            // if the object has a type then see if it has a __del__ method
+                            mp_obj_t dest[2];
+                            mp_load_method_maybe(MP_OBJ_FROM_PTR(obj), MP_QSTR___del__, dest);
+                            if (dest[0] != MP_OBJ_NULL) {
+                                // load_method returned a method, execute it in a protected environment
+                                #if MICROPY_ENABLE_SCHEDULER
+                                mp_sched_lock();
+                                #endif
+                                mp_call_function_1_protected(dest[0], dest[1]);
+                                #if MICROPY_ENABLE_SCHEDULER
+                                mp_sched_unlock();
+                                #endif
+                            }
                         }
+                        // clear finaliser flag
+                        FTB_CLEAR(area, block);
                     }
-                    // clear finaliser flag
-                    FTB_CLEAR(block);
-                }
-                #endif
-                free_tail = 1;
-                DEBUG_printf("gc_sweep(%p)\n", (void *)PTR_FROM_BLOCK(block));
-                #if MICROPY_PY_GC_COLLECT_RETVAL
-                MP_STATE_MEM(gc_collected)++;
-                #endif
-                // fall through to free the head
-                MP_FALLTHROUGH
-
-            case AT_TAIL:
-                if (free_tail) {
-                    ATB_ANY_TO_FREE(block);
-                    #if CLEAR_ON_SWEEP
-                    memset((void *)PTR_FROM_BLOCK(block), 0, BYTES_PER_BLOCK);
                     #endif
-                }
-                break;
+                    free_tail = 1;
+                    DEBUG_printf("gc_sweep(%p)\n", (void *)PTR_FROM_BLOCK(area, block));
+                    #if MICROPY_PY_GC_COLLECT_RETVAL
+                    MP_STATE_MEM(gc_collected)++;
+                    #endif
+                    // fall through to free the head
+                    MP_FALLTHROUGH
+
+                case AT_TAIL:
+                    if (free_tail) {
+                        ATB_ANY_TO_FREE(area, block);
+                        #if CLEAR_ON_SWEEP
+                        memset((void *)PTR_FROM_BLOCK(area, block), 0, BYTES_PER_BLOCK);
+                        #endif
+                    }
+                    break;
 
-            case AT_MARK:
-                ATB_MARK_TO_HEAD(block);
-                free_tail = 0;
-                break;
+                case AT_MARK:
+                    ATB_MARK_TO_HEAD(area, block);
+                    free_tail = 0;
+                    break;
+            }
         }
     }
 }
@@ -360,13 +438,18 @@ void gc_collect_root(void **ptrs, size_t len) {
     for (size_t i = 0; i < len; i++) {
         MICROPY_GC_HOOK_LOOP
         void *ptr = gc_get_ptr(ptrs, i);
-        if (VERIFY_PTR(ptr)) {
-            size_t block = BLOCK_FROM_PTR(ptr);
-            if (ATB_GET_KIND(block) == AT_HEAD) {
+        mp_state_mem_area_t *area = gc_get_ptr_area(ptr);
+        if (area) {
+            size_t block = BLOCK_FROM_PTR(area, ptr);
+            if (ATB_GET_KIND(area, block) == AT_HEAD) {
                 // An unmarked head: mark it, and mark all its children
-                TRACE_MARK(block, ptr);
-                ATB_HEAD_TO_MARK(block);
-                gc_mark_subtree(block);
+                ATB_HEAD_TO_MARK(area, block);
+                #if MICROPY_GC_SPLIT_HEAP
+                mp_gc_stack_item_t item = {area, block};
+                #else
+                mp_gc_stack_item_t item = {block};
+                #endif
+                gc_mark_subtree(item);
             }
         }
     }
@@ -375,7 +458,12 @@ void gc_collect_root(void **ptrs, size_t len) {
 void gc_collect_end(void) {
     gc_deal_with_stack_overflow();
     gc_sweep();
-    MP_STATE_MEM(gc_last_free_atb_index) = 0;
+    #if MICROPY_GC_SPLIT_HEAP
+    MP_STATE_MEM(gc_last_free_area) = &MP_STATE_MEM(area);
+    #endif
+    for (mp_state_mem_area_t *area = &MP_STATE_MEM(area); area != NULL; area = NEXT_AREA(area)) {
+        area->gc_last_free_atb_index = 0;
+    }
     MP_STATE_THREAD(gc_lock_depth)--;
     GC_EXIT();
 }
@@ -389,59 +477,62 @@ void gc_sweep_all(void) {
 
 void gc_info(gc_info_t *info) {
     GC_ENTER();
-    info->total = MP_STATE_MEM(gc_pool_end) - MP_STATE_MEM(gc_pool_start);
+    info->total = 0;
     info->used = 0;
     info->free = 0;
     info->max_free = 0;
     info->num_1block = 0;
     info->num_2block = 0;
     info->max_block = 0;
-    bool finish = false;
-    for (size_t block = 0, len = 0, len_free = 0; !finish;) {
-        size_t kind = ATB_GET_KIND(block);
-        switch (kind) {
-            case AT_FREE:
-                info->free += 1;
-                len_free += 1;
-                len = 0;
-                break;
-
-            case AT_HEAD:
-                info->used += 1;
-                len = 1;
-                break;
-
-            case AT_TAIL:
-                info->used += 1;
-                len += 1;
-                break;
-
-            case AT_MARK:
-                // shouldn't happen
-                break;
-        }
-
-        block++;
-        finish = (block == MP_STATE_MEM(gc_alloc_table_byte_len) * BLOCKS_PER_ATB);
-        // Get next block type if possible
-        if (!finish) {
-            kind = ATB_GET_KIND(block);
-        }
-
-        if (finish || kind == AT_FREE || kind == AT_HEAD) {
-            if (len == 1) {
-                info->num_1block += 1;
-            } else if (len == 2) {
-                info->num_2block += 1;
+    for (mp_state_mem_area_t *area = &MP_STATE_MEM(area); area != NULL; area = NEXT_AREA(area)) {
+        bool finish = false;
+        info->total += area->gc_pool_end - area->gc_pool_start;
+        for (size_t block = 0, len = 0, len_free = 0; !finish;) {
+            size_t kind = ATB_GET_KIND(area, block);
+            switch (kind) {
+                case AT_FREE:
+                    info->free += 1;
+                    len_free += 1;
+                    len = 0;
+                    break;
+
+                case AT_HEAD:
+                    info->used += 1;
+                    len = 1;
+                    break;
+
+                case AT_TAIL:
+                    info->used += 1;
+                    len += 1;
+                    break;
+
+                case AT_MARK:
+                    // shouldn't happen
+                    break;
             }
-            if (len > info->max_block) {
-                info->max_block = len;
+
+            block++;
+            finish = (block == area->gc_alloc_table_byte_len * BLOCKS_PER_ATB);
+            // Get next block type if possible
+            if (!finish) {
+                kind = ATB_GET_KIND(area, block);
             }
-            if (finish || kind == AT_HEAD) {
-                if (len_free > info->max_free) {
-                    info->max_free = len_free;
+
+            if (finish || kind == AT_FREE || kind == AT_HEAD) {
+                if (len == 1) {
+                    info->num_1block += 1;
+                } else if (len == 2) {
+                    info->num_2block += 1;
+                }
+                if (len > info->max_block) {
+                    info->max_block = len;
+                }
+                if (finish || kind == AT_HEAD) {
+                    if (len_free > info->max_free) {
+                        info->max_free = len_free;
+                    }
+                    len_free = 0;
                 }
-                len_free = 0;
             }
         }
     }
@@ -468,6 +559,7 @@ void *gc_alloc(size_t n_bytes, unsigned int alloc_flags) {
 
     GC_ENTER();
 
+    mp_state_mem_area_t *area;
     size_t i;
     size_t end_block;
     size_t start_block;
@@ -485,16 +577,33 @@ void *gc_alloc(size_t n_bytes, unsigned int alloc_flags) {
 
     for (;;) {
 
+        #if MICROPY_GC_SPLIT_HEAP
+        area = MP_STATE_MEM(gc_last_free_area);
+        #else
+        area = &MP_STATE_MEM(area);
+        #endif
+
         // look for a run of n_blocks available blocks
-        n_free = 0;
-        for (i = MP_STATE_MEM(gc_last_free_atb_index); i < MP_STATE_MEM(gc_alloc_table_byte_len); i++) {
-            byte a = MP_STATE_MEM(gc_alloc_table_start)[i];
-            // *FORMAT-OFF*
-            if (ATB_0_IS_FREE(a)) { if (++n_free >= n_blocks) { i = i * BLOCKS_PER_ATB + 0; goto found; } } else { n_free = 0; }
-            if (ATB_1_IS_FREE(a)) { if (++n_free >= n_blocks) { i = i * BLOCKS_PER_ATB + 1; goto found; } } else { n_free = 0; }
-            if (ATB_2_IS_FREE(a)) { if (++n_free >= n_blocks) { i = i * BLOCKS_PER_ATB + 2; goto found; } } else { n_free = 0; }
-            if (ATB_3_IS_FREE(a)) { if (++n_free >= n_blocks) { i = i * BLOCKS_PER_ATB + 3; goto found; } } else { n_free = 0; }
-            // *FORMAT-ON*
+        for (; area != NULL; area = NEXT_AREA(area), i = 0) {
+            n_free = 0;
+            for (i = area->gc_last_free_atb_index; i < area->gc_alloc_table_byte_len; i++) {
+                byte a = area->gc_alloc_table_start[i];
+                // *FORMAT-OFF*
+                if (ATB_0_IS_FREE(a)) { if (++n_free >= n_blocks) { i = i * BLOCKS_PER_ATB + 0; goto found; } } else { n_free = 0; }
+                if (ATB_1_IS_FREE(a)) { if (++n_free >= n_blocks) { i = i * BLOCKS_PER_ATB + 1; goto found; } } else { n_free = 0; }
+                if (ATB_2_IS_FREE(a)) { if (++n_free >= n_blocks) { i = i * BLOCKS_PER_ATB + 2; goto found; } } else { n_free = 0; }
+                if (ATB_3_IS_FREE(a)) { if (++n_free >= n_blocks) { i = i * BLOCKS_PER_ATB + 3; goto found; } } else { n_free = 0; }
+                // *FORMAT-ON*
+            }
+
+            // No free blocks found on this heap. Mark this heap as
+            // filled, so we won't try to find free space here again until
+            // space is freed.
+            #if MICROPY_GC_SPLIT_HEAP
+            if (n_blocks == 1) {
+                area->gc_last_free_atb_index = (i + 1) / BLOCKS_PER_ATB; // or (size_t)-1
+            }
+            #endif
         }
 
         GC_EXIT();
@@ -520,21 +629,24 @@ void *gc_alloc(size_t n_bytes, unsigned int alloc_flags) {
     // before this one.  Also, whenever we free or shink a block we must check
     // if this index needs adjusting (see gc_realloc and gc_free).
     if (n_free == 1) {
-        MP_STATE_MEM(gc_last_free_atb_index) = (i + 1) / BLOCKS_PER_ATB;
+        #if MICROPY_GC_SPLIT_HEAP
+        MP_STATE_MEM(gc_last_free_area) = area;
+        #endif
+        area->gc_last_free_atb_index = (i + 1) / BLOCKS_PER_ATB;
     }
 
     // mark first block as used head
-    ATB_FREE_TO_HEAD(start_block);
+    ATB_FREE_TO_HEAD(area, start_block);
 
     // mark rest of blocks as used tail
     // TODO for a run of many blocks can make this more efficient
     for (size_t bl = start_block + 1; bl <= end_block; bl++) {
-        ATB_FREE_TO_TAIL(bl);
+        ATB_FREE_TO_TAIL(area, bl);
     }
 
     // get pointer to first block
     // we must create this pointer before unlocking the GC so a collection can find it
-    void *ret_ptr = (void *)(MP_STATE_MEM(gc_pool_start) + start_block * BYTES_PER_BLOCK);
+    void *ret_ptr = (void *)(area->gc_pool_start + start_block * BYTES_PER_BLOCK);
     DEBUG_printf("gc_alloc(%p)\n", ret_ptr);
 
     #if MICROPY_GC_ALLOC_THRESHOLD
@@ -561,7 +673,7 @@ void *gc_alloc(size_t n_bytes, unsigned int alloc_flags) {
         ((mp_obj_base_t *)ret_ptr)->type = NULL;
         // set mp_obj flag only if it has a finaliser
         GC_ENTER();
-        FTB_SET(start_block);
+        FTB_SET(area, start_block);
         GC_EXIT();
     }
     #else
@@ -598,46 +710,65 @@ void gc_free(void *ptr) {
     DEBUG_printf("gc_free(%p)\n", ptr);
 
     if (ptr == NULL) {
+        // free(NULL) is a no-op
         GC_EXIT();
-    } else {
-        // get the GC block number corresponding to this pointer
-        assert(VERIFY_PTR(ptr));
-        size_t block = BLOCK_FROM_PTR(ptr);
-        assert(ATB_GET_KIND(block) == AT_HEAD);
-
-        #if MICROPY_ENABLE_FINALISER
-        FTB_CLEAR(block);
-        #endif
+        return;
+    }
 
-        // set the last_free pointer to this block if it's earlier in the heap
-        if (block / BLOCKS_PER_ATB < MP_STATE_MEM(gc_last_free_atb_index)) {
-            MP_STATE_MEM(gc_last_free_atb_index) = block / BLOCKS_PER_ATB;
-        }
+    // get the GC block number corresponding to this pointer
+    mp_state_mem_area_t *area = gc_get_ptr_area(ptr);
+    assert(area);
+    size_t block = BLOCK_FROM_PTR(area, ptr);
+    assert(ATB_GET_KIND(area, block) == AT_HEAD);
 
-        // free head and all of its tail blocks
-        do {
-            ATB_ANY_TO_FREE(block);
-            block += 1;
-        } while (ATB_GET_KIND(block) == AT_TAIL);
+    #if MICROPY_ENABLE_FINALISER
+    FTB_CLEAR(area, block);
+    #endif
 
-        GC_EXIT();
+    #if MICROPY_GC_SPLIT_HEAP
+    if (MP_STATE_MEM(gc_last_free_area) != area) {
+        // We freed something but it isn't the current area. Reset the
+        // last free area to the start for a rescan. Note that this won't
+        // give much of a performance hit, since areas that are completely
+        // filled will likely be skipped (the gc_last_free_atb_index
+        // points to the last block).
+        // The reason why this is necessary is because it is not possible
+        // to see which area came first (like it is possible to adjust
+        // gc_last_free_atb_index based on whether the freed block is
+        // before the last free block).
+        MP_STATE_MEM(gc_last_free_area) = &MP_STATE_MEM(area);
+    }
+    #endif
 
-        #if EXTENSIVE_HEAP_PROFILING
-        gc_dump_alloc_table();
-        #endif
+    // set the last_free pointer to this block if it's earlier in the heap
+    if (block / BLOCKS_PER_ATB < area->gc_last_free_atb_index) {
+        area->gc_last_free_atb_index = block / BLOCKS_PER_ATB;
     }
+
+    // free head and all of its tail blocks
+    do {
+        ATB_ANY_TO_FREE(area, block);
+        block += 1;
+    } while (ATB_GET_KIND(area, block) == AT_TAIL);
+
+    GC_EXIT();
+
+    #if EXTENSIVE_HEAP_PROFILING
+    gc_dump_alloc_table();
+    #endif
 }
 
 size_t gc_nbytes(const void *ptr) {
     GC_ENTER();
-    if (VERIFY_PTR(ptr)) {
-        size_t block = BLOCK_FROM_PTR(ptr);
-        if (ATB_GET_KIND(block) == AT_HEAD) {
+    mp_state_mem_area_t *area = gc_get_ptr_area(ptr);
+    if (area) {
+        size_t block = BLOCK_FROM_PTR(area, ptr);
+        if (ATB_GET_KIND(area, block) == AT_HEAD) {
             // work out number of consecutive blocks in the chain starting with this on
             size_t n_blocks = 0;
             do {
                 n_blocks += 1;
-            } while (ATB_GET_KIND(block + n_blocks) == AT_TAIL);
+            } while (ATB_GET_KIND(area, block + n_blocks) == AT_TAIL);
             GC_EXIT();
             return n_blocks * BYTES_PER_BLOCK;
         }
@@ -698,9 +829,10 @@ void *gc_realloc(void *ptr_in, size_t n_bytes, bool allow_move) {
     GC_ENTER();
 
     // get the GC block number corresponding to this pointer
-    assert(VERIFY_PTR(ptr));
-    size_t block = BLOCK_FROM_PTR(ptr);
-    assert(ATB_GET_KIND(block) == AT_HEAD);
+    mp_state_mem_area_t *area = gc_get_ptr_area(ptr);
+    assert(area);
+    size_t block = BLOCK_FROM_PTR(area, ptr);
+    assert(ATB_GET_KIND(area, block) == AT_HEAD);
 
     // compute number of new blocks that are requested
     size_t new_blocks = (n_bytes + BYTES_PER_BLOCK - 1) / BYTES_PER_BLOCK;
@@ -713,9 +845,9 @@ void *gc_realloc(void *ptr_in, size_t n_bytes, bool allow_move) {
     // efficiently shrink it (see below for shrinking code).
     size_t n_free = 0;
     size_t n_blocks = 1; // counting HEAD block
-    size_t max_block = MP_STATE_MEM(gc_alloc_table_byte_len) * BLOCKS_PER_ATB;
+    size_t max_block = area->gc_alloc_table_byte_len * BLOCKS_PER_ATB;
     for (size_t bl = block + n_blocks; bl < max_block; bl++) {
-        byte block_type = ATB_GET_KIND(bl);
+        byte block_type = ATB_GET_KIND(area, bl);
         if (block_type == AT_TAIL) {
             n_blocks++;
             continue;
@@ -741,12 +873,19 @@ void *gc_realloc(void *ptr_in, size_t n_bytes, bool allow_move) {
     if (new_blocks < n_blocks) {
         // free unneeded tail blocks
         for (size_t bl = block + new_blocks, count = n_blocks - new_blocks; count > 0; bl++, count--) {
-            ATB_ANY_TO_FREE(bl);
+            ATB_ANY_TO_FREE(area, bl);
         }
 
+        #if MICROPY_GC_SPLIT_HEAP
+        if (MP_STATE_MEM(gc_last_free_area) != area) {
+            // See comment in gc_free.
+            MP_STATE_MEM(gc_last_free_area) = &MP_STATE_MEM(area);
+        }
+        #endif
+
         // set the last_free pointer to end of this block if it's earlier in the heap
-        if ((block + new_blocks) / BLOCKS_PER_ATB < MP_STATE_MEM(gc_last_free_atb_index)) {
-            MP_STATE_MEM(gc_last_free_atb_index) = (block + new_blocks) / BLOCKS_PER_ATB;
+        if ((block + new_blocks) / BLOCKS_PER_ATB < area->gc_last_free_atb_index) {
+            area->gc_last_free_atb_index = (block + new_blocks) / BLOCKS_PER_ATB;
         }
 
         GC_EXIT();
@@ -762,8 +901,8 @@ void *gc_realloc(void *ptr_in, size_t n_bytes, bool allow_move) {
     if (new_blocks <= n_blocks + n_free) {
         // mark few more blocks as used tail
         for (size_t bl = block + n_blocks; bl < block + new_blocks; bl++) {
-            assert(ATB_GET_KIND(bl) == AT_FREE);
-            ATB_FREE_TO_TAIL(bl);
+            assert(ATB_GET_KIND(area, bl) == AT_FREE);
+            ATB_FREE_TO_TAIL(area, bl);
         }
 
         GC_EXIT();
@@ -784,7 +923,7 @@ void *gc_realloc(void *ptr_in, size_t n_bytes, bool allow_move) {
     }
 
     #if MICROPY_ENABLE_FINALISER
-    bool ftb_state = FTB_GET(block);
+    bool ftb_state = FTB_GET(area, block);
     #else
     bool ftb_state = false;
     #endif
@@ -823,129 +962,131 @@ void gc_dump_info(void) {
 void gc_dump_alloc_table(void) {
     GC_ENTER();
     static const size_t DUMP_BYTES_PER_LINE = 64;
-    #if !EXTENSIVE_HEAP_PROFILING
-    // When comparing heap output we don't want to print the starting
-    // pointer of the heap because it changes from run to run.
-    mp_printf(&mp_plat_print, "GC memory layout; from %p:", MP_STATE_MEM(gc_pool_start));
-    #endif
-    for (size_t bl = 0; bl < MP_STATE_MEM(gc_alloc_table_byte_len) * BLOCKS_PER_ATB; bl++) {
-        if (bl % DUMP_BYTES_PER_LINE == 0) {
-            // a new line of blocks
-            {
-                // check if this line contains only free blocks
-                size_t bl2 = bl;
-                while (bl2 < MP_STATE_MEM(gc_alloc_table_byte_len) * BLOCKS_PER_ATB && ATB_GET_KIND(bl2) == AT_FREE) {
-                    bl2++;
-                }
-                if (bl2 - bl >= 2 * DUMP_BYTES_PER_LINE) {
-                    // there are at least 2 lines containing only free blocks, so abbreviate their printing
-                    mp_printf(&mp_plat_print, "\n       (%u lines all free)", (uint)(bl2 - bl) / DUMP_BYTES_PER_LINE);
-                    bl = bl2 & (~(DUMP_BYTES_PER_LINE - 1));
-                    if (bl >= MP_STATE_MEM(gc_alloc_table_byte_len) * BLOCKS_PER_ATB) {
-                        // got to end of heap
-                        break;
-                    }
-                }
-            }
-            // print header for new line of blocks
-            // (the cast to uint32_t is for 16-bit ports)
-            // mp_printf(&mp_plat_print, "\n%05x: ", (uint)(PTR_FROM_BLOCK(bl) & (uint32_t)0xfffff));
-            mp_printf(&mp_plat_print, "\n%05x: ", (uint)((bl * BYTES_PER_BLOCK) & (uint32_t)0xfffff));
-        }
-        int c = ' ';
-        switch (ATB_GET_KIND(bl)) {
-            case AT_FREE:
-                c = '.';
-                break;
-            /* this prints out if the object is reachable from BSS or STACK (for unix only)
-            case AT_HEAD: {
-                c = 'h';
-                void **ptrs = (void**)(void*)&mp_state_ctx;
-                mp_uint_t len = offsetof(mp_state_ctx_t, vm.stack_top) / sizeof(mp_uint_t);
-                for (mp_uint_t i = 0; i < len; i++) {
-                    mp_uint_t ptr = (mp_uint_t)ptrs[i];
-                    if (VERIFY_PTR(ptr) && BLOCK_FROM_PTR(ptr) == bl) {
-                        c = 'B';
-                        break;
+    for (mp_state_mem_area_t *area = &MP_STATE_MEM(area); area != NULL; area = NEXT_AREA(area)) {
+        #if !EXTENSIVE_HEAP_PROFILING
+        // When comparing heap output we don't want to print the starting
+        // pointer of the heap because it changes from run to run.
+        mp_printf(&mp_plat_print, "GC memory layout; from %p:", area->gc_pool_start);
+        #endif
+        for (size_t bl = 0; bl < area->gc_alloc_table_byte_len * BLOCKS_PER_ATB; bl++) {
+            if (bl % DUMP_BYTES_PER_LINE == 0) {
+                // a new line of blocks
+                {
+                    // check if this line contains only free blocks
+                    size_t bl2 = bl;
+                    while (bl2 < area->gc_alloc_table_byte_len * BLOCKS_PER_ATB && ATB_GET_KIND(area, bl2) == AT_FREE) {
+                        bl2++;
                     }
-                }
-                if (c == 'h') {
-                    ptrs = (void**)&c;
-                    len = ((mp_uint_t)MP_STATE_THREAD(stack_top) - (mp_uint_t)&c) / sizeof(mp_uint_t);
-                    for (mp_uint_t i = 0; i < len; i++) {
-                        mp_uint_t ptr = (mp_uint_t)ptrs[i];
-                        if (VERIFY_PTR(ptr) && BLOCK_FROM_PTR(ptr) == bl) {
-                            c = 'S';
+                    if (bl2 - bl >= 2 * DUMP_BYTES_PER_LINE) {
+                        // there are at least 2 lines containing only free blocks, so abbreviate their printing
+                        mp_printf(&mp_plat_print, "\n       (%u lines all free)", (uint)(bl2 - bl) / DUMP_BYTES_PER_LINE);
+                        bl = bl2 & (~(DUMP_BYTES_PER_LINE - 1));
+                        if (bl >= area->gc_alloc_table_byte_len * BLOCKS_PER_ATB) {
+                            // got to end of heap
                             break;
                         }
                     }
                 }
-                break;
+                // print header for new line of blocks
+                // (the cast to uint32_t is for 16-bit ports)
+                // mp_printf(&mp_plat_print, "\n%05x: ", (uint)(PTR_FROM_BLOCK(area, bl) & (uint32_t)0xfffff));
+                mp_printf(&mp_plat_print, "\n%05x: ", (uint)((bl * BYTES_PER_BLOCK) & (uint32_t)0xfffff));
             }
-            */
-            /* this prints the uPy object type of the head block */
-            case AT_HEAD: {
-                void **ptr = (void **)(MP_STATE_MEM(gc_pool_start) + bl * BYTES_PER_BLOCK);
-                if (*ptr == &mp_type_tuple) {
-                    c = 'T';
-                } else if (*ptr == &mp_type_list) {
-                    c = 'L';
-                } else if (*ptr == &mp_type_dict) {
-                    c = 'D';
-                } else if (*ptr == &mp_type_str || *ptr == &mp_type_bytes) {
-                    c = 'S';
-                }
-                #if MICROPY_PY_BUILTINS_BYTEARRAY
-                else if (*ptr == &mp_type_bytearray) {
-                    c = 'A';
-                }
-                #endif
-                #if MICROPY_PY_ARRAY
-                else if (*ptr == &mp_type_array) {
-                    c = 'A';
-                }
-                #endif
-                #if MICROPY_PY_BUILTINS_FLOAT
-                else if (*ptr == &mp_type_float) {
-                    c = 'F';
-                }
-                #endif
-                else if (*ptr == &mp_type_fun_bc) {
-                    c = 'B';
-                } else if (*ptr == &mp_type_module) {
-                    c = 'M';
-                } else {
+            int c = ' ';
+            switch (ATB_GET_KIND(area, bl)) {
+                case AT_FREE:
+                    c = '.';
+                    break;
+                /* this prints out if the object is reachable from BSS or STACK (for unix only)
+                case AT_HEAD: {
                     c = 'h';
-                    #if 0
-                    // This code prints "Q" for qstr-pool data, and "q" for qstr-str
-                    // data.  It can be useful to see how qstrs are being allocated,
-                    // but is disabled by default because it is very slow.
-                    for (const qstr_pool_t *pool = MP_STATE_VM(last_pool); c == 'h' && pool != NULL; pool = pool->prev) {
-                        if ((const qstr_pool_t *)ptr == pool) {
-                            c = 'Q';
+                    void **ptrs = (void**)(void*)&mp_state_ctx;
+                    mp_uint_t len = offsetof(mp_state_ctx_t, vm.stack_top) / sizeof(mp_uint_t);
+                    for (mp_uint_t i = 0; i < len; i++) {
+                        mp_uint_t ptr = (mp_uint_t)ptrs[i];
+                        if (gc_get_ptr_area(ptr) && BLOCK_FROM_PTR(ptr) == bl) {
+                            c = 'B';
                             break;
                         }
-                        for (const char *const *q = pool->qstrs, *const *q_top = pool->qstrs + pool->len; q < q_top; q++) {
-                            if ((const char *)ptr == *q) {
-                                c = 'q';
+                    }
+                    if (c == 'h') {
+                        ptrs = (void**)&c;
+                        len = ((mp_uint_t)MP_STATE_THREAD(stack_top) - (mp_uint_t)&c) / sizeof(mp_uint_t);
+                        for (mp_uint_t i = 0; i < len; i++) {
+                            mp_uint_t ptr = (mp_uint_t)ptrs[i];
+                            if (gc_get_ptr_area(ptr) && BLOCK_FROM_PTR(ptr) == bl) {
+                                c = 'S';
                                 break;
                             }
                         }
                     }
+                    break;
+                }
+                */
+                /* this prints the uPy object type of the head block */
+                case AT_HEAD: {
+                    void **ptr = (void **)(area->gc_pool_start + bl * BYTES_PER_BLOCK);
+                    if (*ptr == &mp_type_tuple) {
+                        c = 'T';
+                    } else if (*ptr == &mp_type_list) {
+                        c = 'L';
+                    } else if (*ptr == &mp_type_dict) {
+                        c = 'D';
+                    } else if (*ptr == &mp_type_str || *ptr == &mp_type_bytes) {
+                        c = 'S';
+                    }
+                    #if MICROPY_PY_BUILTINS_BYTEARRAY
+                    else if (*ptr == &mp_type_bytearray) {
+                        c = 'A';
+                    }
                     #endif
+                    #if MICROPY_PY_ARRAY
+                    else if (*ptr == &mp_type_array) {
+                        c = 'A';
+                    }
+                    #endif
+                    #if MICROPY_PY_BUILTINS_FLOAT
+                    else if (*ptr == &mp_type_float) {
+                        c = 'F';
+                    }
+                    #endif
+                    else if (*ptr == &mp_type_fun_bc) {
+                        c = 'B';
+                    } else if (*ptr == &mp_type_module) {
+                        c = 'M';
+                    } else {
+                        c = 'h';
+                        #if 0
+                        // This code prints "Q" for qstr-pool data, and "q" for qstr-str
+                        // data.  It can be useful to see how qstrs are being allocated,
+                        // but is disabled by default because it is very slow.
+                        for (qstr_pool_t *pool = MP_STATE_VM(last_pool); c == 'h' && pool != NULL; pool = pool->prev) {
+                            if ((qstr_pool_t *)ptr == pool) {
+                                c = 'Q';
+                                break;
+                            }
+                            for (const byte **q = pool->qstrs, **q_top = pool->qstrs + pool->len; q < q_top; q++) {
+                                if ((const byte *)ptr == *q) {
+                                    c = 'q';
+                                    break;
+                                }
+                            }
+                        }
+                        #endif
+                    }
+                    break;
                 }
-                break;
+                case AT_TAIL:
+                    c = '=';
+                    break;
+                case AT_MARK:
+                    c = 'm';
+                    break;
             }
-            case AT_TAIL:
-                c = '=';
-                break;
-            case AT_MARK:
-                c = 'm';
-                break;
+            mp_printf(&mp_plat_print, "%c", c);
         }
-        mp_printf(&mp_plat_print, "%c", c);
+        mp_print_str(&mp_plat_print, "\n");
     }
-    mp_print_str(&mp_plat_print, "\n");
     GC_EXIT();
 }
 
diff --git a/py/gc.h b/py/gc.h
index 5aef27c006b93..bb4204b06f433 100644
--- a/py/gc.h
+++ b/py/gc.h
@@ -28,9 +28,15 @@
 
 #include <stdbool.h>
 #include <stddef.h>
+#include "py/mpconfig.h"
 
 void gc_init(void *start, void *end);
 
+#if MICROPY_GC_SPLIT_HEAP
+// Used to add additional memory areas to the heap.
+void gc_add(void *start, void *end);
+#endif
+
 // These lock/unlock functions can be nested.
 // They can be used to prevent the GC from allocating/freeing.
 void gc_lock(void);
diff --git a/py/mpconfig.h b/py/mpconfig.h
index ee0123be34ea3..25f37ff8b3a2c 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -606,6 +606,11 @@
 #define MICROPY_ENABLE_GC (0)
 #endif
 
+// Whether the garbage-collected heap can be split over multiple memory areas.
+#ifndef MICROPY_GC_SPLIT_HEAP
+#define MICROPY_GC_SPLIT_HEAP (0)
+#endif
+
 // Hook to run code during time consuming garbage collector operations
 #ifndef MICROPY_GC_HOOK_LOOP
 #define MICROPY_GC_HOOK_LOOP
diff --git a/py/mpstate.h b/py/mpstate.h
index 1b6e623ca9f63..ea069c24dd1bb 100644
--- a/py/mpstate.h
+++ b/py/mpstate.h
@@ -71,12 +71,11 @@ typedef struct _mp_sched_item_t {
     mp_obj_t arg;
 } mp_sched_item_t;
 
-// This structure hold information about the memory allocation system.
-typedef struct _mp_state_mem_t {
-    #if MICROPY_MEM_STATS
-    size_t total_bytes_allocated;
-    size_t current_bytes_allocated;
-    size_t peak_bytes_allocated;
+// This structure holds information about a single contiguous area of
+// memory reserved for the memory manager.
+typedef struct _mp_state_mem_area_t {
+    #if MICROPY_GC_SPLIT_HEAP
+    struct _mp_state_mem_area_t *next;
     #endif
 
     byte *gc_alloc_table_start;
@@ -87,8 +86,30 @@ typedef struct _mp_state_mem_t {
     byte *gc_pool_start;
     byte *gc_pool_end;
 
+    size_t gc_last_free_atb_index;
+} mp_state_mem_area_t;
+
+// This structure holds a single stacked block and the area it is on. Used
+// during garbage collection.
+typedef struct {
+    #if MICROPY_GC_SPLIT_HEAP
+    mp_state_mem_area_t *area;
+    #endif
+    size_t block;
+} mp_gc_stack_item_t;
+
+// This structure hold information about the memory allocation system.
+typedef struct _mp_state_mem_t {
+    #if MICROPY_MEM_STATS
+    size_t total_bytes_allocated;
+    size_t current_bytes_allocated;
+    size_t peak_bytes_allocated;
+    #endif
+
+    mp_state_mem_area_t area;
+
     int gc_stack_overflow;
-    MICROPY_GC_STACK_ENTRY_TYPE gc_stack[MICROPY_ALLOC_GC_STACK_SIZE];
+    mp_gc_stack_item_t gc_stack[MICROPY_ALLOC_GC_STACK_SIZE];
 
     // This variable controls auto garbage collection.  If set to 0 then the
     // GC won't automatically run when gc_alloc can't find enough blocks.  But
@@ -100,7 +121,9 @@ typedef struct _mp_state_mem_t {
     size_t gc_alloc_threshold;
     #endif
 
-    size_t gc_last_free_atb_index;
+    #if MICROPY_GC_SPLIT_HEAP
+    mp_state_mem_area_t *gc_last_free_area;
+    #endif
 
     #if MICROPY_PY_GC_COLLECT_RETVAL
     size_t gc_collected;

From 4a48531803843f53caf2b535da7ff3bb2a802106 Mon Sep 17 00:00:00 2001
From: Rob Knegjens <rob@knegjens.net>
Date: Tue, 12 Apr 2022 21:26:16 -0700
Subject: [PATCH 2399/3533] py/gc: Reduce code size when MICROPY_GC_SPLIT_HEAP
 is disabled.

Use C macros to reduce the size of firmware images when the GC split-heap
feature is disabled.

The code size difference of this commit versus HEAD~2 (ie the commit prior
to MICROPY_GC_SPLIT_HEAP being introduced) when split-heap is disabled is:

       bare-arm:    +0 +0.000%
    minimal x86:    +0 +0.000%
       unix x64:   -16 -0.003%
    unix nanbox:   -20 -0.004%
          stm32:    -8 -0.002% PYBV10
         cc3200:    +0 +0.000%
        esp8266:    +8 +0.001% GENERIC
          esp32:    +0 +0.000% GENERIC
            nrf:   -20 -0.011% pca10040
            rp2:    +0 +0.000% PICO
           samd:    -4 -0.003% ADAFRUIT_ITSYBITSY_M4_EXPRESS

The code size difference of this commit versus HEAD~2 split-heap is enabled
with MICROPY_GC_MULTIHEAP=1 (but no extra code to add more heaps):

    unix x64: +1032 +0.197% [incl +544(bss)]
       esp32:  +592 +0.039% GENERIC[incl +16(data) +264(bss)]
---
 py/gc.c      | 119 ++++++++++++++++++++++++++++++++++++---------------
 py/mpstate.h |  15 +++----
 2 files changed, 90 insertions(+), 44 deletions(-)

diff --git a/py/gc.c b/py/gc.c
index 93e83aaad5b89..120213783b2cd 100644
--- a/py/gc.c
+++ b/py/gc.c
@@ -230,6 +230,7 @@ bool gc_is_locked(void) {
     return MP_STATE_THREAD(gc_lock_depth) != 0;
 }
 
+#if MICROPY_GC_SPLIT_HEAP
 // Returns the area to which this pointer belongs, or NULL if it isn't
 // allocated on the GC-managed heap.
 STATIC inline mp_state_mem_area_t *gc_get_ptr_area(const void *ptr) {
@@ -244,6 +245,14 @@ STATIC inline mp_state_mem_area_t *gc_get_ptr_area(const void *ptr) {
     }
     return NULL;
 }
+#endif
+
+// ptr should be of type void*
+#define VERIFY_PTR(ptr) ( \
+    ((uintptr_t)(ptr) & (BYTES_PER_BLOCK - 1)) == 0          /* must be aligned on a block */ \
+    && ptr >= (void *)MP_STATE_MEM(area).gc_pool_start      /* must be above start of pool */ \
+    && ptr < (void *)MP_STATE_MEM(area).gc_pool_end         /* must be below end of pool */ \
+    )
 
 #ifndef TRACE_MARK
 #if DEBUG_PRINT
@@ -257,18 +266,20 @@ STATIC inline mp_state_mem_area_t *gc_get_ptr_area(const void *ptr) {
 // children: mark the unmarked child blocks and put those newly marked
 // blocks on the stack. When all children have been checked, pop off the
 // topmost block on the stack and repeat with that one.
-STATIC void gc_mark_subtree(mp_gc_stack_item_t item) {
-    // Start with the item passed in the argument.
+#if MICROPY_GC_SPLIT_HEAP
+STATIC void gc_mark_subtree(mp_state_mem_area_t *area, size_t block)
+#else
+STATIC void gc_mark_subtree(size_t block)
+#endif
+{
+    // Start with the block passed in the argument.
     size_t sp = 0;
     for (;;) {
         MICROPY_GC_HOOK_LOOP
 
-        #if MICROPY_GC_SPLIT_HEAP
-        mp_state_mem_area_t *area = item.area;
-        #else
-        mp_state_mem_area_t *area = &MP_STATE_MEM(area);
+        #if !MICROPY_GC_SPLIT_HEAP
+        mp_state_mem_area_t * area = &MP_STATE_MEM(area);
         #endif
-        size_t block = item.block;
 
         // work out number of consecutive blocks in the chain starting with this one
         size_t n_blocks = 0;
@@ -283,11 +294,18 @@ STATIC void gc_mark_subtree(mp_gc_stack_item_t item) {
             void *ptr = *ptrs;
             // If this is a heap pointer that hasn't been marked, mark it and push
             // it's children to the stack.
+            #if MICROPY_GC_SPLIT_HEAP
             mp_state_mem_area_t *ptr_area = gc_get_ptr_area(ptr);
             if (!ptr_area) {
                 // Not a heap-allocated pointer (might even be random data).
                 continue;
             }
+            #else
+            if (!VERIFY_PTR(ptr)) {
+                continue;
+            }
+            mp_state_mem_area_t *ptr_area = area;
+            #endif
             size_t ptr_block = BLOCK_FROM_PTR(ptr_area, ptr);
             if (ATB_GET_KIND(ptr_area, ptr_block) != AT_HEAD) {
                 // This block is already marked.
@@ -297,24 +315,27 @@ STATIC void gc_mark_subtree(mp_gc_stack_item_t item) {
             TRACE_MARK(ptr_block, ptr);
             ATB_HEAD_TO_MARK(ptr_area, ptr_block);
             if (sp < MICROPY_ALLOC_GC_STACK_SIZE) {
+                MP_STATE_MEM(gc_block_stack)[sp] = ptr_block;
                 #if MICROPY_GC_SPLIT_HEAP
-                mp_gc_stack_item_t ptr_item = {ptr_area, ptr_block};
-                #else
-                mp_gc_stack_item_t ptr_item = {ptr_block};
+                MP_STATE_MEM(gc_area_stack)[sp] = ptr_area;
                 #endif
-                MP_STATE_MEM(gc_stack)[sp++] = ptr_item;
+                sp += 1;
             } else {
                 MP_STATE_MEM(gc_stack_overflow) = 1;
             }
         }
 
-        // Are there any items on the stack?
+        // Are there any blocks on the stack?
         if (sp == 0) {
             break; // No, stack is empty, we're done.
         }
 
-        // pop the next item off the stack
-        item = MP_STATE_MEM(gc_stack)[--sp];
+        // pop the next block off the stack
+        sp -= 1;
+        block = MP_STATE_MEM(gc_block_stack)[sp];
+        #if MICROPY_GC_SPLIT_HEAP
+        area = MP_STATE_MEM(gc_area_stack)[sp];
+        #endif
     }
 }
 
@@ -329,13 +350,10 @@ STATIC void gc_deal_with_stack_overflow(void) {
                 // trace (again) if mark bit set
                 if (ATB_GET_KIND(area, block) == AT_MARK) {
                     #if MICROPY_GC_SPLIT_HEAP
-                    mp_gc_stack_item_t item = {area, block};
+                    gc_mark_subtree(area, block);
                     #else
-                    mp_gc_stack_item_t item = {block};
+                    gc_mark_subtree(block);
                     #endif
-                    // *MP_STATE_MEM(gc_sp)++ = item;
-                    // gc_drain_stack();
-                    gc_mark_subtree(item);
                 }
             }
         }
@@ -435,22 +453,31 @@ static void *gc_get_ptr(void **ptrs, int i) {
 }
 
 void gc_collect_root(void **ptrs, size_t len) {
+    #if !MICROPY_GC_SPLIT_HEAP
+    mp_state_mem_area_t *area = &MP_STATE_MEM(area);
+    #endif
     for (size_t i = 0; i < len; i++) {
         MICROPY_GC_HOOK_LOOP
         void *ptr = gc_get_ptr(ptrs, i);
+        #if MICROPY_GC_SPLIT_HEAP
         mp_state_mem_area_t *area = gc_get_ptr_area(ptr);
-        if (area) {
-            size_t block = BLOCK_FROM_PTR(area, ptr);
-            if (ATB_GET_KIND(area, block) == AT_HEAD) {
-                // An unmarked head: mark it, and mark all its children
-                ATB_HEAD_TO_MARK(area, block);
-                #if MICROPY_GC_SPLIT_HEAP
-                mp_gc_stack_item_t item = {area, block};
-                #else
-                mp_gc_stack_item_t item = {block};
-                #endif
-                gc_mark_subtree(item);
-            }
+        if (!area) {
+            continue;
+        }
+        #else
+        if (!VERIFY_PTR(ptr)) {
+            continue;
+        }
+        #endif
+        size_t block = BLOCK_FROM_PTR(area, ptr);
+        if (ATB_GET_KIND(area, block) == AT_HEAD) {
+            // An unmarked head: mark it, and mark all its children
+            ATB_HEAD_TO_MARK(area, block);
+            #if MICROPY_GC_SPLIT_HEAP
+            gc_mark_subtree(area, block);
+            #else
+            gc_mark_subtree(block);
+            #endif
         }
     }
 }
@@ -716,8 +743,15 @@ void gc_free(void *ptr) {
     }
 
     // get the GC block number corresponding to this pointer
-    mp_state_mem_area_t *area = gc_get_ptr_area(ptr);
+    mp_state_mem_area_t *area;
+    #if MICROPY_GC_SPLIT_HEAP
+    area = gc_get_ptr_area(ptr);
     assert(area);
+    #else
+    assert(VERIFY_PTR(ptr));
+    area = &MP_STATE_MEM(area);
+    #endif
+
     size_t block = BLOCK_FROM_PTR(area, ptr);
     assert(ATB_GET_KIND(area, block) == AT_HEAD);
 
@@ -760,7 +794,18 @@ void gc_free(void *ptr) {
 
 size_t gc_nbytes(const void *ptr) {
     GC_ENTER();
-    mp_state_mem_area_t *area = gc_get_ptr_area(ptr);
+
+    mp_state_mem_area_t *area;
+    #if MICROPY_GC_SPLIT_HEAP
+    area = gc_get_ptr_area(ptr);
+    #else
+    if (VERIFY_PTR(ptr)) {
+        area = &MP_STATE_MEM(area);
+    } else {
+        area = NULL;
+    }
+    #endif
+
     if (area) {
         size_t block = BLOCK_FROM_PTR(area, ptr);
         if (ATB_GET_KIND(area, block) == AT_HEAD) {
@@ -829,8 +874,14 @@ void *gc_realloc(void *ptr_in, size_t n_bytes, bool allow_move) {
     GC_ENTER();
 
     // get the GC block number corresponding to this pointer
-    mp_state_mem_area_t *area = gc_get_ptr_area(ptr);
+    mp_state_mem_area_t *area;
+    #if MICROPY_GC_SPLIT_HEAP
+    area = gc_get_ptr_area(ptr);
     assert(area);
+    #else
+    assert(VERIFY_PTR(ptr));
+    area = &MP_STATE_MEM(area);
+    #endif
     size_t block = BLOCK_FROM_PTR(area, ptr);
     assert(ATB_GET_KIND(area, block) == AT_HEAD);
 
diff --git a/py/mpstate.h b/py/mpstate.h
index ea069c24dd1bb..ba47c7648235b 100644
--- a/py/mpstate.h
+++ b/py/mpstate.h
@@ -89,15 +89,6 @@ typedef struct _mp_state_mem_area_t {
     size_t gc_last_free_atb_index;
 } mp_state_mem_area_t;
 
-// This structure holds a single stacked block and the area it is on. Used
-// during garbage collection.
-typedef struct {
-    #if MICROPY_GC_SPLIT_HEAP
-    mp_state_mem_area_t *area;
-    #endif
-    size_t block;
-} mp_gc_stack_item_t;
-
 // This structure hold information about the memory allocation system.
 typedef struct _mp_state_mem_t {
     #if MICROPY_MEM_STATS
@@ -109,7 +100,11 @@ typedef struct _mp_state_mem_t {
     mp_state_mem_area_t area;
 
     int gc_stack_overflow;
-    mp_gc_stack_item_t gc_stack[MICROPY_ALLOC_GC_STACK_SIZE];
+    MICROPY_GC_STACK_ENTRY_TYPE gc_block_stack[MICROPY_ALLOC_GC_STACK_SIZE];
+    #if MICROPY_GC_SPLIT_HEAP
+    // Array that tracks the area for each block on gc_block_stack.
+    mp_state_mem_area_t *gc_area_stack[MICROPY_ALLOC_GC_STACK_SIZE];
+    #endif
 
     // This variable controls auto garbage collection.  If set to 0 then the
     // GC won't automatically run when gc_alloc can't find enough blocks.  But

From d2e4cf00ccec432ccd38adea78099887ac578882 Mon Sep 17 00:00:00 2001
From: Rob Knegjens <rob@knegjens.net>
Date: Wed, 13 Apr 2022 09:52:22 -0700
Subject: [PATCH 2400/3533] unix: Enable MICROPY_GC_SPLIT_HEAP on coverage
 build.

With a new option to evenly split the GC heap over multiple areas.  This
adds code coverage for gc_add() and code associated with
MICROPY_GC_SPLIT_HEAP.
---
 ports/unix/main.c                             | 20 +++++++++++++++++++
 ports/unix/mpconfigport.h                     |  4 ++++
 .../unix/variants/coverage/mpconfigvariant.h  |  2 ++
 3 files changed, 26 insertions(+)

diff --git a/ports/unix/main.c b/ports/unix/main.c
index e7048dd712b81..0b27a1f5f5c8e 100644
--- a/ports/unix/main.c
+++ b/ports/unix/main.c
@@ -477,8 +477,22 @@ MP_NOINLINE int main_(int argc, char **argv) {
     pre_process_options(argc, argv);
 
     #if MICROPY_ENABLE_GC
+    #if !MICROPY_GC_SPLIT_HEAP
     char *heap = malloc(heap_size);
     gc_init(heap, heap + heap_size);
+    #else
+    assert(MICROPY_GC_SPLIT_HEAP_N_HEAPS > 0);
+    char *heaps[MICROPY_GC_SPLIT_HEAP_N_HEAPS];
+    long multi_heap_size = heap_size / MICROPY_GC_SPLIT_HEAP_N_HEAPS;
+    for (size_t i = 0; i < MICROPY_GC_SPLIT_HEAP_N_HEAPS; i++) {
+        heaps[i] = malloc(multi_heap_size);
+        if (i == 0) {
+            gc_init(heaps[i], heaps[i] + multi_heap_size);
+        } else {
+            gc_add(heaps[i], heaps[i] + multi_heap_size);
+        }
+    }
+    #endif
     #endif
 
     #if MICROPY_ENABLE_PYSTACK
@@ -729,7 +743,13 @@ MP_NOINLINE int main_(int argc, char **argv) {
     #if MICROPY_ENABLE_GC && !defined(NDEBUG)
     // We don't really need to free memory since we are about to exit the
     // process, but doing so helps to find memory leaks.
+    #if !MICROPY_GC_SPLIT_HEAP
     free(heap);
+    #else
+    for (size_t i = 0; i < MICROPY_GC_SPLIT_HEAP_N_HEAPS; i++) {
+        free(heaps[i]);
+    }
+    #endif
     #endif
 
     // printf("total bytes = %d\n", m_get_total_bytes_allocated());
diff --git a/ports/unix/mpconfigport.h b/ports/unix/mpconfigport.h
index 312c0cce8fbbf..4252a406ce8f6 100644
--- a/ports/unix/mpconfigport.h
+++ b/ports/unix/mpconfigport.h
@@ -120,6 +120,10 @@
     #define MICROPY_EMIT_ARM        (1)
 #endif
 #define MICROPY_ENABLE_GC           (1)
+// Number of heaps to assign if MICROPY_GC_SPLIT_HEAP=1
+#ifndef MICROPY_GC_SPLIT_HEAP_N_HEAPS
+#define MICROPY_GC_SPLIT_HEAP_N_HEAPS (1)
+#endif
 #define MICROPY_MALLOC_USES_ALLOCATED_SIZE (1)
 #define MICROPY_MEM_STATS           (1)
 #define MICROPY_DEBUG_PRINTERS      (1)
diff --git a/ports/unix/variants/coverage/mpconfigvariant.h b/ports/unix/variants/coverage/mpconfigvariant.h
index 30e3a4e5d209f..fb70d791ac9b3 100644
--- a/ports/unix/variants/coverage/mpconfigvariant.h
+++ b/ports/unix/variants/coverage/mpconfigvariant.h
@@ -32,6 +32,8 @@
 
 // Enable additional features.
 #define MICROPY_DEBUG_PARSE_RULE_NAME  (1)
+#define MICROPY_GC_SPLIT_HEAP          (1)
+#define MICROPY_GC_SPLIT_HEAP_N_HEAPS  (4)
 #define MICROPY_TRACKED_ALLOC           (1)
 #define MICROPY_FLOAT_HIGH_QUALITY_HASH (1)
 #define MICROPY_REPL_EMACS_WORDS_MOVE  (1)

From 924e55aca18978215209a2ed81a49b0a6bdcaaa7 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Wed, 20 Jul 2022 12:09:24 +1000
Subject: [PATCH 2401/3533] extmod/webrepl: Allow the page to run from the
 device (over HTTP).

The device will respond to a non-WS request with a simple page that loads
websocket_content.js from a static host (http or https). However, even
if the resources are https, the page is still http and therefore allows
requesting to a WS (not WSS) websocket on the device.

Removed unused client_handshake from websocket_helper, and then merges the
remainder of this file (server_handshake) into webrepl.py (to reduce
firmware size). Also added the respond-as-HTTP handling to
server_handshake.

The default HTTP response is a simple page that sets the base URL and then
loads webrepl_content.js which document.write's the actual HTML.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 extmod/webrepl/manifest.py         |   2 +-
 extmod/webrepl/webrepl.py          | 121 +++++++++++++++++++++++++----
 extmod/webrepl/webrepl_setup.py    |   1 -
 extmod/webrepl/websocket_helper.py |  85 --------------------
 4 files changed, 107 insertions(+), 102 deletions(-)
 delete mode 100644 extmod/webrepl/websocket_helper.py

diff --git a/extmod/webrepl/manifest.py b/extmod/webrepl/manifest.py
index 6eceb3eeb6c56..c504c7305c0fd 100644
--- a/extmod/webrepl/manifest.py
+++ b/extmod/webrepl/manifest.py
@@ -1 +1 @@
-freeze(".", ("webrepl.py", "webrepl_setup.py", "websocket_helper.py"))
+freeze(".", ("webrepl.py", "webrepl_setup.py"))
diff --git a/extmod/webrepl/webrepl.py b/extmod/webrepl/webrepl.py
index 0de813cda18c7..56767d8b71f73 100644
--- a/extmod/webrepl/webrepl.py
+++ b/extmod/webrepl/webrepl.py
@@ -1,14 +1,93 @@
 # This module should be imported from REPL, not run from command line.
-import socket
-import uos
+import binascii
+import hashlib
 import network
-import uwebsocket
-import websocket_helper
+import os
+import socket
+import sys
+import websocket
 import _webrepl
 
 listen_s = None
 client_s = None
 
+DEBUG = 0
+
+_DEFAULT_STATIC_HOST = const("https://micropython.org/webrepl/")
+static_host = _DEFAULT_STATIC_HOST
+
+
+def server_handshake(cl):
+    req = cl.makefile("rwb", 0)
+    # Skip HTTP GET line.
+    l = req.readline()
+    if DEBUG:
+        sys.stdout.write(repr(l))
+
+    webkey = None
+    upgrade = False
+    websocket = False
+
+    while True:
+        l = req.readline()
+        if not l:
+            # EOF in headers.
+            return False
+        if l == b"\r\n":
+            break
+        if DEBUG:
+            sys.stdout.write(l)
+        h, v = [x.strip() for x in l.split(b":", 1)]
+        if DEBUG:
+            print((h, v))
+        if h == b"Sec-WebSocket-Key":
+            webkey = v
+        elif h == b"Connection" and b"Upgrade" in v:
+            upgrade = True
+        elif h == b"Upgrade" and v == b"websocket":
+            websocket = True
+
+    if not (upgrade and websocket and webkey):
+        return False
+
+    if DEBUG:
+        print("Sec-WebSocket-Key:", webkey, len(webkey))
+
+    d = hashlib.sha1(webkey)
+    d.update(b"258EAFA5-E914-47DA-95CA-C5AB0DC85B11")
+    respkey = d.digest()
+    respkey = binascii.b2a_base64(respkey)[:-1]
+    if DEBUG:
+        print("respkey:", respkey)
+
+    cl.send(
+        b"""\
+HTTP/1.1 101 Switching Protocols\r
+Upgrade: websocket\r
+Connection: Upgrade\r
+Sec-WebSocket-Accept: """
+    )
+    cl.send(respkey)
+    cl.send("\r\n\r\n")
+
+    return True
+
+
+def send_html(cl):
+    cl.send(
+        b"""\
+HTTP/1.0 200 OK\r
+\r
+<base href=\""""
+    )
+    cl.send(static_host)
+    cl.send(
+        b"""\"></base>\r
+<script src="webrepl_content.js"></script>\r
+"""
+    )
+    cl.close()
+
 
 def setup_conn(port, accept_handler):
     global listen_s
@@ -25,34 +104,41 @@ def setup_conn(port, accept_handler):
     for i in (network.AP_IF, network.STA_IF):
         iface = network.WLAN(i)
         if iface.active():
-            print("WebREPL daemon started on ws://%s:%d" % (iface.ifconfig()[0], port))
+            print("WebREPL server started on http://%s:%d/" % (iface.ifconfig()[0], port))
     return listen_s
 
 
 def accept_conn(listen_sock):
     global client_s
     cl, remote_addr = listen_sock.accept()
-    prev = uos.dupterm(None)
-    uos.dupterm(prev)
+
+    if not server_handshake(cl):
+        send_html(cl)
+        return False
+
+    prev = os.dupterm(None)
+    os.dupterm(prev)
     if prev:
         print("\nConcurrent WebREPL connection from", remote_addr, "rejected")
         cl.close()
-        return
+        return False
     print("\nWebREPL connection from:", remote_addr)
     client_s = cl
-    websocket_helper.server_handshake(cl)
-    ws = uwebsocket.websocket(cl, True)
+
+    ws = websocket.websocket(cl, True)
     ws = _webrepl._webrepl(ws)
     cl.setblocking(False)
     # notify REPL on socket incoming data (ESP32/ESP8266-only)
-    if hasattr(uos, "dupterm_notify"):
-        cl.setsockopt(socket.SOL_SOCKET, 20, uos.dupterm_notify)
-    uos.dupterm(ws)
+    if hasattr(os, "dupterm_notify"):
+        cl.setsockopt(socket.SOL_SOCKET, 20, os.dupterm_notify)
+    os.dupterm(ws)
+
+    return True
 
 
 def stop():
     global listen_s, client_s
-    uos.dupterm(None)
+    os.dupterm(None)
     if client_s:
         client_s.close()
     if listen_s:
@@ -60,6 +146,7 @@ def stop():
 
 
 def start(port=8266, password=None, accept_handler=accept_conn):
+    global static_host
     stop()
     webrepl_pass = password
     if webrepl_pass is None:
@@ -67,6 +154,8 @@ def start(port=8266, password=None, accept_handler=accept_conn):
             import webrepl_cfg
 
             webrepl_pass = webrepl_cfg.PASS
+            if hasattr(webrepl_cfg, "BASE"):
+                static_host = webrepl_cfg.BASE
         except:
             print("WebREPL is not configured, run 'import webrepl_setup'")
 
@@ -75,7 +164,9 @@ def start(port=8266, password=None, accept_handler=accept_conn):
 
     if accept_handler is None:
         print("Starting webrepl in foreground mode")
-        accept_conn(s)
+        # Run accept_conn to serve HTML until we get a websocket connection.
+        while not accept_conn(s):
+            pass
     elif password is None:
         print("Started webrepl in normal mode")
     else:
diff --git a/extmod/webrepl/webrepl_setup.py b/extmod/webrepl/webrepl_setup.py
index ffc9c77fc0deb..16e5f76e655e4 100644
--- a/extmod/webrepl/webrepl_setup.py
+++ b/extmod/webrepl/webrepl_setup.py
@@ -1,6 +1,5 @@
 import sys
 
-# import uos as os
 import os
 import machine
 
diff --git a/extmod/webrepl/websocket_helper.py b/extmod/webrepl/websocket_helper.py
deleted file mode 100644
index 3260acc52f377..0000000000000
--- a/extmod/webrepl/websocket_helper.py
+++ /dev/null
@@ -1,85 +0,0 @@
-try:
-    import usys as sys
-except ImportError:
-    import sys
-
-try:
-    import ubinascii as binascii
-except:
-    import binascii
-try:
-    import uhashlib as hashlib
-except:
-    import hashlib
-
-DEBUG = 0
-
-
-def server_handshake(sock):
-    clr = sock.makefile("rwb", 0)
-    l = clr.readline()
-    # sys.stdout.write(repr(l))
-
-    webkey = None
-
-    while 1:
-        l = clr.readline()
-        if not l:
-            raise OSError("EOF in headers")
-        if l == b"\r\n":
-            break
-        #    sys.stdout.write(l)
-        h, v = [x.strip() for x in l.split(b":", 1)]
-        if DEBUG:
-            print((h, v))
-        if h == b"Sec-WebSocket-Key":
-            webkey = v
-
-    if not webkey:
-        raise OSError("Not a websocket request")
-
-    if DEBUG:
-        print("Sec-WebSocket-Key:", webkey, len(webkey))
-
-    d = hashlib.sha1(webkey)
-    d.update(b"258EAFA5-E914-47DA-95CA-C5AB0DC85B11")
-    respkey = d.digest()
-    respkey = binascii.b2a_base64(respkey)[:-1]
-    if DEBUG:
-        print("respkey:", respkey)
-
-    sock.send(
-        b"""\
-HTTP/1.1 101 Switching Protocols\r
-Upgrade: websocket\r
-Connection: Upgrade\r
-Sec-WebSocket-Accept: """
-    )
-    sock.send(respkey)
-    sock.send("\r\n\r\n")
-
-
-# Very simplified client handshake, works for MicroPython's
-# websocket server implementation, but probably not for other
-# servers.
-def client_handshake(sock):
-    cl = sock.makefile("rwb", 0)
-    cl.write(
-        b"""\
-GET / HTTP/1.1\r
-Host: echo.websocket.org\r
-Connection: Upgrade\r
-Upgrade: websocket\r
-Sec-WebSocket-Key: foo\r
-\r
-"""
-    )
-    l = cl.readline()
-    #    print(l)
-    while 1:
-        l = cl.readline()
-        if l == b"\r\n":
-            break
-
-
-#        sys.stdout.write(l)

From f736afb577f91cee2a53a22ea17b61755e3f44fc Mon Sep 17 00:00:00 2001
From: Tim Gates <tim.gates@iress.com>
Date: Sun, 17 Jul 2022 08:43:33 +1000
Subject: [PATCH 2402/3533] drivers,ports: Fix a few typos in comments.

Fixes:
- Should read `definitions` rather than `defintions`.
- Should read `resolution` rather than `resoultion`.
- Should read `inefficient` rather than `inefficent`.
- Should read `closed` rather than `closded`.

Signed-off-by: Tim Gates <tim.gates@iress.com>
---
 drivers/cc3000/src/evnt_handler.c       | 2 +-
 ports/mimxrt/hal/flexspi_flash_config.h | 4 ++--
 ports/stm32/adc.c                       | 6 +++---
 ports/teensy/core/pins_teensy.c         | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/drivers/cc3000/src/evnt_handler.c b/drivers/cc3000/src/evnt_handler.c
index 80f34e469b244..d430bbfdad555 100644
--- a/drivers/cc3000/src/evnt_handler.c
+++ b/drivers/cc3000/src/evnt_handler.c
@@ -604,7 +604,7 @@ INT32 hci_unsol_event_handler(CHAR *event_hdr)
 				{
 					//data[0] represents the socket id, for which FIN was received by remote.
 					//Upon receiving this event, the user can close the socket, or else the 
-					//socket will be closded after inacvitity timeout (by default 60 seconds)
+					//socket will be closed after inacvitity timeout (by default 60 seconds)
 					tSLInformation.sWlanCB(event_type, data, 1);
 				}
 			}
diff --git a/ports/mimxrt/hal/flexspi_flash_config.h b/ports/mimxrt/hal/flexspi_flash_config.h
index 3c21eb609a77c..80526880be0b1 100644
--- a/ports/mimxrt/hal/flexspi_flash_config.h
+++ b/ports/mimxrt/hal/flexspi_flash_config.h
@@ -18,7 +18,7 @@
 #define FSL_XIP_BOARD_DRIVER_VERSION (MAKE_VERSION(2, 0, 0))
 /*@}*/
 
-/* FLEXSPI memory config block related defintions */
+/* FLEXSPI memory config block related definitions */
 #define FLEXSPI_CFG_BLK_TAG     (0x42464346UL) // ascii "FCFB" Big Endian
 #define FLEXSPI_CFG_BLK_VERSION (0x56010400UL) // V1.4.0
 #define FLEXSPI_CFG_BLK_SIZE    (512)
@@ -26,7 +26,7 @@
 /* FLEXSPI Feature related definitions */
 #define FLEXSPI_FEATURE_HAS_PARALLEL_MODE 1
 
-/* Lookup table related defintions */
+/* Lookup table related definitions */
 #define CMD_INDEX_READ        0
 #define CMD_INDEX_READSTATUS  1
 #define CMD_INDEX_WRITEENABLE 2
diff --git a/ports/stm32/adc.c b/ports/stm32/adc.c
index fcc7d51e45276..9b7788e59e337 100644
--- a/ports/stm32/adc.c
+++ b/ports/stm32/adc.c
@@ -50,7 +50,7 @@
 ///     val = adc.read_core_vbat()      # read MCU VBAT
 ///     val = adc.read_core_vref()      # read MCU VREF
 
-/* ADC defintions */
+/* ADC definitions */
 #define ADCx                    (ADC1)
 #define PIN_ADC_MASK            PIN_ADC1
 #define pin_adc_table           pin_adc1
@@ -171,8 +171,8 @@
 #define EOC_TIMEOUT (10)
 
 /* Core temperature sensor definitions */
-#define CORE_TEMP_V25          (943)  /* (0.76v/3.3v)*(2^ADC resoultion) */
-#define CORE_TEMP_AVG_SLOPE    (3)    /* (2.5mv/3.3v)*(2^ADC resoultion) */
+#define CORE_TEMP_V25          (943)  /* (0.76v/3.3v)*(2^ADC resolution) */
+#define CORE_TEMP_AVG_SLOPE    (3)    /* (2.5mv/3.3v)*(2^ADC resolution) */
 
 // scale and calibration values for VBAT and VREF
 #define ADC_SCALE (ADC_SCALE_V / ((1 << ADC_CAL_BITS) - 1))
diff --git a/ports/teensy/core/pins_teensy.c b/ports/teensy/core/pins_teensy.c
index b28f94a9ecb0c..5817121fad389 100644
--- a/ports/teensy/core/pins_teensy.c
+++ b/ports/teensy/core/pins_teensy.c
@@ -181,7 +181,7 @@ void portb_isr(void)
 
 void portc_isr(void)
 {
-	// TODO: these are inefficent.  Use CLZ somehow....
+	// TODO: these are inefficient.  Use CLZ somehow....
 	uint32_t isfr = PORTC_ISFR;
 	PORTC_ISFR = isfr;
 	if ((isfr & CORE_PIN9_BITMASK) && intFunc[9]) intFunc[9]();

From fa15aed0f718562871288aa174e91507a134db28 Mon Sep 17 00:00:00 2001
From: Andrew Scheller <andrew.scheller@raspberrypi.com>
Date: Fri, 22 Jul 2022 17:28:30 +0100
Subject: [PATCH 2403/3533] docs/library/neopixel: Add note that neopixel is
 included in rp2 builds.

---
 docs/library/neopixel.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/library/neopixel.rst b/docs/library/neopixel.rst
index 1b37f088baa71..bc3b4e68a40eb 100644
--- a/docs/library/neopixel.rst
+++ b/docs/library/neopixel.rst
@@ -6,7 +6,7 @@
 
 This module provides a driver for WS2818 / NeoPixel LEDs.
 
-.. note:: This module is only included by default on the ESP8266 and ESP32
+.. note:: This module is only included by default on the ESP8266, ESP32 and RP2
    ports. On STM32 / Pyboard, you can `download the module
    <https://github.com/micropython/micropython/blob/master/drivers/neopixel/neopixel.py>`_
    and copy it to the filesystem.

From 1e87b56219c69306d77a887cac3d29146180f113 Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Mon, 4 Jul 2022 17:35:46 +1000
Subject: [PATCH 2404/3533] py/obj: Add support for __float__ and __complex__
 functions.

---
 py/obj.c                                      | 15 +++++--
 py/objcomplex.c                               |  4 ++
 py/objtype.c                                  |  6 +++
 py/runtime.c                                  |  9 ++++
 py/runtime0.h                                 |  2 +
 .../types_float_implicit_conversion.py        | 14 +++++++
 tests/float/complex_dunder.py                 | 40 ++++++++++++++++++
 tests/float/float_dunder.py                   | 42 +++++++++++++++++++
 tests/run-tests.py                            |  1 +
 9 files changed, 130 insertions(+), 3 deletions(-)
 create mode 100644 tests/cpydiff/types_float_implicit_conversion.py
 create mode 100644 tests/float/complex_dunder.py
 create mode 100644 tests/float/float_dunder.py

diff --git a/py/obj.c b/py/obj.c
index 51f6d85defb79..5a05ea58c5ddb 100644
--- a/py/obj.c
+++ b/py/obj.c
@@ -355,9 +355,13 @@ bool mp_obj_get_float_maybe(mp_obj_t arg, mp_float_t *value) {
     } else if (mp_obj_is_float(arg)) {
         val = mp_obj_float_get(arg);
     } else {
-        return false;
+        arg = mp_unary_op(MP_UNARY_OP_FLOAT_MAYBE, (mp_obj_t)arg);
+        if (arg != MP_OBJ_NULL && mp_obj_is_float(arg)) {
+            val = mp_obj_float_get(arg);
+        } else {
+            return false;
+        }
     }
-
     *value = val;
     return true;
 }
@@ -399,7 +403,12 @@ bool mp_obj_get_complex_maybe(mp_obj_t arg, mp_float_t *real, mp_float_t *imag)
     } else if (mp_obj_is_type(arg, &mp_type_complex)) {
         mp_obj_complex_get(arg, real, imag);
     } else {
-        return false;
+        arg = mp_unary_op(MP_UNARY_OP_COMPLEX_MAYBE, (mp_obj_t)arg);
+        if (arg != MP_OBJ_NULL && mp_obj_is_type(arg, &mp_type_complex)) {
+            mp_obj_complex_get(arg, real, imag);
+        } else {
+            return false;
+        }
     }
     return true;
 }
diff --git a/py/objcomplex.c b/py/objcomplex.c
index 157617e156774..3c4cb66140987 100644
--- a/py/objcomplex.c
+++ b/py/objcomplex.c
@@ -88,6 +88,10 @@ STATIC mp_obj_t complex_make_new(const mp_obj_type_t *type_in, size_t n_args, si
                 // a complex, just return it
                 return args[0];
             } else {
+                mp_float_t real, imag;
+                if (mp_obj_get_complex_maybe(args[0], &real, &imag)) {
+                    return mp_obj_new_complex(real, imag);
+                }
                 // something else, try to cast it to a complex
                 return mp_obj_new_complex(mp_obj_get_float(args[0]), 0);
             }
diff --git a/py/objtype.c b/py/objtype.c
index 37c1e3bd22d30..fe1918bd3731f 100644
--- a/py/objtype.c
+++ b/py/objtype.c
@@ -378,6 +378,12 @@ const byte mp_unary_op_method_name[MP_UNARY_OP_NUM_RUNTIME] = {
     [MP_UNARY_OP_INVERT] = MP_QSTR___invert__,
     [MP_UNARY_OP_ABS] = MP_QSTR___abs__,
     #endif
+    #if MICROPY_PY_BUILTINS_FLOAT
+    [MP_UNARY_OP_FLOAT_MAYBE] = MP_QSTR___float__,
+    #if MICROPY_PY_BUILTINS_COMPLEX
+    [MP_UNARY_OP_COMPLEX_MAYBE] = MP_QSTR___complex__,
+    #endif
+    #endif
     #if MICROPY_PY_SYS_GETSIZEOF
     [MP_UNARY_OP_SIZEOF] = MP_QSTR___sizeof__,
     #endif
diff --git a/py/runtime.c b/py/runtime.c
index e6d8c68070e5c..2c3b3ddde4a4f 100644
--- a/py/runtime.c
+++ b/py/runtime.c
@@ -319,6 +319,15 @@ mp_obj_t mp_unary_op(mp_unary_op_t op, mp_obj_t arg) {
             // if arg==mp_const_none.
             return mp_const_true;
         }
+        #if MICROPY_PY_BUILTINS_FLOAT
+        if (op == MP_UNARY_OP_FLOAT_MAYBE
+            #if MICROPY_PY_BUILTINS_COMPLEX
+            || op == MP_UNARY_OP_COMPLEX_MAYBE
+            #endif
+            ) {
+            return MP_OBJ_NULL;
+        }
+        #endif
         // With MP_UNARY_OP_INT, mp_unary_op() becomes a fallback for mp_obj_get_int().
         // In this case provide a more focused error message to not confuse, e.g. chr(1.0)
         #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
diff --git a/py/runtime0.h b/py/runtime0.h
index e6eeff97d6868..c82a4717f4516 100644
--- a/py/runtime0.h
+++ b/py/runtime0.h
@@ -76,6 +76,8 @@ typedef enum {
     MP_UNARY_OP_HASH, // __hash__; must return a small int
     MP_UNARY_OP_ABS, // __abs__
     MP_UNARY_OP_INT, // __int__
+    MP_UNARY_OP_FLOAT_MAYBE, // __float__
+    MP_UNARY_OP_COMPLEX_MAYBE, // __complex__
     MP_UNARY_OP_SIZEOF, // for sys.getsizeof()
 } mp_unary_op_t;
 
diff --git a/tests/cpydiff/types_float_implicit_conversion.py b/tests/cpydiff/types_float_implicit_conversion.py
new file mode 100644
index 0000000000000..8d39a7cd41098
--- /dev/null
+++ b/tests/cpydiff/types_float_implicit_conversion.py
@@ -0,0 +1,14 @@
+"""
+categories: Types,float
+description: uPy allows implicit conversion of objects in maths operations while CPython does not.
+cause: Unknown
+workaround: Objects should be wrapped in `float(obj)` for compatibility with CPython.
+"""
+
+
+class Test:
+    def __float__(self):
+        return 0.5
+
+
+print(2.0 * Test())
diff --git a/tests/float/complex_dunder.py b/tests/float/complex_dunder.py
new file mode 100644
index 0000000000000..128dc69293e28
--- /dev/null
+++ b/tests/float/complex_dunder.py
@@ -0,0 +1,40 @@
+# test __complex__ function support
+
+
+class TestComplex:
+    def __complex__(self):
+        return 1j + 10
+
+
+class TestStrComplex:
+    def __complex__(self):
+        return "a"
+
+
+class TestNonComplex:
+    def __complex__(self):
+        return 6
+
+
+class Test:
+    pass
+
+
+print(complex(TestComplex()))
+
+try:
+    print(complex(TestStrComplex()))
+except TypeError:
+    print("TypeError")
+
+
+try:
+    print(complex(TestNonComplex()))
+except TypeError:
+    print("TypeError")
+
+
+try:
+    print(complex(Test()))
+except TypeError:
+    print("TypeError")
diff --git a/tests/float/float_dunder.py b/tests/float/float_dunder.py
new file mode 100644
index 0000000000000..1cd03db524a74
--- /dev/null
+++ b/tests/float/float_dunder.py
@@ -0,0 +1,42 @@
+# test __float__ function support
+
+
+class TestFloat:
+    def __float__(self):
+        return 10.0
+
+
+class TestStrFloat:
+    def __float__(self):
+        return "a"
+
+
+class TestNonFloat:
+    def __float__(self):
+        return 6
+
+
+class Test:
+    pass
+
+
+print("%.1f" % float(TestFloat()))
+print("%.1f" % TestFloat())
+
+
+try:
+    print(float(TestStrFloat()))
+except TypeError:
+    print("TypeError")
+
+
+try:
+    print(float(TestNonFloat()))
+except TypeError:
+    print("TypeError")
+
+
+try:
+    print(float(Test()))
+except TypeError:
+    print("TypeError")
diff --git a/tests/run-tests.py b/tests/run-tests.py
index 2d6dbaaf1cd84..baab7bdd4a90d 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -525,6 +525,7 @@ def run_tests(pyb, tests, args, result_dir, num_threads=1):
         skip_tests.add("float/int_big_float.py")
         skip_tests.add("float/true_value.py")
         skip_tests.add("float/types.py")
+        skip_tests.add("float/complex_dunder.py")
 
     if not has_coverage:
         skip_tests.add("cmdline/cmd_parsetree.py")

From 4fe3e493b1a62381db15b724f77d565ff2666120 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 25 Jul 2022 15:23:48 +1000
Subject: [PATCH 2405/3533] py/obj: Make mp_obj_get_complex_maybe call
 mp_obj_get_float_maybe first.

This commit simplifies mp_obj_get_complex_maybe() by first calling
mp_obj_get_float_maybe() to handle the cases corresponding to floats.
Only if that fails does it attempt to extra a full complex number.

This reduces code size and also means that mp_obj_get_complex_maybe() now
supports user-defined classes defining __float__; in particular this allows
user-defined classes to be used as arguments to cmath-module function.

Furthermore, complex_make_new() can now be simplified to directly call
mp_obj_get_complex(), instead of mp_obj_get_complex_maybe() followed by
mp_obj_get_float().  This also improves error messages from complex with
an invalid argument, it now raises "can't convert <type> to complex" rather
than "can't convert <type> to float".

Signed-off-by: Damien George <damien@micropython.org>
---
 py/obj.c                      | 17 +----------------
 py/objcomplex.c               |  7 ++-----
 tests/float/cmath_dunder.py   | 21 +++++++++++++++++++++
 tests/float/complex_dunder.py |  6 ++++++
 tests/float/math_dunder.py    | 15 +++++++++++++++
 5 files changed, 45 insertions(+), 21 deletions(-)
 create mode 100644 tests/float/cmath_dunder.py
 create mode 100644 tests/float/math_dunder.py

diff --git a/py/obj.c b/py/obj.c
index 5a05ea58c5ddb..b461fe50aa25d 100644
--- a/py/obj.c
+++ b/py/obj.c
@@ -383,22 +383,7 @@ mp_float_t mp_obj_get_float(mp_obj_t arg) {
 
 #if MICROPY_PY_BUILTINS_COMPLEX
 bool mp_obj_get_complex_maybe(mp_obj_t arg, mp_float_t *real, mp_float_t *imag) {
-    if (arg == mp_const_false) {
-        *real = 0;
-        *imag = 0;
-    } else if (arg == mp_const_true) {
-        *real = 1;
-        *imag = 0;
-    } else if (mp_obj_is_small_int(arg)) {
-        *real = (mp_float_t)MP_OBJ_SMALL_INT_VALUE(arg);
-        *imag = 0;
-    #if MICROPY_LONGINT_IMPL != MICROPY_LONGINT_IMPL_NONE
-    } else if (mp_obj_is_exact_type(arg, &mp_type_int)) {
-        *real = mp_obj_int_as_float_impl(arg);
-        *imag = 0;
-    #endif
-    } else if (mp_obj_is_float(arg)) {
-        *real = mp_obj_float_get(arg);
+    if (mp_obj_get_float_maybe(arg, real)) {
         *imag = 0;
     } else if (mp_obj_is_type(arg, &mp_type_complex)) {
         mp_obj_complex_get(arg, real, imag);
diff --git a/py/objcomplex.c b/py/objcomplex.c
index 3c4cb66140987..4aa598a0bcb7d 100644
--- a/py/objcomplex.c
+++ b/py/objcomplex.c
@@ -89,11 +89,8 @@ STATIC mp_obj_t complex_make_new(const mp_obj_type_t *type_in, size_t n_args, si
                 return args[0];
             } else {
                 mp_float_t real, imag;
-                if (mp_obj_get_complex_maybe(args[0], &real, &imag)) {
-                    return mp_obj_new_complex(real, imag);
-                }
-                // something else, try to cast it to a complex
-                return mp_obj_new_complex(mp_obj_get_float(args[0]), 0);
+                mp_obj_get_complex(args[0], &real, &imag);
+                return mp_obj_new_complex(real, imag);
             }
 
         case 2:
diff --git a/tests/float/cmath_dunder.py b/tests/float/cmath_dunder.py
new file mode 100644
index 0000000000000..3526341510e91
--- /dev/null
+++ b/tests/float/cmath_dunder.py
@@ -0,0 +1,21 @@
+# test that cmath functions support user classes with __float__ and __complex__
+
+try:
+    import cmath
+except ImportError:
+    print("SKIP")
+    raise SystemExit
+
+
+class TestFloat:
+    def __float__(self):
+        return 1.0
+
+
+class TestComplex:
+    def __complex__(self):
+        return 1j + 10
+
+
+for clas in TestFloat, TestComplex:
+    print("%.5g" % cmath.phase(clas()))
diff --git a/tests/float/complex_dunder.py b/tests/float/complex_dunder.py
index 128dc69293e28..975d829b47f3d 100644
--- a/tests/float/complex_dunder.py
+++ b/tests/float/complex_dunder.py
@@ -1,6 +1,11 @@
 # test __complex__ function support
 
 
+class TestFloat:
+    def __float__(self):
+        return 1.0
+
+
 class TestComplex:
     def __complex__(self):
         return 1j + 10
@@ -20,6 +25,7 @@ class Test:
     pass
 
 
+print(complex(TestFloat()))
 print(complex(TestComplex()))
 
 try:
diff --git a/tests/float/math_dunder.py b/tests/float/math_dunder.py
new file mode 100644
index 0000000000000..33ea7f7c1c105
--- /dev/null
+++ b/tests/float/math_dunder.py
@@ -0,0 +1,15 @@
+# test that math functions support user classes with __float__
+
+try:
+    import math
+except ImportError:
+    print("SKIP")
+    raise SystemExit
+
+
+class TestFloat:
+    def __float__(self):
+        return 1.0
+
+
+print("%.5g" % math.exp(TestFloat()))

From 9fd8250d6962d016942ac48e0d20767124bcd732 Mon Sep 17 00:00:00 2001
From: Peter Harper <peter.harper@raspberrypi.com>
Date: Thu, 21 Jul 2022 12:04:19 +0100
Subject: [PATCH 2406/3533] lib/cyw43-driver: Update driver to latest version.

This version of the driver adds an event hook to call during firmware
download, and the ability to query the current power mode.
---
 lib/cyw43-driver | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/cyw43-driver b/lib/cyw43-driver
index 5614e2750e019..2ab6ca93f9cd0 160000
--- a/lib/cyw43-driver
+++ b/lib/cyw43-driver
@@ -1 +1 @@
-Subproject commit 5614e2750e019b0ffa14a50e3c92045b952e2634
+Subproject commit 2ab6ca93f9cd044bc6f35c1403b1284e4161294a

From 33d6994d4c5855228ae423f2d77fb2549db9f854 Mon Sep 17 00:00:00 2001
From: Peter Harper <peter.harper@raspberrypi.com>
Date: Thu, 14 Jul 2022 18:11:34 +0100
Subject: [PATCH 2407/3533] rp2/cyw43_configport: Set CYW43_EVENT_POLL_HOOK
 value.

This should allow USB to work while we're loading WiFi firmware.

Fixes issue #8904.
---
 ports/rp2/cyw43_configport.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ports/rp2/cyw43_configport.h b/ports/rp2/cyw43_configport.h
index 6173964cb2bef..aeb220b202b1f 100644
--- a/ports/rp2/cyw43_configport.h
+++ b/ports/rp2/cyw43_configport.h
@@ -95,4 +95,6 @@ static inline void cyw43_delay_ms(uint32_t ms) {
     }
 }
 
+#define CYW43_EVENT_POLL_HOOK MICROPY_EVENT_POLL_HOOK_FAST
+
 #endif // MICROPY_INCLUDED_RP2_CYW43_CONFIGPORT_H

From f64862a766bf7c22feb1de75dadc69fb9e1aed4a Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 26 Jul 2022 01:37:03 +1000
Subject: [PATCH 2408/3533] rp2/cyw43_configport: Set
 CYW43_WIFI_NVRAM_INCLUDE_FILE value.

Required for latest cyw43-driver.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/rp2/cyw43_configport.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/rp2/cyw43_configport.h b/ports/rp2/cyw43_configport.h
index aeb220b202b1f..b6f5b3cad8a75 100644
--- a/ports/rp2/cyw43_configport.h
+++ b/ports/rp2/cyw43_configport.h
@@ -32,6 +32,7 @@
 #include "py/mphal.h"
 #include "pendsv.h"
 
+#define CYW43_WIFI_NVRAM_INCLUDE_FILE   "wifi_nvram_43439.h"
 #define CYW43_IOCTL_TIMEOUT_US          (1000000)
 #define CYW43_SLEEP_MAX                 (10)
 #define CYW43_NETUTILS                  (1)

From 0c45a28d24e1a7f9ea5912c928d7b5a860a6514a Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sun, 24 Jul 2022 09:15:38 +0200
Subject: [PATCH 2409/3533] rp2/rp2_pio: Fix StateMachine.restart when PIO
 program is shared.

The state machines were not properly restarted in the case that the same
PIO program was shared among multiple StateMachine instances.  This is
because only the first StateMachine to use the program would set the
rp2_state_machine_initial_pc variable.

See https://forum.micropython.org/viewtopic.php?f=21&t=12776&p=69464#p69464
---
 ports/rp2/rp2_pio.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/rp2/rp2_pio.c b/ports/rp2/rp2_pio.c
index 072644eba6acc..eb85eb22480d8 100644
--- a/ports/rp2/rp2_pio.c
+++ b/ports/rp2/rp2_pio.c
@@ -469,8 +469,8 @@ STATIC mp_obj_t rp2_state_machine_init_helper(const rp2_state_machine_obj_t *sel
     if (offset < 0) {
         rp2_pio_add_program(&rp2_pio_obj[PIO_NUM(self->pio)], args[ARG_prog].u_obj);
         offset = mp_obj_get_int(prog[PROG_OFFSET_PIO0 + PIO_NUM(self->pio)]);
-        rp2_state_machine_initial_pc[self->id] = offset;
     }
+    rp2_state_machine_initial_pc[self->id] = offset;
 
     // Compute the clock divider.
     uint16_t clkdiv_int;

From c0fa903d6b2ed5131ae60f8faff2c6ad5276b3a2 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 26 Jul 2022 12:24:50 +1000
Subject: [PATCH 2410/3533] py/compile: Support large integers in inline-asm
 data directive.

Fixes issue #8956.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/compile.c                   |  5 +++--
 tests/inlineasm/asmdata.py     | 16 ++++++++++++++++
 tests/inlineasm/asmdata.py.exp |  5 +++++
 3 files changed, 24 insertions(+), 2 deletions(-)
 create mode 100644 tests/inlineasm/asmdata.py
 create mode 100644 tests/inlineasm/asmdata.py.exp

diff --git a/py/compile.c b/py/compile.c
index ff3e5ffc6db30..8aaf885327497 100644
--- a/py/compile.c
+++ b/py/compile.c
@@ -3286,12 +3286,13 @@ STATIC void compile_scope_inline_asm(compiler_t *comp, scope_t *scope, pass_kind
             if (pass > MP_PASS_SCOPE) {
                 mp_int_t bytesize = MP_PARSE_NODE_LEAF_SMALL_INT(pn_arg[0]);
                 for (uint j = 1; j < n_args; j++) {
-                    if (!MP_PARSE_NODE_IS_SMALL_INT(pn_arg[j])) {
+                    mp_obj_t int_obj;
+                    if (!mp_parse_node_get_int_maybe(pn_arg[j], &int_obj)) {
                         compile_syntax_error(comp, nodes[i], MP_ERROR_TEXT("'data' requires integer arguments"));
                         return;
                     }
                     mp_asm_base_data((mp_asm_base_t *)comp->emit_inline_asm,
-                        bytesize, MP_PARSE_NODE_LEAF_SMALL_INT(pn_arg[j]));
+                        bytesize, mp_obj_int_get_truncated(int_obj));
                 }
             }
         } else {
diff --git a/tests/inlineasm/asmdata.py b/tests/inlineasm/asmdata.py
new file mode 100644
index 0000000000000..bbd20c9186a4d
--- /dev/null
+++ b/tests/inlineasm/asmdata.py
@@ -0,0 +1,16 @@
+# test the "data" directive
+
+
+@micropython.asm_thumb
+def ret_num(r0) -> uint:
+    lsl(r0, r0, 2)
+    mov(r1, pc)
+    add(r0, r0, r1)
+    ldr(r0, [r0, 4])
+    b(HERE)
+    data(4, 0x12345678, 0x20000000, 0x40000000, 0x7FFFFFFF + 1, (1 << 32) - 2)
+    label(HERE)
+
+
+for i in range(5):
+    print(hex(ret_num(i)))
diff --git a/tests/inlineasm/asmdata.py.exp b/tests/inlineasm/asmdata.py.exp
new file mode 100644
index 0000000000000..502c04f99314c
--- /dev/null
+++ b/tests/inlineasm/asmdata.py.exp
@@ -0,0 +1,5 @@
+0x12345678
+0x20000000
+0x40000000
+0x80000000
+0xfffffffe

From e65d1e69e88268145ff0e7e73240f028885915be Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Fri, 22 Jul 2022 13:53:13 +1000
Subject: [PATCH 2411/3533] py/modio: Remove FileIO and TextIOWrapper from io
 module.

On ports with more than one filesystem, the type will be wrong, for example
if using LFS but FAT enabled, then the type will be FAT.  So it's not
possible to use these classes to identify a file object type.

Furthermore, constructing an io.FileIO currently crashes on FAT, and
make_new isn't supported on LFS.

And the io.TextIOWrapper class does not match CPython at all.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 extmod/vfs.c              |   2 +-
 extmod/vfs_fat_file.c     | 127 +++++++++++++++-----------------------
 extmod/vfs_posix.c        |   2 +-
 extmod/vfs_posix_file.c   |  19 +-----
 py/modio.c                |   9 ---
 tests/extmod/vfs_posix.py |   4 +-
 6 files changed, 58 insertions(+), 105 deletions(-)

diff --git a/extmod/vfs.c b/extmod/vfs.c
index 2799622b389b2..be1a82d404474 100644
--- a/extmod/vfs.c
+++ b/extmod/vfs.c
@@ -312,7 +312,7 @@ mp_obj_t mp_vfs_open(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args)
     #if MICROPY_VFS_POSIX
     // If the file is an integer then delegate straight to the POSIX handler
     if (mp_obj_is_small_int(args[ARG_file].u_obj)) {
-        return mp_vfs_posix_file_open(&mp_type_textio, args[ARG_file].u_obj, args[ARG_mode].u_obj);
+        return mp_vfs_posix_file_open(&mp_type_vfs_posix_textio, args[ARG_file].u_obj, args[ARG_mode].u_obj);
     }
     #endif
 
diff --git a/extmod/vfs_fat_file.c b/extmod/vfs_fat_file.c
index 537101d00f406..ebf36fc3978c4 100644
--- a/extmod/vfs_fat_file.c
+++ b/extmod/vfs_fat_file.c
@@ -151,72 +151,6 @@ STATIC mp_uint_t file_obj_ioctl(mp_obj_t o_in, mp_uint_t request, uintptr_t arg,
     }
 }
 
-// Note: encoding is ignored for now; it's also not a valid kwarg for CPython's FileIO,
-// but by adding it here we can use one single mp_arg_t array for open() and FileIO's constructor
-STATIC const mp_arg_t file_open_args[] = {
-    { MP_QSTR_file, MP_ARG_OBJ | MP_ARG_REQUIRED, {.u_rom_obj = MP_ROM_NONE} },
-    { MP_QSTR_mode, MP_ARG_OBJ, {.u_obj = MP_OBJ_NEW_QSTR(MP_QSTR_r)} },
-    { MP_QSTR_encoding, MP_ARG_OBJ | MP_ARG_KW_ONLY, {.u_rom_obj = MP_ROM_NONE} },
-};
-#define FILE_OPEN_NUM_ARGS MP_ARRAY_SIZE(file_open_args)
-
-STATIC mp_obj_t file_open(fs_user_mount_t *vfs, const mp_obj_type_t *type, mp_arg_val_t *args) {
-    int mode = 0;
-    const char *mode_s = mp_obj_str_get_str(args[1].u_obj);
-    // TODO make sure only one of r, w, x, a, and b, t are specified
-    while (*mode_s) {
-        switch (*mode_s++) {
-            case 'r':
-                mode |= FA_READ;
-                break;
-            case 'w':
-                mode |= FA_WRITE | FA_CREATE_ALWAYS;
-                break;
-            case 'x':
-                mode |= FA_WRITE | FA_CREATE_NEW;
-                break;
-            case 'a':
-                mode |= FA_WRITE | FA_OPEN_ALWAYS;
-                break;
-            case '+':
-                mode |= FA_READ | FA_WRITE;
-                break;
-            #if MICROPY_PY_IO_FILEIO
-            case 'b':
-                type = &mp_type_vfs_fat_fileio;
-                break;
-            #endif
-            case 't':
-                type = &mp_type_vfs_fat_textio;
-                break;
-        }
-    }
-
-    pyb_file_obj_t *o = m_new_obj_with_finaliser(pyb_file_obj_t);
-    o->base.type = type;
-
-    const char *fname = mp_obj_str_get_str(args[0].u_obj);
-    assert(vfs != NULL);
-    FRESULT res = f_open(&vfs->fatfs, &o->fp, fname, mode);
-    if (res != FR_OK) {
-        m_del_obj(pyb_file_obj_t, o);
-        mp_raise_OSError(fresult_to_errno_table[res]);
-    }
-
-    // for 'a' mode, we must begin at the end of the file
-    if ((mode & FA_OPEN_ALWAYS) != 0) {
-        f_lseek(&o->fp, f_size(&o->fp));
-    }
-
-    return MP_OBJ_FROM_PTR(o);
-}
-
-STATIC mp_obj_t file_obj_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
-    mp_arg_val_t arg_vals[FILE_OPEN_NUM_ARGS];
-    mp_arg_parse_all_kw_array(n_args, n_kw, args, FILE_OPEN_NUM_ARGS, file_open_args, arg_vals);
-    return file_open(NULL, type, arg_vals);
-}
-
 // TODO gc hook to close the file if not already closed
 
 STATIC const mp_rom_map_elem_t vfs_fat_rawfile_locals_dict_table[] = {
@@ -247,7 +181,6 @@ const mp_obj_type_t mp_type_vfs_fat_fileio = {
     { &mp_type_type },
     .name = MP_QSTR_FileIO,
     .print = file_obj_print,
-    .make_new = file_obj_make_new,
     .getiter = mp_identity_getiter,
     .iternext = mp_stream_unbuffered_iter,
     .protocol = &vfs_fat_fileio_stream_p,
@@ -266,7 +199,6 @@ const mp_obj_type_t mp_type_vfs_fat_textio = {
     { &mp_type_type },
     .name = MP_QSTR_TextIOWrapper,
     .print = file_obj_print,
-    .make_new = file_obj_make_new,
     .getiter = mp_identity_getiter,
     .iternext = mp_stream_unbuffered_iter,
     .protocol = &vfs_fat_textio_stream_p,
@@ -274,15 +206,58 @@ const mp_obj_type_t mp_type_vfs_fat_textio = {
 };
 
 // Factory function for I/O stream classes
-STATIC mp_obj_t fatfs_builtin_open_self(mp_obj_t self_in, mp_obj_t path, mp_obj_t mode) {
-    // TODO: analyze buffering args and instantiate appropriate type
+STATIC mp_obj_t fat_vfs_open(mp_obj_t self_in, mp_obj_t path_in, mp_obj_t mode_in) {
     fs_user_mount_t *self = MP_OBJ_TO_PTR(self_in);
-    mp_arg_val_t arg_vals[FILE_OPEN_NUM_ARGS];
-    arg_vals[0].u_obj = path;
-    arg_vals[1].u_obj = mode;
-    arg_vals[2].u_obj = mp_const_none;
-    return file_open(self, &mp_type_vfs_fat_textio, arg_vals);
+
+    const mp_obj_type_t *type = &mp_type_vfs_fat_textio;
+    int mode = 0;
+    const char *mode_s = mp_obj_str_get_str(mode_in);
+    // TODO make sure only one of r, w, x, a, and b, t are specified
+    while (*mode_s) {
+        switch (*mode_s++) {
+            case 'r':
+                mode |= FA_READ;
+                break;
+            case 'w':
+                mode |= FA_WRITE | FA_CREATE_ALWAYS;
+                break;
+            case 'x':
+                mode |= FA_WRITE | FA_CREATE_NEW;
+                break;
+            case 'a':
+                mode |= FA_WRITE | FA_OPEN_ALWAYS;
+                break;
+            case '+':
+                mode |= FA_READ | FA_WRITE;
+                break;
+            #if MICROPY_PY_IO_FILEIO
+            case 'b':
+                type = &mp_type_vfs_fat_fileio;
+                break;
+            #endif
+            case 't':
+                type = &mp_type_vfs_fat_textio;
+                break;
+        }
+    }
+
+    pyb_file_obj_t *o = m_new_obj_with_finaliser(pyb_file_obj_t);
+    o->base.type = type;
+
+    const char *fname = mp_obj_str_get_str(path_in);
+    FRESULT res = f_open(&self->fatfs, &o->fp, fname, mode);
+    if (res != FR_OK) {
+        m_del_obj(pyb_file_obj_t, o);
+        mp_raise_OSError(fresult_to_errno_table[res]);
+    }
+
+    // for 'a' mode, we must begin at the end of the file
+    if ((mode & FA_OPEN_ALWAYS) != 0) {
+        f_lseek(&o->fp, f_size(&o->fp));
+    }
+
+    return MP_OBJ_FROM_PTR(o);
 }
-MP_DEFINE_CONST_FUN_OBJ_3(fat_vfs_open_obj, fatfs_builtin_open_self);
+MP_DEFINE_CONST_FUN_OBJ_3(fat_vfs_open_obj, fat_vfs_open);
 
 #endif // MICROPY_VFS && MICROPY_VFS_FAT
diff --git a/extmod/vfs_posix.c b/extmod/vfs_posix.c
index 1ada596d137c1..9b00365817a17 100644
--- a/extmod/vfs_posix.c
+++ b/extmod/vfs_posix.c
@@ -138,7 +138,7 @@ STATIC mp_obj_t vfs_posix_open(mp_obj_t self_in, mp_obj_t path_in, mp_obj_t mode
     if (!mp_obj_is_small_int(path_in)) {
         path_in = vfs_posix_get_path_obj(self, path_in);
     }
-    return mp_vfs_posix_file_open(&mp_type_textio, path_in, mode_in);
+    return mp_vfs_posix_file_open(&mp_type_vfs_posix_textio, path_in, mode_in);
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_3(vfs_posix_open_obj, vfs_posix_open);
 
diff --git a/extmod/vfs_posix_file.c b/extmod/vfs_posix_file.c
index 837c5489b0e14..795ad7bbd9ea4 100644
--- a/extmod/vfs_posix_file.c
+++ b/extmod/vfs_posix_file.c
@@ -111,17 +111,6 @@ mp_obj_t mp_vfs_posix_file_open(const mp_obj_type_t *type, mp_obj_t file_in, mp_
     return MP_OBJ_FROM_PTR(o);
 }
 
-STATIC mp_obj_t vfs_posix_file_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
-    static const mp_arg_t allowed_args[] = {
-        { MP_QSTR_file, MP_ARG_OBJ | MP_ARG_REQUIRED, {.u_rom_obj = MP_ROM_NONE} },
-        { MP_QSTR_mode, MP_ARG_OBJ, {.u_rom_obj = MP_ROM_QSTR(MP_QSTR_r)} },
-    };
-
-    mp_arg_val_t arg_vals[MP_ARRAY_SIZE(allowed_args)];
-    mp_arg_parse_all_kw_array(n_args, n_kw, args, MP_ARRAY_SIZE(allowed_args), allowed_args, arg_vals);
-    return mp_vfs_posix_file_open(type, arg_vals[0].u_obj, arg_vals[1].u_obj);
-}
-
 STATIC mp_obj_t vfs_posix_file_fileno(mp_obj_t self_in) {
     mp_obj_vfs_posix_file_t *self = MP_OBJ_TO_PTR(self_in);
     check_fd_is_open(self);
@@ -268,7 +257,6 @@ const mp_obj_type_t mp_type_vfs_posix_fileio = {
     { &mp_type_type },
     .name = MP_QSTR_FileIO,
     .print = vfs_posix_file_print,
-    .make_new = vfs_posix_file_make_new,
     .getiter = mp_identity_getiter,
     .iternext = mp_stream_unbuffered_iter,
     .protocol = &vfs_posix_fileio_stream_p,
@@ -287,15 +275,14 @@ const mp_obj_type_t mp_type_vfs_posix_textio = {
     { &mp_type_type },
     .name = MP_QSTR_TextIOWrapper,
     .print = vfs_posix_file_print,
-    .make_new = vfs_posix_file_make_new,
     .getiter = mp_identity_getiter,
     .iternext = mp_stream_unbuffered_iter,
     .protocol = &vfs_posix_textio_stream_p,
     .locals_dict = (mp_obj_dict_t *)&vfs_posix_rawfile_locals_dict,
 };
 
-const mp_obj_vfs_posix_file_t mp_sys_stdin_obj = {{&mp_type_textio}, STDIN_FILENO};
-const mp_obj_vfs_posix_file_t mp_sys_stdout_obj = {{&mp_type_textio}, STDOUT_FILENO};
-const mp_obj_vfs_posix_file_t mp_sys_stderr_obj = {{&mp_type_textio}, STDERR_FILENO};
+const mp_obj_vfs_posix_file_t mp_sys_stdin_obj = {{&mp_type_vfs_posix_textio}, STDIN_FILENO};
+const mp_obj_vfs_posix_file_t mp_sys_stdout_obj = {{&mp_type_vfs_posix_textio}, STDOUT_FILENO};
+const mp_obj_vfs_posix_file_t mp_sys_stderr_obj = {{&mp_type_vfs_posix_textio}, STDERR_FILENO};
 
 #endif // MICROPY_VFS_POSIX || MICROPY_VFS_POSIX_FILE
diff --git a/py/modio.c b/py/modio.c
index 50af0b6a4795e..d44c1948ab27a 100644
--- a/py/modio.c
+++ b/py/modio.c
@@ -37,9 +37,6 @@
 
 #if MICROPY_PY_IO
 
-extern const mp_obj_type_t mp_type_fileio;
-extern const mp_obj_type_t mp_type_textio;
-
 #if MICROPY_PY_IO_IOBASE
 
 STATIC const mp_obj_type_t mp_type_iobase;
@@ -211,12 +208,6 @@ STATIC const mp_rom_map_elem_t mp_module_io_globals_table[] = {
     #if MICROPY_PY_IO_IOBASE
     { MP_ROM_QSTR(MP_QSTR_IOBase), MP_ROM_PTR(&mp_type_iobase) },
     #endif
-    #if MICROPY_PY_IO_FILEIO
-    { MP_ROM_QSTR(MP_QSTR_FileIO), MP_ROM_PTR(&mp_type_fileio) },
-    #if MICROPY_CPYTHON_COMPAT
-    { MP_ROM_QSTR(MP_QSTR_TextIOWrapper), MP_ROM_PTR(&mp_type_textio) },
-    #endif
-    #endif
     { MP_ROM_QSTR(MP_QSTR_StringIO), MP_ROM_PTR(&mp_type_stringio) },
     #if MICROPY_PY_IO_BYTESIO
     { MP_ROM_QSTR(MP_QSTR_BytesIO), MP_ROM_PTR(&mp_type_bytesio) },
diff --git a/tests/extmod/vfs_posix.py b/tests/extmod/vfs_posix.py
index 2a14fc20767be..d193236696ea1 100644
--- a/tests/extmod/vfs_posix.py
+++ b/tests/extmod/vfs_posix.py
@@ -42,8 +42,8 @@
 # close on a closed file should succeed
 f.close()
 
-# construct a file object using the type constructor, with a raw fileno
-f = type(f)(2)
+# construct a file object with a raw fileno
+f = open(2)
 print(f)
 
 # file read

From 092784da1948c6bfb224f8f6c593aff255ab2db0 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Fri, 22 Jul 2022 13:53:40 +1000
Subject: [PATCH 2412/3533] ports: Remove unused mp_type_{fileio/textio} macros
 in mpconfigport.h.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/cc3200/mpconfigport.h                   |  4 ----
 ports/esp32/mpconfigport.h                    |  2 --
 ports/esp8266/mpconfigport.h                  | 11 -----------
 ports/mimxrt/mpconfigport.h                   |  4 ----
 ports/nrf/mpconfigport.h                      | 17 -----------------
 ports/renesas-ra/mpconfigport.h               | 12 ------------
 ports/rp2/mpconfigport.h                      |  9 ---------
 ports/samd/mpconfigport.h                     |  4 ----
 ports/stm32/mpconfigport.h                    | 12 ------------
 ports/unix/mpconfigport.h                     |  3 ---
 ports/unix/variants/minimal/mpconfigvariant.h |  3 ---
 ports/windows/mpconfigport.h                  |  3 ---
 12 files changed, 84 deletions(-)

diff --git a/ports/cc3200/mpconfigport.h b/ports/cc3200/mpconfigport.h
index 8059daeec7c63..e81a2fc29bb3a 100644
--- a/ports/cc3200/mpconfigport.h
+++ b/ports/cc3200/mpconfigport.h
@@ -131,10 +131,6 @@
     X(EINVAL) \
     X(ETIMEDOUT) \
 
-// TODO these should be generic, not bound to fatfs
-#define mp_type_fileio mp_type_vfs_fat_fileio
-#define mp_type_textio mp_type_vfs_fat_textio
-
 // extra constants
 #define MICROPY_PORT_CONSTANTS \
     { MP_ROM_QSTR(MP_QSTR_umachine),     MP_ROM_PTR(&mp_module_machine) },  \
diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h
index dfa577d2bc693..957aa2e93bce0 100644
--- a/ports/esp32/mpconfigport.h
+++ b/ports/esp32/mpconfigport.h
@@ -135,8 +135,6 @@
 #define MICROPY_FATFS_RPATH                 (2)
 #define MICROPY_FATFS_MAX_SS                (4096)
 #define MICROPY_FATFS_LFN_CODE_PAGE         437 /* 1=SFN/ANSI 437=LFN/U.S.(OEM) */
-#define mp_type_fileio                      mp_type_vfs_fat_fileio
-#define mp_type_textio                      mp_type_vfs_fat_textio
 
 #define MP_STATE_PORT MP_STATE_VM
 
diff --git a/ports/esp8266/mpconfigport.h b/ports/esp8266/mpconfigport.h
index 779767311cdfd..9ff6a34ffd625 100644
--- a/ports/esp8266/mpconfigport.h
+++ b/ports/esp8266/mpconfigport.h
@@ -134,17 +134,6 @@ void *esp_native_code_commit(void *, size_t, void *);
 // printer for debugging output, goes to UART only
 extern const struct _mp_print_t mp_debug_print;
 
-#if MICROPY_VFS_FAT
-#define mp_type_fileio mp_type_vfs_fat_fileio
-#define mp_type_textio mp_type_vfs_fat_textio
-#elif MICROPY_VFS_LFS1
-#define mp_type_fileio mp_type_vfs_lfs1_fileio
-#define mp_type_textio mp_type_vfs_lfs1_textio
-#elif MICROPY_VFS_LFS2
-#define mp_type_fileio mp_type_vfs_lfs2_fileio
-#define mp_type_textio mp_type_vfs_lfs2_textio
-#endif
-
 #define MP_STATE_PORT MP_STATE_VM
 
 // We need an implementation of the log2 function which is not a macro
diff --git a/ports/mimxrt/mpconfigport.h b/ports/mimxrt/mpconfigport.h
index 676e563c7be41..00714ca8d0565 100644
--- a/ports/mimxrt/mpconfigport.h
+++ b/ports/mimxrt/mpconfigport.h
@@ -184,10 +184,6 @@ uint32_t trng_random_u32(void);
 #define MICROPY_PY_PENDSV_REENTER atomic_state = raise_irq_pri(IRQ_PRI_PENDSV);
 #define MICROPY_PY_PENDSV_EXIT    restore_irq_pri(atomic_state);
 
-// Use VfsLfs2's types for fileio/textio
-#define mp_type_fileio mp_type_vfs_lfs2_fileio
-#define mp_type_textio mp_type_vfs_lfs2_textio
-
 // Hooks to add builtins
 
 __attribute__((always_inline)) static inline void enable_irq(uint32_t state) {
diff --git a/ports/nrf/mpconfigport.h b/ports/nrf/mpconfigport.h
index 8a2478d27d0f8..a25ca1ec27efe 100644
--- a/ports/nrf/mpconfigport.h
+++ b/ports/nrf/mpconfigport.h
@@ -133,23 +133,6 @@
     #define MICROPY_FATFS_MAX_SS       (4096)
 #endif
 
-#if MICROPY_VFS
-// TODO these should be generic, not bound to a particular FS implementation
-#if MICROPY_VFS_FAT
-#define mp_type_fileio mp_type_vfs_fat_fileio
-#define mp_type_textio mp_type_vfs_fat_textio
-#elif MICROPY_VFS_LFS1
-#define mp_type_fileio mp_type_vfs_lfs1_fileio
-#define mp_type_textio mp_type_vfs_lfs1_textio
-#elif MICROPY_VFS_LFS2
-#define mp_type_fileio mp_type_vfs_lfs2_fileio
-#define mp_type_textio mp_type_vfs_lfs2_textio
-#endif
-#else // !MICROPY_VFS_FAT
-#define mp_type_fileio fatfs_type_fileio
-#define mp_type_textio fatfs_type_textio
-#endif
-
 // Use port specific uos module rather than extmod variant.
 #define MICROPY_PY_UOS              (0)
 
diff --git a/ports/renesas-ra/mpconfigport.h b/ports/renesas-ra/mpconfigport.h
index 8ecc17fcb4acd..65b194274a53d 100644
--- a/ports/renesas-ra/mpconfigport.h
+++ b/ports/renesas-ra/mpconfigport.h
@@ -137,18 +137,6 @@
 #define MICROPY_FATFS_RPATH            (2)
 #define MICROPY_FATFS_MULTI_PARTITION  (1)
 
-// TODO these should be generic, not bound to a particular FS implementation
-#if MICROPY_VFS_FAT
-#define mp_type_fileio mp_type_vfs_fat_fileio
-#define mp_type_textio mp_type_vfs_fat_textio
-#elif MICROPY_VFS_LFS1
-#define mp_type_fileio mp_type_vfs_lfs1_fileio
-#define mp_type_textio mp_type_vfs_lfs1_textio
-#elif MICROPY_VFS_LFS2
-#define mp_type_fileio mp_type_vfs_lfs2_fileio
-#define mp_type_textio mp_type_vfs_lfs2_textio
-#endif
-
 #if MICROPY_PY_MACHINE
 #define MACHINE_BUILTIN_MODULE_CONSTANTS \
     { MP_ROM_QSTR(MP_QSTR_umachine), MP_ROM_PTR(&mp_module_machine) }, \
diff --git a/ports/rp2/mpconfigport.h b/ports/rp2/mpconfigport.h
index d07c1015e7f59..a3725789f0848 100644
--- a/ports/rp2/mpconfigport.h
+++ b/ports/rp2/mpconfigport.h
@@ -122,15 +122,6 @@
 #define MICROPY_FATFS_MAX_SS                    (FLASH_SECTOR_SIZE)
 #endif
 
-#if MICROPY_VFS_FAT && MICROPY_HW_USB_MSC
-#define mp_type_fileio mp_type_vfs_fat_fileio
-#define mp_type_textio mp_type_vfs_fat_textio
-#elif MICROPY_VFS_LFS2
-// Use VfsLfs2's types for fileio/textio
-#define mp_type_fileio mp_type_vfs_lfs2_fileio
-#define mp_type_textio mp_type_vfs_lfs2_textio
-#endif
-
 #ifndef MICROPY_BOARD_ENTER_BOOTLOADER
 #define MICROPY_BOARD_ENTER_BOOTLOADER(nargs, args)
 #endif
diff --git a/ports/samd/mpconfigport.h b/ports/samd/mpconfigport.h
index 96d34bf4da048..24b9cbfe19438 100644
--- a/ports/samd/mpconfigport.h
+++ b/ports/samd/mpconfigport.h
@@ -95,10 +95,6 @@
 #define MICROPY_PY_UZLIB                    (1)
 #define MICROPY_PY_UASYNCIO                 (1)
 
-// Use VfsLfs's types for fileio/textio
-#define mp_type_fileio mp_type_vfs_lfs1_fileio
-#define mp_type_textio mp_type_vfs_lfs1_textio
-
 #define MP_STATE_PORT MP_STATE_VM
 
 // Miscellaneous settings
diff --git a/ports/stm32/mpconfigport.h b/ports/stm32/mpconfigport.h
index e44fa2260cacd..e06e32c0d2173 100644
--- a/ports/stm32/mpconfigport.h
+++ b/ports/stm32/mpconfigport.h
@@ -151,18 +151,6 @@
 #define MICROPY_FATFS_RPATH            (2)
 #define MICROPY_FATFS_MULTI_PARTITION  (1)
 
-// TODO these should be generic, not bound to a particular FS implementation
-#if MICROPY_VFS_FAT
-#define mp_type_fileio mp_type_vfs_fat_fileio
-#define mp_type_textio mp_type_vfs_fat_textio
-#elif MICROPY_VFS_LFS1
-#define mp_type_fileio mp_type_vfs_lfs1_fileio
-#define mp_type_textio mp_type_vfs_lfs1_textio
-#elif MICROPY_VFS_LFS2
-#define mp_type_fileio mp_type_vfs_lfs2_fileio
-#define mp_type_textio mp_type_vfs_lfs2_textio
-#endif
-
 #if MICROPY_PY_PYB
 extern const struct _mp_obj_module_t pyb_module;
 #define PYB_BUILTIN_MODULE_CONSTANTS \
diff --git a/ports/unix/mpconfigport.h b/ports/unix/mpconfigport.h
index 4252a406ce8f6..ed4c71097ff16 100644
--- a/ports/unix/mpconfigport.h
+++ b/ports/unix/mpconfigport.h
@@ -224,9 +224,6 @@ extern const struct _mp_print_t mp_stderr_print;
 #define MICROPY_EMERGENCY_EXCEPTION_BUF_SIZE  (256)
 #define MICROPY_ASYNC_KBD_INTR      (1)
 
-#define mp_type_fileio mp_type_vfs_posix_fileio
-#define mp_type_textio mp_type_vfs_posix_textio
-
 // type definitions for the specific machine
 
 // For size_t and ssize_t
diff --git a/ports/unix/variants/minimal/mpconfigvariant.h b/ports/unix/variants/minimal/mpconfigvariant.h
index 1e378e94d7d2b..d6e5fc47262e9 100644
--- a/ports/unix/variants/minimal/mpconfigvariant.h
+++ b/ports/unix/variants/minimal/mpconfigvariant.h
@@ -107,9 +107,6 @@
 #define MICROPY_PY_UHASHLIB         (0)
 #define MICROPY_PY_UBINASCII        (0)
 
-#define mp_type_fileio mp_type_vfs_posix_fileio
-#define mp_type_textio mp_type_vfs_posix_textio
-
 //////////////////////////////////////////
 // Do not change anything beyond this line
 //////////////////////////////////////////
diff --git a/ports/windows/mpconfigport.h b/ports/windows/mpconfigport.h
index 71814e21476a7..5f8ad983adc4a 100644
--- a/ports/windows/mpconfigport.h
+++ b/ports/windows/mpconfigport.h
@@ -176,9 +176,6 @@ extern const struct _mp_print_t mp_stderr_print;
 #define MICROPY_EMERGENCY_EXCEPTION_BUF_SIZE     (256)
 #define MICROPY_KBD_EXCEPTION       (1)
 
-#define mp_type_fileio mp_type_vfs_posix_fileio
-#define mp_type_textio mp_type_vfs_posix_textio
-
 #define MICROPY_PORT_INIT_FUNC      init()
 #define MICROPY_PORT_DEINIT_FUNC    deinit()
 

From b22abcdbbedb0f7583b19031fd65e19b3883671d Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Thu, 21 Jul 2022 09:54:02 +1000
Subject: [PATCH 2413/3533] extmod/uasyncio: Handle gather with no awaitables.

This previously resulted in gather() yielding but with no way to be
resumed.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 extmod/uasyncio/funcs.py            | 3 +++
 tests/extmod/uasyncio_gather.py     | 5 +++++
 tests/extmod/uasyncio_gather.py.exp | 2 ++
 3 files changed, 10 insertions(+)

diff --git a/extmod/uasyncio/funcs.py b/extmod/uasyncio/funcs.py
index a1d38fbcbf975..96883e4fe1061 100644
--- a/extmod/uasyncio/funcs.py
+++ b/extmod/uasyncio/funcs.py
@@ -62,6 +62,9 @@ def remove(t):
 
 
 async def gather(*aws, return_exceptions=False):
+    if not aws:
+        return []
+
     def done(t, er):
         # Sub-task "t" has finished, with exception "er".
         nonlocal state
diff --git a/tests/extmod/uasyncio_gather.py b/tests/extmod/uasyncio_gather.py
index c081221c9fc68..af6ea555ab132 100644
--- a/tests/extmod/uasyncio_gather.py
+++ b/tests/extmod/uasyncio_gather.py
@@ -53,6 +53,11 @@ async def main():
 
     print("====")
 
+    # Gather with no awaitables
+    print(await asyncio.gather())
+
+    print("====")
+
     # Test return_exceptions, where one task is cancelled and the other finishes normally
     tasks = [asyncio.create_task(task(1)), asyncio.create_task(task(2))]
     tasks[0].cancel()
diff --git a/tests/extmod/uasyncio_gather.py.exp b/tests/extmod/uasyncio_gather.py.exp
index a5ea47ab500d8..371d1ae60dfd2 100644
--- a/tests/extmod/uasyncio_gather.py.exp
+++ b/tests/extmod/uasyncio_gather.py.exp
@@ -9,6 +9,8 @@ Task C: Compute factorial(4)...
 Task C: factorial(4) = 24
 [2, 6, 24]
 ====
+[]
+====
 start 2
 end 2
 [CancelledError(), 2]

From f9cbe6bc47dd4f5b8e85178caecd6f0de22b4c34 Mon Sep 17 00:00:00 2001
From: Dan Ellis <dan.ellis@gmail.com>
Date: Tue, 12 Jul 2022 09:48:38 -0400
Subject: [PATCH 2414/3533] py/formatfloat: Format all whole-number floats
 exactly.

Formerly, py/formatfloat would print whole numbers inaccurately with
nonzero digits beyond the decimal place.  This resulted from its strategy
of successive scaling of the argument by 0.1 which cannot be exactly
represented in floating point.  The change in this commit avoids scaling
until the value is smaller than 1, so all whole numbers print with zero
fractional part.

Fixes issue #4212.

Signed-off-by: Dan Ellis dan.ellis@gmail.com
---
 py/formatfloat.c                            | 154 +++++++++++++-------
 tests/float/float_format_ftoe.py            |   4 +
 tests/float/float_format_ftoe.py.exp        |   1 +
 tests/float/float_format_ints.py            |  31 ++++
 tests/float/float_format_ints_doubleprec.py |  15 ++
 tests/run-tests.py                          |   1 +
 tools/tinytest-codegen.py                   |   1 +
 7 files changed, 153 insertions(+), 54 deletions(-)
 create mode 100644 tests/float/float_format_ftoe.py
 create mode 100644 tests/float/float_format_ftoe.py.exp
 create mode 100644 tests/float/float_format_ints.py
 create mode 100644 tests/float/float_format_ints_doubleprec.py

diff --git a/py/formatfloat.c b/py/formatfloat.c
index 9d28b2317dc64..357b73ace3ab0 100644
--- a/py/formatfloat.c
+++ b/py/formatfloat.c
@@ -25,6 +25,7 @@
  */
 
 #include "py/mpconfig.h"
+#include "py/misc.h"
 #if MICROPY_FLOAT_IMPL != MICROPY_FLOAT_IMPL_NONE
 
 #include <assert.h>
@@ -96,7 +97,16 @@ static inline int fp_isless1(float x) {
 #define fp_iszero(x) (x == 0)
 #define fp_isless1(x) (x < 1.0)
 
-#endif
+#endif // MICROPY_FLOAT_IMPL == MICROPY_FLOAT_IMPL_FLOAT/DOUBLE
+
+static inline int fp_ge_eps(FPTYPE x, FPTYPE y) {
+    mp_float_union_t fb_y = {y};
+    // Back off 2 eps.
+    // This is valid for almost all values, but in practice
+    // it's only used when y = 1eX for X>=0.
+    fb_y.i -= 2;
+    return x >= fb_y.f;
+}
 
 static const FPTYPE g_pos_pow[] = {
     #if FPDECEXP > 32
@@ -173,6 +183,7 @@ int mp_format_float(FPTYPE f, char *buf, size_t buf_size, char fmt, int prec, ch
     int num_digits = 0;
     const FPTYPE *pos_pow = g_pos_pow;
     const FPTYPE *neg_pow = g_neg_pow;
+    int signed_e = 0;
 
     if (fp_iszero(f)) {
         e = 0;
@@ -192,31 +203,24 @@ int mp_format_float(FPTYPE f, char *buf, size_t buf_size, char fmt, int prec, ch
             }
         }
     } else if (fp_isless1(f)) {
-        // We need to figure out what an integer digit will be used
-        // in case 'f' is used (or we revert other format to it below).
-        // As we just tested number to be <1, this is obviously 0,
-        // but we can round it up to 1 below.
-        char first_dig = '0';
-        if (f >= FPROUND_TO_ONE) {
-            first_dig = '1';
-        }
-
+        FPTYPE f_mod = f;
         // Build negative exponent
         for (e = 0, e1 = FPDECEXP; e1; e1 >>= 1, pos_pow++, neg_pow++) {
-            if (*neg_pow > f) {
+            if (*neg_pow > f_mod) {
                 e += e1;
-                f *= *pos_pow;
+                f_mod *= *pos_pow;
             }
         }
+
         char e_sign_char = '-';
-        if (fp_isless1(f) && f >= FPROUND_TO_ONE) {
-            f = FPCONST(1.0);
+        if (fp_isless1(f_mod) && f_mod >= FPROUND_TO_ONE) {
+            f_mod = FPCONST(1.0);
             if (e == 0) {
                 e_sign_char = '+';
             }
-        } else if (fp_isless1(f)) {
+        } else if (fp_isless1(f_mod)) {
             e++;
-            f *= FPCONST(10.0);
+            f_mod *= FPCONST(10.0);
         }
 
         // If the user specified 'g' format, and e is <= 4, then we'll switch
@@ -224,8 +228,7 @@ int mp_format_float(FPTYPE f, char *buf, size_t buf_size, char fmt, int prec, ch
 
         if (fmt == 'f' || (fmt == 'g' && e <= 4)) {
             fmt = 'f';
-            dec = -1;
-            *s++ = first_dig;
+            dec = 0;
 
             if (org_fmt == 'g') {
                 prec += (e - 1);
@@ -237,13 +240,8 @@ int mp_format_float(FPTYPE f, char *buf, size_t buf_size, char fmt, int prec, ch
             }
 
             num_digits = prec;
-            if (num_digits) {
-                *s++ = '.';
-                while (--e && num_digits) {
-                    *s++ = '0';
-                    num_digits--;
-                }
-            }
+            signed_e = 0;
+            ++num_digits;
         } else {
             // For e & g formats, we'll be printing the exponent, so set the
             // sign.
@@ -256,22 +254,29 @@ int mp_format_float(FPTYPE f, char *buf, size_t buf_size, char fmt, int prec, ch
                     prec++;
                 }
             }
+            signed_e = -e;
         }
     } else {
-        // Build positive exponent
-        for (e = 0, e1 = FPDECEXP; e1; e1 >>= 1, pos_pow++, neg_pow++) {
-            if (*pos_pow <= f) {
+        // Build positive exponent.
+        // We don't modify f at this point to avoid innaccuracies from
+        // scaling it.  Instead, we find the product of powers of 10
+        // that is not greater than it, and use that to start the
+        // mantissa.
+        FPTYPE u_base = FPCONST(1.0);
+        for (e = 0, e1 = FPDECEXP; e1; e1 >>= 1, pos_pow++) {
+            FPTYPE next_u = u_base * *pos_pow;
+            // fp_ge_eps performs "f >= (next_u - 2eps)" so that if, for
+            // numerical reasons, f is very close to a power of ten but
+            // not strictly equal, we still treat it as that power of 10.
+            // The comparison was failing for maybe 10% of 1eX values, but
+            // although rounding fixed many of them, there were still some
+            // rendering as 9.99999998e(X-1).
+            if (fp_ge_eps(f, next_u)) {
+                u_base = next_u;
                 e += e1;
-                f *= *neg_pow;
             }
         }
 
-        // It can be that f was right on the edge of an entry in pos_pow needs to be reduced
-        if ((int)f >= 10) {
-            e += 1;
-            f *= FPCONST(0.1);
-        }
-
         // If the user specified fixed format (fmt == 'f') and e makes the
         // number too big to fit into the available buffer, then we'll
         // switch to the 'e' format.
@@ -310,15 +315,15 @@ int mp_format_float(FPTYPE f, char *buf, size_t buf_size, char fmt, int prec, ch
         } else {
             e_sign = '+';
         }
+        signed_e = e;
     }
     if (prec < 0) {
         // This can happen when the prec is trimmed to prevent buffer overflow
         prec = 0;
     }
 
-    // We now have num.f as a floating point number between >= 1 and < 10
-    // (or equal to zero), and e contains the absolute value of the power of
-    // 10 exponent. and (dec + 1) == the number of dgits before the decimal.
+    // At this point e contains the absolute value of the power of 10 exponent.
+    // (dec + 1) == the number of dgits before the decimal.
 
     // For e, prec is # digits after the decimal
     // For f, prec is # digits after the decimal
@@ -336,25 +341,63 @@ int mp_format_float(FPTYPE f, char *buf, size_t buf_size, char fmt, int prec, ch
         num_digits = prec;
     }
 
-    // Print the digits of the mantissa
-    for (int i = 0; i < num_digits; ++i, --dec) {
-        int32_t d = (int32_t)f;
-        if (d < 0) {
-            *s++ = '0';
-        } else {
+    if (signed_e < 0) {
+        // The algorithm below treats numbers smaller than 1 by scaling them
+        // repeatedly by 10 to bring the new digit to the top.  Our input number
+        // was smaller than 1, so scale it up to be 1 <= f < 10.
+        FPTYPE u_base = FPCONST(1.0);
+        const FPTYPE *pow_u = g_pos_pow;
+        for (int m = FPDECEXP; m; m >>= 1, pow_u++) {
+            if (m & e) {
+                u_base *= *pow_u;
+            }
+        }
+        f *= u_base;
+    }
+
+    int d = 0;
+    int num_digits_left = num_digits;
+    for (int digit_index = signed_e; num_digits_left >= 0; --digit_index) {
+        FPTYPE u_base = FPCONST(1.0);
+        if (digit_index > 0) {
+            // Generate 10^digit_index for positive digit_index.
+            const FPTYPE *pow_u = g_pos_pow;
+            int target_index = digit_index;
+            for (int m = FPDECEXP; m; m >>= 1, pow_u++) {
+                if (m & target_index) {
+                    u_base *= *pow_u;
+                }
+            }
+        }
+        for (d = 0; d < 9; ++d) {
+            // This is essentially "if (f < u_base)", but with 2eps margin
+            // so that if f is just a tiny bit smaller, we treat it as
+            // equal (and accept the additional digit value).
+            if (!fp_ge_eps(f, u_base)) {
+                break;
+            }
+            f -= u_base;
+        }
+        // We calculate one more digit than we display, to use in rounding
+        // below.  So only emit the digit if it's one that we display.
+        if (num_digits_left > 0) {
+            // Emit this number (the leading digit).
             *s++ = '0' + d;
+            if (dec == 0 && prec > 0) {
+                *s++ = '.';
+            }
         }
-        if (dec == 0 && prec > 0) {
-            *s++ = '.';
+        --dec;
+        --num_digits_left;
+        if (digit_index <= 0) {
+            // Once we get below 1.0, we scale up f instead of calculting
+            // negative powers of 10 in u_base.  This provides better
+            // renditions of exact decimals like 1/16 etc.
+            f *= FPCONST(10.0);
         }
-        f -= (FPTYPE)d;
-        f *= FPCONST(10.0);
     }
-
-    // Round
-    // If we print non-exponential format (i.e. 'f'), but a digit we're going
-    // to round by (e) is too far away, then there's nothing to round.
-    if ((org_fmt != 'f' || e <= num_digits) && f >= FPCONST(5.0)) {
+    // Rounding.  If the next digit to print is >= 5, round up.
+    if (d >= 5) {
         char *rs = s;
         rs--;
         while (1) {
@@ -394,7 +437,10 @@ int mp_format_float(FPTYPE f, char *buf, size_t buf_size, char fmt, int prec, ch
                 }
             } else {
                 // Need at extra digit at the end to make room for the leading '1'
-                s++;
+                // but if we're at the buffer size limit, just drop the final digit.
+                if ((size_t)(s + 1 - buf) < buf_size) {
+                    s++;
+                }
             }
             char *ss = s;
             while (ss > rs) {
diff --git a/tests/float/float_format_ftoe.py b/tests/float/float_format_ftoe.py
new file mode 100644
index 0000000000000..bc4e5a4a53eb1
--- /dev/null
+++ b/tests/float/float_format_ftoe.py
@@ -0,0 +1,4 @@
+# check a case where rounding was suppressed inappropriately when "f" was
+# promoted to "e" for large numbers.
+v = 8.888e32
+print("%.2f" % v)  # '%.2f' format with e32 becomes '%.2e', expect 8.89e+32.
diff --git a/tests/float/float_format_ftoe.py.exp b/tests/float/float_format_ftoe.py.exp
new file mode 100644
index 0000000000000..f8b1deb3eca8e
--- /dev/null
+++ b/tests/float/float_format_ftoe.py.exp
@@ -0,0 +1 @@
+8.89e+32
diff --git a/tests/float/float_format_ints.py b/tests/float/float_format_ints.py
new file mode 100644
index 0000000000000..0bf4baf12d0a8
--- /dev/null
+++ b/tests/float/float_format_ints.py
@@ -0,0 +1,31 @@
+# Test that integers format to exact values.
+
+for b in [13, 123, 457, 23456]:
+    for r in range(1, 10):
+        e_fmt = "{:." + str(r) + "e}"
+        f_fmt = "{:." + str(r) + "f}"
+        g_fmt = "{:." + str(r) + "g}"
+        for e in range(0, 5):
+            f = b * (10**e)
+            title = str(b) + " x 10^" + str(e)
+            print(title, "with format", e_fmt, "gives", e_fmt.format(f))
+            print(title, "with format", f_fmt, "gives", f_fmt.format(f))
+            print(title, "with format", g_fmt, "gives", g_fmt.format(f))
+
+# Check that powers of 10 (that fit in float32) format correctly.
+for i in range(31):
+    # It works to 12 digits on all platforms *except* qemu-arm, where
+    # 10^11 comes out as 10000000820 or something.
+    print("{:.7g}".format(float("1e" + str(i))))
+
+# 16777215 is 2^24 - 1, the largest integer that can be completely held
+# in a float32.
+print("{:f}".format(16777215))
+# 4294967040 = 16777215 * 128 is the largest integer that is exactly
+# represented by a float32 and that will also fit within a (signed) int32.
+# The upper bound of our integer-handling code is actually double this,
+# but that constant might cause trouble on systems using 32 bit ints.
+print("{:f}".format(2147483520))
+# Very large positive integers can be a test for precision and resolution.
+# This is a weird way to represent 1e38 (largest power of 10 for float32).
+print("{:.6e}".format(float("9" * 30 + "e8")))
diff --git a/tests/float/float_format_ints_doubleprec.py b/tests/float/float_format_ints_doubleprec.py
new file mode 100644
index 0000000000000..57899d6d65a85
--- /dev/null
+++ b/tests/float/float_format_ints_doubleprec.py
@@ -0,0 +1,15 @@
+# Test formatting of very large ints.
+# Relies on double-precision floats.
+
+import array
+import sys
+
+# Challenging way to express 1e200 and 1e100.
+print("{:.12e}".format(float("9" * 400 + "e-200")))
+print("{:.12e}".format(float("9" * 400 + "e-300")))
+
+# These correspond to the binary representation of 1e200 in float64s:
+v1 = 0x54B249AD2594C37D  # 1e100
+v2 = 0x6974E718D7D7625A  # 1e200
+print("{:.12e}".format(array.array("d", v1.to_bytes(8, sys.byteorder))[0]))
+print("{:.12e}".format(array.array("d", v2.to_bytes(8, sys.byteorder))[0]))
diff --git a/tests/run-tests.py b/tests/run-tests.py
index baab7bdd4a90d..2745ee1393bad 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -516,6 +516,7 @@ def run_tests(pyb, tests, args, result_dir, num_threads=1):
     if upy_float_precision < 64:
         skip_tests.add("float/float_divmod.py")  # tested by float/float_divmod_relaxed.py instead
         skip_tests.add("float/float2int_doubleprec_intbig.py")
+        skip_tests.add("float/float_format_ints_doubleprec.py")
         skip_tests.add("float/float_parse_doubleprec.py")
 
     if not has_complex:
diff --git a/tools/tinytest-codegen.py b/tools/tinytest-codegen.py
index f1169a34d4bdd..feda75f283d3c 100755
--- a/tools/tinytest-codegen.py
+++ b/tools/tinytest-codegen.py
@@ -79,6 +79,7 @@ def script_to_map(test_file):
     "float/float_divmod.py",
     # requires double precision floating point to work
     "float/float2int_doubleprec_intbig.py",
+    "float/float_format_ints_doubleprec.py",
     "float/float_parse_doubleprec.py",
     # inline asm FP tests (require Cortex-M4)
     "inlineasm/asmfpaddsub.py",

From 1230d86dca414baec926b2268156d241346efd66 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 27 Jul 2022 11:37:53 +1000
Subject: [PATCH 2415/3533] py/builtinimport: Remove duplicate static function
 argument.

context==mc in all cases where this function was being called.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 py/builtinimport.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/py/builtinimport.c b/py/builtinimport.c
index cd9636ccdc2d4..36cdac07675e3 100644
--- a/py/builtinimport.c
+++ b/py/builtinimport.c
@@ -159,7 +159,7 @@ STATIC void do_load_from_lexer(mp_module_context_t *context, mp_lexer_t *lex) {
 #endif
 
 #if (MICROPY_HAS_FILE_READER && MICROPY_PERSISTENT_CODE_LOAD) || MICROPY_MODULE_FROZEN_MPY
-STATIC void do_execute_raw_code(mp_module_context_t *context, const mp_raw_code_t *rc, const mp_module_context_t *mc, const char *source_name) {
+STATIC void do_execute_raw_code(const mp_module_context_t *context, const mp_raw_code_t *rc, const char *source_name) {
     (void)source_name;
 
     #if MICROPY_PY___FILE__
@@ -179,7 +179,7 @@ STATIC void do_execute_raw_code(mp_module_context_t *context, const mp_raw_code_
 
     nlr_buf_t nlr;
     if (nlr_push(&nlr) == 0) {
-        mp_obj_t module_fun = mp_make_function_from_raw_code(rc, mc, NULL);
+        mp_obj_t module_fun = mp_make_function_from_raw_code(rc, context, NULL);
         mp_call_function_0(module_fun);
 
         // finish nlr block, restore context
@@ -224,7 +224,7 @@ STATIC void do_load(mp_module_context_t *module_obj, vstr_t *file) {
         if (frozen_type == MP_FROZEN_MPY) {
             const mp_frozen_module_t *frozen = modref;
             module_obj->constants = frozen->constants;
-            do_execute_raw_code(module_obj, frozen->rc, module_obj, file_str + frozen_path_prefix_len);
+            do_execute_raw_code(module_obj, frozen->rc, file_str + frozen_path_prefix_len);
             return;
         }
         #endif
@@ -237,7 +237,7 @@ STATIC void do_load(mp_module_context_t *module_obj, vstr_t *file) {
     #if MICROPY_HAS_FILE_READER && MICROPY_PERSISTENT_CODE_LOAD
     if (file_str[file->len - 3] == 'm') {
         mp_compiled_module_t cm = mp_raw_code_load_file(file_str, module_obj);
-        do_execute_raw_code(module_obj, cm.rc, cm.context, file_str);
+        do_execute_raw_code(cm.context, cm.rc, file_str);
         return;
     }
     #endif

From 45ab801c300d605db96229f6e0626ebe2801f24d Mon Sep 17 00:00:00 2001
From: Peter Harper <peter.harper@raspberrypi.com>
Date: Tue, 26 Jul 2022 15:56:07 +0100
Subject: [PATCH 2416/3533] rp2/cyw43_configport: Add event hook into
 cyw43_delay_ms.

Still see some USB issues apparently caused by delays loading wifi
firmware.  cyw43_delay_ms is used to wait in the driver, so we should call
the event hook in there.

Fixes #8963.
---
 ports/rp2/cyw43_configport.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/rp2/cyw43_configport.h b/ports/rp2/cyw43_configport.h
index b6f5b3cad8a75..a5ce8a9e74de6 100644
--- a/ports/rp2/cyw43_configport.h
+++ b/ports/rp2/cyw43_configport.h
@@ -93,6 +93,7 @@ static inline void cyw43_delay_ms(uint32_t ms) {
     int32_t start = mp_hal_ticks_us();
     while (mp_hal_ticks_us() - start < us) {
         __WFI();
+        MICROPY_EVENT_POLL_HOOK_FAST;
     }
 }
 

From 3c32ca6e77143704ac08d5694b7260781f127c3d Mon Sep 17 00:00:00 2001
From: David Lechner <david@pybricks.com>
Date: Fri, 15 Apr 2022 12:04:01 -0500
Subject: [PATCH 2417/3533] unix/unix_mphal: Allow overriding hal time
 functions.

This adds #ifdefs around each of the mp_hal_* time functions for the unix
port.  This allows variants to override individual functions as needed.

Signed-off-by: David Lechner <david@pybricks.com>
---
 ports/unix/unix_mphal.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/ports/unix/unix_mphal.c b/ports/unix/unix_mphal.c
index c224f78700c0a..6f2def890330e 100644
--- a/ports/unix/unix_mphal.c
+++ b/ports/unix/unix_mphal.c
@@ -199,6 +199,7 @@ void mp_hal_stdout_tx_str(const char *str) {
     mp_hal_stdout_tx_strn(str, strlen(str));
 }
 
+#ifndef mp_hal_ticks_ms
 mp_uint_t mp_hal_ticks_ms(void) {
     #if (defined(_POSIX_TIMERS) && _POSIX_TIMERS > 0) && defined(_POSIX_MONOTONIC_CLOCK)
     struct timespec tv;
@@ -210,7 +211,9 @@ mp_uint_t mp_hal_ticks_ms(void) {
     return tv.tv_sec * 1000 + tv.tv_usec / 1000;
     #endif
 }
+#endif
 
+#ifndef mp_hal_ticks_us
 mp_uint_t mp_hal_ticks_us(void) {
     #if (defined(_POSIX_TIMERS) && _POSIX_TIMERS > 0) && defined(_POSIX_MONOTONIC_CLOCK)
     struct timespec tv;
@@ -222,13 +225,17 @@ mp_uint_t mp_hal_ticks_us(void) {
     return tv.tv_sec * 1000000 + tv.tv_usec;
     #endif
 }
+#endif
 
+#ifndef mp_hal_time_ns
 uint64_t mp_hal_time_ns(void) {
     struct timeval tv;
     gettimeofday(&tv, NULL);
     return (uint64_t)tv.tv_sec * 1000000000ULL + (uint64_t)tv.tv_usec * 1000ULL;
 }
+#endif
 
+#ifndef mp_hal_delay_ms
 void mp_hal_delay_ms(mp_uint_t ms) {
     #ifdef MICROPY_EVENT_POLL_HOOK
     mp_uint_t start = mp_hal_ticks_ms();
@@ -242,6 +249,7 @@ void mp_hal_delay_ms(mp_uint_t ms) {
     usleep(ms * 1000);
     #endif
 }
+#endif
 
 void mp_hal_get_random(size_t n, void *buf) {
     #ifdef _HAVE_GETRANDOM

From fdfe4eca745dce5f20fb65a3c197006b9053999a Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Thu, 28 Jul 2022 17:56:27 +1000
Subject: [PATCH 2418/3533] ports: Always include debug information in the ELF.

For bare metal ARM & xtensa targets, passing -g will make the ELF file
larger but doesn't change the binary size.  However, this means tools like
gdb, addr2line, etc can extract source-level information from the ELF.

Also standardise -ggdb to -g, these produce the exact same ELF file on
arm-none-eabi-gcc and will use DWARF format for all these ports.
---
 ports/esp8266/Makefile    | 2 +-
 ports/mimxrt/Makefile     | 3 ++-
 ports/minimal/Makefile    | 3 ++-
 ports/nrf/Makefile        | 5 +++--
 ports/renesas-ra/Makefile | 3 ++-
 ports/samd/Makefile       | 3 ++-
 ports/stm32/Makefile      | 3 ++-
 ports/teensy/Makefile     | 3 ++-
 8 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/ports/esp8266/Makefile b/ports/esp8266/Makefile
index f70fbd2284063..52ba18d7d8b0d 100644
--- a/ports/esp8266/Makefile
+++ b/ports/esp8266/Makefile
@@ -68,8 +68,8 @@ LIBGCC_FILE_NAME = $(shell $(CC) $(CFLAGS) -print-libgcc-file-name)
 LIBS += -L$(dir $(LIBGCC_FILE_NAME)) -lgcc
 
 # Debugging/Optimization
+CFLAGS += -g  # always include debug info in the ELF
 ifeq ($(DEBUG), 1)
-CFLAGS += -g
 COPT = -O0
 else
 CFLAGS += -fdata-sections -ffunction-sections
diff --git a/ports/mimxrt/Makefile b/ports/mimxrt/Makefile
index de560bdb66a6b..13b766eb3cc5e 100644
--- a/ports/mimxrt/Makefile
+++ b/ports/mimxrt/Makefile
@@ -297,8 +297,9 @@ SRC_QSTR += \
 # Compiler Flags
 # =============================================================================
 
+CFLAGS += -g  # always include debug info in the ELF
 ifeq ($(DEBUG),1)
-CFLAGS += -Og -ggdb
+CFLAGS += -Og
 else
 CFLAGS += -Os -DNDEBUG
 endif
diff --git a/ports/minimal/Makefile b/ports/minimal/Makefile
index 4a17df6803e18..169132a1a29f7 100644
--- a/ports/minimal/Makefile
+++ b/ports/minimal/Makefile
@@ -34,8 +34,9 @@ endif
 CSUPEROPT = -Os # save some code space
 
 # Tune for Debugging or Optimization
+CFLAGS += -g  # always include debug info in the ELF
 ifeq ($(DEBUG), 1)
-CFLAGS += -O0 -ggdb
+CFLAGS += -O0
 else
 CFLAGS += -Os -DNDEBUG
 CFLAGS += -fdata-sections -ffunction-sections
diff --git a/ports/nrf/Makefile b/ports/nrf/Makefile
index 47653ae716831..0586524ba6141 100644
--- a/ports/nrf/Makefile
+++ b/ports/nrf/Makefile
@@ -124,7 +124,7 @@ endif
 
 
 CFLAGS += $(CFLAGS_MCU_$(MCU_SERIES))
-CFLAGS += $(INC) -Wall -Werror -g -ansi -std=c11 -nostdlib $(COPT) $(NRF_DEFINES) $(CFLAGS_MOD) $(CFLAGS_EXTRA)
+CFLAGS += $(INC) -Wall -Werror -ansi -std=c11 -nostdlib $(COPT) $(NRF_DEFINES) $(CFLAGS_MOD) $(CFLAGS_EXTRA)
 CFLAGS += -fno-strict-aliasing
 CFLAGS += -Iboards/$(BOARD)
 CFLAGS += -DNRF5_HAL_H='<$(MCU_VARIANT)_hal.h>'
@@ -138,9 +138,10 @@ LDFLAGS += -Wl,'--defsym=_fs_size=$(FS_SIZE)'
 endif
 
 #Debugging/Optimization
+CFLAGS += -g  # always include debug info in the ELF
 ifeq ($(DEBUG), 1)
 #ASMFLAGS += -g -gtabs+
-CFLAGS += -O0 -ggdb
+CFLAGS += -O0
 LDFLAGS += -O0
 else
 CFLAGS += -Os -DNDEBUG
diff --git a/ports/renesas-ra/Makefile b/ports/renesas-ra/Makefile
index d326c81e7858b..92d8be0692af3 100644
--- a/ports/renesas-ra/Makefile
+++ b/ports/renesas-ra/Makefile
@@ -148,8 +148,9 @@ CFLAGS += -fdata-sections -ffunction-sections
 LDFLAGS += --gc-sections
 
 # Debugging/Optimization
+CFLAGS += -g  # always include debug info in the ELF
 ifeq ($(DEBUG), 1)
-CFLAGS += -g -DPENDSV_DEBUG
+CFLAGS += -DPENDSV_DEBUG
 #COPT = -Og
 COPT = -Os
 # Disable text compression in debug builds
diff --git a/ports/samd/Makefile b/ports/samd/Makefile
index b3d6d8b228fda..7091365f4968c 100644
--- a/ports/samd/Makefile
+++ b/ports/samd/Makefile
@@ -57,8 +57,9 @@ LDFLAGS += $(LDFLAGS_MOD)
 LIBS = $(shell $(CC) $(CFLAGS) -print-libgcc-file-name)
 
 # Tune for Debugging or Optimization
+CFLAGS += -g  # always include debug info in the ELF
 ifeq ($(DEBUG),1)
-CFLAGS += -O0 -ggdb
+CFLAGS += -O0
 else
 CFLAGS += -Os -DNDEBUG
 LDFLAGS += --gc-sections
diff --git a/ports/stm32/Makefile b/ports/stm32/Makefile
index 652dff19fe1da..657524798cf5f 100644
--- a/ports/stm32/Makefile
+++ b/ports/stm32/Makefile
@@ -114,8 +114,9 @@ $(BUILD)/stm32_it.o $(BUILD)/pendsv.o: CFLAGS += -fno-lto
 endif
 
 # Debugging/Optimization
+CFLAGS += -g  # always include debug info in the ELF
 ifeq ($(DEBUG), 1)
-CFLAGS += -g -DPENDSV_DEBUG
+CFLAGS += -DPENDSV_DEBUG
 COPT ?= -Og
 # Disable text compression in debug builds
 MICROPY_ROM_TEXT_COMPRESSION = 0
diff --git a/ports/teensy/Makefile b/ports/teensy/Makefile
index 745f530d7a31d..d7161fcbbc3b1 100644
--- a/ports/teensy/Makefile
+++ b/ports/teensy/Makefile
@@ -105,8 +105,9 @@ LIBS += -L $(dir $(LIBC_FILE_NAME)) -lc
 LIBS += -L $(dir $(LIBGCC_FILE_NAME)) -lgcc
 
 #Debugging/Optimization
+CFLAGS += -g  # always include debug info in the ELF
 ifdef DEBUG
-CFLAGS += -Og -ggdb
+CFLAGS += -Og
 else
 CFLAGS += -Os #-DNDEBUG
 endif

From fe5598452dd82ab24cf19221777b901a6decccdd Mon Sep 17 00:00:00 2001
From: Peter Hinch <peterhinch@users.noreply.github.com>
Date: Wed, 27 Jul 2022 18:19:42 +0100
Subject: [PATCH 2419/3533] docs/library/time: Provide more info about which
 epoch is used.

Some embedded targets use 1970 epoch.
---
 docs/library/time.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/library/time.rst b/docs/library/time.rst
index 6ca172f22128e..3ab5caf248c69 100644
--- a/docs/library/time.rst
+++ b/docs/library/time.rst
@@ -10,8 +10,8 @@ The ``time`` module provides functions for getting the current time and date,
 measuring time intervals, and for delays.
 
 **Time Epoch**: Unix port uses standard for POSIX systems epoch of
-1970-01-01 00:00:00 UTC. However, embedded ports use epoch of
-2000-01-01 00:00:00 UTC.
+1970-01-01 00:00:00 UTC. However, some embedded ports use epoch of
+2000-01-01 00:00:00 UTC. Epoch year may be determined with ``gmtime(0)[0]``.
 
 **Maintaining actual calendar date/time**: This requires a
 Real Time Clock (RTC). On systems with underlying OS (including some

From e168d47424eefc15ab74c3c15e363d02deb46fba Mon Sep 17 00:00:00 2001
From: chrismas9 <c.mason@inchipdesign.com.au>
Date: Sun, 26 Jun 2022 22:59:09 +1000
Subject: [PATCH 2420/3533] docs/library/pyb.Pin: Fix out-of-context
 paragraphs, and AF_PP typo.

Remove out of context callback paragraph, it was part of the wipy docs.
And move the paragraph about PULL_UP/PULL_DOWN resistor values to within
the init() method docs.  Also fix pull-pull -> push-pull.

Signed-off-by: Chris Mason <c.mason@inchipdesign.com.au>
---
 docs/library/pyb.Pin.rst | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/docs/library/pyb.Pin.rst b/docs/library/pyb.Pin.rst
index d13cb9741cd22..292758c11cd0b 100644
--- a/docs/library/pyb.Pin.rst
+++ b/docs/library/pyb.Pin.rst
@@ -58,16 +58,6 @@ an ordinal pin number:
 You can set ``pyb.Pin.debug(True)`` to get some debug information about
 how a particular object gets mapped to a pin.
 
-When a pin has the ``Pin.PULL_UP`` or ``Pin.PULL_DOWN`` pull-mode enabled,
-that pin has an effective 40k Ohm resistor pulling it to 3V3 or GND
-respectively (except pin Y5 which has 11k Ohm resistors).
-
-Now every time a falling edge is seen on the gpio pin, the callback will be
-executed. Caution: mechanical push buttons have "bounce" and pushing or
-releasing a switch will often generate multiple edges.
-See: http://www.eng.utah.edu/~cs5780/debouncing.pdf for a detailed
-explanation, along with various techniques for debouncing.
-
 All pin objects go through the pin mapper to come up with one of the
 gpio pins.
 
@@ -107,7 +97,7 @@ Methods
         - ``Pin.IN`` - configure the pin for input;
         - ``Pin.OUT_PP`` - configure the pin for output, with push-pull control;
         - ``Pin.OUT_OD`` - configure the pin for output, with open-drain control;
-        - ``Pin.AF_PP`` - configure the pin for alternate function, pull-pull;
+        - ``Pin.AF_PP`` - configure the pin for alternate function, push-pull;
         - ``Pin.AF_OD`` - configure the pin for alternate function, open-drain;
         - ``Pin.ANALOG`` - configure the pin for analog.
 
@@ -117,6 +107,10 @@ Methods
         - ``Pin.PULL_UP`` - enable the pull-up resistor;
         - ``Pin.PULL_DOWN`` - enable the pull-down resistor.
 
+       When a pin has the ``Pin.PULL_UP`` or ``Pin.PULL_DOWN`` pull-mode enabled,
+       that pin has an effective 40k Ohm resistor pulling it to 3V3 or GND
+       respectively (except pin Y5 which has 11k Ohm resistors).
+
      - *value* if not None will set the port output value before enabling the pin.
 
      - *alt* can be used when mode is ``Pin.AF_PP`` or ``Pin.AF_OD`` to set the

From 33ea400ce849777617bf1e8f44b10928530b64b9 Mon Sep 17 00:00:00 2001
From: chrismas9 <c.mason@inchipdesign.com.au>
Date: Sun, 26 Jun 2022 23:30:37 +1000
Subject: [PATCH 2421/3533] docs/library/pyb.Pin: Add Pin.ALT constant.

Some Pin alternate functions are inputs, for example, timer capture and
break inputs.  In Pyb.Pin the only way to set alt mode is with Pin.AF_PP or
Pin.AF_OD.  It is not intuitive to use an output mode to configure an
input.  Pin.ALT is used in the machine.Pin class and works in pyb.Pin.

The examples are changed to use Pin.ALT because TIM2_CH3 can be a capture
input or pulse output.

Signed-off-by: Chris Mason <c.mason@inchipdesign.com.au>
---
 docs/library/pyb.Pin.rst | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/docs/library/pyb.Pin.rst b/docs/library/pyb.Pin.rst
index 292758c11cd0b..b93924508b943 100644
--- a/docs/library/pyb.Pin.rst
+++ b/docs/library/pyb.Pin.rst
@@ -97,6 +97,7 @@ Methods
         - ``Pin.IN`` - configure the pin for input;
         - ``Pin.OUT_PP`` - configure the pin for output, with push-pull control;
         - ``Pin.OUT_OD`` - configure the pin for output, with open-drain control;
+        - ``Pin.ALT`` - configure the pin for alternate function, input or output;
         - ``Pin.AF_PP`` - configure the pin for alternate function, push-pull;
         - ``Pin.AF_OD`` - configure the pin for alternate function, open-drain;
         - ``Pin.ANALOG`` - configure the pin for analog.
@@ -113,8 +114,8 @@ Methods
 
      - *value* if not None will set the port output value before enabling the pin.
 
-     - *alt* can be used when mode is ``Pin.AF_PP`` or ``Pin.AF_OD`` to set the
-       index or name of one of the alternate functions associated with a pin.
+     - *alt* can be used when mode is ``Pin.ALT`` , ``Pin.AF_PP`` or ``Pin.AF_OD`` to
+       set the index or name of one of the alternate functions associated with a pin.
        This arg was previously called *af* which can still be used if needed.
 
    Returns: ``None``.
@@ -177,6 +178,10 @@ Methods
 Constants
 ---------
 
+.. data:: Pin.ALT
+
+   initialise the pin to alternate-function mode for input or output
+
 .. data:: Pin.AF_OD
 
    initialise the pin to alternate-function mode with an open-drain drive
@@ -237,11 +242,11 @@ control is desired.
 
 To configure X3 to expose TIM2_CH3, you could use::
 
-   pin = pyb.Pin(pyb.Pin.board.X3, mode=pyb.Pin.AF_PP, alt=pyb.Pin.AF1_TIM2)
+   pin = pyb.Pin(pyb.Pin.board.X3, mode=pyb.Pin.ALT, alt=pyb.Pin.AF1_TIM2)
 
 or::
 
-   pin = pyb.Pin(pyb.Pin.board.X3, mode=pyb.Pin.AF_PP, alt=1)
+   pin = pyb.Pin(pyb.Pin.board.X3, mode=pyb.Pin.ALT, alt=1)
 
 Methods
 -------

From c038ea0cc68bff18ce9ac338a283d2dd4cf29f1e Mon Sep 17 00:00:00 2001
From: chrismas9 <c.mason@inchipdesign.com.au>
Date: Sun, 26 Jun 2022 23:54:37 +1000
Subject: [PATCH 2422/3533] docs/library/pyb.Timer: Document how to use BKIN
 pin with example.

Document how to connect the Timer block BRK_IN to a physical Pin alternate
function.

Add an example of PWM Motor drive using complementary outputs with dead
time and break input to kill the PWM and generate a callback.

Signed-off-by: Chris Mason <c.mason@inchipdesign.com.au>
---
 docs/library/pyb.Timer.rst | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/docs/library/pyb.Timer.rst b/docs/library/pyb.Timer.rst
index 53213666ba87b..1749efce2d508 100644
--- a/docs/library/pyb.Timer.rst
+++ b/docs/library/pyb.Timer.rst
@@ -111,7 +111,9 @@ Methods
        the PWM when the ``BRK_IN`` input is asserted. The value of this
        argument determines if break is enabled and what the polarity is, and
        can be one of ``Timer.BRK_OFF``, ``Timer.BRK_LOW`` or
-       ``Timer.BRK_HIGH``.
+       ``Timer.BRK_HIGH``. To select the ``BRK_IN`` pin construct a Pin object with
+       ``mode=Pin.ALT, alt=Pin.AFn_TIMx``. The pin's GPIO input features are
+       available in alt mode - ``pull=`` , ``value()`` and ``irq()``.
 
     You must either specify freq or both of period and prescaler.
 
@@ -204,6 +206,17 @@ Methods
        ch2 = timer.channel(2, pyb.Timer.PWM, pin=pyb.Pin.board.X2, pulse_width=8000)
        ch3 = timer.channel(3, pyb.Timer.PWM, pin=pyb.Pin.board.X3, pulse_width=16000)
 
+   PWM Motor Example with complementary outputs, dead time, break input and break callback::
+
+       from pyb import Timer
+       from machine import Pin # machine.Pin supports alt mode and irq on the same pin.
+       pin_t8_1 = Pin(Pin.board.Y1, mode=Pin.ALT, af=Pin.AF3_TIM8)   # Pin PC6, TIM8_CH1
+       pin_t8_1n = Pin(Pin.board.X8, mode=Pin.ALT, af=Pin.AF3_TIM8)  # Pin PA7, TIM8_CH1N
+       pin_bkin = Pin(Pin.board.X7, mode=Pin.ALT, af=Pin.AF3_TIM8)   # Pin PA6, TIM8_BKIN
+       pin_bkin.irq(handler=break_callabck, trigger=Pin.IRQ_FALLING)
+       timer = pyb.Timer(8, freq=1000, deadtime=1008, brk=Timer.BRK_LOW)
+       ch1 = timer.channel(1, pyb.Timer.PWM, pulse_width_percent=30)
+
 .. method:: Timer.counter([value])
 
    Get or set the timer counter.

From 963e599ec0d253534eb835ade7020e8ac3d7919b Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 29 Jul 2022 12:06:08 +1000
Subject: [PATCH 2423/3533] tests/cpydiff: Fix formatting of code snippet to
 use double quotes.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/cpydiff/types_float_implicit_conversion.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/cpydiff/types_float_implicit_conversion.py b/tests/cpydiff/types_float_implicit_conversion.py
index 8d39a7cd41098..3726839fac6d1 100644
--- a/tests/cpydiff/types_float_implicit_conversion.py
+++ b/tests/cpydiff/types_float_implicit_conversion.py
@@ -2,7 +2,7 @@
 categories: Types,float
 description: uPy allows implicit conversion of objects in maths operations while CPython does not.
 cause: Unknown
-workaround: Objects should be wrapped in `float(obj)` for compatibility with CPython.
+workaround: Objects should be wrapped in ``float(obj)`` for compatibility with CPython.
 """
 
 

From 9a1b7d8448346b353e3aa7ae11ff2b441b6d5313 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Fri, 8 Jul 2022 14:32:12 +1000
Subject: [PATCH 2424/3533] lib/micropython-lib: Add micropython-lib as a
 submodule.

Several boards now depend on libraries from micropython-lib.  Rather than
expecting micropython-lib to be available as a sibling of the micropython
repo, instead make it a submodule.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 .gitmodules         | 3 +++
 lib/micropython-lib | 1 +
 2 files changed, 4 insertions(+)
 create mode 160000 lib/micropython-lib

diff --git a/.gitmodules b/.gitmodules
index 3d1e2fea745e7..3c47b5959aad8 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -53,3 +53,6 @@
 [submodule "lib/cyw43-driver"]
 	path = lib/cyw43-driver
 	url = https://github.com/georgerobotics/cyw43-driver.git
+[submodule "lib/micropython-lib"]
+	path = lib/micropython-lib
+	url = https://github.com/micropython/micropython-lib.git
diff --git a/lib/micropython-lib b/lib/micropython-lib
new file mode 160000
index 0000000000000..70e422dc2e885
--- /dev/null
+++ b/lib/micropython-lib
@@ -0,0 +1 @@
+Subproject commit 70e422dc2e885bbaafe6eb7e3d81118e17d4b555

From be83c08f463c75bb52619ea4f35b5256fc479158 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Fri, 8 Jul 2022 14:59:33 +1000
Subject: [PATCH 2425/3533] ports: Always append to GIT_SUBMODULES.

Avoids overwriting submodules required by base makefiles.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/esp32/Makefile   | 2 +-
 ports/esp8266/Makefile | 2 +-
 ports/mimxrt/Makefile  | 2 +-
 ports/nrf/Makefile     | 2 +-
 ports/samd/Makefile    | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ports/esp32/Makefile b/ports/esp32/Makefile
index c8ca9262c8f16..88f946fa983bc 100644
--- a/ports/esp32/Makefile
+++ b/ports/esp32/Makefile
@@ -14,7 +14,7 @@ BAUD ?= 460800
 
 PYTHON ?= python3
 
-GIT_SUBMODULES = lib/berkeley-db-1.xx
+GIT_SUBMODULES += lib/berkeley-db-1.xx
 
 .PHONY: all clean deploy erase submodules FORCE
 
diff --git a/ports/esp8266/Makefile b/ports/esp8266/Makefile
index 52ba18d7d8b0d..c027f690fb107 100644
--- a/ports/esp8266/Makefile
+++ b/ports/esp8266/Makefile
@@ -32,7 +32,7 @@ FROZEN_MANIFEST ?= boards/manifest.py
 include $(TOP)/py/py.mk
 include $(TOP)/extmod/extmod.mk
 
-GIT_SUBMODULES = lib/axtls lib/berkeley-db-1.xx
+GIT_SUBMODULES += lib/axtls lib/berkeley-db-1.xx
 
 FWBIN = $(BUILD)/firmware-combined.bin
 PORT ?= /dev/ttyACM0
diff --git a/ports/mimxrt/Makefile b/ports/mimxrt/Makefile
index 13b766eb3cc5e..6312ecdd8f3ee 100644
--- a/ports/mimxrt/Makefile
+++ b/ports/mimxrt/Makefile
@@ -7,7 +7,7 @@ BOARD_DIR ?= boards/$(BOARD)
 BUILD ?= build-$(BOARD)
 PORT ?= /dev/ttyACM0
 CROSS_COMPILE ?= arm-none-eabi-
-GIT_SUBMODULES = lib/tinyusb lib/nxp_driver lib/lwip lib/mbedtls
+GIT_SUBMODULES += lib/tinyusb lib/nxp_driver lib/lwip lib/mbedtls
 
 # MicroPython feature configurations
 FROZEN_MANIFEST ?= boards/manifest.py
diff --git a/ports/nrf/Makefile b/ports/nrf/Makefile
index 0586524ba6141..23be4430f3960 100644
--- a/ports/nrf/Makefile
+++ b/ports/nrf/Makefile
@@ -58,7 +58,7 @@ FROZEN_MANIFEST ?= modules/manifest.py
 include ../../py/py.mk
 include ../../extmod/extmod.mk
 
-GIT_SUBMODULES = lib/nrfx lib/tinyusb
+GIT_SUBMODULES += lib/nrfx lib/tinyusb
 
 MICROPY_VFS_FAT ?= 0
 
diff --git a/ports/samd/Makefile b/ports/samd/Makefile
index 7091365f4968c..aed8637abcc1f 100644
--- a/ports/samd/Makefile
+++ b/ports/samd/Makefile
@@ -24,7 +24,7 @@ FROZEN_MANIFEST ?= boards/manifest.py
 include $(TOP)/py/py.mk
 include $(TOP)/extmod/extmod.mk
 
-GIT_SUBMODULES = lib/asf4 lib/tinyusb
+GIT_SUBMODULES += lib/asf4 lib/tinyusb
 
 INC += -I.
 INC += -I$(TOP)

From 9a7ac41be61a4d80234ac91c97ee5f099af29626 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Fri, 8 Jul 2022 15:26:06 +1000
Subject: [PATCH 2426/3533] rp2/Makefile: Always use cmake to discover
 submodules.

Used to be special-cased for Pico, but now everything depends on
micropython-lib if it's using a frozen manifest.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/rp2/CMakeLists.txt | 11 +++++++++--
 ports/rp2/Makefile       | 15 ++++-----------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/ports/rp2/CMakeLists.txt b/ports/rp2/CMakeLists.txt
index f9a9efe62a8c8..f5bd61c44ea84 100644
--- a/ports/rp2/CMakeLists.txt
+++ b/ports/rp2/CMakeLists.txt
@@ -54,6 +54,10 @@ if (MICROPY_PY_NETWORK_CYW43)
     set(PICO_CYW43_DRIVER_PATH ${MICROPY_DIR}/lib/cyw43-driver)
 endif()
 
+# Necessary submodules for all boards.
+string(CONCAT GIT_SUBMODULES "${GIT_SUBMODULES} " lib/mbedtls)
+string(CONCAT GIT_SUBMODULES "${GIT_SUBMODULES} " lib/tinyusb)
+
 # Include component cmake fragments
 include(${MICROPY_DIR}/py/py.cmake)
 include(${MICROPY_DIR}/extmod/extmod.cmake)
@@ -278,6 +282,11 @@ if (MICROPY_PY_NETWORK_NINAW10)
 endif()
 
 if (MICROPY_PY_NETWORK_WIZNET5K)
+    string(CONCAT GIT_SUBMODULES "${GIT_SUBMODULES} " lib/wiznet5k)
+    if((NOT (${ECHO_SUBMODULES})) AND NOT EXISTS ${MICROPY_DIR}/lib/wiznet5k/README.md)
+        message(FATAL_ERROR " wiznet5k not initialized.\n Run 'make BOARD=${MICROPY_BOARD} submodules'")
+    endif()
+
     target_compile_definitions(${MICROPY_TARGET} PRIVATE
         MICROPY_PY_NETWORK_WIZNET5K=1
         WIZCHIP_PREFIXED_EXPORTS=1
@@ -312,8 +321,6 @@ if (MICROPY_PY_NETWORK_WIZNET5K)
     list(APPEND MICROPY_SOURCE_EXTMOD
         ${MICROPY_DIR}/extmod/network_wiznet5k.c
     )
-
-    string(CONCAT GIT_SUBMODULES "${GIT_SUBMODULES} " lib/wiznet5k)
 endif()
 
 # Add qstr sources for extmod and usermod, in case they are modified by components above.
diff --git a/ports/rp2/Makefile b/ports/rp2/Makefile
index 6f8c621c2a4a0..6d2fc009642d8 100644
--- a/ports/rp2/Makefile
+++ b/ports/rp2/Makefile
@@ -29,17 +29,10 @@ all:
 clean:
 	$(RM) -rf $(BUILD)
 
-GIT_SUBMODULES += lib/mbedtls lib/tinyusb
-
+# First ensure that pico-sdk is initialised, then use cmake to pick everything
+# else (including board-specific dependencies).
 submodules:
-	# lib/pico-sdk is required for the cmake build to function (as used for boards other than PICO below)
 	$(MAKE) -f ../../py/mkrules.mk GIT_SUBMODULES="lib/pico-sdk" submodules
-ifeq ($(BOARD),PICO)
-	# Run the standard submodules target with minimum required submodules above
-	$(MAKE) -f ../../py/mkrules.mk GIT_SUBMODULES="$(GIT_SUBMODULES)" submodules
-else
-	# Run submodules task through cmake interface to pick up any board specific dependencies.
-	GIT_SUBMODULES=$$(cmake -B $(BUILD)/submodules -DECHO_SUBMODULES=1 -DGIT_SUBMODULES="$(GIT_SUBMODULES)" ${CMAKE_ARGS} -S . 2>&1 | \
-	    grep 'GIT_SUBMODULES=' | cut -d= -f2); \
+	GIT_SUBMODULES=$$(cmake -B $(BUILD)/submodules -DECHO_SUBMODULES=1 ${CMAKE_ARGS} -S . 2>&1 | \
+	                  grep '^GIT_SUBMODULES=' | cut -d= -f2); \
 	$(MAKE) -f ../../py/mkrules.mk GIT_SUBMODULES="$${GIT_SUBMODULES}" submodules
-endif

From 19f5da9e1bf23821095da2252c2f3c2381f2fe21 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Fri, 8 Jul 2022 15:26:52 +1000
Subject: [PATCH 2427/3533] esp32/Makefile: Force micropython-lib as a required
 submodule.

Also use mkrules.mk's submodule target rather than duplicating the call to
`submodule sync`.

Until we can find a way to use idf.py/cmake to discover submodules we have
no way to discover optional or board-specific submodules so need to err on
the side of including everything.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/esp32/Makefile | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/ports/esp32/Makefile b/ports/esp32/Makefile
index 88f946fa983bc..b7d804d0730e7 100644
--- a/ports/esp32/Makefile
+++ b/ports/esp32/Makefile
@@ -14,7 +14,11 @@ BAUD ?= 460800
 
 PYTHON ?= python3
 
-GIT_SUBMODULES += lib/berkeley-db-1.xx
+# Would be good to use cmake to discover submodules (see how rp2/Makefile does
+# it), but on ESP32 the same trick doesn't work because "idf.py build" fails
+# on berkeley-db dependency before printing out the submodule list.
+# For now just force the submodule dependencies here.
+GIT_SUBMODULES += lib/berkeley-db-1.xx lib/micropython-lib
 
 .PHONY: all clean deploy erase submodules FORCE
 
@@ -52,4 +56,4 @@ erase:
 	idf.py $(IDFPY_FLAGS) -p $(PORT) -b $(BAUD) erase_flash
 
 submodules:
-	git submodule update --init $(addprefix ../../,$(GIT_SUBMODULES))
+	$(MAKE) -f ../../py/mkrules.mk GIT_SUBMODULES="$(GIT_SUBMODULES)" submodules

From 58bed5ec14a2575fd53ca1822be80860f7e3023a Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Fri, 8 Jul 2022 15:27:23 +1000
Subject: [PATCH 2428/3533] tools/ci.sh: Initialise submodules for more ports.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 tools/ci.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/tools/ci.sh b/tools/ci.sh
index 6c3914b1449d2..7e2479e43d388 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -245,8 +245,10 @@ function ci_qemu_arm_setup {
 
 function ci_qemu_arm_build {
     make ${MAKEOPTS} -C mpy-cross
+    make ${MAKEOPTS} -C ports/qemu-arm submodules
     make ${MAKEOPTS} -C ports/qemu-arm CFLAGS_EXTRA=-DMP_ENDIANNESS_BIG=1
     make ${MAKEOPTS} -C ports/qemu-arm clean
+    make ${MAKEOPTS} -C ports/qemu-arm -f Makefile.test submodules
     make ${MAKEOPTS} -C ports/qemu-arm -f Makefile.test test
     make ${MAKEOPTS} -C ports/qemu-arm -f Makefile.test clean
     make ${MAKEOPTS} -C ports/qemu-arm -f Makefile.test BOARD=sabrelite test
@@ -354,6 +356,7 @@ function ci_teensy_setup {
 }
 
 function ci_teensy_build {
+    make ${MAKEOPTS} -C ports/teensy submodules
     make ${MAKEOPTS} -C ports/teensy
 }
 
@@ -577,6 +580,7 @@ function ci_unix_float_clang_run_tests {
 
 function ci_unix_settrace_build {
     make ${MAKEOPTS} -C mpy-cross
+    make ${MAKEOPTS} -C ports/unix submodules
     make ${MAKEOPTS} -C ports/unix "${CI_UNIX_OPTS_SYS_SETTRACE[@]}"
 }
 
@@ -586,6 +590,7 @@ function ci_unix_settrace_run_tests {
 
 function ci_unix_settrace_stackless_build {
     make ${MAKEOPTS} -C mpy-cross
+    make ${MAKEOPTS} -C ports/unix submodules
     make ${MAKEOPTS} -C ports/unix "${CI_UNIX_OPTS_SYS_SETTRACE_STACKLESS[@]}"
 }
 
@@ -661,6 +666,7 @@ function ci_windows_setup {
 
 function ci_windows_build {
     make ${MAKEOPTS} -C mpy-cross
+    make ${MAKEOPTS} -C ports/windows submodules
     make ${MAKEOPTS} -C ports/windows CROSS_COMPILE=i686-w64-mingw32-
 }
 

From 579f330508e4ba46f4a71193582c36bdf7aa56bd Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Fri, 8 Jul 2022 15:00:33 +1000
Subject: [PATCH 2429/3533] py/mkenv.mk: Use micropython-lib from submodule by
 default.

Also adds micropython-lib to 'make submodules' when using a frozen manifest
(for make and cmake).

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/windows/.appveyor.yml       | 4 ++++
 ports/windows/msvc/genhdr.targets | 2 +-
 py/mkenv.mk                       | 3 ++-
 py/mkrules.cmake                  | 7 ++++++-
 py/mkrules.mk                     | 7 +++++++
 5 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/ports/windows/.appveyor.yml b/ports/windows/.appveyor.yml
index d7192236dfbd4..110511fe22c6b 100644
--- a/ports/windows/.appveyor.yml
+++ b/ports/windows/.appveyor.yml
@@ -74,6 +74,10 @@ after_test:
       throw "$env:MSYSTEM mpy_cross build exited with code $LASTEXITCODE"
     }
     cd (Join-Path $env:APPVEYOR_BUILD_FOLDER 'ports/windows')
+    C:\msys64\usr\bin\bash.exe -l -c "make -B VARIANT=$($env:PyVariant) submodules"
+    if ($LASTEXITCODE -ne 0) {
+      throw "$env:MSYSTEM build exited with code $LASTEXITCODE"
+    }
     C:\msys64\usr\bin\bash.exe -l -c "make -B -j4 V=1 MICROPY_MPYCROSS=../../mpy-cross/mpy-cross.exe VARIANT=$($env:PyVariant)"
     if ($LASTEXITCODE -ne 0) {
       throw "$env:MSYSTEM build exited with code $LASTEXITCODE"
diff --git a/ports/windows/msvc/genhdr.targets b/ports/windows/msvc/genhdr.targets
index aa796088efeca..308a6a1f5fe25 100644
--- a/ports/windows/msvc/genhdr.targets
+++ b/ports/windows/msvc/genhdr.targets
@@ -170,7 +170,7 @@ using(var outFile = System.IO.File.CreateText(OutputFile)) {
         <PreprocessorDefinitions>MICROPY_MODULE_FROZEN_MPY=1;MICROPY_QSTR_EXTRA_POOL=mp_qstr_frozen_const_pool;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       </ClCompile>
     </ItemGroup>
-    <Exec Command="$(PyPython) $(PyBaseDir)tools\makemanifest.py -v MPY_DIR=$(PyBaseDir) -v MPY_LIB_DIR=$(PyBaseDir)../micropython-lib -v PORT_DIR=$(PyWinDir) -o $(PyBuildDir)frozen_content.c -b $(PyBuildDir) $(FrozenManifest)"/>
+    <Exec Command="$(PyPython) $(PyBaseDir)tools\makemanifest.py -v MPY_DIR=$(PyBaseDir) -v MPY_LIB_DIR=$(PyBaseDir)/lib/micropython-lib -v PORT_DIR=$(PyWinDir) -o $(PyBuildDir)frozen_content.c -b $(PyBuildDir) $(FrozenManifest)"/>
     <WriteLinesToFile File="$(TLogLocation)frozen.read.1.tlog" Lines="$(FrozenManifest)" Overwrite="True"/>
   </Target>
 
diff --git a/py/mkenv.mk b/py/mkenv.mk
index 2b247974b68e4..cc04a8c0b3071 100644
--- a/py/mkenv.mk
+++ b/py/mkenv.mk
@@ -57,7 +57,8 @@ MAKE_MANIFEST = $(PYTHON) $(TOP)/tools/makemanifest.py
 MAKE_FROZEN = $(PYTHON) $(TOP)/tools/make-frozen.py
 MPY_TOOL = $(PYTHON) $(TOP)/tools/mpy-tool.py
 
-MPY_LIB_DIR = $(TOP)/../micropython-lib
+MPY_LIB_SUBMODULE_DIR = $(TOP)/lib/micropython-lib
+MPY_LIB_DIR = $(MPY_LIB_SUBMODULE_DIR)
 
 ifeq ($(MICROPY_MPYCROSS),)
 MICROPY_MPYCROSS = $(TOP)/mpy-cross/mpy-cross
diff --git a/py/mkrules.cmake b/py/mkrules.cmake
index d7be0f934b158..2f168ede6f2b4 100644
--- a/py/mkrules.cmake
+++ b/py/mkrules.cmake
@@ -180,7 +180,12 @@ if(MICROPY_FROZEN_MANIFEST)
     # Note: target_compile_definitions already added earlier.
 
     if(NOT MICROPY_LIB_DIR)
-        set(MICROPY_LIB_DIR ${MICROPY_DIR}/../micropython-lib)
+        string(CONCAT GIT_SUBMODULES "${GIT_SUBMODULES} " lib/micropython-lib)
+        set(MICROPY_LIB_DIR ${MICROPY_DIR}/lib/micropython-lib)
+    endif()
+
+    if(NOT (${ECHO_SUBMODULES}) AND NOT EXISTS ${MICROPY_LIB_DIR}/README.md)
+        message(FATAL_ERROR " micropython-lib not initialized.\n Run 'make BOARD=${MICROPY_BOARD} submodules'")
     endif()
 
     # If MICROPY_MPYCROSS is not explicitly defined in the environment (which
diff --git a/py/mkrules.mk b/py/mkrules.mk
index a7c437386f8eb..41ec4b0641592 100644
--- a/py/mkrules.mk
+++ b/py/mkrules.mk
@@ -174,8 +174,15 @@ $(error Support for FROZEN_MPY_DIR was removed. Please use manifest.py instead,
 endif
 
 ifneq ($(FROZEN_MANIFEST),)
+# If we're using the default submodule path for micropython-lib, then make
+# sure it's included in "make submodules".
+ifeq ($(MPY_LIB_DIR),$(MPY_LIB_SUBMODULE_DIR))
+GIT_SUBMODULES += lib/micropython-lib
+endif
+
 # to build frozen_content.c from a manifest
 $(BUILD)/frozen_content.c: FORCE $(BUILD)/genhdr/qstrdefs.generated.h $(BUILD)/genhdr/root_pointers.h | $(MICROPY_MPYCROSS_DEPENDENCY)
+	$(Q)test -e "$(MPY_LIB_DIR)/README.md" || (echo "Error: micropython-lib not initialized. Run 'make submodules'"; false)
 	$(Q)$(MAKE_MANIFEST) -o $@ -v "MPY_DIR=$(TOP)" -v "MPY_LIB_DIR=$(MPY_LIB_DIR)" -v "PORT_DIR=$(shell pwd)" -v "BOARD_DIR=$(BOARD_DIR)" -b "$(BUILD)" $(if $(MPY_CROSS_FLAGS),-f"$(MPY_CROSS_FLAGS)",) --mpy-tool-flags="$(MPY_TOOL_FLAGS)" $(FROZEN_MANIFEST)
 endif
 

From 6152bbe3dd82fb7dc1b063e24c19a42af03bf321 Mon Sep 17 00:00:00 2001
From: David Lechner <david@pybricks.com>
Date: Thu, 28 Jul 2022 19:25:59 -0500
Subject: [PATCH 2430/3533] stm32/boards/LEGO_HUB_NO6: Fix typo in README.

This fixes a typo in the build directory path.

Signed-off-by: David Lechner <david@pybricks.com>
---
 ports/stm32/boards/LEGO_HUB_NO6/README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/stm32/boards/LEGO_HUB_NO6/README.md b/ports/stm32/boards/LEGO_HUB_NO6/README.md
index 376d0f2b0e445..cc67b6a4bb6b4 100644
--- a/ports/stm32/boards/LEGO_HUB_NO6/README.md
+++ b/ports/stm32/boards/LEGO_HUB_NO6/README.md
@@ -112,8 +112,8 @@ To use this feature, build the firmware (see above for details) then gzip it and
 copy the resulting file to the Hub (eg using mpremote):
 
     $ make BOARD=LEGO_HUB_NO6
-    $ gzip boards/LEGO_HUB_NO6/firmware.dfu
-    $ mpremote cp boards/LEGO_HUB_NO6/firmware.dfu.gz :
+    $ gzip build-LEGO_HUB_NO6/firmware.dfu
+    $ mpremote cp build-LEGO_HUB_NO6/firmware.dfu.gz :
 
 Then get a REPL on the Hub and execute:
 

From 7cc6df3303f467e218a6ac4f12924eac0ed15045 Mon Sep 17 00:00:00 2001
From: David Lechner <david@pybricks.com>
Date: Fri, 29 Jul 2022 13:58:33 -0500
Subject: [PATCH 2431/3533] stm32/boards/LEGO_HUB_NO6: Use named pins.

This changes all uses of pins to use the alias names of the pins.  This
makes the code easier to understand and will also allow sharing more code
with LEGO_HUB_NO7.

Signed-off-by: David Lechner <david@pybricks.com>
---
 ports/stm32/boards/LEGO_HUB_NO6/appupdate.py  |  9 +++-
 ports/stm32/boards/LEGO_HUB_NO6/board_init.c  |  2 +-
 ports/stm32/boards/LEGO_HUB_NO6/hub_display.c | 30 ++++++------
 .../stm32/boards/LEGO_HUB_NO6/mpconfigboard.h | 49 +++++++++----------
 ports/stm32/boards/LEGO_HUB_NO6/pins.csv      |  8 +--
 5 files changed, 51 insertions(+), 47 deletions(-)

diff --git a/ports/stm32/boards/LEGO_HUB_NO6/appupdate.py b/ports/stm32/boards/LEGO_HUB_NO6/appupdate.py
index 65954454a5821..0927f16111fec 100644
--- a/ports/stm32/boards/LEGO_HUB_NO6/appupdate.py
+++ b/ports/stm32/boards/LEGO_HUB_NO6/appupdate.py
@@ -23,8 +23,13 @@ def update_app(filename):
     key = struct.pack("<I", _SPIFLASH_UPDATE_KEY_VALUE)
 
     # Create a SPI flash object.
-    spi = machine.SoftSPI(sck="B13", mosi="C3", miso="C2", baudrate=50_000_000)
-    cs = machine.Pin("B12", machine.Pin.OUT, value=1)
+    spi = machine.SoftSPI(
+        sck=machine.Pin.board.FLASH_SCK,
+        mosi=machine.Pin.board.FLASH_MOSI,
+        miso=machine.Pin.board.FLASH_MISO,
+        baudrate=50_000_000,
+    )
+    cs = machine.Pin(machine.Pin.board.FLASH_NSS, machine.Pin.OUT, value=1)
     flash = spiflash.SPIFlash(spi, cs)
 
     # Write the update key and elements to the SPI flash.
diff --git a/ports/stm32/boards/LEGO_HUB_NO6/board_init.c b/ports/stm32/boards/LEGO_HUB_NO6/board_init.c
index 37a80bc91f17f..db4c07914af95 100644
--- a/ports/stm32/boards/LEGO_HUB_NO6/board_init.c
+++ b/ports/stm32/boards/LEGO_HUB_NO6/board_init.c
@@ -113,7 +113,7 @@ static void board_led_pattern(int reset_mode, uint16_t brightness) {
 }
 
 static void board_button_init(void) {
-    mp_hal_pin_config(pin_A1, MP_HAL_PIN_MODE_ADC, MP_HAL_PIN_PULL_NONE, 0);
+    mp_hal_pin_config(pyb_pin_BUTTONS_ADC, MP_HAL_PIN_MODE_ADC, MP_HAL_PIN_PULL_NONE, 0);
     adc_config(ADC1, 12);
 }
 
diff --git a/ports/stm32/boards/LEGO_HUB_NO6/hub_display.c b/ports/stm32/boards/LEGO_HUB_NO6/hub_display.c
index d5556be2d0a6e..207ace2dcde0a 100644
--- a/ports/stm32/boards/LEGO_HUB_NO6/hub_display.c
+++ b/ports/stm32/boards/LEGO_HUB_NO6/hub_display.c
@@ -81,7 +81,7 @@ static void hub_display_tim_init(void) {
     tim->CCR2 = 2;
     tim->EGR = 1; // UG
 
-    mp_hal_pin_config(pin_B15, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE, 9);
+    mp_hal_pin_config(pyb_pin_TLC_GS_CLK, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE, 9);
 }
 
 static void hub_display_spi_init(void) {
@@ -93,9 +93,9 @@ static void hub_display_spi_init(void) {
     spi->CR1 = SPI_CR1_SSM | SPI_CR1_SSI | 0 << SPI_CR1_BR_Pos | SPI_CR1_MSTR;
     spi->CR1 |= SPI_CR1_SPE;
 
-    mp_hal_pin_config(pin_A5, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE, 5);
-    mp_hal_pin_config(pin_A6, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE, 5);
-    mp_hal_pin_config(pin_A7, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE, 5);
+    mp_hal_pin_config(pyb_pin_TLC_SCLK, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE, 5);
+    mp_hal_pin_config(pyb_pin_TLC_SOUT, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE, 5);
+    mp_hal_pin_config(pyb_pin_TLC_SIN, MP_HAL_PIN_MODE_ALT, MP_HAL_PIN_PULL_NONE, 5);
 }
 
 static void hub_display_spi_write(uint8_t value) {
@@ -123,9 +123,9 @@ static void hub_display_latch_ctrl(uint8_t dc, uint32_t mc, uint32_t bc, uint8_t
     for (int i = 0; i < 42; ++i) {
         hub_display_spi_write(dc);
     }
-    mp_hal_pin_high(pin_A15);
+    mp_hal_pin_high(pyb_pin_TLC_LAT);
     mp_hal_delay_us(1);
-    mp_hal_pin_low(pin_A15);
+    mp_hal_pin_low(pyb_pin_TLC_LAT);
 }
 
 void hub_display_set(uint8_t led, uint16_t value) {
@@ -142,17 +142,17 @@ void hub_display_update(void) {
     for (int i = 0; i < 96; ++i) {
         hub_display_spi_write(hub_display_gs_state[95 - i]);
     }
-    mp_hal_pin_high(pin_A15);
+    mp_hal_pin_high(pyb_pin_TLC_LAT);
     mp_hal_delay_us(1);
-    mp_hal_pin_low(pin_A15);
+    mp_hal_pin_low(pyb_pin_TLC_LAT);
 }
 
 void hub_display_on(void) {
     if (hub_display_init) {
         return;
     }
-    mp_hal_pin_output(pin_A15);
-    mp_hal_pin_low(pin_A15);
+    mp_hal_pin_output(pyb_pin_TLC_LAT);
+    mp_hal_pin_low(pyb_pin_TLC_LAT);
     hub_display_spi_init();
     for (int i = 0; i < 2; ++i) {
         hub_display_latch_ctrl(0xff, 0, 0x1fffff, 0x11);
@@ -171,10 +171,10 @@ void hub_display_off(void) {
     __HAL_RCC_SPI1_CLK_DISABLE();
     __HAL_RCC_SPI1_FORCE_RESET();
     __HAL_RCC_SPI1_RELEASE_RESET();
-    mp_hal_pin_config(pin_A5, MP_HAL_PIN_MODE_ANALOG, MP_HAL_PIN_PULL_NONE, 0);
-    mp_hal_pin_config(pin_A6, MP_HAL_PIN_MODE_ANALOG, MP_HAL_PIN_PULL_NONE, 0);
-    mp_hal_pin_config(pin_A7, MP_HAL_PIN_MODE_ANALOG, MP_HAL_PIN_PULL_NONE, 0);
-    mp_hal_pin_config(pin_A15, MP_HAL_PIN_MODE_ANALOG, MP_HAL_PIN_PULL_NONE, 0);
-    mp_hal_pin_config(pin_B15, MP_HAL_PIN_MODE_ANALOG, MP_HAL_PIN_PULL_NONE, 0);
+    mp_hal_pin_config(pyb_pin_TLC_SCLK, MP_HAL_PIN_MODE_ANALOG, MP_HAL_PIN_PULL_NONE, 0);
+    mp_hal_pin_config(pyb_pin_TLC_SOUT, MP_HAL_PIN_MODE_ANALOG, MP_HAL_PIN_PULL_NONE, 0);
+    mp_hal_pin_config(pyb_pin_TLC_SIN, MP_HAL_PIN_MODE_ANALOG, MP_HAL_PIN_PULL_NONE, 0);
+    mp_hal_pin_config(pyb_pin_TLC_LAT, MP_HAL_PIN_MODE_ANALOG, MP_HAL_PIN_PULL_NONE, 0);
+    mp_hal_pin_config(pyb_pin_TLC_GS_CLK, MP_HAL_PIN_MODE_ANALOG, MP_HAL_PIN_PULL_NONE, 0);
     hub_display_init = false;
 }
diff --git a/ports/stm32/boards/LEGO_HUB_NO6/mpconfigboard.h b/ports/stm32/boards/LEGO_HUB_NO6/mpconfigboard.h
index cab46fa02d57c..7f0b1fbe45c9c 100644
--- a/ports/stm32/boards/LEGO_HUB_NO6/mpconfigboard.h
+++ b/ports/stm32/boards/LEGO_HUB_NO6/mpconfigboard.h
@@ -34,41 +34,40 @@
 
 // UART buses
 // Bluetooth HCI
-#define MICROPY_HW_UART2_CTS                     (pin_D3)
-#define MICROPY_HW_UART2_RTS                     (pin_D4)
-#define MICROPY_HW_UART2_TX                      (pin_D5)
-#define MICROPY_HW_UART2_RX                      (pin_D6)
+#define MICROPY_HW_UART2_CTS                     (pyb_pin_BT_CTS)
+#define MICROPY_HW_UART2_RTS                     (pyb_pin_BT_RTS)
+#define MICROPY_HW_UART2_TX                      (pyb_pin_BT_TX)
+#define MICROPY_HW_UART2_RX                      (pyb_pin_BT_RX)
 // Port B
-#define MICROPY_HW_UART4_TX                      (pin_D1)
-#define MICROPY_HW_UART4_RX                      (pin_D0)
+#define MICROPY_HW_UART4_TX                      (pyb_pin_PORTB_TX)
+#define MICROPY_HW_UART4_RX                      (pyb_pin_PORTB_RX)
 // Port D
-#define MICROPY_HW_UART5_TX                      (pin_C12)
-#define MICROPY_HW_UART5_RX                      (pin_D2)
+#define MICROPY_HW_UART5_TX                      (pyb_pin_PORTD_TX)
+#define MICROPY_HW_UART5_RX                      (pyb_pin_PORTD_RX)
 // Port A
-#define MICROPY_HW_UART7_TX                      (pin_E8)
-#define MICROPY_HW_UART7_RX                      (pin_E7)
+#define MICROPY_HW_UART7_TX                      (pyb_pin_PORTA_TX)
+#define MICROPY_HW_UART7_RX                      (pyb_pin_PORTA_RX)
 // Port C
-#define MICROPY_HW_UART8_TX                      (pin_E1)
-#define MICROPY_HW_UART8_RX                      (pin_E0)
+#define MICROPY_HW_UART8_TX                      (pyb_pin_PORTC_TX)
+#define MICROPY_HW_UART8_RX                      (pyb_pin_PORTC_RX)
 // Port F
-#define MICROPY_HW_UART9_TX                      (pin_D15)
-#define MICROPY_HW_UART9_RX                      (pin_D14)
+#define MICROPY_HW_UART9_TX                      (pyb_pin_PORTF_TX)
+#define MICROPY_HW_UART9_RX                      (pyb_pin_PORTF_RX)
 // Port E
-#define MICROPY_HW_UART10_TX                     (pin_E3)
-#define MICROPY_HW_UART10_RX                     (pin_E2)
+#define MICROPY_HW_UART10_TX                     (pyb_pin_PORTE_TX)
+#define MICROPY_HW_UART10_RX                     (pyb_pin_PORTE_RX)
 
 // SPI buses
-#define MICROPY_HW_SPI1_NSS                      (pin_A4) // shared with DAC
-#define MICROPY_HW_SPI1_SCK                      (pin_A5) // shared with DAC
-#define MICROPY_HW_SPI1_MISO                     (pin_A6)
-#define MICROPY_HW_SPI1_MOSI                     (pin_A7)
-#define MICROPY_HW_SPI2_NSS                      (pin_B12)
-#define MICROPY_HW_SPI2_SCK                      (pin_B13)
-#define MICROPY_HW_SPI2_MISO                     (pin_C2)
-#define MICROPY_HW_SPI2_MOSI                     (pin_C3)
+#define MICROPY_HW_SPI1_SCK                      (pyb_pin_TLC_SCLK)
+#define MICROPY_HW_SPI1_MISO                     (pyb_pin_TLC_SOUT)
+#define MICROPY_HW_SPI1_MOSI                     (pyb_pin_TLC_SIN)
+#define MICROPY_HW_SPI2_NSS                      (pyb_pin_FLASH_NSS)
+#define MICROPY_HW_SPI2_SCK                      (pyb_pin_FLASH_SCK)
+#define MICROPY_HW_SPI2_MISO                     (pyb_pin_FLASH_MISO)
+#define MICROPY_HW_SPI2_MOSI                     (pyb_pin_FLASH_MOSI)
 
 // USB config
-#define MICROPY_HW_USB_VBUS_DETECT_PIN           (pin_A9)
+#define MICROPY_HW_USB_VBUS_DETECT_PIN           (pyb_pin_USB_VBUS)
 #define MICROPY_HW_USB_FS                        (1)
 #define MICROPY_HW_USB_MSC                       (1)
 
diff --git a/ports/stm32/boards/LEGO_HUB_NO6/pins.csv b/ports/stm32/boards/LEGO_HUB_NO6/pins.csv
index 9e56e2c79de4f..1d0b8f35d8d85 100644
--- a/ports/stm32/boards/LEGO_HUB_NO6/pins.csv
+++ b/ports/stm32/boards/LEGO_HUB_NO6/pins.csv
@@ -26,14 +26,14 @@ PORTD_M1,PB8
 PORTD_M2,PB9
 LSM6_SCL,PB10
 ,PB11
-,PB12
-,PB13
+FLASH_NSS,PB12
+FLASH_SCK,PB13
 ,PB14
 TLC_GS_CLK,PB15
 BAT_IMON_ADC,PC0
 BAT_VMON_ADC,PC1
-,PC2
-,PC3
+FLASH_MISO,PC2
+FLASH_MOSI,PC3
 CHGOK_CENBTN_3V3OK_ADC,PC4
 PORTF_EN,PC5
 PORTE_M1,PC6

From 9a51273d96405527e3950441cfebc6c7314a6bcf Mon Sep 17 00:00:00 2001
From: David Lechner <david@pybricks.com>
Date: Fri, 29 Jul 2022 15:25:10 -0500
Subject: [PATCH 2432/3533] stm32/boards/LEGO_HUB_NO6/appupdate: Detect
 filesystem size at runtime.

This changes appupdate.py to get the filesystem size at runtime.  This will
allow the code to be shared with LEGO_HUB_NO7 which has a similar flash
chip with a different size.

Signed-off-by: David Lechner <david@pybricks.com>
---
 ports/stm32/boards/LEGO_HUB_NO6/appupdate.py | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/ports/stm32/boards/LEGO_HUB_NO6/appupdate.py b/ports/stm32/boards/LEGO_HUB_NO6/appupdate.py
index 0927f16111fec..57b24d3f2e605 100644
--- a/ports/stm32/boards/LEGO_HUB_NO6/appupdate.py
+++ b/ports/stm32/boards/LEGO_HUB_NO6/appupdate.py
@@ -2,13 +2,20 @@
 # MIT license; Copyright (c) 2022 Damien P. George
 
 from micropython import const
-import struct, machine, fwupdate, spiflash
+import struct, machine, fwupdate, spiflash, pyb
+
+_IOCTL_BLOCK_COUNT = const(4)
+_IOCTL_BLOCK_SIZE = const(5)
 
 _SPIFLASH_UPDATE_KEY_ADDR = const(1020 * 1024)
 _SPIFLASH_UPDATE_KEY_VALUE = const(0x12345678)
 
 _FILESYSTEM_ADDR = const(0x8000_0000 + 1024 * 1024)
-_FILESYSTEM_LEN = const(31 * 1024 * 1024)
+
+# Roundabout way to get actual filesystem size from config.
+# This takes into account the 1M "reserved" section of the flash memory.
+flash = pyb.Flash(start=0)
+_FILESYSTEM_LEN = flash.ioctl(_IOCTL_BLOCK_COUNT, None) * flash.ioctl(_IOCTL_BLOCK_SIZE, None)
 
 
 def update_app(filename):
@@ -30,6 +37,8 @@ def update_app(filename):
         baudrate=50_000_000,
     )
     cs = machine.Pin(machine.Pin.board.FLASH_NSS, machine.Pin.OUT, value=1)
+
+    # We can't use pyb.Flash() because we need to write to the "reserved" 1M area.
     flash = spiflash.SPIFlash(spi, cs)
 
     # Write the update key and elements to the SPI flash.

From f69af1661923c05149b2a998d5d074d85c51026d Mon Sep 17 00:00:00 2001
From: David Lechner <david@pybricks.com>
Date: Fri, 29 Jul 2022 15:45:13 -0500
Subject: [PATCH 2433/3533] stm32/boards/LEGO_HUB_NO6/spiflash: Pick command
 type at runtime.

This changes spiflash.py to read the flash chip ID at runtime to select the
read/write/erase commands.  This will allow the code to be shared with
LEGO_HUB_NO7 which doesn't use the 32-bit commands.

Also remove an unused constant while we are touching this.

Signed-off-by: David Lechner <david@pybricks.com>
---
 ports/stm32/boards/LEGO_HUB_NO6/spiflash.py | 24 +++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/ports/stm32/boards/LEGO_HUB_NO6/spiflash.py b/ports/stm32/boards/LEGO_HUB_NO6/spiflash.py
index e052f7738b70b..e483ace950842 100644
--- a/ports/stm32/boards/LEGO_HUB_NO6/spiflash.py
+++ b/ports/stm32/boards/LEGO_HUB_NO6/spiflash.py
@@ -4,18 +4,34 @@
 from micropython import const
 
 _PAGE_SIZE = const(256)  # maximum bytes writable in one SPI transfer
+_CMD_WRITE = const(0x02)
+_CMD_READ = const(0x03)
 _CMD_RDSR = const(0x05)
 _CMD_WREN = const(0x06)
 _CMD_WRITE_32 = const(0x12)
 _CMD_READ_32 = const(0x13)
+_CMD_SEC_ERASE = const(0x20)
 _CMD_SEC_ERASE_32 = const(0x21)
-_CMD_C4READ_32 = const(0xEC)
+_CMD_JEDEC_ID = const(0x9F)
 
 
 class SPIFlash:
     def __init__(self, spi, cs):
         self.spi = spi
         self.cs = cs
+        self.id = self._get_id()
+        # flash chip on Hub No. 6 uses 32-bit addressing
+        _32_bit = self.id == b"\xef\x40\x19"
+        self._READ = _CMD_READ_32 if _32_bit else _CMD_READ
+        self._WRITE = _CMD_WRITE_32 if _32_bit else _CMD_WRITE
+        self._ERASE = _CMD_SEC_ERASE_32 if _32_bit else _CMD_SEC_ERASE
+
+    def _get_id(self):
+        self.cs(0)
+        self.spi.write(bytearray([_CMD_JEDEC_ID]))
+        buf = self.spi.read(3)
+        self.cs(1)
+        return buf
 
     def _wait_wel1(self):
         # wait WEL=1
@@ -52,11 +68,11 @@ def _flash_modify(self, cmd, addr, buf):
         self._wait_wip0()
 
     def erase_block(self, addr):
-        self._flash_modify(_CMD_SEC_ERASE_32, addr, None)
+        self._flash_modify(self._ERASE, addr, None)
 
     def readinto(self, addr, buf):
         self.cs(0)
-        self.spi.write(bytearray([_CMD_READ_32, addr >> 16, addr >> 8, addr]))
+        self.spi.write(bytearray([self._READ, addr >> 16, addr >> 8, addr]))
         self.spi.readinto(buf)
         self.cs(1)
 
@@ -67,7 +83,7 @@ def write(self, addr, buf):
         buf_offset = 0
         while remain:
             l = min(_PAGE_SIZE - offset, remain)
-            self._flash_modify(_CMD_WRITE_32, addr, buf[buf_offset : buf_offset + l])
+            self._flash_modify(self._WRITE, addr, buf[buf_offset : buf_offset + l])
             remain -= l
             addr += l
             buf_offset += l

From 0f0f2351bb3c45801250352e72e026e1671fd5d8 Mon Sep 17 00:00:00 2001
From: David Lechner <david@pybricks.com>
Date: Tue, 14 Jun 2022 22:32:44 -0500
Subject: [PATCH 2434/3533] stm32/boards/LEGO_HUB_NO6/cc2564: Make timer
 configurable.

This adds configurable macros to define the timer and channel used to
provide the Bluetooth 32768 MHz clock.  This will allow code to be shared
with LEGO_HUB_NO7.

Signed-off-by: David Lechner <david@pybricks.com>
---
 ports/stm32/boards/LEGO_HUB_NO6/cc2564.c | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/ports/stm32/boards/LEGO_HUB_NO6/cc2564.c b/ports/stm32/boards/LEGO_HUB_NO6/cc2564.c
index c54daf3002fe3..50ba81c57ac15 100644
--- a/ports/stm32/boards/LEGO_HUB_NO6/cc2564.c
+++ b/ports/stm32/boards/LEGO_HUB_NO6/cc2564.c
@@ -38,6 +38,12 @@
 #define CC2564_PIN_BT_SLOWCLK (pyb_pin_BT_SLOWCLK)
 #define CC2564_PIN_BT_ENABLE (pyb_pin_BT_ENABLE)
 
+// slight difference between LEGO_HUB_NO6 and LEGO_HUB_NO7
+#ifndef CC2564_TIMER_BT_SLOWCLOCK_TIM
+#define CC2564_TIMER_BT_SLOWCLOCK_TIM 8
+#define CC2564_TIMER_BT_SLOWCLOCK_TIM_CH 4
+#endif
+
 STATIC void cc2564_wait_cts_low(mp_hal_pin_obj_t cts, uint32_t timeout_ms) {
     for (int i = 0; i < timeout_ms; ++i) {
         if (mp_hal_pin_read(cts) == 0) {
@@ -53,18 +59,18 @@ int mp_bluetooth_hci_controller_init(void) {
     mp_hal_pin_low(CC2564_PIN_BT_ENABLE);
 
     // Output a 32768Hz signal on BTSLOWCLK.
-    //  tim8 = pyb.Timer(8, freq=32768)
-    //  tim8_ch4 = tim8.channel(4, pyb.Timer.PWM, pin=btclk)
-    //  tim8_ch4.pulse_width_percent(50)
-    mp_obj_t args[6] = { MP_OBJ_NEW_SMALL_INT(8), MP_OBJ_NEW_QSTR(MP_QSTR_freq), MP_OBJ_NEW_SMALL_INT(32768), MP_OBJ_NULL };
-    mp_obj_t tim8 = pyb_timer_type.make_new(&pyb_timer_type, 1, 1, args);
-    mp_load_method(tim8, MP_QSTR_channel, args);
-    args[2] = MP_OBJ_NEW_SMALL_INT(4);
+    //  tim = pyb.Timer(TIM, freq=32768)
+    //  tim_ch = tim.channel(TIM_CH, pyb.Timer.PWM, pin=btclk)
+    //  tim_ch.pulse_width_percent(50)
+    mp_obj_t args[6] = { MP_OBJ_NEW_SMALL_INT(CC2564_TIMER_BT_SLOWCLOCK_TIM), MP_OBJ_NEW_QSTR(MP_QSTR_freq), MP_OBJ_NEW_SMALL_INT(32768), MP_OBJ_NULL };
+    mp_obj_t tim = pyb_timer_type.make_new(&pyb_timer_type, 1, 1, args);
+    mp_load_method(tim, MP_QSTR_channel, args);
+    args[2] = MP_OBJ_NEW_SMALL_INT(CC2564_TIMER_BT_SLOWCLOCK_TIM_CH);
     args[3] = MP_OBJ_NEW_SMALL_INT(0); // CHANNEL_MODE_PWM_NORMAL
     args[4] = MP_OBJ_NEW_QSTR(MP_QSTR_pin);
     args[5] = (mp_obj_t)CC2564_PIN_BT_SLOWCLK;
-    mp_obj_t tim8_ch4 = mp_call_method_n_kw(2, 1, args);
-    mp_load_method(tim8_ch4, MP_QSTR_pulse_width_percent, args);
+    mp_obj_t tim_ch = mp_call_method_n_kw(2, 1, args);
+    mp_load_method(tim_ch, MP_QSTR_pulse_width_percent, args);
     args[2] = MP_OBJ_NEW_SMALL_INT(50);
     mp_call_method_n_kw(1, 0, args);
 

From 10f85fee183404a3cba2795e6cd22c12be742fb3 Mon Sep 17 00:00:00 2001
From: David Lechner <david@pybricks.com>
Date: Tue, 14 Jun 2022 22:32:44 -0500
Subject: [PATCH 2435/3533] stm32/boards/LEGO_HUB_NO7: Add LEGO Hub No. 7 board
 definition.

This adds support for the LEGO Hub No. 7, aka LEGO Technic Small hub, aka
LEGO SPIKE Essential hub.  This board is largely similar to Hub No. 6:

- Same MCU (STM32F413 - different packaging with fewer pins).
- Same Bluetooth chip (TI CC2564).
- Same IMU chip.
- Similar external flash chip - 4MiB instead of 32MiB.
- 2 I/O ports instead of 6.
- No display - only status and battery LEDs.
- Different LED driver chip.
- Only 1 button which is also the power button.
- No speaker.

Signed-off-by: David Lechner <david@pybricks.com>
---
 ports/stm32/boards/LEGO_HUB_NO7/README.md     | 135 +++++++++++
 ports/stm32/boards/LEGO_HUB_NO7/bdev.c        |   3 +
 .../LEGO_HUB_NO7/bluetooth_init_cc2564C_1.5.c |   3 +
 ports/stm32/boards/LEGO_HUB_NO7/board.json    |  13 ++
 ports/stm32/boards/LEGO_HUB_NO7/board_init.c  | 212 ++++++++++++++++++
 ports/stm32/boards/LEGO_HUB_NO7/cc2564.c      |   6 +
 ports/stm32/boards/LEGO_HUB_NO7/hub_display.c | 190 ++++++++++++++++
 ports/stm32/boards/LEGO_HUB_NO7/hub_display.h |   4 +
 ports/stm32/boards/LEGO_HUB_NO7/manifest.py   |   5 +
 .../stm32/boards/LEGO_HUB_NO7/mpconfigboard.h | 152 +++++++++++++
 .../boards/LEGO_HUB_NO7/mpconfigboard.mk      |  50 +++++
 ports/stm32/boards/LEGO_HUB_NO7/pins.csv      | 114 ++++++++++
 .../boards/LEGO_HUB_NO7/stm32f4xx_hal_conf.h  |  23 ++
 13 files changed, 910 insertions(+)
 create mode 100644 ports/stm32/boards/LEGO_HUB_NO7/README.md
 create mode 100644 ports/stm32/boards/LEGO_HUB_NO7/bdev.c
 create mode 100644 ports/stm32/boards/LEGO_HUB_NO7/bluetooth_init_cc2564C_1.5.c
 create mode 100644 ports/stm32/boards/LEGO_HUB_NO7/board.json
 create mode 100644 ports/stm32/boards/LEGO_HUB_NO7/board_init.c
 create mode 100644 ports/stm32/boards/LEGO_HUB_NO7/cc2564.c
 create mode 100644 ports/stm32/boards/LEGO_HUB_NO7/hub_display.c
 create mode 100644 ports/stm32/boards/LEGO_HUB_NO7/hub_display.h
 create mode 100644 ports/stm32/boards/LEGO_HUB_NO7/manifest.py
 create mode 100644 ports/stm32/boards/LEGO_HUB_NO7/mpconfigboard.h
 create mode 100644 ports/stm32/boards/LEGO_HUB_NO7/mpconfigboard.mk
 create mode 100644 ports/stm32/boards/LEGO_HUB_NO7/pins.csv
 create mode 100644 ports/stm32/boards/LEGO_HUB_NO7/stm32f4xx_hal_conf.h

diff --git a/ports/stm32/boards/LEGO_HUB_NO7/README.md b/ports/stm32/boards/LEGO_HUB_NO7/README.md
new file mode 100644
index 0000000000000..8159cf3f47130
--- /dev/null
+++ b/ports/stm32/boards/LEGO_HUB_NO7/README.md
@@ -0,0 +1,135 @@
+LEGO Hub No.7
+=============
+
+This board definition is for the LEGO Hub No. 7, a LEGO control unit with 1 button,
+2 RGB LEDs, 2 Powered Up ports, 6-DOF sensor, Bluetooth, USB, 4MiB external SPI
+flash storage, and a rechargeable battery.
+
+Features that are currently supported:
+- standard MicroPython
+- machine and bluetooth modules
+- filesystem
+- USB VCP, MSC and HID
+
+The Hub has a bootloader preinstalled at 0x08000000 (which is 32kiB in size) which
+cannot be erased.  This bootloader is entered by holding down the button for 5 seconds,
+at which point the USB DFU device appears.  If the battery is installed then the
+RGB LED will flash purple. If the battery is not installed, the LED will flash orange
+briefly and then the hub will turn off (so having the battery installed is required).
+When this bootloader is active, the flash from 0x08008000 and up can be erased
+and programmed via USB DFU.
+
+The built-in bootloader has some drawbacks: it cannot be entered programmatically,
+and it does not keep the Hub powered up when running from battery (which requires
+keeping BAT_PWR_EN high).  As such, this board is configured to work with mboot as
+a secondary bootloader: mboot is placed at 0x08008000 and the main application
+firmware at 0x08010000.  When mboot is installed it can be entered programatically
+via machine.bootloader().
+
+Backing up original Hub firmware
+--------------------------------
+
+Before installing MicroPython it is advised to backup the original LEGO firmware that
+the Hub comes installed with.  To do this, enter the built-in bootloader by holding
+down the power button for 5 seconds while powering up the Hub via USB (you may
+need to take out the battery and disconnect USB to power off the Hub first).  Then
+run the following command from the root of this repository:
+
+    $ cd ports/stm32
+    $ make BOARD=LEGO_HUB_NO7 backup-hub-firmware
+
+This will create a file called `lego_hub_firmware.dfu`.  Put this file in a safe
+location.  To restore it, enter the built-in bootloader again and run:
+
+    $ make BOARD=LEGO_HUB_NO7 restore-hub-firmware
+
+This will restore the original firmware but not the filesystem.  To recreate the
+original filesystem the Hub must be updated using the appropriate LEGO PC
+application.
+
+Installing MicroPython
+----------------------
+
+You first need to build and install mboot, which only needs to be done once.  From
+the root of this repository run:
+
+    $ cd ports/stm32/mboot
+    $ make BOARD=LEGO_HUB_NO7
+
+Now enter the built-in bootloader by holding down the power button for 5
+seconds while powering up the Hub via USB (you may need to take out the battery
+and disconnect USB to power off the Hub first).  Then run:
+
+    $ make BOARD=LEGO_HUB_NO7 deploy
+
+mboot should now be installed.  To enter mboot, remove USB and the battery.
+Connect the USB cable (the other end of the USB cable must be connected to
+something that provides power). The status light should start cycling through
+different colors. Replace the battery (the button will not work without the
+battery present). Press the button to activate the desired boot mode:
+
+- Status light is red - run application (normal boot).
+- Status light is green - run application in factory file system mode.
+- Status light is blue - run application in safe mode.
+- Status light is white - start DFU on the USB port.
+
+
+Now build MicroPython (start at the root of this repository):
+
+    $ cd mpy-cross
+    $ make
+    $ cd ../ports/stm32
+    $ make submodules
+    $ make BOARD=LEGO_HUB_NO7
+
+And deploy to the Hub (making sure mboot DFU is active, the center button is
+blinking red):
+
+    $ make BOARD=LEGO_HUB_NO7 deploy
+
+If successful, the Hub should now appear as a USB serial and mass storage device.
+
+Using MicroPython on the Hub
+----------------------------
+
+Access the MicroPython REPL using mpremote (pip install mpremote), or with any
+serial terminal program.
+
+To scan for BLE devices:
+
+    >>> import bluetooth
+    >>> ble = bluetooth.BLE()
+    >>> ble.irq(lambda *x: print(*x))
+    >>> ble.active(1)
+    >>> ble.gap_scan(2000, 625, 625)
+
+Use help("modules") to see available built-in modules.
+
+Updating MicroPython from the Hub's filesystem
+----------------------------------------------
+
+You can update the MicroPython application firmware using the instructions above
+for installing the firmware for the first time.  The Hub also supports updating
+the application firmware from within MicroPython itself, using the on-board
+filesystem.
+
+To use this feature, build the firmware (see above for details) then gzip it and
+copy the resulting file to the Hub (eg using mpremote):
+
+    $ make BOARD=LEGO_HUB_NO7
+    $ gzip build-LEGO_HUB_NO7/firmware.dfu
+    $ mpremote cp build-LEGO_HUB_NO7/firmware.dfu.gz :
+
+Then get a REPL on the Hub and execute:
+
+    >>> import appupdate
+    >>> appupdate.update_app("firmware.dfu.gz")
+
+You can alternatively run this REPL command using mpremote:
+
+    $ mpremote exec --no-follow "import appupdate; appupdate.update_app('firmware.dfu.gz')"
+
+At that point the Hub should restart and the LED on the central button will flash
+different colours.  Once the update is complete the LED will stop flashing and the
+Hub will appear again as a USB device.  The application firmware is now updated
+and you can remove the firmware.dfu.gz file if desired.
diff --git a/ports/stm32/boards/LEGO_HUB_NO7/bdev.c b/ports/stm32/boards/LEGO_HUB_NO7/bdev.c
new file mode 100644
index 0000000000000..f104c0f3f4634
--- /dev/null
+++ b/ports/stm32/boards/LEGO_HUB_NO7/bdev.c
@@ -0,0 +1,3 @@
+// LEGO_HUB_NO7 is identical to LEGO_HUB_NO6 in this regard.
+
+#include "../LEGO_HUB_NO6/bdev.c"
diff --git a/ports/stm32/boards/LEGO_HUB_NO7/bluetooth_init_cc2564C_1.5.c b/ports/stm32/boards/LEGO_HUB_NO7/bluetooth_init_cc2564C_1.5.c
new file mode 100644
index 0000000000000..6ea298f68839e
--- /dev/null
+++ b/ports/stm32/boards/LEGO_HUB_NO7/bluetooth_init_cc2564C_1.5.c
@@ -0,0 +1,3 @@
+// LEGO_HUB_NO7 is identical to LEGO_HUB_NO6 in this regard.
+
+#include "../LEGO_HUB_NO6/bluetooth_init_cc2564C_1.5.c"
diff --git a/ports/stm32/boards/LEGO_HUB_NO7/board.json b/ports/stm32/boards/LEGO_HUB_NO7/board.json
new file mode 100644
index 0000000000000..1ef02c17a0636
--- /dev/null
+++ b/ports/stm32/boards/LEGO_HUB_NO7/board.json
@@ -0,0 +1,13 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [],
+    "images": [],
+    "mcu": "stm32f4",
+    "product": "Hub No.7",
+    "thumbnail": "",
+    "url": "",
+    "vendor": "LEGO"
+}
diff --git a/ports/stm32/boards/LEGO_HUB_NO7/board_init.c b/ports/stm32/boards/LEGO_HUB_NO7/board_init.c
new file mode 100644
index 0000000000000..7b155b1c3cea8
--- /dev/null
+++ b/ports/stm32/boards/LEGO_HUB_NO7/board_init.c
@@ -0,0 +1,212 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021-2022 Damien P. George
+ * Copyright (c) 2022 David Lechner <david@pybricks.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "py/mphal.h"
+#include "irq.h"
+
+void board_init(void) {
+    if (query_irq() == IRQ_STATE_DISABLED) {
+        enable_irq(IRQ_STATE_ENABLED);
+    }
+
+    // Enable 3V3 for all ports
+    mp_hal_pin_output(pyb_pin_PORT_3V3_EN);
+    mp_hal_pin_high(pyb_pin_PORT_3V3_EN);
+
+    // Port A
+    // Enable RX/TX buffer
+    mp_hal_pin_output(pyb_pin_PORTA_EN);
+    mp_hal_pin_low(pyb_pin_PORTA_EN);
+
+    // Port B
+    // Enable RX/TX buffer
+    mp_hal_pin_output(pyb_pin_PORTB_EN);
+    mp_hal_pin_low(pyb_pin_PORTB_EN);
+}
+
+#if BUILDING_MBOOT
+
+#include "drivers/memory/spiflash.h"
+#include "mboot/mboot.h"
+#include "boardctrl.h"
+#include "adc.h"
+#include "hub_display.h"
+
+#define RESET_MODE_NUM_STATES (4)
+#define RESET_MODE_TIMEOUT_CYCLES (8)
+
+// Location and value for the SPI flash update key.  If this key exists at the defined
+// location then mboot will attempt to do a filesystem-load update of the main firmware.
+// This makes the update robust to power failures: if the update does not complete then
+// it will be restarted the next time it powers up.  Only when it fully completes will
+// this key be erased, and then the application can run.
+#define SPIFLASH_UPDATE_KEY_ADDR (1020 * 1024)
+#define SPIFLASH_UPDATE_KEY_VALUE (0x12345678)
+
+static void board_led_pattern(int reset_mode, uint16_t brightness) {
+    switch (reset_mode) {
+        case BOARDCTRL_RESET_MODE_NORMAL:
+            // set status light to red
+            hub_display_set(3, brightness);
+            hub_display_set(4, 0);
+            hub_display_set(5, 0);
+            break;
+        case BOARDCTRL_RESET_MODE_SAFE_MODE:
+            // set status light to green
+            hub_display_set(3, 0);
+            hub_display_set(4, brightness);
+            hub_display_set(5, 0);
+            break;
+        case BOARDCTRL_RESET_MODE_FACTORY_FILESYSTEM:
+            // set status light to blue
+            hub_display_set(3, 0);
+            hub_display_set(4, 0);
+            hub_display_set(5, brightness);
+            break;
+        case BOARDCTRL_RESET_MODE_BOOTLOADER:
+            // set status light to white
+            hub_display_set(3, brightness);
+            hub_display_set(4, brightness);
+            hub_display_set(5, brightness);
+            break;
+    }
+
+    hub_display_update();
+}
+
+static void board_battery_init(void) {
+    mp_hal_pin_config(pyb_pin_BAT_VMON_ADC, MP_HAL_PIN_MODE_ADC, MP_HAL_PIN_PULL_NONE, 0);
+    adc_config(ADC1, 12);
+}
+
+// returns true if the battery is pressed, otherwise false
+static int board_battery_state(void) {
+    uint16_t value = adc_config_and_read_u16(ADC1, 6, ADC_SAMPLETIME_15CYCLES);
+    // If battery voltage is above USB voltage, then we consider the battery
+    // to be present.
+    return value > 41100; // 41100 is approx 5.5V
+}
+
+static void board_button_init(void) {
+    mp_hal_pin_input(pyb_pin_BUTTON);
+}
+
+// returns true if the button is pressed, otherwise false
+static int board_button_state(void) {
+    // button is active low
+    return !mp_hal_pin_read(pyb_pin_BUTTON);
+}
+
+void board_mboot_cleanup(int reset_mode) {
+    board_led_pattern(0, 0);
+    hub_display_off();
+}
+
+void board_mboot_led_init(void) {
+    hub_display_on();
+}
+
+void board_mboot_led_state(int led, int state) {
+    if (state) {
+        hub_display_set(3 + led, 0x7fff);
+    } else {
+        hub_display_set(3 + led, 0);
+    }
+
+    hub_display_update();
+}
+
+int board_mboot_get_reset_mode(uint32_t *initial_r0) {
+    board_battery_init();
+    board_button_init();
+    int reset_mode = BOARDCTRL_RESET_MODE_NORMAL;
+
+    if (board_battery_state()) {
+        // Battery is present, check flash for update key and start an update if the key exists.
+        // Otherwise, boot normally.
+
+        // Initialise the external SPI flash.
+        MBOOT_SPIFLASH_SPIFLASH->config = MBOOT_SPIFLASH_CONFIG;
+        mp_spiflash_init(MBOOT_SPIFLASH_SPIFLASH);
+
+        // Read in the key.
+        uint32_t buf;
+        mp_spiflash_read(MBOOT_SPIFLASH_SPIFLASH, SPIFLASH_UPDATE_KEY_ADDR, 4, (uint8_t *)&buf);
+
+        if (buf == SPIFLASH_UPDATE_KEY_VALUE) {
+            // The key has the correct value, so read in the FS-load elements and enter the bootloader.
+            mp_spiflash_read(MBOOT_SPIFLASH_SPIFLASH, SPIFLASH_UPDATE_KEY_ADDR + 4, ELEM_DATA_SIZE, ELEM_DATA_START);
+            *initial_r0 = MBOOT_INITIAL_R0_KEY_FSLOAD;
+            reset_mode = BOARDCTRL_RESET_MODE_BOOTLOADER;
+        }
+    } else {
+        // Battery is not present. Cycle through reset modes until button is pressed.
+        systick_init();
+        hub_display_on();
+        reset_mode = 0;
+        for (int i = 0; i < (RESET_MODE_NUM_STATES * RESET_MODE_TIMEOUT_CYCLES + 1) * 64; i++) {
+            if (i % 64 == 0) {
+                if (++reset_mode > RESET_MODE_NUM_STATES) {
+                    reset_mode = BOARDCTRL_RESET_MODE_NORMAL;
+                }
+                board_led_pattern(reset_mode, 0x7fff);
+            }
+
+            if (board_button_state()) {
+                break;
+            }
+
+            mp_hal_delay_ms(19);
+        }
+
+        // Flash the selected reset mode.
+        for (int i = 0; i < 6; i++) {
+            board_led_pattern(reset_mode, 0x0fff);
+            mp_hal_delay_ms(50);
+            board_led_pattern(reset_mode, 0x7fff);
+            mp_hal_delay_ms(50);
+        }
+
+        mp_hal_delay_ms(300);
+    }
+
+    board_led_pattern(0, 0);
+    return reset_mode;
+}
+
+void board_mboot_state_change(int state, uint32_t arg) {
+    if (state == MBOOT_STATE_FSLOAD_END) {
+        // The FS-load update completed (either with success or failure), so erase the
+        // update key and write the result of the FS-load operation into flash.
+        mp_spiflash_erase_block(MBOOT_SPIFLASH_SPIFLASH, SPIFLASH_UPDATE_KEY_ADDR);
+        mp_spiflash_write(MBOOT_SPIFLASH_SPIFLASH, SPIFLASH_UPDATE_KEY_ADDR + 4, 4, (const uint8_t *)&arg);
+    }
+
+    mboot_state_change_default(state, arg);
+}
+
+#endif
diff --git a/ports/stm32/boards/LEGO_HUB_NO7/cc2564.c b/ports/stm32/boards/LEGO_HUB_NO7/cc2564.c
new file mode 100644
index 0000000000000..e5bfe1b4d4ca6
--- /dev/null
+++ b/ports/stm32/boards/LEGO_HUB_NO7/cc2564.c
@@ -0,0 +1,6 @@
+// LEGO_HUB_NO7 is nearly identical to LEGO_HUB_NO6 in this regard.
+
+#define CC2564_TIMER_BT_SLOWCLOCK_TIM 2
+#define CC2564_TIMER_BT_SLOWCLOCK_TIM_CH 2
+
+#include "../LEGO_HUB_NO6/cc2564.c"
diff --git a/ports/stm32/boards/LEGO_HUB_NO7/hub_display.c b/ports/stm32/boards/LEGO_HUB_NO7/hub_display.c
new file mode 100644
index 0000000000000..e19485b0646f9
--- /dev/null
+++ b/ports/stm32/boards/LEGO_HUB_NO7/hub_display.c
@@ -0,0 +1,190 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Damien P. George
+ * Copyright (c) 2022 David Lechner <david@pybricks.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "py/mphal.h"
+#include "hub_display.h"
+
+#include STM32_HAL_H
+
+#define I2C_ADDR 0x28
+
+// Registers
+#define DEVICE_CONFIG0          0x00
+#define DEVICE_CONFIG1          0x01
+#define LED_CONFIG0             0x02
+#define BANK_BRIGHTNESS         0x03
+#define BANK_A_COLOR            0x04
+#define BANK_B_COLOR            0x05
+#define BANK_C_COLOR            0x06
+#define LED0_BRIGHTNESS         0x07
+#define LED1_BRIGHTNESS         0x08
+#define LED2_BRIGHTNESS         0x09
+#define LED3_BRIGHTNESS         0x0A
+#define OUT0_COLOR              0x0B
+#define OUT1_COLOR              0x0C
+#define OUT2_COLOR              0x0D
+#define OUT3_COLOR              0x0E
+#define OUT4_COLOR              0x0F
+#define OUT5_COLOR              0x10
+#define OUT6_COLOR              0x11
+#define OUT7_COLOR              0x12
+#define OUT8_COLOR              0x13
+#define OUT9_COLOR              0x14
+#define OUT10_COLOR             0x15
+#define OUT11_COLOR             0x16
+#define RESET                   0x17
+
+// Flags
+#define DEVICE_CONFIG0_CHIP_EN              (1 << 6)
+#define DEVICE_CONFIG1_LOG_SCALE_EN         (1 << 5)
+#define DEVICE_CONFIG1_POWER_SAVE_EN        (1 << 4)
+#define DEVICE_CONFIG1_AUTO_INCR_EN         (1 << 3)
+#define DEVICE_CONFIG1_PWM_DITHERING_EN     (1 << 2)
+#define DEVICE_CONFIG1_MAX_CURRENT_OPTION   (1 << 1)
+#define DEVICE_CONFIG1_LED_GLOBAL_OFF       (1 << 0)
+#define LED_CONFIG0_LED3_BANK_EN            (1 << 3)
+#define LED_CONFIG0_LED2_BANK_EN            (1 << 2)
+#define LED_CONFIG0_LED1_BANK_EN            (1 << 1)
+#define LED_CONFIG0_LED0_BANK_EN            (1 << 0)
+
+#define LP50XX_NUM_CH 6
+
+// channel mapping:
+// CH 0 = battery LED - red
+// CH 1 = battery LED - green
+// CH 2 = battery LED - blue
+// CH 3 = status LED - red
+// CH 4 = status LED - green
+// CH 5 = status LED - blue
+
+#define FMPI2C_CONVERT_TIMINGS(PRESC, SCLDEL, SDADEL, SCLH, SCLL) \
+    (((PRESC) << FMPI2C_TIMINGR_PRESC_Pos) | \
+    ((SCLDEL) << FMPI2C_TIMINGR_SCLDEL_Pos) | \
+    ((SDADEL) << FMPI2C_TIMINGR_SDADEL_Pos) | \
+    ((SCLH) << FMPI2C_TIMINGR_SCLH_Pos) | \
+    ((SCLL) << FMPI2C_TIMINGR_SCLL_Pos))
+
+static FMPI2C_HandleTypeDef hub_display_i2c;
+static bool hub_display_init;
+
+static struct {
+    uint8_t reg;
+    uint8_t values[LP50XX_NUM_CH];
+} __attribute__((packed)) hub_display_data = {
+    .reg = OUT0_COLOR,
+};
+
+void HAL_FMPI2C_MspInit(FMPI2C_HandleTypeDef *hfmpi2c) {
+    __HAL_RCC_FMPI2C1_CLK_ENABLE();
+    mp_hal_pin_config(pyb_pin_LED_SCL, MP_HAL_PIN_MODE_ALT_OPEN_DRAIN, MP_HAL_PIN_PULL_NONE, 4);
+    mp_hal_pin_config(pyb_pin_LED_SDA, MP_HAL_PIN_MODE_ALT_OPEN_DRAIN, MP_HAL_PIN_PULL_NONE, 4);
+}
+
+void HAL_FMPI2C_MspDeInit(FMPI2C_HandleTypeDef *hfmpi2c) {
+    __HAL_RCC_FMPI2C1_CLK_DISABLE();
+    __HAL_RCC_FMPI2C1_FORCE_RESET();
+    __HAL_RCC_FMPI2C1_RELEASE_RESET();
+    mp_hal_pin_config(pyb_pin_LED_SCL, MP_HAL_PIN_MODE_ANALOG, MP_HAL_PIN_PULL_NONE, 0);
+    mp_hal_pin_config(pyb_pin_LED_SDA, MP_HAL_PIN_MODE_ANALOG, MP_HAL_PIN_PULL_NONE, 0);
+}
+
+static void hub_display_i2c_init(void) {
+    hub_display_i2c.Instance = FMPI2C1;
+    hub_display_i2c.Init.Timing = FMPI2C_CONVERT_TIMINGS(0, 4, 0, 19, 28);
+    hub_display_i2c.Init.OwnAddress1 = 0;
+    hub_display_i2c.Init.AddressingMode = FMPI2C_ADDRESSINGMODE_7BIT;
+    hub_display_i2c.Init.DualAddressMode = FMPI2C_DUALADDRESS_DISABLE;
+    hub_display_i2c.Init.OwnAddress2 = 0;
+    hub_display_i2c.Init.OwnAddress2Masks = FMPI2C_OA2_NOMASK;
+    hub_display_i2c.Init.GeneralCallMode = FMPI2C_GENERALCALL_DISABLE;
+    hub_display_i2c.Init.NoStretchMode = FMPI2C_NOSTRETCH_DISABLE;
+    HAL_FMPI2C_Init(&hub_display_i2c);
+}
+
+void hub_display_set(uint8_t led, uint16_t value) {
+    if (led >= LP50XX_NUM_CH) {
+        return;
+    }
+
+    hub_display_data.values[led] = value >> 8;
+}
+
+void hub_display_update(void) {
+    if (!hub_display_init) {
+        return;
+    }
+
+    HAL_FMPI2C_Master_Transmit(&hub_display_i2c, I2C_ADDR, (uint8_t *)&hub_display_data,
+        sizeof(hub_display_data), HAL_MAX_DELAY);
+}
+
+void hub_display_on(void) {
+    if (hub_display_init) {
+        return;
+    }
+
+    hub_display_i2c_init();
+    mp_hal_pin_output(pyb_pin_LED_EN);
+    mp_hal_pin_high(pyb_pin_LED_EN);
+
+    static const struct {
+        uint8_t reg;
+        uint8_t values[11];
+    } __attribute__((packed)) init_data = {
+        .reg = DEVICE_CONFIG0,
+        .values = {
+            [DEVICE_CONFIG0] = DEVICE_CONFIG0_CHIP_EN,
+            [DEVICE_CONFIG1] = DEVICE_CONFIG1_POWER_SAVE_EN | DEVICE_CONFIG1_PWM_DITHERING_EN | DEVICE_CONFIG1_AUTO_INCR_EN,
+            [LED_CONFIG0] = 0,
+            [BANK_BRIGHTNESS] = 0,
+            [BANK_A_COLOR] = 0,
+            [BANK_B_COLOR] = 0,
+            [BANK_C_COLOR] = 0,
+            [LED0_BRIGHTNESS] = 51, // battery LED
+            [LED1_BRIGHTNESS] = 38, // status LED
+            [LED2_BRIGHTNESS] = 0,
+            [LED3_BRIGHTNESS] = 0,
+        }
+    };
+
+    HAL_FMPI2C_Master_Transmit(&hub_display_i2c, I2C_ADDR, (uint8_t *)&init_data,
+        sizeof(init_data), HAL_MAX_DELAY);
+
+    hub_display_init = true;
+}
+
+void hub_display_off(void) {
+    if (!hub_display_init) {
+        return;
+    }
+
+    HAL_FMPI2C_DeInit(&hub_display_i2c);
+
+    mp_hal_pin_config(pyb_pin_LED_EN, MP_HAL_PIN_MODE_ANALOG, MP_HAL_PIN_PULL_NONE, 0);
+
+    hub_display_init = false;
+}
diff --git a/ports/stm32/boards/LEGO_HUB_NO7/hub_display.h b/ports/stm32/boards/LEGO_HUB_NO7/hub_display.h
new file mode 100644
index 0000000000000..7623e128a804c
--- /dev/null
+++ b/ports/stm32/boards/LEGO_HUB_NO7/hub_display.h
@@ -0,0 +1,4 @@
+void hub_display_on(void);
+void hub_display_off(void);
+void hub_display_update(void);
+void hub_display_set(uint8_t led, uint16_t value);
diff --git a/ports/stm32/boards/LEGO_HUB_NO7/manifest.py b/ports/stm32/boards/LEGO_HUB_NO7/manifest.py
new file mode 100644
index 0000000000000..d746381637d96
--- /dev/null
+++ b/ports/stm32/boards/LEGO_HUB_NO7/manifest.py
@@ -0,0 +1,5 @@
+include("$(PORT_DIR)/boards/manifest.py")
+
+# Modules for application firmware update.
+freeze("$(PORT_DIR)/mboot", "fwupdate.py", opt=3)
+freeze("$(PORT_DIR)/boards/LEGO_HUB_NO6", ("spiflash.py", "appupdate.py"), opt=3)
diff --git a/ports/stm32/boards/LEGO_HUB_NO7/mpconfigboard.h b/ports/stm32/boards/LEGO_HUB_NO7/mpconfigboard.h
new file mode 100644
index 0000000000000..50fb6c0607f89
--- /dev/null
+++ b/ports/stm32/boards/LEGO_HUB_NO7/mpconfigboard.h
@@ -0,0 +1,152 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ * The MIT License (MIT)
+ * Copyright (c) 2021 Damien P. George
+ */
+
+#include <stdint.h>
+
+#define MICROPY_HW_BOARD_NAME                    "LEGO Technic Hub No.7"
+#define MICROPY_HW_MCU_NAME                      "STM32F413"
+
+#define MICROPY_HW_HAS_SWITCH                    (0)
+#define MICROPY_HW_HAS_FLASH                     (1)
+#define MICROPY_PY_PYB_LEGACY                    (0)
+#define MICROPY_HW_ENTER_BOOTLOADER_VIA_RESET    (0)
+#define MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE (0)
+#define MICROPY_HW_ENABLE_RTC                    (1)
+#define MICROPY_HW_ENABLE_RNG                    (1)
+#define MICROPY_HW_ENABLE_DAC                    (1)
+#define MICROPY_HW_ENABLE_USB                    (1)
+#define MICROPY_HW_FLASH_FS_LABEL                "HUB_NO7"
+
+// HSE is 16MHz, CPU freq set to 100MHz, buses at maximum freq
+#define MICROPY_HW_CLK_PLLM                      (16)
+#define MICROPY_HW_CLK_PLLN                      (200)
+#define MICROPY_HW_CLK_PLLP                      (RCC_PLLP_DIV2)
+#define MICROPY_HW_CLK_PLLQ                      (4)
+#define MICROPY_HW_CLK_AHB_DIV                   (RCC_SYSCLK_DIV1)
+#define MICROPY_HW_CLK_APB1_DIV                  (RCC_HCLK_DIV2)
+#define MICROPY_HW_CLK_APB2_DIV                  (RCC_HCLK_DIV1)
+
+// For 2.7 to 3.6 V, 75 to 100 MHz: 3 wait states.
+#define MICROPY_HW_FLASH_LATENCY                 FLASH_LATENCY_3
+
+// UART buses
+// Bluetooth HCI
+#define MICROPY_HW_UART2_CTS                     (pyb_pin_BT_CTS)
+#define MICROPY_HW_UART2_RTS                     (pyb_pin_BT_RTS)
+#define MICROPY_HW_UART2_TX                      (pyb_pin_BT_TX)
+#define MICROPY_HW_UART2_RX                      (pyb_pin_BT_RX)
+// Port B
+#define MICROPY_HW_UART3_TX                      (pyb_pin_PORTB_TX)
+#define MICROPY_HW_UART3_RX                      (pyb_pin_PORTB_RX)
+// Port A
+#define MICROPY_HW_UART5_TX                      (pyb_pin_PORTA_TX)
+#define MICROPY_HW_UART5_RX                      (pyb_pin_PORTA_RX)
+
+// SPI buses
+#define MICROPY_HW_SPI2_NSS                      (pyb_pin_FLASH_NSS)
+#define MICROPY_HW_SPI2_SCK                      (pyb_pin_FLASH_SCK)
+#define MICROPY_HW_SPI2_MISO                     (pyb_pin_FLASH_MISO)
+#define MICROPY_HW_SPI2_MOSI                     (pyb_pin_FLASH_MOSI)
+
+// USB config
+#define MICROPY_HW_USB_VBUS_DETECT_PIN           (pyb_pin_USB_VBUS)
+#define MICROPY_HW_USB_FS                        (1)
+#define MICROPY_HW_USB_MSC                       (1)
+
+// Bluetooth config
+#define MICROPY_HW_BLE_UART_ID                   (PYB_UART_2)
+#define MICROPY_HW_BLE_UART_BAUDRATE             (115200)
+#define MICROPY_HW_BLE_UART_BAUDRATE_SECONDARY   (921600)
+#define MICROPY_HW_BLE_BTSTACK_CHIPSET_INSTANCE  btstack_chipset_cc256x_instance()
+
+// SPI flash, for R/W storage
+// The first 1MiB is skipped because it's used by the built-in bootloader
+// Note: MICROPY_HW_SPIFLASH_OFFSET_BYTES must be a multiple of MP_SPIFLASH_ERASE_BLOCK_SIZE
+#define MICROPY_HW_SPIFLASH_OFFSET_BYTES         (1024 * 1024)
+#define MICROPY_HW_SPIFLASH_BLOCKMAP(bl)         ((bl) + MICROPY_HW_SPIFLASH_OFFSET_BYTES / FLASH_BLOCK_SIZE)
+#define MICROPY_HW_SPIFLASH_BLOCKMAP_EXT(bl)     ((bl) + MICROPY_HW_SPIFLASH_OFFSET_BYTES / MP_SPIFLASH_ERASE_BLOCK_SIZE)
+#define MICROPY_HW_SPIFLASH_ENABLE_CACHE         (1)
+#define MICROPY_HW_SPIFLASH_SIZE_BITS            (32 * 1024 * 1024 - MICROPY_HW_SPIFLASH_OFFSET_BYTES * 8)
+#define MICROPY_HW_SPIFLASH_CS                   (MICROPY_HW_SPI2_NSS)
+#define MICROPY_HW_SPIFLASH_SCK                  (MICROPY_HW_SPI2_SCK)
+#define MICROPY_HW_SPIFLASH_MISO                 (MICROPY_HW_SPI2_MISO)
+#define MICROPY_HW_SPIFLASH_MOSI                 (MICROPY_HW_SPI2_MOSI)
+
+// SPI flash, block device config
+#define MICROPY_HW_BDEV_IOCTL(op, arg) ( \
+    (op) == BDEV_IOCTL_NUM_BLOCKS ? (MICROPY_HW_SPIFLASH_SIZE_BITS / 8 / FLASH_BLOCK_SIZE) : \
+    (op) == BDEV_IOCTL_INIT ? spi_bdev_ioctl(&spi_bdev, (op), (uint32_t)&spiflash_config) : \
+    spi_bdev_ioctl(&spi_bdev, (op), (arg)) \
+    )
+
+// Configuration for stardard block protocol (block size FLASH_BLOCK_SIZE).
+#define MICROPY_HW_BDEV_READBLOCKS(dest, bl, n) \
+    spi_bdev_readblocks(&spi_bdev, (dest), MICROPY_HW_SPIFLASH_BLOCKMAP(bl), (n))
+#define MICROPY_HW_BDEV_WRITEBLOCKS(src, bl, n) \
+    spi_bdev_writeblocks(&spi_bdev, (src), MICROPY_HW_SPIFLASH_BLOCKMAP(bl), (n))
+
+// Configuration for extended block protocol (block size MP_SPIFLASH_ERASE_BLOCK_SIZE).
+#define MICROPY_HW_BDEV_BLOCKSIZE_EXT (MP_SPIFLASH_ERASE_BLOCK_SIZE)
+#define MICROPY_HW_BDEV_READBLOCKS_EXT(dest, bl, off, len) \
+    (spi_bdev_readblocks_raw(&spi_bdev, (dest), MICROPY_HW_SPIFLASH_BLOCKMAP_EXT(bl), (off), (len)))
+#define MICROPY_HW_BDEV_WRITEBLOCKS_EXT(src, bl, off, len) \
+    (spi_bdev_writeblocks_raw(&spi_bdev, (src), MICROPY_HW_SPIFLASH_BLOCKMAP_EXT(bl), (off), (len)))
+#define MICROPY_HW_BDEV_ERASEBLOCKS_EXT(bl, len) \
+    (spi_bdev_eraseblocks_raw(&spi_bdev, MICROPY_HW_SPIFLASH_BLOCKMAP_EXT(bl), (len)))
+
+// Board control config
+#define MICROPY_BOARD_STARTUP                    board_init
+
+/******************************************************************************/
+// Bootloader configuration
+
+// Configure CPU frequency to 96MHz, to make updates from SPI flash faster
+#define MBOOT_CLK_PLLM                           (MICROPY_HW_CLK_VALUE / 1000000)
+#define MBOOT_CLK_PLLN                           (192)
+#define MBOOT_CLK_PLLP                           (RCC_PLLP_DIV2)
+#define MBOOT_CLK_PLLQ                           (4)
+#define MBOOT_CLK_AHB_DIV                        (RCC_SYSCLK_DIV1)
+#define MBOOT_CLK_APB1_DIV                       (RCC_HCLK_DIV4)
+#define MBOOT_CLK_APB2_DIV                       (RCC_HCLK_DIV2)
+#define MBOOT_FLASH_LATENCY                      FLASH_LATENCY_3
+
+#define MBOOT_FSLOAD                             (1)
+#define MBOOT_VFS_FAT                            (1)
+#define MBOOT_LEAVE_BOOTLOADER_VIA_RESET         (0)
+
+#define MBOOT_SPIFLASH_ADDR                      (0x80000000)
+#define MBOOT_SPIFLASH_BYTE_SIZE                 (4 * 1024 * 1024)
+#define MBOOT_SPIFLASH_LAYOUT                    "/0x80000000/1024*4Kg"
+#define MBOOT_SPIFLASH_ERASE_BLOCKS_PER_PAGE     (1)
+#define MBOOT_SPIFLASH_SPIFLASH                  (&board_mboot_spiflash)
+#define MBOOT_SPIFLASH_CONFIG                    (&board_mboot_spiflash_config)
+
+#define MBOOT_LED1                               0
+#define MBOOT_LED2                               1
+#define MBOOT_LED3                               2
+#define MBOOT_BOARD_LED_INIT                     board_mboot_led_init
+#define MBOOT_BOARD_LED_STATE                    board_mboot_led_state
+
+#define MBOOT_BOARD_EARLY_INIT(initial_r0)       board_init()
+#define MBOOT_BOARD_CLEANUP                      board_mboot_cleanup
+#define MBOOT_BOARD_GET_RESET_MODE               board_mboot_get_reset_mode
+#define MBOOT_BOARD_STATE_CHANGE                 board_mboot_state_change
+
+/******************************************************************************/
+// Function declarations
+
+extern const struct _mp_spiflash_config_t spiflash_config;
+extern struct _spi_bdev_t spi_bdev;
+extern const struct _mp_spiflash_config_t board_mboot_spiflash_config;
+extern struct _mp_spiflash_t board_mboot_spiflash;
+
+void board_init(void);
+void board_mboot_cleanup(int reset_mode);
+void board_mboot_led_init(void);
+void board_mboot_led_state(int led, int state);
+int board_mboot_get_reset_mode(uint32_t *initial_r0);
+void board_mboot_state_change(int state, uint32_t arg);
+void *btstack_chipset_cc256x_instance(void);
diff --git a/ports/stm32/boards/LEGO_HUB_NO7/mpconfigboard.mk b/ports/stm32/boards/LEGO_HUB_NO7/mpconfigboard.mk
new file mode 100644
index 0000000000000..c06f9a26ad452
--- /dev/null
+++ b/ports/stm32/boards/LEGO_HUB_NO7/mpconfigboard.mk
@@ -0,0 +1,50 @@
+MCU_SERIES = f4
+CMSIS_MCU = STM32F413xx
+AF_FILE = boards/stm32f413_af.csv
+LD_FILES = boards/LEGO_HUB_NO6/stm32f413xg.ld boards/common_bl.ld
+TEXT0_ADDR = 0x08010000
+
+BOOTLOADER_DFU_USB_VID ?= 0x0694
+BOOTLOADER_DFU_USB_PID ?= 0x000C
+
+# MicroPython settings
+MICROPY_PY_BLUETOOTH ?= 1
+MICROPY_BLUETOOTH_NIMBLE ?= 0
+MICROPY_BLUETOOTH_BTSTACK ?= 1
+MICROPY_VFS_LFS2 ?= 1
+
+# Board specific frozen modules
+FROZEN_MANIFEST ?= $(BOARD_DIR)/manifest.py
+
+SRC_HAL += $(STM32LIB_HAL_BASE)/Src/stm32f4xx_hal_fmpi2c.c
+
+ifneq ($(BUILDING_MBOOT),1)
+LIB_SRC_C += lib/btstack/chipset/cc256x/btstack_chipset_cc256x.c
+endif
+
+# Bootloader settings
+MBOOT_TEXT0_ADDR = 0x08008000
+MBOOT_LD_FILES = ../boards/LEGO_HUB_NO6/mboot_memory.ld stm32_sections.ld
+
+# Backup/restore original Hub firmware
+
+HUB_FIRMWARE = lego_hub_firmware.dfu
+HUB_FIRMWARE_ADDR = $(MBOOT_TEXT0_ADDR)
+HUB_FIRMWARE_SIZE = 0xf8000
+
+backup-hub-firmware:
+	$(Q)$(DFU_UTIL) -a 0 \
+		-d $(BOOTLOADER_DFU_USB_VID):$(BOOTLOADER_DFU_USB_PID) \
+		-U $(HUB_FIRMWARE).bin \
+		-s $(HUB_FIRMWARE_ADDR):$(HUB_FIRMWARE_SIZE)
+	$(Q)$(PYTHON) $(DFU) \
+		-b $(HUB_FIRMWARE_ADDR):$(HUB_FIRMWARE).bin \
+		-D $(BOOTLOADER_DFU_USB_VID):$(BOOTLOADER_DFU_USB_PID) \
+		$(HUB_FIRMWARE)
+	$(Q)$(RM) $(HUB_FIRMWARE).bin
+	$(ECHO) "Backup created in $(HUB_FIRMWARE)"
+
+restore-hub-firmware:
+	$(Q)$(DFU_UTIL) -a 0 \
+		-d $(BOOTLOADER_DFU_USB_VID):$(BOOTLOADER_DFU_USB_PID) \
+		-D $(HUB_FIRMWARE)
diff --git a/ports/stm32/boards/LEGO_HUB_NO7/pins.csv b/ports/stm32/boards/LEGO_HUB_NO7/pins.csv
new file mode 100644
index 0000000000000..dd19518b78a9e
--- /dev/null
+++ b/ports/stm32/boards/LEGO_HUB_NO7/pins.csv
@@ -0,0 +1,114 @@
+BT_CTS,PA0
+BT_RTS,PA1
+BT_TX,PA2
+BT_RX,PA3
+,PA4
+,PA5
+BAT_VMON_ADC,PA6
+BAT_IMON_ADC,PA7
+LSM6_SCL,PA8
+USB_VBUS,PA9
+CHGMODE,PA10
+USB_DM,PA11
+USB_DP,PA12
+,PA13
+,PA14
+,PA15
+BAT_NTC,PB0
+BAT_PWR_EN,PB1
+BUTTON,PB2
+BT_SLOWCLK,PB3
+PORTB_M1,PB4
+PORTB_M2,PB5
+PORTA_M1,PB6
+PORTA_M2,PB7
+PORTB_EN,PB8
+PORTA_EN,PB9
+FLASH_SCK,PB10
+,PB11
+FLASH_NSS,PB12
+LED_EN,PB13
+LED_SDA,PB14
+LED_SCL,PB15
+,PC0
+,PC1
+FLASH_MISO,PC2
+FLASH_MOSI,PC3
+CHG_IMON_ADC,PC4
+,PC5
+CHGOK,PC6
+PORT_3V3_EN,PC7
+BT_ENABLE,PC8
+LSM6_SDA,PC9
+PORTB_TX,PC10
+PORTB_RX,PC11
+PORTA_TX,PC12
+LSM6_INT1,PC13
+,PC14
+,PC15
+,PD0
+,PD1
+PORTA_RX,PD2
+,PD3
+,PD4
+,PD5
+,PD6
+,PD7
+,PD8
+,PD9
+,PD10
+,PD11
+,PD12
+,PD13
+,PD14
+,PD15
+,PE0
+,PE1
+,PE2
+,PE3
+,PE4
+,PE5
+,PE6
+,PE7
+,PE8
+,PE9
+,PE10
+,PE11
+,PE12
+,PE13
+,PE14
+,PE15
+,PF0
+,PF1
+,PF2
+,PF3
+,PF4
+,PF5
+,PF6
+,PF7
+,PF8
+,PF9
+,PF10
+,PF11
+,PF12
+,PF13
+,PF14
+,PF15
+,PG0
+,PG1
+,PG2
+,PG3
+,PG4
+,PG5
+,PG6
+,PG7
+,PG8
+,PG9
+,PG10
+,PG11
+,PG12
+,PG13
+,PG14
+,PG15
+,PH0
+,PH1
diff --git a/ports/stm32/boards/LEGO_HUB_NO7/stm32f4xx_hal_conf.h b/ports/stm32/boards/LEGO_HUB_NO7/stm32f4xx_hal_conf.h
new file mode 100644
index 0000000000000..bd70912748a55
--- /dev/null
+++ b/ports/stm32/boards/LEGO_HUB_NO7/stm32f4xx_hal_conf.h
@@ -0,0 +1,23 @@
+/* This file is part of the MicroPython project, http://micropython.org/
+ * The MIT License (MIT)
+ * Copyright (c) 2019 Damien P. George
+ */
+#ifndef MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H
+#define MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H
+
+#include "boards/stm32f4xx_hal_conf_base.h"
+
+#include "stm32f4xx_hal_fmpi2c.h"
+
+#define HAL_FMPI2C_MODULE_ENABLED
+
+// Oscillator values in Hz
+#define HSE_VALUE (16000000)
+#define LSE_VALUE (32768)
+#define EXTERNAL_CLOCK_VALUE (12288000)
+
+// Oscillator timeouts in ms
+#define HSE_STARTUP_TIMEOUT (100)
+#define LSE_STARTUP_TIMEOUT (5000)
+
+#endif // MICROPY_INCLUDED_STM32F4XX_HAL_CONF_H

From b560b9fe715e293caef80533d61d8c3b179b0339 Mon Sep 17 00:00:00 2001
From: Ian Davies <git@iandavies.org>
Date: Sun, 3 Jul 2022 18:35:17 +0100
Subject: [PATCH 2436/3533] rp2/mbedtls: Enable certificate validity time
 validation.

---
 ports/rp2/mbedtls/mbedtls_config.h | 6 ++++++
 ports/rp2/mbedtls/mbedtls_port.c   | 9 +++++++++
 2 files changed, 15 insertions(+)

diff --git a/ports/rp2/mbedtls/mbedtls_config.h b/ports/rp2/mbedtls/mbedtls_config.h
index 4bf606f5ea23b..743d0a6a8425e 100644
--- a/ports/rp2/mbedtls/mbedtls_config.h
+++ b/ports/rp2/mbedtls/mbedtls_config.h
@@ -93,6 +93,8 @@
 #define MBEDTLS_TLS_DEFAULT_ALLOW_SHA1_IN_KEY_EXCHANGE
 #define MBEDTLS_X509_CRT_PARSE_C
 #define MBEDTLS_X509_USE_C
+#define MBEDTLS_HAVE_TIME
+#define MBEDTLS_HAVE_TIME_DATE
 
 // Memory allocation hooks
 #include <stdlib.h>
@@ -103,6 +105,10 @@ void m_tracked_free(void *ptr);
 #define MBEDTLS_PLATFORM_STD_FREE m_tracked_free
 #define MBEDTLS_PLATFORM_SNPRINTF_MACRO snprintf
 
+// Time hook
+time_t rp2_rtctime_seconds(time_t *timer);
+#define MBEDTLS_PLATFORM_TIME_MACRO rp2_rtctime_seconds
+
 #include "mbedtls/check_config.h"
 
 #endif /* MICROPY_INCLUDED_MBEDTLS_CONFIG_H */
diff --git a/ports/rp2/mbedtls/mbedtls_port.c b/ports/rp2/mbedtls/mbedtls_port.c
index aa0f9a36e0eaa..9067eca90ee55 100644
--- a/ports/rp2/mbedtls/mbedtls_port.c
+++ b/ports/rp2/mbedtls/mbedtls_port.c
@@ -29,6 +29,9 @@
 
 #include "mbedtls_config.h"
 
+#include "hardware/rtc.h"
+#include "shared/timeutils/timeutils.h"
+
 extern uint8_t rosc_random_u8(size_t cycles);
 
 int mbedtls_hardware_poll(void *data, unsigned char *output, size_t len, size_t *olen) {
@@ -39,4 +42,10 @@ int mbedtls_hardware_poll(void *data, unsigned char *output, size_t len, size_t
     return 0;
 }
 
+time_t rp2_rtctime_seconds(time_t *timer) {
+    datetime_t t;
+    rtc_get_datetime(&t);
+    return timeutils_seconds_since_epoch(t.year, t.month, t.day, t.hour, t.min, t.sec);
+}
+
 #endif

From fbe9417b90474dd1a08749b3a79311a8007a98fb Mon Sep 17 00:00:00 2001
From: Ian Davies <git@iandavies.org>
Date: Wed, 6 Jul 2022 16:22:57 +0100
Subject: [PATCH 2437/3533] extmod/ntptime: Factor out ntptime module from
 esp8266 port.

The ntptime module was previously only included in the ESP8266 port.  This
commit factors that module out into the extmod directory, makes it support
different epochs, and includes it in the rp2 port.
---
 {ports/esp8266/modules => extmod}/ntptime.py  | 17 +++++++++++++----
 ports/esp32/boards/manifest.py                |  2 +-
 ports/esp8266/boards/GENERIC_512K/manifest.py |  1 -
 ports/esp8266/boards/manifest.py              |  1 +
 ports/rp2/boards/PICO_W/manifest.py           |  1 +
 5 files changed, 16 insertions(+), 6 deletions(-)
 rename {ports/esp8266/modules => extmod}/ntptime.py (69%)

diff --git a/ports/esp8266/modules/ntptime.py b/extmod/ntptime.py
similarity index 69%
rename from ports/esp8266/modules/ntptime.py
rename to extmod/ntptime.py
index dd07e46f1d3b4..05d7e9717d82d 100644
--- a/ports/esp8266/modules/ntptime.py
+++ b/extmod/ntptime.py
@@ -1,3 +1,5 @@
+import utime
+
 try:
     import usocket as socket
 except:
@@ -7,9 +9,6 @@
 except:
     import struct
 
-# (date(2000, 1, 1) - date(1900, 1, 1)).days * 24*60*60
-NTP_DELTA = 3155673600
-
 # The NTP host can be configured at runtime by doing: ntptime.host = 'myhost.org'
 host = "pool.ntp.org"
 
@@ -26,6 +25,17 @@ def time():
     finally:
         s.close()
     val = struct.unpack("!I", msg[40:44])[0]
+
+    EPOCH_YEAR = utime.gmtime(0)[0]
+    if EPOCH_YEAR == 2000:
+        # (date(2000, 1, 1) - date(1900, 1, 1)).days * 24*60*60
+        NTP_DELTA = 3155673600
+    elif EPOCH_YEAR == 1970:
+        # (date(1970, 1, 1) - date(1900, 1, 1)).days * 24*60*60
+        NTP_DELTA = 2208988800
+    else:
+        raise Exception("Unsupported epoch: {}".format(EPOCH_YEAR))
+
     return val - NTP_DELTA
 
 
@@ -33,7 +43,6 @@ def time():
 def settime():
     t = time()
     import machine
-    import utime
 
     tm = utime.gmtime(t)
     machine.RTC().datetime((tm[0], tm[1], tm[2], tm[6] + 1, tm[3], tm[4], tm[5], 0))
diff --git a/ports/esp32/boards/manifest.py b/ports/esp32/boards/manifest.py
index 1dc1481a420df..f0ed38b515c71 100644
--- a/ports/esp32/boards/manifest.py
+++ b/ports/esp32/boards/manifest.py
@@ -1,6 +1,6 @@
 freeze("$(PORT_DIR)/modules")
 freeze("$(MPY_DIR)/tools", ("upip.py", "upip_utarfile.py"))
-freeze("$(MPY_DIR)/ports/esp8266/modules", "ntptime.py")
+freeze("$(MPY_DIR)/extmod", "ntptime.py")
 freeze("$(MPY_DIR)/drivers/dht", "dht.py")
 freeze("$(MPY_DIR)/drivers/onewire")
 include("$(MPY_DIR)/extmod/uasyncio/manifest.py")
diff --git a/ports/esp8266/boards/GENERIC_512K/manifest.py b/ports/esp8266/boards/GENERIC_512K/manifest.py
index ee148c80892d8..e43d94843fdba 100644
--- a/ports/esp8266/boards/GENERIC_512K/manifest.py
+++ b/ports/esp8266/boards/GENERIC_512K/manifest.py
@@ -1,5 +1,4 @@
 freeze("$(BOARD_DIR)", "_boot.py", opt=3)
-freeze("$(PORT_DIR)/modules", ("apa102.py", "ntptime.py", "port_diag.py"))
 freeze("$(MPY_DIR)/drivers/dht", "dht.py")
 freeze("$(MPY_DIR)/drivers/onewire")
 include("$(MPY_DIR)/extmod/webrepl/manifest.py")
diff --git a/ports/esp8266/boards/manifest.py b/ports/esp8266/boards/manifest.py
index 598572d62ad48..c5809717e6927 100644
--- a/ports/esp8266/boards/manifest.py
+++ b/ports/esp8266/boards/manifest.py
@@ -1,4 +1,5 @@
 freeze("$(PORT_DIR)/modules")
+freeze("$(MPY_DIR)/extmod", "ntptime.py")
 freeze("$(MPY_DIR)/tools", ("upip.py", "upip_utarfile.py"))
 freeze("$(MPY_DIR)/drivers/dht", "dht.py")
 freeze("$(MPY_DIR)/drivers/onewire")
diff --git a/ports/rp2/boards/PICO_W/manifest.py b/ports/rp2/boards/PICO_W/manifest.py
index 1953d5cbd0693..eb748da485c98 100644
--- a/ports/rp2/boards/PICO_W/manifest.py
+++ b/ports/rp2/boards/PICO_W/manifest.py
@@ -2,6 +2,7 @@
 
 freeze("$(MPY_DIR)/tools", "upip.py")
 freeze("$(MPY_DIR)/tools", "upip_utarfile.py")
+freeze("$(MPY_DIR)/extmod", "ntptime.py")
 
 if os.path.isdir(convert_path("$(MPY_LIB_DIR)")):
     freeze("$(MPY_LIB_DIR)/python-ecosys/urequests", "urequests.py")

From 1bf2fd0592df999f913dd96be981cdabc0b557ca Mon Sep 17 00:00:00 2001
From: Ian Davies <git@iandavies.org>
Date: Thu, 21 Jul 2022 21:00:24 +0100
Subject: [PATCH 2438/3533] extmod/modussl_mbedtls: Set a more sensible default
 debug log level.

---
 extmod/modussl_mbedtls.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/extmod/modussl_mbedtls.c b/extmod/modussl_mbedtls.c
index 8365c7a4a4d2e..b14ed9ad0e3d0 100644
--- a/extmod/modussl_mbedtls.c
+++ b/extmod/modussl_mbedtls.c
@@ -74,7 +74,7 @@ STATIC const mp_obj_type_t ussl_socket_type;
 STATIC void mbedtls_debug(void *ctx, int level, const char *file, int line, const char *str) {
     (void)ctx;
     (void)level;
-    printf("DBG:%s:%04d: %s\n", file, line, str);
+    mp_printf(&mp_plat_print, "DBG:%s:%04d: %s\n", file, line, str);
 }
 #endif
 
@@ -175,7 +175,7 @@ STATIC mp_obj_ssl_socket_t *socket_new(mp_obj_t sock, struct ssl_args *args) {
     mbedtls_ctr_drbg_init(&o->ctr_drbg);
     #ifdef MBEDTLS_DEBUG_C
     // Debug level (0-4) 1=warning, 2=info, 3=debug, 4=verbose
-    mbedtls_debug_set_threshold(0);
+    mbedtls_debug_set_threshold(3);
     #endif
 
     mbedtls_entropy_init(&o->entropy);

From b6c2196fbd27834079d9d306d21c0a0897f03c91 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Sun, 17 Jul 2022 12:59:02 +0200
Subject: [PATCH 2439/3533] drivers/cyw43: Allow configuring the netif/mDNS
 hostname.

Allow boards to configure/override the default hostname used for netif and
mDNS.
---
 drivers/cyw43/cyw43.h      | 9 +++++++++
 drivers/cyw43/cyw43_ctrl.c | 2 ++
 drivers/cyw43/cyw43_lwip.c | 7 ++++---
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/drivers/cyw43/cyw43.h b/drivers/cyw43/cyw43.h
index 7d3e30f5d4eda..5ca4898318a3c 100644
--- a/drivers/cyw43/cyw43.h
+++ b/drivers/cyw43/cyw43.h
@@ -47,6 +47,14 @@
 #define CYW43_LINK_NONET        (-2)
 #define CYW43_LINK_BADAUTH      (-3)
 
+#ifndef MICROPY_BOARD_HOSTNAME
+#define MICROPY_BOARD_HOSTNAME  "PYBD"
+#endif
+
+#ifndef MICROPY_BOARD_HOSTNAME_LENGTH
+#define MICROPY_BOARD_HOSTNAME_LENGTH 16
+#endif
+
 typedef struct _cyw43_t {
     cyw43_ll_t cyw43_ll;
 
@@ -76,6 +84,7 @@ typedef struct _cyw43_t {
     struct netif netif[2];
     struct dhcp dhcp_client;
     dhcp_server_t dhcp_server;
+    char hostname[MICROPY_BOARD_HOSTNAME_LENGTH];
 } cyw43_t;
 
 extern cyw43_t cyw43_state;
diff --git a/drivers/cyw43/cyw43_ctrl.c b/drivers/cyw43/cyw43_ctrl.c
index 203bc812ac13f..73e6e5895779e 100644
--- a/drivers/cyw43/cyw43_ctrl.c
+++ b/drivers/cyw43/cyw43_ctrl.c
@@ -101,6 +101,8 @@ void cyw43_init(cyw43_t *self) {
     self->ap_channel = 3;
     self->ap_ssid_len = 0;
     self->ap_key_len = 0;
+    strncpy(self->hostname, MICROPY_BOARD_HOSTNAME, MICROPY_BOARD_HOSTNAME_LENGTH);
+    self->hostname[MICROPY_BOARD_HOSTNAME_LENGTH - 1] = 0;
 
     cyw43_poll = NULL;
 }
diff --git a/drivers/cyw43/cyw43_lwip.c b/drivers/cyw43/cyw43_lwip.c
index 16ae6023755a1..f12a378c5da6d 100644
--- a/drivers/cyw43/cyw43_lwip.c
+++ b/drivers/cyw43/cyw43_lwip.c
@@ -117,7 +117,7 @@ void cyw43_tcpip_init(cyw43_t *self, int itf) {
     #else
     netif_add(n, &ipconfig[0], &ipconfig[1], &ipconfig[2], self, cyw43_netif_init, netif_input);
     #endif
-    netif_set_hostname(n, "PYBD");
+    netif_set_hostname(n, self->hostname);
     netif_set_default(n);
     netif_set_up(n);
 
@@ -132,8 +132,9 @@ void cyw43_tcpip_init(cyw43_t *self, int itf) {
     #if LWIP_MDNS_RESPONDER
     // TODO better to call after IP address is set
     char mdns_hostname[9];
-    memcpy(&mdns_hostname[0], "PYBD", 4);
-    mp_hal_get_mac_ascii(MP_HAL_MAC_WLAN0, 8, 4, &mdns_hostname[4]);
+    int len = MIN(strlen(self->hostname), 4);
+    memcpy(&mdns_hostname[0], self->hostname, len);
+    mp_hal_get_mac_ascii(MP_HAL_MAC_WLAN0, 4 + len, 8 - len, &mdns_hostname[len]);
     mdns_hostname[8] = '\0';
     mdns_resp_add_netif(n, mdns_hostname, 60);
     #endif

From 9dfabcd6d3d080aced888e8474e921f11dc979bb Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Sun, 17 Jul 2022 13:05:56 +0200
Subject: [PATCH 2440/3533] extmod/network_cyw43: Add hostname config option.

---
 extmod/network_cyw43.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/extmod/network_cyw43.c b/extmod/network_cyw43.c
index c131fbb109ee5..9df799119fe61 100644
--- a/extmod/network_cyw43.c
+++ b/extmod/network_cyw43.c
@@ -381,6 +381,11 @@ STATIC mp_obj_t network_cyw43_config(size_t n_args, const mp_obj_t *args, mp_map
                 cyw43_ioctl(self->cyw, CYW43_IOCTL_GET_VAR, 13, buf, self->itf);
                 return MP_OBJ_NEW_SMALL_INT(nw_get_le32(buf) / 4);
             }
+            #if !MICROPY_PY_NETWORK_CYW43_USE_LIB_DRIVER
+            case MP_QSTR_hostname: {
+                return mp_obj_new_str(self->cyw->hostname, strlen(self->cyw->hostname));
+            }
+            #endif
             default:
                 mp_raise_ValueError(MP_ERROR_TEXT("unknown config param"));
         }
@@ -453,6 +458,14 @@ STATIC mp_obj_t network_cyw43_config(size_t n_args, const mp_obj_t *args, mp_map
                         cyw43_ioctl(self->cyw, CYW43_IOCTL_SET_VAR, 9 + 4, buf, self->itf);
                         break;
                     }
+                    #if !MICROPY_PY_NETWORK_CYW43_USE_LIB_DRIVER
+                    case MP_QSTR_hostname: {
+                        const char *hostname = mp_obj_str_get_str(e->value);
+                        strncpy(self->cyw->hostname, hostname, MICROPY_BOARD_HOSTNAME_LENGTH);
+                        self->cyw->hostname[MICROPY_BOARD_HOSTNAME_LENGTH - 1] = 0;
+                        break;
+                    }
+                    #endif
                     default:
                         mp_raise_ValueError(MP_ERROR_TEXT("unknown config param"));
                 }

From 6baeded32236feb9ba57ce78477fd1ee80fb4697 Mon Sep 17 00:00:00 2001
From: David Lechner <david@pybricks.com>
Date: Fri, 5 Aug 2022 18:52:13 -0500
Subject: [PATCH 2441/3533] py/runtime: Fix crash in star arg unpacking.

The reallocation trigger for unpacking star args with unknown length
did not take into account the number of fixed args remaining. So it was
possible that the unpacked iterators could take up exactly the memory
allocated then nothing would be left for fixed args after the star args.
This causes a segfault crash.

This is fixed by taking into account the remaining number of fixed args
in the check to decide whether to realloc yet or not.

Signed-off-by: David Lechner <david@pybricks.com>
---
 py/runtime.c                        | 2 +-
 tests/basics/fun_callstardblstar.py | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/py/runtime.c b/py/runtime.c
index 2c3b3ddde4a4f..ea3553db72275 100644
--- a/py/runtime.c
+++ b/py/runtime.c
@@ -814,7 +814,7 @@ void mp_call_prepare_args_n_kw_var(bool have_self, size_t n_args_n_kw, const mp_
                     mp_obj_t iterable = mp_getiter(arg, &iter_buf);
                     mp_obj_t item;
                     while ((item = mp_iternext(iterable)) != MP_OBJ_STOP_ITERATION) {
-                        if (args2_len >= args2_alloc) {
+                        if (args2_len + (n_args - i) >= args2_alloc) {
                             args2 = mp_nonlocal_realloc(args2, args2_alloc * sizeof(mp_obj_t),
                                 args2_alloc * 2 * sizeof(mp_obj_t));
                             args2_alloc *= 2;
diff --git a/tests/basics/fun_callstardblstar.py b/tests/basics/fun_callstardblstar.py
index f395df3333ded..c08e46f668eb7 100644
--- a/tests/basics/fun_callstardblstar.py
+++ b/tests/basics/fun_callstardblstar.py
@@ -37,3 +37,7 @@ def f2(*args, **kwargs):
 
 # case where *args is not a tuple/list and takes up most of the memory allocated for **kwargs
 f2(*iter(range(100)), **{str(i): i for i in range(100)})
+
+# regression test - iterable with unknown len() was exactly using preallocated
+# memory causing args 4 and 5 to overflow the allocated arg array
+print(1, *iter((1, 2, 3)), *iter((1, 2, 3)), 4, 5, sep=",")

From 6804b6f54fbed1f0fdb86668ebb46274e4876fa6 Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Tue, 5 Apr 2022 08:25:54 +1000
Subject: [PATCH 2442/3533] stm32/boards/NUCLEO_WB55: Add error handling to
 firmware update scripts.

In-the-field use of these FUS/WS firmware update scripts has exposed some
weak points, causing corrupted FUS/WS firmware to be flashed to the unit.

The problems are mostly caused with the ST GUI application, but sometimes
from un-recognised failures during bin file transfer to the WB55 prior to
running the rfcore_firmware.py script.  Other failures were caused by
incorrect load addresses being used, again both from user error copying the
address from the HTML release notes to the GUI tool, but also from
similarly not updating the address correctly in rfcore_firmware.py

To guard against these errors and make it easier to prepare different
versions, this commit adds a few features to the rfcore firmware update
tools:
- When creating the bin file, automatically parse the release note in the
  folder to get the correct address.
- Add a footer to the bin file containing the name, version, CRC, address
  etc.
- Before flashing rfcore, check if the same version is already installed.
- Verify the CRC and obfuscation key before flashing bin.
- Log the name and version of file being flashed.
---
 .../boards/NUCLEO_WB55/rfcore_firmware.py     | 249 ++++++++++++++----
 .../boards/NUCLEO_WB55/rfcore_makefirmware.py | 116 +++++++-
 2 files changed, 308 insertions(+), 57 deletions(-)

diff --git a/ports/stm32/boards/NUCLEO_WB55/rfcore_firmware.py b/ports/stm32/boards/NUCLEO_WB55/rfcore_firmware.py
index 4085da90fd491..7cc81b4c682a1 100644
--- a/ports/stm32/boards/NUCLEO_WB55/rfcore_firmware.py
+++ b/ports/stm32/boards/NUCLEO_WB55/rfcore_firmware.py
@@ -34,36 +34,54 @@
 #
 # To perform a firmware update:
 #
-# 1. Generate "obfuscated" binary images using rfcore_makefirmware.py
-#  ./boards/NUCLEO_WB55/rfcore_makefirmware.py ~/src/github.com/STMicroelectronics/STM32CubeWB/Projects/STM32WB_Copro_Wireless_Binaries/STM32WB5x/ /tmp
+# 1. Generate "obfuscated" binary images using rfcore_makefirmware.py, eg.
+#  $ python3 ./boards/NUCLEO_WB55/rfcore_makefirmware.py ~/src/github.com/STMicroelectronics/STM32CubeWB/Projects/STM32WB_Copro_Wireless_Binaries/STM32WB5x/ /tmp
 #  This will generate /tmp/{fus_102,fus_110,ws_ble_hci}.bin
+#  It may warn that stm32wb5x_FUS_fw_1_0_2.bin cannot be found, newer packs don't include this
+#  which can be ignored unless your currently flashed FUS is older than 1.0.2
 #
 # 2. Copy required files to the device filesystem.
-# In general, it's always safe to copy all three files and the updater will
-# figure out what needs to be done. This is the recommended option.
-# However, if you already have the latest FUS (1.1.0) installed, then just the
-# WS firmware is required.
-# If a FUS binary is present, then the existing WS will be removed so it's a good
-# idea to always include the WS binary if updating FUS.
-# Note that a WS binary will not be installed unless FUS 1.1.0 is installed.
+#  $ mpremote cp /tmp/fus_102.bin :
+#  $ mpremote cp /tmp/fus_110.bin :
+#  $ mpremote cp /tmp/ws_ble_hci.bin :
+#  $ mpremote cp ./boards/NUCLEO_WB55/rfcore_firmware.py :
+#  In general, it's always safe to copy all three files and the updater will
+#  figure out what needs to be done. This is the recommended option.
+#  However, if you already have the latest FUS (1.1.0) installed, then just the
+#  WS firmware is required.
+#  If a FUS binary is present, then the existing WS will be removed so it's a good
+#  idea to always include the WS binary if updating FUS.
+#  Note that a WS binary will not be installed unless FUS 1.1.0 is installed.
 #
 # 3. Ensure boot.py calls `rfcore_firmware.resume()`.
-# The WB55 will reset several times during the firmware update process, so this
-# script manages the update state using RTC backup registers.
-# `rfcore_firmware.resume()` will continue the update operation on startup to
-# resume any in-progress update operation, and either trigger another reset, or
-# return 0 to indicate that the operation completed successfully, or a reason
-# code (see REASON_* below) to indicate failure.
+#  $ mpremote exec "import rfcore_firmware; rfcore_firmware.install_boot()"
+#  The WB55 will reset several times during the firmware update process, so this
+#  script manages the update state using RTC backup registers.
+#  `rfcore_firmware.resume()` will continue the update operation on startup to
+#  resume any in-progress update operation, and either trigger another reset, or
+#  return 0 to indicate that the operation completed successfully, or a reason
+#  code (see REASON_* below) to indicate failure.
 #
 # 4. Call rfcore_firmware.check_for_updates() to start the update process.
-# The device will then immediately reboot and when the firmware update completes,
-# the status will be returned from rfcore_firmware.resume(). See the REASON_ codes below.
-# You can use the built-in stm.rfcore_fw_version() to query the installed version
-# from your application code.
+#  $ mpremote exec "import rfcore_firmware; rfcore_firmware.check_for_updates()"
+#  The device will then immediately reboot and when the firmware update completes,
+#  the status will be returned from rfcore_firmware.resume(). See the REASON_ codes below.
+#  You can use the built-in stm.rfcore_fw_version() to query the installed version
+#  from your application code.
 
 import struct, os
-import machine, stm
-from micropython import const
+
+try:
+    import machine, stm
+    from ubinascii import crc32
+    from micropython import const
+except ImportError:
+    # cpython
+    from binascii import crc32
+
+    machine = stm = None
+    const = lambda x: x
+
 
 _OGF_VENDOR = const(0x3F)
 
@@ -174,13 +192,6 @@
 _PATH_FUS_110 = "fus_110.bin"
 _PATH_WS_BLE_HCI = "ws_ble_hci.bin"
 
-# This address is correct for versions up to v1.8 (assuming existing firmware deleted).
-# Note any address from the end of the filesystem to the SFSA would be fine, but if
-# the FUS is fixed in the future to use the specified address then these are the "correct"
-# ones.
-_ADDR_FUS = 0x080EC000
-_ADDR_WS_BLE_HCI = 0x080DC000
-
 # When installing the FUS/WS it can take a long time to return to the first
 # GET_STATE HCI command.
 # e.g. Installing stm32wb5x_BLE_Stack_full_fw.bin takes 3600ms to respond.
@@ -242,10 +253,79 @@ def write(self, addr, buf, sz, key=0):
         machine.mem32[stm.FLASH + stm.FLASH_CR] = 0
 
 
-def _copy_file_to_flash(filename, addr):
+def validate_crc(f):
+    """Should match copy of function in rfcore_makefirmware.py to confirm operation"""
+    f.seek(0)
+    file_crc = 0
+    chunk = 16 * 1024
+    buff = bytearray(chunk)
+    while True:
+        read = f.readinto(buff)
+        if read < chunk:
+            file_crc = crc32(buff[0:read], file_crc)
+            break
+        file_crc = crc32(buff, file_crc)
+
+    file_crc = 0xFFFFFFFF & -file_crc - 1
+    f.seek(0)
+    return file_crc == 0
+
+
+def check_file_details(filename):
+    with open(filename, "rb") as f:
+        if not validate_crc(f):
+            raise ValueError("file validation failed: incorrect crc")
+
+        # Check the footer on the file
+        f.seek(-64, 2)
+        footer = f.read()
+        details = struct.unpack("<37sIIIIbbbII", footer)
+        (
+            src_filename,
+            addr_1m,
+            addr_640k,
+            addr_512k,
+            addr_256k,
+            vers_major,
+            vers_minor,
+            vers_patch,
+            KEY,
+            crc,
+        ) = details
+        src_filename = src_filename.strip(b"\x00").decode()
+        if KEY != _OBFUSCATION_KEY:
+            raise ValueError("file validation failed: incorrect key")
+
+    return (
+        src_filename,
+        addr_1m,
+        addr_640k,
+        addr_512k,
+        addr_256k,
+        (vers_major, vers_minor, vers_patch),
+    )
+
+
+def _copy_file_to_flash(filename):
     flash = _Flash()
     flash.unlock()
+    # Reset any previously stored address
+    _write_target_addr(0)
     try:
+        (
+            src_filename,
+            addr_1m,
+            addr_640k,
+            addr_512k,
+            addr_256k,
+            vers,
+        ) = check_file_details(filename)
+
+        # TODO add support for querying the correct flash size on chip
+        addr = load_addr = addr_1m
+
+        log(f"Writing {src_filename} v{vers[0]}.{vers[1]}.{vers[2]} to addr: 0x{addr:x}")
+
         # Erase the entire staging area in flash.
         erase_addr = STAGING_AREA_START
         sfr_sfsa = machine.mem32[stm.FLASH + stm.FLASH_SFR] & 0xFF
@@ -266,6 +346,9 @@ def _copy_file_to_flash(filename, addr):
                 flash.write(addr, buf, sz, _OBFUSCATION_KEY)
                 addr += 4096
 
+        # Cache the intended target load address
+        _write_target_addr(load_addr)
+
     finally:
         flash.lock()
 
@@ -308,17 +391,25 @@ def _fus_fwdelete():
     return _run_sys_hci_cmd(_OGF_VENDOR, _OCF_FUS_FW_DELETE)
 
 
-def _fus_run_fwupgrade(addr):
+def _fus_run_fwupgrade():
     # Note: Address is ignored by the FUS (see comments above).
+    addr = _read_target_addr()
+    if not addr:
+        log(f"Update failed: Invalid load address: 0x{addr:x}")
+        return False
+
+    log(f"Loading to: 0x{addr:x}")
     return _run_sys_hci_cmd(_OGF_VENDOR, _OCF_FUS_FW_UPGRADE, struct.pack("<I", addr))
 
 
-# Get/set current state/reason to RTC Backup Domain.
-# Using the second- and third-last registers (17, 18) as the final one (19)
-# is reserved by powerctrl.c for restoring the frequency.
-# Can be overridden if necessary.
-REG_RTC_STATE = stm.RTC + stm.RTC_BKP18R
-REG_RTC_REASON = stm.RTC + stm.RTC_BKP17R
+if stm:
+    # Get/set current state/reason/addr to RTC Backup Domain.
+    # Using the second, third, and fourth-last registers (16, 17, 18) as
+    # the final one (19) is reserved by powerctrl.c for restoring the frequency.
+    # Can be overridden if necessary.
+    REG_RTC_STATE = stm.RTC + stm.RTC_BKP18R
+    REG_RTC_REASON = stm.RTC + stm.RTC_BKP17R
+    REG_RTC_ADDR = stm.RTC + stm.RTC_BKP16R
 
 
 def _read_state():
@@ -339,8 +430,16 @@ def _write_failure_state(reason):
     return reason
 
 
+def _read_target_addr():
+    return machine.mem32[REG_RTC_ADDR]
+
+
+def _write_target_addr(addr):
+    machine.mem32[REG_RTC_ADDR] = addr
+
+
 # Check for the presence of a given file and attempt to start installing it.
-def _stat_and_start_copy(path, addr, copying_state, copied_state):
+def _stat_and_start_copy(path, copying_state, copied_state):
     try:
         os.stat(path)
     except OSError:
@@ -358,7 +457,7 @@ def _stat_and_start_copy(path, addr, copying_state, copied_state):
         log("Copying {} to flash", path)
         # Mark that the flash write has started. Any failure should result in an overall failure.
         _write_state(copying_state)  # Either _STATE_COPYING_FUS or _STATE_COPYING_WS
-        _copy_file_to_flash(path, addr)
+        _copy_file_to_flash(path)
         log("Copying complete")
         # The entire write has completed successfully, start the install.
         _write_state(copied_state)  # Either _STATE_COPIED_FUS or _STATE_COPIED_WS
@@ -423,22 +522,20 @@ def resume():
             log("FUS version {}", fus_version)
             if fus_version < _FUS_VERSION_102:
                 log("Factory FUS detected")
-                if _stat_and_start_copy(
-                    _PATH_FUS_102, _ADDR_FUS, _STATE_COPYING_FUS, _STATE_COPIED_FUS
-                ):
+                if _stat_and_start_copy(_PATH_FUS_102, _STATE_COPYING_FUS, _STATE_COPIED_FUS):
                     continue
             elif fus_version >= _FUS_VERSION_102 and fus_version < _FUS_VERSION_110:
                 log("FUS 1.0.2 detected")
-                if _stat_and_start_copy(
-                    _PATH_FUS_110, _ADDR_FUS, _STATE_COPYING_FUS, _STATE_COPIED_FUS
-                ):
+                if _stat_and_start_copy(_PATH_FUS_110, _STATE_COPYING_FUS, _STATE_COPIED_FUS):
                     continue
             else:
                 log("FUS is up-to-date")
 
             if fus_version >= _FUS_VERSION_110:
                 if _stat_and_start_copy(
-                    _PATH_WS_BLE_HCI, _ADDR_WS_BLE_HCI, _STATE_COPYING_WS, _STATE_COPIED_WS
+                    _PATH_WS_BLE_HCI,
+                    _STATE_COPYING_WS,
+                    _STATE_COPIED_WS,
                 ):
                     continue
                 else:
@@ -465,7 +562,7 @@ def resume():
             if fus_is_idle():
                 log("FUS copy complete, installing")
                 _write_state(_STATE_INSTALLING_FUS)
-                _fus_run_fwupgrade(_ADDR_FUS)
+                _fus_run_fwupgrade()
             else:
                 log("FUS copy bad state")
                 _write_failure_state(REASON_FLASH_FUS_BAD_STATE)
@@ -519,7 +616,7 @@ def resume():
             if fus_is_idle():
                 log("WS copy complete, installing")
                 _write_state(_STATE_INSTALLING_WS)
-                _fus_run_fwupgrade(_ADDR_WS_BLE_HCI)
+                _fus_run_fwupgrade()
             else:
                 log("WS copy bad state")
                 _write_failure_state(REASON_FLASH_WS_BAD_STATE)
@@ -556,9 +653,59 @@ def resume():
                 _write_failure_state(REASON_WS_VENDOR + result)
 
 
+def install_boot():
+    boot_py = "/flash/boot.py"
+    header = ""
+    mode = "w"
+    try:
+        with open(boot_py, "r") as boot:
+            header = "\n"
+            mode = "a"
+            for line in boot:
+                if "rfcore_firmware.resume()" in line:
+                    print("Already installed.")
+                    return
+
+        print("boot.py exists, adding upgrade handler.")
+    except OSError:
+        print("boot.py doesn't exists, adding with upgrade handler.")
+
+    with open(boot_py, mode) as boot:
+        boot.write(header)
+        boot.write("# Handle rfcore updates.\n")
+        boot.write("import rfcore_firmware\n")
+        boot.write("rfcore_firmware.resume()\n")
+
+
 # Start a firmware update.
 # This will immediately trigger a reset and start the update process on boot.
-def check_for_updates():
-    log("Starting firmware update")
-    _write_state(_STATE_WAITING_FOR_FUS)
-    machine.reset()
+def check_for_updates(force=False):
+    (
+        src_filename,
+        addr_1m,
+        addr_640k,
+        addr_512k,
+        addr_256k,
+        vers_fus,
+    ) = check_file_details(_PATH_FUS_110)
+    (
+        src_filename,
+        addr_1m,
+        addr_640k,
+        addr_512k,
+        addr_256k,
+        vers_ws,
+    ) = check_file_details(_PATH_WS_BLE_HCI)
+    current_version_fus = stm.rfcore_fw_version(_FW_VERSION_FUS)
+    fus_uptodate = current_version_fus[0:3] == vers_fus
+
+    current_version_ws = stm.rfcore_fw_version(_FW_VERSION_WS)
+    ws_uptodate = current_version_ws[0:3] == vers_ws
+    if fus_uptodate and ws_uptodate and not force:
+        log(f"Already up to date: fus: {current_version_fus}, ws: {current_version_ws}")
+    else:
+        log(f"Starting firmware update")
+        log(f" - fus: {current_version_fus} -> {vers_fus}")
+        log(f" - ws:  {current_version_ws} -> {vers_ws}")
+        _write_state(_STATE_WAITING_FOR_FUS)
+        machine.reset()
diff --git a/ports/stm32/boards/NUCLEO_WB55/rfcore_makefirmware.py b/ports/stm32/boards/NUCLEO_WB55/rfcore_makefirmware.py
index 23f3d20f0c9ce..6b2fb60892a9b 100755
--- a/ports/stm32/boards/NUCLEO_WB55/rfcore_makefirmware.py
+++ b/ports/stm32/boards/NUCLEO_WB55/rfcore_makefirmware.py
@@ -30,28 +30,70 @@
 # rfcore_firmware.py as well as instructions on how to use.
 
 import os
+import re
 import struct
 import sys
+from binascii import crc32
+from rfcore_firmware import validate_crc, _OBFUSCATION_KEY
 
-# Must match rfcore_firmware.py.
-_OBFUSCATION_KEY = 0x0573B55AA
 
 _FIRMWARE_FILES = {
     "stm32wb5x_FUS_fw_1_0_2.bin": "fus_102.bin",
     "stm32wb5x_FUS_fw.bin": "fus_110.bin",
     "stm32wb5x_BLE_HCILayer_fw.bin": "ws_ble_hci.bin",
 }
+_RELEASE_NOTES = "Release_Notes.html"
+
+
+def get_details(release_notes, filename):
+    if not release_notes:
+        return None
+    file_details = re.findall(
+        rb"%s,(((0x[\d\S]+?),)+[vV][\d\.]+)[<,]" % filename.encode(),
+        release_notes,
+        flags=re.DOTALL,
+    )
+    # The release note has all past version details also, but current is at top
+    latest_details = file_details[0][0].split(b",")
+    addr_1m, addr_640k, addr_512k, addr_256k, version = latest_details
+    addr_1m = int(addr_1m, 0)
+    addr_640k = int(addr_640k, 0)
+    addr_512k = int(addr_512k, 0)
+    addr_256k = int(addr_256k, 0)
+    version = [int(v) for v in version.lower().lstrip(b"v").split(b".")]
+    return addr_1m, addr_640k, addr_512k, addr_256k, version
 
 
 def main(src_path, dest_path):
-    for src_file, dest_file in _FIRMWARE_FILES.items():
-        src_file = os.path.join(src_path, src_file)
+
+    # Load the release note to parse for important details
+    with open(os.path.join(src_path, _RELEASE_NOTES), "rb") as f:
+        release_notes = f.read()
+    # remove some formatting
+    release_notes = re.sub(rb"</?strong>", b"", release_notes)
+    # flatten tables
+    release_notes = re.sub(
+        rb"</t[dh]>\W*\n*\W*",
+        b",",
+        release_notes.replace(b"<td>", b"").replace(b"<th>", b""),
+    )
+    if (
+        b"Wireless Coprocessor Binary,STM32WB5xxG(1M),STM32WB5xxY(640k),STM32WB5xxE(512K),STM32WB5xxC(256K),Version,"
+        not in release_notes
+    ):
+        raise SystemExit(
+            "Cannot determine binary load address, please confirm Coprocessor folder / Release Notes format."
+        )
+
+    for src_filename, dest_file in _FIRMWARE_FILES.items():
+        src_file = os.path.join(src_path, src_filename)
         dest_file = os.path.join(dest_path, dest_file)
         if not os.path.exists(src_file):
             print("Unable to find: {}".format(src_file))
             continue
         sz = 0
         with open(src_file, "rb") as src:
+            crc = 0
             with open(dest_file, "wb") as dest:
                 while True:
                     b = src.read(4)
@@ -59,9 +101,71 @@ def main(src_path, dest_path):
                         break
                     (v,) = struct.unpack("<I", b)
                     v ^= _OBFUSCATION_KEY
-                    dest.write(struct.pack("<I", v))
+                    vs = struct.pack("<I", v)
+                    dest.write(vs)
+                    crc = crc32(vs, crc)
                     sz += 4
-        print("Written {} ({} bytes)".format(dest_file, sz))
+
+                addr_1m, addr_640k, addr_512k, addr_256k, version = get_details(
+                    release_notes, src_filename
+                )
+
+                footer = struct.pack(
+                    "<37sIIIIbbbI",
+                    src_filename.encode(),
+                    addr_1m,
+                    addr_640k,
+                    addr_512k,
+                    addr_256k,
+                    *version,
+                    _OBFUSCATION_KEY,
+                )
+                assert len(footer) == 60
+                dest.write(footer)
+                crc = crc32(footer, crc)
+                crc = 0xFFFFFFFF & -crc - 1
+                dest.write(struct.pack("<I", crc))
+                sz += 64
+
+        print(
+            f"Written {src_filename} v{version[0]}.{version[1]}.{version[2]} to {dest_file} ({sz} bytes)"
+        )
+        check_file_details(dest_file)
+
+
+def check_file_details(filename):
+    """Should match copy of function in rfcore_firmware.py to confirm operation"""
+    with open(filename, "rb") as f:
+        if not validate_crc(f):
+            raise ValueError("file validation failed: incorrect crc")
+
+        f.seek(-64, 2)
+        footer = f.read()
+        assert len(footer) == 64
+        details = struct.unpack("<37sIIIIbbbII", footer)
+        (
+            src_filename,
+            addr_1m,
+            addr_640k,
+            addr_512k,
+            addr_256k,
+            vers_major,
+            vers_minor,
+            vers_patch,
+            KEY,
+            crc,
+        ) = details
+        if KEY != _OBFUSCATION_KEY:
+            raise ValueError("file validation failed: incorrect key")
+
+    return (
+        src_filename,
+        addr_1m,
+        addr_640k,
+        addr_512k,
+        addr_256k,
+        (vers_major, vers_minor, vers_patch),
+    )
 
 
 if __name__ == "__main__":

From d7ef90122e9215b5a5f47b5a340b29e2666fa164 Mon Sep 17 00:00:00 2001
From: David Yang <mmyangfl@gmail.com>
Date: Sat, 23 Jul 2022 13:38:32 +0800
Subject: [PATCH 2443/3533] mpy-cross/Makefile: Respect existing CFLAGS and
 LDFLAGS.

---
 mpy-cross/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mpy-cross/Makefile b/mpy-cross/Makefile
index 2189dff9058ea..4b6e03df8e844 100644
--- a/mpy-cross/Makefile
+++ b/mpy-cross/Makefile
@@ -19,7 +19,7 @@ INC += -I$(TOP)
 # compiler settings
 CWARN = -Wall -Werror
 CWARN += -Wextra -Wno-unused-parameter -Wpointer-arith
-CFLAGS = $(INC) $(CWARN) -std=gnu99 $(CFLAGS_MOD) $(COPT) $(CFLAGS_EXTRA)
+CFLAGS += $(INC) $(CWARN) -std=gnu99 $(CFLAGS_MOD) $(COPT) $(CFLAGS_EXTRA)
 CFLAGS += -fdata-sections -ffunction-sections -fno-asynchronous-unwind-tables
 
 # Debugging/Optimization
@@ -42,7 +42,7 @@ else
 # Use gcc syntax for map file
 LDFLAGS_ARCH = -Wl,-Map=$@.map,--cref -Wl,--gc-sections
 endif
-LDFLAGS = $(LDFLAGS_MOD) $(LDFLAGS_ARCH) -lm $(LDFLAGS_EXTRA)
+LDFLAGS += $(LDFLAGS_MOD) $(LDFLAGS_ARCH) -lm $(LDFLAGS_EXTRA)
 
 # source files
 SRC_C = \

From 736b427220ae0689694fc784bd4426605d556c4c Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Wed, 27 Jul 2022 10:45:38 +0200
Subject: [PATCH 2444/3533] extmod/network_wiznet5k: Register NIC when the lwIP
 stack is used.

That was missing, and network.route() returned an empty list.
---
 extmod/network_wiznet5k.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/extmod/network_wiznet5k.c b/extmod/network_wiznet5k.c
index f328276a5b269..fecb6ae8c2714 100644
--- a/extmod/network_wiznet5k.c
+++ b/extmod/network_wiznet5k.c
@@ -224,6 +224,9 @@ STATIC void wiznet5k_init(void) {
 
     netif_set_link_up(&wiznet5k_obj.netif);
     netif_set_up(&wiznet5k_obj.netif);
+
+    // register with network module
+    mod_network_register_nic(&wiznet5k_obj);
 }
 
 void wiznet5k_deinit(void) {

From be2beab71a1a1047299601af70e99053fac508e5 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Wed, 27 Jul 2022 10:51:03 +0200
Subject: [PATCH 2445/3533] extmod/network_wiznet5k: Drop obsolete argument
 count check.

Drop an obsolete and wrong argument check, which prevented specifying a pin
for the interrupt signal.  The proper checks are now done further down in
the code.
---
 extmod/network_wiznet5k.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/extmod/network_wiznet5k.c b/extmod/network_wiznet5k.c
index fecb6ae8c2714..02bf90244d7e2 100644
--- a/extmod/network_wiznet5k.c
+++ b/extmod/network_wiznet5k.c
@@ -689,10 +689,8 @@ STATIC mp_obj_t wiznet5k_make_new(const mp_obj_type_t *type, size_t n_args, size
     #endif
 
     #ifdef MICROPY_HW_WIZNET_SPI_ID
-    // check arguments
-    mp_arg_check_num(n_args, n_kw, 0, 3, false);
     // Allow auto-configuration of SPI if defined for board and no args passed
-    if (n_args == 0) {
+    if (n_args == 0 && n_kw == 0) {
         // Initialize SPI.
         mp_obj_t spi_obj = MP_OBJ_NEW_SMALL_INT(MICROPY_HW_WIZNET_SPI_SCK);
         mp_obj_t miso_obj = MP_OBJ_NEW_SMALL_INT(MICROPY_HW_WIZNET_SPI_MISO);

From 73699a846c031ecde70cf6bd629ef9a8232291e3 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Wed, 27 Jul 2022 21:01:29 +0200
Subject: [PATCH 2446/3533] extmod/network_wiznet5k: Deinit the NIC before
 (re-)initialisation.

If nic.active(True) is called several times in a row, the device may lock
up.  Even if that is bad coding practice, calling wiznet5k_deinit() in
wiznet5k_init() prevents the lock.
---
 extmod/network_wiznet5k.c | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/extmod/network_wiznet5k.c b/extmod/network_wiznet5k.c
index 02bf90244d7e2..5a26c08952da7 100644
--- a/extmod/network_wiznet5k.c
+++ b/extmod/network_wiznet5k.c
@@ -198,6 +198,16 @@ STATIC void wiznet5k_config_interrupt(bool enabled) {
         );
 }
 
+void wiznet5k_deinit(void) {
+    for (struct netif *netif = netif_list; netif != NULL; netif = netif->next) {
+        if (netif == &wiznet5k_obj.netif) {
+            netif_remove(netif);
+            netif->flags = 0;
+            break;
+        }
+    }
+}
+
 STATIC void wiznet5k_init(void) {
     // Configure wiznet for raw ethernet frame usage.
 
@@ -219,6 +229,9 @@ STATIC void wiznet5k_init(void) {
         wiznet5k_config_interrupt(true);
     }
 
+    // Deinit before a new init to clear the state from a previous activation
+    wiznet5k_deinit();
+
     // Hook the Wiznet into lwIP
     wiznet5k_lwip_init(&wiznet5k_obj);
 
@@ -229,16 +242,6 @@ STATIC void wiznet5k_init(void) {
     mod_network_register_nic(&wiznet5k_obj);
 }
 
-void wiznet5k_deinit(void) {
-    for (struct netif *netif = netif_list; netif != NULL; netif = netif->next) {
-        if (netif == &wiznet5k_obj.netif) {
-            netif_remove(netif);
-            netif->flags = 0;
-            break;
-        }
-    }
-}
-
 STATIC void wiznet5k_send_ethernet(wiznet5k_obj_t *self, size_t len, const uint8_t *buf) {
     uint8_t ip[4] = {1, 1, 1, 1}; // dummy
     int ret = WIZCHIP_EXPORT(sendto)(0, (byte *)buf, len, ip, 11); // dummy port

From 999b66d53108a014194e7a30f20d4a269fdda6b4 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Fri, 29 Jul 2022 08:22:42 +0200
Subject: [PATCH 2447/3533] extmod/network_wiznet5k: Schedule clearing of
 interrupt flags.

Avoiding conflicts between the IRQ and an active transfers.  Before this
change the device could lock up in heavy traffic situations.

Fix found and code supplied by @omogenot.
---
 extmod/network_wiznet5k.c | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/extmod/network_wiznet5k.c b/extmod/network_wiznet5k.c
index 5a26c08952da7..bdf94993d1f7a 100644
--- a/extmod/network_wiznet5k.c
+++ b/extmod/network_wiznet5k.c
@@ -177,11 +177,10 @@ STATIC void wiznet5k_lwip_init(wiznet5k_obj_t *self);
 
 STATIC mp_obj_t mpy_wiznet_read_int(mp_obj_t none_in) {
     (void)none_in;
-    wizchip_clrinterrupt(IK_SOCK_0);
-    setSn_IR(0, Sn_IR_RECV);
-
-    // Handle incoming data
-    wiznet5k_try_poll();
+    // Handle incoming data, unless the SPI bus is busy
+    if (mp_hal_pin_read(wiznet5k_obj.cs)) {
+        wiznet5k_try_poll();
+    }
     return mp_const_none;
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(mpy_wiznet_read_int_obj, mpy_wiznet_read_int);
@@ -343,6 +342,10 @@ void wiznet5k_poll(void) {
             }
         }
     }
+    wizchip_clrinterrupt(IK_SOCK_0);
+    #if _WIZCHIP_ == W5100S
+    setSn_IR(0, Sn_IR_RECV); // W5100S driver bug: must write to the Sn_IR register to reset the IRQ signal
+    #endif
 }
 
 #endif // MICROPY_PY_LWIP

From f000ac9e824cfa2f2f3e50d902e80b576367b4c1 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sat, 30 Jul 2022 12:30:09 +0200
Subject: [PATCH 2448/3533] extmod/network_wiznet5k: Rearrange the function
 wiznet5k_poll().

To have just one exit and a more compact flag test.  This is just a style
change without impact to the functionality.
---
 extmod/network_wiznet5k.c | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/extmod/network_wiznet5k.c b/extmod/network_wiznet5k.c
index bdf94993d1f7a..c862f16c0e7d7 100644
--- a/extmod/network_wiznet5k.c
+++ b/extmod/network_wiznet5k.c
@@ -325,20 +325,18 @@ STATIC void wiznet5k_lwip_init(wiznet5k_obj_t *self) {
 
 void wiznet5k_poll(void) {
     wiznet5k_obj_t *self = &wiznet5k_obj;
-    if (!(self->netif.flags & NETIF_FLAG_UP) ||
-        !(self->netif.flags & NETIF_FLAG_LINK_UP)) {
-        return;
-    }
-    uint16_t len;
-    while ((len = wiznet5k_recv_ethernet(self)) > 0) {
-        if (self->trace_flags & TRACE_ETH_RX) {
-            netutils_ethernet_trace(MP_PYTHON_PRINTER, len, self->eth_frame, NETUTILS_TRACE_NEWLINE);
-        }
-        struct pbuf *p = pbuf_alloc(PBUF_RAW, len, PBUF_POOL);
-        if (p != NULL) {
-            pbuf_take(p, self->eth_frame, len);
-            if (self->netif.input(p, &self->netif) != ERR_OK) {
-                pbuf_free(p);
+    if ((self->netif.flags & (NETIF_FLAG_UP | NETIF_FLAG_LINK_UP)) == (NETIF_FLAG_UP | NETIF_FLAG_LINK_UP)) {
+        uint16_t len;
+        while ((len = wiznet5k_recv_ethernet(self)) > 0) {
+            if (self->trace_flags & TRACE_ETH_RX) {
+                netutils_ethernet_trace(MP_PYTHON_PRINTER, len, self->eth_frame, NETUTILS_TRACE_NEWLINE);
+            }
+            struct pbuf *p = pbuf_alloc(PBUF_RAW, len, PBUF_POOL);
+            if (p != NULL) {
+                pbuf_take(p, self->eth_frame, len);
+                if (self->netif.input(p, &self->netif) != ERR_OK) {
+                    pbuf_free(p);
+                }
             }
         }
     }

From af6d2845fad4fde2d36f220efce876a4b1facdaa Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 10 Aug 2022 00:53:13 +1000
Subject: [PATCH 2449/3533] extmod/network_wiznet5k: Extract SPI transfer
 function dynamically.

Instead of using the fixed machine_spi_type entity to get the SPI transfer
function, this transfer function is now extracted dynamically from the type
of the SPI object.

This allows the SPI object used to communicate with the WIZNET5K hardware
to be SoftSPI or hardware SPI, or anything that has the SPI protocol (at
the C level).

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/network_wiznet5k.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/extmod/network_wiznet5k.c b/extmod/network_wiznet5k.c
index c862f16c0e7d7..89c933c2d4545 100644
--- a/extmod/network_wiznet5k.c
+++ b/extmod/network_wiznet5k.c
@@ -91,12 +91,11 @@
 #endif
 #endif
 
-extern struct _machine_spi_obj_t *spi_from_mp_obj(mp_obj_t o);
-
 typedef struct _wiznet5k_obj_t {
     mp_obj_base_t base;
     mp_uint_t cris_state;
-    struct _machine_spi_obj_t *spi;
+    mp_obj_base_t *spi;
+    void (*spi_transfer)(mp_obj_base_t *obj, size_t len, const uint8_t *src, uint8_t *dest);
     mp_hal_pin_obj_t cs;
     mp_hal_pin_obj_t rst;
     #if WIZNET5K_WITH_LWIP_STACK
@@ -148,21 +147,21 @@ void mpy_wiznet_yield(void) {
 }
 
 STATIC void wiz_spi_read(uint8_t *buf, uint16_t len) {
-    ((mp_machine_spi_p_t *)machine_spi_type.protocol)->transfer((mp_obj_base_t *)wiznet5k_obj.spi, len, buf, buf);
+    wiznet5k_obj.spi_transfer(wiznet5k_obj.spi, len, buf, buf);
 }
 
 STATIC void wiz_spi_write(const uint8_t *buf, uint16_t len) {
-    ((mp_machine_spi_p_t *)machine_spi_type.protocol)->transfer((mp_obj_base_t *)wiznet5k_obj.spi, len, buf, NULL);
+    wiznet5k_obj.spi_transfer(wiznet5k_obj.spi, len, buf, NULL);
 }
 
 STATIC uint8_t wiz_spi_readbyte() {
     uint8_t buf = 0;
-    ((mp_machine_spi_p_t *)machine_spi_type.protocol)->transfer((mp_obj_base_t *)wiznet5k_obj.spi, 1, &buf, &buf);
+    wiznet5k_obj.spi_transfer(wiznet5k_obj.spi, 1, &buf, &buf);
     return buf;
 }
 
 STATIC void wiz_spi_writebyte(const uint8_t buf) {
-    ((mp_machine_spi_p_t *)machine_spi_type.protocol)->transfer((mp_obj_base_t *)wiznet5k_obj.spi, 1, &buf, NULL);
+    wiznet5k_obj.spi_transfer(wiznet5k_obj.spi, 1, &buf, NULL);
 }
 
 STATIC void wiznet5k_get_mac_address(wiznet5k_obj_t *self, uint8_t mac[6]) {
@@ -680,7 +679,7 @@ STATIC void wiznet5k_dhcp_init(wiznet5k_obj_t *self) {
 // WIZNET5K(spi, pin_cs, pin_rst[, pin_intn])
 // Create and return a WIZNET5K object.
 STATIC mp_obj_t wiznet5k_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
-    struct _machine_spi_obj_t *spi;
+    mp_obj_base_t *spi;
     mp_hal_pin_obj_t cs;
     mp_hal_pin_obj_t rst;
 
@@ -706,7 +705,7 @@ STATIC mp_obj_t wiznet5k_make_new(const mp_obj_type_t *type, size_t n_args, size
             MP_ROM_QSTR(MP_QSTR_miso), mp_pin_make_new(NULL, 1, 0, &miso_obj),
             MP_ROM_QSTR(MP_QSTR_mosi), mp_pin_make_new(NULL, 1, 0, &mosi_obj),
         };
-        spi = machine_spi_type.make_new((mp_obj_t)&machine_spi_type, 2, 3, args);
+        spi = MP_OBJ_TO_PTR(machine_spi_type.make_new((mp_obj_t)&machine_spi_type, 2, 3, args));
 
         cs = mp_hal_get_pin_obj(mp_pin_make_new(NULL, 1, 0, (mp_obj_t[]) {MP_OBJ_NEW_SMALL_INT(MICROPY_HW_WIZNET_PIN_CS)}));
         rst = mp_hal_get_pin_obj(mp_pin_make_new(NULL, 1, 0, (mp_obj_t[]) {MP_OBJ_NEW_SMALL_INT(MICROPY_HW_WIZNET_PIN_RST)}));
@@ -724,7 +723,7 @@ STATIC mp_obj_t wiznet5k_make_new(const mp_obj_type_t *type, size_t n_args, size
         #else
         mp_arg_check_num(n_args, n_kw, 3, 3, false);
         #endif
-        spi = spi_from_mp_obj(args[0]);
+        spi = mp_hal_get_spi_obj(args[0]);
         cs = mp_hal_get_pin_obj(args[1]);
         rst = mp_hal_get_pin_obj(args[2]);
         #if WIZNET5K_WITH_LWIP_STACK
@@ -742,6 +741,7 @@ STATIC mp_obj_t wiznet5k_make_new(const mp_obj_type_t *type, size_t n_args, size
     wiznet5k_obj.base.type = (mp_obj_type_t *)&mod_network_nic_type_wiznet5k;
     wiznet5k_obj.cris_state = 0;
     wiznet5k_obj.spi = spi;
+    wiznet5k_obj.spi_transfer = ((mp_machine_spi_p_t *)spi->type->protocol)->transfer;
     wiznet5k_obj.cs = cs;
     wiznet5k_obj.rst = rst;
     #if WIZNET5K_WITH_LWIP_STACK

From f72d3cec2338e88b9aa6e28d345f0007042d692b Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 10 Aug 2022 00:52:03 +1000
Subject: [PATCH 2450/3533] rp2/machine_spi: Add mp_hal_get_spi_obj helper
 function.

And remove the now-obsolete spi_from_mp_obj() function.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/rp2/machine_spi.c | 23 ++++++++++++++---------
 ports/rp2/mphalport.h   |  2 ++
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/ports/rp2/machine_spi.c b/ports/rp2/machine_spi.c
index 742a3cfddf44d..42998664a76de 100644
--- a/ports/rp2/machine_spi.c
+++ b/ports/rp2/machine_spi.c
@@ -269,15 +269,6 @@ STATIC void machine_spi_transfer(mp_obj_base_t *self_in, size_t len, const uint8
     }
 }
 
-machine_spi_obj_t *spi_from_mp_obj(mp_obj_t o) {
-    if (mp_obj_is_type(o, &machine_spi_type)) {
-        machine_spi_obj_t *self = MP_OBJ_TO_PTR(o);
-        return self;
-    } else {
-        mp_raise_TypeError(MP_ERROR_TEXT("expecting an SPI object"));
-    }
-}
-
 STATIC const mp_machine_spi_p_t machine_spi_p = {
     .init = machine_spi_init,
     .transfer = machine_spi_transfer,
@@ -291,3 +282,17 @@ const mp_obj_type_t machine_spi_type = {
     .protocol = &machine_spi_p,
     .locals_dict = (mp_obj_dict_t *)&mp_machine_spi_locals_dict,
 };
+
+mp_obj_base_t *mp_hal_get_spi_obj(mp_obj_t o) {
+    if (mp_obj_is_type(o, &machine_spi_type)) {
+        return MP_OBJ_TO_PTR(o);
+    }
+    #if MICROPY_PY_MACHINE_SOFTSPI
+    else if (mp_obj_is_type(o, &mp_machine_soft_spi_type)) {
+        return MP_OBJ_TO_PTR(o);
+    }
+    #endif
+    else {
+        mp_raise_TypeError(MP_ERROR_TEXT("expecting an SPI object"));
+    }
+}
diff --git a/ports/rp2/mphalport.h b/ports/rp2/mphalport.h
index 88683d9360a4e..31bedf3381245 100644
--- a/ports/rp2/mphalport.h
+++ b/ports/rp2/mphalport.h
@@ -148,6 +148,8 @@ enum mp_hal_pin_interrupt_trigger {
 
 void mp_hal_pin_interrupt(mp_hal_pin_obj_t pin, mp_obj_t handler, mp_uint_t trigger, bool hard);
 
+mp_obj_base_t *mp_hal_get_spi_obj(mp_obj_t spi_in);
+
 enum {
     MP_HAL_MAC_WLAN0 = 0,
     MP_HAL_MAC_BDADDR,

From 7d91a9bf5b30c11ea2dcf90e8b3d031e40b6e985 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 10 Aug 2022 14:09:02 +1000
Subject: [PATCH 2451/3533] py/mpprint: Fix formatting typo with mp_print_ext_t
 struct name.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/mpprint.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/py/mpprint.h b/py/mpprint.h
index 0dff9a770ada7..8383ea85794c2 100644
--- a/py/mpprint.h
+++ b/py/mpprint.h
@@ -56,7 +56,7 @@ typedef struct _mp_print_ext_t {
     mp_print_t base;
     const char *item_separator;
     const char *key_separator;
-}mp_print_ext_t;
+} mp_print_ext_t;
 
 #define MP_PRINT_GET_EXT(print) ((mp_print_ext_t *)print)
 

From b5986784e4341d7d34b97b2481567d842453732d Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 10 Aug 2022 14:09:22 +1000
Subject: [PATCH 2452/3533] py/objstr: Reformat str access macros to make them
 readable.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/objstr.h | 30 ++++++++++++++++++++++--------
 1 file changed, 22 insertions(+), 8 deletions(-)

diff --git a/py/objstr.h b/py/objstr.h
index 8c450baed6e41..8f87c3018a3c9 100644
--- a/py/objstr.h
+++ b/py/objstr.h
@@ -41,24 +41,38 @@ typedef struct _mp_obj_str_t {
 // use this macro to extract the string hash
 // warning: the hash can be 0, meaning invalid, and must then be explicitly computed from the data
 #define GET_STR_HASH(str_obj_in, str_hash) \
-    mp_uint_t str_hash; if (mp_obj_is_qstr(str_obj_in)) \
-    { str_hash = qstr_hash(MP_OBJ_QSTR_VALUE(str_obj_in)); } else { str_hash = ((mp_obj_str_t *)MP_OBJ_TO_PTR(str_obj_in))->hash; }
+    mp_uint_t str_hash; \
+    if (mp_obj_is_qstr(str_obj_in)) { \
+        str_hash = qstr_hash(MP_OBJ_QSTR_VALUE(str_obj_in)); \
+    } else { \
+        str_hash = ((mp_obj_str_t *)MP_OBJ_TO_PTR(str_obj_in))->hash; \
+    }
 
 // use this macro to extract the string length
 #define GET_STR_LEN(str_obj_in, str_len) \
-    size_t str_len; if (mp_obj_is_qstr(str_obj_in)) \
-    { str_len = qstr_len(MP_OBJ_QSTR_VALUE(str_obj_in)); } else { str_len = ((mp_obj_str_t *)MP_OBJ_TO_PTR(str_obj_in))->len; }
+    size_t str_len; \
+    if (mp_obj_is_qstr(str_obj_in)) { \
+        str_len = qstr_len(MP_OBJ_QSTR_VALUE(str_obj_in)); \
+    } else { \
+        str_len = ((mp_obj_str_t *)MP_OBJ_TO_PTR(str_obj_in))->len; \
+    }
 
 // use this macro to extract the string data and length
 #if MICROPY_OBJ_REPR == MICROPY_OBJ_REPR_C || MICROPY_OBJ_REPR == MICROPY_OBJ_REPR_D
 const byte *mp_obj_str_get_data_no_check(mp_obj_t self_in, size_t *len);
 #define GET_STR_DATA_LEN(str_obj_in, str_data, str_len) \
-    size_t str_len; const byte *str_data = mp_obj_str_get_data_no_check(str_obj_in, &str_len);
+    size_t str_len; \
+    const byte *str_data = mp_obj_str_get_data_no_check(str_obj_in, &str_len);
 #else
 #define GET_STR_DATA_LEN(str_obj_in, str_data, str_len) \
-    const byte *str_data; size_t str_len; if (mp_obj_is_qstr(str_obj_in)) \
-    { str_data = qstr_data(MP_OBJ_QSTR_VALUE(str_obj_in), &str_len); } \
-    else { str_len = ((mp_obj_str_t *)MP_OBJ_TO_PTR(str_obj_in))->len; str_data = ((mp_obj_str_t *)MP_OBJ_TO_PTR(str_obj_in))->data; }
+    const byte *str_data; \
+    size_t str_len; \
+    if (mp_obj_is_qstr(str_obj_in)) { \
+        str_data = qstr_data(MP_OBJ_QSTR_VALUE(str_obj_in), &str_len); \
+    } else { \
+        str_len = ((mp_obj_str_t *)MP_OBJ_TO_PTR(str_obj_in))->len; \
+        str_data = ((mp_obj_str_t *)MP_OBJ_TO_PTR(str_obj_in))->data; \
+    }
 #endif
 
 mp_obj_t mp_obj_str_make_new(const mp_obj_type_t *type_in, size_t n_args, size_t n_kw, const mp_obj_t *args);

From 5cfbf18d5fb70a907984781b3ac01aa5c27148be Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 10 Aug 2022 14:09:44 +1000
Subject: [PATCH 2453/3533] javascript/Makefile: Remove obsolete disable of
 array-bounds warning.

This was fixed in bb70874111dbb246624a68c013e8f1c3245ca0d8

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/javascript/Makefile | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/ports/javascript/Makefile b/ports/javascript/Makefile
index 046d303336a95..93c7b5609b23b 100644
--- a/ports/javascript/Makefile
+++ b/ports/javascript/Makefile
@@ -53,7 +53,4 @@ test: $(BUILD)/micropython.js $(TOP)/tests/run-tests.py
 	$(eval DIRNAME=ports/$(notdir $(CURDIR)))
 	cd $(TOP)/tests && MICROPY_MICROPYTHON=../ports/javascript/node_run.sh ./run-tests.py -j1
 
-# Disable errors for array-bounds warnings on "sp[-MP_OBJ_ITER_BUF_NSLOTS + 2]" access.
-$(BUILD)/py/vm.o: CFLAGS += -Wno-error=array-bounds
-
 include $(TOP)/py/mkrules.mk

From b2e82402688b53829f37475583231b067b9faea7 Mon Sep 17 00:00:00 2001
From: Daniel Jour <d.jour@steiner.de>
Date: Tue, 2 Aug 2022 21:39:02 +0200
Subject: [PATCH 2454/3533] py/mkrules.mk: Keep all build artefacts inside
 $(BUILD) directory.

The rules for lib (static library with name $(LIBMICROPYTHON)) and the
default rule to build a binary (name $(PROG)) produced outputs in the
current working directory.  Change this to build these files in the build
directory.

Note: An empty BUILD variable can cause issues (references to the root
directory); this is not addressed by this commit due to multiple other
places having the same issue.
---
 py/mkrules.mk | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/py/mkrules.mk b/py/mkrules.mk
index 41ec4b0641592..af116786798a9 100644
--- a/py/mkrules.mk
+++ b/py/mkrules.mk
@@ -196,9 +196,9 @@ ifneq (,$(findstring mingw,$(COMPILER_TARGET)))
 PROG := $(PROG).exe
 endif
 
-all: $(PROG)
+all: $(BUILD)/$(PROG)
 
-$(PROG): $(OBJ)
+$(BUILD)/$(PROG): $(OBJ)
 	$(ECHO) "LINK $@"
 # Do not pass COPT here - it's *C* compiler optimizations. For example,
 # we may want to compile using Thumb, but link with non-Thumb libc.
@@ -210,8 +210,8 @@ endif
 
 clean: clean-prog
 clean-prog:
-	$(RM) -f $(PROG)
-	$(RM) -f $(PROG).map
+	$(RM) -f $(BUILD)/$(PROG)
+	$(RM) -f $(BUILD)/$(PROG).map
 
 .PHONY: clean-prog
 endif
@@ -231,8 +231,8 @@ LIBMICROPYTHON = libmicropython.a
 # with 3rd-party projects which don't have proper dependency
 # tracking. Then LIBMICROPYTHON_EXTRA_CMD can e.g. touch some
 # other file to cause needed effect, e.g. relinking with new lib.
-lib $(LIBMICROPYTHON): $(OBJ)
-	$(Q)$(AR) rcs $(LIBMICROPYTHON) $^
+lib $(BUILD)/$(LIBMICROPYTHON): $(OBJ)
+	$(Q)$(AR) rcs $(BUILD)/$(LIBMICROPYTHON) $^
 	$(LIBMICROPYTHON_EXTRA_CMD)
 
 clean:

From 47c84286e8c8d9873e99f12711a683ecd6b9ca62 Mon Sep 17 00:00:00 2001
From: Daniel Jour <d.jour@steiner.de>
Date: Tue, 2 Aug 2022 23:48:41 +0200
Subject: [PATCH 2455/3533] all: Fix paths to mpy-cross and micropython
 binaries.

Binaries built using the Make build system now no longer appear in the
working directory of the build, but rather in the build directory.  Thus
some paths had to be adjusted.
---
 .github/workflows/ports_unix.yml |  2 +-
 examples/embedding/Makefile      |  2 +-
 ports/unix/Makefile              | 22 +++++++++++-----------
 py/dynruntime.mk                 |  2 +-
 py/mkenv.mk                      |  2 +-
 py/mkrules.cmake                 |  2 +-
 py/mkrules.mk                    |  2 +-
 tests/run-natmodtests.py         |  2 +-
 tests/run-tests.py               |  6 ++++--
 tools/ci.sh                      | 20 ++++++++++----------
 tools/makemanifest.py            |  2 +-
 11 files changed, 33 insertions(+), 31 deletions(-)

diff --git a/.github/workflows/ports_unix.yml b/.github/workflows/ports_unix.yml
index 63cc1c0faa921..ab2406647a8ca 100644
--- a/.github/workflows/ports_unix.yml
+++ b/.github/workflows/ports_unix.yml
@@ -35,7 +35,7 @@ jobs:
       env:
         SOURCE_DATE_EPOCH: 1234567890
     - name: Check reproducible build date
-      run: echo | ports/unix/micropython-minimal -i | grep 'on 2009-02-13;'
+      run: echo | ports/unix/build-minimal/micropython-minimal -i | grep 'on 2009-02-13;'
 
   standard:
     runs-on: ubuntu-latest
diff --git a/examples/embedding/Makefile b/examples/embedding/Makefile
index 99f239a7c5af8..7de1219b26442 100644
--- a/examples/embedding/Makefile
+++ b/examples/embedding/Makefile
@@ -1,6 +1,6 @@
 MPTOP = ../..
 CFLAGS = -std=c99 -I. -I$(MPTOP) -DNO_QSTR
-LDFLAGS = -L.
+LDFLAGS = -L./build
 
 hello-embed: hello-embed.o -lmicropython
 
diff --git a/ports/unix/Makefile b/ports/unix/Makefile
index 3b339c3d3f79f..709cc79853d57 100644
--- a/ports/unix/Makefile
+++ b/ports/unix/Makefile
@@ -304,18 +304,18 @@ include $(TOP)/py/mkrules.mk
 
 .PHONY: test test_full
 
-test: $(PROG) $(TOP)/tests/run-tests.py
+test: $(BUILD)/$(PROG) $(TOP)/tests/run-tests.py
 	$(eval DIRNAME=ports/$(notdir $(CURDIR)))
-	cd $(TOP)/tests && MICROPY_MICROPYTHON=../$(DIRNAME)/$(PROG) ./run-tests.py
+	cd $(TOP)/tests && MICROPY_MICROPYTHON=../$(DIRNAME)/$(BUILD)/$(PROG) ./run-tests.py
 
-test_full: $(PROG) $(TOP)/tests/run-tests.py
+test_full: $(BUILD)/$(PROG) $(TOP)/tests/run-tests.py
 	$(eval DIRNAME=ports/$(notdir $(CURDIR)))
-	cd $(TOP)/tests && MICROPY_MICROPYTHON=../$(DIRNAME)/$(PROG) ./run-tests.py
-	cd $(TOP)/tests && MICROPY_MICROPYTHON=../$(DIRNAME)/$(PROG) ./run-tests.py -d thread
-	cd $(TOP)/tests && MICROPY_MICROPYTHON=../$(DIRNAME)/$(PROG) ./run-tests.py --emit native
-	cd $(TOP)/tests && MICROPY_MICROPYTHON=../$(DIRNAME)/$(PROG) ./run-tests.py --via-mpy $(RUN_TESTS_MPY_CROSS_FLAGS) -d basics float micropython
-	cd $(TOP)/tests && MICROPY_MICROPYTHON=../$(DIRNAME)/$(PROG) ./run-tests.py --via-mpy $(RUN_TESTS_MPY_CROSS_FLAGS) --emit native -d basics float micropython
-	cat $(TOP)/tests/basics/0prelim.py | ./$(PROG) | grep -q 'abc'
+	cd $(TOP)/tests && MICROPY_MICROPYTHON=../$(DIRNAME)/$(BUILD)/$(PROG) ./run-tests.py
+	cd $(TOP)/tests && MICROPY_MICROPYTHON=../$(DIRNAME)/$(BUILD)/$(PROG) ./run-tests.py -d thread
+	cd $(TOP)/tests && MICROPY_MICROPYTHON=../$(DIRNAME)/$(BUILD)/$(PROG) ./run-tests.py --emit native
+	cd $(TOP)/tests && MICROPY_MICROPYTHON=../$(DIRNAME)/$(BUILD)/$(PROG) ./run-tests.py --via-mpy $(RUN_TESTS_MPY_CROSS_FLAGS) -d basics float micropython
+	cd $(TOP)/tests && MICROPY_MICROPYTHON=../$(DIRNAME)/$(BUILD)/$(PROG) ./run-tests.py --via-mpy $(RUN_TESTS_MPY_CROSS_FLAGS) --emit native -d basics float micropython
+	cat $(TOP)/tests/basics/0prelim.py | ./$(BUILD)/$(PROG) | grep -q 'abc'
 
 test_gcov: test_full
 	gcov -o $(BUILD)/py $(TOP)/py/*.c
@@ -346,9 +346,9 @@ $(BUILD)/lib/libffi/include/ffi.h: $(TOP)/lib/libffi/configure
 PREFIX = /usr/local
 BINDIR = $(DESTDIR)$(PREFIX)/bin
 
-install: $(PROG)
+install: $(BUILD)/$(PROG)
 	install -d $(BINDIR)
-	install $(PROG) $(BINDIR)/$(PROG)
+	install $(BUILD)/$(PROG) $(BINDIR)/$(PROG)
 
 uninstall:
 	-rm $(BINDIR)/$(PROG)
diff --git a/py/dynruntime.mk b/py/dynruntime.mk
index 09cbb2dd37cbb..10feefc4a7c22 100644
--- a/py/dynruntime.mk
+++ b/py/dynruntime.mk
@@ -7,7 +7,7 @@ ECHO = @echo
 RM = /bin/rm
 MKDIR = /bin/mkdir
 PYTHON = python3
-MPY_CROSS = $(MPY_DIR)/mpy-cross/mpy-cross
+MPY_CROSS = $(MPY_DIR)/mpy-cross/build/mpy-cross
 MPY_TOOL = $(PYTHON) $(MPY_DIR)/tools/mpy-tool.py
 MPY_LD = $(PYTHON) $(MPY_DIR)/tools/mpy_ld.py
 
diff --git a/py/mkenv.mk b/py/mkenv.mk
index cc04a8c0b3071..ea2e34f3b64de 100644
--- a/py/mkenv.mk
+++ b/py/mkenv.mk
@@ -61,7 +61,7 @@ MPY_LIB_SUBMODULE_DIR = $(TOP)/lib/micropython-lib
 MPY_LIB_DIR = $(MPY_LIB_SUBMODULE_DIR)
 
 ifeq ($(MICROPY_MPYCROSS),)
-MICROPY_MPYCROSS = $(TOP)/mpy-cross/mpy-cross
+MICROPY_MPYCROSS = $(TOP)/mpy-cross/build/mpy-cross
 MICROPY_MPYCROSS_DEPENDENCY = $(MICROPY_MPYCROSS)
 endif
 
diff --git a/py/mkrules.cmake b/py/mkrules.cmake
index 2f168ede6f2b4..e7c4101ddb72d 100644
--- a/py/mkrules.cmake
+++ b/py/mkrules.cmake
@@ -193,7 +193,7 @@ if(MICROPY_FROZEN_MANIFEST)
     # to automatically build mpy-cross if needed.
     set(MICROPY_MPYCROSS $ENV{MICROPY_MPYCROSS})
     if(NOT MICROPY_MPYCROSS)
-        set(MICROPY_MPYCROSS_DEPENDENCY ${MICROPY_DIR}/mpy-cross/mpy-cross)
+        set(MICROPY_MPYCROSS_DEPENDENCY ${MICROPY_DIR}/mpy-cross/build/mpy-cross)
         if(NOT MICROPY_MAKE_EXECUTABLE)
             set(MICROPY_MAKE_EXECUTABLE make)
         endif()
diff --git a/py/mkrules.mk b/py/mkrules.mk
index af116786798a9..73c33227c09af 100644
--- a/py/mkrules.mk
+++ b/py/mkrules.mk
@@ -162,7 +162,7 @@ $(HEADER_BUILD):
 ifneq ($(MICROPY_MPYCROSS_DEPENDENCY),)
 # to automatically build mpy-cross, if needed
 $(MICROPY_MPYCROSS_DEPENDENCY):
-	$(MAKE) -C $(dir $@)
+	$(MAKE) -C $(dir $@)..
 endif
 
 ifneq ($(FROZEN_DIR),)
diff --git a/tests/run-natmodtests.py b/tests/run-natmodtests.py
index 8eb27169c4ca1..9130e00d6eba1 100755
--- a/tests/run-natmodtests.py
+++ b/tests/run-natmodtests.py
@@ -14,7 +14,7 @@
 
 # Paths for host executables
 CPYTHON3 = os.getenv("MICROPY_CPYTHON3", "python3")
-MICROPYTHON = os.getenv("MICROPY_MICROPYTHON", "../ports/unix/micropython-coverage")
+MICROPYTHON = os.getenv("MICROPY_MICROPYTHON", "../ports/unix/build-coverage/micropython-coverage")
 
 NATMOD_EXAMPLE_DIR = "../examples/natmod/"
 
diff --git a/tests/run-tests.py b/tests/run-tests.py
index 2745ee1393bad..8e9bd843134fc 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -33,14 +33,16 @@ def base_path(*p):
     MICROPYTHON = os.getenv("MICROPY_MICROPYTHON", base_path("../ports/windows/micropython.exe"))
 else:
     CPYTHON3 = os.getenv("MICROPY_CPYTHON3", "python3")
-    MICROPYTHON = os.getenv("MICROPY_MICROPYTHON", base_path("../ports/unix/micropython"))
+    MICROPYTHON = os.getenv(
+        "MICROPY_MICROPYTHON", base_path("../ports/unix/build-standard/micropython")
+    )
 
 # Use CPython options to not save .pyc files, to only access the core standard library
 # (not site packages which may clash with u-module names), and improve start up time.
 CPYTHON3_CMD = [CPYTHON3, "-BS"]
 
 # mpy-cross is only needed if --via-mpy command-line arg is passed
-MPYCROSS = os.getenv("MICROPY_MPYCROSS", base_path("../mpy-cross/mpy-cross"))
+MPYCROSS = os.getenv("MICROPY_MPYCROSS", base_path("../mpy-cross/build/mpy-cross"))
 
 # For diff'ing test output
 DIFF = os.getenv("MICROPY_DIFF", "diff -u")
diff --git a/tools/ci.sh b/tools/ci.sh
index 7e2479e43d388..20119342cfcf5 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -409,9 +409,9 @@ function ci_unix_run_tests_full_helper {
     variant=$1
     shift
     if [ $variant = standard ]; then
-        micropython=micropython
+        micropython=build-$variant/micropython
     else
-        micropython=micropython-$variant
+        micropython=build-$variant/micropython-$variant
     fi
     make -C ports/unix VARIANT=$variant "$@" test_full
     (cd tests && MICROPY_CPYTHON3=python3 MICROPY_MICROPYTHON=../ports/unix/$micropython ./run-multitests.py multi_net/*.py)
@@ -444,7 +444,7 @@ function ci_unix_minimal_build {
 }
 
 function ci_unix_minimal_run_tests {
-    (cd tests && MICROPY_CPYTHON3=python3 MICROPY_MICROPYTHON=../ports/unix/micropython-minimal ./run-tests.py -e exception_chain -e self_type_check -e subclass_native_init -d basics)
+    (cd tests && MICROPY_CPYTHON3=python3 MICROPY_MICROPYTHON=../ports/unix/build-minimal/micropython-minimal ./run-tests.py -e exception_chain -e self_type_check -e subclass_native_init -d basics)
 }
 
 function ci_unix_standard_build {
@@ -491,21 +491,21 @@ function ci_unix_coverage_run_mpy_merge_tests {
         test=$(basename $inpy .py)
         echo $test
         outmpy=$outdir/$test.mpy
-        $mptop/mpy-cross/mpy-cross -o $outmpy $inpy
-        (cd $outdir && $mptop/ports/unix/micropython-coverage -m $test >> out-individual)
+        $mptop/mpy-cross/build/mpy-cross -o $outmpy $inpy
+        (cd $outdir && $mptop/ports/unix/build-coverage/micropython-coverage -m $test >> out-individual)
         allmpy+=($outmpy)
     done
 
     # Merge all the tests into one .mpy file, and then execute it.
     python3 $mptop/tools/mpy-tool.py --merge -o $outdir/merged.mpy ${allmpy[@]}
-    (cd $outdir && $mptop/ports/unix/micropython-coverage -m merged > out-merged)
+    (cd $outdir && $mptop/ports/unix/build-coverage/micropython-coverage -m merged > out-merged)
 
     # Make sure the outputs match.
     diff $outdir/out-individual $outdir/out-merged && /bin/rm -rf $outdir
 }
 
 function ci_unix_coverage_run_native_mpy_tests {
-    MICROPYPATH=examples/natmod/features2 ./ports/unix/micropython-coverage -m features2
+    MICROPYPATH=examples/natmod/features2 ./ports/unix/build-coverage/micropython-coverage -m features2
     (cd tests && ./run-natmodtests.py "$@" extmod/{btree*,framebuf*,uheapq*,urandom*,ure*,uzlib*}.py)
 }
 
@@ -614,7 +614,7 @@ function ci_unix_macos_run_tests {
     # Issues with macOS tests:
     # - import_pkg7 has a problem with relative imports
     # - urandom_basic has a problem with getrandbits(0)
-    (cd tests && ./run-tests.py --exclude 'import_pkg7.py' --exclude 'urandom_basic.py')
+    (cd tests && MICROPY_MICROPYTHON=../ports/unix/build-standard/micropython ./run-tests.py --exclude 'import_pkg7.py' --exclude 'urandom_basic.py')
 }
 
 function ci_unix_qemu_mips_setup {
@@ -634,7 +634,7 @@ function ci_unix_qemu_mips_run_tests {
     # - (i)listdir does not work, it always returns the empty list (it's an issue with the underlying C call)
     # - ffi tests do not work
     file ./ports/unix/micropython-coverage
-    (cd tests && MICROPY_MICROPYTHON=../ports/unix/micropython-coverage ./run-tests.py --exclude 'vfs_posix.py' --exclude 'ffi_(callback|float|float2).py')
+    (cd tests && MICROPY_MICROPYTHON=../ports/unix/build-coverage/micropython-coverage ./run-tests.py --exclude 'vfs_posix.py' --exclude 'ffi_(callback|float|float2).py')
 }
 
 function ci_unix_qemu_arm_setup {
@@ -654,7 +654,7 @@ function ci_unix_qemu_arm_run_tests {
     # - (i)listdir does not work, it always returns the empty list (it's an issue with the underlying C call)
     export QEMU_LD_PREFIX=/usr/arm-linux-gnueabi
     file ./ports/unix/micropython-coverage
-    (cd tests && MICROPY_MICROPYTHON=../ports/unix/micropython-coverage ./run-tests.py --exclude 'vfs_posix.py')
+    (cd tests && MICROPY_MICROPYTHON=../ports/unix/build-coverage/micropython-coverage ./run-tests.py --exclude 'vfs_posix.py')
 }
 
 ########################################################################################
diff --git a/tools/makemanifest.py b/tools/makemanifest.py
index 8cdc3eb7741b9..e69698d3f2340 100644
--- a/tools/makemanifest.py
+++ b/tools/makemanifest.py
@@ -329,7 +329,7 @@ def main():
         sys.exit(1)
 
     # Get paths to tools
-    MPY_CROSS = VARS["MPY_DIR"] + "/mpy-cross/mpy-cross"
+    MPY_CROSS = VARS["MPY_DIR"] + "/mpy-cross/build/mpy-cross"
     if sys.platform == "win32":
         MPY_CROSS += ".exe"
     MPY_CROSS = os.getenv("MICROPY_MPYCROSS", MPY_CROSS)

From 409995ac6828dc6bb70fcbe0bf9f26fd087ed22b Mon Sep 17 00:00:00 2001
From: Daniel Jour <d.jour@steiner.de>
Date: Wed, 3 Aug 2022 01:32:51 +0200
Subject: [PATCH 2456/3533] tools/ci.sh: Force mpy-cross build for samd and
 teensy.

---
 tools/ci.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tools/ci.sh b/tools/ci.sh
index 20119342cfcf5..cf6fc4170587a 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -293,6 +293,7 @@ function ci_samd_setup {
 }
 
 function ci_samd_build {
+    make ${MAKEOPTS} -C mpy-cross
     make ${MAKEOPTS} -C ports/samd submodules
     make ${MAKEOPTS} -C ports/samd
 }
@@ -356,6 +357,7 @@ function ci_teensy_setup {
 }
 
 function ci_teensy_build {
+    make ${MAKEOPTS} -C mpy-cross
     make ${MAKEOPTS} -C ports/teensy submodules
     make ${MAKEOPTS} -C ports/teensy
 }

From c7aa6a2c73854af9c0e9561e9213ef20abccf246 Mon Sep 17 00:00:00 2001
From: Daniel Jour <d.jour@steiner.de>
Date: Wed, 3 Aug 2022 16:29:55 +0200
Subject: [PATCH 2457/3533] tests/run-tests.py: Provide better default MPYCROSS
 value for Windows.

---
 tests/run-tests.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/tests/run-tests.py b/tests/run-tests.py
index 8e9bd843134fc..ca7941f6261bd 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -31,18 +31,20 @@ def base_path(*p):
 if os.name == "nt":
     CPYTHON3 = os.getenv("MICROPY_CPYTHON3", "python")
     MICROPYTHON = os.getenv("MICROPY_MICROPYTHON", base_path("../ports/windows/micropython.exe"))
+    # mpy-cross is only needed if --via-mpy command-line arg is passed
+    MPYCROSS = os.getenv("MICROPY_MPYCROSS", base_path("../mpy-cross/mpy-cross.exe"))
 else:
     CPYTHON3 = os.getenv("MICROPY_CPYTHON3", "python3")
     MICROPYTHON = os.getenv(
         "MICROPY_MICROPYTHON", base_path("../ports/unix/build-standard/micropython")
     )
+    # mpy-cross is only needed if --via-mpy command-line arg is passed
+    MPYCROSS = os.getenv("MICROPY_MPYCROSS", base_path("../mpy-cross/build/mpy-cross"))
 
 # Use CPython options to not save .pyc files, to only access the core standard library
 # (not site packages which may clash with u-module names), and improve start up time.
 CPYTHON3_CMD = [CPYTHON3, "-BS"]
 
-# mpy-cross is only needed if --via-mpy command-line arg is passed
-MPYCROSS = os.getenv("MICROPY_MPYCROSS", base_path("../mpy-cross/build/mpy-cross"))
 
 # For diff'ing test output
 DIFF = os.getenv("MICROPY_DIFF", "diff -u")

From d53c3b6ade01650f88972ccf7e3002d2b5a84ff6 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 11 Aug 2022 12:40:23 +1000
Subject: [PATCH 2458/3533] unix/variants: Remove variant suffix from
 executable filename.

The executable now lives in the build directory, and since the build
directory already contains the variant name there is no need to also add
it to the executable.

Signed-off-by: Damien George <damien@micropython.org>
---
 .github/workflows/ports_unix.yml              |  2 +-
 .../unix/variants/coverage/mpconfigvariant.mk |  2 --
 ports/unix/variants/dev/mpconfigvariant.mk    |  2 --
 ports/unix/variants/fast/mpconfigvariant.mk   |  2 --
 .../unix/variants/freedos/mpconfigvariant.mk  |  2 --
 .../unix/variants/minimal/mpconfigvariant.mk  |  1 -
 ports/unix/variants/nanbox/mpconfigvariant.mk |  1 -
 .../unix/variants/standard/mpconfigvariant.mk |  2 --
 ports/windows/variants/dev/mpconfigvariant.mk |  2 --
 tests/run-natmodtests.py                      |  2 +-
 tools/ci.sh                                   | 26 ++++++++-----------
 tools/metrics.py                              |  4 +--
 12 files changed, 15 insertions(+), 33 deletions(-)

diff --git a/.github/workflows/ports_unix.yml b/.github/workflows/ports_unix.yml
index ab2406647a8ca..45cc87e723945 100644
--- a/.github/workflows/ports_unix.yml
+++ b/.github/workflows/ports_unix.yml
@@ -35,7 +35,7 @@ jobs:
       env:
         SOURCE_DATE_EPOCH: 1234567890
     - name: Check reproducible build date
-      run: echo | ports/unix/build-minimal/micropython-minimal -i | grep 'on 2009-02-13;'
+      run: echo | ports/unix/build-minimal/micropython -i | grep 'on 2009-02-13;'
 
   standard:
     runs-on: ubuntu-latest
diff --git a/ports/unix/variants/coverage/mpconfigvariant.mk b/ports/unix/variants/coverage/mpconfigvariant.mk
index fac8c0d2752e0..bbbb0432b5b76 100644
--- a/ports/unix/variants/coverage/mpconfigvariant.mk
+++ b/ports/unix/variants/coverage/mpconfigvariant.mk
@@ -1,5 +1,3 @@
-PROG ?= micropython-coverage
-
 # Disable optimisations and enable assert() on coverage builds.
 DEBUG ?= 1
 
diff --git a/ports/unix/variants/dev/mpconfigvariant.mk b/ports/unix/variants/dev/mpconfigvariant.mk
index 78588d379bcde..058eda2f8d192 100644
--- a/ports/unix/variants/dev/mpconfigvariant.mk
+++ b/ports/unix/variants/dev/mpconfigvariant.mk
@@ -1,5 +1,3 @@
-PROG ?= micropython-dev
-
 FROZEN_MANIFEST ?= $(VARIANT_DIR)/manifest.py
 
 MICROPY_ROM_TEXT_COMPRESSION = 1
diff --git a/ports/unix/variants/fast/mpconfigvariant.mk b/ports/unix/variants/fast/mpconfigvariant.mk
index 595e5756457c9..b8fe69e487315 100644
--- a/ports/unix/variants/fast/mpconfigvariant.mk
+++ b/ports/unix/variants/fast/mpconfigvariant.mk
@@ -2,6 +2,4 @@
 
 COPT += -fno-crossjumping -O2
 
-PROG = micropython-fast
-
 FROZEN_MANIFEST =
diff --git a/ports/unix/variants/freedos/mpconfigvariant.mk b/ports/unix/variants/freedos/mpconfigvariant.mk
index a30db3e0c1490..86ab6864f45c1 100644
--- a/ports/unix/variants/freedos/mpconfigvariant.mk
+++ b/ports/unix/variants/freedos/mpconfigvariant.mk
@@ -10,8 +10,6 @@ CFLAGS += \
 	-DMICROPY_EMIT_X86=0 \
 	-DMICROPY_NO_ALLOCA=1 \
 
-PROG = micropython-freedos
-
 MICROPY_PY_SOCKET = 0
 MICROPY_PY_FFI = 0
 MICROPY_PY_JNI = 0
diff --git a/ports/unix/variants/minimal/mpconfigvariant.mk b/ports/unix/variants/minimal/mpconfigvariant.mk
index ec3b21c0b979c..9d4ddab9563e4 100644
--- a/ports/unix/variants/minimal/mpconfigvariant.mk
+++ b/ports/unix/variants/minimal/mpconfigvariant.mk
@@ -1,5 +1,4 @@
 # build a minimal interpreter
-PROG = micropython-minimal
 
 FROZEN_MANIFEST =
 
diff --git a/ports/unix/variants/nanbox/mpconfigvariant.mk b/ports/unix/variants/nanbox/mpconfigvariant.mk
index 9752b922c1e31..e588e657efc5b 100644
--- a/ports/unix/variants/nanbox/mpconfigvariant.mk
+++ b/ports/unix/variants/nanbox/mpconfigvariant.mk
@@ -1,4 +1,3 @@
 # build interpreter with nan-boxing as object model (object repr D)
-PROG = micropython-nanbox
 
 MICROPY_FORCE_32BIT = 1
diff --git a/ports/unix/variants/standard/mpconfigvariant.mk b/ports/unix/variants/standard/mpconfigvariant.mk
index cf3efab8ae7d9..def7987d8dc80 100644
--- a/ports/unix/variants/standard/mpconfigvariant.mk
+++ b/ports/unix/variants/standard/mpconfigvariant.mk
@@ -1,3 +1 @@
 # This is the default variant when you `make` the Unix port.
-
-PROG ?= micropython
diff --git a/ports/windows/variants/dev/mpconfigvariant.mk b/ports/windows/variants/dev/mpconfigvariant.mk
index b2a0b5bb3388f..6d83f5b4dbc41 100644
--- a/ports/windows/variants/dev/mpconfigvariant.mk
+++ b/ports/windows/variants/dev/mpconfigvariant.mk
@@ -1,5 +1,3 @@
-PROG ?= micropython-dev
-
 FROZEN_MANIFEST ?= $(VARIANT_DIR)/manifest.py
 
 MICROPY_ROM_TEXT_COMPRESSION = 1
diff --git a/tests/run-natmodtests.py b/tests/run-natmodtests.py
index 9130e00d6eba1..16bb469222569 100755
--- a/tests/run-natmodtests.py
+++ b/tests/run-natmodtests.py
@@ -14,7 +14,7 @@
 
 # Paths for host executables
 CPYTHON3 = os.getenv("MICROPY_CPYTHON3", "python3")
-MICROPYTHON = os.getenv("MICROPY_MICROPYTHON", "../ports/unix/build-coverage/micropython-coverage")
+MICROPYTHON = os.getenv("MICROPY_MICROPYTHON", "../ports/unix/build-coverage/micropython")
 
 NATMOD_EXAMPLE_DIR = "../examples/natmod/"
 
diff --git a/tools/ci.sh b/tools/ci.sh
index cf6fc4170587a..e3203f8bfb9f2 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -410,14 +410,10 @@ function ci_unix_run_tests_helper {
 function ci_unix_run_tests_full_helper {
     variant=$1
     shift
-    if [ $variant = standard ]; then
-        micropython=build-$variant/micropython
-    else
-        micropython=build-$variant/micropython-$variant
-    fi
+    micropython=../ports/unix/build-$variant/micropython
     make -C ports/unix VARIANT=$variant "$@" test_full
-    (cd tests && MICROPY_CPYTHON3=python3 MICROPY_MICROPYTHON=../ports/unix/$micropython ./run-multitests.py multi_net/*.py)
-    (cd tests && MICROPY_CPYTHON3=python3 MICROPY_MICROPYTHON=../ports/unix/$micropython ./run-perfbench.py 1000 1000)
+    (cd tests && MICROPY_CPYTHON3=python3 MICROPY_MICROPYTHON=$micropython ./run-multitests.py multi_net/*.py)
+    (cd tests && MICROPY_CPYTHON3=python3 MICROPY_MICROPYTHON=$micropython ./run-perfbench.py 1000 1000)
 }
 
 function ci_native_mpy_modules_build {
@@ -446,7 +442,7 @@ function ci_unix_minimal_build {
 }
 
 function ci_unix_minimal_run_tests {
-    (cd tests && MICROPY_CPYTHON3=python3 MICROPY_MICROPYTHON=../ports/unix/build-minimal/micropython-minimal ./run-tests.py -e exception_chain -e self_type_check -e subclass_native_init -d basics)
+    (cd tests && MICROPY_CPYTHON3=python3 MICROPY_MICROPYTHON=../ports/unix/build-minimal/micropython ./run-tests.py -e exception_chain -e self_type_check -e subclass_native_init -d basics)
 }
 
 function ci_unix_standard_build {
@@ -494,20 +490,20 @@ function ci_unix_coverage_run_mpy_merge_tests {
         echo $test
         outmpy=$outdir/$test.mpy
         $mptop/mpy-cross/build/mpy-cross -o $outmpy $inpy
-        (cd $outdir && $mptop/ports/unix/build-coverage/micropython-coverage -m $test >> out-individual)
+        (cd $outdir && $mptop/ports/unix/build-coverage/micropython -m $test >> out-individual)
         allmpy+=($outmpy)
     done
 
     # Merge all the tests into one .mpy file, and then execute it.
     python3 $mptop/tools/mpy-tool.py --merge -o $outdir/merged.mpy ${allmpy[@]}
-    (cd $outdir && $mptop/ports/unix/build-coverage/micropython-coverage -m merged > out-merged)
+    (cd $outdir && $mptop/ports/unix/build-coverage/micropython -m merged > out-merged)
 
     # Make sure the outputs match.
     diff $outdir/out-individual $outdir/out-merged && /bin/rm -rf $outdir
 }
 
 function ci_unix_coverage_run_native_mpy_tests {
-    MICROPYPATH=examples/natmod/features2 ./ports/unix/build-coverage/micropython-coverage -m features2
+    MICROPYPATH=examples/natmod/features2 ./ports/unix/build-coverage/micropython -m features2
     (cd tests && ./run-natmodtests.py "$@" extmod/{btree*,framebuf*,uheapq*,urandom*,ure*,uzlib*}.py)
 }
 
@@ -635,8 +631,8 @@ function ci_unix_qemu_mips_run_tests {
     # Issues with MIPS tests:
     # - (i)listdir does not work, it always returns the empty list (it's an issue with the underlying C call)
     # - ffi tests do not work
-    file ./ports/unix/micropython-coverage
-    (cd tests && MICROPY_MICROPYTHON=../ports/unix/build-coverage/micropython-coverage ./run-tests.py --exclude 'vfs_posix.py' --exclude 'ffi_(callback|float|float2).py')
+    file ./ports/unix/build-coverage/micropython
+    (cd tests && MICROPY_MICROPYTHON=../ports/unix/build-coverage/micropython ./run-tests.py --exclude 'vfs_posix.py' --exclude 'ffi_(callback|float|float2).py')
 }
 
 function ci_unix_qemu_arm_setup {
@@ -655,8 +651,8 @@ function ci_unix_qemu_arm_run_tests {
     # Issues with ARM tests:
     # - (i)listdir does not work, it always returns the empty list (it's an issue with the underlying C call)
     export QEMU_LD_PREFIX=/usr/arm-linux-gnueabi
-    file ./ports/unix/micropython-coverage
-    (cd tests && MICROPY_MICROPYTHON=../ports/unix/build-coverage/micropython-coverage ./run-tests.py --exclude 'vfs_posix.py')
+    file ./ports/unix/build-coverage/micropython
+    (cd tests && MICROPY_MICROPYTHON=../ports/unix/build-coverage/micropython ./run-tests.py --exclude 'vfs_posix.py')
 }
 
 ########################################################################################
diff --git a/tools/metrics.py b/tools/metrics.py
index c79b998e18468..da4d188568fdb 100755
--- a/tools/metrics.py
+++ b/tools/metrics.py
@@ -60,8 +60,8 @@ def __init__(self, name, dir, output, make_flags=None):
 port_data = {
     "b": PortData("bare-arm", "bare-arm", "build/firmware.elf"),
     "m": PortData("minimal x86", "minimal", "build/firmware.elf"),
-    "u": PortData("unix x64", "unix", "micropython"),
-    "n": PortData("unix nanbox", "unix", "micropython-nanbox", "VARIANT=nanbox"),
+    "u": PortData("unix x64", "unix", "build-standard/micropython"),
+    "n": PortData("unix nanbox", "unix", "build-nanbox/micropython", "VARIANT=nanbox"),
     "s": PortData("stm32", "stm32", "build-PYBV10/firmware.elf", "BOARD=PYBV10"),
     "c": PortData("cc3200", "cc3200", "build/WIPY/release/application.axf", "BTARGET=application"),
     "8": PortData("esp8266", "esp8266", "build-GENERIC/firmware.elf"),

From 2e8816de915244ee5612178711237f4f88d754ed Mon Sep 17 00:00:00 2001
From: Mat Booth <mat.booth@gmail.com>
Date: Sun, 31 Jul 2022 11:41:54 +0100
Subject: [PATCH 2459/3533] py/dynruntime.mk: Allow building assembly source in
 natmods.

Allow inclusion of assembly source files in dynamic native modules.
---
 py/dynruntime.mk | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/py/dynruntime.mk b/py/dynruntime.mk
index 10feefc4a7c22..62db43ad149ca 100644
--- a/py/dynruntime.mk
+++ b/py/dynruntime.mk
@@ -35,7 +35,7 @@ CFLAGS += -U _FORTIFY_SOURCE # prevent use of __*_chk libc functions
 
 MPY_CROSS_FLAGS += -march=$(ARCH)
 
-SRC_O += $(addprefix $(BUILD)/, $(patsubst %.c,%.o,$(filter %.c,$(SRC))))
+SRC_O += $(addprefix $(BUILD)/, $(patsubst %.c,%.o,$(filter %.c,$(SRC))) $(patsubst %.S,%.o,$(filter %.S,$(SRC))))
 SRC_MPY += $(addprefix $(BUILD)/, $(patsubst %.py,%.mpy,$(filter %.py,$(SRC))))
 
 ################################################################################
@@ -134,6 +134,11 @@ $(BUILD)/%.o: %.c $(CONFIG_H) Makefile
 	$(ECHO) "CC $<"
 	$(Q)$(CROSS)gcc $(CFLAGS) -o $@ -c $<
 
+# Build .o from .S source files
+$(BUILD)/%.o: %.S $(CONFIG_H) Makefile
+	$(ECHO) "AS $<"
+	$(Q)$(CROSS)gcc $(CFLAGS) -o $@ -c $<
+
 # Build .mpy from .py source files
 $(BUILD)/%.mpy: %.py
 	$(ECHO) "MPY $<"

From f3285fef07b4baa64cb05ef6dc034496cb0effdc Mon Sep 17 00:00:00 2001
From: Efi Weiss <efiwiss@gmail.com>
Date: Sun, 31 Jul 2022 22:16:49 +0300
Subject: [PATCH 2460/3533] py/nlrpowerpc: Fix generation of ppc64 code on
 ppc32 build.

Due to inline assembly, wrong instructions were generated.  Use
corresponding 32 bit instructions and fix the offsets used.

Signed-off-by: Efi Weiss <efiwiss@gmail.com>
---
 py/nlrpowerpc.c | 93 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 93 insertions(+)

diff --git a/py/nlrpowerpc.c b/py/nlrpowerpc.c
index 940d8562e120c..448459216b6e8 100644
--- a/py/nlrpowerpc.c
+++ b/py/nlrpowerpc.c
@@ -32,6 +32,8 @@
 
 // Saving all ABI non-vol registers here
 
+#ifdef __LP64__
+
 unsigned int nlr_push(nlr_buf_t *nlr) {
 
     __asm__ volatile (
@@ -118,4 +120,95 @@ NORETURN void nlr_jump(void *val) {
     MP_UNREACHABLE;
 }
 
+#else
+// Saving all ABI non-vol registers here
+
+unsigned int nlr_push(nlr_buf_t *nlr) {
+
+    __asm__ volatile (
+        "li     4, 0x4eed ; "  // Store canary
+        "stw    4,  0x00(%0) ;"
+        "stw    0,  0x04(%0) ;"
+        "stw    1,  0x08(%0) ;"
+        "stw    2,  0x0c(%0) ;"
+        "stw    14, 0x10(%0) ;"
+        "stw    15, 0x14(%0) ;"
+        "stw    16, 0x18(%0) ;"
+        "stw    17, 0x1c(%0) ;"
+        "stw    18, 0x20(%0) ;"
+        "stw    19, 0x24(%0) ;"
+        "stw    20, 0x28(%0) ;"
+        "stw    21, 0x2c(%0) ;"
+        "stw    22, 0x30(%0) ;"
+        "stw    23, 0x34(%0) ;"
+        "stw    24, 0x38(%0) ;"
+        "stw    25, 0x3c(%0) ;"
+        "stw    26, 0x40(%0) ;"
+        "stw    27, 0x44(%0) ;"
+        "stw    28, 0x48(%0) ;"
+        "stw    29, 0x4c(%0) ;"
+        "stw    30, 0x50(%0) ;"
+        "stw    31, 0x54(%0) ;"
+
+        "mfcr   4 ; "
+        "stw    4, 0x58(%0) ;"
+        "mflr   4 ;"
+        "stw    4, 0x5c(%0) ;"
+        "li     4, nlr_push_tail@l ;"
+        "oris   4, 4, nlr_push_tail@h ;"
+        "mtctr  4 ;"
+        "mr    3, %1 ; "
+        "bctr  ;"
+        :
+        : "r" (&nlr->regs), "r" (nlr)
+        :
+        );
+
+    return 0;
+}
+
+NORETURN void nlr_jump(void *val) {
+    MP_NLR_JUMP_HEAD(val, top)
+
+    __asm__ volatile (
+        "l    3, 0x0(%0) ;"
+        "cmpdi 3, 0x4eed ; " // Check canary
+        "bne   . ; "
+        "l    0,  0x04(%0) ;"
+        "l    1,  0x08(%0) ;"
+        "l    2,  0x0c(%0) ;"
+        "l    14, 0x10(%0) ;"
+        "l    15, 0x14(%0) ;"
+        "l    16, 0x18(%0) ;"
+        "l    17, 0x1c(%0) ;"
+        "l    18, 0x20(%0) ;"
+        "l    19, 0x24(%0) ;"
+        "l    20, 0x28(%0) ;"
+        "l    21, 0x2c(%0) ;"
+        "l    22, 0x30(%0) ;"
+        "l    23, 0x34(%0) ;"
+        "l    24, 0x38(%0) ;"
+        "l    25, 0x3c(%0) ;"
+        "l    26, 0x40(%0) ;"
+        "l    27, 0x44(%0) ;"
+        "l    28, 0x48(%0) ;"
+        "l    29, 0x4c(%0) ;"
+        "l    30, 0x50(%0) ;"
+        "l    31, 0x54(%0) ;"
+        "l    3,  0x58(%0) ;"
+        "mtcr  3 ;"
+        "l    3, 0x5c(%0) ;"
+        "mtlr  3 ; "
+        "li    3, 1;"
+        "blr ;"
+        :
+        : "r" (&top->regs)
+        :
+        );
+
+    MP_UNREACHABLE;
+}
+
+#endif // __LP64__
+
 #endif // MICROPY_NLR_POWERPC

From 9c6fd974f769ef1e907c1a41f4a5d9b1c1774df7 Mon Sep 17 00:00:00 2001
From: Daniel Jour <d.jour@steiner.de>
Date: Sun, 31 Jul 2022 18:01:13 +0200
Subject: [PATCH 2461/3533] minimal/Makefile: Avoid terminal reset, use BUILD
 variable.

stty can provide the current terminal settings, so that they can be
stored in a shell variable and restored after running the firmware. This
avoids the complete "blanking" of the terminal, and thus also removes the
need for the sleep call.

The run target now references the firmware file using the BUILD variable
instead of using the hard coded "build/" path.
---
 ports/minimal/Makefile | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/ports/minimal/Makefile b/ports/minimal/Makefile
index 169132a1a29f7..5ba6514c9ed43 100644
--- a/ports/minimal/Makefile
+++ b/ports/minimal/Makefile
@@ -103,12 +103,11 @@ deploy: $(BUILD)/firmware.dfu
 
 # Run emulation build on a POSIX system with suitable terminal settings
 run:
-	stty raw opost -echo
-	build/firmware.elf
-	@echo Resetting terminal...
-# This sleep is useful to spot segfaults
-	sleep 1
-	reset
+	@saved_=`stty -g`; \
+	  stty raw opost -echo; \
+	  $(BUILD)/firmware.elf; \
+	  echo "Exit status: $$?"; \
+	  stty $$saved_
 
 test: $(BUILD)/firmware.elf
 	$(Q)/bin/echo -e "print('hello world!', list(x+1 for x in range(10)), end='eol\\\\n')\\r\\n\\x04" | $(BUILD)/firmware.elf | tail -n2 | grep "^hello world! \\[1, 2, 3, 4, 5, 6, 7, 8, 9, 10\\]eol"

From b6651a7a89a666ca76cdc03e065e339dbf3b9298 Mon Sep 17 00:00:00 2001
From: David Yang <mmyangfl@gmail.com>
Date: Mon, 4 Jan 2021 23:22:08 +0800
Subject: [PATCH 2462/3533] unix/modjni: Add missing const qualifier.

---
 ports/unix/modjni.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/unix/modjni.c b/ports/unix/modjni.c
index c86f30653c81a..6fa00731fb753 100644
--- a/ports/unix/modjni.c
+++ b/ports/unix/modjni.c
@@ -376,7 +376,7 @@ STATIC const char *strprev(const char *s, char c) {
 
 STATIC bool py2jvalue(const char **jtypesig, mp_obj_t arg, jvalue *out) {
     const char *arg_type = *jtypesig;
-    mp_obj_type_t *type = mp_obj_get_type(arg);
+    const mp_obj_type_t *type = mp_obj_get_type(arg);
 
     if (type == &mp_type_str) {
         if (IMATCH(arg_type, "java.lang.String") || IMATCH(arg_type, "java.lang.Object")) {

From 6e51dbd95aa051533e2618e2df8f51cb0f06cfed Mon Sep 17 00:00:00 2001
From: omogenot <olivier.mogenot@mymeterinfo.info>
Date: Tue, 26 Jul 2022 16:36:10 +0200
Subject: [PATCH 2463/3533] rp2/boards/W5500_EVB_PICO: Add new board definition
 for W5500_EVB_PICO.

Signed-off-by: github@mymeterinfo.info
---
 ports/rp2/boards/W5500_EVB_PICO/board.json    | 20 +++++++++++++++++++
 .../boards/W5500_EVB_PICO/mpconfigboard.cmake |  4 ++++
 .../rp2/boards/W5500_EVB_PICO/mpconfigboard.h | 19 ++++++++++++++++++
 ports/rp2/boards/W5500_EVB_PICO/readme.md     | 18 +++++++++++++++++
 4 files changed, 61 insertions(+)
 create mode 100644 ports/rp2/boards/W5500_EVB_PICO/board.json
 create mode 100644 ports/rp2/boards/W5500_EVB_PICO/mpconfigboard.cmake
 create mode 100644 ports/rp2/boards/W5500_EVB_PICO/mpconfigboard.h
 create mode 100644 ports/rp2/boards/W5500_EVB_PICO/readme.md

diff --git a/ports/rp2/boards/W5500_EVB_PICO/board.json b/ports/rp2/boards/W5500_EVB_PICO/board.json
new file mode 100644
index 0000000000000..90b3186cd6b1b
--- /dev/null
+++ b/ports/rp2/boards/W5500_EVB_PICO/board.json
@@ -0,0 +1,20 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [
+        "Breadboard Friendly",
+        "Castellated Pads",
+        "Ethernet",
+        "Micro USB"
+    ],
+    "images": [
+        "W5500-EVB-Pico.jpg"
+    ],
+    "mcu": "rp2040",
+    "product": "Wiznet W5500-EVB-Pico",
+    "thumbnail": "",
+    "url": "https://www.wiznet.io/product-item/w5500-evb-pico/",
+    "vendor": "Wiznet"
+}
diff --git a/ports/rp2/boards/W5500_EVB_PICO/mpconfigboard.cmake b/ports/rp2/boards/W5500_EVB_PICO/mpconfigboard.cmake
new file mode 100644
index 0000000000000..875b89f2befe0
--- /dev/null
+++ b/ports/rp2/boards/W5500_EVB_PICO/mpconfigboard.cmake
@@ -0,0 +1,4 @@
+# cmake file for Wiznet W5500-EVB-Pico.
+set(PICO_BOARD pico)
+set(MICROPY_PY_NETWORK_WIZNET5K W5500)
+set(MICROPY_PY_LWIP 1)
diff --git a/ports/rp2/boards/W5500_EVB_PICO/mpconfigboard.h b/ports/rp2/boards/W5500_EVB_PICO/mpconfigboard.h
new file mode 100644
index 0000000000000..1ad7a0e905327
--- /dev/null
+++ b/ports/rp2/boards/W5500_EVB_PICO/mpconfigboard.h
@@ -0,0 +1,19 @@
+// Board config for Wiznet W5500-EVB-Pico.
+
+// Board and hardware specific configuration
+#define MICROPY_HW_BOARD_NAME             "W5500-EVB-Pico"
+#define MICROPY_HW_FLASH_STORAGE_BYTES    (1408 * 1024)
+
+// Enable networking.
+#define MICROPY_PY_NETWORK                (1)
+
+// Wiznet HW config.
+#define MICROPY_HW_WIZNET_SPI_ID          (0)
+#define MICROPY_HW_WIZNET_SPI_BAUDRATE    (20 * 1000 * 1000)
+#define MICROPY_HW_WIZNET_SPI_SCK         (18)
+#define MICROPY_HW_WIZNET_SPI_MOSI        (19)
+#define MICROPY_HW_WIZNET_SPI_MISO        (16)
+#define MICROPY_HW_WIZNET_PIN_CS          (17)
+#define MICROPY_HW_WIZNET_PIN_RST         (20)
+// Connecting the INTN pin enables RECV interrupt handling of incoming data.
+#define MICROPY_HW_WIZNET_PIN_INTN        (21)
diff --git a/ports/rp2/boards/W5500_EVB_PICO/readme.md b/ports/rp2/boards/W5500_EVB_PICO/readme.md
new file mode 100644
index 0000000000000..be28286695fa0
--- /dev/null
+++ b/ports/rp2/boards/W5500_EVB_PICO/readme.md
@@ -0,0 +1,18 @@
+# Wiznet W5500-EVB-Pico
+
+## Network Example
+
+To use network / socket based code, connect ethernet port to network with DHCP running:
+
+```
+>>> import network
+>>> nic = network.WIZNET5K()
+>>> nic.active(True)
+>>> nic.ifconfig()
+('0.0.0.0', '0.0.0.0', '0.0.0.0', '0.0.0.0')
+>>> nic.ifconfig("dhcp")
+('192.168.0.10', '255.255.255.0', '192.168.0.1', '192.168.0.1')
+>>> nic.isconnected()
+True
+```
+At this point standard network communications libraries should work.

From 71f6eb5ac953637e815ec9c5cbc785b4027a8759 Mon Sep 17 00:00:00 2001
From: Phil Howard <phil@gadgetoid.com>
Date: Fri, 5 Aug 2022 09:43:22 +0100
Subject: [PATCH 2464/3533] rp2: Mark gc_heap NOLOAD for faster boot.

Create a new linker section .unitialized_bss for bss that does not need
zero-initialising.

Move gc_heap to this section, which saves ~30ms from rising edge of RESET
to setting a pin HIGH in MicroPython.

Zero fill happens in Pico SDK crt0.S before ROSC is configured.  It's very,
very slow.

Signed-off-by: Phil Howard <phil@gadgetoid.com>
---
 ports/rp2/main.c       | 2 +-
 ports/rp2/memmap_mp.ld | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/ports/rp2/main.c b/ports/rp2/main.c
index d976464de1cc5..1062236a3916b 100644
--- a/ports/rp2/main.c
+++ b/ports/rp2/main.c
@@ -66,7 +66,7 @@
 #endif
 
 extern uint8_t __StackTop, __StackBottom;
-static char gc_heap[MICROPY_GC_HEAP_SIZE];
+__attribute__((section(".uninitialized_bss"))) static char gc_heap[MICROPY_GC_HEAP_SIZE];
 
 // Embed version info in the binary in machine readable form
 bi_decl(bi_program_version_string(MICROPY_GIT_TAG));
diff --git a/ports/rp2/memmap_mp.ld b/ports/rp2/memmap_mp.ld
index 0dc96743ea5cb..82f9cb01c3eff 100644
--- a/ports/rp2/memmap_mp.ld
+++ b/ports/rp2/memmap_mp.ld
@@ -180,6 +180,12 @@ SECTIONS
         *(.uninitialized_data*)
     } > RAM
 
+    /* bss without zero init on startup */
+    .uninitialized_bss (NOLOAD): {
+        . = ALIGN(4);
+        *(.uninitialized_bss*)
+    } > RAM
+
     /* Start and end symbols must be word-aligned */
     .scratch_x : {
         __scratch_x_start__ = .;

From 0546a12238b53f3243cc6ae5dfbb7bcac1d0be9a Mon Sep 17 00:00:00 2001
From: Jacob Siverskog <jacob@teenage.engineering>
Date: Tue, 9 Aug 2022 14:21:05 +0200
Subject: [PATCH 2465/3533] rp2: Correctly determine path to
 arm-none-eabi-size.

Figure out path to arm-none-eabi-size the same way it's done for the
other binaries, instead of assuming it to be in the user's $PATH.

Signed-off-by: Jacob Siverskog <jacob@teenage.engineering>
---
 ports/rp2/CMakeLists.txt | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ports/rp2/CMakeLists.txt b/ports/rp2/CMakeLists.txt
index f5bd61c44ea84..37ac78b7339f4 100644
--- a/ports/rp2/CMakeLists.txt
+++ b/ports/rp2/CMakeLists.txt
@@ -412,9 +412,11 @@ endif()
 
 pico_add_extra_outputs(${MICROPY_TARGET})
 
+pico_find_compiler(PICO_COMPILER_SIZE ${PICO_GCC_TRIPLE}-size)
+
 add_custom_command(TARGET ${MICROPY_TARGET}
     POST_BUILD
-    COMMAND arm-none-eabi-size --format=berkeley ${PROJECT_BINARY_DIR}/${MICROPY_TARGET}.elf
+    COMMAND ${PICO_COMPILER_SIZE} --format=berkeley ${PROJECT_BINARY_DIR}/${MICROPY_TARGET}.elf
     VERBATIM
 )
 

From 888e831bf78518c367d40a6b77b29c6aab13a7f0 Mon Sep 17 00:00:00 2001
From: David Lechner <david@pybricks.com>
Date: Fri, 8 Jul 2022 13:47:54 -0500
Subject: [PATCH 2466/3533] docs: Update links for Arm GCC toolchain.

The separate A and RM toolchains have been discontinued and replaced
by a single toolchain. This updates the links to the RM toolchain to
the new toolchain.

Signed-off-by: David Lechner <david@pybricks.com>
---
 README.md                       | 2 +-
 docs/develop/gettingstarted.rst | 2 +-
 ports/qemu-arm/README.md        | 2 +-
 ports/renesas-ra/README.md      | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 920f10a5035b8..6941102f0ac48 100644
--- a/README.md
+++ b/README.md
@@ -156,7 +156,7 @@ The STM32 version
 The "stm32" port requires an ARM compiler, arm-none-eabi-gcc, and associated
 bin-utils.  For those using Arch Linux, you need arm-none-eabi-binutils,
 arm-none-eabi-gcc and arm-none-eabi-newlib packages.  Otherwise, try here:
-https://developer.arm.com/tools-and-software/open-source-software/developer-tools/gnu-toolchain/gnu-rm
+https://developer.arm.com/downloads/-/arm-gnu-toolchain-downloads
 
 To build:
 
diff --git a/docs/develop/gettingstarted.rst b/docs/develop/gettingstarted.rst
index 36062ddc008bd..000b7d61390cb 100644
--- a/docs/develop/gettingstarted.rst
+++ b/docs/develop/gettingstarted.rst
@@ -103,7 +103,7 @@ For the stm32 port, the ARM cross-compiler is required:
    $ sudo apt-get install arm-none-eabi-gcc arm-none-eabi-binutils arm-none-eabi-newlib
 
 See the `ARM GCC
-toolchain <https://developer.arm.com/tools-and-software/open-source-software/developer-tools/gnu-toolchain/gnu-rm>`_
+toolchain <https://developer.arm.com/downloads/-/arm-gnu-toolchain-downloads>`_
 for the latest details.
 
 Python is also required. Python 2 is supported for now, but we recommend using Python 3.
diff --git a/ports/qemu-arm/README.md b/ports/qemu-arm/README.md
index 2c815c54b088a..f821c4d1e28fb 100644
--- a/ports/qemu-arm/README.md
+++ b/ports/qemu-arm/README.md
@@ -16,7 +16,7 @@ The purposes of this port are to enable:
       process in terms of plugging things together, pressing buttons, etc.
 
 This port will only work with the [GNU ARM Embedded Toolchain](
-https://developer.arm.com/tools-and-software/open-source-software/developer-tools/gnu-toolchain/gnu-rm)
+https://developer.arm.com/downloads/-/arm-gnu-toolchain-downloads
  and not with CodeSourcery toolchain. You will need to modify
 `LDFLAGS` if you want to use CodeSourcery's version of `arm-none-eabi`.
 The difference is that CodeSourcery needs `-T generic-m-hosted.ld` while
diff --git a/ports/renesas-ra/README.md b/ports/renesas-ra/README.md
index 482870e1c0368..c75a9e13d1ed0 100644
--- a/ports/renesas-ra/README.md
+++ b/ports/renesas-ra/README.md
@@ -36,7 +36,7 @@ All other commands below should be executed from the ports/renesas-ra/ directory
 * Arm compiler
 An `Arm compiler` is required for the build, along with the associated binary
 utilities.  The default compiler is `arm-none-eabi-gcc`, which is available for
-Arch Linux and Windows hosts via https://developer.arm.com/tools-and-software/open-source-software/developer-tools/gnu-toolchain/gnu-rm/downloads.
+Linux, Mac and Windows hosts via https://developer.arm.com/downloads/-/arm-gnu-toolchain-downloads.
 The compiler can be changed using the `CROSS_COMPILE` variable
 when invoking `make`.
 

From 9bcb2c0a209f7970e63757a5f99dd23e010dbc48 Mon Sep 17 00:00:00 2001
From: Nathan Hendler <nathanhendler@gmail.com>
Date: Sun, 31 Jul 2022 11:40:44 -0700
Subject: [PATCH 2467/3533] docs/library/rp2: Fix pull_thresh docs to use pull
 instead of push.

---
 docs/library/rp2.StateMachine.rst | 4 ++--
 docs/library/rp2.rst              | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/library/rp2.StateMachine.rst b/docs/library/rp2.StateMachine.rst
index 8d73ccf772a7f..7e38ba8b1a754 100644
--- a/docs/library/rp2.StateMachine.rst
+++ b/docs/library/rp2.StateMachine.rst
@@ -55,8 +55,8 @@ Methods
       `PIO.SHIFT_LEFT` or `PIO.SHIFT_RIGHT`.
     - *push_thresh* is the threshold in bits before auto-push or conditional
       re-pushing is triggered.
-    - *pull_thresh* is the threshold in bits before auto-push or conditional
-      re-pushing is triggered.
+    - *pull_thresh* is the threshold in bits before auto-pull or conditional
+      re-pulling is triggered.
 
 .. method:: StateMachine.active([value])
 
diff --git a/docs/library/rp2.rst b/docs/library/rp2.rst
index 06affaae8cac5..ec7666d7cef4b 100644
--- a/docs/library/rp2.rst
+++ b/docs/library/rp2.rst
@@ -47,8 +47,8 @@ For running PIO programs, see :class:`rp2.StateMachine`.
       `PIO.SHIFT_LEFT` or `PIO.SHIFT_RIGHT`.
     - *push_thresh* is the threshold in bits before auto-push or conditional
       re-pushing is triggered.
-    - *pull_thresh* is the threshold in bits before auto-push or conditional
-      re-pushing is triggered.
+    - *pull_thresh* is the threshold in bits before auto-pull or conditional
+      re-pulling is triggered.
 
     The remaining parameters are:
 

From bfc63a5c844cd9efa25a44b418be201984fa231c Mon Sep 17 00:00:00 2001
From: Kyuchumimo <74131798+Kyuchumimo@users.noreply.github.com>
Date: Tue, 9 Aug 2022 18:30:21 -0600
Subject: [PATCH 2468/3533] drivers/sdcard: Add delay in init_card_v1 to make
 timeout work.

This now follows how init_card_v2 works.
---
 drivers/sdcard/sdcard.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/sdcard/sdcard.py b/drivers/sdcard/sdcard.py
index f4520acbb5379..df28bd9534482 100644
--- a/drivers/sdcard/sdcard.py
+++ b/drivers/sdcard/sdcard.py
@@ -118,6 +118,7 @@ def init_card(self, baudrate):
 
     def init_card_v1(self):
         for i in range(_CMD_TIMEOUT):
+            time.sleep_ms(50)
             self.cmd(55, 0, 0)
             if self.cmd(41, 0, 0) == 0:
                 # SDSC card, uses byte addressing in read/write/erase commands

From 94a19f10628f9c3a9978daae9f6f4c7ac352e9a2 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Thu, 11 Aug 2022 16:53:42 +1000
Subject: [PATCH 2469/3533] windows/Makefile: Update test dependency on
 $(PROG).

PR #9012 (b2e82402688b53829f37475583231b067b9faea7) changed the output to
$(BUILD)/$(PROG) but the tests are still looking for $(PROG).

Also remove the now-unnecessary override of $(PROG) in the standard
variant.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/windows/Makefile                             | 7 +++----
 ports/windows/variants/standard/mpconfigvariant.mk | 2 --
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/ports/windows/Makefile b/ports/windows/Makefile
index 45d61b0b50ac0..1e793800f804b 100644
--- a/ports/windows/Makefile
+++ b/ports/windows/Makefile
@@ -16,7 +16,6 @@ include $(VARIANT_DIR)/mpconfigvariant.mk
 FROZEN_MANIFEST ?= variants/manifest.py
 
 # Define main target
-# This should be configured by the mpconfigvariant.mk
 PROG ?= micropython
 
 # qstr definitions (must come before including py.mk)
@@ -98,10 +97,10 @@ include $(TOP)/py/mkrules.mk
 
 RUN_TESTS_SKIP += -e math_fun -e float2int_double -e float_parse -e math_domain_special
 
-test: $(PROG) $(TOP)/tests/run-tests.py
+test: $(BUILD)/$(PROG) $(TOP)/tests/run-tests.py
 	$(eval DIRNAME=ports/$(notdir $(CURDIR)))
-	cd $(TOP)/tests && MICROPY_MICROPYTHON=../$(DIRNAME)/$(PROG) $(PYTHON) ./run-tests.py $(RUN_TESTS_SKIP)
+	cd $(TOP)/tests && MICROPY_MICROPYTHON=../$(DIRNAME)/$(BUILD)/$(PROG) $(PYTHON) ./run-tests.py $(RUN_TESTS_SKIP)
 
 test_full: test
 	$(eval DIRNAME=ports/$(notdir $(CURDIR)))
-	cd $(TOP)/tests && MICROPY_MICROPYTHON=../$(DIRNAME)/$(PROG) $(PYTHON) ./run-tests.py --via-mpy $(RUN_TESTS_MPY_CROSS_FLAGS) $(RUN_TESTS_SKIP) -d basics float micropython
+	cd $(TOP)/tests && MICROPY_MICROPYTHON=../$(DIRNAME)/$(BUILD)/$(PROG) $(PYTHON) ./run-tests.py --via-mpy $(RUN_TESTS_MPY_CROSS_FLAGS) $(RUN_TESTS_SKIP) -d basics float micropython
diff --git a/ports/windows/variants/standard/mpconfigvariant.mk b/ports/windows/variants/standard/mpconfigvariant.mk
index 9e1f5ae059cef..a0d6712c55312 100644
--- a/ports/windows/variants/standard/mpconfigvariant.mk
+++ b/ports/windows/variants/standard/mpconfigvariant.mk
@@ -1,3 +1 @@
 # This is the default variant when you `make` the Windows port.
-
-PROG ?= micropython

From 82b3500724206f2baa342a3559bbe716e9819426 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 11 Aug 2022 16:34:02 +1000
Subject: [PATCH 2470/3533] py/qstr: Change qstr hash type from mp_uint_t to
 size_t.

The hash is either 8 or 16 bits (depending on MICROPY_QSTR_BYTES_IN_HASH)
so will fit in a size_t.

This saves 268 bytes on the unix nanbox build.  Non-nanbox configurations
are unchanged because mp_uint_t is the same size as size_t.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/objstr.h | 4 ++--
 py/qstr.c   | 8 ++++----
 py/qstr.h   | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/py/objstr.h b/py/objstr.h
index 8f87c3018a3c9..92b065d869b45 100644
--- a/py/objstr.h
+++ b/py/objstr.h
@@ -30,7 +30,7 @@
 
 typedef struct _mp_obj_str_t {
     mp_obj_base_t base;
-    mp_uint_t hash;
+    size_t hash;
     // len == number of bytes used in data, alloc = len + 1 because (at the moment) we also append a null byte
     size_t len;
     const byte *data;
@@ -41,7 +41,7 @@ typedef struct _mp_obj_str_t {
 // use this macro to extract the string hash
 // warning: the hash can be 0, meaning invalid, and must then be explicitly computed from the data
 #define GET_STR_HASH(str_obj_in, str_hash) \
-    mp_uint_t str_hash; \
+    size_t str_hash; \
     if (mp_obj_is_qstr(str_obj_in)) { \
         str_hash = qstr_hash(MP_OBJ_QSTR_VALUE(str_obj_in)); \
     } else { \
diff --git a/py/qstr.c b/py/qstr.c
index f9ca106837490..ea700566f4f7d 100644
--- a/py/qstr.c
+++ b/py/qstr.c
@@ -60,9 +60,9 @@
 #define MICROPY_ALLOC_QSTR_ENTRIES_INIT (10)
 
 // this must match the equivalent function in makeqstrdata.py
-mp_uint_t qstr_compute_hash(const byte *data, size_t len) {
+size_t qstr_compute_hash(const byte *data, size_t len) {
     // djb2 algorithm; see http://www.cse.yorku.ca/~oz/hash.html
-    mp_uint_t hash = 5381;
+    size_t hash = 5381;
     for (const byte *top = data + len; data < top; data++) {
         hash = ((hash << 5) + hash) ^ (*data); // hash * 33 ^ data
     }
@@ -181,7 +181,7 @@ STATIC qstr qstr_add(mp_uint_t hash, mp_uint_t len, const char *q_ptr) {
 
 qstr qstr_find_strn(const char *str, size_t str_len) {
     // work out hash of str
-    mp_uint_t str_hash = qstr_compute_hash((const byte *)str, str_len);
+    size_t str_hash = qstr_compute_hash((const byte *)str, str_len);
 
     // search pools for the data
     for (const qstr_pool_t *pool = MP_STATE_VM(last_pool); pool != NULL; pool = pool->prev) {
@@ -254,7 +254,7 @@ qstr qstr_from_strn(const char *str, size_t len) {
         MP_STATE_VM(qstr_last_used) += n_bytes;
 
         // store the interned strings' data
-        mp_uint_t hash = qstr_compute_hash((const byte *)str, len);
+        size_t hash = qstr_compute_hash((const byte *)str, len);
         memcpy(q_ptr, str, len);
         q_ptr[len] = '\0';
         q = qstr_add(hash, len, q_ptr);
diff --git a/py/qstr.h b/py/qstr.h
index a463b67a1836c..0ef861f33e8d5 100644
--- a/py/qstr.h
+++ b/py/qstr.h
@@ -78,7 +78,7 @@ typedef struct _qstr_pool_t {
 
 void qstr_init(void);
 
-mp_uint_t qstr_compute_hash(const byte *data, size_t len);
+size_t qstr_compute_hash(const byte *data, size_t len);
 qstr qstr_find_strn(const char *str, size_t str_len); // returns MP_QSTRnull if not found
 
 qstr qstr_from_str(const char *str);

From f7f56d42851aaff2027e23a8ca45c1f1973f1aca Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Wed, 10 Aug 2022 14:13:17 +1000
Subject: [PATCH 2471/3533] py/objstr: Consolidate methods for
 str/bytes/bytearray/array.

This commit adds the bytes methods to bytearray, matching CPython.  The
existing implementations of these methods for str/bytes are reused for
bytearray with minor updates to match CPython return types.

For details on the CPython behaviour see
https://docs.python.org/3/library/stdtypes.html#bytes-and-bytearray-operations

The work to merge locals tables for str/bytes/bytearray/array was done by
@jimmo.  Because of this merging of locals the change in code size for this
commit is mostly negative:

       bare-arm:    +0 +0.000%
    minimal x86:   +29 +0.018%
       unix x64:  -792 -0.128% standard[incl -448(data)]
    unix nanbox:  -436 -0.078% nanbox[incl -448(data)]
          stm32:   -40 -0.010% PYBV10
         cc3200:   -32 -0.017%
        esp8266:   -28 -0.004% GENERIC
          esp32:   -72 -0.005% GENERIC[incl -200(data)]
         mimxrt:   -40 -0.011% TEENSY40
     renesas-ra:   -40 -0.006% RA6M2_EK
            nrf:   -16 -0.009% pca10040
            rp2:   -64 -0.013% PICO
           samd:  +148 +0.105% ADAFRUIT_ITSYBITSY_M4_EXPRESS
---
 py/obj.h                                  |  10 +-
 py/objarray.c                             |  22 +--
 py/objarray.h                             |   5 +
 py/objstr.c                               | 157 ++++++++++++++++------
 py/objstr.h                               |  19 +++
 py/objstrunicode.c                        |  50 +------
 tests/basics/bytearray_byte_operations.py |  35 +++++
 tests/basics/bytearray_center.py          |   8 ++
 tests/basics/bytearray_count.py           |   7 +
 tests/basics/bytearray_partition.py       |   8 ++
 tests/basics/bytes_center.py              |  13 ++
 11 files changed, 225 insertions(+), 109 deletions(-)
 create mode 100644 tests/basics/bytearray_byte_operations.py
 create mode 100644 tests/basics/bytearray_center.py
 create mode 100644 tests/basics/bytearray_count.py
 create mode 100644 tests/basics/bytearray_partition.py
 create mode 100644 tests/basics/bytes_center.py

diff --git a/py/obj.h b/py/obj.h
index 7ba4c0a5f2892..598d6508da737 100644
--- a/py/obj.h
+++ b/py/obj.h
@@ -394,19 +394,21 @@ typedef struct _mp_rom_obj_t { mp_const_obj_t o; } mp_rom_obj_t;
         .table = (mp_map_elem_t *)(mp_rom_map_elem_t *)table_name, \
     }
 
-#define MP_DEFINE_CONST_DICT(dict_name, table_name) \
+#define MP_DEFINE_CONST_DICT_WITH_SIZE(dict_name, table_name, n) \
     const mp_obj_dict_t dict_name = { \
         .base = {&mp_type_dict}, \
         .map = { \
             .all_keys_are_qstrs = 1, \
             .is_fixed = 1, \
             .is_ordered = 1, \
-            .used = MP_ARRAY_SIZE(table_name), \
-            .alloc = MP_ARRAY_SIZE(table_name), \
+            .used = n, \
+            .alloc = n, \
             .table = (mp_map_elem_t *)(mp_rom_map_elem_t *)table_name, \
         }, \
     }
 
+#define MP_DEFINE_CONST_DICT(dict_name, table_name) MP_DEFINE_CONST_DICT_WITH_SIZE(dict_name, table_name, MP_ARRAY_SIZE(table_name))
+
 // These macros are used to declare and define constant staticmethond and classmethod objects
 // You can put "static" in front of the definitions to make them local
 
@@ -789,7 +791,7 @@ mp_obj_t mp_obj_new_str(const char *data, size_t len);
 mp_obj_t mp_obj_new_str_via_qstr(const char *data, size_t len);
 mp_obj_t mp_obj_new_str_from_vstr(const mp_obj_type_t *type, vstr_t *vstr);
 mp_obj_t mp_obj_new_bytes(const byte *data, size_t len);
-mp_obj_t mp_obj_new_bytearray(size_t n, void *items);
+mp_obj_t mp_obj_new_bytearray(size_t n, const void *items);
 mp_obj_t mp_obj_new_bytearray_by_ref(size_t n, void *items);
 #if MICROPY_PY_BUILTINS_FLOAT
 mp_obj_t mp_obj_new_int_from_float(mp_float_t val);
diff --git a/py/objarray.c b/py/objarray.c
index bff3126a2bc41..11bd7bb15c41c 100644
--- a/py/objarray.c
+++ b/py/objarray.c
@@ -381,7 +381,7 @@ STATIC mp_obj_t array_append(mp_obj_t self_in, mp_obj_t arg) {
     self->free--;
     return mp_const_none; // return None, as per CPython
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(array_append_obj, array_append);
+MP_DEFINE_CONST_FUN_OBJ_2(mp_obj_array_append_obj, array_append);
 
 STATIC mp_obj_t array_extend(mp_obj_t self_in, mp_obj_t arg_in) {
     // self is not a memoryview, so we don't need to use (& TYPECODE_MASK)
@@ -413,7 +413,7 @@ STATIC mp_obj_t array_extend(mp_obj_t self_in, mp_obj_t arg_in) {
 
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(array_extend_obj, array_extend);
+MP_DEFINE_CONST_FUN_OBJ_2(mp_obj_array_extend_obj, array_extend);
 #endif
 
 STATIC mp_obj_t array_subscr(mp_obj_t self_in, mp_obj_t index_in, mp_obj_t value) {
@@ -564,18 +564,6 @@ STATIC mp_int_t array_get_buffer(mp_obj_t o_in, mp_buffer_info_t *bufinfo, mp_ui
     return 0;
 }
 
-#if MICROPY_PY_BUILTINS_BYTEARRAY || MICROPY_PY_ARRAY
-STATIC const mp_rom_map_elem_t array_locals_dict_table[] = {
-    { MP_ROM_QSTR(MP_QSTR_append), MP_ROM_PTR(&array_append_obj) },
-    { MP_ROM_QSTR(MP_QSTR_extend), MP_ROM_PTR(&array_extend_obj) },
-    #if MICROPY_CPYTHON_COMPAT
-    { MP_ROM_QSTR(MP_QSTR_decode), MP_ROM_PTR(&bytes_decode_obj) },
-    #endif
-};
-
-STATIC MP_DEFINE_CONST_DICT(array_locals_dict, array_locals_dict_table);
-#endif
-
 #if MICROPY_PY_ARRAY
 const mp_obj_type_t mp_type_array = {
     { &mp_type_type },
@@ -587,7 +575,7 @@ const mp_obj_type_t mp_type_array = {
     .binary_op = array_binary_op,
     .subscr = array_subscr,
     .buffer_p = { .get_buffer = array_get_buffer },
-    .locals_dict = (mp_obj_dict_t *)&array_locals_dict,
+    .locals_dict = (mp_obj_dict_t *)&mp_obj_array_locals_dict,
 };
 #endif
 
@@ -603,7 +591,7 @@ const mp_obj_type_t mp_type_bytearray = {
     .binary_op = array_binary_op,
     .subscr = array_subscr,
     .buffer_p = { .get_buffer = array_get_buffer },
-    .locals_dict = (mp_obj_dict_t *)&array_locals_dict,
+    .locals_dict = (mp_obj_dict_t *)&mp_obj_bytearray_locals_dict,
 };
 #endif
 
@@ -631,7 +619,7 @@ size_t mp_obj_array_len(mp_obj_t self_in) {
 */
 
 #if MICROPY_PY_BUILTINS_BYTEARRAY
-mp_obj_t mp_obj_new_bytearray(size_t n, void *items) {
+mp_obj_t mp_obj_new_bytearray(size_t n, const void *items) {
     mp_obj_array_t *o = array_new(BYTEARRAY_TYPECODE, n);
     memcpy(o->items, items, n);
     return MP_OBJ_FROM_PTR(o);
diff --git a/py/objarray.h b/py/objarray.h
index 94c31c969386b..48a26c3fb301e 100644
--- a/py/objarray.h
+++ b/py/objarray.h
@@ -59,4 +59,9 @@ static inline void mp_obj_memoryview_init(mp_obj_array_t *self, size_t typecode,
 }
 #endif
 
+#if MICROPY_PY_ARRAY || MICROPY_PY_BUILTINS_BYTEARRAY
+MP_DECLARE_CONST_FUN_OBJ_2(mp_obj_array_append_obj);
+MP_DECLARE_CONST_FUN_OBJ_2(mp_obj_array_extend_obj);
+#endif
+
 #endif // MICROPY_INCLUDED_PY_OBJARRAY_H
diff --git a/py/objstr.c b/py/objstr.c
index f15a2d974458b..162229c62b2b3 100644
--- a/py/objstr.c
+++ b/py/objstr.c
@@ -41,6 +41,26 @@ STATIC mp_obj_t str_modulo_format(mp_obj_t pattern, size_t n_args, const mp_obj_
 STATIC mp_obj_t mp_obj_new_bytes_iterator(mp_obj_t str, mp_obj_iter_buf_t *iter_buf);
 STATIC NORETURN void bad_implicit_conversion(mp_obj_t self_in);
 
+STATIC void str_check_arg_type(const mp_obj_type_t *self_type, const mp_obj_t arg) {
+    // String operations generally need the args type to match the object they're called on,
+    // e.g. str.find(str), byte.startswith(byte)
+    // with the exception that bytes may be used for bytearray and vice versa.
+    const mp_obj_type_t *arg_type = mp_obj_get_type(arg);
+
+    #if MICROPY_PY_BUILTINS_BYTEARRAY
+    if (arg_type == &mp_type_bytearray) {
+        arg_type = &mp_type_bytes;
+    }
+    if (self_type == &mp_type_bytearray) {
+        self_type = &mp_type_bytes;
+    }
+    #endif
+
+    if (arg_type != self_type) {
+        bad_implicit_conversion(arg);
+    }
+}
+
 /******************************************************************************/
 /* str                                                                        */
 
@@ -452,6 +472,7 @@ STATIC mp_obj_t bytes_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) {
 STATIC mp_obj_t str_join(mp_obj_t self_in, mp_obj_t arg) {
     mp_check_self(mp_obj_is_str_or_bytes(self_in));
     const mp_obj_type_t *self_type = mp_obj_get_type(self_in);
+    const mp_obj_type_t *ret_type = self_type;
 
     // get separation string
     GET_STR_DATA_LEN(self_in, sep_str, sep_len);
@@ -469,8 +490,19 @@ STATIC mp_obj_t str_join(mp_obj_t self_in, mp_obj_t arg) {
 
     // count required length
     size_t required_len = 0;
+    #if MICROPY_PY_BUILTINS_BYTEARRAY
+    if (self_type == &mp_type_bytearray) {
+        self_type = &mp_type_bytes;
+    }
+    #endif
     for (size_t i = 0; i < seq_len; i++) {
-        if (mp_obj_get_type(seq_items[i]) != self_type) {
+        const mp_obj_type_t *seq_type = mp_obj_get_type(seq_items[i]);
+        #if MICROPY_PY_BUILTINS_BYTEARRAY
+        if (seq_type == &mp_type_bytearray) {
+            seq_type = &mp_type_bytes;
+        }
+        #endif
+        if (seq_type != self_type) {
             mp_raise_TypeError(
                 MP_ERROR_TEXT("join expects a list of str/bytes objects consistent with self object"));
         }
@@ -496,7 +528,7 @@ STATIC mp_obj_t str_join(mp_obj_t self_in, mp_obj_t arg) {
     }
 
     // return joined string
-    return mp_obj_new_str_from_vstr(self_type, &vstr);
+    return mp_obj_new_str_from_vstr(ret_type, &vstr);
 }
 MP_DEFINE_CONST_FUN_OBJ_2(str_join_obj, str_join);
 
@@ -545,9 +577,7 @@ mp_obj_t mp_obj_str_split(size_t n_args, const mp_obj_t *args) {
 
     } else {
         // sep given
-        if (mp_obj_get_type(sep) != self_type) {
-            bad_implicit_conversion(sep);
-        }
+        str_check_arg_type(self_type, sep);
 
         size_t sep_len;
         const char *sep_str = mp_obj_str_get_data(sep, &sep_len);
@@ -699,9 +729,7 @@ STATIC mp_obj_t str_finder(size_t n_args, const mp_obj_t *args, int direction, b
     mp_check_self(mp_obj_is_str_or_bytes(args[0]));
 
     // check argument type
-    if (mp_obj_get_type(args[1]) != self_type) {
-        bad_implicit_conversion(args[1]);
-    }
+    str_check_arg_type(self_type, args[1]);
 
     GET_STR_DATA_LEN(args[0], haystack, haystack_len);
     GET_STR_DATA_LEN(args[1], needle, needle_len);
@@ -805,9 +833,7 @@ STATIC mp_obj_t str_uni_strip(int type, size_t n_args, const mp_obj_t *args) {
         chars_to_del = whitespace;
         chars_to_del_len = sizeof(whitespace) - 1;
     } else {
-        if (mp_obj_get_type(args[1]) != self_type) {
-            bad_implicit_conversion(args[1]);
-        }
+        str_check_arg_type(self_type, args[1]);
         GET_STR_DATA_LEN(args[1], s, l);
         chars_to_del = s;
         chars_to_del_len = l;
@@ -1633,13 +1659,8 @@ STATIC mp_obj_t str_replace(size_t n_args, const mp_obj_t *args) {
 
     const mp_obj_type_t *self_type = mp_obj_get_type(args[0]);
 
-    if (mp_obj_get_type(args[1]) != self_type) {
-        bad_implicit_conversion(args[1]);
-    }
-
-    if (mp_obj_get_type(args[2]) != self_type) {
-        bad_implicit_conversion(args[2]);
-    }
+    str_check_arg_type(self_type, args[1]);
+    str_check_arg_type(self_type, args[2]);
 
     // extract string data
 
@@ -1726,9 +1747,7 @@ STATIC mp_obj_t str_count(size_t n_args, const mp_obj_t *args) {
     mp_check_self(mp_obj_is_str_or_bytes(args[0]));
 
     // check argument type
-    if (mp_obj_get_type(args[1]) != self_type) {
-        bad_implicit_conversion(args[1]);
-    }
+    str_check_arg_type(self_type, args[1]);
 
     GET_STR_DATA_LEN(args[0], haystack, haystack_len);
     GET_STR_DATA_LEN(args[1], needle, needle_len);
@@ -1767,9 +1786,7 @@ MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_count_obj, 2, 4, str_count);
 STATIC mp_obj_t str_partitioner(mp_obj_t self_in, mp_obj_t arg, int direction) {
     mp_check_self(mp_obj_is_str_or_bytes(self_in));
     const mp_obj_type_t *self_type = mp_obj_get_type(self_in);
-    if (self_type != mp_obj_get_type(arg)) {
-        bad_implicit_conversion(arg);
-    }
+    str_check_arg_type(self_type, arg);
 
     GET_STR_DATA_LEN(self_in, str, str_len);
     GET_STR_DATA_LEN(arg, sep, sep_len);
@@ -1795,6 +1812,12 @@ STATIC mp_obj_t str_partitioner(mp_obj_t self_in, mp_obj_t arg, int direction) {
         result[2] = self_in;
     }
 
+    #if MICROPY_PY_BUILTINS_BYTEARRAY
+    if (mp_obj_get_type(arg) != self_type) {
+        arg = mp_obj_new_str_of_type(self_type, sep, sep_len);
+    }
+    #endif
+
     const byte *position_ptr = find_subbytes(str, str_len, sep, sep_len, direction);
     if (position_ptr != NULL) {
         size_t position = position_ptr - str;
@@ -1940,17 +1963,15 @@ mp_int_t mp_obj_str_get_buffer(mp_obj_t self_in, mp_buffer_info_t *bufinfo, mp_u
     }
 }
 
-STATIC const mp_rom_map_elem_t str8_locals_dict_table[] = {
+// This locals table is used for the following types: str, bytes, bytearray, array.array.
+// Each type takes a different section (start to end offset) of this table.
+STATIC const mp_rom_map_elem_t array_bytearray_str_bytes_locals_table[] = {
+    #if MICROPY_PY_ARRAY || MICROPY_PY_BUILTINS_BYTEARRAY
+    { MP_ROM_QSTR(MP_QSTR_append), MP_ROM_PTR(&mp_obj_array_append_obj) },
+    { MP_ROM_QSTR(MP_QSTR_extend), MP_ROM_PTR(&mp_obj_array_extend_obj) },
+    #endif
     #if MICROPY_CPYTHON_COMPAT
     { MP_ROM_QSTR(MP_QSTR_decode), MP_ROM_PTR(&bytes_decode_obj) },
-    #if !MICROPY_PY_BUILTINS_STR_UNICODE
-    // If we have separate unicode type, then here we have methods only
-    // for bytes type, and it should not have encode() methods. Otherwise,
-    // we have non-compliant-but-practical bytestring type, which shares
-    // method table with bytes, so they both have encode() and decode()
-    // methods (which should do type checking at runtime).
-    { MP_ROM_QSTR(MP_QSTR_encode), MP_ROM_PTR(&str_encode_obj) },
-    #endif
     #endif
     { MP_ROM_QSTR(MP_QSTR_find), MP_ROM_PTR(&str_find_obj) },
     { MP_ROM_QSTR(MP_QSTR_rfind), MP_ROM_PTR(&str_rfind_obj) },
@@ -1986,9 +2007,46 @@ STATIC const mp_rom_map_elem_t str8_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_isdigit), MP_ROM_PTR(&str_isdigit_obj) },
     { MP_ROM_QSTR(MP_QSTR_isupper), MP_ROM_PTR(&str_isupper_obj) },
     { MP_ROM_QSTR(MP_QSTR_islower), MP_ROM_PTR(&str_islower_obj) },
+    #if MICROPY_CPYTHON_COMPAT
+    { MP_ROM_QSTR(MP_QSTR_encode), MP_ROM_PTR(&str_encode_obj) },
+    #endif
 };
 
-STATIC MP_DEFINE_CONST_DICT(str8_locals_dict, str8_locals_dict_table);
+#if MICROPY_CPYTHON_COMPAT
+#define TABLE_ENTRIES_COMPAT 1
+#else
+#define TABLE_ENTRIES_COMPAT 0
+#endif
+
+#if MICROPY_PY_ARRAY || MICROPY_PY_BUILTINS_BYTEARRAY
+#define TABLE_ENTRIES_ARRAY 2
+#else
+#define TABLE_ENTRIES_ARRAY 0
+#endif
+
+MP_DEFINE_CONST_DICT_WITH_SIZE(mp_obj_str_locals_dict,
+    array_bytearray_str_bytes_locals_table + TABLE_ENTRIES_ARRAY + TABLE_ENTRIES_COMPAT,
+    MP_ARRAY_SIZE(array_bytearray_str_bytes_locals_table) - (TABLE_ENTRIES_ARRAY + TABLE_ENTRIES_COMPAT));
+
+#if TABLE_ENTRIES_COMPAT == 0
+#define mp_obj_bytes_locals_dict mp_obj_str_locals_dict
+#else
+MP_DEFINE_CONST_DICT_WITH_SIZE(mp_obj_bytes_locals_dict,
+    array_bytearray_str_bytes_locals_table + TABLE_ENTRIES_ARRAY,
+    MP_ARRAY_SIZE(array_bytearray_str_bytes_locals_table) - (TABLE_ENTRIES_ARRAY + TABLE_ENTRIES_COMPAT));
+#endif
+
+#if MICROPY_PY_BUILTINS_BYTEARRAY
+MP_DEFINE_CONST_DICT_WITH_SIZE(mp_obj_bytearray_locals_dict,
+    array_bytearray_str_bytes_locals_table,
+    MP_ARRAY_SIZE(array_bytearray_str_bytes_locals_table) - TABLE_ENTRIES_COMPAT);
+#endif
+
+#if MICROPY_PY_ARRAY
+MP_DEFINE_CONST_DICT_WITH_SIZE(mp_obj_array_locals_dict,
+    array_bytearray_str_bytes_locals_table,
+    TABLE_ENTRIES_ARRAY);
+#endif
 
 #if !MICROPY_PY_BUILTINS_STR_UNICODE
 STATIC mp_obj_t mp_obj_new_str_iterator(mp_obj_t str, mp_obj_iter_buf_t *iter_buf);
@@ -2002,9 +2060,9 @@ const mp_obj_type_t mp_type_str = {
     .subscr = bytes_subscr,
     .getiter = mp_obj_new_str_iterator,
     .buffer_p = { .get_buffer = mp_obj_str_get_buffer },
-    .locals_dict = (mp_obj_dict_t *)&str8_locals_dict,
+    .locals_dict = (mp_obj_dict_t *)&mp_obj_str_locals_dict,
 };
-#endif
+#endif // !MICROPY_PY_BUILTINS_STR_UNICODE
 
 // Reuses most of methods from str
 const mp_obj_type_t mp_type_bytes = {
@@ -2016,7 +2074,7 @@ const mp_obj_type_t mp_type_bytes = {
     .subscr = bytes_subscr,
     .getiter = mp_obj_new_bytes_iterator,
     .buffer_p = { .get_buffer = mp_obj_str_get_buffer },
-    .locals_dict = (mp_obj_dict_t *)&str8_locals_dict,
+    .locals_dict = (mp_obj_dict_t *)&mp_obj_bytes_locals_dict,
 };
 
 // The zero-length bytes object, with data that includes a null-terminating byte
@@ -2044,6 +2102,10 @@ mp_obj_t mp_obj_new_str_copy(const mp_obj_type_t *type, const byte *data, size_t
 mp_obj_t mp_obj_new_str_of_type(const mp_obj_type_t *type, const byte *data, size_t len) {
     if (type == &mp_type_str) {
         return mp_obj_new_str((const char *)data, len);
+    #if MICROPY_PY_BUILTINS_BYTEARRAY
+    } else if (type == &mp_type_bytearray) {
+        return mp_obj_new_bytearray(len, data);
+    #endif
     } else {
         return mp_obj_new_bytes(data, len);
     }
@@ -2068,18 +2130,24 @@ mp_obj_t mp_obj_new_str_from_vstr(const mp_obj_type_t *type, vstr_t *vstr) {
         }
     }
 
-    // make a new str/bytes object
-    mp_obj_str_t *o = mp_obj_malloc(mp_obj_str_t, type);
-    o->len = vstr->len;
-    o->hash = qstr_compute_hash((byte *)vstr->buf, vstr->len);
+    byte *data;
     if (vstr->len + 1 == vstr->alloc) {
-        o->data = (byte *)vstr->buf;
+        data = (byte *)vstr->buf;
     } else {
-        o->data = (byte *)m_renew(char, vstr->buf, vstr->alloc, vstr->len + 1);
+        data = (byte *)m_renew(char, vstr->buf, vstr->alloc, vstr->len + 1);
     }
-    ((byte *)o->data)[o->len] = '\0'; // add null byte
+    data[vstr->len] = '\0'; // add null byte
     vstr->buf = NULL;
     vstr->alloc = 0;
+    #if MICROPY_PY_BUILTINS_BYTEARRAY
+    if (type == &mp_type_bytearray) {
+        return mp_obj_new_bytearray_by_ref(vstr->len, data);
+    }
+    #endif
+    mp_obj_str_t *o = mp_obj_malloc(mp_obj_str_t, type);
+    o->len = vstr->len;
+    o->hash = qstr_compute_hash(data, vstr->len);
+    o->data = data;
     return MP_OBJ_FROM_PTR(o);
 }
 
@@ -2179,6 +2247,7 @@ const byte *mp_obj_str_get_data_no_check(mp_obj_t self_in, size_t *len) {
     if (mp_obj_is_qstr(self_in)) {
         return qstr_data(MP_OBJ_QSTR_VALUE(self_in), len);
     } else {
+        MP_STATIC_ASSERT_STR_ARRAY_COMPATIBLE;
         *len = ((mp_obj_str_t *)MP_OBJ_TO_PTR(self_in))->len;
         return ((mp_obj_str_t *)MP_OBJ_TO_PTR(self_in))->data;
     }
diff --git a/py/objstr.h b/py/objstr.h
index 92b065d869b45..7d86ec30baab7 100644
--- a/py/objstr.h
+++ b/py/objstr.h
@@ -27,6 +27,7 @@
 #define MICROPY_INCLUDED_PY_OBJSTR_H
 
 #include "py/obj.h"
+#include "py/objarray.h"
 
 typedef struct _mp_obj_str_t {
     mp_obj_base_t base;
@@ -36,6 +37,13 @@ typedef struct _mp_obj_str_t {
     const byte *data;
 } mp_obj_str_t;
 
+// This static assert is used to ensure that mp_obj_str_t and mp_obj_array_t are compatible,
+// meaning that their len and data/items entries are at the same offsets in the struct.
+// This allows the same code to be used for str/bytes and bytearray.
+#define MP_STATIC_ASSERT_STR_ARRAY_COMPATIBLE \
+    MP_STATIC_ASSERT(offsetof(mp_obj_str_t, len) == offsetof(mp_obj_array_t, len) \
+    && offsetof(mp_obj_str_t, data) == offsetof(mp_obj_array_t, items))
+
 #define MP_DEFINE_STR_OBJ(obj_name, str) mp_obj_str_t obj_name = {{&mp_type_str}, 0, sizeof(str) - 1, (const byte *)str}
 
 // use this macro to extract the string hash
@@ -70,6 +78,7 @@ const byte *mp_obj_str_get_data_no_check(mp_obj_t self_in, size_t *len);
     if (mp_obj_is_qstr(str_obj_in)) { \
         str_data = qstr_data(MP_OBJ_QSTR_VALUE(str_obj_in), &str_len); \
     } else { \
+        MP_STATIC_ASSERT_STR_ARRAY_COMPATIBLE; \
         str_len = ((mp_obj_str_t *)MP_OBJ_TO_PTR(str_obj_in))->len; \
         str_data = ((mp_obj_str_t *)MP_OBJ_TO_PTR(str_obj_in))->data; \
     }
@@ -118,4 +127,14 @@ MP_DECLARE_CONST_FUN_OBJ_1(str_isupper_obj);
 MP_DECLARE_CONST_FUN_OBJ_1(str_islower_obj);
 MP_DECLARE_CONST_FUN_OBJ_VAR_BETWEEN(bytes_decode_obj);
 
+extern const mp_obj_dict_t mp_obj_str_locals_dict;
+
+#if MICROPY_PY_BUILTINS_BYTEARRAY
+extern const mp_obj_dict_t mp_obj_bytearray_locals_dict;
+#endif
+
+#if MICROPY_PY_ARRAY
+extern const mp_obj_dict_t mp_obj_array_locals_dict;
+#endif
+
 #endif // MICROPY_INCLUDED_PY_OBJSTR_H
diff --git a/py/objstrunicode.c b/py/objstrunicode.c
index ed79ad68a93c6..d36dd8b1375a2 100644
--- a/py/objstrunicode.c
+++ b/py/objstrunicode.c
@@ -116,7 +116,11 @@ const byte *str_index_to_ptr(const mp_obj_type_t *type, const byte *self_data, s
     mp_obj_t index, bool is_slice) {
     // All str functions also handle bytes objects, and they call str_index_to_ptr(),
     // so it must handle bytes.
-    if (type == &mp_type_bytes) {
+    if (type == &mp_type_bytes
+        #if MICROPY_PY_BUILTINS_BYTEARRAY
+        || type == &mp_type_bytearray
+        #endif
+        ) {
         // Taken from objstr.c:str_index_to_ptr()
         size_t index_val = mp_get_index(type, self_len, index, is_slice);
         return self_data + index_val;
@@ -225,48 +229,6 @@ STATIC mp_obj_t str_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) {
     }
 }
 
-STATIC const mp_rom_map_elem_t struni_locals_dict_table[] = {
-    #if MICROPY_CPYTHON_COMPAT
-    { MP_ROM_QSTR(MP_QSTR_encode), MP_ROM_PTR(&str_encode_obj) },
-    #endif
-    { MP_ROM_QSTR(MP_QSTR_find), MP_ROM_PTR(&str_find_obj) },
-    { MP_ROM_QSTR(MP_QSTR_rfind), MP_ROM_PTR(&str_rfind_obj) },
-    { MP_ROM_QSTR(MP_QSTR_index), MP_ROM_PTR(&str_index_obj) },
-    { MP_ROM_QSTR(MP_QSTR_rindex), MP_ROM_PTR(&str_rindex_obj) },
-    { MP_ROM_QSTR(MP_QSTR_join), MP_ROM_PTR(&str_join_obj) },
-    { MP_ROM_QSTR(MP_QSTR_split), MP_ROM_PTR(&str_split_obj) },
-    #if MICROPY_PY_BUILTINS_STR_SPLITLINES
-    { MP_ROM_QSTR(MP_QSTR_splitlines), MP_ROM_PTR(&str_splitlines_obj) },
-    #endif
-    { MP_ROM_QSTR(MP_QSTR_rsplit), MP_ROM_PTR(&str_rsplit_obj) },
-    { MP_ROM_QSTR(MP_QSTR_startswith), MP_ROM_PTR(&str_startswith_obj) },
-    { MP_ROM_QSTR(MP_QSTR_endswith), MP_ROM_PTR(&str_endswith_obj) },
-    { MP_ROM_QSTR(MP_QSTR_strip), MP_ROM_PTR(&str_strip_obj) },
-    { MP_ROM_QSTR(MP_QSTR_lstrip), MP_ROM_PTR(&str_lstrip_obj) },
-    { MP_ROM_QSTR(MP_QSTR_rstrip), MP_ROM_PTR(&str_rstrip_obj) },
-    { MP_ROM_QSTR(MP_QSTR_format), MP_ROM_PTR(&str_format_obj) },
-    { MP_ROM_QSTR(MP_QSTR_replace), MP_ROM_PTR(&str_replace_obj) },
-    #if MICROPY_PY_BUILTINS_STR_COUNT
-    { MP_ROM_QSTR(MP_QSTR_count), MP_ROM_PTR(&str_count_obj) },
-    #endif
-    #if MICROPY_PY_BUILTINS_STR_PARTITION
-    { MP_ROM_QSTR(MP_QSTR_partition), MP_ROM_PTR(&str_partition_obj) },
-    { MP_ROM_QSTR(MP_QSTR_rpartition), MP_ROM_PTR(&str_rpartition_obj) },
-    #endif
-    #if MICROPY_PY_BUILTINS_STR_CENTER
-    { MP_ROM_QSTR(MP_QSTR_center), MP_ROM_PTR(&str_center_obj) },
-    #endif
-    { MP_ROM_QSTR(MP_QSTR_lower), MP_ROM_PTR(&str_lower_obj) },
-    { MP_ROM_QSTR(MP_QSTR_upper), MP_ROM_PTR(&str_upper_obj) },
-    { MP_ROM_QSTR(MP_QSTR_isspace), MP_ROM_PTR(&str_isspace_obj) },
-    { MP_ROM_QSTR(MP_QSTR_isalpha), MP_ROM_PTR(&str_isalpha_obj) },
-    { MP_ROM_QSTR(MP_QSTR_isdigit), MP_ROM_PTR(&str_isdigit_obj) },
-    { MP_ROM_QSTR(MP_QSTR_isupper), MP_ROM_PTR(&str_isupper_obj) },
-    { MP_ROM_QSTR(MP_QSTR_islower), MP_ROM_PTR(&str_islower_obj) },
-};
-
-STATIC MP_DEFINE_CONST_DICT(struni_locals_dict, struni_locals_dict_table);
-
 const mp_obj_type_t mp_type_str = {
     { &mp_type_type },
     .name = MP_QSTR_str,
@@ -277,7 +239,7 @@ const mp_obj_type_t mp_type_str = {
     .subscr = str_subscr,
     .getiter = mp_obj_new_str_iterator,
     .buffer_p = { .get_buffer = mp_obj_str_get_buffer },
-    .locals_dict = (mp_obj_dict_t *)&struni_locals_dict,
+    .locals_dict = (mp_obj_dict_t *)&mp_obj_str_locals_dict,
 };
 
 /******************************************************************************/
diff --git a/tests/basics/bytearray_byte_operations.py b/tests/basics/bytearray_byte_operations.py
new file mode 100644
index 0000000000000..7ce53cac535a1
--- /dev/null
+++ b/tests/basics/bytearray_byte_operations.py
@@ -0,0 +1,35 @@
+# test bytearray with its re-use of byte functions
+
+print(bytearray(b"hello world").find(b"ll"))
+print(bytearray(b"hello\x00world").rfind(b"l"))
+
+print(bytearray(b"abc  efg ").strip(b"g a"))
+print(bytearray(b"   spacious   ").lstrip())
+print(bytearray(b"www.example.com").lstrip(b"cmowz."))
+print(bytearray(b"   spacious   ").rstrip())
+print(bytearray(b"mississippi").rstrip(b"ipz"))
+
+print(bytearray(b"abc").split(b"a"))
+print(bytearray(b"abcabc").rsplit(b"bc"))
+
+print(bytearray(b"asdfasdf").replace(b"a", b"b"))
+
+print("00\x0000".index("0", 0))
+print("00\x0000".index("0", 3))
+print("00\x0000".rindex("0", 0))
+print("00\x0000".rindex("0", 3))
+
+print(bytearray(b"foobar").endswith(b"bar"))
+print(bytearray(b"1foo").startswith(b"foo", 1))
+
+print(bytearray(b" T E \x00 S T").lower())
+print(bytearray(b" te \x00 st").upper())
+
+print(bytearray(b" \t\n\r\v\f").isspace())
+print(bytearray(b"this ").isalpha())
+print(bytearray(b"0123456789").isdigit())
+print(bytearray(b"AB").isupper())
+print(bytearray(b"cheese-cake").islower())
+
+print(bytearray(b",").join((bytearray(b"abc"), bytearray(b"def"))))
+print(type(bytearray(b",").join((b"a", b"b", b"c"))))
diff --git a/tests/basics/bytearray_center.py b/tests/basics/bytearray_center.py
new file mode 100644
index 0000000000000..c262a8c2097b3
--- /dev/null
+++ b/tests/basics/bytearray_center.py
@@ -0,0 +1,8 @@
+try:
+    bytearray.center
+except AttributeError:
+    print("SKIP")
+    raise SystemExit
+
+print(bytearray(b"foo").center(6))
+print(type(bytearray(b"foo").center(6)))
diff --git a/tests/basics/bytearray_count.py b/tests/basics/bytearray_count.py
new file mode 100644
index 0000000000000..a151c1e8183cd
--- /dev/null
+++ b/tests/basics/bytearray_count.py
@@ -0,0 +1,7 @@
+try:
+    bytearray.count
+except AttributeError:
+    print("SKIP")
+    raise SystemExit
+
+print(bytearray(b"aaaa").count(b"a"))
diff --git a/tests/basics/bytearray_partition.py b/tests/basics/bytearray_partition.py
new file mode 100644
index 0000000000000..b48ec4ed9b9f9
--- /dev/null
+++ b/tests/basics/bytearray_partition.py
@@ -0,0 +1,8 @@
+try:
+    bytearray.partition
+except AttributeError:
+    print("SKIP")
+    raise SystemExit
+
+print(bytearray(b"asdsf").partition(b"s"))
+print(bytearray(b"asdsf").rpartition(b"s"))
diff --git a/tests/basics/bytes_center.py b/tests/basics/bytes_center.py
new file mode 100644
index 0000000000000..5d8b41d92ff2c
--- /dev/null
+++ b/tests/basics/bytes_center.py
@@ -0,0 +1,13 @@
+try:
+    bytes.center
+except:
+    print("SKIP")
+    raise SystemExit
+
+print(b"foo".center(0))
+print(b"foo".center(1))
+print(b"foo".center(3))
+print(b"foo".center(4))
+print(b"foo".center(5))
+print(b"foo".center(6))
+print(b"foo".center(20))

From 787bd9991903dc736b5eb79826dd34e4c17f72ec Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 11 Aug 2022 21:43:09 +1000
Subject: [PATCH 2472/3533] nrf/modules/ubluepy: Use mp_obj_str_get_data to
 extract str data.

Instead of GET_STR_DATA_LEN, which is intended to be a private macro.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/nrf/modules/ubluepy/ubluepy_peripheral.c | 8 ++++----
 ports/nrf/modules/ubluepy/ubluepy_uuid.c       | 3 ++-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/ports/nrf/modules/ubluepy/ubluepy_peripheral.c b/ports/nrf/modules/ubluepy/ubluepy_peripheral.c
index 05a72b1de63d9..acfe316c0cf74 100644
--- a/ports/nrf/modules/ubluepy/ubluepy_peripheral.c
+++ b/ports/nrf/modules/ubluepy/ubluepy_peripheral.c
@@ -193,9 +193,8 @@ STATIC mp_obj_t peripheral_advertise(mp_uint_t n_args, const mp_obj_t *pos_args,
     memset(&adv_data, 0, sizeof(ubluepy_advertise_data_t));
 
     if (device_name_obj != mp_const_none && mp_obj_is_str(device_name_obj)) {
-        GET_STR_DATA_LEN(device_name_obj, str_data, str_len);
-
-        adv_data.p_device_name = (uint8_t *)str_data;
+        size_t str_len;
+        adv_data.p_device_name = (uint8_t *)mp_obj_str_get_data(device_name_obj, &str_len);
         adv_data.device_name_len = str_len;
     }
 
@@ -357,7 +356,8 @@ STATIC mp_obj_t peripheral_connect(mp_uint_t n_args, const mp_obj_t *pos_args, m
     ble_drv_gap_event_handler_set(MP_OBJ_FROM_PTR(self), gap_event_handler);
 
     if (mp_obj_is_str(dev_addr)) {
-        GET_STR_DATA_LEN(dev_addr, str_data, str_len);
+        size_t str_len;
+        const byte *str_data = (const byte *)mp_obj_str_get_data(dev_addr, &str_len);
         if (str_len == 17) { // Example "11:22:33:aa:bb:cc"
 
             uint8_t * p_addr = m_new(uint8_t, 6);
diff --git a/ports/nrf/modules/ubluepy/ubluepy_uuid.c b/ports/nrf/modules/ubluepy/ubluepy_uuid.c
index 594d0d9130c3e..aee7b9a1a899c 100644
--- a/ports/nrf/modules/ubluepy/ubluepy_uuid.c
+++ b/ports/nrf/modules/ubluepy/ubluepy_uuid.c
@@ -70,7 +70,8 @@ STATIC mp_obj_t ubluepy_uuid_make_new(const mp_obj_type_t *type, size_t n_args,
         s->value[1] = (((uint16_t)mp_obj_get_int(uuid_obj)) >> 8) & 0xFF;
         s->value[0] = ((uint8_t)mp_obj_get_int(uuid_obj)) & 0xFF;
     } else if (mp_obj_is_str(uuid_obj)) {
-        GET_STR_DATA_LEN(uuid_obj, str_data, str_len);
+        size_t str_len;
+        const byte *str_data = (const byte *)mp_obj_str_get_data(uuid_obj, &str_len);
         if (str_len == 6) { // Assume hex digit prefixed with 0x
             s->type = UBLUEPY_UUID_16_BIT;
             s->value[0]  = unichar_xdigit_value(str_data[5]);

From 6c67fbc280625c59fff7cdf93f16d5e2ad0bad8a Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 11 Aug 2022 21:44:53 +1000
Subject: [PATCH 2473/3533] zephyr/machine_uart: Use mp_obj_str_get_str to get
 device name.

This checks that the argument is actually a string.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/zephyr/machine_uart.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/ports/zephyr/machine_uart.c b/ports/zephyr/machine_uart.c
index 47ca0945a5e6f..3520795c5aad4 100644
--- a/ports/zephyr/machine_uart.c
+++ b/ports/zephyr/machine_uart.c
@@ -75,10 +75,9 @@ STATIC void machine_uart_init_helper(machine_uart_obj_t *self, size_t n_args, co
 
 STATIC mp_obj_t machine_uart_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
     mp_arg_check_num(n_args, n_kw, 1, MP_OBJ_FUN_ARGS_MAX, true);
-    GET_STR_DATA_LEN(args[0], name, name_len);
 
     machine_uart_obj_t *self = mp_obj_malloc(machine_uart_obj_t, &machine_uart_type);
-    self->dev = device_get_binding(name);
+    self->dev = device_get_binding(mp_obj_str_get_str(args[0]));
     if (!self->dev) {
         mp_raise_ValueError(MP_ERROR_TEXT("Bad device name"));
     }

From 28aaab95909aab092cc8c16188fec157142f18a9 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Tue, 13 Jul 2021 18:01:12 +1000
Subject: [PATCH 2474/3533] py/objstr: Add hex/fromhex to
 bytes/memoryview/bytearray.

These were added in Python 3.5.

Enabled via MICROPY_PY_BUILTINS_BYTES_HEX, and enabled by default for all
ports that currently have ubinascii.

Rework ubinascii to use the implementation of these methods.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 extmod/modubinascii.c           | 81 +++++----------------------
 ports/cc3200/mpconfigport.h     |  1 +
 ports/javascript/mpconfigport.h |  1 +
 ports/mimxrt/mpconfigport.h     |  1 +
 ports/qemu-arm/mpconfigport.h   |  1 +
 ports/samd/mpconfigport.h       |  1 +
 ports/unix/mpconfigport.h       |  1 +
 ports/windows/mpconfigport.h    |  1 +
 ports/zephyr/mpconfigport.h     |  1 +
 py/mpconfig.h                   |  5 ++
 py/objarray.c                   |  9 +++
 py/objstr.c                     | 98 ++++++++++++++++++++++++++++++++-
 py/objstr.h                     |  7 +++
 13 files changed, 138 insertions(+), 70 deletions(-)

diff --git a/extmod/modubinascii.c b/extmod/modubinascii.c
index c0e2c587fdd9d..49c8d1fb971e5 100644
--- a/extmod/modubinascii.c
+++ b/extmod/modubinascii.c
@@ -30,78 +30,21 @@
 
 #include "py/runtime.h"
 #include "py/binary.h"
+#include "py/objstr.h"
 
 #if MICROPY_PY_UBINASCII
 
-STATIC mp_obj_t mod_binascii_hexlify(size_t n_args, const mp_obj_t *args) {
-    // First argument is the data to convert.
-    // Second argument is an optional separator to be used between values.
-    const char *sep = NULL;
-    mp_buffer_info_t bufinfo;
-    mp_get_buffer_raise(args[0], &bufinfo, MP_BUFFER_READ);
-
-    // Code below assumes non-zero buffer length when computing size with
-    // separator, so handle the zero-length case here.
-    if (bufinfo.len == 0) {
-        return mp_const_empty_bytes;
-    }
-
-    vstr_t vstr;
-    size_t out_len = bufinfo.len * 2;
-    if (n_args > 1) {
-        // 1-char separator between hex numbers
-        out_len += bufinfo.len - 1;
-        sep = mp_obj_str_get_str(args[1]);
-    }
-    vstr_init_len(&vstr, out_len);
-    byte *in = bufinfo.buf, *out = (byte *)vstr.buf;
-    for (mp_uint_t i = bufinfo.len; i--;) {
-        byte d = (*in >> 4);
-        if (d > 9) {
-            d += 'a' - '9' - 1;
-        }
-        *out++ = d + '0';
-        d = (*in++ & 0xf);
-        if (d > 9) {
-            d += 'a' - '9' - 1;
-        }
-        *out++ = d + '0';
-        if (sep != NULL && i != 0) {
-            *out++ = *sep;
-        }
-    }
-    return mp_obj_new_str_from_vstr(&mp_type_bytes, &vstr);
+#if MICROPY_PY_BUILTINS_BYTES_HEX
+STATIC mp_obj_t bytes_hex_as_bytes(size_t n_args, const mp_obj_t *args) {
+    return mp_obj_bytes_hex(n_args, args, &mp_type_bytes);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_binascii_hexlify_obj, 1, 2, mod_binascii_hexlify);
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(bytes_hex_as_bytes_obj, 1, 2, bytes_hex_as_bytes);
 
-STATIC mp_obj_t mod_binascii_unhexlify(mp_obj_t data) {
-    mp_buffer_info_t bufinfo;
-    mp_get_buffer_raise(data, &bufinfo, MP_BUFFER_READ);
-
-    if ((bufinfo.len & 1) != 0) {
-        mp_raise_ValueError(MP_ERROR_TEXT("odd-length string"));
-    }
-    vstr_t vstr;
-    vstr_init_len(&vstr, bufinfo.len / 2);
-    byte *in = bufinfo.buf, *out = (byte *)vstr.buf;
-    byte hex_byte = 0;
-    for (mp_uint_t i = bufinfo.len; i--;) {
-        byte hex_ch = *in++;
-        if (unichar_isxdigit(hex_ch)) {
-            hex_byte += unichar_xdigit_value(hex_ch);
-        } else {
-            mp_raise_ValueError(MP_ERROR_TEXT("non-hex digit found"));
-        }
-        if (i & 1) {
-            hex_byte <<= 4;
-        } else {
-            *out++ = hex_byte;
-            hex_byte = 0;
-        }
-    }
-    return mp_obj_new_str_from_vstr(&mp_type_bytes, &vstr);
+STATIC mp_obj_t bytes_fromhex_bytes(mp_obj_t data) {
+    return mp_obj_bytes_fromhex(MP_OBJ_FROM_PTR(&mp_type_bytes), data);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_binascii_unhexlify_obj, mod_binascii_unhexlify);
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(bytes_fromhex_obj, bytes_fromhex_bytes);
+#endif
 
 // If ch is a character in the base64 alphabet, and is not a pad character, then
 // the corresponding integer between 0 and 63, inclusively, is returned.
@@ -242,8 +185,10 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_binascii_crc32_obj, 1, 2, mod_bin
 
 STATIC const mp_rom_map_elem_t mp_module_binascii_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_ubinascii) },
-    { MP_ROM_QSTR(MP_QSTR_hexlify), MP_ROM_PTR(&mod_binascii_hexlify_obj) },
-    { MP_ROM_QSTR(MP_QSTR_unhexlify), MP_ROM_PTR(&mod_binascii_unhexlify_obj) },
+    #if MICROPY_PY_BUILTINS_BYTES_HEX
+    { MP_ROM_QSTR(MP_QSTR_hexlify), MP_ROM_PTR(&bytes_hex_as_bytes_obj) },
+    { MP_ROM_QSTR(MP_QSTR_unhexlify), MP_ROM_PTR(&bytes_fromhex_obj) },
+    #endif
     { MP_ROM_QSTR(MP_QSTR_a2b_base64), MP_ROM_PTR(&mod_binascii_a2b_base64_obj) },
     { MP_ROM_QSTR(MP_QSTR_b2a_base64), MP_ROM_PTR(&mod_binascii_b2a_base64_obj) },
     #if MICROPY_PY_UBINASCII_CRC32
diff --git a/ports/cc3200/mpconfigport.h b/ports/cc3200/mpconfigport.h
index e81a2fc29bb3a..f41c1fe99dbfb 100644
--- a/ports/cc3200/mpconfigport.h
+++ b/ports/cc3200/mpconfigport.h
@@ -78,6 +78,7 @@
 #define MICROPY_VFS_FAT                             (1)
 #define MICROPY_PY_ASYNC_AWAIT (0)
 #define MICROPY_PY_ALL_SPECIAL_METHODS              (1)
+#define MICROPY_PY_BUILTINS_BYTES_HEX               (1)
 #define MICROPY_PY_BUILTINS_INPUT                   (1)
 #define MICROPY_PY_BUILTINS_HELP                    (1)
 #define MICROPY_PY_BUILTINS_HELP_TEXT               cc3200_help_text
diff --git a/ports/javascript/mpconfigport.h b/ports/javascript/mpconfigport.h
index 01a61e391d00b..6c86d816bd4fe 100644
--- a/ports/javascript/mpconfigport.h
+++ b/ports/javascript/mpconfigport.h
@@ -89,6 +89,7 @@
 #define MICROPY_PY_UTIME_MP_HAL     (1)
 #define MICROPY_REPL_AUTO_INDENT    (1)
 #define MICROPY_PY_FUNCTION_ATTRS   (1)
+#define MICROPY_PY_BUILTINS_BYTES_HEX (1)
 #define MICROPY_PY_BUILTINS_STR_UNICODE (1)
 #define MICROPY_PY_BUILTINS_STR_CENTER (1)
 #define MICROPY_PY_BUILTINS_STR_PARTITION (1)
diff --git a/ports/mimxrt/mpconfigport.h b/ports/mimxrt/mpconfigport.h
index 00714ca8d0565..54d649795df0c 100644
--- a/ports/mimxrt/mpconfigport.h
+++ b/ports/mimxrt/mpconfigport.h
@@ -74,6 +74,7 @@ uint32_t trng_random_u32(void);
 #define MICROPY_PY_DESCRIPTORS              (1)
 #define MICROPY_PY_DELATTR_SETATTR          (1)
 #define MICROPY_PY_FSTRINGS                 (1)
+#define MICROPY_PY_BUILTINS_BYTES_HEX       (1)
 #define MICROPY_PY_BUILTINS_STR_UNICODE     (1)
 #define MICROPY_PY_BUILTINS_STR_CENTER      (1)
 #define MICROPY_PY_BUILTINS_STR_PARTITION   (1)
diff --git a/ports/qemu-arm/mpconfigport.h b/ports/qemu-arm/mpconfigport.h
index 8809d17154fd0..972dce61b4987 100644
--- a/ports/qemu-arm/mpconfigport.h
+++ b/ports/qemu-arm/mpconfigport.h
@@ -28,6 +28,7 @@
 #define MICROPY_PY_ALL_SPECIAL_METHODS (1)
 #define MICROPY_PY_REVERSE_SPECIAL_METHODS (1)
 #define MICROPY_PY_ARRAY_SLICE_ASSIGN (1)
+#define MICROPY_PY_BUILTINS_BYTES_HEX (1)
 #define MICROPY_PY_BUILTINS_FROZENSET (1)
 #define MICROPY_PY_BUILTINS_MEMORYVIEW (1)
 #define MICROPY_PY_BUILTINS_POW3    (1)
diff --git a/ports/samd/mpconfigport.h b/ports/samd/mpconfigport.h
index 24b9cbfe19438..c02d9316ded30 100644
--- a/ports/samd/mpconfigport.h
+++ b/ports/samd/mpconfigport.h
@@ -56,6 +56,7 @@
 #define MICROPY_MODULE_WEAK_LINKS           (1)
 // Control over Python builtins
 #define MICROPY_PY_ASYNC_AWAIT              (0)
+#define MICROPY_PY_BUILTINS_BYTES_HEX       (1)
 #define MICROPY_PY_BUILTINS_STR_COUNT       (0)
 #define MICROPY_PY_BUILTINS_MEMORYVIEW      (1)
 #define MICROPY_PY_BUILTINS_SET             (0)
diff --git a/ports/unix/mpconfigport.h b/ports/unix/mpconfigport.h
index ed4c71097ff16..5545a74f57cc5 100644
--- a/ports/unix/mpconfigport.h
+++ b/ports/unix/mpconfigport.h
@@ -61,6 +61,7 @@
 #define MICROPY_PY_DESCRIPTORS                  (1)
 #define MICROPY_PY_DELATTR_SETATTR              (1)
 #define MICROPY_PY_FSTRINGS                     (1)
+#define MICROPY_PY_BUILTINS_BYTES_HEX           (1)
 #define MICROPY_PY_BUILTINS_STR_UNICODE         (1)
 #define MICROPY_PY_BUILTINS_STR_CENTER          (1)
 #define MICROPY_PY_BUILTINS_STR_PARTITION       (1)
diff --git a/ports/windows/mpconfigport.h b/ports/windows/mpconfigport.h
index 5f8ad983adc4a..4ed9f316e7bbf 100644
--- a/ports/windows/mpconfigport.h
+++ b/ports/windows/mpconfigport.h
@@ -84,6 +84,7 @@
 #define MICROPY_PY_DESCRIPTORS      (1)
 #define MICROPY_PY_DELATTR_SETATTR  (1)
 #define MICROPY_PY_FSTRINGS         (1)
+#define MICROPY_PY_BUILTINS_BYTES_HEX (1)
 #define MICROPY_PY_BUILTINS_STR_UNICODE (1)
 #define MICROPY_PY_BUILTINS_STR_CENTER (1)
 #define MICROPY_PY_BUILTINS_STR_PARTITION (1)
diff --git a/ports/zephyr/mpconfigport.h b/ports/zephyr/mpconfigport.h
index 586b0ec916972..4c8096b44107a 100644
--- a/ports/zephyr/mpconfigport.h
+++ b/ports/zephyr/mpconfigport.h
@@ -45,6 +45,7 @@
 #define MICROPY_CPYTHON_COMPAT      (0)
 #define MICROPY_PY_ASYNC_AWAIT      (0)
 #define MICROPY_PY_ATTRTUPLE        (0)
+#define MICROPY_PY_BUILTINS_BYTES_HEX (1)
 #define MICROPY_PY_BUILTINS_ENUMERATE (0)
 #define MICROPY_PY_BUILTINS_FILTER  (0)
 #define MICROPY_PY_BUILTINS_MIN_MAX (0)
diff --git a/py/mpconfig.h b/py/mpconfig.h
index 25f37ff8b3a2c..1ed34bb6fdae0 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -987,6 +987,11 @@ typedef double mp_float_t;
 #define MICROPY_PY_STR_BYTES_CMP_WARN (0)
 #endif
 
+// Add bytes.hex and bytes.fromhex
+#ifndef MICROPY_PY_BUILTINS_BYTES_HEX
+#define MICROPY_PY_BUILTINS_BYTES_HEX (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
+#endif
+
 // Whether str object is proper unicode
 #ifndef MICROPY_PY_BUILTINS_STR_UNICODE
 #define MICROPY_PY_BUILTINS_STR_UNICODE (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
diff --git a/py/objarray.c b/py/objarray.c
index 11bd7bb15c41c..ecaffeb6a22e7 100644
--- a/py/objarray.c
+++ b/py/objarray.c
@@ -245,6 +245,12 @@ STATIC void memoryview_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
         mp_obj_array_t *self = MP_OBJ_TO_PTR(self_in);
         dest[0] = MP_OBJ_NEW_SMALL_INT(mp_binary_get_size('@', self->typecode & TYPECODE_MASK, NULL));
     }
+    #if MICROPY_PY_BUILTINS_BYTES_HEX
+    else {
+        // Need to forward to locals dict.
+        dest[1] = MP_OBJ_SENTINEL;
+    }
+    #endif
 }
 #endif
 
@@ -607,6 +613,9 @@ const mp_obj_type_t mp_type_memoryview = {
     #if MICROPY_PY_BUILTINS_MEMORYVIEW_ITEMSIZE
     .attr = memoryview_attr,
     #endif
+    #if MICROPY_PY_BUILTINS_BYTES_HEX
+    .locals_dict = (mp_obj_dict_t *)&mp_obj_memoryview_locals_dict,
+    #endif
     .subscr = array_subscr,
     .buffer_p = { .get_buffer = array_get_buffer },
 };
diff --git a/py/objstr.c b/py/objstr.c
index 162229c62b2b3..45dbb9b3ebde3 100644
--- a/py/objstr.c
+++ b/py/objstr.c
@@ -1950,6 +1950,84 @@ STATIC mp_obj_t str_encode(size_t n_args, const mp_obj_t *args) {
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_encode_obj, 1, 3, str_encode);
 #endif
 
+#if MICROPY_PY_BUILTINS_BYTES_HEX
+mp_obj_t mp_obj_bytes_hex(size_t n_args, const mp_obj_t *args, const mp_obj_type_t *type) {
+    // First argument is the data to convert.
+    // Second argument is an optional separator to be used between values.
+    const char *sep = NULL;
+    mp_buffer_info_t bufinfo;
+    mp_get_buffer_raise(args[0], &bufinfo, MP_BUFFER_READ);
+
+    // Code below assumes non-zero buffer length when computing size with
+    // separator, so handle the zero-length case here.
+    if (bufinfo.len == 0) {
+        return mp_const_empty_bytes;
+    }
+
+    vstr_t vstr;
+    size_t out_len = bufinfo.len * 2;
+    if (n_args > 1) {
+        // 1-char separator between hex numbers
+        out_len += bufinfo.len - 1;
+        sep = mp_obj_str_get_str(args[1]);
+    }
+    vstr_init_len(&vstr, out_len);
+    byte *in = bufinfo.buf, *out = (byte *)vstr.buf;
+    for (mp_uint_t i = bufinfo.len; i--;) {
+        byte d = (*in >> 4);
+        if (d > 9) {
+            d += 'a' - '9' - 1;
+        }
+        *out++ = d + '0';
+        d = (*in++ & 0xf);
+        if (d > 9) {
+            d += 'a' - '9' - 1;
+        }
+        *out++ = d + '0';
+        if (sep != NULL && i != 0) {
+            *out++ = *sep;
+        }
+    }
+    return mp_obj_new_str_from_vstr(type, &vstr);
+}
+
+mp_obj_t mp_obj_bytes_fromhex(mp_obj_t type_in, mp_obj_t data) {
+    mp_buffer_info_t bufinfo;
+    mp_get_buffer_raise(data, &bufinfo, MP_BUFFER_READ);
+
+    if ((bufinfo.len & 1) != 0) {
+        mp_raise_ValueError(MP_ERROR_TEXT("odd-length string"));
+    }
+    vstr_t vstr;
+    vstr_init_len(&vstr, bufinfo.len / 2);
+    byte *in = bufinfo.buf, *out = (byte *)vstr.buf;
+    byte hex_byte = 0;
+    for (mp_uint_t i = bufinfo.len; i--;) {
+        byte hex_ch = *in++;
+        if (unichar_isxdigit(hex_ch)) {
+            hex_byte += unichar_xdigit_value(hex_ch);
+        } else {
+            mp_raise_ValueError(MP_ERROR_TEXT("non-hex digit found"));
+        }
+        if (i & 1) {
+            hex_byte <<= 4;
+        } else {
+            *out++ = hex_byte;
+            hex_byte = 0;
+        }
+    }
+    return mp_obj_new_str_from_vstr(MP_OBJ_TO_PTR(type_in), &vstr);
+}
+
+STATIC mp_obj_t bytes_hex_as_str(size_t n_args, const mp_obj_t *args) {
+    return mp_obj_bytes_hex(n_args, args, &mp_type_str);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(bytes_hex_as_str_obj, 1, 2, bytes_hex_as_str);
+
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(bytes_fromhex_obj, mp_obj_bytes_fromhex);
+STATIC MP_DEFINE_CONST_CLASSMETHOD_OBJ(bytes_fromhex_classmethod_obj, MP_ROM_PTR(&bytes_fromhex_obj));
+#endif // MICROPY_PY_BUILTINS_BYTES_HEX
+
 mp_int_t mp_obj_str_get_buffer(mp_obj_t self_in, mp_buffer_info_t *bufinfo, mp_uint_t flags) {
     if (flags == MP_BUFFER_READ) {
         GET_STR_DATA_LEN(self_in, str_data, str_len);
@@ -1970,6 +2048,10 @@ STATIC const mp_rom_map_elem_t array_bytearray_str_bytes_locals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_append), MP_ROM_PTR(&mp_obj_array_append_obj) },
     { MP_ROM_QSTR(MP_QSTR_extend), MP_ROM_PTR(&mp_obj_array_extend_obj) },
     #endif
+    #if MICROPY_PY_BUILTINS_BYTES_HEX
+    { MP_ROM_QSTR(MP_QSTR_hex), MP_ROM_PTR(&bytes_hex_as_str_obj) },
+    { MP_ROM_QSTR(MP_QSTR_fromhex), MP_ROM_PTR(&bytes_fromhex_classmethod_obj) },
+    #endif
     #if MICROPY_CPYTHON_COMPAT
     { MP_ROM_QSTR(MP_QSTR_decode), MP_ROM_PTR(&bytes_decode_obj) },
     #endif
@@ -2018,6 +2100,12 @@ STATIC const mp_rom_map_elem_t array_bytearray_str_bytes_locals_table[] = {
 #define TABLE_ENTRIES_COMPAT 0
 #endif
 
+#if MICROPY_PY_BUILTINS_BYTES_HEX
+#define TABLE_ENTRIES_HEX 2
+#else
+#define TABLE_ENTRIES_HEX 0
+#endif
+
 #if MICROPY_PY_ARRAY || MICROPY_PY_BUILTINS_BYTEARRAY
 #define TABLE_ENTRIES_ARRAY 2
 #else
@@ -2025,8 +2113,8 @@ STATIC const mp_rom_map_elem_t array_bytearray_str_bytes_locals_table[] = {
 #endif
 
 MP_DEFINE_CONST_DICT_WITH_SIZE(mp_obj_str_locals_dict,
-    array_bytearray_str_bytes_locals_table + TABLE_ENTRIES_ARRAY + TABLE_ENTRIES_COMPAT,
-    MP_ARRAY_SIZE(array_bytearray_str_bytes_locals_table) - (TABLE_ENTRIES_ARRAY + TABLE_ENTRIES_COMPAT));
+    array_bytearray_str_bytes_locals_table + TABLE_ENTRIES_ARRAY + TABLE_ENTRIES_HEX + TABLE_ENTRIES_COMPAT,
+    MP_ARRAY_SIZE(array_bytearray_str_bytes_locals_table) - (TABLE_ENTRIES_ARRAY + TABLE_ENTRIES_HEX + TABLE_ENTRIES_COMPAT));
 
 #if TABLE_ENTRIES_COMPAT == 0
 #define mp_obj_bytes_locals_dict mp_obj_str_locals_dict
@@ -2048,6 +2136,12 @@ MP_DEFINE_CONST_DICT_WITH_SIZE(mp_obj_array_locals_dict,
     TABLE_ENTRIES_ARRAY);
 #endif
 
+#if MICROPY_PY_BUILTINS_MEMORYVIEW && MICROPY_PY_BUILTINS_BYTES_HEX
+MP_DEFINE_CONST_DICT_WITH_SIZE(mp_obj_memoryview_locals_dict,
+    array_bytearray_str_bytes_locals_table + TABLE_ENTRIES_ARRAY,
+    1); // Just the "hex" entry.
+#endif
+
 #if !MICROPY_PY_BUILTINS_STR_UNICODE
 STATIC mp_obj_t mp_obj_new_str_iterator(mp_obj_t str, mp_obj_iter_buf_t *iter_buf);
 
diff --git a/py/objstr.h b/py/objstr.h
index 7d86ec30baab7..b1217d5872b12 100644
--- a/py/objstr.h
+++ b/py/objstr.h
@@ -127,8 +127,15 @@ MP_DECLARE_CONST_FUN_OBJ_1(str_isupper_obj);
 MP_DECLARE_CONST_FUN_OBJ_1(str_islower_obj);
 MP_DECLARE_CONST_FUN_OBJ_VAR_BETWEEN(bytes_decode_obj);
 
+mp_obj_t mp_obj_bytes_hex(size_t n_args, const mp_obj_t *args, const mp_obj_type_t *type);
+mp_obj_t mp_obj_bytes_fromhex(mp_obj_t type_in, mp_obj_t data);
+
 extern const mp_obj_dict_t mp_obj_str_locals_dict;
 
+#if MICROPY_PY_BUILTINS_MEMORYVIEW && MICROPY_PY_BUILTINS_BYTES_HEX
+extern const mp_obj_dict_t mp_obj_memoryview_locals_dict;
+#endif
+
 #if MICROPY_PY_BUILTINS_BYTEARRAY
 extern const mp_obj_dict_t mp_obj_bytearray_locals_dict;
 #endif

From f694058f2bce7d6e5ef82c8efd2bcb6cdebfe7a8 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Tue, 13 Jul 2021 22:49:49 +1000
Subject: [PATCH 2475/3533] tests/extmod/ubinascii: Add tests for bytes.hex
 etc.

Also make the sep test not micropython-specific.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 tests/basics/builtin_str_hex.py           | 24 +++++++++++++++++++++++
 tests/extmod/ubinascii_hexlify.py         | 17 ++++++++++++----
 tests/extmod/ubinascii_micropython.py     | 15 --------------
 tests/extmod/ubinascii_micropython.py.exp |  2 --
 tests/extmod/ubinascii_unhexlify.py       | 11 +++++++----
 5 files changed, 44 insertions(+), 25 deletions(-)
 create mode 100644 tests/basics/builtin_str_hex.py
 delete mode 100644 tests/extmod/ubinascii_micropython.py
 delete mode 100644 tests/extmod/ubinascii_micropython.py.exp

diff --git a/tests/basics/builtin_str_hex.py b/tests/basics/builtin_str_hex.py
new file mode 100644
index 0000000000000..7390c8eaee17c
--- /dev/null
+++ b/tests/basics/builtin_str_hex.py
@@ -0,0 +1,24 @@
+if not hasattr(bytes, "fromhex"):
+    print("SKIP")
+    raise SystemExit
+
+for x in (
+    b"\x00\x01\x02\x03\x04\x05\x06\x07",
+    b"\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f",
+    b"\x7f\x80\xff",
+    b"1234ABCDabcd",
+):
+    print(x.hex())
+    print(bytearray(x).hex())
+    print(memoryview(x).hex())
+    print(x.hex(":"))
+    print(bytearray(x).hex(":"))
+    print(memoryview(x).hex(":"))
+
+for x in (
+    "0001020304050607",
+    "08090a0b0c0d0e0f",
+    "7f80ff",
+    "313233344142434461626364",
+):
+    print(bytes.fromhex(x))
diff --git a/tests/extmod/ubinascii_hexlify.py b/tests/extmod/ubinascii_hexlify.py
index 2329f53edd947..3c266fb6cc08c 100644
--- a/tests/extmod/ubinascii_hexlify.py
+++ b/tests/extmod/ubinascii_hexlify.py
@@ -7,7 +7,16 @@
     print("SKIP")
     raise SystemExit
 
-print(binascii.hexlify(b"\x00\x01\x02\x03\x04\x05\x06\x07"))
-print(binascii.hexlify(b"\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f"))
-print(binascii.hexlify(b"\x7f\x80\xff"))
-print(binascii.hexlify(b"1234ABCDabcd"))
+for x in (
+    b"\x00\x01\x02\x03\x04\x05\x06\x07",
+    b"\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f",
+    b"\x7f\x80\xff",
+    b"1234ABCDabcd",
+):
+    print(binascii.hexlify(x))
+
+# Two-argument version (now supported in CPython)
+print(binascii.hexlify(b"123", ":"))
+
+# zero length buffer
+print(binascii.hexlify(b"", b":"))
diff --git a/tests/extmod/ubinascii_micropython.py b/tests/extmod/ubinascii_micropython.py
deleted file mode 100644
index 94e8daa557b77..0000000000000
--- a/tests/extmod/ubinascii_micropython.py
+++ /dev/null
@@ -1,15 +0,0 @@
-try:
-    try:
-        import ubinascii as binascii
-    except ImportError:
-        import binascii
-except ImportError:
-    print("SKIP")
-    raise SystemExit
-
-# two arguments supported in uPy but not CPython
-a = binascii.hexlify(b"123", ":")
-print(a)
-
-# zero length buffer
-print(binascii.hexlify(b"", b":"))
diff --git a/tests/extmod/ubinascii_micropython.py.exp b/tests/extmod/ubinascii_micropython.py.exp
deleted file mode 100644
index a195d2602c19e..0000000000000
--- a/tests/extmod/ubinascii_micropython.py.exp
+++ /dev/null
@@ -1,2 +0,0 @@
-b'31:32:33'
-b''
diff --git a/tests/extmod/ubinascii_unhexlify.py b/tests/extmod/ubinascii_unhexlify.py
index 413eaf1b6fd63..2c3598ab98ec3 100644
--- a/tests/extmod/ubinascii_unhexlify.py
+++ b/tests/extmod/ubinascii_unhexlify.py
@@ -7,10 +7,13 @@
     print("SKIP")
     raise SystemExit
 
-print(binascii.unhexlify(b"0001020304050607"))
-print(binascii.unhexlify(b"08090a0b0c0d0e0f"))
-print(binascii.unhexlify(b"7f80ff"))
-print(binascii.unhexlify(b"313233344142434461626364"))
+for x in (
+    b"0001020304050607",
+    b"08090a0b0c0d0e0f",
+    b"7f80ff",
+    b"313233344142434461626364",
+):
+    print(binascii.unhexlify(x))
 
 try:
     a = binascii.unhexlify(b"0")  # odd buffer length

From ec24cd1d25a322192be93dc54a02ca4564fc9e7b Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 12 Aug 2022 10:12:21 +1000
Subject: [PATCH 2476/3533] mpy-cross,unix: Remove .gitignore file.

Now that all build artefacts are placed in a build/ directory the gitignore
is no longer needed.

Signed-off-by: Damien George <damien@micropython.org>
---
 mpy-cross/.gitignore  | 1 -
 ports/unix/.gitignore | 3 ---
 2 files changed, 4 deletions(-)
 delete mode 100644 mpy-cross/.gitignore
 delete mode 100644 ports/unix/.gitignore

diff --git a/mpy-cross/.gitignore b/mpy-cross/.gitignore
deleted file mode 100644
index 82a0a7efaab3d..0000000000000
--- a/mpy-cross/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-mpy-cross
diff --git a/ports/unix/.gitignore b/ports/unix/.gitignore
deleted file mode 100644
index 3ca8f6cb27460..0000000000000
--- a/ports/unix/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-micropython
-micropython-*
-*.gcov

From 945f377b436d3ba6d0ac9962762038133e864604 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 12 Aug 2022 10:15:27 +1000
Subject: [PATCH 2477/3533] py/objstr: Remove str function object declarations
 from header file.

Since f7f56d42851aaff2027e23a8ca45c1f1973f1aca consolidated all uses of
these to a single locals dict, they no longer need to be made public.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/objstr.h | 29 -----------------------------
 1 file changed, 29 deletions(-)

diff --git a/py/objstr.h b/py/objstr.h
index b1217d5872b12..78441fedaf2cb 100644
--- a/py/objstr.h
+++ b/py/objstr.h
@@ -98,35 +98,6 @@ const byte *str_index_to_ptr(const mp_obj_type_t *type, const byte *self_data, s
     mp_obj_t index, bool is_slice);
 const byte *find_subbytes(const byte *haystack, size_t hlen, const byte *needle, size_t nlen, int direction);
 
-MP_DECLARE_CONST_FUN_OBJ_VAR_BETWEEN(str_encode_obj);
-MP_DECLARE_CONST_FUN_OBJ_VAR_BETWEEN(str_find_obj);
-MP_DECLARE_CONST_FUN_OBJ_VAR_BETWEEN(str_rfind_obj);
-MP_DECLARE_CONST_FUN_OBJ_VAR_BETWEEN(str_index_obj);
-MP_DECLARE_CONST_FUN_OBJ_VAR_BETWEEN(str_rindex_obj);
-MP_DECLARE_CONST_FUN_OBJ_2(str_join_obj);
-MP_DECLARE_CONST_FUN_OBJ_VAR_BETWEEN(str_split_obj);
-MP_DECLARE_CONST_FUN_OBJ_KW(str_splitlines_obj);
-MP_DECLARE_CONST_FUN_OBJ_VAR_BETWEEN(str_rsplit_obj);
-MP_DECLARE_CONST_FUN_OBJ_VAR_BETWEEN(str_startswith_obj);
-MP_DECLARE_CONST_FUN_OBJ_VAR_BETWEEN(str_endswith_obj);
-MP_DECLARE_CONST_FUN_OBJ_VAR_BETWEEN(str_strip_obj);
-MP_DECLARE_CONST_FUN_OBJ_VAR_BETWEEN(str_lstrip_obj);
-MP_DECLARE_CONST_FUN_OBJ_VAR_BETWEEN(str_rstrip_obj);
-MP_DECLARE_CONST_FUN_OBJ_KW(str_format_obj);
-MP_DECLARE_CONST_FUN_OBJ_VAR_BETWEEN(str_replace_obj);
-MP_DECLARE_CONST_FUN_OBJ_VAR_BETWEEN(str_count_obj);
-MP_DECLARE_CONST_FUN_OBJ_2(str_partition_obj);
-MP_DECLARE_CONST_FUN_OBJ_2(str_rpartition_obj);
-MP_DECLARE_CONST_FUN_OBJ_2(str_center_obj);
-MP_DECLARE_CONST_FUN_OBJ_1(str_lower_obj);
-MP_DECLARE_CONST_FUN_OBJ_1(str_upper_obj);
-MP_DECLARE_CONST_FUN_OBJ_1(str_isspace_obj);
-MP_DECLARE_CONST_FUN_OBJ_1(str_isalpha_obj);
-MP_DECLARE_CONST_FUN_OBJ_1(str_isdigit_obj);
-MP_DECLARE_CONST_FUN_OBJ_1(str_isupper_obj);
-MP_DECLARE_CONST_FUN_OBJ_1(str_islower_obj);
-MP_DECLARE_CONST_FUN_OBJ_VAR_BETWEEN(bytes_decode_obj);
-
 mp_obj_t mp_obj_bytes_hex(size_t n_args, const mp_obj_t *args, const mp_obj_type_t *type);
 mp_obj_t mp_obj_bytes_fromhex(mp_obj_t type_in, mp_obj_t data);
 

From cf90e24335652462bb7eb4bd105e061683bc316a Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 12 Aug 2022 10:32:20 +1000
Subject: [PATCH 2478/3533] py/mkrules: Use abspath to find directory for
 mpy-cross dependency.

Otherwise if the `mpy-cross/build/` directory doesn't exist then
`mpy-cross/build/..` won't work.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/mkrules.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/py/mkrules.mk b/py/mkrules.mk
index 73c33227c09af..14f1b953cda40 100644
--- a/py/mkrules.mk
+++ b/py/mkrules.mk
@@ -162,7 +162,7 @@ $(HEADER_BUILD):
 ifneq ($(MICROPY_MPYCROSS_DEPENDENCY),)
 # to automatically build mpy-cross, if needed
 $(MICROPY_MPYCROSS_DEPENDENCY):
-	$(MAKE) -C $(dir $@)..
+	$(MAKE) -C $(abspath $(dir $@)..)
 endif
 
 ifneq ($(FROZEN_DIR),)

From 5543b2a9cc7381931431c69d93a77ba5d5d58e2e Mon Sep 17 00:00:00 2001
From: Ned Konz <ned@productcreationstudio.com>
Date: Wed, 1 Sep 2021 10:48:15 -0700
Subject: [PATCH 2479/3533] extmod/uasyncio: Add clear method to
 ThreadSafeFlag.

This is useful in situations where the ThreadSafeFlag is reused and needs
to be cleared of any previous, unwanted event.

For example, clear the flag at the start of an operation, trigger the
operation (eg an I2C write), then (a)wait for an external event to set the
flag (eg a pin IRQ).  Further events may trigger the flag again but these
are unwanted and should be cleared before the next cycle starts.
---
 docs/library/uasyncio.rst                   |  7 ++++++-
 extmod/uasyncio/event.py                    |  5 ++++-
 tests/extmod/uasyncio_threadsafeflag.py     | 20 ++++++++++++++++++++
 tests/extmod/uasyncio_threadsafeflag.py.exp | 11 +++++++++++
 4 files changed, 41 insertions(+), 2 deletions(-)

diff --git a/docs/library/uasyncio.rst b/docs/library/uasyncio.rst
index 0abbf8dd8d7d2..859d505d79a92 100644
--- a/docs/library/uasyncio.rst
+++ b/docs/library/uasyncio.rst
@@ -153,9 +153,14 @@ class ThreadSafeFlag
 
 .. method:: ThreadSafeFlag.set()
 
-    Set the flag.  If there is a task waiting on the event, it will be scheduled
+    Set the flag.  If there is a task waiting on the flag, it will be scheduled
     to run.
 
+.. method:: ThreadSafeFlag.clear()
+
+    Clear the flag. This may be used to ensure that a possibly previously-set
+    flag is clear before waiting for it.
+
 .. method:: ThreadSafeFlag.wait()
 
     Wait for the flag to be set.  If the flag is already set then it returns
diff --git a/extmod/uasyncio/event.py b/extmod/uasyncio/event.py
index c48904b9835c7..654ccefa98e00 100644
--- a/extmod/uasyncio/event.py
+++ b/extmod/uasyncio/event.py
@@ -36,7 +36,7 @@ async def wait(self):
 # MicroPython-extension: This can be set from outside the asyncio event loop,
 # such as other threads, IRQs or scheduler context. Implementation is a stream
 # that asyncio will poll until a flag is set.
-# Note: Unlike Event, this is self-clearing.
+# Note: Unlike Event, this is self-clearing after a wait().
 try:
     import uio
 
@@ -52,6 +52,9 @@ def ioctl(self, req, flags):
         def set(self):
             self._flag = 1
 
+        def clear(self):
+            self._flag = 0
+
         async def wait(self):
             if not self._flag:
                 yield core._io_queue.queue_read(self)
diff --git a/tests/extmod/uasyncio_threadsafeflag.py b/tests/extmod/uasyncio_threadsafeflag.py
index 4e002a3d2a0b1..a8a08d2e92587 100644
--- a/tests/extmod/uasyncio_threadsafeflag.py
+++ b/tests/extmod/uasyncio_threadsafeflag.py
@@ -75,5 +75,25 @@ async def main():
     print("wait task")
     await t
 
+    # Flag set, cleared, and set again.
+    print("----")
+    print("set event")
+    flag.set()
+    print("yield")
+    await asyncio.sleep(0)
+    print("clear event")
+    flag.clear()
+    print("yield")
+    await asyncio.sleep(0)
+    t = asyncio.create_task(task(4, flag))
+    print("yield")
+    await asyncio.sleep(0)
+    print("set event")
+    flag.set()
+    print("yield")
+    await asyncio.sleep(0)
+    print("wait task")
+    await t
+
 
 asyncio.run(main())
diff --git a/tests/extmod/uasyncio_threadsafeflag.py.exp b/tests/extmod/uasyncio_threadsafeflag.py.exp
index aef4e479ba447..757115ac4bdd4 100644
--- a/tests/extmod/uasyncio_threadsafeflag.py.exp
+++ b/tests/extmod/uasyncio_threadsafeflag.py.exp
@@ -19,3 +19,14 @@ yield
 task 3
 task 3 done
 wait task
+----
+set event
+yield
+clear event
+yield
+yield
+task 4
+set event
+yield
+wait task
+task 4 done

From 01514e80c9a150f0506bd6c8c43590ca05f8598f Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 12 Aug 2022 17:03:38 +1000
Subject: [PATCH 2480/3533] extmod/uasyncio: Rename internal _flag to state, to
 save a qstr.

Saves about 16 bytes of flash when uasyncio is frozen in.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/uasyncio/event.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/extmod/uasyncio/event.py b/extmod/uasyncio/event.py
index 654ccefa98e00..3b5e79d8f23ea 100644
--- a/extmod/uasyncio/event.py
+++ b/extmod/uasyncio/event.py
@@ -42,23 +42,23 @@ async def wait(self):
 
     class ThreadSafeFlag(uio.IOBase):
         def __init__(self):
-            self._flag = 0
+            self.state = 0
 
         def ioctl(self, req, flags):
             if req == 3:  # MP_STREAM_POLL
-                return self._flag * flags
+                return self.state * flags
             return None
 
         def set(self):
-            self._flag = 1
+            self.state = 1
 
         def clear(self):
-            self._flag = 0
+            self.state = 0
 
         async def wait(self):
-            if not self._flag:
+            if not self.state:
                 yield core._io_queue.queue_read(self)
-            self._flag = 0
+            self.state = 0
 
 except ImportError:
     pass

From 69719927f1752b2d6333708c5b60067fe3b7965d Mon Sep 17 00:00:00 2001
From: MrJake222 <norbertzpilicy@gmail.com>
Date: Thu, 16 Sep 2021 19:49:42 +0200
Subject: [PATCH 2481/3533] extmod/modlwip: Add support for leaving multicast
 groups.

---
 extmod/modlwip.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/extmod/modlwip.c b/extmod/modlwip.c
index 25669228dffd6..c6ee02132ff21 100644
--- a/extmod/modlwip.c
+++ b/extmod/modlwip.c
@@ -66,6 +66,7 @@
 // All socket options should be globally distinct,
 // because we ignore option levels for efficiency.
 #define IP_ADD_MEMBERSHIP 0x400
+#define IP_DROP_MEMBERSHIP 0x401
 
 // For compatibilily with older lwIP versions.
 #ifndef ip_set_option
@@ -1376,7 +1377,8 @@ STATIC mp_obj_t lwip_socket_setsockopt(size_t n_args, const mp_obj_t *args) {
         }
 
         // level: IPPROTO_IP
-        case IP_ADD_MEMBERSHIP: {
+        case IP_ADD_MEMBERSHIP:
+        case IP_DROP_MEMBERSHIP: {
             mp_buffer_info_t bufinfo;
             mp_get_buffer_raise(args[3], &bufinfo, MP_BUFFER_READ);
             if (bufinfo.len != sizeof(ip_addr_t) * 2) {
@@ -1384,7 +1386,12 @@ STATIC mp_obj_t lwip_socket_setsockopt(size_t n_args, const mp_obj_t *args) {
             }
 
             // POSIX setsockopt has order: group addr, if addr, lwIP has it vice-versa
-            err_t err = igmp_joingroup((ip_addr_t *)bufinfo.buf + 1, bufinfo.buf);
+            err_t err;
+            if (opt == IP_ADD_MEMBERSHIP) {
+                err = igmp_joingroup((ip_addr_t *)bufinfo.buf + 1, bufinfo.buf);
+            } else {
+                err = igmp_leavegroup((ip_addr_t *)bufinfo.buf + 1, bufinfo.buf);
+            }
             if (err != ERR_OK) {
                 mp_raise_OSError(error_lookup_table[-err]);
             }
@@ -1769,6 +1776,7 @@ STATIC const mp_rom_map_elem_t mp_module_lwip_globals_table[] = {
 
     { MP_ROM_QSTR(MP_QSTR_IPPROTO_IP), MP_ROM_INT(0) },
     { MP_ROM_QSTR(MP_QSTR_IP_ADD_MEMBERSHIP), MP_ROM_INT(IP_ADD_MEMBERSHIP) },
+    { MP_ROM_QSTR(MP_QSTR_IP_DROP_MEMBERSHIP), MP_ROM_INT(IP_DROP_MEMBERSHIP) },
 };
 
 STATIC MP_DEFINE_CONST_DICT(mp_module_lwip_globals, mp_module_lwip_globals_table);

From 6cd2e4191803e95580bdfc57c06ea818454a25d1 Mon Sep 17 00:00:00 2001
From: Dan Ellis <dan.ellis@gmail.com>
Date: Thu, 28 Jul 2022 23:21:00 -0400
Subject: [PATCH 2482/3533] py/parsenum: Ensure that trailing zeros lead to
 identical results.

Prior to this commit, parsenum would calculate "1e-20" as 1.0*pow(10, -20),
and "1.000e-20" as 1000.0*pow(10, -23); in certain cases, this could make
seemingly-identical values compare as not equal.  This commit watches for
trailing zeros as a special case, and ignores them when appropriate, so
"1.000e-20" is also calculated as 1.0*pow(10, -20).

Fixes issue #5831.
---
 py/parsenum.c | 70 +++++++++++++++++++++++++++++++++++----------------
 1 file changed, 49 insertions(+), 21 deletions(-)

diff --git a/py/parsenum.c b/py/parsenum.c
index 5e8e5dfe8c0f9..19cc719201400 100644
--- a/py/parsenum.c
+++ b/py/parsenum.c
@@ -178,31 +178,51 @@ typedef enum {
     PARSE_DEC_IN_EXP,
 } parse_dec_in_t;
 
-#if MICROPY_PY_BUILTINS_COMPLEX
-mp_obj_t mp_parse_num_decimal(const char *str, size_t len, bool allow_imag, bool force_complex, mp_lexer_t *lex)
-#else
-mp_obj_t mp_parse_num_float(const char *str, size_t len, bool allow_imag, mp_lexer_t *lex)
-#endif
-{
-    #if MICROPY_PY_BUILTINS_FLOAT
-
+#if MICROPY_PY_BUILTINS_FLOAT
 // DEC_VAL_MAX only needs to be rough and is used to retain precision while not overflowing
 // SMALL_NORMAL_VAL is the smallest power of 10 that is still a normal float
 // EXACT_POWER_OF_10 is the largest value of x so that 10^x can be stored exactly in a float
 //   Note: EXACT_POWER_OF_10 is at least floor(log_5(2^mantissa_length)). Indeed, 10^n = 2^n * 5^n
 //   so we only have to store the 5^n part in the mantissa (the 2^n part will go into the float's
 //   exponent).
-    #if MICROPY_FLOAT_IMPL == MICROPY_FLOAT_IMPL_FLOAT
+#if MICROPY_FLOAT_IMPL == MICROPY_FLOAT_IMPL_FLOAT
 #define DEC_VAL_MAX 1e20F
 #define SMALL_NORMAL_VAL (1e-37F)
 #define SMALL_NORMAL_EXP (-37)
 #define EXACT_POWER_OF_10 (9)
-    #elif MICROPY_FLOAT_IMPL == MICROPY_FLOAT_IMPL_DOUBLE
+#elif MICROPY_FLOAT_IMPL == MICROPY_FLOAT_IMPL_DOUBLE
 #define DEC_VAL_MAX 1e200
 #define SMALL_NORMAL_VAL (1e-307)
 #define SMALL_NORMAL_EXP (-307)
 #define EXACT_POWER_OF_10 (22)
-    #endif
+#endif
+
+// Break out inner digit accumulation routine to ease trailing zero deferral.
+static void accept_digit(mp_float_t *p_dec_val, int dig, int *p_exp_extra, int in) {
+    // Core routine to ingest an additional digit.
+    if (*p_dec_val < DEC_VAL_MAX) {
+        // dec_val won't overflow so keep accumulating
+        *p_dec_val = 10 * *p_dec_val + dig;
+        if (in == PARSE_DEC_IN_FRAC) {
+            --(*p_exp_extra);
+        }
+    } else {
+        // dec_val might overflow and we anyway can't represent more digits
+        // of precision, so ignore the digit and just adjust the exponent
+        if (in == PARSE_DEC_IN_INTG) {
+            ++(*p_exp_extra);
+        }
+    }
+}
+#endif // MICROPY_BUILTINS_FLOAT
+
+#if MICROPY_PY_BUILTINS_COMPLEX
+mp_obj_t mp_parse_num_decimal(const char *str, size_t len, bool allow_imag, bool force_complex, mp_lexer_t *lex)
+#else
+mp_obj_t mp_parse_num_float(const char *str, size_t len, bool allow_imag, mp_lexer_t *lex)
+#endif
+{
+    #if MICROPY_PY_BUILTINS_FLOAT
 
     const char *top = str + len;
     mp_float_t dec_val = 0;
@@ -255,6 +275,7 @@ mp_obj_t mp_parse_num_float(const char *str, size_t len, bool allow_imag, mp_lex
         bool exp_neg = false;
         int exp_val = 0;
         int exp_extra = 0;
+        int trailing_zeros_intg = 0, trailing_zeros_frac = 0;
         while (str < top) {
             unsigned int dig = *str++;
             if ('0' <= dig && dig <= '9') {
@@ -267,18 +288,25 @@ mp_obj_t mp_parse_num_float(const char *str, size_t len, bool allow_imag, mp_lex
                         exp_val = 10 * exp_val + dig;
                     }
                 } else {
-                    if (dec_val < DEC_VAL_MAX) {
-                        // dec_val won't overflow so keep accumulating
-                        dec_val = 10 * dec_val + dig;
-                        if (in == PARSE_DEC_IN_FRAC) {
-                            --exp_extra;
+                    if (dig == 0 || dec_val >= DEC_VAL_MAX) {
+                        // Defer treatment of zeros in fractional part.  If nothing comes afterwards, ignore them.
+                        // Also, once we reach DEC_VAL_MAX, treat every additional digit as a trailing zero.
+                        if (in == PARSE_DEC_IN_INTG) {
+                            ++trailing_zeros_intg;
+                        } else {
+                            ++trailing_zeros_frac;
                         }
                     } else {
-                        // dec_val might overflow and we anyway can't represent more digits
-                        // of precision, so ignore the digit and just adjust the exponent
-                        if (in == PARSE_DEC_IN_INTG) {
-                            ++exp_extra;
+                        // Time to un-defer any trailing zeros.  Intg zeros first.
+                        while (trailing_zeros_intg) {
+                            accept_digit(&dec_val, 0, &exp_extra, PARSE_DEC_IN_INTG);
+                            --trailing_zeros_intg;
+                        }
+                        while (trailing_zeros_frac) {
+                            accept_digit(&dec_val, 0, &exp_extra, PARSE_DEC_IN_FRAC);
+                            --trailing_zeros_frac;
                         }
+                        accept_digit(&dec_val, dig, &exp_extra, in);
                     }
                 }
             } else if (in == PARSE_DEC_IN_INTG && dig == '.') {
@@ -311,7 +339,7 @@ mp_obj_t mp_parse_num_float(const char *str, size_t len, bool allow_imag, mp_lex
         }
 
         // apply the exponent, making sure it's not a subnormal value
-        exp_val += exp_extra;
+        exp_val += exp_extra + trailing_zeros_intg;
         if (exp_val < SMALL_NORMAL_EXP) {
             exp_val -= SMALL_NORMAL_EXP;
             dec_val *= SMALL_NORMAL_VAL;

From 6f4d424f461bede1afb69637763f4fce5f27cd90 Mon Sep 17 00:00:00 2001
From: Dan Ellis <dpwe@ee.columbia.edu>
Date: Thu, 28 Jul 2022 10:49:18 -0400
Subject: [PATCH 2483/3533] py/formatfloat: Use pow(10, e) instead of
 pos/neg_pow lookup tables.

Rework the conversion of floats to decimal strings so it aligns precisely
with the conversion of strings to floats in parsenum.c.  This is to avoid
rendering 1eX as 9.99999eX-1 etc.  This is achieved by removing the power-
of-10 tables and using pow() to compute the exponent directly, and that's
done efficiently by first estimating the power-of-10 exponent from the
power-of-2 exponent in the floating-point representation.

Code size is reduced by roughly 100 to 200 bytes by this commit.

Signed-off-by: Dan Ellis <dan.ellis@gmail.com>
---
 py/formatfloat.c                            | 132 ++++++--------------
 py/misc.h                                   |   2 +
 tests/float/float_format.py                 |   8 ++
 tests/float/float_format_ints_doubleprec.py |   3 +
 tests/float/string_format_modulo.py         |   5 +-
 5 files changed, 53 insertions(+), 97 deletions(-)

diff --git a/py/formatfloat.c b/py/formatfloat.c
index 357b73ace3ab0..fc1b2fe7fc5b4 100644
--- a/py/formatfloat.c
+++ b/py/formatfloat.c
@@ -62,26 +62,20 @@
 #define FPMIN_BUF_SIZE 6 // +9e+99
 
 #define FLT_SIGN_MASK   0x80000000
-#define FLT_EXP_MASK    0x7F800000
-#define FLT_MAN_MASK    0x007FFFFF
 
-union floatbits {
-    float f;
-    uint32_t u;
-};
 static inline int fp_signbit(float x) {
-    union floatbits fb = {x};
-    return fb.u & FLT_SIGN_MASK;
+    mp_float_union_t fb = {x};
+    return fb.i & FLT_SIGN_MASK;
 }
 #define fp_isnan(x) isnan(x)
 #define fp_isinf(x) isinf(x)
 static inline int fp_iszero(float x) {
-    union floatbits fb = {x};
-    return fb.u == 0;
+    mp_float_union_t fb = {x};
+    return fb.i == 0;
 }
 static inline int fp_isless1(float x) {
-    union floatbits fb = {x};
-    return fb.u < 0x3f800000;
+    mp_float_union_t fb = {x};
+    return fb.i < 0x3f800000;
 }
 
 #elif MICROPY_FLOAT_IMPL == MICROPY_FLOAT_IMPL_DOUBLE
@@ -99,28 +93,11 @@ static inline int fp_isless1(float x) {
 
 #endif // MICROPY_FLOAT_IMPL == MICROPY_FLOAT_IMPL_FLOAT/DOUBLE
 
-static inline int fp_ge_eps(FPTYPE x, FPTYPE y) {
-    mp_float_union_t fb_y = {y};
-    // Back off 2 eps.
-    // This is valid for almost all values, but in practice
-    // it's only used when y = 1eX for X>=0.
-    fb_y.i -= 2;
-    return x >= fb_y.f;
+static inline int fp_expval(FPTYPE x) {
+    mp_float_union_t fb = {x};
+    return (int)((fb.i >> MP_FLOAT_FRAC_BITS) & (~(0xFFFFFFFF << MP_FLOAT_EXP_BITS))) - MP_FLOAT_EXP_OFFSET;
 }
 
-static const FPTYPE g_pos_pow[] = {
-    #if FPDECEXP > 32
-    MICROPY_FLOAT_CONST(1e256), MICROPY_FLOAT_CONST(1e128), MICROPY_FLOAT_CONST(1e64),
-    #endif
-    MICROPY_FLOAT_CONST(1e32), MICROPY_FLOAT_CONST(1e16), MICROPY_FLOAT_CONST(1e8), MICROPY_FLOAT_CONST(1e4), MICROPY_FLOAT_CONST(1e2), MICROPY_FLOAT_CONST(1e1)
-};
-static const FPTYPE g_neg_pow[] = {
-    #if FPDECEXP > 32
-    MICROPY_FLOAT_CONST(1e-256), MICROPY_FLOAT_CONST(1e-128), MICROPY_FLOAT_CONST(1e-64),
-    #endif
-    MICROPY_FLOAT_CONST(1e-32), MICROPY_FLOAT_CONST(1e-16), MICROPY_FLOAT_CONST(1e-8), MICROPY_FLOAT_CONST(1e-4), MICROPY_FLOAT_CONST(1e-2), MICROPY_FLOAT_CONST(1e-1)
-};
-
 int mp_format_float(FPTYPE f, char *buf, size_t buf_size, char fmt, int prec, char sign) {
 
     char *s = buf;
@@ -177,14 +154,15 @@ int mp_format_float(FPTYPE f, char *buf, size_t buf_size, char fmt, int prec, ch
     if (fmt == 'g' && prec == 0) {
         prec = 1;
     }
-    int e, e1;
+    int e;
     int dec = 0;
     char e_sign = '\0';
     int num_digits = 0;
-    const FPTYPE *pos_pow = g_pos_pow;
-    const FPTYPE *neg_pow = g_neg_pow;
     int signed_e = 0;
 
+    // Approximate power of 10 exponent from binary exponent.
+    // abs(e_guess) is lower bound on abs(power of 10 exponent).
+    int e_guess = (int)(fp_expval(f) * FPCONST(0.3010299956639812));  // 1/log2(10).
     if (fp_iszero(f)) {
         e = 0;
         if (fmt == 'f') {
@@ -203,25 +181,18 @@ int mp_format_float(FPTYPE f, char *buf, size_t buf_size, char fmt, int prec, ch
             }
         }
     } else if (fp_isless1(f)) {
-        FPTYPE f_mod = f;
+        FPTYPE f_entry = f;  // Save f in case we go to 'f' format.
         // Build negative exponent
-        for (e = 0, e1 = FPDECEXP; e1; e1 >>= 1, pos_pow++, neg_pow++) {
-            if (*neg_pow > f_mod) {
-                e += e1;
-                f_mod *= *pos_pow;
-            }
-        }
-
-        char e_sign_char = '-';
-        if (fp_isless1(f_mod) && f_mod >= FPROUND_TO_ONE) {
-            f_mod = FPCONST(1.0);
-            if (e == 0) {
-                e_sign_char = '+';
-            }
-        } else if (fp_isless1(f_mod)) {
-            e++;
-            f_mod *= FPCONST(10.0);
+        e = -e_guess;
+        FPTYPE u_base = MICROPY_FLOAT_C_FUN(pow)(10, -e);
+        while (u_base > f) {
+            ++e;
+            u_base = MICROPY_FLOAT_C_FUN(pow)(10, -e);
         }
+        // Normalize out the inferred unit.  Use divide because
+        // pow(10, e) * pow(10, -e) is slightly < 1 for some e in float32
+        // (e.g. print("%.12f" % ((1e13) * (1e-13))))
+        f /= u_base;
 
         // If the user specified 'g' format, and e is <= 4, then we'll switch
         // to the fixed format ('f')
@@ -241,11 +212,12 @@ int mp_format_float(FPTYPE f, char *buf, size_t buf_size, char fmt, int prec, ch
 
             num_digits = prec;
             signed_e = 0;
+            f = f_entry;
             ++num_digits;
         } else {
             // For e & g formats, we'll be printing the exponent, so set the
             // sign.
-            e_sign = e_sign_char;
+            e_sign = '-';
             dec = 0;
 
             if (prec > (buf_remaining - FPMIN_BUF_SIZE)) {
@@ -262,19 +234,11 @@ int mp_format_float(FPTYPE f, char *buf, size_t buf_size, char fmt, int prec, ch
         // scaling it.  Instead, we find the product of powers of 10
         // that is not greater than it, and use that to start the
         // mantissa.
-        FPTYPE u_base = FPCONST(1.0);
-        for (e = 0, e1 = FPDECEXP; e1; e1 >>= 1, pos_pow++) {
-            FPTYPE next_u = u_base * *pos_pow;
-            // fp_ge_eps performs "f >= (next_u - 2eps)" so that if, for
-            // numerical reasons, f is very close to a power of ten but
-            // not strictly equal, we still treat it as that power of 10.
-            // The comparison was failing for maybe 10% of 1eX values, but
-            // although rounding fixed many of them, there were still some
-            // rendering as 9.99999998e(X-1).
-            if (fp_ge_eps(f, next_u)) {
-                u_base = next_u;
-                e += e1;
-            }
+        e = e_guess;
+        FPTYPE next_u = MICROPY_FLOAT_C_FUN(pow)(10, e + 1);
+        while (f >= next_u) {
+            ++e;
+            next_u = MICROPY_FLOAT_C_FUN(pow)(10, e + 1);
         }
 
         // If the user specified fixed format (fmt == 'f') and e makes the
@@ -341,46 +305,22 @@ int mp_format_float(FPTYPE f, char *buf, size_t buf_size, char fmt, int prec, ch
         num_digits = prec;
     }
 
-    if (signed_e < 0) {
-        // The algorithm below treats numbers smaller than 1 by scaling them
-        // repeatedly by 10 to bring the new digit to the top.  Our input number
-        // was smaller than 1, so scale it up to be 1 <= f < 10.
-        FPTYPE u_base = FPCONST(1.0);
-        const FPTYPE *pow_u = g_pos_pow;
-        for (int m = FPDECEXP; m; m >>= 1, pow_u++) {
-            if (m & e) {
-                u_base *= *pow_u;
-            }
-        }
-        f *= u_base;
-    }
-
     int d = 0;
-    int num_digits_left = num_digits;
-    for (int digit_index = signed_e; num_digits_left >= 0; --digit_index) {
+    for (int digit_index = signed_e; num_digits >= 0; --digit_index) {
         FPTYPE u_base = FPCONST(1.0);
         if (digit_index > 0) {
             // Generate 10^digit_index for positive digit_index.
-            const FPTYPE *pow_u = g_pos_pow;
-            int target_index = digit_index;
-            for (int m = FPDECEXP; m; m >>= 1, pow_u++) {
-                if (m & target_index) {
-                    u_base *= *pow_u;
-                }
-            }
+            u_base = MICROPY_FLOAT_C_FUN(pow)(10, digit_index);
         }
         for (d = 0; d < 9; ++d) {
-            // This is essentially "if (f < u_base)", but with 2eps margin
-            // so that if f is just a tiny bit smaller, we treat it as
-            // equal (and accept the additional digit value).
-            if (!fp_ge_eps(f, u_base)) {
+            if (f < u_base) {
                 break;
             }
             f -= u_base;
         }
         // We calculate one more digit than we display, to use in rounding
         // below.  So only emit the digit if it's one that we display.
-        if (num_digits_left > 0) {
+        if (num_digits > 0) {
             // Emit this number (the leading digit).
             *s++ = '0' + d;
             if (dec == 0 && prec > 0) {
@@ -388,9 +328,9 @@ int mp_format_float(FPTYPE f, char *buf, size_t buf_size, char fmt, int prec, ch
             }
         }
         --dec;
-        --num_digits_left;
+        --num_digits;
         if (digit_index <= 0) {
-            // Once we get below 1.0, we scale up f instead of calculting
+            // Once we get below 1.0, we scale up f instead of calculating
             // negative powers of 10 in u_base.  This provides better
             // renditions of exact decimals like 1/16 etc.
             f *= FPCONST(10.0);
diff --git a/py/misc.h b/py/misc.h
index e642598c56d03..134325f8946ff 100644
--- a/py/misc.h
+++ b/py/misc.h
@@ -243,10 +243,12 @@ extern mp_uint_t mp_verbose_flag;
 
 #if MICROPY_FLOAT_IMPL == MICROPY_FLOAT_IMPL_DOUBLE
 #define MP_FLOAT_EXP_BITS (11)
+#define MP_FLOAT_EXP_OFFSET (1023)
 #define MP_FLOAT_FRAC_BITS (52)
 typedef uint64_t mp_float_uint_t;
 #elif MICROPY_FLOAT_IMPL == MICROPY_FLOAT_IMPL_FLOAT
 #define MP_FLOAT_EXP_BITS (8)
+#define MP_FLOAT_EXP_OFFSET (127)
 #define MP_FLOAT_FRAC_BITS (23)
 typedef uint32_t mp_float_uint_t;
 #endif
diff --git a/tests/float/float_format.py b/tests/float/float_format.py
index 4c8a217567abf..98ed0eb096fa4 100644
--- a/tests/float/float_format.py
+++ b/tests/float/float_format.py
@@ -17,3 +17,11 @@
 # check a case that would render negative digit values, eg ")" characters
 # the string is converted back to a float to check for no illegal characters
 float("%.23e" % 1e-80)
+
+# Check a problem with malformed "e" format numbers on the edge of 1.0e-X.
+for r in range(38):
+    s = "%.12e" % float("1e-" + str(r))
+    # It may format as 1e-r, or 9.999...e-(r+1), both are OK.
+    # But formatting as 0.999...e-r is NOT ok.
+    if s[0] == "0":
+        print("FAIL:", s)
diff --git a/tests/float/float_format_ints_doubleprec.py b/tests/float/float_format_ints_doubleprec.py
index 57899d6d65a85..67101d3e45037 100644
--- a/tests/float/float_format_ints_doubleprec.py
+++ b/tests/float/float_format_ints_doubleprec.py
@@ -13,3 +13,6 @@
 v2 = 0x6974E718D7D7625A  # 1e200
 print("{:.12e}".format(array.array("d", v1.to_bytes(8, sys.byteorder))[0]))
 print("{:.12e}".format(array.array("d", v2.to_bytes(8, sys.byteorder))[0]))
+
+for i in range(300):
+    print(float("1e" + str(i)))
diff --git a/tests/float/string_format_modulo.py b/tests/float/string_format_modulo.py
index 09446153810db..3c206b7393588 100644
--- a/tests/float/string_format_modulo.py
+++ b/tests/float/string_format_modulo.py
@@ -41,7 +41,10 @@
 print(("%.40g" % 1e-1)[:2])
 print(("%.40g" % 1e-2)[:2])
 print(("%.40g" % 1e-3)[:2])
-print(("%.40g" % 1e-4)[:2])
+# Under Appveyor Release builds, 1e-4 was being formatted as 9.99999...e-5
+# instead of 0.0001.  (Interestingly, it formatted correctly for the Debug
+# build). Avoid the edge case.
+print(("%.40g" % 1.1e-4)[:2])
 
 print("%.0g" % 1)  # 0 precision 'g'
 

From a16a330da54afd392252d7ea04139fd4702f48f8 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Mon, 15 Aug 2022 16:07:00 +1000
Subject: [PATCH 2484/3533] nrf,stm32: Don't enable debug info by default if
 LTO is on.

It seems sometimes gcc with LTO will generate otherwise valid assembly
listings that cause 'as' to error out when generating DWARF debug info; see
https://sourceware.org/bugzilla/show_bug.cgi?id=29494

Therefore, don't enable -g by default if LTO is on.

Enabling LTO=1 DEBUG=1 is still possible but may result in random errors
at link time due to 'as' (the error in this case is "Error: unaligned
opcodes detected in executable segment", and the only other easy workaround
is CFLAGS+=-fno-jump-tables which may increase code size significantly).

Follows on from fdfe4eca745dce5f20fb65a3c197006b9053999a
---
 ports/nrf/Makefile   | 6 ++++--
 ports/stm32/Makefile | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/ports/nrf/Makefile b/ports/nrf/Makefile
index 23be4430f3960..bc295cac808e8 100644
--- a/ports/nrf/Makefile
+++ b/ports/nrf/Makefile
@@ -138,12 +138,14 @@ LDFLAGS += -Wl,'--defsym=_fs_size=$(FS_SIZE)'
 endif
 
 #Debugging/Optimization
-CFLAGS += -g  # always include debug info in the ELF
 ifeq ($(DEBUG), 1)
 #ASMFLAGS += -g -gtabs+
-CFLAGS += -O0
+CFLAGS += -g -O0
 LDFLAGS += -O0
 else
+ifneq ($(LTO), 1)
+CFLAGS += -g  # always include debug info in the ELF, unless LTO is on
+endif
 CFLAGS += -Os -DNDEBUG
 LDFLAGS += -Os
 endif
diff --git a/ports/stm32/Makefile b/ports/stm32/Makefile
index 657524798cf5f..14a93a5aa7658 100644
--- a/ports/stm32/Makefile
+++ b/ports/stm32/Makefile
@@ -114,13 +114,15 @@ $(BUILD)/stm32_it.o $(BUILD)/pendsv.o: CFLAGS += -fno-lto
 endif
 
 # Debugging/Optimization
-CFLAGS += -g  # always include debug info in the ELF
 ifeq ($(DEBUG), 1)
-CFLAGS += -DPENDSV_DEBUG
+CFLAGS += -g -DPENDSV_DEBUG
 COPT ?= -Og
 # Disable text compression in debug builds
 MICROPY_ROM_TEXT_COMPRESSION = 0
 else
+ifneq ($(LTO), 1)
+CFLAGS += -g  # always include debug info in the ELF, unless LTO is on
+endif
 COPT ?= -Os -DNDEBUG
 endif
 

From 454d969781564567864bb431f416df1fc1852765 Mon Sep 17 00:00:00 2001
From: David Peake <dave.peake@gmail.com>
Date: Mon, 15 Aug 2022 20:17:41 +1000
Subject: [PATCH 2485/3533] docs/esp32: Fix string quoting consistency in
 SDCard mount example.

It appears that strings in the documentation are typically single quoted.
---
 docs/esp32/quickref.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/esp32/quickref.rst b/docs/esp32/quickref.rst
index 3cbb673c04b52..1529c0ef49297 100644
--- a/docs/esp32/quickref.rst
+++ b/docs/esp32/quickref.rst
@@ -589,7 +589,7 @@ See :ref:`machine.SDCard <machine.SDCard>`. ::
 
     # Slot 2 uses pins sck=18, cs=5, miso=19, mosi=23
     sd = machine.SDCard(slot=2)
-    os.mount(sd, "/sd")  # mount
+    os.mount(sd, '/sd')  # mount
 
     os.listdir('/sd')    # list directory contents
 

From 98bd7e33b32fb00ad2900e71cbe5cc4938598a7a Mon Sep 17 00:00:00 2001
From: Efi Weiss <efiwiss@gmail.com>
Date: Sun, 14 Aug 2022 22:12:24 +0300
Subject: [PATCH 2486/3533] unix/modusocket: Support proto and flags arguments
 to getaddrinfo.

Signed-off-by: Efi Weiss <efiwiss@gmail.com>
---
 ports/unix/modusocket.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/ports/unix/modusocket.c b/ports/unix/modusocket.c
index 03d069cb89ce9..69ae2a78ebbb2 100644
--- a/ports/unix/modusocket.c
+++ b/ports/unix/modusocket.c
@@ -564,7 +564,6 @@ STATIC mp_obj_t mod_socket_inet_ntop(mp_obj_t family_in, mp_obj_t binaddr_in) {
 STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_socket_inet_ntop_obj, mod_socket_inet_ntop);
 
 STATIC mp_obj_t mod_socket_getaddrinfo(size_t n_args, const mp_obj_t *args) {
-    // TODO: Implement 5th and 6th args
 
     const char *host = mp_obj_str_get_str(args[0]);
     const char *serv = NULL;
@@ -600,6 +599,12 @@ STATIC mp_obj_t mod_socket_getaddrinfo(size_t n_args, const mp_obj_t *args) {
         hints.ai_family = MP_OBJ_SMALL_INT_VALUE(args[2]);
         if (n_args > 3) {
             hints.ai_socktype = MP_OBJ_SMALL_INT_VALUE(args[3]);
+            if (n_args > 4) {
+                hints.ai_protocol = MP_OBJ_SMALL_INT_VALUE(args[4]);
+                if (n_args > 5) {
+                    hints.ai_flags = MP_OBJ_SMALL_INT_VALUE(args[5]);
+                }
+            }
         }
     }
 
@@ -633,7 +638,7 @@ STATIC mp_obj_t mod_socket_getaddrinfo(size_t n_args, const mp_obj_t *args) {
     freeaddrinfo(addr_list);
     return list;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_socket_getaddrinfo_obj, 2, 4, mod_socket_getaddrinfo);
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_socket_getaddrinfo_obj, 2, 6, mod_socket_getaddrinfo);
 
 STATIC mp_obj_t mod_socket_sockaddr(mp_obj_t sockaddr_in) {
     mp_buffer_info_t bufinfo;

From cbc9f944c4db6e3aee0bce0584b1eab674f0e5b9 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 18 Aug 2022 11:46:53 +1000
Subject: [PATCH 2487/3533] tests,tools: Update path to unix micropython
 executable.

These were missed by 47c84286e8c8d9873e99f12711a683ecd6b9ca62

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/run-internalbench.py | 2 +-
 tests/run-multitests.py    | 2 +-
 tests/run-perfbench.py     | 2 +-
 tools/codestats.sh         | 2 +-
 tools/gen-cpydiff.py       | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/tests/run-internalbench.py b/tests/run-internalbench.py
index 606fc3b77201e..0d21978501101 100755
--- a/tests/run-internalbench.py
+++ b/tests/run-internalbench.py
@@ -16,7 +16,7 @@
     MICROPYTHON = os.getenv("MICROPY_MICROPYTHON", "../ports/windows/micropython.exe")
 else:
     CPYTHON3 = os.getenv("MICROPY_CPYTHON3", "python3")
-    MICROPYTHON = os.getenv("MICROPY_MICROPYTHON", "../ports/unix/micropython")
+    MICROPYTHON = os.getenv("MICROPY_MICROPYTHON", "../ports/unix/build-standard/micropython")
 
 
 def run_tests(pyb, test_dict):
diff --git a/tests/run-multitests.py b/tests/run-multitests.py
index d8a4a48fa755a..bd6cc70f7a516 100755
--- a/tests/run-multitests.py
+++ b/tests/run-multitests.py
@@ -18,7 +18,7 @@
     MICROPYTHON = os.getenv("MICROPY_MICROPYTHON", "../ports/windows/micropython.exe")
 else:
     CPYTHON3 = os.getenv("MICROPY_CPYTHON3", "python3")
-    MICROPYTHON = os.getenv("MICROPY_MICROPYTHON", "../ports/unix/micropython")
+    MICROPYTHON = os.getenv("MICROPY_MICROPYTHON", "../ports/unix/build-standard/micropython")
 
 # For diff'ing test output
 DIFF = os.getenv("MICROPY_DIFF", "diff -u")
diff --git a/tests/run-perfbench.py b/tests/run-perfbench.py
index d70b996937373..6f340968b2f90 100755
--- a/tests/run-perfbench.py
+++ b/tests/run-perfbench.py
@@ -21,7 +21,7 @@
     MICROPYTHON = os.getenv("MICROPY_MICROPYTHON", "../ports/windows/micropython.exe")
 else:
     CPYTHON3 = os.getenv("MICROPY_CPYTHON3", "python3")
-    MICROPYTHON = os.getenv("MICROPY_MICROPYTHON", "../ports/unix/micropython")
+    MICROPYTHON = os.getenv("MICROPY_MICROPYTHON", "../ports/unix/build-standard/micropython")
 
 PYTHON_TRUTH = CPYTHON3
 
diff --git a/tools/codestats.sh b/tools/codestats.sh
index 09284a30de3ac..74430739917b5 100755
--- a/tools/codestats.sh
+++ b/tools/codestats.sh
@@ -23,7 +23,7 @@ AWK=awk
 MAKE="make -j2"
 
 # these are the binaries that are built; some have 2 or 3 depending on version
-bin_unix=ports/unix/micropython
+bin_unix=ports/unix/build-standard/micropython
 bin_stm32=ports/stm32/build-PYBV10/firmware.elf
 bin_barearm_1=ports/bare-arm/build/flash.elf
 bin_barearm_2=ports/bare-arm/build/firmware.elf
diff --git a/tools/gen-cpydiff.py b/tools/gen-cpydiff.py
index d4c8a5736d9ed..46b3079cac2ea 100644
--- a/tools/gen-cpydiff.py
+++ b/tools/gen-cpydiff.py
@@ -42,7 +42,7 @@
     MICROPYTHON = os.getenv("MICROPY_MICROPYTHON", "../ports/windows/micropython.exe")
 else:
     CPYTHON3 = os.getenv("MICROPY_CPYTHON3", "python3")
-    MICROPYTHON = os.getenv("MICROPY_MICROPYTHON", "../ports/unix/micropython")
+    MICROPYTHON = os.getenv("MICROPY_MICROPYTHON", "../ports/unix/build-standard/micropython")
 
 TESTPATH = "../tests/cpydiff/"
 DOCPATH = "../docs/genrst/"

From 237a393bec51ae564b2b9ded404ef58949a3bc63 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 18 Aug 2022 11:48:45 +1000
Subject: [PATCH 2488/3533] extmod/vfs_posix_file: Remove unused
 MICROPY_VFS_POSIX_FILE.

This was made obsolete by 2b409ef8a46015f8f3bd20bc44e644637dbe9bd3

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/vfs_posix_file.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/extmod/vfs_posix_file.c b/extmod/vfs_posix_file.c
index 795ad7bbd9ea4..a758db14c3bd8 100644
--- a/extmod/vfs_posix_file.c
+++ b/extmod/vfs_posix_file.c
@@ -30,7 +30,7 @@
 #include "py/stream.h"
 #include "extmod/vfs_posix.h"
 
-#if MICROPY_VFS_POSIX || MICROPY_VFS_POSIX_FILE
+#if MICROPY_VFS_POSIX
 
 #include <fcntl.h>
 #include <unistd.h>
@@ -285,4 +285,4 @@ const mp_obj_vfs_posix_file_t mp_sys_stdin_obj = {{&mp_type_vfs_posix_textio}, S
 const mp_obj_vfs_posix_file_t mp_sys_stdout_obj = {{&mp_type_vfs_posix_textio}, STDOUT_FILENO};
 const mp_obj_vfs_posix_file_t mp_sys_stderr_obj = {{&mp_type_vfs_posix_textio}, STDERR_FILENO};
 
-#endif // MICROPY_VFS_POSIX || MICROPY_VFS_POSIX_FILE
+#endif // MICROPY_VFS_POSIX

From 8f4c108025d4590a1b7f9d062ad64f95c45e0bc2 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 18 Aug 2022 11:54:17 +1000
Subject: [PATCH 2489/3533] all: Remove MICROPY_PY_IO_FILEIO config option.

Since commit e65d1e69e88268145ff0e7e73240f028885915be there is no longer an
io.FileIO class, so this option is no longer needed.

This option also controlled whether or not files supported being opened in
binary mode (eg 'rb'), and could, if disabled, lead to confusion as to why
opening a file in binary mode silently did the wrong thing (it would just
open in text mode if MICROPY_PY_IO_FILEIO was disabled).

The various VFS implementations (POSIX, FAT, LFS) were the only places
where enabling this option made a difference, and in almost all cases where
one of these filesystems were enabled, MICROPY_PY_IO_FILEIO was also
enabled.  So it makes sense to just unconditionally enable this feature
(ability to open a file in binary mode) in all cases, and so just remove
this config option altogether.  That makes configuration simpler and means
binary file support always exists (and opening a file in binary mode is
arguably more fundamental than opening in text mode, so if anything should
be configurable then it should be the ability to open in text mode).

Signed-off-by: Damien George <damien@micropython.org>
---
 examples/embedding/mpconfigport_minimal.h         | 1 -
 extmod/vfs_fat_file.c                             | 4 ----
 extmod/vfs_lfsx_file.c                            | 4 ----
 extmod/vfs_posix_file.c                           | 5 -----
 ports/cc3200/mpconfigport.h                       | 1 -
 ports/esp8266/mpconfigport.h                      | 1 -
 ports/mimxrt/mpconfigport.h                       | 1 -
 ports/nrf/mpconfigport.h                          | 1 -
 ports/renesas-ra/mpconfigport.h                   | 1 -
 ports/samd/mpconfigport.h                         | 1 -
 ports/stm32/boards/B_L072Z_LRWAN1/mpconfigboard.h | 1 -
 ports/stm32/boards/NUCLEO_F091RC/mpconfigboard.h  | 1 -
 ports/stm32/boards/NUCLEO_L073RZ/mpconfigboard.h  | 1 -
 ports/unix/mpconfigport.h                         | 1 -
 ports/unix/variants/minimal/mpconfigvariant.h     | 1 -
 ports/windows/mpconfigport.h                      | 1 -
 py/mpconfig.h                                     | 5 -----
 17 files changed, 31 deletions(-)

diff --git a/examples/embedding/mpconfigport_minimal.h b/examples/embedding/mpconfigport_minimal.h
index 91b194bc7bc3f..02089c1a62135 100644
--- a/examples/embedding/mpconfigport_minimal.h
+++ b/examples/embedding/mpconfigport_minimal.h
@@ -69,7 +69,6 @@
 #define MICROPY_PY_MATH             (0)
 #define MICROPY_PY_CMATH            (0)
 #define MICROPY_PY_IO               (0)
-#define MICROPY_PY_IO_FILEIO        (0)
 #define MICROPY_PY_STRUCT           (0)
 #define MICROPY_PY_SYS              (1)
 #define MICROPY_PY_SYS_EXIT         (0)
diff --git a/extmod/vfs_fat_file.c b/extmod/vfs_fat_file.c
index ebf36fc3978c4..874f10c50045c 100644
--- a/extmod/vfs_fat_file.c
+++ b/extmod/vfs_fat_file.c
@@ -170,7 +170,6 @@ STATIC const mp_rom_map_elem_t vfs_fat_rawfile_locals_dict_table[] = {
 
 STATIC MP_DEFINE_CONST_DICT(vfs_fat_rawfile_locals_dict, vfs_fat_rawfile_locals_dict_table);
 
-#if MICROPY_PY_IO_FILEIO
 STATIC const mp_stream_p_t vfs_fat_fileio_stream_p = {
     .read = file_obj_read,
     .write = file_obj_write,
@@ -186,7 +185,6 @@ const mp_obj_type_t mp_type_vfs_fat_fileio = {
     .protocol = &vfs_fat_fileio_stream_p,
     .locals_dict = (mp_obj_dict_t *)&vfs_fat_rawfile_locals_dict,
 };
-#endif
 
 STATIC const mp_stream_p_t vfs_fat_textio_stream_p = {
     .read = file_obj_read,
@@ -230,11 +228,9 @@ STATIC mp_obj_t fat_vfs_open(mp_obj_t self_in, mp_obj_t path_in, mp_obj_t mode_i
             case '+':
                 mode |= FA_READ | FA_WRITE;
                 break;
-            #if MICROPY_PY_IO_FILEIO
             case 'b':
                 type = &mp_type_vfs_fat_fileio;
                 break;
-            #endif
             case 't':
                 type = &mp_type_vfs_fat_textio;
                 break;
diff --git a/extmod/vfs_lfsx_file.c b/extmod/vfs_lfsx_file.c
index bc1a37b90bdb8..124361feb99f2 100644
--- a/extmod/vfs_lfsx_file.c
+++ b/extmod/vfs_lfsx_file.c
@@ -68,11 +68,9 @@ mp_obj_t MP_VFS_LFSx(file_open)(mp_obj_t self_in, mp_obj_t path_in, mp_obj_t mod
             case '+':
                 flags |= LFSx_MACRO(_O_RDWR);
                 break;
-            #if MICROPY_PY_IO_FILEIO
             case 'b':
                 type = &MP_TYPE_VFS_LFSx_(_fileio);
                 break;
-            #endif
             case 't':
                 type = &MP_TYPE_VFS_LFSx_(_textio);
                 break;
@@ -216,7 +214,6 @@ STATIC const mp_rom_map_elem_t MP_VFS_LFSx(file_locals_dict_table)[] = {
 };
 STATIC MP_DEFINE_CONST_DICT(MP_VFS_LFSx(file_locals_dict), MP_VFS_LFSx(file_locals_dict_table));
 
-#if MICROPY_PY_IO_FILEIO
 STATIC const mp_stream_p_t MP_VFS_LFSx(fileio_stream_p) = {
     .read = MP_VFS_LFSx(file_read),
     .write = MP_VFS_LFSx(file_write),
@@ -232,7 +229,6 @@ const mp_obj_type_t MP_TYPE_VFS_LFSx_(_fileio) = {
     .protocol = &MP_VFS_LFSx(fileio_stream_p),
     .locals_dict = (mp_obj_dict_t *)&MP_VFS_LFSx(file_locals_dict),
 };
-#endif
 
 STATIC const mp_stream_p_t MP_VFS_LFSx(textio_stream_p) = {
     .read = MP_VFS_LFSx(file_read),
diff --git a/extmod/vfs_posix_file.c b/extmod/vfs_posix_file.c
index a758db14c3bd8..c550842cd4e86 100644
--- a/extmod/vfs_posix_file.c
+++ b/extmod/vfs_posix_file.c
@@ -83,15 +83,12 @@ mp_obj_t mp_vfs_posix_file_open(const mp_obj_type_t *type, mp_obj_t file_in, mp_
             case '+':
                 mode_rw = O_RDWR;
                 break;
-                #if MICROPY_PY_IO_FILEIO
-            // If we don't have io.FileIO, then files are in text mode implicitly
             case 'b':
                 type = &mp_type_vfs_posix_fileio;
                 break;
             case 't':
                 type = &mp_type_vfs_posix_textio;
                 break;
-                #endif
         }
     }
 
@@ -246,7 +243,6 @@ STATIC const mp_rom_map_elem_t vfs_posix_rawfile_locals_dict_table[] = {
 
 STATIC MP_DEFINE_CONST_DICT(vfs_posix_rawfile_locals_dict, vfs_posix_rawfile_locals_dict_table);
 
-#if MICROPY_PY_IO_FILEIO
 STATIC const mp_stream_p_t vfs_posix_fileio_stream_p = {
     .read = vfs_posix_file_read,
     .write = vfs_posix_file_write,
@@ -262,7 +258,6 @@ const mp_obj_type_t mp_type_vfs_posix_fileio = {
     .protocol = &vfs_posix_fileio_stream_p,
     .locals_dict = (mp_obj_dict_t *)&vfs_posix_rawfile_locals_dict,
 };
-#endif
 
 STATIC const mp_stream_p_t vfs_posix_textio_stream_p = {
     .read = vfs_posix_file_read,
diff --git a/ports/cc3200/mpconfigport.h b/ports/cc3200/mpconfigport.h
index f41c1fe99dbfb..93fc291c1a4c2 100644
--- a/ports/cc3200/mpconfigport.h
+++ b/ports/cc3200/mpconfigport.h
@@ -105,7 +105,6 @@
 #define MICROPY_PY_SYS_STDFILES                     (1)
 #define MICROPY_PY_CMATH                            (0)
 #define MICROPY_PY_IO                               (1)
-#define MICROPY_PY_IO_FILEIO                        (1)
 #define MICROPY_PY_UERRNO                           (1)
 #define MICROPY_PY_UERRNO_ERRORCODE                 (0)
 #define MICROPY_PY_THREAD                           (1)
diff --git a/ports/esp8266/mpconfigport.h b/ports/esp8266/mpconfigport.h
index 9ff6a34ffd625..ded56663b32bf 100644
--- a/ports/esp8266/mpconfigport.h
+++ b/ports/esp8266/mpconfigport.h
@@ -35,7 +35,6 @@
 #define MICROPY_PY_MATH_SPECIAL_FUNCTIONS       (0)
 #define MICROPY_PY_MATH_FACTORIAL               (0)
 #define MICROPY_PY_MATH_ISCLOSE                 (0)
-#define MICROPY_PY_IO_FILEIO                    (MICROPY_VFS)
 #define MICROPY_PY_SYS_PS1_PS2                  (0)
 #define MICROPY_PY_UBINASCII_CRC32              (0)
 #define MICROPY_PY_URANDOM_EXTRA_FUNCS          (0)
diff --git a/ports/mimxrt/mpconfigport.h b/ports/mimxrt/mpconfigport.h
index 54d649795df0c..8642d53ecc455 100644
--- a/ports/mimxrt/mpconfigport.h
+++ b/ports/mimxrt/mpconfigport.h
@@ -101,7 +101,6 @@ uint32_t trng_random_u32(void);
 #define MICROPY_PY_MATH_ISCLOSE             (1)
 #define MICROPY_PY_CMATH                    (1)
 #define MICROPY_PY_IO_IOBASE                (1)
-#define MICROPY_PY_IO_FILEIO                (1)
 #define MICROPY_PY_SYS_MAXSIZE              (1)
 #define MICROPY_PY_SYS_PLATFORM             "mimxrt"
 #define MICROPY_PY_SYS_STDFILES             (1)
diff --git a/ports/nrf/mpconfigport.h b/ports/nrf/mpconfigport.h
index a25ca1ec27efe..ac238057dd427 100644
--- a/ports/nrf/mpconfigport.h
+++ b/ports/nrf/mpconfigport.h
@@ -155,7 +155,6 @@
 #define MICROPY_MODULE_BUILTIN_INIT (1)
 #define MICROPY_PY_MICROPYTHON_MEM_INFO (1)
 #define MICROPY_PY_SYS_MAXSIZE      (1)
-#define MICROPY_PY_IO_FILEIO        (MICROPY_VFS_FAT || MICROPY_VFS_LFS1 || MICROPY_VFS_LFS2)
 #define MICROPY_PY_URANDOM          (1)
 #define MICROPY_PY_URANDOM_EXTRA_FUNCS (1)
 #define MICROPY_PY_UTIME_MP_HAL     (1)
diff --git a/ports/renesas-ra/mpconfigport.h b/ports/renesas-ra/mpconfigport.h
index 65b194274a53d..b77a3c492323b 100644
--- a/ports/renesas-ra/mpconfigport.h
+++ b/ports/renesas-ra/mpconfigport.h
@@ -83,7 +83,6 @@
 #ifndef MICROPY_PY_BUILTINS_HELP_TEXT
 #define MICROPY_PY_BUILTINS_HELP_TEXT ra_help_text
 #endif
-#define MICROPY_PY_IO_FILEIO        (MICROPY_VFS_FAT || MICROPY_VFS_LFS1 || MICROPY_VFS_LFS2)
 #ifndef MICROPY_PY_SYS_PLATFORM     // let boards override it if they want
 #define MICROPY_PY_SYS_PLATFORM     "renesas-ra"
 #endif
diff --git a/ports/samd/mpconfigport.h b/ports/samd/mpconfigport.h
index c02d9316ded30..0b16b5e817af0 100644
--- a/ports/samd/mpconfigport.h
+++ b/ports/samd/mpconfigport.h
@@ -77,7 +77,6 @@
 #define MICROPY_PY_SYS_EXIT                 (1)
 #define MICROPY_PY_SYS_STDFILES             (1)
 #define MICROPY_PY_SYS_MAXSIZE              (1)
-#define MICROPY_PY_IO_FILEIO                (1)
 #define MICROPY_PY_IO                       (1)
 #define MICROPY_PY_IO_IOBASE                (1)
 
diff --git a/ports/stm32/boards/B_L072Z_LRWAN1/mpconfigboard.h b/ports/stm32/boards/B_L072Z_LRWAN1/mpconfigboard.h
index d4996e6c74d65..dfcca72afb55c 100644
--- a/ports/stm32/boards/B_L072Z_LRWAN1/mpconfigboard.h
+++ b/ports/stm32/boards/B_L072Z_LRWAN1/mpconfigboard.h
@@ -11,7 +11,6 @@
 #define MICROPY_PY_BUILTINS_COMPLEX (0)
 #define MICROPY_PY_GENERATOR_PEND_THROW (0)
 #define MICROPY_PY_MATH             (0)
-#define MICROPY_PY_IO_FILEIO        (0)
 #define MICROPY_PY_FRAMEBUF         (0)
 #define MICROPY_PY_USOCKET          (0)
 #define MICROPY_PY_NETWORK          (0)
diff --git a/ports/stm32/boards/NUCLEO_F091RC/mpconfigboard.h b/ports/stm32/boards/NUCLEO_F091RC/mpconfigboard.h
index a68b939939c17..d44bfb0bb663b 100644
--- a/ports/stm32/boards/NUCLEO_F091RC/mpconfigboard.h
+++ b/ports/stm32/boards/NUCLEO_F091RC/mpconfigboard.h
@@ -5,7 +5,6 @@
 #define MICROPY_EMIT_INLINE_THUMB   (0)
 #define MICROPY_OPT_COMPUTED_GOTO   (0)
 #define MICROPY_PY_BUILTINS_COMPLEX (0)
-#define MICROPY_PY_IO_FILEIO        (0)
 #define MICROPY_PY_USOCKET          (0)
 #define MICROPY_PY_NETWORK          (0)
 #define MICROPY_PY_STM              (0)
diff --git a/ports/stm32/boards/NUCLEO_L073RZ/mpconfigboard.h b/ports/stm32/boards/NUCLEO_L073RZ/mpconfigboard.h
index 9af925d45196c..c8c809eb4899e 100644
--- a/ports/stm32/boards/NUCLEO_L073RZ/mpconfigboard.h
+++ b/ports/stm32/boards/NUCLEO_L073RZ/mpconfigboard.h
@@ -11,7 +11,6 @@
 #define MICROPY_PY_BUILTINS_COMPLEX (0)
 #define MICROPY_PY_GENERATOR_PEND_THROW (0)
 #define MICROPY_PY_MATH             (0)
-#define MICROPY_PY_IO_FILEIO        (0)
 #define MICROPY_PY_FRAMEBUF         (0)
 #define MICROPY_PY_USOCKET          (0)
 #define MICROPY_PY_NETWORK          (0)
diff --git a/ports/unix/mpconfigport.h b/ports/unix/mpconfigport.h
index 5545a74f57cc5..03b8ceb1f6f9d 100644
--- a/ports/unix/mpconfigport.h
+++ b/ports/unix/mpconfigport.h
@@ -87,7 +87,6 @@
 #define MICROPY_PY_MATH_ISCLOSE                 (MICROPY_PY_MATH_SPECIAL_FUNCTIONS)
 #define MICROPY_PY_CMATH                        (1)
 #define MICROPY_PY_IO_IOBASE                    (1)
-#define MICROPY_PY_IO_FILEIO                    (1)
 #define MICROPY_PY_SYS_MAXSIZE                  (1)
 #define MICROPY_PY_SYS_STDFILES                 (1)
 #define MICROPY_PY_UERRNO                       (1)
diff --git a/ports/unix/variants/minimal/mpconfigvariant.h b/ports/unix/variants/minimal/mpconfigvariant.h
index d6e5fc47262e9..2e2c1de0cc87e 100644
--- a/ports/unix/variants/minimal/mpconfigvariant.h
+++ b/ports/unix/variants/minimal/mpconfigvariant.h
@@ -86,7 +86,6 @@
 #define MICROPY_PY_MATH             (0)
 #define MICROPY_PY_CMATH            (0)
 #define MICROPY_PY_IO               (0)
-#define MICROPY_PY_IO_FILEIO        (0)
 #define MICROPY_PY_STRUCT           (0)
 #define MICROPY_PY_SYS              (1)
 #define MICROPY_PY_SYS_EXIT         (0)
diff --git a/ports/windows/mpconfigport.h b/ports/windows/mpconfigport.h
index 4ed9f316e7bbf..8967242aee5fc 100644
--- a/ports/windows/mpconfigport.h
+++ b/ports/windows/mpconfigport.h
@@ -125,7 +125,6 @@
 #define MICROPY_PY_MATH_ISCLOSE     (MICROPY_PY_MATH_SPECIAL_FUNCTIONS)
 #define MICROPY_PY_CMATH            (1)
 #define MICROPY_PY_IO_IOBASE        (1)
-#define MICROPY_PY_IO_FILEIO        (1)
 #define MICROPY_PY_GC_COLLECT_RETVAL (1)
 #ifndef MICROPY_STACKLESS
 #define MICROPY_STACKLESS           (0)
diff --git a/py/mpconfig.h b/py/mpconfig.h
index 1ed34bb6fdae0..d478c654d021d 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -1321,11 +1321,6 @@ typedef double mp_float_t;
 #define MICROPY_PY_IO_IOBASE (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
 #endif
 
-// Whether to provide "io.FileIO" class
-#ifndef MICROPY_PY_IO_FILEIO
-#define MICROPY_PY_IO_FILEIO (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
-#endif
-
 // Whether to provide "io.BytesIO" class
 #ifndef MICROPY_PY_IO_BYTESIO
 #define MICROPY_PY_IO_BYTESIO (1)

From a311e9e3d419cf447c8a4cf2beed4a341e8387e3 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Thu, 18 Aug 2022 12:32:10 +1000
Subject: [PATCH 2490/3533] tools/mpremote: Allow + terminator for fs commands.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 docs/reference/mpremote.rst     |  5 +++++
 tools/mpremote/mpremote/main.py | 34 ++++++++++++++++++++++++---------
 2 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/docs/reference/mpremote.rst b/docs/reference/mpremote.rst
index 2bbed56b89144..80290657f4c35 100644
--- a/docs/reference/mpremote.rst
+++ b/docs/reference/mpremote.rst
@@ -30,6 +30,9 @@ For REPL access, running ``mpremote`` without any arguments is usually all that
 is needed.  ``mpremote`` also supports a set of commands given at the command
 line which will perform various actions on remote MicroPython devices.
 
+For commands that support multiple arguments (e.g. a list of files), the
+argument list can be terminated with ``+``.
+
 The full list of supported commands are:
 
 - connect to a specified device via a device-name shortcut:
@@ -248,3 +251,5 @@ Examples
   mpremote cp main.py :
 
   mpremote cp -r dir/ :
+
+  mpremote cp a.py b.py : + repl
diff --git a/tools/mpremote/mpremote/main.py b/tools/mpremote/mpremote/main.py
index e0266fd71901c..73cd5e153bc73 100644
--- a/tools/mpremote/mpremote/main.py
+++ b/tools/mpremote/mpremote/main.py
@@ -300,6 +300,19 @@ def show_progress_bar(size, total_size):
         )
 
 
+# Get all args up to the terminator ("+").
+# The passed args will be updated with these ones removed.
+def get_fs_args(args):
+    n = 0
+    for src in args:
+        if src == "+":
+            break
+        n += 1
+    fs_args = args[:n]
+    args[:] = args[n + 1 :]
+    return fs_args
+
+
 def do_filesystem(pyb, args):
     def _list_recursive(files, path):
         if os.path.isdir(path):
@@ -308,16 +321,18 @@ def _list_recursive(files, path):
         else:
             files.append(os.path.split(path))
 
+    fs_args = get_fs_args(args)
+
     # Don't be verbose when using cat, so output can be redirected to something.
-    verbose = args[0] != "cat"
+    verbose = fs_args[0] != "cat"
 
-    if args[0] == "cp" and args[1] == "-r":
-        args.pop(0)
-        args.pop(0)
-        assert args[-1] == ":"
-        args.pop()
+    if fs_args[0] == "cp" and fs_args[1] == "-r":
+        fs_args.pop(0)
+        fs_args.pop(0)
+        assert fs_args[-1] == ":"
+        fs_args.pop()
         src_files = []
-        for path in args:
+        for path in fs_args:
             _list_recursive(src_files, path)
         known_dirs = {""}
         pyb.exec_("import uos")
@@ -335,8 +350,9 @@ def _list_recursive(files, path):
                 verbose=verbose,
             )
     else:
-        pyboard.filesystem_command(pyb, args, progress_callback=show_progress_bar, verbose=verbose)
-    args.clear()
+        pyboard.filesystem_command(
+            pyb, fs_args, progress_callback=show_progress_bar, verbose=verbose
+        )
 
 
 def do_repl_main_loop(pyb, console_in, console_out_write, *, code_to_inject, file_to_inject):

From 263737ecfea6ec1049ef3aff37913866ebd463e5 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Thu, 18 Aug 2022 12:34:15 +1000
Subject: [PATCH 2491/3533] tools/pyboard.py: Add "touch" filesystem command.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 docs/reference/mpremote.rst   | 5 +++--
 docs/reference/pyboard.py.rst | 5 +++--
 tools/pyboard.py              | 8 ++++++--
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/docs/reference/mpremote.rst b/docs/reference/mpremote.rst
index 80290657f4c35..3927c9badf1f5 100644
--- a/docs/reference/mpremote.rst
+++ b/docs/reference/mpremote.rst
@@ -131,6 +131,7 @@ The full list of supported commands are:
   - ``rm <src...>`` to remove files on the device
   - ``mkdir <dirs...>`` to create directories on the device
   - ``rmdir <dirs...>`` to remove directories on the device
+  - ``touch <file..>`` to create the files (if they don't already exist)
 
 - mount the local directory on the remote device:
 
@@ -192,8 +193,8 @@ Shortcuts can be defined using the macro system.  Built-in shortcuts are::
 
 - ``c0``, ``c1``, ``c2``, ``c3``: connect to COM?
 
-- ``cat``, ``ls``, ``cp``, ``rm``, ``mkdir``, ``rmdir``, ``df``: filesystem
-  commands
+- ``cat``, ``ls``, ``cp``, ``rm``, ``mkdir``, ``rmdir``, ``touch``, ``df``:
+  filesystem commands
 
 - ``reset``: reset the device
 
diff --git a/docs/reference/pyboard.py.rst b/docs/reference/pyboard.py.rst
index 4fedbb7aab9a3..a06ffdcd8fa96 100644
--- a/docs/reference/pyboard.py.rst
+++ b/docs/reference/pyboard.py.rst
@@ -92,12 +92,13 @@ Filesystem access
 
 Using the ``-f`` flag, the following filesystem operations are supported:
 
-* ``cp src [src...] dest`` Copy files to/from the device.
 * ``cat path`` Print the contents of a file on the device.
+* ``cp src [src...] dest`` Copy files to/from the device.
 * ``ls [path]`` List contents of a directory (defaults to current working directory).
-* ``rm path`` Remove a file.
 * ``mkdir path`` Create a directory.
+* ``rm path`` Remove a file.
 * ``rmdir path`` Remove a directory.
+* ``touch path`` Create a file if it doesn't already exist.
 
 The ``cp`` command uses a ``ssh``-like convention for referring to local and
 remote files. Any path starting with a ``:`` will be interpreted as on the
diff --git a/tools/pyboard.py b/tools/pyboard.py
index 7d0ab6bcd703c..7525049875879 100755
--- a/tools/pyboard.py
+++ b/tools/pyboard.py
@@ -543,6 +543,9 @@ def fs_rmdir(self, dir):
     def fs_rm(self, src):
         self.exec_("import uos\nuos.remove('%s')" % src)
 
+    def fs_touch(self, src):
+        self.exec_("f=open('%s','a')\nf.close()" % src)
+
 
 # in Python2 exec is a keyword so one must use "exec_"
 # but for Python3 we want to provide the nicer version "exec"
@@ -595,11 +598,12 @@ def fname_cp_dest(src, dest):
                 op(src, dest2, progress_callback=progress_callback)
         else:
             op = {
-                "ls": pyb.fs_ls,
                 "cat": pyb.fs_cat,
+                "ls": pyb.fs_ls,
                 "mkdir": pyb.fs_mkdir,
-                "rmdir": pyb.fs_rmdir,
                 "rm": pyb.fs_rm,
+                "rmdir": pyb.fs_rmdir,
+                "touch": pyb.fs_touch,
             }[cmd]
             if cmd == "ls" and not args:
                 args = [""]

From 59e3348c101efee4071dd2224d01ccce6075b692 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Thu, 18 Aug 2022 12:36:42 +1000
Subject: [PATCH 2492/3533] tools/mpremote: Add "edit" command.

This allows a remote file to be edited locally by copying it over, running
the local editor, then copying it back.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 docs/reference/mpremote.rst     | 11 +++++++++++
 tools/mpremote/mpremote/main.py | 23 +++++++++++++++++++++++
 2 files changed, 34 insertions(+)

diff --git a/docs/reference/mpremote.rst b/docs/reference/mpremote.rst
index 3927c9badf1f5..eb0233bddae48 100644
--- a/docs/reference/mpremote.rst
+++ b/docs/reference/mpremote.rst
@@ -133,6 +133,17 @@ The full list of supported commands are:
   - ``rmdir <dirs...>`` to remove directories on the device
   - ``touch <file..>`` to create the files (if they don't already exist)
 
+- edit a file on the device:
+
+  .. code-block:: bash
+
+      $ mpremote edit <files...>
+
+  The ``edit`` command will copy each file from the device to a local temporary
+  directory and then launch your editor for each file (defined by the environment
+  variable ``$EDITOR``). If the editor exits successfully, the updated file will
+  be copied back to the device.
+
 - mount the local directory on the remote device:
 
   .. code-block:: bash
diff --git a/tools/mpremote/mpremote/main.py b/tools/mpremote/mpremote/main.py
index 73cd5e153bc73..e614156dbf78c 100644
--- a/tools/mpremote/mpremote/main.py
+++ b/tools/mpremote/mpremote/main.py
@@ -19,6 +19,7 @@
 
 import os, sys
 from collections.abc import Mapping
+import tempfile
 from textwrap import dedent
 
 import serial.tools.list_ports
@@ -28,6 +29,7 @@
 
 _PROG = "mpremote"
 
+# (need_raw_repl, is_action, num_args_min, help_text)
 _COMMANDS = {
     "connect": (
         False,
@@ -39,6 +41,7 @@
         or any valid device name/path""",
     ),
     "disconnect": (False, False, 0, "disconnect current device"),
+    "edit": (True, True, 1, "edit files on the device"),
     "resume": (False, False, 0, "resume a previous mpremote session (will not auto soft-reset)"),
     "soft-reset": (False, True, 0, "perform a soft-reset of the device"),
     "mount": (
@@ -82,6 +85,7 @@
     "ls": "fs ls",
     "cp": "fs cp",
     "rm": "fs rm",
+    "touch": "fs touch",
     "mkdir": "fs mkdir",
     "rmdir": "fs rmdir",
     "df": [
@@ -355,6 +359,23 @@ def _list_recursive(files, path):
         )
 
 
+def do_edit(pyb, args):
+    if not os.getenv("EDITOR"):
+        raise pyboard.PyboardError("edit: $EDITOR not set")
+    for src in get_fs_args(args):
+        src = src.lstrip(":")
+        dest_fd, dest = tempfile.mkstemp(suffix=os.path.basename(src))
+        try:
+            print("edit :%s" % (src,))
+            os.close(dest_fd)
+            pyb.fs_touch(src)
+            pyb.fs_get(src, dest, progress_callback=show_progress_bar)
+            if os.system("$EDITOR '%s'" % (dest,)) == 0:
+                pyb.fs_put(dest, src, progress_callback=show_progress_bar)
+        finally:
+            os.unlink(dest)
+
+
 def do_repl_main_loop(pyb, console_in, console_out_write, *, code_to_inject, file_to_inject):
     while True:
         console_in.waitchar(pyb.serial)
@@ -587,6 +608,8 @@ def main():
                     return ret
             elif cmd == "fs":
                 do_filesystem(pyb, args)
+            elif cmd == "edit":
+                do_edit(pyb, args)
             elif cmd == "repl":
                 do_repl(pyb, args)
 

From 470a44bd3ade45fd10d63aabfb14c3696b60e251 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Fri, 12 Aug 2022 16:47:02 +1000
Subject: [PATCH 2493/3533] extmod/modframebuf: Optimise argument handling.

Several methods extract mp_int_t from adjacent arguments. This reduces
code size for the repeated calls to mp_obj_get_int.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 extmod/modframebuf.c | 165 ++++++++++++++++++++-----------------------
 1 file changed, 77 insertions(+), 88 deletions(-)

diff --git a/extmod/modframebuf.c b/extmod/modframebuf.c
index 5b6575d5a6503..fe32e44a26261 100644
--- a/extmod/modframebuf.c
+++ b/extmod/modframebuf.c
@@ -263,21 +263,21 @@ STATIC void fill_rect(const mp_obj_framebuf_t *fb, int x, int y, int w, int h, u
     formats[fb->format].fill_rect(fb, x, y, xend - x, yend - y, col);
 }
 
-STATIC mp_obj_t framebuf_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
+STATIC mp_obj_t framebuf_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args_in) {
     mp_arg_check_num(n_args, n_kw, 4, 5, false);
 
     mp_obj_framebuf_t *o = mp_obj_malloc(mp_obj_framebuf_t, type);
-    o->buf_obj = args[0];
+    o->buf_obj = args_in[0];
 
     mp_buffer_info_t bufinfo;
-    mp_get_buffer_raise(args[0], &bufinfo, MP_BUFFER_WRITE);
+    mp_get_buffer_raise(args_in[0], &bufinfo, MP_BUFFER_WRITE);
     o->buf = bufinfo.buf;
 
-    o->width = mp_obj_get_int(args[1]);
-    o->height = mp_obj_get_int(args[2]);
-    o->format = mp_obj_get_int(args[3]);
+    o->width = mp_obj_get_int(args_in[1]);
+    o->height = mp_obj_get_int(args_in[2]);
+    o->format = mp_obj_get_int(args_in[3]);
     if (n_args >= 5) {
-        o->stride = mp_obj_get_int(args[4]);
+        o->stride = mp_obj_get_int(args_in[4]);
     } else {
         o->stride = o->width;
     }
@@ -305,6 +305,12 @@ STATIC mp_obj_t framebuf_make_new(const mp_obj_type_t *type, size_t n_args, size
     return MP_OBJ_FROM_PTR(o);
 }
 
+STATIC void framebuf_args(const mp_obj_t *args_in, mp_int_t *args_out, int n) {
+    for (int i = 0; i < n; ++i) {
+        args_out[i] = mp_obj_get_int(args_in[i + 1]);
+    }
+}
+
 STATIC mp_int_t framebuf_get_buffer(mp_obj_t self_in, mp_buffer_info_t *bufinfo, mp_uint_t flags) {
     (void)flags;
     mp_obj_framebuf_t *self = MP_OBJ_TO_PTR(self_in);
@@ -322,98 +328,71 @@ STATIC mp_obj_t framebuf_fill(mp_obj_t self_in, mp_obj_t col_in) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_2(framebuf_fill_obj, framebuf_fill);
 
-STATIC mp_obj_t framebuf_fill_rect(size_t n_args, const mp_obj_t *args) {
-    (void)n_args;
-
-    mp_obj_framebuf_t *self = MP_OBJ_TO_PTR(args[0]);
-    mp_int_t x = mp_obj_get_int(args[1]);
-    mp_int_t y = mp_obj_get_int(args[2]);
-    mp_int_t width = mp_obj_get_int(args[3]);
-    mp_int_t height = mp_obj_get_int(args[4]);
-    mp_int_t col = mp_obj_get_int(args[5]);
-
-    fill_rect(self, x, y, width, height, col);
-
+STATIC mp_obj_t framebuf_fill_rect(size_t n_args, const mp_obj_t *args_in) {
+    mp_obj_framebuf_t *self = MP_OBJ_TO_PTR(args_in[0]);
+    mp_int_t args[5]; // x, y, w, h, col
+    framebuf_args(args_in, args, 5);
+    fill_rect(self, args[0], args[1], args[2], args[3], args[4]);
     return mp_const_none;
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(framebuf_fill_rect_obj, 6, 6, framebuf_fill_rect);
 
-STATIC mp_obj_t framebuf_pixel(size_t n_args, const mp_obj_t *args) {
-    mp_obj_framebuf_t *self = MP_OBJ_TO_PTR(args[0]);
-    mp_int_t x = mp_obj_get_int(args[1]);
-    mp_int_t y = mp_obj_get_int(args[2]);
+STATIC mp_obj_t framebuf_pixel(size_t n_args, const mp_obj_t *args_in) {
+    mp_obj_framebuf_t *self = MP_OBJ_TO_PTR(args_in[0]);
+    mp_int_t x = mp_obj_get_int(args_in[1]);
+    mp_int_t y = mp_obj_get_int(args_in[2]);
     if (0 <= x && x < self->width && 0 <= y && y < self->height) {
         if (n_args == 3) {
             // get
             return MP_OBJ_NEW_SMALL_INT(getpixel(self, x, y));
         } else {
             // set
-            setpixel(self, x, y, mp_obj_get_int(args[3]));
+            setpixel(self, x, y, mp_obj_get_int(args_in[3]));
         }
     }
     return mp_const_none;
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(framebuf_pixel_obj, 3, 4, framebuf_pixel);
 
-STATIC mp_obj_t framebuf_hline(size_t n_args, const mp_obj_t *args) {
+STATIC mp_obj_t framebuf_hline(size_t n_args, const mp_obj_t *args_in) {
     (void)n_args;
 
-    mp_obj_framebuf_t *self = MP_OBJ_TO_PTR(args[0]);
-    mp_int_t x = mp_obj_get_int(args[1]);
-    mp_int_t y = mp_obj_get_int(args[2]);
-    mp_int_t w = mp_obj_get_int(args[3]);
-    mp_int_t col = mp_obj_get_int(args[4]);
+    mp_obj_framebuf_t *self = MP_OBJ_TO_PTR(args_in[0]);
+    mp_int_t args[4]; // x, y, w, col
+    framebuf_args(args_in, args, 4);
 
-    fill_rect(self, x, y, w, 1, col);
+    fill_rect(self, args[0], args[1], args[2], 1, args[3]);
 
     return mp_const_none;
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(framebuf_hline_obj, 5, 5, framebuf_hline);
 
-STATIC mp_obj_t framebuf_vline(size_t n_args, const mp_obj_t *args) {
+STATIC mp_obj_t framebuf_vline(size_t n_args, const mp_obj_t *args_in) {
     (void)n_args;
 
-    mp_obj_framebuf_t *self = MP_OBJ_TO_PTR(args[0]);
-    mp_int_t x = mp_obj_get_int(args[1]);
-    mp_int_t y = mp_obj_get_int(args[2]);
-    mp_int_t h = mp_obj_get_int(args[3]);
-    mp_int_t col = mp_obj_get_int(args[4]);
+    mp_obj_framebuf_t *self = MP_OBJ_TO_PTR(args_in[0]);
+    mp_int_t args[4]; // x, y, h, col
+    framebuf_args(args_in, args, 4);
 
-    fill_rect(self, x, y, 1, h, col);
+    fill_rect(self, args[0], args[1], 1, args[2], args[3]);
 
     return mp_const_none;
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(framebuf_vline_obj, 5, 5, framebuf_vline);
 
-STATIC mp_obj_t framebuf_rect(size_t n_args, const mp_obj_t *args) {
-    (void)n_args;
-
-    mp_obj_framebuf_t *self = MP_OBJ_TO_PTR(args[0]);
-    mp_int_t x = mp_obj_get_int(args[1]);
-    mp_int_t y = mp_obj_get_int(args[2]);
-    mp_int_t w = mp_obj_get_int(args[3]);
-    mp_int_t h = mp_obj_get_int(args[4]);
-    mp_int_t col = mp_obj_get_int(args[5]);
-
-    fill_rect(self, x, y, w, 1, col);
-    fill_rect(self, x, y + h - 1, w, 1, col);
-    fill_rect(self, x, y, 1, h, col);
-    fill_rect(self, x + w - 1, y, 1, h, col);
-
+STATIC mp_obj_t framebuf_rect(size_t n_args, const mp_obj_t *args_in) {
+    mp_obj_framebuf_t *self = MP_OBJ_TO_PTR(args_in[0]);
+    mp_int_t args[5]; // x, y, w, h, col
+    framebuf_args(args_in, args, 5);
+    fill_rect(self, args[0], args[1], args[2], 1, args[4]);
+    fill_rect(self, args[0], args[1] + args[3] - 1, args[2], 1, args[4]);
+    fill_rect(self, args[0], args[1], 1, args[3], args[4]);
+    fill_rect(self, args[0] + args[2] - 1, args[1], 1, args[3], args[4]);
     return mp_const_none;
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(framebuf_rect_obj, 6, 6, framebuf_rect);
 
-STATIC mp_obj_t framebuf_line(size_t n_args, const mp_obj_t *args) {
-    (void)n_args;
-
-    mp_obj_framebuf_t *self = MP_OBJ_TO_PTR(args[0]);
-    mp_int_t x1 = mp_obj_get_int(args[1]);
-    mp_int_t y1 = mp_obj_get_int(args[2]);
-    mp_int_t x2 = mp_obj_get_int(args[3]);
-    mp_int_t y2 = mp_obj_get_int(args[4]);
-    mp_int_t col = mp_obj_get_int(args[5]);
-
+STATIC void line(const mp_obj_framebuf_t *fb, mp_int_t x1, mp_int_t y1, mp_int_t x2, mp_int_t y2, mp_int_t col) {
     mp_int_t dx = x2 - x1;
     mp_int_t sx;
     if (dx > 0) {
@@ -452,12 +431,12 @@ STATIC mp_obj_t framebuf_line(size_t n_args, const mp_obj_t *args) {
     mp_int_t e = 2 * dy - dx;
     for (mp_int_t i = 0; i < dx; ++i) {
         if (steep) {
-            if (0 <= y1 && y1 < self->width && 0 <= x1 && x1 < self->height) {
-                setpixel(self, y1, x1, col);
+            if (0 <= y1 && y1 < fb->width && 0 <= x1 && x1 < fb->height) {
+                setpixel(fb, y1, x1, col);
             }
         } else {
-            if (0 <= x1 && x1 < self->width && 0 <= y1 && y1 < self->height) {
-                setpixel(self, x1, y1, col);
+            if (0 <= x1 && x1 < fb->width && 0 <= y1 && y1 < fb->height) {
+                setpixel(fb, x1, y1, col);
             }
         }
         while (e >= 0) {
@@ -468,31 +447,41 @@ STATIC mp_obj_t framebuf_line(size_t n_args, const mp_obj_t *args) {
         e += 2 * dy;
     }
 
-    if (0 <= x2 && x2 < self->width && 0 <= y2 && y2 < self->height) {
-        setpixel(self, x2, y2, col);
+    if (0 <= x2 && x2 < fb->width && 0 <= y2 && y2 < fb->height) {
+        setpixel(fb, x2, y2, col);
     }
+}
+
+STATIC mp_obj_t framebuf_line(size_t n_args, const mp_obj_t *args_in) {
+    (void)n_args;
+
+    mp_obj_framebuf_t *self = MP_OBJ_TO_PTR(args_in[0]);
+    mp_int_t args[5]; // x1, y1, x2, y2, col
+    framebuf_args(args_in, args, 5);
+
+    line(self, args[0], args[1], args[2], args[3], args[4]);
 
     return mp_const_none;
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(framebuf_line_obj, 6, 6, framebuf_line);
 
-STATIC mp_obj_t framebuf_blit(size_t n_args, const mp_obj_t *args) {
-    mp_obj_framebuf_t *self = MP_OBJ_TO_PTR(args[0]);
-    mp_obj_t source_in = mp_obj_cast_to_native_base(args[1], MP_OBJ_FROM_PTR(&mp_type_framebuf));
+STATIC mp_obj_t framebuf_blit(size_t n_args, const mp_obj_t *args_in) {
+    mp_obj_framebuf_t *self = MP_OBJ_TO_PTR(args_in[0]);
+    mp_obj_t source_in = mp_obj_cast_to_native_base(args_in[1], MP_OBJ_FROM_PTR(&mp_type_framebuf));
     if (source_in == MP_OBJ_NULL) {
         mp_raise_TypeError(NULL);
     }
     mp_obj_framebuf_t *source = MP_OBJ_TO_PTR(source_in);
 
-    mp_int_t x = mp_obj_get_int(args[2]);
-    mp_int_t y = mp_obj_get_int(args[3]);
+    mp_int_t x = mp_obj_get_int(args_in[2]);
+    mp_int_t y = mp_obj_get_int(args_in[3]);
     mp_int_t key = -1;
     if (n_args > 4) {
-        key = mp_obj_get_int(args[4]);
+        key = mp_obj_get_int(args_in[4]);
     }
     mp_obj_framebuf_t *palette = NULL;
-    if (n_args > 5 && args[5] != mp_const_none) {
-        palette = MP_OBJ_TO_PTR(mp_obj_cast_to_native_base(args[5], MP_OBJ_FROM_PTR(&mp_type_framebuf)));
+    if (n_args > 5 && args_in[5] != mp_const_none) {
+        palette = MP_OBJ_TO_PTR(mp_obj_cast_to_native_base(args_in[5], MP_OBJ_FROM_PTR(&mp_type_framebuf)));
     }
 
     if (
@@ -563,15 +552,15 @@ STATIC mp_obj_t framebuf_scroll(mp_obj_t self_in, mp_obj_t xstep_in, mp_obj_t ys
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_3(framebuf_scroll_obj, framebuf_scroll);
 
-STATIC mp_obj_t framebuf_text(size_t n_args, const mp_obj_t *args) {
+STATIC mp_obj_t framebuf_text(size_t n_args, const mp_obj_t *args_in) {
     // extract arguments
-    mp_obj_framebuf_t *self = MP_OBJ_TO_PTR(args[0]);
-    const char *str = mp_obj_str_get_str(args[1]);
-    mp_int_t x0 = mp_obj_get_int(args[2]);
-    mp_int_t y0 = mp_obj_get_int(args[3]);
+    mp_obj_framebuf_t *self = MP_OBJ_TO_PTR(args_in[0]);
+    const char *str = mp_obj_str_get_str(args_in[1]);
+    mp_int_t x0 = mp_obj_get_int(args_in[2]);
+    mp_int_t y0 = mp_obj_get_int(args_in[3]);
     mp_int_t col = 1;
     if (n_args >= 5) {
-        col = mp_obj_get_int(args[4]);
+        col = mp_obj_get_int(args_in[4]);
     }
 
     // loop over chars
@@ -626,18 +615,18 @@ STATIC const mp_obj_type_t mp_type_framebuf = {
 #endif
 
 // this factory function is provided for backwards compatibility with old FrameBuffer1 class
-STATIC mp_obj_t legacy_framebuffer1(size_t n_args, const mp_obj_t *args) {
+STATIC mp_obj_t legacy_framebuffer1(size_t n_args, const mp_obj_t *args_in) {
     mp_obj_framebuf_t *o = mp_obj_malloc(mp_obj_framebuf_t, &mp_type_framebuf);
 
     mp_buffer_info_t bufinfo;
-    mp_get_buffer_raise(args[0], &bufinfo, MP_BUFFER_WRITE);
+    mp_get_buffer_raise(args_in[0], &bufinfo, MP_BUFFER_WRITE);
     o->buf = bufinfo.buf;
 
-    o->width = mp_obj_get_int(args[1]);
-    o->height = mp_obj_get_int(args[2]);
+    o->width = mp_obj_get_int(args_in[1]);
+    o->height = mp_obj_get_int(args_in[2]);
     o->format = FRAMEBUF_MVLSB;
     if (n_args >= 4) {
-        o->stride = mp_obj_get_int(args[3]);
+        o->stride = mp_obj_get_int(args_in[3]);
     } else {
         o->stride = o->width;
     }

From af1f167820e685390d43dd7e250a0ffa078e138d Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Sat, 13 Aug 2022 00:46:00 +1000
Subject: [PATCH 2494/3533] py/dynruntime: Add mp_obj_is_true.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 py/dynruntime.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/py/dynruntime.h b/py/dynruntime.h
index e3200a271954e..fb748eb93fe78 100644
--- a/py/dynruntime.h
+++ b/py/dynruntime.h
@@ -127,6 +127,7 @@ static inline void *m_realloc_dyn(void *ptr, size_t new_num_bytes) {
 #define mp_obj_str_get_data(o, len)         (mp_obj_str_get_data_dyn((o), (len)))
 #define mp_get_buffer_raise(o, bufinfo, fl) (mp_fun_table.get_buffer_raise((o), (bufinfo), (fl)))
 #define mp_get_stream_raise(s, flags)       (mp_fun_table.get_stream_raise((s), (flags)))
+#define mp_obj_is_true(o)                   (mp_fun_table.native_from_obj(o, MP_NATIVE_TYPE_BOOL))
 
 #define mp_obj_len(o)                       (mp_obj_len_dyn(o))
 #define mp_obj_subscr(base, index, val)     (mp_fun_table.obj_subscr((base), (index), (val)))

From 127b340438cddd55748e066cacbc1ab64131e232 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Fri, 12 Aug 2022 16:34:51 +1000
Subject: [PATCH 2495/3533] extmod/modframebuf: Add fill argument to rect().

We plan to add `ellipse` and `poly` methods, but rather than having to
implement a `fill_xyz` version of each, we can make them take an optional
fill argument. This commit add this to `rect` as a starting point.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 docs/library/framebuf.rst | 10 +++++-----
 extmod/modframebuf.c      | 14 +++++++++-----
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/docs/library/framebuf.rst b/docs/library/framebuf.rst
index 098ada8153847..7024616653422 100644
--- a/docs/library/framebuf.rst
+++ b/docs/library/framebuf.rst
@@ -77,12 +77,12 @@ The following methods draw shapes onto the FrameBuffer.
     methods draw horizontal and vertical lines respectively up to
     a given length.
 
-.. method:: FrameBuffer.rect(x, y, w, h, c)
-.. method:: FrameBuffer.fill_rect(x, y, w, h, c)
+.. method:: FrameBuffer.rect(x, y, w, h, c[, f])
 
-    Draw a rectangle at the given location, size and color. The `rect`
-    method draws only a 1 pixel outline whereas the `fill_rect` method
-    draws both the outline and interior.
+    Draw a rectangle at the given location, size and color.
+
+    The optional *f* parameter can be set to ``True`` to fill the rectangle.
+    Otherwise just a one pixel outline is drawn.
 
 Drawing text
 ------------
diff --git a/extmod/modframebuf.c b/extmod/modframebuf.c
index fe32e44a26261..590bd085459b7 100644
--- a/extmod/modframebuf.c
+++ b/extmod/modframebuf.c
@@ -384,13 +384,17 @@ STATIC mp_obj_t framebuf_rect(size_t n_args, const mp_obj_t *args_in) {
     mp_obj_framebuf_t *self = MP_OBJ_TO_PTR(args_in[0]);
     mp_int_t args[5]; // x, y, w, h, col
     framebuf_args(args_in, args, 5);
-    fill_rect(self, args[0], args[1], args[2], 1, args[4]);
-    fill_rect(self, args[0], args[1] + args[3] - 1, args[2], 1, args[4]);
-    fill_rect(self, args[0], args[1], 1, args[3], args[4]);
-    fill_rect(self, args[0] + args[2] - 1, args[1], 1, args[3], args[4]);
+    if (n_args > 6 && mp_obj_is_true(args_in[6])) {
+        fill_rect(self, args[0], args[1], args[2], args[3], args[4]);
+    } else {
+        fill_rect(self, args[0], args[1], args[2], 1, args[4]);
+        fill_rect(self, args[0], args[1] + args[3] - 1, args[2], 1, args[4]);
+        fill_rect(self, args[0], args[1], 1, args[3], args[4]);
+        fill_rect(self, args[0] + args[2] - 1, args[1], 1, args[3], args[4]);
+    }
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(framebuf_rect_obj, 6, 6, framebuf_rect);
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(framebuf_rect_obj, 6, 7, framebuf_rect);
 
 STATIC void line(const mp_obj_framebuf_t *fb, mp_int_t x1, mp_int_t y1, mp_int_t x2, mp_int_t y2, mp_int_t col) {
     mp_int_t dx = x2 - x1;

From 42ec9703a07d1d0b55091f5557ff5f81c5134fb8 Mon Sep 17 00:00:00 2001
From: Peter Hinch <peter@hinch.me.uk>
Date: Wed, 10 Aug 2022 14:51:19 +0100
Subject: [PATCH 2496/3533] extmod/modframebuf: Add ellipse drawing method.

---
 docs/library/framebuf.rst            |  18 +-
 examples/natmod/framebuf/framebuf.c  |   9 +-
 extmod/modframebuf.c                 |  95 ++++
 tests/extmod/framebuf_ellipse.py     |  65 +++
 tests/extmod/framebuf_ellipse.py.exp | 704 +++++++++++++++++++++++++++
 5 files changed, 885 insertions(+), 6 deletions(-)
 create mode 100644 tests/extmod/framebuf_ellipse.py
 create mode 100644 tests/extmod/framebuf_ellipse.py.exp

diff --git a/docs/library/framebuf.rst b/docs/library/framebuf.rst
index 7024616653422..1e23abd0f1b50 100644
--- a/docs/library/framebuf.rst
+++ b/docs/library/framebuf.rst
@@ -11,8 +11,8 @@ class FrameBuffer
 -----------------
 
 The FrameBuffer class provides a pixel buffer which can be drawn upon with
-pixels, lines, rectangles, text and even other FrameBuffer's. It is useful
-when generating output for displays.
+pixels, lines, rectangles, ellipses, text and even other FrameBuffers. It is
+useful when generating output for displays.
 
 For example::
 
@@ -84,6 +84,20 @@ The following methods draw shapes onto the FrameBuffer.
     The optional *f* parameter can be set to ``True`` to fill the rectangle.
     Otherwise just a one pixel outline is drawn.
 
+.. method:: FrameBuffer.ellipse(x, y, xr, yr, c[, f, m])
+
+    Draw an ellipse at the given location. Radii *xr* and *yr* define the
+    geometry; equal values cause a circle to be drawn. The *c* parameter
+    defines the color.
+
+    The optional *f* parameter can be set to ``True`` to fill the ellipse.
+    Otherwise just a one pixel outline is drawn.
+
+    The optional *m* parameter enables drawing to be restricted to certain
+    quadrants of the ellipse. The LS four bits determine which quadrants are
+    to be drawn, with bit 0 specifying Q1, b1 Q2, b2 Q3 and b3 Q4. Quadrants
+    are numbered counterclockwise with Q1 being top right.
+
 Drawing text
 ------------
 
diff --git a/examples/natmod/framebuf/framebuf.c b/examples/natmod/framebuf/framebuf.c
index 8d488cffd685a..53fb90c625ada 100644
--- a/examples/natmod/framebuf/framebuf.c
+++ b/examples/natmod/framebuf/framebuf.c
@@ -12,7 +12,7 @@ mp_obj_type_t mp_type_framebuf;
 
 #include "extmod/modframebuf.c"
 
-mp_map_elem_t framebuf_locals_dict_table[10];
+mp_map_elem_t framebuf_locals_dict_table[11];
 STATIC MP_DEFINE_CONST_DICT(framebuf_locals_dict, framebuf_locals_dict_table);
 
 mp_obj_t mpy_init(mp_obj_fun_bc_t *self, size_t n_args, size_t n_kw, mp_obj_t *args) {
@@ -29,9 +29,10 @@ mp_obj_t mpy_init(mp_obj_fun_bc_t *self, size_t n_args, size_t n_kw, mp_obj_t *a
     framebuf_locals_dict_table[4] = (mp_map_elem_t){ MP_OBJ_NEW_QSTR(MP_QSTR_vline), MP_OBJ_FROM_PTR(&framebuf_vline_obj) };
     framebuf_locals_dict_table[5] = (mp_map_elem_t){ MP_OBJ_NEW_QSTR(MP_QSTR_rect), MP_OBJ_FROM_PTR(&framebuf_rect_obj) };
     framebuf_locals_dict_table[6] = (mp_map_elem_t){ MP_OBJ_NEW_QSTR(MP_QSTR_line), MP_OBJ_FROM_PTR(&framebuf_line_obj) };
-    framebuf_locals_dict_table[7] = (mp_map_elem_t){ MP_OBJ_NEW_QSTR(MP_QSTR_blit), MP_OBJ_FROM_PTR(&framebuf_blit_obj) };
-    framebuf_locals_dict_table[8] = (mp_map_elem_t){ MP_OBJ_NEW_QSTR(MP_QSTR_scroll), MP_OBJ_FROM_PTR(&framebuf_scroll_obj) };
-    framebuf_locals_dict_table[9] = (mp_map_elem_t){ MP_OBJ_NEW_QSTR(MP_QSTR_text), MP_OBJ_FROM_PTR(&framebuf_text_obj) };
+    framebuf_locals_dict_table[7] = (mp_map_elem_t){ MP_OBJ_NEW_QSTR(MP_QSTR_ellipse), MP_OBJ_FROM_PTR(&framebuf_ellipse_obj) };
+    framebuf_locals_dict_table[8] = (mp_map_elem_t){ MP_OBJ_NEW_QSTR(MP_QSTR_blit), MP_OBJ_FROM_PTR(&framebuf_blit_obj) };
+    framebuf_locals_dict_table[9] = (mp_map_elem_t){ MP_OBJ_NEW_QSTR(MP_QSTR_scroll), MP_OBJ_FROM_PTR(&framebuf_scroll_obj) };
+    framebuf_locals_dict_table[10] = (mp_map_elem_t){ MP_OBJ_NEW_QSTR(MP_QSTR_text), MP_OBJ_FROM_PTR(&framebuf_text_obj) };
     mp_type_framebuf.locals_dict = (void*)&framebuf_locals_dict;
 
     mp_store_global(MP_QSTR_FrameBuffer, MP_OBJ_FROM_PTR(&mp_type_framebuf));
diff --git a/extmod/modframebuf.c b/extmod/modframebuf.c
index 590bd085459b7..0fa91942c1a79 100644
--- a/extmod/modframebuf.c
+++ b/extmod/modframebuf.c
@@ -469,6 +469,100 @@ STATIC mp_obj_t framebuf_line(size_t n_args, const mp_obj_t *args_in) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(framebuf_line_obj, 6, 6, framebuf_line);
 
+STATIC void ellipse_pixel(const mp_obj_framebuf_t *fb, mp_int_t x, mp_int_t y, mp_int_t col, mp_int_t mask) {
+    if (mask && 0 <= x && x < fb->width && 0 <= y && y < fb->height) {
+        setpixel(fb, x, y, col);
+    }
+}
+
+// Q2 Q1
+// Q3 Q4
+#define ELLIPSE_MASK_FILL (0x10)
+#define ELLIPSE_MASK_ALL (0x0f)
+#define ELLIPSE_MASK_Q1 (0x01)
+#define ELLIPSE_MASK_Q2 (0x02)
+#define ELLIPSE_MASK_Q3 (0x04)
+#define ELLIPSE_MASK_Q4 (0x08)
+
+STATIC void draw_ellipse_points(const mp_obj_framebuf_t *fb, mp_int_t cx, mp_int_t cy, mp_int_t x, mp_int_t y, mp_int_t col, mp_int_t mask) {
+    if (mask & ELLIPSE_MASK_FILL) {
+        if (mask & ELLIPSE_MASK_Q1) {
+            fill_rect(fb, cx, cy - y, x + 1, 1, col);
+        }
+        if (mask & ELLIPSE_MASK_Q2) {
+            fill_rect(fb, cx - x, cy - y, x + 1, 1, col);
+        }
+        if (mask & ELLIPSE_MASK_Q3) {
+            fill_rect(fb, cx - x, cy + y, x + 1, 1, col);
+        }
+        if (mask & ELLIPSE_MASK_Q4) {
+            fill_rect(fb, cx, cy + y, x + 1, 1, col);
+        }
+    } else {
+        ellipse_pixel(fb, cx + x, cy - y, col, mask & ELLIPSE_MASK_Q1);
+        ellipse_pixel(fb, cx - x, cy - y, col, mask & ELLIPSE_MASK_Q2);
+        ellipse_pixel(fb, cx - x, cy + y, col, mask & ELLIPSE_MASK_Q3);
+        ellipse_pixel(fb, cx + x, cy + y, col, mask & ELLIPSE_MASK_Q4);
+    }
+}
+
+STATIC mp_obj_t framebuf_ellipse(size_t n_args, const mp_obj_t *args_in) {
+    mp_obj_framebuf_t *self = MP_OBJ_TO_PTR(args_in[0]);
+    mp_int_t args[5];
+    framebuf_args(args_in, args, 5); // cx, cy, xradius, yradius, col
+    mp_int_t mask = (n_args > 6 && mp_obj_is_true(args_in[6])) ? ELLIPSE_MASK_FILL : 0;
+    if (n_args > 7) {
+        mask |= mp_obj_get_int(args_in[7]) & ELLIPSE_MASK_ALL;
+    } else {
+        mask |= ELLIPSE_MASK_ALL;
+    }
+    mp_int_t two_asquare = 2 * args[2] * args[2];
+    mp_int_t two_bsquare = 2 * args[3] * args[3];
+    mp_int_t x = args[2];
+    mp_int_t y = 0;
+    mp_int_t xchange = args[3] * args[3] * (1 - 2 * args[2]);
+    mp_int_t ychange = args[2] * args[2];
+    mp_int_t ellipse_error = 0;
+    mp_int_t stoppingx = two_bsquare * args[2];
+    mp_int_t stoppingy = 0;
+    while (stoppingx >= stoppingy) {   // 1st set of points,  y' > -1
+        draw_ellipse_points(self, args[0], args[1], x, y, args[4], mask);
+        y += 1;
+        stoppingy += two_asquare;
+        ellipse_error += ychange;
+        ychange += two_asquare;
+        if ((2 * ellipse_error + xchange) > 0) {
+            x -= 1;
+            stoppingx -= two_bsquare;
+            ellipse_error += xchange;
+            xchange += two_bsquare;
+        }
+    }
+    // 1st point set is done start the 2nd set of points
+    x = 0;
+    y = args[3];
+    xchange = args[3] * args[3];
+    ychange = args[2] * args[2] * (1 - 2 * args[3]);
+    ellipse_error = 0;
+    stoppingx = 0;
+    stoppingy = two_asquare * args[3];
+    while (stoppingx <= stoppingy) {  // 2nd set of points, y' < -1
+        draw_ellipse_points(self, args[0], args[1], x, y, args[4], mask);
+        x += 1;
+        stoppingx += two_bsquare;
+        ellipse_error += xchange;
+        xchange += two_bsquare;
+        if ((2 * ellipse_error + ychange) > 0) {
+            y -= 1;
+            stoppingy -= two_asquare;
+            ellipse_error += ychange;
+            ychange += two_asquare;
+        }
+    }
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(framebuf_ellipse_obj, 6, 8, framebuf_ellipse);
+
 STATIC mp_obj_t framebuf_blit(size_t n_args, const mp_obj_t *args_in) {
     mp_obj_framebuf_t *self = MP_OBJ_TO_PTR(args_in[0]);
     mp_obj_t source_in = mp_obj_cast_to_native_base(args_in[1], MP_OBJ_FROM_PTR(&mp_type_framebuf));
@@ -603,6 +697,7 @@ STATIC const mp_rom_map_elem_t framebuf_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_vline), MP_ROM_PTR(&framebuf_vline_obj) },
     { MP_ROM_QSTR(MP_QSTR_rect), MP_ROM_PTR(&framebuf_rect_obj) },
     { MP_ROM_QSTR(MP_QSTR_line), MP_ROM_PTR(&framebuf_line_obj) },
+    { MP_ROM_QSTR(MP_QSTR_ellipse), MP_ROM_PTR(&framebuf_ellipse_obj) },
     { MP_ROM_QSTR(MP_QSTR_blit), MP_ROM_PTR(&framebuf_blit_obj) },
     { MP_ROM_QSTR(MP_QSTR_scroll), MP_ROM_PTR(&framebuf_scroll_obj) },
     { MP_ROM_QSTR(MP_QSTR_text), MP_ROM_PTR(&framebuf_text_obj) },
diff --git a/tests/extmod/framebuf_ellipse.py b/tests/extmod/framebuf_ellipse.py
new file mode 100644
index 0000000000000..a4c784aff8762
--- /dev/null
+++ b/tests/extmod/framebuf_ellipse.py
@@ -0,0 +1,65 @@
+try:
+    import framebuf
+except ImportError:
+    print("SKIP")
+    raise SystemExit
+
+
+def printbuf():
+    print("--8<--")
+    for y in range(h):
+        for x in range(w):
+            print("%02x" % buf[(x + y * w)], end="")
+        print()
+    print("-->8--")
+
+
+w = 30
+h = 30
+buf = bytearray(w * h)
+fbuf = framebuf.FrameBuffer(buf, w, h, framebuf.GS8)
+
+# Outline
+fbuf.fill(0)
+fbuf.ellipse(15, 15, 12, 6, 0xFF, False)
+printbuf()
+
+# Fill
+fbuf.fill(0)
+fbuf.ellipse(15, 15, 6, 12, 0xAA, True)
+printbuf()
+
+# Outline and fill some different quadrant combos.
+for m in (0, 0b0001, 0b0010, 0b0100, 0b1000, 0b1010):
+    fbuf.fill(0)
+    fbuf.ellipse(15, 15, 6, 12, 0xAA, False, m)
+    printbuf()
+    fbuf.fill(0)
+    fbuf.ellipse(15, 15, 6, 12, 0xAA, True, m)
+    printbuf()
+
+# Draw ellipses that will go out of bounds at each of the edges.
+for x, y in (
+    (
+        4,
+        4,
+    ),
+    (
+        26,
+        4,
+    ),
+    (
+        26,
+        26,
+    ),
+    (
+        4,
+        26,
+    ),
+):
+    fbuf.fill(0)
+    fbuf.ellipse(x, y, 6, 12, 0xAA, False)
+    printbuf()
+    fbuf.fill(0)
+    fbuf.ellipse(x, y, 6, 12, 0xAA, True)
+    printbuf()
diff --git a/tests/extmod/framebuf_ellipse.py.exp b/tests/extmod/framebuf_ellipse.py.exp
new file mode 100644
index 0000000000000..ae6ad1ee7e487
--- /dev/null
+++ b/tests/extmod/framebuf_ellipse.py.exp
@@ -0,0 +1,704 @@
+--8<--
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000ffffffffffffffffff00000000000000000000
+0000000000000000ffffff000000000000000000ffffff00000000000000
+000000000000ffff000000000000000000000000000000ffff0000000000
+0000000000ff00000000000000000000000000000000000000ff00000000
+00000000ff000000000000000000000000000000000000000000ff000000
+000000ff0000000000000000000000000000000000000000000000ff0000
+000000ff0000000000000000000000000000000000000000000000ff0000
+000000ff0000000000000000000000000000000000000000000000ff0000
+00000000ff000000000000000000000000000000000000000000ff000000
+0000000000ff00000000000000000000000000000000000000ff00000000
+000000000000ffff000000000000000000000000000000ffff0000000000
+0000000000000000ffffff000000000000000000ffffff00000000000000
+0000000000000000000000ffffffffffffffffff00000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+-->8--
+--8<--
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000aaaaaa00000000000000000000000000
+00000000000000000000000000aaaaaaaaaa000000000000000000000000
+000000000000000000000000aaaaaaaaaaaaaa0000000000000000000000
+0000000000000000000000aaaaaaaaaaaaaaaaaa00000000000000000000
+0000000000000000000000aaaaaaaaaaaaaaaaaa00000000000000000000
+00000000000000000000aaaaaaaaaaaaaaaaaaaaaa000000000000000000
+00000000000000000000aaaaaaaaaaaaaaaaaaaaaa000000000000000000
+00000000000000000000aaaaaaaaaaaaaaaaaaaaaa000000000000000000
+000000000000000000aaaaaaaaaaaaaaaaaaaaaaaaaa0000000000000000
+000000000000000000aaaaaaaaaaaaaaaaaaaaaaaaaa0000000000000000
+000000000000000000aaaaaaaaaaaaaaaaaaaaaaaaaa0000000000000000
+000000000000000000aaaaaaaaaaaaaaaaaaaaaaaaaa0000000000000000
+000000000000000000aaaaaaaaaaaaaaaaaaaaaaaaaa0000000000000000
+000000000000000000aaaaaaaaaaaaaaaaaaaaaaaaaa0000000000000000
+000000000000000000aaaaaaaaaaaaaaaaaaaaaaaaaa0000000000000000
+000000000000000000aaaaaaaaaaaaaaaaaaaaaaaaaa0000000000000000
+000000000000000000aaaaaaaaaaaaaaaaaaaaaaaaaa0000000000000000
+00000000000000000000aaaaaaaaaaaaaaaaaaaaaa000000000000000000
+00000000000000000000aaaaaaaaaaaaaaaaaaaaaa000000000000000000
+00000000000000000000aaaaaaaaaaaaaaaaaaaaaa000000000000000000
+0000000000000000000000aaaaaaaaaaaaaaaaaa00000000000000000000
+0000000000000000000000aaaaaaaaaaaaaaaaaa00000000000000000000
+000000000000000000000000aaaaaaaaaaaaaa0000000000000000000000
+00000000000000000000000000aaaaaaaaaa000000000000000000000000
+0000000000000000000000000000aaaaaa00000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+-->8--
+--8<--
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+-->8--
+--8<--
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+-->8--
+--8<--
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000aaaa00000000000000000000000000
+0000000000000000000000000000000000aa000000000000000000000000
+000000000000000000000000000000000000aa0000000000000000000000
+00000000000000000000000000000000000000aa00000000000000000000
+00000000000000000000000000000000000000aa00000000000000000000
+0000000000000000000000000000000000000000aa000000000000000000
+0000000000000000000000000000000000000000aa000000000000000000
+0000000000000000000000000000000000000000aa000000000000000000
+000000000000000000000000000000000000000000aa0000000000000000
+000000000000000000000000000000000000000000aa0000000000000000
+000000000000000000000000000000000000000000aa0000000000000000
+000000000000000000000000000000000000000000aa0000000000000000
+000000000000000000000000000000000000000000aa0000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+-->8--
+--8<--
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000aaaa00000000000000000000000000
+000000000000000000000000000000aaaaaa000000000000000000000000
+000000000000000000000000000000aaaaaaaa0000000000000000000000
+000000000000000000000000000000aaaaaaaaaa00000000000000000000
+000000000000000000000000000000aaaaaaaaaa00000000000000000000
+000000000000000000000000000000aaaaaaaaaaaa000000000000000000
+000000000000000000000000000000aaaaaaaaaaaa000000000000000000
+000000000000000000000000000000aaaaaaaaaaaa000000000000000000
+000000000000000000000000000000aaaaaaaaaaaaaa0000000000000000
+000000000000000000000000000000aaaaaaaaaaaaaa0000000000000000
+000000000000000000000000000000aaaaaaaaaaaaaa0000000000000000
+000000000000000000000000000000aaaaaaaaaaaaaa0000000000000000
+000000000000000000000000000000aaaaaaaaaaaaaa0000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+-->8--
+--8<--
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000aaaa0000000000000000000000000000
+00000000000000000000000000aa00000000000000000000000000000000
+000000000000000000000000aa0000000000000000000000000000000000
+0000000000000000000000aa000000000000000000000000000000000000
+0000000000000000000000aa000000000000000000000000000000000000
+00000000000000000000aa00000000000000000000000000000000000000
+00000000000000000000aa00000000000000000000000000000000000000
+00000000000000000000aa00000000000000000000000000000000000000
+000000000000000000aa0000000000000000000000000000000000000000
+000000000000000000aa0000000000000000000000000000000000000000
+000000000000000000aa0000000000000000000000000000000000000000
+000000000000000000aa0000000000000000000000000000000000000000
+000000000000000000aa0000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+-->8--
+--8<--
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000aaaa0000000000000000000000000000
+00000000000000000000000000aaaaaa0000000000000000000000000000
+000000000000000000000000aaaaaaaa0000000000000000000000000000
+0000000000000000000000aaaaaaaaaa0000000000000000000000000000
+0000000000000000000000aaaaaaaaaa0000000000000000000000000000
+00000000000000000000aaaaaaaaaaaa0000000000000000000000000000
+00000000000000000000aaaaaaaaaaaa0000000000000000000000000000
+00000000000000000000aaaaaaaaaaaa0000000000000000000000000000
+000000000000000000aaaaaaaaaaaaaa0000000000000000000000000000
+000000000000000000aaaaaaaaaaaaaa0000000000000000000000000000
+000000000000000000aaaaaaaaaaaaaa0000000000000000000000000000
+000000000000000000aaaaaaaaaaaaaa0000000000000000000000000000
+000000000000000000aaaaaaaaaaaaaa0000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+-->8--
+--8<--
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000aa0000000000000000000000000000000000000000
+000000000000000000aa0000000000000000000000000000000000000000
+000000000000000000aa0000000000000000000000000000000000000000
+000000000000000000aa0000000000000000000000000000000000000000
+000000000000000000aa0000000000000000000000000000000000000000
+00000000000000000000aa00000000000000000000000000000000000000
+00000000000000000000aa00000000000000000000000000000000000000
+00000000000000000000aa00000000000000000000000000000000000000
+0000000000000000000000aa000000000000000000000000000000000000
+0000000000000000000000aa000000000000000000000000000000000000
+000000000000000000000000aa0000000000000000000000000000000000
+00000000000000000000000000aa00000000000000000000000000000000
+0000000000000000000000000000aaaa0000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+-->8--
+--8<--
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000aaaaaaaaaaaaaa0000000000000000000000000000
+000000000000000000aaaaaaaaaaaaaa0000000000000000000000000000
+000000000000000000aaaaaaaaaaaaaa0000000000000000000000000000
+000000000000000000aaaaaaaaaaaaaa0000000000000000000000000000
+000000000000000000aaaaaaaaaaaaaa0000000000000000000000000000
+00000000000000000000aaaaaaaaaaaa0000000000000000000000000000
+00000000000000000000aaaaaaaaaaaa0000000000000000000000000000
+00000000000000000000aaaaaaaaaaaa0000000000000000000000000000
+0000000000000000000000aaaaaaaaaa0000000000000000000000000000
+0000000000000000000000aaaaaaaaaa0000000000000000000000000000
+000000000000000000000000aaaaaaaa0000000000000000000000000000
+00000000000000000000000000aaaaaa0000000000000000000000000000
+0000000000000000000000000000aaaa0000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+-->8--
+--8<--
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000aa0000000000000000
+000000000000000000000000000000000000000000aa0000000000000000
+000000000000000000000000000000000000000000aa0000000000000000
+000000000000000000000000000000000000000000aa0000000000000000
+000000000000000000000000000000000000000000aa0000000000000000
+0000000000000000000000000000000000000000aa000000000000000000
+0000000000000000000000000000000000000000aa000000000000000000
+0000000000000000000000000000000000000000aa000000000000000000
+00000000000000000000000000000000000000aa00000000000000000000
+00000000000000000000000000000000000000aa00000000000000000000
+000000000000000000000000000000000000aa0000000000000000000000
+0000000000000000000000000000000000aa000000000000000000000000
+000000000000000000000000000000aaaa00000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+-->8--
+--8<--
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000aaaaaaaaaaaaaa0000000000000000
+000000000000000000000000000000aaaaaaaaaaaaaa0000000000000000
+000000000000000000000000000000aaaaaaaaaaaaaa0000000000000000
+000000000000000000000000000000aaaaaaaaaaaaaa0000000000000000
+000000000000000000000000000000aaaaaaaaaaaaaa0000000000000000
+000000000000000000000000000000aaaaaaaaaaaa000000000000000000
+000000000000000000000000000000aaaaaaaaaaaa000000000000000000
+000000000000000000000000000000aaaaaaaaaaaa000000000000000000
+000000000000000000000000000000aaaaaaaaaa00000000000000000000
+000000000000000000000000000000aaaaaaaaaa00000000000000000000
+000000000000000000000000000000aaaaaaaa0000000000000000000000
+000000000000000000000000000000aaaaaa000000000000000000000000
+000000000000000000000000000000aaaa00000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+-->8--
+--8<--
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000aaaa0000000000000000000000000000
+00000000000000000000000000aa00000000000000000000000000000000
+000000000000000000000000aa0000000000000000000000000000000000
+0000000000000000000000aa000000000000000000000000000000000000
+0000000000000000000000aa000000000000000000000000000000000000
+00000000000000000000aa00000000000000000000000000000000000000
+00000000000000000000aa00000000000000000000000000000000000000
+00000000000000000000aa00000000000000000000000000000000000000
+000000000000000000aa0000000000000000000000000000000000000000
+000000000000000000aa0000000000000000000000000000000000000000
+000000000000000000aa0000000000000000000000000000000000000000
+000000000000000000aa0000000000000000000000000000000000000000
+000000000000000000aa0000000000000000000000aa0000000000000000
+000000000000000000000000000000000000000000aa0000000000000000
+000000000000000000000000000000000000000000aa0000000000000000
+000000000000000000000000000000000000000000aa0000000000000000
+000000000000000000000000000000000000000000aa0000000000000000
+0000000000000000000000000000000000000000aa000000000000000000
+0000000000000000000000000000000000000000aa000000000000000000
+0000000000000000000000000000000000000000aa000000000000000000
+00000000000000000000000000000000000000aa00000000000000000000
+00000000000000000000000000000000000000aa00000000000000000000
+000000000000000000000000000000000000aa0000000000000000000000
+0000000000000000000000000000000000aa000000000000000000000000
+000000000000000000000000000000aaaa00000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+-->8--
+--8<--
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000aaaa0000000000000000000000000000
+00000000000000000000000000aaaaaa0000000000000000000000000000
+000000000000000000000000aaaaaaaa0000000000000000000000000000
+0000000000000000000000aaaaaaaaaa0000000000000000000000000000
+0000000000000000000000aaaaaaaaaa0000000000000000000000000000
+00000000000000000000aaaaaaaaaaaa0000000000000000000000000000
+00000000000000000000aaaaaaaaaaaa0000000000000000000000000000
+00000000000000000000aaaaaaaaaaaa0000000000000000000000000000
+000000000000000000aaaaaaaaaaaaaa0000000000000000000000000000
+000000000000000000aaaaaaaaaaaaaa0000000000000000000000000000
+000000000000000000aaaaaaaaaaaaaa0000000000000000000000000000
+000000000000000000aaaaaaaaaaaaaa0000000000000000000000000000
+000000000000000000aaaaaaaaaaaaaaaaaaaaaaaaaa0000000000000000
+000000000000000000000000000000aaaaaaaaaaaaaa0000000000000000
+000000000000000000000000000000aaaaaaaaaaaaaa0000000000000000
+000000000000000000000000000000aaaaaaaaaaaaaa0000000000000000
+000000000000000000000000000000aaaaaaaaaaaaaa0000000000000000
+000000000000000000000000000000aaaaaaaaaaaa000000000000000000
+000000000000000000000000000000aaaaaaaaaaaa000000000000000000
+000000000000000000000000000000aaaaaaaaaaaa000000000000000000
+000000000000000000000000000000aaaaaaaaaa00000000000000000000
+000000000000000000000000000000aaaaaaaaaa00000000000000000000
+000000000000000000000000000000aaaaaaaa0000000000000000000000
+000000000000000000000000000000aaaaaa000000000000000000000000
+000000000000000000000000000000aaaa00000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+-->8--
+--8<--
+00000000000000000000aa00000000000000000000000000000000000000
+00000000000000000000aa00000000000000000000000000000000000000
+00000000000000000000aa00000000000000000000000000000000000000
+00000000000000000000aa00000000000000000000000000000000000000
+00000000000000000000aa00000000000000000000000000000000000000
+00000000000000000000aa00000000000000000000000000000000000000
+00000000000000000000aa00000000000000000000000000000000000000
+00000000000000000000aa00000000000000000000000000000000000000
+00000000000000000000aa00000000000000000000000000000000000000
+000000000000000000aa0000000000000000000000000000000000000000
+000000000000000000aa0000000000000000000000000000000000000000
+000000000000000000aa0000000000000000000000000000000000000000
+aa00000000000000aa000000000000000000000000000000000000000000
+aa00000000000000aa000000000000000000000000000000000000000000
+00aa0000000000aa00000000000000000000000000000000000000000000
+0000aa000000aa0000000000000000000000000000000000000000000000
+000000aaaaaa000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+-->8--
+--8<--
+aaaaaaaaaaaaaaaaaaaaaa00000000000000000000000000000000000000
+aaaaaaaaaaaaaaaaaaaaaa00000000000000000000000000000000000000
+aaaaaaaaaaaaaaaaaaaaaa00000000000000000000000000000000000000
+aaaaaaaaaaaaaaaaaaaaaa00000000000000000000000000000000000000
+aaaaaaaaaaaaaaaaaaaaaa00000000000000000000000000000000000000
+aaaaaaaaaaaaaaaaaaaaaa00000000000000000000000000000000000000
+aaaaaaaaaaaaaaaaaaaaaa00000000000000000000000000000000000000
+aaaaaaaaaaaaaaaaaaaaaa00000000000000000000000000000000000000
+aaaaaaaaaaaaaaaaaaaaaa00000000000000000000000000000000000000
+aaaaaaaaaaaaaaaaaaaa0000000000000000000000000000000000000000
+aaaaaaaaaaaaaaaaaaaa0000000000000000000000000000000000000000
+aaaaaaaaaaaaaaaaaaaa0000000000000000000000000000000000000000
+aaaaaaaaaaaaaaaaaa000000000000000000000000000000000000000000
+aaaaaaaaaaaaaaaaaa000000000000000000000000000000000000000000
+00aaaaaaaaaaaaaa00000000000000000000000000000000000000000000
+0000aaaaaaaaaa0000000000000000000000000000000000000000000000
+000000aaaaaa000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+-->8--
+--8<--
+0000000000000000000000000000000000000000aa000000000000000000
+0000000000000000000000000000000000000000aa000000000000000000
+0000000000000000000000000000000000000000aa000000000000000000
+0000000000000000000000000000000000000000aa000000000000000000
+0000000000000000000000000000000000000000aa000000000000000000
+0000000000000000000000000000000000000000aa000000000000000000
+0000000000000000000000000000000000000000aa000000000000000000
+0000000000000000000000000000000000000000aa000000000000000000
+0000000000000000000000000000000000000000aa000000000000000000
+000000000000000000000000000000000000000000aa0000000000000000
+000000000000000000000000000000000000000000aa0000000000000000
+000000000000000000000000000000000000000000aa0000000000000000
+00000000000000000000000000000000000000000000aa00000000000000
+00000000000000000000000000000000000000000000aa00000000000000
+0000000000000000000000000000000000000000000000aa0000000000aa
+000000000000000000000000000000000000000000000000aa000000aa00
+00000000000000000000000000000000000000000000000000aaaaaa0000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+-->8--
+--8<--
+0000000000000000000000000000000000000000aaaaaaaaaaaaaaaaaaaa
+0000000000000000000000000000000000000000aaaaaaaaaaaaaaaaaaaa
+0000000000000000000000000000000000000000aaaaaaaaaaaaaaaaaaaa
+0000000000000000000000000000000000000000aaaaaaaaaaaaaaaaaaaa
+0000000000000000000000000000000000000000aaaaaaaaaaaaaaaaaaaa
+0000000000000000000000000000000000000000aaaaaaaaaaaaaaaaaaaa
+0000000000000000000000000000000000000000aaaaaaaaaaaaaaaaaaaa
+0000000000000000000000000000000000000000aaaaaaaaaaaaaaaaaaaa
+0000000000000000000000000000000000000000aaaaaaaaaaaaaaaaaaaa
+000000000000000000000000000000000000000000aaaaaaaaaaaaaaaaaa
+000000000000000000000000000000000000000000aaaaaaaaaaaaaaaaaa
+000000000000000000000000000000000000000000aaaaaaaaaaaaaaaaaa
+00000000000000000000000000000000000000000000aaaaaaaaaaaaaaaa
+00000000000000000000000000000000000000000000aaaaaaaaaaaaaaaa
+0000000000000000000000000000000000000000000000aaaaaaaaaaaaaa
+000000000000000000000000000000000000000000000000aaaaaaaaaa00
+00000000000000000000000000000000000000000000000000aaaaaa0000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+-->8--
+--8<--
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+00000000000000000000000000000000000000000000000000aaaaaa0000
+000000000000000000000000000000000000000000000000aa000000aa00
+0000000000000000000000000000000000000000000000aa0000000000aa
+00000000000000000000000000000000000000000000aa00000000000000
+00000000000000000000000000000000000000000000aa00000000000000
+000000000000000000000000000000000000000000aa0000000000000000
+000000000000000000000000000000000000000000aa0000000000000000
+000000000000000000000000000000000000000000aa0000000000000000
+0000000000000000000000000000000000000000aa000000000000000000
+0000000000000000000000000000000000000000aa000000000000000000
+0000000000000000000000000000000000000000aa000000000000000000
+0000000000000000000000000000000000000000aa000000000000000000
+0000000000000000000000000000000000000000aa000000000000000000
+0000000000000000000000000000000000000000aa000000000000000000
+0000000000000000000000000000000000000000aa000000000000000000
+0000000000000000000000000000000000000000aa000000000000000000
+-->8--
+--8<--
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+00000000000000000000000000000000000000000000000000aaaaaa0000
+000000000000000000000000000000000000000000000000aaaaaaaaaa00
+0000000000000000000000000000000000000000000000aaaaaaaaaaaaaa
+00000000000000000000000000000000000000000000aaaaaaaaaaaaaaaa
+00000000000000000000000000000000000000000000aaaaaaaaaaaaaaaa
+000000000000000000000000000000000000000000aaaaaaaaaaaaaaaaaa
+000000000000000000000000000000000000000000aaaaaaaaaaaaaaaaaa
+000000000000000000000000000000000000000000aaaaaaaaaaaaaaaaaa
+0000000000000000000000000000000000000000aaaaaaaaaaaaaaaaaaaa
+0000000000000000000000000000000000000000aaaaaaaaaaaaaaaaaaaa
+0000000000000000000000000000000000000000aaaaaaaaaaaaaaaaaaaa
+0000000000000000000000000000000000000000aaaaaaaaaaaaaaaaaaaa
+0000000000000000000000000000000000000000aaaaaaaaaaaaaaaaaaaa
+0000000000000000000000000000000000000000aaaaaaaaaaaaaaaaaaaa
+0000000000000000000000000000000000000000aaaaaaaaaaaaaaaaaaaa
+0000000000000000000000000000000000000000aaaaaaaaaaaaaaaaaaaa
+-->8--
+--8<--
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000aaaaaa000000000000000000000000000000000000000000000000
+0000aa000000aa0000000000000000000000000000000000000000000000
+00aa0000000000aa00000000000000000000000000000000000000000000
+aa00000000000000aa000000000000000000000000000000000000000000
+aa00000000000000aa000000000000000000000000000000000000000000
+000000000000000000aa0000000000000000000000000000000000000000
+000000000000000000aa0000000000000000000000000000000000000000
+000000000000000000aa0000000000000000000000000000000000000000
+00000000000000000000aa00000000000000000000000000000000000000
+00000000000000000000aa00000000000000000000000000000000000000
+00000000000000000000aa00000000000000000000000000000000000000
+00000000000000000000aa00000000000000000000000000000000000000
+00000000000000000000aa00000000000000000000000000000000000000
+00000000000000000000aa00000000000000000000000000000000000000
+00000000000000000000aa00000000000000000000000000000000000000
+00000000000000000000aa00000000000000000000000000000000000000
+-->8--
+--8<--
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000
+000000aaaaaa000000000000000000000000000000000000000000000000
+0000aaaaaaaaaa0000000000000000000000000000000000000000000000
+00aaaaaaaaaaaaaa00000000000000000000000000000000000000000000
+aaaaaaaaaaaaaaaaaa000000000000000000000000000000000000000000
+aaaaaaaaaaaaaaaaaa000000000000000000000000000000000000000000
+aaaaaaaaaaaaaaaaaaaa0000000000000000000000000000000000000000
+aaaaaaaaaaaaaaaaaaaa0000000000000000000000000000000000000000
+aaaaaaaaaaaaaaaaaaaa0000000000000000000000000000000000000000
+aaaaaaaaaaaaaaaaaaaaaa00000000000000000000000000000000000000
+aaaaaaaaaaaaaaaaaaaaaa00000000000000000000000000000000000000
+aaaaaaaaaaaaaaaaaaaaaa00000000000000000000000000000000000000
+aaaaaaaaaaaaaaaaaaaaaa00000000000000000000000000000000000000
+aaaaaaaaaaaaaaaaaaaaaa00000000000000000000000000000000000000
+aaaaaaaaaaaaaaaaaaaaaa00000000000000000000000000000000000000
+aaaaaaaaaaaaaaaaaaaaaa00000000000000000000000000000000000000
+aaaaaaaaaaaaaaaaaaaaaa00000000000000000000000000000000000000
+-->8--

From 04a655c74488128a2c1af9ba8f29fce5e5bbfef9 Mon Sep 17 00:00:00 2001
From: Mat Booth <mat.booth@gmail.com>
Date: Wed, 13 Jul 2022 21:09:51 +0100
Subject: [PATCH 2497/3533] extmod/modframebuf: Add polygon drawing methods.

Add method for drawing polygons.

For non-filled polygons, uses the existing line-drawing code to render
arbitrary polygons using the given coords list, at the given x,y position,
in the given colour.

For filled polygons, arbitrary closed polygons are rendered using a fast
point-in-polygon algorithm to determine where the edges of the polygon lie
on each pixel row.

Tests and documentation updates are also included.

Signed-off-by: Mat Booth <mat.booth@gmail.com>
---
 docs/library/framebuf.rst            |  15 +-
 extmod/modframebuf.c                 | 114 ++++++
 tests/extmod/framebuf_polygon.py     | 222 ++++++++++
 tests/extmod/framebuf_polygon.py.exp | 582 +++++++++++++++++++++++++++
 4 files changed, 931 insertions(+), 2 deletions(-)
 create mode 100644 tests/extmod/framebuf_polygon.py
 create mode 100644 tests/extmod/framebuf_polygon.py.exp

diff --git a/docs/library/framebuf.rst b/docs/library/framebuf.rst
index 1e23abd0f1b50..78ae0c1c346b7 100644
--- a/docs/library/framebuf.rst
+++ b/docs/library/framebuf.rst
@@ -11,8 +11,8 @@ class FrameBuffer
 -----------------
 
 The FrameBuffer class provides a pixel buffer which can be drawn upon with
-pixels, lines, rectangles, ellipses, text and even other FrameBuffers. It is
-useful when generating output for displays.
+pixels, lines, rectangles, ellipses, polygons, text and even other
+FrameBuffers. It is useful when generating output for displays.
 
 For example::
 
@@ -98,6 +98,17 @@ The following methods draw shapes onto the FrameBuffer.
     to be drawn, with bit 0 specifying Q1, b1 Q2, b2 Q3 and b3 Q4. Quadrants
     are numbered counterclockwise with Q1 being top right.
 
+.. method:: FrameBuffer.poly(x, y, coords, c[, f])
+
+    Given a list of coordinates, draw an arbitrary (convex or concave) closed
+    polygon at the given x, y location using the given color.
+
+    The *coords* must be specified as a :mod:`array` of integers, e.g.
+    ``array('h', [x0, y0, x1, y1, ... xn, yn])``.
+
+    The optional *f* parameter can be set to ``True`` to fill the polygon.
+    Otherwise just a one pixel outline is drawn.
+
 Drawing text
 ------------
 
diff --git a/extmod/modframebuf.c b/extmod/modframebuf.c
index 0fa91942c1a79..f17bea70b9675 100644
--- a/extmod/modframebuf.c
+++ b/extmod/modframebuf.c
@@ -28,6 +28,7 @@
 #include <string.h>
 
 #include "py/runtime.h"
+#include "py/binary.h"
 
 #if MICROPY_PY_FRAMEBUF
 
@@ -563,6 +564,116 @@ STATIC mp_obj_t framebuf_ellipse(size_t n_args, const mp_obj_t *args_in) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(framebuf_ellipse_obj, 6, 8, framebuf_ellipse);
 
+#if MICROPY_PY_ARRAY && !MICROPY_ENABLE_DYNRUNTIME
+// TODO: poly needs mp_binary_get_size & mp_binary_get_val_array which aren't
+// available in dynruntime.h yet.
+
+STATIC mp_int_t poly_int(mp_buffer_info_t *bufinfo, size_t index) {
+    return mp_obj_get_int(mp_binary_get_val_array(bufinfo->typecode, bufinfo->buf, index));
+}
+
+STATIC mp_obj_t framebuf_poly(size_t n_args, const mp_obj_t *args_in) {
+    mp_obj_framebuf_t *self = MP_OBJ_TO_PTR(args_in[0]);
+
+    mp_int_t x = mp_obj_get_int(args_in[1]);
+    mp_int_t y = mp_obj_get_int(args_in[2]);
+
+    mp_buffer_info_t bufinfo;
+    mp_get_buffer_raise(args_in[3], &bufinfo, MP_BUFFER_READ);
+    // If an odd number of values was given, this rounds down to multiple of two.
+    int n_poly = bufinfo.len / (mp_binary_get_size('@', bufinfo.typecode, NULL) * 2);
+
+    if (n_poly == 0) {
+        return mp_const_none;
+    }
+
+    mp_int_t col = mp_obj_get_int(args_in[4]);
+    bool fill = n_args > 5 && mp_obj_is_true(args_in[5]);
+
+    if (fill) {
+        // This implements an integer version of http://alienryderflex.com/polygon_fill/
+
+        // The idea is for each scan line, compute the sorted list of x
+        // coordinates where the scan line intersects the polygon edges,
+        // then fill between each resulting pair.
+
+        // Restrict just to the scan lines that include the vertical extent of
+        // this polygon.
+        mp_int_t y_min = INT_MAX, y_max = INT_MIN;
+        for (int i = 0; i < n_poly; i++) {
+            mp_int_t py = poly_int(&bufinfo, i * 2 + 1);
+            y_min = MIN(y_min, py);
+            y_max = MAX(y_max, py);
+        }
+
+        for (mp_int_t row = y_min; row <= y_max; row++) {
+            // Each node is the x coordinate where an edge crosses this scan line.
+            mp_int_t nodes[n_poly];
+            int n_nodes = 0;
+            mp_int_t px1 = poly_int(&bufinfo, 0);
+            mp_int_t py1 = poly_int(&bufinfo, 1);
+            int i = n_poly * 2 - 1;
+            do {
+                mp_int_t py2 = poly_int(&bufinfo, i--);
+                mp_int_t px2 = poly_int(&bufinfo, i--);
+
+                // Don't include the bottom pixel of a given edge to avoid
+                // duplicating the node with the start of the next edge. This
+                // will miss some pixels on the boundary, but we get them at
+                // the end when we unconditionally draw the outline.
+                if (py1 != py2 && ((py1 > row && py2 <= row) || (py1 <= row && py2 > row))) {
+                    mp_int_t node = (32 * px1 + 32 * (px2 - px1) * (row - py1) / (py2 - py1) + 16) / 32;
+                    nodes[n_nodes++] = node;
+                }
+
+                px1 = px2;
+                py1 = py2;
+            } while (i >= 0);
+
+            if (!n_nodes) {
+                continue;
+            }
+
+            // Sort the nodes left-to-right (bubble-sort for code size).
+            i = 0;
+            while (i < n_nodes - 1) {
+                if (nodes[i] > nodes[i + 1]) {
+                    mp_int_t swap = nodes[i];
+                    nodes[i] = nodes[i + 1];
+                    nodes[i + 1] = swap;
+                    if (i) {
+                        i--;
+                    }
+                } else {
+                    i++;
+                }
+            }
+
+            // Fill between each pair of nodes.
+            for (i = 0; i < n_nodes; i += 2) {
+                fill_rect(self, x + nodes[i], y + row, (nodes[i + 1] - nodes[i]) + 1, 1, col);
+            }
+        }
+    }
+
+    // Always draw the outline (either because fill=False, or to fix the
+    // boundary pixels for a fill, see above).
+    mp_int_t px1 = poly_int(&bufinfo, 0);
+    mp_int_t py1 = poly_int(&bufinfo, 1);
+    int i = n_poly * 2 - 1;
+    do {
+        mp_int_t py2 = poly_int(&bufinfo, i--);
+        mp_int_t px2 = poly_int(&bufinfo, i--);
+        line(self, x + px1, y + py1, x + px2, y + py2, col);
+        px1 = px2;
+        py1 = py2;
+    } while (i >= 0);
+
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(framebuf_poly_obj, 5, 6, framebuf_poly);
+#endif // MICROPY_PY_ARRAY && !MICROPY_ENABLE_DYNRUNTIME
+
 STATIC mp_obj_t framebuf_blit(size_t n_args, const mp_obj_t *args_in) {
     mp_obj_framebuf_t *self = MP_OBJ_TO_PTR(args_in[0]);
     mp_obj_t source_in = mp_obj_cast_to_native_base(args_in[1], MP_OBJ_FROM_PTR(&mp_type_framebuf));
@@ -698,6 +809,9 @@ STATIC const mp_rom_map_elem_t framebuf_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_rect), MP_ROM_PTR(&framebuf_rect_obj) },
     { MP_ROM_QSTR(MP_QSTR_line), MP_ROM_PTR(&framebuf_line_obj) },
     { MP_ROM_QSTR(MP_QSTR_ellipse), MP_ROM_PTR(&framebuf_ellipse_obj) },
+    #if MICROPY_PY_ARRAY
+    { MP_ROM_QSTR(MP_QSTR_poly), MP_ROM_PTR(&framebuf_poly_obj) },
+    #endif
     { MP_ROM_QSTR(MP_QSTR_blit), MP_ROM_PTR(&framebuf_blit_obj) },
     { MP_ROM_QSTR(MP_QSTR_scroll), MP_ROM_PTR(&framebuf_scroll_obj) },
     { MP_ROM_QSTR(MP_QSTR_text), MP_ROM_PTR(&framebuf_text_obj) },
diff --git a/tests/extmod/framebuf_polygon.py b/tests/extmod/framebuf_polygon.py
new file mode 100644
index 0000000000000..03130b3bf0fab
--- /dev/null
+++ b/tests/extmod/framebuf_polygon.py
@@ -0,0 +1,222 @@
+import sys
+
+try:
+    import framebuf
+    from array import array
+except ImportError:
+    print("SKIP")
+    raise SystemExit
+
+
+# TODO: poly needs functions that aren't in dynruntime.h yet.
+if not hasattr(framebuf.FrameBuffer, "poly"):
+    print("SKIP")
+    raise SystemExit
+
+
+def print_buffer(buffer, width, height):
+    for row in range(height):
+        for col in range(width):
+            val = buffer[(row * width) + col]
+            sys.stdout.write(" {:02x}".format(val) if val else " ··")
+        sys.stdout.write("\n")
+
+
+buf = bytearray(70 * 70)
+
+w = 30
+h = 25
+fbuf = framebuf.FrameBuffer(buf, w, h, framebuf.GS8)
+col = 0xFF
+col_fill = 0x99
+
+# This describes a arbitrary polygon (this happens to be a concave polygon in
+# the shape of an upper-case letter 'M').
+poly = array(
+    "h",
+    (
+        0,
+        20,
+        3,
+        20,
+        3,
+        10,
+        6,
+        17,
+        9,
+        10,
+        9,
+        20,
+        12,
+        20,
+        12,
+        3,
+        9,
+        3,
+        6,
+        10,
+        3,
+        3,
+        0,
+        3,
+    ),
+)
+# This describes the same polygon, but the points are in reverse order
+# (it shouldn't matter if the polygon has clockwise or anti-clockwise
+# winding). Also defined as a bytes instead of array.
+poly_reversed = bytes(
+    (
+        0,
+        3,
+        3,
+        3,
+        6,
+        10,
+        9,
+        3,
+        12,
+        3,
+        12,
+        20,
+        9,
+        20,
+        9,
+        10,
+        6,
+        17,
+        3,
+        10,
+        3,
+        20,
+        0,
+        20,
+    )
+)
+
+# Draw the line polygon (at the origin) and the reversed-order polygon (offset).
+fbuf.fill(0)
+fbuf.poly(0, 0, poly, col)
+fbuf.poly(15, -2, poly_reversed, col)
+print_buffer(buf, w, h)
+print()
+
+# Same but filled.
+fbuf.fill(0)
+fbuf.poly(0, 0, poly, col_fill, True)
+fbuf.poly(15, -2, poly_reversed, col_fill, True)
+print_buffer(buf, w, h)
+print()
+
+# Draw the fill then the outline to ensure that no fill goes outside the outline.
+fbuf.fill(0)
+fbuf.poly(0, 0, poly, col_fill, True)
+fbuf.poly(0, 0, poly, col)
+fbuf.poly(15, -2, poly, col_fill, True)
+fbuf.poly(15, -2, poly, col)
+print_buffer(buf, w, h)
+print()
+
+# Draw the outline then the fill to ensure the fill completely covers the outline.
+fbuf.fill(0)
+fbuf.poly(0, 0, poly, col)
+fbuf.poly(0, 0, poly, col_fill, True)
+fbuf.poly(15, -2, poly, col)
+fbuf.poly(15, -2, poly, col_fill, True)
+print_buffer(buf, w, h)
+print()
+
+# Draw polygons that will go out of bounds at each of the edges.
+for x, y in (
+    (
+        -8,
+        -8,
+    ),
+    (
+        24,
+        -6,
+    ),
+    (
+        20,
+        12,
+    ),
+    (
+        -2,
+        10,
+    ),
+):
+    fbuf.fill(0)
+    fbuf.poly(x, y, poly, col)
+    print_buffer(buf, w, h)
+    print()
+    fbuf.fill(0)
+    fbuf.poly(x, y, poly_reversed, col, True)
+    print_buffer(buf, w, h)
+    print()
+
+# Edge cases: These two lists describe self-intersecting polygons
+poly_hourglass = array("h", (0, 0, 9, 0, 0, 19, 9, 19))
+poly_star = array("h", (7, 0, 3, 18, 14, 5, 0, 5, 11, 18))
+
+# As before, fill then outline.
+fbuf.fill(0)
+fbuf.poly(0, 2, poly_hourglass, col_fill, True)
+fbuf.poly(0, 2, poly_hourglass, col)
+fbuf.poly(12, 2, poly_star, col_fill, True)
+fbuf.poly(12, 2, poly_star, col)
+print_buffer(buf, w, h)
+print()
+
+# Outline then fill.
+fbuf.fill(0)
+fbuf.poly(0, 2, poly_hourglass, col)
+fbuf.poly(0, 2, poly_hourglass, col_fill, True)
+fbuf.poly(12, 2, poly_star, col)
+fbuf.poly(12, 2, poly_star, col_fill, True)
+print_buffer(buf, w, h)
+print()
+
+# Edge cases: These are "degenerate" polygons.
+poly_empty = array("h")  # Will draw nothing at all.
+poly_one = array("h", (20, 20))  # Will draw a single point.
+poly_two = array("h", (10, 10, 5, 5))  # Will draw a single line.
+poly_wrong_length = array("h", (2, 2, 4))  # Will round down to one point.
+
+fbuf.fill(0)
+fbuf.poly(0, 0, poly_empty, col)
+fbuf.poly(0, 0, poly_one, col)
+fbuf.poly(0, 0, poly_two, col)
+fbuf.poly(0, 0, poly_wrong_length, col)
+print_buffer(buf, w, h)
+print()
+
+# A shape with a horizontal overhang.
+poly_overhang = array("h", (0, 0, 0, 5, 5, 5, 5, 10, 10, 10, 10, 0))
+
+fbuf.fill(0)
+fbuf.poly(0, 0, poly_overhang, col)
+fbuf.poly(0, 0, poly_overhang, col_fill, True)
+print_buffer(buf, w, h)
+print()
+
+fbuf.fill(0)
+fbuf.poly(0, 0, poly_overhang, col_fill, True)
+fbuf.poly(0, 0, poly_overhang, col)
+print_buffer(buf, w, h)
+print()
+
+# Triangles
+w = 70
+h = 70
+fbuf = framebuf.FrameBuffer(buf, w, h, framebuf.GS8)
+t1 = array("h", [40, 0, 20, 68, 62, 40])
+t2 = array("h", [40, 0, 0, 16, 20, 68])
+
+fbuf.fill(0)
+fbuf.poly(0, 0, t1, 0xFF, False)
+fbuf.poly(0, 0, t2, 0xFF, False)
+print_buffer(buf, w, h)
+
+fbuf.fill(0)
+fbuf.poly(0, 0, t1, 0xFF, True)
+fbuf.poly(0, 0, t2, 0xFF, True)
+print_buffer(buf, w, h)
diff --git a/tests/extmod/framebuf_polygon.py.exp b/tests/extmod/framebuf_polygon.py.exp
new file mode 100644
index 0000000000000..05cd4264ea8b4
--- /dev/null
+++ b/tests/extmod/framebuf_polygon.py.exp
@@ -0,0 +1,582 @@
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ff ff ff ·· ·· ·· ·· ·· ff ff ff ff ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ff ·· ·· ·· ·· ·· ff ·· ·· ff ·· ··
+ ff ff ff ff ·· ·· ·· ·· ·· ff ff ff ff ·· ·· ff ·· ·· ·· ff ·· ·· ·· ff ·· ·· ·· ff ·· ··
+ ff ·· ·· ff ·· ·· ·· ·· ·· ff ·· ·· ff ·· ·· ff ·· ·· ·· ff ·· ·· ·· ff ·· ·· ·· ff ·· ··
+ ff ·· ·· ·· ff ·· ·· ·· ff ·· ·· ·· ff ·· ·· ff ·· ·· ·· ·· ff ·· ff ·· ·· ·· ·· ff ·· ··
+ ff ·· ·· ·· ff ·· ·· ·· ff ·· ·· ·· ff ·· ·· ff ·· ·· ·· ·· ff ·· ff ·· ·· ·· ·· ff ·· ··
+ ff ·· ·· ·· ·· ff ·· ff ·· ·· ·· ·· ff ·· ·· ff ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ff ·· ··
+ ff ·· ·· ·· ·· ff ·· ff ·· ·· ·· ·· ff ·· ·· ff ·· ·· ff ·· ·· ff ·· ·· ff ·· ·· ff ·· ··
+ ff ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ff ·· ·· ff ·· ·· ff ·· ·· ·· ·· ·· ff ·· ·· ff ·· ··
+ ff ·· ·· ff ·· ·· ff ·· ·· ff ·· ·· ff ·· ·· ff ·· ·· ff ff ·· ·· ·· ff ff ·· ·· ff ·· ··
+ ff ·· ·· ff ·· ·· ·· ·· ·· ff ·· ·· ff ·· ·· ff ·· ·· ff ff ·· ·· ·· ff ff ·· ·· ff ·· ··
+ ff ·· ·· ff ff ·· ·· ·· ff ff ·· ·· ff ·· ·· ff ·· ·· ff ·· ff ·· ff ·· ff ·· ·· ff ·· ··
+ ff ·· ·· ff ff ·· ·· ·· ff ff ·· ·· ff ·· ·· ff ·· ·· ff ·· ff ·· ff ·· ff ·· ·· ff ·· ··
+ ff ·· ·· ff ·· ff ·· ff ·· ff ·· ·· ff ·· ·· ff ·· ·· ff ·· ·· ff ·· ·· ff ·· ·· ff ·· ··
+ ff ·· ·· ff ·· ff ·· ff ·· ff ·· ·· ff ·· ·· ff ·· ·· ff ·· ·· ff ·· ·· ff ·· ·· ff ·· ··
+ ff ·· ·· ff ·· ·· ff ·· ·· ff ·· ·· ff ·· ·· ff ·· ·· ff ·· ·· ·· ·· ·· ff ·· ·· ff ·· ··
+ ff ·· ·· ff ·· ·· ff ·· ·· ff ·· ·· ff ·· ·· ff ·· ·· ff ·· ·· ·· ·· ·· ff ·· ·· ff ·· ··
+ ff ·· ·· ff ·· ·· ·· ·· ·· ff ·· ·· ff ·· ·· ff ff ff ff ·· ·· ·· ·· ·· ff ff ff ff ·· ··
+ ff ·· ·· ff ·· ·· ·· ·· ·· ff ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ff ff ff ff ·· ·· ·· ·· ·· ff ff ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· 99 99 99 99 ·· ·· ·· ·· ·· 99 99 99 99 ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· 99 99 99 99 ·· ·· ·· ·· ·· 99 99 99 99 ·· ··
+ 99 99 99 99 ·· ·· ·· ·· ·· 99 99 99 99 ·· ·· 99 99 99 99 99 ·· ·· ·· 99 99 99 99 99 ·· ··
+ 99 99 99 99 ·· ·· ·· ·· ·· 99 99 99 99 ·· ·· 99 99 99 99 99 ·· ·· ·· 99 99 99 99 99 ·· ··
+ 99 99 99 99 99 ·· ·· ·· 99 99 99 99 99 ·· ·· 99 99 99 99 99 99 ·· 99 99 99 99 99 99 ·· ··
+ 99 99 99 99 99 ·· ·· ·· 99 99 99 99 99 ·· ·· 99 99 99 99 99 99 ·· 99 99 99 99 99 99 ·· ··
+ 99 99 99 99 99 99 ·· 99 99 99 99 99 99 ·· ·· 99 99 99 99 99 99 99 99 99 99 99 99 99 ·· ··
+ 99 99 99 99 99 99 ·· 99 99 99 99 99 99 ·· ·· 99 99 99 99 99 99 99 99 99 99 99 99 99 ·· ··
+ 99 99 99 99 99 99 99 99 99 99 99 99 99 ·· ·· 99 99 99 99 99 99 99 99 99 99 99 99 99 ·· ··
+ 99 99 99 99 99 99 99 99 99 99 99 99 99 ·· ·· 99 99 99 99 99 99 99 99 99 99 99 99 99 ·· ··
+ 99 99 99 99 99 99 99 99 99 99 99 99 99 ·· ·· 99 99 99 99 99 99 99 99 99 99 99 99 99 ·· ··
+ 99 99 99 99 99 99 99 99 99 99 99 99 99 ·· ·· 99 99 99 99 ·· 99 99 99 ·· 99 99 99 99 ·· ··
+ 99 99 99 99 99 99 99 99 99 99 99 99 99 ·· ·· 99 99 99 99 ·· 99 99 99 ·· 99 99 99 99 ·· ··
+ 99 99 99 99 ·· 99 99 99 ·· 99 99 99 99 ·· ·· 99 99 99 99 ·· ·· 99 ·· ·· 99 99 99 99 ·· ··
+ 99 99 99 99 ·· 99 99 99 ·· 99 99 99 99 ·· ·· 99 99 99 99 ·· ·· 99 ·· ·· 99 99 99 99 ·· ··
+ 99 99 99 99 ·· ·· 99 ·· ·· 99 99 99 99 ·· ·· 99 99 99 99 ·· ·· ·· ·· ·· 99 99 99 99 ·· ··
+ 99 99 99 99 ·· ·· 99 ·· ·· 99 99 99 99 ·· ·· 99 99 99 99 ·· ·· ·· ·· ·· 99 99 99 99 ·· ··
+ 99 99 99 99 ·· ·· ·· ·· ·· 99 99 99 99 ·· ·· 99 99 99 99 ·· ·· ·· ·· ·· 99 99 99 99 ·· ··
+ 99 99 99 99 ·· ·· ·· ·· ·· 99 99 99 99 ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ 99 99 99 99 ·· ·· ·· ·· ·· 99 99 99 99 ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ff ff ff ·· ·· ·· ·· ·· ff ff ff ff ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff 99 99 ff ·· ·· ·· ·· ·· ff 99 99 ff ·· ··
+ ff ff ff ff ·· ·· ·· ·· ·· ff ff ff ff ·· ·· ff 99 99 99 ff ·· ·· ·· ff 99 99 99 ff ·· ··
+ ff 99 99 ff ·· ·· ·· ·· ·· ff 99 99 ff ·· ·· ff 99 99 99 ff ·· ·· ·· ff 99 99 99 ff ·· ··
+ ff 99 99 99 ff ·· ·· ·· ff 99 99 99 ff ·· ·· ff 99 99 99 99 ff ·· ff 99 99 99 99 ff ·· ··
+ ff 99 99 99 ff ·· ·· ·· ff 99 99 99 ff ·· ·· ff 99 99 99 99 ff ·· ff 99 99 99 99 ff ·· ··
+ ff 99 99 99 99 ff ·· ff 99 99 99 99 ff ·· ·· ff 99 99 99 99 99 ff 99 99 99 99 99 ff ·· ··
+ ff 99 99 99 99 ff ·· ff 99 99 99 99 ff ·· ·· ff 99 99 ff 99 99 ff 99 99 ff 99 99 ff ·· ··
+ ff 99 99 99 99 99 ff 99 99 99 99 99 ff ·· ·· ff 99 99 ff 99 99 99 99 99 ff 99 99 ff ·· ··
+ ff 99 99 ff 99 99 ff 99 99 ff 99 99 ff ·· ·· ff 99 99 ff ff 99 99 99 ff ff 99 99 ff ·· ··
+ ff 99 99 ff 99 99 99 99 99 ff 99 99 ff ·· ·· ff 99 99 ff ff 99 99 99 ff ff 99 99 ff ·· ··
+ ff 99 99 ff ff 99 99 99 ff ff 99 99 ff ·· ·· ff 99 99 ff ·· ff 99 ff ·· ff 99 99 ff ·· ··
+ ff 99 99 ff ff 99 99 99 ff ff 99 99 ff ·· ·· ff 99 99 ff ·· ff 99 ff ·· ff 99 99 ff ·· ··
+ ff 99 99 ff ·· ff 99 ff ·· ff 99 99 ff ·· ·· ff 99 99 ff ·· ·· ff ·· ·· ff 99 99 ff ·· ··
+ ff 99 99 ff ·· ff 99 ff ·· ff 99 99 ff ·· ·· ff 99 99 ff ·· ·· ff ·· ·· ff 99 99 ff ·· ··
+ ff 99 99 ff ·· ·· ff ·· ·· ff 99 99 ff ·· ·· ff 99 99 ff ·· ·· ·· ·· ·· ff 99 99 ff ·· ··
+ ff 99 99 ff ·· ·· ff ·· ·· ff 99 99 ff ·· ·· ff 99 99 ff ·· ·· ·· ·· ·· ff 99 99 ff ·· ··
+ ff 99 99 ff ·· ·· ·· ·· ·· ff 99 99 ff ·· ·· ff ff ff ff ·· ·· ·· ·· ·· ff ff ff ff ·· ··
+ ff 99 99 ff ·· ·· ·· ·· ·· ff 99 99 ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ff ff ff ff ·· ·· ·· ·· ·· ff ff ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· 99 99 99 99 ·· ·· ·· ·· ·· 99 99 99 99 ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· 99 99 99 99 ·· ·· ·· ·· ·· 99 99 99 99 ·· ··
+ 99 99 99 99 ·· ·· ·· ·· ·· 99 99 99 99 ·· ·· 99 99 99 99 99 ·· ·· ·· 99 99 99 99 99 ·· ··
+ 99 99 99 99 ·· ·· ·· ·· ·· 99 99 99 99 ·· ·· 99 99 99 99 99 ·· ·· ·· 99 99 99 99 99 ·· ··
+ 99 99 99 99 99 ·· ·· ·· 99 99 99 99 99 ·· ·· 99 99 99 99 99 99 ·· 99 99 99 99 99 99 ·· ··
+ 99 99 99 99 99 ·· ·· ·· 99 99 99 99 99 ·· ·· 99 99 99 99 99 99 ·· 99 99 99 99 99 99 ·· ··
+ 99 99 99 99 99 99 ·· 99 99 99 99 99 99 ·· ·· 99 99 99 99 99 99 99 99 99 99 99 99 99 ·· ··
+ 99 99 99 99 99 99 ·· 99 99 99 99 99 99 ·· ·· 99 99 99 99 99 99 99 99 99 99 99 99 99 ·· ··
+ 99 99 99 99 99 99 99 99 99 99 99 99 99 ·· ·· 99 99 99 99 99 99 99 99 99 99 99 99 99 ·· ··
+ 99 99 99 99 99 99 99 99 99 99 99 99 99 ·· ·· 99 99 99 99 99 99 99 99 99 99 99 99 99 ·· ··
+ 99 99 99 99 99 99 99 99 99 99 99 99 99 ·· ·· 99 99 99 99 99 99 99 99 99 99 99 99 99 ·· ··
+ 99 99 99 99 99 99 99 99 99 99 99 99 99 ·· ·· 99 99 99 99 ·· 99 99 99 ·· 99 99 99 99 ·· ··
+ 99 99 99 99 99 99 99 99 99 99 99 99 99 ·· ·· 99 99 99 99 ·· 99 99 99 ·· 99 99 99 99 ·· ··
+ 99 99 99 99 ·· 99 99 99 ·· 99 99 99 99 ·· ·· 99 99 99 99 ·· ·· 99 ·· ·· 99 99 99 99 ·· ··
+ 99 99 99 99 ·· 99 99 99 ·· 99 99 99 99 ·· ·· 99 99 99 99 ·· ·· 99 ·· ·· 99 99 99 99 ·· ··
+ 99 99 99 99 ·· ·· 99 ·· ·· 99 99 99 99 ·· ·· 99 99 99 99 ·· ·· ·· ·· ·· 99 99 99 99 ·· ··
+ 99 99 99 99 ·· ·· 99 ·· ·· 99 99 99 99 ·· ·· 99 99 99 99 ·· ·· ·· ·· ·· 99 99 99 99 ·· ··
+ 99 99 99 99 ·· ·· ·· ·· ·· 99 99 99 99 ·· ·· 99 99 99 99 ·· ·· ·· ·· ·· 99 99 99 99 ·· ··
+ 99 99 99 99 ·· ·· ·· ·· ·· 99 99 99 99 ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ 99 99 99 99 ·· ·· ·· ·· ·· 99 99 99 99 ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+
+ ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ff ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ff ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ff ff ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ff ff ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ff ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ff ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ff ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ff ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ff ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ff ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ff ff ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+
+ ff ff ff ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ff ff ff ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ff ff ff ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ff ff ff ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ff ff ff ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ff ff ff ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ff ff ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ff ff ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ff ff ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ff ff ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ff ff ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ff ff ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ff ff ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ff ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ff
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ff
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ff ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ff ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ff ff ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ff ff ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ff ·· ff
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ff ·· ff
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ff ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ff ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ff ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ff ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ff ff ff ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ff ff ff ff ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ff ff ff ff ff
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ff ff ff ff ff
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ff ff ff ff ff
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ff ff ff ff ff
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ff ff ff ff ff
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ff ff ff ff ff
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ff ff ff ff ff
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ff ff ff ·· ff
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ff ff ff ·· ff
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ff ff ff ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ff ff ff ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ff ff ff ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ff ff ff ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ff ff ff ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ff ff ff ·· ·· ·· ·· ·· ff
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ff ·· ·· ·· ·· ·· ff
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ff ·· ·· ·· ff ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ff ·· ·· ·· ff ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ff ·· ff ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ff ·· ff ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ff ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ff ·· ·· ff ·· ·· ff
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ff ·· ·· ·· ·· ·· ff
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ff ff ·· ·· ·· ff ff
+
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ff ff ff ·· ·· ·· ·· ·· ff
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ff ff ff ·· ·· ·· ·· ·· ff
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ff ff ff ff ·· ·· ·· ff ff
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ff ff ff ff ·· ·· ·· ff ff
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ff ff ff ff ff ·· ff ff ff
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ff ff ff ff ff ·· ff ff ff
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ff ff ff ff ff ff ff ff ff
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ff ff ff ff ff ff ff ff ff
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ff ff ff ff ff ff ff ff ff
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ff ff ff ff ff ff ff ff ff
+
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ff ff ·· ·· ·· ·· ·· ff ff ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ff ·· ·· ·· ·· ·· ff ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ff ·· ·· ·· ff ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ff ·· ·· ·· ff ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ff ·· ff ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ff ·· ff ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ff ·· ·· ff ·· ·· ff ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ff ·· ·· ·· ·· ·· ff ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ff ff ·· ·· ·· ff ff ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ff ff ·· ·· ·· ff ff ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ff ·· ff ·· ff ·· ff ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ff ff ·· ·· ·· ·· ·· ff ff ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ff ff ·· ·· ·· ·· ·· ff ff ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ff ff ff ·· ·· ·· ff ff ff ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ff ff ff ·· ·· ·· ff ff ff ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ff ff ff ff ·· ff ff ff ff ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ff ff ff ff ·· ff ff ff ff ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ff ff ff ff ff ff ff ff ff ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ff ff ff ff ff ff ff ff ff ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ff ff ff ff ff ff ff ff ff ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ff ff ff ff ff ff ff ff ff ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ff ff ff ff ff ff ff ff ff ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ff ff ·· ff ff ff ·· ff ff ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ff ff ff ff ff ff ff ff ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ff 99 99 99 99 99 99 99 99 ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ff 99 99 99 99 99 99 ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ff 99 99 99 99 99 99 ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ff 99 ff ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ff 99 99 99 99 ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff 99 ff ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ff 99 99 99 99 ff ·· ·· ·· ·· ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ·· ·· ··
+ ·· ·· ·· ff 99 99 ff ·· ·· ·· ·· ·· ·· ff 99 99 99 99 ff ·· ff 99 99 99 99 ff ·· ·· ·· ··
+ ·· ·· ·· ff 99 99 ff ·· ·· ·· ·· ·· ·· ·· ff 99 99 ff ·· ·· ·· ff 99 99 ff ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ff 99 ff ·· ·· ·· ff 99 ff ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ff 99 ff ·· ·· ·· ff 99 ff ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ff ·· ·· ·· ff ff ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ff 99 99 ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ff 99 ff ·· ff 99 ff ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ff 99 99 ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ff 99 99 ff 99 99 ff ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ff 99 99 99 99 ff ·· ·· ·· ·· ·· ·· ·· ·· ff 99 ff ·· ff 99 ff ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ff 99 99 99 99 ff ·· ·· ·· ·· ·· ·· ·· ·· ff 99 ff ·· ff 99 ff ·· ·· ·· ·· ·· ·· ··
+ ·· ff 99 99 99 99 99 99 ff ·· ·· ·· ·· ·· ·· ff 99 ff ·· ·· ·· ff 99 ff ·· ·· ·· ·· ·· ··
+ ·· ff 99 99 99 99 99 99 ff ·· ·· ·· ·· ·· ·· ff ff ·· ·· ·· ·· ·· ff ff ·· ·· ·· ·· ·· ··
+ ff 99 99 99 99 99 99 99 99 ff ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ··
+ ff ff ff ff ff ff ff ff ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ 99 99 99 99 99 99 99 99 99 99 ·· ·· ·· ·· ·· ·· ·· ·· ·· 99 ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ 99 99 99 99 99 99 99 99 99 99 ·· ·· ·· ·· ·· ·· ·· ·· ·· 99 ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· 99 99 99 99 99 99 99 99 ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· 99 ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· 99 99 99 99 99 99 99 99 ·· ·· ·· ·· ·· ·· ·· ·· ·· 99 99 99 ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· 99 99 99 99 99 99 ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· 99 99 99 ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· 99 99 99 99 99 99 ·· ·· ·· ·· 99 99 99 99 99 99 99 99 99 99 99 99 99 99 99 ·· ·· ··
+ ·· ·· ·· 99 99 99 99 ·· ·· ·· ·· ·· ·· 99 99 99 99 99 99 ·· 99 99 99 99 99 99 ·· ·· ·· ··
+ ·· ·· ·· 99 99 99 99 ·· ·· ·· ·· ·· ·· ·· 99 99 99 99 ·· ·· ·· 99 99 99 99 ·· ·· ·· ·· ··
+ ·· ·· ·· ·· 99 99 ·· ·· ·· ·· ·· ·· ·· ·· ·· 99 99 99 ·· ·· ·· 99 99 99 ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· 99 99 ·· ·· ·· ·· ·· ·· ·· ·· ·· 99 99 99 ·· ·· ·· 99 99 99 ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· 99 99 ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· 99 99 ·· ·· ·· 99 99 ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· 99 99 ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· 99 ·· ·· ·· 99 ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· 99 99 99 99 ·· ·· ·· ·· ·· ·· ·· ·· ·· 99 99 99 ·· 99 99 99 ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· 99 99 99 99 ·· ·· ·· ·· ·· ·· ·· ·· ·· 99 99 99 99 99 99 99 ·· ·· ·· ·· ·· ·· ··
+ ·· ·· 99 99 99 99 99 99 ·· ·· ·· ·· ·· ·· ·· ·· 99 99 99 ·· 99 99 99 ·· ·· ·· ·· ·· ·· ··
+ ·· ·· 99 99 99 99 99 99 ·· ·· ·· ·· ·· ·· ·· ·· 99 99 99 ·· 99 99 99 ·· ·· ·· ·· ·· ·· ··
+ ·· 99 99 99 99 99 99 99 99 ·· ·· ·· ·· ·· ·· 99 99 99 ·· ·· ·· 99 99 99 ·· ·· ·· ·· ·· ··
+ ·· 99 99 99 99 99 99 99 99 ·· ·· ·· ·· ·· ·· 99 99 ·· ·· ·· ·· ·· 99 99 ·· ·· ·· ·· ·· ··
+ 99 99 99 99 99 99 99 99 99 99 ·· ·· ·· ·· ·· 99 ·· ·· ·· ·· ·· ·· ·· 99 ·· ·· ·· ·· ·· ··
+ 99 99 99 99 99 99 99 99 99 99 ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+
+ 99 99 99 99 99 99 99 99 99 99 99 ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ 99 99 99 99 99 99 99 99 99 99 99 ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ 99 99 99 99 99 99 99 99 99 99 99 ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ 99 99 99 99 99 99 99 99 99 99 99 ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ 99 99 99 99 99 99 99 99 99 99 99 ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ 99 99 99 99 99 99 99 99 99 99 99 ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· 99 99 99 99 99 99 ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· 99 99 99 99 99 99 ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· 99 99 99 99 99 99 ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· 99 99 99 99 99 99 ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· 99 99 99 99 99 99 ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+
+ ff ff ff ff ff ff ff ff ff ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ff 99 99 99 99 99 99 99 99 99 ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ff 99 99 99 99 99 99 99 99 99 ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ff 99 99 99 99 99 99 99 99 99 ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ff 99 99 99 99 99 99 99 99 99 ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ff ff ff ff ff ff 99 99 99 99 ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ff 99 99 99 99 ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ff 99 99 99 99 ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ff 99 99 99 99 ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ff 99 99 99 99 ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ff ff ff ff ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ff ·· ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ff ff ·· ·· ff ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ff ·· ·· ·· ·· ·· ff ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ff ff ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ff ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ff ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ff ·· ·· ·· ·· ·· ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ff ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ff ·· ·· ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ff ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ff ff ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ff ff ff ff ff ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ff ff ff ff ff ff ff ff ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ff ff ff ff ff ff ff ff ff ff ff ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ff ff ff ff ff ff ff ff ff ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ff ff ff ff ff ff ff ff ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ff ff ff ff ff ff ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ff ff ff ff ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ff ff ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··

From c616721b1afe176c8d760afc15a93621d411c1dc Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Mon, 15 Aug 2022 09:56:26 +1000
Subject: [PATCH 2498/3533] extmod/modframebuf: Improve poly-fill boundary
 pixels.

Rather than drawing the entire boundary to catch missing pixels, just
detect the cases where boundary pixels are skipped during node calculation
and pre-emptively draw them then.

This adds 72 bytes on PYBV11, but makes filled poly() 20% faster.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 extmod/modframebuf.c                 | 65 ++++++++++++++++------------
 tests/extmod/framebuf_polygon.py.exp | 32 +++++++-------
 2 files changed, 54 insertions(+), 43 deletions(-)

diff --git a/extmod/modframebuf.c b/extmod/modframebuf.c
index f17bea70b9675..bb1f4f6310774 100644
--- a/extmod/modframebuf.c
+++ b/extmod/modframebuf.c
@@ -241,11 +241,17 @@ STATIC mp_framebuf_p_t formats[] = {
     [FRAMEBUF_MHMSB] = {mono_horiz_setpixel, mono_horiz_getpixel, mono_horiz_fill_rect},
 };
 
-static inline void setpixel(const mp_obj_framebuf_t *fb, unsigned int x, unsigned int y, uint32_t col) {
+STATIC inline void setpixel(const mp_obj_framebuf_t *fb, unsigned int x, unsigned int y, uint32_t col) {
     formats[fb->format].setpixel(fb, x, y, col);
 }
 
-static inline uint32_t getpixel(const mp_obj_framebuf_t *fb, unsigned int x, unsigned int y) {
+STATIC void setpixel_checked(const mp_obj_framebuf_t *fb, mp_int_t x, mp_int_t y, mp_int_t col, mp_int_t mask) {
+    if (mask && 0 <= x && x < fb->width && 0 <= y && y < fb->height) {
+        setpixel(fb, x, y, col);
+    }
+}
+
+STATIC inline uint32_t getpixel(const mp_obj_framebuf_t *fb, unsigned int x, unsigned int y) {
     return formats[fb->format].getpixel(fb, x, y);
 }
 
@@ -470,12 +476,6 @@ STATIC mp_obj_t framebuf_line(size_t n_args, const mp_obj_t *args_in) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(framebuf_line_obj, 6, 6, framebuf_line);
 
-STATIC void ellipse_pixel(const mp_obj_framebuf_t *fb, mp_int_t x, mp_int_t y, mp_int_t col, mp_int_t mask) {
-    if (mask && 0 <= x && x < fb->width && 0 <= y && y < fb->height) {
-        setpixel(fb, x, y, col);
-    }
-}
-
 // Q2 Q1
 // Q3 Q4
 #define ELLIPSE_MASK_FILL (0x10)
@@ -500,10 +500,10 @@ STATIC void draw_ellipse_points(const mp_obj_framebuf_t *fb, mp_int_t cx, mp_int
             fill_rect(fb, cx, cy + y, x + 1, 1, col);
         }
     } else {
-        ellipse_pixel(fb, cx + x, cy - y, col, mask & ELLIPSE_MASK_Q1);
-        ellipse_pixel(fb, cx - x, cy - y, col, mask & ELLIPSE_MASK_Q2);
-        ellipse_pixel(fb, cx - x, cy + y, col, mask & ELLIPSE_MASK_Q3);
-        ellipse_pixel(fb, cx + x, cy + y, col, mask & ELLIPSE_MASK_Q4);
+        setpixel_checked(fb, cx + x, cy - y, col, mask & ELLIPSE_MASK_Q1);
+        setpixel_checked(fb, cx - x, cy - y, col, mask & ELLIPSE_MASK_Q2);
+        setpixel_checked(fb, cx - x, cy + y, col, mask & ELLIPSE_MASK_Q3);
+        setpixel_checked(fb, cx + x, cy + y, col, mask & ELLIPSE_MASK_Q4);
     }
 }
 
@@ -619,11 +619,23 @@ STATIC mp_obj_t framebuf_poly(size_t n_args, const mp_obj_t *args_in) {
 
                 // Don't include the bottom pixel of a given edge to avoid
                 // duplicating the node with the start of the next edge. This
-                // will miss some pixels on the boundary, but we get them at
-                // the end when we unconditionally draw the outline.
+                // will miss some pixels on the boundary, and in particular
+                // at a local minima or inflection point.
                 if (py1 != py2 && ((py1 > row && py2 <= row) || (py1 <= row && py2 > row))) {
                     mp_int_t node = (32 * px1 + 32 * (px2 - px1) * (row - py1) / (py2 - py1) + 16) / 32;
                     nodes[n_nodes++] = node;
+                } else if (row == MAX(py1, py2)) {
+                    // At local-minima, try and manually fill in the pixels that get missed above.
+                    if (py1 < py2) {
+                        setpixel_checked(self, x + px2, y + py2, col, 1);
+                    } else if (py2 < py1) {
+                        setpixel_checked(self, x + px1, y + py1, col, 1);
+                    } else {
+                        // Even though this is a hline and would be faster to
+                        // use fill_rect, use line() because it handles x2 <
+                        // x1.
+                        line(self, x + px1, y + py1, x + px2, y + py2, col);
+                    }
                 }
 
                 px1 = px2;
@@ -654,21 +666,20 @@ STATIC mp_obj_t framebuf_poly(size_t n_args, const mp_obj_t *args_in) {
                 fill_rect(self, x + nodes[i], y + row, (nodes[i + 1] - nodes[i]) + 1, 1, col);
             }
         }
+    } else {
+        // Outline only.
+        mp_int_t px1 = poly_int(&bufinfo, 0);
+        mp_int_t py1 = poly_int(&bufinfo, 1);
+        int i = n_poly * 2 - 1;
+        do {
+            mp_int_t py2 = poly_int(&bufinfo, i--);
+            mp_int_t px2 = poly_int(&bufinfo, i--);
+            line(self, x + px1, y + py1, x + px2, y + py2, col);
+            px1 = px2;
+            py1 = py2;
+        } while (i >= 0);
     }
 
-    // Always draw the outline (either because fill=False, or to fix the
-    // boundary pixels for a fill, see above).
-    mp_int_t px1 = poly_int(&bufinfo, 0);
-    mp_int_t py1 = poly_int(&bufinfo, 1);
-    int i = n_poly * 2 - 1;
-    do {
-        mp_int_t py2 = poly_int(&bufinfo, i--);
-        mp_int_t px2 = poly_int(&bufinfo, i--);
-        line(self, x + px1, y + py1, x + px2, y + py2, col);
-        px1 = px2;
-        py1 = py2;
-    } while (i >= 0);
-
     return mp_const_none;
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(framebuf_poly_obj, 5, 6, framebuf_poly);
diff --git a/tests/extmod/framebuf_polygon.py.exp b/tests/extmod/framebuf_polygon.py.exp
index 05cd4264ea8b4..9b4801c788a5c 100644
--- a/tests/extmod/framebuf_polygon.py.exp
+++ b/tests/extmod/framebuf_polygon.py.exp
@@ -510,22 +510,22 @@
  ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
  ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
  ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
- ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
- ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ff ff ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
- ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ff ff ff ff ff ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
- ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ff ff ff ff ff ff ff ff ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
- ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ff ff ff ff ff ff ff ff ff ff ff ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
- ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
- ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
- ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
- ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
- ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
- ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
- ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
- ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
- ·· ·· ·· ·· ·· ·· ·· ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
- ·· ·· ·· ·· ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
- ·· ·· ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ff ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ff ff ff ff ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ff ff ff ff ff ff ff ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ff ff ff ff ff ff ff ff ff ff ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ·· ·· ·· ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ·· ·· ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
+ ·· ·· ·· ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
  ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
  ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··
  ·· ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ·· ··

From af54d2ce9f923eba06b19bddb784a1c9da228347 Mon Sep 17 00:00:00 2001
From: "Nicholas H.Tollervey" <ntoll@ntoll.org>
Date: Fri, 19 Aug 2022 14:58:58 +0100
Subject: [PATCH 2499/3533] javascript: Rename this port to 'webassembly'.

---
 ...ports_javascript.yml => ports_webassembly.yml} | 10 +++++-----
 ports/{javascript => webassembly}/Makefile        |  2 +-
 ports/{javascript => webassembly}/README.md       | 15 ++++++++++-----
 ports/{javascript => webassembly}/library.h       |  0
 ports/{javascript => webassembly}/library.js      |  0
 ports/{javascript => webassembly}/main.c          |  0
 ports/{javascript => webassembly}/modutime.c      |  0
 ports/{javascript => webassembly}/mpconfigport.h  |  2 +-
 ports/{javascript => webassembly}/mphalport.c     |  0
 ports/{javascript => webassembly}/mphalport.h     |  0
 ports/{javascript => webassembly}/node_run.sh     |  0
 ports/{javascript => webassembly}/qstrdefsport.h  |  0
 ports/{javascript => webassembly}/wrapper.js      |  0
 tools/ci.sh                                       | 12 ++++++------
 14 files changed, 23 insertions(+), 18 deletions(-)
 rename .github/workflows/{ports_javascript.yml => ports_webassembly.yml} (57%)
 rename ports/{javascript => webassembly}/Makefile (93%)
 rename ports/{javascript => webassembly}/README.md (84%)
 rename ports/{javascript => webassembly}/library.h (100%)
 rename ports/{javascript => webassembly}/library.js (100%)
 rename ports/{javascript => webassembly}/main.c (100%)
 rename ports/{javascript => webassembly}/modutime.c (100%)
 rename ports/{javascript => webassembly}/mpconfigport.h (99%)
 rename ports/{javascript => webassembly}/mphalport.c (100%)
 rename ports/{javascript => webassembly}/mphalport.h (100%)
 rename ports/{javascript => webassembly}/node_run.sh (100%)
 rename ports/{javascript => webassembly}/qstrdefsport.h (100%)
 rename ports/{javascript => webassembly}/wrapper.js (100%)

diff --git a/.github/workflows/ports_javascript.yml b/.github/workflows/ports_webassembly.yml
similarity index 57%
rename from .github/workflows/ports_javascript.yml
rename to .github/workflows/ports_webassembly.yml
index 244dc966aa6d9..861039c0fcffd 100644
--- a/.github/workflows/ports_javascript.yml
+++ b/.github/workflows/ports_webassembly.yml
@@ -1,4 +1,4 @@
-name: javascript port
+name: webassembly port
 
 on:
   push:
@@ -9,7 +9,7 @@ on:
       - 'py/**'
       - 'extmod/**'
       - 'lib/**'
-      - 'ports/javascript/**'
+      - 'ports/webassembly/**'
 
 jobs:
   build:
@@ -17,8 +17,8 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - name: Install packages
-      run: source tools/ci.sh && ci_javascript_setup
+      run: source tools/ci.sh && ci_webassembly_setup
     - name: Build
-      run: source tools/ci.sh && ci_javascript_build
+      run: source tools/ci.sh && ci_webassembly_build
     - name: Run tests
-      run: source tools/ci.sh && ci_javascript_run_tests
+      run: source tools/ci.sh && ci_webassembly_run_tests
diff --git a/ports/javascript/Makefile b/ports/webassembly/Makefile
similarity index 93%
rename from ports/javascript/Makefile
rename to ports/webassembly/Makefile
index 93c7b5609b23b..db3f36ad8eb13 100644
--- a/ports/javascript/Makefile
+++ b/ports/webassembly/Makefile
@@ -51,6 +51,6 @@ min: $(BUILD)/micropython.js
 
 test: $(BUILD)/micropython.js $(TOP)/tests/run-tests.py
 	$(eval DIRNAME=ports/$(notdir $(CURDIR)))
-	cd $(TOP)/tests && MICROPY_MICROPYTHON=../ports/javascript/node_run.sh ./run-tests.py -j1
+	cd $(TOP)/tests && MICROPY_MICROPYTHON=../ports/webassembly/node_run.sh ./run-tests.py -j1
 
 include $(TOP)/py/mkrules.mk
diff --git a/ports/javascript/README.md b/ports/webassembly/README.md
similarity index 84%
rename from ports/javascript/README.md
rename to ports/webassembly/README.md
index 39808943b1043..3b577233fffe5 100644
--- a/ports/javascript/README.md
+++ b/ports/webassembly/README.md
@@ -1,13 +1,18 @@
-MicroPython.js
-==============
+MicroPython WebAssembly
+=======================
 
-MicroPython transmuted into Javascript by Emscripten.
+MicroPython for [WebAssembly](https://webassembly.org/).
 
 Dependencies
 ------------
 
-Building micropython.js bears the same requirements as the standard MicroPython
-ports with the addition of Emscripten (and uglify-js for the minified file).
+Building webassembly port bears the same requirements as the standard
+MicroPython ports with the addition of Emscripten (and uglify-js for the
+minified file).
+
+The output includes `micropython.js` (a JavaScript wrapper for the
+MicroPython runtime) and `firmware.wasm` (actual MicroPython compiled to
+WASM).
 
 Build instructions
 ------------------
diff --git a/ports/javascript/library.h b/ports/webassembly/library.h
similarity index 100%
rename from ports/javascript/library.h
rename to ports/webassembly/library.h
diff --git a/ports/javascript/library.js b/ports/webassembly/library.js
similarity index 100%
rename from ports/javascript/library.js
rename to ports/webassembly/library.js
diff --git a/ports/javascript/main.c b/ports/webassembly/main.c
similarity index 100%
rename from ports/javascript/main.c
rename to ports/webassembly/main.c
diff --git a/ports/javascript/modutime.c b/ports/webassembly/modutime.c
similarity index 100%
rename from ports/javascript/modutime.c
rename to ports/webassembly/modutime.c
diff --git a/ports/javascript/mpconfigport.h b/ports/webassembly/mpconfigport.h
similarity index 99%
rename from ports/javascript/mpconfigport.h
rename to ports/webassembly/mpconfigport.h
index 6c86d816bd4fe..4fbd922e15642 100644
--- a/ports/javascript/mpconfigport.h
+++ b/ports/webassembly/mpconfigport.h
@@ -105,7 +105,7 @@
 #define MICROPY_PY_MICROPYTHON_MEM_INFO (1)
 #define MICROPY_PY_ARRAY_SLICE_ASSIGN (1)
 #define MICROPY_PY_COLLECTIONS_ORDEREDDICT (1)
-#define MICROPY_PY_SYS_PLATFORM     "javascript"
+#define MICROPY_PY_SYS_PLATFORM     "webassembly"
 #define MICROPY_PY_UERRNO           (1)
 #define MICROPY_PY_UCTYPES          (1)
 #define MICROPY_PY_UZLIB            (1)
diff --git a/ports/javascript/mphalport.c b/ports/webassembly/mphalport.c
similarity index 100%
rename from ports/javascript/mphalport.c
rename to ports/webassembly/mphalport.c
diff --git a/ports/javascript/mphalport.h b/ports/webassembly/mphalport.h
similarity index 100%
rename from ports/javascript/mphalport.h
rename to ports/webassembly/mphalport.h
diff --git a/ports/javascript/node_run.sh b/ports/webassembly/node_run.sh
similarity index 100%
rename from ports/javascript/node_run.sh
rename to ports/webassembly/node_run.sh
diff --git a/ports/javascript/qstrdefsport.h b/ports/webassembly/qstrdefsport.h
similarity index 100%
rename from ports/javascript/qstrdefsport.h
rename to ports/webassembly/qstrdefsport.h
diff --git a/ports/javascript/wrapper.js b/ports/webassembly/wrapper.js
similarity index 100%
rename from ports/javascript/wrapper.js
rename to ports/webassembly/wrapper.js
diff --git a/tools/ci.sh b/tools/ci.sh
index e3203f8bfb9f2..dc2ccf775b15e 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -172,21 +172,21 @@ function ci_esp8266_build {
 }
 
 ########################################################################################
-# ports/javascript
+# ports/webassembly
 
-function ci_javascript_setup {
+function ci_webassembly_setup {
     git clone https://github.com/emscripten-core/emsdk.git
     (cd emsdk && ./emsdk install latest && ./emsdk activate latest)
 }
 
-function ci_javascript_build {
+function ci_webassembly_build {
     source emsdk/emsdk_env.sh
-    make ${MAKEOPTS} -C ports/javascript
+    make ${MAKEOPTS} -C ports/webassembly
 }
 
-function ci_javascript_run_tests {
+function ci_webassembly_run_tests {
     # This port is very slow at running, so only run a few of the tests.
-    (cd tests && MICROPY_MICROPYTHON=../ports/javascript/node_run.sh ./run-tests.py -j1 basics/builtin_*.py)
+    (cd tests && MICROPY_MICROPYTHON=../ports/webassembly/node_run.sh ./run-tests.py -j1 basics/builtin_*.py)
 }
 
 ########################################################################################

From 7c8ec85fa34279950e44072b22ac26fe41b91886 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 23 Aug 2022 13:02:40 +1000
Subject: [PATCH 2500/3533] shared/runtime/sys_stdio_mphal: Make func static
 and remove some TODOs.

stdio_obj_print is private to this file so can be made static.  The __del__
method does nothing so can be removed (it's only called by the GC if it
exists, so if it doesn't exist it won't be called).  And FileIO doesn't
support a constructor in MicroPython at this stage.

Signed-off-by: Damien George <damien@micropython.org>
---
 shared/runtime/sys_stdio_mphal.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/shared/runtime/sys_stdio_mphal.c b/shared/runtime/sys_stdio_mphal.c
index e72facb981d9c..24f528b0c4f85 100644
--- a/shared/runtime/sys_stdio_mphal.c
+++ b/shared/runtime/sys_stdio_mphal.c
@@ -52,7 +52,7 @@ typedef struct _sys_stdio_obj_t {
 STATIC const sys_stdio_obj_t stdio_buffer_obj;
 #endif
 
-void stdio_obj_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+STATIC void stdio_obj_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     sys_stdio_obj_t *self = MP_OBJ_TO_PTR(self_in);
     mp_printf(print, "<io.FileIO %d>", self->fd);
 }
@@ -100,8 +100,6 @@ STATIC mp_obj_t stdio_obj___exit__(size_t n_args, const mp_obj_t *args) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(stdio_obj___exit___obj, 4, 4, stdio_obj___exit__);
 
-// TODO gc hook to close the file if not already closed
-
 STATIC const mp_rom_map_elem_t stdio_locals_dict_table[] = {
     #if MICROPY_PY_SYS_STDIO_BUFFER
     { MP_ROM_QSTR(MP_QSTR_buffer), MP_ROM_PTR(&stdio_buffer_obj) },
@@ -112,7 +110,6 @@ STATIC const mp_rom_map_elem_t stdio_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_readlines), MP_ROM_PTR(&mp_stream_unbuffered_readlines_obj)},
     { MP_ROM_QSTR(MP_QSTR_write), MP_ROM_PTR(&mp_stream_write_obj) },
     { MP_ROM_QSTR(MP_QSTR_close), MP_ROM_PTR(&mp_identity_obj) },
-    { MP_ROM_QSTR(MP_QSTR___del__), MP_ROM_PTR(&mp_identity_obj) },
     { MP_ROM_QSTR(MP_QSTR___enter__), MP_ROM_PTR(&mp_identity_obj) },
     { MP_ROM_QSTR(MP_QSTR___exit__), MP_ROM_PTR(&stdio_obj___exit___obj) },
 };
@@ -129,7 +126,6 @@ STATIC const mp_stream_p_t stdio_obj_stream_p = {
 STATIC const mp_obj_type_t stdio_obj_type = {
     { &mp_type_type },
     .name = MP_QSTR_FileIO,
-    // TODO .make_new?
     .print = stdio_obj_print,
     .getiter = mp_identity_getiter,
     .iternext = mp_stream_unbuffered_iter,

From 3d65101a8a55550bdbaa4df4e216edba238fa299 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 23 Aug 2022 13:09:57 +1000
Subject: [PATCH 2501/3533] py: Clean up formatting of union definitions.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/binary.c | 22 +++++++++++++---------
 py/obj.h    |  8 +++++---
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/py/binary.c b/py/binary.c
index f59e89ca48226..4c8b6ffcdc49a 100644
--- a/py/binary.c
+++ b/py/binary.c
@@ -241,13 +241,15 @@ mp_obj_t mp_binary_get_val(char struct_type, char val_type, byte *p_base, byte *
         return mp_obj_new_str(s_val, strlen(s_val));
     #if MICROPY_PY_BUILTINS_FLOAT
     } else if (val_type == 'f') {
-        union { uint32_t i;
-                float f;
+        union {
+            uint32_t i;
+            float f;
         } fpu = {val};
         return mp_obj_new_float_from_f(fpu.f);
     } else if (val_type == 'd') {
-        union { uint64_t i;
-                double f;
+        union {
+            uint64_t i;
+            double f;
         } fpu = {val};
         return mp_obj_new_float_from_d(fpu.f);
     #endif
@@ -308,17 +310,19 @@ void mp_binary_set_val(char struct_type, char val_type, mp_obj_t val_in, byte *p
             break;
         #if MICROPY_PY_BUILTINS_FLOAT
         case 'f': {
-            union { uint32_t i;
-                    float f;
+            union {
+                uint32_t i;
+                float f;
             } fp_sp;
             fp_sp.f = mp_obj_get_float_to_f(val_in);
             val = fp_sp.i;
             break;
         }
         case 'd': {
-            union { uint64_t i64;
-                    uint32_t i32[2];
-                    double f;
+            union {
+                uint64_t i64;
+                uint32_t i32[2];
+                double f;
             } fp_dp;
             fp_dp.f = mp_obj_get_float_to_d(val_in);
             if (MP_BYTES_PER_OBJ_WORD == 8) {
diff --git a/py/obj.h b/py/obj.h
index 598d6508da737..645fae79f5665 100644
--- a/py/obj.h
+++ b/py/obj.h
@@ -283,9 +283,11 @@ static inline bool mp_obj_is_obj(mp_const_obj_t o) {
 #define MP_OBJ_FROM_PTR(p) ((mp_obj_t)((uintptr_t)(p)))
 
 // rom object storage needs special handling to widen 32-bit pointer to 64-bits
-typedef union _mp_rom_obj_t { uint64_t u64;
-                              struct { const void *lo, *hi;
-                              } u32;
+typedef union _mp_rom_obj_t {
+    uint64_t u64;
+    struct {
+        const void *lo, *hi;
+    } u32;
 } mp_rom_obj_t;
 #define MP_ROM_INT(i) {MP_OBJ_NEW_SMALL_INT(i)}
 #define MP_ROM_QSTR(q) {MP_OBJ_NEW_QSTR(q)}

From d8ad87843ab38dcc74e7e86354849fff585e1ba8 Mon Sep 17 00:00:00 2001
From: Laurens Valk <laurens@pybricks.com>
Date: Fri, 19 Aug 2022 16:40:28 +0200
Subject: [PATCH 2502/3533] py/builtinimport: Allow overriding of
 mp_builtin___import__.

This allows ports to override mp_builtin___import__.

This can be useful in MicroPython applications where
MICROPY_ENABLE_EXTERNAL_IMPORT has to be disabled due to its impact on
build size (2% to 2.5% of the minimal port). By overriding the otherwise
very minimal mp_builtin___import__, ports can still allow limited forms
of application-specific imports.

Signed-off-by: Laurens Valk <laurens@pybricks.com>
---
 py/builtin.h       | 6 ++++++
 py/builtinimport.c | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/py/builtin.h b/py/builtin.h
index fb11627841227..7232142b77bea 100644
--- a/py/builtin.h
+++ b/py/builtin.h
@@ -64,7 +64,13 @@ MP_DECLARE_CONST_FUN_OBJ_KW(mp_builtin_open_obj);
 
 #endif
 
+// A port can provide its own import handler by defining mp_builtin___import__.
+#ifndef mp_builtin___import__
+#define mp_builtin___import__ mp_builtin___import___default
+#endif
 mp_obj_t mp_builtin___import__(size_t n_args, const mp_obj_t *args);
+mp_obj_t mp_builtin___import___default(size_t n_args, const mp_obj_t *args);
+
 mp_obj_t mp_micropython_mem_info(size_t n_args, const mp_obj_t *args);
 
 MP_DECLARE_CONST_FUN_OBJ_VAR(mp_builtin___build_class___obj);
diff --git a/py/builtinimport.c b/py/builtinimport.c
index 36cdac07675e3..a578d4ad2732e 100644
--- a/py/builtinimport.c
+++ b/py/builtinimport.c
@@ -467,7 +467,7 @@ STATIC mp_obj_t process_import_at_level(qstr full_mod_name, qstr level_mod_name,
     return module_obj;
 }
 
-mp_obj_t mp_builtin___import__(size_t n_args, const mp_obj_t *args) {
+mp_obj_t mp_builtin___import___default(size_t n_args, const mp_obj_t *args) {
     #if DEBUG_PRINT
     DEBUG_printf("__import__:\n");
     for (size_t i = 0; i < n_args; i++) {
@@ -566,7 +566,7 @@ mp_obj_t mp_builtin___import__(size_t n_args, const mp_obj_t *args) {
 
 #else // MICROPY_ENABLE_EXTERNAL_IMPORT
 
-mp_obj_t mp_builtin___import__(size_t n_args, const mp_obj_t *args) {
+mp_obj_t mp_builtin___import___default(size_t n_args, const mp_obj_t *args) {
     // Check that it's not a relative import
     if (n_args >= 5 && MP_OBJ_SMALL_INT_VALUE(args[4]) != 0) {
         mp_raise_NotImplementedError(MP_ERROR_TEXT("relative import"));

From b1efc1340af122499e5cf1d7214d51e034d45a20 Mon Sep 17 00:00:00 2001
From: Chris Waggoner <waggoner.chris@gmail.com>
Date: Sun, 21 Aug 2022 06:57:12 -0400
Subject: [PATCH 2503/3533] mpy-cross,unix: Include alloca.h for NetBSD.

---
 mpy-cross/mpconfigport.h  | 2 +-
 ports/unix/mpconfigport.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/mpy-cross/mpconfigport.h b/mpy-cross/mpconfigport.h
index 9d455c0af1f3b..4304c552bc45b 100644
--- a/mpy-cross/mpconfigport.h
+++ b/mpy-cross/mpconfigport.h
@@ -119,7 +119,7 @@ typedef long mp_off_t;
 #define MP_PLAT_PRINT_STRN(str, len) (void)0
 
 // We need to provide a declaration/definition of alloca()
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__NetBSD__)
 #include <stdlib.h>
 #elif defined(_WIN32)
 #include <malloc.h>
diff --git a/ports/unix/mpconfigport.h b/ports/unix/mpconfigport.h
index 03b8ceb1f6f9d..dd73f61e24ba9 100644
--- a/ports/unix/mpconfigport.h
+++ b/ports/unix/mpconfigport.h
@@ -294,7 +294,7 @@ static inline unsigned long mp_urandom_seed_init(void) {
 // We need to provide a declaration/definition of alloca()
 // unless support for it is disabled.
 #if !defined(MICROPY_NO_ALLOCA) || MICROPY_NO_ALLOCA == 0
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__NetBSD__)
 #include <stdlib.h>
 #else
 #include <alloca.h>

From 717924001d8da40032fd56aa3ba2207059f550d2 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Wed, 3 Aug 2022 18:01:11 +0200
Subject: [PATCH 2504/3533] stm32: Switch Wiznet to use lib/wiznet5k and
 extmod/network_wiznet5k.

Instead of the old Wiznet driver in drivers/wiznet5k.
---
 ports/stm32/Makefile           |  17 +-
 ports/stm32/modnwwiznet5k.c    | 513 ---------------------------------
 ports/stm32/network_wiznet5k.c | 465 ------------------------------
 3 files changed, 10 insertions(+), 985 deletions(-)
 delete mode 100644 ports/stm32/modnwwiznet5k.c
 delete mode 100644 ports/stm32/network_wiznet5k.c

diff --git a/ports/stm32/Makefile b/ports/stm32/Makefile
index 14a93a5aa7658..7c912f4f0b23a 100644
--- a/ports/stm32/Makefile
+++ b/ports/stm32/Makefile
@@ -460,19 +460,22 @@ LIBS += $(TOP)/drivers/cyw43/libcyw43.a
 endif
 
 ifneq ($(MICROPY_PY_NETWORK_WIZNET5K),0)
-WIZNET5K_DIR=drivers/wiznet5k
-INC += -I$(TOP)/$(WIZNET5K_DIR)
+WIZNET5K_DIR=lib/wiznet5k
+GIT_SUBMODULES += lib/wiznet5k
+INC += -I$(TOP)/$(WIZNET5K_DIR) -I$(TOP)/$(WIZNET5K_DIR)/Ethernet
 CFLAGS_MOD += -DMICROPY_PY_NETWORK_WIZNET5K=$(MICROPY_PY_NETWORK_WIZNET5K) -D_WIZCHIP_=$(MICROPY_PY_NETWORK_WIZNET5K)
+CFLAGS_MOD += -DWIZCHIP_PREFIXED_EXPORTS=1
 ifeq ($(MICROPY_PY_LWIP),1)
 # When using MACRAW mode (with lwIP), maximum buffer space must be used for the raw socket
 CFLAGS_MOD += -DWIZCHIP_USE_MAX_BUFFER
 endif
-SRC_MOD += network_wiznet5k.c modnwwiznet5k.c
+SRC_MOD += extmod/network_wiznet5k.c
 SRC_MOD += $(addprefix $(WIZNET5K_DIR)/,\
-	ethernet/w$(MICROPY_PY_NETWORK_WIZNET5K)/w$(MICROPY_PY_NETWORK_WIZNET5K).c \
-	ethernet/wizchip_conf.c \
-	ethernet/socket.c \
-	internet/dns/dns.c \
+	Ethernet/W$(MICROPY_PY_NETWORK_WIZNET5K)/w$(MICROPY_PY_NETWORK_WIZNET5K).c \
+	Ethernet/wizchip_conf.c \
+	Ethernet/socket.c \
+	Internet/DNS/dns.c \
+	Internet/DHCP/dhcp.c \
 	)
 endif
 
diff --git a/ports/stm32/modnwwiznet5k.c b/ports/stm32/modnwwiznet5k.c
deleted file mode 100644
index 2d5044d5246b1..0000000000000
--- a/ports/stm32/modnwwiznet5k.c
+++ /dev/null
@@ -1,513 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2014 Damien P. George
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#include <stdio.h>
-#include <stdint.h>
-#include <string.h>
-
-#include "py/objlist.h"
-#include "py/runtime.h"
-#include "py/stream.h"
-#include "py/mperrno.h"
-#include "py/mphal.h"
-#include "shared/netutils/netutils.h"
-#include "extmod/modnetwork.h"
-#include "pin.h"
-#include "spi.h"
-
-#if MICROPY_PY_NETWORK_WIZNET5K && !MICROPY_PY_LWIP
-
-#include "ethernet/wizchip_conf.h"
-#include "ethernet/socket.h"
-#include "internet/dns/dns.h"
-
-/// \moduleref network
-
-typedef struct _wiznet5k_obj_t {
-    mp_obj_base_t base;
-    mp_uint_t cris_state;
-    const spi_t *spi;
-    const pin_obj_t *cs;
-    const pin_obj_t *rst;
-    uint8_t socket_used;
-} wiznet5k_obj_t;
-
-STATIC wiznet5k_obj_t wiznet5k_obj;
-
-STATIC void wiz_cris_enter(void) {
-    wiznet5k_obj.cris_state = MICROPY_BEGIN_ATOMIC_SECTION();
-}
-
-STATIC void wiz_cris_exit(void) {
-    MICROPY_END_ATOMIC_SECTION(wiznet5k_obj.cris_state);
-}
-
-STATIC void wiz_cs_select(void) {
-    mp_hal_pin_low(wiznet5k_obj.cs);
-}
-
-STATIC void wiz_cs_deselect(void) {
-    mp_hal_pin_high(wiznet5k_obj.cs);
-}
-
-STATIC void wiz_spi_read(uint8_t *buf, uint32_t len) {
-    HAL_StatusTypeDef status = HAL_SPI_Receive(wiznet5k_obj.spi->spi, buf, len, 5000);
-    (void)status;
-}
-
-STATIC void wiz_spi_write(const uint8_t *buf, uint32_t len) {
-    HAL_StatusTypeDef status = HAL_SPI_Transmit(wiznet5k_obj.spi->spi, (uint8_t *)buf, len, 5000);
-    (void)status;
-}
-
-STATIC int wiznet5k_gethostbyname(mp_obj_t nic, const char *name, mp_uint_t len, uint8_t *out_ip) {
-    uint8_t dns_ip[MOD_NETWORK_IPADDR_BUF_SIZE] = {8, 8, 8, 8};
-    uint8_t *buf = m_new(uint8_t, MAX_DNS_BUF_SIZE);
-    DNS_init(0, buf);
-    mp_int_t ret = DNS_run(dns_ip, (uint8_t *)name, out_ip);
-    m_del(uint8_t, buf, MAX_DNS_BUF_SIZE);
-    if (ret == 1) {
-        // success
-        return 0;
-    } else {
-        // failure
-        return -2;
-    }
-}
-
-STATIC int wiznet5k_socket_socket(mod_network_socket_obj_t *socket, int *_errno) {
-    if (socket->domain != MOD_NETWORK_AF_INET) {
-        *_errno = MP_EAFNOSUPPORT;
-        return -1;
-    }
-
-    switch (socket->type) {
-        case MOD_NETWORK_SOCK_STREAM:
-            socket->type = Sn_MR_TCP;
-            break;
-        case MOD_NETWORK_SOCK_DGRAM:
-            socket->type = Sn_MR_UDP;
-            break;
-        default:
-            *_errno = MP_EINVAL;
-            return -1;
-    }
-
-    if (socket->fileno == -1) {
-        // get first unused socket number
-        for (mp_uint_t sn = 0; sn < _WIZCHIP_SOCK_NUM_; sn++) {
-            if ((wiznet5k_obj.socket_used & (1 << sn)) == 0) {
-                wiznet5k_obj.socket_used |= (1 << sn);
-                socket->fileno = sn;
-                break;
-            }
-        }
-        if (socket->fileno == -1) {
-            // too many open sockets
-            *_errno = MP_EMFILE;
-            return -1;
-        }
-    }
-
-    // WIZNET does not have a concept of pure "open socket".  You need to know
-    // if it's a server or client at the time of creation of the socket.
-    // So, we defer the open until we know what kind of socket we want.
-
-    // use "domain" to indicate that this socket has not yet been opened
-    socket->domain = 0;
-
-    return 0;
-}
-
-STATIC void wiznet5k_socket_close(mod_network_socket_obj_t *socket) {
-    uint8_t sn = (uint8_t)socket->fileno;
-    if (sn < _WIZCHIP_SOCK_NUM_) {
-        wiznet5k_obj.socket_used &= ~(1 << sn);
-        WIZCHIP_EXPORT(close)(sn);
-    }
-}
-
-STATIC int wiznet5k_socket_bind(mod_network_socket_obj_t *socket, byte *ip, mp_uint_t port, int *_errno) {
-    // open the socket in server mode (if port != 0)
-    mp_int_t ret = WIZCHIP_EXPORT(socket)(socket->fileno, socket->type, port, 0);
-    if (ret < 0) {
-        wiznet5k_socket_close(socket);
-        *_errno = -ret;
-        return -1;
-    }
-
-    // indicate that this socket has been opened
-    socket->domain = 1;
-
-    // success
-    return 0;
-}
-
-STATIC int wiznet5k_socket_listen(mod_network_socket_obj_t *socket, mp_int_t backlog, int *_errno) {
-    mp_int_t ret = WIZCHIP_EXPORT(listen)(socket->fileno);
-    if (ret < 0) {
-        wiznet5k_socket_close(socket);
-        *_errno = -ret;
-        return -1;
-    }
-    return 0;
-}
-
-STATIC int wiznet5k_socket_accept(mod_network_socket_obj_t *socket, mod_network_socket_obj_t *socket2, byte *ip, mp_uint_t *port, int *_errno) {
-    for (;;) {
-        int sr = getSn_SR((uint8_t)socket->fileno);
-        if (sr == SOCK_ESTABLISHED) {
-            socket2->domain = socket->domain;
-            socket2->type = socket->type;
-            socket2->fileno = socket->fileno;
-            getSn_DIPR((uint8_t)socket2->fileno, ip);
-            *port = getSn_PORT(socket2->fileno);
-
-            // WIZnet turns the listening socket into the client socket, so we
-            // need to re-bind and re-listen on another socket for the server.
-            // TODO handle errors, especially no-more-sockets error
-            socket->domain = MOD_NETWORK_AF_INET;
-            socket->fileno = -1;
-            int _errno2;
-            if (wiznet5k_socket_socket(socket, &_errno2) != 0) {
-                // printf("(bad resocket %d)\n", _errno2);
-            } else if (wiznet5k_socket_bind(socket, NULL, *port, &_errno2) != 0) {
-                // printf("(bad rebind %d)\n", _errno2);
-            } else if (wiznet5k_socket_listen(socket, 0, &_errno2) != 0) {
-                // printf("(bad relisten %d)\n", _errno2);
-            }
-
-            return 0;
-        }
-        if (sr == SOCK_CLOSED || sr == SOCK_CLOSE_WAIT) {
-            wiznet5k_socket_close(socket);
-            *_errno = MP_ENOTCONN; // ??
-            return -1;
-        }
-        mp_hal_delay_ms(1);
-    }
-}
-
-STATIC int wiznet5k_socket_connect(mod_network_socket_obj_t *socket, byte *ip, mp_uint_t port, int *_errno) {
-    // use "bind" function to open the socket in client mode
-    if (wiznet5k_socket_bind(socket, ip, 0, _errno) != 0) {
-        return -1;
-    }
-
-    // now connect
-    MP_THREAD_GIL_EXIT();
-    mp_int_t ret = WIZCHIP_EXPORT(connect)(socket->fileno, ip, port);
-    MP_THREAD_GIL_ENTER();
-
-    if (ret < 0) {
-        wiznet5k_socket_close(socket);
-        *_errno = -ret;
-        return -1;
-    }
-
-    // success
-    return 0;
-}
-
-STATIC mp_uint_t wiznet5k_socket_send(mod_network_socket_obj_t *socket, const byte *buf, mp_uint_t len, int *_errno) {
-    MP_THREAD_GIL_EXIT();
-    mp_int_t ret = WIZCHIP_EXPORT(send)(socket->fileno, (byte *)buf, len);
-    MP_THREAD_GIL_ENTER();
-
-    // TODO convert Wiz errno's to POSIX ones
-    if (ret < 0) {
-        wiznet5k_socket_close(socket);
-        *_errno = -ret;
-        return -1;
-    }
-    return ret;
-}
-
-STATIC mp_uint_t wiznet5k_socket_recv(mod_network_socket_obj_t *socket, byte *buf, mp_uint_t len, int *_errno) {
-    MP_THREAD_GIL_EXIT();
-    mp_int_t ret = WIZCHIP_EXPORT(recv)(socket->fileno, buf, len);
-    MP_THREAD_GIL_ENTER();
-
-    // TODO convert Wiz errno's to POSIX ones
-    if (ret < 0) {
-        wiznet5k_socket_close(socket);
-        *_errno = -ret;
-        return -1;
-    }
-    return ret;
-}
-
-STATIC mp_uint_t wiznet5k_socket_sendto(mod_network_socket_obj_t *socket, const byte *buf, mp_uint_t len, byte *ip, mp_uint_t port, int *_errno) {
-    if (socket->domain == 0) {
-        // socket not opened; use "bind" function to open the socket in client mode
-        if (wiznet5k_socket_bind(socket, ip, 0, _errno) != 0) {
-            return -1;
-        }
-    }
-
-    MP_THREAD_GIL_EXIT();
-    mp_int_t ret = WIZCHIP_EXPORT(sendto)(socket->fileno, (byte *)buf, len, ip, port);
-    MP_THREAD_GIL_ENTER();
-
-    if (ret < 0) {
-        wiznet5k_socket_close(socket);
-        *_errno = -ret;
-        return -1;
-    }
-    return ret;
-}
-
-STATIC mp_uint_t wiznet5k_socket_recvfrom(mod_network_socket_obj_t *socket, byte *buf, mp_uint_t len, byte *ip, mp_uint_t *port, int *_errno) {
-    uint16_t port2;
-    MP_THREAD_GIL_EXIT();
-    mp_int_t ret = WIZCHIP_EXPORT(recvfrom)(socket->fileno, buf, len, ip, &port2);
-    MP_THREAD_GIL_ENTER();
-    *port = port2;
-    if (ret < 0) {
-        wiznet5k_socket_close(socket);
-        *_errno = -ret;
-        return -1;
-    }
-    return ret;
-}
-
-STATIC int wiznet5k_socket_setsockopt(mod_network_socket_obj_t *socket, mp_uint_t level, mp_uint_t opt, const void *optval, mp_uint_t optlen, int *_errno) {
-    // TODO
-    *_errno = MP_EINVAL;
-    return -1;
-}
-
-STATIC int wiznet5k_socket_settimeout(mod_network_socket_obj_t *socket, mp_uint_t timeout_ms, int *_errno) {
-    // TODO
-    *_errno = MP_EINVAL;
-    return -1;
-
-    /*
-    if (timeout_ms == 0) {
-        // set non-blocking mode
-        uint8_t arg = SOCK_IO_NONBLOCK;
-        WIZCHIP_EXPORT(ctlsocket)(socket->fileno, CS_SET_IOMODE, &arg);
-    }
-    */
-}
-
-STATIC int wiznet5k_socket_ioctl(mod_network_socket_obj_t *socket, mp_uint_t request, mp_uint_t arg, int *_errno) {
-    if (request == MP_STREAM_POLL) {
-        int ret = 0;
-        if (arg & MP_STREAM_POLL_RD && getSn_RX_RSR(socket->fileno) != 0) {
-            ret |= MP_STREAM_POLL_RD;
-        }
-        if (arg & MP_STREAM_POLL_WR && getSn_TX_FSR(socket->fileno) != 0) {
-            ret |= MP_STREAM_POLL_WR;
-        }
-        return ret;
-    } else {
-        *_errno = MP_EINVAL;
-        return MP_STREAM_ERROR;
-    }
-}
-
-#if 0
-STATIC void wiznet5k_socket_print(void (*print)(void *env, const char *fmt, ...), void *env, mp_obj_t self_in, mp_print_kind_t kind) {
-    wiznet5k_socket_obj_t *self = self_in;
-    print(env, "<WIZNET5K.socket sn=%u MR=0x%02x>", self->sn, getSn_MR(self->sn));
-}
-
-STATIC mp_obj_t wiznet5k_socket_disconnect(mp_obj_t self_in) {
-    mp_int_t ret = WIZCHIP_EXPORT(disconnect)(self->sn);
-    return 0;
-}
-#endif
-
-/******************************************************************************/
-// MicroPython bindings
-
-/// \classmethod \constructor(spi, pin_cs, pin_rst)
-/// Create and return a WIZNET5K object.
-STATIC mp_obj_t wiznet5k_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
-    // check arguments
-    mp_arg_check_num(n_args, n_kw, 3, 3, false);
-
-    // init the wiznet5k object
-    wiznet5k_obj.base.type = (mp_obj_type_t *)&mod_network_nic_type_wiznet5k;
-    wiznet5k_obj.cris_state = 0;
-    wiznet5k_obj.spi = spi_from_mp_obj(args[0]);
-    wiznet5k_obj.cs = pin_find(args[1]);
-    wiznet5k_obj.rst = pin_find(args[2]);
-    wiznet5k_obj.socket_used = 0;
-
-    /*!< SPI configuration */
-    SPI_InitTypeDef *init = &wiznet5k_obj.spi->spi->Init;
-    init->Mode = SPI_MODE_MASTER;
-    init->Direction = SPI_DIRECTION_2LINES;
-    init->DataSize = SPI_DATASIZE_8BIT;
-    init->CLKPolarity = SPI_POLARITY_LOW; // clock is low when idle
-    init->CLKPhase = SPI_PHASE_1EDGE; // data latched on first edge, which is rising edge for low-idle
-    init->NSS = SPI_NSS_SOFT;
-    init->BaudRatePrescaler = SPI_BAUDRATEPRESCALER_2; // clock freq = f_PCLK / this_prescale_value; Wiz820i can do up to 80MHz
-    init->FirstBit = SPI_FIRSTBIT_MSB;
-    init->TIMode = SPI_TIMODE_DISABLED;
-    init->CRCCalculation = SPI_CRCCALCULATION_DISABLED;
-    init->CRCPolynomial = 7; // unused
-    spi_init(wiznet5k_obj.spi, false);
-
-    mp_hal_pin_output(wiznet5k_obj.cs);
-    mp_hal_pin_output(wiznet5k_obj.rst);
-
-    mp_hal_pin_low(wiznet5k_obj.rst);
-    mp_hal_delay_ms(1); // datasheet says 2us
-    mp_hal_pin_high(wiznet5k_obj.rst);
-    mp_hal_delay_ms(160); // datasheet says 150ms
-
-    reg_wizchip_cris_cbfunc(wiz_cris_enter, wiz_cris_exit);
-    reg_wizchip_cs_cbfunc(wiz_cs_select, wiz_cs_deselect);
-    reg_wizchip_spi_cbfunc(wiz_spi_read, wiz_spi_write);
-
-    uint8_t sn_size[16] = {2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2}; // 2k buffer for each socket
-    ctlwizchip(CW_INIT_WIZCHIP, sn_size);
-
-    // set some sensible default values; they are configurable using ifconfig method
-    wiz_NetInfo netinfo = {
-        .mac = {0x00, 0x08, 0xdc, 0xab, 0xcd, 0xef},
-        .ip = {192, 168, 0, 18},
-        .sn = {255, 255, 255, 0},
-        .gw = {192, 168, 0, 1},
-        .dns = {8, 8, 8, 8}, // Google public DNS
-        .dhcp = NETINFO_STATIC,
-    };
-    ctlnetwork(CN_SET_NETINFO, (void *)&netinfo);
-
-    // seems we need a small delay after init
-    mp_hal_delay_ms(250);
-
-    // register with network module
-    mod_network_register_nic(&wiznet5k_obj);
-
-    // return wiznet5k object
-    return &wiznet5k_obj;
-}
-
-/// \method regs()
-/// Dump WIZNET5K registers.
-STATIC mp_obj_t wiznet5k_regs(mp_obj_t self_in) {
-    // wiznet5k_obj_t *self = self_in;
-    printf("Wiz CREG:");
-    for (int i = 0; i < 0x50; ++i) {
-        if (i % 16 == 0) {
-            printf("\n  %04x:", i);
-        }
-        #if MICROPY_PY_NETWORK_WIZNET5K == 5200
-        uint32_t reg = i;
-        #else
-        uint32_t reg = _W5500_IO_BASE_ | i << 8;
-        #endif
-        printf(" %02x", WIZCHIP_READ(reg));
-    }
-    for (int sn = 0; sn < 4; ++sn) {
-        printf("\nWiz SREG[%d]:", sn);
-        for (int i = 0; i < 0x30; ++i) {
-            if (i % 16 == 0) {
-                printf("\n  %04x:", i);
-            }
-            #if MICROPY_PY_NETWORK_WIZNET5K == 5200
-            uint32_t reg = WIZCHIP_SREG_ADDR(sn, i);
-            #else
-            uint32_t reg = _W5500_IO_BASE_ | i << 8 | WIZCHIP_SREG_BLOCK(sn) << 3;
-            #endif
-            printf(" %02x", WIZCHIP_READ(reg));
-        }
-    }
-    printf("\n");
-    return mp_const_none;
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(wiznet5k_regs_obj, wiznet5k_regs);
-
-STATIC mp_obj_t wiznet5k_isconnected(mp_obj_t self_in) {
-    (void)self_in;
-    return mp_obj_new_bool(wizphy_getphylink() == PHY_LINK_ON);
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(wiznet5k_isconnected_obj, wiznet5k_isconnected);
-
-/// \method ifconfig([(ip, subnet, gateway, dns)])
-/// Get/set IP address, subnet mask, gateway and DNS.
-STATIC mp_obj_t wiznet5k_ifconfig(size_t n_args, const mp_obj_t *args) {
-    wiz_NetInfo netinfo;
-    ctlnetwork(CN_GET_NETINFO, &netinfo);
-    if (n_args == 1) {
-        // get
-        mp_obj_t tuple[4] = {
-            netutils_format_ipv4_addr(netinfo.ip, NETUTILS_BIG),
-            netutils_format_ipv4_addr(netinfo.sn, NETUTILS_BIG),
-            netutils_format_ipv4_addr(netinfo.gw, NETUTILS_BIG),
-            netutils_format_ipv4_addr(netinfo.dns, NETUTILS_BIG),
-        };
-        return mp_obj_new_tuple(4, tuple);
-    } else {
-        // set
-        mp_obj_t *items;
-        mp_obj_get_array_fixed_n(args[1], 4, &items);
-        netutils_parse_ipv4_addr(items[0], netinfo.ip, NETUTILS_BIG);
-        netutils_parse_ipv4_addr(items[1], netinfo.sn, NETUTILS_BIG);
-        netutils_parse_ipv4_addr(items[2], netinfo.gw, NETUTILS_BIG);
-        netutils_parse_ipv4_addr(items[3], netinfo.dns, NETUTILS_BIG);
-        ctlnetwork(CN_SET_NETINFO, &netinfo);
-        return mp_const_none;
-    }
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(wiznet5k_ifconfig_obj, 1, 2, wiznet5k_ifconfig);
-
-STATIC const mp_rom_map_elem_t wiznet5k_locals_dict_table[] = {
-    { MP_ROM_QSTR(MP_QSTR_regs), MP_ROM_PTR(&wiznet5k_regs_obj) },
-    { MP_ROM_QSTR(MP_QSTR_ifconfig), MP_ROM_PTR(&wiznet5k_ifconfig_obj) },
-    { MP_ROM_QSTR(MP_QSTR_isconnected), MP_ROM_PTR(&wiznet5k_isconnected_obj) },
-};
-
-STATIC MP_DEFINE_CONST_DICT(wiznet5k_locals_dict, wiznet5k_locals_dict_table);
-
-const mod_network_nic_type_t mod_network_nic_type_wiznet5k = {
-    .base = {
-        { &mp_type_type },
-        .name = MP_QSTR_WIZNET5K,
-        .make_new = wiznet5k_make_new,
-        .locals_dict = (mp_obj_dict_t *)&wiznet5k_locals_dict,
-    },
-    .gethostbyname = wiznet5k_gethostbyname,
-    .socket = wiznet5k_socket_socket,
-    .close = wiznet5k_socket_close,
-    .bind = wiznet5k_socket_bind,
-    .listen = wiznet5k_socket_listen,
-    .accept = wiznet5k_socket_accept,
-    .connect = wiznet5k_socket_connect,
-    .send = wiznet5k_socket_send,
-    .recv = wiznet5k_socket_recv,
-    .sendto = wiznet5k_socket_sendto,
-    .recvfrom = wiznet5k_socket_recvfrom,
-    .setsockopt = wiznet5k_socket_setsockopt,
-    .settimeout = wiznet5k_socket_settimeout,
-    .ioctl = wiznet5k_socket_ioctl,
-};
-
-#endif // MICROPY_PY_NETWORK_WIZNET5K && !MICROPY_PY_LWIP
diff --git a/ports/stm32/network_wiznet5k.c b/ports/stm32/network_wiznet5k.c
deleted file mode 100644
index 4675f3c2c2a1e..0000000000000
--- a/ports/stm32/network_wiznet5k.c
+++ /dev/null
@@ -1,465 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2014-2018 Damien P. George
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#include <stdio.h>
-#include <string.h>
-
-#include "py/runtime.h"
-#include "py/mphal.h"
-#include "extmod/modnetwork.h"
-#include "spi.h"
-
-#if MICROPY_PY_NETWORK_WIZNET5K && MICROPY_PY_LWIP
-
-#include "shared/netutils/netutils.h"
-#include "drivers/wiznet5k/ethernet/socket.h"
-#include "lwip/err.h"
-#include "lwip/dns.h"
-#include "lwip/dhcp.h"
-#include "netif/etharp.h"
-
-#define TRACE_ETH_TX (0x0002)
-#define TRACE_ETH_RX (0x0004)
-
-/*******************************************************************************/
-// Wiznet5k Ethernet driver in MACRAW mode
-
-typedef struct _wiznet5k_obj_t {
-    mp_obj_base_t base;
-    mp_uint_t cris_state;
-    const spi_t *spi;
-    mp_hal_pin_obj_t cs;
-    mp_hal_pin_obj_t rst;
-    uint8_t eth_frame[1514];
-    uint32_t trace_flags;
-    struct netif netif;
-    struct dhcp dhcp_struct;
-} wiznet5k_obj_t;
-
-// Global object holding the Wiznet5k state
-STATIC wiznet5k_obj_t wiznet5k_obj;
-
-STATIC void wiznet5k_lwip_init(wiznet5k_obj_t *self);
-
-STATIC void wiz_cris_enter(void) {
-    wiznet5k_obj.cris_state = MICROPY_BEGIN_ATOMIC_SECTION();
-}
-
-STATIC void wiz_cris_exit(void) {
-    MICROPY_END_ATOMIC_SECTION(wiznet5k_obj.cris_state);
-}
-
-STATIC void wiz_cs_select(void) {
-    mp_hal_pin_low(wiznet5k_obj.cs);
-}
-
-STATIC void wiz_cs_deselect(void) {
-    mp_hal_pin_high(wiznet5k_obj.cs);
-}
-
-STATIC void wiz_spi_read(uint8_t *buf, uint32_t len) {
-    HAL_StatusTypeDef status = HAL_SPI_Receive(wiznet5k_obj.spi->spi, buf, len, 5000);
-    (void)status;
-}
-
-STATIC void wiz_spi_write(const uint8_t *buf, uint32_t len) {
-    HAL_StatusTypeDef status = HAL_SPI_Transmit(wiznet5k_obj.spi->spi, (uint8_t *)buf, len, 5000);
-    (void)status;
-}
-
-STATIC void wiznet5k_init(void) {
-    // SPI configuration
-    SPI_InitTypeDef *init = &wiznet5k_obj.spi->spi->Init;
-    init->Mode = SPI_MODE_MASTER;
-    init->Direction = SPI_DIRECTION_2LINES;
-    init->DataSize = SPI_DATASIZE_8BIT;
-    init->CLKPolarity = SPI_POLARITY_LOW; // clock is low when idle
-    init->CLKPhase = SPI_PHASE_1EDGE; // data latched on first edge, which is rising edge for low-idle
-    init->NSS = SPI_NSS_SOFT;
-    init->BaudRatePrescaler = SPI_BAUDRATEPRESCALER_2; // clock freq = f_PCLK / this_prescale_value; Wiz820i can do up to 80MHz
-    init->FirstBit = SPI_FIRSTBIT_MSB;
-    init->TIMode = SPI_TIMODE_DISABLED;
-    init->CRCCalculation = SPI_CRCCALCULATION_DISABLED;
-    init->CRCPolynomial = 7; // unused
-    spi_init(wiznet5k_obj.spi, false);
-
-    mp_hal_pin_output(wiznet5k_obj.cs);
-    mp_hal_pin_output(wiznet5k_obj.rst);
-
-    // Reset the chip
-    mp_hal_pin_low(wiznet5k_obj.rst);
-    mp_hal_delay_ms(1); // datasheet says 2us
-    mp_hal_pin_high(wiznet5k_obj.rst);
-    mp_hal_delay_ms(150); // datasheet says 150ms
-
-    // Set physical interface callbacks
-    reg_wizchip_cris_cbfunc(wiz_cris_enter, wiz_cris_exit);
-    reg_wizchip_cs_cbfunc(wiz_cs_select, wiz_cs_deselect);
-    reg_wizchip_spi_cbfunc(wiz_spi_read, wiz_spi_write);
-
-    // Configure 16k buffers for fast MACRAW
-    uint8_t sn_size[16] = {16, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 0, 0, 0, 0};
-    ctlwizchip(CW_INIT_WIZCHIP, sn_size);
-
-    // Seems we need a small delay after init
-    mp_hal_delay_ms(250);
-
-    // If the device doesn't have a MAC address then set one
-    uint8_t mac[6];
-    getSHAR(mac);
-    if ((mac[0] | mac[1] | mac[2] | mac[3] | mac[4] | mac[5]) == 0) {
-        mp_hal_get_mac(MP_HAL_MAC_ETH0, mac);
-        setSHAR(mac);
-    }
-
-    // Hook the Wiznet into lwIP
-    wiznet5k_lwip_init(&wiznet5k_obj);
-}
-
-STATIC void wiznet5k_deinit(void) {
-    for (struct netif *netif = netif_list; netif != NULL; netif = netif->next) {
-        if (netif == &wiznet5k_obj.netif) {
-            netif_remove(netif);
-            netif->flags = 0;
-            break;
-        }
-    }
-}
-
-STATIC void wiznet5k_get_mac_address(wiznet5k_obj_t *self, uint8_t mac[6]) {
-    (void)self;
-    getSHAR(mac);
-}
-
-STATIC void wiznet5k_send_ethernet(wiznet5k_obj_t *self, size_t len, const uint8_t *buf) {
-    uint8_t ip[4] = {1, 1, 1, 1}; // dummy
-    int ret = WIZCHIP_EXPORT(sendto)(0, (byte *)buf, len, ip, 11); // dummy port
-    if (ret != len) {
-        printf("wiznet5k_send_ethernet: fatal error %d\n", ret);
-        netif_set_link_down(&self->netif);
-        netif_set_down(&self->netif);
-    }
-}
-
-// Stores the frame in self->eth_frame and returns number of bytes in the frame, 0 for no frame
-STATIC uint16_t wiznet5k_recv_ethernet(wiznet5k_obj_t *self) {
-    uint16_t len = getSn_RX_RSR(0);
-    if (len == 0) {
-        return 0;
-    }
-
-    byte ip[4];
-    uint16_t port;
-    int ret = WIZCHIP_EXPORT(recvfrom)(0, self->eth_frame, 1514, ip, &port);
-    if (ret <= 0) {
-        printf("wiznet5k_poll: fatal error len=%u ret=%d\n", len, ret);
-        netif_set_link_down(&self->netif);
-        netif_set_down(&self->netif);
-        return 0;
-    }
-
-    return ret;
-}
-
-/*******************************************************************************/
-// Wiznet5k lwIP interface
-
-STATIC err_t wiznet5k_netif_output(struct netif *netif, struct pbuf *p) {
-    wiznet5k_obj_t *self = netif->state;
-    pbuf_copy_partial(p, self->eth_frame, p->tot_len, 0);
-    if (self->trace_flags & TRACE_ETH_TX) {
-        netutils_ethernet_trace(MP_PYTHON_PRINTER, p->tot_len, self->eth_frame, NETUTILS_TRACE_IS_TX | NETUTILS_TRACE_NEWLINE);
-    }
-    wiznet5k_send_ethernet(self, p->tot_len, self->eth_frame);
-    return ERR_OK;
-}
-
-STATIC err_t wiznet5k_netif_init(struct netif *netif) {
-    netif->linkoutput = wiznet5k_netif_output;
-    netif->output = etharp_output;
-    netif->mtu = 1500;
-    netif->flags = NETIF_FLAG_BROADCAST | NETIF_FLAG_ETHARP | NETIF_FLAG_ETHERNET | NETIF_FLAG_IGMP;
-    wiznet5k_get_mac_address(netif->state, netif->hwaddr);
-    netif->hwaddr_len = sizeof(netif->hwaddr);
-    int ret = WIZCHIP_EXPORT(socket)(0, Sn_MR_MACRAW, 0, 0);
-    if (ret != 0) {
-        printf("WIZNET fatal error in netifinit: %d\n", ret);
-        return ERR_IF;
-    }
-
-    // Enable MAC filtering so we only get frames destined for us, to reduce load on lwIP
-    setSn_MR(0, getSn_MR(0) | Sn_MR_MFEN);
-
-    return ERR_OK;
-}
-
-STATIC void wiznet5k_lwip_init(wiznet5k_obj_t *self) {
-    ip_addr_t ipconfig[4];
-    ipconfig[0].addr = 0;
-    ipconfig[1].addr = 0;
-    ipconfig[2].addr = 0;
-    ipconfig[3].addr = 0;
-    netif_add(&self->netif, &ipconfig[0], &ipconfig[1], &ipconfig[2], self, wiznet5k_netif_init, ethernet_input);
-    self->netif.name[0] = 'e';
-    self->netif.name[1] = '0';
-    netif_set_default(&self->netif);
-    dns_setserver(0, &ipconfig[3]);
-    dhcp_set_struct(&self->netif, &self->dhcp_struct);
-    // Setting NETIF_FLAG_UP then clearing it is a workaround for dhcp_start and the
-    // LWIP_DHCP_CHECK_LINK_UP option, so that the DHCP client schedules itself to
-    // automatically start when the interface later goes up.
-    self->netif.flags |= NETIF_FLAG_UP;
-    dhcp_start(&self->netif);
-    self->netif.flags &= ~NETIF_FLAG_UP;
-}
-
-void wiznet5k_poll(void) {
-    wiznet5k_obj_t *self = &wiznet5k_obj;
-    if (!(self->netif.flags & NETIF_FLAG_LINK_UP)) {
-        return;
-    }
-    uint16_t len;
-    while ((len = wiznet5k_recv_ethernet(self)) > 0) {
-        if (self->trace_flags & TRACE_ETH_RX) {
-            netutils_ethernet_trace(MP_PYTHON_PRINTER, len, self->eth_frame, NETUTILS_TRACE_NEWLINE);
-        }
-        struct pbuf *p = pbuf_alloc(PBUF_RAW, len, PBUF_POOL);
-        if (p != NULL) {
-            pbuf_take(p, self->eth_frame, len);
-            if (self->netif.input(p, &self->netif) != ERR_OK) {
-                pbuf_free(p);
-            }
-        }
-    }
-}
-
-/*******************************************************************************/
-// MicroPython bindings
-
-// WIZNET5K([spi, pin_cs, pin_rst])
-STATIC mp_obj_t wiznet5k_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
-    // check arguments
-    mp_arg_check_num(n_args, n_kw, 3, 3, false);
-
-    const spi_t *spi = spi_from_mp_obj(args[0]);
-    mp_hal_pin_obj_t cs = pin_find(args[1]);
-    mp_hal_pin_obj_t rst = pin_find(args[2]);
-
-    // Access the existing object, if it has been constructed with the same hardware interface
-    if (wiznet5k_obj.base.type == (mp_obj_type_t *)&mod_network_nic_type_wiznet5k) {
-        if (!(wiznet5k_obj.spi == spi && wiznet5k_obj.cs == cs && wiznet5k_obj.rst == rst
-              && wiznet5k_obj.netif.flags != 0)) {
-            wiznet5k_deinit();
-        }
-    }
-
-    // Init the wiznet5k object
-    wiznet5k_obj.base.type = (mp_obj_type_t *)&mod_network_nic_type_wiznet5k;
-    wiznet5k_obj.cris_state = 0;
-    wiznet5k_obj.spi = spi;
-    wiznet5k_obj.cs = cs;
-    wiznet5k_obj.rst = rst;
-    wiznet5k_obj.trace_flags = 0;
-
-    // Return wiznet5k object
-    return MP_OBJ_FROM_PTR(&wiznet5k_obj);
-}
-
-STATIC mp_obj_t wiznet5k_regs(mp_obj_t self_in) {
-    (void)self_in;
-    printf("Wiz CREG:");
-    for (int i = 0; i < 0x50; ++i) {
-        if (i % 16 == 0) {
-            printf("\n  %04x:", i);
-        }
-        #if MICROPY_PY_NETWORK_WIZNET5K == 5200
-        uint32_t reg = i;
-        #else
-        uint32_t reg = _W5500_IO_BASE_ | i << 8;
-        #endif
-        printf(" %02x", WIZCHIP_READ(reg));
-    }
-    for (int sn = 0; sn < 4; ++sn) {
-        printf("\nWiz SREG[%d]:", sn);
-        for (int i = 0; i < 0x30; ++i) {
-            if (i % 16 == 0) {
-                printf("\n  %04x:", i);
-            }
-            #if MICROPY_PY_NETWORK_WIZNET5K == 5200
-            uint32_t reg = WIZCHIP_SREG_ADDR(sn, i);
-            #else
-            uint32_t reg = _W5500_IO_BASE_ | i << 8 | WIZCHIP_SREG_BLOCK(sn) << 3;
-            #endif
-            printf(" %02x", WIZCHIP_READ(reg));
-        }
-    }
-    printf("\n");
-    return mp_const_none;
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(wiznet5k_regs_obj, wiznet5k_regs);
-
-STATIC mp_obj_t wiznet5k_isconnected(mp_obj_t self_in) {
-    wiznet5k_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    return mp_obj_new_bool(
-        wizphy_getphylink() == PHY_LINK_ON
-        && (self->netif.flags & NETIF_FLAG_UP)
-        && self->netif.ip_addr.addr != 0
-        );
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(wiznet5k_isconnected_obj, wiznet5k_isconnected);
-
-STATIC mp_obj_t wiznet5k_active(size_t n_args, const mp_obj_t *args) {
-    wiznet5k_obj_t *self = MP_OBJ_TO_PTR(args[0]);
-    if (n_args == 1) {
-        return mp_obj_new_bool(self->netif.flags & NETIF_FLAG_UP);
-    } else {
-        if (mp_obj_is_true(args[1])) {
-            if (!(self->netif.flags & NETIF_FLAG_UP)) {
-                wiznet5k_init();
-                netif_set_link_up(&self->netif);
-                netif_set_up(&self->netif);
-            }
-        } else {
-            if (self->netif.flags & NETIF_FLAG_UP) {
-                netif_set_down(&self->netif);
-                netif_set_link_down(&self->netif);
-                wiznet5k_deinit();
-            }
-        }
-        return mp_const_none;
-    }
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(wiznet5k_active_obj, 1, 2, wiznet5k_active);
-
-STATIC mp_obj_t wiznet5k_ifconfig(size_t n_args, const mp_obj_t *args) {
-    wiznet5k_obj_t *self = MP_OBJ_TO_PTR(args[0]);
-    return mod_network_nic_ifconfig(&self->netif, n_args - 1, args + 1);
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(wiznet5k_ifconfig_obj, 1, 2, wiznet5k_ifconfig);
-
-STATIC mp_obj_t wiznet5k_status(size_t n_args, const mp_obj_t *args) {
-    wiznet5k_obj_t *self = MP_OBJ_TO_PTR(args[0]);
-    (void)self;
-
-    if (n_args == 1) {
-        // No arguments: return link status
-        if (self->netif.flags && wizphy_getphylink() == PHY_LINK_ON) {
-            if ((self->netif.flags & NETIF_FLAG_UP) && self->netif.ip_addr.addr != 0) {
-                return MP_OBJ_NEW_SMALL_INT(2);
-            } else {
-                return MP_OBJ_NEW_SMALL_INT(1);
-            }
-        } else {
-            return MP_OBJ_NEW_SMALL_INT(0);
-        }
-    }
-
-    mp_raise_ValueError(MP_ERROR_TEXT("unknown config param"));
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(wiznet5k_status_obj, 1, 2, wiznet5k_status);
-
-STATIC mp_obj_t wiznet5k_config(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs) {
-    wiznet5k_obj_t *self = MP_OBJ_TO_PTR(args[0]);
-
-    if (kwargs->used == 0) {
-        // Get config value
-        if (n_args != 2) {
-            mp_raise_TypeError(MP_ERROR_TEXT("must query one param"));
-        }
-
-        switch (mp_obj_str_get_qstr(args[1])) {
-            case MP_QSTR_mac: {
-                uint8_t buf[6];
-                wiznet5k_get_mac_address(self, buf);
-                return mp_obj_new_bytes(buf, 6);
-            }
-            default:
-                mp_raise_ValueError(MP_ERROR_TEXT("unknown config param"));
-        }
-    } else {
-        // Set config value(s)
-        if (n_args != 1) {
-            mp_raise_TypeError(MP_ERROR_TEXT("can't specify pos and kw args"));
-        }
-
-        for (size_t i = 0; i < kwargs->alloc; ++i) {
-            if (MP_MAP_SLOT_IS_FILLED(kwargs, i)) {
-                mp_map_elem_t *e = &kwargs->table[i];
-                switch (mp_obj_str_get_qstr(e->key)) {
-                    case MP_QSTR_mac: {
-                        mp_buffer_info_t buf;
-                        mp_get_buffer_raise(e->value, &buf, MP_BUFFER_READ);
-                        if (buf.len != 6) {
-                            mp_raise_ValueError(NULL);
-                        }
-                        setSHAR(buf.buf);
-                        memcpy(self->netif.hwaddr, buf.buf, 6);
-                        break;
-                    }
-                    case MP_QSTR_trace: {
-                        self->trace_flags = mp_obj_get_int(e->value);
-                        break;
-                    }
-                    default:
-                        mp_raise_ValueError(MP_ERROR_TEXT("unknown config param"));
-                }
-            }
-        }
-
-        return mp_const_none;
-    }
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(wiznet5k_config_obj, 1, wiznet5k_config);
-
-STATIC mp_obj_t send_ethernet_wrapper(mp_obj_t self_in, mp_obj_t buf_in) {
-    wiznet5k_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    mp_buffer_info_t buf;
-    mp_get_buffer_raise(buf_in, &buf, MP_BUFFER_READ);
-    wiznet5k_send_ethernet(self, buf.len, buf.buf);
-    return mp_const_none;
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(send_ethernet_obj, send_ethernet_wrapper);
-
-STATIC const mp_rom_map_elem_t wiznet5k_locals_dict_table[] = {
-    { MP_ROM_QSTR(MP_QSTR_regs), MP_ROM_PTR(&wiznet5k_regs_obj) },
-    { MP_ROM_QSTR(MP_QSTR_isconnected), MP_ROM_PTR(&wiznet5k_isconnected_obj) },
-    { MP_ROM_QSTR(MP_QSTR_active), MP_ROM_PTR(&wiznet5k_active_obj) },
-    { MP_ROM_QSTR(MP_QSTR_ifconfig), MP_ROM_PTR(&wiznet5k_ifconfig_obj) },
-    { MP_ROM_QSTR(MP_QSTR_status), MP_ROM_PTR(&wiznet5k_status_obj) },
-    { MP_ROM_QSTR(MP_QSTR_config), MP_ROM_PTR(&wiznet5k_config_obj) },
-
-    { MP_ROM_QSTR(MP_QSTR_send_ethernet), MP_ROM_PTR(&send_ethernet_obj) },
-};
-STATIC MP_DEFINE_CONST_DICT(wiznet5k_locals_dict, wiznet5k_locals_dict_table);
-
-const mp_obj_type_t mod_network_nic_type_wiznet5k = {
-    { &mp_type_type },
-    .name = MP_QSTR_WIZNET5K,
-    .make_new = wiznet5k_make_new,
-    .locals_dict = (mp_obj_dict_t *)&wiznet5k_locals_dict,
-};
-
-#endif // MICROPY_PY_NETWORK_WIZNET5K && MICROPY_PY_LWIP

From c3305c49e422369119ab211dc8fb2366aa6d7d53 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Thu, 4 Aug 2022 20:19:57 +0200
Subject: [PATCH 2505/3533] stm32: Add definitions required for lwIP version of
 Wiznet NIC.

---
 ports/stm32/mphalport.h     | 8 ++++++++
 ports/stm32/mpnetworkport.c | 5 +++++
 ports/stm32/pendsv.h        | 3 +++
 3 files changed, 16 insertions(+)

diff --git a/ports/stm32/mphalport.h b/ports/stm32/mphalport.h
index 47bb1f8c84417..8028782a90c47 100644
--- a/ports/stm32/mphalport.h
+++ b/ports/stm32/mphalport.h
@@ -96,11 +96,19 @@ static inline mp_uint_t mp_hal_ticks_cpu(void) {
 #define mp_hal_pin_od_high(p)   mp_hal_pin_high(p)
 #define mp_hal_pin_read(p)      (((p)->gpio->IDR >> (p)->pin) & 1)
 #define mp_hal_pin_write(p, v)  ((v) ? mp_hal_pin_high(p) : mp_hal_pin_low(p))
+#define mp_hal_pin_interrupt(pin, handler, trigger, hard) extint_register_pin(pin, trigger, hard, handler)
+
+enum mp_hal_pin_interrupt_trigger {
+    MP_HAL_PIN_TRIGGER_NONE,
+    MP_HAL_PIN_TRIGGER_FALL = GPIO_MODE_IT_FALLING,
+    MP_HAL_PIN_TRIGGER_RISE = GPIO_MODE_IT_RISING,
+};
 
 void mp_hal_gpio_clock_enable(GPIO_TypeDef *gpio);
 void mp_hal_pin_config(mp_hal_pin_obj_t pin, uint32_t mode, uint32_t pull, uint32_t alt);
 bool mp_hal_pin_config_alt(mp_hal_pin_obj_t pin, uint32_t mode, uint32_t pull, uint8_t fn, uint8_t unit);
 void mp_hal_pin_config_speed(mp_hal_pin_obj_t pin_obj, uint32_t speed);
+void extint_register_pin(const pin_obj_t *pin, uint32_t mode, bool hard_irq, mp_obj_t callback_obj);
 
 enum {
     MP_HAL_MAC_WLAN0 = 0,
diff --git a/ports/stm32/mpnetworkport.c b/ports/stm32/mpnetworkport.c
index 2f49328e110ee..1ce758e7dd78a 100644
--- a/ports/stm32/mpnetworkport.c
+++ b/ports/stm32/mpnetworkport.c
@@ -50,6 +50,11 @@
 
 #if MICROPY_PY_NETWORK_WIZNET5K
 void wiznet5k_poll(void);
+void wiznet5k_deinit(void);
+
+void wiznet5k_try_poll(void) {
+    pendsv_schedule_dispatch(PENDSV_DISPATCH_WIZNET, wiznet5k_poll);
+}
 #endif
 
 u32_t sys_now(void) {
diff --git a/ports/stm32/pendsv.h b/ports/stm32/pendsv.h
index 0733d355d3112..f97581e99a308 100644
--- a/ports/stm32/pendsv.h
+++ b/ports/stm32/pendsv.h
@@ -35,6 +35,9 @@ enum {
     #if MICROPY_PY_NETWORK_CYW43
     PENDSV_DISPATCH_CYW43,
     #endif
+    #if MICROPY_PY_NETWORK_WIZNET5K
+    PENDSV_DISPATCH_WIZNET,
+    #endif
     #endif
     #if MICROPY_PY_BLUETOOTH && !MICROPY_PY_BLUETOOTH_USE_SYNC_EVENTS
     PENDSV_DISPATCH_BLUETOOTH_HCI,

From 54eaa8c8a6c854e13f3c1b646ef44d0888628353 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Wed, 10 Aug 2022 11:04:09 +0200
Subject: [PATCH 2506/3533] stm32/mphalport: Add mp_hal_get_spi_obj() helper
 function.

The function spi_from_mp_obj() is kept since it is used by the cc3k driver.
---
 ports/stm32/mphalport.h |  2 ++
 ports/stm32/spi.c       | 15 +++++++++++++++
 2 files changed, 17 insertions(+)

diff --git a/ports/stm32/mphalport.h b/ports/stm32/mphalport.h
index 8028782a90c47..358d9cd25d0da 100644
--- a/ports/stm32/mphalport.h
+++ b/ports/stm32/mphalport.h
@@ -110,6 +110,8 @@ bool mp_hal_pin_config_alt(mp_hal_pin_obj_t pin, uint32_t mode, uint32_t pull, u
 void mp_hal_pin_config_speed(mp_hal_pin_obj_t pin_obj, uint32_t speed);
 void extint_register_pin(const pin_obj_t *pin, uint32_t mode, bool hard_irq, mp_obj_t callback_obj);
 
+mp_obj_base_t *mp_hal_get_spi_obj(mp_obj_t spi_in);
+
 enum {
     MP_HAL_MAC_WLAN0 = 0,
     MP_HAL_MAC_WLAN1,
diff --git a/ports/stm32/spi.c b/ports/stm32/spi.c
index 188376ec06d54..9c031cad2e28d 100644
--- a/ports/stm32/spi.c
+++ b/ports/stm32/spi.c
@@ -30,6 +30,7 @@
 #include "py/runtime.h"
 #include "py/mphal.h"
 #include "spi.h"
+#include "extmod/machine_spi.h"
 
 // Possible DMA configurations for SPI buses:
 // SPI1_TX: DMA2_Stream3.CHANNEL_3 or DMA2_Stream5.CHANNEL_3
@@ -685,6 +686,20 @@ const spi_t *spi_from_mp_obj(mp_obj_t o) {
     }
 }
 
+mp_obj_base_t *mp_hal_get_spi_obj(mp_obj_t o) {
+    if (mp_obj_is_type(o, &machine_hard_spi_type)) {
+        return MP_OBJ_TO_PTR(o);
+    }
+    #if MICROPY_PY_MACHINE_SOFTSPI
+    else if (mp_obj_is_type(o, &mp_machine_soft_spi_type)) {
+        return MP_OBJ_TO_PTR(o);
+    }
+    #endif
+    else {
+        mp_raise_TypeError(MP_ERROR_TEXT("expecting an SPI object"));
+    }
+}
+
 /******************************************************************************/
 // Implementation of low-level SPI C protocol
 

From f6ec01d1da8d316e1cdfeaf20cdc0578f943e154 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Fri, 5 Aug 2022 16:49:15 +0200
Subject: [PATCH 2507/3533] tools/ci.sh: Split the stm32 builds for wiznet5k
 and cc3k.

- Add lib/wiznet5k into the 'make submodules' step.
- Split the stm32 builds for wiznet5k and cc3k.
- Run 'make .... clean' after making the wiznet5k build.
---
 tools/ci.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/tools/ci.sh b/tools/ci.sh
index dc2ccf775b15e..b7b20e3c7d65b 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -309,10 +309,12 @@ function ci_stm32_setup {
 
 function ci_stm32_pyb_build {
     make ${MAKEOPTS} -C mpy-cross
-    make ${MAKEOPTS} -C ports/stm32 submodules
+    make ${MAKEOPTS} -C ports/stm32 MICROPY_PY_NETWORK_WIZNET5K=5200 submodules
     git submodule update --init lib/btstack
     git submodule update --init lib/mynewt-nimble
-    make ${MAKEOPTS} -C ports/stm32 BOARD=PYBV11 MICROPY_PY_NETWORK_WIZNET5K=5200 MICROPY_PY_CC3K=1 USER_C_MODULES=../../examples/usercmodule
+    make ${MAKEOPTS} -C ports/stm32 BOARD=PYBV11 MICROPY_PY_NETWORK_WIZNET5K=5200 USER_C_MODULES=../../examples/usercmodule
+    make ${MAKEOPTS} -C ports/stm32 BOARD=PYBV11 clean
+    make ${MAKEOPTS} -C ports/stm32 BOARD=PYBV11 MICROPY_PY_CC3K=1
     make ${MAKEOPTS} -C ports/stm32 BOARD=PYBD_SF2
     make ${MAKEOPTS} -C ports/stm32 BOARD=PYBD_SF6 NANBOX=1 MICROPY_BLUETOOTH_NIMBLE=0 MICROPY_BLUETOOTH_BTSTACK=1
     make ${MAKEOPTS} -C ports/stm32/mboot BOARD=PYBV10 CFLAGS_EXTRA='-DMBOOT_FSLOAD=1 -DMBOOT_VFS_LFS2=1'

From 71dcb21e24064d1150094e66a904877402cdd157 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Wed, 10 Aug 2022 11:07:35 +0200
Subject: [PATCH 2508/3533] drivers/wiznet5k: Remove old Wiznet driver.

It has been replaced by the submodule lib/wiznet5k.
---
 drivers/wiznet5k/README.md               |    6 -
 drivers/wiznet5k/ethernet/socket.c       |  725 --------
 drivers/wiznet5k/ethernet/socket.h       |  472 -----
 drivers/wiznet5k/ethernet/w5200/w5200.c  |  215 ---
 drivers/wiznet5k/ethernet/w5200/w5200.h  | 2092 ----------------------
 drivers/wiznet5k/ethernet/w5500/w5500.c  |  247 ---
 drivers/wiznet5k/ethernet/w5500/w5500.h  | 2057 ---------------------
 drivers/wiznet5k/ethernet/wizchip_conf.c |  662 -------
 drivers/wiznet5k/ethernet/wizchip_conf.h |  554 ------
 drivers/wiznet5k/internet/dhcp/dhcp.c    |  978 ----------
 drivers/wiznet5k/internet/dhcp/dhcp.h    |  150 --
 drivers/wiznet5k/internet/dns/dns.c      |  566 ------
 drivers/wiznet5k/internet/dns/dns.h      |   96 -
 13 files changed, 8820 deletions(-)
 delete mode 100644 drivers/wiznet5k/README.md
 delete mode 100644 drivers/wiznet5k/ethernet/socket.c
 delete mode 100644 drivers/wiznet5k/ethernet/socket.h
 delete mode 100644 drivers/wiznet5k/ethernet/w5200/w5200.c
 delete mode 100644 drivers/wiznet5k/ethernet/w5200/w5200.h
 delete mode 100644 drivers/wiznet5k/ethernet/w5500/w5500.c
 delete mode 100644 drivers/wiznet5k/ethernet/w5500/w5500.h
 delete mode 100644 drivers/wiznet5k/ethernet/wizchip_conf.c
 delete mode 100644 drivers/wiznet5k/ethernet/wizchip_conf.h
 delete mode 100644 drivers/wiznet5k/internet/dhcp/dhcp.c
 delete mode 100644 drivers/wiznet5k/internet/dhcp/dhcp.h
 delete mode 100644 drivers/wiznet5k/internet/dns/dns.c
 delete mode 100644 drivers/wiznet5k/internet/dns/dns.h

diff --git a/drivers/wiznet5k/README.md b/drivers/wiznet5k/README.md
deleted file mode 100644
index 88f25a2b8dbcb..0000000000000
--- a/drivers/wiznet5k/README.md
+++ /dev/null
@@ -1,6 +0,0 @@
-This is the driver for the WIZnet5x00 series of Ethernet controllers.
-
-Adapted for MicroPython.
-
-Original source: https://github.com/Wiznet/W5500_EVB/tree/master/ioLibrary
-Taken on: 30 August 2014
diff --git a/drivers/wiznet5k/ethernet/socket.c b/drivers/wiznet5k/ethernet/socket.c
deleted file mode 100644
index 3ffda3a722dfa..0000000000000
--- a/drivers/wiznet5k/ethernet/socket.c
+++ /dev/null
@@ -1,725 +0,0 @@
-//*****************************************************************************
-//
-//! \file socket.c
-//! \brief SOCKET APIs Implements file.
-//! \details SOCKET APIs like as Berkeley Socket APIs. 
-//! \version 1.0.3
-//! \date 2013/10/21
-//! \par  Revision history
-//!       <2014/05/01> V1.0.3. Refer to M20140501
-//!         1. Implicit type casting -> Explicit type casting.
-//!         2. replace 0x01 with PACK_REMAINED in recvfrom()
-//!         3. Validation a destination ip in connect() & sendto(): 
-//!            It occurs a fatal error on converting unint32 address if uint8* addr parameter is not aligned by 4byte address.
-//!            Copy 4 byte addr value into temporary uint32 variable and then compares it.
-//!       <2013/12/20> V1.0.2 Refer to M20131220
-//!                    Remove Warning.
-//!       <2013/11/04> V1.0.1 2nd Release. Refer to "20131104".
-//!                    In sendto(), Add to clear timeout interrupt status (Sn_IR_TIMEOUT)
-//!       <2013/10/21> 1st Release
-//! \author MidnightCow
-//! \copyright
-//!
-//! Copyright (c)  2013, WIZnet Co., LTD.
-//! All rights reserved.
-//! 
-//! Redistribution and use in source and binary forms, with or without 
-//! modification, are permitted provided that the following conditions 
-//! are met: 
-//! 
-//!     * Redistributions of source code must retain the above copyright 
-//! notice, this list of conditions and the following disclaimer. 
-//!     * Redistributions in binary form must reproduce the above copyright
-//! notice, this list of conditions and the following disclaimer in the
-//! documentation and/or other materials provided with the distribution. 
-//!     * Neither the name of the <ORGANIZATION> nor the names of its 
-//! contributors may be used to endorse or promote products derived 
-//! from this software without specific prior written permission. 
-//! 
-//! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-//! AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
-//! IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-//! ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE 
-//! LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
-//! CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 
-//! SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-//! INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
-//! CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 
-//! ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF 
-//! THE POSSIBILITY OF SUCH DAMAGE.
-//
-//*****************************************************************************
-
-#include <string.h>
-
-#include "py/mpthread.h"
-#include "socket.h"
-
-#define SOCK_ANY_PORT_NUM  0xC000;
-
-static uint16_t sock_any_port = SOCK_ANY_PORT_NUM;
-static uint16_t sock_io_mode = 0;
-static uint16_t sock_is_sending = 0;
-static uint16_t sock_remained_size[_WIZCHIP_SOCK_NUM_] = {0,0,};
-static uint8_t  sock_pack_info[_WIZCHIP_SOCK_NUM_] = {0,};
-
-#if _WIZCHIP_ == 5200
-   static uint16_t sock_next_rd[_WIZCHIP_SOCK_NUM_] ={0,};
-#endif
-
-#define CHECK_SOCKNUM()   \
-   do{                    \
-      if(sn > _WIZCHIP_SOCK_NUM_) return SOCKERR_SOCKNUM;   \
-   }while(0);             \
-
-#define CHECK_SOCKMODE(mode)  \
-   do{                     \
-      if((getSn_MR(sn) & 0x0F) != mode) return SOCKERR_SOCKMODE;  \
-   }while(0);              \
-
-#define CHECK_SOCKINIT()   \
-   do{                     \
-      if((getSn_SR(sn) != SOCK_INIT)) return SOCKERR_SOCKINIT; \
-   }while(0);              \
-
-#define CHECK_SOCKDATA()   \
-   do{                     \
-      if(len == 0) return SOCKERR_DATALEN;   \
-   }while(0);              \
-
-void WIZCHIP_EXPORT(socket_reset)(void) {
-    sock_any_port = SOCK_ANY_PORT_NUM;
-    sock_io_mode = 0;
-    sock_is_sending = 0;
-    /*
-    memset(sock_remained_size, 0, _WIZCHIP_SOCK_NUM_ * sizeof(uint16_t));
-    memset(sock_pack_info, 0, _WIZCHIP_SOCK_NUM_ * sizeof(uint8_t));
-    */
-
-#if _WIZCHIP_ == 5200
-    memset(sock_next_rd, 0, _WIZCHIP_SOCK_NUM_ * sizeof(uint16_t));
-#endif
-}
-
-int8_t WIZCHIP_EXPORT(socket)(uint8_t sn, uint8_t protocol, uint16_t port, uint8_t flag)
-{
-	CHECK_SOCKNUM();
-	switch(protocol)
-	{
-      case Sn_MR_TCP :
-      case Sn_MR_UDP :
-      case Sn_MR_MACRAW :
-         break;
-   #if ( _WIZCHIP_ < 5200 )
-      case Sn_MR_IPRAW :
-      case Sn_MR_PPPoE :
-         break;
-   #endif
-      default :
-         return SOCKERR_SOCKMODE;
-	}
-	if((flag & 0x06) != 0) return SOCKERR_SOCKFLAG;
-#if _WIZCHIP_ == 5200
-   if(flag & 0x10) return SOCKERR_SOCKFLAG;
-#endif
-	   
-	if(flag != 0)
-	{
-   	switch(protocol)
-   	{
-   	   case Sn_MR_TCP:
-   	      if((flag & (SF_TCP_NODELAY|SF_IO_NONBLOCK))==0) return SOCKERR_SOCKFLAG;
-   	      break;
-   	   case Sn_MR_UDP:
-   	      if(flag & SF_IGMP_VER2)
-   	      {
-   	         if((flag & SF_MULTI_ENABLE)==0) return SOCKERR_SOCKFLAG;
-   	      }
-   	      #if _WIZCHIP_ == 5500
-      	      if(flag & SF_UNI_BLOCK)
-      	      {
-      	         if((flag & SF_MULTI_ENABLE) == 0) return SOCKERR_SOCKFLAG;
-      	      }
-   	      #endif
-   	      break;
-   	   default:
-   	      break;
-   	}
-   }
-	WIZCHIP_EXPORT(close)(sn);
-	setSn_MR(sn, (protocol | (flag & 0xF0)));
-	if(!port)
-	{
-	   port = sock_any_port++;
-	   if(sock_any_port == 0xFFF0) sock_any_port = SOCK_ANY_PORT_NUM;
-	}
-   setSn_PORT(sn,port);	
-   setSn_CR(sn,Sn_CR_OPEN);
-   while(getSn_CR(sn));
-   sock_io_mode |= ((flag & SF_IO_NONBLOCK) << sn);
-   sock_is_sending &= ~(1<<sn);
-   sock_remained_size[sn] = 0;
-   sock_pack_info[sn] = 0;
-   while(getSn_SR(sn) == SOCK_CLOSED);
-   return (int8_t)sn;
-}	   
-
-int8_t WIZCHIP_EXPORT(close)(uint8_t sn)
-{
-	CHECK_SOCKNUM();
-	
-	setSn_CR(sn,Sn_CR_CLOSE);
-   /* wait to process the command... */
-	while( getSn_CR(sn) );
-	/* clear all interrupt of the socket. */
-	setSn_IR(sn, 0xFF);
-	sock_is_sending &= ~(1<<sn);
-	sock_remained_size[sn] = 0;
-	sock_pack_info[sn] = 0;
-	while(getSn_SR(sn) != SOCK_CLOSED);
-	return SOCK_OK;
-}
-
-int8_t WIZCHIP_EXPORT(listen)(uint8_t sn)
-{
-	CHECK_SOCKNUM();
-   CHECK_SOCKMODE(Sn_MR_TCP);
-	CHECK_SOCKINIT();
-	setSn_CR(sn,Sn_CR_LISTEN);
-	while(getSn_CR(sn));
-   while(getSn_SR(sn) != SOCK_LISTEN)
-   {
-      if(getSn_CR(sn) == SOCK_CLOSED)
-      {
-         WIZCHIP_EXPORT(close)(sn);
-         return SOCKERR_SOCKCLOSED;
-      }
-   }
-   return SOCK_OK;
-}
-
-
-int8_t WIZCHIP_EXPORT(connect)(uint8_t sn, uint8_t * addr, uint16_t port)
-{
-   CHECK_SOCKNUM();
-   CHECK_SOCKMODE(Sn_MR_TCP);
-   CHECK_SOCKINIT();
-   //M20140501 : For avoiding fatal error on memory align mismatched
-   //if( *((uint32_t*)addr) == 0xFFFFFFFF || *((uint32_t*)addr) == 0) return SOCKERR_IPINVALID;
-   {
-      uint32_t taddr;
-      taddr = ((uint32_t)addr[0] & 0x000000FF);
-      taddr = (taddr << 8) + ((uint32_t)addr[1] & 0x000000FF);
-      taddr = (taddr << 8) + ((uint32_t)addr[2] & 0x000000FF);
-      taddr = (taddr << 8) + ((uint32_t)addr[3] & 0x000000FF);
-      if (taddr == 0xFFFFFFFF || taddr == 0) return SOCKERR_IPINVALID;
-   }
-   //
-	
-	if(port == 0) return SOCKERR_PORTZERO;
-	setSn_DIPR(sn,addr);
-	setSn_DPORT(sn,port);
-   #if _WIZCHIP_ == 5200   // for W5200 ARP errata 
-    setSUBR(wizchip_getsubn());
-   #endif
-	setSn_CR(sn,Sn_CR_CONNECT);
-   while(getSn_CR(sn));
-   if(sock_io_mode & (1<<sn)) return SOCK_BUSY;
-   while(getSn_SR(sn) != SOCK_ESTABLISHED)
-   {   
-        if (getSn_SR(sn) == SOCK_CLOSED) {
-            #if _WIZCHIP_ == 5200   // for W5200 ARP errata
-            setSUBR((uint8_t*)"\x00\x00\x00\x00");
-            #endif
-            return SOCKERR_SOCKCLOSED;
-        }
-		if (getSn_IR(sn) & Sn_IR_TIMEOUT)
-		{
-			setSn_IR(sn, Sn_IR_TIMEOUT);
-         #if _WIZCHIP_ == 5200   // for W5200 ARP errata 
-            setSUBR((uint8_t*)"\x00\x00\x00\x00");
-         #endif
-         return SOCKERR_TIMEOUT;
-		}
-        MICROPY_THREAD_YIELD();
-	}
-   #if _WIZCHIP_ == 5200   // for W5200 ARP errata 
-      setSUBR((uint8_t*)"\x00\x00\x00\x00");
-   #endif
-   
-   return SOCK_OK;
-}
-
-int8_t WIZCHIP_EXPORT(disconnect)(uint8_t sn)
-{
-   CHECK_SOCKNUM();
-   CHECK_SOCKMODE(Sn_MR_TCP);
-	setSn_CR(sn,Sn_CR_DISCON);
-	/* wait to process the command... */
-	while(getSn_CR(sn));
-	sock_is_sending &= ~(1<<sn);
-   if(sock_io_mode & (1<<sn)) return SOCK_BUSY;
-	while(getSn_SR(sn) != SOCK_CLOSED)
-	{
-	   if(getSn_IR(sn) & Sn_IR_TIMEOUT)
-	   {
-	      WIZCHIP_EXPORT(close)(sn);
-	      return SOCKERR_TIMEOUT;
-	   }
-	}
-	return SOCK_OK;
-}
-
-int32_t WIZCHIP_EXPORT(send)(uint8_t sn, uint8_t * buf, uint16_t len)
-{
-   uint8_t tmp=0;
-   uint16_t freesize=0;
-   
-   CHECK_SOCKNUM();
-   CHECK_SOCKMODE(Sn_MR_TCP);
-   CHECK_SOCKDATA();
-   tmp = getSn_SR(sn);
-   if(tmp != SOCK_ESTABLISHED && tmp != SOCK_CLOSE_WAIT) return SOCKERR_SOCKSTATUS;
-   if( sock_is_sending & (1<<sn) )
-   {
-      tmp = getSn_IR(sn);
-      if(tmp & Sn_IR_SENDOK)
-      {
-         setSn_IR(sn, Sn_IR_SENDOK);
-         #if _WZICHIP_ == 5200
-            if(getSn_TX_RD(sn) != sock_next_rd[sn])
-            {
-               setSn_CR(sn,Sn_CR_SEND);
-               while(getSn_CR(sn));
-               return SOCKERR_BUSY;
-            }
-         #endif
-         sock_is_sending &= ~(1<<sn);         
-      }
-      else if(tmp & Sn_IR_TIMEOUT)
-      {
-         WIZCHIP_EXPORT(close)(sn);
-         return SOCKERR_TIMEOUT;
-      }
-      else return SOCK_BUSY;
-   }
-   freesize = getSn_TxMAX(sn);
-   if (len > freesize) len = freesize; // check size not to exceed MAX size.
-   while(1)
-   {
-      freesize = getSn_TX_FSR(sn);
-      tmp = getSn_SR(sn);
-      if ((tmp != SOCK_ESTABLISHED) && (tmp != SOCK_CLOSE_WAIT))
-      {
-         WIZCHIP_EXPORT(close)(sn);
-         return SOCKERR_SOCKSTATUS;
-      }
-      if( (sock_io_mode & (1<<sn)) && (len > freesize) ) return SOCK_BUSY;
-      if(len <= freesize) break;
-      MICROPY_THREAD_YIELD();
-   }
-   wiz_send_data(sn, buf, len);
-   #if _WIZCHIP_ == 5200
-      sock_next_rd[sn] = getSn_TX_RD(sn) + len;
-   #endif
-   setSn_CR(sn,Sn_CR_SEND);
-   /* wait to process the command... */
-   while(getSn_CR(sn));
-   sock_is_sending |= (1 << sn);
-   return len;
-}
-
-
-int32_t WIZCHIP_EXPORT(recv)(uint8_t sn, uint8_t * buf, uint16_t len)
-{
-   uint8_t  tmp = 0;
-   uint16_t recvsize = 0;
-   CHECK_SOCKNUM();
-   CHECK_SOCKMODE(Sn_MR_TCP);
-   CHECK_SOCKDATA();
-   
-   recvsize = getSn_RxMAX(sn);
-   if(recvsize < len) len = recvsize;
-   while(1)
-   {
-      recvsize = getSn_RX_RSR(sn);
-      tmp = getSn_SR(sn);
-      if (tmp != SOCK_ESTABLISHED)
-      {
-         if(tmp == SOCK_CLOSE_WAIT)
-         {
-            if(recvsize != 0) break;
-            else if(getSn_TX_FSR(sn) == getSn_TxMAX(sn))
-            {
-               // dpgeorge: Getting here seems to be an orderly shutdown of the
-               // socket, and trying to get POSIX behaviour we return 0 because:
-               // "If no messages are available to be received and the peer has per�
-               //  formed an orderly shutdown, recv() shall return 0".
-               // TODO this return value clashes with SOCK_BUSY in non-blocking mode.
-               WIZCHIP_EXPORT(close)(sn);
-               return 0;
-            }
-         }
-         else
-         {
-            WIZCHIP_EXPORT(close)(sn);
-            return SOCKERR_SOCKSTATUS;
-         }
-      }
-      if((sock_io_mode & (1<<sn)) && (recvsize == 0)) return SOCK_BUSY;
-      if(recvsize != 0) break;
-      MICROPY_THREAD_YIELD();
-   };
-   if(recvsize < len) len = recvsize;
-   wiz_recv_data(sn, buf, len);
-   setSn_CR(sn,Sn_CR_RECV);
-   while(getSn_CR(sn));
-   return len;
-}
-
-int32_t WIZCHIP_EXPORT(sendto)(uint8_t sn, uint8_t * buf, uint16_t len, uint8_t * addr, uint16_t port)
-{
-   uint8_t tmp = 0;
-   uint16_t freesize = 0;
-   CHECK_SOCKNUM();
-   switch(getSn_MR(sn) & 0x0F)
-   {
-      case Sn_MR_UDP:
-      case Sn_MR_MACRAW:
-         break;
-      default:
-         return SOCKERR_SOCKMODE;
-   }
-   CHECK_SOCKDATA();
-   //M20140501 : For avoiding fatal error on memory align mismatched
-   //if(*((uint32_t*)addr) == 0) return SOCKERR_IPINVALID;
-   {
-      uint32_t taddr;
-      taddr = ((uint32_t)addr[0]) & 0x000000FF;
-      taddr = (taddr << 8) + ((uint32_t)addr[1] & 0x000000FF);
-      taddr = (taddr << 8) + ((uint32_t)addr[2] & 0x000000FF);
-      taddr = (taddr << 8) + ((uint32_t)addr[3] & 0x000000FF);
-      if (taddr == 0xFFFFFFFF || taddr == 0) return SOCKERR_IPINVALID;
-   }
-   //
-   if(port == 0)               return SOCKERR_PORTZERO;
-   tmp = getSn_SR(sn);
-   if(tmp != SOCK_MACRAW && tmp != SOCK_UDP) return SOCKERR_SOCKSTATUS;
-      
-   setSn_DIPR(sn,addr);
-   setSn_DPORT(sn,port);      
-   freesize = getSn_TxMAX(sn);
-   if (len > freesize) len = freesize; // check size not to exceed MAX size.
-   while(1)
-   {
-      freesize = getSn_TX_FSR(sn);
-      if(getSn_SR(sn) == SOCK_CLOSED) return SOCKERR_SOCKCLOSED;
-      if( (sock_io_mode & (1<<sn)) && (len > freesize) ) return SOCK_BUSY;
-      if(len <= freesize) break;
-      MICROPY_THREAD_YIELD();
-   };
-	wiz_send_data(sn, buf, len);
-
-   #if _WIZCHIP_ == 5200   // for W5200 ARP errata 
-      setSUBR(wizchip_getsubn());
-   #endif
-
-	setSn_CR(sn,Sn_CR_SEND);
-	/* wait to process the command... */
-	while(getSn_CR(sn));
-   while(1)
-   {
-      tmp = getSn_IR(sn);
-      if(tmp & Sn_IR_SENDOK)
-      {
-         setSn_IR(sn, Sn_IR_SENDOK);
-         break;
-      }
-      //M:20131104
-      //else if(tmp & Sn_IR_TIMEOUT) return SOCKERR_TIMEOUT;
-      else if(tmp & Sn_IR_TIMEOUT)
-      {
-         setSn_IR(sn, Sn_IR_TIMEOUT);
-   #if _WIZCHIP_ == 5200   // for W5200 ARP errata 
-      setSUBR((uint8_t*)"\x00\x00\x00\x00");
-   #endif
-         return SOCKERR_TIMEOUT;
-      }
-      ////////////
-      MICROPY_THREAD_YIELD();
-   }
-   #if _WIZCHIP_ == 5200   // for W5200 ARP errata 
-      setSUBR((uint8_t*)"\x00\x00\x00\x00");
-   #endif
-	return len;
-}
-
-
-
-int32_t WIZCHIP_EXPORT(recvfrom)(uint8_t sn, uint8_t * buf, uint16_t len, uint8_t * addr, uint16_t *port)
-{
-   uint8_t  mr;
-   uint8_t  head[8];
-	uint16_t pack_len=0;
-
-   CHECK_SOCKNUM();
-   //CHECK_SOCKMODE(Sn_MR_UDP);
-   switch((mr=getSn_MR(sn)) & 0x0F)
-   {
-      case Sn_MR_UDP:
-      case Sn_MR_MACRAW:
-         break;
-   #if ( _WIZCHIP_ < 5200 )         
-      case Sn_MR_IPRAW:
-      case Sn_MR_PPPoE:
-         break;
-   #endif
-      default:
-         return SOCKERR_SOCKMODE;
-   }
-   CHECK_SOCKDATA();
-   if(sock_remained_size[sn] == 0)
-   {
-      while(1)
-      {
-         pack_len = getSn_RX_RSR(sn);
-         if(getSn_SR(sn) == SOCK_CLOSED) return SOCKERR_SOCKCLOSED;
-         if( (sock_io_mode & (1<<sn)) && (pack_len == 0) ) return SOCK_BUSY;
-         if(pack_len != 0) break;
-         MICROPY_THREAD_YIELD();
-      };
-   }
-   sock_pack_info[sn] = PACK_COMPLETED;
-	switch (mr & 0x07)
-	{
-	   case Sn_MR_UDP :
-	      if(sock_remained_size[sn] == 0)
-	      {
-   			wiz_recv_data(sn, head, 8);
-   			setSn_CR(sn,Sn_CR_RECV);
-   			while(getSn_CR(sn));
-   			// read peer's IP address, port number & packet length
-    			addr[0] = head[0];
-   			addr[1] = head[1];
-   			addr[2] = head[2];
-   			addr[3] = head[3];
-   			*port = head[4];
-   			*port = (*port << 8) + head[5];
-   			sock_remained_size[sn] = head[6];
-   			sock_remained_size[sn] = (sock_remained_size[sn] << 8) + head[7];
-   			sock_pack_info[sn] = PACK_FIRST;
-   	   }
-			if(len < sock_remained_size[sn]) pack_len = len;
-			else pack_len = sock_remained_size[sn];
-			//
-			// Need to packet length check (default 1472)
-			//
-   		wiz_recv_data(sn, buf, pack_len); // data copy.
-			break;
-	   case Sn_MR_MACRAW :
-	      if(sock_remained_size[sn] == 0)
-	      {
-   			wiz_recv_data(sn, head, 2);
-   			setSn_CR(sn,Sn_CR_RECV);
-   			while(getSn_CR(sn));
-   			// read peer's IP address, port number & packet length
-    			sock_remained_size[sn] = head[0];
-   			sock_remained_size[sn] = (sock_remained_size[sn] <<8) + head[1];
-   			sock_remained_size[sn] -= 2; // len includes 2 len bytes
-   			if(sock_remained_size[sn] > 1514) 
-   			{
-   			   WIZCHIP_EXPORT(close)(sn);
-   			   return SOCKFATAL_PACKLEN;
-   			}
-   			sock_pack_info[sn] = PACK_FIRST;
-   	   }
-			if(len < sock_remained_size[sn]) pack_len = len;
-			else pack_len = sock_remained_size[sn];
-			wiz_recv_data(sn,buf,pack_len);
-		   break;
-   #if ( _WIZCHIP_ < 5200 )
-		case Sn_MR_IPRAW:
-		   if(sock_remained_size[sn] == 0)
-		   {
-   			wiz_recv_data(sn, head, 6);
-   			setSn_CR(sn,Sn_CR_RECV);
-   			while(getSn_CR(sn));
-   			addr[0] = head[0];
-   			addr[1] = head[1];
-   			addr[2] = head[2];
-   			addr[3] = head[3];
-   			sock_remained_size[sn] = head[4];
-   			sock_remaiend_size[sn] = (sock_remained_size[sn] << 8) + head[5];
-   			sock_pack_info[sn] = PACK_FIRST;
-         }
-			//
-			// Need to packet length check
-			//
-			if(len < sock_remained_size[sn]) pack_len = len;
-			else pack_len = sock_remained_size[sn];
-   		wiz_recv_data(sn, buf, pack_len); // data copy.
-			break;
-   #endif
-      default:
-         wiz_recv_ignore(sn, pack_len); // data copy.
-         sock_remained_size[sn] = pack_len;
-         break;
-   }
-	setSn_CR(sn,Sn_CR_RECV);
-	/* wait to process the command... */
-	while(getSn_CR(sn)) ;
-	sock_remained_size[sn] -= pack_len;
-	//M20140501 : replace 0x01 with PACK_REMAINED
-	//if(sock_remained_size[sn] != 0) sock_pack_info[sn] |= 0x01;
-	if(sock_remained_size[sn] != 0) sock_pack_info[sn] |= PACK_REMAINED;
-   //
- 	return pack_len;
-}
-
-
-int8_t  WIZCHIP_EXPORT(ctlsocket)(uint8_t sn, ctlsock_type cstype, void* arg)
-{
-   uint8_t tmp = 0;
-   CHECK_SOCKNUM();
-   switch(cstype)
-   {
-      case CS_SET_IOMODE:
-         tmp = *((uint8_t*)arg);
-         if(tmp == SOCK_IO_NONBLOCK)  sock_io_mode |= (1<<sn);
-         else if(tmp == SOCK_IO_BLOCK) sock_io_mode &= ~(1<<sn);
-         else return SOCKERR_ARG;
-         break;
-      case CS_GET_IOMODE:   
-         //M20140501 : implict type casting -> explict type casting
-         //*((uint8_t*)arg) = (sock_io_mode >> sn) & 0x0001;
-         *((uint8_t*)arg) = (uint8_t)((sock_io_mode >> sn) & 0x0001);
-         //
-         break;
-      case CS_GET_MAXTXBUF:
-         *((uint16_t*)arg) = getSn_TxMAX(sn);
-         break;
-      case CS_GET_MAXRXBUF:    
-         *((uint16_t*)arg) = getSn_RxMAX(sn);
-         break;
-      case CS_CLR_INTERRUPT:
-         if( (*(uint8_t*)arg) > SIK_ALL) return SOCKERR_ARG;
-         setSn_IR(sn,*(uint8_t*)arg);
-         break;
-      case CS_GET_INTERRUPT:
-         *((uint8_t*)arg) = getSn_IR(sn);
-         break;
-      case CS_SET_INTMASK:  
-         if( (*(uint8_t*)arg) > SIK_ALL) return SOCKERR_ARG;
-         setSn_IMR(sn,*(uint8_t*)arg);
-         break;
-      case CS_GET_INTMASK:   
-         *((uint8_t*)arg) = getSn_IMR(sn);
-      default:
-         return SOCKERR_ARG;
-   }
-   return SOCK_OK;
-}
-
-int8_t  WIZCHIP_EXPORT(setsockopt)(uint8_t sn, sockopt_type sotype, void* arg)
-{
- // M20131220 : Remove warning
- //uint8_t tmp;
-   CHECK_SOCKNUM();
-   switch(sotype)
-   {
-      case SO_TTL:
-         setSn_TTL(sn,*(uint8_t*)arg);
-         break;
-      case SO_TOS:
-         setSn_TOS(sn,*(uint8_t*)arg);
-         break;
-      case SO_MSS:
-         setSn_MSSR(sn,*(uint16_t*)arg);
-         break;
-      case SO_DESTIP:
-         setSn_DIPR(sn, (uint8_t*)arg);
-         break;
-      case SO_DESTPORT:
-         setSn_DPORT(sn, *(uint16_t*)arg);
-         break;
-#if _WIZCHIP_ != 5100
-      case SO_KEEPALIVESEND:
-         CHECK_SOCKMODE(Sn_MR_TCP);
-         #if _WIZCHIP_ > 5200
-            if(getSn_KPALVTR(sn) != 0) return SOCKERR_SOCKOPT;
-         #endif
-            setSn_CR(sn,Sn_CR_SEND_KEEP);
-            while(getSn_CR(sn) != 0)
-            {
-               // M20131220
-         		//if ((tmp = getSn_IR(sn)) & Sn_IR_TIMEOUT)
-               if (getSn_IR(sn) & Sn_IR_TIMEOUT)
-         		{
-         			setSn_IR(sn, Sn_IR_TIMEOUT);
-                  return SOCKERR_TIMEOUT;
-         		}
-            }
-         break;
-   #if _WIZCHIP_ > 5200
-      case SO_KEEPALIVEAUTO:
-         CHECK_SOCKMODE(Sn_MR_TCP);
-         setSn_KPALVTR(sn,*(uint8_t*)arg);
-         break;
-   #endif      
-#endif   
-      default:
-         return SOCKERR_ARG;
-   }   
-   return SOCK_OK;
-}
-
-int8_t  WIZCHIP_EXPORT(getsockopt)(uint8_t sn, sockopt_type sotype, void* arg)
-{
-   CHECK_SOCKNUM();
-   switch(sotype)
-   {
-      case SO_FLAG:
-         *(uint8_t*)arg = getSn_MR(sn) & 0xF0;
-         break;
-      case SO_TTL:
-         *(uint8_t*) arg = getSn_TTL(sn);
-         break;
-      case SO_TOS:
-         *(uint8_t*) arg = getSn_TOS(sn);
-         break;
-      case SO_MSS:   
-         *(uint8_t*) arg = getSn_MSSR(sn);
-      case SO_DESTIP:
-         getSn_DIPR(sn, (uint8_t*)arg);
-         break;
-      case SO_DESTPORT:  
-         *(uint16_t*) arg = getSn_DPORT(sn);
-         break;
-   #if _WIZCHIP_ > 5200   
-      case SO_KEEPALIVEAUTO:
-         CHECK_SOCKMODE(Sn_MR_TCP);
-         *(uint16_t*) arg = getSn_KPALVTR(sn);
-         break;
-   #endif      
-      case SO_SENDBUF:
-         *(uint16_t*) arg = getSn_TX_FSR(sn);
-      case SO_RECVBUF:
-         *(uint16_t*) arg = getSn_RX_RSR(sn);
-      case SO_STATUS:
-         *(uint8_t*) arg = getSn_SR(sn);
-         break;
-      case SO_REMAINSIZE:
-         if(getSn_MR(sn) == Sn_MR_TCP)
-            *(uint16_t*)arg = getSn_RX_RSR(sn);
-         else
-            *(uint16_t*)arg = sock_remained_size[sn];
-         break;
-      case SO_PACKINFO:
-         CHECK_SOCKMODE(Sn_MR_TCP);
-         *(uint8_t*)arg = sock_pack_info[sn];
-         break;
-      default:
-         return SOCKERR_SOCKOPT;
-   }
-   return SOCK_OK;
-}
diff --git a/drivers/wiznet5k/ethernet/socket.h b/drivers/wiznet5k/ethernet/socket.h
deleted file mode 100644
index 2f03a34eba015..0000000000000
--- a/drivers/wiznet5k/ethernet/socket.h
+++ /dev/null
@@ -1,472 +0,0 @@
-//*****************************************************************************
-//
-//! \file socket.h
-//! \brief SOCKET APIs Header file.
-//! \details SOCKET APIs like as berkeley socket api. 
-//! \version 1.0.2
-//! \date 2013/10/21
-//! \par  Revision history
-//!       <2014/05/01> V1.0.2. Refer to M20140501
-//!         1. Modify the comment : SO_REMAINED -> PACK_REMAINED
-//!         2. Add the comment as zero byte udp data reception in getsockopt(). 
-//!       <2013/10/21> 1st Release
-//! \author MidnightCow
-//! \copyright
-//!
-//! Copyright (c)  2013, WIZnet Co., LTD.
-//! All rights reserved.
-//! 
-//! Redistribution and use in source and binary forms, with or without 
-//! modification, are permitted provided that the following conditions 
-//! are met: 
-//! 
-//!     * Redistributions of source code must retain the above copyright 
-//! notice, this list of conditions and the following disclaimer. 
-//!     * Redistributions in binary form must reproduce the above copyright
-//! notice, this list of conditions and the following disclaimer in the
-//! documentation and/or other materials provided with the distribution. 
-//!     * Neither the name of the <ORGANIZATION> nor the names of its 
-//! contributors may be used to endorse or promote products derived 
-//! from this software without specific prior written permission. 
-//! 
-//! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-//! AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
-//! IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-//! ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE 
-//! LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
-//! CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 
-//! SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-//! INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
-//! CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 
-//! ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF 
-//! THE POSSIBILITY OF SUCH DAMAGE.
-//
-//*****************************************************************************
-/**
- * @defgroup WIZnet_socket_APIs 1. WIZnet socket APIs
- * @brief WIZnet socket APIs are based on Berkeley socket APIs,  thus it has much similar name and interface.
- *        But there is a little bit of difference.
- * @details
- * <b> Comparison between WIZnet and Berkeley SOCKET APIs </b>
- * <table>
- *    <tr>   <td><b>API</b></td> <td><b>WIZnet</b></td> <td><b>Berkeley</b></td>   </tr>
- *    <tr>   <td>socket()</td> <td>O</td> <td>O</td>   </tr>
- *    <tr>   <td><b>bind()</b></td> <td>X</td> <td>O</td>   </tr>
- *    <tr>   <td><b>listen()</b></td> <td>O</td> <td>O</td>   </tr>
- *    <tr>   <td><b>connect()</b></td> <td>O</td> <td>O</td>   </tr>
- *    <tr>   <td><b>accept()</b></td> <td>X</td> <td>O</td>   </tr>
- *    <tr>   <td><b>recv()</b></td> <td>O</td> <td>O</td>    </tr>
- *    <tr>   <td><b>send()</b></td> <td>O</td> <td>O</td>   </tr>
- *    <tr>   <td><b>recvfrom()</b></td> <td>O</td> <td>O</td>   </tr>
- *    <tr>   <td><b>sendto()</b></td> <td>O</td> <td>O</td>    </tr>
- *    <tr>   <td><b>closesocket()</b></td> <td>O<br>close() & disconnect()</td> <td>O</td>   </tr>
- * </table>
- * There are @b bind() and @b accept() functions in @b Berkeley SOCKET API but,
- * not in @b WIZnet SOCKET API. Because socket() of WIZnet is not only creating a SOCKET but also binding a local port number,
- * and listen() of WIZnet is not only listening to connection request from client but also accepting the connection request. \n
- * When you program "TCP SERVER" with Berkeley SOCKET API, you can use only one listen port.
- * When the listen SOCKET accepts a connection request from a client, it keeps listening.
- * After accepting the connection request, a new SOCKET is created and the new SOCKET is used in communication with the client. \n
- * Following figure shows network flow diagram by Berkeley SOCKET API.
- * @image html Berkeley_SOCKET.jpg "<Berkeley SOCKET API>"
- * But, When you program "TCP SERVER" with WIZnet SOCKET API, you can use as many as 8 listen SOCKET with same port number. \n
- * Because there's no accept() in WIZnet SOCKET APIs, when the listen SOCKET accepts a connection request from a client,
- * it is changed in order to communicate with the client.
- * And the changed SOCKET is not listening any more and is dedicated for communicating with the client. \n
- * If there're many listen SOCKET with same listen port number and a client requests a connection,
- * the SOCKET which has the smallest SOCKET number accepts the request and is changed as communication SOCKET. \n
- * Following figure shows network flow diagram by WIZnet SOCKET API.
- * @image html WIZnet_SOCKET.jpg "<WIZnet SOCKET API>"
- */
-#ifndef _WIZCHIP_SOCKET_H_
-#define _WIZCHIP_SOCKET_H_
-
-// use this macro for exported names to avoid name clashes
-#define WIZCHIP_EXPORT(name) wizchip_ ## name
-
-#include "wizchip_conf.h"
-
-#define SOCKET                uint8_t  ///< SOCKET type define for legacy driver
-
-#define SOCK_OK               1        ///< Result is OK about socket process.
-#define SOCK_BUSY             0        ///< Socket is busy on processing the operation. Valid only Non-block IO Mode.
-#define SOCK_FATAL            -1000    ///< Result is fatal error about socket process.
-
-#define SOCK_ERROR            0        
-#define SOCKERR_SOCKNUM       (SOCK_ERROR - 1)     ///< Invalid socket number
-#define SOCKERR_SOCKOPT       (SOCK_ERROR - 2)     ///< Invalid socket option
-#define SOCKERR_SOCKINIT      (SOCK_ERROR - 3)     ///< Socket is not initialized
-#define SOCKERR_SOCKCLOSED    (SOCK_ERROR - 4)     ///< Socket unexpectedly closed.
-#define SOCKERR_SOCKMODE      (SOCK_ERROR - 5)     ///< Invalid socket mode for socket operation.
-#define SOCKERR_SOCKFLAG      (SOCK_ERROR - 6)     ///< Invalid socket flag
-#define SOCKERR_SOCKSTATUS    (SOCK_ERROR - 7)     ///< Invalid socket status for socket operation.
-#define SOCKERR_ARG           (SOCK_ERROR - 10)    ///< Invalid argument.
-#define SOCKERR_PORTZERO      (SOCK_ERROR - 11)    ///< Port number is zero
-#define SOCKERR_IPINVALID     (SOCK_ERROR - 12)    ///< Invalid IP address
-#define SOCKERR_TIMEOUT       (SOCK_ERROR - 13)    ///< Timeout occurred
-#define SOCKERR_DATALEN       (SOCK_ERROR - 14)    ///< Data length is zero or greater than buffer max size.
-#define SOCKERR_BUFFER        (SOCK_ERROR - 15)    ///< Socket buffer is not enough for data communication.
-
-#define SOCKFATAL_PACKLEN     (SOCK_FATAL - 1)     ///< Invalid packet length. Fatal Error.
-
-/*
- * SOCKET FLAG
- */
-#define SF_ETHER_OWN           (Sn_MR_MFEN)        ///< In \ref Sn_MR_MACRAW, Receive only the packet as broadcast, multicast and own packet
-#define SF_IGMP_VER2           (Sn_MR_MC)          ///< In \ref Sn_MR_UDP with \ref SF_MULTI_ENABLE, Select IGMP version 2.   
-#define SF_TCP_NODELAY         (Sn_MR_ND)          ///< In \ref Sn_MR_TCP, Use to nodelayed ack.
-#define SF_MULTI_ENABLE        (Sn_MR_MULTI)       ///< In \ref Sn_MR_UDP, Enable multicast mode.
-
-#if _WIZCHIP_ == 5500
-   #define SF_BROAD_BLOCK         (Sn_MR_BCASTB)   ///< In \ref Sn_MR_UDP or \ref Sn_MR_MACRAW, Block broadcast packet. Valid only in W5500
-   #define SF_MULTI_BLOCK         (Sn_MR_MMB)      ///< In \ref Sn_MR_MACRAW, Block multicast packet. Valid only in W5500
-   #define SF_IPv6_BLOCK          (Sn_MR_MIP6B)    ///< In \ref Sn_MR_MACRAW, Block IPv6 packet. Valid only in W5500
-   #define SF_UNI_BLOCK           (Sn_MR_UCASTB)   ///< In \ref Sn_MR_UDP with \ref SF_MULTI_ENABLE. Valid only in W5500
-#endif
-
-#define SF_IO_NONBLOCK           0x01              ///< Socket nonblock io mode. It used parameter in \ref socket().
-
-/*
- * UDP & MACRAW Packet Infomation
- */
-#define PACK_FIRST               0x80              ///< In Non-TCP packet, It indicates to start receiving a packet.
-#define PACK_REMAINED            0x01              ///< In Non-TCP packet, It indicates to remain a packet to be received.
-#define PACK_COMPLETED           0x00              ///< In Non-TCP packet, It indicates to complete to receive a packet.
-
-// resets all global state associated with the socket interface
-void WIZCHIP_EXPORT(socket_reset)(void);
-
-/**
- * @ingroup WIZnet_socket_APIs
- * @brief Open a socket.
- * @details Initializes the socket with 'sn' passed as parameter and open.
- *
- * @param sn Socket number. It should be <b>0 ~ @ref \_WIZCHIP_SOCK_NUM_</b>.
- * @param protocol Protocol type to operate such as TCP, UDP and MACRAW.
- * @param port Port number to be bined.
- * @param flag Socket flags as \ref SF_ETHER_OWN, \ref SF_IGMP_VER2, \ref SF_TCP_NODELAY, \ref SF_MULTI_ENABLE, \ref SF_IO_NONBLOCK and so on.\n
- *             Valid flags only in W5500 : @ref SF_BROAD_BLOCK, @ref SF_MULTI_BLOCK, @ref SF_IPv6_BLOCK, and @ref SF_UNI_BLOCK.
- * @sa Sn_MR
- *
- * @return @b Success : The socket number @b 'sn' passed as parameter\n
- *         @b Fail    :\n @ref SOCKERR_SOCKNUM     - Invalid socket number\n
- *                        @ref SOCKERR_SOCKMODE    - Not support socket mode as TCP, UDP, and so on. \n
- *                        @ref SOCKERR_SOCKFLAG    - Invaild socket flag.
- */
-int8_t  WIZCHIP_EXPORT(socket)(uint8_t sn, uint8_t protocol, uint16_t port, uint8_t flag);
-
-/**
- * @ingroup WIZnet_socket_APIs
- * @brief Close a socket.
- * @details It closes the socket  with @b'sn' passed as parameter.
- *
- * @param sn Socket number. It should be <b>0 ~ @ref \_WIZCHIP_SOCK_NUM_</b>.
- *
- * @return @b Success : @ref SOCK_OK \n
- *         @b Fail    : @ref SOCKERR_SOCKNUM - Invalid socket number
- */
-int8_t  WIZCHIP_EXPORT(close)(uint8_t sn);
-
-/**
- * @ingroup WIZnet_socket_APIs
- * @brief Listen to a connection request from a client.
- * @details It is listening to a connection request from a client.
- * If connection request is accepted successfully, the connection is established. Socket sn is used in passive(server) mode.
- *
- * @param sn Socket number. It should be <b>0 ~ @ref \_WIZCHIP_SOCK_NUM_</b>.
- * @return @b Success : @ref SOCK_OK \n
- *         @b Fail    :\n @ref SOCKERR_SOCKINIT   - Socket is not initialized \n
- *                        @ref SOCKERR_SOCKCLOSED - Socket closed unexpectedly.
- */
-int8_t  WIZCHIP_EXPORT(listen)(uint8_t sn);
-
-/**
- * @ingroup WIZnet_socket_APIs
- * @brief Try to connect a server.
- * @details It requests connection to the server with destination IP address and port number passed as parameter.\n
- * @note It is valid only in TCP client mode. 
- *       In block io mode, it does not return until connection is completed.
- *       In Non-block io mode, it return @ref SOCK_BUSY immediately.
- *
- * @param sn Socket number. It should be <b>0 ~ @ref \_WIZCHIP_SOCK_NUM_</b>.
- * @param addr Pointer variable of destination IP address. It should be allocated 4 bytes.
- * @param port Destination port number.
- *
- * @return @b Success : @ref SOCK_OK \n
- * @b Fail    :\n @ref SOCKERR_SOCKNUM   - Invalid socket number\n
- *                @ref SOCKERR_SOCKMODE  - Invalid socket mode\n
- *                @ref SOCKERR_SOCKINIT  - Socket is not initialized\n
- *                @ref SOCKERR_IPINVALID - Wrong server IP address\n
- *                @ref SOCKERR_PORTZERO  - Server port zero\n
- *                @ref SOCKERR_TIMEOUT   - Timeout occurred during request connection\n
- *                @ref SOCK_BUSY         - In non-block io mode, it returned immediately\n
- */
-int8_t  WIZCHIP_EXPORT(connect)(uint8_t sn, uint8_t * addr, uint16_t port);
-
-/**
- * @ingroup WIZnet_socket_APIs
- * @brief Try to disconnect a connection socket.
- * @details It sends request message to disconnect the TCP socket 'sn' passed as parameter to the server or client.
- * @note It is valid only in TCP server or client mode. \n
- *       In block io mode, it does not return until disconnection is completed. \n
- *       In Non-block io mode, it return @ref SOCK_BUSY immediately. \n
-
- * @param sn Socket number. It should be <b>0 ~ @ref \_WIZCHIP_SOCK_NUM_</b>.
- * @return @b Success :   @ref SOCK_OK \n
- *         @b Fail    :\n @ref SOCKERR_SOCKNUM  - Invalid socket number \n
- *                        @ref SOCKERR_SOCKMODE - Invalid operation in the socket \n
- *                        @ref SOCKERR_TIMEOUT  - Timeout occurred \n
- *                        @ref SOCK_BUSY        - Socket is busy.
- */
-int8_t  WIZCHIP_EXPORT(disconnect)(uint8_t sn);
-
-/**
- * @ingroup WIZnet_socket_APIs
- * @brief	Send data to the connected peer in TCP socket.
- * @details It is used to send outgoing data to the connected socket.
- * @note    It is valid only in TCP server or client mode. It can't send data greater than socket buffer size. \n
- *          In block io mode, It doesn't return until data send is completed - socket buffer size is greater than data. \n
- *          In non-block io mode, It return @ref SOCK_BUSY immediately when socket buffer is not enough. \n
- * @param sn Socket number. It should be <b>0 ~ @ref \_WIZCHIP_SOCK_NUM_</b>.
- * @param buf Pointer buffer containing data to be sent.
- * @param len The byte length of data in buf.
- * @return	@b Success : The sent data size \n
- *          @b Fail    : \n @ref SOCKERR_SOCKSTATUS - Invalid socket status for socket operation \n
- *                          @ref SOCKERR_TIMEOUT    - Timeout occurred \n
- *                          @ref SOCKERR_SOCKMODE 	- Invalid operation in the socket \n
- *                          @ref SOCKERR_SOCKNUM    - Invalid socket number \n
- *                          @ref SOCKERR_DATALEN    - zero data length \n
- *                          @ref SOCK_BUSY          - Socket is busy.
- */
-int32_t WIZCHIP_EXPORT(send)(uint8_t sn, uint8_t * buf, uint16_t len);
-
-/**
- * @ingroup WIZnet_socket_APIs
- * @brief	Receive data from the connected peer.
- * @details It is used to read incoming data from the connected socket.\n
- *          It waits for data as much as the application wants to receive.
- * @note    It is valid only in TCP server or client mode. It can't receive data greater than socket buffer size. \n
- *          In block io mode, it doesn't return until data reception is completed - data is filled as <I>len</I> in socket buffer. \n
- *          In non-block io mode, it return @ref SOCK_BUSY immediately when <I>len</I> is greater than data size in socket buffer. \n
- *
- * @param sn  Socket number. It should be <b>0 ~ @ref \_WIZCHIP_SOCK_NUM_</b>.
- * @param buf Pointer buffer to read incoming data.
- * @param len The max data length of data in buf.
- * @return	@b Success : The real received data size \n
- *          @b Fail    :\n
- *                     @ref SOCKERR_SOCKSTATUS - Invalid socket status for socket operation \n
- *                     @ref SOCKERR_SOCKMODE   - Invalid operation in the socket \n
- *                     @ref SOCKERR_SOCKNUM    - Invalid socket number \n
- *                     @ref SOCKERR_DATALEN    - zero data length \n
- *                     @ref SOCK_BUSY          - Socket is busy.
- */
-int32_t WIZCHIP_EXPORT(recv)(uint8_t sn, uint8_t * buf, uint16_t len);
-
-/**
- * @ingroup WIZnet_socket_APIs
- * @brief	Sends datagram to the peer with destination IP address and port number passed as parameter.
- * @details It sends datagram of UDP or MACRAW to the peer with destination IP address and port number passed as parameter.\n
- *          Even if the connectionless socket has been previously connected to a specific address,
- *          the address and port number parameters override the destination address for that particular datagram only.
- * @note    In block io mode, It doesn't return until data send is completed - socket buffer size is greater than <I>len</I>.
- *          In non-block io mode, It return @ref SOCK_BUSY immediately when socket buffer is not enough.
- *
- * @param sn    Socket number. It should be <b>0 ~ @ref \_WIZCHIP_SOCK_NUM_</b>.
- * @param buf   Pointer buffer to send outgoing data.
- * @param len   The byte length of data in buf.
- * @param addr  Pointer variable of destination IP address. It should be allocated 4 bytes.
- * @param port  Destination port number.
- *
- * @return @b Success : The sent data size \n
- *         @b Fail    :\n @ref SOCKERR_SOCKNUM     - Invalid socket number \n
- *                        @ref SOCKERR_SOCKMODE    - Invalid operation in the socket \n
- *                        @ref SOCKERR_SOCKSTATUS  - Invalid socket status for socket operation \n
- *                        @ref SOCKERR_DATALEN     - zero data length \n
- *                        @ref SOCKERR_IPINVALID   - Wrong server IP address\n
- *                        @ref SOCKERR_PORTZERO    - Server port zero\n
- *                        @ref SOCKERR_SOCKCLOSED  - Socket unexpectedly closed \n
- *                        @ref SOCKERR_TIMEOUT     - Timeout occurred \n
- *                        @ref SOCK_BUSY           - Socket is busy. 
- */
-int32_t WIZCHIP_EXPORT(sendto)(uint8_t sn, uint8_t * buf, uint16_t len, uint8_t * addr, uint16_t port);
-
-/**
- * @ingroup WIZnet_socket_APIs
- * @brief Receive datagram of UDP or MACRAW
- * @details This function is an application I/F function which is used to receive the data in other then TCP mode. \n
- *          This function is used to receive UDP and MAC_RAW mode, and handle the header as well. 
- *          This function can divide to received the packet data.
- *          On the MACRAW SOCKET, the addr and port parameters are ignored.
- * @note    In block io mode, it doesn't return until data reception is completed - data is filled as <I>len</I> in socket buffer
- *          In non-block io mode, it return @ref SOCK_BUSY immediately when <I>len</I> is greater than data size in socket buffer.
- *
- * @param sn   Socket number. It should be <b>0 ~ @ref \_WIZCHIP_SOCK_NUM_</b>.
- * @param buf  Pointer buffer to read incoming data.
- * @param len  The max data length of data in buf. 
- *             When the received packet size <= len, receives data as packet sized.
- *             When others, receives data as len.
- * @param addr Pointer variable of destination IP address. It should be allocated 4 bytes.
- *             It is valid only when the first call recvfrom for receiving the packet.
- *             When it is valid, @ref  packinfo[7] should be set as '1' after call @ref getsockopt(sn, SO_PACKINFO, &packinfo).
- * @param port Pointer variable of destination port number.
- *             It is valid only when the first call recvform for receiving the packet.
-*             When it is valid, @ref  packinfo[7] should be set as '1' after call @ref getsockopt(sn, SO_PACKINFO, &packinfo).
- *
- * @return	@b Success : This function return real received data size for success.\n
- *          @b Fail    : @ref SOCKERR_DATALEN    - zero data length \n
- *                       @ref SOCKERR_SOCKMODE   - Invalid operation in the socket \n
- *                       @ref SOCKERR_SOCKNUM    - Invalid socket number \n
- *                       @ref SOCKBUSY           - Socket is busy.
- */
-int32_t WIZCHIP_EXPORT(recvfrom)(uint8_t sn, uint8_t * buf, uint16_t len, uint8_t * addr, uint16_t *port);
-
-
-/////////////////////////////
-// SOCKET CONTROL & OPTION //
-/////////////////////////////
-#define SOCK_IO_BLOCK         0  ///< Socket Block IO Mode in @ref setsockopt().
-#define SOCK_IO_NONBLOCK      1  ///< Socket Non-block IO Mode in @ref setsockopt().
-
-/**
- * @defgroup DATA_TYPE DATA TYPE
- */
-
-/**
- * @ingroup DATA_TYPE
- * @brief The kind of Socket Interrupt.
- * @sa Sn_IR, Sn_IMR, setSn_IR(), getSn_IR(), setSn_IMR(), getSn_IMR()
- */
-typedef enum
-{
-   SIK_CONNECTED     = (1 << 0),    ///< connected
-   SIK_DISCONNECTED  = (1 << 1),    ///< disconnected
-   SIK_RECEIVED      = (1 << 2),    ///< data received
-   SIK_TIMEOUT       = (1 << 3),    ///< timeout occurred
-   SIK_SENT          = (1 << 4),    ///< send ok
-   SIK_ALL           = 0x1F,        ///< all interrupt
-}sockint_kind;
-
-/**
- * @ingroup DATA_TYPE
- * @brief The type of @ref ctlsocket().
- */
-typedef enum
-{
-   CS_SET_IOMODE,          ///< set socket IO mode with @ref SOCK_IO_BLOCK or @ref SOCK_IO_NONBLOCK
-   CS_GET_IOMODE,          ///< get socket IO mode
-   CS_GET_MAXTXBUF,        ///< get the size of socket buffer allocated in TX memory
-   CS_GET_MAXRXBUF,        ///< get the size of socket buffer allocated in RX memory
-   CS_CLR_INTERRUPT,       ///< clear the interrupt of socket with @ref sockint_kind
-   CS_GET_INTERRUPT,       ///< get the socket interrupt. refer to @ref sockint_kind
-   CS_SET_INTMASK,         ///< set the interrupt mask of socket with @ref sockint_kind
-   CS_GET_INTMASK          ///< get the masked interrupt of socket. refer to @ref sockint_kind
-}ctlsock_type;
-
-
-/**
- * @ingroup DATA_TYPE
- * @brief The type of socket option in @ref setsockopt() or @ref getsockopt()
- */ 
-typedef enum
-{
-   SO_FLAG,           ///< Valid only in getsockopt(), For set flag of socket refer to <I>flag</I> in @ref socket().
-   SO_TTL,              ///< Set/Get TTL. @ref Sn_TTL  ( @ref setSn_TTL(), @ref getSn_TTL() )
-   SO_TOS,              ///< Set/Get TOS. @ref Sn_TOS  ( @ref setSn_TOS(), @ref getSn_TOS() )
-   SO_MSS,              ///< Set/Get MSS. @ref Sn_MSSR ( @ref setSn_MSSR(), @ref getSn_MSSR() )
-   SO_DESTIP,           ///< Set/Get the destination IP address. @ref Sn_DIPR ( @ref setSn_DIPR(), @ref getSn_DIPR() )
-   SO_DESTPORT,         ///< Set/Get the destination Port number. @ref Sn_DPORT ( @ref setSn_DPORT(), @ref getSn_DPORT() )
-#if _WIZCHIP_ != 5100   
-   SO_KEEPALIVESEND,    ///< Valid only in setsockopt. Manually send keep-alive packet in TCP mode
-   #if _WIZCHIP_ > 5200   
-      SO_KEEPALIVEAUTO, ///< Set/Get keep-alive auto transmission timer in TCP mode
-   #endif      
-#endif
-   SO_SENDBUF,          ///< Valid only in getsockopt. Get the free data size of Socekt TX buffer. @ref Sn_TX_FSR, @ref getSn_TX_FSR()
-   SO_RECVBUF,          ///< Valid only in getsockopt. Get the received data size in socket RX buffer. @ref Sn_RX_RSR, @ref getSn_RX_RSR()
-   SO_STATUS,           ///< Valid only in getsockopt. Get the socket status. @ref Sn_SR, @ref getSn_SR()
-   SO_REMAINSIZE,       ///< Valid only in getsockopt. Get the remained packet size in other then TCP mode.
-   SO_PACKINFO          ///< Valid only in getsockopt. Get the packet information as @ref PACK_FIRST, @ref PACK_REMAINED, and @ref PACK_COMPLETED in other then TCP mode.
-}sockopt_type;
-
-/**
- * @ingroup WIZnet_socket_APIs
- *  @brief Control socket.
- *  @details Control IO mode, Interrupt & Mask of socket and get the socket buffer information.
- *           Refer to @ref ctlsock_type.
- *  @param sn socket number
- *  @param cstype type of control socket. refer to @ref ctlsock_type.
- *  @param arg Data type and value is determined according to @ref ctlsock_type. \n
- *             <table>
- *                  <tr> <td> @b cstype </td> <td> @b data type</td><td>@b value</td></tr>
- *                  <tr> <td> @ref CS_SET_IOMODE \n @ref CS_GET_IOMODE </td> <td> uint8_t </td><td>@ref SOCK_IO_BLOCK @ref SOCK_IO_NONBLOCK</td></tr>
- *                  <tr> <td> @ref CS_GET_MAXTXBUF \n @ref CS_GET_MAXRXBUF </td> <td> uint16_t </td><td> 0 ~ 16K </td></tr>
- *                  <tr> <td> @ref CS_CLR_INTERRUPT \n @ref CS_GET_INTERRUPT \n @ref CS_SET_INTMASK \n @ref CS_GET_INTMASK </td> <td> @ref sockint_kind </td><td> @ref SIK_CONNECTED, etc.  </td></tr> 
- *             </table>
- *  @return @b Success @ref SOCK_OK \n
- *          @b fail    @ref SOCKERR_ARG         - Invalid argument\n
- */
-int8_t  WIZCHIP_EXPORT(ctlsocket)(uint8_t sn, ctlsock_type cstype, void* arg);
-
-/** 
- * @ingroup WIZnet_socket_APIs
- *  @brief set socket options
- *  @details Set socket option like as TTL, MSS, TOS, and so on. Refer to @ref sockopt_type.
- *               
- *  @param sn socket number
- *  @param sotype socket option type. refer to @ref sockopt_type
- *  @param arg Data type and value is determined according to <I>sotype</I>. \n
- *             <table>
- *                  <tr> <td> @b sotype </td> <td> @b data type</td><td>@b value</td></tr> 
- *                  <tr> <td> @ref SO_TTL </td> <td> uint8_t </td><td> 0 ~ 255 </td> </tr>
- *                  <tr> <td> @ref SO_TOS </td> <td> uint8_t </td><td> 0 ~ 255 </td> </tr>
- *                  <tr> <td> @ref SO_MSS </td> <td> uint16_t </td><td> 0 ~ 65535 </td> </tr>
- *                  <tr> <td> @ref SO_DESTIP </td> <td> uint8_t[4] </td><td>  </td></tr> 
- *                  <tr> <td> @ref SO_DESTPORT </td> <td> uint16_t </td><td> 0 ~ 65535 </td></tr> 
- *                  <tr> <td> @ref SO_KEEPALIVESEND </td> <td> null </td><td> null </td></tr> 
- *                  <tr> <td> @ref SO_KEEPALIVEAUTO </td> <td> uint8_t </td><td> 0 ~ 255 </td></tr> 
- *             </table>
- * @return 
- * - @b Success : @ref SOCK_OK \n
- * - @b Fail 
- *  - @ref SOCKERR_SOCKNUM     - Invalid Socket number \n
- *  - @ref SOCKERR_SOCKMODE    - Invalid socket mode \n
- *  - @ref SOCKERR_SOCKOPT     - Invalid socket option or its value \n
- *  - @ref SOCKERR_TIMEOUT     - Timeout occurred when sending keep-alive packet \n
- */
-int8_t  WIZCHIP_EXPORT(setsockopt)(uint8_t sn, sockopt_type sotype, void* arg);
-
-/** 
- * @ingroup WIZnet_socket_APIs
- *  @brief get socket options
- *  @details Get socket option like as FLAG, TTL, MSS, and so on. Refer to @ref sockopt_type
- *  @param sn socket number
- *  @param sotype socket option type. refer to @ref sockopt_type
- *  @param arg Data type and value is determined according to <I>sotype</I>. \n
- *             <table>
- *                  <tr> <td> @b sotype </td> <td>@b data type</td><td>@b value</td></tr>
- *                  <tr> <td> @ref SO_FLAG </td> <td> uint8_t </td><td> @ref SF_ETHER_OWN, etc... </td> </tr>
- *                  <tr> <td> @ref SO_TOS </td> <td> uint8_t </td><td> 0 ~ 255 </td> </tr>
- *                  <tr> <td> @ref SO_MSS </td> <td> uint16_t </td><td> 0 ~ 65535 </td> </tr>
- *                  <tr> <td> @ref SO_DESTIP </td> <td> uint8_t[4] </td><td>  </td></tr> 
- *                  <tr> <td> @ref SO_DESTPORT </td> <td> uint16_t </td><td>  </td></tr> 
- *                  <tr> <td> @ref SO_KEEPALIVEAUTO </td> <td> uint8_t </td><td> 0 ~ 255 </td></tr> 
- *                  <tr> <td> @ref SO_SENDBUF </td> <td> uint16_t </td><td> 0 ~ 65535 </td></tr>  
- *                  <tr> <td> @ref SO_RECVBUF </td> <td> uint16_t </td><td> 0 ~ 65535 </td></tr>  
- *                  <tr> <td> @ref SO_STATUS </td> <td> uint8_t </td><td> @ref SOCK_ESTABLISHED, etc.. </td></tr>  
- *                  <tr> <td> @ref SO_REMAINSIZE </td> <td> uint16_t </td><td> 0~ 65535 </td></tr>
- *                  <tr> <td> @ref SO_PACKINFO </td> <td> uint8_t </td><td> @ref PACK_FIRST, etc... </td></tr>
- *             </table>
- * @return 
- * - @b Success : @ref SOCK_OK \n
- * - @b Fail 
- *  - @ref SOCKERR_SOCKNUM     - Invalid Socket number \n
- *  - @ref SOCKERR_SOCKOPT     - Invalid socket option or its value \n
- *  - @ref SOCKERR_SOCKMODE    - Invalid socket mode \n
- * @note
- *   The option as PACK_REMAINED and SO_PACKINFO is valid only in NON-TCP mode and after call @ref recvfrom(). \n
- *   When SO_PACKINFO value is PACK_FIRST and the return value of recvfrom() is zero, 
- *   This means the zero byte UDP data(UDP Header only) received.
-  */
-int8_t  WIZCHIP_EXPORT(getsockopt)(uint8_t sn, sockopt_type sotype, void* arg);
-
-#endif   // _WIZCHIP_SOCKET_H_
diff --git a/drivers/wiznet5k/ethernet/w5200/w5200.c b/drivers/wiznet5k/ethernet/w5200/w5200.c
deleted file mode 100644
index a84d3c9fa7bcb..0000000000000
--- a/drivers/wiznet5k/ethernet/w5200/w5200.c
+++ /dev/null
@@ -1,215 +0,0 @@
-// dpgeorge: this file taken from w5500/w5500.c and adapted to W5200
-
-//*****************************************************************************
-//
-//! \file w5500.c
-//! \brief W5500 HAL Interface.
-//! \version 1.0.1
-//! \date 2013/10/21
-//! \par  Revision history
-//!       <2014/05/01> V1.0.2
-//!         1. Implicit type casting -> Explicit type casting. Refer to M20140501
-//!            Fixed the problem on porting into under 32bit MCU
-//!            Issued by Mathias ClauBen, wizwiki forum ID Think01 and bobh
-//!            Thank for your interesting and serious advices.
-//!       <2013/10/21> 1st Release
-//!       <2013/12/20> V1.0.1
-//!         1. Remove warning
-//!         2. WIZCHIP_READ_BUF WIZCHIP_WRITE_BUF in case _WIZCHIP_IO_MODE_SPI_FDM_
-//!            for loop optimized(removed). refer to M20131220
-//! \author MidnightCow
-//! \copyright
-//!
-//! Copyright (c)  2013, WIZnet Co., LTD.
-//! All rights reserved.
-//! 
-//! Redistribution and use in source and binary forms, with or without 
-//! modification, are permitted provided that the following conditions 
-//! are met: 
-//! 
-//!     * Redistributions of source code must retain the above copyright 
-//! notice, this list of conditions and the following disclaimer. 
-//!     * Redistributions in binary form must reproduce the above copyright
-//! notice, this list of conditions and the following disclaimer in the
-//! documentation and/or other materials provided with the distribution. 
-//!     * Neither the name of the <ORGANIZATION> nor the names of its 
-//! contributors may be used to endorse or promote products derived 
-//! from this software without specific prior written permission. 
-//! 
-//! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-//! AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
-//! IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-//! ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE 
-//! LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
-//! CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 
-//! SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-//! INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
-//! CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 
-//! ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF 
-//! THE POSSIBILITY OF SUCH DAMAGE.
-//
-//*****************************************************************************
-
-#include "w5200.h"
-
-#if WIZCHIP_USE_MAX_BUFFER
-// This option is intended to be used when MACRAW mode is enabled, to allow
-// the single raw socket to use all the available buffer space.
-#define SMASK (16 * 1024 - 1) /* tx buffer mask */
-#define RMASK (16 * 1024 - 1) /* rx buffer mask */
-#define SSIZE (16 * 1024) /* max tx buffer size */
-#define RSIZE (16 * 1024) /* max rx buffer size */
-#else
-#define SMASK (0x7ff) /* tx buffer mask */
-#define RMASK (0x7ff) /* rx buffer mask */
-#define SSIZE (2048) /* max tx buffer size */
-#define RSIZE (2048) /* max rx buffer size */
-#endif
-
-#define TXBUF_BASE (0x8000)
-#define RXBUF_BASE (0xc000)
-#define SBASE(sn) (TXBUF_BASE + SSIZE * (sn)) /* tx buffer base for socket sn */
-#define RBASE(sn) (RXBUF_BASE + RSIZE * (sn)) /* rx buffer base for socket sn */
-
-uint8_t WIZCHIP_READ(uint32_t AddrSel) {
-    WIZCHIP_CRITICAL_ENTER();
-    WIZCHIP.CS._select();
-
-    uint8_t spi_data[4] = {
-        AddrSel >> 8,
-        AddrSel,
-        0x00,
-        0x01,
-    };
-    WIZCHIP.IF.SPI._write_bytes(spi_data, 4);
-    uint8_t ret;
-    WIZCHIP.IF.SPI._read_bytes(&ret, 1);
-
-    WIZCHIP.CS._deselect();
-    WIZCHIP_CRITICAL_EXIT();
-
-    return ret;
-}
-
-void WIZCHIP_WRITE(uint32_t AddrSel, uint8_t wb) {
-    WIZCHIP_CRITICAL_ENTER();
-    WIZCHIP.CS._select();
-
-    uint8_t spi_data[5] = {
-        AddrSel >> 8,
-        AddrSel,
-        0x80,
-        0x01,
-        wb,
-    };
-    WIZCHIP.IF.SPI._write_bytes(spi_data, 5);
-
-    WIZCHIP.CS._deselect();
-    WIZCHIP_CRITICAL_EXIT();
-}
-
-void WIZCHIP_READ_BUF(uint32_t AddrSel, uint8_t* pBuf, uint16_t len) {
-    WIZCHIP_CRITICAL_ENTER();
-    WIZCHIP.CS._select();
-
-    uint8_t spi_data[4] = {
-        AddrSel >> 8,
-        AddrSel,
-        0x00 | ((len >> 8) & 0x7f),
-        len & 0xff,
-    };
-    WIZCHIP.IF.SPI._write_bytes(spi_data, 4);
-    WIZCHIP.IF.SPI._read_bytes(pBuf, len);
-
-    WIZCHIP.CS._deselect();
-    WIZCHIP_CRITICAL_EXIT();
-}
-
-void WIZCHIP_WRITE_BUF(uint32_t AddrSel, uint8_t* pBuf, uint16_t len) {
-    WIZCHIP_CRITICAL_ENTER();
-    WIZCHIP.CS._select();
-
-    uint8_t spi_data[4] = {
-        AddrSel >> 8,
-        AddrSel,
-        0x80 | ((len >> 8) & 0x7f),
-        len & 0xff,
-    };
-    WIZCHIP.IF.SPI._write_bytes(spi_data, 4);
-    WIZCHIP.IF.SPI._write_bytes(pBuf, len);
-
-    WIZCHIP.CS._deselect();
-    WIZCHIP_CRITICAL_EXIT();
-}
-
-uint16_t getSn_TX_FSR(uint8_t sn) {
-    uint16_t val = 0, val1 = 0;
-    do {
-        val1 = (WIZCHIP_READ(Sn_TX_FSR(sn)) << 8) | WIZCHIP_READ(Sn_TX_FSR(sn) + 1);
-        if (val1 != 0) {
-            val = (WIZCHIP_READ(Sn_TX_FSR(sn)) << 8) | WIZCHIP_READ(Sn_TX_FSR(sn) + 1);
-        }
-    } while (val != val1);
-    return val;
-}
-
-uint16_t getSn_RX_RSR(uint8_t sn) {
-    uint16_t val = 0, val1 = 0;
-    do {
-        val1 = (WIZCHIP_READ(Sn_RX_RSR(sn)) << 8) | WIZCHIP_READ(Sn_RX_RSR(sn) + 1);
-        if (val1 != 0) {
-            val = (WIZCHIP_READ(Sn_RX_RSR(sn)) << 8) | WIZCHIP_READ(Sn_RX_RSR(sn) + 1);
-        }
-    } while (val != val1);
-    return val;
-}
-
-void wiz_send_data(uint8_t sn, uint8_t *wizdata, uint16_t len) {
-    if (len == 0) {
-        return;
-    }
-
-    uint16_t ptr = getSn_TX_WR(sn);
-    uint16_t offset = ptr & SMASK;
-    uint32_t addr = offset + SBASE(sn);
-
-    if (offset + len > SSIZE) {
-        // implement wrap-around circular buffer
-        uint16_t size = SSIZE - offset;
-        WIZCHIP_WRITE_BUF(addr, wizdata, size);
-        WIZCHIP_WRITE_BUF(SBASE(sn), wizdata + size, len - size);
-    } else {
-        WIZCHIP_WRITE_BUF(addr, wizdata, len);
-    }
-
-    ptr += len;
-    setSn_TX_WR(sn, ptr);
-}
-
-void wiz_recv_data(uint8_t sn, uint8_t *wizdata, uint16_t len) {
-    if (len == 0) {
-        return;
-    }
-
-    uint16_t ptr = getSn_RX_RD(sn);
-    uint16_t offset = ptr & RMASK;
-    uint16_t addr = RBASE(sn) + offset;
-
-    if (offset + len > RSIZE) {
-        // implement wrap-around circular buffer
-        uint16_t size = RSIZE - offset;
-        WIZCHIP_READ_BUF(addr, wizdata, size);
-        WIZCHIP_READ_BUF(RBASE(sn), wizdata + size, len - size);
-    } else {
-        WIZCHIP_READ_BUF(addr, wizdata, len);
-    }
-
-    ptr += len;
-    setSn_RX_RD(sn, ptr);
-}
-
-void wiz_recv_ignore(uint8_t sn, uint16_t len) {
-    uint16_t ptr = getSn_RX_RD(sn);
-    ptr += len;
-    setSn_RX_RD(sn, ptr);
-}
diff --git a/drivers/wiznet5k/ethernet/w5200/w5200.h b/drivers/wiznet5k/ethernet/w5200/w5200.h
deleted file mode 100644
index 63561940f8b55..0000000000000
--- a/drivers/wiznet5k/ethernet/w5200/w5200.h
+++ /dev/null
@@ -1,2092 +0,0 @@
-// dpgeorge: this file taken from w5500/w5500.h and adapted to W5200
-
-//*****************************************************************************
-//
-//! \file w5500.h
-//! \brief W5500 HAL Header File.
-//! \version 1.0.0
-//! \date 2013/10/21
-//! \par  Revision history
-//!       <2013/10/21> 1st Release
-//! \author MidnightCow
-//! \copyright
-//!
-//! Copyright (c)  2013, WIZnet Co., LTD.
-//! All rights reserved.
-//! 
-//! Redistribution and use in source and binary forms, with or without 
-//! modification, are permitted provided that the following conditions 
-//! are met: 
-//! 
-//!     * Redistributions of source code must retain the above copyright 
-//! notice, this list of conditions and the following disclaimer. 
-//!     * Redistributions in binary form must reproduce the above copyright
-//! notice, this list of conditions and the following disclaimer in the
-//! documentation and/or other materials provided with the distribution. 
-//!     * Neither the name of the <ORGANIZATION> nor the names of its 
-//! contributors may be used to endorse or promote products derived 
-//! from this software without specific prior written permission. 
-//! 
-//! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-//! AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
-//! IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-//! ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE 
-//! LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
-//! CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 
-//! SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-//! INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
-//! CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 
-//! ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF 
-//! THE POSSIBILITY OF SUCH DAMAGE.
-//
-//*****************************************************************************
-
-#ifndef  _W5200_H_
-#define  _W5200_H_
-
-#include <stdint.h>
-#include "../wizchip_conf.h"
-//#include "board.h"
-
-#define _W5200_IO_BASE_              0x00000000
-
-#define WIZCHIP_CREG_ADDR(addr) (_W5200_IO_BASE_ + (addr))
-
-#define WIZCHIP_CH_BASE (0x4000)
-#define WIZCHIP_CH_SIZE (0x100)
-#define WIZCHIP_SREG_ADDR(sn, addr) (_W5200_IO_BASE_ + WIZCHIP_CH_BASE + (sn) * WIZCHIP_CH_SIZE + (addr))
-
-//////////////////////////////
-//--------------------------  defgroup ---------------------------------
-/**
- * @defgroup W5500 W5500
- *
- * @brief WHIZCHIP register defines and I/O functions of @b W5500.
- *
- * - @ref WIZCHIP_register : @ref Common_register_group and @ref Socket_register_group
- * - @ref WIZCHIP_IO_Functions : @ref Basic_IO_function, @ref Common_register_access_function and @ref Socket_register_access_function
- */
- 
- 
-/**
- * @defgroup WIZCHIP_register WIZCHIP register
- * @ingroup W5500
- *
- * @brief WHIZCHIP register defines register group of @b W5500.
- *
- * - @ref Common_register_group : Common register group
- * - @ref Socket_register_group : \c SOCKET n register group
- */
-
-
-/**
- * @defgroup WIZCHIP_IO_Functions WIZCHIP I/O functions
- * @ingroup W5500
- *
- * @brief This supports the basic I/O functions for @ref WIZCHIP_register.
- *
- * - <b> Basic I/O function </b> \n
- *   WIZCHIP_READ(), WIZCHIP_WRITE(), WIZCHIP_READ_BUF(), WIZCHIP_WRITE_BUF() \n\n
- *
- * - @ref Common_register_group <b>access functions</b> \n
- * 	-# @b Mode \n
- *    getMR(), setMR()
- * 	-# @b Interrupt \n
- *    getIR(), setIR(), getIMR(), setIMR(), getSIR(), setSIR(), getSIMR(), setSIMR(), getINTLEVEL(), setINTLEVEL()
- * 	-# <b> Network Information </b> \n
- *    getSHAR(), setSHAR(), getGAR(), setGAR(), getSUBR(), setSUBR(), getSIPR(), setSIPR()
- * 	-# @b Retransmission \n
- *    getRCR(), setRCR(), getRTR(), setRTR()
- * 	-# @b PPPoE \n
- *    getPTIMER(), setPTIMER(), getPMAGIC(), getPMAGIC(), getPSID(), setPSID(), getPHAR(), setPHAR(), getPMRU(), setPMRU()
- * 	-# <b> ICMP packet </b>\n
- *    getUIPR(), getUPORTR()
- * 	-# @b etc. \n
- *    getPHYCFGR(), setPHYCFGR(), getVERSIONR() \n\n
- *
- * - \ref Socket_register_group <b>access functions</b> \n
- *   -# <b> SOCKET control</b> \n
- *      getSn_MR(), setSn_MR(), getSn_CR(), setSn_CR(), getSn_IMR(), setSn_IMR(), getSn_IR(), setSn_IR()
- *   -# <b> SOCKET information</b> \n
- *      getSn_SR(), getSn_DHAR(), setSn_DHAR(), getSn_PORT(), setSn_PORT(), getSn_DIPR(), setSn_DIPR(), getSn_DPORT(), setSn_DPORT()
- *      getSn_MSSR(), setSn_MSSR()
- *   -# <b> SOCKET communication </b> \n
- *      getSn_RXBUF_SIZE(), setSn_RXBUF_SIZE(), getSn_TXBUF_SIZE(), setSn_TXBUF_SIZE() \n
- *      getSn_TX_RD(), getSn_TX_WR(), setSn_TX_WR() \n
- *      getSn_RX_RD(), setSn_RX_RD(), getSn_RX_WR() \n
- *      getSn_TX_FSR(), getSn_RX_RSR(), getSn_KPALVTR(), setSn_KPALVTR()
- *   -# <b> IP header field </b> \n
- *      getSn_FRAG(), setSn_FRAG(),  getSn_TOS(), setSn_TOS() \n
- *      getSn_TTL(), setSn_TTL()
- */
-
-
-
-/**
- * @defgroup Common_register_group Common register
- * @ingroup WIZCHIP_register
- *
- * @brief Common register group\n
- * It set the basic for the networking\n
- * It set the configuration such as interrupt, network information, ICMP, etc.
- * @details
- * @sa MR : Mode register.
- * @sa GAR, SUBR, SHAR, SIPR
- * @sa INTLEVEL, IR, IMR, SIR, SIMR : Interrupt.
- * @sa RTR, RCR : Data retransmission.
- * @sa PTIMER, PMAGIC, PHAR, PSID, PMRU : PPPoE.
- * @sa UIPR, UPORTR : ICMP message.
- * @sa PHYCFGR, VERSIONR : etc.
- */
- 
-  
- 
-/**
- * @defgroup Socket_register_group Socket register
- * @ingroup WIZCHIP_register
- *
- * @brief Socket register group.\n
- * Socket register configures and control SOCKETn which is necessary to data communication.
- * @details
- * @sa Sn_MR, Sn_CR, Sn_IR, Sn_IMR : SOCKETn Control
- * @sa Sn_SR, Sn_PORT, Sn_DHAR, Sn_DIPR, Sn_DPORT : SOCKETn Information
- * @sa Sn_MSSR, Sn_TOS, Sn_TTL, Sn_KPALVTR, Sn_FRAG : Internet protocol.
- * @sa Sn_RXBUF_SIZE, Sn_TXBUF_SIZE, Sn_TX_FSR, Sn_TX_RD, Sn_TX_WR, Sn_RX_RSR, Sn_RX_RD, Sn_RX_WR : Data communication
- */
- 
- 
- 
- /**
- * @defgroup Basic_IO_function Basic I/O function
- * @ingroup WIZCHIP_IO_Functions
- * @brief These are basic input/output functions to read values from register or write values to register.
- */
-
-/**
- * @defgroup Common_register_access_function Common register access functions
- * @ingroup WIZCHIP_IO_Functions
- * @brief These are functions to access <b>common registers</b>.
- */
-
-/**
- * @defgroup Socket_register_access_function Socket register access functions
- * @ingroup WIZCHIP_IO_Functions
- * @brief These are functions to access <b>socket registers</b>.
- */
- 
-//------------------------------- defgroup end --------------------------------------------
-//----------------------------- W5500 Common Registers IOMAP -----------------------------
-/**
- * @ingroup Common_register_group
- * @brief Mode Register address(R/W)\n
- * @ref MR is used for S/W reset, ping block mode, PPPoE mode and etc.
- * @details Each bit of @ref MR defined as follows.
- * <table>
- * 		<tr>  <td>7</td> <td>6</td> <td>5</td> <td>4</td> <td>3</td> <td>2</td> <td>1</td> <td>0</td>   </tr>
- * 		<tr>  <td>RST</td> <td>Reserved</td> <td>WOL</td> <td>PB</td> <td>PPPoE</td> <td>Reserved</td> <td>FARP</td> <td>Reserved</td> </tr>
- * </table>
- * - \ref MR_RST		 	: Reset
- * - \ref MR_WOL       		: Wake on LAN
- * - \ref MR_PB         	: Ping block
- * - \ref MR_PPPOE      	: PPPoE mode
- * - \ref MR_FARP			: Force ARP mode
- */
-#define MR WIZCHIP_CREG_ADDR(0x0000)
-
-/**
- * @ingroup Common_register_group
- * @brief Gateway IP Register address(R/W)
- * @details @ref GAR configures the default gateway address.
- */
-#define GAR WIZCHIP_CREG_ADDR(0x0001)
-
-/**
- * @ingroup Common_register_group
- * @brief Subnet mask Register address(R/W)
- * @details @ref SUBR configures the subnet mask address.
- */
-#define SUBR WIZCHIP_CREG_ADDR(0x0005)
-
-/**
- * @ingroup Common_register_group
- * @brief Source MAC Register address(R/W)
- * @details @ref SHAR configures the source hardware address.
- */
-#define SHAR WIZCHIP_CREG_ADDR(0x0009)
-
-/**
- * @ingroup Common_register_group
- * @brief Source IP Register address(R/W)
- * @details @ref SIPR configures the source IP address.
- */
-#define SIPR WIZCHIP_CREG_ADDR(0x000f)
-
-/**
- * @ingroup Common_register_group
- * @brief Set Interrupt low level timer register address(R/W)
- * @details @ref INTLEVEL configures the Interrupt Assert Time.
- */
-//#define INTLEVEL           (_W5500_IO_BASE_ + (0x0013 << 8) + (WIZCHIP_CREG_BLOCK << 3))
-
-/**
- * @ingroup Common_register_group
- * @brief Interrupt Register(R/W)
- * @details @ref IR indicates the interrupt status. Each bit of @ref IR will be still until the bit will be written to by the host.
- * If @ref IR is not equal to x00 INTn PIN is asserted to low until it is x00\n\n
- * Each bit of @ref IR defined as follows.
- * <table>
- * 		<tr>  <td>7</td> <td>6</td> <td>5</td> <td>4</td> <td>3</td> <td>2</td> <td>1</td> <td>0</td>   </tr>
- * 		<tr>  <td>CONFLICT</td> <td>UNREACH</td> <td>PPPoE</td> <td>MP</td> <td>Reserved</td> <td>Reserved</td> <td>Reserved</td> <td>Reserved</td> </tr>
- * </table>
- * - \ref IR_CONFLICT : IP conflict
- * - \ref IR_UNREACH  : Destination unreachable
- * - \ref IR_PPPoE	  : PPPoE connection close
- * - \ref IR_MP		  : Magic packet
- */
-#define IR WIZCHIP_CREG_ADDR(0x0015)
-
-/**
- * @ingroup Common_register_group
- * @brief Interrupt mask register(R/W)
- * @details @ref IMR is used to mask interrupts. Each bit of @ref IMR corresponds to each bit of @ref IR.
- * When a bit of @ref IMR is and the corresponding bit of @ref IR is  an interrupt will be issued. In other words,
- * if a bit of @ref IMR is  an interrupt will not be issued even if the corresponding bit of @ref IR is \n\n
- * Each bit of @ref IMR defined as the following.
- * <table>
- * 		<tr>  <td>7</td> <td>6</td> <td>5</td> <td>4</td> <td>3</td> <td>2</td> <td>1</td> <td>0</td>   </tr>
- * 		<tr>  <td>IM_IR7</td> <td>IM_IR6</td> <td>IM_IR5</td> <td>IM_IR4</td> <td>Reserved</td> <td>Reserved</td> <td>Reserved</td> <td>Reserved</td> </tr>
- * </table>
- * - \ref IM_IR7 : IP Conflict Interrupt Mask
- * - \ref IM_IR6 : Destination unreachable Interrupt Mask
- * - \ref IM_IR5 : PPPoE Close Interrupt Mask
- * - \ref IM_IR4 : Magic Packet Interrupt Mask
- */
-#define IMR WIZCHIP_CREG_ADDR(0x0016)
-
-/**
- * @ingroup Common_register_group
- * @brief Socket Interrupt Register(R/W)
- * @details @ref SIR indicates the interrupt status of Socket.\n
- * Each bit of @ref SIR be still until @ref Sn_IR is cleared by the host.\n
- * If @ref Sn_IR is not equal to x00 the n-th bit of @ref SIR is and INTn PIN is asserted until @ref SIR is x00 */
-//#define SIR                (_W5500_IO_BASE_ + (0x0017 << 8) + (WIZCHIP_CREG_BLOCK << 3))
-
-/**
- * @ingroup Common_register_group
- * @brief Socket Interrupt Mask Register(R/W)
- * @details Each bit of @ref SIMR corresponds to each bit of @ref SIR.
- * When a bit of @ref SIMR is and the corresponding bit of @ref SIR is  Interrupt will be issued.
- * In other words, if a bit of @ref SIMR is  an interrupt will be not issued even if the corresponding bit of @ref SIR is 
- */
-//#define SIMR               (_W5500_IO_BASE_ + (0x0018 << 8) + (WIZCHIP_CREG_BLOCK << 3))
-
-/**
- * @ingroup Common_register_group
- * @brief Timeout register address( 1 is 100us )(R/W)
- * @details @ref RTR configures the retransmission timeout period. The unit of timeout period is 100us and the default of @ref RTR is x07D0or 000
- * And so the default timeout period is 200ms(100us X 2000). During the time configured by @ref RTR, W5500 waits for the peer response
- * to the packet that is transmitted by \ref Sn_CR (CONNECT, DISCON, CLOSE, SEND, SEND_MAC, SEND_KEEP command).
- * If the peer does not respond within the @ref RTR time, W5500 retransmits the packet or issues timeout.
- */
-#define RTR WIZCHIP_CREG_ADDR(0x0017)
-
-/**
- * @ingroup Common_register_group
- * @brief Retry count register(R/W)
- * @details @ref RCR configures the number of time of retransmission.
- * When retransmission occurs as many as ref RCR+1 Timeout interrupt is issued (@ref Sn_IR[TIMEOUT] = .
- */
-#define RCR WIZCHIP_CREG_ADDR(0x0019)
-
-/**
- * @ingroup Common_register_group
- * @brief PPP LCP Request Timer register  in PPPoE mode(R/W)
- * @details @ref PTIMER configures the time for sending LCP echo request. The unit of time is 25ms.
- */
-#define PTIMER WIZCHIP_CREG_ADDR(0x0028)
-
-/**
- * @ingroup Common_register_group
- * @brief PPP LCP Magic number register  in PPPoE mode(R/W)
- * @details @ref PMAGIC configures the 4bytes magic number to be used in LCP negotiation.
- */
-#define PMAGIC WIZCHIP_CREG_ADDR(0x0029)
-
-/**
- * @ingroup Common_register_group
- * @brief PPP Destination MAC Register address(R/W)
- * @details @ref PHAR configures the PPPoE server hardware address that is acquired during PPPoE connection process.
- */
-//#define PHAR                (_W5500_IO_BASE_ + (0x001E << 8) + (WIZCHIP_CREG_BLOCK << 3))
-
-/**
- * @ingroup Common_register_group
- * @brief PPP Session Identification Register(R/W)
- * @details @ref PSID configures the PPPoE sever session ID acquired during PPPoE connection process.
- */
-//#define PSID               (_W5500_IO_BASE_ + (0x0024 << 8) + (WIZCHIP_CREG_BLOCK << 3))
-
-/**
- * @ingroup Common_register_group
- * @brief PPP Maximum Segment Size(MSS) register(R/W)
- * @details @ref PMRU configures the maximum receive unit of PPPoE.
- */
-//#define PMRU               (_W5500_IO_BASE_ + (0x0026 << 8) + (WIZCHIP_CREG_BLOCK << 3))
-
-/**
- * @ingroup Common_register_group
- * @brief Unreachable IP register address in UDP mode(R)
- * @details W5500 receives an ICMP packet(Destination port unreachable) when data is sent to a port number
- * which socket is not open and @ref UNREACH bit of @ref IR becomes and @ref UIPR & @ref UPORTR indicates
- * the destination IP address & port number respectively.
- */
-//#define UIPR               (_W5500_IO_BASE_ + (0x002a << 8) + (WIZCHIP_CREG_BLOCK << 3))
-
-/**
- * @ingroup Common_register_group
- * @brief Unreachable Port register address in UDP mode(R)
- * @details W5500 receives an ICMP packet(Destination port unreachable) when data is sent to a port number
- * which socket is not open and @ref UNREACH bit of @ref IR becomes and @ref UIPR & @ref UPORTR
- * indicates the destination IP address & port number respectively.
- */
-//#define UPORTR              (_W5500_IO_BASE_ + (0x002e << 8) + (WIZCHIP_CREG_BLOCK << 3))
-
-/**
- * @ingroup Common_register_group
- * @brief PHY Status Register(R/W)
- * @details @ref PHYCFGR configures PHY operation mode and resets PHY. In addition, @ref PHYCFGR indicates the status of PHY such as duplex, Speed, Link.
- */
-//#define PHYCFGR            (_W5500_IO_BASE_ + (0x002E << 8) + (WIZCHIP_CREG_BLOCK << 3))
-#define PHYSTATUS WIZCHIP_CREG_ADDR(0x0035)
-
-// Reserved			         (_W5500_IO_BASE_ + (0x002F << 8) + (WIZCHIP_CREG_BLOCK << 3))
-// Reserved			         (_W5500_IO_BASE_ + (0x0030 << 8) + (WIZCHIP_CREG_BLOCK << 3))
-// Reserved			         (_W5500_IO_BASE_ + (0x0031 << 8) + (WIZCHIP_CREG_BLOCK << 3))
-// Reserved			         (_W5500_IO_BASE_ + (0x0032 << 8) + (WIZCHIP_CREG_BLOCK << 3))
-// Reserved			         (_W5500_IO_BASE_ + (0x0033 << 8) + (WIZCHIP_CREG_BLOCK << 3))
-// Reserved			         (_W5500_IO_BASE_ + (0x0034 << 8) + (WIZCHIP_CREG_BLOCK << 3))
-// Reserved			         (_W5500_IO_BASE_ + (0x0035 << 8) + (WIZCHIP_CREG_BLOCK << 3))
-// Reserved			         (_W5500_IO_BASE_ + (0x0036 << 8) + (WIZCHIP_CREG_BLOCK << 3))
-// Reserved			         (_W5500_IO_BASE_ + (0x0037 << 8) + (WIZCHIP_CREG_BLOCK << 3))
-// Reserved			         (_W5500_IO_BASE_ + (0x0038 << 8) + (WIZCHIP_CREG_BLOCK << 3))
-
-/**
- * @ingroup Common_register_group
- * @brief chip version register address(R)
- * @details @ref VERSIONR always indicates the W5500 version as @b 0x04.
- */
-//#define VERSIONR           (_W5200_IO_BASE_ + (0x0039 << 8) + (WIZCHIP_CREG_BLOCK << 3))
-
-
-//----------------------------- W5500 Socket Registers IOMAP -----------------------------
-/**
- * @ingroup Socket_register_group
- * @brief socket Mode register(R/W)
- * @details @ref Sn_MR configures the option or protocol type of Socket n.\n\n
- * Each bit of @ref Sn_MR defined as the following.
- * <table>
- * 		<tr>  <td>7</td> <td>6</td> <td>5</td> <td>4</td> <td>3</td> <td>2</td> <td>1</td> <td>0</td>   </tr>
- * 		<tr>  <td>MULTI/MFEN</td> <td>BCASTB</td> <td>ND/MC/MMB</td> <td>UCASTB/MIP6B</td> <td>Protocol[3]</td> <td>Protocol[2]</td> <td>Protocol[1]</td> <td>Protocol[0]</td> </tr>
- * </table>
- * - @ref Sn_MR_MULTI	: Support UDP Multicasting
- * - @ref Sn_MR_BCASTB	: Broadcast block <b>in UDP Multicasting</b>
- * - @ref Sn_MR_ND		: No Delayed Ack(TCP) flag
- * - @ref Sn_MR_MC   	: IGMP version used <b>in UDP mulitcasting</b>
- * - @ref Sn_MR_MMB    	: Multicast Blocking <b>in @ref Sn_MR_MACRAW mode</b>
- * - @ref Sn_MR_UCASTB	: Unicast Block <b>in UDP Multicating</b>
- * - @ref Sn_MR_MIP6B   : IPv6 packet Blocking <b>in @ref Sn_MR_MACRAW mode</b>
- * - <b>Protocol</b>
- * <table>
- * 		<tr>   <td><b>Protocol[3]</b></td> <td><b>Protocol[2]</b></td> <td><b>Protocol[1]</b></td> <td><b>Protocol[0]</b></td> <td>@b Meaning</td>   </tr>
- * 		<tr>   <td>0</td> <td>0</td> <td>0</td> <td>0</td> <td>Closed</td>   </tr>
- * 		<tr>   <td>0</td> <td>0</td> <td>0</td> <td>1</td> <td>TCP</td>   </tr>
- * 		<tr>   <td>0</td> <td>0</td> <td>1</td> <td>0</td> <td>UDP</td>   </tr>
- * 		<tr>   <td>0</td> <td>1</td> <td>0</td> <td>0</td> <td>MACRAW</td>   </tr>
- * </table>
- *	- @ref Sn_MR_MACRAW	: MAC LAYER RAW SOCK \n
- *  - @ref Sn_MR_UDP		: UDP
- *  - @ref Sn_MR_TCP		: TCP
- *  - @ref Sn_MR_CLOSE	: Unused socket
- *  @note MACRAW mode should be only used in Socket 0.
- */
-#define Sn_MR(N) WIZCHIP_SREG_ADDR(N, 0x0000)
-
-/**
- * @ingroup Socket_register_group
- * @brief Socket command register(R/W)
- * @details This is used to set the command for Socket n such as OPEN, CLOSE, CONNECT, LISTEN, SEND, and RECEIVE.\n
- * After W5500 accepts the command, the @ref Sn_CR register is automatically cleared to 0x00.
- * Even though @ref Sn_CR is cleared to 0x00, the command is still being processed.\n
- * To check whether the command is completed or not, please check the @ref Sn_IR or @ref Sn_SR.
- * - @ref Sn_CR_OPEN 		: Initialize or open socket.
- * - @ref Sn_CR_LISTEN 		: Wait connection request in TCP mode(<b>Server mode</b>)
- * - @ref Sn_CR_CONNECT 	: Send connection request in TCP mode(<b>Client mode</b>)
- * - @ref Sn_CR_DISCON 		: Send closing request in TCP mode.
- * - @ref Sn_CR_CLOSE   	: Close socket.
- * - @ref Sn_CR_SEND    	: Update TX buffer pointer and send data.
- * - @ref Sn_CR_SEND_MAC	: Send data with MAC address, so without ARP process.
- * - @ref Sn_CR_SEND_KEEP 	: Send keep alive message.
- * - @ref Sn_CR_RECV		: Update RX buffer pointer and receive data.
- */
-#define Sn_CR(N) WIZCHIP_SREG_ADDR(N, 0x0001)
-
-/**
- * @ingroup Socket_register_group
- * @brief Socket interrupt register(R)
- * @details @ref Sn_IR indicates the status of Socket Interrupt such as establishment, termination, receiving data, timeout).\n
- * When an interrupt occurs and the corresponding bit of @ref Sn_IMR is  the corresponding bit of @ref Sn_IR becomes \n
- * In order to clear the @ref Sn_IR bit, the host should write the bit to \n
- * <table>
- * 		<tr>  <td>7</td> <td>6</td> <td>5</td> <td>4</td> <td>3</td> <td>2</td> <td>1</td> <td>0</td>   </tr>
- * 		<tr>  <td>Reserved</td> <td>Reserved</td> <td>Reserved</td> <td>SEND_OK</td> <td>TIMEOUT</td> <td>RECV</td> <td>DISCON</td> <td>CON</td> </tr>
- * </table>
- * - \ref Sn_IR_SENDOK : <b>SEND_OK Interrupt</b>
- * - \ref Sn_IR_TIMEOUT : <b>TIMEOUT Interrupt</b>
- * - \ref Sn_IR_RECV : <b>RECV Interrupt</b>
- * - \ref Sn_IR_DISCON : <b>DISCON Interrupt</b>
- * - \ref Sn_IR_CON : <b>CON Interrupt</b>
- */
-#define Sn_IR(N) WIZCHIP_SREG_ADDR(N, 0x0002)
-
-/**
- * @ingroup Socket_register_group
- * @brief Socket status register(R)
- * @details @ref Sn_SR indicates the status of Socket n.\n
- * The status of Socket n is changed by @ref Sn_CR or some special control packet as SYN, FIN packet in TCP.
- * @par Normal status
- * - @ref SOCK_CLOSED 		: Closed
- * - @ref SOCK_INIT   		: Initiate state
- * - @ref SOCK_LISTEN    	: Listen state
- * - @ref SOCK_ESTABLISHED 	: Success to connect
- * - @ref SOCK_CLOSE_WAIT   : Closing state
- * - @ref SOCK_UDP   		: UDP socket
- * - @ref SOCK_MACRAW  		: MAC raw mode socket
- *@par Temporary status during changing the status of Socket n.
- * - @ref SOCK_SYNSENT   	: This indicates Socket n sent the connect-request packet (SYN packet) to a peer.
- * - @ref SOCK_SYNRECV    	: It indicates Socket n successfully received the connect-request packet (SYN packet) from a peer.
- * - @ref SOCK_FIN_WAIT		: Connection state
- * - @ref SOCK_CLOSING		: Closing state
- * - @ref SOCK_TIME_WAIT	: Closing state
- * - @ref SOCK_LAST_ACK 	: Closing state
- */
-#define Sn_SR(N) WIZCHIP_SREG_ADDR(N, 0x0003)
-
-/**
- * @ingroup Socket_register_group
- * @brief source port register(R/W)
- * @details @ref Sn_PORT configures the source port number of Socket n.
- * It is valid when Socket n is used in TCP/UPD mode. It should be set before OPEN command is ordered.
- */
-#define Sn_PORT(N) WIZCHIP_SREG_ADDR(N, 0x0004)
-
-/**
- * @ingroup Socket_register_group
- * @brief Peer MAC register address(R/W)
- * @details @ref Sn_DHAR configures the destination hardware address of Socket n when using SEND_MAC command in UDP mode or
- * it indicates that it is acquired in ARP-process by CONNECT/SEND command.
- */
-#define Sn_DHAR(N) WIZCHIP_SREG_ADDR(N, 0x0006)
-
-/**
- * @ingroup Socket_register_group
- * @brief Peer IP register address(R/W)
- * @details @ref Sn_DIPR configures or indicates the destination IP address of Socket n. It is valid when Socket n is used in TCP/UDP mode.
- * In TCP client mode, it configures an IP address of �TCP serverbefore CONNECT command.
- * In TCP server mode, it indicates an IP address of �TCP clientafter successfully establishing connection.
- * In UDP mode, it configures an IP address of peer to be received the UDP packet by SEND or SEND_MAC command.
- */
-#define Sn_DIPR(N) WIZCHIP_SREG_ADDR(N, 0x000c)
-
-/**
- * @ingroup Socket_register_group
- * @brief Peer port register address(R/W)
- * @details @ref Sn_DPORT configures or indicates the destination port number of Socket n. It is valid when Socket n is used in TCP/UDP mode.
- * In �TCP clientmode, it configures the listen port number of �TCP serverbefore CONNECT command.
- * In �TCP Servermode, it indicates the port number of TCP client after successfully establishing connection.
- * In UDP mode, it configures the port number of peer to be transmitted the UDP packet by SEND/SEND_MAC command.
- */
-#define Sn_DPORT(N) WIZCHIP_SREG_ADDR(N, 0x0010)
-
-/**
- * @ingroup Socket_register_group
- * @brief Maximum Segment Size(Sn_MSSR0) register address(R/W)
- * @details @ref Sn_MSSR configures or indicates the MTU(Maximum Transfer Unit) of Socket n.
- */
-#define Sn_MSSR(N) WIZCHIP_SREG_ADDR(N, 0x0012)
-
-// Reserved			         (_W5500_IO_BASE_ + (0x0014 << 8) + (WIZCHIP_SREG_BLOCK(N) << 3))
-
-/**
- * @ingroup Socket_register_group
- * @brief IP Type of Service(TOS) Register(R/W)
- * @details @ref Sn_TOS configures the TOS(Type Of Service field in IP Header) of Socket n.
- * It is set before OPEN command.
- */
-#define Sn_TOS(N) WIZCHIP_SREG_ADDR(N, 0x0015)
-/**
- * @ingroup Socket_register_group
- * @brief IP Time to live(TTL) Register(R/W)
- * @details @ref Sn_TTL configures the TTL(Time To Live field in IP header) of Socket n.
- * It is set before OPEN command.
- */
-#define Sn_TTL(N) WIZCHIP_SREG_ADDR(N, 0x0016)
-// Reserved			         (_W5500_IO_BASE_ + (0x0017 << 8) + (WIZCHIP_SREG_BLOCK(N) << 3))
-// Reserved			         (_W5500_IO_BASE_ + (0x0018 << 8) + (WIZCHIP_SREG_BLOCK(N) << 3)) 
-// Reserved			         (_W5500_IO_BASE_ + (0x0019 << 8) + (WIZCHIP_SREG_BLOCK(N) << 3))
-// Reserved			         (_W5500_IO_BASE_ + (0x001A << 8) + (WIZCHIP_SREG_BLOCK(N) << 3))
-// Reserved			         (_W5500_IO_BASE_ + (0x001B << 8) + (WIZCHIP_SREG_BLOCK(N) << 3))
-// Reserved			         (_W5500_IO_BASE_ + (0x001C << 8) + (WIZCHIP_SREG_BLOCK(N) << 3))
-// Reserved			         (_W5500_IO_BASE_ + (0x001D << 8) + (WIZCHIP_SREG_BLOCK(N) << 3))
-
-/**
- * @ingroup Socket_register_group
- * @brief Receive memory size register(R/W)
- * @details @ref Sn_RXBUF_SIZE configures the RX buffer block size of Socket n.
- * Socket n RX Buffer Block size can be configured with 1,2,4,8, and 16 Kbytes.
- * If a different size is configured, the data cannot be normally received from a peer.
- * Although Socket n RX Buffer Block size is initially configured to 2Kbytes,
- * user can re-configure its size using @ref Sn_RXBUF_SIZE. The total sum of @ref Sn_RXBUF_SIZE can not be exceed 16Kbytes.
- * When exceeded, the data reception error is occurred.
- */
-#define Sn_RXBUF_SIZE(N) WIZCHIP_SREG_ADDR(N, 0x001e)
-
-/**
- * @ingroup Socket_register_group
- * @brief Transmit memory size register(R/W)
- * @details @ref Sn_TXBUF_SIZE configures the TX buffer block size of Socket n. Socket n TX Buffer Block size can be configured with 1,2,4,8, and 16 Kbytes.
- * If a different size is configured, the data can�t be normally transmitted to a peer.
- * Although Socket n TX Buffer Block size is initially configured to 2Kbytes,
- * user can be re-configure its size using @ref Sn_TXBUF_SIZE. The total sum of @ref Sn_TXBUF_SIZE can not be exceed 16Kbytes.
- * When exceeded, the data transmission error is occurred.
- */
-#define Sn_TXBUF_SIZE(N) WIZCHIP_SREG_ADDR(N, 0x001f)
-
-/**
- * @ingroup Socket_register_group
- * @brief Transmit free memory size register(R)
- * @details @ref Sn_TX_FSR indicates the free size of Socket n TX Buffer Block. It is initialized to the configured size by @ref Sn_TXBUF_SIZE.
- * Data bigger than @ref Sn_TX_FSR should not be saved in the Socket n TX Buffer because the bigger data overwrites the previous saved data not yet sent.
- * Therefore, check before saving the data to the Socket n TX Buffer, and if data is equal or smaller than its checked size,
- * transmit the data with SEND/SEND_MAC command after saving the data in Socket n TX buffer. But, if data is bigger than its checked size,
- * transmit the data after dividing into the checked size and saving in the Socket n TX buffer.
- */
-#define Sn_TX_FSR(N) WIZCHIP_SREG_ADDR(N, 0x0020)
-
-/**
- * @ingroup Socket_register_group
- * @brief Transmit memory read pointer register address(R)
- * @details @ref Sn_TX_RD is initialized by OPEN command. However, if Sn_MR(P[3:0]) is TCP mode(001, it is re-initialized while connecting with TCP.
- * After its initialization, it is auto-increased by SEND command.
- * SEND command transmits the saved data from the current @ref Sn_TX_RD to the @ref Sn_TX_WR in the Socket n TX Buffer.
- * After transmitting the saved data, the SEND command increases the @ref Sn_TX_RD as same as the @ref Sn_TX_WR.
- * If its increment value exceeds the maximum value 0xFFFF, (greater than 0x10000 and the carry bit occurs),
- * then the carry bit is ignored and will automatically update with the lower 16bits value.
- */
-#define Sn_TX_RD(N) WIZCHIP_SREG_ADDR(N, 0x0022)
-
-/**
- * @ingroup Socket_register_group
- * @brief Transmit memory write pointer register address(R/W)
- * @details @ref Sn_TX_WR is initialized by OPEN command. However, if Sn_MR(P[3:0]) is TCP mode(001, it is re-initialized while connecting with TCP.\n
- * It should be read or be updated like as follows.\n
- * 1. Read the starting address for saving the transmitting data.\n
- * 2. Save the transmitting data from the starting address of Socket n TX buffer.\n
- * 3. After saving the transmitting data, update @ref Sn_TX_WR to the increased value as many as transmitting data size.
- * If the increment value exceeds the maximum value 0xFFFF(greater than 0x10000 and the carry bit occurs),
- * then the carry bit is ignored and will automatically update with the lower 16bits value.\n
- * 4. Transmit the saved data in Socket n TX Buffer by using SEND/SEND command
- */
-#define Sn_TX_WR(N) WIZCHIP_SREG_ADDR(N, 0x0024)
-
-/**
- * @ingroup Socket_register_group
- * @brief Received data size register(R)
- * @details @ref Sn_RX_RSR indicates the data size received and saved in Socket n RX Buffer.
- * @ref Sn_RX_RSR does not exceed the @ref Sn_RXBUF_SIZE and is calculated as the difference between
- * �Socket n RX Write Pointer (@ref Sn_RX_WR)and �Socket n RX Read Pointer (@ref Sn_RX_RD)
- */
-#define Sn_RX_RSR(N) WIZCHIP_SREG_ADDR(N, 0x0026)
-
-/**
- * @ingroup Socket_register_group
- * @brief Read point of Receive memory(R/W)
- * @details @ref Sn_RX_RD is initialized by OPEN command. Make sure to be read or updated as follows.\n
- * 1. Read the starting save address of the received data.\n
- * 2. Read data from the starting address of Socket n RX Buffer.\n
- * 3. After reading the received data, Update @ref Sn_RX_RD to the increased value as many as the reading size.
- * If the increment value exceeds the maximum value 0xFFFF, that is, is greater than 0x10000 and the carry bit occurs,
- * update with the lower 16bits value ignored the carry bit.\n
- * 4. Order RECV command is for notifying the updated @ref Sn_RX_RD to W5500.
- */
-#define Sn_RX_RD(N) WIZCHIP_SREG_ADDR(N, 0x0028)
-
-/**
- * @ingroup Socket_register_group
- * @brief Write point of Receive memory(R)
- * @details @ref Sn_RX_WR is initialized by OPEN command and it is auto-increased by the data reception.
- * If the increased value exceeds the maximum value 0xFFFF, (greater than 0x10000 and the carry bit occurs),
- * then the carry bit is ignored and will automatically update with the lower 16bits value.
- */
-#define Sn_RX_WR(N) WIZCHIP_SREG_ADDR(N, 0x002a)
-
-/**
- * @ingroup Socket_register_group
- * @brief socket interrupt mask register(R)
- * @details @ref Sn_IMR masks the interrupt of Socket n.
- * Each bit corresponds to each bit of @ref Sn_IR. When a Socket n Interrupt is occurred and the corresponding bit of @ref Sn_IMR is 
- * the corresponding bit of @ref Sn_IR becomes  When both the corresponding bit of @ref Sn_IMR and @ref Sn_IR are and the n-th bit of @ref IR is 
- * Host is interrupted by asserted INTn PIN to low.
- */
-//#define Sn_IMR(N)          (_W5500_IO_BASE_ + (0x002C << 8) + (WIZCHIP_SREG_BLOCK(N) << 3))
-
-/**
- * @ingroup Socket_register_group
- * @brief Fragment field value in IP header register(R/W)
- * @details @ref Sn_FRAG configures the FRAG(Fragment field in IP header).
- */
-//#define Sn_FRAG(N)         (_W5500_IO_BASE_ + (0x002D << 8) + (WIZCHIP_SREG_BLOCK(N) << 3))
-
-/**
- * @ingroup Socket_register_group
- * @brief Keep Alive Timer register(R/W)
- * @details @ref Sn_KPALVTR configures the transmitting timer of �KEEP ALIVE(KA)packet of SOCKETn. It is valid only in TCP mode,
- * and ignored in other modes. The time unit is 5s.
- * KA packet is transmittable after @ref Sn_SR is changed to SOCK_ESTABLISHED and after the data is transmitted or received to/from a peer at least once.
- * In case of '@ref Sn_KPALVTR > 0', W5500 automatically transmits KA packet after time-period for checking the TCP connection (Auto-keepalive-process).
- * In case of '@ref Sn_KPALVTR = 0', Auto-keep-alive-process will not operate,
- * and KA packet can be transmitted by SEND_KEEP command by the host (Manual-keep-alive-process).
- * Manual-keep-alive-process is ignored in case of '@ref Sn_KPALVTR > 0'.
- */
-//#define Sn_KPALVTR(N)      (_W5500_IO_BASE_ + (0x002F << 8) + (WIZCHIP_SREG_BLOCK(N) << 3))
-
-//#define Sn_TSR(N)          (_W5500_IO_BASE_ + (0x0030 << 8) + (WIZCHIP_SREG_BLOCK(N) << 3))
-
-
-//----------------------------- W5500 Register values  -----------------------------
-
-/* MODE register values */
-/**
- * @brief Reset
- * @details If this bit is  All internal registers will be initialized. It will be automatically cleared as after S/W reset.
- */
-#define MR_RST                       0x80
-
-/**
- * @brief Wake on LAN
- * @details 0 : Disable WOL mode\n
- * 1 : Enable WOL mode\n
- * If WOL mode is enabled and the received magic packet over UDP has been normally processed, the Interrupt PIN (INTn) asserts to low.
- * When using WOL mode, the UDP Socket should be opened with any source port number. (Refer to Socket n Mode Register (@ref Sn_MR) for opening Socket.)
- * @note The magic packet over UDP supported by W5500 consists of 6 bytes synchronization stream (xFFFFFFFFFFFF and
- * 16 times Target MAC address stream in UDP payload. The options such like password are ignored. You can use any UDP source port number for WOL mode.
- */
-#define MR_WOL                       0x20
-
-/**
- * @brief Ping block
- * @details 0 : Disable Ping block\n
- * 1 : Enable Ping block\n
- * If the bit is  it blocks the response to a ping request.
- */
-#define MR_PB                        0x10
-
-/**
- * @brief Enable PPPoE
- * @details 0 : DisablePPPoE mode\n
- * 1 : EnablePPPoE mode\n
- * If you use ADSL, this bit should be 
- */
-#define MR_PPPOE                     0x08
-
-/**
- * @brief Enable UDP_FORCE_ARP CHECHK
- * @details 0 : Disable Force ARP mode\n
- * 1 : Enable Force ARP mode\n
- * In Force ARP mode, It forces on sending ARP Request whenever data is sent.
- */
-#define MR_FARP                      0x02
-
-/* IR register values */
-/**
- * @brief Check IP conflict.
- * @details Bit is set as when own source IP address is same with the sender IP address in the received ARP request.
- */
-#define IR_CONFLICT                  0x80
-
-/**
- * @brief Get the destination unreachable message in UDP sending.
- * @details When receiving the ICMP (Destination port unreachable) packet, this bit is set as 
- * When this bit is  Destination Information such as IP address and Port number may be checked with the corresponding @ref UIPR & @ref UPORTR.
- */
-#define IR_UNREACH                   0x40
-
-/**
- * @brief Get the PPPoE close message.
- * @details When PPPoE is disconnected during PPPoE mode, this bit is set.
- */
-#define IR_PPPoE                     0x20
-
-/**
- * @brief Get the magic packet interrupt.
- * @details When WOL mode is enabled and receives the magic packet over UDP, this bit is set.
- */
-#define IR_MP                        0x10
-
-
-/* PHYCFGR register value */
-#define PHYCFGR_RST                  ~(1<<7)  //< For PHY reset, must operate AND mask.
-#define PHYCFGR_OPMD                 (1<<6)   // Configre PHY with OPMDC value
-#define PHYCFGR_OPMDC_ALLA           (7<<3)
-#define PHYCFGR_OPMDC_PDOWN          (6<<3)
-#define PHYCFGR_OPMDC_NA             (5<<3)
-#define PHYCFGR_OPMDC_100FA          (4<<3)
-#define PHYCFGR_OPMDC_100F           (3<<3)
-#define PHYCFGR_OPMDC_100H           (2<<3)
-#define PHYCFGR_OPMDC_10F            (1<<3)
-#define PHYCFGR_OPMDC_10H            (0<<3)           
-#define PHYCFGR_DPX_FULL             (1<<2)
-#define PHYCFGR_DPX_HALF             (0<<2)
-#define PHYCFGR_SPD_100              (1<<1)
-#define PHYCFGR_SPD_10               (0<<1)
-#define PHYCFGR_LNK_ON               (1<<0)
-#define PHYCFGR_LNK_OFF              (0<<0)
-
-// PHYSTATUS register
-#define PHYSTATUS_POWERDOWN (0x08)
-#define PHYSTATUS_LINK      (0x20)
-
-/* IMR register values */
-/**
- * @brief IP Conflict Interrupt Mask.
- * @details 0: Disable IP Conflict Interrupt\n
- * 1: Enable IP Conflict Interrupt
- */
-#define IM_IR7                  	 0x80
-
-/**
- * @brief Destination unreachable Interrupt Mask.
- * @details 0: Disable Destination unreachable Interrupt\n
- * 1: Enable Destination unreachable Interrupt
- */
-#define IM_IR6                  	 0x40
-
-/**
- * @brief PPPoE Close Interrupt Mask.
- * @details 0: Disable PPPoE Close Interrupt\n
- * 1: Enable PPPoE Close Interrupt
- */
-#define IM_IR5                  	 0x20
-
-/**
- * @brief Magic Packet Interrupt Mask.
- * @details 0: Disable Magic Packet Interrupt\n
- * 1: Enable Magic Packet Interrupt
- */
-#define IM_IR4                  	 0x10
-
-/* Sn_MR Default values */
-/**
- * @brief Support UDP Multicasting
- * @details 0 : disable Multicasting\n
- * 1 : enable Multicasting\n
- * This bit is applied only during UDP mode(P[3:0] = 010.\n
- * To use multicasting, @ref Sn_DIPR & @ref Sn_DPORT should be respectively configured with the multicast group IP address & port number
- * before Socket n is opened by OPEN command of @ref Sn_CR.
- */
-#define Sn_MR_MULTI                  0x80
-
-/**
- * @brief Broadcast block in UDP Multicasting.
- * @details 0 : disable Broadcast Blocking\n
- * 1 : enable Broadcast Blocking\n
- * This bit blocks to receive broadcasting packet during UDP mode(P[3:0] = 010.\m
- * In addition, This bit does when MACRAW mode(P[3:0] = 100
- */
-//#define Sn_MR_BCASTB                 0x40
-
-/**
- * @brief No Delayed Ack(TCP), Multicast flag
- * @details 0 : Disable No Delayed ACK option\n
- * 1 : Enable No Delayed ACK option\n
- * This bit is applied only during TCP mode (P[3:0] = 001.\n
- * When this bit is  It sends the ACK packet without delay as soon as a Data packet is received from a peer.\n
- * When this bit is  It sends the ACK packet after waiting for the timeout time configured by @ref RTR.
- */
-#define Sn_MR_ND                     0x20
-
-/**
- * @brief Unicast Block in UDP Multicasting
- * @details 0 : disable Unicast Blocking\n
- * 1 : enable Unicast Blocking\n
- * This bit blocks receiving the unicast packet during UDP mode(P[3:0] = 010 and MULTI = 
- */
-//#define Sn_MR_UCASTB                 0x10
-
-/**
- * @brief MAC LAYER RAW SOCK
- * @details This configures the protocol mode of Socket n.
- * @note MACRAW mode should be only used in Socket 0.
- */
-#define Sn_MR_MACRAW                 0x04
-
-#define Sn_MR_IPRAW                  0x03     /**< IP LAYER RAW SOCK */
-
-/**
- * @brief UDP
- * @details This configures the protocol mode of Socket n.
- */
-#define Sn_MR_UDP                    0x02
-
-/**
- * @brief TCP
- * @details This configures the protocol mode of Socket n.
- */
-#define Sn_MR_TCP                    0x01
-
-/**
- * @brief Unused socket
- * @details This configures the protocol mode of Socket n.
- */
-#define Sn_MR_CLOSE                  0x00
-
-/* Sn_MR values used with Sn_MR_MACRAW */
-/**
- * @brief MAC filter enable in @ref Sn_MR_MACRAW mode
- * @details 0 : disable MAC Filtering\n
- * 1 : enable MAC Filtering\n
- * This bit is applied only during MACRAW mode(P[3:0] = 100.\n
- * When set as  W5500 can only receive broadcasting packet or packet sent to itself.
- * When this bit is  W5500 can receive all packets on Ethernet.
- * If user wants to implement Hybrid TCP/IP stack,
- * it is recommended that this bit is set as for reducing host overhead to process the all received packets.
- */
-#define Sn_MR_MFEN                   Sn_MR_MULTI
-
-/**
- * @brief Multicast Blocking in @ref Sn_MR_MACRAW mode
- * @details 0 : using IGMP version 2\n
- * 1 : using IGMP version 1\n
- * This bit is applied only during UDP mode(P[3:0] = 010 and MULTI = 
- * It configures the version for IGMP messages (Join/Leave/Report).
- */
-#define Sn_MR_MMB                    Sn_MR_ND
-
-/**
- * @brief IPv6 packet Blocking in @ref Sn_MR_MACRAW mode
- * @details 0 : disable IPv6 Blocking\n
- * 1 : enable IPv6 Blocking\n
- * This bit is applied only during MACRAW mode (P[3:0] = 100. It blocks to receiving the IPv6 packet.
- */
-#define Sn_MR_MIP6B                  Sn_MR_UCASTB
-
-/* Sn_MR value used with Sn_MR_UDP & Sn_MR_MULTI */
-/**
- * @brief IGMP version used in UDP mulitcasting
- * @details 0 : disable Multicast Blocking\n
- * 1 : enable Multicast Blocking\n
- * This bit is applied only when MACRAW mode(P[3:0] = 100. It blocks to receive the packet with multicast MAC address.
- */
-#define Sn_MR_MC                     Sn_MR_ND
-
-/* Sn_MR alternate values */
-/**
- * @brief For Berkeley Socket API
- */
-#define SOCK_STREAM                  Sn_MR_TCP
-
-/**
- * @brief For Berkeley Socket API
- */
-#define SOCK_DGRAM                   Sn_MR_UDP
-
-
-/* Sn_CR values */
-/**
- * @brief Initialize or open socket
- * @details Socket n is initialized and opened according to the protocol selected in Sn_MR(P3:P0).
- * The table below shows the value of @ref Sn_SR corresponding to @ref Sn_MR.\n
- * <table>
- *   <tr>  <td>\b Sn_MR (P[3:0])</td> <td>\b Sn_SR</td>            		 </tr>
- *   <tr>  <td>Sn_MR_CLOSE  (000</td> <td></td>         	   		 </tr>
- *   <tr>  <td>Sn_MR_TCP  (001</td> <td>SOCK_INIT (0x13)</td>  		 </tr>
- *   <tr>  <td>Sn_MR_UDP  (010</td>  <td>SOCK_UDP (0x22)</td>  		 </tr>
- *   <tr>  <td>S0_MR_MACRAW  (100</td>  <td>SOCK_MACRAW (0x02)</td>  </tr>
- * </table>
- */
-#define Sn_CR_OPEN                   0x01
-
-/**
- * @brief Wait connection request in TCP mode(Server mode)
- * @details This is valid only in TCP mode (Sn_MR(P3:P0) = Sn_MR_TCP).
- * In this mode, Socket n operates as a �TCP serverand waits for  connection-request (SYN packet) from any �TCP client
- * The @ref Sn_SR changes the state from SOCK_INIT to SOCKET_LISTEN.
- * When a �TCP clientconnection request is successfully established,
- * the @ref Sn_SR changes from SOCK_LISTEN to SOCK_ESTABLISHED and the Sn_IR(0) becomes 
- * But when a �TCP clientconnection request is failed, Sn_IR(3) becomes and the status of @ref Sn_SR changes to SOCK_CLOSED.
- */
-#define Sn_CR_LISTEN                 0x02
-
-/**
- * @brief Send connection request in TCP mode(Client mode)
- * @details  To connect, a connect-request (SYN packet) is sent to b>TCP server</b>configured by @ref Sn_DIPR & Sn_DPORT(destination address & port).
- * If the connect-request is successful, the @ref Sn_SR is changed to @ref SOCK_ESTABLISHED and the Sn_IR(0) becomes \n\n
- * The connect-request fails in the following three cases.\n
- * 1. When a @b ARPTO occurs (@ref Sn_IR[3] =  ) because destination hardware address is not acquired through the ARP-process.\n
- * 2. When a @b SYN/ACK packet is not received and @b TCPTO (Sn_IR(3) =  )\n
- * 3. When a @b RST packet is received instead of a @b SYN/ACK packet. In these cases, @ref Sn_SR is changed to @ref SOCK_CLOSED.
- * @note This is valid only in TCP mode and operates when Socket n acts as b>TCP client</b>
- */
-#define Sn_CR_CONNECT                0x04
-
-/**
- * @brief Send closing request in TCP mode
- * @details Regardless of b>TCP server</b>or b>TCP client</b> the DISCON command processes the disconnect-process (b>Active close</b>or b>Passive close</b>.\n
- * @par Active close
- * it transmits disconnect-request(FIN packet) to the connected peer\n
- * @par Passive close
- * When FIN packet is received from peer, a FIN packet is replied back to the peer.\n
- * @details When the disconnect-process is successful (that is, FIN/ACK packet is received successfully), @ref Sn_SR is changed to @ref SOCK_CLOSED.\n
- * Otherwise, TCPTO occurs (Sn_IR(3)=)= and then @ref Sn_SR is changed to @ref SOCK_CLOSED.
- * @note Valid only in TCP mode.
- */
-#define Sn_CR_DISCON                 0x08
-
-/**
- * @brief Close socket
- * @details Sn_SR is changed to @ref SOCK_CLOSED.
- */
-#define Sn_CR_CLOSE                  0x10
-
-/**
- * @brief Update TX buffer pointer and send data
- * @details SEND transmits all the data in the Socket n TX buffer.\n
- * For more details, please refer to Socket n TX Free Size Register (@ref Sn_TX_FSR), Socket n,
- * TX Write Pointer Register(@ref Sn_TX_WR), and Socket n TX Read Pointer Register(@ref Sn_TX_RD).
- */
-#define Sn_CR_SEND                   0x20
-
-/**
- * @brief Send data with MAC address, so without ARP process
- * @details The basic operation is same as SEND.\n
- * Normally SEND transmits data after destination hardware address is acquired by the automatic ARP-process(Address Resolution Protocol).\n
- * But SEND_MAC transmits data without the automatic ARP-process.\n
- * In this case, the destination hardware address is acquired from @ref Sn_DHAR configured by host, instead of APR-process.
- * @note Valid only in UDP mode.
- */
-#define Sn_CR_SEND_MAC               0x21
-
-/**
- * @brief Send keep alive message
- * @details It checks the connection status by sending 1byte keep-alive packet.\n
- * If the peer can not respond to the keep-alive packet during timeout time, the connection is terminated and the timeout interrupt will occur.
- * @note Valid only in TCP mode.
- */
-#define Sn_CR_SEND_KEEP              0x22
-
-/**
- * @brief Update RX buffer pointer and receive data
- * @details RECV completes the processing of the received data in Socket n RX Buffer by using a RX read pointer register (@ref Sn_RX_RD).\n
- * For more details, refer to Socket n RX Received Size Register (@ref Sn_RX_RSR), Socket n RX Write Pointer Register (@ref Sn_RX_WR),
- * and Socket n RX Read Pointer Register (@ref Sn_RX_RD).
- */
-#define Sn_CR_RECV                   0x40
-
-/* Sn_IR values */
-/**
- * @brief SEND_OK Interrupt
- * @details This is issued when SEND command is completed.
- */
-#define Sn_IR_SENDOK                 0x10
-
-/**
- * @brief TIMEOUT Interrupt
- * @details This is issued when ARPTO or TCPTO occurs.
- */
-#define Sn_IR_TIMEOUT                0x08
-
-/**
- * @brief RECV Interrupt
- * @details This is issued whenever data is received from a peer.
- */
-#define Sn_IR_RECV                   0x04
-
-/**
- * @brief DISCON Interrupt
- * @details This is issued when FIN or FIN/ACK packet is received from a peer.
- */
-#define Sn_IR_DISCON                 0x02
-
-/**
- * @brief CON Interrupt
- * @details This is issued one time when the connection with peer is successful and then @ref Sn_SR is changed to @ref SOCK_ESTABLISHED.
- */
-#define Sn_IR_CON                    0x01
-
-/* Sn_SR values */
-/**
- * @brief Closed
- * @details This indicates that Socket n is released.\N
- * When DICON, CLOSE command is ordered, or when a timeout occurs, it is changed to @ref SOCK_CLOSED regardless of previous status.
- */
-#define SOCK_CLOSED                  0x00
-
-/**
- * @brief Initiate state
- * @details This indicates Socket n is opened with TCP mode.\N
- * It is changed to @ref SOCK_INIT when Sn_MR(P[3:0]) = 001and OPEN command is ordered.\N
- * After @ref SOCK_INIT, user can use LISTEN /CONNECT command.
- */
-#define SOCK_INIT                    0x13
-
-/**
- * @brief Listen state
- * @details This indicates Socket n is operating as b>TCP server</b>mode and waiting for connection-request (SYN packet) from a peer (b>TCP client</b>.\n
- * It will change to @ref SOCK_ESTALBLISHED when the connection-request is successfully accepted.\n
- * Otherwise it will change to @ref SOCK_CLOSED after TCPTO occurred (Sn_IR(TIMEOUT) = .
- */
-#define SOCK_LISTEN                  0x14
-
-/**
- * @brief Connection state
- * @details This indicates Socket n sent the connect-request packet (SYN packet) to a peer.\n
- * It is temporarily shown when @ref Sn_SR is changed from @ref SOCK_INIT to @ref SOCK_ESTABLISHED by CONNECT command.\n
- * If connect-accept(SYN/ACK packet) is received from the peer at SOCK_SYNSENT, it changes to @ref SOCK_ESTABLISHED.\n
- * Otherwise, it changes to @ref SOCK_CLOSED after TCPTO (@ref Sn_IR[TIMEOUT] =  is occurred.
- */
-#define SOCK_SYNSENT                 0x15
-
-/**
- * @brief Connection state
- * @details It indicates Socket n successfully received the connect-request packet (SYN packet) from a peer.\n
- * If socket n sends the response (SYN/ACK  packet) to the peer successfully,  it changes to @ref SOCK_ESTABLISHED. \n
- * If not, it changes to @ref SOCK_CLOSED after timeout occurs (@ref Sn_IR[TIMEOUT] = .
- */
-#define SOCK_SYNRECV                 0x16
-
-/**
- * @brief Success to connect
- * @details This indicates the status of the connection of Socket n.\n
- * It changes to @ref SOCK_ESTABLISHED when the b>TCP SERVER</b>processed the SYN packet from the b>TCP CLIENT</b>during @ref SOCK_LISTEN, or
- * when the CONNECT command is successful.\n
- * During @ref SOCK_ESTABLISHED, DATA packet can be transferred using SEND or RECV command.
- */
-#define SOCK_ESTABLISHED             0x17
-
-/**
- * @brief Closing state
- * @details These indicate Socket n is closing.\n
- * These are shown in disconnect-process such as active-close and passive-close.\n
- * When Disconnect-process is successfully completed, or when timeout occurs, these change to @ref SOCK_CLOSED.
- */
-#define SOCK_FIN_WAIT                0x18
-
-/**
- * @brief Closing state
- * @details These indicate Socket n is closing.\n
- * These are shown in disconnect-process such as active-close and passive-close.\n
- * When Disconnect-process is successfully completed, or when timeout occurs, these change to @ref SOCK_CLOSED.
- */
-#define SOCK_CLOSING                 0x1A
-
-/**
- * @brief Closing state
- * @details These indicate Socket n is closing.\n
- * These are shown in disconnect-process such as active-close and passive-close.\n
- * When Disconnect-process is successfully completed, or when timeout occurs, these change to @ref SOCK_CLOSED.
- */
-#define SOCK_TIME_WAIT               0x1B
-
-/**
- * @brief Closing state
- * @details This indicates Socket n received the disconnect-request (FIN packet) from the connected peer.\n
- * This is half-closing status, and data can be transferred.\n
- * For full-closing, DISCON command is used. But For just-closing, CLOSE command is used.
- */
-#define SOCK_CLOSE_WAIT              0x1C
-
-/**
- * @brief Closing state
- * @details This indicates Socket n is waiting for the response (FIN/ACK packet) to the disconnect-request (FIN packet) by passive-close.\n
- * It changes to @ref SOCK_CLOSED when Socket n received the response successfully, or when timeout occurs  (@ref Sn_IR[TIMEOUT] = .
- */
-#define SOCK_LAST_ACK                0x1D
-
-/**
- * @brief UDP socket
- * @details This indicates Socket n is opened in UDP mode(Sn_MR(P[3:0]) = 010.\n
- * It changes to SOCK_UPD when Sn_MR(P[3:0]) = 010 and OPEN command is ordered.\n
- * Unlike TCP mode, data can be transfered without the connection-process.
- */
-#define SOCK_UDP                     0x22
-
-//#define SOCK_IPRAW                   0x32     /**< IP raw mode socket */
-
-/**
- * @brief MAC raw mode socket
- * @details This indicates Socket 0 is opened in MACRAW mode (S0_MR(P[3:0]) = 100and is valid only in Socket 0.\n
- * It changes to SOCK_MACRAW when S0_MR(P[3:0] = 100and OPEN command is ordered.\n
- * Like UDP mode socket, MACRAW mode Socket 0 can transfer a MAC packet (Ethernet frame) without the connection-process.
- */
-#define SOCK_MACRAW                  0x42
-
-//#define SOCK_PPPOE                   0x5F
-
-/* IP PROTOCOL */
-#define IPPROTO_IP                   0        //< Dummy for IP 
-#define IPPROTO_ICMP                 1        //< Control message protocol
-#define IPPROTO_IGMP                 2        //< Internet group management protocol
-#define IPPROTO_GGP                  3        //< Gateway^2 (deprecated)
-#define IPPROTO_TCP                  6        //< TCP
-#define IPPROTO_PUP                  12       //< PUP
-#define IPPROTO_UDP                  17       //< UDP
-#define IPPROTO_IDP                  22       //< XNS idp
-#define IPPROTO_ND                   77       //< UNOFFICIAL net disk protocol
-#define IPPROTO_RAW                  255      //< Raw IP packet
-
-
-/**
- * @brief Enter a critical section
- *
- * @details It is provided to protect your shared code which are executed without distribution. \n \n
- *
- * In non-OS environment, It can be just implemented by disabling whole interrupt.\n
- * In OS environment, You can replace it to critical section api supported by OS.
- *
- * \sa WIZCHIP_READ(), WIZCHIP_WRITE(), WIZCHIP_READ_BUF(), WIZCHIP_WRITE_BUF()
- * \sa WIZCHIP_CRITICAL_EXIT()
- */
-#define WIZCHIP_CRITICAL_ENTER()    WIZCHIP.CRIS._enter()
-
-/**
- * @brief Exit a critical section
- *
- * @details It is provided to protect your shared code which are executed without distribution. \n\n
- *
- * In non-OS environment, It can be just implemented by disabling whole interrupt. \n
- * In OS environment, You can replace it to critical section api supported by OS.
- *
- * @sa WIZCHIP_READ(), WIZCHIP_WRITE(), WIZCHIP_READ_BUF(), WIZCHIP_WRITE_BUF()
- * @sa WIZCHIP_CRITICAL_ENTER()
- */
-#ifdef _exit
-#undef _exit
-#endif
-#define WIZCHIP_CRITICAL_EXIT()     WIZCHIP.CRIS._exit()
-
-
-
-////////////////////////
-// Basic I/O Function //
-////////////////////////
-
-/**
- * @ingroup Basic_IO_function
- * @brief It reads 1 byte value from a register.
- * @param AddrSel Register address
- * @return The value of register
- */
-uint8_t  WIZCHIP_READ (uint32_t AddrSel);
-
-/**
- * @ingroup Basic_IO_function
- * @brief It writes 1 byte value to a register.
- * @param AddrSel Register address
- * @param wb Write data
- * @return void
- */
-void     WIZCHIP_WRITE(uint32_t AddrSel, uint8_t wb );
-
-/**
- * @ingroup Basic_IO_function
- * @brief It reads sequence data from registers.
- * @param AddrSel Register address
- * @param pBuf Pointer buffer to read data
- * @param len Data length
- */
-void     WIZCHIP_READ_BUF (uint32_t AddrSel, uint8_t* pBuf, uint16_t len);
-
-/**
- * @ingroup Basic_IO_function
- * @brief It writes sequence data to registers.
- * @param AddrSel Register address
- * @param pBuf Pointer buffer to write data
- * @param len Data length
- */
-void     WIZCHIP_WRITE_BUF(uint32_t AddrSel, uint8_t* pBuf, uint16_t len);
-
-/////////////////////////////////
-// Common Register I/O function //
-/////////////////////////////////
-/**
- * @ingroup Common_register_access_function
- * @brief Set Mode Register
- * @param (uint8_t)mr The value to be set.
- * @sa getMR()
- */
-#define setMR(mr) \
-	WIZCHIP_WRITE(MR,mr)
-
-
-/**
- * @ingroup Common_register_access_function
- * @brief Get Mode Register
- * @return uint8_t. The value of Mode register.
- * @sa setMR()
- */
-#define getMR() \
-		WIZCHIP_READ(MR)
-
-/**
- * @ingroup Common_register_access_function
- * @brief Set gateway IP address
- * @param (uint8_t*)gar Pointer variable to set gateway IP address. It should be allocated 4 bytes.
- * @sa getGAR()
- */
-#define setGAR(gar) \
-		WIZCHIP_WRITE_BUF(GAR,gar,4)
-
-/**
- * @ingroup Common_register_access_function
- * @brief Get gateway IP address
- * @param (uint8_t*)gar Pointer variable to get gateway IP address. It should be allocated 4 bytes.
- * @sa setGAR()
- */
-#define getGAR(gar) \
-		WIZCHIP_READ_BUF(GAR,gar,4)
-
-/**
- * @ingroup Common_register_access_function
- * @brief Set subnet mask address
- * @param (uint8_t*)subr Pointer variable to set subnet mask address. It should be allocated 4 bytes.
- * @sa getSUBR()
- */
-#define setSUBR(subr) \
-		WIZCHIP_WRITE_BUF(SUBR, subr,4)
-
-
-/**
- * @ingroup Common_register_access_function
- * @brief Get subnet mask address
- * @param (uint8_t*)subr Pointer variable to get subnet mask address. It should be allocated 4 bytes.
- * @sa setSUBR()
- */
-#define getSUBR(subr) \
-		WIZCHIP_READ_BUF(SUBR, subr, 4)
-
-/**
- * @ingroup Common_register_access_function
- * @brief Set local MAC address
- * @param (uint8_t*)shar Pointer variable to set local MAC address. It should be allocated 6 bytes.
- * @sa getSHAR()
- */
-#define setSHAR(shar) \
-		WIZCHIP_WRITE_BUF(SHAR, shar, 6)
-
-/**
- * @ingroup Common_register_access_function
- * @brief Get local MAC address
- * @param (uint8_t*)shar Pointer variable to get local MAC address. It should be allocated 6 bytes.
- * @sa setSHAR()
- */
-#define getSHAR(shar) \
-		WIZCHIP_READ_BUF(SHAR, shar, 6)
-
-/**
- * @ingroup Common_register_access_function
- * @brief Set local IP address
- * @param (uint8_t*)sipr Pointer variable to set local IP address. It should be allocated 4 bytes.
- * @sa getSIPR()
- */
-#define setSIPR(sipr) \
-		WIZCHIP_WRITE_BUF(SIPR, sipr, 4)
-
-/**
- * @ingroup Common_register_access_function
- * @brief Get local IP address
- * @param (uint8_t*)sipr Pointer variable to get local IP address. It should be allocated 4 bytes.
- * @sa setSIPR()
- */
-#define getSIPR(sipr) \
-		WIZCHIP_READ_BUF(SIPR, sipr, 4)
-
-/**
- * @ingroup Common_register_access_function
- * @brief Set INTLEVEL register
- * @param (uint16_t)intlevel Value to set @ref INTLEVEL register.
- * @sa getINTLEVEL()
- */
-// dpgeorge: not yet implemented
-#define setINTLEVEL(intlevel) (void)intlevel
-#if 0
-#define setINTLEVEL(intlevel)  {\
-		WIZCHIP_WRITE(INTLEVEL,   (uint8_t)(intlevel >> 8)); \
-		WIZCHIP_WRITE(WIZCHIP_OFFSET_INC(INTLEVEL,1), (uint8_t) intlevel); \
-	}
-#endif
-
-
-/**
- * @ingroup Common_register_access_function
- * @brief Get INTLEVEL register
- * @return uint16_t. Value of @ref INTLEVEL register.
- * @sa setINTLEVEL()
- */
-// dpgeorge: not yet implemented
-#define getINTLEVEL() (0)
-#if 0
-#define getINTLEVEL() \
-		((WIZCHIP_READ(INTLEVEL) << 8) + WIZCHIP_READ(WIZCHIP_OFFSET_INC(INTLEVEL,1)))
-#endif
-
-/**
- * @ingroup Common_register_access_function
- * @brief Set @ref IR register
- * @param (uint8_t)ir Value to set @ref IR register.
- * @sa getIR()
- */
-#define setIR(ir) \
-		WIZCHIP_WRITE(IR, (ir & 0xF0))
-
-/**
- * @ingroup Common_register_access_function
- * @brief Get @ref IR register
- * @return uint8_t. Value of @ref IR register.
- * @sa setIR()
- */
-#define getIR() \
-		(WIZCHIP_READ(IR) & 0xF0)
-/**
- * @ingroup Common_register_access_function
- * @brief Set @ref IMR register
- * @param (uint8_t)imr Value to set @ref IMR register.
- * @sa getIMR()
- */
-#define setIMR(imr) \
-		WIZCHIP_WRITE(IMR, imr)
-
-/**
- * @ingroup Common_register_access_function
- * @brief Get @ref IMR register
- * @return uint8_t. Value of @ref IMR register.
- * @sa setIMR()
- */
-#define getIMR() \
-		WIZCHIP_READ(IMR)
-
-
-/**
- * @ingroup Common_register_access_function
- * @brief Set @ref SIR register
- * @param (uint8_t)sir Value to set @ref SIR register.
- * @sa getSIR()
- */
-// dpgeorge: not yet implemented
-#define setSIR(sir) ((void)sir)
-#if 0
-#define setSIR(sir) \
-		WIZCHIP_WRITE(SIR, sir)
-#endif
-
-/**
- * @ingroup Common_register_access_function
- * @brief Get @ref SIR register
- * @return uint8_t. Value of @ref SIR register.
- * @sa setSIR()
- */
-// dpgeorge: not yet implemented
-#define getSIR() (0)
-#if 0
-#define getSIR() \
-		WIZCHIP_READ(SIR)
-#endif
-
-/**
- * @ingroup Common_register_access_function
- * @brief Set @ref SIMR register
- * @param (uint8_t)simr Value to set @ref SIMR register.
- * @sa getSIMR()
- */
-// dpgeorge: not yet implemented
-#define setSIMR(simr) ((void)simr)
-#if 0
-#define setSIMR(simr) \
-		WIZCHIP_WRITE(SIMR, simr)
-#endif
-
-/**
- * @ingroup Common_register_access_function
- * @brief Get @ref SIMR register
- * @return uint8_t. Value of @ref SIMR register.
- * @sa setSIMR()
- */
-// dpgeorge: not yet implemented
-#define getSIMR() (0)
-#if 0
-#define getSIMR() \
-		WIZCHIP_READ(SIMR)
-#endif
-
-/**
- * @ingroup Common_register_access_function
- * @brief Set @ref RTR register
- * @param (uint16_t)rtr Value to set @ref RTR register.
- * @sa getRTR()
- */
-#define setRTR(rtr)   {\
-		WIZCHIP_WRITE(RTR,   (uint8_t)(rtr >> 8)); \
-		WIZCHIP_WRITE(RTR + 1, (uint8_t) rtr); \
-	}
-
-/**
- * @ingroup Common_register_access_function
- * @brief Get @ref RTR register
- * @return uint16_t. Value of @ref RTR register.
- * @sa setRTR()
- */
-#define getRTR() \
-		((WIZCHIP_READ(RTR) << 8) + WIZCHIP_READ(RTR + 1))
-
-/**
- * @ingroup Common_register_access_function
- * @brief Set @ref RCR register
- * @param (uint8_t)rcr Value to set @ref RCR register.
- * @sa getRCR()
- */
-#define setRCR(rcr) \
-		WIZCHIP_WRITE(RCR, rcr)
-
-/**
- * @ingroup Common_register_access_function
- * @brief Get @ref RCR register
- * @return uint8_t. Value of @ref RCR register.
- * @sa setRCR()
- */
-#define getRCR() \
-		WIZCHIP_READ(RCR)
-
-//================================================== test done ===========================================================
-
-/**
- * @ingroup Common_register_access_function
- * @brief Set @ref PTIMER register
- * @param (uint8_t)ptimer Value to set @ref PTIMER register.
- * @sa getPTIMER()
- */
-#define setPTIMER(ptimer) \
-		WIZCHIP_WRITE(PTIMER, ptimer)
-
-/**
- * @ingroup Common_register_access_function
- * @brief Get @ref PTIMER register
- * @return uint8_t. Value of @ref PTIMER register.
- * @sa setPTIMER()
- */
-#define getPTIMER() \
-		WIZCHIP_READ(PTIMER)
-
-/**
- * @ingroup Common_register_access_function
- * @brief Set @ref PMAGIC register
- * @param (uint8_t)pmagic Value to set @ref PMAGIC register.
- * @sa getPMAGIC()
- */
-#define setPMAGIC(pmagic) \
-		WIZCHIP_WRITE(PMAGIC, pmagic)
-
-/**
- * @ingroup Common_register_access_function
- * @brief Get @ref PMAGIC register
- * @return uint8_t. Value of @ref PMAGIC register.
- * @sa setPMAGIC()
- */
-#define getPMAGIC() \
-		WIZCHIP_READ(PMAGIC)
-
-/**
- * @ingroup Common_register_access_function
- * @brief Set PHAR address
- * @param (uint8_t*)phar Pointer variable to set PPP destination MAC register address. It should be allocated 6 bytes.
- * @sa getPHAR()
- */
-#if 0
-#define setPHAR(phar) \
-		WIZCHIP_WRITE_BUF(PHAR, phar, 6)
-
-/**
- * @ingroup Common_register_access_function
- * @brief Get local IP address
- * @param (uint8_t*)phar Pointer variable to PPP destination MAC register address. It should be allocated 6 bytes.
- * @sa setPHAR()
- */
-#define getPHAR(phar) \
-		WIZCHIP_READ_BUF(PHAR, phar, 6)
-
-/**
- * @ingroup Common_register_access_function
- * @brief Set @ref PSID register
- * @param (uint16_t)psid Value to set @ref PSID register.
- * @sa getPSID()
- */
-#define setPSID(psid)  {\
-		WIZCHIP_WRITE(PSID,   (uint8_t)(psid >> 8)); \
-		WIZCHIP_WRITE(WIZCHIP_OFFSET_INC(PSID,1), (uint8_t) psid); \
-	}
-
-/**
- * @ingroup Common_register_access_function
- * @brief Get @ref PSID register
- * @return uint16_t. Value of @ref PSID register.
- * @sa setPSID()
- */
-//uint16_t getPSID(void);
-#define getPSID() \
-		((WIZCHIP_READ(PSID) << 8) + WIZCHIP_READ(WIZCHIP_OFFSET_INC(PSID,1)))
-
-/**
- * @ingroup Common_register_access_function
- * @brief Set @ref PMRU register
- * @param (uint16_t)pmru Value to set @ref PMRU register.
- * @sa getPMRU()
- */
-#define setPMRU(pmru) { \
-		WIZCHIP_WRITE(PMRU,   (uint8_t)(pmru>>8)); \
-		WIZCHIP_WRITE(WIZCHIP_OFFSET_INC(PMRU,1), (uint8_t) pmru); \
-	}
-
-/**
- * @ingroup Common_register_access_function
- * @brief Get @ref PMRU register
- * @return uint16_t. Value of @ref PMRU register.
- * @sa setPMRU()
- */
-#define getPMRU() \
-		((WIZCHIP_READ(PMRU) << 8) + WIZCHIP_READ(WIZCHIP_OFFSET_INC(PMRU,1)))
-
-/**
- * @ingroup Common_register_access_function
- * @brief Get unreachable IP address
- * @param (uint8_t*)uipr Pointer variable to get unreachable IP address. It should be allocated 4 bytes.
- */
-#define getUIPR(uipr) \
-		WIZCHIP_READ_BUF(UIPR,uipr,6)
-
-/**
- * @ingroup Common_register_access_function
- * @brief Get @ref UPORTR register
- * @return uint16_t. Value of @ref UPORTR register.
- */
-#define getUPORTR() \
-	((WIZCHIP_READ(UPORTR) << 8) + WIZCHIP_READ(WIZCHIP_OFFSET_INC(UPORTR,1)))
-
-/**
- * @ingroup Common_register_access_function
- * @brief Set @ref PHYCFGR register
- * @param (uint8_t)phycfgr Value to set @ref PHYCFGR register.
- * @sa getPHYCFGR()
- */
-#define setPHYCFGR(phycfgr) \
-		WIZCHIP_WRITE(PHYCFGR, phycfgr)
-#endif
-
-/**
- * @ingroup Common_register_access_function
- * @brief Get @ref PHYCFGR register
- * @return uint8_t. Value of @ref PHYCFGR register.
- * @sa setPHYCFGR()
- */
-#define getPHYSTATUS() \
-		WIZCHIP_READ(PHYSTATUS)
-
-/**
- * @ingroup Common_register_access_function
- * @brief Get @ref VERSIONR register
- * @return uint8_t. Value of @ref VERSIONR register.
- */
-/*
-#define getVERSIONR() \
-		WIZCHIP_READ(VERSIONR)
-                */
-/////////////////////////////////////
-
-///////////////////////////////////
-// Socket N register I/O function //
-///////////////////////////////////
-/**
- * @ingroup Socket_register_access_function
- * @brief Set @ref Sn_MR register
- * @param (uint8_t)sn Socket number. It should be <b>0 ~ 7</b>.
- * @param (uint8_t)mr Value to set @ref Sn_MR
- * @sa getSn_MR()
- */
-#define setSn_MR(sn, mr) \
-		WIZCHIP_WRITE(Sn_MR(sn),mr)
-
-/**
- * @ingroup Socket_register_access_function
- * @brief Get @ref Sn_MR register
- * @param (uint8_t)sn Socket number. It should be <b>0 ~ 7</b>.
- * @return uint8_t. Value of @ref Sn_MR.
- * @sa setSn_MR()
- */
-#define getSn_MR(sn) \
-	WIZCHIP_READ(Sn_MR(sn))
-
-/**
- * @ingroup Socket_register_access_function
- * @brief Set @ref Sn_CR register
- * @param (uint8_t)sn Socket number. It should be <b>0 ~ 7</b>.
- * @param (uint8_t)cr Value to set @ref Sn_CR
- * @sa getSn_CR()
- */
-#define setSn_CR(sn, cr) \
-		WIZCHIP_WRITE(Sn_CR(sn), cr)
-
-/**
- * @ingroup Socket_register_access_function
- * @brief Get @ref Sn_CR register
- * @param (uint8_t)sn Socket number. It should be <b>0 ~ 7</b>.
- * @return uint8_t. Value of @ref Sn_CR.
- * @sa setSn_CR()
- */
-#define getSn_CR(sn) \
-		WIZCHIP_READ(Sn_CR(sn))
-
-/**
- * @ingroup Socket_register_access_function
- * @brief Set @ref Sn_IR register
- * @param (uint8_t)sn Socket number. It should be <b>0 ~ 7</b>.
- * @param (uint8_t)ir Value to set @ref Sn_IR
- * @sa getSn_IR()
- */
-#define setSn_IR(sn, ir) \
-		WIZCHIP_WRITE(Sn_IR(sn), (ir & 0x1F))
-
-/**
- * @ingroup Socket_register_access_function
- * @brief Get @ref Sn_IR register
- * @param (uint8_t)sn Socket number. It should be <b>0 ~ 7</b>.
- * @return uint8_t. Value of @ref Sn_IR.
- * @sa setSn_IR()
- */
-#define getSn_IR(sn) \
-		(WIZCHIP_READ(Sn_IR(sn)) & 0x1F)
-
-/**
- * @ingroup Socket_register_access_function
- * @brief Set @ref Sn_IMR register
- * @param (uint8_t)sn Socket number. It should be <b>0 ~ 7</b>.
- * @param (uint8_t)imr Value to set @ref Sn_IMR
- * @sa getSn_IMR()
- */
-// dpgeorge: not yet implemented
-#define setSn_IMR(sn, imr) (void)sn; (void)imr
-#if 0
-#define setSn_IMR(sn, imr) \
-		WIZCHIP_WRITE(Sn_IMR(sn), (imr & 0x1F))
-#endif
-
-/**
- * @ingroup Socket_register_access_function
- * @brief Get @ref Sn_IMR register
- * @param (uint8_t)sn Socket number. It should be <b>0 ~ 7</b>.
- * @return uint8_t. Value of @ref Sn_IMR.
- * @sa setSn_IMR()
- */
-// dpgeorge: not yet implemented
-#define getSn_IMR(sn) (0)
-#if 0
-#define getSn_IMR(sn) \
-		(WIZCHIP_READ(Sn_IMR(sn)) & 0x1F)
-#endif
-
-/**
- * @ingroup Socket_register_access_function
- * @brief Get @ref Sn_SR register
- * @param (uint8_t)sn Socket number. It should be <b>0 ~ 7</b>.
- * @return uint8_t. Value of @ref Sn_SR.
- */
-#define getSn_SR(sn) \
-		WIZCHIP_READ(Sn_SR(sn))
-
-/**
- * @ingroup Socket_register_access_function
- * @brief Set @ref Sn_PORT register
- * @param (uint8_t)sn Socket number. It should be <b>0 ~ 7</b>.
- * @param (uint16_t)port Value to set @ref Sn_PORT.
- * @sa getSn_PORT()
- */
-#define setSn_PORT(sn, port)  { \
-		WIZCHIP_WRITE(Sn_PORT(sn),   (uint8_t)(port >> 8)); \
-		WIZCHIP_WRITE(Sn_PORT(sn) + 1, (uint8_t) port); \
-	}
-
-/**
- * @ingroup Socket_register_access_function
- * @brief Get @ref Sn_PORT register
- * @param (uint8_t)sn Socket number. It should be <b>0 ~ 7</b>.
- * @return uint16_t. Value of @ref Sn_PORT.
- * @sa setSn_PORT()
- */
-#define getSn_PORT(sn) \
-		((WIZCHIP_READ(Sn_PORT(sn)) << 8) | WIZCHIP_READ(Sn_PORT(sn) + 1))
-
-/**
- * @ingroup Socket_register_access_function
- * @brief Set @ref Sn_DHAR register
- * @param (uint8_t)sn Socket number. It should be <b>0 ~ 7</b>.
- * @param (uint8_t*)dhar Pointer variable to set socket n destination hardware address. It should be allocated 6 bytes.
- * @sa getSn_DHAR()
- */
-#define setSn_DHAR(sn, dhar) \
-		WIZCHIP_WRITE_BUF(Sn_DHAR(sn), dhar, 6)
-
-/**
- * @ingroup Socket_register_access_function
- * @brief Get @ref Sn_MR register
- * @param (uint8_t)sn Socket number. It should be <b>0 ~ 7</b>.
- * @param (uint8_t*)dhar Pointer variable to get socket n destination hardware address. It should be allocated 6 bytes.
- * @sa setSn_DHAR()
- */
-#define getSn_DHAR(sn, dhar) \
-		WIZCHIP_READ_BUF(Sn_DHAR(sn), dhar, 6)
-
-/**
- * @ingroup Socket_register_access_function
- * @brief Set @ref Sn_DIPR register
- * @param (uint8_t)sn Socket number. It should be <b>0 ~ 7</b>.
- * @param (uint8_t*)dipr Pointer variable to set socket n destination IP address. It should be allocated 4 bytes.
- * @sa getSn_DIPR()
- */
-#define setSn_DIPR(sn, dipr) \
-		WIZCHIP_WRITE_BUF(Sn_DIPR(sn), dipr, 4)
-
-/**
- * @ingroup Socket_register_access_function
- * @brief Get @ref Sn_DIPR register
- * @param (uint8_t)sn Socket number. It should be <b>0 ~ 7</b>.
- * @param (uint8_t*)dipr Pointer variable to get socket n destination IP address. It should be allocated 4 bytes.
- * @sa SetSn_DIPR()
- */
-#define getSn_DIPR(sn, dipr) \
-		WIZCHIP_READ_BUF(Sn_DIPR(sn), dipr, 4)
-
-/**
- * @ingroup Socket_register_access_function
- * @brief Set @ref Sn_DPORT register
- * @param (uint8_t)sn Socket number. It should be <b>0 ~ 7</b>.
- * @param (uint16_t)dport Value to set @ref Sn_DPORT
- * @sa getSn_DPORT()
- */
-#define setSn_DPORT(sn, dport) { \
-		WIZCHIP_WRITE(Sn_DPORT(sn),   (uint8_t) (dport>>8)); \
-		WIZCHIP_WRITE(Sn_DPORT(sn) + 1, (uint8_t)  dport); \
-	}
-
-/**
- * @ingroup Socket_register_access_function
- * @brief Get @ref Sn_DPORT register
- * @param (uint8_t)sn Socket number. It should be <b>0 ~ 7</b>.
- * @return uint16_t. Value of @ref Sn_DPORT.
- * @sa setSn_DPORT()
- */
-#define getSn_DPORT(sn) \
-		((WIZCHIP_READ(Sn_DPORT(sn)) << 8) + WIZCHIP_READ((Sn_DPORT(sn)+1)))
-
-/**
- * @ingroup Socket_register_access_function
- * @brief Set @ref Sn_MSSR register
- * @param (uint8_t)sn Socket number. It should be <b>0 ~ 7</b>.
- * @param (uint16_t)mss Value to set @ref Sn_MSSR
- * @sa setSn_MSSR()
- */
-#define setSn_MSSR(sn, mss) { \
-		WIZCHIP_WRITE(Sn_MSSR(sn),   (uint8_t)(mss>>8)); \
-		WIZCHIP_WRITE((Sn_MSSR(sn)+1), (uint8_t) mss); \
-	}
-
-/**
- * @ingroup Socket_register_access_function
- * @brief Get @ref Sn_MSSR register
- * @param (uint8_t)sn Socket number. It should be <b>0 ~ 7</b>.
- * @return uint16_t. Value of @ref Sn_MSSR.
- * @sa setSn_MSSR()
- */
-#define getSn_MSSR(sn) \
-		((WIZCHIP_READ(Sn_MSSR(sn)) << 8) + WIZCHIP_READ((Sn_MSSR(sn)+1)))
-
-/**
- * @ingroup Socket_register_access_function
- * @brief Set @ref Sn_TOS register
- * @param (uint8_t)sn Socket number. It should be <b>0 ~ 7</b>.
- * @param (uint8_t)tos Value to set @ref Sn_TOS
- * @sa getSn_TOS()
- */
-#define setSn_TOS(sn, tos) \
-		WIZCHIP_WRITE(Sn_TOS(sn), tos)
-
-/**
- * @ingroup Socket_register_access_function
- * @brief Get @ref Sn_TOS register
- * @param (uint8_t)sn Socket number. It should be <b>0 ~ 7</b>.
- * @return uint8_t. Value of Sn_TOS.
- * @sa setSn_TOS()
- */
-#define getSn_TOS(sn) \
-		WIZCHIP_READ(Sn_TOS(sn))
-
-/**
- * @ingroup Socket_register_access_function
- * @brief Set @ref Sn_TTL register
- * @param (uint8_t)sn Socket number. It should be <b>0 ~ 7</b>.
- * @param (uint8_t)ttl Value to set @ref Sn_TTL
- * @sa getSn_TTL()
- */
-#define setSn_TTL(sn, ttl) \
-		WIZCHIP_WRITE(Sn_TTL(sn), ttl)
-
-
-/**
- * @ingroup Socket_register_access_function
- * @brief Get @ref Sn_TTL register
- * @param (uint8_t)sn Socket number. It should be <b>0 ~ 7</b>.
- * @return uint8_t. Value of @ref Sn_TTL.
- * @sa setSn_TTL()
- */
-#define getSn_TTL(sn) \
-		WIZCHIP_READ(Sn_TTL(sn))
-
-
-/**
- * @ingroup Socket_register_access_function
- * @brief Set @ref Sn_RXBUF_SIZE register
- * @param (uint8_t)sn Socket number. It should be <b>0 ~ 7</b>.
- * @param (uint8_t)rxbufsize Value to set @ref Sn_RXBUF_SIZE
- * @sa getSn_RXBUF_SIZE()
- */
-#define setSn_RXBUF_SIZE(sn, rxbufsize) \
-		WIZCHIP_WRITE(Sn_RXBUF_SIZE(sn),rxbufsize)
-
-
-/**
- * @ingroup Socket_register_access_function
- * @brief Get @ref Sn_RXBUF_SIZE register
- * @param (uint8_t)sn Socket number. It should be <b>0 ~ 7</b>.
- * @return uint8_t. Value of @ref Sn_RXBUF_SIZE.
- * @sa setSn_RXBUF_SIZE()
- */
-#define getSn_RXBUF_SIZE(sn) \
-		WIZCHIP_READ(Sn_RXBUF_SIZE(sn))
-
-/**
- * @ingroup Socket_register_access_function
- * @brief Set @ref Sn_TXBUF_SIZE register
- * @param (uint8_t)sn Socket number. It should be <b>0 ~ 7</b>.
- * @param (uint8_t)txbufsize Value to set @ref Sn_TXBUF_SIZE
- * @sa getSn_TXBUF_SIZE()
- */
-#define setSn_TXBUF_SIZE(sn, txbufsize) \
-		WIZCHIP_WRITE(Sn_TXBUF_SIZE(sn), txbufsize)
-
-/**
- * @ingroup Socket_register_access_function
- * @brief Get @ref Sn_TXBUF_SIZE register
- * @param (uint8_t)sn Socket number. It should be <b>0 ~ 7</b>.
- * @return uint8_t. Value of @ref Sn_TXBUF_SIZE.
- * @sa setSn_TXBUF_SIZE()
- */
-#define getSn_TXBUF_SIZE(sn) \
-		WIZCHIP_READ(Sn_TXBUF_SIZE(sn))
-
-/**
- * @ingroup Socket_register_access_function
- * @brief Get @ref Sn_TX_FSR register
- * @param (uint8_t)sn Socket number. It should be <b>0 ~ 7</b>.
- * @return uint16_t. Value of @ref Sn_TX_FSR.
- */
-uint16_t getSn_TX_FSR(uint8_t sn);
-
-/**
- * @ingroup Socket_register_access_function
- * @brief Get @ref Sn_TX_RD register
- * @param (uint8_t)sn Socket number. It should be <b>0 ~ 7</b>.
- * @return uint16_t. Value of @ref Sn_TX_RD.
- */
-#define getSn_TX_RD(sn) \
-		((WIZCHIP_READ(Sn_TX_RD(sn)) << 8) + WIZCHIP_READ((Sn_TX_RD(sn)+1)))
-
-/**
- * @ingroup Socket_register_access_function
- * @brief Set @ref Sn_TX_WR register
- * @param (uint8_t)sn Socket number. It should be <b>0 ~ 7</b>.
- * @param (uint16_t)txwr Value to set @ref Sn_TX_WR
- * @sa GetSn_TX_WR()
- */
-#define setSn_TX_WR(sn, txwr) { \
-		WIZCHIP_WRITE(Sn_TX_WR(sn),   (uint8_t)(txwr>>8)); \
-		WIZCHIP_WRITE((Sn_TX_WR(sn)+1), (uint8_t) txwr); \
-		}
-
-/**
- * @ingroup Socket_register_access_function
- * @brief Get @ref Sn_TX_WR register
- * @param (uint8_t)sn Socket number. It should be <b>0 ~ 7</b>.
- * @return uint16_t. Value of @ref Sn_TX_WR.
- * @sa setSn_TX_WR()
- */
-#define getSn_TX_WR(sn) \
-		((WIZCHIP_READ(Sn_TX_WR(sn)) << 8) + WIZCHIP_READ((Sn_TX_WR(sn)+1)))
-
-
-/**
- * @ingroup Socket_register_access_function
- * @brief Get @ref Sn_RX_RSR register
- * @param (uint8_t)sn Socket number. It should be <b>0 ~ 7</b>.
- * @return uint16_t. Value of @ref Sn_RX_RSR.
- */
-uint16_t getSn_RX_RSR(uint8_t sn);
-
-
-/**
- * @ingroup Socket_register_access_function
- * @brief Set @ref Sn_RX_RD register
- * @param (uint8_t)sn Socket number. It should be <b>0 ~ 7</b>.
- * @param (uint16_t)rxrd Value to set @ref Sn_RX_RD
- * @sa getSn_RX_RD()
- */
-#define setSn_RX_RD(sn, rxrd) { \
-		WIZCHIP_WRITE(Sn_RX_RD(sn),   (uint8_t)(rxrd>>8)); \
-		WIZCHIP_WRITE((Sn_RX_RD(sn)+1), (uint8_t) rxrd); \
-	}
-
-/**
- * @ingroup Socket_register_access_function
- * @brief Get @ref Sn_RX_RD register
- * @param (uint8_t)sn Socket number. It should be <b>0 ~ 7</b>.
- * @regurn uint16_t. Value of @ref Sn_RX_RD.
- * @sa setSn_RX_RD()
- */
-#define getSn_RX_RD(sn) \
-		((WIZCHIP_READ(Sn_RX_RD(sn)) << 8) + WIZCHIP_READ((Sn_RX_RD(sn)+1)))
-
-/**
- * @ingroup Socket_register_access_function
- * @brief Get @ref Sn_RX_WR register
- * @param (uint8_t)sn Socket number. It should be <b>0 ~ 7</b>.
- * @return uint16_t. Value of @ref Sn_RX_WR.
- */
-#define getSn_RX_WR(sn) \
-		((WIZCHIP_READ(Sn_RX_WR(sn)) << 8) + WIZCHIP_READ((Sn_RX_WR(sn)+1)))
-
-
-/**
- * @ingroup Socket_register_access_function
- * @brief Set @ref Sn_FRAG register
- * @param (uint8_t)sn Socket number. It should be <b>0 ~ 7</b>.
- * @param (uint16_t)frag Value to set @ref Sn_FRAG
- * @sa getSn_FRAD()
- */
-#if 0 // dpgeorge
-#define setSn_FRAG(sn, frag) { \
-		WIZCHIP_WRITE(Sn_FRAG(sn),  (uint8_t)(frag >>8)); \
-		WIZCHIP_WRITE(WIZCHIP_OFFSET_INC(Sn_FRAG(sn),1), (uint8_t) frag); \
-	}
-
-/**
- * @ingroup Socket_register_access_function
- * @brief Get @ref Sn_FRAG register
- * @param (uint8_t)sn Socket number. It should be <b>0 ~ 7</b>.
- * @return uint16_t. Value of @ref Sn_FRAG.
- * @sa setSn_FRAG()
- */
-#define getSn_FRAG(sn) \
-		((WIZCHIP_READ(Sn_FRAG(sn)) << 8) + WIZCHIP_READ(WIZCHIP_OFFSET_INC(Sn_FRAG(sn),1)))
-
-/**
- * @ingroup Socket_register_access_function
- * @brief Set @ref Sn_KPALVTR register
- * @param (uint8_t)sn Socket number. It should be <b>0 ~ 7</b>.
- * @param (uint8_t)kpalvt Value to set @ref Sn_KPALVTR
- * @sa getSn_KPALVTR()
- */
-#define setSn_KPALVTR(sn, kpalvt) \
-		WIZCHIP_WRITE(Sn_KPALVTR(sn), kpalvt)
-
-/**
- * @ingroup Socket_register_access_function
- * @brief Get @ref Sn_KPALVTR register
- * @param (uint8_t)sn Socket number. It should be <b>0 ~ 7</b>.
- * @return uint8_t. Value of @ref Sn_KPALVTR.
- * @sa setSn_KPALVTR()
- */
-#define getSn_KPALVTR(sn) \
-		WIZCHIP_READ(Sn_KPALVTR(sn))
-
-//////////////////////////////////////
-#endif
-
-/////////////////////////////////////
-// Sn_TXBUF & Sn_RXBUF IO function //
-/////////////////////////////////////
-/**  
- * @brief Gets the max buffer size of socket sn passed as parameter.
- * @param (uint8_t)sn Socket number. It should be <b>0 ~ 7</b>.
- * @return uint16_t. Value of Socket n RX max buffer size.
- */
-#define getSn_RxMAX(sn) \
-		(getSn_RXBUF_SIZE(sn) << 10)
-
-/**  
- * @brief Gets the max buffer size of socket sn passed as parameters.
- * @param (uint8_t)sn Socket number. It should be <b>0 ~ 7</b>.
- * @return uint16_t. Value of Socket n TX max buffer size.
- */
-//uint16_t getSn_TxMAX(uint8_t sn);
-#define getSn_TxMAX(sn) \
-		(getSn_TXBUF_SIZE(sn) << 10)
-
-void wiz_init(void);
-
-/**
- * @ingroup Basic_IO_function
- * @brief It copies data to internal TX memory
- *
- * @details This function reads the Tx write pointer register and after that,
- * it copies the <i>wizdata(pointer buffer)</i> of the length of <i>len(variable)</i> bytes to internal TX memory
- * and updates the Tx write pointer register.
- * This function is being called by send() and sendto() function also.
- *
- * @note User should read upper byte first and lower byte later to get proper value.
- * @param (uint8_t)sn Socket number. It should be <b>0 ~ 7</b>.
- * @param wizdata Pointer buffer to write data
- * @param len Data length
- * @sa wiz_recv_data()
- */
-void wiz_send_data(uint8_t sn, uint8_t *wizdata, uint16_t len);
-
-/**
- * @ingroup Basic_IO_function
- * @brief It copies data to your buffer from internal RX memory
- *
- * @details This function read the Rx read pointer register and after that,
- * it copies the received data from internal RX memory
- * to <i>wizdata(pointer variable)</i> of the length of <i>len(variable)</i> bytes.
- * This function is being called by recv() also.
- *
- * @note User should read upper byte first and lower byte later to get proper value.
- * @param (uint8_t)sn Socket number. It should be <b>0 ~ 7</b>.
- * @param wizdata Pointer buffer to read data
- * @param len Data length
- * @sa wiz_send_data()
- */
-void wiz_recv_data(uint8_t sn, uint8_t *wizdata, uint16_t len);
-
-/**
- * @ingroup Basic_IO_function
- * @brief It discard the received data in RX memory.
- * @details It discards the data of the length of <i>len(variable)</i> bytes in internal RX memory.
- * @param (uint8_t)sn Socket number. It should be <b>0 ~ 7</b>.
- * @param len Data length
- */
-void wiz_recv_ignore(uint8_t sn, uint16_t len);
-
-#endif   // _W5500_H_
diff --git a/drivers/wiznet5k/ethernet/w5500/w5500.c b/drivers/wiznet5k/ethernet/w5500/w5500.c
deleted file mode 100644
index 3107b1b71aa39..0000000000000
--- a/drivers/wiznet5k/ethernet/w5500/w5500.c
+++ /dev/null
@@ -1,247 +0,0 @@
-//*****************************************************************************
-//
-//! \file w5500.c
-//! \brief W5500 HAL Interface.
-//! \version 1.0.1
-//! \date 2013/10/21
-//! \par  Revision history
-//!       <2014/05/01> V1.0.2
-//!         1. Implicit type casting -> Explicit type casting. Refer to M20140501
-//!            Fixed the problem on porting into under 32bit MCU
-//!            Issued by Mathias ClauBen, wizwiki forum ID Think01 and bobh
-//!            Thank for your interesting and serious advices.
-//!       <2013/10/21> 1st Release
-//!       <2013/12/20> V1.0.1
-//!         1. Remove warning
-//!         2. WIZCHIP_READ_BUF WIZCHIP_WRITE_BUF in case _WIZCHIP_IO_MODE_SPI_FDM_
-//!            for loop optimized(removed). refer to M20131220
-//! \author MidnightCow
-//! \copyright
-//!
-//! Copyright (c)  2013, WIZnet Co., LTD.
-//! All rights reserved.
-//! 
-//! Redistribution and use in source and binary forms, with or without 
-//! modification, are permitted provided that the following conditions 
-//! are met: 
-//! 
-//!     * Redistributions of source code must retain the above copyright 
-//! notice, this list of conditions and the following disclaimer. 
-//!     * Redistributions in binary form must reproduce the above copyright
-//! notice, this list of conditions and the following disclaimer in the
-//! documentation and/or other materials provided with the distribution. 
-//!     * Neither the name of the <ORGANIZATION> nor the names of its 
-//! contributors may be used to endorse or promote products derived 
-//! from this software without specific prior written permission. 
-//! 
-//! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-//! AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
-//! IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-//! ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE 
-//! LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
-//! CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 
-//! SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-//! INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
-//! CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 
-//! ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF 
-//! THE POSSIBILITY OF SUCH DAMAGE.
-//
-//*****************************************************************************
-//#include <stdio.h>
-#include "w5500.h"
-
-#define _W5500_SPI_VDM_OP_          0x00
-#define _W5500_SPI_FDM_OP_LEN1_     0x01
-#define _W5500_SPI_FDM_OP_LEN2_     0x02
-#define _W5500_SPI_FDM_OP_LEN4_     0x03
-
-////////////////////////////////////////////////////
-
-#define LPC_SSP0 (0)
-
-static void Chip_SSP_ReadFrames_Blocking(int dummy, uint8_t *buf, uint32_t len) {
-    WIZCHIP.IF.SPI._read_bytes(buf, len);
-}
-
-static void Chip_SSP_WriteFrames_Blocking(int dummy, const uint8_t *buf, uint32_t len) {
-    WIZCHIP.IF.SPI._write_bytes(buf, len);
-}
-
-uint8_t  WIZCHIP_READ(uint32_t AddrSel)
-{
-   uint8_t ret;
-   uint8_t spi_data[3];
-
-   WIZCHIP_CRITICAL_ENTER();
-   WIZCHIP.CS._select();
-
-   AddrSel |= (_W5500_SPI_READ_ | _W5500_SPI_VDM_OP_);
-
-   //WIZCHIP.IF.SPI._write_byte((AddrSel & 0x00FF0000) >> 16);
-   //WIZCHIP.IF.SPI._write_byte((AddrSel & 0x0000FF00) >>  8);
-   //WIZCHIP.IF.SPI._write_byte((AddrSel & 0x000000FF) >>  0);
-   //ret = WIZCHIP.IF.SPI._read_byte();
-   spi_data[0] = (AddrSel & 0x00FF0000) >> 16;
-   spi_data[1] = (AddrSel & 0x0000FF00) >> 8;
-   spi_data[2] = (AddrSel & 0x000000FF) >> 0;
-   Chip_SSP_WriteFrames_Blocking(LPC_SSP0, spi_data, 3);
-   Chip_SSP_ReadFrames_Blocking(LPC_SSP0, &ret, 1);
-
-   WIZCHIP.CS._deselect();
-   WIZCHIP_CRITICAL_EXIT();
-   return ret;
-}
-
-void     WIZCHIP_WRITE(uint32_t AddrSel, uint8_t wb )
-{
-   uint8_t spi_data[4];
-
-   WIZCHIP_CRITICAL_ENTER();
-   WIZCHIP.CS._select();
-
-   AddrSel |= (_W5500_SPI_WRITE_ | _W5500_SPI_VDM_OP_);
-
-   //WIZCHIP.IF.SPI._write_byte((AddrSel & 0x00FF0000) >> 16);
-   //WIZCHIP.IF.SPI._write_byte((AddrSel & 0x0000FF00) >>  8);
-   //WIZCHIP.IF.SPI._write_byte((AddrSel & 0x000000FF) >>  0);
-   //WIZCHIP.IF.SPI._write_byte(wb);
-   spi_data[0] = (AddrSel & 0x00FF0000) >> 16;
-   spi_data[1] = (AddrSel & 0x0000FF00) >> 8;
-   spi_data[2] = (AddrSel & 0x000000FF) >> 0;
-   spi_data[3] = wb;
-   Chip_SSP_WriteFrames_Blocking(LPC_SSP0, spi_data, 4);
-
-   WIZCHIP.CS._deselect();
-   WIZCHIP_CRITICAL_EXIT();
-}
-         
-void     WIZCHIP_READ_BUF (uint32_t AddrSel, uint8_t* pBuf, uint16_t len)
-{
-   uint8_t spi_data[3];
-   //uint16_t i;
-
-   WIZCHIP_CRITICAL_ENTER();
-   WIZCHIP.CS._select();
-
-   AddrSel |= (_W5500_SPI_READ_ | _W5500_SPI_VDM_OP_);
-
-   //WIZCHIP.IF.SPI._write_byte((AddrSel & 0x00FF0000) >> 16);
-   //WIZCHIP.IF.SPI._write_byte((AddrSel & 0x0000FF00) >>  8);
-   //WIZCHIP.IF.SPI._write_byte((AddrSel & 0x000000FF) >>  0);
-   //for(i = 0; i < len; i++)
-   //  pBuf[i] = WIZCHIP.IF.SPI._read_byte();
-   spi_data[0] = (AddrSel & 0x00FF0000) >> 16;
-   spi_data[1] = (AddrSel & 0x0000FF00) >> 8;
-   spi_data[2] = (AddrSel & 0x000000FF) >> 0;
-   Chip_SSP_WriteFrames_Blocking(LPC_SSP0, spi_data, 3);
-   Chip_SSP_ReadFrames_Blocking(LPC_SSP0, pBuf, len);
-
-   WIZCHIP.CS._deselect();
-   WIZCHIP_CRITICAL_EXIT();
-}
-
-void     WIZCHIP_WRITE_BUF(uint32_t AddrSel, uint8_t* pBuf, uint16_t len)
-{
-   uint8_t spi_data[3];
-   //uint16_t i;
-
-   WIZCHIP_CRITICAL_ENTER();
-   WIZCHIP.CS._select();
-
-   AddrSel |= (_W5500_SPI_WRITE_ | _W5500_SPI_VDM_OP_);
-
-   //WIZCHIP.IF.SPI._write_byte((AddrSel & 0x00FF0000) >> 16);
-   //WIZCHIP.IF.SPI._write_byte((AddrSel & 0x0000FF00) >>  8);
-   //WIZCHIP.IF.SPI._write_byte((AddrSel & 0x000000FF) >>  0);
-   //for(i = 0; i < len; i++)
-   //   WIZCHIP.IF.SPI._write_byte(pBuf[i]);
-   spi_data[0] = (AddrSel & 0x00FF0000) >> 16;
-   spi_data[1] = (AddrSel & 0x0000FF00) >> 8;
-   spi_data[2] = (AddrSel & 0x000000FF) >> 0;
-   Chip_SSP_WriteFrames_Blocking(LPC_SSP0, spi_data, 3);
-   Chip_SSP_WriteFrames_Blocking(LPC_SSP0, pBuf, len);
-
-   WIZCHIP.CS._deselect();
-   WIZCHIP_CRITICAL_EXIT();
-}
-
-
-uint16_t getSn_TX_FSR(uint8_t sn)
-{
-   uint16_t val=0,val1=0;
-
-   do
-   {
-      val1 = WIZCHIP_READ(Sn_TX_FSR(sn));
-      val1 = (val1 << 8) + WIZCHIP_READ(WIZCHIP_OFFSET_INC(Sn_TX_FSR(sn),1));
-      if (val1 != 0)
-      {
-        val = WIZCHIP_READ(Sn_TX_FSR(sn));
-        val = (val << 8) + WIZCHIP_READ(WIZCHIP_OFFSET_INC(Sn_TX_FSR(sn),1));
-      }
-   }while (val != val1);
-   return val;
-}
-
-
-uint16_t getSn_RX_RSR(uint8_t sn)
-{
-   uint16_t val=0,val1=0;
-
-   do
-   {
-      val1 = WIZCHIP_READ(Sn_RX_RSR(sn));
-      val1 = (val1 << 8) + WIZCHIP_READ(WIZCHIP_OFFSET_INC(Sn_RX_RSR(sn),1));
-      if (val1 != 0)
-      {
-        val = WIZCHIP_READ(Sn_RX_RSR(sn));
-        val = (val << 8) + WIZCHIP_READ(WIZCHIP_OFFSET_INC(Sn_RX_RSR(sn),1));
-      }
-   }while (val != val1);
-   return val;
-}
-
-void wiz_send_data(uint8_t sn, uint8_t *wizdata, uint16_t len)
-{
-   uint16_t ptr = 0;
-   uint32_t addrsel = 0;
-
-   if(len == 0)  return;
-   ptr = getSn_TX_WR(sn);
-   //M20140501 : implict type casting -> explict type casting
-   //addrsel = (ptr << 8) + (WIZCHIP_TXBUF_BLOCK(sn) << 3);
-   addrsel = ((uint32_t)ptr << 8) + (WIZCHIP_TXBUF_BLOCK(sn) << 3);
-   //
-   WIZCHIP_WRITE_BUF(addrsel,wizdata, len);
-   
-   ptr += len;
-   setSn_TX_WR(sn,ptr);
-}
-
-void wiz_recv_data(uint8_t sn, uint8_t *wizdata, uint16_t len)
-{
-   uint16_t ptr = 0;
-   uint32_t addrsel = 0;
-   
-   if(len == 0) return;
-   ptr = getSn_RX_RD(sn);
-   //M20140501 : implict type casting -> explict type casting
-   //addrsel = ((ptr << 8) + (WIZCHIP_RXBUF_BLOCK(sn) << 3);
-   addrsel = ((uint32_t)ptr << 8) + (WIZCHIP_RXBUF_BLOCK(sn) << 3);
-   //
-   WIZCHIP_READ_BUF(addrsel, wizdata, len);
-   ptr += len;
-   
-   setSn_RX_RD(sn,ptr);
-}
-
-
-void wiz_recv_ignore(uint8_t sn, uint16_t len)
-{
-   uint16_t ptr = 0;
-
-   ptr = getSn_RX_RD(sn);
-   ptr += len;
-   setSn_RX_RD(sn,ptr);
-}
-
diff --git a/drivers/wiznet5k/ethernet/w5500/w5500.h b/drivers/wiznet5k/ethernet/w5500/w5500.h
deleted file mode 100644
index c2afb180ebbad..0000000000000
--- a/drivers/wiznet5k/ethernet/w5500/w5500.h
+++ /dev/null
@@ -1,2057 +0,0 @@
-//*****************************************************************************
-//
-//! \file w5500.h
-//! \brief W5500 HAL Header File.
-//! \version 1.0.0
-//! \date 2013/10/21
-//! \par  Revision history
-//!       <2013/10/21> 1st Release
-//! \author MidnightCow
-//! \copyright
-//!
-//! Copyright (c)  2013, WIZnet Co., LTD.
-//! All rights reserved.
-//! 
-//! Redistribution and use in source and binary forms, with or without 
-//! modification, are permitted provided that the following conditions 
-//! are met: 
-//! 
-//!     * Redistributions of source code must retain the above copyright 
-//! notice, this list of conditions and the following disclaimer. 
-//!     * Redistributions in binary form must reproduce the above copyright
-//! notice, this list of conditions and the following disclaimer in the
-//! documentation and/or other materials provided with the distribution. 
-//!     * Neither the name of the <ORGANIZATION> nor the names of its 
-//! contributors may be used to endorse or promote products derived 
-//! from this software without specific prior written permission. 
-//! 
-//! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-//! AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
-//! IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-//! ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE 
-//! LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
-//! CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 
-//! SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-//! INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
-//! CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 
-//! ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF 
-//! THE POSSIBILITY OF SUCH DAMAGE.
-//
-//*****************************************************************************
-
-#ifndef  _W5500_H_
-#define  _W5500_H_
-
-#include <stdint.h>
-#include "../wizchip_conf.h"
-
-#define _W5500_IO_BASE_              0x00000000
-
-#define _W5500_SPI_READ_			   (0x00 << 2) //< SPI interface Read operation in Control Phase
-#define _W5500_SPI_WRITE_			   (0x01 << 2) //< SPI interface Write operation in Control Phase
-
-#define WIZCHIP_CREG_BLOCK          0x00 	//< Common register block
-#define WIZCHIP_SREG_BLOCK(N)       (1+4*N) //< Socket N register block
-#define WIZCHIP_TXBUF_BLOCK(N)      (2+4*N) //< Socket N Tx buffer address block
-#define WIZCHIP_RXBUF_BLOCK(N)      (3+4*N) //< Socket N Rx buffer address block
-
-#define WIZCHIP_OFFSET_INC(ADDR, N)    (ADDR + (N<<8)) //< Increase offset address
-
-
-///////////////////////////////////////
-// Definition For Legacy Chip Driver //
-///////////////////////////////////////
-#define IINCHIP_READ(ADDR)                WIZCHIP_READ(ADDR)               ///< The defined for legacy chip driver
-#define IINCHIP_WRITE(ADDR,VAL)           WIZCHIP_WRITE(ADDR,VAL)          ///< The defined for legacy chip driver
-#define IINCHIP_READ_BUF(ADDR,BUF,LEN)    WIZCHIP_READ_BUF(ADDR,BUF,LEN)   ///< The defined for legacy chip driver
-#define IINCHIP_WRITE_BUF(ADDR,BUF,LEN)   WIZCHIP_WRITE(ADDR,BUF,LEN)      ///< The defined for legacy chip driver
-
-//////////////////////////////
-//--------------------------  defgroup ---------------------------------
-/**
- * @defgroup W5500 W5500
- *
- * @brief WHIZCHIP register defines and I/O functions of @b W5500.
- *
- * - @ref WIZCHIP_register : @ref Common_register_group and @ref Socket_register_group
- * - @ref WIZCHIP_IO_Functions : @ref Basic_IO_function, @ref Common_register_access_function and @ref Socket_register_access_function
- */
- 
- 
-/**
- * @defgroup WIZCHIP_register WIZCHIP register
- * @ingroup W5500
- *
- * @brief WHIZCHIP register defines register group of @b W5500.
- *
- * - @ref Common_register_group : Common register group
- * - @ref Socket_register_group : \c SOCKET n register group
- */
-
-
-/**
- * @defgroup WIZCHIP_IO_Functions WIZCHIP I/O functions
- * @ingroup W5500
- *
- * @brief This supports the basic I/O functions for @ref WIZCHIP_register.
- *
- * - <b> Basic I/O function </b> \n
- *   WIZCHIP_READ(), WIZCHIP_WRITE(), WIZCHIP_READ_BUF(), WIZCHIP_WRITE_BUF() \n\n
- *
- * - @ref Common_register_group <b>access functions</b> \n
- * 	-# @b Mode \n
- *    getMR(), setMR()
- * 	-# @b Interrupt \n
- *    getIR(), setIR(), getIMR(), setIMR(), getSIR(), setSIR(), getSIMR(), setSIMR(), getINTLEVEL(), setINTLEVEL()
- * 	-# <b> Network Information </b> \n
- *    getSHAR(), setSHAR(), getGAR(), setGAR(), getSUBR(), setSUBR(), getSIPR(), setSIPR()
- * 	-# @b Retransmission \n
- *    getRCR(), setRCR(), getRTR(), setRTR()
- * 	-# @b PPPoE \n
- *    getPTIMER(), setPTIMER(), getPMAGIC(), getPMAGIC(), getPSID(), setPSID(), getPHAR(), setPHAR(), getPMRU(), setPMRU()
- * 	-# <b> ICMP packet </b>\n
- *    getUIPR(), getUPORTR()
- * 	-# @b etc. \n
- *    getPHYCFGR(), setPHYCFGR(), getVERSIONR() \n\n
- *
- * - \ref Socket_register_group <b>access functions</b> \n
- *   -# <b> SOCKET control</b> \n
- *      getSn_MR(), setSn_MR(), getSn_CR(), setSn_CR(), getSn_IMR(), setSn_IMR(), getSn_IR(), setSn_IR()
- *   -# <b> SOCKET information</b> \n
- *      getSn_SR(), getSn_DHAR(), setSn_DHAR(), getSn_PORT(), setSn_PORT(), getSn_DIPR(), setSn_DIPR(), getSn_DPORT(), setSn_DPORT()
- *      getSn_MSSR(), setSn_MSSR()
- *   -# <b> SOCKET communication </b> \n
- *      getSn_RXBUF_SIZE(), setSn_RXBUF_SIZE(), getSn_TXBUF_SIZE(), setSn_TXBUF_SIZE() \n
- *      getSn_TX_RD(), getSn_TX_WR(), setSn_TX_WR() \n
- *      getSn_RX_RD(), setSn_RX_RD(), getSn_RX_WR() \n
- *      getSn_TX_FSR(), getSn_RX_RSR(), getSn_KPALVTR(), setSn_KPALVTR()
- *   -# <b> IP header field </b> \n
- *      getSn_FRAG(), setSn_FRAG(),  getSn_TOS(), setSn_TOS() \n
- *      getSn_TTL(), setSn_TTL()
- */
-
-
-
-/**
- * @defgroup Common_register_group Common register
- * @ingroup WIZCHIP_register
- *
- * @brief Common register group\n
- * It set the basic for the networking\n
- * It set the configuration such as interrupt, network information, ICMP, etc.
- * @details
- * @sa MR : Mode register.
- * @sa GAR, SUBR, SHAR, SIPR
- * @sa INTLEVEL, IR, IMR, SIR, SIMR : Interrupt.
- * @sa RTR, RCR : Data retransmission.
- * @sa PTIMER, PMAGIC, PHAR, PSID, PMRU : PPPoE.
- * @sa UIPR, UPORTR : ICMP message.
- * @sa PHYCFGR, VERSIONR : etc.
- */
- 
-  
- 
-/**
- * @defgroup Socket_register_group Socket register
- * @ingroup WIZCHIP_register
- *
- * @brief Socket register group.\n
- * Socket register configures and control SOCKETn which is necessary to data communication.
- * @details
- * @sa Sn_MR, Sn_CR, Sn_IR, Sn_IMR : SOCKETn Control
- * @sa Sn_SR, Sn_PORT, Sn_DHAR, Sn_DIPR, Sn_DPORT : SOCKETn Information
- * @sa Sn_MSSR, Sn_TOS, Sn_TTL, Sn_KPALVTR, Sn_FRAG : Internet protocol.
- * @sa Sn_RXBUF_SIZE, Sn_TXBUF_SIZE, Sn_TX_FSR, Sn_TX_RD, Sn_TX_WR, Sn_RX_RSR, Sn_RX_RD, Sn_RX_WR : Data communication
- */
- 
- 
- 
- /**
- * @defgroup Basic_IO_function Basic I/O function
- * @ingroup WIZCHIP_IO_Functions
- * @brief These are basic input/output functions to read values from register or write values to register.
- */
-
-/**
- * @defgroup Common_register_access_function Common register access functions
- * @ingroup WIZCHIP_IO_Functions
- * @brief These are functions to access <b>common registers</b>.
- */
-
-/**
- * @defgroup Socket_register_access_function Socket register access functions
- * @ingroup WIZCHIP_IO_Functions
- * @brief These are functions to access <b>socket registers</b>.
- */
- 
-//------------------------------- defgroup end --------------------------------------------
-//----------------------------- W5500 Common Registers IOMAP -----------------------------
-/**
- * @ingroup Common_register_group
- * @brief Mode Register address(R/W)\n
- * @ref MR is used for S/W reset, ping block mode, PPPoE mode and etc.
- * @details Each bit of @ref MR defined as follows.
- * <table>
- * 		<tr>  <td>7</td> <td>6</td> <td>5</td> <td>4</td> <td>3</td> <td>2</td> <td>1</td> <td>0</td>   </tr>
- * 		<tr>  <td>RST</td> <td>Reserved</td> <td>WOL</td> <td>PB</td> <td>PPPoE</td> <td>Reserved</td> <td>FARP</td> <td>Reserved</td> </tr>
- * </table>
- * - \ref MR_RST		 	: Reset
- * - \ref MR_WOL       		: Wake on LAN
- * - \ref MR_PB         	: Ping block
- * - \ref MR_PPPOE      	: PPPoE mode
- * - \ref MR_FARP			: Force ARP mode
- */
-#define MR                 (_W5500_IO_BASE_ + (0x0000 << 8) + (WIZCHIP_CREG_BLOCK << 3))
-
-/**
- * @ingroup Common_register_group
- * @brief Gateway IP Register address(R/W)
- * @details @ref GAR configures the default gateway address.
- */
-#define GAR                (_W5500_IO_BASE_ + (0x0001 << 8) + (WIZCHIP_CREG_BLOCK << 3))
-
-/**
- * @ingroup Common_register_group
- * @brief Subnet mask Register address(R/W)
- * @details @ref SUBR configures the subnet mask address.
- */
-#define SUBR               (_W5500_IO_BASE_ + (0x0005 << 8) + (WIZCHIP_CREG_BLOCK << 3))
-
-/**
- * @ingroup Common_register_group
- * @brief Source MAC Register address(R/W)
- * @details @ref SHAR configures the source hardware address.
- */
-#define SHAR               (_W5500_IO_BASE_ + (0x0009 << 8) + (WIZCHIP_CREG_BLOCK << 3))
-
-/**
- * @ingroup Common_register_group
- * @brief Source IP Register address(R/W)
- * @details @ref SIPR configures the source IP address.
- */
-#define SIPR               (_W5500_IO_BASE_ + (0x000F << 8) + (WIZCHIP_CREG_BLOCK << 3))
-
-/**
- * @ingroup Common_register_group
- * @brief Set Interrupt low level timer register address(R/W)
- * @details @ref INTLEVEL configures the Interrupt Assert Time.
- */
-#define INTLEVEL           (_W5500_IO_BASE_ + (0x0013 << 8) + (WIZCHIP_CREG_BLOCK << 3))
-
-/**
- * @ingroup Common_register_group
- * @brief Interrupt Register(R/W)
- * @details @ref IR indicates the interrupt status. Each bit of @ref IR will be still until the bit will be written to by the host.
- * If @ref IR is not equal to x00 INTn PIN is asserted to low until it is x00\n\n
- * Each bit of @ref IR defined as follows.
- * <table>
- * 		<tr>  <td>7</td> <td>6</td> <td>5</td> <td>4</td> <td>3</td> <td>2</td> <td>1</td> <td>0</td>   </tr>
- * 		<tr>  <td>CONFLICT</td> <td>UNREACH</td> <td>PPPoE</td> <td>MP</td> <td>Reserved</td> <td>Reserved</td> <td>Reserved</td> <td>Reserved</td> </tr>
- * </table>
- * - \ref IR_CONFLICT : IP conflict
- * - \ref IR_UNREACH  : Destination unreachable
- * - \ref IR_PPPoE	  : PPPoE connection close
- * - \ref IR_MP		  : Magic packet
- */
-#define IR                 (_W5500_IO_BASE_ + (0x0015 << 8) + (WIZCHIP_CREG_BLOCK << 3))
-
-/**
- * @ingroup Common_register_group
- * @brief Interrupt mask register(R/W)
- * @details @ref IMR is used to mask interrupts. Each bit of @ref IMR corresponds to each bit of @ref IR.
- * When a bit of @ref IMR is and the corresponding bit of @ref IR is  an interrupt will be issued. In other words,
- * if a bit of @ref IMR is  an interrupt will not be issued even if the corresponding bit of @ref IR is \n\n
- * Each bit of @ref IMR defined as the following.
- * <table>
- * 		<tr>  <td>7</td> <td>6</td> <td>5</td> <td>4</td> <td>3</td> <td>2</td> <td>1</td> <td>0</td>   </tr>
- * 		<tr>  <td>IM_IR7</td> <td>IM_IR6</td> <td>IM_IR5</td> <td>IM_IR4</td> <td>Reserved</td> <td>Reserved</td> <td>Reserved</td> <td>Reserved</td> </tr>
- * </table>
- * - \ref IM_IR7 : IP Conflict Interrupt Mask
- * - \ref IM_IR6 : Destination unreachable Interrupt Mask
- * - \ref IM_IR5 : PPPoE Close Interrupt Mask
- * - \ref IM_IR4 : Magic Packet Interrupt Mask
- */
-#define IMR                (_W5500_IO_BASE_ + (0x0016 << 8) + (WIZCHIP_CREG_BLOCK << 3))
-
-/**
- * @ingroup Common_register_group
- * @brief Socket Interrupt Register(R/W)
- * @details @ref SIR indicates the interrupt status of Socket.\n
- * Each bit of @ref SIR be still until @ref Sn_IR is cleared by the host.\n
- * If @ref Sn_IR is not equal to x00 the n-th bit of @ref SIR is and INTn PIN is asserted until @ref SIR is x00 */
-#define SIR                (_W5500_IO_BASE_ + (0x0017 << 8) + (WIZCHIP_CREG_BLOCK << 3))
-
-/**
- * @ingroup Common_register_group
- * @brief Socket Interrupt Mask Register(R/W)
- * @details Each bit of @ref SIMR corresponds to each bit of @ref SIR.
- * When a bit of @ref SIMR is and the corresponding bit of @ref SIR is  Interrupt will be issued.
- * In other words, if a bit of @ref SIMR is  an interrupt will be not issued even if the corresponding bit of @ref SIR is 
- */
-#define SIMR               (_W5500_IO_BASE_ + (0x0018 << 8) + (WIZCHIP_CREG_BLOCK << 3))
-
-/**
- * @ingroup Common_register_group
- * @brief Timeout register address( 1 is 100us )(R/W)
- * @details @ref RTR configures the retransmission timeout period. The unit of timeout period is 100us and the default of @ref RTR is x07D0or 000
- * And so the default timeout period is 200ms(100us X 2000). During the time configured by @ref RTR, W5500 waits for the peer response
- * to the packet that is transmitted by \ref Sn_CR (CONNECT, DISCON, CLOSE, SEND, SEND_MAC, SEND_KEEP command).
- * If the peer does not respond within the @ref RTR time, W5500 retransmits the packet or issues timeout.
- */
-#define RTR                (_W5500_IO_BASE_ + (0x0019 << 8) + (WIZCHIP_CREG_BLOCK << 3))
-
-/**
- * @ingroup Common_register_group
- * @brief Retry count register(R/W)
- * @details @ref RCR configures the number of time of retransmission.
- * When retransmission occurs as many as ref RCR+1 Timeout interrupt is issued (@ref Sn_IR[TIMEOUT] = .
- */
-#define RCR                (_W5500_IO_BASE_ + (0x001B << 8) + (WIZCHIP_CREG_BLOCK << 3))
-
-/**
- * @ingroup Common_register_group
- * @brief PPP LCP Request Timer register  in PPPoE mode(R/W)
- * @details @ref PTIMER configures the time for sending LCP echo request. The unit of time is 25ms.
- */
-#define PTIMER             (_W5500_IO_BASE_ + (0x001C << 8) + (WIZCHIP_CREG_BLOCK << 3))
-
-/**
- * @ingroup Common_register_group
- * @brief PPP LCP Magic number register  in PPPoE mode(R/W)
- * @details @ref PMAGIC configures the 4bytes magic number to be used in LCP negotiation.
- */
-#define PMAGIC             (_W5500_IO_BASE_ + (0x001D << 8) + (WIZCHIP_CREG_BLOCK << 3))
-
-/**
- * @ingroup Common_register_group
- * @brief PPP Destination MAC Register address(R/W)
- * @details @ref PHAR configures the PPPoE server hardware address that is acquired during PPPoE connection process.
- */
-#define PHAR                (_W5500_IO_BASE_ + (0x001E << 8) + (WIZCHIP_CREG_BLOCK << 3))
-
-/**
- * @ingroup Common_register_group
- * @brief PPP Session Identification Register(R/W)
- * @details @ref PSID configures the PPPoE sever session ID acquired during PPPoE connection process.
- */
-#define PSID               (_W5500_IO_BASE_ + (0x0024 << 8) + (WIZCHIP_CREG_BLOCK << 3))
-
-/**
- * @ingroup Common_register_group
- * @brief PPP Maximum Segment Size(MSS) register(R/W)
- * @details @ref PMRU configures the maximum receive unit of PPPoE.
- */
-#define PMRU               (_W5500_IO_BASE_ + (0x0026 << 8) + (WIZCHIP_CREG_BLOCK << 3))
-
-/**
- * @ingroup Common_register_group
- * @brief Unreachable IP register address in UDP mode(R)
- * @details W5500 receives an ICMP packet(Destination port unreachable) when data is sent to a port number
- * which socket is not open and @ref UNREACH bit of @ref IR becomes and @ref UIPR & @ref UPORTR indicates
- * the destination IP address & port number respectively.
- */
-#define UIPR               (_W5500_IO_BASE_ + (0x0028 << 8) + (WIZCHIP_CREG_BLOCK << 3))
-
-/**
- * @ingroup Common_register_group
- * @brief Unreachable Port register address in UDP mode(R)
- * @details W5500 receives an ICMP packet(Destination port unreachable) when data is sent to a port number
- * which socket is not open and @ref UNREACH bit of @ref IR becomes and @ref UIPR & @ref UPORTR
- * indicates the destination IP address & port number respectively.
- */
-#define UPORTR              (_W5500_IO_BASE_ + (0x002C << 8) + (WIZCHIP_CREG_BLOCK << 3))
-
-/**
- * @ingroup Common_register_group
- * @brief PHY Status Register(R/W)
- * @details @ref PHYCFGR configures PHY operation mode and resets PHY. In addition, @ref PHYCFGR indicates the status of PHY such as duplex, Speed, Link.
- */
-#define PHYCFGR            (_W5500_IO_BASE_ + (0x002E << 8) + (WIZCHIP_CREG_BLOCK << 3))
-
-// Reserved			         (_W5500_IO_BASE_ + (0x002F << 8) + (WIZCHIP_CREG_BLOCK << 3))
-// Reserved			         (_W5500_IO_BASE_ + (0x0030 << 8) + (WIZCHIP_CREG_BLOCK << 3))
-// Reserved			         (_W5500_IO_BASE_ + (0x0031 << 8) + (WIZCHIP_CREG_BLOCK << 3))
-// Reserved			         (_W5500_IO_BASE_ + (0x0032 << 8) + (WIZCHIP_CREG_BLOCK << 3))
-// Reserved			         (_W5500_IO_BASE_ + (0x0033 << 8) + (WIZCHIP_CREG_BLOCK << 3))
-// Reserved			         (_W5500_IO_BASE_ + (0x0034 << 8) + (WIZCHIP_CREG_BLOCK << 3))
-// Reserved			         (_W5500_IO_BASE_ + (0x0035 << 8) + (WIZCHIP_CREG_BLOCK << 3))
-// Reserved			         (_W5500_IO_BASE_ + (0x0036 << 8) + (WIZCHIP_CREG_BLOCK << 3))
-// Reserved			         (_W5500_IO_BASE_ + (0x0037 << 8) + (WIZCHIP_CREG_BLOCK << 3))
-// Reserved			         (_W5500_IO_BASE_ + (0x0038 << 8) + (WIZCHIP_CREG_BLOCK << 3))
-
-/**
- * @ingroup Common_register_group
- * @brief chip version register address(R)
- * @details @ref VERSIONR always indicates the W5500 version as @b 0x04.
- */
-#define VERSIONR           (_W5500_IO_BASE_ + (0x0039 << 8) + (WIZCHIP_CREG_BLOCK << 3))
-
-
-//----------------------------- W5500 Socket Registers IOMAP -----------------------------
-/**
- * @ingroup Socket_register_group
- * @brief socket Mode register(R/W)
- * @details @ref Sn_MR configures the option or protocol type of Socket n.\n\n
- * Each bit of @ref Sn_MR defined as the following.
- * <table>
- * 		<tr>  <td>7</td> <td>6</td> <td>5</td> <td>4</td> <td>3</td> <td>2</td> <td>1</td> <td>0</td>   </tr>
- * 		<tr>  <td>MULTI/MFEN</td> <td>BCASTB</td> <td>ND/MC/MMB</td> <td>UCASTB/MIP6B</td> <td>Protocol[3]</td> <td>Protocol[2]</td> <td>Protocol[1]</td> <td>Protocol[0]</td> </tr>
- * </table>
- * - @ref Sn_MR_MULTI	: Support UDP Multicasting
- * - @ref Sn_MR_BCASTB	: Broadcast block <b>in UDP Multicasting</b>
- * - @ref Sn_MR_ND		: No Delayed Ack(TCP) flag
- * - @ref Sn_MR_MC   	: IGMP version used <b>in UDP mulitcasting</b>
- * - @ref Sn_MR_MMB    	: Multicast Blocking <b>in @ref Sn_MR_MACRAW mode</b>
- * - @ref Sn_MR_UCASTB	: Unicast Block <b>in UDP Multicating</b>
- * - @ref Sn_MR_MIP6B   : IPv6 packet Blocking <b>in @ref Sn_MR_MACRAW mode</b>
- * - <b>Protocol</b>
- * <table>
- * 		<tr>   <td><b>Protocol[3]</b></td> <td><b>Protocol[2]</b></td> <td><b>Protocol[1]</b></td> <td><b>Protocol[0]</b></td> <td>@b Meaning</td>   </tr>
- * 		<tr>   <td>0</td> <td>0</td> <td>0</td> <td>0</td> <td>Closed</td>   </tr>
- * 		<tr>   <td>0</td> <td>0</td> <td>0</td> <td>1</td> <td>TCP</td>   </tr>
- * 		<tr>   <td>0</td> <td>0</td> <td>1</td> <td>0</td> <td>UDP</td>   </tr>
- * 		<tr>   <td>0</td> <td>1</td> <td>0</td> <td>0</td> <td>MACRAW</td>   </tr>
- * </table>
- *	- @ref Sn_MR_MACRAW	: MAC LAYER RAW SOCK \n
- *  - @ref Sn_MR_UDP		: UDP
- *  - @ref Sn_MR_TCP		: TCP
- *  - @ref Sn_MR_CLOSE	: Unused socket
- *  @note MACRAW mode should be only used in Socket 0.
- */
-#define Sn_MR(N)           (_W5500_IO_BASE_ + (0x0000 << 8) + (WIZCHIP_SREG_BLOCK(N) << 3))
-
-/**
- * @ingroup Socket_register_group
- * @brief Socket command register(R/W)
- * @details This is used to set the command for Socket n such as OPEN, CLOSE, CONNECT, LISTEN, SEND, and RECEIVE.\n
- * After W5500 accepts the command, the @ref Sn_CR register is automatically cleared to 0x00.
- * Even though @ref Sn_CR is cleared to 0x00, the command is still being processed.\n
- * To check whether the command is completed or not, please check the @ref Sn_IR or @ref Sn_SR.
- * - @ref Sn_CR_OPEN 		: Initialize or open socket.
- * - @ref Sn_CR_LISTEN 		: Wait connection request in TCP mode(<b>Server mode</b>)
- * - @ref Sn_CR_CONNECT 	: Send connection request in TCP mode(<b>Client mode</b>)
- * - @ref Sn_CR_DISCON 		: Send closing request in TCP mode.
- * - @ref Sn_CR_CLOSE   	: Close socket.
- * - @ref Sn_CR_SEND    	: Update TX buffer pointer and send data.
- * - @ref Sn_CR_SEND_MAC	: Send data with MAC address, so without ARP process.
- * - @ref Sn_CR_SEND_KEEP 	: Send keep alive message.
- * - @ref Sn_CR_RECV		: Update RX buffer pointer and receive data.
- */
-#define Sn_CR(N)           (_W5500_IO_BASE_ + (0x0001 << 8) + (WIZCHIP_SREG_BLOCK(N) << 3))
-
-/**
- * @ingroup Socket_register_group
- * @brief Socket interrupt register(R)
- * @details @ref Sn_IR indicates the status of Socket Interrupt such as establishment, termination, receiving data, timeout).\n
- * When an interrupt occurs and the corresponding bit of @ref Sn_IMR is  the corresponding bit of @ref Sn_IR becomes \n
- * In order to clear the @ref Sn_IR bit, the host should write the bit to \n
- * <table>
- * 		<tr>  <td>7</td> <td>6</td> <td>5</td> <td>4</td> <td>3</td> <td>2</td> <td>1</td> <td>0</td>   </tr>
- * 		<tr>  <td>Reserved</td> <td>Reserved</td> <td>Reserved</td> <td>SEND_OK</td> <td>TIMEOUT</td> <td>RECV</td> <td>DISCON</td> <td>CON</td> </tr>
- * </table>
- * - \ref Sn_IR_SENDOK : <b>SEND_OK Interrupt</b>
- * - \ref Sn_IR_TIMEOUT : <b>TIMEOUT Interrupt</b>
- * - \ref Sn_IR_RECV : <b>RECV Interrupt</b>
- * - \ref Sn_IR_DISCON : <b>DISCON Interrupt</b>
- * - \ref Sn_IR_CON : <b>CON Interrupt</b>
- */
-#define Sn_IR(N)           (_W5500_IO_BASE_ + (0x0002 << 8) + (WIZCHIP_SREG_BLOCK(N) << 3))
-
-/**
- * @ingroup Socket_register_group
- * @brief Socket status register(R)
- * @details @ref Sn_SR indicates the status of Socket n.\n
- * The status of Socket n is changed by @ref Sn_CR or some special control packet as SYN, FIN packet in TCP.
- * @par Normal status
- * - @ref SOCK_CLOSED 		: Closed
- * - @ref SOCK_INIT   		: Initiate state
- * - @ref SOCK_LISTEN    	: Listen state
- * - @ref SOCK_ESTABLISHED 	: Success to connect
- * - @ref SOCK_CLOSE_WAIT   : Closing state
- * - @ref SOCK_UDP   		: UDP socket
- * - @ref SOCK_MACRAW  		: MAC raw mode socket
- *@par Temporary status during changing the status of Socket n.
- * - @ref SOCK_SYNSENT   	: This indicates Socket n sent the connect-request packet (SYN packet) to a peer.
- * - @ref SOCK_SYNRECV    	: It indicates Socket n successfully received the connect-request packet (SYN packet) from a peer.
- * - @ref SOCK_FIN_WAIT		: Connection state
- * - @ref SOCK_CLOSING		: Closing state
- * - @ref SOCK_TIME_WAIT	: Closing state
- * - @ref SOCK_LAST_ACK 	: Closing state
- */
-#define Sn_SR(N)           (_W5500_IO_BASE_ + (0x0003 << 8) + (WIZCHIP_SREG_BLOCK(N) << 3))
-
-/**
- * @ingroup Socket_register_group
- * @brief source port register(R/W)
- * @details @ref Sn_PORT configures the source port number of Socket n.
- * It is valid when Socket n is used in TCP/UPD mode. It should be set before OPEN command is ordered.
- */
-#define Sn_PORT(N)         (_W5500_IO_BASE_ + (0x0004 << 8) + (WIZCHIP_SREG_BLOCK(N) << 3))
-
-/**
- * @ingroup Socket_register_group
- * @brief Peer MAC register address(R/W)
- * @details @ref Sn_DHAR configures the destination hardware address of Socket n when using SEND_MAC command in UDP mode or
- * it indicates that it is acquired in ARP-process by CONNECT/SEND command.
- */
-#define Sn_DHAR(N)         (_W5500_IO_BASE_ + (0x0006 << 8) + (WIZCHIP_SREG_BLOCK(N) << 3))
-
-/**
- * @ingroup Socket_register_group
- * @brief Peer IP register address(R/W)
- * @details @ref Sn_DIPR configures or indicates the destination IP address of Socket n. It is valid when Socket n is used in TCP/UDP mode.
- * In TCP client mode, it configures an IP address of �TCP serverbefore CONNECT command.
- * In TCP server mode, it indicates an IP address of �TCP clientafter successfully establishing connection.
- * In UDP mode, it configures an IP address of peer to be received the UDP packet by SEND or SEND_MAC command.
- */
-#define Sn_DIPR(N)         (_W5500_IO_BASE_ + (0x000C << 8) + (WIZCHIP_SREG_BLOCK(N) << 3))
-
-/**
- * @ingroup Socket_register_group
- * @brief Peer port register address(R/W)
- * @details @ref Sn_DPORT configures or indicates the destination port number of Socket n. It is valid when Socket n is used in TCP/UDP mode.
- * In �TCP clientmode, it configures the listen port number of �TCP serverbefore CONNECT command.
- * In �TCP Servermode, it indicates the port number of TCP client after successfully establishing connection.
- * In UDP mode, it configures the port number of peer to be transmitted the UDP packet by SEND/SEND_MAC command.
- */
-#define Sn_DPORT(N)        (_W5500_IO_BASE_ + (0x0010 << 8) + (WIZCHIP_SREG_BLOCK(N) << 3))
-
-/**
- * @ingroup Socket_register_group
- * @brief Maximum Segment Size(Sn_MSSR0) register address(R/W)
- * @details @ref Sn_MSSR configures or indicates the MTU(Maximum Transfer Unit) of Socket n.
- */
-#define Sn_MSSR(N)         (_W5500_IO_BASE_ + (0x0012 << 8) + (WIZCHIP_SREG_BLOCK(N) << 3))
-
-// Reserved			         (_W5500_IO_BASE_ + (0x0014 << 8) + (WIZCHIP_SREG_BLOCK(N) << 3))
-
-/**
- * @ingroup Socket_register_group
- * @brief IP Type of Service(TOS) Register(R/W)
- * @details @ref Sn_TOS configures the TOS(Type Of Service field in IP Header) of Socket n.
- * It is set before OPEN command.
- */
-#define Sn_TOS(N)          (_W5500_IO_BASE_ + (0x0015 << 8) + (WIZCHIP_SREG_BLOCK(N) << 3))
-/**
- * @ingroup Socket_register_group
- * @brief IP Time to live(TTL) Register(R/W)
- * @details @ref Sn_TTL configures the TTL(Time To Live field in IP header) of Socket n.
- * It is set before OPEN command.
- */
-#define Sn_TTL(N)          (_W5500_IO_BASE_ + (0x0016 << 8) + (WIZCHIP_SREG_BLOCK(N) << 3))
-// Reserved			         (_W5500_IO_BASE_ + (0x0017 << 8) + (WIZCHIP_SREG_BLOCK(N) << 3))
-// Reserved			         (_W5500_IO_BASE_ + (0x0018 << 8) + (WIZCHIP_SREG_BLOCK(N) << 3)) 
-// Reserved			         (_W5500_IO_BASE_ + (0x0019 << 8) + (WIZCHIP_SREG_BLOCK(N) << 3))
-// Reserved			         (_W5500_IO_BASE_ + (0x001A << 8) + (WIZCHIP_SREG_BLOCK(N) << 3))
-// Reserved			         (_W5500_IO_BASE_ + (0x001B << 8) + (WIZCHIP_SREG_BLOCK(N) << 3))
-// Reserved			         (_W5500_IO_BASE_ + (0x001C << 8) + (WIZCHIP_SREG_BLOCK(N) << 3))
-// Reserved			         (_W5500_IO_BASE_ + (0x001D << 8) + (WIZCHIP_SREG_BLOCK(N) << 3))
-
-/**
- * @ingroup Socket_register_group
- * @brief Receive memory size register(R/W)
- * @details @ref Sn_RXBUF_SIZE configures the RX buffer block size of Socket n.
- * Socket n RX Buffer Block size can be configured with 1,2,4,8, and 16 Kbytes.
- * If a different size is configured, the data cannot be normally received from a peer.
- * Although Socket n RX Buffer Block size is initially configured to 2Kbytes,
- * user can re-configure its size using @ref Sn_RXBUF_SIZE. The total sum of @ref Sn_RXBUF_SIZE can not be exceed 16Kbytes.
- * When exceeded, the data reception error is occurred.
- */
-#define Sn_RXBUF_SIZE(N)   (_W5500_IO_BASE_ + (0x001E << 8) + (WIZCHIP_SREG_BLOCK(N) << 3))
-
-/**
- * @ingroup Socket_register_group
- * @brief Transmit memory size register(R/W)
- * @details @ref Sn_TXBUF_SIZE configures the TX buffer block size of Socket n. Socket n TX Buffer Block size can be configured with 1,2,4,8, and 16 Kbytes.
- * If a different size is configured, the data can�t be normally transmitted to a peer.
- * Although Socket n TX Buffer Block size is initially configured to 2Kbytes,
- * user can be re-configure its size using @ref Sn_TXBUF_SIZE. The total sum of @ref Sn_TXBUF_SIZE can not be exceed 16Kbytes.
- * When exceeded, the data transmission error is occurred.
- */
-#define Sn_TXBUF_SIZE(N)   (_W5500_IO_BASE_ + (0x001F << 8) + (WIZCHIP_SREG_BLOCK(N) << 3))
-
-/**
- * @ingroup Socket_register_group
- * @brief Transmit free memory size register(R)
- * @details @ref Sn_TX_FSR indicates the free size of Socket n TX Buffer Block. It is initialized to the configured size by @ref Sn_TXBUF_SIZE.
- * Data bigger than @ref Sn_TX_FSR should not be saved in the Socket n TX Buffer because the bigger data overwrites the previous saved data not yet sent.
- * Therefore, check before saving the data to the Socket n TX Buffer, and if data is equal or smaller than its checked size,
- * transmit the data with SEND/SEND_MAC command after saving the data in Socket n TX buffer. But, if data is bigger than its checked size,
- * transmit the data after dividing into the checked size and saving in the Socket n TX buffer.
- */
-#define Sn_TX_FSR(N)       (_W5500_IO_BASE_ + (0x0020 << 8) + (WIZCHIP_SREG_BLOCK(N) << 3))
-
-/**
- * @ingroup Socket_register_group
- * @brief Transmit memory read pointer register address(R)
- * @details @ref Sn_TX_RD is initialized by OPEN command. However, if Sn_MR(P[3:0]) is TCP mode(001, it is re-initialized while connecting with TCP.
- * After its initialization, it is auto-increased by SEND command.
- * SEND command transmits the saved data from the current @ref Sn_TX_RD to the @ref Sn_TX_WR in the Socket n TX Buffer.
- * After transmitting the saved data, the SEND command increases the @ref Sn_TX_RD as same as the @ref Sn_TX_WR.
- * If its increment value exceeds the maximum value 0xFFFF, (greater than 0x10000 and the carry bit occurs),
- * then the carry bit is ignored and will automatically update with the lower 16bits value.
- */
-#define Sn_TX_RD(N)        (_W5500_IO_BASE_ + (0x0022 << 8) + (WIZCHIP_SREG_BLOCK(N) << 3))
-
-/**
- * @ingroup Socket_register_group
- * @brief Transmit memory write pointer register address(R/W)
- * @details @ref Sn_TX_WR is initialized by OPEN command. However, if Sn_MR(P[3:0]) is TCP mode(001, it is re-initialized while connecting with TCP.\n
- * It should be read or be updated like as follows.\n
- * 1. Read the starting address for saving the transmitting data.\n
- * 2. Save the transmitting data from the starting address of Socket n TX buffer.\n
- * 3. After saving the transmitting data, update @ref Sn_TX_WR to the increased value as many as transmitting data size.
- * If the increment value exceeds the maximum value 0xFFFF(greater than 0x10000 and the carry bit occurs),
- * then the carry bit is ignored and will automatically update with the lower 16bits value.\n
- * 4. Transmit the saved data in Socket n TX Buffer by using SEND/SEND command
- */
-#define Sn_TX_WR(N)        (_W5500_IO_BASE_ + (0x0024 << 8) + (WIZCHIP_SREG_BLOCK(N) << 3))
-
-/**
- * @ingroup Socket_register_group
- * @brief Received data size register(R)
- * @details @ref Sn_RX_RSR indicates the data size received and saved in Socket n RX Buffer.
- * @ref Sn_RX_RSR does not exceed the @ref Sn_RXBUF_SIZE and is calculated as the difference between
- * �Socket n RX Write Pointer (@ref Sn_RX_WR)and �Socket n RX Read Pointer (@ref Sn_RX_RD)
- */
-#define Sn_RX_RSR(N)       (_W5500_IO_BASE_ + (0x0026 << 8) + (WIZCHIP_SREG_BLOCK(N) << 3))
-
-/**
- * @ingroup Socket_register_group
- * @brief Read point of Receive memory(R/W)
- * @details @ref Sn_RX_RD is initialized by OPEN command. Make sure to be read or updated as follows.\n
- * 1. Read the starting save address of the received data.\n
- * 2. Read data from the starting address of Socket n RX Buffer.\n
- * 3. After reading the received data, Update @ref Sn_RX_RD to the increased value as many as the reading size.
- * If the increment value exceeds the maximum value 0xFFFF, that is, is greater than 0x10000 and the carry bit occurs,
- * update with the lower 16bits value ignored the carry bit.\n
- * 4. Order RECV command is for notifying the updated @ref Sn_RX_RD to W5500.
- */
-#define Sn_RX_RD(N)        (_W5500_IO_BASE_ + (0x0028 << 8) + (WIZCHIP_SREG_BLOCK(N) << 3))
-
-/**
- * @ingroup Socket_register_group
- * @brief Write point of Receive memory(R)
- * @details @ref Sn_RX_WR is initialized by OPEN command and it is auto-increased by the data reception.
- * If the increased value exceeds the maximum value 0xFFFF, (greater than 0x10000 and the carry bit occurs),
- * then the carry bit is ignored and will automatically update with the lower 16bits value.
- */
-#define Sn_RX_WR(N)        (_W5500_IO_BASE_ + (0x002A << 8) + (WIZCHIP_SREG_BLOCK(N) << 3))
-
-/**
- * @ingroup Socket_register_group
- * @brief socket interrupt mask register(R)
- * @details @ref Sn_IMR masks the interrupt of Socket n.
- * Each bit corresponds to each bit of @ref Sn_IR. When a Socket n Interrupt is occurred and the corresponding bit of @ref Sn_IMR is 
- * the corresponding bit of @ref Sn_IR becomes  When both the corresponding bit of @ref Sn_IMR and @ref Sn_IR are and the n-th bit of @ref IR is 
- * Host is interrupted by asserted INTn PIN to low.
- */
-#define Sn_IMR(N)          (_W5500_IO_BASE_ + (0x002C << 8) + (WIZCHIP_SREG_BLOCK(N) << 3))
-
-/**
- * @ingroup Socket_register_group
- * @brief Fragment field value in IP header register(R/W)
- * @details @ref Sn_FRAG configures the FRAG(Fragment field in IP header).
- */
-#define Sn_FRAG(N)         (_W5500_IO_BASE_ + (0x002D << 8) + (WIZCHIP_SREG_BLOCK(N) << 3))
-
-/**
- * @ingroup Socket_register_group
- * @brief Keep Alive Timer register(R/W)
- * @details @ref Sn_KPALVTR configures the transmitting timer of �KEEP ALIVE(KA)packet of SOCKETn. It is valid only in TCP mode,
- * and ignored in other modes. The time unit is 5s.
- * KA packet is transmittable after @ref Sn_SR is changed to SOCK_ESTABLISHED and after the data is transmitted or received to/from a peer at least once.
- * In case of '@ref Sn_KPALVTR > 0', W5500 automatically transmits KA packet after time-period for checking the TCP connection (Auto-keepalive-process).
- * In case of '@ref Sn_KPALVTR = 0', Auto-keep-alive-process will not operate,
- * and KA packet can be transmitted by SEND_KEEP command by the host (Manual-keep-alive-process).
- * Manual-keep-alive-process is ignored in case of '@ref Sn_KPALVTR > 0'.
- */
-#define Sn_KPALVTR(N)      (_W5500_IO_BASE_ + (0x002F << 8) + (WIZCHIP_SREG_BLOCK(N) << 3))
-
-//#define Sn_TSR(N)          (_W5500_IO_BASE_ + (0x0030 << 8) + (WIZCHIP_SREG_BLOCK(N) << 3))
-
-
-//----------------------------- W5500 Register values  -----------------------------
-
-/* MODE register values */
-/**
- * @brief Reset
- * @details If this bit is  All internal registers will be initialized. It will be automatically cleared as after S/W reset.
- */
-#define MR_RST                       0x80
-
-/**
- * @brief Wake on LAN
- * @details 0 : Disable WOL mode\n
- * 1 : Enable WOL mode\n
- * If WOL mode is enabled and the received magic packet over UDP has been normally processed, the Interrupt PIN (INTn) asserts to low.
- * When using WOL mode, the UDP Socket should be opened with any source port number. (Refer to Socket n Mode Register (@ref Sn_MR) for opening Socket.)
- * @note The magic packet over UDP supported by W5500 consists of 6 bytes synchronization stream (xFFFFFFFFFFFF and
- * 16 times Target MAC address stream in UDP payload. The options such like password are ignored. You can use any UDP source port number for WOL mode.
- */
-#define MR_WOL                       0x20
-
-/**
- * @brief Ping block
- * @details 0 : Disable Ping block\n
- * 1 : Enable Ping block\n
- * If the bit is  it blocks the response to a ping request.
- */
-#define MR_PB                        0x10
-
-/**
- * @brief Enable PPPoE
- * @details 0 : DisablePPPoE mode\n
- * 1 : EnablePPPoE mode\n
- * If you use ADSL, this bit should be 
- */
-#define MR_PPPOE                     0x08
-
-/**
- * @brief Enable UDP_FORCE_ARP CHECHK
- * @details 0 : Disable Force ARP mode\n
- * 1 : Enable Force ARP mode\n
- * In Force ARP mode, It forces on sending ARP Request whenever data is sent.
- */
-#define MR_FARP                      0x02
-
-/* IR register values */
-/**
- * @brief Check IP conflict.
- * @details Bit is set as when own source IP address is same with the sender IP address in the received ARP request.
- */
-#define IR_CONFLICT                  0x80
-
-/**
- * @brief Get the destination unreachable message in UDP sending.
- * @details When receiving the ICMP (Destination port unreachable) packet, this bit is set as 
- * When this bit is  Destination Information such as IP address and Port number may be checked with the corresponding @ref UIPR & @ref UPORTR.
- */
-#define IR_UNREACH                   0x40
-
-/**
- * @brief Get the PPPoE close message.
- * @details When PPPoE is disconnected during PPPoE mode, this bit is set.
- */
-#define IR_PPPoE                     0x20
-
-/**
- * @brief Get the magic packet interrupt.
- * @details When WOL mode is enabled and receives the magic packet over UDP, this bit is set.
- */
-#define IR_MP                        0x10
-
-
-/* PHYCFGR register value */
-#define PHYCFGR_RST                  ~(1<<7)  //< For PHY reset, must operate AND mask.
-#define PHYCFGR_OPMD                 (1<<6)   // Configre PHY with OPMDC value
-#define PHYCFGR_OPMDC_ALLA           (7<<3)
-#define PHYCFGR_OPMDC_PDOWN          (6<<3)
-#define PHYCFGR_OPMDC_NA             (5<<3)
-#define PHYCFGR_OPMDC_100FA          (4<<3)
-#define PHYCFGR_OPMDC_100F           (3<<3)
-#define PHYCFGR_OPMDC_100H           (2<<3)
-#define PHYCFGR_OPMDC_10F            (1<<3)
-#define PHYCFGR_OPMDC_10H            (0<<3)           
-#define PHYCFGR_DPX_FULL             (1<<2)
-#define PHYCFGR_DPX_HALF             (0<<2)
-#define PHYCFGR_SPD_100              (1<<1)
-#define PHYCFGR_SPD_10               (0<<1)
-#define PHYCFGR_LNK_ON               (1<<0)
-#define PHYCFGR_LNK_OFF              (0<<0)
-
-/* IMR register values */
-/**
- * @brief IP Conflict Interrupt Mask.
- * @details 0: Disable IP Conflict Interrupt\n
- * 1: Enable IP Conflict Interrupt
- */
-#define IM_IR7                  	 0x80
-
-/**
- * @brief Destination unreachable Interrupt Mask.
- * @details 0: Disable Destination unreachable Interrupt\n
- * 1: Enable Destination unreachable Interrupt
- */
-#define IM_IR6                  	 0x40
-
-/**
- * @brief PPPoE Close Interrupt Mask.
- * @details 0: Disable PPPoE Close Interrupt\n
- * 1: Enable PPPoE Close Interrupt
- */
-#define IM_IR5                  	 0x20
-
-/**
- * @brief Magic Packet Interrupt Mask.
- * @details 0: Disable Magic Packet Interrupt\n
- * 1: Enable Magic Packet Interrupt
- */
-#define IM_IR4                  	 0x10
-
-/* Sn_MR Default values */
-/**
- * @brief Support UDP Multicasting
- * @details 0 : disable Multicasting\n
- * 1 : enable Multicasting\n
- * This bit is applied only during UDP mode(P[3:0] = 010.\n
- * To use multicasting, @ref Sn_DIPR & @ref Sn_DPORT should be respectively configured with the multicast group IP address & port number
- * before Socket n is opened by OPEN command of @ref Sn_CR.
- */
-#define Sn_MR_MULTI                  0x80
-
-/**
- * @brief Broadcast block in UDP Multicasting.
- * @details 0 : disable Broadcast Blocking\n
- * 1 : enable Broadcast Blocking\n
- * This bit blocks to receive broadcasting packet during UDP mode(P[3:0] = 010.\m
- * In addition, This bit does when MACRAW mode(P[3:0] = 100
- */
-#define Sn_MR_BCASTB                 0x40
-
-/**
- * @brief No Delayed Ack(TCP), Multicast flag
- * @details 0 : Disable No Delayed ACK option\n
- * 1 : Enable No Delayed ACK option\n
- * This bit is applied only during TCP mode (P[3:0] = 001.\n
- * When this bit is  It sends the ACK packet without delay as soon as a Data packet is received from a peer.\n
- * When this bit is  It sends the ACK packet after waiting for the timeout time configured by @ref RTR.
- */
-#define Sn_MR_ND                     0x20
-
-/**
- * @brief Unicast Block in UDP Multicasting
- * @details 0 : disable Unicast Blocking\n
- * 1 : enable Unicast Blocking\n
- * This bit blocks receiving the unicast packet during UDP mode(P[3:0] = 010 and MULTI = 
- */
-#define Sn_MR_UCASTB                 0x10
-
-/**
- * @brief MAC LAYER RAW SOCK
- * @details This configures the protocol mode of Socket n.
- * @note MACRAW mode should be only used in Socket 0.
- */
-#define Sn_MR_MACRAW                 0x04
-
-//#define Sn_MR_IPRAW                  0x03     /**< IP LAYER RAW SOCK */
-
-/**
- * @brief UDP
- * @details This configures the protocol mode of Socket n.
- */
-#define Sn_MR_UDP                    0x02
-
-/**
- * @brief TCP
- * @details This configures the protocol mode of Socket n.
- */
-#define Sn_MR_TCP                    0x01
-
-/**
- * @brief Unused socket
- * @details This configures the protocol mode of Socket n.
- */
-#define Sn_MR_CLOSE                  0x00
-
-/* Sn_MR values used with Sn_MR_MACRAW */
-/**
- * @brief MAC filter enable in @ref Sn_MR_MACRAW mode
- * @details 0 : disable MAC Filtering\n
- * 1 : enable MAC Filtering\n
- * This bit is applied only during MACRAW mode(P[3:0] = 100.\n
- * When set as  W5500 can only receive broadcasting packet or packet sent to itself.
- * When this bit is  W5500 can receive all packets on Ethernet.
- * If user wants to implement Hybrid TCP/IP stack,
- * it is recommended that this bit is set as for reducing host overhead to process the all received packets.
- */
-#define Sn_MR_MFEN                   Sn_MR_MULTI
-
-/**
- * @brief Multicast Blocking in @ref Sn_MR_MACRAW mode
- * @details 0 : using IGMP version 2\n
- * 1 : using IGMP version 1\n
- * This bit is applied only during UDP mode(P[3:0] = 010 and MULTI = 
- * It configures the version for IGMP messages (Join/Leave/Report).
- */
-#define Sn_MR_MMB                    Sn_MR_ND
-
-/**
- * @brief IPv6 packet Blocking in @ref Sn_MR_MACRAW mode
- * @details 0 : disable IPv6 Blocking\n
- * 1 : enable IPv6 Blocking\n
- * This bit is applied only during MACRAW mode (P[3:0] = 100. It blocks to receiving the IPv6 packet.
- */
-#define Sn_MR_MIP6B                  Sn_MR_UCASTB
-
-/* Sn_MR value used with Sn_MR_UDP & Sn_MR_MULTI */
-/**
- * @brief IGMP version used in UDP mulitcasting
- * @details 0 : disable Multicast Blocking\n
- * 1 : enable Multicast Blocking\n
- * This bit is applied only when MACRAW mode(P[3:0] = 100. It blocks to receive the packet with multicast MAC address.
- */
-#define Sn_MR_MC                     Sn_MR_ND
-
-/* Sn_MR alternate values */
-/**
- * @brief For Berkeley Socket API
- */
-#define SOCK_STREAM                  Sn_MR_TCP
-
-/**
- * @brief For Berkeley Socket API
- */
-#define SOCK_DGRAM                   Sn_MR_UDP
-
-
-/* Sn_CR values */
-/**
- * @brief Initialize or open socket
- * @details Socket n is initialized and opened according to the protocol selected in Sn_MR(P3:P0).
- * The table below shows the value of @ref Sn_SR corresponding to @ref Sn_MR.\n
- * <table>
- *   <tr>  <td>\b Sn_MR (P[3:0])</td> <td>\b Sn_SR</td>            		 </tr>
- *   <tr>  <td>Sn_MR_CLOSE  (000</td> <td></td>         	   		 </tr>
- *   <tr>  <td>Sn_MR_TCP  (001</td> <td>SOCK_INIT (0x13)</td>  		 </tr>
- *   <tr>  <td>Sn_MR_UDP  (010</td>  <td>SOCK_UDP (0x22)</td>  		 </tr>
- *   <tr>  <td>S0_MR_MACRAW  (100</td>  <td>SOCK_MACRAW (0x02)</td>  </tr>
- * </table>
- */
-#define Sn_CR_OPEN                   0x01
-
-/**
- * @brief Wait connection request in TCP mode(Server mode)
- * @details This is valid only in TCP mode (Sn_MR(P3:P0) = Sn_MR_TCP).
- * In this mode, Socket n operates as a �TCP serverand waits for  connection-request (SYN packet) from any �TCP client
- * The @ref Sn_SR changes the state from SOCK_INIT to SOCKET_LISTEN.
- * When a �TCP clientconnection request is successfully established,
- * the @ref Sn_SR changes from SOCK_LISTEN to SOCK_ESTABLISHED and the Sn_IR(0) becomes 
- * But when a �TCP clientconnection request is failed, Sn_IR(3) becomes and the status of @ref Sn_SR changes to SOCK_CLOSED.
- */
-#define Sn_CR_LISTEN                 0x02
-
-/**
- * @brief Send connection request in TCP mode(Client mode)
- * @details  To connect, a connect-request (SYN packet) is sent to b>TCP server</b>configured by @ref Sn_DIPR & Sn_DPORT(destination address & port).
- * If the connect-request is successful, the @ref Sn_SR is changed to @ref SOCK_ESTABLISHED and the Sn_IR(0) becomes \n\n
- * The connect-request fails in the following three cases.\n
- * 1. When a @b ARPTO occurs (@ref Sn_IR[3] =  ) because destination hardware address is not acquired through the ARP-process.\n
- * 2. When a @b SYN/ACK packet is not received and @b TCPTO (Sn_IR(3) =  )\n
- * 3. When a @b RST packet is received instead of a @b SYN/ACK packet. In these cases, @ref Sn_SR is changed to @ref SOCK_CLOSED.
- * @note This is valid only in TCP mode and operates when Socket n acts as b>TCP client</b>
- */
-#define Sn_CR_CONNECT                0x04
-
-/**
- * @brief Send closing request in TCP mode
- * @details Regardless of b>TCP server</b>or b>TCP client</b> the DISCON command processes the disconnect-process (b>Active close</b>or b>Passive close</b>.\n
- * @par Active close
- * it transmits disconnect-request(FIN packet) to the connected peer\n
- * @par Passive close
- * When FIN packet is received from peer, a FIN packet is replied back to the peer.\n
- * @details When the disconnect-process is successful (that is, FIN/ACK packet is received successfully), @ref Sn_SR is changed to @ref SOCK_CLOSED.\n
- * Otherwise, TCPTO occurs (Sn_IR(3)=)= and then @ref Sn_SR is changed to @ref SOCK_CLOSED.
- * @note Valid only in TCP mode.
- */
-#define Sn_CR_DISCON                 0x08
-
-/**
- * @brief Close socket
- * @details Sn_SR is changed to @ref SOCK_CLOSED.
- */
-#define Sn_CR_CLOSE                  0x10
-
-/**
- * @brief Update TX buffer pointer and send data
- * @details SEND transmits all the data in the Socket n TX buffer.\n
- * For more details, please refer to Socket n TX Free Size Register (@ref Sn_TX_FSR), Socket n,
- * TX Write Pointer Register(@ref Sn_TX_WR), and Socket n TX Read Pointer Register(@ref Sn_TX_RD).
- */
-#define Sn_CR_SEND                   0x20
-
-/**
- * @brief Send data with MAC address, so without ARP process
- * @details The basic operation is same as SEND.\n
- * Normally SEND transmits data after destination hardware address is acquired by the automatic ARP-process(Address Resolution Protocol).\n
- * But SEND_MAC transmits data without the automatic ARP-process.\n
- * In this case, the destination hardware address is acquired from @ref Sn_DHAR configured by host, instead of APR-process.
- * @note Valid only in UDP mode.
- */
-#define Sn_CR_SEND_MAC               0x21
-
-/**
- * @brief Send keep alive message
- * @details It checks the connection status by sending 1byte keep-alive packet.\n
- * If the peer can not respond to the keep-alive packet during timeout time, the connection is terminated and the timeout interrupt will occur.
- * @note Valid only in TCP mode.
- */
-#define Sn_CR_SEND_KEEP              0x22
-
-/**
- * @brief Update RX buffer pointer and receive data
- * @details RECV completes the processing of the received data in Socket n RX Buffer by using a RX read pointer register (@ref Sn_RX_RD).\n
- * For more details, refer to Socket n RX Received Size Register (@ref Sn_RX_RSR), Socket n RX Write Pointer Register (@ref Sn_RX_WR),
- * and Socket n RX Read Pointer Register (@ref Sn_RX_RD).
- */
-#define Sn_CR_RECV                   0x40
-
-/* Sn_IR values */
-/**
- * @brief SEND_OK Interrupt
- * @details This is issued when SEND command is completed.
- */
-#define Sn_IR_SENDOK                 0x10
-
-/**
- * @brief TIMEOUT Interrupt
- * @details This is issued when ARPTO or TCPTO occurs.
- */
-#define Sn_IR_TIMEOUT                0x08
-
-/**
- * @brief RECV Interrupt
- * @details This is issued whenever data is received from a peer.
- */
-#define Sn_IR_RECV                   0x04
-
-/**
- * @brief DISCON Interrupt
- * @details This is issued when FIN or FIN/ACK packet is received from a peer.
- */
-#define Sn_IR_DISCON                 0x02
-
-/**
- * @brief CON Interrupt
- * @details This is issued one time when the connection with peer is successful and then @ref Sn_SR is changed to @ref SOCK_ESTABLISHED.
- */
-#define Sn_IR_CON                    0x01
-
-/* Sn_SR values */
-/**
- * @brief Closed
- * @details This indicates that Socket n is released.\N
- * When DICON, CLOSE command is ordered, or when a timeout occurs, it is changed to @ref SOCK_CLOSED regardless of previous status.
- */
-#define SOCK_CLOSED                  0x00
-
-/**
- * @brief Initiate state
- * @details This indicates Socket n is opened with TCP mode.\N
- * It is changed to @ref SOCK_INIT when Sn_MR(P[3:0]) = 001and OPEN command is ordered.\N
- * After @ref SOCK_INIT, user can use LISTEN /CONNECT command.
- */
-#define SOCK_INIT                    0x13
-
-/**
- * @brief Listen state
- * @details This indicates Socket n is operating as b>TCP server</b>mode and waiting for connection-request (SYN packet) from a peer (b>TCP client</b>.\n
- * It will change to @ref SOCK_ESTALBLISHED when the connection-request is successfully accepted.\n
- * Otherwise it will change to @ref SOCK_CLOSED after TCPTO occurred (Sn_IR(TIMEOUT) = .
- */
-#define SOCK_LISTEN                  0x14
-
-/**
- * @brief Connection state
- * @details This indicates Socket n sent the connect-request packet (SYN packet) to a peer.\n
- * It is temporarily shown when @ref Sn_SR is changed from @ref SOCK_INIT to @ref SOCK_ESTABLISHED by CONNECT command.\n
- * If connect-accept(SYN/ACK packet) is received from the peer at SOCK_SYNSENT, it changes to @ref SOCK_ESTABLISHED.\n
- * Otherwise, it changes to @ref SOCK_CLOSED after TCPTO (@ref Sn_IR[TIMEOUT] =  is occurred.
- */
-#define SOCK_SYNSENT                 0x15
-
-/**
- * @brief Connection state
- * @details It indicates Socket n successfully received the connect-request packet (SYN packet) from a peer.\n
- * If socket n sends the response (SYN/ACK  packet) to the peer successfully,  it changes to @ref SOCK_ESTABLISHED. \n
- * If not, it changes to @ref SOCK_CLOSED after timeout occurs (@ref Sn_IR[TIMEOUT] = .
- */
-#define SOCK_SYNRECV                 0x16
-
-/**
- * @brief Success to connect
- * @details This indicates the status of the connection of Socket n.\n
- * It changes to @ref SOCK_ESTABLISHED when the b>TCP SERVER</b>processed the SYN packet from the b>TCP CLIENT</b>during @ref SOCK_LISTEN, or
- * when the CONNECT command is successful.\n
- * During @ref SOCK_ESTABLISHED, DATA packet can be transferred using SEND or RECV command.
- */
-#define SOCK_ESTABLISHED             0x17
-
-/**
- * @brief Closing state
- * @details These indicate Socket n is closing.\n
- * These are shown in disconnect-process such as active-close and passive-close.\n
- * When Disconnect-process is successfully completed, or when timeout occurs, these change to @ref SOCK_CLOSED.
- */
-#define SOCK_FIN_WAIT                0x18
-
-/**
- * @brief Closing state
- * @details These indicate Socket n is closing.\n
- * These are shown in disconnect-process such as active-close and passive-close.\n
- * When Disconnect-process is successfully completed, or when timeout occurs, these change to @ref SOCK_CLOSED.
- */
-#define SOCK_CLOSING                 0x1A
-
-/**
- * @brief Closing state
- * @details These indicate Socket n is closing.\n
- * These are shown in disconnect-process such as active-close and passive-close.\n
- * When Disconnect-process is successfully completed, or when timeout occurs, these change to @ref SOCK_CLOSED.
- */
-#define SOCK_TIME_WAIT               0x1B
-
-/**
- * @brief Closing state
- * @details This indicates Socket n received the disconnect-request (FIN packet) from the connected peer.\n
- * This is half-closing status, and data can be transferred.\n
- * For full-closing, DISCON command is used. But For just-closing, CLOSE command is used.
- */
-#define SOCK_CLOSE_WAIT              0x1C
-
-/**
- * @brief Closing state
- * @details This indicates Socket n is waiting for the response (FIN/ACK packet) to the disconnect-request (FIN packet) by passive-close.\n
- * It changes to @ref SOCK_CLOSED when Socket n received the response successfully, or when timeout occurs  (@ref Sn_IR[TIMEOUT] = .
- */
-#define SOCK_LAST_ACK                0x1D
-
-/**
- * @brief UDP socket
- * @details This indicates Socket n is opened in UDP mode(Sn_MR(P[3:0]) = 010.\n
- * It changes to SOCK_UPD when Sn_MR(P[3:0]) = 010 and OPEN command is ordered.\n
- * Unlike TCP mode, data can be transfered without the connection-process.
- */
-#define SOCK_UDP                     0x22
-
-//#define SOCK_IPRAW                   0x32     /**< IP raw mode socket */
-
-/**
- * @brief MAC raw mode socket
- * @details This indicates Socket 0 is opened in MACRAW mode (S0_MR(P[3:0]) = 100and is valid only in Socket 0.\n
- * It changes to SOCK_MACRAW when S0_MR(P[3:0] = 100and OPEN command is ordered.\n
- * Like UDP mode socket, MACRAW mode Socket 0 can transfer a MAC packet (Ethernet frame) without the connection-process.
- */
-#define SOCK_MACRAW                  0x42
-
-//#define SOCK_PPPOE                   0x5F
-
-/* IP PROTOCOL */
-#define IPPROTO_IP                   0        //< Dummy for IP 
-#define IPPROTO_ICMP                 1        //< Control message protocol
-#define IPPROTO_IGMP                 2        //< Internet group management protocol
-#define IPPROTO_GGP                  3        //< Gateway^2 (deprecated)
-#define IPPROTO_TCP                  6        //< TCP
-#define IPPROTO_PUP                  12       //< PUP
-#define IPPROTO_UDP                  17       //< UDP
-#define IPPROTO_IDP                  22       //< XNS idp
-#define IPPROTO_ND                   77       //< UNOFFICIAL net disk protocol
-#define IPPROTO_RAW                  255      //< Raw IP packet
-
-
-/**
- * @brief Enter a critical section
- *
- * @details It is provided to protect your shared code which are executed without distribution. \n \n
- *
- * In non-OS environment, It can be just implemented by disabling whole interrupt.\n
- * In OS environment, You can replace it to critical section api supported by OS.
- *
- * \sa WIZCHIP_READ(), WIZCHIP_WRITE(), WIZCHIP_READ_BUF(), WIZCHIP_WRITE_BUF()
- * \sa WIZCHIP_CRITICAL_EXIT()
- */
-#define WIZCHIP_CRITICAL_ENTER()    WIZCHIP.CRIS._enter()
-
-/**
- * @brief Exit a critical section
- *
- * @details It is provided to protect your shared code which are executed without distribution. \n\n
- *
- * In non-OS environment, It can be just implemented by disabling whole interrupt. \n
- * In OS environment, You can replace it to critical section api supported by OS.
- *
- * @sa WIZCHIP_READ(), WIZCHIP_WRITE(), WIZCHIP_READ_BUF(), WIZCHIP_WRITE_BUF()
- * @sa WIZCHIP_CRITICAL_ENTER()
- */
-#ifdef _exit
-#undef _exit
-#endif
-#define WIZCHIP_CRITICAL_EXIT()     WIZCHIP.CRIS._exit()
-
-
-
-////////////////////////
-// Basic I/O Function //
-////////////////////////
-
-/**
- * @ingroup Basic_IO_function
- * @brief It reads 1 byte value from a register.
- * @param AddrSel Register address
- * @return The value of register
- */
-uint8_t  WIZCHIP_READ (uint32_t AddrSel);
-
-/**
- * @ingroup Basic_IO_function
- * @brief It writes 1 byte value to a register.
- * @param AddrSel Register address
- * @param wb Write data
- * @return void
- */
-void     WIZCHIP_WRITE(uint32_t AddrSel, uint8_t wb );
-
-/**
- * @ingroup Basic_IO_function
- * @brief It reads sequence data from registers.
- * @param AddrSel Register address
- * @param pBuf Pointer buffer to read data
- * @param len Data length
- */
-void     WIZCHIP_READ_BUF (uint32_t AddrSel, uint8_t* pBuf, uint16_t len);
-
-/**
- * @ingroup Basic_IO_function
- * @brief It writes sequence data to registers.
- * @param AddrSel Register address
- * @param pBuf Pointer buffer to write data
- * @param len Data length
- */
-void     WIZCHIP_WRITE_BUF(uint32_t AddrSel, uint8_t* pBuf, uint16_t len);
-
-/////////////////////////////////
-// Common Register I/O function //
-/////////////////////////////////
-/**
- * @ingroup Common_register_access_function
- * @brief Set Mode Register
- * @param (uint8_t)mr The value to be set.
- * @sa getMR()
- */
-#define setMR(mr) \
-	WIZCHIP_WRITE(MR,mr)
-
-
-/**
- * @ingroup Common_register_access_function
- * @brief Get Mode Register
- * @return uint8_t. The value of Mode register.
- * @sa setMR()
- */
-#define getMR() \
-		WIZCHIP_READ(MR)
-
-/**
- * @ingroup Common_register_access_function
- * @brief Set gateway IP address
- * @param (uint8_t*)gar Pointer variable to set gateway IP address. It should be allocated 4 bytes.
- * @sa getGAR()
- */
-#define setGAR(gar) \
-		WIZCHIP_WRITE_BUF(GAR,gar,4)
-
-/**
- * @ingroup Common_register_access_function
- * @brief Get gateway IP address
- * @param (uint8_t*)gar Pointer variable to get gateway IP address. It should be allocated 4 bytes.
- * @sa setGAR()
- */
-#define getGAR(gar) \
-		WIZCHIP_READ_BUF(GAR,gar,4)
-
-/**
- * @ingroup Common_register_access_function
- * @brief Set subnet mask address
- * @param (uint8_t*)subr Pointer variable to set subnet mask address. It should be allocated 4 bytes.
- * @sa getSUBR()
- */
-#define setSUBR(subr) \
-		WIZCHIP_WRITE_BUF(SUBR, subr,4)
-
-
-/**
- * @ingroup Common_register_access_function
- * @brief Get subnet mask address
- * @param (uint8_t*)subr Pointer variable to get subnet mask address. It should be allocated 4 bytes.
- * @sa setSUBR()
- */
-#define getSUBR(subr) \
-		WIZCHIP_READ_BUF(SUBR, subr, 4)
-
-/**
- * @ingroup Common_register_access_function
- * @brief Set local MAC address
- * @param (uint8_t*)shar Pointer variable to set local MAC address. It should be allocated 6 bytes.
- * @sa getSHAR()
- */
-#define setSHAR(shar) \
-		WIZCHIP_WRITE_BUF(SHAR, shar, 6)
-
-/**
- * @ingroup Common_register_access_function
- * @brief Get local MAC address
- * @param (uint8_t*)shar Pointer variable to get local MAC address. It should be allocated 6 bytes.
- * @sa setSHAR()
- */
-#define getSHAR(shar) \
-		WIZCHIP_READ_BUF(SHAR, shar, 6)
-
-/**
- * @ingroup Common_register_access_function
- * @brief Set local IP address
- * @param (uint8_t*)sipr Pointer variable to set local IP address. It should be allocated 4 bytes.
- * @sa getSIPR()
- */
-#define setSIPR(sipr) \
-		WIZCHIP_WRITE_BUF(SIPR, sipr, 4)
-
-/**
- * @ingroup Common_register_access_function
- * @brief Get local IP address
- * @param (uint8_t*)sipr Pointer variable to get local IP address. It should be allocated 4 bytes.
- * @sa setSIPR()
- */
-#define getSIPR(sipr) \
-		WIZCHIP_READ_BUF(SIPR, sipr, 4)
-
-/**
- * @ingroup Common_register_access_function
- * @brief Set INTLEVEL register
- * @param (uint16_t)intlevel Value to set @ref INTLEVEL register.
- * @sa getINTLEVEL()
- */
-#define setINTLEVEL(intlevel)  {\
-		WIZCHIP_WRITE(INTLEVEL,   (uint8_t)(intlevel >> 8)); \
-		WIZCHIP_WRITE(WIZCHIP_OFFSET_INC(INTLEVEL,1), (uint8_t) intlevel); \
-	}
-
-
-/**
- * @ingroup Common_register_access_function
- * @brief Get INTLEVEL register
- * @return uint16_t. Value of @ref INTLEVEL register.
- * @sa setINTLEVEL()
- */
-#define getINTLEVEL() \
-		((WIZCHIP_READ(INTLEVEL) << 8) + WIZCHIP_READ(WIZCHIP_OFFSET_INC(INTLEVEL,1)))
-
-/**
- * @ingroup Common_register_access_function
- * @brief Set @ref IR register
- * @param (uint8_t)ir Value to set @ref IR register.
- * @sa getIR()
- */
-#define setIR(ir) \
-		WIZCHIP_WRITE(IR, (ir & 0xF0))
-
-/**
- * @ingroup Common_register_access_function
- * @brief Get @ref IR register
- * @return uint8_t. Value of @ref IR register.
- * @sa setIR()
- */
-#define getIR() \
-		(WIZCHIP_READ(IR) & 0xF0)
-/**
- * @ingroup Common_register_access_function
- * @brief Set @ref IMR register
- * @param (uint8_t)imr Value to set @ref IMR register.
- * @sa getIMR()
- */
-#define setIMR(imr) \
-		WIZCHIP_WRITE(IMR, imr)
-
-/**
- * @ingroup Common_register_access_function
- * @brief Get @ref IMR register
- * @return uint8_t. Value of @ref IMR register.
- * @sa setIMR()
- */
-#define getIMR() \
-		WIZCHIP_READ(IMR)
-
-
-/**
- * @ingroup Common_register_access_function
- * @brief Set @ref SIR register
- * @param (uint8_t)sir Value to set @ref SIR register.
- * @sa getSIR()
- */
-#define setSIR(sir) \
-		WIZCHIP_WRITE(SIR, sir)
-
-/**
- * @ingroup Common_register_access_function
- * @brief Get @ref SIR register
- * @return uint8_t. Value of @ref SIR register.
- * @sa setSIR()
- */
-#define getSIR() \
-		WIZCHIP_READ(SIR)
-/**
- * @ingroup Common_register_access_function
- * @brief Set @ref SIMR register
- * @param (uint8_t)simr Value to set @ref SIMR register.
- * @sa getSIMR()
- */
-#define setSIMR(simr) \
-		WIZCHIP_WRITE(SIMR, simr)
-
-/**
- * @ingroup Common_register_access_function
- * @brief Get @ref SIMR register
- * @return uint8_t. Value of @ref SIMR register.
- * @sa setSIMR()
- */
-#define getSIMR() \
-		WIZCHIP_READ(SIMR)
-
-/**
- * @ingroup Common_register_access_function
- * @brief Set @ref RTR register
- * @param (uint16_t)rtr Value to set @ref RTR register.
- * @sa getRTR()
- */
-#define setRTR(rtr)   {\
-		WIZCHIP_WRITE(RTR,   (uint8_t)(rtr >> 8)); \
-		WIZCHIP_WRITE(WIZCHIP_OFFSET_INC(RTR,1), (uint8_t) rtr); \
-	}
-
-/**
- * @ingroup Common_register_access_function
- * @brief Get @ref RTR register
- * @return uint16_t. Value of @ref RTR register.
- * @sa setRTR()
- */
-#define getRTR() \
-		((WIZCHIP_READ(RTR) << 8) + WIZCHIP_READ(WIZCHIP_OFFSET_INC(RTR,1)))
-
-/**
- * @ingroup Common_register_access_function
- * @brief Set @ref RCR register
- * @param (uint8_t)rcr Value to set @ref RCR register.
- * @sa getRCR()
- */
-#define setRCR(rcr) \
-		WIZCHIP_WRITE(RCR, rcr)
-
-/**
- * @ingroup Common_register_access_function
- * @brief Get @ref RCR register
- * @return uint8_t. Value of @ref RCR register.
- * @sa setRCR()
- */
-#define getRCR() \
-		WIZCHIP_READ(RCR)
-
-//================================================== test done ===========================================================
-
-/**
- * @ingroup Common_register_access_function
- * @brief Set @ref PTIMER register
- * @param (uint8_t)ptimer Value to set @ref PTIMER register.
- * @sa getPTIMER()
- */
-#define setPTIMER(ptimer) \
-		WIZCHIP_WRITE(PTIMER, ptimer)
-
-/**
- * @ingroup Common_register_access_function
- * @brief Get @ref PTIMER register
- * @return uint8_t. Value of @ref PTIMER register.
- * @sa setPTIMER()
- */
-#define getPTIMER() \
-		WIZCHIP_READ(PTIMER)
-
-/**
- * @ingroup Common_register_access_function
- * @brief Set @ref PMAGIC register
- * @param (uint8_t)pmagic Value to set @ref PMAGIC register.
- * @sa getPMAGIC()
- */
-#define setPMAGIC(pmagic) \
-		WIZCHIP_WRITE(PMAGIC, pmagic)
-
-/**
- * @ingroup Common_register_access_function
- * @brief Get @ref PMAGIC register
- * @return uint8_t. Value of @ref PMAGIC register.
- * @sa setPMAGIC()
- */
-#define getPMAGIC() \
-		WIZCHIP_READ(PMAGIC)
-
-/**
- * @ingroup Common_register_access_function
- * @brief Set PHAR address
- * @param (uint8_t*)phar Pointer variable to set PPP destination MAC register address. It should be allocated 6 bytes.
- * @sa getPHAR()
- */
-#define setPHAR(phar) \
-		WIZCHIP_WRITE_BUF(PHAR, phar, 6)
-
-/**
- * @ingroup Common_register_access_function
- * @brief Get local IP address
- * @param (uint8_t*)phar Pointer variable to PPP destination MAC register address. It should be allocated 6 bytes.
- * @sa setPHAR()
- */
-#define getPHAR(phar) \
-		WIZCHIP_READ_BUF(PHAR, phar, 6)
-
-/**
- * @ingroup Common_register_access_function
- * @brief Set @ref PSID register
- * @param (uint16_t)psid Value to set @ref PSID register.
- * @sa getPSID()
- */
-#define setPSID(psid)  {\
-		WIZCHIP_WRITE(PSID,   (uint8_t)(psid >> 8)); \
-		WIZCHIP_WRITE(WIZCHIP_OFFSET_INC(PSID,1), (uint8_t) psid); \
-	}
-
-/**
- * @ingroup Common_register_access_function
- * @brief Get @ref PSID register
- * @return uint16_t. Value of @ref PSID register.
- * @sa setPSID()
- */
-//uint16_t getPSID(void);
-#define getPSID() \
-		((WIZCHIP_READ(PSID) << 8) + WIZCHIP_READ(WIZCHIP_OFFSET_INC(PSID,1)))
-
-/**
- * @ingroup Common_register_access_function
- * @brief Set @ref PMRU register
- * @param (uint16_t)pmru Value to set @ref PMRU register.
- * @sa getPMRU()
- */
-#define setPMRU(pmru) { \
-		WIZCHIP_WRITE(PMRU,   (uint8_t)(pmru>>8)); \
-		WIZCHIP_WRITE(WIZCHIP_OFFSET_INC(PMRU,1), (uint8_t) pmru); \
-	}
-
-/**
- * @ingroup Common_register_access_function
- * @brief Get @ref PMRU register
- * @return uint16_t. Value of @ref PMRU register.
- * @sa setPMRU()
- */
-#define getPMRU() \
-		((WIZCHIP_READ(PMRU) << 8) + WIZCHIP_READ(WIZCHIP_OFFSET_INC(PMRU,1)))
-
-/**
- * @ingroup Common_register_access_function
- * @brief Get unreachable IP address
- * @param (uint8_t*)uipr Pointer variable to get unreachable IP address. It should be allocated 4 bytes.
- */
-#define getUIPR(uipr) \
-		WIZCHIP_READ_BUF(UIPR,uipr,6)
-
-/**
- * @ingroup Common_register_access_function
- * @brief Get @ref UPORTR register
- * @return uint16_t. Value of @ref UPORTR register.
- */
-#define getUPORTR() \
-	((WIZCHIP_READ(UPORTR) << 8) + WIZCHIP_READ(WIZCHIP_OFFSET_INC(UPORTR,1)))
-
-/**
- * @ingroup Common_register_access_function
- * @brief Set @ref PHYCFGR register
- * @param (uint8_t)phycfgr Value to set @ref PHYCFGR register.
- * @sa getPHYCFGR()
- */
-#define setPHYCFGR(phycfgr) \
-		WIZCHIP_WRITE(PHYCFGR, phycfgr)
-
-/**
- * @ingroup Common_register_access_function
- * @brief Get @ref PHYCFGR register
- * @return uint8_t. Value of @ref PHYCFGR register.
- * @sa setPHYCFGR()
- */
-#define getPHYCFGR() \
-		WIZCHIP_READ(PHYCFGR)
-
-/**
- * @ingroup Common_register_access_function
- * @brief Get @ref VERSIONR register
- * @return uint8_t. Value of @ref VERSIONR register.
- */
-#define getVERSIONR() \
-		WIZCHIP_READ(VERSIONR)
-
-/////////////////////////////////////
-
-///////////////////////////////////
-// Socket N register I/O function //
-///////////////////////////////////
-/**
- * @ingroup Socket_register_access_function
- * @brief Set @ref Sn_MR register
- * @param (uint8_t)sn Socket number. It should be <b>0 ~ 7</b>.
- * @param (uint8_t)mr Value to set @ref Sn_MR
- * @sa getSn_MR()
- */
-#define setSn_MR(sn, mr) \
-		WIZCHIP_WRITE(Sn_MR(sn),mr)
-
-/**
- * @ingroup Socket_register_access_function
- * @brief Get @ref Sn_MR register
- * @param (uint8_t)sn Socket number. It should be <b>0 ~ 7</b>.
- * @return uint8_t. Value of @ref Sn_MR.
- * @sa setSn_MR()
- */
-#define getSn_MR(sn) \
-	WIZCHIP_READ(Sn_MR(sn))
-
-/**
- * @ingroup Socket_register_access_function
- * @brief Set @ref Sn_CR register
- * @param (uint8_t)sn Socket number. It should be <b>0 ~ 7</b>.
- * @param (uint8_t)cr Value to set @ref Sn_CR
- * @sa getSn_CR()
- */
-#define setSn_CR(sn, cr) \
-		WIZCHIP_WRITE(Sn_CR(sn), cr)
-
-/**
- * @ingroup Socket_register_access_function
- * @brief Get @ref Sn_CR register
- * @param (uint8_t)sn Socket number. It should be <b>0 ~ 7</b>.
- * @return uint8_t. Value of @ref Sn_CR.
- * @sa setSn_CR()
- */
-#define getSn_CR(sn) \
-		WIZCHIP_READ(Sn_CR(sn))
-
-/**
- * @ingroup Socket_register_access_function
- * @brief Set @ref Sn_IR register
- * @param (uint8_t)sn Socket number. It should be <b>0 ~ 7</b>.
- * @param (uint8_t)ir Value to set @ref Sn_IR
- * @sa getSn_IR()
- */
-#define setSn_IR(sn, ir) \
-		WIZCHIP_WRITE(Sn_IR(sn), (ir & 0x1F))
-
-/**
- * @ingroup Socket_register_access_function
- * @brief Get @ref Sn_IR register
- * @param (uint8_t)sn Socket number. It should be <b>0 ~ 7</b>.
- * @return uint8_t. Value of @ref Sn_IR.
- * @sa setSn_IR()
- */
-#define getSn_IR(sn) \
-		(WIZCHIP_READ(Sn_IR(sn)) & 0x1F)
-
-/**
- * @ingroup Socket_register_access_function
- * @brief Set @ref Sn_IMR register
- * @param (uint8_t)sn Socket number. It should be <b>0 ~ 7</b>.
- * @param (uint8_t)imr Value to set @ref Sn_IMR
- * @sa getSn_IMR()
- */
-#define setSn_IMR(sn, imr) \
-		WIZCHIP_WRITE(Sn_IMR(sn), (imr & 0x1F))
-
-/**
- * @ingroup Socket_register_access_function
- * @brief Get @ref Sn_IMR register
- * @param (uint8_t)sn Socket number. It should be <b>0 ~ 7</b>.
- * @return uint8_t. Value of @ref Sn_IMR.
- * @sa setSn_IMR()
- */
-#define getSn_IMR(sn) \
-		(WIZCHIP_READ(Sn_IMR(sn)) & 0x1F)
-
-/**
- * @ingroup Socket_register_access_function
- * @brief Get @ref Sn_SR register
- * @param (uint8_t)sn Socket number. It should be <b>0 ~ 7</b>.
- * @return uint8_t. Value of @ref Sn_SR.
- */
-#define getSn_SR(sn) \
-		WIZCHIP_READ(Sn_SR(sn))
-
-/**
- * @ingroup Socket_register_access_function
- * @brief Set @ref Sn_PORT register
- * @param (uint8_t)sn Socket number. It should be <b>0 ~ 7</b>.
- * @param (uint16_t)port Value to set @ref Sn_PORT.
- * @sa getSn_PORT()
- */
-#define setSn_PORT(sn, port)  { \
-		WIZCHIP_WRITE(Sn_PORT(sn),   (uint8_t)(port >> 8)); \
-		WIZCHIP_WRITE(WIZCHIP_OFFSET_INC(Sn_PORT(sn),1), (uint8_t) port); \
-	}
-
-/**
- * @ingroup Socket_register_access_function
- * @brief Get @ref Sn_PORT register
- * @param (uint8_t)sn Socket number. It should be <b>0 ~ 7</b>.
- * @return uint16_t. Value of @ref Sn_PORT.
- * @sa setSn_PORT()
- */
-#define getSn_PORT(sn) \
-		((WIZCHIP_READ(Sn_PORT(sn)) << 8) + WIZCHIP_READ(WIZCHIP_OFFSET_INC(Sn_PORT(sn),1)))
-
-/**
- * @ingroup Socket_register_access_function
- * @brief Set @ref Sn_DHAR register
- * @param (uint8_t)sn Socket number. It should be <b>0 ~ 7</b>.
- * @param (uint8_t*)dhar Pointer variable to set socket n destination hardware address. It should be allocated 6 bytes.
- * @sa getSn_DHAR()
- */
-#define setSn_DHAR(sn, dhar) \
-		WIZCHIP_WRITE_BUF(Sn_DHAR(sn), dhar, 6)
-
-/**
- * @ingroup Socket_register_access_function
- * @brief Get @ref Sn_MR register
- * @param (uint8_t)sn Socket number. It should be <b>0 ~ 7</b>.
- * @param (uint8_t*)dhar Pointer variable to get socket n destination hardware address. It should be allocated 6 bytes.
- * @sa setSn_DHAR()
- */
-#define getSn_DHAR(sn, dhar) \
-		WIZCHIP_READ_BUF(Sn_DHAR(sn), dhar, 6)
-
-/**
- * @ingroup Socket_register_access_function
- * @brief Set @ref Sn_DIPR register
- * @param (uint8_t)sn Socket number. It should be <b>0 ~ 7</b>.
- * @param (uint8_t*)dipr Pointer variable to set socket n destination IP address. It should be allocated 4 bytes.
- * @sa getSn_DIPR()
- */
-#define setSn_DIPR(sn, dipr) \
-		WIZCHIP_WRITE_BUF(Sn_DIPR(sn), dipr, 4)
-
-/**
- * @ingroup Socket_register_access_function
- * @brief Get @ref Sn_DIPR register
- * @param (uint8_t)sn Socket number. It should be <b>0 ~ 7</b>.
- * @param (uint8_t*)dipr Pointer variable to get socket n destination IP address. It should be allocated 4 bytes.
- * @sa SetSn_DIPR()
- */
-#define getSn_DIPR(sn, dipr) \
-		WIZCHIP_READ_BUF(Sn_DIPR(sn), dipr, 4)
-
-/**
- * @ingroup Socket_register_access_function
- * @brief Set @ref Sn_DPORT register
- * @param (uint8_t)sn Socket number. It should be <b>0 ~ 7</b>.
- * @param (uint16_t)dport Value to set @ref Sn_DPORT
- * @sa getSn_DPORT()
- */
-#define setSn_DPORT(sn, dport) { \
-		WIZCHIP_WRITE(Sn_DPORT(sn),   (uint8_t) (dport>>8)); \
-		WIZCHIP_WRITE(WIZCHIP_OFFSET_INC(Sn_DPORT(sn),1), (uint8_t)  dport); \
-	}
-
-/**
- * @ingroup Socket_register_access_function
- * @brief Get @ref Sn_DPORT register
- * @param (uint8_t)sn Socket number. It should be <b>0 ~ 7</b>.
- * @return uint16_t. Value of @ref Sn_DPORT.
- * @sa setSn_DPORT()
- */
-#define getSn_DPORT(sn) \
-		((WIZCHIP_READ(Sn_DPORT(sn)) << 8) + WIZCHIP_READ(WIZCHIP_OFFSET_INC(Sn_DPORT(sn),1)))
-
-/**
- * @ingroup Socket_register_access_function
- * @brief Set @ref Sn_MSSR register
- * @param (uint8_t)sn Socket number. It should be <b>0 ~ 7</b>.
- * @param (uint16_t)mss Value to set @ref Sn_MSSR
- * @sa setSn_MSSR()
- */
-#define setSn_MSSR(sn, mss) { \
-		WIZCHIP_WRITE(Sn_MSSR(sn),   (uint8_t)(mss>>8)); \
-		WIZCHIP_WRITE(WIZCHIP_OFFSET_INC(Sn_MSSR(sn),1), (uint8_t) mss); \
-	}
-
-/**
- * @ingroup Socket_register_access_function
- * @brief Get @ref Sn_MSSR register
- * @param (uint8_t)sn Socket number. It should be <b>0 ~ 7</b>.
- * @return uint16_t. Value of @ref Sn_MSSR.
- * @sa setSn_MSSR()
- */
-#define getSn_MSSR(sn) \
-		((WIZCHIP_READ(Sn_MSSR(sn)) << 8) + WIZCHIP_READ(WIZCHIP_OFFSET_INC(Sn_MSSR(sn),1)))
-
-/**
- * @ingroup Socket_register_access_function
- * @brief Set @ref Sn_TOS register
- * @param (uint8_t)sn Socket number. It should be <b>0 ~ 7</b>.
- * @param (uint8_t)tos Value to set @ref Sn_TOS
- * @sa getSn_TOS()
- */
-#define setSn_TOS(sn, tos) \
-		WIZCHIP_WRITE(Sn_TOS(sn), tos)
-
-/**
- * @ingroup Socket_register_access_function
- * @brief Get @ref Sn_TOS register
- * @param (uint8_t)sn Socket number. It should be <b>0 ~ 7</b>.
- * @return uint8_t. Value of Sn_TOS.
- * @sa setSn_TOS()
- */
-#define getSn_TOS(sn) \
-		WIZCHIP_READ(Sn_TOS(sn))
-
-/**
- * @ingroup Socket_register_access_function
- * @brief Set @ref Sn_TTL register
- * @param (uint8_t)sn Socket number. It should be <b>0 ~ 7</b>.
- * @param (uint8_t)ttl Value to set @ref Sn_TTL
- * @sa getSn_TTL()
- */
-#define setSn_TTL(sn, ttl) \
-		WIZCHIP_WRITE(Sn_TTL(sn), ttl)
-
-
-/**
- * @ingroup Socket_register_access_function
- * @brief Get @ref Sn_TTL register
- * @param (uint8_t)sn Socket number. It should be <b>0 ~ 7</b>.
- * @return uint8_t. Value of @ref Sn_TTL.
- * @sa setSn_TTL()
- */
-#define getSn_TTL(sn) \
-		WIZCHIP_READ(Sn_TTL(sn))
-
-
-/**
- * @ingroup Socket_register_access_function
- * @brief Set @ref Sn_RXBUF_SIZE register
- * @param (uint8_t)sn Socket number. It should be <b>0 ~ 7</b>.
- * @param (uint8_t)rxbufsize Value to set @ref Sn_RXBUF_SIZE
- * @sa getSn_RXBUF_SIZE()
- */
-#define setSn_RXBUF_SIZE(sn, rxbufsize) \
-		WIZCHIP_WRITE(Sn_RXBUF_SIZE(sn),rxbufsize)
-
-
-/**
- * @ingroup Socket_register_access_function
- * @brief Get @ref Sn_RXBUF_SIZE register
- * @param (uint8_t)sn Socket number. It should be <b>0 ~ 7</b>.
- * @return uint8_t. Value of @ref Sn_RXBUF_SIZE.
- * @sa setSn_RXBUF_SIZE()
- */
-#define getSn_RXBUF_SIZE(sn) \
-		WIZCHIP_READ(Sn_RXBUF_SIZE(sn))
-
-/**
- * @ingroup Socket_register_access_function
- * @brief Set @ref Sn_TXBUF_SIZE register
- * @param (uint8_t)sn Socket number. It should be <b>0 ~ 7</b>.
- * @param (uint8_t)txbufsize Value to set @ref Sn_TXBUF_SIZE
- * @sa getSn_TXBUF_SIZE()
- */
-#define setSn_TXBUF_SIZE(sn, txbufsize) \
-		WIZCHIP_WRITE(Sn_TXBUF_SIZE(sn), txbufsize)
-
-/**
- * @ingroup Socket_register_access_function
- * @brief Get @ref Sn_TXBUF_SIZE register
- * @param (uint8_t)sn Socket number. It should be <b>0 ~ 7</b>.
- * @return uint8_t. Value of @ref Sn_TXBUF_SIZE.
- * @sa setSn_TXBUF_SIZE()
- */
-#define getSn_TXBUF_SIZE(sn) \
-		WIZCHIP_READ(Sn_TXBUF_SIZE(sn))
-
-/**
- * @ingroup Socket_register_access_function
- * @brief Get @ref Sn_TX_FSR register
- * @param (uint8_t)sn Socket number. It should be <b>0 ~ 7</b>.
- * @return uint16_t. Value of @ref Sn_TX_FSR.
- */
-uint16_t getSn_TX_FSR(uint8_t sn);
-
-/**
- * @ingroup Socket_register_access_function
- * @brief Get @ref Sn_TX_RD register
- * @param (uint8_t)sn Socket number. It should be <b>0 ~ 7</b>.
- * @return uint16_t. Value of @ref Sn_TX_RD.
- */
-#define getSn_TX_RD(sn) \
-		((WIZCHIP_READ(Sn_TX_RD(sn)) << 8) + WIZCHIP_READ(WIZCHIP_OFFSET_INC(Sn_TX_RD(sn),1)))
-
-/**
- * @ingroup Socket_register_access_function
- * @brief Set @ref Sn_TX_WR register
- * @param (uint8_t)sn Socket number. It should be <b>0 ~ 7</b>.
- * @param (uint16_t)txwr Value to set @ref Sn_TX_WR
- * @sa GetSn_TX_WR()
- */
-#define setSn_TX_WR(sn, txwr) { \
-		WIZCHIP_WRITE(Sn_TX_WR(sn),   (uint8_t)(txwr>>8)); \
-		WIZCHIP_WRITE(WIZCHIP_OFFSET_INC(Sn_TX_WR(sn),1), (uint8_t) txwr); \
-		}
-
-/**
- * @ingroup Socket_register_access_function
- * @brief Get @ref Sn_TX_WR register
- * @param (uint8_t)sn Socket number. It should be <b>0 ~ 7</b>.
- * @return uint16_t. Value of @ref Sn_TX_WR.
- * @sa setSn_TX_WR()
- */
-#define getSn_TX_WR(sn) \
-		((WIZCHIP_READ(Sn_TX_WR(sn)) << 8) + WIZCHIP_READ(WIZCHIP_OFFSET_INC(Sn_TX_WR(sn),1)))
-
-
-/**
- * @ingroup Socket_register_access_function
- * @brief Get @ref Sn_RX_RSR register
- * @param (uint8_t)sn Socket number. It should be <b>0 ~ 7</b>.
- * @return uint16_t. Value of @ref Sn_RX_RSR.
- */
-uint16_t getSn_RX_RSR(uint8_t sn);
-
-
-/**
- * @ingroup Socket_register_access_function
- * @brief Set @ref Sn_RX_RD register
- * @param (uint8_t)sn Socket number. It should be <b>0 ~ 7</b>.
- * @param (uint16_t)rxrd Value to set @ref Sn_RX_RD
- * @sa getSn_RX_RD()
- */
-#define setSn_RX_RD(sn, rxrd) { \
-		WIZCHIP_WRITE(Sn_RX_RD(sn),   (uint8_t)(rxrd>>8)); \
-		WIZCHIP_WRITE(WIZCHIP_OFFSET_INC(Sn_RX_RD(sn),1), (uint8_t) rxrd); \
-	}
-
-/**
- * @ingroup Socket_register_access_function
- * @brief Get @ref Sn_RX_RD register
- * @param (uint8_t)sn Socket number. It should be <b>0 ~ 7</b>.
- * @regurn uint16_t. Value of @ref Sn_RX_RD.
- * @sa setSn_RX_RD()
- */
-#define getSn_RX_RD(sn) \
-		((WIZCHIP_READ(Sn_RX_RD(sn)) << 8) + WIZCHIP_READ(WIZCHIP_OFFSET_INC(Sn_RX_RD(sn),1)))
-
-/**
- * @ingroup Socket_register_access_function
- * @brief Get @ref Sn_RX_WR register
- * @param (uint8_t)sn Socket number. It should be <b>0 ~ 7</b>.
- * @return uint16_t. Value of @ref Sn_RX_WR.
- */
-#define getSn_RX_WR(sn) \
-		((WIZCHIP_READ(Sn_RX_WR(sn)) << 8) + WIZCHIP_READ(WIZCHIP_OFFSET_INC(Sn_RX_WR(sn),1)))
-
-
-/**
- * @ingroup Socket_register_access_function
- * @brief Set @ref Sn_FRAG register
- * @param (uint8_t)sn Socket number. It should be <b>0 ~ 7</b>.
- * @param (uint16_t)frag Value to set @ref Sn_FRAG
- * @sa getSn_FRAD()
- */
-#define setSn_FRAG(sn, frag) { \
-		WIZCHIP_WRITE(Sn_FRAG(sn),  (uint8_t)(frag >>8)); \
-		WIZCHIP_WRITE(WIZCHIP_OFFSET_INC(Sn_FRAG(sn),1), (uint8_t) frag); \
-	}
-
-/**
- * @ingroup Socket_register_access_function
- * @brief Get @ref Sn_FRAG register
- * @param (uint8_t)sn Socket number. It should be <b>0 ~ 7</b>.
- * @return uint16_t. Value of @ref Sn_FRAG.
- * @sa setSn_FRAG()
- */
-#define getSn_FRAG(sn) \
-		((WIZCHIP_READ(Sn_FRAG(sn)) << 8) + WIZCHIP_READ(WIZCHIP_OFFSET_INC(Sn_FRAG(sn),1)))
-
-/**
- * @ingroup Socket_register_access_function
- * @brief Set @ref Sn_KPALVTR register
- * @param (uint8_t)sn Socket number. It should be <b>0 ~ 7</b>.
- * @param (uint8_t)kpalvt Value to set @ref Sn_KPALVTR
- * @sa getSn_KPALVTR()
- */
-#define setSn_KPALVTR(sn, kpalvt) \
-		WIZCHIP_WRITE(Sn_KPALVTR(sn), kpalvt)
-
-/**
- * @ingroup Socket_register_access_function
- * @brief Get @ref Sn_KPALVTR register
- * @param (uint8_t)sn Socket number. It should be <b>0 ~ 7</b>.
- * @return uint8_t. Value of @ref Sn_KPALVTR.
- * @sa setSn_KPALVTR()
- */
-#define getSn_KPALVTR(sn) \
-		WIZCHIP_READ(Sn_KPALVTR(sn))
-
-//////////////////////////////////////
-
-/////////////////////////////////////
-// Sn_TXBUF & Sn_RXBUF IO function //
-/////////////////////////////////////
-/**  
- * @brief Gets the max buffer size of socket sn passed as parameter.
- * @param (uint8_t)sn Socket number. It should be <b>0 ~ 7</b>.
- * @return uint16_t. Value of Socket n RX max buffer size.
- */
-#define getSn_RxMAX(sn) \
-		(getSn_RXBUF_SIZE(sn) << 10)
-
-/**  
- * @brief Gets the max buffer size of socket sn passed as parameters.
- * @param (uint8_t)sn Socket number. It should be <b>0 ~ 7</b>.
- * @return uint16_t. Value of Socket n TX max buffer size.
- */
-//uint16_t getSn_TxMAX(uint8_t sn);
-#define getSn_TxMAX(sn) \
-		(getSn_TXBUF_SIZE(sn) << 10)
-
-/**
- * @ingroup Basic_IO_function
- * @brief It copies data to internal TX memory
- *
- * @details This function reads the Tx write pointer register and after that,
- * it copies the <i>wizdata(pointer buffer)</i> of the length of <i>len(variable)</i> bytes to internal TX memory
- * and updates the Tx write pointer register.
- * This function is being called by send() and sendto() function also.
- *
- * @note User should read upper byte first and lower byte later to get proper value.
- * @param (uint8_t)sn Socket number. It should be <b>0 ~ 7</b>.
- * @param wizdata Pointer buffer to write data
- * @param len Data length
- * @sa wiz_recv_data()
- */
-void wiz_send_data(uint8_t sn, uint8_t *wizdata, uint16_t len);
-
-/**
- * @ingroup Basic_IO_function
- * @brief It copies data to your buffer from internal RX memory
- *
- * @details This function read the Rx read pointer register and after that,
- * it copies the received data from internal RX memory
- * to <i>wizdata(pointer variable)</i> of the length of <i>len(variable)</i> bytes.
- * This function is being called by recv() also.
- *
- * @note User should read upper byte first and lower byte later to get proper value.
- * @param (uint8_t)sn Socket number. It should be <b>0 ~ 7</b>.
- * @param wizdata Pointer buffer to read data
- * @param len Data length
- * @sa wiz_send_data()
- */
-void wiz_recv_data(uint8_t sn, uint8_t *wizdata, uint16_t len);
-
-/**
- * @ingroup Basic_IO_function
- * @brief It discard the received data in RX memory.
- * @details It discards the data of the length of <i>len(variable)</i> bytes in internal RX memory.
- * @param (uint8_t)sn Socket number. It should be <b>0 ~ 7</b>.
- * @param len Data length
- */
-void wiz_recv_ignore(uint8_t sn, uint16_t len);
-
-#endif   // _W5500_H_
diff --git a/drivers/wiznet5k/ethernet/wizchip_conf.c b/drivers/wiznet5k/ethernet/wizchip_conf.c
deleted file mode 100644
index 3e54d2c90bcd2..0000000000000
--- a/drivers/wiznet5k/ethernet/wizchip_conf.c
+++ /dev/null
@@ -1,662 +0,0 @@
-//****************************************************************************/ 
-//!
-//! \file wizchip_conf.c
-//! \brief WIZCHIP Config Header File.
-//! \version 1.0.1
-//! \date 2013/10/21
-//! \par  Revision history
-//!       <2014/05/01> V1.0.1  Refer to M20140501
-//!        1. Explicit type casting in wizchip_bus_readbyte() & wizchip_bus_writebyte()
-//            Issued by Mathias ClauBen.
-//!           uint32_t type converts into ptrdiff_t first. And then recoverting it into uint8_t*
-//!           For remove the warning when pointer type size is not 32bit.
-//!           If ptrdiff_t doesn't support in your complier, You should must replace ptrdiff_t into your suitable pointer type.
-//!       <2013/10/21> 1st Release
-//! \author MidnightCow
-//! \copyright
-//!
-//! Copyright (c)  2013, WIZnet Co., LTD.
-//! All rights reserved.
-//! 
-//! Redistribution and use in source and binary forms, with or without 
-//! modification, are permitted provided that the following conditions 
-//! are met: 
-//! 
-//!     * Redistributions of source code must retain the above copyright 
-//! notice, this list of conditions and the following disclaimer. 
-//!     * Redistributions in binary form must reproduce the above copyright
-//! notice, this list of conditions and the following disclaimer in the
-//! documentation and/or other materials provided with the distribution. 
-//!     * Neither the name of the <ORGANIZATION> nor the names of its 
-//! contributors may be used to endorse or promote products derived 
-//! from this software without specific prior written permission. 
-//! 
-//! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-//! AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
-//! IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-//! ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE 
-//! LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
-//! CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 
-//! SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-//! INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
-//! CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 
-//! ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF 
-//! THE POSSIBILITY OF SUCH DAMAGE.
-//
-//*****************************************************************************/
-//A20140501 : for use the type - ptrdiff_t
-#include <stddef.h>
-//
-
-#include "wizchip_conf.h"
-#include "socket.h"
-
-/**
- * @brief Default function to enable interrupt.
- * @note This function help not to access wrong address. If you do not describe this function or register any functions,
- * null function is called.
- */
-void 	  wizchip_cris_enter(void)           {};
-/**
- * @brief Default function to disable interrupt.
- * @note This function help not to access wrong address. If you do not describe this function or register any functions,
- * null function is called.
- */
-void 	  wizchip_cris_exit(void)          {};
-/**
- * @brief Default function to select chip.
- * @note This function help not to access wrong address. If you do not describe this function or register any functions,
- * null function is called.
- */
-void 	wizchip_cs_select(void)            {};
-/**
- * @brief Default function to deselect chip.
- * @note This function help not to access wrong address. If you do not describe this function or register any functions,
- * null function is called.
- */
-void 	wizchip_cs_deselect(void)          {};
-/**
- * @brief Default function to read in direct or indirect interface.
- * @note This function help not to access wrong address. If you do not describe this function or register any functions,
- * null function is called.
- */
- //M20140501 : Explict pointer type casting
-//uint8_t wizchip_bus_readbyte(uint32_t AddrSel) { return * ((volatile uint8_t *) AddrSel); };
-uint8_t wizchip_bus_readbyte(uint32_t AddrSel) { return * ((volatile uint8_t *)((ptrdiff_t) AddrSel)); };
-/**
- * @brief Default function to write in direct or indirect interface.
- * @note This function help not to access wrong address. If you do not describe this function or register any functions,
- * null function is called.
- */
- 
-//M20140501 : Explict pointer type casting
-//void 	wizchip_bus_writebyte(uint32_t AddrSel, uint8_t wb)  { *((volatile uint8_t*) AddrSel) = wb; };
-void 	wizchip_bus_writebyte(uint32_t AddrSel, uint8_t wb)  { *((volatile uint8_t*)((ptrdiff_t)AddrSel)) = wb; };
-
-/**
- * @brief Default function to read in SPI interface.
- * @note This function help not to access wrong address. If you do not describe this function or register any functions,
- * null function is called.
- */
-void wizchip_spi_readbytes(uint8_t *buf, uint32_t len) {}
-/**
- * @brief Default function to write in SPI interface.
- * @note This function help not to access wrong address. If you do not describe this function or register any functions,
- * null function is called.
- */
-void wizchip_spi_writebytes(const uint8_t *buf, uint32_t len) {}
-
-/**
- * @\ref _WIZCHIP instance
- */
-_WIZCHIP  WIZCHIP =
-      {
-      .id                  = _WIZCHIP_ID_,
-      .if_mode             = _WIZCHIP_IO_MODE_,
-      .CRIS._enter         = wizchip_cris_enter,
-      .CRIS._exit          = wizchip_cris_exit,
-      .CS._select          = wizchip_cs_select,
-      .CS._deselect        = wizchip_cs_deselect,
-      .IF.BUS._read_byte   = wizchip_bus_readbyte,
-      .IF.BUS._write_byte  = wizchip_bus_writebyte
-//    .IF.SPI._read_byte   = wizchip_spi_readbyte,
-//    .IF.SPI._write_byte  = wizchip_spi_writebyte
-      };
-
-#if _WIZCHIP_ == 5200   // for W5200 ARP errata
-static uint8_t    _SUBN_[4];     // subnet
-#endif
-static uint8_t    _DNS_[4];      // DNS server ip address
-static dhcp_mode  _DHCP_;        // DHCP mode
-
-void reg_wizchip_cris_cbfunc(void(*cris_en)(void), void(*cris_ex)(void))
-{
-   if(!cris_en || !cris_ex)
-   {
-      WIZCHIP.CRIS._enter = wizchip_cris_enter;
-      WIZCHIP.CRIS._exit  = wizchip_cris_exit;
-   }
-   else
-   {
-      WIZCHIP.CRIS._enter = cris_en;
-      WIZCHIP.CRIS._exit  = cris_ex;
-   }
-}
-
-void reg_wizchip_cs_cbfunc(void(*cs_sel)(void), void(*cs_desel)(void))
-{
-   if(!cs_sel || !cs_desel)
-   {
-      WIZCHIP.CS._select   = wizchip_cs_select;
-      WIZCHIP.CS._deselect = wizchip_cs_deselect;
-   }
-   else
-   {
-      WIZCHIP.CS._select   = cs_sel;
-      WIZCHIP.CS._deselect = cs_desel;
-   }
-}
-
-void reg_wizchip_bus_cbfunc(uint8_t(*bus_rb)(uint32_t addr), void (*bus_wb)(uint32_t addr, uint8_t wb))
-{
-   while(!(WIZCHIP.if_mode & _WIZCHIP_IO_MODE_BUS_));
-   
-   if(!bus_rb || !bus_wb)
-   {
-      WIZCHIP.IF.BUS._read_byte   = wizchip_bus_readbyte;
-      WIZCHIP.IF.BUS._write_byte  = wizchip_bus_writebyte;
-   }
-   else
-   {
-      WIZCHIP.IF.BUS._read_byte   = bus_rb;
-      WIZCHIP.IF.BUS._write_byte  = bus_wb;
-   }
-}
-
-void reg_wizchip_spi_cbfunc(void (*spi_rb)(uint8_t *, uint32_t), void (*spi_wb)(const uint8_t *, uint32_t))
-{
-   while(!(WIZCHIP.if_mode & _WIZCHIP_IO_MODE_SPI_));
-   
-   if(!spi_rb || !spi_wb)
-   {
-      WIZCHIP.IF.SPI._read_bytes   = wizchip_spi_readbytes;
-      WIZCHIP.IF.SPI._write_bytes  = wizchip_spi_writebytes;
-   }
-   else
-   {
-      WIZCHIP.IF.SPI._read_bytes   = spi_rb;
-      WIZCHIP.IF.SPI._write_bytes  = spi_wb;
-   }
-}
-
-int8_t ctlwizchip(ctlwizchip_type cwtype, void* arg)
-{
-   uint8_t tmp = 0;
-   uint8_t* ptmp[2] = {0,0};
-   switch(cwtype)
-   {
-      case CW_RESET_WIZCHIP:
-         wizchip_sw_reset();
-         break;
-      case CW_INIT_WIZCHIP:
-         if(arg != 0) 
-         {
-            ptmp[0] = (uint8_t*)arg;
-            ptmp[1] = ptmp[0] + _WIZCHIP_SOCK_NUM_;
-         }
-         return wizchip_init(ptmp[0], ptmp[1]);
-      case CW_CLR_INTERRUPT:
-         wizchip_clrinterrupt(*((intr_kind*)arg));
-         break;
-      case CW_GET_INTERRUPT:
-        *((intr_kind*)arg) = wizchip_getinterrupt();
-         break;
-      case CW_SET_INTRMASK:
-         wizchip_setinterruptmask(*((intr_kind*)arg));
-         break;         
-      case CW_GET_INTRMASK:
-         *((intr_kind*)arg) = wizchip_getinterruptmask();
-         break;
-   #if _WIZCHIP_ > 5100
-      case CW_SET_INTRTIME:
-         setINTLEVEL(*(uint16_t*)arg);
-         break;
-      case CW_GET_INTRTIME:
-         *(uint16_t*)arg = getINTLEVEL();
-         break;
-   #endif
-      case CW_GET_ID:
-         ((uint8_t*)arg)[0] = WIZCHIP.id[0];
-         ((uint8_t*)arg)[1] = WIZCHIP.id[1];
-         ((uint8_t*)arg)[2] = WIZCHIP.id[2];
-         ((uint8_t*)arg)[3] = WIZCHIP.id[3];
-         ((uint8_t*)arg)[4] = WIZCHIP.id[4];
-         ((uint8_t*)arg)[5] = 0;
-         break;
-   #if _WIZCHIP_ ==  5500
-      case CW_RESET_PHY:
-         wizphy_reset();
-         break;
-      case CW_SET_PHYCONF:
-         wizphy_setphyconf((wiz_PhyConf*)arg);
-         break;
-      case CW_GET_PHYCONF:
-         wizphy_getphyconf((wiz_PhyConf*)arg);
-         break;
-      case CW_GET_PHYSTATUS:
-         break;
-      case CW_SET_PHYPOWMODE:
-         return wizphy_setphypmode(*(uint8_t*)arg);
-   #endif
-      case CW_GET_PHYPOWMODE:
-         tmp = wizphy_getphypmode();
-         if((int8_t)tmp == -1) return -1;
-         *(uint8_t*)arg = tmp;
-         break;
-      case CW_GET_PHYLINK:
-         tmp = wizphy_getphylink();
-         if((int8_t)tmp == -1) return -1;
-         *(uint8_t*)arg = tmp;
-         break;
-      default:
-         return -1;
-   }
-   return 0;
-}
-
-
-int8_t ctlnetwork(ctlnetwork_type cntype, void* arg)
-{
-   
-   switch(cntype)
-   {
-      case CN_SET_NETINFO:
-         wizchip_setnetinfo((wiz_NetInfo*)arg);
-         break;
-      case CN_GET_NETINFO:
-         wizchip_getnetinfo((wiz_NetInfo*)arg);
-         break;
-      case CN_SET_NETMODE:
-         return wizchip_setnetmode(*(netmode_type*)arg);
-      case CN_GET_NETMODE:
-         *(netmode_type*)arg = wizchip_getnetmode();
-         break;
-      case CN_SET_TIMEOUT:
-         wizchip_settimeout((wiz_NetTimeout*)arg);
-         break;
-      case CN_GET_TIMEOUT:
-         wizchip_gettimeout((wiz_NetTimeout*)arg);
-         break;
-      default:
-         return -1;
-   }
-   return 0;
-}
-
-void wizchip_sw_reset(void)
-{
-   uint8_t gw[4], sn[4], sip[4];
-   uint8_t mac[6];
-   getSHAR(mac);
-   getGAR(gw);  getSUBR(sn);  getSIPR(sip);
-   setMR(MR_RST);
-   getMR(); // for delay
-   setSHAR(mac);
-   setGAR(gw);
-   setSUBR(sn);
-   setSIPR(sip);
-}
-
-int8_t wizchip_init(uint8_t* txsize, uint8_t* rxsize)
-{
-   int8_t i;
-   int8_t tmp = 0;
-   wizchip_sw_reset();
-   if(txsize)
-   {
-      tmp = 0;
-      for(i = 0 ; i < _WIZCHIP_SOCK_NUM_; i++)
-         tmp += txsize[i];
-      if(tmp > 16) return -1;
-      for(i = 0 ; i < _WIZCHIP_SOCK_NUM_; i++)
-         setSn_TXBUF_SIZE(i, txsize[i]);
-   }
-   if(rxsize)
-   {
-      tmp = 0;
-      for(i = 0 ; i < _WIZCHIP_SOCK_NUM_; i++)
-         tmp += rxsize[i];
-      if(tmp > 16) return -1;
-      for(i = 0 ; i < _WIZCHIP_SOCK_NUM_; i++)
-         setSn_RXBUF_SIZE(i, rxsize[i]);
-   }
-
-   WIZCHIP_EXPORT(socket_reset)();
-
-   return 0;
-}
-
-void wizchip_clrinterrupt(intr_kind intr)
-{
-   uint8_t ir  = (uint8_t)intr;
-   uint8_t sir = (uint8_t)((uint16_t)intr >> 8);
-#if _WIZCHIP_ < 5500
-   ir |= (1<<4); // IK_WOL
-#endif
-#if _WIZCHIP_ == 5200
-   ir |= (1 << 6);
-#endif
-   
-#if _WIZCHIP_ < 5200
-   sir &= 0x0F;
-#endif
-
-#if _WIZCHIP_ == 5100
-   ir |= sir;
-   setIR(ir);
-#else
-   setIR(ir);
-   setSIR(sir);
-#endif   
-}
-
-intr_kind wizchip_getinterrupt(void)
-{
-   uint8_t ir  = 0;
-   uint8_t sir = 0;
-   uint16_t ret = 0;
-#if _WIZCHIP_ == 5100
-   ir = getIR();
-   sir = ir 0x0F;
-#else
-   ir  = getIR();
-   sir = getSIR();
-#endif         
-
-#if _WIZCHIP_ < 5500
-   ir &= ~(1<<4); // IK_WOL
-#endif
-#if _WIZCHIP_ == 5200
-   ir &= ~(1 << 6);
-#endif
-  ret = sir;
-  ret = (ret << 8) + ir;
-  return (intr_kind)ret;
-}
-
-void wizchip_setinterruptmask(intr_kind intr)
-{
-   uint8_t imr  = (uint8_t)intr;
-   uint8_t simr = (uint8_t)((uint16_t)intr >> 8);
-#if _WIZCHIP_ < 5500
-   imr &= ~(1<<4); // IK_WOL
-#endif
-#if _WIZCHIP_ == 5200
-   imr &= ~(1 << 6);
-#endif
-   
-#if _WIZCHIP_ < 5200
-   simr &= 0x0F;
-#endif
-
-#if _WIZCHIP_ == 5100
-   imr |= simr;
-   setIMR(imr);
-#else
-   setIMR(imr);
-   setSIMR(simr);
-#endif   
-}
-
-intr_kind wizchip_getinterruptmask(void)
-{
-   uint8_t imr  = 0;
-   uint8_t simr = 0;
-   uint16_t ret = 0;
-#if _WIZCHIP_ == 5100
-   imr  = getIMR();
-   simr = imr 0x0F;
-#else
-   imr  = getIMR();
-   simr = getSIMR();
-#endif         
-
-#if _WIZCHIP_ < 5500
-   imr &= ~(1<<4); // IK_WOL
-#endif
-#if _WIZCHIP_ == 5200
-   imr &= ~(1 << 6);  // IK_DEST_UNREACH
-#endif
-  ret = simr;
-  ret = (ret << 8) + imr;
-  return (intr_kind)ret;
-}
-
-int8_t wizphy_getphylink(void)
-{
-   int8_t tmp;
-#if   _WIZCHIP_ == 5200
-   if(getPHYSTATUS() & PHYSTATUS_LINK)
-      tmp = PHY_LINK_ON;
-   else
-      tmp = PHY_LINK_OFF;
-#elif _WIZCHIP_ == 5500
-   if(getPHYCFGR() & PHYCFGR_LNK_ON)
-      tmp = PHY_LINK_ON;
-   else
-      tmp = PHY_LINK_OFF;
-#else
-   tmp = -1;
-#endif
-   return tmp;
-}
-
-#if _WIZCHIP_ > 5100
-
-int8_t wizphy_getphypmode(void)
-{
-   int8_t tmp = 0;
-   #if   _WIZCHIP_ == 5200
-      if(getPHYSTATUS() & PHYSTATUS_POWERDOWN)
-         tmp = PHY_POWER_DOWN;
-      else          
-         tmp = PHY_POWER_NORM;
-   #elif _WIZCHIP_ == 5500
-      if(getPHYCFGR() & PHYCFGR_OPMDC_PDOWN)
-         tmp = PHY_POWER_DOWN;
-      else 
-         tmp = PHY_POWER_NORM;
-   #else
-      tmp = -1;
-   #endif
-   return tmp;
-}
-#endif
-
-#if _WIZCHIP_ == 5500
-void wizphy_reset(void)
-{
-   uint8_t tmp = getPHYCFGR();
-   tmp &= PHYCFGR_RST;
-   setPHYCFGR(tmp);
-   tmp = getPHYCFGR(); 
-   tmp |= ~PHYCFGR_RST;
-   setPHYCFGR(tmp);
-}
-
-void wizphy_setphyconf(wiz_PhyConf* phyconf)
-{
-   uint8_t tmp = 0;
-   if(phyconf->by == PHY_CONFBY_SW)
-      tmp |= PHYCFGR_OPMD;
-   else
-      tmp &= ~PHYCFGR_OPMD;
-   if(phyconf->mode == PHY_MODE_AUTONEGO)
-      tmp |= PHYCFGR_OPMDC_ALLA;
-   else
-   {
-      if(phyconf->duplex == PHY_DUPLEX_FULL)
-      {
-         if(phyconf->speed == PHY_SPEED_100)
-            tmp |= PHYCFGR_OPMDC_100F;
-         else
-            tmp |= PHYCFGR_OPMDC_10F;
-      }   
-      else
-      {
-         if(phyconf->speed == PHY_SPEED_100)
-            tmp |= PHYCFGR_OPMDC_100H;
-         else
-            tmp |= PHYCFGR_OPMDC_10H;
-      }
-   }
-   setPHYCFGR(tmp);
-   wizphy_reset();
-}
-
-void wizphy_getphyconf(wiz_PhyConf* phyconf)
-{
-   uint8_t tmp = 0;
-   tmp = getPHYCFGR();
-   phyconf->by   = (tmp & PHYCFGR_OPMD) ? PHY_CONFBY_SW : PHY_CONFBY_HW;
-   switch(tmp & PHYCFGR_OPMDC_ALLA)
-   {
-      case PHYCFGR_OPMDC_ALLA:
-      case PHYCFGR_OPMDC_100FA: 
-         phyconf->mode = PHY_MODE_AUTONEGO;
-         break;
-      default:
-         phyconf->mode = PHY_MODE_MANUAL;
-         break;
-   }
-   switch(tmp & PHYCFGR_OPMDC_ALLA)
-   {
-      case PHYCFGR_OPMDC_100FA:
-      case PHYCFGR_OPMDC_100F:
-      case PHYCFGR_OPMDC_100H:
-         phyconf->speed = PHY_SPEED_100;
-         break;
-      default:
-         phyconf->speed = PHY_SPEED_10;
-         break;
-   }
-   switch(tmp & PHYCFGR_OPMDC_ALLA)
-   {
-      case PHYCFGR_OPMDC_100FA:
-      case PHYCFGR_OPMDC_100F:
-      case PHYCFGR_OPMDC_10F:
-         phyconf->duplex = PHY_DUPLEX_FULL;
-         break;
-      default:
-         phyconf->duplex = PHY_DUPLEX_HALF;
-         break;
-   }
-}
-
-void wizphy_getphystat(wiz_PhyConf* phyconf)
-{
-   uint8_t tmp = getPHYCFGR();
-   phyconf->duplex = (tmp & PHYCFGR_DPX_FULL) ? PHY_DUPLEX_FULL : PHY_DUPLEX_HALF;
-   phyconf->speed  = (tmp & PHYCFGR_SPD_100) ? PHY_SPEED_100 : PHY_SPEED_10;
-}
-
-int8_t wizphy_setphypmode(uint8_t pmode)
-{
-   uint8_t tmp = 0;
-   tmp = getPHYCFGR();
-   if((tmp & PHYCFGR_OPMD)== 0) return -1;
-   tmp &= ~PHYCFGR_OPMDC_ALLA;         
-   if( pmode == PHY_POWER_DOWN)
-      tmp |= PHYCFGR_OPMDC_PDOWN;
-   else
-      tmp |= PHYCFGR_OPMDC_ALLA;
-   setPHYCFGR(tmp);
-   wizphy_reset();
-   tmp = getPHYCFGR();
-   if( pmode == PHY_POWER_DOWN)
-   {
-      if(tmp & PHYCFGR_OPMDC_PDOWN) return 0;
-   }
-   else
-   {
-      if(tmp & PHYCFGR_OPMDC_ALLA) return 0;
-   }
-   return -1;
-}
-#endif
-
-
-void wizchip_setnetinfo(wiz_NetInfo* pnetinfo)
-{
-   setSHAR(pnetinfo->mac);
-   setGAR(pnetinfo->gw);
-   setSUBR(pnetinfo->sn);
-   setSIPR(pnetinfo->ip);
-#if _WIZCHIP_ == 5200   // for W5200 ARP errata
-   _SUBN_[0] = pnetinfo->sn[0];
-   _SUBN_[1] = pnetinfo->sn[1];
-   _SUBN_[2] = pnetinfo->sn[2];
-   _SUBN_[3] = pnetinfo->sn[3];
-#endif
-   _DNS_[0] = pnetinfo->dns[0];
-   _DNS_[1] = pnetinfo->dns[1];
-   _DNS_[2] = pnetinfo->dns[2];
-   _DNS_[3] = pnetinfo->dns[3];
-   _DHCP_   = pnetinfo->dhcp;
-}
-
-void wizchip_getnetinfo(wiz_NetInfo* pnetinfo)
-{
-   getSHAR(pnetinfo->mac);
-   getGAR(pnetinfo->gw);
-   getSUBR(pnetinfo->sn);
-   getSIPR(pnetinfo->ip);
-#if _WIZCHIP_ == 5200   // for W5200 ARP errata
-   pnetinfo->sn[0] = _SUBN_[0];
-   pnetinfo->sn[1] = _SUBN_[1];
-   pnetinfo->sn[2] = _SUBN_[2];
-   pnetinfo->sn[3] = _SUBN_[3];
-#endif
-   pnetinfo->dns[0]= _DNS_[0];
-   pnetinfo->dns[1]= _DNS_[1];
-   pnetinfo->dns[2]= _DNS_[2];
-   pnetinfo->dns[3]= _DNS_[3];
-   pnetinfo->dhcp  = _DHCP_;
-}
-
-#if _WIZCHIP_ == 5200   // for W5200 ARP errata
-uint8_t *wizchip_getsubn(void) {
-    return _SUBN_;
-}
-#endif
-
-int8_t wizchip_setnetmode(netmode_type netmode)
-{
-   uint8_t tmp = 0;
-#if _WIZCHIP_ != 5500   
-   if(netmode & ~(NM_WAKEONLAN | NM_PPPOE | NM_PINGBLOCK)) return -1;
-#else
-   if(netmode & ~(NM_WAKEONLAN | NM_PPPOE | NM_PINGBLOCK | NM_FORCEARP)) return -1;
-#endif      
-   tmp = getMR();
-   tmp |= (uint8_t)netmode;
-   setMR(tmp);
-   return 0;
-}
-
-netmode_type wizchip_getnetmode(void)
-{
-   return (netmode_type) getMR();
-}
-
-void wizchip_settimeout(wiz_NetTimeout* nettime)
-{
-   setRCR(nettime->retry_cnt);
-   setRTR(nettime->time_100us);
-}
-
-void wizchip_gettimeout(wiz_NetTimeout* nettime)
-{
-   nettime->retry_cnt = getRCR();
-   nettime->time_100us = getRTR();
-}
diff --git a/drivers/wiznet5k/ethernet/wizchip_conf.h b/drivers/wiznet5k/ethernet/wizchip_conf.h
deleted file mode 100644
index 4a7a7bd691400..0000000000000
--- a/drivers/wiznet5k/ethernet/wizchip_conf.h
+++ /dev/null
@@ -1,554 +0,0 @@
-//*****************************************************************************
-//
-//! \file wizchip_conf.h
-//! \brief WIZCHIP Config Header File.
-//! \version 1.0.0
-//! \date 2013/10/21
-//! \par  Revision history
-//!       <2013/10/21> 1st Release
-//! \author MidnightCow
-//! \copyright
-//!
-//! Copyright (c)  2013, WIZnet Co., LTD.
-//! All rights reserved.
-//! 
-//! Redistribution and use in source and binary forms, with or without 
-//! modification, are permitted provided that the following conditions 
-//! are met: 
-//! 
-//!     * Redistributions of source code must retain the above copyright 
-//! notice, this list of conditions and the following disclaimer. 
-//!     * Redistributions in binary form must reproduce the above copyright
-//! notice, this list of conditions and the following disclaimer in the
-//! documentation and/or other materials provided with the distribution. 
-//!     * Neither the name of the <ORGANIZATION> nor the names of its 
-//! contributors may be used to endorse or promote products derived 
-//! from this software without specific prior written permission. 
-//! 
-//! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-//! AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
-//! IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-//! ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE 
-//! LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
-//! CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 
-//! SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-//! INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
-//! CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 
-//! ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF 
-//! THE POSSIBILITY OF SUCH DAMAGE.
-//
-//*****************************************************************************
-
-/**
- * @defgroup extra_functions 2. WIZnet Extra Functions
- *
- * @brief These functions is optional function. It could be replaced at WIZCHIP I/O function because they were made by WIZCHIP I/O functions.  
- * @details There are functions of configuring WIZCHIP, network, interrupt, phy, network information and timer. \n
- * 
- */
-
-#ifndef  _WIZCHIP_CONF_H_
-#define  _WIZCHIP_CONF_H_
-
-#include <stdint.h>
-/**
- * @brief Select WIZCHIP.
- * @todo You should select one, \b 5100, \b 5200 ,\b 5500 or etc. \n\n
- *       ex> <code> #define \_WIZCHIP_      5500 </code>
- */
-#ifndef _WIZCHIP_
-#define _WIZCHIP_                      5200   // 5100, 5200, 5500
-#endif
-
-#define _WIZCHIP_IO_MODE_NONE_         0x0000
-#define _WIZCHIP_IO_MODE_BUS_          0x0100 /**< Bus interface mode */
-#define _WIZCHIP_IO_MODE_SPI_          0x0200 /**< SPI interface mode */
-//#define _WIZCHIP_IO_MODE_IIC_          0x0400
-//#define _WIZCHIP_IO_MODE_SDIO_         0x0800
-// Add to
-//
-
-#define _WIZCHIP_IO_MODE_BUS_DIR_      (_WIZCHIP_IO_MODE_BUS_ + 1) /**< BUS interface mode for direct  */
-#define _WIZCHIP_IO_MODE_BUS_INDIR_    (_WIZCHIP_IO_MODE_BUS_ + 2) /**< BUS interface mode for indirect */
-
-#define _WIZCHIP_IO_MODE_SPI_VDM_      (_WIZCHIP_IO_MODE_SPI_ + 1) /**< SPI interface mode for variable length data*/
-#define _WIZCHIP_IO_MODE_SPI_FDM_      (_WIZCHIP_IO_MODE_SPI_ + 2) /**< SPI interface mode for fixed length data mode*/
-
-
-#if   (_WIZCHIP_ == 5100)
-   #define _WIZCHIP_ID_                "W5100\0"
-/**
- * @brief Define interface mode.
- * @todo you should select interface mode as chip. Select one of @ref \_WIZCHIP_IO_MODE_SPI_ , @ref \_WIZCHIP_IO_MODE_BUS_DIR_ or @ref \_WIZCHIP_IO_MODE_BUS_INDIR_
- */
-
-// #define _WIZCHIP_IO_MODE_           _WIZCHIP_IO_MODE_BUS_DIR_
-// #define _WIZCHIP_IO_MODE_           _WIZCHIP_IO_MODE_BUS_INDIR_
-   #define _WIZCHIP_IO_MODE_           _WIZCHIP_IO_MODE_SPI_
-
-#elif (_WIZCHIP_ == 5200)
-   #define _WIZCHIP_ID_                "W5200\0"
-/**
- * @brief Define interface mode.
- * @todo you should select interface mode as chip. Select one of @ref \_WIZCHIP_IO_MODE_SPI_ or @ref \_WIZCHIP_IO_MODE_BUS_INDIR_
- */
-// #define _WIZCHIP_IO_MODE_           _WIZCHIP_IO_MODE_BUS_INDIR_
-   #define _WIZCHIP_IO_MODE_           _WIZCHIP_IO_MODE_SPI_
-   #include "w5200/w5200.h"
-#elif (_WIZCHIP_ == 5500)
-  #define _WIZCHIP_ID_                 "W5500\0"
-  
-/**
- * @brief Define interface mode. \n
- * @todo Should select interface mode as chip. 
- *        - @ref \_WIZCHIP_IO_MODE_SPI_ \n
- *          -@ref \_WIZCHIP_IO_MODE_SPI_VDM_ : Valid only in @ref \_WIZCHIP_ == 5500 \n
- *          -@ref \_WIZCHIP_IO_MODE_SPI_FDM_ : Valid only in @ref \_WIZCHIP_ == 5500 \n
- *        - @ref \_WIZCHIP_IO_MODE_BUS_ \n
- *          - @ref \_WIZCHIP_IO_MODE_BUS_DIR_ \n
- *          - @ref \_WIZCHIP_IO_MODE_BUS_INDIR_ \n
- *        - Others will be defined in future. \n\n
- *        ex> <code> #define \_WIZCHIP_IO_MODE_ \_WIZCHIP_IO_MODE_SPI_VDM_ </code>
- *       
- */
-   //#define _WIZCHIP_IO_MODE_           _WIZCHIP_IO_MODE_SPI_FDM_
-   #define _WIZCHIP_IO_MODE_           _WIZCHIP_IO_MODE_SPI_VDM_
-   #include "w5500/w5500.h"
-#else 
-   #error "Unknown defined _WIZCHIP_. You should define one of 5100, 5200, and 5500 !!!"
-#endif
-
-#ifndef _WIZCHIP_IO_MODE_
-   #error "Undefined _WIZCHIP_IO_MODE_. You should define it !!!"
-#endif
-
-/**
- * @brief Define I/O base address when BUS IF mode.
- * @todo Should re-define it to fit your system when BUS IF Mode (@ref \_WIZCHIP_IO_MODE_BUS_,
- *       @ref \_WIZCHIP_IO_MODE_BUS_DIR_, @ref \_WIZCHIP_IO_MODE_BUS_INDIR_). \n\n
- *       ex> <code> #define \_WIZCHIP_IO_BASE_      0x00008000 </code>
- */
-#define _WIZCHIP_IO_BASE_              0x00000000  // 
-
-#if _WIZCHIP_IO_MODE_ & _WIZCHIP_IO_MODE_BUS
-   #ifndef _WIZCHIP_IO_BASE_
-      #error "You should be define _WIZCHIP_IO_BASE to fit your system memory map."
-   #endif
-#endif   
-
-#if _WIZCHIP_ > 5100
-   #define _WIZCHIP_SOCK_NUM_   8   ///< The count of independant socket of @b WIZCHIP
-#else
-   #define _WIZCHIP_SOCK_NUM_   4   ///< The count of independant socket of @b WIZCHIP
-#endif      
-
-
-/********************************************************
-* WIZCHIP BASIC IF functions for SPI, SDIO, I2C , ETC.
-*********************************************************/
-/**
- * @ingroup DATA_TYPE
- * @brief The set of callback functions for W5500:@ref WIZCHIP_IO_Functions W5200:@ref WIZCHIP_IO_Functions_W5200
- */
-typedef struct __WIZCHIP
-{
-   uint16_t  if_mode;               ///< host interface mode
-   uint8_t   id[6];                 ///< @b WIZCHIP ID such as @b 5100, @b 5200, @b 5500, and so on.
-   /**
-    * The set of critical section callback func.
-    */
-   struct _CRIS
-   {
-      void (*_enter)  (void);       ///< crtical section enter 
-      void (*_exit) (void);         ///< critial section exit  
-   }CRIS;  
-   /**
-    *  The set of @ref\_WIZCHIP_ select control callback func.
-    */
-   struct _CS
-   {
-      void (*_select)  (void);      ///< @ref \_WIZCHIP_ selected
-      void (*_deselect)(void);      ///< @ref \_WIZCHIP_ deselected
-   }CS;  
-   /**
-    * The set of interface IO callback func.
-    */
-   union _IF
-   {	 
-      /**
-       * For BUS interface IO
-       */  
-      struct
-      {
-         uint8_t  (*_read_byte)  (uint32_t AddrSel);
-         void     (*_write_byte) (uint32_t AddrSel, uint8_t wb);
-      }BUS;      
-      /**
-       * For SPI interface IO
-       */
-      struct
-      {
-         void (*_read_bytes)  (uint8_t *buf, uint32_t len);
-         void (*_write_bytes) (const uint8_t *buf, uint32_t len);
-      }SPI;
-      // To be added
-      //
-   }IF;
-}_WIZCHIP;
-
-extern _WIZCHIP  WIZCHIP;
-
-/**
- * @ingroup DATA_TYPE
- *  WIZCHIP control type enumration used in @ref ctlwizchip().
- */
-typedef enum
-{
-   CW_RESET_WIZCHIP,   ///< Resets WIZCHIP by softly
-   CW_INIT_WIZCHIP,    ///< Inializes to WIZCHIP with SOCKET buffer size 2 or 1 dimension array typed uint8_t.
-   CW_GET_INTERRUPT,   ///< Get Interrupt status of WIZCHIP
-   CW_CLR_INTERRUPT,   ///< Clears interrupt
-   CW_SET_INTRMASK,    ///< Masks interrupt
-   CW_GET_INTRMASK,    ///< Get interrupt mask
-   CW_SET_INTRTIME,    ///< Set interval time between the current and next interrupt. 
-   CW_GET_INTRTIME,    ///< Set interval time between the current and next interrupt. 
-   CW_GET_ID,          ///< Gets WIZCHIP name.
-
-#if _WIZCHIP_ ==  5500
-   CW_RESET_PHY,       ///< Resets internal PHY. Valid Only W5000
-   CW_SET_PHYCONF,     ///< When PHY configured by interal register, PHY operation mode (Manual/Auto, 10/100, Half/Full). Valid Only W5000 
-   CW_GET_PHYCONF,     ///< Get PHY operation mode in interal register. Valid Only W5000
-   CW_GET_PHYSTATUS,   ///< Get real PHY status on operating. Valid Only W5000
-   CW_SET_PHYPOWMODE,  ///< Set PHY power mode as noraml and down when PHYSTATUS.OPMD == 1. Valid Only W5000
-#endif
-   CW_GET_PHYPOWMODE,  ///< Get PHY Power mode as down or normal
-   CW_GET_PHYLINK      ///< Get PHY Link status
-}ctlwizchip_type;
-
-/**
- * @ingroup DATA_TYPE
- *  Network control type enumration used in @ref ctlnetwork().
- */
-typedef enum
-{
-   CN_SET_NETINFO,  ///< Set Network with @ref wiz_NetInfo
-   CN_GET_NETINFO,  ///< Get Network with @ref wiz_NetInfo
-   CN_SET_NETMODE,  ///< Set network mode as WOL, PPPoE, Ping Block, and Force ARP mode
-   CN_GET_NETMODE,  ///< Get network mode as WOL, PPPoE, Ping Block, and Force ARP mode
-   CN_SET_TIMEOUT,  ///< Set network timeout as retry count and time.
-   CN_GET_TIMEOUT,  ///< Get network timeout as retry count and time.
-}ctlnetwork_type;
-
-/**
- * @ingroup DATA_TYPE
- *  Interrupt kind when CW_SET_INTRRUPT, CW_GET_INTERRUPT, CW_SET_INTRMASK
- *  and CW_GET_INTRMASK is used in @ref ctlnetwork().
- *  It can be used with OR operation.
- */
-typedef enum
-{
-#if _WIZCHIP_ > 5200
-   IK_WOL               = (1 << 4),   ///< Wake On Lan by receiving the magic packet. Valid in W500.
-#endif   
-
-   IK_PPPOE_TERMINATED  = (1 << 5),   ///< PPPoE Disconnected
-
-#if _WIZCHIP_ != 5200
-   IK_DEST_UNREACH      = (1 << 6),   ///< Destination IP & Port Unreable, No use in W5200
-#endif   
-
-   IK_IP_CONFLICT       = (1 << 7),   ///< IP conflict occurred
-
-   IK_SOCK_0            = (1 << 8),   ///< Socket 0 interrupt
-   IK_SOCK_1            = (1 << 9),   ///< Socket 1 interrupt
-   IK_SOCK_2            = (1 << 10),  ///< Socket 2 interrupt
-   IK_SOCK_3            = (1 << 11),  ///< Socket 3 interrupt
-#if _WIZCHIP_ > 5100   
-   IK_SOCK_4            = (1 << 12),  ///< Socket 4 interrupt, No use in 5100
-   IK_SOCK_5            = (1 << 13),  ///< Socket 5 interrupt, No use in 5100
-   IK_SOCK_6            = (1 << 14),  ///< Socket 6 interrupt, No use in 5100
-   IK_SOCK_7            = (1 << 15),  ///< Socket 7 interrupt, No use in 5100
-#endif   
-
-#if _WIZCHIP_ > 5100
-   IK_SOCK_ALL          = (0xFF << 8) ///< All Socket interrpt
-#else
-   IK_SOCK_ALL          = (0x0F << 8) ///< All Socket interrpt 
-#endif      
-}intr_kind;
-
-#define PHY_CONFBY_HW            0     ///< Configured PHY operation mode by HW pin
-#define PHY_CONFBY_SW            1     ///< Configured PHY operation mode by SW register   
-#define PHY_MODE_MANUAL          0     ///< Configured PHY operation mode with user setting.
-#define PHY_MODE_AUTONEGO        1     ///< Configured PHY operation mode with auto-negotiation
-#define PHY_SPEED_10             0     ///< Link Speed 10
-#define PHY_SPEED_100            1     ///< Link Speed 100
-#define PHY_DUPLEX_HALF          0     ///< Link Half-Duplex
-#define PHY_DUPLEX_FULL          1     ///< Link Full-Duplex
-#define PHY_LINK_OFF             0     ///< Link Off
-#define PHY_LINK_ON              1     ///< Link On
-#define PHY_POWER_NORM           0     ///< PHY power normal mode
-#define PHY_POWER_DOWN           1     ///< PHY power down mode 
-
-
-#if _WIZCHIP_ == 5500 
-/**
- * @ingroup DATA_TYPE
- *  It configures PHY configuration when CW_SET PHYCONF or CW_GET_PHYCONF in W5500,  
- *  and it indicates the real PHY status configured by HW or SW in all WIZCHIP. \n
- *  Valid only in W5500.
- */
-typedef struct wiz_PhyConf_t
-{
-      uint8_t by;       ///< set by @ref PHY_CONFBY_HW or @ref PHY_CONFBY_SW
-      uint8_t mode;     ///< set by @ref PHY_MODE_MANUAL or @ref PHY_MODE_AUTONEGO
-      uint8_t speed;    ///< set by @ref PHY_SPEED_10 or @ref PHY_SPEED_100
-      uint8_t duplex;   ///< set by @ref PHY_DUPLEX_HALF @ref PHY_DUPLEX_FULL 
-      //uint8_t power;  ///< set by @ref PHY_POWER_NORM or @ref PHY_POWER_DOWN
-      //uint8_t link;   ///< Valid only in CW_GET_PHYSTATUS. set by @ref PHY_LINK_ON or PHY_DUPLEX_OFF 
-   }wiz_PhyConf;
-#endif   
-
-/**
- * @ingroup DATA_TYPE
- *  It used in setting dhcp_mode of @ref wiz_NetInfo.
- */
-typedef enum
-{
-   NETINFO_STATIC = 1,    ///< Static IP configuration by manually.
-   NETINFO_DHCP           ///< Dynamic IP configruation from a DHCP sever
-}dhcp_mode;
-
-/**
- * @ingroup DATA_TYPE
- *  Network Information for WIZCHIP
- */
-typedef struct wiz_NetInfo_t
-{
-   uint8_t mac[6];  ///< Source Mac Address
-   uint8_t ip[4];   ///< Source IP Address
-   uint8_t sn[4];   ///< Subnet Mask 
-   uint8_t gw[4];   ///< Gateway IP Address
-   uint8_t dns[4];  ///< DNS server IP Address
-   dhcp_mode dhcp;  ///< 1 - Static, 2 - DHCP
-}wiz_NetInfo;
-
-/**
- * @ingroup DATA_TYPE
- *  Network mode
- */
-typedef enum
-{
-#if _WIZCHIP_ == 5500   
-   NM_FORCEARP    = (1<<1),  ///< Force to APP send whenever udp data is sent. Valid only in W5500
-#endif   
-   NM_WAKEONLAN   = (1<<5),  ///< Wake On Lan 
-   NM_PINGBLOCK   = (1<<4),  ///< Block ping-request
-   NM_PPPOE       = (1<<3),  ///< PPPoE mode
-}netmode_type;
-
-/**
- * @ingroup DATA_TYPE
- *  Used in CN_SET_TIMEOUT or CN_GET_TIMEOUT of @ref ctlwizchip() for timeout configruation.
- */
-typedef struct wiz_NetTimeout_t
-{
-   uint8_t  retry_cnt;     ///< retry count 
-   uint16_t time_100us;    ///< time unit 100us
-}wiz_NetTimeout;
-
-/**
- *@brief Registers call back function for critical section of I/O functions such as
- *\ref WIZCHIP_READ, @ref WIZCHIP_WRITE, @ref WIZCHIP_READ_BUF and @ref WIZCHIP_WRITE_BUF.
- *@param cris_en : callback function for critical section enter.
- *@param cris_ex : callback function for critical section exit.
- *@todo Describe @ref WIZCHIP_CRITICAL_ENTER and @ref WIZCHIP_CRITICAL_EXIT marco or register your functions.
- *@note If you do not describe or register, default functions(@ref wizchip_cris_enter & @ref wizchip_cris_exit) is called.
- */
-void reg_wizchip_cris_cbfunc(void(*cris_en)(void), void(*cris_ex)(void));
-
-
-/**
- *@brief Registers call back function for WIZCHIP select & deselect.
- *@param cs_sel : callback function for WIZCHIP select
- *@param cs_desel : callback fucntion for WIZCHIP deselect
- *@todo Describe @ref wizchip_cs_select and @ref wizchip_cs_deselect function or register your functions.
- *@note If you do not describe or register, null function is called.
- */
-void reg_wizchip_cs_cbfunc(void(*cs_sel)(void), void(*cs_desel)(void));
-
-/**
- *@brief Registers call back function for bus interface.
- *@param bus_rb   : callback function to read byte data using system bus
- *@param bus_wb   : callback function to write byte data using system bus
- *@todo Describe @ref wizchip_bus_readbyte and @ref wizchip_bus_writebyte function
- *or register your functions.
- *@note If you do not describe or register, null function is called.
- */
-void reg_wizchip_bus_cbfunc(uint8_t (*bus_rb)(uint32_t addr), void (*bus_wb)(uint32_t addr, uint8_t wb));
-
-/**
- *@brief Registers call back function for SPI interface.
- *@param spi_rb : callback function to read byte usig SPI 
- *@param spi_wb : callback function to write byte usig SPI 
- *@todo Describe \ref wizchip_spi_readbyte and \ref wizchip_spi_writebyte function
- *or register your functions.
- *@note If you do not describe or register, null function is called.
- */
-void reg_wizchip_spi_cbfunc(void (*spi_rb)(uint8_t *, uint32_t), void (*spi_wb)(const uint8_t *, uint32_t));
-
-/**
- * @ingroup extra_functions
- * @brief Controls to the WIZCHIP.
- * @details Resets WIZCHIP & internal PHY, Configures PHY mode, Monitor PHY(Link,Speed,Half/Full/Auto),
- * controls interrupt & mask and so on.
- * @param cwtype : Decides to the control type
- * @param arg : arg type is dependent on cwtype.
- * @return  0 : Success \n
- *         -1 : Fail because of invalid \ref ctlwizchip_type or unsupported \ref ctlwizchip_type in WIZCHIP 
- */          
-int8_t ctlwizchip(ctlwizchip_type cwtype, void* arg);
-
-/**
- * @ingroup extra_functions
- * @brief Controls to network.
- * @details Controls to network environment, mode, timeout and so on.
- * @param cntype : Input. Decides to the control type
- * @param arg : Inout. arg type is dependent on cntype.
- * @return -1 : Fail because of invalid \ref ctlnetwork_type or unsupported \ref ctlnetwork_type in WIZCHIP \n
- *          0 : Success      
- */          
-int8_t ctlnetwork(ctlnetwork_type cntype, void* arg);
-
-
-/* 
- * The following functions are implemented for internal use. 
- * but You can call these functions for code size reduction instead of ctlwizchip() and ctlnetwork().
- */
- 
-/**
- * @ingroup extra_functions
- * @brief Reset WIZCHIP by softly.
- */ 
-void   wizchip_sw_reset(void);
-
-/**
- * @ingroup extra_functions
- * @brief Initializes WIZCHIP with socket buffer size
- * @param txsize Socket tx buffer sizes. If null, initialized the default size 2KB.
- * @param rxsize Socket rx buffer sizes. If null, initialized the default size 2KB.
- * @return 0 : succcess \n
- *        -1 : fail. Invalid buffer size
- */
-int8_t wizchip_init(uint8_t* txsize, uint8_t* rxsize);
-
-/** 
- * @ingroup extra_functions
- * @brief Clear Interrupt of WIZCHIP.
- * @param intr : @ref intr_kind value operated OR. It can type-cast to uint16_t.
- */
-void wizchip_clrinterrupt(intr_kind intr);
-
-/** 
- * @ingroup extra_functions
- * @brief Get Interrupt of WIZCHIP.
- * @return @ref intr_kind value operated OR. It can type-cast to uint16_t.
- */
-intr_kind wizchip_getinterrupt(void);
-
-/** 
- * @ingroup extra_functions
- * @brief Mask or Unmask Interrupt of WIZCHIP.
- * @param intr : @ref intr_kind value operated OR. It can type-cast to uint16_t.
- */
-void wizchip_setinterruptmask(intr_kind intr);
-
-/** 
- * @ingroup extra_functions
- * @brief Get Interrupt mask of WIZCHIP.
- * @return : The operated OR vaule of @ref intr_kind. It can type-cast to uint16_t.
- */
-intr_kind wizchip_getinterruptmask(void);
-
-#if _WIZCHIP_ > 5100
-   int8_t wizphy_getphylink(void);              ///< get the link status of phy in WIZCHIP. No use in W5100
-   int8_t wizphy_getphypmode(void);             ///< get the power mode of PHY in WIZCHIP. No use in W5100
-#endif
-
-#if _WIZCHIP_ == 5500
-   void   wizphy_reset(void);                   ///< Reset phy. Vailid only in W5500
-/**
- * @ingroup extra_functions
- * @brief Set the phy information for WIZCHIP without power mode
- * @param phyconf : @ref wiz_PhyConf
- */
-   void   wizphy_setphyconf(wiz_PhyConf* phyconf);  
- /**
- * @ingroup extra_functions
- * @brief Get phy configuration information.
- * @param phyconf : @ref wiz_PhyConf
- */
-   void   wizphy_getphyconf(wiz_PhyConf* phyconf); 
- /**
- * @ingroup extra_functions
- * @brief Get phy status.
- * @param phyconf : @ref wiz_PhyConf
- */ 
-   void   wizphy_getphystat(wiz_PhyConf* phyconf);
- /**
- * @ingroup extra_functions
- * @brief set the power mode of phy inside WIZCHIP. Refer to @ref PHYCFGR in W5500, @ref PHYSTATUS in W5200
- * @param pmode Settig value of power down mode.
- */   
-   int8_t wizphy_setphypmode(uint8_t pmode);    
-#endif
-
-/**
-* @ingroup extra_functions
- * @brief Set the network information for WIZCHIP
- * @param pnetinfo : @ref wizNetInfo
- */
-void wizchip_setnetinfo(wiz_NetInfo* pnetinfo);
-
-/**
- * @ingroup extra_functions
- * @brief Get the network information for WIZCHIP
- * @param pnetinfo : @ref wizNetInfo
- */
-void wizchip_getnetinfo(wiz_NetInfo* pnetinfo);
-
-#if _WIZCHIP_ == 5200   // for W5200 ARP errata
-uint8_t *wizchip_getsubn(void);
-#endif
-
-/**
- * @ingroup extra_functions
- * @brief Set the network mode such WOL, PPPoE, Ping Block, and etc. 
- * @param pnetinfo Value of network mode. Refer to @ref netmode_type.
- */
-int8_t wizchip_setnetmode(netmode_type netmode);
-
-/**
- * @ingroup extra_functions
- * @brief Get the network mode such WOL, PPPoE, Ping Block, and etc. 
- * @return Value of network mode. Refer to @ref netmode_type.
- */
-netmode_type wizchip_getnetmode(void);
-
-/**
- * @ingroup extra_functions
- * @brief Set retry time value(@ref RTR) and retry count(@ref RCR).
- * @details @ref RTR configures the retransmission timeout period and @ref RCR configures the number of time of retransmission.  
- * @param nettime @ref RTR value and @ref RCR value. Refer to @ref wiz_NetTimeout. 
- */
-void wizchip_settimeout(wiz_NetTimeout* nettime);
-
-/**
- * @ingroup extra_functions
- * @brief Get retry time value(@ref RTR) and retry count(@ref RCR).
- * @details @ref RTR configures the retransmission timeout period and @ref RCR configures the number of time of retransmission.  
- * @param nettime @ref RTR value and @ref RCR value. Refer to @ref wiz_NetTimeout. 
- */
-void wizchip_gettimeout(wiz_NetTimeout* nettime);
-
-#endif   // _WIZCHIP_CONF_H_
diff --git a/drivers/wiznet5k/internet/dhcp/dhcp.c b/drivers/wiznet5k/internet/dhcp/dhcp.c
deleted file mode 100644
index 5747582599db4..0000000000000
--- a/drivers/wiznet5k/internet/dhcp/dhcp.c
+++ /dev/null
@@ -1,978 +0,0 @@
-//*****************************************************************************
-//
-//! \file dhcp.c
-//! \brief DHCP APIs implement file.
-//! \details Processig DHCP protocol as DISCOVER, OFFER, REQUEST, ACK, NACK and DECLINE.
-//! \version 1.1.0
-//! \date 2013/11/18
-//! \par  Revision history
-//!       <2013/11/18> 1st Release
-//!       <2012/12/20> V1.1.0
-//!         1. Optimize code
-//!         2. Add reg_dhcp_cbfunc()
-//!         3. Add DHCP_stop() 
-//!         4. Integrate check_DHCP_state() & DHCP_run() to DHCP_run()
-//!         5. Don't care system endian
-//!         6. Add comments
-//!       <2012/12/26> V1.1.1
-//!         1. Modify variable declaration: dhcp_tick_1s is declared volatile for code optimization
-//! \author Eric Jung & MidnightCow
-//! \copyright
-//!
-//! Copyright (c)  2013, WIZnet Co., LTD.
-//! All rights reserved.
-//! 
-//! Redistribution and use in source and binary forms, with or without 
-//! modification, are permitted provided that the following conditions 
-//! are met: 
-//! 
-//!     * Redistributions of source code must retain the above copyright 
-//! notice, this list of conditions and the following disclaimer. 
-//!     * Redistributions in binary form must reproduce the above copyright
-//! notice, this list of conditions and the following disclaimer in the
-//! documentation and/or other materials provided with the distribution. 
-//!     * Neither the name of the <ORGANIZATION> nor the names of its 
-//! contributors may be used to endorse or promote products derived 
-//! from this software without specific prior written permission. 
-//! 
-//! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-//! AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
-//! IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-//! ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE 
-//! LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
-//! CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 
-//! SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-//! INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
-//! CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 
-//! ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF 
-//! THE POSSIBILITY OF SUCH DAMAGE.
-//
-//*****************************************************************************
-
-//#include "Ethernet/socket.h"
-//#include "Internet/DHCP/dhcp.h"
-#include "../../Ethernet/socket.h"
-#include "dhcp.h"
-
-/* If you want to display debug & processing message, Define _DHCP_DEBUG_ in dhcp.h */
-
-#ifdef _DHCP_DEBUG_
-   #include <stdio.h>
-#endif   
-
-/* DHCP state machine. */
-#define STATE_DHCP_INIT          0        ///< Initialize
-#define STATE_DHCP_DISCOVER      1        ///< send DISCOVER and wait OFFER
-#define STATE_DHCP_REQUEST       2        ///< send REQEUST and wait ACK or NACK
-#define STATE_DHCP_LEASED        3        ///< ReceiveD ACK and IP leased
-#define STATE_DHCP_REREQUEST     4        ///< send REQUEST for maintaining leased IP
-#define STATE_DHCP_RELEASE       5        ///< No use
-#define STATE_DHCP_STOP          6        ///< Stop processing DHCP
-
-#define DHCP_FLAGSBROADCAST      0x8000   ///< The broadcast value of flags in @ref RIP_MSG 
-#define DHCP_FLAGSUNICAST        0x0000   ///< The unicast   value of flags in @ref RIP_MSG
-
-/* DHCP message OP code */
-#define DHCP_BOOTREQUEST         1        ///< Request Message used in op of @ref RIP_MSG
-#define DHCP_BOOTREPLY           2        ///< Reply Message used i op of @ref RIP_MSG
-
-/* DHCP message type */
-#define DHCP_DISCOVER            1        ///< DISCOVER message in OPT of @ref RIP_MSG
-#define DHCP_OFFER               2        ///< OFFER message in OPT of @ref RIP_MSG
-#define DHCP_REQUEST             3        ///< REQUEST message in OPT of @ref RIP_MSG
-#define DHCP_DECLINE             4        ///< DECLINE message in OPT of @ref RIP_MSG
-#define DHCP_ACK                 5        ///< ACK message in OPT of @ref RIP_MSG
-#define DHCP_NAK                 6        ///< NACK message in OPT of @ref RIP_MSG
-#define DHCP_RELEASE             7        ///< RELEASE message in OPT of @ref RIP_MSG. No use
-#define DHCP_INFORM              8        ///< INFORM message in OPT of @ref RIP_MSG. No use
-
-#define DHCP_HTYPE10MB           1        ///< Used in type of @ref RIP_MSG
-#define DHCP_HTYPE100MB          2        ///< Used in type of @ref RIP_MSG
-
-#define DHCP_HLENETHERNET        6        ///< Used in hlen of @ref RIP_MSG
-#define DHCP_HOPS                0        ///< Used in hops of @ref RIP_MSG
-#define DHCP_SECS                0        ///< Used in secs of @ref RIP_MSG
-
-#define INFINITE_LEASETIME       0xffffffff	///< Infinite lease time
-
-#define OPT_SIZE                 312               /// Max OPT size of @ref RIP_MSG
-#define RIP_MSG_SIZE             (236+OPT_SIZE)    /// Max size of @ref RIP_MSG
-
-/* 
- * @brief DHCP option and value (cf. RFC1533)
- */
-enum
-{
-   padOption               = 0,
-   subnetMask              = 1,
-   timerOffset             = 2,
-   routersOnSubnet         = 3,
-   timeServer              = 4,
-   nameServer              = 5,
-   dns                     = 6,
-   logServer               = 7,
-   cookieServer            = 8,
-   lprServer               = 9,
-   impressServer           = 10,
-   resourceLocationServer	= 11,
-   hostName                = 12,
-   bootFileSize            = 13,
-   meritDumpFile           = 14,
-   domainName              = 15,
-   swapServer              = 16,
-   rootPath                = 17,
-   extentionsPath          = 18,
-   IPforwarding            = 19,
-   nonLocalSourceRouting   = 20,
-   policyFilter            = 21,
-   maxDgramReasmSize       = 22,
-   defaultIPTTL            = 23,
-   pathMTUagingTimeout     = 24,
-   pathMTUplateauTable     = 25,
-   ifMTU                   = 26,
-   allSubnetsLocal         = 27,
-   broadcastAddr           = 28,
-   performMaskDiscovery    = 29,
-   maskSupplier            = 30,
-   performRouterDiscovery  = 31,
-   routerSolicitationAddr  = 32,
-   staticRoute             = 33,
-   trailerEncapsulation    = 34,
-   arpCacheTimeout         = 35,
-   ethernetEncapsulation   = 36,
-   tcpDefaultTTL           = 37,
-   tcpKeepaliveInterval    = 38,
-   tcpKeepaliveGarbage     = 39,
-   nisDomainName           = 40,
-   nisServers              = 41,
-   ntpServers              = 42,
-   vendorSpecificInfo      = 43,
-   netBIOSnameServer       = 44,
-   netBIOSdgramDistServer	= 45,
-   netBIOSnodeType         = 46,
-   netBIOSscope            = 47,
-   xFontServer             = 48,
-   xDisplayManager         = 49,
-   dhcpRequestedIPaddr     = 50,
-   dhcpIPaddrLeaseTime     = 51,
-   dhcpOptionOverload      = 52,
-   dhcpMessageType         = 53,
-   dhcpServerIdentifier    = 54,
-   dhcpParamRequest        = 55,
-   dhcpMsg                 = 56,
-   dhcpMaxMsgSize          = 57,
-   dhcpT1value             = 58,
-   dhcpT2value             = 59,
-   dhcpClassIdentifier     = 60,
-   dhcpClientIdentifier    = 61,
-   endOption               = 255
-};
-
-/*
- * @brief DHCP message format
- */ 
-typedef struct {
-	uint8_t  op;            ///< @ref DHCP_BOOTREQUEST or @ref DHCP_BOOTREPLY
-	uint8_t  htype;         ///< @ref DHCP_HTYPE10MB or @ref DHCP_HTYPE100MB
-	uint8_t  hlen;          ///< @ref DHCP_HLENETHERNET
-	uint8_t  hops;          ///< @ref DHCP_HOPS
-	uint32_t xid;           ///< @ref DHCP_XID  This increase one every DHCP transaction.
-	uint16_t secs;          ///< @ref DHCP_SECS
-	uint16_t flags;         ///< @ref DHCP_FLAGSBROADCAST or @ref DHCP_FLAGSUNICAST
-	uint8_t  ciaddr[4];     ///< @ref Request IP to DHCP sever
-	uint8_t  yiaddr[4];     ///< @ref Offered IP from DHCP server
-	uint8_t  siaddr[4];     ///< No use 
-	uint8_t  giaddr[4];     ///< No use
-	uint8_t  chaddr[16];    ///< DHCP client 6bytes MAC address. Others is filled to zero
-	uint8_t  sname[64];     ///< No use
-	uint8_t  file[128];     ///< No use
-	uint8_t  OPT[OPT_SIZE]; ///< Option
-} RIP_MSG;
-
-
-
-uint8_t DHCP_SOCKET;                      // Socket number for DHCP
-
-uint8_t DHCP_SIP[4];                      // DHCP Server IP address
-
-// Network information from DHCP Server
-uint8_t OLD_allocated_ip[4]   = {0, };    // Previous IP address
-uint8_t DHCP_allocated_ip[4]  = {0, };    // IP address from DHCP
-uint8_t DHCP_allocated_gw[4]  = {0, };    // Gateway address from DHCP
-uint8_t DHCP_allocated_sn[4]  = {0, };    // Subnet mask from DHCP
-uint8_t DHCP_allocated_dns[4] = {0, };    // DNS address from DHCP
-
-
-int8_t   dhcp_state        = STATE_DHCP_INIT;   // DHCP state
-int8_t   dhcp_retry_count  = 0;                 
-
-uint32_t dhcp_lease_time   			= INFINITE_LEASETIME;
-volatile uint32_t dhcp_tick_1s      = 0;                 // unit 1 second
-uint32_t dhcp_tick_next    			= DHCP_WAIT_TIME ;
-
-uint32_t DHCP_XID;      // Any number
-
-RIP_MSG* pDHCPMSG;      // Buffer pointer for DHCP processing
-
-uint8_t HOST_NAME[] = DCHP_HOST_NAME;  
-
-uint8_t DHCP_CHADDR[6]; // DHCP Client MAC address.
-
-/* The default callback function */
-void default_ip_assign(void);
-void default_ip_update(void);
-void default_ip_conflict(void);
-
-/* Callback handler */
-void (*dhcp_ip_assign)(void)   = default_ip_assign;     /* handler to be called when the IP address from DHCP server is first assigned */
-void (*dhcp_ip_update)(void)   = default_ip_update;     /* handler to be called when the IP address from DHCP server is updated */
-void (*dhcp_ip_conflict)(void) = default_ip_conflict;   /* handler to be called when the IP address from DHCP server is conflict */
-
-void reg_dhcp_cbfunc(void(*ip_assign)(void), void(*ip_update)(void), void(*ip_conflict)(void));
-
-
-/* send DISCOVER message to DHCP server */
-void     send_DHCP_DISCOVER(void);
-
-/* send REQEUST message to DHCP server */
-void     send_DHCP_REQUEST(void);
-
-/* send DECLINE message to DHCP server */
-void     send_DHCP_DECLINE(void);
-
-/* IP conflict check by sending ARP-request to leased IP and wait ARP-response. */
-int8_t   check_DHCP_leasedIP(void);
-
-/* check the timeout in DHCP process */
-uint8_t  check_DHCP_timeout(void);
-
-/* Intialize to timeout process.  */
-void     reset_DHCP_timeout(void);
-
-/* Parse message as OFFER and ACK and NACK from DHCP server.*/
-int8_t   parseDHCPCMSG(void);
-
-/* The default handler of ip assign first */
-void default_ip_assign(void)
-{
-   setSIPR(DHCP_allocated_ip);
-   setSUBR(DHCP_allocated_sn);
-   setGAR (DHCP_allocated_gw);
-}
-
-/* The default handler of ip changed */
-void default_ip_update(void)
-{
-	/* WIZchip Software Reset */
-   setMR(MR_RST);
-   getMR(); // for delay
-   default_ip_assign();
-   setSHAR(DHCP_CHADDR);
-}
-
-/* The default handler of ip changed */
-void default_ip_conflict(void)
-{
-	// WIZchip Software Reset
-	setMR(MR_RST);
-	getMR(); // for delay
-	setSHAR(DHCP_CHADDR);
-}
-
-/* register the call back func. */
-void reg_dhcp_cbfunc(void(*ip_assign)(void), void(*ip_update)(void), void(*ip_conflict)(void))
-{
-   dhcp_ip_assign   = default_ip_assign;
-   dhcp_ip_update   = default_ip_update;
-   dhcp_ip_conflict = default_ip_conflict;
-   if(ip_assign)   dhcp_ip_assign = ip_assign;
-   if(ip_update)   dhcp_ip_update = ip_update;
-   if(ip_conflict) dhcp_ip_conflict = ip_conflict;
-}
-
-/* make the common DHCP message */
-void makeDHCPMSG(void)
-{
-   uint8_t  bk_mac[6];
-   uint8_t* ptmp;
-   uint8_t  i;
-   getSHAR(bk_mac);
-	pDHCPMSG->op      = DHCP_BOOTREQUEST;
-	pDHCPMSG->htype   = DHCP_HTYPE10MB;
-	pDHCPMSG->hlen    = DHCP_HLENETHERNET;
-	pDHCPMSG->hops    = DHCP_HOPS;
-	ptmp              = (uint8_t*)(&pDHCPMSG->xid);
-	*(ptmp+0)         = (uint8_t)((DHCP_XID & 0xFF000000) >> 24);
-	*(ptmp+1)         = (uint8_t)((DHCP_XID & 0x00FF0000) >> 16);
-   *(ptmp+2)         = (uint8_t)((DHCP_XID & 0x0000FF00) >>  8);
-	*(ptmp+3)         = (uint8_t)((DHCP_XID & 0x000000FF) >>  0);   
-	pDHCPMSG->secs    = DHCP_SECS;
-	ptmp              = (uint8_t*)(&pDHCPMSG->flags);	
-	*(ptmp+0)         = (uint8_t)((DHCP_FLAGSBROADCAST & 0xFF00) >> 8);
-	*(ptmp+1)         = (uint8_t)((DHCP_FLAGSBROADCAST & 0x00FF) >> 0);
-
-	pDHCPMSG->ciaddr[0] = 0;
-	pDHCPMSG->ciaddr[1] = 0;
-	pDHCPMSG->ciaddr[2] = 0;
-	pDHCPMSG->ciaddr[3] = 0;
-
-	pDHCPMSG->yiaddr[0] = 0;
-	pDHCPMSG->yiaddr[1] = 0;
-	pDHCPMSG->yiaddr[2] = 0;
-	pDHCPMSG->yiaddr[3] = 0;
-
-	pDHCPMSG->siaddr[0] = 0;
-	pDHCPMSG->siaddr[1] = 0;
-	pDHCPMSG->siaddr[2] = 0;
-	pDHCPMSG->siaddr[3] = 0;
-
-	pDHCPMSG->giaddr[0] = 0;
-	pDHCPMSG->giaddr[1] = 0;
-	pDHCPMSG->giaddr[2] = 0;
-	pDHCPMSG->giaddr[3] = 0;
-
-	pDHCPMSG->chaddr[0] = DHCP_CHADDR[0];
-	pDHCPMSG->chaddr[1] = DHCP_CHADDR[1];
-	pDHCPMSG->chaddr[2] = DHCP_CHADDR[2];
-	pDHCPMSG->chaddr[3] = DHCP_CHADDR[3];
-	pDHCPMSG->chaddr[4] = DHCP_CHADDR[4];
-	pDHCPMSG->chaddr[5] = DHCP_CHADDR[5];
-
-	for (i = 6; i < 16; i++)  pDHCPMSG->chaddr[i] = 0;
-	for (i = 0; i < 64; i++)  pDHCPMSG->sname[i]  = 0;
-	for (i = 0; i < 128; i++) pDHCPMSG->file[i]   = 0;
-
-	// MAGIC_COOKIE
-	pDHCPMSG->OPT[0] = (uint8_t)((MAGIC_COOKIE & 0xFF000000) >> 24);
-	pDHCPMSG->OPT[1] = (uint8_t)((MAGIC_COOKIE & 0x00FF0000) >> 16);
-	pDHCPMSG->OPT[2] = (uint8_t)((MAGIC_COOKIE & 0x0000FF00) >>  8);
-	pDHCPMSG->OPT[3] = (uint8_t) (MAGIC_COOKIE & 0x000000FF) >>  0;
-}
-
-/* SEND DHCP DISCOVER */
-void send_DHCP_DISCOVER(void)
-{
-	uint16_t i;
-	uint8_t ip[4];
-	uint16_t k = 0;
-   
-   makeDHCPMSG();
-
-   k = 4;     // because MAGIC_COOKIE already made by makeDHCPMSG()
-   
-	// Option Request Param
-	pDHCPMSG->OPT[k++] = dhcpMessageType;
-	pDHCPMSG->OPT[k++] = 0x01;
-	pDHCPMSG->OPT[k++] = DHCP_DISCOVER;
-	
-	// Client identifier
-	pDHCPMSG->OPT[k++] = dhcpClientIdentifier;
-	pDHCPMSG->OPT[k++] = 0x07;
-	pDHCPMSG->OPT[k++] = 0x01;
-	pDHCPMSG->OPT[k++] = DHCP_CHADDR[0];
-	pDHCPMSG->OPT[k++] = DHCP_CHADDR[1];
-	pDHCPMSG->OPT[k++] = DHCP_CHADDR[2];
-	pDHCPMSG->OPT[k++] = DHCP_CHADDR[3];
-	pDHCPMSG->OPT[k++] = DHCP_CHADDR[4];
-	pDHCPMSG->OPT[k++] = DHCP_CHADDR[5];
-	
-	// host name
-	pDHCPMSG->OPT[k++] = hostName;
-	pDHCPMSG->OPT[k++] = 0;          // fill zero length of hostname 
-	for(i = 0 ; HOST_NAME[i] != 0; i++)
-   	pDHCPMSG->OPT[k++] = HOST_NAME[i];
-	pDHCPMSG->OPT[k++] = DHCP_CHADDR[3];
-	pDHCPMSG->OPT[k++] = DHCP_CHADDR[4];
-	pDHCPMSG->OPT[k++] = DHCP_CHADDR[5];
-	pDHCPMSG->OPT[k - (i+3+1)] = i+3; // length of hostname
-
-	pDHCPMSG->OPT[k++] = dhcpParamRequest;
-	pDHCPMSG->OPT[k++] = 0x06;	// length of request
-	pDHCPMSG->OPT[k++] = subnetMask;
-	pDHCPMSG->OPT[k++] = routersOnSubnet;
-	pDHCPMSG->OPT[k++] = dns;
-	pDHCPMSG->OPT[k++] = domainName;
-	pDHCPMSG->OPT[k++] = dhcpT1value;
-	pDHCPMSG->OPT[k++] = dhcpT2value;
-	pDHCPMSG->OPT[k++] = endOption;
-
-	for (i = k; i < OPT_SIZE; i++) pDHCPMSG->OPT[i] = 0;
-
-	// send broadcasting packet
-	ip[0] = 255;
-	ip[1] = 255;
-	ip[2] = 255;
-	ip[3] = 255;
-
-#ifdef _DHCP_DEBUG_
-	printf("> Send DHCP_DISCOVER\r\n");
-#endif
-
-	sendto(DHCP_SOCKET, (uint8_t *)pDHCPMSG, RIP_MSG_SIZE, ip, DHCP_SERVER_PORT);
-}
-
-/* SEND DHCP REQUEST */
-void send_DHCP_REQUEST(void)
-{
-	int i;
-	uint8_t ip[4];
-	uint16_t k = 0;
-
-   makeDHCPMSG();
-
-   if(dhcp_state == STATE_DHCP_LEASED || dhcp_state == STATE_DHCP_REREQUEST)
-   {
-   	*((uint8_t*)(&pDHCPMSG->flags))   = ((DHCP_FLAGSUNICAST & 0xFF00)>> 8);
-   	*((uint8_t*)(&pDHCPMSG->flags)+1) = (DHCP_FLAGSUNICAST & 0x00FF);
-   	pDHCPMSG->ciaddr[0] = DHCP_allocated_ip[0];
-   	pDHCPMSG->ciaddr[1] = DHCP_allocated_ip[1];
-   	pDHCPMSG->ciaddr[2] = DHCP_allocated_ip[2];
-   	pDHCPMSG->ciaddr[3] = DHCP_allocated_ip[3];
-   	ip[0] = DHCP_SIP[0];
-   	ip[1] = DHCP_SIP[1];
-   	ip[2] = DHCP_SIP[2];
-   	ip[3] = DHCP_SIP[3];   	   	   	
-   }
-   else
-   {
-   	ip[0] = 255;
-   	ip[1] = 255;
-   	ip[2] = 255;
-   	ip[3] = 255;   	   	   	
-   }
-   
-   k = 4;      // because MAGIC_COOKIE already made by makeDHCPMSG()
-	
-	// Option Request Param.
-	pDHCPMSG->OPT[k++] = dhcpMessageType;
-	pDHCPMSG->OPT[k++] = 0x01;
-	pDHCPMSG->OPT[k++] = DHCP_REQUEST;
-
-	pDHCPMSG->OPT[k++] = dhcpClientIdentifier;
-	pDHCPMSG->OPT[k++] = 0x07;
-	pDHCPMSG->OPT[k++] = 0x01;
-	pDHCPMSG->OPT[k++] = DHCP_CHADDR[0];
-	pDHCPMSG->OPT[k++] = DHCP_CHADDR[1];
-	pDHCPMSG->OPT[k++] = DHCP_CHADDR[2];
-	pDHCPMSG->OPT[k++] = DHCP_CHADDR[3];
-	pDHCPMSG->OPT[k++] = DHCP_CHADDR[4];
-	pDHCPMSG->OPT[k++] = DHCP_CHADDR[5];
-
-   if(ip[3] == 255)  // if(dchp_state == STATE_DHCP_LEASED || dchp_state == DHCP_REREQUEST_STATE)
-   {
-		pDHCPMSG->OPT[k++] = dhcpRequestedIPaddr;
-		pDHCPMSG->OPT[k++] = 0x04;
-		pDHCPMSG->OPT[k++] = DHCP_allocated_ip[0];
-		pDHCPMSG->OPT[k++] = DHCP_allocated_ip[1];
-		pDHCPMSG->OPT[k++] = DHCP_allocated_ip[2];
-		pDHCPMSG->OPT[k++] = DHCP_allocated_ip[3];
-	
-		pDHCPMSG->OPT[k++] = dhcpServerIdentifier;
-		pDHCPMSG->OPT[k++] = 0x04;
-		pDHCPMSG->OPT[k++] = DHCP_SIP[0];
-		pDHCPMSG->OPT[k++] = DHCP_SIP[1];
-		pDHCPMSG->OPT[k++] = DHCP_SIP[2];
-		pDHCPMSG->OPT[k++] = DHCP_SIP[3];
-	}
-
-	// host name
-	pDHCPMSG->OPT[k++] = hostName;
-	pDHCPMSG->OPT[k++] = 0; // length of hostname
-	for(i = 0 ; HOST_NAME[i] != 0; i++)
-   	pDHCPMSG->OPT[k++] = HOST_NAME[i];
-	pDHCPMSG->OPT[k++] = DHCP_CHADDR[3];
-	pDHCPMSG->OPT[k++] = DHCP_CHADDR[4];
-	pDHCPMSG->OPT[k++] = DHCP_CHADDR[5];
-	pDHCPMSG->OPT[k - (i+3+1)] = i+3; // length of hostname
-	
-	pDHCPMSG->OPT[k++] = dhcpParamRequest;
-	pDHCPMSG->OPT[k++] = 0x08;
-	pDHCPMSG->OPT[k++] = subnetMask;
-	pDHCPMSG->OPT[k++] = routersOnSubnet;
-	pDHCPMSG->OPT[k++] = dns;
-	pDHCPMSG->OPT[k++] = domainName;
-	pDHCPMSG->OPT[k++] = dhcpT1value;
-	pDHCPMSG->OPT[k++] = dhcpT2value;
-	pDHCPMSG->OPT[k++] = performRouterDiscovery;
-	pDHCPMSG->OPT[k++] = staticRoute;
-	pDHCPMSG->OPT[k++] = endOption;
-
-	for (i = k; i < OPT_SIZE; i++) pDHCPMSG->OPT[i] = 0;
-
-#ifdef _DHCP_DEBUG_
-	printf("> Send DHCP_REQUEST\r\n");
-#endif
-	
-	sendto(DHCP_SOCKET, (uint8_t *)pDHCPMSG, RIP_MSG_SIZE, ip, DHCP_SERVER_PORT);
-
-}
-
-/* SEND DHCP DHCPDECLINE */
-void send_DHCP_DECLINE(void)
-{
-	int i;
-	uint8_t ip[4];
-	uint16_t k = 0;
-	
-	makeDHCPMSG();
-
-   k = 4;      // because MAGIC_COOKIE already made by makeDHCPMSG()
-   
-	*((uint8_t*)(&pDHCPMSG->flags))   = ((DHCP_FLAGSUNICAST & 0xFF00)>> 8);
-	*((uint8_t*)(&pDHCPMSG->flags)+1) = (DHCP_FLAGSUNICAST & 0x00FF);
-
-	// Option Request Param.
-	pDHCPMSG->OPT[k++] = dhcpMessageType;
-	pDHCPMSG->OPT[k++] = 0x01;
-	pDHCPMSG->OPT[k++] = DHCP_DECLINE;
-
-	pDHCPMSG->OPT[k++] = dhcpClientIdentifier;
-	pDHCPMSG->OPT[k++] = 0x07;
-	pDHCPMSG->OPT[k++] = 0x01;
-	pDHCPMSG->OPT[k++] = DHCP_CHADDR[0];
-	pDHCPMSG->OPT[k++] = DHCP_CHADDR[1];
-	pDHCPMSG->OPT[k++] = DHCP_CHADDR[2];
-	pDHCPMSG->OPT[k++] = DHCP_CHADDR[3];
-	pDHCPMSG->OPT[k++] = DHCP_CHADDR[4];
-	pDHCPMSG->OPT[k++] = DHCP_CHADDR[5];
-
-	pDHCPMSG->OPT[k++] = dhcpRequestedIPaddr;
-	pDHCPMSG->OPT[k++] = 0x04;
-	pDHCPMSG->OPT[k++] = DHCP_allocated_ip[0];
-	pDHCPMSG->OPT[k++] = DHCP_allocated_ip[1];
-	pDHCPMSG->OPT[k++] = DHCP_allocated_ip[2];
-	pDHCPMSG->OPT[k++] = DHCP_allocated_ip[3];
-
-	pDHCPMSG->OPT[k++] = dhcpServerIdentifier;
-	pDHCPMSG->OPT[k++] = 0x04;
-	pDHCPMSG->OPT[k++] = DHCP_SIP[0];
-	pDHCPMSG->OPT[k++] = DHCP_SIP[1];
-	pDHCPMSG->OPT[k++] = DHCP_SIP[2];
-	pDHCPMSG->OPT[k++] = DHCP_SIP[3];
-
-	pDHCPMSG->OPT[k++] = endOption;
-
-	for (i = k; i < OPT_SIZE; i++) pDHCPMSG->OPT[i] = 0;
-
-	//send broadcasting packet
-	ip[0] = 0xFF;
-	ip[1] = 0xFF;
-	ip[2] = 0xFF;
-	ip[3] = 0xFF;
-
-#ifdef _DHCP_DEBUG_
-	printf("\r\n> Send DHCP_DECLINE\r\n");
-#endif
-
-	sendto(DHCP_SOCKET, (uint8_t *)pDHCPMSG, RIP_MSG_SIZE, ip, DHCP_SERVER_PORT);
-}
-
-/* PARSE REPLY pDHCPMSG */
-int8_t parseDHCPMSG(void)
-{
-	uint8_t svr_addr[6];
-	uint16_t  svr_port;
-	uint16_t len;
-
-	uint8_t * p;
-	uint8_t * e;
-	uint8_t type;
-	uint8_t opt_len;
-   
-   if((len = getSn_RX_RSR(DHCP_SOCKET)) > 0)
-   {
-   	len = recvfrom(DHCP_SOCKET, (uint8_t *)pDHCPMSG, len, svr_addr, &svr_port);
-   #ifdef _DHCP_DEBUG_   
-      printf("DHCP message : %d.%d.%d.%d(%d) %d received. \r\n",svr_addr[0],svr_addr[1],svr_addr[2], svr_addr[3],svr_port, len);
-   #endif   
-   }
-   else return 0;
-	if (svr_port == DHCP_SERVER_PORT) {
-      // compare mac address
-		if ( (pDHCPMSG->chaddr[0] != DHCP_CHADDR[0]) || (pDHCPMSG->chaddr[1] != DHCP_CHADDR[1]) ||
-		     (pDHCPMSG->chaddr[2] != DHCP_CHADDR[2]) || (pDHCPMSG->chaddr[3] != DHCP_CHADDR[3]) ||
-		     (pDHCPMSG->chaddr[4] != DHCP_CHADDR[4]) || (pDHCPMSG->chaddr[5] != DHCP_CHADDR[5])   )
-         return 0;
-      type = 0;
-		p = (uint8_t *)(&pDHCPMSG->op);
-		p = p + 240;      // 240 = sizeof(RIP_MSG) + MAGIC_COOKIE size in RIP_MSG.opt - sizeof(RIP_MSG.opt)
-		e = p + (len - 240);
-
-		while ( p < e ) {
-
-			switch ( *p ) {
-
-   			case endOption :
-   			   p = e;   // for break while(p < e)
-   				break;
-            case padOption :
-   				p++;
-   				break;
-   			case dhcpMessageType :
-   				p++;
-   				p++;
-   				type = *p++;
-   				break;
-   			case subnetMask :
-   				p++;
-   				p++;
-   				DHCP_allocated_sn[0] = *p++;
-   				DHCP_allocated_sn[1] = *p++;
-   				DHCP_allocated_sn[2] = *p++;
-   				DHCP_allocated_sn[3] = *p++;
-   				break;
-   			case routersOnSubnet :
-   				p++;
-   				opt_len = *p++;       
-   				DHCP_allocated_gw[0] = *p++;
-   				DHCP_allocated_gw[1] = *p++;
-   				DHCP_allocated_gw[2] = *p++;
-   				DHCP_allocated_gw[3] = *p++;
-   				p = p + (opt_len - 4);
-   				break;
-   			case dns :
-   				p++;                  
-   				opt_len = *p++;       
-   				DHCP_allocated_dns[0] = *p++;
-   				DHCP_allocated_dns[1] = *p++;
-   				DHCP_allocated_dns[2] = *p++;
-   				DHCP_allocated_dns[3] = *p++;
-   				p = p + (opt_len - 4);
-   				break;
-   			case dhcpIPaddrLeaseTime :
-   				p++;
-   				opt_len = *p++;
-   				dhcp_lease_time  = *p++;
-   				dhcp_lease_time  = (dhcp_lease_time << 8) + *p++;
-   				dhcp_lease_time  = (dhcp_lease_time << 8) + *p++;
-   				dhcp_lease_time  = (dhcp_lease_time << 8) + *p++;
-            #ifdef _DHCP_DEBUG_  
-                dhcp_lease_time = 10;
- 			#endif
-   				break;
-   			case dhcpServerIdentifier :
-   				p++;
-   				opt_len = *p++;
-   				DHCP_SIP[0] = *p++;
-   				DHCP_SIP[1] = *p++;
-   				DHCP_SIP[2] = *p++;
-   				DHCP_SIP[3] = *p++;
-   				break;
-   			default :
-   				p++;
-   				opt_len = *p++;
-   				p += opt_len;
-   				break;
-			} // switch
-		} // while
-	} // if
-	return	type;
-}
-
-uint8_t DHCP_run(void)
-{
-	uint8_t  type;
-	uint8_t  ret;
-
-	if(dhcp_state == STATE_DHCP_STOP) return DHCP_STOPPED;
-
-	if(getSn_SR(DHCP_SOCKET) != SOCK_UDP)
-	   socket(DHCP_SOCKET, Sn_MR_UDP, DHCP_CLIENT_PORT, 0x00);
-
-	ret = DHCP_RUNNING;
-	type = parseDHCPMSG();
-
-	switch ( dhcp_state ) {
-	   case STATE_DHCP_INIT     :
-         DHCP_allocated_ip[0] = 0;
-         DHCP_allocated_ip[1] = 0;
-         DHCP_allocated_ip[2] = 0;
-         DHCP_allocated_ip[3] = 0;
-   		send_DHCP_DISCOVER();
-   		dhcp_state = STATE_DHCP_DISCOVER;
-   		break;
-		case STATE_DHCP_DISCOVER :
-			if (type == DHCP_OFFER){
-#ifdef _DHCP_DEBUG_
-				printf("> Receive DHCP_OFFER\r\n");
-#endif
-            DHCP_allocated_ip[0] = pDHCPMSG->yiaddr[0];
-            DHCP_allocated_ip[1] = pDHCPMSG->yiaddr[1];
-            DHCP_allocated_ip[2] = pDHCPMSG->yiaddr[2];
-            DHCP_allocated_ip[3] = pDHCPMSG->yiaddr[3];
-
-				send_DHCP_REQUEST();
-				dhcp_state = STATE_DHCP_REQUEST;
-			} else ret = check_DHCP_timeout();
-         break;
-
-		case STATE_DHCP_REQUEST :
-			if (type == DHCP_ACK) {
-
-#ifdef _DHCP_DEBUG_
-				printf("> Receive DHCP_ACK\r\n");
-#endif
-				if (check_DHCP_leasedIP()) {
-					// Network info assignment from DHCP
-					dhcp_ip_assign();
-					reset_DHCP_timeout();
-
-					dhcp_state = STATE_DHCP_LEASED;
-				} else {
-					// IP address conflict occurred
-					reset_DHCP_timeout();
-					dhcp_ip_conflict();
-				    dhcp_state = STATE_DHCP_INIT;
-				}
-			} else if (type == DHCP_NAK) {
-
-#ifdef _DHCP_DEBUG_
-				printf("> Receive DHCP_NACK\r\n");
-#endif
-
-				reset_DHCP_timeout();
-
-				dhcp_state = STATE_DHCP_DISCOVER;
-			} else ret = check_DHCP_timeout();
-		break;
-
-		case STATE_DHCP_LEASED :
-		   ret = DHCP_IP_LEASED;
-			if ((dhcp_lease_time != INFINITE_LEASETIME) && ((dhcp_lease_time/2) < dhcp_tick_1s)) {
-				
-#ifdef _DHCP_DEBUG_
- 				printf("> Maintains the IP address \r\n");
-#endif
-
-				type = 0;
-				OLD_allocated_ip[0] = DHCP_allocated_ip[0];
-				OLD_allocated_ip[1] = DHCP_allocated_ip[1];
-				OLD_allocated_ip[2] = DHCP_allocated_ip[2];
-				OLD_allocated_ip[3] = DHCP_allocated_ip[3];
-				
-				DHCP_XID++;
-
-				send_DHCP_REQUEST();
-
-				reset_DHCP_timeout();
-
-				dhcp_state = STATE_DHCP_REREQUEST;
-			}
-		break;
-
-		case STATE_DHCP_REREQUEST :
-		   ret = DHCP_IP_LEASED;
-			if (type == DHCP_ACK) {
-				dhcp_retry_count = 0;
-				if (OLD_allocated_ip[0] != DHCP_allocated_ip[0] || 
-				    OLD_allocated_ip[1] != DHCP_allocated_ip[1] ||
-				    OLD_allocated_ip[2] != DHCP_allocated_ip[2] ||
-				    OLD_allocated_ip[3] != DHCP_allocated_ip[3]) 
-				{
-					ret = DHCP_IP_CHANGED;
-					dhcp_ip_update();
-               #ifdef _DHCP_DEBUG_
-                  printf(">IP changed.\r\n");
-               #endif
-					
-				}
-         #ifdef _DHCP_DEBUG_
-            else printf(">IP is continued.\r\n");
-         #endif            				
-				reset_DHCP_timeout();
-				dhcp_state = STATE_DHCP_LEASED;
-			} else if (type == DHCP_NAK) {
-
-#ifdef _DHCP_DEBUG_
-				printf("> Receive DHCP_NACK, Failed to maintain ip\r\n");
-#endif
-
-				reset_DHCP_timeout();
-
-				dhcp_state = STATE_DHCP_DISCOVER;
-			} else ret = check_DHCP_timeout();
-	   	break;
-		default :
-   		break;
-	}
-
-	return ret;
-}
-
-void    DHCP_stop(void)
-{
-   close(DHCP_SOCKET);
-   dhcp_state = STATE_DHCP_STOP;
-}
-
-uint8_t check_DHCP_timeout(void)
-{
-	uint8_t ret = DHCP_RUNNING;
-	
-	if (dhcp_retry_count < MAX_DHCP_RETRY) {
-		if (dhcp_tick_next < dhcp_tick_1s) {
-
-			switch ( dhcp_state ) {
-				case STATE_DHCP_DISCOVER :
-//					printf("<<timeout>> state : STATE_DHCP_DISCOVER\r\n");
-					send_DHCP_DISCOVER();
-				break;
-		
-				case STATE_DHCP_REQUEST :
-//					printf("<<timeout>> state : STATE_DHCP_REQUEST\r\n");
-
-					send_DHCP_REQUEST();
-				break;
-
-				case STATE_DHCP_REREQUEST :
-//					printf("<<timeout>> state : STATE_DHCP_REREQUEST\r\n");
-					
-					send_DHCP_REQUEST();
-				break;
-		
-				default :
-				break;
-			}
-
-			dhcp_tick_1s = 0;
-			dhcp_tick_next = dhcp_tick_1s + DHCP_WAIT_TIME;
-			dhcp_retry_count++;
-		}
-	} else { // timeout occurred
-
-		switch(dhcp_state) {
-			case STATE_DHCP_DISCOVER:
-				dhcp_state = STATE_DHCP_INIT;
-				ret = DHCP_FAILED;
-				break;
-			case STATE_DHCP_REQUEST:
-			case STATE_DHCP_REREQUEST:
-				send_DHCP_DISCOVER();
-				dhcp_state = STATE_DHCP_DISCOVER;
-				break;
-			default :
-				break;
-		}
-		reset_DHCP_timeout();
-	}
-	return ret;
-}
-
-int8_t check_DHCP_leasedIP(void)
-{
-	uint8_t tmp;
-	int32_t ret;
-
-	//WIZchip RCR value changed for ARP Timeout count control
-	tmp = getRCR();
-	setRCR(0x03);
-
-	// IP conflict detection : ARP request - ARP reply
-	// Broadcasting ARP Request for check the IP conflict using UDP sendto() function
-	ret = sendto(DHCP_SOCKET, (uint8_t *)"CHECK_IP_CONFLICT", 17, DHCP_allocated_ip, 5000);
-
-	// RCR value restore
-	setRCR(tmp);
-
-	if(ret == SOCKERR_TIMEOUT) {
-		// UDP send Timeout occurred : allocated IP address is unique, DHCP Success
-
-#ifdef _DHCP_DEBUG_
-		printf("\r\n> Check leased IP - OK\r\n");
-#endif
-
-		return 1;
-	} else {
-		// Received ARP reply or etc : IP address conflict occur, DHCP Failed
-		send_DHCP_DECLINE();
-
-		ret = dhcp_tick_1s;
-		while((dhcp_tick_1s - ret) < 2) ;   // wait for 1s over; wait to complete to send DECLINE message;
-
-		return 0;
-	}
-}	
-
-void DHCP_init(uint8_t s, uint8_t * buf)
-{
-   uint8_t zeroip[4] = {0,0,0,0};
-   getSHAR(DHCP_CHADDR);
-   if((DHCP_CHADDR[0] | DHCP_CHADDR[1]  | DHCP_CHADDR[2] | DHCP_CHADDR[3] | DHCP_CHADDR[4] | DHCP_CHADDR[5]) == 0x00)
-   {
-      // assign temporary mac address, you should be set SHAR before call this function.
-      DHCP_CHADDR[0] = 0x00;
-      DHCP_CHADDR[1] = 0x08;
-      DHCP_CHADDR[2] = 0xdc;      
-      DHCP_CHADDR[3] = 0x00;
-      DHCP_CHADDR[4] = 0x00;
-      DHCP_CHADDR[5] = 0x00; 
-      setSHAR(DHCP_CHADDR);     
-   }
-
-	DHCP_SOCKET = s; // SOCK_DHCP
-	pDHCPMSG = (RIP_MSG*)buf;
-	DHCP_XID = 0x12345678;
-
-	// WIZchip Netinfo Clear
-	setSIPR(zeroip);
-	setSIPR(zeroip);
-	setGAR(zeroip);
-
-	reset_DHCP_timeout();
-	dhcp_state = STATE_DHCP_INIT;
-}
-
-
-/* Rset the DHCP timeout count and retry count. */
-void reset_DHCP_timeout(void)
-{
-	dhcp_tick_1s = 0;
-	dhcp_tick_next = DHCP_WAIT_TIME;
-	dhcp_retry_count = 0;
-}
-
-void DHCP_time_handler(void)
-{
-	dhcp_tick_1s++;
-}
-
-void getIPfromDHCP(uint8_t* ip)
-{
-	ip[0] = DHCP_allocated_ip[0];
-	ip[1] = DHCP_allocated_ip[1];
-	ip[2] = DHCP_allocated_ip[2];	
-	ip[3] = DHCP_allocated_ip[3];
-}
-
-void getGWfromDHCP(uint8_t* ip)
-{
-	ip[0] =DHCP_allocated_gw[0];
-	ip[1] =DHCP_allocated_gw[1];
-	ip[2] =DHCP_allocated_gw[2];
-	ip[3] =DHCP_allocated_gw[3];			
-}
-
-void getSNfromDHCP(uint8_t* ip)
-{
-   ip[0] = DHCP_allocated_sn[0];
-   ip[1] = DHCP_allocated_sn[1];
-   ip[2] = DHCP_allocated_sn[2];
-   ip[3] = DHCP_allocated_sn[3];         
-}
-
-void getDNSfromDHCP(uint8_t* ip)
-{
-   ip[0] = DHCP_allocated_dns[0];
-   ip[1] = DHCP_allocated_dns[1];
-   ip[2] = DHCP_allocated_dns[2];
-   ip[3] = DHCP_allocated_dns[3];         
-}
-
-uint32_t getDHCPLeasetime(void)
-{
-	return dhcp_lease_time;
-}
-
-
-
-
diff --git a/drivers/wiznet5k/internet/dhcp/dhcp.h b/drivers/wiznet5k/internet/dhcp/dhcp.h
deleted file mode 100644
index ee154d506ac37..0000000000000
--- a/drivers/wiznet5k/internet/dhcp/dhcp.h
+++ /dev/null
@@ -1,150 +0,0 @@
-//*****************************************************************************
-//
-//! \file dhcp.h
-//! \brief DHCP APIs Header file.
-//! \details Processig DHCP protocol as DISCOVER, OFFER, REQUEST, ACK, NACK and DECLINE.
-//! \version 1.1.0
-//! \date 2013/11/18
-//! \par  Revision history
-//!       <2013/11/18> 1st Release
-//!       <2012/12/20> V1.1.0
-//!         1. Move unreferenced DEFINE to dhcp.c
-//!       <2012/12/26> V1.1.1
-//! \author Eric Jung & MidnightCow
-//! \copyright
-//!
-//! Copyright (c)  2013, WIZnet Co., LTD.
-//! All rights reserved.
-//! 
-//! Redistribution and use in source and binary forms, with or without 
-//! modification, are permitted provided that the following conditions 
-//! are met: 
-//! 
-//!     * Redistributions of source code must retain the above copyright 
-//! notice, this list of conditions and the following disclaimer. 
-//!     * Redistributions in binary form must reproduce the above copyright
-//! notice, this list of conditions and the following disclaimer in the
-//! documentation and/or other materials provided with the distribution. 
-//!     * Neither the name of the <ORGANIZATION> nor the names of its 
-//! contributors may be used to endorse or promote products derived 
-//! from this software without specific prior written permission. 
-//! 
-//! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-//! AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
-//! IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-//! ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE 
-//! LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
-//! CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 
-//! SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-//! INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
-//! CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 
-//! ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF 
-//! THE POSSIBILITY OF SUCH DAMAGE.
-//
-//*****************************************************************************
-#ifndef _DHCP_H_
-#define _DHCP_H_
-
-/*
- * @brief 
- * @details If you want to display debug & processing message, Define _DHCP_DEBUG_
- * @note    If defined, it depends on <stdio.h>
- */
-
-//#define _DHCP_DEBUG_
-
-/* Retry to processing DHCP */
-#define	MAX_DHCP_RETRY          2        ///< Maximum retry count
-#define	DHCP_WAIT_TIME          10       ///< Wait Time 10s
-
-/* UDP port numbers for DHCP */
-#define DHCP_SERVER_PORT      		67	      ///< DHCP server port number
-#define DHCP_CLIENT_PORT         	68	      ///< DHCP client port number
-
-#define MAGIC_COOKIE             0x63825363  ///< Any number. You can be modified it any number
-
-#define DCHP_HOST_NAME           "WIZnet\0"
-
-/* 
- * @brief return value of @ref DHCP_run()
- */
-enum
-{
-   DHCP_FAILED = 0,  ///< Processing Fail
-   DHCP_RUNNING,     ///< Processing DHCP protocol
-   DHCP_IP_ASSIGN,   ///< First Occupy IP from DHPC server      (if cbfunc == null, act as default default_ip_assign)
-   DHCP_IP_CHANGED,  ///< Change IP address by new IP address from DHCP (if cbfunc == null, act as default default_ip_update)
-   DHCP_IP_LEASED,   ///< Stand by 
-   DHCP_STOPPED      ///< Stop processing DHCP protocol
-};
-
-/*
- * @brief DHCP client initialization (outside of the main loop)
- * @param s   - socket number
- * @param buf - buffer for processing DHCP message
- */
-void DHCP_init(uint8_t s, uint8_t * buf);
-
-/*
- * @brief DHCP 1s Tick Timer handler
- * @note SHOULD BE register to your system 1s Tick timer handler 
- */
-void DHCP_time_handler(void);
-
-/* 
- * @brief Register call back function 
- * @param ip_assign   - callback func when IP is assigned from DHCP server first
- * @param ip_update   - callback func when IP is changed
- * @prarm ip_conflict - callback func when the assigned IP is conflict with others.
- */
-void reg_dhcp_cbfunc(void(*ip_assign)(void), void(*ip_update)(void), void(*ip_conflict)(void));
-
-/*
- * @brief DHCP client in the main loop
- * @return    The value is as the follow \n
- *            @ref DHCP_FAILED     \n
- *            @ref DHCP_RUNNING    \n
- *            @ref DHCP_IP_ASSIGN  \n
- *            @ref DHCP_IP_CHANGED \n
- * 			  @ref DHCP_IP_LEASED  \n
- *            @ref DHCP_STOPPED    \n
- *
- * @note This function is always called by you main task.
- */ 
-uint8_t DHCP_run(void);
-
-/*
- * @brief Stop DHCP processing
- * @note If you want to restart. call DHCP_init() and DHCP_run()
- */ 
-void    DHCP_stop(void);
-
-/* Get Network information assigned from DHCP server */
-/*
- * @brief Get IP address
- * @param ip  - IP address to be returned
- */
-void getIPfromDHCP(uint8_t* ip);
-/*
- * @brief Get Gateway address
- * @param ip  - Gateway address to be returned
- */
-void getGWfromDHCP(uint8_t* ip);
-/*
- * @brief Get Subnet mask value
- * @param ip  - Subnet mask to be returned
- */
-void getSNfromDHCP(uint8_t* ip);
-/*
- * @brief Get DNS address
- * @param ip  - DNS address to be returned
- */
-void getDNSfromDHCP(uint8_t* ip);
-
-/*
- * @brief Get the leased time by DHCP sever
- * @return unit 1s
- */
-uint32_t getDHCPLeasetime(void);
-
-#endif	/* _DHCP_H_ */
diff --git a/drivers/wiznet5k/internet/dns/dns.c b/drivers/wiznet5k/internet/dns/dns.c
deleted file mode 100644
index c0ad570c00970..0000000000000
--- a/drivers/wiznet5k/internet/dns/dns.c
+++ /dev/null
@@ -1,566 +0,0 @@
-//*****************************************************************************
-//
-//! \file dns.c
-//! \brief DNS APIs Implement file.
-//! \details Send DNS query & Receive DNS reponse.  \n
-//!          It depends on stdlib.h & string.h in ansi-c library
-//! \version 1.1.0
-//! \date 2013/11/18
-//! \par  Revision history
-//!       <2013/10/21> 1st Release
-//!       <2013/12/20> V1.1.0
-//!         1. Remove secondary DNS server in DNS_run
-//!            If 1st DNS_run failed, call DNS_run with 2nd DNS again
-//!         2. DNS_timerHandler -> DNS_time_handler
-//!         3. Remove the unused define
-//!         4. Integrated dns.h dns.c & dns_parse.h dns_parse.c into dns.h & dns.c
-//!       <2013/12/20> V1.1.0
-//!
-//! \author Eric Jung & MidnightCow
-//! \copyright
-//!
-//! Copyright (c)  2013, WIZnet Co., LTD.
-//! All rights reserved.
-//! 
-//! Redistribution and use in source and binary forms, with or without 
-//! modification, are permitted provided that the following conditions 
-//! are met: 
-//! 
-//!     * Redistributions of source code must retain the above copyright 
-//! notice, this list of conditions and the following disclaimer. 
-//!     * Redistributions in binary form must reproduce the above copyright
-//! notice, this list of conditions and the following disclaimer in the
-//! documentation and/or other materials provided with the distribution. 
-//!     * Neither the name of the <ORGANIZATION> nor the names of its 
-//! contributors may be used to endorse or promote products derived 
-//! from this software without specific prior written permission. 
-//! 
-//! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-//! AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
-//! IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-//! ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE 
-//! LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
-//! CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 
-//! SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-//! INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
-//! CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 
-//! ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF 
-//! THE POSSIBILITY OF SUCH DAMAGE.
-//
-//*****************************************************************************
-
-#include <string.h>
-#include <stdlib.h>
-
-//#include "Ethernet/socket.h"
-//#include "Internet/DNS/dns.h"
-#include "../../ethernet/socket.h"
-#include "dns.h"
-
-#ifdef _DNS_DEBUG_
-   #include <stdio.h>
-#endif
-
-#define	INITRTT		2000L	/* Initial smoothed response time */
-#define	MAXCNAME	   (MAX_DOMAIN_NAME + (MAX_DOMAIN_NAME>>1))	   /* Maximum amount of cname recursion */
-
-#define	TYPE_A		1	   /* Host address */
-#define	TYPE_NS		2	   /* Name server */
-#define	TYPE_MD		3	   /* Mail destination (obsolete) */
-#define	TYPE_MF		4	   /* Mail forwarder (obsolete) */
-#define	TYPE_CNAME	5	   /* Canonical name */
-#define	TYPE_SOA	   6	   /* Start of Authority */
-#define	TYPE_MB		7	   /* Mailbox name (experimental) */
-#define	TYPE_MG		8	   /* Mail group member (experimental) */
-#define	TYPE_MR		9	   /* Mail rename name (experimental) */
-#define	TYPE_NULL	10	   /* Null (experimental) */
-#define	TYPE_WKS	   11	   /* Well-known sockets */
-#define	TYPE_PTR	   12	   /* Pointer record */
-#define	TYPE_HINFO	13	   /* Host information */
-#define	TYPE_MINFO	14	   /* Mailbox information (experimental)*/
-#define	TYPE_MX		15	   /* Mail exchanger */
-#define	TYPE_TXT	   16	   /* Text strings */
-#define	TYPE_ANY	   255	/* Matches any type */
-
-#define	CLASS_IN	   1	   /* The ARPA Internet */
-
-/* Round trip timing parameters */
-#define	AGAIN	      8     /* Average RTT gain = 1/8 */
-#define	LAGAIN      3     /* Log2(AGAIN) */
-#define	DGAIN       4     /* Mean deviation gain = 1/4 */
-#define	LDGAIN      2     /* log2(DGAIN) */
-
-/* Header for all domain messages */
-struct dhdr
-{
-	uint16_t id;   /* Identification */
-	uint8_t	qr;      /* Query/Response */
-#define	QUERY    0
-#define	RESPONSE 1
-	uint8_t	opcode;
-#define	IQUERY   1
-	uint8_t	aa;      /* Authoratative answer */
-	uint8_t	tc;      /* Truncation */
-	uint8_t	rd;      /* Recursion desired */
-	uint8_t	ra;      /* Recursion available */
-	uint8_t	rcode;   /* Response code */
-#define	NO_ERROR       0
-#define	FORMAT_ERROR   1
-#define	SERVER_FAIL    2
-#define	NAME_ERROR     3
-#define	NOT_IMPL       4
-#define	REFUSED        5
-	uint16_t qdcount;	/* Question count */
-	uint16_t ancount;	/* Answer count */
-	uint16_t nscount;	/* Authority (name server) count */
-	uint16_t arcount;	/* Additional record count */
-};
-
-
-uint8_t* pDNSMSG;       // DNS message buffer
-uint8_t  DNS_SOCKET;    // SOCKET number for DNS
-uint16_t DNS_MSGID;     // DNS message ID
-
-extern uint32_t HAL_GetTick(void);
-uint32_t hal_sys_tick;
-
-/* converts uint16_t from network buffer to a host byte order integer. */
-uint16_t get16(uint8_t * s)
-{
-	uint16_t i;
-	i = *s++ << 8;
-	i = i + *s;
-	return i;
-}
-
-/* copies uint16_t to the network buffer with network byte order. */
-uint8_t * put16(uint8_t * s, uint16_t i)
-{
-	*s++ = i >> 8;
-	*s++ = i;
-	return s;
-}
-
-
-/*
- *              CONVERT A DOMAIN NAME TO THE HUMAN-READABLE FORM
- *
- * Description : This function converts a compressed domain name to the human-readable form
- * Arguments   : msg        - is a pointer to the reply message
- *               compressed - is a pointer to the domain name in reply message.
- *               buf        - is a pointer to the buffer for the human-readable form name.
- *               len        - is the MAX. size of buffer.
- * Returns     : the length of compressed message
- */
-int parse_name(uint8_t * msg, uint8_t * compressed, char * buf, int16_t len)
-{
-	uint16_t slen;		/* Length of current segment */
-	uint8_t * cp;
-	int clen = 0;		/* Total length of compressed name */
-	int indirect = 0;	/* Set if indirection encountered */
-	int nseg = 0;		/* Total number of segments in name */
-
-	cp = compressed;
-
-	for (;;)
-	{
-		slen = *cp++;	/* Length of this segment */
-
-		if (!indirect) clen++;
-
-		if ((slen & 0xc0) == 0xc0)
-		{
-			if (!indirect)
-				clen++;
-			indirect = 1;
-			/* Follow indirection */
-			cp = &msg[((slen & 0x3f)<<8) + *cp];
-			slen = *cp++;
-		}
-
-		if (slen == 0)	/* zero length == all done */
-			break;
-
-		len -= slen + 1;
-
-		if (len < 0) return -1;
-
-		if (!indirect) clen += slen;
-
-		while (slen-- != 0) *buf++ = (char)*cp++;
-		*buf++ = '.';
-		nseg++;
-	}
-
-	if (nseg == 0)
-	{
-		/* Root name; represent as single dot */
-		*buf++ = '.';
-		len--;
-	}
-
-	*buf++ = '\0';
-	len--;
-
-	return clen;	/* Length of compressed message */
-}
-
-/*
- *              PARSE QUESTION SECTION
- *
- * Description : This function parses the question record of the reply message.
- * Arguments   : msg - is a pointer to the reply message
- *               cp  - is a pointer to the question record.
- * Returns     : a pointer the to next record.
- */
-uint8_t * dns_question(uint8_t * msg, uint8_t * cp)
-{
-	int len;
-	char name[MAXCNAME];
-
-	len = parse_name(msg, cp, name, MAXCNAME);
-
-
-	if (len == -1) return 0;
-
-	cp += len;
-	cp += 2;		/* type */
-	cp += 2;		/* class */
-
-	return cp;
-}
-
-
-/*
- *              PARSE ANSER SECTION
- *
- * Description : This function parses the answer record of the reply message.
- * Arguments   : msg - is a pointer to the reply message
- *               cp  - is a pointer to the answer record.
- * Returns     : a pointer the to next record.
- */
-uint8_t * dns_answer(uint8_t * msg, uint8_t * cp, uint8_t * ip_from_dns)
-{
-	int len, type;
-	char name[MAXCNAME];
-
-	len = parse_name(msg, cp, name, MAXCNAME);
-
-	if (len == -1) return 0;
-
-	cp += len;
-	type = get16(cp);
-	cp += 2;		/* type */
-	cp += 2;		/* class */
-	cp += 4;		/* ttl */
-	cp += 2;		/* len */
-
-
-	switch (type)
-	{
-	case TYPE_A:
-		/* Just read the address directly into the structure */
-		ip_from_dns[0] = *cp++;
-		ip_from_dns[1] = *cp++;
-		ip_from_dns[2] = *cp++;
-		ip_from_dns[3] = *cp++;
-		break;
-	case TYPE_CNAME:
-	case TYPE_MB:
-	case TYPE_MG:
-	case TYPE_MR:
-	case TYPE_NS:
-	case TYPE_PTR:
-		/* These types all consist of a single domain name */
-		/* convert it to ASCII format */
-		len = parse_name(msg, cp, name, MAXCNAME);
-		if (len == -1) return 0;
-
-		cp += len;
-		break;
-	case TYPE_HINFO:
-		len = *cp++;
-		cp += len;
-
-		len = *cp++;
-		cp += len;
-		break;
-	case TYPE_MX:
-		cp += 2;
-		/* Get domain name of exchanger */
-		len = parse_name(msg, cp, name, MAXCNAME);
-		if (len == -1) return 0;
-
-		cp += len;
-		break;
-	case TYPE_SOA:
-		/* Get domain name of name server */
-		len = parse_name(msg, cp, name, MAXCNAME);
-		if (len == -1) return 0;
-
-		cp += len;
-
-		/* Get domain name of responsible person */
-		len = parse_name(msg, cp, name, MAXCNAME);
-		if (len == -1) return 0;
-
-		cp += len;
-
-		cp += 4;
-		cp += 4;
-		cp += 4;
-		cp += 4;
-		cp += 4;
-		break;
-	case TYPE_TXT:
-		/* Just stash */
-		break;
-	default:
-		/* Ignore */
-		break;
-	}
-
-	return cp;
-}
-
-/*
- *              PARSE THE DNS REPLY
- *
- * Description : This function parses the reply message from DNS server.
- * Arguments   : dhdr - is a pointer to the header for DNS message
- *               buf  - is a pointer to the reply message.
- *               len  - is the size of reply message.
- * Returns     : -1 - Domain name length is too big
- *                0 - Fail (Timeout or parse error)
- *                1 - Success, 
- */
-int8_t parseDNSMSG(struct dhdr * pdhdr, uint8_t * pbuf, uint8_t * ip_from_dns)
-{
-	uint16_t tmp;
-	uint16_t i;
-	uint8_t * msg;
-	uint8_t * cp;
-
-	msg = pbuf;
-	memset(pdhdr, 0, sizeof(*pdhdr));
-
-	pdhdr->id = get16(&msg[0]);
-	tmp = get16(&msg[2]);
-	if (tmp & 0x8000) pdhdr->qr = 1;
-
-	pdhdr->opcode = (tmp >> 11) & 0xf;
-
-	if (tmp & 0x0400) pdhdr->aa = 1;
-	if (tmp & 0x0200) pdhdr->tc = 1;
-	if (tmp & 0x0100) pdhdr->rd = 1;
-	if (tmp & 0x0080) pdhdr->ra = 1;
-
-	pdhdr->rcode = tmp & 0xf;
-	pdhdr->qdcount = get16(&msg[4]);
-	pdhdr->ancount = get16(&msg[6]);
-	pdhdr->nscount = get16(&msg[8]);
-	pdhdr->arcount = get16(&msg[10]);
-
-
-	/* Now parse the variable length sections */
-	cp = &msg[12];
-
-	/* Question section */
-	for (i = 0; i < pdhdr->qdcount; i++)
-	{
-		cp = dns_question(msg, cp);
-		if(!cp)
-		{
-#ifdef _DNS_DEBUG_
-			printf("MAX_DOMAIN_NAME is too small, it should be redefined in dns.h\r\n");
-#endif
-			return -1;
-		}
-	}
-
-	/* Answer section */
-	for (i = 0; i < pdhdr->ancount; i++)
-	{
-		cp = dns_answer(msg, cp, ip_from_dns);
-		if(!cp)
-		{
-#ifdef _DNS_DEBUG_
-			printf("MAX_DOMAIN_NAME is too small, it should be redefined in dns.h\r\n");
-#endif
-			return -1;
-		}
-
-	}
-
-	/* Name server (authority) section */
-	for (i = 0; i < pdhdr->nscount; i++)
-	{
-		;
-	}
-
-	/* Additional section */
-	for (i = 0; i < pdhdr->arcount; i++)
-	{
-		;
-	}
-
-	if(pdhdr->rcode == 0) return 1;		// No error
-	else return 0;
-}
-
-
-/*
- *              MAKE DNS QUERY MESSAGE
- *
- * Description : This function makes DNS query message.
- * Arguments   : op   - Recursion desired
- *               name - is a pointer to the domain name.
- *               buf  - is a pointer to the buffer for DNS message.
- *               len  - is the MAX. size of buffer.
- * Returns     : the pointer to the DNS message.
- */
-int16_t dns_makequery(uint16_t op, char * name, uint8_t * buf, uint16_t len)
-{
-	uint8_t *cp;
-	char *cp1;
-	char sname[MAXCNAME];
-	char *dname;
-	uint16_t p;
-	uint16_t dlen;
-
-	cp = buf;
-
-	DNS_MSGID++;
-	cp = put16(cp, DNS_MSGID);
-	p = (op << 11) | 0x0100;			/* Recursion desired */
-	cp = put16(cp, p);
-	cp = put16(cp, 1);
-	cp = put16(cp, 0);
-	cp = put16(cp, 0);
-	cp = put16(cp, 0);
-
-	strcpy(sname, name);
-	dname = sname;
-	dlen = strlen(dname);
-	for (;;)
-	{
-		/* Look for next dot */
-		cp1 = strchr(dname, '.');
-
-		if (cp1 != NULL) len = cp1 - dname;	/* More to come */
-		else len = dlen;			/* Last component */
-
-		*cp++ = len;				/* Write length of component */
-		if (len == 0) break;
-
-		/* Copy component up to (but not including) dot */
-		memcpy(cp, dname, len);
-		cp += len;
-		if (cp1 == NULL)
-		{
-			*cp++ = 0;			/* Last one; write null and finish */
-			break;
-		}
-		dname += len+1;
-		dlen -= len+1;
-	}
-
-	cp = put16(cp, 0x0001);				/* type */
-	cp = put16(cp, 0x0001);				/* class */
-
-	return ((int16_t)((uint32_t)(cp) - (uint32_t)(buf)));
-}
-
-/*
- *              CHECK DNS TIMEOUT
- *
- * Description : This function check the DNS timeout
- * Arguments   : None.
- * Returns     : -1 - timeout occurred, 0 - timer over, but no timeout, 1 - no timer over, no timeout occur
- * Note        : timeout : retry count and timer both over.
- */
-
-int8_t check_DNS_timeout(void)
-{
-	static uint8_t retry_count;
-
-    uint32_t tick = HAL_GetTick();
-	if(tick - hal_sys_tick >= DNS_WAIT_TIME * 1000)
-	{
-		hal_sys_tick = tick;
-		if(retry_count >= MAX_DNS_RETRY) {
-			retry_count = 0;
-			return -1; // timeout occurred
-		}
-		retry_count++;
-		return 0; // timer over, but no timeout
-	}
-
-	return 1; // no timer over, no timeout occur
-}
-
-
-
-/* DNS CLIENT INIT */
-void DNS_init(uint8_t s, uint8_t * buf)
-{
-	DNS_SOCKET = s; // SOCK_DNS
-	pDNSMSG = buf; // User's shared buffer
-	DNS_MSGID = DNS_MSG_ID;
-}
-
-/* DNS CLIENT RUN */
-int8_t DNS_run(uint8_t * dns_ip, uint8_t * name, uint8_t * ip_from_dns)
-{
-	int8_t ret;
-	struct dhdr dhp;
-	uint8_t ip[4];
-	uint16_t len, port;
-	int8_t ret_check_timeout;
-
-        hal_sys_tick = HAL_GetTick();
-   
-   // Socket open
-   WIZCHIP_EXPORT(socket)(DNS_SOCKET, Sn_MR_UDP, 0, 0);
-
-#ifdef _DNS_DEBUG_
-	printf("> DNS Query to DNS Server : %d.%d.%d.%d\r\n", dns_ip[0], dns_ip[1], dns_ip[2], dns_ip[3]);
-#endif
-
-	len = dns_makequery(0, (char *)name, pDNSMSG, MAX_DNS_BUF_SIZE);
-	WIZCHIP_EXPORT(sendto)(DNS_SOCKET, pDNSMSG, len, dns_ip, IPPORT_DOMAIN);
-
-	while (1)
-	{
-		if ((len = getSn_RX_RSR(DNS_SOCKET)) > 0)
-		{
-			if (len > MAX_DNS_BUF_SIZE) len = MAX_DNS_BUF_SIZE;
-			len = WIZCHIP_EXPORT(recvfrom)(DNS_SOCKET, pDNSMSG, len, ip, &port);
-      #ifdef _DNS_DEBUG_
-	      printf("> Receive DNS message from %d.%d.%d.%d(%d). len = %d\r\n", ip[0], ip[1], ip[2], ip[3],port,len);
-      #endif
-         ret = parseDNSMSG(&dhp, pDNSMSG, ip_from_dns);
-			break;
-		}
-		// Check Timeout
-		ret_check_timeout = check_DNS_timeout();
-		if (ret_check_timeout < 0) {
-
-#ifdef _DNS_DEBUG_
-			printf("> DNS Server is not responding : %d.%d.%d.%d\r\n", dns_ip[0], dns_ip[1], dns_ip[2], dns_ip[3]);
-#endif
-			return 0; // timeout occurred
-		}
-		else if (ret_check_timeout == 0) {
-
-#ifdef _DNS_DEBUG_
-			printf("> DNS Timeout\r\n");
-#endif
-			WIZCHIP_EXPORT(sendto)(DNS_SOCKET, pDNSMSG, len, dns_ip, IPPORT_DOMAIN);
-		}
-	}
-	WIZCHIP_EXPORT(close)(DNS_SOCKET);
-	// Return value
-	// 0 > :  failed / 1 - success
-	return ret;
-}
diff --git a/drivers/wiznet5k/internet/dns/dns.h b/drivers/wiznet5k/internet/dns/dns.h
deleted file mode 100644
index de0039515e28f..0000000000000
--- a/drivers/wiznet5k/internet/dns/dns.h
+++ /dev/null
@@ -1,96 +0,0 @@
-//*****************************************************************************
-//
-//! \file dns.h
-//! \brief DNS APIs Header file.
-//! \details Send DNS query & Receive DNS reponse. 
-//! \version 1.1.0
-//! \date 2013/11/18
-//! \par  Revision history
-//!       <2013/10/21> 1st Release
-//!       <2013/12/20> V1.1.0
-//!         1. Remove secondary DNS server in DNS_run
-//!            If 1st DNS_run failed, call DNS_run with 2nd DNS again
-//!         2. DNS_timerHandler -> DNS_time_handler
-//!         3. Move the no reference define to dns.c
-//!         4. Integrated dns.h dns.c & dns_parse.h dns_parse.c into dns.h & dns.c
-//!       <2013/12/20> V1.1.0
-//!
-//! \author Eric Jung & MidnightCow
-//! \copyright
-//!
-//! Copyright (c)  2013, WIZnet Co., LTD.
-//! All rights reserved.
-//! 
-//! Redistribution and use in source and binary forms, with or without 
-//! modification, are permitted provided that the following conditions 
-//! are met: 
-//! 
-//!     * Redistributions of source code must retain the above copyright 
-//! notice, this list of conditions and the following disclaimer. 
-//!     * Redistributions in binary form must reproduce the above copyright
-//! notice, this list of conditions and the following disclaimer in the
-//! documentation and/or other materials provided with the distribution. 
-//!     * Neither the name of the <ORGANIZATION> nor the names of its 
-//! contributors may be used to endorse or promote products derived 
-//! from this software without specific prior written permission. 
-//! 
-//! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-//! AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
-//! IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-//! ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE 
-//! LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
-//! CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 
-//! SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-//! INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
-//! CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 
-//! ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF 
-//! THE POSSIBILITY OF SUCH DAMAGE.
-//
-//*****************************************************************************
-
-#ifndef	_DNS_H_
-#define	_DNS_H_
-
-#include <stdint.h>
-/*
- * @brief Define it for Debug & Monitor DNS processing.
- * @note If defined, it depends on <stdio.h>
- */
-
-//#define _DNS_DEBUG_
-
-#define	MAX_DNS_BUF_SIZE	256		///< maximum size of DNS buffer. */
-/*
- * @brief Maximum length of your queried Domain name
- * @todo SHOULD BE defined it equal as or greater than your Domain name length + null character(1)
- * @note SHOULD BE careful to stack overflow because it is allocated 1.5 times as MAX_DOMAIN_NAME in stack.
- */
-#define  MAX_DOMAIN_NAME   32       // for example "www.google.com"
-
-#define	MAX_DNS_RETRY     2        ///< Requery Count
-#define	DNS_WAIT_TIME     4        ///< Wait response time. unit 1s.
-
-#define	IPPORT_DOMAIN     53       ///< DNS server port number
-
-#define DNS_MSG_ID         0x1122   ///< ID for DNS message. You can be modified it any number
-/*
- * @brief DNS process initialize
- * @param s   : Socket number for DNS
- * @param buf : Buffer for DNS message
- */
-void DNS_init(uint8_t s, uint8_t * buf);
-
-/*
- * @brief DNS process
- * @details Send DNS query and receive DNS response
- * @param dns_ip        : DNS server ip address
- * @param name          : Domain name to be queried
- * @param ip_from_dns   : IP address from DNS server
- * @return  -1 : failed. @ref MAX_DOMIN_NAME is too small \n
- *           0 : failed  (Timeout or Parse error)\n
- *           1 : success
- * @note This function blocks until success or fail. max time = @ref MAX_DNS_RETRY * @ref DNS_WAIT_TIME
- */
-int8_t DNS_run(uint8_t * dns_ip, uint8_t * name, uint8_t * ip_from_dns);
-
-#endif	/* _DNS_H_ */

From 8308f9c977adf322b264e5fbec6dd84315231eb4 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sat, 20 Aug 2022 11:25:34 +0200
Subject: [PATCH 2509/3533] extmod/network_wiznet5k: Use the configured DNS
 address if available.

Instead of the default 8.8.8.8.  The change was suggested by @omogenot.
---
 extmod/network_wiznet5k.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/extmod/network_wiznet5k.c b/extmod/network_wiznet5k.c
index 89c933c2d4545..95c852d7f7299 100644
--- a/extmod/network_wiznet5k.c
+++ b/extmod/network_wiznet5k.c
@@ -397,6 +397,9 @@ STATIC int wiznet5k_gethostbyname(mp_obj_t nic, const char *name, mp_uint_t len,
     uint8_t dns_ip[MOD_NETWORK_IPADDR_BUF_SIZE] = {8, 8, 8, 8};
     uint8_t *buf = m_new(uint8_t, MAX_DNS_BUF_SIZE);
     DNS_init(2, buf);
+    if (wiznet5k_obj.netinfo.dns[0]) {
+        memcpy(dns_ip, wiznet5k_obj.netinfo.dns, MOD_NETWORK_IPADDR_BUF_SIZE);
+    }
     mp_int_t ret = DNS_run(dns_ip, (uint8_t *)name, out_ip);
     m_del(uint8_t, buf, MAX_DNS_BUF_SIZE);
     if (ret == 1) {

From 47c45d0e7fda10f4a62b7017d48ae452203b22f0 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Mon, 22 Aug 2022 08:09:02 +0200
Subject: [PATCH 2510/3533] rp2/machine_wdt: Check for the maximum timeout
 value of watchdog.

The value will be checked for timeout <= 8388.  Notes were added to the
documentation.
---
 docs/library/machine.WDT.rst | 5 +++--
 docs/rp2/quickref.rst        | 1 +
 ports/rp2/machine_wdt.c      | 9 ++++++++-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/docs/library/machine.WDT.rst b/docs/library/machine.WDT.rst
index 8c81e10ea5817..95893cec36be7 100644
--- a/docs/library/machine.WDT.rst
+++ b/docs/library/machine.WDT.rst
@@ -15,7 +15,7 @@ Example usage::
     wdt = WDT(timeout=2000)  # enable it with a timeout of 2s
     wdt.feed()
 
-Availability of this class: pyboard, WiPy, esp8266, esp32.
+Availability of this class: pyboard, WiPy, esp8266, esp32, rp2040, mimxrt.
 
 Constructors
 ------------
@@ -26,7 +26,8 @@ Constructors
    Once it is running the timeout cannot be changed and the WDT cannot be stopped either.
 
    Notes: On the esp32 the minimum timeout is 1 second. On the esp8266 a timeout
-   cannot be specified, it is determined by the underlying system.
+   cannot be specified, it is determined by the underlying system. On rp2040 devices,
+   the maximum timeout is 8388 ms.
 
 Methods
 -------
diff --git a/docs/rp2/quickref.rst b/docs/rp2/quickref.rst
index 4824f390ebfbe..430c130c6e865 100644
--- a/docs/rp2/quickref.rst
+++ b/docs/rp2/quickref.rst
@@ -296,6 +296,7 @@ See :ref:`machine.WDT <machine.WDT>`. ::
     wdt = WDT(timeout=5000)
     wdt.feed()
 
+The maximum value for timeout is 8388 ms.
 
 OneWire driver
 --------------
diff --git a/ports/rp2/machine_wdt.c b/ports/rp2/machine_wdt.c
index 38e0597018d64..d6914a4f2615d 100644
--- a/ports/rp2/machine_wdt.c
+++ b/ports/rp2/machine_wdt.c
@@ -29,6 +29,9 @@
 
 #include "hardware/watchdog.h"
 
+// The maximum timeout in milliseconds is: 0xffffff / 2 / 1000
+#define WDT_TIMEOUT_MAX 8388
+
 typedef struct _machine_wdt_obj_t {
     mp_obj_base_t base;
 } machine_wdt_obj_t;
@@ -53,7 +56,11 @@ STATIC mp_obj_t machine_wdt_make_new(const mp_obj_type_t *type, size_t n_args, s
     }
 
     // Start the watchdog (timeout is in milliseconds).
-    watchdog_enable(args[ARG_timeout].u_int, false);
+    uint32_t timeout = args[ARG_timeout].u_int;
+    if (timeout > WDT_TIMEOUT_MAX) {
+        mp_raise_ValueError(MP_ERROR_TEXT("timeout exceeds " MP_STRINGIFY(WDT_TIMEOUT_MAX)));
+    }
+    watchdog_enable(timeout, false);
 
     return MP_OBJ_FROM_PTR(&machine_wdt);
 }

From 98d1c50159fe9427d72ec358ba0219eaebb1d991 Mon Sep 17 00:00:00 2001
From: glenn20 <glenn.moloney@gmail.com>
Date: Sun, 31 Jul 2022 16:36:10 +1000
Subject: [PATCH 2511/3533] esp32/network_wlan: Use esp_wifi_set/get_channel to
 config wifi channel.

Set the channel with esp_wifi_set_channel(), which adds support for setting
the channel of the STA interface

Get the channel with esp_wifi_get_channel() which returns the actual wifi
channel of the radio, rather than the configured channel.
---
 ports/esp32/network_wlan.c | 27 ++++++++++++++++++++++-----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/ports/esp32/network_wlan.c b/ports/esp32/network_wlan.c
index 9b2200e4ff9ce..501dc40f275a4 100644
--- a/ports/esp32/network_wlan.c
+++ b/ports/esp32/network_wlan.c
@@ -448,8 +448,22 @@ STATIC mp_obj_t network_wlan_config(size_t n_args, const mp_obj_t *args, mp_map_
                         break;
                     }
                     case MP_QSTR_channel: {
-                        req_if = WIFI_IF_AP;
-                        cfg.ap.channel = mp_obj_get_int(kwargs->table[i].value);
+                        uint8_t primary;
+                        wifi_second_chan_t secondary;
+                        // Get the current value of secondary
+                        esp_exceptions(esp_wifi_get_channel(&primary, &secondary));
+                        primary = mp_obj_get_int(kwargs->table[i].value);
+                        esp_err_t err = esp_wifi_set_channel(primary, secondary);
+                        if (err == ESP_ERR_INVALID_ARG) {
+                            // May need to swap secondary channel above to below or below to above
+                            secondary = (
+                                (secondary == WIFI_SECOND_CHAN_ABOVE)
+                                ? WIFI_SECOND_CHAN_BELOW
+                                : (secondary == WIFI_SECOND_CHAN_BELOW)
+                                    ? WIFI_SECOND_CHAN_ABOVE
+                                    : WIFI_SECOND_CHAN_NONE);
+                            esp_exceptions(esp_wifi_set_channel(primary, secondary));
+                        }
                         break;
                     }
                     case MP_QSTR_hostname:
@@ -535,10 +549,13 @@ STATIC mp_obj_t network_wlan_config(size_t n_args, const mp_obj_t *args, mp_map_
             req_if = WIFI_IF_AP;
             val = MP_OBJ_NEW_SMALL_INT(cfg.ap.authmode);
             break;
-        case MP_QSTR_channel:
-            req_if = WIFI_IF_AP;
-            val = MP_OBJ_NEW_SMALL_INT(cfg.ap.channel);
+        case MP_QSTR_channel: {
+            uint8_t channel;
+            wifi_second_chan_t second;
+            esp_exceptions(esp_wifi_get_channel(&channel, &second));
+            val = MP_OBJ_NEW_SMALL_INT(channel);
             break;
+        }
         case MP_QSTR_hostname:
         case MP_QSTR_dhcp_hostname: {
             const char *s;

From 76f2e3e62bd2bc177a62649bae34b67d9bd2c8b1 Mon Sep 17 00:00:00 2001
From: glenn20 <glenn.moloney@gmail.com>
Date: Sun, 31 Jul 2022 18:17:40 +1000
Subject: [PATCH 2512/3533] esp32/network_wlan: Add support to set/get the wifi
 protocol.

Add 'protocol' option to WLAN.config() to support setting/getting the wifi
protocol modes: MODE_11G|MODE_11G|MODE_11N.
---
 ports/esp32/network_wlan.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/ports/esp32/network_wlan.c b/ports/esp32/network_wlan.c
index 501dc40f275a4..4f74262afc381 100644
--- a/ports/esp32/network_wlan.c
+++ b/ports/esp32/network_wlan.c
@@ -490,6 +490,10 @@ STATIC mp_obj_t network_wlan_config(size_t n_args, const mp_obj_t *args, mp_map_
                         esp_exceptions(esp_wifi_set_max_tx_power(power));
                         break;
                     }
+                    case MP_QSTR_protocol: {
+                        esp_exceptions(esp_wifi_set_protocol(self->if_id, mp_obj_get_int(kwargs->table[i].value)));
+                        break;
+                    }
                     default:
                         goto unknown;
                 }
@@ -578,6 +582,12 @@ STATIC mp_obj_t network_wlan_config(size_t n_args, const mp_obj_t *args, mp_map_
             val = mp_obj_new_float(power * 0.25);
             break;
         }
+        case MP_QSTR_protocol: {
+            uint8_t protocol_bitmap;
+            esp_exceptions(esp_wifi_get_protocol(self->if_id, &protocol_bitmap));
+            val = MP_OBJ_NEW_SMALL_INT(protocol_bitmap);
+            break;
+        }
         default:
             goto unknown;
     }

From 0507f239e812fa7ae57c1e172c53eae8fc37cd18 Mon Sep 17 00:00:00 2001
From: glenn20 <glenn.moloney@gmail.com>
Date: Sun, 31 Jul 2022 18:19:18 +1000
Subject: [PATCH 2513/3533] esp32/modnetwork: Add network.MODE_LR constant.

Adds the MODE_LR constant to the network module to support Espressif's
long-range communication protocol.
---
 ports/esp32/modnetwork.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/esp32/modnetwork.c b/ports/esp32/modnetwork.c
index 45231c42307c8..7429274c1571d 100644
--- a/ports/esp32/modnetwork.c
+++ b/ports/esp32/modnetwork.c
@@ -244,6 +244,7 @@ STATIC const mp_rom_map_elem_t mp_module_network_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_MODE_11B), MP_ROM_INT(WIFI_PROTOCOL_11B) },
     { MP_ROM_QSTR(MP_QSTR_MODE_11G), MP_ROM_INT(WIFI_PROTOCOL_11G) },
     { MP_ROM_QSTR(MP_QSTR_MODE_11N), MP_ROM_INT(WIFI_PROTOCOL_11N) },
+    { MP_ROM_QSTR(MP_QSTR_MODE_LR), MP_ROM_INT(WIFI_PROTOCOL_LR) },
 
     { MP_ROM_QSTR(MP_QSTR_AUTH_OPEN), MP_ROM_INT(WIFI_AUTH_OPEN) },
     { MP_ROM_QSTR(MP_QSTR_AUTH_WEP), MP_ROM_INT(WIFI_AUTH_WEP) },

From e6e60f4330c176e1a9443a994ba29ea155d7aca7 Mon Sep 17 00:00:00 2001
From: glenn20 <glenn.moloney@gmail.com>
Date: Fri, 12 Aug 2022 16:53:48 +1000
Subject: [PATCH 2514/3533] esp8266/modnetwork: Add support for
 WLAN.config(protocol=XX) option.

Following esp32.  This is preferred to using the phy_mode() function.
---
 ports/esp8266/modnetwork.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/ports/esp8266/modnetwork.c b/ports/esp8266/modnetwork.c
index dbc12f74d4ae9..5240d3b320649 100644
--- a/ports/esp8266/modnetwork.c
+++ b/ports/esp8266/modnetwork.c
@@ -406,6 +406,10 @@ STATIC mp_obj_t esp_config(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs
                         }
                         break;
                     }
+                    case MP_QSTR_protocol: {
+                        wifi_set_phy_mode(mp_obj_get_int(kwargs->table[i].value));
+                        break;
+                    }
                     default:
                         goto unknown;
                 }
@@ -473,6 +477,10 @@ STATIC mp_obj_t esp_config(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs
             }
             break;
         }
+        case MP_QSTR_protocol: {
+            val = mp_obj_new_int(wifi_get_phy_mode());
+            break;
+        }
         default:
             goto unknown;
     }

From 13dceaa4ea4336eddb763985c2274cfa497c8e82 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Tue, 12 Jul 2022 18:25:41 +0200
Subject: [PATCH 2515/3533] esp32/machine_uart: Change sendbreak time to be at
 least 15 bit times.

It used to be 10 bit times, which is too short.  The break state must be
longer than a regular character time, at least 13 bit times.  This is now
implemented by reducing the baudrate while sending the "0".  The break time
will now vary with data length and parity setting, but will at least be 15
bit times.

Tested with a GENERIC_SPIRAM, GENERIC_C3 and UM_TINYS2 board.
---
 ports/esp32/machine_uart.c | 23 +++++++----------------
 1 file changed, 7 insertions(+), 16 deletions(-)

diff --git a/ports/esp32/machine_uart.c b/ports/esp32/machine_uart.c
index 49ce78b1b24c9..28110e39f3781 100644
--- a/ports/esp32/machine_uart.c
+++ b/ports/esp32/machine_uart.c
@@ -399,28 +399,19 @@ STATIC mp_obj_t machine_uart_sendbreak(mp_obj_t self_in) {
     machine_uart_obj_t *self = MP_OBJ_TO_PTR(self_in);
 
     // Save settings
-    uart_word_length_t word_length;
-    uart_parity_t parity;
-    uart_get_word_length(self->uart_num, &word_length);
-    uart_get_parity(self->uart_num, &parity);
+    uint32_t baudrate;
+    uart_get_baudrate(self->uart_num, &baudrate);
 
-    // Synthesise the break condition by either a longer word or using even parity
+    // Synthesise the break condition by reducing the baud rate,
+    // and cater for the worst case of 5 data bits, no parity.
     uart_wait_tx_done(self->uart_num, pdMS_TO_TICKS(1000));
-    if (word_length != UART_DATA_8_BITS) {
-        uart_set_word_length(self->uart_num, UART_DATA_8_BITS);
-    } else if (parity == UART_PARITY_DISABLE) {
-        uart_set_parity(self->uart_num, UART_PARITY_EVEN);
-    } else {
-        // Cannot synthesise break
-        mp_raise_OSError(MP_EPERM);
-    }
+    uart_set_baudrate(self->uart_num, baudrate * 6 / 15);
     char buf[1] = {0};
     uart_write_bytes(self->uart_num, buf, 1);
     uart_wait_tx_done(self->uart_num, pdMS_TO_TICKS(1000));
 
-    // Restore original settings
-    uart_set_word_length(self->uart_num, word_length);
-    uart_set_parity(self->uart_num, parity);
+    // Restore original setting
+    uart_set_baudrate(self->uart_num, baudrate);
 
     return mp_const_none;
 }

From 8139cbcf6bfad3f9b14865a5315bc83b5c5ecc7a Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Wed, 17 Aug 2022 08:44:03 +0200
Subject: [PATCH 2516/3533] esp32/machine_timer: Support all init arguments in
 Timer constructor.

Following the usual style of instantiation and init().
---
 ports/esp32/machine_timer.c | 32 ++++++++++++++++++++++----------
 1 file changed, 22 insertions(+), 10 deletions(-)

diff --git a/ports/esp32/machine_timer.c b/ports/esp32/machine_timer.c
index 8541bcbfdb486..66969b3a954f2 100644
--- a/ports/esp32/machine_timer.c
+++ b/ports/esp32/machine_timer.c
@@ -68,6 +68,7 @@ typedef struct _machine_timer_obj_t {
 const mp_obj_type_t machine_timer_type;
 
 STATIC void machine_timer_disable(machine_timer_obj_t *self);
+STATIC mp_obj_t machine_timer_init_helper(machine_timer_obj_t *self, mp_uint_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args);
 
 void machine_timer_deinit_all(void) {
     // Disable, deallocate and remove all timers from list
@@ -94,24 +95,35 @@ STATIC void machine_timer_print(const mp_print_t *print, mp_obj_t self_in, mp_pr
 }
 
 STATIC mp_obj_t machine_timer_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
-    mp_arg_check_num(n_args, n_kw, 1, 1, false);
+    mp_arg_check_num(n_args, n_kw, 1, MP_OBJ_FUN_ARGS_MAX, true);
     mp_uint_t group = (mp_obj_get_int(args[0]) >> 1) & 1;
     mp_uint_t index = mp_obj_get_int(args[0]) & 1;
 
-    // Check whether the timer is already initialized, if so return it
+    machine_timer_obj_t *self = NULL;
+
+    // Check whether the timer is already initialized, if so use it
     for (machine_timer_obj_t *t = MP_STATE_PORT(machine_timer_obj_head); t; t = t->next) {
         if (t->group == group && t->index == index) {
-            return t;
+            self = t;
+            break;
         }
     }
+    // The timer does not exist, create it.
+    if (self == NULL) {
+        self = mp_obj_malloc(machine_timer_obj_t, &machine_timer_type);
+        self->group = group;
+        self->index = index;
+
+        // Add the timer to the linked-list of timers
+        self->next = MP_STATE_PORT(machine_timer_obj_head);
+        MP_STATE_PORT(machine_timer_obj_head) = self;
+    }
 
-    machine_timer_obj_t *self = mp_obj_malloc(machine_timer_obj_t, &machine_timer_type);
-    self->group = group;
-    self->index = index;
-
-    // Add the timer to the linked-list of timers
-    self->next = MP_STATE_PORT(machine_timer_obj_head);
-    MP_STATE_PORT(machine_timer_obj_head) = self;
+    if (n_args > 1 || n_kw > 0) {
+        mp_map_t kw_args;
+        mp_map_init_fixed_table(&kw_args, n_kw, args + n_args);
+        machine_timer_init_helper(self, n_args - 1, args + 1, &kw_args);
+    }
 
     return self;
 }

From 1fbf0efaebd597207f32a910d635a94ec9f6ef69 Mon Sep 17 00:00:00 2001
From: Damiano Mazzella <damianomazzella@gmail.com>
Date: Tue, 23 Aug 2022 16:50:24 +0200
Subject: [PATCH 2517/3533] stm32/sdram: Enable MPU for unaligned access on H7
 MCUs.

So that SDRAM can be used as the heap on ARDUINO_PORTENTA_H7, for example.

Fixes issue #9087.
---
 ports/stm32/sdram.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/stm32/sdram.c b/ports/stm32/sdram.c
index a94b802ea49fb..fb0e5a8688d30 100644
--- a/ports/stm32/sdram.c
+++ b/ports/stm32/sdram.c
@@ -244,7 +244,7 @@ static void sdram_init_seq(SDRAM_HandleTypeDef
     #define REFRESH_COUNT (MICROPY_HW_SDRAM_REFRESH_RATE * 90000 / 8192 - 20)
     HAL_SDRAM_ProgramRefreshRate(hsdram, REFRESH_COUNT);
 
-    #if defined(STM32F7)
+    #if defined(STM32F7) || defined(STM32H7)
     /* Enable MPU for the SDRAM Memory Region to allow non-aligned
        accesses (hard-fault otherwise)
        Initially disable all access for the entire SDRAM memory space,

From 923375380b29aca68b50b3ec685c6d83465fd63d Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Wed, 30 Mar 2022 10:50:18 +1100
Subject: [PATCH 2518/3533] stm32/boards: Increase mboot region to 32k for WB55
 boards.

If mboot is built with support for packing (signing/encryption) it needs up
to 32KiB.  So for simplicity increase the mboot region to 32KiB
unconditionally for WB55 boards (custom WB55 board configurations can still
provide their own linker scripts to override this).
---
 ports/stm32/boards/NUCLEO_WB55/mpconfigboard.mk    | 2 +-
 ports/stm32/boards/USBDONGLE_WB55/mpconfigboard.mk | 2 +-
 ports/stm32/boards/stm32wb55xg.ld                  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ports/stm32/boards/NUCLEO_WB55/mpconfigboard.mk b/ports/stm32/boards/NUCLEO_WB55/mpconfigboard.mk
index 349ce46d79588..2e6ce1fe8f77e 100644
--- a/ports/stm32/boards/NUCLEO_WB55/mpconfigboard.mk
+++ b/ports/stm32/boards/NUCLEO_WB55/mpconfigboard.mk
@@ -6,7 +6,7 @@ STARTUP_FILE = $(STM32LIB_CMSIS_BASE)/Source/Templates/gcc/startup_stm32wb55xx_c
 ifeq ($(USE_MBOOT),1)
 # When using Mboot all the text goes together after the bootloader
 LD_FILES = boards/stm32wb55xg.ld boards/common_bl.ld
-TEXT0_ADDR = 0x08004000
+TEXT0_ADDR = 0x08008000
 else
 # When not using Mboot the text goes at the start of flash
 LD_FILES = boards/stm32wb55xg.ld boards/common_basic.ld
diff --git a/ports/stm32/boards/USBDONGLE_WB55/mpconfigboard.mk b/ports/stm32/boards/USBDONGLE_WB55/mpconfigboard.mk
index 349ce46d79588..2e6ce1fe8f77e 100644
--- a/ports/stm32/boards/USBDONGLE_WB55/mpconfigboard.mk
+++ b/ports/stm32/boards/USBDONGLE_WB55/mpconfigboard.mk
@@ -6,7 +6,7 @@ STARTUP_FILE = $(STM32LIB_CMSIS_BASE)/Source/Templates/gcc/startup_stm32wb55xx_c
 ifeq ($(USE_MBOOT),1)
 # When using Mboot all the text goes together after the bootloader
 LD_FILES = boards/stm32wb55xg.ld boards/common_bl.ld
-TEXT0_ADDR = 0x08004000
+TEXT0_ADDR = 0x08008000
 else
 # When not using Mboot the text goes at the start of flash
 LD_FILES = boards/stm32wb55xg.ld boards/common_basic.ld
diff --git a/ports/stm32/boards/stm32wb55xg.ld b/ports/stm32/boards/stm32wb55xg.ld
index 841c32b8a0fb8..9b1e5bca147d5 100644
--- a/ports/stm32/boards/stm32wb55xg.ld
+++ b/ports/stm32/boards/stm32wb55xg.ld
@@ -6,7 +6,7 @@
 MEMORY
 {
     FLASH (rx)      : ORIGIN = 0x08000000, LENGTH = 512K /* sectors 0-127 */
-    FLASH_APP (rx)  : ORIGIN = 0x08004000, LENGTH = 496K /* sectors 4-127 */
+    FLASH_APP (rx)  : ORIGIN = 0x08008000, LENGTH = 480K /* sectors 8-127 */
     FLASH_FS (r)    : ORIGIN = 0x08080000, LENGTH = 256K /* sectors 128-191 */
     RAM (xrw)       : ORIGIN = 0x20000000, LENGTH = 192K /* SRAM1 */
     RAM2A (xrw)     : ORIGIN = 0x20030000, LENGTH = 10K  /* SRAM2A */

From 492ba5eaf2c6e1e9fe8e31fd2e8f47fac6188673 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Mon, 15 Aug 2022 16:20:40 +1000
Subject: [PATCH 2519/3533] stm32: Move board variant config to
 mpconfigboard.mk.

Rather than having the autobuild know about the particular variants, have
the mpconfigboard.mk describe them and make autobuild discover them
automatically.

Adds a "query-variants" target to stm32/Makefile to allow the set of
possible variants to be queried.

Removes pybv3 from the autobuild as this isn't use by the downloads page.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/stm32/Makefile                          |  3 ++
 .../stm32/boards/PYBLITEV10/mpconfigboard.mk  | 21 ++++++++++++
 ports/stm32/boards/PYBV10/mpconfigboard.mk    | 21 ++++++++++++
 ports/stm32/boards/PYBV11/mpconfigboard.mk    | 21 ++++++++++++
 tools/autobuild/build-stm32-extra.sh          | 34 +++++++------------
 5 files changed, 79 insertions(+), 21 deletions(-)

diff --git a/ports/stm32/Makefile b/ports/stm32/Makefile
index 7c912f4f0b23a..f981f8f3eb057 100644
--- a/ports/stm32/Makefile
+++ b/ports/stm32/Makefile
@@ -37,6 +37,9 @@ include $(TOP)/extmod/extmod.mk
 
 GIT_SUBMODULES += lib/libhydrogen lib/lwip lib/mbedtls lib/stm32lib
 
+query-variants:
+	$(ECHO) "VARIANTS:" $(BOARD_VARIANTS)
+
 LD_DIR=boards
 USBDEV_DIR=usbdev
 #USBHOST_DIR=usbhost
diff --git a/ports/stm32/boards/PYBLITEV10/mpconfigboard.mk b/ports/stm32/boards/PYBLITEV10/mpconfigboard.mk
index df9506522574f..89977b74ead45 100644
--- a/ports/stm32/boards/PYBLITEV10/mpconfigboard.mk
+++ b/ports/stm32/boards/PYBLITEV10/mpconfigboard.mk
@@ -4,3 +4,24 @@ AF_FILE = boards/stm32f411_af.csv
 LD_FILES = boards/stm32f411.ld boards/common_ifs.ld
 TEXT0_ADDR = 0x08000000
 TEXT1_ADDR = 0x08020000
+
+# Provide different variants for the downloads page.
+BOARD_VARIANTS += "dp thread dp-thread network"
+
+ifeq ($(BOARD_VARIANT),"dp")
+MICROPY_FLOAT_IMPL=double
+endif
+
+ifeq ($(BOARD_VARIANT),"thread")
+CFLAGS += -DMICROPY_PY_THREAD=1
+endif
+
+ifeq ($(BOARD_VARIANT),"dp-thread")
+MICROPY_FLOAT_IMPL=double
+CFLAGS += -DMICROPY_PY_THREAD=1
+endif
+
+ifeq ($(BOARD_VARIANT),"network")
+MICROPY_PY_NETWORK_WIZNET5K=5200
+MICROPY_PY_CC3K=1
+endif
diff --git a/ports/stm32/boards/PYBV10/mpconfigboard.mk b/ports/stm32/boards/PYBV10/mpconfigboard.mk
index cb78a7846d933..071ae6eb7c6b5 100644
--- a/ports/stm32/boards/PYBV10/mpconfigboard.mk
+++ b/ports/stm32/boards/PYBV10/mpconfigboard.mk
@@ -14,3 +14,24 @@ endif
 
 # MicroPython settings
 MICROPY_VFS_LFS2 = 1
+
+# Provide different variants for the downloads page.
+BOARD_VARIANTS += "dp thread dp-thread network"
+
+ifeq ($(BOARD_VARIANT),"dp")
+MICROPY_FLOAT_IMPL=double
+endif
+
+ifeq ($(BOARD_VARIANT),"thread")
+CFLAGS += -DMICROPY_PY_THREAD=1
+endif
+
+ifeq ($(BOARD_VARIANT),"dp-thread")
+MICROPY_FLOAT_IMPL=double
+CFLAGS += -DMICROPY_PY_THREAD=1
+endif
+
+ifeq ($(BOARD_VARIANT),"network")
+MICROPY_PY_NETWORK_WIZNET5K=5200
+MICROPY_PY_CC3K=1
+endif
diff --git a/ports/stm32/boards/PYBV11/mpconfigboard.mk b/ports/stm32/boards/PYBV11/mpconfigboard.mk
index cb78a7846d933..071ae6eb7c6b5 100644
--- a/ports/stm32/boards/PYBV11/mpconfigboard.mk
+++ b/ports/stm32/boards/PYBV11/mpconfigboard.mk
@@ -14,3 +14,24 @@ endif
 
 # MicroPython settings
 MICROPY_VFS_LFS2 = 1
+
+# Provide different variants for the downloads page.
+BOARD_VARIANTS += "dp thread dp-thread network"
+
+ifeq ($(BOARD_VARIANT),"dp")
+MICROPY_FLOAT_IMPL=double
+endif
+
+ifeq ($(BOARD_VARIANT),"thread")
+CFLAGS += -DMICROPY_PY_THREAD=1
+endif
+
+ifeq ($(BOARD_VARIANT),"dp-thread")
+MICROPY_FLOAT_IMPL=double
+CFLAGS += -DMICROPY_PY_THREAD=1
+endif
+
+ifeq ($(BOARD_VARIANT),"network")
+MICROPY_PY_NETWORK_WIZNET5K=5200
+MICROPY_PY_CC3K=1
+endif
diff --git a/tools/autobuild/build-stm32-extra.sh b/tools/autobuild/build-stm32-extra.sh
index 80c6f42f5e6c7..feb269e356049 100755
--- a/tools/autobuild/build-stm32-extra.sh
+++ b/tools/autobuild/build-stm32-extra.sh
@@ -7,12 +7,15 @@ function do_build() {
     board=$2
     shift
     shift
-    echo "building $descr $board"
-    build_dir=/tmp/stm-build-$board
-    $MICROPY_AUTOBUILD_MAKE $@ BOARD=$board BUILD=$build_dir || exit 1
-    mv $build_dir/firmware.dfu $dest_dir/$descr$fw_tag.dfu
-    mv $build_dir/firmware.hex $dest_dir/$descr$fw_tag.hex
-    rm -rf $build_dir
+    for variant in `$MICROPY_AUTOBUILD_MAKE BOARD=$board query-variants | grep VARIANTS: | cut -d' ' -f2-`; do
+        target=$descr-$variant
+        echo "building $target $board"
+        build_dir=/tmp/stm-build-$board
+        $MICROPY_AUTOBUILD_MAKE $@ BOARD=$board BOARD_VARIANT=$variant BUILD=$build_dir || exit 1
+        mv $build_dir/firmware.dfu $dest_dir/$target$fw_tag.dfu
+        mv $build_dir/firmware.hex $dest_dir/$target$fw_tag.hex
+        rm -rf $build_dir
+    done
 }
 
 # check/get parameters
@@ -30,18 +33,7 @@ if [ ! -r modpyb.c ]; then
     exit 1
 fi
 
-# build the versions
-do_build pybv3 PYBV3
-do_build pybv3-network PYBV3 MICROPY_PY_NETWORK_WIZNET5K=5200 MICROPY_PY_CC3K=1
-do_build pybv10-dp PYBV10 MICROPY_FLOAT_IMPL=double
-do_build pybv10-thread PYBV10 CFLAGS_EXTRA='-DMICROPY_PY_THREAD=1'
-do_build pybv10-dp-thread PYBV10 MICROPY_FLOAT_IMPL=double CFLAGS_EXTRA='-DMICROPY_PY_THREAD=1'
-do_build pybv10-network PYBV10 MICROPY_PY_NETWORK_WIZNET5K=5200 MICROPY_PY_CC3K=1
-do_build pybv11-dp PYBV11 MICROPY_FLOAT_IMPL=double
-do_build pybv11-thread PYBV11 CFLAGS_EXTRA='-DMICROPY_PY_THREAD=1'
-do_build pybv11-dp-thread PYBV11 MICROPY_FLOAT_IMPL=double CFLAGS_EXTRA='-DMICROPY_PY_THREAD=1'
-do_build pybv11-network PYBV11 MICROPY_PY_NETWORK_WIZNET5K=5200 MICROPY_PY_CC3K=1
-do_build pyblitev10-dp PYBLITEV10 MICROPY_FLOAT_IMPL=double
-do_build pyblitev10-thread PYBLITEV10 CFLAGS_EXTRA='-DMICROPY_PY_THREAD=1'
-do_build pyblitev10-dp-thread PYBLITEV10 MICROPY_FLOAT_IMPL=double CFLAGS_EXTRA='-DMICROPY_PY_THREAD=1'
-do_build pyblitev10-network PYBLITEV10 MICROPY_PY_NETWORK_WIZNET5K=5200 MICROPY_PY_CC3K=1
+# build the variants for each board
+do_build pybv10 PYBV10
+do_build pybv11 PYBV11
+do_build pyblitev10 PYBLITEV10

From 986ad6bf1d35cbc6f8073e847aa6b87156eefc4b Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Thu, 25 Aug 2022 12:27:49 +1000
Subject: [PATCH 2520/3533] stm32/boardctrl: Use HAL_Delay instead of
 mp_hal_delay_ms.

Not safe to use mp_hal_delay_ms before boot if threading is enabled,
because threading will not have been initialised, and
MICROPY_EVENT_POLL_HOOK assumes threading is initialised.

HAL_Delay doesn't call MICROPY_EVENT_POLL_HOOK, but is still
power-efficient like mp_hal_delay_ms (unlike mp_hal_delay_us).

Fixes #7816.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/stm32/boardctrl.c | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/ports/stm32/boardctrl.c b/ports/stm32/boardctrl.c
index 406a98381419c..85a42a240ff0d 100644
--- a/ports/stm32/boardctrl.c
+++ b/ports/stm32/boardctrl.c
@@ -89,6 +89,9 @@ void boardctrl_maybe_enter_mboot(size_t n_args, const void *args_in) {
 
 #if !MICROPY_HW_USES_BOOTLOADER
 STATIC uint update_reset_mode(uint reset_mode) {
+    // Note: Must use HAL_Delay here as MicroPython is not yet initialised
+    // and mp_hal_delay_ms will attempt to invoke the scheduler.
+
     #if MICROPY_HW_HAS_SWITCH
     if (switch_get()) {
 
@@ -100,7 +103,7 @@ STATIC uint update_reset_mode(uint reset_mode) {
             led_state(3, reset_mode & 2);
             led_state(4, reset_mode & 4);
             for (uint j = 0; j < 30; ++j) {
-                mp_hal_delay_ms(20);
+                HAL_Delay(20);
                 if (!switch_get()) {
                     goto select_mode;
                 }
@@ -115,13 +118,13 @@ STATIC uint update_reset_mode(uint reset_mode) {
             led_state(2, 0);
             led_state(3, 0);
             led_state(4, 0);
-            mp_hal_delay_ms(50);
+            HAL_Delay(50);
             led_state(2, reset_mode & 1);
             led_state(3, reset_mode & 2);
             led_state(4, reset_mode & 4);
-            mp_hal_delay_ms(50);
+            HAL_Delay(50);
         }
-        mp_hal_delay_ms(400);
+        HAL_Delay(400);
 
         #elif defined(MICROPY_HW_LED1)
 
@@ -134,11 +137,11 @@ STATIC uint update_reset_mode(uint reset_mode) {
                     break;
                 }
                 led_state(1, 1);
-                mp_hal_delay_ms(100);
+                HAL_Delay(100);
                 led_state(1, 0);
-                mp_hal_delay_ms(200);
+                HAL_Delay(200);
             }
-            mp_hal_delay_ms(400);
+            HAL_Delay(400);
             if (!switch_get()) {
                 break;
             }
@@ -150,11 +153,11 @@ STATIC uint update_reset_mode(uint reset_mode) {
         for (uint i = 0; i < 2; i++) {
             for (uint j = 0; j < reset_mode; j++) {
                 led_state(1, 1);
-                mp_hal_delay_ms(100);
+                HAL_Delay(100);
                 led_state(1, 0);
-                mp_hal_delay_ms(200);
+                HAL_Delay(200);
             }
-            mp_hal_delay_ms(400);
+            HAL_Delay(400);
         }
         #else
         #error Need a reset mode update method

From 1855df6361ad4ade62aa46ad08f3202a6a5b1bd1 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 24 Aug 2022 10:44:35 +1000
Subject: [PATCH 2521/3533] stm32: Remove support for CC3000 WiFi driver.

It has been about 8 years since support for this chip was added.  Reasons
to remove it are:
- It is no longer easy to obtain this part.
- There are now many other options for WiFi.
- It's not a good use of developer time to maintain it.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/Makefile                          |  23 -
 ports/stm32/boards/PYBLITEV10/board.md        |   2 +-
 .../stm32/boards/PYBLITEV10/mpconfigboard.mk  |   1 -
 ports/stm32/boards/PYBV10/board.md            |   2 +-
 ports/stm32/boards/PYBV10/mpconfigboard.mk    |   1 -
 ports/stm32/boards/PYBV11/board.md            |   2 +-
 ports/stm32/boards/PYBV11/mpconfigboard.mk    |   1 -
 ports/stm32/modnwcc3k.c                       | 608 ------------------
 ports/stm32/mpconfigport.h                    |   8 -
 ports/stm32/mpconfigport.mk                   |   3 -
 tools/ci.sh                                   |   2 -
 11 files changed, 3 insertions(+), 650 deletions(-)
 delete mode 100644 ports/stm32/modnwcc3k.c

diff --git a/ports/stm32/Makefile b/ports/stm32/Makefile
index f981f8f3eb057..ee00d77173640 100644
--- a/ports/stm32/Makefile
+++ b/ports/stm32/Makefile
@@ -482,29 +482,6 @@ SRC_MOD += $(addprefix $(WIZNET5K_DIR)/,\
 	)
 endif
 
-# for CC3000 module
-ifeq ($(MICROPY_PY_CC3K),1)
-CC3000_DIR=drivers/cc3000
-INC += -I$(TOP)/$(CC3000_DIR)/inc
-CFLAGS_MOD += -DMICROPY_PY_CC3K=1
-SRC_MOD += modnwcc3k.c
-SRC_MOD += $(addprefix $(CC3000_DIR)/src/,\
-	cc3000_common.c \
-	evnt_handler.c \
-	hci.c \
-	netapp.c \
-	nvmem.c \
-	security.c \
-	socket.c \
-	wlan.c \
-	ccspi.c \
-	inet_ntop.c \
-	inet_pton.c \
-	patch.c \
-	patch_prog.c \
-	)
-endif
-
 ifeq ($(MICROPY_SSL_MBEDTLS),1)
 CFLAGS_MOD += -DMBEDTLS_CONFIG_FILE='"mbedtls/mbedtls_config.h"'
 SRC_MOD += mbedtls/mbedtls_port.c
diff --git a/ports/stm32/boards/PYBLITEV10/board.md b/ports/stm32/boards/PYBLITEV10/board.md
index 1511ffcf514fa..b490d54046915 100644
--- a/ports/stm32/boards/PYBLITEV10/board.md
+++ b/ports/stm32/boards/PYBLITEV10/board.md
@@ -1 +1 @@
-The "standard" build is listed first and is the default firmware that the pyboards are shipped with. Use this firmware if you are uncertain. The "double FP" builds use double-precision floating point instead of the standard single precision. The "threading" builds contain the \_thread module and allow multithreading. The "network" builds have network drivers for CC3000 and WIZ820io included. All these different firmware are completely interchangeable and you can freely change from one to the other without losing the filesystem on your pyboard.
+The "standard" build is listed first and is the default firmware that the pyboards are shipped with. Use this firmware if you are uncertain. The "double FP" builds use double-precision floating point instead of the standard single precision. The "threading" builds contain the \_thread module and allow multithreading. The "network" builds have network drivers for WIZ820io included. All these different firmware are completely interchangeable and you can freely change from one to the other without losing the filesystem on your pyboard.
diff --git a/ports/stm32/boards/PYBLITEV10/mpconfigboard.mk b/ports/stm32/boards/PYBLITEV10/mpconfigboard.mk
index 89977b74ead45..8aeaf0e40cfbd 100644
--- a/ports/stm32/boards/PYBLITEV10/mpconfigboard.mk
+++ b/ports/stm32/boards/PYBLITEV10/mpconfigboard.mk
@@ -23,5 +23,4 @@ endif
 
 ifeq ($(BOARD_VARIANT),"network")
 MICROPY_PY_NETWORK_WIZNET5K=5200
-MICROPY_PY_CC3K=1
 endif
diff --git a/ports/stm32/boards/PYBV10/board.md b/ports/stm32/boards/PYBV10/board.md
index 1511ffcf514fa..b490d54046915 100644
--- a/ports/stm32/boards/PYBV10/board.md
+++ b/ports/stm32/boards/PYBV10/board.md
@@ -1 +1 @@
-The "standard" build is listed first and is the default firmware that the pyboards are shipped with. Use this firmware if you are uncertain. The "double FP" builds use double-precision floating point instead of the standard single precision. The "threading" builds contain the \_thread module and allow multithreading. The "network" builds have network drivers for CC3000 and WIZ820io included. All these different firmware are completely interchangeable and you can freely change from one to the other without losing the filesystem on your pyboard.
+The "standard" build is listed first and is the default firmware that the pyboards are shipped with. Use this firmware if you are uncertain. The "double FP" builds use double-precision floating point instead of the standard single precision. The "threading" builds contain the \_thread module and allow multithreading. The "network" builds have network drivers for WIZ820io included. All these different firmware are completely interchangeable and you can freely change from one to the other without losing the filesystem on your pyboard.
diff --git a/ports/stm32/boards/PYBV10/mpconfigboard.mk b/ports/stm32/boards/PYBV10/mpconfigboard.mk
index 071ae6eb7c6b5..97af22b5e19bd 100644
--- a/ports/stm32/boards/PYBV10/mpconfigboard.mk
+++ b/ports/stm32/boards/PYBV10/mpconfigboard.mk
@@ -33,5 +33,4 @@ endif
 
 ifeq ($(BOARD_VARIANT),"network")
 MICROPY_PY_NETWORK_WIZNET5K=5200
-MICROPY_PY_CC3K=1
 endif
diff --git a/ports/stm32/boards/PYBV11/board.md b/ports/stm32/boards/PYBV11/board.md
index 1511ffcf514fa..b490d54046915 100644
--- a/ports/stm32/boards/PYBV11/board.md
+++ b/ports/stm32/boards/PYBV11/board.md
@@ -1 +1 @@
-The "standard" build is listed first and is the default firmware that the pyboards are shipped with. Use this firmware if you are uncertain. The "double FP" builds use double-precision floating point instead of the standard single precision. The "threading" builds contain the \_thread module and allow multithreading. The "network" builds have network drivers for CC3000 and WIZ820io included. All these different firmware are completely interchangeable and you can freely change from one to the other without losing the filesystem on your pyboard.
+The "standard" build is listed first and is the default firmware that the pyboards are shipped with. Use this firmware if you are uncertain. The "double FP" builds use double-precision floating point instead of the standard single precision. The "threading" builds contain the \_thread module and allow multithreading. The "network" builds have network drivers for WIZ820io included. All these different firmware are completely interchangeable and you can freely change from one to the other without losing the filesystem on your pyboard.
diff --git a/ports/stm32/boards/PYBV11/mpconfigboard.mk b/ports/stm32/boards/PYBV11/mpconfigboard.mk
index 071ae6eb7c6b5..97af22b5e19bd 100644
--- a/ports/stm32/boards/PYBV11/mpconfigboard.mk
+++ b/ports/stm32/boards/PYBV11/mpconfigboard.mk
@@ -33,5 +33,4 @@ endif
 
 ifeq ($(BOARD_VARIANT),"network")
 MICROPY_PY_NETWORK_WIZNET5K=5200
-MICROPY_PY_CC3K=1
 endif
diff --git a/ports/stm32/modnwcc3k.c b/ports/stm32/modnwcc3k.c
deleted file mode 100644
index 952e535c2dbc6..0000000000000
--- a/ports/stm32/modnwcc3k.c
+++ /dev/null
@@ -1,608 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2014 Damien P. George
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#include <string.h>
-#include <stdarg.h>
-
-// CC3000 defines its own ENOBUFS (different to standard one!)
-#undef ENOBUFS
-
-#include "py/objtuple.h"
-#include "py/objlist.h"
-#include "py/stream.h"
-#include "py/runtime.h"
-#include "py/mperrno.h"
-#include "py/mphal.h"
-#include "shared/netutils/netutils.h"
-#include "extmod/modnetwork.h"
-#include "pin.h"
-#include "spi.h"
-
-#include "hci.h"
-#include "socket.h"
-#include "inet_ntop.h"
-#include "inet_pton.h"
-#include "ccspi.h"
-#include "wlan.h"
-#include "nvmem.h"
-#include "netapp.h"
-#include "patch_prog.h"
-
-#define MAX_ADDRSTRLEN      (128)
-#define MAX_RX_PACKET       (CC3000_RX_BUFFER_SIZE - CC3000_MINIMAL_RX_SIZE - 1)
-#define MAX_TX_PACKET       (CC3000_TX_BUFFER_SIZE - CC3000_MINIMAL_TX_SIZE - 1)
-
-#define MAKE_SOCKADDR(addr, ip, port) \
-    sockaddr addr; \
-    addr.sa_family = AF_INET; \
-    addr.sa_data[0] = port >> 8; \
-    addr.sa_data[1] = port; \
-    addr.sa_data[2] = ip[0]; \
-    addr.sa_data[3] = ip[1]; \
-    addr.sa_data[4] = ip[2]; \
-    addr.sa_data[5] = ip[3];
-
-#define UNPACK_SOCKADDR(addr, ip, port) \
-    port = (addr.sa_data[0] << 8) | addr.sa_data[1]; \
-    ip[0] = addr.sa_data[2]; \
-    ip[1] = addr.sa_data[3]; \
-    ip[2] = addr.sa_data[4]; \
-    ip[3] = addr.sa_data[5];
-
-STATIC int cc3k_socket_ioctl(mod_network_socket_obj_t *socket, mp_uint_t request, mp_uint_t arg, int *_errno);
-
-int CC3000_EXPORT(errno); // for cc3000 driver
-
-STATIC volatile uint32_t fd_closed_state = 0;
-STATIC volatile bool wlan_connected = false;
-STATIC volatile bool ip_obtained = false;
-
-STATIC int cc3k_get_fd_closed_state(int fd) {
-    return fd_closed_state & (1 << fd);
-}
-
-STATIC void cc3k_set_fd_closed_state(int fd) {
-    fd_closed_state |= 1 << fd;
-}
-
-STATIC void cc3k_reset_fd_closed_state(int fd) {
-    fd_closed_state &= ~(1 << fd);
-}
-
-STATIC void cc3k_callback(long event_type, char *data, unsigned char length) {
-    switch (event_type) {
-        case HCI_EVNT_WLAN_UNSOL_CONNECT:
-            wlan_connected = true;
-            break;
-        case HCI_EVNT_WLAN_UNSOL_DISCONNECT:
-            // link down
-            wlan_connected = false;
-            ip_obtained = false;
-            break;
-        case HCI_EVNT_WLAN_UNSOL_DHCP:
-            ip_obtained = true;
-            break;
-        case HCI_EVNT_BSD_TCP_CLOSE_WAIT:
-            // mark socket for closure
-            cc3k_set_fd_closed_state(data[0]);
-            break;
-    }
-}
-
-STATIC int cc3k_gethostbyname(mp_obj_t nic, const char *name, mp_uint_t len, uint8_t *out_ip) {
-    uint32_t ip;
-    // CC3000 gethostbyname is unreliable and usually returns -95 on first call
-    for (int retry = 5; CC3000_EXPORT(gethostbyname)((char *)name, len, &ip) < 0; retry--) {
-        if (retry == 0 || CC3000_EXPORT(errno) != -95) {
-            return CC3000_EXPORT(errno);
-        }
-        mp_hal_delay_ms(50);
-    }
-
-    if (ip == 0) {
-        // unknown host
-        return -2;
-    }
-
-    out_ip[0] = ip >> 24;
-    out_ip[1] = ip >> 16;
-    out_ip[2] = ip >> 8;
-    out_ip[3] = ip;
-
-    return 0;
-}
-
-STATIC int cc3k_socket_socket(mod_network_socket_obj_t *socket, int *_errno) {
-    if (socket->domain != MOD_NETWORK_AF_INET) {
-        *_errno = MP_EAFNOSUPPORT;
-        return -1;
-    }
-
-    mp_uint_t type;
-    switch (socket->type) {
-        case MOD_NETWORK_SOCK_STREAM:
-            type = SOCK_STREAM;
-            break;
-        case MOD_NETWORK_SOCK_DGRAM:
-            type = SOCK_DGRAM;
-            break;
-        case MOD_NETWORK_SOCK_RAW:
-            type = SOCK_RAW;
-            break;
-        default:
-            *_errno = MP_EINVAL;
-            return -1;
-    }
-
-    // open socket
-    int fd = CC3000_EXPORT(socket)(AF_INET, type, 0);
-    if (fd < 0) {
-        *_errno = CC3000_EXPORT(errno);
-        return -1;
-    }
-
-    // clear socket state
-    cc3k_reset_fd_closed_state(fd);
-
-    // store state of this socket
-    socket->fileno = fd;
-
-    // make accept blocking by default
-    int optval = SOCK_OFF;
-    socklen_t optlen = sizeof(optval);
-    CC3000_EXPORT(setsockopt)(socket->fileno, SOL_SOCKET, SOCKOPT_ACCEPT_NONBLOCK, &optval, optlen);
-
-    return 0;
-}
-
-STATIC void cc3k_socket_close(mod_network_socket_obj_t *socket) {
-    CC3000_EXPORT(closesocket)(socket->fileno);
-}
-
-STATIC int cc3k_socket_bind(mod_network_socket_obj_t *socket, byte *ip, mp_uint_t port, int *_errno) {
-    MAKE_SOCKADDR(addr, ip, port)
-    int ret = CC3000_EXPORT(bind)(socket->fileno, &addr, sizeof(addr));
-    if (ret != 0) {
-        *_errno = ret;
-        return -1;
-    }
-    return 0;
-}
-
-STATIC int cc3k_socket_listen(mod_network_socket_obj_t *socket, mp_int_t backlog, int *_errno) {
-    int ret = CC3000_EXPORT(listen)(socket->fileno, backlog);
-    if (ret != 0) {
-        *_errno = ret;
-        return -1;
-    }
-    return 0;
-}
-
-STATIC int cc3k_socket_accept(mod_network_socket_obj_t *socket, mod_network_socket_obj_t *socket2, byte *ip, mp_uint_t *port, int *_errno) {
-    // accept incoming connection
-    int fd;
-    sockaddr addr;
-    socklen_t addr_len = sizeof(addr);
-    if ((fd = CC3000_EXPORT(accept)(socket->fileno, &addr, &addr_len)) < 0) {
-        if (fd == SOC_IN_PROGRESS) {
-            *_errno = MP_EAGAIN;
-        } else {
-            *_errno = -fd;
-        }
-        return -1;
-    }
-
-    // clear socket state
-    cc3k_reset_fd_closed_state(fd);
-
-    // store state in new socket object
-    socket2->fileno = fd;
-
-    // return ip and port
-    // it seems CC3000 returns little endian for accept??
-    // UNPACK_SOCKADDR(addr, ip, *port);
-    *port = (addr.sa_data[1] << 8) | addr.sa_data[0];
-    ip[3] = addr.sa_data[2];
-    ip[2] = addr.sa_data[3];
-    ip[1] = addr.sa_data[4];
-    ip[0] = addr.sa_data[5];
-
-    return 0;
-}
-
-STATIC int cc3k_socket_connect(mod_network_socket_obj_t *socket, byte *ip, mp_uint_t port, int *_errno) {
-    MAKE_SOCKADDR(addr, ip, port)
-    int ret = CC3000_EXPORT(connect)(socket->fileno, &addr, sizeof(addr));
-    if (ret != 0) {
-        *_errno = CC3000_EXPORT(errno);
-        return -1;
-    }
-    return 0;
-}
-
-STATIC mp_uint_t cc3k_socket_send(mod_network_socket_obj_t *socket, const byte *buf, mp_uint_t len, int *_errno) {
-    if (cc3k_get_fd_closed_state(socket->fileno)) {
-        CC3000_EXPORT(closesocket)(socket->fileno);
-        *_errno = MP_EPIPE;
-        return -1;
-    }
-
-    // CC3K does not handle fragmentation, and will overflow,
-    // split the packet into smaller ones and send them out.
-    mp_int_t bytes = 0;
-    while (bytes < len) {
-        int n = MIN((len - bytes), MAX_TX_PACKET);
-        n = CC3000_EXPORT(send)(socket->fileno, (uint8_t *)buf + bytes, n, 0);
-        if (n <= 0) {
-            *_errno = CC3000_EXPORT(errno);
-            return -1;
-        }
-        bytes += n;
-    }
-
-    return bytes;
-}
-
-STATIC mp_uint_t cc3k_socket_recv(mod_network_socket_obj_t *socket, byte *buf, mp_uint_t len, int *_errno) {
-    // check the socket is open
-    if (cc3k_get_fd_closed_state(socket->fileno)) {
-        // socket is closed, but CC3000 may have some data remaining in buffer, so check
-        fd_set rfds;
-        FD_ZERO(&rfds);
-        FD_SET(socket->fileno, &rfds);
-        cc3000_timeval tv;
-        tv.tv_sec = 0;
-        tv.tv_usec = 1;
-        int nfds = CC3000_EXPORT(select)(socket->fileno + 1, &rfds, NULL, NULL, &tv);
-        if (nfds == -1 || !FD_ISSET(socket->fileno, &rfds)) {
-            // no data waiting, so close socket and return 0 data
-            CC3000_EXPORT(closesocket)(socket->fileno);
-            return 0;
-        }
-    }
-
-    // cap length at MAX_RX_PACKET
-    len = MIN(len, MAX_RX_PACKET);
-
-    // do the recv
-    int ret = CC3000_EXPORT(recv)(socket->fileno, buf, len, 0);
-    if (ret < 0) {
-        *_errno = CC3000_EXPORT(errno);
-        return -1;
-    }
-
-    return ret;
-}
-
-STATIC mp_uint_t cc3k_socket_sendto(mod_network_socket_obj_t *socket, const byte *buf, mp_uint_t len, byte *ip, mp_uint_t port, int *_errno) {
-    MAKE_SOCKADDR(addr, ip, port)
-    int ret = CC3000_EXPORT(sendto)(socket->fileno, (byte *)buf, len, 0, (sockaddr *)&addr, sizeof(addr));
-    if (ret < 0) {
-        *_errno = CC3000_EXPORT(errno);
-        return -1;
-    }
-    return ret;
-}
-
-STATIC mp_uint_t cc3k_socket_recvfrom(mod_network_socket_obj_t *socket, byte *buf, mp_uint_t len, byte *ip, mp_uint_t *port, int *_errno) {
-    sockaddr addr;
-    socklen_t addr_len = sizeof(addr);
-    mp_int_t ret = CC3000_EXPORT(recvfrom)(socket->fileno, buf, len, 0, &addr, &addr_len);
-    if (ret < 0) {
-        *_errno = CC3000_EXPORT(errno);
-        return -1;
-    }
-    UNPACK_SOCKADDR(addr, ip, *port);
-    return ret;
-}
-
-STATIC int cc3k_socket_setsockopt(mod_network_socket_obj_t *socket, mp_uint_t level, mp_uint_t opt, const void *optval, mp_uint_t optlen, int *_errno) {
-    int ret = CC3000_EXPORT(setsockopt)(socket->fileno, level, opt, optval, optlen);
-    if (ret < 0) {
-        *_errno = CC3000_EXPORT(errno);
-        return -1;
-    }
-    return 0;
-}
-
-STATIC int cc3k_socket_settimeout(mod_network_socket_obj_t *socket, mp_uint_t timeout_ms, int *_errno) {
-    int ret;
-    if (timeout_ms == 0 || timeout_ms == -1) {
-        int optval;
-        socklen_t optlen = sizeof(optval);
-        if (timeout_ms == 0) {
-            // set non-blocking mode
-            optval = SOCK_ON;
-        } else {
-            // set blocking mode
-            optval = SOCK_OFF;
-        }
-        ret = CC3000_EXPORT(setsockopt)(socket->fileno, SOL_SOCKET, SOCKOPT_RECV_NONBLOCK, &optval, optlen);
-        if (ret == 0) {
-            ret = CC3000_EXPORT(setsockopt)(socket->fileno, SOL_SOCKET, SOCKOPT_ACCEPT_NONBLOCK, &optval, optlen);
-        }
-    } else {
-        // set timeout
-        socklen_t optlen = sizeof(timeout_ms);
-        ret = CC3000_EXPORT(setsockopt)(socket->fileno, SOL_SOCKET, SOCKOPT_RECV_TIMEOUT, &timeout_ms, optlen);
-    }
-
-    if (ret != 0) {
-        *_errno = CC3000_EXPORT(errno);
-        return -1;
-    }
-
-    return 0;
-}
-
-STATIC int cc3k_socket_ioctl(mod_network_socket_obj_t *socket, mp_uint_t request, mp_uint_t arg, int *_errno) {
-    mp_uint_t ret;
-    if (request == MP_STREAM_POLL) {
-        mp_uint_t flags = arg;
-        ret = 0;
-        int fd = socket->fileno;
-
-        // init fds
-        fd_set rfds, wfds, xfds;
-        FD_ZERO(&rfds);
-        FD_ZERO(&wfds);
-        FD_ZERO(&xfds);
-
-        // set fds if needed
-        if (flags & MP_STREAM_POLL_RD) {
-            FD_SET(fd, &rfds);
-
-            // A socked that just closed is available for reading.  A call to
-            // recv() returns 0 which is consistent with BSD.
-            if (cc3k_get_fd_closed_state(fd)) {
-                ret |= MP_STREAM_POLL_RD;
-            }
-        }
-        if (flags & MP_STREAM_POLL_WR) {
-            FD_SET(fd, &wfds);
-        }
-        if (flags & MP_STREAM_POLL_HUP) {
-            FD_SET(fd, &xfds);
-        }
-
-        // call cc3000 select with minimum timeout
-        cc3000_timeval tv;
-        tv.tv_sec = 0;
-        tv.tv_usec = 1;
-        int nfds = CC3000_EXPORT(select)(fd + 1, &rfds, &wfds, &xfds, &tv);
-
-        // check for error
-        if (nfds == -1) {
-            *_errno = CC3000_EXPORT(errno);
-            return -1;
-        }
-
-        // check return of select
-        if (FD_ISSET(fd, &rfds)) {
-            ret |= MP_STREAM_POLL_RD;
-        }
-        if (FD_ISSET(fd, &wfds)) {
-            ret |= MP_STREAM_POLL_WR;
-        }
-        if (FD_ISSET(fd, &xfds)) {
-            ret |= MP_STREAM_POLL_HUP;
-        }
-    } else {
-        *_errno = MP_EINVAL;
-        ret = -1;
-    }
-    return ret;
-}
-
-/******************************************************************************/
-// MicroPython bindings; CC3K class
-
-typedef struct _cc3k_obj_t {
-    mp_obj_base_t base;
-} cc3k_obj_t;
-
-STATIC const cc3k_obj_t cc3k_obj = {{(mp_obj_type_t *)&mod_network_nic_type_cc3k}};
-
-// \classmethod \constructor(spi, pin_cs, pin_en, pin_irq)
-// Initialise the CC3000 using the given SPI bus and pins and return a CC3K object.
-//
-// Note: pins were originally hard-coded to:
-//      PYBv1.0: init(pyb.SPI(2), pyb.Pin.board.Y5, pyb.Pin.board.Y4, pyb.Pin.board.Y3)
-//        [SPI on Y position; Y6=B13=SCK, Y7=B14=MISO, Y8=B15=MOSI]
-//
-//      STM32F4DISC: init(pyb.SPI(2), pyb.Pin.cpu.A15, pyb.Pin.cpu.B10, pyb.Pin.cpu.B11)
-STATIC mp_obj_t cc3k_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
-    // check arguments
-    mp_arg_check_num(n_args, n_kw, 4, 4, false);
-
-    // set the pins to use
-    SpiInit(
-        spi_from_mp_obj(args[0])->spi,
-        pin_find(args[1]),
-        pin_find(args[2]),
-        pin_find(args[3])
-        );
-
-    // initialize and start the module
-    wlan_init(cc3k_callback, NULL, NULL, NULL,
-        ReadWlanInterruptPin, SpiResumeSpi, SpiPauseSpi, WriteWlanPin);
-
-    if (wlan_start(0) != 0) {
-        mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("failed to init CC3000 module"));
-    }
-
-    // set connection policy. this should be called explicitly by the user
-    // wlan_ioctl_set_connection_policy(0, 0, 0);
-
-    // Mask out all non-required events from the CC3000
-    wlan_set_event_mask(HCI_EVNT_WLAN_KEEPALIVE |
-        HCI_EVNT_WLAN_UNSOL_INIT |
-        HCI_EVNT_WLAN_ASYNC_PING_REPORT |
-        HCI_EVNT_WLAN_ASYNC_SIMPLE_CONFIG_DONE);
-
-    // register with network module
-    mod_network_register_nic((mp_obj_t)&cc3k_obj);
-
-    return (mp_obj_t)&cc3k_obj;
-}
-
-// method connect(ssid, key=None, *, security=WPA2, bssid=None)
-STATIC mp_obj_t cc3k_connect(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
-    static const mp_arg_t allowed_args[] = {
-        { MP_QSTR_ssid, MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
-        { MP_QSTR_key, MP_ARG_OBJ, {.u_obj = mp_const_none} },
-        { MP_QSTR_security, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = WLAN_SEC_WPA2} },
-        { MP_QSTR_bssid, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = mp_const_none} },
-    };
-
-    // parse args
-    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
-    mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
-
-    // get ssid
-    size_t ssid_len;
-    const char *ssid = mp_obj_str_get_data(args[0].u_obj, &ssid_len);
-
-    // get key and sec
-    size_t key_len = 0;
-    const char *key = NULL;
-    mp_uint_t sec = WLAN_SEC_UNSEC;
-    if (args[1].u_obj != mp_const_none) {
-        key = mp_obj_str_get_data(args[1].u_obj, &key_len);
-        sec = args[2].u_int;
-    }
-
-    // get bssid
-    const char *bssid = NULL;
-    if (args[3].u_obj != mp_const_none) {
-        bssid = mp_obj_str_get_str(args[3].u_obj);
-    }
-
-    // connect to AP
-    if (wlan_connect(sec, (char *)ssid, ssid_len, (uint8_t *)bssid, (uint8_t *)key, key_len) != 0) {
-        mp_raise_msg_varg(&mp_type_OSError, MP_ERROR_TEXT("could not connect to ssid=%s, sec=%d, key=%s\n"), ssid, sec, key);
-    }
-
-    return mp_const_none;
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(cc3k_connect_obj, 1, cc3k_connect);
-
-STATIC mp_obj_t cc3k_disconnect(mp_obj_t self_in) {
-    // should we check return value?
-    wlan_disconnect();
-    return mp_const_none;
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(cc3k_disconnect_obj, cc3k_disconnect);
-
-STATIC mp_obj_t cc3k_isconnected(mp_obj_t self_in) {
-    return mp_obj_new_bool(wlan_connected && ip_obtained);
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(cc3k_isconnected_obj, cc3k_isconnected);
-
-STATIC mp_obj_t cc3k_ifconfig(mp_obj_t self_in) {
-    tNetappIpconfigRetArgs ipconfig;
-    netapp_ipconfig(&ipconfig);
-
-    // render MAC address
-    VSTR_FIXED(mac_vstr, 18);
-    const uint8_t *mac = ipconfig.uaMacAddr;
-    vstr_printf(&mac_vstr, "%02x:%02x:%02x:%02x:%02x:%02x", mac[5], mac[4], mac[3], mac[2], mac[1], mac[0]);
-
-    // create and return tuple with ifconfig info
-    mp_obj_t tuple[7] = {
-        netutils_format_ipv4_addr(ipconfig.aucIP, NETUTILS_LITTLE),
-        netutils_format_ipv4_addr(ipconfig.aucSubnetMask, NETUTILS_LITTLE),
-        netutils_format_ipv4_addr(ipconfig.aucDefaultGateway, NETUTILS_LITTLE),
-        netutils_format_ipv4_addr(ipconfig.aucDNSServer, NETUTILS_LITTLE),
-        netutils_format_ipv4_addr(ipconfig.aucDHCPServer, NETUTILS_LITTLE),
-        mp_obj_new_str(mac_vstr.buf, mac_vstr.len),
-        mp_obj_new_str((const char *)ipconfig.uaSSID, strlen((const char *)ipconfig.uaSSID)),
-    };
-    return mp_obj_new_tuple(MP_ARRAY_SIZE(tuple), tuple);
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(cc3k_ifconfig_obj, cc3k_ifconfig);
-
-STATIC mp_obj_t cc3k_patch_version(mp_obj_t self_in) {
-    uint8_t pver[2];
-    mp_obj_tuple_t *t_pver;
-
-    nvmem_read_sp_version(pver);
-    t_pver = mp_obj_new_tuple(2, NULL);
-    t_pver->items[0] = mp_obj_new_int(pver[0]);
-    t_pver->items[1] = mp_obj_new_int(pver[1]);
-    return t_pver;
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(cc3k_patch_version_obj, cc3k_patch_version);
-
-STATIC mp_obj_t cc3k_patch_program(mp_obj_t self_in, mp_obj_t key_in) {
-    const char *key = mp_obj_str_get_str(key_in);
-    if (key[0] == 'p' && key[1] == 'g' && key[2] == 'm' && key[3] == '\0') {
-        patch_prog_start();
-    } else {
-        mp_print_str(&mp_plat_print, "pass 'pgm' as argument in order to program\n");
-    }
-    return mp_const_none;
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(cc3k_patch_program_obj, cc3k_patch_program);
-
-STATIC const mp_rom_map_elem_t cc3k_locals_dict_table[] = {
-    { MP_ROM_QSTR(MP_QSTR_connect), MP_ROM_PTR(&cc3k_connect_obj) },
-    { MP_ROM_QSTR(MP_QSTR_disconnect), MP_ROM_PTR(&cc3k_disconnect_obj) },
-    { MP_ROM_QSTR(MP_QSTR_isconnected), MP_ROM_PTR(&cc3k_isconnected_obj) },
-    { MP_ROM_QSTR(MP_QSTR_ifconfig), MP_ROM_PTR(&cc3k_ifconfig_obj) },
-    { MP_ROM_QSTR(MP_QSTR_patch_version), MP_ROM_PTR(&cc3k_patch_version_obj) },
-    { MP_ROM_QSTR(MP_QSTR_patch_program), MP_ROM_PTR(&cc3k_patch_program_obj) },
-
-    // class constants
-    { MP_ROM_QSTR(MP_QSTR_WEP), MP_ROM_INT(WLAN_SEC_WEP) },
-    { MP_ROM_QSTR(MP_QSTR_WPA), MP_ROM_INT(WLAN_SEC_WPA) },
-    { MP_ROM_QSTR(MP_QSTR_WPA2), MP_ROM_INT(WLAN_SEC_WPA2) },
-};
-
-STATIC MP_DEFINE_CONST_DICT(cc3k_locals_dict, cc3k_locals_dict_table);
-
-const mod_network_nic_type_t mod_network_nic_type_cc3k = {
-    .base = {
-        { &mp_type_type },
-        .name = MP_QSTR_CC3K,
-        .make_new = cc3k_make_new,
-        .locals_dict = (mp_obj_dict_t *)&cc3k_locals_dict,
-    },
-    .gethostbyname = cc3k_gethostbyname,
-    .socket = cc3k_socket_socket,
-    .close = cc3k_socket_close,
-    .bind = cc3k_socket_bind,
-    .listen = cc3k_socket_listen,
-    .accept = cc3k_socket_accept,
-    .connect = cc3k_socket_connect,
-    .send = cc3k_socket_send,
-    .recv = cc3k_socket_recv,
-    .sendto = cc3k_socket_sendto,
-    .recvfrom = cc3k_socket_recvfrom,
-    .setsockopt = cc3k_socket_setsockopt,
-    .settimeout = cc3k_socket_settimeout,
-    .ioctl = cc3k_socket_ioctl,
-};
diff --git a/ports/stm32/mpconfigport.h b/ports/stm32/mpconfigport.h
index e06e32c0d2173..69b29e8ec3932 100644
--- a/ports/stm32/mpconfigport.h
+++ b/ports/stm32/mpconfigport.h
@@ -200,13 +200,6 @@ extern const struct _mod_network_nic_type_t mod_network_nic_type_wiznet5k;
 #define MICROPY_HW_NIC_WIZNET5K
 #endif
 
-#if MICROPY_PY_CC3K
-extern const struct _mod_network_nic_type_t mod_network_nic_type_cc3k;
-#define MICROPY_HW_NIC_CC3K                 { MP_ROM_QSTR(MP_QSTR_CC3K), MP_ROM_PTR(&mod_network_nic_type_cc3k) },
-#else
-#define MICROPY_HW_NIC_CC3K
-#endif
-
 // extra constants
 #define MICROPY_PORT_CONSTANTS \
     MACHINE_BUILTIN_MODULE_CONSTANTS \
@@ -221,7 +214,6 @@ extern const struct _mod_network_nic_type_t mod_network_nic_type_cc3k;
     MICROPY_HW_NIC_ETH  \
     MICROPY_HW_NIC_CYW43 \
     MICROPY_HW_NIC_WIZNET5K \
-    MICROPY_HW_NIC_CC3K \
     MICROPY_BOARD_NETWORK_INTERFACES \
 
 #define MP_STATE_PORT MP_STATE_VM
diff --git a/ports/stm32/mpconfigport.mk b/ports/stm32/mpconfigport.mk
index 830ccf03123a3..737ff9d3d29ac 100644
--- a/ports/stm32/mpconfigport.mk
+++ b/ports/stm32/mpconfigport.mk
@@ -6,9 +6,6 @@
 #   5500 : support for W5500 module
 MICROPY_PY_NETWORK_WIZNET5K ?= 0
 
-# cc3k module for wifi support
-MICROPY_PY_CC3K ?= 0
-
 # VFS FAT FS support
 MICROPY_VFS_FAT ?= 1
 
diff --git a/tools/ci.sh b/tools/ci.sh
index b7b20e3c7d65b..b4cb7dc2e380a 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -313,8 +313,6 @@ function ci_stm32_pyb_build {
     git submodule update --init lib/btstack
     git submodule update --init lib/mynewt-nimble
     make ${MAKEOPTS} -C ports/stm32 BOARD=PYBV11 MICROPY_PY_NETWORK_WIZNET5K=5200 USER_C_MODULES=../../examples/usercmodule
-    make ${MAKEOPTS} -C ports/stm32 BOARD=PYBV11 clean
-    make ${MAKEOPTS} -C ports/stm32 BOARD=PYBV11 MICROPY_PY_CC3K=1
     make ${MAKEOPTS} -C ports/stm32 BOARD=PYBD_SF2
     make ${MAKEOPTS} -C ports/stm32 BOARD=PYBD_SF6 NANBOX=1 MICROPY_BLUETOOTH_NIMBLE=0 MICROPY_BLUETOOTH_BTSTACK=1
     make ${MAKEOPTS} -C ports/stm32/mboot BOARD=PYBV10 CFLAGS_EXTRA='-DMBOOT_FSLOAD=1 -DMBOOT_VFS_LFS2=1'

From 7d3f4b23dc26bd26477a2ef6d7b25b3af73453f4 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 24 Aug 2022 10:48:27 +1000
Subject: [PATCH 2522/3533] drivers/cc3000: Remove CC3000 WiFi driver files.

It's no longer used by any port.

Signed-off-by: Damien George <damien@micropython.org>
---
 LICENSE                                  |    1 -
 docs/library/network.CC3K.rst            |   89 --
 docs/library/network.rst                 |    1 -
 drivers/cc3000/inc/cc3000_common.h       |  365 -------
 drivers/cc3000/inc/ccspi.h               |   84 --
 drivers/cc3000/inc/data_types.h          |  107 --
 drivers/cc3000/inc/evnt_handler.h        |  166 ---
 drivers/cc3000/inc/hci.h                 |  330 ------
 drivers/cc3000/inc/host_driver_version.h |   40 -
 drivers/cc3000/inc/inet_ntop.h           |    4 -
 drivers/cc3000/inc/inet_pton.h           |    4 -
 drivers/cc3000/inc/netapp.h              |  343 ------
 drivers/cc3000/inc/nvmem.h               |  248 -----
 drivers/cc3000/inc/patch_prog.h          |   11 -
 drivers/cc3000/inc/security.h            |  130 ---
 drivers/cc3000/inc/socket.h              |  676 ------------
 drivers/cc3000/inc/wlan.h                |  518 ---------
 drivers/cc3000/src/cc3000_common.c       |  164 ---
 drivers/cc3000/src/ccspi.c               |  455 --------
 drivers/cc3000/src/evnt_handler.c        |  849 ---------------
 drivers/cc3000/src/hci.c                 |  225 ----
 drivers/cc3000/src/inet_ntop.c           |  200 ----
 drivers/cc3000/src/inet_pton.c           |  216 ----
 drivers/cc3000/src/netapp.c              |  459 --------
 drivers/cc3000/src/nvmem.c               |  334 ------
 drivers/cc3000/src/patch.c               |  117 --
 drivers/cc3000/src/patch_prog.c          |  414 -------
 drivers/cc3000/src/security.c            |  530 ---------
 drivers/cc3000/src/socket.c              | 1182 --------------------
 drivers/cc3000/src/wlan.c                | 1252 ----------------------
 30 files changed, 9514 deletions(-)
 delete mode 100644 docs/library/network.CC3K.rst
 delete mode 100644 drivers/cc3000/inc/cc3000_common.h
 delete mode 100644 drivers/cc3000/inc/ccspi.h
 delete mode 100644 drivers/cc3000/inc/data_types.h
 delete mode 100644 drivers/cc3000/inc/evnt_handler.h
 delete mode 100644 drivers/cc3000/inc/hci.h
 delete mode 100644 drivers/cc3000/inc/host_driver_version.h
 delete mode 100644 drivers/cc3000/inc/inet_ntop.h
 delete mode 100644 drivers/cc3000/inc/inet_pton.h
 delete mode 100644 drivers/cc3000/inc/netapp.h
 delete mode 100644 drivers/cc3000/inc/nvmem.h
 delete mode 100644 drivers/cc3000/inc/patch_prog.h
 delete mode 100644 drivers/cc3000/inc/security.h
 delete mode 100644 drivers/cc3000/inc/socket.h
 delete mode 100644 drivers/cc3000/inc/wlan.h
 delete mode 100644 drivers/cc3000/src/cc3000_common.c
 delete mode 100644 drivers/cc3000/src/ccspi.c
 delete mode 100644 drivers/cc3000/src/evnt_handler.c
 delete mode 100644 drivers/cc3000/src/hci.c
 delete mode 100644 drivers/cc3000/src/inet_ntop.c
 delete mode 100644 drivers/cc3000/src/inet_pton.c
 delete mode 100644 drivers/cc3000/src/netapp.c
 delete mode 100644 drivers/cc3000/src/nvmem.c
 delete mode 100644 drivers/cc3000/src/patch.c
 delete mode 100644 drivers/cc3000/src/patch_prog.c
 delete mode 100644 drivers/cc3000/src/security.c
 delete mode 100644 drivers/cc3000/src/socket.c
 delete mode 100644 drivers/cc3000/src/wlan.c

diff --git a/LICENSE b/LICENSE
index 2b9a64b89a723..5a91df195fd4a 100644
--- a/LICENSE
+++ b/LICENSE
@@ -35,7 +35,6 @@ used during the build process and is not part of the compiled source code.
 
 / (MIT)
     /drivers
-        /cc3000 (BSD-3-clause)
         /cc3100 (BSD-3-clause)
         /wiznet5k (BSD-3-clause)
     /lib
diff --git a/docs/library/network.CC3K.rst b/docs/library/network.CC3K.rst
deleted file mode 100644
index 41d3fb437e992..0000000000000
--- a/docs/library/network.CC3K.rst
+++ /dev/null
@@ -1,89 +0,0 @@
-.. currentmodule:: network
-.. _network.CC3K:
-
-class CC3K -- control CC3000 WiFi modules
-=========================================
-
-This class provides a driver for CC3000 WiFi modules.  Example usage::
-
-    import network
-    nic = network.CC3K(pyb.SPI(2), pyb.Pin.board.Y5, pyb.Pin.board.Y4, pyb.Pin.board.Y3)
-    nic.connect('your-ssid', 'your-password')
-    while not nic.isconnected():
-        pyb.delay(50)
-    print(nic.ifconfig())
-
-    # now use socket as usual
-    ...
-
-For this example to work the CC3000 module must have the following connections:
-
-    - MOSI connected to Y8
-    - MISO connected to Y7
-    - CLK connected to Y6
-    - CS connected to Y5
-    - VBEN connected to Y4
-    - IRQ connected to Y3
-
-It is possible to use other SPI buses and other pins for CS, VBEN and IRQ.
-
-Constructors
-------------
-
-.. class:: CC3K(spi, pin_cs, pin_en, pin_irq)
-
-   Create a CC3K driver object, initialise the CC3000 module using the given SPI bus
-   and pins, and return the CC3K object.
-
-   Arguments are:
-
-     - *spi* is an :ref:`SPI object <pyb.SPI>` which is the SPI bus that the CC3000 is
-       connected to (the MOSI, MISO and CLK pins).
-     - *pin_cs* is a :ref:`Pin object <pyb.Pin>` which is connected to the CC3000 CS pin.
-     - *pin_en* is a :ref:`Pin object <pyb.Pin>` which is connected to the CC3000 VBEN pin.
-     - *pin_irq* is a :ref:`Pin object <pyb.Pin>` which is connected to the CC3000 IRQ pin.
-
-   All of these objects will be initialised by the driver, so there is no need to
-   initialise them yourself.  For example, you can use::
-
-     nic = network.CC3K(pyb.SPI(2), pyb.Pin.board.Y5, pyb.Pin.board.Y4, pyb.Pin.board.Y3)
-
-Methods
--------
-
-.. method:: CC3K.connect(ssid, key=None, *, security=WPA2, bssid=None)
-
-   Connect to a WiFi access point using the given SSID, and other security
-   parameters.
-
-.. method:: CC3K.disconnect()
-
-   Disconnect from the WiFi access point.
-
-.. method:: CC3K.isconnected()
-
-   Returns True if connected to a WiFi access point and has a valid IP address,
-   False otherwise.
-
-.. method:: CC3K.ifconfig()
-
-   Returns a 7-tuple with (ip, subnet mask, gateway, DNS server, DHCP server,
-   MAC address, SSID).
-
-.. method:: CC3K.patch_version()
-
-   Return the version of the patch program (firmware) on the CC3000.
-
-.. method:: CC3K.patch_program('pgm')
-
-   Upload the current firmware to the CC3000.  You must pass 'pgm' as the first
-   argument in order for the upload to proceed.
-
-Constants
----------
-
-.. data:: CC3K.WEP
-.. data:: CC3K.WPA
-.. data:: CC3K.WPA2
-
-   security type to use
diff --git a/docs/library/network.rst b/docs/library/network.rst
index 6742a2e0733db..0a6f5506ea411 100644
--- a/docs/library/network.rst
+++ b/docs/library/network.rst
@@ -150,7 +150,6 @@ provide a way to control networking interfaces of various kinds.
 
    network.WLAN.rst
    network.WLANWiPy.rst
-   network.CC3K.rst
    network.WIZNET5K.rst
    network.LAN.rst
 
diff --git a/drivers/cc3000/inc/cc3000_common.h b/drivers/cc3000/inc/cc3000_common.h
deleted file mode 100644
index d0c4b1d4b92ea..0000000000000
--- a/drivers/cc3000/inc/cc3000_common.h
+++ /dev/null
@@ -1,365 +0,0 @@
-/*****************************************************************************
-*
-*  cc3000_common.h  - CC3000 Host Driver Implementation.
-*  Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/
-*
-*  Redistribution and use in source and binary forms, with or without
-*  modification, are permitted provided that the following conditions
-*  are met:
-*
-*    Redistributions of source code must retain the above copyright
-*    notice, this list of conditions and the following disclaimer.
-*
-*    Redistributions in binary form must reproduce the above copyright
-*    notice, this list of conditions and the following disclaimer in the
-*    documentation and/or other materials provided with the   
-*    distribution.
-*
-*    Neither the name of Texas Instruments Incorporated nor the names of
-*    its contributors may be used to endorse or promote products derived
-*    from this software without specific prior written permission.
-*
-*  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
-*  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
-*  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-*  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
-*  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
-*  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
-*  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-*  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-*  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-*  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
-*  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*
-*****************************************************************************/
-#ifndef __CC3000_COMMON_H__
-#define __CC3000_COMMON_H__
-
-#include "data_types.h"
-
-//******************************************************************************
-// Include files
-//******************************************************************************
-#include <stdlib.h>
-#include <stdint.h>
-
-//*****************************************************************************
-// Prefix exported names to avoid name clash
-//*****************************************************************************
-#define CC3000_EXPORT(name) cc3000_ ## name
-
-//*****************************************************************************
-//
-// If building with a C++ compiler, make all of the definitions in this header
-// have a C binding.
-//
-//*****************************************************************************
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-extern int CC3000_EXPORT(errno);
-
-//*****************************************************************************
-//                  ERROR CODES
-//*****************************************************************************
-#define ESUCCESS        0
-#define EFAIL          -1
-#define EERROR          EFAIL
-
-//*****************************************************************************
-//                  COMMON DEFINES
-//*****************************************************************************
-#define ERROR_SOCKET_INACTIVE   -57 
-
-#define WLAN_ENABLE      (1)   
-#define WLAN_DISABLE     (0)
-
-#define	MAC_ADDR_LEN	(6)
-
-#define	SP_PORTION_SIZE	(32)
-  
-/*Defines for minimal and maximal RX buffer size. This size includes the spi 
-  header and hci header.
-  The maximal buffer size derives from:
-    MTU + HCI header + SPI header + sendto() agrs size
-  The minimum buffer size derives from:
-    HCI header + SPI header + max args size
-
-  This buffer is used for receiving events and data.
-  The packet can not be longer than MTU size and CC3000 does not support 
-  fragmentation. Note that the same buffer is used for reception of the data 
-  and events from CC3000. That is why the minimum is defined. 
-  The calculation for the actual size of buffer for reception is:
-  Given the maximal data size MAX_DATA that is expected to be received by
-  application, the required buffer is:
-  Using recv() or recvfrom():
- 
-    max(CC3000_MINIMAL_RX_SIZE, MAX_DATA + HEADERS_SIZE_DATA + fromlen
-    + ucArgsize + 1)
- 
-  Using gethostbyname() with minimal buffer size will limit the host name
-  returned to 99 bytes only.
-  The 1 is used for the overrun detection 
-
-  Buffer size increased to 130 following the add_profile() with WEP security
-  which requires TX buffer size of 130 bytes: 
-  HEADERS_SIZE_EVNT + WLAN_ADD_PROFILE_WEP_PARAM_LEN + MAX SSID LEN + 4 * MAX KEY LEN = 130
-  MAX SSID LEN = 32 
-  MAX SSID LEN = 13 (with add_profile only ascii key setting is supported, 
-  therfore maximum key size is 13)
-*/
-
-#define CC3000_MINIMAL_RX_SIZE      (130 + 1)
-#define CC3000_MAXIMAL_RX_SIZE      (1519 + 1)
-
-/*Defines for minimal and maximal TX buffer size.
-  This buffer is used for sending events and data.
-  The packet can not be longer than MTU size and CC3000 does not support 
-  fragmentation. Note that the same buffer is used for transmission of the data
-  and commands. That is why the minimum is defined.
-  The calculation for the actual size of buffer for transmission is:
-  Given the maximal data size MAX_DATA, the required buffer is:
-  Using Sendto():
- 
-   max(CC3000_MINIMAL_TX_SIZE, MAX_DATA + SPI_HEADER_SIZE
-   + SOCKET_SENDTO_PARAMS_LEN + SIMPLE_LINK_HCI_DATA_HEADER_SIZE + 1)
- 
-  Using Send():
- 
-   max(CC3000_MINIMAL_TX_SIZE, MAX_DATA + SPI_HEADER_SIZE
-   + HCI_CMND_SEND_ARG_LENGTH + SIMPLE_LINK_HCI_DATA_HEADER_SIZE + 1)
- 
-  The 1 is used for the overrun detection */ 
-
-#define	CC3000_MINIMAL_TX_SIZE      (130 + 1)  
-#define	CC3000_MAXIMAL_TX_SIZE      (1519 + 1)
-
-//TX and RX buffer sizes, allow to receive and transmit maximum data at length 8.
-#ifdef CC3000_TINY_DRIVER
-#define TINY_CC3000_MAXIMAL_RX_SIZE 44
-#define TINY_CC3000_MAXIMAL_TX_SIZE 59
-#endif
-
-/*In order to determine your preferred buffer size, 
-  change CC3000_MAXIMAL_RX_SIZE and CC3000_MAXIMAL_TX_SIZE to a value between
-  the minimal and maximal specified above. 
-  Note that the buffers are allocated by SPI.
-  In case you change the size of those buffers, you might need also to change
-  the linker file, since for example on MSP430 FRAM devices the buffers are
-  allocated in the FRAM section that is allocated manually and not by IDE.
-*/
-  
-#ifndef CC3000_TINY_DRIVER
-  
-	#define CC3000_RX_BUFFER_SIZE   (CC3000_MAXIMAL_RX_SIZE)
-	#define CC3000_TX_BUFFER_SIZE   (CC3000_MAXIMAL_TX_SIZE)
-  
-//if defined TINY DRIVER we use smaller RX and TX buffer in order to minimize RAM consumption
-#else
-	#define CC3000_RX_BUFFER_SIZE   (TINY_CC3000_MAXIMAL_RX_SIZE)
-	#define CC3000_TX_BUFFER_SIZE   (TINY_CC3000_MAXIMAL_TX_SIZE)
-
-#endif  
-
-//*****************************************************************************
-//                  Compound Types
-//*****************************************************************************
-typedef INT32 cc3000_time_t;
-typedef UINT32 clock_t;
-typedef INT32 suseconds_t;
-
-typedef struct cc3000_timeval cc3000_timeval;
-
-struct cc3000_timeval
-{
-    cc3000_time_t  tv_sec;                  /* seconds */
-    suseconds_t    tv_usec;                 /* microseconds */
-};
-
-typedef CHAR *(*tFWPatches)(UINT32 *usLength);
-
-typedef CHAR *(*tDriverPatches)(UINT32 *usLength);
-
-typedef CHAR *(*tBootLoaderPatches)(UINT32 *usLength);
-
-typedef void (*tWlanCB)(INT32 event_type, CHAR * data, UINT8 length );
-
-typedef INT32 (*tWlanReadInteruptPin)(void);
-
-typedef void (*tWlanInterruptEnable)(void);
-
-typedef void (*tWlanInterruptDisable)(void);
-
-typedef void (*tWriteWlanPin)(UINT8 val);
-
-typedef struct
-{
-	UINT16	 usRxEventOpcode;
-	UINT16	 usEventOrDataReceived;
-	UINT8 	*pucReceivedData;
-	UINT8 	*pucTxCommandBuffer;
-
-	tFWPatches 			sFWPatches;
-	tDriverPatches 		sDriverPatches;
-	tBootLoaderPatches 	sBootLoaderPatches;
-	tWlanCB	 			sWlanCB;
-    tWlanReadInteruptPin  ReadWlanInterruptPin;
-    tWlanInterruptEnable  WlanInterruptEnable;
-    tWlanInterruptDisable WlanInterruptDisable;
-    tWriteWlanPin         WriteWlanPin;
-
-	INT32		 slTransmitDataError;
-	UINT16	 usNumberOfFreeBuffers;
-	UINT16	 usSlBufferLength;
-	UINT16	 usBufferSize;
-	UINT16	 usRxDataPending;
-
-	UINT32    NumberOfSentPackets;
-	UINT32    NumberOfReleasedPackets;
-
-	UINT8	 InformHostOnTxComplete;
-}sSimplLinkInformation;
-
-extern volatile sSimplLinkInformation tSLInformation;
-
-
-//*****************************************************************************
-// Prototypes for the APIs.
-//*****************************************************************************
-
-
-
-//*****************************************************************************
-//
-//!  SimpleLinkWaitEvent
-//!
-//!  @param  usOpcode      command operation code
-//!  @param  pRetParams    command return parameters
-//!
-//!  @return               none
-//!
-//!  @brief                Wait for event, pass it to the hci_event_handler and
-//!                        update the event opcode in a global variable.
-//
-//*****************************************************************************
-
-extern void SimpleLinkWaitEvent(UINT16 usOpcode, void *pRetParams);
-
-//*****************************************************************************
-//
-//!  SimpleLinkWaitData
-//!
-//!  @param  pBuf       data buffer
-//!  @param  from       from information
-//!  @param  fromlen	  from information length
-//!
-//!  @return               none
-//!
-//!  @brief                Wait for data, pass it to the hci_event_handler
-//! 					   and update in a global variable that there is 
-//!						   data to read.
-//
-//*****************************************************************************
-
-extern void SimpleLinkWaitData(UINT8 *pBuf, UINT8 *from, UINT8 *fromlen);
-
-//*****************************************************************************
-//
-//!  UINT32_TO_STREAM_f
-//!
-//!  \param  p       pointer to the new stream
-//!  \param  u32     pointer to the 32 bit
-//!
-//!  \return               pointer to the new stream
-//!
-//!  \brief                This function is used for copying 32 bit to stream
-//!						   while converting to little endian format.
-//
-//*****************************************************************************
-
-extern UINT8* UINT32_TO_STREAM_f (UINT8 *p, UINT32 u32);
-
-//*****************************************************************************
-//
-//!  UINT16_TO_STREAM_f
-//!
-//!  \param  p       pointer to the new stream
-//!  \param  u32     pointer to the 16 bit
-//!
-//!  \return               pointer to the new stream
-//!
-//!  \brief               This function is used for copying 16 bit to stream 
-//!                       while converting to little endian format.
-//
-//*****************************************************************************
-
-extern UINT8* UINT16_TO_STREAM_f (UINT8 *p, UINT16 u16);
-
-//*****************************************************************************
-//
-//!  STREAM_TO_UINT16_f
-//!
-//!  \param  p          pointer to the stream
-//!  \param  offset     offset in the stream
-//!
-//!  \return               pointer to the new 16 bit
-//!
-//!  \brief               This function is used for copying received stream to 
-//!                       16 bit in little endian format.
-//
-//*****************************************************************************
-
-extern UINT16 STREAM_TO_UINT16_f(CHAR* p, UINT16 offset);
-
-//*****************************************************************************
-//
-//!  STREAM_TO_UINT32_f
-//!
-//!  \param  p          pointer to the stream
-//!  \param  offset     offset in the stream
-//!
-//!  \return               pointer to the new 32 bit
-//!
-//!  \brief               This function is used for copying received stream to
-//!                       32 bit in little endian format.
-//
-//*****************************************************************************
-
-extern UINT32 STREAM_TO_UINT32_f(CHAR* p, UINT16 offset);
-
-
-//*****************************************************************************
-//                    COMMON MACROs
-//*****************************************************************************
-
-
-//This macro is used for copying 8 bit to stream while converting to little endian format.
-#define UINT8_TO_STREAM(_p, _val)	{*(_p)++ = (_val);}
-//This macro is used for copying 16 bit to stream while converting to little endian format.
-#define UINT16_TO_STREAM(_p, _u16)	(UINT16_TO_STREAM_f(_p, _u16))
-//This macro is used for copying 32 bit to stream while converting to little endian format.
-#define UINT32_TO_STREAM(_p, _u32)	(UINT32_TO_STREAM_f(_p, _u32))
-//This macro is used for copying a specified value length bits (l) to stream while converting to little endian format.
-#define ARRAY_TO_STREAM(p, a, l) 	{register INT16 _i; for (_i = 0; _i < l; _i++) *(p)++ = ((UINT8 *) a)[_i];}
-//This macro is used for copying received stream to 8 bit in little endian format.
-#define STREAM_TO_UINT8(_p, _offset, _u8)	{_u8 = (UINT8)(*(_p + _offset));}
-//This macro is used for copying received stream to 16 bit in little endian format.
-#define STREAM_TO_UINT16(_p, _offset, _u16)	{_u16 = STREAM_TO_UINT16_f(_p, _offset);}
-//This macro is used for copying received stream to 32 bit in little endian format.
-#define STREAM_TO_UINT32(_p, _offset, _u32)	{_u32 = STREAM_TO_UINT32_f(_p, _offset);}
-#define STREAM_TO_STREAM(p, a, l) 	{register INT16 _i; for (_i = 0; _i < l; _i++) *(a)++= ((UINT8 *) p)[_i];}
-
-
-
-
-//*****************************************************************************
-//
-// Mark the end of the C bindings section for C++ compilers.
-//
-//*****************************************************************************
-#ifdef  __cplusplus
-}
-#endif // __cplusplus
-
-#endif // __CC3000_COMMON_H__
diff --git a/drivers/cc3000/inc/ccspi.h b/drivers/cc3000/inc/ccspi.h
deleted file mode 100644
index 8fa3ecd10c2fc..0000000000000
--- a/drivers/cc3000/inc/ccspi.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/*****************************************************************************
-*
-*  spi.h  - CC3000 Host Driver Implementation.
-*  Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/
-*
-*  Redistribution and use in source and binary forms, with or without
-*  modification, are permitted provided that the following conditions
-*  are met:
-*
-*    Redistributions of source code must retain the above copyright
-*    notice, this list of conditions and the following disclaimer.
-*
-*    Redistributions in binary form must reproduce the above copyright
-*    notice, this list of conditions and the following disclaimer in the
-*    documentation and/or other materials provided with the   
-*    distribution.
-*
-*    Neither the name of Texas Instruments Incorporated nor the names of
-*    its contributors may be used to endorse or promote products derived
-*    from this software without specific prior written permission.
-*
-*  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
-*  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
-*  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-*  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
-*  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
-*  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
-*  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-*  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-*  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-*  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
-*  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*
-*****************************************************************************/
-
-
-#ifndef __CC3000_SPI_H__
-#define __CC3000_SPI_H__
-
-//*****************************************************************************
-//
-// If building with a C++ compiler, make all of the definitions in this header
-// have a C binding.
-//
-//*****************************************************************************
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-typedef void (*gcSpiHandleRx)(void *p);
-typedef void (*gcSpiHandleTx)(void);
-extern unsigned char wlan_tx_buffer[];
-
-//*****************************************************************************
-//
-// Prototypes for the APIs.
-//
-//*****************************************************************************
-
-// the arguments must be of type pin_obj_t* and SPI_HandleTypeDef*
-extern void SpiInit(void *spi, const void *pin_cs, const void *pin_en, const void *pin_irq);
-
-extern void SpiOpen(gcSpiHandleRx pfRxHandler);
-extern void SpiClose(void);
-extern void SpiPauseSpi(void);
-extern void SpiResumeSpi(void);
-extern long SpiWrite(unsigned char *pUserBuffer, unsigned short usLength);
-extern void SpiConfigureHwMapping(void);
-extern void SpiCleanGPIOISR(void);
-extern void SSIConfigure(unsigned long ulSSIFreq, unsigned long bForceGpioConfiguration, unsigned long uiReconfigureSysClock);
-extern int init_spi(void);
-extern long ReadWlanInterruptPin(void);
-extern void WriteWlanPin(unsigned char val);
-//*****************************************************************************
-//
-// Mark the end of the C bindings section for C++ compilers.
-//
-//*****************************************************************************
-#ifdef  __cplusplus
-}
-#endif // __cplusplus
-
-#endif
-
diff --git a/drivers/cc3000/inc/data_types.h b/drivers/cc3000/inc/data_types.h
deleted file mode 100644
index 0520a9202fb88..0000000000000
--- a/drivers/cc3000/inc/data_types.h
+++ /dev/null
@@ -1,107 +0,0 @@
-/*****************************************************************************
-*
-*  data_types.h  - CC3000 Host Driver Implementation.
-*  Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/
-*
-*  Redistribution and use in source and binary forms, with or without
-*  modification, are permitted provided that the following conditions
-*  are met:
-*
-*    Redistributions of source code must retain the above copyright
-*    notice, this list of conditions and the following disclaimer.
-*
-*    Redistributions in binary form must reproduce the above copyright
-*    notice, this list of conditions and the following disclaimer in the
-*    documentation and/or other materials provided with the   
-*    distribution.
-*
-*    Neither the name of Texas Instruments Incorporated nor the names of
-*    its contributors may be used to endorse or promote products derived
-*    from this software without specific prior written permission.
-*
-*  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
-*  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
-*  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-*  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
-*  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
-*  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
-*  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-*  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-*  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-*  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
-*  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*
-*****************************************************************************/
-#ifndef __CC3000_DATA_TYPES__
-#define __CC3000_DATA_TYPES__
-
-//*****************************************************************************
-//
-// If building with a C++ compiler, make all of the definitions in this header
-// have a C binding.
-//
-//*****************************************************************************
-#ifdef	__cplusplus
-extern "C" {
-#endif
-
-
-#ifndef NULL
-#define NULL        		(0)
-#endif
-
-#ifndef FALSE
-#define FALSE       		(0)
-#endif
-
-#ifndef TRUE
-#define TRUE        		(!FALSE)
-#endif
-
-#ifndef OK
-#define OK          		(0)
-#endif
-
-#ifndef _INT8
-#define _INT8
-typedef signed char   		INT8;
-#endif
-
-#ifndef _UINT8
-#define _UINT8
-typedef unsigned char   	UINT8;
-#endif
-
-#ifndef _INT16
-#define _INT16
-typedef signed short  		INT16;
-#endif
-
-#ifndef _UINT16
-#define _UINT16
-typedef unsigned short   	UINT16;
-#endif
-
-#ifndef _BOOLEAN
-#define _BOOLEAN
-typedef unsigned char   	BOOLEAN;
-#endif
-
-#ifndef _INT32
-#define _INT32
-typedef signed long   		INT32;
-#endif
-
-#ifndef _UINT32
-#define _UINT32
-typedef unsigned long   	UINT32;
-#endif
-
-typedef int             	INT;
-typedef char            	CHAR;
-
-#ifdef	__cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __CC3000_DATA_TYPES__ */
diff --git a/drivers/cc3000/inc/evnt_handler.h b/drivers/cc3000/inc/evnt_handler.h
deleted file mode 100644
index d05a442f05fbb..0000000000000
--- a/drivers/cc3000/inc/evnt_handler.h
+++ /dev/null
@@ -1,166 +0,0 @@
-/*****************************************************************************
-*
-*  evnt_handler.h  - CC3000 Host Driver Implementation.
-*  Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/
-*
-*  Redistribution and use in source and binary forms, with or without
-*  modification, are permitted provided that the following conditions
-*  are met:
-*
-*    Redistributions of source code must retain the above copyright
-*    notice, this list of conditions and the following disclaimer.
-*
-*    Redistributions in binary form must reproduce the above copyright
-*    notice, this list of conditions and the following disclaimer in the
-*    documentation and/or other materials provided with the   
-*    distribution.
-*
-*    Neither the name of Texas Instruments Incorporated nor the names of
-*    its contributors may be used to endorse or promote products derived
-*    from this software without specific prior written permission.
-*
-*  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
-*  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
-*  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-*  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
-*  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
-*  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
-*  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-*  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-*  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-*  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
-*  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*
-*****************************************************************************/
-#ifndef __CC3000_EVENT_HANDLER_H__
-#define __CC3000_EVENT_HANDLER_H__
-#include "hci.h"
-#include "socket.h"
-
-//*****************************************************************************
-//
-// If building with a C++ compiler, make all of the definitions in this header
-// have a C binding.
-//
-//*****************************************************************************
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-//*****************************************************************************
-//
-// Prototypes for the APIs.
-//
-//*****************************************************************************
-
-//*****************************************************************************
-//
-//!  hci_event_handler
-//!
-//!  @param  pRetParams     incoming data buffer
-//!  @param  from           from information (in case of data received)
-//!  @param  fromlen        from information length (in case of data received)
-//!
-//!  @return         none
-//!
-//!  @brief          Parse the incoming events packets and issues corresponding
-//!                  event handler from global array of handlers pointers
-//
-//*****************************************************************************
-extern UINT8 *hci_event_handler(void *pRetParams, UINT8 *from, UINT8 *fromlen);
-
-//*****************************************************************************
-//
-//!  hci_unsol_event_handler
-//!
-//!  @param  event_hdr   event header
-//!
-//!  @return             1 if event supported and handled
-//!                      0 if event is not supported
-//!
-//!  @brief              Handle unsolicited events
-//
-//*****************************************************************************
-extern INT32 hci_unsol_event_handler(CHAR *event_hdr);
-
-//*****************************************************************************
-//
-//!  hci_unsolicited_event_handler
-//!
-//!  @param None
-//!
-//!  @return         ESUCCESS if successful, EFAIL if an error occurred
-//!
-//!  @brief          Parse the incoming unsolicited event packets and issues 
-//!                  corresponding event handler.
-//
-//*****************************************************************************
-extern INT32 hci_unsolicited_event_handler(void);
-
-#define M_BSD_RESP_PARAMS_OFFSET(hci_event_hdr)((CHAR *)(hci_event_hdr) + HCI_EVENT_HEADER_SIZE)
-
-#define SOCKET_STATUS_ACTIVE       0
-#define SOCKET_STATUS_INACTIVE     1
-/* Init socket_active_status = 'all ones': init all sockets with SOCKET_STATUS_INACTIVE.
-   Will be changed by 'set_socket_active_status' upon 'connect' and 'accept' calls */
-#define SOCKET_STATUS_INIT_VAL  0xFFFF
-#define M_IS_VALID_SD(sd) ((0 <= (sd)) && ((sd) <= 7))
-#define M_IS_VALID_STATUS(status) (((status) == SOCKET_STATUS_ACTIVE)||((status) == SOCKET_STATUS_INACTIVE))
-
-extern UINT32 socket_active_status;
-
-extern void set_socket_active_status(INT32 Sd, INT32 Status);
-extern INT32 get_socket_active_status(INT32 Sd);
-
-typedef struct _bsd_accept_return_t
-{
-    INT32             iSocketDescriptor;
-    INT32             iStatus;
-    sockaddr   		tSocketAddress;
-    
-} tBsdReturnParams;
-
-
-typedef struct _bsd_read_return_t
-{
-    INT32             iSocketDescriptor;
-    INT32             iNumberOfBytes;
-    UINT32	 uiFlags;
-} tBsdReadReturnParams;
-
-#define BSD_RECV_FROM_FROMLEN_OFFSET	(4)
-#define BSD_RECV_FROM_FROM_OFFSET		(16)
-
-
-typedef struct _bsd_select_return_t
-{
-    INT32					iStatus;
-	UINT32 			uiRdfd;
-	UINT32 			uiWrfd;
-	UINT32 			uiExfd;
-} tBsdSelectRecvParams;
-
-
-typedef struct _bsd_getsockopt_return_t
-{
-	UINT8			ucOptValue[4];
-	CHAR						iStatus;
-} tBsdGetSockOptReturnParams;
-
-typedef struct _bsd_gethostbyname_return_t
-{
-    INT32             retVal;
-    INT32             outputAddress;
-} tBsdGethostbynameParams;
-
-//*****************************************************************************
-//
-// Mark the end of the C bindings section for C++ compilers.
-//
-//*****************************************************************************
-#ifdef  __cplusplus
-}
-#endif // __cplusplus
-
-#endif // __CC3000_EVENT_HANDLER_H__
-
diff --git a/drivers/cc3000/inc/hci.h b/drivers/cc3000/inc/hci.h
deleted file mode 100644
index f12b00e918e1b..0000000000000
--- a/drivers/cc3000/inc/hci.h
+++ /dev/null
@@ -1,330 +0,0 @@
-/*****************************************************************************
-*
-*  hci.h  - CC3000 Host Driver Implementation.
-*  Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/
-*
-*  Redistribution and use in source and binary forms, with or without
-*  modification, are permitted provided that the following conditions
-*  are met:
-*
-*    Redistributions of source code must retain the above copyright
-*    notice, this list of conditions and the following disclaimer.
-*
-*    Redistributions in binary form must reproduce the above copyright
-*    notice, this list of conditions and the following disclaimer in the
-*    documentation and/or other materials provided with the   
-*    distribution.
-*
-*    Neither the name of Texas Instruments Incorporated nor the names of
-*    its contributors may be used to endorse or promote products derived
-*    from this software without specific prior written permission.
-*
-*  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
-*  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
-*  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-*  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
-*  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
-*  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
-*  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-*  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-*  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-*  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
-*  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*
-*****************************************************************************/
-#ifndef __CC3000_HCI_H__
-#define __CC3000_HCI_H__
-
-#include "cc3000_common.h"
-
-//*****************************************************************************
-//
-// If building with a C++ compiler, make all of the definitions in this header
-// have a C binding.
-//
-//*****************************************************************************
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-
-#define SPI_HEADER_SIZE 				   			(5)
-#define SIMPLE_LINK_HCI_CMND_HEADER_SIZE 			(4)
-#define HEADERS_SIZE_CMD        					(SPI_HEADER_SIZE + SIMPLE_LINK_HCI_CMND_HEADER_SIZE)
-#define SIMPLE_LINK_HCI_DATA_CMND_HEADER_SIZE 		(5)
-#define SIMPLE_LINK_HCI_DATA_HEADER_SIZE 			(5)
-#define SIMPLE_LINK_HCI_PATCH_HEADER_SIZE 			(2)
-
-
-//*****************************************************************************
-//
-// Values that can be used as HCI Commands and HCI Packet header defines
-//
-//*****************************************************************************
-#define  HCI_TYPE_CMND          0x1
-#define  HCI_TYPE_DATA          0x2
-#define  HCI_TYPE_PATCH         0x3
-#define  HCI_TYPE_EVNT          0x4
-
-
-#define HCI_EVENT_PATCHES_DRV_REQ			(1)
-#define HCI_EVENT_PATCHES_FW_REQ			(2)
-#define HCI_EVENT_PATCHES_BOOTLOAD_REQ		(3)
-
-
-#define  HCI_CMND_WLAN_BASE  (0x0000)
-#define  HCI_CMND_WLAN_CONNECT  0x0001
-#define  HCI_CMND_WLAN_DISCONNECT   0x0002
-#define  HCI_CMND_WLAN_IOCTL_SET_SCANPARAM    0x0003
-#define  HCI_CMND_WLAN_IOCTL_SET_CONNECTION_POLICY  0x0004
-#define  HCI_CMND_WLAN_IOCTL_ADD_PROFILE  0x0005
-#define  HCI_CMND_WLAN_IOCTL_DEL_PROFILE  0x0006
-#define  HCI_CMND_WLAN_IOCTL_GET_SCAN_RESULTS  0x0007
-#define  HCI_CMND_EVENT_MASK    0x0008
-#define  HCI_CMND_WLAN_IOCTL_STATUSGET 0x0009
-#define  HCI_CMND_WLAN_IOCTL_SIMPLE_CONFIG_START        0x000A
-#define  HCI_CMND_WLAN_IOCTL_SIMPLE_CONFIG_STOP         0x000B
-#define  HCI_CMND_WLAN_IOCTL_SIMPLE_CONFIG_SET_PREFIX   0x000C
-#define  HCI_CMND_WLAN_CONFIGURE_PATCH					0x000D
-
-
-#define  HCI_CMND_SOCKET_BASE   0x1000
-#define  HCI_CMND_SOCKET        0x1001
-#define  HCI_CMND_BIND          0x1002
-#define  HCI_CMND_RECV          0x1004
-#define  HCI_CMND_ACCEPT        0x1005
-#define  HCI_CMND_LISTEN        0x1006
-#define  HCI_CMND_CONNECT       0x1007
-#define  HCI_CMND_BSD_SELECT 	0x1008
-#define  HCI_CMND_SETSOCKOPT    0x1009
-#define  HCI_CMND_GETSOCKOPT    0x100A
-#define  HCI_CMND_CLOSE_SOCKET  0x100B
-#define  HCI_CMND_RECVFROM      0x100D
-#define  HCI_CMND_GETHOSTNAME   0x1010
-#define  HCI_CMND_MDNS_ADVERTISE	   0x1011
-#define  HCI_CMND_GETMSSVALUE		0x1012
-
-
-#define HCI_DATA_BASE								0x80
-
-#define HCI_CMND_SEND           					(0x01 + HCI_DATA_BASE)
-#define HCI_CMND_SENDTO        						(0x03 + HCI_DATA_BASE)
-#define HCI_DATA_BSD_RECVFROM						(0x04 + HCI_DATA_BASE)
-#define HCI_DATA_BSD_RECV							(0x05 + HCI_DATA_BASE)
-
-
-#define HCI_CMND_NVMEM_CBASE		(0x0200)
-
-
-#define HCI_CMND_NVMEM_CREATE_ENTRY (0x0203)
-#define HCI_CMND_NVMEM_SWAP_ENTRY  	(0x0205)
-#define HCI_CMND_NVMEM_READ    		(0x0201)
-#define HCI_CMND_NVMEM_WRITE   		(0x0090)
-#define HCI_CMND_NVMEM_WRITE_PATCH	(0x0204)
-#define HCI_CMND_READ_SP_VERSION  	(0x0207)
-
-#define  HCI_CMND_READ_BUFFER_SIZE  0x400B
-#define  HCI_CMND_SIMPLE_LINK_START 0x4000
-
-#define HCI_CMND_NETAPP_BASE		0x2000
-
-#define HCI_NETAPP_DHCP				    (0x0001 + HCI_CMND_NETAPP_BASE)
-#define HCI_NETAPP_PING_SEND                        (0x0002 + HCI_CMND_NETAPP_BASE)
-#define HCI_NETAPP_PING_REPORT                      (0x0003 + HCI_CMND_NETAPP_BASE)
-#define HCI_NETAPP_PING_STOP                        (0x0004 + HCI_CMND_NETAPP_BASE)
-#define HCI_NETAPP_IPCONFIG                         (0x0005 + HCI_CMND_NETAPP_BASE)
-#define HCI_NETAPP_ARP_FLUSH			    (0x0006 + HCI_CMND_NETAPP_BASE)
-#define HCI_NETAPP_SET_DEBUG_LEVEL					(0x0008 + HCI_CMND_NETAPP_BASE)
-#define HCI_NETAPP_SET_TIMERS						(0x0009 + HCI_CMND_NETAPP_BASE)
-
-
-
-
-
-
-//*****************************************************************************
-//
-// Values that can be used as HCI Events defines
-//
-//*****************************************************************************
-#define  HCI_EVNT_WLAN_BASE     0x0000
-#define  HCI_EVNT_WLAN_CONNECT  0x0001
-#define  HCI_EVNT_WLAN_DISCONNECT \
-                                0x0002
-#define  HCI_EVNT_WLAN_IOCTL_ADD_PROFILE  \
-                                0x0005
-
-
-#define  HCI_EVNT_SOCKET              HCI_CMND_SOCKET
-#define  HCI_EVNT_BIND                HCI_CMND_BIND
-#define  HCI_EVNT_RECV                HCI_CMND_RECV
-#define  HCI_EVNT_ACCEPT              HCI_CMND_ACCEPT
-#define  HCI_EVNT_LISTEN              HCI_CMND_LISTEN
-#define  HCI_EVNT_CONNECT             HCI_CMND_CONNECT
-#define  HCI_EVNT_SELECT              HCI_CMND_BSD_SELECT
-#define  HCI_EVNT_CLOSE_SOCKET        HCI_CMND_CLOSE_SOCKET
-#define  HCI_EVNT_RECVFROM            HCI_CMND_RECVFROM
-#define  HCI_EVNT_SETSOCKOPT          HCI_CMND_SETSOCKOPT
-#define  HCI_EVNT_GETSOCKOPT          HCI_CMND_GETSOCKOPT
-#define  HCI_EVNT_BSD_GETHOSTBYNAME   HCI_CMND_GETHOSTNAME
-#define  HCI_EVNT_MDNS_ADVERTISE   HCI_CMND_MDNS_ADVERTISE
-#define  HCI_EVNT_GETMSSVALUE		HCI_CMND_GETMSSVALUE	
-
-#define  HCI_EVNT_SEND          0x1003
-#define  HCI_EVNT_WRITE         0x100E
-#define  HCI_EVNT_SENDTO        0x100F
-
-#define HCI_EVNT_PATCHES_REQ    0x1000
-
-#define HCI_EVNT_UNSOL_BASE    0x4000
-
-#define HCI_EVNT_WLAN_UNSOL_BASE     (0x8000)
-
-#define HCI_EVNT_WLAN_UNSOL_CONNECT  	 (0x0001 + HCI_EVNT_WLAN_UNSOL_BASE)
-#define HCI_EVNT_WLAN_UNSOL_DISCONNECT   (0x0002 + HCI_EVNT_WLAN_UNSOL_BASE)
-#define HCI_EVNT_WLAN_UNSOL_INIT         (0x0004 + HCI_EVNT_WLAN_UNSOL_BASE)
-#define HCI_EVNT_WLAN_TX_COMPLETE         (0x0008 + HCI_EVNT_WLAN_UNSOL_BASE)
-#define HCI_EVNT_WLAN_UNSOL_DHCP         (0x0010 + HCI_EVNT_WLAN_UNSOL_BASE)
-#define HCI_EVNT_WLAN_ASYNC_PING_REPORT  (0x0040 + HCI_EVNT_WLAN_UNSOL_BASE)
-#define HCI_EVNT_WLAN_ASYNC_SIMPLE_CONFIG_DONE  (0x0080 + HCI_EVNT_WLAN_UNSOL_BASE)
-#define HCI_EVNT_WLAN_KEEPALIVE			 (0x0200  + HCI_EVNT_WLAN_UNSOL_BASE)
-#define	HCI_EVNT_BSD_TCP_CLOSE_WAIT      (0x0800 + HCI_EVNT_WLAN_UNSOL_BASE)
-
-#define HCI_EVNT_DATA_UNSOL_FREE_BUFF \
-                                0x4100
-
-#define HCI_EVNT_NVMEM_CREATE_ENTRY \
-                                HCI_CMND_NVMEM_CREATE_ENTRY
-#define HCI_EVNT_NVMEM_SWAP_ENTRY HCI_CMND_NVMEM_SWAP_ENTRY
-
-#define HCI_EVNT_NVMEM_READ     HCI_CMND_NVMEM_READ
-#define HCI_EVNT_NVMEM_WRITE    (0x0202)
-
-#define HCI_EVNT_READ_SP_VERSION  	\
-				HCI_CMND_READ_SP_VERSION
-
-#define  HCI_EVNT_INPROGRESS    0xFFFF
-
-
-#define HCI_DATA_RECVFROM       0x84
-#define HCI_DATA_RECV           0x85
-#define HCI_DATA_NVMEM          0x91
-
-#define HCI_EVENT_CC3000_CAN_SHUT_DOWN 0x99
-
-//*****************************************************************************
-//
-// Prototypes for the structures for APIs.
-//
-//*****************************************************************************
-
-#define HCI_DATA_HEADER_SIZE		(5)
-#define HCI_EVENT_HEADER_SIZE		(5)
-#define HCI_DATA_CMD_HEADER_SIZE	(5)
-#define HCI_PATCH_HEADER_SIZE		(6)
-
-#define HCI_PACKET_TYPE_OFFSET		(0)
-#define HCI_PACKET_ARGSIZE_OFFSET	(2)
-#define HCI_PACKET_LENGTH_OFFSET	(3)
-
-
-#define HCI_EVENT_OPCODE_OFFSET (1)
-#define HCI_EVENT_LENGTH_OFFSET	(3)
-#define HCI_EVENT_STATUS_OFFSET	(4)
-#define HCI_DATA_LENGTH_OFFSET	(3)
-  
-  
-
-
-//*****************************************************************************
-//
-// Prototypes for the APIs.
-//
-//*****************************************************************************
-
-//*****************************************************************************
-//
-//!  hci_command_send
-//!
-//!  @param  usOpcode     command operation code
-//!  @param  pucBuff      pointer to the command's arguments buffer
-//!  @param  ucArgsLength length of the arguments
-//!
-//!  @return              none
-//!
-//!  @brief               Initiate an HCI command.
-//
-//*****************************************************************************
-extern UINT16 hci_command_send(UINT16 usOpcode, 
-                                   UINT8 *ucArgs,
-                                   UINT8 ucArgsLength);
- 
-
-//*****************************************************************************
-//
-//!  hci_data_send
-//!
-//!  @param  usOpcode        command operation code
-//!	 @param  ucArgs					 pointer to the command's arguments buffer
-//!  @param  usArgsLength    length of the arguments
-//!  @param  ucTail          pointer to the data buffer
-//!  @param  usTailLength    buffer length
-//!
-//!  @return none
-//!
-//!  @brief              Initiate an HCI data write operation
-//
-//*****************************************************************************
-extern INT32 hci_data_send(UINT8 ucOpcode,
-                                      UINT8 *ucArgs,
-                                      UINT16 usArgsLength,
-                                      UINT16 usDataLength,
-                                      const UINT8 *ucTail,
-                                      UINT16 usTailLength);
-
-
-//*****************************************************************************
-//
-//!  hci_data_command_send
-//!
-//!  @param  usOpcode      command operation code
-//!  @param  pucBuff       pointer to the data buffer
-//!  @param  ucArgsLength  arguments length
-//!  @param  ucDataLength  data length
-//!
-//!  @return none
-//!
-//!  @brief              Prepare HCI header and initiate an HCI data write operation
-//
-//*****************************************************************************
-extern void hci_data_command_send(UINT16 usOpcode, UINT8 *pucBuff,
-                     UINT8 ucArgsLength, UINT16 ucDataLength);
-
-//*****************************************************************************
-//
-//!  hci_patch_send
-//!
-//!  @param  usOpcode      command operation code
-//!  @param  pucBuff       pointer to the command's arguments buffer
-//!  @param  patch         pointer to patch content buffer 
-//!  @param  usDataLength  data length
-//!
-//!  @return              none
-//!
-//!  @brief               Prepare HCI header and initiate an HCI patch write operation
-//
-//*****************************************************************************
-extern void hci_patch_send(UINT8 ucOpcode, UINT8 *pucBuff, CHAR *patch, UINT16 usDataLength);
-
-
-
-//*****************************************************************************
-//
-// Mark the end of the C bindings section for C++ compilers.
-//
-//*****************************************************************************
-#ifdef  __cplusplus
-}
-#endif // __cplusplus
-
-#endif // __CC3000_HCI_H__
diff --git a/drivers/cc3000/inc/host_driver_version.h b/drivers/cc3000/inc/host_driver_version.h
deleted file mode 100644
index a28d21f1beaca..0000000000000
--- a/drivers/cc3000/inc/host_driver_version.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*****************************************************************************
-*
-*  host_driver_version.h  - CC3000 Host Driver Implementation.
-*  Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/
-*
-*  Redistribution and use in source and binary forms, with or without
-*  modification, are permitted provided that the following conditions
-*  are met:
-*
-*    Redistributions of source code must retain the above copyright
-*    notice, this list of conditions and the following disclaimer.
-*
-*    Redistributions in binary form must reproduce the above copyright
-*    notice, this list of conditions and the following disclaimer in the
-*    documentation and/or other materials provided with the   
-*    distribution.
-*
-*    Neither the name of Texas Instruments Incorporated nor the names of
-*    its contributors may be used to endorse or promote products derived
-*    from this software without specific prior written permission.
-*
-*  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
-*  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
-*  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-*  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
-*  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
-*  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
-*  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-*  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-*  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-*  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
-*  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*
-*****************************************************************************/
-#ifndef __CC3000_HOST_DRIVER_VERSION_H__
-#define __CC3000_HOST_DRIVER_VERSION_H__
-
-#define DRIVER_VERSION_NUMBER   15
-
-#endif // __CC3000_HOST_DRIVER_VERSION_H__
diff --git a/drivers/cc3000/inc/inet_ntop.h b/drivers/cc3000/inc/inet_ntop.h
deleted file mode 100644
index fa70806206ac8..0000000000000
--- a/drivers/cc3000/inc/inet_ntop.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef __INET_NTOP_H
-#define __INET_NTOP_H
-char *inet_ntop(int af, const void *addr, char *buf, size_t size);
-#endif /* __INET_NTOP_H */
diff --git a/drivers/cc3000/inc/inet_pton.h b/drivers/cc3000/inc/inet_pton.h
deleted file mode 100644
index 0896d5d29fd7b..0000000000000
--- a/drivers/cc3000/inc/inet_pton.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef __INET_PTON_H
-#define __INET_PTON_H
-int inet_pton(int, const char *, void *);
-#endif /* __INET_PTON_H */
diff --git a/drivers/cc3000/inc/netapp.h b/drivers/cc3000/inc/netapp.h
deleted file mode 100644
index 1e4f265896561..0000000000000
--- a/drivers/cc3000/inc/netapp.h
+++ /dev/null
@@ -1,343 +0,0 @@
-/*****************************************************************************
-*
-*  netapp.h  - CC3000 Host Driver Implementation.
-*  Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/
-*
-*  Redistribution and use in source and binary forms, with or without
-*  modification, are permitted provided that the following conditions
-*  are met:
-*
-*    Redistributions of source code must retain the above copyright
-*    notice, this list of conditions and the following disclaimer.
-*
-*    Redistributions in binary form must reproduce the above copyright
-*    notice, this list of conditions and the following disclaimer in the
-*    documentation and/or other materials provided with the   
-*    distribution.
-*
-*    Neither the name of Texas Instruments Incorporated nor the names of
-*    its contributors may be used to endorse or promote products derived
-*    from this software without specific prior written permission.
-*
-*  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
-*  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
-*  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-*  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
-*  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
-*  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
-*  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-*  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-*  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-*  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
-*  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*
-*****************************************************************************/
-#ifndef __CC3000_NETAPP_H__
-#define	__CC3000_NETAPP_H__
-
-#include "data_types.h"
-
-//*****************************************************************************
-//
-// If building with a C++ compiler, make all of the definitions in this header
-// have a C binding.
-//
-//*****************************************************************************
-#ifdef	__cplusplus
-extern "C" {
-#endif
-
-//*****************************************************************************
-//
-//! \addtogroup netapp_api
-//! @{
-//
-//*****************************************************************************
-
-typedef struct _netapp_dhcp_ret_args_t
-{
-    UINT8 aucIP[4];
-	UINT8 aucSubnetMask[4];
-	UINT8 aucDefaultGateway[4];
-	UINT8 aucDHCPServer[4];
-	UINT8 aucDNSServer[4];
-}tNetappDhcpParams;
-
-typedef struct _netapp_ipconfig_ret_args_t
-{
-    UINT8 aucIP[4];
-	UINT8 aucSubnetMask[4];
-	UINT8 aucDefaultGateway[4];
-	UINT8 aucDHCPServer[4];
-	UINT8 aucDNSServer[4];
-	UINT8 uaMacAddr[6];
-	UINT8 uaSSID[32];
-}tNetappIpconfigRetArgs;
-
-
-/*Ping send report parameters*/
-typedef struct _netapp_pingreport_args
-{
-	UINT32 packets_sent;
-	UINT32 packets_received;
-	UINT32 min_round_time;
-	UINT32 max_round_time;
-	UINT32 avg_round_time;
-} netapp_pingreport_args_t;
-
-
-//*****************************************************************************
-//
-//!  netapp_config_mac_adrress
-//!
-//!  @param  mac   device mac address, 6 bytes. Saved: yes 
-//!
-//!  @return       return on success 0, otherwise error.
-//!
-//!  @brief        Configure device MAC address and store it in NVMEM. 
-//!                The value of the MAC address configured through the API will
-//!		             be stored in CC3000 non volatile memory, thus preserved 
-//!                over resets.
-//
-//*****************************************************************************
-extern INT32  netapp_config_mac_adrress( UINT8 *mac );
-
-//*****************************************************************************
-//
-//!  netapp_dhcp
-//!
-//!  @param  aucIP               device mac address, 6 bytes. Saved: yes 
-//!  @param  aucSubnetMask       device mac address, 6 bytes. Saved: yes 
-//!  @param  aucDefaultGateway   device mac address, 6 bytes. Saved: yes 
-//!  @param  aucDNSServer        device mac address, 6 bytes. Saved: yes 
-//!
-//!  @return       return on success 0, otherwise error.
-//!
-//!  @brief       netapp_dhcp is used to configure the network interface, 
-//!               static or dynamic (DHCP).\n In order to activate DHCP mode, 
-//!               aucIP, aucSubnetMask, aucDefaultGateway must be 0.
-//!               The default mode of CC3000 is DHCP mode.
-//!               Note that the configuration is saved in non volatile memory
-//!               and thus preserved over resets.
-//!	 
-//! @note         If the mode is altered a reset of CC3000 device is required 
-//!               in order to apply changes.\nAlso note that asynchronous event 
-//!               of DHCP_EVENT, which is generated when an IP address is 
-//!               allocated either by the DHCP server or due to static 
-//!               allocation is generated only upon a connection to the 
-//!               AP was established. 
-//!
-//*****************************************************************************
-extern 	INT32 netapp_dhcp(UINT32 *aucIP, UINT32 *aucSubnetMask,UINT32 *aucDefaultGateway, UINT32 *aucDNSServer);
-
-
-
-//*****************************************************************************
-//
-//!  netapp_timeout_values
-//!
-//!  @param  aucDHCP    DHCP lease time request, also impact 
-//!                     the DHCP renew timeout. Range: [0-0xffffffff] seconds,
-//!                     0 or 0xffffffff == infinity lease timeout.
-//!                     Resolution:10 seconds. Influence: only after 
-//!                     reconnecting to the AP. 
-//!                     Minimal bound value: MIN_TIMER_VAL_SECONDS - 10 seconds.
-//!                     The parameter is saved into the CC3000 NVMEM. 
-//!                     The default value on CC3000 is 14400 seconds.
-//!	 
-//!  @param  aucARP     ARP refresh timeout, if ARP entry is not updated by
-//!                     incoming packet, the ARP entry will be  deleted by
-//!                     the end of the timeout. 
-//!                     Range: [0-0xffffffff] seconds, 0 == infinity ARP timeout
-//!                     Resolution: 10 seconds. Influence: on runtime.
-//!                     Minimal bound value: MIN_TIMER_VAL_SECONDS - 10 seconds
-//!                     The parameter is saved into the CC3000 NVMEM. 
-//!	                    The default value on CC3000 is 3600 seconds.
-//!
-//!  @param  aucKeepalive   Keepalive event sent by the end of keepalive timeout
-//!                         Range: [0-0xffffffff] seconds, 0 == infinity timeout
-//!                         Resolution: 10 seconds.
-//!                         Influence: on runtime.
-//!                         Minimal bound value: MIN_TIMER_VAL_SECONDS - 10 sec
-//!                         The parameter is saved into the CC3000 NVMEM. 
-//!                         The default value on CC3000 is 10 seconds.
-//!
-//!  @param  aucInactivity   Socket inactivity timeout, socket timeout is
-//!                          refreshed by incoming or outgoing packet, by the
-//!                          end of the socket timeout the socket will be closed
-//!                          Range: [0-0xffffffff] sec, 0 == infinity timeout.
-//!                          Resolution: 10 seconds. Influence: on runtime.
-//!                          Minimal bound value: MIN_TIMER_VAL_SECONDS - 10 sec
-//!                          The parameter is saved into the CC3000 NVMEM. 
-//!	                         The default value on CC3000 is 60 seconds.
-//!
-//!  @return       return on success 0, otherwise error.
-//!
-//!  @brief       Set new timeout values. Function set new timeout values for: 
-//!               DHCP lease timeout, ARP  refresh timeout, keepalive event 
-//!               timeout and socket inactivity timeout 
-//!	 
-//! @note         If a parameter set to non zero value which is less than 10s,
-//!               it will be set automatically to 10s.
-//!
-//*****************************************************************************
-#ifndef CC3000_TINY_DRIVER
-extern INT32 netapp_timeout_values(UINT32 *aucDHCP, UINT32 *aucARP, UINT32 *aucKeepalive, UINT32 *aucInactivity);
-#endif
-
-//*****************************************************************************
-//
-//!  netapp_ping_send
-//!
-//!  @param  ip              destination IP address
-//!  @param  pingAttempts    number of echo requests to send
-//!  @param  pingSize        send buffer size which may be up to 1400 bytes 
-//!  @param  pingTimeout     Time to wait for a response,in milliseconds.
-//!
-//!  @return       return on success 0, otherwise error.
-//!
-//!  @brief       send ICMP ECHO_REQUEST to network hosts 
-//!	 
-//! @note         If an operation finished successfully asynchronous ping report 
-//!               event will be generated. The report structure is as defined
-//!               by structure netapp_pingreport_args_t.
-//!
-//! @warning      Calling this function while a previous Ping Requests are in 
-//!               progress will stop the previous ping request.
-//*****************************************************************************
-
- #ifndef CC3000_TINY_DRIVER
-extern INT32 netapp_ping_send(UINT32 *ip, UINT32 ulPingAttempts, UINT32 ulPingSize, UINT32 ulPingTimeout);
-#endif
-
-//*****************************************************************************
-//
-//!  netapp_ping_stop
-//!
-//!  @param  none
-//!
-//!  @return  On success, zero is returned. On error, -1 is returned.      
-//!
-//!  @brief   Stop any ping request.
-//!	 
-//!
-//*****************************************************************************
-
-#ifndef CC3000_TINY_DRIVER
-extern INT32 netapp_ping_stop();
-#endif
-//*****************************************************************************
-//
-//!  netapp_ping_report
-//!
-//!  @param  none
-//!
-//!  @return  none
-//!
-//!  @brief   Request for ping status. This API triggers the CC3000 to send 
-//!           asynchronous events: HCI_EVNT_WLAN_ASYNC_PING_REPORT.
-//!           This event will carry  the report structure:
-//!           netapp_pingreport_args_t. This structure is filled in with ping
-//!           results up till point of triggering API.
-//!           netapp_pingreport_args_t:\n packets_sent - echo sent,
-//!           packets_received - echo reply, min_round_time - minimum
-//!           round time, max_round_time - max round time,
-//!           avg_round_time - average round time
-//!	 
-//! @note     When a ping operation is not active, the returned structure 
-//!           fields are 0.
-//!
-//*****************************************************************************
-#ifndef CC3000_TINY_DRIVER
-extern void netapp_ping_report();
-#endif
-
-
-//*****************************************************************************
-//
-//!  netapp_ipconfig
-//!
-//!  @param[out]  ipconfig  This argument is a pointer to a 
-//!                         tNetappIpconfigRetArgs structure. This structure is
-//!                         filled in with the network interface configuration.
-//!                         tNetappIpconfigRetArgs:\n aucIP - ip address,
-//!                         aucSubnetMask - mask, aucDefaultGateway - default
-//!                         gateway address, aucDHCPServer - dhcp server address
-//!                         aucDNSServer - dns server address, uaMacAddr - mac
-//!                         address, uaSSID - connected AP ssid
-//!
-//!  @return  none
-//!
-//!  @brief   Obtain the CC3000 Network interface information.
-//!           Note that the information is available only after the WLAN
-//!       	  connection was established. Calling this function before
-//!           associated, will cause non-defined values to be returned.
-//!	 
-//! @note     The function is useful for figuring out the IP Configuration of
-//!       		the device when DHCP is used and for figuring out the SSID of
-//!       		the Wireless network the device is associated with.
-//!
-//*****************************************************************************
-
-extern void netapp_ipconfig( tNetappIpconfigRetArgs * ipconfig );
-
-
-//*****************************************************************************
-//
-//!  netapp_arp_flush
-//!
-//!  @param  none
-//!
-//!  @return  none
-//!
-//!  @brief  Flushes ARP table
-//!
-//*****************************************************************************
-
-#ifndef CC3000_TINY_DRIVER
-extern INT32 netapp_arp_flush();
-#endif
-
-
-//*****************************************************************************
-//
-//!  netapp_set_debug_level
-//!
-//!  @param[in]      level    debug level. Bitwise [0-8],
-//!                         0(disable)or 1(enable).\n Bitwise map: 0 - Critical
-//!                         message, 1 information message, 2 - core messages, 3 -
-//!                         HCI messages, 4 - Network stack messages, 5 - wlan
-//!                         messages, 6 - wlan driver messages, 7 - epprom messages,
-//!                         8 - general messages. Default: 0x13f. Saved: no
-//!
-//!  @return  On success, zero is returned. On error, -1 is returned
-//!
-//!  @brief   Debug messages sent via the UART debug channel, this function
-//!              enable/disable the debug level
-//!
-//*****************************************************************************
-
-
-#ifndef CC3000_TINY_DRIVER
-INT32 netapp_set_debug_level(UINT32 ulLevel);
-#endif
-//*****************************************************************************
-//
-// Close the Doxygen group.
-//! @}
-//
-//*****************************************************************************
-
-
-
-//*****************************************************************************
-//
-// Mark the end of the C bindings section for C++ compilers.
-//
-//*****************************************************************************
-#ifdef	__cplusplus
-}
-#endif // __cplusplus
-
-#endif	// __CC3000_NETAPP_H__
-
diff --git a/drivers/cc3000/inc/nvmem.h b/drivers/cc3000/inc/nvmem.h
deleted file mode 100644
index b99a2e7b9ec5b..0000000000000
--- a/drivers/cc3000/inc/nvmem.h
+++ /dev/null
@@ -1,248 +0,0 @@
-/*****************************************************************************
-*
-*  nvmem.h  - CC3000 Host Driver Implementation.
-*  Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/
-*
-*  Redistribution and use in source and binary forms, with or without
-*  modification, are permitted provided that the following conditions
-*  are met:
-*
-*    Redistributions of source code must retain the above copyright
-*    notice, this list of conditions and the following disclaimer.
-*
-*    Redistributions in binary form must reproduce the above copyright
-*    notice, this list of conditions and the following disclaimer in the
-*    documentation and/or other materials provided with the   
-*    distribution.
-*
-*    Neither the name of Texas Instruments Incorporated nor the names of
-*    its contributors may be used to endorse or promote products derived
-*    from this software without specific prior written permission.
-*
-*  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
-*  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
-*  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-*  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
-*  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
-*  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
-*  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-*  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-*  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-*  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
-*  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*
-*****************************************************************************/
-#ifndef __CC3000_NVRAM_H__
-#define __CC3000_NVRAM_H__
-
-#include "cc3000_common.h"
-
-
-//*****************************************************************************
-//
-// If building with a C++ compiler, make all of the definitions in this header
-// have a C binding.
-//
-//*****************************************************************************
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-
-//*****************************************************************************
-//
-//! \addtogroup nvmem_api
-//! @{
-//
-//*****************************************************************************
-
-/****************************************************************************
-**
-**	Definitions for File IDs
-**	
-****************************************************************************/
-/* NVMEM file ID - system files*/
-#define NVMEM_NVS_FILEID 							(0)
-#define NVMEM_NVS_SHADOW_FILEID 					(1)
-#define NVMEM_WLAN_CONFIG_FILEID 					(2)
-#define NVMEM_WLAN_CONFIG_SHADOW_FILEID 			(3)
-#define NVMEM_WLAN_DRIVER_SP_FILEID					(4)
-#define NVMEM_WLAN_FW_SP_FILEID						(5)
-#define NVMEM_MAC_FILEID 							(6)
-#define NVMEM_FRONTEND_VARS_FILEID 					(7)
-#define NVMEM_IP_CONFIG_FILEID 						(8)
-#define NVMEM_IP_CONFIG_SHADOW_FILEID 				(9)
-#define NVMEM_BOOTLOADER_SP_FILEID 					(10)
-#define NVMEM_RM_FILEID			 					(11)
-
-/* NVMEM file ID - user files*/
-#define NVMEM_AES128_KEY_FILEID	 					(12)
-#define NVMEM_SHARED_MEM_FILEID	 					(13)
-
-/*  max entry in order to invalid nvmem              */
-#define NVMEM_MAX_ENTRY                              (16)
-
-
-//*****************************************************************************
-//
-//!  nvmem_read
-//!
-//!  @param  ulFileId   nvmem file id:\n
-//!                     NVMEM_NVS_FILEID, NVMEM_NVS_SHADOW_FILEID,
-//!                     NVMEM_WLAN_CONFIG_FILEID, NVMEM_WLAN_CONFIG_SHADOW_FILEID,
-//!                     NVMEM_WLAN_DRIVER_SP_FILEID, NVMEM_WLAN_FW_SP_FILEID,
-//!                     NVMEM_MAC_FILEID, NVMEM_FRONTEND_VARS_FILEID,
-//!                     NVMEM_IP_CONFIG_FILEID, NVMEM_IP_CONFIG_SHADOW_FILEID,
-//!                     NVMEM_BOOTLOADER_SP_FILEID, NVMEM_RM_FILEID,
-//!                     and user files 12-15.
-//!  @param  ulLength    number of bytes to read 
-//!  @param  ulOffset    ulOffset in file from where to read  
-//!  @param  buff        output buffer pointer
-//!
-//!  @return       on success 0, error otherwise.
-//!
-//!  @brief       Reads data from the file referred by the ulFileId parameter. 
-//!               Reads data from file ulOffset till length. Err if the file can't
-//!               be used, is invalid, or if the read is out of bounds. 
-//!	 
-//*****************************************************************************
-
-extern INT32 nvmem_read(UINT32 file_id, UINT32 length, UINT32 offset, UINT8 *buff);
-
-//*****************************************************************************
-//
-//!  nvmem_write
-//!
-//!  @param  ulFileId nvmem file id:\n
-//!                   NVMEM_WLAN_DRIVER_SP_FILEID, NVMEM_WLAN_FW_SP_FILEID,
-//!                   NVMEM_MAC_FILEID, NVMEM_BOOTLOADER_SP_FILEID,
-//!                   and user files 12-15.
-//!  @param  ulLength       number of bytes to write  
-//!  @param  ulEntryOffset  offset in file to start write operation from 
-//!  @param  buff           data to write
-//!
-//!  @return       on success 0, error otherwise.
-//!
-//!  @brief       Write data to nvmem.
-//!               writes data to file referred by the ulFileId parameter. 
-//!               Writes data to file ulOffset till ulLength.The file id will be 
-//!               marked invalid till the write is done. The file entry doesn't
-//!               need to be valid - only allocated.
-//!	 
-//*****************************************************************************
-
-extern INT32 nvmem_write(UINT32 ulFileId, UINT32 ulLength, UINT32 ulEntryOffset, UINT8 *buff);
-
-
-//*****************************************************************************
-//
-//!  nvmem_set_mac_address
-//!
-//!  @param  mac   mac address to be set
-//!
-//!  @return       on success 0, error otherwise.
-//!
-//!  @brief       Write MAC address to EEPROM. 
-//!               mac address as appears over the air (OUI first)
-//!	 
-//*****************************************************************************
-extern UINT8 nvmem_set_mac_address(UINT8 *mac);
-
-
-//*****************************************************************************
-//
-//!  nvmem_get_mac_address
-//!
-//!  @param[out]  mac   mac address  
-//!
-//!  @return       on success 0, error otherwise.
-//!
-//!  @brief       Read MAC address from EEPROM. 
-//!               mac address as appears over the air (OUI first)
-//!	 
-//*****************************************************************************
-extern UINT8 nvmem_get_mac_address(UINT8 *mac);
-
-
-//*****************************************************************************
-//
-//!  nvmem_write_patch
-//!
-//!  @param  ulFileId   nvmem file id:\n
-//!                     NVMEM_WLAN_DRIVER_SP_FILEID, NVMEM_WLAN_FW_SP_FILEID,
-//!  @param  spLength   number of bytes to write 
-//!  @param  spData     SP data to write
-//!
-//!  @return       on success 0, error otherwise.
-//!
-//!  @brief      program a patch to a specific file ID. 
-//!              The SP data is assumed to be organized in 2-dimensional.
-//!              Each line is SP_PORTION_SIZE bytes long. Actual programming is 
-//!              applied in SP_PORTION_SIZE bytes portions.
-//!	 
-//*****************************************************************************
-extern UINT8 nvmem_write_patch(UINT32 ulFileId, UINT32 spLength, const UINT8 *spData);
-
-
-//*****************************************************************************
-//
-//!  nvmem_read_sp_version
-//!
-//!  @param[out]  patchVer    first number indicates package ID and the second 
-//!                           number indicates package build number   
-//!
-//!  @return       on success 0, error otherwise.
-//!
-//!  @brief      Read patch version. read package version (WiFi FW patch, 
-//!              driver-supplicant-NS patch, bootloader patch)
-//!	 
-//*****************************************************************************
-#ifndef CC3000_TINY_DRIVER 
-extern UINT8 nvmem_read_sp_version(UINT8* patchVer);
-#endif
-
-//*****************************************************************************
-//
-//!  nvmem_create_entry
-//!
-//!  @param       ulFileId    nvmem file Id:\n
-//!                           * NVMEM_AES128_KEY_FILEID: 12
-//!                           * NVMEM_SHARED_MEM_FILEID: 13
-//!                           * and fileIDs 14 and 15
-//!  @param       ulNewLen    entry ulLength  
-//!
-//!  @return       on success 0, error otherwise.
-//!
-//!  @brief      Create new file entry and allocate space on the NVMEM. 
-//!              Applies only to user files.
-//!              Modify the size of file.
-//!              If the entry is unallocated - allocate it to size 
-//!              ulNewLen (marked invalid).
-//!              If it is allocated then deallocate it first.
-//!              To just mark the file as invalid without resizing - 
-//!              set ulNewLen=0.
-//!	 
-//*****************************************************************************
-extern INT32 nvmem_create_entry(UINT32 file_id, UINT32 newlen);
-
-
-//*****************************************************************************
-//
-// Mark the end of the C bindings section for C++ compilers.
-//
-//*****************************************************************************
-
-
-//*****************************************************************************
-//
-// Close the Doxygen group.
-//! @}
-//
-//*****************************************************************************
-
-
-#ifdef  __cplusplus
-}
-#endif // __cplusplus
-
-#endif // __CC3000_NVRAM_H__
diff --git a/drivers/cc3000/inc/patch_prog.h b/drivers/cc3000/inc/patch_prog.h
deleted file mode 100644
index 0a141a0cb535c..0000000000000
--- a/drivers/cc3000/inc/patch_prog.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#ifndef __CC3000_PATCH_PROG_H__
-#define __CC3000_PATCH_PROG_H__
-extern unsigned short fw_length;
-extern const unsigned char fw_patch[];
-
-extern unsigned short drv_length;
-extern const unsigned char wlan_drv_patch[];
-extern const unsigned char cRMdefaultParams[128];
-
-void patch_prog_start();
-#endif //__CC3000_PATCH_PROG_H__
diff --git a/drivers/cc3000/inc/security.h b/drivers/cc3000/inc/security.h
deleted file mode 100644
index cd1baf55416f5..0000000000000
--- a/drivers/cc3000/inc/security.h
+++ /dev/null
@@ -1,130 +0,0 @@
-/*****************************************************************************
-*
-*  security.h  - CC3000 Host Driver Implementation.
-*  Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/
-*
-*  Redistribution and use in source and binary forms, with or without
-*  modification, are permitted provided that the following conditions
-*  are met:
-*
-*    Redistributions of source code must retain the above copyright
-*    notice, this list of conditions and the following disclaimer.
-*
-*    Redistributions in binary form must reproduce the above copyright
-*    notice, this list of conditions and the following disclaimer in the
-*    documentation and/or other materials provided with the   
-*    distribution.
-*
-*    Neither the name of Texas Instruments Incorporated nor the names of
-*    its contributors may be used to endorse or promote products derived
-*    from this software without specific prior written permission.
-*
-*  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
-*  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
-*  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-*  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
-*  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
-*  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
-*  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-*  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-*  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-*  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
-*  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*
-*****************************************************************************/
-#ifndef __CC3000_SECURITY__
-#define __CC3000_SECURITY__
-
-#include "nvmem.h"
-
-//*****************************************************************************
-//
-// If building with a C++ compiler, make all of the definitions in this header
-// have a C binding.
-//
-//*****************************************************************************
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-
-#define AES128_KEY_SIZE		16
-
-#ifndef CC3000_UNENCRYPTED_SMART_CONFIG
-
-
-//*****************************************************************************
-//
-//!  aes_encrypt
-//!
-//!  @param[in]  key   AES128 key of size 16 bytes
-//!  @param[in\out] state   16 bytes of plain text and cipher text
-//!
-//!  @return  none
-//!
-//!  @brief   AES128 encryption:
-//!           Given AES128 key and  16 bytes plain text, cipher text of 16 bytes
-//!           is computed. The AES implementation is in mode ECB (Electronic 
-//!           Code Book). 
-//!	 
-//!
-//*****************************************************************************
-extern void aes_encrypt(UINT8 *state, UINT8 *key);
-
-//*****************************************************************************
-//
-//!  aes_decrypt
-//!
-//!  @param[in]  key   AES128 key of size 16 bytes
-//!  @param[in\out] state   16 bytes of cipher text and plain text
-//!
-//!  @return  none
-//!
-//!  @brief   AES128 decryption:
-//!           Given AES128 key and  16 bytes cipher text, plain text of 16 bytes
-//!           is computed The AES implementation is in mode ECB 
-//!           (Electronic Code Book).
-//!	 
-//!
-//*****************************************************************************
-extern void aes_decrypt(UINT8 *state, UINT8 *key);
-
-
-//*****************************************************************************
-//
-//!  aes_read_key
-//!
-//!  @param[out]  key   AES128 key of size 16 bytes
-//!
-//!  @return  on success 0, error otherwise.
-//!
-//!  @brief   Reads AES128 key from EEPROM
-//!           Reads the AES128 key from fileID #12 in EEPROM
-//!           returns an error if the key does not exist. 
-//!	 
-//!
-//*****************************************************************************
-extern INT32 aes_read_key(UINT8 *key);
-
-//*****************************************************************************
-//
-//!  aes_write_key
-//!
-//!  @param[out]  key   AES128 key of size 16 bytes
-//!
-//!  @return  on success 0, error otherwise.
-//!
-//!  @brief   writes AES128 key from EEPROM
-//!           Writes the AES128 key to fileID #12 in EEPROM
-//!	 
-//!
-//*****************************************************************************
-extern INT32 aes_write_key(UINT8 *key);
-
-#endif //CC3000_UNENCRYPTED_SMART_CONFIG
-
-#ifdef  __cplusplus
-}
-#endif // __cplusplus
-
-#endif
diff --git a/drivers/cc3000/inc/socket.h b/drivers/cc3000/inc/socket.h
deleted file mode 100644
index 96c814bf77a08..0000000000000
--- a/drivers/cc3000/inc/socket.h
+++ /dev/null
@@ -1,676 +0,0 @@
-/*****************************************************************************
-*
-*  socket.h  - CC3000 Host Driver Implementation.
-*  Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/
-*
-*  Redistribution and use in source and binary forms, with or without
-*  modification, are permitted provided that the following conditions
-*  are met:
-*
-*    Redistributions of source code must retain the above copyright
-*    notice, this list of conditions and the following disclaimer.
-*
-*    Redistributions in binary form must reproduce the above copyright
-*    notice, this list of conditions and the following disclaimer in the
-*    documentation and/or other materials provided with the   
-*    distribution.
-*
-*    Neither the name of Texas Instruments Incorporated nor the names of
-*    its contributors may be used to endorse or promote products derived
-*    from this software without specific prior written permission.
-*
-*  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
-*  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
-*  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-*  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
-*  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
-*  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
-*  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-*  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-*  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-*  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
-*  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*
-*****************************************************************************/
-#ifndef __CC3000_SOCKET_H__
-#define __CC3000_SOCKET_H__
-
-#include "cc3000_common.h"
-
-//*****************************************************************************
-//
-//! \addtogroup socket_api
-//! @{
-//
-//*****************************************************************************
-
-
-//*****************************************************************************
-//
-// If building with a C++ compiler, make all of the definitions in this header
-// have a C binding.
-//
-//*****************************************************************************
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-#define HOSTNAME_MAX_LENGTH (230)  // 230 bytes + header shouldn't exceed 8 bit value
-
-//--------- Address Families --------
-
-#define  AF_INET                2
-#define  AF_INET6               23
-
-//------------ Socket Types ------------
-
-#define  SOCK_STREAM            1
-#define  SOCK_DGRAM             2
-#define  SOCK_RAW               3           // Raw sockets allow new IPv4 protocols to be implemented in user space. A raw socket receives or sends the raw datagram not including link level headers
-#define  SOCK_RDM               4
-#define  SOCK_SEQPACKET         5
-
-//----------- Socket Protocol ----------
-
-#define IPPROTO_IP              0           // dummy for IP
-#define IPPROTO_ICMP            1           // control message protocol
-#define IPPROTO_IPV4            IPPROTO_IP  // IP inside IP
-#define IPPROTO_TCP             6           // tcp
-#define IPPROTO_UDP             17          // user datagram protocol
-#define IPPROTO_IPV6            41          // IPv6 in IPv6
-#define IPPROTO_NONE            59          // No next header
-#define IPPROTO_RAW             255         // raw IP packet
-#define IPPROTO_MAX             256
-
-//----------- Socket retunr codes  -----------
-
-#define SOC_ERROR				(-1)		// error 
-#define SOC_IN_PROGRESS			(-2)		// socket in progress
-
-//----------- Socket Options -----------
-#define  SOL_SOCKET             0xffff		//  socket level
-#define  SOCKOPT_RECV_NONBLOCK         	0	// recv non block mode, set SOCK_ON or SOCK_OFF (default block mode)
-#define  SOCKOPT_RECV_TIMEOUT			1	// optname to configure recv and recvfromtimeout
-#define  SOCKOPT_ACCEPT_NONBLOCK		2	// accept non block mode, set SOCK_ON or SOCK_OFF (default block mode)
-#define  SOCK_ON                0			// socket non-blocking mode	is enabled		
-#define  SOCK_OFF               1			// socket blocking mode is enabled
-
-#define  MAX_PACKET_SIZE        1500
-#define  MAX_LISTEN_QUEUE       4
-
-#define  IOCTL_SOCKET_EVENTMASK
-
-#define ENOBUFS                 55          // No buffer space available
-
-#define __FD_SETSIZE            32
-
-#define  ASIC_ADDR_LEN          8
-	
-#define NO_QUERY_RECIVED        -3
-	
-	
-typedef struct _in_addr_t
-{
-    UINT32 s_addr;                   // load with inet_aton()
-} in_addr;
-
-typedef struct _sockaddr_t
-{
-    UINT16   sa_family;
-    UINT8     sa_data[14];
-} sockaddr;
-
-typedef struct _sockaddr_in_t
-{
-    INT16            sin_family;            // e.g. AF_INET
-    UINT16   sin_port;              // e.g. htons(3490)
-    in_addr          sin_addr;              // see struct in_addr, below
-    CHAR             sin_zero[8];           // zero this if you want to
-} sockaddr_in;
-
-typedef UINT32 socklen_t;
-
-// The fd_set member is required to be an array of INT32s.
-typedef INT32 __fd_mask;
-
-// It's easier to assume 8-bit bytes than to get CHAR_BIT.
-#define __NFDBITS               (8 * sizeof (__fd_mask))
-#define __FDELT(d)              ((d) / __NFDBITS)
-#define __FDMASK(d)             ((__fd_mask) 1 << ((d) % __NFDBITS))
-
-// fd_set for select and pselect.
-typedef struct
-{
-    __fd_mask fds_bits[__FD_SETSIZE / __NFDBITS];
-#define __FDS_BITS(set)        ((set)->fds_bits)
-} fd_set;
-
-// We don't use `memset' because this would require a prototype and
-//   the array isn't too big.
-#define __FD_ZERO(set)                               \
-  do {                                                \
-    UINT16 __i;                                 \
-    fd_set *__arr = (set);                            \
-    for (__i = 0; __i < sizeof (fd_set) / sizeof (__fd_mask); ++__i) \
-      __FDS_BITS (__arr)[__i] = 0;                    \
-  } while (0)
-#define __FD_SET(d, set)       (__FDS_BITS (set)[__FDELT (d)] |= __FDMASK (d))
-#define __FD_CLR(d, set)       (__FDS_BITS (set)[__FDELT (d)] &= ~__FDMASK (d))
-#define __FD_ISSET(d, set)     (__FDS_BITS (set)[__FDELT (d)] & __FDMASK (d))
-
-// Access macros for 'fd_set'.
-#define FD_SET(fd, fdsetp)      __FD_SET (fd, fdsetp)
-#define FD_CLR(fd, fdsetp)      __FD_CLR (fd, fdsetp)
-#define FD_ISSET(fd, fdsetp)    __FD_ISSET (fd, fdsetp)
-#define FD_ZERO(fdsetp)         __FD_ZERO (fdsetp)
-
-//Use in case of Big Endian only
-  
-#define htonl(A)    ((((UINT32)(A) & 0xff000000) >> 24) | \
-                     (((UINT32)(A) & 0x00ff0000) >> 8) | \
-                     (((UINT32)(A) & 0x0000ff00) << 8) | \
-                     (((UINT32)(A) & 0x000000ff) << 24))
-
-#define ntohl                   htonl
-
-//Use in case of Big Endian only
-#define htons(A)     ((((UINT32)(A) & 0xff00) >> 8) | \
-                      (((UINT32)(A) & 0x00ff) << 8))
-
-
-#define ntohs                   htons
-
-// mDNS port - 5353    mDNS multicast address - 224.0.0.251 
-#define SET_mDNS_ADD(sockaddr)     	   	sockaddr.sa_data[0] = 0x14; \
-																								sockaddr.sa_data[1] = 0xe9; \
-																								sockaddr.sa_data[2] = 0xe0; \
-																								sockaddr.sa_data[3] = 0x0; \
-																								sockaddr.sa_data[4] = 0x0; \
-																								sockaddr.sa_data[5] = 0xfb; 
-
-
-//*****************************************************************************
-//
-// Prototypes for the APIs.
-//
-//*****************************************************************************
-
-//*****************************************************************************
-//
-//! socket
-//!
-//!  @param  domain    selects the protocol family which will be used for 
-//!                    communication. On this version only AF_INET is supported
-//!  @param  type      specifies the communication semantics. On this version 
-//!                    only SOCK_STREAM, SOCK_DGRAM, SOCK_RAW are supported
-//!  @param  protocol  specifies a particular protocol to be used with the 
-//!                    socket IPPROTO_TCP, IPPROTO_UDP or IPPROTO_RAW are 
-//!                    supported.
-//!
-//!  @return  On success, socket handle that is used for consequent socket 
-//!           operations. On error, -1 is returned.
-//!
-//!  @brief  create an endpoint for communication
-//!          The socket function creates a socket that is bound to a specific 
-//!          transport service provider. This function is called by the 
-//!          application layer to obtain a socket handle.
-//
-//*****************************************************************************
-extern INT16 CC3000_EXPORT(socket)(INT32 domain, INT32 type, INT32 protocol);
-
-//*****************************************************************************
-//
-//! closesocket
-//!
-//!  @param  sd    socket handle.
-//!
-//!  @return  On success, zero is returned. On error, -1 is returned.
-//!
-//!  @brief  The socket function closes a created socket.
-//
-//*****************************************************************************
-extern INT32 CC3000_EXPORT(closesocket)(INT32 sd);
-
-//*****************************************************************************
-//
-//! accept
-//!
-//!  @param[in]   sd      socket descriptor (handle)              
-//!  @param[out]  addr    the argument addr is a pointer to a sockaddr structure
-//!                       This structure is filled in with the address of the  
-//!                       peer socket, as known to the communications layer.        
-//!                       determined. The exact format of the address returned             
-//!                       addr is by the socket's address sockaddr. 
-//!                       On this version only AF_INET is supported.
-//!                       This argument returns in network order.
-//!  @param[out] addrlen  the addrlen argument is a value-result argument: 
-//!                       it should initially contain the size of the structure
-//!                       pointed to by addr.
-//!
-//!  @return  For socket in blocking mode:
-//!				      On success, socket handle. on failure negative
-//!			      For socket in non-blocking mode:
-//!				     - On connection establishment, socket handle
-//!				     - On connection pending, SOC_IN_PROGRESS (-2)
-//!			       - On failure, SOC_ERROR	(-1)
-//!
-//!  @brief  accept a connection on a socket:
-//!          This function is used with connection-based socket types 
-//!          (SOCK_STREAM). It extracts the first connection request on the 
-//!          queue of pending connections, creates a new connected socket, and
-//!          returns a new file descriptor referring to that socket.
-//!          The newly created socket is not in the listening state. 
-//!          The original socket sd is unaffected by this call. 
-//!          The argument sd is a socket that has been created with socket(),
-//!          bound to a local address with bind(), and is  listening for 
-//!          connections after a listen(). The argument addr is a pointer 
-//!          to a sockaddr structure. This structure is filled in with the 
-//!          address of the peer socket, as known to the communications layer.
-//!          The exact format of the address returned addr is determined by the 
-//!          socket's address family. The addrlen argument is a value-result
-//!          argument: it should initially contain the size of the structure
-//!          pointed to by addr, on return it will contain the actual 
-//!          length (in bytes) of the address returned.
-//!
-//! @sa     socket ; bind ; listen
-//
-//*****************************************************************************
-extern INT32 CC3000_EXPORT(accept)(INT32 sd, sockaddr *addr, socklen_t *addrlen);
-
-//*****************************************************************************
-//
-//! bind
-//!
-//!  @param[in]   sd      socket descriptor (handle)              
-//!  @param[out]  addr    specifies the destination address. On this version 
-//!                       only AF_INET is supported.
-//!  @param[out] addrlen  contains the size of the structure pointed to by addr.
-//!
-//!  @return  	On success, zero is returned. On error, -1 is returned.
-//!
-//!  @brief  assign a name to a socket
-//!          This function gives the socket the local address addr.
-//!          addr is addrlen bytes long. Traditionally, this is called when a 
-//!          socket is created with socket, it exists in a name space (address 
-//!          family) but has no name assigned.
-//!          It is necessary to assign a local address before a SOCK_STREAM
-//!          socket may receive connections.
-//!
-//! @sa     socket ; accept ; listen
-//
-//*****************************************************************************
-extern INT32 CC3000_EXPORT(bind)(INT32 sd, const sockaddr *addr, INT32 addrlen);
-
-//*****************************************************************************
-//
-//! listen
-//!
-//!  @param[in]   sd      socket descriptor (handle)              
-//!  @param[in]  backlog  specifies the listen queue depth. On this version
-//!                       backlog is not supported.
-//!  @return  	On success, zero is returned. On error, -1 is returned.
-//!
-//!  @brief  listen for connections on a socket
-//!          The willingness to accept incoming connections and a queue
-//!          limit for incoming connections are specified with listen(),
-//!          and then the connections are accepted with accept.
-//!          The listen() call applies only to sockets of type SOCK_STREAM
-//!          The backlog parameter defines the maximum length the queue of
-//!          pending connections may grow to. 
-//!
-//! @sa     socket ; accept ; bind
-//!
-//! @note   On this version, backlog is not supported
-//
-//*****************************************************************************
-extern INT32 CC3000_EXPORT(listen)(INT32 sd, INT32 backlog);
-
-//*****************************************************************************
-//
-//! gethostbyname
-//!
-//!  @param[in]   hostname     host name              
-//!  @param[in]   usNameLen    name length 
-//!  @param[out]  out_ip_addr  This parameter is filled in with host IP address. 
-//!                            In case that host name is not resolved, 
-//!                            out_ip_addr is zero.                  
-//!  @return  	On success, positive is returned. On error, negative is returned
-//!
-//!  @brief  Get host IP by name. Obtain the IP Address of machine on network, 
-//!          by its name.
-//!
-//!  @note  On this version, only blocking mode is supported. Also note that
-//!		     the function requires DNS server to be configured prior to its usage.
-//
-//*****************************************************************************
-#ifndef CC3000_TINY_DRIVER 
-extern INT16 CC3000_EXPORT(gethostbyname)(CHAR * hostname, UINT16 usNameLen, UINT32* out_ip_addr);
-#endif
-
-
-//*****************************************************************************
-//
-//! connect
-//!
-//!  @param[in]   sd       socket descriptor (handle)         
-//!  @param[in]   addr     specifies the destination addr. On this version
-//!                        only AF_INET is supported.
-//!  @param[out]  addrlen  contains the size of the structure pointed to by addr    
-//!  @return  	On success, zero is returned. On error, -1 is returned
-//!
-//!  @brief  initiate a connection on a socket 
-//!          Function connects the socket referred to by the socket descriptor 
-//!          sd, to the address specified by addr. The addrlen argument 
-//!          specifies the size of addr. The format of the address in addr is 
-//!          determined by the address space of the socket. If it is of type 
-//!          SOCK_DGRAM, this call specifies the peer with which the socket is 
-//!          to be associated; this address is that to which datagrams are to be
-//!          sent, and the only address from which datagrams are to be received.  
-//!          If the socket is of type SOCK_STREAM, this call attempts to make a 
-//!          connection to another socket. The other socket is specified  by 
-//!          address, which is an address in the communications space of the
-//!          socket. Note that the function implements only blocking behavior 
-//!          thus the caller will be waiting either for the connection 
-//!          establishment or for the connection establishment failure.
-//!
-//!  @sa socket
-//
-//*****************************************************************************
-extern INT32 CC3000_EXPORT(connect)(INT32 sd, const sockaddr *addr, INT32 addrlen);
-
-//*****************************************************************************
-//
-//! select
-//!
-//!  @param[in]   nfds       the highest-numbered file descriptor in any of the
-//!                           three sets, plus 1.     
-//!  @param[out]   writesds   socket descriptors list for write monitoring
-//!  @param[out]   readsds    socket descriptors list for read monitoring  
-//!  @param[out]   exceptsds  socket descriptors list for exception monitoring
-//!  @param[in]   timeout     is an upper bound on the amount of time elapsed
-//!                           before select() returns. Null means infinity 
-//!                           timeout. The minimum timeout is 5 milliseconds,
-//!                          less than 5 milliseconds will be set
-//!                           automatically to 5 milliseconds.
-//!  @return  	On success, select() returns the number of file descriptors
-//!             contained in the three returned descriptor sets (that is, the
-//!             total number of bits that are set in readfds, writefds,
-//!             exceptfds) which may be zero if the timeout expires before
-//!             anything interesting  happens.
-//!             On error, -1 is returned.
-//!                   *readsds - return the sockets on which Read request will
-//!                              return without delay with valid data.
-//!                   *writesds - return the sockets on which Write request 
-//!                                 will return without delay.
-//!                   *exceptsds - return the sockets which closed recently.
-//!
-//!  @brief  Monitor socket activity  
-//!          Select allow a program to monitor multiple file descriptors,
-//!          waiting until one or more of the file descriptors become 
-//!         "ready" for some class of I/O operation 
-//!
-//!  @Note   If the timeout value set to less than 5ms it will automatically set
-//!          to 5ms to prevent overload of the system
-//!
-//!  @sa socket
-//
-//*****************************************************************************
-extern INT16 CC3000_EXPORT(select)(INT32 nfds, fd_set *readsds, fd_set *writesds,
-                  fd_set *exceptsds, struct cc3000_timeval *timeout);
-
-//*****************************************************************************
-//
-//! setsockopt
-//!
-//!  @param[in]   sd          socket handle
-//!  @param[in]   level       defines the protocol level for this option
-//!  @param[in]   optname     defines the option name to Interrogate
-//!  @param[in]   optval      specifies a value for the option
-//!  @param[in]   optlen      specifies the length of the option value
-//!  @return  	On success, zero is returned. On error, -1 is returned
-//!
-//!  @brief  set socket options
-//!          This function manipulate the options associated with a socket.
-//!          Options may exist at multiple protocol levels; they are always
-//!          present at the uppermost socket level.
-//!          When manipulating socket options the level at which the option 
-//!          resides and the name of the option must be specified.  
-//!          To manipulate options at the socket level, level is specified as 
-//!          SOL_SOCKET. To manipulate options at any other level the protocol 
-//!          number of the appropriate protocol controlling the option is 
-//!          supplied. For example, to indicate that an option is to be 
-//!          interpreted by the TCP protocol, level should be set to the 
-//!          protocol number of TCP; 
-//!          The parameters optval and optlen are used to access optval - 
-//!          use for setsockopt(). For getsockopt() they identify a buffer
-//!          in which the value for the requested option(s) are to 
-//!          be returned. For getsockopt(), optlen is a value-result 
-//!          parameter, initially containing the size of the buffer 
-//!          pointed to by option_value, and modified on return to 
-//!          indicate the actual size of the value returned. If no option 
-//!          value is to be supplied or returned, option_value may be NULL.
-//!
-//!  @Note   On this version the following two socket options are enabled:
-//!    			 The only protocol level supported in this version
-//!          is SOL_SOCKET (level).
-//!		       1. SOCKOPT_RECV_TIMEOUT (optname)
-//!			      SOCKOPT_RECV_TIMEOUT configures recv and recvfrom timeout 
-//!           in milliseconds.
-//!		        In that case optval should be pointer to UINT32.
-//!		       2. SOCKOPT_NONBLOCK (optname). sets the socket non-blocking mode on 
-//!           or off.
-//!		        In that case optval should be SOCK_ON or SOCK_OFF (optval).
-//!
-//!  @sa getsockopt
-//
-//*****************************************************************************
-#ifndef CC3000_TINY_DRIVER 
-extern INT16 CC3000_EXPORT(setsockopt)(INT32 sd, INT32 level, INT32 optname, const void *optval,
-                      socklen_t optlen);
-#endif
-//*****************************************************************************
-//
-//! getsockopt
-//!
-//!  @param[in]   sd          socket handle
-//!  @param[in]   level       defines the protocol level for this option
-//!  @param[in]   optname     defines the option name to Interrogate
-//!  @param[out]   optval      specifies a value for the option
-//!  @param[out]   optlen      specifies the length of the option value
-//!  @return  	On success, zero is returned. On error, -1 is returned
-//!
-//!  @brief  set socket options
-//!          This function manipulate the options associated with a socket.
-//!          Options may exist at multiple protocol levels; they are always
-//!          present at the uppermost socket level.
-//!          When manipulating socket options the level at which the option 
-//!          resides and the name of the option must be specified.  
-//!          To manipulate options at the socket level, level is specified as 
-//!          SOL_SOCKET. To manipulate options at any other level the protocol 
-//!          number of the appropriate protocol controlling the option is 
-//!          supplied. For example, to indicate that an option is to be 
-//!          interpreted by the TCP protocol, level should be set to the 
-//!          protocol number of TCP; 
-//!          The parameters optval and optlen are used to access optval - 
-//!          use for setsockopt(). For getsockopt() they identify a buffer
-//!          in which the value for the requested option(s) are to 
-//!          be returned. For getsockopt(), optlen is a value-result 
-//!          parameter, initially containing the size of the buffer 
-//!          pointed to by option_value, and modified on return to 
-//!          indicate the actual size of the value returned. If no option 
-//!          value is to be supplied or returned, option_value may be NULL.
-//!
-//!  @Note   On this version the following two socket options are enabled:
-//!    			 The only protocol level supported in this version
-//!          is SOL_SOCKET (level).
-//!		       1. SOCKOPT_RECV_TIMEOUT (optname)
-//!			      SOCKOPT_RECV_TIMEOUT configures recv and recvfrom timeout 
-//!           in milliseconds.
-//!		        In that case optval should be pointer to UINT32.
-//!		       2. SOCKOPT_NONBLOCK (optname). sets the socket non-blocking mode on 
-//!           or off.
-//!		        In that case optval should be SOCK_ON or SOCK_OFF (optval).
-//!
-//!  @sa setsockopt
-//
-//*****************************************************************************
-extern INT16 CC3000_EXPORT(getsockopt)(INT32 sd, INT32 level, INT32 optname, void *optval,
-                      socklen_t *optlen);
-
-//*****************************************************************************
-//
-//!  recv
-//!
-//!  @param[in]  sd     socket handle
-//!  @param[out] buf    Points to the buffer where the message should be stored
-//!  @param[in]  len    Specifies the length in bytes of the buffer pointed to 
-//!                     by the buffer argument.
-//!  @param[in] flags   Specifies the type of message reception. 
-//!                     On this version, this parameter is not supported.
-//!
-//!  @return         Return the number of bytes received, or -1 if an error
-//!                  occurred
-//!
-//!  @brief          function receives a message from a connection-mode socket
-//!
-//!  @sa recvfrom
-//!
-//!  @Note On this version, only blocking mode is supported.
-//
-//*****************************************************************************
-extern INT16 CC3000_EXPORT(recv)(INT32 sd, void *buf, INT32 len, INT32 flags);
-
-//*****************************************************************************
-//
-//!  recvfrom
-//!
-//!  @param[in]  sd     socket handle
-//!  @param[out] buf    Points to the buffer where the message should be stored
-//!  @param[in]  len    Specifies the length in bytes of the buffer pointed to 
-//!                     by the buffer argument.
-//!  @param[in] flags   Specifies the type of message reception. 
-//!                     On this version, this parameter is not supported.
-//!  @param[in] from   pointer to an address structure indicating the source
-//!                    address: sockaddr. On this version only AF_INET is
-//!                    supported.
-//!  @param[in] fromlen   source address structure size
-//!
-//!  @return         Return the number of bytes received, or -1 if an error
-//!                  occurred
-//!
-//!  @brief         read data from socket
-//!                 function receives a message from a connection-mode or
-//!                 connectionless-mode socket. Note that raw sockets are not
-//!                 supported.
-//!
-//!  @sa recv
-//!
-//!  @Note On this version, only blocking mode is supported.
-//
-//*****************************************************************************
-extern INT16 CC3000_EXPORT(recvfrom)(INT32 sd, void *buf, INT32 len, INT32 flags, sockaddr *from, 
-                    socklen_t *fromlen);
-
-//*****************************************************************************
-//
-//!  send
-//!
-//!  @param sd       socket handle
-//!  @param buf      Points to a buffer containing the message to be sent
-//!  @param len      message size in bytes
-//!  @param flags    On this version, this parameter is not supported
-//!
-//!  @return         Return the number of bytes transmitted, or -1 if an
-//!                  error occurred
-//!
-//!  @brief          Write data to TCP socket
-//!                  This function is used to transmit a message to another 
-//!                  socket.
-//!
-//!  @Note           On this version, only blocking mode is supported.
-//!
-//!  @sa             sendto
-//
-//*****************************************************************************
-
-extern INT16 CC3000_EXPORT(send)(INT32 sd, const void *buf, INT32 len, INT32 flags);
-
-//*****************************************************************************
-//
-//!  sendto
-//!
-//!  @param sd       socket handle
-//!  @param buf      Points to a buffer containing the message to be sent
-//!  @param len      message size in bytes
-//!  @param flags    On this version, this parameter is not supported
-//!  @param to       pointer to an address structure indicating the destination
-//!                  address: sockaddr. On this version only AF_INET is
-//!                  supported.
-//!  @param tolen    destination address structure size
-//!
-//!  @return         Return the number of bytes transmitted, or -1 if an
-//!                  error occurred
-//!
-//!  @brief          Write data to TCP socket
-//!                  This function is used to transmit a message to another 
-//!                  socket.
-//!
-//!  @Note           On this version, only blocking mode is supported.
-//!
-//!  @sa             send
-//
-//*****************************************************************************
-
-extern INT16 CC3000_EXPORT(sendto)(INT32 sd, const void *buf, INT32 len, INT32 flags, 
-                  const sockaddr *to, socklen_t tolen);
-
-//*****************************************************************************
-//
-//!  mdnsAdvertiser
-//!
-//!  @param[in] mdnsEnabled         flag to enable/disable the mDNS feature
-//!  @param[in] deviceServiceName   Service name as part of the published
-//!                                 canonical domain name
-//!  @param[in] deviceServiceNameLength   Length of the service name - up to 32 chars
-//!  
-//!
-//!  @return   On success, zero is returned, return SOC_ERROR if socket was not 
-//!            opened successfully, or if an error occurred.
-//!
-//!  @brief    Set CC3000 in mDNS advertiser mode in order to advertise itself.
-//
-//*****************************************************************************
-extern INT16 CC3000_EXPORT(mdnsAdvertiser)(UINT16 mdnsEnabled, CHAR * deviceServiceName, UINT16 deviceServiceNameLength);
-
-
-//*****************************************************************************
-//
-//!  getmssvalue
-//!
-//!  @param[in] sd         socket descriptor
-//!
-//!  @return   On success, returns the MSS value of a TCP connection
-//!
-//!  @brief    Returns the MSS value of a TCP connection according to the socket descriptor
-//
-//*****************************************************************************
-extern UINT16 CC3000_EXPORT(getmssvalue) (INT32 sd);
-
-//*****************************************************************************
-//
-// Close the Doxygen group.
-//! @}
-//
-//*****************************************************************************
-
-
-//*****************************************************************************
-//
-// Mark the end of the C bindings section for C++ compilers.
-//
-//*****************************************************************************
-#ifdef  __cplusplus
-}
-#endif // __cplusplus
-
-#endif // __SOCKET_H__
diff --git a/drivers/cc3000/inc/wlan.h b/drivers/cc3000/inc/wlan.h
deleted file mode 100644
index 48d195b32ae80..0000000000000
--- a/drivers/cc3000/inc/wlan.h
+++ /dev/null
@@ -1,518 +0,0 @@
-/*****************************************************************************
-*
-*  wlan.h  - CC3000 Host Driver Implementation.
-*  Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/
-*
-*  Redistribution and use in source and binary forms, with or without
-*  modification, are permitted provided that the following conditions
-*  are met:
-*
-*    Redistributions of source code must retain the above copyright
-*    notice, this list of conditions and the following disclaimer.
-*
-*    Redistributions in binary form must reproduce the above copyright
-*    notice, this list of conditions and the following disclaimer in the
-*    documentation and/or other materials provided with the   
-*    distribution.
-*
-*    Neither the name of Texas Instruments Incorporated nor the names of
-*    its contributors may be used to endorse or promote products derived
-*    from this software without specific prior written permission.
-*
-*  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
-*  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
-*  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-*  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
-*  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
-*  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
-*  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-*  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-*  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-*  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
-*  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*
-*****************************************************************************/
-#ifndef __CC3000_WLAN_H__
-#define	__CC3000_WLAN_H__
-
-#include "cc3000_common.h"
-
-//*****************************************************************************
-//
-// If building with a C++ compiler, make all of the definitions in this header
-// have a C binding.
-//
-//*****************************************************************************
-#ifdef	__cplusplus
-extern "C" {
-#endif
-
-#define      WLAN_SEC_UNSEC (0)
-#define      WLAN_SEC_WEP	(1)
-#define      WLAN_SEC_WPA	(2)
-#define      WLAN_SEC_WPA2	(3)
-//*****************************************************************************
-//
-//! \addtogroup wlan_api
-//! @{
-//
-//*****************************************************************************
-
-
-//*****************************************************************************
-//
-//!  wlan_init
-//!
-//!  @param  sWlanCB   Asynchronous events callback.  
-//!                    0 no event call back.
-//!                  -call back parameters:
-//!                   1) event_type: HCI_EVNT_WLAN_UNSOL_CONNECT connect event,
-//!                     HCI_EVNT_WLAN_UNSOL_DISCONNECT disconnect event,
-//!                     HCI_EVNT_WLAN_ASYNC_SIMPLE_CONFIG_DONE config done,
-//!                     HCI_EVNT_WLAN_UNSOL_DHCP dhcp report, 
-//!                     HCI_EVNT_WLAN_ASYNC_PING_REPORT ping report OR 
-//!                     HCI_EVNT_WLAN_KEEPALIVE keepalive.
-//!                   2) data: pointer to extra data that received by the event
-//!                     (NULL no data).
-//!                   3) length: data length.
-//!                  -Events with extra data:
-//!                     HCI_EVNT_WLAN_UNSOL_DHCP: 4 bytes IP, 4 bytes Mask, 
-//!                     4 bytes default gateway, 4 bytes DHCP server and 4 bytes
-//!                     for DNS server.
-//!                     HCI_EVNT_WLAN_ASYNC_PING_REPORT: 4 bytes Packets sent, 
-//!                     4 bytes Packets received, 4 bytes Min round time, 
-//!                     4 bytes Max round time and 4 bytes for Avg round time.
-//!
-//!  @param    sFWPatches  0 no patch or pointer to FW patches 
-//!  @param    sDriverPatches  0 no patch or pointer to driver patches
-//!  @param    sBootLoaderPatches  0 no patch or pointer to bootloader patches
-//!  @param    sReadWlanInterruptPin    init callback. the callback read wlan 
-//!            interrupt status.
-//!  @param    sWlanInterruptEnable   init callback. the callback enable wlan 
-//!            interrupt.
-//!  @param    sWlanInterruptDisable   init callback. the callback disable wlan
-//!            interrupt.
-//!  @param    sWriteWlanPin      init callback. the callback write value 
-//!            to device pin.  
-//!
-//!  @return   none
-//!
-//!  @sa       wlan_set_event_mask , wlan_start , wlan_stop 
-//!
-//!  @brief    Initialize wlan driver
-//!
-//!  @warning This function must be called before ANY other wlan driver function
-//
-//*****************************************************************************
-extern void wlan_init(		tWlanCB	 	sWlanCB,
-	   			tFWPatches sFWPatches,
-	   			tDriverPatches sDriverPatches,
-	   			tBootLoaderPatches sBootLoaderPatches,
-                tWlanReadInteruptPin  sReadWlanInterruptPin,
-                tWlanInterruptEnable  sWlanInterruptEnable,
-                tWlanInterruptDisable sWlanInterruptDisable,
-                tWriteWlanPin         sWriteWlanPin);
-
-
-
-//*****************************************************************************
-//
-//!  wlan_start
-//!
-//!  @param   usPatchesAvailableAtHost -  flag to indicate if patches available
-//!                                    from host or from EEPROM. Due to the 
-//!                                    fact the patches are burn to the EEPROM
-//!                                    using the patch programmer utility, the 
-//!                                    patches will be available from the EEPROM
-//!                                    and not from the host.
-//!
-//!  @return        none
-//!
-//!  @brief        Start WLAN device. This function asserts the enable pin of 
-//!                the device (WLAN_EN), starting the HW initialization process.
-//!                The function blocked until device Initialization is completed.
-//!                Function also configure patches (FW, driver or bootloader) 
-//!                and calls appropriate device callbacks.
-//!
-//!  @Note          Prior calling the function wlan_init shall be called.
-//!  @Warning       This function must be called after wlan_init and before any 
-//!                 other wlan API
-//!  @sa            wlan_init , wlan_stop
-//!
-//
-//*****************************************************************************
-extern int wlan_start(UINT16 usPatchesAvailableAtHost);
-
-//*****************************************************************************
-//
-//!  wlan_stop
-//!
-//!  @param         none
-//!
-//!  @return        none
-//!
-//!  @brief         Stop WLAN device by putting it into reset state.
-//!
-//!  @sa            wlan_start
-//
-//*****************************************************************************
-extern void wlan_stop(void);
-
-//*****************************************************************************
-//
-//!  wlan_connect
-//!
-//!  @param    sec_type   security options:
-//!               WLAN_SEC_UNSEC, 
-//!               WLAN_SEC_WEP (ASCII support only),
-//!               WLAN_SEC_WPA or WLAN_SEC_WPA2
-//!  @param    ssid       up to 32 bytes and is ASCII SSID of the AP
-//!  @param    ssid_len   length of the SSID
-//!  @param    bssid      6 bytes specified the AP bssid
-//!  @param    key        up to 32 bytes specified the AP security key
-//!  @param    key_len    key length 
-//!
-//!  @return     On success, zero is returned. On error, negative is returned. 
-//!              Note that even though a zero is returned on success to trigger
-//!              connection operation, it does not mean that CCC3000 is already
-//!              connected. An asynchronous "Connected" event is generated when 
-//!              actual association process finishes and CC3000 is connected to
-//!              the AP. If DHCP is set, An asynchronous "DHCP" event is 
-//!              generated when DHCP process is finish.
-//!              
-//!
-//!  @brief      Connect to AP
-//!  @warning    Please Note that when connection to AP configured with security
-//!              type WEP, please confirm that the key is set as ASCII and not
-//!              as HEX.
-//!  @sa         wlan_disconnect
-//
-//*****************************************************************************
-#ifndef CC3000_TINY_DRIVER
-extern INT32 wlan_connect(UINT32 ulSecType, CHAR *ssid, INT32 ssid_len,
-                        UINT8 *bssid, UINT8 *key, INT32 key_len);
-#else
-extern INT32 wlan_connect(CHAR *ssid, INT32 ssid_len);
-
-#endif
-
-//*****************************************************************************
-//
-//!  wlan_disconnect
-//!
-//!  @return    0 disconnected done, other CC3000 already disconnected            
-//!
-//!  @brief      Disconnect connection from AP. 
-//!
-//!  @sa         wlan_connect
-//
-//*****************************************************************************
-
-extern INT32 wlan_disconnect(void);
-
-//*****************************************************************************
-//
-//!  wlan_add_profile
-//!
-//!  @param    ulSecType  WLAN_SEC_UNSEC,WLAN_SEC_WEP,WLAN_SEC_WPA,WLAN_SEC_WPA2
-//!  @param    ucSsid    ssid  SSID up to 32 bytes
-//!  @param    ulSsidLen ssid length
-//!  @param    ucBssid   bssid  6 bytes
-//!  @param    ulPriority ulPriority profile priority. Lowest priority:0.
-//!  @param    ulPairwiseCipher_Or_TxKeyLen  key length for WEP security
-//!  @param    ulGroupCipher_TxKeyIndex  key index
-//!  @param    ulKeyMgmt        KEY management 
-//!  @param    ucPf_OrKey       security key
-//!  @param    ulPassPhraseLen  security key length for WPA\WPA2
-//!
-//!  @return    On success, index (1-7) of the stored profile is returned.         
-//!				On error, -1 is returned.        
-//!
-//!  @brief     When auto start is enabled, the device connects to
-//!             station from the profiles table. Up to 7 profiles are supported. 
-//!             If several profiles configured the device choose the highest 
-//!             priority profile, within each priority group, device will choose 
-//!             profile based on security policy, signal strength, etc 
-//!             parameters. All the profiles are stored in CC3000 NVMEM.
-//!
-//!  @sa        wlan_ioctl_del_profile 
-//
-//*****************************************************************************
-
-extern INT32 wlan_add_profile(UINT32 ulSecType, UINT8* ucSsid,
-										 UINT32 ulSsidLen, 
-										 UINT8 *ucBssid,
-                                         UINT32 ulPriority,
-                                         UINT32 ulPairwiseCipher_Or_Key,
-                                         UINT32 ulGroupCipher_TxKeyLen,
-                                         UINT32 ulKeyMgmt,
-                                         UINT8* ucPf_OrKey,
-                                         UINT32 ulPassPhraseLen);
-
-
-
-//*****************************************************************************
-//
-//!  wlan_ioctl_del_profile
-//!
-//!  @param    index   number of profile to delete
-//!
-//!  @return    On success, zero is returned. On error, -1 is returned        
-//!
-//!  @brief     Delete WLAN profile 
-//!
-//!  @Note      In order to delete all stored profile, set index to 255.
-//!
-//!  @sa        wlan_add_profile 
-//
-//*****************************************************************************
-extern INT32 wlan_ioctl_del_profile(UINT32 ulIndex);
-
-//*****************************************************************************
-//
-//!  wlan_set_event_mask
-//!
-//!  @param    mask   mask option:
-//!       HCI_EVNT_WLAN_UNSOL_CONNECT connect event
-//!       HCI_EVNT_WLAN_UNSOL_DISCONNECT disconnect event
-//!       HCI_EVNT_WLAN_ASYNC_SIMPLE_CONFIG_DONE  smart config done
-//!       HCI_EVNT_WLAN_UNSOL_INIT init done
-//!       HCI_EVNT_WLAN_UNSOL_DHCP dhcp event report
-//!       HCI_EVNT_WLAN_ASYNC_PING_REPORT ping report
-//!       HCI_EVNT_WLAN_KEEPALIVE keepalive
-//!       HCI_EVNT_WLAN_TX_COMPLETE - disable information on end of transmission
-//!   	  Saved: no.
-//!
-//!  @return    On success, zero is returned. On error, -1 is returned        
-//!
-//!  @brief    Mask event according to bit mask. In case that event is 
-//!            masked (1), the device will not send the masked event to host. 
-//
-//*****************************************************************************
-extern INT32 wlan_set_event_mask(UINT32 ulMask);
-
-//*****************************************************************************
-//
-//!  wlan_ioctl_statusget
-//!
-//!  @param none 
-//!
-//!  @return    WLAN_STATUS_DISCONNECTED, WLAN_STATUS_SCANING, 
-//!             STATUS_CONNECTING or WLAN_STATUS_CONNECTED      
-//!
-//!  @brief    get wlan status: disconnected, scanning, connecting or connected
-//
-//*****************************************************************************
-extern INT32 wlan_ioctl_statusget(void);
-
-
-//*****************************************************************************
-//
-//!  wlan_ioctl_set_connection_policy
-//!
-//!  @param    should_connect_to_open_ap  enable(1), disable(0) connect to any 
-//!            available AP. This parameter corresponds to the configuration of 
-//!            item # 3 in the brief description.
-//!  @param    should_use_fast_connect enable(1), disable(0). if enabled, tries 
-//!            to connect to the last connected AP. This parameter corresponds 
-//!            to the configuration of item # 1 in the brief description.
-//!  @param    auto_start enable(1), disable(0) auto connect 
-//!            after reset and periodically reconnect if needed. This 
-//!       	   configuration configures option 2 in the above description.
-//!
-//!  @return     On success, zero is returned. On error, -1 is returned        
-//!
-//!  @brief      When auto is enabled, the device tries to connect according 
-//!              the following policy:
-//!              1) If fast connect is enabled and last connection is valid, 
-//!                 the device will try to connect to it without the scanning 
-//!                 procedure (fast). The last connection will be marked as
-//!                 invalid, due to adding/removing profile. 
-//!              2) If profile exists, the device will try to connect it 
-//!                 (Up to seven profiles).
-//!              3) If fast and profiles are not found, and open mode is
-//!                 enabled, the device will try to connect to any AP.
-//!              * Note that the policy settings are stored in the CC3000 NVMEM.
-//!
-//!  @sa         wlan_add_profile , wlan_ioctl_del_profile 
-//
-//*****************************************************************************
-extern INT32 wlan_ioctl_set_connection_policy(
-                                        UINT32 should_connect_to_open_ap,
-                                        UINT32 should_use_fast_connect,
-                                        UINT32 ulUseProfiles);
-
-//*****************************************************************************
-//
-//!  wlan_ioctl_get_scan_results
-//!
-//!  @param[in]    scan_timeout   parameter not supported
-//!  @param[out]   ucResults  scan result (_wlan_full_scan_results_args_t)
-//!
-//!  @return    On success, zero is returned. On error, -1 is returned        
-//!
-//!  @brief    Gets entry from scan result table.
-//!            The scan results are returned one by one, and each entry 
-//!            represents a single AP found in the area. The following is a 
-//!            format of the scan result: 
-//!        	 - 4 Bytes: number of networks found
-//!          - 4 Bytes: The status of the scan: 0 - aged results,
-//!                     1 - results valid, 2 - no results
-//!          - 42 bytes: Result entry, where the bytes are arranged as  follows:
-//!              
-//!          				- 1 bit isValid - is result valid or not
-//!         				- 7 bits rssi - RSSI value;	 
-//!                 - 2 bits: securityMode - security mode of the AP:
-//!                           0 - Open, 1 - WEP, 2 WPA, 3 WPA2
-//!         				- 6 bits: SSID name length
-//!         				- 2 bytes: the time at which the entry has entered into 
-//!                            scans result table
-//!         				- 32 bytes: SSID name
-//!                 - 6 bytes:	BSSID 
-//!
-//!  @Note      scan_timeout, is not supported on this version.
-//!
-//!  @sa        wlan_ioctl_set_scan_params 
-//
-//*****************************************************************************
-
-
-extern INT32 wlan_ioctl_get_scan_results(UINT32 ulScanTimeout,
-                                       UINT8 *ucResults);
-
-//*****************************************************************************
-//
-//!  wlan_ioctl_set_scan_params
-//!
-//!  @param    uiEnable - start/stop application scan: 
-//!            1 = start scan with default interval value of 10 min. 
-//!            in order to set a different scan interval value apply the value 
-//!            in milliseconds. minimum 1 second. 0=stop). Wlan reset
-//!           (wlan_stop() wlan_start()) is needed when changing scan interval
-//!            value. Saved: No
-//!  @param   uiMinDwellTime   minimum dwell time value to be used for each 
-//!           channel, in milliseconds. Saved: yes
-//!           Recommended Value: 100 (Default: 20)
-//!  @param   uiMaxDwellTime    maximum dwell time value to be used for each
-//!           channel, in milliseconds. Saved: yes
-//!           Recommended Value: 100 (Default: 30)
-//!  @param   uiNumOfProbeRequests  max probe request between dwell time. 
-//!           Saved: yes. Recommended Value: 5 (Default:2)
-//!  @param   uiChannelMask  bitwise, up to 13 channels (0x1fff). 
-//!           Saved: yes. Default: 0x7ff
-//!  @param   uiRSSIThreshold   RSSI threshold. Saved: yes (Default: -80)
-//!  @param   uiSNRThreshold    NSR threshold. Saved: yes (Default: 0)
-//!  @param   uiDefaultTxPower  probe Tx power. Saved: yes (Default: 205)
-//!  @param   aiIntervalList    pointer to array with 16 entries (16 channels) 
-//!           each entry (UINT32) holds timeout between periodic scan 
-//!           (connection scan) - in milliseconds. Saved: yes. Default 2000ms.
-//!
-//!  @return    On success, zero is returned. On error, -1 is returned        
-//!
-//!  @brief    start and stop scan procedure. Set scan parameters. 
-//!
-//!  @Note     uiDefaultTxPower, is not supported on this version.
-//!
-//!  @sa        wlan_ioctl_get_scan_results 
-//
-//*****************************************************************************
-extern INT32 wlan_ioctl_set_scan_params(UINT32 uiEnable, UINT32 
-											 uiMinDwellTime,UINT32 uiMaxDwellTime,
-										   UINT32 uiNumOfProbeRequests,
-											 UINT32 uiChannelMask,
-										   INT32 iRSSIThreshold,UINT32 uiSNRThreshold,
-										   UINT32 uiDefaultTxPower, 
-											 UINT32 *aiIntervalList);
-
-                                           
-//*****************************************************************************
-//
-//!  wlan_smart_config_start
-//!
-//!  @param    algoEncryptedFlag indicates whether the information is encrypted
-//!
-//!  @return   On success, zero is returned. On error, -1 is returned        
-//!
-//!  @brief   Start to acquire device profile. The device acquire its own 
-//!           profile, if profile message is found. The acquired AP information
-//!           is stored in CC3000 EEPROM only in case AES128 encryption is used.
-//!           In case AES128 encryption is not used, a profile is created by 
-//!           CC3000 internally.
-//!
-//!  @Note    An asynchronous event - Smart Config Done will be generated as soon
-//!           as the process finishes successfully.
-//!
-//!  @sa      wlan_smart_config_set_prefix , wlan_smart_config_stop
-//
-//*****************************************************************************                                        
-extern INT32 wlan_smart_config_start(UINT32 algoEncryptedFlag);
-
-
-//*****************************************************************************
-//
-//!  wlan_smart_config_stop
-//!
-//!  @param    algoEncryptedFlag indicates whether the information is encrypted
-//!
-//!  @return   On success, zero is returned. On error, -1 is returned        
-//!
-//!  @brief   Stop the acquire profile procedure 
-//!
-//!  @sa      wlan_smart_config_start , wlan_smart_config_set_prefix
-//
-//*****************************************************************************
-extern INT32 wlan_smart_config_stop(void);
-
-//*****************************************************************************
-//
-//!  wlan_smart_config_set_prefix
-//!
-//!  @param   newPrefix  3 bytes identify the SSID prefix for the Smart Config. 
-//!
-//!  @return   On success, zero is returned. On error, -1 is returned        
-//!
-//!  @brief   Configure station ssid prefix. The prefix is used internally 
-//!           in CC3000. It should always be TTT.
-//!
-//!  @Note    The prefix is stored in CC3000 NVMEM
-//!
-//!  @sa      wlan_smart_config_start , wlan_smart_config_stop
-//
-//*****************************************************************************
-extern INT32 wlan_smart_config_set_prefix(CHAR* cNewPrefix);
-
-//*****************************************************************************
-//
-//!  wlan_smart_config_process
-//!
-//!  @param   none 
-//!
-//!  @return   On success, zero is returned. On error, -1 is returned        
-//!
-//!  @brief   process the acquired data and store it as a profile. The acquired 
-//!           AP information is stored in CC3000 EEPROM encrypted.
-//!           The encrypted data is decrypted and stored as a profile.
-//!           behavior is as defined by connection policy.
-//
-//*****************************************************************************
-extern INT32 wlan_smart_config_process(void);
-
-//*****************************************************************************
-//
-// Close the Doxygen group.
-//! @}
-//
-//*****************************************************************************
-
-
-
-//*****************************************************************************
-//
-// Mark the end of the C bindings section for C++ compilers.
-//
-//*****************************************************************************
-#ifdef	__cplusplus
-}
-#endif // __cplusplus
-
-#endif	// __CC3000_WLAN_H__
diff --git a/drivers/cc3000/src/cc3000_common.c b/drivers/cc3000/src/cc3000_common.c
deleted file mode 100644
index b4c87848cf476..0000000000000
--- a/drivers/cc3000/src/cc3000_common.c
+++ /dev/null
@@ -1,164 +0,0 @@
-/*****************************************************************************
-*
-*  cc3000_common.c.c  - CC3000 Host Driver Implementation.
-*  Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/
-*
-*  Redistribution and use in source and binary forms, with or without
-*  modification, are permitted provided that the following conditions
-*  are met:
-*
-*    Redistributions of source code must retain the above copyright
-*    notice, this list of conditions and the following disclaimer.
-*
-*    Redistributions in binary form must reproduce the above copyright
-*    notice, this list of conditions and the following disclaimer in the
-*    documentation and/or other materials provided with the   
-*    distribution.
-*
-*    Neither the name of Texas Instruments Incorporated nor the names of
-*    its contributors may be used to endorse or promote products derived
-*    from this software without specific prior written permission.
-*
-*  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
-*  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
-*  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-*  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
-*  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
-*  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
-*  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-*  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-*  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-*  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
-*  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*
-*****************************************************************************/
-//*****************************************************************************
-//
-//! \addtogroup common_api
-//! @{
-//
-//*****************************************************************************
-/******************************************************************************
-*
-* Include files
-*
-*****************************************************************************/
-
-#include "cc3000_common.h"
-#include "socket.h"
-#include "wlan.h"
-#include "evnt_handler.h"
-
-//*****************************************************************************
-//
-//!  __error__
-//!
-//!  @param  pcFilename - file name, where error occurred
-//!  @param  ulLine     - line number, where error occurred
-//!
-//!  @return none
-//!
-//!  @brief stub function for ASSERT macro
-//
-//*****************************************************************************
-void __error__(CHAR *pcFilename, UINT32 ulLine)
-{
-	//TODO full up function
-}
-
-
-
-//*****************************************************************************
-//
-//!  UINT32_TO_STREAM_f
-//!
-//!  @param  p       pointer to the new stream
-//!  @param  u32     pointer to the 32 bit
-//!
-//!  @return               pointer to the new stream
-//!
-//!  @brief                This function is used for copying 32 bit to stream
-//!						   while converting to little endian format.
-//
-//*****************************************************************************
-
-UINT8* UINT32_TO_STREAM_f (UINT8 *p, UINT32 u32)
-{
-	*(p)++ = (UINT8)(u32);
-	*(p)++ = (UINT8)((u32) >> 8);
-	*(p)++ = (UINT8)((u32) >> 16);
-	*(p)++ = (UINT8)((u32) >> 24);
-	return p;
-}
-
-//*****************************************************************************
-//
-//!  UINT16_TO_STREAM_f
-//!
-//!  @param  p       pointer to the new stream
-//!  @param  u32     pointer to the 16 bit
-//!
-//!  @return               pointer to the new stream
-//!
-//!  @brief               This function is used for copying 16 bit to stream
-//!                       while converting to little endian format.
-//
-//*****************************************************************************
-
-UINT8* UINT16_TO_STREAM_f (UINT8 *p, UINT16 u16)
-{
-	*(p)++ = (UINT8)(u16);
-	*(p)++ = (UINT8)((u16) >> 8);
-	return p;
-}
-
-//*****************************************************************************
-//
-//!  STREAM_TO_UINT16_f
-//!
-//!  @param  p          pointer to the stream
-//!  @param  offset     offset in the stream
-//!
-//!  @return               pointer to the new 16 bit
-//!
-//!  @brief               This function is used for copying received stream to
-//!                       16 bit in little endian format.
-//
-//*****************************************************************************
-
-UINT16 STREAM_TO_UINT16_f(CHAR* p, UINT16 offset)
-{
-	return (UINT16)((UINT16)((UINT16)
-		(*(p + offset + 1)) << 8) + (UINT16)(*(p + offset)));
-}
-
-//*****************************************************************************
-//
-//!  STREAM_TO_UINT32_f
-//!
-//!  @param  p          pointer to the stream
-//!  @param  offset     offset in the stream
-//!
-//!  @return               pointer to the new 32 bit
-//!
-//!  @brief               This function is used for copying received stream to
-//!                       32 bit in little endian format.
-//
-//*****************************************************************************
-
-UINT32 STREAM_TO_UINT32_f(CHAR* p, UINT16 offset)
-{
-	return (UINT32)((UINT32)((UINT32)
-		(*(p + offset + 3)) << 24) + (UINT32)((UINT32)
-		(*(p + offset + 2)) << 16) + (UINT32)((UINT32)
-		(*(p + offset + 1)) << 8) + (UINT32)(*(p + offset)));
-}
-
-
-
-//*****************************************************************************
-//
-// Close the Doxygen group.
-//! @}
-//
-//*****************************************************************************
diff --git a/drivers/cc3000/src/ccspi.c b/drivers/cc3000/src/ccspi.c
deleted file mode 100644
index 1dcd61884086d..0000000000000
--- a/drivers/cc3000/src/ccspi.c
+++ /dev/null
@@ -1,455 +0,0 @@
-/*****************************************************************************
- *
- *  spi.c - CC3000 Host Driver Implementation.
- *  Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions
- *  are met:
- *
- *    Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- *    Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- *    Neither the name of Texas Instruments Incorporated nor the names of
- *    its contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *****************************************************************************/
-
-#include <string.h>
-
-#include "py/runtime.h"
-#include "pin.h"
-#include "led.h"
-#include "extint.h"
-#include "spi.h"
-#include "ccspi.h"
-#include "evnt_handler.h"
-
-#if 0 // print debugging info
-#include <stdio.h>
-#define DEBUG_printf(args...) printf(args)
-#else // don't print debugging info
-#define DEBUG_printf(args...) (void)0
-#endif
-
-// these need to be set to valid values before anything in this file will work
-STATIC const spi_t *SPI_HANDLE = NULL;
-STATIC const pin_obj_t *PIN_CS = NULL;
-STATIC const pin_obj_t *PIN_EN = NULL;
-STATIC const pin_obj_t *PIN_IRQ = NULL;
-
-#define CS_LOW()            HAL_GPIO_WritePin(PIN_CS->gpio, PIN_CS->pin_mask, GPIO_PIN_RESET)
-#define CS_HIGH()           HAL_GPIO_WritePin(PIN_CS->gpio, PIN_CS->pin_mask, GPIO_PIN_SET)
-
-#define READ                3
-#define WRITE               1
-
-#define HI(value)           (((value) & 0xFF00) >> 8)
-#define LO(value)           ((value) & 0x00FF)
-
-#define SPI_TIMEOUT         (1000)
-#define HEADERS_SIZE_EVNT   (SPI_HEADER_SIZE + 5)
-
-/* SPI bus states */
-#define eSPI_STATE_POWERUP                  (0)
-#define eSPI_STATE_INITIALIZED              (1)
-#define eSPI_STATE_IDLE                     (2)
-#define eSPI_STATE_WRITE_IRQ                (3)
-#define eSPI_STATE_WRITE_FIRST_PORTION      (4)
-#define eSPI_STATE_WRITE_EOT                (5)
-#define eSPI_STATE_READ_IRQ                 (6)
-#define eSPI_STATE_READ_FIRST_PORTION       (7)
-#define eSPI_STATE_READ_EOT                 (8)
-
-// The magic number that resides at the end of the TX/RX buffer (1 byte after the allocated size)
-// for the purpose of detection of the overrun. The location of the memory where the magic number
-// resides shall never be written. In case it is written - the overrun occured and either recevie function
-// or send function will stuck forever.
-#define CC3000_BUFFER_MAGIC_NUMBER (0xDE)
-
-typedef struct {
-    gcSpiHandleRx  SPIRxHandler;
-    unsigned short usTxPacketLength;
-    unsigned short usRxPacketLength;
-    unsigned long  ulSpiState;
-    unsigned char *pTxPacket;
-    unsigned char *pRxPacket;
-} tSpiInformation;
-STATIC tSpiInformation sSpiInformation;
-
-STATIC char spi_buffer[CC3000_RX_BUFFER_SIZE];
-unsigned char wlan_tx_buffer[CC3000_TX_BUFFER_SIZE];
-
-STATIC const mp_obj_fun_builtin_fixed_t irq_callback_obj;
-
-// set the pins to use to communicate with the CC3000
-// the arguments must be of type pin_obj_t* and SPI_HandleTypeDef*
-void SpiInit(void *spi, const void *pin_cs, const void *pin_en, const void *pin_irq) {
-    SPI_HANDLE = spi;
-    PIN_CS = pin_cs;
-    PIN_EN = pin_en;
-    PIN_IRQ = pin_irq;
-}
-
-void SpiClose(void)
-{
-    if (sSpiInformation.pRxPacket) {
-        sSpiInformation.pRxPacket = 0;
-    }
-
-    tSLInformation.WlanInterruptDisable();
-
-    //HAL_SPI_DeInit(SPI_HANDLE);
-}
-
-void SpiOpen(gcSpiHandleRx pfRxHandler)
-{
-    DEBUG_printf("SpiOpen\n");
-
-    /* initialize SPI state */
-    sSpiInformation.ulSpiState = eSPI_STATE_POWERUP;
-    sSpiInformation.SPIRxHandler = pfRxHandler;
-    sSpiInformation.usTxPacketLength = 0;
-    sSpiInformation.pTxPacket = NULL;
-    sSpiInformation.pRxPacket = (unsigned char *)spi_buffer;
-    sSpiInformation.usRxPacketLength = 0;
-    spi_buffer[CC3000_RX_BUFFER_SIZE - 1] = CC3000_BUFFER_MAGIC_NUMBER;
-    wlan_tx_buffer[CC3000_TX_BUFFER_SIZE - 1] = CC3000_BUFFER_MAGIC_NUMBER;
-
-    /* SPI configuration */
-    SPI_InitTypeDef *init = &SPI_HANDLE->spi->Init;
-    init->Mode              = SPI_MODE_MASTER;
-    init->Direction         = SPI_DIRECTION_2LINES;
-    init->DataSize          = SPI_DATASIZE_8BIT;
-    init->CLKPolarity       = SPI_POLARITY_LOW;
-    init->CLKPhase          = SPI_PHASE_2EDGE;
-    init->NSS               = SPI_NSS_SOFT;
-    init->BaudRatePrescaler = SPI_BAUDRATEPRESCALER_8;
-    init->FirstBit          = SPI_FIRSTBIT_MSB;
-    init->TIMode            = SPI_TIMODE_DISABLED;
-    init->CRCCalculation    = SPI_CRCCALCULATION_DISABLED;
-    init->CRCPolynomial     = 7;
-    spi_init(SPI_HANDLE, false);
-
-    // configure wlan CS and EN pins
-    GPIO_InitTypeDef GPIO_InitStructure;
-    GPIO_InitStructure.Speed = GPIO_SPEED_FAST;
-    GPIO_InitStructure.Mode = GPIO_MODE_OUTPUT_PP;
-    GPIO_InitStructure.Pull = GPIO_NOPULL;
-    GPIO_InitStructure.Alternate = 0;
-
-    GPIO_InitStructure.Pin = PIN_CS->pin_mask;
-    HAL_GPIO_Init(PIN_CS->gpio, &GPIO_InitStructure);
-
-    GPIO_InitStructure.Pin = PIN_EN->pin_mask;
-    HAL_GPIO_Init(PIN_EN->gpio, &GPIO_InitStructure);
-
-    HAL_GPIO_WritePin(PIN_CS->gpio, PIN_CS->pin_mask, GPIO_PIN_SET);
-    HAL_GPIO_WritePin(PIN_EN->gpio, PIN_EN->pin_mask, GPIO_PIN_RESET);
-
-    /* do a dummy read, this ensures SCLK is low before
-       actual communications start, it might be required */
-    CS_LOW();
-    uint8_t buf[1];
-    HAL_SPI_Receive(SPI_HANDLE->spi, buf, sizeof(buf), SPI_TIMEOUT);
-    CS_HIGH();
-
-    // register EXTI
-    extint_register((mp_obj_t)PIN_IRQ, GPIO_MODE_IT_FALLING, GPIO_PULLUP, (mp_obj_t)&irq_callback_obj, true);
-    extint_enable(PIN_IRQ->pin);
-
-    DEBUG_printf("SpiOpen finished; IRQ.pin=%d IRQ_LINE=%d\n", PIN_IRQ->pin, PIN_IRQ->pin);
-}
-
-long ReadWlanInterruptPin(void)
-{
-    return HAL_GPIO_ReadPin(PIN_IRQ->gpio, PIN_IRQ->pin_mask);
-}
-
-void WriteWlanPin(unsigned char val)
-{
-    HAL_GPIO_WritePin(PIN_EN->gpio, PIN_EN->pin_mask,
-            (WLAN_ENABLE)? GPIO_PIN_SET:GPIO_PIN_RESET);
-}
-
-STATIC void SpiWriteDataSynchronous(unsigned char *data, unsigned short size)
-{
-    DEBUG_printf("SpiWriteDataSynchronous(data=%p [%x %x %x %x], size=%u)\n", data, data[0], data[1], data[2], data[3], size);
-    __disable_irq();
-    if (HAL_SPI_TransmitReceive(SPI_HANDLE->spi, data, data, size, SPI_TIMEOUT) != HAL_OK) {
-        //BREAK();
-    }
-    __enable_irq();
-    DEBUG_printf(" - rx data = [%x %x %x %x]\n", data[0], data[1], data[2], data[3]);
-}
-
-STATIC void SpiReadDataSynchronous(unsigned char *data, unsigned short size)
-{
-    memset(data, READ, size);
-    __disable_irq();
-    if (HAL_SPI_TransmitReceive(SPI_HANDLE->spi, data, data, size, SPI_TIMEOUT) != HAL_OK) {
-       //BREAK();
-    }
-    __enable_irq();
-}
-
-STATIC void __delay_cycles(volatile int x)
-{
-    x *= 6; // for 168 MHz CPU
-    while (x--);
-}
-
-STATIC long SpiFirstWrite(unsigned char *ucBuf, unsigned short usLength)
-{
-    DEBUG_printf("SpiFirstWrite %lu\n", sSpiInformation.ulSpiState);
-
-    CS_LOW();
-
-    // Assuming we are running on 24 MHz ~50 micro delay is 1200 cycles;
-    __delay_cycles(1200);
-
-    // SPI writes first 4 bytes of data
-    SpiWriteDataSynchronous(ucBuf, 4);
-
-    __delay_cycles(1200);
-
-    SpiWriteDataSynchronous(ucBuf + 4, usLength - 4);
-
-    // From this point on - operate in a regular way
-    sSpiInformation.ulSpiState = eSPI_STATE_IDLE;
-
-    CS_HIGH();
-
-    return(0);
-}
-
-long SpiWrite(unsigned char *pUserBuffer, unsigned short usLength)
-{
-    DEBUG_printf("SpiWrite %lu\n", sSpiInformation.ulSpiState);
-
-    unsigned char ucPad = 0;
-
-    // Figure out the total length of the packet in order to figure out if there 
-    // is padding or not
-    if(!(usLength & 0x0001)) {
-        ucPad++;
-    }
-
-    pUserBuffer[0] = WRITE;
-    pUserBuffer[1] = HI(usLength + ucPad);
-    pUserBuffer[2] = LO(usLength + ucPad);
-    pUserBuffer[3] = 0;
-    pUserBuffer[4] = 0;
-
-    usLength += (SPI_HEADER_SIZE + ucPad);
-
-    // The magic number that resides at the end of the TX/RX buffer (1 byte after the allocated size)
-    // for the purpose of detection of the overrun. If the magic number is overriten - buffer overrun
-    // occurred - and we will stuck here forever!
-    if (wlan_tx_buffer[CC3000_TX_BUFFER_SIZE - 1] != CC3000_BUFFER_MAGIC_NUMBER) {
-        while (1);
-    }
-
-    if (sSpiInformation.ulSpiState == eSPI_STATE_POWERUP) {
-        while (sSpiInformation.ulSpiState != eSPI_STATE_INITIALIZED);
-    }
-
-    if (sSpiInformation.ulSpiState == eSPI_STATE_INITIALIZED) {
-        // This is time for first TX/RX transactions over SPI:
-        // the IRQ is down - so need to send read buffer size command
-        SpiFirstWrite(pUserBuffer, usLength);
-    } else {
-        //
-        // We need to prevent here race that can occur in case 2 back to back packets are sent to the
-        // device, so the state will move to IDLE and once again to not IDLE due to IRQ
-        //
-        tSLInformation.WlanInterruptDisable();
-
-        while (sSpiInformation.ulSpiState != eSPI_STATE_IDLE);
-
-        sSpiInformation.ulSpiState = eSPI_STATE_WRITE_IRQ;
-        sSpiInformation.pTxPacket = pUserBuffer;
-        sSpiInformation.usTxPacketLength = usLength;
-
-        // Assert the CS line and wait till SSI IRQ line is active and then initialize write operation
-        CS_LOW();
-
-        // Re-enable IRQ - if it was not disabled - this is not a problem...
-        tSLInformation.WlanInterruptEnable();
-
-        // check for a missing interrupt between the CS assertion and enabling back the interrupts
-        if (tSLInformation.ReadWlanInterruptPin() == 0) {
-            SpiWriteDataSynchronous(sSpiInformation.pTxPacket, sSpiInformation.usTxPacketLength);
-
-            sSpiInformation.ulSpiState = eSPI_STATE_IDLE;
-
-            CS_HIGH();
-        }
-    }
-
-    // Due to the fact that we are currently implementing a blocking situation
-    // here we will wait till end of transaction
-    while (eSPI_STATE_IDLE != sSpiInformation.ulSpiState);
-
-    return(0);
-}
-
-#if 0
-unused
-STATIC void SpiReadPacket(void)
-{
-    int length;
-
-    /* read SPI header */
-    SpiReadDataSynchronous(sSpiInformation.pRxPacket, SPI_HEADER_SIZE);
-
-    /* parse data length  */
-    STREAM_TO_UINT8(sSpiInformation.pRxPacket, SPI_HEADER_SIZE-1, length);
-
-    /* read the remainder of the packet */
-    SpiReadDataSynchronous(sSpiInformation.pRxPacket + SPI_HEADER_SIZE, length);
-
-    sSpiInformation.ulSpiState = eSPI_STATE_READ_EOT;
-}
-#endif
-
-STATIC void SpiReadHeader(void)
-{
-    SpiReadDataSynchronous(sSpiInformation.pRxPacket, 10);
-}
-
-STATIC void SpiTriggerRxProcessing(void)
-{
-    SpiPauseSpi();
-    CS_HIGH();
-
-    // The magic number that resides at the end of the TX/RX buffer (1 byte after the allocated size)
-    // for the purpose of detection of the overrun. If the magic number is overriten - buffer overrun
-    // occurred - and we will stuck here forever!
-    if (sSpiInformation.pRxPacket[CC3000_RX_BUFFER_SIZE - 1] != CC3000_BUFFER_MAGIC_NUMBER) {
-        while (1);
-    }
-
-    sSpiInformation.ulSpiState = eSPI_STATE_IDLE;
-    sSpiInformation.SPIRxHandler(sSpiInformation.pRxPacket + SPI_HEADER_SIZE);
-}
-
-
-STATIC long SpiReadDataCont(void)
-{
-    long data_to_recv=0;
-    unsigned char *evnt_buff, type;
-
-    //determine what type of packet we have
-    evnt_buff =  sSpiInformation.pRxPacket;
-    STREAM_TO_UINT8((char *)(evnt_buff + SPI_HEADER_SIZE), HCI_PACKET_TYPE_OFFSET, type);
-
-    switch (type) {
-        case HCI_TYPE_DATA:{
-                // We need to read the rest of data..
-                STREAM_TO_UINT16((char *)(evnt_buff + SPI_HEADER_SIZE),
-                        HCI_DATA_LENGTH_OFFSET, data_to_recv);
-                if (!((HEADERS_SIZE_EVNT + data_to_recv) & 1)) {
-                    data_to_recv++;
-                }
-
-                if (data_to_recv) {
-                    SpiReadDataSynchronous(evnt_buff + 10, data_to_recv);
-                }
-                break;
-            }
-        case HCI_TYPE_EVNT: {
-                // Calculate the rest length of the data
-                STREAM_TO_UINT8((char *)(evnt_buff + SPI_HEADER_SIZE),
-                        HCI_EVENT_LENGTH_OFFSET, data_to_recv);
-                data_to_recv -= 1;
-
-                // Add padding byte if needed
-                if ((HEADERS_SIZE_EVNT + data_to_recv) & 1) {
-                    data_to_recv++;
-                }
-
-                if (data_to_recv) {
-                    SpiReadDataSynchronous(evnt_buff + 10, data_to_recv);
-                }
-
-                sSpiInformation.ulSpiState = eSPI_STATE_READ_EOT;
-                break;
-            }
-    }
-
-    return 0;
-}
-
-STATIC void SSIContReadOperation(void)
-{
-    // The header was read - continue with  the payload read
-    if (!SpiReadDataCont()) {
-        /* All the data was read - finalize handling by switching
-           to the task and calling from task Event Handler */
-        SpiTriggerRxProcessing();
-    }
-}
-
-STATIC mp_obj_t irq_callback(mp_obj_t line) {
-    DEBUG_printf("<< IRQ; state=%lu >>\n", sSpiInformation.ulSpiState);
-    switch (sSpiInformation.ulSpiState) {
-        case eSPI_STATE_POWERUP:
-            /* This means IRQ line was low call a callback of HCI Layer to inform on event */
-            DEBUG_printf(" - POWERUP\n");
-            sSpiInformation.ulSpiState = eSPI_STATE_INITIALIZED;
-            break;
-        case eSPI_STATE_IDLE:
-            DEBUG_printf(" - IDLE\n");
-            sSpiInformation.ulSpiState = eSPI_STATE_READ_IRQ;
-
-            /* IRQ line goes down - we are start reception */
-            CS_LOW();
-
-            // Wait for TX/RX Compete which will come as DMA interrupt
-            SpiReadHeader();
-
-            sSpiInformation.ulSpiState = eSPI_STATE_READ_EOT;
-
-            SSIContReadOperation();
-            break;
-        case eSPI_STATE_WRITE_IRQ:
-            DEBUG_printf(" - WRITE IRQ\n");
-            SpiWriteDataSynchronous(sSpiInformation.pTxPacket, sSpiInformation.usTxPacketLength);
-
-            sSpiInformation.ulSpiState = eSPI_STATE_IDLE;
-
-            CS_HIGH();
-            break;
-    }
-    return mp_const_none;
-}
-
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(irq_callback_obj, irq_callback);
-
-void SpiPauseSpi(void) {
-    DEBUG_printf("SpiPauseSpi\n");
-    extint_disable(PIN_IRQ->pin);
-}
-
-void SpiResumeSpi(void) {
-    DEBUG_printf("SpiResumeSpi\n");
-    extint_enable(PIN_IRQ->pin);
-}
diff --git a/drivers/cc3000/src/evnt_handler.c b/drivers/cc3000/src/evnt_handler.c
deleted file mode 100644
index d430bbfdad555..0000000000000
--- a/drivers/cc3000/src/evnt_handler.c
+++ /dev/null
@@ -1,849 +0,0 @@
-/*****************************************************************************
-*
-*  evnt_handler.c  - CC3000 Host Driver Implementation.
-*  Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/
-*
-*  Redistribution and use in source and binary forms, with or without
-*  modification, are permitted provided that the following conditions
-*  are met:
-*
-*    Redistributions of source code must retain the above copyright
-*    notice, this list of conditions and the following disclaimer.
-*
-*    Redistributions in binary form must reproduce the above copyright
-*    notice, this list of conditions and the following disclaimer in the
-*    documentation and/or other materials provided with the   
-*    distribution.
-*
-*    Neither the name of Texas Instruments Incorporated nor the names of
-*    its contributors may be used to endorse or promote products derived
-*    from this software without specific prior written permission.
-*
-*  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
-*  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
-*  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-*  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
-*  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
-*  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
-*  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-*  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-*  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-*  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
-*  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*
-*****************************************************************************/
-//*****************************************************************************
-//
-//! \addtogroup evnt_handler_api
-//! @{
-//
-//******************************************************************************
-
-//******************************************************************************
-//                  INCLUDE FILES
-//******************************************************************************
-
-#include "cc3000_common.h"
-#include "string.h"
-#include "hci.h"
-#include "evnt_handler.h"
-#include "wlan.h"
-#include "socket.h"
-#include "netapp.h"
-#include "ccspi.h"
-
-
-
-//*****************************************************************************
-//                  COMMON DEFINES
-//*****************************************************************************
-
-#define FLOW_CONTROL_EVENT_HANDLE_OFFSET		(0)
-#define FLOW_CONTROL_EVENT_BLOCK_MODE_OFFSET	(1)
-#define FLOW_CONTROL_EVENT_FREE_BUFFS_OFFSET	(2)
-#define FLOW_CONTROL_EVENT_SIZE					(4)
-
-#define BSD_RSP_PARAMS_SOCKET_OFFSET		(0)
-#define BSD_RSP_PARAMS_STATUS_OFFSET		(4)
-
-#define GET_HOST_BY_NAME_RETVAL_OFFSET	(0)
-#define GET_HOST_BY_NAME_ADDR_OFFSET	(4)
-
-#define ACCEPT_SD_OFFSET			(0)
-#define ACCEPT_RETURN_STATUS_OFFSET	(4)
-#define ACCEPT_ADDRESS__OFFSET		(8)
-
-#define SL_RECEIVE_SD_OFFSET			(0)
-#define SL_RECEIVE_NUM_BYTES_OFFSET		(4)
-#define SL_RECEIVE__FLAGS__OFFSET		(8)
-
-
-#define SELECT_STATUS_OFFSET			(0)
-#define SELECT_READFD_OFFSET			(4)
-#define SELECT_WRITEFD_OFFSET			(8)
-#define SELECT_EXFD_OFFSET				(12)
-
-
-#define NETAPP_IPCONFIG_IP_OFFSET				(0)
-#define NETAPP_IPCONFIG_SUBNET_OFFSET			(4)
-#define NETAPP_IPCONFIG_GW_OFFSET				(8)
-#define NETAPP_IPCONFIG_DHCP_OFFSET				(12)
-#define NETAPP_IPCONFIG_DNS_OFFSET				(16)
-#define NETAPP_IPCONFIG_MAC_OFFSET				(20)
-#define NETAPP_IPCONFIG_SSID_OFFSET				(26)
-
-#define NETAPP_IPCONFIG_IP_LENGTH				(4)
-#define NETAPP_IPCONFIG_MAC_LENGTH				(6)
-#define NETAPP_IPCONFIG_SSID_LENGTH				(32)
-
-
-#define NETAPP_PING_PACKETS_SENT_OFFSET			(0)
-#define NETAPP_PING_PACKETS_RCVD_OFFSET			(4)
-#define NETAPP_PING_MIN_RTT_OFFSET				(8)
-#define NETAPP_PING_MAX_RTT_OFFSET				(12)
-#define NETAPP_PING_AVG_RTT_OFFSET				(16)
-
-#define GET_SCAN_RESULTS_TABlE_COUNT_OFFSET				(0)
-#define GET_SCAN_RESULTS_SCANRESULT_STATUS_OFFSET		(4)
-#define GET_SCAN_RESULTS_ISVALID_TO_SSIDLEN_OFFSET		(8)
-#define GET_SCAN_RESULTS_FRAME_TIME_OFFSET				(10)
-#define GET_SCAN_RESULTS_SSID_MAC_LENGTH				(38)
-
-#define GET_MSS_VAL_RETVAL_OFFSET	(0)
-
-//*****************************************************************************
-//                  GLOBAL VARAIABLES
-//*****************************************************************************
-
-UINT32 socket_active_status = SOCKET_STATUS_INIT_VAL; 
-
-
-//*****************************************************************************
-//            Prototypes for the static functions
-//*****************************************************************************
-
-static INT32 hci_event_unsol_flowcontrol_handler(CHAR *pEvent);
-
-static void update_socket_active_status(CHAR *resp_params);
-
-
-//*****************************************************************************
-//
-//!  hci_unsol_handle_patch_request
-//!
-//!  @param  event_hdr  event header
-//!
-//!  @return none
-//!
-//!  @brief   Handle unsolicited event from type patch request
-//
-//*****************************************************************************
-void hci_unsol_handle_patch_request(CHAR *event_hdr)
-{
-	CHAR *params = (CHAR *)(event_hdr) + HCI_EVENT_HEADER_SIZE;
-	UINT32 ucLength = 0;
-	CHAR *patch;
-
-	switch (*params)
-	{
-	case HCI_EVENT_PATCHES_DRV_REQ:
-
-		if (tSLInformation.sDriverPatches)
-		{
-			patch = tSLInformation.sDriverPatches(&ucLength);
-
-			if (patch)
-			{
-				hci_patch_send(HCI_EVENT_PATCHES_DRV_REQ, 
-					tSLInformation.pucTxCommandBuffer, patch, ucLength);
-				return;
-			}
-		}
-
-		// Send 0 length Patches response event
-		hci_patch_send(HCI_EVENT_PATCHES_DRV_REQ, 
-			tSLInformation.pucTxCommandBuffer, 0, 0);
-		break;
-
-	case HCI_EVENT_PATCHES_FW_REQ:
-
-		if (tSLInformation.sFWPatches)
-		{
-			patch = tSLInformation.sFWPatches(&ucLength);
-
-			// Build and send a patch
-			if (patch)
-			{
-				hci_patch_send(HCI_EVENT_PATCHES_FW_REQ, 
-					tSLInformation.pucTxCommandBuffer, patch, ucLength);
-				return;
-			}
-		}
-
-		// Send 0 length Patches response event
-		hci_patch_send(HCI_EVENT_PATCHES_FW_REQ, 
-			tSLInformation.pucTxCommandBuffer, 0, 0);
-		break;
-
-	case HCI_EVENT_PATCHES_BOOTLOAD_REQ:
-
-		if (tSLInformation.sBootLoaderPatches)
-		{
-			patch = tSLInformation.sBootLoaderPatches(&ucLength);
-
-			if (patch)
-			{
-				hci_patch_send(HCI_EVENT_PATCHES_BOOTLOAD_REQ,  
-					tSLInformation.pucTxCommandBuffer, patch, ucLength);
-				return;
-			}
-		}
-
-		// Send 0 length Patches response event
-		hci_patch_send(HCI_EVENT_PATCHES_BOOTLOAD_REQ, 
-			tSLInformation.pucTxCommandBuffer, 0, 0);
-		break;
-	}
-}
-
-
-
-//*****************************************************************************
-//
-//!  hci_event_handler
-//!
-//!  @param  pRetParams     incoming data buffer
-//!  @param  from           from information (in case of data received)
-//!  @param  fromlen        from information length (in case of data received)
-//!
-//!  @return         none
-//!
-//!  @brief          Parse the incoming events packets and issues corresponding
-//!                  event handler from global array of handlers pointers
-//
-//*****************************************************************************
-
-
-UINT8 * hci_event_handler(void *pRetParams, UINT8 *from, UINT8 *fromlen)
-{
-	UINT8 *pucReceivedData, ucArgsize;
-	UINT16 usLength;
-	UINT8 *pucReceivedParams;
-	UINT16 usReceivedEventOpcode = 0;
-	UINT32 retValue32;
-	UINT8 * RecvParams;
-	UINT8 *RetParams;
-
-
-	while (1)
-	{
-		if (tSLInformation.usEventOrDataReceived != 0)
-		{				
-			pucReceivedData = (tSLInformation.pucReceivedData);
-
-			if (*pucReceivedData == HCI_TYPE_EVNT)
-			{
-				// Event Received
-				STREAM_TO_UINT16((CHAR *)pucReceivedData, HCI_EVENT_OPCODE_OFFSET,
-					usReceivedEventOpcode);
-				pucReceivedParams = pucReceivedData + HCI_EVENT_HEADER_SIZE;		
-				RecvParams = pucReceivedParams;
-				RetParams = pRetParams;
-
-				// In case unsolicited event received - here the handling finished
-				if (hci_unsol_event_handler((CHAR *)pucReceivedData) == 0)
-				{
-					STREAM_TO_UINT8(pucReceivedData, HCI_DATA_LENGTH_OFFSET, usLength);
-
-					switch(usReceivedEventOpcode)
-					{		
-					case HCI_CMND_READ_BUFFER_SIZE:
-						{
-							STREAM_TO_UINT8((CHAR *)pucReceivedParams, 0, 
-								tSLInformation.usNumberOfFreeBuffers);
-							STREAM_TO_UINT16((CHAR *)pucReceivedParams, 1, 
-								tSLInformation.usSlBufferLength);
-						}
-						break;
-
-					case HCI_CMND_WLAN_CONFIGURE_PATCH:
-					case HCI_NETAPP_DHCP:
-					case HCI_NETAPP_PING_SEND:
-					case HCI_NETAPP_PING_STOP:
-					case HCI_NETAPP_ARP_FLUSH:
-					case HCI_NETAPP_SET_DEBUG_LEVEL:
-					case HCI_NETAPP_SET_TIMERS:
-					case HCI_EVNT_NVMEM_READ:
-					case HCI_EVNT_NVMEM_CREATE_ENTRY:
-					case HCI_CMND_NVMEM_WRITE_PATCH:
-					case HCI_NETAPP_PING_REPORT:
-					case HCI_EVNT_MDNS_ADVERTISE:
-
-						STREAM_TO_UINT8(pucReceivedData, HCI_EVENT_STATUS_OFFSET
-							,*(UINT8 *)pRetParams);
-						break;
-
-					case HCI_CMND_SETSOCKOPT:
-					case HCI_CMND_WLAN_CONNECT:
-					case HCI_CMND_WLAN_IOCTL_STATUSGET:
-					case HCI_EVNT_WLAN_IOCTL_ADD_PROFILE:
-					case HCI_CMND_WLAN_IOCTL_DEL_PROFILE:
-					case HCI_CMND_WLAN_IOCTL_SET_CONNECTION_POLICY:
-					case HCI_CMND_WLAN_IOCTL_SET_SCANPARAM:
-					case HCI_CMND_WLAN_IOCTL_SIMPLE_CONFIG_START:
-					case HCI_CMND_WLAN_IOCTL_SIMPLE_CONFIG_STOP:
-					case HCI_CMND_WLAN_IOCTL_SIMPLE_CONFIG_SET_PREFIX:
-					case HCI_CMND_EVENT_MASK:
-					case HCI_EVNT_WLAN_DISCONNECT:
-					case HCI_EVNT_SOCKET:
-					case HCI_EVNT_BIND:
-					case HCI_CMND_LISTEN:
-					case HCI_EVNT_CLOSE_SOCKET:
-					case HCI_EVNT_CONNECT:
-					case HCI_EVNT_NVMEM_WRITE:
-
-						STREAM_TO_UINT32((CHAR *)pucReceivedParams,0
-							,*(UINT32 *)pRetParams);
-						break;
-
-					case HCI_EVNT_READ_SP_VERSION:
-
-						STREAM_TO_UINT8(pucReceivedData, HCI_EVENT_STATUS_OFFSET
-							,*(UINT8 *)pRetParams);
-						pRetParams = ((CHAR *)pRetParams) + 1;
-						STREAM_TO_UINT32((CHAR *)pucReceivedParams, 0, retValue32);
-						UINT32_TO_STREAM((UINT8 *)pRetParams, retValue32);				
-						break;
-
-					case HCI_EVNT_BSD_GETHOSTBYNAME:
-
-						STREAM_TO_UINT32((CHAR *)pucReceivedParams
-							,GET_HOST_BY_NAME_RETVAL_OFFSET,*(UINT32 *)pRetParams);
-						pRetParams = ((CHAR *)pRetParams) + 4;
-						STREAM_TO_UINT32((CHAR *)pucReceivedParams
-							,GET_HOST_BY_NAME_ADDR_OFFSET,*(UINT32 *)pRetParams);					
-						break;
-
-					case HCI_EVNT_GETMSSVALUE:
-
-						STREAM_TO_UINT16((CHAR *)pucReceivedParams
-							,GET_MSS_VAL_RETVAL_OFFSET,*(UINT16 *)pRetParams);					
-
-						break;
-
-					case HCI_EVNT_ACCEPT:
-						{
-							STREAM_TO_UINT32((CHAR *)pucReceivedParams,ACCEPT_SD_OFFSET
-								,*(UINT32 *)pRetParams);
-							pRetParams = ((CHAR *)pRetParams) + 4;
-							STREAM_TO_UINT32((CHAR *)pucReceivedParams
-								,ACCEPT_RETURN_STATUS_OFFSET,*(UINT32 *)pRetParams);
-							pRetParams = ((CHAR *)pRetParams) + 4; 
-
-							//This argument returns in network order
-							memcpy((UINT8 *)pRetParams, 
-								pucReceivedParams + ACCEPT_ADDRESS__OFFSET, sizeof(sockaddr));	
-							break;
-						}
-
-					case HCI_EVNT_RECV:
-					case HCI_EVNT_RECVFROM:
-						{
-							STREAM_TO_UINT32((CHAR *)pucReceivedParams,SL_RECEIVE_SD_OFFSET ,*(UINT32 *)pRetParams);
-							pRetParams = ((CHAR *)pRetParams) + 4;
-							STREAM_TO_UINT32((CHAR *)pucReceivedParams,SL_RECEIVE_NUM_BYTES_OFFSET,*(UINT32 *)pRetParams);
-							pRetParams = ((CHAR *)pRetParams) + 4;
-							STREAM_TO_UINT32((CHAR *)pucReceivedParams,SL_RECEIVE__FLAGS__OFFSET,*(UINT32 *)pRetParams);
-
-							if(((tBsdReadReturnParams *)pRetParams)->iNumberOfBytes == ERROR_SOCKET_INACTIVE)
-							{
-								set_socket_active_status(((tBsdReadReturnParams *)pRetParams)->iSocketDescriptor,SOCKET_STATUS_INACTIVE);
-							}
-							break;
-						}
-
-					case HCI_EVNT_SEND:
-					case HCI_EVNT_SENDTO:
-						{
-							STREAM_TO_UINT32((CHAR *)pucReceivedParams,SL_RECEIVE_SD_OFFSET ,*(UINT32 *)pRetParams);
-							pRetParams = ((CHAR *)pRetParams) + 4;
-							STREAM_TO_UINT32((CHAR *)pucReceivedParams,SL_RECEIVE_NUM_BYTES_OFFSET,*(UINT32 *)pRetParams);
-							pRetParams = ((CHAR *)pRetParams) + 4;
-
-							break;
-						}
-
-					case HCI_EVNT_SELECT:
-						{ 
-							STREAM_TO_UINT32((CHAR *)pucReceivedParams,SELECT_STATUS_OFFSET,*(UINT32 *)pRetParams);
-							pRetParams = ((CHAR *)pRetParams) + 4;
-							STREAM_TO_UINT32((CHAR *)pucReceivedParams,SELECT_READFD_OFFSET,*(UINT32 *)pRetParams);
-							pRetParams = ((CHAR *)pRetParams) + 4;
-							STREAM_TO_UINT32((CHAR *)pucReceivedParams,SELECT_WRITEFD_OFFSET,*(UINT32 *)pRetParams);
-							pRetParams = ((CHAR *)pRetParams) + 4;
-							STREAM_TO_UINT32((CHAR *)pucReceivedParams,SELECT_EXFD_OFFSET,*(UINT32 *)pRetParams);			
-							break;
-						}
-
-					case HCI_CMND_GETSOCKOPT:
-
-						STREAM_TO_UINT8(pucReceivedData, HCI_EVENT_STATUS_OFFSET,((tBsdGetSockOptReturnParams *)pRetParams)->iStatus);
-						//This argument returns in network order
-						memcpy((UINT8 *)pRetParams, pucReceivedParams, 4);
-						break;
-
-					case HCI_CMND_WLAN_IOCTL_GET_SCAN_RESULTS:
-
-						STREAM_TO_UINT32((CHAR *)pucReceivedParams,GET_SCAN_RESULTS_TABlE_COUNT_OFFSET,*(UINT32 *)pRetParams);
-						pRetParams = ((CHAR *)pRetParams) + 4;   					
-						STREAM_TO_UINT32((CHAR *)pucReceivedParams,GET_SCAN_RESULTS_SCANRESULT_STATUS_OFFSET,*(UINT32 *)pRetParams);
-						pRetParams = ((CHAR *)pRetParams) + 4;                                                        					
-						STREAM_TO_UINT16((CHAR *)pucReceivedParams,GET_SCAN_RESULTS_ISVALID_TO_SSIDLEN_OFFSET,*(UINT32 *)pRetParams);
-						pRetParams = ((CHAR *)pRetParams) + 2;   					
-						STREAM_TO_UINT16((CHAR *)pucReceivedParams,GET_SCAN_RESULTS_FRAME_TIME_OFFSET,*(UINT32 *)pRetParams);
-						pRetParams = ((CHAR *)pRetParams) + 2;  
-						memcpy((UINT8 *)pRetParams, (CHAR *)(pucReceivedParams + GET_SCAN_RESULTS_FRAME_TIME_OFFSET + 2), GET_SCAN_RESULTS_SSID_MAC_LENGTH);	
-						break;
-
-					case HCI_CMND_SIMPLE_LINK_START:
-						break;
-
-					case HCI_NETAPP_IPCONFIG:
-
-						//Read IP address
-						STREAM_TO_STREAM(RecvParams,RetParams,NETAPP_IPCONFIG_IP_LENGTH);
-						RecvParams += 4;
-
-						//Read subnet
-						STREAM_TO_STREAM(RecvParams,RetParams,NETAPP_IPCONFIG_IP_LENGTH);
-						RecvParams += 4;
-
-						//Read default GW
-						STREAM_TO_STREAM(RecvParams,RetParams,NETAPP_IPCONFIG_IP_LENGTH);
-						RecvParams += 4;
-
-						//Read DHCP server                                          	
-						STREAM_TO_STREAM(RecvParams,RetParams,NETAPP_IPCONFIG_IP_LENGTH);
-						RecvParams += 4;
-
-						//Read DNS server                                           
-						STREAM_TO_STREAM(RecvParams,RetParams,NETAPP_IPCONFIG_IP_LENGTH);
-						RecvParams += 4;
-
-						//Read Mac address                            	
-						STREAM_TO_STREAM(RecvParams,RetParams,NETAPP_IPCONFIG_MAC_LENGTH);
-						RecvParams += 6;
-
-						//Read SSID
-						STREAM_TO_STREAM(RecvParams,RetParams,NETAPP_IPCONFIG_SSID_LENGTH);
-
-					}
-				}
-
-				if (usReceivedEventOpcode == tSLInformation.usRxEventOpcode)
-				{
-					tSLInformation.usRxEventOpcode = 0;
-				}
-			}
-			else
-			{				
-				pucReceivedParams = pucReceivedData;
-				STREAM_TO_UINT8((CHAR *)pucReceivedData, HCI_PACKET_ARGSIZE_OFFSET, ucArgsize);
-
-				STREAM_TO_UINT16((CHAR *)pucReceivedData, HCI_PACKET_LENGTH_OFFSET, usLength);
-
-				// Data received: note that the only case where from and from length 
-				// are not null is in recv from, so fill the args accordingly
-				if (from)
-				{
-					STREAM_TO_UINT32((CHAR *)(pucReceivedData + HCI_DATA_HEADER_SIZE), BSD_RECV_FROM_FROMLEN_OFFSET, *(UINT32 *)fromlen);
-					memcpy(from, (pucReceivedData + HCI_DATA_HEADER_SIZE + BSD_RECV_FROM_FROM_OFFSET) ,*fromlen);
-				}
-
-				memcpy(pRetParams, pucReceivedParams + HCI_DATA_HEADER_SIZE + ucArgsize,
-					usLength - ucArgsize);
-
-				tSLInformation.usRxDataPending = 0;
-			}
-
-			tSLInformation.usEventOrDataReceived = 0;
-
-			SpiResumeSpi();
-
-			// Since we are going to TX - we need to handle this event after the 
-			// ResumeSPi since we need interrupts
-			if ((*pucReceivedData == HCI_TYPE_EVNT) &&
-				(usReceivedEventOpcode == HCI_EVNT_PATCHES_REQ))
-			{
-				hci_unsol_handle_patch_request((CHAR *)pucReceivedData);
-			}
-
-			if ((tSLInformation.usRxEventOpcode == 0) && (tSLInformation.usRxDataPending == 0))
-			{
-				return NULL;
-			}	
-		}
-	}
-
-}
-
-//*****************************************************************************
-//
-//!  hci_unsol_event_handler
-//!
-//!  @param  event_hdr   event header
-//!
-//!  @return             1 if event supported and handled
-//!                      0 if event is not supported
-//!
-//!  @brief              Handle unsolicited events
-//
-//*****************************************************************************
-INT32 hci_unsol_event_handler(CHAR *event_hdr)
-{
-	CHAR * data = NULL;
-	INT32 event_type;
-	UINT32 NumberOfReleasedPackets;
-	UINT32 NumberOfSentPackets;
-
-	STREAM_TO_UINT16(event_hdr, HCI_EVENT_OPCODE_OFFSET,event_type);
-
-	if (event_type & HCI_EVNT_UNSOL_BASE)
-	{
-		switch(event_type)
-		{
-
-		case HCI_EVNT_DATA_UNSOL_FREE_BUFF:
-			{
-				hci_event_unsol_flowcontrol_handler(event_hdr);
-
-				NumberOfReleasedPackets = tSLInformation.NumberOfReleasedPackets;
-				NumberOfSentPackets = tSLInformation.NumberOfSentPackets;
-
-				if (NumberOfReleasedPackets == NumberOfSentPackets)
-				{
-					if (tSLInformation.InformHostOnTxComplete)
-					{
-						tSLInformation.sWlanCB(HCI_EVENT_CC3000_CAN_SHUT_DOWN, NULL, 0);
-					}
-				}				
-				return 1;
-
-			}
-		}
-	}
-
-	if(event_type & HCI_EVNT_WLAN_UNSOL_BASE)
-	{           
-		switch(event_type)
-		{
-		case HCI_EVNT_WLAN_KEEPALIVE:
-		case HCI_EVNT_WLAN_UNSOL_CONNECT:
-		case HCI_EVNT_WLAN_UNSOL_DISCONNECT:
-		case HCI_EVNT_WLAN_UNSOL_INIT:
-		case HCI_EVNT_WLAN_ASYNC_SIMPLE_CONFIG_DONE:
-
-			if( tSLInformation.sWlanCB )
-			{
-				tSLInformation.sWlanCB(event_type, 0, 0);
-			}
-			break;
-
-		case HCI_EVNT_WLAN_UNSOL_DHCP:
-			{
-				UINT8	params[NETAPP_IPCONFIG_MAC_OFFSET + 1];	// extra byte is for the status
-				UINT8 *recParams = params;
-
-				data = (CHAR*)(event_hdr) + HCI_EVENT_HEADER_SIZE;
-
-				//Read IP address
-				STREAM_TO_STREAM(data,recParams,NETAPP_IPCONFIG_IP_LENGTH);
-				data += 4;
-				//Read subnet
-				STREAM_TO_STREAM(data,recParams,NETAPP_IPCONFIG_IP_LENGTH);
-				data += 4;
-				//Read default GW
-				STREAM_TO_STREAM(data,recParams,NETAPP_IPCONFIG_IP_LENGTH); 
-				data += 4;
-				//Read DHCP server  
-				STREAM_TO_STREAM(data,recParams,NETAPP_IPCONFIG_IP_LENGTH);     
-				data += 4;
-				//Read DNS server  
-				STREAM_TO_STREAM(data,recParams,NETAPP_IPCONFIG_IP_LENGTH); 
-				// read the status
-				STREAM_TO_UINT8(event_hdr, HCI_EVENT_STATUS_OFFSET, *recParams);
-
-
-				if( tSLInformation.sWlanCB )
-				{
-					tSLInformation.sWlanCB(event_type, (CHAR *)params, sizeof(params));
-				}
-			}
-			break;
-
-		case HCI_EVNT_WLAN_ASYNC_PING_REPORT:
-			{
-				netapp_pingreport_args_t params;			
-				data = (CHAR*)(event_hdr) + HCI_EVENT_HEADER_SIZE;			
-				STREAM_TO_UINT32(data, NETAPP_PING_PACKETS_SENT_OFFSET, params.packets_sent);			
-				STREAM_TO_UINT32(data, NETAPP_PING_PACKETS_RCVD_OFFSET, params.packets_received);			
-				STREAM_TO_UINT32(data, NETAPP_PING_MIN_RTT_OFFSET, params.min_round_time);		
-				STREAM_TO_UINT32(data, NETAPP_PING_MAX_RTT_OFFSET, params.max_round_time);	
-				STREAM_TO_UINT32(data, NETAPP_PING_AVG_RTT_OFFSET, params.avg_round_time);
-
-				if( tSLInformation.sWlanCB )
-				{
-					tSLInformation.sWlanCB(event_type, (CHAR *)&params, sizeof(params));
-				}
-			}
-			break;
-		case HCI_EVNT_BSD_TCP_CLOSE_WAIT:
-			{
-				data = (CHAR *)(event_hdr) + HCI_EVENT_HEADER_SIZE;
-				if( tSLInformation.sWlanCB )
-				{
-					//data[0] represents the socket id, for which FIN was received by remote.
-					//Upon receiving this event, the user can close the socket, or else the 
-					//socket will be closed after inacvitity timeout (by default 60 seconds)
-					tSLInformation.sWlanCB(event_type, data, 1);
-				}
-			}
-			break;
-
-			//'default' case which means "event not supported" 	
-		default: 
-			return (0);
-		}
-		return(1);
-	}
-
-	if ((event_type == HCI_EVNT_SEND) || (event_type == HCI_EVNT_SENDTO)
-		|| (event_type == HCI_EVNT_WRITE))
-	{
-		CHAR *pArg;
-		INT32 status;
-
-		pArg = M_BSD_RESP_PARAMS_OFFSET(event_hdr);
-		STREAM_TO_UINT32(pArg, BSD_RSP_PARAMS_STATUS_OFFSET,status);
-
-		if (ERROR_SOCKET_INACTIVE == status)
-		{
-			// The only synchronous event that can come from SL device in form of 
-			// command complete is "Command Complete" on data sent, in case SL device 
-			// was unable to transmit
-			STREAM_TO_UINT8(event_hdr, HCI_EVENT_STATUS_OFFSET, tSLInformation.slTransmitDataError);
-			update_socket_active_status(M_BSD_RESP_PARAMS_OFFSET(event_hdr));
-
-			return (1);
-		}
-		else
-			return (0);
-	}
-
-	//handle a case where unsolicited event arrived, but was not handled by any of the cases above
-	if ((event_type != tSLInformation.usRxEventOpcode) && (event_type != HCI_EVNT_PATCHES_REQ))
-	{
-		return(1);
-	}
-
-	return(0);
-}
-
-//*****************************************************************************
-//
-//!  hci_unsolicited_event_handler
-//!
-//!  @param None
-//!
-//!  @return         ESUCCESS if successful, EFAIL if an error occurred
-//!
-//!  @brief          Parse the incoming unsolicited event packets and issues 
-//!                  corresponding event handler.
-//
-//*****************************************************************************
-INT32 hci_unsolicited_event_handler(void)
-{
-	UINT32   res = 0;
-	UINT8 *pucReceivedData;
-
-	if (tSLInformation.usEventOrDataReceived != 0)
-	{
-		pucReceivedData = (tSLInformation.pucReceivedData);
-
-		if (*pucReceivedData == HCI_TYPE_EVNT)
-		{			
-
-			// In case unsolicited event received - here the handling finished
-			if (hci_unsol_event_handler((CHAR *)pucReceivedData) == 1)
-			{
-
-				// There was an unsolicited event received - we can release the buffer
-				// and clean the event received 
-				tSLInformation.usEventOrDataReceived = 0;
-
-				res = 1;
-				SpiResumeSpi();
-			}
-		}
-	}
-
-	return res;
-}
-
-//*****************************************************************************
-//
-//!  set_socket_active_status
-//!
-//!  @param Sd
-//!	 @param Status
-//!  @return         none
-//!
-//!  @brief          Check if the socket ID and status are valid and set 
-//!                  accordingly  the global socket status
-//
-//*****************************************************************************
-void set_socket_active_status(INT32 Sd, INT32 Status)
-{
-	if(M_IS_VALID_SD(Sd) && M_IS_VALID_STATUS(Status))
-	{
-		socket_active_status &= ~(1 << Sd);      /* clean socket's mask */
-		socket_active_status |= (Status << Sd); /* set new socket's mask */
-	}
-}
-
-
-//*****************************************************************************
-//
-//!  hci_event_unsol_flowcontrol_handler
-//!
-//!  @param  pEvent  pointer to the string contains parameters for IPERF
-//!  @return         ESUCCESS if successful, EFAIL if an error occurred
-//!
-//!  @brief  Called in case unsolicited event from type
-//!          HCI_EVNT_DATA_UNSOL_FREE_BUFF has received.
-//!				   Keep track on the number of packets transmitted and update the
-//!					 number of free buffer in the SL device.
-//
-//*****************************************************************************
-INT32 hci_event_unsol_flowcontrol_handler(CHAR *pEvent)
-{
-
-	INT32 temp, value;
-	UINT16 i;
-	UINT16  pusNumberOfHandles=0;
-	CHAR *pReadPayload;
-
-	STREAM_TO_UINT16((CHAR *)pEvent,HCI_EVENT_HEADER_SIZE,pusNumberOfHandles);
-	pReadPayload = ((CHAR *)pEvent +
-		HCI_EVENT_HEADER_SIZE + sizeof(pusNumberOfHandles));	
-	temp = 0;
-
-	for(i = 0; i < pusNumberOfHandles ; i++)
-	{
-		STREAM_TO_UINT16(pReadPayload, FLOW_CONTROL_EVENT_FREE_BUFFS_OFFSET, value);
-		temp += value;
-		pReadPayload += FLOW_CONTROL_EVENT_SIZE;  
-	}
-
-	tSLInformation.usNumberOfFreeBuffers += temp;
-	tSLInformation.NumberOfReleasedPackets += temp;
-
-	return(ESUCCESS);
-}
-
-//*****************************************************************************
-//
-//!  get_socket_active_status
-//!
-//!  @param  Sd  Socket IS
-//!  @return     Current status of the socket.   
-//!
-//!  @brief  Retrieve socket status
-//
-//*****************************************************************************
-
-INT32 get_socket_active_status(INT32 Sd)
-{
-	if(M_IS_VALID_SD(Sd))
-	{
-		return (socket_active_status & (1 << Sd)) ? SOCKET_STATUS_INACTIVE : SOCKET_STATUS_ACTIVE;
-	}
-	return SOCKET_STATUS_INACTIVE;
-}
-
-//*****************************************************************************
-//
-//!  update_socket_active_status
-//!
-//!  @param  resp_params  Socket IS
-//!  @return     Current status of the socket.   
-//!
-//!  @brief  Retrieve socket status
-//
-//*****************************************************************************
-void update_socket_active_status(CHAR *resp_params)
-{
-	INT32 status, sd;
-
-	STREAM_TO_UINT32(resp_params, BSD_RSP_PARAMS_SOCKET_OFFSET,sd);
-	STREAM_TO_UINT32(resp_params, BSD_RSP_PARAMS_STATUS_OFFSET,status);
-
-	if(ERROR_SOCKET_INACTIVE == status)
-	{
-		set_socket_active_status(sd, SOCKET_STATUS_INACTIVE);
-	}
-}
-
-
-//*****************************************************************************
-//
-//!  SimpleLinkWaitEvent
-//!
-//!  @param  usOpcode      command operation code
-//!  @param  pRetParams    command return parameters
-//!
-//!  @return               none
-//!
-//!  @brief                Wait for event, pass it to the hci_event_handler and
-//!                        update the event opcode in a global variable.
-//
-//*****************************************************************************
-
-void SimpleLinkWaitEvent(UINT16 usOpcode, void *pRetParams)
-{
-	// In the blocking implementation the control to caller will be returned only 
-	// after the end of current transaction
-	tSLInformation.usRxEventOpcode = usOpcode;
-	hci_event_handler(pRetParams, 0, 0);
-}
-
-//*****************************************************************************
-//
-//!  SimpleLinkWaitData
-//!
-//!  @param  pBuf       data buffer
-//!  @param  from       from information
-//!  @param  fromlen	from information length
-//!
-//!  @return               none
-//!
-//!  @brief                Wait for data, pass it to the hci_event_handler
-//! 					   and update in a global variable that there is 
-//!						   data to read.
-//
-//*****************************************************************************
-
-void SimpleLinkWaitData(UINT8 *pBuf, UINT8 *from, UINT8 *fromlen)
-{
-	// In the blocking implementation the control to caller will be returned only 
-	// after the end of current transaction, i.e. only after data will be received
-	tSLInformation.usRxDataPending = 1;
-	hci_event_handler(pBuf, from, fromlen);
-}
-
-//*****************************************************************************
-//
-// Close the Doxygen group.
-//! @}
-//
-//*****************************************************************************
diff --git a/drivers/cc3000/src/hci.c b/drivers/cc3000/src/hci.c
deleted file mode 100644
index 4391692b8bc2b..0000000000000
--- a/drivers/cc3000/src/hci.c
+++ /dev/null
@@ -1,225 +0,0 @@
-/*****************************************************************************
-*
-*  hci.c  - CC3000 Host Driver Implementation.
-*  Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/
-*
-*  Redistribution and use in source and binary forms, with or without
-*  modification, are permitted provided that the following conditions
-*  are met:
-*
-*    Redistributions of source code must retain the above copyright
-*    notice, this list of conditions and the following disclaimer.
-*
-*    Redistributions in binary form must reproduce the above copyright
-*    notice, this list of conditions and the following disclaimer in the
-*    documentation and/or other materials provided with the   
-*    distribution.
-*
-*    Neither the name of Texas Instruments Incorporated nor the names of
-*    its contributors may be used to endorse or promote products derived
-*    from this software without specific prior written permission.
-*
-*  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
-*  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
-*  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-*  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
-*  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
-*  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
-*  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-*  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-*  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-*  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
-*  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*
-*****************************************************************************/
-
-//*****************************************************************************
-//
-//! \addtogroup hci_app
-//! @{
-//
-//*****************************************************************************
-
-#include <string.h>
-#include "cc3000_common.h"
-#include "hci.h"
-#include "ccspi.h"
-#include "evnt_handler.h"
-#include "wlan.h"
-
-#define SL_PATCH_PORTION_SIZE		(1000)
-
-
-//*****************************************************************************
-//
-//!  hci_command_send
-//!
-//!  @param  usOpcode     command operation code
-//!  @param  pucBuff      pointer to the command's arguments buffer
-//!  @param  ucArgsLength length of the arguments
-//!
-//!  @return              none
-//!
-//!  @brief               Initiate an HCI command.
-//
-//*****************************************************************************
-UINT16 hci_command_send(UINT16 usOpcode, UINT8 *pucBuff, UINT8 ucArgsLength)
-{ 
-	UINT8 *stream;
-
-	stream = (pucBuff + SPI_HEADER_SIZE);
-
-	UINT8_TO_STREAM(stream, HCI_TYPE_CMND);
-	stream = UINT16_TO_STREAM(stream, usOpcode);
-	UINT8_TO_STREAM(stream, ucArgsLength);
-
-	//Update the opcode of the event we will be waiting for
-	SpiWrite(pucBuff, ucArgsLength + SIMPLE_LINK_HCI_CMND_HEADER_SIZE);
-
-	return(0);
-}
-
-//*****************************************************************************
-//
-//!  hci_data_send
-//!
-//!  @param  usOpcode        command operation code
-//!	 @param  ucArgs					 pointer to the command's arguments buffer
-//!  @param  usArgsLength    length of the arguments
-//!  @param  ucTail          pointer to the data buffer
-//!  @param  usTailLength    buffer length
-//!
-//!  @return none
-//!
-//!  @brief              Initiate an HCI data write operation
-//
-//*****************************************************************************
-INT32 hci_data_send(UINT8 ucOpcode, 
-	UINT8 *ucArgs,
-	UINT16 usArgsLength, 
-	UINT16 usDataLength,
-	const UINT8 *ucTail,
-	UINT16 usTailLength)
-{
-	UINT8 *stream;
-
-	stream = ((ucArgs) + SPI_HEADER_SIZE);
-
-	UINT8_TO_STREAM(stream, HCI_TYPE_DATA);
-	UINT8_TO_STREAM(stream, ucOpcode);
-	UINT8_TO_STREAM(stream, usArgsLength);
-	stream = UINT16_TO_STREAM(stream, usArgsLength + usDataLength + usTailLength);
-
-	// Send the packet over the SPI
-	SpiWrite(ucArgs, SIMPLE_LINK_HCI_DATA_HEADER_SIZE + usArgsLength + usDataLength + usTailLength);
-
-	return(ESUCCESS);
-}
-
-
-//*****************************************************************************
-//
-//!  hci_data_command_send
-//!
-//!  @param  usOpcode      command operation code
-//!  @param  pucBuff       pointer to the data buffer
-//!  @param  ucArgsLength  arguments length
-//!  @param  ucDataLength  data length
-//!
-//!  @return none
-//!
-//!  @brief              Prepeare HCI header and initiate an HCI data write operation
-//
-//*****************************************************************************
-void hci_data_command_send(UINT16 usOpcode, UINT8 *pucBuff, UINT8 ucArgsLength,UINT16 ucDataLength)
-{ 
-	UINT8 *stream = (pucBuff + SPI_HEADER_SIZE);
-
-	UINT8_TO_STREAM(stream, HCI_TYPE_DATA);
-	UINT8_TO_STREAM(stream, usOpcode);
-	UINT8_TO_STREAM(stream, ucArgsLength);
-	stream = UINT16_TO_STREAM(stream, ucArgsLength + ucDataLength);
-
-	// Send the command over SPI on data channel
-	SpiWrite(pucBuff, ucArgsLength + ucDataLength + SIMPLE_LINK_HCI_DATA_CMND_HEADER_SIZE);
-
-	return;
-}
-
-//*****************************************************************************
-//
-//!  hci_patch_send
-//!
-//!  @param  usOpcode      command operation code
-//!  @param  pucBuff       pointer to the command's arguments buffer
-//!  @param  patch         pointer to patch content buffer 
-//!  @param  usDataLength  data length
-//!
-//!  @return              none
-//!
-//!  @brief               Prepeare HCI header and initiate an HCI patch write operation
-//
-//*****************************************************************************
-void hci_patch_send(UINT8 ucOpcode, UINT8 *pucBuff, CHAR *patch, UINT16 usDataLength)
-{ 
-	UINT8 *data_ptr = (pucBuff + SPI_HEADER_SIZE);
-	UINT16 usTransLength;
-	UINT8 *stream = (pucBuff + SPI_HEADER_SIZE);
-
-	UINT8_TO_STREAM(stream, HCI_TYPE_PATCH);
-	UINT8_TO_STREAM(stream, ucOpcode);
-	stream = UINT16_TO_STREAM(stream, usDataLength + SIMPLE_LINK_HCI_PATCH_HEADER_SIZE);
-
-	if (usDataLength <= SL_PATCH_PORTION_SIZE)
-	{
-		UINT16_TO_STREAM(stream, usDataLength);
-		stream = UINT16_TO_STREAM(stream, usDataLength);
-		memcpy((pucBuff + SPI_HEADER_SIZE) + HCI_PATCH_HEADER_SIZE, patch, usDataLength);
-
-		// Update the opcode of the event we will be waiting for
-		SpiWrite(pucBuff, usDataLength + HCI_PATCH_HEADER_SIZE);
-	}
-	else
-	{
-
-		usTransLength = (usDataLength/SL_PATCH_PORTION_SIZE);
-		UINT16_TO_STREAM(stream, usDataLength + SIMPLE_LINK_HCI_PATCH_HEADER_SIZE + usTransLength*SIMPLE_LINK_HCI_PATCH_HEADER_SIZE);
-		stream = UINT16_TO_STREAM(stream, SL_PATCH_PORTION_SIZE);
-		memcpy(pucBuff + SPI_HEADER_SIZE + HCI_PATCH_HEADER_SIZE, patch, SL_PATCH_PORTION_SIZE);
-		usDataLength -= SL_PATCH_PORTION_SIZE;
-		patch += SL_PATCH_PORTION_SIZE;
-
-		// Update the opcode of the event we will be waiting for
-		SpiWrite(pucBuff, SL_PATCH_PORTION_SIZE + HCI_PATCH_HEADER_SIZE);
-
-		while (usDataLength)
-		{
-			if (usDataLength <= SL_PATCH_PORTION_SIZE)
-			{
-				usTransLength = usDataLength;
-				usDataLength = 0;
-
-			}
-			else
-			{
-				usTransLength = SL_PATCH_PORTION_SIZE;
-				usDataLength -= usTransLength;
-			}
-
-			*(UINT16 *)data_ptr = usTransLength;
-			memcpy(data_ptr + SIMPLE_LINK_HCI_PATCH_HEADER_SIZE, patch, usTransLength);
-			patch += usTransLength;
-
-			// Update the opcode of the event we will be waiting for
-			SpiWrite((UINT8 *)data_ptr, usTransLength + sizeof(usTransLength));
-		}
-	}
-}
-
-//*****************************************************************************
-//
-// Close the Doxygen group.
-//! @}
-//
-//
-//*****************************************************************************
diff --git a/drivers/cc3000/src/inet_ntop.c b/drivers/cc3000/src/inet_ntop.c
deleted file mode 100644
index 83242efa00b07..0000000000000
--- a/drivers/cc3000/src/inet_ntop.c
+++ /dev/null
@@ -1,200 +0,0 @@
-/*
- * Copyright (C) 1996-2001  Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM
- * DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL
- * INTERNET SOFTWARE CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT,
- * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include <string.h>
-#include "cc3000_common.h"
-#include "socket.h"
-#include "inet_ntop.h"
-
-// We can't include stdio.h because it defines _types_fd_set, but we
-// need to use the CC3000 version of this type.  So we must provide
-// our own declaration of snprintf.  Grrr.
-int snprintf(char *str, size_t size, const char *fmt, ...);
-
-#define IN6ADDRSZ       16
-#define INADDRSZ         4
-#define INT16SZ          2
-
-#define ENOSPC          (28)
-#define EAFNOSUPPORT    (106)
-#define SET_ERRNO(err)  (CC3000_EXPORT(errno)=-err)
-
-/*
- * Format an IPv4 address, more or less like inet_ntoa().
- *
- * Returns `dst' (as a const)
- * Note:
- *  - uses no statics
- *  - takes a unsigned char* not an in_addr as input
- */
-static char *inet_ntop4 (const unsigned char *src, char *dst, size_t size)
-{
-  size_t len;
-  char tmp[sizeof "255.255.255.255"];
-
-  tmp[0] = '\0';
-  (void)snprintf(tmp, sizeof(tmp), "%d.%d.%d.%d",
-          ((int)((unsigned char)src[3])) & 0xff,
-          ((int)((unsigned char)src[2])) & 0xff,
-          ((int)((unsigned char)src[1])) & 0xff,
-          ((int)((unsigned char)src[0])) & 0xff);
-
-  len = strlen(tmp);
-  if(len == 0 || len >= size)
-  {
-    SET_ERRNO(ENOSPC);
-    return (NULL);
-  }
-  strcpy(dst, tmp);
-  return dst;
-}
-
-#ifdef ENABLE_IPV6
-/*
- * Convert IPv6 binary address into presentation (printable) format.
- */
-static char *inet_ntop6 (const unsigned char *src, char *dst, size_t size)
-{
-  /*
-   * Note that int32_t and int16_t need only be "at least" large enough
-   * to contain a value of the specified size.  On some systems, like
-   * Crays, there is no such thing as an integer variable with 16 bits.
-   * Keep this in mind if you think this function should have been coded
-   * to use pointer overlays.  All the world's not a VAX.
-   */
-  char tmp[sizeof("ffff:ffff:ffff:ffff:ffff:ffff:255.255.255.255")];
-  char *tp;
-  struct {
-    long base;
-    long len;
-  } best, cur;
-  unsigned long words[IN6ADDRSZ / INT16SZ];
-  int i;
-
-  /* Preprocess:
-   *  Copy the input (bytewise) array into a wordwise array.
-   *  Find the longest run of 0x00's in src[] for :: shorthanding.
-   */
-  memset(words, '\0', sizeof(words));
-  for (i = 0; i < IN6ADDRSZ; i++)
-      words[i/2] |= (src[i] << ((1 - (i % 2)) << 3));
-
-  best.base = -1;
-  cur.base  = -1;
-  best.len = 0;
-  cur.len = 0;
-
-  for (i = 0; i < (IN6ADDRSZ / INT16SZ); i++)
-  {
-    if(words[i] == 0)
-    {
-      if(cur.base == -1)
-        cur.base = i, cur.len = 1;
-      else
-        cur.len++;
-    }
-    else if(cur.base != -1)
-    {
-      if(best.base == -1 || cur.len > best.len)
-         best = cur;
-      cur.base = -1;
-    }
-  }
-  if((cur.base != -1) && (best.base == -1 || cur.len > best.len))
-     best = cur;
-  if(best.base != -1 && best.len < 2)
-     best.base = -1;
-
-  /* Format the result.
-   */
-  tp = tmp;
-  for (i = 0; i < (IN6ADDRSZ / INT16SZ); i++)
-  {
-    /* Are we inside the best run of 0x00's?
-     */
-    if(best.base != -1 && i >= best.base && i < (best.base + best.len))
-    {
-      if(i == best.base)
-         *tp++ = ':';
-      continue;
-    }
-
-    /* Are we following an initial run of 0x00s or any real hex?
-     */
-    if(i != 0)
-       *tp++ = ':';
-
-    /* Is this address an encapsulated IPv4?
-     */
-    if(i == 6 && best.base == 0 &&
-        (best.len == 6 || (best.len == 5 && words[5] == 0xffff)))
-    {
-      if(!inet_ntop4(src+12, tp, sizeof(tmp) - (tp - tmp)))
-      {
-        SET_ERRNO(ENOSPC);
-        return (NULL);
-      }
-      tp += strlen(tp);
-      break;
-    }
-    tp += snprintf(tp, 5, "%lx", words[i]);
-  }
-
-  /* Was it a trailing run of 0x00's?
-   */
-  if(best.base != -1 && (best.base + best.len) == (IN6ADDRSZ / INT16SZ))
-     *tp++ = ':';
-  *tp++ = '\0';
-
-  /* Check for overflow, copy, and we're done.
-   */
-  if((size_t)(tp - tmp) > size)
-  {
-    SET_ERRNO(ENOSPC);
-    return (NULL);
-  }
-  strcpy(dst, tmp);
-  return dst;
-}
-#endif  /* ENABLE_IPV6 */
-
-/*
- * Convert a network format address to presentation format.
- *
- * Returns pointer to presentation format address (`buf').
- * Returns NULL on error and errno set with the specific
- * error, EAFNOSUPPORT or ENOSPC.
- *
- * On Windows we store the error in the thread errno, not
- * in the winsock error code. This is to avoid loosing the
- * actual last winsock error. So use macro ERRNO to fetch the
- * errno this funtion sets when returning NULL, not SOCKERRNO.
- */
-char *inet_ntop(int af, const void *src, char *buf, size_t size)
-{
-  switch (af) {
-  case AF_INET:
-    return inet_ntop4((const unsigned char*)src, buf, size);
-#ifdef ENABLE_IPV6
-  case AF_INET6:
-    return inet_ntop6((const unsigned char*)src, buf, size);
-#endif
-  default:
-    SET_ERRNO(EAFNOSUPPORT);
-    return NULL;
-  }
-}
diff --git a/drivers/cc3000/src/inet_pton.c b/drivers/cc3000/src/inet_pton.c
deleted file mode 100644
index 5f5ae5f9d7f1e..0000000000000
--- a/drivers/cc3000/src/inet_pton.c
+++ /dev/null
@@ -1,216 +0,0 @@
-/* This is from the BIND 4.9.4 release, modified to compile by itself */
-
-/* Copyright (c) 1996 by Internet Software Consortium.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- */
-
-#include <string.h>
-#include "cc3000_common.h"
-#include "socket.h"
-#include "inet_pton.h"
-
-#define IN6ADDRSZ       16
-#define INADDRSZ         4
-#define INT16SZ          2
-
-static int      inet_pton4(const char *src, unsigned char *dst);
-#ifdef ENABLE_IPV6
-static int      inet_pton6(const char *src, unsigned char *dst);
-#endif
-
-#define EAFNOSUPPORT (106)
-#define SET_ERRNO(err) (CC3000_EXPORT(errno)=-err)
-
-/* int
- * inet_pton(af, src, dst)
- *      convert from presentation format (which usually means ASCII printable)
- *      to network format (which is usually some kind of binary format).
- * return:
- *      1 if the address was valid for the specified address family
- *      0 if the address wasn't valid (`dst' is untouched in this case)
- *      -1 if some other error occurred (`dst' is untouched in this case, too)
- * notice:
- *      On Windows we store the error in the thread errno, not
- *      in the winsock error code. This is to avoid loosing the
- *      actual last winsock error. So use macro ERRNO to fetch the
- *      errno this funtion sets when returning (-1), not SOCKERRNO.
- * author:
- *      Paul Vixie, 1996.
- */
-int inet_pton(int af, const char *src, void *dst)
-{
-  switch (af) {
-  case AF_INET:
-    return (inet_pton4(src, (unsigned char *)dst));
-#ifdef ENABLE_IPV6
-  case AF_INET6:
-    return (inet_pton6(src, (unsigned char *)dst));
-#endif
-  default:
-    SET_ERRNO(EAFNOSUPPORT);
-    return (-1);
-  }
-  /* NOTREACHED */
-}
-
-/* int
- * inet_pton4(src, dst)
- *      like inet_aton() but without all the hexadecimal and shorthand.
- * return:
- *      1 if `src' is a valid dotted quad, else 0.
- * notice:
- *      does not touch `dst' unless it's returning 1.
- * author:
- *      Paul Vixie, 1996.
- */
-static int inet_pton4(const char *src, unsigned char *dst)
-{
-  static const char digits[] = "0123456789";
-  int saw_digit, octets, ch;
-  unsigned char tmp[INADDRSZ], *tp;
-
-  saw_digit = 0;
-  octets = 0;
-  tp = tmp;
-  *tp = 0;
-  while((ch = *src++) != '\0') {
-    const char *pch;
-
-    if((pch = strchr(digits, ch)) != NULL) {
-      unsigned int val = *tp * 10 + (unsigned int)(pch - digits);
-
-      if(saw_digit && *tp == 0)
-        return (0);
-      if(val > 255)
-        return (0);
-      *tp = (unsigned char)val;
-      if(! saw_digit) {
-        if(++octets > 4)
-          return (0);
-        saw_digit = 1;
-      }
-    }
-    else if(ch == '.' && saw_digit) {
-      if(octets == 4)
-        return (0);
-      *++tp = 0;
-      saw_digit = 0;
-    }
-    else
-      return (0);
-  }
-  if(octets < 4)
-    return (0);
-  memcpy(dst, tmp, INADDRSZ);
-  return (1);
-}
-
-#ifdef ENABLE_IPV6
-/* int
- * inet_pton6(src, dst)
- *      convert presentation level address to network order binary form.
- * return:
- *      1 if `src' is a valid [RFC1884 2.2] address, else 0.
- * notice:
- *      (1) does not touch `dst' unless it's returning 1.
- *      (2) :: in a full address is silently ignored.
- * credit:
- *      inspired by Mark Andrews.
- * author:
- *      Paul Vixie, 1996.
- */
-static int inet_pton6(const char *src, unsigned char *dst)
-{
-  static const char xdigits_l[] = "0123456789abcdef",
-    xdigits_u[] = "0123456789ABCDEF";
-  unsigned char tmp[IN6ADDRSZ], *tp, *endp, *colonp;
-  const char *xdigits, *curtok;
-  int ch, saw_xdigit;
-  unsigned int val;
-
-  memset((tp = tmp), 0, IN6ADDRSZ);
-  endp = tp + IN6ADDRSZ;
-  colonp = NULL;
-  /* Leading :: requires some special handling. */
-  if(*src == ':')
-    if(*++src != ':')
-      return (0);
-  curtok = src;
-  saw_xdigit = 0;
-  val = 0;
-  while((ch = *src++) != '\0') {
-    const char *pch;
-
-    if((pch = strchr((xdigits = xdigits_l), ch)) == NULL)
-      pch = strchr((xdigits = xdigits_u), ch);
-    if(pch != NULL) {
-      val <<= 4;
-      val |= (pch - xdigits);
-      if(++saw_xdigit > 4)
-        return (0);
-      continue;
-    }
-    if(ch == ':') {
-      curtok = src;
-      if(!saw_xdigit) {
-        if(colonp)
-          return (0);
-        colonp = tp;
-        continue;
-      }
-      if(tp + INT16SZ > endp)
-        return (0);
-      *tp++ = (unsigned char) (val >> 8) & 0xff;
-      *tp++ = (unsigned char) val & 0xff;
-      saw_xdigit = 0;
-      val = 0;
-      continue;
-    }
-    if(ch == '.' && ((tp + INADDRSZ) <= endp) &&
-        inet_pton4(curtok, tp) > 0) {
-      tp += INADDRSZ;
-      saw_xdigit = 0;
-      break;    /* '\0' was seen by inet_pton4(). */
-    }
-    return (0);
-  }
-  if(saw_xdigit) {
-    if(tp + INT16SZ > endp)
-      return (0);
-    *tp++ = (unsigned char) (val >> 8) & 0xff;
-    *tp++ = (unsigned char) val & 0xff;
-  }
-  if(colonp != NULL) {
-    /*
-     * Since some memmove()'s erroneously fail to handle
-     * overlapping regions, we'll do the shift by hand.
-     */
-    const long n = tp - colonp;
-    long i;
-
-    if(tp == endp)
-      return (0);
-    for (i = 1; i <= n; i++) {
-      endp[- i] = colonp[n - i];
-      colonp[n - i] = 0;
-    }
-    tp = endp;
-  }
-  if(tp != endp)
-    return (0);
-  memcpy(dst, tmp, IN6ADDRSZ);
-  return (1);
-}
-#endif /* ENABLE_IPV6 */
diff --git a/drivers/cc3000/src/netapp.c b/drivers/cc3000/src/netapp.c
deleted file mode 100644
index a6f60feda0d4c..0000000000000
--- a/drivers/cc3000/src/netapp.c
+++ /dev/null
@@ -1,459 +0,0 @@
-/*****************************************************************************
-*
-*  netapp.c  - CC3000 Host Driver Implementation.
-*  Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/
-*
-*  Redistribution and use in source and binary forms, with or without
-*  modification, are permitted provided that the following conditions
-*  are met:
-*
-*    Redistributions of source code must retain the above copyright
-*    notice, this list of conditions and the following disclaimer.
-*
-*    Redistributions in binary form must reproduce the above copyright
-*    notice, this list of conditions and the following disclaimer in the
-*    documentation and/or other materials provided with the   
-*    distribution.
-*
-*    Neither the name of Texas Instruments Incorporated nor the names of
-*    its contributors may be used to endorse or promote products derived
-*    from this software without specific prior written permission.
-*
-*  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
-*  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
-*  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-*  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
-*  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
-*  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
-*  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-*  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-*  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-*  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
-*  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*
-*****************************************************************************/
-
-#include <string.h>
-#include "netapp.h"
-#include "hci.h"
-#include "socket.h"
-#include "evnt_handler.h"
-#include "nvmem.h"
-
-#define MIN_TIMER_VAL_SECONDS      10
-#define MIN_TIMER_SET(t)    if ((0 != t) && (t < MIN_TIMER_VAL_SECONDS)) \
-							{ \
-							t = MIN_TIMER_VAL_SECONDS; \
-							}
-
-
-#define NETAPP_DHCP_PARAMS_LEN 				(20)
-#define NETAPP_SET_TIMER_PARAMS_LEN 		(20)
-#define NETAPP_SET_DEBUG_LEVEL_PARAMS_LEN	(4)
-#define NETAPP_PING_SEND_PARAMS_LEN			(16)
-
-
-//*****************************************************************************
-//
-//!  netapp_config_mac_adrress
-//!
-//!  @param  mac   device mac address, 6 bytes. Saved: yes 
-//!
-//!  @return       return on success 0, otherwise error.
-//!
-//!  @brief        Configure device MAC address and store it in NVMEM. 
-//!                The value of the MAC address configured through the API will
-//!		             be stored in CC3000 non volatile memory, thus preserved 
-//!                over resets.
-//
-//*****************************************************************************
-INT32 netapp_config_mac_adrress(UINT8 * mac)
-{
-	return  nvmem_set_mac_address(mac);
-}
-
-//*****************************************************************************
-//
-//!  netapp_dhcp
-//!
-//!  @param  aucIP               device mac address, 6 bytes. Saved: yes 
-//!  @param  aucSubnetMask       device mac address, 6 bytes. Saved: yes 
-//!  @param  aucDefaultGateway   device mac address, 6 bytes. Saved: yes 
-//!  @param  aucDNSServer        device mac address, 6 bytes. Saved: yes 
-//!
-//!  @return       return on success 0, otherwise error.
-//!
-//!  @brief       netapp_dhcp is used to configure the network interface, 
-//!               static or dynamic (DHCP).\n In order to activate DHCP mode, 
-//!               aucIP, aucSubnetMask, aucDefaultGateway must be 0.
-//!               The default mode of CC3000 is DHCP mode.
-//!               Note that the configuration is saved in non volatile memory
-//!               and thus preserved over resets.
-//!	 
-//! @note         If the mode is altered a reset of CC3000 device is required 
-//!               in order to apply changes.\nAlso note that asynchronous event 
-//!               of DHCP_EVENT, which is generated when an IP address is 
-//!               allocated either by the DHCP server or due to static 
-//!               allocation is generated only upon a connection to the 
-//!               AP was established. 
-//!
-//*****************************************************************************
-INT32 netapp_dhcp(UINT32 *aucIP, UINT32 *aucSubnetMask,UINT32 *aucDefaultGateway, UINT32 *aucDNSServer)
-{
-	INT8 scRet;
-	UINT8 *ptr;
-	UINT8 *args;
-
-	scRet = EFAIL;
-	ptr = tSLInformation.pucTxCommandBuffer;
-	args = (ptr + HEADERS_SIZE_CMD);
-
-	// Fill in temporary command buffer
-	ARRAY_TO_STREAM(args,aucIP,4);
-	ARRAY_TO_STREAM(args,aucSubnetMask,4);
-	ARRAY_TO_STREAM(args,aucDefaultGateway,4);
-	args = UINT32_TO_STREAM(args, 0);
-	ARRAY_TO_STREAM(args,aucDNSServer,4);
-
-	// Initiate a HCI command
-	hci_command_send(HCI_NETAPP_DHCP, ptr, NETAPP_DHCP_PARAMS_LEN);
-
-	// Wait for command complete event
-	SimpleLinkWaitEvent(HCI_NETAPP_DHCP, &scRet);
-
-	return(scRet);
-}
-
-
-//*****************************************************************************
-//
-//!  netapp_timeout_values
-//!
-//!  @param  aucDHCP    DHCP lease time request, also impact 
-//!                     the DHCP renew timeout. Range: [0-0xffffffff] seconds,
-//!                     0 or 0xffffffff == infinity lease timeout.
-//!                     Resolution:10 seconds. Influence: only after 
-//!                     reconnecting to the AP. 
-//!                     Minimal bound value: MIN_TIMER_VAL_SECONDS - 10 seconds.
-//!                     The parameter is saved into the CC3000 NVMEM. 
-//!                     The default value on CC3000 is 14400 seconds.
-//!	 
-//!  @param  aucARP     ARP refresh timeout, if ARP entry is not updated by
-//!                     incoming packet, the ARP entry will be  deleted by
-//!                     the end of the timeout. 
-//!                     Range: [0-0xffffffff] seconds, 0 == infinity ARP timeout
-//!                     Resolution: 10 seconds. Influence: on runtime.
-//!                     Minimal bound value: MIN_TIMER_VAL_SECONDS - 10 seconds
-//!                     The parameter is saved into the CC3000 NVMEM. 
-//!	                    The default value on CC3000 is 3600 seconds.
-//!
-//!  @param  aucKeepalive   Keepalive event sent by the end of keepalive timeout
-//!                         Range: [0-0xffffffff] seconds, 0 == infinity timeout
-//!                         Resolution: 10 seconds.
-//!                         Influence: on runtime.
-//!                         Minimal bound value: MIN_TIMER_VAL_SECONDS - 10 sec
-//!                         The parameter is saved into the CC3000 NVMEM. 
-//!                         The default value on CC3000 is 10 seconds.
-//!
-//!  @param  aucInactivity   Socket inactivity timeout, socket timeout is
-//!                          refreshed by incoming or outgoing packet, by the
-//!                          end of the socket timeout the socket will be closed
-//!                          Range: [0-0xffffffff] sec, 0 == infinity timeout.
-//!                          Resolution: 10 seconds. Influence: on runtime.
-//!                          Minimal bound value: MIN_TIMER_VAL_SECONDS - 10 sec
-//!                          The parameter is saved into the CC3000 NVMEM. 
-//!	                         The default value on CC3000 is 60 seconds.
-//!
-//!  @return       return on success 0, otherwise error.
-//!
-//!  @brief       Set new timeout values. Function set new timeout values for: 
-//!               DHCP lease timeout, ARP  refresh timeout, keepalive event 
-//!               timeout and socket inactivity timeout 
-//!	 
-//! @note         If a parameter set to non zero value which is less than 10s,
-//!               it will be set automatically to 10s.
-//!
-//*****************************************************************************
-
-#ifndef CC3000_TINY_DRIVER
-INT32 netapp_timeout_values(UINT32 *aucDHCP, UINT32 *aucARP,UINT32 *aucKeepalive,	UINT32 *aucInactivity)
-{
-	INT8 scRet;
-	UINT8 *ptr;
-	UINT8 *args;
-
-	scRet = EFAIL;
-	ptr = tSLInformation.pucTxCommandBuffer;
-	args = (ptr + HEADERS_SIZE_CMD);
-
-	// Set minimal values of timers 
-	MIN_TIMER_SET(*aucDHCP)
-		MIN_TIMER_SET(*aucARP)
-		MIN_TIMER_SET(*aucKeepalive)
-		MIN_TIMER_SET(*aucInactivity)
-
-		// Fill in temporary command buffer
-		args = UINT32_TO_STREAM(args, *aucDHCP);
-	args = UINT32_TO_STREAM(args, *aucARP);
-	args = UINT32_TO_STREAM(args, *aucKeepalive);
-	args = UINT32_TO_STREAM(args, *aucInactivity);
-
-	// Initiate a HCI command
-	hci_command_send(HCI_NETAPP_SET_TIMERS, ptr, NETAPP_SET_TIMER_PARAMS_LEN);
-
-	// Wait for command complete event
-	SimpleLinkWaitEvent(HCI_NETAPP_SET_TIMERS, &scRet);
-
-	return(scRet);
-}
-#endif
-
-
-//*****************************************************************************
-//
-//!  netapp_ping_send
-//!
-//!  @param  ip              destination IP address
-//!  @param  pingAttempts    number of echo requests to send
-//!  @param  pingSize        send buffer size which may be up to 1400 bytes 
-//!  @param  pingTimeout     Time to wait for a response,in milliseconds.
-//!
-//!  @return       return on success 0, otherwise error.
-//!
-//!  @brief       send ICMP ECHO_REQUEST to network hosts 
-//!	 
-//! @note         If an operation finished successfully asynchronous ping report 
-//!               event will be generated. The report structure is as defined
-//!               by structure netapp_pingreport_args_t.
-//!
-//! @warning      Calling this function while a previous Ping Requests are in 
-//!               progress will stop the previous ping request.
-//*****************************************************************************
-
-#ifndef CC3000_TINY_DRIVER
-INT32
-	netapp_ping_send(UINT32 *ip, UINT32 ulPingAttempts, UINT32 ulPingSize, UINT32 ulPingTimeout)
-{
-	INT8 scRet;
-	UINT8 *ptr, *args;
-
-	scRet = EFAIL;
-	ptr = tSLInformation.pucTxCommandBuffer;
-	args = (ptr + HEADERS_SIZE_CMD);
-
-	// Fill in temporary command buffer
-	args = UINT32_TO_STREAM(args, *ip);
-	args = UINT32_TO_STREAM(args, ulPingAttempts);
-	args = UINT32_TO_STREAM(args, ulPingSize);
-	args = UINT32_TO_STREAM(args, ulPingTimeout);
-
-	// Initiate a HCI command
-	hci_command_send(HCI_NETAPP_PING_SEND, ptr, NETAPP_PING_SEND_PARAMS_LEN);
-
-	// Wait for command complete event
-	SimpleLinkWaitEvent(HCI_NETAPP_PING_SEND, &scRet);
-
-	return(scRet);
-}
-#endif
-
-//*****************************************************************************
-//
-//!  netapp_ping_report
-//!
-//!  @param  none
-//!
-//!  @return  none
-//!
-//!  @brief   Request for ping status. This API triggers the CC3000 to send 
-//!           asynchronous events: HCI_EVNT_WLAN_ASYNC_PING_REPORT.
-//!           This event will carry  the report structure:
-//!           netapp_pingreport_args_t. This structure is filled in with ping
-//!           results up till point of triggering API.
-//!           netapp_pingreport_args_t:\n packets_sent - echo sent,
-//!           packets_received - echo reply, min_round_time - minimum
-//!           round time, max_round_time - max round time,
-//!           avg_round_time - average round time
-//!	 
-//! @note     When a ping operation is not active, the returned structure 
-//!           fields are 0.
-//!
-//*****************************************************************************
-
-
-#ifndef CC3000_TINY_DRIVER
-void netapp_ping_report()
-{
-	UINT8 *ptr;
-	ptr = tSLInformation.pucTxCommandBuffer;
-	INT8 scRet;
-
-	scRet = EFAIL;
-
-	// Initiate a HCI command
-	hci_command_send(HCI_NETAPP_PING_REPORT, ptr, 0);
-
-	// Wait for command complete event
-	SimpleLinkWaitEvent(HCI_NETAPP_PING_REPORT, &scRet); 
-}
-#endif
-
-//*****************************************************************************
-//
-//!  netapp_ping_stop
-//!
-//!  @param  none
-//!
-//!  @return  On success, zero is returned. On error, -1 is returned.      
-//!
-//!  @brief   Stop any ping request.
-//!	 
-//!
-//*****************************************************************************
-
-#ifndef CC3000_TINY_DRIVER
-INT32 netapp_ping_stop()
-{
-	INT8 scRet;
-	UINT8 *ptr;
-
-	scRet = EFAIL;
-	ptr = tSLInformation.pucTxCommandBuffer;
-
-	// Initiate a HCI command
-	hci_command_send(HCI_NETAPP_PING_STOP, ptr, 0);
-
-	// Wait for command complete event
-	SimpleLinkWaitEvent(HCI_NETAPP_PING_STOP, &scRet);
-
-	return(scRet);
-}
-#endif
-
-//*****************************************************************************
-//
-//!  netapp_ipconfig
-//!
-//!  @param[out]  ipconfig  This argument is a pointer to a 
-//!                         tNetappIpconfigRetArgs structure. This structure is
-//!                         filled in with the network interface configuration.
-//!                         tNetappIpconfigRetArgs:\n aucIP - ip address,
-//!                         aucSubnetMask - mask, aucDefaultGateway - default
-//!                         gateway address, aucDHCPServer - dhcp server address
-//!                         aucDNSServer - dns server address, uaMacAddr - mac
-//!                         address, uaSSID - connected AP ssid
-//!
-//!  @return  none
-//!
-//!  @brief   Obtain the CC3000 Network interface information.
-//!           Note that the information is available only after the WLAN
-//!       		connection was established. Calling this function before
-//!           associated, will cause non-defined values to be returned.
-//!	 
-//! @note     The function is useful for figuring out the IP Configuration of
-//!       		the device when DHCP is used and for figuring out the SSID of
-//!       		the Wireless network the device is associated with.
-//!
-//*****************************************************************************
-
-#ifndef CC3000_TINY_DRIVER
-void netapp_ipconfig( tNetappIpconfigRetArgs * ipconfig )
-{
-	UINT8 *ptr;
-
-	ptr = tSLInformation.pucTxCommandBuffer;
-
-	// Initiate a HCI command
-	hci_command_send(HCI_NETAPP_IPCONFIG, ptr, 0);
-
-	// Wait for command complete event
-	SimpleLinkWaitEvent(HCI_NETAPP_IPCONFIG, ipconfig );
-
-}
-#else
-void netapp_ipconfig( tNetappIpconfigRetArgs * ipconfig )
-{
-
-}
-#endif
-
-//*****************************************************************************
-//
-//!  netapp_arp_flush
-//!
-//!  @param  none
-//!
-//!  @return  none
-//!
-//!  @brief  Flushes ARP table
-//!
-//*****************************************************************************
-
-#ifndef CC3000_TINY_DRIVER
-INT32 netapp_arp_flush(void)
-{
-	INT8 scRet;
-	UINT8 *ptr;
-
-	scRet = EFAIL;
-	ptr = tSLInformation.pucTxCommandBuffer;
-
-	// Initiate a HCI command
-	hci_command_send(HCI_NETAPP_ARP_FLUSH, ptr, 0);
-
-	// Wait for command complete event
-	SimpleLinkWaitEvent(HCI_NETAPP_ARP_FLUSH, &scRet);
-
-	return(scRet);
-}
-#endif
-
-//*****************************************************************************
-//
-//!  netapp_set_debug_level
-//!
-//!  @param[in]      level    debug level. Bitwise [0-8],
-//!                         0(disable)or 1(enable).\n Bitwise map: 0 - Critical
-//!                         message, 1 information message, 2 - core messages, 3 -
-//!                         HCI messages, 4 - Network stack messages, 5 - wlan
-//!                         messages, 6 - wlan driver messages, 7 - epprom messages,
-//!                         8 - general messages. Default: 0x13f. Saved: no
-//!
-//!  @return  On success, zero is returned. On error, -1 is returned
-//!
-//!  @brief   Debug messages sent via the UART debug channel, this function
-//!              enable/disable the debug level
-//!
-//*****************************************************************************
-
-
-#ifndef CC3000_TINY_DRIVER
-INT32 netapp_set_debug_level(UINT32 ulLevel)
-{
-	INT8 scRet;    
-	UINT8 *ptr, *args;
-
-	scRet = EFAIL;
-	ptr = tSLInformation.pucTxCommandBuffer;
-	args = (ptr + HEADERS_SIZE_CMD);
-
-	//
-	// Fill in temporary command buffer
-	//
-	args = UINT32_TO_STREAM(args, ulLevel);
-
-
-	//
-	// Initiate a HCI command
-	//
-	hci_command_send(HCI_NETAPP_SET_DEBUG_LEVEL, ptr, NETAPP_SET_DEBUG_LEVEL_PARAMS_LEN);
-
-	//
-	// Wait for command complete event
-	//
-	SimpleLinkWaitEvent(HCI_NETAPP_SET_DEBUG_LEVEL, &scRet);
-
-	return(scRet);
-
-}
-#endif
diff --git a/drivers/cc3000/src/nvmem.c b/drivers/cc3000/src/nvmem.c
deleted file mode 100644
index c6e170a746504..0000000000000
--- a/drivers/cc3000/src/nvmem.c
+++ /dev/null
@@ -1,334 +0,0 @@
-/*****************************************************************************
-*
-*  nvmem.c  - CC3000 Host Driver Implementation.
-*  Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/
-*
-*  Redistribution and use in source and binary forms, with or without
-*  modification, are permitted provided that the following conditions
-*  are met:
-*
-*    Redistributions of source code must retain the above copyright
-*    notice, this list of conditions and the following disclaimer.
-*
-*    Redistributions in binary form must reproduce the above copyright
-*    notice, this list of conditions and the following disclaimer in the
-*    documentation and/or other materials provided with the   
-*    distribution.
-*
-*    Neither the name of Texas Instruments Incorporated nor the names of
-*    its contributors may be used to endorse or promote products derived
-*    from this software without specific prior written permission.
-*
-*  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
-*  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
-*  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-*  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
-*  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
-*  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
-*  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-*  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-*  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-*  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
-*  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*
-*****************************************************************************/
-
-//*****************************************************************************
-//
-//! \addtogroup nvmem_api
-//! @{
-//
-//*****************************************************************************
-
-#include <string.h>
-#include "nvmem.h"
-#include "hci.h"
-#include "socket.h"
-#include "evnt_handler.h"
-
-//*****************************************************************************
-//
-// Prototypes for the structures for APIs.
-//
-//*****************************************************************************
-
-#define NVMEM_READ_PARAMS_LEN 	(12)
-#define NVMEM_CREATE_PARAMS_LEN 	(8)
-#define NVMEM_WRITE_PARAMS_LEN  (16)
-
-//*****************************************************************************
-//
-//!  nvmem_read
-//!
-//!  @param  ulFileId   nvmem file id:\n
-//!                     NVMEM_NVS_FILEID, NVMEM_NVS_SHADOW_FILEID,
-//!                     NVMEM_WLAN_CONFIG_FILEID, NVMEM_WLAN_CONFIG_SHADOW_FILEID,
-//!                     NVMEM_WLAN_DRIVER_SP_FILEID, NVMEM_WLAN_FW_SP_FILEID,
-//!                     NVMEM_MAC_FILEID, NVMEM_FRONTEND_VARS_FILEID,
-//!                     NVMEM_IP_CONFIG_FILEID, NVMEM_IP_CONFIG_SHADOW_FILEID,
-//!                     NVMEM_BOOTLOADER_SP_FILEID, NVMEM_RM_FILEID,
-//!                     and user files 12-15.
-//!  @param  ulLength    number of bytes to read 
-//!  @param  ulOffset    ulOffset in file from where to read  
-//!  @param  buff        output buffer pointer
-//!
-//!  @return       on success 0, error otherwise.
-//!
-//!  @brief       Reads data from the file referred by the ulFileId parameter. 
-//!               Reads data from file ulOffset till length. Err if the file can't
-//!               be used, is invalid, or if the read is out of bounds. 
-//!	 
-//*****************************************************************************
-
-INT32 nvmem_read(UINT32 ulFileId, UINT32 ulLength, UINT32 ulOffset, UINT8 *buff)
-{
-	UINT8 ucStatus = 0xFF;
-	UINT8 *ptr;
-	UINT8 *args;
-
-	ptr = tSLInformation.pucTxCommandBuffer;
-	args = (ptr + HEADERS_SIZE_CMD);
-
-	// Fill in HCI packet structure
-	args = UINT32_TO_STREAM(args, ulFileId);
-	args = UINT32_TO_STREAM(args, ulLength);
-	args = UINT32_TO_STREAM(args, ulOffset);
-
-	// Initiate a HCI command
-	hci_command_send(HCI_CMND_NVMEM_READ, ptr, NVMEM_READ_PARAMS_LEN);
-	SimpleLinkWaitEvent(HCI_CMND_NVMEM_READ, &ucStatus);
-
-	// In case there is data - read it - even if an error code is returned
-	// Note: It is the user responsibility to ignore the data in case of an error code
-
-	// Wait for the data in a synchronous way. Here we assume that the buffer is 
-	// big enough to store also parameters of nvmem
-
-	SimpleLinkWaitData(buff, 0, 0);
-
-	return(ucStatus);
-}
-
-//*****************************************************************************
-//
-//!  nvmem_write
-//!
-//!  @param  ulFileId nvmem file id:\n
-//!                   NVMEM_WLAN_DRIVER_SP_FILEID, NVMEM_WLAN_FW_SP_FILEID,
-//!                   NVMEM_MAC_FILEID, NVMEM_BOOTLOADER_SP_FILEID,
-//!                   and user files 12-15.
-//!  @param  ulLength       number of bytes to write  
-//!  @param  ulEntryOffset  offset in file to start write operation from 
-//!  @param  buff           data to write
-//!
-//!  @return       on success 0, error otherwise.
-//!
-//!  @brief       Write data to nvmem.
-//!               writes data to file referred by the ulFileId parameter. 
-//!               Writes data to file ulOffset till ulLength.The file id will be 
-//!               marked invalid till the write is done. The file entry doesn't
-//!               need to be valid - only allocated.
-//!	 
-//*****************************************************************************
-
-INT32 nvmem_write(UINT32 ulFileId, UINT32 ulLength, UINT32 ulEntryOffset, UINT8 *buff)
-{
-	INT32 iRes;
-	UINT8 *ptr;
-	UINT8 *args;
-
-	iRes = EFAIL;
-
-	ptr = tSLInformation.pucTxCommandBuffer;
-	args = (ptr + SPI_HEADER_SIZE + HCI_DATA_CMD_HEADER_SIZE);
-
-	// Fill in HCI packet structure
-	args = UINT32_TO_STREAM(args, ulFileId);
-	args = UINT32_TO_STREAM(args, 12);
-	args = UINT32_TO_STREAM(args, ulLength);
-	args = UINT32_TO_STREAM(args, ulEntryOffset);
-
-	memcpy((ptr + SPI_HEADER_SIZE + HCI_DATA_CMD_HEADER_SIZE + 
-		NVMEM_WRITE_PARAMS_LEN),buff,ulLength);
-
-	// Initiate a HCI command but it will come on data channel
-	hci_data_command_send(HCI_CMND_NVMEM_WRITE, ptr, NVMEM_WRITE_PARAMS_LEN,
-		ulLength);
-
-	SimpleLinkWaitEvent(HCI_EVNT_NVMEM_WRITE, &iRes);
-
-	return(iRes);
-}
-
-
-//*****************************************************************************
-//
-//!  nvmem_set_mac_address
-//!
-//!  @param  mac   mac address to be set
-//!
-//!  @return       on success 0, error otherwise.
-//!
-//!  @brief       Write MAC address to EEPROM. 
-//!               mac address as appears over the air (OUI first)
-//!	 
-//*****************************************************************************
-
-UINT8 nvmem_set_mac_address(UINT8 *mac)
-{
-	return  nvmem_write(NVMEM_MAC_FILEID, MAC_ADDR_LEN, 0, mac);
-}
-
-//*****************************************************************************
-//
-//!  nvmem_get_mac_address
-//!
-//!  @param[out]  mac   mac address  
-//!
-//!  @return       on success 0, error otherwise.
-//!
-//!  @brief       Read MAC address from EEPROM. 
-//!               mac address as appears over the air (OUI first)
-//!	 
-//*****************************************************************************
-
-UINT8 nvmem_get_mac_address(UINT8 *mac)
-{
-	return  nvmem_read(NVMEM_MAC_FILEID, MAC_ADDR_LEN, 0, mac);
-}
-
-//*****************************************************************************
-//
-//!  nvmem_write_patch
-//!
-//!  @param  ulFileId   nvmem file id:\n
-//!                     NVMEM_WLAN_DRIVER_SP_FILEID, NVMEM_WLAN_FW_SP_FILEID,
-//!  @param  spLength   number of bytes to write 
-//!  @param  spData     SP data to write
-//!
-//!  @return       on success 0, error otherwise.
-//!
-//!  @brief      program a patch to a specific file ID. 
-//!              The SP data is assumed to be organized in 2-dimensional.
-//!              Each line is SP_PORTION_SIZE bytes long. Actual programming is 
-//!              applied in SP_PORTION_SIZE bytes portions.
-//!	 
-//*****************************************************************************
-
-UINT8 nvmem_write_patch(UINT32 ulFileId, UINT32 spLength, const UINT8 *spData)
-{
-	UINT8 	status = 0;
-	UINT16	offset = 0;
-	UINT8*      spDataPtr = (UINT8*)spData;
-
-	while ((status == 0) && (spLength >= SP_PORTION_SIZE))
-	{
-		status = nvmem_write(ulFileId, SP_PORTION_SIZE, offset, spDataPtr);
-		offset += SP_PORTION_SIZE;
-		spLength -= SP_PORTION_SIZE;
-		spDataPtr += SP_PORTION_SIZE;
-	}
-
-	if (status !=0)
-	{
-		// NVMEM error occurred
-		return status;
-	}
-
-	if (spLength != 0)
-	{
-		// if reached here, a reminder is left
-		status = nvmem_write(ulFileId, spLength, offset, spDataPtr);
-	}
-
-	return status;
-}
-
-//*****************************************************************************
-//
-//!  nvmem_read_sp_version
-//!
-//!  @param[out]  patchVer    first number indicates package ID and the second 
-//!                           number indicates package build number   
-//!
-//!  @return       on success  0, error otherwise.
-//!
-//!  @brief      Read patch version. read package version (WiFi FW patch, 
-//!              driver-supplicant-NS patch, bootloader patch)
-//!	 
-//*****************************************************************************
-
-#ifndef CC3000_TINY_DRIVER
-UINT8 nvmem_read_sp_version(UINT8* patchVer)
-{
-	UINT8 *ptr;
-	// 1st byte is the status and the rest is the SP version
-	UINT8	retBuf[5];	
-
-	ptr = tSLInformation.pucTxCommandBuffer;
-
-	// Initiate a HCI command, no args are required
-	hci_command_send(HCI_CMND_READ_SP_VERSION, ptr, 0);	
-	SimpleLinkWaitEvent(HCI_CMND_READ_SP_VERSION, retBuf);
-
-	// package ID
-	*patchVer = retBuf[3];			
-	// package build number
-	*(patchVer+1) = retBuf[4];		
-
-	return(retBuf[0]);
-}
-#endif
-
-//*****************************************************************************
-//
-//!  nvmem_create_entry
-//!
-//!  @param       ulFileId    nvmem file Id:\n
-//!                           * NVMEM_AES128_KEY_FILEID: 12
-//!                           * NVMEM_SHARED_MEM_FILEID: 13
-//!                           * and fileIDs 14 and 15
-//!  @param       ulNewLen    entry ulLength  
-//!
-//!  @return       on success 0, error otherwise.
-//!
-//!  @brief      Create new file entry and allocate space on the NVMEM. 
-//!              Applies only to user files.
-//!              Modify the size of file.
-//!              If the entry is unallocated - allocate it to size 
-//!              ulNewLen (marked invalid).
-//!              If it is allocated then deallocate it first.
-//!              To just mark the file as invalid without resizing - 
-//!              set ulNewLen=0.
-//!	 
-//*****************************************************************************
-
-INT32 nvmem_create_entry(UINT32 ulFileId, UINT32 ulNewLen)
-{
-	UINT8 *ptr; 
-	UINT8 *args;
-	UINT8 retval;
-
-	ptr = tSLInformation.pucTxCommandBuffer;
-	args = (ptr + HEADERS_SIZE_CMD);
-
-	// Fill in HCI packet structure
-	args = UINT32_TO_STREAM(args, ulFileId);
-	args = UINT32_TO_STREAM(args, ulNewLen);
-
-	// Initiate a HCI command
-	hci_command_send(HCI_CMND_NVMEM_CREATE_ENTRY,ptr, NVMEM_CREATE_PARAMS_LEN);
-
-	SimpleLinkWaitEvent(HCI_CMND_NVMEM_CREATE_ENTRY, &retval);
-
-	return(retval);
-}
-
-
-
-//*****************************************************************************
-//
-// Close the Doxygen group.
-//! @}
-//
-//*****************************************************************************
diff --git a/drivers/cc3000/src/patch.c b/drivers/cc3000/src/patch.c
deleted file mode 100644
index 227be3c9f2a30..0000000000000
--- a/drivers/cc3000/src/patch.c
+++ /dev/null
@@ -1,117 +0,0 @@
-/*****************************************************************************
- *
- * {PatchProgrammer_DR_Patch.c}
- *
- * Burn Patches to EEPROM
- *
- * Copyright (C) 2013 Texas Instruments Incorporated - http://www.ti.com/
- * ALL RIGHTS RESERVED
- *
- *****************************************************************************/
-//
-// Service Pack version P1.13.7.15.28 -  Driver patches
-// This file contains the CC3K driver and firmware patches
-// From CC3000-FRAM-PATCH V:1.13.7 15-MAY-2014
-
-unsigned short fw_length = 5700;
-unsigned short drv_length = 8024;
-
-const unsigned char wlan_drv_patch[8024] = { 0x00, 0x01, 0x00, 0x00, 0x50, 0x1F, 0x00, 0x00, 0xF0, 0x03, 0x18, 0x00, 0xE4, 0x62, 0x08, 0x00, 0x96, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 ,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x7A, 0x63, 0x08, 0x00, 0x96, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 ,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x10, 0x64, 0x08, 0x00, 0x96, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x20, 0x0C, 0x49, 0x08, 0x60, 0x0C, 0x48, 0x19, 0x30, 0xF7, 0x46, 0x30, 0xB5, 0x05, 0x1C, 0xAC, 0x69, 0x68, 0x68, 0x5F, 0x30, 0x09, 0xD1, 0x60, 0x6B, 0x0C, 0x38, 0x01, 0x21, 0x8E, 0x46, 0x06, 0x49, 0xFE, 0x44, 0x08, 0x47, 0x00, 0x20, 0x60, 0x63, 0xAC, 0x69, 0x6C, 0x60, 0x04, 0x48, 0x5B, 0x30, 0x30, 0xBD, 0x40, 0x3B, 0x08, 0x00, 0x49, 0xD0, 0x01, 0x00, 0x09, 0xEA, 0x02, 0x00, 0x91, 0xE1, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 ,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xA6, 0x64, 0x08, 0x00, 0x96, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 ,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x3C, 0x65, 0x08, 0x00, 0x96, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF0, 0xB5, 0x85, 0xB0, 0x05, 0x1C, 0xA8, 0x88, 0x00, 0x90, 0x28, 0x89, 0x01, 0x90, 0xE9, 0x68, 0x02, 0x91, 0x28, 0x7C, 0x03, 0x90, 0x2A, 0x6A, 0x00, 0x20, 0x17, 0x56, 0x68, 0x60, 0x00, 0x29, 0x4C, 0xD0, 0x00, 0x2F, 0x4A, 0xDC ,
-0xCA, 0x49, 0x0C, 0x1C, 0x08, 0x26, 0x04, 0x90, 0x21, 0x88, 0x00, 0x98, 0x81, 0x42, 0x0C, 0xD1, 0x62, 0x88, 0x01, 0x98, 0x82, 0x42, 0x08, 0xD1, 0x46, 0x20, 0x02, 0x5D, 0x03, 0x98, 0x82, 0x42, 0x03, 0xD1, 0x0E, 0x20, 0x00, 0x57, 0xB8, 0x42, 0x0A, 0xD0, 0x46, 0x20, 0x00, 0x5D, 0x11, 0x28, 0x22, 0xD1, 0x00, 0x98, 0x81, 0x42, 0x1F, 0xD1, 0x0E, 0x20, 0x00, 0x57, 0xFF, 0xFF, 0xD2, 0x65, 0x08, 0x00, 0x96, 0x00, 0x00, 0x00, 0xB8, 0x42, 0x1B, 0xD1, 0x04, 0x20, 0x02, 0x1C, 0x02, 0x98, 0xB9, 0x49, 0x01, 0x23, 0x9E, 0x46, 0xEC, 0x4B, 0xFE, 0x44, 0x18, 0x47, 0x00, 0x28, 0x17, 0xD0, 0x20, 0x1D, 0x02, 0x99, 0x04, 0x22, 0x01, 0x23, 0x9E, 0x46, 0xE7, 0x4B, 0xFE, 0x44, 0x18, 0x47, 0x00, 0x28, 0x0D, 0xD0, 0x46, 0x20, 0x00, 0x5D, 0x11, 0x28, 0x09, 0xD0, 0xA0, 0x6D, 0x00, 0x28, 0x06, 0xD0, 0xAC, 0x34, 0x04, 0x98, 0x01, 0x30, 0x04, 0x90, 0x01, 0x3E, 0xC1, 0xD1, 0x07, 0xE0, 0x04, 0x98, 0x00, 0x06, 0x00, 0x0E ,
-0xAC, 0x21, 0x41, 0x43, 0xA6, 0x48, 0x40, 0x18, 0x68, 0x60, 0xA6, 0x48, 0xAD, 0x30, 0x05, 0xB0, 0xF0, 0xBD, 0x00, 0xB5, 0xC2, 0x68, 0x90, 0x69, 0x02, 0x21, 0x01, 0x23, 0x9E, 0x46, 0xA2, 0x4B, 0xFE, 0x44, 0x18, 0x47, 0xA2, 0x48, 0x61, 0x30, 0x00, 0xBD, 0x01, 0x79, 0x0B, 0x29, 0x03, 0xD0, 0x89, 0x00, 0x9F, 0x4A, 0x51, 0x5A, 0x01, 0xE0, 0x01, 0x21, 0x49, 0x02, 0x41, 0x60, 0x9D, 0x48, 0x0D, 0x30, 0xF7, 0x46, 0x01, 0x1C, 0xFF, 0xFF, 0x68, 0x66, 0x08, 0x00, 0x96, 0x00, 0x00, 0x00, 0x9C, 0x48, 0x02, 0x68, 0x9C, 0x48, 0x01, 0x2A, 0x01, 0xD1, 0x25, 0x30, 0xF7, 0x46, 0x9B, 0x4A, 0x12, 0x68, 0x4A, 0x60, 0x19, 0x30, 0xF7, 0x46, 0x00, 0x21, 0x41, 0x60, 0x99, 0x48, 0x98, 0x49, 0x08, 0x18, 0xF7, 0x46, 0x00, 0x21, 0x41, 0x60, 0x97, 0x48, 0xE7, 0x49, 0x08, 0x18, 0xF7, 0x46, 0xFF, 0xB5, 0x46, 0x69, 0x40, 0x68, 0x01, 0x90, 0x94, 0x49, 0x0A, 0x7C, 0x9A, 0x4F, 0x01, 0x2A, 0x63, 0xD0, 0x09, 0x7C, 0x03, 0x29 ,
-0x60, 0xD0, 0x91, 0x4A, 0x92, 0x4B, 0x00, 0x21, 0x02, 0x91, 0x59, 0x56, 0x24, 0x23, 0x59, 0x43, 0x53, 0x18, 0x03, 0x93, 0x01, 0x28, 0x17, 0xD1, 0x8A, 0x18, 0x04, 0x23, 0x6C, 0x46, 0x8C, 0x49, 0x15, 0x79, 0x08, 0x78, 0xC0, 0x43, 0x28, 0x43, 0x20, 0x70, 0x01, 0x32, 0x01, 0x31, 0x01, 0x34, 0x01, 0x3B, 0xF5, 0xD1, 0x31, 0x1D, 0x68, 0x46, 0x04, 0x22, 0x01, 0x23, 0x9E, 0x46, 0xA9, 0x4B, 0xFE, 0x44, 0x18, 0x47, 0x00, 0x28, 0x40, 0xD0, 0x35, 0x1D, 0x82, 0x48, 0x00, 0x78, 0xFF, 0x28, 0xFF, 0xFF, 0xFE, 0x66, 0x08, 0x00, 0x96, 0x00, 0x00, 0x00, 0x11, 0xD0, 0x00, 0x28, 0x0F, 0xD0, 0x03, 0x98, 0x01, 0x1D, 0x28, 0x1C, 0x01, 0x24, 0xA6, 0x46, 0x7E, 0x4A, 0xFE, 0x44, 0x10, 0x47, 0x00, 0x28, 0x05, 0xD1, 0x7A, 0x48, 0xA6, 0x46, 0x7B, 0x49, 0xFE, 0x44, 0x08, 0x47, 0x05, 0xE0, 0x28, 0x1C, 0x01, 0x21, 0x8E, 0x46, 0x78, 0x49, 0xFE, 0x44, 0x08, 0x47, 0x01, 0x99, 0x01, 0x29, 0x01, 0xD1, 0x00, 0x28, 0x1E, 0xD1 ,
-0x01, 0x99, 0x5F, 0x31, 0x01, 0xD0, 0x00, 0x28, 0x0F, 0xD1, 0xA8, 0x20, 0x81, 0x5D, 0x00, 0x29, 0x08, 0xD0, 0x49, 0x1E, 0x81, 0x55, 0x80, 0x5D, 0x00, 0x28, 0x09, 0xD1, 0x38, 0x1C, 0xFF, 0x30, 0x08, 0x30, 0x11, 0xE0, 0x03, 0x21, 0x02, 0x91, 0x00, 0xE0, 0xA8, 0x20, 0x02, 0x99, 0x81, 0x55, 0x38, 0x1C, 0xFF, 0x30, 0x16, 0x30, 0x07, 0xE0, 0x01, 0x98, 0x01, 0x28, 0x02, 0xD1, 0x38, 0x1C, 0xA3, 0x30, 0x01, 0xE0, 0x38, 0x1C, 0x9F, 0x30, 0x00, 0x90, 0xFF, 0xBD, 0x00, 0xB5, 0x02, 0x1C, 0x10, 0x6A, 0xD1, 0x69, 0x52, 0x69, 0xC3, 0x69, 0x5A, 0x60, 0xFF, 0xFF, 0x94, 0x67, 0x08, 0x00, 0x96, 0x00, 0x00, 0x00, 0x01, 0x22, 0x96, 0x46, 0x5E, 0x4A, 0xFE, 0x44, 0x10, 0x47, 0x5E, 0x48, 0xFF, 0x30, 0x6E, 0x30, 0x00, 0xBD, 0x10, 0xB5, 0x0A, 0x1C, 0x41, 0x69, 0x00, 0x6A, 0x93, 0x69, 0xDB, 0x69, 0x58, 0x60, 0x90, 0x69, 0x01, 0x24, 0xA6, 0x46, 0x56, 0x4A, 0xFE, 0x44, 0x10, 0x47, 0xA6, 0x46, 0x56, 0x48, 0xFE, 0x44 ,
-0x00, 0x47, 0x55, 0x48, 0xFF, 0x30, 0xB6, 0x30, 0x10, 0xBD, 0x70, 0xB5, 0x05, 0x1C, 0x6E, 0x69, 0x53, 0x48, 0x02, 0x68, 0x5C, 0x21, 0x88, 0x5D, 0x04, 0x28, 0x15, 0xD1, 0x07, 0x20, 0x88, 0x55, 0x10, 0x0B, 0x11, 0xD2, 0x01, 0x24, 0xA6, 0x46, 0x4E, 0x48, 0xFE, 0x44, 0x00, 0x47, 0x00, 0x28, 0x0A, 0xD0, 0x47, 0x21, 0x89, 0x57, 0xC1, 0x60, 0x11, 0x21, 0xC9, 0x02, 0x00, 0x22, 0x04, 0x23, 0xA6, 0x46, 0xE8, 0x4C, 0xFE, 0x44, 0x20, 0x47, 0x01, 0x20, 0x68, 0x60, 0x43, 0x48, 0xED, 0x49, 0x08, 0x18, 0x70, 0xBD, 0x70, 0xB5, 0x05, 0x1C, 0xAE, 0x69, 0x9C, 0x20, 0x80, 0x19, 0x4B, 0x21, 0x89, 0x00, 0x01, 0x24, 0xFF, 0xFF, 0x2A, 0x68, 0x08, 0x00, 0x96, 0x00, 0x00, 0x00, 0xA6, 0x46, 0xE8, 0x4A, 0xFE, 0x44, 0x10, 0x47, 0x5C, 0x21, 0x88, 0x5D, 0x07, 0x28, 0x01, 0xD1, 0x09, 0x20, 0x00, 0xE0, 0x05, 0x20, 0xAA, 0x69, 0x88, 0x54, 0x30, 0x1C, 0xA6, 0x46, 0xE9, 0x49, 0xFE, 0x44, 0x08, 0x47, 0x68, 0x60, 0xE8, 0x48 ,
-0x4D, 0x30, 0x70, 0xBD, 0xF0, 0xB5, 0x41, 0x68, 0x82, 0x68, 0x88, 0x23, 0x5E, 0x18, 0x37, 0x88, 0x0B, 0x6F, 0x00, 0x2B, 0x01, 0xD1, 0x00, 0x2F, 0x10, 0xD1, 0x06, 0x2F, 0x02, 0xDD, 0x00, 0x21, 0xC9, 0x43, 0x07, 0xE0, 0x33, 0x88, 0x9B, 0x00, 0xC9, 0x18, 0x0A, 0x67, 0x31, 0x88, 0x01, 0x31, 0x31, 0x80, 0x01, 0x21, 0x81, 0x60, 0xE1, 0x48, 0x1D, 0x30, 0xF0, 0xBD, 0x0B, 0x1C, 0x01, 0x24, 0x5D, 0x6F, 0x1D, 0x67, 0x04, 0x33, 0x01, 0x34, 0x06, 0x2C, 0xE1, 0xDA, 0xF8, 0xE7, 0x00, 0xB5, 0x00, 0x21, 0xC1, 0x60, 0xE9, 0x48, 0x01, 0x68, 0x10, 0x31, 0xE6, 0x48, 0x20, 0x22, 0x01, 0x23, 0x9E, 0x46, 0xE7, 0x4B, 0xFE, 0x44, 0x18, 0x47, 0xE5, 0x48, 0xFB, 0x30, 0x00, 0xBD, 0xFF, 0xFF, 0xC0, 0x68, 0x08, 0x00, 0x96, 0x00, 0x00, 0x00, 0x14, 0x0D, 0x1B, 0x00, 0x54, 0x19, 0x1B, 0x00, 0x91, 0x1A, 0x01, 0x00, 0x4B, 0xAD, 0x03, 0x00, 0x61, 0x4E, 0x01, 0x00, 0x06, 0x32, 0x08, 0x00, 0x1F, 0x0B, 0x02, 0x00, 0x54, 0x3F ,
-0x08, 0x00, 0x45, 0xC1, 0x00, 0x00, 0x84, 0x3C, 0x08, 0x00, 0x1B, 0x02, 0x00, 0x00, 0xED, 0x17, 0x00, 0x00, 0xF3, 0xC1, 0x01, 0x00, 0x34, 0x19, 0x1B, 0x00, 0x08, 0x19, 0x1B, 0x00, 0xA6, 0x44, 0x08, 0x00, 0x1C, 0x17, 0x1B, 0x00, 0x18, 0x17, 0x1B, 0x00, 0xCB, 0x67, 0x03, 0x00, 0x0D, 0x47, 0x02, 0x00, 0x39, 0x42, 0x03, 0x00, 0xBD, 0xE7, 0x02, 0x00, 0xB1, 0x40, 0x03, 0x00, 0xB9, 0xEA, 0x01, 0x00, 0x45, 0xDA, 0x00, 0x00, 0x24, 0x41, 0x08, 0x00, 0x71, 0xC0, 0x02, 0x00, 0xF0, 0xB5, 0x88, 0xB0, 0x06, 0x91, 0x07, 0x90, 0x86, 0x69, 0xF0, 0x1C, 0xD9, 0xA1, 0x04, 0x22, 0x01, 0x24, 0xA6, 0x46, 0x14, 0x4B, 0xFE, 0x44, 0x18, 0x47, 0x00, 0x28, 0x32, 0xD1, 0xF2, 0x79, 0xD7, 0x48, 0x02, 0x70, 0x35, 0x7A, 0x77, 0x7A, 0x78, 0x1B, 0xFF, 0xFF, 0x56, 0x69, 0x08, 0x00, 0x96, 0x00, 0x00, 0x00, 0x43, 0x1C, 0x93, 0x42, 0x1D, 0xD0, 0x16, 0x2A, 0x0C, 0xDB, 0x00, 0x2D, 0x0A, 0xD1, 0xD6, 0x48, 0x04, 0x70, 0x0A, 0x20 ,
-0x81, 0x19, 0xD0, 0x48, 0x1A, 0x1C, 0xA6, 0x46, 0xB8, 0x4B, 0xFE, 0x44, 0x18, 0x47, 0x74, 0xE0, 0xD2, 0x48, 0x04, 0x70, 0xCC, 0x48, 0x40, 0x19, 0x0A, 0x21, 0x89, 0x19, 0x7A, 0x1B, 0x52, 0x1C, 0xA6, 0x46, 0xB1, 0x4B, 0xFE, 0x44, 0x18, 0x47, 0x67, 0xE0, 0x8F, 0xC6, 0x03, 0x00, 0xC9, 0x48, 0x04, 0x70, 0xC9, 0x48, 0x04, 0x70, 0x0A, 0x20, 0x81, 0x19, 0xC2, 0x48, 0xA6, 0x46, 0xAA, 0x4B, 0xFE, 0x44, 0x18, 0x47, 0x59, 0xE0, 0xF0, 0x1C, 0x03, 0x21, 0x0A, 0x1C, 0xBC, 0xA1, 0xA6, 0x46, 0xC6, 0x4B, 0xFE, 0x44, 0x18, 0x47, 0x00, 0x28, 0x4F, 0xD1, 0xF1, 0x79, 0xBB, 0x48, 0x01, 0x70, 0xBB, 0x4D, 0xB2, 0x79, 0x2A, 0x70, 0x03, 0x20, 0x17, 0x49, 0xF4, 0x31, 0xA6, 0x46, 0xB8, 0x4B, 0xFE, 0x44, 0x18, 0x47, 0x28, 0x78, 0x00, 0x28, 0x0B, 0xD1, 0xFF, 0xE7, 0xB8, 0x49, 0x0C, 0x70, 0xB8, 0x49, 0xFF, 0xFF, 0xEC, 0x69, 0x08, 0x00, 0x96, 0x00, 0x00, 0x00, 0x0C, 0x70, 0x03, 0x20, 0x0F, 0x49, 0xF5, 0x31, 0xA6, 0x46 ,
-0xB6, 0x4A, 0xFE, 0x44, 0x10, 0x47, 0x20, 0x1C, 0xF2, 0x79, 0x35, 0x7A, 0x77, 0x7A, 0x79, 0x1B, 0x4B, 0x1C, 0x93, 0x42, 0x20, 0xD0, 0xA9, 0x49, 0x09, 0x78, 0x16, 0x29, 0x0F, 0xDB, 0x00, 0x2D, 0x0D, 0xD1, 0xAB, 0x49, 0x08, 0x70, 0x0A, 0x20, 0x81, 0x19, 0xE9, 0x48, 0x1A, 0x1C, 0xA6, 0x46, 0x8B, 0x4B, 0xFE, 0x44, 0x18, 0x47, 0x1A, 0xE0, 0xC0, 0x46, 0xC7, 0x04, 0x00, 0x00, 0xA5, 0x49, 0x08, 0x70, 0xE3, 0x48, 0x40, 0x19, 0x0A, 0x21, 0x89, 0x19, 0x7A, 0x1B, 0x52, 0x1C, 0xA6, 0x46, 0x83, 0x4B, 0xFE, 0x44, 0x18, 0x47, 0x0A, 0xE0, 0x9E, 0x49, 0x08, 0x70, 0x9E, 0x49, 0x08, 0x70, 0x0A, 0x20, 0x81, 0x19, 0xDB, 0x48, 0xA6, 0x46, 0x7D, 0x4B, 0xFE, 0x44, 0x18, 0x47, 0x96, 0x48, 0x00, 0x78, 0x00, 0x28, 0x0A, 0xD0, 0x95, 0x48, 0x00, 0x78, 0x00, 0x28, 0x06, 0xD0, 0x94, 0x48, 0x00, 0x78, 0x00, 0x28, 0x02, 0xD0, 0x93, 0x48, 0x00, 0x78, 0x00, 0x28, 0xFF, 0xFF, 0x82, 0x6A, 0x08, 0x00, 0x96, 0x00, 0x00, 0x00 ,
-0x00, 0xD1, 0x8C, 0xE0, 0x03, 0x20, 0x17, 0x21, 0x89, 0x01, 0xA6, 0x46, 0x90, 0x4A, 0xFE, 0x44, 0x10, 0x47, 0x87, 0x48, 0x01, 0x78, 0x87, 0x48, 0x07, 0x78, 0x84, 0x4E, 0x83, 0x4D, 0xE0, 0x48, 0x00, 0x68, 0x00, 0x28, 0x2E, 0xD1, 0x07, 0x98, 0x41, 0x61, 0x06, 0x62, 0xC6, 0x48, 0x06, 0x9A, 0x10, 0x64, 0x02, 0x2F, 0x01, 0xD0, 0x03, 0x2F, 0x01, 0xD1, 0x03, 0x22, 0x00, 0xE0, 0x3A, 0x1C, 0x06, 0x9B, 0xDA, 0x63, 0x2A, 0x78, 0x9A, 0x63, 0x01, 0x2F, 0x03, 0xD1, 0x05, 0x29, 0x04, 0xD0, 0x0D, 0x29, 0x02, 0xD0, 0xEC, 0x48, 0xDB, 0x30, 0x64, 0xE0, 0x00, 0x25, 0x00, 0x95, 0x01, 0x91, 0x02, 0x96, 0x03, 0x95, 0x04, 0x90, 0x2B, 0x1C, 0x20, 0x1C, 0x01, 0x1C, 0x8E, 0x46, 0xE6, 0x4E, 0xFE, 0x44, 0x30, 0x47, 0xE6, 0x48, 0x04, 0x60, 0x28, 0x1C, 0xA6, 0x46, 0xE5, 0x49, 0xFE, 0x44, 0x08, 0x47, 0x4C, 0xE0, 0x0D, 0x27, 0x00, 0x20, 0x39, 0x1C, 0x05, 0xAA, 0xA6, 0x46, 0xE3, 0x4B, 0xFE, 0x44, 0x18, 0x47, 0x68, 0x46 ,
-0xFF, 0xFF, 0x18, 0x6B, 0x08, 0x00, 0x96, 0x00, 0x00, 0x00, 0x80, 0x8A, 0x40, 0x08, 0x05, 0xD2, 0x38, 0x1C, 0x50, 0x21, 0xA6, 0x46, 0xDC, 0x4A, 0xFE, 0x44, 0x10, 0x47, 0x38, 0x1C, 0x21, 0x1C, 0x0B, 0x1C, 0x29, 0x1C, 0x00, 0x22, 0xA6, 0x46, 0xD9, 0x4F, 0xFE, 0x44, 0x38, 0x47, 0x2B, 0x78, 0x0D, 0x20, 0x31, 0x1C, 0x22, 0x1C, 0xA6, 0x46, 0xD5, 0x4E, 0xFE, 0x44, 0x30, 0x47, 0x28, 0x78, 0x01, 0x30, 0x02, 0x1C, 0x0D, 0x20, 0x57, 0x49, 0x23, 0x1C, 0xA6, 0x46, 0xD0, 0x4E, 0xFE, 0x44, 0x30, 0x47, 0x55, 0x4E, 0x28, 0x78, 0x02, 0x30, 0x02, 0x1C, 0x0D, 0x20, 0x31, 0x1C, 0x23, 0x1C, 0xA6, 0x46, 0xCA, 0x4F, 0xFE, 0x44, 0x38, 0x47, 0x30, 0x78, 0x00, 0x28, 0x0A, 0xD0, 0x28, 0x78, 0x03, 0x30, 0x02, 0x1C, 0x4C, 0x48, 0x03, 0x78, 0x0D, 0x20, 0x8F, 0x49, 0xA6, 0x46, 0xC3, 0x4D, 0xFE, 0x44, 0x28, 0x47, 0xBF, 0x48, 0x04, 0x60, 0x00, 0x20, 0xA6, 0x46, 0xBE, 0x49, 0xFE, 0x44, 0x08, 0x47, 0xB9, 0x48, 0xEC, 0x49 ,
-0x08, 0x18, 0x08, 0xB0, 0xF0, 0xBD, 0xC0, 0x46, 0x7B, 0xC0, 0xFF, 0xFF, 0xAE, 0x6B, 0x08, 0x00, 0x96, 0x00, 0x00, 0x00, 0x02, 0x00, 0x01, 0x1C, 0xE9, 0x48, 0x02, 0x68, 0xE9, 0x48, 0x00, 0x2A, 0x04, 0xD0, 0x00, 0x22, 0x0A, 0x62, 0x8A, 0x61, 0x1D, 0x30, 0xF7, 0x46, 0xD7, 0x30, 0xF7, 0x46, 0xC0, 0x46, 0x9F, 0x03, 0x00, 0x00, 0x7D, 0xB8, 0x03, 0x00, 0x01, 0x1C, 0xE2, 0x48, 0x02, 0x68, 0xE2, 0x48, 0x00, 0x2A, 0x02, 0xD0, 0xFF, 0x30, 0xB4, 0x30, 0xF7, 0x46, 0x00, 0x22, 0xCA, 0x61, 0x8A, 0x61, 0x4F, 0x30, 0xF7, 0x46, 0xC9, 0x21, 0x01, 0x00, 0x91, 0xE1, 0x00, 0x00, 0xDB, 0x48, 0x01, 0x68, 0x8A, 0x69, 0x01, 0x20, 0xC0, 0x03, 0x10, 0x43, 0x88, 0x61, 0x00, 0x20, 0x08, 0x61, 0xD8, 0x48, 0x23, 0x30, 0xF7, 0x46, 0x89, 0x17, 0x02, 0x00, 0x70, 0xB5, 0x05, 0x1C, 0xD5, 0x4E, 0x29, 0x6A, 0xEA, 0x69, 0x30, 0x1C, 0x01, 0x24, 0xA6, 0x46, 0x0B, 0x4B, 0xFE, 0x44, 0x18, 0x47, 0x68, 0x69, 0xA6, 0x46, 0xD1, 0x49 ,
-0xFE, 0x44, 0x08, 0x47, 0xA8, 0x69, 0x06, 0x30, 0xA8, 0x60, 0xCF, 0x48, 0x00, 0x68, 0x68, 0x60, 0xEE, 0x60, 0xCE, 0x48, 0xFF, 0xFF, 0x44, 0x6C, 0x08, 0x00, 0x96, 0x00, 0x00, 0x00, 0x6D, 0x30, 0x70, 0xBD, 0x46, 0x17, 0x1B, 0x00, 0x30, 0x3F, 0x08, 0x00, 0x41, 0xEB, 0x00, 0x00, 0x09, 0xB4, 0x03, 0x00, 0x30, 0xB5, 0xEE, 0x48, 0x01, 0x6D, 0x80, 0x6C, 0x08, 0x43, 0x18, 0xD0, 0xEC, 0x49, 0x08, 0x1C, 0x07, 0x22, 0xFF, 0x23, 0x09, 0x33, 0x1B, 0x58, 0x00, 0x2B, 0x04, 0xD0, 0xFF, 0x30, 0x1D, 0x30, 0x01, 0x3A, 0xF6, 0xD1, 0x0B, 0xE0, 0x02, 0x20, 0xF0, 0x4A, 0xF1, 0x4B, 0x01, 0x24, 0xA6, 0x46, 0xF0, 0x4D, 0xFE, 0x44, 0x28, 0x47, 0xA6, 0x46, 0xEF, 0x48, 0xFE, 0x44, 0x00, 0x47, 0xEF, 0x48, 0xFF, 0x30, 0x5C, 0x30, 0x30, 0xBD, 0xC0, 0x46, 0x53, 0x53, 0x49, 0x44, 0x00, 0xC0, 0x46, 0xC0, 0x4B, 0x45, 0x59, 0x00, 0xEE, 0x62, 0x08, 0x00, 0xF0, 0x62, 0x08, 0x00, 0xEC, 0x62, 0x08, 0x00, 0xED, 0x62, 0x08, 0x00 ,
-0xE7, 0x7E, 0x03, 0x00, 0xE8, 0x62, 0x08, 0x00, 0xE9, 0x62, 0x08, 0x00, 0xEA, 0x62, 0x08, 0x00, 0xEB, 0x62, 0x08, 0x00, 0xDD, 0x7E, 0x03, 0x00, 0x8F, 0xC6, 0x03, 0x00, 0xF0, 0xB5, 0xFF, 0xFF, 0xDA, 0x6C, 0x08, 0x00, 0x96, 0x00, 0x00, 0x00, 0x87, 0xB0, 0x00, 0x91, 0x01, 0x90, 0x6B, 0x48, 0x01, 0x68, 0xCC, 0x4A, 0x14, 0x1C, 0x02, 0x94, 0x07, 0x26, 0x00, 0x25, 0x03, 0x95, 0x04, 0x94, 0x05, 0x95, 0xDF, 0x48, 0x00, 0x68, 0x08, 0x43, 0x27, 0xD0, 0xE0, 0x68, 0x03, 0x99, 0x88, 0x42, 0x0A, 0xDD, 0x03, 0x90, 0x40, 0x1C, 0x00, 0x99, 0x88, 0x60, 0xC2, 0x49, 0xFF, 0x20, 0x1D, 0x30, 0x68, 0x43, 0x0C, 0x18, 0xE0, 0x68, 0x04, 0x91, 0x02, 0x99, 0xC9, 0x68, 0x88, 0x42, 0x10, 0xDB, 0x88, 0x42, 0x10, 0xD1, 0x02, 0x98, 0x01, 0x27, 0xBE, 0x46, 0xCE, 0x49, 0xFE, 0x44, 0x08, 0x47, 0x06, 0x90, 0x20, 0x1C, 0xBE, 0x46, 0xCB, 0x49, 0xFE, 0x44, 0x08, 0x47, 0x06, 0x99, 0x88, 0x42, 0x01, 0xDA, 0x05, 0x95, 0x02, 0x94 ,
-0x51, 0x48, 0x01, 0x68, 0xFF, 0x27, 0x09, 0x37, 0x38, 0x59, 0x00, 0x28, 0x06, 0xD0, 0xC7, 0x48, 0x00, 0x68, 0x07, 0x2E, 0x00, 0xD1, 0x2E, 0x1C, 0x08, 0x43, 0x04, 0xD0, 0xFF, 0x34, 0x1D, 0x34, 0x01, 0x35, 0x07, 0x2D, 0xC2, 0xDB, 0x07, 0x2E, 0xFF, 0xFF, 0x70, 0x6D, 0x08, 0x00, 0x96, 0x00, 0x00, 0x00, 0x0A, 0xD1, 0xC0, 0x48, 0x00, 0x68, 0x08, 0x43, 0x06, 0xD0, 0x05, 0x9E, 0x30, 0x1C, 0x01, 0x21, 0x8E, 0x46, 0xBA, 0x49, 0xFE, 0x44, 0x08, 0x47, 0x01, 0x98, 0x47, 0x61, 0x00, 0x21, 0x81, 0x61, 0xFF, 0x22, 0x1D, 0x32, 0x72, 0x43, 0x04, 0x99, 0x89, 0x18, 0xC1, 0x61, 0x06, 0x62, 0xB4, 0x48, 0x39, 0x30, 0x07, 0xB0, 0xF0, 0xBD, 0x10, 0xB5, 0x04, 0x1C, 0x00, 0x20, 0x01, 0x21, 0x8E, 0x46, 0xB1, 0x49, 0xFE, 0x44, 0x08, 0x47, 0x40, 0x1E, 0x00, 0xD5, 0x00, 0x20, 0x60, 0x60, 0xE0, 0x61, 0xAE, 0x48, 0x21, 0x30, 0x10, 0xBD, 0xC0, 0x46, 0x10, 0x63, 0x08, 0x00, 0x70, 0xB5, 0x04, 0x1C, 0xE5, 0x69, 0x66, 0x69 ,
-0x00, 0x20, 0x01, 0x21, 0x8E, 0x46, 0xA7, 0x49, 0xFE, 0x44, 0x08, 0x47, 0x60, 0x60, 0xAB, 0x19, 0xA6, 0x4A, 0xA5, 0x49, 0x93, 0x42, 0x02, 0xD3, 0x9A, 0x1A, 0x82, 0x42, 0x02, 0xD9, 0x08, 0x1C, 0x99, 0x30, 0x70, 0xBD, 0x08, 0x1C, 0xAB, 0x30, 0x70, 0xBD, 0x08, 0x6B, 0x41, 0x7D, 0x02, 0x88, 0x92, 0x00, 0xFF, 0xFF, 0x06, 0x6E, 0x08, 0x00, 0x96, 0x00, 0x00, 0x00, 0x51, 0x1A, 0x3C, 0x39, 0xFF, 0x22, 0x5F, 0x32, 0x91, 0x42, 0x03, 0xD9, 0x65, 0x21, 0x01, 0x80, 0x02, 0x21, 0x81, 0x73, 0x9B, 0x48, 0x99, 0x49, 0x08, 0x18, 0xF7, 0x46, 0xC0, 0x46, 0x30, 0x63, 0x08, 0x00, 0xF8, 0xB5, 0x40, 0x68, 0x24, 0x21, 0x41, 0x43, 0x97, 0x48, 0x45, 0x18, 0x28, 0x1D, 0x0C, 0x21, 0x49, 0x19, 0x04, 0x22, 0x01, 0x23, 0x9E, 0x46, 0x94, 0x4B, 0xFE, 0x44, 0x18, 0x47, 0x91, 0x4C, 0x00, 0x28, 0x1B, 0xD0, 0x2B, 0x1C, 0x04, 0x22, 0x6E, 0x46, 0x91, 0x49, 0x1F, 0x7B, 0x08, 0x78, 0xC0, 0x43, 0x38, 0x43, 0x30, 0x70, 0x01, 0x33 ,
-0x01, 0x31, 0x01, 0x36, 0x01, 0x3A, 0xF5, 0xD1, 0x0C, 0x20, 0x41, 0x19, 0x68, 0x46, 0x04, 0x22, 0x01, 0x23, 0x9E, 0x46, 0x87, 0x4B, 0xFE, 0x44, 0x18, 0x47, 0x00, 0x28, 0x02, 0xD0, 0x20, 0x1C, 0x4A, 0x30, 0xF8, 0xBD, 0x20, 0x1C, 0xF8, 0xBD, 0xB1, 0xBD, 0x00, 0x00, 0x15, 0x95, 0x00, 0x00, 0x58, 0x3F, 0x08, 0x00, 0xF3, 0xF8, 0x00, 0x00, 0xE9, 0x09, 0x02, 0x00, 0xFF, 0xFF, 0x9C, 0x6E, 0x08, 0x00, 0x96, 0x00, 0x00, 0x00, 0x2B, 0x09, 0x02, 0x00, 0xDD, 0x0A, 0x02, 0x00, 0xF8, 0xB5, 0x05, 0x1C, 0xAA, 0x69, 0x7D, 0x49, 0x00, 0x20, 0x08, 0x56, 0x24, 0x21, 0x41, 0x43, 0x76, 0x48, 0x43, 0x18, 0x04, 0x24, 0x6E, 0x46, 0x76, 0x49, 0x1F, 0x79, 0x08, 0x78, 0xC0, 0x43, 0x38, 0x43, 0x30, 0x70, 0x01, 0x33, 0x01, 0x31, 0x01, 0x36, 0x01, 0x3C, 0xF5, 0xD1, 0x11, 0x1D, 0x68, 0x46, 0x04, 0x22, 0x01, 0x24, 0xA6, 0x46, 0x6D, 0x4B, 0xFE, 0x44, 0x18, 0x47, 0x01, 0x1C, 0x6D, 0x48, 0x04, 0xD0, 0x6E, 0x49, 0x09, 0x78 ,
-0x69, 0x60, 0x45, 0x30, 0xF8, 0xBD, 0xEC, 0x61, 0xAF, 0x30, 0xF8, 0xBD, 0x70, 0xB5, 0xC5, 0x68, 0x81, 0x68, 0x0A, 0x89, 0x6D, 0x4E, 0x00, 0x2A, 0x22, 0xD0, 0x01, 0x24, 0xC2, 0x6D, 0xA2, 0x18, 0xC2, 0x65, 0x08, 0x89, 0x0D, 0x28, 0x1B, 0xD1, 0x68, 0x6B, 0x21, 0x1C, 0xA6, 0x46, 0x63, 0x4A, 0xFE, 0x44, 0x10, 0x47, 0x22, 0x1C, 0x28, 0x1C, 0x00, 0x21, 0xA6, 0x46, 0x60, 0x4B, 0xFE, 0x44, 0x18, 0x47, 0x2C, 0x60, 0xE9, 0x6B, 0xFF, 0xFF, 0x32, 0x6F, 0x08, 0x00, 0x96, 0x00, 0x00, 0x00, 0x28, 0x1C, 0xA6, 0x46, 0x5E, 0x4A, 0xFE, 0x44, 0x10, 0x47, 0x28, 0x1C, 0xA6, 0x46, 0x5C, 0x49, 0xFE, 0x44, 0x08, 0x47, 0x30, 0x1C, 0x3D, 0x30, 0x70, 0xBD, 0x30, 0x1C, 0x23, 0x30, 0x70, 0xBD, 0xC0, 0x46, 0xB1, 0x02, 0x00, 0x00, 0x74, 0x3F, 0x08, 0x00, 0x19, 0xC6, 0x00, 0x00, 0x5C, 0x3F, 0x08, 0x00, 0x1D, 0xC2, 0x00, 0x00, 0x68, 0x44, 0x08, 0x00, 0x43, 0x12, 0x03, 0x00, 0x34, 0x63, 0x08, 0x00, 0x2F, 0x7A, 0x02, 0x00 ,
-0xB4, 0x36, 0x08, 0x00, 0x8F, 0xF4, 0x01, 0x00, 0xF0, 0xB5, 0x05, 0x1C, 0xAB, 0x69, 0xEC, 0x69, 0x60, 0x68, 0x00, 0x68, 0x2A, 0x30, 0x01, 0x78, 0x0A, 0x06, 0x41, 0x78, 0x09, 0x04, 0x8A, 0x18, 0x81, 0x78, 0x09, 0x02, 0x8A, 0x18, 0xC1, 0x78, 0x8A, 0x18, 0x8E, 0x26, 0xF1, 0x5A, 0x09, 0x0A, 0x01, 0x70, 0xF0, 0x5C, 0x61, 0x68, 0x09, 0x68, 0x2B, 0x26, 0x70, 0x54, 0x8C, 0x20, 0xC0, 0x18, 0x61, 0x68, 0x0E, 0x68, 0x01, 0x88, 0x09, 0x0A, 0x2C, 0x27, 0xB9, 0x55, 0x61, 0x68, 0x09, 0x68, 0xFF, 0xFF, 0xC8, 0x6F, 0x08, 0x00, 0x96, 0x00, 0x00, 0x00, 0x2D, 0x26, 0x00, 0x78, 0x70, 0x54, 0x60, 0x68, 0x01, 0x68, 0x32, 0x31, 0x08, 0x78, 0x00, 0x02, 0x49, 0x78, 0x08, 0x18, 0x00, 0x04, 0x00, 0x0C, 0x8C, 0x21, 0xCB, 0x58, 0x35, 0x49, 0x41, 0x40, 0x08, 0x04, 0x00, 0x0C, 0xC0, 0x18, 0x80, 0x1A, 0x01, 0x21, 0x8E, 0x46, 0x32, 0x49, 0xFE, 0x44, 0x08, 0x47, 0x61, 0x68, 0x0A, 0x68, 0x32, 0x23, 0x01, 0x0A, 0x99, 0x54 ,
-0x61, 0x68, 0x09, 0x68, 0x33, 0x22, 0x50, 0x54, 0x60, 0x68, 0x68, 0x60, 0x2C, 0x48, 0xF0, 0xBD, 0x00, 0x00, 0x1B, 0x00, 0x34, 0x04, 0x1B, 0x00, 0x02, 0x6A, 0x8B, 0x69, 0xDB, 0x69, 0x1B, 0x68, 0x83, 0x60, 0x88, 0x69, 0xC0, 0x69, 0x41, 0x68, 0x8A, 0x42, 0x00, 0xDA, 0x42, 0x60, 0x25, 0x48, 0x79, 0x30, 0xF7, 0x46, 0x24, 0x48, 0x57, 0x30, 0xF7, 0x46, 0x24, 0x48, 0x91, 0x30, 0xF7, 0x46, 0x32, 0x04, 0x00, 0x00, 0xC4, 0x07, 0x00, 0x00, 0x15, 0x09, 0x02, 0x00, 0xC5, 0x93, 0x00, 0x00, 0x0D, 0x91, 0x00, 0x00, 0x40, 0x1E, 0x80, 0x00, 0x1E, 0x4B, 0xFF, 0xFF, 0x5E, 0x70, 0x08, 0x00, 0x96, 0x00, 0x00, 0x00, 0x19, 0x50, 0x1C, 0x49, 0x0A, 0x50, 0xF7, 0x46, 0xC0, 0x46, 0xBD, 0xB5, 0x00, 0x00, 0x95, 0x92, 0x00, 0x00, 0xFD, 0x93, 0x00, 0x00, 0x54, 0x3F, 0x08, 0x00, 0x29, 0x4F, 0x03, 0x00, 0xDF, 0xE8, 0x02, 0x00, 0x36, 0x89, 0x41, 0x00, 0x81, 0x06, 0x00, 0x00, 0xB1, 0x78, 0x00, 0x00, 0x94, 0xEC, 0x01, 0x00 ,
-0x08, 0x19, 0x1B, 0x00, 0x8F, 0xC6, 0x03, 0x00, 0x1C, 0x17, 0x1B, 0x00, 0x67, 0x66, 0x03, 0x00, 0xA6, 0x44, 0x08, 0x00, 0x18, 0x17, 0x1B, 0x00, 0xA7, 0x2F, 0x02, 0x00, 0x91, 0x44, 0x03, 0x00, 0x91, 0x63, 0x03, 0x00, 0x5B, 0x44, 0x03, 0x00, 0xE7, 0x44, 0x03, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0x61, 0xA2, 0x03, 0x00, 0x6A, 0x1E, 0x01, 0x00, 0x45, 0xDA, 0x00, 0x00, 0xD7, 0xE8, 0x01, 0x00, 0xE9, 0x78, 0x02, 0x00, 0x04, 0xF3, 0x1A, 0x00, 0x80, 0x7B, 0x08, 0x00, 0xFC, 0xB5, 0x04, 0x1C, 0xA5, 0x69, 0x60, 0x6A, 0x01, 0x90, 0x20, 0x69, 0x00, 0x28, 0x35, 0xD4, 0x08, 0x28, 0x33, 0xDA, 0xE1, 0x69, 0x09, 0x68, 0xFF, 0xFF, 0xF4, 0x70, 0x08, 0x00, 0x96, 0x00, 0x00, 0x00, 0x10, 0x29, 0x2F, 0xD1, 0xAC, 0x21, 0x41, 0x43, 0x9E, 0x4A, 0x51, 0x5C, 0x49, 0x08, 0x27, 0xD3, 0x00, 0x06, 0x00, 0x16, 0xA2, 0x68, 0x69, 0x46, 0x01, 0x23, 0x9E, 0x46, 0x9A, 0x4B, 0xFE, 0x44, 0x18, 0x47, 0x06, 0x1C, 0x39, 0x30, 0x1F, 0xD0 ,
-0x00, 0x2E, 0x1D, 0xD0, 0x00, 0x98, 0x07, 0x68, 0x00, 0x99, 0x0C, 0x39, 0x01, 0x98, 0x01, 0x60, 0x28, 0x1D, 0x10, 0x21, 0x79, 0x1A, 0x04, 0x22, 0x01, 0x23, 0x9E, 0x46, 0x91, 0x4B, 0xFE, 0x44, 0x18, 0x47, 0x02, 0x22, 0x2A, 0x80, 0xA8, 0x1C, 0x08, 0x21, 0x79, 0x1A, 0x01, 0x23, 0x9E, 0x46, 0x8C, 0x4B, 0xFE, 0x44, 0x18, 0x47, 0x03, 0xE0, 0x38, 0x20, 0x00, 0xE0, 0x00, 0x20, 0xC6, 0x43, 0x26, 0x60, 0x89, 0x48, 0x7C, 0x30, 0x20, 0x62, 0xFC, 0xBD, 0x30, 0xB5, 0x05, 0x1C, 0x28, 0x69, 0xA9, 0x69, 0x90, 0x29, 0x1D, 0xD1, 0x69, 0x69, 0x09, 0x78, 0x04, 0x29, 0x19, 0xD0, 0x05, 0x29, 0x17, 0xD0, 0x0A, 0x29, 0x15, 0xD0, 0x06, 0x29, 0x13, 0xD0, 0x0C, 0x29, 0x01, 0xDB, 0xFF, 0xFF, 0x8A, 0x71, 0x08, 0x00, 0x96, 0x00, 0x00, 0x00, 0x10, 0x29, 0x0F, 0xD1, 0x01, 0x24, 0xA6, 0x46, 0x7D, 0x49, 0xFE, 0x44, 0x08, 0x47, 0x7C, 0x48, 0x7D, 0x49, 0x00, 0x22, 0xA6, 0x46, 0x7C, 0x4B, 0xFE, 0x44, 0x18, 0x47, 0x7C, 0x48 ,
-0xFF, 0x30, 0x5F, 0x30, 0x28, 0x62, 0x30, 0xBD, 0xF0, 0xB5, 0x89, 0xB0, 0x05, 0x90, 0x41, 0x69, 0x02, 0x69, 0x75, 0x48, 0x79, 0x4E, 0x82, 0x42, 0x3A, 0xD0, 0x04, 0x30, 0x82, 0x42, 0x25, 0xD0, 0x74, 0x4D, 0xAA, 0x42, 0x00, 0xD0, 0xCC, 0xE0, 0x08, 0x68, 0x06, 0x1C, 0x0C, 0x22, 0x8F, 0x1A, 0x4A, 0x68, 0x89, 0x18, 0x09, 0x1D, 0x10, 0x22, 0x01, 0x24, 0xA6, 0x46, 0x6E, 0x4B, 0xFE, 0x44, 0x18, 0x47, 0x01, 0x1C, 0x09, 0xD1, 0xAC, 0x22, 0x72, 0x43, 0xCB, 0x48, 0x80, 0x18, 0x46, 0x22, 0x12, 0x5C, 0x11, 0x2A, 0x01, 0xD1, 0x44, 0x22, 0x14, 0x54, 0x28, 0x1C, 0x3A, 0x1C, 0xA6, 0x46, 0x62, 0x4B, 0xFE, 0x44, 0x18, 0x47, 0x69, 0x48, 0xEC, 0x30, 0xAB, 0xE0, 0x08, 0x68, 0xC0, 0x00, 0x30, 0x18, 0x8A, 0x68, 0x02, 0x2A, 0x02, 0xD0, 0xFF, 0xFF, 0x20, 0x72, 0x08, 0x00, 0x96, 0x00, 0x00, 0x00, 0xE7, 0x20, 0x80, 0x00, 0xA2, 0xE0, 0xCA, 0x68, 0x89, 0x18, 0x09, 0x7B, 0x41, 0x60, 0x80, 0x21, 0x01, 0x60, 0x3B, 0x20 ,
-0x00, 0x01, 0x99, 0xE0, 0x08, 0x68, 0x06, 0x90, 0xC0, 0x00, 0x34, 0x58, 0x10, 0x20, 0x04, 0x90, 0x01, 0x25, 0xAE, 0x46, 0x57, 0x48, 0xFE, 0x44, 0x00, 0x47, 0x07, 0x90, 0x00, 0x28, 0x00, 0xD1, 0x89, 0xE0, 0x0C, 0x21, 0x07, 0x98, 0x0F, 0x18, 0xB0, 0x49, 0xAC, 0x20, 0x06, 0x9A, 0x50, 0x43, 0x08, 0x18, 0x48, 0x22, 0x13, 0x5C, 0x5B, 0x06, 0x5B, 0x0E, 0x13, 0x54, 0x06, 0x9A, 0xD2, 0x00, 0xB6, 0x18, 0x71, 0x68, 0x00, 0x29, 0x47, 0xD1, 0x00, 0x2C, 0x01, 0xDD, 0x08, 0x2C, 0x21, 0xDB, 0x00, 0x22, 0x69, 0x46, 0x0A, 0x70, 0x01, 0x92, 0x0A, 0x81, 0x8A, 0x72, 0xCD, 0x72, 0x0D, 0x73, 0x4D, 0x73, 0x01, 0x88, 0x44, 0x48, 0x06, 0x23, 0xAE, 0x46, 0x44, 0x4C, 0xFE, 0x44, 0x20, 0x47, 0x04, 0x1C, 0x02, 0xDC, 0x00, 0x20, 0xC0, 0x43, 0x36, 0xE0, 0x34, 0x60, 0xAC, 0x20, 0x60, 0x43, 0x9A, 0x49, 0xFF, 0xFF, 0xB6, 0x72, 0x08, 0x00, 0x96, 0x00, 0x00, 0x00, 0x09, 0x18, 0x5C, 0x22, 0x28, 0x1C, 0x50, 0x54, 0x48, 0x20 ,
-0x42, 0x5C, 0x52, 0x06, 0x52, 0x0E, 0x42, 0x54, 0xAC, 0x20, 0x60, 0x43, 0x94, 0x49, 0x08, 0x18, 0x5C, 0x21, 0x09, 0x5C, 0x49, 0x1E, 0x02, 0x29, 0x16, 0xD9, 0x03, 0x39, 0x08, 0xD0, 0x00, 0x20, 0x30, 0x56, 0xAE, 0x46, 0xEA, 0x49, 0xFE, 0x44, 0x08, 0x47, 0x80, 0x20, 0x30, 0x60, 0xDB, 0xE7, 0x08, 0x94, 0x80, 0x21, 0x31, 0x60, 0x48, 0x22, 0x13, 0x5C, 0x19, 0x43, 0x11, 0x54, 0xAE, 0x46, 0xE4, 0x49, 0xFE, 0x44, 0x08, 0x47, 0x0A, 0xE0, 0x01, 0x20, 0xCE, 0xE7, 0x06, 0x98, 0x39, 0x1C, 0x04, 0xAA, 0xAE, 0x46, 0xE0, 0x4B, 0xFE, 0x44, 0x18, 0x47, 0x04, 0x1C, 0x08, 0x90, 0x06, 0x98, 0x38, 0x60, 0x08, 0x98, 0x78, 0x60, 0x00, 0x28, 0x15, 0xD0, 0xAC, 0x20, 0x60, 0x43, 0x7C, 0x49, 0x09, 0x18, 0x48, 0x88, 0x02, 0x04, 0x02, 0x20, 0x10, 0x43, 0xB8, 0x60, 0x48, 0x68, 0x02, 0x0E, 0x01, 0x02, 0x09, 0x0E, 0x09, 0x02, 0x11, 0x43, 0x02, 0x04, 0x12, 0x0E, 0xFF, 0xFF, 0x4C, 0x73, 0x08, 0x00, 0x96, 0x00, 0x00, 0x00 ,
-0x12, 0x04, 0x0A, 0x43, 0x00, 0x06, 0x10, 0x43, 0xF8, 0x60, 0x07, 0x98, 0x0D, 0x49, 0x00, 0x22, 0x10, 0x23, 0xAE, 0x46, 0xCE, 0x4C, 0xFE, 0x44, 0x20, 0x47, 0x13, 0x48, 0x00, 0xE0, 0x16, 0x20, 0xCC, 0x49, 0x09, 0x18, 0x05, 0x98, 0x01, 0x62, 0x09, 0xB0, 0xF0, 0xBD, 0x5D, 0x0D, 0x1B, 0x00, 0x81, 0xE7, 0x02, 0x00, 0x09, 0xB4, 0x03, 0x00, 0x27, 0x1A, 0x02, 0x00, 0x2F, 0x7A, 0x02, 0x00, 0x02, 0x02, 0x00, 0x00, 0x05, 0x10, 0x00, 0x00, 0xCF, 0xF6, 0x00, 0x00, 0xD5, 0xF4, 0x00, 0x00, 0x02, 0x10, 0x00, 0x00, 0x91, 0x19, 0x02, 0x00, 0x50, 0x65, 0x08, 0x00, 0x71, 0xC0, 0x02, 0x00, 0x50, 0x19, 0x1B, 0x00, 0x29, 0x16, 0x01, 0x00, 0x2A, 0x03, 0x00, 0x00, 0xF0, 0xB5, 0x8B, 0xB0, 0x07, 0x90, 0x05, 0x69, 0x47, 0x69, 0x0C, 0x20, 0x38, 0x1A, 0x08, 0x90, 0xB6, 0x49, 0x8D, 0x42, 0x16, 0xD1, 0x78, 0x68, 0x0F, 0x30, 0x00, 0x11, 0x00, 0x01, 0x78, 0x60, 0x38, 0x68, 0x0B, 0x28, 0x0E, 0xD8, 0x00, 0x23, 0x68, 0x46 ,
-0xFF, 0xFF, 0xE2, 0x73, 0x08, 0x00, 0x96, 0x00, 0x00, 0x00, 0x03, 0x70, 0x08, 0x98, 0x05, 0x22, 0x01, 0x24, 0xA6, 0x46, 0xAE, 0x4C, 0xFE, 0x44, 0x20, 0x47, 0xAE, 0x48, 0xFF, 0x30, 0x95, 0x30, 0x07, 0x99, 0x08, 0x62, 0xAC, 0x48, 0x85, 0x42, 0x23, 0xD1, 0xAC, 0x48, 0x02, 0x78, 0x6C, 0x46, 0x22, 0x72, 0x43, 0x78, 0x63, 0x72, 0x81, 0x78, 0xA1, 0x72, 0xC0, 0x78, 0xE0, 0x72, 0x00, 0x91, 0x01, 0x90, 0x03, 0x20, 0xA6, 0x49, 0x01, 0x39, 0x01, 0x26, 0xB6, 0x46, 0xF3, 0x4E, 0xFE, 0x44, 0x30, 0x47, 0x04, 0x20, 0x20, 0x70, 0x08, 0x98, 0x9F, 0x49, 0x00, 0x22, 0x02, 0xAB, 0x01, 0x24, 0xA6, 0x46, 0x9B, 0x4C, 0xFE, 0x44, 0x20, 0x47, 0x9A, 0x48, 0xFF, 0x30, 0x95, 0x30, 0x07, 0x99, 0x08, 0x62, 0xEB, 0x49, 0x8D, 0x42, 0x14, 0xD1, 0x02, 0x22, 0x68, 0x46, 0x02, 0x70, 0x3A, 0x68, 0xAC, 0x20, 0x42, 0x43, 0x30, 0x48, 0x68, 0x30, 0x83, 0x18, 0x08, 0x98, 0x00, 0x22, 0x01, 0x24, 0xA6, 0x46, 0x8F, 0x4C, 0xFE, 0x44 ,
-0x20, 0x47, 0x8E, 0x48, 0xFF, 0x30, 0x95, 0x30, 0x07, 0x99, 0xFF, 0xFF, 0x78, 0x74, 0x08, 0x00, 0x96, 0x00, 0x00, 0x00, 0x08, 0x62, 0xEF, 0x48, 0x85, 0x42, 0x00, 0xD0, 0x04, 0xE1, 0x03, 0x20, 0x8C, 0x49, 0x01, 0x22, 0x96, 0x46, 0xEC, 0x4A, 0xFE, 0x44, 0x10, 0x47, 0x86, 0x48, 0xFF, 0x30, 0x95, 0x30, 0x09, 0x90, 0x38, 0x68, 0xEA, 0x4D, 0x00, 0x28, 0x00, 0xD1, 0xE2, 0xE0, 0x01, 0x24, 0xA6, 0x46, 0xE6, 0x48, 0xFE, 0x44, 0x00, 0x47, 0x00, 0x28, 0x00, 0xD1, 0xD6, 0xE0, 0xE4, 0x48, 0x02, 0x68, 0x03, 0x20, 0x7F, 0x49, 0x01, 0x31, 0xA6, 0x46, 0xE2, 0x4B, 0xFE, 0x44, 0x18, 0x47, 0xDF, 0x48, 0x00, 0x68, 0x00, 0x28, 0x5A, 0xD1, 0xDF, 0x4D, 0x2E, 0x20, 0x41, 0x19, 0xB8, 0x68, 0x03, 0x30, 0x08, 0x70, 0x38, 0x7A, 0x48, 0x70, 0x2E, 0x1C, 0x30, 0x36, 0xB8, 0x68, 0x28, 0x18, 0x30, 0x30, 0xDA, 0x49, 0x0A, 0x68, 0x30, 0x3A, 0x31, 0x1C, 0xA6, 0x46, 0xD8, 0x4B, 0xFE, 0x44, 0x18, 0x47, 0x78, 0x68, 0x38, 0x18 ,
-0x01, 0x1D, 0xBA, 0x68, 0x30, 0x1C, 0xA6, 0x46, 0xD9, 0x4B, 0xFE, 0x44, 0x18, 0x47, 0xB8, 0x68, 0x41, 0x19, 0x97, 0x22, 0xFF, 0xFF, 0x0E, 0x75, 0x08, 0x00, 0x96, 0x00, 0x00, 0x00, 0x09, 0x30, 0x50, 0x54, 0xB8, 0x68, 0x46, 0x19, 0x9E, 0x36, 0x30, 0x70, 0x01, 0x36, 0xB8, 0x68, 0x01, 0xE0, 0x14, 0x0D, 0x1B, 0x00, 0x30, 0x18, 0xCA, 0x49, 0x0A, 0x68, 0x9E, 0x3A, 0x31, 0x1C, 0xA6, 0x46, 0xC8, 0x4B, 0xFE, 0x44, 0x18, 0x47, 0x78, 0x68, 0x38, 0x18, 0x01, 0x1D, 0xBA, 0x68, 0x30, 0x1C, 0xA6, 0x46, 0xC9, 0x4B, 0xFE, 0x44, 0x18, 0x47, 0xB8, 0x68, 0x40, 0x00, 0xC0, 0x49, 0x09, 0x68, 0x08, 0x18, 0x28, 0x18, 0xC0, 0x49, 0x0A, 0x79, 0x02, 0x70, 0x4A, 0x79, 0x42, 0x70, 0x8A, 0x79, 0x82, 0x70, 0xC9, 0x79, 0xC1, 0x70, 0x04, 0x30, 0x0F, 0x21, 0x41, 0x1A, 0x0A, 0x78, 0xBB, 0x68, 0x9A, 0x18, 0x0A, 0x70, 0x40, 0x1B, 0x00, 0x04, 0x00, 0x0C, 0xB5, 0x49, 0x08, 0x60, 0xB1, 0x48, 0x04, 0x60, 0x02, 0x20, 0x01, 0x1C ,
-0x11, 0x22, 0xA6, 0x46, 0xB4, 0x4B, 0xFE, 0x44, 0x18, 0x47, 0x06, 0x1C, 0x63, 0xD4, 0x03, 0x20, 0xA6, 0x46, 0xB1, 0x49, 0xFE, 0x44, 0x08, 0x47, 0x0A, 0x90, 0x00, 0x25, 0x01, 0x1C, 0xFF, 0xFF, 0xA4, 0x75, 0x08, 0x00, 0x96, 0x00, 0x00, 0x00, 0x8D, 0x42, 0x50, 0xD0, 0x29, 0x1C, 0x2B, 0x22, 0xA6, 0x46, 0xAD, 0x4B, 0xFE, 0x44, 0x18, 0x47, 0x0C, 0x20, 0x0A, 0x99, 0x40, 0x18, 0xAC, 0x22, 0x72, 0x43, 0xAB, 0x49, 0x8F, 0x18, 0x78, 0x63, 0x29, 0x1C, 0x18, 0x22, 0xA6, 0x46, 0xA6, 0x4B, 0xFE, 0x44, 0x18, 0x47, 0x9F, 0x48, 0x02, 0x68, 0x79, 0x6B, 0x4A, 0x60, 0x0A, 0x98, 0xAC, 0x30, 0x08, 0x60, 0x08, 0x68, 0x9A, 0x49, 0xA6, 0x46, 0xA0, 0x4B, 0xFE, 0x44, 0x18, 0x47, 0x29, 0x1C, 0x03, 0xA8, 0x10, 0x22, 0xA6, 0x46, 0x9C, 0x4B, 0xFE, 0x44, 0x18, 0x47, 0xE0, 0x21, 0x68, 0x46, 0x01, 0x74, 0x45, 0x74, 0x85, 0x74, 0xFB, 0x21, 0xC1, 0x74, 0xEE, 0x49, 0xC1, 0x81, 0x02, 0x21, 0x81, 0x81, 0x79, 0x6B, 0xCA, 0x68 ,
-0x01, 0x20, 0xC0, 0x03, 0x10, 0x43, 0xC8, 0x60, 0x48, 0x68, 0x00, 0x90, 0x2A, 0x1C, 0x30, 0x1C, 0x0A, 0x9D, 0x29, 0x1C, 0x03, 0xAB, 0xA6, 0x46, 0xE6, 0x4F, 0xFE, 0x44, 0x38, 0x47, 0x07, 0x1C, 0x30, 0x06, 0x00, 0x16, 0xA6, 0x46, 0xEF, 0x49, 0xFF, 0xFF, 0x3A, 0x76, 0x08, 0x00, 0x96, 0x00, 0x00, 0x00, 0xFE, 0x44, 0x08, 0x47, 0x28, 0x1C, 0xA6, 0x46, 0xEE, 0x49, 0xFE, 0x44, 0x08, 0x47, 0x11, 0xE0, 0x30, 0x06, 0x00, 0x16, 0xA6, 0x46, 0xE9, 0x49, 0xFE, 0x44, 0x08, 0x47, 0x01, 0x20, 0xC7, 0x43, 0x08, 0xE0, 0x07, 0x1C, 0x06, 0xE0, 0x00, 0x20, 0x00, 0x21, 0xCF, 0x43, 0x01, 0xE0, 0x00, 0x20, 0x07, 0x1C, 0x28, 0x60, 0x00, 0x23, 0x68, 0x46, 0x03, 0x70, 0x3A, 0x06, 0x12, 0x0E, 0x08, 0x98, 0x6F, 0x49, 0x01, 0x24, 0xA6, 0x46, 0x09, 0x4C, 0xFE, 0x44, 0x20, 0x47, 0x07, 0x98, 0x09, 0x99, 0x01, 0x62, 0x0B, 0xB0, 0xF0, 0xBD, 0xC1, 0x18, 0x01, 0x00, 0xF1, 0x1B, 0x01, 0x00, 0xF3, 0x1C, 0x02, 0x00, 0x7B, 0xC0 ,
-0x02, 0x00, 0x91, 0xF0, 0x00, 0x00, 0x03, 0x02, 0x00, 0x00, 0xA3, 0xC0, 0x02, 0x00, 0xA9, 0xE9, 0x00, 0x00, 0x07, 0x02, 0x00, 0x00, 0xE4, 0x62, 0x08, 0x00, 0xAC, 0x05, 0x00, 0x00, 0xFE, 0xB5, 0x07, 0x1C, 0x7D, 0x69, 0xBE, 0x69, 0x0C, 0x20, 0x30, 0x1A, 0x01, 0x90, 0xDF, 0x4C, 0x0A, 0x2D, 0x13, 0xD1, 0xFF, 0xFF, 0xD0, 0x76, 0x08, 0x00, 0x96, 0x00, 0x00, 0x00, 0x30, 0x68, 0xDB, 0x49, 0x08, 0x60, 0x01, 0x20, 0x86, 0x46, 0xDA, 0x48, 0xFE, 0x44, 0x00, 0x47, 0x0A, 0x20, 0x00, 0x21, 0x01, 0x9A, 0x01, 0x23, 0x9E, 0x46, 0xE6, 0x4B, 0xFE, 0x44, 0x18, 0x47, 0xF5, 0x20, 0x80, 0x00, 0x00, 0x19, 0x38, 0x62, 0x03, 0x2D, 0x79, 0xD1, 0xF5, 0x20, 0x80, 0x00, 0x00, 0x19, 0x02, 0x90, 0x70, 0x68, 0x00, 0x28, 0x0C, 0xD1, 0x00, 0x21, 0xCF, 0x48, 0x01, 0x60, 0xCF, 0x48, 0x00, 0x68, 0x00, 0x28, 0x61, 0xD0, 0x01, 0x21, 0x8E, 0x46, 0xCD, 0x49, 0xFE, 0x44, 0x08, 0x47, 0x5B, 0xE0, 0xCC, 0x48, 0xB1, 0x68, 0x01, 0x60 ,
-0xF1, 0x68, 0x41, 0x60, 0x31, 0x69, 0x81, 0x60, 0x71, 0x69, 0xC1, 0x60, 0xB1, 0x69, 0xC1, 0x63, 0xF1, 0x69, 0x01, 0x64, 0x31, 0x6A, 0xC1, 0x64, 0x01, 0x24, 0xA6, 0x46, 0xC5, 0x48, 0xFE, 0x44, 0x00, 0x47, 0xA6, 0x46, 0xC4, 0x48, 0xFE, 0x44, 0x00, 0x47, 0x70, 0x68, 0x7D, 0x25, 0xED, 0x00, 0xA8, 0x42, 0x21, 0xD8, 0x01, 0x28, 0x18, 0xD0, 0x02, 0x28, 0x05, 0xD0, 0xFF, 0xFF, 0x66, 0x77, 0x08, 0x00, 0x96, 0x00, 0x00, 0x00, 0x28, 0x1C, 0xA6, 0x46, 0xBE, 0x49, 0xFE, 0x44, 0x08, 0x47, 0x1C, 0xE0, 0xB9, 0x48, 0x00, 0x23, 0x19, 0x1C, 0x59, 0x43, 0x3E, 0x22, 0x4A, 0x43, 0x82, 0x83, 0x02, 0x30, 0x01, 0x33, 0x10, 0x2B, 0xF6, 0xDB, 0xA6, 0x46, 0xB4, 0x48, 0xFE, 0x44, 0x00, 0x47, 0xB5, 0x48, 0x0D, 0xE0, 0xB5, 0x4D, 0x28, 0x1C, 0xA6, 0x46, 0xB2, 0x49, 0xFE, 0x44, 0x08, 0x47, 0x04, 0xE0, 0xA6, 0x46, 0xAF, 0x49, 0xFE, 0x44, 0x08, 0x47, 0x75, 0x68, 0xAE, 0x48, 0x05, 0x60, 0x05, 0x1C, 0xA7, 0x4E, 0x30, 0x68 ,
-0x00, 0x28, 0x06, 0xD1, 0xAD, 0x48, 0x00, 0x68, 0xA6, 0x46, 0xAC, 0x49, 0xFE, 0x44, 0x08, 0x47, 0x30, 0x60, 0x00, 0x94, 0x2B, 0x68, 0xAA, 0x49, 0xAB, 0x4A, 0xA6, 0x46, 0xAB, 0x4D, 0xFE, 0x44, 0x28, 0x47, 0x9C, 0x48, 0x04, 0x60, 0x03, 0x20, 0x00, 0x21, 0x01, 0x9A, 0x01, 0x23, 0x9E, 0x46, 0xA7, 0x4B, 0xFE, 0x44, 0x18, 0x47, 0x02, 0x98, 0x38, 0x62, 0xFE, 0xBD, 0xC0, 0x46, 0x13, 0x7F, 0x03, 0x00, 0x12, 0x10, 0x00, 0x00, 0xFF, 0xFF, 0xFC, 0x77, 0x08, 0x00, 0x96, 0x00, 0x00, 0x00, 0x30, 0xB5, 0x05, 0x1C, 0x00, 0x20, 0x01, 0x24, 0xA6, 0x46, 0xA0, 0x49, 0xFE, 0x44, 0x08, 0x47, 0xA6, 0x46, 0x9F, 0x49, 0xFE, 0x44, 0x08, 0x47, 0xA6, 0x46, 0x9E, 0x48, 0xFE, 0x44, 0x00, 0x47, 0x7D, 0x21, 0xC9, 0x00, 0xA6, 0x46, 0x9E, 0x4A, 0xFE, 0x44, 0x10, 0x47, 0x9B, 0x49, 0x08, 0x18, 0x99, 0x49, 0x08, 0x80, 0x9B, 0x48, 0x0A, 0x30, 0x28, 0x62, 0x30, 0xBD, 0x11, 0x10, 0x00, 0x00, 0xDD, 0x7E, 0x03, 0x00, 0xB9, 0x90 ,
-0x00, 0x00, 0x6C, 0x64, 0x08, 0x00, 0xE7, 0x7E, 0x03, 0x00, 0x74, 0x64, 0x08, 0x00, 0x70, 0x64, 0x08, 0x00, 0x6D, 0xC6, 0x03, 0x00, 0x08, 0x19, 0x1B, 0x00, 0x11, 0x18, 0x02, 0x00, 0xD1, 0x78, 0x02, 0x00, 0xC9, 0xBA, 0x03, 0x00, 0x09, 0xB4, 0x03, 0x00, 0x14, 0x0D, 0x1B, 0x00, 0xFE, 0xB5, 0x02, 0x90, 0x45, 0x69, 0x68, 0x46, 0x01, 0x21, 0x8E, 0x46, 0x89, 0x49, 0xFE, 0x44, 0x08, 0x47, 0x89, 0x48, 0x04, 0x1C, 0x68, 0x68, 0x01, 0x69, 0x4A, 0x78, 0x00, 0x27, 0x3E, 0x1C, 0x20, 0x88, 0xFF, 0xFF, 0x92, 0x78, 0x08, 0x00, 0x96, 0x00, 0x00, 0x00, 0x40, 0x08, 0x22, 0xD3, 0x20, 0x1D, 0x89, 0x1C, 0x01, 0x23, 0x9E, 0x46, 0x83, 0x4B, 0xFE, 0x44, 0x18, 0x47, 0x00, 0x28, 0x07, 0xD1, 0x68, 0x68, 0x00, 0x69, 0x40, 0x78, 0x21, 0x88, 0x09, 0x04, 0x89, 0x16, 0x81, 0x42, 0x3D, 0xD0, 0x02, 0x20, 0x00, 0x5F, 0x00, 0x99, 0x08, 0x1A, 0x00, 0x04, 0x00, 0x14, 0x3C, 0x28, 0x03, 0xDD, 0x20, 0x88, 0x40, 0x10, 0x40, 0x00 ,
-0x20, 0x80, 0x78, 0x1C, 0x07, 0x06, 0x3F, 0x0E, 0x68, 0x68, 0x01, 0x69, 0x4A, 0x78, 0x2A, 0x34, 0x01, 0x36, 0x14, 0x2E, 0xD5, 0xDB, 0x00, 0x2A, 0x02, 0xD1, 0xAB, 0x20, 0x40, 0x00, 0x50, 0xE0, 0x00, 0x9B, 0x6D, 0x48, 0x14, 0x21, 0x00, 0x22, 0x04, 0x88, 0x64, 0x08, 0x03, 0xD3, 0x2A, 0x30, 0x01, 0x32, 0x01, 0x39, 0xF8, 0xD1, 0x12, 0x06, 0x12, 0x0E, 0x14, 0x2F, 0x16, 0xD1, 0x66, 0x48, 0x00, 0x88, 0x00, 0x06, 0x44, 0x16, 0x64, 0x49, 0x00, 0x22, 0x01, 0x20, 0x4E, 0x8D, 0x36, 0x06, 0x76, 0x16, 0xA6, 0x42, 0x02, 0xDD, 0x34, 0x1C, 0x02, 0x06, 0xFF, 0xFF, 0x28, 0x79, 0x08, 0x00, 0x96, 0x00, 0x00, 0x00, 0x12, 0x0E, 0x2A, 0x31, 0x01, 0x30, 0x14, 0x28, 0xF3, 0xDB, 0x02, 0xE0, 0x32, 0x06, 0x12, 0x0E, 0x00, 0x9B, 0x2A, 0x20, 0x42, 0x43, 0x5A, 0x48, 0x11, 0x18, 0x0C, 0x88, 0x01, 0x20, 0x20, 0x43, 0x00, 0x04, 0x00, 0x0C, 0x08, 0x80, 0xFE, 0x24, 0xA0, 0x43, 0x14, 0x24, 0x64, 0x57, 0x64, 0x06, 0x24, 0x0E ,
-0x04, 0x43, 0x52, 0x48, 0x14, 0x52, 0x14, 0x18, 0x63, 0x80, 0x08, 0x88, 0x80, 0x05, 0x82, 0x0D, 0x68, 0x68, 0x00, 0x69, 0x40, 0x78, 0x80, 0x02, 0x10, 0x43, 0x08, 0x80, 0x68, 0x68, 0x02, 0x69, 0x20, 0x1D, 0x91, 0x1C, 0x52, 0x78, 0x01, 0x23, 0x9E, 0x46, 0x4B, 0x4B, 0xFE, 0x44, 0x18, 0x47, 0x02, 0x98, 0x04, 0x61, 0xFE, 0x20, 0x47, 0x49, 0x09, 0x18, 0x02, 0x98, 0x01, 0x62, 0xFE, 0xBD, 0x82, 0x69, 0x41, 0x69, 0x03, 0x69, 0x02, 0x2B, 0x0A, 0xD1, 0x01, 0x2A, 0x01, 0xD1, 0x00, 0x29, 0x05, 0xD0, 0x02, 0x2A, 0x04, 0xD1, 0x00, 0x29, 0x02, 0xD1, 0x11, 0x21, 0x00, 0xE0, 0x06, 0x21, 0x41, 0x61, 0xF7, 0x46, 0xFF, 0xFF, 0xBE, 0x79, 0x08, 0x00, 0x96, 0x00, 0x00, 0x00, 0xC0, 0x46, 0x14, 0xE9, 0x00, 0x00, 0xC9, 0x18, 0x02, 0x00, 0x30, 0xB5, 0x05, 0x1C, 0x3A, 0x48, 0x00, 0x78, 0x00, 0x28, 0x04, 0xD0, 0x01, 0x20, 0x86, 0x46, 0x38, 0x48, 0xFE, 0x44, 0x00, 0x47, 0x01, 0x24, 0xA6, 0x46, 0x37, 0x48, 0xFE, 0x44 ,
-0x00, 0x47, 0xA6, 0x46, 0x36, 0x48, 0xFE, 0x44, 0x00, 0x47, 0x35, 0x48, 0x0E, 0x30, 0x28, 0x62, 0x30, 0xBD, 0x49, 0x19, 0x01, 0x00, 0x2F, 0x7A, 0x02, 0x00, 0x18, 0xB5, 0x43, 0x69, 0x81, 0x69, 0x31, 0x48, 0x81, 0x29, 0x00, 0xD1, 0x0B, 0x38, 0x00, 0x21, 0x00, 0x91, 0x1A, 0x68, 0x9B, 0x68, 0x01, 0x24, 0xA6, 0x46, 0x2D, 0x4C, 0xFE, 0x44, 0x20, 0x47, 0x18, 0xBD, 0x18, 0xB5, 0x40, 0x69, 0x00, 0x21, 0x00, 0x91, 0x02, 0x68, 0x83, 0x68, 0x27, 0x48, 0x01, 0x30, 0x01, 0x24, 0xA6, 0x46, 0x26, 0x4C, 0xFE, 0x44, 0x20, 0x47, 0x18, 0xBD, 0xC0, 0x46, 0x30, 0x63, 0x08, 0x00, 0x19, 0x9E, 0x00, 0x00, 0xB9, 0xEC, 0x00, 0x00, 0x74, 0x3F, 0x08, 0x00, 0x80, 0x3F, 0x08, 0x00, 0xFF, 0xFF, 0x54, 0x7A, 0x08, 0x00, 0x96, 0x00, 0x00, 0x00, 0xB7, 0x5D, 0x03, 0x00, 0x00, 0x00, 0x1B, 0x00, 0xD3, 0x8E, 0x00, 0x00, 0xF7, 0xC6, 0x00, 0x00, 0xE5, 0x90, 0x00, 0x00, 0x68, 0x64, 0x08, 0x00, 0xC0, 0x27, 0x09, 0x00, 0xA0, 0x3B ,
-0x08, 0x00, 0x3D, 0x5D, 0x03, 0x00, 0x19, 0xC6, 0x00, 0x00, 0xE8, 0x3A, 0x08, 0x00, 0x81, 0x5D, 0x03, 0x00, 0xCF, 0xF6, 0x00, 0x00, 0x4B, 0x4F, 0x03, 0x00, 0x6B, 0xC0, 0x03, 0x00, 0x95, 0x1E, 0x01, 0x00, 0xDA, 0x40, 0x08, 0x00, 0xDC, 0x05, 0x00, 0x00, 0x55, 0xAA, 0x03, 0x00, 0x0D, 0x91, 0x00, 0x00, 0xD7, 0x56, 0x03, 0x00, 0x08, 0x51, 0x08, 0x00, 0x8F, 0xC6, 0x03, 0x00, 0x65, 0xB8, 0x00, 0x00, 0x09, 0xB4, 0x03, 0x00, 0x84, 0x17, 0x1B, 0x00, 0xB5, 0x86, 0x01, 0x00, 0x3D, 0x47, 0x02, 0x00, 0x73, 0x49, 0x02, 0x00, 0x5F, 0x90, 0x00, 0x00, 0x0E, 0x10, 0x00, 0x00, 0xF7, 0xF6, 0x00, 0x00, 0xFF, 0xB5, 0x68, 0x46, 0xFF, 0xF7, 0x76, 0xFF, 0xFF, 0xBD, 0xFF, 0xB5, 0x68, 0x46, 0xFF, 0xF7, 0x5A, 0xFF, 0xFF, 0xBD, 0xFF, 0xB5, 0xFF, 0xFF, 0xEA, 0x7A, 0x08, 0x00, 0x58, 0x00, 0x00, 0x00, 0x68, 0x46, 0xFF, 0xF7, 0x99, 0xFF, 0xFF, 0xBD, 0xFF, 0xB5, 0x68, 0x46, 0xFF, 0xF7, 0x83, 0xFF, 0xFF, 0xBD, 0xFF, 0xB5 ,
-0x68, 0x46, 0xFF, 0xF7, 0xB6, 0xFE, 0xFF, 0xBD, 0xFF, 0xB5, 0x68, 0x46, 0xFF, 0xF7, 0x55, 0xFC, 0xFF, 0xBD, 0xFF, 0xB5, 0x68, 0x46, 0xFF, 0xF7, 0x27, 0xFB, 0xFF, 0xBD, 0xFF, 0xB5, 0x68, 0x46, 0xFF, 0xF7, 0xDD, 0xFA, 0xFF, 0xBD, 0xFF, 0xB5, 0x68, 0x46, 0xFF, 0xF7, 0x68, 0xFE, 0xFF, 0xBD, 0xFF, 0xB5, 0x68, 0x46, 0xFF, 0xF7, 0x3D, 0xFB, 0xFF, 0xBD, 0xFF, 0xB5, 0x68, 0x46, 0xFF, 0xF7, 0xBE, 0xFD, 0xFF, 0xBD, 0x78, 0x7B, 0x08, 0x00, 0x88, 0x00, 0x00, 0x00, 0x00, 0xB5, 0xF8, 0xF0, 0x43, 0xFA, 0x00, 0xBD, 0x35, 0x66, 0x08, 0x00, 0x67, 0x66, 0x08, 0x00, 0x71, 0x65, 0x08, 0x00, 0x4D, 0x66, 0x08, 0x00, 0x25, 0x64, 0x08, 0x00, 0x81, 0x66, 0x08, 0x00, 0x8D, 0x66, 0x08, 0x00, 0x99, 0x66, 0x08, 0x00, 0x87, 0x67, 0x08, 0x00, 0xA7, 0x67, 0x08, 0x00, 0xD1, 0x67, 0x08, 0x00, 0x1B, 0x68, 0x08, 0x00, 0x57, 0x68, 0x08, 0x00, 0x2D, 0x69, 0x08, 0x00, 0xB1, 0x6B, 0x08, 0x00, 0xD5, 0x6B, 0x08, 0x00, 0xF9, 0x6B ,
-0x08, 0x00, 0x15, 0x6C, 0x08, 0x00, 0xA1, 0x68, 0x08, 0x00, 0x59, 0x6C, 0x08, 0x00, 0xA7, 0x6D, 0x08, 0x00, 0xFF, 0x6D, 0x08, 0x00, 0x29, 0x6E, 0x08, 0x00, 0xF9, 0x6E, 0x08, 0x00, 0xD9, 0x6C, 0x08, 0x00, 0xA5, 0x6E, 0x08, 0x00, 0xCD, 0x6D, 0x08, 0x00, 0x81, 0x6F, 0x08, 0x00, 0x1D, 0x70, 0x08, 0x00, 0x31, 0x64, 0x08, 0x00, 0x39, 0x70, 0x08, 0x00, 0x3F, 0x70, 0x08, 0x00, 0x04, 0xF3, 0x1A, 0x00, 0x80, 0x00, 0x00, 0x00, 0xB2, 0x4E, 0x01, 0x00, 0x5A, 0xC1, 0x00, 0x00, 0x96, 0x1A, 0x01, 0x00, 0x22, 0x0B, 0x02, 0x00, 0x60, 0xD0, 0x01, 0x00, 0x06, 0x1A, 0x00, 0x00, 0xB8, 0xC6, 0x01, 0x00, 0xD8, 0x42, 0x03, 0x00, 0x16, 0x42, 0x03, 0x00, 0xEE, 0xDB, 0x00, 0x00, 0x62, 0xDC, 0x00, 0x00, 0xC8, 0xE1, 0x00, 0x00, 0x8A, 0x17, 0x02, 0x00, 0x38, 0xBE, 0x00, 0x00, 0x26, 0xC6, 0x00, 0x00, 0x56, 0xC2, 0x00, 0x00, 0x62, 0x12, 0x03, 0x00, 0xE4, 0xF4, 0x01, 0x00, 0x3A, 0xEC, 0x00, 0x00, 0x5E, 0x92, 0x00, 0x00 ,
-0xFE, 0xE8, 0x02, 0x00, 0x18, 0x7F, 0x00, 0x00, 0x64, 0xEC, 0x01, 0x00, 0xFE, 0x44, 0x03, 0x00, 0x1C, 0x94, 0x00, 0x00, 0xA8, 0x66, 0x03, 0x00, 0x74, 0xE9, 0x02, 0x00, 0x68, 0x1E, 0x01, 0x00, 0xBC, 0xDA, 0x00, 0x00, 0xEA, 0xE1, 0x00, 0x00, 0x24, 0xE9, 0x01, 0x00, 0x70, 0x79, 0x02, 0x00, 0x00, 0x00, 0x18, 0x00, 0x96, 0x00, 0x00, 0x00, 0x00, 0x06, 0x01, 0x1C, 0xF0, 0xB5, 0x88, 0xB0, 0xCA, 0x4C, 0x03, 0x20, 0x22, 0x78, 0x63, 0x78, 0xCA, 0x4E, 0x31, 0x1C, 0x01, 0x39, 0x01, 0x25, 0xAE, 0x46, 0xC7, 0x4F, 0xFE, 0x44, 0x38, 0x47, 0xA2, 0x78, 0xE3, 0x78, 0x03, 0x20, 0x31, 0x1C, 0xAE, 0x46, 0xC3, 0x4F, 0xFE, 0x44, 0x38, 0x47, 0x03, 0x20, 0x31, 0x1C, 0x01, 0x31, 0xAE, 0x46, 0xC1, 0x4A, 0xFE, 0x44, 0x10, 0x47, 0xC1, 0x48, 0x21, 0x78, 0x01, 0x70, 0x61, 0x78, 0x41, 0x70, 0xE1, 0x78, 0xC1, 0x70, 0xA1, 0x78, 0x81, 0x70, 0xBF, 0x48, 0x04, 0x1C, 0x33, 0x3C, 0x20, 0x1C, 0x00, 0x21, 0xDC, 0x22, 0xAE, 0x46 ,
-0xBA, 0x4B, 0xFE, 0x44, 0x18, 0x47, 0x84, 0x20, 0xA0, 0x70, 0x05, 0x27, 0xE7, 0x71, 0x0C, 0x26, 0x26, 0x73, 0x0D, 0x20, 0x00, 0x19, 0x98, 0xA1, 0x32, 0x1C, 0xAE, 0x46, 0xB4, 0x4B, 0xFE, 0x44, 0x18, 0x47, 0x04, 0x20, 0x60, 0x76, 0x1A, 0x20, 0x00, 0x19, 0x97, 0xA1, 0x06, 0x91, 0x04, 0x22, 0xAE, 0x46, 0xAE, 0x4B, 0xFE, 0x44, 0x18, 0x47, 0xFF, 0xFF, 0x96, 0x00, 0x18, 0x00, 0x96, 0x00, 0x00, 0x00, 0xA7, 0x77, 0x1F, 0x34, 0x95, 0xA1, 0x07, 0x91, 0x20, 0x1C, 0x3A, 0x1C, 0xAE, 0x46, 0xA9, 0x4B, 0xFE, 0x44, 0x18, 0x47, 0xE6, 0x71, 0x28, 0x1C, 0x60, 0x72, 0x11, 0x20, 0x20, 0x73, 0x94, 0x20, 0x60, 0x73, 0xC0, 0x25, 0x65, 0x74, 0xA6, 0x74, 0x09, 0x22, 0xE2, 0x74, 0xA3, 0x4C, 0x20, 0x1C, 0x8C, 0xA1, 0x01, 0x23, 0x9E, 0x46, 0x9F, 0x4B, 0xFE, 0x44, 0x18, 0x47, 0x07, 0x22, 0x62, 0x72, 0x9E, 0x4C, 0x0A, 0x34, 0x20, 0x1C, 0x89, 0xA1, 0x01, 0x23, 0x9E, 0x46, 0x9A, 0x4B, 0xFE, 0x44, 0x18, 0x47, 0x04, 0x20 ,
-0xE0, 0x71, 0x98, 0x4C, 0x12, 0x34, 0x20, 0x1C, 0x06, 0x99, 0x04, 0x22, 0x01, 0x23, 0x9E, 0x46, 0x94, 0x4B, 0xFE, 0x44, 0x18, 0x47, 0x27, 0x71, 0x93, 0x4C, 0x17, 0x34, 0x20, 0x1C, 0x07, 0x99, 0x3A, 0x1C, 0x01, 0x23, 0x9E, 0x46, 0x8E, 0x4B, 0xFE, 0x44, 0x18, 0x47, 0xE6, 0x71, 0x01, 0x20, 0x60, 0x72, 0x11, 0x20, 0x20, 0x73, 0x94, 0x20, 0x60, 0x73, 0x02, 0x20, 0xE0, 0x73, 0x25, 0x74, 0x66, 0x74, 0xFF, 0xFF, 0x2C, 0x01, 0x18, 0x00, 0x96, 0x00, 0x00, 0x00, 0xA5, 0x74, 0x2F, 0x27, 0xE7, 0x74, 0x10, 0x20, 0x60, 0x75, 0x80, 0x26, 0xA6, 0x75, 0x01, 0x20, 0xE0, 0x75, 0x11, 0x20, 0xA0, 0x76, 0x94, 0x20, 0xE0, 0x76, 0x24, 0x20, 0x60, 0x77, 0x0A, 0x22, 0xA2, 0x77, 0x80, 0x4C, 0x36, 0x34, 0x20, 0x1C, 0x6D, 0xA1, 0x01, 0x23, 0x9E, 0x46, 0x7C, 0x4B, 0xFE, 0x44, 0x18, 0x47, 0x18, 0x22, 0xA2, 0x72, 0x7A, 0x4C, 0x41, 0x34, 0x20, 0x1C, 0x6B, 0xA1, 0x01, 0x23, 0x9E, 0x46, 0x76, 0x4B, 0xFE, 0x44, 0x18, 0x47 ,
-0x25, 0x76, 0x67, 0x76, 0x21, 0x20, 0xE0, 0x76, 0x26, 0x77, 0x01, 0x20, 0x60, 0x77, 0x72, 0x48, 0x61, 0x30, 0x11, 0x21, 0x01, 0x70, 0x94, 0x21, 0x41, 0x70, 0x04, 0x21, 0x01, 0x72, 0xD2, 0x21, 0x41, 0x72, 0xC5, 0x72, 0x1E, 0x21, 0x01, 0x73, 0x45, 0x73, 0x9E, 0x21, 0x81, 0x73, 0x01, 0x21, 0x01, 0x74, 0x46, 0x74, 0x81, 0x74, 0x11, 0x21, 0x41, 0x75, 0x94, 0x21, 0x81, 0x75, 0x04, 0x21, 0x01, 0x76, 0xAD, 0x20, 0x66, 0x49, 0x08, 0x60, 0x00, 0x24, 0x0F, 0x25, 0xFF, 0xFF, 0xC2, 0x01, 0x18, 0x00, 0x96, 0x00, 0x00, 0x00, 0x29, 0x06, 0x09, 0x0E, 0x00, 0x20, 0x6A, 0x46, 0x01, 0x23, 0x9E, 0x46, 0x62, 0x4B, 0xFE, 0x44, 0x18, 0x47, 0x6B, 0x46, 0x18, 0x88, 0x40, 0x08, 0x0E, 0xD3, 0xA0, 0x00, 0x0F, 0x21, 0xCA, 0x43, 0x69, 0x46, 0x0E, 0x88, 0x16, 0x40, 0x01, 0xAF, 0x3E, 0x52, 0x49, 0x88, 0x11, 0x40, 0x68, 0x44, 0xC1, 0x80, 0x60, 0x1C, 0x04, 0x04, 0x24, 0x0C, 0x01, 0x3D, 0x0B, 0x2D, 0xE0, 0xDA, 0x60, 0x1E ,
-0x00, 0x04, 0x00, 0x0C, 0x1D, 0xD0, 0x86, 0x46, 0x01, 0x1C, 0x01, 0xAD, 0x01, 0x22, 0xAE, 0x88, 0x90, 0x00, 0xC7, 0x5A, 0xB7, 0x42, 0x0A, 0xDA, 0xBC, 0x46, 0x07, 0x1C, 0x6F, 0x44, 0x7F, 0x88, 0x68, 0x44, 0x06, 0x80, 0xEE, 0x88, 0x46, 0x80, 0x60, 0x46, 0xA8, 0x80, 0xEF, 0x80, 0x04, 0x35, 0x50, 0x1C, 0x02, 0x04, 0x12, 0x0C, 0x01, 0x39, 0xE9, 0xD1, 0x70, 0x46, 0x01, 0x38, 0x86, 0x46, 0xE2, 0xD1, 0x99, 0x88, 0x68, 0x46, 0xC0, 0x88, 0x40, 0x18, 0x00, 0x04, 0x00, 0x0C, 0x42, 0x4B, 0x18, 0x80, 0x42, 0x49, 0x08, 0x1A, 0xFF, 0xFF, 0x58, 0x02, 0x18, 0x00, 0x96, 0x00, 0x00, 0x00, 0x58, 0x80, 0x02, 0x2C, 0x1E, 0xDB, 0x65, 0x1E, 0x01, 0xAA, 0x01, 0x20, 0x01, 0x1C, 0x8C, 0x00, 0x6B, 0x46, 0xE6, 0x5A, 0x93, 0x88, 0xD4, 0x88, 0xE7, 0x18, 0xB7, 0x42, 0x0C, 0xDA, 0x06, 0x24, 0x44, 0x43, 0x38, 0x4B, 0x1B, 0x19, 0x1F, 0x80, 0x1C, 0x88, 0x34, 0x1B, 0x5C, 0x80, 0x01, 0x24, 0x1C, 0x71, 0x40, 0x1C, 0x00, 0x04 ,
-0x00, 0x0C, 0x04, 0x32, 0x49, 0x1C, 0x09, 0x06, 0x09, 0x0E, 0x01, 0x3D, 0xE4, 0xD1, 0x00, 0x24, 0x31, 0x48, 0x04, 0x70, 0x31, 0x48, 0x04, 0x70, 0x31, 0x48, 0x04, 0x70, 0x31, 0x48, 0x04, 0x70, 0x01, 0x20, 0x86, 0x46, 0x30, 0x48, 0xFE, 0x44, 0x00, 0x47, 0x2F, 0x49, 0x22, 0x1C, 0x08, 0x68, 0x00, 0x28, 0x02, 0xD0, 0x01, 0x20, 0x90, 0x40, 0x04, 0x43, 0x04, 0x31, 0x01, 0x32, 0x20, 0x2A, 0xF5, 0xD3, 0x2A, 0x48, 0x04, 0x60, 0x08, 0xB0, 0xF0, 0xBD, 0x5F, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x2D, 0x69, 0x6E, 0x66, 0x6F, 0x00, 0xC0, 0x46, 0xC0, 0x5F, 0x75, 0x64, 0x70, 0x00, 0xC0, 0xFF, 0xFF, 0xEE, 0x02, 0x18, 0x00, 0x96, 0x00, 0x00, 0x00, 0x46, 0xC0, 0x6C, 0x6F, 0x63, 0x61, 0x6C, 0x00, 0xC0, 0x46, 0x5F, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x00, 0xC0, 0x46, 0x5F, 0x64, 0x6E, 0x73, 0x2D, 0x73, 0x64, 0x00, 0x64, 0x65, 0x76, 0x3D, 0x43, 0x43, 0x33, 0x30, 0x30, 0x30, 0x00, 0xC0, 0x76, 0x65 ,
-0x6E, 0x64, 0x6F, 0x72, 0x3D, 0x54, 0x65, 0x78, 0x61, 0x73, 0x2D, 0x49, 0x6E, 0x73, 0x74, 0x72, 0x75, 0x6D, 0x65, 0x6E, 0x74, 0x73, 0x00, 0xC0, 0x46, 0xC0, 0x00, 0x00, 0x18, 0x00, 0xF3, 0x7E, 0x03, 0x00, 0xC6, 0x05, 0x00, 0x00, 0xDD, 0x7E, 0x03, 0x00, 0xE4, 0x62, 0x08, 0x00, 0xC9, 0xBA, 0x03, 0x00, 0x09, 0xB4, 0x03, 0x00, 0xA7, 0x64, 0x08, 0x00, 0x70, 0x64, 0x08, 0x00, 0xDD, 0x0A, 0x02, 0x00, 0x48, 0x32, 0x08, 0x00, 0x00, 0x80, 0xFF, 0xFF, 0xE8, 0x62, 0x08, 0x00, 0xE9, 0x62, 0x08, 0x00, 0xEA, 0x62, 0x08, 0x00, 0xEB, 0x62, 0x08, 0x00, 0x81, 0x03, 0x18, 0x00, 0x80, 0x7B, 0x08, 0x00, 0x84, 0xF3, 0x1A, 0x00, 0x0D, 0x49, 0x0E, 0x48, 0xFF, 0xFF, 0x84, 0x03, 0x18, 0x00, 0x6C, 0x00, 0x00, 0x00, 0x88, 0x67, 0x0E, 0x48, 0x88, 0x64, 0x0E, 0x48, 0x48, 0x64, 0x0E, 0x48, 0xC8, 0x64, 0x0E, 0x48, 0x08, 0x65, 0x11, 0x48, 0x02, 0x1C, 0x04, 0x32, 0x0C, 0x4B, 0x13, 0x60, 0x0C, 0x4B, 0x93, 0x62, 0x0C, 0x4A ,
-0x8A, 0x66, 0x0D, 0x49, 0x01, 0x60, 0x0D, 0x48, 0x0E, 0x49, 0x01, 0x60, 0x0E, 0x49, 0x41, 0x60, 0xF7, 0x46, 0x1C, 0x21, 0x08, 0x00, 0x1B, 0x7B, 0x08, 0x00, 0x11, 0x7B, 0x08, 0x00, 0x07, 0x7B, 0x08, 0x00, 0x39, 0x7B, 0x08, 0x00, 0x2F, 0x7B, 0x08, 0x00, 0x25, 0x7B, 0x08, 0x00, 0xFD, 0x7A, 0x08, 0x00, 0xDF, 0x7A, 0x08, 0x00, 0x50, 0x23, 0x08, 0x00, 0xD5, 0x7A, 0x08, 0x00, 0x58, 0x26, 0x08, 0x00, 0xF3, 0x7A, 0x08, 0x00, 0xE9, 0x7A, 0x08, 0x00 };
-
-
-const unsigned char cRMdefaultParams[128] = { 0x03, 0x00, 0x01, 0x01, 0x14, 0x14, 0x00, 0x27, 0x27, 0x27, 0x27, 0x27, 0x27, 0x27, 0x27, 0x27, 0x27, 0x27, 0x27, 0x27, 0x27, 0x23, 0x25, 0x25, 0x25, 0x25, 0x25, 0x25, 0x25, 0x25, 0x25, 0x23, 0x23, 0x23, 0x23, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50, 0x50, 0x50, 0x50, 0x50, 0x50, 0x50, 0x50, 0x50, 0x50, 0x50, 0x50, 0x50, 0x50, 0x50, 0x50, 0x50, 0x50, 0x50, 0x50, 0x50, 0x50, 0x50, 0x50, 0x50, 0x50, 0x50, 0x50, 0x50, 0x50, 0x50, 0x50, 0x50, 0x50, 0x50, 0x01, 0x77, 0x80, 0x1D, 0x1F, 0x22, 0x26, 0x28, 0x29, 0x1A, 0x1F, 0x22, 0x24, 0x26, 0x28, 0x16, 0x1D, 0x1E, 0x20, 0x24, 0x25, 0x1E, 0x2D, 0x01, 0x02, 0x02, 0x02, 0x02, 0x00, 0x15, 0x15, 0x15, 0x11, 0x15, 0x15, 0x0E, 0x00};
-
-//
-//Service Pack version P1.13.7.15.15 - FW patches
-//
-const unsigned char fw_patch[5700] = { 0x00, 0x01, 0x00, 0x00, 0x3C, 0x16, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x14, 0x03, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x68, 0x46, 0x25, 0xF0, 0x95, 0xFB, 0xE0, 0x6B, 0xD0, 0x03, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x25, 0xF0, 0x38, 0xFB, 0x2C, 0x04, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x25, 0xF0, 0x0A, 0xFB, 0x04, 0x15, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0xB8, 0xF1, 0x90, 0x0F, 0xA4, 0x16, 0x00, 0x00, 0xC8, 0x00, 0x00, 0x00, 0x66, 0xE0, 0x04, 0xA8, 0x35, 0x1D, 0x21, 0xF0, 0x99, 0xFC, 0x68, 0x46, 0x23, 0xF0, 0x28, 0xFB, 0x9A, 0xF8, 0x00, 0x00, 0x01, 0x28, 0x07, 0xD1, 0x28, 0x46, 0x05, 0xF0, 0xC3, 0xFE, 0x01, 0x46, 0x01, 0xAA, 0x00, 0x20, 0x21, 0xF0, 0x50, 0xF9, 0x28, 0x46, 0x05, 0xF0, 0xBB, 0xFE, 0x01, 0xA9, 0x21, 0xF0, 0x2A, 0xFA, 0xE9, 0x79, 0x4F, 0xEA, 0xE0, 0x00, 0x40, 0xB2, 0x11, 0xB1, 0x00, 0xF1, 0x06, 0x00, 0x40, 0xB2, 0xA8, 0x71, 0x1F, 0x38, 0x40, 0x00, 0xE8, 0x71, 0x30, 0x46 ,
-0x01, 0xF0, 0x0D, 0xFF, 0x10, 0xF1, 0x00, 0x09, 0x4F, 0xF0, 0x00, 0x01, 0x09, 0xD0, 0x28, 0x68, 0x40, 0x0C, 0x09, 0xD3, 0xE8, 0x68, 0xC0, 0x0B, 0x03, 0xD2, 0x48, 0x46, 0xFF, 0xF7, 0xDD, 0xFE, 0x01, 0x21, 0x28, 0x68, 0x40, 0x0C, 0x0A, 0xD2, 0x38, 0x68, 0x40, 0x1C, 0x38, 0x60, 0x20, 0x68, 0x6F, 0xF3, 0x0F, 0x00, 0x20, 0x60, 0x22, 0x68, 0x38, 0x68, 0x10, 0x43, 0x20, 0x60, 0xE8, 0x68, 0xC0, 0x0B, 0x0F, 0xD3, 0xD8, 0xF8, 0x00, 0x00, 0x00, 0xF1, 0x01, 0x00, 0xC8, 0xF8, 0x00, 0x00, 0x20, 0x68, 0x6F, 0xF3, 0x1F, 0x40, 0x20, 0x60, 0xD8, 0xF8, 0x00, 0x20, 0x20, 0x68, 0x40, 0xEA, 0x02, 0x40, 0x20, 0x60, 0x49, 0xB9, 0xB9, 0xF1, 0x00, 0x0F, 0x03, 0xD1, 0x30, 0x46, 0x07, 0xF0, 0xBE, 0xF9, 0x02, 0xE0, 0x48, 0x46, 0x07, 0xF0, 0x06, 0xFA, 0x6C, 0x17, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x68, 0x46, 0x0E, 0xF0, 0x85, 0xFB, 0x00, 0x9E, 0x00, 0x2E, 0x96, 0xD1, 0x05, 0xB0, 0xBD, 0xE8, 0xF0, 0x87, 0xC0, 0x46 ,
-0x9C, 0x20, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x23, 0xF0, 0x2A, 0xFE, 0x74, 0x47, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x0B, 0x21, 0x21, 0xF0, 0x41, 0xFA, 0x20, 0x68, 0x18, 0x4B, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x21, 0xF0, 0x1C, 0xF9, 0x0A, 0xE0, 0x20, 0x68, 0x00, 0x68, 0x0C, 0x21, 0x40, 0xF0, 0x20, 0x00, 0x21, 0xF0, 0x14, 0xF9, 0x10, 0x57, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x01, 0xA8, 0x20, 0xF0, 0x97, 0xF9, 0x01, 0x98, 0x5C, 0x57, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x02, 0xA8, 0x20, 0xF0, 0x71, 0xF9, 0x03, 0x98, 0x00, 0x58, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x20, 0xF0, 0x20, 0xF9, 0x1C, 0x58, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x20, 0xF0, 0x12, 0xF9, 0x54, 0x58, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x09, 0xA8, 0x20, 0xF0, 0xF5, 0xF8, 0x04, 0xAB, 0x04, 0x62, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x20, 0x79, 0x1F, 0xF0, 0x1B, 0xFD, 0x69, 0xE0, 0x60, 0x93, 0x00, 0x00, 0x40, 0x00 ,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x48, 0xA6, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x78, 0x1B, 0xF0, 0x39, 0xFB, 0x28, 0x46, 0x90, 0xA8, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x78, 0x1B, 0xF0, 0x69, 0xF9, 0x1E, 0x48, 0x34, 0xAD, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x09, 0x68, 0xFF, 0x29, 0x98, 0xAD, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x10, 0xD4, 0x21, 0xD4, 0xB2, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x09, 0xD0, 0x1A, 0xF0, 0x47, 0xFC, 0x20, 0x98, 0xAC, 0xC5, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x78, 0x19, 0xF0 ,
-0xDB, 0xFA, 0x09, 0x49, 0x28, 0xC6, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x19, 0xF0, 0x9E, 0xFA, 0xDC, 0xD3, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0xB5, 0x18, 0xF0, 0xAB, 0xFC, 0x00, 0xF0, 0x03, 0xF8, 0x00, 0xBD, 0x00, 0x00, 0x00, 0x00, 0xC0, 0xDF, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x17, 0xF0, 0xA8, 0xFD, 0xCC, 0xEB, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x38, 0x78, 0x17, 0xF0, 0x77, 0xF8, 0x38, 0x78, 0x16, 0xF0, 0xF0, 0xFF, 0xA8, 0xF7, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x0E, 0x49, 0x09, 0x68, 0x23, 0x22, 0x41, 0x61, 0xC8, 0xF7, 0x00, 0x00, 0x28, 0x00, 0x00, 0x00, 0x31, 0x2E, 0x31, 0x39, 0x2E, 0x33, 0x31, 0x34, 0x5F, 0x4E, 0x65, 0x77, 0x5F, 0x43, 0x43, 0x41, 0x5F, 0x61, 0x6C, 0x67, 0x6F, 0x72, 0x69, 0x74, 0x68, 0x6D, 0x00, 0xC0, 0x74, 0x56, 0x30, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4C, 0xF9, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x02, 0xA8, 0x16, 0xF0, 0x79, 0xF8 ,
-0x12, 0xE0, 0x38, 0xFA, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x01, 0xA8, 0x16, 0xF0, 0x03, 0xF8, 0x32, 0x20, 0x94, 0xFB, 0x00, 0x00, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x34, 0x0C, 0x01, 0x00, 0x08, 0x00, 0x00, 0x00, 0x05, 0xA8, 0x14, 0xF0, 0x05, 0xFF, 0x01, 0xF0, 0x10, 0x1B, 0x01, 0x00, 0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 ,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x1E, 0x01, 0x00, 0x04, 0x00, 0x00, 0x00, 0x13, 0xF0, 0x46, 0xBF, 0x18, 0x30, 0x01, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, 0x30, 0x01, 0x00, 0x04, 0x00, 0x00, 0x00, 0x12, 0xF0, 0xD8, 0xFC, 0x9C, 0x31, 0x01, 0x00, 0x08, 0x00 ,
-0x00, 0x00, 0x68, 0x46, 0x12, 0xF0, 0x51, 0xFC, 0xFE, 0xF7, 0xF0, 0x35, 0x01, 0x00, 0x08, 0x00, 0x00, 0x00, 0x68, 0x46, 0x12, 0xF0, 0x27, 0xFA, 0xFE, 0xF7, 0xF0, 0x3D, 0x01, 0x00, 0x08, 0x00, 0x00, 0x00, 0x05, 0xA9, 0x11, 0xF0, 0x27, 0xFE, 0x20, 0x6F, 0xD0, 0x62, 0x01, 0x00, 0x04, 0x00, 0x00, 0x00, 0x0F, 0xF0, 0xB8, 0xFB, 0x80, 0x7E, 0x01, 0x00, 0x04, 0x00, 0x00, 0x00, 0xDF, 0xF8, 0x58, 0x82, 0xE0, 0x7E, 0x01, 0x00, 0x18, 0x00, 0x00, 0x00, 0x0D, 0xF0, 0x6A, 0xFE, 0x0B, 0xF0, 0x9A, 0xF9, 0x03, 0x20, 0xA8, 0xF5, 0x88, 0x71, 0x08, 0x60, 0xF2, 0xF7, 0x16, 0xF9, 0x7A, 0x48, 0x6B, 0x49, 0x9C, 0x7F, 0x01, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x70, 0x51, 0x4D, 0xC4, 0x7F, 0x01, 0x00, 0x3C, 0x00, 0x00, 0x00, 0x40, 0x49, 0x00, 0xF1, 0x52, 0x00, 0x3A, 0x4A, 0xA8, 0x81, 0x28, 0x83, 0xE8, 0x83, 0xE8, 0x84, 0xA8, 0x85, 0x2A, 0x60, 0x39, 0x48, 0x41, 0xF2, 0x11, 0x12, 0x2A, 0x85, 0x18, 0x90, 0x19, 0x91 ,
-0x39, 0x49, 0x1A, 0x91, 0x39, 0x49, 0x1B, 0x91, 0x39, 0x49, 0x20, 0x46, 0xDF, 0xF8, 0xC4, 0x90, 0x1C, 0x91, 0x38, 0x49, 0xDF, 0xF8, 0xC0, 0xB0, 0x31, 0x4E, 0x1D, 0x91, 0x48, 0x80, 0x01, 0x00, 0x04, 0x00, 0x00, 0x00, 0x0D, 0xF0, 0x7C, 0xFA, 0xB4, 0x80, 0x01, 0x00, 0x34, 0x00, 0x00, 0x00, 0x34, 0x12, 0x66, 0x09, 0x84, 0x6B, 0x00, 0x20, 0x94, 0x70, 0x00, 0x20, 0xB4, 0x70, 0x00, 0x20, 0xC4, 0x78, 0x00, 0x20, 0x50, 0x7A, 0x00, 0x20, 0xFE, 0xFF, 0x03, 0x00, 0xA4, 0x70, 0x00, 0x20, 0xB0, 0x70, 0x00, 0x20, 0xB8, 0x70, 0x00, 0x20, 0x60, 0x55, 0x30, 0x80, 0x3C, 0x5C, 0x00, 0x20, 0x04, 0x74, 0x00, 0x20, 0xB8, 0xE4, 0x01, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x20, 0x78, 0x07, 0xF0, 0x01, 0xFC, 0x20, 0x78, 0x07, 0xF0, 0x7A, 0xFB, 0x04, 0x4D, 0x02, 0x00, 0xC8, 0x00, 0x00, 0x00, 0x2D, 0xE9, 0xF0, 0x4F, 0xAD, 0xF1, 0x8C, 0x0D, 0x04, 0x68, 0x0F, 0x30, 0x03, 0x94, 0xFE, 0xF7, 0xDB, 0xFA, 0x04, 0xF1, 0x14, 0x00 ,
-0x04, 0x90, 0x21, 0x7D, 0x00, 0x20, 0x21, 0xF0, 0x73, 0x01, 0x88, 0x29, 0x08, 0xBF, 0x01, 0x20, 0x05, 0x90, 0x03, 0x98, 0x00, 0x1D, 0x06, 0x90, 0x5D, 0x48, 0x00, 0x68, 0x01, 0x28, 0x40, 0xF0, 0xFA, 0x83, 0x5B, 0x4D, 0x5C, 0x48, 0xDF, 0xF8, 0x70, 0x91, 0x29, 0x68, 0xDF, 0xF8, 0x70, 0x81, 0xDF, 0xF8, 0x74, 0xA1, 0x88, 0x42, 0x21, 0xD1, 0x10, 0x22, 0x00, 0x21, 0x48, 0x46, 0x4F, 0x46, 0xFB, 0xF7, 0xB7, 0xFE, 0x10, 0x22, 0x00, 0x21, 0x40, 0x46, 0xFB, 0xF7, 0xB2, 0xFE, 0x54, 0x49, 0x08, 0x68, 0x40, 0xF4, 0x80, 0x10, 0x08, 0x60, 0x01, 0x20, 0x51, 0x46, 0x08, 0x60, 0x00, 0x21, 0x29, 0x60, 0x39, 0x78, 0x46, 0x46, 0x00, 0x91, 0x31, 0x78, 0x41, 0xF2, 0x11, 0x13, 0x04, 0x22, 0x01, 0x91, 0x07, 0x21, 0x02, 0x90, 0x03, 0x20, 0xF3, 0xF7, 0x41, 0xFC, 0x51, 0x46, 0x07, 0x91, 0x08, 0x68, 0x56, 0x49, 0xDF, 0xF8, 0x5C, 0xB1, 0x01, 0x28, 0x08, 0x91, 0x56, 0x49, 0xDF, 0xF8, 0x48, 0xA1, 0x09, 0x91, 0x55, 0x49 ,
-0x0A, 0x91, 0x44, 0x49, 0x0B, 0x91, 0x44, 0x49, 0x0C, 0x91, 0x44, 0x49, 0x0D, 0x91, 0x44, 0x49, 0x0E, 0x91, 0x44, 0x49, 0x0F, 0x91, 0x44, 0x49, 0x10, 0x91, 0x44, 0x49, 0xCC, 0x4D, 0x02, 0x00, 0xC8, 0x00, 0x00, 0x00, 0x11, 0x91, 0x44, 0x49, 0x12, 0x91, 0x44, 0x49, 0x13, 0x91, 0x44, 0x49, 0x14, 0x91, 0x44, 0x49, 0x15, 0x91, 0x44, 0x49, 0x16, 0x91, 0x9F, 0x49, 0x17, 0x91, 0x9F, 0x49, 0x18, 0x91, 0x9F, 0x49, 0x19, 0x91, 0x9F, 0x49, 0x1A, 0x91, 0x9F, 0x49, 0x1B, 0x91, 0x9F, 0x49, 0x1C, 0x91, 0x9F, 0x49, 0x1D, 0x91, 0x9F, 0x49, 0x1E, 0x91, 0x9F, 0x49, 0x1F, 0x91, 0x40, 0xF0, 0x00, 0x81, 0x04, 0x98, 0x40, 0x78, 0x00, 0xF0, 0x03, 0x01, 0x01, 0x29, 0x40, 0xF0, 0xF9, 0x80, 0x04, 0x99, 0x09, 0x78, 0x01, 0xF0, 0x0C, 0x01, 0x08, 0x29, 0x40, 0xF0, 0xF2, 0x80, 0x06, 0x99, 0x09, 0x88, 0xA1, 0xF1, 0x3C, 0x01, 0x0E, 0xB2, 0x05, 0x99, 0x11, 0xB1, 0xA6, 0xF1, 0x02, 0x06, 0x36, 0xB2, 0xC0, 0x09, 0x4F, 0xF0 ,
-0x00, 0x07, 0x15, 0xD3, 0x08, 0x3E, 0x36, 0xB2, 0x03, 0x2E, 0x10, 0xD0, 0x17, 0x2E, 0x0E, 0xD0, 0x08, 0x3E, 0x36, 0xB2, 0x03, 0x2E, 0x08, 0xD0, 0x17, 0x2E, 0x06, 0xD0, 0x36, 0x1F, 0x36, 0xB2, 0x03, 0x2E, 0x14, 0xBF, 0x17, 0x2E, 0x02, 0x27, 0x02, 0xE0, 0x03, 0x27, 0x00, 0xE0, 0x01, 0x27, 0x03, 0x2E, 0x18, 0xBF, 0x17, 0x2E, 0x04, 0x9A, 0x40, 0xF0, 0xC8, 0x80, 0x0A, 0x32, 0x12, 0xF8, 0x01, 0x1B, 0x05, 0x24, 0x12, 0xF8, 0x01, 0x3B, 0x4B, 0x40, 0x64, 0x1E, 0xD9, 0xB2, 0xF9, 0xD1, 0x81, 0xEA, 0x21, 0x11, 0x03, 0x2E, 0x94, 0x4E, 0x02, 0x00, 0xC8, 0x00, 0x00, 0x00, 0x01, 0xF0, 0x0F, 0x01, 0x48, 0x46, 0x35, 0xD0, 0x43, 0x46, 0xCA, 0x5C, 0x52, 0x1C, 0xCA, 0x54, 0x0C, 0x18, 0x33, 0xE0, 0x50, 0x57, 0x02, 0x00, 0x04, 0x74, 0x00, 0x20, 0x34, 0x12, 0x66, 0x09, 0x60, 0x57, 0x02, 0x00, 0x70, 0x57, 0x02, 0x00, 0xC8, 0x48, 0x30, 0x80, 0x4C, 0x57, 0x02, 0x00, 0x88, 0x57, 0x02, 0x00, 0x80, 0x57, 0x02, 0x00 ,
-0x18, 0x58, 0x02, 0x00, 0x20, 0x58, 0x02, 0x00, 0x28, 0x58, 0x02, 0x00, 0x30, 0x58, 0x02, 0x00, 0x38, 0x58, 0x02, 0x00, 0x40, 0x58, 0x02, 0x00, 0xE4, 0x58, 0x02, 0x00, 0xE2, 0x58, 0x02, 0x00, 0x14, 0x58, 0x02, 0x00, 0xEF, 0x58, 0x02, 0x00, 0xE0, 0x58, 0x02, 0x00, 0xEE, 0x58, 0x02, 0x00, 0x5C, 0x57, 0x02, 0x00, 0xE6, 0x58, 0x02, 0x00, 0xE8, 0x58, 0x02, 0x00, 0x0C, 0x18, 0x20, 0x78, 0x40, 0x1C, 0x20, 0x70, 0x20, 0x78, 0x43, 0x46, 0x03, 0xEB, 0x01, 0x08, 0x0A, 0x28, 0x76, 0xDB, 0x98, 0xF8, 0x00, 0x00, 0x0A, 0x28, 0x72, 0xDB, 0x94, 0x48, 0x00, 0x25, 0x01, 0x60, 0x04, 0x98, 0x00, 0xF1, 0x0A, 0x09, 0x40, 0x78, 0x41, 0x08, 0x24, 0xBF, 0x04, 0x99, 0x09, 0x1D, 0x04, 0xD2, 0x80, 0x08, 0x2E, 0xBF, 0x49, 0x46, 0x04, 0x99, 0x10, 0x31, 0x0B, 0x98, 0x06, 0x22, 0xFA, 0xF7, 0xB9, 0xFC, 0x0C, 0x98, 0x06, 0x22, 0x49, 0x46, 0xFA, 0xF7, 0xB4, 0xFC, 0x9B, 0x48, 0x9A, 0x49, 0x5C, 0x4F, 0x02, 0x00, 0xC8, 0x00 ,
-0x00, 0x00, 0x00, 0x78, 0x08, 0x22, 0x08, 0x60, 0x58, 0x46, 0x07, 0x60, 0x0D, 0x98, 0x29, 0x46, 0xFB, 0xF7, 0xAF, 0xFD, 0x08, 0x22, 0x0E, 0x98, 0x29, 0x46, 0xFB, 0xF7, 0xAA, 0xFD, 0x08, 0x22, 0x0F, 0x98, 0x29, 0x46, 0xFB, 0xF7, 0xA5, 0xFD, 0x08, 0x22, 0x10, 0x98, 0x29, 0x46, 0xFB, 0xF7, 0xA0, 0xFD, 0x08, 0x22, 0x11, 0x98, 0x29, 0x46, 0xFB, 0xF7, 0x9B, 0xFD, 0x08, 0x22, 0x12, 0x98, 0x29, 0x46, 0xFB, 0xF7, 0x96, 0xFD, 0x07, 0x99, 0x02, 0x20, 0x08, 0x60, 0x13, 0x99, 0x28, 0x46, 0x08, 0x80, 0x08, 0x99, 0x08, 0x70, 0x14, 0x99, 0x08, 0x70, 0x15, 0x99, 0x08, 0x60, 0x16, 0x99, 0x08, 0x70, 0x17, 0x99, 0x08, 0x60, 0x18, 0x99, 0x08, 0x60, 0x19, 0x99, 0x08, 0x60, 0x09, 0x99, 0x08, 0x80, 0x0A, 0x99, 0x08, 0x80, 0x1A, 0x99, 0x08, 0x80, 0x7D, 0x49, 0x0D, 0x60, 0x1B, 0x99, 0x08, 0x70, 0x1C, 0x99, 0x08, 0x70, 0x1D, 0x99, 0x08, 0x70, 0x1E, 0x99, 0x08, 0x80, 0x1F, 0x99, 0x08, 0x80, 0x51, 0x46, 0x08, 0x80 ,
-0x20, 0x78, 0x00, 0x96, 0x04, 0x22, 0x01, 0x90, 0x98, 0xF8, 0x00, 0x00, 0x41, 0xF2, 0x14, 0x13, 0x07, 0x21, 0x02, 0x90, 0x03, 0x20, 0xF3, 0xF7, 0x07, 0xFB, 0x07, 0x98, 0xA2, 0x49, 0x00, 0x68, 0x20, 0x91, 0xA2, 0x49, 0x05, 0x28, 0x21, 0x91, 0x9E, 0x49, 0x22, 0x91, 0x40, 0xF0, 0x37, 0x82, 0x04, 0x98, 0x40, 0x78, 0x24, 0x50, 0x02, 0x00, 0xC8, 0x00, 0x00, 0x00, 0x41, 0x08, 0x24, 0xBF, 0x04, 0x99, 0x09, 0x1D, 0x05, 0xD2, 0x80, 0x08, 0x27, 0xBF, 0x04, 0x99, 0x0A, 0x31, 0x04, 0x99, 0x10, 0x31, 0x0B, 0x98, 0xF8, 0xF7, 0x2D, 0xFC, 0x01, 0x28, 0x04, 0x98, 0x40, 0xF0, 0x23, 0x82, 0x40, 0x78, 0x00, 0xF0, 0x03, 0x00, 0x03, 0x28, 0x18, 0xD0, 0x02, 0x28, 0x07, 0xBF, 0x04, 0x99, 0x10, 0x31, 0x04, 0x99, 0x0A, 0x31, 0x13, 0xE0, 0x48, 0x58, 0x02, 0x00, 0x4C, 0x58, 0x02, 0x00, 0x50, 0x58, 0x02, 0x00, 0xF0, 0x58, 0x02, 0x00, 0xF2, 0x58, 0x02, 0x00, 0xF3, 0x58, 0x02, 0x00, 0xF4, 0x58, 0x02, 0x00, 0xEA, 0x58 ,
-0x02, 0x00, 0xEC, 0x58, 0x02, 0x00, 0x04, 0x99, 0x18, 0x31, 0x0C, 0x98, 0xF8, 0xF7, 0x06, 0xFC, 0x04, 0x99, 0x01, 0x28, 0x40, 0xF0, 0xFC, 0x81, 0x49, 0x78, 0x01, 0xF0, 0x03, 0x01, 0x01, 0x29, 0x40, 0xF0, 0xF6, 0x81, 0x59, 0x46, 0x09, 0x68, 0x04, 0x9A, 0x8E, 0x46, 0x51, 0x46, 0xD2, 0x8A, 0x0B, 0x88, 0x12, 0x11, 0x93, 0x42, 0x00, 0xF0, 0x37, 0x82, 0x0A, 0x80, 0x06, 0x99, 0x09, 0x88, 0x3C, 0x39, 0x0B, 0xB2, 0x71, 0x46, 0x49, 0x1E, 0x09, 0xD0, 0x49, 0x1E, 0x04, 0xD0, 0x49, 0x1E, 0x08, 0xD1, 0xA3, 0xF1, 0x10, 0x03, 0x04, 0xE0, 0xA3, 0xF1, 0x14, 0x03, 0x01, 0xE0, 0xA3, 0xF1, 0x08, 0x03, 0x1B, 0xB2, 0x05, 0x98, 0x10, 0xB1, 0xA3, 0xF1, 0x02, 0x03, 0x1B, 0xB2, 0xEC, 0x50, 0x02, 0x00, 0xC8, 0x00, 0x00, 0x00, 0x00, 0x2B, 0x00, 0xF1, 0xCE, 0x81, 0x16, 0x98, 0x40, 0xF2, 0x77, 0x51, 0x99, 0x42, 0x0B, 0x90, 0x14, 0x98, 0x05, 0x90, 0x00, 0xF0, 0xA3, 0x81, 0x08, 0x46, 0x00, 0xF1, 0x3C, 0x00, 0x98, 0x42 ,
-0x05, 0x9A, 0x00, 0xF0, 0x9A, 0x81, 0xDF, 0xF8, 0x48, 0x82, 0x14, 0x78, 0x0B, 0x9A, 0xBB, 0x2C, 0x12, 0x78, 0x0C, 0x92, 0x63, 0xD1, 0xDD, 0xF8, 0x68, 0xC0, 0xBC, 0xF9, 0x00, 0x20, 0x91, 0x42, 0x18, 0xBF, 0x90, 0x42, 0x5B, 0xD1, 0x1C, 0x2B, 0x4F, 0xF0, 0x00, 0x00, 0xC0, 0xF2, 0x82, 0x81, 0x3D, 0x2B, 0x13, 0x9D, 0x80, 0xF2, 0x7E, 0x81, 0xA3, 0xF1, 0x1C, 0x01, 0x09, 0xB2, 0x29, 0x80, 0x1E, 0x9A, 0xDD, 0xF8, 0x30, 0x90, 0xB2, 0xF9, 0x00, 0x60, 0xB9, 0xF1, 0x01, 0x0F, 0x15, 0xD1, 0xDD, 0xF8, 0x24, 0x90, 0x03, 0x2E, 0x0D, 0xDA, 0xB9, 0xF9, 0x00, 0x70, 0xB9, 0x42, 0x07, 0xD0, 0x01, 0x26, 0x16, 0x80, 0x4A, 0x46, 0x0E, 0x46, 0x03, 0xE0, 0xC0, 0x46, 0x90, 0x57, 0x02, 0x00, 0x76, 0x1C, 0x16, 0x80, 0x1B, 0x9A, 0x16, 0x78, 0x1D, 0x9A, 0x16, 0x70, 0x0C, 0x9A, 0x1F, 0x9E, 0x02, 0x2A, 0x28, 0xD1, 0xB6, 0xF9, 0x00, 0x20, 0xBE, 0xF1, 0x00, 0x0F, 0x1A, 0xD0, 0x03, 0x2A, 0x35, 0x46, 0x0B, 0xDA, 0x0A, 0x9E ,
-0xB6, 0xF9, 0x00, 0x70, 0xB9, 0x42, 0x04, 0xD0, 0x01, 0x22, 0x2A, 0x80, 0x0A, 0x46, 0x35, 0x46, 0x00, 0xE0, 0xB4, 0x51, 0x02, 0x00, 0xC8, 0x00, 0x00, 0x00, 0x52, 0x1C, 0x2A, 0x80, 0x1C, 0x99, 0x0A, 0x78, 0x1D, 0x99, 0x0A, 0x70, 0x0F, 0xE0, 0xC0, 0x46, 0x58, 0x57, 0x02, 0x00, 0xA6, 0x64, 0x00, 0x20, 0x54, 0x57, 0x02, 0x00, 0x28, 0x80, 0x05, 0x99, 0x08, 0x70, 0x08, 0x9A, 0x11, 0x78, 0x41, 0xF0, 0x04, 0x01, 0x11, 0x70, 0x04, 0x46, 0x45, 0x46, 0xAC, 0xF8, 0x00, 0x00, 0x28, 0x70, 0xCC, 0x2C, 0x09, 0x9A, 0x40, 0xF0, 0x00, 0x81, 0xDD, 0xF8, 0x7C, 0xC0, 0x0A, 0x99, 0x1E, 0x9F, 0x45, 0x46, 0xB1, 0xF9, 0x00, 0x60, 0xB2, 0xF9, 0x00, 0x90, 0x28, 0x78, 0xCD, 0xF8, 0x50, 0xC0, 0x16, 0x91, 0x0A, 0x97, 0x13, 0x92, 0x09, 0x95, 0x0C, 0x99, 0x01, 0x29, 0x05, 0xD1, 0x05, 0x9A, 0xB0, 0xEB, 0x49, 0x0F, 0x01, 0xD1, 0x00, 0x21, 0x11, 0x70, 0x0C, 0x99, 0x02, 0x29, 0x05, 0xD1, 0x05, 0x9A, 0xB0, 0xEB, 0x46, 0x0F ,
-0x01, 0xD1, 0x00, 0x21, 0x11, 0x70, 0xB3, 0xF5, 0x14, 0x7F, 0x40, 0xF3, 0xBA, 0x80, 0x40, 0xF2, 0x51, 0x31, 0x99, 0x42, 0x08, 0x99, 0x40, 0xF3, 0xB4, 0x80, 0x09, 0x78, 0x06, 0x29, 0x00, 0xF0, 0xB0, 0x80, 0xA3, 0xF2, 0x51, 0x21, 0x0B, 0xB2, 0x4F, 0xEA, 0xE3, 0x01, 0x03, 0xEB, 0x11, 0x71, 0x4F, 0xEA, 0x21, 0x11, 0xCA, 0xB2, 0x4F, 0xEA, 0xE3, 0x01, 0x03, 0xEB, 0x11, 0x71, 0x15, 0x9D, 0x21, 0xF0, 0x0F, 0x01, 0xA3, 0xEB, 0x01, 0x03, 0x1D, 0x99, 0x2E, 0x68, 0x7C, 0x52, 0x02, 0x00, 0xC8, 0x00, 0x00, 0x00, 0x91, 0xF8, 0x00, 0xE0, 0x5F, 0xFA, 0x83, 0xF8, 0x60, 0xB1, 0x31, 0x18, 0x11, 0xF8, 0x01, 0x1C, 0x51, 0x40, 0xCB, 0xB2, 0x07, 0xE0, 0xC0, 0x46, 0x58, 0x58, 0x02, 0x00, 0x54, 0x58, 0x02, 0x00, 0xDC, 0x58, 0x02, 0x00, 0x13, 0x46, 0x19, 0x99, 0xDD, 0xF8, 0x6C, 0xA0, 0xDD, 0xF8, 0x70, 0xB0, 0xD1, 0xF8, 0x00, 0xC0, 0x00, 0xF0, 0x0F, 0x01, 0x99, 0x42, 0x22, 0xD0, 0x0A, 0x9B, 0x86, 0x45, 0x9A, 0xF8 ,
-0x00, 0x10, 0xB3, 0xF9, 0x00, 0x30, 0x9B, 0xF8, 0x00, 0x50, 0x15, 0xDD, 0x37, 0x5C, 0x44, 0x1C, 0x82, 0xEA, 0x07, 0x0C, 0x04, 0xF0, 0x0F, 0x07, 0x67, 0x45, 0x0B, 0xD0, 0xA6, 0x45, 0x06, 0x44, 0x0A, 0xDD, 0x76, 0x78, 0x72, 0x40, 0x86, 0x1C, 0x06, 0xF0, 0x0F, 0x06, 0x96, 0x42, 0x03, 0xD1, 0xC0, 0x1C, 0x4D, 0xE0, 0x80, 0x1C, 0x4B, 0xE0, 0x05, 0x9E, 0x00, 0x22, 0x32, 0x70, 0x4A, 0xE0, 0x00, 0xF0, 0x1F, 0x01, 0x01, 0x22, 0x8A, 0x40, 0x17, 0x99, 0xC4, 0x10, 0x0B, 0x68, 0x24, 0xF0, 0x03, 0x01, 0x5C, 0xF8, 0x01, 0x70, 0x3A, 0x42, 0x32, 0xD1, 0x5F, 0x58, 0x3A, 0x42, 0x06, 0x44, 0x1F, 0xD0, 0x18, 0x9B, 0x37, 0x78, 0x1B, 0x68, 0xB8, 0x45, 0x04, 0xD1, 0x58, 0x58, 0x02, 0x42, 0x19, 0xD0, 0x63, 0x46, 0x15, 0xE0, 0xA1, 0x10, 0x8C, 0x00, 0x19, 0x59, 0x91, 0x43, 0x19, 0x51, 0x00, 0x90, 0x30, 0x78, 0x01, 0x90, 0x44, 0x53, 0x02, 0x00, 0xC8, 0x00, 0x00, 0x00, 0x03, 0x20, 0x06, 0x21, 0x02, 0x46, 0x4D, 0xF6 ,
-0x80, 0x53, 0xF3, 0xF7, 0x63, 0xF9, 0x09, 0x99, 0x28, 0x68, 0x0E, 0x78, 0x36, 0x18, 0x06, 0xE0, 0xE3, 0x58, 0x02, 0x00, 0xA0, 0x10, 0x81, 0x00, 0x58, 0x58, 0x02, 0x43, 0x5A, 0x50, 0x86, 0xF8, 0x00, 0x80, 0x0B, 0x98, 0x00, 0x78, 0x0C, 0x90, 0x13, 0x98, 0xB0, 0xF9, 0x00, 0x90, 0x09, 0x98, 0x00, 0x78, 0x0A, 0x9A, 0x40, 0x1C, 0x9B, 0xF8, 0x00, 0x50, 0x9A, 0xF8, 0x00, 0x10, 0xB2, 0xF9, 0x00, 0x30, 0x09, 0x9A, 0xC0, 0xB2, 0x10, 0x70, 0x0C, 0x9A, 0x01, 0x2A, 0x03, 0xD1, 0x88, 0x42, 0xC8, 0xBF, 0x8A, 0xF8, 0x00, 0x00, 0x0C, 0x99, 0x02, 0x29, 0x07, 0xD1, 0xA8, 0x42, 0xC8, 0xBF, 0x8B, 0xF8, 0x00, 0x00, 0x02, 0xE0, 0x0A, 0x98, 0xB0, 0xF9, 0x00, 0x30, 0xB9, 0xF1, 0x00, 0x0F, 0x06, 0xDD, 0x03, 0x2B, 0x04, 0xD1, 0x11, 0x98, 0x01, 0x22, 0x49, 0x46, 0x00, 0xF0, 0x72, 0xFB, 0x16, 0x98, 0xB0, 0xF9, 0x00, 0x10, 0x14, 0x98, 0x00, 0x29, 0xB0, 0xF9, 0x00, 0x00, 0x05, 0xDD, 0x03, 0x28, 0x03, 0xD1, 0x12, 0x98 ,
-0x02, 0x22, 0x00, 0xF0, 0x64, 0xFB, 0x05, 0x98, 0x04, 0x78, 0x0B, 0x98, 0x00, 0x78, 0x0C, 0x90, 0x08, 0x98, 0xBB, 0x2C, 0x01, 0x78, 0x02, 0xD0, 0xAA, 0x2C, 0x2F, 0xD0, 0x31, 0xE0, 0x0C, 0x98, 0x01, 0x28, 0x0B, 0xD1, 0x0D, 0x98, 0x17, 0x9A, 0x10, 0x60, 0x0C, 0x54, 0x02, 0x00, 0xC8, 0x00, 0x00, 0x00, 0x0F, 0x98, 0x18, 0x9A, 0x10, 0x60, 0x19, 0x9A, 0x11, 0x98, 0x10, 0x60, 0x47, 0x4A, 0x15, 0x98, 0x02, 0x60, 0x0C, 0x98, 0x02, 0x28, 0x0B, 0xD1, 0x0E, 0x98, 0x17, 0x9A, 0x10, 0x60, 0x10, 0x98, 0x18, 0x9A, 0x10, 0x60, 0x19, 0x9A, 0x12, 0x98, 0x10, 0x60, 0x41, 0x4A, 0x15, 0x98, 0x02, 0x60, 0xCC, 0x20, 0x0F, 0xE0, 0x08, 0x99, 0x09, 0x78, 0x0C, 0xE0, 0x02, 0x20, 0x00, 0xE0, 0x01, 0x20, 0x0B, 0x99, 0x08, 0x70, 0x1A, 0x99, 0x0B, 0x80, 0x13, 0x99, 0x00, 0x20, 0x08, 0x80, 0x08, 0x98, 0x01, 0x78, 0xBB, 0x20, 0x05, 0x9A, 0x10, 0x70, 0x06, 0x29, 0x07, 0x99, 0x11, 0xD1, 0x06, 0x20, 0x08, 0x60, 0x20, 0x98 ,
-0x00, 0x25, 0x05, 0x70, 0x21, 0x98, 0x29, 0x46, 0x04, 0x22, 0xFB, 0xF7, 0x27, 0xFB, 0x01, 0x20, 0x00, 0xF0, 0x3A, 0xFA, 0x02, 0x20, 0x00, 0xF0, 0x37, 0xFA, 0x22, 0x98, 0x05, 0x60, 0x07, 0x98, 0x04, 0x99, 0x00, 0x68, 0x07, 0x28, 0x44, 0xD1, 0x09, 0x78, 0x03, 0x9C, 0x80, 0x29, 0x40, 0xD1, 0x38, 0x34, 0x21, 0x78, 0x64, 0x1C, 0x22, 0x46, 0x00, 0x29, 0x3A, 0xD1, 0x20, 0x98, 0x90, 0xF8, 0x00, 0xA0, 0x22, 0x98, 0x05, 0x90, 0xD0, 0xF8, 0x00, 0x90, 0x51, 0x46, 0x48, 0x46, 0xFD, 0xF7, 0x79, 0xF9, 0x5F, 0xFA, 0x80, 0xF8, 0x21, 0x9F, 0x15, 0x78, 0x51, 0x46, 0x48, 0x46, 0x17, 0xF8, 0x08, 0x30, 0xFD, 0xF7, 0xD4, 0x54, 0x02, 0x00, 0xC8, 0x00, 0x00, 0x00, 0x6F, 0xF9, 0x1E, 0x46, 0x1B, 0x1D, 0xC0, 0xB2, 0x38, 0x5C, 0x00, 0x1D, 0xA8, 0x42, 0x28, 0x46, 0x07, 0xDD, 0x80, 0x18, 0x82, 0x1C, 0x10, 0x78, 0x2D, 0x18, 0xAD, 0x1C, 0xAD, 0xB2, 0xAB, 0x42, 0xF7, 0xDC, 0x04, 0xF8, 0x01, 0x6B, 0x11, 0x49, 0x32, 0x46 ,
-0x20, 0x46, 0x01, 0xEB, 0x48, 0x11, 0xFA, 0xF7, 0xDC, 0xF9, 0xAD, 0x1B, 0xFF, 0x20, 0x34, 0x19, 0xAD, 0x1E, 0x04, 0xF8, 0x01, 0x0B, 0x25, 0x70, 0x05, 0x98, 0x01, 0x68, 0x49, 0x1C, 0x01, 0x60, 0x07, 0x98, 0x00, 0x68, 0x07, 0x28, 0x04, 0xD0, 0x06, 0x99, 0x08, 0x68, 0x20, 0xF4, 0x80, 0x30, 0x08, 0x60, 0x23, 0xB0, 0xBD, 0xE8, 0xF0, 0x8F, 0xC0, 0x46, 0x94, 0x57, 0x02, 0x00, 0xD4, 0x57, 0x02, 0x00, 0x5C, 0x58, 0x02, 0x00, 0x6E, 0x48, 0x2D, 0xE9, 0xF0, 0x47, 0x6E, 0x4D, 0x82, 0x89, 0x4A, 0xF6, 0x55, 0x21, 0xAD, 0xF5, 0xFE, 0x7D, 0x91, 0x42, 0x4F, 0xF0, 0x00, 0x01, 0xAD, 0xF1, 0x38, 0x0D, 0x12, 0xD1, 0x29, 0x60, 0x68, 0x4A, 0x11, 0x70, 0x41, 0xF2, 0x10, 0x41, 0x81, 0x81, 0x4F, 0xF6, 0xFF, 0x70, 0x66, 0x49, 0x08, 0x60, 0x28, 0x68, 0x00, 0x90, 0x02, 0x22, 0x05, 0x21, 0x03, 0x20, 0x41, 0xF2, 0x34, 0x23, 0xF3, 0xF7, 0x48, 0xF8, 0x29, 0x68, 0x61, 0x4C, 0x01, 0x29, 0x20, 0x68, 0x40, 0xF0, 0xAF, 0x80 ,
-0x5F, 0x4D, 0x02, 0x28, 0x29, 0x68, 0x23, 0xD1, 0x9C, 0x55, 0x02, 0x00, 0xC8, 0x00, 0x00, 0x00, 0x5E, 0x48, 0x00, 0x68, 0x5F, 0x4A, 0x12, 0x5C, 0x00, 0x92, 0x01, 0x91, 0x5E, 0x49, 0x09, 0x68, 0x02, 0x91, 0x5B, 0x49, 0x0B, 0x5C, 0x03, 0x20, 0x07, 0x21, 0x04, 0x22, 0xF3, 0xF7, 0x2E, 0xF8, 0x5B, 0x49, 0x4A, 0x79, 0x59, 0x48, 0x00, 0x92, 0x02, 0x79, 0x01, 0x92, 0x40, 0x79, 0x04, 0x22, 0x02, 0x90, 0x03, 0x20, 0x0B, 0x79, 0x07, 0x21, 0xF3, 0xF7, 0x20, 0xF8, 0x03, 0x20, 0x20, 0x60, 0xEC, 0xF7, 0x1A, 0xFF, 0x20, 0x68, 0x29, 0x68, 0x04, 0x28, 0x15, 0xD1, 0x0D, 0x20, 0x8D, 0xF8, 0x10, 0x00, 0x00, 0x25, 0x8D, 0xF8, 0x14, 0x50, 0x8D, 0xF8, 0x15, 0x10, 0x28, 0x46, 0x63, 0x21, 0x00, 0xF0, 0xAA, 0xFB, 0x63, 0x21, 0x28, 0x46, 0x00, 0xF0, 0xFA, 0xFA, 0x03, 0xA9, 0x04, 0xA8, 0xE0, 0xF7, 0xCA, 0xFC, 0x05, 0x20, 0x20, 0x60, 0x46, 0x4D, 0x05, 0x28, 0x29, 0x68, 0x01, 0xF1, 0x01, 0x01, 0x29, 0x60, 0x1D, 0xD1 ,
-0x44, 0x4A, 0x8A, 0x42, 0x1A, 0xD1, 0x43, 0x48, 0x01, 0x68, 0x00, 0x91, 0x40, 0x68, 0x01, 0x90, 0x03, 0x20, 0x02, 0x46, 0x06, 0x21, 0x41, 0x4E, 0x33, 0x46, 0x22, 0x3B, 0xF2, 0xF7, 0xEB, 0xFF, 0x3E, 0x48, 0x01, 0x68, 0x00, 0x91, 0x40, 0x68, 0x33, 0x46, 0x06, 0x21, 0x01, 0x90, 0x03, 0x20, 0x02, 0x46, 0xF2, 0xF7, 0xE0, 0xFF, 0x00, 0x20, 0x28, 0x60, 0x20, 0x68, 0x06, 0x28, 0x47, 0xD1, 0x4F, 0xF0, 0x64, 0x56, 0x02, 0x00, 0xC8, 0x00, 0x00, 0x00, 0x07, 0x0A, 0xC4, 0xF8, 0x00, 0xA0, 0x03, 0x20, 0x48, 0xF2, 0x70, 0x53, 0x01, 0x22, 0x04, 0x21, 0xF2, 0xF7, 0xD0, 0xFF, 0xDF, 0xF8, 0xCC, 0x80, 0x31, 0x4F, 0x48, 0xF2, 0x70, 0x59, 0x01, 0x25, 0x49, 0xEA, 0x05, 0x03, 0x01, 0x22, 0x04, 0x21, 0x03, 0x20, 0xF2, 0xF7, 0xC3, 0xFF, 0x00, 0x24, 0x17, 0xF8, 0x02, 0x0F, 0x20, 0xE0, 0x69, 0x01, 0x04, 0xEB, 0x08, 0x02, 0x88, 0x18, 0xC6, 0x1C, 0x43, 0x78, 0x00, 0x93, 0x80, 0x78, 0x01, 0x90, 0x30, 0x78, 0x02, 0x90 ,
-0x53, 0x5C, 0x51, 0x46, 0x04, 0x22, 0x03, 0x20, 0xF2, 0xF7, 0xAE, 0xFF, 0x38, 0x78, 0x01, 0x1B, 0xB1, 0xF1, 0xFF, 0x3F, 0x08, 0xD1, 0xF0, 0x78, 0x00, 0x90, 0xB3, 0x78, 0x03, 0x20, 0x02, 0x22, 0x05, 0x21, 0xF2, 0xF7, 0xA1, 0xFF, 0x38, 0x78, 0x24, 0x1D, 0xE4, 0xB2, 0xA0, 0x42, 0xDC, 0xDC, 0xAD, 0x1C, 0xED, 0xB2, 0x04, 0x2D, 0xCD, 0xDB, 0x63, 0x21, 0x4F, 0xF4, 0x05, 0x70, 0xF1, 0xF7, 0xA3, 0xFC, 0xE1, 0xF7, 0x85, 0xFD, 0x7F, 0xB0, 0x0E, 0xB0, 0xBD, 0xE8, 0xF0, 0x87, 0xC0, 0x46, 0x04, 0x74, 0x00, 0x20, 0x50, 0x57, 0x02, 0x00, 0x6C, 0x5D, 0x02, 0x00, 0x40, 0x00, 0x3D, 0x80, 0x4C, 0x57, 0x02, 0x00, 0x58, 0x57, 0x02, 0x00, 0x90, 0x57, 0x02, 0x00, 0x60, 0x57, 0x02, 0x00, 0x70, 0x57, 0x02, 0x00, 0x5C, 0x57, 0x02, 0x00, 0x80, 0x57, 0x02, 0x00, 0x2C, 0x57, 0x02, 0x00, 0xC8, 0x00, 0x00, 0x00, 0x88, 0x57, 0x02, 0x00, 0x54, 0x57, 0x02, 0x00, 0xFF, 0xFF, 0x03, 0x00, 0x38, 0x58, 0x02, 0x00, 0x40, 0x58 ,
-0x02, 0x00, 0x66, 0x55, 0xDD, 0xEE, 0xDB, 0x58, 0x02, 0x00, 0x5C, 0x58, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 ,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF4, 0x57, 0x02, 0x00, 0xC8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 ,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xBC, 0x58, 0x02, 0x00, 0xC8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 ,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2D, 0xE9, 0xFE, 0x4F, 0x4A, 0x4A, 0x49, 0x4D, 0x00, 0x90, 0xB2, 0xF9, 0x00, 0x20, 0x43, 0xA3, 0x29, 0x78, 0x01, 0x93, 0x43, 0xA3, 0x01, 0x28, 0x02, 0x93, 0x47, 0x4E, 0xDF, 0xF8, 0x1C, 0x81, 0xDF, 0xF8, 0x1C, 0x91, 0x1E, 0xD0, 0x43, 0x48, 0x04, 0x78, 0x48, 0x01, 0x87, 0x19, 0x30, 0x18, 0x01, 0x99, 0x06, 0x22, 0xF9, 0xF7, 0xC8, 0xFF, 0x40, 0x46, 0x01, 0x78, 0x00, 0x68, 0x07, 0xF1, 0x06, 0x07, 0x07, 0xF8, 0x01, 0x1B, 0x07, 0xF8, 0x01, 0x4B, 0x4F, 0xF0, 0x00, 0x01, 0x07, 0xF8, 0x01, 0x1B, 0x20, 0xB9, 0x39, 0x70, 0x28, 0x78, 0x4E, 0x46, 0x0A, 0x21, 0x58, 0xE0, 0xDF, 0xF8, 0xE4, 0xB0, 0x0F, 0xE0, 0xD4, 0xB2, 0x48, 0x01, 0x87, 0x19, 0x30, 0x18, 0x02, 0x99, 0x07, 0x22, 0xF9, 0xF7, 0xAA, 0xFF, 0xFF, 0x1D, 0x00, 0x20, 0xDF, 0xF8, 0xCC, 0xB0, 0x07, 0xF8, 0x01, 0x4B, 0x07, 0xF8, 0x01, 0x0B, 0x16, 0x2C, 0xB2, 0x46, 0xAE, 0xBF, 0x14, 0x20, 0x84, 0x59 ,
-0x02, 0x00, 0xC8, 0x00, 0x00, 0x00, 0x60, 0x1E, 0xC0, 0xB2, 0x38, 0x70, 0x4E, 0x46, 0x7F, 0x1C, 0x40, 0x1C, 0xC2, 0xB2, 0x28, 0x78, 0x5B, 0x46, 0x00, 0x21, 0x32, 0x54, 0x38, 0x46, 0x00, 0xF0, 0xBC, 0xF9, 0x28, 0x78, 0x16, 0x2C, 0x31, 0x5C, 0x01, 0xF1, 0x0A, 0x01, 0x31, 0x54, 0x00, 0xF1, 0x01, 0x00, 0xC0, 0xB2, 0x28, 0x70, 0x2B, 0xDB, 0x00, 0x99, 0x0A, 0xEB, 0x40, 0x10, 0x07, 0x46, 0x01, 0x29, 0xA4, 0xF1, 0x01, 0x09, 0x09, 0xD0, 0x01, 0x99, 0x06, 0x22, 0xF9, 0xF7, 0x79, 0xFF, 0x40, 0x46, 0x00, 0x78, 0xBF, 0x1D, 0x07, 0xF8, 0x01, 0x0B, 0x04, 0xE0, 0x02, 0x99, 0x07, 0x22, 0xF9, 0xF7, 0x6F, 0xFF, 0xFF, 0x1D, 0x07, 0xF8, 0x01, 0x4B, 0x15, 0x3C, 0x15, 0x21, 0x28, 0x78, 0xE2, 0xB2, 0x5B, 0x46, 0x07, 0xF8, 0x01, 0x1B, 0x32, 0x54, 0x07, 0xF8, 0x01, 0x9B, 0x38, 0x46, 0x00, 0xF0, 0x8B, 0xF9, 0x28, 0x78, 0x31, 0x5C, 0x0A, 0x31, 0x31, 0x54, 0x40, 0x1C, 0x28, 0x70, 0xBD, 0xE8, 0xFE, 0x8F, 0xC0, 0x46 ,
-0x54, 0x54, 0x54, 0x4B, 0x45, 0x59, 0x00, 0xC0, 0x54, 0x54, 0x54, 0x53, 0x53, 0x49, 0x44, 0x00, 0x54, 0x58, 0x02, 0x00, 0xE6, 0x58, 0x02, 0x00, 0xE8, 0x58, 0x02, 0x00, 0x5C, 0x58, 0x02, 0x00, 0x5C, 0x57, 0x02, 0x00, 0xDC, 0x58, 0x02, 0x00, 0xD4, 0x57, 0x02, 0x00, 0x94, 0x57, 0x02, 0x00, 0xFF, 0xB5, 0x0C, 0x46, 0x06, 0x46, 0xF7, 0xF7, 0x4C, 0x5A, 0x02, 0x00, 0xC8, 0x00, 0x00, 0x00, 0xE3, 0xFE, 0x15, 0x49, 0x15, 0x4A, 0x0D, 0x68, 0x01, 0xA9, 0x92, 0xE8, 0x8C, 0x00, 0x81, 0xE8, 0x8C, 0x00, 0xF7, 0xF7, 0xFD, 0xFE, 0x01, 0x98, 0x11, 0x49, 0x28, 0x1A, 0x03, 0x9D, 0x25, 0x60, 0x02, 0x9A, 0x80, 0x18, 0x82, 0x42, 0x30, 0x60, 0x0E, 0xD8, 0x08, 0x46, 0x00, 0x68, 0x22, 0x68, 0x82, 0x42, 0x0E, 0xD2, 0x68, 0x46, 0xE8, 0xF7, 0xB9, 0xFF, 0x9D, 0xF8, 0x00, 0x00, 0x05, 0xF1, 0x01, 0x05, 0x30, 0xB9, 0x03, 0x95, 0x03, 0xE0, 0x25, 0x68, 0x6D, 0x1C, 0x25, 0x60, 0x0C, 0x46, 0x25, 0x60, 0x00, 0x20, 0x00, 0x90 ,
-0xFF, 0xBD, 0x60, 0x55, 0x30, 0x80, 0x24, 0x5D, 0x00, 0x20, 0x6C, 0x5D, 0x02, 0x00, 0x70, 0xB5, 0x4D, 0x00, 0x20, 0x2D, 0x4F, 0xF0, 0x00, 0x01, 0x0C, 0x46, 0x4F, 0xEA, 0x55, 0x13, 0x09, 0xD3, 0x50, 0xF8, 0x21, 0x60, 0xB6, 0xF1, 0xFF, 0x3F, 0x04, 0xD1, 0x49, 0x1C, 0xC9, 0xB2, 0x20, 0x3D, 0x5B, 0x1E, 0xF5, 0xD1, 0x4D, 0xB1, 0x20, 0x2D, 0x09, 0xD2, 0x01, 0x23, 0xAB, 0x40, 0x5B, 0x1E, 0x50, 0xF8, 0x21, 0x00, 0x18, 0x40, 0x83, 0x42, 0x01, 0xD1, 0x4F, 0xF0, 0x01, 0x04, 0x07, 0x48, 0x03, 0x78, 0x2C, 0xB9, 0x01, 0x21, 0x91, 0x40, 0xC9, 0x43, 0xC9, 0xB2, 0x0B, 0x40, 0x03, 0xE0, 0x01, 0x21, 0x91, 0x40, 0xC9, 0xB2, 0x0B, 0x43, 0x03, 0x70, 0x70, 0xBD, 0xC0, 0x46, 0xEE, 0x58, 0x02, 0x00, 0x14, 0x5B, 0x02, 0x00, 0xC8, 0x00, 0x00, 0x00, 0x7E, 0xB5, 0x05, 0x46, 0x95, 0xF8, 0x36, 0x20, 0x0E, 0x46, 0x0F, 0x49, 0x07, 0x2A, 0x12, 0xBF, 0x08, 0x68, 0x01, 0x20, 0x08, 0x60, 0x0D, 0x4C, 0x00, 0x92, 0x21, 0x68 ,
-0x41, 0xF2, 0x12, 0x13, 0x04, 0x22, 0x01, 0x91, 0x07, 0x21, 0x02, 0x90, 0x03, 0x20, 0xF2, 0xF7, 0x6B, 0xFD, 0x31, 0x46, 0x28, 0x46, 0xE7, 0xF7, 0x21, 0xFC, 0x21, 0x68, 0x00, 0x22, 0x05, 0x29, 0x02, 0xD1, 0x04, 0x49, 0x08, 0x31, 0x0A, 0x60, 0x7E, 0xBD, 0xC0, 0x46, 0x50, 0x57, 0x02, 0x00, 0x4C, 0x57, 0x02, 0x00, 0x00, 0x7C, 0x00, 0x20, 0x0E, 0x49, 0x09, 0x68, 0x49, 0x08, 0x15, 0xD2, 0x0D, 0x49, 0x09, 0x78, 0x91, 0xB1, 0x44, 0xF2, 0xE9, 0x21, 0x68, 0xB9, 0x0B, 0x48, 0x01, 0x78, 0x07, 0x48, 0x01, 0x29, 0x03, 0xD1, 0x0A, 0x49, 0x09, 0x78, 0x0E, 0x29, 0x02, 0xD0, 0x44, 0xF2, 0xDE, 0x21, 0x41, 0x60, 0x01, 0x21, 0x00, 0xE0, 0x06, 0x48, 0x01, 0x60, 0x70, 0x47, 0xC0, 0x46, 0x00, 0x97, 0x3C, 0x80, 0x10, 0x0C, 0x30, 0x80, 0xDD, 0x6A, 0x00, 0x20, 0xE0, 0x7C, 0x00, 0x20, 0xA6, 0x64, 0x00, 0x20, 0x04, 0x97, 0x3C, 0x80, 0x00, 0xB5, 0xAD, 0xF1, 0x18, 0x0D, 0x4F, 0xF0, 0x09, 0x00, 0x00, 0x90, 0x4F, 0xF4 ,
-0x0C, 0x60, 0x03, 0x90, 0x4F, 0xF0, 0x00, 0x00, 0x01, 0x90, 0x02, 0x90, 0x08, 0x48, 0x08, 0x49, 0x05, 0x90, 0x08, 0x68, 0x20, 0xB9, 0xDC, 0x5B, 0x02, 0x00, 0xC8, 0x00, 0x00, 0x00, 0x68, 0x46, 0x03, 0x22, 0xED, 0xF7, 0x3A, 0xFA, 0x03, 0xE0, 0x68, 0x46, 0x03, 0x22, 0xED, 0xF7, 0xC1, 0xFC, 0x06, 0xB0, 0x00, 0xBD, 0xC0, 0x46, 0x81, 0x5C, 0x02, 0x00, 0xDC, 0x7C, 0x00, 0x20, 0x1C, 0xB5, 0x0F, 0x4C, 0x22, 0x68, 0x01, 0x2A, 0x15, 0xD1, 0x0C, 0x48, 0x00, 0x68, 0x07, 0x28, 0x14, 0xBF, 0x40, 0x20, 0x4F, 0xF4, 0x05, 0x70, 0x63, 0x21, 0xF1, 0xF7, 0x0F, 0xFA, 0x20, 0x68, 0x00, 0x90, 0x43, 0xF2, 0x33, 0x33, 0x06, 0x21, 0x40, 0x20, 0x01, 0x90, 0x03, 0x20, 0x02, 0x46, 0xF2, 0xF7, 0xF4, 0xFC, 0x1C, 0xBD, 0xF1, 0xF7, 0x01, 0xFA, 0x1C, 0xBD, 0x4C, 0x57, 0x02, 0x00, 0x50, 0x57, 0x02, 0x00, 0x1E, 0xB5, 0x04, 0x46, 0x0A, 0x49, 0x00, 0x20, 0x0A, 0x4A, 0x08, 0x60, 0x0A, 0x49, 0x00, 0x90, 0x01, 0x90, 0x11, 0x60 ,
-0x09, 0x4A, 0x45, 0xF2, 0x55, 0x53, 0x02, 0x91, 0x10, 0x60, 0x07, 0x21, 0x04, 0x22, 0x03, 0x20, 0xF2, 0xF7, 0xD8, 0xFC, 0x20, 0x46, 0xE7, 0xF7, 0x59, 0xFD, 0x1E, 0xBD, 0x50, 0x57, 0x02, 0x00, 0x04, 0x74, 0x00, 0x20, 0x34, 0x12, 0x66, 0x09, 0x4C, 0x57, 0x02, 0x00, 0x00, 0xB5, 0x0B, 0x49, 0x00, 0x20, 0x08, 0x60, 0xE0, 0x20, 0xF7, 0xF7, 0xAA, 0xFD, 0x09, 0x49, 0x09, 0x78, 0x49, 0xB1, 0x08, 0x49, 0x0A, 0x78, 0x08, 0x49, 0x00, 0x2A, 0x06, 0xBF, 0x01, 0x22, 0x09, 0x1F, 0x44, 0xF2, 0xA4, 0x5C, 0x02, 0x00, 0xC8, 0x00, 0x00, 0x00, 0xE9, 0x22, 0x0A, 0x60, 0xF7, 0xF7, 0xA1, 0xFD, 0x00, 0xBD, 0xC0, 0x46, 0xDC, 0x7C, 0x00, 0x20, 0xDD, 0x6A, 0x00, 0x20, 0xA7, 0x64, 0x00, 0x20, 0x04, 0x97, 0x3C, 0x80, 0x50, 0xB9, 0x09, 0x48, 0x00, 0x78, 0x01, 0x28, 0x06, 0xD1, 0x08, 0x48, 0x00, 0x78, 0x0E, 0x28, 0x08, 0xBF, 0x44, 0xF2, 0xCB, 0x20, 0x01, 0xD0, 0x44, 0xF2, 0xDE, 0x20, 0x04, 0x49, 0x08, 0x60, 0x01, 0x20 ,
-0x41, 0xF8, 0x04, 0x0C, 0x70, 0x47, 0xE0, 0x7C, 0x00, 0x20, 0xA6, 0x64, 0x00, 0x20, 0x04, 0x97, 0x3C, 0x80, 0x30, 0xB5, 0x0D, 0x46, 0x84, 0x69, 0xDC, 0xF7, 0x97, 0xFB, 0x24, 0x1D, 0x01, 0x28, 0x04, 0xEB, 0x45, 0x01, 0x06, 0xD1, 0x89, 0x8E, 0x04, 0xEB, 0x85, 0x04, 0x11, 0xB9, 0x21, 0x69, 0x01, 0xB9, 0x00, 0x20, 0x30, 0xBD, 0x30, 0xB5, 0x05, 0x46, 0x5A, 0xB1, 0x03, 0xEB, 0x41, 0x03, 0x1C, 0x78, 0x59, 0x78, 0x41, 0xEA, 0x04, 0x11, 0x52, 0x1E, 0x03, 0xF1, 0x02, 0x03, 0x05, 0xF8, 0x01, 0x1B, 0xF5, 0xD1, 0x30, 0xBD, 0x00, 0xB5, 0x00, 0x20, 0xE7, 0xF7, 0xD6, 0xFE, 0x03, 0x48, 0x01, 0x68, 0x03, 0x29, 0x04, 0xBF, 0x04, 0x21, 0x01, 0x60, 0x00, 0xBD, 0xC0, 0x46, 0x4C, 0x57, 0x02, 0x00, 0x03, 0x4A, 0x12, 0x68, 0x01, 0x2A, 0x04, 0xBF, 0x02, 0x48, 0x63, 0x21, 0xF1, 0xF7, 0x76, 0xB9, 0x50, 0x57, 0x02, 0x00, 0x02, 0x20, 0x01, 0x00, 0x6C, 0x5D, 0x02, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
diff --git a/drivers/cc3000/src/patch_prog.c b/drivers/cc3000/src/patch_prog.c
deleted file mode 100644
index fd128928fbaff..0000000000000
--- a/drivers/cc3000/src/patch_prog.c
+++ /dev/null
@@ -1,414 +0,0 @@
-#include <stdio.h>
-#include <string.h>
-#include "cc3000_common.h"
-#include "nvmem.h"
-#include "ccspi.h"
-#include "hci.h"
-#include "wlan.h"
-#include "patch_prog.h"
-#define BIT0    0x1
-#define BIT1    0x2
-#define BIT2    0x4
-#define BIT3    0x8
-#define BIT4    0x10
-#define BIT5    0x20
-#define BIT6    0x40
-#define BIT7    0x80
-
-static unsigned char ucStatus_Dr;
-static unsigned char ucStatus_FW;
-static unsigned char return_status = 0xFF;
-
-static signed char mac_status = -1;
-static unsigned char counter = 0;
-
-// Array to store RM parameters from EEPROM.
-static unsigned char cRMParamsFromEeprom[128];
-// Array to store MAC address from EEPROM.
-static unsigned char cMacFromEeprom[MAC_ADDR_LEN];
-// Smart Config Prefix
-static const char aucCC3000_prefix[] = {'T', 'T', 'T'};
-
-static void systick_sleep(unsigned long ms) {
-    extern void HAL_Delay(volatile uint32_t Delay);
-    HAL_Delay(ms);
-}
-
-// 2 dim array to store address and length of new FAT
-static const unsigned short aFATEntries[2][NVMEM_RM_FILEID + 1] = 
-/*  address 	*/  {{0x50, 	0x1f0, 	0x390, 	0x1390, 	0x2390, 	0x4390, 	0x6390, 	0x63a0, 	0x63b0, 	0x63f0, 	0x6430, 	0x6830},
-/*  length	*/	{0x1a0, 	0x1a0, 	0x1000, 	0x1000, 	0x2000, 	0x2000, 	0x10, 	0x10, 	0x40, 	0x40, 	0x400, 	0x200}};
-/* 0. NVS */
-/* 1. NVS Shadow */
-/* 2. Wireless Conf */
-/* 3. Wireless Conf Shadow */
-/* 4. BT (WLAN driver) Patches */
-/* 5. WiLink (Firmware) Patches */
-/* 6. MAC addr */
-/* 7. Frontend Vars */
-/* 8. IP config */
-/* 9. IP config Shadow */
-/* 10. Bootloader Patches */
-/* 11. Radio Module params */
-/* 12. AES128 for smart config */
-/* 13. user file */
-/* 14. user file */
-/* 15. user file */
-
-//*****************************************************************************
-//
-//! sendDriverPatch
-//!
-//! \param  pointer to the length
-//!
-//! \return none
-//!
-//! \brief  The function returns a pointer to the driver patch: 
-//!         since there is no patch yet - it returns 0
-//
-//*****************************************************************************
-
-static char *sendDriverPatch(unsigned long *Length)
-{
-    *Length = 0;
-    return NULL;
-}
-
-
-//*****************************************************************************
-//
-//! sendBootLoaderPatch
-//!
-//! \param  pointer to the length
-//!
-//! \return none
-//!
-//! \brief  The function returns a pointer to the boot loader patch: 
-//!         since there is no patch yet - it returns 0
-//
-//*****************************************************************************
-
-static char *sendBootLoaderPatch(unsigned long *Length)
-{
-    *Length = 0;
-    return NULL;
-}
-
-//*****************************************************************************
-//
-//! sendWLFWPatch
-//!
-//! \param  pointer to the length
-//!
-//! \return none
-//!
-//! \brief  The function returns a pointer to the FW patch: 
-//!         since there is no patch yet - it returns 0
-//
-//*****************************************************************************
-
-static char *sendWLFWPatch(unsigned long *Length)
-{
-    *Length = 0;
-    return NULL;
-}
-
-//*****************************************************************************
-//
-//! CC3000_UsynchCallback
-//!
-//! \param  Event type
-//!
-//! \return none
-//!
-//! \brief  The function handles asynchronous events that come from CC3000 
-//!         device and operates a LED4 to have an on-board indication
-//
-//*****************************************************************************
-
-static void CC3000_UsynchCallback(long lEventType, char * data, unsigned char length)
-{
-	
-}
-
-//*****************************************************************************
-//
-//! initDriver
-//!
-//!  \param[in] cRequestPatch 0 to load with EEPROM patches 
-//!             and 1 to load with no patches
-//!
-//!  \return none
-//!
-//!  \brief  The function initializes a CC3000 device 
-//!          and triggers it to start operation
-//
-//*****************************************************************************
-static int initDriver(unsigned short cRequestPatch)
-{
-    // WLAN On API Implementation
-    wlan_init(CC3000_UsynchCallback, sendWLFWPatch, sendDriverPatch, sendBootLoaderPatch,
-              ReadWlanInterruptPin, SpiResumeSpi, SpiPauseSpi, WriteWlanPin);
-
-    // Trigger a WLAN device
-    wlan_start(cRequestPatch);
-    wlan_smart_config_set_prefix((char*)aucCC3000_prefix);
-    wlan_ioctl_set_connection_policy(0, 0, 0);
-    wlan_ioctl_del_profile(255);
-
-    // Mask out all non-required events from CC3000
-    wlan_set_event_mask(HCI_EVNT_WLAN_KEEPALIVE|
-                        HCI_EVNT_WLAN_UNSOL_INIT|
-                        HCI_EVNT_WLAN_ASYNC_PING_REPORT);
-
-    //unsolicicted_events_timer_init();
-    systick_sleep(100);
-    return(0);
-}
-
-
-//*****************************************************************************
-//
-//! fat_read_content
-//!
-//! \param[out] is_allocated  array of is_allocated in FAT table:\n
-//!             an allocated entry implies the address and length of the 
-//!             file are valid.
-//!             0: not allocated; 1: allocated.
-//! \param[out] is_valid  array of is_valid in FAT table:\n
-//!             a valid entry implies the content of the file is relevant.
-//!             0: not valid; 1: valid.
-//! \param[out] write_protected  array of write_protected in FAT table:\n
-//!             a write protected entry implies it is not possible to write
-//!             into this entry.
-//!             0: not protected; 1: protected.
-//! \param[out] file_address  array of file address in FAT table:\n
-//!             this is the absolute address of the file in the EEPROM.
-//! \param[out] file_length  array of file length in FAT table:\n
-//!             this is the upper limit of the file size in the EEPROM.
-//!
-//! \return on succes 0, error otherwise
-//!
-//! \brief  parse the FAT table from eeprom 
-//
-//*****************************************************************************
-static unsigned char  __attribute__ ((unused))
-fat_read_content(unsigned char *is_allocated, unsigned char *is_valid,
-        unsigned char *write_protected, unsigned short *file_address, unsigned short *file_length)
-{
-    unsigned short  index;
-    unsigned char   ucStatus;
-    unsigned char   fatTable[48];
-    unsigned char*  fatTablePtr = fatTable;
-
-    //
-    // Read in 6 parts to work with tiny driver
-    //
-    for (index = 0; index < 6; index++)
-    {
-        ucStatus = nvmem_read(16, 8, 4 + 8*index, fatTablePtr); 
-        fatTablePtr += 8;
-    }
-	
-    fatTablePtr = fatTable;
-	
-    for (index = 0; index <= NVMEM_RM_FILEID; index++)
-    {
-        *is_allocated++ = (*fatTablePtr) & BIT0;
-        *is_valid++ = ((*fatTablePtr) & BIT1) >> 1;
-        *write_protected++ = ((*fatTablePtr) & BIT2) >> 2;
-        *file_address++ = ((*(fatTablePtr+1)<<8) | (*fatTablePtr)) & (BIT4|BIT5|BIT6|BIT7);
-        *file_length++ = ((*(fatTablePtr+3)<<8) | (*(fatTablePtr+2))) & (BIT4|BIT5|BIT6|BIT7);
-        
-        //
-        // Move to next file ID
-        //
-        fatTablePtr += 4;  
-    }
-    
-    return ucStatus;
-}
-
-//*****************************************************************************
-//
-//! fat_write_content
-//!
-//! \param[in] file_address  array of file address in FAT table:\n
-//!            this is the absolute address of the file in the EEPROM.
-//! \param[in] file_length  array of file length in FAT table:\n
-//!            this is the upper limit of the file size in the EEPROM.
-//!
-//! \return on succes 0, error otherwise
-//!
-//! \brief  parse the FAT table from eeprom 
-//
-//*****************************************************************************
-static unsigned char fat_write_content(unsigned short const *file_address,
-                                unsigned short const *file_length)
-{
-    unsigned short  index = 0;
-    unsigned char   ucStatus;
-    unsigned char   fatTable[48];
-    unsigned char*  fatTablePtr = fatTable;
-
-    //
-    // First, write the magic number.
-    //
-    ucStatus = nvmem_write(16, 2, 0, (unsigned char*)"LS"); 
-	
-    for (; index <= NVMEM_RM_FILEID; index++)
-    {
-        //
-        // Write address low char and mark as allocated.
-        //
-        *fatTablePtr++ = (unsigned char)(file_address[index] & 0xff) | BIT0;
-	
-        //	
-        // Write address high char.
-        //
-        *fatTablePtr++ = (unsigned char)((file_address[index]>>8) & 0xff);
-		
-        //
-        // Write length low char.
-        //
-        *fatTablePtr++ = (unsigned char)(file_length[index] & 0xff);
-		
-        //
-        // Write length high char.
-        //
-        *fatTablePtr++ = (unsigned char)((file_length[index]>>8) & 0xff);		
-    }
-	
-    //
-    // Second, write the FAT.
-    // Write in two parts to work with tiny driver.
-    //
-    ucStatus = nvmem_write(16, 24, 4, fatTable); 
-    ucStatus = nvmem_write(16, 24, 24+4, &fatTable[24]); 
-	
-    //
-    // Third, we want to erase any user files.
-    //
-    memset(fatTable, 0, sizeof(fatTable));
-    ucStatus = nvmem_write(16, 16, 52, fatTable); 
-	
-    return ucStatus;
-}
-
-void patch_prog_start()
-{
-    unsigned short  index;
-    unsigned char   *pRMParams;
-
-    printf("Initializing module...\n");
-
-    // Init module and request to load with no patches.
-    // This is in order to overwrite restrictions to
-    // write to specific places in EEPROM.
-    initDriver(1);
-
-    // Read MAC address.
-    mac_status = nvmem_get_mac_address(cMacFromEeprom);
-
-    return_status = 1;
-
-    printf("Reading RM parameters...\n");
-    while ((return_status) && (counter < 3)) {
-        // Read RM parameters.
-        // Read in 16 parts to work with tiny driver.
-        return_status = 0;
-        pRMParams = cRMParamsFromEeprom;
-        for (index = 0; index < 16; index++) {
-            return_status |= nvmem_read(NVMEM_RM_FILEID, 8, 8*index, pRMParams);
-            pRMParams += 8;
-        }
-        counter++;
-    }
-
-    // If RM file is not valid, load the default one.
-    if (counter == 3) {
-        printf("RM is not valid, loading default one...\n");
-        pRMParams = (unsigned char *)cRMdefaultParams;
-    } else {
-        printf("RM is valid.\n");
-        pRMParams = cRMParamsFromEeprom;
-    }
-
-    return_status = 1;
-
-    printf("Writing new FAT\n");
-    while (return_status) {
-        // Write new FAT.
-        return_status = fat_write_content(aFATEntries[0], aFATEntries[1]);
-    }
-
-    return_status = 1;
-
-    printf("Writing RM parameters...\n");
-    while (return_status) {
-        // Write RM parameters.
-        // Write in 4 parts to work with tiny driver.
-        return_status = 0;
-
-        for (index = 0; index < 4; index++) {
-            return_status |= nvmem_write(NVMEM_RM_FILEID,
-                                         32,
-                                         32*index,
-                                         (pRMParams + 32*index)); 
-        }
-    }
-
-    return_status = 1;
-
-    // Write back the MAC address, only if exists.
-    if (mac_status == 0) {
-        // Zero out MCAST bit if set.
-        cMacFromEeprom[0] &= 0xfe;
-        printf("Writing back MAC address..\n");
-        while (return_status) {
-            return_status = nvmem_set_mac_address(cMacFromEeprom);
-        }
-    }
-
-    // Update driver
-    ucStatus_Dr = 1;
-    printf("Updating driver patch...\n");
-    while (ucStatus_Dr) {
-        // Writing driver patch to EEPRROM - PROTABLE CODE
-        // Note that the array itself is changing between the
-        // different Service Packs.
-        ucStatus_Dr = nvmem_write_patch(NVMEM_WLAN_DRIVER_SP_FILEID,
-                                        drv_length,
-                                        wlan_drv_patch);
-    }
-
-    // Update firmware
-    ucStatus_FW = 1;
-    printf("Updating firmware patch...\n");
-    while (ucStatus_FW) {
-        // Writing FW patch to EEPRROM - PROTABLE CODE
-        // Note that the array itself is changing between the
-        // different Service Packs.
-        ucStatus_FW = nvmem_write_patch(NVMEM_WLAN_FW_SP_FILEID,
-                                        fw_length,
-                                        fw_patch);
-    }
-
-    printf("Update complete, resetting module\n"\
-           "If this doesn't work, reset manually...\n");
-
-    wlan_stop();
-    systick_sleep(500);
-
-    // Re-Init module and request to load with patches.
-    initDriver(0);
-
-    // If MAC does not exist, it is recommended
-    // that the user will write a valid mac address.
-    if (mac_status != 0) {
-        printf("MAC address is not valid, please write a new one\n");
-    }
-
-    // Patch update done
-    printf("All done, call wlan.patch_version()\n");
-}
diff --git a/drivers/cc3000/src/security.c b/drivers/cc3000/src/security.c
deleted file mode 100644
index 62b4f881343ad..0000000000000
--- a/drivers/cc3000/src/security.c
+++ /dev/null
@@ -1,530 +0,0 @@
-/*****************************************************************************
-*
-*  security.c  - CC3000 Host Driver Implementation.
-*  Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/
-*
-*  Redistribution and use in source and binary forms, with or without
-*  modification, are permitted provided that the following conditions
-*  are met:
-*
-*    Redistributions of source code must retain the above copyright
-*    notice, this list of conditions and the following disclaimer.
-*
-*    Redistributions in binary form must reproduce the above copyright
-*    notice, this list of conditions and the following disclaimer in the
-*    documentation and/or other materials provided with the   
-*    distribution.
-*
-*    Neither the name of Texas Instruments Incorporated nor the names of
-*    its contributors may be used to endorse or promote products derived
-*    from this software without specific prior written permission.
-*
-*  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
-*  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
-*  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-*  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
-*  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
-*  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
-*  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-*  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-*  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-*  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
-*  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*
-*****************************************************************************/
-
-//*****************************************************************************
-//
-//! \addtogroup security_api
-//! @{
-//
-//*****************************************************************************
-
-#include "security.h"
-
-#ifndef CC3000_UNENCRYPTED_SMART_CONFIG
-// foreward sbox
-const UINT8 sbox[256] =   { 
-//0     1    2      3     4    5     6     7      8    9     A      B    C     D     E     F
-0x63, 0x7c, 0x77, 0x7b, 0xf2, 0x6b, 0x6f, 0xc5, 0x30, 0x01, 0x67, 0x2b, 0xfe, 0xd7, 0xab, 0x76, //0
-0xca, 0x82, 0xc9, 0x7d, 0xfa, 0x59, 0x47, 0xf0, 0xad, 0xd4, 0xa2, 0xaf, 0x9c, 0xa4, 0x72, 0xc0, //1
-0xb7, 0xfd, 0x93, 0x26, 0x36, 0x3f, 0xf7, 0xcc, 0x34, 0xa5, 0xe5, 0xf1, 0x71, 0xd8, 0x31, 0x15, //2
-0x04, 0xc7, 0x23, 0xc3, 0x18, 0x96, 0x05, 0x9a, 0x07, 0x12, 0x80, 0xe2, 0xeb, 0x27, 0xb2, 0x75, //3
-0x09, 0x83, 0x2c, 0x1a, 0x1b, 0x6e, 0x5a, 0xa0, 0x52, 0x3b, 0xd6, 0xb3, 0x29, 0xe3, 0x2f, 0x84, //4
-0x53, 0xd1, 0x00, 0xed, 0x20, 0xfc, 0xb1, 0x5b, 0x6a, 0xcb, 0xbe, 0x39, 0x4a, 0x4c, 0x58, 0xcf, //5
-0xd0, 0xef, 0xaa, 0xfb, 0x43, 0x4d, 0x33, 0x85, 0x45, 0xf9, 0x02, 0x7f, 0x50, 0x3c, 0x9f, 0xa8, //6
-0x51, 0xa3, 0x40, 0x8f, 0x92, 0x9d, 0x38, 0xf5, 0xbc, 0xb6, 0xda, 0x21, 0x10, 0xff, 0xf3, 0xd2, //7
-0xcd, 0x0c, 0x13, 0xec, 0x5f, 0x97, 0x44, 0x17, 0xc4, 0xa7, 0x7e, 0x3d, 0x64, 0x5d, 0x19, 0x73, //8
-0x60, 0x81, 0x4f, 0xdc, 0x22, 0x2a, 0x90, 0x88, 0x46, 0xee, 0xb8, 0x14, 0xde, 0x5e, 0x0b, 0xdb, //9
-0xe0, 0x32, 0x3a, 0x0a, 0x49, 0x06, 0x24, 0x5c, 0xc2, 0xd3, 0xac, 0x62, 0x91, 0x95, 0xe4, 0x79, //A
-0xe7, 0xc8, 0x37, 0x6d, 0x8d, 0xd5, 0x4e, 0xa9, 0x6c, 0x56, 0xf4, 0xea, 0x65, 0x7a, 0xae, 0x08, //B
-0xba, 0x78, 0x25, 0x2e, 0x1c, 0xa6, 0xb4, 0xc6, 0xe8, 0xdd, 0x74, 0x1f, 0x4b, 0xbd, 0x8b, 0x8a, //C
-0x70, 0x3e, 0xb5, 0x66, 0x48, 0x03, 0xf6, 0x0e, 0x61, 0x35, 0x57, 0xb9, 0x86, 0xc1, 0x1d, 0x9e, //D
-0xe1, 0xf8, 0x98, 0x11, 0x69, 0xd9, 0x8e, 0x94, 0x9b, 0x1e, 0x87, 0xe9, 0xce, 0x55, 0x28, 0xdf, //E
-0x8c, 0xa1, 0x89, 0x0d, 0xbf, 0xe6, 0x42, 0x68, 0x41, 0x99, 0x2d, 0x0f, 0xb0, 0x54, 0xbb, 0x16 }; //F   
-// inverse sbox
-const UINT8 rsbox[256] =
-{ 0x52, 0x09, 0x6a, 0xd5, 0x30, 0x36, 0xa5, 0x38, 0xbf, 0x40, 0xa3, 0x9e, 0x81, 0xf3, 0xd7, 0xfb
-, 0x7c, 0xe3, 0x39, 0x82, 0x9b, 0x2f, 0xff, 0x87, 0x34, 0x8e, 0x43, 0x44, 0xc4, 0xde, 0xe9, 0xcb
-, 0x54, 0x7b, 0x94, 0x32, 0xa6, 0xc2, 0x23, 0x3d, 0xee, 0x4c, 0x95, 0x0b, 0x42, 0xfa, 0xc3, 0x4e
-, 0x08, 0x2e, 0xa1, 0x66, 0x28, 0xd9, 0x24, 0xb2, 0x76, 0x5b, 0xa2, 0x49, 0x6d, 0x8b, 0xd1, 0x25
-, 0x72, 0xf8, 0xf6, 0x64, 0x86, 0x68, 0x98, 0x16, 0xd4, 0xa4, 0x5c, 0xcc, 0x5d, 0x65, 0xb6, 0x92
-, 0x6c, 0x70, 0x48, 0x50, 0xfd, 0xed, 0xb9, 0xda, 0x5e, 0x15, 0x46, 0x57, 0xa7, 0x8d, 0x9d, 0x84
-, 0x90, 0xd8, 0xab, 0x00, 0x8c, 0xbc, 0xd3, 0x0a, 0xf7, 0xe4, 0x58, 0x05, 0xb8, 0xb3, 0x45, 0x06
-, 0xd0, 0x2c, 0x1e, 0x8f, 0xca, 0x3f, 0x0f, 0x02, 0xc1, 0xaf, 0xbd, 0x03, 0x01, 0x13, 0x8a, 0x6b
-, 0x3a, 0x91, 0x11, 0x41, 0x4f, 0x67, 0xdc, 0xea, 0x97, 0xf2, 0xcf, 0xce, 0xf0, 0xb4, 0xe6, 0x73
-, 0x96, 0xac, 0x74, 0x22, 0xe7, 0xad, 0x35, 0x85, 0xe2, 0xf9, 0x37, 0xe8, 0x1c, 0x75, 0xdf, 0x6e
-, 0x47, 0xf1, 0x1a, 0x71, 0x1d, 0x29, 0xc5, 0x89, 0x6f, 0xb7, 0x62, 0x0e, 0xaa, 0x18, 0xbe, 0x1b
-, 0xfc, 0x56, 0x3e, 0x4b, 0xc6, 0xd2, 0x79, 0x20, 0x9a, 0xdb, 0xc0, 0xfe, 0x78, 0xcd, 0x5a, 0xf4
-, 0x1f, 0xdd, 0xa8, 0x33, 0x88, 0x07, 0xc7, 0x31, 0xb1, 0x12, 0x10, 0x59, 0x27, 0x80, 0xec, 0x5f
-, 0x60, 0x51, 0x7f, 0xa9, 0x19, 0xb5, 0x4a, 0x0d, 0x2d, 0xe5, 0x7a, 0x9f, 0x93, 0xc9, 0x9c, 0xef
-, 0xa0, 0xe0, 0x3b, 0x4d, 0xae, 0x2a, 0xf5, 0xb0, 0xc8, 0xeb, 0xbb, 0x3c, 0x83, 0x53, 0x99, 0x61
-, 0x17, 0x2b, 0x04, 0x7e, 0xba, 0x77, 0xd6, 0x26, 0xe1, 0x69, 0x14, 0x63, 0x55, 0x21, 0x0c, 0x7d };
-// round constant
-const UINT8 Rcon[11] = {
-  0x8d, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x1b, 0x36};
-
-
-UINT8 expandedKey[176];
-
-//*****************************************************************************
-//
-//!  expandKey
-//!
-//!  @param  key          AES128 key - 16 bytes
-//!  @param  expandedKey  expanded AES128 key
-//!
-//!  @return  none
-//!
-//!  @brief  expend a 16 bytes key for AES128 implementation
-//!
-//*****************************************************************************
-
-void expandKey(UINT8 *expandedKey, UINT8 *key)
-{
-  UINT16 ii, buf1;
-  for (ii=0;ii<16;ii++)
-    expandedKey[ii] = key[ii];
-  for (ii=1;ii<11;ii++){
-    buf1 = expandedKey[ii*16 - 4];
-    expandedKey[ii*16 + 0] = sbox[expandedKey[ii*16 - 3]]^expandedKey[(ii-1)*16 + 0]^Rcon[ii];
-    expandedKey[ii*16 + 1] = sbox[expandedKey[ii*16 - 2]]^expandedKey[(ii-1)*16 + 1];
-    expandedKey[ii*16 + 2] = sbox[expandedKey[ii*16 - 1]]^expandedKey[(ii-1)*16 + 2];
-    expandedKey[ii*16 + 3] = sbox[buf1                  ]^expandedKey[(ii-1)*16 + 3];
-    expandedKey[ii*16 + 4] = expandedKey[(ii-1)*16 + 4]^expandedKey[ii*16 + 0];
-    expandedKey[ii*16 + 5] = expandedKey[(ii-1)*16 + 5]^expandedKey[ii*16 + 1];
-    expandedKey[ii*16 + 6] = expandedKey[(ii-1)*16 + 6]^expandedKey[ii*16 + 2];
-    expandedKey[ii*16 + 7] = expandedKey[(ii-1)*16 + 7]^expandedKey[ii*16 + 3];
-    expandedKey[ii*16 + 8] = expandedKey[(ii-1)*16 + 8]^expandedKey[ii*16 + 4];
-    expandedKey[ii*16 + 9] = expandedKey[(ii-1)*16 + 9]^expandedKey[ii*16 + 5];
-    expandedKey[ii*16 +10] = expandedKey[(ii-1)*16 +10]^expandedKey[ii*16 + 6];
-    expandedKey[ii*16 +11] = expandedKey[(ii-1)*16 +11]^expandedKey[ii*16 + 7];
-    expandedKey[ii*16 +12] = expandedKey[(ii-1)*16 +12]^expandedKey[ii*16 + 8];
-    expandedKey[ii*16 +13] = expandedKey[(ii-1)*16 +13]^expandedKey[ii*16 + 9];
-    expandedKey[ii*16 +14] = expandedKey[(ii-1)*16 +14]^expandedKey[ii*16 +10];
-    expandedKey[ii*16 +15] = expandedKey[(ii-1)*16 +15]^expandedKey[ii*16 +11];
-  }
-	
-}
-
-//*****************************************************************************
-//
-//!  galois_mul2
-//!
-//!  @param  value    argument to multiply
-//!
-//!  @return  multiplied argument
-//!
-//!  @brief  multiply by 2 in the galois field
-//!
-//*****************************************************************************
-
-UINT8 galois_mul2(UINT8 value)
-{
-	if (value>>7)
-	{
-		value = value << 1;
-		return (value^0x1b);
-	} else
-		return value<<1;
-}
-
-//*****************************************************************************
-//
-//!  aes_encr
-//!
-//!  @param[in]  expandedKey expanded AES128 key
-//!  @param[in/out] state 16 bytes of plain text and cipher text
-//!
-//!  @return  none
-//!
-//!  @brief   internal implementation of AES128 encryption.
-//!           straight forward aes encryption implementation
-//!           first the group of operations
-//!          - addRoundKey
-//!          - subbytes
-//!          - shiftrows
-//!          - mixcolums
-//!          is executed 9 times, after this addroundkey to finish the 9th 
-//!          round, after that the 10th round without mixcolums
-//!          no further subfunctions to save cycles for function calls
-//!          no structuring with "for (....)" to save cycles.
-//!	 
-//!
-//*****************************************************************************
-
-void aes_encr(UINT8 *state, UINT8 *expandedKey)
-{
-  UINT8 buf1, buf2, buf3, round;
-		
-  for (round = 0; round < 9; round ++){
-    // addroundkey, sbox and shiftrows
-    // row 0
-    state[ 0]  = sbox[(state[ 0] ^ expandedKey[(round*16)     ])];
-    state[ 4]  = sbox[(state[ 4] ^ expandedKey[(round*16) +  4])];
-    state[ 8]  = sbox[(state[ 8] ^ expandedKey[(round*16) +  8])];
-    state[12]  = sbox[(state[12] ^ expandedKey[(round*16) + 12])];
-    // row 1
-    buf1 = state[1] ^ expandedKey[(round*16) + 1];
-    state[ 1]  = sbox[(state[ 5] ^ expandedKey[(round*16) +  5])];
-    state[ 5]  = sbox[(state[ 9] ^ expandedKey[(round*16) +  9])];
-    state[ 9]  = sbox[(state[13] ^ expandedKey[(round*16) + 13])];
-    state[13]  = sbox[buf1];
-    // row 2
-    buf1 = state[2] ^ expandedKey[(round*16) + 2];
-    buf2 = state[6] ^ expandedKey[(round*16) + 6];
-    state[ 2]  = sbox[(state[10] ^ expandedKey[(round*16) + 10])];
-    state[ 6]  = sbox[(state[14] ^ expandedKey[(round*16) + 14])];
-    state[10]  = sbox[buf1];
-    state[14]  = sbox[buf2];
-    // row 3
-    buf1 = state[15] ^ expandedKey[(round*16) + 15];
-    state[15]  = sbox[(state[11] ^ expandedKey[(round*16) + 11])];
-    state[11]  = sbox[(state[ 7] ^ expandedKey[(round*16) +  7])];
-    state[ 7]  = sbox[(state[ 3] ^ expandedKey[(round*16) +  3])];
-    state[ 3]  = sbox[buf1];
-    
-    // mixcolums //////////
-    // col1
-    buf1 = state[0] ^ state[1] ^ state[2] ^ state[3];
-    buf2 = state[0];
-    buf3 = state[0]^state[1]; buf3=galois_mul2(buf3); state[0] = state[0] ^ buf3 ^ buf1;
-    buf3 = state[1]^state[2]; buf3=galois_mul2(buf3); state[1] = state[1] ^ buf3 ^ buf1;
-    buf3 = state[2]^state[3]; buf3=galois_mul2(buf3); state[2] = state[2] ^ buf3 ^ buf1;
-    buf3 = state[3]^buf2;     buf3=galois_mul2(buf3); state[3] = state[3] ^ buf3 ^ buf1;
-    // col2
-    buf1 = state[4] ^ state[5] ^ state[6] ^ state[7];
-    buf2 = state[4];
-    buf3 = state[4]^state[5]; buf3=galois_mul2(buf3); state[4] = state[4] ^ buf3 ^ buf1;
-    buf3 = state[5]^state[6]; buf3=galois_mul2(buf3); state[5] = state[5] ^ buf3 ^ buf1;
-    buf3 = state[6]^state[7]; buf3=galois_mul2(buf3); state[6] = state[6] ^ buf3 ^ buf1;
-    buf3 = state[7]^buf2;     buf3=galois_mul2(buf3); state[7] = state[7] ^ buf3 ^ buf1;
-    // col3
-    buf1 = state[8] ^ state[9] ^ state[10] ^ state[11];
-    buf2 = state[8];
-    buf3 = state[8]^state[9];   buf3=galois_mul2(buf3); state[8] = state[8] ^ buf3 ^ buf1;
-    buf3 = state[9]^state[10];  buf3=galois_mul2(buf3); state[9] = state[9] ^ buf3 ^ buf1;
-    buf3 = state[10]^state[11]; buf3=galois_mul2(buf3); state[10] = state[10] ^ buf3 ^ buf1;
-    buf3 = state[11]^buf2;      buf3=galois_mul2(buf3); state[11] = state[11] ^ buf3 ^ buf1;
-    // col4
-    buf1 = state[12] ^ state[13] ^ state[14] ^ state[15];
-    buf2 = state[12];
-    buf3 = state[12]^state[13]; buf3=galois_mul2(buf3); state[12] = state[12] ^ buf3 ^ buf1;
-    buf3 = state[13]^state[14]; buf3=galois_mul2(buf3); state[13] = state[13] ^ buf3 ^ buf1;
-    buf3 = state[14]^state[15]; buf3=galois_mul2(buf3); state[14] = state[14] ^ buf3 ^ buf1;
-    buf3 = state[15]^buf2;      buf3=galois_mul2(buf3); state[15] = state[15] ^ buf3 ^ buf1;    
-		
-  }
-  // 10th round without mixcols
-  state[ 0]  = sbox[(state[ 0] ^ expandedKey[(round*16)     ])];
-  state[ 4]  = sbox[(state[ 4] ^ expandedKey[(round*16) +  4])];
-  state[ 8]  = sbox[(state[ 8] ^ expandedKey[(round*16) +  8])];
-  state[12]  = sbox[(state[12] ^ expandedKey[(round*16) + 12])];
-  // row 1
-  buf1 = state[1] ^ expandedKey[(round*16) + 1];
-  state[ 1]  = sbox[(state[ 5] ^ expandedKey[(round*16) +  5])];
-  state[ 5]  = sbox[(state[ 9] ^ expandedKey[(round*16) +  9])];
-  state[ 9]  = sbox[(state[13] ^ expandedKey[(round*16) + 13])];
-  state[13]  = sbox[buf1];
-  // row 2
-  buf1 = state[2] ^ expandedKey[(round*16) + 2];
-  buf2 = state[6] ^ expandedKey[(round*16) + 6];
-  state[ 2]  = sbox[(state[10] ^ expandedKey[(round*16) + 10])];
-  state[ 6]  = sbox[(state[14] ^ expandedKey[(round*16) + 14])];
-  state[10]  = sbox[buf1];
-  state[14]  = sbox[buf2];
-  // row 3
-  buf1 = state[15] ^ expandedKey[(round*16) + 15];
-  state[15]  = sbox[(state[11] ^ expandedKey[(round*16) + 11])];
-  state[11]  = sbox[(state[ 7] ^ expandedKey[(round*16) +  7])];
-  state[ 7]  = sbox[(state[ 3] ^ expandedKey[(round*16) +  3])];
-  state[ 3]  = sbox[buf1];
-  // last addroundkey
-  state[ 0]^=expandedKey[160];
-  state[ 1]^=expandedKey[161];
-  state[ 2]^=expandedKey[162];
-  state[ 3]^=expandedKey[163];
-  state[ 4]^=expandedKey[164];
-  state[ 5]^=expandedKey[165];
-  state[ 6]^=expandedKey[166];
-  state[ 7]^=expandedKey[167];
-  state[ 8]^=expandedKey[168];
-  state[ 9]^=expandedKey[169];
-  state[10]^=expandedKey[170];
-  state[11]^=expandedKey[171];
-  state[12]^=expandedKey[172];
-  state[13]^=expandedKey[173];
-  state[14]^=expandedKey[174]; 
-  state[15]^=expandedKey[175];
-} 
-
-//*****************************************************************************
-//
-//!  aes_decr
-//!
-//!  @param[in]  expandedKey expanded AES128 key
-//!  @param[in\out] state 16 bytes of cipher text and plain text
-//!
-//!  @return  none
-//!
-//!  @brief   internal implementation of AES128 decryption.
-//!           straight forward aes decryption implementation
-//!           the order of substeps is the exact reverse of decryption
-//!           inverse functions:
-//!            - addRoundKey is its own inverse
-//!            - rsbox is inverse of sbox
-//!            - rightshift instead of leftshift
-//!            - invMixColumns = barreto + mixColumns
-//!           no further subfunctions to save cycles for function calls
-//!           no structuring with "for (....)" to save cycles
-//!
-//*****************************************************************************
-
-void aes_decr(UINT8 *state, UINT8 *expandedKey)
-{
-  UINT8 buf1, buf2, buf3;
-  INT8 round;
-  round = 9;
-	
-  // initial addroundkey
-  state[ 0]^=expandedKey[160];
-  state[ 1]^=expandedKey[161];
-  state[ 2]^=expandedKey[162];
-  state[ 3]^=expandedKey[163];
-  state[ 4]^=expandedKey[164];
-  state[ 5]^=expandedKey[165];
-  state[ 6]^=expandedKey[166];
-  state[ 7]^=expandedKey[167];
-  state[ 8]^=expandedKey[168];
-  state[ 9]^=expandedKey[169];
-  state[10]^=expandedKey[170];
-  state[11]^=expandedKey[171];
-  state[12]^=expandedKey[172];
-  state[13]^=expandedKey[173];
-  state[14]^=expandedKey[174]; 
-  state[15]^=expandedKey[175];
-	
-  // 10th round without mixcols
-  state[ 0]  = rsbox[state[ 0]] ^ expandedKey[(round*16)     ];
-  state[ 4]  = rsbox[state[ 4]] ^ expandedKey[(round*16) +  4];
-  state[ 8]  = rsbox[state[ 8]] ^ expandedKey[(round*16) +  8];
-  state[12]  = rsbox[state[12]] ^ expandedKey[(round*16) + 12];
-  // row 1
-  buf1 =       rsbox[state[13]] ^ expandedKey[(round*16) +  1];
-  state[13]  = rsbox[state[ 9]] ^ expandedKey[(round*16) + 13];
-  state[ 9]  = rsbox[state[ 5]] ^ expandedKey[(round*16) +  9];
-  state[ 5]  = rsbox[state[ 1]] ^ expandedKey[(round*16) +  5];
-  state[ 1]  = buf1;
-  // row 2
-  buf1 =       rsbox[state[ 2]] ^ expandedKey[(round*16) + 10];
-  buf2 =       rsbox[state[ 6]] ^ expandedKey[(round*16) + 14];
-  state[ 2]  = rsbox[state[10]] ^ expandedKey[(round*16) +  2];
-  state[ 6]  = rsbox[state[14]] ^ expandedKey[(round*16) +  6];
-  state[10]  = buf1;
-  state[14]  = buf2;
-  // row 3
-  buf1 =       rsbox[state[ 3]] ^ expandedKey[(round*16) + 15];
-  state[ 3]  = rsbox[state[ 7]] ^ expandedKey[(round*16) +  3];
-  state[ 7]  = rsbox[state[11]] ^ expandedKey[(round*16) +  7];
-  state[11]  = rsbox[state[15]] ^ expandedKey[(round*16) + 11];
-  state[15]  = buf1;
-	
-  for (round = 8; round >= 0; round--){
-    // barreto
-    //col1
-    buf1 = galois_mul2(galois_mul2(state[0]^state[2]));
-    buf2 = galois_mul2(galois_mul2(state[1]^state[3]));
-    state[0] ^= buf1;     state[1] ^= buf2;    state[2] ^= buf1;    state[3] ^= buf2;
-    //col2
-    buf1 = galois_mul2(galois_mul2(state[4]^state[6]));
-    buf2 = galois_mul2(galois_mul2(state[5]^state[7]));
-    state[4] ^= buf1;    state[5] ^= buf2;    state[6] ^= buf1;    state[7] ^= buf2;
-    //col3
-    buf1 = galois_mul2(galois_mul2(state[8]^state[10]));
-    buf2 = galois_mul2(galois_mul2(state[9]^state[11]));
-    state[8] ^= buf1;    state[9] ^= buf2;    state[10] ^= buf1;    state[11] ^= buf2;
-    //col4
-    buf1 = galois_mul2(galois_mul2(state[12]^state[14]));
-    buf2 = galois_mul2(galois_mul2(state[13]^state[15]));
-    state[12] ^= buf1;    state[13] ^= buf2;    state[14] ^= buf1;    state[15] ^= buf2;
-    // mixcolums //////////
-    // col1
-    buf1 = state[0] ^ state[1] ^ state[2] ^ state[3];
-    buf2 = state[0];
-    buf3 = state[0]^state[1]; buf3=galois_mul2(buf3); state[0] = state[0] ^ buf3 ^ buf1;
-    buf3 = state[1]^state[2]; buf3=galois_mul2(buf3); state[1] = state[1] ^ buf3 ^ buf1;
-    buf3 = state[2]^state[3]; buf3=galois_mul2(buf3); state[2] = state[2] ^ buf3 ^ buf1;
-    buf3 = state[3]^buf2;     buf3=galois_mul2(buf3); state[3] = state[3] ^ buf3 ^ buf1;
-    // col2
-    buf1 = state[4] ^ state[5] ^ state[6] ^ state[7];
-    buf2 = state[4];
-    buf3 = state[4]^state[5]; buf3=galois_mul2(buf3); state[4] = state[4] ^ buf3 ^ buf1;
-    buf3 = state[5]^state[6]; buf3=galois_mul2(buf3); state[5] = state[5] ^ buf3 ^ buf1;
-    buf3 = state[6]^state[7]; buf3=galois_mul2(buf3); state[6] = state[6] ^ buf3 ^ buf1;
-    buf3 = state[7]^buf2;     buf3=galois_mul2(buf3); state[7] = state[7] ^ buf3 ^ buf1;
-    // col3
-    buf1 = state[8] ^ state[9] ^ state[10] ^ state[11];
-    buf2 = state[8];
-    buf3 = state[8]^state[9];   buf3=galois_mul2(buf3); state[8] = state[8] ^ buf3 ^ buf1;
-    buf3 = state[9]^state[10];  buf3=galois_mul2(buf3); state[9] = state[9] ^ buf3 ^ buf1;
-    buf3 = state[10]^state[11]; buf3=galois_mul2(buf3); state[10] = state[10] ^ buf3 ^ buf1;
-    buf3 = state[11]^buf2;      buf3=galois_mul2(buf3); state[11] = state[11] ^ buf3 ^ buf1;
-    // col4
-    buf1 = state[12] ^ state[13] ^ state[14] ^ state[15];
-    buf2 = state[12];
-    buf3 = state[12]^state[13]; buf3=galois_mul2(buf3); state[12] = state[12] ^ buf3 ^ buf1;
-    buf3 = state[13]^state[14]; buf3=galois_mul2(buf3); state[13] = state[13] ^ buf3 ^ buf1;
-    buf3 = state[14]^state[15]; buf3=galois_mul2(buf3); state[14] = state[14] ^ buf3 ^ buf1;
-    buf3 = state[15]^buf2;      buf3=galois_mul2(buf3); state[15] = state[15] ^ buf3 ^ buf1;    
-		
-    // addroundkey, rsbox and shiftrows
-    // row 0
-    state[ 0]  = rsbox[state[ 0]] ^ expandedKey[(round*16)     ];
-    state[ 4]  = rsbox[state[ 4]] ^ expandedKey[(round*16) +  4];
-    state[ 8]  = rsbox[state[ 8]] ^ expandedKey[(round*16) +  8];
-    state[12]  = rsbox[state[12]] ^ expandedKey[(round*16) + 12];
-    // row 1
-    buf1 =       rsbox[state[13]] ^ expandedKey[(round*16) +  1];
-    state[13]  = rsbox[state[ 9]] ^ expandedKey[(round*16) + 13];
-    state[ 9]  = rsbox[state[ 5]] ^ expandedKey[(round*16) +  9];
-    state[ 5]  = rsbox[state[ 1]] ^ expandedKey[(round*16) +  5];
-    state[ 1]  = buf1;
-    // row 2
-    buf1 =       rsbox[state[ 2]] ^ expandedKey[(round*16) + 10];
-    buf2 =       rsbox[state[ 6]] ^ expandedKey[(round*16) + 14];
-    state[ 2]  = rsbox[state[10]] ^ expandedKey[(round*16) +  2];
-    state[ 6]  = rsbox[state[14]] ^ expandedKey[(round*16) +  6];
-    state[10]  = buf1;
-    state[14]  = buf2;
-    // row 3
-    buf1 =       rsbox[state[ 3]] ^ expandedKey[(round*16) + 15];
-    state[ 3]  = rsbox[state[ 7]] ^ expandedKey[(round*16) +  3];
-    state[ 7]  = rsbox[state[11]] ^ expandedKey[(round*16) +  7];
-    state[11]  = rsbox[state[15]] ^ expandedKey[(round*16) + 11];
-    state[15]  = buf1;
-  }
-	
-} 
-
-//*****************************************************************************
-//
-//!  aes_encrypt
-//!
-//!  @param[in]  key   AES128 key of size 16 bytes
-//!  @param[in\out] state   16 bytes of plain text and cipher text
-//!
-//!  @return  none
-//!
-//!  @brief   AES128 encryption:
-//!           Given AES128 key and  16 bytes plain text, cipher text of 16 bytes
-//!           is computed. The AES implementation is in mode ECB (Electronic 
-//!           Code Book). 
-//!	 
-//!
-//*****************************************************************************
-
-void aes_encrypt(UINT8 *state, UINT8 *key)
-{
-	// expand the key into 176 bytes
-	expandKey(expandedKey, key);       
-	aes_encr(state, expandedKey);
-}
-
-//*****************************************************************************
-//
-//!  aes_decrypt
-//!
-//!  @param[in]  key   AES128 key of size 16 bytes
-//!  @param[in\out] state   16 bytes of cipher text and plain text
-//!
-//!  @return  none
-//!
-//!  @brief   AES128 decryption:
-//!           Given AES128 key and  16 bytes cipher text, plain text of 16 bytes
-//!           is computed The AES implementation is in mode ECB 
-//!           (Electronic Code Book).
-//!	 
-//!
-//*****************************************************************************
-
-void aes_decrypt(UINT8 *state, UINT8 *key)
-{
-    expandKey(expandedKey, key);       // expand the key into 176 bytes
-    aes_decr(state, expandedKey);
-}
-
-//*****************************************************************************
-//
-//!  aes_read_key
-//!
-//!  @param[out]  key   AES128 key of size 16 bytes
-//!
-//!  @return  on success 0, error otherwise.
-//!
-//!  @brief   Reads AES128 key from EEPROM
-//!           Reads the AES128 key from fileID #12 in EEPROM
-//!           returns an error if the key does not exist. 
-//!	 
-//!
-//*****************************************************************************
-
-INT32 aes_read_key(UINT8 *key)
-{
-	INT32	returnValue;
-	
-	returnValue = nvmem_read(NVMEM_AES128_KEY_FILEID, AES128_KEY_SIZE, 0, key);
-
-	return returnValue;
-}
-
-//*****************************************************************************
-//
-//!  aes_write_key
-//!
-//!  @param[out]  key   AES128 key of size 16 bytes
-//!
-//!  @return  on success 0, error otherwise.
-//!
-//!  @brief   writes AES128 key from EEPROM
-//!           Writes the AES128 key to fileID #12 in EEPROM
-//!	 
-//!
-//*****************************************************************************
-
-INT32 aes_write_key(UINT8 *key)
-{
-	INT32	returnValue;
-
-	returnValue = nvmem_write(NVMEM_AES128_KEY_FILEID, AES128_KEY_SIZE, 0, key);
-
-	return returnValue;
-}
-
-#endif //CC3000_UNENCRYPTED_SMART_CONFIG
-
-//*****************************************************************************
-//
-// Close the Doxygen group.
-//! @}
-//
-//*****************************************************************************
diff --git a/drivers/cc3000/src/socket.c b/drivers/cc3000/src/socket.c
deleted file mode 100644
index ddd7e56e80759..0000000000000
--- a/drivers/cc3000/src/socket.c
+++ /dev/null
@@ -1,1182 +0,0 @@
-/*****************************************************************************
-*
-*  socket.c  - CC3000 Host Driver Implementation.
-*  Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/
-*
-*  Redistribution and use in source and binary forms, with or without
-*  modification, are permitted provided that the following conditions
-*  are met:
-*
-*    Redistributions of source code must retain the above copyright
-*    notice, this list of conditions and the following disclaimer.
-*
-*    Redistributions in binary form must reproduce the above copyright
-*    notice, this list of conditions and the following disclaimer in the
-*    documentation and/or other materials provided with the   
-*    distribution.
-*
-*    Neither the name of Texas Instruments Incorporated nor the names of
-*    its contributors may be used to endorse or promote products derived
-*    from this software without specific prior written permission.
-*
-*  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
-*  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
-*  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-*  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
-*  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
-*  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
-*  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-*  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-*  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-*  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
-*  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*
-*****************************************************************************/
-
-//*****************************************************************************
-//
-//! \addtogroup socket_api
-//! @{
-//
-//*****************************************************************************
-
-#include <string.h>
-#include <stdlib.h>
-#include "hci.h"
-#include "socket.h"
-#include "evnt_handler.h"
-#include "netapp.h"
-
-
-
-//Enable this flag if and only if you must comply with BSD socket 
-//close() function
-#ifdef _API_USE_BSD_CLOSE
-#define close(sd) closesocket(sd)
-#endif
-
-//Enable this flag if and only if you must comply with BSD socket read() and 
-//write() functions
-#ifdef _API_USE_BSD_READ_WRITE
-#define read(sd, buf, len, flags) recv(sd, buf, len, flags)
-#define write(sd, buf, len, flags) send(sd, buf, len, flags)
-#endif
-
-#define SOCKET_OPEN_PARAMS_LEN				(12)
-#define SOCKET_CLOSE_PARAMS_LEN				(4)
-#define SOCKET_ACCEPT_PARAMS_LEN			(4)
-#define SOCKET_BIND_PARAMS_LEN				(20)
-#define SOCKET_LISTEN_PARAMS_LEN			(8)
-#define SOCKET_GET_HOST_BY_NAME_PARAMS_LEN	(9)
-#define SOCKET_CONNECT_PARAMS_LEN			(20)
-#define SOCKET_SELECT_PARAMS_LEN			(44)
-#define SOCKET_SET_SOCK_OPT_PARAMS_LEN		(20)
-#define SOCKET_GET_SOCK_OPT_PARAMS_LEN		(12)
-#define SOCKET_RECV_FROM_PARAMS_LEN			(12)
-#define SOCKET_SENDTO_PARAMS_LEN			(24)
-#define SOCKET_MDNS_ADVERTISE_PARAMS_LEN	(12)
-#define SOCKET_GET_MSS_VALUE_PARAMS_LEN		(4)
-
-// The legnth of arguments for the SEND command: sd + buff_offset + len + flags, 
-// while size of each parameter is 32 bit - so the total length is 16 bytes;
-
-#define HCI_CMND_SEND_ARG_LENGTH	(16)
-
-
-#define SELECT_TIMEOUT_MIN_MICRO_SECONDS  5000
-
-#define HEADERS_SIZE_DATA       (SPI_HEADER_SIZE + 5)
-
-#define SIMPLE_LINK_HCI_CMND_TRANSPORT_HEADER_SIZE  (SPI_HEADER_SIZE + SIMPLE_LINK_HCI_CMND_HEADER_SIZE)
-
-#define MDNS_DEVICE_SERVICE_MAX_LENGTH 	(32)
-
-
-//*****************************************************************************
-//
-//! HostFlowControlConsumeBuff
-//!
-//!  @param  sd  socket descriptor
-//!
-//!  @return 0 in case there are buffers available, 
-//!          -1 in case of bad socket
-//!          -2 if there are no free buffers present (only when 
-//!          SEND_NON_BLOCKING is enabled)
-//!
-//!  @brief  if SEND_NON_BLOCKING not define - block until have free buffer 
-//!          becomes available, else return immediately  with correct status 
-//!          regarding the buffers available.
-//
-//*****************************************************************************
-static INT16 HostFlowControlConsumeBuff(INT16 sd)
-{
-#ifndef SEND_NON_BLOCKING
-	/* wait in busy loop */
-	do
-	{
-		// In case last transmission failed then we will return the last failure 
-		// reason here.
-		// Note that the buffer will not be allocated in this case
-		if (tSLInformation.slTransmitDataError != 0)
-		{
-			CC3000_EXPORT(errno) = tSLInformation.slTransmitDataError;
-			tSLInformation.slTransmitDataError = 0;
-			return CC3000_EXPORT(errno);
-		}
-
-		if(SOCKET_STATUS_ACTIVE != get_socket_active_status(sd))
-			return -1;
-	} while(0 == tSLInformation.usNumberOfFreeBuffers);
-
-	tSLInformation.usNumberOfFreeBuffers--;
-
-	return 0;
-#else
-
-	// In case last transmission failed then we will return the last failure 
-	// reason here.
-	// Note that the buffer will not be allocated in this case
-	if (tSLInformation.slTransmitDataError != 0)
-	{
-		CC3000_EXPORT(errno) = tSLInformation.slTransmitDataError;
-		tSLInformation.slTransmitDataError = 0;
-		return CC3000_EXPORT(errno);
-	}
-	if(SOCKET_STATUS_ACTIVE != get_socket_active_status(sd))
-		return -1;
-
-	//If there are no available buffers, return -2. It is recommended to use  
-	// select or receive to see if there is any buffer occupied with received data
-	// If so, call receive() to release the buffer.
-	if(0 == tSLInformation.usNumberOfFreeBuffers)
-	{
-		return -2;
-	}
-	else
-	{
-		tSLInformation.usNumberOfFreeBuffers--;
-		return 0;
-	}
-#endif
-}
-
-//*****************************************************************************
-//
-//! socket
-//!
-//!  @param  domain    selects the protocol family which will be used for 
-//!                    communication. On this version only AF_INET is supported
-//!  @param  type      specifies the communication semantics. On this version 
-//!                    only SOCK_STREAM, SOCK_DGRAM, SOCK_RAW are supported
-//!  @param  protocol  specifies a particular protocol to be used with the 
-//!                    socket IPPROTO_TCP, IPPROTO_UDP or IPPROTO_RAW are 
-//!                    supported.
-//!
-//!  @return  On success, socket handle that is used for consequent socket 
-//!           operations. On error, -1 is returned.
-//!
-//!  @brief  create an endpoint for communication
-//!          The socket function creates a socket that is bound to a specific 
-//!          transport service provider. This function is called by the 
-//!          application layer to obtain a socket handle.
-//
-//*****************************************************************************
-
-INT16 CC3000_EXPORT(socket)(INT32 domain, INT32 type, INT32 protocol)
-{
-	INT32 ret;
-	UINT8 *ptr, *args;
-
-	ret = EFAIL;
-	ptr = tSLInformation.pucTxCommandBuffer;
-	args = (ptr + HEADERS_SIZE_CMD);
-
-	// Fill in HCI packet structure
-	args = UINT32_TO_STREAM(args, domain);
-	args = UINT32_TO_STREAM(args, type);
-	args = UINT32_TO_STREAM(args, protocol);
-
-	// Initiate a HCI command
-	hci_command_send(HCI_CMND_SOCKET, ptr, SOCKET_OPEN_PARAMS_LEN);
-
-	// Since we are in blocking state - wait for event complete
-	SimpleLinkWaitEvent(HCI_CMND_SOCKET, &ret);
-
-	// Process the event 
-	CC3000_EXPORT(errno) = ret;
-
-	set_socket_active_status(ret, SOCKET_STATUS_ACTIVE);
-
-	return(ret);
-}
-
-//*****************************************************************************
-//
-//! closesocket
-//!
-//!  @param  sd    socket handle.
-//!
-//!  @return  On success, zero is returned. On error, -1 is returned.
-//!
-//!  @brief  The socket function closes a created socket.
-//
-//*****************************************************************************
-
-INT32 CC3000_EXPORT(closesocket)(INT32 sd)
-{
-	INT32 ret;
-	UINT8 *ptr, *args;
-
-	ret = EFAIL;
-	ptr = tSLInformation.pucTxCommandBuffer;
-	args = (ptr + HEADERS_SIZE_CMD);
-
-	// Fill in HCI packet structure
-	args = UINT32_TO_STREAM(args, sd);
-
-	// Initiate a HCI command
-	hci_command_send(HCI_CMND_CLOSE_SOCKET,
-		ptr, SOCKET_CLOSE_PARAMS_LEN);
-
-	// Since we are in blocking state - wait for event complete
-	SimpleLinkWaitEvent(HCI_CMND_CLOSE_SOCKET, &ret);
-	CC3000_EXPORT(errno) = ret;
-
-	// since 'close' call may result in either OK (and then it closed) or error 
-	// mark this socket as invalid 
-	set_socket_active_status(sd, SOCKET_STATUS_INACTIVE);
-
-	return(ret);
-}
-
-//*****************************************************************************
-//
-//! accept
-//!
-//!  @param[in]   sd      socket descriptor (handle)              
-//!  @param[out]  addr    the argument addr is a pointer to a sockaddr structure
-//!                       This structure is filled in with the address of the  
-//!                       peer socket, as known to the communications layer.        
-//!                       determined. The exact format of the address returned             
-//!                       addr is by the socket's address sockaddr. 
-//!                       On this version only AF_INET is supported.
-//!                       This argument returns in network order.
-//!  @param[out] addrlen  the addrlen argument is a value-result argument: 
-//!                       it should initially contain the size of the structure
-//!                       pointed to by addr.
-//!
-//!  @return  For socket in blocking mode:
-//!				      On success, socket handle. on failure negative
-//!			      For socket in non-blocking mode:
-//!				     - On connection establishment, socket handle
-//!				     - On connection pending, SOC_IN_PROGRESS (-2)
-//!			       - On failure, SOC_ERROR	(-1)
-//!
-//!  @brief  accept a connection on a socket:
-//!          This function is used with connection-based socket types 
-//!          (SOCK_STREAM). It extracts the first connection request on the 
-//!          queue of pending connections, creates a new connected socket, and
-//!          returns a new file descriptor referring to that socket.
-//!          The newly created socket is not in the listening state. 
-//!          The original socket sd is unaffected by this call. 
-//!          The argument sd is a socket that has been created with socket(),
-//!          bound to a local address with bind(), and is  listening for 
-//!          connections after a listen(). The argument addr is a pointer 
-//!          to a sockaddr structure. This structure is filled in with the 
-//!          address of the peer socket, as known to the communications layer.
-//!          The exact format of the address returned addr is determined by the 
-//!          socket's address family. The addrlen argument is a value-result
-//!          argument: it should initially contain the size of the structure
-//!          pointed to by addr, on return it will contain the actual 
-//!          length (in bytes) of the address returned.
-//!
-//! @sa     socket ; bind ; listen
-//
-//*****************************************************************************
-
-INT32 CC3000_EXPORT(accept)(INT32 sd, sockaddr *addr, socklen_t *addrlen)
-{
-	INT32 ret;
-	UINT8 *ptr, *args;
-	tBsdReturnParams tAcceptReturnArguments;
-
-	ret = EFAIL;
-	ptr = tSLInformation.pucTxCommandBuffer;
-	args = (ptr + HEADERS_SIZE_CMD);
-
-	// Fill in temporary command buffer
-	args = UINT32_TO_STREAM(args, sd);
-
-	// Initiate a HCI command
-	hci_command_send(HCI_CMND_ACCEPT,
-		ptr, SOCKET_ACCEPT_PARAMS_LEN);
-
-	// Since we are in blocking state - wait for event complete
-	SimpleLinkWaitEvent(HCI_CMND_ACCEPT, &tAcceptReturnArguments);
-
-
-	// need specify return parameters!!!
-	memcpy(addr, &tAcceptReturnArguments.tSocketAddress, ASIC_ADDR_LEN);
-	*addrlen = ASIC_ADDR_LEN;
-	CC3000_EXPORT(errno) = tAcceptReturnArguments.iStatus; 
-	ret = CC3000_EXPORT(errno);
-
-	// if succeeded, iStatus = new socket descriptor. otherwise - error number 
-	if(M_IS_VALID_SD(ret))
-	{
-		set_socket_active_status(ret, SOCKET_STATUS_ACTIVE);
-	}
-	else
-	{
-		set_socket_active_status(sd, SOCKET_STATUS_INACTIVE);
-	}
-
-	return(ret);
-}
-
-//*****************************************************************************
-//
-//! bind
-//!
-//!  @param[in]   sd      socket descriptor (handle)              
-//!  @param[out]  addr    specifies the destination address. On this version 
-//!                       only AF_INET is supported.
-//!  @param[out] addrlen  contains the size of the structure pointed to by addr.
-//!
-//!  @return  	On success, zero is returned. On error, -1 is returned.
-//!
-//!  @brief  assign a name to a socket
-//!          This function gives the socket the local address addr.
-//!          addr is addrlen bytes long. Traditionally, this is called when a 
-//!          socket is created with socket, it exists in a name space (address 
-//!          family) but has no name assigned.
-//!          It is necessary to assign a local address before a SOCK_STREAM
-//!          socket may receive connections.
-//!
-//! @sa     socket ; accept ; listen
-//
-//*****************************************************************************
-
-INT32 CC3000_EXPORT(bind)(INT32 sd, const sockaddr *addr, INT32 addrlen)
-{
-	INT32 ret;
-	UINT8 *ptr, *args;
-
-	ret = EFAIL;
-	ptr = tSLInformation.pucTxCommandBuffer;
-	args = (ptr + HEADERS_SIZE_CMD);
-
-	addrlen = ASIC_ADDR_LEN;
-
-	// Fill in temporary command buffer
-	args = UINT32_TO_STREAM(args, sd);
-	args = UINT32_TO_STREAM(args, 0x00000008);
-	args = UINT32_TO_STREAM(args, addrlen);
-	ARRAY_TO_STREAM(args, ((UINT8 *)addr), addrlen);
-
-	// Initiate a HCI command
-	hci_command_send(HCI_CMND_BIND,
-		ptr, SOCKET_BIND_PARAMS_LEN);
-
-	// Since we are in blocking state - wait for event complete
-	SimpleLinkWaitEvent(HCI_CMND_BIND, &ret);
-
-	CC3000_EXPORT(errno) = ret;
-
-	return(ret);
-}
-
-//*****************************************************************************
-//
-//! listen
-//!
-//!  @param[in]   sd      socket descriptor (handle)              
-//!  @param[in]  backlog  specifies the listen queue depth. On this version
-//!                       backlog is not supported.
-//!  @return  	On success, zero is returned. On error, -1 is returned.
-//!
-//!  @brief  listen for connections on a socket
-//!          The willingness to accept incoming connections and a queue
-//!          limit for incoming connections are specified with listen(),
-//!          and then the connections are accepted with accept.
-//!          The listen() call applies only to sockets of type SOCK_STREAM
-//!          The backlog parameter defines the maximum length the queue of
-//!          pending connections may grow to. 
-//!
-//! @sa     socket ; accept ; bind
-//!
-//! @note   On this version, backlog is not supported
-//
-//*****************************************************************************
-
-INT32 CC3000_EXPORT(listen)(INT32 sd, INT32 backlog)
-{
-	INT32 ret;
-	UINT8 *ptr, *args;
-
-	ret = EFAIL;
-	ptr = tSLInformation.pucTxCommandBuffer;
-	args = (ptr + HEADERS_SIZE_CMD);
-
-	// Fill in temporary command buffer
-	args = UINT32_TO_STREAM(args, sd);
-	args = UINT32_TO_STREAM(args, backlog);
-
-	// Initiate a HCI command
-	hci_command_send(HCI_CMND_LISTEN,
-		ptr, SOCKET_LISTEN_PARAMS_LEN);
-
-	// Since we are in blocking state - wait for event complete
-	SimpleLinkWaitEvent(HCI_CMND_LISTEN, &ret);
-	CC3000_EXPORT(errno) = ret;
-
-	return(ret);
-}
-
-//*****************************************************************************
-//
-//! gethostbyname
-//!
-//!  @param[in]   hostname     host name              
-//!  @param[in]   usNameLen    name length 
-//!  @param[out]  out_ip_addr  This parameter is filled in with host IP address. 
-//!                            In case that host name is not resolved, 
-//!                            out_ip_addr is zero.                  
-//!  @return  	On success, positive is returned. On error, negative is returned
-//!
-//!  @brief  Get host IP by name. Obtain the IP Address of machine on network, 
-//!          by its name.
-//!
-//!  @note  On this version, only blocking mode is supported. Also note that
-//!		     the function requires DNS server to be configured prior to its usage.
-//
-//*****************************************************************************
-
-#ifndef CC3000_TINY_DRIVER
-INT16 CC3000_EXPORT(gethostbyname)(CHAR * hostname, UINT16 usNameLen, 
-	UINT32* out_ip_addr)
-{
-	tBsdGethostbynameParams ret;
-	UINT8 *ptr, *args;
-
-	CC3000_EXPORT(errno) = EFAIL;
-
-	if (usNameLen > HOSTNAME_MAX_LENGTH)
-	{
-		return CC3000_EXPORT(errno);
-	}
-
-	ptr = tSLInformation.pucTxCommandBuffer;
-	args = (ptr + SIMPLE_LINK_HCI_CMND_TRANSPORT_HEADER_SIZE);
-
-	// Fill in HCI packet structure
-	args = UINT32_TO_STREAM(args, 8);
-	args = UINT32_TO_STREAM(args, usNameLen);
-	ARRAY_TO_STREAM(args, hostname, usNameLen);
-
-	// Initiate a HCI command
-	hci_command_send(HCI_CMND_GETHOSTNAME, ptr, SOCKET_GET_HOST_BY_NAME_PARAMS_LEN
-		+ usNameLen - 1);
-
-	// Since we are in blocking state - wait for event complete
-	SimpleLinkWaitEvent(HCI_EVNT_BSD_GETHOSTBYNAME, &ret);
-
-	CC3000_EXPORT(errno) = ret.retVal;
-
-	(*((INT32*)out_ip_addr)) = ret.outputAddress;
-
-	return CC3000_EXPORT(errno);
-
-}
-#endif
-
-//*****************************************************************************
-//
-//! connect
-//!
-//!  @param[in]   sd       socket descriptor (handle)         
-//!  @param[in]   addr     specifies the destination addr. On this version
-//!                        only AF_INET is supported.
-//!  @param[out]  addrlen  contains the size of the structure pointed to by addr    
-//!  @return  	On success, zero is returned. On error, -1 is returned
-//!
-//!  @brief  initiate a connection on a socket 
-//!          Function connects the socket referred to by the socket descriptor 
-//!          sd, to the address specified by addr. The addrlen argument 
-//!          specifies the size of addr. The format of the address in addr is 
-//!          determined by the address space of the socket. If it is of type 
-//!          SOCK_DGRAM, this call specifies the peer with which the socket is 
-//!          to be associated; this address is that to which datagrams are to be
-//!          sent, and the only address from which datagrams are to be received.  
-//!          If the socket is of type SOCK_STREAM, this call attempts to make a 
-//!          connection to another socket. The other socket is specified  by 
-//!          address, which is an address in the communications space of the
-//!          socket. Note that the function implements only blocking behavior 
-//!          thus the caller will be waiting either for the connection 
-//!          establishment or for the connection establishment failure.
-//!
-//!  @sa socket
-//
-//*****************************************************************************
-
-INT32 CC3000_EXPORT(connect)(INT32 sd, const sockaddr *addr, INT32 addrlen)
-{
-	INT32 ret;
-	UINT8 *ptr, *args;
-
-	ret = EFAIL;
-	ptr = tSLInformation.pucTxCommandBuffer;
-	args = (ptr + SIMPLE_LINK_HCI_CMND_TRANSPORT_HEADER_SIZE);
-	addrlen = 8;
-
-	// Fill in temporary command buffer
-	args = UINT32_TO_STREAM(args, sd);
-	args = UINT32_TO_STREAM(args, 0x00000008);
-	args = UINT32_TO_STREAM(args, addrlen);
-	ARRAY_TO_STREAM(args, ((UINT8 *)addr), addrlen);
-
-	// Initiate a HCI command
-	hci_command_send(HCI_CMND_CONNECT,
-		ptr, SOCKET_CONNECT_PARAMS_LEN);
-
-	// Since we are in blocking state - wait for event complete
-	SimpleLinkWaitEvent(HCI_CMND_CONNECT, &ret);
-
-	CC3000_EXPORT(errno) = ret;
-
-	return((INT32)ret);
-}
-
-
-//*****************************************************************************
-//
-//! select
-//!
-//!  @param[in]   nfds       the highest-numbered file descriptor in any of the
-//!                           three sets, plus 1.     
-//!  @param[out]   writesds   socket descriptors list for write monitoring
-//!  @param[out]   readsds    socket descriptors list for read monitoring  
-//!  @param[out]   exceptsds  socket descriptors list for exception monitoring
-//!  @param[in]   timeout     is an upper bound on the amount of time elapsed
-//!                           before select() returns. Null means infinity 
-//!                           timeout. The minimum timeout is 5 milliseconds,
-//!                          less than 5 milliseconds will be set
-//!                           automatically to 5 milliseconds.
-//!  @return  	On success, select() returns the number of file descriptors
-//!             contained in the three returned descriptor sets (that is, the
-//!             total number of bits that are set in readfds, writefds,
-//!             exceptfds) which may be zero if the timeout expires before
-//!             anything interesting  happens.
-//!             On error, -1 is returned.
-//!                   *readsds - return the sockets on which Read request will
-//!                              return without delay with valid data.
-//!                   *writesds - return the sockets on which Write request 
-//!                                 will return without delay.
-//!                   *exceptsds - return the sockets which closed recently.
-//!
-//!  @brief  Monitor socket activity  
-//!          Select allow a program to monitor multiple file descriptors,
-//!          waiting until one or more of the file descriptors become 
-//!         "ready" for some class of I/O operation 
-//!
-//!  @Note   If the timeout value set to less than 5ms it will automatically set
-//!          to 5ms to prevent overload of the system
-//!
-//!  @sa socket
-//
-//*****************************************************************************
-
-INT16 CC3000_EXPORT(select)(INT32 nfds, fd_set *readsds, fd_set *writesds, fd_set *exceptsds, 
-struct cc3000_timeval *timeout)
-{
-	UINT8 *ptr, *args;
-	tBsdSelectRecvParams tParams;
-	UINT32 is_blocking;
-
-	if( timeout == NULL)
-	{
-		is_blocking = 1; /* blocking , infinity timeout */
-	}
-	else
-	{
-		is_blocking = 0; /* no blocking, timeout */
-	}
-
-	// Fill in HCI packet structure
-	ptr = tSLInformation.pucTxCommandBuffer;
-	args = (ptr + HEADERS_SIZE_CMD);
-
-	// Fill in temporary command buffer
-	args = UINT32_TO_STREAM(args, nfds);
-	args = UINT32_TO_STREAM(args, 0x00000014);
-	args = UINT32_TO_STREAM(args, 0x00000014);
-	args = UINT32_TO_STREAM(args, 0x00000014);
-	args = UINT32_TO_STREAM(args, 0x00000014);
-	args = UINT32_TO_STREAM(args, is_blocking);
-	args = UINT32_TO_STREAM(args, ((readsds) ? *(UINT32*)readsds : 0));
-	args = UINT32_TO_STREAM(args, ((writesds) ? *(UINT32*)writesds : 0));
-	args = UINT32_TO_STREAM(args, ((exceptsds) ? *(UINT32*)exceptsds : 0));
-
-	if (timeout)
-	{
-		if ( 0 == timeout->tv_sec && timeout->tv_usec < 
-			SELECT_TIMEOUT_MIN_MICRO_SECONDS)
-		{
-			timeout->tv_usec = SELECT_TIMEOUT_MIN_MICRO_SECONDS;
-		}
-		args = UINT32_TO_STREAM(args, timeout->tv_sec);
-		args = UINT32_TO_STREAM(args, timeout->tv_usec);
-	}
-
-	// Initiate a HCI command
-	hci_command_send(HCI_CMND_BSD_SELECT, ptr, SOCKET_SELECT_PARAMS_LEN);
-
-	// Since we are in blocking state - wait for event complete
-	SimpleLinkWaitEvent(HCI_EVNT_SELECT, &tParams);
-
-	// Update actually read FD
-	if (tParams.iStatus >= 0)
-	{
-		if (readsds)
-		{
-			memcpy(readsds, &tParams.uiRdfd, sizeof(tParams.uiRdfd));
-		}
-
-		if (writesds)
-		{
-			memcpy(writesds, &tParams.uiWrfd, sizeof(tParams.uiWrfd)); 
-		}
-
-		if (exceptsds)
-		{
-			memcpy(exceptsds, &tParams.uiExfd, sizeof(tParams.uiExfd)); 
-		}
-
-		return(tParams.iStatus);
-
-	}
-	else
-	{
-		CC3000_EXPORT(errno) = tParams.iStatus;
-		return(-1);
-	}
-}
-
-//*****************************************************************************
-//
-//! setsockopt
-//!
-//!  @param[in]   sd          socket handle
-//!  @param[in]   level       defines the protocol level for this option
-//!  @param[in]   optname     defines the option name to Interrogate
-//!  @param[in]   optval      specifies a value for the option
-//!  @param[in]   optlen      specifies the length of the option value
-//!  @return  	On success, zero is returned. On error, -1 is returned
-//!
-//!  @brief  set socket options
-//!          This function manipulate the options associated with a socket.
-//!          Options may exist at multiple protocol levels; they are always
-//!          present at the uppermost socket level.
-//!          When manipulating socket options the level at which the option 
-//!          resides and the name of the option must be specified.  
-//!          To manipulate options at the socket level, level is specified as 
-//!          SOL_SOCKET. To manipulate options at any other level the protocol 
-//!          number of the appropriate protocol controlling the option is 
-//!          supplied. For example, to indicate that an option is to be 
-//!          interpreted by the TCP protocol, level should be set to the 
-//!          protocol number of TCP; 
-//!          The parameters optval and optlen are used to access optval - 
-//!          use for setsockopt(). For getsockopt() they identify a buffer
-//!          in which the value for the requested option(s) are to 
-//!          be returned. For getsockopt(), optlen is a value-result 
-//!          parameter, initially containing the size of the buffer 
-//!          pointed to by option_value, and modified on return to 
-//!          indicate the actual size of the value returned. If no option 
-//!          value is to be supplied or returned, option_value may be NULL.
-//!
-//!  @Note   On this version the following two socket options are enabled:
-//!    			 The only protocol level supported in this version
-//!          is SOL_SOCKET (level).
-//!		       1. SOCKOPT_RECV_TIMEOUT (optname)
-//!			      SOCKOPT_RECV_TIMEOUT configures recv and recvfrom timeout 
-//!           in milliseconds.
-//!		        In that case optval should be pointer to UINT32.
-//!		       2. SOCKOPT_NONBLOCK (optname). sets the socket non-blocking mode on 
-//!           or off.
-//!		        In that case optval should be SOCK_ON or SOCK_OFF (optval).
-//!
-//!  @sa getsockopt
-//
-//*****************************************************************************
-
-#ifndef CC3000_TINY_DRIVER
-INT16 CC3000_EXPORT(setsockopt)(INT32 sd, INT32 level, INT32 optname, const void *optval,
-	socklen_t optlen)
-{
-	INT32 ret;
-	UINT8 *ptr, *args;
-
-	ptr = tSLInformation.pucTxCommandBuffer;
-	args = (ptr + HEADERS_SIZE_CMD);
-
-	// Fill in temporary command buffer
-	args = UINT32_TO_STREAM(args, sd);
-	args = UINT32_TO_STREAM(args, level);
-	args = UINT32_TO_STREAM(args, optname);
-	args = UINT32_TO_STREAM(args, 0x00000008);
-	args = UINT32_TO_STREAM(args, optlen);
-	ARRAY_TO_STREAM(args, ((UINT8 *)optval), optlen);
-
-	// Initiate a HCI command
-	hci_command_send(HCI_CMND_SETSOCKOPT,
-		ptr, SOCKET_SET_SOCK_OPT_PARAMS_LEN  + optlen);
-
-	// Since we are in blocking state - wait for event complete
-	SimpleLinkWaitEvent(HCI_CMND_SETSOCKOPT, &ret);
-
-	if (ret >= 0)
-	{
-		return (0);
-	}
-	else
-	{
-		CC3000_EXPORT(errno) = ret;
-		return ret;
-	}
-}
-#endif
-
-//*****************************************************************************
-//
-//! getsockopt
-//!
-//!  @param[in]   sd          socket handle
-//!  @param[in]   level       defines the protocol level for this option
-//!  @param[in]   optname     defines the option name to Interrogate
-//!  @param[out]   optval      specifies a value for the option
-//!  @param[out]   optlen      specifies the length of the option value
-//!  @return  	On success, zero is returned. On error, -1 is returned
-//!
-//!  @brief  set socket options
-//!          This function manipulate the options associated with a socket.
-//!          Options may exist at multiple protocol levels; they are always
-//!          present at the uppermost socket level.
-//!          When manipulating socket options the level at which the option 
-//!          resides and the name of the option must be specified.  
-//!          To manipulate options at the socket level, level is specified as 
-//!          SOL_SOCKET. To manipulate options at any other level the protocol 
-//!          number of the appropriate protocol controlling the option is 
-//!          supplied. For example, to indicate that an option is to be 
-//!          interpreted by the TCP protocol, level should be set to the 
-//!          protocol number of TCP; 
-//!          The parameters optval and optlen are used to access optval - 
-//!          use for setsockopt(). For getsockopt() they identify a buffer
-//!          in which the value for the requested option(s) are to 
-//!          be returned. For getsockopt(), optlen is a value-result 
-//!          parameter, initially containing the size of the buffer 
-//!          pointed to by option_value, and modified on return to 
-//!          indicate the actual size of the value returned. If no option 
-//!          value is to be supplied or returned, option_value may be NULL.
-//!
-//!  @Note   On this version the following two socket options are enabled:
-//!    			 The only protocol level supported in this version
-//!          is SOL_SOCKET (level).
-//!		       1. SOCKOPT_RECV_TIMEOUT (optname)
-//!			      SOCKOPT_RECV_TIMEOUT configures recv and recvfrom timeout 
-//!           in milliseconds.
-//!		        In that case optval should be pointer to UINT32.
-//!		       2. SOCKOPT_NONBLOCK (optname). sets the socket non-blocking mode on 
-//!           or off.
-//!		        In that case optval should be SOCK_ON or SOCK_OFF (optval).
-//!
-//!  @sa setsockopt
-//
-//*****************************************************************************
-
-INT16 CC3000_EXPORT(getsockopt) (INT32 sd, INT32 level, INT32 optname, void *optval, socklen_t *optlen)
-{
-	UINT8 *ptr, *args;
-	tBsdGetSockOptReturnParams  tRetParams;
-
-	ptr = tSLInformation.pucTxCommandBuffer;
-	args = (ptr + HEADERS_SIZE_CMD);
-
-	// Fill in temporary command buffer
-	args = UINT32_TO_STREAM(args, sd);
-	args = UINT32_TO_STREAM(args, level);
-	args = UINT32_TO_STREAM(args, optname);
-
-	// Initiate a HCI command
-	hci_command_send(HCI_CMND_GETSOCKOPT,
-		ptr, SOCKET_GET_SOCK_OPT_PARAMS_LEN);
-
-	// Since we are in blocking state - wait for event complete
-	SimpleLinkWaitEvent(HCI_CMND_GETSOCKOPT, &tRetParams);
-
-	if (((INT8)tRetParams.iStatus) >= 0)
-	{
-		*optlen = 4;
-		memcpy(optval, tRetParams.ucOptValue, 4);
-		return (0);
-	}
-	else
-	{
-		CC3000_EXPORT(errno) = tRetParams.iStatus;
-		return CC3000_EXPORT(errno);
-	}
-}
-
-//*****************************************************************************
-//
-//!  simple_link_recv
-//!
-//!  @param sd       socket handle
-//!  @param buf      read buffer
-//!  @param len      buffer length
-//!  @param flags    indicates blocking or non-blocking operation
-//!  @param from     pointer to an address structure indicating source address
-//!  @param fromlen  source address structure size
-//!
-//!  @return         Return the number of bytes received, or -1 if an error
-//!                  occurred
-//!
-//!  @brief          Read data from socket
-//!                  Return the length of the message on successful completion.
-//!                  If a message is too long to fit in the supplied buffer,
-//!                  excess bytes may be discarded depending on the type of
-//!                  socket the message is received from
-//
-//*****************************************************************************
-static INT16 simple_link_recv(INT32 sd, void *buf, INT32 len, INT32 flags, sockaddr *from,
-	socklen_t *fromlen, INT32 opcode)
-{
-	UINT8 *ptr, *args;
-	tBsdReadReturnParams tSocketReadEvent;
-
-	ptr = tSLInformation.pucTxCommandBuffer;
-	args = (ptr + HEADERS_SIZE_CMD);
-
-	// Fill in HCI packet structure
-	args = UINT32_TO_STREAM(args, sd);
-	args = UINT32_TO_STREAM(args, len);
-	args = UINT32_TO_STREAM(args, flags);
-
-	// Generate the read command, and wait for the 
-	hci_command_send(opcode,  ptr, SOCKET_RECV_FROM_PARAMS_LEN);
-
-	// Since we are in blocking state - wait for event complete
-	SimpleLinkWaitEvent(opcode, &tSocketReadEvent);
-
-	// In case the number of bytes is more then zero - read data
-	if (tSocketReadEvent.iNumberOfBytes > 0)
-	{
-		// Wait for the data in a synchronous way. Here we assume that the bug is 
-		// big enough to store also parameters of receive from too....
-		SimpleLinkWaitData(buf, (UINT8 *)from, (UINT8 *)fromlen);
-	}
-
-	CC3000_EXPORT(errno) = tSocketReadEvent.iNumberOfBytes;
-
-	return(tSocketReadEvent.iNumberOfBytes);
-}
-
-//*****************************************************************************
-//
-//!  recv
-//!
-//!  @param[in]  sd     socket handle
-//!  @param[out] buf    Points to the buffer where the message should be stored
-//!  @param[in]  len    Specifies the length in bytes of the buffer pointed to 
-//!                     by the buffer argument.
-//!  @param[in] flags   Specifies the type of message reception. 
-//!                     On this version, this parameter is not supported.
-//!
-//!  @return         Return the number of bytes received, or -1 if an error
-//!                  occurred
-//!
-//!  @brief          function receives a message from a connection-mode socket
-//!
-//!  @sa recvfrom
-//!
-//!  @Note On this version, only blocking mode is supported.
-//
-//*****************************************************************************
-
-INT16 CC3000_EXPORT(recv)(INT32 sd, void *buf, INT32 len, INT32 flags)
-{
-	return(simple_link_recv(sd, buf, len, flags, NULL, NULL, HCI_CMND_RECV));
-}
-
-//*****************************************************************************
-//
-//!  recvfrom
-//!
-//!  @param[in]  sd     socket handle
-//!  @param[out] buf    Points to the buffer where the message should be stored
-//!  @param[in]  len    Specifies the length in bytes of the buffer pointed to 
-//!                     by the buffer argument.
-//!  @param[in] flags   Specifies the type of message reception. 
-//!                     On this version, this parameter is not supported.
-//!  @param[in] from   pointer to an address structure indicating the source
-//!                    address: sockaddr. On this version only AF_INET is
-//!                    supported.
-//!  @param[in] fromlen   source address tructure size
-//!
-//!  @return         Return the number of bytes received, or -1 if an error
-//!                  occurred
-//!
-//!  @brief         read data from socket
-//!                 function receives a message from a connection-mode or
-//!                 connectionless-mode socket. Note that raw sockets are not
-//!                 supported.
-//!
-//!  @sa recv
-//!
-//!  @Note On this version, only blocking mode is supported.
-//
-//*****************************************************************************
-INT16 CC3000_EXPORT(recvfrom)(INT32 sd, void *buf, INT32 len, INT32 flags, sockaddr *from,
-	socklen_t *fromlen)
-{
-	return(simple_link_recv(sd, buf, len, flags, from, fromlen,
-		HCI_CMND_RECVFROM));
-}
-
-//*****************************************************************************
-//
-//!  simple_link_send
-//!
-//!  @param sd       socket handle
-//!  @param buf      write buffer
-//!  @param len      buffer length
-//!  @param flags    On this version, this parameter is not supported
-//!  @param to       pointer to an address structure indicating destination
-//!                  address
-//!  @param tolen    destination address structure size
-//!
-//!  @return         Return the number of bytes transmitted, or -1 if an error
-//!                  occurred, or -2 in case there are no free buffers available
-//!                 (only when SEND_NON_BLOCKING is enabled)
-//!
-//!  @brief          This function is used to transmit a message to another
-//!                  socket
-//
-//*****************************************************************************
-static INT16 simple_link_send(INT32 sd, const void *buf, INT32 len, INT32 flags,
-	const sockaddr *to, INT32 tolen, INT32 opcode)
-{    
-	UINT8 uArgSize=0,  addrlen;
-	UINT8 *ptr, *pDataPtr=0, *args;
-	UINT32 addr_offset=0;
-	INT16 res;
-	tBsdReadReturnParams tSocketSendEvent;
-
-	// Check the bsd_arguments
-	if (0 != (res = HostFlowControlConsumeBuff(sd)))
-	{
-		return res;
-	}
-
-	//Update the number of sent packets
-	tSLInformation.NumberOfSentPackets++;
-
-	// Allocate a buffer and construct a packet and send it over spi
-	ptr = tSLInformation.pucTxCommandBuffer;
-	args = (ptr + HEADERS_SIZE_DATA);
-
-	// Update the offset of data and parameters according to the command
-	switch(opcode)
-	{ 
-	case HCI_CMND_SENDTO:
-		{
-			addr_offset = len + sizeof(len) + sizeof(len);
-			addrlen = 8;
-			uArgSize = SOCKET_SENDTO_PARAMS_LEN;
-			pDataPtr = ptr + HEADERS_SIZE_DATA + SOCKET_SENDTO_PARAMS_LEN;
-			break;
-		}
-
-	case HCI_CMND_SEND:
-		{
-			tolen = 0;
-			to = NULL;
-			uArgSize = HCI_CMND_SEND_ARG_LENGTH;
-			pDataPtr = ptr + HEADERS_SIZE_DATA + HCI_CMND_SEND_ARG_LENGTH;
-			break;
-		}
-
-	default:
-		{
-			break;
-		}
-	}
-
-	// Fill in temporary command buffer
-	args = UINT32_TO_STREAM(args, sd);
-	args = UINT32_TO_STREAM(args, uArgSize - sizeof(sd));
-	args = UINT32_TO_STREAM(args, len);
-	args = UINT32_TO_STREAM(args, flags);
-
-	if (opcode == HCI_CMND_SENDTO)
-	{
-		args = UINT32_TO_STREAM(args, addr_offset);
-		args = UINT32_TO_STREAM(args, addrlen);
-	}
-
-	// Copy the data received from user into the TX Buffer
-	ARRAY_TO_STREAM(pDataPtr, ((UINT8 *)buf), len);
-
-	// In case we are using SendTo, copy the to parameters
-	if (opcode == HCI_CMND_SENDTO)
-	{	
-		ARRAY_TO_STREAM(pDataPtr, ((UINT8 *)to), tolen);
-	}
-
-	// Initiate a HCI command
-	hci_data_send(opcode, ptr, uArgSize, len,(UINT8*)to, tolen);
-
-	if (opcode == HCI_CMND_SENDTO)
-		SimpleLinkWaitEvent(HCI_EVNT_SENDTO, &tSocketSendEvent);
-	else
-		SimpleLinkWaitEvent(HCI_EVNT_SEND, &tSocketSendEvent);
-
-	return	(len);
-}
-
-
-//*****************************************************************************
-//
-//!  send
-//!
-//!  @param sd       socket handle
-//!  @param buf      Points to a buffer containing the message to be sent
-//!  @param len      message size in bytes
-//!  @param flags    On this version, this parameter is not supported
-//!
-//!  @return         Return the number of bytes transmitted, or -1 if an
-//!                  error occurred
-//!
-//!  @brief          Write data to TCP socket
-//!                  This function is used to transmit a message to another 
-//!                  socket.
-//!
-//!  @Note           On this version, only blocking mode is supported.
-//!
-//!  @sa             sendto
-//
-//*****************************************************************************
-
-INT16 CC3000_EXPORT(send)(INT32 sd, const void *buf, INT32 len, INT32 flags)
-{
-	return(simple_link_send(sd, buf, len, flags, NULL, 0, HCI_CMND_SEND));
-}
-
-//*****************************************************************************
-//
-//!  sendto
-//!
-//!  @param sd       socket handle
-//!  @param buf      Points to a buffer containing the message to be sent
-//!  @param len      message size in bytes
-//!  @param flags    On this version, this parameter is not supported
-//!  @param to       pointer to an address structure indicating the destination
-//!                  address: sockaddr. On this version only AF_INET is
-//!                  supported.
-//!  @param tolen    destination address structure size
-//!
-//!  @return         Return the number of bytes transmitted, or -1 if an
-//!                  error occurred
-//!
-//!  @brief          Write data to TCP socket
-//!                  This function is used to transmit a message to another 
-//!                  socket.
-//!
-//!  @Note           On this version, only blocking mode is supported.
-//!
-//!  @sa             send
-//
-//*****************************************************************************
-
-INT16 CC3000_EXPORT(sendto)(INT32 sd, const void *buf, INT32 len, INT32 flags, const sockaddr *to,
-	socklen_t tolen)
-{
-	return(simple_link_send(sd, buf, len, flags, to, tolen, HCI_CMND_SENDTO));
-}
-
-//*****************************************************************************
-//
-//!  mdnsAdvertiser
-//!
-//!  @param[in] mdnsEnabled         flag to enable/disable the mDNS feature
-//!  @param[in] deviceServiceName   Service name as part of the published
-//!                                 canonical domain name
-//!  @param[in] deviceServiceNameLength   Length of the service name - up to 32 chars
-//!  
-//!
-//!  @return   On success, zero is returned, return SOC_ERROR if socket was not 
-//!            opened successfully, or if an error occurred.
-//!
-//!  @brief    Set CC3000 in mDNS advertiser mode in order to advertise itself.
-//
-//*****************************************************************************
-
-INT16 CC3000_EXPORT(mdnsAdvertiser)(UINT16 mdnsEnabled, CHAR * deviceServiceName, UINT16 deviceServiceNameLength)
-{
-	INT8 ret;
-	UINT8 *pTxBuffer, *pArgs;
-
-	if (deviceServiceNameLength > MDNS_DEVICE_SERVICE_MAX_LENGTH)
-	{
-		return EFAIL;
-	}
-
-	pTxBuffer = tSLInformation.pucTxCommandBuffer;
-	pArgs = (pTxBuffer + SIMPLE_LINK_HCI_CMND_TRANSPORT_HEADER_SIZE);
-
-	// Fill in HCI packet structure
-	pArgs = UINT32_TO_STREAM(pArgs, mdnsEnabled);
-	pArgs = UINT32_TO_STREAM(pArgs, 8);
-	pArgs = UINT32_TO_STREAM(pArgs, deviceServiceNameLength);
-	ARRAY_TO_STREAM(pArgs, deviceServiceName, deviceServiceNameLength);
-
-	// Initiate a HCI command
-	hci_command_send(HCI_CMND_MDNS_ADVERTISE, pTxBuffer, SOCKET_MDNS_ADVERTISE_PARAMS_LEN + deviceServiceNameLength);
-
-	// Since we are in blocking state - wait for event complete
-	SimpleLinkWaitEvent(HCI_EVNT_MDNS_ADVERTISE, &ret);
-
-	return ret;
-
-}
-
-
-//*****************************************************************************
-//
-//!  getmssvalue
-//!
-//!  @param[in] sd         socket descriptor
-//!
-//!  @return   On success, returns the MSS value of a TCP connection
-//!
-//!  @brief    Returns the MSS value of a TCP connection according to the socket descriptor
-//
-//*****************************************************************************
-UINT16 CC3000_EXPORT(getmssvalue) (INT32 sd)
-{
-	UINT8 *ptr, *args;
-	UINT16 ret;
-
-	ptr = tSLInformation.pucTxCommandBuffer;
-	args = (ptr + HEADERS_SIZE_CMD);
-
-	// Fill in temporary command buffer
-	args = UINT32_TO_STREAM(args, sd);
-
-	// Initiate a HCI command
-	hci_command_send(HCI_CMND_GETMSSVALUE, ptr, SOCKET_GET_MSS_VALUE_PARAMS_LEN);
-
-	// Since we are in blocking state - wait for event complete
-	SimpleLinkWaitEvent(HCI_EVNT_GETMSSVALUE, &ret);
-
-	return ret;
-}
diff --git a/drivers/cc3000/src/wlan.c b/drivers/cc3000/src/wlan.c
deleted file mode 100644
index 6385937778ccc..0000000000000
--- a/drivers/cc3000/src/wlan.c
+++ /dev/null
@@ -1,1252 +0,0 @@
-/*****************************************************************************
-*
-*  wlan.c  - CC3000 Host Driver Implementation.
-*  Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/
-*
-*  Redistribution and use in source and binary forms, with or without
-*  modification, are permitted provided that the following conditions
-*  are met:
-*
-*    Redistributions of source code must retain the above copyright
-*    notice, this list of conditions and the following disclaimer.
-*
-*    Redistributions in binary form must reproduce the above copyright
-*    notice, this list of conditions and the following disclaimer in the
-*    documentation and/or other materials provided with the   
-*    distribution.
-*
-*    Neither the name of Texas Instruments Incorporated nor the names of
-*    its contributors may be used to endorse or promote products derived
-*    from this software without specific prior written permission.
-*
-*  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
-*  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
-*  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-*  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
-*  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
-*  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
-*  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-*  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-*  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-*  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
-*  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*
-*****************************************************************************/
-
-//*****************************************************************************
-//
-//! \addtogroup wlan_api
-//! @{
-//
-//*****************************************************************************
-
-#include <string.h>
-#include "wlan.h"
-#include "hci.h"
-#include "ccspi.h"
-#include "socket.h"
-#include "nvmem.h"
-#include "security.h"
-#include "evnt_handler.h"
-
-
-volatile sSimplLinkInformation tSLInformation;
-
-#define SMART_CONFIG_PROFILE_SIZE		67		// 67 = 32 (max ssid) + 32 (max key) + 1 (SSID length) + 1 (security type) + 1 (key length)
-
-#ifndef CC3000_UNENCRYPTED_SMART_CONFIG
-UINT8 key[AES128_KEY_SIZE];	
-UINT8 profileArray[SMART_CONFIG_PROFILE_SIZE];
-#endif //CC3000_UNENCRYPTED_SMART_CONFIG
-
-/* patches type */
-#define PATCHES_HOST_TYPE_WLAN_DRIVER   0x01
-#define PATCHES_HOST_TYPE_WLAN_FW       0x02
-#define PATCHES_HOST_TYPE_BOOTLOADER    0x03
-
-#define SL_SET_SCAN_PARAMS_INTERVAL_LIST_SIZE	(16)
-#define SL_SIMPLE_CONFIG_PREFIX_LENGTH (3)
-#define ETH_ALEN								(6)
-#define MAXIMAL_SSID_LENGTH						(32)
-
-#define SL_PATCHES_REQUEST_DEFAULT		(0)
-#define SL_PATCHES_REQUEST_FORCE_HOST	(1)
-#define SL_PATCHES_REQUEST_FORCE_NONE	(2)
-
-
-#define      WLAN_SEC_UNSEC (0)
-#define      WLAN_SEC_WEP	(1)
-#define      WLAN_SEC_WPA	(2)
-#define      WLAN_SEC_WPA2	(3)
-
-
-#define WLAN_SL_INIT_START_PARAMS_LEN			(1)
-#define WLAN_PATCH_PARAMS_LENGTH				(8)
-#define WLAN_SET_CONNECTION_POLICY_PARAMS_LEN	(12)
-#define WLAN_DEL_PROFILE_PARAMS_LEN				(4)
-#define WLAN_SET_MASK_PARAMS_LEN				(4)
-#define WLAN_SET_SCAN_PARAMS_LEN				(100)
-#define WLAN_GET_SCAN_RESULTS_PARAMS_LEN		(4)
-#define WLAN_ADD_PROFILE_NOSEC_PARAM_LEN		(24)			
-#define WLAN_ADD_PROFILE_WEP_PARAM_LEN			(36)
-#define WLAN_ADD_PROFILE_WPA_PARAM_LEN			(44)
-#define WLAN_CONNECT_PARAM_LEN					(29)
-#define WLAN_SMART_CONFIG_START_PARAMS_LEN		(4)
-
-
-
-
-//*****************************************************************************
-//
-//!  SimpleLink_Init_Start
-//!
-//!  @param  usPatchesAvailableAtHost  flag to indicate if patches available
-//!                                    from host or from EEPROM. Due to the 
-//!                                    fact the patches are burn to the EEPROM
-//!                                    using the patch programmer utility, the 
-//!                                    patches will be available from the EEPROM
-//!                                    and not from the host.
-//!
-//!  @return   none
-//!
-//!  @brief    Send HCI_CMND_SIMPLE_LINK_START to CC3000
-//
-//*****************************************************************************
-static void SimpleLink_Init_Start(UINT16 usPatchesAvailableAtHost)
-{
-	UINT8 *ptr;
-	UINT8 *args;
-
-	ptr = tSLInformation.pucTxCommandBuffer;
-	args = (UINT8 *)(ptr + HEADERS_SIZE_CMD);
-
-	UINT8_TO_STREAM(args, ((usPatchesAvailableAtHost) ? SL_PATCHES_REQUEST_FORCE_NONE : SL_PATCHES_REQUEST_DEFAULT));
-
-	// IRQ Line asserted - send HCI_CMND_SIMPLE_LINK_START to CC3000
-	hci_command_send(HCI_CMND_SIMPLE_LINK_START, ptr, WLAN_SL_INIT_START_PARAMS_LEN);
-
-	SimpleLinkWaitEvent(HCI_CMND_SIMPLE_LINK_START, 0);
-}
-
-
-
-//*****************************************************************************
-//
-//!  wlan_init
-//!
-//!  @param  sWlanCB   Asynchronous events callback.  
-//!                    0 no event call back.
-//!                  -call back parameters:
-//!                   1) event_type: HCI_EVNT_WLAN_UNSOL_CONNECT connect event,
-//!                     HCI_EVNT_WLAN_UNSOL_DISCONNECT disconnect event,
-//!                     HCI_EVNT_WLAN_ASYNC_SIMPLE_CONFIG_DONE config done,
-//!                     HCI_EVNT_WLAN_UNSOL_DHCP dhcp report, 
-//!                     HCI_EVNT_WLAN_ASYNC_PING_REPORT ping report OR 
-//!                     HCI_EVNT_WLAN_KEEPALIVE keepalive.
-//!                   2) data: pointer to extra data that received by the event
-//!                     (NULL no data).
-//!                   3) length: data length.
-//!                  -Events with extra data:
-//!                     HCI_EVNT_WLAN_UNSOL_DHCP: 4 bytes IP, 4 bytes Mask, 
-//!                     4 bytes default gateway, 4 bytes DHCP server and 4 bytes
-//!                     for DNS server.
-//!                     HCI_EVNT_WLAN_ASYNC_PING_REPORT: 4 bytes Packets sent, 
-//!                     4 bytes Packets received, 4 bytes Min round time, 
-//!                     4 bytes Max round time and 4 bytes for Avg round time.
-//!
-//!  @param    sFWPatches  0 no patch or pointer to FW patches 
-//!  @param    sDriverPatches  0 no patch or pointer to driver patches
-//!  @param    sBootLoaderPatches  0 no patch or pointer to bootloader patches
-//!  @param    sReadWlanInterruptPin    init callback. the callback read wlan 
-//!            interrupt status.
-//!  @param    sWlanInterruptEnable   init callback. the callback enable wlan 
-//!            interrupt.
-//!  @param    sWlanInterruptDisable   init callback. the callback disable wlan
-//!            interrupt.
-//!  @param    sWriteWlanPin      init callback. the callback write value 
-//!            to device pin.  
-//!
-//!  @return   none
-//!
-//!  @sa       wlan_set_event_mask , wlan_start , wlan_stop 
-//!
-//!  @brief    Initialize wlan driver
-//!
-//!  @warning This function must be called before ANY other wlan driver function
-//
-//*****************************************************************************
-
-void wlan_init(		tWlanCB	 	sWlanCB,
-	tFWPatches sFWPatches,
-	tDriverPatches sDriverPatches,
-	tBootLoaderPatches sBootLoaderPatches,
-	tWlanReadInteruptPin  sReadWlanInterruptPin,
-	tWlanInterruptEnable  sWlanInterruptEnable,
-	tWlanInterruptDisable sWlanInterruptDisable,
-	tWriteWlanPin         sWriteWlanPin)
-{
-
-	tSLInformation.sFWPatches = sFWPatches;
-	tSLInformation.sDriverPatches = sDriverPatches;
-	tSLInformation.sBootLoaderPatches = sBootLoaderPatches;
-
-	// init io callback
-	tSLInformation.ReadWlanInterruptPin = sReadWlanInterruptPin;
-	tSLInformation.WlanInterruptEnable  = sWlanInterruptEnable;
-	tSLInformation.WlanInterruptDisable = sWlanInterruptDisable;
-	tSLInformation.WriteWlanPin = sWriteWlanPin;
-
-	//init asynchronous events callback
-	tSLInformation.sWlanCB= sWlanCB;
-
-	// By default TX Complete events are routed to host too
-	tSLInformation.InformHostOnTxComplete = 1;
-}
-
-//*****************************************************************************
-//
-//!  SpiReceiveHandler
-//!
-//!  @param         pvBuffer - pointer to the received data buffer
-//!                      The function triggers Received event/data processing
-//!                 
-//!  @param         Pointer to the received data
-//!  @return        none
-//!
-//!  @brief         The function triggers Received event/data processing. It is 
-//! 			          called from the SPI library to receive the data
-//
-//*****************************************************************************
-void SpiReceiveHandler(void *pvBuffer)
-{	
-	tSLInformation.usEventOrDataReceived = 1;
-	tSLInformation.pucReceivedData = (UINT8 *)pvBuffer;
-
-	hci_unsolicited_event_handler();
-}
-
-
-//*****************************************************************************
-//
-//!  wlan_start
-//!
-//!  @param   usPatchesAvailableAtHost -  flag to indicate if patches available
-//!                                    from host or from EEPROM. Due to the 
-//!                                    fact the patches are burn to the EEPROM
-//!                                    using the patch programmer utility, the 
-//!                                    patches will be available from the EEPROM
-//!                                    and not from the host.
-//!
-//!  @return        none
-//!
-//!  @brief        Start WLAN device. This function asserts the enable pin of 
-//!                the device (WLAN_EN), starting the HW initialization process.
-//!                The function blocked until device Initialization is completed.
-//!                Function also configure patches (FW, driver or bootloader) 
-//!                and calls appropriate device callbacks.
-//!
-//!  @Note          Prior calling the function wlan_init shall be called.
-//!  @Warning       This function must be called after wlan_init and before any 
-//!                 other wlan API
-//!  @sa            wlan_init , wlan_stop
-//!
-//
-//*****************************************************************************
-#define TIMEOUT (500000)
-
-int wlan_start(UINT16 usPatchesAvailableAtHost)
-{
-
-	UINT32 ulSpiIRQState;
-	UINT32 wlan_timeout;
-
-	tSLInformation.NumberOfSentPackets = 0;
-	tSLInformation.NumberOfReleasedPackets = 0;
-	tSLInformation.usRxEventOpcode = 0;
-	tSLInformation.usNumberOfFreeBuffers = 0;
-	tSLInformation.usSlBufferLength = 0;
-	tSLInformation.usBufferSize = 0;
-	tSLInformation.usRxDataPending = 0;
-	tSLInformation.slTransmitDataError = 0;
-	tSLInformation.usEventOrDataReceived = 0;
-	tSLInformation.pucReceivedData = 0;
-
-	// Allocate the memory for the RX/TX data transactions
-	tSLInformation.pucTxCommandBuffer = (UINT8 *)wlan_tx_buffer;
-
-	// init spi
-	SpiOpen(SpiReceiveHandler);
-
-	// Check the IRQ line
-	ulSpiIRQState = tSLInformation.ReadWlanInterruptPin();
-
-	// Chip enable: toggle WLAN EN line
-	tSLInformation.WriteWlanPin( WLAN_ENABLE );
-    
-    wlan_timeout = TIMEOUT;
-	if (ulSpiIRQState) {
-		// wait till the IRQ line goes low
-		while(tSLInformation.ReadWlanInterruptPin() != 0 && --wlan_timeout)
-		{
-		}
-	}
-	else
-	{
-		// wait till the IRQ line goes high and than low
-		while(tSLInformation.ReadWlanInterruptPin() == 0 && --wlan_timeout)
-		{
-		}
-
-        if (wlan_timeout == 0) {
-            return -1;
-        }
-
-        wlan_timeout = TIMEOUT;
-		while(tSLInformation.ReadWlanInterruptPin() != 0 && --wlan_timeout)
-		{
-		}
-	}
-
-    if (wlan_timeout ==0) {
-        return -1;
-    }
-
-	SimpleLink_Init_Start(usPatchesAvailableAtHost);
-
-	// Read Buffer's size and finish
-	hci_command_send(HCI_CMND_READ_BUFFER_SIZE, tSLInformation.pucTxCommandBuffer, 0);
-	SimpleLinkWaitEvent(HCI_CMND_READ_BUFFER_SIZE, 0);
-
-    return 0;
-}
-
-
-//*****************************************************************************
-//
-//!  wlan_stop
-//!
-//!  @param         none
-//!
-//!  @return        none
-//!
-//!  @brief         Stop WLAN device by putting it into reset state.
-//!
-//!  @sa            wlan_start
-//
-//*****************************************************************************
-
-void wlan_stop(void)
-{
-	// Chip disable
-	tSLInformation.WriteWlanPin( WLAN_DISABLE );
-
-	// Wait till IRQ line goes high...
-	while(tSLInformation.ReadWlanInterruptPin() == 0)
-	{
-	}
-
-	// Free the used by WLAN Driver memory
-	if (tSLInformation.pucTxCommandBuffer)
-	{
-		tSLInformation.pucTxCommandBuffer = 0;
-	}
-
-	SpiClose();
-}
-
-
-//*****************************************************************************
-//
-//!  wlan_connect
-//!
-//!  @param    sec_type   security options:
-//!               WLAN_SEC_UNSEC, 
-//!               WLAN_SEC_WEP (ASCII support only),
-//!               WLAN_SEC_WPA or WLAN_SEC_WPA2
-//!  @param    ssid       up to 32 bytes and is ASCII SSID of the AP
-//!  @param    ssid_len   length of the SSID
-//!  @param    bssid      6 bytes specified the AP bssid
-//!  @param    key        up to 32 bytes specified the AP security key
-//!  @param    key_len    key length 
-//!
-//!  @return     On success, zero is returned. On error, negative is returned. 
-//!              Note that even though a zero is returned on success to trigger
-//!              connection operation, it does not mean that CCC3000 is already
-//!              connected. An asynchronous "Connected" event is generated when 
-//!              actual association process finishes and CC3000 is connected to
-//!              the AP. If DHCP is set, An asynchronous "DHCP" event is 
-//!              generated when DHCP process is finish.
-//!              
-//!
-//!  @brief      Connect to AP
-//!  @warning    Please Note that when connection to AP configured with security
-//!              type WEP, please confirm that the key is set as ASCII and not
-//!              as HEX.
-//!  @sa         wlan_disconnect
-//
-//*****************************************************************************
-
-#ifndef CC3000_TINY_DRIVER
-INT32 wlan_connect(UINT32 ulSecType, CHAR *ssid, INT32 ssid_len,
-	UINT8 *bssid, UINT8 *key, INT32 key_len)
-{
-	INT32 ret;
-	UINT8 *ptr;
-	UINT8 *args;
-	UINT8 bssid_zero[] = {0, 0, 0, 0, 0, 0};
-
-	ret  	= EFAIL;
-	ptr  	= tSLInformation.pucTxCommandBuffer;
-	args 	= (ptr + HEADERS_SIZE_CMD);
-
-	// Fill in command buffer
-	args = UINT32_TO_STREAM(args, 0x0000001c);
-	args = UINT32_TO_STREAM(args, ssid_len);
-	args = UINT32_TO_STREAM(args, ulSecType);
-	args = UINT32_TO_STREAM(args, 0x00000010 + ssid_len);
-	args = UINT32_TO_STREAM(args, key_len);
-	args = UINT16_TO_STREAM(args, 0);
-
-	// padding shall be zeroed
-	if(bssid)
-	{
-		ARRAY_TO_STREAM(args, bssid, ETH_ALEN);
-	}
-	else
-	{
-		ARRAY_TO_STREAM(args, bssid_zero, ETH_ALEN);
-	}
-
-	ARRAY_TO_STREAM(args, ssid, ssid_len);
-
-	if(key_len && key)
-	{
-		ARRAY_TO_STREAM(args, key, key_len);
-	}
-
-	// Initiate a HCI command
-	hci_command_send(HCI_CMND_WLAN_CONNECT, ptr, WLAN_CONNECT_PARAM_LEN + 
-		ssid_len + key_len - 1);
-
-	// Wait for command complete event
-	SimpleLinkWaitEvent(HCI_CMND_WLAN_CONNECT, &ret);
-	CC3000_EXPORT(errno) = ret;
-
-	return(ret);
-}
-#else
-INT32 wlan_connect(CHAR *ssid, INT32 ssid_len)
-{
-	INT32 ret;
-	UINT8 *ptr;
-	UINT8 *args;
-	UINT8 bssid_zero[] = {0, 0, 0, 0, 0, 0};
-
-	ret  	= EFAIL;
-	ptr  	= tSLInformation.pucTxCommandBuffer;
-	args 	= (ptr + HEADERS_SIZE_CMD);
-
-	// Fill in command buffer
-	args = UINT32_TO_STREAM(args, 0x0000001c);
-	args = UINT32_TO_STREAM(args, ssid_len);
-	args = UINT32_TO_STREAM(args, 0);
-	args = UINT32_TO_STREAM(args, 0x00000010 + ssid_len);
-	args = UINT32_TO_STREAM(args, 0);
-	args = UINT16_TO_STREAM(args, 0);
-
-	// padding shall be zeroed
-	ARRAY_TO_STREAM(args, bssid_zero, ETH_ALEN);
-	ARRAY_TO_STREAM(args, ssid, ssid_len);
-
-	// Initiate a HCI command
-	hci_command_send(HCI_CMND_WLAN_CONNECT, ptr, WLAN_CONNECT_PARAM_LEN + 
-		ssid_len  - 1);
-
-	// Wait for command complete event
-	SimpleLinkWaitEvent(HCI_CMND_WLAN_CONNECT, &ret);
-	CC3000_EXPORT(errno) = ret;
-
-	return(ret);
-}
-#endif
-
-//*****************************************************************************
-//
-//!  wlan_disconnect
-//!
-//!  @return    0 disconnected done, other CC3000 already disconnected            
-//!
-//!  @brief      Disconnect connection from AP. 
-//!
-//!  @sa         wlan_connect
-//
-//*****************************************************************************
-
-INT32 wlan_disconnect()
-{
-	INT32 ret;
-	UINT8 *ptr;
-
-	ret = EFAIL;
-	ptr = tSLInformation.pucTxCommandBuffer;
-
-	hci_command_send(HCI_CMND_WLAN_DISCONNECT, ptr, 0);
-
-	// Wait for command complete event
-	SimpleLinkWaitEvent(HCI_CMND_WLAN_DISCONNECT, &ret);
-	CC3000_EXPORT(errno) = ret;
-
-	return(ret);
-}
-
-//*****************************************************************************
-//
-//!  wlan_ioctl_set_connection_policy
-//!
-//!  @param    should_connect_to_open_ap  enable(1), disable(0) connect to any 
-//!            available AP. This parameter corresponds to the configuration of 
-//!            item # 3 in the brief description.
-//!  @param    should_use_fast_connect enable(1), disable(0). if enabled, tries 
-//!            to connect to the last connected AP. This parameter corresponds 
-//!            to the configuration of item # 1 in the brief description.
-//!  @param    auto_start enable(1), disable(0) auto connect 
-//!            after reset and periodically reconnect if needed. This 
-//!       	   configuration configures option 2 in the above description.
-//!
-//!  @return     On success, zero is returned. On error, -1 is returned        
-//!
-//!  @brief      When auto is enabled, the device tries to connect according 
-//!              the following policy:
-//!              1) If fast connect is enabled and last connection is valid, 
-//!                 the device will try to connect to it without the scanning 
-//!                 procedure (fast). The last connection will be marked as
-//!                 invalid, due to adding/removing profile. 
-//!              2) If profile exists, the device will try to connect it 
-//!                 (Up to seven profiles).
-//!              3) If fast and profiles are not found, and open mode is
-//!                 enabled, the device will try to connect to any AP.
-//!              * Note that the policy settings are stored in the CC3000 NVMEM.
-//!
-//!  @sa         wlan_add_profile , wlan_ioctl_del_profile 
-//
-//*****************************************************************************
-
-INT32 wlan_ioctl_set_connection_policy(UINT32 should_connect_to_open_ap, 
-	UINT32 ulShouldUseFastConnect,
-	UINT32 ulUseProfiles)
-{
-	INT32 ret;
-	UINT8 *ptr;
-	UINT8 *args;
-
-	ret = EFAIL;
-	ptr = tSLInformation.pucTxCommandBuffer;
-	args = (UINT8 *)(ptr + HEADERS_SIZE_CMD);
-
-	// Fill in HCI packet structure
-	args = UINT32_TO_STREAM(args, should_connect_to_open_ap);
-	args = UINT32_TO_STREAM(args, ulShouldUseFastConnect);
-	args = UINT32_TO_STREAM(args, ulUseProfiles);
-
-	// Initiate a HCI command
-	hci_command_send(HCI_CMND_WLAN_IOCTL_SET_CONNECTION_POLICY,
-		ptr, WLAN_SET_CONNECTION_POLICY_PARAMS_LEN);
-
-	// Wait for command complete event
-	SimpleLinkWaitEvent(HCI_CMND_WLAN_IOCTL_SET_CONNECTION_POLICY, &ret);
-
-	return(ret);
-}
-
-//*****************************************************************************
-//
-//!  wlan_add_profile
-//!
-//!  @param    ulSecType  WLAN_SEC_UNSEC,WLAN_SEC_WEP,WLAN_SEC_WPA,WLAN_SEC_WPA2
-//!  @param    ucSsid    ssid  SSID up to 32 bytes
-//!  @param    ulSsidLen ssid length
-//!  @param    ucBssid   bssid  6 bytes
-//!  @param    ulPriority ulPriority profile priority. Lowest priority:0.
-//!			   Important Note: Smartconfig process (in unencrypted mode) 
-//!			   stores the profile internally with priority 1, so changing  
-//!			   priorities when adding new profiles should be done with extra care
-//!  @param    ulPairwiseCipher_Or_TxKeyLen  key length for WEP security
-//!  @param    ulGroupCipher_TxKeyIndex  key index
-//!  @param    ulKeyMgmt        KEY management 
-//!  @param    ucPf_OrKey       security key
-//!  @param    ulPassPhraseLen  security key length for WPA\WPA2
-//!
-//!  @return    On success, index (1-7) of the stored profile is returned.         
-//!				On error, -1 is returned.
-//!
-//!  @brief     When auto start is enabled, the device connects to
-//!             station from the profiles table. Up to 7 profiles are supported. 
-//!             If several profiles configured the device choose the highest 
-//!             priority profile, within each priority group, device will choose 
-//!             profile based on security policy, signal strength, etc 
-//!             parameters. All the profiles are stored in CC3000 NVMEM.
-//!
-//!  @sa        wlan_ioctl_del_profile 
-//
-//*****************************************************************************
-
-#ifndef CC3000_TINY_DRIVER
-INT32 wlan_add_profile(UINT32 ulSecType, 
-	UINT8* ucSsid,
-	UINT32 ulSsidLen, 
-	UINT8 *ucBssid,
-	UINT32 ulPriority,
-	UINT32 ulPairwiseCipher_Or_TxKeyLen,
-	UINT32 ulGroupCipher_TxKeyIndex,
-	UINT32 ulKeyMgmt,
-	UINT8* ucPf_OrKey,
-	UINT32 ulPassPhraseLen)
-{
-	UINT16 arg_len=0;
-	INT32 ret;
-	UINT8 *ptr;
-	INT32 i = 0;
-	UINT8 *args;
-	UINT8 bssid_zero[] = {0, 0, 0, 0, 0, 0};
-
-	ptr = tSLInformation.pucTxCommandBuffer;
-	args = (ptr + HEADERS_SIZE_CMD);
-
-	args = UINT32_TO_STREAM(args, ulSecType);
-
-	// Setup arguments in accordance with the security type
-	switch (ulSecType)
-	{
-		//OPEN
-	case WLAN_SEC_UNSEC:
-		{
-			args = UINT32_TO_STREAM(args, 0x00000014);
-			args = UINT32_TO_STREAM(args, ulSsidLen);
-			args = UINT16_TO_STREAM(args, 0);
-			if(ucBssid)
-			{
-				ARRAY_TO_STREAM(args, ucBssid, ETH_ALEN);
-			}
-			else
-			{
-				ARRAY_TO_STREAM(args, bssid_zero, ETH_ALEN);
-			}
-			args = UINT32_TO_STREAM(args, ulPriority);
-			ARRAY_TO_STREAM(args, ucSsid, ulSsidLen);
-
-			arg_len = WLAN_ADD_PROFILE_NOSEC_PARAM_LEN + ulSsidLen;
-		}
-		break;
-
-		//WEP
-	case WLAN_SEC_WEP:
-		{
-			args = UINT32_TO_STREAM(args, 0x00000020);
-			args = UINT32_TO_STREAM(args, ulSsidLen);
-			args = UINT16_TO_STREAM(args, 0);
-			if(ucBssid)
-			{
-				ARRAY_TO_STREAM(args, ucBssid, ETH_ALEN);
-			}
-			else
-			{
-				ARRAY_TO_STREAM(args, bssid_zero, ETH_ALEN);
-			}
-			args = UINT32_TO_STREAM(args, ulPriority);
-			args = UINT32_TO_STREAM(args, 0x0000000C + ulSsidLen);
-			args = UINT32_TO_STREAM(args, ulPairwiseCipher_Or_TxKeyLen);
-			args = UINT32_TO_STREAM(args, ulGroupCipher_TxKeyIndex);
-			ARRAY_TO_STREAM(args, ucSsid, ulSsidLen);
-
-			for(i = 0; i < 4; i++)
-			{
-				UINT8 *p = &ucPf_OrKey[i * ulPairwiseCipher_Or_TxKeyLen];
-
-				ARRAY_TO_STREAM(args, p, ulPairwiseCipher_Or_TxKeyLen);
-			}		
-
-			arg_len = WLAN_ADD_PROFILE_WEP_PARAM_LEN + ulSsidLen + 
-				ulPairwiseCipher_Or_TxKeyLen * 4;
-
-		}
-		break;
-
-		//WPA
-		//WPA2
-	case WLAN_SEC_WPA:
-	case WLAN_SEC_WPA2:
-		{
-			args = UINT32_TO_STREAM(args, 0x00000028);
-			args = UINT32_TO_STREAM(args, ulSsidLen);
-			args = UINT16_TO_STREAM(args, 0);
-			if(ucBssid)
-			{
-				ARRAY_TO_STREAM(args, ucBssid, ETH_ALEN);
-			}
-			else
-			{
-				ARRAY_TO_STREAM(args, bssid_zero, ETH_ALEN);
-			}
-			args = UINT32_TO_STREAM(args, ulPriority);
-			args = UINT32_TO_STREAM(args, ulPairwiseCipher_Or_TxKeyLen);
-			args = UINT32_TO_STREAM(args, ulGroupCipher_TxKeyIndex);
-			args = UINT32_TO_STREAM(args, ulKeyMgmt);
-			args = UINT32_TO_STREAM(args, 0x00000008 + ulSsidLen);
-			args = UINT32_TO_STREAM(args, ulPassPhraseLen);
-			ARRAY_TO_STREAM(args, ucSsid, ulSsidLen);
-			ARRAY_TO_STREAM(args, ucPf_OrKey, ulPassPhraseLen);
-
-			arg_len = WLAN_ADD_PROFILE_WPA_PARAM_LEN + ulSsidLen + ulPassPhraseLen;
-		}
-
-		break;
-	}    
-
-	// Initiate a HCI command
-	hci_command_send(HCI_CMND_WLAN_IOCTL_ADD_PROFILE,
-		ptr, arg_len);
-
-	// Wait for command complete event
-	SimpleLinkWaitEvent(HCI_CMND_WLAN_IOCTL_ADD_PROFILE, &ret);
-
-	return(ret);
-}
-#else
-INT32 wlan_add_profile(UINT32 ulSecType, 
-	UINT8* ucSsid,
-	UINT32 ulSsidLen, 
-	UINT8 *ucBssid,
-	UINT32 ulPriority,
-	UINT32 ulPairwiseCipher_Or_TxKeyLen,
-	UINT32 ulGroupCipher_TxKeyIndex,
-	UINT32 ulKeyMgmt,
-	UINT8* ucPf_OrKey,
-	UINT32 ulPassPhraseLen)
-{
-	return -1;
-}
-#endif
-
-//*****************************************************************************
-//
-//!  wlan_ioctl_del_profile
-//!
-//!  @param    index   number of profile to delete
-//!
-//!  @return    On success, zero is returned. On error, -1 is returned        
-//!
-//!  @brief     Delete WLAN profile 
-//!
-//!  @Note      In order to delete all stored profile, set index to 255.
-//!
-//!  @sa        wlan_add_profile 
-//
-//*****************************************************************************
-
-INT32 wlan_ioctl_del_profile(UINT32 ulIndex)
-{
-	INT32 ret;
-	UINT8 *ptr;
-	UINT8 *args;
-
-	ptr = tSLInformation.pucTxCommandBuffer;
-	args = (UINT8 *)(ptr + HEADERS_SIZE_CMD);
-
-	// Fill in HCI packet structure
-	args = UINT32_TO_STREAM(args, ulIndex);
-	ret = EFAIL;
-
-	// Initiate a HCI command
-	hci_command_send(HCI_CMND_WLAN_IOCTL_DEL_PROFILE,
-		ptr, WLAN_DEL_PROFILE_PARAMS_LEN);
-
-	// Wait for command complete event
-	SimpleLinkWaitEvent(HCI_CMND_WLAN_IOCTL_DEL_PROFILE, &ret);
-
-	return(ret);
-}
-
-//*****************************************************************************
-//
-//!  wlan_ioctl_get_scan_results
-//!
-//!  @param[in]    scan_timeout   parameter not supported
-//!  @param[out]   ucResults  scan results (_wlan_full_scan_results_args_t)
-//!
-//!  @return    On success, zero is returned. On error, -1 is returned        
-//!
-//!  @brief    Gets entry from scan result table.
-//!            The scan results are returned one by one, and each entry 
-//!            represents a single AP found in the area. The following is a 
-//!            format of the scan result: 
-//!        	 - 4 Bytes: number of networks found
-//!          - 4 Bytes: The status of the scan: 0 - aged results,
-//!                     1 - results valid, 2 - no results
-//!          - 42 bytes: Result entry, where the bytes are arranged as  follows:
-//!              
-//!          				- 1 bit isValid - is result valid or not
-//!         				- 7 bits rssi - RSSI value;	 
-//!                 - 2 bits: securityMode - security mode of the AP:
-//!                           0 - Open, 1 - WEP, 2 WPA, 3 WPA2
-//!         				- 6 bits: SSID name length
-//!         				- 2 bytes: the time at which the entry has entered into 
-//!                            scans result table
-//!         				- 32 bytes: SSID name
-//!                 - 6 bytes:	BSSID 
-//!
-//!  @Note      scan_timeout, is not supported on this version.
-//!
-//!  @sa        wlan_ioctl_set_scan_params 
-//
-//*****************************************************************************
-
-#ifndef CC3000_TINY_DRIVER
-INT32 wlan_ioctl_get_scan_results(UINT32 ulScanTimeout,
-	UINT8 *ucResults)
-{
-	UINT8 *ptr;
-	UINT8 *args;
-
-	ptr = tSLInformation.pucTxCommandBuffer;
-	args = (ptr + HEADERS_SIZE_CMD);
-
-	// Fill in temporary command buffer
-	args = UINT32_TO_STREAM(args, ulScanTimeout);
-
-	// Initiate a HCI command
-	hci_command_send(HCI_CMND_WLAN_IOCTL_GET_SCAN_RESULTS,
-		ptr, WLAN_GET_SCAN_RESULTS_PARAMS_LEN);
-
-	// Wait for command complete event
-	SimpleLinkWaitEvent(HCI_CMND_WLAN_IOCTL_GET_SCAN_RESULTS, ucResults);
-
-	return(0);
-}
-#endif
-
-//*****************************************************************************
-//
-//!  wlan_ioctl_set_scan_params
-//!
-//!  @param    uiEnable - start/stop application scan: 
-//!            1 = start scan with default interval value of 10 min. 
-//!            in order to set a different scan interval value apply the value 
-//!            in milliseconds. minimum 1 second. 0=stop). Wlan reset
-//!           (wlan_stop() wlan_start()) is needed when changing scan interval
-//!            value. Saved: No
-//!  @param   uiMinDwellTime   minimum dwell time value to be used for each 
-//!           channel, in milliseconds. Saved: yes
-//!           Recommended Value: 100 (Default: 20)
-//!  @param   uiMaxDwellTime    maximum dwell time value to be used for each
-//!           channel, in milliseconds. Saved: yes
-//!           Recommended Value: 100 (Default: 30)
-//!  @param   uiNumOfProbeRequests  max probe request between dwell time. 
-//!           Saved: yes. Recommended Value: 5 (Default:2)
-//!  @param   uiChannelMask  bitwise, up to 13 channels (0x1fff). 
-//!           Saved: yes. Default: 0x7ff
-//!  @param   uiRSSIThreshold   RSSI threshold. Saved: yes (Default: -80)
-//!  @param   uiSNRThreshold    NSR threshold. Saved: yes (Default: 0)
-//!  @param   uiDefaultTxPower  probe Tx power. Saved: yes (Default: 205)
-//!  @param   aiIntervalList    pointer to array with 16 entries (16 channels) 
-//!           each entry (UINT32) holds timeout between periodic scan 
-//!           (connection scan) - in millisecond. Saved: yes. Default 2000ms.
-//!
-//!  @return    On success, zero is returned. On error, -1 is returned        
-//!
-//!  @brief    start and stop scan procedure. Set scan parameters. 
-//!
-//!  @Note     uiDefaultTxPower, is not supported on this version.
-//!
-//!  @sa        wlan_ioctl_get_scan_results 
-//
-//*****************************************************************************
-
-#ifndef CC3000_TINY_DRIVER
-INT32 wlan_ioctl_set_scan_params(UINT32 uiEnable, UINT32 uiMinDwellTime,
-	UINT32 uiMaxDwellTime,
-	UINT32 uiNumOfProbeRequests,
-	UINT32 uiChannelMask,INT32 iRSSIThreshold,
-	UINT32 uiSNRThreshold,
-	UINT32 uiDefaultTxPower,
-	UINT32 *aiIntervalList)
-{
-	UINT32  uiRes;
-	UINT8 *ptr;
-	UINT8 *args;
-
-	ptr = tSLInformation.pucTxCommandBuffer;
-	args = (ptr + HEADERS_SIZE_CMD);
-
-	// Fill in temporary command buffer
-	args = UINT32_TO_STREAM(args, 36);
-	args = UINT32_TO_STREAM(args, uiEnable);
-	args = UINT32_TO_STREAM(args, uiMinDwellTime);
-	args = UINT32_TO_STREAM(args, uiMaxDwellTime);
-	args = UINT32_TO_STREAM(args, uiNumOfProbeRequests);
-	args = UINT32_TO_STREAM(args, uiChannelMask);
-	args = UINT32_TO_STREAM(args, iRSSIThreshold);
-	args = UINT32_TO_STREAM(args, uiSNRThreshold);
-	args = UINT32_TO_STREAM(args, uiDefaultTxPower);
-	ARRAY_TO_STREAM(args, aiIntervalList, sizeof(UINT32) * 
-		SL_SET_SCAN_PARAMS_INTERVAL_LIST_SIZE);
-
-	// Initiate a HCI command
-	hci_command_send(HCI_CMND_WLAN_IOCTL_SET_SCANPARAM,
-		ptr, WLAN_SET_SCAN_PARAMS_LEN);
-
-	// Wait for command complete event
-	SimpleLinkWaitEvent(HCI_CMND_WLAN_IOCTL_SET_SCANPARAM, &uiRes);
-
-	return(uiRes);
-}
-#endif
-
-//*****************************************************************************
-//
-//!  wlan_set_event_mask
-//!
-//!  @param    mask   mask option:
-//!       HCI_EVNT_WLAN_UNSOL_CONNECT connect event
-//!       HCI_EVNT_WLAN_UNSOL_DISCONNECT disconnect event
-//!       HCI_EVNT_WLAN_ASYNC_SIMPLE_CONFIG_DONE  smart config done
-//!       HCI_EVNT_WLAN_UNSOL_INIT init done
-//!       HCI_EVNT_WLAN_UNSOL_DHCP dhcp event report
-//!       HCI_EVNT_WLAN_ASYNC_PING_REPORT ping report
-//!       HCI_EVNT_WLAN_KEEPALIVE keepalive
-//!       HCI_EVNT_WLAN_TX_COMPLETE - disable information on end of transmission
-//!   	  Saved: no.
-//!
-//!  @return    On success, zero is returned. On error, -1 is returned        
-//!
-//!  @brief    Mask event according to bit mask. In case that event is 
-//!            masked (1), the device will not send the masked event to host. 
-//
-//*****************************************************************************
-
-INT32 wlan_set_event_mask(UINT32 ulMask)
-{
-	INT32 ret;
-	UINT8 *ptr;
-	UINT8 *args;
-
-
-	if ((ulMask & HCI_EVNT_WLAN_TX_COMPLETE) == HCI_EVNT_WLAN_TX_COMPLETE)
-	{
-		tSLInformation.InformHostOnTxComplete = 0;
-
-		// Since an event is a virtual event - i.e. it is not coming from CC3000
-		// there is no need to send anything to the device if it was an only event
-		if (ulMask == HCI_EVNT_WLAN_TX_COMPLETE)
-		{
-			return 0;
-		}
-
-		ulMask &= ~HCI_EVNT_WLAN_TX_COMPLETE;
-		ulMask |= HCI_EVNT_WLAN_UNSOL_BASE;
-	}
-	else
-	{
-		tSLInformation.InformHostOnTxComplete = 1;
-	}
-
-	ret = EFAIL;
-	ptr = tSLInformation.pucTxCommandBuffer;
-	args = (UINT8 *)(ptr + HEADERS_SIZE_CMD);
-
-	// Fill in HCI packet structure
-	args = UINT32_TO_STREAM(args, ulMask);
-
-	// Initiate a HCI command
-	hci_command_send(HCI_CMND_EVENT_MASK,
-		ptr, WLAN_SET_MASK_PARAMS_LEN);
-
-	// Wait for command complete event
-	SimpleLinkWaitEvent(HCI_CMND_EVENT_MASK, &ret);
-
-	return(ret);
-}
-
-//*****************************************************************************
-//
-//!  wlan_ioctl_statusget
-//!
-//!  @param none 
-//!
-//!  @return    WLAN_STATUS_DISCONNECTED, WLAN_STATUS_SCANING, 
-//!             STATUS_CONNECTING or WLAN_STATUS_CONNECTED      
-//!
-//!  @brief    get wlan status: disconnected, scanning, connecting or connected
-//
-//*****************************************************************************
-
-#ifndef CC3000_TINY_DRIVER
-INT32 wlan_ioctl_statusget(void)
-{
-	INT32 ret;
-	UINT8 *ptr;
-
-	ret = EFAIL;
-	ptr = tSLInformation.pucTxCommandBuffer;
-
-	hci_command_send(HCI_CMND_WLAN_IOCTL_STATUSGET,
-		ptr, 0);
-
-	// Wait for command complete event
-	SimpleLinkWaitEvent(HCI_CMND_WLAN_IOCTL_STATUSGET, &ret);
-
-	return(ret);    
-}
-#endif
-
-//*****************************************************************************
-//
-//!  wlan_smart_config_start
-//!
-//!  @param    algoEncryptedFlag indicates whether the information is encrypted
-//!
-//!  @return   On success, zero is returned. On error, -1 is returned        
-//!
-//!  @brief   Start to acquire device profile. The device acquire its own 
-//!           profile, if profile message is found. The acquired AP information
-//!           is stored in CC3000 EEPROM only in case AES128 encryption is used.
-//!           In case AES128 encryption is not used, a profile is created by 
-//!           CC3000 internally.
-//!
-//!  @Note    An asynchronous event - Smart Config Done will be generated as soon
-//!           as the process finishes successfully.
-//!
-//!  @sa      wlan_smart_config_set_prefix , wlan_smart_config_stop
-//
-//*****************************************************************************
-
-INT32 wlan_smart_config_start(UINT32 algoEncryptedFlag)
-{
-	INT32 ret;
-	UINT8 *ptr;
-	UINT8 *args;
-
-	ret = EFAIL;
-	ptr = tSLInformation.pucTxCommandBuffer;
-	args = (UINT8 *)(ptr + HEADERS_SIZE_CMD);
-
-	// Fill in HCI packet structure
-	args = UINT32_TO_STREAM(args, algoEncryptedFlag);
-	ret = EFAIL;
-
-	hci_command_send(HCI_CMND_WLAN_IOCTL_SIMPLE_CONFIG_START, ptr, 
-		WLAN_SMART_CONFIG_START_PARAMS_LEN);
-
-	// Wait for command complete event
-	SimpleLinkWaitEvent(HCI_CMND_WLAN_IOCTL_SIMPLE_CONFIG_START, &ret);
-
-	return(ret);    
-}
-
-//*****************************************************************************
-//
-//!  wlan_smart_config_stop
-//!
-//!  @param    algoEncryptedFlag indicates whether the information is encrypted
-//!
-//!  @return   On success, zero is returned. On error, -1 is returned        
-//!
-//!  @brief   Stop the acquire profile procedure 
-//!
-//!  @sa      wlan_smart_config_start , wlan_smart_config_set_prefix
-//
-//*****************************************************************************
-
-INT32 wlan_smart_config_stop(void)
-{
-	INT32 ret;
-	UINT8 *ptr;
-
-	ret = EFAIL;
-	ptr = tSLInformation.pucTxCommandBuffer;
-
-	hci_command_send(HCI_CMND_WLAN_IOCTL_SIMPLE_CONFIG_STOP, ptr, 0);
-
-	// Wait for command complete event
-	SimpleLinkWaitEvent(HCI_CMND_WLAN_IOCTL_SIMPLE_CONFIG_STOP, &ret);
-
-	return(ret);    
-}
-
-//*****************************************************************************
-//
-//!  wlan_smart_config_set_prefix
-//!
-//!  @param   newPrefix  3 bytes identify the SSID prefix for the Smart Config. 
-//!
-//!  @return   On success, zero is returned. On error, -1 is returned        
-//!
-//!  @brief   Configure station ssid prefix. The prefix is used internally 
-//!           in CC3000. It should always be TTT.
-//!
-//!  @Note    The prefix is stored in CC3000 NVMEM
-//!
-//!  @sa      wlan_smart_config_start , wlan_smart_config_stop
-//
-//*****************************************************************************
-
-INT32 wlan_smart_config_set_prefix(CHAR* cNewPrefix)
-{
-	INT32 ret;
-	UINT8 *ptr;
-	UINT8 *args;
-
-	ret = EFAIL;
-	ptr = tSLInformation.pucTxCommandBuffer;
-	args = (ptr + HEADERS_SIZE_CMD);
-
-	if (cNewPrefix == NULL)
-		return ret;
-	else	// with the new Smart Config, prefix must be TTT
-	{
-		*cNewPrefix = 'T';
-		*(cNewPrefix + 1) = 'T';
-		*(cNewPrefix + 2) = 'T';
-	}
-
-	ARRAY_TO_STREAM(args, cNewPrefix, SL_SIMPLE_CONFIG_PREFIX_LENGTH);
-
-	hci_command_send(HCI_CMND_WLAN_IOCTL_SIMPLE_CONFIG_SET_PREFIX, ptr, 
-		SL_SIMPLE_CONFIG_PREFIX_LENGTH);
-
-	// Wait for command complete event
-	SimpleLinkWaitEvent(HCI_CMND_WLAN_IOCTL_SIMPLE_CONFIG_SET_PREFIX, &ret);
-
-	return(ret);    
-}
-
-//*****************************************************************************
-//
-//!  wlan_smart_config_process
-//!
-//!  @param   none 
-//!
-//!  @return   On success, zero is returned. On error, -1 is returned        
-//!
-//!  @brief   process the acquired data and store it as a profile. The acquired 
-//!           AP information is stored in CC3000 EEPROM encrypted.
-//!           The encrypted data is decrypted and stored as a profile.
-//!           behavior is as defined by connection policy.
-//
-//*****************************************************************************
-
-
-#ifndef CC3000_UNENCRYPTED_SMART_CONFIG
-INT32 wlan_smart_config_process()
-{
-	INT32	returnValue;
-	UINT32 ssidLen, keyLen;
-	UINT8 *decKeyPtr;
-	UINT8 *ssidPtr;
-
-	// read the key from EEPROM - fileID 12
-	returnValue = aes_read_key(key);
-
-	if (returnValue != 0)
-		return returnValue;
-
-	// read the received data from fileID #13 and parse it according to the followings:
-	// 1) SSID LEN - not encrypted
-	// 2) SSID - not encrypted
-	// 3) KEY LEN - not encrypted. always 32 bytes long
-	// 4) Security type - not encrypted
-	// 5) KEY - encrypted together with true key length as the first byte in KEY
-	//	 to elaborate, there are two corner cases:
-	//		1) the KEY is 32 bytes long. In this case, the first byte does not represent KEY length
-	//		2) the KEY is 31 bytes long. In this case, the first byte represent KEY length and equals 31
-	returnValue = nvmem_read(NVMEM_SHARED_MEM_FILEID, SMART_CONFIG_PROFILE_SIZE, 0, profileArray);
-
-	if (returnValue != 0)
-		return returnValue;
-
-	ssidPtr = &profileArray[1];
-
-	ssidLen = profileArray[0];
-
-	decKeyPtr = &profileArray[profileArray[0] + 3];
-
-	aes_decrypt(decKeyPtr, key);
-	if (profileArray[profileArray[0] + 1] > 16)
-		aes_decrypt((UINT8 *)(decKeyPtr + 16), key);
-
-	if (*(UINT8 *)(decKeyPtr +31) != 0)
-	{
-		if (*decKeyPtr == 31)
-		{
-			keyLen = 31;
-			decKeyPtr++;
-		}
-		else
-		{
-			keyLen = 32;
-		}
-	}
-	else
-	{
-		keyLen = *decKeyPtr;
-		decKeyPtr++;
-	}
-
-	// add a profile
-	switch (profileArray[profileArray[0] + 2])
-	{
-	case WLAN_SEC_UNSEC://None
-		{
-			returnValue = wlan_add_profile(profileArray[profileArray[0] + 2], 	// security type
-				ssidPtr,		 					// SSID
-				ssidLen, 							// SSID length
-				NULL, 							// BSSID
-				1,								// Priority
-				0, 0, 0, 0, 0);
-
-			break;
-		}
-
-	case WLAN_SEC_WEP://WEP
-		{
-			returnValue = wlan_add_profile(profileArray[profileArray[0] + 2], 	// security type
-				ssidPtr, 							// SSID
-				ssidLen, 							// SSID length
-				NULL, 							// BSSID
-				1,								// Priority
-				keyLen,							// KEY length
-				0, 								// KEY index
-				0,
-				decKeyPtr,						// KEY
-				0);
-
-			break;
-		}
-
-	case WLAN_SEC_WPA://WPA
-	case WLAN_SEC_WPA2://WPA2
-		{
-			returnValue = wlan_add_profile(WLAN_SEC_WPA2, 	// security type
-				ssidPtr,
-				ssidLen,
-				NULL, 							// BSSID
-				1,								// Priority
-				0x18,							// PairwiseCipher
-				0x1e, 							// GroupCipher
-				2,								// KEY management
-				decKeyPtr,						// KEY
-				keyLen);							// KEY length
-
-			break;
-		}
-	}
-
-	return returnValue;
-}
-#endif //CC3000_UNENCRYPTED_SMART_CONFIG		
-
-//*****************************************************************************
-//
-// Close the Doxygen group.
-//! @}
-//
-//*****************************************************************************

From 858707181d907b96fe55e786defa8947e404ab91 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 23 Aug 2022 17:05:30 +1000
Subject: [PATCH 2523/3533] tools/mpremote: Print a nicer error when a
 filesystem command fails.

Signed-off-by: Damien George <damien@micropython.org>
---
 tools/mpremote/mpremote/main.py | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/tools/mpremote/mpremote/main.py b/tools/mpremote/mpremote/main.py
index e614156dbf78c..fa4785b3bf8ff 100644
--- a/tools/mpremote/mpremote/main.py
+++ b/tools/mpremote/mpremote/main.py
@@ -354,9 +354,13 @@ def _list_recursive(files, path):
                 verbose=verbose,
             )
     else:
-        pyboard.filesystem_command(
-            pyb, fs_args, progress_callback=show_progress_bar, verbose=verbose
-        )
+        try:
+            pyboard.filesystem_command(
+                pyb, fs_args, progress_callback=show_progress_bar, verbose=verbose
+            )
+        except OSError as er:
+            print(f"{_PROG}: {er}")
+            sys.exit(1)
 
 
 def do_edit(pyb, args):

From 24f1161fe21df146b64a657acadf67e723040636 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 23 Aug 2022 17:25:54 +1000
Subject: [PATCH 2524/3533] tools/pyboard.py: Remove implicit fs_put if source
 starts with ./.

Signed-off-by: Damien George <damien@micropython.org>
---
 tools/pyboard.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/pyboard.py b/tools/pyboard.py
index 7525049875879..8c4696c4392c3 100755
--- a/tools/pyboard.py
+++ b/tools/pyboard.py
@@ -583,7 +583,7 @@ def fname_cp_dest(src, dest):
         if cmd == "cp":
             srcs = args[:-1]
             dest = args[-1]
-            if srcs[0].startswith("./") or dest.startswith(":"):
+            if dest.startswith(":"):
                 op = pyb.fs_put
                 fmt = "cp %s :%s"
                 dest = fname_remote(dest)

From f5fedf4676274dd26d70142b08753873dc1b99bc Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 24 Aug 2022 10:26:35 +1000
Subject: [PATCH 2525/3533] tools/pyboard.py: Add fs_cp function for direct
 device-to-device copy.

Signed-off-by: Damien George <damien@micropython.org>
---
 tools/pyboard.py | 35 ++++++++++++++++++++++++++---------
 1 file changed, 26 insertions(+), 9 deletions(-)

diff --git a/tools/pyboard.py b/tools/pyboard.py
index 8c4696c4392c3..436bc5ab1be58 100755
--- a/tools/pyboard.py
+++ b/tools/pyboard.py
@@ -491,6 +491,20 @@ def fs_cat(self, src, chunk_size=256):
         )
         self.exec_(cmd, data_consumer=stdout_write_bytes)
 
+    def fs_cp(self, src, dest, chunk_size=256, progress_callback=None):
+        if progress_callback:
+            src_size = int(self.exec_("import os\nprint(os.stat('%s')[6])" % src))
+            written = 0
+        self.exec_("fr=open('%s','rb')\nr=fr.read\nfw=open('%s','wb')\nw=fw.write" % (src, dest))
+        while True:
+            data_len = int(self.exec_("d=r(%u)\nw(d)\nprint(len(d))" % chunk_size))
+            if not data_len:
+                break
+            if progress_callback:
+                written += data_len
+                progress_callback(written, src_size)
+        self.exec_("fr.close()\nfw.close()")
+
     def fs_get(self, src, dest, chunk_size=256, progress_callback=None):
         if progress_callback:
             src_size = int(self.exec_("import os\nprint(os.stat('%s')[6])" % src))
@@ -584,18 +598,21 @@ def fname_cp_dest(src, dest):
             srcs = args[:-1]
             dest = args[-1]
             if dest.startswith(":"):
-                op = pyb.fs_put
-                fmt = "cp %s :%s"
-                dest = fname_remote(dest)
+                op_remote_src = pyb.fs_cp
+                op_local_src = pyb.fs_put
             else:
-                op = pyb.fs_get
-                fmt = "cp :%s %s"
+                op_remote_src = pyb.fs_get
+                op_local_src = lambda src, dest, **_: __import__("shutil").copy(src, dest)
             for src in srcs:
-                src = fname_remote(src)
-                dest2 = fname_cp_dest(src, dest)
                 if verbose:
-                    print(fmt % (src, dest2))
-                op(src, dest2, progress_callback=progress_callback)
+                    print("cp %s %s" % (src, dest))
+                if src.startswith(":"):
+                    op = op_remote_src
+                else:
+                    op = op_local_src
+                src2 = fname_remote(src)
+                dest2 = fname_cp_dest(src2, fname_remote(dest))
+                op(src2, dest2, progress_callback=progress_callback)
         else:
             op = {
                 "cat": pyb.fs_cat,

From 2e386bcf76c38a81a9de93452f9a253c571d2b72 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 24 Aug 2022 10:33:11 +1000
Subject: [PATCH 2526/3533] tools/mpremote: Print nicer errors for unsupported
 'cp -r' arguments.

Also document support for 'cp :a :b'.

Signed-off-by: Damien George <damien@micropython.org>
---
 docs/reference/mpremote.rst     | 2 ++
 tools/mpremote/mpremote/main.py | 7 ++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/docs/reference/mpremote.rst b/docs/reference/mpremote.rst
index eb0233bddae48..a48df9953f503 100644
--- a/docs/reference/mpremote.rst
+++ b/docs/reference/mpremote.rst
@@ -262,6 +262,8 @@ Examples
 
   mpremote cp main.py :
 
+  mpremote cp :a.py :b.py
+
   mpremote cp -r dir/ :
 
   mpremote cp a.py b.py : + repl
diff --git a/tools/mpremote/mpremote/main.py b/tools/mpremote/mpremote/main.py
index fa4785b3bf8ff..bd98da88248c1 100644
--- a/tools/mpremote/mpremote/main.py
+++ b/tools/mpremote/mpremote/main.py
@@ -333,10 +333,15 @@ def _list_recursive(files, path):
     if fs_args[0] == "cp" and fs_args[1] == "-r":
         fs_args.pop(0)
         fs_args.pop(0)
-        assert fs_args[-1] == ":"
+        if fs_args[-1] != ":":
+            print(f"{_PROG}: 'cp -r' destination must be ':'")
+            sys.exit(1)
         fs_args.pop()
         src_files = []
         for path in fs_args:
+            if path.startswith(":"):
+                print(f"{_PROG}: 'cp -r' source files must be local")
+                sys.exit(1)
             _list_recursive(src_files, path)
         known_dirs = {""}
         pyb.exec_("import uos")

From 6b16ce8d38461e9a8f11642a4a9c6e4621c00872 Mon Sep 17 00:00:00 2001
From: Matt Trentini <matt.trentini@gmail.com>
Date: Fri, 19 Aug 2022 01:15:50 +1000
Subject: [PATCH 2527/3533] docs: Update CPython differences and improve the
 look of table layouts.

Updated some of the CPython feature differences:
- Updated status of some features.
- Added CSS to fix table widths to 100% and word wrap.
- Specified explicit table column ratios to improve layout appearance.
- Added missing references to anchors.
- Better consistency with use of formatting and case.
---
 docs/conf.py                   |   4 +
 docs/differences/python_35.rst | 330 +++++++++++++++++----------------
 docs/differences/python_36.rst | 103 +++++-----
 docs/differences/python_37.rst | 127 +++++++------
 docs/differences/python_38.rst |  33 ++--
 docs/differences/python_39.rst |  43 +++--
 docs/static/custom.css         |   5 +
 7 files changed, 353 insertions(+), 292 deletions(-)
 create mode 100644 docs/static/custom.css

diff --git a/docs/conf.py b/docs/conf.py
index a7a4ab08c5b03..5533bf01918a7 100755
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -166,6 +166,10 @@
 # so a file named "default.css" will overwrite the builtin "default.css".
 html_static_path = ['static']
 
+# Add a custom CSS file for HTML generation
+html_css_files = [
+    'custom.css',
+]
 # Add any extra paths that contain custom files (such as robots.txt or
 # .htaccess) here, relative to this directory. These files are copied
 # directly to the root of the documentation.
diff --git a/docs/differences/python_35.rst b/docs/differences/python_35.rst
index 94b10b5837374..0fdc6121a1dd0 100644
--- a/docs/differences/python_35.rst
+++ b/docs/differences/python_35.rst
@@ -5,55 +5,60 @@ Python 3.5
 
 Below is a list of finalised/accepted PEPs for Python 3.5 grouped into their impact to MicroPython.
 
-   +----------------------------------------------------------------------------------------------------------+---------------+
-   | **Extensions to the syntax:**                                                                            | **Status**    |
-   +--------------------------------------------------------+-------------------------------------------------+---------------+
-   | `PEP 448 <https://www.python.org/dev/peps/pep-0448/>`_ | additional unpacking generalizations            | Partial       |
-   +--------------------------------------------------------+-------------------------------------------------+---------------+
-   | `PEP 465 <https://www.python.org/dev/peps/pep-0465/>`_ | a new matrix multiplication operator            | Completed     |
-   +--------------------------------------------------------+-------------------------------------------------+---------------+
-   | `PEP 492 <https://www.python.org/dev/peps/pep-0492/>`_ | coroutines with async and await syntax          | Completed     |
-   +--------------------------------------------------------+-------------------------------------------------+---------------+
-   | **Extensions and changes to runtime:**                                                                                   |
-   +--------------------------------------------------------+-------------------------------------------------+---------------+
-   | `PEP 461 <https://www.python.org/dev/peps/pep-0461/>`_ | % formatting for binary strings                 | Completed     |
-   +--------------------------------------------------------+-------------------------------------------------+---------------+
-   | `PEP 475 <https://www.python.org/dev/peps/pep-0475/>`_ | retrying system calls that fail with EINTR      | Completed     |
-   +--------------------------------------------------------+-------------------------------------------------+---------------+
-   | `PEP 479 <https://www.python.org/dev/peps/pep-0479/>`_ | change StopIteration handling inside generators | Completed     |
-   +--------------------------------------------------------+-------------------------------------------------+---------------+
-   | **Standard library changes:**                                                                                            |
-   +--------------------------------------------------------+-------------------------------------------------+---------------+
-   | `PEP 471 <https://www.python.org/dev/peps/pep-0471/>`_ | os.scandir()                                    |               |
-   +--------------------------------------------------------+-------------------------------------------------+---------------+
-   | `PEP 485 <https://www.python.org/dev/peps/pep-0485/>`_ | math.isclose(), a function for testing          | Completed     |
-   |                                                        | approximate equality                            |               |
-   +--------------------------------------------------------+-------------------------------------------------+---------------+
-   | **Miscellaneous changes:**                                                                                               |
-   +--------------------------------------------------------+-------------------------------------------------+---------------+
-   | `PEP 441 <https://www.python.org/dev/peps/pep-0441/>`_ | improved Python zip application support         |               |
-   +--------------------------------------------------------+-------------------------------------------------+---------------+
-   | `PEP 486 <https://www.python.org/dev/peps/pep-0486/>`_ | make the Python Launcher aware of virtual       | Not relevant  |
-   |                                                        | environments                                    |               |
-   +--------------------------------------------------------+-------------------------------------------------+---------------+
-   | `PEP 484 <https://www.python.org/dev/peps/pep-0484/>`_ | type hints (advisory only)                      | In Progress   |
-   +--------------------------------------------------------+-------------------------------------------------+---------------+
-   | `PEP 488 <https://www.python.org/dev/peps/pep-0488/>`_ | elimination of PYO files                        | Not relevant  |
-   +--------------------------------------------------------+-------------------------------------------------+---------------+
-   | `PEP 489 <https://www.python.org/dev/peps/pep-0489/>`_ | redesigning extension module loading            |               |
-   +--------------------------------------------------------+-------------------------------------------------+---------------+
+.. table::
+  :widths: 30 50 20
 
+  +--------------------------------------------------------------------------------------------------------------+--------------------+
+  | **Extensions to the syntax**                                                                                 | **Status**         |
+  +--------------------------------------------------------+-----------------------------------------------------+--------------------+
+  | `PEP 448 <https://www.python.org/dev/peps/pep-0448/>`_ | Additional unpacking generalizations                | Partial            |
+  +--------------------------------------------------------+-----------------------------------------------------+--------------------+
+  | `PEP 465 <https://www.python.org/dev/peps/pep-0465/>`_ | A new matrix multiplication operator                | Complete           |
+  +--------------------------------------------------------+-----------------------------------------------------+--------------------+
+  | `PEP 492 <https://www.python.org/dev/peps/pep-0492/>`_ | Coroutines with ``async`` and ``await`` syntax      | Complete           |
+  +--------------------------------------------------------+-----------------------------------------------------+--------------------+
+  | **Extensions and changes to runtime**                                                                                             |
+  +--------------------------------------------------------+-----------------------------------------------------+--------------------+
+  | `PEP 461 <https://www.python.org/dev/peps/pep-0461/>`_ | % formatting for binary strings                     | Complete           |
+  +--------------------------------------------------------+-----------------------------------------------------+--------------------+
+  | `PEP 475 <https://www.python.org/dev/peps/pep-0475/>`_ | Retrying system calls that fail with ``EINTR``      | Complete           |
+  +--------------------------------------------------------+-----------------------------------------------------+--------------------+
+  | `PEP 479 <https://www.python.org/dev/peps/pep-0479/>`_ | Change ``StopIteration`` handling inside generators | Complete           |
+  +--------------------------------------------------------+-----------------------------------------------------+--------------------+
+  | **Standard library changes**                                                                                                      |
+  +--------------------------------------------------------+-----------------------------------------------------+--------------------+
+  | `PEP 471 <https://www.python.org/dev/peps/pep-0471/>`_ | ``os.scandir()``                                    |                    |
+  +--------------------------------------------------------+-----------------------------------------------------+--------------------+
+  | `PEP 485 <https://www.python.org/dev/peps/pep-0485/>`_ | ``math.isclose()``, a function for testing          | Complete           |
+  |                                                        | approximate equality                                |                    |
+  +--------------------------------------------------------+-----------------------------------------------------+--------------------+
+  | **Miscellaneous changes**                                                                                                         |
+  +--------------------------------------------------------+-----------------------------------------------------+--------------------+
+  | `PEP 441 <https://www.python.org/dev/peps/pep-0441/>`_ | Improved Python zip application support             |                    |
+  +--------------------------------------------------------+-----------------------------------------------------+--------------------+
+  | `PEP 486 <https://www.python.org/dev/peps/pep-0486/>`_ | Make the Python Launcher aware of virtual           | Not relevant       |
+  |                                                        | environments                                        |                    |
+  +--------------------------------------------------------+-----------------------------------------------------+--------------------+
+  | `PEP 484 <https://www.python.org/dev/peps/pep-0484/>`_ | Type hints (advisory only)                          | Complete [#fth]_   |
+  +--------------------------------------------------------+-----------------------------------------------------+--------------------+
+  | `PEP 488 <https://www.python.org/dev/peps/pep-0488/>`_ | Elimination of PYO files                            | Not relevant       |
+  +--------------------------------------------------------+-----------------------------------------------------+--------------------+
+  | `PEP 489 <https://www.python.org/dev/peps/pep-0489/>`_ | Redesigning extension module loading                |                    |
+  +--------------------------------------------------------+-----------------------------------------------------+--------------------+
 
 Other Language Changes:
 
-   +-----------------------------------------------------------------------------------------------------------+---------------+
-   | Added the *namereplace* error handlers. The *backslashreplace* error handlers now work with decoding and  |               |
-   | translating.                                                                                              |               |
-   +-----------------------------------------------------------------------------------------------------------+---------------+
-   | Property docstrings are now writable. This is especially useful for collections.namedtuple() docstrings   |               |
-   +-----------------------------------------------------------------------------------------------------------+---------------+
-   | Circular imports involving relative imports are now supported.                                            |               |
-   +-----------------------------------------------------------------------------------------------------------+---------------+
+.. table::
+  :widths: 90 10
+
+  +-----------------------------------------------------------------------------------------------------------+---------------+
+  | Added the *namereplace* error handlers. The *backslashreplace* error handlers now work with decoding and  |               |
+  | translating.                                                                                              |               |
+  +-----------------------------------------------------------------------------------------------------------+---------------+
+  | Property docstrings are now writable. This is especially useful for collections.namedtuple() docstrings   |               |
+  +-----------------------------------------------------------------------------------------------------------+---------------+
+  | Circular imports involving relative imports are now supported.                                            |               |
+  +-----------------------------------------------------------------------------------------------------------+---------------+
 
 
 New Modules:
@@ -65,117 +70,124 @@ New Modules:
 
 Changes to built-in modules:
 
-   +-----------------------------------------------------------------------------------------------------------+---------------+
-   | `collections <https://docs.python.org/3/whatsnew/3.5.html#collections>`_                                                  |
-   +-----------------------------------------------------------------------------------------------------------+---------------+
-   | The *OrderedDict* class is now implemented in C, which makes it 4 to 100 times faster.                    |               |
-   +-----------------------------------------------------------------------------------------------------------+---------------+
-   | *OrderedDict.items()* , *OrderedDict.keys()* , *OrderedDict.values()* views now support reversed()        |               |
-   | iteration.                                                                                                |               |
-   +-----------------------------------------------------------------------------------------------------------+---------------+
-   | The deque class now defines *index()*, *insert()*, and *copy()*, and supports the + and * operators.      |               |
-   +-----------------------------------------------------------------------------------------------------------+---------------+
-   | Docstrings produced by namedtuple() can now be updated.                                                   |               |
-   +-----------------------------------------------------------------------------------------------------------+---------------+
-   | The UserString class now implements the *__getnewargs__()*, *__rmod__()*, *casefold()*, *format_map()*,   |               |
-   | *isprintable()*, and *maketrans()* methods to match the corresponding methods of str.                     |               |
-   +-----------------------------------------------------------------------------------------------------------+---------------+
-   | `heapq <https://docs.python.org/3/whatsnew/3.5.html#heapq>`_                                                              |
-   +-----------------------------------------------------------------------------------------------------------+---------------+
-   | Element comparison in *merge()* can now be customized by passing a key function in a new optional key     |               |
-   | keyword argument, and a new optional *reverse* keyword argument can be used to reverse element comparison |               |
-   +-----------------------------------------------------------------------------------------------------------+---------------+
-   | `io <https://docs.python.org/3/whatsnew/3.5.html#io>`_                                                                    |
-   +-----------------------------------------------------------------------------------------------------------+---------------+
-   | A new *BufferedIOBase.readinto1()* method, that uses at most one call to the underlying raw stream's      |               |
-   | *RawIOBase.read()* or *RawIOBase.readinto()* methods                                                      |               |
-   +-----------------------------------------------------------------------------------------------------------+---------------+
-   | `json <https://docs.python.org/3/whatsnew/3.5.html#json>`_                                                |               |
-   +-----------------------------------------------------------------------------------------------------------+---------------+
-   | JSON decoder now raises JSONDecodeError instead of ValueError to provide better context information about |               |
-   | the error.                                                                                                |               |
-   +-----------------------------------------------------------------------------------------------------------+---------------+
-   | `math <https://docs.python.org/3/whatsnew/3.5.html#math>`_                                                                |
-   +-----------------------------------------------------------------------------------------------------------+---------------+
-   | Two new constants have been added to the math module: *inf* and *nan*.                                    | Completed     |
-   +-----------------------------------------------------------------------------------------------------------+---------------+
-   | A new function *isclose()* provides a way to test for approximate equality.                               |               |
-   +-----------------------------------------------------------------------------------------------------------+---------------+
-   | A new *gcd()* function has been added. The *fractions.gcd()* function is now deprecated.                  |               |
-   +-----------------------------------------------------------------------------------------------------------+---------------+
-   | `os <https://docs.python.org/3/whatsnew/3.5.html#os>`_                                                                    |
-   +-----------------------------------------------------------------------------------------------------------+---------------+
-   | The new *scandir()* function returning an iterator of DirEntry objects has been added.                    |               |
-   +-----------------------------------------------------------------------------------------------------------+---------------+
-   | The *urandom()* function now uses the *getrandom()* syscall on Linux 3.17 or newer, and *getentropy()* on |               |
-   | OpenBSD 5.6 and newer, removing the need to use /dev/urandom and avoiding failures due to potential file  |               |
-   | descriptor exhaustion.                                                                                    |               |
-   +-----------------------------------------------------------------------------------------------------------+---------------+
-   | New *get_blocking()* and *set_blocking()* functions allow getting and setting a file descriptor's blocking|               |
-   | mode (O_NONBLOCK.)                                                                                        |               |
-   +-----------------------------------------------------------------------------------------------------------+---------------+
-   | There is a new *os.path.commonpath()* function returning the longest common sub-path of each passed       |               |
-   | pathname                                                                                                  |               |
-   +-----------------------------------------------------------------------------------------------------------+---------------+
-   | `re <https://docs.python.org/3/whatsnew/3.5.html#re>`_                                                    |               |
-   +-----------------------------------------------------------------------------------------------------------+---------------+
-   | References and conditional references to groups with fixed length are now allowed in lookbehind assertions|               |
-   +-----------------------------------------------------------------------------------------------------------+---------------+
-   | The number of capturing groups in regular expressions is no longer limited to 100.                        |               |
-   +-----------------------------------------------------------------------------------------------------------+---------------+
-   | The *sub()* and *subn()* functions now replace unmatched groups with empty strings instead of raising an  |               |
-   | exception.                                                                                                |               |
-   +-----------------------------------------------------------------------------------------------------------+---------------+
-   | The *re.error* exceptions have new attributes, msg, pattern, pos, lineno, and colno, that provide better  |               |
-   | context information about the error                                                                       |               |
-   +-----------------------------------------------------------------------------------------------------------+---------------+
-   | `socket <https://docs.python.org/3/whatsnew/3.5.html#socket>`_                                                            |
-   +-----------------------------------------------------------------------------------------------------------+---------------+
-   | Functions with timeouts now use a monotonic clock, instead of a system clock.                             |               |
-   +-----------------------------------------------------------------------------------------------------------+---------------+
-   | A new *socket.sendfile()* method allows sending a file over a socket by using the high-performance        |               |
-   | *os.sendfile()* function on UNIX, resulting in uploads being from 2 to 3 times faster than when using     |               |
-   | plain *socket.send()*                                                                                     |               |
-   +-----------------------------------------------------------------------------------------------------------+---------------+
-   | The *socket.sendall()* method no longer resets the socket timeout every time bytes are received or sent.  |               |
-   | The socket timeout is now the maximum total duration to send all data.                                    |               |
-   +-----------------------------------------------------------------------------------------------------------+---------------+
-   | The backlog argument of the *socket.listen()* method is now optional. By default it is set to SOMAXCONN or| Completed     |
-   | to 128, whichever is less.                                                                                |               |
-   +-----------------------------------------------------------------------------------------------------------+---------------+
-   | `ssl <https://docs.python.org/3/whatsnew/3.5.html#ssl>`_                                                                  |
-   +-----------------------------------------------------------------------------------------------------------+---------------+
-   | Memory BIO Support                                                                                        |               |
-   +-----------------------------------------------------------------------------------------------------------+---------------+
-   | Application-Layer Protocol Negotiation Support                                                            |               |
-   +-----------------------------------------------------------------------------------------------------------+---------------+
-   | There is a new *SSLSocket.version()* method to query the actual protocol version in use.                  |               |
-   +-----------------------------------------------------------------------------------------------------------+---------------+
-   | The SSLSocket class now implements a *SSLSocket.sendfile()* method.                                       |               |
-   +-----------------------------------------------------------------------------------------------------------+---------------+
-   | The *SSLSocket.send()* method now raises either the *ssl.SSLWantReadError* or *ssl.SSLWantWriteError*     |               |
-   | exception on a non-blocking socket if the operation would block. Previously, it would return 0.           |               |
-   +-----------------------------------------------------------------------------------------------------------+---------------+
-   | The *cert_time_to_seconds()* function now interprets the input time as UTC and not as local time, per RFC |               |
-   | 5280. Additionally, the return value is always an int.                                                    |               |
-   +-----------------------------------------------------------------------------------------------------------+---------------+
-   | New *SSLObject.shared_ciphers()* and *SSLSocket.shared_ciphers()* methods return the list of ciphers sent |               |
-   | by the client during the handshake.                                                                       |               |
-   +-----------------------------------------------------------------------------------------------------------+---------------+
-   | The *SSLSocket.do_handshake()*, *SSLSocket.read()*, *SSLSocket.shutdown()*, and *SSLSocket.write()*       |               |
-   | methods of the SSLSocket class no longer reset the socket timeout every time bytes are received or sent.  |               |
-   +-----------------------------------------------------------------------------------------------------------+---------------+
-   | The *match_hostname()* function now supports matching of IP addresses.                                    |               |
-   +-----------------------------------------------------------------------------------------------------------+---------------+
-   | `sys <https://docs.python.org/3/whatsnew/3.5.html#sys>`_                                                                  |
-   +-----------------------------------------------------------------------------------------------------------+---------------+
-   | A new *set_coroutine_wrapper()* function allows setting a global hook that will be called whenever a      |               |
-   | coroutine object is created by an async def function. A corresponding *get_coroutine_wrapper()* can be    |               |
-   | used to obtain a currently set wrapper.                                                                   |               |
-   +-----------------------------------------------------------------------------------------------------------+---------------+
-   | A new *is_finalizing()* function can be used to check if the Python interpreter is shutting down.         |               |
-   +-----------------------------------------------------------------------------------------------------------+---------------+
-   | `time <https://docs.python.org/3/whatsnew/3.5.html#time>`_                                                                |
-   +-----------------------------------------------------------------------------------------------------------+---------------+
-   | The *monotonic()* function is now always available                                                        |               |
-   +-----------------------------------------------------------------------------------------------------------+---------------+
+.. table::
+  :widths: 90 10
+
+  +-----------------------------------------------------------------------------------------------------------+---------------+
+  | `collections <https://docs.python.org/3/whatsnew/3.5.html#collections>`_                                                  |
+  +-----------------------------------------------------------------------------------------------------------+---------------+
+  | The *OrderedDict* class is now implemented in C, which makes it 4 to 100 times faster.                    |               |
+  +-----------------------------------------------------------------------------------------------------------+---------------+
+  | *OrderedDict.items()* , *OrderedDict.keys()* , *OrderedDict.values()* views now support reversed()        |               |
+  | iteration.                                                                                                |               |
+  +-----------------------------------------------------------------------------------------------------------+---------------+
+  | The deque class now defines *index()*, *insert()*, and *copy()*, and supports the + and * operators.      |               |
+  +-----------------------------------------------------------------------------------------------------------+---------------+
+  | Docstrings produced by namedtuple() can now be updated.                                                   |               |
+  +-----------------------------------------------------------------------------------------------------------+---------------+
+  | The UserString class now implements the *__getnewargs__()*, *__rmod__()*, *casefold()*, *format_map()*,   |               |
+  | *isprintable()*, and *maketrans()* methods to match the corresponding methods of str.                     |               |
+  +-----------------------------------------------------------------------------------------------------------+---------------+
+  | `heapq <https://docs.python.org/3/whatsnew/3.5.html#heapq>`_                                                              |
+  +-----------------------------------------------------------------------------------------------------------+---------------+
+  | Element comparison in *merge()* can now be customized by passing a key function in a new optional key     |               |
+  | keyword argument, and a new optional *reverse* keyword argument can be used to reverse element comparison |               |
+  +-----------------------------------------------------------------------------------------------------------+---------------+
+  | `io <https://docs.python.org/3/whatsnew/3.5.html#io>`_                                                                    |
+  +-----------------------------------------------------------------------------------------------------------+---------------+
+  | A new *BufferedIOBase.readinto1()* method, that uses at most one call to the underlying raw stream's      |               |
+  | *RawIOBase.read()* or *RawIOBase.readinto()* methods                                                      |               |
+  +-----------------------------------------------------------------------------------------------------------+---------------+
+  | `json <https://docs.python.org/3/whatsnew/3.5.html#json>`_                                                |               |
+  +-----------------------------------------------------------------------------------------------------------+---------------+
+  | JSON decoder now raises JSONDecodeError instead of ValueError to provide better context information about |               |
+  | the error.                                                                                                |               |
+  +-----------------------------------------------------------------------------------------------------------+---------------+
+  | `math <https://docs.python.org/3/whatsnew/3.5.html#math>`_                                                                |
+  +-----------------------------------------------------------------------------------------------------------+---------------+
+  | Two new constants have been added to the math module: *inf* and *nan*.                                    | Complete      |
+  +-----------------------------------------------------------------------------------------------------------+---------------+
+  | A new function *isclose()* provides a way to test for approximate equality.                               |               |
+  +-----------------------------------------------------------------------------------------------------------+---------------+
+  | A new *gcd()* function has been added. The *fractions.gcd()* function is now deprecated.                  |               |
+  +-----------------------------------------------------------------------------------------------------------+---------------+
+  | `os <https://docs.python.org/3/whatsnew/3.5.html#os>`_                                                                    |
+  +-----------------------------------------------------------------------------------------------------------+---------------+
+  | The new *scandir()* function returning an iterator of DirEntry objects has been added.                    |               |
+  +-----------------------------------------------------------------------------------------------------------+---------------+
+  | The *urandom()* function now uses the *getrandom()* syscall on Linux 3.17 or newer, and *getentropy()* on |               |
+  | OpenBSD 5.6 and newer, removing the need to use /dev/urandom and avoiding failures due to potential file  |               |
+  | descriptor exhaustion.                                                                                    |               |
+  +-----------------------------------------------------------------------------------------------------------+---------------+
+  | New *get_blocking()* and *set_blocking()* functions allow getting and setting a file descriptor's blocking|               |
+  | mode (O_NONBLOCK.)                                                                                        |               |
+  +-----------------------------------------------------------------------------------------------------------+---------------+
+  | There is a new *os.path.commonpath()* function returning the longest common sub-path of each passed       |               |
+  | pathname                                                                                                  |               |
+  +-----------------------------------------------------------------------------------------------------------+---------------+
+  | `re <https://docs.python.org/3/whatsnew/3.5.html#re>`_                                                    |               |
+  +-----------------------------------------------------------------------------------------------------------+---------------+
+  | References and conditional references to groups with fixed length are now allowed in lookbehind assertions|               |
+  +-----------------------------------------------------------------------------------------------------------+---------------+
+  | The number of capturing groups in regular expressions is no longer limited to 100.                        |               |
+  +-----------------------------------------------------------------------------------------------------------+---------------+
+  | The *sub()* and *subn()* functions now replace unmatched groups with empty strings instead of raising an  |               |
+  | exception.                                                                                                |               |
+  +-----------------------------------------------------------------------------------------------------------+---------------+
+  | The *re.error* exceptions have new attributes, msg, pattern, pos, lineno, and colno, that provide better  |               |
+  | context information about the error                                                                       |               |
+  +-----------------------------------------------------------------------------------------------------------+---------------+
+  | `socket <https://docs.python.org/3/whatsnew/3.5.html#socket>`_                                                            |
+  +-----------------------------------------------------------------------------------------------------------+---------------+
+  | Functions with timeouts now use a monotonic clock, instead of a system clock.                             |               |
+  +-----------------------------------------------------------------------------------------------------------+---------------+
+  | A new *socket.sendfile()* method allows sending a file over a socket by using the high-performance        |               |
+  | *os.sendfile()* function on UNIX, resulting in uploads being from 2 to 3 times faster than when using     |               |
+  | plain *socket.send()*                                                                                     |               |
+  +-----------------------------------------------------------------------------------------------------------+---------------+
+  | The *socket.sendall()* method no longer resets the socket timeout every time bytes are received or sent.  |               |
+  | The socket timeout is now the maximum total duration to send all data.                                    |               |
+  +-----------------------------------------------------------------------------------------------------------+---------------+
+  | The backlog argument of the *socket.listen()* method is now optional. By default it is set to SOMAXCONN or| Complete      |
+  | to 128, whichever is less.                                                                                |               |
+  +-----------------------------------------------------------------------------------------------------------+---------------+
+  | `ssl <https://docs.python.org/3/whatsnew/3.5.html#ssl>`_                                                                  |
+  +-----------------------------------------------------------------------------------------------------------+---------------+
+  | Memory BIO Support                                                                                        |               |
+  +-----------------------------------------------------------------------------------------------------------+---------------+
+  | Application-Layer Protocol Negotiation Support                                                            |               |
+  +-----------------------------------------------------------------------------------------------------------+---------------+
+  | There is a new *SSLSocket.version()* method to query the actual protocol version in use.                  |               |
+  +-----------------------------------------------------------------------------------------------------------+---------------+
+  | The SSLSocket class now implements a *SSLSocket.sendfile()* method.                                       |               |
+  +-----------------------------------------------------------------------------------------------------------+---------------+
+  | The *SSLSocket.send()* method now raises either the *ssl.SSLWantReadError* or *ssl.SSLWantWriteError*     |               |
+  | exception on a non-blocking socket if the operation would block. Previously, it would return 0.           |               |
+  +-----------------------------------------------------------------------------------------------------------+---------------+
+  | The *cert_time_to_seconds()* function now interprets the input time as UTC and not as local time, per RFC |               |
+  | 5280. Additionally, the return value is always an int.                                                    |               |
+  +-----------------------------------------------------------------------------------------------------------+---------------+
+  | New *SSLObject.shared_ciphers()* and *SSLSocket.shared_ciphers()* methods return the list of ciphers sent |               |
+  | by the client during the handshake.                                                                       |               |
+  +-----------------------------------------------------------------------------------------------------------+---------------+
+  | The *SSLSocket.do_handshake()*, *SSLSocket.read()*, *SSLSocket.shutdown()*, and *SSLSocket.write()*       |               |
+  | methods of the SSLSocket class no longer reset the socket timeout every time bytes are received or sent.  |               |
+  +-----------------------------------------------------------------------------------------------------------+---------------+
+  | The *match_hostname()* function now supports matching of IP addresses.                                    |               |
+  +-----------------------------------------------------------------------------------------------------------+---------------+
+  | `sys <https://docs.python.org/3/whatsnew/3.5.html#sys>`_                                                                  |
+  +-----------------------------------------------------------------------------------------------------------+---------------+
+  | A new *set_coroutine_wrapper()* function allows setting a global hook that will be called whenever a      |               |
+  | coroutine object is created by an async def function. A corresponding *get_coroutine_wrapper()* can be    |               |
+  | used to obtain a currently set wrapper.                                                                   |               |
+  +-----------------------------------------------------------------------------------------------------------+---------------+
+  | A new *is_finalizing()* function can be used to check if the Python interpreter is shutting down.         |               |
+  +-----------------------------------------------------------------------------------------------------------+---------------+
+  | `time <https://docs.python.org/3/whatsnew/3.5.html#time>`_                                                                |
+  +-----------------------------------------------------------------------------------------------------------+---------------+
+  | The *monotonic()* function is now always available                                                        |               |
+  +-----------------------------------------------------------------------------------------------------------+---------------+
+
+.. rubric:: Notes
+
+.. [#fth] The MicroPython parser correct ignores all type hints. However, the ``typing`` module is not built-in.
diff --git a/docs/differences/python_36.rst b/docs/differences/python_36.rst
index edf6bef02300a..3315b0594dafc 100644
--- a/docs/differences/python_36.rst
+++ b/docs/differences/python_36.rst
@@ -5,53 +5,59 @@ Python 3.6
 
 Python 3.6 beta 1 was released on 12 Sep 2016, and a summary of the new features can be found here:
 
-  +-----------------------------------------------------------------------------------------------------------+--------------+
-  | **New Syntax Features:**                                                                                  | **Status**   |
-  +--------------------------------------------------------+--------------------------------------------------+--------------+
-  | `PEP 498 <https://www.python.org/dev/peps/pep-0498/>`_ | Literal String Formatting                        |              |
-  +--------------------------------------------------------+--------------------------------------------------+--------------+
-  | `PEP 515 <https://www.python.org/dev/peps/pep-0515/>`_ | Underscores in Numeric Literals                  |              |
-  +--------------------------------------------------------+--------------------------------------------------+--------------+
-  | `PEP 525 <https://www.python.org/dev/peps/pep-0525/>`_ | Asynchronous Generators                          |              |
-  +--------------------------------------------------------+--------------------------------------------------+--------------+
-  | `PEP 526 <https://www.python.org/dev/peps/pep-0526/>`_ | Syntax for Variable Annotations (provisional)    |              |
-  +--------------------------------------------------------+--------------------------------------------------+--------------+
-  | `PEP 530 <https://www.python.org/dev/peps/pep-0530/>`_ | Asynchronous Comprehensions                      |              |
-  +--------------------------------------------------------+--------------------------------------------------+--------------+
-  | **New Built-in Features:**                                                                                               |
-  +--------------------------------------------------------+--------------------------------------------------+--------------+
-  | `PEP 468 <https://www.python.org/dev/peps/pep-0468/>`_ | Preserving the order of *kwargs* in a function   |              |
-  +--------------------------------------------------------+--------------------------------------------------+--------------+
-  | `PEP 487 <https://www.python.org/dev/peps/pep-0487/>`_ | Simpler customization of class creation          |              |
-  +--------------------------------------------------------+--------------------------------------------------+--------------+
-  | `PEP 520 <https://www.python.org/dev/peps/pep-0520/>`_ | Preserving Class Attribute Definition Order      |              |
-  +--------------------------------------------------------+--------------------------------------------------+--------------+
-  | **Standard Library Changes:**                                                                                            |
-  +--------------------------------------------------------+--------------------------------------------------+--------------+
-  | `PEP 495 <https://www.python.org/dev/peps/pep-0495/>`_ | Local Time Disambiguation                        |              |
-  +--------------------------------------------------------+--------------------------------------------------+--------------+
-  | `PEP 506 <https://www.python.org/dev/peps/pep-0506/>`_ | Adding A Secrets Module To The Standard Library  |              |
-  +--------------------------------------------------------+--------------------------------------------------+--------------+
-  | `PEP 519 <https://www.python.org/dev/peps/pep-0519/>`_ | Adding a file system path protocol               |              |
-  +--------------------------------------------------------+--------------------------------------------------+--------------+
-  | **CPython internals:**                                                                                                   |
-  +--------------------------------------------------------+--------------------------------------------------+--------------+
-  | `PEP 509 <https://www.python.org/dev/peps/pep-0509/>`_ | Add a private version to dict                    |              |
-  +--------------------------------------------------------+--------------------------------------------------+--------------+
-  | `PEP 523 <https://www.python.org/dev/peps/pep-0523/>`_ | Adding a frame evaluation API to CPython         |              |
-  +--------------------------------------------------------+--------------------------------------------------+--------------+
-  | **Linux/Window Changes**                                                                                                 |
-  +--------------------------------------------------------+--------------------------------------------------+--------------+
-  | `PEP 524 <https://www.python.org/dev/peps/pep-0524/>`_ | Make os.urandom() blocking on Linux              |              |
-  |                                                        | (during system startup)                          |              |
-  +--------------------------------------------------------+--------------------------------------------------+--------------+
-  | `PEP 528 <https://www.python.org/dev/peps/pep-0528/>`_ | Change Windows console encoding to UTF-8         |              |
-  +--------------------------------------------------------+--------------------------------------------------+--------------+
-  | `PEP 529 <https://www.python.org/dev/peps/pep-0529/>`_ | Change Windows filesystem encoding to UTF-8      |              |
-  +--------------------------------------------------------+--------------------------------------------------+--------------+
+.. table::
+  :widths: 30 50 20
+
+  +-----------------------------------------------------------------------------------------------------------+-----------------+
+  | **New Syntax Features**                                                                                   | **Status**      |
+  +--------------------------------------------------------+--------------------------------------------------+-----------------+
+  | `PEP 498 <https://www.python.org/dev/peps/pep-0498/>`_ | Literal String Formatting                        | Complete        |
+  +--------------------------------------------------------+--------------------------------------------------+-----------------+
+  | `PEP 515 <https://www.python.org/dev/peps/pep-0515/>`_ | Underscores in Numeric Literals                  | Complete        |
+  +--------------------------------------------------------+--------------------------------------------------+-----------------+
+  | `PEP 525 <https://www.python.org/dev/peps/pep-0525/>`_ | Asynchronous Generators                          |                 |
+  +--------------------------------------------------------+--------------------------------------------------+-----------------+
+  | `PEP 526 <https://www.python.org/dev/peps/pep-0526/>`_ | Syntax for Variable Annotations (provisional)    | Complete        |
+  +--------------------------------------------------------+--------------------------------------------------+-----------------+
+  | `PEP 530 <https://www.python.org/dev/peps/pep-0530/>`_ | Asynchronous Comprehensions                      |                 |
+  +--------------------------------------------------------+--------------------------------------------------+-----------------+
+  | **New Built-in Features**                                                                                                   |
+  +--------------------------------------------------------+--------------------------------------------------+-----------------+
+  | `PEP 468 <https://www.python.org/dev/peps/pep-0468/>`_ | Preserving the order of *kwargs* in a function   |                 |
+  +--------------------------------------------------------+--------------------------------------------------+-----------------+
+  | `PEP 487 <https://www.python.org/dev/peps/pep-0487/>`_ | Simpler customization of class creation          |                 |
+  +--------------------------------------------------------+--------------------------------------------------+-----------------+
+  | `PEP 520 <https://www.python.org/dev/peps/pep-0520/>`_ | Preserving Class Attribute Definition Order      |                 |
+  +--------------------------------------------------------+--------------------------------------------------+-----------------+
+  | **Standard Library Changes**                                                                                                |
+  +--------------------------------------------------------+--------------------------------------------------+-----------------+
+  | `PEP 495 <https://www.python.org/dev/peps/pep-0495/>`_ | Local Time Disambiguation                        |                 |
+  +--------------------------------------------------------+--------------------------------------------------+-----------------+
+  | `PEP 506 <https://www.python.org/dev/peps/pep-0506/>`_ | Adding A Secrets Module To The Standard Library  |                 |
+  +--------------------------------------------------------+--------------------------------------------------+-----------------+
+  | `PEP 519 <https://www.python.org/dev/peps/pep-0519/>`_ | Adding a file system path protocol               |                 |
+  +--------------------------------------------------------+--------------------------------------------------+-----------------+
+  | **CPython Internals**                                                                                                       |
+  +--------------------------------------------------------+--------------------------------------------------+-----------------+
+  | `PEP 509 <https://www.python.org/dev/peps/pep-0509/>`_ | Add a private version to dict                    | Won't do        |
+  +--------------------------------------------------------+--------------------------------------------------+-----------------+
+  | `PEP 523 <https://www.python.org/dev/peps/pep-0523/>`_ | Adding a frame evaluation API to CPython         |                 |
+  +--------------------------------------------------------+--------------------------------------------------+-----------------+
+  | **Linux/Window Changes**                                                                                                    |
+  +--------------------------------------------------------+--------------------------------------------------+-----------------+
+  | `PEP 524 <https://www.python.org/dev/peps/pep-0524/>`_ | Make ``os.urandom()`` blocking on Linux          |                 |
+  |                                                        | (during system startup)                          |                 |
+  +--------------------------------------------------------+--------------------------------------------------+-----------------+
+  | `PEP 528 <https://www.python.org/dev/peps/pep-0528/>`_ | Change Windows console encoding to UTF-8         |                 |
+  +--------------------------------------------------------+--------------------------------------------------+-----------------+
+  | `PEP 529 <https://www.python.org/dev/peps/pep-0529/>`_ | Change Windows filesystem encoding to UTF-8      |                 |
+  +--------------------------------------------------------+--------------------------------------------------+-----------------+
 
 Other Language Changes:
 
+.. table::
+  :widths: 90 10
+
   +-------------------------------------------------------------------------------------------------------------+---------------+
   | A *global* or *nonlocal* statement must now textually appear before the first use of the affected name in   |               |
   | the same scope. Previously this was a SyntaxWarning.                                                        |               |
@@ -71,6 +77,9 @@ Other Language Changes:
 
 Changes to built-in modules:
 
+.. table::
+  :widths: 90 10
+
   +--------------------------------------------------------------------------------------------------------------+----------------+
   | `array <https://docs.python.org/3.6/whatsnew/3.6.html#array>`_                                               |                |
   +--------------------------------------------------------------------------------------------------------------+----------------+
@@ -78,7 +87,7 @@ Changes to built-in modules:
   +--------------------------------------------------------------------------------------------------------------+----------------+
   | `binascii <https://docs.python.org/3.6/whatsnew/3.6.html#binascii>`_                                         |                |
   +--------------------------------------------------------------------------------------------------------------+----------------+
-  | The b2a_base64() function now accepts an optional newline keyword argument to control whether the newline    | Completed      |
+  | The b2a_base64() function now accepts an optional newline keyword argument to control whether the newline    | Complete       |
   | character is appended to the return value                                                                    |                |
   +--------------------------------------------------------------------------------------------------------------+----------------+
   | `cmath <https://docs.python.org/3.6/whatsnew/3.6.html#cmath>`_                                               |                |
@@ -121,7 +130,7 @@ Changes to built-in modules:
   +--------------------------------------------------------------------------------------------------------------+----------------+
   | `math <https://docs.python.org/3.6/whatsnew/3.6.html#math>`_                                                                  |
   +--------------------------------------------------------------------------------------------------------------+----------------+
-  | The new math.tau (Ï„) constant has been added                                                                 | Completed      |
+  | The new math.tau (Ï„) constant has been added                                                                 | Complete       |
   +--------------------------------------------------------------------------------------------------------------+----------------+
   | `os <https://docs.python.org/3.6/whatsnew/3.6.html#os>`_                                                                      |
   +--------------------------------------------------------------------------------------------------------------+----------------+
@@ -136,7 +145,7 @@ Changes to built-in modules:
   | `re <https://docs.python.org/3.6/whatsnew/3.6.html#re>`_                                                                      |
   +--------------------------------------------------------------------------------------------------------------+----------------+
   | Added support of modifier spans in regular expressions. Examples: *'(?i:p)ython'* matches 'python' and       |                |
-  | 'Python', but not 'PYTHON'; *'(?i)g(?-i:v)r'* matches *'GvR'* and *'gvr'*, but not *'GVR'* .                 |                |
+  | 'Python', but not 'PYTHON'; *'(?i)g(?-i:v)r'* matches *'GvR'* and *'gvr'*, but not *'GVR'*.                  |                |
   +--------------------------------------------------------------------------------------------------------------+----------------+
   | Match object groups can be accessed by *__getitem__*, which is equivalent to *group()*. So *mo['name']* is   |                |
   | now equivalent to *mo.group('name')*.                                                                        |                |
diff --git a/docs/differences/python_37.rst b/docs/differences/python_37.rst
index c46678e931dd1..86d1b6e81f96d 100644
--- a/docs/differences/python_37.rst
+++ b/docs/differences/python_37.rst
@@ -5,72 +5,81 @@ Python 3.7
 
 New Features:
 
-  +--------------------------------------------------------+--------------------------------------------------+----------------+
-  | **Features:**                                                                                             | **Status**     |
-  +--------------------------------------------------------+--------------------------------------------------+----------------+
-  | `PEP 538 <https://www.python.org/dev/peps/pep-0538/>`_ | Coercing the legacy C locale to a UTF-8 based    |                |
-  |                                                        | locale                                           |                |
-  +--------------------------------------------------------+--------------------------------------------------+----------------+
-  | `PEP 539 <https://www.python.org/dev/peps/pep-0539/>`_ | A New C-API for Thread-Local Storage in CPython  |                |
-  +--------------------------------------------------------+--------------------------------------------------+----------------+
-  | `PEP 540 <https://www.python.org/dev/peps/pep-0540/>`_ | UTF-8 mode                                       |                |
-  +--------------------------------------------------------+--------------------------------------------------+----------------+
-  | `PEP 552 <https://www.python.org/dev/peps/pep-0552/>`_ | Deterministic pyc                                |                |
-  +--------------------------------------------------------+--------------------------------------------------+----------------+
-  | `PEP 553 <https://www.python.org/dev/peps/pep-0553/>`_ | Built-in breakpoint()                            |                |
-  +--------------------------------------------------------+--------------------------------------------------+----------------+
-  | `PEP 557 <https://www.python.org/dev/peps/pep-0557/>`_ | Data Classes                                     |                |
-  +--------------------------------------------------------+--------------------------------------------------+----------------+
-  | `PEP 560 <https://www.python.org/dev/peps/pep-0560/>`_ | Core support for typing module and generic types |                |
-  +--------------------------------------------------------+--------------------------------------------------+----------------+
-  | `PEP 562 <https://www.python.org/dev/peps/pep-0562/>`_ | Module __getattr__ and __dir__                   | Partially done |
-  +--------------------------------------------------------+--------------------------------------------------+----------------+
-  | `PEP 563 <https://www.python.org/dev/peps/pep-0563/>`_ | Postponed Evaluation of Annotations              |                |
-  +--------------------------------------------------------+--------------------------------------------------+----------------+
-  | `PEP 564 <https://www.python.org/dev/peps/pep-0564/>`_ | Time functions with nanosecond resolution        |                |
-  +--------------------------------------------------------+--------------------------------------------------+----------------+
-  | `PEP 565 <https://www.python.org/dev/peps/pep-0565/>`_ | Show DeprecationWarning in __main__              |                |
-  +--------------------------------------------------------+--------------------------------------------------+----------------+
-  | `PEP 567 <https://www.python.org/dev/peps/pep-0567/>`_ | Context Variables                                |                |
-  +--------------------------------------------------------+--------------------------------------------------+----------------+
+.. table::
+  :widths: 20 60 20
+
+  +--------------------------------------------------------+--------------------------------------------------+--------------------------------------+
+  | **Feature**                                                                                               | **Status**                           |
+  +--------------------------------------------------------+--------------------------------------------------+--------------------------------------+
+  | `PEP 538 <https://www.python.org/dev/peps/pep-0538/>`_ | Coercing the legacy C locale to a UTF-8 based    |                                      |
+  |                                                        | locale                                           |                                      |
+  +--------------------------------------------------------+--------------------------------------------------+--------------------------------------+
+  | `PEP 539 <https://www.python.org/dev/peps/pep-0539/>`_ | A New C-API for Thread-Local Storage in CPython  |                                      |
+  +--------------------------------------------------------+--------------------------------------------------+--------------------------------------+
+  | `PEP 540 <https://www.python.org/dev/peps/pep-0540/>`_ | UTF-8 mode                                       |                                      |
+  +--------------------------------------------------------+--------------------------------------------------+--------------------------------------+
+  | `PEP 552 <https://www.python.org/dev/peps/pep-0552/>`_ | Deterministic pyc                                |                                      |
+  +--------------------------------------------------------+--------------------------------------------------+--------------------------------------+
+  | `PEP 553 <https://www.python.org/dev/peps/pep-0553/>`_ | Built-in ``breakpoint()``                        |                                      |
+  +--------------------------------------------------------+--------------------------------------------------+--------------------------------------+
+  | `PEP 557 <https://www.python.org/dev/peps/pep-0557/>`_ | Data Classes                                     |                                      |
+  +--------------------------------------------------------+--------------------------------------------------+--------------------------------------+
+  | `PEP 560 <https://www.python.org/dev/peps/pep-0560/>`_ | Core support for typing module and generic types |                                      |
+  +--------------------------------------------------------+--------------------------------------------------+--------------------------------------+
+  | `PEP 562 <https://www.python.org/dev/peps/pep-0562/>`_ | Module ``__getattr__`` and ``__dir__``           | Partial                              |
+  +--------------------------------------------------------+--------------------------------------------------+--------------------------------------+
+  | `PEP 563 <https://www.python.org/dev/peps/pep-0563/>`_ | Postponed Evaluation of Annotations              |                                      |
+  +--------------------------------------------------------+--------------------------------------------------+--------------------------------------+
+  | `PEP 564 <https://www.python.org/dev/peps/pep-0564/>`_ | Time functions with nanosecond resolution        | Partial [#ftimenanosec]_             |
+  +--------------------------------------------------------+--------------------------------------------------+--------------------------------------+
+  | `PEP 565 <https://www.python.org/dev/peps/pep-0565/>`_ | Show DeprecationWarning in ``__main__``          |                                      |
+  +--------------------------------------------------------+--------------------------------------------------+--------------------------------------+
+  | `PEP 567 <https://www.python.org/dev/peps/pep-0567/>`_ | Context Variables                                |                                      |
+  +--------------------------------------------------------+--------------------------------------------------+--------------------------------------+
 
 Other Language Changes:
 
-  +----------------------------------------------------------------------------------------------------------+----------------+
-  | async and await are now reserved keywords                                                                | Completed      |
-  +----------------------------------------------------------------------------------------------------------+----------------+
-  | dict objects must preserve insertion-order                                                               |                |
-  +----------------------------------------------------------------------------------------------------------+----------------+
-  | More than 255 arguments can now be passed to a function; a function can now have more than 255 parameters|                |
-  +----------------------------------------------------------------------------------------------------------+----------------+
-  | bytes.fromhex() and bytearray.fromhex() now ignore all ASCII whitespace, not only spaces                 |                |
-  +----------------------------------------------------------------------------------------------------------+----------------+
-  | str, bytes, and bytearray gained support for the new isascii() method, which can be used to test if a    |                |
-  | string or bytes contain only the ASCII characters                                                        |                |
-  +----------------------------------------------------------------------------------------------------------+----------------+
-  | ImportError now displays module name and module __file__ path whenfrom ... import ... fails              |                |
-  +----------------------------------------------------------------------------------------------------------+----------------+
-  | Circular imports involving absolute imports with binding a submodule to a name are now supported         |                |
-  +----------------------------------------------------------------------------------------------------------+----------------+
-  | object.__format__(x, '') is now equivalent to str(x) rather than format(str(self), '')                   |                |
-  +----------------------------------------------------------------------------------------------------------+----------------+
-  | In order to better support dynamic creation of stack traces, types.TracebackType can now be instantiated |                |
-  | from Python code, and the tb_next attribute on tracebacks is now writable                                |                |
-  +----------------------------------------------------------------------------------------------------------+----------------+
-  | When using the -m switch, sys.path[0] is now eagerly expanded to the full starting directory path, rather|                |
-  | than being left as the empty directory (which allows imports from the current working directory at the   |                |
-  | time when an import occurs)                                                                              |                |
-  +----------------------------------------------------------------------------------------------------------+----------------+
-  | The new -X importtime option or the PYTHONPROFILEIMPORTTIME environment variable can be used to show the |                |
-  | timing of each module import                                                                             |                |
-  +----------------------------------------------------------------------------------------------------------+----------------+
+.. table::
+  :widths: 90 10
+
+  +-----------------------------------------------------------------------------------------------------------------+----------------+
+  | ``async`` and ``await`` are now reserved keywords                                                               | Complete       |
+  +-----------------------------------------------------------------------------------------------------------------+----------------+
+  | ``dict`` objects must preserve insertion-order                                                                  |                |
+  +-----------------------------------------------------------------------------------------------------------------+----------------+
+  | More than 255 arguments can now be passed to a function; a function can now have more than 255 parameters       |                |
+  +-----------------------------------------------------------------------------------------------------------------+----------------+
+  | ``bytes.fromhex()`` and ``bytearray.fromhex()`` now ignore all ASCII whitespace, not only spaces                |                |
+  +-----------------------------------------------------------------------------------------------------------------+----------------+
+  | ``str``, ``bytes``, and ``bytearray`` gained support for the new ``isascii()`` method, which can be used to     |                |
+  | test if a string or bytes contain only the ASCII characters                                                     |                |
+  +-----------------------------------------------------------------------------------------------------------------+----------------+
+  | ``ImportError`` now displays module name and module ``__file__`` path when ``from ... import ...`` fails        |                |
+  +-----------------------------------------------------------------------------------------------------------------+----------------+
+  | Circular imports involving absolute imports with binding a submodule to a name are now supported                |                |
+  +-----------------------------------------------------------------------------------------------------------------+----------------+
+  | ``object.__format__(x, '')`` is now equivalent to ``str(x)`` rather than ``format(str(self), '')``              |                |
+  +-----------------------------------------------------------------------------------------------------------------+----------------+
+  | In order to better support dynamic creation of stack traces, ``types.TracebackType`` can now be                 |                |
+  | instantiated from Python code, and the ``tb_next`` attribute on tracebacks is now writable                      |                |
+  +-----------------------------------------------------------------------------------------------------------------+----------------+
+  | When using the ``-m`` switch, ``sys.path[0]`` is now eagerly expanded to the full starting directory path,      |                |
+  | rather than being left as the empty directory (which allows imports from the current working directory          |                |
+  | at the time when an import occurs)                                                                              |                |
+  +-----------------------------------------------------------------------------------------------------------------+----------------+
+  | The new ``-X importtime`` option or the ``PYTHONPROFILEIMPORTTIME`` environment variable can be used to         |                |
+  | show the timing of each module import                                                                           |                |
+  +-----------------------------------------------------------------------------------------------------------------+----------------+
 
 Changes to built-in modules:
 
+.. table::
+  :widths: 90 10
+
   +------------------------------------------------------------------------------------------------------------+----------------+
   | `asyncio <https://docs.python.org/3/whatsnew/3.7.html#asyncio>`_                                           |                |
   +------------------------------------------------------------------------------------------------------------+----------------+
-  | asyncio (many, may need a separate ticket)                                                                 |                |
+  | Too many to list                                                                                           |                |
   +------------------------------------------------------------------------------------------------------------+----------------+
   | `gc <https://docs.python.org/3/whatsnew/3.7.html#gc>`_                                                     |                |
   +------------------------------------------------------------------------------------------------------------+----------------+
@@ -93,3 +102,7 @@ Changes to built-in modules:
   +------------------------------------------------------------------------------------------------------------+----------------+
   | Mostly updates to support nanosecond resolution in PEP564, see above                                       |                |
   +------------------------------------------------------------------------------------------------------------+----------------+
+
+.. rubric:: Notes
+
+.. [#ftimenanosec] Only :func:`time.time_ns` is implemented. 
diff --git a/docs/differences/python_38.rst b/docs/differences/python_38.rst
index 47840a8b40ec3..32fd68d2caeac 100644
--- a/docs/differences/python_38.rst
+++ b/docs/differences/python_38.rst
@@ -5,15 +5,18 @@ Python 3.8
 
 Python 3.8.0 (final) was released on the 14 October 2019. The Features for 3.8
 are defined in `PEP 569 <https://www.python.org/dev/peps/pep-0569/#id9>`_ and
-a detailed description of the changes can be found in What's New in `Python
+a detailed description of the changes can be found in `What's New in Python
 3.8. <https://docs.python.org/3/whatsnew/3.8.html>`_
 
+.. table::
+  :widths: 20 60 20
+
   +--------------------------------------------------------+---------------------------------------------------+---------------+
-  | **Features:**                                                                                              | Status        |
+  | **Features**                                                                                               | **Status**    |
   +--------------------------------------------------------+---------------------------------------------------+---------------+
   | `PEP 570 <https://www.python.org/dev/peps/pep-0570/>`_ | Positional-only arguments                         |               |
   +--------------------------------------------------------+---------------------------------------------------+---------------+
-  | `PEP 572 <https://www.python.org/dev/peps/pep-0572/>`_ | Assignment Expressions                            |               |
+  | `PEP 572 <https://www.python.org/dev/peps/pep-0572/>`_ | Assignment Expressions                            | Complete      |
   +--------------------------------------------------------+---------------------------------------------------+---------------+
   | `PEP 574 <https://www.python.org/dev/peps/pep-0574/>`_ | Pickle protocol 5 with out-of-band data           |               |
   +--------------------------------------------------------+---------------------------------------------------+---------------+
@@ -25,13 +28,16 @@ a detailed description of the changes can be found in What's New in `Python
   +--------------------------------------------------------+---------------------------------------------------+---------------+
   | **Miscellaneous**                                                                                                          |
   +------------------------------------------------------------------------------------------------------------+---------------+
-  |  f-strings support = for self-documenting expressions and debugging                                        | Completed     |
+  |  f-strings support = for self-documenting expressions and debugging                                        | Complete      |
   +------------------------------------------------------------------------------------------------------------+---------------+
 
 Other Language Changes:
 
+.. table::
+  :widths: 90 10
+
   +------------------------------------------------------------------------------------------------------------+-------------+
-  | A *continue* statement was illegal in the *finally* clause due to a problem with the implementation. In    | Completed   |
+  | A *continue* statement was illegal in the *finally* clause due to a problem with the implementation. In    | Complete    |
   | Python 3.8 this restriction was lifted                                                                     |             |
   +------------------------------------------------------------------------------------------------------------+-------------+
   | The *bool*, *int* , and *fractions.Fraction* types now have an *as_integer_ratio()* method like that found |             |
@@ -72,14 +78,17 @@ Other Language Changes:
 
 Changes to built-in modules:
 
+.. table::
+  :widths: 90 10
+
   +------------------------------------------------------------------------------------------------------------+-------------+
-  | `asyncio`                                                                                                                |
+  | `asyncio <https://docs.python.org/3/whatsnew/3.8.html#asyncio>`_                                                         |
   +------------------------------------------------------------------------------------------------------------+-------------+
-  | *asyncio.run()* has graduated from the provisional to stable API                                           | Completed   |
+  | *asyncio.run()* has graduated from the provisional to stable API                                           | Complete    |
   +------------------------------------------------------------------------------------------------------------+-------------+
   | Running *python -m asyncio* launches a natively async REPL                                                 |             |
   +------------------------------------------------------------------------------------------------------------+-------------+
-  | The exception *asyncio.CancelledError* now inherits from *BaseException* rather than *Exception* and no    | Completed   |
+  | The exception *asyncio.CancelledError* now inherits from *BaseException* rather than *Exception* and no    | Complete    |
   | longer inherits from *concurrent.futures.CancelledError*                                                   |             |
   +------------------------------------------------------------------------------------------------------------+-------------+
   | Added *asyncio.Task.get_coro()* for getting the wrapped coroutine within an *asyncio.Task*                 |             |
@@ -90,12 +99,12 @@ Changes to built-in modules:
   | Added support for Happy Eyeballs to *asyncio.loop.create_connection()*. To specify the behavior, two new   |             |
   | parameters have been added: *happy_eyeballs_delay* and interleave.                                         |             |
   +------------------------------------------------------------------------------------------------------------+-------------+
-  | `gc`                                                                                                                     |
+  | `gc <https://docs.python.org/3/whatsnew/3.8.html#gc>`_                                                                   |
   +------------------------------------------------------------------------------------------------------------+-------------+
   | *get_objects()* can now receive an optional generation parameter indicating a generation to get objects    |             |
   | from. (Note, though, that while *gc* is a built-in, *get_objects()* is not implemented for MicroPython)    |             |
   +------------------------------------------------------------------------------------------------------------+-------------+
-  | `math`                                                                                                                   |
+  | `math <https://docs.python.org/3/whatsnew/3.8.html#math>`_                                                               |
   +------------------------------------------------------------------------------------------------------------+-------------+
   | Added new function *math.dist()* for computing Euclidean distance between two points                       |             |
   +------------------------------------------------------------------------------------------------------------+-------------+
@@ -109,9 +118,9 @@ Changes to built-in modules:
   | Added a new function *math.isqrt()* for computing accurate integer square roots without conversion to      |             |
   | floating point                                                                                             |             |
   +------------------------------------------------------------------------------------------------------------+-------------+
-  | The function *math.factorial()* no longer accepts arguments that are not int-like                          | Completed   |
+  | The function *math.factorial()* no longer accepts arguments that are not int-like                          | Complete    |
   +------------------------------------------------------------------------------------------------------------+-------------+
-  | `sys`                                                                                                                    |
+  | `sys <https://docs.python.org/3/whatsnew/3.8.html#sys>`_                                                                 |
   +------------------------------------------------------------------------------------------------------------+-------------+
   | Add new *sys.unraisablehook()* function which can be overridden to control how "unraisable exceptions"     |             |
   | are handled                                                                                                |             |
diff --git a/docs/differences/python_39.rst b/docs/differences/python_39.rst
index 6852dd635ea82..023c6d7c1e398 100644
--- a/docs/differences/python_39.rst
+++ b/docs/differences/python_39.rst
@@ -8,35 +8,41 @@ defined in `PEP 596 <https://www.python.org/dev/peps/pep-0596/#features-for-3-9>
 and a detailed description of the changes can be found in
 `What's New in Python 3.9 <https://docs.python.org/3/whatsnew/3.9.html>`_
 
+.. table::
+  :widths: 20 60 20
+
   +--------------------------------------------------------+----------------------------------------------------+--------------+
-  | **Features:**                                          |                                                    | **Status**   |
+  | **Features**                                           |                                                    | **Status**   |
   +--------------------------------------------------------+----------------------------------------------------+--------------+
-  | `PEP 573 <https://www.python.org/dev/peps/pep-0573/>`_ | fast access to module state from methods of C      |              |
+  | `PEP 573 <https://www.python.org/dev/peps/pep-0573/>`_ | Fast access to module state from methods of C      |              |
   |                                                        | extension types                                    |              |
   +--------------------------------------------------------+----------------------------------------------------+--------------+
-  | `PEP 584 <https://www.python.org/dev/peps/pep-0584/>`_ | union operators added to dict                      |              |
+  | `PEP 584 <https://www.python.org/dev/peps/pep-0584/>`_ | Union operators added to dict                      |              |
   +--------------------------------------------------------+----------------------------------------------------+--------------+
-  | `PEP 585 <https://www.python.org/dev/peps/pep-0584/>`_ | type hinting generics in standard collections      |              |
+  | `PEP 585 <https://www.python.org/dev/peps/pep-0584/>`_ | Type hinting generics in standard collections      |              |
   +--------------------------------------------------------+----------------------------------------------------+--------------+
-  | `PEP 593 <https://www.python.org/dev/peps/pep-0593/>`_ | flexible function and variable annotations         |              |
+  | `PEP 593 <https://www.python.org/dev/peps/pep-0593/>`_ | Flexible function and variable annotations         |              |
   +--------------------------------------------------------+----------------------------------------------------+--------------+
   | `PEP 602 <https://www.python.org/dev/peps/pep-0602/>`_ | CPython adopts an annual release cycle. Instead of |              |
   |                                                        | annual, aiming for two month release cycle         |              |
   +--------------------------------------------------------+----------------------------------------------------+--------------+
-  | `PEP 614 <https://www.python.org/dev/peps/pep-0614/>`_ | relaxed grammar restrictions on decorators         |              |
+  | `PEP 614 <https://www.python.org/dev/peps/pep-0614/>`_ | Relaxed grammar restrictions on decorators         |              |
   +--------------------------------------------------------+----------------------------------------------------+--------------+
-  | `PEP 615 <https://www.python.org/dev/peps/pep-0615/>`_ | the IANA Time Zone Database is now present in the  |              |
+  | `PEP 615 <https://www.python.org/dev/peps/pep-0615/>`_ | The IANA Time Zone Database is now present in the  |              |
   |                                                        | standard library in the zoneinfo module            |              |
   +--------------------------------------------------------+----------------------------------------------------+--------------+
-  | `PEP 616 <https://www.python.org/dev/peps/pep-0616/>`_ | string methods to remove prefixes and suffixes     |              |
+  | `PEP 616 <https://www.python.org/dev/peps/pep-0616/>`_ | String methods to remove prefixes and suffixes     |              |
   +--------------------------------------------------------+----------------------------------------------------+--------------+
   | `PEP 617 <https://www.python.org/dev/peps/pep-0617/>`_ | CPython now uses a new parser based on PEG         |              |
   +--------------------------------------------------------+----------------------------------------------------+--------------+
 
 Other Language Changes:
 
+.. table::
+  :widths: 90 10
+
   +-------------------------------------------------------------------------------------------------------------+---------------+
-  | *__import__()* now raises *ImportError* instead of *ValueError*                                             | Completed     |
+  | *__import__()* now raises *ImportError* instead of *ValueError*                                             | Complete      |
   +-------------------------------------------------------------------------------------------------------------+---------------+
   | Python now gets the absolute path of the script filename specified on the command line (ex: *python3*       |               |
   | *script.py*): the *__file__* attribute of the *__main__* module became an absolute path, rather than a      |               |
@@ -62,8 +68,11 @@ Other Language Changes:
 
 Changes to built-in modules:
 
+.. table::
+  :widths: 90 10
+
   +---------------------------------------------------------------------------------------------------------------+---------------+
-  | `asyncio`                                                                                                                     |
+  | `asyncio <https://docs.python.org/3/whatsnew/3.9.html#asyncio>`_                                                              |
   +---------------------------------------------------------------------------------------------------------------+---------------+
   | Due to significant security concerns, the reuse_address parameter of *asyncio.loop.create_datagram_endpoint()*|               |
   | is no longer supported                                                                                        |               |
@@ -82,13 +91,13 @@ Changes to built-in modules:
   +---------------------------------------------------------------------------------------------------------------+---------------+
   | *asyncio* now raises *TyperError* when calling incompatible methods with an *ssl.SSLSocket* socket            |               |
   +---------------------------------------------------------------------------------------------------------------+---------------+
-  | `gc`                                                                                                                          |
+  | `gc <https://docs.python.org/3/whatsnew/3.9.html#gc>`_                                                                        |
   +---------------------------------------------------------------------------------------------------------------+---------------+
   | Garbage collection does not block on resurrected objects                                                      |               |
   +---------------------------------------------------------------------------------------------------------------+---------------+
   | Added a new function *gc.is_finalized()* to check if an object has been finalized by the garbage collector    |               |
   +---------------------------------------------------------------------------------------------------------------+---------------+
-  | `math`                                                                                                                        |
+  | `math <https://docs.python.org/3/whatsnew/3.9.html#math>`_                                                                    |
   +---------------------------------------------------------------------------------------------------------------+---------------+
   | Expanded the *math.gcd()* function to handle multiple arguments. Formerly, it only supported two arguments    |               |
   +---------------------------------------------------------------------------------------------------------------+---------------+
@@ -98,21 +107,21 @@ Changes to built-in modules:
   +---------------------------------------------------------------------------------------------------------------+---------------+
   | Added *math.ulp()*: return the value of the least significant bit of a float                                  |               |
   +---------------------------------------------------------------------------------------------------------------+---------------+
-  | `os`                                                                                                                          |
+  | `os <https://docs.python.org/3/whatsnew/3.9.html#os>`_                                                                        |
   +---------------------------------------------------------------------------------------------------------------+---------------+
   | Exposed the Linux-specific *os.pidfd_open()* and *os.P_PIDFD*                                                 |               |
   +---------------------------------------------------------------------------------------------------------------+---------------+
-  | The *os.unsetenv()* function is now also available on Windows                                                 | Completed     |
+  | The *os.unsetenv()* function is now also available on Windows                                                 | Complete      |
   +---------------------------------------------------------------------------------------------------------------+---------------+
-  | The *os.putenv()* and *os.unsetenv()* functions are now always available                                      | Completed     |
+  | The *os.putenv()* and *os.unsetenv()* functions are now always available                                      | Complete      |
   +---------------------------------------------------------------------------------------------------------------+---------------+
   |  Added *os.waitstatus_to_exitcode()* function: convert a wait status to an exit code                          |               |
   +---------------------------------------------------------------------------------------------------------------+---------------+
-  | `random`                                                                                                                      |
+  | `random <https://docs.python.org/3/whatsnew/3.9.html#random>`_                                                                |
   +---------------------------------------------------------------------------------------------------------------+---------------+
   | Added a new *random.Random.randbytes* method: generate random bytes                                           |               |
   +---------------------------------------------------------------------------------------------------------------+---------------+
-  | `sys`                                                                                                                         |
+  | `sys <https://docs.python.org/3/whatsnew/3.9.html#sys>`_                                                                      |
   +---------------------------------------------------------------------------------------------------------------+---------------+
   | Added a new *sys.platlibdir* attribute: name of the platform-specific library directory                       |               |
   +---------------------------------------------------------------------------------------------------------------+---------------+
diff --git a/docs/static/custom.css b/docs/static/custom.css
new file mode 100644
index 0000000000000..b0a7f746fcab3
--- /dev/null
+++ b/docs/static/custom.css
@@ -0,0 +1,5 @@
+/* Workaround to force Sphinx to render tables to 100% and wordwrap */
+/* See https://stackoverflow.com/questions/69359978/grid-table-does-not-word-wrap for more details */
+.wy-table-responsive table td, .wy-table-responsive table th {
+    white-space: inherit;
+}

From 769262ef03b4e7198759bcc72c87c7ca5fc7de29 Mon Sep 17 00:00:00 2001
From: Tomasz 'CeDeROM' CEDRO <tomek@cedro.info>
Date: Thu, 18 Aug 2022 05:20:02 +0200
Subject: [PATCH 2528/3533] docs/esp32: Update UART quickref on input-only
 pins.

Signed-off-by: Tomasz 'CeDeROM' CEDRO <tomek@cedro.info>
---
 docs/esp32/quickref.rst | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/docs/esp32/quickref.rst b/docs/esp32/quickref.rst
index 1529c0ef49297..03ca97c7a7df0 100644
--- a/docs/esp32/quickref.rst
+++ b/docs/esp32/quickref.rst
@@ -216,9 +216,10 @@ They each have default GPIO assigned to them, however depending on your
 ESP32 variant and board, these pins may conflict with embedded flash,
 onboard PSRAM or peripherals.
 
-Any GPIO can be used for hardware UARTs using the GPIO matrix, so to avoid
-conflicts simply provide ``tx`` and ``rx`` pins when constructing. The default
-pins listed below.
+Any GPIO can be used for hardware UARTs using the GPIO matrix, except for
+input-only pins 34-39 that can be used as ``rx``. To avoid conflicts simply
+provide ``tx`` and ``rx`` pins when constructing. The default pins listed
+below.
 
 =====  =====  =====  =====
 \      UART0  UART1  UART2

From 602f9db2f35924a687f8ded2170b2a0b0e13979a Mon Sep 17 00:00:00 2001
From: Tomasz 'CeDeROM' CEDRO <tomek@cedro.info>
Date: Thu, 18 Aug 2022 06:02:53 +0200
Subject: [PATCH 2529/3533] docs/library/machine.UART: Add notes about UART
 init and deinit.

* `init()` can be called multiple times to reconfigure UART.
* After `deinit()` it is impossible to call `init()` again.

Signed-off-by: Tomasz 'CeDeROM' CEDRO <tomek@cedro.info>
---
 docs/library/machine.UART.rst | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/docs/library/machine.UART.rst b/docs/library/machine.UART.rst
index e239525736983..1d54174c99614 100644
--- a/docs/library/machine.UART.rst
+++ b/docs/library/machine.UART.rst
@@ -87,10 +87,22 @@ Methods
        When no pins are given, then the default set of TX and RX pins is taken, and hardware
        flow control will be disabled. If *pins* is ``None``, no pin assignment will be made.
 
+   .. note::
+     It is possible to call ``init()`` multiple times on the same object in
+     order to reconfigure  UART on the fly. That allows using single UART
+     peripheral to serve different devices attached to different GPIO pins.
+     Only one device can be served at a time in that case.
+     Also do not call ``deinit()`` as it will prevent calling ``init()``
+     again.
+
 .. method:: UART.deinit()
 
    Turn off the UART bus.
 
+   .. note::
+     You will not be able to call ``init()`` on the object after ``deinit()``.
+     A new instance needs to be created in that case.
+
 .. method:: UART.any()
 
    Returns an integer counting the number of characters that can be read without

From da217e83d9a710a03fd8e324fe18d3684628cd69 Mon Sep 17 00:00:00 2001
From: Laurens Valk <laurens@pybricks.com>
Date: Tue, 23 Aug 2022 21:35:49 +0200
Subject: [PATCH 2530/3533] docs/library: Fix nested rst styles not rendering.

These can't be nested, so apply styling separately.

Signed-off-by: Laurens Valk <laurens@pybricks.com>
---
 docs/library/index.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/library/index.rst b/docs/library/index.rst
index ffd373a4df25b..59ed1127a7836 100644
--- a/docs/library/index.rst
+++ b/docs/library/index.rst
@@ -195,4 +195,4 @@ but also the MicroPython libraries too (e.g. ``machine``, ``bluetooth``, etc).
 The main exception is the port-specific libraries (``pyb``, ``esp``, etc).
 
 *Other than when you specifically want to force the use of the built-in module,
-we recommend always using ``import module`` rather than ``import umodule``.*
+we recommend always using* ``import module`` *rather than* ``import umodule``.

From 6dcfb25ae7cadc298a5aaa09c68205a828939cd9 Mon Sep 17 00:00:00 2001
From: Laurens Valk <laurens@pybricks.com>
Date: Tue, 23 Aug 2022 21:37:24 +0200
Subject: [PATCH 2531/3533] docs/library/micropython: Fix spelling of compiler.

Signed-off-by: Laurens Valk <laurens@pybricks.com>
---
 docs/library/micropython.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/library/micropython.rst b/docs/library/micropython.rst
index 7106a1a2ff16d..b17dfa9a75a48 100644
--- a/docs/library/micropython.rst
+++ b/docs/library/micropython.rst
@@ -9,7 +9,7 @@ Functions
 
 .. function:: const(expr)
 
-   Used to declare that the expression is a constant so that the compile can
+   Used to declare that the expression is a constant so that the compiler can
    optimise it.  The use of this function should be as follows::
 
     from micropython import const

From 09879f99ca3a6c0e48353eb2aaa1c71ed237f126 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Mon, 22 Aug 2022 11:16:16 +1000
Subject: [PATCH 2532/3533] esp8266/README: Update build instructions to match
 ci.sh.

The existing non-Docker instructions are basically impossible to follow
because the esp-open-sdk does not compile.  Update these instructions to
use the exact toolchain that our CI uses.

Also split the Docker from non-Docker instructions, to avoid confusion
about which commands need to be prefixed.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/esp8266/README.md | 116 +++++++++++++++++++++++++++++-----------
 1 file changed, 86 insertions(+), 30 deletions(-)

diff --git a/ports/esp8266/README.md b/ports/esp8266/README.md
index 15ca7f891c263..dd50fc1af943f 100644
--- a/ports/esp8266/README.md
+++ b/ports/esp8266/README.md
@@ -27,52 +27,106 @@ Documentation is available at http://docs.micropython.org/en/latest/esp8266/quic
 Build instructions
 ------------------
 
-You need the esp-open-sdk toolchain (which provides both the compiler and libraries), which
-you can obtain using one of the following two options:
-
- - Use a Docker image with a pre-built toolchain (**recommended**).
-   To use this, install Docker, then prepend
-   `docker run --rm -v $HOME:$HOME -u $UID -w $PWD larsks/esp-open-sdk ` to the start
-   of the mpy-cross and firmware `make` commands below. This will run the commands using the
-   toolchain inside the container but using the files on your local filesystem.
-
- - or, install the esp-open-sdk directly on your PC, which can be found at
-   <https://github.com/pfalcon/esp-open-sdk>. Clone this repository and
-   run `make` in its directory to build and install the SDK locally.  Make sure
-   to add toolchain bin directory to your PATH.  Read esp-open-sdk's README for
-   additional important information on toolchain setup.
-   If you use this approach, then the command below will work exactly.
-
-Add the external dependencies to the MicroPython repository checkout:
+You need the esp-open-sdk toolchain, which provides both the compiler and libraries.
+
+There are two ways to do this:
+ - By running the toolchain in [Docker](https://www.docker.com/) (**recommended**).
+ - By installing a pre-built toolchain and adding it to your `$PATH`.
+
+Regardless of which toolchain you use, the first step is to make sure required
+submodules are available:
+
 ```bash
 $ make -C ports/esp8266 submodules
 ```
+
 See the README in the repository root for more information about external
 dependencies.
 
-The MicroPython cross-compiler must be built to pre-compile some of the
-built-in scripts to bytecode.  This can be done using:
+__Building with Docker__
+
+Once you have installed Docker, you can run all of the following build
+commands inside the Docker container by prefixing them with `docker
+run --rm -v $HOME:$HOME -u $UID -w $PWD larsks/esp-open-sdk ...command...`.
+This will automatically download the Docker image provided by @larsks which
+contains the full toolchain and SDK.
+
+Then you need to compile the MicroPython cross-compiler (`mpy-cross`). From
+the root of this repository, run:
+
 ```bash
-$ make -C mpy-cross
+$ docker run --rm -v $HOME:$HOME -u $UID -w $PWD larsks/esp-open-sdk make -C mpy-cross
+```
+
+**Note:** The `mpy-cross` binary will likely only work inside the Docker
+container. This will not be a problem if you're only building ESP8266
+firmware, but if you're also working on other ports then you will need to
+recompile for your host when switching between ports. To avoid this, use
+the local toolchain instead.
+
+Then to compile the ESP8266 firmware:
+
+```
+$ cd ports/esp8266
+$ docker run --rm -v $HOME:$HOME -u $UID -w $PWD larsks/esp-open-sdk make -j BOARD=GENERIC
+```
+
+This will produce binary images in the `build-GENERIC/` subdirectory.
+Substitute the board for whichever board you're using.
+
+__Building with a local toolchain__
+
+First download the pre-built toolchain (thanks to @jepler from Adafruit). You
+will need to find somewhere to put it in your filesystem, e.g. `~/espressif`.
+Create that directory first if necessary.
+
+```
+$ cd ~/espressif # Change as necessary
+$ wget https://github.com/jepler/esp-open-sdk/releases/download/2018-06-10/xtensa-lx106-elf-standalone.tar.gz
+$ tar zxvf xtensa-lx106-elf-standalone.tar.gz
+$ rm xtensa-lx106-elf/bin/esptool.py  # Use system version of esptool.py instead.
+```
+
+Then append this to your `$PATH` variable so the compiler binaries can be
+found:
+
+```
+$ export "PATH=$HOME/espressif/xtensa-lx106-elf/bin/:$PATH"
 ```
-(Prepend the Docker command if using Docker, see above)
 
-Then, to build MicroPython for the ESP8266, just run:
+(You will need to do this each time you start a new terminal)
+
+Then you need to compile the MicroPython cross-compiler (`mpy-cross`). From
+the root of this repository, run:
+
 ```bash
+$ make -C mpy-cross
+```
+
+Then to compile the ESP8266 firmware:
+
+```
 $ cd ports/esp8266
-$ make
+$ make -j BOARD=GENERIC
 ```
-(Prepend the Docker command if using Docker, see above)
 
-This will produce binary images in the `build-GENERIC/` subdirectory. If you
-install MicroPython to your module for the first time, or after installing any
-other firmware, you should erase flash completely:
+This will produce binary images in the `build-GENERIC/` subdirectory.
+Substitute the board for whichever board you're using.
+
+
+Installing MicroPython
+----------------------
+
+To communicate with the board you will need to install `esptool.py`. This can
+be obtained from your system package manager or from PyPi via `pip`.
+
+If you install MicroPython to your module for the first time, or after
+installing any other firmware, you should erase flash completely:
+
 ```bash
 $ esptool.py --port /dev/ttyXXX erase_flash
 ```
 
-You can install esptool.py either from your system package manager or from PyPi.
-
 Erasing the flash is also useful as a troubleshooting measure, if a module doesn't
 behave as expected.
 
@@ -80,7 +134,9 @@ To flash MicroPython image to your ESP8266, use:
 ```bash
 $ make deploy
 ```
-(This should not be run inside Docker as it will need access to the serial port.)
+
+(If using the Docker instructions above, do not run this command via Docker as
+it will need access to the serial port. Run it directly instead.)
 
 This will use the `esptool.py` script to download the images.  You must have
 your ESP module in the bootloader mode, and connected to a serial port on your PC.

From 8a0ee5a5c04e83f04d1c62029ac5ba7c74856507 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Mon, 22 Aug 2022 17:08:05 +1000
Subject: [PATCH 2533/3533] py/objstr: Split mp_obj_str_from_vstr into
 bytes/str versions.

Previously the desired output type was specified.  Now make the type part
of the function name.  Because this function is used in a few places this
saves code size due to smaller call-site.

This makes `mp_obj_new_str_type_from_vstr` a private function of objstr.c
(which is almost the only place where the output type isn't a compile-time
constant).

This saves ~140 bytes on PYBV11.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 extmod/machine_i2c.c            |  4 ++--
 extmod/machine_spi.c            |  2 +-
 extmod/modlwip.c                |  4 ++--
 extmod/modubinascii.c           |  4 ++--
 extmod/moducryptolib.c          |  2 +-
 extmod/moduhashlib.c            | 12 +++++-----
 extmod/modujson.c               |  4 ++--
 extmod/modure.c                 |  6 ++++-
 extmod/modusocket.c             |  4 ++--
 extmod/vfs.c                    |  2 +-
 ports/cc3200/mods/moduos.c      |  2 +-
 ports/cc3200/mods/modusocket.c  |  4 ++--
 ports/cc3200/mods/pybi2c.c      |  4 ++--
 ports/cc3200/mods/pybspi.c      |  2 +-
 ports/esp32/modsocket.c         |  2 +-
 ports/esp32/moduos.c            |  2 +-
 ports/esp8266/moduos.c          |  2 +-
 ports/mimxrt/moduos.c           |  2 +-
 ports/nrf/modules/machine/spi.c |  2 +-
 ports/nrf/modules/uos/moduos.c  |  2 +-
 ports/rp2/moduos.c              |  2 +-
 ports/stm32/moduos.c            |  2 +-
 ports/stm32/pyb_i2c.c           |  4 ++--
 ports/stm32/pyb_spi.c           |  4 ++--
 ports/stm32/usb.c               |  4 ++--
 ports/unix/main.c               |  4 ++--
 ports/unix/moduos.c             |  2 +-
 ports/unix/modusocket.c         |  2 +-
 ports/zephyr/modusocket.c       |  2 +-
 py/modbuiltins.c                |  4 ++--
 py/modstruct.c                  |  2 +-
 py/obj.h                        |  3 ++-
 py/objint.c                     |  2 +-
 py/objstr.c                     | 40 ++++++++++++++++++++-------------
 py/parsenum.c                   |  2 +-
 py/persistentcode.c             |  6 ++++-
 py/stream.c                     | 22 +++++++++++++-----
 37 files changed, 102 insertions(+), 73 deletions(-)

diff --git a/extmod/machine_i2c.c b/extmod/machine_i2c.c
index 452f07a2ebdb8..2aa217914bfb5 100644
--- a/extmod/machine_i2c.c
+++ b/extmod/machine_i2c.c
@@ -417,7 +417,7 @@ STATIC mp_obj_t machine_i2c_readfrom(size_t n_args, const mp_obj_t *args) {
     if (ret < 0) {
         mp_raise_OSError(-ret);
     }
-    return mp_obj_new_str_from_vstr(&mp_type_bytes, &vstr);
+    return mp_obj_new_bytes_from_vstr(&vstr);
 }
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_i2c_readfrom_obj, 3, 4, machine_i2c_readfrom);
 
@@ -581,7 +581,7 @@ STATIC mp_obj_t machine_i2c_readfrom_mem(size_t n_args, const mp_obj_t *pos_args
         mp_raise_OSError(-ret);
     }
 
-    return mp_obj_new_str_from_vstr(&mp_type_bytes, &vstr);
+    return mp_obj_new_bytes_from_vstr(&vstr);
 }
 MP_DEFINE_CONST_FUN_OBJ_KW(machine_i2c_readfrom_mem_obj, 1, machine_i2c_readfrom_mem);
 
diff --git a/extmod/machine_spi.c b/extmod/machine_spi.c
index f160f97d04b4f..ba533b2a651a0 100644
--- a/extmod/machine_spi.c
+++ b/extmod/machine_spi.c
@@ -70,7 +70,7 @@ STATIC mp_obj_t mp_machine_spi_read(size_t n_args, const mp_obj_t *args) {
     vstr_init_len(&vstr, mp_obj_get_int(args[1]));
     memset(vstr.buf, n_args == 3 ? mp_obj_get_int(args[2]) : 0, vstr.len);
     mp_machine_spi_transfer(args[0], vstr.len, vstr.buf, vstr.buf);
-    return mp_obj_new_str_from_vstr(&mp_type_bytes, &vstr);
+    return mp_obj_new_bytes_from_vstr(&vstr);
 }
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_machine_spi_read_obj, 2, 3, mp_machine_spi_read);
 
diff --git a/extmod/modlwip.c b/extmod/modlwip.c
index c6ee02132ff21..f9451a0ce4399 100644
--- a/extmod/modlwip.c
+++ b/extmod/modlwip.c
@@ -1198,7 +1198,7 @@ STATIC mp_obj_t lwip_socket_recv(mp_obj_t self_in, mp_obj_t len_in) {
         return mp_const_empty_bytes;
     }
     vstr.len = ret;
-    return mp_obj_new_str_from_vstr(&mp_type_bytes, &vstr);
+    return mp_obj_new_bytes_from_vstr(&vstr);
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_2(lwip_socket_recv_obj, lwip_socket_recv);
 
@@ -1271,7 +1271,7 @@ STATIC mp_obj_t lwip_socket_recvfrom(mp_obj_t self_in, mp_obj_t len_in) {
         tuple[0] = mp_const_empty_bytes;
     } else {
         vstr.len = ret;
-        tuple[0] = mp_obj_new_str_from_vstr(&mp_type_bytes, &vstr);
+        tuple[0] = mp_obj_new_bytes_from_vstr(&vstr);
     }
     tuple[1] = netutils_format_inet_addr(ip, port, NETUTILS_BIG);
     return mp_obj_new_tuple(2, tuple);
diff --git a/extmod/modubinascii.c b/extmod/modubinascii.c
index 49c8d1fb971e5..45a39c58d443b 100644
--- a/extmod/modubinascii.c
+++ b/extmod/modubinascii.c
@@ -104,7 +104,7 @@ STATIC mp_obj_t mod_binascii_a2b_base64(mp_obj_t data) {
         mp_raise_ValueError(MP_ERROR_TEXT("incorrect padding"));
     }
 
-    return mp_obj_new_str_from_vstr(&mp_type_bytes, &vstr);
+    return mp_obj_new_bytes_from_vstr(&vstr);
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_binascii_a2b_base64_obj, mod_binascii_a2b_base64);
 
@@ -166,7 +166,7 @@ STATIC mp_obj_t mod_binascii_b2a_base64(size_t n_args, const mp_obj_t *pos_args,
     if (newline) {
         *out = '\n';
     }
-    return mp_obj_new_str_from_vstr(&mp_type_bytes, &vstr);
+    return mp_obj_new_bytes_from_vstr(&vstr);
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_KW(mod_binascii_b2a_base64_obj, 1, mod_binascii_b2a_base64);
 
diff --git a/extmod/moducryptolib.c b/extmod/moducryptolib.c
index c58abaada67e0..dc0ecb9b20f1d 100644
--- a/extmod/moducryptolib.c
+++ b/extmod/moducryptolib.c
@@ -329,7 +329,7 @@ STATIC mp_obj_t aes_process(size_t n_args, const mp_obj_t *args, bool encrypt) {
     if (out_buf != MP_OBJ_NULL) {
         return out_buf;
     }
-    return mp_obj_new_str_from_vstr(&mp_type_bytes, &vstr);
+    return mp_obj_new_bytes_from_vstr(&vstr);
 }
 
 STATIC mp_obj_t ucryptolib_aes_encrypt(size_t n_args, const mp_obj_t *args) {
diff --git a/extmod/moduhashlib.c b/extmod/moduhashlib.c
index 39488788f2712..7eae06b77d341 100644
--- a/extmod/moduhashlib.c
+++ b/extmod/moduhashlib.c
@@ -109,7 +109,7 @@ STATIC mp_obj_t uhashlib_sha256_digest(mp_obj_t self_in) {
     vstr_t vstr;
     vstr_init_len(&vstr, 32);
     mbedtls_sha256_finish_ret((mbedtls_sha256_context *)&self->state, (unsigned char *)vstr.buf);
-    return mp_obj_new_str_from_vstr(&mp_type_bytes, &vstr);
+    return mp_obj_new_bytes_from_vstr(&vstr);
 }
 
 #else
@@ -143,7 +143,7 @@ STATIC mp_obj_t uhashlib_sha256_digest(mp_obj_t self_in) {
     vstr_t vstr;
     vstr_init_len(&vstr, SHA256_BLOCK_SIZE);
     sha256_final((CRYAL_SHA256_CTX *)self->state, (byte *)vstr.buf);
-    return mp_obj_new_str_from_vstr(&mp_type_bytes, &vstr);
+    return mp_obj_new_bytes_from_vstr(&vstr);
 }
 #endif
 
@@ -196,7 +196,7 @@ STATIC mp_obj_t uhashlib_sha1_digest(mp_obj_t self_in) {
     vstr_t vstr;
     vstr_init_len(&vstr, SHA1_SIZE);
     SHA1_Final((byte *)vstr.buf, (SHA1_CTX *)self->state);
-    return mp_obj_new_str_from_vstr(&mp_type_bytes, &vstr);
+    return mp_obj_new_bytes_from_vstr(&vstr);
 }
 #endif
 
@@ -237,7 +237,7 @@ STATIC mp_obj_t uhashlib_sha1_digest(mp_obj_t self_in) {
     vstr_init_len(&vstr, 20);
     mbedtls_sha1_finish_ret((mbedtls_sha1_context *)self->state, (byte *)vstr.buf);
     mbedtls_sha1_free((mbedtls_sha1_context *)self->state);
-    return mp_obj_new_str_from_vstr(&mp_type_bytes, &vstr);
+    return mp_obj_new_bytes_from_vstr(&vstr);
 }
 #endif
 
@@ -289,7 +289,7 @@ STATIC mp_obj_t uhashlib_md5_digest(mp_obj_t self_in) {
     vstr_t vstr;
     vstr_init_len(&vstr, MD5_SIZE);
     MD5_Final((byte *)vstr.buf, (MD5_CTX *)self->state);
-    return mp_obj_new_str_from_vstr(&mp_type_bytes, &vstr);
+    return mp_obj_new_bytes_from_vstr(&vstr);
 }
 #endif // MICROPY_SSL_AXTLS
 
@@ -330,7 +330,7 @@ STATIC mp_obj_t uhashlib_md5_digest(mp_obj_t self_in) {
     vstr_init_len(&vstr, 16);
     mbedtls_md5_finish_ret((mbedtls_md5_context *)self->state, (byte *)vstr.buf);
     mbedtls_md5_free((mbedtls_md5_context *)self->state);
-    return mp_obj_new_str_from_vstr(&mp_type_bytes, &vstr);
+    return mp_obj_new_bytes_from_vstr(&vstr);
 }
 #endif // MICROPY_SSL_MBEDTLS
 
diff --git a/extmod/modujson.c b/extmod/modujson.c
index 9a73e4501e7c0..57c50deec028c 100644
--- a/extmod/modujson.c
+++ b/extmod/modujson.c
@@ -67,7 +67,7 @@ STATIC mp_obj_t mod_ujson_dump_helper(size_t n_args, const mp_obj_t *pos_args, m
         vstr_t vstr;
         vstr_init_print(&vstr, 8, &print_ext.base);
         mp_obj_print_helper(&print_ext.base, pos_args[0], PRINT_JSON);
-        return mp_obj_new_str_from_vstr(&mp_type_str, &vstr);
+        return mp_obj_new_str_from_vstr(&vstr);
     } else {
         // dump(obj, stream)
         print_ext.base.data = MP_OBJ_TO_PTR(pos_args[1]);
@@ -103,7 +103,7 @@ STATIC mp_obj_t mod_ujson_dumps(mp_obj_t obj) {
     mp_print_t print;
     vstr_init_print(&vstr, 8, &print);
     mp_obj_print_helper(&print, obj, PRINT_JSON);
-    return mp_obj_new_str_from_vstr(&mp_type_str, &vstr);
+    return mp_obj_new_str_from_vstr(&vstr);
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_ujson_dumps_obj, mod_ujson_dumps);
 
diff --git a/extmod/modure.c b/extmod/modure.c
index 6bd89898431ff..59fbfddbf24a0 100644
--- a/extmod/modure.c
+++ b/extmod/modure.c
@@ -372,7 +372,11 @@ STATIC mp_obj_t re_sub_helper(size_t n_args, const mp_obj_t *args) {
     // Add post-match string
     vstr_add_strn(&vstr_return, subj.begin, subj.end - subj.begin);
 
-    return mp_obj_new_str_from_vstr(mp_obj_get_type(where), &vstr_return);
+    if (mp_obj_get_type(where) == &mp_type_str) {
+        return mp_obj_new_str_from_vstr(&vstr_return);
+    } else {
+        return mp_obj_new_bytes_from_vstr(&vstr_return);
+    }
 }
 
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(re_sub_obj, 3, 5, re_sub_helper);
diff --git a/extmod/modusocket.c b/extmod/modusocket.c
index 638ab0cf28c0a..4d72531160e6a 100644
--- a/extmod/modusocket.c
+++ b/extmod/modusocket.c
@@ -296,7 +296,7 @@ STATIC mp_obj_t socket_recv(mp_obj_t self_in, mp_obj_t len_in) {
         return mp_const_empty_bytes;
     }
     vstr.len = ret;
-    return mp_obj_new_str_from_vstr(&mp_type_bytes, &vstr);
+    return mp_obj_new_bytes_from_vstr(&vstr);
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_2(socket_recv_obj, socket_recv);
 
@@ -347,7 +347,7 @@ STATIC mp_obj_t socket_recvfrom(mp_obj_t self_in, mp_obj_t len_in) {
         tuple[0] = mp_const_empty_bytes;
     } else {
         vstr.len = ret;
-        tuple[0] = mp_obj_new_str_from_vstr(&mp_type_bytes, &vstr);
+        tuple[0] = mp_obj_new_bytes_from_vstr(&vstr);
     }
     tuple[1] = netutils_format_inet_addr(ip, port, NETUTILS_BIG);
     return mp_obj_new_tuple(2, tuple);
diff --git a/extmod/vfs.c b/extmod/vfs.c
index be1a82d404474..0ef20e9281088 100644
--- a/extmod/vfs.c
+++ b/extmod/vfs.c
@@ -360,7 +360,7 @@ mp_obj_t mp_vfs_getcwd(void) {
     if (!(cwd[0] == '/' && cwd[1] == 0)) {
         vstr_add_str(&vstr, cwd);
     }
-    return mp_obj_new_str_from_vstr(&mp_type_str, &vstr);
+    return mp_obj_new_str_from_vstr(&vstr);
 }
 MP_DEFINE_CONST_FUN_OBJ_0(mp_vfs_getcwd_obj, mp_vfs_getcwd);
 
diff --git a/ports/cc3200/mods/moduos.c b/ports/cc3200/mods/moduos.c
index cd01b59b35d5c..e284e9eb1ffb4 100644
--- a/ports/cc3200/mods/moduos.c
+++ b/ports/cc3200/mods/moduos.c
@@ -116,7 +116,7 @@ STATIC mp_obj_t os_urandom(mp_obj_t num) {
     for (int i = 0; i < n; i++) {
         vstr.buf[i] = rng_get();
     }
-    return mp_obj_new_str_from_vstr(&mp_type_bytes, &vstr);
+    return mp_obj_new_bytes_from_vstr(&vstr);
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(os_urandom_obj, os_urandom);
 
diff --git a/ports/cc3200/mods/modusocket.c b/ports/cc3200/mods/modusocket.c
index 32849c51d47c6..23982eb96602c 100644
--- a/ports/cc3200/mods/modusocket.c
+++ b/ports/cc3200/mods/modusocket.c
@@ -581,7 +581,7 @@ STATIC mp_obj_t socket_recv(mp_obj_t self_in, mp_obj_t len_in) {
     }
     vstr.len = ret;
     vstr.buf[vstr.len] = '\0';
-    return mp_obj_new_str_from_vstr(&mp_type_bytes, &vstr);
+    return mp_obj_new_bytes_from_vstr(&vstr);
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_2(socket_recv_obj, socket_recv);
 
@@ -625,7 +625,7 @@ STATIC mp_obj_t socket_recvfrom(mp_obj_t self_in, mp_obj_t len_in) {
     } else {
         vstr.len = ret;
         vstr.buf[vstr.len] = '\0';
-        tuple[0] = mp_obj_new_str_from_vstr(&mp_type_bytes, &vstr);
+        tuple[0] = mp_obj_new_bytes_from_vstr(&vstr);
     }
     tuple[1] = netutils_format_inet_addr(ip, port, NETUTILS_LITTLE);
     return mp_obj_new_tuple(2, tuple);
diff --git a/ports/cc3200/mods/pybi2c.c b/ports/cc3200/mods/pybi2c.c
index 5310176091a96..40b3e2a207146 100644
--- a/ports/cc3200/mods/pybi2c.c
+++ b/ports/cc3200/mods/pybi2c.c
@@ -392,7 +392,7 @@ STATIC mp_obj_t pyb_i2c_readfrom(size_t n_args, const mp_obj_t *pos_args, mp_map
     pyb_i2c_read_into(args, &vstr);
 
     // return the received data
-    return mp_obj_new_str_from_vstr(&mp_type_bytes, &vstr);
+    return mp_obj_new_bytes_from_vstr(&vstr);
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_KW(pyb_i2c_readfrom_obj, 3, pyb_i2c_readfrom);
 
@@ -456,7 +456,7 @@ STATIC mp_obj_t pyb_i2c_readfrom_mem(size_t n_args, const mp_obj_t *pos_args, mp
 
     vstr_t vstr;
     pyb_i2c_readmem_into (args, &vstr);
-    return mp_obj_new_str_from_vstr(&mp_type_bytes, &vstr);
+    return mp_obj_new_bytes_from_vstr(&vstr);
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_KW(pyb_i2c_readfrom_mem_obj, 1, pyb_i2c_readfrom_mem);
 
diff --git a/ports/cc3200/mods/pybspi.c b/ports/cc3200/mods/pybspi.c
index 61b1a6bd11eeb..ed03b09060811 100644
--- a/ports/cc3200/mods/pybspi.c
+++ b/ports/cc3200/mods/pybspi.c
@@ -305,7 +305,7 @@ STATIC mp_obj_t pyb_spi_read(size_t n_args, const mp_obj_t *pos_args, mp_map_t *
     pybspi_transfer(self, NULL, vstr.buf, vstr.len, &write);
 
     // return the received data
-    return mp_obj_new_str_from_vstr(&mp_type_bytes, &vstr);
+    return mp_obj_new_bytes_from_vstr(&vstr);
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_KW(pyb_spi_read_obj, 1, pyb_spi_read);
 
diff --git a/ports/esp32/modsocket.c b/ports/esp32/modsocket.c
index 819ea26e98006..a281558241dca 100644
--- a/ports/esp32/modsocket.c
+++ b/ports/esp32/modsocket.c
@@ -552,7 +552,7 @@ mp_obj_t _socket_recvfrom(mp_obj_t self_in, mp_obj_t len_in,
     }
 
     vstr.len = ret;
-    return mp_obj_new_str_from_vstr(&mp_type_bytes, &vstr);
+    return mp_obj_new_bytes_from_vstr(&vstr);
 }
 
 STATIC mp_obj_t socket_recv(mp_obj_t self_in, mp_obj_t len_in) {
diff --git a/ports/esp32/moduos.c b/ports/esp32/moduos.c
index f307a9ffe05b1..bdfd19c5d20ad 100644
--- a/ports/esp32/moduos.c
+++ b/ports/esp32/moduos.c
@@ -45,7 +45,7 @@ STATIC mp_obj_t mp_uos_urandom(mp_obj_t num) {
         vstr.buf[i] = r;
         r >>= 8;
     }
-    return mp_obj_new_str_from_vstr(&mp_type_bytes, &vstr);
+    return mp_obj_new_bytes_from_vstr(&vstr);
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_uos_urandom_obj, mp_uos_urandom);
 
diff --git a/ports/esp8266/moduos.c b/ports/esp8266/moduos.c
index 9a235e61b9b9f..a023796fd3b6c 100644
--- a/ports/esp8266/moduos.c
+++ b/ports/esp8266/moduos.c
@@ -48,7 +48,7 @@ STATIC mp_obj_t mp_uos_urandom(mp_obj_t num) {
     for (int i = 0; i < n; i++) {
         vstr.buf[i] = *WDEV_HWRNG;
     }
-    return mp_obj_new_str_from_vstr(&mp_type_bytes, &vstr);
+    return mp_obj_new_bytes_from_vstr(&vstr);
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_uos_urandom_obj, mp_uos_urandom);
 
diff --git a/ports/mimxrt/moduos.c b/ports/mimxrt/moduos.c
index 34bd2b4248769..ddb4826db9cf3 100644
--- a/ports/mimxrt/moduos.c
+++ b/ports/mimxrt/moduos.c
@@ -63,7 +63,7 @@ STATIC mp_obj_t mp_uos_urandom(mp_obj_t num) {
     trng_start();
     TRNG_GetRandomData(TRNG, vstr.buf, n);
 
-    return mp_obj_new_str_from_vstr(&mp_type_bytes, &vstr);
+    return mp_obj_new_bytes_from_vstr(&vstr);
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_uos_urandom_obj, mp_uos_urandom);
 #endif
diff --git a/ports/nrf/modules/machine/spi.c b/ports/nrf/modules/machine/spi.c
index 880d946a29f95..81bc151bebd63 100644
--- a/ports/nrf/modules/machine/spi.c
+++ b/ports/nrf/modules/machine/spi.c
@@ -388,7 +388,7 @@ STATIC mp_obj_t mp_machine_spi_read(size_t n_args, const mp_obj_t *args) {
     vstr_init_len(&vstr, mp_obj_get_int(args[1]));
     memset(vstr.buf, n_args == 3 ? mp_obj_get_int(args[2]) : 0, vstr.len);
     spi_transfer(args[0], vstr.len, vstr.buf, vstr.buf);
-    return mp_obj_new_str_from_vstr(&mp_type_bytes, &vstr);
+    return mp_obj_new_bytes_from_vstr(&vstr);
 }
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_machine_spi_read_obj, 2, 3, mp_machine_spi_read);
 
diff --git a/ports/nrf/modules/uos/moduos.c b/ports/nrf/modules/uos/moduos.c
index 184f833ef5df9..3fdd8eb19ec15 100644
--- a/ports/nrf/modules/uos/moduos.c
+++ b/ports/nrf/modules/uos/moduos.c
@@ -108,7 +108,7 @@ STATIC mp_obj_t os_urandom(mp_obj_t num) {
     for (int i = 0; i < n; i++) {
         vstr.buf[i] = (uint8_t)(rng_generate_random_word() & 0xFF);
     }
-    return mp_obj_new_str_from_vstr(&mp_type_bytes, &vstr);
+    return mp_obj_new_bytes_from_vstr(&vstr);
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(os_urandom_obj, os_urandom);
 #endif
diff --git a/ports/rp2/moduos.c b/ports/rp2/moduos.c
index 6288ff5696e4f..398ec28d92107 100644
--- a/ports/rp2/moduos.c
+++ b/ports/rp2/moduos.c
@@ -35,6 +35,6 @@ STATIC mp_obj_t mp_uos_urandom(mp_obj_t num) {
     for (int i = 0; i < n; i++) {
         vstr.buf[i] = rosc_random_u8(8);
     }
-    return mp_obj_new_str_from_vstr(&mp_type_bytes, &vstr);
+    return mp_obj_new_bytes_from_vstr(&vstr);
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_uos_urandom_obj, mp_uos_urandom);
diff --git a/ports/stm32/moduos.c b/ports/stm32/moduos.c
index 1862564b611cd..85d0edeca8a1f 100644
--- a/ports/stm32/moduos.c
+++ b/ports/stm32/moduos.c
@@ -58,7 +58,7 @@ STATIC mp_obj_t mp_uos_urandom(mp_obj_t num) {
     for (int i = 0; i < n; i++) {
         vstr.buf[i] = rng_get();
     }
-    return mp_obj_new_str_from_vstr(&mp_type_bytes, &vstr);
+    return mp_obj_new_bytes_from_vstr(&vstr);
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_uos_urandom_obj, mp_uos_urandom);
 #endif
diff --git a/ports/stm32/pyb_i2c.c b/ports/stm32/pyb_i2c.c
index 2ca0793c189e6..436b1c9bc2437 100644
--- a/ports/stm32/pyb_i2c.c
+++ b/ports/stm32/pyb_i2c.c
@@ -926,7 +926,7 @@ STATIC mp_obj_t pyb_i2c_recv(size_t n_args, const mp_obj_t *pos_args, mp_map_t *
     if (o_ret != MP_OBJ_NULL) {
         return o_ret;
     } else {
-        return mp_obj_new_str_from_vstr(&mp_type_bytes, &vstr);
+        return mp_obj_new_bytes_from_vstr(&vstr);
     }
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_KW(pyb_i2c_recv_obj, 1, pyb_i2c_recv);
@@ -1002,7 +1002,7 @@ STATIC mp_obj_t pyb_i2c_mem_read(size_t n_args, const mp_obj_t *pos_args, mp_map
     if (o_ret != MP_OBJ_NULL) {
         return o_ret;
     } else {
-        return mp_obj_new_str_from_vstr(&mp_type_bytes, &vstr);
+        return mp_obj_new_bytes_from_vstr(&vstr);
     }
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_KW(pyb_i2c_mem_read_obj, 1, pyb_i2c_mem_read);
diff --git a/ports/stm32/pyb_spi.c b/ports/stm32/pyb_spi.c
index abb7ba41db0d1..f2cdcebf2a72f 100644
--- a/ports/stm32/pyb_spi.c
+++ b/ports/stm32/pyb_spi.c
@@ -229,7 +229,7 @@ STATIC mp_obj_t pyb_spi_recv(size_t n_args, const mp_obj_t *pos_args, mp_map_t *
     if (o_ret != MP_OBJ_NULL) {
         return o_ret;
     } else {
-        return mp_obj_new_str_from_vstr(&mp_type_bytes, &vstr);
+        return mp_obj_new_bytes_from_vstr(&vstr);
     }
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_KW(pyb_spi_recv_obj, 1, pyb_spi_recv);
@@ -298,7 +298,7 @@ STATIC mp_obj_t pyb_spi_send_recv(size_t n_args, const mp_obj_t *pos_args, mp_ma
     if (o_ret != MP_OBJ_NULL) {
         return o_ret;
     } else {
-        return mp_obj_new_str_from_vstr(&mp_type_bytes, &vstr_recv);
+        return mp_obj_new_bytes_from_vstr(&vstr_recv);
     }
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_KW(pyb_spi_send_recv_obj, 1, pyb_spi_send_recv);
diff --git a/ports/stm32/usb.c b/ports/stm32/usb.c
index 2a669b2a28a86..c5fdd88acfb8f 100644
--- a/ports/stm32/usb.c
+++ b/ports/stm32/usb.c
@@ -813,7 +813,7 @@ STATIC mp_obj_t pyb_usb_vcp_recv(size_t n_args, const mp_obj_t *args, mp_map_t *
         return mp_obj_new_int(ret); // number of bytes read into given buffer
     } else {
         vstr.len = ret; // set actual number of bytes read
-        return mp_obj_new_str_from_vstr(&mp_type_bytes, &vstr); // create a new buffer
+        return mp_obj_new_bytes_from_vstr(&vstr); // create a new buffer
     }
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_KW(pyb_usb_vcp_recv_obj, 1, pyb_usb_vcp_recv);
@@ -1007,7 +1007,7 @@ STATIC mp_obj_t pyb_usb_hid_recv(size_t n_args, const mp_obj_t *args, mp_map_t *
         return mp_obj_new_int(ret); // number of bytes read into given buffer
     } else {
         vstr.len = ret; // set actual number of bytes read
-        return mp_obj_new_str_from_vstr(&mp_type_bytes, &vstr); // create a new buffer
+        return mp_obj_new_bytes_from_vstr(&vstr); // create a new buffer
     }
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_KW(pyb_usb_hid_recv_obj, 1, pyb_usb_hid_recv);
diff --git a/ports/unix/main.c b/ports/unix/main.c
index 0b27a1f5f5c8e..c388106a645e1 100644
--- a/ports/unix/main.c
+++ b/ports/unix/main.c
@@ -554,7 +554,7 @@ MP_NOINLINE int main_(int argc, char **argv) {
                 vstr_init(&vstr, home_l + (p1 - p - 1) + 1);
                 vstr_add_strn(&vstr, home, home_l);
                 vstr_add_strn(&vstr, p + 1, p1 - p - 1);
-                path_items[i] = mp_obj_new_str_from_vstr(&mp_type_str, &vstr);
+                path_items[i] = mp_obj_new_str_from_vstr(&vstr);
             } else {
                 path_items[i] = mp_obj_new_str_via_qstr(p, p1 - p);
             }
@@ -650,7 +650,7 @@ MP_NOINLINE int main_(int argc, char **argv) {
                     vstr_init(&vstr, len + sizeof(".__main__"));
                     vstr_add_strn(&vstr, argv[a + 1], len);
                     vstr_add_strn(&vstr, ".__main__", sizeof(".__main__") - 1);
-                    import_args[0] = mp_obj_new_str_from_vstr(&mp_type_str, &vstr);
+                    import_args[0] = mp_obj_new_str_from_vstr(&vstr);
                     goto reimport;
                 }
 
diff --git a/ports/unix/moduos.c b/ports/unix/moduos.c
index b577dbd297f71..854ff335faa47 100644
--- a/ports/unix/moduos.c
+++ b/ports/unix/moduos.c
@@ -94,7 +94,7 @@ STATIC mp_obj_t mp_uos_urandom(mp_obj_t num) {
     vstr_t vstr;
     vstr_init_len(&vstr, n);
     mp_hal_get_random(n, vstr.buf);
-    return mp_obj_new_str_from_vstr(&mp_type_bytes, &vstr);
+    return mp_obj_new_bytes_from_vstr(&vstr);
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_uos_urandom_obj, mp_uos_urandom);
 
diff --git a/ports/unix/modusocket.c b/ports/unix/modusocket.c
index 69ae2a78ebbb2..88e7675a9278f 100644
--- a/ports/unix/modusocket.c
+++ b/ports/unix/modusocket.c
@@ -559,7 +559,7 @@ STATIC mp_obj_t mod_socket_inet_ntop(mp_obj_t family_in, mp_obj_t binaddr_in) {
         mp_raise_OSError(errno);
     }
     vstr.len = strlen(vstr.buf);
-    return mp_obj_new_str_from_vstr(&mp_type_str, &vstr);
+    return mp_obj_new_str_from_vstr(&vstr);
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_socket_inet_ntop_obj, mod_socket_inet_ntop);
 
diff --git a/ports/zephyr/modusocket.c b/ports/zephyr/modusocket.c
index 2b6adf4773343..17cf9babd3333 100644
--- a/ports/zephyr/modusocket.c
+++ b/ports/zephyr/modusocket.c
@@ -289,7 +289,7 @@ STATIC mp_obj_t socket_recv(mp_obj_t self_in, mp_obj_t len_in) {
     }
 
     vstr.len = len;
-    return mp_obj_new_str_from_vstr(&mp_type_bytes, &vstr);
+    return mp_obj_new_bytes_from_vstr(&vstr);
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_2(socket_recv_obj, socket_recv);
 
diff --git a/py/modbuiltins.c b/py/modbuiltins.c
index f3caccbc83e16..2459edda13cd3 100644
--- a/py/modbuiltins.c
+++ b/py/modbuiltins.c
@@ -250,7 +250,7 @@ STATIC mp_obj_t mp_builtin_input(size_t n_args, const mp_obj_t *args) {
     if (line.len == 0 && ret == CHAR_CTRL_D) {
         mp_raise_type(&mp_type_EOFError);
     }
-    return mp_obj_new_str_from_vstr(&mp_type_str, &line);
+    return mp_obj_new_str_from_vstr(&line);
 }
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_builtin_input_obj, 0, 1, mp_builtin_input);
 
@@ -467,7 +467,7 @@ STATIC mp_obj_t mp_builtin_repr(mp_obj_t o_in) {
     mp_print_t print;
     vstr_init_print(&vstr, 16, &print);
     mp_obj_print_helper(&print, o_in, PRINT_REPR);
-    return mp_obj_new_str_from_vstr(&mp_type_str, &vstr);
+    return mp_obj_new_str_from_vstr(&vstr);
 }
 MP_DEFINE_CONST_FUN_OBJ_1(mp_builtin_repr_obj, mp_builtin_repr);
 
diff --git a/py/modstruct.c b/py/modstruct.c
index 69c7279e370e6..ec86d4b9c2976 100644
--- a/py/modstruct.c
+++ b/py/modstruct.c
@@ -220,7 +220,7 @@ STATIC mp_obj_t struct_pack(size_t n_args, const mp_obj_t *args) {
     byte *p = (byte *)vstr.buf;
     memset(p, 0, size);
     struct_pack_into_internal(args[0], p, n_args - 1, &args[1]);
-    return mp_obj_new_str_from_vstr(&mp_type_bytes, &vstr);
+    return mp_obj_new_bytes_from_vstr(&vstr);
 }
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(struct_pack_obj, 1, MP_OBJ_FUN_ARGS_MAX, struct_pack);
 
diff --git a/py/obj.h b/py/obj.h
index 645fae79f5665..d171e0fe620e3 100644
--- a/py/obj.h
+++ b/py/obj.h
@@ -791,7 +791,8 @@ mp_obj_t mp_obj_new_int_from_ll(long long val); // this must return a multi-prec
 mp_obj_t mp_obj_new_int_from_ull(unsigned long long val); // this must return a multi-precision integer object (or raise an overflow exception)
 mp_obj_t mp_obj_new_str(const char *data, size_t len);
 mp_obj_t mp_obj_new_str_via_qstr(const char *data, size_t len);
-mp_obj_t mp_obj_new_str_from_vstr(const mp_obj_type_t *type, vstr_t *vstr);
+mp_obj_t mp_obj_new_str_from_vstr(vstr_t *vstr);
+mp_obj_t mp_obj_new_bytes_from_vstr(vstr_t *vstr);
 mp_obj_t mp_obj_new_bytes(const byte *data, size_t len);
 mp_obj_t mp_obj_new_bytearray(size_t n, const void *items);
 mp_obj_t mp_obj_new_bytearray_by_ref(size_t n, void *items);
diff --git a/py/objint.c b/py/objint.c
index 740e7ea948df8..645b26996689c 100644
--- a/py/objint.c
+++ b/py/objint.c
@@ -446,7 +446,7 @@ STATIC mp_obj_t int_to_bytes(size_t n_args, const mp_obj_t *args) {
         mp_binary_set_int(l, big_endian, data + (big_endian ? (len - l) : 0), val);
     }
 
-    return mp_obj_new_str_from_vstr(&mp_type_bytes, &vstr);
+    return mp_obj_new_bytes_from_vstr(&vstr);
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(int_to_bytes_obj, 3, 4, int_to_bytes);
 
diff --git a/py/objstr.c b/py/objstr.c
index 45dbb9b3ebde3..69745a2f586ac 100644
--- a/py/objstr.c
+++ b/py/objstr.c
@@ -41,6 +41,8 @@ STATIC mp_obj_t str_modulo_format(mp_obj_t pattern, size_t n_args, const mp_obj_
 STATIC mp_obj_t mp_obj_new_bytes_iterator(mp_obj_t str, mp_obj_iter_buf_t *iter_buf);
 STATIC NORETURN void bad_implicit_conversion(mp_obj_t self_in);
 
+STATIC mp_obj_t mp_obj_new_str_type_from_vstr(const mp_obj_type_t *type, vstr_t *vstr);
+
 STATIC void str_check_arg_type(const mp_obj_type_t *self_type, const mp_obj_t arg) {
     // String operations generally need the args type to match the object they're called on,
     // e.g. str.find(str), byte.startswith(byte)
@@ -170,7 +172,7 @@ mp_obj_t mp_obj_str_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_
             mp_print_t print;
             vstr_init_print(&vstr, 16, &print);
             mp_obj_print_helper(&print, args[0], PRINT_STR);
-            return mp_obj_new_str_from_vstr(type, &vstr);
+            return mp_obj_new_str_type_from_vstr(type, &vstr);
         }
 
         default: // 2 or 3 args
@@ -256,7 +258,7 @@ STATIC mp_obj_t bytes_make_new(const mp_obj_type_t *type_in, size_t n_args, size
         vstr_t vstr;
         vstr_init_len(&vstr, len);
         memset(vstr.buf, 0, len);
-        return mp_obj_new_str_from_vstr(&mp_type_bytes, &vstr);
+        return mp_obj_new_bytes_from_vstr(&vstr);
     }
 
     // check if argument has the buffer protocol
@@ -288,7 +290,7 @@ STATIC mp_obj_t bytes_make_new(const mp_obj_type_t *type_in, size_t n_args, size
         vstr_add_byte(&vstr, val);
     }
 
-    return mp_obj_new_str_from_vstr(&mp_type_bytes, &vstr);
+    return mp_obj_new_bytes_from_vstr(&vstr);
 
 wrong_args:
     mp_raise_TypeError(MP_ERROR_TEXT("wrong number of arguments"));
@@ -363,7 +365,7 @@ mp_obj_t mp_obj_str_binary_op(mp_binary_op_t op, mp_obj_t lhs_in, mp_obj_t rhs_i
         vstr_t vstr;
         vstr_init_len(&vstr, lhs_len * n);
         mp_seq_multiply(lhs_data, sizeof(*lhs_data), lhs_len, n, vstr.buf);
-        return mp_obj_new_str_from_vstr(lhs_type, &vstr);
+        return mp_obj_new_str_type_from_vstr(lhs_type, &vstr);
     }
 
     // From now on all operations allow:
@@ -414,7 +416,7 @@ mp_obj_t mp_obj_str_binary_op(mp_binary_op_t op, mp_obj_t lhs_in, mp_obj_t rhs_i
             vstr_init_len(&vstr, lhs_len + rhs_len);
             memcpy(vstr.buf, lhs_data, lhs_len);
             memcpy(vstr.buf + lhs_len, rhs_data, rhs_len);
-            return mp_obj_new_str_from_vstr(lhs_type, &vstr);
+            return mp_obj_new_str_type_from_vstr(lhs_type, &vstr);
         }
 
         case MP_BINARY_OP_CONTAINS:
@@ -528,7 +530,7 @@ STATIC mp_obj_t str_join(mp_obj_t self_in, mp_obj_t arg) {
     }
 
     // return joined string
-    return mp_obj_new_str_from_vstr(ret_type, &vstr);
+    return mp_obj_new_str_type_from_vstr(ret_type, &vstr);
 }
 MP_DEFINE_CONST_FUN_OBJ_2(str_join_obj, str_join);
 
@@ -918,7 +920,7 @@ STATIC mp_obj_t str_center(mp_obj_t str_in, mp_obj_t width_in) {
     memset(vstr.buf, ' ', width);
     int left = (width - str_len) / 2;
     memcpy(vstr.buf + left, str, str_len);
-    return mp_obj_new_str_from_vstr(mp_obj_get_type(str_in), &vstr);
+    return mp_obj_new_str_type_from_vstr(mp_obj_get_type(str_in), &vstr);
 }
 MP_DEFINE_CONST_FUN_OBJ_2(str_center_obj, str_center);
 #endif
@@ -1144,7 +1146,7 @@ STATIC vstr_t mp_obj_str_format_helper(const char *str, const char *top, int *ar
             mp_print_t arg_print;
             vstr_init_print(&arg_vstr, 16, &arg_print);
             mp_obj_print_helper(&arg_print, arg, print_kind);
-            arg = mp_obj_new_str_from_vstr(&mp_type_str, &arg_vstr);
+            arg = mp_obj_new_str_type_from_vstr(&mp_type_str, &arg_vstr);
         }
 
         char fill = '\0';
@@ -1429,7 +1431,7 @@ mp_obj_t mp_obj_str_format(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs
     GET_STR_DATA_LEN(args[0], str, len);
     int arg_i = 0;
     vstr_t vstr = mp_obj_str_format_helper((const char *)str, (const char *)str + len, &arg_i, n_args, args, kwargs);
-    return mp_obj_new_str_from_vstr(mp_obj_get_type(args[0]), &vstr);
+    return mp_obj_new_str_type_from_vstr(mp_obj_get_type(args[0]), &vstr);
 }
 MP_DEFINE_CONST_FUN_OBJ_KW(str_format_obj, 1, mp_obj_str_format);
 
@@ -1634,7 +1636,7 @@ STATIC mp_obj_t str_modulo_format(mp_obj_t pattern, size_t n_args, const mp_obj_
         mp_raise_TypeError(MP_ERROR_TEXT("format string didn't convert all arguments"));
     }
 
-    return mp_obj_new_str_from_vstr(is_bytes ? &mp_type_bytes : &mp_type_str, &vstr);
+    return mp_obj_new_str_type_from_vstr(is_bytes ? &mp_type_bytes : &mp_type_str, &vstr);
 }
 #endif
 
@@ -1737,7 +1739,7 @@ STATIC mp_obj_t str_replace(size_t n_args, const mp_obj_t *args) {
         }
     }
 
-    return mp_obj_new_str_from_vstr(self_type, &vstr);
+    return mp_obj_new_str_type_from_vstr(self_type, &vstr);
 }
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_replace_obj, 3, 4, str_replace);
 
@@ -1849,7 +1851,7 @@ STATIC mp_obj_t str_caseconv(unichar (*op)(unichar), mp_obj_t self_in) {
     for (size_t i = 0; i < self_len; i++) {
         *data++ = op(*self_data++);
     }
-    return mp_obj_new_str_from_vstr(mp_obj_get_type(self_in), &vstr);
+    return mp_obj_new_str_type_from_vstr(mp_obj_get_type(self_in), &vstr);
 }
 
 STATIC mp_obj_t str_lower(mp_obj_t self_in) {
@@ -1988,7 +1990,7 @@ mp_obj_t mp_obj_bytes_hex(size_t n_args, const mp_obj_t *args, const mp_obj_type
             *out++ = *sep;
         }
     }
-    return mp_obj_new_str_from_vstr(type, &vstr);
+    return mp_obj_new_str_type_from_vstr(type, &vstr);
 }
 
 mp_obj_t mp_obj_bytes_fromhex(mp_obj_t type_in, mp_obj_t data) {
@@ -2016,7 +2018,7 @@ mp_obj_t mp_obj_bytes_fromhex(mp_obj_t type_in, mp_obj_t data) {
             hex_byte = 0;
         }
     }
-    return mp_obj_new_str_from_vstr(MP_OBJ_TO_PTR(type_in), &vstr);
+    return mp_obj_new_str_type_from_vstr(MP_OBJ_TO_PTR(type_in), &vstr);
 }
 
 STATIC mp_obj_t bytes_hex_as_str(size_t n_args, const mp_obj_t *args) {
@@ -2213,7 +2215,7 @@ mp_obj_t mp_obj_new_str_via_qstr(const char *data, size_t len) {
 // Create a str/bytes object from the given vstr.  The vstr buffer is resized to
 // the exact length required and then reused for the str/bytes object.  The vstr
 // is cleared and can safely be passed to vstr_free if it was heap allocated.
-mp_obj_t mp_obj_new_str_from_vstr(const mp_obj_type_t *type, vstr_t *vstr) {
+STATIC mp_obj_t mp_obj_new_str_type_from_vstr(const mp_obj_type_t *type, vstr_t *vstr) {
     // if not a bytes object, look if a qstr with this data already exists
     if (type == &mp_type_str) {
         qstr q = qstr_find_strn(vstr->buf, vstr->len);
@@ -2245,6 +2247,14 @@ mp_obj_t mp_obj_new_str_from_vstr(const mp_obj_type_t *type, vstr_t *vstr) {
     return MP_OBJ_FROM_PTR(o);
 }
 
+mp_obj_t mp_obj_new_str_from_vstr(vstr_t *vstr) {
+    return mp_obj_new_str_type_from_vstr(&mp_type_str, vstr);
+}
+
+mp_obj_t mp_obj_new_bytes_from_vstr(vstr_t *vstr) {
+    return mp_obj_new_str_type_from_vstr(&mp_type_bytes, vstr);
+}
+
 mp_obj_t mp_obj_new_str(const char *data, size_t len) {
     qstr q = qstr_find_strn(data, len);
     if (q != MP_QSTRnull) {
diff --git a/py/parsenum.c b/py/parsenum.c
index 19cc719201400..79765f84f64fb 100644
--- a/py/parsenum.c
+++ b/py/parsenum.c
@@ -160,7 +160,7 @@ mp_obj_t mp_parse_num_integer(const char *restrict str_, size_t len, int base, m
         mp_printf(&print, "invalid syntax for integer with base %d: ", base);
         mp_str_print_quoted(&print, str_val_start, top - str_val_start, true);
         mp_obj_t exc = mp_obj_new_exception_arg1(&mp_type_ValueError,
-            mp_obj_new_str_from_vstr(&mp_type_str, &vstr));
+            mp_obj_new_str_from_vstr(&vstr));
         raise_exc(exc, lex);
         #endif
     }
diff --git a/py/persistentcode.c b/py/persistentcode.c
index a8e74295504e0..995dedb4569d0 100644
--- a/py/persistentcode.c
+++ b/py/persistentcode.c
@@ -202,7 +202,11 @@ STATIC mp_obj_t load_obj(mp_reader_t *reader) {
         read_bytes(reader, (byte *)vstr.buf, len);
         if (obj_type == MP_PERSISTENT_OBJ_STR || obj_type == MP_PERSISTENT_OBJ_BYTES) {
             read_byte(reader); // skip null terminator
-            return mp_obj_new_str_from_vstr(obj_type == MP_PERSISTENT_OBJ_STR ? &mp_type_str : &mp_type_bytes, &vstr);
+            if (obj_type == MP_PERSISTENT_OBJ_STR) {
+                return mp_obj_new_str_from_vstr(&vstr);
+            } else {
+                return mp_obj_new_bytes_from_vstr(&vstr);
+            }
         } else if (obj_type == MP_PERSISTENT_OBJ_INT) {
             return mp_parse_num_integer(vstr.buf, vstr.len, 10, NULL);
         } else {
diff --git a/py/stream.c b/py/stream.c
index dce64a44dbeda..87bed38f6778f 100644
--- a/py/stream.c
+++ b/py/stream.c
@@ -40,8 +40,6 @@
 
 STATIC mp_obj_t stream_readall(mp_obj_t self_in);
 
-#define STREAM_CONTENT_TYPE(stream) (((stream)->is_text) ? &mp_type_str : &mp_type_bytes)
-
 // Returns error condition in *errcode, if non-zero, return value is number of bytes written
 // before error condition occurred. If *errcode == 0, returns total bytes written (which will
 // be equal to input size).
@@ -190,7 +188,7 @@ STATIC mp_obj_t stream_read_generic(size_t n_args, const mp_obj_t *args, byte fl
             }
         }
 
-        return mp_obj_new_str_from_vstr(&mp_type_str, &vstr);
+        return mp_obj_new_str_from_vstr(&vstr);
     }
     #endif
 
@@ -211,7 +209,11 @@ STATIC mp_obj_t stream_read_generic(size_t n_args, const mp_obj_t *args, byte fl
         mp_raise_OSError(error);
     } else {
         vstr.len = out_sz;
-        return mp_obj_new_str_from_vstr(STREAM_CONTENT_TYPE(stream_p), &vstr);
+        if (stream_p->is_text) {
+            return mp_obj_new_str_from_vstr(&vstr);
+        } else {
+            return mp_obj_new_bytes_from_vstr(&vstr);
+        }
     }
 }
 
@@ -337,7 +339,11 @@ STATIC mp_obj_t stream_readall(mp_obj_t self_in) {
     }
 
     vstr.len = total_size;
-    return mp_obj_new_str_from_vstr(STREAM_CONTENT_TYPE(stream_p), &vstr);
+    if (stream_p->is_text) {
+        return mp_obj_new_str_from_vstr(&vstr);
+    } else {
+        return mp_obj_new_bytes_from_vstr(&vstr);
+    }
 }
 
 // Unbuffered, inefficient implementation of readline() for raw I/O files.
@@ -390,7 +396,11 @@ STATIC mp_obj_t stream_unbuffered_readline(size_t n_args, const mp_obj_t *args)
         }
     }
 
-    return mp_obj_new_str_from_vstr(STREAM_CONTENT_TYPE(stream_p), &vstr);
+    if (stream_p->is_text) {
+        return mp_obj_new_str_from_vstr(&vstr);
+    } else {
+        return mp_obj_new_bytes_from_vstr(&vstr);
+    }
 }
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_stream_unbuffered_readline_obj, 1, 2, stream_unbuffered_readline);
 

From 88864587f5af292d7f86aceb6bf40e8331e9a8d6 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Fri, 26 Aug 2022 12:54:53 +1000
Subject: [PATCH 2534/3533] py/objstr: Always ensure mp_obj_str_from_vstr is
 unicode-safe.

Now that we have `mp_obj_new_str_type_from_vstr` (private helper used by
objstr.c) split from the public API (`mp_obj_new_str_from_vstr`), we can
enforce a unicode check at the public API without incurring a performance
cost on the various objstr.c methods (which are already working on known
unicode-safe strings).

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 py/objstr.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/py/objstr.c b/py/objstr.c
index 69745a2f586ac..ab1229ad66a6c 100644
--- a/py/objstr.c
+++ b/py/objstr.c
@@ -2248,6 +2248,11 @@ STATIC mp_obj_t mp_obj_new_str_type_from_vstr(const mp_obj_type_t *type, vstr_t
 }
 
 mp_obj_t mp_obj_new_str_from_vstr(vstr_t *vstr) {
+    #if MICROPY_PY_BUILTINS_STR_UNICODE && MICROPY_PY_BUILTINS_STR_UNICODE_CHECK
+    if (!utf8_check((byte *)vstr->buf, vstr->len)) {
+        mp_raise_msg(&mp_type_UnicodeError, NULL);
+    }
+    #endif // MICROPY_PY_BUILTINS_STR_UNICODE && MICROPY_PY_BUILTINS_STR_UNICODE_CHECK
     return mp_obj_new_str_type_from_vstr(&mp_type_str, vstr);
 }
 

From 3a910b15650636efc58bce48cc1bfa0debfd375c Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Tue, 23 Aug 2022 18:35:37 +1000
Subject: [PATCH 2535/3533] py/objstr: Optimise mp_obj_new_str_from_vstr for
 known-safe strings.

The new `mp_obj_new_str_from_utf8_vstr` can be used when you know you
already have a unicode-safe string.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 extmod/modujson.c       | 4 ++--
 extmod/modure.c         | 2 +-
 ports/unix/modusocket.c | 2 +-
 py/modbuiltins.c        | 2 +-
 py/obj.h                | 5 +++++
 py/objstr.c             | 7 +++++++
 py/parsenum.c           | 2 +-
 py/persistentcode.c     | 2 +-
 8 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/extmod/modujson.c b/extmod/modujson.c
index 57c50deec028c..4e992e2245d18 100644
--- a/extmod/modujson.c
+++ b/extmod/modujson.c
@@ -67,7 +67,7 @@ STATIC mp_obj_t mod_ujson_dump_helper(size_t n_args, const mp_obj_t *pos_args, m
         vstr_t vstr;
         vstr_init_print(&vstr, 8, &print_ext.base);
         mp_obj_print_helper(&print_ext.base, pos_args[0], PRINT_JSON);
-        return mp_obj_new_str_from_vstr(&vstr);
+        return mp_obj_new_str_from_utf8_vstr(&vstr);
     } else {
         // dump(obj, stream)
         print_ext.base.data = MP_OBJ_TO_PTR(pos_args[1]);
@@ -103,7 +103,7 @@ STATIC mp_obj_t mod_ujson_dumps(mp_obj_t obj) {
     mp_print_t print;
     vstr_init_print(&vstr, 8, &print);
     mp_obj_print_helper(&print, obj, PRINT_JSON);
-    return mp_obj_new_str_from_vstr(&vstr);
+    return mp_obj_new_str_from_utf8_vstr(&vstr);
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_ujson_dumps_obj, mod_ujson_dumps);
 
diff --git a/extmod/modure.c b/extmod/modure.c
index 59fbfddbf24a0..799fef13b1bdb 100644
--- a/extmod/modure.c
+++ b/extmod/modure.c
@@ -373,7 +373,7 @@ STATIC mp_obj_t re_sub_helper(size_t n_args, const mp_obj_t *args) {
     vstr_add_strn(&vstr_return, subj.begin, subj.end - subj.begin);
 
     if (mp_obj_get_type(where) == &mp_type_str) {
-        return mp_obj_new_str_from_vstr(&vstr_return);
+        return mp_obj_new_str_from_utf8_vstr(&vstr_return);
     } else {
         return mp_obj_new_bytes_from_vstr(&vstr_return);
     }
diff --git a/ports/unix/modusocket.c b/ports/unix/modusocket.c
index 88e7675a9278f..72c70d1750b53 100644
--- a/ports/unix/modusocket.c
+++ b/ports/unix/modusocket.c
@@ -559,7 +559,7 @@ STATIC mp_obj_t mod_socket_inet_ntop(mp_obj_t family_in, mp_obj_t binaddr_in) {
         mp_raise_OSError(errno);
     }
     vstr.len = strlen(vstr.buf);
-    return mp_obj_new_str_from_vstr(&vstr);
+    return mp_obj_new_str_from_utf8_vstr(&vstr);
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_socket_inet_ntop_obj, mod_socket_inet_ntop);
 
diff --git a/py/modbuiltins.c b/py/modbuiltins.c
index 2459edda13cd3..f74db95cf5a54 100644
--- a/py/modbuiltins.c
+++ b/py/modbuiltins.c
@@ -467,7 +467,7 @@ STATIC mp_obj_t mp_builtin_repr(mp_obj_t o_in) {
     mp_print_t print;
     vstr_init_print(&vstr, 16, &print);
     mp_obj_print_helper(&print, o_in, PRINT_REPR);
-    return mp_obj_new_str_from_vstr(&vstr);
+    return mp_obj_new_str_from_utf8_vstr(&vstr);
 }
 MP_DEFINE_CONST_FUN_OBJ_1(mp_builtin_repr_obj, mp_builtin_repr);
 
diff --git a/py/obj.h b/py/obj.h
index d171e0fe620e3..0b0a9692ed53a 100644
--- a/py/obj.h
+++ b/py/obj.h
@@ -792,6 +792,11 @@ mp_obj_t mp_obj_new_int_from_ull(unsigned long long val); // this must return a
 mp_obj_t mp_obj_new_str(const char *data, size_t len);
 mp_obj_t mp_obj_new_str_via_qstr(const char *data, size_t len);
 mp_obj_t mp_obj_new_str_from_vstr(vstr_t *vstr);
+#if MICROPY_PY_BUILTINS_STR_UNICODE && MICROPY_PY_BUILTINS_STR_UNICODE_CHECK
+mp_obj_t mp_obj_new_str_from_utf8_vstr(vstr_t *vstr); // only use when vstr is already known to be utf-8 encoded
+#else
+#define mp_obj_new_str_from_utf8_vstr mp_obj_new_str_from_vstr
+#endif
 mp_obj_t mp_obj_new_bytes_from_vstr(vstr_t *vstr);
 mp_obj_t mp_obj_new_bytes(const byte *data, size_t len);
 mp_obj_t mp_obj_new_bytearray(size_t n, const void *items);
diff --git a/py/objstr.c b/py/objstr.c
index ab1229ad66a6c..5a62237516c3d 100644
--- a/py/objstr.c
+++ b/py/objstr.c
@@ -2256,6 +2256,13 @@ mp_obj_t mp_obj_new_str_from_vstr(vstr_t *vstr) {
     return mp_obj_new_str_type_from_vstr(&mp_type_str, vstr);
 }
 
+#if MICROPY_PY_BUILTINS_STR_UNICODE && MICROPY_PY_BUILTINS_STR_UNICODE_CHECK
+mp_obj_t mp_obj_new_str_from_utf8_vstr(vstr_t *vstr) {
+    // bypasses utf8_check.
+    return mp_obj_new_str_type_from_vstr(&mp_type_str, vstr);
+}
+#endif // MICROPY_PY_BUILTINS_STR_UNICODE && MICROPY_PY_BUILTINS_STR_UNICODE_CHECK
+
 mp_obj_t mp_obj_new_bytes_from_vstr(vstr_t *vstr) {
     return mp_obj_new_str_type_from_vstr(&mp_type_bytes, vstr);
 }
diff --git a/py/parsenum.c b/py/parsenum.c
index 79765f84f64fb..d59715fdc9379 100644
--- a/py/parsenum.c
+++ b/py/parsenum.c
@@ -160,7 +160,7 @@ mp_obj_t mp_parse_num_integer(const char *restrict str_, size_t len, int base, m
         mp_printf(&print, "invalid syntax for integer with base %d: ", base);
         mp_str_print_quoted(&print, str_val_start, top - str_val_start, true);
         mp_obj_t exc = mp_obj_new_exception_arg1(&mp_type_ValueError,
-            mp_obj_new_str_from_vstr(&vstr));
+            mp_obj_new_str_from_utf8_vstr(&vstr));
         raise_exc(exc, lex);
         #endif
     }
diff --git a/py/persistentcode.c b/py/persistentcode.c
index 995dedb4569d0..82ef0c49953ff 100644
--- a/py/persistentcode.c
+++ b/py/persistentcode.c
@@ -203,7 +203,7 @@ STATIC mp_obj_t load_obj(mp_reader_t *reader) {
         if (obj_type == MP_PERSISTENT_OBJ_STR || obj_type == MP_PERSISTENT_OBJ_BYTES) {
             read_byte(reader); // skip null terminator
             if (obj_type == MP_PERSISTENT_OBJ_STR) {
-                return mp_obj_new_str_from_vstr(&vstr);
+                return mp_obj_new_str_from_utf8_vstr(&vstr);
             } else {
                 return mp_obj_new_bytes_from_vstr(&vstr);
             }

From 6c3d8d38bfbe24c3d810f89f546ac947cf0cb66d Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Wed, 24 Aug 2022 12:22:57 +1000
Subject: [PATCH 2536/3533] py/objstr: Always validate utf-8 for
 mp_obj_new_str.

All uses of this are either tiny strings or not-known-to-be-safe.

Update comments for mp_obj_new_str_copy and mp_obj_new_str_of_type.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 py/obj.h    |  8 ++++----
 py/objstr.c | 11 ++++++-----
 py/objstr.h |  4 ++--
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/py/obj.h b/py/obj.h
index 0b0a9692ed53a..e048cf0c286af 100644
--- a/py/obj.h
+++ b/py/obj.h
@@ -789,11 +789,11 @@ mp_obj_t mp_obj_new_int_from_uint(mp_uint_t value);
 mp_obj_t mp_obj_new_int_from_str_len(const char **str, size_t len, bool neg, unsigned int base);
 mp_obj_t mp_obj_new_int_from_ll(long long val); // this must return a multi-precision integer object (or raise an overflow exception)
 mp_obj_t mp_obj_new_int_from_ull(unsigned long long val); // this must return a multi-precision integer object (or raise an overflow exception)
-mp_obj_t mp_obj_new_str(const char *data, size_t len);
-mp_obj_t mp_obj_new_str_via_qstr(const char *data, size_t len);
-mp_obj_t mp_obj_new_str_from_vstr(vstr_t *vstr);
+mp_obj_t mp_obj_new_str(const char *data, size_t len); // will check utf-8 (raises UnicodeError)
+mp_obj_t mp_obj_new_str_via_qstr(const char *data, size_t len); // input data must be valid utf-8
+mp_obj_t mp_obj_new_str_from_vstr(vstr_t *vstr); // will check utf-8 (raises UnicodeError)
 #if MICROPY_PY_BUILTINS_STR_UNICODE && MICROPY_PY_BUILTINS_STR_UNICODE_CHECK
-mp_obj_t mp_obj_new_str_from_utf8_vstr(vstr_t *vstr); // only use when vstr is already known to be utf-8 encoded
+mp_obj_t mp_obj_new_str_from_utf8_vstr(vstr_t *vstr); // input data must be valid utf-8
 #else
 #define mp_obj_new_str_from_utf8_vstr mp_obj_new_str_from_vstr
 #endif
diff --git a/py/objstr.c b/py/objstr.c
index 5a62237516c3d..683d035e44090 100644
--- a/py/objstr.c
+++ b/py/objstr.c
@@ -202,11 +202,7 @@ mp_obj_t mp_obj_str_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_
             } else {
                 mp_buffer_info_t bufinfo;
                 mp_get_buffer_raise(args[0], &bufinfo, MP_BUFFER_READ);
-                #if MICROPY_PY_BUILTINS_STR_UNICODE_CHECK
-                if (!utf8_check(bufinfo.buf, bufinfo.len)) {
-                    mp_raise_msg(&mp_type_UnicodeError, NULL);
-                }
-                #endif
+                // This will utf-8 check the input.
                 return mp_obj_new_str(bufinfo.buf, bufinfo.len);
             }
     }
@@ -2268,6 +2264,11 @@ mp_obj_t mp_obj_new_bytes_from_vstr(vstr_t *vstr) {
 }
 
 mp_obj_t mp_obj_new_str(const char *data, size_t len) {
+    #if MICROPY_PY_BUILTINS_STR_UNICODE && MICROPY_PY_BUILTINS_STR_UNICODE_CHECK
+    if (!utf8_check((byte *)data, len)) {
+        mp_raise_msg(&mp_type_UnicodeError, NULL);
+    }
+    #endif
     qstr q = qstr_find_strn(data, len);
     if (q != MP_QSTRnull) {
         // qstr with this data already exists
diff --git a/py/objstr.h b/py/objstr.h
index 78441fedaf2cb..6c6735bf5efa0 100644
--- a/py/objstr.h
+++ b/py/objstr.h
@@ -88,8 +88,8 @@ mp_obj_t mp_obj_str_make_new(const mp_obj_type_t *type_in, size_t n_args, size_t
 void mp_str_print_json(const mp_print_t *print, const byte *str_data, size_t str_len);
 mp_obj_t mp_obj_str_format(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs);
 mp_obj_t mp_obj_str_split(size_t n_args, const mp_obj_t *args);
-mp_obj_t mp_obj_new_str_copy(const mp_obj_type_t *type, const byte *data, size_t len);
-mp_obj_t mp_obj_new_str_of_type(const mp_obj_type_t *type, const byte *data, size_t len);
+mp_obj_t mp_obj_new_str_copy(const mp_obj_type_t *type, const byte *data, size_t len); // for type=str, input data must be valid utf-8
+mp_obj_t mp_obj_new_str_of_type(const mp_obj_type_t *type, const byte *data, size_t len); // for type=str, will check utf-8 (raises UnicodeError)
 
 mp_obj_t mp_obj_str_binary_op(mp_binary_op_t op, mp_obj_t lhs_in, mp_obj_t rhs_in);
 mp_int_t mp_obj_str_get_buffer(mp_obj_t self_in, mp_buffer_info_t *bufinfo, mp_uint_t flags);

From bd4e45fd68e20af3f965b403e643fa5f71aa1b08 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Wed, 24 Aug 2022 12:42:45 +1000
Subject: [PATCH 2537/3533] tests/unicode: Add test for invalid utf-8 file
 contents.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 tests/unicode/data/utf-8_invalid.txt | 1 +
 tests/unicode/file_invalid.py        | 5 +++++
 2 files changed, 6 insertions(+)
 create mode 100644 tests/unicode/data/utf-8_invalid.txt
 create mode 100644 tests/unicode/file_invalid.py

diff --git a/tests/unicode/data/utf-8_invalid.txt b/tests/unicode/data/utf-8_invalid.txt
new file mode 100644
index 0000000000000..50020482bf6e9
--- /dev/null
+++ b/tests/unicode/data/utf-8_invalid.txt
@@ -0,0 +1 @@
+aaÿbb
diff --git a/tests/unicode/file_invalid.py b/tests/unicode/file_invalid.py
new file mode 100644
index 0000000000000..3f7f1840629f8
--- /dev/null
+++ b/tests/unicode/file_invalid.py
@@ -0,0 +1,5 @@
+try:
+    f = open("unicode/data/utf-8_invalid.txt", encoding="utf-8")
+    f.read()
+except UnicodeError:
+    print("UnicodeError")

From d521899e18c305a4cf3870449e3dd12308f7a806 Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Wed, 17 Aug 2022 08:43:17 +1000
Subject: [PATCH 2538/3533] py/persistentcode: Clarify ValueError when native
 emitter disabled.

---
 py/persistentcode.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/py/persistentcode.c b/py/persistentcode.c
index 82ef0c49953ff..1b1741f2614e2 100644
--- a/py/persistentcode.c
+++ b/py/persistentcode.c
@@ -402,7 +402,13 @@ mp_compiled_module_t mp_raw_code_load(mp_reader_t *reader, mp_module_context_t *
     if (MPY_FEATURE_DECODE_ARCH(header[2]) != MP_NATIVE_ARCH_NONE) {
         byte arch = MPY_FEATURE_DECODE_ARCH(header[2]);
         if (!MPY_FEATURE_ARCH_TEST(arch)) {
-            mp_raise_ValueError(MP_ERROR_TEXT("incompatible .mpy arch"));
+            if (MPY_FEATURE_ARCH_TEST(MP_NATIVE_ARCH_NONE)) {
+                // On supported ports this can be resolved by enabling feature, eg
+                // mpconfigboard.h: MICROPY_EMIT_THUMB (1)
+                mp_raise_ValueError(MP_ERROR_TEXT("native code in .mpy unsupported"));
+            } else {
+                mp_raise_ValueError(MP_ERROR_TEXT("incompatible .mpy arch"));
+            }
         }
     }
 

From 9a826e0f24add1b7e719e915e0d4dde1c14b416e Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 26 Jul 2022 18:48:06 +1000
Subject: [PATCH 2539/3533] lib/lwip: Update lwIP to v2.1.3, tag
 STABLE-2_1_3_RELEASE.

There don't seem to be many changes going from v2.1.2 to v2.1.3 of lwIP.
Mostly they are:
- IPv6 fixes and improvements
- changes to apps and other code that MicroPython doesn't use
- comments and tests
- minor bug fixes

In particular there doesn't look to be any change to the API of any
function used by MicroPython.

Network multi tests pass on PYBD_SF2 and PYBD_SF6.  PYBD_SF2, PYBD_SF6 and
PICO_W have unchanged iperf3 performance.  Similar results for networking
on the mimxrt port.

Signed-off-by: Damien George <damien@micropython.org>
---
 lib/lwip | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/lwip b/lib/lwip
index 159e31b689577..6ca936f6b588c 160000
--- a/lib/lwip
+++ b/lib/lwip
@@ -1 +1 @@
-Subproject commit 159e31b689577dbf69cf0683bbaffbd71fa5ee10
+Subproject commit 6ca936f6b588cee702c638eee75c2436e6cf75de

From 730e97509117ea9c8b527857c25f8a2bf04ecd86 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 30 Aug 2022 11:14:32 +1000
Subject: [PATCH 2540/3533] esp32/boards: Merge manifest_release modules into
 standard manifest.

Having two separate manifests is confusing.  It's simpler to have the daily
builds use the same configuration as the stable, release builds.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/boards/manifest.py         | 6 ++++++
 ports/esp32/boards/manifest_release.py | 7 -------
 tools/autobuild/build-boards.sh        | 7 +------
 3 files changed, 7 insertions(+), 13 deletions(-)
 delete mode 100644 ports/esp32/boards/manifest_release.py

diff --git a/ports/esp32/boards/manifest.py b/ports/esp32/boards/manifest.py
index f0ed38b515c71..23252442ea460 100644
--- a/ports/esp32/boards/manifest.py
+++ b/ports/esp32/boards/manifest.py
@@ -6,3 +6,9 @@
 include("$(MPY_DIR)/extmod/uasyncio/manifest.py")
 include("$(MPY_DIR)/extmod/webrepl/manifest.py")
 include("$(MPY_DIR)/drivers/neopixel/manifest.py")
+
+# Freeze some micropython-lib modules.
+freeze("$(MPY_LIB_DIR)/python-ecosys/urequests", "urequests.py")
+freeze("$(MPY_LIB_DIR)/micropython/upysh", "upysh.py")
+freeze("$(MPY_LIB_DIR)/micropython/umqtt.simple", "umqtt/simple.py")
+freeze("$(MPY_LIB_DIR)/micropython/umqtt.robust", "umqtt/robust.py")
diff --git a/ports/esp32/boards/manifest_release.py b/ports/esp32/boards/manifest_release.py
deleted file mode 100644
index 8b9bcde6ffa77..0000000000000
--- a/ports/esp32/boards/manifest_release.py
+++ /dev/null
@@ -1,7 +0,0 @@
-include("manifest.py")
-
-freeze("$(MPY_LIB_DIR)/python-ecosys/urequests", "urequests.py")
-
-freeze("$(MPY_LIB_DIR)/micropython/upysh", "upysh.py")
-freeze("$(MPY_LIB_DIR)/micropython/umqtt.simple", "umqtt/simple.py")
-freeze("$(MPY_LIB_DIR)/micropython/umqtt.robust", "umqtt/robust.py")
diff --git a/tools/autobuild/build-boards.sh b/tools/autobuild/build-boards.sh
index b3d2f8c4c55aa..48c7b81841aa6 100755
--- a/tools/autobuild/build-boards.sh
+++ b/tools/autobuild/build-boards.sh
@@ -83,12 +83,7 @@ function build_esp32_boards {
         if idf.py --version | grep -q v4.2; then
             if [ $mcu = esp32 ]; then
                 # build standard esp32-based boards with IDF v4.2
-                if echo $board_json | grep -q GENERIC; then
-                    # traditionally, GENERIC and GENERIC_SPIRAM boards used manifest_release.py
-                    MICROPY_AUTOBUILD_MAKE="$MICROPY_AUTOBUILD_MAKE FROZEN_MANIFEST=$(pwd)/boards/manifest_release.py" build_board $board_json $fw_tag $dest_dir bin elf map
-                else
-                    build_board $board_json $fw_tag $dest_dir bin elf map
-                fi
+                build_board $board_json $fw_tag $dest_dir bin elf map
             fi
         else
             if [ $mcu != esp32 ]; then

From d108fc9c4793e1846b2ddfad925fb17bbc44cd51 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 30 Aug 2022 11:18:08 +1000
Subject: [PATCH 2541/3533] esp32/machine_sdcard: Free SPI bus when deiniting
 SD card.

So that everything is reset and the SD card can be created again after
calling SDCard.deinit() (and after a soft reset).

Fixes issue #8949.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/machine_sdcard.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ports/esp32/machine_sdcard.c b/ports/esp32/machine_sdcard.c
index 82c2e6cd4e320..3f94356adbb4c 100644
--- a/ports/esp32/machine_sdcard.c
+++ b/ports/esp32/machine_sdcard.c
@@ -283,6 +283,10 @@ STATIC mp_obj_t sd_deinit(mp_obj_t self_in) {
         {
             self->host.deinit();
         }
+        if (self->host.flags & SDMMC_HOST_FLAG_SPI) {
+            // SD card used a (dedicated) SPI bus, so free that SPI bus.
+            spi_bus_free(self->host.slot);
+        }
         self->flags &= ~SDCARD_CARD_FLAGS_HOST_INIT_DONE;
     }
 

From 64c62f8cf162e56cf4c6049f4a65c3d5e18556ae Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Wed, 24 Aug 2022 23:47:58 +1000
Subject: [PATCH 2542/3533] README: Simplify and update, and move unix section
 to separate file.

Changes are:
- Remove unix- and stm32-specific sections (move unix to its own
  README.md), stm32 was duplicated.
- Add links to GitHub Discussions and Discord.
- Update information about the project.
- Add a getting started section.
- Explain `make submodules`.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
Signed-off-by: Damien George <damien@micropython.org>
---
 README.md            | 262 ++++++++++++++++++-------------------------
 ports/unix/README.md |  70 ++++++++++++
 2 files changed, 181 insertions(+), 151 deletions(-)
 create mode 100644 ports/unix/README.md

diff --git a/README.md b/README.md
index 6941102f0ac48..6482899b251d9 100644
--- a/README.md
+++ b/README.md
@@ -15,174 +15,134 @@ code-base, including project-wide name changes and API changes.
 
 MicroPython implements the entire Python 3.4 syntax (including exceptions,
 `with`, `yield from`, etc., and additionally `async`/`await` keywords from
-Python 3.5). The following core datatypes are provided: `str` (including
-basic Unicode support), `bytes`, `bytearray`, `tuple`, `list`, `dict`, `set`,
-`frozenset`, `array.array`, `collections.namedtuple`, classes and instances.
-Builtin modules include `sys`, `time`, and `struct`, etc. Select ports have
-support for `_thread` module (multithreading). Note that only a subset of
-Python 3 functionality is implemented for the data types and modules.
-
-MicroPython can execute scripts in textual source form or from precompiled
-bytecode, in both cases either from an on-device filesystem or "frozen" into
-the MicroPython executable.
-
-See the repository http://github.com/micropython/pyboard for the MicroPython
-board (PyBoard), the officially supported reference electronic circuit board.
-
-Major components in this repository:
-- py/ -- the core Python implementation, including compiler, runtime, and
+Python 3.5 and some select features from later versions). The following core
+datatypes are provided: `str`(including basic Unicode support), `bytes`,
+`bytearray`, `tuple`, `list`, `dict`, `set`, `frozenset`, `array.array`,
+`collections.namedtuple`, classes and instances. Builtin modules include
+`os`, `sys`, `time`, `re`, and `struct`, etc. Select ports have support for
+`_thread` module (multithreading), `socket` and `ssl` for networking, and
+`asyncio`. Note that only a subset of Python 3 functionality is implemented
+for the data types and modules.
+
+MicroPython can execute scripts in textual source form (.py files) or from
+precompiled bytecode (.mpy files), in both cases either from an on-device
+filesystem or "frozen" into the MicroPython executable.
+
+MicroPython also provides a set of MicroPython-specific modules to access
+hardware-specific functionality and peripherals such as GPIO, Timers, ADC,
+DAC, PWM, SPI, I2C, CAN, Bluetooth, and USB.
+
+Getting started
+---------------
+
+See the [online documentation](https://docs.micropython.org/) for API
+references and information about using MicroPython and information about how
+it is implemented.
+
+We use [GitHub Discussions](https://github.com/micropython/micropython/discussions)
+as our forum, and [Discord](https://discord.gg/RB8HZSAExQ) for chat. These
+are great places to ask questions and advice from the community or to discuss your
+MicroPython-based projects.
+
+For bugs and feature requests, please [raise an issue](https://github.com/micropython/micropython/issues/new/choose)
+and follow the templates there.
+
+For information about the [MicroPython pyboard](https://store.micropython.org/pyb-features),
+the officially supported board from the
+[original Kickstarter campaign](https://www.kickstarter.com/projects/214379695/micro-python-python-for-microcontrollers),
+see the [schematics and pinouts](http://github.com/micropython/pyboard) and
+[documentation](https://docs.micropython.org/en/latest/pyboard/quickref.html).
+
+Contributing
+------------
+
+MicroPython is an open-source project and welcomes contributions. To be
+productive, please be sure to follow the
+[Contributors' Guidelines](https://github.com/micropython/micropython/wiki/ContributorGuidelines)
+and the [Code Conventions](https://github.com/micropython/micropython/blob/master/CODECONVENTIONS.md).
+Note that MicroPython is licenced under the MIT license, and all contributions
+should follow this license.
+
+About this repository
+---------------------
+
+This repository contains the following components:
+- [py/](py/) -- the core Python implementation, including compiler, runtime, and
   core library.
-- mpy-cross/ -- the MicroPython cross-compiler which is used to turn scripts
+- [mpy-cross/](mpy-cross/) -- the MicroPython cross-compiler which is used to turn scripts
   into precompiled bytecode.
-- ports/unix/ -- a version of MicroPython that runs on Unix.
-- ports/stm32/ -- a version of MicroPython that runs on the PyBoard and similar
-  STM32 boards (using ST's Cube HAL drivers).
-- ports/minimal/ -- a minimal MicroPython port. Start with this if you want
-  to port MicroPython to another microcontroller.
-- tests/ -- test framework and test scripts.
-- docs/ -- user documentation in Sphinx reStructuredText format. Rendered
-  HTML documentation is available at http://docs.micropython.org.
-
-Additional components:
-- ports/bare-arm/ -- a bare minimum version of MicroPython for ARM MCUs. Used
-  mostly to control code size.
-- ports/teensy/ -- a version of MicroPython that runs on the Teensy 3.1
-  (preliminary but functional).
-- ports/pic16bit/ -- a version of MicroPython for 16-bit PIC microcontrollers.
-- ports/cc3200/ -- a version of MicroPython that runs on the CC3200 from TI.
-- ports/esp8266/ -- a version of MicroPython that runs on Espressif's ESP8266 SoC.
-- ports/esp32/ -- a version of MicroPython that runs on Espressif's ESP32 SoC.
-- ports/nrf/ -- a version of MicroPython that runs on Nordic's nRF51 and nRF52 MCUs.
-- extmod/ -- additional (non-core) modules implemented in C.
-- tools/ -- various tools, including the pyboard.py module.
-- examples/ -- a few example Python scripts.
-
-The subdirectories above may include READMEs with additional info.
+- [ports/](ports/) -- platform-specific code for the various ports and architectures that MicroPython runs on.
+- [lib/](lib/) -- submodules for external dependencies.
+- [tests/](tests/) -- test framework and test scripts.
+- [docs/](docs/) -- user documentation in Sphinx reStructuredText format. This is used to generate the [online documentation](http://docs.micropython.org).
+- [extmod/](extmod/) -- additional (non-core) modules implemented in C.
+- [tools/](tools/) -- various tools, including the pyboard.py module.
+- [examples/](examples/) -- a few example Python scripts.
 
 "make" is used to build the components, or "gmake" on BSD-based systems.
 You will also need bash, gcc, and Python 3.3+ available as the command `python3`
 (if your system only has Python 2.7 then invoke make with the additional option
-`PYTHON=python2`).
+`PYTHON=python2`). Some ports (rp2 and esp32) additionally use CMake.
+
+Supported platforms & architectures
+-----------------------------------
+
+MicroPython runs on a wide range of microcontrollers, as well as on Unix-like
+(including Linux, BSD, macOS, WSL) and Windows systems.
+
+Microcontroller targets can be as small as 256kiB flash + 16kiB RAM, although
+devices with at least 512kiB flash + 128kiB RAM allow a much more
+full-featured experience.
+
+The [Unix](ports/unix) and [Windows](ports/windows) ports allow both
+development and testing of MicroPython itself, as well as providing
+lightweight alternative to CPython on these platforms (in particular on
+embedded Linux systems).
+
+The ["minimal"](ports/minimal) port provides an example of a very basic
+MicroPython port and can be compiled as both a standalone Linux binary as
+well as for ARM Cortex M4. Start with this if you want to port MicroPython to
+another microcontroller. Additionally the ["bare-arm"](ports/bare-arm) port
+is an example of the absolute minimum configuration, and is used to keep
+track of the code size of the core runtime and VM.
+
+In addition, the following ports are provided in this repository:
+ - [cc3200](ports/cc3200) -- Texas Instruments CC3200 (including PyCom WiPy).
+ - [esp32](ports/esp32) -- Espressif ESP32 SoC (including ESP32S2, ESP32S3, ESP32C3).
+ - [esp8266](ports/esp8266) -- Espressif ESP8266 SoC.
+ - [mimxrt](ports/mimxrt) -- NXP m.iMX RT (including Teensy 4.x).
+ - [nrf](ports/nrf) -- Nordic Semiconductor nRF51 and nRF52.
+ - [pic16bit](ports/pic16bit) -- Microchip PIC 16-bit.
+ - [powerpc](ports/powerpc) -- IBM PowerPC (including Microwatt)
+ - [qemu-arm](ports/qemu-arm) -- QEMU-based emulated target, for testing)
+ - [renesas-ra](ports/renesas-ra) -- Renesas RA family.
+ - [rp2](ports/rp2) -- Raspberry Pi RP2040 (including Pico and Pico W).
+ - [samd](ports/samd) -- Microchip (formerly Atmel) SAMD21 and SAMD51.
+ - [stm32](ports/stm32) -- STMicroelectronics STM32 family (including F0, F4, F7, G0, G4, H7, L0, L4, WB)
+ - [teensy](ports/teensy) -- Teensy 3.x.
+ - [webassembly](ports/webassembly) -- Emscripten port targeting browsers and NodeJS.
+ - [zephyr](ports/zephyr) -- Zephyr RTOS.
 
 The MicroPython cross-compiler, mpy-cross
 -----------------------------------------
 
-Most ports require the MicroPython cross-compiler to be built first.  This
-program, called mpy-cross, is used to pre-compile Python scripts to .mpy
-files which can then be included (frozen) into the firmware/executable for
-a port.  To build mpy-cross use:
+Most ports require the [MicroPython cross-compiler](mpy-cross) to be built
+first.  This program, called mpy-cross, is used to pre-compile Python scripts
+to .mpy files which can then be included (frozen) into the
+firmware/executable for a port.  To build mpy-cross use:
 
     $ cd mpy-cross
     $ make
 
-The Unix version
-----------------
-
-The "unix" port requires a standard Unix environment with gcc and GNU make.
-x86 and x64 architectures are supported (i.e. x86 32- and 64-bit), as well
-as ARM and MIPS. Making full-featured port to another architecture requires
-writing some assembly code for the exception handling and garbage collection.
-Alternatively, fallback implementation based on setjmp/longjmp can be used.
-
-To build (see section below for required dependencies):
-
-    $ cd ports/unix
-    $ make submodules
-    $ make
-
-Then to give it a try:
-
-    $ ./micropython
-    >>> list(5 * x + y for x in range(10) for y in [4, 2, 1])
-
-Use `CTRL-D` (i.e. EOF) to exit the shell.
-Learn about command-line options (in particular, how to increase heap size
-which may be needed for larger applications):
-
-    $ ./micropython -h
-
-Run complete testsuite:
-
-    $ make test
-
-Unix version comes with a builtin package manager called upip, e.g.:
-
-    $ ./micropython -m upip install micropython-pystone
-    $ ./micropython -m pystone
-
-Browse available modules on
-[PyPI](https://pypi.python.org/pypi?%3Aaction=search&term=micropython).
-Standard library modules come from
-[micropython-lib](https://github.com/micropython/micropython-lib) project.
-
 External dependencies
 ---------------------
 
-Building MicroPython ports may require some dependencies installed.
-
-For Unix port, `libffi` library and `pkg-config` tool are required. On
-Debian/Ubuntu/Mint derivative Linux distros, install `build-essential`
-(includes toolchain and make), `libffi-dev`, and `pkg-config` packages.
-
-Other dependencies can be built together with MicroPython. This may
-be required to enable extra features or capabilities, and in recent
-versions of MicroPython, these may be enabled by default. To build
-these additional dependencies, in the port directory you're
-interested in (e.g. `ports/unix/`) first execute:
+The core MicroPython VM and runtime has no external dependencies, but a given
+port might depend on third-party drivers or vendor HALs. This repository
+includes [several submodules](lib/) linking to these external dependencies.
+Before compiling a given port, use
 
+    $ cd ports/name
     $ make submodules
 
-This will fetch all the relevant git submodules (sub repositories) that
-the port needs.  Use the same command to get the latest versions of
-submodules as they are updated from time to time. After that execute:
-
-    $ make deplibs
-
-This will build all available dependencies (regardless whether they
-are used or not). If you intend to build MicroPython with additional
-options (like cross-compiling), the same set of options should be passed
-to `make deplibs`. To actually enable/disable use of dependencies, edit
-`ports/unix/mpconfigport.mk` file, which has inline descriptions of the options.
-For example, to build SSL module (required for `upip` tool described above,
-and so enabled by default), `MICROPY_PY_USSL` should be set to 1.
-
-For some ports, building required dependences is transparent, and happens
-automatically.  But they still need to be fetched with the `make submodules`
-command.
-
-The STM32 version
------------------
-
-The "stm32" port requires an ARM compiler, arm-none-eabi-gcc, and associated
-bin-utils.  For those using Arch Linux, you need arm-none-eabi-binutils,
-arm-none-eabi-gcc and arm-none-eabi-newlib packages.  Otherwise, try here:
-https://developer.arm.com/downloads/-/arm-gnu-toolchain-downloads
-
-To build:
-
-    $ cd ports/stm32
-    $ make submodules
-    $ make
-
-You then need to get your board into DFU mode.  On the pyboard, connect the
-3V3 pin to the P1/DFU pin with a wire (on PYBv1.0 they are next to each other
-on the bottom left of the board, second row from the bottom).
-
-Then to flash the code via USB DFU to your device:
-
-    $ make deploy
-
-This will use the included `tools/pydfu.py` script.  If flashing the firmware
-does not work it may be because you don't have the correct permissions, and
-need to use `sudo make deploy`.
-See the README.md file in the ports/stm32/ directory for further details.
-
-Contributing
-------------
-
-MicroPython is an open-source project and welcomes contributions. To be
-productive, please be sure to follow the
-[Contributors' Guidelines](https://github.com/micropython/micropython/wiki/ContributorGuidelines)
-and the [Code Conventions](https://github.com/micropython/micropython/blob/master/CODECONVENTIONS.md).
-Note that MicroPython is licenced under the MIT license, and all contributions
-should follow this license.
+to ensure that all required submodules are initialised.
diff --git a/ports/unix/README.md b/ports/unix/README.md
new file mode 100644
index 0000000000000..efc68b2455f90
--- /dev/null
+++ b/ports/unix/README.md
@@ -0,0 +1,70 @@
+The Unix version
+----------------
+
+The "unix" port requires a standard Unix-like environment with gcc and GNU
+make. This includes Linux, BSD, macOS, and Windows Subsystem for Linux. The
+x86 and x64 architectures are supported (i.e. x86 32- and 64-bit), as well as
+ARM and MIPS. Making a full-featured port to another architecture requires
+writing some assembly code for the exception handling and garbage collection.
+Alternatively, a fallback implementation based on setjmp/longjmp can be used.
+
+To build (see section below for required dependencies):
+
+    $ cd ports/unix
+    $ make submodules
+    $ make
+
+Then to give it a try:
+
+    $ ./build-standard/micropython
+    >>> list(5 * x + y for x in range(10) for y in [4, 2, 1])
+
+Use `CTRL-D` (i.e. EOF) to exit the shell.
+
+Learn about command-line options (in particular, how to increase heap size
+which may be needed for larger applications):
+
+    $ ./micropython -h
+
+To run the complete testsuite, use:
+
+    $ make test
+
+The Unix port comes with a builtin package manager called upip, e.g.:
+
+    $ ./micropython -m upip install micropython-pystone
+    $ ./micropython -m pystone
+
+Browse available modules on
+[PyPI](https://pypi.python.org/pypi?%3Aaction=search&term=micropython).
+Standard library modules come from the
+[micropython-lib](https://github.com/micropython/micropython-lib) project.
+
+External dependencies
+---------------------
+
+The `libffi` library and `pkg-config` tool are required. On Debian/Ubuntu/Mint
+derivative Linux distros, install `build-essential`(includes toolchain and
+make), `libffi-dev`, and `pkg-config` packages.
+
+Other dependencies can be built together with MicroPython. This may
+be required to enable extra features or capabilities, and in recent
+versions of MicroPython, these may be enabled by default. To build
+these additional dependencies, in the unix port directory first execute:
+
+    $ make submodules
+
+This will fetch all the relevant git submodules (sub repositories) that
+the port needs.  Use the same command to get the latest versions of
+submodules as they are updated from time to time. After that execute:
+
+    $ make deplibs
+
+This will build all available dependencies (regardless whether they are used
+or not). If you intend to build MicroPython with additional options
+(like cross-compiling), the same set of options should be passed to `make
+deplibs`. To actually enable/disable use of dependencies, edit the
+`ports/unix/mpconfigport.mk` file, which has inline descriptions of the
+options. For example, to build SSL module (required for the `upip` tool
+described above, and so enabled by default), `MICROPY_PY_USSL` should be set
+to 1.

From 316008046a689b59e7a521c811d6e381bd03fb5a Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Thu, 25 Aug 2022 15:03:38 +1000
Subject: [PATCH 2543/3533] github/ISSUE_TEMPLATE: Replace forum with
 Discussions.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
Signed-off-by: Damien George <damien@micropython.org>
---
 .github/ISSUE_TEMPLATE/bug_report.md      | 2 +-
 .github/ISSUE_TEMPLATE/config.yml         | 4 ++--
 .github/ISSUE_TEMPLATE/documentation.md   | 2 +-
 .github/ISSUE_TEMPLATE/feature_request.md | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index ac9d97041a505..7bad9562964af 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -7,7 +7,7 @@ assignees: ''
 
 ---
 
-* Please search existing issues before raising a new issue. For questions about MicroPython or for help using MicroPython, or any sort of "how do I?" requests, please see the MicroPython Forum (https://forum.micropython.org/) or raise a documentation request instead.
+* Please search existing issues before raising a new issue. For questions about MicroPython or for help using MicroPython, or any sort of "how do I?" requests, please use the Discussions tab or raise a documentation request instead.
 
 * In your issue, please include a clear and concise description of what the bug is, the expected output, and how to replicate it.
 
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index 318d9416ee74a..f3662464da337 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,7 +1,7 @@
 blank_issues_enabled: false
 contact_links:
-  - name: MicroPython Forum
-    url: https://forum.micropython.org/
+  - name: MicroPython GitHub Discussions
+    url: https://github.com/orgs/micropython/discussions
     about: Community discussion about all things MicroPython. This is the best place to start if you have questions about using MicroPython or getting started with MicroPython development.
   - name: MicroPython Documentation
     url: https://docs.micropython.org/
diff --git a/.github/ISSUE_TEMPLATE/documentation.md b/.github/ISSUE_TEMPLATE/documentation.md
index c86c1ec2b8ed6..e36fa62ac29a4 100644
--- a/.github/ISSUE_TEMPLATE/documentation.md
+++ b/.github/ISSUE_TEMPLATE/documentation.md
@@ -7,7 +7,7 @@ assignees: ''
 
 ---
 
-* Please search existing issues before raising a new issue. For questions about MicroPython or for help using MicroPython, or any sort of "how do I?" requests, please see the MicroPython Forum -- https://forum.micropython.org/
+* Please search existing issues before raising a new issue. For questions about MicroPython or for help using MicroPython, or any sort of "how do I?" requests, please use the Discussions tab instead.
 
 * Describe what was missing from the documentation and/or what was incorrect/incomplete.
 
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index 3976699b28ed6..81b55d98e0da8 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -7,7 +7,7 @@ assignees: ''
 
 ---
 
-* Please search existing issues before raising a new issue. For questions about MicroPython or for help using MicroPython, or any sort of "how do I?" requests, please see the MicroPython Forum (https://forum.micropython.org/) or raise a documentation request instead.
+* Please search existing issues before raising a new issue. For questions about MicroPython or for help using MicroPython, or any sort of "how do I?" requests, please use the Discussions tab or raise a documentation request instead.
 
 * Describe the feature you'd like to see added to MicroPython. In particular, what does this feature enable and why is it useful. MicroPython aims to strike a balance between functionality and code size, so please consider whether this feature can be optionally enabled and whether it can be provided in other ways (e.g. pure-Python library).
 

From 31d7ab327b0da4fe7747aba5590a542b88caa123 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Thu, 25 Aug 2022 15:03:56 +1000
Subject: [PATCH 2544/3533] docs/templates/topindex.html: Update forum link.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 docs/templates/topindex.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/templates/topindex.html b/docs/templates/topindex.html
index 41bcc740dd919..cfe3ad1516ac6 100644
--- a/docs/templates/topindex.html
+++ b/docs/templates/topindex.html
@@ -119,7 +119,7 @@ <h1>MicroPython documentation</h1>
         <span class="linkdescr">the official MicroPython site</span>
       </p>
       <p class="biglink">
-        <a class="biglink" href="http://forum.micropython.org">MicroPython forum</a><br/>
+        <a class="biglink" href="https://github.com/orgs/micropython/discussions">GitHub Discussions</a><br/>
         <span class="linkdescr">community discussion for all things related to MicroPython</span>
       </p>
     </td>

From 53ebbf10e56dd4cc33aec6cc6d0590c66fd1948e Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sat, 27 Aug 2022 10:42:15 +0200
Subject: [PATCH 2545/3533] docs/library/machine.I2C: Add a note about I2C
 pull-up resistors.

Quite regularly users complain about unexpected behavior of I2C, calling it
a bug, when in fact the trouble is caused by missing pull-up resistors.  So
this commit adds a note to the documentation, in the slim hope that people
will find and read it.
---
 docs/library/machine.I2C.rst | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/docs/library/machine.I2C.rst b/docs/library/machine.I2C.rst
index 82a88390c3fb3..2a33b1da47a31 100644
--- a/docs/library/machine.I2C.rst
+++ b/docs/library/machine.I2C.rst
@@ -20,6 +20,17 @@ Software I2C is implemented by bit-banging and can be used on any pin but is not
 as efficient.  These classes have the same methods available and differ primarily
 in the way they are constructed.
 
+.. Note::
+
+   The I2C bus requires pull-up circuitry on both SDA and SCL for it's operation.
+   Usually these are resistors in the range of 1 - 10 kOhm, connected from each SDA/SCL
+   to Vcc. Without these, the behaviour is undefined and may range from blocking,
+   unexpected watchdog reset to just wrong values. Often, this pull-up circuitry
+   is built-in already to the MCU board or sensor breakout boards, but there is
+   no rule for that. So please check in case of trouble. See also this excellent
+   `learning guide <https://learn.adafruit.com/working-with-i2c-devices/pull-up-resistors>`_
+   by Adafruit about I2C wiring.
+
 Example usage::
 
     from machine import I2C

From 2488311dc2f5ef259a03b871620fd6d3f45a1086 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Fri, 26 Aug 2022 12:47:34 +0200
Subject: [PATCH 2546/3533] rp2/machine_uart: Implement uart.flush() and
 uart.txdone().

uart.flush()

flush() will wait until all characters have been sent. It may return
while the last character is sent. if needed, the calling code has to
add one character wait time. To avoid a permanent lock, a timeout
applies depending on the size of txbuf and the baud rate.

ret = uart.txdone()

ret is True if no transfer is in progress. It may return True if the
last byte of a transfer is sent.
ret is False otherwise.
---
 ports/rp2/machine_uart.c | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/ports/rp2/machine_uart.c b/ports/rp2/machine_uart.c
index 77ccdb5f50f2a..f7e44b6b256c1 100644
--- a/ports/rp2/machine_uart.c
+++ b/ports/rp2/machine_uart.c
@@ -435,17 +435,31 @@ STATIC mp_obj_t machine_uart_sendbreak(mp_obj_t self_in) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_uart_sendbreak_obj, machine_uart_sendbreak);
 
+STATIC mp_obj_t machine_uart_txdone(mp_obj_t self_in) {
+    machine_uart_obj_t *self = MP_OBJ_TO_PTR(self_in);
+
+    if (ringbuf_avail(&self->write_buffer) == 0 &&
+        uart_get_hw(self->uart)->fr & UART_UARTFR_TXFE_BITS) {
+        return mp_const_true;
+    } else {
+        return mp_const_false;
+    }
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_uart_txdone_obj, machine_uart_txdone);
+
 STATIC const mp_rom_map_elem_t machine_uart_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_init), MP_ROM_PTR(&machine_uart_init_obj) },
     { MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&machine_uart_deinit_obj) },
 
     { MP_ROM_QSTR(MP_QSTR_any), MP_ROM_PTR(&machine_uart_any_obj) },
+    { MP_ROM_QSTR(MP_QSTR_flush), MP_ROM_PTR(&mp_stream_flush_obj) },
     { MP_ROM_QSTR(MP_QSTR_read), MP_ROM_PTR(&mp_stream_read_obj) },
     { MP_ROM_QSTR(MP_QSTR_readline), MP_ROM_PTR(&mp_stream_unbuffered_readline_obj) },
     { MP_ROM_QSTR(MP_QSTR_readinto), MP_ROM_PTR(&mp_stream_readinto_obj) },
     { MP_ROM_QSTR(MP_QSTR_write), MP_ROM_PTR(&mp_stream_write_obj) },
 
     { MP_ROM_QSTR(MP_QSTR_sendbreak), MP_ROM_PTR(&machine_uart_sendbreak_obj) },
+    { MP_ROM_QSTR(MP_QSTR_txdone), MP_ROM_PTR(&machine_uart_txdone_obj) },
 
     { MP_ROM_QSTR(MP_QSTR_INV_TX), MP_ROM_INT(UART_INVERT_TX) },
     { MP_ROM_QSTR(MP_QSTR_INV_RX), MP_ROM_INT(UART_INVERT_RX) },
@@ -538,6 +552,19 @@ STATIC mp_uint_t machine_uart_ioctl(mp_obj_t self_in, mp_uint_t request, mp_uint
         if ((flags & MP_STREAM_POLL_WR) && ringbuf_free(&self->write_buffer) > 0) {
             ret |= MP_STREAM_POLL_WR;
         }
+    } else if (request == MP_STREAM_FLUSH) {
+        // The timeout is estimated using the buffer size and the baudrate.
+        // Take the worst case assumptions at 13 bit symbol size times 2.
+        uint64_t timeout = time_us_64() +
+            (uint64_t)(33 + self->write_buffer.size) * 13000000ll * 2 / self->baudrate;
+        do {
+            if (machine_uart_txdone((mp_obj_t)self) == mp_const_true) {
+                return 0;
+            }
+            MICROPY_EVENT_POLL_HOOK
+        } while (time_us_64() < timeout);
+        *errcode = MP_ETIMEDOUT;
+        ret = MP_STREAM_ERROR;
     } else {
         *errcode = MP_EINVAL;
         ret = MP_STREAM_ERROR;

From 5466f1b0ea562548cd11cdbe31b5f71c97cf36f9 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Fri, 26 Aug 2022 15:21:48 +0200
Subject: [PATCH 2547/3533] esp32/machine_uart: Implement uart.flush() and
 uart.txdone().

uart.flush()

flush() will wait until all characters have been sent.To
avoid a permanent lock, a timeout applies depending on the
size of txbuf and the baud rate.

ret = uart.txdone()

ret is True if no transfer is in progress.
ret is False otherwise.
---
 ports/esp32/machine_uart.c | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/ports/esp32/machine_uart.c b/ports/esp32/machine_uart.c
index 28110e39f3781..72445912897f5 100644
--- a/ports/esp32/machine_uart.c
+++ b/ports/esp32/machine_uart.c
@@ -417,15 +417,28 @@ STATIC mp_obj_t machine_uart_sendbreak(mp_obj_t self_in) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_uart_sendbreak_obj, machine_uart_sendbreak);
 
+STATIC mp_obj_t machine_uart_txdone(mp_obj_t self_in) {
+    machine_uart_obj_t *self = MP_OBJ_TO_PTR(self_in);
+
+    if (uart_wait_tx_done(self->uart_num, 0) == ESP_OK) {
+        return mp_const_true;
+    } else {
+        return mp_const_false;
+    }
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_uart_txdone_obj, machine_uart_txdone);
+
 STATIC const mp_rom_map_elem_t machine_uart_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_init), MP_ROM_PTR(&machine_uart_init_obj) },
     { MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&machine_uart_deinit_obj) },
     { MP_ROM_QSTR(MP_QSTR_any), MP_ROM_PTR(&machine_uart_any_obj) },
+    { MP_ROM_QSTR(MP_QSTR_flush), MP_ROM_PTR(&mp_stream_flush_obj) },
     { MP_ROM_QSTR(MP_QSTR_read), MP_ROM_PTR(&mp_stream_read_obj) },
     { MP_ROM_QSTR(MP_QSTR_readline), MP_ROM_PTR(&mp_stream_unbuffered_readline_obj) },
     { MP_ROM_QSTR(MP_QSTR_readinto), MP_ROM_PTR(&mp_stream_readinto_obj) },
     { MP_ROM_QSTR(MP_QSTR_write), MP_ROM_PTR(&mp_stream_write_obj) },
     { MP_ROM_QSTR(MP_QSTR_sendbreak), MP_ROM_PTR(&machine_uart_sendbreak_obj) },
+    { MP_ROM_QSTR(MP_QSTR_txdone), MP_ROM_PTR(&machine_uart_txdone_obj) },
 
     { MP_ROM_QSTR(MP_QSTR_INV_TX), MP_ROM_INT(UART_INV_TX) },
     { MP_ROM_QSTR(MP_QSTR_INV_RX), MP_ROM_INT(UART_INV_RX) },
@@ -491,6 +504,18 @@ STATIC mp_uint_t machine_uart_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr
         if ((flags & MP_STREAM_POLL_WR) && 1) { // FIXME: uart_tx_any_room(self->uart_num)
             ret |= MP_STREAM_POLL_WR;
         }
+    } else if (request == MP_STREAM_FLUSH) {
+        // The timeout is estimated using the buffer size and the baudrate.
+        // Take the worst case assumptions at 13 bit symbol size times 2.
+        uint32_t baudrate;
+        uart_get_baudrate(self->uart_num, &baudrate);
+        uint32_t timeout = (3 + self->txbuf) * 13000 * 2 / baudrate;
+        if (uart_wait_tx_done(self->uart_num, timeout) == ESP_OK) {
+            ret = 0;
+        } else {
+            *errcode = MP_ETIMEDOUT;
+            ret = MP_STREAM_ERROR;
+        }
     } else {
         *errcode = MP_EINVAL;
         ret = MP_STREAM_ERROR;

From 49e17c8bb0c55d8efb3f768ba1dfd5b27c466b26 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Fri, 26 Aug 2022 15:49:59 +0200
Subject: [PATCH 2548/3533] mimxrt/machine_uart: Implement uart.flush() and
 uart.txdone().

uart.flush()

flush() will wait until all characters have been sent.To avoid a
permanent lock, a timeout applies depending on the size of txbuf
and the baud rate.

ret = uart.txdone()

ret is True if no transfer is in progress.
ret is False otherwise.
---
 ports/mimxrt/machine_uart.c | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/ports/mimxrt/machine_uart.c b/ports/mimxrt/machine_uart.c
index 115d9226bf8be..302244f7221f6 100644
--- a/ports/mimxrt/machine_uart.c
+++ b/ports/mimxrt/machine_uart.c
@@ -308,17 +308,30 @@ STATIC mp_obj_t machine_uart_sendbreak(mp_obj_t self_in) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_uart_sendbreak_obj, machine_uart_sendbreak);
 
+STATIC mp_obj_t machine_uart_txdone(mp_obj_t self_in) {
+    machine_uart_obj_t *self = MP_OBJ_TO_PTR(self_in);
+
+    if (self->tx_status == kStatus_LPUART_TxIdle) {
+        return mp_const_true;
+    } else {
+        return mp_const_false;
+    }
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_uart_txdone_obj, machine_uart_txdone);
+
 STATIC const mp_rom_map_elem_t machine_uart_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_init), MP_ROM_PTR(&machine_uart_init_obj) },
 
     { MP_ROM_QSTR(MP_QSTR_any), MP_ROM_PTR(&machine_uart_any_obj) },
 
+    { MP_ROM_QSTR(MP_QSTR_flush), MP_ROM_PTR(&mp_stream_flush_obj) },
     { MP_ROM_QSTR(MP_QSTR_read), MP_ROM_PTR(&mp_stream_read_obj) },
     { MP_ROM_QSTR(MP_QSTR_readline), MP_ROM_PTR(&mp_stream_unbuffered_readline_obj) },
     { MP_ROM_QSTR(MP_QSTR_readinto), MP_ROM_PTR(&mp_stream_readinto_obj) },
     { MP_ROM_QSTR(MP_QSTR_write), MP_ROM_PTR(&mp_stream_write_obj) },
 
     { MP_ROM_QSTR(MP_QSTR_sendbreak), MP_ROM_PTR(&machine_uart_sendbreak_obj) },
+    { MP_ROM_QSTR(MP_QSTR_txdone), MP_ROM_PTR(&machine_uart_txdone_obj) },
 
     { MP_ROM_QSTR(MP_QSTR_INV_TX), MP_ROM_INT(UART_INVERT_TX) },
     { MP_ROM_QSTR(MP_QSTR_INV_RX), MP_ROM_INT(UART_INVERT_RX) },
@@ -433,6 +446,21 @@ STATIC mp_uint_t machine_uart_ioctl(mp_obj_t self_in, mp_uint_t request, mp_uint
         if ((flags & MP_STREAM_POLL_WR)) {
             ret |= MP_STREAM_POLL_WR;
         }
+    } else if (request == MP_STREAM_FLUSH) {
+        // The timeout is estimated using the buffer size and the baudrate.
+        // Take the worst case assumptions at 13 bit symbol size times 2.
+        uint64_t timeout = (uint64_t)(3 + self->txbuf_len) * 13000000ll * 2 /
+            self->config.baudRate_Bps + ticks_us64();
+
+        do {
+            if (machine_uart_txdone((mp_obj_t)self) == mp_const_true) {
+                return 0;
+            }
+            MICROPY_EVENT_POLL_HOOK
+        } while (ticks_us64() < timeout);
+
+        *errcode = MP_ETIMEDOUT;
+        ret = MP_STREAM_ERROR;
     } else {
         *errcode = MP_EINVAL;
         ret = MP_STREAM_ERROR;

From 8804993d0f5326fd71f137433a1b52199d65f119 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Fri, 26 Aug 2022 16:42:10 +0200
Subject: [PATCH 2549/3533] esp8266/machine_uart: Implement uart.flush() and
 uart.txdone().

uart.flush()

flush() will wait until all characters but the last one have been sent.
It returns while the last character is sent. If needed, the calling
code has to add one character wait time. To avoid a permanent lock,
a timeout applies depending on the size of the FIFO and the baud rate.

ret = uart.txdone()

ret is True if no transfer is in progress. It returns already True when
the last byte of a transfer is sent.
ret is False otherwise.
---
 ports/esp8266/machine_uart.c | 24 ++++++++++++++++++++++++
 ports/esp8266/uart.c         |  9 +++++++++
 ports/esp8266/uart.h         |  1 +
 3 files changed, 34 insertions(+)

diff --git a/ports/esp8266/machine_uart.c b/ports/esp8266/machine_uart.c
index 4e88eee162d8b..2fe6516dc7ced 100644
--- a/ports/esp8266/machine_uart.c
+++ b/ports/esp8266/machine_uart.c
@@ -231,10 +231,20 @@ STATIC mp_obj_t pyb_uart_any(mp_obj_t self_in) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(pyb_uart_any_obj, pyb_uart_any);
 
+STATIC mp_obj_t machine_uart_txdone(mp_obj_t self_in) {
+    pyb_uart_obj_t *self = MP_OBJ_TO_PTR(self_in);
+
+    return uart_txdone(self->uart_id) == true ? mp_const_true : mp_const_false;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_uart_txdone_obj, machine_uart_txdone);
+
 STATIC const mp_rom_map_elem_t pyb_uart_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_init), MP_ROM_PTR(&pyb_uart_init_obj) },
 
     { MP_ROM_QSTR(MP_QSTR_any), MP_ROM_PTR(&pyb_uart_any_obj) },
+    { MP_ROM_QSTR(MP_QSTR_txdone), MP_ROM_PTR(&machine_uart_txdone_obj) },
+
+    { MP_ROM_QSTR(MP_QSTR_flush), MP_ROM_PTR(&mp_stream_flush_obj) },
     { MP_ROM_QSTR(MP_QSTR_read), MP_ROM_PTR(&mp_stream_read_obj) },
     { MP_ROM_QSTR(MP_QSTR_readline), MP_ROM_PTR(&mp_stream_unbuffered_readline_obj) },
     { MP_ROM_QSTR(MP_QSTR_readinto), MP_ROM_PTR(&mp_stream_readinto_obj) },
@@ -305,6 +315,20 @@ STATIC mp_uint_t pyb_uart_ioctl(mp_obj_t self_in, mp_uint_t request, mp_uint_t a
         if ((flags & MP_STREAM_POLL_WR) && uart_tx_any_room(self->uart_id)) {
             ret |= MP_STREAM_POLL_WR;
         }
+    } else if (request == MP_STREAM_FLUSH) {
+        // The timeout is estimated using the buffer size and the baudrate.
+        // Take the worst case assumptions at 13 bit symbol size times 2.
+        uint64_t timeout = (uint64_t)(3 + 127) * 13000000ll * 2 / self->baudrate
+            + system_get_time();
+        do {
+            if (machine_uart_txdone((mp_obj_t)self) == mp_const_true) {
+                return 0;
+            }
+            MICROPY_EVENT_POLL_HOOK
+        } while (system_get_time() < timeout);
+
+        *errcode = MP_ETIMEDOUT;
+        ret = MP_STREAM_ERROR;
     } else {
         *errcode = MP_EINVAL;
         ret = MP_STREAM_ERROR;
diff --git a/ports/esp8266/uart.c b/ports/esp8266/uart.c
index 978a7efc38edf..117cd1bf6c938 100644
--- a/ports/esp8266/uart.c
+++ b/ports/esp8266/uart.c
@@ -111,6 +111,15 @@ void uart_tx_one_char(uint8 uart, uint8 TxChar) {
     WRITE_PERI_REG(UART_FIFO(uart), TxChar);
 }
 
+int uart_txdone(uint8 uart) {
+    uint32 fifo_cnt = READ_PERI_REG(UART_STATUS(uart)) & (UART_TXFIFO_CNT << UART_TXFIFO_CNT_S);
+    if ((fifo_cnt >> UART_TXFIFO_CNT_S & UART_TXFIFO_CNT) == 0) {
+        return true;
+    } else {
+        return false;
+    }
+}
+
 void uart_flush(uint8 uart) {
     while (true) {
         uint32 fifo_cnt = READ_PERI_REG(UART_STATUS(uart)) & (UART_TXFIFO_CNT << UART_TXFIFO_CNT_S);
diff --git a/ports/esp8266/uart.h b/ports/esp8266/uart.h
index de0919bde056d..3c5592ff0aa88 100644
--- a/ports/esp8266/uart.h
+++ b/ports/esp8266/uart.h
@@ -101,6 +101,7 @@ bool uart_rx_wait(uint32_t timeout_us);
 int uart_rx_char(void);
 void uart_tx_one_char(uint8 uart, uint8 TxChar);
 void uart_flush(uint8 uart);
+int uart_txdone(uint8 uart);
 void uart_os_config(int uart);
 void uart_setup(uint8 uart);
 int uart0_get_rxbuf_len(void);

From 8ea6fefc6d52ae46199a337064c05431f6dd30cb Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Fri, 26 Aug 2022 17:04:23 +0200
Subject: [PATCH 2550/3533] stm32/machine_uart: Implement uart.flush() and
 uart.txdone().

Since uart.write() of the STM32 port waits until all bytes have
been sent, uart.flush() and uart.txdone() are implemented as empty
functions to provide API consistency.

uart.flush()

flush() will always return immediately.

ret = uart.txdone()

uart.txdone() will always return True.
---
 ports/stm32/machine_uart.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/ports/stm32/machine_uart.c b/ports/stm32/machine_uart.c
index bf7bcfb9cd354..1bb1d2a1a7844 100644
--- a/ports/stm32/machine_uart.c
+++ b/ports/stm32/machine_uart.c
@@ -523,6 +523,12 @@ STATIC mp_obj_t pyb_uart_irq(size_t n_args, const mp_obj_t *pos_args, mp_map_t *
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_KW(pyb_uart_irq_obj, 1, pyb_uart_irq);
 
+// Since uart.write() waits up to the last byte, uart.txdone() always returns True.
+STATIC mp_obj_t machine_uart_txdone(mp_obj_t self_in) {
+    return mp_const_true;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_uart_txdone_obj, machine_uart_txdone);
+
 STATIC const mp_rom_map_elem_t pyb_uart_locals_dict_table[] = {
     // instance methods
 
@@ -538,11 +544,13 @@ STATIC const mp_rom_map_elem_t pyb_uart_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_readinto), MP_ROM_PTR(&mp_stream_readinto_obj) },
     /// \method write(buf)
     { MP_ROM_QSTR(MP_QSTR_write), MP_ROM_PTR(&mp_stream_write_obj) },
+    { MP_ROM_QSTR(MP_QSTR_flush), MP_ROM_PTR(&mp_stream_flush_obj) },
     { MP_ROM_QSTR(MP_QSTR_irq), MP_ROM_PTR(&pyb_uart_irq_obj) },
 
     { MP_ROM_QSTR(MP_QSTR_writechar), MP_ROM_PTR(&pyb_uart_writechar_obj) },
     { MP_ROM_QSTR(MP_QSTR_readchar), MP_ROM_PTR(&pyb_uart_readchar_obj) },
     { MP_ROM_QSTR(MP_QSTR_sendbreak), MP_ROM_PTR(&pyb_uart_sendbreak_obj) },
+    { MP_ROM_QSTR(MP_QSTR_txdone), MP_ROM_PTR(&machine_uart_txdone_obj) },
 
     // class constants
     { MP_ROM_QSTR(MP_QSTR_RTS), MP_ROM_INT(UART_HWCONTROL_RTS) },
@@ -635,6 +643,9 @@ STATIC mp_uint_t pyb_uart_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_t a
         if ((flags & MP_STREAM_POLL_WR) && uart_tx_avail(self)) {
             ret |= MP_STREAM_POLL_WR;
         }
+    } else if (request == MP_STREAM_FLUSH) {
+        // Since uart.write() waits up to the last byte, uart.flush() always succeds.
+        ret = 0;
     } else {
         *errcode = MP_EINVAL;
         ret = MP_STREAM_ERROR;

From cc0249c936091889c9f2bda0ecafc522e06364a3 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Fri, 26 Aug 2022 17:24:30 +0200
Subject: [PATCH 2551/3533] nrf/modules/machine/uart: Implement uart.flush()
 and uart.txdone().

Since uart.write() of the nrf port waits until all bytes but the last
one have been sent, uart.flush() and uart.txdone() are implemented
as empty functions to provide API consistency.

uart.flush()

flush() will always return immediately, even if the last byte
may still be sent.

ret = uart.txdone()

uart.txdone() will always return True, even if the last byte
may still be sent.
---
 ports/nrf/modules/machine/uart.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/ports/nrf/modules/machine/uart.c b/ports/nrf/modules/machine/uart.c
index e8c82e57dd162..1fd2ccc06cafd 100644
--- a/ports/nrf/modules/machine/uart.c
+++ b/ports/nrf/modules/machine/uart.c
@@ -292,6 +292,12 @@ STATIC mp_obj_t machine_hard_uart_sendbreak(mp_obj_t self_in) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_hard_uart_sendbreak_obj, machine_hard_uart_sendbreak);
 
+// Since uart.write() waits up to the last byte, uart.txdone() always returns True.
+STATIC mp_obj_t machine_uart_txdone(mp_obj_t self_in) {
+    return mp_const_true;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_uart_txdone_obj, machine_uart_txdone);
+
 STATIC const mp_rom_map_elem_t machine_hard_uart_locals_dict_table[] = {
     // instance methods
     { MP_ROM_QSTR(MP_QSTR_read), MP_ROM_PTR(&mp_stream_read_obj) },
@@ -302,6 +308,8 @@ STATIC const mp_rom_map_elem_t machine_hard_uart_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_writechar), MP_ROM_PTR(&machine_hard_uart_writechar_obj) },
     { MP_ROM_QSTR(MP_QSTR_readchar), MP_ROM_PTR(&machine_hard_uart_readchar_obj) },
     { MP_ROM_QSTR(MP_QSTR_sendbreak), MP_ROM_PTR(&machine_hard_uart_sendbreak_obj) },
+    { MP_ROM_QSTR(MP_QSTR_flush), MP_ROM_PTR(&mp_stream_flush_obj) },
+    { MP_ROM_QSTR(MP_QSTR_txdone), MP_ROM_PTR(&machine_uart_txdone_obj) },
 
     // class constants
 /*
@@ -347,6 +355,11 @@ STATIC mp_uint_t machine_hard_uart_write(mp_obj_t self_in, const void *buf_in, m
 STATIC mp_uint_t machine_hard_uart_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_t arg, int *errcode) {
     machine_hard_uart_obj_t *self = self_in;
     (void)self;
+
+    if (request == MP_STREAM_FLUSH) {
+        // Since uart.write() waits up to the last byte, uart.flush() always succeds.
+        return 0;
+    }
     return MP_STREAM_ERROR;
 }
 

From a39b88f0fbffe802dc8a80980e6fd675c9ef5a65 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Fri, 26 Aug 2022 18:08:29 +0200
Subject: [PATCH 2552/3533] cc3200/mods/pybuart: Implement uart.flush() and
 uart.txdone().

uart.flush()

flush() will wait until all characters have been sent.
To avoid a permanent lock, a timeout applies depending on the
size of FIFO and the baud rate.

ret = uart.txdone()

ret is True if no transfer is in progress.
ret is False otherwise.
---
 ports/cc3200/mods/pybuart.c | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/ports/cc3200/mods/pybuart.c b/ports/cc3200/mods/pybuart.c
index 6e774b70d9a9f..a81954abb8b57 100644
--- a/ports/cc3200/mods/pybuart.c
+++ b/ports/cc3200/mods/pybuart.c
@@ -66,6 +66,7 @@
 #define PYBUART_TX_MAX_TIMEOUT_MS               (5)
 
 #define PYBUART_RX_BUFFER_LEN                   (256)
+#define PYBUART_TX_BUFFER_LEN                   (17)
 
 // interrupt triggers
 #define UART_TRIGGER_RX_ANY                     (0x01)
@@ -558,6 +559,17 @@ STATIC mp_obj_t pyb_uart_irq(size_t n_args, const mp_obj_t *pos_args, mp_map_t *
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_KW(pyb_uart_irq_obj, 1, pyb_uart_irq);
 
+STATIC mp_obj_t machine_uart_txdone(mp_obj_t self_in) {
+    pyb_uart_obj_t *self = MP_OBJ_TO_PTR(self_in);
+
+    if (MAP_UARTBusy(self->reg) == false) {
+        return mp_const_true;
+    } else {
+        return mp_const_false;
+    }
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_uart_txdone_obj, machine_uart_txdone);
+
 STATIC const mp_rom_map_elem_t pyb_uart_locals_dict_table[] = {
     // instance methods
     { MP_ROM_QSTR(MP_QSTR_init),        MP_ROM_PTR(&pyb_uart_init_obj) },
@@ -565,6 +577,7 @@ STATIC const mp_rom_map_elem_t pyb_uart_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_any),         MP_ROM_PTR(&pyb_uart_any_obj) },
     { MP_ROM_QSTR(MP_QSTR_sendbreak),   MP_ROM_PTR(&pyb_uart_sendbreak_obj) },
     { MP_ROM_QSTR(MP_QSTR_irq),         MP_ROM_PTR(&pyb_uart_irq_obj) },
+    { MP_ROM_QSTR(MP_QSTR_txdone),      MP_ROM_PTR(&machine_uart_txdone_obj) },
 
     /// \method read([nbytes])
     { MP_ROM_QSTR(MP_QSTR_read),        MP_ROM_PTR(&mp_stream_read_obj) },
@@ -574,6 +587,7 @@ STATIC const mp_rom_map_elem_t pyb_uart_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_readinto),    MP_ROM_PTR(&mp_stream_readinto_obj) },
     /// \method write(buf)
     { MP_ROM_QSTR(MP_QSTR_write),       MP_ROM_PTR(&mp_stream_write_obj) },
+    { MP_ROM_QSTR(MP_QSTR_flush),       MP_ROM_PTR(&mp_stream_flush_obj) },
 
     // class constants
     { MP_ROM_QSTR(MP_QSTR_RX_ANY),      MP_ROM_INT(UART_TRIGGER_RX_ANY) },
@@ -635,6 +649,21 @@ STATIC mp_uint_t pyb_uart_ioctl(mp_obj_t self_in, mp_uint_t request, mp_uint_t a
         if ((flags & MP_STREAM_POLL_WR) && MAP_UARTSpaceAvail(self->reg)) {
             ret |= MP_STREAM_POLL_WR;
         }
+    } else if (request == MP_STREAM_FLUSH) {
+        // The timeout is estimated using the buffer size and the baudrate.
+        // Take the worst case assumptions at 13 bit symbol size times 2.
+        uint64_t timeout = mp_hal_ticks_ms()  +
+            (PYBUART_TX_BUFFER_LEN) * 13000 * 2 / self->baudrate;
+
+        do {
+            if (machine_uart_txdone((mp_obj_t)self) == mp_const_true) {
+                return 0;
+            }
+            MICROPY_EVENT_POLL_HOOK
+        } while (mp_hal_ticks_ms() < timeout);
+
+        *errcode = MP_ETIMEDOUT;
+        ret = MP_STREAM_ERROR;;
     } else {
         *errcode = MP_EINVAL;
         ret = MP_STREAM_ERROR;

From b74eeee5e0e2a6c1437072c7343ccf9a5e7b5aad Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Fri, 26 Aug 2022 20:37:43 +0200
Subject: [PATCH 2553/3533] docs/library/machine.UART: Add docs for
 uart.flush() and uart.txdone().

---
 docs/library/machine.UART.rst | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/docs/library/machine.UART.rst b/docs/library/machine.UART.rst
index 1d54174c99614..c3eca8f55a693 100644
--- a/docs/library/machine.UART.rst
+++ b/docs/library/machine.UART.rst
@@ -177,6 +177,32 @@ Methods
 
    Availability: WiPy.
 
+.. method:: UART.flush()
+
+   Waits until all data has been sent. In case of a timeout, an exception is raised. The timeout
+   duration depends on the tx buffer size and the baud rate. Unless flow control is enabled, a timeout
+   should not occur.
+
+   .. note::
+
+       For the rp2, esp8266 and nrf ports the call returns while the last byte is sent.
+       If required, a one character wait time has to be added in the calling script.
+
+   Availability: rp2, esp32, esp8266, mimxrt, cc3200, stm32, nrf ports
+
+.. method:: UART.txdone()
+
+   Tells whether all data has been sent or no data transfer is happening. In this case,
+   it returns ``True``. If a data transmission is ongoing it returns ``False``.
+
+   .. note::
+
+       For the rp2, esp8266 and nrf ports the call may return ``True`` even if the last byte
+       of a transfer is still being sent. If required, a one character wait time has to be
+       added in the calling script.
+
+   Availability: rp2, esp32, esp8266, mimxrt, cc3200, stm32, nrf ports
+
 Constants
 ---------
 

From 85a25895ffc17b6034f4348e26c6248c34be8324 Mon Sep 17 00:00:00 2001
From: hoihu <fischer.carlito@gmail.com>
Date: Mon, 29 Aug 2022 08:00:37 +0200
Subject: [PATCH 2554/3533] rp2/mbedtls: Fix missing time.h include.

---
 ports/rp2/mbedtls/mbedtls_config.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/rp2/mbedtls/mbedtls_config.h b/ports/rp2/mbedtls/mbedtls_config.h
index 743d0a6a8425e..c80aa5bc18c2a 100644
--- a/ports/rp2/mbedtls/mbedtls_config.h
+++ b/ports/rp2/mbedtls/mbedtls_config.h
@@ -106,6 +106,7 @@ void m_tracked_free(void *ptr);
 #define MBEDTLS_PLATFORM_SNPRINTF_MACRO snprintf
 
 // Time hook
+#include <time.h>
 time_t rp2_rtctime_seconds(time_t *timer);
 #define MBEDTLS_PLATFORM_TIME_MACRO rp2_rtctime_seconds
 

From 621bff8557c7a7e35cdc9f6c6de0e6c912d94202 Mon Sep 17 00:00:00 2001
From: Takeo Takahashi <takeo.takahashi.xv@renesas.com>
Date: Thu, 23 Jun 2022 22:27:47 +0900
Subject: [PATCH 2555/3533] renesas-ra/machine_pin: Support drive keyword and
 fix GPIO setting.

Changes are:
- Support drive= keyword argument.
- Fix trigger keyword check.
- Fix GPIO pin setting.

Signed-off-by: Takeo Takahashi <takeo.takahashi.xv@renesas.com>
---
 .../boards/RA4M1_CLICKER/mpconfigboard.h      |   4 +-
 .../boards/RA4M1_EK/mpconfigboard.h           |   4 +-
 .../boards/RA4W1_EK/mpconfigboard.h           |   4 +-
 .../boards/RA6M1_EK/mpconfigboard.h           |   4 +-
 .../boards/RA6M2_EK/mpconfigboard.h           |   4 +-
 ports/renesas-ra/extint.c                     |  30 ++--
 ports/renesas-ra/machine_pin.c                | 132 +++++++++++-------
 ports/renesas-ra/mphalport.h                  |  12 +-
 ports/renesas-ra/ra/ra_gpio.c                 |  59 ++++----
 ports/renesas-ra/ra/ra_gpio.h                 |  57 ++++----
 ports/renesas-ra/ra/ra_i2c.c                  |   4 +-
 ports/renesas-ra/ra/ra_sci.c                  |   8 +-
 ports/renesas-ra/ra/ra_spi.c                  |   4 +-
 ports/renesas-ra/usrsw.c                      |   2 +-
 14 files changed, 177 insertions(+), 151 deletions(-)

diff --git a/ports/renesas-ra/boards/RA4M1_CLICKER/mpconfigboard.h b/ports/renesas-ra/boards/RA4M1_CLICKER/mpconfigboard.h
index ec67d68b6584e..f39cf8f80e39c 100644
--- a/ports/renesas-ra/boards/RA4M1_CLICKER/mpconfigboard.h
+++ b/ports/renesas-ra/boards/RA4M1_CLICKER/mpconfigboard.h
@@ -47,8 +47,8 @@
 // Switch
 #define MICROPY_HW_HAS_SWITCH       (1)
 #define MICROPY_HW_USRSW_PIN        (pin_P304)
-#define MICROPY_HW_USRSW_PULL       (GPIO_NOPULL)
-#define MICROPY_HW_USRSW_EXTI_MODE  (GPIO_MODE_IT_FALLING)
+#define MICROPY_HW_USRSW_PULL       (MP_HAL_PIN_PULL_NONE)
+#define MICROPY_HW_USRSW_EXTI_MODE  (MP_HAL_PIN_TRIGGER_FALLING)
 #define MICROPY_HW_USRSW_PRESSED    (0)
 
 // LEDs
diff --git a/ports/renesas-ra/boards/RA4M1_EK/mpconfigboard.h b/ports/renesas-ra/boards/RA4M1_EK/mpconfigboard.h
index 500fe78b9e121..2874142890c13 100644
--- a/ports/renesas-ra/boards/RA4M1_EK/mpconfigboard.h
+++ b/ports/renesas-ra/boards/RA4M1_EK/mpconfigboard.h
@@ -59,8 +59,8 @@
 // Switch
 #define MICROPY_HW_HAS_SWITCH       (1)
 #define MICROPY_HW_USRSW_PIN        (pin_P105)
-#define MICROPY_HW_USRSW_PULL       (GPIO_NOPULL)
-#define MICROPY_HW_USRSW_EXTI_MODE  (GPIO_MODE_IT_FALLING)
+#define MICROPY_HW_USRSW_PULL       (MP_HAL_PIN_PULL_NONE)
+#define MICROPY_HW_USRSW_EXTI_MODE  (MP_HAL_PIN_TRIGGER_FALLING)
 #define MICROPY_HW_USRSW_PRESSED    (0)
 
 // LEDs
diff --git a/ports/renesas-ra/boards/RA4W1_EK/mpconfigboard.h b/ports/renesas-ra/boards/RA4W1_EK/mpconfigboard.h
index 0e0dff14755cf..0bf907a48c7cc 100644
--- a/ports/renesas-ra/boards/RA4W1_EK/mpconfigboard.h
+++ b/ports/renesas-ra/boards/RA4W1_EK/mpconfigboard.h
@@ -58,8 +58,8 @@
 // Switch
 #define MICROPY_HW_HAS_SWITCH       (1)
 #define MICROPY_HW_USRSW_PIN        (pin_P402)
-#define MICROPY_HW_USRSW_PULL       (GPIO_NOPULL)
-#define MICROPY_HW_USRSW_EXTI_MODE  (GPIO_MODE_IT_FALLING)
+#define MICROPY_HW_USRSW_PULL       (MP_HAL_PIN_PULL_NONE)
+#define MICROPY_HW_USRSW_EXTI_MODE  (MP_HAL_PIN_TRIGGER_FALLING)
 #define MICROPY_HW_USRSW_PRESSED    (0)
 
 // LEDs
diff --git a/ports/renesas-ra/boards/RA6M1_EK/mpconfigboard.h b/ports/renesas-ra/boards/RA6M1_EK/mpconfigboard.h
index 0693e404fd8f3..59db4bc218a82 100644
--- a/ports/renesas-ra/boards/RA6M1_EK/mpconfigboard.h
+++ b/ports/renesas-ra/boards/RA6M1_EK/mpconfigboard.h
@@ -64,8 +64,8 @@
 // Switch
 #define MICROPY_HW_HAS_SWITCH       (1)
 #define MICROPY_HW_USRSW_PIN        (pin_P415)
-#define MICROPY_HW_USRSW_PULL       (GPIO_NOPULL)
-#define MICROPY_HW_USRSW_EXTI_MODE  (GPIO_MODE_IT_FALLING)
+#define MICROPY_HW_USRSW_PULL       (MP_HAL_PIN_PULL_NONE)
+#define MICROPY_HW_USRSW_EXTI_MODE  (MP_HAL_PIN_TRIGGER_FALLING)
 #define MICROPY_HW_USRSW_PRESSED    (0)
 
 // LEDs
diff --git a/ports/renesas-ra/boards/RA6M2_EK/mpconfigboard.h b/ports/renesas-ra/boards/RA6M2_EK/mpconfigboard.h
index 2d2dc326d3384..9988e0ed25d0c 100644
--- a/ports/renesas-ra/boards/RA6M2_EK/mpconfigboard.h
+++ b/ports/renesas-ra/boards/RA6M2_EK/mpconfigboard.h
@@ -77,8 +77,8 @@
 // Switch
 #define MICROPY_HW_HAS_SWITCH       (1)
 #define MICROPY_HW_USRSW_PIN        (pin_P105)
-#define MICROPY_HW_USRSW_PULL       (GPIO_NOPULL)
-#define MICROPY_HW_USRSW_EXTI_MODE  (GPIO_MODE_IT_FALLING)
+#define MICROPY_HW_USRSW_PULL       (MP_HAL_PIN_PULL_NONE)
+#define MICROPY_HW_USRSW_EXTI_MODE  (MP_HAL_PIN_TRIGGER_FALLING)
 #define MICROPY_HW_USRSW_PRESSED    (0)
 
 // LEDs
diff --git a/ports/renesas-ra/extint.c b/ports/renesas-ra/extint.c
index 19caa7a3b3fef..59f9ecfa37ea0 100644
--- a/ports/renesas-ra/extint.c
+++ b/ports/renesas-ra/extint.c
@@ -138,8 +138,8 @@ uint extint_register(mp_obj_t pin_obj, uint32_t mode, uint32_t pull, mp_obj_t ca
             mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("The Pin object(%d) doesn't have EXTINT feature"), pin_idx);
         }
     }
-    if (pull != GPIO_NOPULL &&
-        pull != GPIO_PULLUP) {
+    if ((pull != MP_HAL_PIN_PULL_NONE) &&
+        (pull != MP_HAL_PIN_PULL_UP)) {
         mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("invalid ExtInt Pull: %d"), pull);
     }
     mp_obj_t *cb = &MP_STATE_PORT(pyb_extint_callback)[v_line];
@@ -153,7 +153,6 @@ uint extint_register(mp_obj_t pin_obj, uint32_t mode, uint32_t pull, mp_obj_t ca
     extint_disable(v_line);
 
     *cb = callback_obj;
-    // ToDo: mode should be handled
     pyb_extint_mode[v_line] = mode;
     pyb_extint_callback_arg[v_line] = MP_OBJ_NEW_SMALL_INT(v_line);
     if (*cb != mp_const_none) {
@@ -200,7 +199,6 @@ void extint_register_pin(const machine_pin_obj_t *pin, uint32_t mode, bool hard_
     extint_disable(line);
 
     *cb = callback_obj;
-    // ToDo: mode should be handled
     pyb_extint_mode[line] = mode;
 
     if (*cb != mp_const_none) {
@@ -255,16 +253,16 @@ void extint_trigger_mode(uint line, uint32_t mode) {
     // cond: 0: falling, 1: rising, 2: both edge, 3 low level
     // Enable or disable the rising detector
     uint32_t cond = 0;
-    if ((mode == GPIO_MODE_IT_RISING) || (mode == GPIO_MODE_EVT_RISING)) {
-        cond = 1;
-    } else if ((mode == GPIO_MODE_IT_FALLING) || (mode == GPIO_MODE_EVT_FALLING)) {
-        cond = 0;
-    } else if ((mode == GPIO_MODE_IT_RISING_FALLING) || (mode == GPIO_MODE_EVT_RISING_FALLING)) {
-        cond = 2;
-    } else if (mode == GPIO_IRQ_LOWLEVEL) {
+    if (mode & MP_HAL_PIN_TRIGGER_LOWLEVEL) {
         cond = 3;
+    } else if (mode & MP_HAL_PIN_TRIGGER_FALLING) {
+        if (mode & MP_HAL_PIN_TRIGGER_RISING) {
+            cond = 2;
+        } else {
+            cond = 0;
+        }
     } else {
-        mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("The device doesn't have (%d) feature"), (uint32_t)mode);
+        cond = 1;
     }
     ra_icu_trigger_irq_no((uint8_t)line, cond);
     enable_irq(irq_state);
@@ -372,14 +370,6 @@ STATIC const mp_rom_map_elem_t extint_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_disable), MP_ROM_PTR(&extint_obj_disable_obj) },
     { MP_ROM_QSTR(MP_QSTR_swint),   MP_ROM_PTR(&extint_obj_swint_obj) },
     { MP_ROM_QSTR(MP_QSTR_regs),    MP_ROM_PTR(&extint_regs_obj) },
-
-    // class constants
-    /// \constant IRQ_RISING - interrupt on a rising edge
-    /// \constant IRQ_FALLING - interrupt on a falling edge
-    /// \constant IRQ_RISING_FALLING - interrupt on a rising or falling edge
-    { MP_ROM_QSTR(MP_QSTR_IRQ_RISING),         MP_ROM_INT(GPIO_MODE_IT_RISING) },
-    { MP_ROM_QSTR(MP_QSTR_IRQ_FALLING),        MP_ROM_INT(GPIO_MODE_IT_FALLING) },
-    { MP_ROM_QSTR(MP_QSTR_IRQ_RISING_FALLING), MP_ROM_INT(GPIO_MODE_IT_RISING_FALLING) },
 };
 
 STATIC MP_DEFINE_CONST_DICT(extint_locals_dict, extint_locals_dict_table);
diff --git a/ports/renesas-ra/machine_pin.c b/ports/renesas-ra/machine_pin.c
index 6e852e9cbf1d6..f940b55547eba 100644
--- a/ports/renesas-ra/machine_pin.c
+++ b/ports/renesas-ra/machine_pin.c
@@ -78,7 +78,7 @@ STATIC void machine_pin_print(const mp_print_t *print, mp_obj_t self_in, mp_prin
 
     uint32_t mode = pin_get_mode(self);
 
-    if (mode == GPIO_MODE_ANALOG) {
+    if (mode == MP_HAL_PIN_MODE_ANALOG) {
         // analog
         mp_print_str(print, "ANALOG)");
 
@@ -86,15 +86,15 @@ STATIC void machine_pin_print(const mp_print_t *print, mp_obj_t self_in, mp_prin
         // IO mode
         bool af = false;
         qstr mode_qst;
-        if (mode == GPIO_MODE_INPUT) {
+        if (mode == MP_HAL_PIN_MODE_INPUT) {
             mode_qst = MP_QSTR_IN;
-        } else if (mode == GPIO_MODE_OUTPUT_PP) {
+        } else if (mode == MP_HAL_PIN_MODE_OUTPUT) {
             mode_qst = MP_QSTR_OUT;
-        } else if (mode == GPIO_MODE_OUTPUT_OD) {
+        } else if (mode == MP_HAL_PIN_MODE_OPEN_DRAIN) {
             mode_qst = MP_QSTR_OPEN_DRAIN;
         } else {
             af = true;
-            if (mode == GPIO_MODE_AF_PP) {
+            if (mode == MP_HAL_PIN_MODE_ALT) {
                 mode_qst = MP_QSTR_ALT;
             } else {
                 mode_qst = MP_QSTR_ALT_OPEN_DRAIN;
@@ -105,9 +105,9 @@ STATIC void machine_pin_print(const mp_print_t *print, mp_obj_t self_in, mp_prin
         // pull mode
         qstr pull_qst = MP_QSTRnull;
         uint32_t pull = pin_get_pull(self);
-        if (pull == GPIO_PULLUP) {
+        if (pull == MP_HAL_PIN_PULL_UP) {
             pull_qst = MP_QSTR_PULL_UP;
-        } else if (pull == GPIO_NOPULL) {
+        } else if (pull == MP_HAL_PIN_PULL_NONE) {
             pull_qst = MP_QSTR_PULL_NONE;
         }
         if (pull_qst != MP_QSTRnull) {
@@ -117,12 +117,14 @@ STATIC void machine_pin_print(const mp_print_t *print, mp_obj_t self_in, mp_prin
         // drive
         qstr drive_qst = MP_QSTRnull;
         uint32_t drive = pin_get_drive(self);
-        if (drive == GPIO_HIGH_POWER) {
-            drive_qst = MP_QSTR_HIGH_POWER;
-        } else if (drive == GPIO_MED_POWER) {
-            drive_qst = MP_QSTR_MED_POWER;
-        } else if (drive == GPIO_LOW_POWER) {
-            drive_qst = MP_QSTR_LOW_POWER;
+        if (drive == MP_HAL_PIN_DRIVE_3) {
+            drive_qst = MP_QSTR_DRIVE_3;
+        } else if (drive == MP_HAL_PIN_DRIVE_2) {
+            drive_qst = MP_QSTR_DRIVE_2;
+        } else if (drive == MP_HAL_PIN_DRIVE_1) {
+            drive_qst = MP_QSTR_DRIVE_1;
+        } else if (drive == MP_HAL_PIN_DRIVE_0) {
+            drive_qst = MP_QSTR_DRIVE_0;
         }
         if (drive_qst != MP_QSTRnull) {
             mp_printf(print, ", drive=Pin.%q", drive_qst);
@@ -143,14 +145,14 @@ STATIC void machine_pin_print(const mp_print_t *print, mp_obj_t self_in, mp_prin
     }
 }
 
-// pin.init(mode, pull=None, *, value=None, driver=None, alt=FUNC_SIO)
+// pin.init(mode=-1, pull=-1, *, value=None, drive=0, alt=-1)
 STATIC mp_obj_t machine_pin_obj_init_helper(const machine_pin_obj_t *self, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    enum { ARG_mode, ARG_pull, ARG_value, ARG_drive, ARG_alt };
     static const mp_arg_t allowed_args[] = {
-        { MP_QSTR_mode, MP_ARG_REQUIRED | MP_ARG_INT },
+        { MP_QSTR_mode, MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE}},
         { MP_QSTR_pull, MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE}},
-        { MP_QSTR_af, MP_ARG_INT, {.u_int = -1}}, // legacy
-        { MP_QSTR_value, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL}},
-        { MP_QSTR_drive, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = GPIO_LOW_POWER}},
+        { MP_QSTR_value, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE}},
+        { MP_QSTR_drive, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE}},
         { MP_QSTR_alt, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1}},
     };
 
@@ -159,29 +161,50 @@ STATIC mp_obj_t machine_pin_obj_init_helper(const machine_pin_obj_t *self, size_
     mp_arg_parse_all(n_args, pos_args, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
 
     // get io mode
-    uint mode = args[0].u_int;
-    if (!IS_GPIO_MODE(mode)) {
-        mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("invalid pin mode: %d"), mode);
+    uint32_t mode;
+    if (args[ARG_mode].u_obj != mp_const_none) {
+        mode = mp_obj_get_int(args[ARG_mode].u_obj);
+        if (!IS_GPIO_MODE(mode)) {
+            mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("invalid pin mode: %d"), mode);
+        }
+    } else {
+        mode = ra_gpio_get_mode(self->pin);
     }
 
     // get pull mode
-    uint pull = 0;
-    if (args[1].u_obj != mp_const_none) {
-        pull = mp_obj_get_int(args[1].u_obj);
+    uint32_t pull;
+    if (args[ARG_pull].u_obj != mp_const_none) {
+        pull = mp_obj_get_int(args[ARG_pull].u_obj);
+        if (!IS_GPIO_PULL(pull)) {
+            mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("invalid pull mode: %d"), pull);
+        }
+        if (pull == MP_HAL_PIN_PULL_DOWN) {
+            mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("%q is not supported"), MP_QSTR_PULL_DOWN);
+        }
+    } else {
+        pull = ra_gpio_get_pull(self->pin);
     }
 
     // get drive
-    uint drive = args[4].u_int;
-    if (!IS_GPIO_DRIVE(drive)) {
-        mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("invalid pin drive: %d"), drive);
+    uint32_t drive;
+    if (args[ARG_drive].u_obj != mp_const_none) {
+        drive = mp_obj_get_int(args[ARG_drive].u_obj);
+        if (!IS_GPIO_DRIVE(drive)) {
+            mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("invalid pin drive: %d"), drive);
+        }
+    } else {
+        drive = ra_gpio_get_drive(self->pin);
     }
 
-    mp_hal_pin_config(self, mode, pull, drive, -1);
+    // get alt
+    if (args[ARG_alt].u_int != (-1)) {
+        mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("alt is not supported"));
+    }
+    mp_hal_pin_config(self, mode, pull, drive, 0);
     // if given, set the pin value before initialising to prevent glitches
-    if (args[3].u_obj != MP_OBJ_NULL) {
-        mp_hal_pin_write(self, mp_obj_is_true(args[3].u_obj));
+    if (args[ARG_value].u_obj != mp_const_none) {
+        mp_hal_pin_write(self, mp_obj_is_true(args[ARG_value].u_obj));
     }
-
     return mp_const_none;
 }
 
@@ -249,13 +272,17 @@ STATIC mp_obj_t machine_pin_irq(size_t n_args, const mp_obj_t *pos_args, mp_map_
     enum { ARG_handler, ARG_trigger, ARG_hard };
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_handler, MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
-        { MP_QSTR_trigger, MP_ARG_INT, {.u_int = GPIO_MODE_IT_RISING | GPIO_MODE_IT_FALLING} },
+        { MP_QSTR_trigger, MP_ARG_INT, {.u_int = MP_HAL_PIN_TRIGGER_RISING | MP_HAL_PIN_TRIGGER_FALLING} },
         { MP_QSTR_hard, MP_ARG_BOOL, {.u_bool = false} },
     };
     machine_pin_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]);
     mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
     mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
 
+    if (args[ARG_trigger].u_int & MP_HAL_PIN_TRIGGER_HIGHLEVEL) {
+        mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("%q is not supported"), MP_QSTR_IRQ_HIGH_LEVEL);
+    }
+
     if (n_args > 1 || kw_args->used != 0) {
         // configure irq
         extint_register_pin(self, args[ARG_trigger].u_int,
@@ -282,27 +309,23 @@ STATIC const mp_rom_map_elem_t machine_pin_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_cpu),     MP_ROM_PTR(&pin_cpu_pins_obj_type) },
 
     // class constants
-    { MP_ROM_QSTR(MP_QSTR_IN), MP_ROM_INT(GPIO_MODE_INPUT) },
-    { MP_ROM_QSTR(MP_QSTR_OUT), MP_ROM_INT(GPIO_MODE_OUTPUT_PP) },
-    { MP_ROM_QSTR(MP_QSTR_OPEN_DRAIN), MP_ROM_INT(GPIO_MODE_OUTPUT_OD) },
-    { MP_ROM_QSTR(MP_QSTR_ALT), MP_ROM_INT(GPIO_MODE_AF_PP) },
-    { MP_ROM_QSTR(MP_QSTR_ALT_OPEN_DRAIN), MP_ROM_INT(GPIO_MODE_AF_OD) },
-    { MP_ROM_QSTR(MP_QSTR_ANALOG), MP_ROM_INT(GPIO_MODE_ANALOG) },
-    { MP_ROM_QSTR(MP_QSTR_PULL_UP), MP_ROM_INT(GPIO_PULLUP) },
-    { MP_ROM_QSTR(MP_QSTR_PULL_DOWN), MP_ROM_INT(GPIO_PULLDOWN) },
-    { MP_ROM_QSTR(MP_QSTR_PULL_HOLD), MP_ROM_INT(GPIO_PULLHOLD) },
-    { MP_ROM_QSTR(MP_QSTR_PULL_NONE), MP_ROM_INT(GPIO_NOPULL) },
-    { MP_ROM_QSTR(MP_QSTR_LOW_POWER), MP_ROM_INT(GPIO_LOW_POWER) },
-    { MP_ROM_QSTR(MP_QSTR_MED_POWER), MP_ROM_INT(GPIO_MED_POWER) },
-    { MP_ROM_QSTR(MP_QSTR_HIGH_POWER), MP_ROM_INT(GPIO_HIGH_POWER) },
-    { MP_ROM_QSTR(MP_QSTR_IRQ_RISING), MP_ROM_INT(GPIO_MODE_IT_RISING) },
-    { MP_ROM_QSTR(MP_QSTR_IRQ_FALLING), MP_ROM_INT(GPIO_MODE_IT_FALLING) },
-    { MP_ROM_QSTR(MP_QSTR_IRQ_RISING_FALLING), MP_ROM_INT(GPIO_MODE_IT_RISING_FALLING) },
-    { MP_ROM_QSTR(MP_QSTR_EVT_RISING), MP_ROM_INT(GPIO_MODE_EVT_RISING) },
-    { MP_ROM_QSTR(MP_QSTR_EVT_FALLING), MP_ROM_INT(GPIO_MODE_EVT_FALLING) },
-    { MP_ROM_QSTR(MP_QSTR_EVT_RISING_FALLING), MP_ROM_INT(GPIO_MODE_EVT_RISING_FALLING) },
-    { MP_ROM_QSTR(MP_QSTR_IRQ_LOWLEVEL), MP_ROM_INT(GPIO_IRQ_LOWLEVEL) },
-    { MP_ROM_QSTR(MP_QSTR_IRQ_HIGHLEVEL), MP_ROM_INT(GPIO_IRQ_HIGHLEVEL) },
+    { MP_ROM_QSTR(MP_QSTR_IN), MP_ROM_INT(MP_HAL_PIN_MODE_INPUT) },
+    { MP_ROM_QSTR(MP_QSTR_OUT), MP_ROM_INT(MP_HAL_PIN_MODE_OUTPUT) },
+    { MP_ROM_QSTR(MP_QSTR_OPEN_DRAIN), MP_ROM_INT(MP_HAL_PIN_MODE_OPEN_DRAIN) },
+    { MP_ROM_QSTR(MP_QSTR_ALT), MP_ROM_INT(MP_HAL_PIN_MODE_ALT) },
+    { MP_ROM_QSTR(MP_QSTR_ALT_OPEN_DRAIN), MP_ROM_INT(MP_HAL_PIN_MODE_ALT_OPEN_DRAIN) },
+    { MP_ROM_QSTR(MP_QSTR_ANALOG), MP_ROM_INT(MP_HAL_PIN_MODE_ANALOG) },
+    { MP_ROM_QSTR(MP_QSTR_PULL_NONE), MP_ROM_INT(MP_HAL_PIN_PULL_NONE) },
+    { MP_ROM_QSTR(MP_QSTR_PULL_UP), MP_ROM_INT(MP_HAL_PIN_PULL_UP) },
+    { MP_ROM_QSTR(MP_QSTR_PULL_DOWN), MP_ROM_INT(MP_HAL_PIN_PULL_DOWN) },
+    { MP_ROM_QSTR(MP_QSTR_DRIVE_0), MP_ROM_INT(MP_HAL_PIN_DRIVE_0) },
+    { MP_ROM_QSTR(MP_QSTR_DRIVE_1), MP_ROM_INT(MP_HAL_PIN_DRIVE_1) },
+    { MP_ROM_QSTR(MP_QSTR_DRIVE_2), MP_ROM_INT(MP_HAL_PIN_DRIVE_2) },
+    { MP_ROM_QSTR(MP_QSTR_DRIVE_3), MP_ROM_INT(MP_HAL_PIN_DRIVE_3) },
+    { MP_ROM_QSTR(MP_QSTR_IRQ_FALLING), MP_ROM_INT(MP_HAL_PIN_TRIGGER_FALLING) },
+    { MP_ROM_QSTR(MP_QSTR_IRQ_RISING), MP_ROM_INT(MP_HAL_PIN_TRIGGER_RISING) },
+    { MP_ROM_QSTR(MP_QSTR_IRQ_LOW_LEVEL), MP_ROM_INT(MP_HAL_PIN_TRIGGER_LOWLEVEL) },
+    { MP_ROM_QSTR(MP_QSTR_IRQ_HIGH_LEVEL), MP_ROM_INT(MP_HAL_PIN_TRIGGER_HIGHLEVEL) },
 };
 STATIC MP_DEFINE_CONST_DICT(machine_pin_locals_dict, machine_pin_locals_dict_table);
 
@@ -352,7 +375,8 @@ uint32_t pin_get_pull(const machine_pin_obj_t *pin) {
 }
 
 // Returns the pin drive. The value returned by this macro should
-// be one of GPIO_HIGH_POWER, GPIO_MED_POWER, or GPIO_LOW_POWER.
+// be one of GPIO_HIGH_POWER, GPIO_MID_FAST_POWER, GPIO_MID_POWER,
+// or GPIO_LOW_POWER.
 
 uint32_t pin_get_drive(const machine_pin_obj_t *pin) {
     return (uint32_t)ra_gpio_get_drive(pin->pin);
diff --git a/ports/renesas-ra/mphalport.h b/ports/renesas-ra/mphalport.h
index c489d1b966a74..2648e22f994ca 100644
--- a/ports/renesas-ra/mphalport.h
+++ b/ports/renesas-ra/mphalport.h
@@ -4,7 +4,7 @@
  * The MIT License (MIT)
  *
  * Copyright (c) 2018 Damien P. George
- * Copyright (c) 2021 Renesas Electronics Corporation
+ * Copyright (c) 2021-2022 Renesas Electronics Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -69,13 +69,21 @@ static inline mp_uint_t mp_hal_ticks_cpu(void) {
 #define MP_HAL_PIN_PULL_NONE            (GPIO_NOPULL)
 #define MP_HAL_PIN_PULL_UP              (GPIO_PULLUP)
 #define MP_HAL_PIN_PULL_DOWN            (GPIO_PULLDOWN)
+#define MP_HAL_PIN_TRIGGER_FALLING      (GPIO_IRQ_FALLING)
+#define MP_HAL_PIN_TRIGGER_RISING       (GPIO_IRQ_RISING)
+#define MP_HAL_PIN_TRIGGER_LOWLEVEL     (GPIO_IRQ_LOWLEVEL)
+#define MP_HAL_PIN_TRIGGER_HIGHLEVEL    (GPIO_IRQ_HIGHLEVEL)
+#define MP_HAL_PIN_DRIVE_0              (GPIO_LOW_POWER)
+#define MP_HAL_PIN_DRIVE_1              (GPIO_MID_POWER)
+#define MP_HAL_PIN_DRIVE_2              (GPIO_MID_FAST_POWER)
+#define MP_HAL_PIN_DRIVE_3              (GPIO_HIGH_POWER)
 
 #define mp_hal_pin_obj_t        const machine_pin_obj_t *
 #define mp_hal_get_pin_obj(o)   machine_pin_find(o)
 #define mp_hal_pin_name(p)      ((p)->name)
 #define mp_hal_pin_input(p)     ra_gpio_mode_input((p)->pin)
 #define mp_hal_pin_output(p)    ra_gpio_mode_output((p)->pin)
-#define mp_hal_pin_open_drain(p)    ra_gpio_config((p)->pin, GPIO_MODE_OUTPUT_OD, 0, 0, 0)
+#define mp_hal_pin_open_drain(p)    ra_gpio_config((p)->pin, MP_HAL_PIN_MODE_OPEN_DRAIN, MP_HAL_PIN_PULL_NONE, MP_HAL_PIN_DRIVE_0, 0)
 #define mp_hal_pin_high(p)      ra_gpio_write((p)->pin, 1)
 #define mp_hal_pin_low(p)       ra_gpio_write((p)->pin, 0)
 #define mp_hal_pin_toggle(p)    ra_gpio_toggle((p)->pin)
diff --git a/ports/renesas-ra/ra/ra_gpio.c b/ports/renesas-ra/ra/ra_gpio.c
index 598546cb93493..a01131953c1f3 100644
--- a/ports/renesas-ra/ra/ra_gpio.c
+++ b/ports/renesas-ra/ra/ra_gpio.c
@@ -31,23 +31,17 @@ void ra_gpio_config(uint32_t pin, uint32_t mode, uint32_t pull, uint32_t drive,
     uint32_t port = GPIO_PORT(pin);
     uint32_t bit = GPIO_BIT(pin);
     pwpr_unprotect();
+    _PXXPFS(port, bit) &= ~(PMR_MASK | ASEL_MASK | NCODR_MASK | PCR_MASK | PDR_MASK | DSCR1_MASK | DSCR_MASK);
     switch (mode) {
         case GPIO_MODE_INPUT:
-            _PXXPFS(port, bit) &= ~(PMR_MASK | ASEL_MASK);  // GPIO
-            _PXXPFS(port, bit) &= ~PDR_MASK;    // input
-            if (pull != 0) {
+            if (pull == GPIO_PULLUP) {
                 _PXXPFS(port, bit) |= PCR_MASK;     // set pullup
-            } else {
-                _PXXPFS(port, bit) &= ~PCR_MASK;    // clear pullup
             }
             break;
         case GPIO_MODE_OUTPUT_PP:
-            _PXXPFS(port, bit) &= ~(PMR_MASK | ASEL_MASK);  // GPIO
             _PXXPFS(port, bit) |= PDR_MASK;     // output
-            _PXXPFS(port, bit) &= ~PCR_MASK;    // pullup clear
             break;
         case GPIO_MODE_OUTPUT_OD:
-            _PXXPFS(port, bit) &= ~(PMR_MASK | ASEL_MASK);  // GPIO
             _PXXPFS(port, bit) |= (PDR_MASK | NCODR_MASK);
             break;
         case GPIO_MODE_AF_PP:
@@ -56,20 +50,23 @@ void ra_gpio_config(uint32_t pin, uint32_t mode, uint32_t pull, uint32_t drive,
         case GPIO_MODE_AF_OD:
             _PXXPFS(port, bit) |= (PMR_MASK | PDR_MASK | NCODR_MASK);
             break;
+        case GPIO_MODE_ANALOG:
+            _PXXPFS(port, bit) |= ASEL_MASK;
+            break;
     }
     switch (drive) {
         case GPIO_HIGH_POWER:
             _PXXPFS(port, bit) |= (DSCR1_MASK | DSCR_MASK);
             break;
-        case GPIO_MED_POWER:
-            _PXXPFS(port, bit) &= ~DSCR1_MASK;
+        case GPIO_MID_FAST_POWER:
+            _PXXPFS(port, bit) |= DSCR1_MASK;
+            break;
+        case GPIO_MID_POWER:
             _PXXPFS(port, bit) |= DSCR_MASK;
             break;
         case GPIO_LOW_POWER:
-            _PXXPFS(port, bit) &= ~(DSCR1_MASK | DSCR_MASK);
-            break;
-        default: /* GPIO_NOTOUCH_POWER */
-            /* do not modify */
+        default:
+            /* Bits are already cleared */
             break;
     }
     _PXXPFS(port, bit) &= ~(uint32_t)(0x1f000000);
@@ -102,7 +99,6 @@ void ra_gpio_toggle(uint32_t pin) {
     uint32_t port = GPIO_PORT(pin);
     uint32_t bit = GPIO_BIT(pin);
     pwpr_unprotect();
-    _PXXPFS(port, bit) &= ~(PMR_MASK | ASEL_MASK);  // GPIO
     _PXXPFS(port, bit) ^= 1;
     pwpr_protect();
 }
@@ -111,7 +107,6 @@ void ra_gpio_write(uint32_t pin, uint32_t value) {
     uint32_t port = GPIO_PORT(pin);
     uint32_t bit = GPIO_BIT(pin);
     pwpr_unprotect();
-    _PXXPFS(port, bit) &= ~(PMR_MASK | ASEL_MASK);  // GPIO
     if (value != 0) {
         _PXXPFS(port, bit) |= 1;
     } else {
@@ -123,15 +118,26 @@ void ra_gpio_write(uint32_t pin, uint32_t value) {
 uint32_t ra_gpio_read(uint32_t pin) {
     uint32_t port = GPIO_PORT(pin);
     uint32_t bit = GPIO_BIT(pin);
-    return ((_PXXPFS(port, bit) &= PIDR_MASK) != 0) ? 1 : 0;
+    return ((_PXXPFS(port, bit) & PIDR_MASK) != 0) ? 1 : 0;
 }
 
 uint32_t ra_gpio_get_mode(uint32_t pin) {
     uint8_t mode = 0;
-    uint32_t port = GPIO_PORT(pin);
-    uint32_t bit = GPIO_BIT(pin);
-    if ((_PXXPFS(port, bit) &= PDR_MASK) != 0) {
-        mode = GPIO_MODE_OUTPUT_PP;
+    uint32_t pfs = _PXXPFS(GPIO_PORT(pin), GPIO_BIT(pin));
+    if ((pfs & ASEL_MASK) != 0) {
+        mode = GPIO_MODE_ANALOG;
+    } else if ((pfs & PMR_MASK) != 0) {
+        if ((pfs & NCODR_MASK) != 0) {
+            mode = GPIO_MODE_AF_OD;
+        } else {
+            mode = GPIO_MODE_AF_PP;
+        }
+    } else if ((pfs & PDR_MASK) != 0) {
+        if ((pfs & NCODR_MASK) != 0) {
+            mode = GPIO_MODE_OUTPUT_OD;
+        } else {
+            mode = GPIO_MODE_OUTPUT_PP;
+        }
     } else {
         mode = GPIO_MODE_INPUT;
     }
@@ -142,7 +148,7 @@ uint32_t ra_gpio_get_pull(uint32_t pin) {
     uint8_t pull = 0;
     uint32_t port = GPIO_PORT(pin);
     uint32_t bit = GPIO_BIT(pin);
-    if ((_PXXPFS(port, bit) &= PCR_MASK) != 0) {
+    if ((_PXXPFS(port, bit) & PCR_MASK) != 0) {
         pull = GPIO_PULLUP;
     } else {
         pull = GPIO_NOPULL;
@@ -153,19 +159,22 @@ uint32_t ra_gpio_get_pull(uint32_t pin) {
 uint32_t ra_gpio_get_af(uint32_t pin) {
     uint32_t port = GPIO_PORT(pin);
     uint32_t bit = GPIO_BIT(pin);
-    return (_PXXPFS(port, bit) &= PMR_MASK) != 0;
+    return (_PXXPFS(port, bit) & PMR_MASK) != 0;
 }
 
 uint32_t ra_gpio_get_drive(uint32_t pin) {
     uint8_t drive = 0;
     uint32_t port = GPIO_PORT(pin);
     uint32_t bit = GPIO_BIT(pin);
-    switch (_PXXPFS(port, bit) &= (DSCR1_MASK | DSCR_MASK)) {
+    switch (_PXXPFS(port, bit) & (DSCR1_MASK | DSCR_MASK)) {
         case (DSCR1_MASK | DSCR_MASK):
             drive = GPIO_HIGH_POWER;
             break;
+        case DSCR1_MASK:
+            drive = GPIO_MID_FAST_POWER;
+            break;
         case DSCR_MASK:
-            drive = GPIO_MED_POWER;
+            drive = GPIO_MID_POWER;
             break;
         case 0:
         default:
diff --git a/ports/renesas-ra/ra/ra_gpio.h b/ports/renesas-ra/ra/ra_gpio.h
index 7b76016635342..8c16fe3ba18c7 100644
--- a/ports/renesas-ra/ra/ra_gpio.h
+++ b/ports/renesas-ra/ra/ra_gpio.h
@@ -1,7 +1,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2021 Renesas Electronics Corporation
+ * Copyright (c) 2021,2022 Renesas Electronics Corporation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -69,47 +69,42 @@ enum AF_INDEX {
     AF_END = 0xff,
 };
 
-#define  GPIO_MODE_INPUT        1
-#define  GPIO_MODE_OUTPUT_PP    2
-#define  GPIO_MODE_OUTPUT_OD    3
-#define  GPIO_MODE_AF_PP        4
-#define  GPIO_MODE_AF_OD        5
-#define  GPIO_MODE_ANALOG       6
-#define  GPIO_MODE_IT_RISING    7
-#define  GPIO_MODE_IT_FALLING   8
-#define  GPIO_MODE_IT_RISING_FALLING 9
-#define  GPIO_MODE_EVT_RISING   10
-#define  GPIO_MODE_EVT_FALLING  11
-#define  GPIO_MODE_EVT_RISING_FALLING   12
-#define  GPIO_NOPULL            13
-#define  GPIO_PULLUP            14
-#define  GPIO_PULLDOWN          15
-#define  GPIO_PULLHOLD          16
-#define  GPIO_LOW_POWER         17
-#define  GPIO_MED_POWER         18
-#define  GPIO_HIGH_POWER        19
-#define  GPIO_NOTOUCH_POWER     20
-#define  GPIO_IRQ_LOWLEVEL      21
-#define  GPIO_IRQ_HIGHLEVEL     22
+#define  GPIO_MODE_INPUT        0
+#define  GPIO_MODE_OUTPUT_PP    1
+#define  GPIO_MODE_OUTPUT_OD    2
+#define  GPIO_MODE_AF_PP        3
+#define  GPIO_MODE_AF_OD        4
+#define  GPIO_MODE_ANALOG       5
+
+#define  GPIO_IRQ_FALLING       0x1
+#define  GPIO_IRQ_RISING        0x2
+#define  GPIO_IRQ_LOWLEVEL      0x4
+#define  GPIO_IRQ_HIGHLEVEL     0x8
+
+#define  GPIO_NOPULL            0
+#define  GPIO_PULLUP            1
+#define  GPIO_PULLDOWN          2
+
+#define  GPIO_LOW_POWER         0
+#define  GPIO_MID_POWER         1
+#define  GPIO_MID_FAST_POWER    2
+#define  GPIO_HIGH_POWER        3
 
 #define IS_GPIO_MODE(MODE) (((MODE) == GPIO_MODE_INPUT) || \
     ((MODE) == GPIO_MODE_OUTPUT_PP) || \
     ((MODE) == GPIO_MODE_OUTPUT_OD) || \
     ((MODE) == GPIO_MODE_AF_PP) || \
     ((MODE) == GPIO_MODE_AF_OD) || \
-    ((MODE) == GPIO_MODE_IT_RISING) || \
-    ((MODE) == GPIO_MODE_IT_FALLING) || \
-    ((MODE) == GPIO_MODE_IT_RISING_FALLING) || \
-    ((MODE) == GPIO_MODE_EVT_RISING) || \
-    ((MODE) == GPIO_MODE_EVT_FALLING) || \
-    ((MODE) == GPIO_MODE_EVT_RISING_FALLING) || \
     ((MODE) == GPIO_MODE_ANALOG))
 
 #define IS_GPIO_DRIVE(DRIVE) (((DRIVE) == GPIO_LOW_POWER) || \
-    ((DRIVE) == GPIO_MED_POWER) || \
+    ((DRIVE) == GPIO_MID_POWER) || \
+    ((DRIVE) == GPIO_MID_FAST_POWER) || \
     ((DRIVE) == GPIO_HIGH_POWER))
 
-#define IS_GPIO_PULL(PULL) (((PULL) == GPIO_NOPULL) || ((PULL) == GPIO_PULLUP))
+#define IS_GPIO_PULL(PULL) (((PULL) == GPIO_NOPULL) || \
+    ((PULL) == GPIO_PULLUP) || \
+    ((PULL) == GPIO_PULLDOWN))
 
 #define IS_GPIO_AF(AF)   ((AF) <= (uint8_t)0x1F)
 
diff --git a/ports/renesas-ra/ra/ra_i2c.c b/ports/renesas-ra/ra/ra_i2c.c
index 64bbd6f501b43..ad1e3a74e0de3 100644
--- a/ports/renesas-ra/ra/ra_i2c.c
+++ b/ports/renesas-ra/ra/ra_i2c.c
@@ -362,8 +362,8 @@ void ra_i2c_set_baudrate(R_IIC0_Type *i2c_inst, uint32_t baudrate) {
 
 void ra_i2c_init(R_IIC0_Type *i2c_inst, uint32_t scl, uint32_t sda, uint32_t baudrate) {
     ra_i2c_module_start(i2c_inst);
-    ra_gpio_config(scl, GPIO_MODE_AF_OD, 0, GPIO_NOTOUCH_POWER, AF_I2C);
-    ra_gpio_config(sda, GPIO_MODE_AF_OD, 0, GPIO_NOTOUCH_POWER, AF_I2C);
+    ra_gpio_config(scl, GPIO_MODE_AF_OD, GPIO_NOPULL, GPIO_LOW_POWER, AF_I2C);
+    ra_gpio_config(sda, GPIO_MODE_AF_OD, GPIO_NOPULL, GPIO_LOW_POWER, AF_I2C);
     ra_i2c_priority(i2c_inst, RA_PRI_I2C);
     i2c_inst->ICCR1_b.ICE = 0;     // I2C disable
     i2c_inst->ICCR1_b.IICRST = 1;  // I2C internal reset
diff --git a/ports/renesas-ra/ra/ra_sci.c b/ports/renesas-ra/ra/ra_sci.c
index 8cf26680cc6e7..2e7c81c4ac477 100644
--- a/ports/renesas-ra/ra/ra_sci.c
+++ b/ports/renesas-ra/ra/ra_sci.c
@@ -788,7 +788,7 @@ static void ra_sci_tx_set_pin(uint32_t pin) {
     uint32_t af;
     find = ra_af_find_ch_af((ra_af_pin_t *)&ra_sci_tx_pins, SCI_TX_PINS_SIZE, pin, &ch, &af);
     if (find) {
-        ra_gpio_config(pin, GPIO_MODE_AF_PP, 0, 0, af);
+        ra_gpio_config(pin, GPIO_MODE_AF_PP, GPIO_NOPULL, GPIO_LOW_POWER, af);
     }
 }
 
@@ -798,7 +798,7 @@ static void ra_sci_rx_set_pin(uint32_t pin) {
     uint32_t af;
     find = ra_af_find_ch_af((ra_af_pin_t *)&ra_sci_rx_pins, SCI_RX_PINS_SIZE, pin, &ch, &af);
     if (find) {
-        ra_gpio_config(pin, GPIO_MODE_INPUT, 1, 0, af);
+        ra_gpio_config(pin, GPIO_MODE_INPUT, GPIO_PULLUP, GPIO_LOW_POWER, af);
     }
 }
 
@@ -808,7 +808,7 @@ static void ra_sci_cts_set_pin(uint32_t pin) {
     uint32_t af;
     find = ra_af_find_ch_af((ra_af_pin_t *)&ra_sci_cts_pins, SCI_CTS_PINS_SIZE, pin, &ch, &af);
     if (find) {
-        ra_gpio_config(pin, GPIO_MODE_INPUT, 1, 0, af);
+        ra_gpio_config(pin, GPIO_MODE_INPUT, GPIO_PULLUP, GPIO_LOW_POWER, af);
     }
 }
 
@@ -1134,7 +1134,7 @@ void ra_sci_init_with_flow(uint32_t ch, uint32_t tx_pin, uint32_t rx_pin, uint32
         }
         if (rts_pin != (uint32_t)PIN_END) {
             m_rts_pin[idx] = rts_pin;
-            ra_gpio_config(rts_pin, GPIO_MODE_OUTPUT_PP, false, 0, 0);
+            ra_gpio_config(rts_pin, GPIO_MODE_OUTPUT_PP, GPIO_NOPULL, GPIO_LOW_POWER, 0);
             ra_gpio_write(rts_pin, 0);
         }
     }
diff --git a/ports/renesas-ra/ra/ra_spi.c b/ports/renesas-ra/ra/ra_spi.c
index b7f78cd6deadd..096519ffd6402 100644
--- a/ports/renesas-ra/ra/ra_spi.c
+++ b/ports/renesas-ra/ra/ra_spi.c
@@ -196,9 +196,9 @@ static void ra_spi_module_stop(uint32_t ch) {
 
 static void ra_spi_set_pin(uint32_t pin, bool miso) {
     if (miso) {
-        ra_gpio_config(pin, GPIO_MODE_INPUT, 1, 0, AF_SPI);
+        ra_gpio_config(pin, GPIO_MODE_INPUT, GPIO_PULLUP, GPIO_LOW_POWER, AF_SPI);
     } else {
-        ra_gpio_config(pin, GPIO_MODE_AF_PP, 0, 0, AF_SPI);
+        ra_gpio_config(pin, GPIO_MODE_AF_PP, GPIO_NOPULL, GPIO_LOW_POWER, AF_SPI);
     }
 }
 
diff --git a/ports/renesas-ra/usrsw.c b/ports/renesas-ra/usrsw.c
index 5e11f48e63929..572510816b1f1 100644
--- a/ports/renesas-ra/usrsw.c
+++ b/ports/renesas-ra/usrsw.c
@@ -54,7 +54,7 @@
 
 // this function inits the switch GPIO so that it can be used
 void switch_init0(void) {
-    mp_hal_pin_config(MICROPY_HW_USRSW_PIN, MP_HAL_PIN_MODE_INPUT, MICROPY_HW_USRSW_PULL, GPIO_LOW_POWER, 0);
+    mp_hal_pin_config(MICROPY_HW_USRSW_PIN, MP_HAL_PIN_MODE_INPUT, MICROPY_HW_USRSW_PULL, MP_HAL_PIN_DRIVE_0, 0);
 }
 
 int switch_get(void) {

From 2f2fd36713c2c02f56093338e8c1f3cd7b8d403a Mon Sep 17 00:00:00 2001
From: Takeo Takahashi <takeo.takahashi.xv@renesas.com>
Date: Thu, 23 Jun 2022 22:28:35 +0900
Subject: [PATCH 2556/3533] tests/renesas-ra: Update pin test to support all
 boards.

Signed-off-by: Takeo Takahashi <takeo.takahashi.xv@renesas.com>
---
 tests/renesas-ra/pin.py     | 46 ++++++++-----------------------------
 tests/renesas-ra/pin.py.exp | 12 ++--------
 2 files changed, 11 insertions(+), 47 deletions(-)

diff --git a/tests/renesas-ra/pin.py b/tests/renesas-ra/pin.py
index 61d76cca7c748..4617cce111101 100644
--- a/tests/renesas-ra/pin.py
+++ b/tests/renesas-ra/pin.py
@@ -1,43 +1,15 @@
 from machine import Pin
-import os
 
-n = os.uname().machine
-if "RA4W1_EK" in n:
-    try_pin = "P004"
-    try_s = "Pin(Pin.cpu.P004, mode=Pin.IN, pull=Pin.PULL_NONE, drive=Pin.LOW_POWER)"
+p = Pin("SW1", Pin.IN)
+if p.value() == 1:
+    print("pass")
 else:
-    try_pin = "P000"
-    try_s = "Pin(Pin.cpu.P000, mode=Pin.IN, pull=Pin.PULL_NONE, drive=Pin.LOW_POWER)"
+    print("FAIL")
 
-p = Pin(try_pin, Pin.IN)
-if str(p) == try_s:
-    print("OK")
+p = Pin("LED1", Pin.OUT)
+p.high()
+if p.value() == 1:
+    print("pass")
 else:
-    print("NG")
-    print("exp: " + try_s)
-    print("out: " + str(p))
-
-p.init(p.IN, p.PULL_UP)
-p.init(p.IN, pull=p.PULL_UP)
-p.init(mode=p.IN, pull=p.PULL_UP)
-print(p.value())
-
-p.init(p.OUT)
-p.init(p.OPEN_DRAIN)
+    print("FAIL")
 p.low()
-print(p.value())
-p.high()
-print(p.value())
-p.value(0)
-print(p.value())
-p.value(1)
-print(p.value())
-p.value(False)
-print(p.value())
-p.value(True)
-print(p.value())
-p.off()
-print(p.value())
-p.on()
-print(p.value())
-p.off()
diff --git a/tests/renesas-ra/pin.py.exp b/tests/renesas-ra/pin.py.exp
index 4c8cc50b0c06f..0c34cd7a39ca6 100644
--- a/tests/renesas-ra/pin.py.exp
+++ b/tests/renesas-ra/pin.py.exp
@@ -1,10 +1,2 @@
-OK
-1
-0
-1
-0
-1
-0
-1
-0
-1
+pass
+pass

From af100b70290d20d7e9c3e7d49713e3916b6f05b6 Mon Sep 17 00:00:00 2001
From: Takeo Takahashi <takeo.takahashi.xv@renesas.com>
Date: Thu, 23 Jun 2022 22:29:00 +0900
Subject: [PATCH 2557/3533] docs/renesas-ra: Add pin drive keyword argument
 description.

Signed-off-by: Takeo Takahashi <takeo.takahashi.xv@renesas.com>
---
 docs/renesas-ra/quickref.rst | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/docs/renesas-ra/quickref.rst b/docs/renesas-ra/quickref.rst
index 23ffab50eb80f..47b49575bd5be 100644
--- a/docs/renesas-ra/quickref.rst
+++ b/docs/renesas-ra/quickref.rst
@@ -110,6 +110,24 @@ Use the :ref:`machine.Pin <machine.Pin>` class::
 
 Pin id is available corresponding to the RA MCU's pin name which are Pin.cpu.P106 and 'P106'. The RA MCU has many feature's pins. However, there are some cases that pin feature is fixed or not connected by the board. Please confirm the board manual for the pin mapping.
 
+The following *drive* keyword argument are available if the port drive capability of the Pin is supported by the MCU::
+
+    Pin.DRIVE_0: Low drive
+    Pin.DRIVE_1: Middle drive
+    Pin.DRIVE_2: Middle drive for I2C Fast-mode
+    Pin.DRIVE_3: High drive
+
+The *alt* keyword argument is not supported.
+
+The following functions are not supported::
+
+    Pin.irq(priority=)  # priority keyword argument is not supported
+    Pin.irq(wake=)      # wake keyword argument is not supported
+    Pin.irq(hard=)      # hard keyword argument is ignored because hardware interrupt is used
+    Pin.mode()
+    Pin.pull()
+    Pin.drive()
+
 UART (serial bus)
 -----------------
 

From 0b26efe73dd3396bdc2b77651a78d9f2edeb9004 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sun, 28 Aug 2022 18:14:53 +0200
Subject: [PATCH 2558/3533] extmod/machine_i2c: Call MICROPY_PY_EVENT_HOOK
 during i2c.scan().

Avoiding a watchdog reset during i2c.scan() if the hardware is not properly
set up (eg on esp8266), and also allowing to stop the scan with a
KeyboardInterrupt.

Fixes issue #8876.
---
 extmod/machine_i2c.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/extmod/machine_i2c.c b/extmod/machine_i2c.c
index 2aa217914bfb5..ff597b58c5e5c 100644
--- a/extmod/machine_i2c.c
+++ b/extmod/machine_i2c.c
@@ -328,6 +328,9 @@ STATIC mp_obj_t machine_i2c_scan(mp_obj_t self_in) {
         if (ret == 0) {
             mp_obj_list_append(list, MP_OBJ_NEW_SMALL_INT(addr));
         }
+        #ifdef MICROPY_EVENT_POLL_HOOK
+        MICROPY_EVENT_POLL_HOOK
+        #endif
     }
     return list;
 }

From da7f2537a124191371cbc3bc625ed96a43dc29c7 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Wed, 10 Aug 2022 22:53:39 +1000
Subject: [PATCH 2559/3533] top: Use micropython-lib unconditionally in
 manifests.

micropython-lib is now a submodule, and the manifest compilation process
will ensure it is available, so manifests no longer need to check that it
is available.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/esp8266/boards/GENERIC/manifest.py       | 18 ++++++++----------
 .../ARDUINO_NANO_RP2040_CONNECT/manifest.py    |  3 +--
 ports/rp2/boards/PICO_W/manifest.py            |  3 +--
 3 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/ports/esp8266/boards/GENERIC/manifest.py b/ports/esp8266/boards/GENERIC/manifest.py
index 9ce3ffe3aae15..ef25040ef8a76 100644
--- a/ports/esp8266/boards/GENERIC/manifest.py
+++ b/ports/esp8266/boards/GENERIC/manifest.py
@@ -7,15 +7,13 @@
 # drivers
 freeze("$(MPY_DIR)/drivers/display", "ssd1306.py")
 
-# Libraries from micropython-lib, include only if the library directory exists
-if os.path.isdir(convert_path("$(MPY_LIB_DIR)")):
-    # file utilities
-    freeze("$(MPY_LIB_DIR)/micropython/upysh", "upysh.py")
+# micropython-lib: file utilities
+freeze("$(MPY_LIB_DIR)/micropython/upysh", "upysh.py")
 
-    # requests
-    freeze("$(MPY_LIB_DIR)/python-ecosys/urequests", "urequests.py")
-    freeze("$(MPY_LIB_DIR)/micropython/urllib.urequest", "urllib/urequest.py")
+# micropython-lib: requests
+freeze("$(MPY_LIB_DIR)/python-ecosys/urequests", "urequests.py")
+freeze("$(MPY_LIB_DIR)/micropython/urllib.urequest", "urllib/urequest.py")
 
-    # umqtt
-    freeze("$(MPY_LIB_DIR)/micropython/umqtt.simple", "umqtt/simple.py")
-    freeze("$(MPY_LIB_DIR)/micropython/umqtt.robust", "umqtt/robust.py")
+# micropython-lib: umqtt
+freeze("$(MPY_LIB_DIR)/micropython/umqtt.simple", "umqtt/simple.py")
+freeze("$(MPY_LIB_DIR)/micropython/umqtt.robust", "umqtt/robust.py")
diff --git a/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/manifest.py b/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/manifest.py
index 0448aa89a11e4..7a2f1c9e2738c 100644
--- a/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/manifest.py
+++ b/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/manifest.py
@@ -8,5 +8,4 @@
     l2cap=True,
     security=True,
 )
-if os.path.isdir(convert_path("$(MPY_LIB_DIR)")):
-    freeze("$(MPY_LIB_DIR)/python-ecosys/urequests", "urequests.py")
+freeze("$(MPY_LIB_DIR)/python-ecosys/urequests", "urequests.py")
diff --git a/ports/rp2/boards/PICO_W/manifest.py b/ports/rp2/boards/PICO_W/manifest.py
index eb748da485c98..d2c76602affe8 100644
--- a/ports/rp2/boards/PICO_W/manifest.py
+++ b/ports/rp2/boards/PICO_W/manifest.py
@@ -4,5 +4,4 @@
 freeze("$(MPY_DIR)/tools", "upip_utarfile.py")
 freeze("$(MPY_DIR)/extmod", "ntptime.py")
 
-if os.path.isdir(convert_path("$(MPY_LIB_DIR)")):
-    freeze("$(MPY_LIB_DIR)/python-ecosys/urequests", "urequests.py")
+freeze("$(MPY_LIB_DIR)/python-ecosys/urequests", "urequests.py")

From f3cdb052db1784b38e02f043cb72bda5a57b8696 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Wed, 13 Jul 2022 23:36:45 +1000
Subject: [PATCH 2560/3533] tools/manifestfile.py: Add library for working with
 manifests.

This splits the manifest file loading logic from makemanifest.py and
updates makemanifest.py to use it.

This will allow non-freezing uses of manifests, such as defining packages
and dependencies in micropython-lib.

Also adds additional methods to the manifest "API":
 - require() - to get a package from micropython-lib.
 - module() - to define a single-file module
 - package() - to define a multi-file package

module() and package() should replace most uses of freeze() and can also
be also used in non-freezing scenarios.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 tools/makemanifest.py | 302 +++++++-----------------------
 tools/manifestfile.py | 416 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 477 insertions(+), 241 deletions(-)
 create mode 100644 tools/manifestfile.py

diff --git a/tools/makemanifest.py b/tools/makemanifest.py
index e69698d3f2340..800a25435eb91 100644
--- a/tools/makemanifest.py
+++ b/tools/makemanifest.py
@@ -29,127 +29,10 @@
 import os
 import subprocess
 
-
-###########################################################################
-# Public functions to be used in the manifest
-
-
-def include(manifest, **kwargs):
-    """Include another manifest.
-
-    The manifest argument can be a string (filename) or an iterable of
-    strings.
-
-    Relative paths are resolved with respect to the current manifest file.
-
-    Optional kwargs can be provided which will be available to the
-    included script via the `options` variable.
-
-    e.g. include("path.py", extra_features=True)
-
-    in path.py:
-        options.defaults(standard_features=True)
-
-        # freeze minimal modules.
-        if options.standard_features:
-            # freeze standard modules.
-        if options.extra_features:
-            # freeze extra modules.
-    """
-
-    if not isinstance(manifest, str):
-        for m in manifest:
-            include(m)
-    else:
-        manifest = convert_path(manifest)
-        with open(manifest) as f:
-            # Make paths relative to this manifest file while processing it.
-            # Applies to includes and input files.
-            prev_cwd = os.getcwd()
-            os.chdir(os.path.dirname(manifest))
-            exec(f.read(), globals(), {"options": IncludeOptions(**kwargs)})
-            os.chdir(prev_cwd)
-
-
-def freeze(path, script=None, opt=0):
-    """Freeze the input, automatically determining its type.  A .py script
-    will be compiled to a .mpy first then frozen, and a .mpy file will be
-    frozen directly.
-
-    `path` must be a directory, which is the base directory to search for
-    files from.  When importing the resulting frozen modules, the name of
-    the module will start after `path`, ie `path` is excluded from the
-    module name.
-
-    If `path` is relative, it is resolved to the current manifest.py.
-    Use $(MPY_DIR), $(MPY_LIB_DIR), $(PORT_DIR), $(BOARD_DIR) if you need
-    to access specific paths.
-
-    If `script` is None all files in `path` will be frozen.
-
-    If `script` is an iterable then freeze() is called on all items of the
-    iterable (with the same `path` and `opt` passed through).
-
-    If `script` is a string then it specifies the file or directory to
-    freeze, and can include extra directories before the file or last
-    directory.  The file or directory will be searched for in `path`.  If
-    `script` is a directory then all files in that directory will be frozen.
-
-    `opt` is the optimisation level to pass to mpy-cross when compiling .py
-    to .mpy.
-    """
-
-    freeze_internal(KIND_AUTO, path, script, opt)
-
-
-def freeze_as_str(path):
-    """Freeze the given `path` and all .py scripts within it as a string,
-    which will be compiled upon import.
-    """
-
-    freeze_internal(KIND_AS_STR, path, None, 0)
-
-
-def freeze_as_mpy(path, script=None, opt=0):
-    """Freeze the input (see above) by first compiling the .py scripts to
-    .mpy files, then freezing the resulting .mpy files.
-    """
-
-    freeze_internal(KIND_AS_MPY, path, script, opt)
-
-
-def freeze_mpy(path, script=None, opt=0):
-    """Freeze the input (see above), which must be .mpy files that are
-    frozen directly.
-    """
-
-    freeze_internal(KIND_MPY, path, script, opt)
-
-
-###########################################################################
-# Internal implementation
-
-KIND_AUTO = 0
-KIND_AS_STR = 1
-KIND_AS_MPY = 2
-KIND_MPY = 3
+import manifestfile
 
 VARS = {}
 
-manifest_list = []
-
-
-class IncludeOptions:
-    def __init__(self, **kwargs):
-        self._kwargs = kwargs
-        self._defaults = {}
-
-    def defaults(self, **kwargs):
-        self._defaults = kwargs
-
-    def __getattr__(self, name):
-        return self._kwargs.get(name, self._defaults.get(name, None))
-
 
 class FreezeError(Exception):
     pass
@@ -163,15 +46,6 @@ def system(cmd):
         return -1, er.output
 
 
-def convert_path(path):
-    # Perform variable substituion.
-    for name, value in VARS.items():
-        path = path.replace("$({})".format(name), value)
-    # Convert to absolute path (so that future operations don't rely on
-    # still being chdir'ed).
-    return os.path.abspath(path)
-
-
 def get_timestamp(path, default=None):
     try:
         stat = os.stat(path)
@@ -182,119 +56,64 @@ def get_timestamp(path, default=None):
         return default
 
 
-def get_timestamp_newest(path):
-    ts_newest = 0
-    for dirpath, dirnames, filenames in os.walk(path, followlinks=True):
-        for f in filenames:
-            ts_newest = max(ts_newest, get_timestamp(os.path.join(dirpath, f)))
-    return ts_newest
-
-
 def mkdir(filename):
     path = os.path.dirname(filename)
     if not os.path.isdir(path):
         os.makedirs(path)
 
 
-def freeze_internal(kind, path, script, opt):
-    path = convert_path(path)
-    if not os.path.isdir(path):
-        raise FreezeError("freeze path must be a directory: {}".format(path))
-    if script is None and kind == KIND_AS_STR:
-        manifest_list.append((KIND_AS_STR, path, script, opt))
-    elif script is None or isinstance(script, str) and script.find(".") == -1:
-        # Recursively search `path` for files to freeze, optionally restricted
-        # to a subdirectory specified by `script`
-        if script is None:
-            subdir = ""
-        else:
-            subdir = "/" + script
-        for dirpath, dirnames, filenames in os.walk(path + subdir, followlinks=True):
-            for f in filenames:
-                freeze_internal(kind, path, (dirpath + "/" + f)[len(path) + 1 :], opt)
-    elif not isinstance(script, str):
-        # `script` is an iterable of items to freeze
-        for s in script:
-            freeze_internal(kind, path, s, opt)
-    else:
-        # `script` should specify an individual file to be frozen
-        extension_kind = {KIND_AS_MPY: ".py", KIND_MPY: ".mpy"}
-        if kind == KIND_AUTO:
-            for k, ext in extension_kind.items():
-                if script.endswith(ext):
-                    kind = k
-                    break
-            else:
-                print("warn: unsupported file type, skipped freeze: {}".format(script))
-                return
-        wanted_extension = extension_kind[kind]
-        if not script.endswith(wanted_extension):
-            raise FreezeError("expecting a {} file, got {}".format(wanted_extension, script))
-        manifest_list.append((kind, path, script, opt))
-
-
 # Formerly make-frozen.py.
 # This generates:
 # - MP_FROZEN_STR_NAMES macro
 # - mp_frozen_str_sizes
 # - mp_frozen_str_content
-def generate_frozen_str_content(paths):
-    def module_name(f):
-        return f
-
-    modules = []
-    output = [b"#include <stdint.h>\n"]
-
-    for path in paths:
-        root = path.rstrip("/")
-        root_len = len(root)
-
-        for dirpath, dirnames, filenames in os.walk(root):
-            for f in filenames:
-                fullpath = dirpath + "/" + f
-                st = os.stat(fullpath)
-                modules.append((path, fullpath[root_len + 1 :], st))
-
-    output.append(b"#define MP_FROZEN_STR_NAMES \\\n")
-    for _path, f, st in modules:
-        m = module_name(f)
-        output.append(b'"%s\\0" \\\n' % m.encode())
+def generate_frozen_str_content(modules):
+    output = [
+        b"#include <stdint.h>\n",
+        b"#define MP_FROZEN_STR_NAMES \\\n",
+    ]
+
+    for _, target_path in modules:
+        print("STR", target_path)
+        output.append(b'"%s\\0" \\\n' % target_path.encode())
     output.append(b"\n")
 
     output.append(b"const uint32_t mp_frozen_str_sizes[] = { ")
 
-    for _path, f, st in modules:
+    for full_path, _ in modules:
+        st = os.stat(full_path)
         output.append(b"%d, " % st.st_size)
     output.append(b"0 };\n")
 
     output.append(b"const char mp_frozen_str_content[] = {\n")
-    for path, f, st in modules:
-        data = open(path + "/" + f, "rb").read()
-
-        # We need to properly escape the script data to create a C string.
-        # When C parses hex characters of the form \x00 it keeps parsing the hex
-        # data until it encounters a non-hex character.  Thus one must create
-        # strings of the form "data\x01" "abc" to properly encode this kind of
-        # data.  We could just encode all characters as hex digits but it's nice
-        # to be able to read the resulting C code as ASCII when possible.
-
-        data = bytearray(data)  # so Python2 extracts each byte as an integer
-        esc_dict = {ord("\n"): b"\\n", ord("\r"): b"\\r", ord('"'): b'\\"', ord("\\"): b"\\\\"}
-        output.append(b'"')
-        break_str = False
-        for c in data:
-            try:
-                output.append(esc_dict[c])
-            except KeyError:
-                if 32 <= c <= 126:
-                    if break_str:
-                        output.append(b'" "')
-                        break_str = False
-                    output.append(chr(c).encode())
-                else:
-                    output.append(b"\\x%02x" % c)
-                    break_str = True
-        output.append(b'\\0"\n')
+    for full_path, _ in modules:
+        with open(full_path, "rb") as f:
+            data = f.read()
+
+            # We need to properly escape the script data to create a C string.
+            # When C parses hex characters of the form \x00 it keeps parsing the hex
+            # data until it encounters a non-hex character.  Thus one must create
+            # strings of the form "data\x01" "abc" to properly encode this kind of
+            # data.  We could just encode all characters as hex digits but it's nice
+            # to be able to read the resulting C code as ASCII when possible.
+
+            data = bytearray(data)  # so Python2 extracts each byte as an integer
+            esc_dict = {ord("\n"): b"\\n", ord("\r"): b"\\r", ord('"'): b'\\"', ord("\\"): b"\\\\"}
+            output.append(b'"')
+            break_str = False
+            for c in data:
+                try:
+                    output.append(esc_dict[c])
+                except KeyError:
+                    if 32 <= c <= 126:
+                        if break_str:
+                            output.append(b'" "')
+                            break_str = False
+                        output.append(chr(c).encode())
+                    else:
+                        output.append(b"\\x%02x" % c)
+                        break_str = True
+            output.append(b'\\0"\n')
 
     output.append(b'"\\0"\n};\n\n')
     return b"".join(output)
@@ -340,14 +159,13 @@ def main():
         print("mpy-cross not found at {}, please build it first".format(MPY_CROSS))
         sys.exit(1)
 
+    manifest = manifestfile.ManifestFile(manifestfile.MODE_FREEZE, VARS)
+
     # Include top-level inputs, to generate the manifest
     for input_manifest in args.files:
         try:
-            if input_manifest.endswith(".py"):
-                include(input_manifest)
-            else:
-                exec(input_manifest)
-        except FreezeError as er:
+            manifest.execute(input_manifest)
+        except manifestfile.ManifestFileError as er:
             print('freeze error executing "{}": {}'.format(input_manifest, er.args[0]))
             sys.exit(1)
 
@@ -355,22 +173,25 @@ def main():
     str_paths = []
     mpy_files = []
     ts_newest = 0
-    for kind, path, script, opt in manifest_list:
-        if kind == KIND_AS_STR:
-            str_paths.append(path)
-            ts_outfile = get_timestamp_newest(path)
-        elif kind == KIND_AS_MPY:
-            infile = "{}/{}".format(path, script)
-            outfile = "{}/frozen_mpy/{}.mpy".format(args.build_dir, script[:-3])
-            ts_infile = get_timestamp(infile)
+    for full_path, target_path, timestamp, kind, version, opt in manifest.files():
+        if kind == manifestfile.KIND_FREEZE_AS_STR:
+            str_paths.append(
+                (
+                    full_path,
+                    target_path,
+                )
+            )
+            ts_outfile = timestamp
+        elif kind == manifestfile.KIND_FREEZE_AS_MPY:
+            outfile = "{}/frozen_mpy/{}.mpy".format(args.build_dir, target_path[:-3])
             ts_outfile = get_timestamp(outfile, 0)
-            if ts_infile >= ts_outfile:
-                print("MPY", script)
+            if timestamp >= ts_outfile:
+                print("MPY", target_path)
                 mkdir(outfile)
                 res, out = system(
                     [MPY_CROSS]
                     + args.mpy_cross_flags.split()
-                    + ["-o", outfile, "-s", script, "-O{}".format(opt), infile]
+                    + ["-o", outfile, "-s", target_path, "-O{}".format(opt), full_path]
                 )
                 if res != 0:
                     print("error compiling {}:".format(infile))
@@ -379,10 +200,9 @@ def main():
                 ts_outfile = get_timestamp(outfile)
             mpy_files.append(outfile)
         else:
-            assert kind == KIND_MPY
-            infile = "{}/{}".format(path, script)
-            mpy_files.append(infile)
-            ts_outfile = get_timestamp(infile)
+            assert kind == manifestfile.KIND_FREEZE_MPY
+            mpy_files.append(full_path)
+            ts_outfile = timestamp
         ts_newest = max(ts_newest, ts_outfile)
 
     # Check if output file needs generating
diff --git a/tools/manifestfile.py b/tools/manifestfile.py
new file mode 100644
index 0000000000000..cb155da2101cb
--- /dev/null
+++ b/tools/manifestfile.py
@@ -0,0 +1,416 @@
+#!/usr/bin/env python3
+#
+# This file is part of the MicroPython project, http://micropython.org/
+#
+# The MIT License (MIT)
+#
+# Copyright (c) 2022 Jim Mussared
+# Copyright (c) 2019 Damien P. George
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+from __future__ import print_function
+import os
+import sys
+import glob
+
+__all__ = ["ManifestFileError", "ManifestFile"]
+
+# Allow freeze*() etc.
+MODE_FREEZE = 1
+# Only allow include/require/module/package.
+MODE_COMPILE = 2
+
+
+# In compile mode, .py -> KIND_COMPILE_AS_MPY
+# In freeze mode, .py -> KIND_FREEZE_AS_MPY, .mpy->KIND_FREEZE_MPY
+KIND_AUTO = 1
+# Freeze-mode only, .py -> KIND_FREEZE_AS_MPY, .mpy->KIND_FREEZE_MPY
+KIND_FREEZE_AUTO = 2
+
+# Freeze-mode only, The .py file will be frozen as text.
+KIND_FREEZE_AS_STR = 3
+# Freeze-mode only, The .py file will be compiled and frozen as bytecode.
+KIND_FREEZE_AS_MPY = 4
+# Freeze-mode only, The .mpy file will be frozen directly.
+KIND_FREEZE_MPY = 5
+# Compile mode only, the .py file should be compiled to .mpy.
+KIND_COMPILE_AS_MPY = 6
+
+# File on the local filesystem.
+FILE_TYPE_LOCAL = 1
+# URL to file. (TODO)
+FILE_TYPE_HTTP = 2
+
+
+class ManifestFileError(Exception):
+    pass
+
+
+# Turns a dict of options into a object with attributes used to turn the
+# kwargs passed to include() and require into the "options" global in the
+# included manifest.
+#   options = IncludeOptions(foo="bar", blah="stuff")
+#   options.foo # "bar"
+#   options.blah # "stuff"
+class IncludeOptions:
+    def __init__(self, **kwargs):
+        self._kwargs = kwargs
+        self._defaults = {}
+
+    def defaults(self, **kwargs):
+        self._defaults = kwargs
+
+    def __getattr__(self, name):
+        return self._kwargs.get(name, self._defaults.get(name, None))
+
+
+class ManifestFile:
+    def __init__(self, mode, path_vars=None):
+        # Either MODE_FREEZE or MODE_COMPILE.
+        self._mode = mode
+        # Path substition variables.
+        self._path_vars = path_vars or {}
+        # List of files references by this manifest.
+        # Tuple of (file_type, full_path, target_path, timestamp, kind, version, opt)
+        self._manifest_files = []
+        # Don't allow including the same file twice.
+        self._visited = set()
+
+    def _resolve_path(self, path):
+        # Convert path to an absolute path, applying variable substitutions.
+        for name, value in self._path_vars.items():
+            if value is not None:
+                path = path.replace("$({})".format(name), value)
+        return os.path.abspath(path)
+
+    def _manifest_globals(self, kwargs):
+        # This is the "API" available to a manifest file.
+        return {
+            "metadata": self.metadata,
+            "include": self.include,
+            "require": self.require,
+            "package": self.package,
+            "module": self.module,
+            "freeze": self.freeze,
+            "freeze_as_str": self.freeze_as_str,
+            "freeze_as_mpy": self.freeze_as_mpy,
+            "freeze_mpy": self.freeze_mpy,
+            "options": IncludeOptions(**kwargs),
+        }
+
+    def files(self):
+        return self._manifest_files
+
+    def execute(self, manifest_file):
+        if manifest_file.endswith(".py"):
+            # Execute file from filesystem.
+            self.include(manifest_file)
+        else:
+            # Execute manifest code snippet.
+            try:
+                exec(manifest_file, self._manifest_globals({}))
+            except Exception as er:
+                raise ManifestFileError("Error in manifest: {}".format(er))
+
+    def _add_file(self, full_path, target_path, kind=KIND_AUTO, version=None, opt=None):
+        # Check file exists and get timestamp.
+        try:
+            stat = os.stat(full_path)
+            timestamp = stat.st_mtime
+        except OSError:
+            raise ManifestFileError("cannot stat {}".format(full_path))
+
+        # Map the AUTO kinds to their actual kind based on mode and extension.
+        _, ext = os.path.splitext(full_path)
+        if self._mode == MODE_FREEZE:
+            if kind in (
+                KIND_AUTO,
+                KIND_FREEZE_AUTO,
+            ):
+                if ext.lower() == ".py":
+                    kind = KIND_FREEZE_AS_MPY
+                elif ext.lower() == ".mpy":
+                    kind = KIND_FREEZE_MPY
+        else:
+            if kind != KIND_AUTO:
+                raise ManifestFileError("Not in freeze mode")
+            if ext.lower() != ".py":
+                raise ManifestFileError("Expected .py file")
+            kind = KIND_COMPILE_AS_MPY
+
+        self._manifest_files.append(
+            (FILE_TYPE_LOCAL, full_path, target_path, timestamp, kind, version, opt)
+        )
+
+    def _search(self, base_path, package_path, files, exts, kind, opt=None, strict=False):
+        base_path = self._resolve_path(base_path)
+
+        if files:
+            # Use explicit list of files (relative to package_path).
+            for file in files:
+                if package_path:
+                    file = os.path.join(package_path, file)
+                self._add_file(
+                    os.path.join(base_path, file), file, kind=kind, version=None, opt=opt
+                )
+        else:
+            if base_path:
+                prev_cwd = os.getcwd()
+                os.chdir(self._resolve_path(base_path))
+
+            # Find all candidate files.
+            for dirpath, _, filenames in os.walk(package_path or ".", followlinks=True):
+                for file in filenames:
+                    file = os.path.relpath(os.path.join(dirpath, file), ".")
+                    _, ext = os.path.splitext(file)
+                    if ext.lower() in exts:
+                        self._add_file(
+                            os.path.join(base_path, file),
+                            file,
+                            kind=kind,
+                            version=None,
+                            opt=opt,
+                        )
+                    elif strict:
+                        raise ManifestFileError("Unexpected file type")
+
+            if base_path:
+                os.chdir(prev_cwd)
+
+    def metadata(self, description=None, version=None):
+        # TODO
+        pass
+
+    def include_maybe(self, manifest_path, **kwargs):
+        """
+        Include the manifest file if it exists. See docs for include().
+        """
+        if os.path.exists(manifest_path):
+            self.include(manifest_path, **kwargs)
+
+    def include(self, manifest_path, **kwargs):
+        """
+        Include another manifest.
+
+        The manifest argument can be a string (filename) or an iterable of
+        strings.
+
+        Relative paths are resolved with respect to the current manifest file.
+
+        Optional kwargs can be provided which will be available to the
+        included script via the `options` variable.
+
+        e.g. include("path.py", extra_features=True)
+
+        in path.py:
+            options.defaults(standard_features=True)
+
+            # freeze minimal modules.
+            if options.standard_features:
+                # freeze standard modules.
+            if options.extra_features:
+                # freeze extra modules.
+        """
+        if not isinstance(manifest_path, str):
+            for m in manifest_path:
+                self.include(m)
+        else:
+            manifest_path = self._resolve_path(manifest_path)
+            if manifest_path in self._visited:
+                return
+            self._visited.add(manifest_path)
+            with open(manifest_path) as f:
+                # Make paths relative to this manifest file while processing it.
+                # Applies to includes and input files.
+                prev_cwd = os.getcwd()
+                os.chdir(os.path.dirname(manifest_path))
+                try:
+                    exec(f.read(), self._manifest_globals(kwargs))
+                except Exception as er:
+                    raise ManifestFileError(
+                        "Error in manifest file: {}: {}".format(manifest_path, er)
+                    )
+                os.chdir(prev_cwd)
+
+    def require(self, name, version=None, **kwargs):
+        """
+        Require a module by name from micropython-lib.
+
+        This is a shortcut for
+        """
+        if self._path_vars["MPY_LIB_DIR"]:
+            for manifest_path in glob.glob(
+                os.path.join(self._path_vars["MPY_LIB_DIR"], "**", name, "manifest.py"),
+                recursive=True,
+            ):
+                self.include(manifest_path, **kwargs)
+                return
+            raise ValueError("Library not found in local micropython-lib: {}".format(name))
+        else:
+            # TODO: HTTP request to obtain URLs from manifest.json.
+            raise ValueError("micropython-lib not available for require('{}').", name)
+
+    def package(self, package_path, files=None, base_path=".", opt=None):
+        """
+        Define a package, optionally restricting to a set of files.
+
+        Simple case, a package in the current directory:
+            package("foo")
+        will include all .py files in foo, and will be stored as foo/bar/baz.py.
+
+        If the package isn't in the current directory, use base_path:
+            package("foo", base_path="src")
+
+        To restrict to certain files in the package use files (note: paths should be relative to the package):
+            package("foo", files=["bar/baz.py"])
+        """
+        # Include "base_path/package_path/**/*.py" --> "package_path/**/*.py"
+        self._search(base_path, package_path, files, exts=(".py",), kind=KIND_AUTO, opt=opt)
+
+    def module(self, module_path, base_path=".", opt=None):
+        """
+        Include a single Python file as a module.
+
+        If the file is in the current directory:
+            module("foo.py")
+
+        Otherwise use base_path to locate the file:
+            module("foo.py", "src/drivers")
+        """
+        # Include "base_path/module_path" --> "module_path"
+        base_path = self._resolve_path(base_path)
+        _, ext = os.path.splitext(module_path)
+        if ext.lower() != ".py":
+            raise ManifestFileError("module must be .py file")
+        # TODO: version None
+        self._add_file(os.path.join(base_path, module_path), module_path, version=None, opt=opt)
+
+    def _freeze_internal(self, path, script, exts, kind, opt):
+        if script is None:
+            self._search(path, None, None, exts=exts, kind=kind, opt=opt)
+        elif isinstance(script, str) and os.path.isdir(os.path.join(path, script)):
+            self._search(path, script, None, exts=exts, kind=kind, opt=opt)
+        elif not isinstance(script, str):
+            self._search(path, None, script, exts=exts, kind=kind, opt=opt)
+        else:
+            self._search(path, None, (script,), exts=exts, kind=kind, opt=opt)
+
+    def freeze(self, path, script=None, opt=None):
+        """
+        Freeze the input, automatically determining its type.  A .py script
+        will be compiled to a .mpy first then frozen, and a .mpy file will be
+        frozen directly.
+
+        `path` must be a directory, which is the base directory to _search for
+        files from.  When importing the resulting frozen modules, the name of
+        the module will start after `path`, ie `path` is excluded from the
+        module name.
+
+        If `path` is relative, it is resolved to the current manifest.py.
+        Use $(MPY_DIR), $(MPY_LIB_DIR), $(PORT_DIR), $(BOARD_DIR) if you need
+        to access specific paths.
+
+        If `script` is None all files in `path` will be frozen.
+
+        If `script` is an iterable then freeze() is called on all items of the
+        iterable (with the same `path` and `opt` passed through).
+
+        If `script` is a string then it specifies the file or directory to
+        freeze, and can include extra directories before the file or last
+        directory.  The file or directory will be _searched for in `path`.  If
+        `script` is a directory then all files in that directory will be frozen.
+
+        `opt` is the optimisation level to pass to mpy-cross when compiling .py
+        to .mpy.
+        """
+        self._freeze_internal(path, script, exts=(".py", ".mpy"), kind=KIND_FREEZE_AUTO, opt=opt)
+
+    def freeze_as_str(self, path):
+        """
+        Freeze the given `path` and all .py scripts within it as a string,
+        which will be compiled upon import.
+        """
+        self._search(path, None, None, exts=(".py"), kind=KIND_FREEZE_AS_STR)
+
+    def freeze_as_mpy(self, path, script=None, opt=None):
+        """
+        Freeze the input (see above) by first compiling the .py scripts to
+        .mpy files, then freezing the resulting .mpy files.
+        """
+        self._freeze_internal(path, script, exts=(".py"), kind=KIND_FREEZE_AS_MPY, opt=opt)
+
+    def freeze_mpy(self, path, script=None, opt=None):
+        """
+        Freeze the input (see above), which must be .mpy files that are
+        frozen directly.
+        """
+        self._freeze_internal(path, script, exts=(".mpy"), kind=KIND_FREEZE_MPY, opt=opt)
+
+
+def main():
+    import argparse
+
+    cmd_parser = argparse.ArgumentParser(description="List the files referenced by a manifest.")
+    cmd_parser.add_argument("--freeze", action="store_true", help="freeze mode")
+    cmd_parser.add_argument("--compile", action="store_true", help="compile mode")
+    cmd_parser.add_argument(
+        "--lib",
+        default=os.path.join(os.path.dirname(__file__), "../lib/micropython-lib"),
+        help="path to micropython-lib repo",
+    )
+    cmd_parser.add_argument("--port", default=None, help="path to port dir")
+    cmd_parser.add_argument("--board", default=None, help="path to board dir")
+    cmd_parser.add_argument(
+        "--top",
+        default=os.path.join(os.path.dirname(__file__), ".."),
+        help="path to micropython repo",
+    )
+    cmd_parser.add_argument("files", nargs="+", help="input manifest.py")
+    args = cmd_parser.parse_args()
+
+    path_vars = {
+        "MPY_DIR": os.path.abspath(args.top) if args.top else None,
+        "BOARD_DIR": os.path.abspath(args.board) if args.board else None,
+        "PORT_DIR": os.path.abspath(args.port) if args.port else None,
+        "MPY_LIB_DIR": os.path.abspath(args.lib) if args.lib else None,
+    }
+
+    mode = None
+    if args.freeze:
+        mode = MODE_FREEZE
+    elif args.compile:
+        mode = MODE_COMPILE
+    else:
+        print("Error: No mode specified.", file=sys.stderr)
+        exit(1)
+
+    m = ManifestFile(mode, path_vars)
+    for manifest_file in args.files:
+        try:
+            m.execute(manifest_file)
+        except ManifestFileError as er:
+            print(er, file=sys.stderr)
+            exit(1)
+    for f in m.files():
+        print(f)
+
+
+if __name__ == "__main__":
+    main()

From e42809531f735b376409d458e51e25f9708ec551 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Fri, 15 Jul 2022 23:01:06 +1000
Subject: [PATCH 2561/3533] mpy-cross/mpy_cross: Add Python wrapper for
 mpy-cross.

Rather than invoking mpy-cross directly via system/subprocess in our build
tools and other tools, this provides a Python interface for it.

Based on https://gitlab.com/alelec/mpy_cross (with the intention of
eventually replacing that as the "official" pypi distribution once setup.py
etc are added).

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 mpy-cross/mpy_cross/__init__.py | 113 ++++++++++++++++++++++++++++++++
 mpy-cross/mpy_cross/__main__.py |  38 +++++++++++
 2 files changed, 151 insertions(+)
 create mode 100644 mpy-cross/mpy_cross/__init__.py
 create mode 100644 mpy-cross/mpy_cross/__main__.py

diff --git a/mpy-cross/mpy_cross/__init__.py b/mpy-cross/mpy_cross/__init__.py
new file mode 100644
index 0000000000000..d4c0930bb9198
--- /dev/null
+++ b/mpy-cross/mpy_cross/__init__.py
@@ -0,0 +1,113 @@
+#!/usr/bin/env python3
+#
+# This file is part of the MicroPython project, http://micropython.org/
+#
+# The MIT License (MIT)
+#
+# Copyright (c) 2022 Andrew Leech
+# Copyright (c) 2022 Jim Mussared
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+from __future__ import print_function
+import os
+import stat
+import subprocess
+
+NATIVE_ARCH_X86 = "x86"
+NATIVE_ARCH_X64 = "x64"
+NATIVE_ARCH_ARMV6 = "armv6"
+NATIVE_ARCH_ARMV6M = "armv6m"
+NATIVE_ARCH_ARMV7M = "armv7m"
+NATIVE_ARCH_ARMV7EM = "armv7em"
+NATIVE_ARCH_ARMV7EMSP = "armv7emsp"
+NATIVE_ARCH_ARMV7EMDP = "armv7emdp"
+NATIVE_ARCH_XTENSA = "xtensa"
+NATIVE_ARCH_XTENSAWIN = "xtensawin"
+
+NATIVE_ARCHS = [
+    NATIVE_ARCH_X86,
+    NATIVE_ARCH_X64,
+    NATIVE_ARCH_ARMV6,
+    NATIVE_ARCH_ARMV6M,
+    NATIVE_ARCH_ARMV7M,
+    NATIVE_ARCH_ARMV7EM,
+    NATIVE_ARCH_ARMV7EMSP,
+    NATIVE_ARCH_ARMV7EMDP,
+    NATIVE_ARCH_XTENSA,
+    NATIVE_ARCH_XTENSAWIN,
+]
+
+__all__ = ["compile", "run", "CrossCompileError"]
+
+
+class CrossCompileError(Exception):
+    pass
+
+
+def find_mpy_cross_binary(mpy_cross):
+    if mpy_cross:
+        return mpy_cross
+    return os.path.abspath(os.path.join(os.path.dirname(__file__), "../mpy-cross"))
+
+
+def compile(src, dest=None, src_path=None, opt=None, march=None, mpy_cross=None, extra_args=None):
+    if not src:
+        raise ValueError("src is required")
+    if not os.path.exists(src):
+        raise CrossCompileError("Input .py file not found: {}.".format(src_py))
+
+    args = []
+
+    if src_path:
+        args += ["-s", src_path]
+
+    if dest:
+        args += ["-o", dest]
+
+    if march:
+        args += ["-march", march]
+
+    if opt is not None:
+        args += ["-O{}".format(opt)]
+
+    if extra_args:
+        args += extra_args
+
+    args += [src]
+
+    run(args, mpy_cross)
+
+
+def run(args, mpy_cross=None):
+    mpy_cross = find_mpy_cross_binary(mpy_cross)
+
+    if not os.path.exists(mpy_cross):
+        raise CrossCompileError("mpy-cross binary not found at {}.".format(mpy_cross))
+
+    try:
+        st = os.stat(mpy_cross)
+        os.chmod(mpy_cross, st.st_mode | stat.S_IEXEC)
+    except OSError:
+        pass
+
+    try:
+        subprocess.check_output([mpy_cross] + args, stderr=subprocess.STDOUT)
+    except subprocess.CalledProcessError as er:
+        raise CrossCompileError(er.output)
diff --git a/mpy-cross/mpy_cross/__main__.py b/mpy-cross/mpy_cross/__main__.py
new file mode 100644
index 0000000000000..9d957bca025d6
--- /dev/null
+++ b/mpy-cross/mpy_cross/__main__.py
@@ -0,0 +1,38 @@
+#!/usr/bin/env python3
+#
+# This file is part of the MicroPython project, http://micropython.org/
+#
+# The MIT License (MIT)
+#
+# Copyright (c) 2022 Andrew Leech
+# Copyright (c) 2022 Jim Mussared
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+from __future__ import print_function
+import argparse
+import sys
+
+from . import run, CrossCompileError
+
+try:
+    run(sys.argv[1:])
+except CrossCompileError as er:
+    print(er.args[0], file=sys.stderr)
+    raise SystemExit(1)

From 6bd0ec7a70496dc51d8dc6c706919ef398b0346e Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Fri, 15 Jul 2022 23:06:15 +1000
Subject: [PATCH 2562/3533] tools/makemanifest.py: Update to use mpy_cross
 module.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 tools/makemanifest.py | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/tools/makemanifest.py b/tools/makemanifest.py
index 800a25435eb91..2e7021040dd97 100644
--- a/tools/makemanifest.py
+++ b/tools/makemanifest.py
@@ -29,6 +29,9 @@
 import os
 import subprocess
 
+sys.path.append(os.path.join(os.path.dirname(__file__), "../mpy-cross"))
+import mpy_cross
+
 import manifestfile
 
 VARS = {}
@@ -173,7 +176,7 @@ def main():
     str_paths = []
     mpy_files = []
     ts_newest = 0
-    for full_path, target_path, timestamp, kind, version, opt in manifest.files():
+    for _file_type, full_path, target_path, timestamp, kind, version, opt in manifest.files():
         if kind == manifestfile.KIND_FREEZE_AS_STR:
             str_paths.append(
                 (
@@ -188,14 +191,18 @@ def main():
             if timestamp >= ts_outfile:
                 print("MPY", target_path)
                 mkdir(outfile)
-                res, out = system(
-                    [MPY_CROSS]
-                    + args.mpy_cross_flags.split()
-                    + ["-o", outfile, "-s", target_path, "-O{}".format(opt), full_path]
-                )
-                if res != 0:
-                    print("error compiling {}:".format(infile))
-                    sys.stdout.buffer.write(out)
+                try:
+                    mpy_cross.compile(
+                        full_path,
+                        dest=outfile,
+                        src_path=target_path,
+                        opt=opt,
+                        mpy_cross=MPY_CROSS,
+                        extra_args=args.mpy_cross_flags.split(),
+                    )
+                except mpy_cross.CrossCompileError as ex:
+                    print("error compiling {}:".format(target_path))
+                    print(ex.args[0])
                     raise SystemExit(1)
                 ts_outfile = get_timestamp(outfile)
             mpy_files.append(outfile)

From e9a28ce312b75a4f2b3b7a8c3e38b7766cb567b3 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Fri, 15 Jul 2022 23:42:51 +1000
Subject: [PATCH 2563/3533] tools/manifestfile.py: Allow include of directory
 path.

If an include path is a directory, then it implicitly grabs the manifest.py
file inside that directory. This simplifies most manifest.py files.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 tools/manifestfile.py | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/tools/manifestfile.py b/tools/manifestfile.py
index cb155da2101cb..bf626c22b38d8 100644
--- a/tools/manifestfile.py
+++ b/tools/manifestfile.py
@@ -198,13 +198,6 @@ def metadata(self, description=None, version=None):
         # TODO
         pass
 
-    def include_maybe(self, manifest_path, **kwargs):
-        """
-        Include the manifest file if it exists. See docs for include().
-        """
-        if os.path.exists(manifest_path):
-            self.include(manifest_path, **kwargs)
-
     def include(self, manifest_path, **kwargs):
         """
         Include another manifest.
@@ -214,6 +207,9 @@ def include(self, manifest_path, **kwargs):
 
         Relative paths are resolved with respect to the current manifest file.
 
+        If the path is to a directory, then it implicitly includes the
+        manifest.py file inside that directory.
+
         Optional kwargs can be provided which will be available to the
         included script via the `options` variable.
 
@@ -233,6 +229,9 @@ def include(self, manifest_path, **kwargs):
                 self.include(m)
         else:
             manifest_path = self._resolve_path(manifest_path)
+            # Including a directory grabs the manifest.py inside it.
+            if os.path.isdir(manifest_path):
+                manifest_path = os.path.join(manifest_path, "manifest.py")
             if manifest_path in self._visited:
                 return
             self._visited.add(manifest_path)

From bc23f207cefed82172551288ebb8686ee2c512a3 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Thu, 11 Aug 2022 00:16:48 +1000
Subject: [PATCH 2564/3533] tools/manifestfile.py: Allow require() to specify
 unix packages.

By default, don't include micropython-lib/unix-ffi in the search.

If unix_ffi=True is passed to require(), then include unix-ffi and make it
take precedence over the other locations (e.g. python-stdlib).

This does two things:
 - Prevents non-unix builds from using unix-only packages.
 - Allows the unix build to optionally use a more full-featured (e.g. ffi)
   based package, even with the same name as one from e.g. stdlib.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 tools/manifestfile.py | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/tools/manifestfile.py b/tools/manifestfile.py
index bf626c22b38d8..61560e4565abe 100644
--- a/tools/manifestfile.py
+++ b/tools/manifestfile.py
@@ -248,19 +248,28 @@ def include(self, manifest_path, **kwargs):
                     )
                 os.chdir(prev_cwd)
 
-    def require(self, name, version=None, **kwargs):
+    def require(self, name, version=None, unix_ffi=False, **kwargs):
         """
         Require a module by name from micropython-lib.
 
-        This is a shortcut for
+        Optionally specify unix_ffi=True to use a module from the unix-ffi directory.
         """
         if self._path_vars["MPY_LIB_DIR"]:
-            for manifest_path in glob.glob(
-                os.path.join(self._path_vars["MPY_LIB_DIR"], "**", name, "manifest.py"),
-                recursive=True,
-            ):
-                self.include(manifest_path, **kwargs)
-                return
+            lib_dirs = ["micropython", "python-stdlib", "python-ecosys"]
+            if unix_ffi:
+                # Search unix-ffi only if unix_ffi=True, and make unix-ffi modules
+                # take precedence.
+                lib_dirs = ["unix-ffi"] + lib_dirs
+
+            for lib_dir in lib_dirs:
+                for manifest_path in glob.glob(
+                    os.path.join(
+                        self._path_vars["MPY_LIB_DIR"], lib_dir, "**", name, "manifest.py"
+                    ),
+                    recursive=True,
+                ):
+                    self.include(manifest_path, **kwargs)
+                    return
             raise ValueError("Library not found in local micropython-lib: {}".format(name))
         else:
             # TODO: HTTP request to obtain URLs from manifest.json.

From 5852fd7708d02d6ca85e4a5ed01d8263e3962631 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Fri, 12 Aug 2022 11:30:56 +1000
Subject: [PATCH 2565/3533] tools/manifestfile.py: Allow manifests to set
 metadata.

The metadata can be version, description, and license.

After executing a manifest, the top-level metadata can be queried, and also
each file output from the manifest will have the metadata of the
containing manifest.

Use the version metadata to "tag" files before freezing such that they have
__version__ available.
---
 tools/makemanifest.py | 46 +++++++++++-----------
 tools/manifestfile.py | 92 ++++++++++++++++++++++++++++++++++++-------
 2 files changed, 102 insertions(+), 36 deletions(-)

diff --git a/tools/makemanifest.py b/tools/makemanifest.py
index 2e7021040dd97..d059d4a2660fe 100644
--- a/tools/makemanifest.py
+++ b/tools/makemanifest.py
@@ -176,34 +176,36 @@ def main():
     str_paths = []
     mpy_files = []
     ts_newest = 0
-    for _file_type, full_path, target_path, timestamp, kind, version, opt in manifest.files():
-        if kind == manifestfile.KIND_FREEZE_AS_STR:
+    for result in manifest.files():
+        if result.kind == manifestfile.KIND_FREEZE_AS_STR:
             str_paths.append(
                 (
-                    full_path,
-                    target_path,
+                    result.full_path,
+                    result.target_path,
                 )
             )
-            ts_outfile = timestamp
-        elif kind == manifestfile.KIND_FREEZE_AS_MPY:
-            outfile = "{}/frozen_mpy/{}.mpy".format(args.build_dir, target_path[:-3])
+            ts_outfile = result.timestamp
+        elif result.kind == manifestfile.KIND_FREEZE_AS_MPY:
+            outfile = "{}/frozen_mpy/{}.mpy".format(args.build_dir, result.target_path[:-3])
             ts_outfile = get_timestamp(outfile, 0)
-            if timestamp >= ts_outfile:
-                print("MPY", target_path)
+            if result.timestamp >= ts_outfile:
+                print("MPY", result.target_path)
                 mkdir(outfile)
-                try:
-                    mpy_cross.compile(
-                        full_path,
-                        dest=outfile,
-                        src_path=target_path,
-                        opt=opt,
-                        mpy_cross=MPY_CROSS,
-                        extra_args=args.mpy_cross_flags.split(),
-                    )
-                except mpy_cross.CrossCompileError as ex:
-                    print("error compiling {}:".format(target_path))
-                    print(ex.args[0])
-                    raise SystemExit(1)
+                # Add __version__ to the end of the file before compiling.
+                with manifestfile.tagged_py_file(result.full_path, result.metadata) as tagged_path:
+                    try:
+                        mpy_cross.compile(
+                            tagged_path,
+                            dest=outfile,
+                            src_path=result.target_path,
+                            opt=result.opt,
+                            mpy_cross=MPY_CROSS,
+                            extra_args=args.mpy_cross_flags.split(),
+                        )
+                    except mpy_cross.CrossCompileError as ex:
+                        print("error compiling {}:".format(target_path))
+                        print(ex.args[0])
+                        raise SystemExit(1)
                 ts_outfile = get_timestamp(outfile)
             mpy_files.append(outfile)
         else:
diff --git a/tools/manifestfile.py b/tools/manifestfile.py
index 61560e4565abe..84c79ed82b28f 100644
--- a/tools/manifestfile.py
+++ b/tools/manifestfile.py
@@ -26,9 +26,12 @@
 # THE SOFTWARE.
 
 from __future__ import print_function
+import contextlib
 import os
 import sys
 import glob
+import tempfile
+from collections import namedtuple
 
 __all__ = ["ManifestFileError", "ManifestFile"]
 
@@ -63,6 +66,37 @@ class ManifestFileError(Exception):
     pass
 
 
+# The set of files that this manifest references.
+ManifestOutput = namedtuple(
+    "ManifestOutput",
+    [
+        "file_type",  # FILE_TYPE_*.
+        "full_path",  # The input file full path.
+        "target_path",  # The target path on the device.
+        "timestamp",  # Last modified date of the input file.
+        "kind",  # KIND_*.
+        "metadata",  # Metadata for the containing package.
+        "opt",  # Optimisation level (or None).
+    ],
+)
+
+
+# Represent the metadata for a package.
+class ManifestMetadata:
+    def __init__(self):
+        self.version = None
+        self.description = None
+        self.license = None
+
+    def update(self, description=None, version=None, license=None):
+        if description:
+            self.description = description
+        if version:
+            self.version = version
+        if license:
+            self.license = version
+
+
 # Turns a dict of options into a object with attributes used to turn the
 # kwargs passed to include() and require into the "options" global in the
 # included manifest.
@@ -87,11 +121,12 @@ def __init__(self, mode, path_vars=None):
         self._mode = mode
         # Path substition variables.
         self._path_vars = path_vars or {}
-        # List of files references by this manifest.
-        # Tuple of (file_type, full_path, target_path, timestamp, kind, version, opt)
+        # List of files (as ManifestFileResult) references by this manifest.
         self._manifest_files = []
         # Don't allow including the same file twice.
         self._visited = set()
+        # Stack of metadata for each level.
+        self._metadata = [ManifestMetadata()]
 
     def _resolve_path(self, path):
         # Convert path to an absolute path, applying variable substitutions.
@@ -121,7 +156,7 @@ def files(self):
     def execute(self, manifest_file):
         if manifest_file.endswith(".py"):
             # Execute file from filesystem.
-            self.include(manifest_file)
+            self.include(manifest_file, top_level=True)
         else:
             # Execute manifest code snippet.
             try:
@@ -129,7 +164,7 @@ def execute(self, manifest_file):
             except Exception as er:
                 raise ManifestFileError("Error in manifest: {}".format(er))
 
-    def _add_file(self, full_path, target_path, kind=KIND_AUTO, version=None, opt=None):
+    def _add_file(self, full_path, target_path, kind=KIND_AUTO, opt=None):
         # Check file exists and get timestamp.
         try:
             stat = os.stat(full_path)
@@ -156,7 +191,9 @@ def _add_file(self, full_path, target_path, kind=KIND_AUTO, version=None, opt=No
             kind = KIND_COMPILE_AS_MPY
 
         self._manifest_files.append(
-            (FILE_TYPE_LOCAL, full_path, target_path, timestamp, kind, version, opt)
+            ManifestOutput(
+                FILE_TYPE_LOCAL, full_path, target_path, timestamp, kind, self._metadata[-1], opt
+            )
         )
 
     def _search(self, base_path, package_path, files, exts, kind, opt=None, strict=False):
@@ -167,9 +204,7 @@ def _search(self, base_path, package_path, files, exts, kind, opt=None, strict=F
             for file in files:
                 if package_path:
                     file = os.path.join(package_path, file)
-                self._add_file(
-                    os.path.join(base_path, file), file, kind=kind, version=None, opt=opt
-                )
+                self._add_file(os.path.join(base_path, file), file, kind=kind, opt=opt)
         else:
             if base_path:
                 prev_cwd = os.getcwd()
@@ -185,7 +220,6 @@ def _search(self, base_path, package_path, files, exts, kind, opt=None, strict=F
                             os.path.join(base_path, file),
                             file,
                             kind=kind,
-                            version=None,
                             opt=opt,
                         )
                     elif strict:
@@ -194,11 +228,19 @@ def _search(self, base_path, package_path, files, exts, kind, opt=None, strict=F
             if base_path:
                 os.chdir(prev_cwd)
 
-    def metadata(self, description=None, version=None):
-        # TODO
-        pass
+    def metadata(self, description=None, version=None, license=None):
+        """
+        From within a manifest file, use this to set the metadata for the
+        package described by current manifest.
+
+        After executing a manifest file (via execute()), call this
+        to obtain the metadata for the top-level manifest file.
+        """
+
+        self._metadata[-1].update(description, version, license)
+        return self._metadata[-1]
 
-    def include(self, manifest_path, **kwargs):
+    def include(self, manifest_path, top_level=False, **kwargs):
         """
         Include another manifest.
 
@@ -235,6 +277,8 @@ def include(self, manifest_path, **kwargs):
             if manifest_path in self._visited:
                 return
             self._visited.add(manifest_path)
+            if not top_level:
+                self._metadata.append(ManifestMetadata())
             with open(manifest_path) as f:
                 # Make paths relative to this manifest file while processing it.
                 # Applies to includes and input files.
@@ -247,6 +291,8 @@ def include(self, manifest_path, **kwargs):
                         "Error in manifest file: {}: {}".format(manifest_path, er)
                     )
                 os.chdir(prev_cwd)
+            if not top_level:
+                self._metadata.pop()
 
     def require(self, name, version=None, unix_ffi=False, **kwargs):
         """
@@ -308,7 +354,7 @@ def module(self, module_path, base_path=".", opt=None):
         if ext.lower() != ".py":
             raise ManifestFileError("module must be .py file")
         # TODO: version None
-        self._add_file(os.path.join(base_path, module_path), module_path, version=None, opt=opt)
+        self._add_file(os.path.join(base_path, module_path), module_path, opt=opt)
 
     def _freeze_internal(self, path, script, exts, kind, opt):
         if script is None:
@@ -372,6 +418,24 @@ def freeze_mpy(self, path, script=None, opt=None):
         self._freeze_internal(path, script, exts=(".mpy"), kind=KIND_FREEZE_MPY, opt=opt)
 
 
+# Generate a temporary file with a line appended to the end that adds __version__.
+@contextlib.contextmanager
+def tagged_py_file(path, metadata):
+    dest_fd, dest_path = tempfile.mkstemp(suffix=".py", text=True)
+    try:
+        with os.fdopen(dest_fd, "w") as dest:
+            with open(path, "r") as src:
+                contents = src.read()
+                dest.write(contents)
+
+                # Don't overwrite a version definition if the file already has one in it.
+                if metadata.version and "__version__ =" not in contents:
+                    dest.write("\n\n__version__ = {}\n".format(repr(metadata.version)))
+        yield dest_path
+    finally:
+        os.unlink(dest_path)
+
+
 def main():
     import argparse
 

From ccd210984e7a959694b2af4937ce953a822c2ea5 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 5 Sep 2022 18:23:11 +1000
Subject: [PATCH 2566/3533] lib/micropython-lib: Update to latest version with
 manifest changes.

Signed-off-by: Damien George <damien@micropython.org>
---
 lib/micropython-lib | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/micropython-lib b/lib/micropython-lib
index 70e422dc2e885..f3cfc52ab076f 160000
--- a/lib/micropython-lib
+++ b/lib/micropython-lib
@@ -1 +1 @@
-Subproject commit 70e422dc2e885bbaafe6eb7e3d81118e17d4b555
+Subproject commit f3cfc52ab076fc913dc6e266fb7370b418c8f542

From 203dae41fbaceeea9a04dc540b22de4ddd0d5a69 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Fri, 15 Jul 2022 23:46:28 +1000
Subject: [PATCH 2567/3533] all: Update all manifest.py files to use new
 features.

Changes in this commit:
- Manifest include's now use the directory path where possible (no longer
  necessary to include the manifest.py file explicitly).
- Add manifest.py for all drivers and components that are referenced by
  port/board manifests.
- Replace all uses of freeze() with package()/module(), except for port and
  board modules.
- Use opt=3 everywhere, for consistency and to reduce code size.
- Use require() instead of include() for all micropython-lib references.
- Remove support for optional board-level manifest.py in mimxrt port, to
  make it behave the same as other ports (the board must set
  FROZEN_MANIFEST to a custom manifest.py, which can optionally include the
  default, port-level manifest).
- Also reinstates modules that were accidentally removed from the esp8266
  512k build in fbe9417b90474dd1a08749b3a79311a8007a98fb.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
Signed-off-by: Damien George <damien@micropython.org>
---
 drivers/codec/manifest.py                     |  1 +
 drivers/dht/manifest.py                       |  1 +
 drivers/display/manifest.py                   | 11 ++++++++
 drivers/hts221/manifest.py                    |  1 +
 drivers/lps22h/manifest.py                    |  1 +
 drivers/lsm6dsox/manifest.py                  |  1 +
 drivers/lsm9ds1/manifest.py                   |  1 +
 drivers/neopixel/manifest.py                  |  6 +----
 drivers/nrf24l01/manifest.py                  |  1 +
 drivers/onewire/manifest.py                   |  6 +++++
 drivers/sdcard/manifest.py                    |  1 +
 extmod/uasyncio/manifest.py                   | 20 ++++++++-------
 extmod/webrepl/manifest.py                    |  3 ++-
 .../boards/LILYGO_TTGO_LORA32/manifest.py     |  2 +-
 ports/esp32/boards/LOLIN_S2_PICO/manifest.py  |  2 +-
 ports/esp32/boards/UM_FEATHERS2/manifest.py   |  2 +-
 ports/esp32/boards/manifest.py                | 25 ++++++++++---------
 ports/esp8266/boards/GENERIC/manifest.py      | 14 +++++------
 ports/esp8266/boards/GENERIC_512K/manifest.py | 13 ++++++----
 ports/esp8266/boards/manifest.py              | 13 +++++-----
 ports/mimxrt/boards/manifest.py               | 10 +++-----
 .../arduino_nano_33_ble_sense/manifest.py     |  6 ++---
 ports/nrf/modules/manifest.py                 |  4 +--
 .../boards/RA4M1_CLICKER/manifest.py          |  2 +-
 ports/renesas-ra/boards/RA4M1_EK/manifest.py  |  2 +-
 ports/renesas-ra/boards/manifest.py           |  8 +++---
 .../ARDUINO_NANO_RP2040_CONNECT/manifest.py   | 20 +++++++--------
 ports/rp2/boards/PICO_W/manifest.py           |  8 +++---
 ports/rp2/boards/manifest.py                  |  8 +++---
 .../boards/ARDUINO_PORTENTA_H7/manifest.py    | 10 ++------
 .../GARATRONIC_PYBSTICK26_F411/manifest.py    |  2 +-
 ports/stm32/boards/LEGO_HUB_NO6/manifest.py   |  2 ++
 ports/stm32/boards/LEGO_HUB_NO7/manifest.py   |  7 ++----
 ports/stm32/boards/PYBD_SF2/manifest.py       |  2 +-
 ports/stm32/boards/manifest.py                |  9 ++++---
 ports/unix/variants/dev/manifest.py           |  2 +-
 ports/unix/variants/manifest.py               |  4 +--
 ports/windows/variants/dev/manifest.py        |  2 +-
 38 files changed, 126 insertions(+), 107 deletions(-)
 create mode 100644 drivers/codec/manifest.py
 create mode 100644 drivers/dht/manifest.py
 create mode 100644 drivers/display/manifest.py
 create mode 100644 drivers/hts221/manifest.py
 create mode 100644 drivers/lps22h/manifest.py
 create mode 100644 drivers/lsm6dsox/manifest.py
 create mode 100644 drivers/lsm9ds1/manifest.py
 create mode 100644 drivers/nrf24l01/manifest.py
 create mode 100644 drivers/onewire/manifest.py
 create mode 100644 drivers/sdcard/manifest.py

diff --git a/drivers/codec/manifest.py b/drivers/codec/manifest.py
new file mode 100644
index 0000000000000..4ff5d9fc445e2
--- /dev/null
+++ b/drivers/codec/manifest.py
@@ -0,0 +1 @@
+module("wm8960.py", opt=3)
diff --git a/drivers/dht/manifest.py b/drivers/dht/manifest.py
new file mode 100644
index 0000000000000..72a4e0d24fcd5
--- /dev/null
+++ b/drivers/dht/manifest.py
@@ -0,0 +1 @@
+module("dht.py", opt=3)
diff --git a/drivers/display/manifest.py b/drivers/display/manifest.py
new file mode 100644
index 0000000000000..d1ddff3374aba
--- /dev/null
+++ b/drivers/display/manifest.py
@@ -0,0 +1,11 @@
+# TODO: Split these into separate directories with their own manifests.
+options.defaults(lcd160cr=False, ssd1306=False, test=True)
+
+if options.lcd160cr:
+    module("lcd160cr.py", opt=3)
+
+    if options.test:
+        module("lcd160cr_test.py", opt=3)
+
+if options.ssd1306:
+    module("ssd1306.py", opt=3)
diff --git a/drivers/hts221/manifest.py b/drivers/hts221/manifest.py
new file mode 100644
index 0000000000000..5f1792665943a
--- /dev/null
+++ b/drivers/hts221/manifest.py
@@ -0,0 +1 @@
+module("hts221.py", opt=3)
diff --git a/drivers/lps22h/manifest.py b/drivers/lps22h/manifest.py
new file mode 100644
index 0000000000000..d30108d93dce0
--- /dev/null
+++ b/drivers/lps22h/manifest.py
@@ -0,0 +1 @@
+module("lps22h.py", opt=3)
diff --git a/drivers/lsm6dsox/manifest.py b/drivers/lsm6dsox/manifest.py
new file mode 100644
index 0000000000000..28f4b3565e9f7
--- /dev/null
+++ b/drivers/lsm6dsox/manifest.py
@@ -0,0 +1 @@
+module("lsm6dsox.py", opt=3)
diff --git a/drivers/lsm9ds1/manifest.py b/drivers/lsm9ds1/manifest.py
new file mode 100644
index 0000000000000..6779362de7ee5
--- /dev/null
+++ b/drivers/lsm9ds1/manifest.py
@@ -0,0 +1 @@
+module("lsm9ds1.py", opt=3)
diff --git a/drivers/neopixel/manifest.py b/drivers/neopixel/manifest.py
index 27f610adc0ad7..561d19574af32 100644
--- a/drivers/neopixel/manifest.py
+++ b/drivers/neopixel/manifest.py
@@ -1,5 +1 @@
-freeze(
-    ".",
-    "neopixel.py",
-    opt=3,
-)
+module("neopixel.py", opt=3)
diff --git a/drivers/nrf24l01/manifest.py b/drivers/nrf24l01/manifest.py
new file mode 100644
index 0000000000000..babdb7a52a953
--- /dev/null
+++ b/drivers/nrf24l01/manifest.py
@@ -0,0 +1 @@
+module("nrf24l01.py", opt=3)
diff --git a/drivers/onewire/manifest.py b/drivers/onewire/manifest.py
new file mode 100644
index 0000000000000..f500a65d780b8
--- /dev/null
+++ b/drivers/onewire/manifest.py
@@ -0,0 +1,6 @@
+options.defaults(ds18x20=False)
+
+module("onewire.py", opt=3)
+
+if options.ds18x20:
+    module("ds18x20.py", opt=3)
diff --git a/drivers/sdcard/manifest.py b/drivers/sdcard/manifest.py
new file mode 100644
index 0000000000000..e584b97d9ca6f
--- /dev/null
+++ b/drivers/sdcard/manifest.py
@@ -0,0 +1 @@
+module("sdcard.py", opt=3)
diff --git a/extmod/uasyncio/manifest.py b/extmod/uasyncio/manifest.py
index f5fa27bfcaa35..d425a467b3afa 100644
--- a/extmod/uasyncio/manifest.py
+++ b/extmod/uasyncio/manifest.py
@@ -1,13 +1,15 @@
-# This list of frozen files doesn't include task.py because that's provided by the C module.
-freeze(
-    "..",
+# This list of package files doesn't include task.py because that's provided
+# by the C module.
+package(
+    "uasyncio",
     (
-        "uasyncio/__init__.py",
-        "uasyncio/core.py",
-        "uasyncio/event.py",
-        "uasyncio/funcs.py",
-        "uasyncio/lock.py",
-        "uasyncio/stream.py",
+        "__init__.py",
+        "core.py",
+        "event.py",
+        "funcs.py",
+        "lock.py",
+        "stream.py",
     ),
+    base_path="..",
     opt=3,
 )
diff --git a/extmod/webrepl/manifest.py b/extmod/webrepl/manifest.py
index c504c7305c0fd..6d1a314219caa 100644
--- a/extmod/webrepl/manifest.py
+++ b/extmod/webrepl/manifest.py
@@ -1 +1,2 @@
-freeze(".", ("webrepl.py", "webrepl_setup.py"))
+module("webrepl.py", opt=3)
+module("webrepl_setup.py", opt=3)
diff --git a/ports/esp32/boards/LILYGO_TTGO_LORA32/manifest.py b/ports/esp32/boards/LILYGO_TTGO_LORA32/manifest.py
index 0709f8597c07c..6c491c8f66de8 100644
--- a/ports/esp32/boards/LILYGO_TTGO_LORA32/manifest.py
+++ b/ports/esp32/boards/LILYGO_TTGO_LORA32/manifest.py
@@ -1,4 +1,4 @@
 include("$(PORT_DIR)/boards/manifest.py")
 freeze("modules")
 
-freeze("$(MPY_DIR)/drivers/display", "ssd1306.py")
+include("$(MPY_DIR)/drivers/display", ssd1306=True)
diff --git a/ports/esp32/boards/LOLIN_S2_PICO/manifest.py b/ports/esp32/boards/LOLIN_S2_PICO/manifest.py
index 98d4247c607a9..efc37137b2cfd 100644
--- a/ports/esp32/boards/LOLIN_S2_PICO/manifest.py
+++ b/ports/esp32/boards/LOLIN_S2_PICO/manifest.py
@@ -1,4 +1,4 @@
 include("$(PORT_DIR)/boards/manifest.py")
 freeze("./modules")
 
-freeze("$(MPY_DIR)/drivers/display", "ssd1306.py")
+include("$(MPY_DIR)/drivers/display", ssd1306=True)
diff --git a/ports/esp32/boards/UM_FEATHERS2/manifest.py b/ports/esp32/boards/UM_FEATHERS2/manifest.py
index 82ad0c7e49888..3fda1dd8272cf 100644
--- a/ports/esp32/boards/UM_FEATHERS2/manifest.py
+++ b/ports/esp32/boards/UM_FEATHERS2/manifest.py
@@ -1,3 +1,3 @@
 include("$(PORT_DIR)/boards/manifest.py")
-freeze("$(PORT_DIR)/boards/UM_TINYPICO/modules", "dotstar.py")
+module("dotstar.py", base_path="$(PORT_DIR)/boards/UM_TINYPICO/modules", opt=3)
 freeze("modules")
diff --git a/ports/esp32/boards/manifest.py b/ports/esp32/boards/manifest.py
index 23252442ea460..658d11d5855d7 100644
--- a/ports/esp32/boards/manifest.py
+++ b/ports/esp32/boards/manifest.py
@@ -1,14 +1,15 @@
 freeze("$(PORT_DIR)/modules")
-freeze("$(MPY_DIR)/tools", ("upip.py", "upip_utarfile.py"))
-freeze("$(MPY_DIR)/extmod", "ntptime.py")
-freeze("$(MPY_DIR)/drivers/dht", "dht.py")
-freeze("$(MPY_DIR)/drivers/onewire")
-include("$(MPY_DIR)/extmod/uasyncio/manifest.py")
-include("$(MPY_DIR)/extmod/webrepl/manifest.py")
-include("$(MPY_DIR)/drivers/neopixel/manifest.py")
+module("upip.py", base_path="$(MPY_DIR)/tools", opt=3)
+module("upip_utarfile.py", base_path="$(MPY_DIR)/tools", opt=3)
+module("ntptime.py", base_path="$(MPY_DIR)/extmod", opt=3)
+include("$(MPY_DIR)/drivers/dht")
+include("$(MPY_DIR)/drivers/onewire")
+include("$(MPY_DIR)/drivers/neopixel")
+include("$(MPY_DIR)/extmod/uasyncio")
+include("$(MPY_DIR)/extmod/webrepl")
 
-# Freeze some micropython-lib modules.
-freeze("$(MPY_LIB_DIR)/python-ecosys/urequests", "urequests.py")
-freeze("$(MPY_LIB_DIR)/micropython/upysh", "upysh.py")
-freeze("$(MPY_LIB_DIR)/micropython/umqtt.simple", "umqtt/simple.py")
-freeze("$(MPY_LIB_DIR)/micropython/umqtt.robust", "umqtt/robust.py")
+# Require some micropython-lib modules.
+require("urequests")
+require("upysh")
+require("umqtt.simple")
+require("umqtt.robust")
diff --git a/ports/esp8266/boards/GENERIC/manifest.py b/ports/esp8266/boards/GENERIC/manifest.py
index ef25040ef8a76..54b916546c343 100644
--- a/ports/esp8266/boards/GENERIC/manifest.py
+++ b/ports/esp8266/boards/GENERIC/manifest.py
@@ -2,18 +2,18 @@
 include("$(PORT_DIR)/boards/manifest.py")
 
 # uasyncio
-include("$(MPY_DIR)/extmod/uasyncio/manifest.py")
+include("$(MPY_DIR)/extmod/uasyncio")
 
 # drivers
-freeze("$(MPY_DIR)/drivers/display", "ssd1306.py")
+include("$(MPY_DIR)/drivers/display", ssd1306=True)
 
 # micropython-lib: file utilities
-freeze("$(MPY_LIB_DIR)/micropython/upysh", "upysh.py")
+require("upysh")
 
 # micropython-lib: requests
-freeze("$(MPY_LIB_DIR)/python-ecosys/urequests", "urequests.py")
-freeze("$(MPY_LIB_DIR)/micropython/urllib.urequest", "urllib/urequest.py")
+require("urequests")
+require("urllib.urequest")
 
 # micropython-lib: umqtt
-freeze("$(MPY_LIB_DIR)/micropython/umqtt.simple", "umqtt/simple.py")
-freeze("$(MPY_LIB_DIR)/micropython/umqtt.robust", "umqtt/robust.py")
+require("umqtt.simple")
+require("umqtt.robust")
diff --git a/ports/esp8266/boards/GENERIC_512K/manifest.py b/ports/esp8266/boards/GENERIC_512K/manifest.py
index e43d94843fdba..57970a6b4dc11 100644
--- a/ports/esp8266/boards/GENERIC_512K/manifest.py
+++ b/ports/esp8266/boards/GENERIC_512K/manifest.py
@@ -1,5 +1,8 @@
-freeze("$(BOARD_DIR)", "_boot.py", opt=3)
-freeze("$(MPY_DIR)/drivers/dht", "dht.py")
-freeze("$(MPY_DIR)/drivers/onewire")
-include("$(MPY_DIR)/extmod/webrepl/manifest.py")
-include("$(MPY_DIR)/drivers/neopixel/manifest.py")
+module("_boot.py", opt=3)
+module("apa102.py", base_path="$(PORT_DIR)/modules", opt=3)
+module("port_diag.py", base_path="$(PORT_DIR)/modules", opt=3)
+module("ntptime.py", base_path="$(MPY_DIR)/extmod", opt=3)
+include("$(MPY_DIR)/drivers/dht")
+include("$(MPY_DIR)/drivers/onewire")
+include("$(MPY_DIR)/extmod/webrepl")
+include("$(MPY_DIR)/drivers/neopixel")
diff --git a/ports/esp8266/boards/manifest.py b/ports/esp8266/boards/manifest.py
index c5809717e6927..abcee253ffe55 100644
--- a/ports/esp8266/boards/manifest.py
+++ b/ports/esp8266/boards/manifest.py
@@ -1,7 +1,8 @@
 freeze("$(PORT_DIR)/modules")
-freeze("$(MPY_DIR)/extmod", "ntptime.py")
-freeze("$(MPY_DIR)/tools", ("upip.py", "upip_utarfile.py"))
-freeze("$(MPY_DIR)/drivers/dht", "dht.py")
-freeze("$(MPY_DIR)/drivers/onewire")
-include("$(MPY_DIR)/extmod/webrepl/manifest.py")
-include("$(MPY_DIR)/drivers/neopixel/manifest.py")
+module("upip.py", base_path="$(MPY_DIR)/tools", opt=3)
+module("upip_utarfile.py", base_path="$(MPY_DIR)/tools", opt=3)
+module("ntptime.py", base_path="$(MPY_DIR)/extmod", opt=3)
+include("$(MPY_DIR)/drivers/dht")
+include("$(MPY_DIR)/drivers/onewire")
+include("$(MPY_DIR)/extmod/webrepl")
+include("$(MPY_DIR)/drivers/neopixel")
diff --git a/ports/mimxrt/boards/manifest.py b/ports/mimxrt/boards/manifest.py
index 2e1a1d63d4e79..a273dfa37041a 100644
--- a/ports/mimxrt/boards/manifest.py
+++ b/ports/mimxrt/boards/manifest.py
@@ -1,8 +1,4 @@
 freeze("$(PORT_DIR)/modules")
-freeze("$(MPY_DIR)/drivers/onewire")
-freeze("$(MPY_DIR)/drivers/dht", "dht.py")
-include("$(MPY_DIR)/extmod/uasyncio/manifest.py")
-try:
-    include("$(BOARD_DIR)/manifest.py")
-except FileNotFoundError:
-    pass
+include("$(MPY_DIR)/drivers/onewire")
+include("$(MPY_DIR)/drivers/dht")
+include("$(MPY_DIR)/extmod/uasyncio")
diff --git a/ports/nrf/boards/arduino_nano_33_ble_sense/manifest.py b/ports/nrf/boards/arduino_nano_33_ble_sense/manifest.py
index dbc8104dc24fc..2b0cc6c818fbe 100644
--- a/ports/nrf/boards/arduino_nano_33_ble_sense/manifest.py
+++ b/ports/nrf/boards/arduino_nano_33_ble_sense/manifest.py
@@ -1,4 +1,4 @@
 include("$(PORT_DIR)/modules/manifest.py")
-freeze("$(MPY_DIR)/drivers/hts221", "hts221.py")
-freeze("$(MPY_DIR)/drivers/lps22h", "lps22h.py")
-freeze("$(MPY_DIR)/drivers/lsm9ds1", "lsm9ds1.py")
+include("$(MPY_DIR)/drivers/hts221")
+include("$(MPY_DIR)/drivers/lps22h")
+include("$(MPY_DIR)/drivers/lsm9ds1")
diff --git a/ports/nrf/modules/manifest.py b/ports/nrf/modules/manifest.py
index b27d4648b7ea2..6efaf62d79d69 100644
--- a/ports/nrf/modules/manifest.py
+++ b/ports/nrf/modules/manifest.py
@@ -1,2 +1,2 @@
-freeze("$(PORT_DIR)/modules/scripts", "_mkfs.py")
-include("$(MPY_DIR)/extmod/uasyncio/manifest.py")
+module("_mkfs.py", base_path="$(PORT_DIR)/modules/scripts", opt=3)
+include("$(MPY_DIR)/extmod/uasyncio")
diff --git a/ports/renesas-ra/boards/RA4M1_CLICKER/manifest.py b/ports/renesas-ra/boards/RA4M1_CLICKER/manifest.py
index 4a387915d37e0..c25ae79887e28 100644
--- a/ports/renesas-ra/boards/RA4M1_CLICKER/manifest.py
+++ b/ports/renesas-ra/boards/RA4M1_CLICKER/manifest.py
@@ -1,2 +1,2 @@
 # We do not want to include default frozen modules,
-freeze("$(MPY_DIR)/drivers/sdcard", "sdcard.py")
+include("$(MPY_DIR)/drivers/sdcard")
diff --git a/ports/renesas-ra/boards/RA4M1_EK/manifest.py b/ports/renesas-ra/boards/RA4M1_EK/manifest.py
index 4a387915d37e0..c25ae79887e28 100644
--- a/ports/renesas-ra/boards/RA4M1_EK/manifest.py
+++ b/ports/renesas-ra/boards/RA4M1_EK/manifest.py
@@ -1,2 +1,2 @@
 # We do not want to include default frozen modules,
-freeze("$(MPY_DIR)/drivers/sdcard", "sdcard.py")
+include("$(MPY_DIR)/drivers/sdcard")
diff --git a/ports/renesas-ra/boards/manifest.py b/ports/renesas-ra/boards/manifest.py
index 836bf7ccc24dc..c66ec92015dea 100644
--- a/ports/renesas-ra/boards/manifest.py
+++ b/ports/renesas-ra/boards/manifest.py
@@ -1,4 +1,4 @@
-include("$(MPY_DIR)/extmod/uasyncio/manifest.py")
-freeze("$(MPY_DIR)/drivers/dht", "dht.py")
-freeze("$(MPY_DIR)/drivers/onewire", "onewire.py")
-freeze("$(MPY_DIR)/drivers/sdcard", "sdcard.py")
+include("$(MPY_DIR)/extmod/uasyncio")
+include("$(MPY_DIR)/drivers/dht")
+include("$(MPY_DIR)/drivers/onewire", ds18x20=False)
+include("$(MPY_DIR)/drivers/sdcard")
diff --git a/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/manifest.py b/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/manifest.py
index 7a2f1c9e2738c..e139c7d60bed7 100644
--- a/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/manifest.py
+++ b/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/manifest.py
@@ -1,11 +1,11 @@
 include("$(PORT_DIR)/boards/manifest.py")
-include("$(MPY_DIR)/extmod/webrepl/manifest.py")
-freeze("$(MPY_DIR)/drivers/lsm6dsox/", "lsm6dsox.py")
-include(
-    "$(MPY_LIB_DIR)/micropython/bluetooth/aioble/manifest.py",
-    client=True,
-    central=True,
-    l2cap=True,
-    security=True,
-)
-freeze("$(MPY_LIB_DIR)/python-ecosys/urequests", "urequests.py")
+
+# Networking
+include("$(MPY_DIR)/extmod/webrepl")
+require("urequests")
+
+# Drivers
+include("$(MPY_DIR)/drivers/lsm6dsox")
+
+# Bluetooth
+require("aioble", client=True, central=True, l2cap=True, security=True)
diff --git a/ports/rp2/boards/PICO_W/manifest.py b/ports/rp2/boards/PICO_W/manifest.py
index d2c76602affe8..66ff26b0c8569 100644
--- a/ports/rp2/boards/PICO_W/manifest.py
+++ b/ports/rp2/boards/PICO_W/manifest.py
@@ -1,7 +1,7 @@
 include("../manifest.py")
 
-freeze("$(MPY_DIR)/tools", "upip.py")
-freeze("$(MPY_DIR)/tools", "upip_utarfile.py")
-freeze("$(MPY_DIR)/extmod", "ntptime.py")
+module("upip.py", base_path="$(MPY_DIR)/tools", opt=3)
+module("upip_utarfile.py", base_path="$(MPY_DIR)/tools", opt=3)
+module("ntptime.py", base_path="$(MPY_DIR)/extmod", opt=3)
 
-freeze("$(MPY_LIB_DIR)/python-ecosys/urequests", "urequests.py")
+require("urequests")
diff --git a/ports/rp2/boards/manifest.py b/ports/rp2/boards/manifest.py
index b0e5e315544f2..9afcba17e85d2 100644
--- a/ports/rp2/boards/manifest.py
+++ b/ports/rp2/boards/manifest.py
@@ -1,5 +1,5 @@
 freeze("$(PORT_DIR)/modules")
-freeze("$(MPY_DIR)/drivers/onewire")
-freeze("$(MPY_DIR)/drivers/dht", "dht.py")
-include("$(MPY_DIR)/extmod/uasyncio/manifest.py")
-include("$(MPY_DIR)/drivers/neopixel/manifest.py")
+include("$(MPY_DIR)/drivers/onewire")
+include("$(MPY_DIR)/drivers/dht")
+include("$(MPY_DIR)/extmod/uasyncio")
+include("$(MPY_DIR)/drivers/neopixel")
diff --git a/ports/stm32/boards/ARDUINO_PORTENTA_H7/manifest.py b/ports/stm32/boards/ARDUINO_PORTENTA_H7/manifest.py
index cd721d0ac45d1..0ecdcd21534fe 100644
--- a/ports/stm32/boards/ARDUINO_PORTENTA_H7/manifest.py
+++ b/ports/stm32/boards/ARDUINO_PORTENTA_H7/manifest.py
@@ -1,9 +1,3 @@
 include("$(PORT_DIR)/boards/manifest.py")
-include("$(MPY_DIR)/extmod/webrepl/manifest.py")
-include(
-    "$(MPY_LIB_DIR)/micropython/bluetooth/aioble/manifest.py",
-    client=True,
-    central=True,
-    l2cap=True,
-    security=True,
-)
+include("$(MPY_DIR)/extmod/webrepl")
+require("aioble", client=True, central=True, l2cap=True, security=True)
diff --git a/ports/stm32/boards/GARATRONIC_PYBSTICK26_F411/manifest.py b/ports/stm32/boards/GARATRONIC_PYBSTICK26_F411/manifest.py
index b09c7ab920308..69da2897ae06f 100644
--- a/ports/stm32/boards/GARATRONIC_PYBSTICK26_F411/manifest.py
+++ b/ports/stm32/boards/GARATRONIC_PYBSTICK26_F411/manifest.py
@@ -1,2 +1,2 @@
-include("$(MPY_DIR)/extmod/uasyncio/manifest.py")
+# Note: Freezes to display.ssd1306, so must use deprecated "freeze" function.
 freeze("$(MPY_DIR)/drivers/", ("display/ssd1306.py"))
diff --git a/ports/stm32/boards/LEGO_HUB_NO6/manifest.py b/ports/stm32/boards/LEGO_HUB_NO6/manifest.py
index dc09d04c9f2bf..107001c38eda9 100644
--- a/ports/stm32/boards/LEGO_HUB_NO6/manifest.py
+++ b/ports/stm32/boards/LEGO_HUB_NO6/manifest.py
@@ -1,3 +1,5 @@
+# Shared manifest for LEGO_HUB_NO6 & LEGO_HUB_NO7.
+
 include("$(PORT_DIR)/boards/manifest.py")
 
 # Modules for application firmware update.
diff --git a/ports/stm32/boards/LEGO_HUB_NO7/manifest.py b/ports/stm32/boards/LEGO_HUB_NO7/manifest.py
index d746381637d96..ee79864a982c7 100644
--- a/ports/stm32/boards/LEGO_HUB_NO7/manifest.py
+++ b/ports/stm32/boards/LEGO_HUB_NO7/manifest.py
@@ -1,5 +1,2 @@
-include("$(PORT_DIR)/boards/manifest.py")
-
-# Modules for application firmware update.
-freeze("$(PORT_DIR)/mboot", "fwupdate.py", opt=3)
-freeze("$(PORT_DIR)/boards/LEGO_HUB_NO6", ("spiflash.py", "appupdate.py"), opt=3)
+# Use shared manifest.
+include("$(PORT_DIR)/boards/LEGO_HUB_NO6")
diff --git a/ports/stm32/boards/PYBD_SF2/manifest.py b/ports/stm32/boards/PYBD_SF2/manifest.py
index 3819aa01b3dc6..e4736f693a989 100644
--- a/ports/stm32/boards/PYBD_SF2/manifest.py
+++ b/ports/stm32/boards/PYBD_SF2/manifest.py
@@ -1,2 +1,2 @@
 include("$(PORT_DIR)/boards/manifest.py")
-include("$(MPY_DIR)/extmod/webrepl/manifest.py")
+include("$(MPY_DIR)/extmod/webrepl")
diff --git a/ports/stm32/boards/manifest.py b/ports/stm32/boards/manifest.py
index 81b85834101de..4bb224e2d866d 100644
--- a/ports/stm32/boards/manifest.py
+++ b/ports/stm32/boards/manifest.py
@@ -1,4 +1,5 @@
-include("$(MPY_DIR)/extmod/uasyncio/manifest.py")
-freeze("$(MPY_DIR)/drivers/dht", "dht.py")
-freeze("$(MPY_DIR)/drivers/display", ("lcd160cr.py", "lcd160cr_test.py"))
-freeze("$(MPY_DIR)/drivers/onewire", "onewire.py")
+include("$(MPY_DIR)/extmod/uasyncio")
+
+include("$(MPY_DIR)/drivers/dht")
+include("$(MPY_DIR)/drivers/display", lcd160cr=True, test=True)
+include("$(MPY_DIR)/drivers/onewire", ds18x20=False)
diff --git a/ports/unix/variants/dev/manifest.py b/ports/unix/variants/dev/manifest.py
index 92a681116a687..dd521258e1ac1 100644
--- a/ports/unix/variants/dev/manifest.py
+++ b/ports/unix/variants/dev/manifest.py
@@ -1,3 +1,3 @@
 include("$(PORT_DIR)/variants/manifest.py")
 
-include("$(MPY_DIR)/extmod/uasyncio/manifest.py")
+include("$(MPY_DIR)/extmod/uasyncio")
diff --git a/ports/unix/variants/manifest.py b/ports/unix/variants/manifest.py
index 7708e598dbcfb..bf7ce992ade0d 100644
--- a/ports/unix/variants/manifest.py
+++ b/ports/unix/variants/manifest.py
@@ -1,2 +1,2 @@
-freeze_as_mpy("$(MPY_DIR)/tools", "upip.py")
-freeze_as_mpy("$(MPY_DIR)/tools", "upip_utarfile.py", opt=3)
+module("upip.py", base_path="$(MPY_DIR)/tools", opt=3)
+module("upip_utarfile.py", base_path="$(MPY_DIR)/tools", opt=3)
diff --git a/ports/windows/variants/dev/manifest.py b/ports/windows/variants/dev/manifest.py
index 88a6937b4fb36..f65a3d35e9d15 100644
--- a/ports/windows/variants/dev/manifest.py
+++ b/ports/windows/variants/dev/manifest.py
@@ -1,2 +1,2 @@
 include("$(PORT_DIR)/variants/manifest.py")
-include("$(MPY_DIR)/extmod/uasyncio/manifest.py")
+include("$(MPY_DIR)/extmod/uasyncio")

From fb20dbe4d123c69a7770e70911e827cefef01aa3 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Tue, 6 Sep 2022 10:57:33 +1000
Subject: [PATCH 2568/3533] stm32/boards/LEGO_HUB_NO6: Update manifest to new
 format.

This was added after 203dae41f and missed in the rebase.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/stm32/boards/LEGO_HUB_NO6/manifest.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/ports/stm32/boards/LEGO_HUB_NO6/manifest.py b/ports/stm32/boards/LEGO_HUB_NO6/manifest.py
index 107001c38eda9..1be4246e37882 100644
--- a/ports/stm32/boards/LEGO_HUB_NO6/manifest.py
+++ b/ports/stm32/boards/LEGO_HUB_NO6/manifest.py
@@ -3,5 +3,6 @@
 include("$(PORT_DIR)/boards/manifest.py")
 
 # Modules for application firmware update.
-freeze("$(PORT_DIR)/mboot", "fwupdate.py", opt=3)
-freeze("$(BOARD_DIR)", ("spiflash.py", "appupdate.py"), opt=3)
+module("fwupdate.py", base_path="$(PORT_DIR)/mboot", opt=3)
+module("spiflash.py", opt=3)
+module("appupdate.py", opt=3)

From 655c29351a7c4ef74612edf6088036b07f39e6c7 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 6 Sep 2022 11:52:46 +1000
Subject: [PATCH 2569/3533] drivers/display: Don't include tests by default.

The tests can be copied to the board if needed.

Also update the docs to reflect this change.

Signed-off-by: Damien George <damien@micropython.org>
---
 docs/pyboard/tutorial/lcd160cr_skin.rst | 4 ++--
 docs/reference/mpremote.rst             | 2 ++
 drivers/display/manifest.py             | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/docs/pyboard/tutorial/lcd160cr_skin.rst b/docs/pyboard/tutorial/lcd160cr_skin.rst
index fc9d63538261e..fa0debcb1ce3f 100644
--- a/docs/pyboard/tutorial/lcd160cr_skin.rst
+++ b/docs/pyboard/tutorial/lcd160cr_skin.rst
@@ -40,9 +40,9 @@ Testing the display
 
 There is a test program which you can use to test the features of the display,
 and which also serves as a basis to start creating your own code that uses the
-LCD.  This test program is included in recent versions of the pyboard firmware
-and is also available on GitHub
+LCD.  This test program is available on GitHub
 `here <https://github.com/micropython/micropython/blob/master/drivers/display/lcd160cr_test.py>`__.
+Copy it to the board over USB mass storage, or by using `mpremote`.
 
 To run the test from the MicroPython prompt do::
 
diff --git a/docs/reference/mpremote.rst b/docs/reference/mpremote.rst
index a48df9953f503..e3902f8e5d7e9 100644
--- a/docs/reference/mpremote.rst
+++ b/docs/reference/mpremote.rst
@@ -1,3 +1,5 @@
+.. _mpremote:
+
 MicroPython remote control: mpremote
 ====================================
 
diff --git a/drivers/display/manifest.py b/drivers/display/manifest.py
index d1ddff3374aba..16f93a7d4e99a 100644
--- a/drivers/display/manifest.py
+++ b/drivers/display/manifest.py
@@ -1,5 +1,5 @@
 # TODO: Split these into separate directories with their own manifests.
-options.defaults(lcd160cr=False, ssd1306=False, test=True)
+options.defaults(lcd160cr=False, ssd1306=False, test=False)
 
 if options.lcd160cr:
     module("lcd160cr.py", opt=3)

From 4e4c28bf27ff4a9e1a2ce5b6fffa641d9a332507 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 6 Sep 2022 11:53:36 +1000
Subject: [PATCH 2570/3533] stm32/boards: Only freeze LCD160CR driver in PYB
 board firmware.

Although this driver and associated hardware can be used on any board, it
makes to only freeze it for PYB and PYBD boards.  It can be easily copied
to any board if needed.

Fixes issue #8056.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/boards/PYBD_SF2/manifest.py        | 1 +
 ports/stm32/boards/PYBLITEV10/mpconfigboard.mk | 3 +++
 ports/stm32/boards/PYBV10/manifest.py          | 2 ++
 ports/stm32/boards/PYBV10/mpconfigboard.mk     | 3 +++
 ports/stm32/boards/PYBV11/mpconfigboard.mk     | 3 +++
 ports/stm32/boards/manifest.py                 | 1 -
 ports/stm32/boards/manifest_pyboard.py         | 1 +
 7 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 ports/stm32/boards/PYBV10/manifest.py
 create mode 100644 ports/stm32/boards/manifest_pyboard.py

diff --git a/ports/stm32/boards/PYBD_SF2/manifest.py b/ports/stm32/boards/PYBD_SF2/manifest.py
index e4736f693a989..a9e92848d58d5 100644
--- a/ports/stm32/boards/PYBD_SF2/manifest.py
+++ b/ports/stm32/boards/PYBD_SF2/manifest.py
@@ -1,2 +1,3 @@
 include("$(PORT_DIR)/boards/manifest.py")
+include("$(PORT_DIR)/boards/manifest_pyboard.py")
 include("$(MPY_DIR)/extmod/webrepl")
diff --git a/ports/stm32/boards/PYBLITEV10/mpconfigboard.mk b/ports/stm32/boards/PYBLITEV10/mpconfigboard.mk
index 8aeaf0e40cfbd..74698664760f0 100644
--- a/ports/stm32/boards/PYBLITEV10/mpconfigboard.mk
+++ b/ports/stm32/boards/PYBLITEV10/mpconfigboard.mk
@@ -24,3 +24,6 @@ endif
 ifeq ($(BOARD_VARIANT),"network")
 MICROPY_PY_NETWORK_WIZNET5K=5200
 endif
+
+# PYB-specific frozen modules
+FROZEN_MANIFEST ?= boards/PYBV10/manifest.py
diff --git a/ports/stm32/boards/PYBV10/manifest.py b/ports/stm32/boards/PYBV10/manifest.py
new file mode 100644
index 0000000000000..ec0d4a26b7853
--- /dev/null
+++ b/ports/stm32/boards/PYBV10/manifest.py
@@ -0,0 +1,2 @@
+include("$(PORT_DIR)/boards/manifest.py")
+include("$(PORT_DIR)/boards/manifest_pyboard.py")
diff --git a/ports/stm32/boards/PYBV10/mpconfigboard.mk b/ports/stm32/boards/PYBV10/mpconfigboard.mk
index 97af22b5e19bd..af28782678031 100644
--- a/ports/stm32/boards/PYBV10/mpconfigboard.mk
+++ b/ports/stm32/boards/PYBV10/mpconfigboard.mk
@@ -34,3 +34,6 @@ endif
 ifeq ($(BOARD_VARIANT),"network")
 MICROPY_PY_NETWORK_WIZNET5K=5200
 endif
+
+# PYB-specific frozen modules
+FROZEN_MANIFEST ?= $(BOARD_DIR)/manifest.py
diff --git a/ports/stm32/boards/PYBV11/mpconfigboard.mk b/ports/stm32/boards/PYBV11/mpconfigboard.mk
index 97af22b5e19bd..cf7884cfc67a9 100644
--- a/ports/stm32/boards/PYBV11/mpconfigboard.mk
+++ b/ports/stm32/boards/PYBV11/mpconfigboard.mk
@@ -34,3 +34,6 @@ endif
 ifeq ($(BOARD_VARIANT),"network")
 MICROPY_PY_NETWORK_WIZNET5K=5200
 endif
+
+# PYB-specific frozen modules
+FROZEN_MANIFEST ?= boards/PYBV10/manifest.py
diff --git a/ports/stm32/boards/manifest.py b/ports/stm32/boards/manifest.py
index 4bb224e2d866d..723caa3eb6d1a 100644
--- a/ports/stm32/boards/manifest.py
+++ b/ports/stm32/boards/manifest.py
@@ -1,5 +1,4 @@
 include("$(MPY_DIR)/extmod/uasyncio")
 
 include("$(MPY_DIR)/drivers/dht")
-include("$(MPY_DIR)/drivers/display", lcd160cr=True, test=True)
 include("$(MPY_DIR)/drivers/onewire", ds18x20=False)
diff --git a/ports/stm32/boards/manifest_pyboard.py b/ports/stm32/boards/manifest_pyboard.py
new file mode 100644
index 0000000000000..e4fb0a8c4dd1a
--- /dev/null
+++ b/ports/stm32/boards/manifest_pyboard.py
@@ -0,0 +1 @@
+include("$(MPY_DIR)/drivers/display", lcd160cr=True)

From 8770cd2f4d24b1ad14c934b4161e42108fe98f84 Mon Sep 17 00:00:00 2001
From: yn386 <wf.yn386@gmail.com>
Date: Sun, 28 Aug 2022 15:40:00 +0900
Subject: [PATCH 2571/3533] stm32/adc: Make ADCAll.read_channel reject invalid
 channels.

pyb.ADC(channel) checks whether specified channel is valid or have ADC
capability but pyb.ADCAll().read_channel() does not.

This change adds checking whether specified channel is valid and throw
ValueError if channel is invalid.  This is same as pyb.ADC().
---
 ports/stm32/adc.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ports/stm32/adc.c b/ports/stm32/adc.c
index 9b7788e59e337..9d58cf2e7cf02 100644
--- a/ports/stm32/adc.c
+++ b/ports/stm32/adc.c
@@ -856,6 +856,9 @@ STATIC mp_obj_t adc_all_make_new(const mp_obj_type_t *type, size_t n_args, size_
 STATIC mp_obj_t adc_all_read_channel(mp_obj_t self_in, mp_obj_t channel) {
     pyb_adc_all_obj_t *self = MP_OBJ_TO_PTR(self_in);
     uint32_t chan = adc_get_internal_channel(mp_obj_get_int(channel));
+    if (!is_adcx_channel(chan)) {
+        mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("not a valid ADC Channel: %d"), chan);
+    }
     uint32_t data = adc_config_and_read_channel(&self->handle, chan);
     return mp_obj_new_int(data);
 }

From da50827657d6bc3024dd6acea76cb315d1cbbae1 Mon Sep 17 00:00:00 2001
From: yn386 <wf.yn386@gmail.com>
Date: Wed, 31 Aug 2022 19:13:00 +0900
Subject: [PATCH 2572/3533] stm32/pyb_i2c: Fix pyb.I2C to work with dma=True on
 F4 MCUs.

Prior to this commit, excuting this code:

    i2c = I2C(1, I2C.CONTROLLER, dma=True)
    i2c.send(data, addr=i2c_addr)

the call to i2c.send() does not return and the board needs a reset.  This
code works when dma=False.

According to the specification, I2Cx_EV_IRQHandler should:
- Write DR to address when Start condition generated.
- Clear ADDR by reading SR2 after reading SR2 when address sent.

These processes are included in HAL_I2C_EV_IRQHandler(), however the
firmware size increses about 2KB if HAL_I2C_EV_IRQHandler is called.  This
commit adds above processes to i2c_ev_irq_handler, and increases firmware
by less than 100 bytes.

Fixes issue #2643.
---
 ports/stm32/pyb_i2c.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/ports/stm32/pyb_i2c.c b/ports/stm32/pyb_i2c.c
index 436b1c9bc2437..e9877422ca0b4 100644
--- a/ports/stm32/pyb_i2c.c
+++ b/ports/stm32/pyb_i2c.c
@@ -472,7 +472,17 @@ void i2c_ev_irq_handler(mp_uint_t i2c_id) {
 
     #if defined(STM32F4)
 
-    if (hi2c->Instance->SR1 & I2C_FLAG_BTF && hi2c->State == HAL_I2C_STATE_BUSY_TX) {
+    if (hi2c->Instance->SR1 & I2C_FLAG_SB) {
+        if (hi2c->State == HAL_I2C_STATE_BUSY_TX) {
+            hi2c->Instance->DR = I2C_7BIT_ADD_WRITE(hi2c->Devaddress);
+        } else {
+            hi2c->Instance->DR = I2C_7BIT_ADD_READ(hi2c->Devaddress);
+        }
+    } else if (hi2c->Instance->SR1 & I2C_FLAG_ADDR) {
+        __IO uint32_t tmp_sr2;
+        tmp_sr2 = hi2c->Instance->SR2;
+        UNUSED(tmp_sr2);
+    } else if (hi2c->Instance->SR1 & I2C_FLAG_BTF && hi2c->State == HAL_I2C_STATE_BUSY_TX) {
         if (hi2c->XferCount != 0U) {
             hi2c->Instance->DR = *hi2c->pBuffPtr++;
             hi2c->XferCount--;

From 989b8c728b296969e6489908b8e94ed23625a1e8 Mon Sep 17 00:00:00 2001
From: yn386 <wf.yn386@gmail.com>
Date: Thu, 1 Sep 2022 18:08:18 +0900
Subject: [PATCH 2573/3533] stm32/timer: Fix use of timer channel callback()
 method on L4 MCUs.

Since L4 HAL version 1.17.0, HAL_TIM_IC_Start_IT() checks whether specified
channel of timer is busy or not, which is the case if this function is
called more than once without first calling HAL_TIM_IC_Stop_IT().  The fix
in this commit is to call the stop function before calling start.  The PWM
and OC modes have the same issue with the same fix.

Fixes issue #8732.
---
 ports/stm32/timer.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ports/stm32/timer.c b/ports/stm32/timer.c
index 0cef60cb62c87..518a2e23b4730 100644
--- a/ports/stm32/timer.c
+++ b/ports/stm32/timer.c
@@ -1576,6 +1576,7 @@ STATIC mp_obj_t pyb_timer_channel_callback(mp_obj_t self_in, mp_obj_t callback)
         switch (self->mode) {
             case CHANNEL_MODE_PWM_NORMAL:
             case CHANNEL_MODE_PWM_INVERTED:
+                HAL_TIM_PWM_Stop_IT(&self->timer->tim, TIMER_CHANNEL(self));
                 HAL_TIM_PWM_Start_IT(&self->timer->tim, TIMER_CHANNEL(self));
                 break;
             case CHANNEL_MODE_OC_TIMING:
@@ -1584,9 +1585,11 @@ STATIC mp_obj_t pyb_timer_channel_callback(mp_obj_t self_in, mp_obj_t callback)
             case CHANNEL_MODE_OC_TOGGLE:
             case CHANNEL_MODE_OC_FORCED_ACTIVE:
             case CHANNEL_MODE_OC_FORCED_INACTIVE:
+                HAL_TIM_OC_Stop_IT(&self->timer->tim, TIMER_CHANNEL(self));
                 HAL_TIM_OC_Start_IT(&self->timer->tim, TIMER_CHANNEL(self));
                 break;
             case CHANNEL_MODE_IC:
+                HAL_TIM_IC_Stop_IT(&self->timer->tim, TIMER_CHANNEL(self));
                 HAL_TIM_IC_Start_IT(&self->timer->tim, TIMER_CHANNEL(self));
                 break;
         }

From 719dbbf5639cdeff99bf629c45d66b18007e9958 Mon Sep 17 00:00:00 2001
From: yn386 <wf.yn386@gmail.com>
Date: Fri, 2 Sep 2022 18:46:10 +0900
Subject: [PATCH 2574/3533] stm32/boards: Add alternate function list for
 STM32F446RE.

Signed-off-by: Damien George <damien@micropython.org>
---
 .../boards/NUCLEO_F446RE/mpconfigboard.mk     |   2 +-
 ports/stm32/boards/stm32f446_af.csv           | 116 ++++++++++++++++++
 2 files changed, 117 insertions(+), 1 deletion(-)
 create mode 100644 ports/stm32/boards/stm32f446_af.csv

diff --git a/ports/stm32/boards/NUCLEO_F446RE/mpconfigboard.mk b/ports/stm32/boards/NUCLEO_F446RE/mpconfigboard.mk
index 64a80e992bcec..3a922acebfbd7 100644
--- a/ports/stm32/boards/NUCLEO_F446RE/mpconfigboard.mk
+++ b/ports/stm32/boards/NUCLEO_F446RE/mpconfigboard.mk
@@ -1,6 +1,6 @@
 MCU_SERIES = f4
 CMSIS_MCU = STM32F446xx
-AF_FILE = boards/stm32f429_af.csv
+AF_FILE = boards/stm32f446_af.csv
 LD_FILES = boards/stm32f411.ld boards/common_ifs.ld
 TEXT0_ADDR = 0x08000000
 TEXT1_ADDR = 0x08020000
diff --git a/ports/stm32/boards/stm32f446_af.csv b/ports/stm32/boards/stm32f446_af.csv
new file mode 100644
index 0000000000000..0838ed089d8f2
--- /dev/null
+++ b/ports/stm32/boards/stm32f446_af.csv
@@ -0,0 +1,116 @@
+Port,,AF0,AF1,AF2,AF3,AF4,AF5,AF6,AF7,AF8,AF9,AF10,AF11,AF12,AF13,AF14,AF15,
+,,SYS,TIM1/2,TIM3/4/5,TIM8/9/10/11/CEC,I2C1/2/3/4/CEC,SPI1/2/3/4,SPI2/3/4/SAI1,SPI2/3/USART1/2/3/UART5/SPDIFRX,SAI/USART6/UART4/5/SPDIFRX,CAN1/2/TIM12/13/14/QUADSPI,SAI2/QUADSPI/OTG2_HS/OTG1_FS,OTG1_FS,FMC/SDIO/OTG2_FS,DCMI,,SYS,
+PortA,PA0,,TIM2_CH1/TIM2_ETR,TIM5_CH1,TIM8_ETR,,,,USART2_CTS,UART4_TX,,,,,,,EVENTOUT,ADC123_IN0
+PortA,PA1,,TIM2_CH2,TIM5_CH2,,,,,USART2_RTS,UART4_RX,QUADSPI_BK1_IO3,SAI2_MCLK_B,,,,,EVENTOUT,ADC123_IN1
+PortA,PA2,,TIM2_CH3,TIM5_CH3,TIM9_CH1,,,,USART2_TX,SAI2_SCK_B,,,,,,,EVENTOUT,ADC123_IN2
+PortA,PA3,,TIM2_CH4,TIM5_CH4,TIM9_CH2,,,SAI1_FS_A,USART2_RX,,,OTG_HS_ULPI_D0,,,,,EVENTOUT,ADC123_IN3
+PortA,PA4,,,,,,SPI1_NSS/I2S1_WS,SPI3_NSS/I2S3_WS,USART2_CK,,,,,OTG_HS_SOF,DCMI_HSYNC,,EVENTOUT,ADC12_IN4
+PortA,PA5,,TIM2_CH1/TIM2_ETR,,TIM8_CH1N,,SPI1_SCK/I2S1_CK,,,,,OTG_HS_ULPI_CK,,,,,EVENTOUT,ADC12_IN5
+PortA,PA6,,TIM1_BKIN,TIM3_CH1,TIM8_BKIN,,SPI1_MISO,I2S2_MCK,,,TIM13_CH1,,,,DCMI_PIXCLK,,EVENTOUT,ADC12_IN6
+PortA,PA7,,TIM1_CH1N,TIM3_CH2,TIM8_CH1N,,SPI1_MOSI/I2S1_SD,,,,TIM14_CH1,,,FMC_SDNWE,,,EVENTOUT,ADC12_IN7
+PortA,PA8,MCO1,TIM1_CH1,,,I2C3_SCL,,,USART1_CK,,,OTG_FS_SOF,,,,,EVENTOUT,
+PortA,PA9,,TIM1_CH2,,,I2C3_SMBA,SPI2_SCK/I2S2_CK,SAI1_SD_B,USART1_TX,,,,,,DCMI_D0,,EVENTOUT,
+PortA,PA10,,TIM1_CH3,,,,,,USART1_RX,,,OTG_FS_ID,,,DCMI_D1,,EVENTOUT,
+PortA,PA11,,TIM1_CH4,,,,,,USART1_CTS,,CAN1_RX,OTG_FS_DM,,,,,EVENTOUT,
+PortA,PA12,,TIM1_ETR,,,,,,USART1_RTS,SAI2_FS_B,CAN1_TX,OTG_FS_DP,,,,,EVENTOUT,
+PortA,PA13,JTMS/SWDIO,,,,,,,,,,,,,,,EVENTOUT,
+PortA,PA14,JTCK/SWCLK,,,,,,,,,,,,,,,EVENTOUT,
+PortA,PA15,JTDI,TIM2_CH1/TIM2_ETR,,,HDMI_CEC,SPI1_NSS/I2S1_WS,SPI3_NSS/I2S3_WS,,UART4_RTS,,,,,,,EVENTOUT,
+PortB,PB0,,TIM1_CH2N,TIM3_CH3,TIM8_CH2N,,,,SPI3_MOSI/I2S3_SD,UART4_CTS,,OTG_HS_ULPI_D1,,SDIO_D1,,,EVENTOUT,ADC12_IN8
+PortB,PB1,,TIM1_CH3N,TIM3_CH4,TIM8_CH3N,,,,,,,OTG_HS_ULPI_D2,,SDIO_D2,,,EVENTOUT,ADC12_IN9
+PortB,PB2,,TIM2_CH4,,,,,SAI1_SD_A,SPI3_MOSI/I2S3_SD,,QUADSPI_CLK,OTG_HS_ULPI_D4,,SDIO_CK,,,EVENTOUT,
+PortB,PB3,JTDO/TRACESWO,TIM2_CH2,,,I2C2_SDA,SPI1_SCK/I2S1_CK,SPI3_SCK/I2S3_CK,,,,,,,,,EVENTOUT,
+PortB,PB4,NJTRST,,TIM3_CH1,,I2C3_SDA,SPI1_MISO,SPI3_MISO,SPI2_NSS/I2S2_WS,,,,,,,,EVENTOUT,
+PortB,PB5,,,TIM3_CH2,,I2C1_SMBA,SPI1_MOSI/I2S1_SD,SPI3_MOSI/I2S3_SD,,,CAN2_RX,OTG_HS_ULPI_D7,,FMC_SDCKE1,DCMI_D10,,EVENTOUT,
+PortB,PB6,,,TIM4_CH1,HDMI_CEC,I2C1_SCL,,,USART1_TX,,CAN2_TX,QUADSPI_BK1_NCS,,FMC_SDNE1,DCMI_D5,,EVENTOUT,
+PortB,PB7,,,TIM4_CH2,,I2C1_SDA,,,USART1_RX,SPDIF_RX0,,,,FMC_NL,DCMI_VSYNC,,EVENTOUT,
+PortB,PB8,,TIM2_CH1/TIM2_ETR,TIM4_CH3,TIM10_CH1,I2C1_SCL,,,,,CAN1_RX,,,SDIO_D4,DCMI_D6,,EVENTOUT,
+PortB,PB9,,TIM2_CH2,TIM4_CH4,TIM11_CH1,I2C1_SDA,SPI2_NSS/I2S2_WS,SAI1_FS_B,,,CAN1_TX,,,SDIO_D5,DCMI_D7,,EVENTOUT,
+PortB,PB10,,TIM2_CH3,,,I2C2_SCL,SPI2_SCK/I2S2_CK,SAI1_SCK_A,USART3_TX,,,OTG_HS_ULPI_D3,,,,,EVENTOUT,
+PortB,PB11,,TIM2_CH4,,,I2C2_SDA,,,USART3_RX,SAI2_SD_A,,,,,,,EVENTOUT,
+PortB,PB12,,TIM1_BKIN,,,I2C2_SMBA,SPI2_NSS/I2S2_WS,SAI1_SCK_B,USART3_CK,,CAN2_RX,OTG_HS_ULPI_D5,,OTG_HS_ID,,,EVENTOUT,
+PortB,PB13,,TIM1_CH1N,,,,SPI2_SCK/I2S2_CK,,USART3_CTS,,CAN2_TX,OTG_HS_ULPI_D6,,,,,EVENTOUT,
+PortB,PB14,,TIM1_CH2N,,TIM8_CH2N,,SPI2_MISO,,USART3_RTS,,TIM12_CH1,,,OTG_HS_DM,,,EVENTOUT,
+PortB,PB15,RTC_REFIN,TIM1_CH3N,,TIM8_CH3N,,SPI2_MOSI/I2S2_SD,,,,TIM12_CH2,,,OTG_HS_DP,,,EVENTOUT,
+PortC,PC0,,,,,,,SAI1_MCLK_B,,,,OTG_HS_ULPI_STP,,FMC_SDNWE,,,EVENTOUT,ADC123_IN10
+PortC,PC1,,,,,,SPI3_MOSI/I2S3_SD,SAI1_SD_A,SPI2_MOSI/I2S2_SD,,,,,,,,EVENTOUT,ADC123_IN11
+PortC,PC2,,,,,,SPI2_MISO,,,,,OTG_HS_ULPI_DIR,,FMC_SDNE0,,,EVENTOUT,ADC123_IN12
+PortC,PC3,,,,,,SPI2_MOSI/I2S2_SD,,,,,OTG_HS_ULPI_NXT,,FMC_SDCKE0,,,EVENTOUT,ADC123_IN13
+PortC,PC4,,,,,,I2S1_MCK,,,SPDIF_RX2,,,,FMC_SDNE0,,,EVENTOUT,ADC12_IN14
+PortC,PC5,,,,,,,,USART3_RX,SPDIF_RX3,,,,FMC_SDCKE0,,,EVENTOUT,ADC12_IN15
+PortC,PC6,,,TIM3_CH1,TIM8_CH1,FMPI2C1_SCL,I2S2_MCK,,,USART6_TX,,,,SDIO_D6,DCMI_D0,,EVENTOUT,
+PortC,PC7,,,TIM3_CH2,TIM8_CH2,FMPI2C1_SDA,SPI2_SCK/I2S2_CK,I2S3_MCK,SPDIF_RX1,USART6_RX,,,,SDIO_D7,DCMI_D1,,EVENTOUT,
+PortC,PC8,TRACED0,,TIM3_CH3,TIM8_CH3,,,,UART5_RTS,USART6_CK,,,,SDIO_D0,DCMI_D2,,EVENTOUT,
+PortC,PC9,MCO2,,TIM3_CH4,TIM8_CH4,I2C3_SDA,I2S_CKIN,,UART5_CTS,,QUADSPI_BK1_IO0,,,SDIO_D1,DCMI_D3,,EVENTOUT,
+PortC,PC10,,,,,,,SPI3_SCK/I2S3_CK,USART3_TX,UART4_TX,QUADSPI_BK1_IO1,,,SDIO_D2,DCMI_D8,,EVENTOUT,
+PortC,PC11,,,,,,,SPI3_MISO,USART3_RX,UART4_RX,QUADSPI_BK2_NCS,,,SDIO_D3,DCMI_D4,,EVENTOUT,
+PortC,PC12,,,,,I2C2_SDA,,SPI3_MOSI/I2S3_SD,USART3_CK,UART5_TX,,,,SDIO_CK,DCMI_D9,,EVENTOUT,
+PortC,PC13,,,,,,,,,,,,,,,,EVENTOUT,
+PortC,PC14,,,,,,,,,,,,,,,,EVENTOUT,
+PortC,PC15,,,,,,,,,,,,,,,,EVENTOUT,
+PortD,PD0,,,,,,SPI4_MISO,SPI3_MOSI/I2S3_SD,,,CAN1_RX,,,FMC_D2,,,EVENTOUT,
+PortD,PD1,,,,,,,,SPI2_NSS/I2S2_WS,,CAN1_TX,,,FMC_D3,,,EVENTOUT,
+PortD,PD2,,,TIM3_ETR,,,,,,UART5_RX,,,,SDIO_CMD,DCMI_D11,,EVENTOUT,
+PortD,PD3,TRACED1,,,,,SPI2_SCK/I2S2_CK,,USART2_CTS,,QUADSPI_CLK,,,FMC_CLK,DCMI_D5,,EVENTOUT,
+PortD,PD4,,,,,,,,USART2_RTS,,,,,FMC_NOE,,,EVENTOUT,
+PortD,PD5,,,,,,,,USART2_TX,,,,,FMC_NWE,,,EVENTOUT,
+PortD,PD6,,,,,,SPI3_MOSI/I2S3_SD,SAI1_SD_A,USART2_RX,,,,,FMC_NWAIT,DCMI_D10,,EVENTOUT,
+PortD,PD7,,,,,,,,USART2_CK,SPDIF_RX0,,,,FMC_NE1,,,EVENTOUT,
+PortD,PD8,,,,,,,,USART3_TX,SPDIF_RX1,,,,FMC_D13,,,EVENTOUT,
+PortD,PD9,,,,,,,,USART3_RX,,,,,FMC_D14,,,EVENTOUT,
+PortD,PD10,,,,,,,,USART3_CK,,,,,FMC_D15,,,EVENTOUT,
+PortD,PD11,,,,,FMPI2C1_SMBA,,,USART3_CTS,,QUADSPI_BK1_IO0,SAI2_SD_A,,FMC_A16,,,EVENTOUT,
+PortD,PD12,,,TIM4_CH1,,FMPI2C1_SCL,,,USART3_RTS,,QUADSPI_BK1_IO1,SAI2_FS_A,,FMC_A17,,,EVENTOUT,
+PortD,PD13,,,TIM4_CH2,,FMPI2C1_SDA,,,,,QUADSPI_BK1_IO3,SAI2_SCK_A,,FMC_A18,,,EVENTOUT,
+PortD,PD14,,,TIM4_CH3,,FMPI2C1_SCL,,,,SAI2_SCK_A,,,,FMC_D0,,,EVENTOUT,
+PortD,PD15,,,TIM4_CH4,,FMPI2C1_SDA,,,,,,,,FMC_D1,,,EVENTOUT,
+PortE,PE0,,,TIM4_ETR,,,,,,,,SAI2_MCLK_A,,FMC_NBL0,DCMI_D2,,EVENTOUT,
+PortE,PE1,,,,,,,,,,,,,FMC_NBL1,DCMI_D3,,EVENTOUT,
+PortE,PE2,TRACECLK,,,,,SPI4_SCK,SAI1_MCLK_A,,,QUADSPI_BK1_IO2,,,FMC_A23,,,EVENTOUT,
+PortE,PE3,TRACED0,,,,,,SAI1_SD_B,,,,,,FMC_A19,,,EVENTOUT,
+PortE,PE4,TRACED1,,,,,SPI4_NSS,SAI1_FS_A,,,,,,FMC_A20,DCMI_D4,,EVENTOUT,
+PortE,PE5,TRACED2,,,TIM9_CH1,,SPI4_MISO,SAI1_SCK_A,,,,,,FMC_A21,DCMI_D6,,EVENTOUT,
+PortE,PE6,TRACED3,,,TIM9_CH2,,SPI4_MOSI,SAI1_SD_A,,,,,,FMC_A22,DCMI_D7,,EVENTOUT,
+PortE,PE7,,TIM1_ETR,,,,,,,UART5_RX,,QUADSPI_BK2_IO0,,FMC_D4,,,EVENTOUT,
+PortE,PE8,,TIM1_CH1N,,,,,,,UART5_TX,,QUADSPI_BK2_IO1,,FMC_D5,,,EVENTOUT,
+PortE,PE9,,TIM1_CH1,,,,,,,,,QUADSPI_BK2_IO2,,FMC_D6,,,EVENTOUT,
+PortE,PE10,,TIM1_CH2N,,,,,,,,,QUADSPI_BK2_IO3,,FMC_D7,,,EVENTOUT,
+PortE,PE11,,TIM1_CH2,,,,SPI4_NSS,,,,,SAI2_SD_B,,FMC_D8,,,EVENTOUT,
+PortE,PE12,,TIM1_CH3N,,,,SPI4_SCK,,,,,SAI2_SCK_B,,FMC_D9,,,EVENTOUT,
+PortE,PE13,,TIM1_CH3,,,,SPI4_MISO,,,,,SAI2_FS_B,,FMC_D10,,,EVENTOUT,
+PortE,PE14,,TIM1_CH4,,,,SPI4_MOSI,,,,,SAI2_MCLK_B,,FMC_D11,,,EVENTOUT,
+PortE,PE15,,TIM1_BKIN,,,,,,,,,,,FMC_D12,,,EVENTOUT,
+PortF,PF0,,,,,I2C2_SDA,,,,,,,,FMC_A0,,,EVENTOUT,
+PortF,PF1,,,,,I2C2_SCL,,,,,,,,FMC_A1,,,EVENTOUT,
+PortF,PF2,,,,,I2C2_SMBA,,,,,,,,FMC_A2,,,EVENTOUT,
+PortF,PF3,,,,,,,,,,,,,FMC_A3,,,EVENTOUT,ADC3_IN9
+PortF,PF4,,,,,,,,,,,,,FMC_A4,,,EVENTOUT,ADC3_IN14
+PortF,PF5,,,,,,,,,,,,,FMC_A5,,,EVENTOUT,ADC3_IN15
+PortF,PF6,,,,TIM10_CH1,,,SAI1_SD_B,,,QUADSPI_BK1_IO3,,,,,,EVENTOUT,ADC3_IN4
+PortF,PF7,,,,TIM11_CH1,,,SAI1_MCLK_B,,,QUADSPI_BK1_IO2,,,,,,EVENTOUT,ADC3_IN5
+PortF,PF8,,,,,,,SAI1_SCK_B,,,TIM13_CH1,QUADSPI_BK1_IO0,,,,,EVENTOUT,ADC3_IN6
+PortF,PF9,,,,,,,SAI1_FS_B,,,TIM14_CH1,QUADSPI_BK1_IO1,,,,,EVENTOUT,ADC3_IN7
+PortF,PF10,,,,,,,,,,,,,,DCMI_D11,,EVENTOUT,ADC3_IN8
+PortF,PF11,,,,,,,,,,,SAI2_SD_B,,FMC_SDNRAS,DCMI_D12,,EVENTOUT,
+PortF,PF12,,,,,,,,,,,,,FMC_A6,,,EVENTOUT,
+PortF,PF13,,,,,FMPI2C1_SMBA,,,,,,,,FMC_A7,,,EVENTOUT,
+PortF,PF14,,,,,FMPI2C1_SCL,,,,,,,,FMC_A8,,,EVENTOUT,
+PortF,PF15,,,,,FMPI2C1_SDA,,,,,,,,FMC_A9,,,EVENTOUT,
+PortG,PG0,,,,,,,,,,,,,FMC_A10,,,EVENTOUT,
+PortG,PG1,,,,,,,,,,,,,FMC_A11,,,EVENTOUT,
+PortG,PG2,,,,,,,,,,,,,FMC_A12,,,EVENTOUT,
+PortG,PG3,,,,,,,,,,,,,FMC_A13,,,EVENTOUT,
+PortG,PG4,,,,,,,,,,,,,FMC_A14/FMC_BA0,,,EVENTOUT,
+PortG,PG5,,,,,,,,,,,,,FMC_A15/FMC_BA1,,,EVENTOUT,
+PortG,PG6,,,,,,,,,,,QUADSPI_BK1_NCS,,,DCMI_D12,,EVENTOUT,
+PortG,PG7,,,,,,,,,USART6_CK,,,,FMC_INT,DCMI_D13,,EVENTOUT,
+PortG,PG8,,,,,,,,SPDIFRX_IN2,USART6_RTS,,,,FMC_SDCLK,,,EVENTOUT,
+PortG,PG9,,,,,,,,SPDIFRX_IN3,USART6_RX,QUADSPI_BK2_IO2,SAI2_FS_B,,FMC_NE2/FMC_NCE3,DCMI_VSYNC,,EVENTOUT,
+PortG,PG10,,,,,,,,,,,SAI2_SD_B,,FMC_NE3,DCMI_D2,,EVENTOUT,
+PortG,PG11,,,,,,,SPI4_SCK,SPDIFRX_IN0,,,,,,DCMI_D3,,EVENTOUT,
+PortG,PG12,,,,,,,SPI4_MISO,SPDIFRX_IN1,USART6_RTS,,,,FMC_NE4,,,EVENTOUT,
+PortG,PG13,TRACED2,,,,,,SPI4_MOSI,,USART6_CTS,,,,FMC_A24,,,EVENTOUT,
+PortG,PG14,TRACED3,,,,,,SPI4_NSS,,USART6_TX,QUADSPI_BK2_IO3,,,FMC_A25,,,EVENTOUT,
+PortG,PG15,,,,,,,,,USART6_CTS,,,,FMC_SDNCAS,DCMI_D13,,EVENTOUT,
+PortH,PH0,,,,,,,,,,,,,,,,EVENTOUT,
+PortH,PH1,,,,,,,,,,,,,,,,EVENTOUT,

From e90b85cc98a24003f2d673bab2c255ab3dce66e7 Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Mon, 5 Sep 2022 07:58:04 -0500
Subject: [PATCH 2575/3533] extmod/modure: Convert byte offsets to unicode
 indices when necessary.

And add a test.

Fixes issue #9202.

Signed-off-by: Jeff Epler <jepler@gmail.com>
---
 extmod/modure.c              | 16 ++++++++++++++++
 tests/unicode/unicode_ure.py | 32 ++++++++++++++++++++++++++++++++
 2 files changed, 48 insertions(+)
 create mode 100644 tests/unicode/unicode_ure.py

diff --git a/extmod/modure.c b/extmod/modure.c
index 799fef13b1bdb..a674d664999a8 100644
--- a/extmod/modure.c
+++ b/extmod/modure.c
@@ -33,6 +33,10 @@
 #include "py/objstr.h"
 #include "py/stackctrl.h"
 
+#if MICROPY_PY_BUILTINS_STR_UNICODE
+#include "py/unicode.h"
+#endif
+
 #if MICROPY_PY_URE
 
 #define re1_5_stack_chk() MP_STACK_CHECK()
@@ -121,6 +125,18 @@ STATIC void match_span_helper(size_t n_args, const mp_obj_t *args, mp_obj_t span
         e = self->caps[no * 2 + 1] - begin;
     }
 
+    #if MICROPY_PY_BUILTINS_STR_UNICODE
+    if (mp_obj_get_type(self->str) == &mp_type_str) {
+        const byte *begin = (const byte *)mp_obj_str_get_str(self->str);
+        if (s != -1) {
+            s = utf8_ptr_to_index(begin, begin + s);
+        }
+        if (e != -1) {
+            e = utf8_ptr_to_index(begin, begin + e);
+        }
+    }
+    #endif
+
     span[0] = mp_obj_new_int(s);
     span[1] = mp_obj_new_int(e);
 }
diff --git a/tests/unicode/unicode_ure.py b/tests/unicode/unicode_ure.py
new file mode 100644
index 0000000000000..5a5dc600545f1
--- /dev/null
+++ b/tests/unicode/unicode_ure.py
@@ -0,0 +1,32 @@
+# test match.span() for unicode strings
+
+try:
+    import ure as re
+except ImportError:
+    try:
+        import re
+    except ImportError:
+        print("SKIP")
+        raise SystemExit
+
+try:
+    m = re.match(".", "a")
+    m.span
+except AttributeError:
+    print("SKIP")
+    raise SystemExit
+
+
+def print_spans(match):
+    print("----")
+    try:
+        i = 0
+        while True:
+            print(match.span(i), match.start(i), match.end(i))
+            i += 1
+    except IndexError:
+        pass
+
+
+m = re.match(r"([0-9]*)(([a-z]*)([0-9]*))", "1234\u2764567")
+print_spans(m)

From aeff6911d750a2d203eeb1cacd74701de5313ee6 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Thu, 8 Sep 2022 11:24:18 +1000
Subject: [PATCH 2576/3533] lib/micropython-lib: Update submodule to latest.

This brings in the drivers and libraries that were previously in this
repo.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 lib/micropython-lib | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/micropython-lib b/lib/micropython-lib
index f3cfc52ab076f..58f8bec54d5b3 160000
--- a/lib/micropython-lib
+++ b/lib/micropython-lib
@@ -1 +1 @@
-Subproject commit f3cfc52ab076fc913dc6e266fb7370b418c8f542
+Subproject commit 58f8bec54d5b3b959247b73a6e8f28e8493bd30b

From d84c6ef0e8dd363881d80b2d8fb03447cc349830 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Tue, 6 Sep 2022 13:49:41 +1000
Subject: [PATCH 2577/3533] ports: Use micropython-lib version of drivers in
 manifests.

---
 .../esp32/boards/LILYGO_TTGO_LORA32/manifest.py |  3 +--
 ports/esp32/boards/LOLIN_S2_PICO/manifest.py    |  3 +--
 ports/esp32/boards/manifest.py                  | 17 +++++++++--------
 ports/esp8266/boards/GENERIC/manifest.py        |  2 +-
 ports/esp8266/boards/GENERIC_512K/manifest.py   | 11 ++++++-----
 ports/esp8266/boards/manifest.py                | 11 ++++++-----
 ports/mimxrt/boards/manifest.py                 |  5 +++--
 .../arduino_nano_33_ble_sense/manifest.py       |  6 +++---
 .../renesas-ra/boards/RA4M1_CLICKER/manifest.py |  2 +-
 ports/renesas-ra/boards/RA4M1_EK/manifest.py    |  2 +-
 ports/renesas-ra/boards/manifest.py             |  6 +++---
 .../ARDUINO_NANO_RP2040_CONNECT/manifest.py     |  4 ++--
 ports/rp2/boards/PICO_W/manifest.py             |  2 +-
 ports/rp2/boards/manifest.py                    |  7 ++++---
 .../boards/ARDUINO_PORTENTA_H7/manifest.py      |  2 +-
 .../GARATRONIC_PYBSTICK26_F411/manifest.py      |  3 +--
 ports/stm32/boards/PYBD_SF2/manifest.py         |  2 +-
 ports/stm32/boards/manifest.py                  |  4 ++--
 ports/stm32/boards/manifest_pyboard.py          |  2 +-
 19 files changed, 48 insertions(+), 46 deletions(-)

diff --git a/ports/esp32/boards/LILYGO_TTGO_LORA32/manifest.py b/ports/esp32/boards/LILYGO_TTGO_LORA32/manifest.py
index 6c491c8f66de8..e2cd6b3d01519 100644
--- a/ports/esp32/boards/LILYGO_TTGO_LORA32/manifest.py
+++ b/ports/esp32/boards/LILYGO_TTGO_LORA32/manifest.py
@@ -1,4 +1,3 @@
 include("$(PORT_DIR)/boards/manifest.py")
 freeze("modules")
-
-include("$(MPY_DIR)/drivers/display", ssd1306=True)
+require("ssd1306")
diff --git a/ports/esp32/boards/LOLIN_S2_PICO/manifest.py b/ports/esp32/boards/LOLIN_S2_PICO/manifest.py
index efc37137b2cfd..9ac8ade8275bf 100644
--- a/ports/esp32/boards/LOLIN_S2_PICO/manifest.py
+++ b/ports/esp32/boards/LOLIN_S2_PICO/manifest.py
@@ -1,4 +1,3 @@
 include("$(PORT_DIR)/boards/manifest.py")
 freeze("./modules")
-
-include("$(MPY_DIR)/drivers/display", ssd1306=True)
+require("ssd1306")
diff --git a/ports/esp32/boards/manifest.py b/ports/esp32/boards/manifest.py
index 658d11d5855d7..fcc48d721805a 100644
--- a/ports/esp32/boards/manifest.py
+++ b/ports/esp32/boards/manifest.py
@@ -1,15 +1,16 @@
 freeze("$(PORT_DIR)/modules")
 module("upip.py", base_path="$(MPY_DIR)/tools", opt=3)
 module("upip_utarfile.py", base_path="$(MPY_DIR)/tools", opt=3)
-module("ntptime.py", base_path="$(MPY_DIR)/extmod", opt=3)
-include("$(MPY_DIR)/drivers/dht")
-include("$(MPY_DIR)/drivers/onewire")
-include("$(MPY_DIR)/drivers/neopixel")
 include("$(MPY_DIR)/extmod/uasyncio")
-include("$(MPY_DIR)/extmod/webrepl")
 
 # Require some micropython-lib modules.
-require("urequests")
-require("upysh")
-require("umqtt.simple")
+require("dht")
+require("ds18x20")
+require("neopixel")
+require("ntptime")
+require("onewire")
 require("umqtt.robust")
+require("umqtt.simple")
+require("upysh")
+require("urequests")
+require("webrepl")
diff --git a/ports/esp8266/boards/GENERIC/manifest.py b/ports/esp8266/boards/GENERIC/manifest.py
index 54b916546c343..ef708846241fa 100644
--- a/ports/esp8266/boards/GENERIC/manifest.py
+++ b/ports/esp8266/boards/GENERIC/manifest.py
@@ -5,7 +5,7 @@
 include("$(MPY_DIR)/extmod/uasyncio")
 
 # drivers
-include("$(MPY_DIR)/drivers/display", ssd1306=True)
+require("ssd1306")
 
 # micropython-lib: file utilities
 require("upysh")
diff --git a/ports/esp8266/boards/GENERIC_512K/manifest.py b/ports/esp8266/boards/GENERIC_512K/manifest.py
index 57970a6b4dc11..15f6cffc3f94a 100644
--- a/ports/esp8266/boards/GENERIC_512K/manifest.py
+++ b/ports/esp8266/boards/GENERIC_512K/manifest.py
@@ -1,8 +1,9 @@
 module("_boot.py", opt=3)
 module("apa102.py", base_path="$(PORT_DIR)/modules", opt=3)
 module("port_diag.py", base_path="$(PORT_DIR)/modules", opt=3)
-module("ntptime.py", base_path="$(MPY_DIR)/extmod", opt=3)
-include("$(MPY_DIR)/drivers/dht")
-include("$(MPY_DIR)/drivers/onewire")
-include("$(MPY_DIR)/extmod/webrepl")
-include("$(MPY_DIR)/drivers/neopixel")
+require("ntptime")
+require("dht")
+require("onewire")
+require("ds18x20")
+require("webrepl")
+require("neopixel")
diff --git a/ports/esp8266/boards/manifest.py b/ports/esp8266/boards/manifest.py
index abcee253ffe55..e7defd0bb70ff 100644
--- a/ports/esp8266/boards/manifest.py
+++ b/ports/esp8266/boards/manifest.py
@@ -1,8 +1,9 @@
 freeze("$(PORT_DIR)/modules")
 module("upip.py", base_path="$(MPY_DIR)/tools", opt=3)
 module("upip_utarfile.py", base_path="$(MPY_DIR)/tools", opt=3)
-module("ntptime.py", base_path="$(MPY_DIR)/extmod", opt=3)
-include("$(MPY_DIR)/drivers/dht")
-include("$(MPY_DIR)/drivers/onewire")
-include("$(MPY_DIR)/extmod/webrepl")
-include("$(MPY_DIR)/drivers/neopixel")
+require("ntptime")
+require("dht")
+require("onewire")
+require("ds18x20")
+require("neopixel")
+require("webrepl")
diff --git a/ports/mimxrt/boards/manifest.py b/ports/mimxrt/boards/manifest.py
index a273dfa37041a..e4e5a236a3578 100644
--- a/ports/mimxrt/boards/manifest.py
+++ b/ports/mimxrt/boards/manifest.py
@@ -1,4 +1,5 @@
 freeze("$(PORT_DIR)/modules")
-include("$(MPY_DIR)/drivers/onewire")
-include("$(MPY_DIR)/drivers/dht")
 include("$(MPY_DIR)/extmod/uasyncio")
+require("onewire")
+require("ds18x20")
+require("dht")
diff --git a/ports/nrf/boards/arduino_nano_33_ble_sense/manifest.py b/ports/nrf/boards/arduino_nano_33_ble_sense/manifest.py
index 2b0cc6c818fbe..8396e0249cbc1 100644
--- a/ports/nrf/boards/arduino_nano_33_ble_sense/manifest.py
+++ b/ports/nrf/boards/arduino_nano_33_ble_sense/manifest.py
@@ -1,4 +1,4 @@
 include("$(PORT_DIR)/modules/manifest.py")
-include("$(MPY_DIR)/drivers/hts221")
-include("$(MPY_DIR)/drivers/lps22h")
-include("$(MPY_DIR)/drivers/lsm9ds1")
+require("hts221")
+require("lps22h")
+require("lsm9ds1")
diff --git a/ports/renesas-ra/boards/RA4M1_CLICKER/manifest.py b/ports/renesas-ra/boards/RA4M1_CLICKER/manifest.py
index c25ae79887e28..99b9c94051edb 100644
--- a/ports/renesas-ra/boards/RA4M1_CLICKER/manifest.py
+++ b/ports/renesas-ra/boards/RA4M1_CLICKER/manifest.py
@@ -1,2 +1,2 @@
 # We do not want to include default frozen modules,
-include("$(MPY_DIR)/drivers/sdcard")
+require("sdcard")
diff --git a/ports/renesas-ra/boards/RA4M1_EK/manifest.py b/ports/renesas-ra/boards/RA4M1_EK/manifest.py
index c25ae79887e28..99b9c94051edb 100644
--- a/ports/renesas-ra/boards/RA4M1_EK/manifest.py
+++ b/ports/renesas-ra/boards/RA4M1_EK/manifest.py
@@ -1,2 +1,2 @@
 # We do not want to include default frozen modules,
-include("$(MPY_DIR)/drivers/sdcard")
+require("sdcard")
diff --git a/ports/renesas-ra/boards/manifest.py b/ports/renesas-ra/boards/manifest.py
index c66ec92015dea..01699c3d6e6ad 100644
--- a/ports/renesas-ra/boards/manifest.py
+++ b/ports/renesas-ra/boards/manifest.py
@@ -1,4 +1,4 @@
 include("$(MPY_DIR)/extmod/uasyncio")
-include("$(MPY_DIR)/drivers/dht")
-include("$(MPY_DIR)/drivers/onewire", ds18x20=False)
-include("$(MPY_DIR)/drivers/sdcard")
+require("dht")
+require("onewire")
+require("sdcard")
diff --git a/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/manifest.py b/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/manifest.py
index e139c7d60bed7..dbd45fa408e63 100644
--- a/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/manifest.py
+++ b/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/manifest.py
@@ -1,11 +1,11 @@
 include("$(PORT_DIR)/boards/manifest.py")
 
 # Networking
-include("$(MPY_DIR)/extmod/webrepl")
+require("webrepl")
 require("urequests")
 
 # Drivers
-include("$(MPY_DIR)/drivers/lsm6dsox")
+require("lsm6dsox")
 
 # Bluetooth
 require("aioble", client=True, central=True, l2cap=True, security=True)
diff --git a/ports/rp2/boards/PICO_W/manifest.py b/ports/rp2/boards/PICO_W/manifest.py
index 66ff26b0c8569..4d9eb87f20f3c 100644
--- a/ports/rp2/boards/PICO_W/manifest.py
+++ b/ports/rp2/boards/PICO_W/manifest.py
@@ -2,6 +2,6 @@
 
 module("upip.py", base_path="$(MPY_DIR)/tools", opt=3)
 module("upip_utarfile.py", base_path="$(MPY_DIR)/tools", opt=3)
-module("ntptime.py", base_path="$(MPY_DIR)/extmod", opt=3)
 
+require("ntptime")
 require("urequests")
diff --git a/ports/rp2/boards/manifest.py b/ports/rp2/boards/manifest.py
index 9afcba17e85d2..e62d02f30857c 100644
--- a/ports/rp2/boards/manifest.py
+++ b/ports/rp2/boards/manifest.py
@@ -1,5 +1,6 @@
 freeze("$(PORT_DIR)/modules")
-include("$(MPY_DIR)/drivers/onewire")
-include("$(MPY_DIR)/drivers/dht")
 include("$(MPY_DIR)/extmod/uasyncio")
-include("$(MPY_DIR)/drivers/neopixel")
+require("onewire")
+require("ds18x20")
+require("dht")
+require("neopixel")
diff --git a/ports/stm32/boards/ARDUINO_PORTENTA_H7/manifest.py b/ports/stm32/boards/ARDUINO_PORTENTA_H7/manifest.py
index 0ecdcd21534fe..4fa92b7205327 100644
--- a/ports/stm32/boards/ARDUINO_PORTENTA_H7/manifest.py
+++ b/ports/stm32/boards/ARDUINO_PORTENTA_H7/manifest.py
@@ -1,3 +1,3 @@
 include("$(PORT_DIR)/boards/manifest.py")
-include("$(MPY_DIR)/extmod/webrepl")
+require("webrepl")
 require("aioble", client=True, central=True, l2cap=True, security=True)
diff --git a/ports/stm32/boards/GARATRONIC_PYBSTICK26_F411/manifest.py b/ports/stm32/boards/GARATRONIC_PYBSTICK26_F411/manifest.py
index 69da2897ae06f..2600fc506241e 100644
--- a/ports/stm32/boards/GARATRONIC_PYBSTICK26_F411/manifest.py
+++ b/ports/stm32/boards/GARATRONIC_PYBSTICK26_F411/manifest.py
@@ -1,2 +1 @@
-# Note: Freezes to display.ssd1306, so must use deprecated "freeze" function.
-freeze("$(MPY_DIR)/drivers/", ("display/ssd1306.py"))
+require("ssd1306")
diff --git a/ports/stm32/boards/PYBD_SF2/manifest.py b/ports/stm32/boards/PYBD_SF2/manifest.py
index a9e92848d58d5..0ee11baf4b8e3 100644
--- a/ports/stm32/boards/PYBD_SF2/manifest.py
+++ b/ports/stm32/boards/PYBD_SF2/manifest.py
@@ -1,3 +1,3 @@
 include("$(PORT_DIR)/boards/manifest.py")
 include("$(PORT_DIR)/boards/manifest_pyboard.py")
-include("$(MPY_DIR)/extmod/webrepl")
+require("webrepl")
diff --git a/ports/stm32/boards/manifest.py b/ports/stm32/boards/manifest.py
index 723caa3eb6d1a..e6b77f8ab335d 100644
--- a/ports/stm32/boards/manifest.py
+++ b/ports/stm32/boards/manifest.py
@@ -1,4 +1,4 @@
 include("$(MPY_DIR)/extmod/uasyncio")
 
-include("$(MPY_DIR)/drivers/dht")
-include("$(MPY_DIR)/drivers/onewire", ds18x20=False)
+require("dht")
+require("onewire")
diff --git a/ports/stm32/boards/manifest_pyboard.py b/ports/stm32/boards/manifest_pyboard.py
index e4fb0a8c4dd1a..789365a433070 100644
--- a/ports/stm32/boards/manifest_pyboard.py
+++ b/ports/stm32/boards/manifest_pyboard.py
@@ -1 +1 @@
-include("$(MPY_DIR)/drivers/display", lcd160cr=True)
+require("lcd160cr")

From 24678fe452e9c0d0b96575424f81fb4a5f5f4302 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Tue, 6 Sep 2022 13:49:10 +1000
Subject: [PATCH 2578/3533] drivers: Remove drivers that are now in
 micropython-lib.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 drivers/README.md                  |   2 +-
 drivers/codec/manifest.py          |   1 -
 drivers/codec/wm8960.py            | 753 -----------------------------
 drivers/dht/dht.py                 |  46 --
 drivers/dht/manifest.py            |   1 -
 drivers/display/lcd160cr.py        | 482 ------------------
 drivers/display/lcd160cr_test.py   | 187 -------
 drivers/display/manifest.py        |  11 -
 drivers/display/ssd1306.py         | 163 -------
 drivers/hts221/hts221.py           |  91 ----
 drivers/hts221/manifest.py         |   1 -
 drivers/lps22h/lps22h.py           | 109 -----
 drivers/lps22h/manifest.py         |   1 -
 drivers/lsm6dsox/lsm6dsox.py       | 271 -----------
 drivers/lsm6dsox/lsm6dsox_basic.py |  15 -
 drivers/lsm6dsox/lsm6dsox_mlc.py   |  48 --
 drivers/lsm6dsox/manifest.py       |   1 -
 drivers/lsm9ds1/lsm9ds1.py         | 189 --------
 drivers/lsm9ds1/manifest.py        |   1 -
 drivers/neopixel/manifest.py       |   1 -
 drivers/neopixel/neopixel.py       |  50 --
 drivers/nrf24l01/manifest.py       |   1 -
 drivers/nrf24l01/nrf24l01.py       | 252 ----------
 drivers/nrf24l01/nrf24l01test.py   | 150 ------
 drivers/onewire/ds18x20.py         |  52 --
 drivers/onewire/manifest.py        |   6 -
 drivers/onewire/onewire.py         |  92 ----
 drivers/sdcard/manifest.py         |   1 -
 drivers/sdcard/sdcard.py           | 299 ------------
 drivers/sdcard/sdtest.py           |  61 ---
 extmod/ntptime.py                  |  48 --
 extmod/webrepl/manifest.py         |   2 -
 extmod/webrepl/webrepl.py          | 177 -------
 extmod/webrepl/webrepl_setup.py    | 107 ----
 34 files changed, 1 insertion(+), 3671 deletions(-)
 delete mode 100644 drivers/codec/manifest.py
 delete mode 100644 drivers/codec/wm8960.py
 delete mode 100644 drivers/dht/dht.py
 delete mode 100644 drivers/dht/manifest.py
 delete mode 100644 drivers/display/lcd160cr.py
 delete mode 100644 drivers/display/lcd160cr_test.py
 delete mode 100644 drivers/display/manifest.py
 delete mode 100644 drivers/display/ssd1306.py
 delete mode 100644 drivers/hts221/hts221.py
 delete mode 100644 drivers/hts221/manifest.py
 delete mode 100644 drivers/lps22h/lps22h.py
 delete mode 100644 drivers/lps22h/manifest.py
 delete mode 100644 drivers/lsm6dsox/lsm6dsox.py
 delete mode 100644 drivers/lsm6dsox/lsm6dsox_basic.py
 delete mode 100644 drivers/lsm6dsox/lsm6dsox_mlc.py
 delete mode 100644 drivers/lsm6dsox/manifest.py
 delete mode 100644 drivers/lsm9ds1/lsm9ds1.py
 delete mode 100644 drivers/lsm9ds1/manifest.py
 delete mode 100644 drivers/neopixel/manifest.py
 delete mode 100644 drivers/neopixel/neopixel.py
 delete mode 100644 drivers/nrf24l01/manifest.py
 delete mode 100644 drivers/nrf24l01/nrf24l01.py
 delete mode 100644 drivers/nrf24l01/nrf24l01test.py
 delete mode 100644 drivers/onewire/ds18x20.py
 delete mode 100644 drivers/onewire/manifest.py
 delete mode 100644 drivers/onewire/onewire.py
 delete mode 100644 drivers/sdcard/manifest.py
 delete mode 100644 drivers/sdcard/sdcard.py
 delete mode 100644 drivers/sdcard/sdtest.py
 delete mode 100644 extmod/ntptime.py
 delete mode 100644 extmod/webrepl/manifest.py
 delete mode 100644 extmod/webrepl/webrepl.py
 delete mode 100644 extmod/webrepl/webrepl_setup.py

diff --git a/drivers/README.md b/drivers/README.md
index 854acc50b62c0..e4fac9fe8d43b 100644
--- a/drivers/README.md
+++ b/drivers/README.md
@@ -1,2 +1,2 @@
-This directory contains drivers for specific hardware.  The drivers are
+This directory contains C drivers for specific hardware.  The drivers are
 intended to work across multiple ports.
diff --git a/drivers/codec/manifest.py b/drivers/codec/manifest.py
deleted file mode 100644
index 4ff5d9fc445e2..0000000000000
--- a/drivers/codec/manifest.py
+++ /dev/null
@@ -1 +0,0 @@
-module("wm8960.py", opt=3)
diff --git a/drivers/codec/wm8960.py b/drivers/codec/wm8960.py
deleted file mode 100644
index ad1cb1cbf872b..0000000000000
--- a/drivers/codec/wm8960.py
+++ /dev/null
@@ -1,753 +0,0 @@
-#
-# Driver class for the WM8960 Codec to be used e.g. with MIMXRT_1xxx Boards.
-# Derived from the NXP SDK drivers.
-#
-# Copyright (c) 2015, Freescale Semiconductor, Inc., (C-Code)
-# Copyright 2016-2021 NXP, (C-Code)
-# All rights reserved.
-#
-# Translated to MicroPython by Robert Hammelrath, 2022
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
-import array
-from micropython import const
-
-# Define the register addresses of WM8960.
-_LINVOL = const(0x0)
-_RINVOL = const(0x1)
-_LOUT1 = const(0x2)
-_ROUT1 = const(0x3)
-_CLOCK1 = const(0x4)
-_DACCTL1 = const(0x5)
-_DACCTL2 = const(0x6)
-_IFACE1 = const(0x7)
-_CLOCK2 = const(0x8)
-_IFACE2 = const(0x9)
-_LDAC = const(0xA)
-_RDAC = const(0xB)
-_RESET = const(0xF)
-_3D = const(0x10)
-_ALC1 = const(0x11)
-_ALC2 = const(0x12)
-_ALC3 = const(0x13)
-_NOISEG = const(0x14)
-_LADC = const(0x15)
-_RADC = const(0x16)
-_ADDCTL1 = const(0x17)
-# Register _ADDCTL2 = const(0x18)
-_POWER1 = const(0x19)
-_POWER2 = const(0x1A)
-_ADDCTL3 = const(0x1B)
-# Register _APOP1 = const(0x1C)
-# Register _APOP2 = const(0x1D)
-_LINPATH = const(0x20)
-_RINPATH = const(0x21)
-_LOUTMIX = const(0x22)
-_ROUTMIX = const(0x25)
-_MONOMIX1 = const(0x26)
-_MONOMIX2 = const(0x27)
-_LOUT2 = const(0x28)
-_ROUT2 = const(0x29)
-_MONO = const(0x2A)
-_INBMIX1 = const(0x2B)
-_INBMIX2 = const(0x2C)
-_BYPASS1 = const(0x2D)
-_BYPASS2 = const(0x2E)
-_POWER3 = const(0x2F)
-_ADDCTL4 = const(0x30)
-_CLASSD1 = const(0x31)
-# Register _CLASSD3 = const(0x33)
-_PLL1 = const(0x34)
-_PLL2 = const(0x35)
-_PLL3 = const(0x36)
-_PLL4 = const(0x37)
-
-# WM8960 PLLN range */
-_PLL_N_MIN_VALUE = const(6)
-_PLL_N_MAX_VALUE = const(12)
-
-# WM8960 CLOCK2 bits
-_CLOCK2_BCLK_DIV_MASK = const(0x0F)
-_CLOCK2_DCLK_DIV_MASK = const(0x1C0)
-_CLOCK2_DCLK_DIV_SHIFT = const(0x06)
-
-# Register _IFACE1
-_IFACE1_FORMAT_MASK = const(0x03)
-_IFACE1_WL_MASK = const(0x0C)
-_IFACE1_WL_SHIFT = const(0x02)
-_IFACE1_LRP_MASK = const(0x10)
-_IFACE1_MS_MASK = const(0x40)
-_IFACE1_DLRSWAP_MASK = const(0x20)
-_IFACE1_ALRSWAP_MASK = const(0x100)
-
-# Register _POWER1
-_POWER1_VREF_MASK = const(0x40)
-_POWER1_VREF_SHIFT = const(0x06)
-_POWER1_AINL_MASK = const(0x20)
-_POWER1_AINR_MASK = const(0x10)
-_POWER1_ADCL_MASK = const(0x08)
-_POWER1_ADCR_MASK = const(0x0)
-_POWER1_MICB_MASK = const(0x02)
-_POWER1_MICB_SHIFT = const(0x01)
-
-# Register _POWER2
-_POWER2_DACL_MASK = const(0x100)
-_POWER2_DACR_MASK = const(0x80)
-_POWER2_LOUT1_MASK = const(0x40)
-_POWER2_ROUT1_MASK = const(0x20)
-_POWER2_SPKL_MASK = const(0x10)
-_POWER2_SPKR_MASK = const(0x08)
-_POWER3_LMIC_MASK = const(0x20)
-_POWER3_RMIC_MASK = const(0x10)
-_POWER3_LOMIX_MASK = const(0x08)
-_POWER3_ROMIX_MASK = const(0x04)
-
-# Register _DACCTL1 .. 3
-_DACCTL1_MONOMIX_MASK = const(0x10)
-_DACCTL1_MONOMIX_SHIFT = const(0x4)
-_DACCTL1_DACMU_MASK = const(0x08)
-_DACCTL1_DEEM_MASK = const(0x06)
-_DACCTL1_DEEM_SHIFT = const(0x01)
-_DACCTL2_DACSMM_MASK = const(0x08)
-_DACCTL2_DACMR_MASK = const(0x04)
-_DACCTL3_ALCSR_MASK = const(0x07)
-
-# _WM8060_ALC1 .. 3
-_ALC_CHANNEL_MASK = const(0x180)
-_ALC_CHANNEL_SHIFT = const(0x7)
-_ALC_MODE_MASK = const(0x100)
-_ALC_MODE_SHIFT = const(0x8)
-_ALC_GAIN_MASK = const(0x70)
-_ALC_GAIN_SHIFT = const(0x4)
-_ALC_TARGET_MASK = const(0x0F)
-_ALC_ATTACK_MASK = const(0x0F)
-_ALC_DECAY_MASK = const(0xF0)
-_ALC_DECAY_SHIFT = const(4)
-_ALC_HOLD_MASK = const(0xF)
-
-# Register _NOISEG
-_NOISEG_LEVEL_SHIFT = const(3)
-
-_I2C_ADDR = const(0x1A)
-
-# WM8960 maximum volume values
-_MAX_VOLUME_ADC = const(0xFF)
-_MAX_VOLUME_DAC = const(0xFF)
-_MAX_VOLUME_HEADPHONE = const(0x7F)
-_MAX_VOLUME_LINEIN = const(0x3F)
-_MAX_VOLUME_SPEAKER = const(0x7F)
-
-# Config symbol names
-# Modules
-MODULE_ADC = const(0)  # ADC module in WM8960
-MODULE_DAC = const(1)  # DAC module in WM8960
-MODULE_VREF = const(2)  # VREF module
-MODULE_HEADPHONE = const(3)  # Headphone
-MODULE_MIC_BIAS = const(4)  # Mic bias
-MODULE_MIC = const(5)  # Input Mic
-MODULE_LINE_IN = const(6)  # Analog in PGA
-MODULE_LINE_OUT = const(7)  # Line out module
-MODULE_SPEAKER = const(8)  # Speaker module
-MODULE_OMIX = const(9)  # Output mixer
-MODULE_MONO_OUT = const(10)  # Mono mix
-
-# Route
-ROUTE_BYPASS = const(0)  # LINEIN->Headphone.
-ROUTE_PLAYBACK = const(1)  #  I2SIN->DAC->Headphone.
-ROUTE_PLAYBACK_RECORD = const(2)  # I2SIN->DAC->Headphone, LINEIN->ADC->I2SOUT.
-ROUTE_RECORD = const(5)  # LINEIN->ADC->I2SOUT.
-
-# Input
-INPUT_CLOSED = const(0)  # Input device is closed
-INPUT_MIC1 = const(1)  # Input as single ended mic, only use L/RINPUT1
-INPUT_MIC2 = const(2)  # Input as diff. mic, use L/RINPUT1 and L/RINPUT2
-INPUT_MIC3 = const(3)  # Input as diff. mic, use L/RINPUT1 and L/RINPUT3
-INPUT_LINE2 = const(4)  # Input as line input, only use L/RINPUT2
-INPUT_LINE3 = const(5)  # Input as line input, only use L/RINPUT3
-
-# ADC sync input
-SYNC_ADC = const(0)  # Use ADCLRC pin for ADC sync
-SYNC_DAC = const(1)  # used DACLRC pin for ADC sync
-
-# Protocol type
-BUS_I2S = const(2)  # I2S type
-BUS_LEFT_JUSTIFIED = const(1)  # Left justified mode
-BUS_RIGHT_JUSTIFIED = const(0)  # Right justified mode
-BUS_PCMA = const(3)  # PCM A mode
-BUS_PCMB = const(3 | (1 << 4))  # PCM B mode
-
-# Channel swap
-SWAP_NONE = const(0)
-SWAP_INPUT = const(1)
-SWAP_OUTPUT = const(2)
-
-# Mute settings
-MUTE_FAST = const(0)
-MUTE_SLOW = const(1)
-
-# ALC settings
-ALC_OFF = const(0)
-ALC_RIGHT = const(1)
-ALC_LEFT = const(2)
-ALC_STEREO = const(3)
-ALC_MODE = const(0)  # ALC mode
-ALC_LIMITER = const(1)  # Limiter mode
-
-# Clock Source
-SYSCLK_MCLK = const(0)  # sysclk source from external MCLK
-SYSCLK_PLL = const(1)  # sysclk source from internal PLL
-
-
-class Regs:
-    # register cache of 56 register. Since registers cannot be read back, they are
-    # kept in the table for modification
-    # fmt: off
-    cache = array.array("H", (
-        0x0097, 0x0097, 0x0000, 0x0000, 0x0000, 0x0008, 0x0000,
-        0x000a, 0x01c0, 0x0000, 0x00ff, 0x00ff, 0x0000, 0x0000,
-        0x0000, 0x0000, 0x0000, 0x007b, 0x0100, 0x0032, 0x0000,
-        0x00c3, 0x00c3, 0x01c0, 0x0000, 0x0000, 0x0000, 0x0000,
-        0x0000, 0x0000, 0x0000, 0x0000, 0x0100, 0x0100, 0x0050,
-        0x0050, 0x0050, 0x0050, 0x0000, 0x0000, 0x0000, 0x0000,
-        0x0040, 0x0000, 0x0000, 0x0050, 0x0050, 0x0000, 0x0002,
-        0x0037, 0x004d, 0x0080, 0x0008, 0x0031, 0x0026, 0x00e9
-    ))
-    # fmt: on
-
-    def __init__(self, i2c, i2c_address=_I2C_ADDR):
-        self.value_buffer = bytearray(2)
-        self.i2c = i2c
-        self.i2c_address = i2c_address
-
-    def __getitem__(self, reg):
-        return self.cache[reg]
-
-    def __setitem__(self, reg, value):
-        if type(reg) is tuple:
-            if type(value) is tuple:
-                self[reg[0]] = value[0]
-                self[reg[1]] = value[1]
-            else:
-                self[reg[0]] = value
-                self[reg[1]] = value
-        else:
-            if type(value) is tuple:
-                val = (self.cache[reg] & (~value[0] & 0xFFFF)) | value[1]
-            else:
-                val = value
-            self.cache[reg] = val
-            self.value_buffer[0] = (reg << 1) | ((val >> 8) & 0x01)
-            self.value_buffer[1] = val & 0xFF
-            self.i2c.writeto(self.i2c_address, self.value_buffer)
-
-
-class WM8960:
-
-    _bit_clock_divider_table = {
-        2: 0,
-        3: 1,
-        4: 2,
-        6: 3,
-        8: 4,
-        11: 5,
-        12: 6,
-        16: 7,
-        22: 8,
-        24: 9,
-        32: 10,
-        44: 11,
-        48: 12,
-    }
-
-    _dac_divider_table = {
-        1.0 * 256: 0b000,
-        1.5 * 256: 0b001,
-        2 * 256: 0b010,
-        3 * 256: 0b011,
-        4 * 256: 0b100,
-        5.5 * 256: 0b101,
-        6 * 256: 0b110,
-    }
-
-    _audio_word_length_table = {
-        16: 0b00,
-        20: 0b01,
-        24: 0b10,
-        32: 0b11,
-    }
-
-    _alc_sample_rate_table = {
-        48000: 0,
-        44100: 0,
-        32000: 1,
-        24000: 2,
-        22050: 2,
-        16000: 3,
-        12000: 4,
-        11025: 4,
-        8000: 5,
-    }
-
-    _volume_config_table = {
-        MODULE_ADC: (_MAX_VOLUME_ADC, _LADC, 0x100),
-        MODULE_DAC: (_MAX_VOLUME_DAC, _LDAC, 0x100),
-        MODULE_HEADPHONE: (_MAX_VOLUME_HEADPHONE, _LOUT1, 0x180),
-        MODULE_LINE_IN: (_MAX_VOLUME_LINEIN, _LINVOL, 0x140),
-        MODULE_SPEAKER: (_MAX_VOLUME_SPEAKER, _LOUT2, 0x180),
-    }
-
-    _input_config_table = {
-        INPUT_CLOSED: None,
-        INPUT_MIC1: (0x138, 0x117),
-        INPUT_MIC2: (0x178, 0x117),
-        INPUT_MIC3: (0x1B8, 0x117),
-        INPUT_LINE2: (0, 0xE),
-        INPUT_LINE3: (0, 0x70),
-    }
-
-    def __init__(
-        self,
-        i2c,
-        sample_rate=16000,
-        bits=16,
-        swap=SWAP_NONE,
-        route=ROUTE_PLAYBACK_RECORD,
-        left_input=INPUT_MIC3,
-        right_input=INPUT_MIC2,
-        sysclk_source=SYSCLK_MCLK,
-        mclk_freq=None,
-        primary=False,
-        adc_sync=SYNC_DAC,
-        protocol=BUS_I2S,
-        i2c_address=_I2C_ADDR,
-    ):
-        self.regs = regs = Regs(i2c, i2c_address)
-        self.sample_rate = sample_rate
-
-        # check parameter consistency and set the sysclk value
-        if sysclk_source == SYSCLK_PLL:
-            if sample_rate in (11025, 22050, 44100):
-                sysclk = 11289600
-            else:
-                sysclk = 12288000
-            if sysclk < sample_rate * 256:
-                sysclk = sample_rate * 256
-            if mclk_freq is None:
-                mclk_freq = sysclk
-        else:  # sysclk_source == SYSCLK_MCLK
-            if mclk_freq is None:
-                mclk_freq = sample_rate * 256
-            sysclk = mclk_freq
-
-        regs[_RESET] = 0x00
-        # VMID=50K, Enable VREF, AINL, AINR, ADCL and ADCR
-        # I2S_IN (bit 0), I2S_OUT (bit 1), DAP (bit 4), DAC (bit 5), ADC (bit 6) are powered on
-        regs[_POWER1] = 0xFE
-        # Enable DACL, DACR, LOUT1, ROUT1, PLL down, SPKL, SPKR
-        regs[_POWER2] = 0x1F8
-        # Enable left and right channel input PGA, left and right output mixer
-        regs[_POWER3] = 0x3C
-
-        if adc_sync == SYNC_ADC:
-            # ADC and DAC use different Frame Clock Pins
-            regs[_IFACE2] = 0x00  # ADCLRC 0x00:Input 0x40:output.
-        else:
-            # ADC and DAC use the same Frame Clock Pin
-            regs[_IFACE2] = 0x40  # ADCLRC 0x00:Input 0x40:output.
-        self.set_data_route(route)
-        self.set_protocol(protocol)
-
-        if sysclk_source == SYSCLK_PLL:
-            self.set_internal_pll_config(mclk_freq, sysclk)
-        if primary:
-            self.set_master_clock(sysclk, sample_rate, bits)
-            # set master bit.
-            self.regs[_IFACE1] = (0, _IFACE1_MS_MASK)
-
-        self.set_speaker_clock(sysclk)
-
-        # swap channels
-        if swap & SWAP_INPUT:
-            regs[_IFACE1] = (0, _IFACE1_ALRSWAP_MASK)
-        if swap & SWAP_OUTPUT:
-            regs[_IFACE1] = (0, _IFACE1_DLRSWAP_MASK)
-
-        self.set_left_input(left_input)
-        self.set_right_input(right_input)
-
-        regs[_ADDCTL1] = 0x0C0
-        regs[_ADDCTL4] = 0x60  # Set GPIO1 to 0.
-
-        regs[_BYPASS1] = regs[_BYPASS2] = 0x0
-        # ADC volume, 0dB
-        regs[_LADC, _RADC] = 0x1C3
-        # Digital DAC volume, 0dB
-        regs[_LDAC, _RDAC] = 0x1FF
-        # Headphone volume, LOUT1 and ROUT1, 0dB
-        regs[_LOUT1, _ROUT1] = 0x16F
-        # speaker volume 6dB
-        regs[_LOUT2, _ROUT2] = 0x1FF
-        # enable class D output
-        regs[_CLASSD1] = 0xF7
-        # Unmute DAC.
-        regs[_DACCTL1] = 0x0000
-        # Input PGA volume 0 dB
-        regs[_LINVOL, _RINVOL] = 0x117
-
-        self.config_data_format(sysclk, sample_rate, bits)
-
-    def deinit(self):
-
-        self.set_module(MODULE_ADC, False)
-        self.set_module(MODULE_DAC, False)
-        self.set_module(MODULE_VREF, False)
-        self.set_module(MODULE_LINE_IN, False)
-        self.set_module(MODULE_LINE_OUT, False)
-        self.set_module(MODULE_SPEAKER, False)
-
-    def set_internal_pll_config(self, input_mclk, output_clk):
-        regs = self.regs
-        pllF2 = output_clk * 4
-        pll_prescale = 0
-        sysclk_div = 1
-        frac_mode = 0
-
-        # disable PLL power
-        regs[_POWER2] = (1, 0)
-        regs[_CLOCK1] = (7, 0)
-
-        pllN = pllF2 // input_mclk
-        if pllN < _PLL_N_MIN_VALUE:
-            input_mclk //= 2
-            pll_prescale = 1
-            pllN = pllF2 // input_mclk
-            if pllN < _PLL_N_MIN_VALUE:
-                sysclk_div = 2
-                pllF2 *= 2
-                pllN = pllF2 // input_mclk
-
-        if (pllN < _PLL_N_MIN_VALUE) or (pllN > _PLL_N_MAX_VALUE):
-            raise ValueError("Invalid MCLK vs. sysclk ratio")
-
-        pllK = ((pllF2 % input_mclk) * (1 << 24)) // input_mclk
-        if pllK != 0:
-            frac_mode = 1
-
-        regs[_PLL1] = (frac_mode << 5) | (pll_prescale << 4) | (pllN & 0x0F)
-        regs[_PLL2] = (pllK >> 16) & 0xFF
-        regs[_PLL3] = (pllK >> 8) & 0xFF
-        regs[_PLL4] = pllK & 0xFF
-        # enable PLL power
-        regs[_POWER2] = (1, 1)
-        regs[_CLOCK1] = (7, ((0 if sysclk_div == 1 else sysclk_div) << 1) | 1)
-
-    def set_master_clock(self, sysclk, sample_rate, bit_width):
-        bit_clock_divider = (sysclk * 2) // (sample_rate * bit_width * 2)
-        try:
-            reg_divider = self._bit_clock_divider_table[bit_clock_divider]
-        except:
-            raise ValueError("Invalid ratio of sysclk sample rate and bits")
-        # configure the master bit clock divider
-        self.regs[_CLOCK2] = (_CLOCK2_BCLK_DIV_MASK, reg_divider)
-
-    def set_speaker_clock(self, sysclk):
-        speaker_divider_table = (1.5, 2, 3, 4, 6, 8, 12, 16)
-        for val in range(8):
-            divider = speaker_divider_table[val]
-            f = sysclk / divider
-            if 500_000 < f < 1_000_000:
-                break
-        else:
-            val = 7
-        self.regs[_CLOCK2] = (
-            _CLOCK2_DCLK_DIV_MASK,
-            val << _CLOCK2_DCLK_DIV_SHIFT,
-        )
-
-    def set_module(self, module, is_enabled):
-
-        is_enabled = 1 if is_enabled else 0
-        regs = self.regs
-
-        if module == MODULE_ADC:
-
-            regs[_POWER1] = (
-                _POWER1_ADCL_MASK | _POWER1_ADCR_MASK,
-                (_POWER1_ADCL_MASK | _POWER1_ADCR_MASK) * is_enabled,
-            )
-
-        elif module == MODULE_DAC:
-
-            regs[_POWER2] = (
-                _POWER2_DACL_MASK | _POWER2_DACR_MASK,
-                (_POWER2_DACL_MASK | _POWER2_DACR_MASK) * is_enabled,
-            )
-
-        elif module == MODULE_VREF:
-
-            regs[_POWER1] = (
-                _POWER1_VREF_MASK,
-                (is_enabled << _POWER1_VREF_SHIFT),
-            )
-
-        elif module == MODULE_LINE_IN:
-
-            regs[_POWER1] = (
-                _POWER1_AINL_MASK | _POWER1_AINR_MASK,
-                (_POWER1_AINL_MASK | _POWER1_AINR_MASK) * is_enabled,
-            )
-            regs[_POWER3] = (
-                _POWER3_LMIC_MASK | _POWER3_RMIC_MASK,
-                (_POWER3_LMIC_MASK | _POWER3_RMIC_MASK) * is_enabled,
-            )
-
-        elif module == MODULE_LINE_OUT:
-
-            regs[_POWER2] = (
-                _POWER2_LOUT1_MASK | _POWER2_ROUT1_MASK,
-                (_POWER2_LOUT1_MASK | _POWER2_ROUT1_MASK) * is_enabled,
-            )
-
-        elif module == MODULE_MIC_BIAS:
-
-            regs[_POWER1] = (
-                _POWER1_MICB_MASK,
-                (is_enabled << _POWER1_MICB_SHIFT),
-            )
-
-        elif module == MODULE_SPEAKER:
-
-            regs[_POWER2] = (
-                _POWER2_SPKL_MASK | _POWER2_SPKR_MASK,
-                (_POWER2_SPKL_MASK | _POWER2_SPKR_MASK) * is_enabled,
-            )
-            regs[_CLASSD1] = 0xF7
-
-        elif module == MODULE_OMIX:
-
-            regs[_POWER3] = (
-                _POWER3_LOMIX_MASK | _POWER3_ROMIX_MASK,
-                (_POWER3_LOMIX_MASK | _POWER3_ROMIX_MASK) * is_enabled,
-            )
-
-        elif module == MODULE_MONO_OUT:
-
-            regs[_MONOMIX1] = regs[_MONOMIX2] = is_enabled << 7
-            regs[_MONO] = is_enabled << 6
-
-        else:
-            raise ValueError("Invalid module")
-
-    def enable_module(self, module):
-        self.set_module(module, True)
-
-    def disable_module(self, module):
-        self.set_module(module, False)
-
-    def set_data_route(self, route):
-        regs = self.regs
-        if route == ROUTE_BYPASS:
-            # Bypass means from line-in to HP
-            # Left LINPUT3 to left output mixer, LINPUT3 left output mixer volume = 0dB
-            # Right RINPUT3 to right output mixer, RINPUT3 right output mixer volume = 0dB
-            regs[_LOUTMIX, _ROUTMIX] = 0x80
-
-        elif route == ROUTE_PLAYBACK:
-            # Data route I2S_IN-> DAC-> HP
-            #
-            # Left DAC to left output mixer, LINPUT3 left output mixer volume = 0dB
-            # Right DAC to right output mixer, RINPUT3 right output mixer volume = 0dB
-            regs[_LOUTMIX, _ROUTMIX] = 0x100
-            regs[_POWER3] = 0x0C
-            # Set power for DAC
-            self.set_module(MODULE_DAC, True)
-            self.set_module(MODULE_OMIX, True)
-            self.set_module(MODULE_LINE_OUT, True)
-
-        elif route == ROUTE_PLAYBACK_RECORD:
-            #
-            # Left DAC to left output mixer, LINPUT3 left output mixer volume = 0dB
-            # Right DAC to right output mixer, RINPUT3 right output mixer volume = 0dB
-            regs[_LOUTMIX, _ROUTMIX] = 0x100
-            regs[_POWER3] = 0x3C
-            self.set_module(MODULE_DAC, True)
-            self.set_module(MODULE_ADC, True)
-            self.set_module(MODULE_LINE_IN, True)
-            self.set_module(MODULE_OMIX, True)
-            self.set_module(MODULE_LINE_OUT, True)
-
-        elif route == ROUTE_RECORD:
-            # LINE_IN->ADC->I2S_OUT
-            # Left and right input boost, LIN3BOOST and RIN3BOOST = 0dB
-            regs[_POWER3] = 0x30
-            # Power up ADC and AIN
-            self.set_module(MODULE_LINE_IN, True)
-            self.set_module(MODULE_ADC, True)
-
-        else:
-            raise ValueError("Invalid route")
-
-    def set_left_input(self, input):
-        if not input in self._input_config_table.keys():
-            raise ValueError("Invalid input")
-
-        input = self._input_config_table[input]
-
-        regs = self.regs
-        if input is None:
-            regs[_POWER1] = (_POWER1_AINL_MASK | _POWER1_ADCL_MASK, 0)
-        elif input[0] == 0:
-            regs[_POWER1] = (0, _POWER1_AINL_MASK | _POWER1_ADCL_MASK)
-            regs[_INBMIX1] = input
-        else:
-            regs[_POWER1] = (0, _POWER1_AINL_MASK | _POWER1_ADCL_MASK | _POWER1_MICB_MASK)
-            regs[_LINPATH] = input[0]
-            regs[_LINVOL] = input[1]
-
-    def set_right_input(self, input):
-        if not input in self._input_config_table.keys():
-            raise ValueError("Invalid input name")
-
-        input = self._input_config_table[input]
-
-        regs = self.regs
-        if input is None:
-            regs[_POWER1] = (_POWER1_AINR_MASK | _POWER1_ADCR_MASK, 0)
-        elif input[0] == 0:
-            regs[_POWER1] = (0, _POWER1_AINL_MASK | _POWER1_ADCR_MASK)
-            regs[_INBMIX2] = input
-        else:
-            regs[_POWER1] = (0, _POWER1_AINR_MASK | _POWER1_ADCR_MASK | _POWER1_MICB_MASK)
-            regs[_RINPATH] = input[0]
-            regs[_RINVOL] = input[1]
-
-    def set_protocol(self, protocol):
-        self.regs[_IFACE1] = (
-            _IFACE1_FORMAT_MASK | _IFACE1_LRP_MASK,
-            protocol,
-        )
-
-    def config_data_format(self, sysclk, sample_rate, bits):
-        #  Compute sample rate divider, dac and adc are the same sample rate
-        try:
-            divider = self._dac_divider_table[sysclk // sample_rate]
-            wl = self._audio_word_length_table[bits]
-        except:
-            raise ValueError("Invalid ratio sysclk/sample_rate or invalid bit length")
-
-        self.regs[_CLOCK1] = (0x1F8, divider << 6 | divider << 3)
-        self.regs[_IFACE1] = (_IFACE1_WL_MASK, wl << _IFACE1_WL_SHIFT)
-
-    def volume(self, module, volume_l=None, volume_r=None):
-        if not module in self._volume_config_table.keys():
-            raise ValueError("Invalid module")
-
-        if volume_l is None:  # get volume
-            vol_max, regnum, _ = self._volume_config_table[module]
-            return (
-                int((self.regs[regnum] & vol_max) * 100 / vol_max + 0.5),
-                int((self.regs[regnum + 1] & vol_max) * 100 / vol_max + 0.5),
-            )
-        else:  # set volume
-            if volume_r is None:
-                volume_r = volume_l
-
-            if not ((0 <= volume_l <= 100) and (0 <= volume_r <= 100)):
-                raise ValueError("Invalid value for volume")
-            elif not module in self._volume_config_table.keys():
-                raise ValueError("Invalid module")
-
-            vol_max, regnum, flags = self._volume_config_table[module]
-            self.regs[regnum] = int(volume_l * vol_max / 100 + 0.5) | flags
-            self.regs[regnum + 1] = int(volume_r * vol_max / 100 + 0.5) | flags
-
-    def mute(self, enable, soft=True, ramp=MUTE_FAST):
-        enable = _DACCTL1_DACMU_MASK if enable else 0
-        soft = _DACCTL2_DACSMM_MASK if soft else 0
-        ramp = _DACCTL2_DACMR_MASK if ramp == MUTE_SLOW else 0
-        self.regs[_DACCTL1] = (_DACCTL1_DACMU_MASK, enable)
-        self.regs[_DACCTL2] = (
-            _DACCTL2_DACSMM_MASK | _DACCTL2_DACMR_MASK,
-            soft | ramp,
-        )
-
-    def expand_3d(self, depth=0):
-        depth &= 0x0F
-        cutoff = 0 if self.sample_rate >= 32000 else 0b1100000
-        self.regs[_3D] = cutoff | depth << 1 | (1 if depth > 0 else 0)
-
-    def mono(self, enable):
-        enable = 1 if enable else 0
-        self.regs[_DACCTL1] = (
-            _DACCTL1_MONOMIX_MASK,
-            enable << _DACCTL1_MONOMIX_SHIFT,
-        )
-
-    def alc_mode(self, channel, mode=ALC_MODE):
-        if mode != ALC_MODE:
-            mode = ALC_LIMITER
-        channel &= 3
-        self.regs[_ALC1] = (
-            _ALC_CHANNEL_MASK,
-            channel << _ALC_CHANNEL_SHIFT,
-        )
-        self.regs[_ALC3] = (_ALC_MODE_MASK, mode << _ALC_MODE_SHIFT)
-        try:
-            rate = _alc_sample_rate_table[self.sample_rate]
-        except:
-            rate = 0
-        self.regs[_ADDCTL3] = (_DACCTL3_ALCSR_MASK, rate)
-
-    def alc_gain(self, target=-12, max_gain=30, min_gain=-17.25, noise_gate=-78):
-        def limit(value, minval, maxval):
-            value = int(value)
-            if value < minval:
-                value = minval
-            if value > maxval:
-                value = maxval
-            return value
-
-        target = limit((16 + (target * 2) // 3), 0, 15)
-        max_gain = limit((max_gain + 12) // 6, 0, 7)
-        min_gain = limit((min_gain * 4 + 69) // 24, 0, 7)
-        noise_gate = limit((noise_gate * 2 + 153) // 3, -1, 31)
-        self.regs[_ALC1] = (
-            _ALC_GAIN_MASK | _ALC_TARGET_MASK,
-            (max_gain << _ALC_GAIN_SHIFT) | target,
-        )
-        self.regs[_ALC2] = (_ALC_GAIN_MASK, (min_gain << _ALC_GAIN_SHIFT))
-        if noise_gate >= 0:
-            self.regs[_NOISEG] = noise_gate << _NOISEG_LEVEL_SHIFT | 1
-        else:
-            self.regs[_NOISEG] = 0
-
-    def alc_time(self, attack=24, decay=192, hold=0):
-        def logb(value, limit):
-            value = int(value)
-            lb = 0
-            while value > 1:
-                value >>= 1
-                lb += 1
-            if lb > limit:
-                lb = limit
-            return lb
-
-        attack = logb(attack / 6, 7)
-        decay = logb(decay / 24, 7)
-        hold = logb((hold * 3) / 8, 15)
-        self.regs[_ALC2] = (_ALC_HOLD_MASK, hold)
-        self.regs[_ALC3] = (
-            _ALC_DECAY_MASK | _ALC_ATTACK_MASK,
-            (decay << _ALC_DECAY_SHIFT) | attack,
-        )
-
-    def deemphasis(self, enable):
-        deem_table = (32000, 44100, 48000)
-        enable = not not enable
-        if enable and self.sample_rate in deem_table:
-            val = deem_table.index(self.sample_rate) + 1
-        else:
-            val = 0
-        self.regs[_DACCTL1] = (_DACCTL1_DEEM_MASK, val << _DACCTL1_DEEM_SHIFT)
diff --git a/drivers/dht/dht.py b/drivers/dht/dht.py
deleted file mode 100644
index 411e9a8d28a6b..0000000000000
--- a/drivers/dht/dht.py
+++ /dev/null
@@ -1,46 +0,0 @@
-# DHT11/DHT22 driver for MicroPython on ESP8266
-# MIT license; Copyright (c) 2016 Damien P. George
-
-import sys
-
-if sys.platform.startswith("esp"):
-    from esp import dht_readinto
-elif sys.platform == "mimxrt":
-    from mimxrt import dht_readinto
-elif sys.platform == "rp2":
-    from rp2 import dht_readinto
-elif sys.platform == "pyboard":
-    from pyb import dht_readinto
-else:
-    from machine import dht_readinto
-
-
-class DHTBase:
-    def __init__(self, pin):
-        self.pin = pin
-        self.buf = bytearray(5)
-
-    def measure(self):
-        buf = self.buf
-        dht_readinto(self.pin, buf)
-        if (buf[0] + buf[1] + buf[2] + buf[3]) & 0xFF != buf[4]:
-            raise Exception("checksum error")
-
-
-class DHT11(DHTBase):
-    def humidity(self):
-        return self.buf[0]
-
-    def temperature(self):
-        return self.buf[2]
-
-
-class DHT22(DHTBase):
-    def humidity(self):
-        return (self.buf[0] << 8 | self.buf[1]) * 0.1
-
-    def temperature(self):
-        t = ((self.buf[2] & 0x7F) << 8 | self.buf[3]) * 0.1
-        if self.buf[2] & 0x80:
-            t = -t
-        return t
diff --git a/drivers/dht/manifest.py b/drivers/dht/manifest.py
deleted file mode 100644
index 72a4e0d24fcd5..0000000000000
--- a/drivers/dht/manifest.py
+++ /dev/null
@@ -1 +0,0 @@
-module("dht.py", opt=3)
diff --git a/drivers/display/lcd160cr.py b/drivers/display/lcd160cr.py
deleted file mode 100644
index f792418aa2b55..0000000000000
--- a/drivers/display/lcd160cr.py
+++ /dev/null
@@ -1,482 +0,0 @@
-# Driver for official MicroPython LCD160CR display
-# MIT license; Copyright (c) 2017 Damien P. George
-
-from micropython import const
-from utime import sleep_ms
-from ustruct import calcsize, pack_into
-import uerrno, machine
-
-# for set_orient
-PORTRAIT = const(0)
-LANDSCAPE = const(1)
-PORTRAIT_UPSIDEDOWN = const(2)
-LANDSCAPE_UPSIDEDOWN = const(3)
-
-# for set_startup_deco; can be or'd
-STARTUP_DECO_NONE = const(0)
-STARTUP_DECO_MLOGO = const(1)
-STARTUP_DECO_INFO = const(2)
-
-_uart_baud_table = {
-    2400: 0,
-    4800: 1,
-    9600: 2,
-    19200: 3,
-    38400: 4,
-    57600: 5,
-    115200: 6,
-    230400: 7,
-    460800: 8,
-}
-
-
-class LCD160CR:
-    def __init__(self, connect=None, *, pwr=None, i2c=None, spi=None, i2c_addr=98):
-        if connect in ("X", "Y", "XY", "YX"):
-            i = connect[-1]
-            j = connect[0]
-            y = j + "4"
-        elif connect == "C":
-            i = 2
-            j = 2
-            y = "A7"
-        else:
-            if pwr is None or i2c is None or spi is None:
-                raise ValueError('must specify valid "connect" or all of "pwr", "i2c" and "spi"')
-
-        if pwr is None:
-            pwr = machine.Pin(y, machine.Pin.OUT)
-        if i2c is None:
-            i2c = machine.I2C(i, freq=1000000)
-        if spi is None:
-            spi = machine.SPI(j, baudrate=13500000, polarity=0, phase=0)
-
-        if not pwr.value():
-            pwr(1)
-            sleep_ms(10)
-        # else:
-        # alread have power
-        # lets be optimistic...
-
-        # set connections
-        self.pwr = pwr
-        self.i2c = i2c
-        self.spi = spi
-        self.i2c_addr = i2c_addr
-
-        # create temp buffers and memoryviews
-        self.buf16 = bytearray(16)
-        self.buf19 = bytearray(19)
-        self.buf = [None] * 10
-        for i in range(1, 10):
-            self.buf[i] = memoryview(self.buf16)[0:i]
-        self.buf1 = self.buf[1]
-        self.array4 = [0, 0, 0, 0]
-
-        # set default orientation and window
-        self.set_orient(PORTRAIT)
-        self._fcmd2b("<BBBBBB", 0x76, 0, 0, self.w, self.h)  # viewport 'v'
-        self._fcmd2b("<BBBBBB", 0x79, 0, 0, self.w, self.h)  # window 'y'
-
-    def _send(self, cmd):
-        i = self.i2c.writeto(self.i2c_addr, cmd)
-        if i == len(cmd):
-            return
-        cmd = memoryview(cmd)
-        n = len(cmd)
-        while True:
-            i += self.i2c.writeto(self.i2c_addr, cmd[i:])
-            if i == n:
-                return
-            sleep_ms(10)
-
-    def _fcmd2(self, fmt, a0, a1=0, a2=0):
-        buf = self.buf[calcsize(fmt)]
-        pack_into(fmt, buf, 0, 2, a0, a1, a2)
-        self._send(buf)
-
-    def _fcmd2b(self, fmt, a0, a1, a2, a3, a4=0):
-        buf = self.buf[calcsize(fmt)]
-        pack_into(fmt, buf, 0, 2, a0, a1, a2, a3, a4)
-        self._send(buf)
-
-    def _waitfor(self, n, buf):
-        t = 5000
-        while t:
-            self.i2c.readfrom_into(self.i2c_addr, self.buf1)
-            if self.buf1[0] >= n:
-                self.i2c.readfrom_into(self.i2c_addr, buf)
-                return
-            t -= 1
-            sleep_ms(1)
-        raise OSError(uerrno.ETIMEDOUT)
-
-    def oflush(self, n=255):
-        t = 5000
-        while t:
-            self.i2c.readfrom_into(self.i2c_addr + 1, self.buf1)
-            r = self.buf1[0]
-            if r >= n:
-                return
-            t -= 1
-            machine.idle()
-        raise OSError(uerrno.ETIMEDOUT)
-
-    def iflush(self):
-        t = 5000
-        while t:
-            self.i2c.readfrom_into(self.i2c_addr, self.buf16)
-            if self.buf16[0] == 0:
-                return
-            t -= 1
-            sleep_ms(1)
-        raise OSError(uerrno.ETIMEDOUT)
-
-    #### MISC METHODS ####
-
-    @staticmethod
-    def rgb(r, g, b):
-        return ((b & 0xF8) << 8) | ((g & 0xFC) << 3) | (r >> 3)
-
-    @staticmethod
-    def clip_line(c, w, h):
-        while True:
-            ca = ce = 0
-            if c[1] < 0:
-                ca |= 8
-            elif c[1] > h:
-                ca |= 4
-            if c[0] < 0:
-                ca |= 1
-            elif c[0] > w:
-                ca |= 2
-            if c[3] < 0:
-                ce |= 8
-            elif c[3] > h:
-                ce |= 4
-            if c[2] < 0:
-                ce |= 1
-            elif c[2] > w:
-                ce |= 2
-            if ca & ce:
-                return False
-            elif ca | ce:
-                ca |= ce
-                if ca & 1:
-                    if c[2] < c[0]:
-                        c[0], c[2] = c[2], c[0]
-                        c[1], c[3] = c[3], c[1]
-                    c[1] += ((-c[0]) * (c[3] - c[1])) // (c[2] - c[0])
-                    c[0] = 0
-                elif ca & 2:
-                    if c[2] < c[0]:
-                        c[0], c[2] = c[2], c[0]
-                        c[1], c[3] = c[3], c[1]
-                    c[3] += ((w - 1 - c[2]) * (c[3] - c[1])) // (c[2] - c[0])
-                    c[2] = w - 1
-                elif ca & 4:
-                    if c[0] == c[2]:
-                        if c[1] >= h:
-                            c[1] = h - 1
-                        if c[3] >= h:
-                            c[3] = h - 1
-                    else:
-                        if c[3] < c[1]:
-                            c[0], c[2] = c[2], c[0]
-                            c[1], c[3] = c[3], c[1]
-                        c[2] += ((h - 1 - c[3]) * (c[2] - c[0])) // (c[3] - c[1])
-                        c[3] = h - 1
-                else:
-                    if c[0] == c[2]:
-                        if c[1] < 0:
-                            c[1] = 0
-                        if c[3] < 0:
-                            c[3] = 0
-                    else:
-                        if c[3] < c[1]:
-                            c[0], c[2] = c[2], c[0]
-                            c[1], c[3] = c[3], c[1]
-                        c[0] += ((-c[1]) * (c[2] - c[0])) // (c[3] - c[1])
-                        c[1] = 0
-            else:
-                return True
-
-    #### SETUP COMMANDS ####
-
-    def set_power(self, on):
-        self.pwr(on)
-        sleep_ms(15)
-
-    def set_orient(self, orient):
-        self._fcmd2("<BBB", 0x14, (orient & 3) + 4)
-        # update width and height variables
-        self.iflush()
-        self._send(b"\x02g0")
-        self._waitfor(4, self.buf[5])
-        self.w = self.buf[5][1]
-        self.h = self.buf[5][2]
-
-    def set_brightness(self, value):
-        self._fcmd2("<BBB", 0x16, value)
-
-    def set_i2c_addr(self, addr):
-        # 0x0e set i2c addr
-        if addr & 3:
-            raise ValueError("must specify mod 4 aligned address")
-        self._fcmd2("<BBW", 0x0E, 0x433249 | (addr << 24))
-
-    def set_uart_baudrate(self, baudrate):
-        try:
-            baudrate = _uart_baud_table[baudrate]
-        except KeyError:
-            raise ValueError("invalid baudrate")
-        self._fcmd2("<BBB", 0x18, baudrate)
-
-    def set_startup_deco(self, value):
-        self._fcmd2("<BBB", 0x19, value)
-
-    def save_to_flash(self):
-        self._send(b"\x02fn")
-
-    #### PIXEL ACCESS ####
-
-    def set_pixel(self, x, y, c):
-        self._fcmd2b("<BBBBH", 0x41, x, y, c)
-
-    def get_pixel(self, x, y):
-        self._fcmd2("<BBBB", 0x61, x, y)
-        t = 1000
-        while t:
-            self.i2c.readfrom_into(self.i2c_addr, self.buf1)
-            if self.buf1[0] >= 2:
-                self.i2c.readfrom_into(self.i2c_addr, self.buf[3])
-                return self.buf[3][1] | self.buf[3][2] << 8
-            t -= 1
-            sleep_ms(1)
-        raise OSError(uerrno.ETIMEDOUT)
-
-    def get_line(self, x, y, buf):
-        l = len(buf) // 2
-        self._fcmd2b("<BBBBB", 0x10, l, x, y)
-        l *= 2
-        t = 1000
-        while t:
-            self.i2c.readfrom_into(self.i2c_addr, self.buf1)
-            if self.buf1[0] >= l:
-                self.i2c.readfrom_into(self.i2c_addr, buf)
-                return
-            t -= 1
-            sleep_ms(1)
-        raise OSError(uerrno.ETIMEDOUT)
-
-    def screen_dump(self, buf, x=0, y=0, w=None, h=None):
-        if w is None:
-            w = self.w - x
-        if h is None:
-            h = self.h - y
-        if w <= 127:
-            line = bytearray(2 * w + 1)
-            line2 = None
-        else:
-            # split line if more than 254 bytes needed
-            buflen = (w + 1) // 2
-            line = bytearray(2 * buflen + 1)
-            line2 = memoryview(line)[: 2 * (w - buflen) + 1]
-        for i in range(min(len(buf) // (2 * w), h)):
-            ix = i * w * 2
-            self.get_line(x, y + i, line)
-            buf[ix : ix + len(line) - 1] = memoryview(line)[1:]
-            ix += len(line) - 1
-            if line2:
-                self.get_line(x + buflen, y + i, line2)
-                buf[ix : ix + len(line2) - 1] = memoryview(line2)[1:]
-                ix += len(line2) - 1
-
-    def screen_load(self, buf):
-        l = self.w * self.h * 2 + 2
-        self._fcmd2b("<BBHBBB", 0x70, l, 16, self.w, self.h)
-        n = 0
-        ar = memoryview(buf)
-        while n < len(buf):
-            if len(buf) - n >= 0x200:
-                self._send(ar[n : n + 0x200])
-                n += 0x200
-            else:
-                self._send(ar[n:])
-                while n < self.w * self.h * 2:
-                    self._send(b"\x00")
-                    n += 1
-
-    #### TEXT COMMANDS ####
-
-    def set_pos(self, x, y):
-        self._fcmd2("<BBBB", 0x58, x, y)
-
-    def set_text_color(self, fg, bg):
-        self._fcmd2("<BBHH", 0x63, fg, bg)
-
-    def set_font(self, font, scale=0, bold=0, trans=0, scroll=0):
-        self._fcmd2(
-            "<BBBB",
-            0x46,
-            (scroll << 7) | (trans << 6) | ((font & 3) << 4) | (bold & 0xF),
-            scale & 0xFF,
-        )
-
-    def write(self, s):
-        # TODO: eventually check for room in LCD input queue
-        self._send(s)
-
-    #### PRIMITIVE DRAWING COMMANDS ####
-
-    def set_pen(self, line, fill):
-        self._fcmd2("<BBHH", 0x50, line, fill)
-
-    def erase(self):
-        self._send(b"\x02\x45")
-
-    def dot(self, x, y):
-        if 0 <= x < self.w and 0 <= y < self.h:
-            self._fcmd2("<BBBB", 0x4B, x, y)
-
-    def rect(self, x, y, w, h, cmd=0x72):
-        if x + w <= 0 or y + h <= 0 or x >= self.w or y >= self.h:
-            return
-        elif x < 0 or y < 0:
-            left = top = True
-            if x < 0:
-                left = False
-                w += x
-                x = 0
-            if y < 0:
-                top = False
-                h += y
-                y = 0
-            if cmd == 0x51 or cmd == 0x72:
-                # draw interior
-                self._fcmd2b("<BBBBBB", 0x51, x, y, min(w, 255), min(h, 255))
-            if cmd == 0x57 or cmd == 0x72:
-                # draw outline
-                if left:
-                    self._fcmd2b("<BBBBBB", 0x57, x, y, 1, min(h, 255))
-                if top:
-                    self._fcmd2b("<BBBBBB", 0x57, x, y, min(w, 255), 1)
-                if x + w < self.w:
-                    self._fcmd2b("<BBBBBB", 0x57, x + w, y, 1, min(h, 255))
-                if y + h < self.h:
-                    self._fcmd2b("<BBBBBB", 0x57, x, y + h, min(w, 255), 1)
-        else:
-            self._fcmd2b("<BBBBBB", cmd, x, y, min(w, 255), min(h, 255))
-
-    def rect_outline(self, x, y, w, h):
-        self.rect(x, y, w, h, 0x57)
-
-    def rect_interior(self, x, y, w, h):
-        self.rect(x, y, w, h, 0x51)
-
-    def line(self, x1, y1, x2, y2):
-        ar4 = self.array4
-        ar4[0] = x1
-        ar4[1] = y1
-        ar4[2] = x2
-        ar4[3] = y2
-        if self.clip_line(ar4, self.w, self.h):
-            self._fcmd2b("<BBBBBB", 0x4C, ar4[0], ar4[1], ar4[2], ar4[3])
-
-    def dot_no_clip(self, x, y):
-        self._fcmd2("<BBBB", 0x4B, x, y)
-
-    def rect_no_clip(self, x, y, w, h):
-        self._fcmd2b("<BBBBBB", 0x72, x, y, w, h)
-
-    def rect_outline_no_clip(self, x, y, w, h):
-        self._fcmd2b("<BBBBBB", 0x57, x, y, w, h)
-
-    def rect_interior_no_clip(self, x, y, w, h):
-        self._fcmd2b("<BBBBBB", 0x51, x, y, w, h)
-
-    def line_no_clip(self, x1, y1, x2, y2):
-        self._fcmd2b("<BBBBBB", 0x4C, x1, y1, x2, y2)
-
-    def poly_dot(self, data):
-        if len(data) & 1:
-            raise ValueError("must specify even number of bytes")
-        self._fcmd2("<BBB", 0x71, len(data) // 2)
-        self._send(data)
-
-    def poly_line(self, data):
-        if len(data) & 1:
-            raise ValueError("must specify even number of bytes")
-        self._fcmd2("<BBB", 0x78, len(data) // 2)
-        self._send(data)
-
-    #### TOUCH COMMANDS ####
-
-    def touch_config(self, calib=False, save=False, irq=None):
-        self._fcmd2("<BBBB", 0x7A, (irq is not None) << 2 | save << 1 | calib, bool(irq) << 7)
-
-    def is_touched(self):
-        self._send(b"\x02T")
-        b = self.buf[4]
-        self._waitfor(3, b)
-        return b[1] >> 7 != 0
-
-    def get_touch(self):
-        self._send(b"\x02T")  # implicit LCD output flush
-        b = self.buf[4]
-        self._waitfor(3, b)
-        return b[1] >> 7, b[2], b[3]
-
-    #### ADVANCED COMMANDS ####
-
-    def set_spi_win(self, x, y, w, h):
-        pack_into(
-            "<BBBHHHHHHHH", self.buf19, 0, 2, 0x55, 10, x, y, x + w - 1, y + h - 1, 0, 0, 0, 0xFFFF
-        )
-        self._send(self.buf19)
-
-    def fast_spi(self, flush=True):
-        self._send(b"\x02\x12")
-        if flush:
-            self.oflush()
-        return self.spi
-
-    def show_framebuf(self, buf):
-        self.fast_spi().write(buf)
-
-    def set_scroll(self, on):
-        self._fcmd2("<BBB", 0x15, on)
-
-    def set_scroll_win(self, win, x=-1, y=0, w=0, h=0, vec=0, pat=0, fill=0x07E0, color=0):
-        pack_into("<BBBHHHHHHHH", self.buf19, 0, 2, 0x55, win, x, y, w, h, vec, pat, fill, color)
-        self._send(self.buf19)
-
-    def set_scroll_win_param(self, win, param, value):
-        self._fcmd2b("<BBBBH", 0x75, win, param, value)
-
-    def set_scroll_buf(self, s):
-        l = len(s)
-        if l > 32:
-            raise ValueError("length must be 32 or less")
-        self._fcmd2("<BBB", 0x11, l)
-        self._send(s)
-
-    def jpeg_start(self, l):
-        if l > 0xFFFF:
-            raise ValueError("length must be 65535 or less")
-        self.oflush()
-        self._fcmd2("<BBH", 0x6A, l)
-
-    def jpeg_data(self, buf):
-        self._send(buf)
-
-    def jpeg(self, buf):
-        self.jpeg_start(len(buf))
-        self.jpeg_data(buf)
-
-    def feed_wdt(self):
-        self._send(b"\x02\x17")
-
-    def reset(self):
-        self._send(b"\x02Y\xef\xbe\xad\xde")
-        sleep_ms(15)
diff --git a/drivers/display/lcd160cr_test.py b/drivers/display/lcd160cr_test.py
deleted file mode 100644
index 883c7d3b7a1ff..0000000000000
--- a/drivers/display/lcd160cr_test.py
+++ /dev/null
@@ -1,187 +0,0 @@
-# Driver test for official MicroPython LCD160CR display
-# MIT license; Copyright (c) 2017 Damien P. George
-
-import time, math, framebuf, lcd160cr
-
-
-def get_lcd(lcd):
-    if type(lcd) is str:
-        lcd = lcd160cr.LCD160CR(lcd)
-    return lcd
-
-
-def show_adc(lcd, adc):
-    data = [adc.read_core_temp(), adc.read_core_vbat(), 3.3]
-    try:
-        data[2] = adc.read_vref()
-    except:
-        pass
-    for i in range(3):
-        lcd.set_text_color((825, 1625, 1600)[i], 0)
-        if lcd.h == 160:
-            lcd.set_font(2)
-            lcd.set_pos(0, 100 + i * 16)
-        else:
-            lcd.set_font(2, trans=1)
-            lcd.set_pos(0, lcd.h - 60 + i * 16)
-        lcd.write("%4s: " % ("TEMP", "VBAT", "VREF")[i])
-        if i > 0:
-            s = "%6.3fV" % data[i]
-        else:
-            s = "%5.1f°C" % data[i]
-        if lcd.h == 160:
-            lcd.set_font(1, bold=0, scale=1)
-        else:
-            lcd.set_font(1, bold=0, scale=1, trans=1)
-            lcd.set_pos(45, lcd.h - 60 + i * 16)
-        lcd.write(s)
-
-
-def test_features(lcd, orient=lcd160cr.PORTRAIT):
-    # if we run on pyboard then use ADC and RTC features
-    try:
-        import pyb
-
-        adc = pyb.ADCAll(12, 0xF0000)
-        rtc = pyb.RTC()
-    except:
-        adc = None
-        rtc = None
-
-    # set orientation and clear screen
-    lcd = get_lcd(lcd)
-    lcd.set_orient(orient)
-    lcd.set_pen(0, 0)
-    lcd.erase()
-
-    # create M-logo
-    mlogo = framebuf.FrameBuffer(bytearray(17 * 17 * 2), 17, 17, framebuf.RGB565)
-    mlogo.fill(0)
-    mlogo.fill_rect(1, 1, 15, 15, 0xFFFFFF)
-    mlogo.vline(4, 4, 12, 0)
-    mlogo.vline(8, 1, 12, 0)
-    mlogo.vline(12, 4, 12, 0)
-    mlogo.vline(14, 13, 2, 0)
-
-    # create inline framebuf
-    offx = 14
-    offy = 19
-    w = 100
-    h = 75
-    fbuf = framebuf.FrameBuffer(bytearray(w * h * 2), w, h, framebuf.RGB565)
-    lcd.set_spi_win(offx, offy, w, h)
-
-    # initialise loop parameters
-    tx = ty = 0
-    t0 = time.ticks_us()
-
-    for i in range(300):
-        # update position of cross-hair
-        t, tx2, ty2 = lcd.get_touch()
-        if t:
-            tx2 -= offx
-            ty2 -= offy
-            if tx2 >= 0 and ty2 >= 0 and tx2 < w and ty2 < h:
-                tx, ty = tx2, ty2
-        else:
-            tx = (tx + 1) % w
-            ty = (ty + 1) % h
-
-        # create and show the inline framebuf
-        fbuf.fill(lcd.rgb(128 + int(64 * math.cos(0.1 * i)), 128, 192))
-        fbuf.line(
-            w // 2,
-            h // 2,
-            w // 2 + int(40 * math.cos(0.2 * i)),
-            h // 2 + int(40 * math.sin(0.2 * i)),
-            lcd.rgb(128, 255, 64),
-        )
-        fbuf.hline(0, ty, w, lcd.rgb(64, 64, 64))
-        fbuf.vline(tx, 0, h, lcd.rgb(64, 64, 64))
-        fbuf.rect(tx - 3, ty - 3, 7, 7, lcd.rgb(64, 64, 64))
-        for phase in (-0.2, 0, 0.2):
-            x = w // 2 - 8 + int(50 * math.cos(0.05 * i + phase))
-            y = h // 2 - 8 + int(32 * math.sin(0.05 * i + phase))
-            fbuf.blit(mlogo, x, y)
-        for j in range(-3, 3):
-            fbuf.text(
-                "MicroPython",
-                5,
-                h // 2 + 9 * j + int(20 * math.sin(0.1 * (i + j))),
-                lcd.rgb(128 + 10 * j, 0, 128 - 10 * j),
-            )
-        lcd.show_framebuf(fbuf)
-
-        # show results from the ADC
-        if adc:
-            show_adc(lcd, adc)
-
-        # show the time
-        if rtc:
-            lcd.set_pos(2, 0)
-            lcd.set_font(1)
-            t = rtc.datetime()
-            lcd.write(
-                "%4d-%02d-%02d %2d:%02d:%02d.%01d"
-                % (t[0], t[1], t[2], t[4], t[5], t[6], t[7] // 100000)
-            )
-
-        # compute the frame rate
-        t1 = time.ticks_us()
-        dt = time.ticks_diff(t1, t0)
-        t0 = t1
-
-        # show the frame rate
-        lcd.set_pos(2, 9)
-        lcd.write("%.2f fps" % (1000000 / dt))
-
-
-def test_mandel(lcd, orient=lcd160cr.PORTRAIT):
-    # set orientation and clear screen
-    lcd = get_lcd(lcd)
-    lcd.set_orient(orient)
-    lcd.set_pen(0, 0xFFFF)
-    lcd.erase()
-
-    # function to compute Mandelbrot pixels
-    def in_set(c):
-        z = 0
-        for i in range(32):
-            z = z * z + c
-            if abs(z) > 100:
-                return i
-        return 0
-
-    # cache width and height of LCD
-    w = lcd.w
-    h = lcd.h
-
-    # create the buffer for each line and set SPI parameters
-    line = bytearray(w * 2)
-    lcd.set_spi_win(0, 0, w, h)
-    spi = lcd.fast_spi()
-
-    # draw the Mandelbrot set line-by-line
-    hh = (h - 1) / 3.2
-    ww = (w - 1) / 2.4
-    for v in range(h):
-        for u in range(w):
-            c = in_set((v / hh - 2.3) + (u / ww - 1.2) * 1j)
-            if c < 16:
-                rgb = c << 12 | c << 6
-            else:
-                rgb = 0xF800 | c << 6
-            line[2 * u] = rgb
-            line[2 * u + 1] = rgb >> 8
-        spi.write(line)
-
-
-def test_all(lcd, orient=lcd160cr.PORTRAIT):
-    lcd = get_lcd(lcd)
-    test_features(lcd, orient)
-    test_mandel(lcd, orient)
-
-
-print("To run all tests: test_all(<lcd>)")
-print("Individual tests are: test_features, test_mandel")
-print('<lcd> argument should be a connection, eg "X", or an LCD160CR object')
diff --git a/drivers/display/manifest.py b/drivers/display/manifest.py
deleted file mode 100644
index 16f93a7d4e99a..0000000000000
--- a/drivers/display/manifest.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# TODO: Split these into separate directories with their own manifests.
-options.defaults(lcd160cr=False, ssd1306=False, test=False)
-
-if options.lcd160cr:
-    module("lcd160cr.py", opt=3)
-
-    if options.test:
-        module("lcd160cr_test.py", opt=3)
-
-if options.ssd1306:
-    module("ssd1306.py", opt=3)
diff --git a/drivers/display/ssd1306.py b/drivers/display/ssd1306.py
deleted file mode 100644
index a504cdadcc94e..0000000000000
--- a/drivers/display/ssd1306.py
+++ /dev/null
@@ -1,163 +0,0 @@
-# MicroPython SSD1306 OLED driver, I2C and SPI interfaces
-
-from micropython import const
-import framebuf
-
-
-# register definitions
-SET_CONTRAST = const(0x81)
-SET_ENTIRE_ON = const(0xA4)
-SET_NORM_INV = const(0xA6)
-SET_DISP = const(0xAE)
-SET_MEM_ADDR = const(0x20)
-SET_COL_ADDR = const(0x21)
-SET_PAGE_ADDR = const(0x22)
-SET_DISP_START_LINE = const(0x40)
-SET_SEG_REMAP = const(0xA0)
-SET_MUX_RATIO = const(0xA8)
-SET_IREF_SELECT = const(0xAD)
-SET_COM_OUT_DIR = const(0xC0)
-SET_DISP_OFFSET = const(0xD3)
-SET_COM_PIN_CFG = const(0xDA)
-SET_DISP_CLK_DIV = const(0xD5)
-SET_PRECHARGE = const(0xD9)
-SET_VCOM_DESEL = const(0xDB)
-SET_CHARGE_PUMP = const(0x8D)
-
-# Subclassing FrameBuffer provides support for graphics primitives
-# http://docs.micropython.org/en/latest/pyboard/library/framebuf.html
-class SSD1306(framebuf.FrameBuffer):
-    def __init__(self, width, height, external_vcc):
-        self.width = width
-        self.height = height
-        self.external_vcc = external_vcc
-        self.pages = self.height // 8
-        self.buffer = bytearray(self.pages * self.width)
-        super().__init__(self.buffer, self.width, self.height, framebuf.MONO_VLSB)
-        self.init_display()
-
-    def init_display(self):
-        for cmd in (
-            SET_DISP,  # display off
-            # address setting
-            SET_MEM_ADDR,
-            0x00,  # horizontal
-            # resolution and layout
-            SET_DISP_START_LINE,  # start at line 0
-            SET_SEG_REMAP | 0x01,  # column addr 127 mapped to SEG0
-            SET_MUX_RATIO,
-            self.height - 1,
-            SET_COM_OUT_DIR | 0x08,  # scan from COM[N] to COM0
-            SET_DISP_OFFSET,
-            0x00,
-            SET_COM_PIN_CFG,
-            0x02 if self.width > 2 * self.height else 0x12,
-            # timing and driving scheme
-            SET_DISP_CLK_DIV,
-            0x80,
-            SET_PRECHARGE,
-            0x22 if self.external_vcc else 0xF1,
-            SET_VCOM_DESEL,
-            0x30,  # 0.83*Vcc
-            # display
-            SET_CONTRAST,
-            0xFF,  # maximum
-            SET_ENTIRE_ON,  # output follows RAM contents
-            SET_NORM_INV,  # not inverted
-            SET_IREF_SELECT,
-            0x30,  # enable internal IREF during display on
-            # charge pump
-            SET_CHARGE_PUMP,
-            0x10 if self.external_vcc else 0x14,
-            SET_DISP | 0x01,  # display on
-        ):  # on
-            self.write_cmd(cmd)
-        self.fill(0)
-        self.show()
-
-    def poweroff(self):
-        self.write_cmd(SET_DISP)
-
-    def poweron(self):
-        self.write_cmd(SET_DISP | 0x01)
-
-    def contrast(self, contrast):
-        self.write_cmd(SET_CONTRAST)
-        self.write_cmd(contrast)
-
-    def invert(self, invert):
-        self.write_cmd(SET_NORM_INV | (invert & 1))
-
-    def rotate(self, rotate):
-        self.write_cmd(SET_COM_OUT_DIR | ((rotate & 1) << 3))
-        self.write_cmd(SET_SEG_REMAP | (rotate & 1))
-
-    def show(self):
-        x0 = 0
-        x1 = self.width - 1
-        if self.width != 128:
-            # narrow displays use centred columns
-            col_offset = (128 - self.width) // 2
-            x0 += col_offset
-            x1 += col_offset
-        self.write_cmd(SET_COL_ADDR)
-        self.write_cmd(x0)
-        self.write_cmd(x1)
-        self.write_cmd(SET_PAGE_ADDR)
-        self.write_cmd(0)
-        self.write_cmd(self.pages - 1)
-        self.write_data(self.buffer)
-
-
-class SSD1306_I2C(SSD1306):
-    def __init__(self, width, height, i2c, addr=0x3C, external_vcc=False):
-        self.i2c = i2c
-        self.addr = addr
-        self.temp = bytearray(2)
-        self.write_list = [b"\x40", None]  # Co=0, D/C#=1
-        super().__init__(width, height, external_vcc)
-
-    def write_cmd(self, cmd):
-        self.temp[0] = 0x80  # Co=1, D/C#=0
-        self.temp[1] = cmd
-        self.i2c.writeto(self.addr, self.temp)
-
-    def write_data(self, buf):
-        self.write_list[1] = buf
-        self.i2c.writevto(self.addr, self.write_list)
-
-
-class SSD1306_SPI(SSD1306):
-    def __init__(self, width, height, spi, dc, res, cs, external_vcc=False):
-        self.rate = 10 * 1024 * 1024
-        dc.init(dc.OUT, value=0)
-        res.init(res.OUT, value=0)
-        cs.init(cs.OUT, value=1)
-        self.spi = spi
-        self.dc = dc
-        self.res = res
-        self.cs = cs
-        import time
-
-        self.res(1)
-        time.sleep_ms(1)
-        self.res(0)
-        time.sleep_ms(10)
-        self.res(1)
-        super().__init__(width, height, external_vcc)
-
-    def write_cmd(self, cmd):
-        self.spi.init(baudrate=self.rate, polarity=0, phase=0)
-        self.cs(1)
-        self.dc(0)
-        self.cs(0)
-        self.spi.write(bytearray([cmd]))
-        self.cs(1)
-
-    def write_data(self, buf):
-        self.spi.init(baudrate=self.rate, polarity=0, phase=0)
-        self.cs(1)
-        self.dc(1)
-        self.cs(0)
-        self.spi.write(buf)
-        self.cs(1)
diff --git a/drivers/hts221/hts221.py b/drivers/hts221/hts221.py
deleted file mode 100644
index fec52a7389a98..0000000000000
--- a/drivers/hts221/hts221.py
+++ /dev/null
@@ -1,91 +0,0 @@
-"""
-The MIT License (MIT)
-
-Copyright (c) 2013-2022 Ibrahim Abdelkader <iabdalkader@openmv.io>
-Copyright (c) 2013-2022 Kwabena W. Agyeman <kwagyeman@openmv.io>
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
-HTS221 driver driver for MicroPython.
-Original source: https://github.com/ControlEverythingCommunity/HTS221/blob/master/Python/HTS221.py
-
-Example usage:
-
-import time
-import hts221
-from machine import Pin, I2C
-
-bus = I2C(1, scl=Pin(15), sda=Pin(14))
-hts = hts221.HTS221(bus)
-
-while (True):
-    rH   = hts.humidity()
-    temp = hts.temperature()
-    print ("rH: %.2f%% T: %.2fC" %(rH, temp))
-    time.sleep_ms(100)
-"""
-
-import struct
-
-
-class HTS221:
-    def __init__(self, i2c, data_rate=1, address=0x5F):
-        self.bus = i2c
-        self.odr = data_rate
-        self.slv_addr = address
-
-        # Set configuration register
-        # Humidity and temperature average configuration
-        self.bus.writeto_mem(self.slv_addr, 0x10, b"\x1B")
-
-        # Set control register
-        # PD | BDU | ODR
-        cfg = 0x80 | 0x04 | (self.odr & 0x3)
-        self.bus.writeto_mem(self.slv_addr, 0x20, bytes([cfg]))
-
-        # Read Calibration values from non-volatile memory of the device
-        # Humidity Calibration values
-        self.H0 = self._read_reg(0x30, 1) / 2
-        self.H1 = self._read_reg(0x31, 1) / 2
-        self.H2 = self._read_reg(0x36, 2)
-        self.H3 = self._read_reg(0x3A, 2)
-
-        # Temperature Calibration values
-        raw = self._read_reg(0x35, 1)
-        self.T0 = ((raw & 0x03) * 256) + self._read_reg(0x32, 1)
-        self.T1 = ((raw & 0x0C) * 64) + self._read_reg(0x33, 1)
-        self.T2 = self._read_reg(0x3C, 2)
-        self.T3 = self._read_reg(0x3E, 2)
-
-    def _read_reg(self, reg_addr, size):
-        fmt = "B" if size == 1 else "H"
-        reg_addr = reg_addr if size == 1 else reg_addr | 0x80
-        return struct.unpack(fmt, self.bus.readfrom_mem(self.slv_addr, reg_addr, size))[0]
-
-    def humidity(self):
-        rH = self._read_reg(0x28, 2)
-        return (self.H1 - self.H0) * (rH - self.H2) / (self.H3 - self.H2) + self.H0
-
-    def temperature(self):
-        temp = self._read_reg(0x2A, 2)
-        if temp > 32767:
-            temp -= 65536
-        return ((self.T1 - self.T0) / 8.0) * (temp - self.T2) / (self.T3 - self.T2) + (
-            self.T0 / 8.0
-        )
diff --git a/drivers/hts221/manifest.py b/drivers/hts221/manifest.py
deleted file mode 100644
index 5f1792665943a..0000000000000
--- a/drivers/hts221/manifest.py
+++ /dev/null
@@ -1 +0,0 @@
-module("hts221.py", opt=3)
diff --git a/drivers/lps22h/lps22h.py b/drivers/lps22h/lps22h.py
deleted file mode 100644
index ca29efce2d6f8..0000000000000
--- a/drivers/lps22h/lps22h.py
+++ /dev/null
@@ -1,109 +0,0 @@
-"""
-The MIT License (MIT)
-
-Copyright (c) 2016-2019 shaoziyang <shaoziyang@micropython.org.cn>
-Copyright (c) 2022 Ibrahim Abdelkader <iabdalkader@openmv.io>
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
-LPS22HB/HH pressure sensor driver for MicroPython.
-
-Example usage:
-
-import time
-from lps22h import LPS22H
-from machine import Pin, I2C
-
-bus = I2C(1, scl=Pin(15), sda=Pin(14))
-lps = LPS22H(bus, oneshot=False)
-
-while (True):
-    print("Pressure: %.2f hPa Temperature: %.2f C"%(lps.pressure(), lps.temperature()))
-    time.sleep_ms(10)
-"""
-import machine
-
-_LPS22_CTRL_REG1 = const(0x10)
-_LPS22_CTRL_REG2 = const(0x11)
-_LPS22_STATUS = const(0x27)
-_LPS22_TEMP_OUT_L = const(0x2B)
-_LPS22_PRESS_OUT_XL = const(0x28)
-_LPS22_PRESS_OUT_L = const(0x29)
-
-
-class LPS22H:
-    def __init__(self, i2c, address=0x5C, oneshot=False):
-        self.i2c = i2c
-        self.addr = address
-        self.oneshot = oneshot
-        self.buf = bytearray(1)
-        # ODR=1 EN_LPFP=1 BDU=1
-        self._write_reg(_LPS22_CTRL_REG1, 0x1A)
-        self.set_oneshot_mode(self.oneshot)
-
-    def _int16(self, d):
-        return d if d < 0x8000 else d - 0x10000
-
-    def _write_reg(self, reg, dat):
-        self.buf[0] = dat
-        self.i2c.writeto_mem(self.addr, reg, self.buf)
-
-    def _read_reg(self, reg, width=8):
-        self.i2c.readfrom_mem_into(self.addr, reg, self.buf)
-        val = self.buf[0]
-        if width == 16:
-            val |= self._read_reg(reg + 1) << 8
-        return val
-
-    def _tigger_oneshot(self, b):
-        if self.oneshot:
-            self._write_reg(_LPS22_CTRL_REG2, self._read_reg(_LPS22_CTRL_REG2) | 0x01)
-            self._read_reg(0x28 + b * 2)
-            while True:
-                if self._read_reg(_LPS22_STATUS) & b:
-                    return
-                machine.idle()
-
-    def set_oneshot_mode(self, oneshot):
-        self._read_reg(_LPS22_CTRL_REG1)
-        self.oneshot = oneshot
-        if oneshot:
-            self.buf[0] &= 0x0F
-        else:
-            self.buf[0] |= 0x10
-        self._write_reg(_LPS22_CTRL_REG1, self.buf[0])
-
-    def pressure(self):
-        if self.oneshot:
-            self._tigger_oneshot(1)
-        return (
-            self._read_reg(_LPS22_PRESS_OUT_XL) + self._read_reg(_LPS22_PRESS_OUT_L, 16) * 256
-        ) / 4096
-
-    def temperature(self):
-        if self.oneshot:
-            self._tigger_oneshot(2)
-        return self._int16(self._read_reg(_LPS22_TEMP_OUT_L, 16)) / 100
-
-    def altitude(self):
-        return (
-            (((1013.25 / self.pressure()) ** (1 / 5.257)) - 1.0)
-            * (self.temperature() + 273.15)
-            / 0.0065
-        )
diff --git a/drivers/lps22h/manifest.py b/drivers/lps22h/manifest.py
deleted file mode 100644
index d30108d93dce0..0000000000000
--- a/drivers/lps22h/manifest.py
+++ /dev/null
@@ -1 +0,0 @@
-module("lps22h.py", opt=3)
diff --git a/drivers/lsm6dsox/lsm6dsox.py b/drivers/lsm6dsox/lsm6dsox.py
deleted file mode 100644
index 98e19fa4ca7b3..0000000000000
--- a/drivers/lsm6dsox/lsm6dsox.py
+++ /dev/null
@@ -1,271 +0,0 @@
-"""
-LSM6DSOX STMicro driver for MicroPython based on LSM9DS1:
-Source repo: https://github.com/hoihu/projects/tree/master/raspi-hat
-
-The MIT License (MIT)
-
-Copyright (c) 2021 Damien P. George
-Copyright (c) 2021-2022 Ibrahim Abdelkader <iabdalkader@openmv.io>
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
-Basic example usage:
-
-import time
-from lsm6dsox import LSM6DSOX
-
-from machine import Pin, SPI, I2C
-# Init in I2C mode.
-lsm = LSM6DSOX(I2C(0, scl=Pin(13), sda=Pin(12)))
-
-# Or init in SPI mode.
-#lsm = LSM6DSOX(SPI(5), cs_pin=Pin(10))
-
-while (True):
-    print('Accelerometer: x:{:>8.3f} y:{:>8.3f} z:{:>8.3f}'.format(*lsm.read_accel()))
-    print('Gyroscope:     x:{:>8.3f} y:{:>8.3f} z:{:>8.3f}'.format(*lsm.read_gyro()))
-    print("")
-    time.sleep_ms(100)
-"""
-
-import array
-from micropython import const
-
-
-class LSM6DSOX:
-    _CTRL3_C = const(0x12)
-    _CTRL1_XL = const(0x10)
-    _CTRL8_XL = const(0x17)
-    _CTRL9_XL = const(0x18)
-
-    _CTRL2_G = const(0x11)
-    _CTRL7_G = const(0x16)
-
-    _OUTX_L_G = const(0x22)
-    _OUTX_L_XL = const(0x28)
-    _MLC_STATUS = const(0x38)
-
-    _DEFAULT_ADDR = const(0x6A)
-    _WHO_AM_I_REG = const(0x0F)
-
-    _FUNC_CFG_ACCESS = const(0x01)
-    _FUNC_CFG_BANK_USER = const(0)
-    _FUNC_CFG_BANK_HUB = const(1)
-    _FUNC_CFG_BANK_EMBED = const(2)
-
-    _MLC0_SRC = const(0x70)
-    _MLC_INT1 = const(0x0D)
-    _TAP_CFG0 = const(0x56)
-
-    _EMB_FUNC_EN_A = const(0x04)
-    _EMB_FUNC_EN_B = const(0x05)
-
-    def __init__(
-        self,
-        bus,
-        cs_pin=None,
-        address=_DEFAULT_ADDR,
-        gyro_odr=104,
-        accel_odr=104,
-        gyro_scale=2000,
-        accel_scale=4,
-        ucf=None,
-    ):
-        """Initalizes Gyro and Accelerator.
-        accel_odr: (0, 1.6Hz, 3.33Hz, 6.66Hz, 12.5Hz, 26Hz, 52Hz, 104Hz, 208Hz, 416Hz, 888Hz)
-        gyro_odr:  (0, 1.6Hz, 3.33Hz, 6.66Hz, 12.5Hz, 26Hz, 52Hz, 104Hz, 208Hz, 416Hz, 888Hz)
-        gyro_scale:  (245dps, 500dps, 1000dps, 2000dps)
-        accel_scale: (+/-2g, +/-4g, +/-8g, +-16g)
-        ucf: MLC program to load.
-        """
-        self.bus = bus
-        self.cs_pin = cs_pin
-        self.address = address
-        self._use_i2c = hasattr(self.bus, "readfrom_mem")
-
-        if not self._use_i2c and cs_pin is None:
-            raise ValueError("A CS pin must be provided in SPI mode")
-
-        # check the id of the Accelerometer/Gyro
-        if self.__read_reg(_WHO_AM_I_REG) != 108:
-            raise OSError("No LSM6DS device was found at address 0x%x" % (self.address))
-
-        # allocate scratch buffer for efficient conversions and memread op's
-        self.scratch_int = array.array("h", [0, 0, 0])
-
-        SCALE_GYRO = {250: 0, 500: 1, 1000: 2, 2000: 3}
-        SCALE_ACCEL = {2: 0, 4: 2, 8: 3, 16: 1}
-        # XL_HM_MODE = 0 by default. G_HM_MODE = 0 by default.
-        ODR = {
-            0: 0x00,
-            1.6: 0x08,
-            3.33: 0x09,
-            6.66: 0x0A,
-            12.5: 0x01,
-            26: 0x02,
-            52: 0x03,
-            104: 0x04,
-            208: 0x05,
-            416: 0x06,
-            888: 0x07,
-        }
-
-        gyro_odr = round(gyro_odr, 2)
-        accel_odr = round(accel_odr, 2)
-
-        # Sanity checks
-        if not gyro_odr in ODR:
-            raise ValueError("Invalid sampling rate: %d" % accel_odr)
-        if not gyro_scale in SCALE_GYRO:
-            raise ValueError("invalid gyro scaling: %d" % gyro_scale)
-        if not accel_odr in ODR:
-            raise ValueError("Invalid sampling rate: %d" % accel_odr)
-        if not accel_scale in SCALE_ACCEL:
-            raise ValueError("invalid accelerometer scaling: %d" % accel_scale)
-
-        # Soft-reset the device.
-        self.reset()
-
-        # Load and configure MLC if UCF file is provided
-        if ucf != None:
-            self.load_mlc(ucf)
-
-        # Set Gyroscope datarate and scale.
-        # Note output from LPF2 second filtering stage is selected. See Figure 18.
-        self.__write_reg(_CTRL1_XL, (ODR[accel_odr] << 4) | (SCALE_ACCEL[accel_scale] << 2) | 2)
-
-        # Enable LPF2 and HPF fast-settling mode, ODR/4
-        self.__write_reg(_CTRL8_XL, 0x09)
-
-        # Set Gyroscope datarate and scale.
-        self.__write_reg(_CTRL2_G, (ODR[gyro_odr] << 4) | (SCALE_GYRO[gyro_scale] << 2) | 0)
-
-        self.gyro_scale = 32768 / gyro_scale
-        self.accel_scale = 32768 / accel_scale
-
-    def __read_reg(self, reg, size=1):
-        if self._use_i2c:
-            buf = self.bus.readfrom_mem(self.address, reg, size)
-        else:
-            try:
-                self.cs_pin(0)
-                self.bus.write(bytes([reg | 0x80]))
-                buf = self.bus.read(size)
-            finally:
-                self.cs_pin(1)
-        if size == 1:
-            return int(buf[0])
-        return [int(x) for x in buf]
-
-    def __write_reg(self, reg, val):
-        if self._use_i2c:
-            self.bus.writeto_mem(self.address, reg, bytes([val]))
-        else:
-            try:
-                self.cs_pin(0)
-                self.bus.write(bytes([reg, val]))
-            finally:
-                self.cs_pin(1)
-
-    def __read_reg_into(self, reg, buf):
-        if self._use_i2c:
-            self.bus.readfrom_mem_into(self.address, reg, buf)
-        else:
-            try:
-                self.cs_pin(0)
-                self.bus.write(bytes([reg | 0x80]))
-                self.bus.readinto(buf)
-            finally:
-                self.cs_pin(1)
-
-    def reset(self):
-        self.__write_reg(_CTRL3_C, self.__read_reg(_CTRL3_C) | 0x1)
-        for i in range(0, 10):
-            if (self.__read_reg(_CTRL3_C) & 0x01) == 0:
-                return
-            time.sleep_ms(10)
-        raise OSError("Failed to reset LSM6DS device.")
-
-    def set_mem_bank(self, bank):
-        cfg = self.__read_reg(_FUNC_CFG_ACCESS) & 0x3F
-        self.__write_reg(_FUNC_CFG_ACCESS, cfg | (bank << 6))
-
-    def set_embedded_functions(self, enable, emb_ab=None):
-        self.set_mem_bank(_FUNC_CFG_BANK_EMBED)
-        if enable:
-            self.__write_reg(_EMB_FUNC_EN_A, emb_ab[0])
-            self.__write_reg(_EMB_FUNC_EN_B, emb_ab[1])
-        else:
-            emb_a = self.__read_reg(_EMB_FUNC_EN_A)
-            emb_b = self.__read_reg(_EMB_FUNC_EN_B)
-            self.__write_reg(_EMB_FUNC_EN_A, (emb_a & 0xC7))
-            self.__write_reg(_EMB_FUNC_EN_B, (emb_b & 0xE6))
-            emb_ab = (emb_a, emb_b)
-
-        self.set_mem_bank(_FUNC_CFG_BANK_USER)
-        return emb_ab
-
-    def load_mlc(self, ucf):
-        # Load MLC config from file
-        with open(ucf, "r") as ucf_file:
-            for l in ucf_file:
-                if l.startswith("Ac"):
-                    v = [int(v, 16) for v in l.strip().split(" ")[1:3]]
-                    self.__write_reg(v[0], v[1])
-
-        emb_ab = self.set_embedded_functions(False)
-
-        # Disable I3C interface
-        self.__write_reg(_CTRL9_XL, self.__read_reg(_CTRL9_XL) | 0x01)
-
-        # Enable Block Data Update
-        self.__write_reg(_CTRL3_C, self.__read_reg(_CTRL3_C) | 0x40)
-
-        # Route signals on interrupt pin 1
-        self.set_mem_bank(_FUNC_CFG_BANK_EMBED)
-        self.__write_reg(_MLC_INT1, self.__read_reg(_MLC_INT1) & 0x01)
-        self.set_mem_bank(_FUNC_CFG_BANK_USER)
-
-        # Configure interrupt pin mode
-        self.__write_reg(_TAP_CFG0, self.__read_reg(_TAP_CFG0) | 0x41)
-
-        self.set_embedded_functions(True, emb_ab)
-
-    def read_mlc_output(self):
-        buf = None
-        if self.__read_reg(_MLC_STATUS) & 0x1:
-            self.__read_reg(0x1A, size=12)
-            self.set_mem_bank(_FUNC_CFG_BANK_EMBED)
-            buf = self.__read_reg(_MLC0_SRC, 8)
-            self.set_mem_bank(_FUNC_CFG_BANK_USER)
-        return buf
-
-    def read_gyro(self):
-        """Returns gyroscope vector in degrees/sec."""
-        mv = memoryview(self.scratch_int)
-        f = self.gyro_scale
-        self.__read_reg_into(_OUTX_L_G, mv)
-        return (mv[0] / f, mv[1] / f, mv[2] / f)
-
-    def read_accel(self):
-        """Returns acceleration vector in gravity units (9.81m/s^2)."""
-        mv = memoryview(self.scratch_int)
-        f = self.accel_scale
-        self.__read_reg_into(_OUTX_L_XL, mv)
-        return (mv[0] / f, mv[1] / f, mv[2] / f)
diff --git a/drivers/lsm6dsox/lsm6dsox_basic.py b/drivers/lsm6dsox/lsm6dsox_basic.py
deleted file mode 100644
index 0ffe9e92b7689..0000000000000
--- a/drivers/lsm6dsox/lsm6dsox_basic.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# LSM6DSOX Basic Example.
-import time
-from lsm6dsox import LSM6DSOX
-
-from machine import Pin, I2C
-
-lsm = LSM6DSOX(I2C(0, scl=Pin(13), sda=Pin(12)))
-# Or init in SPI mode.
-# lsm = LSM6DSOX(SPI(5), cs_pin=Pin(10))
-
-while True:
-    print("Accelerometer: x:{:>8.3f} y:{:>8.3f} z:{:>8.3f}".format(*lsm.read_accel()))
-    print("Gyroscope:     x:{:>8.3f} y:{:>8.3f} z:{:>8.3f}".format(*lsm.read_gyro()))
-    print("")
-    time.sleep_ms(100)
diff --git a/drivers/lsm6dsox/lsm6dsox_mlc.py b/drivers/lsm6dsox/lsm6dsox_mlc.py
deleted file mode 100644
index 866498d0ce13e..0000000000000
--- a/drivers/lsm6dsox/lsm6dsox_mlc.py
+++ /dev/null
@@ -1,48 +0,0 @@
-# LSM6DSOX IMU MLC (Machine Learning Core) Example.
-# Download the raw UCF file, copy to storage and reset.
-
-# NOTE: The pre-trained models (UCF files) for the examples can be found here:
-# https://github.com/STMicroelectronics/STMems_Machine_Learning_Core/tree/master/application_examples/lsm6dsox
-
-import time
-from lsm6dsox import LSM6DSOX
-from machine import Pin, I2C
-
-INT_MODE = True  # Run in interrupt mode.
-INT_FLAG = False  # Set True on interrupt.
-
-
-def imu_int_handler(pin):
-    global INT_FLAG
-    INT_FLAG = True
-
-
-if INT_MODE == True:
-    int_pin = Pin(24)
-    int_pin.irq(handler=imu_int_handler, trigger=Pin.IRQ_RISING)
-
-i2c = I2C(0, scl=Pin(13), sda=Pin(12))
-
-# Vibration detection example
-UCF_FILE = "lsm6dsox_vibration_monitoring.ucf"
-UCF_LABELS = {0: "no vibration", 1: "low vibration", 2: "high vibration"}
-# NOTE: Selected data rate and scale must match the MLC data rate and scale.
-lsm = LSM6DSOX(i2c, gyro_odr=26, accel_odr=26, gyro_scale=2000, accel_scale=4, ucf=UCF_FILE)
-
-# Head gestures example
-# UCF_FILE = "lsm6dsox_head_gestures.ucf"
-# UCF_LABELS = {0:"Nod", 1:"Shake", 2:"Stationary", 3:"Swing", 4:"Walk"}
-# NOTE: Selected data rate and scale must match the MLC data rate and scale.
-# lsm = LSM6DSOX(i2c, gyro_odr=26, accel_odr=26, gyro_scale=250, accel_scale=2, ucf=UCF_FILE)
-
-print("MLC configured...")
-
-while True:
-    if INT_MODE:
-        if INT_FLAG:
-            INT_FLAG = False
-            print(UCF_LABELS[lsm.read_mlc_output()[0]])
-    else:
-        buf = lsm.read_mlc_output()
-        if buf != None:
-            print(UCF_LABELS[buf[0]])
diff --git a/drivers/lsm6dsox/manifest.py b/drivers/lsm6dsox/manifest.py
deleted file mode 100644
index 28f4b3565e9f7..0000000000000
--- a/drivers/lsm6dsox/manifest.py
+++ /dev/null
@@ -1 +0,0 @@
-module("lsm6dsox.py", opt=3)
diff --git a/drivers/lsm9ds1/lsm9ds1.py b/drivers/lsm9ds1/lsm9ds1.py
deleted file mode 100644
index 5d9942a7b3469..0000000000000
--- a/drivers/lsm9ds1/lsm9ds1.py
+++ /dev/null
@@ -1,189 +0,0 @@
-"""
-The MIT License (MIT)
-
-Copyright (c) 2013, 2014 Damien P. George
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
-
-LSM9DS1 - 9DOF inertial sensor of STMicro driver for MicroPython.
-The sensor contains an accelerometer / gyroscope / magnetometer
-Uses the internal FIFO to store up to 16 gyro/accel data, use the iter_accel_gyro generator to access it.
-
-Example usage:
-
-import time
-from lsm9ds1 import LSM9DS1
-from machine import Pin, I2C
-
-lsm = LSM9DS1(I2C(1, scl=Pin(15), sda=Pin(14)))
-
-while (True):
-    #for g,a in lsm.iter_accel_gyro(): print(g,a)    # using fifo
-    print('Accelerometer: x:{:>8.3f} y:{:>8.3f} z:{:>8.3f}'.format(*lsm.accel()))
-    print('Magnetometer:  x:{:>8.3f} y:{:>8.3f} z:{:>8.3f}'.format(*lsm.magnet()))
-    print('Gyroscope:     x:{:>8.3f} y:{:>8.3f} z:{:>8.3f}'.format(*lsm.gyro()))
-    print("")
-    time.sleep_ms(100)
-"""
-import array
-
-
-_WHO_AM_I = const(0xF)
-_CTRL_REG1_G = const(0x10)
-_INT_GEN_SRC_G = const(0x14)
-_OUT_TEMP = const(0x15)
-_OUT_G = const(0x18)
-_CTRL_REG4_G = const(0x1E)
-_STATUS_REG = const(0x27)
-_OUT_XL = const(0x28)
-_FIFO_CTRL_REG = const(0x2E)
-_FIFO_SRC = const(0x2F)
-_OFFSET_REG_X_M = const(0x05)
-_CTRL_REG1_M = const(0x20)
-_OUT_M = const(0x28)
-_SCALE_GYRO = const(((245, 0), (500, 1), (2000, 3)))
-_SCALE_ACCEL = const(((2, 0), (4, 2), (8, 3), (16, 1)))
-
-
-class LSM9DS1:
-    def __init__(self, i2c, address_gyro=0x6B, address_magnet=0x1E):
-        self.i2c = i2c
-        self.address_gyro = address_gyro
-        self.address_magnet = address_magnet
-        # check id's of accelerometer/gyro and magnetometer
-        if (self.magent_id() != b"=") or (self.gyro_id() != b"h"):
-            raise OSError(
-                "Invalid LSM9DS1 device, using address {}/{}".format(address_gyro, address_magnet)
-            )
-        # allocate scratch buffer for efficient conversions and memread op's
-        self.scratch = array.array("B", [0, 0, 0, 0, 0, 0])
-        self.scratch_int = array.array("h", [0, 0, 0])
-        self.init_gyro_accel()
-        self.init_magnetometer()
-
-    def init_gyro_accel(self, sample_rate=6, scale_gyro=0, scale_accel=0):
-        """Initalizes Gyro and Accelerator.
-        sample rate: 0-6 (off, 14.9Hz, 59.5Hz, 119Hz, 238Hz, 476Hz, 952Hz)
-        scale_gyro: 0-2 (245dps, 500dps, 2000dps )
-        scale_accel: 0-3 (+/-2g, +/-4g, +/-8g, +-16g)
-        """
-        assert sample_rate <= 6, "invalid sampling rate: %d" % sample_rate
-        assert scale_gyro <= 2, "invalid gyro scaling: %d" % scale_gyro
-        assert scale_accel <= 3, "invalid accelerometer scaling: %d" % scale_accel
-
-        i2c = self.i2c
-        addr = self.address_gyro
-        mv = memoryview(self.scratch)
-        # angular control registers 1-3 / Orientation
-        mv[0] = ((sample_rate & 0x07) << 5) | ((_SCALE_GYRO[scale_gyro][1] & 0x3) << 3)
-        mv[1:4] = b"\x00\x00\x00"
-        i2c.writeto_mem(addr, _CTRL_REG1_G, mv[:5])
-        # ctrl4 - enable x,y,z, outputs, no irq latching, no 4D
-        # ctrl5 - enable all axes, no decimation
-        # ctrl6 - set scaling and sample rate of accel
-        # ctrl7,8 - leave at default values
-        # ctrl9 - FIFO enabled
-        mv[0] = mv[1] = 0x38
-        mv[2] = ((sample_rate & 7) << 5) | ((_SCALE_ACCEL[scale_accel][1] & 0x3) << 3)
-        mv[3] = 0x00
-        mv[4] = 0x4
-        mv[5] = 0x2
-        i2c.writeto_mem(addr, _CTRL_REG4_G, mv[:6])
-
-        # fifo: use continous mode (overwrite old data if overflow)
-        i2c.writeto_mem(addr, _FIFO_CTRL_REG, b"\x00")
-        i2c.writeto_mem(addr, _FIFO_CTRL_REG, b"\xc0")
-
-        self.scale_gyro = 32768 / _SCALE_GYRO[scale_gyro][0]
-        self.scale_accel = 32768 / _SCALE_ACCEL[scale_accel][0]
-
-    def init_magnetometer(self, sample_rate=7, scale_magnet=0):
-        """
-        sample rates = 0-7 (0.625, 1.25, 2.5, 5, 10, 20, 40, 80Hz)
-        scaling = 0-3 (+/-4, +/-8, +/-12, +/-16 Gauss)
-        """
-        assert sample_rate < 8, "invalid sample rate: %d (0-7)" % sample_rate
-        assert scale_magnet < 4, "invalid scaling: %d (0-3)" % scale_magnet
-        i2c = self.i2c
-        addr = self.address_magnet
-        mv = memoryview(self.scratch)
-        mv[0] = 0x40 | (sample_rate << 2)  # ctrl1: high performance mode
-        mv[1] = scale_magnet << 5  # ctrl2: scale, normal mode, no reset
-        mv[2] = 0x00  # ctrl3: continous conversion, no low power, I2C
-        mv[3] = 0x08  # ctrl4: high performance z-axis
-        mv[4] = 0x00  # ctr5: no fast read, no block update
-        i2c.writeto_mem(addr, _CTRL_REG1_M, mv[:5])
-        self.scale_factor_magnet = 32768 / ((scale_magnet + 1) * 4)
-
-    def calibrate_magnet(self, offset):
-        """
-        offset is a magnet vecor that will be substracted by the magnetometer
-        for each measurement. It is written to the magnetometer's offset register
-        """
-        offset = [int(i * self.scale_factor_magnet) for i in offset]
-        mv = memoryview(self.scratch)
-        mv[0] = offset[0] & 0xFF
-        mv[1] = offset[0] >> 8
-        mv[2] = offset[1] & 0xFF
-        mv[3] = offset[1] >> 8
-        mv[4] = offset[2] & 0xFF
-        mv[5] = offset[2] >> 8
-        self.i2c.writeto_mem(self.address_magnet, _OFFSET_REG_X_M, mv[:6])
-
-    def gyro_id(self):
-        return self.i2c.readfrom_mem(self.address_gyro, _WHO_AM_I, 1)
-
-    def magent_id(self):
-        return self.i2c.readfrom_mem(self.address_magnet, _WHO_AM_I, 1)
-
-    def magnet(self):
-        """Returns magnetometer vector in gauss.
-        raw_values: if True, the non-scaled adc values are returned
-        """
-        mv = memoryview(self.scratch_int)
-        f = self.scale_factor_magnet
-        self.i2c.readfrom_mem_into(self.address_magnet, _OUT_M | 0x80, mv)
-        return (mv[0] / f, mv[1] / f, mv[2] / f)
-
-    def gyro(self):
-        """Returns gyroscope vector in degrees/sec."""
-        mv = memoryview(self.scratch_int)
-        f = self.scale_gyro
-        self.i2c.readfrom_mem_into(self.address_gyro, _OUT_G | 0x80, mv)
-        return (mv[0] / f, mv[1] / f, mv[2] / f)
-
-    def accel(self):
-        """Returns acceleration vector in gravity units (9.81m/s^2)."""
-        mv = memoryview(self.scratch_int)
-        f = self.scale_accel
-        self.i2c.readfrom_mem_into(self.address_gyro, _OUT_XL | 0x80, mv)
-        return (mv[0] / f, mv[1] / f, mv[2] / f)
-
-    def iter_accel_gyro(self):
-        """A generator that returns tuples of (gyro,accelerometer) data from the fifo."""
-        while True:
-            fifo_state = int.from_bytes(
-                self.i2c.readfrom_mem(self.address_gyro, _FIFO_SRC, 1), "big"
-            )
-            if fifo_state & 0x3F:
-                # print("Available samples=%d" % (fifo_state & 0x1f))
-                yield self.gyro(), self.accel()
-            else:
-                break
diff --git a/drivers/lsm9ds1/manifest.py b/drivers/lsm9ds1/manifest.py
deleted file mode 100644
index 6779362de7ee5..0000000000000
--- a/drivers/lsm9ds1/manifest.py
+++ /dev/null
@@ -1 +0,0 @@
-module("lsm9ds1.py", opt=3)
diff --git a/drivers/neopixel/manifest.py b/drivers/neopixel/manifest.py
deleted file mode 100644
index 561d19574af32..0000000000000
--- a/drivers/neopixel/manifest.py
+++ /dev/null
@@ -1 +0,0 @@
-module("neopixel.py", opt=3)
diff --git a/drivers/neopixel/neopixel.py b/drivers/neopixel/neopixel.py
deleted file mode 100644
index caa12dc845361..0000000000000
--- a/drivers/neopixel/neopixel.py
+++ /dev/null
@@ -1,50 +0,0 @@
-# NeoPixel driver for MicroPython
-# MIT license; Copyright (c) 2016 Damien P. George, 2021 Jim Mussared
-
-from machine import bitstream
-
-
-class NeoPixel:
-    # G R B W
-    ORDER = (1, 0, 2, 3)
-
-    def __init__(self, pin, n, bpp=3, timing=1):
-        self.pin = pin
-        self.n = n
-        self.bpp = bpp
-        self.buf = bytearray(n * bpp)
-        self.pin.init(pin.OUT)
-        # Timing arg can either be 1 for 800kHz or 0 for 400kHz,
-        # or a user-specified timing ns tuple (high_0, low_0, high_1, low_1).
-        self.timing = (
-            ((400, 850, 800, 450) if timing else (800, 1700, 1600, 900))
-            if isinstance(timing, int)
-            else timing
-        )
-
-    def __len__(self):
-        return self.n
-
-    def __setitem__(self, i, v):
-        offset = i * self.bpp
-        for i in range(self.bpp):
-            self.buf[offset + self.ORDER[i]] = v[i]
-
-    def __getitem__(self, i):
-        offset = i * self.bpp
-        return tuple(self.buf[offset + self.ORDER[i]] for i in range(self.bpp))
-
-    def fill(self, v):
-        b = self.buf
-        l = len(self.buf)
-        bpp = self.bpp
-        for i in range(bpp):
-            c = v[i]
-            j = self.ORDER[i]
-            while j < l:
-                b[j] = c
-                j += bpp
-
-    def write(self):
-        # BITSTREAM_TYPE_HIGH_LOW = 0
-        bitstream(self.pin, 0, self.timing, self.buf)
diff --git a/drivers/nrf24l01/manifest.py b/drivers/nrf24l01/manifest.py
deleted file mode 100644
index babdb7a52a953..0000000000000
--- a/drivers/nrf24l01/manifest.py
+++ /dev/null
@@ -1 +0,0 @@
-module("nrf24l01.py", opt=3)
diff --git a/drivers/nrf24l01/nrf24l01.py b/drivers/nrf24l01/nrf24l01.py
deleted file mode 100644
index 76d55312f8568..0000000000000
--- a/drivers/nrf24l01/nrf24l01.py
+++ /dev/null
@@ -1,252 +0,0 @@
-"""NRF24L01 driver for MicroPython
-"""
-
-from micropython import const
-import utime
-
-# nRF24L01+ registers
-CONFIG = const(0x00)
-EN_RXADDR = const(0x02)
-SETUP_AW = const(0x03)
-SETUP_RETR = const(0x04)
-RF_CH = const(0x05)
-RF_SETUP = const(0x06)
-STATUS = const(0x07)
-RX_ADDR_P0 = const(0x0A)
-TX_ADDR = const(0x10)
-RX_PW_P0 = const(0x11)
-FIFO_STATUS = const(0x17)
-DYNPD = const(0x1C)
-
-# CONFIG register
-EN_CRC = const(0x08)  # enable CRC
-CRCO = const(0x04)  # CRC encoding scheme; 0=1 byte, 1=2 bytes
-PWR_UP = const(0x02)  # 1=power up, 0=power down
-PRIM_RX = const(0x01)  # RX/TX control; 0=PTX, 1=PRX
-
-# RF_SETUP register
-POWER_0 = const(0x00)  # -18 dBm
-POWER_1 = const(0x02)  # -12 dBm
-POWER_2 = const(0x04)  # -6 dBm
-POWER_3 = const(0x06)  # 0 dBm
-SPEED_1M = const(0x00)
-SPEED_2M = const(0x08)
-SPEED_250K = const(0x20)
-
-# STATUS register
-RX_DR = const(0x40)  # RX data ready; write 1 to clear
-TX_DS = const(0x20)  # TX data sent; write 1 to clear
-MAX_RT = const(0x10)  # max retransmits reached; write 1 to clear
-
-# FIFO_STATUS register
-RX_EMPTY = const(0x01)  # 1 if RX FIFO is empty
-
-# constants for instructions
-R_RX_PL_WID = const(0x60)  # read RX payload width
-R_RX_PAYLOAD = const(0x61)  # read RX payload
-W_TX_PAYLOAD = const(0xA0)  # write TX payload
-FLUSH_TX = const(0xE1)  # flush TX FIFO
-FLUSH_RX = const(0xE2)  # flush RX FIFO
-NOP = const(0xFF)  # use to read STATUS register
-
-
-class NRF24L01:
-    def __init__(self, spi, cs, ce, channel=46, payload_size=16):
-        assert payload_size <= 32
-
-        self.buf = bytearray(1)
-
-        # store the pins
-        self.spi = spi
-        self.cs = cs
-        self.ce = ce
-
-        # init the SPI bus and pins
-        self.init_spi(4000000)
-
-        # reset everything
-        ce.init(ce.OUT, value=0)
-        cs.init(cs.OUT, value=1)
-
-        self.payload_size = payload_size
-        self.pipe0_read_addr = None
-        utime.sleep_ms(5)
-
-        # set address width to 5 bytes and check for device present
-        self.reg_write(SETUP_AW, 0b11)
-        if self.reg_read(SETUP_AW) != 0b11:
-            raise OSError("nRF24L01+ Hardware not responding")
-
-        # disable dynamic payloads
-        self.reg_write(DYNPD, 0)
-
-        # auto retransmit delay: 1750us
-        # auto retransmit count: 8
-        self.reg_write(SETUP_RETR, (6 << 4) | 8)
-
-        # set rf power and speed
-        self.set_power_speed(POWER_3, SPEED_250K)  # Best for point to point links
-
-        # init CRC
-        self.set_crc(2)
-
-        # clear status flags
-        self.reg_write(STATUS, RX_DR | TX_DS | MAX_RT)
-
-        # set channel
-        self.set_channel(channel)
-
-        # flush buffers
-        self.flush_rx()
-        self.flush_tx()
-
-    def init_spi(self, baudrate):
-        try:
-            master = self.spi.MASTER
-        except AttributeError:
-            self.spi.init(baudrate=baudrate, polarity=0, phase=0)
-        else:
-            self.spi.init(master, baudrate=baudrate, polarity=0, phase=0)
-
-    def reg_read(self, reg):
-        self.cs(0)
-        self.spi.readinto(self.buf, reg)
-        self.spi.readinto(self.buf)
-        self.cs(1)
-        return self.buf[0]
-
-    def reg_write_bytes(self, reg, buf):
-        self.cs(0)
-        self.spi.readinto(self.buf, 0x20 | reg)
-        self.spi.write(buf)
-        self.cs(1)
-        return self.buf[0]
-
-    def reg_write(self, reg, value):
-        self.cs(0)
-        self.spi.readinto(self.buf, 0x20 | reg)
-        ret = self.buf[0]
-        self.spi.readinto(self.buf, value)
-        self.cs(1)
-        return ret
-
-    def flush_rx(self):
-        self.cs(0)
-        self.spi.readinto(self.buf, FLUSH_RX)
-        self.cs(1)
-
-    def flush_tx(self):
-        self.cs(0)
-        self.spi.readinto(self.buf, FLUSH_TX)
-        self.cs(1)
-
-    # power is one of POWER_x defines; speed is one of SPEED_x defines
-    def set_power_speed(self, power, speed):
-        setup = self.reg_read(RF_SETUP) & 0b11010001
-        self.reg_write(RF_SETUP, setup | power | speed)
-
-    # length in bytes: 0, 1 or 2
-    def set_crc(self, length):
-        config = self.reg_read(CONFIG) & ~(CRCO | EN_CRC)
-        if length == 0:
-            pass
-        elif length == 1:
-            config |= EN_CRC
-        else:
-            config |= EN_CRC | CRCO
-        self.reg_write(CONFIG, config)
-
-    def set_channel(self, channel):
-        self.reg_write(RF_CH, min(channel, 125))
-
-    # address should be a bytes object 5 bytes long
-    def open_tx_pipe(self, address):
-        assert len(address) == 5
-        self.reg_write_bytes(RX_ADDR_P0, address)
-        self.reg_write_bytes(TX_ADDR, address)
-        self.reg_write(RX_PW_P0, self.payload_size)
-
-    # address should be a bytes object 5 bytes long
-    # pipe 0 and 1 have 5 byte address
-    # pipes 2-5 use same 4 most-significant bytes as pipe 1, plus 1 extra byte
-    def open_rx_pipe(self, pipe_id, address):
-        assert len(address) == 5
-        assert 0 <= pipe_id <= 5
-        if pipe_id == 0:
-            self.pipe0_read_addr = address
-        if pipe_id < 2:
-            self.reg_write_bytes(RX_ADDR_P0 + pipe_id, address)
-        else:
-            self.reg_write(RX_ADDR_P0 + pipe_id, address[0])
-        self.reg_write(RX_PW_P0 + pipe_id, self.payload_size)
-        self.reg_write(EN_RXADDR, self.reg_read(EN_RXADDR) | (1 << pipe_id))
-
-    def start_listening(self):
-        self.reg_write(CONFIG, self.reg_read(CONFIG) | PWR_UP | PRIM_RX)
-        self.reg_write(STATUS, RX_DR | TX_DS | MAX_RT)
-
-        if self.pipe0_read_addr is not None:
-            self.reg_write_bytes(RX_ADDR_P0, self.pipe0_read_addr)
-
-        self.flush_rx()
-        self.flush_tx()
-        self.ce(1)
-        utime.sleep_us(130)
-
-    def stop_listening(self):
-        self.ce(0)
-        self.flush_tx()
-        self.flush_rx()
-
-    # returns True if any data available to recv
-    def any(self):
-        return not bool(self.reg_read(FIFO_STATUS) & RX_EMPTY)
-
-    def recv(self):
-        # get the data
-        self.cs(0)
-        self.spi.readinto(self.buf, R_RX_PAYLOAD)
-        buf = self.spi.read(self.payload_size)
-        self.cs(1)
-        # clear RX ready flag
-        self.reg_write(STATUS, RX_DR)
-
-        return buf
-
-    # blocking wait for tx complete
-    def send(self, buf, timeout=500):
-        self.send_start(buf)
-        start = utime.ticks_ms()
-        result = None
-        while result is None and utime.ticks_diff(utime.ticks_ms(), start) < timeout:
-            result = self.send_done()  # 1 == success, 2 == fail
-        if result == 2:
-            raise OSError("send failed")
-
-    # non-blocking tx
-    def send_start(self, buf):
-        # power up
-        self.reg_write(CONFIG, (self.reg_read(CONFIG) | PWR_UP) & ~PRIM_RX)
-        utime.sleep_us(150)
-        # send the data
-        self.cs(0)
-        self.spi.readinto(self.buf, W_TX_PAYLOAD)
-        self.spi.write(buf)
-        if len(buf) < self.payload_size:
-            self.spi.write(b"\x00" * (self.payload_size - len(buf)))  # pad out data
-        self.cs(1)
-
-        # enable the chip so it can send the data
-        self.ce(1)
-        utime.sleep_us(15)  # needs to be >10us
-        self.ce(0)
-
-    # returns None if send still in progress, 1 for success, 2 for fail
-    def send_done(self):
-        if not (self.reg_read(STATUS) & (TX_DS | MAX_RT)):
-            return None  # tx not finished
-
-        # either finished or failed: get and clear status flags, power down
-        status = self.reg_write(STATUS, RX_DR | TX_DS | MAX_RT)
-        self.reg_write(CONFIG, self.reg_read(CONFIG) & ~PWR_UP)
-        return 1 if status & TX_DS else 2
diff --git a/drivers/nrf24l01/nrf24l01test.py b/drivers/nrf24l01/nrf24l01test.py
deleted file mode 100644
index 56bdb6e26eb9c..0000000000000
--- a/drivers/nrf24l01/nrf24l01test.py
+++ /dev/null
@@ -1,150 +0,0 @@
-"""Test for nrf24l01 module.  Portable between MicroPython targets."""
-
-import usys
-import ustruct as struct
-import utime
-from machine import Pin, SPI
-from nrf24l01 import NRF24L01
-from micropython import const
-
-# Slave pause between receiving data and checking for further packets.
-_RX_POLL_DELAY = const(15)
-# Slave pauses an additional _SLAVE_SEND_DELAY ms after receiving data and before
-# transmitting to allow the (remote) master time to get into receive mode. The
-# master may be a slow device. Value tested with Pyboard, ESP32 and ESP8266.
-_SLAVE_SEND_DELAY = const(10)
-
-if usys.platform == "pyboard":
-    cfg = {"spi": 2, "miso": "Y7", "mosi": "Y8", "sck": "Y6", "csn": "Y5", "ce": "Y4"}
-elif usys.platform == "esp8266":  # Hardware SPI
-    cfg = {"spi": 1, "miso": 12, "mosi": 13, "sck": 14, "csn": 4, "ce": 5}
-elif usys.platform == "esp32":  # Software SPI
-    cfg = {"spi": -1, "miso": 32, "mosi": 33, "sck": 25, "csn": 26, "ce": 27}
-else:
-    raise ValueError("Unsupported platform {}".format(usys.platform))
-
-# Addresses are in little-endian format. They correspond to big-endian
-# 0xf0f0f0f0e1, 0xf0f0f0f0d2
-pipes = (b"\xe1\xf0\xf0\xf0\xf0", b"\xd2\xf0\xf0\xf0\xf0")
-
-
-def master():
-    csn = Pin(cfg["csn"], mode=Pin.OUT, value=1)
-    ce = Pin(cfg["ce"], mode=Pin.OUT, value=0)
-    if cfg["spi"] == -1:
-        spi = SPI(-1, sck=Pin(cfg["sck"]), mosi=Pin(cfg["mosi"]), miso=Pin(cfg["miso"]))
-        nrf = NRF24L01(spi, csn, ce, payload_size=8)
-    else:
-        nrf = NRF24L01(SPI(cfg["spi"]), csn, ce, payload_size=8)
-
-    nrf.open_tx_pipe(pipes[0])
-    nrf.open_rx_pipe(1, pipes[1])
-    nrf.start_listening()
-
-    num_needed = 16
-    num_successes = 0
-    num_failures = 0
-    led_state = 0
-
-    print("NRF24L01 master mode, sending %d packets..." % num_needed)
-
-    while num_successes < num_needed and num_failures < num_needed:
-        # stop listening and send packet
-        nrf.stop_listening()
-        millis = utime.ticks_ms()
-        led_state = max(1, (led_state << 1) & 0x0F)
-        print("sending:", millis, led_state)
-        try:
-            nrf.send(struct.pack("ii", millis, led_state))
-        except OSError:
-            pass
-
-        # start listening again
-        nrf.start_listening()
-
-        # wait for response, with 250ms timeout
-        start_time = utime.ticks_ms()
-        timeout = False
-        while not nrf.any() and not timeout:
-            if utime.ticks_diff(utime.ticks_ms(), start_time) > 250:
-                timeout = True
-
-        if timeout:
-            print("failed, response timed out")
-            num_failures += 1
-
-        else:
-            # recv packet
-            (got_millis,) = struct.unpack("i", nrf.recv())
-
-            # print response and round-trip delay
-            print(
-                "got response:",
-                got_millis,
-                "(delay",
-                utime.ticks_diff(utime.ticks_ms(), got_millis),
-                "ms)",
-            )
-            num_successes += 1
-
-        # delay then loop
-        utime.sleep_ms(250)
-
-    print("master finished sending; successes=%d, failures=%d" % (num_successes, num_failures))
-
-
-def slave():
-    csn = Pin(cfg["csn"], mode=Pin.OUT, value=1)
-    ce = Pin(cfg["ce"], mode=Pin.OUT, value=0)
-    if cfg["spi"] == -1:
-        spi = SPI(-1, sck=Pin(cfg["sck"]), mosi=Pin(cfg["mosi"]), miso=Pin(cfg["miso"]))
-        nrf = NRF24L01(spi, csn, ce, payload_size=8)
-    else:
-        nrf = NRF24L01(SPI(cfg["spi"]), csn, ce, payload_size=8)
-
-    nrf.open_tx_pipe(pipes[1])
-    nrf.open_rx_pipe(1, pipes[0])
-    nrf.start_listening()
-
-    print("NRF24L01 slave mode, waiting for packets... (ctrl-C to stop)")
-
-    while True:
-        if nrf.any():
-            while nrf.any():
-                buf = nrf.recv()
-                millis, led_state = struct.unpack("ii", buf)
-                print("received:", millis, led_state)
-                for led in leds:
-                    if led_state & 1:
-                        led.on()
-                    else:
-                        led.off()
-                    led_state >>= 1
-                utime.sleep_ms(_RX_POLL_DELAY)
-
-            # Give master time to get into receive mode.
-            utime.sleep_ms(_SLAVE_SEND_DELAY)
-            nrf.stop_listening()
-            try:
-                nrf.send(struct.pack("i", millis))
-            except OSError:
-                pass
-            print("sent response")
-            nrf.start_listening()
-
-
-try:
-    import pyb
-
-    leds = [pyb.LED(i + 1) for i in range(4)]
-except:
-    leds = []
-
-print("NRF24L01 test module loaded")
-print("NRF24L01 pinout for test:")
-print("    CE on", cfg["ce"])
-print("    CSN on", cfg["csn"])
-print("    SCK on", cfg["sck"])
-print("    MISO on", cfg["miso"])
-print("    MOSI on", cfg["mosi"])
-print("run nrf24l01test.slave() on slave, then nrf24l01test.master() on master")
diff --git a/drivers/onewire/ds18x20.py b/drivers/onewire/ds18x20.py
deleted file mode 100644
index ad2d9f52cdd00..0000000000000
--- a/drivers/onewire/ds18x20.py
+++ /dev/null
@@ -1,52 +0,0 @@
-# DS18x20 temperature sensor driver for MicroPython.
-# MIT license; Copyright (c) 2016 Damien P. George
-
-from micropython import const
-
-_CONVERT = const(0x44)
-_RD_SCRATCH = const(0xBE)
-_WR_SCRATCH = const(0x4E)
-
-
-class DS18X20:
-    def __init__(self, onewire):
-        self.ow = onewire
-        self.buf = bytearray(9)
-
-    def scan(self):
-        return [rom for rom in self.ow.scan() if rom[0] in (0x10, 0x22, 0x28)]
-
-    def convert_temp(self):
-        self.ow.reset(True)
-        self.ow.writebyte(self.ow.SKIP_ROM)
-        self.ow.writebyte(_CONVERT)
-
-    def read_scratch(self, rom):
-        self.ow.reset(True)
-        self.ow.select_rom(rom)
-        self.ow.writebyte(_RD_SCRATCH)
-        self.ow.readinto(self.buf)
-        if self.ow.crc8(self.buf):
-            raise Exception("CRC error")
-        return self.buf
-
-    def write_scratch(self, rom, buf):
-        self.ow.reset(True)
-        self.ow.select_rom(rom)
-        self.ow.writebyte(_WR_SCRATCH)
-        self.ow.write(buf)
-
-    def read_temp(self, rom):
-        buf = self.read_scratch(rom)
-        if rom[0] == 0x10:
-            if buf[1]:
-                t = buf[0] >> 1 | 0x80
-                t = -((~t + 1) & 0xFF)
-            else:
-                t = buf[0] >> 1
-            return t - 0.25 + (buf[7] - buf[6]) / buf[7]
-        else:
-            t = buf[1] << 8 | buf[0]
-            if t & 0x8000:  # sign bit set
-                t = -((t ^ 0xFFFF) + 1)
-            return t / 16
diff --git a/drivers/onewire/manifest.py b/drivers/onewire/manifest.py
deleted file mode 100644
index f500a65d780b8..0000000000000
--- a/drivers/onewire/manifest.py
+++ /dev/null
@@ -1,6 +0,0 @@
-options.defaults(ds18x20=False)
-
-module("onewire.py", opt=3)
-
-if options.ds18x20:
-    module("ds18x20.py", opt=3)
diff --git a/drivers/onewire/onewire.py b/drivers/onewire/onewire.py
deleted file mode 100644
index 4c6da741c74ce..0000000000000
--- a/drivers/onewire/onewire.py
+++ /dev/null
@@ -1,92 +0,0 @@
-# 1-Wire driver for MicroPython
-# MIT license; Copyright (c) 2016 Damien P. George
-
-import _onewire as _ow
-
-
-class OneWireError(Exception):
-    pass
-
-
-class OneWire:
-    SEARCH_ROM = 0xF0
-    MATCH_ROM = 0x55
-    SKIP_ROM = 0xCC
-
-    def __init__(self, pin):
-        self.pin = pin
-        self.pin.init(pin.OPEN_DRAIN, pin.PULL_UP)
-
-    def reset(self, required=False):
-        reset = _ow.reset(self.pin)
-        if required and not reset:
-            raise OneWireError
-        return reset
-
-    def readbit(self):
-        return _ow.readbit(self.pin)
-
-    def readbyte(self):
-        return _ow.readbyte(self.pin)
-
-    def readinto(self, buf):
-        for i in range(len(buf)):
-            buf[i] = _ow.readbyte(self.pin)
-
-    def writebit(self, value):
-        return _ow.writebit(self.pin, value)
-
-    def writebyte(self, value):
-        return _ow.writebyte(self.pin, value)
-
-    def write(self, buf):
-        for b in buf:
-            _ow.writebyte(self.pin, b)
-
-    def select_rom(self, rom):
-        self.reset()
-        self.writebyte(self.MATCH_ROM)
-        self.write(rom)
-
-    def scan(self):
-        devices = []
-        diff = 65
-        rom = False
-        for i in range(0xFF):
-            rom, diff = self._search_rom(rom, diff)
-            if rom:
-                devices += [rom]
-            if diff == 0:
-                break
-        return devices
-
-    def _search_rom(self, l_rom, diff):
-        if not self.reset():
-            return None, 0
-        self.writebyte(self.SEARCH_ROM)
-        if not l_rom:
-            l_rom = bytearray(8)
-        rom = bytearray(8)
-        next_diff = 0
-        i = 64
-        for byte in range(8):
-            r_b = 0
-            for bit in range(8):
-                b = self.readbit()
-                if self.readbit():
-                    if b:  # there are no devices or there is an error on the bus
-                        return None, 0
-                else:
-                    if not b:  # collision, two devices with different bit meaning
-                        if diff > i or ((l_rom[byte] & (1 << bit)) and diff != i):
-                            b = 1
-                            next_diff = i
-                self.writebit(b)
-                if b:
-                    r_b |= 1 << bit
-                i -= 1
-            rom[byte] = r_b
-        return rom, next_diff
-
-    def crc8(self, data):
-        return _ow.crc8(data)
diff --git a/drivers/sdcard/manifest.py b/drivers/sdcard/manifest.py
deleted file mode 100644
index e584b97d9ca6f..0000000000000
--- a/drivers/sdcard/manifest.py
+++ /dev/null
@@ -1 +0,0 @@
-module("sdcard.py", opt=3)
diff --git a/drivers/sdcard/sdcard.py b/drivers/sdcard/sdcard.py
deleted file mode 100644
index df28bd9534482..0000000000000
--- a/drivers/sdcard/sdcard.py
+++ /dev/null
@@ -1,299 +0,0 @@
-"""
-MicroPython driver for SD cards using SPI bus.
-
-Requires an SPI bus and a CS pin.  Provides readblocks and writeblocks
-methods so the device can be mounted as a filesystem.
-
-Example usage on pyboard:
-
-    import pyb, sdcard, os
-    sd = sdcard.SDCard(pyb.SPI(1), pyb.Pin.board.X5)
-    pyb.mount(sd, '/sd2')
-    os.listdir('/')
-
-Example usage on ESP8266:
-
-    import machine, sdcard, os
-    sd = sdcard.SDCard(machine.SPI(1), machine.Pin(15))
-    os.mount(sd, '/sd')
-    os.listdir('/')
-
-"""
-
-from micropython import const
-import time
-
-
-_CMD_TIMEOUT = const(100)
-
-_R1_IDLE_STATE = const(1 << 0)
-# R1_ERASE_RESET = const(1 << 1)
-_R1_ILLEGAL_COMMAND = const(1 << 2)
-# R1_COM_CRC_ERROR = const(1 << 3)
-# R1_ERASE_SEQUENCE_ERROR = const(1 << 4)
-# R1_ADDRESS_ERROR = const(1 << 5)
-# R1_PARAMETER_ERROR = const(1 << 6)
-_TOKEN_CMD25 = const(0xFC)
-_TOKEN_STOP_TRAN = const(0xFD)
-_TOKEN_DATA = const(0xFE)
-
-
-class SDCard:
-    def __init__(self, spi, cs, baudrate=1320000):
-        self.spi = spi
-        self.cs = cs
-
-        self.cmdbuf = bytearray(6)
-        self.dummybuf = bytearray(512)
-        self.tokenbuf = bytearray(1)
-        for i in range(512):
-            self.dummybuf[i] = 0xFF
-        self.dummybuf_memoryview = memoryview(self.dummybuf)
-
-        # initialise the card
-        self.init_card(baudrate)
-
-    def init_spi(self, baudrate):
-        try:
-            master = self.spi.MASTER
-        except AttributeError:
-            # on ESP8266
-            self.spi.init(baudrate=baudrate, phase=0, polarity=0)
-        else:
-            # on pyboard
-            self.spi.init(master, baudrate=baudrate, phase=0, polarity=0)
-
-    def init_card(self, baudrate):
-
-        # init CS pin
-        self.cs.init(self.cs.OUT, value=1)
-
-        # init SPI bus; use low data rate for initialisation
-        self.init_spi(100000)
-
-        # clock card at least 100 cycles with cs high
-        for i in range(16):
-            self.spi.write(b"\xff")
-
-        # CMD0: init card; should return _R1_IDLE_STATE (allow 5 attempts)
-        for _ in range(5):
-            if self.cmd(0, 0, 0x95) == _R1_IDLE_STATE:
-                break
-        else:
-            raise OSError("no SD card")
-
-        # CMD8: determine card version
-        r = self.cmd(8, 0x01AA, 0x87, 4)
-        if r == _R1_IDLE_STATE:
-            self.init_card_v2()
-        elif r == (_R1_IDLE_STATE | _R1_ILLEGAL_COMMAND):
-            self.init_card_v1()
-        else:
-            raise OSError("couldn't determine SD card version")
-
-        # get the number of sectors
-        # CMD9: response R2 (R1 byte + 16-byte block read)
-        if self.cmd(9, 0, 0, 0, False) != 0:
-            raise OSError("no response from SD card")
-        csd = bytearray(16)
-        self.readinto(csd)
-        if csd[0] & 0xC0 == 0x40:  # CSD version 2.0
-            self.sectors = ((csd[8] << 8 | csd[9]) + 1) * 1024
-        elif csd[0] & 0xC0 == 0x00:  # CSD version 1.0 (old, <=2GB)
-            c_size = (csd[6] & 0b11) << 10 | csd[7] << 2 | csd[8] >> 6
-            c_size_mult = (csd[9] & 0b11) << 1 | csd[10] >> 7
-            read_bl_len = csd[5] & 0b1111
-            capacity = (c_size + 1) * (2 ** (c_size_mult + 2)) * (2**read_bl_len)
-            self.sectors = capacity // 512
-        else:
-            raise OSError("SD card CSD format not supported")
-        # print('sectors', self.sectors)
-
-        # CMD16: set block length to 512 bytes
-        if self.cmd(16, 512, 0) != 0:
-            raise OSError("can't set 512 block size")
-
-        # set to high data rate now that it's initialised
-        self.init_spi(baudrate)
-
-    def init_card_v1(self):
-        for i in range(_CMD_TIMEOUT):
-            time.sleep_ms(50)
-            self.cmd(55, 0, 0)
-            if self.cmd(41, 0, 0) == 0:
-                # SDSC card, uses byte addressing in read/write/erase commands
-                self.cdv = 512
-                # print("[SDCard] v1 card")
-                return
-        raise OSError("timeout waiting for v1 card")
-
-    def init_card_v2(self):
-        for i in range(_CMD_TIMEOUT):
-            time.sleep_ms(50)
-            self.cmd(58, 0, 0, 4)
-            self.cmd(55, 0, 0)
-            if self.cmd(41, 0x40000000, 0) == 0:
-                self.cmd(58, 0, 0, -4)  # 4-byte response, negative means keep the first byte
-                ocr = self.tokenbuf[0]  # get first byte of response, which is OCR
-                if not ocr & 0x40:
-                    # SDSC card, uses byte addressing in read/write/erase commands
-                    self.cdv = 512
-                else:
-                    # SDHC/SDXC card, uses block addressing in read/write/erase commands
-                    self.cdv = 1
-                # print("[SDCard] v2 card")
-                return
-        raise OSError("timeout waiting for v2 card")
-
-    def cmd(self, cmd, arg, crc, final=0, release=True, skip1=False):
-        self.cs(0)
-
-        # create and send the command
-        buf = self.cmdbuf
-        buf[0] = 0x40 | cmd
-        buf[1] = arg >> 24
-        buf[2] = arg >> 16
-        buf[3] = arg >> 8
-        buf[4] = arg
-        buf[5] = crc
-        self.spi.write(buf)
-
-        if skip1:
-            self.spi.readinto(self.tokenbuf, 0xFF)
-
-        # wait for the response (response[7] == 0)
-        for i in range(_CMD_TIMEOUT):
-            self.spi.readinto(self.tokenbuf, 0xFF)
-            response = self.tokenbuf[0]
-            if not (response & 0x80):
-                # this could be a big-endian integer that we are getting here
-                # if final<0 then store the first byte to tokenbuf and discard the rest
-                if final < 0:
-                    self.spi.readinto(self.tokenbuf, 0xFF)
-                    final = -1 - final
-                for j in range(final):
-                    self.spi.write(b"\xff")
-                if release:
-                    self.cs(1)
-                    self.spi.write(b"\xff")
-                return response
-
-        # timeout
-        self.cs(1)
-        self.spi.write(b"\xff")
-        return -1
-
-    def readinto(self, buf):
-        self.cs(0)
-
-        # read until start byte (0xff)
-        for i in range(_CMD_TIMEOUT):
-            self.spi.readinto(self.tokenbuf, 0xFF)
-            if self.tokenbuf[0] == _TOKEN_DATA:
-                break
-            time.sleep_ms(1)
-        else:
-            self.cs(1)
-            raise OSError("timeout waiting for response")
-
-        # read data
-        mv = self.dummybuf_memoryview
-        if len(buf) != len(mv):
-            mv = mv[: len(buf)]
-        self.spi.write_readinto(mv, buf)
-
-        # read checksum
-        self.spi.write(b"\xff")
-        self.spi.write(b"\xff")
-
-        self.cs(1)
-        self.spi.write(b"\xff")
-
-    def write(self, token, buf):
-        self.cs(0)
-
-        # send: start of block, data, checksum
-        self.spi.read(1, token)
-        self.spi.write(buf)
-        self.spi.write(b"\xff")
-        self.spi.write(b"\xff")
-
-        # check the response
-        if (self.spi.read(1, 0xFF)[0] & 0x1F) != 0x05:
-            self.cs(1)
-            self.spi.write(b"\xff")
-            return
-
-        # wait for write to finish
-        while self.spi.read(1, 0xFF)[0] == 0:
-            pass
-
-        self.cs(1)
-        self.spi.write(b"\xff")
-
-    def write_token(self, token):
-        self.cs(0)
-        self.spi.read(1, token)
-        self.spi.write(b"\xff")
-        # wait for write to finish
-        while self.spi.read(1, 0xFF)[0] == 0x00:
-            pass
-
-        self.cs(1)
-        self.spi.write(b"\xff")
-
-    def readblocks(self, block_num, buf):
-        nblocks = len(buf) // 512
-        assert nblocks and not len(buf) % 512, "Buffer length is invalid"
-        if nblocks == 1:
-            # CMD17: set read address for single block
-            if self.cmd(17, block_num * self.cdv, 0, release=False) != 0:
-                # release the card
-                self.cs(1)
-                raise OSError(5)  # EIO
-            # receive the data and release card
-            self.readinto(buf)
-        else:
-            # CMD18: set read address for multiple blocks
-            if self.cmd(18, block_num * self.cdv, 0, release=False) != 0:
-                # release the card
-                self.cs(1)
-                raise OSError(5)  # EIO
-            offset = 0
-            mv = memoryview(buf)
-            while nblocks:
-                # receive the data and release card
-                self.readinto(mv[offset : offset + 512])
-                offset += 512
-                nblocks -= 1
-            if self.cmd(12, 0, 0xFF, skip1=True):
-                raise OSError(5)  # EIO
-
-    def writeblocks(self, block_num, buf):
-        nblocks, err = divmod(len(buf), 512)
-        assert nblocks and not err, "Buffer length is invalid"
-        if nblocks == 1:
-            # CMD24: set write address for single block
-            if self.cmd(24, block_num * self.cdv, 0) != 0:
-                raise OSError(5)  # EIO
-
-            # send the data
-            self.write(_TOKEN_DATA, buf)
-        else:
-            # CMD25: set write address for first block
-            if self.cmd(25, block_num * self.cdv, 0) != 0:
-                raise OSError(5)  # EIO
-            # send the data
-            offset = 0
-            mv = memoryview(buf)
-            while nblocks:
-                self.write(_TOKEN_CMD25, mv[offset : offset + 512])
-                offset += 512
-                nblocks -= 1
-            self.write_token(_TOKEN_STOP_TRAN)
-
-    def ioctl(self, op, arg):
-        if op == 4:  # get number of blocks
-            return self.sectors
-        if op == 5:  # get block size in bytes
-            return 512
diff --git a/drivers/sdcard/sdtest.py b/drivers/sdcard/sdtest.py
deleted file mode 100644
index 018ef7c64aa19..0000000000000
--- a/drivers/sdcard/sdtest.py
+++ /dev/null
@@ -1,61 +0,0 @@
-# Test for sdcard block protocol
-# Peter hinch 30th Jan 2016
-import os, sdcard, machine
-
-
-def sdtest():
-    spi = machine.SPI(1)
-    spi.init()  # Ensure right baudrate
-    sd = sdcard.SDCard(spi, machine.Pin.board.X21)  # Compatible with PCB
-    vfs = os.VfsFat(sd)
-    os.mount(vfs, "/fc")
-    print("Filesystem check")
-    print(os.listdir("/fc"))
-
-    line = "abcdefghijklmnopqrstuvwxyz\n"
-    lines = line * 200  # 5400 chars
-    short = "1234567890\n"
-
-    fn = "/fc/rats.txt"
-    print()
-    print("Multiple block read/write")
-    with open(fn, "w") as f:
-        n = f.write(lines)
-        print(n, "bytes written")
-        n = f.write(short)
-        print(n, "bytes written")
-        n = f.write(lines)
-        print(n, "bytes written")
-
-    with open(fn, "r") as f:
-        result1 = f.read()
-        print(len(result1), "bytes read")
-
-    fn = "/fc/rats1.txt"
-    print()
-    print("Single block read/write")
-    with open(fn, "w") as f:
-        n = f.write(short)  # one block
-        print(n, "bytes written")
-
-    with open(fn, "r") as f:
-        result2 = f.read()
-        print(len(result2), "bytes read")
-
-    os.umount("/fc")
-
-    print()
-    print("Verifying data read back")
-    success = True
-    if result1 == "".join((lines, short, lines)):
-        print("Large file Pass")
-    else:
-        print("Large file Fail")
-        success = False
-    if result2 == short:
-        print("Small file Pass")
-    else:
-        print("Small file Fail")
-        success = False
-    print()
-    print("Tests", "passed" if success else "failed")
diff --git a/extmod/ntptime.py b/extmod/ntptime.py
deleted file mode 100644
index 05d7e9717d82d..0000000000000
--- a/extmod/ntptime.py
+++ /dev/null
@@ -1,48 +0,0 @@
-import utime
-
-try:
-    import usocket as socket
-except:
-    import socket
-try:
-    import ustruct as struct
-except:
-    import struct
-
-# The NTP host can be configured at runtime by doing: ntptime.host = 'myhost.org'
-host = "pool.ntp.org"
-
-
-def time():
-    NTP_QUERY = bytearray(48)
-    NTP_QUERY[0] = 0x1B
-    addr = socket.getaddrinfo(host, 123)[0][-1]
-    s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
-    try:
-        s.settimeout(1)
-        res = s.sendto(NTP_QUERY, addr)
-        msg = s.recv(48)
-    finally:
-        s.close()
-    val = struct.unpack("!I", msg[40:44])[0]
-
-    EPOCH_YEAR = utime.gmtime(0)[0]
-    if EPOCH_YEAR == 2000:
-        # (date(2000, 1, 1) - date(1900, 1, 1)).days * 24*60*60
-        NTP_DELTA = 3155673600
-    elif EPOCH_YEAR == 1970:
-        # (date(1970, 1, 1) - date(1900, 1, 1)).days * 24*60*60
-        NTP_DELTA = 2208988800
-    else:
-        raise Exception("Unsupported epoch: {}".format(EPOCH_YEAR))
-
-    return val - NTP_DELTA
-
-
-# There's currently no timezone support in MicroPython, and the RTC is set in UTC time.
-def settime():
-    t = time()
-    import machine
-
-    tm = utime.gmtime(t)
-    machine.RTC().datetime((tm[0], tm[1], tm[2], tm[6] + 1, tm[3], tm[4], tm[5], 0))
diff --git a/extmod/webrepl/manifest.py b/extmod/webrepl/manifest.py
deleted file mode 100644
index 6d1a314219caa..0000000000000
--- a/extmod/webrepl/manifest.py
+++ /dev/null
@@ -1,2 +0,0 @@
-module("webrepl.py", opt=3)
-module("webrepl_setup.py", opt=3)
diff --git a/extmod/webrepl/webrepl.py b/extmod/webrepl/webrepl.py
deleted file mode 100644
index 56767d8b71f73..0000000000000
--- a/extmod/webrepl/webrepl.py
+++ /dev/null
@@ -1,177 +0,0 @@
-# This module should be imported from REPL, not run from command line.
-import binascii
-import hashlib
-import network
-import os
-import socket
-import sys
-import websocket
-import _webrepl
-
-listen_s = None
-client_s = None
-
-DEBUG = 0
-
-_DEFAULT_STATIC_HOST = const("https://micropython.org/webrepl/")
-static_host = _DEFAULT_STATIC_HOST
-
-
-def server_handshake(cl):
-    req = cl.makefile("rwb", 0)
-    # Skip HTTP GET line.
-    l = req.readline()
-    if DEBUG:
-        sys.stdout.write(repr(l))
-
-    webkey = None
-    upgrade = False
-    websocket = False
-
-    while True:
-        l = req.readline()
-        if not l:
-            # EOF in headers.
-            return False
-        if l == b"\r\n":
-            break
-        if DEBUG:
-            sys.stdout.write(l)
-        h, v = [x.strip() for x in l.split(b":", 1)]
-        if DEBUG:
-            print((h, v))
-        if h == b"Sec-WebSocket-Key":
-            webkey = v
-        elif h == b"Connection" and b"Upgrade" in v:
-            upgrade = True
-        elif h == b"Upgrade" and v == b"websocket":
-            websocket = True
-
-    if not (upgrade and websocket and webkey):
-        return False
-
-    if DEBUG:
-        print("Sec-WebSocket-Key:", webkey, len(webkey))
-
-    d = hashlib.sha1(webkey)
-    d.update(b"258EAFA5-E914-47DA-95CA-C5AB0DC85B11")
-    respkey = d.digest()
-    respkey = binascii.b2a_base64(respkey)[:-1]
-    if DEBUG:
-        print("respkey:", respkey)
-
-    cl.send(
-        b"""\
-HTTP/1.1 101 Switching Protocols\r
-Upgrade: websocket\r
-Connection: Upgrade\r
-Sec-WebSocket-Accept: """
-    )
-    cl.send(respkey)
-    cl.send("\r\n\r\n")
-
-    return True
-
-
-def send_html(cl):
-    cl.send(
-        b"""\
-HTTP/1.0 200 OK\r
-\r
-<base href=\""""
-    )
-    cl.send(static_host)
-    cl.send(
-        b"""\"></base>\r
-<script src="webrepl_content.js"></script>\r
-"""
-    )
-    cl.close()
-
-
-def setup_conn(port, accept_handler):
-    global listen_s
-    listen_s = socket.socket()
-    listen_s.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
-
-    ai = socket.getaddrinfo("0.0.0.0", port)
-    addr = ai[0][4]
-
-    listen_s.bind(addr)
-    listen_s.listen(1)
-    if accept_handler:
-        listen_s.setsockopt(socket.SOL_SOCKET, 20, accept_handler)
-    for i in (network.AP_IF, network.STA_IF):
-        iface = network.WLAN(i)
-        if iface.active():
-            print("WebREPL server started on http://%s:%d/" % (iface.ifconfig()[0], port))
-    return listen_s
-
-
-def accept_conn(listen_sock):
-    global client_s
-    cl, remote_addr = listen_sock.accept()
-
-    if not server_handshake(cl):
-        send_html(cl)
-        return False
-
-    prev = os.dupterm(None)
-    os.dupterm(prev)
-    if prev:
-        print("\nConcurrent WebREPL connection from", remote_addr, "rejected")
-        cl.close()
-        return False
-    print("\nWebREPL connection from:", remote_addr)
-    client_s = cl
-
-    ws = websocket.websocket(cl, True)
-    ws = _webrepl._webrepl(ws)
-    cl.setblocking(False)
-    # notify REPL on socket incoming data (ESP32/ESP8266-only)
-    if hasattr(os, "dupterm_notify"):
-        cl.setsockopt(socket.SOL_SOCKET, 20, os.dupterm_notify)
-    os.dupterm(ws)
-
-    return True
-
-
-def stop():
-    global listen_s, client_s
-    os.dupterm(None)
-    if client_s:
-        client_s.close()
-    if listen_s:
-        listen_s.close()
-
-
-def start(port=8266, password=None, accept_handler=accept_conn):
-    global static_host
-    stop()
-    webrepl_pass = password
-    if webrepl_pass is None:
-        try:
-            import webrepl_cfg
-
-            webrepl_pass = webrepl_cfg.PASS
-            if hasattr(webrepl_cfg, "BASE"):
-                static_host = webrepl_cfg.BASE
-        except:
-            print("WebREPL is not configured, run 'import webrepl_setup'")
-
-    _webrepl.password(webrepl_pass)
-    s = setup_conn(port, accept_handler)
-
-    if accept_handler is None:
-        print("Starting webrepl in foreground mode")
-        # Run accept_conn to serve HTML until we get a websocket connection.
-        while not accept_conn(s):
-            pass
-    elif password is None:
-        print("Started webrepl in normal mode")
-    else:
-        print("Started webrepl in manual override mode")
-
-
-def start_foreground(port=8266, password=None):
-    start(port, password, None)
diff --git a/extmod/webrepl/webrepl_setup.py b/extmod/webrepl/webrepl_setup.py
deleted file mode 100644
index 16e5f76e655e4..0000000000000
--- a/extmod/webrepl/webrepl_setup.py
+++ /dev/null
@@ -1,107 +0,0 @@
-import sys
-
-import os
-import machine
-
-RC = "./boot.py"
-CONFIG = "./webrepl_cfg.py"
-
-
-def input_choice(prompt, choices):
-    while 1:
-        resp = input(prompt)
-        if resp in choices:
-            return resp
-
-
-def getpass(prompt):
-    return input(prompt)
-
-
-def input_pass():
-    while 1:
-        passwd1 = getpass("New password (4-9 chars): ")
-        if len(passwd1) < 4 or len(passwd1) > 9:
-            print("Invalid password length")
-            continue
-        passwd2 = getpass("Confirm password: ")
-        if passwd1 == passwd2:
-            return passwd1
-        print("Passwords do not match")
-
-
-def exists(fname):
-    try:
-        with open(fname):
-            pass
-        return True
-    except OSError:
-        return False
-
-
-def get_daemon_status():
-    with open(RC) as f:
-        for l in f:
-            if "webrepl" in l:
-                if l.startswith("#"):
-                    return False
-                return True
-        return None
-
-
-def change_daemon(action):
-    LINES = ("import webrepl", "webrepl.start()")
-    with open(RC) as old_f, open(RC + ".tmp", "w") as new_f:
-        found = False
-        for l in old_f:
-            for patt in LINES:
-                if patt in l:
-                    found = True
-                    if action and l.startswith("#"):
-                        l = l[1:]
-                    elif not action and not l.startswith("#"):
-                        l = "#" + l
-            new_f.write(l)
-        if not found:
-            new_f.write("import webrepl\nwebrepl.start()\n")
-    # FatFs rename() is not POSIX compliant, will raise OSError if
-    # dest file exists.
-    os.remove(RC)
-    os.rename(RC + ".tmp", RC)
-
-
-def main():
-    status = get_daemon_status()
-
-    print("WebREPL daemon auto-start status:", "enabled" if status else "disabled")
-    print("\nWould you like to (E)nable or (D)isable it running on boot?")
-    print("(Empty line to quit)")
-    resp = input("> ").upper()
-
-    if resp == "E":
-        if exists(CONFIG):
-            resp2 = input_choice(
-                "Would you like to change WebREPL password? (y/n) ", ("y", "n", "")
-            )
-        else:
-            print("To enable WebREPL, you must set password for it")
-            resp2 = "y"
-
-        if resp2 == "y":
-            passwd = input_pass()
-            with open(CONFIG, "w") as f:
-                f.write("PASS = %r\n" % passwd)
-
-    if resp not in ("D", "E") or (resp == "D" and not status) or (resp == "E" and status):
-        print("No further action required")
-        sys.exit()
-
-    change_daemon(resp == "E")
-
-    print("Changes will be activated after reboot")
-    resp = input_choice("Would you like to reboot now? (y/n) ", ("y", "n", ""))
-    if resp == "y":
-        machine.reset()
-
-
-main()

From 6aa3c946347281875165392c09753547d8c77fc3 Mon Sep 17 00:00:00 2001
From: Phil Howard <phil@gadgetoid.com>
Date: Mon, 5 Sep 2022 11:20:10 +0100
Subject: [PATCH 2579/3533] rp2/rp2_flash: Add start/len support to rp2.Flash()
 constructor.

This allows support for partitioned flash on rp2 boards.

See issue #9208.

Signed-off-by: Phil Howard <phil@gadgetoid.com>
---
 ports/rp2/rp2_flash.c | 45 +++++++++++++++++++++++++++++++++++--------
 1 file changed, 37 insertions(+), 8 deletions(-)

diff --git a/ports/rp2/rp2_flash.c b/ports/rp2/rp2_flash.c
index db6b9f3bfe757..47c95ea5c822c 100644
--- a/ports/rp2/rp2_flash.c
+++ b/ports/rp2/rp2_flash.c
@@ -70,16 +70,45 @@ bi_decl(bi_block_device(
     BINARY_INFO_BLOCK_DEV_FLAG_PT_UNKNOWN));
 
 STATIC mp_obj_t rp2_flash_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
-    // Check args.
-    mp_arg_check_num(n_args, n_kw, 0, 0, false);
+    // Parse arguments
+    enum { ARG_start, ARG_len };
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_start, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} },
+        { MP_QSTR_len,   MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} },
+    };
+    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
+    mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
+
+    if (args[ARG_start].u_int == -1 && args[ARG_len].u_int == -1) {
+        #ifndef NDEBUG
+        extern char __flash_binary_end;
+        assert((uintptr_t)&__flash_binary_end - XIP_BASE <= MICROPY_HW_FLASH_STORAGE_BASE);
+        #endif
+
+        // Default singleton object that accesses entire flash
+        return MP_OBJ_FROM_PTR(&rp2_flash_obj);
+    }
+
+    rp2_flash_obj_t *self = mp_obj_malloc(rp2_flash_obj_t, &rp2_flash_type);
+
+    mp_int_t start = args[ARG_start].u_int;
+    if (start == -1) {
+        start = 0;
+    } else if (!(0 <= start && start < MICROPY_HW_FLASH_STORAGE_BYTES && start % BLOCK_SIZE_BYTES == 0)) {
+        mp_raise_ValueError(NULL);
+    }
+
+    mp_int_t len = args[ARG_len].u_int;
+    if (len == -1) {
+        len = MICROPY_HW_FLASH_STORAGE_BYTES - start;
+    } else if (!(0 < len && start + len <= MICROPY_HW_FLASH_STORAGE_BYTES && len % BLOCK_SIZE_BYTES == 0)) {
+        mp_raise_ValueError(NULL);
+    }
 
-    #ifndef NDEBUG
-    extern char __flash_binary_end;
-    assert((uintptr_t)&__flash_binary_end - XIP_BASE <= MICROPY_HW_FLASH_STORAGE_BASE);
-    #endif
+    self->flash_base = MICROPY_HW_FLASH_STORAGE_BASE + start;
+    self->flash_size = len;
 
-    // Return singleton object.
-    return MP_OBJ_FROM_PTR(&rp2_flash_obj);
+    return MP_OBJ_FROM_PTR(self);
 }
 
 STATIC mp_obj_t rp2_flash_readblocks(size_t n_args, const mp_obj_t *args) {

From c364301817d828eeb6df74095b3ea8083e8fbef6 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Tue, 6 Sep 2022 23:32:11 +1000
Subject: [PATCH 2580/3533] rp2/boards: Set PICO_BOARD correctly for each
 board.

In most cases, it's calculated automatically from the board name, and so
doesn't need to be set at all.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 .../rp2/boards/GARATRONIC_PYBSTICK26_RP2040/mpconfigboard.cmake | 2 --
 ports/rp2/boards/PICO_W/mpconfigboard.cmake                     | 2 --
 ports/rp2/boards/W5100S_EVB_PICO/mpconfigboard.cmake            | 2 +-
 ports/rp2/boards/W5500_EVB_PICO/mpconfigboard.cmake             | 2 +-
 4 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/ports/rp2/boards/GARATRONIC_PYBSTICK26_RP2040/mpconfigboard.cmake b/ports/rp2/boards/GARATRONIC_PYBSTICK26_RP2040/mpconfigboard.cmake
index 311e114b2914e..11fcb3d087ec0 100644
--- a/ports/rp2/boards/GARATRONIC_PYBSTICK26_RP2040/mpconfigboard.cmake
+++ b/ports/rp2/boards/GARATRONIC_PYBSTICK26_RP2040/mpconfigboard.cmake
@@ -1,3 +1 @@
 # cmake file
-
-set(PICO_BOARD garatronic_pybstick26_rp2040)
diff --git a/ports/rp2/boards/PICO_W/mpconfigboard.cmake b/ports/rp2/boards/PICO_W/mpconfigboard.cmake
index d3fbce6993276..681e0dec44ffd 100644
--- a/ports/rp2/boards/PICO_W/mpconfigboard.cmake
+++ b/ports/rp2/boards/PICO_W/mpconfigboard.cmake
@@ -1,6 +1,4 @@
 # cmake file for Raspberry Pi Pico W
-set(MICROPY_BOARD PICO_W)
-
 set(MICROPY_PY_LWIP ON)
 set(MICROPY_PY_NETWORK_CYW43 ON)
 
diff --git a/ports/rp2/boards/W5100S_EVB_PICO/mpconfigboard.cmake b/ports/rp2/boards/W5100S_EVB_PICO/mpconfigboard.cmake
index bc5d1ea65e8bf..4746c6e267a19 100644
--- a/ports/rp2/boards/W5100S_EVB_PICO/mpconfigboard.cmake
+++ b/ports/rp2/boards/W5100S_EVB_PICO/mpconfigboard.cmake
@@ -1,4 +1,4 @@
 # cmake file for Wiznet W5100S-EVB-Pico.
-set(PICO_BOARD pico)
+set(PICO_BOARD wiznet_w5100s_evb_pico)
 set(MICROPY_PY_NETWORK_WIZNET5K W5100S)
 set(MICROPY_PY_LWIP 1)
diff --git a/ports/rp2/boards/W5500_EVB_PICO/mpconfigboard.cmake b/ports/rp2/boards/W5500_EVB_PICO/mpconfigboard.cmake
index 875b89f2befe0..f7f2650bfa0ed 100644
--- a/ports/rp2/boards/W5500_EVB_PICO/mpconfigboard.cmake
+++ b/ports/rp2/boards/W5500_EVB_PICO/mpconfigboard.cmake
@@ -1,4 +1,4 @@
 # cmake file for Wiznet W5500-EVB-Pico.
-set(PICO_BOARD pico)
+set(PICO_BOARD wiznet_w5100s_evb_pico)
 set(MICROPY_PY_NETWORK_WIZNET5K W5500)
 set(MICROPY_PY_LWIP 1)

From 29437205f29976db71dc12d61ce756732e6f813a Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Tue, 6 Sep 2022 22:54:40 +1000
Subject: [PATCH 2581/3533] rp2/machine_spi: Use pico-sdk's default pins for
 SPI.

Rather than hardcoding the defaults, use pico-sdk's board definition.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/rp2/machine_spi.c | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/ports/rp2/machine_spi.c b/ports/rp2/machine_spi.c
index 42998664a76de..104bd1fd5338b 100644
--- a/ports/rp2/machine_spi.c
+++ b/ports/rp2/machine_spi.c
@@ -40,20 +40,36 @@
 #define DEFAULT_SPI_FIRSTBIT    (SPI_MSB_FIRST)
 
 #ifndef MICROPY_HW_SPI0_SCK
+#if PICO_DEFAULT_SPI == 0
+#define MICROPY_HW_SPI0_SCK     (PICO_DEFAULT_SPI_SCK_PIN)
+#define MICROPY_HW_SPI0_MOSI    (PICO_DEFAULT_SPI_TX_PIN)
+#define MICROPY_HW_SPI0_MISO    (PICO_DEFAULT_SPI_RX_PIN)
+#else
 #define MICROPY_HW_SPI0_SCK     (6)
 #define MICROPY_HW_SPI0_MOSI    (7)
 #define MICROPY_HW_SPI0_MISO    (4)
 #endif
+#endif
 
 #ifndef MICROPY_HW_SPI1_SCK
+#if PICO_DEFAULT_SPI == 1
+#define MICROPY_HW_SPI1_SCK     (PICO_DEFAULT_SPI_SCK_PIN)
+#define MICROPY_HW_SPI1_MOSI    (PICO_DEFAULT_SPI_TX_PIN)
+#define MICROPY_HW_SPI1_MISO    (PICO_DEFAULT_SPI_RX_PIN)
+#else
 #define MICROPY_HW_SPI1_SCK     (10)
 #define MICROPY_HW_SPI1_MOSI    (11)
 #define MICROPY_HW_SPI1_MISO    (8)
 #endif
+#endif
 
+// SPI0 can be GP{0..7,16..23}, SPI1 can be GP{8..15,24..29}.
 #define IS_VALID_PERIPH(spi, pin)   ((((pin) & 8) >> 3) == (spi))
+// GP{2,6,10,14,...}
 #define IS_VALID_SCK(spi, pin)      (((pin) & 3) == 2 && IS_VALID_PERIPH(spi, pin))
+// GP{3,7,11,15,...}
 #define IS_VALID_MOSI(spi, pin)     (((pin) & 3) == 3 && IS_VALID_PERIPH(spi, pin))
+// GP{0,4,8,10,...}
 #define IS_VALID_MISO(spi, pin)     (((pin) & 3) == 0 && IS_VALID_PERIPH(spi, pin))
 
 typedef struct _machine_spi_obj_t {

From 315e74236fb7be7c72f708832038596d668979b7 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Tue, 6 Sep 2022 23:28:50 +1000
Subject: [PATCH 2582/3533] rp2/machine_i2c: Use pico-sdk's default pins for
 I2C.

Inherits the default values for whichever instance is PICO_DEFAULT_I2C.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/rp2/machine_i2c.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/ports/rp2/machine_i2c.c b/ports/rp2/machine_i2c.c
index f785ad7dedf33..3390cc42101d5 100644
--- a/ports/rp2/machine_i2c.c
+++ b/ports/rp2/machine_i2c.c
@@ -35,14 +35,24 @@
 #define DEFAULT_I2C_FREQ (400000)
 
 #ifndef MICROPY_HW_I2C0_SCL
+#if PICO_DEFAULT_I2C == 0
+#define MICROPY_HW_I2C0_SCL (PICO_DEFAULT_I2C_SCL_PIN)
+#define MICROPY_HW_I2C0_SDA (PICO_DEFAULT_I2C_SDA_PIN)
+#else
 #define MICROPY_HW_I2C0_SCL (9)
 #define MICROPY_HW_I2C0_SDA (8)
 #endif
+#endif
 
 #ifndef MICROPY_HW_I2C1_SCL
+#if PICO_DEFAULT_I2C == 1
+#define MICROPY_HW_I2C1_SCL (PICO_DEFAULT_I2C_SCL_PIN)
+#define MICROPY_HW_I2C1_SDA (PICO_DEFAULT_I2C_SDA_PIN)
+#else
 #define MICROPY_HW_I2C1_SCL (7)
 #define MICROPY_HW_I2C1_SDA (6)
 #endif
+#endif
 
 // SDA/SCL on even/odd pins, I2C0/I2C1 on even/odd pairs of pins.
 #define IS_VALID_SCL(i2c, pin) (((pin) & 1) == 1 && (((pin) & 2) >> 1) == (i2c))

From dec0ff7a10efee286037812287d5bfcad611f64f Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Tue, 6 Sep 2022 23:32:34 +1000
Subject: [PATCH 2583/3533] rp2/boards: Remove all I2C,SPI pin defs that
 already match pico-sdk.

I.e. for whichever SPI/I2C instance is PICO_DEFAULT_I2C, there's no need to
set MICROPY_HW_SPIn_SCK.

The only ones remaining are for the non-default instance.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 .../rp2/boards/ADAFRUIT_FEATHER_RP2040/mpconfigboard.h |  8 --------
 .../boards/ADAFRUIT_ITSYBITSY_RP2040/mpconfigboard.h   |  7 -------
 ports/rp2/boards/ADAFRUIT_QTPY_RP2040/mpconfigboard.h  |  9 +--------
 .../boards/ARDUINO_NANO_RP2040_CONNECT/mpconfigboard.h |  8 ++------
 .../rp2/boards/PIMORONI_PICOLIPO_16MB/mpconfigboard.h  |  8 --------
 ports/rp2/boards/PIMORONI_PICOLIPO_4MB/mpconfigboard.h |  8 --------
 ports/rp2/boards/PIMORONI_TINY2040/mpconfigboard.h     |  1 +
 ports/rp2/boards/SPARKFUN_PROMICRO/mpconfigboard.h     |  8 --------
 ports/rp2/boards/SPARKFUN_THINGPLUS/mpconfigboard.h    | 10 +---------
 9 files changed, 5 insertions(+), 62 deletions(-)

diff --git a/ports/rp2/boards/ADAFRUIT_FEATHER_RP2040/mpconfigboard.h b/ports/rp2/boards/ADAFRUIT_FEATHER_RP2040/mpconfigboard.h
index 84d2bf20dbc6d..f9cd030d46ce1 100644
--- a/ports/rp2/boards/ADAFRUIT_FEATHER_RP2040/mpconfigboard.h
+++ b/ports/rp2/boards/ADAFRUIT_FEATHER_RP2040/mpconfigboard.h
@@ -7,14 +7,6 @@
 #define MICROPY_HW_USB_VID (0x239A)
 #define MICROPY_HW_USB_PID (0x80F2)
 
-// STEMMA QT / Qwiic on I2C1
-#define MICROPY_HW_I2C1_SCL  (3)
-#define MICROPY_HW_I2C1_SDA  (2)
-
-#define MICROPY_HW_SPI0_SCK  (18)
-#define MICROPY_HW_SPI0_MOSI (19)
-#define MICROPY_HW_SPI0_MISO (20)
-
 // NeoPixel GPIO16, power not toggleable
 
 // Red user LED GPIO13
diff --git a/ports/rp2/boards/ADAFRUIT_ITSYBITSY_RP2040/mpconfigboard.h b/ports/rp2/boards/ADAFRUIT_ITSYBITSY_RP2040/mpconfigboard.h
index 8f5551172bf97..be950f4f99d46 100644
--- a/ports/rp2/boards/ADAFRUIT_ITSYBITSY_RP2040/mpconfigboard.h
+++ b/ports/rp2/boards/ADAFRUIT_ITSYBITSY_RP2040/mpconfigboard.h
@@ -7,13 +7,6 @@
 #define MICROPY_HW_USB_VID (0x239A)
 #define MICROPY_HW_USB_PID (0x80FE)
 
-#define MICROPY_HW_I2C0_SCL  (3)
-#define MICROPY_HW_I2C0_SDA  (2)
-
-#define MICROPY_HW_SPI0_SCK  (18)
-#define MICROPY_HW_SPI0_MOSI (19)
-#define MICROPY_HW_SPI0_MISO (20)
-
 // NeoPixel data GPIO17, power GPIO16
 
 // Red user LED GPIO11
diff --git a/ports/rp2/boards/ADAFRUIT_QTPY_RP2040/mpconfigboard.h b/ports/rp2/boards/ADAFRUIT_QTPY_RP2040/mpconfigboard.h
index ca341cedd8d21..6d834fd4f5d68 100644
--- a/ports/rp2/boards/ADAFRUIT_QTPY_RP2040/mpconfigboard.h
+++ b/ports/rp2/boards/ADAFRUIT_QTPY_RP2040/mpconfigboard.h
@@ -12,17 +12,10 @@
 #define MICROPY_HW_UART1_CTS (10)
 #define MICROPY_HW_UART1_RTS (7)
 
-#define MICROPY_HW_I2C0_SCL  (25)
-#define MICROPY_HW_I2C0_SDA  (24)
-
-// STEMMA QT / Qwiic on I2C1
+// STEMMA QT / Qwiic on (non-default) I2C1
 #define MICROPY_HW_I2C1_SCL  (23)
 #define MICROPY_HW_I2C1_SDA  (22)
 
-#define MICROPY_HW_SPI0_SCK  (6)
-#define MICROPY_HW_SPI0_MOSI (3)
-#define MICROPY_HW_SPI0_MISO (4)
-
 // NeoPixel data GPIO12, power GPIO11
 
 // Boot button GPIO21
diff --git a/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/mpconfigboard.h b/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/mpconfigboard.h
index 87b9187659a42..5ea9b8cdb850f 100644
--- a/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/mpconfigboard.h
+++ b/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/mpconfigboard.h
@@ -22,16 +22,12 @@
 #define MICROPY_HW_UART1_CTS            (10)
 #define MICROPY_HW_UART1_RTS            (11)
 
-// SPI 1 config.
+// SPI 1 config (non-default).
 #define MICROPY_HW_SPI1_SCK             (14)
 #define MICROPY_HW_SPI1_MOSI            (11)
 #define MICROPY_HW_SPI1_MISO            (8)
 
-// I2C0 config.
-#define MICROPY_HW_I2C0_SCL             (13)
-#define MICROPY_HW_I2C0_SDA             (12)
-
-// I2C1 config.
+// I2C1 config (non-default).
 #define MICROPY_HW_I2C1_SCL             (27)
 #define MICROPY_HW_I2C1_SDA             (26)
 
diff --git a/ports/rp2/boards/PIMORONI_PICOLIPO_16MB/mpconfigboard.h b/ports/rp2/boards/PIMORONI_PICOLIPO_16MB/mpconfigboard.h
index 134c2ff784959..a90ef6783d669 100644
--- a/ports/rp2/boards/PIMORONI_PICOLIPO_16MB/mpconfigboard.h
+++ b/ports/rp2/boards/PIMORONI_PICOLIPO_16MB/mpconfigboard.h
@@ -11,14 +11,6 @@
 #define MICROPY_HW_UART1_CTS (10)
 #define MICROPY_HW_UART1_RTS (11)
 
-// Qwiic on I2C0
-#define MICROPY_HW_I2C0_SCL  (4)
-#define MICROPY_HW_I2C0_SDA  (5)
-
-#define MICROPY_HW_SPI0_SCK  (18)
-#define MICROPY_HW_SPI0_MOSI (19)
-#define MICROPY_HW_SPI0_MISO (16)
-
 // User LED GPIO25
 
 // VBUS_SENSE GPIO24
diff --git a/ports/rp2/boards/PIMORONI_PICOLIPO_4MB/mpconfigboard.h b/ports/rp2/boards/PIMORONI_PICOLIPO_4MB/mpconfigboard.h
index fd45547e1b286..53ade7291532a 100644
--- a/ports/rp2/boards/PIMORONI_PICOLIPO_4MB/mpconfigboard.h
+++ b/ports/rp2/boards/PIMORONI_PICOLIPO_4MB/mpconfigboard.h
@@ -11,14 +11,6 @@
 #define MICROPY_HW_UART1_CTS (10)
 #define MICROPY_HW_UART1_RTS (11)
 
-// Qwiic on I2C0
-#define MICROPY_HW_I2C0_SCL  (4)
-#define MICROPY_HW_I2C0_SDA  (5)
-
-#define MICROPY_HW_SPI0_SCK  (18)
-#define MICROPY_HW_SPI0_MOSI (19)
-#define MICROPY_HW_SPI0_MISO (16)
-
 // User LED GPIO25
 
 // VBUS_SENSE GPIO24
diff --git a/ports/rp2/boards/PIMORONI_TINY2040/mpconfigboard.h b/ports/rp2/boards/PIMORONI_TINY2040/mpconfigboard.h
index 50cb2bd59936f..ea40a8071b77b 100644
--- a/ports/rp2/boards/PIMORONI_TINY2040/mpconfigboard.h
+++ b/ports/rp2/boards/PIMORONI_TINY2040/mpconfigboard.h
@@ -6,6 +6,7 @@
 #define MICROPY_HW_USB_VID (0x16D0)
 #define MICROPY_HW_USB_PID (0x08C7)
 
+// I2C0 (non-default)
 #define MICROPY_HW_I2C0_SCL  (4)
 #define MICROPY_HW_I2C0_SDA  (5)
 
diff --git a/ports/rp2/boards/SPARKFUN_PROMICRO/mpconfigboard.h b/ports/rp2/boards/SPARKFUN_PROMICRO/mpconfigboard.h
index 65b29eecd1511..72a9aeb373e44 100644
--- a/ports/rp2/boards/SPARKFUN_PROMICRO/mpconfigboard.h
+++ b/ports/rp2/boards/SPARKFUN_PROMICRO/mpconfigboard.h
@@ -11,12 +11,4 @@
 #define MICROPY_HW_UART1_CTS (10)
 #define MICROPY_HW_UART1_RTS (11)
 
-// Qwiic on I2C0
-#define MICROPY_HW_I2C0_SCL  (17)
-#define MICROPY_HW_I2C0_SDA  (16)
-
-#define MICROPY_HW_SPI0_SCK  (22)
-#define MICROPY_HW_SPI0_MOSI (23)
-#define MICROPY_HW_SPI0_MISO (20)
-
 // NeoPixel data GPIO25, power not toggleable
diff --git a/ports/rp2/boards/SPARKFUN_THINGPLUS/mpconfigboard.h b/ports/rp2/boards/SPARKFUN_THINGPLUS/mpconfigboard.h
index f88ba5dd63c8d..c2ca90b968353 100644
--- a/ports/rp2/boards/SPARKFUN_THINGPLUS/mpconfigboard.h
+++ b/ports/rp2/boards/SPARKFUN_THINGPLUS/mpconfigboard.h
@@ -9,15 +9,7 @@
 #define MICROPY_HW_I2C0_SCL  (17)
 #define MICROPY_HW_I2C0_SDA  (16)
 
-// Qwiic on I2C1
-#define MICROPY_HW_I2C1_SCL  (7)
-#define MICROPY_HW_I2C1_SDA  (6)
-
-#define MICROPY_HW_SPI0_SCK  (2)
-#define MICROPY_HW_SPI0_MOSI (3)
-#define MICROPY_HW_SPI0_MISO (4)
-
-// MicroSD on SPI1
+// MicroSD on SPI1 (non-default)
 #define MICROPY_HW_SPI1_SCK  (14)
 #define MICROPY_HW_SPI1_MOSI (15)
 #define MICROPY_HW_SPI1_MISO (12)

From 9070a2494022383586e1f86745ae4c9af52389f6 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Thu, 8 Sep 2022 13:55:50 +1000
Subject: [PATCH 2584/3533] tools/autobuild: Use distinct directory for
 building stm32 variants.

Previous the build directory just used the board name, now make it use the
variant name too.

This shouldn't have any change because the existing directory should not
exist (all builds run by these scripts remove their build directory after
completion), but it makes debugging easier.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 tools/autobuild/build-stm32-extra.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/autobuild/build-stm32-extra.sh b/tools/autobuild/build-stm32-extra.sh
index feb269e356049..887e3cd246943 100755
--- a/tools/autobuild/build-stm32-extra.sh
+++ b/tools/autobuild/build-stm32-extra.sh
@@ -10,7 +10,7 @@ function do_build() {
     for variant in `$MICROPY_AUTOBUILD_MAKE BOARD=$board query-variants | grep VARIANTS: | cut -d' ' -f2-`; do
         target=$descr-$variant
         echo "building $target $board"
-        build_dir=/tmp/stm-build-$board
+        build_dir=/tmp/stm-build-$board-$variant
         $MICROPY_AUTOBUILD_MAKE $@ BOARD=$board BOARD_VARIANT=$variant BUILD=$build_dir || exit 1
         mv $build_dir/firmware.dfu $dest_dir/$target$fw_tag.dfu
         mv $build_dir/firmware.hex $dest_dir/$target$fw_tag.hex

From 6e75d177e778caebe791add7eb4cc9eff3a33b6a Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Thu, 8 Sep 2022 13:58:03 +1000
Subject: [PATCH 2585/3533] stm32/boards/PYB: Fix handling of BOARD_VARIANT
 selection.

The matches should not have been quoted.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/stm32/boards/PYBLITEV10/mpconfigboard.mk | 8 ++++----
 ports/stm32/boards/PYBV10/mpconfigboard.mk     | 8 ++++----
 ports/stm32/boards/PYBV11/mpconfigboard.mk     | 8 ++++----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/ports/stm32/boards/PYBLITEV10/mpconfigboard.mk b/ports/stm32/boards/PYBLITEV10/mpconfigboard.mk
index 74698664760f0..461886b63cab0 100644
--- a/ports/stm32/boards/PYBLITEV10/mpconfigboard.mk
+++ b/ports/stm32/boards/PYBLITEV10/mpconfigboard.mk
@@ -8,20 +8,20 @@ TEXT1_ADDR = 0x08020000
 # Provide different variants for the downloads page.
 BOARD_VARIANTS += "dp thread dp-thread network"
 
-ifeq ($(BOARD_VARIANT),"dp")
+ifeq ($(BOARD_VARIANT),dp)
 MICROPY_FLOAT_IMPL=double
 endif
 
-ifeq ($(BOARD_VARIANT),"thread")
+ifeq ($(BOARD_VARIANT),thread)
 CFLAGS += -DMICROPY_PY_THREAD=1
 endif
 
-ifeq ($(BOARD_VARIANT),"dp-thread")
+ifeq ($(BOARD_VARIANT),dp-thread)
 MICROPY_FLOAT_IMPL=double
 CFLAGS += -DMICROPY_PY_THREAD=1
 endif
 
-ifeq ($(BOARD_VARIANT),"network")
+ifeq ($(BOARD_VARIANT),network)
 MICROPY_PY_NETWORK_WIZNET5K=5200
 endif
 
diff --git a/ports/stm32/boards/PYBV10/mpconfigboard.mk b/ports/stm32/boards/PYBV10/mpconfigboard.mk
index af28782678031..363f6b4806163 100644
--- a/ports/stm32/boards/PYBV10/mpconfigboard.mk
+++ b/ports/stm32/boards/PYBV10/mpconfigboard.mk
@@ -18,20 +18,20 @@ MICROPY_VFS_LFS2 = 1
 # Provide different variants for the downloads page.
 BOARD_VARIANTS += "dp thread dp-thread network"
 
-ifeq ($(BOARD_VARIANT),"dp")
+ifeq ($(BOARD_VARIANT),dp)
 MICROPY_FLOAT_IMPL=double
 endif
 
-ifeq ($(BOARD_VARIANT),"thread")
+ifeq ($(BOARD_VARIANT),thread)
 CFLAGS += -DMICROPY_PY_THREAD=1
 endif
 
-ifeq ($(BOARD_VARIANT),"dp-thread")
+ifeq ($(BOARD_VARIANT),dp-thread)
 MICROPY_FLOAT_IMPL=double
 CFLAGS += -DMICROPY_PY_THREAD=1
 endif
 
-ifeq ($(BOARD_VARIANT),"network")
+ifeq ($(BOARD_VARIANT),network)
 MICROPY_PY_NETWORK_WIZNET5K=5200
 endif
 
diff --git a/ports/stm32/boards/PYBV11/mpconfigboard.mk b/ports/stm32/boards/PYBV11/mpconfigboard.mk
index cf7884cfc67a9..857049f215963 100644
--- a/ports/stm32/boards/PYBV11/mpconfigboard.mk
+++ b/ports/stm32/boards/PYBV11/mpconfigboard.mk
@@ -18,20 +18,20 @@ MICROPY_VFS_LFS2 = 1
 # Provide different variants for the downloads page.
 BOARD_VARIANTS += "dp thread dp-thread network"
 
-ifeq ($(BOARD_VARIANT),"dp")
+ifeq ($(BOARD_VARIANT),dp)
 MICROPY_FLOAT_IMPL=double
 endif
 
-ifeq ($(BOARD_VARIANT),"thread")
+ifeq ($(BOARD_VARIANT),thread)
 CFLAGS += -DMICROPY_PY_THREAD=1
 endif
 
-ifeq ($(BOARD_VARIANT),"dp-thread")
+ifeq ($(BOARD_VARIANT),dp-thread)
 MICROPY_FLOAT_IMPL=double
 CFLAGS += -DMICROPY_PY_THREAD=1
 endif
 
-ifeq ($(BOARD_VARIANT),"network")
+ifeq ($(BOARD_VARIANT),network)
 MICROPY_PY_NETWORK_WIZNET5K=5200
 endif
 

From 82fc16f2982b38f6dfd0145b8012b34308d13605 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Tue, 9 Aug 2022 16:48:04 +1000
Subject: [PATCH 2586/3533] extmod/modbluetooth: Fix descriptor registration
 with empty tuple.

Incorrect use of "continue" when the tuple was length zero meant it
broke the rest of the argument handling.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 extmod/modbluetooth.c | 62 +++++++++++++++++++++----------------------
 1 file changed, 30 insertions(+), 32 deletions(-)

diff --git a/extmod/modbluetooth.c b/extmod/modbluetooth.c
index 4645ae6c98691..c2cbf0e70ad52 100644
--- a/extmod/modbluetooth.c
+++ b/extmod/modbluetooth.c
@@ -529,43 +529,41 @@ STATIC int bluetooth_gatts_register_service(mp_obj_t uuid_in, mp_obj_t character
 
         // Optional third element, iterable of descriptors.
         if (characteristic_len >= 3) {
-            mp_obj_t descriptors_len_in = mp_obj_len(characteristic_items[2]);
-            num_descriptors[characteristic_index] = mp_obj_get_int(descriptors_len_in);
+            mp_int_t n = mp_obj_get_int(mp_obj_len(characteristic_items[2]));
+            if (n) {
+                num_descriptors[characteristic_index] = n;
+
+                // Grow the flattened uuids and flags arrays with this many more descriptors.
+                descriptor_uuids = m_renew(mp_obj_bluetooth_uuid_t *, descriptor_uuids, descriptor_index, descriptor_index + num_descriptors[characteristic_index]);
+                descriptor_flags = m_renew(uint16_t, descriptor_flags, descriptor_index, descriptor_index + num_descriptors[characteristic_index]);
+
+                // Also grow the handles array.
+                *handles = m_renew(uint16_t, *handles, *num_handles, *num_handles + num_descriptors[characteristic_index]);
+
+                mp_obj_iter_buf_t iter_buf_desc;
+                mp_obj_t iterable_desc = mp_getiter(characteristic_items[2], &iter_buf_desc);
+                mp_obj_t descriptor_obj;
+
+                // Extract out descriptors for this characteristic.
+                while ((descriptor_obj = mp_iternext(iterable_desc)) != MP_OBJ_STOP_ITERATION) {
+                    // (uuid, flags,)
+                    mp_obj_t *descriptor_items;
+                    mp_obj_get_array_fixed_n(descriptor_obj, 2, &descriptor_items);
+                    mp_obj_t desc_uuid_obj = descriptor_items[0];
+                    if (!mp_obj_is_type(desc_uuid_obj, &mp_type_bluetooth_uuid)) {
+                        mp_raise_ValueError(MP_ERROR_TEXT("invalid descriptor UUID"));
+                    }
 
-            if (num_descriptors[characteristic_index] == 0) {
-                continue;
-            }
+                    descriptor_uuids[descriptor_index] = MP_OBJ_TO_PTR(desc_uuid_obj);
+                    descriptor_flags[descriptor_index] = mp_obj_get_int(descriptor_items[1]);
+                    ++descriptor_index;
 
-            // Grow the flattened uuids and flags arrays with this many more descriptors.
-            descriptor_uuids = m_renew(mp_obj_bluetooth_uuid_t *, descriptor_uuids, descriptor_index, descriptor_index + num_descriptors[characteristic_index]);
-            descriptor_flags = m_renew(uint16_t, descriptor_flags, descriptor_index, descriptor_index + num_descriptors[characteristic_index]);
-
-            // Also grow the handles array.
-            *handles = m_renew(uint16_t, *handles, *num_handles, *num_handles + num_descriptors[characteristic_index]);
-
-            mp_obj_iter_buf_t iter_buf_desc;
-            mp_obj_t iterable_desc = mp_getiter(characteristic_items[2], &iter_buf_desc);
-            mp_obj_t descriptor_obj;
-
-            // Extract out descriptors for this characteristic.
-            while ((descriptor_obj = mp_iternext(iterable_desc)) != MP_OBJ_STOP_ITERATION) {
-                // (uuid, flags,)
-                mp_obj_t *descriptor_items;
-                mp_obj_get_array_fixed_n(descriptor_obj, 2, &descriptor_items);
-                mp_obj_t desc_uuid_obj = descriptor_items[0];
-                if (!mp_obj_is_type(desc_uuid_obj, &mp_type_bluetooth_uuid)) {
-                    mp_raise_ValueError(MP_ERROR_TEXT("invalid descriptor UUID"));
+                    (*handles)[handle_index++] = 0xffff;
                 }
 
-                descriptor_uuids[descriptor_index] = MP_OBJ_TO_PTR(desc_uuid_obj);
-                descriptor_flags[descriptor_index] = mp_obj_get_int(descriptor_items[1]);
-                ++descriptor_index;
-
-                (*handles)[handle_index++] = 0xffff;
+                // Reflect that we've grown the handles array.
+                *num_handles += num_descriptors[characteristic_index];
             }
-
-            // Reflect that we've grown the handles array.
-            *num_handles += num_descriptors[characteristic_index];
         }
 
         characteristic_uuids[characteristic_index] = MP_OBJ_TO_PTR(uuid_obj);

From cacc96d98c2a70dc7e5194331ea70746c39746ec Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Tue, 9 Aug 2022 16:50:58 +1000
Subject: [PATCH 2587/3533] extmod/modbluetooth: Replace def_handle with
 end_handle in char IRQ.

This is technically a breaking change, but:
a) We need the end handle to do descriptor discovery properly.
b) We have no possible use for the existing definition handle in the
characteristic result IRQ. None of the methods can use it, and therefore
no existing code should be using it in a way that changing it to a
different integer value should break.

Unfortunately NimBLE doesn't make it easy to get the end handle, so also
implement a mechanism to use the following characteristic to calculate
the previous characteristic's end handle.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 docs/library/bluetooth.rst            |  2 +-
 extmod/btstack/modbluetooth_btstack.c |  2 +-
 extmod/modbluetooth.c                 | 12 +++--
 extmod/modbluetooth.h                 |  2 +-
 extmod/nimble/modbluetooth_nimble.c   | 70 +++++++++++++++++++++++----
 extmod/nimble/modbluetooth_nimble.h   | 15 ++++++
 6 files changed, 86 insertions(+), 17 deletions(-)

diff --git a/docs/library/bluetooth.rst b/docs/library/bluetooth.rst
index 052f7a5c78039..8f7041e8d3fbc 100644
--- a/docs/library/bluetooth.rst
+++ b/docs/library/bluetooth.rst
@@ -166,7 +166,7 @@ Event Handling
                 conn_handle, status = data
             elif event == _IRQ_GATTC_CHARACTERISTIC_RESULT:
                 # Called for each characteristic found by gattc_discover_services().
-                conn_handle, def_handle, value_handle, properties, uuid = data
+                conn_handle, end_handle, value_handle, properties, uuid = data
             elif event == _IRQ_GATTC_CHARACTERISTIC_DONE:
                 # Called once service discovery is complete.
                 # Note: Status will be zero on success, implementation-specific value otherwise.
diff --git a/extmod/btstack/modbluetooth_btstack.c b/extmod/btstack/modbluetooth_btstack.c
index d41c671d68a32..b58be78a9942d 100644
--- a/extmod/btstack/modbluetooth_btstack.c
+++ b/extmod/btstack/modbluetooth_btstack.c
@@ -450,7 +450,7 @@ STATIC void btstack_packet_handler(uint8_t packet_type, uint8_t *packet, uint8_t
         gatt_client_characteristic_t characteristic;
         gatt_event_characteristic_query_result_get_characteristic(packet, &characteristic);
         mp_obj_bluetooth_uuid_t characteristic_uuid = create_mp_uuid(characteristic.uuid16, characteristic.uuid128);
-        mp_bluetooth_gattc_on_characteristic_result(conn_handle, characteristic.start_handle, characteristic.value_handle, characteristic.properties, &characteristic_uuid);
+        mp_bluetooth_gattc_on_characteristic_result(conn_handle, characteristic.value_handle, characteristic.end_handle, characteristic.properties, &characteristic_uuid);
     } else if (event_type == GATT_EVENT_ALL_CHARACTERISTIC_DESCRIPTORS_QUERY_RESULT) {
         DEBUG_printf("  --> gatt descriptor query result\n");
         uint16_t conn_handle = gatt_event_all_characteristic_descriptors_query_result_get_handle(packet);
diff --git a/extmod/modbluetooth.c b/extmod/modbluetooth.c
index c2cbf0e70ad52..bd4d9b71790c1 100644
--- a/extmod/modbluetooth.c
+++ b/extmod/modbluetooth.c
@@ -1101,7 +1101,7 @@ STATIC mp_obj_t bluetooth_ble_invoke_irq(mp_obj_t none_in) {
             // conn_handle, start_handle, end_handle, uuid
             ringbuf_extract(&o->ringbuf, data_tuple, 3, 0, NULL, 0, &o->irq_data_uuid, NULL);
         } else if (event == MP_BLUETOOTH_IRQ_GATTC_CHARACTERISTIC_RESULT) {
-            // conn_handle, def_handle, value_handle, properties, uuid
+            // conn_handle, end_handle, value_handle, properties, uuid
             ringbuf_extract(&o->ringbuf, data_tuple, 3, 1, NULL, 0, &o->irq_data_uuid, NULL);
         } else if (event == MP_BLUETOOTH_IRQ_GATTC_DESCRIPTOR_RESULT) {
             // conn_handle, handle, uuid
@@ -1375,8 +1375,9 @@ void mp_bluetooth_gattc_on_primary_service_result(uint16_t conn_handle, uint16_t
     invoke_irq_handler(MP_BLUETOOTH_IRQ_GATTC_SERVICE_RESULT, args, 3, 0, NULL_ADDR, service_uuid, NULL_DATA, NULL_DATA_LEN, 0);
 }
 
-void mp_bluetooth_gattc_on_characteristic_result(uint16_t conn_handle, uint16_t def_handle, uint16_t value_handle, uint8_t properties, mp_obj_bluetooth_uuid_t *characteristic_uuid) {
-    mp_int_t args[] = {conn_handle, def_handle, value_handle, properties};
+void mp_bluetooth_gattc_on_characteristic_result(uint16_t conn_handle, uint16_t value_handle, uint16_t end_handle, uint8_t properties, mp_obj_bluetooth_uuid_t *characteristic_uuid) {
+    // Note: "end_handle" replaces "def_handle" from the original version of this event.
+    mp_int_t args[] = {conn_handle, end_handle, value_handle, properties};
     invoke_irq_handler(MP_BLUETOOTH_IRQ_GATTC_CHARACTERISTIC_RESULT, args, 4, 0, NULL_ADDR, characteristic_uuid, NULL_DATA, NULL_DATA_LEN, 0);
 }
 
@@ -1588,12 +1589,13 @@ void mp_bluetooth_gattc_on_primary_service_result(uint16_t conn_handle, uint16_t
     schedule_ringbuf(atomic_state);
 }
 
-void mp_bluetooth_gattc_on_characteristic_result(uint16_t conn_handle, uint16_t def_handle, uint16_t value_handle, uint8_t properties, mp_obj_bluetooth_uuid_t *characteristic_uuid) {
+void mp_bluetooth_gattc_on_characteristic_result(uint16_t conn_handle, uint16_t value_handle, uint16_t end_handle, uint8_t properties, mp_obj_bluetooth_uuid_t *characteristic_uuid) {
     MICROPY_PY_BLUETOOTH_ENTER
     mp_obj_bluetooth_ble_t *o = MP_OBJ_TO_PTR(MP_STATE_VM(bluetooth));
     if (enqueue_irq(o, 2 + 2 + 2 + 1 + characteristic_uuid->type, MP_BLUETOOTH_IRQ_GATTC_CHARACTERISTIC_RESULT)) {
         ringbuf_put16(&o->ringbuf, conn_handle);
-        ringbuf_put16(&o->ringbuf, def_handle);
+        // Note: "end_handle" replaces "def_handle" from the original version of this event.
+        ringbuf_put16(&o->ringbuf, end_handle);
         ringbuf_put16(&o->ringbuf, value_handle);
         ringbuf_put(&o->ringbuf, properties);
         ringbuf_put_uuid(&o->ringbuf, characteristic_uuid);
diff --git a/extmod/modbluetooth.h b/extmod/modbluetooth.h
index 52053045f852c..d490346278203 100644
--- a/extmod/modbluetooth.h
+++ b/extmod/modbluetooth.h
@@ -459,7 +459,7 @@ void mp_bluetooth_gap_on_scan_result(uint8_t addr_type, const uint8_t *addr, uin
 void mp_bluetooth_gattc_on_primary_service_result(uint16_t conn_handle, uint16_t start_handle, uint16_t end_handle, mp_obj_bluetooth_uuid_t *service_uuid);
 
 // Notify modbluetooth that a characteristic was found (either by discover-all-on-service, or discover-by-uuid-on-service).
-void mp_bluetooth_gattc_on_characteristic_result(uint16_t conn_handle, uint16_t def_handle, uint16_t value_handle, uint8_t properties, mp_obj_bluetooth_uuid_t *characteristic_uuid);
+void mp_bluetooth_gattc_on_characteristic_result(uint16_t conn_handle, uint16_t value_handle, uint16_t end_handle, uint8_t properties, mp_obj_bluetooth_uuid_t *characteristic_uuid);
 
 // Notify modbluetooth that a descriptor was found.
 void mp_bluetooth_gattc_on_descriptor_result(uint16_t conn_handle, uint16_t handle, mp_obj_bluetooth_uuid_t *descriptor_uuid);
diff --git a/extmod/nimble/modbluetooth_nimble.c b/extmod/nimble/modbluetooth_nimble.c
index c26c09e61a2cb..b0194446bd4ba 100644
--- a/extmod/nimble/modbluetooth_nimble.c
+++ b/extmod/nimble/modbluetooth_nimble.c
@@ -1310,15 +1310,51 @@ int mp_bluetooth_gattc_discover_primary_services(uint16_t conn_handle, const mp_
     return ble_hs_err_to_errno(err);
 }
 
+STATIC bool match_char_uuid(const mp_obj_bluetooth_uuid_t *filter_uuid, const ble_uuid_any_t *result_uuid) {
+    if (!filter_uuid) {
+        return true;
+    }
+    ble_uuid_any_t filter_uuid_nimble;
+    create_nimble_uuid(filter_uuid, &filter_uuid_nimble);
+    return ble_uuid_cmp(&result_uuid->u, &filter_uuid_nimble.u) == 0;
+}
+
 STATIC int ble_gattc_characteristic_cb(uint16_t conn_handle, const struct ble_gatt_error *error, const struct ble_gatt_chr *characteristic, void *arg) {
     DEBUG_printf("ble_gattc_characteristic_cb: conn_handle=%d status=%d def_handle=%d val_handle=%d\n", conn_handle, error->status, characteristic ? characteristic->def_handle : -1, characteristic ? characteristic->val_handle : -1);
     if (!mp_bluetooth_is_active()) {
         return 0;
     }
+
+    mp_bluetooth_nimble_pending_characteristic_t *pending = &MP_STATE_PORT(bluetooth_nimble_root_pointers)->pending_char_result;
+    if (pending->ready) {
+        // If there's a pending characteristic, we now know what it's end handle is, report it up to modbluetooth.
+        pending->ready = 0;
+
+        // The end handle will either be the end of the query range (there are
+        // no more results), or one before the current result's definition
+        // handle.
+        uint16_t end_handle = MP_STATE_PORT(bluetooth_nimble_root_pointers)->char_disc_end_handle;
+        if (error->status == 0) {
+            end_handle = characteristic->def_handle - 1;
+        }
+
+        // Assume same conn_handle because we're limiting to a single active discovery.
+        mp_bluetooth_gattc_on_characteristic_result(conn_handle, pending->value_handle, end_handle, pending->properties, &pending->uuid);
+    }
+
     if (error->status == 0) {
-        mp_obj_bluetooth_uuid_t characteristic_uuid = create_mp_uuid(&characteristic->uuid);
-        mp_bluetooth_gattc_on_characteristic_result(conn_handle, characteristic->def_handle, characteristic->val_handle, characteristic->properties, &characteristic_uuid);
+        // If there's no filter, or the filter matches, then save this result.
+        if (match_char_uuid(MP_STATE_PORT(bluetooth_nimble_root_pointers)->char_filter_uuid, &characteristic->uuid)) {
+            pending->value_handle = characteristic->val_handle;
+            pending->properties = characteristic->properties;
+            pending->uuid = create_mp_uuid(&characteristic->uuid);
+            pending->ready = 1;
+        }
     } else {
+        // Finished (or failed). Allow another characteristic discovery to start.
+        MP_STATE_PORT(bluetooth_nimble_root_pointers)->char_disc_end_handle = 0;
+
+        // Report completion.
         mp_bluetooth_gattc_on_discover_complete(MP_BLUETOOTH_IRQ_GATTC_CHARACTERISTIC_DONE, conn_handle, error->status == BLE_HS_EDONE ? 0 : error->status);
     }
     return 0;
@@ -1328,13 +1364,29 @@ int mp_bluetooth_gattc_discover_characteristics(uint16_t conn_handle, uint16_t s
     if (!mp_bluetooth_is_active()) {
         return ERRNO_BLUETOOTH_NOT_ACTIVE;
     }
-    int err;
-    if (uuid) {
-        ble_uuid_any_t nimble_uuid;
-        create_nimble_uuid(uuid, &nimble_uuid);
-        err = ble_gattc_disc_chrs_by_uuid(conn_handle, start_handle, end_handle, &nimble_uuid.u, &ble_gattc_characteristic_cb, NULL);
-    } else {
-        err = ble_gattc_disc_all_chrs(conn_handle, start_handle, end_handle, &ble_gattc_characteristic_cb, NULL);
+
+    // The implementation of characteristic discovery queries for all
+    // characteristics, and then UUID filtering is applied by NimBLE on each
+    // characteristic. Unfortunately, each characteristic result does not
+    // include its end handle, so you need to know the next characteristic
+    // before you can raise the previous one to modbluetooth. But if we let
+    // NimBLE do the filtering, then we don't necessarily see the next one.
+    // So we make NimBLE return all results and do the filtering here instead.
+
+    if (MP_STATE_PORT(bluetooth_nimble_root_pointers)->char_disc_end_handle) {
+        // Only allow a single discovery (otherwise we'd need to track a
+        // pending characteristic per conn handle).
+        return MP_EBUSY;
+    }
+
+    // Set the uuid filter (if any). This needs to be a root pointer,
+    // otherwise we'd use ble_gattc_disc_all_chrs's arg param.
+    MP_STATE_PORT(bluetooth_nimble_root_pointers)->char_filter_uuid = uuid;
+
+    int err = ble_gattc_disc_all_chrs(conn_handle, start_handle, end_handle, &ble_gattc_characteristic_cb, NULL);
+    if (!err) {
+        // Lock out concurrent characteristic discovery.
+        MP_STATE_PORT(bluetooth_nimble_root_pointers)->char_disc_end_handle = end_handle;
     }
     return ble_hs_err_to_errno(err);
 }
diff --git a/extmod/nimble/modbluetooth_nimble.h b/extmod/nimble/modbluetooth_nimble.h
index 15648a9959a60..d9bef649201ce 100644
--- a/extmod/nimble/modbluetooth_nimble.h
+++ b/extmod/nimble/modbluetooth_nimble.h
@@ -31,6 +31,13 @@
 
 #define MP_BLUETOOTH_NIMBLE_MAX_SERVICES (8)
 
+typedef struct _mp_bluetooth_nimble_pending_characteristic_t {
+    uint16_t value_handle;
+    uint8_t properties;
+    mp_obj_bluetooth_uuid_t uuid;
+    uint8_t ready;
+} mp_bluetooth_nimble_pending_characteristic_t;
+
 typedef struct _mp_bluetooth_nimble_root_pointers_t {
     // Characteristic (and descriptor) value storage.
     mp_gatts_db_t gatts_db;
@@ -44,6 +51,14 @@ typedef struct _mp_bluetooth_nimble_root_pointers_t {
     struct _mp_bluetooth_nimble_l2cap_channel_t *l2cap_chan;
     bool l2cap_listening;
     #endif
+
+    #if MICROPY_PY_BLUETOOTH_ENABLE_GATT_CLIENT
+    // Workaround to allow us to get the end_handle of each characteristic
+    // during discovery. See mp_bluetooth_gattc_discover_characteristics().
+    uint16_t char_disc_end_handle;
+    const mp_obj_bluetooth_uuid_t *char_filter_uuid;
+    mp_bluetooth_nimble_pending_characteristic_t pending_char_result;
+    #endif
 } mp_bluetooth_nimble_root_pointers_t;
 
 enum {

From 1d4228ccc1f4b6760007a8370d75a3ae3339c801 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 9 Sep 2022 14:14:31 +1000
Subject: [PATCH 2588/3533] zephyr/boards: Add config for bbc_microbit_v2.

This enables the bluetooth module.  GAP scanning and advertising works.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/zephyr/boards/bbc_microbit_v2.conf | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 ports/zephyr/boards/bbc_microbit_v2.conf

diff --git a/ports/zephyr/boards/bbc_microbit_v2.conf b/ports/zephyr/boards/bbc_microbit_v2.conf
new file mode 100644
index 0000000000000..31872244ca712
--- /dev/null
+++ b/ports/zephyr/boards/bbc_microbit_v2.conf
@@ -0,0 +1,8 @@
+CONFIG_CONSOLE_SUBSYS=n
+CONFIG_NETWORKING=n
+CONFIG_BT=y
+CONFIG_BT_DEVICE_NAME_DYNAMIC=y
+CONFIG_BT_PERIPHERAL=y
+CONFIG_BT_CENTRAL=y
+
+CONFIG_MICROPY_HEAP_SIZE=98304

From 4903e48e340bd9741577f30cacb31605cc70cf20 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Fri, 9 Sep 2022 18:12:55 +1000
Subject: [PATCH 2589/3533] tools/makemanifest.py: Force the repo version of
 the mpy_cross package.

In case the version from pypi is installed or some other version is
available in sys.path, prepend `$(TOP)/mpy-cross` to sys.path instead.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 tools/makemanifest.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tools/makemanifest.py b/tools/makemanifest.py
index d059d4a2660fe..9dd8815aac5f7 100644
--- a/tools/makemanifest.py
+++ b/tools/makemanifest.py
@@ -29,7 +29,8 @@
 import os
 import subprocess
 
-sys.path.append(os.path.join(os.path.dirname(__file__), "../mpy-cross"))
+# Always use the mpy-cross from this repo.
+sys.path.insert(0, os.path.join(os.path.dirname(__file__), "../mpy-cross"))
 import mpy_cross
 
 import manifestfile

From 582b3e4e7864809e30eac694251600f61db52a3c Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Fri, 9 Sep 2022 09:48:01 +1000
Subject: [PATCH 2590/3533] py/objpolyiter: Add a new polyiter type with
 finaliser support.

---
 py/obj.h         |  3 +++
 py/objpolyiter.c | 34 ++++++++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+)

diff --git a/py/obj.h b/py/obj.h
index e048cf0c286af..8949830282256 100644
--- a/py/obj.h
+++ b/py/obj.h
@@ -677,6 +677,9 @@ extern const mp_obj_type_t mp_type_stringio;
 extern const mp_obj_type_t mp_type_bytesio;
 extern const mp_obj_type_t mp_type_reversed;
 extern const mp_obj_type_t mp_type_polymorph_iter;
+#if MICROPY_ENABLE_FINALISER
+extern const mp_obj_type_t mp_type_polymorph_iter_with_finaliser;
+#endif
 
 // Exceptions
 extern const mp_obj_type_t mp_type_BaseException;
diff --git a/py/objpolyiter.c b/py/objpolyiter.c
index 01880bff9c1b9..16fd1f486c15f 100644
--- a/py/objpolyiter.c
+++ b/py/objpolyiter.c
@@ -51,3 +51,37 @@ const mp_obj_type_t mp_type_polymorph_iter = {
     .getiter = mp_identity_getiter,
     .iternext = polymorph_it_iternext,
 };
+
+#if MICROPY_ENABLE_FINALISER
+// mp_type_polymorph_iter_with_finaliser is a variant of the universal iterator
+// above which has a finaliser function attached. This function will be run when
+// the GC collects the iter object and can be used to close file handles etc.
+
+// Any instance should have these 3 fields at the beginning
+typedef struct _mp_obj_polymorph_iter_with_finaliser_t {
+    mp_obj_base_t base;
+    mp_fun_1_t iternext;
+    mp_fun_1_t finaliser;
+} mp_obj_polymorph_with_finaliser_iter_t;
+
+STATIC mp_obj_t mp_obj_polymorph_iter_del(mp_obj_t self_in) {
+    mp_obj_polymorph_with_finaliser_iter_t *self = MP_OBJ_TO_PTR(self_in);
+    // Redirect call to object instance's iternext method
+    return self->finaliser(self_in);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_obj_polymorph_iter_del_obj, mp_obj_polymorph_iter_del);
+
+STATIC const mp_rom_map_elem_t mp_obj_polymorph_iter_locals_dict_table[] = {
+    { MP_ROM_QSTR(MP_QSTR___del__), MP_ROM_PTR(&mp_obj_polymorph_iter_del_obj) },
+};
+STATIC MP_DEFINE_CONST_DICT(mp_obj_polymorph_iter_locals_dict, mp_obj_polymorph_iter_locals_dict_table);
+
+const mp_obj_type_t mp_type_polymorph_iter_with_finaliser = {
+    { &mp_type_type },
+    .name = MP_QSTR_iterator,
+    .getiter = mp_identity_getiter,
+    .iternext = polymorph_it_iternext,
+    .locals_dict = (mp_obj_dict_t *)&mp_obj_polymorph_iter_locals_dict,
+};
+
+#endif

From 4e0964b59f44b25ebaa5239f9ea4273b804ebe64 Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Fri, 9 Sep 2022 09:48:01 +1000
Subject: [PATCH 2591/3533] extmod/vfs: Add finaliser to ilistdir to close
 directory handle.

When iterating over filesystem/folders with os.iterdir(), an open file
(directory) handle is used internally.  Currently this file handle is only
closed once the iterator is completely drained, eg. once all entries have
been looped over / converted into list etc.

If a program opens an iterdir but does not loop over it, or starts to loop
over the iterator but breaks out of the loop, then the handle never gets
closed.  In this state, when the iter object is cleaned up by the garbage
collector this open handle can cause corruption of the filesystem.

Fixes issues #6568 and #8506.
---
 extmod/vfs_fat.c                           | 16 ++++-
 extmod/vfs_lfsx.c                          | 25 +++++++-
 extmod/vfs_posix.c                         | 19 +++++-
 tests/extmod/vfs_fat_ilistdir_del.py       | 75 ++++++++++++++++++++++
 tests/extmod/vfs_fat_ilistdir_del.py.exp   | 30 +++++++++
 tests/extmod/vfs_lfs_ilistdir_del.py       | 75 ++++++++++++++++++++++
 tests/extmod/vfs_lfs_ilistdir_del.py.exp   | 30 +++++++++
 tests/extmod/vfs_posix_ilistdir_del.py     | 70 ++++++++++++++++++++
 tests/extmod/vfs_posix_ilistdir_del.py.exp | 30 +++++++++
 tools/ci.sh                                |  4 +-
 10 files changed, 368 insertions(+), 6 deletions(-)
 create mode 100644 tests/extmod/vfs_fat_ilistdir_del.py
 create mode 100644 tests/extmod/vfs_fat_ilistdir_del.py.exp
 create mode 100644 tests/extmod/vfs_lfs_ilistdir_del.py
 create mode 100644 tests/extmod/vfs_lfs_ilistdir_del.py.exp
 create mode 100644 tests/extmod/vfs_posix_ilistdir_del.py
 create mode 100644 tests/extmod/vfs_posix_ilistdir_del.py.exp

diff --git a/extmod/vfs_fat.c b/extmod/vfs_fat.c
index 27681ca77012a..7d8b51efeb617 100644
--- a/extmod/vfs_fat.c
+++ b/extmod/vfs_fat.c
@@ -28,6 +28,10 @@
 #include "py/mpconfig.h"
 #if MICROPY_VFS_FAT
 
+#if !MICROPY_ENABLE_FINALISER
+#error "MICROPY_VFS_FAT requires MICROPY_ENABLE_FINALISER"
+#endif
+
 #if !MICROPY_VFS
 #error "with MICROPY_VFS_FAT enabled, must also enable MICROPY_VFS"
 #endif
@@ -118,6 +122,7 @@ STATIC MP_DEFINE_CONST_STATICMETHOD_OBJ(fat_vfs_mkfs_obj, MP_ROM_PTR(&fat_vfs_mk
 typedef struct _mp_vfs_fat_ilistdir_it_t {
     mp_obj_base_t base;
     mp_fun_1_t iternext;
+    mp_fun_1_t finaliser;
     bool is_str;
     FF_DIR dir;
 } mp_vfs_fat_ilistdir_it_t;
@@ -162,6 +167,13 @@ STATIC mp_obj_t mp_vfs_fat_ilistdir_it_iternext(mp_obj_t self_in) {
     return MP_OBJ_STOP_ITERATION;
 }
 
+STATIC mp_obj_t mp_vfs_fat_ilistdir_it_del(mp_obj_t self_in) {
+    mp_vfs_fat_ilistdir_it_t *self = MP_OBJ_TO_PTR(self_in);
+    // ignore result / error because we may be closing a second time.
+    f_closedir(&self->dir);
+    return mp_const_none;
+}
+
 STATIC mp_obj_t fat_vfs_ilistdir_func(size_t n_args, const mp_obj_t *args) {
     mp_obj_fat_vfs_t *self = MP_OBJ_TO_PTR(args[0]);
     bool is_str_type = true;
@@ -176,8 +188,10 @@ STATIC mp_obj_t fat_vfs_ilistdir_func(size_t n_args, const mp_obj_t *args) {
     }
 
     // Create a new iterator object to list the dir
-    mp_vfs_fat_ilistdir_it_t *iter = mp_obj_malloc(mp_vfs_fat_ilistdir_it_t, &mp_type_polymorph_iter);
+    mp_vfs_fat_ilistdir_it_t *iter = m_new_obj_with_finaliser(mp_vfs_fat_ilistdir_it_t);
+    iter->base.type = &mp_type_polymorph_iter_with_finaliser;
     iter->iternext = mp_vfs_fat_ilistdir_it_iternext;
+    iter->finaliser = mp_vfs_fat_ilistdir_it_del;
     iter->is_str = is_str_type;
     FRESULT res = f_opendir(&self->fatfs, &iter->dir, path);
     if (res != FR_OK) {
diff --git a/extmod/vfs_lfsx.c b/extmod/vfs_lfsx.c
index dbd32338cfd9f..fbfeaa5ccf1a2 100644
--- a/extmod/vfs_lfsx.c
+++ b/extmod/vfs_lfsx.c
@@ -36,6 +36,10 @@
 #include "extmod/vfs.h"
 #include "shared/timeutils/timeutils.h"
 
+#if !MICROPY_ENABLE_FINALISER
+#error "MICROPY_VFS_LFS requires MICROPY_ENABLE_FINALISER"
+#endif
+
 STATIC int MP_VFS_LFSx(dev_ioctl)(const struct LFSx_API (config) * c, int cmd, int arg, bool must_return_int) {
     mp_obj_t ret = mp_vfs_blockdev_ioctl(c->context, cmd, arg);
     int ret_i = 0;
@@ -155,6 +159,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_3(MP_VFS_LFSx(open_obj), MP_VFS_LFSx(file_open));
 typedef struct MP_VFS_LFSx (_ilistdir_it_t) {
     mp_obj_base_t base;
     mp_fun_1_t iternext;
+    mp_fun_1_t finaliser;
     bool is_str;
     MP_OBJ_VFS_LFSx *vfs;
     LFSx_API(dir_t) dir;
@@ -163,11 +168,16 @@ typedef struct MP_VFS_LFSx (_ilistdir_it_t) {
 STATIC mp_obj_t MP_VFS_LFSx(ilistdir_it_iternext)(mp_obj_t self_in) {
     MP_VFS_LFSx(ilistdir_it_t) * self = MP_OBJ_TO_PTR(self_in);
 
+    if (self->vfs == NULL) {
+        return MP_OBJ_STOP_ITERATION;
+    }
+
     struct LFSx_API (info) info;
     for (;;) {
         int ret = LFSx_API(dir_read)(&self->vfs->lfs, &self->dir, &info);
         if (ret == 0) {
             LFSx_API(dir_close)(&self->vfs->lfs, &self->dir);
+            self->vfs = NULL;
             return MP_OBJ_STOP_ITERATION;
         }
         if (!(info.name[0] == '.' && (info.name[1] == '\0'
@@ -190,6 +200,14 @@ STATIC mp_obj_t MP_VFS_LFSx(ilistdir_it_iternext)(mp_obj_t self_in) {
     return MP_OBJ_FROM_PTR(t);
 }
 
+STATIC mp_obj_t MP_VFS_LFSx(ilistdir_it_del)(mp_obj_t self_in) {
+    MP_VFS_LFSx(ilistdir_it_t) * self = MP_OBJ_TO_PTR(self_in);
+    if (self->vfs != NULL) {
+        LFSx_API(dir_close)(&self->vfs->lfs, &self->dir);
+    }
+    return mp_const_none;
+}
+
 STATIC mp_obj_t MP_VFS_LFSx(ilistdir_func)(size_t n_args, const mp_obj_t *args) {
     MP_OBJ_VFS_LFSx *self = MP_OBJ_TO_PTR(args[0]);
     bool is_str_type = true;
@@ -203,14 +221,17 @@ STATIC mp_obj_t MP_VFS_LFSx(ilistdir_func)(size_t n_args, const mp_obj_t *args)
         path = vstr_null_terminated_str(&self->cur_dir);
     }
 
-    MP_VFS_LFSx(ilistdir_it_t) * iter = mp_obj_malloc(MP_VFS_LFSx(ilistdir_it_t), &mp_type_polymorph_iter);
+    MP_VFS_LFSx(ilistdir_it_t) * iter = m_new_obj_with_finaliser(MP_VFS_LFSx(ilistdir_it_t));
+    iter->base.type = &mp_type_polymorph_iter_with_finaliser;
+
     iter->iternext = MP_VFS_LFSx(ilistdir_it_iternext);
+    iter->finaliser = MP_VFS_LFSx(ilistdir_it_del);
     iter->is_str = is_str_type;
-    iter->vfs = self;
     int ret = LFSx_API(dir_open)(&self->lfs, &iter->dir, path);
     if (ret < 0) {
         mp_raise_OSError(-ret);
     }
+    iter->vfs = self;
     return MP_OBJ_FROM_PTR(iter);
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(MP_VFS_LFSx(ilistdir_obj), 1, 2, MP_VFS_LFSx(ilistdir_func));
diff --git a/extmod/vfs_posix.c b/extmod/vfs_posix.c
index 9b00365817a17..36b211b84d6b7 100644
--- a/extmod/vfs_posix.c
+++ b/extmod/vfs_posix.c
@@ -33,6 +33,10 @@
 
 #if MICROPY_VFS_POSIX
 
+#if !MICROPY_ENABLE_FINALISER
+#error "MICROPY_VFS_POSIX requires MICROPY_ENABLE_FINALISER"
+#endif
+
 #include <stdio.h>
 #include <string.h>
 #include <sys/stat.h>
@@ -162,6 +166,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(vfs_posix_getcwd_obj, vfs_posix_getcwd);
 typedef struct _vfs_posix_ilistdir_it_t {
     mp_obj_base_t base;
     mp_fun_1_t iternext;
+    mp_fun_1_t finaliser;
     bool is_str;
     DIR *dir;
 } vfs_posix_ilistdir_it_t;
@@ -226,10 +231,22 @@ STATIC mp_obj_t vfs_posix_ilistdir_it_iternext(mp_obj_t self_in) {
     }
 }
 
+STATIC mp_obj_t vfs_posix_ilistdir_it_del(mp_obj_t self_in) {
+    vfs_posix_ilistdir_it_t *self = MP_OBJ_TO_PTR(self_in);
+    if (self->dir != NULL) {
+        MP_THREAD_GIL_EXIT();
+        closedir(self->dir);
+        MP_THREAD_GIL_ENTER();
+    }
+    return mp_const_none;
+}
+
 STATIC mp_obj_t vfs_posix_ilistdir(mp_obj_t self_in, mp_obj_t path_in) {
     mp_obj_vfs_posix_t *self = MP_OBJ_TO_PTR(self_in);
-    vfs_posix_ilistdir_it_t *iter = mp_obj_malloc(vfs_posix_ilistdir_it_t, &mp_type_polymorph_iter);
+    vfs_posix_ilistdir_it_t *iter = m_new_obj_with_finaliser(vfs_posix_ilistdir_it_t);
+    iter->base.type = &mp_type_polymorph_iter_with_finaliser;
     iter->iternext = vfs_posix_ilistdir_it_iternext;
+    iter->finaliser = vfs_posix_ilistdir_it_del;
     iter->is_str = mp_obj_get_type(path_in) == &mp_type_str;
     const char *path = vfs_posix_get_path_str(self, path_in);
     if (path[0] == '\0') {
diff --git a/tests/extmod/vfs_fat_ilistdir_del.py b/tests/extmod/vfs_fat_ilistdir_del.py
new file mode 100644
index 0000000000000..a833e9ac128c5
--- /dev/null
+++ b/tests/extmod/vfs_fat_ilistdir_del.py
@@ -0,0 +1,75 @@
+# Test ilistdir __del__ for VfsFat using a RAM device.
+import gc
+
+try:
+    import uos
+
+    uos.VfsFat
+except (ImportError, AttributeError):
+    print("SKIP")
+    raise SystemExit
+
+
+class RAMBlockDevice:
+    ERASE_BLOCK_SIZE = 4096
+
+    def __init__(self, blocks):
+        self.data = bytearray(blocks * self.ERASE_BLOCK_SIZE)
+
+    def readblocks(self, block, buf, off=0):
+        addr = block * self.ERASE_BLOCK_SIZE + off
+        for i in range(len(buf)):
+            buf[i] = self.data[addr + i]
+
+    def writeblocks(self, block, buf, off=0):
+        addr = block * self.ERASE_BLOCK_SIZE + off
+        for i in range(len(buf)):
+            self.data[addr + i] = buf[i]
+
+    def ioctl(self, op, arg):
+        if op == 4:  # block count
+            return len(self.data) // self.ERASE_BLOCK_SIZE
+        if op == 5:  # block size
+            return self.ERASE_BLOCK_SIZE
+        if op == 6:  # erase block
+            return 0
+
+
+def test(bdev, vfs_class):
+    vfs_class.mkfs(bdev)
+    vfs = vfs_class(bdev)
+    vfs.mkdir("/test_d1")
+    vfs.mkdir("/test_d2")
+    vfs.mkdir("/test_d3")
+
+    for i in range(10):
+        print(i)
+
+        # We want to partially iterate the ilistdir iterator to leave it in an
+        # open state, which will then test the finaliser when it's garbage collected.
+        idir = vfs.ilistdir("/")
+        print(any(idir))
+
+        # Alternate way of partially iterating the ilistdir object, modifying the
+        # filesystem while it's open.
+        for dname, *_ in vfs.ilistdir("/"):
+            vfs.rmdir(dname)
+            break
+        vfs.mkdir(dname)
+
+        # Also create a fully drained iterator and ensure trying to re-use it
+        # throws the correct exception.
+        idir_emptied = vfs.ilistdir("/")
+        l = list(idir_emptied)
+        print(len(l))
+        try:
+            next(idir_emptied)
+        except StopIteration:
+            pass
+
+        gc.collect()
+        vfs.open("/test", "w").close()
+
+
+bdev = RAMBlockDevice(30)
+test(bdev, uos.VfsFat)
diff --git a/tests/extmod/vfs_fat_ilistdir_del.py.exp b/tests/extmod/vfs_fat_ilistdir_del.py.exp
new file mode 100644
index 0000000000000..0ab2b019f4b6c
--- /dev/null
+++ b/tests/extmod/vfs_fat_ilistdir_del.py.exp
@@ -0,0 +1,30 @@
+0
+True
+3
+1
+True
+4
+2
+True
+4
+3
+True
+4
+4
+True
+4
+5
+True
+4
+6
+True
+4
+7
+True
+4
+8
+True
+4
+9
+True
+4
diff --git a/tests/extmod/vfs_lfs_ilistdir_del.py b/tests/extmod/vfs_lfs_ilistdir_del.py
new file mode 100644
index 0000000000000..073576986d3ac
--- /dev/null
+++ b/tests/extmod/vfs_lfs_ilistdir_del.py
@@ -0,0 +1,75 @@
+# Test ilistdir __del__ for VfsLittle using a RAM device.
+import gc
+
+try:
+    import uos
+
+    uos.VfsLfs2
+except (ImportError, AttributeError):
+    print("SKIP")
+    raise SystemExit
+
+
+class RAMBlockDevice:
+    ERASE_BLOCK_SIZE = 1024
+
+    def __init__(self, blocks):
+        self.data = bytearray(blocks * self.ERASE_BLOCK_SIZE)
+
+    def readblocks(self, block, buf, off):
+        addr = block * self.ERASE_BLOCK_SIZE + off
+        for i in range(len(buf)):
+            buf[i] = self.data[addr + i]
+
+    def writeblocks(self, block, buf, off):
+        addr = block * self.ERASE_BLOCK_SIZE + off
+        for i in range(len(buf)):
+            self.data[addr + i] = buf[i]
+
+    def ioctl(self, op, arg):
+        if op == 4:  # block count
+            return len(self.data) // self.ERASE_BLOCK_SIZE
+        if op == 5:  # block size
+            return self.ERASE_BLOCK_SIZE
+        if op == 6:  # erase block
+            return 0
+
+
+def test(bdev, vfs_class):
+    vfs_class.mkfs(bdev)
+    vfs = vfs_class(bdev)
+    vfs.mkdir("/test_d1")
+    vfs.mkdir("/test_d2")
+    vfs.mkdir("/test_d3")
+
+    for i in range(10):
+        print(i)
+
+        # We want to partially iterate the ilistdir iterator to leave it in an
+        # open state, which will then test the finaliser when it's garbage collected.
+        idir = vfs.ilistdir("/")
+        print(any(idir))
+
+        # Alternate way of partially iterating the ilistdir object, modifying the
+        # filesystem while it's open.
+        for dname, *_ in vfs.ilistdir("/"):
+            vfs.rmdir(dname)
+            break
+        vfs.mkdir(dname)
+
+        # Also create a fully drained iterator and ensure trying to re-use it
+        # throws the correct exception.
+        idir_emptied = vfs.ilistdir("/")
+        l = list(idir_emptied)
+        print(len(l))
+        try:
+            next(idir_emptied)
+        except StopIteration:
+            pass
+
+        gc.collect()
+        vfs.open("/test", "w").close()
+
+
+bdev = RAMBlockDevice(30)
+test(bdev, uos.VfsLfs2)
diff --git a/tests/extmod/vfs_lfs_ilistdir_del.py.exp b/tests/extmod/vfs_lfs_ilistdir_del.py.exp
new file mode 100644
index 0000000000000..0ab2b019f4b6c
--- /dev/null
+++ b/tests/extmod/vfs_lfs_ilistdir_del.py.exp
@@ -0,0 +1,30 @@
+0
+True
+3
+1
+True
+4
+2
+True
+4
+3
+True
+4
+4
+True
+4
+5
+True
+4
+6
+True
+4
+7
+True
+4
+8
+True
+4
+9
+True
+4
diff --git a/tests/extmod/vfs_posix_ilistdir_del.py b/tests/extmod/vfs_posix_ilistdir_del.py
new file mode 100644
index 0000000000000..edb50dfd6229c
--- /dev/null
+++ b/tests/extmod/vfs_posix_ilistdir_del.py
@@ -0,0 +1,70 @@
+# Test ilistdir __del__ for VfsPosix.
+import gc
+
+try:
+    import os
+
+    os.VfsPosix
+except (ImportError, AttributeError):
+    print("SKIP")
+    raise SystemExit
+
+
+def test(testdir):
+    vfs = os.VfsPosix(testdir)
+    vfs.mkdir("/test_d1")
+    vfs.mkdir("/test_d2")
+    vfs.mkdir("/test_d3")
+
+    for i in range(10):
+        print(i)
+
+        # We want to partially iterate the ilistdir iterator to leave it in an
+        # open state, which will then test the finaliser when it's garbage collected.
+        idir = vfs.ilistdir("/")
+        print(any(idir))
+
+        # Alternate way of partially iterating the ilistdir object, modifying the
+        # filesystem while it's open.
+        for dname, *_ in vfs.ilistdir("/"):
+            vfs.rmdir(dname)
+            break
+        vfs.mkdir(dname)
+
+        # Also create a fully drained iterator and ensure trying to re-use it
+        # throws the correct exception.
+        idir_emptied = vfs.ilistdir("/")
+        l = list(idir_emptied)
+        print(len(l))
+        try:
+            next(idir_emptied)
+        except StopIteration:
+            pass
+
+        gc.collect()
+
+        # Create and delete a file, try to flush out any filesystem
+        # corruption that may be caused over the loops.
+        vfs.open("/test", "w").close()
+        vfs.remove("/test")
+
+
+# We need an empty directory for testing.
+# Skip the test if it already exists.
+temp_dir = "vfs_posix_ilistdir_del_test_dir"
+try:
+    os.stat(temp_dir)
+    print("SKIP")
+    raise SystemExit
+except OSError:
+    pass
+
+os.mkdir(temp_dir)
+
+test(temp_dir)
+
+# Remove tempdir.
+for td in os.listdir(temp_dir):
+    os.rmdir("/".join((temp_dir, td)))
+
+os.rmdir(temp_dir)
diff --git a/tests/extmod/vfs_posix_ilistdir_del.py.exp b/tests/extmod/vfs_posix_ilistdir_del.py.exp
new file mode 100644
index 0000000000000..c30ba41326864
--- /dev/null
+++ b/tests/extmod/vfs_posix_ilistdir_del.py.exp
@@ -0,0 +1,30 @@
+0
+True
+3
+1
+True
+3
+2
+True
+3
+3
+True
+3
+4
+True
+3
+5
+True
+3
+6
+True
+3
+7
+True
+3
+8
+True
+3
+9
+True
+3
diff --git a/tools/ci.sh b/tools/ci.sh
index b4cb7dc2e380a..8f1d729a13260 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -632,7 +632,7 @@ function ci_unix_qemu_mips_run_tests {
     # - (i)listdir does not work, it always returns the empty list (it's an issue with the underlying C call)
     # - ffi tests do not work
     file ./ports/unix/build-coverage/micropython
-    (cd tests && MICROPY_MICROPYTHON=../ports/unix/build-coverage/micropython ./run-tests.py --exclude 'vfs_posix.py' --exclude 'ffi_(callback|float|float2).py')
+    (cd tests && MICROPY_MICROPYTHON=../ports/unix/build-coverage/micropython ./run-tests.py --exclude 'vfs_posix.*\.py' --exclude 'ffi_(callback|float|float2).py')
 }
 
 function ci_unix_qemu_arm_setup {
@@ -652,7 +652,7 @@ function ci_unix_qemu_arm_run_tests {
     # - (i)listdir does not work, it always returns the empty list (it's an issue with the underlying C call)
     export QEMU_LD_PREFIX=/usr/arm-linux-gnueabi
     file ./ports/unix/build-coverage/micropython
-    (cd tests && MICROPY_MICROPYTHON=../ports/unix/build-coverage/micropython ./run-tests.py --exclude 'vfs_posix.py')
+    (cd tests && MICROPY_MICROPYTHON=../ports/unix/build-coverage/micropython ./run-tests.py --exclude 'vfs_posix.*\.py')
 }
 
 ########################################################################################

From 86676a43aa9de47bfdf52c7a71751de1bb512c64 Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Mon, 12 Sep 2022 08:41:39 +1000
Subject: [PATCH 2592/3533] unix/mpconfigport: Enable MICROPY_ENABLE_FINALISER
 when VFS is used.

---
 ports/unix/mpconfigport.h                     | 2 +-
 ports/unix/variants/minimal/mpconfigvariant.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/unix/mpconfigport.h b/ports/unix/mpconfigport.h
index dd73f61e24ba9..cb389d9a53620 100644
--- a/ports/unix/mpconfigport.h
+++ b/ports/unix/mpconfigport.h
@@ -45,7 +45,6 @@
 #ifndef MICROPY_OPT_MAP_LOOKUP_CACHE
 #define MICROPY_OPT_MAP_LOOKUP_CACHE            (1)
 #endif
-#define MICROPY_ENABLE_FINALISER                (1)
 #define MICROPY_STACK_CHECK                     (1)
 #define MICROPY_KBD_EXCEPTION                   (1)
 #define MICROPY_HELPER_REPL                     (1)
@@ -124,6 +123,7 @@
 #ifndef MICROPY_GC_SPLIT_HEAP_N_HEAPS
 #define MICROPY_GC_SPLIT_HEAP_N_HEAPS (1)
 #endif
+#define MICROPY_ENABLE_FINALISER    (1)
 #define MICROPY_MALLOC_USES_ALLOCATED_SIZE (1)
 #define MICROPY_MEM_STATS           (1)
 #define MICROPY_DEBUG_PRINTERS      (1)
diff --git a/ports/unix/variants/minimal/mpconfigvariant.h b/ports/unix/variants/minimal/mpconfigvariant.h
index 2e2c1de0cc87e..d9d2a6c48e643 100644
--- a/ports/unix/variants/minimal/mpconfigvariant.h
+++ b/ports/unix/variants/minimal/mpconfigvariant.h
@@ -37,8 +37,8 @@
 #define MICROPY_ALLOC_PARSE_CHUNK_INIT (64)
 #define MICROPY_ALLOC_PATH_MAX      (PATH_MAX)
 #define MICROPY_ENABLE_GC           (1)
+#define MICROPY_ENABLE_FINALISER    (1)
 #define MICROPY_GC_ALLOC_THRESHOLD  (0)
-#define MICROPY_ENABLE_FINALISER    (0)
 #define MICROPY_STACK_CHECK         (0)
 #define MICROPY_COMP_CONST          (0)
 #define MICROPY_MEM_STATS           (0)

From afc7e1d298add00eacf38be0ae9455f0f09aed2e Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Mon, 12 Sep 2022 08:45:56 +1000
Subject: [PATCH 2593/3533] zephyr/mpconfigport: Enable
 MICROPY_ENABLE_FINALISER when VFS is used.

---
 ports/zephyr/mpconfigport.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/zephyr/mpconfigport.h b/ports/zephyr/mpconfigport.h
index 4c8096b44107a..71836768a44c5 100644
--- a/ports/zephyr/mpconfigport.h
+++ b/ports/zephyr/mpconfigport.h
@@ -39,6 +39,7 @@
 #define MICROPY_ENABLE_SOURCE_LINE  (1)
 #define MICROPY_STACK_CHECK         (1)
 #define MICROPY_ENABLE_GC           (1)
+#define MICROPY_ENABLE_FINALISER    (MICROPY_VFS)
 #define MICROPY_HELPER_REPL         (1)
 #define MICROPY_REPL_AUTO_INDENT    (1)
 #define MICROPY_KBD_EXCEPTION       (1)

From 2d4e7e99bfcfaaed252564f9498176ca3ad88fee Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Mon, 12 Sep 2022 08:47:02 +1000
Subject: [PATCH 2594/3533] samd/mpconfigport: Enable MICROPY_ENABLE_FINALISER
 when VFS is used.

---
 ports/samd/mpconfigport.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/samd/mpconfigport.h b/ports/samd/mpconfigport.h
index 0b16b5e817af0..2c6052149ba30 100644
--- a/ports/samd/mpconfigport.h
+++ b/ports/samd/mpconfigport.h
@@ -41,6 +41,7 @@
 
 // Python internal features
 #define MICROPY_ENABLE_GC                   (1)
+#define MICROPY_ENABLE_FINALISER            (1)
 #define MICROPY_KBD_EXCEPTION               (1)
 #define MICROPY_HELPER_REPL                 (1)
 #define MICROPY_LONGINT_IMPL                (MICROPY_LONGINT_IMPL_MPZ)

From 57fd66b80f8352e4859e6b71536b6083f9d7279c Mon Sep 17 00:00:00 2001
From: Wind-stormger <storm-wind@foxmail.com>
Date: Tue, 30 Aug 2022 11:30:12 +0800
Subject: [PATCH 2595/3533] tools/pyboard.py: Support Windows pathname
 separators.

Addresses issue #9132.
---
 tools/pyboard.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/pyboard.py b/tools/pyboard.py
index 436bc5ab1be58..60cc06508ebef 100755
--- a/tools/pyboard.py
+++ b/tools/pyboard.py
@@ -582,12 +582,12 @@ def fname_remote(src):
         return src
 
     def fname_cp_dest(src, dest):
-        src = src.rsplit("/", 1)[-1]
+        _, src = os.path.split(src)
         if dest is None or dest == "":
             dest = src
         elif dest == ".":
-            dest = "./" + src
-        elif dest.endswith("/"):
+            dest = os.path.join(".", src)
+        elif dest.endswith(os.path.sep):
             dest += src
         return dest
 

From 89a0fefb6c5c730a7b740cf31e44a6c76c3993b1 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Tue, 13 Sep 2022 14:57:24 +1000
Subject: [PATCH 2596/3533] py/mpconfig: Add LFS1/LFS2 options to match
 FAT/posix.

Also fixes the #ifndef for FAT & posix.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 py/mpconfig.h | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/py/mpconfig.h b/py/mpconfig.h
index d478c654d021d..b8cc61b2adb17 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -920,15 +920,25 @@ typedef double mp_float_t;
 #endif
 
 // Support for VFS POSIX component, to mount a POSIX filesystem within VFS
-#ifndef MICROPY_VFS
+#ifndef MICROPY_VFS_POSIX
 #define MICROPY_VFS_POSIX (0)
 #endif
 
 // Support for VFS FAT component, to mount a FAT filesystem within VFS
-#ifndef MICROPY_VFS
+#ifndef MICROPY_VFS_FAT
 #define MICROPY_VFS_FAT (0)
 #endif
 
+// Support for VFS LittleFS v1 component, to mount a LFSv1 filesystem within VFS
+#ifndef MICROPY_VFS_LFS1
+#define MICROPY_VFS_LFS1 (0)
+#endif
+
+// Support for VFS LittleFS v2 component, to mount a LFSv2 filesystem within VFS
+#ifndef MICROPY_VFS_LFS2
+#define MICROPY_VFS_LFS2 (0)
+#endif
+
 /*****************************************************************************/
 /* Fine control over Python builtins, classes, modules, etc                  */
 

From 605266ee9a1258003032abb2fbfa58ef354ded25 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Tue, 16 Aug 2022 01:28:31 +1000
Subject: [PATCH 2597/3533] py/mpconfig: Make feature levels available to
 mpconfigport.h.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 py/mpconfig.h | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/py/mpconfig.h b/py/mpconfig.h
index b8cc61b2adb17..5da7e453ecac3 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -56,12 +56,6 @@
 // release vs debug configs, etc. Note that if you switch from one config
 // to another, you must rebuild from scratch using "-B" switch to make.
 
-#ifdef MP_CONFIGFILE
-#include MP_CONFIGFILE
-#else
-#include <mpconfigport.h>
-#endif
-
 // Disable all optional features (i.e. minimal port).
 #define MICROPY_CONFIG_ROM_LEVEL_MINIMUM (0)
 // Only enable core features (constrained flash, e.g. STM32L072)
@@ -75,6 +69,12 @@
 // Enable everything (e.g. coverage)
 #define MICROPY_CONFIG_ROM_LEVEL_EVERYTHING (50)
 
+#ifdef MP_CONFIGFILE
+#include MP_CONFIGFILE
+#else
+#include <mpconfigport.h>
+#endif
+
 // Ports/boards should set this, but default to level=core.
 #ifndef MICROPY_CONFIG_ROM_LEVEL
 #define MICROPY_CONFIG_ROM_LEVEL (MICROPY_CONFIG_ROM_LEVEL_CORE_FEATURES)

From f4fed02537e5b1b1a06912c8339c47ce500d18c6 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Mon, 15 Aug 2022 11:56:03 +1000
Subject: [PATCH 2598/3533] unix/variants: Remove freedos and fast variants.

The freedos variant is untested by CI and is difficult to maintain.  The
fast variant is not a good name for what it does.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/unix/variants/fast/mpconfigvariant.h    | 34 -----------------
 ports/unix/variants/fast/mpconfigvariant.mk   |  5 ---
 ports/unix/variants/freedos/mpconfigvariant.h | 38 -------------------
 .../unix/variants/freedos/mpconfigvariant.mk  | 18 ---------
 4 files changed, 95 deletions(-)
 delete mode 100644 ports/unix/variants/fast/mpconfigvariant.h
 delete mode 100644 ports/unix/variants/fast/mpconfigvariant.mk
 delete mode 100644 ports/unix/variants/freedos/mpconfigvariant.h
 delete mode 100644 ports/unix/variants/freedos/mpconfigvariant.mk

diff --git a/ports/unix/variants/fast/mpconfigvariant.h b/ports/unix/variants/fast/mpconfigvariant.h
deleted file mode 100644
index 8a531b056ab71..0000000000000
--- a/ports/unix/variants/fast/mpconfigvariant.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2013, 2014 Damien P. George
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-// This config file is intended to configure artificially fast uPy build for
-// synthetic benchmarking, at the expense of features supported and memory
-// usage. This config is not intended to be used in production.
-
-#define MICROPY_PY___FILE__ (0)
-// 91 is a magic number proposed by @dpgeorge, which make pystone run ~ at tie
-// with CPython 3.4.
-#define MICROPY_MODULE_DICT_SIZE (91)
diff --git a/ports/unix/variants/fast/mpconfigvariant.mk b/ports/unix/variants/fast/mpconfigvariant.mk
deleted file mode 100644
index b8fe69e487315..0000000000000
--- a/ports/unix/variants/fast/mpconfigvariant.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-# build synthetically fast interpreter for benchmarking
-
-COPT += -fno-crossjumping -O2
-
-FROZEN_MANIFEST =
diff --git a/ports/unix/variants/freedos/mpconfigvariant.h b/ports/unix/variants/freedos/mpconfigvariant.h
deleted file mode 100644
index 562c783ca35fb..0000000000000
--- a/ports/unix/variants/freedos/mpconfigvariant.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2015 Damien P. George
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-// options to control how MicroPython is built
-
-#define MICROPY_PY_USELECT_POSIX (0)
-
-#define MICROPY_STREAMS_NON_BLOCK (0)
-
-#define MICROPY_PY_SYS_PLATFORM "freedos"
-
-// djgpp dirent struct does not have d_ino field
-#undef _DIRENT_HAVE_D_INO
-
-#define MICROPY_USE_INTERNAL_ERRNO  (1)
diff --git a/ports/unix/variants/freedos/mpconfigvariant.mk b/ports/unix/variants/freedos/mpconfigvariant.mk
deleted file mode 100644
index 86ab6864f45c1..0000000000000
--- a/ports/unix/variants/freedos/mpconfigvariant.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-CC = i586-pc-msdosdjgpp-gcc
-
-STRIP = i586-pc-msdosdjgpp-strip
-
-SIZE = i586-pc-msdosdjgpp-size
-
-CFLAGS += \
-	-DMICROPY_NLR_SETJMP \
-	-Dtgamma=gamma \
-	-DMICROPY_EMIT_X86=0 \
-	-DMICROPY_NO_ALLOCA=1 \
-
-MICROPY_PY_SOCKET = 0
-MICROPY_PY_FFI = 0
-MICROPY_PY_JNI = 0
-MICROPY_PY_BTREE = 0
-MICROPY_PY_THREAD = 0
-MICROPY_PY_USSL = 0

From c1530a0ce8e83811f88fbd4558ea7aaf27919ed8 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Mon, 15 Aug 2022 13:58:34 +1000
Subject: [PATCH 2599/3533] unix: Refactor mpconfigport.h and
 mpconfigvariant.h.

This is a no-op for coverage and minimal.

The standard and dev variants have been merged and enable the same feature
set as a typical bare-metal board.  And remove the CI for the dev build.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 .github/workflows/ports_unix.yml              |  12 -
 ports/unix/main.c                             |   5 +
 ports/unix/mpconfigport.h                     | 283 ++++++------------
 .../unix/variants/coverage/mpconfigvariant.h  |   5 +-
 ports/unix/variants/dev/mpconfigvariant.h     |  40 ---
 ports/unix/variants/dev/mpconfigvariant.mk    |   8 -
 ports/unix/variants/minimal/mpconfigvariant.h | 135 ++-------
 ports/unix/variants/mpconfigvariant_common.h  | 124 ++++++++
 ports/unix/variants/nanbox/mpconfigvariant.h  |   5 +
 .../variants/{dev => standard}/manifest.py    |   0
 .../unix/variants/standard/mpconfigvariant.h  |  17 +-
 .../unix/variants/standard/mpconfigvariant.mk |   7 +
 tools/ci.sh                                   |  10 -
 13 files changed, 268 insertions(+), 383 deletions(-)
 delete mode 100644 ports/unix/variants/dev/mpconfigvariant.h
 delete mode 100644 ports/unix/variants/dev/mpconfigvariant.mk
 create mode 100644 ports/unix/variants/mpconfigvariant_common.h
 rename ports/unix/variants/{dev => standard}/manifest.py (100%)

diff --git a/.github/workflows/ports_unix.yml b/.github/workflows/ports_unix.yml
index 45cc87e723945..3b738634a67fe 100644
--- a/.github/workflows/ports_unix.yml
+++ b/.github/workflows/ports_unix.yml
@@ -49,18 +49,6 @@ jobs:
       if: failure()
       run: tests/run-tests.py --print-failures
 
-  dev:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - name: Build
-      run: source tools/ci.sh && ci_unix_dev_build
-    - name: Run main test suite
-      run: source tools/ci.sh && ci_unix_dev_run_tests
-    - name: Print failures
-      if: failure()
-      run: tests/run-tests.py --print-failures
-
   coverage:
     runs-on: ubuntu-latest
     steps:
diff --git a/ports/unix/main.c b/ports/unix/main.c
index c388106a645e1..4f019b6c2c30d 100644
--- a/ports/unix/main.c
+++ b/ports/unix/main.c
@@ -63,6 +63,11 @@ STATIC uint emit_opt = MP_EMIT_OPT_NONE;
 long heap_size = 1024 * 1024 * (sizeof(mp_uint_t) / 4);
 #endif
 
+// Number of heaps to assign by default if MICROPY_GC_SPLIT_HEAP=1
+#ifndef MICROPY_GC_SPLIT_HEAP_N_HEAPS
+#define MICROPY_GC_SPLIT_HEAP_N_HEAPS (1)
+#endif
+
 STATIC void stderr_print_strn(void *env, const char *str, size_t len) {
     (void)env;
     ssize_t ret;
diff --git a/ports/unix/mpconfigport.h b/ports/unix/mpconfigport.h
index cb389d9a53620..08ddd21f63ba1 100644
--- a/ports/unix/mpconfigport.h
+++ b/ports/unix/mpconfigport.h
@@ -24,85 +24,36 @@
  * THE SOFTWARE.
  */
 
-// Options to control how MicroPython is built for this port,
-// overriding defaults in py/mpconfig.h.
+// Options to control how MicroPython is built for this port, overriding
+// defaults in py/mpconfig.h. This file is mostly about configuring the
+// features to work on Unix-like systems, see mpconfigvariant.h (and
+// mpconfigvariant_common.h) for feature enabling.
+
+// For size_t and ssize_t
+#include <unistd.h>
 
 // Variant-specific definitions.
 #include "mpconfigvariant.h"
 
-// The minimal variant's config covers everything.
-// If we're building the minimal variant, ignore the rest of this file.
-#ifndef MICROPY_UNIX_MINIMAL
-
-// If the variant did not set a feature level then configure a set of features.
 #ifndef MICROPY_CONFIG_ROM_LEVEL
-#define MICROPY_COMP_MODULE_CONST               (1)
-#define MICROPY_COMP_TRIPLE_TUPLE_ASSIGN        (1)
-#define MICROPY_COMP_RETURN_IF_EXPR             (1)
-#ifndef MICROPY_OPT_LOAD_ATTR_FAST_PATH
-#define MICROPY_OPT_LOAD_ATTR_FAST_PATH         (1)
-#endif
-#ifndef MICROPY_OPT_MAP_LOOKUP_CACHE
-#define MICROPY_OPT_MAP_LOOKUP_CACHE            (1)
+#define MICROPY_CONFIG_ROM_LEVEL (MICROPY_CONFIG_ROM_LEVEL_CORE_FEATURES)
 #endif
-#define MICROPY_STACK_CHECK                     (1)
-#define MICROPY_KBD_EXCEPTION                   (1)
-#define MICROPY_HELPER_REPL                     (1)
-#define MICROPY_REPL_EMACS_KEYS                 (1)
-#define MICROPY_REPL_AUTO_INDENT                (1)
-#define MICROPY_ENABLE_SOURCE_LINE              (1)
-#ifndef MICROPY_STREAMS_NON_BLOCK
-#define MICROPY_STREAMS_NON_BLOCK               (1)
+
+#ifndef MICROPY_PY_SYS_PLATFORM
+#if defined(__APPLE__) && defined(__MACH__)
+    #define MICROPY_PY_SYS_PLATFORM  "darwin"
+#else
+    #define MICROPY_PY_SYS_PLATFORM  "linux"
 #endif
-#define MICROPY_MODULE_WEAK_LINKS               (1)
-#define MICROPY_CAN_OVERRIDE_BUILTINS           (1)
-#define MICROPY_PY_FUNCTION_ATTRS               (1)
-#define MICROPY_PY_DESCRIPTORS                  (1)
-#define MICROPY_PY_DELATTR_SETATTR              (1)
-#define MICROPY_PY_FSTRINGS                     (1)
-#define MICROPY_PY_BUILTINS_BYTES_HEX           (1)
-#define MICROPY_PY_BUILTINS_STR_UNICODE         (1)
-#define MICROPY_PY_BUILTINS_STR_CENTER          (1)
-#define MICROPY_PY_BUILTINS_STR_PARTITION       (1)
-#define MICROPY_PY_BUILTINS_STR_SPLITLINES      (1)
-#define MICROPY_PY_BUILTINS_MEMORYVIEW          (1)
-#define MICROPY_PY_BUILTINS_SLICE_ATTRS         (1)
-#define MICROPY_PY_BUILTINS_SLICE_INDICES       (1)
-#define MICROPY_PY_BUILTINS_FROZENSET           (1)
-#define MICROPY_PY_BUILTINS_ROUND_INT           (1)
-#define MICROPY_PY_ALL_SPECIAL_METHODS          (1)
-#define MICROPY_PY_REVERSE_SPECIAL_METHODS      (1)
-#define MICROPY_PY_BUILTINS_COMPILE             (1)
-#define MICROPY_PY_BUILTINS_NOTIMPLEMENTED      (1)
-#define MICROPY_PY_BUILTINS_INPUT               (1)
-#define MICROPY_PY_BUILTINS_POW3                (1)
-#define MICROPY_PY_MICROPYTHON_MEM_INFO         (1)
-#define MICROPY_PY_ARRAY_SLICE_ASSIGN           (1)
-#define MICROPY_PY_COLLECTIONS_DEQUE            (1)
-#define MICROPY_PY_COLLECTIONS_ORDEREDDICT      (1)
-#ifndef MICROPY_PY_MATH_SPECIAL_FUNCTIONS
-#define MICROPY_PY_MATH_SPECIAL_FUNCTIONS       (1)
 #endif
-#define MICROPY_PY_MATH_ISCLOSE                 (MICROPY_PY_MATH_SPECIAL_FUNCTIONS)
-#define MICROPY_PY_CMATH                        (1)
-#define MICROPY_PY_IO_IOBASE                    (1)
-#define MICROPY_PY_SYS_MAXSIZE                  (1)
-#define MICROPY_PY_SYS_STDFILES                 (1)
-#define MICROPY_PY_UERRNO                       (1)
-#define MICROPY_PY_UCTYPES                      (1)
-#define MICROPY_PY_UZLIB                        (1)
-#define MICROPY_PY_UJSON                        (1)
-#define MICROPY_PY_UOS                          (1)
-#define MICROPY_PY_URE                          (1)
-#define MICROPY_PY_UHEAPQ                       (1)
-#define MICROPY_PY_UHASHLIB                     (1)
-#define MICROPY_PY_UBINASCII                    (1)
-#define MICROPY_PY_UBINASCII_CRC32              (1)
-#define MICROPY_PY_URANDOM                      (1)
+
+#ifndef MICROPY_PY_SYS_PATH_DEFAULT
+#define MICROPY_PY_SYS_PATH_DEFAULT ".frozen:~/.micropython/lib:/usr/lib/micropython"
 #endif
 
-#define MICROPY_ALLOC_PATH_MAX      (PATH_MAX)
-#define MICROPY_PERSISTENT_CODE_LOAD (1)
+#define MP_STATE_PORT MP_STATE_VM
+
+// Configure which emitter to use for this target.
 #if !defined(MICROPY_EMIT_X64) && defined(__x86_64__)
     #define MICROPY_EMIT_X64        (1)
 #endif
@@ -118,83 +69,75 @@
 #if !defined(MICROPY_EMIT_ARM) && defined(__arm__) && !defined(__thumb2__)
     #define MICROPY_EMIT_ARM        (1)
 #endif
-#define MICROPY_ENABLE_GC           (1)
-// Number of heaps to assign if MICROPY_GC_SPLIT_HEAP=1
-#ifndef MICROPY_GC_SPLIT_HEAP_N_HEAPS
-#define MICROPY_GC_SPLIT_HEAP_N_HEAPS (1)
-#endif
-#define MICROPY_ENABLE_FINALISER    (1)
-#define MICROPY_MALLOC_USES_ALLOCATED_SIZE (1)
-#define MICROPY_MEM_STATS           (1)
-#define MICROPY_DEBUG_PRINTERS      (1)
-// Printing debug to stderr may give tests which
-// check stdout a chance to pass, etc.
-#define MICROPY_DEBUG_PRINTER       (&mp_stderr_print)
-#define MICROPY_READER_POSIX        (1)
-#define MICROPY_READER_VFS          (1)
-#define MICROPY_USE_READLINE_HISTORY (1)
-#ifndef MICROPY_READLINE_HISTORY_SIZE
-#define MICROPY_READLINE_HISTORY_SIZE 50
+
+// Type definitions for the specific machine based on the word size.
+#ifndef MICROPY_OBJ_REPR
+#ifdef __LP64__
+typedef long mp_int_t; // must be pointer size
+typedef unsigned long mp_uint_t; // must be pointer size
+#else
+// These are definitions for machines where sizeof(int) == sizeof(void*),
+// regardless of actual size.
+typedef int mp_int_t; // must be pointer size
+typedef unsigned int mp_uint_t; // must be pointer size
 #endif
-#define MICROPY_HELPER_LEXER_UNIX   (1)
-#ifndef MICROPY_FLOAT_IMPL
-#define MICROPY_FLOAT_IMPL          (MICROPY_FLOAT_IMPL_DOUBLE)
+#else
+// Assume that if we already defined the obj repr then we also defined types.
 #endif
-#define MICROPY_LONGINT_IMPL        (MICROPY_LONGINT_IMPL_MPZ)
-#define MICROPY_STREAMS_POSIX_API   (1)
-#define MICROPY_OPT_COMPUTED_GOTO   (1)
-#define MICROPY_MODULE_OVERRIDE_MAIN_IMPORT (1)
-#define MICROPY_VFS                 (1)
-#define MICROPY_VFS_POSIX           (1)
-#define MICROPY_PY_SYS_PATH_ARGV_DEFAULTS (0)
-#define MICROPY_PY_SYS_EXIT         (1)
-#define MICROPY_PY_SYS_ATEXIT       (1)
-#if MICROPY_PY_SYS_SETTRACE
-#define MICROPY_PERSISTENT_CODE_SAVE (1)
-#define MICROPY_COMP_CONST (0)
+
+// Cannot include <sys/types.h>, as it may lead to symbol name clashes
+#if _FILE_OFFSET_BITS == 64 && !defined(__LP64__)
+typedef long long mp_off_t;
+#else
+typedef long mp_off_t;
 #endif
-#ifndef MICROPY_PY_SYS_PLATFORM
-#if defined(__APPLE__) && defined(__MACH__)
-    #define MICROPY_PY_SYS_PLATFORM  "darwin"
+
+// We need to provide a declaration/definition of alloca()
+// unless support for it is disabled.
+#if !defined(MICROPY_NO_ALLOCA) || MICROPY_NO_ALLOCA == 0
+#if defined(__FreeBSD__) || defined(__NetBSD__)
+#include <stdlib.h>
 #else
-    #define MICROPY_PY_SYS_PLATFORM  "linux"
+#include <alloca.h>
 #endif
 #endif
-#ifndef MICROPY_PY_SYS_PATH_DEFAULT
-#define MICROPY_PY_SYS_PATH_DEFAULT ".frozen:~/.micropython/lib:/usr/lib/micropython"
+
+// Always enable GC.
+#define MICROPY_ENABLE_GC           (1)
+
+#if !(defined(MICROPY_GCREGS_SETJMP) || defined(__x86_64__) || defined(__i386__) || defined(__thumb2__) || defined(__thumb__) || defined(__arm__))
+// Fall back to setjmp() implementation for discovery of GC pointers in registers.
+#define MICROPY_GCREGS_SETJMP (1)
 #endif
-#define MICROPY_PY_SYS_EXC_INFO     (1)
-#define MICROPY_PY_GC_COLLECT_RETVAL (1)
 
+// Enable the VFS, and enable the posix "filesystem".
+#define MICROPY_ENABLE_FINALISER    (1)
+#define MICROPY_VFS                 (1)
+#define MICROPY_READER_VFS          (1)
+#define MICROPY_HELPER_LEXER_UNIX   (1)
+#define MICROPY_VFS_POSIX           (1)
+#define MICROPY_READER_POSIX        (1)
+
+// VFS stat functions should return time values relative to 1970/1/1
+#define MICROPY_EPOCH_IS_1970       (1)
+
+// Assume that select() call, interrupted with a signal, and erroring
+// with EINTR, updates remaining timeout value.
+#define MICROPY_SELECT_REMAINING_TIME (1)
+
+// Disable stackless by default.
 #ifndef MICROPY_STACKLESS
 #define MICROPY_STACKLESS           (0)
 #define MICROPY_STACKLESS_STRICT    (0)
 #endif
 
-#define MICROPY_PY_UOS_INCLUDEFILE  "ports/unix/moduos.c"
-#define MICROPY_PY_UOS_ERRNO        (1)
-#define MICROPY_PY_UOS_GETENV_PUTENV_UNSETENV (1)
-#define MICROPY_PY_UOS_SEP          (1)
-#define MICROPY_PY_UOS_SYSTEM       (1)
-#define MICROPY_PY_UOS_URANDOM      (1)
-#define MICROPY_PY_UTIME            (1)
-#define MICROPY_PY_UTIME_MP_HAL     (1)
-#define MICROPY_PY_UTIMEQ           (1)
-#define MICROPY_PY_USOCKET_LISTEN_BACKLOG_DEFAULT (SOMAXCONN < 128 ? SOMAXCONN : 128)
-#if MICROPY_PY_USSL
-#define MICROPY_PY_UHASHLIB_MD5     (1)
-#define MICROPY_PY_UHASHLIB_SHA1    (1)
-#define MICROPY_PY_UCRYPTOLIB       (1)
-#endif
-#ifndef MICROPY_PY_USELECT
-#define MICROPY_PY_USELECT          (0)
-#endif
-#ifndef MICROPY_PY_USELECT_POSIX
-#define MICROPY_PY_USELECT_POSIX    (!MICROPY_PY_USELECT)
+// If settrace is enabled then we need code saving.
+#if MICROPY_PY_SYS_SETTRACE
+#define MICROPY_PERSISTENT_CODE_SAVE (1)
+#define MICROPY_COMP_CONST (0)
 #endif
-#define MICROPY_PY_UWEBSOCKET       (1)
-#define MICROPY_PY_MACHINE          (1)
-#define MICROPY_PY_MACHINE_PULSE    (1)
+
+// Unix-specific configuration of machine.mem*.
 #define MICROPY_MACHINE_MEM_GET_READ_ADDR   mod_machine_mem_get_addr
 #define MICROPY_MACHINE_MEM_GET_WRITE_ADDR  mod_machine_mem_get_addr
 
@@ -203,52 +146,23 @@
 #define MICROPY_FATFS_MAX_SS           (4096)
 #define MICROPY_FATFS_LFN_CODE_PAGE    437 /* 1=SFN/ANSI 437=LFN/U.S.(OEM) */
 
-// Define to MICROPY_ERROR_REPORTING_DETAILED to get function, etc.
-// names in exception messages (may require more RAM).
-#define MICROPY_ERROR_REPORTING     (MICROPY_ERROR_REPORTING_DETAILED)
-#define MICROPY_WARNINGS            (1)
-#define MICROPY_ERROR_PRINTER       (&mp_stderr_print)
-#define MICROPY_PY_STR_BYTES_CMP_WARN (1)
-
-// VFS stat functions should return time values relative to 1970/1/1
-#define MICROPY_EPOCH_IS_1970       (1)
-
-extern const struct _mp_print_t mp_stderr_print;
-
-#if !(defined(MICROPY_GCREGS_SETJMP) || defined(__x86_64__) || defined(__i386__) || defined(__thumb2__) || defined(__thumb__) || defined(__arm__))
-// Fall back to setjmp() implementation for discovery of GC pointers in registers.
-#define MICROPY_GCREGS_SETJMP (1)
-#endif
-
-#define MICROPY_ENABLE_EMERGENCY_EXCEPTION_BUF   (1)
-#define MICROPY_EMERGENCY_EXCEPTION_BUF_SIZE  (256)
-#define MICROPY_ASYNC_KBD_INTR      (1)
+#define MICROPY_ALLOC_PATH_MAX      (PATH_MAX)
 
-// type definitions for the specific machine
+// Ensure builtinimport.c works with -m.
+#define MICROPY_MODULE_OVERRIDE_MAIN_IMPORT (1)
 
-// For size_t and ssize_t
-#include <unistd.h>
+// Don't default sys.argv because we do that in main.
+#define MICROPY_PY_SYS_PATH_ARGV_DEFAULTS (0)
 
-// assume that if we already defined the obj repr then we also defined types
-#ifndef MICROPY_OBJ_REPR
-#ifdef __LP64__
-typedef long mp_int_t; // must be pointer size
-typedef unsigned long mp_uint_t; // must be pointer size
-#else
-// These are definitions for machines where sizeof(int) == sizeof(void*),
-// regardless of actual size.
-typedef int mp_int_t; // must be pointer size
-typedef unsigned int mp_uint_t; // must be pointer size
-#endif
-#endif
+#define MICROPY_PY_USOCKET_LISTEN_BACKLOG_DEFAULT (SOMAXCONN < 128 ? SOMAXCONN : 128)
 
-// Cannot include <sys/types.h>, as it may lead to symbol name clashes
-#if _FILE_OFFSET_BITS == 64 && !defined(__LP64__)
-typedef long long mp_off_t;
-#else
-typedef long mp_off_t;
-#endif
+// Bare-metal ports don't have stderr. Printing debug to stderr may give tests
+// which check stdout a chance to pass, etc.
+extern const struct _mp_print_t mp_stderr_print;
+#define MICROPY_DEBUG_PRINTER (&mp_stderr_print)
+#define MICROPY_ERROR_PRINTER (&mp_stderr_print)
 
+// For the native emitter configure how to mark a region as executable.
 void mp_unix_alloc_exec(size_t min_size, void **ptr, size_t *size);
 void mp_unix_free_exec(void *ptr, size_t size);
 void mp_unix_mark_exec(void);
@@ -260,8 +174,8 @@ void mp_unix_mark_exec(void);
 #define MICROPY_FORCE_PLAT_ALLOC_EXEC (1)
 #endif
 
+// If enabled, configure how to seed random on init.
 #ifdef MICROPY_PY_URANDOM_SEED_INIT_FUNC
-// Support for seeding the random module on import.
 #include <stddef.h>
 void mp_hal_get_random(size_t n, void *buf);
 static inline unsigned long mp_urandom_seed_init(void) {
@@ -276,10 +190,6 @@ static inline unsigned long mp_urandom_seed_init(void) {
 #define MICROPY_PLAT_DEV_MEM  (1)
 #endif
 
-// Assume that select() call, interrupted with a signal, and erroring
-// with EINTR, updates remaining timeout value.
-#define MICROPY_SELECT_REMAINING_TIME (1)
-
 #ifdef __ANDROID__
 #include <android/api-level.h>
 #if __ANDROID_API__ < 4
@@ -289,18 +199,6 @@ static inline unsigned long mp_urandom_seed_init(void) {
 #endif
 #endif
 
-#define MP_STATE_PORT MP_STATE_VM
-
-// We need to provide a declaration/definition of alloca()
-// unless support for it is disabled.
-#if !defined(MICROPY_NO_ALLOCA) || MICROPY_NO_ALLOCA == 0
-#if defined(__FreeBSD__) || defined(__NetBSD__)
-#include <stdlib.h>
-#else
-#include <alloca.h>
-#endif
-#endif
-
 // From "man readdir": "Under glibc, programs can check for the availability
 // of the fields [in struct dirent] not defined in POSIX.1 by testing whether
 // the macros [...], _DIRENT_HAVE_D_TYPE are defined."
@@ -320,11 +218,13 @@ static inline unsigned long mp_urandom_seed_init(void) {
 #include <stdio.h>
 #endif
 
+// If threading is enabled, configure the atomic section.
 #if MICROPY_PY_THREAD
 #define MICROPY_BEGIN_ATOMIC_SECTION() (mp_thread_unix_begin_atomic_section(), 0xffffffff)
 #define MICROPY_END_ATOMIC_SECTION(x) (void)x; mp_thread_unix_end_atomic_section()
 #endif
 
+// In lieu of a WFI(), slow down polling from being a tight loop.
 #ifndef MICROPY_EVENT_POLL_HOOK
 #define MICROPY_EVENT_POLL_HOOK \
     do { \
@@ -334,7 +234,6 @@ static inline unsigned long mp_urandom_seed_init(void) {
     } while (0);
 #endif
 
+// Configure the implementation of machine.idle().
 #include <sched.h>
 #define MICROPY_UNIX_MACHINE_IDLE sched_yield();
-
-#endif // MICROPY_UNIX_MINIMAL
diff --git a/ports/unix/variants/coverage/mpconfigvariant.h b/ports/unix/variants/coverage/mpconfigvariant.h
index fb70d791ac9b3..9857c668748a5 100644
--- a/ports/unix/variants/coverage/mpconfigvariant.h
+++ b/ports/unix/variants/coverage/mpconfigvariant.h
@@ -30,6 +30,9 @@
 // Set base feature level.
 #define MICROPY_CONFIG_ROM_LEVEL (MICROPY_CONFIG_ROM_LEVEL_EVERYTHING)
 
+// Enable extra Unix features.
+#include "../mpconfigvariant_common.h"
+
 // Enable additional features.
 #define MICROPY_DEBUG_PARSE_RULE_NAME  (1)
 #define MICROPY_GC_SPLIT_HEAP          (1)
@@ -45,11 +48,9 @@
 #define MICROPY_PY_BUILTINS_RANGE_BINOP (1)
 #define MICROPY_PY_SYS_GETSIZEOF       (1)
 #define MICROPY_PY_IO_BUFFEREDWRITER (1)
-#define MICROPY_PY_URANDOM_SEED_INIT_FUNC (mp_urandom_seed_init())
 #define MICROPY_PY_URE_DEBUG           (1)
 #define MICROPY_PY_URE_MATCH_GROUPS    (1)
 #define MICROPY_PY_URE_MATCH_SPAN_START_END (1)
 #define MICROPY_PY_COLLECTIONS_NAMEDTUPLE__ASDICT (1)
-#define MICROPY_PY_UCRYPTOLIB          (1)
 #define MICROPY_PY_UCRYPTOLIB_CTR      (1)
 #define MICROPY_PY_MICROPYTHON_HEAP_LOCKED (1)
diff --git a/ports/unix/variants/dev/mpconfigvariant.h b/ports/unix/variants/dev/mpconfigvariant.h
deleted file mode 100644
index 2522f1861fdc3..0000000000000
--- a/ports/unix/variants/dev/mpconfigvariant.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2019 Damien P. George
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-// Set base feature level.
-#define MICROPY_CONFIG_ROM_LEVEL (MICROPY_CONFIG_ROM_LEVEL_EXTRA_FEATURES)
-
-// Enable some additional features.
-#ifndef MICROPY_REPL_EMACS_WORDS_MOVE
-#define MICROPY_REPL_EMACS_WORDS_MOVE           (1)
-#endif
-#ifndef MICROPY_REPL_EMACS_EXTRA_WORDS_MOVE
-#define MICROPY_REPL_EMACS_EXTRA_WORDS_MOVE     (1)
-#endif
-#ifndef MICROPY_PY_SYS_SETTRACE
-#define MICROPY_PY_SYS_SETTRACE                 (1)
-#endif
-#define MICROPY_PY_URANDOM_SEED_INIT_FUNC       (mp_urandom_seed_init())
diff --git a/ports/unix/variants/dev/mpconfigvariant.mk b/ports/unix/variants/dev/mpconfigvariant.mk
deleted file mode 100644
index 058eda2f8d192..0000000000000
--- a/ports/unix/variants/dev/mpconfigvariant.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-FROZEN_MANIFEST ?= $(VARIANT_DIR)/manifest.py
-
-MICROPY_ROM_TEXT_COMPRESSION = 1
-MICROPY_VFS_FAT ?= 1
-MICROPY_VFS_LFS1 ?= 1
-MICROPY_VFS_LFS2 ?= 1
-
-MICROPY_PY_BLUETOOTH ?= 1
diff --git a/ports/unix/variants/minimal/mpconfigvariant.h b/ports/unix/variants/minimal/mpconfigvariant.h
index d9d2a6c48e643..6b107e77909c3 100644
--- a/ports/unix/variants/minimal/mpconfigvariant.h
+++ b/ports/unix/variants/minimal/mpconfigvariant.h
@@ -26,117 +26,44 @@
 
 // options to control how MicroPython is built
 
-// Prevent the rest of the default mpconfigport.h being used.
-#define MICROPY_UNIX_MINIMAL (1)
+#define MICROPY_CONFIG_ROM_LEVEL (MICROPY_CONFIG_ROM_LEVEL_MINIMUM)
 
+// Disable native emitters.
+#define MICROPY_EMIT_X86 (0)
+#define MICROPY_EMIT_X64 (0)
+#define MICROPY_EMIT_THUMB (0)
+#define MICROPY_EMIT_ARM (0)
+
+// Tune the parser to use less RAM by default.
 #define MICROPY_ALLOC_QSTR_CHUNK_INIT (64)
 #define MICROPY_ALLOC_PARSE_RULE_INIT (8)
 #define MICROPY_ALLOC_PARSE_RULE_INC  (8)
 #define MICROPY_ALLOC_PARSE_RESULT_INIT (8)
 #define MICROPY_ALLOC_PARSE_RESULT_INC (8)
 #define MICROPY_ALLOC_PARSE_CHUNK_INIT (64)
-#define MICROPY_ALLOC_PATH_MAX      (PATH_MAX)
-#define MICROPY_ENABLE_GC           (1)
-#define MICROPY_ENABLE_FINALISER    (1)
-#define MICROPY_GC_ALLOC_THRESHOLD  (0)
-#define MICROPY_STACK_CHECK         (0)
-#define MICROPY_COMP_CONST          (0)
-#define MICROPY_MEM_STATS           (0)
-#define MICROPY_DEBUG_PRINTERS      (0)
-#define MICROPY_READER_POSIX        (1)
-#define MICROPY_READER_VFS          (1)
-#define MICROPY_HELPER_REPL         (1)
-#define MICROPY_HELPER_LEXER_UNIX   (1)
-#define MICROPY_ENABLE_SOURCE_LINE  (0)
-#define MICROPY_ERROR_REPORTING     (MICROPY_ERROR_REPORTING_TERSE)
-#define MICROPY_WARNINGS            (0)
-#define MICROPY_ENABLE_EMERGENCY_EXCEPTION_BUF   (0)
-#define MICROPY_KBD_EXCEPTION       (1)
-#define MICROPY_FLOAT_IMPL          (MICROPY_FLOAT_IMPL_NONE)
-#define MICROPY_LONGINT_IMPL        (MICROPY_LONGINT_IMPL_NONE)
-#define MICROPY_STREAMS_NON_BLOCK   (0)
-#define MICROPY_OPT_COMPUTED_GOTO   (0)
-#define MICROPY_OPT_LOAD_ATTR_FAST_PATH (0)
-#define MICROPY_OPT_MAP_LOOKUP_CACHE (0)
-#define MICROPY_CAN_OVERRIDE_BUILTINS (0)
-#define MICROPY_BUILTIN_METHOD_CHECK_SELF_ARG (0)
-#define MICROPY_VFS                 (1)
-#define MICROPY_VFS_POSIX           (1)
-#define MICROPY_CPYTHON_COMPAT      (0)
-#define MICROPY_PY_BUILTINS_BYTEARRAY (0)
-#define MICROPY_PY_BUILTINS_MEMORYVIEW (0)
-#define MICROPY_PY_BUILTINS_COMPILE (0)
-#define MICROPY_PY_BUILTINS_ENUMERATE (0)
-#define MICROPY_PY_BUILTINS_FILTER  (0)
-#define MICROPY_PY_BUILTINS_FROZENSET (0)
-#define MICROPY_PY_BUILTINS_REVERSED (0)
-#define MICROPY_PY_BUILTINS_SET     (0)
-#define MICROPY_PY_BUILTINS_SLICE   (0)
-#define MICROPY_PY_BUILTINS_STR_COUNT (0)
-#define MICROPY_PY_BUILTINS_STR_OP_MODULO (0)
-#define MICROPY_PY_BUILTINS_STR_UNICODE (0)
-#define MICROPY_PY_BUILTINS_PROPERTY (0)
-#define MICROPY_PY_BUILTINS_MIN_MAX (0)
-#define MICROPY_PY___FILE__         (0)
-#define MICROPY_PY_MICROPYTHON_MEM_INFO (0)
-#define MICROPY_PY_GC               (0)
-#define MICROPY_PY_GC_COLLECT_RETVAL (0)
-#define MICROPY_PY_ARRAY            (0)
-#define MICROPY_PY_COLLECTIONS      (0)
-#define MICROPY_PY_MATH             (0)
-#define MICROPY_PY_CMATH            (0)
-#define MICROPY_PY_IO               (0)
-#define MICROPY_PY_STRUCT           (0)
-#define MICROPY_PY_SYS              (1)
-#define MICROPY_PY_SYS_EXIT         (0)
-#define MICROPY_PY_SYS_PLATFORM     "linux"
-#ifndef MICROPY_PY_SYS_PATH_DEFAULT
-#define MICROPY_PY_SYS_PATH_DEFAULT ".frozen:~/.micropython/lib:/usr/lib/micropython"
-#endif
-#define MICROPY_PY_SYS_MAXSIZE      (0)
-#define MICROPY_PY_SYS_STDFILES     (0)
-#define MICROPY_PY_CMATH            (0)
-#define MICROPY_PY_UCTYPES          (0)
-#define MICROPY_PY_UTIME            (0)
-#define MICROPY_PY_UZLIB            (0)
-#define MICROPY_PY_UJSON            (0)
-#define MICROPY_PY_UOS              (1)
-#define MICROPY_PY_URE              (0)
-#define MICROPY_PY_UHEAPQ           (0)
-#define MICROPY_PY_UHASHLIB         (0)
-#define MICROPY_PY_UBINASCII        (0)
-
-//////////////////////////////////////////
-// Do not change anything beyond this line
-//////////////////////////////////////////
-
-#if !(defined(MICROPY_GCREGS_SETJMP) || defined(__x86_64__) || defined(__i386__) || defined(__thumb2__) || defined(__thumb__) || defined(__arm__))
-// Fall back to setjmp() implementation for discovery of GC pointers in registers.
-#define MICROPY_GCREGS_SETJMP (1)
-#endif
-
-// type definitions for the specific machine
 
-#ifdef __LP64__
-typedef long mp_int_t; // must be pointer size
-typedef unsigned long mp_uint_t; // must be pointer size
-#else
-// These are definitions for machines where sizeof(int) == sizeof(void*),
-// regardless for actual size.
-typedef int mp_int_t; // must be pointer size
-typedef unsigned int mp_uint_t; // must be pointer size
-#endif
+// Enable features that are not enabled by default with the minimum config.
+#define MICROPY_COMP_CONST_FOLDING (1)
+#define MICROPY_COMP_CONST_LITERAL (1)
+#define MICROPY_COMP_CONST_TUPLE (1)
+#define MICROPY_COMP_DOUBLE_TUPLE_ASSIGN (1)
+#define MICROPY_ENABLE_COMPILER (1)
+#define MICROPY_ENABLE_EXTERNAL_IMPORT (1)
+#define MICROPY_FULL_CHECKS (1)
+#define MICROPY_HELPER_REPL (1)
+#define MICROPY_KBD_EXCEPTION (1)
+#define MICROPY_MODULE_GETATTR (1)
+#define MICROPY_MULTIPLE_INHERITANCE (1)
+#define MICROPY_PY_ASSIGN_EXPR (1)
+#define MICROPY_PY_ASYNC_AWAIT (1)
+#define MICROPY_PY_ATTRTUPLE (1)
+#define MICROPY_PY_BUILTINS_DICT_FROMKEYS (1)
+#define MICROPY_PY_BUILTINS_RANGE_ATTRS (1)
+#define MICROPY_PY_GENERATOR_PEND_THROW (1)
 
-// Cannot include <sys/types.h>, as it may lead to symbol name clashes
-#if _FILE_OFFSET_BITS == 64 && !defined(__LP64__)
-typedef long long mp_off_t;
-#else
-typedef long mp_off_t;
-#endif
+// Enable just the sys and os built-in modules.
+#define MICROPY_PY_SYS (1)
+#define MICROPY_PY_UOS (1)
 
-// We need to provide a declaration/definition of alloca()
-#ifdef __FreeBSD__
-#include <stdlib.h>
-#else
-#include <alloca.h>
-#endif
+// The minimum sets this to 1 to save flash.
+#define MICROPY_QSTR_BYTES_IN_HASH (2)
diff --git a/ports/unix/variants/mpconfigvariant_common.h b/ports/unix/variants/mpconfigvariant_common.h
new file mode 100644
index 0000000000000..1128f21d22ece
--- /dev/null
+++ b/ports/unix/variants/mpconfigvariant_common.h
@@ -0,0 +1,124 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2022 Jim Mussared
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+// This file enables and configures features common to all variants
+// other than "minimal".
+
+// Send raise KeyboardInterrupt directly from the signal handler rather than
+// scheduling it into the VM.
+#define MICROPY_ASYNC_KBD_INTR         (1)
+
+// Enable helpers for printing debugging information.
+#ifndef MICROPY_DEBUG_PRINTERS
+#define MICROPY_DEBUG_PRINTERS         (1)
+#endif
+
+// Enable floating point by default.
+#ifndef MICROPY_FLOAT_IMPL
+#define MICROPY_FLOAT_IMPL             (MICROPY_FLOAT_IMPL_DOUBLE)
+#endif
+
+// Enable arbritrary precision long-int by default.
+#ifndef MICROPY_LONGINT_IMPL
+#define MICROPY_LONGINT_IMPL           (MICROPY_LONGINT_IMPL_MPZ)
+#endif
+
+// Enable use of C libraries that need read/write/lseek/fsync, e.g. axtls.
+#define MICROPY_STREAMS_POSIX_API      (1)
+
+// REPL conveniences.
+#define MICROPY_REPL_EMACS_WORDS_MOVE  (1)
+#define MICROPY_REPL_EMACS_EXTRA_WORDS_MOVE (1)
+#define MICROPY_USE_READLINE_HISTORY   (1)
+#ifndef MICROPY_READLINE_HISTORY_SIZE
+#define MICROPY_READLINE_HISTORY_SIZE  (50)
+#endif
+
+// Seed random on import.
+#define MICROPY_PY_URANDOM_SEED_INIT_FUNC (mp_urandom_seed_init())
+
+// Allow exception details in low-memory conditions.
+#define MICROPY_ENABLE_EMERGENCY_EXCEPTION_BUF (1)
+#define MICROPY_EMERGENCY_EXCEPTION_BUF_SIZE (256)
+
+// Allow loading of .mpy files.
+#define MICROPY_PERSISTENT_CODE_LOAD   (1)
+
+// Extra memory debugging.
+#define MICROPY_MALLOC_USES_ALLOCATED_SIZE (1)
+#define MICROPY_MEM_STATS              (1)
+
+// Enable a small performance boost for the VM.
+#define MICROPY_OPT_COMPUTED_GOTO      (1)
+
+// Return number of collected objects from gc.collect().
+#define MICROPY_PY_GC_COLLECT_RETVAL   (1)
+
+// Enable detailed error messages and warnings.
+#define MICROPY_ERROR_REPORTING     (MICROPY_ERROR_REPORTING_DETAILED)
+#define MICROPY_WARNINGS               (1)
+#define MICROPY_PY_STR_BYTES_CMP_WARN  (1)
+
+// Configure the "sys" module with features not usually enabled on bare-metal.
+#define MICROPY_PY_SYS_ATEXIT          (1)
+#define MICROPY_PY_SYS_EXC_INFO        (1)
+
+// Configure the "os" module with extra unix features.
+#define MICROPY_PY_UOS_INCLUDEFILE     "ports/unix/moduos.c"
+#define MICROPY_PY_UOS_ERRNO           (1)
+#define MICROPY_PY_UOS_GETENV_PUTENV_UNSETENV (1)
+#define MICROPY_PY_UOS_SEP             (1)
+#define MICROPY_PY_UOS_SYSTEM          (1)
+#define MICROPY_PY_UOS_URANDOM         (1)
+
+// Enable the unix-specific "time" module.
+#define MICROPY_PY_UTIME               (1)
+#define MICROPY_PY_UTIME_MP_HAL        (1)
+
+// Enable the utimeq module used by the previous (v2) version of uasyncio.
+#define MICROPY_PY_UTIMEQ              (1)
+
+#if MICROPY_PY_USSL
+#define MICROPY_PY_UHASHLIB_MD5        (1)
+#define MICROPY_PY_UHASHLIB_SHA1       (1)
+#define MICROPY_PY_UCRYPTOLIB          (1)
+#endif
+
+// Use the posix implementation of the "select" module (unless the variant
+// specifically asks for the MicroPython version).
+#ifndef MICROPY_PY_USELECT
+#define MICROPY_PY_USELECT             (0)
+#endif
+#ifndef MICROPY_PY_USELECT_POSIX
+#define MICROPY_PY_USELECT_POSIX       (!MICROPY_PY_USELECT)
+#endif
+
+// Enable the "websocket" module.
+#define MICROPY_PY_UWEBSOCKET          (1)
+
+// Enable the "machine" module, mostly for machine.mem*.
+#define MICROPY_PY_MACHINE             (1)
+#define MICROPY_PY_MACHINE_PULSE       (1)
diff --git a/ports/unix/variants/nanbox/mpconfigvariant.h b/ports/unix/variants/nanbox/mpconfigvariant.h
index f827158fb7127..7b13b7dc6ce4e 100644
--- a/ports/unix/variants/nanbox/mpconfigvariant.h
+++ b/ports/unix/variants/nanbox/mpconfigvariant.h
@@ -28,6 +28,11 @@
 // continues to build (i.e. catches usage of mp_obj_t that don't work with
 // this representation).
 
+#define MICROPY_CONFIG_ROM_LEVEL (MICROPY_CONFIG_ROM_LEVEL_EXTRA_FEATURES)
+
+// Enable extra Unix features.
+#include "../mpconfigvariant_common.h"
+
 // select nan-boxing object model
 #define MICROPY_OBJ_REPR (MICROPY_OBJ_REPR_D)
 
diff --git a/ports/unix/variants/dev/manifest.py b/ports/unix/variants/standard/manifest.py
similarity index 100%
rename from ports/unix/variants/dev/manifest.py
rename to ports/unix/variants/standard/manifest.py
diff --git a/ports/unix/variants/standard/mpconfigvariant.h b/ports/unix/variants/standard/mpconfigvariant.h
index 31618652e961b..75201e9abc8d6 100644
--- a/ports/unix/variants/standard/mpconfigvariant.h
+++ b/ports/unix/variants/standard/mpconfigvariant.h
@@ -27,18 +27,5 @@
 // Set base feature level.
 #define MICROPY_CONFIG_ROM_LEVEL (MICROPY_CONFIG_ROM_LEVEL_EXTRA_FEATURES)
 
-// Disable some features that come enabled by default with the feature level.
-#define MICROPY_OPT_MPZ_BITWISE                 (0)
-#define MICROPY_OPT_MATH_FACTORIAL              (0)
-#define MICROPY_MODULE_ATTR_DELEGATION          (0)
-#define MICROPY_MODULE_BUILTIN_INIT             (0)
-#define MICROPY_ENABLE_SCHEDULER                (0)
-#define MICROPY_PY_BUILTINS_EXECFILE            (0)
-#define MICROPY_PY_MATH_CONSTANTS               (0)
-#define MICROPY_PY_MATH_FACTORIAL               (0)
-#define MICROPY_PY_SYS_PS1_PS2                  (0)
-#define MICROPY_PY_SYS_STDIO_BUFFER             (0)
-#define MICROPY_PY_UASYNCIO                     (0)
-#define MICROPY_PY_URE_SUB                      (0)
-#define MICROPY_PY_URANDOM_EXTRA_FUNCS          (0)
-#define MICROPY_PY_FRAMEBUF                     (0)
+// Enable extra Unix features.
+#include "../mpconfigvariant_common.h"
diff --git a/ports/unix/variants/standard/mpconfigvariant.mk b/ports/unix/variants/standard/mpconfigvariant.mk
index def7987d8dc80..929a1aec117da 100644
--- a/ports/unix/variants/standard/mpconfigvariant.mk
+++ b/ports/unix/variants/standard/mpconfigvariant.mk
@@ -1 +1,8 @@
 # This is the default variant when you `make` the Unix port.
+
+FROZEN_MANIFEST ?= $(VARIANT_DIR)/manifest.py
+
+MICROPY_ROM_TEXT_COMPRESSION = 1
+MICROPY_VFS_FAT ?= 1
+MICROPY_VFS_LFS1 ?= 1
+MICROPY_VFS_LFS2 ?= 1
diff --git a/tools/ci.sh b/tools/ci.sh
index 8f1d729a13260..9c670b7be5ead 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -454,14 +454,6 @@ function ci_unix_standard_run_tests {
     ci_unix_run_tests_full_helper standard
 }
 
-function ci_unix_dev_build {
-    ci_unix_build_helper VARIANT=dev
-}
-
-function ci_unix_dev_run_tests {
-    ci_unix_run_tests_helper VARIANT=dev
-}
-
 function ci_unix_coverage_setup {
     sudo pip3 install setuptools
     sudo pip3 install pyelftools
@@ -602,8 +594,6 @@ function ci_unix_macos_build {
     #make ${MAKEOPTS} -C ports/unix deplibs
     make ${MAKEOPTS} -C ports/unix
     # check for additional compiler errors/warnings
-    make ${MAKEOPTS} -C ports/unix VARIANT=dev submodules
-    make ${MAKEOPTS} -C ports/unix VARIANT=dev
     make ${MAKEOPTS} -C ports/unix VARIANT=coverage submodules
     make ${MAKEOPTS} -C ports/unix VARIANT=coverage
 }

From 3e5b1be8cad9cc38af9af30f5e7fa3582f65ffd9 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Tue, 16 Aug 2022 01:41:03 +1000
Subject: [PATCH 2600/3533] py/mpconfig: Add "everything" features from unix
 coverage.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 .../unix/variants/coverage/mpconfigvariant.h  | 20 +++----------
 py/mpconfig.h                                 | 28 +++++++++----------
 2 files changed, 18 insertions(+), 30 deletions(-)

diff --git a/ports/unix/variants/coverage/mpconfigvariant.h b/ports/unix/variants/coverage/mpconfigvariant.h
index 9857c668748a5..6107a4a55625a 100644
--- a/ports/unix/variants/coverage/mpconfigvariant.h
+++ b/ports/unix/variants/coverage/mpconfigvariant.h
@@ -33,24 +33,12 @@
 // Enable extra Unix features.
 #include "../mpconfigvariant_common.h"
 
-// Enable additional features.
-#define MICROPY_DEBUG_PARSE_RULE_NAME  (1)
+// Enable testing of split heap.
 #define MICROPY_GC_SPLIT_HEAP          (1)
 #define MICROPY_GC_SPLIT_HEAP_N_HEAPS  (4)
+
+// Enable additional features.
+#define MICROPY_DEBUG_PARSE_RULE_NAME  (1)
 #define MICROPY_TRACKED_ALLOC           (1)
-#define MICROPY_FLOAT_HIGH_QUALITY_HASH (1)
-#define MICROPY_REPL_EMACS_WORDS_MOVE  (1)
-#define MICROPY_REPL_EMACS_EXTRA_WORDS_MOVE (1)
 #define MICROPY_WARNINGS_CATEGORY      (1)
-#define MICROPY_PY_ALL_INPLACE_SPECIAL_METHODS (1)
-#define MICROPY_PY_BUILTINS_MEMORYVIEW_ITEMSIZE (1)
-#define MICROPY_PY_BUILTINS_NEXT2      (1)
-#define MICROPY_PY_BUILTINS_RANGE_BINOP (1)
-#define MICROPY_PY_SYS_GETSIZEOF       (1)
-#define MICROPY_PY_IO_BUFFEREDWRITER (1)
-#define MICROPY_PY_URE_DEBUG           (1)
-#define MICROPY_PY_URE_MATCH_GROUPS    (1)
-#define MICROPY_PY_URE_MATCH_SPAN_START_END (1)
-#define MICROPY_PY_COLLECTIONS_NAMEDTUPLE__ASDICT (1)
 #define MICROPY_PY_UCRYPTOLIB_CTR      (1)
-#define MICROPY_PY_MICROPYTHON_HEAP_LOCKED (1)
diff --git a/py/mpconfig.h b/py/mpconfig.h
index 5da7e453ecac3..698d264d2e800 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -683,7 +683,7 @@
 // This adds Alt+F, Alt+B, Alt+D and Alt+Backspace for forward-word, backward-word, forward-kill-word
 // and backward-kill-word, respectively.
 #ifndef MICROPY_REPL_EMACS_WORDS_MOVE
-#define MICROPY_REPL_EMACS_WORDS_MOVE (0)
+#define MICROPY_REPL_EMACS_WORDS_MOVE (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EVERYTHING)
 #endif
 
 // Whether to include extra convenience keys for word movement/kill in readline REPL.
@@ -691,7 +691,7 @@
 // respectively. Ctrl+Delete is not implemented because it's a very different escape sequence.
 // Depends on MICROPY_REPL_EMACS_WORDS_MOVE.
 #ifndef MICROPY_REPL_EMACS_EXTRA_WORDS_MOVE
-#define MICROPY_REPL_EMACS_EXTRA_WORDS_MOVE (0)
+#define MICROPY_REPL_EMACS_EXTRA_WORDS_MOVE (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EVERYTHING)
 #endif
 
 // Whether to implement auto-indent in REPL
@@ -802,7 +802,7 @@ typedef double mp_float_t;
 // Whether to provide a high-quality hash for float and complex numbers.
 // Otherwise the default is a very simple but correct hashing function.
 #ifndef MICROPY_FLOAT_HIGH_QUALITY_HASH
-#define MICROPY_FLOAT_HIGH_QUALITY_HASH (0)
+#define MICROPY_FLOAT_HIGH_QUALITY_HASH (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EVERYTHING)
 #endif
 
 // Enable features which improve CPython compatibility
@@ -1054,7 +1054,7 @@ typedef double mp_float_t;
 
 // Whether to support memoryview.itemsize attribute
 #ifndef MICROPY_PY_BUILTINS_MEMORYVIEW_ITEMSIZE
-#define MICROPY_PY_BUILTINS_MEMORYVIEW_ITEMSIZE (0)
+#define MICROPY_PY_BUILTINS_MEMORYVIEW_ITEMSIZE (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EVERYTHING)
 #endif
 
 // Whether to support set object
@@ -1099,12 +1099,12 @@ typedef double mp_float_t;
 // the same object will compare as not-equal.  With it enabled the semantics
 // match CPython and ranges are equal if they yield the same sequence of items.
 #ifndef MICROPY_PY_BUILTINS_RANGE_BINOP
-#define MICROPY_PY_BUILTINS_RANGE_BINOP (0)
+#define MICROPY_PY_BUILTINS_RANGE_BINOP (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EVERYTHING)
 #endif
 
 // Support for callling next() with second argument
 #ifndef MICROPY_PY_BUILTINS_NEXT2
-#define MICROPY_PY_BUILTINS_NEXT2 (0)
+#define MICROPY_PY_BUILTINS_NEXT2 (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EVERYTHING)
 #endif
 
 // Whether to support rounding of integers (incl bignum); eg round(123,-1)=120
@@ -1124,7 +1124,7 @@ typedef double mp_float_t;
 // Whether to support all inplace arithmetic operarion methods
 // (__imul__, etc.)
 #ifndef MICROPY_PY_ALL_INPLACE_SPECIAL_METHODS
-#define MICROPY_PY_ALL_INPLACE_SPECIAL_METHODS (0)
+#define MICROPY_PY_ALL_INPLACE_SPECIAL_METHODS (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EVERYTHING)
 #endif
 
 // Whether to support reverse arithmetic operarion methods
@@ -1219,7 +1219,7 @@ typedef double mp_float_t;
 
 // Whether to provide the "micropython.heap_locked" function
 #ifndef MICROPY_PY_MICROPYTHON_HEAP_LOCKED
-#define MICROPY_PY_MICROPYTHON_HEAP_LOCKED (0)
+#define MICROPY_PY_MICROPYTHON_HEAP_LOCKED (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EVERYTHING)
 #endif
 
 // Whether to provide "array" module. Note that large chunk of the
@@ -1258,7 +1258,7 @@ typedef double mp_float_t;
 
 // Whether to provide the _asdict function for namedtuple
 #ifndef MICROPY_PY_COLLECTIONS_NAMEDTUPLE__ASDICT
-#define MICROPY_PY_COLLECTIONS_NAMEDTUPLE__ASDICT (0)
+#define MICROPY_PY_COLLECTIONS_NAMEDTUPLE__ASDICT (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EVERYTHING)
 #endif
 
 // Whether to provide "math" module
@@ -1338,7 +1338,7 @@ typedef double mp_float_t;
 
 // Whether to provide "io.BufferedWriter" class
 #ifndef MICROPY_PY_IO_BUFFEREDWRITER
-#define MICROPY_PY_IO_BUFFEREDWRITER (0)
+#define MICROPY_PY_IO_BUFFEREDWRITER (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EVERYTHING)
 #endif
 
 // Whether to provide "struct" module
@@ -1394,7 +1394,7 @@ typedef double mp_float_t;
 
 // Whether to provide "sys.getsizeof" function
 #ifndef MICROPY_PY_SYS_GETSIZEOF
-#define MICROPY_PY_SYS_GETSIZEOF (0)
+#define MICROPY_PY_SYS_GETSIZEOF (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EVERYTHING)
 #endif
 
 // Whether to provide sys.{stdin,stdout,stderr} objects
@@ -1516,15 +1516,15 @@ typedef double mp_float_t;
 #endif
 
 #ifndef MICROPY_PY_URE_DEBUG
-#define MICROPY_PY_URE_DEBUG (0)
+#define MICROPY_PY_URE_DEBUG (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EVERYTHING)
 #endif
 
 #ifndef MICROPY_PY_URE_MATCH_GROUPS
-#define MICROPY_PY_URE_MATCH_GROUPS (0)
+#define MICROPY_PY_URE_MATCH_GROUPS (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EVERYTHING)
 #endif
 
 #ifndef MICROPY_PY_URE_MATCH_SPAN_START_END
-#define MICROPY_PY_URE_MATCH_SPAN_START_END (0)
+#define MICROPY_PY_URE_MATCH_SPAN_START_END (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EVERYTHING)
 #endif
 
 #ifndef MICROPY_PY_URE_SUB

From 51b054dd66fcd4f26f965910ea25de85a2ea01a3 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Tue, 16 Aug 2022 01:56:25 +1000
Subject: [PATCH 2601/3533] unix: Refactor mpconfigvariant.mk.

All variants (except minimal) enable text compression and fat/lfs, so move
them to the common mpconfigport.mk.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/unix/mpconfigport.mk                      | 6 ++++++
 ports/unix/variants/coverage/mpconfigvariant.mk | 5 -----
 ports/unix/variants/minimal/mpconfigvariant.mk  | 5 ++++-
 ports/unix/variants/standard/mpconfigvariant.mk | 5 -----
 4 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/ports/unix/mpconfigport.mk b/ports/unix/mpconfigport.mk
index fe9eec18dc331..ce6183c13397a 100644
--- a/ports/unix/mpconfigport.mk
+++ b/ports/unix/mpconfigport.mk
@@ -38,3 +38,9 @@ MICROPY_PY_JNI = 0
 # Avoid using system libraries, use copies bundled with MicroPython
 # as submodules (currently affects only libffi).
 MICROPY_STANDALONE = 0
+
+MICROPY_ROM_TEXT_COMPRESSION = 1
+
+MICROPY_VFS_FAT = 1
+MICROPY_VFS_LFS1 = 1
+MICROPY_VFS_LFS2 = 1
diff --git a/ports/unix/variants/coverage/mpconfigvariant.mk b/ports/unix/variants/coverage/mpconfigvariant.mk
index bbbb0432b5b76..cc37ba1582470 100644
--- a/ports/unix/variants/coverage/mpconfigvariant.mk
+++ b/ports/unix/variants/coverage/mpconfigvariant.mk
@@ -12,10 +12,5 @@ LDFLAGS += -fprofile-arcs -ftest-coverage
 FROZEN_MANIFEST ?= $(VARIANT_DIR)/manifest.py
 USER_C_MODULES = $(TOP)/examples/usercmodule
 
-MICROPY_ROM_TEXT_COMPRESSION = 1
-MICROPY_VFS_FAT = 1
-MICROPY_VFS_LFS1 = 1
-MICROPY_VFS_LFS2 = 1
-
 SRC_C += coverage.c
 SRC_CXX += coveragecpp.cpp
diff --git a/ports/unix/variants/minimal/mpconfigvariant.mk b/ports/unix/variants/minimal/mpconfigvariant.mk
index 9d4ddab9563e4..d5c2a52e9ae62 100644
--- a/ports/unix/variants/minimal/mpconfigvariant.mk
+++ b/ports/unix/variants/minimal/mpconfigvariant.mk
@@ -2,7 +2,6 @@
 
 FROZEN_MANIFEST =
 
-MICROPY_ROM_TEXT_COMPRESSION = 1
 MICROPY_PY_BTREE = 0
 MICROPY_PY_FFI = 0
 MICROPY_PY_SOCKET = 0
@@ -10,3 +9,7 @@ MICROPY_PY_THREAD = 0
 MICROPY_PY_TERMIOS = 0
 MICROPY_PY_USSL = 0
 MICROPY_USE_READLINE = 0
+
+MICROPY_VFS_FAT = 0
+MICROPY_VFS_LFS1 = 0
+MICROPY_VFS_LFS2 = 0
diff --git a/ports/unix/variants/standard/mpconfigvariant.mk b/ports/unix/variants/standard/mpconfigvariant.mk
index 929a1aec117da..c91db1aa10ff9 100644
--- a/ports/unix/variants/standard/mpconfigvariant.mk
+++ b/ports/unix/variants/standard/mpconfigvariant.mk
@@ -1,8 +1,3 @@
 # This is the default variant when you `make` the Unix port.
 
 FROZEN_MANIFEST ?= $(VARIANT_DIR)/manifest.py
-
-MICROPY_ROM_TEXT_COMPRESSION = 1
-MICROPY_VFS_FAT ?= 1
-MICROPY_VFS_LFS1 ?= 1
-MICROPY_VFS_LFS2 ?= 1

From 6c376a93067230b3b9d7d4adc1b804df18b12dcd Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Tue, 13 Sep 2022 16:40:34 +1000
Subject: [PATCH 2602/3533] tests/extmod/uasyncio_heaplock.py: Force SKIP on
 stackless.

This is a latent issue that wasn't caught by CI because there was no
configuration that had both stackless+uasyncio.

The previous check to skip with stackless builds only worked when the
bytecode emitter was used by default.  Force the check to use the bytecode
emitter.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 tests/extmod/uasyncio_heaplock.py | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/tests/extmod/uasyncio_heaplock.py b/tests/extmod/uasyncio_heaplock.py
index a6b4a0819c0e0..9c9487357a2ef 100644
--- a/tests/extmod/uasyncio_heaplock.py
+++ b/tests/extmod/uasyncio_heaplock.py
@@ -8,11 +8,19 @@
 
 # strict stackless builds can't call functions without allocating a frame on the heap
 try:
-    f = lambda: 0
+    # force bytecode (in case we're running with emit=native) and verify
+    # that bytecode-calling-bytecode doesn't allocate
+    @micropython.bytecode
+    def f(x):
+        x and f(x - 1)
+
     micropython.heap_lock()
-    f()
+    f(1)
     micropython.heap_unlock()
 except RuntimeError:
+    # RuntimeError (max recursion depth) not MemoryError because effectively
+    # the recursion depth is at the limit while the heap is locked with
+    # stackless
     print("SKIP")
     raise SystemExit
 

From 65ce7d7ade17f7f9ac2c5fbb75ad5d28078f8490 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sun, 17 Jul 2022 08:43:02 +0200
Subject: [PATCH 2603/3533] mimxrt/machine_uart: Drop a few commented lines
 about TX ring buffer.

---
 ports/mimxrt/machine_uart.c | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/ports/mimxrt/machine_uart.c b/ports/mimxrt/machine_uart.c
index 302244f7221f6..1b0c0633345af 100644
--- a/ports/mimxrt/machine_uart.c
+++ b/ports/mimxrt/machine_uart.c
@@ -244,12 +244,6 @@ STATIC mp_obj_t machine_uart_init_helper(machine_uart_obj_t *self, size_t n_args
         LPUART_EnableTx(self->lpuart, false);
         self->lpuart->STAT |= 1 << LPUART_STAT_BRK13_SHIFT;
         LPUART_EnableTx(self->lpuart, true);
-
-        // Allocate the TX ring buffer. Not used yet, but maybe later.
-
-        // ringbuf_alloc(&(self->write_buffer), txbuf_len + 1);
-        // MP_STATE_PORT(rp2_uart_tx_buffer[uart_id]) = self->write_buffer.buf;
-
     }
 
     return MP_OBJ_FROM_PTR(self);

From 8e542251405d780f7aa0d6c9abaa30282dd360d5 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Mon, 25 Apr 2022 13:56:45 +0200
Subject: [PATCH 2604/3533] mimxrt: Format the firmware image to match the new
 teensy loader.

The new teensy loader keeps the file system under certain conditions:
- The file size is properly set in the file header.
- The header version is 4.3

These changes are implemented here, requiring a backport of
fsl_flexspi_nor_boot.c.  There is still a problem with the command line
version of the teensy loader, which fails on the first attempt.  At the
second attempt it works.  The GUI version of the teensy loader is fine.
---
 ports/mimxrt/Makefile                   |   2 +-
 ports/mimxrt/boards/common.ld           |   7 +-
 ports/mimxrt/hal/fsl_flexspi_nor_boot.c |  53 +++++++++++
 ports/mimxrt/hal/fsl_flexspi_nor_boot.h | 114 ++++++++++++++++++++++++
 4 files changed, 173 insertions(+), 3 deletions(-)
 create mode 100644 ports/mimxrt/hal/fsl_flexspi_nor_boot.c
 create mode 100644 ports/mimxrt/hal/fsl_flexspi_nor_boot.h

diff --git a/ports/mimxrt/Makefile b/ports/mimxrt/Makefile
index 6312ecdd8f3ee..6a18879ac5833 100644
--- a/ports/mimxrt/Makefile
+++ b/ports/mimxrt/Makefile
@@ -128,7 +128,7 @@ SRC_HAL_IMX_C += \
 	$(MCU_DIR)/drivers/fsl_trng.c \
 	$(MCU_DIR)/drivers/fsl_wdog.c \
 	$(MCU_DIR)/system_$(MCU_SERIES).c \
-	$(MCU_DIR)/xip/fsl_flexspi_nor_boot.c \
+	hal/fsl_flexspi_nor_boot.c \
 
 ifeq ($(MICROPY_HW_SDRAM_AVAIL),1)
 SRC_HAL_IMX_C += $(MCU_DIR)/drivers/fsl_semc.c
diff --git a/ports/mimxrt/boards/common.ld b/ports/mimxrt/boards/common.ld
index fbc99da3ddb0e..3aaa14c83bf21 100644
--- a/ports/mimxrt/boards/common.ld
+++ b/ports/mimxrt/boards/common.ld
@@ -207,7 +207,7 @@ SECTIONS
     __ram_function_end__ = .;
   } > m_itcm  
 
-  __NDATA_ROM = __DATA_ROM + (__ram_function_end__ - __data_start__);
+  __NDATA_ROM = __RAM_FUNCTIONS_ROM + (__ram_function_end__ - __ram_function_start__);
   .ncache.init : AT(__NDATA_ROM)
   {
     __noncachedata_start__ = .;   /* create a global symbol at ncache data start */
@@ -223,7 +223,8 @@ SECTIONS
     __noncachedata_end__ = .;     /* define a global symbol at ncache data end */
   } > m_dtcm
 
-  __DATA_END = __NDATA_ROM + (__noncachedata_init_end__ - __noncachedata_start__);
+  __DATA_END = __NDATA_ROM + (__noncachedata_end__ - __noncachedata_start__);
+  __FLASH_DATA_END = __NDATA_ROM + (__noncachedata_init_end__ - __noncachedata_start__);
   text_end = ORIGIN(m_text) + LENGTH(m_text);
   ASSERT(__DATA_END <= text_end, "region m_text overflowed with text and data")
 
@@ -262,6 +263,8 @@ SECTIONS
     . += STACK_SIZE;
   } > m_dtcm
 
+  _flashimagelen = __FLASH_DATA_END - flash_start;
+
   /* Initializes stack on the end of block */
   __StackTop   = ORIGIN(m_dtcm) + LENGTH(m_dtcm);
   __StackLimit = __StackTop - STACK_SIZE;
diff --git a/ports/mimxrt/hal/fsl_flexspi_nor_boot.c b/ports/mimxrt/hal/fsl_flexspi_nor_boot.c
new file mode 100644
index 0000000000000..5786f37e7ab80
--- /dev/null
+++ b/ports/mimxrt/hal/fsl_flexspi_nor_boot.c
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2017 NXP
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#include "fsl_flexspi_nor_boot.h"
+extern unsigned long _flashimagelen;
+extern unsigned long __etext;
+
+/* Component ID definition, used by tools. */
+#ifndef FSL_COMPONENT_ID
+#define FSL_COMPONENT_ID "platform.drivers.xip_device"
+#endif
+
+#if defined(XIP_BOOT_HEADER_ENABLE) && (XIP_BOOT_HEADER_ENABLE == 1)
+#if defined(__CC_ARM) || defined(__ARMCC_VERSION) || defined(__GNUC__)
+__attribute__((section(".boot_hdr.ivt")))
+#elif defined(__ICCARM__)
+#pragma location=".boot_hdr.ivt"
+#endif
+
+
+/*************************************
+ *  IVT Data
+ *************************************/
+const ivt image_vector_table = {
+    IVT_HEADER,                       /* IVT Header */
+    IMAGE_ENTRY_ADDRESS,              /* Image Entry Function */
+    IVT_RSVD,                         /* Reserved = 0 */
+    (uint32_t)DCD_ADDRESS,            /* Address where DCD information is stored */
+    (uint32_t)BOOT_DATA_ADDRESS,      /* Address where BOOT Data Structure is stored */
+    (uint32_t)&image_vector_table,    /* Pointer to IVT Self (absolute address */
+    (uint32_t)CSF_ADDRESS,            /* Address where CSF file is stored */
+    IVT_RSVD                          /* Reserved = 0 */
+};
+
+#if defined(__CC_ARM) || defined(__ARMCC_VERSION) || defined(__GNUC__)
+__attribute__((section(".boot_hdr.boot_data")))
+#elif defined(__ICCARM__)
+#pragma location=".boot_hdr.boot_data"
+#endif
+/*************************************
+ *  Boot Data
+ *************************************/
+const BOOT_DATA_T boot_data = {
+    FLASH_BASE,               /* boot start location */
+    (uint32_t)&_flashimagelen, /* Image size */
+    PLUGIN_FLAG,              /* Plugin flag*/
+    0xFFFFFFFF                            /* empty - extra data word */
+};
+#endif
diff --git a/ports/mimxrt/hal/fsl_flexspi_nor_boot.h b/ports/mimxrt/hal/fsl_flexspi_nor_boot.h
new file mode 100644
index 0000000000000..fbb8a574f3eaa
--- /dev/null
+++ b/ports/mimxrt/hal/fsl_flexspi_nor_boot.h
@@ -0,0 +1,114 @@
+/*
+ * Copyright 2017 NXP
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#ifndef __FLEXSPI_NOR_BOOT_H__
+#define __FLEXSPI_NOR_BOOT_H__
+
+#include <stdint.h>
+#include "board.h"
+
+/*! @name Driver version */
+/*@{*/
+/*! @brief XIP_DEVICE driver version 2.0.0. */
+#define FSL_XIP_DEVICE_DRIVER_VERSION (MAKE_VERSION(2, 0, 0))
+/*@}*/
+
+/*************************************
+ *  IVT Data
+ *************************************/
+typedef struct _ivt_ {
+    /** @ref hdr with tag #HAB_TAG_IVT, length and HAB version fields
+     *  (see @ref data)
+     */
+    uint32_t hdr;
+    /** Absolute address of the first instruction to execute from the
+     *  image
+     */
+    uint32_t entry;
+    /** Reserved in this version of HAB: should be NULL. */
+    uint32_t reserved1;
+    /** Absolute address of the image DCD: may be NULL. */
+    uint32_t dcd;
+    /** Absolute address of the Boot Data: may be NULL, but not interpreted
+     *  any further by HAB
+     */
+    uint32_t boot_data;
+    /** Absolute address of the IVT.*/
+    uint32_t self;
+    /** Absolute address of the image CSF.*/
+    uint32_t csf;
+    /** Reserved in this version of HAB: should be zero. */
+    uint32_t reserved2;
+} ivt;
+
+#define IVT_MAJOR_VERSION           0x4
+#define IVT_MAJOR_VERSION_SHIFT     0x4
+#define IVT_MAJOR_VERSION_MASK      0xF
+#define IVT_MINOR_VERSION           0x3
+#define IVT_MINOR_VERSION_SHIFT     0x0
+#define IVT_MINOR_VERSION_MASK      0xF
+
+#define IVT_VERSION(major, minor)   \
+    ((((major) & IVT_MAJOR_VERSION_MASK) << IVT_MAJOR_VERSION_SHIFT) |  \
+    (((minor) & IVT_MINOR_VERSION_MASK) << IVT_MINOR_VERSION_SHIFT))
+
+/* IVT header */
+#define IVT_TAG_HEADER        0xD1       /**< Image Vector Table */
+#define IVT_SIZE              0x2000
+#define IVT_PAR               IVT_VERSION(IVT_MAJOR_VERSION, IVT_MINOR_VERSION)
+#define IVT_HEADER           (IVT_TAG_HEADER | (IVT_SIZE << 8) | (IVT_PAR << 24))
+
+/* Set resume entry */
+#if defined(__CC_ARM) || defined(__ARMCC_VERSION)
+extern uint32_t __Vectors[];
+extern uint32_t Image$$RW_m_config_text$$Base[];
+#define IMAGE_ENTRY_ADDRESS ((uint32_t)__Vectors)
+#define FLASH_BASE ((uint32_t)Image$$RW_m_config_text$$Base)
+#elif defined(__MCUXPRESSO)
+extern uint32_t __Vectors[];
+extern uint32_t __boot_hdr_start__[];
+#define IMAGE_ENTRY_ADDRESS ((uint32_t)__Vectors)
+#define FLASH_BASE          ((uint32_t)__boot_hdr_start__)
+#elif defined(__ICCARM__)
+extern uint32_t __VECTOR_TABLE[];
+extern uint32_t m_boot_hdr_conf_start[];
+#define IMAGE_ENTRY_ADDRESS ((uint32_t)__VECTOR_TABLE)
+#define FLASH_BASE ((uint32_t)m_boot_hdr_conf_start)
+#elif defined(__GNUC__)
+extern uint32_t __VECTOR_TABLE[];
+extern uint32_t __FLASH_BASE[];
+#define IMAGE_ENTRY_ADDRESS ((uint32_t)__VECTOR_TABLE)
+#define FLASH_BASE ((uint32_t)__FLASH_BASE)
+#endif
+
+#define DCD_ADDRESS           dcd_data
+#define BOOT_DATA_ADDRESS     &boot_data
+#define CSF_ADDRESS           0
+#define IVT_RSVD             (uint32_t)(0x00000000)
+
+/*************************************
+ *  Boot Data
+ *************************************/
+typedef struct _boot_data_ {
+    uint32_t start;         /* boot start location */
+    uint32_t size;          /* size */
+    uint32_t plugin;        /* plugin flag - 1 if downloaded application is plugin */
+    uint32_t placeholder;       /* placehoder to make even 0x10 size */
+}BOOT_DATA_T;
+
+#if defined(BOARD_FLASH_SIZE)
+#define FLASH_SIZE            BOARD_FLASH_SIZE
+#else
+#error "Please define macro BOARD_FLASH_SIZE"
+#endif
+#define PLUGIN_FLAG           (uint32_t)0
+
+/* External Variables */
+const BOOT_DATA_T boot_data;
+extern const uint8_t dcd_data[];
+
+#endif /* __FLEXSPI_NOR_BOOT_H__ */

From 0f048a5a2a4cb239784cd152c9cd3fa0deb86db7 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sun, 31 Jul 2022 11:09:57 +0200
Subject: [PATCH 2605/3533] mimxrt/machine_spi: Allow a setting of -1 for cs in
 the constructor.

In that case, no Pin will be configured for the CS signal, even if it is
internally still generated.  That setting allows to use any pin for CS,
which then must be controlled by the Python script.

Also make the default cs=-1 to match other ports (software CS).
---
 docs/mimxrt/pinout.rst     |  3 ++-
 docs/mimxrt/quickref.rst   |  8 +++++++-
 ports/mimxrt/machine_spi.c | 13 ++++++++-----
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/docs/mimxrt/pinout.rst b/docs/mimxrt/pinout.rst
index b82c153fc3ea4..ef53fa63bff22 100644
--- a/docs/mimxrt/pinout.rst
+++ b/docs/mimxrt/pinout.rst
@@ -322,7 +322,8 @@ Olimex RT1010Py             -                 CS0/-/SDO/SDI/SCK        SDCARD wi
 Seeed ARCH MIX     J4_12/-/J4_14/J4_13/J4_15  J3_09/J3_05/J3_08_J3_11
 =================  =========================  =======================  ===============
 
-Pins denoted with (*) are by default not wired at the board.
+Pins denoted with (*) are by default not wired at the board. The CS0 and CS1 signals
+are enabled with the keyword option cs=0 or cs=1 of the SPI object constructor.
 
 .. _mimxrt_i2c_pinout:
 
diff --git a/docs/mimxrt/quickref.rst b/docs/mimxrt/quickref.rst
index 0a14c632aafe5..c75fe60c8d66b 100644
--- a/docs/mimxrt/quickref.rst
+++ b/docs/mimxrt/quickref.rst
@@ -301,13 +301,19 @@ There are up to four hardware SPI channels that allow faster transmission
 rates (up to 30Mhz).  Hardware SPI is accessed via the
 :ref:`machine.SPI <machine.SPI>` class and has the same methods as software SPI above::
 
-    from machine import SPI
+    from machine import SPI, Pin
 
     spi = SPI(0, 10000000)
+    cs_pin = Pin(6, Pin.OUT, value=1)
+    cs_pin(0)
     spi.write('Hello World')
+    cs_pin(1)
 
 For the assignment of Pins to SPI signals, refer to
 :ref:`Hardware SPI pinout <mimxrt_spi_pinout>`.
+The keyword option cs=n can be used to enable the cs pin 0 or 1 for an automatic cs signal. The
+default is cs=-1. Using cs=-1 the automatic cs signal is not created. 
+In that case, cs has to be set by the script. Clearing that assignment requires a power cycle.
 
 Notes:
 
diff --git a/ports/mimxrt/machine_spi.c b/ports/mimxrt/machine_spi.c
index 805ed9a0ac540..32bc77c34ddf6 100644
--- a/ports/mimxrt/machine_spi.c
+++ b/ports/mimxrt/machine_spi.c
@@ -77,7 +77,7 @@ static const iomux_table_t iomux_table[] = {
     IOMUX_TABLE_SPI
 };
 
-bool lpspi_set_iomux(int8_t spi, uint8_t drive, uint8_t cs) {
+bool lpspi_set_iomux(int8_t spi, uint8_t drive, int8_t cs) {
     int index = (spi - 1) * 5;
 
     if (SCK.muxRegister != 0) {
@@ -93,7 +93,7 @@ bool lpspi_set_iomux(int8_t spi, uint8_t drive, uint8_t cs) {
             IOMUXC_SetPinMux(CS1.muxRegister, CS1.muxMode, CS1.inputRegister, CS1.inputDaisy, CS1.configRegister, 0U);
             IOMUXC_SetPinConfig(CS1.muxRegister, CS1.muxMode, CS1.inputRegister, CS1.inputDaisy, CS1.configRegister,
                 pin_generate_config(PIN_PULL_UP_100K, PIN_MODE_OUT, drive, CS1.configRegister));
-        } else {
+        } else if (cs != -1) {
             mp_raise_ValueError(MP_ERROR_TEXT("The chosen CS is not available"));
         }
 
@@ -131,7 +131,7 @@ mp_obj_t machine_spi_make_new(const mp_obj_type_t *type, size_t n_args, size_t n
         { MP_QSTR_firstbit, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = DEFAULT_SPI_FIRSTBIT} },
         { MP_QSTR_gap_ns,   MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} },
         { MP_QSTR_drive,    MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = DEFAULT_SPI_DRIVE} },
-        { MP_QSTR_cs,       MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 0} },
+        { MP_QSTR_cs,       MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} },
     };
 
     // Parse the arguments.
@@ -173,8 +173,11 @@ mp_obj_t machine_spi_make_new(const mp_obj_type_t *type, size_t n_args, size_t n
     }
     self->master_config->lastSckToPcsDelayInNanoSec = self->master_config->betweenTransferDelayInNanoSec;
     self->master_config->pcsToSckDelayInNanoSec = self->master_config->betweenTransferDelayInNanoSec;
-    uint8_t cs = args[ARG_cs].u_int;
-    if (cs <= 1) {
+    int8_t cs = args[ARG_cs].u_int;
+    // In the SPI master_config for automatic CS the value cs=0 is set already,
+    // so only cs=1 has to be addressed here. The case cs == -1 for manual CS is handled
+    // in the function spi_set_iomux() and the value in the master_config can stay at 0.
+    if (cs == 1) {
         self->master_config->whichPcs = cs;
     }
     LPSPI_MasterInit(self->spi_inst, self->master_config, BOARD_BOOTCLOCKRUN_LPSPI_CLK_ROOT);

From 443fbcf81c05de00f35b90d8a443837d62073a63 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Thu, 18 Aug 2022 11:36:08 +0200
Subject: [PATCH 2606/3533] mimxrt/machine_uart: Set the UART ioctl write poll
 flag properly.

It was always set to True.  The change adds a check to the tx status flag
which is set when all data is transferred.
---
 ports/mimxrt/machine_uart.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/mimxrt/machine_uart.c b/ports/mimxrt/machine_uart.c
index 1b0c0633345af..ab17886926453 100644
--- a/ports/mimxrt/machine_uart.c
+++ b/ports/mimxrt/machine_uart.c
@@ -437,7 +437,7 @@ STATIC mp_uint_t machine_uart_ioctl(mp_obj_t self_in, mp_uint_t request, mp_uint
                 ret |= MP_STREAM_POLL_RD;
             }
         }
-        if ((flags & MP_STREAM_POLL_WR)) {
+        if ((flags & MP_STREAM_POLL_WR) && (self->tx_status == kStatus_LPUART_TxIdle)) {
             ret |= MP_STREAM_POLL_WR;
         }
     } else if (request == MP_STREAM_FLUSH) {

From 6472348c1b2559105e1b2f912a58566b9900e9c1 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Thu, 8 Sep 2022 14:24:32 +0200
Subject: [PATCH 2607/3533] mimxrt/machine_uart: Fix a bug in UART.write().

Causing an incomplete send if the data size was longer than the buffer
size.
---
 ports/mimxrt/machine_uart.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/mimxrt/machine_uart.c b/ports/mimxrt/machine_uart.c
index ab17886926453..83382a6cf2bc1 100644
--- a/ports/mimxrt/machine_uart.c
+++ b/ports/mimxrt/machine_uart.c
@@ -395,7 +395,7 @@ STATIC mp_uint_t machine_uart_write(mp_obj_t self_in, const void *buf_in, mp_uin
 
         // Wait at least the number of character times for this chunk.
         t = ticks_us64() + (uint64_t)xfer.dataSize * (13000000 / self->config.baudRate_Bps + 1000);
-        while (self->handle.txDataSize) {
+        while (self->tx_status != kStatus_LPUART_TxIdle) {
             // Wait for the first/next character to be sent.
             if (ticks_us64() > t) { // timed out
                 if (self->handle.txDataSize >= size) {

From 74805435f9459ceae4ea6044a767de4a5479e6c8 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 13 Sep 2022 21:14:22 +1000
Subject: [PATCH 2608/3533] py/objpolyiter: Fix comment about finaliser method.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/objpolyiter.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/py/objpolyiter.c b/py/objpolyiter.c
index 16fd1f486c15f..dac6a2545575f 100644
--- a/py/objpolyiter.c
+++ b/py/objpolyiter.c
@@ -66,7 +66,7 @@ typedef struct _mp_obj_polymorph_iter_with_finaliser_t {
 
 STATIC mp_obj_t mp_obj_polymorph_iter_del(mp_obj_t self_in) {
     mp_obj_polymorph_with_finaliser_iter_t *self = MP_OBJ_TO_PTR(self_in);
-    // Redirect call to object instance's iternext method
+    // Redirect call to object instance's finaliser method
     return self->finaliser(self_in);
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_obj_polymorph_iter_del_obj, mp_obj_polymorph_iter_del);

From 0e8c2204da377e95b5000a3c708891d98cdeb69c Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 14 Sep 2022 14:03:37 +1000
Subject: [PATCH 2609/3533] esp32/mphalport: Fix calculation of large sleep by
 using 64-bit arith.

Fixes issue #9304.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/mphalport.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/esp32/mphalport.c b/ports/esp32/mphalport.c
index aab534937e137..2aaeb9755f972 100644
--- a/ports/esp32/mphalport.c
+++ b/ports/esp32/mphalport.c
@@ -130,7 +130,7 @@ uint32_t mp_hal_ticks_us(void) {
 }
 
 void mp_hal_delay_ms(uint32_t ms) {
-    uint64_t us = ms * 1000;
+    uint64_t us = (uint64_t)ms * 1000ULL;
     uint64_t dt;
     uint64_t t0 = esp_timer_get_time();
     for (;;) {
@@ -139,7 +139,7 @@ void mp_hal_delay_ms(uint32_t ms) {
         MP_THREAD_GIL_EXIT();
         uint64_t t1 = esp_timer_get_time();
         dt = t1 - t0;
-        if (dt + portTICK_PERIOD_MS * 1000 >= us) {
+        if (dt + portTICK_PERIOD_MS * 1000ULL >= us) {
             // doing a vTaskDelay would take us beyond requested delay time
             taskYIELD();
             MP_THREAD_GIL_ENTER();

From 45972fa5481aeef38d074360b0f72b212968a305 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Wed, 14 Sep 2022 09:57:47 +1000
Subject: [PATCH 2610/3533] py/mkrules.mk: Add link to build troubleshooting on
 failure.

Also update the submodules help text to match.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 py/mkrules.mk | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/py/mkrules.mk b/py/mkrules.mk
index 14f1b953cda40..a58bd2ee0e4d6 100644
--- a/py/mkrules.mk
+++ b/py/mkrules.mk
@@ -4,6 +4,9 @@ THIS_MAKEFILE = $(lastword $(MAKEFILE_LIST))
 include $(dir $(THIS_MAKEFILE))mkenv.mk
 endif
 
+HELP_BUILD_ERROR ?= "See \033[1;31mhttps://github.com/micropython/micropython/wiki/Build-Troubleshooting\033[0m"
+HELP_MPY_LIB_SUBMODULE ?= "\033[1;31mError: micropython-lib submodule is not initialized.\033[0m Run 'make submodules'"
+
 # Extra deps that need to happen before object compilation.
 OBJ_EXTRA_ORDER_DEPS =
 
@@ -53,7 +56,7 @@ $(BUILD)/%.o: %.s
 
 define compile_c
 $(ECHO) "CC $<"
-$(Q)$(CC) $(CFLAGS) -c -MD -o $@ $<
+$(Q)$(CC) $(CFLAGS) -c -MD -o $@ $< || (echo -e $(HELP_BUILD_ERROR); false)
 @# The following fixes the dependency file.
 @# See http://make.paulandlesley.org/autodep.html for details.
 @# Regex adjusted from the above to play better with Windows paths, etc.
@@ -65,7 +68,7 @@ endef
 
 define compile_cxx
 $(ECHO) "CXX $<"
-$(Q)$(CXX) $(CXXFLAGS) -c -MD -o $@ $<
+$(Q)$(CXX) $(CXXFLAGS) -c -MD -o $@ $< || (echo -e $(HELP_BUILD_ERROR); false)
 @# The following fixes the dependency file.
 @# See http://make.paulandlesley.org/autodep.html for details.
 @# Regex adjusted from the above to play better with Windows paths, etc.
@@ -182,7 +185,7 @@ endif
 
 # to build frozen_content.c from a manifest
 $(BUILD)/frozen_content.c: FORCE $(BUILD)/genhdr/qstrdefs.generated.h $(BUILD)/genhdr/root_pointers.h | $(MICROPY_MPYCROSS_DEPENDENCY)
-	$(Q)test -e "$(MPY_LIB_DIR)/README.md" || (echo "Error: micropython-lib not initialized. Run 'make submodules'"; false)
+	$(Q)test -e "$(MPY_LIB_DIR)/README.md" || (echo -e $(HELP_MPY_LIB_SUBMODULE); false)
 	$(Q)$(MAKE_MANIFEST) -o $@ -v "MPY_DIR=$(TOP)" -v "MPY_LIB_DIR=$(MPY_LIB_DIR)" -v "PORT_DIR=$(shell pwd)" -v "BOARD_DIR=$(BOARD_DIR)" -b "$(BUILD)" $(if $(MPY_CROSS_FLAGS),-f"$(MPY_CROSS_FLAGS)",) --mpy-tool-flags="$(MPY_TOOL_FLAGS)" $(FROZEN_MANIFEST)
 endif
 

From 18d0e6d0dbdb34c6cac5aeeb9c4424821cd9f16a Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Wed, 14 Sep 2022 10:08:48 +1000
Subject: [PATCH 2611/3533] esp32/Makefile: Add link to build troubleshooting
 on failure.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/esp32/Makefile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ports/esp32/Makefile b/ports/esp32/Makefile
index b7d804d0730e7..e43cad751b216 100644
--- a/ports/esp32/Makefile
+++ b/ports/esp32/Makefile
@@ -34,8 +34,10 @@ ifdef FROZEN_MANIFEST
        IDFPY_FLAGS += -D MICROPY_FROZEN_MANIFEST=$(FROZEN_MANIFEST)
 endif
 
+HELP_BUILD_ERROR ?= "See \033[1;31mhttps://github.com/micropython/micropython/wiki/Build-Troubleshooting\033[0m"
+
 all:
-	idf.py $(IDFPY_FLAGS) build
+	idf.py $(IDFPY_FLAGS) build || (echo -e $(HELP_BUILD_ERROR); false)
 	@$(PYTHON) makeimg.py \
 		$(BUILD)/sdkconfig \
 		$(BUILD)/bootloader/bootloader.bin \

From ca51d63c37e6ca67bec0a645e2aeea71aba91058 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Wed, 14 Sep 2022 10:08:59 +1000
Subject: [PATCH 2612/3533] rp2/Makefile: Add link to build troubleshooting on
 failure.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/rp2/Makefile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ports/rp2/Makefile b/ports/rp2/Makefile
index 6d2fc009642d8..c603f5403fcac 100644
--- a/ports/rp2/Makefile
+++ b/ports/rp2/Makefile
@@ -22,9 +22,11 @@ ifeq ($(DEBUG),1)
 CMAKE_ARGS += -DCMAKE_BUILD_TYPE=Debug
 endif
 
+HELP_BUILD_ERROR ?= "See \033[1;31mhttps://github.com/micropython/micropython/wiki/Build-Troubleshooting\033[0m"
+
 all:
 	[ -e $(BUILD)/Makefile ] || cmake -S . -B $(BUILD) -DPICO_BUILD_DOCS=0 ${CMAKE_ARGS}
-	$(MAKE) $(MAKESILENT) -C $(BUILD)
+	$(MAKE) $(MAKESILENT) -C $(BUILD) || (echo -e $(HELP_BUILD_ERROR); false)
 
 clean:
 	$(RM) -rf $(BUILD)

From fb2a57800acffd811d05373dcf63e95b4048d0c6 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Thu, 15 Jul 2021 14:31:06 +1000
Subject: [PATCH 2613/3533] all: Simplify buffer protocol to just a "get
 buffer" callback.

The buffer protocol type only has a single member, and this existing layout
creates problems for the upcoming split/slot-index mp_obj_type_t layout
optimisations.

If we need to make the buffer protocol more sophisticated in the future
either we can rely on the mp_obj_type_t optimisations to just add
additional slots to mp_obj_type_t or re-visit the buffer protocol then.

This change is a no-op in terms of generated code.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 examples/natmod/framebuf/framebuf.c                 | 2 +-
 extmod/modbluetooth.c                               | 2 +-
 extmod/modframebuf.c                                | 2 +-
 extmod/moductypes.c                                 | 2 +-
 ports/nrf/boards/microbit/modules/iters.c           | 1 -
 ports/nrf/boards/microbit/modules/microbitdisplay.c | 1 -
 ports/nrf/boards/microbit/modules/microbitimage.c   | 1 -
 ports/unix/modffi.c                                 | 4 ++--
 py/obj.c                                            | 4 ++--
 py/obj.h                                            | 6 ++----
 py/objarray.c                                       | 6 +++---
 py/objstr.c                                         | 4 ++--
 py/objstrunicode.c                                  | 2 +-
 py/objtype.c                                        | 6 +++---
 14 files changed, 19 insertions(+), 24 deletions(-)

diff --git a/examples/natmod/framebuf/framebuf.c b/examples/natmod/framebuf/framebuf.c
index 53fb90c625ada..2eff61c817d22 100644
--- a/examples/natmod/framebuf/framebuf.c
+++ b/examples/natmod/framebuf/framebuf.c
@@ -21,7 +21,7 @@ mp_obj_t mpy_init(mp_obj_fun_bc_t *self, size_t n_args, size_t n_kw, mp_obj_t *a
     mp_type_framebuf.base.type = (void*)&mp_type_type;
     mp_type_framebuf.name = MP_QSTR_FrameBuffer;
     mp_type_framebuf.make_new = framebuf_make_new;
-    mp_type_framebuf.buffer_p.get_buffer = framebuf_get_buffer;
+    mp_type_framebuf.buffer = framebuf_get_buffer;
     framebuf_locals_dict_table[0] = (mp_map_elem_t){ MP_OBJ_NEW_QSTR(MP_QSTR_fill), MP_OBJ_FROM_PTR(&framebuf_fill_obj) };
     framebuf_locals_dict_table[1] = (mp_map_elem_t){ MP_OBJ_NEW_QSTR(MP_QSTR_fill_rect), MP_OBJ_FROM_PTR(&framebuf_fill_rect_obj) };
     framebuf_locals_dict_table[2] = (mp_map_elem_t){ MP_OBJ_NEW_QSTR(MP_QSTR_pixel), MP_OBJ_FROM_PTR(&framebuf_pixel_obj) };
diff --git a/extmod/modbluetooth.c b/extmod/modbluetooth.c
index bd4d9b71790c1..4cc57b3d55ab8 100644
--- a/extmod/modbluetooth.c
+++ b/extmod/modbluetooth.c
@@ -248,7 +248,7 @@ const mp_obj_type_t mp_type_bluetooth_uuid = {
     .binary_op = bluetooth_uuid_binary_op,
     .locals_dict = NULL,
     .print = bluetooth_uuid_print,
-    .buffer_p = { .get_buffer = bluetooth_uuid_get_buffer },
+    .buffer = bluetooth_uuid_get_buffer,
 };
 
 // ----------------------------------------------------------------------------
diff --git a/extmod/modframebuf.c b/extmod/modframebuf.c
index bb1f4f6310774..9542d4303e09d 100644
--- a/extmod/modframebuf.c
+++ b/extmod/modframebuf.c
@@ -833,7 +833,7 @@ STATIC const mp_obj_type_t mp_type_framebuf = {
     { &mp_type_type },
     .name = MP_QSTR_FrameBuffer,
     .make_new = framebuf_make_new,
-    .buffer_p = { .get_buffer = framebuf_get_buffer },
+    .buffer = framebuf_get_buffer,
     .locals_dict = (mp_obj_dict_t *)&framebuf_locals_dict,
 };
 #endif
diff --git a/extmod/moductypes.c b/extmod/moductypes.c
index 547453c48e9fd..25578dd6b0710 100644
--- a/extmod/moductypes.c
+++ b/extmod/moductypes.c
@@ -642,7 +642,7 @@ STATIC const mp_obj_type_t uctypes_struct_type = {
     .attr = uctypes_struct_attr,
     .subscr = uctypes_struct_subscr,
     .unary_op = uctypes_struct_unary_op,
-    .buffer_p = { .get_buffer = uctypes_get_buffer },
+    .buffer = uctypes_get_buffer,
 };
 
 STATIC const mp_rom_map_elem_t mp_module_uctypes_globals_table[] = {
diff --git a/ports/nrf/boards/microbit/modules/iters.c b/ports/nrf/boards/microbit/modules/iters.c
index 8ae4b698fe92e..e9c4ae3c72bc8 100644
--- a/ports/nrf/boards/microbit/modules/iters.c
+++ b/ports/nrf/boards/microbit/modules/iters.c
@@ -55,7 +55,6 @@ const mp_obj_type_t microbit_repeat_iterator_type = {
     .subscr = NULL,
     .getiter = mp_identity_getiter,
     .iternext = microbit_repeat_iter_next,
-    .buffer_p = {NULL},
     MP_OBJ_NULL
 };
 
diff --git a/ports/nrf/boards/microbit/modules/microbitdisplay.c b/ports/nrf/boards/microbit/modules/microbitdisplay.c
index b35703ad6f9a7..04b8602879b8d 100644
--- a/ports/nrf/boards/microbit/modules/microbitdisplay.c
+++ b/ports/nrf/boards/microbit/modules/microbitdisplay.c
@@ -554,7 +554,6 @@ const mp_obj_type_t microbit_display_type = {
     .subscr = NULL,
     .getiter = NULL,
     .iternext = NULL,
-    .buffer_p = {NULL},
     .locals_dict = (mp_obj_dict_t*)&microbit_display_locals_dict,
 };
 
diff --git a/ports/nrf/boards/microbit/modules/microbitimage.c b/ports/nrf/boards/microbit/modules/microbitimage.c
index a028df8282a96..5d2896c38346a 100644
--- a/ports/nrf/boards/microbit/modules/microbitimage.c
+++ b/ports/nrf/boards/microbit/modules/microbitimage.c
@@ -690,7 +690,6 @@ const mp_obj_type_t microbit_image_type = {
     .subscr = NULL,
     .getiter = NULL,
     .iternext = NULL,
-    .buffer_p = {NULL},
     .locals_dict = (mp_obj_dict_t*)&microbit_image_locals_dict,
 };
 
diff --git a/ports/unix/modffi.c b/ports/unix/modffi.c
index d82d5270fa34f..6417b5d3b395c 100644
--- a/ports/unix/modffi.c
+++ b/ports/unix/modffi.c
@@ -505,10 +505,10 @@ STATIC mp_obj_t ffifunc_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const
         } else if (mp_obj_is_str(a)) {
             const char *s = mp_obj_str_get_str(a);
             values[i].ffi = (ffi_arg)(intptr_t)s;
-        } else if (((mp_obj_base_t *)MP_OBJ_TO_PTR(a))->type->buffer_p.get_buffer != NULL) {
+        } else if (((mp_obj_base_t *)MP_OBJ_TO_PTR(a))->type->buffer != NULL) {
             mp_obj_base_t *o = (mp_obj_base_t *)MP_OBJ_TO_PTR(a);
             mp_buffer_info_t bufinfo;
-            int ret = o->type->buffer_p.get_buffer(MP_OBJ_FROM_PTR(o), &bufinfo, MP_BUFFER_READ); // TODO: MP_BUFFER_READ?
+            int ret = o->type->buffer(MP_OBJ_FROM_PTR(o), &bufinfo, MP_BUFFER_READ); // TODO: MP_BUFFER_READ?
             if (ret != 0) {
                 goto error;
             }
diff --git a/py/obj.c b/py/obj.c
index b461fe50aa25d..eeadd3eedddae 100644
--- a/py/obj.c
+++ b/py/obj.c
@@ -579,10 +579,10 @@ mp_obj_t mp_identity_getiter(mp_obj_t self, mp_obj_iter_buf_t *iter_buf) {
 
 bool mp_get_buffer(mp_obj_t obj, mp_buffer_info_t *bufinfo, mp_uint_t flags) {
     const mp_obj_type_t *type = mp_obj_get_type(obj);
-    if (type->buffer_p.get_buffer == NULL) {
+    if (type->buffer == NULL) {
         return false;
     }
-    int ret = type->buffer_p.get_buffer(obj, bufinfo, flags);
+    int ret = type->buffer(obj, bufinfo, flags);
     if (ret != 0) {
         return false;
     }
diff --git a/py/obj.h b/py/obj.h
index 8949830282256..0bf5b58f8155f 100644
--- a/py/obj.h
+++ b/py/obj.h
@@ -557,9 +557,7 @@ typedef struct _mp_buffer_info_t {
 #define MP_BUFFER_READ  (1)
 #define MP_BUFFER_WRITE (2)
 #define MP_BUFFER_RW (MP_BUFFER_READ | MP_BUFFER_WRITE)
-typedef struct _mp_buffer_p_t {
-    mp_int_t (*get_buffer)(mp_obj_t obj, mp_buffer_info_t *bufinfo, mp_uint_t flags);
-} mp_buffer_p_t;
+typedef mp_int_t (*mp_buffer_fun_t)(mp_obj_t obj, mp_buffer_info_t *bufinfo, mp_uint_t flags);
 bool mp_get_buffer(mp_obj_t obj, mp_buffer_info_t *bufinfo, mp_uint_t flags);
 void mp_get_buffer_raise(mp_obj_t obj, mp_buffer_info_t *bufinfo, mp_uint_t flags);
 
@@ -618,7 +616,7 @@ struct _mp_obj_type_t {
     mp_fun_1_t iternext;
 
     // Implements the buffer protocol if supported by this type.
-    mp_buffer_p_t buffer_p;
+    mp_buffer_fun_t buffer;
 
     // One of disjoint protocols (interfaces), like mp_stream_p_t, etc.
     const void *protocol;
diff --git a/py/objarray.c b/py/objarray.c
index ecaffeb6a22e7..dca41c2931d66 100644
--- a/py/objarray.c
+++ b/py/objarray.c
@@ -580,7 +580,7 @@ const mp_obj_type_t mp_type_array = {
     .unary_op = array_unary_op,
     .binary_op = array_binary_op,
     .subscr = array_subscr,
-    .buffer_p = { .get_buffer = array_get_buffer },
+    .buffer_p = array_get_buffer,
     .locals_dict = (mp_obj_dict_t *)&mp_obj_array_locals_dict,
 };
 #endif
@@ -596,7 +596,7 @@ const mp_obj_type_t mp_type_bytearray = {
     .unary_op = array_unary_op,
     .binary_op = array_binary_op,
     .subscr = array_subscr,
-    .buffer_p = { .get_buffer = array_get_buffer },
+    .buffer = array_get_buffer,
     .locals_dict = (mp_obj_dict_t *)&mp_obj_bytearray_locals_dict,
 };
 #endif
@@ -617,7 +617,7 @@ const mp_obj_type_t mp_type_memoryview = {
     .locals_dict = (mp_obj_dict_t *)&mp_obj_memoryview_locals_dict,
     #endif
     .subscr = array_subscr,
-    .buffer_p = { .get_buffer = array_get_buffer },
+    .buffer = array_get_buffer,
 };
 #endif
 
diff --git a/py/objstr.c b/py/objstr.c
index 683d035e44090..9dd7f65e66cae 100644
--- a/py/objstr.c
+++ b/py/objstr.c
@@ -2151,7 +2151,7 @@ const mp_obj_type_t mp_type_str = {
     .binary_op = mp_obj_str_binary_op,
     .subscr = bytes_subscr,
     .getiter = mp_obj_new_str_iterator,
-    .buffer_p = { .get_buffer = mp_obj_str_get_buffer },
+    .buffer = mp_obj_str_get_buffer,
     .locals_dict = (mp_obj_dict_t *)&mp_obj_str_locals_dict,
 };
 #endif // !MICROPY_PY_BUILTINS_STR_UNICODE
@@ -2165,7 +2165,7 @@ const mp_obj_type_t mp_type_bytes = {
     .binary_op = mp_obj_str_binary_op,
     .subscr = bytes_subscr,
     .getiter = mp_obj_new_bytes_iterator,
-    .buffer_p = { .get_buffer = mp_obj_str_get_buffer },
+    .buffer = mp_obj_str_get_buffer,
     .locals_dict = (mp_obj_dict_t *)&mp_obj_bytes_locals_dict,
 };
 
diff --git a/py/objstrunicode.c b/py/objstrunicode.c
index d36dd8b1375a2..fef0353683c19 100644
--- a/py/objstrunicode.c
+++ b/py/objstrunicode.c
@@ -238,7 +238,7 @@ const mp_obj_type_t mp_type_str = {
     .binary_op = mp_obj_str_binary_op,
     .subscr = str_subscr,
     .getiter = mp_obj_new_str_iterator,
-    .buffer_p = { .get_buffer = mp_obj_str_get_buffer },
+    .buffer = mp_obj_str_get_buffer,
     .locals_dict = (mp_obj_dict_t *)&mp_obj_str_locals_dict,
 };
 
diff --git a/py/objtype.c b/py/objtype.c
index fe1918bd3731f..c0f68578092dc 100644
--- a/py/objtype.c
+++ b/py/objtype.c
@@ -913,14 +913,14 @@ STATIC mp_int_t instance_get_buffer(mp_obj_t self_in, mp_buffer_info_t *bufinfo,
     struct class_lookup_data lookup = {
         .obj = self,
         .attr = MP_QSTR_, // don't actually look for a method
-        .meth_offset = offsetof(mp_obj_type_t, buffer_p.get_buffer),
+        .meth_offset = offsetof(mp_obj_type_t, buffer),
         .dest = member,
         .is_type = false,
     };
     mp_obj_class_lookup(&lookup, self->base.type);
     if (member[0] == MP_OBJ_SENTINEL) {
         const mp_obj_type_t *type = mp_obj_get_type(self->subobj[0]);
-        return type->buffer_p.get_buffer(self->subobj[0], bufinfo, flags);
+        return type->buffer(self->subobj[0], bufinfo, flags);
     } else {
         return 1; // object does not support buffer protocol
     }
@@ -1160,7 +1160,7 @@ mp_obj_t mp_obj_new_type(qstr name, mp_obj_t bases_tuple, mp_obj_t locals_dict)
     o->subscr = instance_subscr;
     o->getiter = mp_obj_instance_getiter;
     // o->iternext = ; not implemented
-    o->buffer_p.get_buffer = instance_get_buffer;
+    o->buffer = instance_get_buffer;
 
     if (bases_len > 0) {
         // Inherit protocol from a base class. This allows to define an

From 42587c78702e0a96ca025e66267201f27389bb17 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Wed, 14 Jul 2021 14:06:29 +1000
Subject: [PATCH 2614/3533] all: Standardise mp_obj_type_t initialisation.

Remove setting unused slots.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 extmod/vfs_fat.c                              |  1 -
 ports/nrf/boards/microbit/modules/iters.c     |  8 ----
 .../boards/microbit/modules/microbitdisplay.c |  9 ----
 .../boards/microbit/modules/microbitimage.c   | 42 -------------------
 4 files changed, 60 deletions(-)

diff --git a/extmod/vfs_fat.c b/extmod/vfs_fat.c
index 7d8b51efeb617..8d2f13be476d8 100644
--- a/extmod/vfs_fat.c
+++ b/extmod/vfs_fat.c
@@ -437,7 +437,6 @@ const mp_obj_type_t mp_fat_vfs_type = {
     .make_new = fat_vfs_make_new,
     .protocol = &fat_vfs_proto,
     .locals_dict = (mp_obj_dict_t *)&fat_vfs_locals_dict,
-
 };
 
 #endif // MICROPY_VFS_FAT
diff --git a/ports/nrf/boards/microbit/modules/iters.c b/ports/nrf/boards/microbit/modules/iters.c
index e9c4ae3c72bc8..66f9f6c7f3ea0 100644
--- a/ports/nrf/boards/microbit/modules/iters.c
+++ b/ports/nrf/boards/microbit/modules/iters.c
@@ -46,16 +46,8 @@ static mp_obj_t microbit_repeat_iter_next(mp_obj_t iter_in) {
 const mp_obj_type_t microbit_repeat_iterator_type = {
     { &mp_type_type },
     .name = MP_QSTR_iterator,
-    .print = NULL,
-    .make_new = NULL,
-    .call = NULL,
-    .unary_op = NULL,
-    .binary_op = NULL,
-    .attr = NULL,
-    .subscr = NULL,
     .getiter = mp_identity_getiter,
     .iternext = microbit_repeat_iter_next,
-    MP_OBJ_NULL
 };
 
 mp_obj_t microbit_repeat_iterator(mp_obj_t iterable) {
diff --git a/ports/nrf/boards/microbit/modules/microbitdisplay.c b/ports/nrf/boards/microbit/modules/microbitdisplay.c
index 04b8602879b8d..93ba9772fe98c 100644
--- a/ports/nrf/boards/microbit/modules/microbitdisplay.c
+++ b/ports/nrf/boards/microbit/modules/microbitdisplay.c
@@ -545,15 +545,6 @@ STATIC MP_DEFINE_CONST_DICT(microbit_display_locals_dict, microbit_display_local
 const mp_obj_type_t microbit_display_type = {
     { &mp_type_type },
     .name = MP_QSTR_MicroBitDisplay,
-    .print = NULL,
-    .make_new = NULL,
-    .call = NULL,
-    .unary_op = NULL,
-    .binary_op = NULL,
-    .attr = NULL,
-    .subscr = NULL,
-    .getiter = NULL,
-    .iternext = NULL,
     .locals_dict = (mp_obj_dict_t*)&microbit_display_locals_dict,
 };
 
diff --git a/ports/nrf/boards/microbit/modules/microbitimage.c b/ports/nrf/boards/microbit/modules/microbitimage.c
index 5d2896c38346a..eb44660b974ce 100644
--- a/ports/nrf/boards/microbit/modules/microbitimage.c
+++ b/ports/nrf/boards/microbit/modules/microbitimage.c
@@ -683,13 +683,7 @@ const mp_obj_type_t microbit_image_type = {
     .name = MP_QSTR_MicroBitImage,
     .print = microbit_image_print,
     .make_new = microbit_image_make_new,
-    .call = NULL,
-    .unary_op = NULL,
     .binary_op = image_binary_op,
-    .attr = NULL,
-    .subscr = NULL,
-    .getiter = NULL,
-    .iternext = NULL,
     .locals_dict = (mp_obj_dict_t*)&microbit_image_locals_dict,
 };
 
@@ -829,33 +823,14 @@ STATIC mp_obj_t microbit_scrolling_string_iter_next(mp_obj_t o_in) {
 const mp_obj_type_t microbit_scrolling_string_type = {
     { &mp_type_type },
     .name = MP_QSTR_ScrollingString,
-    .print = NULL,
-    .make_new = NULL,
-    .call = NULL,
-    .unary_op = NULL,
-    .binary_op = NULL,
-    .attr = NULL,
-    .subscr = NULL,
     .getiter = get_microbit_scrolling_string_iter,
-    .iternext = NULL,
-    .buffer_p = {NULL},
-    .locals_dict = NULL,
 };
 
 const mp_obj_type_t microbit_scrolling_string_iterator_type = {
     { &mp_type_type },
     .name = MP_QSTR_iterator,
-    .print = NULL,
-    .make_new = NULL,
-    .call = NULL,
-    .unary_op = NULL,
-    .binary_op = NULL,
-    .attr = NULL,
-    .subscr = NULL,
     .getiter = mp_identity_getiter,
     .iternext = microbit_scrolling_string_iter_next,
-    .buffer_p = {NULL},
-    .locals_dict = NULL,
 };
 
 /** Facade types to present a string as a sequence of images.
@@ -897,17 +872,9 @@ static mp_obj_t microbit_facade_iterator(mp_obj_t iterable_in, mp_obj_iter_buf_t
 const mp_obj_type_t string_image_facade_type = {
     { &mp_type_type },
     .name = MP_QSTR_Facade,
-    .print = NULL,
-    .make_new = NULL,
-    .call = NULL,
     .unary_op = facade_unary_op,
-    .binary_op = NULL,
-    .attr = NULL,
     .subscr = string_image_facade_subscr,
     .getiter = microbit_facade_iterator,
-    .iternext = NULL,
-    .buffer_p = {NULL},
-    NULL
 };
 
 
@@ -940,17 +907,8 @@ static mp_obj_t microbit_facade_iter_next(mp_obj_t iter_in) {
 const mp_obj_type_t microbit_facade_iterator_type = {
     { &mp_type_type },
     .name = MP_QSTR_iterator,
-    .print = NULL,
-    .make_new = NULL,
-    .call = NULL,
-    .unary_op = NULL,
-    .binary_op = NULL,
-    .attr = NULL,
-    .subscr = NULL,
     .getiter = mp_identity_getiter,
     .iternext = microbit_facade_iter_next,
-    .buffer_p = {NULL},
-    NULL
 };
 
 mp_obj_t microbit_facade_iterator(mp_obj_t iterable_in, mp_obj_iter_buf_t *iter_buf) {

From cdb880789f61ee037cc7905ad75a7a9201d12ba5 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Wed, 14 Jul 2021 13:38:27 +1000
Subject: [PATCH 2615/3533] py/obj: Add macro to declare ROM mp_obj_type_t
 instances.

This will allow the structure of mp_obj_type_t to change while keeping the
definition code the same.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 py/obj.h | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/py/obj.h b/py/obj.h
index 0bf5b58f8155f..4ab7e0dc09c13 100644
--- a/py/obj.h
+++ b/py/obj.h
@@ -513,6 +513,7 @@ typedef mp_obj_t (*mp_fun_kw_t)(size_t n, const mp_obj_t *, mp_map_t *);
 // operator and not the __ne__ operator.  If it's set then __ne__ may be implemented.
 // If MP_TYPE_FLAG_BINDS_SELF is set then the type as a method binds self as the first arg.
 // If MP_TYPE_FLAG_BUILTIN_FUN is set then the type is a built-in function type.
+#define MP_TYPE_FLAG_NONE (0x0000)
 #define MP_TYPE_FLAG_IS_SUBCLASSED (0x0001)
 #define MP_TYPE_FLAG_HAS_SPECIAL_ACCESSORS (0x0002)
 #define MP_TYPE_FLAG_EQ_NOT_REFLEXIVE (0x0004)
@@ -631,6 +632,40 @@ struct _mp_obj_type_t {
     struct _mp_obj_dict_t *locals_dict;
 };
 
+#define MP_TYPE_NULL_MAKE_NEW (NULL)
+
+// Implementation of MP_DEFINE_CONST_OBJ_TYPE for each number of arguments.
+// Do not use these directly, instead use MP_DEFINE_CONST_OBJ_TYPE.
+#define MP_DEFINE_CONST_OBJ_TYPE_NARGS_0(_struct_type, _typename, _name, _flags, _make_new) const _struct_type _typename = { .base = { &mp_type_type }, .name = _name, .flags = _flags, .make_new = _make_new }
+#define MP_DEFINE_CONST_OBJ_TYPE_NARGS_1(_struct_type, _typename, _name, _flags, _make_new, f1, v1) const _struct_type _typename = { .base = { &mp_type_type }, .name = _name, .flags = _flags, .make_new = _make_new, .f1 = v1 }
+#define MP_DEFINE_CONST_OBJ_TYPE_NARGS_2(_struct_type, _typename, _name, _flags, _make_new, f1, v1, f2, v2) const _struct_type _typename = { .base = { &mp_type_type }, .name = _name, .flags = _flags, .make_new = _make_new, .f1 = v1, .f2 = v2 }
+#define MP_DEFINE_CONST_OBJ_TYPE_NARGS_3(_struct_type, _typename, _name, _flags, _make_new, f1, v1, f2, v2, f3, v3) const _struct_type _typename = { .base = { &mp_type_type }, .name = _name, .flags = _flags, .make_new = _make_new, .f1 = v1, .f2 = v2, .f3 = v3 }
+#define MP_DEFINE_CONST_OBJ_TYPE_NARGS_4(_struct_type, _typename, _name, _flags, _make_new, f1, v1, f2, v2, f3, v3, f4, v4) const _struct_type _typename = { .base = { &mp_type_type }, .name = _name, .flags = _flags, .make_new = _make_new, .f1 = v1, .f2 = v2, .f3 = v3, .f4 = v4 }
+#define MP_DEFINE_CONST_OBJ_TYPE_NARGS_5(_struct_type, _typename, _name, _flags, _make_new, f1, v1, f2, v2, f3, v3, f4, v4, f5, v5) const _struct_type _typename = { .base = { &mp_type_type }, .name = _name, .flags = _flags, .make_new = _make_new, .f1 = v1, .f2 = v2, .f3 = v3, .f4 = v4, .f5 = v5 }
+#define MP_DEFINE_CONST_OBJ_TYPE_NARGS_6(_struct_type, _typename, _name, _flags, _make_new, f1, v1, f2, v2, f3, v3, f4, v4, f5, v5, f6, v6) const _struct_type _typename = { .base = { &mp_type_type }, .name = _name, .flags = _flags, .make_new = _make_new, .f1 = v1, .f2 = v2, .f3 = v3, .f4 = v4, .f5 = v5, .f6 = v6 }
+#define MP_DEFINE_CONST_OBJ_TYPE_NARGS_7(_struct_type, _typename, _name, _flags, _make_new, f1, v1, f2, v2, f3, v3, f4, v4, f5, v5, f6, v6, f7, v7) const _struct_type _typename = { .base = { &mp_type_type }, .name = _name, .flags = _flags, .make_new = _make_new, .f1 = v1, .f2 = v2, .f3 = v3, .f4 = v4, .f5 = v5, .f6 = v6, .f7 = v7 }
+#define MP_DEFINE_CONST_OBJ_TYPE_NARGS_8(_struct_type, _typename, _name, _flags, _make_new, f1, v1, f2, v2, f3, v3, f4, v4, f5, v5, f6, v6, f7, v7, f8, v8) const _struct_type _typename = { .base = { &mp_type_type }, .name = _name, .flags = _flags, .make_new = _make_new, .f1 = v1, .f2 = v2, .f3 = v3, .f4 = v4, .f5 = v5, .f6 = v6, .f7 = v7, .f8 = v8 }
+#define MP_DEFINE_CONST_OBJ_TYPE_NARGS_9(_struct_type, _typename, _name, _flags, _make_new, f1, v1, f2, v2, f3, v3, f4, v4, f5, v5, f6, v6, f7, v7, f8, v8, f9, v9) const _struct_type _typename = { .base = { &mp_type_type }, .name = _name, .flags = _flags, .make_new = _make_new, .f1 = v1, .f2 = v2, .f3 = v3, .f4 = v4, .f5 = v5, .f6 = v6, .f7 = v7, .f8 = v8, .f9 = v9 }
+#define MP_DEFINE_CONST_OBJ_TYPE_NARGS_10(_struct_type, _typename, _name, _flags, _make_new, f1, v1, f2, v2, f3, v3, f4, v4, f5, v5, f6, v6, f7, v7, f8, v8, f9, v9, f10, v10) const _struct_type _typename = { .base = { &mp_type_type }, .name = _name, .flags = _flags, .make_new = _make_new, .f1 = v1, .f2 = v2, .f3 = v3, .f4 = v4, .f5 = v5, .f6 = v6, .f7 = v7, .f8 = v8, .f9 = v9, .f10 = v10 }
+#define MP_DEFINE_CONST_OBJ_TYPE_NARGS_11(_struct_type, _typename, _name, _flags, _make_new, f1, v1, f2, v2, f3, v3, f4, v4, f5, v5, f6, v6, f7, v7, f8, v8, f9, v9, f10, v10, f11, v11) const _struct_type _typename = { .base = { &mp_type_type }, .name = _name, .flags = _flags, .make_new = _make_new, .f1 = v1, .f2 = v2, .f3 = v3, .f4 = v4, .f5 = v5, .f6 = v6, .f7 = v7, .f8 = v8, .f9 = v9, .f10 = v10, .f11 = v11 }
+#define MP_DEFINE_CONST_OBJ_TYPE_NARGS_12(_struct_type, _typename, _name, _flags, _make_new, f1, v1, f2, v2, f3, v3, f4, v4, f5, v5, f6, v6, f7, v7, f8, v8, f9, v9, f10, v10, f11, v11, f12, v12) const _struct_type _typename = { .base = { &mp_type_type }, .name = _name, .flags = _flags, .make_new = _make_new, .f1 = v1, .f2 = v2, .f3 = v3, .f4 = v4, .f5 = v5, .f6 = v6, .f7 = v7, .f8 = v8, .f9 = v9, .f10 = v10, .f11 = v11, .f12 = v12 }
+
+// Workaround for https://docs.microsoft.com/en-us/cpp/preprocessor/preprocessor-experimental-overview?view=msvc-160#macro-arguments-are-unpacked
+#define MP_DEFINE_CONST_OBJ_TYPE_EXPAND(x) x
+
+// This macro evaluates to MP_DEFINE_CONST_OBJ_TYPE_NARGS_##N, where N is the value
+// of the 30th argument (30 is 13*2 + 4).
+#define MP_DEFINE_CONST_OBJ_TYPE_NARGS(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, N, ...) MP_DEFINE_CONST_OBJ_TYPE_NARGS_##N
+
+// This macro is used to define a object type in ROM.
+// Invoke as MP_DEFINE_CONST_OBJ_TYPE(_typename, _name, _flags, _make_new [, slot, func]*)
+// It uses the number of arguments to select which MP_DEFINE_CONST_OBJ_TYPE_*
+// macro to use based on the number of arguments. It works by shifting the
+// numeric values 12, 11, ... 0 by the number of arguments, such that the
+// 30th argument ends up being the number to use. The _INV values are
+// placeholders because the slot arguments come in pairs.
+#define MP_DEFINE_CONST_OBJ_TYPE(...) MP_DEFINE_CONST_OBJ_TYPE_EXPAND(MP_DEFINE_CONST_OBJ_TYPE_NARGS(__VA_ARGS__, _INV, 12, _INV, 11, _INV, 10, _INV, 9, _INV, 8, _INV, 7, _INV, 6, _INV, 5, _INV, 4, _INV, 3, _INV, 2, _INV, 1, _INV, 0)(mp_obj_type_t, __VA_ARGS__))
+
 // Constant types, globally accessible
 extern const mp_obj_type_t mp_type_type;
 extern const mp_obj_type_t mp_type_object;

From 662b9761b37b054f08fe2f7c00d0fce3a418d0b0 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Wed, 14 Jul 2021 14:38:38 +1000
Subject: [PATCH 2616/3533] all: Make all mp_obj_type_t defs use
 MP_DEFINE_CONST_OBJ_TYPE.

In preparation for upcoming rework of mp_obj_type_t layout.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 extmod/machine_i2c.c                          |  17 +--
 extmod/machine_mem.c                          |  14 ++-
 extmod/machine_pinbase.c                      |  13 +-
 extmod/machine_pwm.c                          |  15 +--
 extmod/machine_signal.c                       |  17 +--
 extmod/machine_spi.c                          |  17 +--
 extmod/modbluetooth.c                         |  33 ++---
 extmod/modbtree.c                             |  22 ++--
 extmod/modframebuf.c                          |  15 +--
 extmod/modlwip.c                              |  30 ++---
 extmod/moduasyncio.c                          |  30 ++---
 extmod/moducryptolib.c                        |  13 +-
 extmod/moductypes.c                           |  21 ++--
 extmod/moduhashlib.c                          |  39 +++---
 extmod/modure.c                               |  28 +++--
 extmod/moduselect.c                           |  16 +--
 extmod/modusocket.c                           |  17 +--
 extmod/modussl_axtls.c                        |  20 ++--
 extmod/modussl_mbedtls.c                      |  20 ++--
 extmod/modutimeq.c                            |  15 +--
 extmod/moduwebsocket.c                        |  15 +--
 extmod/moduzlib.c                             |  15 +--
 extmod/modwebrepl.c                           |  15 +--
 extmod/network_cyw43.c                        |  15 +--
 extmod/network_ninaw10.c                      |  15 ++-
 extmod/network_wiznet5k.c                     |  28 +++--
 extmod/vfs_fat.c                              |  15 +--
 extmod/vfs_fat_file.c                         |  40 ++++---
 extmod/vfs_lfsx.c                             |  17 +--
 extmod/vfs_lfsx_file.c                        |  40 ++++---
 extmod/vfs_posix.c                            |  15 +--
 extmod/vfs_posix_file.c                       |  40 ++++---
 ports/cc3200/misc/mpirq.c                     |  14 ++-
 ports/cc3200/mods/modnetwork.c                |  13 +-
 ports/cc3200/mods/moduhashlib.c               |  28 +++--
 ports/cc3200/mods/modusocket.c                |  15 +--
 ports/cc3200/mods/modussl.c                   |  18 +--
 ports/cc3200/mods/modwlan.c                   |  15 ++-
 ports/cc3200/mods/pybadc.c                    |  31 ++---
 ports/cc3200/mods/pybflash.c                  |  13 +-
 ports/cc3200/mods/pybi2c.c                    |  15 +--
 ports/cc3200/mods/pybpin.c                    |  31 ++---
 ports/cc3200/mods/pybrtc.c                    |  13 +-
 ports/cc3200/mods/pybsd.c                     |  13 +-
 ports/cc3200/mods/pybsleep.c                  |  10 +-
 ports/cc3200/mods/pybspi.c                    |  15 +--
 ports/cc3200/mods/pybtimer.c                  |  29 +++--
 ports/cc3200/mods/pybuart.c                   |  21 ++--
 ports/cc3200/mods/pybwdt.c                    |  13 +-
 ports/esp32/esp32_nvs.c                       |  15 +--
 ports/esp32/esp32_partition.c                 |  15 +--
 ports/esp32/esp32_rmt.c                       |  15 +--
 ports/esp32/esp32_ulp.c                       |  13 +-
 ports/esp32/machine_adc.c                     |  15 +--
 ports/esp32/machine_adcblock.c                |  15 +--
 ports/esp32/machine_dac.c                     |  15 +--
 ports/esp32/machine_hw_spi.c                  |  17 +--
 ports/esp32/machine_i2c.c                     |  17 +--
 ports/esp32/machine_i2s.c                     |  21 ++--
 ports/esp32/machine_pin.c                     |  33 ++---
 ports/esp32/machine_rtc.c                     |  13 +-
 ports/esp32/machine_sdcard.c                  |  13 +-
 ports/esp32/machine_timer.c                   |  15 +--
 ports/esp32/machine_touchpad.c                |  13 +-
 ports/esp32/machine_uart.c                    |  21 ++--
 ports/esp32/machine_wdt.c                     |  13 +-
 ports/esp32/modsocket.c                       |  15 +--
 ports/esp32/network_lan.c                     |  12 +-
 ports/esp32/network_ppp.c                     |  12 +-
 ports/esp32/network_wlan.c                    |  20 ++--
 ports/esp8266/machine_adc.c                   |  15 +--
 ports/esp8266/machine_hspi.c                  |  17 +--
 ports/esp8266/machine_pin.c                   |  33 ++---
 ports/esp8266/machine_rtc.c                   |  13 +-
 ports/esp8266/machine_uart.c                  |  21 ++--
 ports/esp8266/machine_wdt.c                   |  13 +-
 ports/esp8266/modmachine.c                    |  15 +--
 ports/esp8266/modnetwork.c                    |  12 +-
 ports/mimxrt/machine_adc.c                    |  15 +--
 ports/mimxrt/machine_i2c.c                    |  17 +--
 ports/mimxrt/machine_i2s.c                    |  21 ++--
 ports/mimxrt/machine_led.c                    |  15 +--
 ports/mimxrt/machine_pin.c                    |  61 +++++-----
 ports/mimxrt/machine_rtc.c                    |  13 +-
 ports/mimxrt/machine_sdcard.c                 |  13 +-
 ports/mimxrt/machine_spi.c                    |  17 +--
 ports/mimxrt/machine_timer.c                  |  15 +--
 ports/mimxrt/machine_uart.c                   |  21 ++--
 ports/mimxrt/machine_wdt.c                    |  13 +-
 ports/mimxrt/mimxrt_flash.c                   |  13 +-
 ports/mimxrt/network_lan.c                    |  16 +--
 ports/nrf/boards/microbit/modules/iters.c     |  14 ++-
 .../boards/microbit/modules/microbitdisplay.c |  12 +-
 .../boards/microbit/modules/microbitimage.c   |  73 ++++++-----
 ports/nrf/modules/board/led.c                 |  15 +--
 ports/nrf/modules/machine/adc.c               |  15 +--
 ports/nrf/modules/machine/i2c.c               |  17 +--
 ports/nrf/modules/machine/pin.c               |  31 ++---
 ports/nrf/modules/machine/pwm.c               |  15 +--
 ports/nrf/modules/machine/rtcounter.c         |  15 +--
 ports/nrf/modules/machine/spi.c               |  17 +--
 ports/nrf/modules/machine/temp.c              |  15 +--
 ports/nrf/modules/machine/timer.c             |  15 +--
 ports/nrf/modules/machine/uart.c              |  21 ++--
 ports/nrf/modules/nrf/flashbdev.c             |  15 +--
 .../modules/ubluepy/ubluepy_characteristic.c  |  15 +--
 ports/nrf/modules/ubluepy/ubluepy_constants.c |  24 ++--
 ports/nrf/modules/ubluepy/ubluepy_delegate.c  |  15 +--
 .../nrf/modules/ubluepy/ubluepy_descriptor.c  |  15 +--
 .../nrf/modules/ubluepy/ubluepy_peripheral.c  |  15 +--
 .../nrf/modules/ubluepy/ubluepy_scan_entry.c  |  14 ++-
 ports/nrf/modules/ubluepy/ubluepy_scanner.c   |  15 +--
 ports/nrf/modules/ubluepy/ubluepy_service.c   |  15 +--
 ports/nrf/modules/ubluepy/ubluepy_uuid.c      |  15 +--
 ports/nrf/modules/uos/microbitfs.c            |  28 +++--
 ports/nrf/pin_named_pins.c                    |  28 +++--
 ports/pic16bit/modpybled.c                    |  15 +--
 ports/pic16bit/modpybswitch.c                 |  17 +--
 ports/renesas-ra/extint.c                     |  15 +--
 ports/renesas-ra/led.c                        |  15 +--
 ports/renesas-ra/machine_adc.c                |  15 +--
 ports/renesas-ra/machine_i2c.c                |  17 +--
 ports/renesas-ra/machine_pin.c                |  45 +++----
 ports/renesas-ra/machine_rtc.c                |  13 +-
 ports/renesas-ra/machine_spi.c                |  17 +--
 ports/renesas-ra/machine_timer.c              |  15 +--
 ports/renesas-ra/machine_uart.c               |  21 ++--
 ports/renesas-ra/storage.c                    |  15 +--
 ports/renesas-ra/timer.c                      |  29 +++--
 ports/renesas-ra/usrsw.c                      |  17 +--
 ports/rp2/machine_adc.c                       |  15 +--
 ports/rp2/machine_i2c.c                       |  17 +--
 ports/rp2/machine_i2s.c                       |  21 ++--
 ports/rp2/machine_pin.c                       |  19 +--
 ports/rp2/machine_rtc.c                       |  13 +-
 ports/rp2/machine_spi.c                       |  17 +--
 ports/rp2/machine_timer.c                     |  15 +--
 ports/rp2/machine_uart.c                      |  21 ++--
 ports/rp2/machine_wdt.c                       |  13 +-
 ports/rp2/rp2_flash.c                         |  13 +-
 ports/rp2/rp2_pio.c                           |  30 ++---
 ports/samd/machine_led.c                      |  17 +--
 ports/samd/machine_pin.c                      |  19 +--
 ports/samd/samd_flash.c                       |  13 +-
 ports/stm32/accel.c                           |  13 +-
 ports/stm32/adc.c                             |  28 +++--
 ports/stm32/dac.c                             |  15 +--
 ports/stm32/extint.c                          |  15 +--
 ports/stm32/lcd.c                             |  13 +-
 ports/stm32/led.c                             |  15 +--
 ports/stm32/machine_adc.c                     |  15 +--
 ports/stm32/machine_i2c.c                     |  17 +--
 ports/stm32/machine_i2s.c                     |  21 ++--
 ports/stm32/machine_spi.c                     |  17 +--
 ports/stm32/machine_timer.c                   |  15 +--
 ports/stm32/machine_uart.c                    |  21 ++--
 ports/stm32/network_lan.c                     |  15 +--
 ports/stm32/pin.c                             |  33 ++---
 ports/stm32/pin_named_pins.c                  |  24 ++--
 ports/stm32/pyb_can.c                         |  17 +--
 ports/stm32/pyb_i2c.c                         |  15 +--
 ports/stm32/pyb_spi.c                         |  17 +--
 ports/stm32/rtc.c                             |  13 +-
 ports/stm32/sdcard.c                          |  26 ++--
 ports/stm32/servo.c                           |  15 +--
 ports/stm32/storage.c                         |  15 +--
 ports/stm32/timer.c                           |  29 +++--
 ports/stm32/usb.c                             |  36 +++---
 ports/stm32/usrsw.c                           |  17 +--
 ports/stm32/wdt.c                             |  13 +-
 ports/teensy/led.c                            |  15 +--
 ports/teensy/timer.c                          |  29 +++--
 ports/teensy/uart.c                           |  15 +--
 ports/unix/coverage.c                         |  26 ++--
 ports/unix/modffi.c                           |  69 ++++++-----
 ports/unix/modjni.c                           |  58 +++++----
 ports/unix/moduselect.c                       |  16 +--
 ports/unix/modusocket.c                       |  21 ++--
 ports/zephyr/machine_i2c.c                    |  17 +--
 ports/zephyr/machine_pin.c                    |  19 +--
 ports/zephyr/machine_spi.c                    |  17 +--
 ports/zephyr/machine_uart.c                   |  21 ++--
 ports/zephyr/modusocket.c                     |  17 +--
 ports/zephyr/modzsensor.c                     |  13 +-
 ports/zephyr/zephyr_storage.c                 |  30 ++---
 py/builtinevex.c                              |  10 +-
 py/modio.c                                    |  28 +++--
 py/modthread.c                                |  12 +-
 py/objarray.c                                 |  87 +++++++-------
 py/objattrtuple.c                             |  23 ++--
 py/objbool.c                                  |  19 +--
 py/objboundmeth.c                             |  16 +--
 py/objcell.c                                  |  10 +-
 py/objclosure.c                               |  17 +--
 py/objcomplex.c                               |  17 ++-
 py/objdeque.c                                 |  15 +--
 py/objdict.c                                  |  78 ++++++------
 py/objenumerate.c                             |  15 +--
 py/objexcept.c                                |  15 +--
 py/objfilter.c                                |  15 +--
 py/objfloat.c                                 |  15 +--
 py/objfun.c                                   | 113 ++++++++----------
 py/objgenerator.c                             |  54 +++++----
 py/objgetitemiter.c                           |  14 ++-
 py/objint.c                                   |  19 +--
 py/objlist.c                                  |  24 ++--
 py/objmap.c                                   |  15 +--
 py/objmodule.c                                |  14 ++-
 py/objnone.c                                  |  14 ++-
 py/objobject.c                                |  13 +-
 py/objpolyiter.c                              |  31 ++---
 py/objproperty.c                              |  13 +-
 py/objrange.c                                 |  37 +++---
 py/objreversed.c                              |  15 +--
 py/objset.c                                   |  43 +++----
 py/objsingleton.c                             |  11 +-
 py/objslice.c                                 |  16 +--
 py/objstr.c                                   |  48 ++++----
 py/objstringio.c                              |  42 +++----
 py/objstrunicode.c                            |  25 ++--
 py/objtuple.c                                 |  23 ++--
 py/objtype.c                                  |  58 ++++-----
 py/objzip.c                                   |  15 +--
 py/profile.c                                  |  32 ++---
 py/runtime.c                                  |  13 +-
 shared/runtime/mpirq.c                        |  14 ++-
 shared/runtime/sys_stdio_mphal.c              |  40 ++++---
 227 files changed, 2547 insertions(+), 2188 deletions(-)

diff --git a/extmod/machine_i2c.c b/extmod/machine_i2c.c
index ff597b58c5e5c..7e597b791029b 100644
--- a/extmod/machine_i2c.c
+++ b/extmod/machine_i2c.c
@@ -730,13 +730,14 @@ STATIC const mp_machine_i2c_p_t mp_machine_soft_i2c_p = {
     .transfer = mp_machine_soft_i2c_transfer,
 };
 
-const mp_obj_type_t mp_machine_soft_i2c_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_SoftI2C,
-    .print = mp_machine_soft_i2c_print,
-    .make_new = mp_machine_soft_i2c_make_new,
-    .protocol = &mp_machine_soft_i2c_p,
-    .locals_dict = (mp_obj_dict_t *)&mp_machine_i2c_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    mp_machine_soft_i2c_type,
+    MP_QSTR_SoftI2C,
+    MP_TYPE_FLAG_NONE,
+    mp_machine_soft_i2c_make_new,
+    print, mp_machine_soft_i2c_print,
+    protocol, &mp_machine_soft_i2c_p,
+    locals_dict, (mp_obj_dict_t *)&mp_machine_i2c_locals_dict
+    );
 
 #endif // MICROPY_PY_MACHINE_SOFTI2C
diff --git a/extmod/machine_mem.c b/extmod/machine_mem.c
index 73e2f7fd1fcb0..422e99d3ce42a 100644
--- a/extmod/machine_mem.c
+++ b/extmod/machine_mem.c
@@ -101,12 +101,14 @@ STATIC mp_obj_t machine_mem_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t va
     }
 }
 
-const mp_obj_type_t machine_mem_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_mem,
-    .print = machine_mem_print,
-    .subscr = machine_mem_subscr,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    machine_mem_type,
+    MP_QSTR_mem,
+    MP_TYPE_FLAG_NONE,
+    MP_TYPE_NULL_MAKE_NEW,
+    print, machine_mem_print,
+    subscr, machine_mem_subscr
+    );
 
 const machine_mem_obj_t machine_mem8_obj = {{&machine_mem_type}, 1};
 const machine_mem_obj_t machine_mem16_obj = {{&machine_mem_type}, 2};
diff --git a/extmod/machine_pinbase.c b/extmod/machine_pinbase.c
index 070c5cde9d3ac..617dd1280c784 100644
--- a/extmod/machine_pinbase.c
+++ b/extmod/machine_pinbase.c
@@ -77,11 +77,12 @@ STATIC const mp_pin_p_t pinbase_pin_p = {
     .ioctl = pinbase_ioctl,
 };
 
-const mp_obj_type_t machine_pinbase_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_PinBase,
-    .make_new = pinbase_make_new,
-    .protocol = &pinbase_pin_p,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    machine_pinbase_type,
+    MP_QSTR_PinBase,
+    MP_TYPE_FLAG_NONE,
+    pinbase_make_new,
+    protocol, &pinbase_pin_p
+    );
 
 #endif // MICROPY_PY_MACHINE
diff --git a/extmod/machine_pwm.c b/extmod/machine_pwm.c
index ddf49c1358a5d..f12f70a2d14d4 100644
--- a/extmod/machine_pwm.c
+++ b/extmod/machine_pwm.c
@@ -132,12 +132,13 @@ STATIC const mp_rom_map_elem_t machine_pwm_locals_dict_table[] = {
 };
 STATIC MP_DEFINE_CONST_DICT(machine_pwm_locals_dict, machine_pwm_locals_dict_table);
 
-const mp_obj_type_t machine_pwm_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_PWM,
-    .print = mp_machine_pwm_print,
-    .make_new = mp_machine_pwm_make_new,
-    .locals_dict = (mp_obj_dict_t *)&machine_pwm_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    machine_pwm_type,
+    MP_QSTR_PWM,
+    MP_TYPE_FLAG_NONE,
+    mp_machine_pwm_make_new,
+    print, mp_machine_pwm_print,
+    locals_dict, &machine_pwm_locals_dict
+    );
 
 #endif // MICROPY_PY_MACHINE_PWM
diff --git a/extmod/machine_signal.c b/extmod/machine_signal.c
index cf7550a2e084a..818bc01c27112 100644
--- a/extmod/machine_signal.c
+++ b/extmod/machine_signal.c
@@ -172,13 +172,14 @@ STATIC const mp_pin_p_t signal_pin_p = {
     .ioctl = signal_ioctl,
 };
 
-const mp_obj_type_t machine_signal_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_Signal,
-    .make_new = signal_make_new,
-    .call = signal_call,
-    .protocol = &signal_pin_p,
-    .locals_dict = (void *)&signal_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    machine_signal_type,
+    MP_QSTR_Signal,
+    MP_TYPE_FLAG_NONE,
+    signal_make_new,
+    call, signal_call,
+    protocol, &signal_pin_p,
+    locals_dict, (void *)&signal_locals_dict
+    );
 
 #endif // MICROPY_PY_MACHINE
diff --git a/extmod/machine_spi.c b/extmod/machine_spi.c
index ba533b2a651a0..43148c9c8d46d 100644
--- a/extmod/machine_spi.c
+++ b/extmod/machine_spi.c
@@ -251,13 +251,14 @@ const mp_machine_spi_p_t mp_machine_soft_spi_p = {
     .transfer = mp_machine_soft_spi_transfer,
 };
 
-const mp_obj_type_t mp_machine_soft_spi_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_SoftSPI,
-    .print = mp_machine_soft_spi_print,
-    .make_new = mp_machine_soft_spi_make_new,
-    .protocol = &mp_machine_soft_spi_p,
-    .locals_dict = (mp_obj_dict_t *)&mp_machine_spi_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    mp_machine_soft_spi_type,
+    MP_QSTR_SoftSPI,
+    MP_TYPE_FLAG_NONE,
+    mp_machine_soft_spi_make_new,
+    print, mp_machine_soft_spi_print,
+    protocol, &mp_machine_soft_spi_p,
+    locals_dict, (mp_obj_dict_t *)&mp_machine_spi_locals_dict
+    );
 
 #endif // MICROPY_PY_MACHINE_SOFTSPI
diff --git a/extmod/modbluetooth.c b/extmod/modbluetooth.c
index 4cc57b3d55ab8..2b7497e1b6551 100644
--- a/extmod/modbluetooth.c
+++ b/extmod/modbluetooth.c
@@ -240,16 +240,16 @@ STATIC void ringbuf_get_uuid(ringbuf_t *ringbuf, mp_obj_bluetooth_uuid_t *uuid)
 
 #endif // !MICROPY_PY_BLUETOOTH_USE_SYNC_EVENTS
 
-const mp_obj_type_t mp_type_bluetooth_uuid = {
-    { &mp_type_type },
-    .name = MP_QSTR_UUID,
-    .make_new = bluetooth_uuid_make_new,
-    .unary_op = bluetooth_uuid_unary_op,
-    .binary_op = bluetooth_uuid_binary_op,
-    .locals_dict = NULL,
-    .print = bluetooth_uuid_print,
-    .buffer = bluetooth_uuid_get_buffer,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    mp_type_bluetooth_uuid,
+    MP_QSTR_UUID,
+    MP_TYPE_FLAG_NONE,
+    bluetooth_uuid_make_new,
+    unary_op, bluetooth_uuid_unary_op,
+    binary_op, bluetooth_uuid_binary_op,
+    print, bluetooth_uuid_print,
+    buffer, bluetooth_uuid_get_buffer
+    );
 
 // ----------------------------------------------------------------------------
 // Bluetooth object: General
@@ -976,12 +976,13 @@ STATIC const mp_rom_map_elem_t bluetooth_ble_locals_dict_table[] = {
 };
 STATIC MP_DEFINE_CONST_DICT(bluetooth_ble_locals_dict, bluetooth_ble_locals_dict_table);
 
-STATIC const mp_obj_type_t mp_type_bluetooth_ble = {
-    { &mp_type_type },
-    .name = MP_QSTR_BLE,
-    .make_new = bluetooth_ble_make_new,
-    .locals_dict = (void *)&bluetooth_ble_locals_dict,
-};
+STATIC MP_DEFINE_CONST_OBJ_TYPE(
+    mp_type_bluetooth_ble,
+    MP_QSTR_BLE,
+    MP_TYPE_FLAG_NONE,
+    bluetooth_ble_make_new,
+    locals_dict, (void *)&bluetooth_ble_locals_dict
+    );
 
 STATIC const mp_rom_map_elem_t mp_module_bluetooth_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_ubluetooth) },
diff --git a/extmod/modbtree.c b/extmod/modbtree.c
index 7a1daacb41669..f115be44fec15 100644
--- a/extmod/modbtree.c
+++ b/extmod/modbtree.c
@@ -319,17 +319,19 @@ STATIC const mp_rom_map_elem_t btree_locals_dict_table[] = {
 
 STATIC MP_DEFINE_CONST_DICT(btree_locals_dict, btree_locals_dict_table);
 
-STATIC const mp_obj_type_t btree_type = {
-    { &mp_type_type },
+STATIC MP_DEFINE_CONST_OBJ_TYPE(
+    btree_type,
+    MP_QSTR_btree,
+    MP_TYPE_FLAG_NONE,
+    MP_TYPE_NULL_MAKE_NEW,
     // Save on qstr's, reuse same as for module
-    .name = MP_QSTR_btree,
-    .print = btree_print,
-    .getiter = btree_getiter,
-    .iternext = btree_iternext,
-    .binary_op = btree_binary_op,
-    .subscr = btree_subscr,
-    .locals_dict = (void *)&btree_locals_dict,
-};
+    print, btree_print,
+    getiter, btree_getiter,
+    iternext, btree_iternext,
+    binary_op, btree_binary_op,
+    subscr, btree_subscr,
+    locals_dict, (void *)&btree_locals_dict
+    );
 #endif
 
 STATIC const FILEVTABLE btree_stream_fvtable = {
diff --git a/extmod/modframebuf.c b/extmod/modframebuf.c
index 9542d4303e09d..1d44312cf3040 100644
--- a/extmod/modframebuf.c
+++ b/extmod/modframebuf.c
@@ -829,13 +829,14 @@ STATIC const mp_rom_map_elem_t framebuf_locals_dict_table[] = {
 };
 STATIC MP_DEFINE_CONST_DICT(framebuf_locals_dict, framebuf_locals_dict_table);
 
-STATIC const mp_obj_type_t mp_type_framebuf = {
-    { &mp_type_type },
-    .name = MP_QSTR_FrameBuffer,
-    .make_new = framebuf_make_new,
-    .buffer = framebuf_get_buffer,
-    .locals_dict = (mp_obj_dict_t *)&framebuf_locals_dict,
-};
+STATIC MP_DEFINE_CONST_OBJ_TYPE(
+    mp_type_framebuf,
+    MP_QSTR_FrameBuffer,
+    MP_TYPE_FLAG_NONE,
+    framebuf_make_new,
+    buffer, framebuf_get_buffer,
+    locals_dict, (mp_obj_dict_t *)&framebuf_locals_dict
+    );
 #endif
 
 // this factory function is provided for backwards compatibility with old FrameBuffer1 class
diff --git a/extmod/modlwip.c b/extmod/modlwip.c
index f9451a0ce4399..f9d5b76b2c8bb 100644
--- a/extmod/modlwip.c
+++ b/extmod/modlwip.c
@@ -177,12 +177,13 @@ STATIC const mp_rom_map_elem_t lwip_slip_locals_dict_table[] = {
 
 STATIC MP_DEFINE_CONST_DICT(lwip_slip_locals_dict, lwip_slip_locals_dict_table);
 
-STATIC const mp_obj_type_t lwip_slip_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_slip,
-    .make_new = lwip_slip_make_new,
-    .locals_dict = (mp_obj_dict_t *)&lwip_slip_locals_dict,
-};
+STATIC MP_DEFINE_CONST_OBJ_TYPE(
+    lwip_slip_type,
+    MP_QSTR_slip,
+    MP_TYPE_FLAG_NONE,
+    lwip_slip_make_new,
+    locals_dict, (mp_obj_dict_t *)&lwip_slip_locals_dict
+    );
 
 #endif // MICROPY_PY_LWIP_SLIP
 
@@ -1594,14 +1595,15 @@ STATIC const mp_stream_p_t lwip_socket_stream_p = {
     .ioctl = lwip_socket_ioctl,
 };
 
-STATIC const mp_obj_type_t lwip_socket_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_socket,
-    .print = lwip_socket_print,
-    .make_new = lwip_socket_make_new,
-    .protocol = &lwip_socket_stream_p,
-    .locals_dict = (mp_obj_dict_t *)&lwip_socket_locals_dict,
-};
+STATIC MP_DEFINE_CONST_OBJ_TYPE(
+    lwip_socket_type,
+    MP_QSTR_socket,
+    MP_TYPE_FLAG_NONE,
+    lwip_socket_make_new,
+    print, lwip_socket_print,
+    protocol, &lwip_socket_stream_p,
+    locals_dict, (mp_obj_dict_t *)&lwip_socket_locals_dict
+    );
 
 /******************************************************************************/
 // Support functions for memory protection. lwIP has its own memory management
diff --git a/extmod/moduasyncio.c b/extmod/moduasyncio.c
index 6e3603fa18a47..500d13c5b8595 100644
--- a/extmod/moduasyncio.c
+++ b/extmod/moduasyncio.c
@@ -144,12 +144,13 @@ STATIC const mp_rom_map_elem_t task_queue_locals_dict_table[] = {
 };
 STATIC MP_DEFINE_CONST_DICT(task_queue_locals_dict, task_queue_locals_dict_table);
 
-STATIC const mp_obj_type_t task_queue_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_TaskQueue,
-    .make_new = task_queue_make_new,
-    .locals_dict = (mp_obj_dict_t *)&task_queue_locals_dict,
-};
+STATIC MP_DEFINE_CONST_OBJ_TYPE(
+    task_queue_type,
+    MP_QSTR_TaskQueue,
+    MP_TYPE_FLAG_NONE,
+    task_queue_make_new,
+    locals_dict, (mp_obj_dict_t *)&task_queue_locals_dict
+    );
 
 /******************************************************************************/
 // Task class
@@ -286,14 +287,15 @@ STATIC mp_obj_t task_iternext(mp_obj_t self_in) {
     return mp_const_none;
 }
 
-STATIC const mp_obj_type_t task_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_Task,
-    .make_new = task_make_new,
-    .attr = task_attr,
-    .getiter = task_getiter,
-    .iternext = task_iternext,
-};
+STATIC MP_DEFINE_CONST_OBJ_TYPE(
+    task_type,
+    MP_QSTR_Task,
+    MP_TYPE_FLAG_NONE,
+    task_make_new,
+    attr, task_attr,
+    getiter, task_getiter,
+    iternext, task_iternext
+    );
 
 /******************************************************************************/
 // C-level uasyncio module
diff --git a/extmod/moducryptolib.c b/extmod/moducryptolib.c
index dc0ecb9b20f1d..236b7edfd7aa4 100644
--- a/extmod/moducryptolib.c
+++ b/extmod/moducryptolib.c
@@ -348,12 +348,13 @@ STATIC const mp_rom_map_elem_t ucryptolib_aes_locals_dict_table[] = {
 };
 STATIC MP_DEFINE_CONST_DICT(ucryptolib_aes_locals_dict, ucryptolib_aes_locals_dict_table);
 
-STATIC const mp_obj_type_t ucryptolib_aes_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_aes,
-    .make_new = ucryptolib_aes_make_new,
-    .locals_dict = (void *)&ucryptolib_aes_locals_dict,
-};
+STATIC MP_DEFINE_CONST_OBJ_TYPE(
+    ucryptolib_aes_type,
+    MP_QSTR_aes,
+    MP_TYPE_FLAG_NONE,
+    ucryptolib_aes_make_new,
+    locals_dict, (void *)&ucryptolib_aes_locals_dict
+    );
 
 STATIC const mp_rom_map_elem_t mp_module_ucryptolib_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_ucryptolib) },
diff --git a/extmod/moductypes.c b/extmod/moductypes.c
index 25578dd6b0710..a9ad500c2d1a0 100644
--- a/extmod/moductypes.c
+++ b/extmod/moductypes.c
@@ -634,16 +634,17 @@ STATIC mp_obj_t uctypes_struct_bytes_at(mp_obj_t ptr, mp_obj_t size) {
 }
 MP_DEFINE_CONST_FUN_OBJ_2(uctypes_struct_bytes_at_obj, uctypes_struct_bytes_at);
 
-STATIC const mp_obj_type_t uctypes_struct_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_struct,
-    .print = uctypes_struct_print,
-    .make_new = uctypes_struct_make_new,
-    .attr = uctypes_struct_attr,
-    .subscr = uctypes_struct_subscr,
-    .unary_op = uctypes_struct_unary_op,
-    .buffer = uctypes_get_buffer,
-};
+STATIC MP_DEFINE_CONST_OBJ_TYPE(
+    uctypes_struct_type,
+    MP_QSTR_struct,
+    MP_TYPE_FLAG_NONE,
+    uctypes_struct_make_new,
+    print, uctypes_struct_print,
+    attr, uctypes_struct_attr,
+    subscr, uctypes_struct_subscr,
+    unary_op, uctypes_struct_unary_op,
+    buffer, uctypes_get_buffer
+    );
 
 STATIC const mp_rom_map_elem_t mp_module_uctypes_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_uctypes) },
diff --git a/extmod/moduhashlib.c b/extmod/moduhashlib.c
index 7eae06b77d341..44625ed6da2ac 100644
--- a/extmod/moduhashlib.c
+++ b/extmod/moduhashlib.c
@@ -157,12 +157,13 @@ STATIC const mp_rom_map_elem_t uhashlib_sha256_locals_dict_table[] = {
 
 STATIC MP_DEFINE_CONST_DICT(uhashlib_sha256_locals_dict, uhashlib_sha256_locals_dict_table);
 
-STATIC const mp_obj_type_t uhashlib_sha256_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_sha256,
-    .make_new = uhashlib_sha256_make_new,
-    .locals_dict = (void *)&uhashlib_sha256_locals_dict,
-};
+STATIC MP_DEFINE_CONST_OBJ_TYPE(
+    uhashlib_sha256_type,
+    MP_QSTR_sha256,
+    MP_TYPE_FLAG_NONE,
+    uhashlib_sha256_make_new,
+    locals_dict, (void *)&uhashlib_sha256_locals_dict
+    );
 #endif
 
 #if MICROPY_PY_UHASHLIB_SHA1
@@ -250,12 +251,13 @@ STATIC const mp_rom_map_elem_t uhashlib_sha1_locals_dict_table[] = {
 };
 STATIC MP_DEFINE_CONST_DICT(uhashlib_sha1_locals_dict, uhashlib_sha1_locals_dict_table);
 
-STATIC const mp_obj_type_t uhashlib_sha1_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_sha1,
-    .make_new = uhashlib_sha1_make_new,
-    .locals_dict = (void *)&uhashlib_sha1_locals_dict,
-};
+STATIC MP_DEFINE_CONST_OBJ_TYPE(
+    uhashlib_sha1_type,
+    MP_QSTR_sha1,
+    MP_TYPE_FLAG_NONE,
+    uhashlib_sha1_make_new,
+    locals_dict, (void *)&uhashlib_sha1_locals_dict
+    );
 #endif
 
 #if MICROPY_PY_UHASHLIB_MD5
@@ -343,12 +345,13 @@ STATIC const mp_rom_map_elem_t uhashlib_md5_locals_dict_table[] = {
 };
 STATIC MP_DEFINE_CONST_DICT(uhashlib_md5_locals_dict, uhashlib_md5_locals_dict_table);
 
-STATIC const mp_obj_type_t uhashlib_md5_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_md5,
-    .make_new = uhashlib_md5_make_new,
-    .locals_dict = (void *)&uhashlib_md5_locals_dict,
-};
+STATIC MP_DEFINE_CONST_OBJ_TYPE(
+    uhashlib_md5_type,
+    MP_QSTR_md5,
+    MP_TYPE_FLAG_NONE,
+    uhashlib_md5_make_new,
+    locals_dict, (void *)&uhashlib_md5_locals_dict
+    );
 #endif // MICROPY_PY_UHASHLIB_MD5
 
 STATIC const mp_rom_map_elem_t mp_module_uhashlib_globals_table[] = {
diff --git a/extmod/modure.c b/extmod/modure.c
index a674d664999a8..a27c7ff9fdc57 100644
--- a/extmod/modure.c
+++ b/extmod/modure.c
@@ -179,12 +179,14 @@ STATIC const mp_rom_map_elem_t match_locals_dict_table[] = {
 
 STATIC MP_DEFINE_CONST_DICT(match_locals_dict, match_locals_dict_table);
 
-STATIC const mp_obj_type_t match_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_match,
-    .print = match_print,
-    .locals_dict = (void *)&match_locals_dict,
-};
+STATIC MP_DEFINE_CONST_OBJ_TYPE(
+    match_type,
+    MP_QSTR_match,
+    MP_TYPE_FLAG_NONE,
+    MP_TYPE_NULL_MAKE_NEW,
+    print, match_print,
+    locals_dict, (void *)&match_locals_dict
+    );
 #endif
 
 STATIC void re_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
@@ -411,12 +413,14 @@ STATIC const mp_rom_map_elem_t re_locals_dict_table[] = {
 
 STATIC MP_DEFINE_CONST_DICT(re_locals_dict, re_locals_dict_table);
 
-STATIC const mp_obj_type_t re_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_ure,
-    .print = re_print,
-    .locals_dict = (void *)&re_locals_dict,
-};
+STATIC MP_DEFINE_CONST_OBJ_TYPE(
+    re_type,
+    MP_QSTR_ure,
+    MP_TYPE_FLAG_NONE,
+    MP_TYPE_NULL_MAKE_NEW,
+    print, re_print,
+    locals_dict, (void *)&re_locals_dict
+    );
 #endif
 
 STATIC mp_obj_t mod_re_compile(size_t n_args, const mp_obj_t *args) {
diff --git a/extmod/moduselect.c b/extmod/moduselect.c
index 70a1de2e40998..1a11ee0eab50e 100644
--- a/extmod/moduselect.c
+++ b/extmod/moduselect.c
@@ -336,13 +336,15 @@ STATIC const mp_rom_map_elem_t poll_locals_dict_table[] = {
 };
 STATIC MP_DEFINE_CONST_DICT(poll_locals_dict, poll_locals_dict_table);
 
-STATIC const mp_obj_type_t mp_type_poll = {
-    { &mp_type_type },
-    .name = MP_QSTR_poll,
-    .getiter = mp_identity_getiter,
-    .iternext = poll_iternext,
-    .locals_dict = (void *)&poll_locals_dict,
-};
+STATIC MP_DEFINE_CONST_OBJ_TYPE(
+    mp_type_poll,
+    MP_QSTR_poll,
+    MP_TYPE_FLAG_NONE,
+    MP_TYPE_NULL_MAKE_NEW,
+    getiter, mp_identity_getiter,
+    iternext, poll_iternext,
+    locals_dict, (void *)&poll_locals_dict
+    );
 
 // poll()
 STATIC mp_obj_t select_poll(void) {
diff --git a/extmod/modusocket.c b/extmod/modusocket.c
index 4d72531160e6a..6008edb11c76f 100644
--- a/extmod/modusocket.c
+++ b/extmod/modusocket.c
@@ -528,14 +528,15 @@ STATIC const mp_stream_p_t socket_stream_p = {
     .is_text = false,
 };
 
-STATIC const mp_obj_type_t socket_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_socket,
-    .print = socket_print,
-    .make_new = socket_make_new,
-    .protocol = &socket_stream_p,
-    .locals_dict = (mp_obj_dict_t *)&socket_locals_dict,
-};
+STATIC MP_DEFINE_CONST_OBJ_TYPE(
+    socket_type,
+    MP_QSTR_socket,
+    MP_TYPE_FLAG_NONE,
+    socket_make_new,
+    protocol, &socket_stream_p,
+    locals_dict, (mp_obj_dict_t *)&socket_locals_dict,
+    print, socket_print
+    );
 
 /******************************************************************************/
 // usocket module
diff --git a/extmod/modussl_axtls.c b/extmod/modussl_axtls.c
index 9ba613a3e89e0..72eb0e214fe3f 100644
--- a/extmod/modussl_axtls.c
+++ b/extmod/modussl_axtls.c
@@ -314,16 +314,18 @@ STATIC const mp_stream_p_t ussl_socket_stream_p = {
     .ioctl = ussl_socket_ioctl,
 };
 
-STATIC const mp_obj_type_t ussl_socket_type = {
-    { &mp_type_type },
+STATIC MP_DEFINE_CONST_OBJ_TYPE(
+    ussl_socket_type,
+    MP_QSTR_ussl,
+    MP_TYPE_FLAG_NONE,
+    MP_TYPE_NULL_MAKE_NEW,
     // Save on qstr's, reuse same as for module
-    .name = MP_QSTR_ussl,
-    .print = ussl_socket_print,
-    .getiter = NULL,
-    .iternext = NULL,
-    .protocol = &ussl_socket_stream_p,
-    .locals_dict = (void *)&ussl_socket_locals_dict,
-};
+    print, ussl_socket_print,
+    getiter, NULL,
+    iternext, NULL,
+    protocol, &ussl_socket_stream_p,
+    locals_dict, (void *)&ussl_socket_locals_dict
+    );
 
 STATIC mp_obj_t mod_ssl_wrap_socket(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     // TODO: Implement more args
diff --git a/extmod/modussl_mbedtls.c b/extmod/modussl_mbedtls.c
index b14ed9ad0e3d0..0fab915f3f06f 100644
--- a/extmod/modussl_mbedtls.c
+++ b/extmod/modussl_mbedtls.c
@@ -392,16 +392,18 @@ STATIC const mp_stream_p_t ussl_socket_stream_p = {
     .ioctl = socket_ioctl,
 };
 
-STATIC const mp_obj_type_t ussl_socket_type = {
-    { &mp_type_type },
+STATIC MP_DEFINE_CONST_OBJ_TYPE(
+    ussl_socket_type,
+    MP_QSTR_ussl,
+    MP_TYPE_FLAG_NONE,
+    MP_TYPE_NULL_MAKE_NEW,
     // Save on qstr's, reuse same as for module
-    .name = MP_QSTR_ussl,
-    .print = socket_print,
-    .getiter = NULL,
-    .iternext = NULL,
-    .protocol = &ussl_socket_stream_p,
-    .locals_dict = (void *)&ussl_socket_locals_dict,
-};
+    print, socket_print,
+    getiter, NULL,
+    iternext, NULL,
+    protocol, &ussl_socket_stream_p,
+    locals_dict, (void *)&ussl_socket_locals_dict
+    );
 
 STATIC mp_obj_t mod_ssl_wrap_socket(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     // TODO: Implement more args
diff --git a/extmod/modutimeq.c b/extmod/modutimeq.c
index 1dde90bd1b026..bf4e031895fa6 100644
--- a/extmod/modutimeq.c
+++ b/extmod/modutimeq.c
@@ -209,13 +209,14 @@ STATIC const mp_rom_map_elem_t utimeq_locals_dict_table[] = {
 
 STATIC MP_DEFINE_CONST_DICT(utimeq_locals_dict, utimeq_locals_dict_table);
 
-STATIC const mp_obj_type_t utimeq_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_utimeq,
-    .make_new = utimeq_make_new,
-    .unary_op = utimeq_unary_op,
-    .locals_dict = (void *)&utimeq_locals_dict,
-};
+STATIC MP_DEFINE_CONST_OBJ_TYPE(
+    utimeq_type,
+    MP_QSTR_utimeq,
+    MP_TYPE_FLAG_NONE,
+    utimeq_make_new,
+    unary_op, utimeq_unary_op,
+    locals_dict, (void *)&utimeq_locals_dict
+    );
 
 STATIC const mp_rom_map_elem_t mp_module_utimeq_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_utimeq) },
diff --git a/extmod/moduwebsocket.c b/extmod/moduwebsocket.c
index a9ad0c22e3a51..2895978f3d5d2 100644
--- a/extmod/moduwebsocket.c
+++ b/extmod/moduwebsocket.c
@@ -290,13 +290,14 @@ STATIC const mp_stream_p_t websocket_stream_p = {
     .ioctl = websocket_ioctl,
 };
 
-STATIC const mp_obj_type_t websocket_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_websocket,
-    .make_new = websocket_make_new,
-    .protocol = &websocket_stream_p,
-    .locals_dict = (void *)&websocket_locals_dict,
-};
+STATIC MP_DEFINE_CONST_OBJ_TYPE(
+    websocket_type,
+    MP_QSTR_websocket,
+    MP_TYPE_FLAG_NONE,
+    websocket_make_new,
+    protocol, &websocket_stream_p,
+    locals_dict, (void *)&websocket_locals_dict
+    );
 
 STATIC const mp_rom_map_elem_t uwebsocket_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_uwebsocket) },
diff --git a/extmod/moduzlib.c b/extmod/moduzlib.c
index 0161b9f49cdd8..93c939129eab8 100644
--- a/extmod/moduzlib.c
+++ b/extmod/moduzlib.c
@@ -140,13 +140,14 @@ STATIC const mp_stream_p_t decompio_stream_p = {
 };
 
 #if !MICROPY_ENABLE_DYNRUNTIME
-STATIC const mp_obj_type_t decompio_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_DecompIO,
-    .make_new = decompio_make_new,
-    .protocol = &decompio_stream_p,
-    .locals_dict = (void *)&decompio_locals_dict,
-};
+STATIC MP_DEFINE_CONST_OBJ_TYPE(
+    decompio_type,
+    MP_QSTR_DecompIO,
+    MP_TYPE_FLAG_NONE,
+    decompio_make_new,
+    protocol, &decompio_stream_p,
+    locals_dict, (void *)&decompio_locals_dict
+    );
 #endif
 
 STATIC mp_obj_t mod_uzlib_decompress(size_t n_args, const mp_obj_t *args) {
diff --git a/extmod/modwebrepl.c b/extmod/modwebrepl.c
index 1a2a718acfab5..cb893b38dcbe6 100644
--- a/extmod/modwebrepl.c
+++ b/extmod/modwebrepl.c
@@ -342,13 +342,14 @@ STATIC const mp_stream_p_t webrepl_stream_p = {
     .ioctl = webrepl_ioctl,
 };
 
-STATIC const mp_obj_type_t webrepl_type = {
-    { &mp_type_type },
-    .name = MP_QSTR__webrepl,
-    .make_new = webrepl_make_new,
-    .protocol = &webrepl_stream_p,
-    .locals_dict = (mp_obj_dict_t *)&webrepl_locals_dict,
-};
+STATIC MP_DEFINE_CONST_OBJ_TYPE(
+    webrepl_type,
+    MP_QSTR__webrepl,
+    MP_TYPE_FLAG_NONE,
+    webrepl_make_new,
+    protocol, &webrepl_stream_p,
+    locals_dict, (mp_obj_dict_t *)&webrepl_locals_dict
+    );
 
 STATIC const mp_rom_map_elem_t webrepl_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR__webrepl) },
diff --git a/extmod/network_cyw43.c b/extmod/network_cyw43.c
index 9df799119fe61..fbd0a750b8e6c 100644
--- a/extmod/network_cyw43.c
+++ b/extmod/network_cyw43.c
@@ -496,12 +496,13 @@ STATIC const mp_rom_map_elem_t network_cyw43_locals_dict_table[] = {
 };
 STATIC MP_DEFINE_CONST_DICT(network_cyw43_locals_dict, network_cyw43_locals_dict_table);
 
-const mp_obj_type_t mp_network_cyw43_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_CYW43,
-    .print = network_cyw43_print,
-    .make_new = network_cyw43_make_new,
-    .locals_dict = (mp_obj_dict_t *)&network_cyw43_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    mp_network_cyw43_type,
+    MP_QSTR_CYW43,
+    MP_TYPE_FLAG_NONE,
+    network_cyw43_make_new,
+    print, network_cyw43_print,
+    locals_dict, (mp_obj_dict_t *)&network_cyw43_locals_dict
+    );
 
 #endif // MICROPY_PY_NETWORK_CYW43
diff --git a/extmod/network_ninaw10.c b/extmod/network_ninaw10.c
index 4014a71c1acfa..0906176d20b0b 100644
--- a/extmod/network_ninaw10.c
+++ b/extmod/network_ninaw10.c
@@ -774,13 +774,16 @@ static const mp_rom_map_elem_t nina_locals_dict_table[] = {
 
 static MP_DEFINE_CONST_DICT(nina_locals_dict, nina_locals_dict_table);
 
+STATIC MP_DEFINE_CONST_OBJ_TYPE(
+    mod_network_nic_type_nina_base,
+    MP_QSTR_nina,
+    MP_TYPE_FLAG_NONE,
+    network_ninaw10_make_new,
+    locals_dict, &nina_locals_dict
+    );
+
 const mod_network_nic_type_t mod_network_nic_type_nina = {
-    .base = {
-        { &mp_type_type },
-        .name = MP_QSTR_nina,
-        .make_new = network_ninaw10_make_new,
-        .locals_dict = (mp_obj_t)&nina_locals_dict,
-    },
+    .base = mod_network_nic_type_nina_base,
     .gethostbyname = network_ninaw10_gethostbyname,
     .socket = network_ninaw10_socket_socket,
     .close = network_ninaw10_socket_close,
diff --git a/extmod/network_wiznet5k.c b/extmod/network_wiznet5k.c
index 95c852d7f7299..951a2966c93f9 100644
--- a/extmod/network_wiznet5k.c
+++ b/extmod/network_wiznet5k.c
@@ -1016,20 +1016,24 @@ STATIC const mp_rom_map_elem_t wiznet5k_locals_dict_table[] = {
 STATIC MP_DEFINE_CONST_DICT(wiznet5k_locals_dict, wiznet5k_locals_dict_table);
 
 #if WIZNET5K_WITH_LWIP_STACK
-const mp_obj_type_t mod_network_nic_type_wiznet5k = {
-    { &mp_type_type },
-    .name = MP_QSTR_WIZNET5K,
-    .make_new = wiznet5k_make_new,
-    .locals_dict = (mp_obj_dict_t *)&wiznet5k_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    mod_network_nic_type_wiznet5k,
+    MP_QSTR_WIZNET5K,
+    MP_TYPE_FLAG_NONE,
+    wiznet5k_make_new,
+    locals_dict, &wiznet5k_locals_dict
+    );
 #else // WIZNET5K_PROVIDED_STACK
+STATIC MP_DEFINE_CONST_OBJ_TYPE(
+    mod_network_nic_type_wiznet5k_base,
+    MP_QSTR_WIZNET5K,
+    MP_TYPE_FLAG_NONE,
+    wiznet5k_make_new,
+    locals_dict, &wiznet5k_locals_dict
+    );
+
 const mod_network_nic_type_t mod_network_nic_type_wiznet5k = {
-    .base = {
-        { &mp_type_type },
-        .name = MP_QSTR_WIZNET5K,
-        .make_new = wiznet5k_make_new,
-        .locals_dict = (mp_obj_dict_t *)&wiznet5k_locals_dict,
-    },
+    .base = mod_network_nic_type_wiznet5k_base,
     .gethostbyname = wiznet5k_gethostbyname,
     .socket = wiznet5k_socket_socket,
     .close = wiznet5k_socket_close,
diff --git a/extmod/vfs_fat.c b/extmod/vfs_fat.c
index 8d2f13be476d8..4a2ef883c26c1 100644
--- a/extmod/vfs_fat.c
+++ b/extmod/vfs_fat.c
@@ -431,12 +431,13 @@ STATIC const mp_vfs_proto_t fat_vfs_proto = {
     .import_stat = fat_vfs_import_stat,
 };
 
-const mp_obj_type_t mp_fat_vfs_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_VfsFat,
-    .make_new = fat_vfs_make_new,
-    .protocol = &fat_vfs_proto,
-    .locals_dict = (mp_obj_dict_t *)&fat_vfs_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    mp_fat_vfs_type,
+    MP_QSTR_VfsFat,
+    MP_TYPE_FLAG_NONE,
+    fat_vfs_make_new,
+    protocol, &fat_vfs_proto,
+    locals_dict, (mp_obj_dict_t *)&fat_vfs_locals_dict
+    );
 
 #endif // MICROPY_VFS_FAT
diff --git a/extmod/vfs_fat_file.c b/extmod/vfs_fat_file.c
index 874f10c50045c..0d4af09b452cc 100644
--- a/extmod/vfs_fat_file.c
+++ b/extmod/vfs_fat_file.c
@@ -176,15 +176,17 @@ STATIC const mp_stream_p_t vfs_fat_fileio_stream_p = {
     .ioctl = file_obj_ioctl,
 };
 
-const mp_obj_type_t mp_type_vfs_fat_fileio = {
-    { &mp_type_type },
-    .name = MP_QSTR_FileIO,
-    .print = file_obj_print,
-    .getiter = mp_identity_getiter,
-    .iternext = mp_stream_unbuffered_iter,
-    .protocol = &vfs_fat_fileio_stream_p,
-    .locals_dict = (mp_obj_dict_t *)&vfs_fat_rawfile_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    mp_type_vfs_fat_fileio,
+    MP_QSTR_FileIO,
+    MP_TYPE_FLAG_NONE,
+    MP_TYPE_NULL_MAKE_NEW,
+    print, file_obj_print,
+    getiter, mp_identity_getiter,
+    iternext, mp_stream_unbuffered_iter,
+    protocol, &vfs_fat_fileio_stream_p,
+    locals_dict, (mp_obj_dict_t *)&vfs_fat_rawfile_locals_dict
+    );
 
 STATIC const mp_stream_p_t vfs_fat_textio_stream_p = {
     .read = file_obj_read,
@@ -193,15 +195,17 @@ STATIC const mp_stream_p_t vfs_fat_textio_stream_p = {
     .is_text = true,
 };
 
-const mp_obj_type_t mp_type_vfs_fat_textio = {
-    { &mp_type_type },
-    .name = MP_QSTR_TextIOWrapper,
-    .print = file_obj_print,
-    .getiter = mp_identity_getiter,
-    .iternext = mp_stream_unbuffered_iter,
-    .protocol = &vfs_fat_textio_stream_p,
-    .locals_dict = (mp_obj_dict_t *)&vfs_fat_rawfile_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    mp_type_vfs_fat_textio,
+    MP_QSTR_TextIOWrapper,
+    MP_TYPE_FLAG_NONE,
+    MP_TYPE_NULL_MAKE_NEW,
+    print, file_obj_print,
+    getiter, mp_identity_getiter,
+    iternext, mp_stream_unbuffered_iter,
+    protocol, &vfs_fat_textio_stream_p,
+    locals_dict, (mp_obj_dict_t *)&vfs_fat_rawfile_locals_dict
+    );
 
 // Factory function for I/O stream classes
 STATIC mp_obj_t fat_vfs_open(mp_obj_t self_in, mp_obj_t path_in, mp_obj_t mode_in) {
diff --git a/extmod/vfs_lfsx.c b/extmod/vfs_lfsx.c
index fbfeaa5ccf1a2..72c6696105d9e 100644
--- a/extmod/vfs_lfsx.c
+++ b/extmod/vfs_lfsx.c
@@ -502,14 +502,15 @@ STATIC const mp_vfs_proto_t MP_VFS_LFSx(proto) = {
     .import_stat = MP_VFS_LFSx(import_stat),
 };
 
-const mp_obj_type_t MP_TYPE_VFS_LFSx = {
-    { &mp_type_type },
+MP_DEFINE_CONST_OBJ_TYPE(
+    MP_TYPE_VFS_LFSx,
     #if LFS_BUILD_VERSION == 1
-    .name = MP_QSTR_VfsLfs1,
+    MP_QSTR_VfsLfs1,
     #else
-    .name = MP_QSTR_VfsLfs2,
+    MP_QSTR_VfsLfs2,
     #endif
-    .make_new = MP_VFS_LFSx(make_new),
-    .protocol = &MP_VFS_LFSx(proto),
-    .locals_dict = (mp_obj_dict_t *)&MP_VFS_LFSx(locals_dict),
-};
+    MP_TYPE_FLAG_NONE,
+    MP_VFS_LFSx(make_new),
+    protocol, &MP_VFS_LFSx(proto),
+    locals_dict, (mp_obj_dict_t *)&MP_VFS_LFSx(locals_dict)
+    );
diff --git a/extmod/vfs_lfsx_file.c b/extmod/vfs_lfsx_file.c
index 124361feb99f2..ba90cc6084435 100644
--- a/extmod/vfs_lfsx_file.c
+++ b/extmod/vfs_lfsx_file.c
@@ -220,15 +220,17 @@ STATIC const mp_stream_p_t MP_VFS_LFSx(fileio_stream_p) = {
     .ioctl = MP_VFS_LFSx(file_ioctl),
 };
 
-const mp_obj_type_t MP_TYPE_VFS_LFSx_(_fileio) = {
-    { &mp_type_type },
-    .name = MP_QSTR_FileIO,
-    .print = MP_VFS_LFSx(file_print),
-    .getiter = mp_identity_getiter,
-    .iternext = mp_stream_unbuffered_iter,
-    .protocol = &MP_VFS_LFSx(fileio_stream_p),
-    .locals_dict = (mp_obj_dict_t *)&MP_VFS_LFSx(file_locals_dict),
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    MP_TYPE_VFS_LFSx_(_fileio),
+    MP_QSTR_FileIO,
+    MP_TYPE_FLAG_NONE,
+    MP_TYPE_NULL_MAKE_NEW,
+    print, MP_VFS_LFSx(file_print),
+    getiter, mp_identity_getiter,
+    iternext, mp_stream_unbuffered_iter,
+    protocol, &MP_VFS_LFSx(fileio_stream_p),
+    locals_dict, (mp_obj_dict_t *)&MP_VFS_LFSx(file_locals_dict)
+    );
 
 STATIC const mp_stream_p_t MP_VFS_LFSx(textio_stream_p) = {
     .read = MP_VFS_LFSx(file_read),
@@ -237,12 +239,14 @@ STATIC const mp_stream_p_t MP_VFS_LFSx(textio_stream_p) = {
     .is_text = true,
 };
 
-const mp_obj_type_t MP_TYPE_VFS_LFSx_(_textio) = {
-    { &mp_type_type },
-    .name = MP_QSTR_TextIOWrapper,
-    .print = MP_VFS_LFSx(file_print),
-    .getiter = mp_identity_getiter,
-    .iternext = mp_stream_unbuffered_iter,
-    .protocol = &MP_VFS_LFSx(textio_stream_p),
-    .locals_dict = (mp_obj_dict_t *)&MP_VFS_LFSx(file_locals_dict),
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    MP_TYPE_VFS_LFSx_(_textio),
+    MP_QSTR_TextIOWrapper,
+    MP_TYPE_FLAG_NONE,
+    MP_TYPE_NULL_MAKE_NEW,
+    print, MP_VFS_LFSx(file_print),
+    getiter, mp_identity_getiter,
+    iternext, mp_stream_unbuffered_iter,
+    protocol, &MP_VFS_LFSx(textio_stream_p),
+    locals_dict, (mp_obj_dict_t *)&MP_VFS_LFSx(file_locals_dict)
+    );
diff --git a/extmod/vfs_posix.c b/extmod/vfs_posix.c
index 36b211b84d6b7..79126c007068f 100644
--- a/extmod/vfs_posix.c
+++ b/extmod/vfs_posix.c
@@ -398,12 +398,13 @@ STATIC const mp_vfs_proto_t vfs_posix_proto = {
     .import_stat = mp_vfs_posix_import_stat,
 };
 
-const mp_obj_type_t mp_type_vfs_posix = {
-    { &mp_type_type },
-    .name = MP_QSTR_VfsPosix,
-    .make_new = vfs_posix_make_new,
-    .protocol = &vfs_posix_proto,
-    .locals_dict = (mp_obj_dict_t *)&vfs_posix_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    mp_type_vfs_posix,
+    MP_QSTR_VfsPosix,
+    MP_TYPE_FLAG_NONE,
+    vfs_posix_make_new,
+    protocol, &vfs_posix_proto,
+    locals_dict, (mp_obj_dict_t *)&vfs_posix_locals_dict
+    );
 
 #endif // MICROPY_VFS_POSIX
diff --git a/extmod/vfs_posix_file.c b/extmod/vfs_posix_file.c
index c550842cd4e86..85aef1617b80d 100644
--- a/extmod/vfs_posix_file.c
+++ b/extmod/vfs_posix_file.c
@@ -249,15 +249,17 @@ STATIC const mp_stream_p_t vfs_posix_fileio_stream_p = {
     .ioctl = vfs_posix_file_ioctl,
 };
 
-const mp_obj_type_t mp_type_vfs_posix_fileio = {
-    { &mp_type_type },
-    .name = MP_QSTR_FileIO,
-    .print = vfs_posix_file_print,
-    .getiter = mp_identity_getiter,
-    .iternext = mp_stream_unbuffered_iter,
-    .protocol = &vfs_posix_fileio_stream_p,
-    .locals_dict = (mp_obj_dict_t *)&vfs_posix_rawfile_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    mp_type_vfs_posix_fileio,
+    MP_QSTR_FileIO,
+    MP_TYPE_FLAG_NONE,
+    MP_TYPE_NULL_MAKE_NEW,
+    print, vfs_posix_file_print,
+    getiter, mp_identity_getiter,
+    iternext, mp_stream_unbuffered_iter,
+    protocol, &vfs_posix_fileio_stream_p,
+    locals_dict, (mp_obj_dict_t *)&vfs_posix_rawfile_locals_dict
+    );
 
 STATIC const mp_stream_p_t vfs_posix_textio_stream_p = {
     .read = vfs_posix_file_read,
@@ -266,15 +268,17 @@ STATIC const mp_stream_p_t vfs_posix_textio_stream_p = {
     .is_text = true,
 };
 
-const mp_obj_type_t mp_type_vfs_posix_textio = {
-    { &mp_type_type },
-    .name = MP_QSTR_TextIOWrapper,
-    .print = vfs_posix_file_print,
-    .getiter = mp_identity_getiter,
-    .iternext = mp_stream_unbuffered_iter,
-    .protocol = &vfs_posix_textio_stream_p,
-    .locals_dict = (mp_obj_dict_t *)&vfs_posix_rawfile_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    mp_type_vfs_posix_textio,
+    MP_QSTR_TextIOWrapper,
+    MP_TYPE_FLAG_NONE,
+    MP_TYPE_NULL_MAKE_NEW,
+    print, vfs_posix_file_print,
+    getiter, mp_identity_getiter,
+    iternext, mp_stream_unbuffered_iter,
+    protocol, &vfs_posix_textio_stream_p,
+    locals_dict, (mp_obj_dict_t *)&vfs_posix_rawfile_locals_dict
+    );
 
 const mp_obj_vfs_posix_file_t mp_sys_stdin_obj = {{&mp_type_vfs_posix_textio}, STDIN_FILENO};
 const mp_obj_vfs_posix_file_t mp_sys_stdout_obj = {{&mp_type_vfs_posix_textio}, STDOUT_FILENO};
diff --git a/ports/cc3200/misc/mpirq.c b/ports/cc3200/misc/mpirq.c
index eb93e5eef0cc3..e9cae92a327e6 100644
--- a/ports/cc3200/misc/mpirq.c
+++ b/ports/cc3200/misc/mpirq.c
@@ -190,11 +190,13 @@ STATIC const mp_rom_map_elem_t mp_irq_locals_dict_table[] = {
 
 STATIC MP_DEFINE_CONST_DICT(mp_irq_locals_dict, mp_irq_locals_dict_table);
 
-const mp_obj_type_t mp_irq_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_irq,
-    .call = mp_irq_call,
-    .locals_dict = (mp_obj_t)&mp_irq_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    mp_irq_type,
+    MP_QSTR_irq,
+    MP_TYPE_FLAG_NONE,
+    MP_TYPE_NULL_MAKE_NEW,
+    call, mp_irq_call,
+    locals_dict, (mp_obj_t)&mp_irq_locals_dict
+    );
 
 MP_REGISTER_ROOT_POINTER(mp_obj_list_t mp_irq_obj_list);
diff --git a/ports/cc3200/mods/modnetwork.c b/ports/cc3200/mods/modnetwork.c
index d6ccc7c6a04d7..a74189300775b 100644
--- a/ports/cc3200/mods/modnetwork.c
+++ b/ports/cc3200/mods/modnetwork.c
@@ -171,10 +171,11 @@ STATIC const mp_rom_map_elem_t network_server_locals_dict_table[] = {
 
 STATIC MP_DEFINE_CONST_DICT(network_server_locals_dict, network_server_locals_dict_table);
 
-STATIC const mp_obj_type_t network_server_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_Server,
-    .make_new = network_server_make_new,
-    .locals_dict = (mp_obj_t)&network_server_locals_dict,
-};
+STATIC MP_DEFINE_CONST_OBJ_TYPE(
+    network_server_type,
+    MP_QSTR_Server,
+    MP_TYPE_FLAG_NONE,
+    network_server_make_new,
+    locals_dict, (mp_obj_t)&network_server_locals_dict
+    );
 #endif
diff --git a/ports/cc3200/mods/moduhashlib.c b/ports/cc3200/mods/moduhashlib.c
index fc11569b7f988..5437cfb264e6e 100644
--- a/ports/cc3200/mods/moduhashlib.c
+++ b/ports/cc3200/mods/moduhashlib.c
@@ -177,19 +177,21 @@ STATIC MP_DEFINE_CONST_DICT(hash_locals_dict, hash_locals_dict_table);
 //    .locals_dict = (mp_obj_t)&hash_locals_dict,
 //};
 
-STATIC const mp_obj_type_t sha1_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_sha1,
-    .make_new = hash_make_new,
-    .locals_dict = (mp_obj_t)&hash_locals_dict,
-};
-
-STATIC const mp_obj_type_t sha256_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_sha256,
-    .make_new = hash_make_new,
-    .locals_dict = (mp_obj_t)&hash_locals_dict,
-};
+STATIC MP_DEFINE_CONST_OBJ_TYPE(
+    sha1_type,
+    MP_QSTR_sha1,
+    MP_TYPE_FLAG_NONE,
+    hash_make_new,
+    locals_dict, (mp_obj_t)&hash_locals_dict
+    );
+
+STATIC MP_DEFINE_CONST_OBJ_TYPE(
+    sha256_type,
+    MP_QSTR_sha256,
+    MP_TYPE_FLAG_NONE,
+    hash_make_new,
+    locals_dict, (mp_obj_t)&hash_locals_dict
+    );
 
 STATIC const mp_rom_map_elem_t mp_module_hashlib_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__),    MP_ROM_QSTR(MP_QSTR_uhashlib) },
diff --git a/ports/cc3200/mods/modusocket.c b/ports/cc3200/mods/modusocket.c
index 23982eb96602c..11199de14628f 100644
--- a/ports/cc3200/mods/modusocket.c
+++ b/ports/cc3200/mods/modusocket.c
@@ -759,13 +759,14 @@ const mp_stream_p_t socket_stream_p = {
     .is_text = false,
 };
 
-STATIC const mp_obj_type_t socket_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_socket,
-    .make_new = socket_make_new,
-    .protocol = &socket_stream_p,
-    .locals_dict = (mp_obj_t)&socket_locals_dict,
-};
+STATIC MP_DEFINE_CONST_OBJ_TYPE(
+    socket_type,
+    MP_QSTR_socket,
+    MP_TYPE_FLAG_NONE,
+    socket_make_new,
+    protocol, &socket_stream_p,
+    locals_dict, (mp_obj_t)&socket_locals_dict
+    );
 
 /******************************************************************************/
 // usocket module
diff --git a/ports/cc3200/mods/modussl.c b/ports/cc3200/mods/modussl.c
index cd2c62dcb82e3..d0909e7c2909d 100644
--- a/ports/cc3200/mods/modussl.c
+++ b/ports/cc3200/mods/modussl.c
@@ -60,14 +60,16 @@ STATIC const mp_obj_type_t ssl_socket_type;
 
 // ssl sockets inherit from normal socket, so we take its
 // locals and stream methods
-STATIC const mp_obj_type_t ssl_socket_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_ussl,
-    .getiter = NULL,
-    .iternext = NULL,
-    .protocol = &socket_stream_p,
-    .locals_dict = (mp_obj_t)&socket_locals_dict,
-};
+STATIC MP_DEFINE_CONST_OBJ_TYPE(
+    ssl_socket_type,
+    MP_QSTR_ussl,
+    MP_TYPE_FLAG_NONE,
+    MP_TYPE_NULL_MAKE_NEW,
+    getiter, NULL,
+    iternext, NULL,
+    protocol, &socket_stream_p,
+    locals_dict, (mp_obj_t)&socket_locals_dict
+    );
 
 STATIC mp_obj_t mod_ssl_wrap_socket(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     STATIC const mp_arg_t allowed_args[] = {
diff --git a/ports/cc3200/mods/modwlan.c b/ports/cc3200/mods/modwlan.c
index 3b686932e81da..24f5d196d2a30 100644
--- a/ports/cc3200/mods/modwlan.c
+++ b/ports/cc3200/mods/modwlan.c
@@ -1285,13 +1285,16 @@ STATIC const mp_rom_map_elem_t wlan_locals_dict_table[] = {
 };
 STATIC MP_DEFINE_CONST_DICT(wlan_locals_dict, wlan_locals_dict_table);
 
+STATIC MP_DEFINE_CONST_OBJ_TYPE(
+    mod_network_nic_type_wlan_base,
+    MP_QSTR_WLAN,
+    MP_TYPE_FLAG_NONE,
+    wlan_make_new,
+    locals_dict, (mp_obj_t)&wlan_locals_dict
+    );
+
 const mod_network_nic_type_t mod_network_nic_type_wlan = {
-    .base = {
-        { &mp_type_type },
-        .name = MP_QSTR_WLAN,
-        .make_new = wlan_make_new,
-        .locals_dict = (mp_obj_t)&wlan_locals_dict,
-    },
+    .base = mod_network_nic_type_wlan_base,
 };
 
 STATIC const mp_irq_methods_t wlan_irq_methods = {
diff --git a/ports/cc3200/mods/pybadc.c b/ports/cc3200/mods/pybadc.c
index fbdd393cd2ecc..a114eeda169a0 100644
--- a/ports/cc3200/mods/pybadc.c
+++ b/ports/cc3200/mods/pybadc.c
@@ -233,13 +233,14 @@ STATIC const mp_rom_map_elem_t adc_locals_dict_table[] = {
 
 STATIC MP_DEFINE_CONST_DICT(adc_locals_dict, adc_locals_dict_table);
 
-const mp_obj_type_t pyb_adc_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_ADC,
-    .print = adc_print,
-    .make_new = adc_make_new,
-    .locals_dict = (mp_obj_t)&adc_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    pyb_adc_type,
+    MP_QSTR_ADC,
+    MP_TYPE_FLAG_NONE,
+    adc_make_new,
+    print, adc_print,
+    locals_dict, (mp_obj_t)&adc_locals_dict
+    );
 
 STATIC void adc_channel_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     pyb_adc_channel_obj_t *self = self_in;
@@ -300,10 +301,12 @@ STATIC const mp_rom_map_elem_t adc_channel_locals_dict_table[] = {
 
 STATIC MP_DEFINE_CONST_DICT(adc_channel_locals_dict, adc_channel_locals_dict_table);
 
-STATIC const mp_obj_type_t pyb_adc_channel_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_ADCChannel,
-    .print = adc_channel_print,
-    .call = adc_channel_call,
-    .locals_dict = (mp_obj_t)&adc_channel_locals_dict,
-};
+STATIC MP_DEFINE_CONST_OBJ_TYPE(
+    pyb_adc_channel_type,
+    MP_QSTR_ADCChannel,
+    MP_TYPE_FLAG_NONE,
+    MP_TYPE_NULL_MAKE_NEW,
+    print, adc_channel_print,
+    call, adc_channel_call,
+    locals_dict, (mp_obj_t)&adc_channel_locals_dict
+    );
diff --git a/ports/cc3200/mods/pybflash.c b/ports/cc3200/mods/pybflash.c
index 9d534608becce..4cfafb7abf642 100644
--- a/ports/cc3200/mods/pybflash.c
+++ b/ports/cc3200/mods/pybflash.c
@@ -84,12 +84,13 @@ STATIC const mp_rom_map_elem_t pyb_flash_locals_dict_table[] = {
 
 STATIC MP_DEFINE_CONST_DICT(pyb_flash_locals_dict, pyb_flash_locals_dict_table);
 
-const mp_obj_type_t pyb_flash_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_Flash,
-    .make_new = pyb_flash_make_new,
-    .locals_dict = (mp_obj_t)&pyb_flash_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    pyb_flash_type,
+    MP_QSTR_Flash,
+    MP_TYPE_FLAG_NONE,
+    pyb_flash_make_new,
+    locals_dict, (mp_obj_t)&pyb_flash_locals_dict
+    );
 
 void pyb_flash_init_vfs(fs_user_mount_t *vfs) {
     vfs->base.type = &mp_fat_vfs_type;
diff --git a/ports/cc3200/mods/pybi2c.c b/ports/cc3200/mods/pybi2c.c
index 40b3e2a207146..91a0b9b9f9a99 100644
--- a/ports/cc3200/mods/pybi2c.c
+++ b/ports/cc3200/mods/pybi2c.c
@@ -521,10 +521,11 @@ STATIC const mp_rom_map_elem_t pyb_i2c_locals_dict_table[] = {
 
 STATIC MP_DEFINE_CONST_DICT(pyb_i2c_locals_dict, pyb_i2c_locals_dict_table);
 
-const mp_obj_type_t pyb_i2c_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_I2C,
-    .print = pyb_i2c_print,
-    .make_new = pyb_i2c_make_new,
-    .locals_dict = (mp_obj_t)&pyb_i2c_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    pyb_i2c_type,
+    MP_QSTR_I2C,
+    MP_TYPE_FLAG_NONE,
+    pyb_i2c_make_new,
+    print, pyb_i2c_print,
+    locals_dict, (mp_obj_t)&pyb_i2c_locals_dict
+    );
diff --git a/ports/cc3200/mods/pybpin.c b/ports/cc3200/mods/pybpin.c
index fd2f032e8d7ce..948cda70d4ab9 100644
--- a/ports/cc3200/mods/pybpin.c
+++ b/ports/cc3200/mods/pybpin.c
@@ -931,14 +931,15 @@ STATIC const mp_rom_map_elem_t pin_locals_dict_table[] = {
 
 STATIC MP_DEFINE_CONST_DICT(pin_locals_dict, pin_locals_dict_table);
 
-const mp_obj_type_t pin_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_Pin,
-    .print = pin_print,
-    .make_new = pin_make_new,
-    .call = pin_call,
-    .locals_dict = (mp_obj_t)&pin_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    pin_type,
+    MP_QSTR_Pin,
+    MP_TYPE_FLAG_NONE,
+    pin_make_new,
+    print, pin_print,
+    call, pin_call,
+    locals_dict, (mp_obj_t)&pin_locals_dict
+    );
 
 STATIC const mp_irq_methods_t pin_irq_methods = {
     .init = pin_irq,
@@ -952,10 +953,12 @@ STATIC void pin_named_pins_obj_print(const mp_print_t *print, mp_obj_t self_in,
     mp_printf(print, "<Pin.%q>", self->name);
 }
 
-const mp_obj_type_t pin_board_pins_obj_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_board,
-    .print = pin_named_pins_obj_print,
-    .locals_dict = (mp_obj_t)&pin_board_pins_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    pin_board_pins_obj_type,
+    MP_QSTR_board,
+    MP_TYPE_FLAG_NONE,
+    MP_TYPE_NULL_MAKE_NEW,
+    print, pin_named_pins_obj_print,
+    locals_dict, (mp_obj_t)&pin_board_pins_locals_dict
+    );
 
diff --git a/ports/cc3200/mods/pybrtc.c b/ports/cc3200/mods/pybrtc.c
index 6c1918831c8c2..2761cb3c64f5d 100644
--- a/ports/cc3200/mods/pybrtc.c
+++ b/ports/cc3200/mods/pybrtc.c
@@ -469,12 +469,13 @@ STATIC const mp_rom_map_elem_t pyb_rtc_locals_dict_table[] = {
 };
 STATIC MP_DEFINE_CONST_DICT(pyb_rtc_locals_dict, pyb_rtc_locals_dict_table);
 
-const mp_obj_type_t pyb_rtc_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_RTC,
-    .make_new = pyb_rtc_make_new,
-    .locals_dict = (mp_obj_t)&pyb_rtc_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    pyb_rtc_type,
+    MP_QSTR_RTC,
+    MP_TYPE_FLAG_NONE,
+    pyb_rtc_make_new,
+    locals_dict, (mp_obj_t)&pyb_rtc_locals_dict
+    );
 
 STATIC const mp_irq_methods_t pyb_rtc_irq_methods = {
     .init = pyb_rtc_irq,
diff --git a/ports/cc3200/mods/pybsd.c b/ports/cc3200/mods/pybsd.c
index 817127634d898..d8834e36f7447 100644
--- a/ports/cc3200/mods/pybsd.c
+++ b/ports/cc3200/mods/pybsd.c
@@ -212,9 +212,10 @@ STATIC const mp_rom_map_elem_t pyb_sd_locals_dict_table[] = {
 
 STATIC MP_DEFINE_CONST_DICT(pyb_sd_locals_dict, pyb_sd_locals_dict_table);
 
-const mp_obj_type_t pyb_sd_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_SD,
-    .make_new = pyb_sd_make_new,
-    .locals_dict = (mp_obj_t)&pyb_sd_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    pyb_sd_type,
+    MP_QSTR_SD,
+    MP_TYPE_FLAG_NONE,
+    pyb_sd_make_new,
+    locals_dict, (mp_obj_t)&pyb_sd_locals_dict
+    );
diff --git a/ports/cc3200/mods/pybsleep.c b/ports/cc3200/mods/pybsleep.c
index 76fe0849a4bc2..423099991f8d1 100644
--- a/ports/cc3200/mods/pybsleep.c
+++ b/ports/cc3200/mods/pybsleep.c
@@ -125,10 +125,12 @@ STATIC pybsleep_data_t   pybsleep_data = {NULL, NULL, NULL};
 volatile arm_cm4_core_regs_t vault_arm_registers;
 STATIC pybsleep_reset_cause_t pybsleep_reset_cause = PYB_SLP_PWRON_RESET;
 STATIC pybsleep_wake_reason_t pybsleep_wake_reason = PYB_SLP_WAKED_PWRON;
-STATIC const mp_obj_type_t pyb_sleep_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_sleep,
-};
+STATIC MP_DEFINE_CONST_OBJ_TYPE(
+    pyb_sleep_type,
+    MP_QSTR_sleep,
+    MP_TYPE_FLAG_NONE,
+    MP_TYPE_NULL_MAKE_NEW
+    );
 
 /******************************************************************************
  DECLARE PRIVATE FUNCTIONS
diff --git a/ports/cc3200/mods/pybspi.c b/ports/cc3200/mods/pybspi.c
index ed03b09060811..50d897633e557 100644
--- a/ports/cc3200/mods/pybspi.c
+++ b/ports/cc3200/mods/pybspi.c
@@ -377,10 +377,11 @@ STATIC const mp_rom_map_elem_t pyb_spi_locals_dict_table[] = {
 
 STATIC MP_DEFINE_CONST_DICT(pyb_spi_locals_dict, pyb_spi_locals_dict_table);
 
-const mp_obj_type_t pyb_spi_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_SPI,
-    .print = pyb_spi_print,
-    .make_new = pyb_spi_make_new,
-    .locals_dict = (mp_obj_t)&pyb_spi_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    pyb_spi_type,
+    MP_QSTR_SPI,
+    MP_TYPE_FLAG_NONE,
+    pyb_spi_make_new,
+    print, pyb_spi_print,
+    locals_dict, (mp_obj_t)&pyb_spi_locals_dict
+    );
diff --git a/ports/cc3200/mods/pybtimer.c b/ports/cc3200/mods/pybtimer.c
index b2725ae166537..a8bc7821e0ce2 100644
--- a/ports/cc3200/mods/pybtimer.c
+++ b/ports/cc3200/mods/pybtimer.c
@@ -459,13 +459,14 @@ STATIC const mp_rom_map_elem_t pyb_timer_locals_dict_table[] = {
 };
 STATIC MP_DEFINE_CONST_DICT(pyb_timer_locals_dict, pyb_timer_locals_dict_table);
 
-const mp_obj_type_t pyb_timer_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_Timer,
-    .print = pyb_timer_print,
-    .make_new = pyb_timer_make_new,
-    .locals_dict = (mp_obj_t)&pyb_timer_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    pyb_timer_type,
+    MP_QSTR_Timer,
+    MP_TYPE_FLAG_NONE,
+    pyb_timer_make_new,
+    print, pyb_timer_print,
+    locals_dict, (mp_obj_t)&pyb_timer_locals_dict
+    );
 
 STATIC const mp_irq_methods_t pyb_timer_channel_irq_methods = {
     .init = pyb_timer_channel_irq,
@@ -721,11 +722,13 @@ STATIC const mp_rom_map_elem_t pyb_timer_channel_locals_dict_table[] = {
 };
 STATIC MP_DEFINE_CONST_DICT(pyb_timer_channel_locals_dict, pyb_timer_channel_locals_dict_table);
 
-STATIC const mp_obj_type_t pyb_timer_channel_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_TimerChannel,
-    .print = pyb_timer_channel_print,
-    .locals_dict = (mp_obj_t)&pyb_timer_channel_locals_dict,
-};
+STATIC MP_DEFINE_CONST_OBJ_TYPE(
+    pyb_timer_channel_type,
+    MP_QSTR_TimerChannel,
+    MP_TYPE_FLAG_NONE,
+    MP_TYPE_NULL_MAKE_NEW,
+    print, pyb_timer_channel_print,
+    locals_dict, (mp_obj_t)&pyb_timer_channel_locals_dict
+    );
 
 MP_REGISTER_ROOT_POINTER(mp_obj_list_t pyb_timer_channel_obj_list);
diff --git a/ports/cc3200/mods/pybuart.c b/ports/cc3200/mods/pybuart.c
index a81954abb8b57..059101f4f205a 100644
--- a/ports/cc3200/mods/pybuart.c
+++ b/ports/cc3200/mods/pybuart.c
@@ -685,15 +685,16 @@ STATIC const mp_irq_methods_t uart_irq_methods = {
     .flags = uart_irq_flags
 };
 
-const mp_obj_type_t pyb_uart_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_UART,
-    .print = pyb_uart_print,
-    .make_new = pyb_uart_make_new,
-    .getiter = mp_identity_getiter,
-    .iternext = mp_stream_unbuffered_iter,
-    .protocol = &uart_stream_p,
-    .locals_dict = (mp_obj_t)&pyb_uart_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    pyb_uart_type,
+    MP_QSTR_UART,
+    MP_TYPE_FLAG_NONE,
+    pyb_uart_make_new,
+    print, pyb_uart_print,
+    getiter, mp_identity_getiter,
+    iternext, mp_stream_unbuffered_iter,
+    protocol, &uart_stream_p,
+    locals_dict, (mp_obj_t)&pyb_uart_locals_dict
+    );
 
 MP_REGISTER_ROOT_POINTER(struct _pyb_uart_obj_t *pyb_uart_objs[2]);
diff --git a/ports/cc3200/mods/pybwdt.c b/ports/cc3200/mods/pybwdt.c
index 8db096d6b5fcb..cde1abe59d896 100644
--- a/ports/cc3200/mods/pybwdt.c
+++ b/ports/cc3200/mods/pybwdt.c
@@ -150,10 +150,11 @@ STATIC const mp_rom_map_elem_t pybwdt_locals_dict_table[] = {
 };
 STATIC MP_DEFINE_CONST_DICT(pybwdt_locals_dict, pybwdt_locals_dict_table);
 
-const mp_obj_type_t pyb_wdt_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_WDT,
-    .make_new = pyb_wdt_make_new,
-    .locals_dict = (mp_obj_t)&pybwdt_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    pyb_wdt_type,
+    MP_QSTR_WDT,
+    MP_TYPE_FLAG_NONE,
+    pyb_wdt_make_new,
+    locals_dict, (mp_obj_t)&pybwdt_locals_dict
+    );
 
diff --git a/ports/esp32/esp32_nvs.c b/ports/esp32/esp32_nvs.c
index 42d65be4a63b2..1f96ad129d11a 100644
--- a/ports/esp32/esp32_nvs.c
+++ b/ports/esp32/esp32_nvs.c
@@ -141,10 +141,11 @@ STATIC const mp_rom_map_elem_t esp32_nvs_locals_dict_table[] = {
 };
 STATIC MP_DEFINE_CONST_DICT(esp32_nvs_locals_dict, esp32_nvs_locals_dict_table);
 
-const mp_obj_type_t esp32_nvs_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_NVS,
-    .print = esp32_nvs_print,
-    .make_new = esp32_nvs_make_new,
-    .locals_dict = (mp_obj_dict_t *)&esp32_nvs_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    esp32_nvs_type,
+    MP_QSTR_NVS,
+    MP_TYPE_FLAG_NONE,
+    esp32_nvs_make_new,
+    print, esp32_nvs_print,
+    locals_dict, (mp_obj_dict_t *)&esp32_nvs_locals_dict
+    );
diff --git a/ports/esp32/esp32_partition.c b/ports/esp32/esp32_partition.c
index 47e769486c9b4..2e42e7a81903e 100644
--- a/ports/esp32/esp32_partition.c
+++ b/ports/esp32/esp32_partition.c
@@ -284,10 +284,11 @@ STATIC const mp_rom_map_elem_t esp32_partition_locals_dict_table[] = {
 };
 STATIC MP_DEFINE_CONST_DICT(esp32_partition_locals_dict, esp32_partition_locals_dict_table);
 
-const mp_obj_type_t esp32_partition_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_Partition,
-    .print = esp32_partition_print,
-    .make_new = esp32_partition_make_new,
-    .locals_dict = (mp_obj_dict_t *)&esp32_partition_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    esp32_partition_type,
+    MP_QSTR_Partition,
+    MP_TYPE_FLAG_NONE,
+    esp32_partition_make_new,
+    print, esp32_partition_print,
+    locals_dict, (mp_obj_dict_t *)&esp32_partition_locals_dict
+    );
diff --git a/ports/esp32/esp32_rmt.c b/ports/esp32/esp32_rmt.c
index ac897e33368a3..36f33df3f5d44 100644
--- a/ports/esp32/esp32_rmt.c
+++ b/ports/esp32/esp32_rmt.c
@@ -372,10 +372,11 @@ STATIC const mp_rom_map_elem_t esp32_rmt_locals_dict_table[] = {
 };
 STATIC MP_DEFINE_CONST_DICT(esp32_rmt_locals_dict, esp32_rmt_locals_dict_table);
 
-const mp_obj_type_t esp32_rmt_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_RMT,
-    .print = esp32_rmt_print,
-    .make_new = esp32_rmt_make_new,
-    .locals_dict = (mp_obj_dict_t *)&esp32_rmt_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    esp32_rmt_type,
+    MP_QSTR_RMT,
+    MP_TYPE_FLAG_NONE,
+    esp32_rmt_make_new,
+    print, esp32_rmt_print,
+    locals_dict, (mp_obj_dict_t *)&esp32_rmt_locals_dict
+    );
diff --git a/ports/esp32/esp32_ulp.c b/ports/esp32/esp32_ulp.c
index 8e4ce9c5a41b9..5eb0e5591e7e0 100644
--- a/ports/esp32/esp32_ulp.c
+++ b/ports/esp32/esp32_ulp.c
@@ -91,11 +91,12 @@ STATIC const mp_rom_map_elem_t esp32_ulp_locals_dict_table[] = {
 };
 STATIC MP_DEFINE_CONST_DICT(esp32_ulp_locals_dict, esp32_ulp_locals_dict_table);
 
-const mp_obj_type_t esp32_ulp_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_ULP,
-    .make_new = esp32_ulp_make_new,
-    .locals_dict = (mp_obj_t)&esp32_ulp_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    esp32_ulp_type,
+    MP_QSTR_ULP,
+    MP_TYPE_FLAG_NONE,
+    esp32_ulp_make_new,
+    locals_dict, (mp_obj_t)&esp32_ulp_locals_dict
+    );
 
 #endif // CONFIG_IDF_TARGET_ESP32
diff --git a/ports/esp32/machine_adc.c b/ports/esp32/machine_adc.c
index cb45aab33910c..5cc2d80384915 100644
--- a/ports/esp32/machine_adc.c
+++ b/ports/esp32/machine_adc.c
@@ -256,10 +256,11 @@ STATIC const mp_rom_map_elem_t madc_locals_dict_table[] = {
 };
 STATIC MP_DEFINE_CONST_DICT(madc_locals_dict, madc_locals_dict_table);
 
-const mp_obj_type_t machine_adc_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_ADC,
-    .print = madc_print,
-    .make_new = madc_make_new,
-    .locals_dict = (mp_obj_t)&madc_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    machine_adc_type,
+    MP_QSTR_ADC,
+    MP_TYPE_FLAG_NONE,
+    madc_make_new,
+    print, madc_print,
+    locals_dict, (mp_obj_t)&madc_locals_dict
+    );
diff --git a/ports/esp32/machine_adcblock.c b/ports/esp32/machine_adcblock.c
index 06c215f8ae73d..770839e93e1b1 100644
--- a/ports/esp32/machine_adcblock.c
+++ b/ports/esp32/machine_adcblock.c
@@ -194,10 +194,11 @@ STATIC const mp_rom_map_elem_t madcblock_locals_dict_table[] = {
 };
 STATIC MP_DEFINE_CONST_DICT(madcblock_locals_dict, madcblock_locals_dict_table);
 
-const mp_obj_type_t machine_adcblock_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_ADCBlock,
-    .print = madcblock_print,
-    .make_new = madcblock_make_new,
-    .locals_dict = (mp_obj_t)&madcblock_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    machine_adcblock_type,
+    MP_QSTR_ADCBlock,
+    MP_TYPE_FLAG_NONE,
+    madcblock_make_new,
+    print, madcblock_print,
+    locals_dict, (mp_obj_dict_t *)&madcblock_locals_dict
+    );
diff --git a/ports/esp32/machine_dac.c b/ports/esp32/machine_dac.c
index 35826d4a99a8b..c9b9c14e01e77 100644
--- a/ports/esp32/machine_dac.c
+++ b/ports/esp32/machine_dac.c
@@ -104,12 +104,13 @@ STATIC const mp_rom_map_elem_t mdac_locals_dict_table[] = {
 
 STATIC MP_DEFINE_CONST_DICT(mdac_locals_dict, mdac_locals_dict_table);
 
-const mp_obj_type_t machine_dac_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_DAC,
-    .print = mdac_print,
-    .make_new = mdac_make_new,
-    .locals_dict = (mp_obj_t)&mdac_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    machine_dac_type,
+    MP_QSTR_DAC,
+    MP_TYPE_FLAG_NONE,
+    mdac_make_new,
+    print, mdac_print,
+    locals_dict, (mp_obj_t)&mdac_locals_dict
+    );
 
 #endif // MICROPY_PY_MACHINE_DAC
diff --git a/ports/esp32/machine_hw_spi.c b/ports/esp32/machine_hw_spi.c
index 3e720adb1a5e2..71583ef60e900 100644
--- a/ports/esp32/machine_hw_spi.c
+++ b/ports/esp32/machine_hw_spi.c
@@ -545,11 +545,12 @@ STATIC const mp_machine_spi_p_t machine_hw_spi_p = {
     .transfer = machine_hw_spi_transfer,
 };
 
-const mp_obj_type_t machine_hw_spi_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_SPI,
-    .print = machine_hw_spi_print,
-    .make_new = machine_hw_spi_make_new,
-    .protocol = &machine_hw_spi_p,
-    .locals_dict = (mp_obj_dict_t *)&mp_machine_spi_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    machine_hw_spi_type,
+    MP_QSTR_SPI,
+    MP_TYPE_FLAG_NONE,
+    machine_hw_spi_make_new,
+    print, machine_hw_spi_print,
+    protocol, &machine_hw_spi_p,
+    locals_dict, (mp_obj_dict_t *)&mp_machine_spi_locals_dict
+    );
diff --git a/ports/esp32/machine_i2c.c b/ports/esp32/machine_i2c.c
index e25cad0b60a52..9e5be606dbf99 100644
--- a/ports/esp32/machine_i2c.c
+++ b/ports/esp32/machine_i2c.c
@@ -192,11 +192,12 @@ STATIC const mp_machine_i2c_p_t machine_hw_i2c_p = {
     .transfer = machine_hw_i2c_transfer,
 };
 
-const mp_obj_type_t machine_hw_i2c_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_I2C,
-    .print = machine_hw_i2c_print,
-    .make_new = machine_hw_i2c_make_new,
-    .protocol = &machine_hw_i2c_p,
-    .locals_dict = (mp_obj_dict_t *)&mp_machine_i2c_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    machine_hw_i2c_type,
+    MP_QSTR_I2C,
+    MP_TYPE_FLAG_NONE,
+    machine_hw_i2c_make_new,
+    print, machine_hw_i2c_print,
+    protocol, &machine_hw_i2c_p,
+    locals_dict, (mp_obj_dict_t *)&mp_machine_i2c_locals_dict
+    );
diff --git a/ports/esp32/machine_i2s.c b/ports/esp32/machine_i2s.c
index 933e68684b9e2..d30fb5d836e7b 100644
--- a/ports/esp32/machine_i2s.c
+++ b/ports/esp32/machine_i2s.c
@@ -829,16 +829,17 @@ STATIC const mp_stream_p_t i2s_stream_p = {
     .is_text = false,
 };
 
-const mp_obj_type_t machine_i2s_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_I2S,
-    .print = machine_i2s_print,
-    .getiter = mp_identity_getiter,
-    .iternext = mp_stream_unbuffered_iter,
-    .protocol = &i2s_stream_p,
-    .make_new = machine_i2s_make_new,
-    .locals_dict = (mp_obj_dict_t *)&machine_i2s_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    machine_i2s_type,
+    MP_QSTR_I2S,
+    MP_TYPE_FLAG_NONE,
+    machine_i2s_make_new,
+    print, machine_i2s_print,
+    getiter, mp_identity_getiter,
+    iternext, mp_stream_unbuffered_iter,
+    protocol, &i2s_stream_p,
+    locals_dict, (mp_obj_dict_t *)&machine_i2s_locals_dict
+    );
 
 MP_REGISTER_ROOT_POINTER(struct _machine_i2s_obj_t *machine_i2s_obj[I2S_NUM_MAX]);
 
diff --git a/ports/esp32/machine_pin.c b/ports/esp32/machine_pin.c
index b57562633878d..1a1a3a0f8d170 100644
--- a/ports/esp32/machine_pin.c
+++ b/ports/esp32/machine_pin.c
@@ -529,15 +529,16 @@ STATIC const mp_pin_p_t pin_pin_p = {
     .ioctl = pin_ioctl,
 };
 
-const mp_obj_type_t machine_pin_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_Pin,
-    .print = machine_pin_print,
-    .make_new = mp_pin_make_new,
-    .call = machine_pin_call,
-    .protocol = &pin_pin_p,
-    .locals_dict = (mp_obj_t)&machine_pin_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    machine_pin_type,
+    MP_QSTR_Pin,
+    MP_TYPE_FLAG_NONE,
+    mp_pin_make_new,
+    print, machine_pin_print,
+    call, machine_pin_call,
+    protocol, &pin_pin_p,
+    locals_dict, (mp_obj_t)&machine_pin_locals_dict
+    );
 
 /******************************************************************************/
 // Pin IRQ object
@@ -723,11 +724,13 @@ STATIC const mp_rom_map_elem_t machine_pin_irq_locals_dict_table[] = {
 };
 STATIC MP_DEFINE_CONST_DICT(machine_pin_irq_locals_dict, machine_pin_irq_locals_dict_table);
 
-STATIC const mp_obj_type_t machine_pin_irq_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_IRQ,
-    .call = machine_pin_irq_call,
-    .locals_dict = (mp_obj_dict_t *)&machine_pin_irq_locals_dict,
-};
+STATIC MP_DEFINE_CONST_OBJ_TYPE(
+    machine_pin_irq_type,
+    MP_QSTR_IRQ,
+    MP_TYPE_FLAG_NONE,
+    MP_TYPE_NULL_MAKE_NEW,
+    call, machine_pin_irq_call,
+    locals_dict, (mp_obj_dict_t *)&machine_pin_irq_locals_dict
+    );
 
 MP_REGISTER_ROOT_POINTER(mp_obj_t machine_pin_irq_handler[40]);
diff --git a/ports/esp32/machine_rtc.c b/ports/esp32/machine_rtc.c
index 72d7b5c8280aa..6634bf5b03b9b 100644
--- a/ports/esp32/machine_rtc.c
+++ b/ports/esp32/machine_rtc.c
@@ -173,9 +173,10 @@ STATIC const mp_rom_map_elem_t machine_rtc_locals_dict_table[] = {
 };
 STATIC MP_DEFINE_CONST_DICT(machine_rtc_locals_dict, machine_rtc_locals_dict_table);
 
-const mp_obj_type_t machine_rtc_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_RTC,
-    .make_new = machine_rtc_make_new,
-    .locals_dict = (mp_obj_t)&machine_rtc_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    machine_rtc_type,
+    MP_QSTR_RTC,
+    MP_TYPE_FLAG_NONE,
+    machine_rtc_make_new,
+    locals_dict, (mp_obj_t)&machine_rtc_locals_dict
+    );
diff --git a/ports/esp32/machine_sdcard.c b/ports/esp32/machine_sdcard.c
index 3f94356adbb4c..2d5663d476e8f 100644
--- a/ports/esp32/machine_sdcard.c
+++ b/ports/esp32/machine_sdcard.c
@@ -399,11 +399,12 @@ STATIC const mp_rom_map_elem_t machine_sdcard_locals_dict_table[] = {
 
 STATIC MP_DEFINE_CONST_DICT(machine_sdcard_locals_dict, machine_sdcard_locals_dict_table);
 
-const mp_obj_type_t machine_sdcard_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_SDCard,
-    .make_new = machine_sdcard_make_new,
-    .locals_dict = (mp_obj_dict_t *)&machine_sdcard_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    machine_sdcard_type,
+    MP_QSTR_SDCard,
+    MP_TYPE_FLAG_NONE,
+    machine_sdcard_make_new,
+    locals_dict, (mp_obj_dict_t *)&machine_sdcard_locals_dict
+    );
 
 #endif // MICROPY_HW_ENABLE_SDCARD
diff --git a/ports/esp32/machine_timer.c b/ports/esp32/machine_timer.c
index 66969b3a954f2..3b1295095593e 100644
--- a/ports/esp32/machine_timer.c
+++ b/ports/esp32/machine_timer.c
@@ -277,12 +277,13 @@ STATIC const mp_rom_map_elem_t machine_timer_locals_dict_table[] = {
 };
 STATIC MP_DEFINE_CONST_DICT(machine_timer_locals_dict, machine_timer_locals_dict_table);
 
-const mp_obj_type_t machine_timer_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_Timer,
-    .print = machine_timer_print,
-    .make_new = machine_timer_make_new,
-    .locals_dict = (mp_obj_t)&machine_timer_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    machine_timer_type,
+    MP_QSTR_Timer,
+    MP_TYPE_FLAG_NONE,
+    machine_timer_make_new,
+    print, machine_timer_print,
+    locals_dict, (mp_obj_t)&machine_timer_locals_dict
+    );
 
 MP_REGISTER_ROOT_POINTER(struct _machine_timer_obj_t *machine_timer_obj_head);
diff --git a/ports/esp32/machine_touchpad.c b/ports/esp32/machine_touchpad.c
index 168ac16d0eef6..c5e3483b74a08 100644
--- a/ports/esp32/machine_touchpad.c
+++ b/ports/esp32/machine_touchpad.c
@@ -134,11 +134,12 @@ STATIC const mp_rom_map_elem_t mtp_locals_dict_table[] = {
 
 STATIC MP_DEFINE_CONST_DICT(mtp_locals_dict, mtp_locals_dict_table);
 
-const mp_obj_type_t machine_touchpad_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_TouchPad,
-    .make_new = mtp_make_new,
-    .locals_dict = (mp_obj_t)&mtp_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    machine_touchpad_type,
+    MP_QSTR_TouchPad,
+    MP_TYPE_FLAG_NONE,
+    mtp_make_new,
+    locals_dict, (mp_obj_t)&mtp_locals_dict
+    );
 
 #endif // CONFIG_IDF_TARGET_ESP32
diff --git a/ports/esp32/machine_uart.c b/ports/esp32/machine_uart.c
index 72445912897f5..9df16ae419837 100644
--- a/ports/esp32/machine_uart.c
+++ b/ports/esp32/machine_uart.c
@@ -530,13 +530,14 @@ STATIC const mp_stream_p_t uart_stream_p = {
     .is_text = false,
 };
 
-const mp_obj_type_t machine_uart_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_UART,
-    .print = machine_uart_print,
-    .make_new = machine_uart_make_new,
-    .getiter = mp_identity_getiter,
-    .iternext = mp_stream_unbuffered_iter,
-    .protocol = &uart_stream_p,
-    .locals_dict = (mp_obj_dict_t *)&machine_uart_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    machine_uart_type,
+    MP_QSTR_UART,
+    MP_TYPE_FLAG_NONE,
+    machine_uart_make_new,
+    print, machine_uart_print,
+    getiter, mp_identity_getiter,
+    iternext, mp_stream_unbuffered_iter,
+    protocol, &uart_stream_p,
+    locals_dict, (mp_obj_dict_t *)&machine_uart_locals_dict
+    );
diff --git a/ports/esp32/machine_wdt.c b/ports/esp32/machine_wdt.c
index f0ec6928e05df..c2898c7fe1586 100644
--- a/ports/esp32/machine_wdt.c
+++ b/ports/esp32/machine_wdt.c
@@ -83,9 +83,10 @@ STATIC const mp_rom_map_elem_t machine_wdt_locals_dict_table[] = {
 };
 STATIC MP_DEFINE_CONST_DICT(machine_wdt_locals_dict, machine_wdt_locals_dict_table);
 
-const mp_obj_type_t machine_wdt_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_WDT,
-    .make_new = machine_wdt_make_new,
-    .locals_dict = (mp_obj_t)&machine_wdt_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    machine_wdt_type,
+    MP_QSTR_WDT,
+    MP_TYPE_FLAG_NONE,
+    machine_wdt_make_new,
+    locals_dict, (mp_obj_t)&machine_wdt_locals_dict
+    );
diff --git a/ports/esp32/modsocket.c b/ports/esp32/modsocket.c
index a281558241dca..a2dcb3946ceaa 100644
--- a/ports/esp32/modsocket.c
+++ b/ports/esp32/modsocket.c
@@ -785,13 +785,14 @@ STATIC const mp_stream_p_t socket_stream_p = {
     .ioctl = socket_stream_ioctl
 };
 
-STATIC const mp_obj_type_t socket_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_socket,
-    .make_new = socket_make_new,
-    .protocol = &socket_stream_p,
-    .locals_dict = (mp_obj_t)&socket_locals_dict,
-};
+STATIC MP_DEFINE_CONST_OBJ_TYPE(
+    socket_type,
+    MP_QSTR_socket,
+    MP_TYPE_FLAG_NONE,
+    socket_make_new,
+    protocol, &socket_stream_p,
+    locals_dict, (mp_obj_t)&socket_locals_dict
+    );
 
 STATIC mp_obj_t esp_socket_getaddrinfo(size_t n_args, const mp_obj_t *args) {
     // TODO support additional args beyond the first two
diff --git a/ports/esp32/network_lan.c b/ports/esp32/network_lan.c
index f302d70fec1d5..fc50e13c48edc 100644
--- a/ports/esp32/network_lan.c
+++ b/ports/esp32/network_lan.c
@@ -302,10 +302,12 @@ STATIC const mp_rom_map_elem_t lan_if_locals_dict_table[] = {
 
 STATIC MP_DEFINE_CONST_DICT(lan_if_locals_dict, lan_if_locals_dict_table);
 
-const mp_obj_type_t lan_if_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_LAN,
-    .locals_dict = (mp_obj_dict_t *)&lan_if_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    lan_if_type,
+    MP_QSTR_LAN,
+    MP_TYPE_FLAG_NONE,
+    MP_TYPE_NULL_MAKE_NEW,
+    locals_dict, (mp_obj_dict_t *)&lan_if_locals_dict
+    );
 
 #endif
diff --git a/ports/esp32/network_ppp.c b/ports/esp32/network_ppp.c
index d74283c19cf63..d6368d9f2038b 100644
--- a/ports/esp32/network_ppp.c
+++ b/ports/esp32/network_ppp.c
@@ -278,8 +278,10 @@ STATIC const mp_rom_map_elem_t ppp_if_locals_dict_table[] = {
 };
 STATIC MP_DEFINE_CONST_DICT(ppp_if_locals_dict, ppp_if_locals_dict_table);
 
-const mp_obj_type_t ppp_if_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_PPP,
-    .locals_dict = (mp_obj_dict_t *)&ppp_if_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    ppp_if_type,
+    MP_QSTR_PPP,
+    MP_TYPE_FLAG_NONE,
+    MP_TYPE_NULL_MAKE_NEW,
+    locals_dict, (mp_obj_dict_t *)&ppp_if_locals_dict
+    );
diff --git a/ports/esp32/network_wlan.c b/ports/esp32/network_wlan.c
index 4f74262afc381..6ca5f9a9bafea 100644
--- a/ports/esp32/network_wlan.c
+++ b/ports/esp32/network_wlan.c
@@ -47,9 +47,8 @@
 #error WIFI_MODE_STA and WIFI_MODE_AP are supposed to be bitfields!
 #endif
 
-STATIC const mp_obj_type_t wlan_if_type;
-STATIC const wlan_if_obj_t wlan_sta_obj = {{&wlan_if_type}, WIFI_IF_STA};
-STATIC const wlan_if_obj_t wlan_ap_obj = {{&wlan_if_type}, WIFI_IF_AP};
+STATIC const wlan_if_obj_t wlan_sta_obj;
+STATIC const wlan_if_obj_t wlan_ap_obj;
 
 // Set to "true" if esp_wifi_start() was called
 static bool wifi_started = false;
@@ -616,10 +615,15 @@ STATIC const mp_rom_map_elem_t wlan_if_locals_dict_table[] = {
 };
 STATIC MP_DEFINE_CONST_DICT(wlan_if_locals_dict, wlan_if_locals_dict_table);
 
-STATIC const mp_obj_type_t wlan_if_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_WLAN,
-    .locals_dict = (mp_obj_t)&wlan_if_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    wlan_if_type,
+    MP_QSTR_WLAN,
+    MP_TYPE_FLAG_NONE,
+    MP_TYPE_NULL_MAKE_NEW,
+    locals_dict, (mp_obj_dict_t *)&wlan_if_locals_dict
+    );
+
+STATIC const wlan_if_obj_t wlan_sta_obj = {{&wlan_if_type}, WIFI_IF_STA};
+STATIC const wlan_if_obj_t wlan_ap_obj = {{&wlan_if_type}, WIFI_IF_AP};
 
 #endif // MICROPY_PY_NETWORK_WLAN
diff --git a/ports/esp8266/machine_adc.c b/ports/esp8266/machine_adc.c
index 471e14d8dfbed..bface7f7e155c 100644
--- a/ports/esp8266/machine_adc.c
+++ b/ports/esp8266/machine_adc.c
@@ -89,10 +89,11 @@ STATIC const mp_rom_map_elem_t machine_adc_locals_dict_table[] = {
 };
 STATIC MP_DEFINE_CONST_DICT(machine_adc_locals_dict, machine_adc_locals_dict_table);
 
-const mp_obj_type_t machine_adc_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_ADC,
-    .print = machine_adc_print,
-    .make_new = machine_adc_make_new,
-    .locals_dict = (mp_obj_dict_t *)&machine_adc_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    machine_adc_type,
+    MP_QSTR_ADC,
+    MP_TYPE_FLAG_NONE,
+    machine_adc_make_new,
+    print, machine_adc_print,
+    locals_dict, (mp_obj_dict_t *)&machine_adc_locals_dict
+    );
diff --git a/ports/esp8266/machine_hspi.c b/ports/esp8266/machine_hspi.c
index 3ff76f5a02e04..c0d4a677e3ef5 100644
--- a/ports/esp8266/machine_hspi.c
+++ b/ports/esp8266/machine_hspi.c
@@ -175,13 +175,14 @@ STATIC const mp_machine_spi_p_t machine_hspi_p = {
     .transfer = machine_hspi_transfer,
 };
 
-const mp_obj_type_t machine_hspi_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_HSPI,
-    .print = machine_hspi_print,
-    .make_new = machine_hspi_make_new,
-    .protocol = &machine_hspi_p,
-    .locals_dict = (mp_obj_dict_t *)&mp_machine_spi_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    machine_hspi_type,
+    MP_QSTR_HSPI,
+    MP_TYPE_FLAG_NONE,
+    machine_hspi_make_new,
+    print, machine_hspi_print,
+    protocol, &machine_hspi_p,
+    locals_dict, (mp_obj_dict_t *)&mp_machine_spi_locals_dict
+    );
 
 #endif // MICROPY_PY_MACHINE_SPI
diff --git a/ports/esp8266/machine_pin.c b/ports/esp8266/machine_pin.c
index 8171b8a8a3e35..8b759766cd6f7 100644
--- a/ports/esp8266/machine_pin.c
+++ b/ports/esp8266/machine_pin.c
@@ -450,15 +450,16 @@ STATIC const mp_pin_p_t pin_pin_p = {
     .ioctl = pin_ioctl,
 };
 
-const mp_obj_type_t pyb_pin_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_Pin,
-    .print = pyb_pin_print,
-    .make_new = mp_pin_make_new,
-    .call = pyb_pin_call,
-    .protocol = &pin_pin_p,
-    .locals_dict = (mp_obj_dict_t *)&pyb_pin_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    pyb_pin_type,
+    MP_QSTR_Pin,
+    MP_TYPE_FLAG_NONE,
+    mp_pin_make_new,
+    print, pyb_pin_print,
+    call, pyb_pin_call,
+    protocol, &pin_pin_p,
+    locals_dict, (mp_obj_dict_t *)&pyb_pin_locals_dict
+    );
 
 /******************************************************************************/
 // Pin IRQ object
@@ -509,11 +510,13 @@ STATIC const mp_rom_map_elem_t pin_irq_locals_dict_table[] = {
 
 STATIC MP_DEFINE_CONST_DICT(pin_irq_locals_dict, pin_irq_locals_dict_table);
 
-STATIC const mp_obj_type_t pin_irq_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_IRQ,
-    .call = pin_irq_call,
-    .locals_dict = (mp_obj_dict_t *)&pin_irq_locals_dict,
-};
+STATIC MP_DEFINE_CONST_OBJ_TYPE(
+    pin_irq_type,
+    MP_QSTR_IRQ,
+    MP_TYPE_FLAG_NONE,
+    MP_TYPE_NULL_MAKE_NEW,
+    call, pin_irq_call,
+    locals_dict, (mp_obj_dict_t *)&pin_irq_locals_dict
+    );
 
 MP_REGISTER_ROOT_POINTER(mp_obj_t pin_irq_handler[16]);
diff --git a/ports/esp8266/machine_rtc.c b/ports/esp8266/machine_rtc.c
index 38049ce724939..4235b325ef7a8 100644
--- a/ports/esp8266/machine_rtc.c
+++ b/ports/esp8266/machine_rtc.c
@@ -262,9 +262,10 @@ STATIC const mp_rom_map_elem_t pyb_rtc_locals_dict_table[] = {
 };
 STATIC MP_DEFINE_CONST_DICT(pyb_rtc_locals_dict, pyb_rtc_locals_dict_table);
 
-const mp_obj_type_t pyb_rtc_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_RTC,
-    .make_new = pyb_rtc_make_new,
-    .locals_dict = (mp_obj_dict_t *)&pyb_rtc_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    pyb_rtc_type,
+    MP_QSTR_RTC,
+    MP_TYPE_FLAG_NONE,
+    pyb_rtc_make_new,
+    locals_dict, (mp_obj_dict_t *)&pyb_rtc_locals_dict
+    );
diff --git a/ports/esp8266/machine_uart.c b/ports/esp8266/machine_uart.c
index 2fe6516dc7ced..82f5189388caf 100644
--- a/ports/esp8266/machine_uart.c
+++ b/ports/esp8266/machine_uart.c
@@ -343,15 +343,16 @@ STATIC const mp_stream_p_t uart_stream_p = {
     .is_text = false,
 };
 
-const mp_obj_type_t pyb_uart_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_UART,
-    .print = pyb_uart_print,
-    .make_new = pyb_uart_make_new,
-    .getiter = mp_identity_getiter,
-    .iternext = mp_stream_unbuffered_iter,
-    .protocol = &uart_stream_p,
-    .locals_dict = (mp_obj_dict_t *)&pyb_uart_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    pyb_uart_type,
+    MP_QSTR_UART,
+    MP_TYPE_FLAG_NONE,
+    pyb_uart_make_new,
+    print, pyb_uart_print,
+    getiter, mp_identity_getiter,
+    iternext, mp_stream_unbuffered_iter,
+    protocol, &uart_stream_p,
+    locals_dict, (mp_obj_dict_t *)&pyb_uart_locals_dict
+    );
 
 MP_REGISTER_ROOT_POINTER(byte * uart0_rxbuf);
diff --git a/ports/esp8266/machine_wdt.c b/ports/esp8266/machine_wdt.c
index b06e752277288..d8c32ddd1a1f3 100644
--- a/ports/esp8266/machine_wdt.c
+++ b/ports/esp8266/machine_wdt.c
@@ -69,9 +69,10 @@ STATIC const mp_rom_map_elem_t machine_wdt_locals_dict_table[] = {
 };
 STATIC MP_DEFINE_CONST_DICT(machine_wdt_locals_dict, machine_wdt_locals_dict_table);
 
-const mp_obj_type_t esp_wdt_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_WDT,
-    .make_new = machine_wdt_make_new,
-    .locals_dict = (mp_obj_dict_t *)&machine_wdt_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    esp_wdt_type,
+    MP_QSTR_WDT,
+    MP_TYPE_FLAG_NONE,
+    machine_wdt_make_new,
+    locals_dict, (mp_obj_dict_t *)&machine_wdt_locals_dict
+    );
diff --git a/ports/esp8266/modmachine.c b/ports/esp8266/modmachine.c
index 1dd87b9af8f74..2bb2c7bd7695f 100644
--- a/ports/esp8266/modmachine.c
+++ b/ports/esp8266/modmachine.c
@@ -337,13 +337,14 @@ STATIC const mp_rom_map_elem_t esp_timer_locals_dict_table[] = {
 };
 STATIC MP_DEFINE_CONST_DICT(esp_timer_locals_dict, esp_timer_locals_dict_table);
 
-const mp_obj_type_t esp_timer_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_Timer,
-    .print = esp_timer_print,
-    .make_new = esp_timer_make_new,
-    .locals_dict = (mp_obj_dict_t *)&esp_timer_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    esp_timer_type,
+    MP_QSTR_Timer,
+    MP_TYPE_FLAG_NONE,
+    esp_timer_make_new,
+    print, esp_timer_print,
+    locals_dict, (mp_obj_dict_t *)&esp_timer_locals_dict
+    );
 
 // this bit is unused in the Xtensa PS register
 #define ETS_LOOP_ITER_BIT (12)
diff --git a/ports/esp8266/modnetwork.c b/ports/esp8266/modnetwork.c
index 5240d3b320649..f78bf5da52eb1 100644
--- a/ports/esp8266/modnetwork.c
+++ b/ports/esp8266/modnetwork.c
@@ -510,11 +510,13 @@ STATIC const mp_rom_map_elem_t wlan_if_locals_dict_table[] = {
 
 STATIC MP_DEFINE_CONST_DICT(wlan_if_locals_dict, wlan_if_locals_dict_table);
 
-const mp_obj_type_t wlan_if_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_WLAN,
-    .locals_dict = (mp_obj_dict_t *)&wlan_if_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    wlan_if_type,
+    MP_QSTR_WLAN,
+    MP_TYPE_FLAG_NONE,
+    MP_TYPE_NULL_MAKE_NEW,
+    locals_dict, (mp_obj_dict_t *)&wlan_if_locals_dict
+    );
 
 STATIC mp_obj_t esp_phy_mode(size_t n_args, const mp_obj_t *args) {
     if (n_args == 0) {
diff --git a/ports/mimxrt/machine_adc.c b/ports/mimxrt/machine_adc.c
index aa4cc831e5613..cbac6b5734d21 100644
--- a/ports/mimxrt/machine_adc.c
+++ b/ports/mimxrt/machine_adc.c
@@ -117,13 +117,14 @@ STATIC const mp_rom_map_elem_t adc_locals_dict_table[] = {
 
 STATIC MP_DEFINE_CONST_DICT(adc_locals_dict, adc_locals_dict_table);
 
-const mp_obj_type_t machine_adc_type = {
-    {&mp_type_type},
-    .name = MP_QSTR_ADC,
-    .print = adc_obj_print,
-    .make_new = adc_obj_make_new,
-    .locals_dict = (mp_obj_dict_t *)&adc_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    machine_adc_type,
+    MP_QSTR_ADC,
+    MP_TYPE_FLAG_NONE,
+    adc_obj_make_new,
+    print, adc_obj_print,
+    locals_dict, (mp_obj_dict_t *)&adc_locals_dict
+    );
 
 void machine_adc_init(void) {
     for (int i = 1; i < sizeof(adc_bases) / sizeof(ADC_Type *); ++i) {
diff --git a/ports/mimxrt/machine_i2c.c b/ports/mimxrt/machine_i2c.c
index c10fcaddbe38c..b8b6b7bc63340 100644
--- a/ports/mimxrt/machine_i2c.c
+++ b/ports/mimxrt/machine_i2c.c
@@ -197,11 +197,12 @@ STATIC const mp_machine_i2c_p_t machine_i2c_p = {
     .transfer_single = machine_i2c_transfer_single,
 };
 
-const mp_obj_type_t machine_i2c_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_I2C,
-    .print = machine_i2c_print,
-    .make_new = machine_i2c_make_new,
-    .protocol = &machine_i2c_p,
-    .locals_dict = (mp_obj_dict_t *)&mp_machine_i2c_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    machine_i2c_type,
+    MP_QSTR_I2C,
+    MP_TYPE_FLAG_NONE,
+    machine_i2c_make_new,
+    print, machine_i2c_print,
+    protocol, &machine_i2c_p,
+    locals_dict, (mp_obj_dict_t *)&mp_machine_i2c_locals_dict
+    );
diff --git a/ports/mimxrt/machine_i2s.c b/ports/mimxrt/machine_i2s.c
index a5446c7ac3efa..68bf3a820f59f 100644
--- a/ports/mimxrt/machine_i2s.c
+++ b/ports/mimxrt/machine_i2s.c
@@ -1213,16 +1213,17 @@ STATIC const mp_stream_p_t i2s_stream_p = {
     .is_text = false,
 };
 
-const mp_obj_type_t machine_i2s_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_I2S,
-    .print = machine_i2s_print,
-    .getiter = mp_identity_getiter,
-    .iternext = mp_stream_unbuffered_iter,
-    .protocol = &i2s_stream_p,
-    .make_new = machine_i2s_make_new,
-    .locals_dict = (mp_obj_dict_t *)&machine_i2s_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    machine_i2s_type,
+    MP_QSTR_I2S,
+    MP_TYPE_FLAG_NONE,
+    machine_i2s_make_new,
+    print, machine_i2s_print,
+    getiter, mp_identity_getiter,
+    iternext, mp_stream_unbuffered_iter,
+    protocol, &i2s_stream_p,
+    locals_dict, (mp_obj_dict_t *)&machine_i2s_locals_dict
+    );
 
 MP_REGISTER_ROOT_POINTER(struct _machine_i2s_obj_t *machine_i2s_obj[MICROPY_HW_I2S_NUM]);
 
diff --git a/ports/mimxrt/machine_led.c b/ports/mimxrt/machine_led.c
index 4082eb34bbbfb..d766c8f3237a2 100644
--- a/ports/mimxrt/machine_led.c
+++ b/ports/mimxrt/machine_led.c
@@ -80,12 +80,13 @@ STATIC const mp_rom_map_elem_t led_locals_dict_table[] = {
 
 STATIC MP_DEFINE_CONST_DICT(led_locals_dict, led_locals_dict_table);
 
-const mp_obj_type_t machine_led_type = {
-    {&mp_type_type},
-    .name = MP_QSTR_LED,
-    .print = led_obj_print,
-    .make_new = led_obj_make_new,
-    .locals_dict = (mp_obj_dict_t *)&led_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    machine_led_type,
+    MP_QSTR_LED,
+    MP_TYPE_FLAG_NONE,
+    led_obj_make_new,
+    print, led_obj_print,
+    locals_dict, (mp_obj_dict_t *)&led_locals_dict
+    );
 
 #endif
diff --git a/ports/mimxrt/machine_pin.c b/ports/mimxrt/machine_pin.c
index 64066af0e16ce..7ec66d0eac95b 100644
--- a/ports/mimxrt/machine_pin.c
+++ b/ports/mimxrt/machine_pin.c
@@ -58,17 +58,21 @@ enum {
 };
 
 // Pin mapping dictionaries
-const mp_obj_type_t machine_pin_cpu_pins_obj_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_cpu,
-    .locals_dict = (mp_obj_t)&machine_pin_cpu_pins_locals_dict,
-};
-
-const mp_obj_type_t machine_pin_board_pins_obj_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_board,
-    .locals_dict = (mp_obj_t)&machine_pin_board_pins_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    machine_pin_cpu_pins_obj_type,
+    MP_QSTR_cpu,
+    MP_TYPE_FLAG_NONE,
+    MP_TYPE_NULL_MAKE_NEW,
+    locals_dict, (mp_obj_t)&machine_pin_cpu_pins_locals_dict
+    );
+
+MP_DEFINE_CONST_OBJ_TYPE(
+    machine_pin_board_pins_obj_type,
+    MP_QSTR_board,
+    MP_TYPE_FLAG_NONE,
+    MP_TYPE_NULL_MAKE_NEW,
+    locals_dict, (mp_obj_t)&machine_pin_board_pins_locals_dict
+    );
 
 STATIC const mp_irq_methods_t machine_pin_irq_methods;
 
@@ -396,7 +400,6 @@ STATIC const mp_rom_map_elem_t machine_pin_locals_dict_table[] = {
 };
 STATIC MP_DEFINE_CONST_DICT(machine_pin_locals_dict, machine_pin_locals_dict_table);
 
-
 STATIC mp_uint_t machine_pin_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_t arg, int *errcode) {
     (void)errcode;
     machine_pin_obj_t *self = self_in;
@@ -417,24 +420,26 @@ STATIC const mp_pin_p_t machine_pin_obj_protocol = {
     .ioctl = machine_pin_ioctl,
 };
 
-const mp_obj_type_t machine_pin_type = {
-    {&mp_type_type},
-    .name = MP_QSTR_Pin,
-    .print = machine_pin_obj_print,
-    .call = machine_pin_obj_call,
-    .make_new = mp_pin_make_new,
-    .protocol = &machine_pin_obj_protocol,
-    .locals_dict = (mp_obj_dict_t *)&machine_pin_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    machine_pin_type,
+    MP_QSTR_Pin,
+    MP_TYPE_FLAG_NONE,
+    mp_pin_make_new,
+    print, machine_pin_obj_print,
+    call, machine_pin_obj_call,
+    protocol, &machine_pin_obj_protocol,
+    locals_dict, (mp_obj_dict_t *)&machine_pin_locals_dict
+    );
 
 // FIXME: Create actual pin_af type!!!
-const mp_obj_type_t machine_pin_af_type = {
-    {&mp_type_type},
-    .name = MP_QSTR_PinAF,
-    .print = machine_pin_obj_print,
-    .make_new = mp_pin_make_new,
-    .locals_dict = (mp_obj_dict_t *)&machine_pin_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    machine_pin_af_type,
+    MP_QSTR_PinAF,
+    MP_TYPE_FLAG_NONE,
+    mp_pin_make_new,
+    print, machine_pin_obj_print,
+    locals_dict, (mp_obj_dict_t *)&machine_pin_locals_dict
+    );
 
 STATIC mp_uint_t machine_pin_irq_trigger(mp_obj_t self_in, mp_uint_t new_trigger) {
     machine_pin_obj_t *self = MP_OBJ_TO_PTR(self_in);
diff --git a/ports/mimxrt/machine_rtc.c b/ports/mimxrt/machine_rtc.c
index e0d33554b5594..5211027bdf807 100644
--- a/ports/mimxrt/machine_rtc.c
+++ b/ports/mimxrt/machine_rtc.c
@@ -166,9 +166,10 @@ STATIC const mp_rom_map_elem_t machine_rtc_locals_dict_table[] = {
 };
 STATIC MP_DEFINE_CONST_DICT(machine_rtc_locals_dict, machine_rtc_locals_dict_table);
 
-const mp_obj_type_t machine_rtc_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_RTC,
-    .make_new = machine_rtc_make_new,
-    .locals_dict = (mp_obj_t)&machine_rtc_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    machine_rtc_type,
+    MP_QSTR_RTC,
+    MP_TYPE_FLAG_NONE,
+    machine_rtc_make_new,
+    locals_dict, (mp_obj_t)&machine_rtc_locals_dict
+    );
diff --git a/ports/mimxrt/machine_sdcard.c b/ports/mimxrt/machine_sdcard.c
index 4a92aae00cefa..b7bdceef47edb 100644
--- a/ports/mimxrt/machine_sdcard.c
+++ b/ports/mimxrt/machine_sdcard.c
@@ -208,12 +208,13 @@ STATIC const mp_rom_map_elem_t sdcard_locals_dict_table[] = {
 };
 STATIC MP_DEFINE_CONST_DICT(sdcard_locals_dict, sdcard_locals_dict_table);
 
-const mp_obj_type_t machine_sdcard_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_SDCard,
-    .make_new = sdcard_obj_make_new,
-    .locals_dict = (mp_obj_dict_t *)&sdcard_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    machine_sdcard_type,
+    MP_QSTR_SDCard,
+    MP_TYPE_FLAG_NONE,
+    sdcard_obj_make_new,
+    locals_dict, (mp_obj_dict_t *)&sdcard_locals_dict
+    );
 
 void machine_sdcard_init0(void) {
     return;
diff --git a/ports/mimxrt/machine_spi.c b/ports/mimxrt/machine_spi.c
index 32bc77c34ddf6..ff3cf4fb2551d 100644
--- a/ports/mimxrt/machine_spi.c
+++ b/ports/mimxrt/machine_spi.c
@@ -251,11 +251,12 @@ STATIC const mp_machine_spi_p_t machine_spi_p = {
     .transfer = machine_spi_transfer,
 };
 
-const mp_obj_type_t machine_spi_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_SPI,
-    .print = machine_spi_print,
-    .make_new = machine_spi_make_new,
-    .protocol = &machine_spi_p,
-    .locals_dict = (mp_obj_dict_t *)&mp_machine_spi_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    machine_spi_type,
+    MP_QSTR_SPI,
+    MP_TYPE_FLAG_NONE,
+    machine_spi_make_new,
+    print, machine_spi_print,
+    protocol, &machine_spi_p,
+    locals_dict, (mp_obj_dict_t *)&mp_machine_spi_locals_dict
+    );
diff --git a/ports/mimxrt/machine_timer.c b/ports/mimxrt/machine_timer.c
index 62a560ebbfc4c..9612388486e31 100644
--- a/ports/mimxrt/machine_timer.c
+++ b/ports/mimxrt/machine_timer.c
@@ -211,12 +211,13 @@ STATIC const mp_rom_map_elem_t machine_timer_locals_dict_table[] = {
 };
 STATIC MP_DEFINE_CONST_DICT(machine_timer_locals_dict, machine_timer_locals_dict_table);
 
-const mp_obj_type_t machine_timer_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_Timer,
-    .print = machine_timer_print,
-    .make_new = machine_timer_make_new,
-    .locals_dict = (mp_obj_dict_t *)&machine_timer_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    machine_timer_type,
+    MP_QSTR_Timer,
+    MP_TYPE_FLAG_NONE,
+    machine_timer_make_new,
+    print, machine_timer_print,
+    locals_dict, (mp_obj_dict_t *)&machine_timer_locals_dict
+    );
 
 MP_REGISTER_ROOT_POINTER(struct _machine_timer_obj_t *timer_table[MICROPY_HW_PIT_NUM_CHANNELS]);
diff --git a/ports/mimxrt/machine_uart.c b/ports/mimxrt/machine_uart.c
index 83382a6cf2bc1..4bb518eab25e4 100644
--- a/ports/mimxrt/machine_uart.c
+++ b/ports/mimxrt/machine_uart.c
@@ -469,13 +469,14 @@ STATIC const mp_stream_p_t uart_stream_p = {
     .is_text = false,
 };
 
-const mp_obj_type_t machine_uart_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_UART,
-    .print = machine_uart_print,
-    .make_new = machine_uart_make_new,
-    .getiter = mp_identity_getiter,
-    .iternext = mp_stream_unbuffered_iter,
-    .protocol = &uart_stream_p,
-    .locals_dict = (mp_obj_dict_t *)&machine_uart_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    machine_uart_type,
+    MP_QSTR_UART,
+    MP_TYPE_FLAG_NONE,
+    machine_uart_make_new,
+    print, machine_uart_print,
+    getiter, mp_identity_getiter,
+    iternext, mp_stream_unbuffered_iter,
+    protocol, &uart_stream_p,
+    locals_dict, (mp_obj_dict_t *)&machine_uart_locals_dict
+    );
diff --git a/ports/mimxrt/machine_wdt.c b/ports/mimxrt/machine_wdt.c
index d09c464f69a3c..cde80f085b997 100644
--- a/ports/mimxrt/machine_wdt.c
+++ b/ports/mimxrt/machine_wdt.c
@@ -99,9 +99,10 @@ STATIC const mp_rom_map_elem_t machine_wdt_locals_dict_table[] = {
 };
 STATIC MP_DEFINE_CONST_DICT(machine_wdt_locals_dict, machine_wdt_locals_dict_table);
 
-const mp_obj_type_t machine_wdt_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_WDT,
-    .make_new = machine_wdt_make_new,
-    .locals_dict = (mp_obj_dict_t *)&machine_wdt_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    machine_wdt_type,
+    MP_QSTR_WDT,
+    MP_TYPE_FLAG_NONE,
+    machine_wdt_make_new,
+    locals_dict, (mp_obj_dict_t *)&machine_wdt_locals_dict
+    );
diff --git a/ports/mimxrt/mimxrt_flash.c b/ports/mimxrt/mimxrt_flash.c
index 27ab987ed17f2..1a7d6cca8da0e 100644
--- a/ports/mimxrt/mimxrt_flash.c
+++ b/ports/mimxrt/mimxrt_flash.c
@@ -215,9 +215,10 @@ STATIC const mp_rom_map_elem_t mimxrt_flash_locals_dict_table[] = {
 };
 STATIC MP_DEFINE_CONST_DICT(mimxrt_flash_locals_dict, mimxrt_flash_locals_dict_table);
 
-const mp_obj_type_t mimxrt_flash_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_Flash,
-    .make_new = mimxrt_flash_make_new,
-    .locals_dict = (mp_obj_dict_t *)&mimxrt_flash_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    mimxrt_flash_type,
+    MP_QSTR_Flash,
+    MP_TYPE_FLAG_NONE,
+    mimxrt_flash_make_new,
+    locals_dict, (mp_obj_dict_t *)&mimxrt_flash_locals_dict
+    );
diff --git a/ports/mimxrt/network_lan.c b/ports/mimxrt/network_lan.c
index 5517b54bd02f5..08c3c9e729f50 100644
--- a/ports/mimxrt/network_lan.c
+++ b/ports/mimxrt/network_lan.c
@@ -220,12 +220,14 @@ STATIC const mp_rom_map_elem_t network_lan_locals_dict_table[] = {
 };
 STATIC MP_DEFINE_CONST_DICT(network_lan_locals_dict, network_lan_locals_dict_table);
 
-const mp_obj_type_t network_lan_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_LAN,
-    .print = network_lan_print,
-    .make_new = network_lan_make_new,
-    .locals_dict = (mp_obj_dict_t *)&network_lan_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    network_lan_type,
+    MP_QSTR_LAN,
+    MP_TYPE_FLAG_NONE,
+    network_lan_make_new,
+    print, network_lan_print,
+    locals_dict, (mp_obj_dict_t *)&network_lan_locals_dict
+    );
+
 
 #endif // defined(MICROPY_HW_ETH_MDC)
diff --git a/ports/nrf/boards/microbit/modules/iters.c b/ports/nrf/boards/microbit/modules/iters.c
index 66f9f6c7f3ea0..296fc1f51c525 100644
--- a/ports/nrf/boards/microbit/modules/iters.c
+++ b/ports/nrf/boards/microbit/modules/iters.c
@@ -43,12 +43,14 @@ static mp_obj_t microbit_repeat_iter_next(mp_obj_t iter_in) {
     return mp_obj_subscr(iter->iterable, MP_OBJ_NEW_SMALL_INT(iter->index), MP_OBJ_SENTINEL);
 }
 
-const mp_obj_type_t microbit_repeat_iterator_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_iterator,
-    .getiter = mp_identity_getiter,
-    .iternext = microbit_repeat_iter_next,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    microbit_repeat_iterator_type,
+    MP_QSTR_iterator,
+    MP_TYPE_FLAG_NONE,
+    MP_TYPE_NULL_MAKE_NEW,
+    getiter, mp_identity_getiter,
+    iternext, microbit_repeat_iter_next
+    );
 
 mp_obj_t microbit_repeat_iterator(mp_obj_t iterable) {
     repeat_iterator_t *result = mp_obj_malloc(repeat_iterator_t, &microbit_repeat_iterator_type);
diff --git a/ports/nrf/boards/microbit/modules/microbitdisplay.c b/ports/nrf/boards/microbit/modules/microbitdisplay.c
index 93ba9772fe98c..084cb09524da7 100644
--- a/ports/nrf/boards/microbit/modules/microbitdisplay.c
+++ b/ports/nrf/boards/microbit/modules/microbitdisplay.c
@@ -542,11 +542,13 @@ STATIC const mp_rom_map_elem_t microbit_display_locals_dict_table[] = {
 
 STATIC MP_DEFINE_CONST_DICT(microbit_display_locals_dict, microbit_display_locals_dict_table);
 
-const mp_obj_type_t microbit_display_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_MicroBitDisplay,
-    .locals_dict = (mp_obj_dict_t*)&microbit_display_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    microbit_display_type,
+    MP_QSTR_MicroBitDisplay,
+    MP_TYPE_FLAG_NONE,
+    MP_TYPE_NULL_MAKE_NEW,
+    locals_dict, (mp_obj_dict_t*)&microbit_display_locals_dict
+    );
 
 microbit_display_obj_t microbit_display_obj = {
     {&microbit_display_type},
diff --git a/ports/nrf/boards/microbit/modules/microbitimage.c b/ports/nrf/boards/microbit/modules/microbitimage.c
index eb44660b974ce..95b17bb6d3396 100644
--- a/ports/nrf/boards/microbit/modules/microbitimage.c
+++ b/ports/nrf/boards/microbit/modules/microbitimage.c
@@ -678,14 +678,15 @@ STATIC mp_obj_t image_binary_op(mp_binary_op_t op, mp_obj_t lhs_in, mp_obj_t rhs
 }
 
 
-const mp_obj_type_t microbit_image_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_MicroBitImage,
-    .print = microbit_image_print,
-    .make_new = microbit_image_make_new,
-    .binary_op = image_binary_op,
-    .locals_dict = (mp_obj_dict_t*)&microbit_image_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    microbit_image_type,
+    MP_QSTR_MicroBitImage,
+    MP_TYPE_FLAG_NONE,
+    microbit_image_make_new,
+    print, microbit_image_print,
+    binary_op, image_binary_op,
+    locals_dict, (mp_obj_dict_t*)&microbit_image_locals_dict
+    );
 
 typedef struct _scrolling_string_t {
     mp_obj_base_t base;
@@ -820,18 +821,22 @@ STATIC mp_obj_t microbit_scrolling_string_iter_next(mp_obj_t o_in) {
     return iter->img;
 }
 
-const mp_obj_type_t microbit_scrolling_string_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_ScrollingString,
-    .getiter = get_microbit_scrolling_string_iter,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    microbit_scrolling_string_type,
+    MP_QSTR_ScrollingString,
+    MP_TYPE_FLAG_NONE,
+    MP_TYPE_NULL_MAKE_NEW,
+    getiter, get_microbit_scrolling_string_iter
+    );
 
-const mp_obj_type_t microbit_scrolling_string_iterator_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_iterator,
-    .getiter = mp_identity_getiter,
-    .iternext = microbit_scrolling_string_iter_next,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    microbit_scrolling_string_iterator_type,
+    MP_QSTR_iterator,
+    MP_TYPE_FLAG_NONE,
+    MP_TYPE_NULL_MAKE_NEW,
+    getiter, mp_identity_getiter,
+    iternext, microbit_scrolling_string_iter_next
+    );
 
 /** Facade types to present a string as a sequence of images.
  * These are necessary to avoid allocation during iteration,
@@ -869,13 +874,15 @@ static mp_obj_t facade_unary_op(mp_unary_op_t op, mp_obj_t self_in) {
 
 static mp_obj_t microbit_facade_iterator(mp_obj_t iterable_in, mp_obj_iter_buf_t *iter_buf);
 
-const mp_obj_type_t string_image_facade_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_Facade,
-    .unary_op = facade_unary_op,
-    .subscr = string_image_facade_subscr,
-    .getiter = microbit_facade_iterator,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    string_image_facade_type,
+    MP_QSTR_Facade,
+    MP_TYPE_FLAG_NONE,
+    MP_TYPE_NULL_MAKE_NEW,
+    unary_op, facade_unary_op,
+    subscr, string_image_facade_subscr,
+    getiter, microbit_facade_iterator
+    );
 
 
 typedef struct _facade_iterator_t {
@@ -904,12 +911,14 @@ static mp_obj_t microbit_facade_iter_next(mp_obj_t iter_in) {
     return iter->image;
 }
 
-const mp_obj_type_t microbit_facade_iterator_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_iterator,
-    .getiter = mp_identity_getiter,
-    .iternext = microbit_facade_iter_next,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    microbit_facade_iterator_type,
+    MP_QSTR_iterator,
+    MP_TYPE_FLAG_NONE,
+    MP_TYPE_NULL_MAKE_NEW,
+    getiter, mp_identity_getiter,
+    iternext, microbit_facade_iter_next
+    );
 
 mp_obj_t microbit_facade_iterator(mp_obj_t iterable_in, mp_obj_iter_buf_t *iter_buf) {
     (void)iter_buf;
diff --git a/ports/nrf/modules/board/led.c b/ports/nrf/modules/board/led.c
index cbfc330d63309..5eef8f0464021 100644
--- a/ports/nrf/modules/board/led.c
+++ b/ports/nrf/modules/board/led.c
@@ -194,13 +194,14 @@ STATIC const mp_rom_map_elem_t led_locals_dict_table[] = {
 
 STATIC MP_DEFINE_CONST_DICT(led_locals_dict, led_locals_dict_table);
 
-const mp_obj_type_t board_led_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_LED,
-    .print = led_obj_print,
-    .make_new = led_obj_make_new,
-    .locals_dict = (mp_obj_dict_t*)&led_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    board_led_type,
+    MP_QSTR_LED,
+    MP_TYPE_FLAG_NONE,
+    led_obj_make_new,
+    print, led_obj_print,
+    locals_dict, (mp_obj_dict_t*)&led_locals_dict
+    );
 
 #else
 // For boards with no LEDs, we leave an empty function here so that we don't
diff --git a/ports/nrf/modules/machine/adc.c b/ports/nrf/modules/machine/adc.c
index 54870d2c18ee8..5814dcaa392cf 100644
--- a/ports/nrf/modules/machine/adc.c
+++ b/ports/nrf/modules/machine/adc.c
@@ -294,12 +294,13 @@ STATIC const mp_rom_map_elem_t machine_adc_locals_dict_table[] = {
 
 STATIC MP_DEFINE_CONST_DICT(machine_adc_locals_dict, machine_adc_locals_dict_table);
 
-const mp_obj_type_t machine_adc_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_ADC,
-    .make_new = machine_adc_make_new,
-    .locals_dict = (mp_obj_dict_t*)&machine_adc_locals_dict,
-    .print = machine_adc_print,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    machine_adc_type,
+    MP_QSTR_ADC,
+    MP_TYPE_FLAG_NONE,
+    machine_adc_make_new,
+    locals_dict, (mp_obj_dict_t*)&machine_adc_locals_dict,
+    print, machine_adc_print
+    );
 
 #endif // MICROPY_PY_MACHINE_ADC
diff --git a/ports/nrf/modules/machine/i2c.c b/ports/nrf/modules/machine/i2c.c
index aac9320873207..8468684428a7c 100644
--- a/ports/nrf/modules/machine/i2c.c
+++ b/ports/nrf/modules/machine/i2c.c
@@ -161,13 +161,14 @@ STATIC const mp_machine_i2c_p_t machine_hard_i2c_p = {
     .transfer_single = machine_hard_i2c_transfer_single,
 };
 
-const mp_obj_type_t machine_hard_i2c_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_I2C,
-    .print = machine_hard_i2c_print,
-    .make_new = machine_hard_i2c_make_new,
-    .protocol = &machine_hard_i2c_p,
-    .locals_dict = (mp_obj_dict_t*)&mp_machine_i2c_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    machine_hard_i2c_type,
+    MP_QSTR_I2C,
+    MP_TYPE_FLAG_NONE,
+    machine_hard_i2c_make_new,
+    print, machine_hard_i2c_print,
+    protocol, &machine_hard_i2c_p,
+    locals_dict, (mp_obj_dict_t*)&mp_machine_i2c_locals_dict
+    );
 
 #endif // MICROPY_PY_MACHINE_I2C
diff --git a/ports/nrf/modules/machine/pin.c b/ports/nrf/modules/machine/pin.c
index 3a45c22d18ef2..835f6cf2bd32c 100644
--- a/ports/nrf/modules/machine/pin.c
+++ b/ports/nrf/modules/machine/pin.c
@@ -596,14 +596,15 @@ STATIC const mp_rom_map_elem_t pin_locals_dict_table[] = {
 
 STATIC MP_DEFINE_CONST_DICT(pin_locals_dict, pin_locals_dict_table);
 
-const mp_obj_type_t pin_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_Pin,
-    .print = pin_print,
-    .make_new = pin_make_new,
-    .call = pin_call,
-    .locals_dict = (mp_obj_dict_t*)&pin_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    pin_type,
+    MP_QSTR_Pin,
+    MP_TYPE_FLAG_NONE,
+    pin_make_new,
+    print, pin_print,
+    call, pin_call,
+    locals_dict, (mp_obj_dict_t*)&pin_locals_dict
+    );
 
 /// \moduleref machine
 /// \class PinAF - Pin Alternate Functions
@@ -671,12 +672,14 @@ STATIC const mp_rom_map_elem_t pin_af_locals_dict_table[] = {
 };
 STATIC MP_DEFINE_CONST_DICT(pin_af_locals_dict, pin_af_locals_dict_table);
 
-const mp_obj_type_t pin_af_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_PinAF,
-    .print = pin_af_obj_print,
-    .locals_dict = (mp_obj_dict_t*)&pin_af_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    pin_af_type,
+    MP_QSTR_PinAF,
+    MP_TYPE_FLAG_NONE,
+    MP_TYPE_NULL_MAKE_NEW,
+    print, pin_af_obj_print,
+    locals_dict, (mp_obj_dict_t*)&pin_af_locals_dict
+    );
 
 MP_REGISTER_ROOT_POINTER(mp_obj_t pin_class_mapper);
 MP_REGISTER_ROOT_POINTER(mp_obj_t pin_class_map_dict);
diff --git a/ports/nrf/modules/machine/pwm.c b/ports/nrf/modules/machine/pwm.c
index a750285841e24..d0ac0e9450c3c 100644
--- a/ports/nrf/modules/machine/pwm.c
+++ b/ports/nrf/modules/machine/pwm.c
@@ -339,12 +339,13 @@ STATIC mp_obj_t machine_hard_pwm_freq(mp_obj_t self_in, mp_arg_val_t *args) {
     return mp_const_none;
 }
 
-const mp_obj_type_t machine_hard_pwm_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_PWM,
-    .print = machine_pwm_print,
-    .make_new = machine_pwm_make_new,
-    .locals_dict = (mp_obj_dict_t*)&machine_pwm_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    machine_hard_pwm_type,
+    MP_QSTR_PWM,
+    MP_TYPE_FLAG_NONE,
+    machine_pwm_make_new,
+    print, machine_pwm_print,
+    locals_dict, (mp_obj_dict_t*)&machine_pwm_locals_dict
+    );
 
 #endif // MICROPY_PY_MACHINE_HW_PWM
diff --git a/ports/nrf/modules/machine/rtcounter.c b/ports/nrf/modules/machine/rtcounter.c
index c9f907774e6a3..3c48c4bb1fb2e 100644
--- a/ports/nrf/modules/machine/rtcounter.c
+++ b/ports/nrf/modules/machine/rtcounter.c
@@ -262,12 +262,13 @@ STATIC const mp_rom_map_elem_t machine_rtc_locals_dict_table[] = {
 
 STATIC MP_DEFINE_CONST_DICT(machine_rtc_locals_dict, machine_rtc_locals_dict_table);
 
-const mp_obj_type_t machine_rtcounter_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_RTCounter,
-    .print = rtc_print,
-    .make_new = machine_rtc_make_new,
-    .locals_dict = (mp_obj_dict_t*)&machine_rtc_locals_dict
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    machine_rtcounter_type,
+    MP_QSTR_RTCounter,
+    MP_TYPE_FLAG_NONE,
+    machine_rtc_make_new,
+    print, rtc_print,
+    locals_dict, (mp_obj_dict_t*)&machine_rtc_locals_dict
+    );
 
 #endif // MICROPY_PY_MACHINE_RTCOUNTER
diff --git a/ports/nrf/modules/machine/spi.c b/ports/nrf/modules/machine/spi.c
index 81bc151bebd63..22b0ff56e59ae 100644
--- a/ports/nrf/modules/machine/spi.c
+++ b/ports/nrf/modules/machine/spi.c
@@ -427,13 +427,14 @@ STATIC const mp_machine_spi_p_t machine_hard_spi_p = {
     .transfer = machine_hard_spi_transfer,
 };
 
-const mp_obj_type_t machine_hard_spi_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_SPI,
-    .print = machine_hard_spi_print,
-    .make_new = machine_spi_make_new,
-    .protocol = &machine_hard_spi_p,
-    .locals_dict = (mp_obj_dict_t*)&machine_spi_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    machine_hard_spi_type,
+    MP_QSTR_SPI,
+    MP_TYPE_FLAG_NONE,
+    machine_spi_make_new,
+    print, machine_hard_spi_print,
+    protocol, &machine_hard_spi_p,
+    locals_dict, (mp_obj_dict_t*)&machine_spi_locals_dict
+    );
 
 #endif // MICROPY_PY_MACHINE_HW_SPI
diff --git a/ports/nrf/modules/machine/temp.c b/ports/nrf/modules/machine/temp.c
index 1eb38c08d0bdc..1e21f11253fd2 100644
--- a/ports/nrf/modules/machine/temp.c
+++ b/ports/nrf/modules/machine/temp.c
@@ -112,12 +112,13 @@ STATIC const mp_rom_map_elem_t machine_temp_locals_dict_table[] = {
 
 STATIC MP_DEFINE_CONST_DICT(machine_temp_locals_dict, machine_temp_locals_dict_table);
 
-const mp_obj_type_t machine_temp_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_Temp,
-    .make_new = machine_temp_make_new,
-    .locals_dict = (mp_obj_dict_t*)&machine_temp_locals_dict,
-    .print = machine_temp_print,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    machine_temp_type,
+    MP_QSTR_Temp,
+    MP_TYPE_FLAG_NONE,
+    machine_temp_make_new,
+    locals_dict, (mp_obj_dict_t*)&machine_temp_locals_dict,
+    print, machine_temp_print
+    );
 
 #endif // MICROPY_PY_MACHINE_TEMP
diff --git a/ports/nrf/modules/machine/timer.c b/ports/nrf/modules/machine/timer.c
index c99713ef52c5d..3724881aa8131 100644
--- a/ports/nrf/modules/machine/timer.c
+++ b/ports/nrf/modules/machine/timer.c
@@ -234,12 +234,13 @@ STATIC const mp_rom_map_elem_t machine_timer_locals_dict_table[] = {
 
 STATIC MP_DEFINE_CONST_DICT(machine_timer_locals_dict, machine_timer_locals_dict_table);
 
-const mp_obj_type_t machine_timer_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_Timer,
-    .print = timer_print,
-    .make_new = machine_timer_make_new,
-    .locals_dict = (mp_obj_dict_t*)&machine_timer_locals_dict
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    machine_timer_type,
+    MP_QSTR_Timer,
+    MP_TYPE_FLAG_NONE,
+    machine_timer_make_new,
+    print, timer_print,
+    locals_dict, (mp_obj_dict_t*)&machine_timer_locals_dict
+    );
 
 #endif // MICROPY_PY_MACHINE_TIMER
diff --git a/ports/nrf/modules/machine/uart.c b/ports/nrf/modules/machine/uart.c
index 1fd2ccc06cafd..5c9ba83ab6626 100644
--- a/ports/nrf/modules/machine/uart.c
+++ b/ports/nrf/modules/machine/uart.c
@@ -370,15 +370,16 @@ STATIC const mp_stream_p_t uart_stream_p = {
     .is_text = false,
 };
 
-const mp_obj_type_t machine_hard_uart_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_UART,
-    .print = machine_hard_uart_print,
-    .make_new = machine_hard_uart_make_new,
-    .getiter = mp_identity_getiter,
-    .iternext = mp_stream_unbuffered_iter,
-    .protocol = &uart_stream_p,
-    .locals_dict = (mp_obj_dict_t*)&machine_hard_uart_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    machine_hard_uart_type,
+    MP_QSTR_UART,
+    MP_TYPE_FLAG_NONE,
+    machine_hard_uart_make_new,
+    print, machine_hard_uart_print,
+    getiter, mp_identity_getiter,
+    iternext, mp_stream_unbuffered_iter,
+    protocol, &uart_stream_p,
+    locals_dict, (mp_obj_dict_t*)&machine_hard_uart_locals_dict
+    );
 
 #endif // MICROPY_PY_MACHINE_UART
diff --git a/ports/nrf/modules/nrf/flashbdev.c b/ports/nrf/modules/nrf/flashbdev.c
index f63a9b46b29cf..b67e86d0d0dfd 100644
--- a/ports/nrf/modules/nrf/flashbdev.c
+++ b/ports/nrf/modules/nrf/flashbdev.c
@@ -183,13 +183,14 @@ STATIC mp_obj_t nrf_flashbdev_make_new(const mp_obj_type_t *type, size_t n_args,
     return MP_OBJ_FROM_PTR(self);
 }
 
-const mp_obj_type_t nrf_flashbdev_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_Flash,
-    .print = nrf_flashbdev_print,
-    .make_new = nrf_flashbdev_make_new,
-    .locals_dict = (mp_obj_dict_t *)&nrf_flashbdev_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    nrf_flashbdev_type,
+    MP_QSTR_Flash,
+    MP_TYPE_FLAG_NONE,
+    nrf_flashbdev_make_new,
+    print, nrf_flashbdev_print,
+    locals_dict, (mp_obj_dict_t *)&nrf_flashbdev_locals_dict
+    );
 
 void flashbdev_init(void) {
     // Set start to first aligned page from _fs_start.
diff --git a/ports/nrf/modules/ubluepy/ubluepy_characteristic.c b/ports/nrf/modules/ubluepy/ubluepy_characteristic.c
index a66483f60dad7..5544ac6aefedc 100644
--- a/ports/nrf/modules/ubluepy/ubluepy_characteristic.c
+++ b/ports/nrf/modules/ubluepy/ubluepy_characteristic.c
@@ -209,12 +209,13 @@ STATIC const mp_rom_map_elem_t ubluepy_characteristic_locals_dict_table[] = {
 
 STATIC MP_DEFINE_CONST_DICT(ubluepy_characteristic_locals_dict, ubluepy_characteristic_locals_dict_table);
 
-const mp_obj_type_t ubluepy_characteristic_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_Characteristic,
-    .print = ubluepy_characteristic_print,
-    .make_new = ubluepy_characteristic_make_new,
-    .locals_dict = (mp_obj_dict_t*)&ubluepy_characteristic_locals_dict
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    ubluepy_characteristic_type,
+    MP_QSTR_Characteristic,
+    MP_TYPE_FLAG_NONE,
+    ubluepy_characteristic_make_new,
+    print, ubluepy_characteristic_print,
+    locals_dict, (mp_obj_dict_t*)&ubluepy_characteristic_locals_dict
+    );
 
 #endif // MICROPY_PY_UBLUEPY_PERIPHERAL || MICROPY_PY_UBLUEPY_CENTRAL
diff --git a/ports/nrf/modules/ubluepy/ubluepy_constants.c b/ports/nrf/modules/ubluepy/ubluepy_constants.c
index 14e433e6ebff3..e4637c8cbce2e 100644
--- a/ports/nrf/modules/ubluepy/ubluepy_constants.c
+++ b/ports/nrf/modules/ubluepy/ubluepy_constants.c
@@ -69,11 +69,13 @@ STATIC const mp_rom_map_elem_t ubluepy_constants_ad_types_locals_dict_table[] =
 
 STATIC MP_DEFINE_CONST_DICT(ubluepy_constants_ad_types_locals_dict, ubluepy_constants_ad_types_locals_dict_table);
 
-const mp_obj_type_t ubluepy_constants_ad_types_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_ad_types,
-    .locals_dict = (mp_obj_dict_t*)&ubluepy_constants_ad_types_locals_dict
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    ubluepy_constants_ad_types_type,
+    MP_QSTR_ad_types,
+    MP_TYPE_FLAG_NONE,
+    MP_TYPE_NULL_MAKE_NEW,
+    locals_dict, (mp_obj_dict_t*)&ubluepy_constants_ad_types_locals_dict
+    );
 
 STATIC const mp_rom_map_elem_t ubluepy_constants_locals_dict_table[] = {
     // GAP events
@@ -90,10 +92,12 @@ STATIC const mp_rom_map_elem_t ubluepy_constants_locals_dict_table[] = {
 
 STATIC MP_DEFINE_CONST_DICT(ubluepy_constants_locals_dict, ubluepy_constants_locals_dict_table);
 
-const mp_obj_type_t ubluepy_constants_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_constants,
-    .locals_dict = (mp_obj_dict_t*)&ubluepy_constants_locals_dict
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    ubluepy_constants_type,
+    MP_QSTR_constants,
+    MP_TYPE_FLAG_NONE,
+    MP_TYPE_NULL_MAKE_NEW,
+    locals_dict, (mp_obj_dict_t*)&ubluepy_constants_locals_dict
+    );
 
 #endif // MICROPY_PY_UBLUEPY
diff --git a/ports/nrf/modules/ubluepy/ubluepy_delegate.c b/ports/nrf/modules/ubluepy/ubluepy_delegate.c
index 736bfbc9dd236..71648767e61d7 100644
--- a/ports/nrf/modules/ubluepy/ubluepy_delegate.c
+++ b/ports/nrf/modules/ubluepy/ubluepy_delegate.c
@@ -77,12 +77,13 @@ STATIC const mp_rom_map_elem_t ubluepy_delegate_locals_dict_table[] = {
 
 STATIC MP_DEFINE_CONST_DICT(ubluepy_delegate_locals_dict, ubluepy_delegate_locals_dict_table);
 
-const mp_obj_type_t ubluepy_delegate_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_DefaultDelegate,
-    .print = ubluepy_delegate_print,
-    .make_new = ubluepy_delegate_make_new,
-    .locals_dict = (mp_obj_dict_t*)&ubluepy_delegate_locals_dict
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    ubluepy_delegate_type,
+    MP_QSTR_DefaultDelegate,
+    MP_TYPE_FLAG_NONE,
+    ubluepy_delegate_make_new,
+    print, ubluepy_delegate_print,
+    locals_dict, (mp_obj_dict_t*)&ubluepy_delegate_locals_dict
+    );
 
 #endif // MICROPY_PY_UBLUEPY_PERIPHERAL || MICROPY_PY_UBLUEPY_CENTRAL
diff --git a/ports/nrf/modules/ubluepy/ubluepy_descriptor.c b/ports/nrf/modules/ubluepy/ubluepy_descriptor.c
index 370188f7fc7a8..07035460ae4d9 100644
--- a/ports/nrf/modules/ubluepy/ubluepy_descriptor.c
+++ b/ports/nrf/modules/ubluepy/ubluepy_descriptor.c
@@ -70,12 +70,13 @@ STATIC const mp_rom_map_elem_t ubluepy_descriptor_locals_dict_table[] = {
 
 STATIC MP_DEFINE_CONST_DICT(ubluepy_descriptor_locals_dict, ubluepy_descriptor_locals_dict_table);
 
-const mp_obj_type_t ubluepy_descriptor_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_Descriptor,
-    .print = ubluepy_descriptor_print,
-    .make_new = ubluepy_descriptor_make_new,
-    .locals_dict = (mp_obj_dict_t*)&ubluepy_descriptor_locals_dict
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    ubluepy_descriptor_type,
+    MP_QSTR_Descriptor,
+    MP_TYPE_FLAG_NONE,
+    ubluepy_descriptor_make_new,
+    print, ubluepy_descriptor_print,
+    locals_dict, (mp_obj_dict_t*)&ubluepy_descriptor_locals_dict
+    );
 
 #endif // MICROPY_PY_UBLUEPY
diff --git a/ports/nrf/modules/ubluepy/ubluepy_peripheral.c b/ports/nrf/modules/ubluepy/ubluepy_peripheral.c
index acfe316c0cf74..9c346a885b2cb 100644
--- a/ports/nrf/modules/ubluepy/ubluepy_peripheral.c
+++ b/ports/nrf/modules/ubluepy/ubluepy_peripheral.c
@@ -482,12 +482,13 @@ STATIC const mp_rom_map_elem_t ubluepy_peripheral_locals_dict_table[] = {
 
 STATIC MP_DEFINE_CONST_DICT(ubluepy_peripheral_locals_dict, ubluepy_peripheral_locals_dict_table);
 
-const mp_obj_type_t ubluepy_peripheral_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_Peripheral,
-    .print = ubluepy_peripheral_print,
-    .make_new = ubluepy_peripheral_make_new,
-    .locals_dict = (mp_obj_dict_t*)&ubluepy_peripheral_locals_dict
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    ubluepy_peripheral_type,
+    MP_QSTR_Peripheral,
+    MP_TYPE_FLAG_NONE,
+    ubluepy_peripheral_make_new,
+    print, ubluepy_peripheral_print,
+    locals_dict, (mp_obj_dict_t*)&ubluepy_peripheral_locals_dict
+    );
 
 #endif // MICROPY_PY_UBLUEPY
diff --git a/ports/nrf/modules/ubluepy/ubluepy_scan_entry.c b/ports/nrf/modules/ubluepy/ubluepy_scan_entry.c
index 773070b08907f..64a81d215d379 100644
--- a/ports/nrf/modules/ubluepy/ubluepy_scan_entry.c
+++ b/ports/nrf/modules/ubluepy/ubluepy_scan_entry.c
@@ -136,11 +136,13 @@ STATIC const mp_rom_map_elem_t ubluepy_scan_entry_locals_dict_table[] = {
 
 STATIC MP_DEFINE_CONST_DICT(ubluepy_scan_entry_locals_dict, ubluepy_scan_entry_locals_dict_table);
 
-const mp_obj_type_t ubluepy_scan_entry_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_ScanEntry,
-    .print = ubluepy_scan_entry_print,
-    .locals_dict = (mp_obj_dict_t*)&ubluepy_scan_entry_locals_dict
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    ubluepy_scan_entry_type,
+    MP_QSTR_ScanEntry,
+    MP_TYPE_FLAG_NONE,
+    MP_TYPE_NULL_MAKE_NEW,
+    print, ubluepy_scan_entry_print,
+    locals_dict, (mp_obj_dict_t*)&ubluepy_scan_entry_locals_dict
+    );
 
 #endif // MICROPY_PY_UBLUEPY_CENTRAL
diff --git a/ports/nrf/modules/ubluepy/ubluepy_scanner.c b/ports/nrf/modules/ubluepy/ubluepy_scanner.c
index 60895a3da93fe..c47044cf0c37a 100644
--- a/ports/nrf/modules/ubluepy/ubluepy_scanner.c
+++ b/ports/nrf/modules/ubluepy/ubluepy_scanner.c
@@ -114,12 +114,13 @@ STATIC const mp_rom_map_elem_t ubluepy_scanner_locals_dict_table[] = {
 STATIC MP_DEFINE_CONST_DICT(ubluepy_scanner_locals_dict, ubluepy_scanner_locals_dict_table);
 
 
-const mp_obj_type_t ubluepy_scanner_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_Scanner,
-    .print = ubluepy_scanner_print,
-    .make_new = ubluepy_scanner_make_new,
-    .locals_dict = (mp_obj_dict_t*)&ubluepy_scanner_locals_dict
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    ubluepy_scanner_type,
+    MP_QSTR_Scanner,
+    MP_TYPE_FLAG_NONE,
+    ubluepy_scanner_make_new,
+    print, ubluepy_scanner_print,
+    locals_dict, (mp_obj_dict_t*)&ubluepy_scanner_locals_dict
+    );
 
 #endif // MICROPY_PY_UBLUEPY_CENTRAL
diff --git a/ports/nrf/modules/ubluepy/ubluepy_service.c b/ports/nrf/modules/ubluepy/ubluepy_service.c
index 6dac231779258..9d0d6e5b95f8e 100644
--- a/ports/nrf/modules/ubluepy/ubluepy_service.c
+++ b/ports/nrf/modules/ubluepy/ubluepy_service.c
@@ -171,12 +171,13 @@ STATIC const mp_rom_map_elem_t ubluepy_service_locals_dict_table[] = {
 
 STATIC MP_DEFINE_CONST_DICT(ubluepy_service_locals_dict, ubluepy_service_locals_dict_table);
 
-const mp_obj_type_t ubluepy_service_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_Service,
-    .print = ubluepy_service_print,
-    .make_new = ubluepy_service_make_new,
-    .locals_dict = (mp_obj_dict_t*)&ubluepy_service_locals_dict
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    ubluepy_service_type,
+    MP_QSTR_Service,
+    MP_TYPE_FLAG_NONE,
+    ubluepy_service_make_new,
+    print, ubluepy_service_print,
+    locals_dict, (mp_obj_dict_t*)&ubluepy_service_locals_dict
+    );
 
 #endif // MICROPY_PY_UBLUEPY_PERIPHERAL || MICROPY_PY_UBLUEPY_CENTRAL
diff --git a/ports/nrf/modules/ubluepy/ubluepy_uuid.c b/ports/nrf/modules/ubluepy/ubluepy_uuid.c
index aee7b9a1a899c..0414a2a2867f5 100644
--- a/ports/nrf/modules/ubluepy/ubluepy_uuid.c
+++ b/ports/nrf/modules/ubluepy/ubluepy_uuid.c
@@ -160,12 +160,13 @@ STATIC const mp_rom_map_elem_t ubluepy_uuid_locals_dict_table[] = {
 
 STATIC MP_DEFINE_CONST_DICT(ubluepy_uuid_locals_dict, ubluepy_uuid_locals_dict_table);
 
-const mp_obj_type_t ubluepy_uuid_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_UUID,
-    .print = ubluepy_uuid_print,
-    .make_new = ubluepy_uuid_make_new,
-    .locals_dict = (mp_obj_dict_t*)&ubluepy_uuid_locals_dict
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    ubluepy_uuid_type,
+    MP_QSTR_UUID,
+    MP_TYPE_FLAG_NONE,
+    ubluepy_uuid_make_new,
+    print, ubluepy_uuid_print,
+    locals_dict, (mp_obj_dict_t*)&ubluepy_uuid_locals_dict
+    );
 
 #endif // MICROPY_PY_UBLUEPY
diff --git a/ports/nrf/modules/uos/microbitfs.c b/ports/nrf/modules/uos/microbitfs.c
index 6c8ffb0925d0e..63ac8c93213f6 100644
--- a/ports/nrf/modules/uos/microbitfs.c
+++ b/ports/nrf/modules/uos/microbitfs.c
@@ -626,12 +626,14 @@ STATIC const mp_stream_p_t textio_stream_p = {
     .is_text = true,
 };
 
-const mp_obj_type_t uos_mbfs_textio_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_TextIO,
-    .protocol = &textio_stream_p,
-    .locals_dict = (mp_obj_dict_t*)&uos_mbfs_file_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    uos_mbfs_textio_type,
+    MP_QSTR_TextIO,
+    MP_TYPE_FLAG_NONE,
+    MP_TYPE_NULL_MAKE_NEW,
+    protocol, &textio_stream_p,
+    locals_dict, (mp_obj_dict_t*)&uos_mbfs_file_locals_dict
+    );
 
 
 STATIC const mp_stream_p_t fileio_stream_p = {
@@ -639,12 +641,14 @@ STATIC const mp_stream_p_t fileio_stream_p = {
     .write = microbit_file_write,
 };
 
-const mp_obj_type_t uos_mbfs_fileio_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_FileIO,
-    .protocol = &fileio_stream_p,
-    .locals_dict = (mp_obj_dict_t*)&uos_mbfs_file_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    uos_mbfs_fileio_type,
+    MP_QSTR_FileIO,
+    MP_TYPE_FLAG_NONE,
+    MP_TYPE_NULL_MAKE_NEW,
+    protocol, &fileio_stream_p,
+    locals_dict, (mp_obj_dict_t*)&uos_mbfs_file_locals_dict
+    );
 
 // From micro:bit fileobj.c
 mp_obj_t uos_mbfs_open(size_t n_args, const mp_obj_t *args) {
diff --git a/ports/nrf/pin_named_pins.c b/ports/nrf/pin_named_pins.c
index e1d8736b9cf23..87fed746e64ee 100644
--- a/ports/nrf/pin_named_pins.c
+++ b/ports/nrf/pin_named_pins.c
@@ -36,19 +36,23 @@ STATIC void pin_named_pins_obj_print(const mp_print_t *print, mp_obj_t self_in,
     mp_printf(print, "<Pin.%q>", self->name);
 }
 
-const mp_obj_type_t pin_cpu_pins_obj_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_cpu,
-    .print = pin_named_pins_obj_print,
-    .locals_dict = (mp_obj_t)&pin_cpu_pins_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    pin_cpu_pins_obj_type,
+    MP_QSTR_cpu,
+    MP_TYPE_FLAG_NONE,
+    MP_TYPE_NULL_MAKE_NEW,
+    print, pin_named_pins_obj_print,
+    locals_dict, (mp_obj_t)&pin_cpu_pins_locals_dict
+    );
 
-const mp_obj_type_t pin_board_pins_obj_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_board,
-    .print = pin_named_pins_obj_print,
-    .locals_dict = (mp_obj_t)&pin_board_pins_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    pin_board_pins_obj_type,
+    MP_QSTR_board,
+    MP_TYPE_FLAG_NONE,
+    MP_TYPE_NULL_MAKE_NEW,
+    print, pin_named_pins_obj_print,
+    locals_dict, (mp_obj_t)&pin_board_pins_locals_dict
+    );
 
 const pin_obj_t *pin_find_named_pin(const mp_obj_dict_t *named_pins, mp_obj_t name) {
     mp_map_t *named_map = mp_obj_dict_get_map((mp_obj_t)named_pins);
diff --git a/ports/pic16bit/modpybled.c b/ports/pic16bit/modpybled.c
index 6adb2fda31265..fd4e8cce9c922 100644
--- a/ports/pic16bit/modpybled.c
+++ b/ports/pic16bit/modpybled.c
@@ -84,10 +84,11 @@ STATIC const mp_rom_map_elem_t pyb_led_locals_dict_table[] = {
 
 STATIC MP_DEFINE_CONST_DICT(pyb_led_locals_dict, pyb_led_locals_dict_table);
 
-const mp_obj_type_t pyb_led_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_LED,
-    .print = pyb_led_print,
-    .make_new = pyb_led_make_new,
-    .locals_dict = (mp_obj_t)&pyb_led_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    pyb_led_type,
+    MP_QSTR_LED,
+    MP_TYPE_FLAG_NONE,
+    pyb_led_make_new,
+    print, pyb_led_print,
+    locals_dict, (mp_obj_t)&pyb_led_locals_dict
+    );
diff --git a/ports/pic16bit/modpybswitch.c b/ports/pic16bit/modpybswitch.c
index 7b3d0f5f527bb..e1096b1daaadd 100644
--- a/ports/pic16bit/modpybswitch.c
+++ b/ports/pic16bit/modpybswitch.c
@@ -71,11 +71,12 @@ STATIC const mp_rom_map_elem_t pyb_switch_locals_dict_table[] = {
 
 STATIC MP_DEFINE_CONST_DICT(pyb_switch_locals_dict, pyb_switch_locals_dict_table);
 
-const mp_obj_type_t pyb_switch_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_Switch,
-    .print = pyb_switch_print,
-    .make_new = pyb_switch_make_new,
-    .call = pyb_switch_call,
-    .locals_dict = (mp_obj_t)&pyb_switch_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    pyb_switch_type,
+    MP_QSTR_Switch,
+    MP_TYPE_FLAG_NONE,
+    pyb_switch_make_new,
+    print, pyb_switch_print,
+    call, pyb_switch_call,
+    locals_dict, (mp_obj_t)&pyb_switch_locals_dict
+    );
diff --git a/ports/renesas-ra/extint.c b/ports/renesas-ra/extint.c
index 59f9ecfa37ea0..496a50c3e827a 100644
--- a/ports/renesas-ra/extint.c
+++ b/ports/renesas-ra/extint.c
@@ -374,13 +374,14 @@ STATIC const mp_rom_map_elem_t extint_locals_dict_table[] = {
 
 STATIC MP_DEFINE_CONST_DICT(extint_locals_dict, extint_locals_dict_table);
 
-const mp_obj_type_t extint_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_ExtInt,
-    .print = extint_obj_print,
-    .make_new = extint_make_new,
-    .locals_dict = (mp_obj_dict_t *)&extint_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    extint_type,
+    MP_QSTR_ExtInt,
+    MP_TYPE_FLAG_NONE,
+    extint_make_new,
+    locals_dict, &extint_locals_dict,
+    print, extint_obj_print
+    );
 
 void extint_init0(void) {
     ra_icu_init();
diff --git a/ports/renesas-ra/led.c b/ports/renesas-ra/led.c
index efc09d9de1b08..9a3f1d40e9651 100644
--- a/ports/renesas-ra/led.c
+++ b/ports/renesas-ra/led.c
@@ -170,13 +170,14 @@ STATIC const mp_rom_map_elem_t led_locals_dict_table[] = {
 
 STATIC MP_DEFINE_CONST_DICT(led_locals_dict, led_locals_dict_table);
 
-const mp_obj_type_t ra_led_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_LED,
-    .print = led_obj_print,
-    .make_new = led_obj_make_new,
-    .locals_dict = (mp_obj_dict_t *)&led_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    ra_led_type,
+    MP_QSTR_LED,
+    MP_TYPE_FLAG_NONE,
+    led_obj_make_new,
+    locals_dict, &led_locals_dict,
+    print, led_obj_print
+    );
 
 #else
 // For boards with no LEDs, we leave an empty function here so that we don't
diff --git a/ports/renesas-ra/machine_adc.c b/ports/renesas-ra/machine_adc.c
index adeebeb4c4acd..99e35f48d997f 100644
--- a/ports/renesas-ra/machine_adc.c
+++ b/ports/renesas-ra/machine_adc.c
@@ -126,10 +126,11 @@ STATIC const mp_rom_map_elem_t machine_adc_locals_dict_table[] = {
 };
 STATIC MP_DEFINE_CONST_DICT(machine_adc_locals_dict, machine_adc_locals_dict_table);
 
-const mp_obj_type_t machine_adc_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_ADC,
-    .print = machine_adc_print,
-    .make_new = machine_adc_make_new,
-    .locals_dict = (mp_obj_dict_t *)&machine_adc_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    machine_adc_type,
+    MP_QSTR_ADC,
+    MP_TYPE_FLAG_NONE,
+    machine_adc_make_new,
+    locals_dict, &machine_adc_locals_dict,
+    print, machine_adc_print
+    );
diff --git a/ports/renesas-ra/machine_i2c.c b/ports/renesas-ra/machine_i2c.c
index bc1cea0cd93b8..eaca5ff4a85ea 100644
--- a/ports/renesas-ra/machine_i2c.c
+++ b/ports/renesas-ra/machine_i2c.c
@@ -156,13 +156,14 @@ STATIC const mp_machine_i2c_p_t machine_i2c_p = {
     .transfer_single = machine_i2c_transfer_single,
 };
 
-const mp_obj_type_t machine_i2c_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_I2C,
-    .print = machine_i2c_print,
-    .make_new = machine_i2c_make_new,
-    .protocol = &machine_i2c_p,
-    .locals_dict = (mp_obj_dict_t *)&mp_machine_i2c_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    machine_i2c_type,
+    MP_QSTR_I2C,
+    MP_TYPE_FLAG_NONE,
+    machine_i2c_make_new,
+    locals_dict, (void *)&mp_machine_i2c_locals_dict,
+    print, machine_i2c_print,
+    protocol, &machine_i2c_p
+    );
 
 #endif // MICROPY_HW_ENABLE_HW_I2C
diff --git a/ports/renesas-ra/machine_pin.c b/ports/renesas-ra/machine_pin.c
index f940b55547eba..17ef1e19a4137 100644
--- a/ports/renesas-ra/machine_pin.c
+++ b/ports/renesas-ra/machine_pin.c
@@ -349,15 +349,16 @@ STATIC const mp_pin_p_t machine_pin_pin_p = {
     .ioctl = machine_pin_ioctl,
 };
 
-const mp_obj_type_t machine_pin_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_Pin,
-    .print = machine_pin_print,
-    .make_new = mp_pin_make_new,
-    .call = machine_pin_call,
-    .protocol = &machine_pin_pin_p,
-    .locals_dict = (mp_obj_t)&machine_pin_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    machine_pin_type,
+    MP_QSTR_Pin,
+    MP_TYPE_FLAG_NONE,
+    mp_pin_make_new,
+    locals_dict, &machine_pin_locals_dict,
+    print, machine_pin_print,
+    call, machine_pin_call,
+    protocol, &machine_pin_pin_p
+    );
 
 // Returns the pin mode. This value returned by this macro should be one of:
 // GPIO_MODE_INPUT, GPIO_MODE_OUTPUT_PP, GPIO_MODE_OUTPUT_OD,
@@ -388,17 +389,21 @@ uint32_t pin_get_af(const machine_pin_obj_t *pin) {
     return (uint32_t)ra_gpio_get_af(pin->pin);
 }
 
-const mp_obj_type_t pin_cpu_pins_obj_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_cpu,
-    .locals_dict = (mp_obj_dict_t *)&pin_cpu_pins_locals_dict,
-};
-
-const mp_obj_type_t pin_board_pins_obj_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_board,
-    .locals_dict = (mp_obj_dict_t *)&pin_board_pins_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    pin_cpu_pins_obj_type,
+    MP_QSTR_cpu,
+    MP_TYPE_FLAG_NONE,
+    MP_TYPE_NULL_MAKE_NEW,
+    locals_dict, &pin_cpu_pins_locals_dict
+    );
+
+MP_DEFINE_CONST_OBJ_TYPE(
+    pin_board_pins_obj_type,
+    MP_QSTR_board,
+    MP_TYPE_FLAG_NONE,
+    MP_TYPE_NULL_MAKE_NEW,
+    locals_dict, &pin_board_pins_locals_dict
+    );
 
 const machine_pin_obj_t *pin_find_named_pin(const mp_obj_dict_t *named_pins, mp_obj_t name) {
     const mp_map_t *named_map = &named_pins->map;
diff --git a/ports/renesas-ra/machine_rtc.c b/ports/renesas-ra/machine_rtc.c
index 9ddc90213774c..c3f64c6971088 100644
--- a/ports/renesas-ra/machine_rtc.c
+++ b/ports/renesas-ra/machine_rtc.c
@@ -341,9 +341,10 @@ STATIC const mp_rom_map_elem_t machine_rtc_locals_dict_table[] = {
 };
 STATIC MP_DEFINE_CONST_DICT(machine_rtc_locals_dict, machine_rtc_locals_dict_table);
 
-const mp_obj_type_t machine_rtc_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_RTC,
-    .make_new = machine_rtc_make_new,
-    .locals_dict = (mp_obj_dict_t *)&machine_rtc_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    machine_rtc_type,
+    MP_QSTR_RTC,
+    MP_TYPE_FLAG_NONE,
+    machine_rtc_make_new,
+    locals_dict, &machine_rtc_locals_dict
+    );
diff --git a/ports/renesas-ra/machine_spi.c b/ports/renesas-ra/machine_spi.c
index 01972ad457610..d0e8b03bd12ea 100644
--- a/ports/renesas-ra/machine_spi.c
+++ b/ports/renesas-ra/machine_spi.c
@@ -297,14 +297,15 @@ STATIC const mp_machine_spi_p_t machine_hard_spi_p = {
     .transfer = machine_hard_spi_transfer,
 };
 
-const mp_obj_type_t machine_hard_spi_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_SPI,
-    .print = machine_hard_spi_print,
-    .make_new = machine_hard_spi_make_new,
-    .protocol = &machine_hard_spi_p,
-    .locals_dict = (mp_obj_dict_t *)&mp_machine_spi_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    machine_hard_spi_type,
+    MP_QSTR_SPI,
+    MP_TYPE_FLAG_NONE,
+    machine_hard_spi_make_new,
+    locals_dict, &mp_machine_spi_locals_dict,
+    print, machine_hard_spi_print,
+    protocol, &machine_hard_spi_p
+    );
 
 void spi_init0(void) {
 }
diff --git a/ports/renesas-ra/machine_timer.c b/ports/renesas-ra/machine_timer.c
index c387d35117d82..f3e5aafb7cab2 100644
--- a/ports/renesas-ra/machine_timer.c
+++ b/ports/renesas-ra/machine_timer.c
@@ -136,10 +136,11 @@ STATIC const mp_rom_map_elem_t machine_timer_locals_dict_table[] = {
 };
 STATIC MP_DEFINE_CONST_DICT(machine_timer_locals_dict, machine_timer_locals_dict_table);
 
-const mp_obj_type_t machine_timer_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_Timer,
-    .print = machine_timer_print,
-    .make_new = machine_timer_make_new,
-    .locals_dict = (mp_obj_dict_t *)&machine_timer_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    machine_timer_type,
+    MP_QSTR_Timer,
+    MP_TYPE_FLAG_NONE,
+    machine_timer_make_new,
+    locals_dict, &machine_timer_locals_dict,
+    print, machine_timer_print
+    );
diff --git a/ports/renesas-ra/machine_uart.c b/ports/renesas-ra/machine_uart.c
index 4b4aa3396b622..11f5d6825eb2d 100644
--- a/ports/renesas-ra/machine_uart.c
+++ b/ports/renesas-ra/machine_uart.c
@@ -571,15 +571,16 @@ STATIC const mp_stream_p_t uart_stream_p = {
     .is_text = false,
 };
 
-const mp_obj_type_t machine_uart_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_UART,
-    .print = machine_uart_print,
-    .make_new = machine_uart_make_new,
-    .getiter = mp_identity_getiter,
-    .iternext = mp_stream_unbuffered_iter,
-    .protocol = &uart_stream_p,
-    .locals_dict = (mp_obj_dict_t *)&machine_uart_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    machine_uart_type,
+    MP_QSTR_UART,
+    MP_TYPE_FLAG_NONE,
+    machine_uart_make_new,
+    locals_dict, &machine_uart_locals_dict,
+    print, machine_uart_print,
+    getiter, mp_identity_getiter,
+    iternext, mp_stream_unbuffered_iter,
+    protocol, &uart_stream_p
+    );
 
 MP_REGISTER_ROOT_POINTER(struct _machine_uart_obj_t *machine_uart_obj_all[MICROPY_HW_MAX_UART + MICROPY_HW_MAX_LPUART]);
diff --git a/ports/renesas-ra/storage.c b/ports/renesas-ra/storage.c
index 8d94f6fb9c3b6..f573894a50148 100644
--- a/ports/renesas-ra/storage.c
+++ b/ports/renesas-ra/storage.c
@@ -400,13 +400,14 @@ STATIC const mp_rom_map_elem_t pyb_flash_locals_dict_table[] = {
 
 STATIC MP_DEFINE_CONST_DICT(pyb_flash_locals_dict, pyb_flash_locals_dict_table);
 
-const mp_obj_type_t pyb_flash_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_Flash,
-    .print = pyb_flash_print,
-    .make_new = pyb_flash_make_new,
-    .locals_dict = (mp_obj_dict_t *)&pyb_flash_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    pyb_flash_type,
+    MP_QSTR_Flash,
+    MP_TYPE_FLAG_NONE,
+    pyb_flash_make_new,
+    locals_dict, &pyb_flash_locals_dict,
+    print, pyb_flash_print
+    );
 
 void pyb_flash_init_vfs(fs_user_mount_t *vfs) {
     vfs->base.type = &mp_fat_vfs_type;
diff --git a/ports/renesas-ra/timer.c b/ports/renesas-ra/timer.c
index 1ae936525eaff..8f7acbcdaa476 100644
--- a/ports/renesas-ra/timer.c
+++ b/ports/renesas-ra/timer.c
@@ -410,13 +410,14 @@ STATIC const mp_rom_map_elem_t pyb_timer_locals_dict_table[] = {
 };
 STATIC MP_DEFINE_CONST_DICT(pyb_timer_locals_dict, pyb_timer_locals_dict_table);
 
-const mp_obj_type_t pyb_timer_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_Timer,
-    .print = pyb_timer_print,
-    .make_new = pyb_timer_make_new,
-    .locals_dict = (mp_obj_dict_t *)&pyb_timer_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    pyb_timer_type,
+    MP_QSTR_Timer,
+    MP_TYPE_FLAG_NONE,
+    pyb_timer_make_new,
+    locals_dict, &pyb_timer_locals_dict,
+    print, pyb_timer_print
+    );
 
 #if defined(TIMER_CHANNEL)
 /*
@@ -502,12 +503,14 @@ STATIC const mp_rom_map_elem_t pyb_timer_channel_locals_dict_table[] = {
 };
 STATIC MP_DEFINE_CONST_DICT(pyb_timer_channel_locals_dict, pyb_timer_channel_locals_dict_table);
 
-STATIC const mp_obj_type_t pyb_timer_channel_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_TimerChannel,
-    .print = pyb_timer_channel_print,
-    .locals_dict = (mp_obj_dict_t *)&pyb_timer_channel_locals_dict,
-};
+STATIC MP_DEFINE_CONST_OBJ_TYPE(
+    pyb_timer_channel_type,
+    MP_QSTR_TimerChannel,
+    MP_TYPE_FLAG_NONE,
+    MP_TYPE_NULL_MAKE_NEW,
+    locals_dict, &pyb_timer_channel_locals_dict,
+    print, pyb_timer_channel_print
+    );
 #endif
 
 STATIC void timer_handle_irq_channel(pyb_timer_obj_t *tim, uint8_t channel, mp_obj_t callback) {
diff --git a/ports/renesas-ra/usrsw.c b/ports/renesas-ra/usrsw.c
index 572510816b1f1..4107d7850d382 100644
--- a/ports/renesas-ra/usrsw.c
+++ b/ports/renesas-ra/usrsw.c
@@ -135,14 +135,15 @@ STATIC const mp_rom_map_elem_t pyb_switch_locals_dict_table[] = {
 
 STATIC MP_DEFINE_CONST_DICT(pyb_switch_locals_dict, pyb_switch_locals_dict_table);
 
-const mp_obj_type_t pyb_switch_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_Switch,
-    .print = pyb_switch_print,
-    .make_new = pyb_switch_make_new,
-    .call = pyb_switch_call,
-    .locals_dict = (mp_obj_dict_t *)&pyb_switch_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    pyb_switch_type,
+    MP_QSTR_Switch,
+    MP_TYPE_FLAG_NONE,
+    pyb_switch_make_new,
+    locals_dict, &pyb_switch_locals_dict,
+    print, pyb_switch_print,
+    call, pyb_switch_call
+    );
 
 MP_REGISTER_ROOT_POINTER(mp_obj_t pyb_switch_callback);
 
diff --git a/ports/rp2/machine_adc.c b/ports/rp2/machine_adc.c
index 5f91392e142df..549f8d5ecdc5a 100644
--- a/ports/rp2/machine_adc.c
+++ b/ports/rp2/machine_adc.c
@@ -113,10 +113,11 @@ STATIC const mp_rom_map_elem_t machine_adc_locals_dict_table[] = {
 };
 STATIC MP_DEFINE_CONST_DICT(machine_adc_locals_dict, machine_adc_locals_dict_table);
 
-const mp_obj_type_t machine_adc_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_ADC,
-    .print = machine_adc_print,
-    .make_new = machine_adc_make_new,
-    .locals_dict = (mp_obj_dict_t *)&machine_adc_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    machine_adc_type,
+    MP_QSTR_ADC,
+    MP_TYPE_FLAG_NONE,
+    machine_adc_make_new,
+    print, machine_adc_print,
+    locals_dict, (mp_obj_dict_t *)&machine_adc_locals_dict
+    );
diff --git a/ports/rp2/machine_i2c.c b/ports/rp2/machine_i2c.c
index 3390cc42101d5..91d8bb59b76c1 100644
--- a/ports/rp2/machine_i2c.c
+++ b/ports/rp2/machine_i2c.c
@@ -176,11 +176,12 @@ STATIC const mp_machine_i2c_p_t machine_i2c_p = {
     .transfer_single = machine_i2c_transfer_single,
 };
 
-const mp_obj_type_t machine_hw_i2c_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_I2C,
-    .print = machine_i2c_print,
-    .make_new = machine_i2c_make_new,
-    .protocol = &machine_i2c_p,
-    .locals_dict = (mp_obj_dict_t *)&mp_machine_i2c_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    machine_hw_i2c_type,
+    MP_QSTR_I2C,
+    MP_TYPE_FLAG_NONE,
+    machine_i2c_make_new,
+    print, machine_i2c_print,
+    protocol, &machine_i2c_p,
+    locals_dict, (mp_obj_dict_t *)&mp_machine_i2c_locals_dict
+    );
diff --git a/ports/rp2/machine_i2s.c b/ports/rp2/machine_i2s.c
index 1015ba10179aa..8446a59781bb9 100644
--- a/ports/rp2/machine_i2s.c
+++ b/ports/rp2/machine_i2s.c
@@ -1137,15 +1137,16 @@ STATIC const mp_stream_p_t i2s_stream_p = {
     .is_text = false,
 };
 
-const mp_obj_type_t machine_i2s_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_I2S,
-    .print = machine_i2s_print,
-    .getiter = mp_identity_getiter,
-    .iternext = mp_stream_unbuffered_iter,
-    .protocol = &i2s_stream_p,
-    .make_new = machine_i2s_make_new,
-    .locals_dict = (mp_obj_dict_t *)&machine_i2s_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    machine_i2s_type,
+    MP_QSTR_I2S,
+    MP_TYPE_FLAG_NONE,
+    machine_i2s_make_new,
+    print, machine_i2s_print,
+    getiter, mp_identity_getiter,
+    iternext, mp_stream_unbuffered_iter,
+    protocol, &i2s_stream_p,
+    locals_dict, (mp_obj_dict_t *)&machine_i2s_locals_dict
+    );
 
 MP_REGISTER_ROOT_POINTER(void *machine_i2s_obj[2]);
diff --git a/ports/rp2/machine_pin.c b/ports/rp2/machine_pin.c
index 705f61242c259..38670f09abead 100644
--- a/ports/rp2/machine_pin.c
+++ b/ports/rp2/machine_pin.c
@@ -641,15 +641,16 @@ STATIC const mp_pin_p_t pin_pin_p = {
     .ioctl = pin_ioctl,
 };
 
-const mp_obj_type_t machine_pin_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_Pin,
-    .print = machine_pin_print,
-    .make_new = mp_pin_make_new,
-    .call = machine_pin_call,
-    .protocol = &pin_pin_p,
-    .locals_dict = (mp_obj_t)&machine_pin_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    machine_pin_type,
+    MP_QSTR_Pin,
+    MP_TYPE_FLAG_NONE,
+    mp_pin_make_new,
+    print, machine_pin_print,
+    call, machine_pin_call,
+    protocol, &pin_pin_p,
+    locals_dict, (mp_obj_t)&machine_pin_locals_dict
+    );
 
 STATIC mp_uint_t machine_pin_irq_trigger(mp_obj_t self_in, mp_uint_t new_trigger) {
     machine_pin_obj_t *self = MP_OBJ_TO_PTR(self_in);
diff --git a/ports/rp2/machine_rtc.c b/ports/rp2/machine_rtc.c
index 9d59124a66e1f..73bdaee6c7606 100644
--- a/ports/rp2/machine_rtc.c
+++ b/ports/rp2/machine_rtc.c
@@ -115,9 +115,10 @@ STATIC const mp_rom_map_elem_t machine_rtc_locals_dict_table[] = {
 };
 STATIC MP_DEFINE_CONST_DICT(machine_rtc_locals_dict, machine_rtc_locals_dict_table);
 
-const mp_obj_type_t machine_rtc_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_RTC,
-    .make_new = machine_rtc_make_new,
-    .locals_dict = (mp_obj_t)&machine_rtc_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    machine_rtc_type,
+    MP_QSTR_RTC,
+    MP_TYPE_FLAG_NONE,
+    machine_rtc_make_new,
+    locals_dict, (mp_obj_t)&machine_rtc_locals_dict
+    );
diff --git a/ports/rp2/machine_spi.c b/ports/rp2/machine_spi.c
index 104bd1fd5338b..f3ac8d7cf811f 100644
--- a/ports/rp2/machine_spi.c
+++ b/ports/rp2/machine_spi.c
@@ -290,14 +290,15 @@ STATIC const mp_machine_spi_p_t machine_spi_p = {
     .transfer = machine_spi_transfer,
 };
 
-const mp_obj_type_t machine_spi_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_SPI,
-    .print = machine_spi_print,
-    .make_new = machine_spi_make_new,
-    .protocol = &machine_spi_p,
-    .locals_dict = (mp_obj_dict_t *)&mp_machine_spi_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    machine_spi_type,
+    MP_QSTR_SPI,
+    MP_TYPE_FLAG_NONE,
+    machine_spi_make_new,
+    print, machine_spi_print,
+    protocol, &machine_spi_p,
+    locals_dict, (mp_obj_dict_t *)&mp_machine_spi_locals_dict
+    );
 
 mp_obj_base_t *mp_hal_get_spi_obj(mp_obj_t o) {
     if (mp_obj_is_type(o, &machine_spi_type)) {
diff --git a/ports/rp2/machine_timer.c b/ports/rp2/machine_timer.c
index e7e8f02d5517c..d3b60155294f4 100644
--- a/ports/rp2/machine_timer.c
+++ b/ports/rp2/machine_timer.c
@@ -156,10 +156,11 @@ STATIC const mp_rom_map_elem_t machine_timer_locals_dict_table[] = {
 };
 STATIC MP_DEFINE_CONST_DICT(machine_timer_locals_dict, machine_timer_locals_dict_table);
 
-const mp_obj_type_t machine_timer_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_Timer,
-    .print = machine_timer_print,
-    .make_new = machine_timer_make_new,
-    .locals_dict = (mp_obj_dict_t *)&machine_timer_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    machine_timer_type,
+    MP_QSTR_Timer,
+    MP_TYPE_FLAG_NONE,
+    machine_timer_make_new,
+    print, machine_timer_print,
+    locals_dict, (mp_obj_dict_t *)&machine_timer_locals_dict
+    );
diff --git a/ports/rp2/machine_uart.c b/ports/rp2/machine_uart.c
index f7e44b6b256c1..df6228058be7b 100644
--- a/ports/rp2/machine_uart.c
+++ b/ports/rp2/machine_uart.c
@@ -579,16 +579,17 @@ STATIC const mp_stream_p_t uart_stream_p = {
     .is_text = false,
 };
 
-const mp_obj_type_t machine_uart_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_UART,
-    .print = machine_uart_print,
-    .make_new = machine_uart_make_new,
-    .getiter = mp_identity_getiter,
-    .iternext = mp_stream_unbuffered_iter,
-    .protocol = &uart_stream_p,
-    .locals_dict = (mp_obj_dict_t *)&machine_uart_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    machine_uart_type,
+    MP_QSTR_UART,
+    MP_TYPE_FLAG_NONE,
+    machine_uart_make_new,
+    print, machine_uart_print,
+    getiter, mp_identity_getiter,
+    iternext, mp_stream_unbuffered_iter,
+    protocol, &uart_stream_p,
+    locals_dict, (mp_obj_dict_t *)&machine_uart_locals_dict
+    );
 
 MP_REGISTER_ROOT_POINTER(void *rp2_uart_rx_buffer[2]);
 MP_REGISTER_ROOT_POINTER(void *rp2_uart_tx_buffer[2]);
diff --git a/ports/rp2/machine_wdt.c b/ports/rp2/machine_wdt.c
index d6914a4f2615d..e8c433306922b 100644
--- a/ports/rp2/machine_wdt.c
+++ b/ports/rp2/machine_wdt.c
@@ -77,9 +77,10 @@ STATIC const mp_rom_map_elem_t machine_wdt_locals_dict_table[] = {
 };
 STATIC MP_DEFINE_CONST_DICT(machine_wdt_locals_dict, machine_wdt_locals_dict_table);
 
-const mp_obj_type_t machine_wdt_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_WDT,
-    .make_new = machine_wdt_make_new,
-    .locals_dict = (mp_obj_dict_t *)&machine_wdt_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    machine_wdt_type,
+    MP_QSTR_WDT,
+    MP_TYPE_FLAG_NONE,
+    machine_wdt_make_new,
+    locals_dict, (mp_obj_dict_t *)&machine_wdt_locals_dict
+    );
diff --git a/ports/rp2/rp2_flash.c b/ports/rp2/rp2_flash.c
index 47c95ea5c822c..37a3412db5cfe 100644
--- a/ports/rp2/rp2_flash.c
+++ b/ports/rp2/rp2_flash.c
@@ -185,9 +185,10 @@ STATIC const mp_rom_map_elem_t rp2_flash_locals_dict_table[] = {
 };
 STATIC MP_DEFINE_CONST_DICT(rp2_flash_locals_dict, rp2_flash_locals_dict_table);
 
-const mp_obj_type_t rp2_flash_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_Flash,
-    .make_new = rp2_flash_make_new,
-    .locals_dict = (mp_obj_dict_t *)&rp2_flash_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    rp2_flash_type,
+    MP_QSTR_Flash,
+    MP_TYPE_FLAG_NONE,
+    rp2_flash_make_new,
+    locals_dict, (mp_obj_dict_t *)&rp2_flash_locals_dict
+    );
diff --git a/ports/rp2/rp2_pio.c b/ports/rp2/rp2_pio.c
index eb85eb22480d8..9a195bdd8a64c 100644
--- a/ports/rp2/rp2_pio.c
+++ b/ports/rp2/rp2_pio.c
@@ -376,13 +376,14 @@ STATIC const mp_rom_map_elem_t rp2_pio_locals_dict_table[] = {
 };
 STATIC MP_DEFINE_CONST_DICT(rp2_pio_locals_dict, rp2_pio_locals_dict_table);
 
-const mp_obj_type_t rp2_pio_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_PIO,
-    .print = rp2_pio_print,
-    .make_new = rp2_pio_make_new,
-    .locals_dict = (mp_obj_dict_t *)&rp2_pio_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    rp2_pio_type,
+    MP_QSTR_PIO,
+    MP_TYPE_FLAG_NONE,
+    rp2_pio_make_new,
+    print, rp2_pio_print,
+    locals_dict, (mp_obj_dict_t *)&rp2_pio_locals_dict
+    );
 
 STATIC mp_uint_t rp2_pio_irq_trigger(mp_obj_t self_in, mp_uint_t new_trigger) {
     rp2_pio_obj_t *self = MP_OBJ_TO_PTR(self_in);
@@ -806,13 +807,14 @@ STATIC const mp_rom_map_elem_t rp2_state_machine_locals_dict_table[] = {
 };
 STATIC MP_DEFINE_CONST_DICT(rp2_state_machine_locals_dict, rp2_state_machine_locals_dict_table);
 
-const mp_obj_type_t rp2_state_machine_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_StateMachine,
-    .print = rp2_state_machine_print,
-    .make_new = rp2_state_machine_make_new,
-    .locals_dict = (mp_obj_dict_t *)&rp2_state_machine_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    rp2_state_machine_type,
+    MP_QSTR_StateMachine,
+    MP_TYPE_FLAG_NONE,
+    rp2_state_machine_make_new,
+    print, rp2_state_machine_print,
+    locals_dict, (mp_obj_dict_t *)&rp2_state_machine_locals_dict
+    );
 
 STATIC mp_uint_t rp2_state_machine_irq_trigger(mp_obj_t self_in, mp_uint_t new_trigger) {
     rp2_state_machine_obj_t *self = MP_OBJ_TO_PTR(self_in);
diff --git a/ports/samd/machine_led.c b/ports/samd/machine_led.c
index f4dd1aeb3c65a..76aae8ffc5767 100644
--- a/ports/samd/machine_led.c
+++ b/ports/samd/machine_led.c
@@ -162,11 +162,12 @@ STATIC const mp_rom_map_elem_t machine_led_locals_dict_table[] = {
 };
 STATIC MP_DEFINE_CONST_DICT(machine_led_locals_dict, machine_led_locals_dict_table);
 
-const mp_obj_type_t machine_led_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_LED,
-    .print = machine_led_print,
-    .make_new = mp_led_make_new,
-    .call = machine_led_call,
-    .locals_dict = (mp_obj_t)&machine_led_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    machine_led_type,
+    MP_QSTR_LED,
+    MP_TYPE_FLAG_NONE,
+    mp_led_make_new,
+    print, machine_led_print,
+    call, machine_led_call,
+    locals_dict, (mp_obj_t)&machine_led_locals_dict
+    );
diff --git a/ports/samd/machine_pin.c b/ports/samd/machine_pin.c
index 161a3ccddd2a4..d47982e0e1c6b 100644
--- a/ports/samd/machine_pin.c
+++ b/ports/samd/machine_pin.c
@@ -287,15 +287,16 @@ STATIC const mp_pin_p_t pin_pin_p = {
     .ioctl = pin_ioctl,
 };
 
-const mp_obj_type_t machine_pin_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_Pin,
-    .print = machine_pin_print,
-    .make_new = mp_pin_make_new,
-    .call = machine_pin_call,
-    .protocol = &pin_pin_p,
-    .locals_dict = (mp_obj_t)&machine_pin_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    machine_pin_type,
+    MP_QSTR_Pin,
+    MP_TYPE_FLAG_NONE,
+    mp_pin_make_new,
+    print, machine_pin_print,
+    call, machine_pin_call,
+    protocol, &pin_pin_p,
+    locals_dict, (mp_obj_t)&machine_pin_locals_dict
+    );
 
 /*
 STATIC mp_uint_t machine_pin_irq_trigger(mp_obj_t self_in, mp_uint_t new_trigger) {
diff --git a/ports/samd/samd_flash.c b/ports/samd/samd_flash.c
index 530e3d9c8e5b8..6c74b59a263ad 100644
--- a/ports/samd/samd_flash.c
+++ b/ports/samd/samd_flash.c
@@ -181,9 +181,10 @@ STATIC const mp_rom_map_elem_t samd_flash_locals_dict_table[] = {
 };
 STATIC MP_DEFINE_CONST_DICT(samd_flash_locals_dict, samd_flash_locals_dict_table);
 
-const mp_obj_type_t samd_flash_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_Flash,
-    .make_new = samd_flash_make_new,
-    .locals_dict = (mp_obj_dict_t *)&samd_flash_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    samd_flash_type,
+    MP_QSTR_Flash,
+    MP_TYPE_FLAG_NONE,
+    samd_flash_make_new,
+    locals_dict, (mp_obj_dict_t *)&samd_flash_locals_dict
+    );
diff --git a/ports/stm32/accel.c b/ports/stm32/accel.c
index b07791a9a0b5a..276ce37d3ad49 100644
--- a/ports/stm32/accel.c
+++ b/ports/stm32/accel.c
@@ -281,11 +281,12 @@ STATIC const mp_rom_map_elem_t pyb_accel_locals_dict_table[] = {
 
 STATIC MP_DEFINE_CONST_DICT(pyb_accel_locals_dict, pyb_accel_locals_dict_table);
 
-const mp_obj_type_t pyb_accel_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_Accel,
-    .make_new = pyb_accel_make_new,
-    .locals_dict = (mp_obj_dict_t *)&pyb_accel_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    pyb_accel_type,
+    MP_QSTR_Accel,
+    MP_TYPE_FLAG_NONE,
+    pyb_accel_make_new,
+    locals_dict, (mp_obj_dict_t *)&pyb_accel_locals_dict
+    );
 
 #endif // MICROPY_HW_HAS_MMA7660 || MICROPY_HW_HAS_KXTJ3
diff --git a/ports/stm32/adc.c b/ports/stm32/adc.c
index 9d58cf2e7cf02..7e627d088f744 100644
--- a/ports/stm32/adc.c
+++ b/ports/stm32/adc.c
@@ -703,13 +703,14 @@ STATIC const mp_rom_map_elem_t adc_locals_dict_table[] = {
 
 STATIC MP_DEFINE_CONST_DICT(adc_locals_dict, adc_locals_dict_table);
 
-const mp_obj_type_t pyb_adc_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_ADC,
-    .print = adc_print,
-    .make_new = adc_make_new,
-    .locals_dict = (mp_obj_dict_t *)&adc_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    pyb_adc_type,
+    MP_QSTR_ADC,
+    MP_TYPE_FLAG_NONE,
+    adc_make_new,
+    print, adc_print,
+    locals_dict, (mp_obj_dict_t *)&adc_locals_dict
+    );
 
 /******************************************************************************/
 /* adc all object                                                             */
@@ -911,11 +912,12 @@ STATIC const mp_rom_map_elem_t adc_all_locals_dict_table[] = {
 
 STATIC MP_DEFINE_CONST_DICT(adc_all_locals_dict, adc_all_locals_dict_table);
 
-const mp_obj_type_t pyb_adc_all_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_ADCAll,
-    .make_new = adc_all_make_new,
-    .locals_dict = (mp_obj_dict_t *)&adc_all_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    pyb_adc_all_type,
+    MP_QSTR_ADCAll,
+    MP_TYPE_FLAG_NONE,
+    adc_all_make_new,
+    locals_dict, (mp_obj_dict_t *)&adc_all_locals_dict
+    );
 
 #endif // MICROPY_HW_ENABLE_ADC
diff --git a/ports/stm32/dac.c b/ports/stm32/dac.c
index c41bf858a7ed4..da50b30fef135 100644
--- a/ports/stm32/dac.c
+++ b/ports/stm32/dac.c
@@ -502,12 +502,13 @@ STATIC const mp_rom_map_elem_t pyb_dac_locals_dict_table[] = {
 
 STATIC MP_DEFINE_CONST_DICT(pyb_dac_locals_dict, pyb_dac_locals_dict_table);
 
-const mp_obj_type_t pyb_dac_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_DAC,
-    .print = pyb_dac_print,
-    .make_new = pyb_dac_make_new,
-    .locals_dict = (mp_obj_dict_t *)&pyb_dac_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    pyb_dac_type,
+    MP_QSTR_DAC,
+    MP_TYPE_FLAG_NONE,
+    pyb_dac_make_new,
+    print, pyb_dac_print,
+    locals_dict, (mp_obj_dict_t *)&pyb_dac_locals_dict
+    );
 
 #endif // MICROPY_HW_ENABLE_DAC
diff --git a/ports/stm32/extint.c b/ports/stm32/extint.c
index d68275bf19c4e..4d2dc5d23be93 100644
--- a/ports/stm32/extint.c
+++ b/ports/stm32/extint.c
@@ -659,13 +659,14 @@ STATIC const mp_rom_map_elem_t extint_locals_dict_table[] = {
 
 STATIC MP_DEFINE_CONST_DICT(extint_locals_dict, extint_locals_dict_table);
 
-const mp_obj_type_t extint_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_ExtInt,
-    .print = extint_obj_print,
-    .make_new = extint_make_new,
-    .locals_dict = (mp_obj_dict_t *)&extint_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    extint_type,
+    MP_QSTR_ExtInt,
+    MP_TYPE_FLAG_NONE,
+    extint_make_new,
+    print, extint_obj_print,
+    locals_dict, (mp_obj_dict_t *)&extint_locals_dict
+    );
 
 void extint_init0(void) {
     for (int i = 0; i < PYB_EXTI_NUM_VECTORS; i++) {
diff --git a/ports/stm32/lcd.c b/ports/stm32/lcd.c
index a0e001d1fdad2..a951ea7668447 100644
--- a/ports/stm32/lcd.c
+++ b/ports/stm32/lcd.c
@@ -525,11 +525,12 @@ STATIC const mp_rom_map_elem_t pyb_lcd_locals_dict_table[] = {
 
 STATIC MP_DEFINE_CONST_DICT(pyb_lcd_locals_dict, pyb_lcd_locals_dict_table);
 
-const mp_obj_type_t pyb_lcd_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_LCD,
-    .make_new = pyb_lcd_make_new,
-    .locals_dict = (mp_obj_dict_t *)&pyb_lcd_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    pyb_lcd_type,
+    MP_QSTR_LCD,
+    MP_TYPE_FLAG_NONE,
+    pyb_lcd_make_new,
+    locals_dict, (mp_obj_dict_t *)&pyb_lcd_locals_dict
+    );
 
 #endif // MICROPY_HW_HAS_LCD
diff --git a/ports/stm32/led.c b/ports/stm32/led.c
index 078327462ae15..6745ef60b8d11 100644
--- a/ports/stm32/led.c
+++ b/ports/stm32/led.c
@@ -381,13 +381,14 @@ STATIC const mp_rom_map_elem_t led_locals_dict_table[] = {
 
 STATIC MP_DEFINE_CONST_DICT(led_locals_dict, led_locals_dict_table);
 
-const mp_obj_type_t pyb_led_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_LED,
-    .print = led_obj_print,
-    .make_new = led_obj_make_new,
-    .locals_dict = (mp_obj_dict_t *)&led_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    pyb_led_type,
+    MP_QSTR_LED,
+    MP_TYPE_FLAG_NONE,
+    led_obj_make_new,
+    print, led_obj_print,
+    locals_dict, (mp_obj_dict_t *)&led_locals_dict
+    );
 
 #else
 // For boards with no LEDs, we leave an empty function here so that we don't
diff --git a/ports/stm32/machine_adc.c b/ports/stm32/machine_adc.c
index ad7c994ba111d..682bae3a6d13a 100644
--- a/ports/stm32/machine_adc.c
+++ b/ports/stm32/machine_adc.c
@@ -492,12 +492,13 @@ STATIC const mp_rom_map_elem_t machine_adc_locals_dict_table[] = {
 };
 STATIC MP_DEFINE_CONST_DICT(machine_adc_locals_dict, machine_adc_locals_dict_table);
 
-const mp_obj_type_t machine_adc_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_ADC,
-    .print = machine_adc_print,
-    .make_new = machine_adc_make_new,
-    .locals_dict = (mp_obj_dict_t *)&machine_adc_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    machine_adc_type,
+    MP_QSTR_ADC,
+    MP_TYPE_FLAG_NONE,
+    machine_adc_make_new,
+    print, machine_adc_print,
+    locals_dict, (mp_obj_dict_t *)&machine_adc_locals_dict
+    );
 
 #endif
diff --git a/ports/stm32/machine_i2c.c b/ports/stm32/machine_i2c.c
index 262944585aaac..89970f234d190 100644
--- a/ports/stm32/machine_i2c.c
+++ b/ports/stm32/machine_i2c.c
@@ -236,13 +236,14 @@ STATIC const mp_machine_i2c_p_t machine_hard_i2c_p = {
     .transfer = machine_hard_i2c_transfer,
 };
 
-const mp_obj_type_t machine_hard_i2c_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_I2C,
-    .print = machine_hard_i2c_print,
-    .make_new = machine_hard_i2c_make_new,
-    .protocol = &machine_hard_i2c_p,
-    .locals_dict = (mp_obj_dict_t *)&mp_machine_i2c_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    machine_hard_i2c_type,
+    MP_QSTR_I2C,
+    MP_TYPE_FLAG_NONE,
+    machine_hard_i2c_make_new,
+    print, machine_hard_i2c_print,
+    protocol, &machine_hard_i2c_p,
+    locals_dict, (mp_obj_dict_t *)&mp_machine_i2c_locals_dict
+    );
 
 #endif // MICROPY_HW_ENABLE_HW_I2C
diff --git a/ports/stm32/machine_i2s.c b/ports/stm32/machine_i2s.c
index 4f583a53e87bf..7dc6439f25c09 100644
--- a/ports/stm32/machine_i2s.c
+++ b/ports/stm32/machine_i2s.c
@@ -1114,16 +1114,17 @@ STATIC const mp_stream_p_t i2s_stream_p = {
     .is_text = false,
 };
 
-const mp_obj_type_t machine_i2s_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_I2S,
-    .print = machine_i2s_print,
-    .getiter = mp_identity_getiter,
-    .iternext = mp_stream_unbuffered_iter,
-    .protocol = &i2s_stream_p,
-    .make_new = machine_i2s_make_new,
-    .locals_dict = (mp_obj_dict_t *)&machine_i2s_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    machine_i2s_type,
+    MP_QSTR_I2S,
+    MP_TYPE_FLAG_NONE,
+    machine_i2s_make_new,
+    print, machine_i2s_print,
+    getiter, mp_identity_getiter,
+    iternext, mp_stream_unbuffered_iter,
+    protocol, &i2s_stream_p,
+    locals_dict, (mp_obj_dict_t *)&machine_i2s_locals_dict
+    );
 
 MP_REGISTER_ROOT_POINTER(struct _machine_i2s_obj_t *machine_i2s_obj[MICROPY_HW_MAX_I2S]);
 
diff --git a/ports/stm32/machine_spi.c b/ports/stm32/machine_spi.c
index 37c026cefc33a..87561c2b7b1dd 100644
--- a/ports/stm32/machine_spi.c
+++ b/ports/stm32/machine_spi.c
@@ -135,11 +135,12 @@ STATIC const mp_machine_spi_p_t machine_hard_spi_p = {
     .transfer = machine_hard_spi_transfer,
 };
 
-const mp_obj_type_t machine_hard_spi_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_SPI,
-    .print = machine_hard_spi_print,
-    .make_new = machine_hard_spi_make_new,
-    .protocol = &machine_hard_spi_p,
-    .locals_dict = (mp_obj_dict_t *)&mp_machine_spi_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    machine_hard_spi_type,
+    MP_QSTR_SPI,
+    MP_TYPE_FLAG_NONE,
+    machine_hard_spi_make_new,
+    print, machine_hard_spi_print,
+    protocol, &machine_hard_spi_p,
+    locals_dict, (mp_obj_dict_t *)&mp_machine_spi_locals_dict
+    );
diff --git a/ports/stm32/machine_timer.c b/ports/stm32/machine_timer.c
index c387d35117d82..bd9dbe609849b 100644
--- a/ports/stm32/machine_timer.c
+++ b/ports/stm32/machine_timer.c
@@ -136,10 +136,11 @@ STATIC const mp_rom_map_elem_t machine_timer_locals_dict_table[] = {
 };
 STATIC MP_DEFINE_CONST_DICT(machine_timer_locals_dict, machine_timer_locals_dict_table);
 
-const mp_obj_type_t machine_timer_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_Timer,
-    .print = machine_timer_print,
-    .make_new = machine_timer_make_new,
-    .locals_dict = (mp_obj_dict_t *)&machine_timer_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    machine_timer_type,
+    MP_QSTR_Timer,
+    MP_TYPE_FLAG_NONE,
+    machine_timer_make_new,
+    print, machine_timer_print,
+    locals_dict, (mp_obj_dict_t *)&machine_timer_locals_dict
+    );
diff --git a/ports/stm32/machine_uart.c b/ports/stm32/machine_uart.c
index 1bb1d2a1a7844..4d25a0274cdd3 100644
--- a/ports/stm32/machine_uart.c
+++ b/ports/stm32/machine_uart.c
@@ -660,13 +660,14 @@ STATIC const mp_stream_p_t uart_stream_p = {
     .is_text = false,
 };
 
-const mp_obj_type_t pyb_uart_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_UART,
-    .print = pyb_uart_print,
-    .make_new = pyb_uart_make_new,
-    .getiter = mp_identity_getiter,
-    .iternext = mp_stream_unbuffered_iter,
-    .protocol = &uart_stream_p,
-    .locals_dict = (mp_obj_dict_t *)&pyb_uart_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    pyb_uart_type,
+    MP_QSTR_UART,
+    MP_TYPE_FLAG_NONE,
+    pyb_uart_make_new,
+    print, pyb_uart_print,
+    getiter, mp_identity_getiter,
+    iternext, mp_stream_unbuffered_iter,
+    protocol, &uart_stream_p,
+    locals_dict, (mp_obj_dict_t *)&pyb_uart_locals_dict
+    );
diff --git a/ports/stm32/network_lan.c b/ports/stm32/network_lan.c
index f19916a1df091..f9c7d80b78e95 100644
--- a/ports/stm32/network_lan.c
+++ b/ports/stm32/network_lan.c
@@ -158,12 +158,13 @@ STATIC const mp_rom_map_elem_t network_lan_locals_dict_table[] = {
 };
 STATIC MP_DEFINE_CONST_DICT(network_lan_locals_dict, network_lan_locals_dict_table);
 
-const mp_obj_type_t network_lan_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_LAN,
-    .print = network_lan_print,
-    .make_new = network_lan_make_new,
-    .locals_dict = (mp_obj_dict_t *)&network_lan_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    network_lan_type,
+    MP_QSTR_LAN,
+    MP_TYPE_FLAG_NONE,
+    network_lan_make_new,
+    print, network_lan_print,
+    locals_dict, (mp_obj_dict_t *)&network_lan_locals_dict
+    );
 
 #endif // defined(MICROPY_HW_ETH_MDC)
diff --git a/ports/stm32/pin.c b/ports/stm32/pin.c
index af6bafc43f219..992046cd17e5a 100644
--- a/ports/stm32/pin.c
+++ b/ports/stm32/pin.c
@@ -592,15 +592,16 @@ STATIC const mp_pin_p_t pin_pin_p = {
     .ioctl = pin_ioctl,
 };
 
-const mp_obj_type_t pin_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_Pin,
-    .print = pin_print,
-    .make_new = mp_pin_make_new,
-    .call = pin_call,
-    .protocol = &pin_pin_p,
-    .locals_dict = (mp_obj_dict_t *)&pin_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    pin_type,
+    MP_QSTR_Pin,
+    MP_TYPE_FLAG_NONE,
+    mp_pin_make_new,
+    print, pin_print,
+    call, pin_call,
+    protocol, &pin_pin_p,
+    locals_dict, (mp_obj_dict_t *)&pin_locals_dict
+    );
 
 /// \moduleref pyb
 /// \class PinAF - Pin Alternate Functions
@@ -669,12 +670,14 @@ STATIC const mp_rom_map_elem_t pin_af_locals_dict_table[] = {
 };
 STATIC MP_DEFINE_CONST_DICT(pin_af_locals_dict, pin_af_locals_dict_table);
 
-const mp_obj_type_t pin_af_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_PinAF,
-    .print = pin_af_obj_print,
-    .locals_dict = (mp_obj_dict_t *)&pin_af_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    pin_af_type,
+    MP_QSTR_PinAF,
+    MP_TYPE_FLAG_NONE,
+    MP_TYPE_NULL_MAKE_NEW,
+    print, pin_af_obj_print,
+    locals_dict, (mp_obj_dict_t *)&pin_af_locals_dict
+    );
 
 MP_REGISTER_ROOT_POINTER(mp_obj_t pin_class_mapper);
 MP_REGISTER_ROOT_POINTER(mp_obj_t pin_class_map_dict);
diff --git a/ports/stm32/pin_named_pins.c b/ports/stm32/pin_named_pins.c
index 3a8e0f9fce9da..620888878c4a6 100644
--- a/ports/stm32/pin_named_pins.c
+++ b/ports/stm32/pin_named_pins.c
@@ -31,17 +31,21 @@
 #include "py/mphal.h"
 #include "pin.h"
 
-const mp_obj_type_t pin_cpu_pins_obj_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_cpu,
-    .locals_dict = (mp_obj_dict_t *)&pin_cpu_pins_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    pin_cpu_pins_obj_type,
+    MP_QSTR_cpu,
+    MP_TYPE_FLAG_NONE,
+    MP_TYPE_NULL_MAKE_NEW,
+    locals_dict, (mp_obj_dict_t *)&pin_cpu_pins_locals_dict
+    );
 
-const mp_obj_type_t pin_board_pins_obj_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_board,
-    .locals_dict = (mp_obj_dict_t *)&pin_board_pins_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    pin_board_pins_obj_type,
+    MP_QSTR_board,
+    MP_TYPE_FLAG_NONE,
+    MP_TYPE_NULL_MAKE_NEW,
+    locals_dict, (mp_obj_dict_t *)&pin_board_pins_locals_dict
+    );
 
 const pin_obj_t *pin_find_named_pin(const mp_obj_dict_t *named_pins, mp_obj_t name) {
     const mp_map_t *named_map = &named_pins->map;
diff --git a/ports/stm32/pyb_can.c b/ports/stm32/pyb_can.c
index ff41de31868da..6fdfd2c8549e1 100644
--- a/ports/stm32/pyb_can.c
+++ b/ports/stm32/pyb_can.c
@@ -1072,14 +1072,15 @@ STATIC const mp_stream_p_t can_stream_p = {
     .is_text = false,
 };
 
-const mp_obj_type_t pyb_can_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_CAN,
-    .print = pyb_can_print,
-    .make_new = pyb_can_make_new,
-    .protocol = &can_stream_p,
-    .locals_dict = (mp_obj_dict_t *)&pyb_can_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    pyb_can_type,
+    MP_QSTR_CAN,
+    MP_TYPE_FLAG_NONE,
+    pyb_can_make_new,
+    print, pyb_can_print,
+    protocol, &can_stream_p,
+    locals_dict, (mp_obj_dict_t *)&pyb_can_locals_dict
+    );
 
 MP_REGISTER_ROOT_POINTER(struct _pyb_can_obj_t *pyb_can_obj_all[MICROPY_HW_MAX_CAN]);
 
diff --git a/ports/stm32/pyb_i2c.c b/ports/stm32/pyb_i2c.c
index e9877422ca0b4..ee6983a143fd3 100644
--- a/ports/stm32/pyb_i2c.c
+++ b/ports/stm32/pyb_i2c.c
@@ -1104,12 +1104,13 @@ STATIC const mp_rom_map_elem_t pyb_i2c_locals_dict_table[] = {
 
 STATIC MP_DEFINE_CONST_DICT(pyb_i2c_locals_dict, pyb_i2c_locals_dict_table);
 
-const mp_obj_type_t pyb_i2c_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_I2C,
-    .print = pyb_i2c_print,
-    .make_new = pyb_i2c_make_new,
-    .locals_dict = (mp_obj_dict_t *)&pyb_i2c_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    pyb_i2c_type,
+    MP_QSTR_I2C,
+    MP_TYPE_FLAG_NONE,
+    pyb_i2c_make_new,
+    print, pyb_i2c_print,
+    locals_dict, (mp_obj_dict_t *)&pyb_i2c_locals_dict
+    );
 
 #endif // MICROPY_PY_PYB_LEGACY && MICROPY_HW_ENABLE_HW_I2C
diff --git a/ports/stm32/pyb_spi.c b/ports/stm32/pyb_spi.c
index f2cdcebf2a72f..b1425272feeef 100644
--- a/ports/stm32/pyb_spi.c
+++ b/ports/stm32/pyb_spi.c
@@ -350,11 +350,12 @@ STATIC const mp_machine_spi_p_t pyb_spi_p = {
     .transfer = spi_transfer_machine,
 };
 
-const mp_obj_type_t pyb_spi_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_SPI,
-    .print = pyb_spi_print,
-    .make_new = pyb_spi_make_new,
-    .protocol = &pyb_spi_p,
-    .locals_dict = (mp_obj_dict_t *)&pyb_spi_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    pyb_spi_type,
+    MP_QSTR_SPI,
+    MP_TYPE_FLAG_NONE,
+    pyb_spi_make_new,
+    print, pyb_spi_print,
+    protocol, &pyb_spi_p,
+    locals_dict, (mp_obj_dict_t *)&pyb_spi_locals_dict
+    );
diff --git a/ports/stm32/rtc.c b/ports/stm32/rtc.c
index 55977791b8c24..c7698db1430a3 100644
--- a/ports/stm32/rtc.c
+++ b/ports/stm32/rtc.c
@@ -837,9 +837,10 @@ STATIC const mp_rom_map_elem_t pyb_rtc_locals_dict_table[] = {
 };
 STATIC MP_DEFINE_CONST_DICT(pyb_rtc_locals_dict, pyb_rtc_locals_dict_table);
 
-const mp_obj_type_t pyb_rtc_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_RTC,
-    .make_new = pyb_rtc_make_new,
-    .locals_dict = (mp_obj_dict_t *)&pyb_rtc_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    pyb_rtc_type,
+    MP_QSTR_RTC,
+    MP_TYPE_FLAG_NONE,
+    pyb_rtc_make_new,
+    locals_dict, (mp_obj_dict_t *)&pyb_rtc_locals_dict
+    );
diff --git a/ports/stm32/sdcard.c b/ports/stm32/sdcard.c
index 6f5892570baf2..b9cc051e7f13d 100644
--- a/ports/stm32/sdcard.c
+++ b/ports/stm32/sdcard.c
@@ -872,21 +872,23 @@ STATIC const mp_rom_map_elem_t pyb_sdcard_locals_dict_table[] = {
 STATIC MP_DEFINE_CONST_DICT(pyb_sdcard_locals_dict, pyb_sdcard_locals_dict_table);
 
 #if MICROPY_HW_ENABLE_SDCARD
-const mp_obj_type_t pyb_sdcard_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_SDCard,
-    .make_new = pyb_sdcard_make_new,
-    .locals_dict = (mp_obj_dict_t *)&pyb_sdcard_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    pyb_sdcard_type,
+    MP_QSTR_SDCard,
+    MP_TYPE_FLAG_NONE,
+    pyb_sdcard_make_new,
+    locals_dict, (mp_obj_dict_t *)&pyb_sdcard_locals_dict
+    );
 #endif
 
 #if MICROPY_HW_ENABLE_MMCARD
-const mp_obj_type_t pyb_mmcard_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_MMCard,
-    .make_new = pyb_mmcard_make_new,
-    .locals_dict = (mp_obj_dict_t *)&pyb_sdcard_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    pyb_mmcard_type,
+    MP_QSTR_MMCard,
+    MP_TYPE_FLAG_NONE,
+    pyb_mmcard_make_new,
+    locals_dict, (mp_obj_dict_t *)&pyb_sdcard_locals_dict
+    );
 #endif
 
 void sdcard_init_vfs(fs_user_mount_t *vfs, int part) {
diff --git a/ports/stm32/servo.c b/ports/stm32/servo.c
index 17084224637ec..d552f5e6b5d3a 100644
--- a/ports/stm32/servo.c
+++ b/ports/stm32/servo.c
@@ -336,12 +336,13 @@ STATIC const mp_rom_map_elem_t pyb_servo_locals_dict_table[] = {
 
 STATIC MP_DEFINE_CONST_DICT(pyb_servo_locals_dict, pyb_servo_locals_dict_table);
 
-const mp_obj_type_t pyb_servo_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_Servo,
-    .print = pyb_servo_print,
-    .make_new = pyb_servo_make_new,
-    .locals_dict = (mp_obj_dict_t *)&pyb_servo_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    pyb_servo_type,
+    MP_QSTR_Servo,
+    MP_TYPE_FLAG_NONE,
+    pyb_servo_make_new,
+    print, pyb_servo_print,
+    locals_dict, (mp_obj_dict_t *)&pyb_servo_locals_dict
+    );
 
 #endif // MICROPY_HW_ENABLE_SERVO
diff --git a/ports/stm32/storage.c b/ports/stm32/storage.c
index c33a75f67100c..92f7059493384 100644
--- a/ports/stm32/storage.c
+++ b/ports/stm32/storage.c
@@ -453,13 +453,14 @@ STATIC const mp_rom_map_elem_t pyb_flash_locals_dict_table[] = {
 
 STATIC MP_DEFINE_CONST_DICT(pyb_flash_locals_dict, pyb_flash_locals_dict_table);
 
-const mp_obj_type_t pyb_flash_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_Flash,
-    .print = pyb_flash_print,
-    .make_new = pyb_flash_make_new,
-    .locals_dict = (mp_obj_dict_t *)&pyb_flash_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    pyb_flash_type,
+    MP_QSTR_Flash,
+    MP_TYPE_FLAG_NONE,
+    pyb_flash_make_new,
+    print, pyb_flash_print,
+    locals_dict, (mp_obj_dict_t *)&pyb_flash_locals_dict
+    );
 
 void pyb_flash_init_vfs(fs_user_mount_t *vfs) {
     vfs->base.type = &mp_fat_vfs_type;
diff --git a/ports/stm32/timer.c b/ports/stm32/timer.c
index 518a2e23b4730..abf4c1f3fc4ca 100644
--- a/ports/stm32/timer.c
+++ b/ports/stm32/timer.c
@@ -1471,13 +1471,14 @@ STATIC const mp_rom_map_elem_t pyb_timer_locals_dict_table[] = {
 };
 STATIC MP_DEFINE_CONST_DICT(pyb_timer_locals_dict, pyb_timer_locals_dict_table);
 
-const mp_obj_type_t pyb_timer_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_Timer,
-    .print = pyb_timer_print,
-    .make_new = pyb_timer_make_new,
-    .locals_dict = (mp_obj_dict_t *)&pyb_timer_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    pyb_timer_type,
+    MP_QSTR_Timer,
+    MP_TYPE_FLAG_NONE,
+    pyb_timer_make_new,
+    print, pyb_timer_print,
+    locals_dict, (mp_obj_dict_t *)&pyb_timer_locals_dict
+    );
 
 /// \moduleref pyb
 /// \class TimerChannel - setup a channel for a timer.
@@ -1610,12 +1611,14 @@ STATIC const mp_rom_map_elem_t pyb_timer_channel_locals_dict_table[] = {
 };
 STATIC MP_DEFINE_CONST_DICT(pyb_timer_channel_locals_dict, pyb_timer_channel_locals_dict_table);
 
-STATIC const mp_obj_type_t pyb_timer_channel_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_TimerChannel,
-    .print = pyb_timer_channel_print,
-    .locals_dict = (mp_obj_dict_t *)&pyb_timer_channel_locals_dict,
-};
+STATIC MP_DEFINE_CONST_OBJ_TYPE(
+    pyb_timer_channel_type,
+    MP_QSTR_TimerChannel,
+    MP_TYPE_FLAG_NONE,
+    MP_TYPE_NULL_MAKE_NEW,
+    print, pyb_timer_channel_print,
+    locals_dict, (mp_obj_dict_t *)&pyb_timer_channel_locals_dict
+    );
 
 STATIC void timer_handle_irq_channel(pyb_timer_obj_t *tim, uint8_t channel, mp_obj_t callback) {
     uint32_t irq_mask = TIMER_IRQ_MASK(channel);
diff --git a/ports/stm32/usb.c b/ports/stm32/usb.c
index c5fdd88acfb8f..7c36765c28c1b 100644
--- a/ports/stm32/usb.c
+++ b/ports/stm32/usb.c
@@ -936,16 +936,17 @@ STATIC const mp_stream_p_t pyb_usb_vcp_stream_p = {
     .ioctl = pyb_usb_vcp_ioctl,
 };
 
-const mp_obj_type_t pyb_usb_vcp_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_USB_VCP,
-    .print = pyb_usb_vcp_print,
-    .make_new = pyb_usb_vcp_make_new,
-    .getiter = mp_identity_getiter,
-    .iternext = mp_stream_unbuffered_iter,
-    .protocol = &pyb_usb_vcp_stream_p,
-    .locals_dict = (mp_obj_dict_t *)&pyb_usb_vcp_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    pyb_usb_vcp_type,
+    MP_QSTR_USB_VCP,
+    MP_TYPE_FLAG_NONE,
+    pyb_usb_vcp_make_new,
+    print, pyb_usb_vcp_print,
+    getiter, mp_identity_getiter,
+    iternext, mp_stream_unbuffered_iter,
+    protocol, &pyb_usb_vcp_stream_p,
+    locals_dict, (mp_obj_dict_t *)&pyb_usb_vcp_locals_dict
+    );
 
 /******************************************************************************/
 // MicroPython bindings for USB HID
@@ -1077,13 +1078,14 @@ STATIC const mp_stream_p_t pyb_usb_hid_stream_p = {
     .ioctl = pyb_usb_hid_ioctl,
 };
 
-const mp_obj_type_t pyb_usb_hid_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_USB_HID,
-    .make_new = pyb_usb_hid_make_new,
-    .protocol = &pyb_usb_hid_stream_p,
-    .locals_dict = (mp_obj_dict_t *)&pyb_usb_hid_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    pyb_usb_hid_type,
+    MP_QSTR_USB_HID,
+    MP_TYPE_FLAG_NONE,
+    pyb_usb_hid_make_new,
+    protocol, &pyb_usb_hid_stream_p,
+    locals_dict, (mp_obj_dict_t *)&pyb_usb_hid_locals_dict
+    );
 
 #endif // MICROPY_HW_USB_HID
 
diff --git a/ports/stm32/usrsw.c b/ports/stm32/usrsw.c
index 60aae1c8839da..137f4dabfa5c3 100644
--- a/ports/stm32/usrsw.c
+++ b/ports/stm32/usrsw.c
@@ -134,14 +134,15 @@ STATIC const mp_rom_map_elem_t pyb_switch_locals_dict_table[] = {
 
 STATIC MP_DEFINE_CONST_DICT(pyb_switch_locals_dict, pyb_switch_locals_dict_table);
 
-const mp_obj_type_t pyb_switch_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_Switch,
-    .print = pyb_switch_print,
-    .make_new = pyb_switch_make_new,
-    .call = pyb_switch_call,
-    .locals_dict = (mp_obj_dict_t *)&pyb_switch_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    pyb_switch_type,
+    MP_QSTR_Switch,
+    MP_TYPE_FLAG_NONE,
+    pyb_switch_make_new,
+    print, pyb_switch_print,
+    call, pyb_switch_call,
+    locals_dict, (mp_obj_dict_t *)&pyb_switch_locals_dict
+    );
 
 MP_REGISTER_ROOT_POINTER(mp_obj_t pyb_switch_callback);
 
diff --git a/ports/stm32/wdt.c b/ports/stm32/wdt.c
index d794607bc0a71..e3b8e2e0ae22e 100644
--- a/ports/stm32/wdt.c
+++ b/ports/stm32/wdt.c
@@ -102,9 +102,10 @@ STATIC const mp_rom_map_elem_t pyb_wdt_locals_dict_table[] = {
 
 STATIC MP_DEFINE_CONST_DICT(pyb_wdt_locals_dict, pyb_wdt_locals_dict_table);
 
-const mp_obj_type_t pyb_wdt_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_WDT,
-    .make_new = pyb_wdt_make_new,
-    .locals_dict = (mp_obj_dict_t *)&pyb_wdt_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    pyb_wdt_type,
+    MP_QSTR_WDT,
+    MP_TYPE_FLAG_NONE,
+    pyb_wdt_make_new,
+    locals_dict, (mp_obj_dict_t *)&pyb_wdt_locals_dict
+    );
diff --git a/ports/teensy/led.c b/ports/teensy/led.c
index d79e63cf7102a..ca548431fecad 100644
--- a/ports/teensy/led.c
+++ b/ports/teensy/led.c
@@ -134,10 +134,11 @@ STATIC const mp_rom_map_elem_t led_locals_dict_table[] = {
 
 STATIC MP_DEFINE_CONST_DICT(led_locals_dict, led_locals_dict_table);
 
-const mp_obj_type_t pyb_led_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_LED,
-    .print = led_obj_print,
-    .make_new = led_obj_make_new,
-    .locals_dict = (mp_obj_t)&led_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    pyb_led_type,
+    MP_QSTR_LED,
+    MP_TYPE_FLAG_NONE,
+    led_obj_make_new,
+    print, led_obj_print,
+    locals_dict, (mp_obj_t)&led_locals_dict
+    );
diff --git a/ports/teensy/timer.c b/ports/teensy/timer.c
index 68dc965eb8bc8..4df24743356cc 100644
--- a/ports/teensy/timer.c
+++ b/ports/teensy/timer.c
@@ -746,13 +746,14 @@ STATIC const mp_rom_map_elem_t pyb_timer_locals_dict_table[] = {
 };
 STATIC MP_DEFINE_CONST_DICT(pyb_timer_locals_dict, pyb_timer_locals_dict_table);
 
-const mp_obj_type_t pyb_timer_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_Timer,
-    .print = pyb_timer_print,
-    .make_new = pyb_timer_make_new,
-    .locals_dict = (mp_obj_t)&pyb_timer_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    pyb_timer_type,
+    MP_QSTR_Timer,
+    MP_TYPE_FLAG_NONE,
+    pyb_timer_make_new,
+    print, pyb_timer_print,
+    locals_dict, (mp_obj_t)&pyb_timer_locals_dict
+    );
 
 /// \moduleref pyb
 /// \class TimerChannel - setup a channel for a timer.
@@ -889,12 +890,14 @@ STATIC const mp_rom_map_elem_t pyb_timer_channel_locals_dict_table[] = {
 };
 STATIC MP_DEFINE_CONST_DICT(pyb_timer_channel_locals_dict, pyb_timer_channel_locals_dict_table);
 
-STATIC const mp_obj_type_t pyb_timer_channel_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_TimerChannel,
-    .print = pyb_timer_channel_print,
-    .locals_dict = (mp_obj_t)&pyb_timer_channel_locals_dict,
-};
+STATIC MP_DEFINE_CONST_OBJ_TYPE(
+    pyb_timer_channel_type,
+    MP_QSTR_TimerChannel,
+    MP_TYPE_FLAG_NONE,
+    MP_TYPE_NULL_MAKE_NEW,
+    print, pyb_timer_channel_print,
+    locals_dict, (mp_obj_t)&pyb_timer_channel_locals_dict
+    );
 
 STATIC bool ftm_handle_irq_callback(pyb_timer_obj_t *self, mp_uint_t channel, mp_obj_t callback) {
     // execute callback if it's set
diff --git a/ports/teensy/uart.c b/ports/teensy/uart.c
index 5b63fcb3cdd54..8957d92709468 100644
--- a/ports/teensy/uart.c
+++ b/ports/teensy/uart.c
@@ -483,10 +483,11 @@ STATIC const mp_rom_map_elem_t pyb_uart_locals_dict_table[] = {
 
 STATIC MP_DEFINE_CONST_DICT(pyb_uart_locals_dict, pyb_uart_locals_dict_table);
 
-const mp_obj_type_t pyb_uart_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_UART,
-    .print = pyb_uart_print,
-    .make_new = pyb_uart_make_new,
-    .locals_dict = (mp_obj_t)&pyb_uart_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    pyb_uart_type,
+    MP_QSTR_UART,
+    MP_TYPE_FLAG_NONE,
+    pyb_uart_make_new,
+    print, pyb_uart_print,
+    locals_dict, (mp_obj_t)&pyb_uart_locals_dict
+    );
diff --git a/ports/unix/coverage.c b/ports/unix/coverage.c
index cf425ac4334f8..b4567417a22a8 100644
--- a/ports/unix/coverage.c
+++ b/ports/unix/coverage.c
@@ -106,11 +106,14 @@ STATIC const mp_stream_p_t fileio_stream_p = {
     .ioctl = stest_ioctl,
 };
 
-STATIC const mp_obj_type_t mp_type_stest_fileio = {
-    { &mp_type_type },
-    .protocol = &fileio_stream_p,
-    .locals_dict = (mp_obj_dict_t *)&rawfile_locals_dict,
-};
+STATIC MP_DEFINE_CONST_OBJ_TYPE(
+    mp_type_stest_fileio,
+    MP_QSTR_stest_fileio,
+    MP_TYPE_FLAG_NONE,
+    MP_TYPE_NULL_MAKE_NEW,
+    protocol, &fileio_stream_p,
+    locals_dict, (mp_obj_dict_t *)&rawfile_locals_dict
+    );
 
 // stream read returns non-blocking error
 STATIC mp_uint_t stest_read2(mp_obj_t o_in, void *buf, mp_uint_t size, int *errcode) {
@@ -133,11 +136,14 @@ STATIC const mp_stream_p_t textio_stream_p2 = {
     .is_text = true,
 };
 
-STATIC const mp_obj_type_t mp_type_stest_textio2 = {
-    { &mp_type_type },
-    .protocol = &textio_stream_p2,
-    .locals_dict = (mp_obj_dict_t *)&rawfile_locals_dict2,
-};
+STATIC MP_DEFINE_CONST_OBJ_TYPE(
+    mp_type_stest_textio2,
+    MP_QSTR_stest_textio2,
+    MP_TYPE_FLAG_NONE,
+    MP_TYPE_NULL_MAKE_NEW,
+    protocol, &textio_stream_p2,
+    locals_dict, (mp_obj_dict_t *)&rawfile_locals_dict2
+    );
 
 // str/bytes objects without a valid hash
 STATIC const mp_obj_str_t str_no_hash_obj = {{&mp_type_str}, 0, 10, (const byte *)"0123456789"};
diff --git a/ports/unix/modffi.c b/ports/unix/modffi.c
index 6417b5d3b395c..98f0a1aa0ff68 100644
--- a/ports/unix/modffi.c
+++ b/ports/unix/modffi.c
@@ -421,13 +421,14 @@ STATIC const mp_rom_map_elem_t ffimod_locals_dict_table[] = {
 
 STATIC MP_DEFINE_CONST_DICT(ffimod_locals_dict, ffimod_locals_dict_table);
 
-STATIC const mp_obj_type_t ffimod_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_ffimod,
-    .print = ffimod_print,
-    .make_new = ffimod_make_new,
-    .locals_dict = (mp_obj_dict_t *)&ffimod_locals_dict,
-};
+STATIC MP_DEFINE_CONST_OBJ_TYPE(
+    ffimod_type,
+    MP_QSTR_ffimod,
+    MP_TYPE_FLAG_NONE,
+    ffimod_make_new,
+    print, ffimod_print,
+    locals_dict, (mp_obj_dict_t *)&ffimod_locals_dict
+    );
 
 // FFI function
 
@@ -530,12 +531,14 @@ STATIC mp_obj_t ffifunc_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const
     mp_raise_TypeError(MP_ERROR_TEXT("don't know how to pass object to native function"));
 }
 
-STATIC const mp_obj_type_t ffifunc_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_ffifunc,
-    .print = ffifunc_print,
-    .call = ffifunc_call,
-};
+STATIC MP_DEFINE_CONST_OBJ_TYPE(
+    ffifunc_type,
+    MP_QSTR_ffifunc,
+    MP_TYPE_FLAG_NONE,
+    MP_TYPE_NULL_MAKE_NEW,
+    print, ffifunc_print,
+    call, ffifunc_call
+    );
 
 // FFI callback for Python function
 
@@ -556,12 +559,14 @@ STATIC const mp_rom_map_elem_t fficallback_locals_dict_table[] = {
 };
 STATIC MP_DEFINE_CONST_DICT(fficallback_locals_dict, fficallback_locals_dict_table);
 
-STATIC const mp_obj_type_t fficallback_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_fficallback,
-    .print = fficallback_print,
-    .locals_dict = (mp_obj_dict_t *)&fficallback_locals_dict
-};
+STATIC MP_DEFINE_CONST_OBJ_TYPE(
+    fficallback_type,
+    MP_QSTR_fficallback,
+    MP_TYPE_FLAG_NONE,
+    MP_TYPE_NULL_MAKE_NEW,
+    print, fficallback_print,
+    locals_dict, (mp_obj_dict_t *)&fficallback_locals_dict
+    );
 
 // FFI variable
 
@@ -592,21 +597,25 @@ STATIC const mp_rom_map_elem_t ffivar_locals_dict_table[] = {
 
 STATIC MP_DEFINE_CONST_DICT(ffivar_locals_dict, ffivar_locals_dict_table);
 
-STATIC const mp_obj_type_t ffivar_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_ffivar,
-    .print = ffivar_print,
-    .locals_dict = (mp_obj_dict_t *)&ffivar_locals_dict,
-};
+STATIC MP_DEFINE_CONST_OBJ_TYPE(
+    ffivar_type,
+    MP_QSTR_ffivar,
+    MP_TYPE_FLAG_NONE,
+    MP_TYPE_NULL_MAKE_NEW,
+    print, ffivar_print,
+    locals_dict, (mp_obj_dict_t *)&ffivar_locals_dict
+    );
 
 // Generic opaque storage object (unused)
 
 /*
-STATIC const mp_obj_type_t opaque_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_opaqueval,
-//    .print = opaque_print,
-};
+STATIC MP_DEFINE_CONST_OBJ_TYPE(
+    opaque_type,
+    MP_QSTR_opaqueval,
+    MP_TYPE_FLAG_NONE,
+    MP_TYPE_NULL_MAKE_NEW,
+    //    .print = opaque_print,
+    );
 */
 
 STATIC mp_obj_t mod_ffi_open(size_t n_args, const mp_obj_t *args) {
diff --git a/ports/unix/modjni.c b/ports/unix/modjni.c
index 6fa00731fb753..72f95b645b257 100644
--- a/ports/unix/modjni.c
+++ b/ports/unix/modjni.c
@@ -174,14 +174,16 @@ STATIC const mp_rom_map_elem_t jclass_locals_dict_table[] = {
 
 STATIC MP_DEFINE_CONST_DICT(jclass_locals_dict, jclass_locals_dict_table);
 
-STATIC const mp_obj_type_t jclass_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_jclass,
-    .print = jclass_print,
-    .attr = jclass_attr,
-    .call = jclass_call,
-    .locals_dict = (mp_obj_dict_t *)&jclass_locals_dict,
-};
+STATIC MP_DEFINE_CONST_OBJ_TYPE(
+    jclass_type,
+    MP_QSTR_jclass,
+    MP_TYPE_FLAG_NONE,
+    MP_TYPE_NULL_MAKE_NEW,
+    print, jclass_print,
+    attr, jclass_attr,
+    call, jclass_call,
+    locals_dict, (mp_obj_dict_t *)&jclass_locals_dict
+    );
 
 STATIC mp_obj_t new_jclass(jclass jc) {
     mp_obj_jclass_t *o = mp_obj_malloc(mp_obj_jclass_t, &jclass_type);
@@ -320,16 +322,18 @@ STATIC mp_obj_t subscr_getiter(mp_obj_t self_in, mp_obj_iter_buf_t *iter_buf) {
     return mp_obj_new_getitem_iter(dest, iter_buf);
 }
 
-STATIC const mp_obj_type_t jobject_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_jobject,
-    .print = jobject_print,
-    .unary_op = jobject_unary_op,
-    .attr = jobject_attr,
-    .subscr = jobject_subscr,
-    .getiter = subscr_getiter,
-//    .locals_dict = (mp_obj_dict_t*)&jobject_locals_dict,
-};
+STATIC MP_DEFINE_CONST_OBJ_TYPE(
+    jobject_type,
+    MP_QSTR_jobject,
+    MP_TYPE_FLAG_NONE,
+    MP_TYPE_NULL_MAKE_NEW,
+    print, jobject_print,
+    unary_op, jobject_unary_op,
+    attr, jobject_attr,
+    subscr, jobject_subscr,
+    getiter, subscr_getiter,
+    //    .locals_dict = (mp_obj_dict_t*)&jobject_locals_dict,
+    );
 
 STATIC mp_obj_t new_jobject(jobject jo) {
     if (jo == NULL) {
@@ -567,14 +571,16 @@ STATIC mp_obj_t jmethod_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const
     return call_method(self->obj, name, methods, false, n_args, args);
 }
 
-STATIC const mp_obj_type_t jmethod_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_jmethod,
-    .print = jmethod_print,
-    .call = jmethod_call,
-//    .attr = jobject_attr,
-//    .locals_dict = (mp_obj_dict_t*)&jobject_locals_dict,
-};
+STATIC MP_DEFINE_CONST_OBJ_TYPE(
+    jmethod_type,
+    MP_QSTR_jmethod,
+    MP_TYPE_FLAG_NONE,
+    MP_TYPE_NULL_MAKE_NEW,
+    print, jmethod_print,
+    call, jmethod_call,
+    //    .attr = jobject_attr,
+    //    .locals_dict = (mp_obj_dict_t*)&jobject_locals_dict,
+    );
 
 #ifdef __ANDROID__
 #define LIBJVM_SO "libdvm.so"
diff --git a/ports/unix/moduselect.c b/ports/unix/moduselect.c
index 2de4a316edb99..d8a8d1d8c38b7 100644
--- a/ports/unix/moduselect.c
+++ b/ports/unix/moduselect.c
@@ -311,13 +311,15 @@ STATIC const mp_rom_map_elem_t poll_locals_dict_table[] = {
 };
 STATIC MP_DEFINE_CONST_DICT(poll_locals_dict, poll_locals_dict_table);
 
-STATIC const mp_obj_type_t mp_type_poll = {
-    { &mp_type_type },
-    .name = MP_QSTR_poll,
-    .getiter = mp_identity_getiter,
-    .iternext = poll_iternext,
-    .locals_dict = (void *)&poll_locals_dict,
-};
+STATIC MP_DEFINE_CONST_OBJ_TYPE(
+    mp_type_poll,
+    MP_QSTR_poll,
+    MP_TYPE_FLAG_NONE,
+    MP_TYPE_NULL_MAKE_NEW,
+    getiter, mp_identity_getiter,
+    iternext, poll_iternext,
+    locals_dict, (void *)&poll_locals_dict
+    );
 
 STATIC mp_obj_t select_poll(size_t n_args, const mp_obj_t *args) {
     int alloc = 4;
diff --git a/ports/unix/modusocket.c b/ports/unix/modusocket.c
index 72c70d1750b53..7e4476cbd0add 100644
--- a/ports/unix/modusocket.c
+++ b/ports/unix/modusocket.c
@@ -516,16 +516,17 @@ STATIC const mp_stream_p_t usocket_stream_p = {
     .ioctl = socket_ioctl,
 };
 
-const mp_obj_type_t mp_type_socket = {
-    { &mp_type_type },
-    .name = MP_QSTR_socket,
-    .print = socket_print,
-    .make_new = socket_make_new,
-    .getiter = NULL,
-    .iternext = NULL,
-    .protocol = &usocket_stream_p,
-    .locals_dict = (mp_obj_dict_t *)&usocket_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    mp_type_socket,
+    MP_QSTR_socket,
+    MP_TYPE_FLAG_NONE,
+    socket_make_new,
+    print, socket_print,
+    getiter, NULL,
+    iternext, NULL,
+    protocol, &usocket_stream_p,
+    locals_dict, (mp_obj_dict_t *)&usocket_locals_dict
+    );
 
 #define BINADDR_MAX_LEN sizeof(struct in6_addr)
 STATIC mp_obj_t mod_socket_inet_pton(mp_obj_t family_in, mp_obj_t addr_in) {
diff --git a/ports/zephyr/machine_i2c.c b/ports/zephyr/machine_i2c.c
index 9bb63229ddb5d..60a1924d803d3 100644
--- a/ports/zephyr/machine_i2c.c
+++ b/ports/zephyr/machine_i2c.c
@@ -126,13 +126,14 @@ STATIC const mp_machine_i2c_p_t machine_hard_i2c_p = {
     .transfer_single = machine_hard_i2c_transfer_single,
 };
 
-const mp_obj_type_t machine_hard_i2c_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_I2C,
-    .print = machine_hard_i2c_print,
-    .make_new = machine_hard_i2c_make_new,
-    .protocol = &machine_hard_i2c_p,
-    .locals_dict = (mp_obj_dict_t *)&mp_machine_i2c_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    machine_hard_i2c_type,
+    MP_QSTR_I2C,
+    MP_TYPE_FLAG_NONE,
+    machine_hard_i2c_make_new,
+    print, machine_hard_i2c_print,
+    protocol, &machine_hard_i2c_p,
+    locals_dict, (mp_obj_dict_t *)&mp_machine_i2c_locals_dict
+    );
 
 #endif // MICROPY_PY_MACHINE_I2C
diff --git a/ports/zephyr/machine_pin.c b/ports/zephyr/machine_pin.c
index aa55c04104e46..48303edd8167e 100644
--- a/ports/zephyr/machine_pin.c
+++ b/ports/zephyr/machine_pin.c
@@ -285,15 +285,16 @@ STATIC const mp_pin_p_t machine_pin_pin_p = {
     .ioctl = machine_pin_ioctl,
 };
 
-const mp_obj_type_t machine_pin_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_Pin,
-    .print = machine_pin_print,
-    .make_new = mp_pin_make_new,
-    .call = machine_pin_call,
-    .protocol = &machine_pin_pin_p,
-    .locals_dict = (mp_obj_t)&machine_pin_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    machine_pin_type,
+    MP_QSTR_Pin,
+    MP_TYPE_FLAG_NONE,
+    mp_pin_make_new,
+    print, machine_pin_print,
+    call, machine_pin_call,
+    protocol, &machine_pin_pin_p,
+    locals_dict, (mp_obj_t)&machine_pin_locals_dict
+    );
 
 STATIC mp_uint_t machine_pin_irq_trigger(mp_obj_t self_in, mp_uint_t new_trigger) {
     machine_pin_obj_t *self = MP_OBJ_TO_PTR(self_in);
diff --git a/ports/zephyr/machine_spi.c b/ports/zephyr/machine_spi.c
index 2b0911c5917e5..6d9bf896b06d9 100644
--- a/ports/zephyr/machine_spi.c
+++ b/ports/zephyr/machine_spi.c
@@ -197,13 +197,14 @@ STATIC const mp_machine_spi_p_t machine_hard_spi_p = {
     .transfer = machine_hard_spi_transfer,
 };
 
-const mp_obj_type_t machine_hard_spi_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_SPI,
-    .print = machine_hard_spi_print,
-    .make_new = machine_hard_spi_make_new,
-    .protocol = &machine_hard_spi_p,
-    .locals_dict = (mp_obj_dict_t *)&mp_machine_spi_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    machine_hard_spi_type,
+    MP_QSTR_SPI,
+    MP_TYPE_FLAG_NONE,
+    machine_hard_spi_make_new,
+    print, machine_hard_spi_print,
+    protocol, &machine_hard_spi_p,
+    locals_dict, (mp_obj_dict_t *)&mp_machine_spi_locals_dict
+    );
 
 #endif // MICROPY_PY_MACHINE_SPI
diff --git a/ports/zephyr/machine_uart.c b/ports/zephyr/machine_uart.c
index 3520795c5aad4..3f5df7465791b 100644
--- a/ports/zephyr/machine_uart.c
+++ b/ports/zephyr/machine_uart.c
@@ -154,13 +154,14 @@ STATIC const mp_stream_p_t uart_stream_p = {
     .is_text = false,
 };
 
-const mp_obj_type_t machine_uart_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_UART,
-    .print = machine_uart_print,
-    .make_new = machine_uart_make_new,
-    .getiter = mp_identity_getiter,
-    .iternext = mp_stream_unbuffered_iter,
-    .protocol = &uart_stream_p,
-    .locals_dict = (mp_obj_dict_t *)&machine_uart_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    machine_uart_type,
+    MP_QSTR_UART,
+    MP_TYPE_FLAG_NONE,
+    machine_uart_make_new,
+    print, machine_uart_print,
+    getiter, mp_identity_getiter,
+    iternext, mp_stream_unbuffered_iter,
+    protocol, &uart_stream_p,
+    locals_dict, (mp_obj_dict_t *)&machine_uart_locals_dict
+    );
diff --git a/ports/zephyr/modusocket.c b/ports/zephyr/modusocket.c
index 17cf9babd3333..a7bef74ca6deb 100644
--- a/ports/zephyr/modusocket.c
+++ b/ports/zephyr/modusocket.c
@@ -353,14 +353,15 @@ STATIC const mp_stream_p_t socket_stream_p = {
     .ioctl = sock_ioctl,
 };
 
-STATIC const mp_obj_type_t socket_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_socket,
-    .print = socket_print,
-    .make_new = socket_make_new,
-    .protocol = &socket_stream_p,
-    .locals_dict = (mp_obj_t)&socket_locals_dict,
-};
+STATIC MP_DEFINE_CONST_OBJ_TYPE(
+    socket_type,
+    MP_QSTR_socket,
+    MP_TYPE_FLAG_NONE,
+    socket_make_new,
+    print, socket_print,
+    protocol, &socket_stream_p,
+    locals_dict, (mp_obj_t)&socket_locals_dict
+    );
 
 //
 // getaddrinfo() implementation
diff --git a/ports/zephyr/modzsensor.c b/ports/zephyr/modzsensor.c
index ba6717046fa42..7c0b0193d3269 100644
--- a/ports/zephyr/modzsensor.c
+++ b/ports/zephyr/modzsensor.c
@@ -105,12 +105,13 @@ STATIC const mp_rom_map_elem_t sensor_locals_dict_table[] = {
 
 STATIC MP_DEFINE_CONST_DICT(sensor_locals_dict, sensor_locals_dict_table);
 
-STATIC const mp_obj_type_t sensor_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_Sensor,
-    .make_new = sensor_make_new,
-    .locals_dict = (void *)&sensor_locals_dict,
-};
+STATIC MP_DEFINE_CONST_OBJ_TYPE(
+    sensor_type,
+    MP_QSTR_Sensor,
+    MP_TYPE_FLAG_NONE,
+    sensor_make_new,
+    locals_dict, (void *)&sensor_locals_dict
+    );
 
 STATIC const mp_rom_map_elem_t mp_module_zsensor_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_zsensor) },
diff --git a/ports/zephyr/zephyr_storage.c b/ports/zephyr/zephyr_storage.c
index 1179c3fda809b..ded7caa657632 100644
--- a/ports/zephyr/zephyr_storage.c
+++ b/ports/zephyr/zephyr_storage.c
@@ -128,13 +128,14 @@ STATIC const mp_rom_map_elem_t zephyr_disk_access_locals_dict_table[] = {
 };
 STATIC MP_DEFINE_CONST_DICT(zephyr_disk_access_locals_dict, zephyr_disk_access_locals_dict_table);
 
-const mp_obj_type_t zephyr_disk_access_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_DiskAccess,
-    .print = zephyr_disk_access_print,
-    .make_new = zephyr_disk_access_make_new,
-    .locals_dict = (mp_obj_dict_t *)&zephyr_disk_access_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    zephyr_disk_access_type,
+    MP_QSTR_DiskAccess,
+    MP_TYPE_FLAG_NONE,
+    zephyr_disk_access_make_new,
+    print, zephyr_disk_access_print,
+    locals_dict, (mp_obj_dict_t *)&zephyr_disk_access_locals_dict
+    );
 #endif // CONFIG_DISK_ACCESS
 
 #ifdef CONFIG_FLASH_MAP
@@ -249,11 +250,12 @@ STATIC const mp_rom_map_elem_t zephyr_flash_area_locals_dict_table[] = {
 };
 STATIC MP_DEFINE_CONST_DICT(zephyr_flash_area_locals_dict, zephyr_flash_area_locals_dict_table);
 
-const mp_obj_type_t zephyr_flash_area_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_FlashArea,
-    .print = zephyr_flash_area_print,
-    .make_new = zephyr_flash_area_make_new,
-    .locals_dict = (mp_obj_dict_t *)&zephyr_flash_area_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    zephyr_flash_area_type,
+    MP_QSTR_FlashArea,
+    MP_TYPE_FLAG_NONE,
+    zephyr_flash_area_make_new,
+    print, zephyr_flash_area_print,
+    locals_dict, (mp_obj_dict_t *)&zephyr_flash_area_locals_dict
+    );
 #endif // CONFIG_FLASH_MAP
diff --git a/py/builtinevex.c b/py/builtinevex.c
index 73b77b40b70fd..403cd95a9deef 100644
--- a/py/builtinevex.c
+++ b/py/builtinevex.c
@@ -38,10 +38,12 @@ typedef struct _mp_obj_code_t {
     mp_obj_t module_fun;
 } mp_obj_code_t;
 
-STATIC const mp_obj_type_t mp_type_code = {
-    { &mp_type_type },
-    .name = MP_QSTR_code,
-};
+STATIC MP_DEFINE_CONST_OBJ_TYPE(
+    mp_type_code,
+    MP_QSTR_code,
+    MP_TYPE_FLAG_NONE,
+    MP_TYPE_NULL_MAKE_NEW
+    );
 
 STATIC mp_obj_t code_execute(mp_obj_code_t *self, mp_obj_dict_t *globals, mp_obj_dict_t *locals) {
     // save context and set new context
diff --git a/py/modio.c b/py/modio.c
index d44c1948ab27a..093cb1f7e78d2 100644
--- a/py/modio.c
+++ b/py/modio.c
@@ -97,12 +97,13 @@ STATIC const mp_stream_p_t iobase_p = {
     .ioctl = iobase_ioctl,
 };
 
-STATIC const mp_obj_type_t mp_type_iobase = {
-    { &mp_type_type },
-    .name = MP_QSTR_IOBase,
-    .make_new = iobase_make_new,
-    .protocol = &iobase_p,
-};
+STATIC MP_DEFINE_CONST_OBJ_TYPE(
+    mp_type_iobase,
+    MP_QSTR_IOBase,
+    MP_TYPE_FLAG_NONE,
+    iobase_make_new,
+    protocol, &iobase_p
+    );
 
 #endif // MICROPY_PY_IO_IOBASE
 
@@ -191,13 +192,14 @@ STATIC const mp_stream_p_t bufwriter_stream_p = {
     .write = bufwriter_write,
 };
 
-STATIC const mp_obj_type_t mp_type_bufwriter = {
-    { &mp_type_type },
-    .name = MP_QSTR_BufferedWriter,
-    .make_new = bufwriter_make_new,
-    .protocol = &bufwriter_stream_p,
-    .locals_dict = (mp_obj_dict_t *)&bufwriter_locals_dict,
-};
+STATIC MP_DEFINE_CONST_OBJ_TYPE(
+    mp_type_bufwriter,
+    MP_QSTR_BufferedWriter,
+    MP_TYPE_FLAG_NONE,
+    bufwriter_make_new,
+    protocol, &bufwriter_stream_p,
+    locals_dict, (mp_obj_dict_t *)&bufwriter_locals_dict
+    );
 #endif // MICROPY_PY_IO_BUFFEREDWRITER
 
 STATIC const mp_rom_map_elem_t mp_module_io_globals_table[] = {
diff --git a/py/modthread.c b/py/modthread.c
index bad94fbf2f088..0a154474252d1 100644
--- a/py/modthread.c
+++ b/py/modthread.c
@@ -116,11 +116,13 @@ STATIC const mp_rom_map_elem_t thread_lock_locals_dict_table[] = {
 
 STATIC MP_DEFINE_CONST_DICT(thread_lock_locals_dict, thread_lock_locals_dict_table);
 
-STATIC const mp_obj_type_t mp_type_thread_lock = {
-    { &mp_type_type },
-    .name = MP_QSTR_lock,
-    .locals_dict = (mp_obj_dict_t *)&thread_lock_locals_dict,
-};
+STATIC MP_DEFINE_CONST_OBJ_TYPE(
+    mp_type_thread_lock,
+    MP_QSTR_lock,
+    MP_TYPE_FLAG_NONE,
+    MP_TYPE_NULL_MAKE_NEW,
+    locals_dict, (mp_obj_dict_t *)&thread_lock_locals_dict
+    );
 
 /****************************************************************/
 // _thread module
diff --git a/py/objarray.c b/py/objarray.c
index dca41c2931d66..d93cce29eef5a 100644
--- a/py/objarray.c
+++ b/py/objarray.c
@@ -571,54 +571,55 @@ STATIC mp_int_t array_get_buffer(mp_obj_t o_in, mp_buffer_info_t *bufinfo, mp_ui
 }
 
 #if MICROPY_PY_ARRAY
-const mp_obj_type_t mp_type_array = {
-    { &mp_type_type },
-    .name = MP_QSTR_array,
-    .print = array_print,
-    .make_new = array_make_new,
-    .getiter = array_iterator_new,
-    .unary_op = array_unary_op,
-    .binary_op = array_binary_op,
-    .subscr = array_subscr,
-    .buffer_p = array_get_buffer,
-    .locals_dict = (mp_obj_dict_t *)&mp_obj_array_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    mp_type_array,
+    MP_QSTR_array,
+    MP_TYPE_FLAG_NONE,
+    array_make_new,
+    print, array_print,
+    getiter, array_iterator_new,
+    unary_op, array_unary_op,
+    binary_op, array_binary_op,
+    subscr, array_subscr,
+    buffer, array_get_buffer,
+    locals_dict, (mp_obj_dict_t *)&mp_obj_array_locals_dict
+    );
 #endif
 
 #if MICROPY_PY_BUILTINS_BYTEARRAY
-const mp_obj_type_t mp_type_bytearray = {
-    { &mp_type_type },
-    .flags = MP_TYPE_FLAG_EQ_CHECKS_OTHER_TYPE,
-    .name = MP_QSTR_bytearray,
-    .print = array_print,
-    .make_new = bytearray_make_new,
-    .getiter = array_iterator_new,
-    .unary_op = array_unary_op,
-    .binary_op = array_binary_op,
-    .subscr = array_subscr,
-    .buffer = array_get_buffer,
-    .locals_dict = (mp_obj_dict_t *)&mp_obj_bytearray_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    mp_type_bytearray,
+    MP_QSTR_bytearray,
+    MP_TYPE_FLAG_EQ_CHECKS_OTHER_TYPE,
+    bytearray_make_new,
+    print, array_print,
+    getiter, array_iterator_new,
+    unary_op, array_unary_op,
+    binary_op, array_binary_op,
+    subscr, array_subscr,
+    buffer, array_get_buffer,
+    locals_dict, (mp_obj_dict_t *)&mp_obj_bytearray_locals_dict
+    );
 #endif
 
 #if MICROPY_PY_BUILTINS_MEMORYVIEW
-const mp_obj_type_t mp_type_memoryview = {
-    { &mp_type_type },
-    .flags = MP_TYPE_FLAG_EQ_CHECKS_OTHER_TYPE,
-    .name = MP_QSTR_memoryview,
-    .make_new = memoryview_make_new,
-    .getiter = array_iterator_new,
-    .unary_op = array_unary_op,
-    .binary_op = array_binary_op,
+MP_DEFINE_CONST_OBJ_TYPE(
+    mp_type_memoryview,
+    MP_QSTR_memoryview,
+    MP_TYPE_FLAG_EQ_CHECKS_OTHER_TYPE,
+    memoryview_make_new,
+    getiter, array_iterator_new,
+    unary_op, array_unary_op,
+    binary_op, array_binary_op,
     #if MICROPY_PY_BUILTINS_MEMORYVIEW_ITEMSIZE
-    .attr = memoryview_attr,
+    attr, memoryview_attr,
     #endif
     #if MICROPY_PY_BUILTINS_BYTES_HEX
-    .locals_dict = (mp_obj_dict_t *)&mp_obj_memoryview_locals_dict,
+    locals_dict, (mp_obj_dict_t *)&mp_obj_memoryview_locals_dict,
     #endif
     .subscr = array_subscr,
     .buffer = array_get_buffer,
-};
+    );
 #endif
 
 /* unused
@@ -664,12 +665,14 @@ STATIC mp_obj_t array_it_iternext(mp_obj_t self_in) {
     }
 }
 
-STATIC const mp_obj_type_t mp_type_array_it = {
-    { &mp_type_type },
-    .name = MP_QSTR_iterator,
-    .getiter = mp_identity_getiter,
-    .iternext = array_it_iternext,
-};
+STATIC MP_DEFINE_CONST_OBJ_TYPE(
+    mp_type_array_it,
+    MP_QSTR_iterator,
+    MP_TYPE_FLAG_NONE,
+    MP_TYPE_NULL_MAKE_NEW,
+    getiter, mp_identity_getiter,
+    iternext, array_it_iternext
+    );
 
 STATIC mp_obj_t array_iterator_new(mp_obj_t array_in, mp_obj_iter_buf_t *iter_buf) {
     assert(sizeof(mp_obj_array_t) <= sizeof(mp_obj_iter_buf_t));
diff --git a/py/objattrtuple.c b/py/objattrtuple.c
index 13c281aa1c600..0d41ee52354a4 100644
--- a/py/objattrtuple.c
+++ b/py/objattrtuple.c
@@ -80,15 +80,18 @@ mp_obj_t mp_obj_new_attrtuple(const qstr *fields, size_t n, const mp_obj_t *item
     return MP_OBJ_FROM_PTR(o);
 }
 
-const mp_obj_type_t mp_type_attrtuple = {
-    { &mp_type_type },
-    .name = MP_QSTR_tuple, // reuse tuple to save on a qstr
-    .print = mp_obj_attrtuple_print,
-    .unary_op = mp_obj_tuple_unary_op,
-    .binary_op = mp_obj_tuple_binary_op,
-    .attr = mp_obj_attrtuple_attr,
-    .subscr = mp_obj_tuple_subscr,
-    .getiter = mp_obj_tuple_getiter,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    mp_type_attrtuple,
+    MP_QSTR_tuple,
+    MP_TYPE_FLAG_NONE,
+    MP_TYPE_NULL_MAKE_NEW,
+    // reuse tuple to save on a qstr
+    print, mp_obj_attrtuple_print,
+    unary_op, mp_obj_tuple_unary_op,
+    binary_op, mp_obj_tuple_binary_op,
+    attr, mp_obj_attrtuple_attr,
+    subscr, mp_obj_tuple_subscr,
+    getiter, mp_obj_tuple_getiter
+    );
 
 #endif // MICROPY_PY_ATTRTUPLE
diff --git a/py/objbool.c b/py/objbool.c
index 23e023d8cbc15..5d014bbb8eaf8 100644
--- a/py/objbool.c
+++ b/py/objbool.c
@@ -84,15 +84,16 @@ STATIC mp_obj_t bool_binary_op(mp_binary_op_t op, mp_obj_t lhs_in, mp_obj_t rhs_
     return mp_binary_op(op, MP_OBJ_NEW_SMALL_INT(value), rhs_in);
 }
 
-const mp_obj_type_t mp_type_bool = {
-    { &mp_type_type },
-    .flags = MP_TYPE_FLAG_EQ_CHECKS_OTHER_TYPE, // can match all numeric types
-    .name = MP_QSTR_bool,
-    .print = bool_print,
-    .make_new = bool_make_new,
-    .unary_op = bool_unary_op,
-    .binary_op = bool_binary_op,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    // can match all numeric types
+    mp_type_bool,
+    MP_QSTR_bool,
+    MP_TYPE_FLAG_EQ_CHECKS_OTHER_TYPE,
+    bool_make_new,
+    print, bool_print,
+    unary_op, bool_unary_op,
+    binary_op, bool_binary_op
+    );
 
 #if !MICROPY_OBJ_IMMEDIATE_OBJS
 const mp_obj_bool_t mp_const_false_obj = {{&mp_type_bool}, false};
diff --git a/py/objboundmeth.c b/py/objboundmeth.c
index 9936c06e494b2..353364cdc70ab 100644
--- a/py/objboundmeth.c
+++ b/py/objboundmeth.c
@@ -95,17 +95,19 @@ STATIC void bound_meth_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
 }
 #endif
 
-STATIC const mp_obj_type_t mp_type_bound_meth = {
-    { &mp_type_type },
-    .name = MP_QSTR_bound_method,
+STATIC MP_DEFINE_CONST_OBJ_TYPE(
+    mp_type_bound_meth,
+    MP_QSTR_bound_method,
+    MP_TYPE_FLAG_NONE,
+    MP_TYPE_NULL_MAKE_NEW,
     #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_DETAILED
-    .print = bound_meth_print,
+    print, bound_meth_print,
     #endif
-    .call = bound_meth_call,
+    call, bound_meth_call
     #if MICROPY_PY_FUNCTION_ATTRS
-    .attr = bound_meth_attr,
+    , attr, bound_meth_attr
     #endif
-};
+    );
 
 mp_obj_t mp_obj_new_bound_meth(mp_obj_t meth, mp_obj_t self) {
     mp_obj_bound_meth_t *o = mp_obj_malloc(mp_obj_bound_meth_t, &mp_type_bound_meth);
diff --git a/py/objcell.c b/py/objcell.c
index cab0d0b030ee7..a17a94b9b78e9 100644
--- a/py/objcell.c
+++ b/py/objcell.c
@@ -40,13 +40,13 @@ STATIC void cell_print(const mp_print_t *print, mp_obj_t o_in, mp_print_kind_t k
 }
 #endif
 
-STATIC const mp_obj_type_t mp_type_cell = {
-    { &mp_type_type },
-    .name = MP_QSTR_, // cell representation is just value in < >
+STATIC MP_DEFINE_CONST_OBJ_TYPE(
+    // cell representation is just value in < >
+    mp_type_cell, MP_QSTR_, MP_TYPE_FLAG_NONE, MP_TYPE_NULL_MAKE_NEW
     #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_DETAILED
-    .print = cell_print,
+    , print, cell_print
     #endif
-};
+    );
 
 mp_obj_t mp_obj_new_cell(mp_obj_t obj) {
     mp_obj_cell_t *o = mp_obj_malloc(mp_obj_cell_t, &mp_type_cell);
diff --git a/py/objclosure.c b/py/objclosure.c
index 5b9923a44bc77..15ed994d37263 100644
--- a/py/objclosure.c
+++ b/py/objclosure.c
@@ -86,18 +86,19 @@ STATIC void mp_obj_closure_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
 }
 #endif
 
-const mp_obj_type_t mp_type_closure = {
-    { &mp_type_type },
-    .flags = MP_TYPE_FLAG_BINDS_SELF,
-    .name = MP_QSTR_closure,
+MP_DEFINE_CONST_OBJ_TYPE(
+    mp_type_closure,
+    MP_QSTR_closure,
+    MP_TYPE_FLAG_BINDS_SELF,
+    MP_TYPE_NULL_MAKE_NEW,
     #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_DETAILED
-    .print = closure_print,
+    print, closure_print,
     #endif
-    .call = closure_call,
     #if MICROPY_PY_FUNCTION_ATTRS
-    .attr = mp_obj_closure_attr,
+    attr, mp_obj_closure_attr,
     #endif
-};
+    call, closure_call
+    );
 
 mp_obj_t mp_obj_new_closure(mp_obj_t fun, size_t n_closed_over, const mp_obj_t *closed) {
     mp_obj_closure_t *o = mp_obj_malloc_var(mp_obj_closure_t, mp_obj_t, n_closed_over, &mp_type_closure);
diff --git a/py/objcomplex.c b/py/objcomplex.c
index 4aa598a0bcb7d..cf213d718a793 100644
--- a/py/objcomplex.c
+++ b/py/objcomplex.c
@@ -151,16 +151,13 @@ STATIC void complex_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
     }
 }
 
-const mp_obj_type_t mp_type_complex = {
-    { &mp_type_type },
-    .flags = MP_TYPE_FLAG_EQ_NOT_REFLEXIVE | MP_TYPE_FLAG_EQ_CHECKS_OTHER_TYPE,
-    .name = MP_QSTR_complex,
-    .print = complex_print,
-    .make_new = complex_make_new,
-    .unary_op = complex_unary_op,
-    .binary_op = complex_binary_op,
-    .attr = complex_attr,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    mp_type_complex, MP_QSTR_complex, MP_TYPE_FLAG_EQ_NOT_REFLEXIVE | MP_TYPE_FLAG_EQ_CHECKS_OTHER_TYPE, complex_make_new,
+    print, complex_print,
+    unary_op, complex_unary_op,
+    binary_op, complex_binary_op,
+    attr, complex_attr
+    );
 
 mp_obj_t mp_obj_new_complex(mp_float_t real, mp_float_t imag) {
     mp_obj_complex_t *o = mp_obj_malloc(mp_obj_complex_t, &mp_type_complex);
diff --git a/py/objdeque.c b/py/objdeque.c
index b1c59a81e9f3c..22770317ab31a 100644
--- a/py/objdeque.c
+++ b/py/objdeque.c
@@ -155,12 +155,13 @@ STATIC const mp_rom_map_elem_t deque_locals_dict_table[] = {
 
 STATIC MP_DEFINE_CONST_DICT(deque_locals_dict, deque_locals_dict_table);
 
-const mp_obj_type_t mp_type_deque = {
-    { &mp_type_type },
-    .name = MP_QSTR_deque,
-    .make_new = deque_make_new,
-    .unary_op = deque_unary_op,
-    .locals_dict = (mp_obj_dict_t *)&deque_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    mp_type_deque,
+    MP_QSTR_deque,
+    MP_TYPE_FLAG_NONE,
+    deque_make_new,
+    unary_op, deque_unary_op,
+    locals_dict, (mp_obj_dict_t *)&deque_locals_dict
+    );
 
 #endif // MICROPY_PY_COLLECTIONS_DEQUE
diff --git a/py/objdict.c b/py/objdict.c
index 1d8e9059a188d..6e217d5c9a716 100644
--- a/py/objdict.c
+++ b/py/objdict.c
@@ -461,12 +461,14 @@ STATIC mp_obj_t dict_view_it_iternext(mp_obj_t self_in) {
     }
 }
 
-STATIC const mp_obj_type_t mp_type_dict_view_it = {
-    { &mp_type_type },
-    .name = MP_QSTR_iterator,
-    .getiter = mp_identity_getiter,
-    .iternext = dict_view_it_iternext,
-};
+STATIC MP_DEFINE_CONST_OBJ_TYPE(
+    mp_type_dict_view_it,
+    MP_QSTR_iterator,
+    MP_TYPE_FLAG_NONE,
+    MP_TYPE_NULL_MAKE_NEW,
+    getiter, mp_identity_getiter,
+    iternext, dict_view_it_iternext
+    );
 
 STATIC mp_obj_t dict_view_getiter(mp_obj_t view_in, mp_obj_iter_buf_t *iter_buf) {
     assert(sizeof(mp_obj_dict_view_it_t) <= sizeof(mp_obj_iter_buf_t));
@@ -512,13 +514,15 @@ STATIC mp_obj_t dict_view_binary_op(mp_binary_op_t op, mp_obj_t lhs_in, mp_obj_t
     return dict_binary_op(op, o->dict, rhs_in);
 }
 
-STATIC const mp_obj_type_t mp_type_dict_view = {
-    { &mp_type_type },
-    .name = MP_QSTR_dict_view,
-    .print = dict_view_print,
-    .binary_op = dict_view_binary_op,
-    .getiter = dict_view_getiter,
-};
+STATIC MP_DEFINE_CONST_OBJ_TYPE(
+    mp_type_dict_view,
+    MP_QSTR_dict_view,
+    MP_TYPE_FLAG_NONE,
+    MP_TYPE_NULL_MAKE_NEW,
+    print, dict_view_print,
+    binary_op, dict_view_binary_op,
+    getiter, dict_view_getiter
+    );
 
 STATIC mp_obj_t mp_obj_new_dict_view(mp_obj_t dict, mp_dict_view_kind_t kind) {
     mp_obj_dict_view_t *o = mp_obj_malloc(mp_obj_dict_view_t, &mp_type_dict_view);
@@ -585,31 +589,33 @@ STATIC const mp_rom_map_elem_t dict_locals_dict_table[] = {
 
 STATIC MP_DEFINE_CONST_DICT(dict_locals_dict, dict_locals_dict_table);
 
-const mp_obj_type_t mp_type_dict = {
-    { &mp_type_type },
-    .name = MP_QSTR_dict,
-    .print = dict_print,
-    .make_new = mp_obj_dict_make_new,
-    .unary_op = dict_unary_op,
-    .binary_op = dict_binary_op,
-    .subscr = dict_subscr,
-    .getiter = dict_getiter,
-    .locals_dict = (mp_obj_dict_t *)&dict_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    mp_type_dict,
+    MP_QSTR_dict,
+    MP_TYPE_FLAG_NONE,
+    mp_obj_dict_make_new,
+    print, dict_print,
+    unary_op, dict_unary_op,
+    binary_op, dict_binary_op,
+    subscr, dict_subscr,
+    getiter, dict_getiter,
+    locals_dict, (mp_obj_dict_t *)&dict_locals_dict
+    );
 
 #if MICROPY_PY_COLLECTIONS_ORDEREDDICT
-const mp_obj_type_t mp_type_ordereddict = {
-    { &mp_type_type },
-    .name = MP_QSTR_OrderedDict,
-    .print = dict_print,
-    .make_new = mp_obj_dict_make_new,
-    .unary_op = dict_unary_op,
-    .binary_op = dict_binary_op,
-    .subscr = dict_subscr,
-    .getiter = dict_getiter,
-    .parent = &mp_type_dict,
-    .locals_dict = (mp_obj_dict_t *)&dict_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    mp_type_ordereddict,
+    MP_QSTR_OrderedDict,
+    MP_TYPE_FLAG_NONE,
+    mp_obj_dict_make_new,
+    print, dict_print,
+    unary_op, dict_unary_op,
+    binary_op, dict_binary_op,
+    subscr, dict_subscr,
+    getiter, dict_getiter,
+    parent, &mp_type_dict,
+    locals_dict, (mp_obj_dict_t *)&dict_locals_dict
+    );
 #endif
 
 void mp_obj_dict_init(mp_obj_dict_t *dict, size_t n_args) {
diff --git a/py/objenumerate.c b/py/objenumerate.c
index 241aef30236ff..f4f4ff6ae1d93 100644
--- a/py/objenumerate.c
+++ b/py/objenumerate.c
@@ -67,13 +67,14 @@ STATIC mp_obj_t enumerate_make_new(const mp_obj_type_t *type, size_t n_args, siz
     return MP_OBJ_FROM_PTR(o);
 }
 
-const mp_obj_type_t mp_type_enumerate = {
-    { &mp_type_type },
-    .name = MP_QSTR_enumerate,
-    .make_new = enumerate_make_new,
-    .iternext = enumerate_iternext,
-    .getiter = mp_identity_getiter,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    mp_type_enumerate,
+    MP_QSTR_enumerate,
+    MP_TYPE_FLAG_NONE,
+    enumerate_make_new,
+    iternext, enumerate_iternext,
+    getiter, mp_identity_getiter
+    );
 
 STATIC mp_obj_t enumerate_iternext(mp_obj_t self_in) {
     assert(mp_obj_is_type(self_in, &mp_type_enumerate));
diff --git a/py/objexcept.c b/py/objexcept.c
index 028b73fd8b217..190213e12f610 100644
--- a/py/objexcept.c
+++ b/py/objexcept.c
@@ -284,13 +284,14 @@ void mp_obj_exception_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
     }
 }
 
-const mp_obj_type_t mp_type_BaseException = {
-    { &mp_type_type },
-    .name = MP_QSTR_BaseException,
-    .print = mp_obj_exception_print,
-    .make_new = mp_obj_exception_make_new,
-    .attr = mp_obj_exception_attr,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    mp_type_BaseException,
+    MP_QSTR_BaseException,
+    MP_TYPE_FLAG_NONE,
+    mp_obj_exception_make_new,
+    print, mp_obj_exception_print,
+    attr, mp_obj_exception_attr
+    );
 
 // *FORMAT-OFF*
 
diff --git a/py/objfilter.c b/py/objfilter.c
index a402d8c648899..2b57300af3df5 100644
--- a/py/objfilter.c
+++ b/py/objfilter.c
@@ -60,12 +60,13 @@ STATIC mp_obj_t filter_iternext(mp_obj_t self_in) {
     return MP_OBJ_STOP_ITERATION;
 }
 
-const mp_obj_type_t mp_type_filter = {
-    { &mp_type_type },
-    .name = MP_QSTR_filter,
-    .make_new = filter_make_new,
-    .getiter = mp_identity_getiter,
-    .iternext = filter_iternext,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    mp_type_filter,
+    MP_QSTR_filter,
+    MP_TYPE_FLAG_NONE,
+    filter_make_new,
+    getiter, mp_identity_getiter,
+    iternext, filter_iternext
+    );
 
 #endif // MICROPY_PY_BUILTINS_FILTER
diff --git a/py/objfloat.c b/py/objfloat.c
index 8e89b3da37beb..9ecbab7a4dede 100644
--- a/py/objfloat.c
+++ b/py/objfloat.c
@@ -182,15 +182,12 @@ STATIC mp_obj_t float_binary_op(mp_binary_op_t op, mp_obj_t lhs_in, mp_obj_t rhs
     return mp_obj_float_binary_op(op, lhs_val, rhs_in);
 }
 
-const mp_obj_type_t mp_type_float = {
-    { &mp_type_type },
-    .flags = MP_TYPE_FLAG_EQ_NOT_REFLEXIVE | MP_TYPE_FLAG_EQ_CHECKS_OTHER_TYPE,
-    .name = MP_QSTR_float,
-    .print = float_print,
-    .make_new = float_make_new,
-    .unary_op = float_unary_op,
-    .binary_op = float_binary_op,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    mp_type_float, MP_QSTR_float, MP_TYPE_FLAG_EQ_NOT_REFLEXIVE | MP_TYPE_FLAG_EQ_CHECKS_OTHER_TYPE, float_make_new,
+    print, float_print,
+    unary_op, float_unary_op,
+    binary_op, float_binary_op
+    );
 
 #if MICROPY_OBJ_REPR != MICROPY_OBJ_REPR_C && MICROPY_OBJ_REPR != MICROPY_OBJ_REPR_D
 
diff --git a/py/objfun.c b/py/objfun.c
index 5fa9d71ddaf42..30de8670a1de9 100644
--- a/py/objfun.c
+++ b/py/objfun.c
@@ -56,13 +56,11 @@ STATIC mp_obj_t fun_builtin_0_call(mp_obj_t self_in, size_t n_args, size_t n_kw,
     return self->fun._0();
 }
 
-const mp_obj_type_t mp_type_fun_builtin_0 = {
-    { &mp_type_type },
-    .flags = MP_TYPE_FLAG_BINDS_SELF | MP_TYPE_FLAG_BUILTIN_FUN,
-    .name = MP_QSTR_function,
-    .call = fun_builtin_0_call,
-    .unary_op = mp_generic_unary_op,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    mp_type_fun_builtin_0, MP_QSTR_function, MP_TYPE_FLAG_BINDS_SELF | MP_TYPE_FLAG_BUILTIN_FUN, MP_TYPE_NULL_MAKE_NEW,
+    call, fun_builtin_0_call,
+    unary_op, mp_generic_unary_op
+    );
 
 STATIC mp_obj_t fun_builtin_1_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
     assert(mp_obj_is_type(self_in, &mp_type_fun_builtin_1));
@@ -71,13 +69,11 @@ STATIC mp_obj_t fun_builtin_1_call(mp_obj_t self_in, size_t n_args, size_t n_kw,
     return self->fun._1(args[0]);
 }
 
-const mp_obj_type_t mp_type_fun_builtin_1 = {
-    { &mp_type_type },
-    .flags = MP_TYPE_FLAG_BINDS_SELF | MP_TYPE_FLAG_BUILTIN_FUN,
-    .name = MP_QSTR_function,
-    .call = fun_builtin_1_call,
-    .unary_op = mp_generic_unary_op,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    mp_type_fun_builtin_1, MP_QSTR_function, MP_TYPE_FLAG_BINDS_SELF | MP_TYPE_FLAG_BUILTIN_FUN, MP_TYPE_NULL_MAKE_NEW,
+    call, fun_builtin_1_call,
+    unary_op, mp_generic_unary_op
+    );
 
 STATIC mp_obj_t fun_builtin_2_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
     assert(mp_obj_is_type(self_in, &mp_type_fun_builtin_2));
@@ -86,13 +82,11 @@ STATIC mp_obj_t fun_builtin_2_call(mp_obj_t self_in, size_t n_args, size_t n_kw,
     return self->fun._2(args[0], args[1]);
 }
 
-const mp_obj_type_t mp_type_fun_builtin_2 = {
-    { &mp_type_type },
-    .flags = MP_TYPE_FLAG_BINDS_SELF | MP_TYPE_FLAG_BUILTIN_FUN,
-    .name = MP_QSTR_function,
-    .call = fun_builtin_2_call,
-    .unary_op = mp_generic_unary_op,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    mp_type_fun_builtin_2, MP_QSTR_function, MP_TYPE_FLAG_BINDS_SELF | MP_TYPE_FLAG_BUILTIN_FUN, MP_TYPE_NULL_MAKE_NEW,
+    call, fun_builtin_2_call,
+    unary_op, mp_generic_unary_op
+    );
 
 STATIC mp_obj_t fun_builtin_3_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
     assert(mp_obj_is_type(self_in, &mp_type_fun_builtin_3));
@@ -101,13 +95,11 @@ STATIC mp_obj_t fun_builtin_3_call(mp_obj_t self_in, size_t n_args, size_t n_kw,
     return self->fun._3(args[0], args[1], args[2]);
 }
 
-const mp_obj_type_t mp_type_fun_builtin_3 = {
-    { &mp_type_type },
-    .flags = MP_TYPE_FLAG_BINDS_SELF | MP_TYPE_FLAG_BUILTIN_FUN,
-    .name = MP_QSTR_function,
-    .call = fun_builtin_3_call,
-    .unary_op = mp_generic_unary_op,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    mp_type_fun_builtin_3, MP_QSTR_function, MP_TYPE_FLAG_BINDS_SELF | MP_TYPE_FLAG_BUILTIN_FUN, MP_TYPE_NULL_MAKE_NEW,
+    call, fun_builtin_3_call,
+    unary_op, mp_generic_unary_op
+    );
 
 STATIC mp_obj_t fun_builtin_var_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
     assert(mp_obj_is_type(self_in, &mp_type_fun_builtin_var));
@@ -132,13 +124,11 @@ STATIC mp_obj_t fun_builtin_var_call(mp_obj_t self_in, size_t n_args, size_t n_k
     }
 }
 
-const mp_obj_type_t mp_type_fun_builtin_var = {
-    { &mp_type_type },
-    .flags = MP_TYPE_FLAG_BINDS_SELF | MP_TYPE_FLAG_BUILTIN_FUN,
-    .name = MP_QSTR_function,
-    .call = fun_builtin_var_call,
-    .unary_op = mp_generic_unary_op,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    mp_type_fun_builtin_var, MP_QSTR_function, MP_TYPE_FLAG_BINDS_SELF | MP_TYPE_FLAG_BUILTIN_FUN, MP_TYPE_NULL_MAKE_NEW,
+    call, fun_builtin_var_call,
+    unary_op, mp_generic_unary_op
+    );
 
 /******************************************************************************/
 /* byte code functions                                                        */
@@ -362,19 +352,20 @@ void mp_obj_fun_bc_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
 }
 #endif
 
-const mp_obj_type_t mp_type_fun_bc = {
-    { &mp_type_type },
-    .flags = MP_TYPE_FLAG_BINDS_SELF,
-    .name = MP_QSTR_function,
+MP_DEFINE_CONST_OBJ_TYPE(
+    mp_type_fun_bc,
+    MP_QSTR_function,
+    MP_TYPE_FLAG_BINDS_SELF,
+    MP_TYPE_NULL_MAKE_NEW,
     #if MICROPY_CPYTHON_COMPAT
-    .print = fun_bc_print,
+    print, fun_bc_print,
     #endif
-    .call = fun_bc_call,
-    .unary_op = mp_generic_unary_op,
+    call, fun_bc_call,
+    unary_op, mp_generic_unary_op
     #if MICROPY_PY_FUNCTION_ATTRS
-    .attr = mp_obj_fun_bc_attr,
+    , attr, mp_obj_fun_bc_attr
     #endif
-};
+    );
 
 mp_obj_t mp_obj_new_fun_bc(const mp_obj_t *def_args, const byte *code, const mp_module_context_t *context, struct _mp_raw_code_t *const *child_table) {
     size_t n_def_args = 0;
@@ -417,19 +408,20 @@ STATIC mp_obj_t fun_native_call(mp_obj_t self_in, size_t n_args, size_t n_kw, co
     return fun(self_in, n_args, n_kw, args);
 }
 
-STATIC const mp_obj_type_t mp_type_fun_native = {
-    { &mp_type_type },
-    .flags = MP_TYPE_FLAG_BINDS_SELF,
-    .name = MP_QSTR_function,
+STATIC MP_DEFINE_CONST_OBJ_TYPE(
+    mp_type_fun_native,
+    MP_QSTR_function,
+    MP_TYPE_FLAG_BINDS_SELF,
+    MP_TYPE_NULL_MAKE_NEW,
     #if MICROPY_CPYTHON_COMPAT
-    .print = fun_bc_print,
+    print, fun_bc_print,
     #endif
-    .call = fun_native_call,
-    .unary_op = mp_generic_unary_op,
     #if MICROPY_PY_FUNCTION_ATTRS
-    .attr = mp_obj_fun_bc_attr,
+    attr, mp_obj_fun_bc_attr,
     #endif
-};
+    call, fun_native_call,
+    unary_op, mp_generic_unary_op
+    );
 
 mp_obj_t mp_obj_new_fun_native(const mp_obj_t *def_args, const void *fun_data, const mp_module_context_t *mc, struct _mp_raw_code_t *const *child_table) {
     mp_obj_fun_bc_t *o = MP_OBJ_TO_PTR(mp_obj_new_fun_bc(def_args, (const byte *)fun_data, mc, child_table));
@@ -531,13 +523,14 @@ STATIC mp_obj_t fun_asm_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const
     return mp_native_to_obj(ret, self->type_sig);
 }
 
-STATIC const mp_obj_type_t mp_type_fun_asm = {
-    { &mp_type_type },
-    .flags = MP_TYPE_FLAG_BINDS_SELF,
-    .name = MP_QSTR_function,
-    .call = fun_asm_call,
-    .unary_op = mp_generic_unary_op,
-};
+STATIC MP_DEFINE_CONST_OBJ_TYPE(
+    mp_type_fun_asm,
+    MP_QSTR_function,
+    MP_TYPE_FLAG_BINDS_SELF,
+    MP_TYPE_NULL_MAKE_NEW,
+    call, fun_asm_call,
+    unary_op, mp_generic_unary_op
+    );
 
 mp_obj_t mp_obj_new_fun_asm(size_t n_args, const void *fun_data, mp_uint_t type_sig) {
     mp_obj_fun_asm_t *o = mp_obj_malloc(mp_obj_fun_asm_t, &mp_type_fun_asm);
diff --git a/py/objgenerator.c b/py/objgenerator.c
index 802fd45bbdf6a..0ab80ca118255 100644
--- a/py/objgenerator.c
+++ b/py/objgenerator.c
@@ -70,16 +70,17 @@ STATIC mp_obj_t gen_wrap_call(mp_obj_t self_in, size_t n_args, size_t n_kw, cons
     return MP_OBJ_FROM_PTR(o);
 }
 
-const mp_obj_type_t mp_type_gen_wrap = {
-    { &mp_type_type },
-    .flags = MP_TYPE_FLAG_BINDS_SELF,
-    .name = MP_QSTR_generator,
-    .call = gen_wrap_call,
-    .unary_op = mp_generic_unary_op,
+MP_DEFINE_CONST_OBJ_TYPE(
+    mp_type_gen_wrap,
+    MP_QSTR_generator,
+    MP_TYPE_FLAG_BINDS_SELF,
+    MP_TYPE_NULL_MAKE_NEW,
+    call, gen_wrap_call,
+    unary_op, mp_generic_unary_op
     #if MICROPY_PY_FUNCTION_ATTRS
-    .attr = mp_obj_fun_bc_attr,
+    , attr, mp_obj_fun_bc_attr
     #endif
-};
+    );
 
 /******************************************************************************/
 // native generator wrapper
@@ -131,16 +132,17 @@ STATIC mp_obj_t native_gen_wrap_call(mp_obj_t self_in, size_t n_args, size_t n_k
     return MP_OBJ_FROM_PTR(o);
 }
 
-const mp_obj_type_t mp_type_native_gen_wrap = {
-    { &mp_type_type },
-    .flags = MP_TYPE_FLAG_BINDS_SELF,
-    .name = MP_QSTR_generator,
-    .call = native_gen_wrap_call,
-    .unary_op = mp_generic_unary_op,
+MP_DEFINE_CONST_OBJ_TYPE(
+    mp_type_native_gen_wrap,
+    MP_QSTR_generator,
+    MP_TYPE_FLAG_BINDS_SELF,
+    MP_TYPE_NULL_MAKE_NEW,
+    call, native_gen_wrap_call,
+    unary_op, mp_generic_unary_op
     #if MICROPY_PY_FUNCTION_ATTRS
-    .attr = mp_obj_fun_bc_attr,
+    , attr, mp_obj_fun_bc_attr
     #endif
-};
+    );
 
 #endif // MICROPY_EMIT_NATIVE
 
@@ -357,12 +359,14 @@ STATIC const mp_rom_map_elem_t gen_instance_locals_dict_table[] = {
 
 STATIC MP_DEFINE_CONST_DICT(gen_instance_locals_dict, gen_instance_locals_dict_table);
 
-const mp_obj_type_t mp_type_gen_instance = {
-    { &mp_type_type },
-    .name = MP_QSTR_generator,
-    .print = gen_instance_print,
-    .unary_op = mp_generic_unary_op,
-    .getiter = mp_identity_getiter,
-    .iternext = gen_instance_iternext,
-    .locals_dict = (mp_obj_dict_t *)&gen_instance_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    mp_type_gen_instance,
+    MP_QSTR_generator,
+    MP_TYPE_FLAG_NONE,
+    MP_TYPE_NULL_MAKE_NEW,
+    print, gen_instance_print,
+    unary_op, mp_generic_unary_op,
+    getiter, mp_identity_getiter,
+    iternext, gen_instance_iternext,
+    locals_dict, (mp_obj_dict_t *)&gen_instance_locals_dict
+    );
diff --git a/py/objgetitemiter.c b/py/objgetitemiter.c
index 31ed4a9228ce5..ed2dfbbe1f9e7 100644
--- a/py/objgetitemiter.c
+++ b/py/objgetitemiter.c
@@ -56,12 +56,14 @@ STATIC mp_obj_t it_iternext(mp_obj_t self_in) {
     }
 }
 
-STATIC const mp_obj_type_t mp_type_it = {
-    { &mp_type_type },
-    .name = MP_QSTR_iterator,
-    .getiter = mp_identity_getiter,
-    .iternext = it_iternext,
-};
+STATIC MP_DEFINE_CONST_OBJ_TYPE(
+    mp_type_it,
+    MP_QSTR_iterator,
+    MP_TYPE_FLAG_NONE,
+    MP_TYPE_NULL_MAKE_NEW,
+    getiter, mp_identity_getiter,
+    iternext, it_iternext
+    );
 
 // args are those returned from mp_load_method_maybe (ie either an attribute or a method)
 mp_obj_t mp_obj_new_getitem_iter(mp_obj_t *args, mp_obj_iter_buf_t *iter_buf) {
diff --git a/py/objint.c b/py/objint.c
index 645b26996689c..d7a3f9eb9d18d 100644
--- a/py/objint.c
+++ b/py/objint.c
@@ -457,12 +457,13 @@ STATIC const mp_rom_map_elem_t int_locals_dict_table[] = {
 
 STATIC MP_DEFINE_CONST_DICT(int_locals_dict, int_locals_dict_table);
 
-const mp_obj_type_t mp_type_int = {
-    { &mp_type_type },
-    .name = MP_QSTR_int,
-    .print = mp_obj_int_print,
-    .make_new = mp_obj_int_make_new,
-    .unary_op = mp_obj_int_unary_op,
-    .binary_op = mp_obj_int_binary_op,
-    .locals_dict = (mp_obj_dict_t *)&int_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    mp_type_int,
+    MP_QSTR_int,
+    MP_TYPE_FLAG_NONE,
+    mp_obj_int_make_new,
+    print, mp_obj_int_print,
+    unary_op, mp_obj_int_unary_op,
+    binary_op, mp_obj_int_binary_op,
+    locals_dict, (mp_obj_dict_t *)&int_locals_dict
+    );
diff --git a/py/objlist.c b/py/objlist.c
index f431e273df0af..8c7921b9891b9 100644
--- a/py/objlist.c
+++ b/py/objlist.c
@@ -452,17 +452,19 @@ STATIC const mp_rom_map_elem_t list_locals_dict_table[] = {
 
 STATIC MP_DEFINE_CONST_DICT(list_locals_dict, list_locals_dict_table);
 
-const mp_obj_type_t mp_type_list = {
-    { &mp_type_type },
-    .name = MP_QSTR_list,
-    .print = list_print,
-    .make_new = list_make_new,
-    .unary_op = list_unary_op,
-    .binary_op = list_binary_op,
-    .subscr = list_subscr,
-    .getiter = list_getiter,
-    .locals_dict = (mp_obj_dict_t *)&list_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    mp_type_list,
+    MP_QSTR_list,
+    MP_TYPE_FLAG_NONE,
+    list_make_new,
+    print, list_print,
+    unary_op, list_unary_op,
+    binary_op, list_binary_op,
+    subscr, list_subscr,
+    getiter, list_getiter,
+    locals_dict, (mp_obj_dict_t *)&list_locals_dict
+    );
+
 
 void mp_obj_list_init(mp_obj_list_t *o, size_t n) {
     o->base.type = &mp_type_list;
diff --git a/py/objmap.c b/py/objmap.c
index 1f9275854f833..dc305e21b5cb7 100644
--- a/py/objmap.c
+++ b/py/objmap.c
@@ -63,10 +63,11 @@ STATIC mp_obj_t map_iternext(mp_obj_t self_in) {
     return mp_call_function_n_kw(self->fun, self->n_iters, 0, nextses);
 }
 
-const mp_obj_type_t mp_type_map = {
-    { &mp_type_type },
-    .name = MP_QSTR_map,
-    .make_new = map_make_new,
-    .getiter = mp_identity_getiter,
-    .iternext = map_iternext,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    mp_type_map,
+    MP_QSTR_map,
+    MP_TYPE_FLAG_NONE,
+    map_make_new,
+    getiter, mp_identity_getiter,
+    iternext, map_iternext
+    );
diff --git a/py/objmodule.c b/py/objmodule.c
index 783d6b050868b..6fc3653e6a24d 100644
--- a/py/objmodule.c
+++ b/py/objmodule.c
@@ -130,12 +130,14 @@ STATIC void module_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
     }
 }
 
-const mp_obj_type_t mp_type_module = {
-    { &mp_type_type },
-    .name = MP_QSTR_module,
-    .print = module_print,
-    .attr = module_attr,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    mp_type_module,
+    MP_QSTR_module,
+    MP_TYPE_FLAG_NONE,
+    MP_TYPE_NULL_MAKE_NEW,
+    print, module_print,
+    attr, module_attr
+    );
 
 mp_obj_t mp_obj_new_module(qstr module_name) {
     mp_map_t *mp_loaded_modules_map = &MP_STATE_VM(mp_loaded_modules_dict).map;
diff --git a/py/objnone.c b/py/objnone.c
index 271a8543f9718..4fffbc997e89e 100644
--- a/py/objnone.c
+++ b/py/objnone.c
@@ -43,12 +43,14 @@ STATIC void none_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_
     }
 }
 
-const mp_obj_type_t mp_type_NoneType = {
-    { &mp_type_type },
-    .name = MP_QSTR_NoneType,
-    .print = none_print,
-    .unary_op = mp_generic_unary_op,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    mp_type_NoneType,
+    MP_QSTR_NoneType,
+    MP_TYPE_FLAG_NONE,
+    MP_TYPE_NULL_MAKE_NEW,
+    print, none_print,
+    unary_op, mp_generic_unary_op
+    );
 
 #if !MICROPY_OBJ_IMMEDIATE_OBJS
 const mp_obj_none_t mp_const_none_obj = {{&mp_type_NoneType}};
diff --git a/py/objobject.c b/py/objobject.c
index 1652802805bbc..617b40fbbf05e 100644
--- a/py/objobject.c
+++ b/py/objobject.c
@@ -111,11 +111,12 @@ STATIC const mp_rom_map_elem_t object_locals_dict_table[] = {
 STATIC MP_DEFINE_CONST_DICT(object_locals_dict, object_locals_dict_table);
 #endif
 
-const mp_obj_type_t mp_type_object = {
-    { &mp_type_type },
-    .name = MP_QSTR_object,
-    .make_new = object_make_new,
+MP_DEFINE_CONST_OBJ_TYPE(
+    mp_type_object,
+    MP_QSTR_object,
+    MP_TYPE_FLAG_NONE,
+    object_make_new
     #if MICROPY_CPYTHON_COMPAT
-    .locals_dict = (mp_obj_dict_t *)&object_locals_dict,
+    , locals_dict, (mp_obj_dict_t *)&object_locals_dict
     #endif
-};
+    );
diff --git a/py/objpolyiter.c b/py/objpolyiter.c
index dac6a2545575f..326153182bca7 100644
--- a/py/objpolyiter.c
+++ b/py/objpolyiter.c
@@ -45,12 +45,14 @@ STATIC mp_obj_t polymorph_it_iternext(mp_obj_t self_in) {
     return self->iternext(self_in);
 }
 
-const mp_obj_type_t mp_type_polymorph_iter = {
-    { &mp_type_type },
-    .name = MP_QSTR_iterator,
-    .getiter = mp_identity_getiter,
-    .iternext = polymorph_it_iternext,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    mp_type_polymorph_iter,
+    MP_QSTR_iterator,
+    MP_TYPE_FLAG_NONE,
+    MP_TYPE_NULL_MAKE_NEW,
+    getiter, mp_identity_getiter,
+    iternext, polymorph_it_iternext
+    );
 
 #if MICROPY_ENABLE_FINALISER
 // mp_type_polymorph_iter_with_finaliser is a variant of the universal iterator
@@ -76,12 +78,13 @@ STATIC const mp_rom_map_elem_t mp_obj_polymorph_iter_locals_dict_table[] = {
 };
 STATIC MP_DEFINE_CONST_DICT(mp_obj_polymorph_iter_locals_dict, mp_obj_polymorph_iter_locals_dict_table);
 
-const mp_obj_type_t mp_type_polymorph_iter_with_finaliser = {
-    { &mp_type_type },
-    .name = MP_QSTR_iterator,
-    .getiter = mp_identity_getiter,
-    .iternext = polymorph_it_iternext,
-    .locals_dict = (mp_obj_dict_t *)&mp_obj_polymorph_iter_locals_dict,
-};
-
+MP_DEFINE_CONST_OBJ_TYPE(
+    mp_type_polymorph_iter_with_finaliser,
+    MP_QSTR_iterator,
+    MP_TYPE_FLAG_NONE,
+    MP_TYPE_NULL_MAKE_NEW,
+    getiter, mp_identity_getiter,
+    iternext, polymorph_it_iternext,
+    locals_dict, (mp_obj_dict_t *)&mp_obj_polymorph_iter_locals_dict
+    );
 #endif
diff --git a/py/objproperty.c b/py/objproperty.c
index 49327c981e0b5..42c357f33050b 100644
--- a/py/objproperty.c
+++ b/py/objproperty.c
@@ -90,12 +90,13 @@ STATIC const mp_rom_map_elem_t property_locals_dict_table[] = {
 
 STATIC MP_DEFINE_CONST_DICT(property_locals_dict, property_locals_dict_table);
 
-const mp_obj_type_t mp_type_property = {
-    { &mp_type_type },
-    .name = MP_QSTR_property,
-    .make_new = property_make_new,
-    .locals_dict = (mp_obj_dict_t *)&property_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    mp_type_property,
+    MP_QSTR_property,
+    MP_TYPE_FLAG_NONE,
+    property_make_new,
+    locals_dict, (mp_obj_dict_t *)&property_locals_dict
+    );
 
 const mp_obj_t *mp_obj_property_get(mp_obj_t self_in) {
     mp_check_self(mp_obj_is_type(self_in, &mp_type_property));
diff --git a/py/objrange.c b/py/objrange.c
index 5496021892cb1..adf4b17466ad5 100644
--- a/py/objrange.c
+++ b/py/objrange.c
@@ -50,12 +50,14 @@ STATIC mp_obj_t range_it_iternext(mp_obj_t o_in) {
     }
 }
 
-STATIC const mp_obj_type_t mp_type_range_it = {
-    { &mp_type_type },
-    .name = MP_QSTR_iterator,
-    .getiter = mp_identity_getiter,
-    .iternext = range_it_iternext,
-};
+STATIC MP_DEFINE_CONST_OBJ_TYPE(
+    mp_type_range_it,
+    MP_QSTR_iterator,
+    MP_TYPE_FLAG_NONE,
+    MP_TYPE_NULL_MAKE_NEW,
+    getiter, mp_identity_getiter,
+    iternext, range_it_iternext
+    );
 
 STATIC mp_obj_t mp_obj_new_range_iterator(mp_int_t cur, mp_int_t stop, mp_int_t step, mp_obj_iter_buf_t *iter_buf) {
     assert(sizeof(mp_obj_range_it_t) <= sizeof(mp_obj_iter_buf_t));
@@ -208,18 +210,19 @@ STATIC void range_attr(mp_obj_t o_in, qstr attr, mp_obj_t *dest) {
 }
 #endif
 
-const mp_obj_type_t mp_type_range = {
-    { &mp_type_type },
-    .name = MP_QSTR_range,
-    .print = range_print,
-    .make_new = range_make_new,
-    .unary_op = range_unary_op,
+MP_DEFINE_CONST_OBJ_TYPE(
+    mp_type_range,
+    MP_QSTR_range,
+    MP_TYPE_FLAG_NONE,
+    range_make_new,
+    print, range_print,
+    unary_op, range_unary_op,
     #if MICROPY_PY_BUILTINS_RANGE_BINOP
-    .binary_op = range_binary_op,
+    binary_op, range_binary_op,
     #endif
-    .subscr = range_subscr,
-    .getiter = range_getiter,
+    subscr, range_subscr,
+    getiter, range_getiter
     #if MICROPY_PY_BUILTINS_RANGE_ATTRS
-    .attr = range_attr,
+    , attr, range_attr
     #endif
-};
+    );
diff --git a/py/objreversed.c b/py/objreversed.c
index 08961c0d2d899..bc1f07ddecc46 100644
--- a/py/objreversed.c
+++ b/py/objreversed.c
@@ -68,12 +68,13 @@ STATIC mp_obj_t reversed_iternext(mp_obj_t self_in) {
     return mp_obj_subscr(self->seq, MP_OBJ_NEW_SMALL_INT(self->cur_index), MP_OBJ_SENTINEL);
 }
 
-const mp_obj_type_t mp_type_reversed = {
-    { &mp_type_type },
-    .name = MP_QSTR_reversed,
-    .make_new = reversed_make_new,
-    .getiter = mp_identity_getiter,
-    .iternext = reversed_iternext,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    mp_type_reversed,
+    MP_QSTR_reversed,
+    MP_TYPE_FLAG_NONE,
+    reversed_make_new,
+    getiter, mp_identity_getiter,
+    iternext, reversed_iternext
+    );
 
 #endif // MICROPY_PY_BUILTINS_REVERSED
diff --git a/py/objset.c b/py/objset.c
index 26fd74398b8a9..8fc744a14047e 100644
--- a/py/objset.c
+++ b/py/objset.c
@@ -539,16 +539,17 @@ STATIC const mp_rom_map_elem_t set_locals_dict_table[] = {
 };
 STATIC MP_DEFINE_CONST_DICT(set_locals_dict, set_locals_dict_table);
 
-const mp_obj_type_t mp_type_set = {
-    { &mp_type_type },
-    .name = MP_QSTR_set,
-    .print = set_print,
-    .make_new = set_make_new,
-    .unary_op = set_unary_op,
-    .binary_op = set_binary_op,
-    .getiter = set_getiter,
-    .locals_dict = (mp_obj_dict_t *)&set_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    mp_type_set,
+    MP_QSTR_set,
+    MP_TYPE_FLAG_NONE,
+    set_make_new,
+    print, set_print,
+    unary_op, set_unary_op,
+    binary_op, set_binary_op,
+    getiter, set_getiter,
+    locals_dict, (mp_obj_dict_t *)&set_locals_dict
+    );
 
 #if MICROPY_PY_BUILTINS_FROZENSET
 STATIC const mp_rom_map_elem_t frozenset_locals_dict_table[] = {
@@ -564,17 +565,17 @@ STATIC const mp_rom_map_elem_t frozenset_locals_dict_table[] = {
 };
 STATIC MP_DEFINE_CONST_DICT(frozenset_locals_dict, frozenset_locals_dict_table);
 
-const mp_obj_type_t mp_type_frozenset = {
-    { &mp_type_type },
-    .flags = MP_TYPE_FLAG_EQ_CHECKS_OTHER_TYPE,
-    .name = MP_QSTR_frozenset,
-    .print = set_print,
-    .make_new = set_make_new,
-    .unary_op = set_unary_op,
-    .binary_op = set_binary_op,
-    .getiter = set_getiter,
-    .locals_dict = (mp_obj_dict_t *)&frozenset_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    mp_type_frozenset,
+    MP_QSTR_frozenset,
+    MP_TYPE_FLAG_EQ_CHECKS_OTHER_TYPE,
+    set_make_new,
+    print, set_print,
+    unary_op, set_unary_op,
+    binary_op, set_binary_op,
+    getiter, set_getiter,
+    locals_dict, (mp_obj_dict_t *)&frozenset_locals_dict
+    );
 #endif
 
 mp_obj_t mp_obj_new_set(size_t n_args, mp_obj_t *items) {
diff --git a/py/objsingleton.c b/py/objsingleton.c
index 2b896305cff5b..4a099657d4be4 100644
--- a/py/objsingleton.c
+++ b/py/objsingleton.c
@@ -43,12 +43,11 @@ STATIC void singleton_print(const mp_print_t *print, mp_obj_t self_in, mp_print_
     mp_printf(print, "%q", self->name);
 }
 
-const mp_obj_type_t mp_type_singleton = {
-    { &mp_type_type },
-    .name = MP_QSTR_,
-    .print = singleton_print,
-    .unary_op = mp_generic_unary_op,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    mp_type_singleton, MP_QSTR_, MP_TYPE_FLAG_NONE, MP_TYPE_NULL_MAKE_NEW,
+    print, singleton_print,
+    unary_op, mp_generic_unary_op
+    );
 
 const mp_obj_singleton_t mp_const_ellipsis_obj = {{&mp_type_singleton}, MP_QSTR_Ellipsis};
 #if MICROPY_PY_BUILTINS_NOTIMPLEMENTED
diff --git a/py/objslice.c b/py/objslice.c
index 0b34516c185a7..98c03485ff39e 100644
--- a/py/objslice.c
+++ b/py/objslice.c
@@ -92,16 +92,18 @@ STATIC const mp_rom_map_elem_t slice_locals_dict_table[] = {
 STATIC MP_DEFINE_CONST_DICT(slice_locals_dict, slice_locals_dict_table);
 #endif
 
-const mp_obj_type_t mp_type_slice = {
-    { &mp_type_type },
-    .name = MP_QSTR_slice,
-    .print = slice_print,
+MP_DEFINE_CONST_OBJ_TYPE(
+    mp_type_slice,
+    MP_QSTR_slice,
+    MP_TYPE_FLAG_NONE,
+    MP_TYPE_NULL_MAKE_NEW,
+    print, slice_print
     #if MICROPY_PY_BUILTINS_SLICE_ATTRS
-    .attr = slice_attr,
+    , attr, slice_attr
     #elif MICROPY_PY_BUILTINS_SLICE_INDICES
-    .locals_dict = (mp_obj_dict_t *)&slice_locals_dict,
+    , locals_dict, (mp_obj_dict_t *)&slice_locals_dict
     #endif
-};
+    );
 
 mp_obj_t mp_obj_new_slice(mp_obj_t ostart, mp_obj_t ostop, mp_obj_t ostep) {
     mp_obj_slice_t *o = mp_obj_malloc(mp_obj_slice_t, &mp_type_slice);
diff --git a/py/objstr.c b/py/objstr.c
index 9dd7f65e66cae..77ca269d423bb 100644
--- a/py/objstr.c
+++ b/py/objstr.c
@@ -2143,31 +2143,33 @@ MP_DEFINE_CONST_DICT_WITH_SIZE(mp_obj_memoryview_locals_dict,
 #if !MICROPY_PY_BUILTINS_STR_UNICODE
 STATIC mp_obj_t mp_obj_new_str_iterator(mp_obj_t str, mp_obj_iter_buf_t *iter_buf);
 
-const mp_obj_type_t mp_type_str = {
-    { &mp_type_type },
-    .name = MP_QSTR_str,
-    .print = str_print,
-    .make_new = mp_obj_str_make_new,
-    .binary_op = mp_obj_str_binary_op,
-    .subscr = bytes_subscr,
-    .getiter = mp_obj_new_str_iterator,
-    .buffer = mp_obj_str_get_buffer,
-    .locals_dict = (mp_obj_dict_t *)&mp_obj_str_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    mp_type_str,
+    MP_QSTR_str,
+    MP_TYPE_FLAG_NONE,
+    mp_obj_str_make_new,
+    print, str_print,
+    binary_op, mp_obj_str_binary_op,
+    subscr, bytes_subscr,
+    getiter, mp_obj_new_str_iterator,
+    buffer, mp_obj_str_get_buffer,
+    locals_dict, (mp_obj_dict_t *)&mp_obj_str_locals_dict
+    );
 #endif // !MICROPY_PY_BUILTINS_STR_UNICODE
 
-// Reuses most of methods from str
-const mp_obj_type_t mp_type_bytes = {
-    { &mp_type_type },
-    .name = MP_QSTR_bytes,
-    .print = str_print,
-    .make_new = bytes_make_new,
-    .binary_op = mp_obj_str_binary_op,
-    .subscr = bytes_subscr,
-    .getiter = mp_obj_new_bytes_iterator,
-    .buffer = mp_obj_str_get_buffer,
-    .locals_dict = (mp_obj_dict_t *)&mp_obj_bytes_locals_dict,
-};
+// Reuses most methods from str
+MP_DEFINE_CONST_OBJ_TYPE(
+    mp_type_bytes,
+    MP_QSTR_bytes,
+    MP_TYPE_FLAG_NONE,
+    bytes_make_new,
+    print, str_print,
+    binary_op, mp_obj_str_binary_op,
+    subscr, bytes_subscr,
+    getiter, mp_obj_new_bytes_iterator,
+    buffer, mp_obj_str_get_buffer,
+    locals_dict, (mp_obj_dict_t *)&mp_obj_bytes_locals_dict
+    );
 
 // The zero-length bytes object, with data that includes a null-terminating byte
 const mp_obj_str_t mp_const_empty_bytes_obj = {{&mp_type_bytes}, 0, 0, (const byte *)""};
diff --git a/py/objstringio.c b/py/objstringio.c
index 8b6c7531d79de..d781ccc789d20 100644
--- a/py/objstringio.c
+++ b/py/objstringio.c
@@ -244,16 +244,17 @@ STATIC const mp_stream_p_t stringio_stream_p = {
     .is_text = true,
 };
 
-const mp_obj_type_t mp_type_stringio = {
-    { &mp_type_type },
-    .name = MP_QSTR_StringIO,
-    .print = stringio_print,
-    .make_new = stringio_make_new,
-    .getiter = mp_identity_getiter,
-    .iternext = mp_stream_unbuffered_iter,
-    .protocol = &stringio_stream_p,
-    .locals_dict = (mp_obj_dict_t *)&stringio_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    mp_type_stringio,
+    MP_QSTR_StringIO,
+    MP_TYPE_FLAG_NONE,
+    stringio_make_new,
+    print, stringio_print,
+    getiter, mp_identity_getiter,
+    iternext, mp_stream_unbuffered_iter,
+    protocol, &stringio_stream_p,
+    locals_dict, (mp_obj_dict_t *)&stringio_locals_dict
+    );
 
 #if MICROPY_PY_IO_BYTESIO
 STATIC const mp_stream_p_t bytesio_stream_p = {
@@ -262,16 +263,17 @@ STATIC const mp_stream_p_t bytesio_stream_p = {
     .ioctl = stringio_ioctl,
 };
 
-const mp_obj_type_t mp_type_bytesio = {
-    { &mp_type_type },
-    .name = MP_QSTR_BytesIO,
-    .print = stringio_print,
-    .make_new = stringio_make_new,
-    .getiter = mp_identity_getiter,
-    .iternext = mp_stream_unbuffered_iter,
-    .protocol = &bytesio_stream_p,
-    .locals_dict = (mp_obj_dict_t *)&stringio_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    mp_type_bytesio,
+    MP_QSTR_BytesIO,
+    MP_TYPE_FLAG_NONE,
+    stringio_make_new,
+    print, stringio_print,
+    getiter, mp_identity_getiter,
+    iternext, mp_stream_unbuffered_iter,
+    protocol, &bytesio_stream_p,
+    locals_dict, (mp_obj_dict_t *)&stringio_locals_dict
+    );
 #endif
 
 #endif
diff --git a/py/objstrunicode.c b/py/objstrunicode.c
index fef0353683c19..afef1498e98e7 100644
--- a/py/objstrunicode.c
+++ b/py/objstrunicode.c
@@ -229,18 +229,19 @@ STATIC mp_obj_t str_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) {
     }
 }
 
-const mp_obj_type_t mp_type_str = {
-    { &mp_type_type },
-    .name = MP_QSTR_str,
-    .print = uni_print,
-    .make_new = mp_obj_str_make_new,
-    .unary_op = uni_unary_op,
-    .binary_op = mp_obj_str_binary_op,
-    .subscr = str_subscr,
-    .getiter = mp_obj_new_str_iterator,
-    .buffer = mp_obj_str_get_buffer,
-    .locals_dict = (mp_obj_dict_t *)&mp_obj_str_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    mp_type_str,
+    MP_QSTR_str,
+    MP_TYPE_FLAG_NONE,
+    mp_obj_str_make_new,
+    print, uni_print,
+    unary_op, uni_unary_op,
+    binary_op, mp_obj_str_binary_op,
+    subscr, str_subscr,
+    getiter, mp_obj_new_str_iterator,
+    buffer, mp_obj_str_get_buffer,
+    locals_dict, (mp_obj_dict_t *)&mp_obj_str_locals_dict
+    );
 
 /******************************************************************************/
 /* str iterator                                                               */
diff --git a/py/objtuple.c b/py/objtuple.c
index e0cec84473639..b2ea6e380eb1d 100644
--- a/py/objtuple.c
+++ b/py/objtuple.c
@@ -224,17 +224,18 @@ STATIC const mp_rom_map_elem_t tuple_locals_dict_table[] = {
 
 STATIC MP_DEFINE_CONST_DICT(tuple_locals_dict, tuple_locals_dict_table);
 
-const mp_obj_type_t mp_type_tuple = {
-    { &mp_type_type },
-    .name = MP_QSTR_tuple,
-    .print = mp_obj_tuple_print,
-    .make_new = mp_obj_tuple_make_new,
-    .unary_op = mp_obj_tuple_unary_op,
-    .binary_op = mp_obj_tuple_binary_op,
-    .subscr = mp_obj_tuple_subscr,
-    .getiter = mp_obj_tuple_getiter,
-    .locals_dict = (mp_obj_dict_t *)&tuple_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    mp_type_tuple,
+    MP_QSTR_tuple,
+    MP_TYPE_FLAG_NONE,
+    mp_obj_tuple_make_new,
+    print, mp_obj_tuple_print,
+    unary_op, mp_obj_tuple_unary_op,
+    binary_op, mp_obj_tuple_binary_op,
+    subscr, mp_obj_tuple_subscr,
+    getiter, mp_obj_tuple_getiter,
+    locals_dict, (mp_obj_dict_t *)&tuple_locals_dict
+    );
 
 // the zero-length tuple
 const mp_obj_tuple_t mp_const_empty_tuple_obj = {{&mp_type_tuple}, 0};
diff --git a/py/objtype.c b/py/objtype.c
index c0f68578092dc..77fe8e22e3844 100644
--- a/py/objtype.c
+++ b/py/objtype.c
@@ -1098,15 +1098,16 @@ STATIC void type_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
     }
 }
 
-const mp_obj_type_t mp_type_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_type,
-    .print = type_print,
-    .make_new = type_make_new,
-    .call = type_call,
-    .unary_op = mp_generic_unary_op,
-    .attr = type_attr,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    mp_type_type,
+    MP_QSTR_type,
+    MP_TYPE_FLAG_NONE,
+    type_make_new,
+    print, type_print,
+    call, type_call,
+    unary_op, mp_generic_unary_op,
+    attr, type_attr
+    );
 
 mp_obj_t mp_obj_new_type(qstr name, mp_obj_t bases_tuple, mp_obj_t locals_dict) {
     // Verify input objects have expected type
@@ -1314,13 +1315,14 @@ STATIC void super_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
     mp_obj_class_lookup(&lookup, &mp_type_object);
 }
 
-const mp_obj_type_t mp_type_super = {
-    { &mp_type_type },
-    .name = MP_QSTR_super,
-    .print = super_print,
-    .make_new = super_make_new,
-    .attr = super_attr,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    mp_type_super,
+    MP_QSTR_super,
+    MP_TYPE_FLAG_NONE,
+    super_make_new,
+    print, super_print,
+    attr, super_attr
+    );
 
 void mp_load_super_method(qstr attr, mp_obj_t *dest) {
     mp_obj_super_t super = {{&mp_type_super}, dest[1], dest[2]};
@@ -1436,14 +1438,16 @@ STATIC mp_obj_t static_class_method_make_new(const mp_obj_type_t *self, size_t n
     return MP_OBJ_FROM_PTR(o);
 }
 
-const mp_obj_type_t mp_type_staticmethod = {
-    { &mp_type_type },
-    .name = MP_QSTR_staticmethod,
-    .make_new = static_class_method_make_new,
-};
-
-const mp_obj_type_t mp_type_classmethod = {
-    { &mp_type_type },
-    .name = MP_QSTR_classmethod,
-    .make_new = static_class_method_make_new,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    mp_type_staticmethod,
+    MP_QSTR_staticmethod,
+    MP_TYPE_FLAG_NONE,
+    static_class_method_make_new
+    );
+
+MP_DEFINE_CONST_OBJ_TYPE(
+    mp_type_classmethod,
+    MP_QSTR_classmethod,
+    MP_TYPE_FLAG_NONE,
+    static_class_method_make_new
+    );
diff --git a/py/objzip.c b/py/objzip.c
index 81fa1d587e37a..0ceafd97f2409 100644
--- a/py/objzip.c
+++ b/py/objzip.c
@@ -66,10 +66,11 @@ STATIC mp_obj_t zip_iternext(mp_obj_t self_in) {
     return MP_OBJ_FROM_PTR(tuple);
 }
 
-const mp_obj_type_t mp_type_zip = {
-    { &mp_type_type },
-    .name = MP_QSTR_zip,
-    .make_new = zip_make_new,
-    .getiter = mp_identity_getiter,
-    .iternext = zip_iternext,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    mp_type_zip,
+    MP_QSTR_zip,
+    MP_TYPE_FLAG_NONE,
+    zip_make_new,
+    getiter, mp_identity_getiter,
+    iternext, zip_iternext
+    );
diff --git a/py/profile.c b/py/profile.c
index 4e23e9eac43b5..2b9531e245ac5 100644
--- a/py/profile.c
+++ b/py/profile.c
@@ -172,13 +172,15 @@ STATIC void code_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
     }
 }
 
-const mp_obj_type_t mp_type_settrace_codeobj = {
-    { &mp_type_type },
-    .name = MP_QSTR_code,
-    .print = code_print,
-    .unary_op = mp_generic_unary_op,
-    .attr = code_attr,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    mp_type_settrace_codeobj,
+    MP_QSTR_code,
+    MP_TYPE_FLAG_NONE,
+    MP_TYPE_NULL_MAKE_NEW,
+    print, code_print,
+    unary_op, mp_generic_unary_op,
+    attr, code_attr
+    );
 
 mp_obj_t mp_obj_new_code(const mp_module_context_t *context, const mp_raw_code_t *rc) {
     mp_obj_code_t *o = m_new_obj_maybe(mp_obj_code_t);
@@ -241,13 +243,15 @@ STATIC void frame_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
     }
 }
 
-const mp_obj_type_t mp_type_frame = {
-    { &mp_type_type },
-    .name = MP_QSTR_frame,
-    .print = frame_print,
-    .unary_op = mp_generic_unary_op,
-    .attr = frame_attr,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    mp_type_frame,
+    MP_QSTR_frame,
+    MP_TYPE_FLAG_NONE,
+    MP_TYPE_NULL_MAKE_NEW,
+    print, frame_print,
+    unary_op, mp_generic_unary_op,
+    attr, frame_attr
+    );
 
 mp_obj_t mp_obj_new_frame(const mp_code_state_t *code_state) {
     if (gc_is_locked()) {
diff --git a/py/runtime.c b/py/runtime.c
index ea3553db72275..27b4f05f0460d 100644
--- a/py/runtime.c
+++ b/py/runtime.c
@@ -1070,12 +1070,13 @@ STATIC mp_obj_t checked_fun_call(mp_obj_t self_in, size_t n_args, size_t n_kw, c
     return mp_call_function_n_kw(self->fun, n_args, n_kw, args);
 }
 
-STATIC const mp_obj_type_t mp_type_checked_fun = {
-    { &mp_type_type },
-    .flags = MP_TYPE_FLAG_BINDS_SELF,
-    .name = MP_QSTR_function,
-    .call = checked_fun_call,
-};
+STATIC MP_DEFINE_CONST_OBJ_TYPE(
+    mp_type_checked_fun,
+    MP_QSTR_function,
+    MP_TYPE_FLAG_BINDS_SELF,
+    MP_TYPE_NULL_MAKE_NEW,
+    call, checked_fun_call
+    );
 
 STATIC mp_obj_t mp_obj_new_checked_fun(const mp_obj_type_t *type, mp_obj_t fun) {
     mp_obj_checked_fun_t *o = mp_obj_malloc(mp_obj_checked_fun_t, &mp_type_checked_fun);
diff --git a/shared/runtime/mpirq.c b/shared/runtime/mpirq.c
index 8e474bf5a2b13..763da6e0e4449 100644
--- a/shared/runtime/mpirq.c
+++ b/shared/runtime/mpirq.c
@@ -125,11 +125,13 @@ STATIC const mp_rom_map_elem_t mp_irq_locals_dict_table[] = {
 };
 STATIC MP_DEFINE_CONST_DICT(mp_irq_locals_dict, mp_irq_locals_dict_table);
 
-const mp_obj_type_t mp_irq_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_irq,
-    .call = mp_irq_call,
-    .locals_dict = (mp_obj_dict_t *)&mp_irq_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    mp_irq_type,
+    MP_QSTR_irq,
+    MP_TYPE_FLAG_NONE,
+    MP_TYPE_NULL_MAKE_NEW,
+    call, mp_irq_call,
+    locals_dict, (mp_obj_dict_t *)&mp_irq_locals_dict
+    );
 
 #endif // MICROPY_ENABLE_SCHEDULER
diff --git a/shared/runtime/sys_stdio_mphal.c b/shared/runtime/sys_stdio_mphal.c
index 24f528b0c4f85..f1290853da734 100644
--- a/shared/runtime/sys_stdio_mphal.c
+++ b/shared/runtime/sys_stdio_mphal.c
@@ -123,15 +123,17 @@ STATIC const mp_stream_p_t stdio_obj_stream_p = {
     .is_text = true,
 };
 
-STATIC const mp_obj_type_t stdio_obj_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_FileIO,
-    .print = stdio_obj_print,
-    .getiter = mp_identity_getiter,
-    .iternext = mp_stream_unbuffered_iter,
-    .protocol = &stdio_obj_stream_p,
-    .locals_dict = (mp_obj_dict_t *)&stdio_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    stdio_obj_type,
+    MP_QSTR_FileIO,
+    MP_TYPE_FLAG_NONE,
+    MP_TYPE_NULL_MAKE_NEW,
+    print, stdio_obj_print,
+    getiter, mp_identity_getiter,
+    iternext, mp_stream_unbuffered_iter,
+    protocol, &stdio_obj_stream_p,
+    locals_dict, (mp_obj_dict_t *)&stdio_locals_dict
+    );
 
 const sys_stdio_obj_t mp_sys_stdin_obj = {{&stdio_obj_type}, .fd = STDIO_FD_IN};
 const sys_stdio_obj_t mp_sys_stdout_obj = {{&stdio_obj_type}, .fd = STDIO_FD_OUT};
@@ -157,15 +159,17 @@ STATIC const mp_stream_p_t stdio_buffer_obj_stream_p = {
     .is_text = false,
 };
 
-STATIC const mp_obj_type_t stdio_buffer_obj_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_FileIO,
-    .print = stdio_obj_print,
-    .getiter = mp_identity_getiter,
-    .iternext = mp_stream_unbuffered_iter,
-    .protocol = &stdio_buffer_obj_stream_p,
-    .locals_dict = (mp_obj_dict_t *)&stdio_locals_dict,
-};
+STATIC MP_DEFINE_CONST_OBJ_TYPE(
+    stdio_buffer_obj_type,
+    MP_QSTR_FileIO,
+    MP_TYPE_FLAG_NONE,
+    MP_TYPE_NULL_MAKE_NEW,
+    print, stdio_obj_print,
+    getiter, mp_identity_getiter,
+    iternext, mp_stream_unbuffered_iter,
+    protocol, &stdio_buffer_obj_stream_p,
+    locals_dict, (mp_obj_dict_t *)&stdio_locals_dict
+    );
 
 STATIC const sys_stdio_obj_t stdio_buffer_obj = {{&stdio_buffer_obj_type}, .fd = 0}; // fd unused
 #endif

From b7d6ee9b75650bd0ac36e89077d5d08a3eed9e3f Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Fri, 24 Jun 2022 16:22:38 +1000
Subject: [PATCH 2617/3533] all: Fix #if inside MP_DEFINE_CONST_OBJ_TYPE for
 msvc.

Changes:

    MP_DEFINE_CONST_OBJ_TYPE(
       ...
       #if FOO
       ...
       #endif
       ...
    );

to:

    MP_DEFINE_CONST_OBJ_TYPE(
       ...
       FOO_TYPE_ATTR
       ...
    );

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 extmod/vfs_lfsx.c | 14 +++++++++-----
 py/objarray.c     | 26 +++++++++++++++++---------
 py/objboundmeth.c | 20 ++++++++++++++------
 py/objcell.c      | 10 +++++++---
 py/objclosure.c   | 17 +++++++++++------
 py/objfun.c       | 39 +++++++++++++++++++++++++++------------
 py/objgenerator.c | 20 ++++++++++++++------
 py/objobject.c    | 10 +++++++---
 py/objrange.c     | 20 ++++++++++++++------
 py/objslice.c     | 14 +++++++++-----
 10 files changed, 129 insertions(+), 61 deletions(-)

diff --git a/extmod/vfs_lfsx.c b/extmod/vfs_lfsx.c
index 72c6696105d9e..3f8d262a4858f 100644
--- a/extmod/vfs_lfsx.c
+++ b/extmod/vfs_lfsx.c
@@ -502,15 +502,19 @@ STATIC const mp_vfs_proto_t MP_VFS_LFSx(proto) = {
     .import_stat = MP_VFS_LFSx(import_stat),
 };
 
+#if LFS_BUILD_VERSION == 1
+#define VFS_LFSx_QSTR MP_QSTR_VfsLfs1
+#else
+#define VFS_LFSx_QSTR MP_QSTR_VfsLfs2
+#endif
+
 MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_VFS_LFSx,
-    #if LFS_BUILD_VERSION == 1
-    MP_QSTR_VfsLfs1,
-    #else
-    MP_QSTR_VfsLfs2,
-    #endif
+    VFS_LFSx_QSTR,
     MP_TYPE_FLAG_NONE,
     MP_VFS_LFSx(make_new),
     protocol, &MP_VFS_LFSx(proto),
     locals_dict, (mp_obj_dict_t *)&MP_VFS_LFSx(locals_dict)
     );
+
+#undef VFS_LFSx_QSTR
diff --git a/py/objarray.c b/py/objarray.c
index d93cce29eef5a..8d0fe7f58503c 100644
--- a/py/objarray.c
+++ b/py/objarray.c
@@ -603,6 +603,18 @@ MP_DEFINE_CONST_OBJ_TYPE(
 #endif
 
 #if MICROPY_PY_BUILTINS_MEMORYVIEW
+#if MICROPY_PY_BUILTINS_MEMORYVIEW_ITEMSIZE
+#define MEMORYVIEW_TYPE_ATTR attr, memoryview_attr,
+#else
+#define MEMORYVIEW_TYPE_ATTR
+#endif
+
+#if MICROPY_PY_BUILTINS_BYTES_HEX
+#define MEMORYVIEW_TYPE_LOCALS_DICT locals_dict, (mp_obj_dict_t *)&mp_obj_memoryview_locals_dict,
+#else
+#define MEMORYVIEW_TYPE_LOCALS_DICT
+#endif
+
 MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_memoryview,
     MP_QSTR_memoryview,
@@ -611,16 +623,12 @@ MP_DEFINE_CONST_OBJ_TYPE(
     getiter, array_iterator_new,
     unary_op, array_unary_op,
     binary_op, array_binary_op,
-    #if MICROPY_PY_BUILTINS_MEMORYVIEW_ITEMSIZE
-    attr, memoryview_attr,
-    #endif
-    #if MICROPY_PY_BUILTINS_BYTES_HEX
-    locals_dict, (mp_obj_dict_t *)&mp_obj_memoryview_locals_dict,
-    #endif
-    .subscr = array_subscr,
-    .buffer = array_get_buffer,
+    MEMORYVIEW_TYPE_LOCALS_DICT
+    MEMORYVIEW_TYPE_ATTR
+    subscr, array_subscr,
+    buffer, array_get_buffer
     );
-#endif
+#endif // MICROPY_PY_BUILTINS_MEMORYVIEW
 
 /* unused
 size_t mp_obj_array_len(mp_obj_t self_in) {
diff --git a/py/objboundmeth.c b/py/objboundmeth.c
index 353364cdc70ab..f4b3b9b7df9ce 100644
--- a/py/objboundmeth.c
+++ b/py/objboundmeth.c
@@ -95,18 +95,26 @@ STATIC void bound_meth_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
 }
 #endif
 
+#if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_DETAILED
+#define BOUND_METH_TYPE_PRINT print, bound_meth_print,
+#else
+#define BOUND_METH_TYPE_PRINT
+#endif
+
+#if MICROPY_PY_FUNCTION_ATTRS
+#define BOUND_METH_TYPE_ATTR attr, bound_meth_attr,
+#else
+#define BOUND_METH_TYPE_ATTR
+#endif
+
 STATIC MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_bound_meth,
     MP_QSTR_bound_method,
     MP_TYPE_FLAG_NONE,
     MP_TYPE_NULL_MAKE_NEW,
-    #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_DETAILED
-    print, bound_meth_print,
-    #endif
+    BOUND_METH_TYPE_PRINT
+    BOUND_METH_TYPE_ATTR
     call, bound_meth_call
-    #if MICROPY_PY_FUNCTION_ATTRS
-    , attr, bound_meth_attr
-    #endif
     );
 
 mp_obj_t mp_obj_new_bound_meth(mp_obj_t meth, mp_obj_t self) {
diff --git a/py/objcell.c b/py/objcell.c
index a17a94b9b78e9..b100fae4fe994 100644
--- a/py/objcell.c
+++ b/py/objcell.c
@@ -40,12 +40,16 @@ STATIC void cell_print(const mp_print_t *print, mp_obj_t o_in, mp_print_kind_t k
 }
 #endif
 
+#if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_DETAILED
+#define CELL_TYPE_PRINT , print, cell_print
+#else
+#define CELL_TYPE_PRINT
+#endif
+
 STATIC MP_DEFINE_CONST_OBJ_TYPE(
     // cell representation is just value in < >
     mp_type_cell, MP_QSTR_, MP_TYPE_FLAG_NONE, MP_TYPE_NULL_MAKE_NEW
-    #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_DETAILED
-    , print, cell_print
-    #endif
+    CELL_TYPE_PRINT
     );
 
 mp_obj_t mp_obj_new_cell(mp_obj_t obj) {
diff --git a/py/objclosure.c b/py/objclosure.c
index 15ed994d37263..45a3e83c462d8 100644
--- a/py/objclosure.c
+++ b/py/objclosure.c
@@ -84,6 +84,15 @@ STATIC void mp_obj_closure_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
     mp_obj_closure_t *o = MP_OBJ_TO_PTR(self_in);
     mp_load_method_maybe(o->fun, attr, dest);
 }
+#define CLOSURE_TYPE_ATTR attr, mp_obj_closure_attr,
+#else
+#define CLOSURE_TYPE_ATTR
+#endif
+
+#if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_DETAILED
+#define CLOSURE_TYPE_PRINT print, closure_print,
+#else
+#define CLOSURE_TYPE_PRINT
 #endif
 
 MP_DEFINE_CONST_OBJ_TYPE(
@@ -91,12 +100,8 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_QSTR_closure,
     MP_TYPE_FLAG_BINDS_SELF,
     MP_TYPE_NULL_MAKE_NEW,
-    #if MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_DETAILED
-    print, closure_print,
-    #endif
-    #if MICROPY_PY_FUNCTION_ATTRS
-    attr, mp_obj_closure_attr,
-    #endif
+    CLOSURE_TYPE_ATTR
+    CLOSURE_TYPE_PRINT
     call, closure_call
     );
 
diff --git a/py/objfun.c b/py/objfun.c
index 30de8670a1de9..d6ff354575bf9 100644
--- a/py/objfun.c
+++ b/py/objfun.c
@@ -352,19 +352,27 @@ void mp_obj_fun_bc_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
 }
 #endif
 
+#if MICROPY_CPYTHON_COMPAT
+#define FUN_BC_TYPE_PRINT print, fun_bc_print,
+#else
+#define FUN_BC_TYPE_PRINT
+#endif
+
+#if MICROPY_PY_FUNCTION_ATTRS
+#define FUN_BC_TYPE_ATTR attr, mp_obj_fun_bc_attr,
+#else
+#define FUN_BC_TYPE_ATTR
+#endif
+
 MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_fun_bc,
     MP_QSTR_function,
     MP_TYPE_FLAG_BINDS_SELF,
     MP_TYPE_NULL_MAKE_NEW,
-    #if MICROPY_CPYTHON_COMPAT
-    print, fun_bc_print,
-    #endif
+    FUN_BC_TYPE_PRINT
+    FUN_BC_TYPE_ATTR
     call, fun_bc_call,
     unary_op, mp_generic_unary_op
-    #if MICROPY_PY_FUNCTION_ATTRS
-    , attr, mp_obj_fun_bc_attr
-    #endif
     );
 
 mp_obj_t mp_obj_new_fun_bc(const mp_obj_t *def_args, const byte *code, const mp_module_context_t *context, struct _mp_raw_code_t *const *child_table) {
@@ -408,17 +416,24 @@ STATIC mp_obj_t fun_native_call(mp_obj_t self_in, size_t n_args, size_t n_kw, co
     return fun(self_in, n_args, n_kw, args);
 }
 
+#if MICROPY_CPYTHON_COMPAT
+#define FUN_BC_TYPE_PRINT print, fun_bc_print,
+#else
+#define FUN_BC_TYPE_PRINT
+#endif
+#if MICROPY_PY_FUNCTION_ATTRS
+#define FUN_BC_TYPE_ATTR attr, mp_obj_fun_bc_attr,
+#else
+#define FUN_BC_TYPE_ATTR
+#endif
+
 STATIC MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_fun_native,
     MP_QSTR_function,
     MP_TYPE_FLAG_BINDS_SELF,
     MP_TYPE_NULL_MAKE_NEW,
-    #if MICROPY_CPYTHON_COMPAT
-    print, fun_bc_print,
-    #endif
-    #if MICROPY_PY_FUNCTION_ATTRS
-    attr, mp_obj_fun_bc_attr,
-    #endif
+    FUN_BC_TYPE_PRINT
+    FUN_BC_TYPE_ATTR
     call, fun_native_call,
     unary_op, mp_generic_unary_op
     );
diff --git a/py/objgenerator.c b/py/objgenerator.c
index 0ab80ca118255..299f25e7bb634 100644
--- a/py/objgenerator.c
+++ b/py/objgenerator.c
@@ -70,16 +70,20 @@ STATIC mp_obj_t gen_wrap_call(mp_obj_t self_in, size_t n_args, size_t n_kw, cons
     return MP_OBJ_FROM_PTR(o);
 }
 
+#if MICROPY_PY_FUNCTION_ATTRS
+#define GEN_WRAP_TYPE_ATTR attr, mp_obj_fun_bc_attr,
+#else
+#define GEN_WRAP_TYPE_ATTR
+#endif
+
 MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_gen_wrap,
     MP_QSTR_generator,
     MP_TYPE_FLAG_BINDS_SELF,
     MP_TYPE_NULL_MAKE_NEW,
+    GEN_WRAP_TYPE_ATTR
     call, gen_wrap_call,
     unary_op, mp_generic_unary_op
-    #if MICROPY_PY_FUNCTION_ATTRS
-    , attr, mp_obj_fun_bc_attr
-    #endif
     );
 
 /******************************************************************************/
@@ -132,16 +136,20 @@ STATIC mp_obj_t native_gen_wrap_call(mp_obj_t self_in, size_t n_args, size_t n_k
     return MP_OBJ_FROM_PTR(o);
 }
 
+#if MICROPY_PY_FUNCTION_ATTRS
+#define NATIVE_GEN_WRAP_TYPE_ATTR attr, mp_obj_fun_bc_attr,
+#else
+#define NATIVE_GEN_WRAP_TYPE_ATTR
+#endif
+
 MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_native_gen_wrap,
     MP_QSTR_generator,
     MP_TYPE_FLAG_BINDS_SELF,
     MP_TYPE_NULL_MAKE_NEW,
     call, native_gen_wrap_call,
+    NATIVE_GEN_WRAP_TYPE_ATTR
     unary_op, mp_generic_unary_op
-    #if MICROPY_PY_FUNCTION_ATTRS
-    , attr, mp_obj_fun_bc_attr
-    #endif
     );
 
 #endif // MICROPY_EMIT_NATIVE
diff --git a/py/objobject.c b/py/objobject.c
index 617b40fbbf05e..868a85b32ab0c 100644
--- a/py/objobject.c
+++ b/py/objobject.c
@@ -111,12 +111,16 @@ STATIC const mp_rom_map_elem_t object_locals_dict_table[] = {
 STATIC MP_DEFINE_CONST_DICT(object_locals_dict, object_locals_dict_table);
 #endif
 
+#if MICROPY_CPYTHON_COMPAT
+#define OBJECT_TYPE_LOCALS_DICT , locals_dict, (mp_obj_dict_t *)&object_locals_dict
+#else
+#define OBJECT_TYPE_LOCALS_DICT
+#endif
+
 MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_object,
     MP_QSTR_object,
     MP_TYPE_FLAG_NONE,
     object_make_new
-    #if MICROPY_CPYTHON_COMPAT
-    , locals_dict, (mp_obj_dict_t *)&object_locals_dict
-    #endif
+    OBJECT_TYPE_LOCALS_DICT
     );
diff --git a/py/objrange.c b/py/objrange.c
index adf4b17466ad5..3140504b2bb4c 100644
--- a/py/objrange.c
+++ b/py/objrange.c
@@ -210,19 +210,27 @@ STATIC void range_attr(mp_obj_t o_in, qstr attr, mp_obj_t *dest) {
 }
 #endif
 
+#if MICROPY_PY_BUILTINS_RANGE_BINOP
+#define RANGE_TYPE_BINOP binary_op, range_binary_op,
+#else
+#define RANGE_TYPE_BINOP
+#endif
+
+#if MICROPY_PY_BUILTINS_RANGE_ATTRS
+#define RANGE_TYPE_ATTR attr, range_attr,
+#else
+#define RANGE_TYPE_ATTR
+#endif
+
 MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_range,
     MP_QSTR_range,
     MP_TYPE_FLAG_NONE,
     range_make_new,
+    RANGE_TYPE_BINOP
+    RANGE_TYPE_ATTR
     print, range_print,
     unary_op, range_unary_op,
-    #if MICROPY_PY_BUILTINS_RANGE_BINOP
-    binary_op, range_binary_op,
-    #endif
     subscr, range_subscr,
     getiter, range_getiter
-    #if MICROPY_PY_BUILTINS_RANGE_ATTRS
-    , attr, range_attr
-    #endif
     );
diff --git a/py/objslice.c b/py/objslice.c
index 98c03485ff39e..7baca1fbe6685 100644
--- a/py/objslice.c
+++ b/py/objslice.c
@@ -92,17 +92,21 @@ STATIC const mp_rom_map_elem_t slice_locals_dict_table[] = {
 STATIC MP_DEFINE_CONST_DICT(slice_locals_dict, slice_locals_dict_table);
 #endif
 
+#if MICROPY_PY_BUILTINS_SLICE_ATTRS
+#define SLICE_TYPE_ATTR_OR_LOCALS_DICT attr, slice_attr,
+#elif MICROPY_PY_BUILTINS_SLICE_INDICES
+#define SLICE_TYPE_ATTR_OR_LOCALS_DICT locals_dict, (mp_obj_dict_t *)&slice_locals_dict,
+#else
+#define SLICE_TYPE_ATTR_OR_LOCALS_DICT
+#endif
+
 MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_slice,
     MP_QSTR_slice,
     MP_TYPE_FLAG_NONE,
     MP_TYPE_NULL_MAKE_NEW,
+    SLICE_TYPE_ATTR_OR_LOCALS_DICT
     print, slice_print
-    #if MICROPY_PY_BUILTINS_SLICE_ATTRS
-    , attr, slice_attr
-    #elif MICROPY_PY_BUILTINS_SLICE_INDICES
-    , locals_dict, (mp_obj_dict_t *)&slice_locals_dict
-    #endif
     );
 
 mp_obj_t mp_obj_new_slice(mp_obj_t ostart, mp_obj_t ostop, mp_obj_t ostep) {

From 9dce82776db104750283b213095a7aedfb95a1d9 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Fri, 24 Jun 2022 16:27:46 +1000
Subject: [PATCH 2618/3533] all: Remove unnecessary locals_dict cast.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 extmod/machine_i2c.c                                | 2 +-
 extmod/machine_signal.c                             | 2 +-
 extmod/machine_spi.c                                | 2 +-
 extmod/modbluetooth.c                               | 2 +-
 extmod/modbtree.c                                   | 2 +-
 extmod/modframebuf.c                                | 2 +-
 extmod/modlwip.c                                    | 4 ++--
 extmod/moduasyncio.c                                | 2 +-
 extmod/moducryptolib.c                              | 2 +-
 extmod/moduhashlib.c                                | 6 +++---
 extmod/modure.c                                     | 4 ++--
 extmod/moduselect.c                                 | 2 +-
 extmod/modusocket.c                                 | 2 +-
 extmod/modussl_axtls.c                              | 2 +-
 extmod/modussl_mbedtls.c                            | 2 +-
 extmod/modutimeq.c                                  | 2 +-
 extmod/moduwebsocket.c                              | 2 +-
 extmod/moduzlib.c                                   | 2 +-
 extmod/modwebrepl.c                                 | 2 +-
 extmod/network_cyw43.c                              | 2 +-
 extmod/vfs_fat.c                                    | 2 +-
 extmod/vfs_fat_file.c                               | 4 ++--
 extmod/vfs_lfsx.c                                   | 2 +-
 extmod/vfs_lfsx_file.c                              | 4 ++--
 extmod/vfs_posix.c                                  | 2 +-
 extmod/vfs_posix_file.c                             | 4 ++--
 ports/cc3200/misc/mpirq.c                           | 2 +-
 ports/cc3200/mods/modnetwork.c                      | 2 +-
 ports/cc3200/mods/moduhashlib.c                     | 4 ++--
 ports/cc3200/mods/modusocket.c                      | 2 +-
 ports/cc3200/mods/modussl.c                         | 2 +-
 ports/cc3200/mods/modwlan.c                         | 2 +-
 ports/cc3200/mods/pybadc.c                          | 4 ++--
 ports/cc3200/mods/pybflash.c                        | 2 +-
 ports/cc3200/mods/pybi2c.c                          | 2 +-
 ports/cc3200/mods/pybpin.c                          | 4 ++--
 ports/cc3200/mods/pybrtc.c                          | 2 +-
 ports/cc3200/mods/pybsd.c                           | 2 +-
 ports/cc3200/mods/pybspi.c                          | 2 +-
 ports/cc3200/mods/pybtimer.c                        | 4 ++--
 ports/cc3200/mods/pybuart.c                         | 2 +-
 ports/cc3200/mods/pybwdt.c                          | 2 +-
 ports/esp32/esp32_nvs.c                             | 2 +-
 ports/esp32/esp32_partition.c                       | 2 +-
 ports/esp32/esp32_rmt.c                             | 2 +-
 ports/esp32/esp32_ulp.c                             | 2 +-
 ports/esp32/machine_adc.c                           | 2 +-
 ports/esp32/machine_adcblock.c                      | 2 +-
 ports/esp32/machine_dac.c                           | 2 +-
 ports/esp32/machine_hw_spi.c                        | 2 +-
 ports/esp32/machine_i2c.c                           | 2 +-
 ports/esp32/machine_i2s.c                           | 2 +-
 ports/esp32/machine_pin.c                           | 4 ++--
 ports/esp32/machine_rtc.c                           | 2 +-
 ports/esp32/machine_sdcard.c                        | 2 +-
 ports/esp32/machine_timer.c                         | 2 +-
 ports/esp32/machine_touchpad.c                      | 2 +-
 ports/esp32/machine_uart.c                          | 2 +-
 ports/esp32/machine_wdt.c                           | 2 +-
 ports/esp32/modsocket.c                             | 2 +-
 ports/esp32/network_lan.c                           | 2 +-
 ports/esp32/network_ppp.c                           | 2 +-
 ports/esp32/network_wlan.c                          | 2 +-
 ports/esp8266/machine_adc.c                         | 2 +-
 ports/esp8266/machine_hspi.c                        | 2 +-
 ports/esp8266/machine_pin.c                         | 4 ++--
 ports/esp8266/machine_rtc.c                         | 2 +-
 ports/esp8266/machine_uart.c                        | 2 +-
 ports/esp8266/machine_wdt.c                         | 2 +-
 ports/esp8266/modmachine.c                          | 2 +-
 ports/esp8266/modnetwork.c                          | 2 +-
 ports/mimxrt/machine_adc.c                          | 2 +-
 ports/mimxrt/machine_i2c.c                          | 2 +-
 ports/mimxrt/machine_i2s.c                          | 2 +-
 ports/mimxrt/machine_led.c                          | 2 +-
 ports/mimxrt/machine_pin.c                          | 8 ++++----
 ports/mimxrt/machine_rtc.c                          | 2 +-
 ports/mimxrt/machine_sdcard.c                       | 2 +-
 ports/mimxrt/machine_spi.c                          | 2 +-
 ports/mimxrt/machine_timer.c                        | 2 +-
 ports/mimxrt/machine_uart.c                         | 2 +-
 ports/mimxrt/machine_wdt.c                          | 2 +-
 ports/mimxrt/mimxrt_flash.c                         | 2 +-
 ports/mimxrt/network_lan.c                          | 2 +-
 ports/nrf/boards/microbit/modules/microbitdisplay.c | 2 +-
 ports/nrf/boards/microbit/modules/microbitimage.c   | 2 +-
 ports/nrf/modules/board/led.c                       | 2 +-
 ports/nrf/modules/machine/adc.c                     | 2 +-
 ports/nrf/modules/machine/i2c.c                     | 2 +-
 ports/nrf/modules/machine/pin.c                     | 4 ++--
 ports/nrf/modules/machine/pwm.c                     | 2 +-
 ports/nrf/modules/machine/rtcounter.c               | 2 +-
 ports/nrf/modules/machine/spi.c                     | 2 +-
 ports/nrf/modules/machine/temp.c                    | 2 +-
 ports/nrf/modules/machine/timer.c                   | 2 +-
 ports/nrf/modules/machine/uart.c                    | 2 +-
 ports/nrf/modules/nrf/flashbdev.c                   | 2 +-
 ports/nrf/modules/ubluepy/ubluepy_characteristic.c  | 2 +-
 ports/nrf/modules/ubluepy/ubluepy_constants.c       | 4 ++--
 ports/nrf/modules/ubluepy/ubluepy_delegate.c        | 2 +-
 ports/nrf/modules/ubluepy/ubluepy_descriptor.c      | 2 +-
 ports/nrf/modules/ubluepy/ubluepy_peripheral.c      | 2 +-
 ports/nrf/modules/ubluepy/ubluepy_scan_entry.c      | 2 +-
 ports/nrf/modules/ubluepy/ubluepy_scanner.c         | 2 +-
 ports/nrf/modules/ubluepy/ubluepy_service.c         | 2 +-
 ports/nrf/modules/ubluepy/ubluepy_uuid.c            | 2 +-
 ports/nrf/modules/uos/microbitfs.c                  | 4 ++--
 ports/nrf/pin_named_pins.c                          | 4 ++--
 ports/pic16bit/modpybled.c                          | 2 +-
 ports/pic16bit/modpybswitch.c                       | 2 +-
 ports/renesas-ra/machine_i2c.c                      | 2 +-
 ports/rp2/machine_adc.c                             | 2 +-
 ports/rp2/machine_i2c.c                             | 2 +-
 ports/rp2/machine_i2s.c                             | 2 +-
 ports/rp2/machine_pin.c                             | 2 +-
 ports/rp2/machine_rtc.c                             | 2 +-
 ports/rp2/machine_spi.c                             | 2 +-
 ports/rp2/machine_timer.c                           | 2 +-
 ports/rp2/machine_uart.c                            | 2 +-
 ports/rp2/machine_wdt.c                             | 2 +-
 ports/rp2/rp2_flash.c                               | 2 +-
 ports/rp2/rp2_pio.c                                 | 4 ++--
 ports/samd/machine_led.c                            | 2 +-
 ports/samd/machine_pin.c                            | 2 +-
 ports/samd/samd_flash.c                             | 2 +-
 ports/stm32/accel.c                                 | 2 +-
 ports/stm32/adc.c                                   | 4 ++--
 ports/stm32/dac.c                                   | 2 +-
 ports/stm32/extint.c                                | 2 +-
 ports/stm32/lcd.c                                   | 2 +-
 ports/stm32/led.c                                   | 2 +-
 ports/stm32/machine_adc.c                           | 2 +-
 ports/stm32/machine_i2c.c                           | 2 +-
 ports/stm32/machine_i2s.c                           | 2 +-
 ports/stm32/machine_spi.c                           | 2 +-
 ports/stm32/machine_timer.c                         | 2 +-
 ports/stm32/machine_uart.c                          | 2 +-
 ports/stm32/network_lan.c                           | 2 +-
 ports/stm32/pin.c                                   | 4 ++--
 ports/stm32/pin_named_pins.c                        | 4 ++--
 ports/stm32/pyb_can.c                               | 2 +-
 ports/stm32/pyb_i2c.c                               | 2 +-
 ports/stm32/pyb_spi.c                               | 2 +-
 ports/stm32/rtc.c                                   | 2 +-
 ports/stm32/sdcard.c                                | 4 ++--
 ports/stm32/servo.c                                 | 2 +-
 ports/stm32/storage.c                               | 2 +-
 ports/stm32/timer.c                                 | 4 ++--
 ports/stm32/usb.c                                   | 4 ++--
 ports/stm32/usrsw.c                                 | 2 +-
 ports/stm32/wdt.c                                   | 2 +-
 ports/teensy/led.c                                  | 2 +-
 ports/teensy/timer.c                                | 4 ++--
 ports/teensy/uart.c                                 | 2 +-
 ports/unix/coverage.c                               | 4 ++--
 ports/unix/modffi.c                                 | 6 +++---
 ports/unix/modjni.c                                 | 6 +++---
 ports/unix/moduselect.c                             | 2 +-
 ports/unix/modusocket.c                             | 2 +-
 ports/zephyr/machine_i2c.c                          | 2 +-
 ports/zephyr/machine_pin.c                          | 2 +-
 ports/zephyr/machine_spi.c                          | 2 +-
 ports/zephyr/machine_uart.c                         | 2 +-
 ports/zephyr/modusocket.c                           | 2 +-
 ports/zephyr/modzsensor.c                           | 2 +-
 ports/zephyr/zephyr_storage.c                       | 4 ++--
 py/modio.c                                          | 2 +-
 py/modthread.c                                      | 2 +-
 py/objarray.c                                       | 6 +++---
 py/objdeque.c                                       | 2 +-
 py/objdict.c                                        | 4 ++--
 py/objgenerator.c                                   | 2 +-
 py/objint.c                                         | 2 +-
 py/objlist.c                                        | 2 +-
 py/objobject.c                                      | 2 +-
 py/objpolyiter.c                                    | 2 +-
 py/objproperty.c                                    | 2 +-
 py/objset.c                                         | 4 ++--
 py/objslice.c                                       | 2 +-
 py/objstr.c                                         | 4 ++--
 py/objstringio.c                                    | 4 ++--
 py/objstrunicode.c                                  | 2 +-
 py/objtuple.c                                       | 2 +-
 shared/runtime/mpirq.c                              | 2 +-
 shared/runtime/sys_stdio_mphal.c                    | 4 ++--
 185 files changed, 226 insertions(+), 226 deletions(-)

diff --git a/extmod/machine_i2c.c b/extmod/machine_i2c.c
index 7e597b791029b..378bf8fc914b7 100644
--- a/extmod/machine_i2c.c
+++ b/extmod/machine_i2c.c
@@ -737,7 +737,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     mp_machine_soft_i2c_make_new,
     print, mp_machine_soft_i2c_print,
     protocol, &mp_machine_soft_i2c_p,
-    locals_dict, (mp_obj_dict_t *)&mp_machine_i2c_locals_dict
+    locals_dict, &mp_machine_i2c_locals_dict
     );
 
 #endif // MICROPY_PY_MACHINE_SOFTI2C
diff --git a/extmod/machine_signal.c b/extmod/machine_signal.c
index 818bc01c27112..f665ffaa494e7 100644
--- a/extmod/machine_signal.c
+++ b/extmod/machine_signal.c
@@ -179,7 +179,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     signal_make_new,
     call, signal_call,
     protocol, &signal_pin_p,
-    locals_dict, (void *)&signal_locals_dict
+    locals_dict, &signal_locals_dict
     );
 
 #endif // MICROPY_PY_MACHINE
diff --git a/extmod/machine_spi.c b/extmod/machine_spi.c
index 43148c9c8d46d..c7fc5877b1b09 100644
--- a/extmod/machine_spi.c
+++ b/extmod/machine_spi.c
@@ -258,7 +258,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     mp_machine_soft_spi_make_new,
     print, mp_machine_soft_spi_print,
     protocol, &mp_machine_soft_spi_p,
-    locals_dict, (mp_obj_dict_t *)&mp_machine_spi_locals_dict
+    locals_dict, &mp_machine_spi_locals_dict
     );
 
 #endif // MICROPY_PY_MACHINE_SOFTSPI
diff --git a/extmod/modbluetooth.c b/extmod/modbluetooth.c
index 2b7497e1b6551..2e058fc7deb25 100644
--- a/extmod/modbluetooth.c
+++ b/extmod/modbluetooth.c
@@ -981,7 +981,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     MP_QSTR_BLE,
     MP_TYPE_FLAG_NONE,
     bluetooth_ble_make_new,
-    locals_dict, (void *)&bluetooth_ble_locals_dict
+    locals_dict, &bluetooth_ble_locals_dict
     );
 
 STATIC const mp_rom_map_elem_t mp_module_bluetooth_globals_table[] = {
diff --git a/extmod/modbtree.c b/extmod/modbtree.c
index f115be44fec15..15cb6341637a5 100644
--- a/extmod/modbtree.c
+++ b/extmod/modbtree.c
@@ -330,7 +330,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     iternext, btree_iternext,
     binary_op, btree_binary_op,
     subscr, btree_subscr,
-    locals_dict, (void *)&btree_locals_dict
+    locals_dict, &btree_locals_dict
     );
 #endif
 
diff --git a/extmod/modframebuf.c b/extmod/modframebuf.c
index 1d44312cf3040..f29eab272f0ea 100644
--- a/extmod/modframebuf.c
+++ b/extmod/modframebuf.c
@@ -835,7 +835,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     framebuf_make_new,
     buffer, framebuf_get_buffer,
-    locals_dict, (mp_obj_dict_t *)&framebuf_locals_dict
+    locals_dict, &framebuf_locals_dict
     );
 #endif
 
diff --git a/extmod/modlwip.c b/extmod/modlwip.c
index f9d5b76b2c8bb..2f5da36f40845 100644
--- a/extmod/modlwip.c
+++ b/extmod/modlwip.c
@@ -182,7 +182,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     MP_QSTR_slip,
     MP_TYPE_FLAG_NONE,
     lwip_slip_make_new,
-    locals_dict, (mp_obj_dict_t *)&lwip_slip_locals_dict
+    locals_dict, &lwip_slip_locals_dict
     );
 
 #endif // MICROPY_PY_LWIP_SLIP
@@ -1602,7 +1602,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     lwip_socket_make_new,
     print, lwip_socket_print,
     protocol, &lwip_socket_stream_p,
-    locals_dict, (mp_obj_dict_t *)&lwip_socket_locals_dict
+    locals_dict, &lwip_socket_locals_dict
     );
 
 /******************************************************************************/
diff --git a/extmod/moduasyncio.c b/extmod/moduasyncio.c
index 500d13c5b8595..546764209608a 100644
--- a/extmod/moduasyncio.c
+++ b/extmod/moduasyncio.c
@@ -149,7 +149,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     MP_QSTR_TaskQueue,
     MP_TYPE_FLAG_NONE,
     task_queue_make_new,
-    locals_dict, (mp_obj_dict_t *)&task_queue_locals_dict
+    locals_dict, &task_queue_locals_dict
     );
 
 /******************************************************************************/
diff --git a/extmod/moducryptolib.c b/extmod/moducryptolib.c
index 236b7edfd7aa4..e4625c21a8786 100644
--- a/extmod/moducryptolib.c
+++ b/extmod/moducryptolib.c
@@ -353,7 +353,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     MP_QSTR_aes,
     MP_TYPE_FLAG_NONE,
     ucryptolib_aes_make_new,
-    locals_dict, (void *)&ucryptolib_aes_locals_dict
+    locals_dict, &ucryptolib_aes_locals_dict
     );
 
 STATIC const mp_rom_map_elem_t mp_module_ucryptolib_globals_table[] = {
diff --git a/extmod/moduhashlib.c b/extmod/moduhashlib.c
index 44625ed6da2ac..9535e00b406dd 100644
--- a/extmod/moduhashlib.c
+++ b/extmod/moduhashlib.c
@@ -162,7 +162,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     MP_QSTR_sha256,
     MP_TYPE_FLAG_NONE,
     uhashlib_sha256_make_new,
-    locals_dict, (void *)&uhashlib_sha256_locals_dict
+    locals_dict, &uhashlib_sha256_locals_dict
     );
 #endif
 
@@ -256,7 +256,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     MP_QSTR_sha1,
     MP_TYPE_FLAG_NONE,
     uhashlib_sha1_make_new,
-    locals_dict, (void *)&uhashlib_sha1_locals_dict
+    locals_dict, &uhashlib_sha1_locals_dict
     );
 #endif
 
@@ -350,7 +350,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     MP_QSTR_md5,
     MP_TYPE_FLAG_NONE,
     uhashlib_md5_make_new,
-    locals_dict, (void *)&uhashlib_md5_locals_dict
+    locals_dict, &uhashlib_md5_locals_dict
     );
 #endif // MICROPY_PY_UHASHLIB_MD5
 
diff --git a/extmod/modure.c b/extmod/modure.c
index a27c7ff9fdc57..43959924053bc 100644
--- a/extmod/modure.c
+++ b/extmod/modure.c
@@ -185,7 +185,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     MP_TYPE_NULL_MAKE_NEW,
     print, match_print,
-    locals_dict, (void *)&match_locals_dict
+    locals_dict, &match_locals_dict
     );
 #endif
 
@@ -419,7 +419,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     MP_TYPE_NULL_MAKE_NEW,
     print, re_print,
-    locals_dict, (void *)&re_locals_dict
+    locals_dict, &re_locals_dict
     );
 #endif
 
diff --git a/extmod/moduselect.c b/extmod/moduselect.c
index 1a11ee0eab50e..352b15d983d84 100644
--- a/extmod/moduselect.c
+++ b/extmod/moduselect.c
@@ -343,7 +343,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_NULL_MAKE_NEW,
     getiter, mp_identity_getiter,
     iternext, poll_iternext,
-    locals_dict, (void *)&poll_locals_dict
+    locals_dict, &poll_locals_dict
     );
 
 // poll()
diff --git a/extmod/modusocket.c b/extmod/modusocket.c
index 6008edb11c76f..fc16d7e270301 100644
--- a/extmod/modusocket.c
+++ b/extmod/modusocket.c
@@ -534,7 +534,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     socket_make_new,
     protocol, &socket_stream_p,
-    locals_dict, (mp_obj_dict_t *)&socket_locals_dict,
+    locals_dict, &socket_locals_dict,
     print, socket_print
     );
 
diff --git a/extmod/modussl_axtls.c b/extmod/modussl_axtls.c
index 72eb0e214fe3f..78470ea6df046 100644
--- a/extmod/modussl_axtls.c
+++ b/extmod/modussl_axtls.c
@@ -324,7 +324,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     getiter, NULL,
     iternext, NULL,
     protocol, &ussl_socket_stream_p,
-    locals_dict, (void *)&ussl_socket_locals_dict
+    locals_dict, &ussl_socket_locals_dict
     );
 
 STATIC mp_obj_t mod_ssl_wrap_socket(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
diff --git a/extmod/modussl_mbedtls.c b/extmod/modussl_mbedtls.c
index 0fab915f3f06f..76ca3ac719c91 100644
--- a/extmod/modussl_mbedtls.c
+++ b/extmod/modussl_mbedtls.c
@@ -402,7 +402,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     getiter, NULL,
     iternext, NULL,
     protocol, &ussl_socket_stream_p,
-    locals_dict, (void *)&ussl_socket_locals_dict
+    locals_dict, &ussl_socket_locals_dict
     );
 
 STATIC mp_obj_t mod_ssl_wrap_socket(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
diff --git a/extmod/modutimeq.c b/extmod/modutimeq.c
index bf4e031895fa6..1a7575adc9e58 100644
--- a/extmod/modutimeq.c
+++ b/extmod/modutimeq.c
@@ -215,7 +215,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     utimeq_make_new,
     unary_op, utimeq_unary_op,
-    locals_dict, (void *)&utimeq_locals_dict
+    locals_dict, &utimeq_locals_dict
     );
 
 STATIC const mp_rom_map_elem_t mp_module_utimeq_globals_table[] = {
diff --git a/extmod/moduwebsocket.c b/extmod/moduwebsocket.c
index 2895978f3d5d2..c6be50d0e15a3 100644
--- a/extmod/moduwebsocket.c
+++ b/extmod/moduwebsocket.c
@@ -296,7 +296,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     websocket_make_new,
     protocol, &websocket_stream_p,
-    locals_dict, (void *)&websocket_locals_dict
+    locals_dict, &websocket_locals_dict
     );
 
 STATIC const mp_rom_map_elem_t uwebsocket_module_globals_table[] = {
diff --git a/extmod/moduzlib.c b/extmod/moduzlib.c
index 93c939129eab8..533168d0b0543 100644
--- a/extmod/moduzlib.c
+++ b/extmod/moduzlib.c
@@ -146,7 +146,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     decompio_make_new,
     protocol, &decompio_stream_p,
-    locals_dict, (void *)&decompio_locals_dict
+    locals_dict, &decompio_locals_dict
     );
 #endif
 
diff --git a/extmod/modwebrepl.c b/extmod/modwebrepl.c
index cb893b38dcbe6..fc5ca35ea0338 100644
--- a/extmod/modwebrepl.c
+++ b/extmod/modwebrepl.c
@@ -348,7 +348,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     webrepl_make_new,
     protocol, &webrepl_stream_p,
-    locals_dict, (mp_obj_dict_t *)&webrepl_locals_dict
+    locals_dict, &webrepl_locals_dict
     );
 
 STATIC const mp_rom_map_elem_t webrepl_module_globals_table[] = {
diff --git a/extmod/network_cyw43.c b/extmod/network_cyw43.c
index fbd0a750b8e6c..329ba53ef51a6 100644
--- a/extmod/network_cyw43.c
+++ b/extmod/network_cyw43.c
@@ -502,7 +502,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     network_cyw43_make_new,
     print, network_cyw43_print,
-    locals_dict, (mp_obj_dict_t *)&network_cyw43_locals_dict
+    locals_dict, &network_cyw43_locals_dict
     );
 
 #endif // MICROPY_PY_NETWORK_CYW43
diff --git a/extmod/vfs_fat.c b/extmod/vfs_fat.c
index 4a2ef883c26c1..7c18a51633746 100644
--- a/extmod/vfs_fat.c
+++ b/extmod/vfs_fat.c
@@ -437,7 +437,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     fat_vfs_make_new,
     protocol, &fat_vfs_proto,
-    locals_dict, (mp_obj_dict_t *)&fat_vfs_locals_dict
+    locals_dict, &fat_vfs_locals_dict
     );
 
 #endif // MICROPY_VFS_FAT
diff --git a/extmod/vfs_fat_file.c b/extmod/vfs_fat_file.c
index 0d4af09b452cc..00980459db8b9 100644
--- a/extmod/vfs_fat_file.c
+++ b/extmod/vfs_fat_file.c
@@ -185,7 +185,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     getiter, mp_identity_getiter,
     iternext, mp_stream_unbuffered_iter,
     protocol, &vfs_fat_fileio_stream_p,
-    locals_dict, (mp_obj_dict_t *)&vfs_fat_rawfile_locals_dict
+    locals_dict, &vfs_fat_rawfile_locals_dict
     );
 
 STATIC const mp_stream_p_t vfs_fat_textio_stream_p = {
@@ -204,7 +204,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     getiter, mp_identity_getiter,
     iternext, mp_stream_unbuffered_iter,
     protocol, &vfs_fat_textio_stream_p,
-    locals_dict, (mp_obj_dict_t *)&vfs_fat_rawfile_locals_dict
+    locals_dict, &vfs_fat_rawfile_locals_dict
     );
 
 // Factory function for I/O stream classes
diff --git a/extmod/vfs_lfsx.c b/extmod/vfs_lfsx.c
index 3f8d262a4858f..33e2ef551987a 100644
--- a/extmod/vfs_lfsx.c
+++ b/extmod/vfs_lfsx.c
@@ -514,7 +514,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     MP_VFS_LFSx(make_new),
     protocol, &MP_VFS_LFSx(proto),
-    locals_dict, (mp_obj_dict_t *)&MP_VFS_LFSx(locals_dict)
+    locals_dict, &MP_VFS_LFSx(locals_dict)
     );
 
 #undef VFS_LFSx_QSTR
diff --git a/extmod/vfs_lfsx_file.c b/extmod/vfs_lfsx_file.c
index ba90cc6084435..fda1b97b2a13c 100644
--- a/extmod/vfs_lfsx_file.c
+++ b/extmod/vfs_lfsx_file.c
@@ -229,7 +229,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     getiter, mp_identity_getiter,
     iternext, mp_stream_unbuffered_iter,
     protocol, &MP_VFS_LFSx(fileio_stream_p),
-    locals_dict, (mp_obj_dict_t *)&MP_VFS_LFSx(file_locals_dict)
+    locals_dict, &MP_VFS_LFSx(file_locals_dict)
     );
 
 STATIC const mp_stream_p_t MP_VFS_LFSx(textio_stream_p) = {
@@ -248,5 +248,5 @@ MP_DEFINE_CONST_OBJ_TYPE(
     getiter, mp_identity_getiter,
     iternext, mp_stream_unbuffered_iter,
     protocol, &MP_VFS_LFSx(textio_stream_p),
-    locals_dict, (mp_obj_dict_t *)&MP_VFS_LFSx(file_locals_dict)
+    locals_dict, &MP_VFS_LFSx(file_locals_dict)
     );
diff --git a/extmod/vfs_posix.c b/extmod/vfs_posix.c
index 79126c007068f..b02827e8647c9 100644
--- a/extmod/vfs_posix.c
+++ b/extmod/vfs_posix.c
@@ -404,7 +404,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     vfs_posix_make_new,
     protocol, &vfs_posix_proto,
-    locals_dict, (mp_obj_dict_t *)&vfs_posix_locals_dict
+    locals_dict, &vfs_posix_locals_dict
     );
 
 #endif // MICROPY_VFS_POSIX
diff --git a/extmod/vfs_posix_file.c b/extmod/vfs_posix_file.c
index 85aef1617b80d..f0b5436fe1ea4 100644
--- a/extmod/vfs_posix_file.c
+++ b/extmod/vfs_posix_file.c
@@ -258,7 +258,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     getiter, mp_identity_getiter,
     iternext, mp_stream_unbuffered_iter,
     protocol, &vfs_posix_fileio_stream_p,
-    locals_dict, (mp_obj_dict_t *)&vfs_posix_rawfile_locals_dict
+    locals_dict, &vfs_posix_rawfile_locals_dict
     );
 
 STATIC const mp_stream_p_t vfs_posix_textio_stream_p = {
@@ -277,7 +277,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     getiter, mp_identity_getiter,
     iternext, mp_stream_unbuffered_iter,
     protocol, &vfs_posix_textio_stream_p,
-    locals_dict, (mp_obj_dict_t *)&vfs_posix_rawfile_locals_dict
+    locals_dict, &vfs_posix_rawfile_locals_dict
     );
 
 const mp_obj_vfs_posix_file_t mp_sys_stdin_obj = {{&mp_type_vfs_posix_textio}, STDIN_FILENO};
diff --git a/ports/cc3200/misc/mpirq.c b/ports/cc3200/misc/mpirq.c
index e9cae92a327e6..9c3c2f7196721 100644
--- a/ports/cc3200/misc/mpirq.c
+++ b/ports/cc3200/misc/mpirq.c
@@ -196,7 +196,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     MP_TYPE_NULL_MAKE_NEW,
     call, mp_irq_call,
-    locals_dict, (mp_obj_t)&mp_irq_locals_dict
+    locals_dict, &mp_irq_locals_dict
     );
 
 MP_REGISTER_ROOT_POINTER(mp_obj_list_t mp_irq_obj_list);
diff --git a/ports/cc3200/mods/modnetwork.c b/ports/cc3200/mods/modnetwork.c
index a74189300775b..0a72a1ab3256b 100644
--- a/ports/cc3200/mods/modnetwork.c
+++ b/ports/cc3200/mods/modnetwork.c
@@ -176,6 +176,6 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     MP_QSTR_Server,
     MP_TYPE_FLAG_NONE,
     network_server_make_new,
-    locals_dict, (mp_obj_t)&network_server_locals_dict
+    locals_dict, &network_server_locals_dict
     );
 #endif
diff --git a/ports/cc3200/mods/moduhashlib.c b/ports/cc3200/mods/moduhashlib.c
index 5437cfb264e6e..4a759d8ea5c56 100644
--- a/ports/cc3200/mods/moduhashlib.c
+++ b/ports/cc3200/mods/moduhashlib.c
@@ -182,7 +182,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     MP_QSTR_sha1,
     MP_TYPE_FLAG_NONE,
     hash_make_new,
-    locals_dict, (mp_obj_t)&hash_locals_dict
+    locals_dict, &hash_locals_dict
     );
 
 STATIC MP_DEFINE_CONST_OBJ_TYPE(
@@ -190,7 +190,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     MP_QSTR_sha256,
     MP_TYPE_FLAG_NONE,
     hash_make_new,
-    locals_dict, (mp_obj_t)&hash_locals_dict
+    locals_dict, &hash_locals_dict
     );
 
 STATIC const mp_rom_map_elem_t mp_module_hashlib_globals_table[] = {
diff --git a/ports/cc3200/mods/modusocket.c b/ports/cc3200/mods/modusocket.c
index 11199de14628f..55d504a709726 100644
--- a/ports/cc3200/mods/modusocket.c
+++ b/ports/cc3200/mods/modusocket.c
@@ -765,7 +765,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     socket_make_new,
     protocol, &socket_stream_p,
-    locals_dict, (mp_obj_t)&socket_locals_dict
+    locals_dict, &socket_locals_dict
     );
 
 /******************************************************************************/
diff --git a/ports/cc3200/mods/modussl.c b/ports/cc3200/mods/modussl.c
index d0909e7c2909d..abc9917c8134c 100644
--- a/ports/cc3200/mods/modussl.c
+++ b/ports/cc3200/mods/modussl.c
@@ -68,7 +68,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     getiter, NULL,
     iternext, NULL,
     protocol, &socket_stream_p,
-    locals_dict, (mp_obj_t)&socket_locals_dict
+    locals_dict, &socket_locals_dict
     );
 
 STATIC mp_obj_t mod_ssl_wrap_socket(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
diff --git a/ports/cc3200/mods/modwlan.c b/ports/cc3200/mods/modwlan.c
index 24f5d196d2a30..1c99f075e9020 100644
--- a/ports/cc3200/mods/modwlan.c
+++ b/ports/cc3200/mods/modwlan.c
@@ -1290,7 +1290,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     MP_QSTR_WLAN,
     MP_TYPE_FLAG_NONE,
     wlan_make_new,
-    locals_dict, (mp_obj_t)&wlan_locals_dict
+    locals_dict, &wlan_locals_dict
     );
 
 const mod_network_nic_type_t mod_network_nic_type_wlan = {
diff --git a/ports/cc3200/mods/pybadc.c b/ports/cc3200/mods/pybadc.c
index a114eeda169a0..a14f9aced2618 100644
--- a/ports/cc3200/mods/pybadc.c
+++ b/ports/cc3200/mods/pybadc.c
@@ -239,7 +239,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     adc_make_new,
     print, adc_print,
-    locals_dict, (mp_obj_t)&adc_locals_dict
+    locals_dict, &adc_locals_dict
     );
 
 STATIC void adc_channel_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
@@ -308,5 +308,5 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_NULL_MAKE_NEW,
     print, adc_channel_print,
     call, adc_channel_call,
-    locals_dict, (mp_obj_t)&adc_channel_locals_dict
+    locals_dict, &adc_channel_locals_dict
     );
diff --git a/ports/cc3200/mods/pybflash.c b/ports/cc3200/mods/pybflash.c
index 4cfafb7abf642..a6d1e23fbf021 100644
--- a/ports/cc3200/mods/pybflash.c
+++ b/ports/cc3200/mods/pybflash.c
@@ -89,7 +89,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_QSTR_Flash,
     MP_TYPE_FLAG_NONE,
     pyb_flash_make_new,
-    locals_dict, (mp_obj_t)&pyb_flash_locals_dict
+    locals_dict, &pyb_flash_locals_dict
     );
 
 void pyb_flash_init_vfs(fs_user_mount_t *vfs) {
diff --git a/ports/cc3200/mods/pybi2c.c b/ports/cc3200/mods/pybi2c.c
index 91a0b9b9f9a99..de92cc7c32b30 100644
--- a/ports/cc3200/mods/pybi2c.c
+++ b/ports/cc3200/mods/pybi2c.c
@@ -527,5 +527,5 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     pyb_i2c_make_new,
     print, pyb_i2c_print,
-    locals_dict, (mp_obj_t)&pyb_i2c_locals_dict
+    locals_dict, &pyb_i2c_locals_dict
     );
diff --git a/ports/cc3200/mods/pybpin.c b/ports/cc3200/mods/pybpin.c
index 948cda70d4ab9..374d09ddfbd77 100644
--- a/ports/cc3200/mods/pybpin.c
+++ b/ports/cc3200/mods/pybpin.c
@@ -938,7 +938,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     pin_make_new,
     print, pin_print,
     call, pin_call,
-    locals_dict, (mp_obj_t)&pin_locals_dict
+    locals_dict, &pin_locals_dict
     );
 
 STATIC const mp_irq_methods_t pin_irq_methods = {
@@ -959,6 +959,6 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     MP_TYPE_NULL_MAKE_NEW,
     print, pin_named_pins_obj_print,
-    locals_dict, (mp_obj_t)&pin_board_pins_locals_dict
+    locals_dict, &pin_board_pins_locals_dict
     );
 
diff --git a/ports/cc3200/mods/pybrtc.c b/ports/cc3200/mods/pybrtc.c
index 2761cb3c64f5d..ed7a20fecbf6c 100644
--- a/ports/cc3200/mods/pybrtc.c
+++ b/ports/cc3200/mods/pybrtc.c
@@ -474,7 +474,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_QSTR_RTC,
     MP_TYPE_FLAG_NONE,
     pyb_rtc_make_new,
-    locals_dict, (mp_obj_t)&pyb_rtc_locals_dict
+    locals_dict, &pyb_rtc_locals_dict
     );
 
 STATIC const mp_irq_methods_t pyb_rtc_irq_methods = {
diff --git a/ports/cc3200/mods/pybsd.c b/ports/cc3200/mods/pybsd.c
index d8834e36f7447..968a6a87ec4d7 100644
--- a/ports/cc3200/mods/pybsd.c
+++ b/ports/cc3200/mods/pybsd.c
@@ -217,5 +217,5 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_QSTR_SD,
     MP_TYPE_FLAG_NONE,
     pyb_sd_make_new,
-    locals_dict, (mp_obj_t)&pyb_sd_locals_dict
+    locals_dict, &pyb_sd_locals_dict
     );
diff --git a/ports/cc3200/mods/pybspi.c b/ports/cc3200/mods/pybspi.c
index 50d897633e557..7d83fabfde4da 100644
--- a/ports/cc3200/mods/pybspi.c
+++ b/ports/cc3200/mods/pybspi.c
@@ -383,5 +383,5 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     pyb_spi_make_new,
     print, pyb_spi_print,
-    locals_dict, (mp_obj_t)&pyb_spi_locals_dict
+    locals_dict, &pyb_spi_locals_dict
     );
diff --git a/ports/cc3200/mods/pybtimer.c b/ports/cc3200/mods/pybtimer.c
index a8bc7821e0ce2..14e1deb083ed2 100644
--- a/ports/cc3200/mods/pybtimer.c
+++ b/ports/cc3200/mods/pybtimer.c
@@ -465,7 +465,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     pyb_timer_make_new,
     print, pyb_timer_print,
-    locals_dict, (mp_obj_t)&pyb_timer_locals_dict
+    locals_dict, &pyb_timer_locals_dict
     );
 
 STATIC const mp_irq_methods_t pyb_timer_channel_irq_methods = {
@@ -728,7 +728,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     MP_TYPE_NULL_MAKE_NEW,
     print, pyb_timer_channel_print,
-    locals_dict, (mp_obj_t)&pyb_timer_channel_locals_dict
+    locals_dict, &pyb_timer_channel_locals_dict
     );
 
 MP_REGISTER_ROOT_POINTER(mp_obj_list_t pyb_timer_channel_obj_list);
diff --git a/ports/cc3200/mods/pybuart.c b/ports/cc3200/mods/pybuart.c
index 059101f4f205a..e7896c4ca5cfa 100644
--- a/ports/cc3200/mods/pybuart.c
+++ b/ports/cc3200/mods/pybuart.c
@@ -694,7 +694,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     getiter, mp_identity_getiter,
     iternext, mp_stream_unbuffered_iter,
     protocol, &uart_stream_p,
-    locals_dict, (mp_obj_t)&pyb_uart_locals_dict
+    locals_dict, &pyb_uart_locals_dict
     );
 
 MP_REGISTER_ROOT_POINTER(struct _pyb_uart_obj_t *pyb_uart_objs[2]);
diff --git a/ports/cc3200/mods/pybwdt.c b/ports/cc3200/mods/pybwdt.c
index cde1abe59d896..3c1f9eb195f10 100644
--- a/ports/cc3200/mods/pybwdt.c
+++ b/ports/cc3200/mods/pybwdt.c
@@ -155,6 +155,6 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_QSTR_WDT,
     MP_TYPE_FLAG_NONE,
     pyb_wdt_make_new,
-    locals_dict, (mp_obj_t)&pybwdt_locals_dict
+    locals_dict, &pybwdt_locals_dict
     );
 
diff --git a/ports/esp32/esp32_nvs.c b/ports/esp32/esp32_nvs.c
index 1f96ad129d11a..d935a13d6fe5d 100644
--- a/ports/esp32/esp32_nvs.c
+++ b/ports/esp32/esp32_nvs.c
@@ -147,5 +147,5 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     esp32_nvs_make_new,
     print, esp32_nvs_print,
-    locals_dict, (mp_obj_dict_t *)&esp32_nvs_locals_dict
+    locals_dict, &esp32_nvs_locals_dict
     );
diff --git a/ports/esp32/esp32_partition.c b/ports/esp32/esp32_partition.c
index 2e42e7a81903e..6ce1e90b4c700 100644
--- a/ports/esp32/esp32_partition.c
+++ b/ports/esp32/esp32_partition.c
@@ -290,5 +290,5 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     esp32_partition_make_new,
     print, esp32_partition_print,
-    locals_dict, (mp_obj_dict_t *)&esp32_partition_locals_dict
+    locals_dict, &esp32_partition_locals_dict
     );
diff --git a/ports/esp32/esp32_rmt.c b/ports/esp32/esp32_rmt.c
index 36f33df3f5d44..ee09ac5200611 100644
--- a/ports/esp32/esp32_rmt.c
+++ b/ports/esp32/esp32_rmt.c
@@ -378,5 +378,5 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     esp32_rmt_make_new,
     print, esp32_rmt_print,
-    locals_dict, (mp_obj_dict_t *)&esp32_rmt_locals_dict
+    locals_dict, &esp32_rmt_locals_dict
     );
diff --git a/ports/esp32/esp32_ulp.c b/ports/esp32/esp32_ulp.c
index 5eb0e5591e7e0..5030f980675ed 100644
--- a/ports/esp32/esp32_ulp.c
+++ b/ports/esp32/esp32_ulp.c
@@ -96,7 +96,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_QSTR_ULP,
     MP_TYPE_FLAG_NONE,
     esp32_ulp_make_new,
-    locals_dict, (mp_obj_t)&esp32_ulp_locals_dict
+    locals_dict, &esp32_ulp_locals_dict
     );
 
 #endif // CONFIG_IDF_TARGET_ESP32
diff --git a/ports/esp32/machine_adc.c b/ports/esp32/machine_adc.c
index 5cc2d80384915..c4e04159c0b90 100644
--- a/ports/esp32/machine_adc.c
+++ b/ports/esp32/machine_adc.c
@@ -262,5 +262,5 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     madc_make_new,
     print, madc_print,
-    locals_dict, (mp_obj_t)&madc_locals_dict
+    locals_dict, &madc_locals_dict
     );
diff --git a/ports/esp32/machine_adcblock.c b/ports/esp32/machine_adcblock.c
index 770839e93e1b1..ae3244f7fdb4a 100644
--- a/ports/esp32/machine_adcblock.c
+++ b/ports/esp32/machine_adcblock.c
@@ -200,5 +200,5 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     madcblock_make_new,
     print, madcblock_print,
-    locals_dict, (mp_obj_dict_t *)&madcblock_locals_dict
+    locals_dict, &madcblock_locals_dict
     );
diff --git a/ports/esp32/machine_dac.c b/ports/esp32/machine_dac.c
index c9b9c14e01e77..fbe33b0344a47 100644
--- a/ports/esp32/machine_dac.c
+++ b/ports/esp32/machine_dac.c
@@ -110,7 +110,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     mdac_make_new,
     print, mdac_print,
-    locals_dict, (mp_obj_t)&mdac_locals_dict
+    locals_dict, &mdac_locals_dict
     );
 
 #endif // MICROPY_PY_MACHINE_DAC
diff --git a/ports/esp32/machine_hw_spi.c b/ports/esp32/machine_hw_spi.c
index 71583ef60e900..51ea31ac1b3db 100644
--- a/ports/esp32/machine_hw_spi.c
+++ b/ports/esp32/machine_hw_spi.c
@@ -552,5 +552,5 @@ MP_DEFINE_CONST_OBJ_TYPE(
     machine_hw_spi_make_new,
     print, machine_hw_spi_print,
     protocol, &machine_hw_spi_p,
-    locals_dict, (mp_obj_dict_t *)&mp_machine_spi_locals_dict
+    locals_dict, &mp_machine_spi_locals_dict
     );
diff --git a/ports/esp32/machine_i2c.c b/ports/esp32/machine_i2c.c
index 9e5be606dbf99..895dc3a39874d 100644
--- a/ports/esp32/machine_i2c.c
+++ b/ports/esp32/machine_i2c.c
@@ -199,5 +199,5 @@ MP_DEFINE_CONST_OBJ_TYPE(
     machine_hw_i2c_make_new,
     print, machine_hw_i2c_print,
     protocol, &machine_hw_i2c_p,
-    locals_dict, (mp_obj_dict_t *)&mp_machine_i2c_locals_dict
+    locals_dict, &mp_machine_i2c_locals_dict
     );
diff --git a/ports/esp32/machine_i2s.c b/ports/esp32/machine_i2s.c
index d30fb5d836e7b..b853f418ada3c 100644
--- a/ports/esp32/machine_i2s.c
+++ b/ports/esp32/machine_i2s.c
@@ -838,7 +838,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     getiter, mp_identity_getiter,
     iternext, mp_stream_unbuffered_iter,
     protocol, &i2s_stream_p,
-    locals_dict, (mp_obj_dict_t *)&machine_i2s_locals_dict
+    locals_dict, &machine_i2s_locals_dict
     );
 
 MP_REGISTER_ROOT_POINTER(struct _machine_i2s_obj_t *machine_i2s_obj[I2S_NUM_MAX]);
diff --git a/ports/esp32/machine_pin.c b/ports/esp32/machine_pin.c
index 1a1a3a0f8d170..fd523a38edacc 100644
--- a/ports/esp32/machine_pin.c
+++ b/ports/esp32/machine_pin.c
@@ -537,7 +537,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     print, machine_pin_print,
     call, machine_pin_call,
     protocol, &pin_pin_p,
-    locals_dict, (mp_obj_t)&machine_pin_locals_dict
+    locals_dict, &machine_pin_locals_dict
     );
 
 /******************************************************************************/
@@ -730,7 +730,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     MP_TYPE_NULL_MAKE_NEW,
     call, machine_pin_irq_call,
-    locals_dict, (mp_obj_dict_t *)&machine_pin_irq_locals_dict
+    locals_dict, &machine_pin_irq_locals_dict
     );
 
 MP_REGISTER_ROOT_POINTER(mp_obj_t machine_pin_irq_handler[40]);
diff --git a/ports/esp32/machine_rtc.c b/ports/esp32/machine_rtc.c
index 6634bf5b03b9b..19b83703fd43f 100644
--- a/ports/esp32/machine_rtc.c
+++ b/ports/esp32/machine_rtc.c
@@ -178,5 +178,5 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_QSTR_RTC,
     MP_TYPE_FLAG_NONE,
     machine_rtc_make_new,
-    locals_dict, (mp_obj_t)&machine_rtc_locals_dict
+    locals_dict, &machine_rtc_locals_dict
     );
diff --git a/ports/esp32/machine_sdcard.c b/ports/esp32/machine_sdcard.c
index 2d5663d476e8f..0b6159157d980 100644
--- a/ports/esp32/machine_sdcard.c
+++ b/ports/esp32/machine_sdcard.c
@@ -404,7 +404,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_QSTR_SDCard,
     MP_TYPE_FLAG_NONE,
     machine_sdcard_make_new,
-    locals_dict, (mp_obj_dict_t *)&machine_sdcard_locals_dict
+    locals_dict, &machine_sdcard_locals_dict
     );
 
 #endif // MICROPY_HW_ENABLE_SDCARD
diff --git a/ports/esp32/machine_timer.c b/ports/esp32/machine_timer.c
index 3b1295095593e..2fd40fa2afc12 100644
--- a/ports/esp32/machine_timer.c
+++ b/ports/esp32/machine_timer.c
@@ -283,7 +283,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     machine_timer_make_new,
     print, machine_timer_print,
-    locals_dict, (mp_obj_t)&machine_timer_locals_dict
+    locals_dict, &machine_timer_locals_dict
     );
 
 MP_REGISTER_ROOT_POINTER(struct _machine_timer_obj_t *machine_timer_obj_head);
diff --git a/ports/esp32/machine_touchpad.c b/ports/esp32/machine_touchpad.c
index c5e3483b74a08..deba818dd1c87 100644
--- a/ports/esp32/machine_touchpad.c
+++ b/ports/esp32/machine_touchpad.c
@@ -139,7 +139,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_QSTR_TouchPad,
     MP_TYPE_FLAG_NONE,
     mtp_make_new,
-    locals_dict, (mp_obj_t)&mtp_locals_dict
+    locals_dict, &mtp_locals_dict
     );
 
 #endif // CONFIG_IDF_TARGET_ESP32
diff --git a/ports/esp32/machine_uart.c b/ports/esp32/machine_uart.c
index 9df16ae419837..6e091b8838a23 100644
--- a/ports/esp32/machine_uart.c
+++ b/ports/esp32/machine_uart.c
@@ -539,5 +539,5 @@ MP_DEFINE_CONST_OBJ_TYPE(
     getiter, mp_identity_getiter,
     iternext, mp_stream_unbuffered_iter,
     protocol, &uart_stream_p,
-    locals_dict, (mp_obj_dict_t *)&machine_uart_locals_dict
+    locals_dict, &machine_uart_locals_dict
     );
diff --git a/ports/esp32/machine_wdt.c b/ports/esp32/machine_wdt.c
index c2898c7fe1586..bda9c6975e152 100644
--- a/ports/esp32/machine_wdt.c
+++ b/ports/esp32/machine_wdt.c
@@ -88,5 +88,5 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_QSTR_WDT,
     MP_TYPE_FLAG_NONE,
     machine_wdt_make_new,
-    locals_dict, (mp_obj_t)&machine_wdt_locals_dict
+    locals_dict, &machine_wdt_locals_dict
     );
diff --git a/ports/esp32/modsocket.c b/ports/esp32/modsocket.c
index a2dcb3946ceaa..e7e6f3c26e287 100644
--- a/ports/esp32/modsocket.c
+++ b/ports/esp32/modsocket.c
@@ -791,7 +791,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     socket_make_new,
     protocol, &socket_stream_p,
-    locals_dict, (mp_obj_t)&socket_locals_dict
+    locals_dict, &socket_locals_dict
     );
 
 STATIC mp_obj_t esp_socket_getaddrinfo(size_t n_args, const mp_obj_t *args) {
diff --git a/ports/esp32/network_lan.c b/ports/esp32/network_lan.c
index fc50e13c48edc..3c5aea5fb8a4d 100644
--- a/ports/esp32/network_lan.c
+++ b/ports/esp32/network_lan.c
@@ -307,7 +307,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_QSTR_LAN,
     MP_TYPE_FLAG_NONE,
     MP_TYPE_NULL_MAKE_NEW,
-    locals_dict, (mp_obj_dict_t *)&lan_if_locals_dict
+    locals_dict, &lan_if_locals_dict
     );
 
 #endif
diff --git a/ports/esp32/network_ppp.c b/ports/esp32/network_ppp.c
index d6368d9f2038b..df07515c7d411 100644
--- a/ports/esp32/network_ppp.c
+++ b/ports/esp32/network_ppp.c
@@ -283,5 +283,5 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_QSTR_PPP,
     MP_TYPE_FLAG_NONE,
     MP_TYPE_NULL_MAKE_NEW,
-    locals_dict, (mp_obj_dict_t *)&ppp_if_locals_dict
+    locals_dict, &ppp_if_locals_dict
     );
diff --git a/ports/esp32/network_wlan.c b/ports/esp32/network_wlan.c
index 6ca5f9a9bafea..0f1f5de14937a 100644
--- a/ports/esp32/network_wlan.c
+++ b/ports/esp32/network_wlan.c
@@ -620,7 +620,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_QSTR_WLAN,
     MP_TYPE_FLAG_NONE,
     MP_TYPE_NULL_MAKE_NEW,
-    locals_dict, (mp_obj_dict_t *)&wlan_if_locals_dict
+    locals_dict, &wlan_if_locals_dict
     );
 
 STATIC const wlan_if_obj_t wlan_sta_obj = {{&wlan_if_type}, WIFI_IF_STA};
diff --git a/ports/esp8266/machine_adc.c b/ports/esp8266/machine_adc.c
index bface7f7e155c..b1e7b38435276 100644
--- a/ports/esp8266/machine_adc.c
+++ b/ports/esp8266/machine_adc.c
@@ -95,5 +95,5 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     machine_adc_make_new,
     print, machine_adc_print,
-    locals_dict, (mp_obj_dict_t *)&machine_adc_locals_dict
+    locals_dict, &machine_adc_locals_dict
     );
diff --git a/ports/esp8266/machine_hspi.c b/ports/esp8266/machine_hspi.c
index c0d4a677e3ef5..3f449a1de91e1 100644
--- a/ports/esp8266/machine_hspi.c
+++ b/ports/esp8266/machine_hspi.c
@@ -182,7 +182,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     machine_hspi_make_new,
     print, machine_hspi_print,
     protocol, &machine_hspi_p,
-    locals_dict, (mp_obj_dict_t *)&mp_machine_spi_locals_dict
+    locals_dict, &mp_machine_spi_locals_dict
     );
 
 #endif // MICROPY_PY_MACHINE_SPI
diff --git a/ports/esp8266/machine_pin.c b/ports/esp8266/machine_pin.c
index 8b759766cd6f7..32ffca873dfaf 100644
--- a/ports/esp8266/machine_pin.c
+++ b/ports/esp8266/machine_pin.c
@@ -458,7 +458,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     print, pyb_pin_print,
     call, pyb_pin_call,
     protocol, &pin_pin_p,
-    locals_dict, (mp_obj_dict_t *)&pyb_pin_locals_dict
+    locals_dict, &pyb_pin_locals_dict
     );
 
 /******************************************************************************/
@@ -516,7 +516,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     MP_TYPE_NULL_MAKE_NEW,
     call, pin_irq_call,
-    locals_dict, (mp_obj_dict_t *)&pin_irq_locals_dict
+    locals_dict, &pin_irq_locals_dict
     );
 
 MP_REGISTER_ROOT_POINTER(mp_obj_t pin_irq_handler[16]);
diff --git a/ports/esp8266/machine_rtc.c b/ports/esp8266/machine_rtc.c
index 4235b325ef7a8..cc6b79a031be7 100644
--- a/ports/esp8266/machine_rtc.c
+++ b/ports/esp8266/machine_rtc.c
@@ -267,5 +267,5 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_QSTR_RTC,
     MP_TYPE_FLAG_NONE,
     pyb_rtc_make_new,
-    locals_dict, (mp_obj_dict_t *)&pyb_rtc_locals_dict
+    locals_dict, &pyb_rtc_locals_dict
     );
diff --git a/ports/esp8266/machine_uart.c b/ports/esp8266/machine_uart.c
index 82f5189388caf..c737f854c34f3 100644
--- a/ports/esp8266/machine_uart.c
+++ b/ports/esp8266/machine_uart.c
@@ -352,7 +352,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     getiter, mp_identity_getiter,
     iternext, mp_stream_unbuffered_iter,
     protocol, &uart_stream_p,
-    locals_dict, (mp_obj_dict_t *)&pyb_uart_locals_dict
+    locals_dict, &pyb_uart_locals_dict
     );
 
 MP_REGISTER_ROOT_POINTER(byte * uart0_rxbuf);
diff --git a/ports/esp8266/machine_wdt.c b/ports/esp8266/machine_wdt.c
index d8c32ddd1a1f3..26d5c9fa76f13 100644
--- a/ports/esp8266/machine_wdt.c
+++ b/ports/esp8266/machine_wdt.c
@@ -74,5 +74,5 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_QSTR_WDT,
     MP_TYPE_FLAG_NONE,
     machine_wdt_make_new,
-    locals_dict, (mp_obj_dict_t *)&machine_wdt_locals_dict
+    locals_dict, &machine_wdt_locals_dict
     );
diff --git a/ports/esp8266/modmachine.c b/ports/esp8266/modmachine.c
index 2bb2c7bd7695f..eb41e30f66b12 100644
--- a/ports/esp8266/modmachine.c
+++ b/ports/esp8266/modmachine.c
@@ -343,7 +343,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     esp_timer_make_new,
     print, esp_timer_print,
-    locals_dict, (mp_obj_dict_t *)&esp_timer_locals_dict
+    locals_dict, &esp_timer_locals_dict
     );
 
 // this bit is unused in the Xtensa PS register
diff --git a/ports/esp8266/modnetwork.c b/ports/esp8266/modnetwork.c
index f78bf5da52eb1..45a5a2be5412a 100644
--- a/ports/esp8266/modnetwork.c
+++ b/ports/esp8266/modnetwork.c
@@ -515,7 +515,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_QSTR_WLAN,
     MP_TYPE_FLAG_NONE,
     MP_TYPE_NULL_MAKE_NEW,
-    locals_dict, (mp_obj_dict_t *)&wlan_if_locals_dict
+    locals_dict, &wlan_if_locals_dict
     );
 
 STATIC mp_obj_t esp_phy_mode(size_t n_args, const mp_obj_t *args) {
diff --git a/ports/mimxrt/machine_adc.c b/ports/mimxrt/machine_adc.c
index cbac6b5734d21..7a19d1225ee73 100644
--- a/ports/mimxrt/machine_adc.c
+++ b/ports/mimxrt/machine_adc.c
@@ -123,7 +123,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     adc_obj_make_new,
     print, adc_obj_print,
-    locals_dict, (mp_obj_dict_t *)&adc_locals_dict
+    locals_dict, &adc_locals_dict
     );
 
 void machine_adc_init(void) {
diff --git a/ports/mimxrt/machine_i2c.c b/ports/mimxrt/machine_i2c.c
index b8b6b7bc63340..62dfd8204c081 100644
--- a/ports/mimxrt/machine_i2c.c
+++ b/ports/mimxrt/machine_i2c.c
@@ -204,5 +204,5 @@ MP_DEFINE_CONST_OBJ_TYPE(
     machine_i2c_make_new,
     print, machine_i2c_print,
     protocol, &machine_i2c_p,
-    locals_dict, (mp_obj_dict_t *)&mp_machine_i2c_locals_dict
+    locals_dict, &mp_machine_i2c_locals_dict
     );
diff --git a/ports/mimxrt/machine_i2s.c b/ports/mimxrt/machine_i2s.c
index 68bf3a820f59f..13380b4ee6b09 100644
--- a/ports/mimxrt/machine_i2s.c
+++ b/ports/mimxrt/machine_i2s.c
@@ -1222,7 +1222,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     getiter, mp_identity_getiter,
     iternext, mp_stream_unbuffered_iter,
     protocol, &i2s_stream_p,
-    locals_dict, (mp_obj_dict_t *)&machine_i2s_locals_dict
+    locals_dict, &machine_i2s_locals_dict
     );
 
 MP_REGISTER_ROOT_POINTER(struct _machine_i2s_obj_t *machine_i2s_obj[MICROPY_HW_I2S_NUM]);
diff --git a/ports/mimxrt/machine_led.c b/ports/mimxrt/machine_led.c
index d766c8f3237a2..9fd98ef71043f 100644
--- a/ports/mimxrt/machine_led.c
+++ b/ports/mimxrt/machine_led.c
@@ -86,7 +86,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     led_obj_make_new,
     print, led_obj_print,
-    locals_dict, (mp_obj_dict_t *)&led_locals_dict
+    locals_dict, &led_locals_dict
     );
 
 #endif
diff --git a/ports/mimxrt/machine_pin.c b/ports/mimxrt/machine_pin.c
index 7ec66d0eac95b..261e3e4148034 100644
--- a/ports/mimxrt/machine_pin.c
+++ b/ports/mimxrt/machine_pin.c
@@ -63,7 +63,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_QSTR_cpu,
     MP_TYPE_FLAG_NONE,
     MP_TYPE_NULL_MAKE_NEW,
-    locals_dict, (mp_obj_t)&machine_pin_cpu_pins_locals_dict
+    locals_dict, &machine_pin_cpu_pins_locals_dict
     );
 
 MP_DEFINE_CONST_OBJ_TYPE(
@@ -71,7 +71,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_QSTR_board,
     MP_TYPE_FLAG_NONE,
     MP_TYPE_NULL_MAKE_NEW,
-    locals_dict, (mp_obj_t)&machine_pin_board_pins_locals_dict
+    locals_dict, &machine_pin_board_pins_locals_dict
     );
 
 STATIC const mp_irq_methods_t machine_pin_irq_methods;
@@ -428,7 +428,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     print, machine_pin_obj_print,
     call, machine_pin_obj_call,
     protocol, &machine_pin_obj_protocol,
-    locals_dict, (mp_obj_dict_t *)&machine_pin_locals_dict
+    locals_dict, &machine_pin_locals_dict
     );
 
 // FIXME: Create actual pin_af type!!!
@@ -438,7 +438,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     mp_pin_make_new,
     print, machine_pin_obj_print,
-    locals_dict, (mp_obj_dict_t *)&machine_pin_locals_dict
+    locals_dict, &machine_pin_locals_dict
     );
 
 STATIC mp_uint_t machine_pin_irq_trigger(mp_obj_t self_in, mp_uint_t new_trigger) {
diff --git a/ports/mimxrt/machine_rtc.c b/ports/mimxrt/machine_rtc.c
index 5211027bdf807..2e1a09dedbe6f 100644
--- a/ports/mimxrt/machine_rtc.c
+++ b/ports/mimxrt/machine_rtc.c
@@ -171,5 +171,5 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_QSTR_RTC,
     MP_TYPE_FLAG_NONE,
     machine_rtc_make_new,
-    locals_dict, (mp_obj_t)&machine_rtc_locals_dict
+    locals_dict, &machine_rtc_locals_dict
     );
diff --git a/ports/mimxrt/machine_sdcard.c b/ports/mimxrt/machine_sdcard.c
index b7bdceef47edb..22f7e7c232a8e 100644
--- a/ports/mimxrt/machine_sdcard.c
+++ b/ports/mimxrt/machine_sdcard.c
@@ -213,7 +213,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_QSTR_SDCard,
     MP_TYPE_FLAG_NONE,
     sdcard_obj_make_new,
-    locals_dict, (mp_obj_dict_t *)&sdcard_locals_dict
+    locals_dict, &sdcard_locals_dict
     );
 
 void machine_sdcard_init0(void) {
diff --git a/ports/mimxrt/machine_spi.c b/ports/mimxrt/machine_spi.c
index ff3cf4fb2551d..93b75e931eb48 100644
--- a/ports/mimxrt/machine_spi.c
+++ b/ports/mimxrt/machine_spi.c
@@ -258,5 +258,5 @@ MP_DEFINE_CONST_OBJ_TYPE(
     machine_spi_make_new,
     print, machine_spi_print,
     protocol, &machine_spi_p,
-    locals_dict, (mp_obj_dict_t *)&mp_machine_spi_locals_dict
+    locals_dict, &mp_machine_spi_locals_dict
     );
diff --git a/ports/mimxrt/machine_timer.c b/ports/mimxrt/machine_timer.c
index 9612388486e31..a6b61982f7ec0 100644
--- a/ports/mimxrt/machine_timer.c
+++ b/ports/mimxrt/machine_timer.c
@@ -217,7 +217,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     machine_timer_make_new,
     print, machine_timer_print,
-    locals_dict, (mp_obj_dict_t *)&machine_timer_locals_dict
+    locals_dict, &machine_timer_locals_dict
     );
 
 MP_REGISTER_ROOT_POINTER(struct _machine_timer_obj_t *timer_table[MICROPY_HW_PIT_NUM_CHANNELS]);
diff --git a/ports/mimxrt/machine_uart.c b/ports/mimxrt/machine_uart.c
index 4bb518eab25e4..9d4873274a8fe 100644
--- a/ports/mimxrt/machine_uart.c
+++ b/ports/mimxrt/machine_uart.c
@@ -478,5 +478,5 @@ MP_DEFINE_CONST_OBJ_TYPE(
     getiter, mp_identity_getiter,
     iternext, mp_stream_unbuffered_iter,
     protocol, &uart_stream_p,
-    locals_dict, (mp_obj_dict_t *)&machine_uart_locals_dict
+    locals_dict, &machine_uart_locals_dict
     );
diff --git a/ports/mimxrt/machine_wdt.c b/ports/mimxrt/machine_wdt.c
index cde80f085b997..e0b5c74b54268 100644
--- a/ports/mimxrt/machine_wdt.c
+++ b/ports/mimxrt/machine_wdt.c
@@ -104,5 +104,5 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_QSTR_WDT,
     MP_TYPE_FLAG_NONE,
     machine_wdt_make_new,
-    locals_dict, (mp_obj_dict_t *)&machine_wdt_locals_dict
+    locals_dict, &machine_wdt_locals_dict
     );
diff --git a/ports/mimxrt/mimxrt_flash.c b/ports/mimxrt/mimxrt_flash.c
index 1a7d6cca8da0e..bd03c853d597d 100644
--- a/ports/mimxrt/mimxrt_flash.c
+++ b/ports/mimxrt/mimxrt_flash.c
@@ -220,5 +220,5 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_QSTR_Flash,
     MP_TYPE_FLAG_NONE,
     mimxrt_flash_make_new,
-    locals_dict, (mp_obj_dict_t *)&mimxrt_flash_locals_dict
+    locals_dict, &mimxrt_flash_locals_dict
     );
diff --git a/ports/mimxrt/network_lan.c b/ports/mimxrt/network_lan.c
index 08c3c9e729f50..e15894294b68c 100644
--- a/ports/mimxrt/network_lan.c
+++ b/ports/mimxrt/network_lan.c
@@ -226,7 +226,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     network_lan_make_new,
     print, network_lan_print,
-    locals_dict, (mp_obj_dict_t *)&network_lan_locals_dict
+    locals_dict, &network_lan_locals_dict
     );
 
 
diff --git a/ports/nrf/boards/microbit/modules/microbitdisplay.c b/ports/nrf/boards/microbit/modules/microbitdisplay.c
index 084cb09524da7..5cb25ea1ced48 100644
--- a/ports/nrf/boards/microbit/modules/microbitdisplay.c
+++ b/ports/nrf/boards/microbit/modules/microbitdisplay.c
@@ -547,7 +547,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_QSTR_MicroBitDisplay,
     MP_TYPE_FLAG_NONE,
     MP_TYPE_NULL_MAKE_NEW,
-    locals_dict, (mp_obj_dict_t*)&microbit_display_locals_dict
+    locals_dict, &microbit_display_locals_dict
     );
 
 microbit_display_obj_t microbit_display_obj = {
diff --git a/ports/nrf/boards/microbit/modules/microbitimage.c b/ports/nrf/boards/microbit/modules/microbitimage.c
index 95b17bb6d3396..4870b6738f6c0 100644
--- a/ports/nrf/boards/microbit/modules/microbitimage.c
+++ b/ports/nrf/boards/microbit/modules/microbitimage.c
@@ -685,7 +685,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     microbit_image_make_new,
     print, microbit_image_print,
     binary_op, image_binary_op,
-    locals_dict, (mp_obj_dict_t*)&microbit_image_locals_dict
+    locals_dict, &microbit_image_locals_dict
     );
 
 typedef struct _scrolling_string_t {
diff --git a/ports/nrf/modules/board/led.c b/ports/nrf/modules/board/led.c
index 5eef8f0464021..577c2b62843f4 100644
--- a/ports/nrf/modules/board/led.c
+++ b/ports/nrf/modules/board/led.c
@@ -200,7 +200,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     led_obj_make_new,
     print, led_obj_print,
-    locals_dict, (mp_obj_dict_t*)&led_locals_dict
+    locals_dict, &led_locals_dict
     );
 
 #else
diff --git a/ports/nrf/modules/machine/adc.c b/ports/nrf/modules/machine/adc.c
index 5814dcaa392cf..84db8d259f2ac 100644
--- a/ports/nrf/modules/machine/adc.c
+++ b/ports/nrf/modules/machine/adc.c
@@ -299,7 +299,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_QSTR_ADC,
     MP_TYPE_FLAG_NONE,
     machine_adc_make_new,
-    locals_dict, (mp_obj_dict_t*)&machine_adc_locals_dict,
+    locals_dict, &machine_adc_locals_dict,
     print, machine_adc_print
     );
 
diff --git a/ports/nrf/modules/machine/i2c.c b/ports/nrf/modules/machine/i2c.c
index 8468684428a7c..7cb55d078821c 100644
--- a/ports/nrf/modules/machine/i2c.c
+++ b/ports/nrf/modules/machine/i2c.c
@@ -168,7 +168,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     machine_hard_i2c_make_new,
     print, machine_hard_i2c_print,
     protocol, &machine_hard_i2c_p,
-    locals_dict, (mp_obj_dict_t*)&mp_machine_i2c_locals_dict
+    locals_dict, &mp_machine_i2c_locals_dict
     );
 
 #endif // MICROPY_PY_MACHINE_I2C
diff --git a/ports/nrf/modules/machine/pin.c b/ports/nrf/modules/machine/pin.c
index 835f6cf2bd32c..4f283e5dba149 100644
--- a/ports/nrf/modules/machine/pin.c
+++ b/ports/nrf/modules/machine/pin.c
@@ -603,7 +603,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     pin_make_new,
     print, pin_print,
     call, pin_call,
-    locals_dict, (mp_obj_dict_t*)&pin_locals_dict
+    locals_dict, &pin_locals_dict
     );
 
 /// \moduleref machine
@@ -678,7 +678,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     MP_TYPE_NULL_MAKE_NEW,
     print, pin_af_obj_print,
-    locals_dict, (mp_obj_dict_t*)&pin_af_locals_dict
+    locals_dict, &pin_af_locals_dict
     );
 
 MP_REGISTER_ROOT_POINTER(mp_obj_t pin_class_mapper);
diff --git a/ports/nrf/modules/machine/pwm.c b/ports/nrf/modules/machine/pwm.c
index d0ac0e9450c3c..54e643ec55ffd 100644
--- a/ports/nrf/modules/machine/pwm.c
+++ b/ports/nrf/modules/machine/pwm.c
@@ -345,7 +345,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     machine_pwm_make_new,
     print, machine_pwm_print,
-    locals_dict, (mp_obj_dict_t*)&machine_pwm_locals_dict
+    locals_dict, &machine_pwm_locals_dict
     );
 
 #endif // MICROPY_PY_MACHINE_HW_PWM
diff --git a/ports/nrf/modules/machine/rtcounter.c b/ports/nrf/modules/machine/rtcounter.c
index 3c48c4bb1fb2e..cafe08b6c6843 100644
--- a/ports/nrf/modules/machine/rtcounter.c
+++ b/ports/nrf/modules/machine/rtcounter.c
@@ -268,7 +268,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     machine_rtc_make_new,
     print, rtc_print,
-    locals_dict, (mp_obj_dict_t*)&machine_rtc_locals_dict
+    locals_dict, &machine_rtc_locals_dict
     );
 
 #endif // MICROPY_PY_MACHINE_RTCOUNTER
diff --git a/ports/nrf/modules/machine/spi.c b/ports/nrf/modules/machine/spi.c
index 22b0ff56e59ae..d5613a4643246 100644
--- a/ports/nrf/modules/machine/spi.c
+++ b/ports/nrf/modules/machine/spi.c
@@ -434,7 +434,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     machine_spi_make_new,
     print, machine_hard_spi_print,
     protocol, &machine_hard_spi_p,
-    locals_dict, (mp_obj_dict_t*)&machine_spi_locals_dict
+    locals_dict, &machine_spi_locals_dict
     );
 
 #endif // MICROPY_PY_MACHINE_HW_SPI
diff --git a/ports/nrf/modules/machine/temp.c b/ports/nrf/modules/machine/temp.c
index 1e21f11253fd2..00d6329b6498c 100644
--- a/ports/nrf/modules/machine/temp.c
+++ b/ports/nrf/modules/machine/temp.c
@@ -117,7 +117,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_QSTR_Temp,
     MP_TYPE_FLAG_NONE,
     machine_temp_make_new,
-    locals_dict, (mp_obj_dict_t*)&machine_temp_locals_dict,
+    locals_dict, &machine_temp_locals_dict,
     print, machine_temp_print
     );
 
diff --git a/ports/nrf/modules/machine/timer.c b/ports/nrf/modules/machine/timer.c
index 3724881aa8131..f7f6101726a6e 100644
--- a/ports/nrf/modules/machine/timer.c
+++ b/ports/nrf/modules/machine/timer.c
@@ -240,7 +240,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     machine_timer_make_new,
     print, timer_print,
-    locals_dict, (mp_obj_dict_t*)&machine_timer_locals_dict
+    locals_dict, &machine_timer_locals_dict
     );
 
 #endif // MICROPY_PY_MACHINE_TIMER
diff --git a/ports/nrf/modules/machine/uart.c b/ports/nrf/modules/machine/uart.c
index 5c9ba83ab6626..fc0bd682b4b7d 100644
--- a/ports/nrf/modules/machine/uart.c
+++ b/ports/nrf/modules/machine/uart.c
@@ -379,7 +379,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     getiter, mp_identity_getiter,
     iternext, mp_stream_unbuffered_iter,
     protocol, &uart_stream_p,
-    locals_dict, (mp_obj_dict_t*)&machine_hard_uart_locals_dict
+    locals_dict, &machine_hard_uart_locals_dict
     );
 
 #endif // MICROPY_PY_MACHINE_UART
diff --git a/ports/nrf/modules/nrf/flashbdev.c b/ports/nrf/modules/nrf/flashbdev.c
index b67e86d0d0dfd..84a3dd2520b44 100644
--- a/ports/nrf/modules/nrf/flashbdev.c
+++ b/ports/nrf/modules/nrf/flashbdev.c
@@ -189,7 +189,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     nrf_flashbdev_make_new,
     print, nrf_flashbdev_print,
-    locals_dict, (mp_obj_dict_t *)&nrf_flashbdev_locals_dict
+    locals_dict, &nrf_flashbdev_locals_dict
     );
 
 void flashbdev_init(void) {
diff --git a/ports/nrf/modules/ubluepy/ubluepy_characteristic.c b/ports/nrf/modules/ubluepy/ubluepy_characteristic.c
index 5544ac6aefedc..2be7dab9d3f7c 100644
--- a/ports/nrf/modules/ubluepy/ubluepy_characteristic.c
+++ b/ports/nrf/modules/ubluepy/ubluepy_characteristic.c
@@ -215,7 +215,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     ubluepy_characteristic_make_new,
     print, ubluepy_characteristic_print,
-    locals_dict, (mp_obj_dict_t*)&ubluepy_characteristic_locals_dict
+    locals_dict, &ubluepy_characteristic_locals_dict
     );
 
 #endif // MICROPY_PY_UBLUEPY_PERIPHERAL || MICROPY_PY_UBLUEPY_CENTRAL
diff --git a/ports/nrf/modules/ubluepy/ubluepy_constants.c b/ports/nrf/modules/ubluepy/ubluepy_constants.c
index e4637c8cbce2e..c6c399924573d 100644
--- a/ports/nrf/modules/ubluepy/ubluepy_constants.c
+++ b/ports/nrf/modules/ubluepy/ubluepy_constants.c
@@ -74,7 +74,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_QSTR_ad_types,
     MP_TYPE_FLAG_NONE,
     MP_TYPE_NULL_MAKE_NEW,
-    locals_dict, (mp_obj_dict_t*)&ubluepy_constants_ad_types_locals_dict
+    locals_dict, &ubluepy_constants_ad_types_locals_dict
     );
 
 STATIC const mp_rom_map_elem_t ubluepy_constants_locals_dict_table[] = {
@@ -97,7 +97,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_QSTR_constants,
     MP_TYPE_FLAG_NONE,
     MP_TYPE_NULL_MAKE_NEW,
-    locals_dict, (mp_obj_dict_t*)&ubluepy_constants_locals_dict
+    locals_dict, &ubluepy_constants_locals_dict
     );
 
 #endif // MICROPY_PY_UBLUEPY
diff --git a/ports/nrf/modules/ubluepy/ubluepy_delegate.c b/ports/nrf/modules/ubluepy/ubluepy_delegate.c
index 71648767e61d7..dd19f70be445b 100644
--- a/ports/nrf/modules/ubluepy/ubluepy_delegate.c
+++ b/ports/nrf/modules/ubluepy/ubluepy_delegate.c
@@ -83,7 +83,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     ubluepy_delegate_make_new,
     print, ubluepy_delegate_print,
-    locals_dict, (mp_obj_dict_t*)&ubluepy_delegate_locals_dict
+    locals_dict, &ubluepy_delegate_locals_dict
     );
 
 #endif // MICROPY_PY_UBLUEPY_PERIPHERAL || MICROPY_PY_UBLUEPY_CENTRAL
diff --git a/ports/nrf/modules/ubluepy/ubluepy_descriptor.c b/ports/nrf/modules/ubluepy/ubluepy_descriptor.c
index 07035460ae4d9..d942d98223067 100644
--- a/ports/nrf/modules/ubluepy/ubluepy_descriptor.c
+++ b/ports/nrf/modules/ubluepy/ubluepy_descriptor.c
@@ -76,7 +76,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     ubluepy_descriptor_make_new,
     print, ubluepy_descriptor_print,
-    locals_dict, (mp_obj_dict_t*)&ubluepy_descriptor_locals_dict
+    locals_dict, &ubluepy_descriptor_locals_dict
     );
 
 #endif // MICROPY_PY_UBLUEPY
diff --git a/ports/nrf/modules/ubluepy/ubluepy_peripheral.c b/ports/nrf/modules/ubluepy/ubluepy_peripheral.c
index 9c346a885b2cb..9f638b45d7359 100644
--- a/ports/nrf/modules/ubluepy/ubluepy_peripheral.c
+++ b/ports/nrf/modules/ubluepy/ubluepy_peripheral.c
@@ -488,7 +488,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     ubluepy_peripheral_make_new,
     print, ubluepy_peripheral_print,
-    locals_dict, (mp_obj_dict_t*)&ubluepy_peripheral_locals_dict
+    locals_dict, &ubluepy_peripheral_locals_dict
     );
 
 #endif // MICROPY_PY_UBLUEPY
diff --git a/ports/nrf/modules/ubluepy/ubluepy_scan_entry.c b/ports/nrf/modules/ubluepy/ubluepy_scan_entry.c
index 64a81d215d379..5c74e2e92caf4 100644
--- a/ports/nrf/modules/ubluepy/ubluepy_scan_entry.c
+++ b/ports/nrf/modules/ubluepy/ubluepy_scan_entry.c
@@ -142,7 +142,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     MP_TYPE_NULL_MAKE_NEW,
     print, ubluepy_scan_entry_print,
-    locals_dict, (mp_obj_dict_t*)&ubluepy_scan_entry_locals_dict
+    locals_dict, &ubluepy_scan_entry_locals_dict
     );
 
 #endif // MICROPY_PY_UBLUEPY_CENTRAL
diff --git a/ports/nrf/modules/ubluepy/ubluepy_scanner.c b/ports/nrf/modules/ubluepy/ubluepy_scanner.c
index c47044cf0c37a..b56ec349d0430 100644
--- a/ports/nrf/modules/ubluepy/ubluepy_scanner.c
+++ b/ports/nrf/modules/ubluepy/ubluepy_scanner.c
@@ -120,7 +120,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     ubluepy_scanner_make_new,
     print, ubluepy_scanner_print,
-    locals_dict, (mp_obj_dict_t*)&ubluepy_scanner_locals_dict
+    locals_dict, &ubluepy_scanner_locals_dict
     );
 
 #endif // MICROPY_PY_UBLUEPY_CENTRAL
diff --git a/ports/nrf/modules/ubluepy/ubluepy_service.c b/ports/nrf/modules/ubluepy/ubluepy_service.c
index 9d0d6e5b95f8e..2bec6befd6894 100644
--- a/ports/nrf/modules/ubluepy/ubluepy_service.c
+++ b/ports/nrf/modules/ubluepy/ubluepy_service.c
@@ -177,7 +177,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     ubluepy_service_make_new,
     print, ubluepy_service_print,
-    locals_dict, (mp_obj_dict_t*)&ubluepy_service_locals_dict
+    locals_dict, &ubluepy_service_locals_dict
     );
 
 #endif // MICROPY_PY_UBLUEPY_PERIPHERAL || MICROPY_PY_UBLUEPY_CENTRAL
diff --git a/ports/nrf/modules/ubluepy/ubluepy_uuid.c b/ports/nrf/modules/ubluepy/ubluepy_uuid.c
index 0414a2a2867f5..0fd6e75e5b628 100644
--- a/ports/nrf/modules/ubluepy/ubluepy_uuid.c
+++ b/ports/nrf/modules/ubluepy/ubluepy_uuid.c
@@ -166,7 +166,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     ubluepy_uuid_make_new,
     print, ubluepy_uuid_print,
-    locals_dict, (mp_obj_dict_t*)&ubluepy_uuid_locals_dict
+    locals_dict, &ubluepy_uuid_locals_dict
     );
 
 #endif // MICROPY_PY_UBLUEPY
diff --git a/ports/nrf/modules/uos/microbitfs.c b/ports/nrf/modules/uos/microbitfs.c
index 63ac8c93213f6..d1b320111607b 100644
--- a/ports/nrf/modules/uos/microbitfs.c
+++ b/ports/nrf/modules/uos/microbitfs.c
@@ -632,7 +632,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     MP_TYPE_NULL_MAKE_NEW,
     protocol, &textio_stream_p,
-    locals_dict, (mp_obj_dict_t*)&uos_mbfs_file_locals_dict
+    locals_dict, &uos_mbfs_file_locals_dict
     );
 
 
@@ -647,7 +647,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     MP_TYPE_NULL_MAKE_NEW,
     protocol, &fileio_stream_p,
-    locals_dict, (mp_obj_dict_t*)&uos_mbfs_file_locals_dict
+    locals_dict, &uos_mbfs_file_locals_dict
     );
 
 // From micro:bit fileobj.c
diff --git a/ports/nrf/pin_named_pins.c b/ports/nrf/pin_named_pins.c
index 87fed746e64ee..84ec89f44aa69 100644
--- a/ports/nrf/pin_named_pins.c
+++ b/ports/nrf/pin_named_pins.c
@@ -42,7 +42,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     MP_TYPE_NULL_MAKE_NEW,
     print, pin_named_pins_obj_print,
-    locals_dict, (mp_obj_t)&pin_cpu_pins_locals_dict
+    locals_dict, &pin_cpu_pins_locals_dict
     );
 
 MP_DEFINE_CONST_OBJ_TYPE(
@@ -51,7 +51,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     MP_TYPE_NULL_MAKE_NEW,
     print, pin_named_pins_obj_print,
-    locals_dict, (mp_obj_t)&pin_board_pins_locals_dict
+    locals_dict, &pin_board_pins_locals_dict
     );
 
 const pin_obj_t *pin_find_named_pin(const mp_obj_dict_t *named_pins, mp_obj_t name) {
diff --git a/ports/pic16bit/modpybled.c b/ports/pic16bit/modpybled.c
index fd4e8cce9c922..2e5c2dcca3b1b 100644
--- a/ports/pic16bit/modpybled.c
+++ b/ports/pic16bit/modpybled.c
@@ -90,5 +90,5 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     pyb_led_make_new,
     print, pyb_led_print,
-    locals_dict, (mp_obj_t)&pyb_led_locals_dict
+    locals_dict, &pyb_led_locals_dict
     );
diff --git a/ports/pic16bit/modpybswitch.c b/ports/pic16bit/modpybswitch.c
index e1096b1daaadd..f27cfb9b093af 100644
--- a/ports/pic16bit/modpybswitch.c
+++ b/ports/pic16bit/modpybswitch.c
@@ -78,5 +78,5 @@ MP_DEFINE_CONST_OBJ_TYPE(
     pyb_switch_make_new,
     print, pyb_switch_print,
     call, pyb_switch_call,
-    locals_dict, (mp_obj_t)&pyb_switch_locals_dict
+    locals_dict, &pyb_switch_locals_dict
     );
diff --git a/ports/renesas-ra/machine_i2c.c b/ports/renesas-ra/machine_i2c.c
index eaca5ff4a85ea..563ea8787e523 100644
--- a/ports/renesas-ra/machine_i2c.c
+++ b/ports/renesas-ra/machine_i2c.c
@@ -161,7 +161,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_QSTR_I2C,
     MP_TYPE_FLAG_NONE,
     machine_i2c_make_new,
-    locals_dict, (void *)&mp_machine_i2c_locals_dict,
+    locals_dict, &mp_machine_i2c_locals_dict,
     print, machine_i2c_print,
     protocol, &machine_i2c_p
     );
diff --git a/ports/rp2/machine_adc.c b/ports/rp2/machine_adc.c
index 549f8d5ecdc5a..85562d5c07583 100644
--- a/ports/rp2/machine_adc.c
+++ b/ports/rp2/machine_adc.c
@@ -119,5 +119,5 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     machine_adc_make_new,
     print, machine_adc_print,
-    locals_dict, (mp_obj_dict_t *)&machine_adc_locals_dict
+    locals_dict, &machine_adc_locals_dict
     );
diff --git a/ports/rp2/machine_i2c.c b/ports/rp2/machine_i2c.c
index 91d8bb59b76c1..5ab93f63581d6 100644
--- a/ports/rp2/machine_i2c.c
+++ b/ports/rp2/machine_i2c.c
@@ -183,5 +183,5 @@ MP_DEFINE_CONST_OBJ_TYPE(
     machine_i2c_make_new,
     print, machine_i2c_print,
     protocol, &machine_i2c_p,
-    locals_dict, (mp_obj_dict_t *)&mp_machine_i2c_locals_dict
+    locals_dict, &mp_machine_i2c_locals_dict
     );
diff --git a/ports/rp2/machine_i2s.c b/ports/rp2/machine_i2s.c
index 8446a59781bb9..9d70a476f30b1 100644
--- a/ports/rp2/machine_i2s.c
+++ b/ports/rp2/machine_i2s.c
@@ -1146,7 +1146,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     getiter, mp_identity_getiter,
     iternext, mp_stream_unbuffered_iter,
     protocol, &i2s_stream_p,
-    locals_dict, (mp_obj_dict_t *)&machine_i2s_locals_dict
+    locals_dict, &machine_i2s_locals_dict
     );
 
 MP_REGISTER_ROOT_POINTER(void *machine_i2s_obj[2]);
diff --git a/ports/rp2/machine_pin.c b/ports/rp2/machine_pin.c
index 38670f09abead..8ccfbca3ab426 100644
--- a/ports/rp2/machine_pin.c
+++ b/ports/rp2/machine_pin.c
@@ -649,7 +649,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     print, machine_pin_print,
     call, machine_pin_call,
     protocol, &pin_pin_p,
-    locals_dict, (mp_obj_t)&machine_pin_locals_dict
+    locals_dict, &machine_pin_locals_dict
     );
 
 STATIC mp_uint_t machine_pin_irq_trigger(mp_obj_t self_in, mp_uint_t new_trigger) {
diff --git a/ports/rp2/machine_rtc.c b/ports/rp2/machine_rtc.c
index 73bdaee6c7606..6b2c9ac71b65d 100644
--- a/ports/rp2/machine_rtc.c
+++ b/ports/rp2/machine_rtc.c
@@ -120,5 +120,5 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_QSTR_RTC,
     MP_TYPE_FLAG_NONE,
     machine_rtc_make_new,
-    locals_dict, (mp_obj_t)&machine_rtc_locals_dict
+    locals_dict, &machine_rtc_locals_dict
     );
diff --git a/ports/rp2/machine_spi.c b/ports/rp2/machine_spi.c
index f3ac8d7cf811f..08c79712cf226 100644
--- a/ports/rp2/machine_spi.c
+++ b/ports/rp2/machine_spi.c
@@ -297,7 +297,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     machine_spi_make_new,
     print, machine_spi_print,
     protocol, &machine_spi_p,
-    locals_dict, (mp_obj_dict_t *)&mp_machine_spi_locals_dict
+    locals_dict, &mp_machine_spi_locals_dict
     );
 
 mp_obj_base_t *mp_hal_get_spi_obj(mp_obj_t o) {
diff --git a/ports/rp2/machine_timer.c b/ports/rp2/machine_timer.c
index d3b60155294f4..66f632329c723 100644
--- a/ports/rp2/machine_timer.c
+++ b/ports/rp2/machine_timer.c
@@ -162,5 +162,5 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     machine_timer_make_new,
     print, machine_timer_print,
-    locals_dict, (mp_obj_dict_t *)&machine_timer_locals_dict
+    locals_dict, &machine_timer_locals_dict
     );
diff --git a/ports/rp2/machine_uart.c b/ports/rp2/machine_uart.c
index df6228058be7b..bb8bf51be6511 100644
--- a/ports/rp2/machine_uart.c
+++ b/ports/rp2/machine_uart.c
@@ -588,7 +588,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     getiter, mp_identity_getiter,
     iternext, mp_stream_unbuffered_iter,
     protocol, &uart_stream_p,
-    locals_dict, (mp_obj_dict_t *)&machine_uart_locals_dict
+    locals_dict, &machine_uart_locals_dict
     );
 
 MP_REGISTER_ROOT_POINTER(void *rp2_uart_rx_buffer[2]);
diff --git a/ports/rp2/machine_wdt.c b/ports/rp2/machine_wdt.c
index e8c433306922b..c224298d136be 100644
--- a/ports/rp2/machine_wdt.c
+++ b/ports/rp2/machine_wdt.c
@@ -82,5 +82,5 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_QSTR_WDT,
     MP_TYPE_FLAG_NONE,
     machine_wdt_make_new,
-    locals_dict, (mp_obj_dict_t *)&machine_wdt_locals_dict
+    locals_dict, &machine_wdt_locals_dict
     );
diff --git a/ports/rp2/rp2_flash.c b/ports/rp2/rp2_flash.c
index 37a3412db5cfe..df49c881c4a41 100644
--- a/ports/rp2/rp2_flash.c
+++ b/ports/rp2/rp2_flash.c
@@ -190,5 +190,5 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_QSTR_Flash,
     MP_TYPE_FLAG_NONE,
     rp2_flash_make_new,
-    locals_dict, (mp_obj_dict_t *)&rp2_flash_locals_dict
+    locals_dict, &rp2_flash_locals_dict
     );
diff --git a/ports/rp2/rp2_pio.c b/ports/rp2/rp2_pio.c
index 9a195bdd8a64c..cfba9cce5ae01 100644
--- a/ports/rp2/rp2_pio.c
+++ b/ports/rp2/rp2_pio.c
@@ -382,7 +382,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     rp2_pio_make_new,
     print, rp2_pio_print,
-    locals_dict, (mp_obj_dict_t *)&rp2_pio_locals_dict
+    locals_dict, &rp2_pio_locals_dict
     );
 
 STATIC mp_uint_t rp2_pio_irq_trigger(mp_obj_t self_in, mp_uint_t new_trigger) {
@@ -813,7 +813,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     rp2_state_machine_make_new,
     print, rp2_state_machine_print,
-    locals_dict, (mp_obj_dict_t *)&rp2_state_machine_locals_dict
+    locals_dict, &rp2_state_machine_locals_dict
     );
 
 STATIC mp_uint_t rp2_state_machine_irq_trigger(mp_obj_t self_in, mp_uint_t new_trigger) {
diff --git a/ports/samd/machine_led.c b/ports/samd/machine_led.c
index 76aae8ffc5767..7a9b2299ae3b9 100644
--- a/ports/samd/machine_led.c
+++ b/ports/samd/machine_led.c
@@ -169,5 +169,5 @@ MP_DEFINE_CONST_OBJ_TYPE(
     mp_led_make_new,
     print, machine_led_print,
     call, machine_led_call,
-    locals_dict, (mp_obj_t)&machine_led_locals_dict
+    locals_dict, &machine_led_locals_dict
     );
diff --git a/ports/samd/machine_pin.c b/ports/samd/machine_pin.c
index d47982e0e1c6b..75e1a2356c4d2 100644
--- a/ports/samd/machine_pin.c
+++ b/ports/samd/machine_pin.c
@@ -295,7 +295,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     print, machine_pin_print,
     call, machine_pin_call,
     protocol, &pin_pin_p,
-    locals_dict, (mp_obj_t)&machine_pin_locals_dict
+    locals_dict, &machine_pin_locals_dict
     );
 
 /*
diff --git a/ports/samd/samd_flash.c b/ports/samd/samd_flash.c
index 6c74b59a263ad..9d64768cfa020 100644
--- a/ports/samd/samd_flash.c
+++ b/ports/samd/samd_flash.c
@@ -186,5 +186,5 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_QSTR_Flash,
     MP_TYPE_FLAG_NONE,
     samd_flash_make_new,
-    locals_dict, (mp_obj_dict_t *)&samd_flash_locals_dict
+    locals_dict, &samd_flash_locals_dict
     );
diff --git a/ports/stm32/accel.c b/ports/stm32/accel.c
index 276ce37d3ad49..05fd1898bc11d 100644
--- a/ports/stm32/accel.c
+++ b/ports/stm32/accel.c
@@ -286,7 +286,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_QSTR_Accel,
     MP_TYPE_FLAG_NONE,
     pyb_accel_make_new,
-    locals_dict, (mp_obj_dict_t *)&pyb_accel_locals_dict
+    locals_dict, &pyb_accel_locals_dict
     );
 
 #endif // MICROPY_HW_HAS_MMA7660 || MICROPY_HW_HAS_KXTJ3
diff --git a/ports/stm32/adc.c b/ports/stm32/adc.c
index 7e627d088f744..e0759439d1ece 100644
--- a/ports/stm32/adc.c
+++ b/ports/stm32/adc.c
@@ -709,7 +709,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     adc_make_new,
     print, adc_print,
-    locals_dict, (mp_obj_dict_t *)&adc_locals_dict
+    locals_dict, &adc_locals_dict
     );
 
 /******************************************************************************/
@@ -917,7 +917,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_QSTR_ADCAll,
     MP_TYPE_FLAG_NONE,
     adc_all_make_new,
-    locals_dict, (mp_obj_dict_t *)&adc_all_locals_dict
+    locals_dict, &adc_all_locals_dict
     );
 
 #endif // MICROPY_HW_ENABLE_ADC
diff --git a/ports/stm32/dac.c b/ports/stm32/dac.c
index da50b30fef135..ac8d76090ee04 100644
--- a/ports/stm32/dac.c
+++ b/ports/stm32/dac.c
@@ -508,7 +508,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     pyb_dac_make_new,
     print, pyb_dac_print,
-    locals_dict, (mp_obj_dict_t *)&pyb_dac_locals_dict
+    locals_dict, &pyb_dac_locals_dict
     );
 
 #endif // MICROPY_HW_ENABLE_DAC
diff --git a/ports/stm32/extint.c b/ports/stm32/extint.c
index 4d2dc5d23be93..0f28610cc3e7e 100644
--- a/ports/stm32/extint.c
+++ b/ports/stm32/extint.c
@@ -665,7 +665,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     extint_make_new,
     print, extint_obj_print,
-    locals_dict, (mp_obj_dict_t *)&extint_locals_dict
+    locals_dict, &extint_locals_dict
     );
 
 void extint_init0(void) {
diff --git a/ports/stm32/lcd.c b/ports/stm32/lcd.c
index a951ea7668447..5017a68fe5489 100644
--- a/ports/stm32/lcd.c
+++ b/ports/stm32/lcd.c
@@ -530,7 +530,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_QSTR_LCD,
     MP_TYPE_FLAG_NONE,
     pyb_lcd_make_new,
-    locals_dict, (mp_obj_dict_t *)&pyb_lcd_locals_dict
+    locals_dict, &pyb_lcd_locals_dict
     );
 
 #endif // MICROPY_HW_HAS_LCD
diff --git a/ports/stm32/led.c b/ports/stm32/led.c
index 6745ef60b8d11..6e3229ab32180 100644
--- a/ports/stm32/led.c
+++ b/ports/stm32/led.c
@@ -387,7 +387,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     led_obj_make_new,
     print, led_obj_print,
-    locals_dict, (mp_obj_dict_t *)&led_locals_dict
+    locals_dict, &led_locals_dict
     );
 
 #else
diff --git a/ports/stm32/machine_adc.c b/ports/stm32/machine_adc.c
index 682bae3a6d13a..3659073d06bf0 100644
--- a/ports/stm32/machine_adc.c
+++ b/ports/stm32/machine_adc.c
@@ -498,7 +498,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     machine_adc_make_new,
     print, machine_adc_print,
-    locals_dict, (mp_obj_dict_t *)&machine_adc_locals_dict
+    locals_dict, &machine_adc_locals_dict
     );
 
 #endif
diff --git a/ports/stm32/machine_i2c.c b/ports/stm32/machine_i2c.c
index 89970f234d190..7927daac1bdd7 100644
--- a/ports/stm32/machine_i2c.c
+++ b/ports/stm32/machine_i2c.c
@@ -243,7 +243,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     machine_hard_i2c_make_new,
     print, machine_hard_i2c_print,
     protocol, &machine_hard_i2c_p,
-    locals_dict, (mp_obj_dict_t *)&mp_machine_i2c_locals_dict
+    locals_dict, &mp_machine_i2c_locals_dict
     );
 
 #endif // MICROPY_HW_ENABLE_HW_I2C
diff --git a/ports/stm32/machine_i2s.c b/ports/stm32/machine_i2s.c
index 7dc6439f25c09..93a465d07ca8a 100644
--- a/ports/stm32/machine_i2s.c
+++ b/ports/stm32/machine_i2s.c
@@ -1123,7 +1123,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     getiter, mp_identity_getiter,
     iternext, mp_stream_unbuffered_iter,
     protocol, &i2s_stream_p,
-    locals_dict, (mp_obj_dict_t *)&machine_i2s_locals_dict
+    locals_dict, &machine_i2s_locals_dict
     );
 
 MP_REGISTER_ROOT_POINTER(struct _machine_i2s_obj_t *machine_i2s_obj[MICROPY_HW_MAX_I2S]);
diff --git a/ports/stm32/machine_spi.c b/ports/stm32/machine_spi.c
index 87561c2b7b1dd..d64ff2af8f761 100644
--- a/ports/stm32/machine_spi.c
+++ b/ports/stm32/machine_spi.c
@@ -142,5 +142,5 @@ MP_DEFINE_CONST_OBJ_TYPE(
     machine_hard_spi_make_new,
     print, machine_hard_spi_print,
     protocol, &machine_hard_spi_p,
-    locals_dict, (mp_obj_dict_t *)&mp_machine_spi_locals_dict
+    locals_dict, &mp_machine_spi_locals_dict
     );
diff --git a/ports/stm32/machine_timer.c b/ports/stm32/machine_timer.c
index bd9dbe609849b..2e0120ea8191d 100644
--- a/ports/stm32/machine_timer.c
+++ b/ports/stm32/machine_timer.c
@@ -142,5 +142,5 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     machine_timer_make_new,
     print, machine_timer_print,
-    locals_dict, (mp_obj_dict_t *)&machine_timer_locals_dict
+    locals_dict, &machine_timer_locals_dict
     );
diff --git a/ports/stm32/machine_uart.c b/ports/stm32/machine_uart.c
index 4d25a0274cdd3..5851d8cf352df 100644
--- a/ports/stm32/machine_uart.c
+++ b/ports/stm32/machine_uart.c
@@ -669,5 +669,5 @@ MP_DEFINE_CONST_OBJ_TYPE(
     getiter, mp_identity_getiter,
     iternext, mp_stream_unbuffered_iter,
     protocol, &uart_stream_p,
-    locals_dict, (mp_obj_dict_t *)&pyb_uart_locals_dict
+    locals_dict, &pyb_uart_locals_dict
     );
diff --git a/ports/stm32/network_lan.c b/ports/stm32/network_lan.c
index f9c7d80b78e95..25a955508853a 100644
--- a/ports/stm32/network_lan.c
+++ b/ports/stm32/network_lan.c
@@ -164,7 +164,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     network_lan_make_new,
     print, network_lan_print,
-    locals_dict, (mp_obj_dict_t *)&network_lan_locals_dict
+    locals_dict, &network_lan_locals_dict
     );
 
 #endif // defined(MICROPY_HW_ETH_MDC)
diff --git a/ports/stm32/pin.c b/ports/stm32/pin.c
index 992046cd17e5a..3c3cde026568b 100644
--- a/ports/stm32/pin.c
+++ b/ports/stm32/pin.c
@@ -600,7 +600,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     print, pin_print,
     call, pin_call,
     protocol, &pin_pin_p,
-    locals_dict, (mp_obj_dict_t *)&pin_locals_dict
+    locals_dict, &pin_locals_dict
     );
 
 /// \moduleref pyb
@@ -676,7 +676,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     MP_TYPE_NULL_MAKE_NEW,
     print, pin_af_obj_print,
-    locals_dict, (mp_obj_dict_t *)&pin_af_locals_dict
+    locals_dict, &pin_af_locals_dict
     );
 
 MP_REGISTER_ROOT_POINTER(mp_obj_t pin_class_mapper);
diff --git a/ports/stm32/pin_named_pins.c b/ports/stm32/pin_named_pins.c
index 620888878c4a6..1a35ec57875fc 100644
--- a/ports/stm32/pin_named_pins.c
+++ b/ports/stm32/pin_named_pins.c
@@ -36,7 +36,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_QSTR_cpu,
     MP_TYPE_FLAG_NONE,
     MP_TYPE_NULL_MAKE_NEW,
-    locals_dict, (mp_obj_dict_t *)&pin_cpu_pins_locals_dict
+    locals_dict, &pin_cpu_pins_locals_dict
     );
 
 MP_DEFINE_CONST_OBJ_TYPE(
@@ -44,7 +44,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_QSTR_board,
     MP_TYPE_FLAG_NONE,
     MP_TYPE_NULL_MAKE_NEW,
-    locals_dict, (mp_obj_dict_t *)&pin_board_pins_locals_dict
+    locals_dict, &pin_board_pins_locals_dict
     );
 
 const pin_obj_t *pin_find_named_pin(const mp_obj_dict_t *named_pins, mp_obj_t name) {
diff --git a/ports/stm32/pyb_can.c b/ports/stm32/pyb_can.c
index 6fdfd2c8549e1..a07fc921649cf 100644
--- a/ports/stm32/pyb_can.c
+++ b/ports/stm32/pyb_can.c
@@ -1079,7 +1079,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     pyb_can_make_new,
     print, pyb_can_print,
     protocol, &can_stream_p,
-    locals_dict, (mp_obj_dict_t *)&pyb_can_locals_dict
+    locals_dict, &pyb_can_locals_dict
     );
 
 MP_REGISTER_ROOT_POINTER(struct _pyb_can_obj_t *pyb_can_obj_all[MICROPY_HW_MAX_CAN]);
diff --git a/ports/stm32/pyb_i2c.c b/ports/stm32/pyb_i2c.c
index ee6983a143fd3..9071d92944ee4 100644
--- a/ports/stm32/pyb_i2c.c
+++ b/ports/stm32/pyb_i2c.c
@@ -1110,7 +1110,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     pyb_i2c_make_new,
     print, pyb_i2c_print,
-    locals_dict, (mp_obj_dict_t *)&pyb_i2c_locals_dict
+    locals_dict, &pyb_i2c_locals_dict
     );
 
 #endif // MICROPY_PY_PYB_LEGACY && MICROPY_HW_ENABLE_HW_I2C
diff --git a/ports/stm32/pyb_spi.c b/ports/stm32/pyb_spi.c
index b1425272feeef..a225bd84e7534 100644
--- a/ports/stm32/pyb_spi.c
+++ b/ports/stm32/pyb_spi.c
@@ -357,5 +357,5 @@ MP_DEFINE_CONST_OBJ_TYPE(
     pyb_spi_make_new,
     print, pyb_spi_print,
     protocol, &pyb_spi_p,
-    locals_dict, (mp_obj_dict_t *)&pyb_spi_locals_dict
+    locals_dict, &pyb_spi_locals_dict
     );
diff --git a/ports/stm32/rtc.c b/ports/stm32/rtc.c
index c7698db1430a3..f501ec23b1b31 100644
--- a/ports/stm32/rtc.c
+++ b/ports/stm32/rtc.c
@@ -842,5 +842,5 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_QSTR_RTC,
     MP_TYPE_FLAG_NONE,
     pyb_rtc_make_new,
-    locals_dict, (mp_obj_dict_t *)&pyb_rtc_locals_dict
+    locals_dict, &pyb_rtc_locals_dict
     );
diff --git a/ports/stm32/sdcard.c b/ports/stm32/sdcard.c
index b9cc051e7f13d..cbf1ade5c5b78 100644
--- a/ports/stm32/sdcard.c
+++ b/ports/stm32/sdcard.c
@@ -877,7 +877,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_QSTR_SDCard,
     MP_TYPE_FLAG_NONE,
     pyb_sdcard_make_new,
-    locals_dict, (mp_obj_dict_t *)&pyb_sdcard_locals_dict
+    locals_dict, &pyb_sdcard_locals_dict
     );
 #endif
 
@@ -887,7 +887,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_QSTR_MMCard,
     MP_TYPE_FLAG_NONE,
     pyb_mmcard_make_new,
-    locals_dict, (mp_obj_dict_t *)&pyb_sdcard_locals_dict
+    locals_dict, &pyb_sdcard_locals_dict
     );
 #endif
 
diff --git a/ports/stm32/servo.c b/ports/stm32/servo.c
index d552f5e6b5d3a..1b0ca0a88224c 100644
--- a/ports/stm32/servo.c
+++ b/ports/stm32/servo.c
@@ -342,7 +342,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     pyb_servo_make_new,
     print, pyb_servo_print,
-    locals_dict, (mp_obj_dict_t *)&pyb_servo_locals_dict
+    locals_dict, &pyb_servo_locals_dict
     );
 
 #endif // MICROPY_HW_ENABLE_SERVO
diff --git a/ports/stm32/storage.c b/ports/stm32/storage.c
index 92f7059493384..a0154408dd5fb 100644
--- a/ports/stm32/storage.c
+++ b/ports/stm32/storage.c
@@ -459,7 +459,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     pyb_flash_make_new,
     print, pyb_flash_print,
-    locals_dict, (mp_obj_dict_t *)&pyb_flash_locals_dict
+    locals_dict, &pyb_flash_locals_dict
     );
 
 void pyb_flash_init_vfs(fs_user_mount_t *vfs) {
diff --git a/ports/stm32/timer.c b/ports/stm32/timer.c
index abf4c1f3fc4ca..91c88df1b3726 100644
--- a/ports/stm32/timer.c
+++ b/ports/stm32/timer.c
@@ -1477,7 +1477,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     pyb_timer_make_new,
     print, pyb_timer_print,
-    locals_dict, (mp_obj_dict_t *)&pyb_timer_locals_dict
+    locals_dict, &pyb_timer_locals_dict
     );
 
 /// \moduleref pyb
@@ -1617,7 +1617,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     MP_TYPE_NULL_MAKE_NEW,
     print, pyb_timer_channel_print,
-    locals_dict, (mp_obj_dict_t *)&pyb_timer_channel_locals_dict
+    locals_dict, &pyb_timer_channel_locals_dict
     );
 
 STATIC void timer_handle_irq_channel(pyb_timer_obj_t *tim, uint8_t channel, mp_obj_t callback) {
diff --git a/ports/stm32/usb.c b/ports/stm32/usb.c
index 7c36765c28c1b..df755fe984c30 100644
--- a/ports/stm32/usb.c
+++ b/ports/stm32/usb.c
@@ -945,7 +945,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     getiter, mp_identity_getiter,
     iternext, mp_stream_unbuffered_iter,
     protocol, &pyb_usb_vcp_stream_p,
-    locals_dict, (mp_obj_dict_t *)&pyb_usb_vcp_locals_dict
+    locals_dict, &pyb_usb_vcp_locals_dict
     );
 
 /******************************************************************************/
@@ -1084,7 +1084,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     pyb_usb_hid_make_new,
     protocol, &pyb_usb_hid_stream_p,
-    locals_dict, (mp_obj_dict_t *)&pyb_usb_hid_locals_dict
+    locals_dict, &pyb_usb_hid_locals_dict
     );
 
 #endif // MICROPY_HW_USB_HID
diff --git a/ports/stm32/usrsw.c b/ports/stm32/usrsw.c
index 137f4dabfa5c3..7d406c0ecd717 100644
--- a/ports/stm32/usrsw.c
+++ b/ports/stm32/usrsw.c
@@ -141,7 +141,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     pyb_switch_make_new,
     print, pyb_switch_print,
     call, pyb_switch_call,
-    locals_dict, (mp_obj_dict_t *)&pyb_switch_locals_dict
+    locals_dict, &pyb_switch_locals_dict
     );
 
 MP_REGISTER_ROOT_POINTER(mp_obj_t pyb_switch_callback);
diff --git a/ports/stm32/wdt.c b/ports/stm32/wdt.c
index e3b8e2e0ae22e..09780ea9d3cc9 100644
--- a/ports/stm32/wdt.c
+++ b/ports/stm32/wdt.c
@@ -107,5 +107,5 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_QSTR_WDT,
     MP_TYPE_FLAG_NONE,
     pyb_wdt_make_new,
-    locals_dict, (mp_obj_dict_t *)&pyb_wdt_locals_dict
+    locals_dict, &pyb_wdt_locals_dict
     );
diff --git a/ports/teensy/led.c b/ports/teensy/led.c
index ca548431fecad..dd4c65da39e1b 100644
--- a/ports/teensy/led.c
+++ b/ports/teensy/led.c
@@ -140,5 +140,5 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     led_obj_make_new,
     print, led_obj_print,
-    locals_dict, (mp_obj_t)&led_locals_dict
+    locals_dict, &led_locals_dict
     );
diff --git a/ports/teensy/timer.c b/ports/teensy/timer.c
index 4df24743356cc..a0f490d925fbb 100644
--- a/ports/teensy/timer.c
+++ b/ports/teensy/timer.c
@@ -752,7 +752,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     pyb_timer_make_new,
     print, pyb_timer_print,
-    locals_dict, (mp_obj_t)&pyb_timer_locals_dict
+    locals_dict, &pyb_timer_locals_dict
     );
 
 /// \moduleref pyb
@@ -896,7 +896,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     MP_TYPE_NULL_MAKE_NEW,
     print, pyb_timer_channel_print,
-    locals_dict, (mp_obj_t)&pyb_timer_channel_locals_dict
+    locals_dict, &pyb_timer_channel_locals_dict
     );
 
 STATIC bool ftm_handle_irq_callback(pyb_timer_obj_t *self, mp_uint_t channel, mp_obj_t callback) {
diff --git a/ports/teensy/uart.c b/ports/teensy/uart.c
index 8957d92709468..db5b8e2f44336 100644
--- a/ports/teensy/uart.c
+++ b/ports/teensy/uart.c
@@ -489,5 +489,5 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     pyb_uart_make_new,
     print, pyb_uart_print,
-    locals_dict, (mp_obj_t)&pyb_uart_locals_dict
+    locals_dict, &pyb_uart_locals_dict
     );
diff --git a/ports/unix/coverage.c b/ports/unix/coverage.c
index b4567417a22a8..7b4c0c0bf48e7 100644
--- a/ports/unix/coverage.c
+++ b/ports/unix/coverage.c
@@ -112,7 +112,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     MP_TYPE_NULL_MAKE_NEW,
     protocol, &fileio_stream_p,
-    locals_dict, (mp_obj_dict_t *)&rawfile_locals_dict
+    locals_dict, &rawfile_locals_dict
     );
 
 // stream read returns non-blocking error
@@ -142,7 +142,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     MP_TYPE_NULL_MAKE_NEW,
     protocol, &textio_stream_p2,
-    locals_dict, (mp_obj_dict_t *)&rawfile_locals_dict2
+    locals_dict, &rawfile_locals_dict2
     );
 
 // str/bytes objects without a valid hash
diff --git a/ports/unix/modffi.c b/ports/unix/modffi.c
index 98f0a1aa0ff68..98fd8936b1aa8 100644
--- a/ports/unix/modffi.c
+++ b/ports/unix/modffi.c
@@ -427,7 +427,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     ffimod_make_new,
     print, ffimod_print,
-    locals_dict, (mp_obj_dict_t *)&ffimod_locals_dict
+    locals_dict, &ffimod_locals_dict
     );
 
 // FFI function
@@ -565,7 +565,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     MP_TYPE_NULL_MAKE_NEW,
     print, fficallback_print,
-    locals_dict, (mp_obj_dict_t *)&fficallback_locals_dict
+    locals_dict, &fficallback_locals_dict
     );
 
 // FFI variable
@@ -603,7 +603,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     MP_TYPE_NULL_MAKE_NEW,
     print, ffivar_print,
-    locals_dict, (mp_obj_dict_t *)&ffivar_locals_dict
+    locals_dict, &ffivar_locals_dict
     );
 
 // Generic opaque storage object (unused)
diff --git a/ports/unix/modjni.c b/ports/unix/modjni.c
index 72f95b645b257..02368e453716b 100644
--- a/ports/unix/modjni.c
+++ b/ports/unix/modjni.c
@@ -182,7 +182,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     print, jclass_print,
     attr, jclass_attr,
     call, jclass_call,
-    locals_dict, (mp_obj_dict_t *)&jclass_locals_dict
+    locals_dict, &jclass_locals_dict
     );
 
 STATIC mp_obj_t new_jclass(jclass jc) {
@@ -332,7 +332,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     attr, jobject_attr,
     subscr, jobject_subscr,
     getiter, subscr_getiter,
-    //    .locals_dict = (mp_obj_dict_t*)&jobject_locals_dict,
+    //    .locals_dict = &jobject_locals_dict,
     );
 
 STATIC mp_obj_t new_jobject(jobject jo) {
@@ -579,7 +579,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     print, jmethod_print,
     call, jmethod_call,
     //    .attr = jobject_attr,
-    //    .locals_dict = (mp_obj_dict_t*)&jobject_locals_dict,
+    //    .locals_dict = &jobject_locals_dict,
     );
 
 #ifdef __ANDROID__
diff --git a/ports/unix/moduselect.c b/ports/unix/moduselect.c
index d8a8d1d8c38b7..baed88761c463 100644
--- a/ports/unix/moduselect.c
+++ b/ports/unix/moduselect.c
@@ -318,7 +318,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_NULL_MAKE_NEW,
     getiter, mp_identity_getiter,
     iternext, poll_iternext,
-    locals_dict, (void *)&poll_locals_dict
+    locals_dict, &poll_locals_dict
     );
 
 STATIC mp_obj_t select_poll(size_t n_args, const mp_obj_t *args) {
diff --git a/ports/unix/modusocket.c b/ports/unix/modusocket.c
index 7e4476cbd0add..21260f0b2ada5 100644
--- a/ports/unix/modusocket.c
+++ b/ports/unix/modusocket.c
@@ -525,7 +525,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     getiter, NULL,
     iternext, NULL,
     protocol, &usocket_stream_p,
-    locals_dict, (mp_obj_dict_t *)&usocket_locals_dict
+    locals_dict, &usocket_locals_dict
     );
 
 #define BINADDR_MAX_LEN sizeof(struct in6_addr)
diff --git a/ports/zephyr/machine_i2c.c b/ports/zephyr/machine_i2c.c
index 60a1924d803d3..a844eceb50c14 100644
--- a/ports/zephyr/machine_i2c.c
+++ b/ports/zephyr/machine_i2c.c
@@ -133,7 +133,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     machine_hard_i2c_make_new,
     print, machine_hard_i2c_print,
     protocol, &machine_hard_i2c_p,
-    locals_dict, (mp_obj_dict_t *)&mp_machine_i2c_locals_dict
+    locals_dict, &mp_machine_i2c_locals_dict
     );
 
 #endif // MICROPY_PY_MACHINE_I2C
diff --git a/ports/zephyr/machine_pin.c b/ports/zephyr/machine_pin.c
index 48303edd8167e..3114ac36fd008 100644
--- a/ports/zephyr/machine_pin.c
+++ b/ports/zephyr/machine_pin.c
@@ -293,7 +293,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     print, machine_pin_print,
     call, machine_pin_call,
     protocol, &machine_pin_pin_p,
-    locals_dict, (mp_obj_t)&machine_pin_locals_dict
+    locals_dict, &machine_pin_locals_dict
     );
 
 STATIC mp_uint_t machine_pin_irq_trigger(mp_obj_t self_in, mp_uint_t new_trigger) {
diff --git a/ports/zephyr/machine_spi.c b/ports/zephyr/machine_spi.c
index 6d9bf896b06d9..d990ed9c150f5 100644
--- a/ports/zephyr/machine_spi.c
+++ b/ports/zephyr/machine_spi.c
@@ -204,7 +204,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     machine_hard_spi_make_new,
     print, machine_hard_spi_print,
     protocol, &machine_hard_spi_p,
-    locals_dict, (mp_obj_dict_t *)&mp_machine_spi_locals_dict
+    locals_dict, &mp_machine_spi_locals_dict
     );
 
 #endif // MICROPY_PY_MACHINE_SPI
diff --git a/ports/zephyr/machine_uart.c b/ports/zephyr/machine_uart.c
index 3f5df7465791b..9580d37907812 100644
--- a/ports/zephyr/machine_uart.c
+++ b/ports/zephyr/machine_uart.c
@@ -163,5 +163,5 @@ MP_DEFINE_CONST_OBJ_TYPE(
     getiter, mp_identity_getiter,
     iternext, mp_stream_unbuffered_iter,
     protocol, &uart_stream_p,
-    locals_dict, (mp_obj_dict_t *)&machine_uart_locals_dict
+    locals_dict, &machine_uart_locals_dict
     );
diff --git a/ports/zephyr/modusocket.c b/ports/zephyr/modusocket.c
index a7bef74ca6deb..77f839fdd5104 100644
--- a/ports/zephyr/modusocket.c
+++ b/ports/zephyr/modusocket.c
@@ -360,7 +360,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     socket_make_new,
     print, socket_print,
     protocol, &socket_stream_p,
-    locals_dict, (mp_obj_t)&socket_locals_dict
+    locals_dict, &socket_locals_dict
     );
 
 //
diff --git a/ports/zephyr/modzsensor.c b/ports/zephyr/modzsensor.c
index 7c0b0193d3269..beb4d6ad7903a 100644
--- a/ports/zephyr/modzsensor.c
+++ b/ports/zephyr/modzsensor.c
@@ -110,7 +110,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     MP_QSTR_Sensor,
     MP_TYPE_FLAG_NONE,
     sensor_make_new,
-    locals_dict, (void *)&sensor_locals_dict
+    locals_dict, &sensor_locals_dict
     );
 
 STATIC const mp_rom_map_elem_t mp_module_zsensor_globals_table[] = {
diff --git a/ports/zephyr/zephyr_storage.c b/ports/zephyr/zephyr_storage.c
index ded7caa657632..6ab8271d34766 100644
--- a/ports/zephyr/zephyr_storage.c
+++ b/ports/zephyr/zephyr_storage.c
@@ -134,7 +134,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     zephyr_disk_access_make_new,
     print, zephyr_disk_access_print,
-    locals_dict, (mp_obj_dict_t *)&zephyr_disk_access_locals_dict
+    locals_dict, &zephyr_disk_access_locals_dict
     );
 #endif // CONFIG_DISK_ACCESS
 
@@ -256,6 +256,6 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     zephyr_flash_area_make_new,
     print, zephyr_flash_area_print,
-    locals_dict, (mp_obj_dict_t *)&zephyr_flash_area_locals_dict
+    locals_dict, &zephyr_flash_area_locals_dict
     );
 #endif // CONFIG_FLASH_MAP
diff --git a/py/modio.c b/py/modio.c
index 093cb1f7e78d2..a1e04e4cac54a 100644
--- a/py/modio.c
+++ b/py/modio.c
@@ -198,7 +198,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     bufwriter_make_new,
     protocol, &bufwriter_stream_p,
-    locals_dict, (mp_obj_dict_t *)&bufwriter_locals_dict
+    locals_dict, &bufwriter_locals_dict
     );
 #endif // MICROPY_PY_IO_BUFFEREDWRITER
 
diff --git a/py/modthread.c b/py/modthread.c
index 0a154474252d1..3116fe6bd9db5 100644
--- a/py/modthread.c
+++ b/py/modthread.c
@@ -121,7 +121,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     MP_QSTR_lock,
     MP_TYPE_FLAG_NONE,
     MP_TYPE_NULL_MAKE_NEW,
-    locals_dict, (mp_obj_dict_t *)&thread_lock_locals_dict
+    locals_dict, &thread_lock_locals_dict
     );
 
 /****************************************************************/
diff --git a/py/objarray.c b/py/objarray.c
index 8d0fe7f58503c..1cb163c4b97aa 100644
--- a/py/objarray.c
+++ b/py/objarray.c
@@ -582,7 +582,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     binary_op, array_binary_op,
     subscr, array_subscr,
     buffer, array_get_buffer,
-    locals_dict, (mp_obj_dict_t *)&mp_obj_array_locals_dict
+    locals_dict, &mp_obj_array_locals_dict
     );
 #endif
 
@@ -598,7 +598,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     binary_op, array_binary_op,
     subscr, array_subscr,
     buffer, array_get_buffer,
-    locals_dict, (mp_obj_dict_t *)&mp_obj_bytearray_locals_dict
+    locals_dict, &mp_obj_bytearray_locals_dict
     );
 #endif
 
@@ -610,7 +610,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
 #endif
 
 #if MICROPY_PY_BUILTINS_BYTES_HEX
-#define MEMORYVIEW_TYPE_LOCALS_DICT locals_dict, (mp_obj_dict_t *)&mp_obj_memoryview_locals_dict,
+#define MEMORYVIEW_TYPE_LOCALS_DICT locals_dict, &mp_obj_memoryview_locals_dict,
 #else
 #define MEMORYVIEW_TYPE_LOCALS_DICT
 #endif
diff --git a/py/objdeque.c b/py/objdeque.c
index 22770317ab31a..1a8f76ca110b1 100644
--- a/py/objdeque.c
+++ b/py/objdeque.c
@@ -161,7 +161,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     deque_make_new,
     unary_op, deque_unary_op,
-    locals_dict, (mp_obj_dict_t *)&deque_locals_dict
+    locals_dict, &deque_locals_dict
     );
 
 #endif // MICROPY_PY_COLLECTIONS_DEQUE
diff --git a/py/objdict.c b/py/objdict.c
index 6e217d5c9a716..c65b14caad6ca 100644
--- a/py/objdict.c
+++ b/py/objdict.c
@@ -599,7 +599,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     binary_op, dict_binary_op,
     subscr, dict_subscr,
     getiter, dict_getiter,
-    locals_dict, (mp_obj_dict_t *)&dict_locals_dict
+    locals_dict, &dict_locals_dict
     );
 
 #if MICROPY_PY_COLLECTIONS_ORDEREDDICT
@@ -614,7 +614,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     subscr, dict_subscr,
     getiter, dict_getiter,
     parent, &mp_type_dict,
-    locals_dict, (mp_obj_dict_t *)&dict_locals_dict
+    locals_dict, &dict_locals_dict
     );
 #endif
 
diff --git a/py/objgenerator.c b/py/objgenerator.c
index 299f25e7bb634..a960c237002f5 100644
--- a/py/objgenerator.c
+++ b/py/objgenerator.c
@@ -376,5 +376,5 @@ MP_DEFINE_CONST_OBJ_TYPE(
     unary_op, mp_generic_unary_op,
     getiter, mp_identity_getiter,
     iternext, gen_instance_iternext,
-    locals_dict, (mp_obj_dict_t *)&gen_instance_locals_dict
+    locals_dict, &gen_instance_locals_dict
     );
diff --git a/py/objint.c b/py/objint.c
index d7a3f9eb9d18d..f06bc441f15d5 100644
--- a/py/objint.c
+++ b/py/objint.c
@@ -465,5 +465,5 @@ MP_DEFINE_CONST_OBJ_TYPE(
     print, mp_obj_int_print,
     unary_op, mp_obj_int_unary_op,
     binary_op, mp_obj_int_binary_op,
-    locals_dict, (mp_obj_dict_t *)&int_locals_dict
+    locals_dict, &int_locals_dict
     );
diff --git a/py/objlist.c b/py/objlist.c
index 8c7921b9891b9..5f9e99cc79b26 100644
--- a/py/objlist.c
+++ b/py/objlist.c
@@ -462,7 +462,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     binary_op, list_binary_op,
     subscr, list_subscr,
     getiter, list_getiter,
-    locals_dict, (mp_obj_dict_t *)&list_locals_dict
+    locals_dict, &list_locals_dict
     );
 
 
diff --git a/py/objobject.c b/py/objobject.c
index 868a85b32ab0c..ffad610707279 100644
--- a/py/objobject.c
+++ b/py/objobject.c
@@ -112,7 +112,7 @@ STATIC MP_DEFINE_CONST_DICT(object_locals_dict, object_locals_dict_table);
 #endif
 
 #if MICROPY_CPYTHON_COMPAT
-#define OBJECT_TYPE_LOCALS_DICT , locals_dict, (mp_obj_dict_t *)&object_locals_dict
+#define OBJECT_TYPE_LOCALS_DICT , locals_dict, &object_locals_dict
 #else
 #define OBJECT_TYPE_LOCALS_DICT
 #endif
diff --git a/py/objpolyiter.c b/py/objpolyiter.c
index 326153182bca7..5bc397f6ec3bf 100644
--- a/py/objpolyiter.c
+++ b/py/objpolyiter.c
@@ -85,6 +85,6 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_NULL_MAKE_NEW,
     getiter, mp_identity_getiter,
     iternext, polymorph_it_iternext,
-    locals_dict, (mp_obj_dict_t *)&mp_obj_polymorph_iter_locals_dict
+    locals_dict, &mp_obj_polymorph_iter_locals_dict
     );
 #endif
diff --git a/py/objproperty.c b/py/objproperty.c
index 42c357f33050b..ce3b572591d2f 100644
--- a/py/objproperty.c
+++ b/py/objproperty.c
@@ -95,7 +95,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_QSTR_property,
     MP_TYPE_FLAG_NONE,
     property_make_new,
-    locals_dict, (mp_obj_dict_t *)&property_locals_dict
+    locals_dict, &property_locals_dict
     );
 
 const mp_obj_t *mp_obj_property_get(mp_obj_t self_in) {
diff --git a/py/objset.c b/py/objset.c
index 8fc744a14047e..6f21bf15dfb58 100644
--- a/py/objset.c
+++ b/py/objset.c
@@ -548,7 +548,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     unary_op, set_unary_op,
     binary_op, set_binary_op,
     getiter, set_getiter,
-    locals_dict, (mp_obj_dict_t *)&set_locals_dict
+    locals_dict, &set_locals_dict
     );
 
 #if MICROPY_PY_BUILTINS_FROZENSET
@@ -574,7 +574,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     unary_op, set_unary_op,
     binary_op, set_binary_op,
     getiter, set_getiter,
-    locals_dict, (mp_obj_dict_t *)&frozenset_locals_dict
+    locals_dict, &frozenset_locals_dict
     );
 #endif
 
diff --git a/py/objslice.c b/py/objslice.c
index 7baca1fbe6685..d1dbb24586d9f 100644
--- a/py/objslice.c
+++ b/py/objslice.c
@@ -95,7 +95,7 @@ STATIC MP_DEFINE_CONST_DICT(slice_locals_dict, slice_locals_dict_table);
 #if MICROPY_PY_BUILTINS_SLICE_ATTRS
 #define SLICE_TYPE_ATTR_OR_LOCALS_DICT attr, slice_attr,
 #elif MICROPY_PY_BUILTINS_SLICE_INDICES
-#define SLICE_TYPE_ATTR_OR_LOCALS_DICT locals_dict, (mp_obj_dict_t *)&slice_locals_dict,
+#define SLICE_TYPE_ATTR_OR_LOCALS_DICT locals_dict, &slice_locals_dict,
 #else
 #define SLICE_TYPE_ATTR_OR_LOCALS_DICT
 #endif
diff --git a/py/objstr.c b/py/objstr.c
index 77ca269d423bb..d425055559f84 100644
--- a/py/objstr.c
+++ b/py/objstr.c
@@ -2153,7 +2153,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     subscr, bytes_subscr,
     getiter, mp_obj_new_str_iterator,
     buffer, mp_obj_str_get_buffer,
-    locals_dict, (mp_obj_dict_t *)&mp_obj_str_locals_dict
+    locals_dict, &mp_obj_str_locals_dict
     );
 #endif // !MICROPY_PY_BUILTINS_STR_UNICODE
 
@@ -2168,7 +2168,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     subscr, bytes_subscr,
     getiter, mp_obj_new_bytes_iterator,
     buffer, mp_obj_str_get_buffer,
-    locals_dict, (mp_obj_dict_t *)&mp_obj_bytes_locals_dict
+    locals_dict, &mp_obj_bytes_locals_dict
     );
 
 // The zero-length bytes object, with data that includes a null-terminating byte
diff --git a/py/objstringio.c b/py/objstringio.c
index d781ccc789d20..77547f88cf6c2 100644
--- a/py/objstringio.c
+++ b/py/objstringio.c
@@ -253,7 +253,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     getiter, mp_identity_getiter,
     iternext, mp_stream_unbuffered_iter,
     protocol, &stringio_stream_p,
-    locals_dict, (mp_obj_dict_t *)&stringio_locals_dict
+    locals_dict, &stringio_locals_dict
     );
 
 #if MICROPY_PY_IO_BYTESIO
@@ -272,7 +272,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     getiter, mp_identity_getiter,
     iternext, mp_stream_unbuffered_iter,
     protocol, &bytesio_stream_p,
-    locals_dict, (mp_obj_dict_t *)&stringio_locals_dict
+    locals_dict, &stringio_locals_dict
     );
 #endif
 
diff --git a/py/objstrunicode.c b/py/objstrunicode.c
index afef1498e98e7..15c59e4e95724 100644
--- a/py/objstrunicode.c
+++ b/py/objstrunicode.c
@@ -240,7 +240,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     subscr, str_subscr,
     getiter, mp_obj_new_str_iterator,
     buffer, mp_obj_str_get_buffer,
-    locals_dict, (mp_obj_dict_t *)&mp_obj_str_locals_dict
+    locals_dict, &mp_obj_str_locals_dict
     );
 
 /******************************************************************************/
diff --git a/py/objtuple.c b/py/objtuple.c
index b2ea6e380eb1d..a684b13e6f254 100644
--- a/py/objtuple.c
+++ b/py/objtuple.c
@@ -234,7 +234,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     binary_op, mp_obj_tuple_binary_op,
     subscr, mp_obj_tuple_subscr,
     getiter, mp_obj_tuple_getiter,
-    locals_dict, (mp_obj_dict_t *)&tuple_locals_dict
+    locals_dict, &tuple_locals_dict
     );
 
 // the zero-length tuple
diff --git a/shared/runtime/mpirq.c b/shared/runtime/mpirq.c
index 763da6e0e4449..889fa7a9a82ed 100644
--- a/shared/runtime/mpirq.c
+++ b/shared/runtime/mpirq.c
@@ -131,7 +131,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     MP_TYPE_NULL_MAKE_NEW,
     call, mp_irq_call,
-    locals_dict, (mp_obj_dict_t *)&mp_irq_locals_dict
+    locals_dict, &mp_irq_locals_dict
     );
 
 #endif // MICROPY_ENABLE_SCHEDULER
diff --git a/shared/runtime/sys_stdio_mphal.c b/shared/runtime/sys_stdio_mphal.c
index f1290853da734..6d43425e298fe 100644
--- a/shared/runtime/sys_stdio_mphal.c
+++ b/shared/runtime/sys_stdio_mphal.c
@@ -132,7 +132,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     getiter, mp_identity_getiter,
     iternext, mp_stream_unbuffered_iter,
     protocol, &stdio_obj_stream_p,
-    locals_dict, (mp_obj_dict_t *)&stdio_locals_dict
+    locals_dict, &stdio_locals_dict
     );
 
 const sys_stdio_obj_t mp_sys_stdin_obj = {{&stdio_obj_type}, .fd = STDIO_FD_IN};
@@ -168,7 +168,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     getiter, mp_identity_getiter,
     iternext, mp_stream_unbuffered_iter,
     protocol, &stdio_buffer_obj_stream_p,
-    locals_dict, (mp_obj_dict_t *)&stdio_locals_dict
+    locals_dict, &stdio_locals_dict
     );
 
 STATIC const sys_stdio_obj_t stdio_buffer_obj = {{&stdio_buffer_obj_type}, .fd = 0}; // fd unused

From 5ddf671944465411f90bd0968550b719d0dbdb80 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Wed, 14 Jul 2021 15:02:15 +1000
Subject: [PATCH 2619/3533] py/objexcept: Make MP_DEFINE_EXCEPTION use
 MP_DEFINE_CONST_OBJ_TYPE.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 py/objexcept.h | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/py/objexcept.h b/py/objexcept.h
index 384456bb51a94..5d56d67d7314f 100644
--- a/py/objexcept.h
+++ b/py/objexcept.h
@@ -41,13 +41,10 @@ void mp_obj_exception_print(const mp_print_t *print, mp_obj_t o_in, mp_print_kin
 void mp_obj_exception_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest);
 
 #define MP_DEFINE_EXCEPTION(exc_name, base_name) \
-    const mp_obj_type_t mp_type_##exc_name = { \
-        { &mp_type_type }, \
-        .name = MP_QSTR_##exc_name, \
-        .print = mp_obj_exception_print, \
-        .make_new = mp_obj_exception_make_new, \
-        .attr = mp_obj_exception_attr, \
-        .parent = &mp_type_##base_name, \
-    };
+    MP_DEFINE_CONST_OBJ_TYPE(mp_type_##exc_name, MP_QSTR_##exc_name, MP_TYPE_FLAG_NONE, mp_obj_exception_make_new, \
+    print, mp_obj_exception_print, \
+    attr, mp_obj_exception_attr, \
+    parent, &mp_type_##base_name \
+    );
 
 #endif // MICROPY_INCLUDED_PY_OBJEXCEPT_H

From e8355eb16357b0bd234a9bcab1c9e8b72fcdbabc Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Fri, 22 Apr 2022 13:05:56 +1000
Subject: [PATCH 2620/3533] py/obj: Add "full" and "empty" non-variable-length
 mp_obj_type_t.

This will always have the maximum/minimum size of a mp_obj_type_t
representation and can be used as a member in other structs.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 examples/natmod/btree/btree_c.c     |  2 +-
 examples/natmod/framebuf/framebuf.c |  2 +-
 examples/natmod/ure/ure.c           |  4 ++--
 examples/natmod/uzlib/uzlib.c       |  2 +-
 extmod/modbtree.c                   |  2 +-
 extmod/modframebuf.c                |  2 +-
 extmod/modnetwork.h                 |  3 ++-
 extmod/modure.c                     | 10 +++++-----
 extmod/network_ninaw10.c            |  2 +-
 extmod/network_wiznet5k.c           |  2 +-
 ports/cc3200/mods/modnetwork.h      |  3 ++-
 ports/cc3200/mods/modwlan.c         |  2 +-
 py/obj.h                            | 15 +++++++++++++--
 py/objnamedtuple.h                  |  5 ++++-
 py/objtype.c                        |  5 ++++-
 15 files changed, 40 insertions(+), 21 deletions(-)

diff --git a/examples/natmod/btree/btree_c.c b/examples/natmod/btree/btree_c.c
index 5e8a34ac40095..e342b7d90320a 100644
--- a/examples/natmod/btree/btree_c.c
+++ b/examples/natmod/btree/btree_c.c
@@ -94,7 +94,7 @@ int mp_stream_posix_fsync(void *stream) {
     return res;
 }
 
-mp_obj_type_t btree_type;
+mp_obj_full_type_t btree_type;
 
 #include "extmod/modbtree.c"
 
diff --git a/examples/natmod/framebuf/framebuf.c b/examples/natmod/framebuf/framebuf.c
index 2eff61c817d22..98b44987b342f 100644
--- a/examples/natmod/framebuf/framebuf.c
+++ b/examples/natmod/framebuf/framebuf.c
@@ -8,7 +8,7 @@ void *memset(void *s, int c, size_t n) {
 }
 #endif
 
-mp_obj_type_t mp_type_framebuf;
+mp_obj_full_type_t mp_type_framebuf;
 
 #include "extmod/modframebuf.c"
 
diff --git a/examples/natmod/ure/ure.c b/examples/natmod/ure/ure.c
index 175b93e395ef9..d9e11760a70c1 100644
--- a/examples/natmod/ure/ure.c
+++ b/examples/natmod/ure/ure.c
@@ -32,8 +32,8 @@ void *memmove(void *dest, const void *src, size_t n) {
     return mp_fun_table.memmove_(dest, src, n);
 }
 
-mp_obj_type_t match_type;
-mp_obj_type_t re_type;
+mp_obj_full_type_t match_type;
+mp_obj_full_type_t re_type;
 
 #include "extmod/modure.c"
 
diff --git a/examples/natmod/uzlib/uzlib.c b/examples/natmod/uzlib/uzlib.c
index 99b3691761ea4..24ab15d6f1446 100644
--- a/examples/natmod/uzlib/uzlib.c
+++ b/examples/natmod/uzlib/uzlib.c
@@ -8,7 +8,7 @@ void *memset(void *s, int c, size_t n) {
 }
 #endif
 
-mp_obj_type_t decompio_type;
+mp_obj_full_type_t decompio_type;
 
 #include "extmod/moduzlib.c"
 
diff --git a/extmod/modbtree.c b/extmod/modbtree.c
index 15cb6341637a5..60c6885e6b2cc 100644
--- a/extmod/modbtree.c
+++ b/extmod/modbtree.c
@@ -67,7 +67,7 @@ void __dbpanic(DB *db) {
 }
 
 STATIC mp_obj_btree_t *btree_new(DB *db, mp_obj_t stream) {
-    mp_obj_btree_t *o = mp_obj_malloc(mp_obj_btree_t, &btree_type);
+    mp_obj_btree_t *o = mp_obj_malloc(mp_obj_btree_t, (mp_obj_type_t *)&btree_type);
     o->stream = stream;
     o->db = db;
     o->start_key = mp_const_none;
diff --git a/extmod/modframebuf.c b/extmod/modframebuf.c
index f29eab272f0ea..5347be5643667 100644
--- a/extmod/modframebuf.c
+++ b/extmod/modframebuf.c
@@ -841,7 +841,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
 
 // this factory function is provided for backwards compatibility with old FrameBuffer1 class
 STATIC mp_obj_t legacy_framebuffer1(size_t n_args, const mp_obj_t *args_in) {
-    mp_obj_framebuf_t *o = mp_obj_malloc(mp_obj_framebuf_t, &mp_type_framebuf);
+    mp_obj_framebuf_t *o = mp_obj_malloc(mp_obj_framebuf_t, (mp_obj_type_t *)&mp_type_framebuf);
 
     mp_buffer_info_t bufinfo;
     mp_get_buffer_raise(args_in[0], &bufinfo, MP_BUFFER_WRITE);
diff --git a/extmod/modnetwork.h b/extmod/modnetwork.h
index 3481cc6dcc575..55ee4eb4d3e35 100644
--- a/extmod/modnetwork.h
+++ b/extmod/modnetwork.h
@@ -62,7 +62,8 @@ mp_obj_t mod_network_nic_ifconfig(struct netif *netif, size_t n_args, const mp_o
 struct _mod_network_socket_obj_t;
 
 typedef struct _mod_network_nic_type_t {
-    mp_obj_type_t base;
+    // Ensure that this struct is big enough to hold any type size.
+    mp_obj_full_type_t base;
 
     // API for non-socket operations
     int (*gethostbyname)(mp_obj_t nic, const char *name, mp_uint_t len, uint8_t *ip_out);
diff --git a/extmod/modure.c b/extmod/modure.c
index 43959924053bc..c0114c14fd57f 100644
--- a/extmod/modure.c
+++ b/extmod/modure.c
@@ -198,7 +198,7 @@ STATIC void re_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t
 STATIC mp_obj_t ure_exec(bool is_anchored, uint n_args, const mp_obj_t *args) {
     (void)n_args;
     mp_obj_re_t *self;
-    if (mp_obj_is_type(args[0], &re_type)) {
+    if (mp_obj_is_type(args[0], (mp_obj_type_t *)&re_type)) {
         self = MP_OBJ_TO_PTR(args[0]);
     } else {
         self = MP_OBJ_TO_PTR(mod_re_compile(1, args));
@@ -217,7 +217,7 @@ STATIC mp_obj_t ure_exec(bool is_anchored, uint n_args, const mp_obj_t *args) {
         return mp_const_none;
     }
 
-    match->base.type = &match_type;
+    match->base.type = (mp_obj_type_t *)&match_type;
     match->num_matches = caps_num / 2; // caps_num counts start and end pointers
     match->str = args[1];
     return MP_OBJ_FROM_PTR(match);
@@ -282,7 +282,7 @@ MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(re_split_obj, 2, 3, re_split);
 
 STATIC mp_obj_t re_sub_helper(size_t n_args, const mp_obj_t *args) {
     mp_obj_re_t *self;
-    if (mp_obj_is_type(args[0], &re_type)) {
+    if (mp_obj_is_type(args[0], (mp_obj_type_t *)&re_type)) {
         self = MP_OBJ_TO_PTR(args[0]);
     } else {
         self = MP_OBJ_TO_PTR(mod_re_compile(1, args));
@@ -305,7 +305,7 @@ STATIC mp_obj_t re_sub_helper(size_t n_args, const mp_obj_t *args) {
     vstr_t vstr_return;
     vstr_return.buf = NULL; // We'll init the vstr after the first match
     mp_obj_match_t *match = mp_local_alloc(sizeof(mp_obj_match_t) + caps_num * sizeof(char *));
-    match->base.type = &match_type;
+    match->base.type = (mp_obj_type_t *)&match_type;
     match->num_matches = caps_num / 2; // caps_num counts start and end pointers
     match->str = where;
 
@@ -430,7 +430,7 @@ STATIC mp_obj_t mod_re_compile(size_t n_args, const mp_obj_t *args) {
     if (size == -1) {
         goto error;
     }
-    mp_obj_re_t *o = mp_obj_malloc_var(mp_obj_re_t, char, size, &re_type);
+    mp_obj_re_t *o = mp_obj_malloc_var(mp_obj_re_t, char, size, (mp_obj_type_t *)&re_type);
     #if MICROPY_PY_URE_DEBUG
     int flags = 0;
     if (n_args > 1) {
diff --git a/extmod/network_ninaw10.c b/extmod/network_ninaw10.c
index 0906176d20b0b..806819648d2ee 100644
--- a/extmod/network_ninaw10.c
+++ b/extmod/network_ninaw10.c
@@ -774,7 +774,7 @@ static const mp_rom_map_elem_t nina_locals_dict_table[] = {
 
 static MP_DEFINE_CONST_DICT(nina_locals_dict, nina_locals_dict_table);
 
-STATIC MP_DEFINE_CONST_OBJ_TYPE(
+STATIC MP_DEFINE_CONST_OBJ_FULL_TYPE(
     mod_network_nic_type_nina_base,
     MP_QSTR_nina,
     MP_TYPE_FLAG_NONE,
diff --git a/extmod/network_wiznet5k.c b/extmod/network_wiznet5k.c
index 951a2966c93f9..1d7318827c895 100644
--- a/extmod/network_wiznet5k.c
+++ b/extmod/network_wiznet5k.c
@@ -1024,7 +1024,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     locals_dict, &wiznet5k_locals_dict
     );
 #else // WIZNET5K_PROVIDED_STACK
-STATIC MP_DEFINE_CONST_OBJ_TYPE(
+STATIC MP_DEFINE_CONST_OBJ_FULL_TYPE(
     mod_network_nic_type_wiznet5k_base,
     MP_QSTR_WIZNET5K,
     MP_TYPE_FLAG_NONE,
diff --git a/ports/cc3200/mods/modnetwork.h b/ports/cc3200/mods/modnetwork.h
index 6ec90a2bac189..c15a6467f2788 100644
--- a/ports/cc3200/mods/modnetwork.h
+++ b/ports/cc3200/mods/modnetwork.h
@@ -36,7 +36,8 @@
  DEFINE TYPES
  ******************************************************************************/
 typedef struct _mod_network_nic_type_t {
-    mp_obj_type_t base;
+    // Ensure that this struct is big enough to hold any type size.
+    mp_obj_full_type_t base;
 } mod_network_nic_type_t;
 
 typedef struct _mod_network_socket_base_t {
diff --git a/ports/cc3200/mods/modwlan.c b/ports/cc3200/mods/modwlan.c
index 1c99f075e9020..1e82b07e0874c 100644
--- a/ports/cc3200/mods/modwlan.c
+++ b/ports/cc3200/mods/modwlan.c
@@ -1285,7 +1285,7 @@ STATIC const mp_rom_map_elem_t wlan_locals_dict_table[] = {
 };
 STATIC MP_DEFINE_CONST_DICT(wlan_locals_dict, wlan_locals_dict_table);
 
-STATIC MP_DEFINE_CONST_OBJ_TYPE(
+STATIC MP_DEFINE_CONST_OBJ_FULL_TYPE(
     mod_network_nic_type_wlan_base,
     MP_QSTR_WLAN,
     MP_TYPE_FLAG_NONE,
diff --git a/py/obj.h b/py/obj.h
index 4ab7e0dc09c13..9c0f41dc3d737 100644
--- a/py/obj.h
+++ b/py/obj.h
@@ -562,6 +562,9 @@ typedef mp_int_t (*mp_buffer_fun_t)(mp_obj_t obj, mp_buffer_info_t *bufinfo, mp_
 bool mp_get_buffer(mp_obj_t obj, mp_buffer_info_t *bufinfo, mp_uint_t flags);
 void mp_get_buffer_raise(mp_obj_t obj, mp_buffer_info_t *bufinfo, mp_uint_t flags);
 
+// This struct will be updated to become a variable sized struct. In order to
+// use this as a member, or allocate dynamically, use the mp_obj_empty_type_t
+// or mp_obj_full_type_t structs below (which must be kept in sync).
 struct _mp_obj_type_t {
     // A type is an object so must start with this entry, which points to mp_type_type.
     mp_obj_base_t base;
@@ -632,6 +635,13 @@ struct _mp_obj_type_t {
     struct _mp_obj_dict_t *locals_dict;
 };
 
+// Non-variable sized versions of mp_obj_type_t to be used as a member
+// in other structs or for dynamic allocation. The fields are exactly
+// as in mp_obj_type_t, but with a fixed size for the flexible array
+// members.
+typedef mp_obj_type_t mp_obj_empty_type_t;
+typedef mp_obj_type_t mp_obj_full_type_t;
+
 #define MP_TYPE_NULL_MAKE_NEW (NULL)
 
 // Implementation of MP_DEFINE_CONST_OBJ_TYPE for each number of arguments.
@@ -657,14 +667,15 @@ struct _mp_obj_type_t {
 // of the 30th argument (30 is 13*2 + 4).
 #define MP_DEFINE_CONST_OBJ_TYPE_NARGS(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, N, ...) MP_DEFINE_CONST_OBJ_TYPE_NARGS_##N
 
-// This macro is used to define a object type in ROM.
+// These macros are used to define a object type in ROM.
 // Invoke as MP_DEFINE_CONST_OBJ_TYPE(_typename, _name, _flags, _make_new [, slot, func]*)
-// It uses the number of arguments to select which MP_DEFINE_CONST_OBJ_TYPE_*
+// They use the number of arguments to select which MP_DEFINE_CONST_OBJ_TYPE_*
 // macro to use based on the number of arguments. It works by shifting the
 // numeric values 12, 11, ... 0 by the number of arguments, such that the
 // 30th argument ends up being the number to use. The _INV values are
 // placeholders because the slot arguments come in pairs.
 #define MP_DEFINE_CONST_OBJ_TYPE(...) MP_DEFINE_CONST_OBJ_TYPE_EXPAND(MP_DEFINE_CONST_OBJ_TYPE_NARGS(__VA_ARGS__, _INV, 12, _INV, 11, _INV, 10, _INV, 9, _INV, 8, _INV, 7, _INV, 6, _INV, 5, _INV, 4, _INV, 3, _INV, 2, _INV, 1, _INV, 0)(mp_obj_type_t, __VA_ARGS__))
+#define MP_DEFINE_CONST_OBJ_FULL_TYPE(...) MP_DEFINE_CONST_OBJ_TYPE_EXPAND(MP_DEFINE_CONST_OBJ_TYPE_NARGS(__VA_ARGS__, _INV, 12, _INV, 11, _INV, 10, _INV, 9, _INV, 8, _INV, 7, _INV, 6, _INV, 5, _INV, 4, _INV, 3, _INV, 2, _INV, 1, _INV, 0)(mp_obj_full_type_t, __VA_ARGS__))
 
 // Constant types, globally accessible
 extern const mp_obj_type_t mp_type_type;
diff --git a/py/objnamedtuple.h b/py/objnamedtuple.h
index d32af35afec43..9f23351d5a36c 100644
--- a/py/objnamedtuple.h
+++ b/py/objnamedtuple.h
@@ -29,7 +29,10 @@
 #include "py/objtuple.h"
 
 typedef struct _mp_obj_namedtuple_type_t {
-    mp_obj_type_t base;
+    // Must use the full-size version to avoid this being a variable sized member.
+    // This means that named tuples use slightly more RAM than necessary, but
+    // no worse than if we didn't have slots/split representation.
+    mp_obj_full_type_t base;
     size_t n_fields;
     qstr fields[];
 } mp_obj_namedtuple_type_t;
diff --git a/py/objtype.c b/py/objtype.c
index 77fe8e22e3844..cc5a5e580254d 100644
--- a/py/objtype.c
+++ b/py/objtype.c
@@ -1148,7 +1148,10 @@ mp_obj_t mp_obj_new_type(qstr name, mp_obj_t bases_tuple, mp_obj_t locals_dict)
         #endif
     }
 
-    mp_obj_type_t *o = m_new0(mp_obj_type_t, 1);
+    // Allocate a full-sized mp_obj_full_type_t instance (i.e. all slots / extended fields).
+    // Given that Python types use almost all the slots anyway, this doesn't cost anything
+    // extra.
+    mp_obj_type_t *o = (mp_obj_type_t *)m_new0(mp_obj_full_type_t, 1);
     o->base.type = &mp_type_type;
     o->flags = base_flags;
     o->name = name;

From a52cd5b07d6d6e2502fff2bbfb9e5b96562452a4 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Wed, 14 Jul 2021 17:14:16 +1000
Subject: [PATCH 2621/3533] py/obj: Add accessors for type slots and use
 everywhere.

This is a no-op, but sets the stage for changing the mp_obj_type_t
representation.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 drivers/ninaw10/nina_wifi_bsp.c               |   2 +-
 examples/natmod/btree/btree_c.c               |  20 +--
 examples/natmod/framebuf/framebuf.c           |   4 +-
 examples/natmod/ure/ure.c                     |   8 +-
 examples/natmod/uzlib/uzlib.c                 |   6 +-
 extmod/machine_i2c.c                          |  22 +--
 extmod/machine_signal.c                       |   2 +-
 extmod/machine_spi.c                          |   6 +-
 extmod/network_wiznet5k.c                     |   2 +-
 extmod/vfs.c                                  |   5 +-
 extmod/virtpin.c                              |   4 +-
 .../nrf/modules/ubluepy/ubluepy_scan_entry.c  |   2 +-
 ports/rp2/mpbthciport.c                       |   6 +-
 ports/unix/modffi.c                           |   4 +-
 py/builtinhelp.c                              |   4 +-
 py/dynruntime.h                               |   2 +-
 py/modbuiltins.c                              |   2 +-
 py/obj.c                                      |  28 ++--
 py/obj.h                                      |  12 +-
 py/objarray.c                                 |   2 +-
 py/objnamedtuple.c                            |  14 +-
 py/objtuple.c                                 |   4 +-
 py/objtype.c                                  | 136 +++++++++---------
 py/opmethods.c                                |  12 +-
 py/runtime.c                                  |  59 ++++----
 py/stream.c                                   |  25 ++--
 py/stream.h                                   |   2 +-
 27 files changed, 207 insertions(+), 188 deletions(-)

diff --git a/drivers/ninaw10/nina_wifi_bsp.c b/drivers/ninaw10/nina_wifi_bsp.c
index a65ef7fd86448..d5b1308536af9 100644
--- a/drivers/ninaw10/nina_wifi_bsp.c
+++ b/drivers/ninaw10/nina_wifi_bsp.c
@@ -137,7 +137,7 @@ int nina_bsp_spi_slave_deselect(void) {
 
 int nina_bsp_spi_transfer(const uint8_t *tx_buf, uint8_t *rx_buf, uint32_t size) {
     mp_obj_t mp_wifi_spi = MP_STATE_PORT(mp_wifi_spi);
-    ((mp_machine_spi_p_t *)machine_spi_type.protocol)->transfer(mp_wifi_spi, size, tx_buf, rx_buf);
+    ((mp_machine_spi_p_t *)MP_OBJ_TYPE_GET_SLOT(&machine_spi_type, protocol))->transfer(mp_wifi_spi, size, tx_buf, rx_buf);
     #if NINA_DEBUG
     for (int i = 0; i < size; i++) {
         if (tx_buf) {
diff --git a/examples/natmod/btree/btree_c.c b/examples/natmod/btree/btree_c.c
index e342b7d90320a..af7535a68f7f7 100644
--- a/examples/natmod/btree/btree_c.c
+++ b/examples/natmod/btree/btree_c.c
@@ -51,7 +51,7 @@ int *__errno (void)
 
 ssize_t mp_stream_posix_write(void *stream, const void *buf, size_t len) {
     mp_obj_base_t* o = stream;
-    const mp_stream_p_t *stream_p = o->type->protocol;
+    const mp_stream_p_t *stream_p = MP_OBJ_TYPE_GET_SLOT(o->type, protocol);
     mp_uint_t out_sz = stream_p->write(MP_OBJ_FROM_PTR(stream), buf, len, &native_errno);
     if (out_sz == MP_STREAM_ERROR) {
         return -1;
@@ -62,7 +62,7 @@ ssize_t mp_stream_posix_write(void *stream, const void *buf, size_t len) {
 
 ssize_t mp_stream_posix_read(void *stream, void *buf, size_t len) {
     mp_obj_base_t* o = stream;
-    const mp_stream_p_t *stream_p = o->type->protocol;
+    const mp_stream_p_t *stream_p = MP_OBJ_TYPE_GET_SLOT(o->type, protocol);
     mp_uint_t out_sz = stream_p->read(MP_OBJ_FROM_PTR(stream), buf, len, &native_errno);
     if (out_sz == MP_STREAM_ERROR) {
         return -1;
@@ -73,7 +73,7 @@ ssize_t mp_stream_posix_read(void *stream, void *buf, size_t len) {
 
 off_t mp_stream_posix_lseek(void *stream, off_t offset, int whence) {
     const mp_obj_base_t* o = stream;
-    const mp_stream_p_t *stream_p = o->type->protocol;
+    const mp_stream_p_t *stream_p = MP_OBJ_TYPE_GET_SLOT(o->type, protocol);
     struct mp_stream_seek_t seek_s;
     seek_s.offset = offset;
     seek_s.whence = whence;
@@ -86,7 +86,7 @@ off_t mp_stream_posix_lseek(void *stream, off_t offset, int whence) {
 
 int mp_stream_posix_fsync(void *stream) {
     mp_obj_base_t* o = stream;
-    const mp_stream_p_t *stream_p = o->type->protocol;
+    const mp_stream_p_t *stream_p = MP_OBJ_TYPE_GET_SLOT(o->type, protocol);
     mp_uint_t res = stream_p->ioctl(MP_OBJ_FROM_PTR(stream), MP_STREAM_FLUSH, 0, &native_errno);
     if (res == MP_STREAM_ERROR) {
         return -1;
@@ -124,11 +124,11 @@ mp_obj_t mpy_init(mp_obj_fun_bc_t *self, size_t n_args, size_t n_kw, mp_obj_t *a
 
     btree_type.base.type = (void*)&mp_fun_table.type_type;
     btree_type.name = MP_QSTR_btree;
-    btree_type.print = btree_print;
-    btree_type.getiter = btree_getiter;
-    btree_type.iternext = btree_iternext;
-    btree_type.binary_op = btree_binary_op;
-    btree_type.subscr = btree_subscr;
+    MP_OBJ_TYPE_SET_SLOT(&btree_type, print, btree_print, 0);
+    MP_OBJ_TYPE_SET_SLOT(&btree_type, getiter, btree_getiter, 1);
+    MP_OBJ_TYPE_SET_SLOT(&btree_type, iternext, btree_iternext, 2);
+    MP_OBJ_TYPE_SET_SLOT(&btree_type, binary_op, btree_binary_op, 3);
+    MP_OBJ_TYPE_SET_SLOT(&btree_type, subscr, btree_subscr, 4);
     btree_locals_dict_table[0] = (mp_map_elem_t){ MP_OBJ_NEW_QSTR(MP_QSTR_close), MP_OBJ_FROM_PTR(&btree_close_obj) };
     btree_locals_dict_table[1] = (mp_map_elem_t){ MP_OBJ_NEW_QSTR(MP_QSTR_flush), MP_OBJ_FROM_PTR(&btree_flush_obj) };
     btree_locals_dict_table[2] = (mp_map_elem_t){ MP_OBJ_NEW_QSTR(MP_QSTR_get), MP_OBJ_FROM_PTR(&btree_get_obj) };
@@ -137,7 +137,7 @@ mp_obj_t mpy_init(mp_obj_fun_bc_t *self, size_t n_args, size_t n_kw, mp_obj_t *a
     btree_locals_dict_table[5] = (mp_map_elem_t){ MP_OBJ_NEW_QSTR(MP_QSTR_keys), MP_OBJ_FROM_PTR(&btree_keys_obj) };
     btree_locals_dict_table[6] = (mp_map_elem_t){ MP_OBJ_NEW_QSTR(MP_QSTR_values), MP_OBJ_FROM_PTR(&btree_values_obj) };
     btree_locals_dict_table[7] = (mp_map_elem_t){ MP_OBJ_NEW_QSTR(MP_QSTR_items), MP_OBJ_FROM_PTR(&btree_items_obj) };
-    btree_type.locals_dict = (void*)&btree_locals_dict;
+    MP_OBJ_TYPE_SET_SLOT(&btree_type, locals_dict, (void*)&btree_locals_dict, 5);
 
     mp_store_global(MP_QSTR__open, MP_OBJ_FROM_PTR(&btree_open_obj));
     mp_store_global(MP_QSTR_INCL, MP_OBJ_NEW_SMALL_INT(FLAG_END_KEY_INCL));
diff --git a/examples/natmod/framebuf/framebuf.c b/examples/natmod/framebuf/framebuf.c
index 98b44987b342f..4c557294719d8 100644
--- a/examples/natmod/framebuf/framebuf.c
+++ b/examples/natmod/framebuf/framebuf.c
@@ -21,7 +21,7 @@ mp_obj_t mpy_init(mp_obj_fun_bc_t *self, size_t n_args, size_t n_kw, mp_obj_t *a
     mp_type_framebuf.base.type = (void*)&mp_type_type;
     mp_type_framebuf.name = MP_QSTR_FrameBuffer;
     mp_type_framebuf.make_new = framebuf_make_new;
-    mp_type_framebuf.buffer = framebuf_get_buffer;
+    MP_OBJ_TYPE_SET_SLOT(&mp_type_framebuf, buffer, framebuf_get_buffer, 0);
     framebuf_locals_dict_table[0] = (mp_map_elem_t){ MP_OBJ_NEW_QSTR(MP_QSTR_fill), MP_OBJ_FROM_PTR(&framebuf_fill_obj) };
     framebuf_locals_dict_table[1] = (mp_map_elem_t){ MP_OBJ_NEW_QSTR(MP_QSTR_fill_rect), MP_OBJ_FROM_PTR(&framebuf_fill_rect_obj) };
     framebuf_locals_dict_table[2] = (mp_map_elem_t){ MP_OBJ_NEW_QSTR(MP_QSTR_pixel), MP_OBJ_FROM_PTR(&framebuf_pixel_obj) };
@@ -33,7 +33,7 @@ mp_obj_t mpy_init(mp_obj_fun_bc_t *self, size_t n_args, size_t n_kw, mp_obj_t *a
     framebuf_locals_dict_table[8] = (mp_map_elem_t){ MP_OBJ_NEW_QSTR(MP_QSTR_blit), MP_OBJ_FROM_PTR(&framebuf_blit_obj) };
     framebuf_locals_dict_table[9] = (mp_map_elem_t){ MP_OBJ_NEW_QSTR(MP_QSTR_scroll), MP_OBJ_FROM_PTR(&framebuf_scroll_obj) };
     framebuf_locals_dict_table[10] = (mp_map_elem_t){ MP_OBJ_NEW_QSTR(MP_QSTR_text), MP_OBJ_FROM_PTR(&framebuf_text_obj) };
-    mp_type_framebuf.locals_dict = (void*)&framebuf_locals_dict;
+    MP_OBJ_TYPE_SET_SLOT(&mp_type_framebuf, locals_dict, (void*)&framebuf_locals_dict, 1);
 
     mp_store_global(MP_QSTR_FrameBuffer, MP_OBJ_FROM_PTR(&mp_type_framebuf));
     mp_store_global(MP_QSTR_FrameBuffer1, MP_OBJ_FROM_PTR(&legacy_framebuffer1_obj));
diff --git a/examples/natmod/ure/ure.c b/examples/natmod/ure/ure.c
index d9e11760a70c1..d4bd680abd428 100644
--- a/examples/natmod/ure/ure.c
+++ b/examples/natmod/ure/ure.c
@@ -54,21 +54,21 @@ mp_obj_t mpy_init(mp_obj_fun_bc_t *self, size_t n_args, size_t n_kw, mp_obj_t *a
 
     match_type.base.type = (void*)&mp_fun_table.type_type;
     match_type.name = MP_QSTR_match;
-    match_type.print = match_print;
+    MP_OBJ_TYPE_SET_SLOT(&match_type, print, match_print, 0);
     match_locals_dict_table[0] = (mp_map_elem_t){ MP_OBJ_NEW_QSTR(MP_QSTR_group), MP_OBJ_FROM_PTR(&match_group_obj) };
     match_locals_dict_table[1] = (mp_map_elem_t){ MP_OBJ_NEW_QSTR(MP_QSTR_groups), MP_OBJ_FROM_PTR(&match_groups_obj) };
     match_locals_dict_table[2] = (mp_map_elem_t){ MP_OBJ_NEW_QSTR(MP_QSTR_span), MP_OBJ_FROM_PTR(&match_span_obj) };
     match_locals_dict_table[3] = (mp_map_elem_t){ MP_OBJ_NEW_QSTR(MP_QSTR_start), MP_OBJ_FROM_PTR(&match_start_obj) };
     match_locals_dict_table[4] = (mp_map_elem_t){ MP_OBJ_NEW_QSTR(MP_QSTR_end), MP_OBJ_FROM_PTR(&match_end_obj) };
-    match_type.locals_dict = (void*)&match_locals_dict;
+    MP_OBJ_TYPE_SET_SLOT(&match_type, locals_dict, (void*)&match_locals_dict, 1);
 
     re_type.base.type = (void*)&mp_fun_table.type_type;
     re_type.name = MP_QSTR_ure;
-    re_type.print = re_print;
+    MP_OBJ_TYPE_SET_SLOT(&re_type, print, re_print, 0);
     re_locals_dict_table[0] = (mp_map_elem_t){ MP_OBJ_NEW_QSTR(MP_QSTR_match), MP_OBJ_FROM_PTR(&re_match_obj) };
     re_locals_dict_table[1] = (mp_map_elem_t){ MP_OBJ_NEW_QSTR(MP_QSTR_search), MP_OBJ_FROM_PTR(&re_search_obj) };
     re_locals_dict_table[2] = (mp_map_elem_t){ MP_OBJ_NEW_QSTR(MP_QSTR_split), MP_OBJ_FROM_PTR(&re_split_obj) };
-    re_type.locals_dict = (void*)&re_locals_dict;
+    MP_OBJ_TYPE_SET_SLOT(&re_type, locals_dict, (void*)&re_locals_dict, 1);
 
     mp_store_global(MP_QSTR_compile, MP_OBJ_FROM_PTR(&mod_re_compile_obj));
     mp_store_global(MP_QSTR_match, MP_OBJ_FROM_PTR(&re_match_obj));
diff --git a/examples/natmod/uzlib/uzlib.c b/examples/natmod/uzlib/uzlib.c
index 24ab15d6f1446..469452e8f8437 100644
--- a/examples/natmod/uzlib/uzlib.c
+++ b/examples/natmod/uzlib/uzlib.c
@@ -20,12 +20,12 @@ mp_obj_t mpy_init(mp_obj_fun_bc_t *self, size_t n_args, size_t n_kw, mp_obj_t *a
 
     decompio_type.base.type = mp_fun_table.type_type;
     decompio_type.name = MP_QSTR_DecompIO;
-    decompio_type.make_new = decompio_make_new;
-    decompio_type.protocol = &decompio_stream_p;
+    decompio_type.make_new = &decompio_make_new;
+    MP_OBJ_TYPE_SET_SLOT(&decompio_type, protocol, &decompio_stream_p, 0);
     decompio_locals_dict_table[0] = (mp_map_elem_t){ MP_OBJ_NEW_QSTR(MP_QSTR_read), MP_OBJ_FROM_PTR(&mp_stream_read_obj) };
     decompio_locals_dict_table[1] = (mp_map_elem_t){ MP_OBJ_NEW_QSTR(MP_QSTR_readinto), MP_OBJ_FROM_PTR(&mp_stream_readinto_obj) };
     decompio_locals_dict_table[2] = (mp_map_elem_t){ MP_OBJ_NEW_QSTR(MP_QSTR_readline), MP_OBJ_FROM_PTR(&mp_stream_unbuffered_readline_obj) };
-    decompio_type.locals_dict = (void*)&decompio_locals_dict;
+    MP_OBJ_TYPE_SET_SLOT(&decompio_type, locals_dict, (void*)&decompio_locals_dict, 1);
 
     mp_store_global(MP_QSTR___name__, MP_OBJ_NEW_QSTR(MP_QSTR_uzlib));
     mp_store_global(MP_QSTR_decompress, MP_OBJ_FROM_PTR(&mod_uzlib_decompress_obj));
diff --git a/extmod/machine_i2c.c b/extmod/machine_i2c.c
index 378bf8fc914b7..bb7ade6fcf574 100644
--- a/extmod/machine_i2c.c
+++ b/extmod/machine_i2c.c
@@ -273,7 +273,7 @@ int mp_machine_i2c_transfer_adaptor(mp_obj_base_t *self, uint16_t addr, size_t n
         }
     }
 
-    mp_machine_i2c_p_t *i2c_p = (mp_machine_i2c_p_t *)self->type->protocol;
+    mp_machine_i2c_p_t *i2c_p = (mp_machine_i2c_p_t *)MP_OBJ_TYPE_GET_SLOT(self->type, protocol);
     int ret = i2c_p->transfer_single(self, addr, len, buf, flags);
 
     if (n > 1) {
@@ -292,14 +292,14 @@ int mp_machine_i2c_transfer_adaptor(mp_obj_base_t *self, uint16_t addr, size_t n
 }
 
 STATIC int mp_machine_i2c_readfrom(mp_obj_base_t *self, uint16_t addr, uint8_t *dest, size_t len, bool stop) {
-    mp_machine_i2c_p_t *i2c_p = (mp_machine_i2c_p_t *)self->type->protocol;
+    mp_machine_i2c_p_t *i2c_p = (mp_machine_i2c_p_t *)MP_OBJ_TYPE_GET_SLOT(self->type, protocol);
     mp_machine_i2c_buf_t buf = {.len = len, .buf = dest};
     unsigned int flags = MP_MACHINE_I2C_FLAG_READ | (stop ? MP_MACHINE_I2C_FLAG_STOP : 0);
     return i2c_p->transfer(self, addr, 1, &buf, flags);
 }
 
 STATIC int mp_machine_i2c_writeto(mp_obj_base_t *self, uint16_t addr, const uint8_t *src, size_t len, bool stop) {
-    mp_machine_i2c_p_t *i2c_p = (mp_machine_i2c_p_t *)self->type->protocol;
+    mp_machine_i2c_p_t *i2c_p = (mp_machine_i2c_p_t *)MP_OBJ_TYPE_GET_SLOT(self->type, protocol);
     mp_machine_i2c_buf_t buf = {.len = len, .buf = (uint8_t *)src};
     unsigned int flags = stop ? MP_MACHINE_I2C_FLAG_STOP : 0;
     return i2c_p->transfer(self, addr, 1, &buf, flags);
@@ -310,7 +310,7 @@ STATIC int mp_machine_i2c_writeto(mp_obj_base_t *self, uint16_t addr, const uint
 
 STATIC mp_obj_t machine_i2c_init(size_t n_args, const mp_obj_t *args, mp_map_t *kw_args) {
     mp_obj_base_t *self = (mp_obj_base_t *)MP_OBJ_TO_PTR(args[0]);
-    mp_machine_i2c_p_t *i2c_p = (mp_machine_i2c_p_t *)self->type->protocol;
+    mp_machine_i2c_p_t *i2c_p = (mp_machine_i2c_p_t *)MP_OBJ_TYPE_GET_SLOT(self->type, protocol);
     if (i2c_p->init == NULL) {
         mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("I2C operation not supported"));
     }
@@ -338,7 +338,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(machine_i2c_scan_obj, machine_i2c_scan);
 
 STATIC mp_obj_t machine_i2c_start(mp_obj_t self_in) {
     mp_obj_base_t *self = (mp_obj_base_t *)MP_OBJ_TO_PTR(self_in);
-    mp_machine_i2c_p_t *i2c_p = (mp_machine_i2c_p_t *)self->type->protocol;
+    mp_machine_i2c_p_t *i2c_p = (mp_machine_i2c_p_t *)MP_OBJ_TYPE_GET_SLOT(self->type, protocol);
     if (i2c_p->start == NULL) {
         mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("I2C operation not supported"));
     }
@@ -352,7 +352,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(machine_i2c_start_obj, machine_i2c_start);
 
 STATIC mp_obj_t machine_i2c_stop(mp_obj_t self_in) {
     mp_obj_base_t *self = (mp_obj_base_t *)MP_OBJ_TO_PTR(self_in);
-    mp_machine_i2c_p_t *i2c_p = (mp_machine_i2c_p_t *)self->type->protocol;
+    mp_machine_i2c_p_t *i2c_p = (mp_machine_i2c_p_t *)MP_OBJ_TYPE_GET_SLOT(self->type, protocol);
     if (i2c_p->stop == NULL) {
         mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("I2C operation not supported"));
     }
@@ -366,7 +366,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(machine_i2c_stop_obj, machine_i2c_stop);
 
 STATIC mp_obj_t machine_i2c_readinto(size_t n_args, const mp_obj_t *args) {
     mp_obj_base_t *self = (mp_obj_base_t *)MP_OBJ_TO_PTR(args[0]);
-    mp_machine_i2c_p_t *i2c_p = (mp_machine_i2c_p_t *)self->type->protocol;
+    mp_machine_i2c_p_t *i2c_p = (mp_machine_i2c_p_t *)MP_OBJ_TYPE_GET_SLOT(self->type, protocol);
     if (i2c_p->read == NULL) {
         mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("I2C operation not supported"));
     }
@@ -390,7 +390,7 @@ MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_i2c_readinto_obj, 2, 3, machine_i2c_
 
 STATIC mp_obj_t machine_i2c_write(mp_obj_t self_in, mp_obj_t buf_in) {
     mp_obj_base_t *self = (mp_obj_base_t *)MP_OBJ_TO_PTR(self_in);
-    mp_machine_i2c_p_t *i2c_p = (mp_machine_i2c_p_t *)self->type->protocol;
+    mp_machine_i2c_p_t *i2c_p = (mp_machine_i2c_p_t *)MP_OBJ_TYPE_GET_SLOT(self->type, protocol);
     if (i2c_p->write == NULL) {
         mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("I2C operation not supported"));
     }
@@ -486,7 +486,7 @@ STATIC mp_obj_t machine_i2c_writevto(size_t n_args, const mp_obj_t *args) {
     }
 
     // Do the I2C transfer
-    mp_machine_i2c_p_t *i2c_p = (mp_machine_i2c_p_t *)self->type->protocol;
+    mp_machine_i2c_p_t *i2c_p = (mp_machine_i2c_p_t *)MP_OBJ_TYPE_GET_SLOT(self->type, protocol);
     int ret = i2c_p->transfer(self, addr, nbufs, bufs, stop ? MP_MACHINE_I2C_FLAG_STOP : 0);
     mp_local_free(bufs);
 
@@ -519,7 +519,7 @@ STATIC int read_mem(mp_obj_t self_in, uint16_t addr, uint32_t memaddr, uint8_t a
 
     #if MICROPY_PY_MACHINE_I2C_TRANSFER_WRITE1
     // The I2C transfer function may support the MP_MACHINE_I2C_FLAG_WRITE1 option
-    mp_machine_i2c_p_t *i2c_p = (mp_machine_i2c_p_t *)self->type->protocol;
+    mp_machine_i2c_p_t *i2c_p = (mp_machine_i2c_p_t *)MP_OBJ_TYPE_GET_SLOT(self->type, protocol);
     if (i2c_p->transfer_supports_write1) {
         // Create partial write and read buffers
         mp_machine_i2c_buf_t bufs[2] = {
@@ -556,7 +556,7 @@ STATIC int write_mem(mp_obj_t self_in, uint16_t addr, uint32_t memaddr, uint8_t
     };
 
     // Do I2C transfer
-    mp_machine_i2c_p_t *i2c_p = (mp_machine_i2c_p_t *)self->type->protocol;
+    mp_machine_i2c_p_t *i2c_p = (mp_machine_i2c_p_t *)MP_OBJ_TYPE_GET_SLOT(self->type, protocol);
     return i2c_p->transfer(self, addr, 2, bufs, MP_MACHINE_I2C_FLAG_STOP);
 }
 
diff --git a/extmod/machine_signal.c b/extmod/machine_signal.c
index f665ffaa494e7..49ee6dfb4abc8 100644
--- a/extmod/machine_signal.c
+++ b/extmod/machine_signal.c
@@ -51,7 +51,7 @@ STATIC mp_obj_t signal_make_new(const mp_obj_type_t *type, size_t n_args, size_t
 
     if (n_args > 0 && mp_obj_is_obj(args[0])) {
         mp_obj_base_t *pin_base = (mp_obj_base_t *)MP_OBJ_TO_PTR(args[0]);
-        pin_p = (mp_pin_p_t *)pin_base->type->protocol;
+        pin_p = (mp_pin_p_t *)MP_OBJ_TYPE_GET_SLOT_OR_NULL(pin_base->type, protocol);
     }
 
     if (pin_p == NULL) {
diff --git a/extmod/machine_spi.c b/extmod/machine_spi.c
index c7fc5877b1b09..54f1964e2193a 100644
--- a/extmod/machine_spi.c
+++ b/extmod/machine_spi.c
@@ -43,7 +43,7 @@
 
 STATIC mp_obj_t machine_spi_init(size_t n_args, const mp_obj_t *args, mp_map_t *kw_args) {
     mp_obj_base_t *s = (mp_obj_base_t *)MP_OBJ_TO_PTR(args[0]);
-    mp_machine_spi_p_t *spi_p = (mp_machine_spi_p_t *)s->type->protocol;
+    mp_machine_spi_p_t *spi_p = (mp_machine_spi_p_t *)MP_OBJ_TYPE_GET_SLOT(s->type, protocol);
     spi_p->init(s, n_args - 1, args + 1, kw_args);
     return mp_const_none;
 }
@@ -51,7 +51,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_KW(machine_spi_init_obj, 1, machine_spi_init);
 
 STATIC mp_obj_t machine_spi_deinit(mp_obj_t self) {
     mp_obj_base_t *s = (mp_obj_base_t *)MP_OBJ_TO_PTR(self);
-    mp_machine_spi_p_t *spi_p = (mp_machine_spi_p_t *)s->type->protocol;
+    mp_machine_spi_p_t *spi_p = (mp_machine_spi_p_t *)MP_OBJ_TYPE_GET_SLOT(s->type, protocol);
     if (spi_p->deinit != NULL) {
         spi_p->deinit(s);
     }
@@ -61,7 +61,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_spi_deinit_obj, machine_spi_deinit);
 
 STATIC void mp_machine_spi_transfer(mp_obj_t self, size_t len, const void *src, void *dest) {
     mp_obj_base_t *s = (mp_obj_base_t *)MP_OBJ_TO_PTR(self);
-    mp_machine_spi_p_t *spi_p = (mp_machine_spi_p_t *)s->type->protocol;
+    mp_machine_spi_p_t *spi_p = (mp_machine_spi_p_t *)MP_OBJ_TYPE_GET_SLOT(s->type, protocol);
     spi_p->transfer(s, len, src, dest);
 }
 
diff --git a/extmod/network_wiznet5k.c b/extmod/network_wiznet5k.c
index 1d7318827c895..82f836f691844 100644
--- a/extmod/network_wiznet5k.c
+++ b/extmod/network_wiznet5k.c
@@ -744,7 +744,7 @@ STATIC mp_obj_t wiznet5k_make_new(const mp_obj_type_t *type, size_t n_args, size
     wiznet5k_obj.base.type = (mp_obj_type_t *)&mod_network_nic_type_wiznet5k;
     wiznet5k_obj.cris_state = 0;
     wiznet5k_obj.spi = spi;
-    wiznet5k_obj.spi_transfer = ((mp_machine_spi_p_t *)spi->type->protocol)->transfer;
+    wiznet5k_obj.spi_transfer = ((mp_machine_spi_p_t *)MP_OBJ_TYPE_GET_SLOT(spi->type, protocol))->transfer;
     wiznet5k_obj.cs = cs;
     wiznet5k_obj.rst = rst;
     #if WIZNET5K_WITH_LWIP_STACK
diff --git a/extmod/vfs.c b/extmod/vfs.c
index 0ef20e9281088..00450e1005595 100644
--- a/extmod/vfs.c
+++ b/extmod/vfs.c
@@ -132,8 +132,9 @@ mp_import_stat_t mp_vfs_import_stat(const char *path) {
     }
 
     // If the mounted object has the VFS protocol, call its import_stat helper
-    const mp_vfs_proto_t *proto = mp_obj_get_type(vfs->obj)->protocol;
-    if (proto != NULL) {
+    const mp_obj_type_t *type = mp_obj_get_type(vfs->obj);
+    if (MP_OBJ_TYPE_HAS_SLOT(type, protocol)) {
+        const mp_vfs_proto_t *proto = MP_OBJ_TYPE_GET_SLOT(type, protocol);
         return proto->import_stat(MP_OBJ_TO_PTR(vfs->obj), path_out);
     }
 
diff --git a/extmod/virtpin.c b/extmod/virtpin.c
index 71a11232d4339..cd0b9f92f830e 100644
--- a/extmod/virtpin.c
+++ b/extmod/virtpin.c
@@ -28,12 +28,12 @@
 
 int mp_virtual_pin_read(mp_obj_t pin) {
     mp_obj_base_t *s = (mp_obj_base_t *)MP_OBJ_TO_PTR(pin);
-    mp_pin_p_t *pin_p = (mp_pin_p_t *)s->type->protocol;
+    mp_pin_p_t *pin_p = (mp_pin_p_t *)MP_OBJ_TYPE_GET_SLOT(s->type, protocol);
     return pin_p->ioctl(pin, MP_PIN_READ, 0, NULL);
 }
 
 void mp_virtual_pin_write(mp_obj_t pin, int value) {
     mp_obj_base_t *s = (mp_obj_base_t *)MP_OBJ_TO_PTR(pin);
-    mp_pin_p_t *pin_p = (mp_pin_p_t *)s->type->protocol;
+    mp_pin_p_t *pin_p = (mp_pin_p_t *)MP_OBJ_TYPE_GET_SLOT(s->type, protocol);
     pin_p->ioctl(pin, MP_PIN_WRITE, value, NULL);
 }
diff --git a/ports/nrf/modules/ubluepy/ubluepy_scan_entry.c b/ports/nrf/modules/ubluepy/ubluepy_scan_entry.c
index 5c74e2e92caf4..89ca65d18c800 100644
--- a/ports/nrf/modules/ubluepy/ubluepy_scan_entry.c
+++ b/ports/nrf/modules/ubluepy/ubluepy_scan_entry.c
@@ -91,7 +91,7 @@ STATIC mp_obj_t scan_entry_get_scan_data(mp_obj_t self_in) {
 
         mp_obj_t description = mp_const_none;
 
-        mp_map_t *constant_map = mp_obj_dict_get_map(ubluepy_constants_ad_types_type.locals_dict);
+        mp_map_t *constant_map = mp_obj_dict_get_map(MP_OBJ_TYPE_GET_SLOT(&ubluepy_constants_ad_types_type, locals_dict));
         mp_map_elem_t *ad_types_table = MP_OBJ_TO_PTR(constant_map->table);
 
         uint16_t num_of_elements = constant_map->used;
diff --git a/ports/rp2/mpbthciport.c b/ports/rp2/mpbthciport.c
index 91c908b164fc8..e37167a974dee 100644
--- a/ports/rp2/mpbthciport.c
+++ b/ports/rp2/mpbthciport.c
@@ -128,7 +128,7 @@ int mp_bluetooth_hci_uart_set_baudrate(uint32_t baudrate) {
 
 int mp_bluetooth_hci_uart_any(void) {
     int errcode = 0;
-    const mp_stream_p_t *proto = (mp_stream_p_t *)machine_uart_type.protocol;
+    const mp_stream_p_t *proto = (mp_stream_p_t *)MP_OBJ_TYPE_GET_SLOT(&machine_uart_type, protocol);
 
     mp_uint_t ret = proto->ioctl(mp_bthci_uart, MP_STREAM_POLL, MP_STREAM_POLL_RD, &errcode);
     if (errcode != 0) {
@@ -142,7 +142,7 @@ int mp_bluetooth_hci_uart_write(const uint8_t *buf, size_t len) {
     debug_printf("mp_bluetooth_hci_uart_write\n");
 
     int errcode = 0;
-    const mp_stream_p_t *proto = (mp_stream_p_t *)machine_uart_type.protocol;
+    const mp_stream_p_t *proto = (mp_stream_p_t *)MP_OBJ_TYPE_GET_SLOT(&machine_uart_type, protocol);
 
     mp_bluetooth_hci_controller_wakeup();
 
@@ -159,7 +159,7 @@ int mp_bluetooth_hci_uart_readchar(void) {
     if (mp_bluetooth_hci_uart_any()) {
         int errcode = 0;
         uint8_t buf = 0;
-        const mp_stream_p_t *proto = (mp_stream_p_t *)machine_uart_type.protocol;
+        const mp_stream_p_t *proto = (mp_stream_p_t *)MP_OBJ_TYPE_GET_SLOT(&machine_uart_type, protocol);
         if (proto->read(mp_bthci_uart, (void *)&buf, 1, &errcode) < 0) {
             error_printf("mp_bluetooth_hci_uart_readchar: failed to read UART %d\n", errcode);
             return -1;
diff --git a/ports/unix/modffi.c b/ports/unix/modffi.c
index 98fd8936b1aa8..04152f1ad41f2 100644
--- a/ports/unix/modffi.c
+++ b/ports/unix/modffi.c
@@ -506,10 +506,10 @@ STATIC mp_obj_t ffifunc_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const
         } else if (mp_obj_is_str(a)) {
             const char *s = mp_obj_str_get_str(a);
             values[i].ffi = (ffi_arg)(intptr_t)s;
-        } else if (((mp_obj_base_t *)MP_OBJ_TO_PTR(a))->type->buffer != NULL) {
+        } else if (MP_OBJ_TYPE_HAS_SLOT(((mp_obj_base_t *)MP_OBJ_TO_PTR(a))->type, buffer)) {
             mp_obj_base_t *o = (mp_obj_base_t *)MP_OBJ_TO_PTR(a);
             mp_buffer_info_t bufinfo;
-            int ret = o->type->buffer(MP_OBJ_FROM_PTR(o), &bufinfo, MP_BUFFER_READ); // TODO: MP_BUFFER_READ?
+            int ret = MP_OBJ_TYPE_GET_SLOT(o->type, buffer)(MP_OBJ_FROM_PTR(o), &bufinfo, MP_BUFFER_READ); // TODO: MP_BUFFER_READ?
             if (ret != 0) {
                 goto error;
             }
diff --git a/py/builtinhelp.c b/py/builtinhelp.c
index 94f8beaff23c8..93d94a389d269 100644
--- a/py/builtinhelp.c
+++ b/py/builtinhelp.c
@@ -143,8 +143,8 @@ STATIC void mp_help_print_obj(const mp_obj_t obj) {
         if (type == &mp_type_type) {
             type = MP_OBJ_TO_PTR(obj);
         }
-        if (type->locals_dict != NULL) {
-            map = &type->locals_dict->map;
+        if (MP_OBJ_TYPE_HAS_SLOT(type, locals_dict)) {
+            map = &MP_OBJ_TYPE_GET_SLOT(type, locals_dict)->map;
         }
     }
     if (map != NULL) {
diff --git a/py/dynruntime.h b/py/dynruntime.h
index fb748eb93fe78..be573bde2ad4a 100644
--- a/py/dynruntime.h
+++ b/py/dynruntime.h
@@ -150,7 +150,7 @@ static inline mp_obj_t mp_obj_cast_to_native_base_dyn(mp_obj_t self_in, mp_const
 
     if (MP_OBJ_FROM_PTR(self_type) == native_type) {
         return self_in;
-    } else if (self_type->parent != native_type) {
+    } else if (MP_OBJ_TYPE_GET_SLOT_OR_NULL(self_type, parent) != native_type) {
         // The self_in object is not a direct descendant of native_type, so fail the cast.
         // This is a very simple version of mp_obj_is_subclass_fast that could be improved.
         return MP_OBJ_NULL;
diff --git a/py/modbuiltins.c b/py/modbuiltins.c
index f74db95cf5a54..152323b5ca963 100644
--- a/py/modbuiltins.c
+++ b/py/modbuiltins.c
@@ -455,7 +455,7 @@ STATIC mp_obj_t mp_builtin___repl_print__(mp_obj_t o) {
         #if MICROPY_CAN_OVERRIDE_BUILTINS
         // Set "_" special variable
         mp_obj_t dest[2] = {MP_OBJ_SENTINEL, o};
-        mp_type_module.attr(MP_OBJ_FROM_PTR(&mp_module_builtins), MP_QSTR__, dest);
+        MP_OBJ_TYPE_GET_SLOT(&mp_type_module, attr)(MP_OBJ_FROM_PTR(&mp_module_builtins), MP_QSTR__, dest);
         #endif
     }
     return mp_const_none;
diff --git a/py/obj.c b/py/obj.c
index eeadd3eedddae..359c73b9c2120 100644
--- a/py/obj.c
+++ b/py/obj.c
@@ -116,8 +116,8 @@ void mp_obj_print_helper(const mp_print_t *print, mp_obj_t o_in, mp_print_kind_t
     }
     #endif
     const mp_obj_type_t *type = mp_obj_get_type(o_in);
-    if (type->print != NULL) {
-        type->print((mp_print_t *)print, o_in, kind);
+    if (MP_OBJ_TYPE_HAS_SLOT(type, print)) {
+        MP_OBJ_TYPE_GET_SLOT(type, print)((mp_print_t *)print, o_in, kind);
     } else {
         mp_printf(print, "<%q>", type->name);
     }
@@ -170,8 +170,8 @@ bool mp_obj_is_true(mp_obj_t arg) {
         }
     } else {
         const mp_obj_type_t *type = mp_obj_get_type(arg);
-        if (type->unary_op != NULL) {
-            mp_obj_t result = type->unary_op(MP_UNARY_OP_BOOL, arg);
+        if (MP_OBJ_TYPE_HAS_SLOT(type, unary_op)) {
+            mp_obj_t result = MP_OBJ_TYPE_GET_SLOT(type, unary_op)(MP_UNARY_OP_BOOL, arg);
             if (result != MP_OBJ_NULL) {
                 return result == mp_const_true;
             }
@@ -189,7 +189,7 @@ bool mp_obj_is_true(mp_obj_t arg) {
 }
 
 bool mp_obj_is_callable(mp_obj_t o_in) {
-    const mp_call_fun_t call = mp_obj_get_type(o_in)->call;
+    const mp_call_fun_t call = MP_OBJ_TYPE_GET_SLOT_OR_NULL(mp_obj_get_type(o_in), call);
     if (call != mp_obj_instance_call) {
         return call != NULL;
     }
@@ -256,19 +256,19 @@ mp_obj_t mp_obj_equal_not_equal(mp_binary_op_t op, mp_obj_t o1, mp_obj_t o2) {
         const mp_obj_type_t *type = mp_obj_get_type(o1);
         // If a full equality test is not needed and the other object is a different
         // type then we don't need to bother trying the comparison.
-        if (type->binary_op != NULL &&
+        if (MP_OBJ_TYPE_HAS_SLOT(type, binary_op) &&
             ((type->flags & MP_TYPE_FLAG_EQ_CHECKS_OTHER_TYPE) || mp_obj_get_type(o2) == type)) {
             // CPython is asymmetric: it will try __eq__ if there's no __ne__ but not the
             // other way around.  If the class doesn't need a full test we can skip __ne__.
             if (op == MP_BINARY_OP_NOT_EQUAL && (type->flags & MP_TYPE_FLAG_EQ_HAS_NEQ_TEST)) {
-                mp_obj_t r = type->binary_op(MP_BINARY_OP_NOT_EQUAL, o1, o2);
+                mp_obj_t r = MP_OBJ_TYPE_GET_SLOT(type, binary_op)(MP_BINARY_OP_NOT_EQUAL, o1, o2);
                 if (r != MP_OBJ_NULL) {
                     return r;
                 }
             }
 
             // Try calling __eq__.
-            mp_obj_t r = type->binary_op(MP_BINARY_OP_EQUAL, o1, o2);
+            mp_obj_t r = MP_OBJ_TYPE_GET_SLOT(type, binary_op)(MP_BINARY_OP_EQUAL, o1, o2);
             if (r != MP_OBJ_NULL) {
                 if (op == MP_BINARY_OP_EQUAL) {
                     return r;
@@ -524,8 +524,8 @@ mp_obj_t mp_obj_len_maybe(mp_obj_t o_in) {
         return MP_OBJ_NEW_SMALL_INT(l);
     } else {
         const mp_obj_type_t *type = mp_obj_get_type(o_in);
-        if (type->unary_op != NULL) {
-            return type->unary_op(MP_UNARY_OP_LEN, o_in);
+        if (MP_OBJ_TYPE_HAS_SLOT(type, unary_op)) {
+            return MP_OBJ_TYPE_GET_SLOT(type, unary_op)(MP_UNARY_OP_LEN, o_in);
         } else {
             return MP_OBJ_NULL;
         }
@@ -534,8 +534,8 @@ mp_obj_t mp_obj_len_maybe(mp_obj_t o_in) {
 
 mp_obj_t mp_obj_subscr(mp_obj_t base, mp_obj_t index, mp_obj_t value) {
     const mp_obj_type_t *type = mp_obj_get_type(base);
-    if (type->subscr != NULL) {
-        mp_obj_t ret = type->subscr(base, index, value);
+    if (MP_OBJ_TYPE_HAS_SLOT(type, subscr)) {
+        mp_obj_t ret = MP_OBJ_TYPE_GET_SLOT(type, subscr)(base, index, value);
         if (ret != MP_OBJ_NULL) {
             return ret;
         }
@@ -579,10 +579,10 @@ mp_obj_t mp_identity_getiter(mp_obj_t self, mp_obj_iter_buf_t *iter_buf) {
 
 bool mp_get_buffer(mp_obj_t obj, mp_buffer_info_t *bufinfo, mp_uint_t flags) {
     const mp_obj_type_t *type = mp_obj_get_type(obj);
-    if (type->buffer == NULL) {
+    if (!MP_OBJ_TYPE_HAS_SLOT(type, buffer)) {
         return false;
     }
-    int ret = type->buffer(obj, bufinfo, flags);
+    int ret = MP_OBJ_TYPE_GET_SLOT(type, buffer)(obj, bufinfo, flags);
     if (ret != 0) {
         return false;
     }
diff --git a/py/obj.h b/py/obj.h
index 9c0f41dc3d737..37e6f0052428c 100644
--- a/py/obj.h
+++ b/py/obj.h
@@ -660,6 +660,16 @@ typedef mp_obj_type_t mp_obj_full_type_t;
 #define MP_DEFINE_CONST_OBJ_TYPE_NARGS_11(_struct_type, _typename, _name, _flags, _make_new, f1, v1, f2, v2, f3, v3, f4, v4, f5, v5, f6, v6, f7, v7, f8, v8, f9, v9, f10, v10, f11, v11) const _struct_type _typename = { .base = { &mp_type_type }, .name = _name, .flags = _flags, .make_new = _make_new, .f1 = v1, .f2 = v2, .f3 = v3, .f4 = v4, .f5 = v5, .f6 = v6, .f7 = v7, .f8 = v8, .f9 = v9, .f10 = v10, .f11 = v11 }
 #define MP_DEFINE_CONST_OBJ_TYPE_NARGS_12(_struct_type, _typename, _name, _flags, _make_new, f1, v1, f2, v2, f3, v3, f4, v4, f5, v5, f6, v6, f7, v7, f8, v8, f9, v9, f10, v10, f11, v11, f12, v12) const _struct_type _typename = { .base = { &mp_type_type }, .name = _name, .flags = _flags, .make_new = _make_new, .f1 = v1, .f2 = v2, .f3 = v3, .f4 = v4, .f5 = v5, .f6 = v6, .f7 = v7, .f8 = v8, .f9 = v9, .f10 = v10, .f11 = v11, .f12 = v12 }
 
+// Always safe, checks if the type can and does have this slot.
+#define MP_OBJ_TYPE_HAS_SLOT(t, f) ((t)->f)
+// Requires you know that this type can have this slot.
+#define MP_OBJ_TYPE_GET_SLOT(t, f) ((t)->f)
+// Always safe, returns NULL if the type cannot have this slot.
+#define MP_OBJ_TYPE_GET_SLOT_OR_NULL(t, f) ((t)->f)
+#define MP_OBJ_TYPE_SET_SLOT(t, f, v, n) ((t)->f = v)
+#define MP_OBJ_TYPE_OFFSETOF_SLOT(f) (offsetof(mp_obj_type_t, f))
+#define MP_OBJ_TYPE_HAS_SLOT_BY_OFFSET(t, offset) (*(void **)((char *)(t) + (offset)) != NULL)
+
 // Workaround for https://docs.microsoft.com/en-us/cpp/preprocessor/preprocessor-experimental-overview?view=msvc-160#macro-arguments-are-unpacked
 #define MP_DEFINE_CONST_OBJ_TYPE_EXPAND(x) x
 
@@ -822,7 +832,7 @@ void *mp_obj_malloc_helper(size_t num_bytes, const mp_obj_type_t *type);
 #endif
 #define mp_obj_is_int(o) (mp_obj_is_small_int(o) || mp_obj_is_exact_type(o, &mp_type_int))
 #define mp_obj_is_str(o) (mp_obj_is_qstr(o) || mp_obj_is_exact_type(o, &mp_type_str))
-#define mp_obj_is_str_or_bytes(o) (mp_obj_is_qstr(o) || (mp_obj_is_obj(o) && ((mp_obj_base_t *)MP_OBJ_TO_PTR(o))->type->binary_op == mp_obj_str_binary_op))
+#define mp_obj_is_str_or_bytes(o) (mp_obj_is_qstr(o) || (mp_obj_is_obj(o) && MP_OBJ_TYPE_GET_SLOT_OR_NULL(((mp_obj_base_t *)MP_OBJ_TO_PTR(o))->type, binary_op) == mp_obj_str_binary_op))
 #define mp_obj_is_dict_or_ordereddict(o) (mp_obj_is_obj(o) && ((mp_obj_base_t *)MP_OBJ_TO_PTR(o))->type->make_new == mp_obj_dict_make_new)
 #define mp_obj_is_fun(o) (mp_obj_is_obj(o) && (((mp_obj_base_t *)MP_OBJ_TO_PTR(o))->type->name == MP_QSTR_function))
 
diff --git a/py/objarray.c b/py/objarray.c
index 1cb163c4b97aa..762a4105c5f56 100644
--- a/py/objarray.c
+++ b/py/objarray.c
@@ -443,7 +443,7 @@ STATIC mp_obj_t array_subscr(mp_obj_t self_in, mp_obj_t index_in, mp_obj_t value
                 size_t src_len;
                 void *src_items;
                 size_t item_sz = mp_binary_get_size('@', o->typecode & TYPECODE_MASK, NULL);
-                if (mp_obj_is_obj(value) && ((mp_obj_base_t *)MP_OBJ_TO_PTR(value))->type->subscr == array_subscr) {
+                if (mp_obj_is_obj(value) && MP_OBJ_TYPE_GET_SLOT_OR_NULL(((mp_obj_base_t *)MP_OBJ_TO_PTR(value))->type, subscr) == array_subscr) {
                     // value is array, bytearray or memoryview
                     mp_obj_array_t *src_slice = MP_OBJ_TO_PTR(value);
                     if (item_sz != mp_binary_get_size('@', src_slice->typecode & TYPECODE_MASK, NULL)) {
diff --git a/py/objnamedtuple.c b/py/objnamedtuple.c
index b2129935067c1..cc55aec0b97c0 100644
--- a/py/objnamedtuple.c
+++ b/py/objnamedtuple.c
@@ -157,14 +157,14 @@ STATIC mp_obj_t mp_obj_new_namedtuple_type(qstr name, size_t n_fields, mp_obj_t
     o->base.base.type = &mp_type_type;
     o->base.flags = MP_TYPE_FLAG_EQ_CHECKS_OTHER_TYPE; // can match tuple
     o->base.name = name;
-    o->base.print = namedtuple_print;
     o->base.make_new = namedtuple_make_new;
-    o->base.unary_op = mp_obj_tuple_unary_op;
-    o->base.binary_op = mp_obj_tuple_binary_op;
-    o->base.attr = namedtuple_attr;
-    o->base.subscr = mp_obj_tuple_subscr;
-    o->base.getiter = mp_obj_tuple_getiter;
-    o->base.parent = &mp_type_tuple;
+    MP_OBJ_TYPE_SET_SLOT(&o->base, print, namedtuple_print, 0);
+    MP_OBJ_TYPE_SET_SLOT(&o->base, unary_op, mp_obj_tuple_unary_op, 1);
+    MP_OBJ_TYPE_SET_SLOT(&o->base, binary_op, mp_obj_tuple_binary_op, 2);
+    MP_OBJ_TYPE_SET_SLOT(&o->base, attr, namedtuple_attr, 3);
+    MP_OBJ_TYPE_SET_SLOT(&o->base, subscr, mp_obj_tuple_subscr, 4);
+    MP_OBJ_TYPE_SET_SLOT(&o->base, getiter, mp_obj_tuple_getiter, 5);
+    MP_OBJ_TYPE_SET_SLOT(&o->base, parent, &mp_type_tuple, 6);
     return MP_OBJ_FROM_PTR(o);
 }
 
diff --git a/py/objtuple.c b/py/objtuple.c
index a684b13e6f254..01b2fa14885ac 100644
--- a/py/objtuple.c
+++ b/py/objtuple.c
@@ -32,7 +32,7 @@
 #include "py/runtime.h"
 
 // type check is done on getiter method to allow tuple, namedtuple, attrtuple
-#define mp_obj_is_tuple_compatible(o) (mp_obj_get_type(o)->getiter == mp_obj_tuple_getiter)
+#define mp_obj_is_tuple_compatible(o) (MP_OBJ_TYPE_GET_SLOT_OR_NULL(mp_obj_get_type(o), getiter) == mp_obj_tuple_getiter)
 
 /******************************************************************************/
 /* tuple                                                                      */
@@ -111,7 +111,7 @@ STATIC mp_obj_t tuple_cmp_helper(mp_uint_t op, mp_obj_t self_in, mp_obj_t anothe
     mp_check_self(mp_obj_is_tuple_compatible(self_in));
     const mp_obj_type_t *another_type = mp_obj_get_type(another_in);
     mp_obj_tuple_t *self = MP_OBJ_TO_PTR(self_in);
-    if (another_type->getiter != mp_obj_tuple_getiter) {
+    if (MP_OBJ_TYPE_GET_SLOT_OR_NULL(another_type, getiter) != mp_obj_tuple_getiter) {
         // Slow path for user subclasses
         another_in = mp_obj_cast_to_native_base(another_in, MP_OBJ_FROM_PTR(&mp_type_tuple));
         if (another_in == MP_OBJ_NULL) {
diff --git a/py/objtype.c b/py/objtype.c
index cc5a5e580254d..968d6eb3ac32f 100644
--- a/py/objtype.c
+++ b/py/objtype.c
@@ -59,13 +59,13 @@ STATIC int instance_count_native_bases(const mp_obj_type_t *type, const mp_obj_t
             // Native types don't have parents (at least not from our perspective) so end.
             *last_native_base = type;
             return count + 1;
-        } else if (type->parent == NULL) {
+        } else if (!MP_OBJ_TYPE_HAS_SLOT(type, parent)) {
             // No parents so end search here.
             return count;
         #if MICROPY_MULTIPLE_INHERITANCE
-        } else if (((mp_obj_base_t *)type->parent)->type == &mp_type_tuple) {
+        } else if (((mp_obj_base_t *)MP_OBJ_TYPE_GET_SLOT(type, parent))->type == &mp_type_tuple) {
             // Multiple parents, search through them all recursively.
-            const mp_obj_tuple_t *parent_tuple = type->parent;
+            const mp_obj_tuple_t *parent_tuple = MP_OBJ_TYPE_GET_SLOT(type, parent);
             const mp_obj_t *item = parent_tuple->items;
             const mp_obj_t *top = item + parent_tuple->len;
             for (; item < top; ++item) {
@@ -77,7 +77,7 @@ STATIC int instance_count_native_bases(const mp_obj_type_t *type, const mp_obj_t
         #endif
         } else {
             // A single parent, use iteration to continue the search.
-            type = type->parent;
+            type = MP_OBJ_TYPE_GET_SLOT(type, parent);
         }
     }
 }
@@ -118,7 +118,7 @@ mp_obj_instance_t *mp_obj_new_instance(const mp_obj_type_t *class, const mp_obj_
 // will keep lookup->dest[0]'s value (should be MP_OBJ_NULL on invocation) if attribute
 // is not found
 // will set lookup->dest[0] to MP_OBJ_SENTINEL if special method was found in a native
-// type base via slot id (as specified by lookup->meth_offset). As there can be only one
+// type base via slot id (as specified by lookup->slot_offset). As there can be only one
 // native base, it's known that it applies to instance->subobj[0]. In most cases, we also
 // don't need to know which type it was - because instance->subobj[0] is of that type.
 // The only exception is when object is not yet constructed, then we need to know base
@@ -127,7 +127,7 @@ mp_obj_instance_t *mp_obj_new_instance(const mp_obj_type_t *class, const mp_obj_
 struct class_lookup_data {
     mp_obj_instance_t *obj;
     qstr attr;
-    size_t meth_offset;
+    size_t slot_offset;
     mp_obj_t *dest;
     bool is_type;
 };
@@ -141,19 +141,19 @@ STATIC void mp_obj_class_lookup(struct class_lookup_data *lookup, const mp_obj_t
         // This avoids extra method_name => slot lookup. On the other hand,
         // this should not be applied to class types, as will result in extra
         // lookup either.
-        if (lookup->meth_offset != 0 && mp_obj_is_native_type(type)) {
-            if (*(void **)((char *)type + lookup->meth_offset) != NULL) {
+        if (lookup->slot_offset != 0 && mp_obj_is_native_type(type)) {
+            if (MP_OBJ_TYPE_HAS_SLOT_BY_OFFSET(type, lookup->slot_offset)) {
                 DEBUG_printf("mp_obj_class_lookup: Matched special meth slot (off=%d) for %s\n",
-                    lookup->meth_offset, qstr_str(lookup->attr));
+                    lookup->slot_offset, qstr_str(lookup->attr));
                 lookup->dest[0] = MP_OBJ_SENTINEL;
                 return;
             }
         }
 
-        if (type->locals_dict != NULL) {
+        if (MP_OBJ_TYPE_HAS_SLOT(type, locals_dict)) {
             // search locals_dict (the set of methods/attributes)
-            assert(mp_obj_is_dict_or_ordereddict(MP_OBJ_FROM_PTR(type->locals_dict))); // MicroPython restriction, for now
-            mp_map_t *locals_map = &type->locals_dict->map;
+            assert(mp_obj_is_dict_or_ordereddict(MP_OBJ_FROM_PTR(MP_OBJ_TYPE_GET_SLOT(type, locals_dict)))); // MicroPython restriction, for now
+            mp_map_t *locals_map = &MP_OBJ_TYPE_GET_SLOT(type, locals_dict)->map;
             mp_map_elem_t *elem = mp_map_lookup(locals_map, MP_OBJ_NEW_QSTR(lookup->attr), MP_MAP_LOOKUP);
             if (elem != NULL) {
                 if (lookup->is_type) {
@@ -197,12 +197,12 @@ STATIC void mp_obj_class_lookup(struct class_lookup_data *lookup, const mp_obj_t
 
         // attribute not found, keep searching base classes
 
-        if (type->parent == NULL) {
+        if (!MP_OBJ_TYPE_HAS_SLOT(type, parent)) {
             DEBUG_printf("mp_obj_class_lookup: No more parents\n");
             return;
         #if MICROPY_MULTIPLE_INHERITANCE
-        } else if (((mp_obj_base_t *)type->parent)->type == &mp_type_tuple) {
-            const mp_obj_tuple_t *parent_tuple = type->parent;
+        } else if (((mp_obj_base_t *)MP_OBJ_TYPE_GET_SLOT(type, parent))->type == &mp_type_tuple) {
+            const mp_obj_tuple_t *parent_tuple = MP_OBJ_TYPE_GET_SLOT(type, parent);
             const mp_obj_t *item = parent_tuple->items;
             const mp_obj_t *top = item + parent_tuple->len - 1;
             for (; item < top; ++item) {
@@ -223,7 +223,7 @@ STATIC void mp_obj_class_lookup(struct class_lookup_data *lookup, const mp_obj_t
             type = (mp_obj_type_t *)MP_OBJ_TO_PTR(*item);
         #endif
         } else {
-            type = type->parent;
+            type = MP_OBJ_TYPE_GET_SLOT(type, parent);
         }
         if (type == &mp_type_object) {
             // Not a "real" type
@@ -239,7 +239,7 @@ STATIC void instance_print(const mp_print_t *print, mp_obj_t self_in, mp_print_k
     struct class_lookup_data lookup = {
         .obj = self,
         .attr = meth,
-        .meth_offset = offsetof(mp_obj_type_t, print),
+        .slot_offset = MP_OBJ_TYPE_OFFSETOF_SLOT(print),
         .dest = member,
         .is_type = false,
     };
@@ -247,7 +247,7 @@ STATIC void instance_print(const mp_print_t *print, mp_obj_t self_in, mp_print_k
     if (member[0] == MP_OBJ_NULL && kind == PRINT_STR) {
         // If there's no __str__, fall back to __repr__
         lookup.attr = MP_QSTR___repr__;
-        lookup.meth_offset = 0;
+        lookup.slot_offset = 0;
         mp_obj_class_lookup(&lookup, self->base.type);
     }
 
@@ -282,7 +282,7 @@ mp_obj_t mp_obj_instance_make_new(const mp_obj_type_t *self, size_t n_args, size
     struct class_lookup_data lookup = {
         .obj = NULL,
         .attr = MP_QSTR___new__,
-        .meth_offset = offsetof(mp_obj_type_t, make_new),
+        .slot_offset = offsetof(mp_obj_type_t, make_new),
         .dest = init_fn,
         .is_type = false,
     };
@@ -332,7 +332,7 @@ mp_obj_t mp_obj_instance_make_new(const mp_obj_type_t *self, size_t n_args, size
     init_fn[0] = init_fn[1] = MP_OBJ_NULL;
     lookup.obj = o;
     lookup.attr = MP_QSTR___init__;
-    lookup.meth_offset = 0;
+    lookup.slot_offset = 0;
     mp_obj_class_lookup(&lookup, self);
     if (init_fn[0] != MP_OBJ_NULL) {
         mp_obj_t init_ret;
@@ -414,7 +414,7 @@ STATIC mp_obj_t instance_unary_op(mp_unary_op_t op, mp_obj_t self_in) {
     struct class_lookup_data lookup = {
         .obj = self,
         .attr = op_name,
-        .meth_offset = offsetof(mp_obj_type_t, unary_op),
+        .slot_offset = MP_OBJ_TYPE_OFFSETOF_SLOT(unary_op),
         .dest = member,
         .is_type = false,
     };
@@ -542,7 +542,7 @@ retry:;
     struct class_lookup_data lookup = {
         .obj = lhs,
         .attr = op_name,
-        .meth_offset = offsetof(mp_obj_type_t, binary_op),
+        .slot_offset = MP_OBJ_TYPE_OFFSETOF_SLOT(binary_op),
         .dest = dest,
         .is_type = false,
     };
@@ -608,7 +608,7 @@ STATIC void mp_obj_instance_load_attr(mp_obj_t self_in, qstr attr, mp_obj_t *des
     struct class_lookup_data lookup = {
         .obj = self,
         .attr = attr,
-        .meth_offset = 0,
+        .slot_offset = 0,
         .dest = dest,
         .is_type = false,
     };
@@ -693,7 +693,7 @@ STATIC bool mp_obj_instance_store_attr(mp_obj_t self_in, qstr attr, mp_obj_t val
     struct class_lookup_data lookup = {
         .obj = self,
         .attr = attr,
-        .meth_offset = 0,
+        .slot_offset = 0,
         .dest = member,
         .is_type = false,
     };
@@ -815,7 +815,7 @@ STATIC mp_obj_t instance_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value
     mp_obj_t member[4] = {MP_OBJ_NULL, MP_OBJ_NULL, index, value};
     struct class_lookup_data lookup = {
         .obj = self,
-        .meth_offset = offsetof(mp_obj_type_t, subscr),
+        .slot_offset = MP_OBJ_TYPE_OFFSETOF_SLOT(subscr),
         .dest = member,
         .is_type = false,
     };
@@ -850,7 +850,7 @@ STATIC mp_obj_t mp_obj_instance_get_call(mp_obj_t self_in, mp_obj_t *member) {
     struct class_lookup_data lookup = {
         .obj = self,
         .attr = MP_QSTR___call__,
-        .meth_offset = offsetof(mp_obj_type_t, call),
+        .slot_offset = MP_OBJ_TYPE_OFFSETOF_SLOT(call),
         .dest = member,
         .is_type = false,
     };
@@ -889,7 +889,7 @@ mp_obj_t mp_obj_instance_getiter(mp_obj_t self_in, mp_obj_iter_buf_t *iter_buf)
     struct class_lookup_data lookup = {
         .obj = self,
         .attr = MP_QSTR___iter__,
-        .meth_offset = offsetof(mp_obj_type_t, getiter),
+        .slot_offset = MP_OBJ_TYPE_OFFSETOF_SLOT(getiter),
         .dest = member,
         .is_type = false,
     };
@@ -901,7 +901,7 @@ mp_obj_t mp_obj_instance_getiter(mp_obj_t self_in, mp_obj_iter_buf_t *iter_buf)
         if (iter_buf == NULL) {
             iter_buf = m_new_obj(mp_obj_iter_buf_t);
         }
-        return type->getiter(self->subobj[0], iter_buf);
+        return MP_OBJ_TYPE_GET_SLOT(type, getiter)(self->subobj[0], iter_buf);
     } else {
         return mp_call_method_n_kw(0, 0, member);
     }
@@ -913,14 +913,14 @@ STATIC mp_int_t instance_get_buffer(mp_obj_t self_in, mp_buffer_info_t *bufinfo,
     struct class_lookup_data lookup = {
         .obj = self,
         .attr = MP_QSTR_, // don't actually look for a method
-        .meth_offset = offsetof(mp_obj_type_t, buffer),
+        .slot_offset = MP_OBJ_TYPE_OFFSETOF_SLOT(buffer),
         .dest = member,
         .is_type = false,
     };
     mp_obj_class_lookup(&lookup, self->base.type);
     if (member[0] == MP_OBJ_SENTINEL) {
         const mp_obj_type_t *type = mp_obj_get_type(self->subobj[0]);
-        return type->buffer(self->subobj[0], bufinfo, flags);
+        return MP_OBJ_TYPE_GET_SLOT(type, buffer)(self->subobj[0], bufinfo, flags);
     } else {
         return 1; // object does not support buffer protocol
     }
@@ -1021,7 +1021,7 @@ STATIC void type_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
         if (attr == MP_QSTR___dict__) {
             // Returns a read-only dict of the class attributes.
             // If the internal locals is not fixed, a copy will be created.
-            const mp_obj_dict_t *dict = self->locals_dict;
+            const mp_obj_dict_t *dict = MP_OBJ_TYPE_GET_SLOT_OR_NULL(self, locals_dict);
             if (!dict) {
                 dict = &mp_const_empty_dict_obj;
             }
@@ -1040,7 +1040,7 @@ STATIC void type_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
                 dest[0] = mp_const_empty_tuple;
                 return;
             }
-            mp_obj_t parent_obj = self->parent ? MP_OBJ_FROM_PTR(self->parent) : MP_OBJ_FROM_PTR(&mp_type_object);
+            mp_obj_t parent_obj = MP_OBJ_TYPE_HAS_SLOT(self, parent) ? MP_OBJ_FROM_PTR(MP_OBJ_TYPE_GET_SLOT(self, parent)) : MP_OBJ_FROM_PTR(&mp_type_object);
             #if MICROPY_MULTIPLE_INHERITANCE
             if (mp_obj_is_type(parent_obj, &mp_type_tuple)) {
                 dest[0] = parent_obj;
@@ -1054,7 +1054,7 @@ STATIC void type_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
         struct class_lookup_data lookup = {
             .obj = (mp_obj_instance_t *)self,
             .attr = attr,
-            .meth_offset = 0,
+            .slot_offset = 0,
             .dest = dest,
             .is_type = true,
         };
@@ -1062,9 +1062,9 @@ STATIC void type_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
     } else {
         // delete/store attribute
 
-        if (self->locals_dict != NULL) {
-            assert(mp_obj_is_dict_or_ordereddict(MP_OBJ_FROM_PTR(self->locals_dict))); // MicroPython restriction, for now
-            mp_map_t *locals_map = &self->locals_dict->map;
+        if (MP_OBJ_TYPE_HAS_SLOT(self, locals_dict)) {
+            assert(mp_obj_is_dict_or_ordereddict(MP_OBJ_FROM_PTR(MP_OBJ_TYPE_GET_SLOT(self, locals_dict)))); // MicroPython restriction, for now
+            mp_map_t *locals_map = &MP_OBJ_TYPE_GET_SLOT(self, locals_dict)->map;
             if (locals_map->is_fixed) {
                 // can't apply delete/store to a fixed map
                 return;
@@ -1155,43 +1155,44 @@ mp_obj_t mp_obj_new_type(qstr name, mp_obj_t bases_tuple, mp_obj_t locals_dict)
     o->base.type = &mp_type_type;
     o->flags = base_flags;
     o->name = name;
-    o->print = instance_print;
     o->make_new = mp_obj_instance_make_new;
-    o->call = mp_obj_instance_call;
-    o->unary_op = instance_unary_op;
-    o->binary_op = instance_binary_op;
-    o->attr = mp_obj_instance_attr;
-    o->subscr = instance_subscr;
-    o->getiter = mp_obj_instance_getiter;
-    // o->iternext = ; not implemented
-    o->buffer = instance_get_buffer;
+    MP_OBJ_TYPE_SET_SLOT(o, print, instance_print, 0);
+    MP_OBJ_TYPE_SET_SLOT(o, call, mp_obj_instance_call, 1);
+    MP_OBJ_TYPE_SET_SLOT(o, unary_op, instance_unary_op, 2);
+    MP_OBJ_TYPE_SET_SLOT(o, binary_op, instance_binary_op, 3);
+    MP_OBJ_TYPE_SET_SLOT(o, attr, mp_obj_instance_attr, 4);
+    MP_OBJ_TYPE_SET_SLOT(o, subscr, instance_subscr, 5);
+    MP_OBJ_TYPE_SET_SLOT(o, getiter, mp_obj_instance_getiter, 6);
+    // MP_OBJ_TYPE_SET_SLOT(o, iternext, not implemented)
+    MP_OBJ_TYPE_SET_SLOT(o, buffer, instance_get_buffer, 7);
 
     if (bases_len > 0) {
         // Inherit protocol from a base class. This allows to define an
         // abstract base class which would translate C-level protocol to
         // Python method calls, and any subclass inheriting from it will
         // support this feature.
-        o->protocol = ((mp_obj_type_t *)MP_OBJ_TO_PTR(bases_items[0]))->protocol;
+        MP_OBJ_TYPE_SET_SLOT(o, protocol, MP_OBJ_TYPE_GET_SLOT_OR_NULL(((mp_obj_type_t *)MP_OBJ_TO_PTR(bases_items[0])), protocol), 8);
 
         if (bases_len >= 2) {
             #if MICROPY_MULTIPLE_INHERITANCE
-            o->parent = MP_OBJ_TO_PTR(bases_tuple);
+            MP_OBJ_TYPE_SET_SLOT(o, parent, MP_OBJ_TO_PTR(bases_tuple), 9);
             #else
             mp_raise_NotImplementedError(MP_ERROR_TEXT("multiple inheritance not supported"));
             #endif
         } else {
-            o->parent = MP_OBJ_TO_PTR(bases_items[0]);
+            MP_OBJ_TYPE_SET_SLOT(o, parent, MP_OBJ_TO_PTR(bases_items[0]), 9);
         }
     }
 
-    o->locals_dict = MP_OBJ_TO_PTR(locals_dict);
+    mp_obj_dict_t *locals_ptr = MP_OBJ_TO_PTR(locals_dict);
+    MP_OBJ_TYPE_SET_SLOT(o, locals_dict, locals_ptr, 10);
 
     #if ENABLE_SPECIAL_ACCESSORS
     // Check if the class has any special accessor methods
     if (!(o->flags & MP_TYPE_FLAG_HAS_SPECIAL_ACCESSORS)) {
-        for (size_t i = 0; i < o->locals_dict->map.alloc; i++) {
-            if (mp_map_slot_is_filled(&o->locals_dict->map, i)) {
-                const mp_map_elem_t *elem = &o->locals_dict->map.table[i];
+        for (size_t i = 0; i < locals_ptr->map.alloc; i++) {
+            if (mp_map_slot_is_filled(&locals_ptr->map, i)) {
+                const mp_map_elem_t *elem = &locals_ptr->map.table[i];
                 if (check_for_special_accessors(elem->key, elem->value)) {
                     o->flags |= MP_TYPE_FLAG_HAS_SPECIAL_ACCESSORS;
                     break;
@@ -1207,7 +1208,7 @@ mp_obj_t mp_obj_new_type(qstr name, mp_obj_t bases_tuple, mp_obj_t locals_dict)
         mp_raise_TypeError(MP_ERROR_TEXT("multiple bases have instance lay-out conflict"));
     }
 
-    mp_map_t *locals_map = &o->locals_dict->map;
+    mp_map_t *locals_map = &MP_OBJ_TYPE_GET_SLOT(o, locals_dict)->map;
     mp_map_elem_t *elem = mp_map_lookup(locals_map, MP_OBJ_NEW_QSTR(MP_QSTR___new__), MP_MAP_LOOKUP);
     if (elem != NULL) {
         // __new__ slot exists; check if it is a function
@@ -1268,21 +1269,21 @@ STATIC void super_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
     struct class_lookup_data lookup = {
         .obj = MP_OBJ_TO_PTR(self->obj),
         .attr = attr,
-        .meth_offset = 0,
+        .slot_offset = 0,
         .dest = dest,
         .is_type = false,
     };
 
-    // Allow a call super().__init__() to reach any native base classes
+    // Allow a call super().__init__() to reach any native base classes.
     if (attr == MP_QSTR___init__) {
-        lookup.meth_offset = offsetof(mp_obj_type_t, make_new);
+        lookup.slot_offset = offsetof(mp_obj_type_t, make_new);
     }
 
-    if (type->parent == NULL) {
+    if (!MP_OBJ_TYPE_HAS_SLOT(type, parent)) {
         // no parents, do nothing
     #if MICROPY_MULTIPLE_INHERITANCE
-    } else if (((mp_obj_base_t *)type->parent)->type == &mp_type_tuple) {
-        const mp_obj_tuple_t *parent_tuple = type->parent;
+    } else if (((mp_obj_base_t *)MP_OBJ_TYPE_GET_SLOT(type, parent))->type == &mp_type_tuple) {
+        const mp_obj_tuple_t *parent_tuple = MP_OBJ_TYPE_GET_SLOT(type, parent);
         size_t len = parent_tuple->len;
         const mp_obj_t *items = parent_tuple->items;
         for (size_t i = 0; i < len; i++) {
@@ -1292,14 +1293,15 @@ STATIC void super_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
                 // and we don't want to lookup native methods in object.
                 continue;
             }
+
             mp_obj_class_lookup(&lookup, (mp_obj_type_t *)MP_OBJ_TO_PTR(items[i]));
             if (dest[0] != MP_OBJ_NULL) {
                 break;
             }
         }
     #endif
-    } else if (type->parent != &mp_type_object) {
-        mp_obj_class_lookup(&lookup, type->parent);
+    } else if (MP_OBJ_TYPE_GET_SLOT(type, parent) != &mp_type_object) {
+        mp_obj_class_lookup(&lookup, MP_OBJ_TYPE_GET_SLOT(type, parent));
     }
 
     if (dest[0] != MP_OBJ_NULL) {
@@ -1311,9 +1313,9 @@ STATIC void super_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
         return;
     }
 
-    // Reset meth_offset so we don't look up any native methods in object,
+    // Reset slot_offset so we don't look up any native methods in object,
     // because object never takes up the native base-class slot.
-    lookup.meth_offset = 0;
+    lookup.slot_offset = 0;
 
     mp_obj_class_lookup(&lookup, &mp_type_object);
 }
@@ -1352,13 +1354,13 @@ bool mp_obj_is_subclass_fast(mp_const_obj_t object, mp_const_obj_t classinfo) {
 
         const mp_obj_type_t *self = MP_OBJ_TO_PTR(object);
 
-        if (self->parent == NULL) {
+        if (!MP_OBJ_TYPE_HAS_SLOT(self, parent)) {
             // type has no parents
             return false;
         #if MICROPY_MULTIPLE_INHERITANCE
-        } else if (((mp_obj_base_t *)self->parent)->type == &mp_type_tuple) {
+        } else if (((mp_obj_base_t *)MP_OBJ_TYPE_GET_SLOT(self, parent))->type == &mp_type_tuple) {
             // get the base objects (they should be type objects)
-            const mp_obj_tuple_t *parent_tuple = self->parent;
+            const mp_obj_tuple_t *parent_tuple = MP_OBJ_TYPE_GET_SLOT(self, parent);
             const mp_obj_t *item = parent_tuple->items;
             const mp_obj_t *top = item + parent_tuple->len - 1;
 
@@ -1374,7 +1376,7 @@ bool mp_obj_is_subclass_fast(mp_const_obj_t object, mp_const_obj_t classinfo) {
         #endif
         } else {
             // type has 1 parent
-            object = MP_OBJ_FROM_PTR(self->parent);
+            object = MP_OBJ_FROM_PTR(MP_OBJ_TYPE_GET_SLOT(self, parent));
         }
     }
 }
diff --git a/py/opmethods.c b/py/opmethods.c
index 595cc088ba933..c3931fd358466 100644
--- a/py/opmethods.c
+++ b/py/opmethods.c
@@ -29,24 +29,28 @@
 
 STATIC mp_obj_t op_getitem(mp_obj_t self_in, mp_obj_t key_in) {
     const mp_obj_type_t *type = mp_obj_get_type(self_in);
-    return type->subscr(self_in, key_in, MP_OBJ_SENTINEL);
+    // Note: assumes type must have subscr (only used by dict).
+    return MP_OBJ_TYPE_GET_SLOT(type, subscr)(self_in, key_in, MP_OBJ_SENTINEL);
 }
 MP_DEFINE_CONST_FUN_OBJ_2(mp_op_getitem_obj, op_getitem);
 
 STATIC mp_obj_t op_setitem(mp_obj_t self_in, mp_obj_t key_in, mp_obj_t value_in) {
     const mp_obj_type_t *type = mp_obj_get_type(self_in);
-    return type->subscr(self_in, key_in, value_in);
+    // Note: assumes type must have subscr (only used by dict).
+    return MP_OBJ_TYPE_GET_SLOT(type, subscr)(self_in, key_in, value_in);
 }
 MP_DEFINE_CONST_FUN_OBJ_3(mp_op_setitem_obj, op_setitem);
 
 STATIC mp_obj_t op_delitem(mp_obj_t self_in, mp_obj_t key_in) {
     const mp_obj_type_t *type = mp_obj_get_type(self_in);
-    return type->subscr(self_in, key_in, MP_OBJ_NULL);
+    // Note: assumes type must have subscr (only used by dict).
+    return MP_OBJ_TYPE_GET_SLOT(type, subscr)(self_in, key_in, MP_OBJ_NULL);
 }
 MP_DEFINE_CONST_FUN_OBJ_2(mp_op_delitem_obj, op_delitem);
 
 STATIC mp_obj_t op_contains(mp_obj_t lhs_in, mp_obj_t rhs_in) {
     const mp_obj_type_t *type = mp_obj_get_type(lhs_in);
-    return type->binary_op(MP_BINARY_OP_CONTAINS, lhs_in, rhs_in);
+    // Note: assumes type must have binary_op (only used by set/frozenset).
+    return MP_OBJ_TYPE_GET_SLOT(type, binary_op)(MP_BINARY_OP_CONTAINS, lhs_in, rhs_in);
 }
 MP_DEFINE_CONST_FUN_OBJ_2(mp_op_contains_obj, op_contains);
diff --git a/py/runtime.c b/py/runtime.c
index 27b4f05f0460d..d0e504a3d096f 100644
--- a/py/runtime.c
+++ b/py/runtime.c
@@ -307,8 +307,8 @@ mp_obj_t mp_unary_op(mp_unary_op_t op, mp_obj_t arg) {
         return MP_OBJ_NEW_SMALL_INT(h);
     } else {
         const mp_obj_type_t *type = mp_obj_get_type(arg);
-        if (type->unary_op != NULL) {
-            mp_obj_t result = type->unary_op(op, arg);
+        if (MP_OBJ_TYPE_HAS_SLOT(type, unary_op)) {
+            mp_obj_t result = MP_OBJ_TYPE_GET_SLOT(type, unary_op)(op, arg);
             if (result != MP_OBJ_NULL) {
                 return result;
             }
@@ -613,8 +613,8 @@ mp_obj_t MICROPY_WRAP_MP_BINARY_OP(mp_binary_op)(mp_binary_op_t op, mp_obj_t lhs
     const mp_obj_type_t *type;
 generic_binary_op:
     type = mp_obj_get_type(lhs);
-    if (type->binary_op != NULL) {
-        mp_obj_t result = type->binary_op(op, lhs, rhs);
+    if (MP_OBJ_TYPE_HAS_SLOT(type, binary_op)) {
+        mp_obj_t result = MP_OBJ_TYPE_GET_SLOT(type, binary_op)(op, lhs, rhs);
         if (result != MP_OBJ_NULL) {
             return result;
         }
@@ -689,8 +689,8 @@ mp_obj_t mp_call_function_n_kw(mp_obj_t fun_in, size_t n_args, size_t n_kw, cons
     const mp_obj_type_t *type = mp_obj_get_type(fun_in);
 
     // do the call
-    if (type->call != NULL) {
-        return type->call(fun_in, n_args, n_kw, args);
+    if (MP_OBJ_TYPE_HAS_SLOT(type, call)) {
+        return MP_OBJ_TYPE_GET_SLOT(type, call)(fun_in, n_args, n_kw, args);
     }
 
     #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
@@ -1167,14 +1167,14 @@ void mp_load_method_maybe(mp_obj_t obj, qstr attr, mp_obj_t *dest) {
     }
     #endif
 
-    if (attr == MP_QSTR___next__ && type->iternext != NULL) {
+    if (attr == MP_QSTR___next__ && MP_OBJ_TYPE_HAS_SLOT(type, iternext)) {
         dest[0] = MP_OBJ_FROM_PTR(&mp_builtin_next_obj);
         dest[1] = obj;
         return;
     }
-    if (type->attr != NULL) {
+    if (MP_OBJ_TYPE_HAS_SLOT(type, attr)) {
         // this type can do its own load, so call it
-        type->attr(obj, attr, dest);
+        MP_OBJ_TYPE_GET_SLOT(type, attr)(obj, attr, dest);
         // If type->attr has set dest[1] = MP_OBJ_SENTINEL, we should proceed
         // with lookups below (i.e. in locals_dict). If not, return right away.
         if (dest[1] != MP_OBJ_SENTINEL) {
@@ -1183,11 +1183,11 @@ void mp_load_method_maybe(mp_obj_t obj, qstr attr, mp_obj_t *dest) {
         // Clear the fail flag set by type->attr so it's like it never ran.
         dest[1] = MP_OBJ_NULL;
     }
-    if (type->locals_dict != NULL) {
+    if (MP_OBJ_TYPE_HAS_SLOT(type, locals_dict)) {
         // generic method lookup
         // this is a lookup in the object (ie not class or type)
-        assert(type->locals_dict->base.type == &mp_type_dict); // MicroPython restriction, for now
-        mp_map_t *locals_map = &type->locals_dict->map;
+        assert(MP_OBJ_TYPE_GET_SLOT(type, locals_dict)->base.type == &mp_type_dict); // MicroPython restriction, for now
+        mp_map_t *locals_map = &MP_OBJ_TYPE_GET_SLOT(type, locals_dict)->map;
         mp_map_elem_t *elem = mp_map_lookup(locals_map, MP_OBJ_NEW_QSTR(attr), MP_MAP_LOOKUP);
         if (elem != NULL) {
             mp_convert_member_lookup(obj, type, elem->value, dest);
@@ -1239,9 +1239,9 @@ void mp_load_method_protected(mp_obj_t obj, qstr attr, mp_obj_t *dest, bool catc
 void mp_store_attr(mp_obj_t base, qstr attr, mp_obj_t value) {
     DEBUG_OP_printf("store attr %p.%s <- %p\n", base, qstr_str(attr), value);
     const mp_obj_type_t *type = mp_obj_get_type(base);
-    if (type->attr != NULL) {
+    if (MP_OBJ_TYPE_HAS_SLOT(type, attr)) {
         mp_obj_t dest[2] = {MP_OBJ_SENTINEL, value};
-        type->attr(base, attr, dest);
+        MP_OBJ_TYPE_GET_SLOT(type, attr)(base, attr, dest);
         if (dest[0] == MP_OBJ_NULL) {
             // success
             return;
@@ -1260,20 +1260,21 @@ mp_obj_t mp_getiter(mp_obj_t o_in, mp_obj_iter_buf_t *iter_buf) {
     assert(o_in);
     const mp_obj_type_t *type = mp_obj_get_type(o_in);
 
-    // Check for native getiter which is the identity.  We handle this case explicitly
-    // so we don't unnecessarily allocate any RAM for the iter_buf, which won't be used.
-    if (type->getiter == mp_identity_getiter) {
-        return o_in;
-    }
 
-    // check for native getiter (corresponds to __iter__)
-    if (type->getiter != NULL) {
-        if (iter_buf == NULL && type->getiter != mp_obj_instance_getiter) {
+    if (MP_OBJ_TYPE_HAS_SLOT(type, getiter)) {
+        // Check for native getiter which is the identity.  We handle this case explicitly
+        // so we don't unnecessarily allocate any RAM for the iter_buf, which won't be used.
+        if (MP_OBJ_TYPE_GET_SLOT(type, getiter) == mp_identity_getiter) {
+            return o_in;
+        }
+
+        // check for native getiter (corresponds to __iter__)
+        if (iter_buf == NULL && MP_OBJ_TYPE_GET_SLOT(type, getiter) != mp_obj_instance_getiter) {
             // if caller did not provide a buffer then allocate one on the heap
             // mp_obj_instance_getiter is special, it will allocate only if needed
             iter_buf = m_new_obj(mp_obj_iter_buf_t);
         }
-        mp_obj_t iter = type->getiter(o_in, iter_buf);
+        mp_obj_t iter = MP_OBJ_TYPE_GET_SLOT(type, getiter)(o_in, iter_buf);
         if (iter != MP_OBJ_NULL) {
             return iter;
         }
@@ -1305,9 +1306,9 @@ mp_obj_t mp_getiter(mp_obj_t o_in, mp_obj_iter_buf_t *iter_buf) {
 // may also raise StopIteration()
 mp_obj_t mp_iternext_allow_raise(mp_obj_t o_in) {
     const mp_obj_type_t *type = mp_obj_get_type(o_in);
-    if (type->iternext != NULL) {
+    if (MP_OBJ_TYPE_HAS_SLOT(type, iternext)) {
         MP_STATE_THREAD(stop_iteration_arg) = MP_OBJ_NULL;
-        return type->iternext(o_in);
+        return MP_OBJ_TYPE_GET_SLOT(type, iternext)(o_in);
     } else {
         // check for __next__ method
         mp_obj_t dest[2];
@@ -1331,9 +1332,9 @@ mp_obj_t mp_iternext_allow_raise(mp_obj_t o_in) {
 mp_obj_t mp_iternext(mp_obj_t o_in) {
     MP_STACK_CHECK(); // enumerate, filter, map and zip can recursively call mp_iternext
     const mp_obj_type_t *type = mp_obj_get_type(o_in);
-    if (type->iternext != NULL) {
+    if (MP_OBJ_TYPE_HAS_SLOT(type, iternext)) {
         MP_STATE_THREAD(stop_iteration_arg) = MP_OBJ_NULL;
-        return type->iternext(o_in);
+        return MP_OBJ_TYPE_GET_SLOT(type, iternext)(o_in);
     } else {
         // check for __next__ method
         mp_obj_t dest[2];
@@ -1371,9 +1372,9 @@ mp_vm_return_kind_t mp_resume(mp_obj_t self_in, mp_obj_t send_value, mp_obj_t th
         return mp_obj_gen_resume(self_in, send_value, throw_value, ret_val);
     }
 
-    if (type->iternext != NULL && send_value == mp_const_none) {
+    if (MP_OBJ_TYPE_HAS_SLOT(type, iternext) && send_value == mp_const_none) {
         MP_STATE_THREAD(stop_iteration_arg) = MP_OBJ_NULL;
-        mp_obj_t ret = type->iternext(self_in);
+        mp_obj_t ret = MP_OBJ_TYPE_GET_SLOT(type, iternext)(self_in);
         *ret_val = ret;
         if (ret != MP_OBJ_STOP_ITERATION) {
             return MP_VM_RETURN_YIELD;
diff --git a/py/stream.c b/py/stream.c
index 87bed38f6778f..36325e7d414a6 100644
--- a/py/stream.c
+++ b/py/stream.c
@@ -84,15 +84,16 @@ mp_uint_t mp_stream_rw(mp_obj_t stream, void *buf_, mp_uint_t size, int *errcode
 
 const mp_stream_p_t *mp_get_stream_raise(mp_obj_t self_in, int flags) {
     const mp_obj_type_t *type = mp_obj_get_type(self_in);
-    const mp_stream_p_t *stream_p = type->protocol;
-    if (stream_p == NULL
-        || ((flags & MP_STREAM_OP_READ) && stream_p->read == NULL)
-        || ((flags & MP_STREAM_OP_WRITE) && stream_p->write == NULL)
-        || ((flags & MP_STREAM_OP_IOCTL) && stream_p->ioctl == NULL)) {
-        // CPython: io.UnsupportedOperation, OSError subclass
-        mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("stream operation not supported"));
+    if (MP_OBJ_TYPE_HAS_SLOT(type, protocol)) {
+        const mp_stream_p_t *stream_p = MP_OBJ_TYPE_GET_SLOT(type, protocol);
+        if (!((flags & MP_STREAM_OP_READ) && stream_p->read == NULL)
+            && !((flags & MP_STREAM_OP_WRITE) && stream_p->write == NULL)
+            && !((flags & MP_STREAM_OP_IOCTL) && stream_p->ioctl == NULL)) {
+            return stream_p;
+        }
     }
-    return stream_p;
+    // CPython: io.UnsupportedOperation, OSError subclass
+    mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("stream operation not supported"));
 }
 
 STATIC mp_obj_t stream_read_generic(size_t n_args, const mp_obj_t *args, byte flags) {
@@ -517,7 +518,7 @@ MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_stream_ioctl_obj, 2, 3, stream_ioctl);
 
 ssize_t mp_stream_posix_write(void *stream, const void *buf, size_t len) {
     mp_obj_base_t *o = stream;
-    const mp_stream_p_t *stream_p = o->type->protocol;
+    const mp_stream_p_t *stream_p = MP_OBJ_TYPE_GET_SLOT(o->type, protocol);
     mp_uint_t out_sz = stream_p->write(MP_OBJ_FROM_PTR(stream), buf, len, &errno);
     if (out_sz == MP_STREAM_ERROR) {
         return -1;
@@ -528,7 +529,7 @@ ssize_t mp_stream_posix_write(void *stream, const void *buf, size_t len) {
 
 ssize_t mp_stream_posix_read(void *stream, void *buf, size_t len) {
     mp_obj_base_t *o = stream;
-    const mp_stream_p_t *stream_p = o->type->protocol;
+    const mp_stream_p_t *stream_p = MP_OBJ_TYPE_GET_SLOT(o->type, protocol);
     mp_uint_t out_sz = stream_p->read(MP_OBJ_FROM_PTR(stream), buf, len, &errno);
     if (out_sz == MP_STREAM_ERROR) {
         return -1;
@@ -539,7 +540,7 @@ ssize_t mp_stream_posix_read(void *stream, void *buf, size_t len) {
 
 off_t mp_stream_posix_lseek(void *stream, off_t offset, int whence) {
     const mp_obj_base_t *o = stream;
-    const mp_stream_p_t *stream_p = o->type->protocol;
+    const mp_stream_p_t *stream_p = MP_OBJ_TYPE_GET_SLOT(o->type, protocol);
     struct mp_stream_seek_t seek_s;
     seek_s.offset = offset;
     seek_s.whence = whence;
@@ -552,7 +553,7 @@ off_t mp_stream_posix_lseek(void *stream, off_t offset, int whence) {
 
 int mp_stream_posix_fsync(void *stream) {
     mp_obj_base_t *o = stream;
-    const mp_stream_p_t *stream_p = o->type->protocol;
+    const mp_stream_p_t *stream_p = MP_OBJ_TYPE_GET_SLOT(o->type, protocol);
     mp_uint_t res = stream_p->ioctl(MP_OBJ_FROM_PTR(stream), MP_STREAM_FLUSH, 0, &errno);
     if (res == MP_STREAM_ERROR) {
         return -1;
diff --git a/py/stream.h b/py/stream.h
index 45f36ef5a6f39..4bc329b3e790d 100644
--- a/py/stream.h
+++ b/py/stream.h
@@ -95,7 +95,7 @@ MP_DECLARE_CONST_FUN_OBJ_VAR_BETWEEN(mp_stream_ioctl_obj);
 
 // Object is assumed to have a non-NULL stream protocol with valid r/w/ioctl methods
 static inline const mp_stream_p_t *mp_get_stream(mp_const_obj_t self) {
-    return (const mp_stream_p_t *)((const mp_obj_base_t *)MP_OBJ_TO_PTR(self))->type->protocol;
+    return (const mp_stream_p_t *)MP_OBJ_TYPE_GET_SLOT(((const mp_obj_base_t *)MP_OBJ_TO_PTR(self))->type, protocol);
 }
 
 const mp_stream_p_t *mp_get_stream_raise(mp_obj_t self_in, int flags);

From 3ac8b5851e5f4dade465d52b91ed2ccc17851263 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Thu, 15 Jul 2021 15:04:40 +1000
Subject: [PATCH 2622/3533] py/obj: Add slot-index mp_obj_type_t
 representation.

The existings mp_obj_type_t uses a sparse representation for slots for the
capability methods of the type (eg print, make_new).  This commit adds a
compact slot-index representation.  The basic idea is that where the
mp_obj_type_t struct used to have 12 pointer fields, it now has 12 uint8_t
indices, and a variable-length array of pointers.  So in the best case (no
fields used) it saves 12x4-12=36 bytes (on a 32-bit machine) and in the
common case (three fields used) it saves 9x4-12=24 bytes.

Overall with all associated changes, this slot-index representation reduces
code size by 1000 to 3000 bytes on bare-metal ports.  Performance is
marginally better on a few tests (eg about 1% better on misc_pystone.py and
misc_raytrace.py on PYBv1.1), but overall marginally worse by a percent or
so.

See issue #7542 for further analysis and discussion.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 py/mpconfig.h |   7 +++
 py/obj.h      | 121 ++++++++++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 125 insertions(+), 3 deletions(-)

diff --git a/py/mpconfig.h b/py/mpconfig.h
index 698d264d2e800..0045fa1985b05 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -145,6 +145,13 @@
 #define MICROPY_OBJ_IMMEDIATE_OBJS (MICROPY_OBJ_REPR != MICROPY_OBJ_REPR_D)
 #endif
 
+#define MICROPY_OBJ_TYPE_REPR_FULL (0)
+#define MICROPY_OBJ_TYPE_REPR_SLOT_INDEX (1)
+
+#ifndef MICROPY_OBJ_TYPE_REPR
+#define MICROPY_OBJ_TYPE_REPR (MICROPY_OBJ_TYPE_REPR_FULL)
+#endif
+
 /*****************************************************************************/
 /* Memory allocation policy                                                  */
 
diff --git a/py/obj.h b/py/obj.h
index 37e6f0052428c..c17e0e5f18992 100644
--- a/py/obj.h
+++ b/py/obj.h
@@ -575,12 +575,13 @@ struct _mp_obj_type_t {
     // The name of this type, a qstr.
     uint16_t name;
 
-    // Corresponds to __repr__ and __str__ special methods.
-    mp_print_fun_t print;
-
     // Corresponds to __new__ and __init__ special methods, to make an instance of the type.
     mp_make_new_fun_t make_new;
 
+    #if MICROPY_OBJ_TYPE_REPR == MICROPY_OBJ_TYPE_REPR_FULL
+    // Corresponds to __repr__ and __str__ special methods.
+    mp_print_fun_t print;
+
     // Corresponds to __call__ special method, ie T(...).
     mp_call_fun_t call;
 
@@ -633,17 +634,87 @@ struct _mp_obj_type_t {
 
     // A dict mapping qstrs to objects local methods/constants/etc.
     struct _mp_obj_dict_t *locals_dict;
+
+    #elif MICROPY_OBJ_TYPE_REPR == MICROPY_OBJ_TYPE_REPR_SLOT_INDEX
+
+    // Ideally these would be only 4 bits, but the extra overhead of
+    // accessing them adds more code, and we also need to be able to
+    // take the address of them for mp_obj_class_lookup.
+    uint8_t slot_index_print;
+    uint8_t slot_index_call;
+    uint8_t slot_index_unary_op;
+    uint8_t slot_index_binary_op;
+    uint8_t slot_index_attr;
+    uint8_t slot_index_subscr;
+    uint8_t slot_index_getiter;
+    uint8_t slot_index_iternext;
+    uint8_t slot_index_buffer;
+    uint8_t slot_index_protocol;
+    uint8_t slot_index_parent;
+    uint8_t slot_index_locals_dict;
+
+    const void *slots[];
+
+    #endif
 };
 
 // Non-variable sized versions of mp_obj_type_t to be used as a member
 // in other structs or for dynamic allocation. The fields are exactly
 // as in mp_obj_type_t, but with a fixed size for the flexible array
 // members.
+#if MICROPY_OBJ_TYPE_REPR == MICROPY_OBJ_TYPE_REPR_FULL
 typedef mp_obj_type_t mp_obj_empty_type_t;
 typedef mp_obj_type_t mp_obj_full_type_t;
+#else
+typedef struct _mp_obj_empty_type_t {
+    mp_obj_base_t base;
+    uint16_t flags;
+    uint16_t name;
+    mp_make_new_fun_t make_new;
+
+    uint8_t slot_index_print;
+    uint8_t slot_index_call;
+    uint8_t slot_index_unary_op;
+    uint8_t slot_index_binary_op;
+    uint8_t slot_index_attr;
+    uint8_t slot_index_subscr;
+    uint8_t slot_index_getiter;
+    uint8_t slot_index_iternext;
+    uint8_t slot_index_buffer;
+    uint8_t slot_index_protocol;
+    uint8_t slot_index_parent;
+    uint8_t slot_index_locals_dict;
+
+    // No slots member.
+} mp_obj_empty_type_t;
+
+typedef struct _mp_obj_full_type_t {
+    mp_obj_base_t base;
+    uint16_t flags;
+    uint16_t name;
+    mp_make_new_fun_t make_new;
+
+    uint8_t slot_index_print;
+    uint8_t slot_index_call;
+    uint8_t slot_index_unary_op;
+    uint8_t slot_index_binary_op;
+    uint8_t slot_index_attr;
+    uint8_t slot_index_subscr;
+    uint8_t slot_index_getiter;
+    uint8_t slot_index_iternext;
+    uint8_t slot_index_buffer;
+    uint8_t slot_index_protocol;
+    uint8_t slot_index_parent;
+    uint8_t slot_index_locals_dict;
+
+    // Explicitly add 12 slots.
+    const void *slots[12];
+} mp_obj_full_type_t;
+#endif
 
 #define MP_TYPE_NULL_MAKE_NEW (NULL)
 
+#if MICROPY_OBJ_TYPE_REPR == MICROPY_OBJ_TYPE_REPR_FULL
 // Implementation of MP_DEFINE_CONST_OBJ_TYPE for each number of arguments.
 // Do not use these directly, instead use MP_DEFINE_CONST_OBJ_TYPE.
 #define MP_DEFINE_CONST_OBJ_TYPE_NARGS_0(_struct_type, _typename, _name, _flags, _make_new) const _struct_type _typename = { .base = { &mp_type_type }, .name = _name, .flags = _flags, .make_new = _make_new }
@@ -670,6 +741,50 @@ typedef mp_obj_type_t mp_obj_full_type_t;
 #define MP_OBJ_TYPE_OFFSETOF_SLOT(f) (offsetof(mp_obj_type_t, f))
 #define MP_OBJ_TYPE_HAS_SLOT_BY_OFFSET(t, offset) (*(void **)((char *)(t) + (offset)) != NULL)
 
+#elif MICROPY_OBJ_TYPE_REPR == MICROPY_OBJ_TYPE_REPR_SLOT_INDEX
+
+#define _MP_OBJ_TYPE_SLOT_TYPE_print (mp_print_fun_t)
+#define _MP_OBJ_TYPE_SLOT_TYPE_call (mp_call_fun_t)
+#define _MP_OBJ_TYPE_SLOT_TYPE_unary_op (mp_unary_op_fun_t)
+#define _MP_OBJ_TYPE_SLOT_TYPE_binary_op (mp_binary_op_fun_t)
+#define _MP_OBJ_TYPE_SLOT_TYPE_attr (mp_attr_fun_t)
+#define _MP_OBJ_TYPE_SLOT_TYPE_subscr (mp_subscr_fun_t)
+#define _MP_OBJ_TYPE_SLOT_TYPE_getiter (mp_getiter_fun_t)
+#define _MP_OBJ_TYPE_SLOT_TYPE_iternext (mp_fun_1_t)
+#define _MP_OBJ_TYPE_SLOT_TYPE_buffer (mp_buffer_fun_t)
+#define _MP_OBJ_TYPE_SLOT_TYPE_protocol (const void *)
+#define _MP_OBJ_TYPE_SLOT_TYPE_parent (const void *)
+#define _MP_OBJ_TYPE_SLOT_TYPE_locals_dict (struct _mp_obj_dict_t *)
+
+// Implementation of MP_DEFINE_CONST_OBJ_TYPE for each number of arguments.
+// Do not use these directly, instead use MP_DEFINE_CONST_OBJ_TYPE.
+// Generated with:
+// for i in range(13):
+//     print(f"#define MP_DEFINE_CONST_OBJ_TYPE_NARGS_{i}(_struct_type, _typename, _name, _flags, _make_new{''.join(f', f{j+1}, v{j+1}' for j in range(i))}) const _struct_type _typename = {{ .base = {{ &mp_type_type }}, .name = _name, .flags = _flags, .make_new = _make_new{''.join(f', .slot_index_##f{j+1} = {j+1}' for j in range(i))}{', .slots = { ' + ''.join(f'v{j+1}, ' for j in range(i)) + '}' if i else '' } }}")
+#define MP_DEFINE_CONST_OBJ_TYPE_NARGS_0(_struct_type, _typename, _name, _flags, _make_new) const _struct_type _typename = { .base = { &mp_type_type }, .name = _name, .flags = _flags, .make_new = _make_new }
+#define MP_DEFINE_CONST_OBJ_TYPE_NARGS_1(_struct_type, _typename, _name, _flags, _make_new, f1, v1) const _struct_type _typename = { .base = { &mp_type_type }, .name = _name, .flags = _flags, .make_new = _make_new, .slot_index_##f1 = 1, .slots = { v1, } }
+#define MP_DEFINE_CONST_OBJ_TYPE_NARGS_2(_struct_type, _typename, _name, _flags, _make_new, f1, v1, f2, v2) const _struct_type _typename = { .base = { &mp_type_type }, .name = _name, .flags = _flags, .make_new = _make_new, .slot_index_##f1 = 1, .slot_index_##f2 = 2, .slots = { v1, v2, } }
+#define MP_DEFINE_CONST_OBJ_TYPE_NARGS_3(_struct_type, _typename, _name, _flags, _make_new, f1, v1, f2, v2, f3, v3) const _struct_type _typename = { .base = { &mp_type_type }, .name = _name, .flags = _flags, .make_new = _make_new, .slot_index_##f1 = 1, .slot_index_##f2 = 2, .slot_index_##f3 = 3, .slots = { v1, v2, v3, } }
+#define MP_DEFINE_CONST_OBJ_TYPE_NARGS_4(_struct_type, _typename, _name, _flags, _make_new, f1, v1, f2, v2, f3, v3, f4, v4) const _struct_type _typename = { .base = { &mp_type_type }, .name = _name, .flags = _flags, .make_new = _make_new, .slot_index_##f1 = 1, .slot_index_##f2 = 2, .slot_index_##f3 = 3, .slot_index_##f4 = 4, .slots = { v1, v2, v3, v4, } }
+#define MP_DEFINE_CONST_OBJ_TYPE_NARGS_5(_struct_type, _typename, _name, _flags, _make_new, f1, v1, f2, v2, f3, v3, f4, v4, f5, v5) const _struct_type _typename = { .base = { &mp_type_type }, .name = _name, .flags = _flags, .make_new = _make_new, .slot_index_##f1 = 1, .slot_index_##f2 = 2, .slot_index_##f3 = 3, .slot_index_##f4 = 4, .slot_index_##f5 = 5, .slots = { v1, v2, v3, v4, v5, } }
+#define MP_DEFINE_CONST_OBJ_TYPE_NARGS_6(_struct_type, _typename, _name, _flags, _make_new, f1, v1, f2, v2, f3, v3, f4, v4, f5, v5, f6, v6) const _struct_type _typename = { .base = { &mp_type_type }, .name = _name, .flags = _flags, .make_new = _make_new, .slot_index_##f1 = 1, .slot_index_##f2 = 2, .slot_index_##f3 = 3, .slot_index_##f4 = 4, .slot_index_##f5 = 5, .slot_index_##f6 = 6, .slots = { v1, v2, v3, v4, v5, v6, } }
+#define MP_DEFINE_CONST_OBJ_TYPE_NARGS_7(_struct_type, _typename, _name, _flags, _make_new, f1, v1, f2, v2, f3, v3, f4, v4, f5, v5, f6, v6, f7, v7) const _struct_type _typename = { .base = { &mp_type_type }, .name = _name, .flags = _flags, .make_new = _make_new, .slot_index_##f1 = 1, .slot_index_##f2 = 2, .slot_index_##f3 = 3, .slot_index_##f4 = 4, .slot_index_##f5 = 5, .slot_index_##f6 = 6, .slot_index_##f7 = 7, .slots = { v1, v2, v3, v4, v5, v6, v7, } }
+#define MP_DEFINE_CONST_OBJ_TYPE_NARGS_8(_struct_type, _typename, _name, _flags, _make_new, f1, v1, f2, v2, f3, v3, f4, v4, f5, v5, f6, v6, f7, v7, f8, v8) const _struct_type _typename = { .base = { &mp_type_type }, .name = _name, .flags = _flags, .make_new = _make_new, .slot_index_##f1 = 1, .slot_index_##f2 = 2, .slot_index_##f3 = 3, .slot_index_##f4 = 4, .slot_index_##f5 = 5, .slot_index_##f6 = 6, .slot_index_##f7 = 7, .slot_index_##f8 = 8, .slots = { v1, v2, v3, v4, v5, v6, v7, v8, } }
+#define MP_DEFINE_CONST_OBJ_TYPE_NARGS_9(_struct_type, _typename, _name, _flags, _make_new, f1, v1, f2, v2, f3, v3, f4, v4, f5, v5, f6, v6, f7, v7, f8, v8, f9, v9) const _struct_type _typename = { .base = { &mp_type_type }, .name = _name, .flags = _flags, .make_new = _make_new, .slot_index_##f1 = 1, .slot_index_##f2 = 2, .slot_index_##f3 = 3, .slot_index_##f4 = 4, .slot_index_##f5 = 5, .slot_index_##f6 = 6, .slot_index_##f7 = 7, .slot_index_##f8 = 8, .slot_index_##f9 = 9, .slots = { v1, v2, v3, v4, v5, v6, v7, v8, v9, } }
+#define MP_DEFINE_CONST_OBJ_TYPE_NARGS_10(_struct_type, _typename, _name, _flags, _make_new, f1, v1, f2, v2, f3, v3, f4, v4, f5, v5, f6, v6, f7, v7, f8, v8, f9, v9, f10, v10) const _struct_type _typename = { .base = { &mp_type_type }, .name = _name, .flags = _flags, .make_new = _make_new, .slot_index_##f1 = 1, .slot_index_##f2 = 2, .slot_index_##f3 = 3, .slot_index_##f4 = 4, .slot_index_##f5 = 5, .slot_index_##f6 = 6, .slot_index_##f7 = 7, .slot_index_##f8 = 8, .slot_index_##f9 = 9, .slot_index_##f10 = 10, .slots = { v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, } }
+#define MP_DEFINE_CONST_OBJ_TYPE_NARGS_11(_struct_type, _typename, _name, _flags, _make_new, f1, v1, f2, v2, f3, v3, f4, v4, f5, v5, f6, v6, f7, v7, f8, v8, f9, v9, f10, v10, f11, v11) const _struct_type _typename = { .base = { &mp_type_type }, .name = _name, .flags = _flags, .make_new = _make_new, .slot_index_##f1 = 1, .slot_index_##f2 = 2, .slot_index_##f3 = 3, .slot_index_##f4 = 4, .slot_index_##f5 = 5, .slot_index_##f6 = 6, .slot_index_##f7 = 7, .slot_index_##f8 = 8, .slot_index_##f9 = 9, .slot_index_##f10 = 10, .slot_index_##f11 = 11, .slots = { v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, } }
+#define MP_DEFINE_CONST_OBJ_TYPE_NARGS_12(_struct_type, _typename, _name, _flags, _make_new, f1, v1, f2, v2, f3, v3, f4, v4, f5, v5, f6, v6, f7, v7, f8, v8, f9, v9, f10, v10, f11, v11, f12, v12) const _struct_type _typename = { .base = { &mp_type_type }, .name = _name, .flags = _flags, .make_new = _make_new, .slot_index_##f1 = 1, .slot_index_##f2 = 2, .slot_index_##f3 = 3, .slot_index_##f4 = 4, .slot_index_##f5 = 5, .slot_index_##f6 = 6, .slot_index_##f7 = 7, .slot_index_##f8 = 8, .slot_index_##f9 = 9, .slot_index_##f10 = 10, .slot_index_##f11 = 11, .slot_index_##f12 = 12, .slots = { v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, } }
+
+#define MP_OBJ_TYPE_HAS_SLOT(t, f) ((t)->slot_index_##f)
+#define MP_OBJ_TYPE_GET_SLOT(t, f) (_MP_OBJ_TYPE_SLOT_TYPE_##f(t)->slots[(t)->slot_index_##f - 1])
+#define MP_OBJ_TYPE_GET_SLOT_OR_NULL(t, f) (_MP_OBJ_TYPE_SLOT_TYPE_##f(MP_OBJ_TYPE_HAS_SLOT(t, f) ? MP_OBJ_TYPE_GET_SLOT(t, f) : NULL))
+#define MP_OBJ_TYPE_SET_SLOT(t, f, v, n) ((t)->slot_index_##f = (n) + 1, (t)->slots[(t)->slot_index_##f - 1] = (void *)v)
+#define MP_OBJ_TYPE_OFFSETOF_SLOT(f) (offsetof(mp_obj_type_t, slot_index_##f))
+// For everything except make_new, the offset is to the uint8_t index. For make_new, we need to check the pointer.
+#define MP_OBJ_TYPE_HAS_SLOT_BY_OFFSET(t, offset) (*(uint8_t *)((char *)(t) + (offset)) != 0 || (offset == offsetof(mp_obj_type_t, make_new) && t->make_new))
+
+#endif
+
 // Workaround for https://docs.microsoft.com/en-us/cpp/preprocessor/preprocessor-experimental-overview?view=msvc-160#macro-arguments-are-unpacked
 #define MP_DEFINE_CONST_OBJ_TYPE_EXPAND(x) x
 

From cb0ffdd2bf25dcac3c230bdc1168d492aabaf573 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Wed, 22 Jun 2022 11:24:41 +1000
Subject: [PATCH 2623/3533] py/obj: Remove basic mp_obj_type_t sparse
 representation.

This makes the slots-based representation the only option.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 py/mpconfig.h |  7 -----
 py/obj.h      | 85 +++++++++++----------------------------------------
 2 files changed, 17 insertions(+), 75 deletions(-)

diff --git a/py/mpconfig.h b/py/mpconfig.h
index 0045fa1985b05..698d264d2e800 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -145,13 +145,6 @@
 #define MICROPY_OBJ_IMMEDIATE_OBJS (MICROPY_OBJ_REPR != MICROPY_OBJ_REPR_D)
 #endif
 
-#define MICROPY_OBJ_TYPE_REPR_FULL (0)
-#define MICROPY_OBJ_TYPE_REPR_SLOT_INDEX (1)
-
-#ifndef MICROPY_OBJ_TYPE_REPR
-#define MICROPY_OBJ_TYPE_REPR (MICROPY_OBJ_TYPE_REPR_FULL)
-#endif
-
 /*****************************************************************************/
 /* Memory allocation policy                                                  */
 
diff --git a/py/obj.h b/py/obj.h
index c17e0e5f18992..878fa673487a5 100644
--- a/py/obj.h
+++ b/py/obj.h
@@ -578,17 +578,22 @@ struct _mp_obj_type_t {
     // Corresponds to __new__ and __init__ special methods, to make an instance of the type.
     mp_make_new_fun_t make_new;
 
-    #if MICROPY_OBJ_TYPE_REPR == MICROPY_OBJ_TYPE_REPR_FULL
+    // Slots: For the rest of the fields, the slot index points to the
+    // relevant function in the variable-length "slots" field. Ideally these
+    // would be only 4 bits, but the extra overhead of accessing them adds
+    // more code, and we also need to be able to take the address of them for
+    // mp_obj_class_lookup.
+
     // Corresponds to __repr__ and __str__ special methods.
-    mp_print_fun_t print;
+    uint8_t slot_index_print;
 
     // Corresponds to __call__ special method, ie T(...).
-    mp_call_fun_t call;
+    uint8_t slot_index_call;
 
     // Implements unary and binary operations.
     // Can return MP_OBJ_NULL if the operation is not supported.
-    mp_unary_op_fun_t unary_op;
-    mp_binary_op_fun_t binary_op;
+    uint8_t slot_index_unary_op;
+    uint8_t slot_index_binary_op;
 
     // Implements load, store and delete attribute.
     //
@@ -602,70 +607,46 @@ struct _mp_obj_type_t {
     // dest[0,1] = {MP_OBJ_SENTINEL, object} means store
     //  return: for fail, do nothing
     //          for success set dest[0] = MP_OBJ_NULL
-    mp_attr_fun_t attr;
+    uint8_t slot_index_attr;
 
     // Implements load, store and delete subscripting:
     //  - value = MP_OBJ_SENTINEL means load
     //  - value = MP_OBJ_NULL means delete
     //  - all other values mean store the value
     // Can return MP_OBJ_NULL if operation not supported.
-    mp_subscr_fun_t subscr;
+    uint8_t slot_index_subscr;
 
     // Corresponds to __iter__ special method.
     // Can use the given mp_obj_iter_buf_t to store iterator object,
     // otherwise can return a pointer to an object on the heap.
-    mp_getiter_fun_t getiter;
+    uint8_t slot_index_getiter;
 
     // Corresponds to __next__ special method.  May return MP_OBJ_STOP_ITERATION
     // as an optimisation instead of raising StopIteration() with no args.
-    mp_fun_1_t iternext;
+    uint8_t slot_index_iternext;
 
     // Implements the buffer protocol if supported by this type.
-    mp_buffer_fun_t buffer;
+    uint8_t slot_index_buffer;
 
     // One of disjoint protocols (interfaces), like mp_stream_p_t, etc.
-    const void *protocol;
+    uint8_t slot_index_protocol;
 
     // A pointer to the parents of this type:
     //  - 0 parents: pointer is NULL (object is implicitly the single parent)
     //  - 1 parent: a pointer to the type of that parent
     //  - 2 or more parents: pointer to a tuple object containing the parent types
-    const void *parent;
+    uint8_t slot_index_parent;
 
     // A dict mapping qstrs to objects local methods/constants/etc.
-    struct _mp_obj_dict_t *locals_dict;
-
-    #elif MICROPY_OBJ_TYPE_REPR == MICROPY_OBJ_TYPE_REPR_SLOT_INDEX
-
-    // Ideally these would be only 4 bits, but the extra overhead of
-    // accessing them adds more code, and we also need to be able to
-    // take the address of them for mp_obj_class_lookup.
-    uint8_t slot_index_print;
-    uint8_t slot_index_call;
-    uint8_t slot_index_unary_op;
-    uint8_t slot_index_binary_op;
-    uint8_t slot_index_attr;
-    uint8_t slot_index_subscr;
-    uint8_t slot_index_getiter;
-    uint8_t slot_index_iternext;
-    uint8_t slot_index_buffer;
-    uint8_t slot_index_protocol;
-    uint8_t slot_index_parent;
     uint8_t slot_index_locals_dict;
 
     const void *slots[];
-
-    #endif
 };
 
 // Non-variable sized versions of mp_obj_type_t to be used as a member
 // in other structs or for dynamic allocation. The fields are exactly
 // as in mp_obj_type_t, but with a fixed size for the flexible array
 // members.
-#if MICROPY_OBJ_TYPE_REPR == MICROPY_OBJ_TYPE_REPR_FULL
-typedef mp_obj_type_t mp_obj_empty_type_t;
-typedef mp_obj_type_t mp_obj_full_type_t;
-#else
 typedef struct _mp_obj_empty_type_t {
     mp_obj_base_t base;
     uint16_t flags;
@@ -710,39 +691,9 @@ typedef struct _mp_obj_full_type_t {
     // Explicitly add 12 slots.
     const void *slots[12];
 } mp_obj_full_type_t;
-#endif
 
 #define MP_TYPE_NULL_MAKE_NEW (NULL)
 
-#if MICROPY_OBJ_TYPE_REPR == MICROPY_OBJ_TYPE_REPR_FULL
-// Implementation of MP_DEFINE_CONST_OBJ_TYPE for each number of arguments.
-// Do not use these directly, instead use MP_DEFINE_CONST_OBJ_TYPE.
-#define MP_DEFINE_CONST_OBJ_TYPE_NARGS_0(_struct_type, _typename, _name, _flags, _make_new) const _struct_type _typename = { .base = { &mp_type_type }, .name = _name, .flags = _flags, .make_new = _make_new }
-#define MP_DEFINE_CONST_OBJ_TYPE_NARGS_1(_struct_type, _typename, _name, _flags, _make_new, f1, v1) const _struct_type _typename = { .base = { &mp_type_type }, .name = _name, .flags = _flags, .make_new = _make_new, .f1 = v1 }
-#define MP_DEFINE_CONST_OBJ_TYPE_NARGS_2(_struct_type, _typename, _name, _flags, _make_new, f1, v1, f2, v2) const _struct_type _typename = { .base = { &mp_type_type }, .name = _name, .flags = _flags, .make_new = _make_new, .f1 = v1, .f2 = v2 }
-#define MP_DEFINE_CONST_OBJ_TYPE_NARGS_3(_struct_type, _typename, _name, _flags, _make_new, f1, v1, f2, v2, f3, v3) const _struct_type _typename = { .base = { &mp_type_type }, .name = _name, .flags = _flags, .make_new = _make_new, .f1 = v1, .f2 = v2, .f3 = v3 }
-#define MP_DEFINE_CONST_OBJ_TYPE_NARGS_4(_struct_type, _typename, _name, _flags, _make_new, f1, v1, f2, v2, f3, v3, f4, v4) const _struct_type _typename = { .base = { &mp_type_type }, .name = _name, .flags = _flags, .make_new = _make_new, .f1 = v1, .f2 = v2, .f3 = v3, .f4 = v4 }
-#define MP_DEFINE_CONST_OBJ_TYPE_NARGS_5(_struct_type, _typename, _name, _flags, _make_new, f1, v1, f2, v2, f3, v3, f4, v4, f5, v5) const _struct_type _typename = { .base = { &mp_type_type }, .name = _name, .flags = _flags, .make_new = _make_new, .f1 = v1, .f2 = v2, .f3 = v3, .f4 = v4, .f5 = v5 }
-#define MP_DEFINE_CONST_OBJ_TYPE_NARGS_6(_struct_type, _typename, _name, _flags, _make_new, f1, v1, f2, v2, f3, v3, f4, v4, f5, v5, f6, v6) const _struct_type _typename = { .base = { &mp_type_type }, .name = _name, .flags = _flags, .make_new = _make_new, .f1 = v1, .f2 = v2, .f3 = v3, .f4 = v4, .f5 = v5, .f6 = v6 }
-#define MP_DEFINE_CONST_OBJ_TYPE_NARGS_7(_struct_type, _typename, _name, _flags, _make_new, f1, v1, f2, v2, f3, v3, f4, v4, f5, v5, f6, v6, f7, v7) const _struct_type _typename = { .base = { &mp_type_type }, .name = _name, .flags = _flags, .make_new = _make_new, .f1 = v1, .f2 = v2, .f3 = v3, .f4 = v4, .f5 = v5, .f6 = v6, .f7 = v7 }
-#define MP_DEFINE_CONST_OBJ_TYPE_NARGS_8(_struct_type, _typename, _name, _flags, _make_new, f1, v1, f2, v2, f3, v3, f4, v4, f5, v5, f6, v6, f7, v7, f8, v8) const _struct_type _typename = { .base = { &mp_type_type }, .name = _name, .flags = _flags, .make_new = _make_new, .f1 = v1, .f2 = v2, .f3 = v3, .f4 = v4, .f5 = v5, .f6 = v6, .f7 = v7, .f8 = v8 }
-#define MP_DEFINE_CONST_OBJ_TYPE_NARGS_9(_struct_type, _typename, _name, _flags, _make_new, f1, v1, f2, v2, f3, v3, f4, v4, f5, v5, f6, v6, f7, v7, f8, v8, f9, v9) const _struct_type _typename = { .base = { &mp_type_type }, .name = _name, .flags = _flags, .make_new = _make_new, .f1 = v1, .f2 = v2, .f3 = v3, .f4 = v4, .f5 = v5, .f6 = v6, .f7 = v7, .f8 = v8, .f9 = v9 }
-#define MP_DEFINE_CONST_OBJ_TYPE_NARGS_10(_struct_type, _typename, _name, _flags, _make_new, f1, v1, f2, v2, f3, v3, f4, v4, f5, v5, f6, v6, f7, v7, f8, v8, f9, v9, f10, v10) const _struct_type _typename = { .base = { &mp_type_type }, .name = _name, .flags = _flags, .make_new = _make_new, .f1 = v1, .f2 = v2, .f3 = v3, .f4 = v4, .f5 = v5, .f6 = v6, .f7 = v7, .f8 = v8, .f9 = v9, .f10 = v10 }
-#define MP_DEFINE_CONST_OBJ_TYPE_NARGS_11(_struct_type, _typename, _name, _flags, _make_new, f1, v1, f2, v2, f3, v3, f4, v4, f5, v5, f6, v6, f7, v7, f8, v8, f9, v9, f10, v10, f11, v11) const _struct_type _typename = { .base = { &mp_type_type }, .name = _name, .flags = _flags, .make_new = _make_new, .f1 = v1, .f2 = v2, .f3 = v3, .f4 = v4, .f5 = v5, .f6 = v6, .f7 = v7, .f8 = v8, .f9 = v9, .f10 = v10, .f11 = v11 }
-#define MP_DEFINE_CONST_OBJ_TYPE_NARGS_12(_struct_type, _typename, _name, _flags, _make_new, f1, v1, f2, v2, f3, v3, f4, v4, f5, v5, f6, v6, f7, v7, f8, v8, f9, v9, f10, v10, f11, v11, f12, v12) const _struct_type _typename = { .base = { &mp_type_type }, .name = _name, .flags = _flags, .make_new = _make_new, .f1 = v1, .f2 = v2, .f3 = v3, .f4 = v4, .f5 = v5, .f6 = v6, .f7 = v7, .f8 = v8, .f9 = v9, .f10 = v10, .f11 = v11, .f12 = v12 }
-
-// Always safe, checks if the type can and does have this slot.
-#define MP_OBJ_TYPE_HAS_SLOT(t, f) ((t)->f)
-// Requires you know that this type can have this slot.
-#define MP_OBJ_TYPE_GET_SLOT(t, f) ((t)->f)
-// Always safe, returns NULL if the type cannot have this slot.
-#define MP_OBJ_TYPE_GET_SLOT_OR_NULL(t, f) ((t)->f)
-#define MP_OBJ_TYPE_SET_SLOT(t, f, v, n) ((t)->f = v)
-#define MP_OBJ_TYPE_OFFSETOF_SLOT(f) (offsetof(mp_obj_type_t, f))
-#define MP_OBJ_TYPE_HAS_SLOT_BY_OFFSET(t, offset) (*(void **)((char *)(t) + (offset)) != NULL)
-
-#elif MICROPY_OBJ_TYPE_REPR == MICROPY_OBJ_TYPE_REPR_SLOT_INDEX
-
 #define _MP_OBJ_TYPE_SLOT_TYPE_print (mp_print_fun_t)
 #define _MP_OBJ_TYPE_SLOT_TYPE_call (mp_call_fun_t)
 #define _MP_OBJ_TYPE_SLOT_TYPE_unary_op (mp_unary_op_fun_t)
@@ -783,8 +734,6 @@ typedef struct _mp_obj_full_type_t {
 // For everything except make_new, the offset is to the uint8_t index. For make_new, we need to check the pointer.
 #define MP_OBJ_TYPE_HAS_SLOT_BY_OFFSET(t, offset) (*(uint8_t *)((char *)(t) + (offset)) != 0 || (offset == offsetof(mp_obj_type_t, make_new) && t->make_new))
 
-#endif
-
 // Workaround for https://docs.microsoft.com/en-us/cpp/preprocessor/preprocessor-experimental-overview?view=msvc-160#macro-arguments-are-unpacked
 #define MP_DEFINE_CONST_OBJ_TYPE_EXPAND(x) x
 

From 165388e4eb5db1207f4d839abe77d417d4c3f7c3 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Tue, 13 Sep 2022 23:56:52 +1000
Subject: [PATCH 2624/3533] py/objtype: Optimise slot RAM usage for instance
 types.

In all cases other than where you have a native base with a protocol, it
now fits into 4 GC blocks (like it did before the slots representation).

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 py/misc.h          |  1 +
 py/objnamedtuple.c |  3 +--
 py/objtype.c       | 33 ++++++++++++++++++++-------------
 3 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/py/misc.h b/py/misc.h
index 134325f8946ff..7350d2f9b0c08 100644
--- a/py/misc.h
+++ b/py/misc.h
@@ -72,6 +72,7 @@ typedef unsigned int uint;
 #define m_new_obj(type) (m_new(type, 1))
 #define m_new_obj_maybe(type) (m_new_maybe(type, 1))
 #define m_new_obj_var(obj_type, var_type, var_num) ((obj_type *)m_malloc(sizeof(obj_type) + sizeof(var_type) * (var_num)))
+#define m_new_obj_var0(obj_type, var_type, var_num) ((obj_type *)m_malloc0(sizeof(obj_type) + sizeof(var_type) * (var_num)))
 #define m_new_obj_var_maybe(obj_type, var_type, var_num) ((obj_type *)m_malloc_maybe(sizeof(obj_type) + sizeof(var_type) * (var_num)))
 #if MICROPY_ENABLE_FINALISER
 #define m_new_obj_with_finaliser(type) ((type *)(m_malloc_with_finaliser(sizeof(type))))
diff --git a/py/objnamedtuple.c b/py/objnamedtuple.c
index cc55aec0b97c0..5666521617744 100644
--- a/py/objnamedtuple.c
+++ b/py/objnamedtuple.c
@@ -143,8 +143,7 @@ STATIC mp_obj_t namedtuple_make_new(const mp_obj_type_t *type_in, size_t n_args,
 }
 
 mp_obj_namedtuple_type_t *mp_obj_new_namedtuple_base(size_t n_fields, mp_obj_t *fields) {
-    mp_obj_namedtuple_type_t *o = m_new_obj_var(mp_obj_namedtuple_type_t, qstr, n_fields);
-    memset(&o->base, 0, sizeof(o->base));
+    mp_obj_namedtuple_type_t *o = m_new_obj_var0(mp_obj_namedtuple_type_t, qstr, n_fields);
     o->n_fields = n_fields;
     for (size_t i = 0; i < n_fields; i++) {
         o->fields[i] = mp_obj_str_get_qstr(fields[i]);
diff --git a/py/objtype.c b/py/objtype.c
index 968d6eb3ac32f..5b4e375bcc481 100644
--- a/py/objtype.c
+++ b/py/objtype.c
@@ -1148,10 +1148,15 @@ mp_obj_t mp_obj_new_type(qstr name, mp_obj_t bases_tuple, mp_obj_t locals_dict)
         #endif
     }
 
-    // Allocate a full-sized mp_obj_full_type_t instance (i.e. all slots / extended fields).
-    // Given that Python types use almost all the slots anyway, this doesn't cost anything
-    // extra.
-    mp_obj_type_t *o = (mp_obj_type_t *)m_new0(mp_obj_full_type_t, 1);
+    const void *base_protocol = NULL;
+    if (bases_len > 0) {
+        base_protocol = MP_OBJ_TYPE_GET_SLOT_OR_NULL(((mp_obj_type_t *)MP_OBJ_TO_PTR(bases_items[0])), protocol);
+    }
+
+    // Allocate a variable-sized mp_obj_type_t with as many slots as we need
+    // (currently 9, plus 1 for base, plus 1 for base-protocol).
+    // Note: 11 slots pushes it from 4 to 5 GC blocks.
+    mp_obj_type_t *o = m_new_obj_var0(mp_obj_type_t, void *, 9 + (bases_len ? 1 : 0) + (base_protocol ? 1 : 0));
     o->base.type = &mp_type_type;
     o->flags = base_flags;
     o->name = name;
@@ -1166,13 +1171,10 @@ mp_obj_t mp_obj_new_type(qstr name, mp_obj_t bases_tuple, mp_obj_t locals_dict)
     // MP_OBJ_TYPE_SET_SLOT(o, iternext, not implemented)
     MP_OBJ_TYPE_SET_SLOT(o, buffer, instance_get_buffer, 7);
 
-    if (bases_len > 0) {
-        // Inherit protocol from a base class. This allows to define an
-        // abstract base class which would translate C-level protocol to
-        // Python method calls, and any subclass inheriting from it will
-        // support this feature.
-        MP_OBJ_TYPE_SET_SLOT(o, protocol, MP_OBJ_TYPE_GET_SLOT_OR_NULL(((mp_obj_type_t *)MP_OBJ_TO_PTR(bases_items[0])), protocol), 8);
+    mp_obj_dict_t *locals_ptr = MP_OBJ_TO_PTR(locals_dict);
+    MP_OBJ_TYPE_SET_SLOT(o, locals_dict, locals_ptr, 8);
 
+    if (bases_len > 0) {
         if (bases_len >= 2) {
             #if MICROPY_MULTIPLE_INHERITANCE
             MP_OBJ_TYPE_SET_SLOT(o, parent, MP_OBJ_TO_PTR(bases_tuple), 9);
@@ -1182,10 +1184,15 @@ mp_obj_t mp_obj_new_type(qstr name, mp_obj_t bases_tuple, mp_obj_t locals_dict)
         } else {
             MP_OBJ_TYPE_SET_SLOT(o, parent, MP_OBJ_TO_PTR(bases_items[0]), 9);
         }
-    }
 
-    mp_obj_dict_t *locals_ptr = MP_OBJ_TO_PTR(locals_dict);
-    MP_OBJ_TYPE_SET_SLOT(o, locals_dict, locals_ptr, 10);
+        // Inherit protocol from a base class. This allows to define an
+        // abstract base class which would translate C-level protocol to
+        // Python method calls, and any subclass inheriting from it will
+        // support this feature.
+        if (base_protocol) {
+            MP_OBJ_TYPE_SET_SLOT(o, protocol, base_protocol, 10);
+        }
+    }
 
     #if ENABLE_SPECIAL_ACCESSORS
     // Check if the class has any special accessor methods

From 3c6127dfcfc63a2b48c31f751d1ae2c385874c8a Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Wed, 14 Sep 2022 00:39:48 +1000
Subject: [PATCH 2625/3533] py/objnamedtuple: Optimise slot RAM usage for
 namedtuple.

Rather than reserving a full 12-slot mp_obj_type_t, reserve enough room for
seven and cast as necessary.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 py/objnamedtuple.c | 25 +++++++++++++------------
 py/objnamedtuple.h |  7 +++----
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/py/objnamedtuple.c b/py/objnamedtuple.c
index 5666521617744..52536be8b4e97 100644
--- a/py/objnamedtuple.c
+++ b/py/objnamedtuple.c
@@ -104,7 +104,7 @@ STATIC mp_obj_t namedtuple_make_new(const mp_obj_type_t *type_in, size_t n_args,
         #elif MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_DETAILED
         mp_raise_msg_varg(&mp_type_TypeError,
             MP_ERROR_TEXT("%q() takes %d positional arguments but %d were given"),
-            type->base.name, num_fields, n_args + n_kw);
+            ((mp_obj_type_t *)&type->base)->name, num_fields, n_args + n_kw);
         #endif
     }
 
@@ -153,17 +153,18 @@ mp_obj_namedtuple_type_t *mp_obj_new_namedtuple_base(size_t n_fields, mp_obj_t *
 
 STATIC mp_obj_t mp_obj_new_namedtuple_type(qstr name, size_t n_fields, mp_obj_t *fields) {
     mp_obj_namedtuple_type_t *o = mp_obj_new_namedtuple_base(n_fields, fields);
-    o->base.base.type = &mp_type_type;
-    o->base.flags = MP_TYPE_FLAG_EQ_CHECKS_OTHER_TYPE; // can match tuple
-    o->base.name = name;
-    o->base.make_new = namedtuple_make_new;
-    MP_OBJ_TYPE_SET_SLOT(&o->base, print, namedtuple_print, 0);
-    MP_OBJ_TYPE_SET_SLOT(&o->base, unary_op, mp_obj_tuple_unary_op, 1);
-    MP_OBJ_TYPE_SET_SLOT(&o->base, binary_op, mp_obj_tuple_binary_op, 2);
-    MP_OBJ_TYPE_SET_SLOT(&o->base, attr, namedtuple_attr, 3);
-    MP_OBJ_TYPE_SET_SLOT(&o->base, subscr, mp_obj_tuple_subscr, 4);
-    MP_OBJ_TYPE_SET_SLOT(&o->base, getiter, mp_obj_tuple_getiter, 5);
-    MP_OBJ_TYPE_SET_SLOT(&o->base, parent, &mp_type_tuple, 6);
+    mp_obj_type_t *type = (mp_obj_type_t *)&o->base;
+    type->base.type = &mp_type_type;
+    type->flags = MP_TYPE_FLAG_EQ_CHECKS_OTHER_TYPE; // can match tuple
+    type->name = name;
+    type->make_new = namedtuple_make_new;
+    MP_OBJ_TYPE_SET_SLOT(type, print, namedtuple_print, 0);
+    MP_OBJ_TYPE_SET_SLOT(type, unary_op, mp_obj_tuple_unary_op, 1);
+    MP_OBJ_TYPE_SET_SLOT(type, binary_op, mp_obj_tuple_binary_op, 2);
+    MP_OBJ_TYPE_SET_SLOT(type, attr, namedtuple_attr, 3);
+    MP_OBJ_TYPE_SET_SLOT(type, subscr, mp_obj_tuple_subscr, 4);
+    MP_OBJ_TYPE_SET_SLOT(type, getiter, mp_obj_tuple_getiter, 5);
+    MP_OBJ_TYPE_SET_SLOT(type, parent, &mp_type_tuple, 6);
     return MP_OBJ_FROM_PTR(o);
 }
 
diff --git a/py/objnamedtuple.h b/py/objnamedtuple.h
index 9f23351d5a36c..db4a3d87d87fd 100644
--- a/py/objnamedtuple.h
+++ b/py/objnamedtuple.h
@@ -29,10 +29,9 @@
 #include "py/objtuple.h"
 
 typedef struct _mp_obj_namedtuple_type_t {
-    // Must use the full-size version to avoid this being a variable sized member.
-    // This means that named tuples use slightly more RAM than necessary, but
-    // no worse than if we didn't have slots/split representation.
-    mp_obj_full_type_t base;
+    // This is a mp_obj_type_t with seven slots.
+    mp_obj_empty_type_t base;
+    void *slots[7];
     size_t n_fields;
     qstr fields[];
 } mp_obj_namedtuple_type_t;

From 6da41b59007c9e9a2443ae17278d32210034a63f Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Fri, 16 Sep 2022 23:57:38 +1000
Subject: [PATCH 2626/3533] py/obj: Merge getiter and iternext mp_obj_type_t
 slots.

The goal here is to remove a slot (making way to turn make_new into a slot)
as well as reduce code size by the ~40 references to mp_identity_getiter
and mp_stream_unbuffered_iter.

This introduces two new type flags:
- MP_TYPE_FLAG_ITER_IS_ITERNEXT: This means that the "iter" slot in the
  type is "iternext", and should use the identity getiter.
- MP_TYPE_FLAG_ITER_IS_CUSTOM: This means that the "iter" slot is a pointer
  to a mp_getiter_iternext_custom_t instance, which then defines both
  getiter and iternext.

And a third flag that is the OR of both, MP_TYPE_FLAG_ITER_IS_STREAM: This
means that the type should use the identity getiter, and
mp_stream_unbuffered_iter as iternext.

Finally, MP_TYPE_FLAG_ITER_IS_GETITER is defined as a no-op flag to give
the default case where "iter" is "getiter".

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 examples/natmod/btree/btree_c.c               | 14 +++--
 extmod/modbtree.c                             | 10 +++-
 extmod/moduasyncio.c                          | 10 +++-
 extmod/moduselect.c                           |  5 +-
 extmod/modussl_axtls.c                        |  2 -
 extmod/modussl_mbedtls.c                      |  2 -
 extmod/vfs_fat_file.c                         |  8 +--
 extmod/vfs_lfsx_file.c                        |  8 +--
 extmod/vfs_posix_file.c                       |  8 +--
 ports/cc3200/mods/modussl.c                   |  3 -
 ports/cc3200/mods/pybuart.c                   |  4 +-
 ports/esp32/machine_i2s.c                     |  4 +-
 ports/esp32/machine_uart.c                    |  4 +-
 ports/esp8266/machine_uart.c                  |  4 +-
 ports/mimxrt/machine_i2s.c                    |  4 +-
 ports/mimxrt/machine_uart.c                   |  4 +-
 ports/nrf/boards/microbit/modules/iters.c     |  5 +-
 .../boards/microbit/modules/microbitimage.c   | 20 +++----
 ports/nrf/modules/machine/uart.c              |  4 +-
 ports/renesas-ra/machine_uart.c               |  4 +-
 ports/rp2/machine_i2s.c                       |  4 +-
 ports/rp2/machine_uart.c                      |  4 +-
 ports/stm32/machine_i2s.c                     |  4 +-
 ports/stm32/machine_uart.c                    |  4 +-
 ports/stm32/usb.c                             |  4 +-
 ports/unix/modjni.c                           |  4 +-
 ports/unix/moduselect.c                       |  5 +-
 ports/unix/modusocket.c                       |  2 -
 ports/zephyr/machine_uart.c                   |  4 +-
 py/obj.c                                      |  8 +--
 py/obj.h                                      | 56 ++++++++++++-------
 py/objarray.c                                 | 17 +++---
 py/objattrtuple.c                             |  4 +-
 py/objdict.c                                  | 17 +++---
 py/objenumerate.c                             |  5 +-
 py/objfilter.c                                |  5 +-
 py/objgenerator.c                             |  5 +-
 py/objgetitemiter.c                           |  5 +-
 py/objlist.c                                  |  4 +-
 py/objmap.c                                   |  5 +-
 py/objnamedtuple.c                            |  2 +-
 py/objpolyiter.c                              | 10 ++--
 py/objrange.c                                 |  7 +--
 py/objreversed.c                              |  5 +-
 py/objset.c                                   |  8 +--
 py/objstr.c                                   |  4 +-
 py/objstringio.c                              |  8 +--
 py/objstrunicode.c                            |  4 +-
 py/objtuple.c                                 |  8 +--
 py/objtype.c                                  | 23 +++++---
 py/objzip.c                                   |  5 +-
 py/runtime.c                                  | 52 +++++++++++------
 shared/runtime/sys_stdio_mphal.c              |  8 +--
 tests/basics/io_stringio_base.py              | 24 ++++++++
 54 files changed, 234 insertions(+), 227 deletions(-)
 create mode 100644 tests/basics/io_stringio_base.py

diff --git a/examples/natmod/btree/btree_c.c b/examples/natmod/btree/btree_c.c
index af7535a68f7f7..c897f2e9a3859 100644
--- a/examples/natmod/btree/btree_c.c
+++ b/examples/natmod/btree/btree_c.c
@@ -95,6 +95,7 @@ int mp_stream_posix_fsync(void *stream) {
 }
 
 mp_obj_full_type_t btree_type;
+mp_getiter_iternext_custom_t btree_getiter_iternext;
 
 #include "extmod/modbtree.c"
 
@@ -122,13 +123,16 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(btree_open_obj, 5, 5, btree_open);
 mp_obj_t mpy_init(mp_obj_fun_bc_t *self, size_t n_args, size_t n_kw, mp_obj_t *args) {
     MP_DYNRUNTIME_INIT_ENTRY
 
+    btree_getiter_iternext.getiter = btree_getiter;
+    btree_getiter_iternext.iternext = btree_iternext;
+
     btree_type.base.type = (void*)&mp_fun_table.type_type;
+    btree_type.flags = MP_TYPE_FLAG_ITER_IS_CUSTOM;
     btree_type.name = MP_QSTR_btree;
     MP_OBJ_TYPE_SET_SLOT(&btree_type, print, btree_print, 0);
-    MP_OBJ_TYPE_SET_SLOT(&btree_type, getiter, btree_getiter, 1);
-    MP_OBJ_TYPE_SET_SLOT(&btree_type, iternext, btree_iternext, 2);
-    MP_OBJ_TYPE_SET_SLOT(&btree_type, binary_op, btree_binary_op, 3);
-    MP_OBJ_TYPE_SET_SLOT(&btree_type, subscr, btree_subscr, 4);
+    MP_OBJ_TYPE_SET_SLOT(&btree_type, iter, &btree_getiter_iternext, 1);
+    MP_OBJ_TYPE_SET_SLOT(&btree_type, binary_op, btree_binary_op, 2);
+    MP_OBJ_TYPE_SET_SLOT(&btree_type, subscr, btree_subscr, 3);
     btree_locals_dict_table[0] = (mp_map_elem_t){ MP_OBJ_NEW_QSTR(MP_QSTR_close), MP_OBJ_FROM_PTR(&btree_close_obj) };
     btree_locals_dict_table[1] = (mp_map_elem_t){ MP_OBJ_NEW_QSTR(MP_QSTR_flush), MP_OBJ_FROM_PTR(&btree_flush_obj) };
     btree_locals_dict_table[2] = (mp_map_elem_t){ MP_OBJ_NEW_QSTR(MP_QSTR_get), MP_OBJ_FROM_PTR(&btree_get_obj) };
@@ -137,7 +141,7 @@ mp_obj_t mpy_init(mp_obj_fun_bc_t *self, size_t n_args, size_t n_kw, mp_obj_t *a
     btree_locals_dict_table[5] = (mp_map_elem_t){ MP_OBJ_NEW_QSTR(MP_QSTR_keys), MP_OBJ_FROM_PTR(&btree_keys_obj) };
     btree_locals_dict_table[6] = (mp_map_elem_t){ MP_OBJ_NEW_QSTR(MP_QSTR_values), MP_OBJ_FROM_PTR(&btree_values_obj) };
     btree_locals_dict_table[7] = (mp_map_elem_t){ MP_OBJ_NEW_QSTR(MP_QSTR_items), MP_OBJ_FROM_PTR(&btree_items_obj) };
-    MP_OBJ_TYPE_SET_SLOT(&btree_type, locals_dict, (void*)&btree_locals_dict, 5);
+    MP_OBJ_TYPE_SET_SLOT(&btree_type, locals_dict, (void*)&btree_locals_dict, 4);
 
     mp_store_global(MP_QSTR__open, MP_OBJ_FROM_PTR(&btree_open_obj));
     mp_store_global(MP_QSTR_INCL, MP_OBJ_NEW_SMALL_INT(FLAG_END_KEY_INCL));
diff --git a/extmod/modbtree.c b/extmod/modbtree.c
index 60c6885e6b2cc..f21fe3ff94173 100644
--- a/extmod/modbtree.c
+++ b/extmod/modbtree.c
@@ -319,15 +319,19 @@ STATIC const mp_rom_map_elem_t btree_locals_dict_table[] = {
 
 STATIC MP_DEFINE_CONST_DICT(btree_locals_dict, btree_locals_dict_table);
 
+STATIC const mp_getiter_iternext_custom_t btree_getiter_iternext = {
+    .getiter = btree_getiter,
+    .iternext = btree_iternext,
+};
+
 STATIC MP_DEFINE_CONST_OBJ_TYPE(
     btree_type,
     MP_QSTR_btree,
-    MP_TYPE_FLAG_NONE,
+    MP_TYPE_FLAG_ITER_IS_CUSTOM,
     MP_TYPE_NULL_MAKE_NEW,
     // Save on qstr's, reuse same as for module
     print, btree_print,
-    getiter, btree_getiter,
-    iternext, btree_iternext,
+    iter, &btree_getiter_iternext,
     binary_op, btree_binary_op,
     subscr, btree_subscr,
     locals_dict, &btree_locals_dict
diff --git a/extmod/moduasyncio.c b/extmod/moduasyncio.c
index 546764209608a..b0eb8b6509c82 100644
--- a/extmod/moduasyncio.c
+++ b/extmod/moduasyncio.c
@@ -287,14 +287,18 @@ STATIC mp_obj_t task_iternext(mp_obj_t self_in) {
     return mp_const_none;
 }
 
+STATIC const mp_getiter_iternext_custom_t task_getiter_iternext = {
+    .getiter = task_getiter,
+    .iternext = task_iternext,
+};
+
 STATIC MP_DEFINE_CONST_OBJ_TYPE(
     task_type,
     MP_QSTR_Task,
-    MP_TYPE_FLAG_NONE,
+    MP_TYPE_FLAG_ITER_IS_CUSTOM,
     task_make_new,
     attr, task_attr,
-    getiter, task_getiter,
-    iternext, task_iternext
+    iter, &task_getiter_iternext
     );
 
 /******************************************************************************/
diff --git a/extmod/moduselect.c b/extmod/moduselect.c
index 352b15d983d84..58bd1169a945e 100644
--- a/extmod/moduselect.c
+++ b/extmod/moduselect.c
@@ -339,10 +339,9 @@ STATIC MP_DEFINE_CONST_DICT(poll_locals_dict, poll_locals_dict_table);
 STATIC MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_poll,
     MP_QSTR_poll,
-    MP_TYPE_FLAG_NONE,
+    MP_TYPE_FLAG_ITER_IS_ITERNEXT,
     MP_TYPE_NULL_MAKE_NEW,
-    getiter, mp_identity_getiter,
-    iternext, poll_iternext,
+    iter, poll_iternext,
     locals_dict, &poll_locals_dict
     );
 
diff --git a/extmod/modussl_axtls.c b/extmod/modussl_axtls.c
index 78470ea6df046..a6d606d560ebe 100644
--- a/extmod/modussl_axtls.c
+++ b/extmod/modussl_axtls.c
@@ -321,8 +321,6 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_NULL_MAKE_NEW,
     // Save on qstr's, reuse same as for module
     print, ussl_socket_print,
-    getiter, NULL,
-    iternext, NULL,
     protocol, &ussl_socket_stream_p,
     locals_dict, &ussl_socket_locals_dict
     );
diff --git a/extmod/modussl_mbedtls.c b/extmod/modussl_mbedtls.c
index 76ca3ac719c91..50712980ba04f 100644
--- a/extmod/modussl_mbedtls.c
+++ b/extmod/modussl_mbedtls.c
@@ -399,8 +399,6 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_NULL_MAKE_NEW,
     // Save on qstr's, reuse same as for module
     print, socket_print,
-    getiter, NULL,
-    iternext, NULL,
     protocol, &ussl_socket_stream_p,
     locals_dict, &ussl_socket_locals_dict
     );
diff --git a/extmod/vfs_fat_file.c b/extmod/vfs_fat_file.c
index 00980459db8b9..ca2e2b446f13d 100644
--- a/extmod/vfs_fat_file.c
+++ b/extmod/vfs_fat_file.c
@@ -179,11 +179,9 @@ STATIC const mp_stream_p_t vfs_fat_fileio_stream_p = {
 MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_vfs_fat_fileio,
     MP_QSTR_FileIO,
-    MP_TYPE_FLAG_NONE,
+    MP_TYPE_FLAG_ITER_IS_STREAM,
     MP_TYPE_NULL_MAKE_NEW,
     print, file_obj_print,
-    getiter, mp_identity_getiter,
-    iternext, mp_stream_unbuffered_iter,
     protocol, &vfs_fat_fileio_stream_p,
     locals_dict, &vfs_fat_rawfile_locals_dict
     );
@@ -198,11 +196,9 @@ STATIC const mp_stream_p_t vfs_fat_textio_stream_p = {
 MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_vfs_fat_textio,
     MP_QSTR_TextIOWrapper,
-    MP_TYPE_FLAG_NONE,
+    MP_TYPE_FLAG_ITER_IS_STREAM,
     MP_TYPE_NULL_MAKE_NEW,
     print, file_obj_print,
-    getiter, mp_identity_getiter,
-    iternext, mp_stream_unbuffered_iter,
     protocol, &vfs_fat_textio_stream_p,
     locals_dict, &vfs_fat_rawfile_locals_dict
     );
diff --git a/extmod/vfs_lfsx_file.c b/extmod/vfs_lfsx_file.c
index fda1b97b2a13c..f97641b7b951a 100644
--- a/extmod/vfs_lfsx_file.c
+++ b/extmod/vfs_lfsx_file.c
@@ -223,11 +223,9 @@ STATIC const mp_stream_p_t MP_VFS_LFSx(fileio_stream_p) = {
 MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_VFS_LFSx_(_fileio),
     MP_QSTR_FileIO,
-    MP_TYPE_FLAG_NONE,
+    MP_TYPE_FLAG_ITER_IS_STREAM,
     MP_TYPE_NULL_MAKE_NEW,
     print, MP_VFS_LFSx(file_print),
-    getiter, mp_identity_getiter,
-    iternext, mp_stream_unbuffered_iter,
     protocol, &MP_VFS_LFSx(fileio_stream_p),
     locals_dict, &MP_VFS_LFSx(file_locals_dict)
     );
@@ -242,11 +240,9 @@ STATIC const mp_stream_p_t MP_VFS_LFSx(textio_stream_p) = {
 MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_VFS_LFSx_(_textio),
     MP_QSTR_TextIOWrapper,
-    MP_TYPE_FLAG_NONE,
+    MP_TYPE_FLAG_ITER_IS_STREAM,
     MP_TYPE_NULL_MAKE_NEW,
     print, MP_VFS_LFSx(file_print),
-    getiter, mp_identity_getiter,
-    iternext, mp_stream_unbuffered_iter,
     protocol, &MP_VFS_LFSx(textio_stream_p),
     locals_dict, &MP_VFS_LFSx(file_locals_dict)
     );
diff --git a/extmod/vfs_posix_file.c b/extmod/vfs_posix_file.c
index f0b5436fe1ea4..729d914d3a11a 100644
--- a/extmod/vfs_posix_file.c
+++ b/extmod/vfs_posix_file.c
@@ -252,11 +252,9 @@ STATIC const mp_stream_p_t vfs_posix_fileio_stream_p = {
 MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_vfs_posix_fileio,
     MP_QSTR_FileIO,
-    MP_TYPE_FLAG_NONE,
+    MP_TYPE_FLAG_ITER_IS_STREAM,
     MP_TYPE_NULL_MAKE_NEW,
     print, vfs_posix_file_print,
-    getiter, mp_identity_getiter,
-    iternext, mp_stream_unbuffered_iter,
     protocol, &vfs_posix_fileio_stream_p,
     locals_dict, &vfs_posix_rawfile_locals_dict
     );
@@ -271,11 +269,9 @@ STATIC const mp_stream_p_t vfs_posix_textio_stream_p = {
 MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_vfs_posix_textio,
     MP_QSTR_TextIOWrapper,
-    MP_TYPE_FLAG_NONE,
+    MP_TYPE_FLAG_ITER_IS_STREAM,
     MP_TYPE_NULL_MAKE_NEW,
     print, vfs_posix_file_print,
-    getiter, mp_identity_getiter,
-    iternext, mp_stream_unbuffered_iter,
     protocol, &vfs_posix_textio_stream_p,
     locals_dict, &vfs_posix_rawfile_locals_dict
     );
diff --git a/ports/cc3200/mods/modussl.c b/ports/cc3200/mods/modussl.c
index abc9917c8134c..118cbd06f8fad 100644
--- a/ports/cc3200/mods/modussl.c
+++ b/ports/cc3200/mods/modussl.c
@@ -64,9 +64,6 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     ssl_socket_type,
     MP_QSTR_ussl,
     MP_TYPE_FLAG_NONE,
-    MP_TYPE_NULL_MAKE_NEW,
-    getiter, NULL,
-    iternext, NULL,
     protocol, &socket_stream_p,
     locals_dict, &socket_locals_dict
     );
diff --git a/ports/cc3200/mods/pybuart.c b/ports/cc3200/mods/pybuart.c
index e7896c4ca5cfa..f92f544732209 100644
--- a/ports/cc3200/mods/pybuart.c
+++ b/ports/cc3200/mods/pybuart.c
@@ -688,11 +688,9 @@ STATIC const mp_irq_methods_t uart_irq_methods = {
 MP_DEFINE_CONST_OBJ_TYPE(
     pyb_uart_type,
     MP_QSTR_UART,
-    MP_TYPE_FLAG_NONE,
+    MP_TYPE_FLAG_ITER_IS_STREAM,
     pyb_uart_make_new,
     print, pyb_uart_print,
-    getiter, mp_identity_getiter,
-    iternext, mp_stream_unbuffered_iter,
     protocol, &uart_stream_p,
     locals_dict, &pyb_uart_locals_dict
     );
diff --git a/ports/esp32/machine_i2s.c b/ports/esp32/machine_i2s.c
index b853f418ada3c..6e18394cc5e56 100644
--- a/ports/esp32/machine_i2s.c
+++ b/ports/esp32/machine_i2s.c
@@ -832,11 +832,9 @@ STATIC const mp_stream_p_t i2s_stream_p = {
 MP_DEFINE_CONST_OBJ_TYPE(
     machine_i2s_type,
     MP_QSTR_I2S,
-    MP_TYPE_FLAG_NONE,
+    MP_TYPE_FLAG_ITER_IS_STREAM,
     machine_i2s_make_new,
     print, machine_i2s_print,
-    getiter, mp_identity_getiter,
-    iternext, mp_stream_unbuffered_iter,
     protocol, &i2s_stream_p,
     locals_dict, &machine_i2s_locals_dict
     );
diff --git a/ports/esp32/machine_uart.c b/ports/esp32/machine_uart.c
index 6e091b8838a23..1f404154fc5ba 100644
--- a/ports/esp32/machine_uart.c
+++ b/ports/esp32/machine_uart.c
@@ -533,11 +533,9 @@ STATIC const mp_stream_p_t uart_stream_p = {
 MP_DEFINE_CONST_OBJ_TYPE(
     machine_uart_type,
     MP_QSTR_UART,
-    MP_TYPE_FLAG_NONE,
+    MP_TYPE_FLAG_ITER_IS_STREAM,
     machine_uart_make_new,
     print, machine_uart_print,
-    getiter, mp_identity_getiter,
-    iternext, mp_stream_unbuffered_iter,
     protocol, &uart_stream_p,
     locals_dict, &machine_uart_locals_dict
     );
diff --git a/ports/esp8266/machine_uart.c b/ports/esp8266/machine_uart.c
index c737f854c34f3..af6231c21903b 100644
--- a/ports/esp8266/machine_uart.c
+++ b/ports/esp8266/machine_uart.c
@@ -346,11 +346,9 @@ STATIC const mp_stream_p_t uart_stream_p = {
 MP_DEFINE_CONST_OBJ_TYPE(
     pyb_uart_type,
     MP_QSTR_UART,
-    MP_TYPE_FLAG_NONE,
+    MP_TYPE_FLAG_ITER_IS_STREAM,
     pyb_uart_make_new,
     print, pyb_uart_print,
-    getiter, mp_identity_getiter,
-    iternext, mp_stream_unbuffered_iter,
     protocol, &uart_stream_p,
     locals_dict, &pyb_uart_locals_dict
     );
diff --git a/ports/mimxrt/machine_i2s.c b/ports/mimxrt/machine_i2s.c
index 13380b4ee6b09..b6c630138b76b 100644
--- a/ports/mimxrt/machine_i2s.c
+++ b/ports/mimxrt/machine_i2s.c
@@ -1216,11 +1216,9 @@ STATIC const mp_stream_p_t i2s_stream_p = {
 MP_DEFINE_CONST_OBJ_TYPE(
     machine_i2s_type,
     MP_QSTR_I2S,
-    MP_TYPE_FLAG_NONE,
+    MP_TYPE_FLAG_ITER_IS_STREAM,
     machine_i2s_make_new,
     print, machine_i2s_print,
-    getiter, mp_identity_getiter,
-    iternext, mp_stream_unbuffered_iter,
     protocol, &i2s_stream_p,
     locals_dict, &machine_i2s_locals_dict
     );
diff --git a/ports/mimxrt/machine_uart.c b/ports/mimxrt/machine_uart.c
index 9d4873274a8fe..e93d2478f3ff6 100644
--- a/ports/mimxrt/machine_uart.c
+++ b/ports/mimxrt/machine_uart.c
@@ -472,11 +472,9 @@ STATIC const mp_stream_p_t uart_stream_p = {
 MP_DEFINE_CONST_OBJ_TYPE(
     machine_uart_type,
     MP_QSTR_UART,
-    MP_TYPE_FLAG_NONE,
+    MP_TYPE_FLAG_ITER_IS_STREAM,
     machine_uart_make_new,
     print, machine_uart_print,
-    getiter, mp_identity_getiter,
-    iternext, mp_stream_unbuffered_iter,
     protocol, &uart_stream_p,
     locals_dict, &machine_uart_locals_dict
     );
diff --git a/ports/nrf/boards/microbit/modules/iters.c b/ports/nrf/boards/microbit/modules/iters.c
index 296fc1f51c525..2fe14866914fd 100644
--- a/ports/nrf/boards/microbit/modules/iters.c
+++ b/ports/nrf/boards/microbit/modules/iters.c
@@ -46,10 +46,9 @@ static mp_obj_t microbit_repeat_iter_next(mp_obj_t iter_in) {
 MP_DEFINE_CONST_OBJ_TYPE(
     microbit_repeat_iterator_type,
     MP_QSTR_iterator,
-    MP_TYPE_FLAG_NONE,
+    MP_TYPE_FLAG_ITER_IS_ITERNEXT,
     MP_TYPE_NULL_MAKE_NEW,
-    getiter, mp_identity_getiter,
-    iternext, microbit_repeat_iter_next
+    iter, microbit_repeat_iter_next
     );
 
 mp_obj_t microbit_repeat_iterator(mp_obj_t iterable) {
diff --git a/ports/nrf/boards/microbit/modules/microbitimage.c b/ports/nrf/boards/microbit/modules/microbitimage.c
index 4870b6738f6c0..b22c2e29acec9 100644
--- a/ports/nrf/boards/microbit/modules/microbitimage.c
+++ b/ports/nrf/boards/microbit/modules/microbitimage.c
@@ -824,18 +824,16 @@ STATIC mp_obj_t microbit_scrolling_string_iter_next(mp_obj_t o_in) {
 MP_DEFINE_CONST_OBJ_TYPE(
     microbit_scrolling_string_type,
     MP_QSTR_ScrollingString,
-    MP_TYPE_FLAG_NONE,
-    MP_TYPE_NULL_MAKE_NEW,
-    getiter, get_microbit_scrolling_string_iter
+    MP_TYPE_FLAG_ITER_IS_GETITER,
+    iter, get_microbit_scrolling_string_iter
     );
 
 MP_DEFINE_CONST_OBJ_TYPE(
     microbit_scrolling_string_iterator_type,
     MP_QSTR_iterator,
-    MP_TYPE_FLAG_NONE,
+    MP_TYPE_FLAG_ITER_IS_ITERNEXT,
     MP_TYPE_NULL_MAKE_NEW,
-    getiter, mp_identity_getiter,
-    iternext, microbit_scrolling_string_iter_next
+    iter, microbit_scrolling_string_iter_next
     );
 
 /** Facade types to present a string as a sequence of images.
@@ -877,11 +875,10 @@ static mp_obj_t microbit_facade_iterator(mp_obj_t iterable_in, mp_obj_iter_buf_t
 MP_DEFINE_CONST_OBJ_TYPE(
     string_image_facade_type,
     MP_QSTR_Facade,
-    MP_TYPE_FLAG_NONE,
-    MP_TYPE_NULL_MAKE_NEW,
+    MP_TYPE_FLAG_ITER_IS_GETITER,
     unary_op, facade_unary_op,
     subscr, string_image_facade_subscr,
-    getiter, microbit_facade_iterator
+    iter, microbit_facade_iterator
     );
 
 
@@ -914,10 +911,9 @@ static mp_obj_t microbit_facade_iter_next(mp_obj_t iter_in) {
 MP_DEFINE_CONST_OBJ_TYPE(
     microbit_facade_iterator_type,
     MP_QSTR_iterator,
-    MP_TYPE_FLAG_NONE,
+    MP_TYPE_FLAG_ITER_IS_ITERNEXT,
     MP_TYPE_NULL_MAKE_NEW,
-    getiter, mp_identity_getiter,
-    iternext, microbit_facade_iter_next
+    iter, microbit_facade_iter_next
     );
 
 mp_obj_t microbit_facade_iterator(mp_obj_t iterable_in, mp_obj_iter_buf_t *iter_buf) {
diff --git a/ports/nrf/modules/machine/uart.c b/ports/nrf/modules/machine/uart.c
index fc0bd682b4b7d..ca0fcf859a55a 100644
--- a/ports/nrf/modules/machine/uart.c
+++ b/ports/nrf/modules/machine/uart.c
@@ -373,11 +373,9 @@ STATIC const mp_stream_p_t uart_stream_p = {
 MP_DEFINE_CONST_OBJ_TYPE(
     machine_hard_uart_type,
     MP_QSTR_UART,
-    MP_TYPE_FLAG_NONE,
+    MP_TYPE_FLAG_ITER_IS_STREAM,
     machine_hard_uart_make_new,
     print, machine_hard_uart_print,
-    getiter, mp_identity_getiter,
-    iternext, mp_stream_unbuffered_iter,
     protocol, &uart_stream_p,
     locals_dict, &machine_hard_uart_locals_dict
     );
diff --git a/ports/renesas-ra/machine_uart.c b/ports/renesas-ra/machine_uart.c
index 11f5d6825eb2d..6fa84ca821e4e 100644
--- a/ports/renesas-ra/machine_uart.c
+++ b/ports/renesas-ra/machine_uart.c
@@ -574,12 +574,10 @@ STATIC const mp_stream_p_t uart_stream_p = {
 MP_DEFINE_CONST_OBJ_TYPE(
     machine_uart_type,
     MP_QSTR_UART,
-    MP_TYPE_FLAG_NONE,
+    MP_TYPE_FLAG_ITER_IS_STREAM,
     machine_uart_make_new,
     locals_dict, &machine_uart_locals_dict,
     print, machine_uart_print,
-    getiter, mp_identity_getiter,
-    iternext, mp_stream_unbuffered_iter,
     protocol, &uart_stream_p
     );
 
diff --git a/ports/rp2/machine_i2s.c b/ports/rp2/machine_i2s.c
index 9d70a476f30b1..53ff7417d79a7 100644
--- a/ports/rp2/machine_i2s.c
+++ b/ports/rp2/machine_i2s.c
@@ -1140,11 +1140,9 @@ STATIC const mp_stream_p_t i2s_stream_p = {
 MP_DEFINE_CONST_OBJ_TYPE(
     machine_i2s_type,
     MP_QSTR_I2S,
-    MP_TYPE_FLAG_NONE,
+    MP_TYPE_FLAG_ITER_IS_STREAM,
     machine_i2s_make_new,
     print, machine_i2s_print,
-    getiter, mp_identity_getiter,
-    iternext, mp_stream_unbuffered_iter,
     protocol, &i2s_stream_p,
     locals_dict, &machine_i2s_locals_dict
     );
diff --git a/ports/rp2/machine_uart.c b/ports/rp2/machine_uart.c
index bb8bf51be6511..06f7e9aaaca2c 100644
--- a/ports/rp2/machine_uart.c
+++ b/ports/rp2/machine_uart.c
@@ -582,11 +582,9 @@ STATIC const mp_stream_p_t uart_stream_p = {
 MP_DEFINE_CONST_OBJ_TYPE(
     machine_uart_type,
     MP_QSTR_UART,
-    MP_TYPE_FLAG_NONE,
+    MP_TYPE_FLAG_ITER_IS_STREAM,
     machine_uart_make_new,
     print, machine_uart_print,
-    getiter, mp_identity_getiter,
-    iternext, mp_stream_unbuffered_iter,
     protocol, &uart_stream_p,
     locals_dict, &machine_uart_locals_dict
     );
diff --git a/ports/stm32/machine_i2s.c b/ports/stm32/machine_i2s.c
index 93a465d07ca8a..d68648bc348a5 100644
--- a/ports/stm32/machine_i2s.c
+++ b/ports/stm32/machine_i2s.c
@@ -1117,11 +1117,9 @@ STATIC const mp_stream_p_t i2s_stream_p = {
 MP_DEFINE_CONST_OBJ_TYPE(
     machine_i2s_type,
     MP_QSTR_I2S,
-    MP_TYPE_FLAG_NONE,
+    MP_TYPE_FLAG_ITER_IS_STREAM,
     machine_i2s_make_new,
     print, machine_i2s_print,
-    getiter, mp_identity_getiter,
-    iternext, mp_stream_unbuffered_iter,
     protocol, &i2s_stream_p,
     locals_dict, &machine_i2s_locals_dict
     );
diff --git a/ports/stm32/machine_uart.c b/ports/stm32/machine_uart.c
index 5851d8cf352df..4ccff8c136ada 100644
--- a/ports/stm32/machine_uart.c
+++ b/ports/stm32/machine_uart.c
@@ -663,11 +663,9 @@ STATIC const mp_stream_p_t uart_stream_p = {
 MP_DEFINE_CONST_OBJ_TYPE(
     pyb_uart_type,
     MP_QSTR_UART,
-    MP_TYPE_FLAG_NONE,
+    MP_TYPE_FLAG_ITER_IS_STREAM,
     pyb_uart_make_new,
     print, pyb_uart_print,
-    getiter, mp_identity_getiter,
-    iternext, mp_stream_unbuffered_iter,
     protocol, &uart_stream_p,
     locals_dict, &pyb_uart_locals_dict
     );
diff --git a/ports/stm32/usb.c b/ports/stm32/usb.c
index df755fe984c30..e389ef68f2aae 100644
--- a/ports/stm32/usb.c
+++ b/ports/stm32/usb.c
@@ -939,11 +939,9 @@ STATIC const mp_stream_p_t pyb_usb_vcp_stream_p = {
 MP_DEFINE_CONST_OBJ_TYPE(
     pyb_usb_vcp_type,
     MP_QSTR_USB_VCP,
-    MP_TYPE_FLAG_NONE,
+    MP_TYPE_FLAG_ITER_IS_STREAM,
     pyb_usb_vcp_make_new,
     print, pyb_usb_vcp_print,
-    getiter, mp_identity_getiter,
-    iternext, mp_stream_unbuffered_iter,
     protocol, &pyb_usb_vcp_stream_p,
     locals_dict, &pyb_usb_vcp_locals_dict
     );
diff --git a/ports/unix/modjni.c b/ports/unix/modjni.c
index 02368e453716b..e6b874b235ecb 100644
--- a/ports/unix/modjni.c
+++ b/ports/unix/modjni.c
@@ -325,13 +325,13 @@ STATIC mp_obj_t subscr_getiter(mp_obj_t self_in, mp_obj_iter_buf_t *iter_buf) {
 STATIC MP_DEFINE_CONST_OBJ_TYPE(
     jobject_type,
     MP_QSTR_jobject,
-    MP_TYPE_FLAG_NONE,
+    MP_TYPE_FLAG_ITER_IS_GETITER,
     MP_TYPE_NULL_MAKE_NEW,
     print, jobject_print,
     unary_op, jobject_unary_op,
     attr, jobject_attr,
     subscr, jobject_subscr,
-    getiter, subscr_getiter,
+    iter, subscr_getiter,
     //    .locals_dict = &jobject_locals_dict,
     );
 
diff --git a/ports/unix/moduselect.c b/ports/unix/moduselect.c
index baed88761c463..674841bf1871d 100644
--- a/ports/unix/moduselect.c
+++ b/ports/unix/moduselect.c
@@ -314,10 +314,9 @@ STATIC MP_DEFINE_CONST_DICT(poll_locals_dict, poll_locals_dict_table);
 STATIC MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_poll,
     MP_QSTR_poll,
-    MP_TYPE_FLAG_NONE,
+    MP_TYPE_FLAG_ITER_IS_ITERNEXT,
     MP_TYPE_NULL_MAKE_NEW,
-    getiter, mp_identity_getiter,
-    iternext, poll_iternext,
+    iter, poll_iternext,
     locals_dict, &poll_locals_dict
     );
 
diff --git a/ports/unix/modusocket.c b/ports/unix/modusocket.c
index 21260f0b2ada5..dfbf15cd3efd3 100644
--- a/ports/unix/modusocket.c
+++ b/ports/unix/modusocket.c
@@ -522,8 +522,6 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     socket_make_new,
     print, socket_print,
-    getiter, NULL,
-    iternext, NULL,
     protocol, &usocket_stream_p,
     locals_dict, &usocket_locals_dict
     );
diff --git a/ports/zephyr/machine_uart.c b/ports/zephyr/machine_uart.c
index 9580d37907812..867c5ae8863a0 100644
--- a/ports/zephyr/machine_uart.c
+++ b/ports/zephyr/machine_uart.c
@@ -157,11 +157,9 @@ STATIC const mp_stream_p_t uart_stream_p = {
 MP_DEFINE_CONST_OBJ_TYPE(
     machine_uart_type,
     MP_QSTR_UART,
-    MP_TYPE_FLAG_NONE,
+    MP_TYPE_FLAG_ITER_IS_STREAM,
     machine_uart_make_new,
     print, machine_uart_print,
-    getiter, mp_identity_getiter,
-    iternext, mp_stream_unbuffered_iter,
     protocol, &uart_stream_p,
     locals_dict, &machine_uart_locals_dict
     );
diff --git a/py/obj.c b/py/obj.c
index 359c73b9c2120..eb17308fed884 100644
--- a/py/obj.c
+++ b/py/obj.c
@@ -572,10 +572,10 @@ mp_obj_t mp_identity(mp_obj_t self) {
 }
 MP_DEFINE_CONST_FUN_OBJ_1(mp_identity_obj, mp_identity);
 
-mp_obj_t mp_identity_getiter(mp_obj_t self, mp_obj_iter_buf_t *iter_buf) {
-    (void)iter_buf;
-    return self;
-}
+// mp_obj_t mp_identity_getiter(mp_obj_t self, mp_obj_iter_buf_t *iter_buf) {
+//     (void)iter_buf;
+//     return self;
+// }
 
 bool mp_get_buffer(mp_obj_t obj, mp_buffer_info_t *bufinfo, mp_uint_t flags) {
     const mp_obj_type_t *type = mp_obj_get_type(obj);
diff --git a/py/obj.h b/py/obj.h
index 878fa673487a5..b1d722080c665 100644
--- a/py/obj.h
+++ b/py/obj.h
@@ -507,12 +507,20 @@ typedef mp_obj_t (*mp_fun_kw_t)(size_t n, const mp_obj_t *, mp_map_t *);
 // Flags for type behaviour (mp_obj_type_t.flags)
 // If MP_TYPE_FLAG_EQ_NOT_REFLEXIVE is clear then __eq__ is reflexive (A==A returns True).
 // If MP_TYPE_FLAG_EQ_CHECKS_OTHER_TYPE is clear then the type can't be equal to an
-// instance of any different class that also clears this flag.  If this flag is set
-// then the type may check for equality against a different type.
+//   instance of any different class that also clears this flag.  If this flag is set
+//   then the type may check for equality against a different type.
 // If MP_TYPE_FLAG_EQ_HAS_NEQ_TEST is clear then the type only implements the __eq__
-// operator and not the __ne__ operator.  If it's set then __ne__ may be implemented.
+//   operator and not the __ne__ operator.  If it's set then __ne__ may be implemented.
 // If MP_TYPE_FLAG_BINDS_SELF is set then the type as a method binds self as the first arg.
 // If MP_TYPE_FLAG_BUILTIN_FUN is set then the type is a built-in function type.
+// MP_TYPE_FLAG_ITER_IS_GETITER is a no-op flag that means the default behaviour for the
+//   iter slot and it's the getiter function.
+// If MP_TYPE_FLAG_ITER_IS_ITERNEXT is set then the "iter" slot is the iternext
+//   function and getiter will be automatically implemented as "return self".
+// If MP_TYPE_FLAG_ITER_IS_CUSTOM is set then the "iter" slot is a pointer to a
+//   mp_getiter_iternext_custom_t struct instance (with both .getiter and .iternext set).
+// If MP_TYPE_FLAG_ITER_IS_STREAM is set then the type implicitly gets a "return self"
+//   getiter, and mp_stream_unbuffered_iter for iternext.
 #define MP_TYPE_FLAG_NONE (0x0000)
 #define MP_TYPE_FLAG_IS_SUBCLASSED (0x0001)
 #define MP_TYPE_FLAG_HAS_SPECIAL_ACCESSORS (0x0002)
@@ -521,6 +529,10 @@ typedef mp_obj_t (*mp_fun_kw_t)(size_t n, const mp_obj_t *, mp_map_t *);
 #define MP_TYPE_FLAG_EQ_HAS_NEQ_TEST (0x0010)
 #define MP_TYPE_FLAG_BINDS_SELF (0x0020)
 #define MP_TYPE_FLAG_BUILTIN_FUN (0x0040)
+#define MP_TYPE_FLAG_ITER_IS_GETITER (0x0000)
+#define MP_TYPE_FLAG_ITER_IS_ITERNEXT (0x0080)
+#define MP_TYPE_FLAG_ITER_IS_CUSTOM (0x0100)
+#define MP_TYPE_FLAG_ITER_IS_STREAM (MP_TYPE_FLAG_ITER_IS_ITERNEXT | MP_TYPE_FLAG_ITER_IS_CUSTOM)
 
 typedef enum {
     PRINT_STR = 0,
@@ -548,6 +560,13 @@ typedef mp_obj_t (*mp_binary_op_fun_t)(mp_binary_op_t op, mp_obj_t, mp_obj_t);
 typedef void (*mp_attr_fun_t)(mp_obj_t self_in, qstr attr, mp_obj_t *dest);
 typedef mp_obj_t (*mp_subscr_fun_t)(mp_obj_t self_in, mp_obj_t index, mp_obj_t value);
 typedef mp_obj_t (*mp_getiter_fun_t)(mp_obj_t self_in, mp_obj_iter_buf_t *iter_buf);
+typedef mp_fun_1_t mp_iternext_fun_t;
+
+// For MP_TYPE_FLAG_ITER_IS_CUSTOM, the "getiter" slot points to an instance of this type.
+typedef struct _mp_getiter_iternext_custom_t {
+    mp_getiter_fun_t getiter;
+    mp_iternext_fun_t iternext;
+} mp_getiter_iternext_custom_t;
 
 // Buffer protocol
 typedef struct _mp_buffer_info_t {
@@ -616,14 +635,17 @@ struct _mp_obj_type_t {
     // Can return MP_OBJ_NULL if operation not supported.
     uint8_t slot_index_subscr;
 
-    // Corresponds to __iter__ special method.
-    // Can use the given mp_obj_iter_buf_t to store iterator object,
-    // otherwise can return a pointer to an object on the heap.
-    uint8_t slot_index_getiter;
-
-    // Corresponds to __next__ special method.  May return MP_OBJ_STOP_ITERATION
-    // as an optimisation instead of raising StopIteration() with no args.
-    uint8_t slot_index_iternext;
+    // This slot's behaviour depends on the MP_TYPE_FLAG_ITER_IS_* flags above.
+    // - If MP_TYPE_FLAG_ITER_IS_GETITER flag is set, then this corresponds to the __iter__
+    //   special method (of type mp_getiter_fun_t). Can use the given mp_obj_iter_buf_t
+    //   to store the iterator object, otherwise can return a pointer to an object on the heap.
+    // - If MP_TYPE_FLAG_ITER_IS_ITERNEXT is set, then this corresponds to __next__ special method.
+    //   May return MP_OBJ_STOP_ITERATION as an optimisation instead of raising StopIteration()
+    //   with no args. The type will implicitly implement getiter as "return self".
+    // - If MP_TYPE_FLAG_ITER_IS_CUSTOM is set, then this slot must point to an
+    //   mp_getiter_iternext_custom_t instance with both the getiter and iternext fields set.
+    // - If MP_TYPE_FLAG_ITER_IS_STREAM is set, this this slot should be unset.
+    uint8_t slot_index_iter;
 
     // Implements the buffer protocol if supported by this type.
     uint8_t slot_index_buffer;
@@ -659,8 +681,7 @@ typedef struct _mp_obj_empty_type_t {
     uint8_t slot_index_binary_op;
     uint8_t slot_index_attr;
     uint8_t slot_index_subscr;
-    uint8_t slot_index_getiter;
-    uint8_t slot_index_iternext;
+    uint8_t slot_index_iter;
     uint8_t slot_index_buffer;
     uint8_t slot_index_protocol;
     uint8_t slot_index_parent;
@@ -681,15 +702,14 @@ typedef struct _mp_obj_full_type_t {
     uint8_t slot_index_binary_op;
     uint8_t slot_index_attr;
     uint8_t slot_index_subscr;
-    uint8_t slot_index_getiter;
-    uint8_t slot_index_iternext;
+    uint8_t slot_index_iter;
     uint8_t slot_index_buffer;
     uint8_t slot_index_protocol;
     uint8_t slot_index_parent;
     uint8_t slot_index_locals_dict;
 
     // Explicitly add 12 slots.
-    const void *slots[12];
+    const void *slots[11];
 } mp_obj_full_type_t;
 
 #define MP_TYPE_NULL_MAKE_NEW (NULL)
@@ -700,8 +720,7 @@ typedef struct _mp_obj_full_type_t {
 #define _MP_OBJ_TYPE_SLOT_TYPE_binary_op (mp_binary_op_fun_t)
 #define _MP_OBJ_TYPE_SLOT_TYPE_attr (mp_attr_fun_t)
 #define _MP_OBJ_TYPE_SLOT_TYPE_subscr (mp_subscr_fun_t)
-#define _MP_OBJ_TYPE_SLOT_TYPE_getiter (mp_getiter_fun_t)
-#define _MP_OBJ_TYPE_SLOT_TYPE_iternext (mp_fun_1_t)
+#define _MP_OBJ_TYPE_SLOT_TYPE_iter (const void *)
 #define _MP_OBJ_TYPE_SLOT_TYPE_buffer (mp_buffer_fun_t)
 #define _MP_OBJ_TYPE_SLOT_TYPE_protocol (const void *)
 #define _MP_OBJ_TYPE_SLOT_TYPE_parent (const void *)
@@ -1162,7 +1181,6 @@ qstr mp_obj_fun_get_name(mp_const_obj_t fun);
 
 mp_obj_t mp_identity(mp_obj_t self);
 MP_DECLARE_CONST_FUN_OBJ_1(mp_identity_obj);
-mp_obj_t mp_identity_getiter(mp_obj_t self, mp_obj_iter_buf_t *iter_buf);
 
 // module
 typedef struct _mp_obj_module_t {
diff --git a/py/objarray.c b/py/objarray.c
index 762a4105c5f56..0d1032929f48c 100644
--- a/py/objarray.c
+++ b/py/objarray.c
@@ -574,10 +574,10 @@ STATIC mp_int_t array_get_buffer(mp_obj_t o_in, mp_buffer_info_t *bufinfo, mp_ui
 MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_array,
     MP_QSTR_array,
-    MP_TYPE_FLAG_NONE,
+    MP_TYPE_FLAG_ITER_IS_GETITER,
     array_make_new,
     print, array_print,
-    getiter, array_iterator_new,
+    iter, array_iterator_new,
     unary_op, array_unary_op,
     binary_op, array_binary_op,
     subscr, array_subscr,
@@ -590,10 +590,10 @@ MP_DEFINE_CONST_OBJ_TYPE(
 MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_bytearray,
     MP_QSTR_bytearray,
-    MP_TYPE_FLAG_EQ_CHECKS_OTHER_TYPE,
+    MP_TYPE_FLAG_EQ_CHECKS_OTHER_TYPE | MP_TYPE_FLAG_ITER_IS_GETITER,
     bytearray_make_new,
     print, array_print,
-    getiter, array_iterator_new,
+    iter, array_iterator_new,
     unary_op, array_unary_op,
     binary_op, array_binary_op,
     subscr, array_subscr,
@@ -618,9 +618,9 @@ MP_DEFINE_CONST_OBJ_TYPE(
 MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_memoryview,
     MP_QSTR_memoryview,
-    MP_TYPE_FLAG_EQ_CHECKS_OTHER_TYPE,
+    MP_TYPE_FLAG_EQ_CHECKS_OTHER_TYPE | MP_TYPE_FLAG_ITER_IS_GETITER,
     memoryview_make_new,
-    getiter, array_iterator_new,
+    iter, array_iterator_new,
     unary_op, array_unary_op,
     binary_op, array_binary_op,
     MEMORYVIEW_TYPE_LOCALS_DICT
@@ -676,10 +676,9 @@ STATIC mp_obj_t array_it_iternext(mp_obj_t self_in) {
 STATIC MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_array_it,
     MP_QSTR_iterator,
-    MP_TYPE_FLAG_NONE,
+    MP_TYPE_FLAG_ITER_IS_ITERNEXT,
     MP_TYPE_NULL_MAKE_NEW,
-    getiter, mp_identity_getiter,
-    iternext, array_it_iternext
+    iter, array_it_iternext
     );
 
 STATIC mp_obj_t array_iterator_new(mp_obj_t array_in, mp_obj_iter_buf_t *iter_buf) {
diff --git a/py/objattrtuple.c b/py/objattrtuple.c
index 0d41ee52354a4..2e207f4cf0c46 100644
--- a/py/objattrtuple.c
+++ b/py/objattrtuple.c
@@ -83,7 +83,7 @@ mp_obj_t mp_obj_new_attrtuple(const qstr *fields, size_t n, const mp_obj_t *item
 MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_attrtuple,
     MP_QSTR_tuple,
-    MP_TYPE_FLAG_NONE,
+    MP_TYPE_FLAG_ITER_IS_GETITER,
     MP_TYPE_NULL_MAKE_NEW,
     // reuse tuple to save on a qstr
     print, mp_obj_attrtuple_print,
@@ -91,7 +91,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     binary_op, mp_obj_tuple_binary_op,
     attr, mp_obj_attrtuple_attr,
     subscr, mp_obj_tuple_subscr,
-    getiter, mp_obj_tuple_getiter
+    iter, mp_obj_tuple_getiter
     );
 
 #endif // MICROPY_PY_ATTRTUPLE
diff --git a/py/objdict.c b/py/objdict.c
index c65b14caad6ca..7755d7b786d4c 100644
--- a/py/objdict.c
+++ b/py/objdict.c
@@ -464,10 +464,9 @@ STATIC mp_obj_t dict_view_it_iternext(mp_obj_t self_in) {
 STATIC MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_dict_view_it,
     MP_QSTR_iterator,
-    MP_TYPE_FLAG_NONE,
+    MP_TYPE_FLAG_ITER_IS_ITERNEXT,
     MP_TYPE_NULL_MAKE_NEW,
-    getiter, mp_identity_getiter,
-    iternext, dict_view_it_iternext
+    iter, dict_view_it_iternext
     );
 
 STATIC mp_obj_t dict_view_getiter(mp_obj_t view_in, mp_obj_iter_buf_t *iter_buf) {
@@ -517,11 +516,11 @@ STATIC mp_obj_t dict_view_binary_op(mp_binary_op_t op, mp_obj_t lhs_in, mp_obj_t
 STATIC MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_dict_view,
     MP_QSTR_dict_view,
-    MP_TYPE_FLAG_NONE,
+    MP_TYPE_FLAG_ITER_IS_GETITER,
     MP_TYPE_NULL_MAKE_NEW,
     print, dict_view_print,
     binary_op, dict_view_binary_op,
-    getiter, dict_view_getiter
+    iter, dict_view_getiter
     );
 
 STATIC mp_obj_t mp_obj_new_dict_view(mp_obj_t dict, mp_dict_view_kind_t kind) {
@@ -592,13 +591,13 @@ STATIC MP_DEFINE_CONST_DICT(dict_locals_dict, dict_locals_dict_table);
 MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_dict,
     MP_QSTR_dict,
-    MP_TYPE_FLAG_NONE,
+    MP_TYPE_FLAG_ITER_IS_GETITER,
     mp_obj_dict_make_new,
     print, dict_print,
     unary_op, dict_unary_op,
     binary_op, dict_binary_op,
     subscr, dict_subscr,
-    getiter, dict_getiter,
+    iter, dict_getiter,
     locals_dict, &dict_locals_dict
     );
 
@@ -606,13 +605,13 @@ MP_DEFINE_CONST_OBJ_TYPE(
 MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_ordereddict,
     MP_QSTR_OrderedDict,
-    MP_TYPE_FLAG_NONE,
+    MP_TYPE_FLAG_ITER_IS_GETITER,
     mp_obj_dict_make_new,
     print, dict_print,
     unary_op, dict_unary_op,
     binary_op, dict_binary_op,
     subscr, dict_subscr,
-    getiter, dict_getiter,
+    iter, dict_getiter,
     parent, &mp_type_dict,
     locals_dict, &dict_locals_dict
     );
diff --git a/py/objenumerate.c b/py/objenumerate.c
index f4f4ff6ae1d93..eea9e3e381ed4 100644
--- a/py/objenumerate.c
+++ b/py/objenumerate.c
@@ -70,10 +70,9 @@ STATIC mp_obj_t enumerate_make_new(const mp_obj_type_t *type, size_t n_args, siz
 MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_enumerate,
     MP_QSTR_enumerate,
-    MP_TYPE_FLAG_NONE,
+    MP_TYPE_FLAG_ITER_IS_ITERNEXT,
     enumerate_make_new,
-    iternext, enumerate_iternext,
-    getiter, mp_identity_getiter
+    iter, enumerate_iternext
     );
 
 STATIC mp_obj_t enumerate_iternext(mp_obj_t self_in) {
diff --git a/py/objfilter.c b/py/objfilter.c
index 2b57300af3df5..bfe651f40d036 100644
--- a/py/objfilter.c
+++ b/py/objfilter.c
@@ -63,10 +63,9 @@ STATIC mp_obj_t filter_iternext(mp_obj_t self_in) {
 MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_filter,
     MP_QSTR_filter,
-    MP_TYPE_FLAG_NONE,
+    MP_TYPE_FLAG_ITER_IS_ITERNEXT,
     filter_make_new,
-    getiter, mp_identity_getiter,
-    iternext, filter_iternext
+    iter, filter_iternext
     );
 
 #endif // MICROPY_PY_BUILTINS_FILTER
diff --git a/py/objgenerator.c b/py/objgenerator.c
index a960c237002f5..d8515c13ce257 100644
--- a/py/objgenerator.c
+++ b/py/objgenerator.c
@@ -370,11 +370,10 @@ STATIC MP_DEFINE_CONST_DICT(gen_instance_locals_dict, gen_instance_locals_dict_t
 MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_gen_instance,
     MP_QSTR_generator,
-    MP_TYPE_FLAG_NONE,
+    MP_TYPE_FLAG_ITER_IS_ITERNEXT,
     MP_TYPE_NULL_MAKE_NEW,
     print, gen_instance_print,
     unary_op, mp_generic_unary_op,
-    getiter, mp_identity_getiter,
-    iternext, gen_instance_iternext,
+    iter, gen_instance_iternext,
     locals_dict, &gen_instance_locals_dict
     );
diff --git a/py/objgetitemiter.c b/py/objgetitemiter.c
index ed2dfbbe1f9e7..134cbcd6299d5 100644
--- a/py/objgetitemiter.c
+++ b/py/objgetitemiter.c
@@ -59,10 +59,9 @@ STATIC mp_obj_t it_iternext(mp_obj_t self_in) {
 STATIC MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_it,
     MP_QSTR_iterator,
-    MP_TYPE_FLAG_NONE,
+    MP_TYPE_FLAG_ITER_IS_ITERNEXT,
     MP_TYPE_NULL_MAKE_NEW,
-    getiter, mp_identity_getiter,
-    iternext, it_iternext
+    iter, it_iternext
     );
 
 // args are those returned from mp_load_method_maybe (ie either an attribute or a method)
diff --git a/py/objlist.c b/py/objlist.c
index 5f9e99cc79b26..8d18344ea8a71 100644
--- a/py/objlist.c
+++ b/py/objlist.c
@@ -455,13 +455,13 @@ STATIC MP_DEFINE_CONST_DICT(list_locals_dict, list_locals_dict_table);
 MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_list,
     MP_QSTR_list,
-    MP_TYPE_FLAG_NONE,
+    MP_TYPE_FLAG_ITER_IS_GETITER,
     list_make_new,
     print, list_print,
     unary_op, list_unary_op,
     binary_op, list_binary_op,
     subscr, list_subscr,
-    getiter, list_getiter,
+    iter, list_getiter,
     locals_dict, &list_locals_dict
     );
 
diff --git a/py/objmap.c b/py/objmap.c
index dc305e21b5cb7..115832e387e56 100644
--- a/py/objmap.c
+++ b/py/objmap.c
@@ -66,8 +66,7 @@ STATIC mp_obj_t map_iternext(mp_obj_t self_in) {
 MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_map,
     MP_QSTR_map,
-    MP_TYPE_FLAG_NONE,
+    MP_TYPE_FLAG_ITER_IS_ITERNEXT,
     map_make_new,
-    getiter, mp_identity_getiter,
-    iternext, map_iternext
+    iter, map_iternext
     );
diff --git a/py/objnamedtuple.c b/py/objnamedtuple.c
index 52536be8b4e97..3b45d8f76f29b 100644
--- a/py/objnamedtuple.c
+++ b/py/objnamedtuple.c
@@ -163,7 +163,7 @@ STATIC mp_obj_t mp_obj_new_namedtuple_type(qstr name, size_t n_fields, mp_obj_t
     MP_OBJ_TYPE_SET_SLOT(type, binary_op, mp_obj_tuple_binary_op, 2);
     MP_OBJ_TYPE_SET_SLOT(type, attr, namedtuple_attr, 3);
     MP_OBJ_TYPE_SET_SLOT(type, subscr, mp_obj_tuple_subscr, 4);
-    MP_OBJ_TYPE_SET_SLOT(type, getiter, mp_obj_tuple_getiter, 5);
+    MP_OBJ_TYPE_SET_SLOT(type, iter, mp_obj_tuple_getiter, 5);
     MP_OBJ_TYPE_SET_SLOT(type, parent, &mp_type_tuple, 6);
     return MP_OBJ_FROM_PTR(o);
 }
diff --git a/py/objpolyiter.c b/py/objpolyiter.c
index 5bc397f6ec3bf..7a45b6b73fe6f 100644
--- a/py/objpolyiter.c
+++ b/py/objpolyiter.c
@@ -48,10 +48,9 @@ STATIC mp_obj_t polymorph_it_iternext(mp_obj_t self_in) {
 MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_polymorph_iter,
     MP_QSTR_iterator,
-    MP_TYPE_FLAG_NONE,
+    MP_TYPE_FLAG_ITER_IS_ITERNEXT,
     MP_TYPE_NULL_MAKE_NEW,
-    getiter, mp_identity_getiter,
-    iternext, polymorph_it_iternext
+    iter, polymorph_it_iternext
     );
 
 #if MICROPY_ENABLE_FINALISER
@@ -81,10 +80,9 @@ STATIC MP_DEFINE_CONST_DICT(mp_obj_polymorph_iter_locals_dict, mp_obj_polymorph_
 MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_polymorph_iter_with_finaliser,
     MP_QSTR_iterator,
-    MP_TYPE_FLAG_NONE,
+    MP_TYPE_FLAG_ITER_IS_ITERNEXT,
     MP_TYPE_NULL_MAKE_NEW,
-    getiter, mp_identity_getiter,
-    iternext, polymorph_it_iternext,
+    iter, polymorph_it_iternext,
     locals_dict, &mp_obj_polymorph_iter_locals_dict
     );
 #endif
diff --git a/py/objrange.c b/py/objrange.c
index 3140504b2bb4c..1ad8f6031f292 100644
--- a/py/objrange.c
+++ b/py/objrange.c
@@ -53,10 +53,9 @@ STATIC mp_obj_t range_it_iternext(mp_obj_t o_in) {
 STATIC MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_range_it,
     MP_QSTR_iterator,
-    MP_TYPE_FLAG_NONE,
+    MP_TYPE_FLAG_ITER_IS_ITERNEXT,
     MP_TYPE_NULL_MAKE_NEW,
-    getiter, mp_identity_getiter,
-    iternext, range_it_iternext
+    iter, range_it_iternext
     );
 
 STATIC mp_obj_t mp_obj_new_range_iterator(mp_int_t cur, mp_int_t stop, mp_int_t step, mp_obj_iter_buf_t *iter_buf) {
@@ -232,5 +231,5 @@ MP_DEFINE_CONST_OBJ_TYPE(
     print, range_print,
     unary_op, range_unary_op,
     subscr, range_subscr,
-    getiter, range_getiter
+    iter, range_getiter
     );
diff --git a/py/objreversed.c b/py/objreversed.c
index bc1f07ddecc46..e265266d3f127 100644
--- a/py/objreversed.c
+++ b/py/objreversed.c
@@ -71,10 +71,9 @@ STATIC mp_obj_t reversed_iternext(mp_obj_t self_in) {
 MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_reversed,
     MP_QSTR_reversed,
-    MP_TYPE_FLAG_NONE,
+    MP_TYPE_FLAG_ITER_IS_ITERNEXT,
     reversed_make_new,
-    getiter, mp_identity_getiter,
-    iternext, reversed_iternext
+    iter, reversed_iternext
     );
 
 #endif // MICROPY_PY_BUILTINS_REVERSED
diff --git a/py/objset.c b/py/objset.c
index 6f21bf15dfb58..b827f49f40dfe 100644
--- a/py/objset.c
+++ b/py/objset.c
@@ -542,12 +542,12 @@ STATIC MP_DEFINE_CONST_DICT(set_locals_dict, set_locals_dict_table);
 MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_set,
     MP_QSTR_set,
-    MP_TYPE_FLAG_NONE,
+    MP_TYPE_FLAG_ITER_IS_GETITER,
     set_make_new,
     print, set_print,
     unary_op, set_unary_op,
     binary_op, set_binary_op,
-    getiter, set_getiter,
+    iter, set_getiter,
     locals_dict, &set_locals_dict
     );
 
@@ -568,12 +568,12 @@ STATIC MP_DEFINE_CONST_DICT(frozenset_locals_dict, frozenset_locals_dict_table);
 MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_frozenset,
     MP_QSTR_frozenset,
-    MP_TYPE_FLAG_EQ_CHECKS_OTHER_TYPE,
+    MP_TYPE_FLAG_EQ_CHECKS_OTHER_TYPE | MP_TYPE_FLAG_ITER_IS_GETITER,
     set_make_new,
     print, set_print,
     unary_op, set_unary_op,
     binary_op, set_binary_op,
-    getiter, set_getiter,
+    iter, set_getiter,
     locals_dict, &frozenset_locals_dict
     );
 #endif
diff --git a/py/objstr.c b/py/objstr.c
index d425055559f84..12f6e15d0498c 100644
--- a/py/objstr.c
+++ b/py/objstr.c
@@ -2151,7 +2151,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     print, str_print,
     binary_op, mp_obj_str_binary_op,
     subscr, bytes_subscr,
-    getiter, mp_obj_new_str_iterator,
+    iter, mp_obj_new_str_iterator,
     buffer, mp_obj_str_get_buffer,
     locals_dict, &mp_obj_str_locals_dict
     );
@@ -2166,7 +2166,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     print, str_print,
     binary_op, mp_obj_str_binary_op,
     subscr, bytes_subscr,
-    getiter, mp_obj_new_bytes_iterator,
+    iter, mp_obj_new_bytes_iterator,
     buffer, mp_obj_str_get_buffer,
     locals_dict, &mp_obj_bytes_locals_dict
     );
diff --git a/py/objstringio.c b/py/objstringio.c
index 77547f88cf6c2..4e19b83999aac 100644
--- a/py/objstringio.c
+++ b/py/objstringio.c
@@ -247,11 +247,9 @@ STATIC const mp_stream_p_t stringio_stream_p = {
 MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_stringio,
     MP_QSTR_StringIO,
-    MP_TYPE_FLAG_NONE,
+    MP_TYPE_FLAG_ITER_IS_STREAM,
     stringio_make_new,
     print, stringio_print,
-    getiter, mp_identity_getiter,
-    iternext, mp_stream_unbuffered_iter,
     protocol, &stringio_stream_p,
     locals_dict, &stringio_locals_dict
     );
@@ -266,11 +264,9 @@ STATIC const mp_stream_p_t bytesio_stream_p = {
 MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_bytesio,
     MP_QSTR_BytesIO,
-    MP_TYPE_FLAG_NONE,
+    MP_TYPE_FLAG_ITER_IS_STREAM,
     stringio_make_new,
     print, stringio_print,
-    getiter, mp_identity_getiter,
-    iternext, mp_stream_unbuffered_iter,
     protocol, &bytesio_stream_p,
     locals_dict, &stringio_locals_dict
     );
diff --git a/py/objstrunicode.c b/py/objstrunicode.c
index 15c59e4e95724..9b28841ecd177 100644
--- a/py/objstrunicode.c
+++ b/py/objstrunicode.c
@@ -232,13 +232,13 @@ STATIC mp_obj_t str_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) {
 MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_str,
     MP_QSTR_str,
-    MP_TYPE_FLAG_NONE,
+    MP_TYPE_FLAG_ITER_IS_GETITER,
     mp_obj_str_make_new,
     print, uni_print,
     unary_op, uni_unary_op,
     binary_op, mp_obj_str_binary_op,
     subscr, str_subscr,
-    getiter, mp_obj_new_str_iterator,
+    iter, mp_obj_new_str_iterator,
     buffer, mp_obj_str_get_buffer,
     locals_dict, &mp_obj_str_locals_dict
     );
diff --git a/py/objtuple.c b/py/objtuple.c
index 01b2fa14885ac..485d44c52a8d7 100644
--- a/py/objtuple.c
+++ b/py/objtuple.c
@@ -32,7 +32,7 @@
 #include "py/runtime.h"
 
 // type check is done on getiter method to allow tuple, namedtuple, attrtuple
-#define mp_obj_is_tuple_compatible(o) (MP_OBJ_TYPE_GET_SLOT_OR_NULL(mp_obj_get_type(o), getiter) == mp_obj_tuple_getiter)
+#define mp_obj_is_tuple_compatible(o) (MP_OBJ_TYPE_GET_SLOT_OR_NULL(mp_obj_get_type(o), iter) == mp_obj_tuple_getiter)
 
 /******************************************************************************/
 /* tuple                                                                      */
@@ -111,7 +111,7 @@ STATIC mp_obj_t tuple_cmp_helper(mp_uint_t op, mp_obj_t self_in, mp_obj_t anothe
     mp_check_self(mp_obj_is_tuple_compatible(self_in));
     const mp_obj_type_t *another_type = mp_obj_get_type(another_in);
     mp_obj_tuple_t *self = MP_OBJ_TO_PTR(self_in);
-    if (MP_OBJ_TYPE_GET_SLOT_OR_NULL(another_type, getiter) != mp_obj_tuple_getiter) {
+    if (MP_OBJ_TYPE_GET_SLOT_OR_NULL(another_type, iter) != mp_obj_tuple_getiter) {
         // Slow path for user subclasses
         another_in = mp_obj_cast_to_native_base(another_in, MP_OBJ_FROM_PTR(&mp_type_tuple));
         if (another_in == MP_OBJ_NULL) {
@@ -227,13 +227,13 @@ STATIC MP_DEFINE_CONST_DICT(tuple_locals_dict, tuple_locals_dict_table);
 MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_tuple,
     MP_QSTR_tuple,
-    MP_TYPE_FLAG_NONE,
+    MP_TYPE_FLAG_ITER_IS_GETITER,
     mp_obj_tuple_make_new,
     print, mp_obj_tuple_print,
     unary_op, mp_obj_tuple_unary_op,
     binary_op, mp_obj_tuple_binary_op,
     subscr, mp_obj_tuple_subscr,
-    getiter, mp_obj_tuple_getiter,
+    iter, mp_obj_tuple_getiter,
     locals_dict, &tuple_locals_dict
     );
 
diff --git a/py/objtype.c b/py/objtype.c
index 5b4e375bcc481..183dce071ee9b 100644
--- a/py/objtype.c
+++ b/py/objtype.c
@@ -142,7 +142,10 @@ STATIC void mp_obj_class_lookup(struct class_lookup_data *lookup, const mp_obj_t
         // this should not be applied to class types, as will result in extra
         // lookup either.
         if (lookup->slot_offset != 0 && mp_obj_is_native_type(type)) {
-            if (MP_OBJ_TYPE_HAS_SLOT_BY_OFFSET(type, lookup->slot_offset)) {
+            // Check if there is a non-zero value in the specified slot index,
+            // with a special case for getiter where the slot won't be set
+            // for MP_TYPE_FLAG_ITER_IS_STREAM.
+            if (MP_OBJ_TYPE_HAS_SLOT_BY_OFFSET(type, lookup->slot_offset) || (lookup->slot_offset == MP_OBJ_TYPE_OFFSETOF_SLOT(iter) && type->flags & MP_TYPE_FLAG_ITER_IS_STREAM)) {
                 DEBUG_printf("mp_obj_class_lookup: Matched special meth slot (off=%d) for %s\n",
                     lookup->slot_offset, qstr_str(lookup->attr));
                 lookup->dest[0] = MP_OBJ_SENTINEL;
@@ -889,7 +892,7 @@ mp_obj_t mp_obj_instance_getiter(mp_obj_t self_in, mp_obj_iter_buf_t *iter_buf)
     struct class_lookup_data lookup = {
         .obj = self,
         .attr = MP_QSTR___iter__,
-        .slot_offset = MP_OBJ_TYPE_OFFSETOF_SLOT(getiter),
+        .slot_offset = MP_OBJ_TYPE_OFFSETOF_SLOT(iter),
         .dest = member,
         .is_type = false,
     };
@@ -898,10 +901,14 @@ mp_obj_t mp_obj_instance_getiter(mp_obj_t self_in, mp_obj_iter_buf_t *iter_buf)
         return MP_OBJ_NULL;
     } else if (member[0] == MP_OBJ_SENTINEL) {
         const mp_obj_type_t *type = mp_obj_get_type(self->subobj[0]);
-        if (iter_buf == NULL) {
-            iter_buf = m_new_obj(mp_obj_iter_buf_t);
+        if (type->flags & MP_TYPE_FLAG_ITER_IS_ITERNEXT) {
+            return self->subobj[0];
+        } else {
+            if (iter_buf == NULL) {
+                iter_buf = m_new_obj(mp_obj_iter_buf_t);
+            }
+            return ((mp_getiter_fun_t)MP_OBJ_TYPE_GET_SLOT(type, iter))(self->subobj[0], iter_buf);
         }
-        return MP_OBJ_TYPE_GET_SLOT(type, getiter)(self->subobj[0], iter_buf);
     } else {
         return mp_call_method_n_kw(0, 0, member);
     }
@@ -1122,7 +1129,9 @@ mp_obj_t mp_obj_new_type(qstr name, mp_obj_t bases_tuple, mp_obj_t locals_dict)
 
     // Basic validation of base classes
     uint16_t base_flags = MP_TYPE_FLAG_EQ_NOT_REFLEXIVE
-        | MP_TYPE_FLAG_EQ_CHECKS_OTHER_TYPE | MP_TYPE_FLAG_EQ_HAS_NEQ_TEST;
+        | MP_TYPE_FLAG_EQ_CHECKS_OTHER_TYPE
+        | MP_TYPE_FLAG_EQ_HAS_NEQ_TEST
+        | MP_TYPE_FLAG_ITER_IS_GETITER;
     size_t bases_len;
     mp_obj_t *bases_items;
     mp_obj_tuple_get(bases_tuple, &bases_len, &bases_items);
@@ -1167,7 +1176,7 @@ mp_obj_t mp_obj_new_type(qstr name, mp_obj_t bases_tuple, mp_obj_t locals_dict)
     MP_OBJ_TYPE_SET_SLOT(o, binary_op, instance_binary_op, 3);
     MP_OBJ_TYPE_SET_SLOT(o, attr, mp_obj_instance_attr, 4);
     MP_OBJ_TYPE_SET_SLOT(o, subscr, instance_subscr, 5);
-    MP_OBJ_TYPE_SET_SLOT(o, getiter, mp_obj_instance_getiter, 6);
+    MP_OBJ_TYPE_SET_SLOT(o, iter, mp_obj_instance_getiter, 6);
     // MP_OBJ_TYPE_SET_SLOT(o, iternext, not implemented)
     MP_OBJ_TYPE_SET_SLOT(o, buffer, instance_get_buffer, 7);
 
diff --git a/py/objzip.c b/py/objzip.c
index 0ceafd97f2409..34d73465ef2bd 100644
--- a/py/objzip.c
+++ b/py/objzip.c
@@ -69,8 +69,7 @@ STATIC mp_obj_t zip_iternext(mp_obj_t self_in) {
 MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_zip,
     MP_QSTR_zip,
-    MP_TYPE_FLAG_NONE,
+    MP_TYPE_FLAG_ITER_IS_ITERNEXT,
     zip_make_new,
-    getiter, mp_identity_getiter,
-    iternext, zip_iternext
+    iter, zip_iternext
     );
diff --git a/py/runtime.c b/py/runtime.c
index d0e504a3d096f..ec628bfe14b4a 100644
--- a/py/runtime.c
+++ b/py/runtime.c
@@ -61,6 +61,8 @@ const mp_obj_module_t mp_module___main__ = {
 
 MP_REGISTER_MODULE(MP_QSTR___main__, mp_module___main__);
 
+#define TYPE_HAS_ITERNEXT(type) (type->flags & (MP_TYPE_FLAG_ITER_IS_ITERNEXT | MP_TYPE_FLAG_ITER_IS_CUSTOM | MP_TYPE_FLAG_ITER_IS_STREAM))
+
 void mp_init(void) {
     qstr_init();
 
@@ -1167,7 +1169,7 @@ void mp_load_method_maybe(mp_obj_t obj, qstr attr, mp_obj_t *dest) {
     }
     #endif
 
-    if (attr == MP_QSTR___next__ && MP_OBJ_TYPE_HAS_SLOT(type, iternext)) {
+    if (attr == MP_QSTR___next__ && TYPE_HAS_ITERNEXT(type)) {
         dest[0] = MP_OBJ_FROM_PTR(&mp_builtin_next_obj);
         dest[1] = obj;
         return;
@@ -1260,21 +1262,26 @@ mp_obj_t mp_getiter(mp_obj_t o_in, mp_obj_iter_buf_t *iter_buf) {
     assert(o_in);
     const mp_obj_type_t *type = mp_obj_get_type(o_in);
 
+    // Most types that use iternext just use the identity getiter. We handle this case explicitly
+    // so we don't unnecessarily allocate any RAM for the iter_buf, which won't be used.
+    if ((type->flags & MP_TYPE_FLAG_ITER_IS_ITERNEXT) == MP_TYPE_FLAG_ITER_IS_ITERNEXT || (type->flags & MP_TYPE_FLAG_ITER_IS_STREAM) == MP_TYPE_FLAG_ITER_IS_STREAM) {
+        return o_in;
+    }
 
-    if (MP_OBJ_TYPE_HAS_SLOT(type, getiter)) {
-        // Check for native getiter which is the identity.  We handle this case explicitly
-        // so we don't unnecessarily allocate any RAM for the iter_buf, which won't be used.
-        if (MP_OBJ_TYPE_GET_SLOT(type, getiter) == mp_identity_getiter) {
-            return o_in;
-        }
-
+    if (MP_OBJ_TYPE_HAS_SLOT(type, iter)) {
         // check for native getiter (corresponds to __iter__)
-        if (iter_buf == NULL && MP_OBJ_TYPE_GET_SLOT(type, getiter) != mp_obj_instance_getiter) {
+        if (iter_buf == NULL && MP_OBJ_TYPE_GET_SLOT(type, iter) != mp_obj_instance_getiter) {
             // if caller did not provide a buffer then allocate one on the heap
             // mp_obj_instance_getiter is special, it will allocate only if needed
             iter_buf = m_new_obj(mp_obj_iter_buf_t);
         }
-        mp_obj_t iter = MP_OBJ_TYPE_GET_SLOT(type, getiter)(o_in, iter_buf);
+        mp_getiter_fun_t getiter;
+        if (type->flags & MP_TYPE_FLAG_ITER_IS_CUSTOM) {
+            getiter = ((mp_getiter_iternext_custom_t *)MP_OBJ_TYPE_GET_SLOT(type, iter))->getiter;
+        } else {
+            getiter = (mp_getiter_fun_t)MP_OBJ_TYPE_GET_SLOT(type, iter);
+        }
+        mp_obj_t iter = getiter(o_in, iter_buf);
         if (iter != MP_OBJ_NULL) {
             return iter;
         }
@@ -1302,13 +1309,26 @@ mp_obj_t mp_getiter(mp_obj_t o_in, mp_obj_iter_buf_t *iter_buf) {
 
 }
 
+STATIC mp_fun_1_t type_get_iternext(const mp_obj_type_t *type) {
+    if ((type->flags & MP_TYPE_FLAG_ITER_IS_STREAM) == MP_TYPE_FLAG_ITER_IS_STREAM) {
+        mp_obj_t mp_stream_unbuffered_iter(mp_obj_t self);
+        return mp_stream_unbuffered_iter;
+    } else if (type->flags & MP_TYPE_FLAG_ITER_IS_ITERNEXT) {
+        return (mp_fun_1_t)MP_OBJ_TYPE_GET_SLOT(type, iter);
+    } else if (type->flags & MP_TYPE_FLAG_ITER_IS_CUSTOM) {
+        return ((mp_getiter_iternext_custom_t *)MP_OBJ_TYPE_GET_SLOT(type, iter))->iternext;
+    } else {
+        return NULL;
+    }
+}
+
 // may return MP_OBJ_STOP_ITERATION as an optimisation instead of raise StopIteration()
 // may also raise StopIteration()
 mp_obj_t mp_iternext_allow_raise(mp_obj_t o_in) {
     const mp_obj_type_t *type = mp_obj_get_type(o_in);
-    if (MP_OBJ_TYPE_HAS_SLOT(type, iternext)) {
+    if (TYPE_HAS_ITERNEXT(type)) {
         MP_STATE_THREAD(stop_iteration_arg) = MP_OBJ_NULL;
-        return MP_OBJ_TYPE_GET_SLOT(type, iternext)(o_in);
+        return type_get_iternext(type)(o_in);
     } else {
         // check for __next__ method
         mp_obj_t dest[2];
@@ -1332,9 +1352,9 @@ mp_obj_t mp_iternext_allow_raise(mp_obj_t o_in) {
 mp_obj_t mp_iternext(mp_obj_t o_in) {
     MP_STACK_CHECK(); // enumerate, filter, map and zip can recursively call mp_iternext
     const mp_obj_type_t *type = mp_obj_get_type(o_in);
-    if (MP_OBJ_TYPE_HAS_SLOT(type, iternext)) {
+    if (TYPE_HAS_ITERNEXT(type)) {
         MP_STATE_THREAD(stop_iteration_arg) = MP_OBJ_NULL;
-        return MP_OBJ_TYPE_GET_SLOT(type, iternext)(o_in);
+        return type_get_iternext(type)(o_in);
     } else {
         // check for __next__ method
         mp_obj_t dest[2];
@@ -1372,9 +1392,9 @@ mp_vm_return_kind_t mp_resume(mp_obj_t self_in, mp_obj_t send_value, mp_obj_t th
         return mp_obj_gen_resume(self_in, send_value, throw_value, ret_val);
     }
 
-    if (MP_OBJ_TYPE_HAS_SLOT(type, iternext) && send_value == mp_const_none) {
+    if (TYPE_HAS_ITERNEXT(type) && send_value == mp_const_none) {
         MP_STATE_THREAD(stop_iteration_arg) = MP_OBJ_NULL;
-        mp_obj_t ret = MP_OBJ_TYPE_GET_SLOT(type, iternext)(self_in);
+        mp_obj_t ret = type_get_iternext(type)(self_in);
         *ret_val = ret;
         if (ret != MP_OBJ_STOP_ITERATION) {
             return MP_VM_RETURN_YIELD;
diff --git a/shared/runtime/sys_stdio_mphal.c b/shared/runtime/sys_stdio_mphal.c
index 6d43425e298fe..325f93dde1d89 100644
--- a/shared/runtime/sys_stdio_mphal.c
+++ b/shared/runtime/sys_stdio_mphal.c
@@ -126,11 +126,9 @@ STATIC const mp_stream_p_t stdio_obj_stream_p = {
 MP_DEFINE_CONST_OBJ_TYPE(
     stdio_obj_type,
     MP_QSTR_FileIO,
-    MP_TYPE_FLAG_NONE,
+    MP_TYPE_FLAG_ITER_IS_STREAM,
     MP_TYPE_NULL_MAKE_NEW,
     print, stdio_obj_print,
-    getiter, mp_identity_getiter,
-    iternext, mp_stream_unbuffered_iter,
     protocol, &stdio_obj_stream_p,
     locals_dict, &stdio_locals_dict
     );
@@ -162,11 +160,9 @@ STATIC const mp_stream_p_t stdio_buffer_obj_stream_p = {
 STATIC MP_DEFINE_CONST_OBJ_TYPE(
     stdio_buffer_obj_type,
     MP_QSTR_FileIO,
-    MP_TYPE_FLAG_NONE,
+    MP_TYPE_FLAG_ITER_IS_STREAM,
     MP_TYPE_NULL_MAKE_NEW,
     print, stdio_obj_print,
-    getiter, mp_identity_getiter,
-    iternext, mp_stream_unbuffered_iter,
     protocol, &stdio_buffer_obj_stream_p,
     locals_dict, &stdio_locals_dict
     );
diff --git a/tests/basics/io_stringio_base.py b/tests/basics/io_stringio_base.py
new file mode 100644
index 0000000000000..dffc879074a78
--- /dev/null
+++ b/tests/basics/io_stringio_base.py
@@ -0,0 +1,24 @@
+# Checks that an instance type inheriting from a native base that uses
+# MP_TYPE_FLAG_ITER_IS_STREAM will still have a getiter.
+
+try:
+    import uio as io
+except ImportError:
+    import io
+
+a = io.StringIO()
+a.write("hello\nworld\nmicro\npython\n")
+a.seek(0)
+
+for line in a:
+    print(line)
+
+class X(io.StringIO):
+    pass
+
+b = X()
+b.write("hello\nworld\nmicro\npython\n")
+b.seek(0)
+
+for line in b:
+    print(line)

From 94beeabd2ee179d587942046555833e022241f24 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Sat, 17 Sep 2022 00:31:23 +1000
Subject: [PATCH 2627/3533] py/obj: Convert make_new into a mp_obj_type_t slot.

Instead of being an explicit field, it's now a slot like all the other
methods.

This is a marginal code size improvement because most types have a make_new
(100/138 on PYBV11), however it improves consistency in how types are
declared, removing the special case for make_new.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 drivers/ninaw10/nina_wifi_bsp.c               |  2 +-
 examples/natmod/framebuf/framebuf.c           |  6 +-
 examples/natmod/uzlib/uzlib.c                 |  6 +-
 extmod/machine_i2c.c                          |  2 +-
 extmod/machine_i2c.h                          |  2 +-
 extmod/machine_mem.c                          |  1 -
 extmod/machine_pinbase.c                      |  2 +-
 extmod/machine_pwm.c                          |  2 +-
 extmod/machine_signal.c                       |  2 +-
 extmod/machine_spi.c                          |  2 +-
 extmod/machine_spi.h                          |  2 +-
 extmod/modbluetooth.c                         |  4 +-
 extmod/modbtree.c                             |  1 -
 extmod/modframebuf.c                          |  2 +-
 extmod/modlwip.c                              |  4 +-
 extmod/moduasyncio.c                          |  4 +-
 extmod/moducryptolib.c                        |  2 +-
 extmod/moductypes.c                           |  2 +-
 extmod/moduhashlib.c                          |  6 +-
 extmod/modure.c                               |  2 -
 extmod/moduselect.c                           |  1 -
 extmod/modusocket.c                           |  2 +-
 extmod/modussl_axtls.c                        |  1 -
 extmod/modussl_mbedtls.c                      |  1 -
 extmod/modutimeq.c                            |  2 +-
 extmod/moduwebsocket.c                        |  2 +-
 extmod/moduzlib.c                             |  2 +-
 extmod/modwebrepl.c                           |  2 +-
 extmod/network_cyw43.c                        |  2 +-
 extmod/network_ninaw10.c                      |  4 +-
 extmod/network_wiznet5k.c                     |  6 +-
 extmod/vfs.c                                  |  6 +-
 extmod/vfs_fat.c                              |  2 +-
 extmod/vfs_fat_file.c                         |  2 -
 extmod/vfs_lfsx.c                             |  2 +-
 extmod/vfs_lfsx_file.c                        |  2 -
 extmod/vfs_posix.c                            |  2 +-
 extmod/vfs_posix_file.c                       |  2 -
 ports/cc3200/misc/mpirq.c                     |  1 -
 ports/cc3200/mods/modnetwork.c                |  2 +-
 ports/cc3200/mods/moduhashlib.c               |  4 +-
 ports/cc3200/mods/modusocket.c                |  2 +-
 ports/cc3200/mods/modwlan.c                   |  2 +-
 ports/cc3200/mods/pybadc.c                    |  3 +-
 ports/cc3200/mods/pybflash.c                  |  2 +-
 ports/cc3200/mods/pybi2c.c                    |  2 +-
 ports/cc3200/mods/pybpin.c                    |  3 +-
 ports/cc3200/mods/pybrtc.c                    |  2 +-
 ports/cc3200/mods/pybsd.c                     |  2 +-
 ports/cc3200/mods/pybsleep.c                  |  3 +-
 ports/cc3200/mods/pybspi.c                    |  2 +-
 ports/cc3200/mods/pybtimer.c                  |  3 +-
 ports/cc3200/mods/pybuart.c                   |  2 +-
 ports/cc3200/mods/pybwdt.c                    |  2 +-
 ports/esp32/esp32_nvs.c                       |  2 +-
 ports/esp32/esp32_partition.c                 |  2 +-
 ports/esp32/esp32_rmt.c                       |  2 +-
 ports/esp32/esp32_ulp.c                       |  2 +-
 ports/esp32/machine_adc.c                     |  2 +-
 ports/esp32/machine_adcblock.c                |  2 +-
 ports/esp32/machine_dac.c                     |  2 +-
 ports/esp32/machine_hw_spi.c                  |  2 +-
 ports/esp32/machine_i2c.c                     |  2 +-
 ports/esp32/machine_i2s.c                     |  2 +-
 ports/esp32/machine_pin.c                     |  3 +-
 ports/esp32/machine_rtc.c                     |  2 +-
 ports/esp32/machine_sdcard.c                  |  2 +-
 ports/esp32/machine_timer.c                   |  2 +-
 ports/esp32/machine_touchpad.c                |  2 +-
 ports/esp32/machine_uart.c                    |  2 +-
 ports/esp32/machine_wdt.c                     |  2 +-
 ports/esp32/modsocket.c                       |  2 +-
 ports/esp32/network_lan.c                     |  1 -
 ports/esp32/network_ppp.c                     |  1 -
 ports/esp32/network_wlan.c                    |  1 -
 ports/esp8266/machine_adc.c                   |  2 +-
 ports/esp8266/machine_hspi.c                  |  2 +-
 ports/esp8266/machine_pin.c                   |  3 +-
 ports/esp8266/machine_rtc.c                   |  2 +-
 ports/esp8266/machine_uart.c                  |  2 +-
 ports/esp8266/machine_wdt.c                   |  2 +-
 ports/esp8266/main.c                          |  2 +-
 ports/esp8266/modmachine.c                    |  2 +-
 ports/esp8266/modnetwork.c                    |  1 -
 ports/mimxrt/machine_adc.c                    |  2 +-
 ports/mimxrt/machine_i2c.c                    |  2 +-
 ports/mimxrt/machine_i2s.c                    |  2 +-
 ports/mimxrt/machine_led.c                    |  2 +-
 ports/mimxrt/machine_pin.c                    |  6 +-
 ports/mimxrt/machine_rtc.c                    |  2 +-
 ports/mimxrt/machine_sdcard.c                 |  2 +-
 ports/mimxrt/machine_spi.c                    |  2 +-
 ports/mimxrt/machine_timer.c                  |  2 +-
 ports/mimxrt/machine_uart.c                   |  2 +-
 ports/mimxrt/machine_wdt.c                    |  2 +-
 ports/mimxrt/mimxrt_flash.c                   |  2 +-
 ports/mimxrt/network_lan.c                    |  2 +-
 ports/nrf/boards/microbit/modules/iters.c     |  1 -
 .../boards/microbit/modules/microbitdisplay.c |  1 -
 .../boards/microbit/modules/microbitimage.c   |  4 +-
 ports/nrf/main.c                              |  2 +-
 ports/nrf/modules/board/led.c                 |  2 +-
 ports/nrf/modules/machine/adc.c               |  2 +-
 ports/nrf/modules/machine/i2c.c               |  2 +-
 ports/nrf/modules/machine/pin.c               |  3 +-
 ports/nrf/modules/machine/pwm.c               |  2 +-
 ports/nrf/modules/machine/rtcounter.c         |  2 +-
 ports/nrf/modules/machine/spi.c               |  2 +-
 ports/nrf/modules/machine/temp.c              |  2 +-
 ports/nrf/modules/machine/timer.c             |  2 +-
 ports/nrf/modules/machine/uart.c              |  2 +-
 ports/nrf/modules/nrf/flashbdev.c             |  2 +-
 .../modules/ubluepy/ubluepy_characteristic.c  |  2 +-
 ports/nrf/modules/ubluepy/ubluepy_constants.c |  2 -
 ports/nrf/modules/ubluepy/ubluepy_delegate.c  |  2 +-
 .../nrf/modules/ubluepy/ubluepy_descriptor.c  |  2 +-
 .../nrf/modules/ubluepy/ubluepy_peripheral.c  |  2 +-
 .../nrf/modules/ubluepy/ubluepy_scan_entry.c  |  1 -
 ports/nrf/modules/ubluepy/ubluepy_scanner.c   |  2 +-
 ports/nrf/modules/ubluepy/ubluepy_service.c   |  2 +-
 ports/nrf/modules/ubluepy/ubluepy_uuid.c      |  2 +-
 ports/nrf/modules/uos/microbitfs.c            |  2 -
 ports/nrf/pin_named_pins.c                    |  2 -
 ports/pic16bit/modpybled.c                    |  2 +-
 ports/pic16bit/modpybswitch.c                 |  2 +-
 ports/renesas-ra/extint.c                     |  2 +-
 ports/renesas-ra/led.c                        |  2 +-
 ports/renesas-ra/machine_adc.c                |  2 +-
 ports/renesas-ra/machine_i2c.c                |  2 +-
 ports/renesas-ra/machine_pin.c                |  4 +-
 ports/renesas-ra/machine_rtc.c                |  2 +-
 ports/renesas-ra/machine_spi.c                |  2 +-
 ports/renesas-ra/machine_timer.c              |  2 +-
 ports/renesas-ra/machine_uart.c               |  2 +-
 ports/renesas-ra/main.c                       |  2 +-
 ports/renesas-ra/storage.c                    |  2 +-
 ports/renesas-ra/timer.c                      |  3 +-
 ports/renesas-ra/usrsw.c                      |  2 +-
 ports/rp2/machine_adc.c                       |  2 +-
 ports/rp2/machine_i2c.c                       |  2 +-
 ports/rp2/machine_i2s.c                       |  2 +-
 ports/rp2/machine_pin.c                       |  2 +-
 ports/rp2/machine_rtc.c                       |  2 +-
 ports/rp2/machine_spi.c                       |  2 +-
 ports/rp2/machine_timer.c                     |  2 +-
 ports/rp2/machine_uart.c                      |  2 +-
 ports/rp2/machine_wdt.c                       |  2 +-
 ports/rp2/mpbthciport.c                       |  2 +-
 ports/rp2/rp2_flash.c                         |  2 +-
 ports/rp2/rp2_pio.c                           |  4 +-
 ports/samd/machine_led.c                      |  2 +-
 ports/samd/machine_pin.c                      |  2 +-
 ports/samd/samd_flash.c                       |  2 +-
 ports/stm32/accel.c                           |  2 +-
 ports/stm32/adc.c                             |  4 +-
 ports/stm32/boards/LEGO_HUB_NO6/cc2564.c      |  2 +-
 ports/stm32/dac.c                             |  2 +-
 ports/stm32/extint.c                          |  2 +-
 ports/stm32/lcd.c                             |  2 +-
 ports/stm32/led.c                             |  2 +-
 ports/stm32/machine_adc.c                     |  2 +-
 ports/stm32/machine_i2c.c                     |  2 +-
 ports/stm32/machine_i2s.c                     |  2 +-
 ports/stm32/machine_spi.c                     |  2 +-
 ports/stm32/machine_timer.c                   |  2 +-
 ports/stm32/machine_uart.c                    |  2 +-
 ports/stm32/main.c                            |  2 +-
 ports/stm32/network_lan.c                     |  2 +-
 ports/stm32/pin.c                             |  3 +-
 ports/stm32/pin_named_pins.c                  |  2 -
 ports/stm32/pyb_can.c                         |  2 +-
 ports/stm32/pyb_i2c.c                         |  2 +-
 ports/stm32/pyb_spi.c                         |  2 +-
 ports/stm32/rtc.c                             |  2 +-
 ports/stm32/sdcard.c                          |  4 +-
 ports/stm32/servo.c                           |  2 +-
 ports/stm32/storage.c                         |  2 +-
 ports/stm32/timer.c                           |  3 +-
 ports/stm32/usb.c                             |  4 +-
 ports/stm32/usrsw.c                           |  2 +-
 ports/stm32/wdt.c                             |  2 +-
 ports/teensy/led.c                            |  2 +-
 ports/teensy/timer.c                          |  3 +-
 ports/teensy/uart.c                           |  2 +-
 ports/unix/coverage.c                         |  2 -
 ports/unix/main.c                             |  2 +-
 ports/unix/modffi.c                           |  8 +--
 ports/unix/modjni.c                           |  3 -
 ports/unix/moduselect.c                       |  1 -
 ports/unix/modusocket.c                       |  2 +-
 ports/zephyr/machine_i2c.c                    |  2 +-
 ports/zephyr/machine_pin.c                    |  2 +-
 ports/zephyr/machine_spi.c                    |  2 +-
 ports/zephyr/machine_uart.c                   |  2 +-
 ports/zephyr/main.c                           |  4 +-
 ports/zephyr/modusocket.c                     |  2 +-
 ports/zephyr/modzsensor.c                     |  2 +-
 ports/zephyr/zephyr_storage.c                 |  4 +-
 py/builtinevex.c                              |  3 +-
 py/dynruntime.h                               |  2 +-
 py/modbuiltins.c                              |  2 +-
 py/modio.c                                    |  4 +-
 py/modthread.c                                |  1 -
 py/obj.h                                      | 56 +++++++++----------
 py/objarray.c                                 |  7 +--
 py/objattrtuple.c                             |  1 -
 py/objbool.c                                  |  2 +-
 py/objboundmeth.c                             |  1 -
 py/objcell.c                                  |  2 +-
 py/objclosure.c                               |  1 -
 py/objcomplex.c                               |  3 +-
 py/objdeque.c                                 |  2 +-
 py/objdict.c                                  |  6 +-
 py/objenumerate.c                             |  2 +-
 py/objexcept.c                                | 12 ++--
 py/objexcept.h                                |  3 +-
 py/objfilter.c                                |  2 +-
 py/objfloat.c                                 |  3 +-
 py/objfun.c                                   | 13 ++---
 py/objgenerator.c                             |  3 -
 py/objgetitemiter.c                           |  1 -
 py/objint.c                                   |  2 +-
 py/objlist.c                                  |  4 +-
 py/objlist.h                                  |  1 +
 py/objmap.c                                   |  2 +-
 py/objmodule.c                                |  1 -
 py/objnamedtuple.c                            | 16 +++---
 py/objnamedtuple.h                            |  4 +-
 py/objnone.c                                  |  1 -
 py/objobject.c                                |  2 +-
 py/objpolyiter.c                              |  2 -
 py/objproperty.c                              |  2 +-
 py/objrange.c                                 |  3 +-
 py/objreversed.c                              |  2 +-
 py/objset.c                                   |  4 +-
 py/objsingleton.c                             |  2 +-
 py/objslice.c                                 |  1 -
 py/objstr.c                                   |  6 +-
 py/objstringio.c                              |  4 +-
 py/objstrunicode.c                            |  2 +-
 py/objtuple.c                                 |  2 +-
 py/objtype.c                                  | 56 +++++++++----------
 py/objtype.h                                  |  4 +-
 py/objzip.c                                   |  2 +-
 py/profile.c                                  |  2 -
 py/runtime.c                                  |  1 -
 shared/runtime/mpirq.c                        |  1 -
 shared/runtime/sys_stdio_mphal.c              |  2 -
 248 files changed, 316 insertions(+), 397 deletions(-)

diff --git a/drivers/ninaw10/nina_wifi_bsp.c b/drivers/ninaw10/nina_wifi_bsp.c
index d5b1308536af9..c65fb111fb101 100644
--- a/drivers/ninaw10/nina_wifi_bsp.c
+++ b/drivers/ninaw10/nina_wifi_bsp.c
@@ -73,7 +73,7 @@ int nina_bsp_init(void) {
         MP_OBJ_NEW_SMALL_INT(MICROPY_HW_WIFI_SPI_BAUDRATE),
     };
 
-    MP_STATE_PORT(mp_wifi_spi) = machine_spi_type.make_new((mp_obj_t)&machine_spi_type, 2, 0, args);
+    MP_STATE_PORT(mp_wifi_spi) = MP_OBJ_TYPE_GET_SLOT(&machine_spi_type, make_new)((mp_obj_t)&machine_spi_type, 2, 0, args);
     return 0;
 }
 
diff --git a/examples/natmod/framebuf/framebuf.c b/examples/natmod/framebuf/framebuf.c
index 4c557294719d8..32b67eabcf84f 100644
--- a/examples/natmod/framebuf/framebuf.c
+++ b/examples/natmod/framebuf/framebuf.c
@@ -20,8 +20,8 @@ mp_obj_t mpy_init(mp_obj_fun_bc_t *self, size_t n_args, size_t n_kw, mp_obj_t *a
 
     mp_type_framebuf.base.type = (void*)&mp_type_type;
     mp_type_framebuf.name = MP_QSTR_FrameBuffer;
-    mp_type_framebuf.make_new = framebuf_make_new;
-    MP_OBJ_TYPE_SET_SLOT(&mp_type_framebuf, buffer, framebuf_get_buffer, 0);
+    MP_OBJ_TYPE_SET_SLOT(&mp_type_framebuf, make_new, framebuf_make_new, 0);
+    MP_OBJ_TYPE_SET_SLOT(&mp_type_framebuf, buffer, framebuf_get_buffer, 1);
     framebuf_locals_dict_table[0] = (mp_map_elem_t){ MP_OBJ_NEW_QSTR(MP_QSTR_fill), MP_OBJ_FROM_PTR(&framebuf_fill_obj) };
     framebuf_locals_dict_table[1] = (mp_map_elem_t){ MP_OBJ_NEW_QSTR(MP_QSTR_fill_rect), MP_OBJ_FROM_PTR(&framebuf_fill_rect_obj) };
     framebuf_locals_dict_table[2] = (mp_map_elem_t){ MP_OBJ_NEW_QSTR(MP_QSTR_pixel), MP_OBJ_FROM_PTR(&framebuf_pixel_obj) };
@@ -33,7 +33,7 @@ mp_obj_t mpy_init(mp_obj_fun_bc_t *self, size_t n_args, size_t n_kw, mp_obj_t *a
     framebuf_locals_dict_table[8] = (mp_map_elem_t){ MP_OBJ_NEW_QSTR(MP_QSTR_blit), MP_OBJ_FROM_PTR(&framebuf_blit_obj) };
     framebuf_locals_dict_table[9] = (mp_map_elem_t){ MP_OBJ_NEW_QSTR(MP_QSTR_scroll), MP_OBJ_FROM_PTR(&framebuf_scroll_obj) };
     framebuf_locals_dict_table[10] = (mp_map_elem_t){ MP_OBJ_NEW_QSTR(MP_QSTR_text), MP_OBJ_FROM_PTR(&framebuf_text_obj) };
-    MP_OBJ_TYPE_SET_SLOT(&mp_type_framebuf, locals_dict, (void*)&framebuf_locals_dict, 1);
+    MP_OBJ_TYPE_SET_SLOT(&mp_type_framebuf, locals_dict, (void*)&framebuf_locals_dict, 2);
 
     mp_store_global(MP_QSTR_FrameBuffer, MP_OBJ_FROM_PTR(&mp_type_framebuf));
     mp_store_global(MP_QSTR_FrameBuffer1, MP_OBJ_FROM_PTR(&legacy_framebuffer1_obj));
diff --git a/examples/natmod/uzlib/uzlib.c b/examples/natmod/uzlib/uzlib.c
index 469452e8f8437..9cf58b10e78e2 100644
--- a/examples/natmod/uzlib/uzlib.c
+++ b/examples/natmod/uzlib/uzlib.c
@@ -20,12 +20,12 @@ mp_obj_t mpy_init(mp_obj_fun_bc_t *self, size_t n_args, size_t n_kw, mp_obj_t *a
 
     decompio_type.base.type = mp_fun_table.type_type;
     decompio_type.name = MP_QSTR_DecompIO;
-    decompio_type.make_new = &decompio_make_new;
-    MP_OBJ_TYPE_SET_SLOT(&decompio_type, protocol, &decompio_stream_p, 0);
+    MP_OBJ_TYPE_SET_SLOT(&decompio_type, make_new, &decompio_make_new, 0);
+    MP_OBJ_TYPE_SET_SLOT(&decompio_type, protocol, &decompio_stream_p, 1);
     decompio_locals_dict_table[0] = (mp_map_elem_t){ MP_OBJ_NEW_QSTR(MP_QSTR_read), MP_OBJ_FROM_PTR(&mp_stream_read_obj) };
     decompio_locals_dict_table[1] = (mp_map_elem_t){ MP_OBJ_NEW_QSTR(MP_QSTR_readinto), MP_OBJ_FROM_PTR(&mp_stream_readinto_obj) };
     decompio_locals_dict_table[2] = (mp_map_elem_t){ MP_OBJ_NEW_QSTR(MP_QSTR_readline), MP_OBJ_FROM_PTR(&mp_stream_unbuffered_readline_obj) };
-    MP_OBJ_TYPE_SET_SLOT(&decompio_type, locals_dict, (void*)&decompio_locals_dict, 1);
+    MP_OBJ_TYPE_SET_SLOT(&decompio_type, locals_dict, (void*)&decompio_locals_dict, 2);
 
     mp_store_global(MP_QSTR___name__, MP_OBJ_NEW_QSTR(MP_QSTR_uzlib));
     mp_store_global(MP_QSTR_decompress, MP_OBJ_FROM_PTR(&mod_uzlib_decompress_obj));
diff --git a/extmod/machine_i2c.c b/extmod/machine_i2c.c
index bb7ade6fcf574..3563b3243c36f 100644
--- a/extmod/machine_i2c.c
+++ b/extmod/machine_i2c.c
@@ -734,7 +734,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     mp_machine_soft_i2c_type,
     MP_QSTR_SoftI2C,
     MP_TYPE_FLAG_NONE,
-    mp_machine_soft_i2c_make_new,
+    make_new, mp_machine_soft_i2c_make_new,
     print, mp_machine_soft_i2c_print,
     protocol, &mp_machine_soft_i2c_p,
     locals_dict, &mp_machine_i2c_locals_dict
diff --git a/extmod/machine_i2c.h b/extmod/machine_i2c.h
index a3363d4c341c5..600145bfedf4e 100644
--- a/extmod/machine_i2c.h
+++ b/extmod/machine_i2c.h
@@ -38,7 +38,7 @@
                 --n_args; \
                 ++all_args; \
             } \
-            return mp_machine_soft_i2c_type.make_new(&mp_machine_soft_i2c_type, n_args, n_kw, all_args); \
+            return MP_OBJ_TYPE_GET_SLOT(&mp_machine_soft_i2c_type, make_new)(&mp_machine_soft_i2c_type, n_args, n_kw, all_args); \
         } \
     } while (0)
 
diff --git a/extmod/machine_mem.c b/extmod/machine_mem.c
index 422e99d3ce42a..f27356e028365 100644
--- a/extmod/machine_mem.c
+++ b/extmod/machine_mem.c
@@ -105,7 +105,6 @@ MP_DEFINE_CONST_OBJ_TYPE(
     machine_mem_type,
     MP_QSTR_mem,
     MP_TYPE_FLAG_NONE,
-    MP_TYPE_NULL_MAKE_NEW,
     print, machine_mem_print,
     subscr, machine_mem_subscr
     );
diff --git a/extmod/machine_pinbase.c b/extmod/machine_pinbase.c
index 617dd1280c784..8607e6ed3de99 100644
--- a/extmod/machine_pinbase.c
+++ b/extmod/machine_pinbase.c
@@ -81,7 +81,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     machine_pinbase_type,
     MP_QSTR_PinBase,
     MP_TYPE_FLAG_NONE,
-    pinbase_make_new,
+    make_new, pinbase_make_new,
     protocol, &pinbase_pin_p
     );
 
diff --git a/extmod/machine_pwm.c b/extmod/machine_pwm.c
index f12f70a2d14d4..220d34d7da582 100644
--- a/extmod/machine_pwm.c
+++ b/extmod/machine_pwm.c
@@ -136,7 +136,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     machine_pwm_type,
     MP_QSTR_PWM,
     MP_TYPE_FLAG_NONE,
-    mp_machine_pwm_make_new,
+    make_new, mp_machine_pwm_make_new,
     print, mp_machine_pwm_print,
     locals_dict, &machine_pwm_locals_dict
     );
diff --git a/extmod/machine_signal.c b/extmod/machine_signal.c
index 49ee6dfb4abc8..7922ed70771e9 100644
--- a/extmod/machine_signal.c
+++ b/extmod/machine_signal.c
@@ -176,7 +176,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     machine_signal_type,
     MP_QSTR_Signal,
     MP_TYPE_FLAG_NONE,
-    signal_make_new,
+    make_new, signal_make_new,
     call, signal_call,
     protocol, &signal_pin_p,
     locals_dict, &signal_locals_dict
diff --git a/extmod/machine_spi.c b/extmod/machine_spi.c
index 54f1964e2193a..bb35cff38e618 100644
--- a/extmod/machine_spi.c
+++ b/extmod/machine_spi.c
@@ -255,7 +255,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     mp_machine_soft_spi_type,
     MP_QSTR_SoftSPI,
     MP_TYPE_FLAG_NONE,
-    mp_machine_soft_spi_make_new,
+    make_new, mp_machine_soft_spi_make_new,
     print, mp_machine_soft_spi_print,
     protocol, &mp_machine_soft_spi_p,
     locals_dict, &mp_machine_spi_locals_dict
diff --git a/extmod/machine_spi.h b/extmod/machine_spi.h
index ca92c719a8b5a..93ee8d00ca32b 100644
--- a/extmod/machine_spi.h
+++ b/extmod/machine_spi.h
@@ -39,7 +39,7 @@
                 --n_args; \
                 ++all_args; \
             } \
-            return mp_machine_soft_spi_type.make_new(&mp_machine_soft_spi_type, n_args, n_kw, all_args); \
+            return MP_OBJ_TYPE_GET_SLOT(&mp_machine_soft_spi_type, make_new)(&mp_machine_soft_spi_type, n_args, n_kw, all_args); \
         } \
     } while (0)
 
diff --git a/extmod/modbluetooth.c b/extmod/modbluetooth.c
index 2e058fc7deb25..9c168483ba453 100644
--- a/extmod/modbluetooth.c
+++ b/extmod/modbluetooth.c
@@ -244,7 +244,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_bluetooth_uuid,
     MP_QSTR_UUID,
     MP_TYPE_FLAG_NONE,
-    bluetooth_uuid_make_new,
+    make_new, bluetooth_uuid_make_new,
     unary_op, bluetooth_uuid_unary_op,
     binary_op, bluetooth_uuid_binary_op,
     print, bluetooth_uuid_print,
@@ -980,7 +980,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_bluetooth_ble,
     MP_QSTR_BLE,
     MP_TYPE_FLAG_NONE,
-    bluetooth_ble_make_new,
+    make_new, bluetooth_ble_make_new,
     locals_dict, &bluetooth_ble_locals_dict
     );
 
diff --git a/extmod/modbtree.c b/extmod/modbtree.c
index f21fe3ff94173..2da65a2c7affc 100644
--- a/extmod/modbtree.c
+++ b/extmod/modbtree.c
@@ -328,7 +328,6 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     btree_type,
     MP_QSTR_btree,
     MP_TYPE_FLAG_ITER_IS_CUSTOM,
-    MP_TYPE_NULL_MAKE_NEW,
     // Save on qstr's, reuse same as for module
     print, btree_print,
     iter, &btree_getiter_iternext,
diff --git a/extmod/modframebuf.c b/extmod/modframebuf.c
index 5347be5643667..e7825b59128ef 100644
--- a/extmod/modframebuf.c
+++ b/extmod/modframebuf.c
@@ -833,7 +833,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_framebuf,
     MP_QSTR_FrameBuffer,
     MP_TYPE_FLAG_NONE,
-    framebuf_make_new,
+    make_new, framebuf_make_new,
     buffer, framebuf_get_buffer,
     locals_dict, &framebuf_locals_dict
     );
diff --git a/extmod/modlwip.c b/extmod/modlwip.c
index 2f5da36f40845..f64a5a6250bae 100644
--- a/extmod/modlwip.c
+++ b/extmod/modlwip.c
@@ -181,7 +181,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     lwip_slip_type,
     MP_QSTR_slip,
     MP_TYPE_FLAG_NONE,
-    lwip_slip_make_new,
+    make_new, lwip_slip_make_new,
     locals_dict, &lwip_slip_locals_dict
     );
 
@@ -1599,7 +1599,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     lwip_socket_type,
     MP_QSTR_socket,
     MP_TYPE_FLAG_NONE,
-    lwip_socket_make_new,
+    make_new, lwip_socket_make_new,
     print, lwip_socket_print,
     protocol, &lwip_socket_stream_p,
     locals_dict, &lwip_socket_locals_dict
diff --git a/extmod/moduasyncio.c b/extmod/moduasyncio.c
index b0eb8b6509c82..021e0da1be2c4 100644
--- a/extmod/moduasyncio.c
+++ b/extmod/moduasyncio.c
@@ -148,7 +148,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     task_queue_type,
     MP_QSTR_TaskQueue,
     MP_TYPE_FLAG_NONE,
-    task_queue_make_new,
+    make_new, task_queue_make_new,
     locals_dict, &task_queue_locals_dict
     );
 
@@ -296,7 +296,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     task_type,
     MP_QSTR_Task,
     MP_TYPE_FLAG_ITER_IS_CUSTOM,
-    task_make_new,
+    make_new, task_make_new,
     attr, task_attr,
     iter, &task_getiter_iternext
     );
diff --git a/extmod/moducryptolib.c b/extmod/moducryptolib.c
index e4625c21a8786..fc3fcfd90d904 100644
--- a/extmod/moducryptolib.c
+++ b/extmod/moducryptolib.c
@@ -352,7 +352,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     ucryptolib_aes_type,
     MP_QSTR_aes,
     MP_TYPE_FLAG_NONE,
-    ucryptolib_aes_make_new,
+    make_new, ucryptolib_aes_make_new,
     locals_dict, &ucryptolib_aes_locals_dict
     );
 
diff --git a/extmod/moductypes.c b/extmod/moductypes.c
index a9ad500c2d1a0..15c36290a9f0e 100644
--- a/extmod/moductypes.c
+++ b/extmod/moductypes.c
@@ -638,7 +638,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     uctypes_struct_type,
     MP_QSTR_struct,
     MP_TYPE_FLAG_NONE,
-    uctypes_struct_make_new,
+    make_new, uctypes_struct_make_new,
     print, uctypes_struct_print,
     attr, uctypes_struct_attr,
     subscr, uctypes_struct_subscr,
diff --git a/extmod/moduhashlib.c b/extmod/moduhashlib.c
index 9535e00b406dd..64e15c444df80 100644
--- a/extmod/moduhashlib.c
+++ b/extmod/moduhashlib.c
@@ -161,7 +161,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     uhashlib_sha256_type,
     MP_QSTR_sha256,
     MP_TYPE_FLAG_NONE,
-    uhashlib_sha256_make_new,
+    make_new, uhashlib_sha256_make_new,
     locals_dict, &uhashlib_sha256_locals_dict
     );
 #endif
@@ -255,7 +255,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     uhashlib_sha1_type,
     MP_QSTR_sha1,
     MP_TYPE_FLAG_NONE,
-    uhashlib_sha1_make_new,
+    make_new, uhashlib_sha1_make_new,
     locals_dict, &uhashlib_sha1_locals_dict
     );
 #endif
@@ -349,7 +349,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     uhashlib_md5_type,
     MP_QSTR_md5,
     MP_TYPE_FLAG_NONE,
-    uhashlib_md5_make_new,
+    make_new, uhashlib_md5_make_new,
     locals_dict, &uhashlib_md5_locals_dict
     );
 #endif // MICROPY_PY_UHASHLIB_MD5
diff --git a/extmod/modure.c b/extmod/modure.c
index c0114c14fd57f..801e5df89779e 100644
--- a/extmod/modure.c
+++ b/extmod/modure.c
@@ -183,7 +183,6 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     match_type,
     MP_QSTR_match,
     MP_TYPE_FLAG_NONE,
-    MP_TYPE_NULL_MAKE_NEW,
     print, match_print,
     locals_dict, &match_locals_dict
     );
@@ -417,7 +416,6 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     re_type,
     MP_QSTR_ure,
     MP_TYPE_FLAG_NONE,
-    MP_TYPE_NULL_MAKE_NEW,
     print, re_print,
     locals_dict, &re_locals_dict
     );
diff --git a/extmod/moduselect.c b/extmod/moduselect.c
index 58bd1169a945e..128154a4b6d9a 100644
--- a/extmod/moduselect.c
+++ b/extmod/moduselect.c
@@ -340,7 +340,6 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_poll,
     MP_QSTR_poll,
     MP_TYPE_FLAG_ITER_IS_ITERNEXT,
-    MP_TYPE_NULL_MAKE_NEW,
     iter, poll_iternext,
     locals_dict, &poll_locals_dict
     );
diff --git a/extmod/modusocket.c b/extmod/modusocket.c
index fc16d7e270301..194ee6899ede3 100644
--- a/extmod/modusocket.c
+++ b/extmod/modusocket.c
@@ -532,7 +532,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     socket_type,
     MP_QSTR_socket,
     MP_TYPE_FLAG_NONE,
-    socket_make_new,
+    make_new, socket_make_new,
     protocol, &socket_stream_p,
     locals_dict, &socket_locals_dict,
     print, socket_print
diff --git a/extmod/modussl_axtls.c b/extmod/modussl_axtls.c
index a6d606d560ebe..2eae46504835f 100644
--- a/extmod/modussl_axtls.c
+++ b/extmod/modussl_axtls.c
@@ -318,7 +318,6 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     ussl_socket_type,
     MP_QSTR_ussl,
     MP_TYPE_FLAG_NONE,
-    MP_TYPE_NULL_MAKE_NEW,
     // Save on qstr's, reuse same as for module
     print, ussl_socket_print,
     protocol, &ussl_socket_stream_p,
diff --git a/extmod/modussl_mbedtls.c b/extmod/modussl_mbedtls.c
index 50712980ba04f..95cf12c975af2 100644
--- a/extmod/modussl_mbedtls.c
+++ b/extmod/modussl_mbedtls.c
@@ -396,7 +396,6 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     ussl_socket_type,
     MP_QSTR_ussl,
     MP_TYPE_FLAG_NONE,
-    MP_TYPE_NULL_MAKE_NEW,
     // Save on qstr's, reuse same as for module
     print, socket_print,
     protocol, &ussl_socket_stream_p,
diff --git a/extmod/modutimeq.c b/extmod/modutimeq.c
index 1a7575adc9e58..1a38104eafcdc 100644
--- a/extmod/modutimeq.c
+++ b/extmod/modutimeq.c
@@ -213,7 +213,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     utimeq_type,
     MP_QSTR_utimeq,
     MP_TYPE_FLAG_NONE,
-    utimeq_make_new,
+    make_new, utimeq_make_new,
     unary_op, utimeq_unary_op,
     locals_dict, &utimeq_locals_dict
     );
diff --git a/extmod/moduwebsocket.c b/extmod/moduwebsocket.c
index c6be50d0e15a3..9b12fc86358cd 100644
--- a/extmod/moduwebsocket.c
+++ b/extmod/moduwebsocket.c
@@ -294,7 +294,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     websocket_type,
     MP_QSTR_websocket,
     MP_TYPE_FLAG_NONE,
-    websocket_make_new,
+    make_new, websocket_make_new,
     protocol, &websocket_stream_p,
     locals_dict, &websocket_locals_dict
     );
diff --git a/extmod/moduzlib.c b/extmod/moduzlib.c
index 533168d0b0543..14d15321a3c1e 100644
--- a/extmod/moduzlib.c
+++ b/extmod/moduzlib.c
@@ -144,7 +144,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     decompio_type,
     MP_QSTR_DecompIO,
     MP_TYPE_FLAG_NONE,
-    decompio_make_new,
+    make_new, decompio_make_new,
     protocol, &decompio_stream_p,
     locals_dict, &decompio_locals_dict
     );
diff --git a/extmod/modwebrepl.c b/extmod/modwebrepl.c
index fc5ca35ea0338..d86f358962348 100644
--- a/extmod/modwebrepl.c
+++ b/extmod/modwebrepl.c
@@ -346,7 +346,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     webrepl_type,
     MP_QSTR__webrepl,
     MP_TYPE_FLAG_NONE,
-    webrepl_make_new,
+    make_new, webrepl_make_new,
     protocol, &webrepl_stream_p,
     locals_dict, &webrepl_locals_dict
     );
diff --git a/extmod/network_cyw43.c b/extmod/network_cyw43.c
index 329ba53ef51a6..87d9b9f614282 100644
--- a/extmod/network_cyw43.c
+++ b/extmod/network_cyw43.c
@@ -500,7 +500,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     mp_network_cyw43_type,
     MP_QSTR_CYW43,
     MP_TYPE_FLAG_NONE,
-    network_cyw43_make_new,
+    make_new, network_cyw43_make_new,
     print, network_cyw43_print,
     locals_dict, &network_cyw43_locals_dict
     );
diff --git a/extmod/network_ninaw10.c b/extmod/network_ninaw10.c
index 806819648d2ee..f4cc0b22244dd 100644
--- a/extmod/network_ninaw10.c
+++ b/extmod/network_ninaw10.c
@@ -159,7 +159,7 @@ STATIC mp_obj_t network_ninaw10_active(size_t n_args, const mp_obj_t *args) {
                     MP_OBJ_NEW_QSTR(MP_QSTR_freq), MP_OBJ_NEW_SMALL_INT(10),
                     MP_OBJ_NEW_QSTR(MP_QSTR_callback), MP_OBJ_FROM_PTR(&network_ninaw10_timer_callback_obj),
                 };
-                MP_STATE_PORT(mp_wifi_timer) = machine_timer_type.make_new((mp_obj_t)&machine_timer_type, 0, 2, timer_args);
+                MP_STATE_PORT(mp_wifi_timer) = MP_OBJ_TYPE_GET_SLOT(&machine_timer_type, make_new)((mp_obj_t)&machine_timer_type, 0, 2, timer_args);
             }
         } else {
             nina_deinit();
@@ -778,7 +778,7 @@ STATIC MP_DEFINE_CONST_OBJ_FULL_TYPE(
     mod_network_nic_type_nina_base,
     MP_QSTR_nina,
     MP_TYPE_FLAG_NONE,
-    network_ninaw10_make_new,
+    make_new, network_ninaw10_make_new,
     locals_dict, &nina_locals_dict
     );
 
diff --git a/extmod/network_wiznet5k.c b/extmod/network_wiznet5k.c
index 82f836f691844..af2014508127c 100644
--- a/extmod/network_wiznet5k.c
+++ b/extmod/network_wiznet5k.c
@@ -708,7 +708,7 @@ STATIC mp_obj_t wiznet5k_make_new(const mp_obj_type_t *type, size_t n_args, size
             MP_ROM_QSTR(MP_QSTR_miso), mp_pin_make_new(NULL, 1, 0, &miso_obj),
             MP_ROM_QSTR(MP_QSTR_mosi), mp_pin_make_new(NULL, 1, 0, &mosi_obj),
         };
-        spi = MP_OBJ_TO_PTR(machine_spi_type.make_new((mp_obj_t)&machine_spi_type, 2, 3, args));
+        spi = MP_OBJ_TO_PTR(MP_OBJ_TYPE_GET_SLOT(&machine_spi_type, make_new)((mp_obj_t)&machine_spi_type, 2, 3, args));
 
         cs = mp_hal_get_pin_obj(mp_pin_make_new(NULL, 1, 0, (mp_obj_t[]) {MP_OBJ_NEW_SMALL_INT(MICROPY_HW_WIZNET_PIN_CS)}));
         rst = mp_hal_get_pin_obj(mp_pin_make_new(NULL, 1, 0, (mp_obj_t[]) {MP_OBJ_NEW_SMALL_INT(MICROPY_HW_WIZNET_PIN_RST)}));
@@ -1020,7 +1020,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     mod_network_nic_type_wiznet5k,
     MP_QSTR_WIZNET5K,
     MP_TYPE_FLAG_NONE,
-    wiznet5k_make_new,
+    make_new, wiznet5k_make_new,
     locals_dict, &wiznet5k_locals_dict
     );
 #else // WIZNET5K_PROVIDED_STACK
@@ -1028,7 +1028,7 @@ STATIC MP_DEFINE_CONST_OBJ_FULL_TYPE(
     mod_network_nic_type_wiznet5k_base,
     MP_QSTR_WIZNET5K,
     MP_TYPE_FLAG_NONE,
-    wiznet5k_make_new,
+    make_new, wiznet5k_make_new,
     locals_dict, &wiznet5k_locals_dict
     );
 
diff --git a/extmod/vfs.c b/extmod/vfs.c
index 00450e1005595..af63ceb37eb19 100644
--- a/extmod/vfs.c
+++ b/extmod/vfs.c
@@ -173,7 +173,7 @@ STATIC mp_obj_t mp_vfs_autodetect(mp_obj_t bdev_obj) {
             #if MICROPY_VFS_LFS1
             if (memcmp(&buf[32], "littlefs", 8) == 0) {
                 // LFS1
-                mp_obj_t vfs = mp_type_vfs_lfs1.make_new(&mp_type_vfs_lfs1, 1, 0, &bdev_obj);
+                mp_obj_t vfs = MP_OBJ_TYPE_GET_SLOT(&mp_type_vfs_lfs1, make_new)(&mp_type_vfs_lfs1, 1, 0, &bdev_obj);
                 nlr_pop();
                 return vfs;
             }
@@ -181,7 +181,7 @@ STATIC mp_obj_t mp_vfs_autodetect(mp_obj_t bdev_obj) {
             #if MICROPY_VFS_LFS2
             if (memcmp(&buf[0], "littlefs", 8) == 0) {
                 // LFS2
-                mp_obj_t vfs = mp_type_vfs_lfs2.make_new(&mp_type_vfs_lfs2, 1, 0, &bdev_obj);
+                mp_obj_t vfs = MP_OBJ_TYPE_GET_SLOT(&mp_type_vfs_lfs2, make_new)(&mp_type_vfs_lfs2, 1, 0, &bdev_obj);
                 nlr_pop();
                 return vfs;
             }
@@ -194,7 +194,7 @@ STATIC mp_obj_t mp_vfs_autodetect(mp_obj_t bdev_obj) {
     #endif
 
     #if MICROPY_VFS_FAT
-    return mp_fat_vfs_type.make_new(&mp_fat_vfs_type, 1, 0, &bdev_obj);
+    return MP_OBJ_TYPE_GET_SLOT(&mp_fat_vfs_type, make_new)(&mp_fat_vfs_type, 1, 0, &bdev_obj);
     #endif
 
     // no filesystem found
diff --git a/extmod/vfs_fat.c b/extmod/vfs_fat.c
index 7c18a51633746..efb6bf7e9815d 100644
--- a/extmod/vfs_fat.c
+++ b/extmod/vfs_fat.c
@@ -435,7 +435,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     mp_fat_vfs_type,
     MP_QSTR_VfsFat,
     MP_TYPE_FLAG_NONE,
-    fat_vfs_make_new,
+    make_new, fat_vfs_make_new,
     protocol, &fat_vfs_proto,
     locals_dict, &fat_vfs_locals_dict
     );
diff --git a/extmod/vfs_fat_file.c b/extmod/vfs_fat_file.c
index ca2e2b446f13d..07e6df9bf9595 100644
--- a/extmod/vfs_fat_file.c
+++ b/extmod/vfs_fat_file.c
@@ -180,7 +180,6 @@ MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_vfs_fat_fileio,
     MP_QSTR_FileIO,
     MP_TYPE_FLAG_ITER_IS_STREAM,
-    MP_TYPE_NULL_MAKE_NEW,
     print, file_obj_print,
     protocol, &vfs_fat_fileio_stream_p,
     locals_dict, &vfs_fat_rawfile_locals_dict
@@ -197,7 +196,6 @@ MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_vfs_fat_textio,
     MP_QSTR_TextIOWrapper,
     MP_TYPE_FLAG_ITER_IS_STREAM,
-    MP_TYPE_NULL_MAKE_NEW,
     print, file_obj_print,
     protocol, &vfs_fat_textio_stream_p,
     locals_dict, &vfs_fat_rawfile_locals_dict
diff --git a/extmod/vfs_lfsx.c b/extmod/vfs_lfsx.c
index 33e2ef551987a..d9617817f9565 100644
--- a/extmod/vfs_lfsx.c
+++ b/extmod/vfs_lfsx.c
@@ -512,7 +512,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_VFS_LFSx,
     VFS_LFSx_QSTR,
     MP_TYPE_FLAG_NONE,
-    MP_VFS_LFSx(make_new),
+    make_new, MP_VFS_LFSx(make_new),
     protocol, &MP_VFS_LFSx(proto),
     locals_dict, &MP_VFS_LFSx(locals_dict)
     );
diff --git a/extmod/vfs_lfsx_file.c b/extmod/vfs_lfsx_file.c
index f97641b7b951a..2c87fd5b994c6 100644
--- a/extmod/vfs_lfsx_file.c
+++ b/extmod/vfs_lfsx_file.c
@@ -224,7 +224,6 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_VFS_LFSx_(_fileio),
     MP_QSTR_FileIO,
     MP_TYPE_FLAG_ITER_IS_STREAM,
-    MP_TYPE_NULL_MAKE_NEW,
     print, MP_VFS_LFSx(file_print),
     protocol, &MP_VFS_LFSx(fileio_stream_p),
     locals_dict, &MP_VFS_LFSx(file_locals_dict)
@@ -241,7 +240,6 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_VFS_LFSx_(_textio),
     MP_QSTR_TextIOWrapper,
     MP_TYPE_FLAG_ITER_IS_STREAM,
-    MP_TYPE_NULL_MAKE_NEW,
     print, MP_VFS_LFSx(file_print),
     protocol, &MP_VFS_LFSx(textio_stream_p),
     locals_dict, &MP_VFS_LFSx(file_locals_dict)
diff --git a/extmod/vfs_posix.c b/extmod/vfs_posix.c
index b02827e8647c9..3694ebaf99743 100644
--- a/extmod/vfs_posix.c
+++ b/extmod/vfs_posix.c
@@ -402,7 +402,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_vfs_posix,
     MP_QSTR_VfsPosix,
     MP_TYPE_FLAG_NONE,
-    vfs_posix_make_new,
+    make_new, vfs_posix_make_new,
     protocol, &vfs_posix_proto,
     locals_dict, &vfs_posix_locals_dict
     );
diff --git a/extmod/vfs_posix_file.c b/extmod/vfs_posix_file.c
index 729d914d3a11a..4a37489686cd9 100644
--- a/extmod/vfs_posix_file.c
+++ b/extmod/vfs_posix_file.c
@@ -253,7 +253,6 @@ MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_vfs_posix_fileio,
     MP_QSTR_FileIO,
     MP_TYPE_FLAG_ITER_IS_STREAM,
-    MP_TYPE_NULL_MAKE_NEW,
     print, vfs_posix_file_print,
     protocol, &vfs_posix_fileio_stream_p,
     locals_dict, &vfs_posix_rawfile_locals_dict
@@ -270,7 +269,6 @@ MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_vfs_posix_textio,
     MP_QSTR_TextIOWrapper,
     MP_TYPE_FLAG_ITER_IS_STREAM,
-    MP_TYPE_NULL_MAKE_NEW,
     print, vfs_posix_file_print,
     protocol, &vfs_posix_textio_stream_p,
     locals_dict, &vfs_posix_rawfile_locals_dict
diff --git a/ports/cc3200/misc/mpirq.c b/ports/cc3200/misc/mpirq.c
index 9c3c2f7196721..eb813fa4c6f2a 100644
--- a/ports/cc3200/misc/mpirq.c
+++ b/ports/cc3200/misc/mpirq.c
@@ -194,7 +194,6 @@ MP_DEFINE_CONST_OBJ_TYPE(
     mp_irq_type,
     MP_QSTR_irq,
     MP_TYPE_FLAG_NONE,
-    MP_TYPE_NULL_MAKE_NEW,
     call, mp_irq_call,
     locals_dict, &mp_irq_locals_dict
     );
diff --git a/ports/cc3200/mods/modnetwork.c b/ports/cc3200/mods/modnetwork.c
index 0a72a1ab3256b..590e872683930 100644
--- a/ports/cc3200/mods/modnetwork.c
+++ b/ports/cc3200/mods/modnetwork.c
@@ -175,7 +175,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     network_server_type,
     MP_QSTR_Server,
     MP_TYPE_FLAG_NONE,
-    network_server_make_new,
+    make_new, network_server_make_new,
     locals_dict, &network_server_locals_dict
     );
 #endif
diff --git a/ports/cc3200/mods/moduhashlib.c b/ports/cc3200/mods/moduhashlib.c
index 4a759d8ea5c56..302ff335ff862 100644
--- a/ports/cc3200/mods/moduhashlib.c
+++ b/ports/cc3200/mods/moduhashlib.c
@@ -181,7 +181,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     sha1_type,
     MP_QSTR_sha1,
     MP_TYPE_FLAG_NONE,
-    hash_make_new,
+    make_new, hash_make_new,
     locals_dict, &hash_locals_dict
     );
 
@@ -189,7 +189,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     sha256_type,
     MP_QSTR_sha256,
     MP_TYPE_FLAG_NONE,
-    hash_make_new,
+    make_new, hash_make_new,
     locals_dict, &hash_locals_dict
     );
 
diff --git a/ports/cc3200/mods/modusocket.c b/ports/cc3200/mods/modusocket.c
index 55d504a709726..cd1489fb4ae5a 100644
--- a/ports/cc3200/mods/modusocket.c
+++ b/ports/cc3200/mods/modusocket.c
@@ -763,7 +763,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     socket_type,
     MP_QSTR_socket,
     MP_TYPE_FLAG_NONE,
-    socket_make_new,
+    make_new, socket_make_new,
     protocol, &socket_stream_p,
     locals_dict, &socket_locals_dict
     );
diff --git a/ports/cc3200/mods/modwlan.c b/ports/cc3200/mods/modwlan.c
index 1e82b07e0874c..6cf1cbee4e414 100644
--- a/ports/cc3200/mods/modwlan.c
+++ b/ports/cc3200/mods/modwlan.c
@@ -1289,7 +1289,7 @@ STATIC MP_DEFINE_CONST_OBJ_FULL_TYPE(
     mod_network_nic_type_wlan_base,
     MP_QSTR_WLAN,
     MP_TYPE_FLAG_NONE,
-    wlan_make_new,
+    make_new, wlan_make_new,
     locals_dict, &wlan_locals_dict
     );
 
diff --git a/ports/cc3200/mods/pybadc.c b/ports/cc3200/mods/pybadc.c
index a14f9aced2618..74664282560d2 100644
--- a/ports/cc3200/mods/pybadc.c
+++ b/ports/cc3200/mods/pybadc.c
@@ -237,7 +237,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     pyb_adc_type,
     MP_QSTR_ADC,
     MP_TYPE_FLAG_NONE,
-    adc_make_new,
+    make_new, adc_make_new,
     print, adc_print,
     locals_dict, &adc_locals_dict
     );
@@ -305,7 +305,6 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     pyb_adc_channel_type,
     MP_QSTR_ADCChannel,
     MP_TYPE_FLAG_NONE,
-    MP_TYPE_NULL_MAKE_NEW,
     print, adc_channel_print,
     call, adc_channel_call,
     locals_dict, &adc_channel_locals_dict
diff --git a/ports/cc3200/mods/pybflash.c b/ports/cc3200/mods/pybflash.c
index a6d1e23fbf021..46b7be234f9cb 100644
--- a/ports/cc3200/mods/pybflash.c
+++ b/ports/cc3200/mods/pybflash.c
@@ -88,7 +88,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     pyb_flash_type,
     MP_QSTR_Flash,
     MP_TYPE_FLAG_NONE,
-    pyb_flash_make_new,
+    make_new, pyb_flash_make_new,
     locals_dict, &pyb_flash_locals_dict
     );
 
diff --git a/ports/cc3200/mods/pybi2c.c b/ports/cc3200/mods/pybi2c.c
index de92cc7c32b30..5d77dc8367c4a 100644
--- a/ports/cc3200/mods/pybi2c.c
+++ b/ports/cc3200/mods/pybi2c.c
@@ -525,7 +525,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     pyb_i2c_type,
     MP_QSTR_I2C,
     MP_TYPE_FLAG_NONE,
-    pyb_i2c_make_new,
+    make_new, pyb_i2c_make_new,
     print, pyb_i2c_print,
     locals_dict, &pyb_i2c_locals_dict
     );
diff --git a/ports/cc3200/mods/pybpin.c b/ports/cc3200/mods/pybpin.c
index 374d09ddfbd77..f04ca756540e4 100644
--- a/ports/cc3200/mods/pybpin.c
+++ b/ports/cc3200/mods/pybpin.c
@@ -935,7 +935,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     pin_type,
     MP_QSTR_Pin,
     MP_TYPE_FLAG_NONE,
-    pin_make_new,
+    make_new, pin_make_new,
     print, pin_print,
     call, pin_call,
     locals_dict, &pin_locals_dict
@@ -957,7 +957,6 @@ MP_DEFINE_CONST_OBJ_TYPE(
     pin_board_pins_obj_type,
     MP_QSTR_board,
     MP_TYPE_FLAG_NONE,
-    MP_TYPE_NULL_MAKE_NEW,
     print, pin_named_pins_obj_print,
     locals_dict, &pin_board_pins_locals_dict
     );
diff --git a/ports/cc3200/mods/pybrtc.c b/ports/cc3200/mods/pybrtc.c
index ed7a20fecbf6c..21e729dbf175b 100644
--- a/ports/cc3200/mods/pybrtc.c
+++ b/ports/cc3200/mods/pybrtc.c
@@ -473,7 +473,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     pyb_rtc_type,
     MP_QSTR_RTC,
     MP_TYPE_FLAG_NONE,
-    pyb_rtc_make_new,
+    make_new, pyb_rtc_make_new,
     locals_dict, &pyb_rtc_locals_dict
     );
 
diff --git a/ports/cc3200/mods/pybsd.c b/ports/cc3200/mods/pybsd.c
index 968a6a87ec4d7..209c3b5a85ecb 100644
--- a/ports/cc3200/mods/pybsd.c
+++ b/ports/cc3200/mods/pybsd.c
@@ -216,6 +216,6 @@ MP_DEFINE_CONST_OBJ_TYPE(
     pyb_sd_type,
     MP_QSTR_SD,
     MP_TYPE_FLAG_NONE,
-    pyb_sd_make_new,
+    make_new, pyb_sd_make_new,
     locals_dict, &pyb_sd_locals_dict
     );
diff --git a/ports/cc3200/mods/pybsleep.c b/ports/cc3200/mods/pybsleep.c
index 423099991f8d1..ffb281e6b13dc 100644
--- a/ports/cc3200/mods/pybsleep.c
+++ b/ports/cc3200/mods/pybsleep.c
@@ -128,8 +128,7 @@ STATIC pybsleep_wake_reason_t pybsleep_wake_reason = PYB_SLP_WAKED_PWRON;
 STATIC MP_DEFINE_CONST_OBJ_TYPE(
     pyb_sleep_type,
     MP_QSTR_sleep,
-    MP_TYPE_FLAG_NONE,
-    MP_TYPE_NULL_MAKE_NEW
+    MP_TYPE_FLAG_NONE
     );
 
 /******************************************************************************
diff --git a/ports/cc3200/mods/pybspi.c b/ports/cc3200/mods/pybspi.c
index 7d83fabfde4da..61086ec2e1d84 100644
--- a/ports/cc3200/mods/pybspi.c
+++ b/ports/cc3200/mods/pybspi.c
@@ -381,7 +381,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     pyb_spi_type,
     MP_QSTR_SPI,
     MP_TYPE_FLAG_NONE,
-    pyb_spi_make_new,
+    make_new, pyb_spi_make_new,
     print, pyb_spi_print,
     locals_dict, &pyb_spi_locals_dict
     );
diff --git a/ports/cc3200/mods/pybtimer.c b/ports/cc3200/mods/pybtimer.c
index 14e1deb083ed2..be365f3c92b26 100644
--- a/ports/cc3200/mods/pybtimer.c
+++ b/ports/cc3200/mods/pybtimer.c
@@ -463,7 +463,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     pyb_timer_type,
     MP_QSTR_Timer,
     MP_TYPE_FLAG_NONE,
-    pyb_timer_make_new,
+    make_new, pyb_timer_make_new,
     print, pyb_timer_print,
     locals_dict, &pyb_timer_locals_dict
     );
@@ -726,7 +726,6 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     pyb_timer_channel_type,
     MP_QSTR_TimerChannel,
     MP_TYPE_FLAG_NONE,
-    MP_TYPE_NULL_MAKE_NEW,
     print, pyb_timer_channel_print,
     locals_dict, &pyb_timer_channel_locals_dict
     );
diff --git a/ports/cc3200/mods/pybuart.c b/ports/cc3200/mods/pybuart.c
index f92f544732209..424ca251ec792 100644
--- a/ports/cc3200/mods/pybuart.c
+++ b/ports/cc3200/mods/pybuart.c
@@ -689,7 +689,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     pyb_uart_type,
     MP_QSTR_UART,
     MP_TYPE_FLAG_ITER_IS_STREAM,
-    pyb_uart_make_new,
+    make_new, pyb_uart_make_new,
     print, pyb_uart_print,
     protocol, &uart_stream_p,
     locals_dict, &pyb_uart_locals_dict
diff --git a/ports/cc3200/mods/pybwdt.c b/ports/cc3200/mods/pybwdt.c
index 3c1f9eb195f10..589f53cf1275d 100644
--- a/ports/cc3200/mods/pybwdt.c
+++ b/ports/cc3200/mods/pybwdt.c
@@ -154,7 +154,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     pyb_wdt_type,
     MP_QSTR_WDT,
     MP_TYPE_FLAG_NONE,
-    pyb_wdt_make_new,
+    make_new, pyb_wdt_make_new,
     locals_dict, &pybwdt_locals_dict
     );
 
diff --git a/ports/esp32/esp32_nvs.c b/ports/esp32/esp32_nvs.c
index d935a13d6fe5d..0b3661918c771 100644
--- a/ports/esp32/esp32_nvs.c
+++ b/ports/esp32/esp32_nvs.c
@@ -145,7 +145,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     esp32_nvs_type,
     MP_QSTR_NVS,
     MP_TYPE_FLAG_NONE,
-    esp32_nvs_make_new,
+    make_new, esp32_nvs_make_new,
     print, esp32_nvs_print,
     locals_dict, &esp32_nvs_locals_dict
     );
diff --git a/ports/esp32/esp32_partition.c b/ports/esp32/esp32_partition.c
index 6ce1e90b4c700..17aa34e560e8a 100644
--- a/ports/esp32/esp32_partition.c
+++ b/ports/esp32/esp32_partition.c
@@ -288,7 +288,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     esp32_partition_type,
     MP_QSTR_Partition,
     MP_TYPE_FLAG_NONE,
-    esp32_partition_make_new,
+    make_new, esp32_partition_make_new,
     print, esp32_partition_print,
     locals_dict, &esp32_partition_locals_dict
     );
diff --git a/ports/esp32/esp32_rmt.c b/ports/esp32/esp32_rmt.c
index ee09ac5200611..78c8c8aceeffb 100644
--- a/ports/esp32/esp32_rmt.c
+++ b/ports/esp32/esp32_rmt.c
@@ -376,7 +376,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     esp32_rmt_type,
     MP_QSTR_RMT,
     MP_TYPE_FLAG_NONE,
-    esp32_rmt_make_new,
+    make_new, esp32_rmt_make_new,
     print, esp32_rmt_print,
     locals_dict, &esp32_rmt_locals_dict
     );
diff --git a/ports/esp32/esp32_ulp.c b/ports/esp32/esp32_ulp.c
index 5030f980675ed..843bdb2366df2 100644
--- a/ports/esp32/esp32_ulp.c
+++ b/ports/esp32/esp32_ulp.c
@@ -95,7 +95,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     esp32_ulp_type,
     MP_QSTR_ULP,
     MP_TYPE_FLAG_NONE,
-    esp32_ulp_make_new,
+    make_new, esp32_ulp_make_new,
     locals_dict, &esp32_ulp_locals_dict
     );
 
diff --git a/ports/esp32/machine_adc.c b/ports/esp32/machine_adc.c
index c4e04159c0b90..1e20186b97be9 100644
--- a/ports/esp32/machine_adc.c
+++ b/ports/esp32/machine_adc.c
@@ -260,7 +260,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     machine_adc_type,
     MP_QSTR_ADC,
     MP_TYPE_FLAG_NONE,
-    madc_make_new,
+    make_new, madc_make_new,
     print, madc_print,
     locals_dict, &madc_locals_dict
     );
diff --git a/ports/esp32/machine_adcblock.c b/ports/esp32/machine_adcblock.c
index ae3244f7fdb4a..afe8fdea40b2a 100644
--- a/ports/esp32/machine_adcblock.c
+++ b/ports/esp32/machine_adcblock.c
@@ -198,7 +198,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     machine_adcblock_type,
     MP_QSTR_ADCBlock,
     MP_TYPE_FLAG_NONE,
-    madcblock_make_new,
+    make_new, madcblock_make_new,
     print, madcblock_print,
     locals_dict, &madcblock_locals_dict
     );
diff --git a/ports/esp32/machine_dac.c b/ports/esp32/machine_dac.c
index fbe33b0344a47..0e85dc9c9bfb2 100644
--- a/ports/esp32/machine_dac.c
+++ b/ports/esp32/machine_dac.c
@@ -108,7 +108,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     machine_dac_type,
     MP_QSTR_DAC,
     MP_TYPE_FLAG_NONE,
-    mdac_make_new,
+    make_new, mdac_make_new,
     print, mdac_print,
     locals_dict, &mdac_locals_dict
     );
diff --git a/ports/esp32/machine_hw_spi.c b/ports/esp32/machine_hw_spi.c
index 51ea31ac1b3db..05b1c871cb3cf 100644
--- a/ports/esp32/machine_hw_spi.c
+++ b/ports/esp32/machine_hw_spi.c
@@ -549,7 +549,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     machine_hw_spi_type,
     MP_QSTR_SPI,
     MP_TYPE_FLAG_NONE,
-    machine_hw_spi_make_new,
+    make_new, machine_hw_spi_make_new,
     print, machine_hw_spi_print,
     protocol, &machine_hw_spi_p,
     locals_dict, &mp_machine_spi_locals_dict
diff --git a/ports/esp32/machine_i2c.c b/ports/esp32/machine_i2c.c
index 895dc3a39874d..9244343dcf618 100644
--- a/ports/esp32/machine_i2c.c
+++ b/ports/esp32/machine_i2c.c
@@ -196,7 +196,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     machine_hw_i2c_type,
     MP_QSTR_I2C,
     MP_TYPE_FLAG_NONE,
-    machine_hw_i2c_make_new,
+    make_new, machine_hw_i2c_make_new,
     print, machine_hw_i2c_print,
     protocol, &machine_hw_i2c_p,
     locals_dict, &mp_machine_i2c_locals_dict
diff --git a/ports/esp32/machine_i2s.c b/ports/esp32/machine_i2s.c
index 6e18394cc5e56..eecf71549871f 100644
--- a/ports/esp32/machine_i2s.c
+++ b/ports/esp32/machine_i2s.c
@@ -833,7 +833,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     machine_i2s_type,
     MP_QSTR_I2S,
     MP_TYPE_FLAG_ITER_IS_STREAM,
-    machine_i2s_make_new,
+    make_new, machine_i2s_make_new,
     print, machine_i2s_print,
     protocol, &i2s_stream_p,
     locals_dict, &machine_i2s_locals_dict
diff --git a/ports/esp32/machine_pin.c b/ports/esp32/machine_pin.c
index fd523a38edacc..4f6f948d52af5 100644
--- a/ports/esp32/machine_pin.c
+++ b/ports/esp32/machine_pin.c
@@ -533,7 +533,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     machine_pin_type,
     MP_QSTR_Pin,
     MP_TYPE_FLAG_NONE,
-    mp_pin_make_new,
+    make_new, mp_pin_make_new,
     print, machine_pin_print,
     call, machine_pin_call,
     protocol, &pin_pin_p,
@@ -728,7 +728,6 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     machine_pin_irq_type,
     MP_QSTR_IRQ,
     MP_TYPE_FLAG_NONE,
-    MP_TYPE_NULL_MAKE_NEW,
     call, machine_pin_irq_call,
     locals_dict, &machine_pin_irq_locals_dict
     );
diff --git a/ports/esp32/machine_rtc.c b/ports/esp32/machine_rtc.c
index 19b83703fd43f..3d620336c9a91 100644
--- a/ports/esp32/machine_rtc.c
+++ b/ports/esp32/machine_rtc.c
@@ -177,6 +177,6 @@ MP_DEFINE_CONST_OBJ_TYPE(
     machine_rtc_type,
     MP_QSTR_RTC,
     MP_TYPE_FLAG_NONE,
-    machine_rtc_make_new,
+    make_new, machine_rtc_make_new,
     locals_dict, &machine_rtc_locals_dict
     );
diff --git a/ports/esp32/machine_sdcard.c b/ports/esp32/machine_sdcard.c
index 0b6159157d980..801a26f378db9 100644
--- a/ports/esp32/machine_sdcard.c
+++ b/ports/esp32/machine_sdcard.c
@@ -403,7 +403,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     machine_sdcard_type,
     MP_QSTR_SDCard,
     MP_TYPE_FLAG_NONE,
-    machine_sdcard_make_new,
+    make_new, machine_sdcard_make_new,
     locals_dict, &machine_sdcard_locals_dict
     );
 
diff --git a/ports/esp32/machine_timer.c b/ports/esp32/machine_timer.c
index 2fd40fa2afc12..83fe81f6eee34 100644
--- a/ports/esp32/machine_timer.c
+++ b/ports/esp32/machine_timer.c
@@ -281,7 +281,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     machine_timer_type,
     MP_QSTR_Timer,
     MP_TYPE_FLAG_NONE,
-    machine_timer_make_new,
+    make_new, machine_timer_make_new,
     print, machine_timer_print,
     locals_dict, &machine_timer_locals_dict
     );
diff --git a/ports/esp32/machine_touchpad.c b/ports/esp32/machine_touchpad.c
index deba818dd1c87..ad1f6c9474cde 100644
--- a/ports/esp32/machine_touchpad.c
+++ b/ports/esp32/machine_touchpad.c
@@ -138,7 +138,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     machine_touchpad_type,
     MP_QSTR_TouchPad,
     MP_TYPE_FLAG_NONE,
-    mtp_make_new,
+    make_new, mtp_make_new,
     locals_dict, &mtp_locals_dict
     );
 
diff --git a/ports/esp32/machine_uart.c b/ports/esp32/machine_uart.c
index 1f404154fc5ba..4cfa31b71de3b 100644
--- a/ports/esp32/machine_uart.c
+++ b/ports/esp32/machine_uart.c
@@ -534,7 +534,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     machine_uart_type,
     MP_QSTR_UART,
     MP_TYPE_FLAG_ITER_IS_STREAM,
-    machine_uart_make_new,
+    make_new, machine_uart_make_new,
     print, machine_uart_print,
     protocol, &uart_stream_p,
     locals_dict, &machine_uart_locals_dict
diff --git a/ports/esp32/machine_wdt.c b/ports/esp32/machine_wdt.c
index bda9c6975e152..4ccf417b60999 100644
--- a/ports/esp32/machine_wdt.c
+++ b/ports/esp32/machine_wdt.c
@@ -87,6 +87,6 @@ MP_DEFINE_CONST_OBJ_TYPE(
     machine_wdt_type,
     MP_QSTR_WDT,
     MP_TYPE_FLAG_NONE,
-    machine_wdt_make_new,
+    make_new, machine_wdt_make_new,
     locals_dict, &machine_wdt_locals_dict
     );
diff --git a/ports/esp32/modsocket.c b/ports/esp32/modsocket.c
index e7e6f3c26e287..334c5bae33c4f 100644
--- a/ports/esp32/modsocket.c
+++ b/ports/esp32/modsocket.c
@@ -789,7 +789,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     socket_type,
     MP_QSTR_socket,
     MP_TYPE_FLAG_NONE,
-    socket_make_new,
+    make_new, socket_make_new,
     protocol, &socket_stream_p,
     locals_dict, &socket_locals_dict
     );
diff --git a/ports/esp32/network_lan.c b/ports/esp32/network_lan.c
index 3c5aea5fb8a4d..c57d7815d7cab 100644
--- a/ports/esp32/network_lan.c
+++ b/ports/esp32/network_lan.c
@@ -306,7 +306,6 @@ MP_DEFINE_CONST_OBJ_TYPE(
     lan_if_type,
     MP_QSTR_LAN,
     MP_TYPE_FLAG_NONE,
-    MP_TYPE_NULL_MAKE_NEW,
     locals_dict, &lan_if_locals_dict
     );
 
diff --git a/ports/esp32/network_ppp.c b/ports/esp32/network_ppp.c
index df07515c7d411..703cdc7889fdc 100644
--- a/ports/esp32/network_ppp.c
+++ b/ports/esp32/network_ppp.c
@@ -282,6 +282,5 @@ MP_DEFINE_CONST_OBJ_TYPE(
     ppp_if_type,
     MP_QSTR_PPP,
     MP_TYPE_FLAG_NONE,
-    MP_TYPE_NULL_MAKE_NEW,
     locals_dict, &ppp_if_locals_dict
     );
diff --git a/ports/esp32/network_wlan.c b/ports/esp32/network_wlan.c
index 0f1f5de14937a..f0b458e6ddfe7 100644
--- a/ports/esp32/network_wlan.c
+++ b/ports/esp32/network_wlan.c
@@ -619,7 +619,6 @@ MP_DEFINE_CONST_OBJ_TYPE(
     wlan_if_type,
     MP_QSTR_WLAN,
     MP_TYPE_FLAG_NONE,
-    MP_TYPE_NULL_MAKE_NEW,
     locals_dict, &wlan_if_locals_dict
     );
 
diff --git a/ports/esp8266/machine_adc.c b/ports/esp8266/machine_adc.c
index b1e7b38435276..f4fd32db9c765 100644
--- a/ports/esp8266/machine_adc.c
+++ b/ports/esp8266/machine_adc.c
@@ -93,7 +93,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     machine_adc_type,
     MP_QSTR_ADC,
     MP_TYPE_FLAG_NONE,
-    machine_adc_make_new,
+    make_new, machine_adc_make_new,
     print, machine_adc_print,
     locals_dict, &machine_adc_locals_dict
     );
diff --git a/ports/esp8266/machine_hspi.c b/ports/esp8266/machine_hspi.c
index 3f449a1de91e1..2edb294adeff6 100644
--- a/ports/esp8266/machine_hspi.c
+++ b/ports/esp8266/machine_hspi.c
@@ -179,7 +179,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     machine_hspi_type,
     MP_QSTR_HSPI,
     MP_TYPE_FLAG_NONE,
-    machine_hspi_make_new,
+    make_new, machine_hspi_make_new,
     print, machine_hspi_print,
     protocol, &machine_hspi_p,
     locals_dict, &mp_machine_spi_locals_dict
diff --git a/ports/esp8266/machine_pin.c b/ports/esp8266/machine_pin.c
index 32ffca873dfaf..ea17728e2359b 100644
--- a/ports/esp8266/machine_pin.c
+++ b/ports/esp8266/machine_pin.c
@@ -454,7 +454,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     pyb_pin_type,
     MP_QSTR_Pin,
     MP_TYPE_FLAG_NONE,
-    mp_pin_make_new,
+    make_new, mp_pin_make_new,
     print, pyb_pin_print,
     call, pyb_pin_call,
     protocol, &pin_pin_p,
@@ -514,7 +514,6 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     pin_irq_type,
     MP_QSTR_IRQ,
     MP_TYPE_FLAG_NONE,
-    MP_TYPE_NULL_MAKE_NEW,
     call, pin_irq_call,
     locals_dict, &pin_irq_locals_dict
     );
diff --git a/ports/esp8266/machine_rtc.c b/ports/esp8266/machine_rtc.c
index cc6b79a031be7..d8cbb8f8247dc 100644
--- a/ports/esp8266/machine_rtc.c
+++ b/ports/esp8266/machine_rtc.c
@@ -266,6 +266,6 @@ MP_DEFINE_CONST_OBJ_TYPE(
     pyb_rtc_type,
     MP_QSTR_RTC,
     MP_TYPE_FLAG_NONE,
-    pyb_rtc_make_new,
+    make_new, pyb_rtc_make_new,
     locals_dict, &pyb_rtc_locals_dict
     );
diff --git a/ports/esp8266/machine_uart.c b/ports/esp8266/machine_uart.c
index af6231c21903b..873b12b2fab9c 100644
--- a/ports/esp8266/machine_uart.c
+++ b/ports/esp8266/machine_uart.c
@@ -347,7 +347,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     pyb_uart_type,
     MP_QSTR_UART,
     MP_TYPE_FLAG_ITER_IS_STREAM,
-    pyb_uart_make_new,
+    make_new, pyb_uart_make_new,
     print, pyb_uart_print,
     protocol, &uart_stream_p,
     locals_dict, &pyb_uart_locals_dict
diff --git a/ports/esp8266/machine_wdt.c b/ports/esp8266/machine_wdt.c
index 26d5c9fa76f13..39a5d51119efb 100644
--- a/ports/esp8266/machine_wdt.c
+++ b/ports/esp8266/machine_wdt.c
@@ -73,6 +73,6 @@ MP_DEFINE_CONST_OBJ_TYPE(
     esp_wdt_type,
     MP_QSTR_WDT,
     MP_TYPE_FLAG_NONE,
-    machine_wdt_make_new,
+    make_new, machine_wdt_make_new,
     locals_dict, &machine_wdt_locals_dict
     );
diff --git a/ports/esp8266/main.c b/ports/esp8266/main.c
index ded5e58abf7ab..583540a81c76b 100644
--- a/ports/esp8266/main.c
+++ b/ports/esp8266/main.c
@@ -68,7 +68,7 @@ STATIC void mp_reset(void) {
         mp_obj_t args[2];
         args[0] = MP_OBJ_NEW_SMALL_INT(0);
         args[1] = MP_OBJ_NEW_SMALL_INT(115200);
-        args[0] = pyb_uart_type.make_new(&pyb_uart_type, 2, 0, args);
+        args[0] = MP_OBJ_TYPE_GET_SLOT(&pyb_uart_type, make_new)(&pyb_uart_type, 2, 0, args);
         args[1] = MP_OBJ_NEW_SMALL_INT(1);
         mp_uos_dupterm_obj.fun.var(2, args);
     }
diff --git a/ports/esp8266/modmachine.c b/ports/esp8266/modmachine.c
index eb41e30f66b12..af46cbbfe7478 100644
--- a/ports/esp8266/modmachine.c
+++ b/ports/esp8266/modmachine.c
@@ -341,7 +341,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     esp_timer_type,
     MP_QSTR_Timer,
     MP_TYPE_FLAG_NONE,
-    esp_timer_make_new,
+    make_new, esp_timer_make_new,
     print, esp_timer_print,
     locals_dict, &esp_timer_locals_dict
     );
diff --git a/ports/esp8266/modnetwork.c b/ports/esp8266/modnetwork.c
index 45a5a2be5412a..ec62528a08344 100644
--- a/ports/esp8266/modnetwork.c
+++ b/ports/esp8266/modnetwork.c
@@ -514,7 +514,6 @@ MP_DEFINE_CONST_OBJ_TYPE(
     wlan_if_type,
     MP_QSTR_WLAN,
     MP_TYPE_FLAG_NONE,
-    MP_TYPE_NULL_MAKE_NEW,
     locals_dict, &wlan_if_locals_dict
     );
 
diff --git a/ports/mimxrt/machine_adc.c b/ports/mimxrt/machine_adc.c
index 7a19d1225ee73..d63157d36efba 100644
--- a/ports/mimxrt/machine_adc.c
+++ b/ports/mimxrt/machine_adc.c
@@ -121,7 +121,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     machine_adc_type,
     MP_QSTR_ADC,
     MP_TYPE_FLAG_NONE,
-    adc_obj_make_new,
+    make_new, adc_obj_make_new,
     print, adc_obj_print,
     locals_dict, &adc_locals_dict
     );
diff --git a/ports/mimxrt/machine_i2c.c b/ports/mimxrt/machine_i2c.c
index 62dfd8204c081..f00ba6b1ba768 100644
--- a/ports/mimxrt/machine_i2c.c
+++ b/ports/mimxrt/machine_i2c.c
@@ -201,7 +201,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     machine_i2c_type,
     MP_QSTR_I2C,
     MP_TYPE_FLAG_NONE,
-    machine_i2c_make_new,
+    make_new, machine_i2c_make_new,
     print, machine_i2c_print,
     protocol, &machine_i2c_p,
     locals_dict, &mp_machine_i2c_locals_dict
diff --git a/ports/mimxrt/machine_i2s.c b/ports/mimxrt/machine_i2s.c
index b6c630138b76b..1733140fb57ee 100644
--- a/ports/mimxrt/machine_i2s.c
+++ b/ports/mimxrt/machine_i2s.c
@@ -1217,7 +1217,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     machine_i2s_type,
     MP_QSTR_I2S,
     MP_TYPE_FLAG_ITER_IS_STREAM,
-    machine_i2s_make_new,
+    make_new, machine_i2s_make_new,
     print, machine_i2s_print,
     protocol, &i2s_stream_p,
     locals_dict, &machine_i2s_locals_dict
diff --git a/ports/mimxrt/machine_led.c b/ports/mimxrt/machine_led.c
index 9fd98ef71043f..8dd74b32ba76d 100644
--- a/ports/mimxrt/machine_led.c
+++ b/ports/mimxrt/machine_led.c
@@ -84,7 +84,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     machine_led_type,
     MP_QSTR_LED,
     MP_TYPE_FLAG_NONE,
-    led_obj_make_new,
+    make_new, led_obj_make_new,
     print, led_obj_print,
     locals_dict, &led_locals_dict
     );
diff --git a/ports/mimxrt/machine_pin.c b/ports/mimxrt/machine_pin.c
index 261e3e4148034..836bd8524b729 100644
--- a/ports/mimxrt/machine_pin.c
+++ b/ports/mimxrt/machine_pin.c
@@ -62,7 +62,6 @@ MP_DEFINE_CONST_OBJ_TYPE(
     machine_pin_cpu_pins_obj_type,
     MP_QSTR_cpu,
     MP_TYPE_FLAG_NONE,
-    MP_TYPE_NULL_MAKE_NEW,
     locals_dict, &machine_pin_cpu_pins_locals_dict
     );
 
@@ -70,7 +69,6 @@ MP_DEFINE_CONST_OBJ_TYPE(
     machine_pin_board_pins_obj_type,
     MP_QSTR_board,
     MP_TYPE_FLAG_NONE,
-    MP_TYPE_NULL_MAKE_NEW,
     locals_dict, &machine_pin_board_pins_locals_dict
     );
 
@@ -424,7 +422,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     machine_pin_type,
     MP_QSTR_Pin,
     MP_TYPE_FLAG_NONE,
-    mp_pin_make_new,
+    make_new, mp_pin_make_new,
     print, machine_pin_obj_print,
     call, machine_pin_obj_call,
     protocol, &machine_pin_obj_protocol,
@@ -436,7 +434,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     machine_pin_af_type,
     MP_QSTR_PinAF,
     MP_TYPE_FLAG_NONE,
-    mp_pin_make_new,
+    make_new, mp_pin_make_new,
     print, machine_pin_obj_print,
     locals_dict, &machine_pin_locals_dict
     );
diff --git a/ports/mimxrt/machine_rtc.c b/ports/mimxrt/machine_rtc.c
index 2e1a09dedbe6f..da7a437491f72 100644
--- a/ports/mimxrt/machine_rtc.c
+++ b/ports/mimxrt/machine_rtc.c
@@ -170,6 +170,6 @@ MP_DEFINE_CONST_OBJ_TYPE(
     machine_rtc_type,
     MP_QSTR_RTC,
     MP_TYPE_FLAG_NONE,
-    machine_rtc_make_new,
+    make_new, machine_rtc_make_new,
     locals_dict, &machine_rtc_locals_dict
     );
diff --git a/ports/mimxrt/machine_sdcard.c b/ports/mimxrt/machine_sdcard.c
index 22f7e7c232a8e..9254faf14a441 100644
--- a/ports/mimxrt/machine_sdcard.c
+++ b/ports/mimxrt/machine_sdcard.c
@@ -212,7 +212,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     machine_sdcard_type,
     MP_QSTR_SDCard,
     MP_TYPE_FLAG_NONE,
-    sdcard_obj_make_new,
+    make_new, sdcard_obj_make_new,
     locals_dict, &sdcard_locals_dict
     );
 
diff --git a/ports/mimxrt/machine_spi.c b/ports/mimxrt/machine_spi.c
index 93b75e931eb48..a3a6bb414edde 100644
--- a/ports/mimxrt/machine_spi.c
+++ b/ports/mimxrt/machine_spi.c
@@ -255,7 +255,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     machine_spi_type,
     MP_QSTR_SPI,
     MP_TYPE_FLAG_NONE,
-    machine_spi_make_new,
+    make_new, machine_spi_make_new,
     print, machine_spi_print,
     protocol, &machine_spi_p,
     locals_dict, &mp_machine_spi_locals_dict
diff --git a/ports/mimxrt/machine_timer.c b/ports/mimxrt/machine_timer.c
index a6b61982f7ec0..a237272390ce4 100644
--- a/ports/mimxrt/machine_timer.c
+++ b/ports/mimxrt/machine_timer.c
@@ -215,7 +215,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     machine_timer_type,
     MP_QSTR_Timer,
     MP_TYPE_FLAG_NONE,
-    machine_timer_make_new,
+    make_new, machine_timer_make_new,
     print, machine_timer_print,
     locals_dict, &machine_timer_locals_dict
     );
diff --git a/ports/mimxrt/machine_uart.c b/ports/mimxrt/machine_uart.c
index e93d2478f3ff6..a0706c8f4fcae 100644
--- a/ports/mimxrt/machine_uart.c
+++ b/ports/mimxrt/machine_uart.c
@@ -473,7 +473,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     machine_uart_type,
     MP_QSTR_UART,
     MP_TYPE_FLAG_ITER_IS_STREAM,
-    machine_uart_make_new,
+    make_new, machine_uart_make_new,
     print, machine_uart_print,
     protocol, &uart_stream_p,
     locals_dict, &machine_uart_locals_dict
diff --git a/ports/mimxrt/machine_wdt.c b/ports/mimxrt/machine_wdt.c
index e0b5c74b54268..f5f14f9ef7b20 100644
--- a/ports/mimxrt/machine_wdt.c
+++ b/ports/mimxrt/machine_wdt.c
@@ -103,6 +103,6 @@ MP_DEFINE_CONST_OBJ_TYPE(
     machine_wdt_type,
     MP_QSTR_WDT,
     MP_TYPE_FLAG_NONE,
-    machine_wdt_make_new,
+    make_new, machine_wdt_make_new,
     locals_dict, &machine_wdt_locals_dict
     );
diff --git a/ports/mimxrt/mimxrt_flash.c b/ports/mimxrt/mimxrt_flash.c
index bd03c853d597d..fd2e7558f9f8d 100644
--- a/ports/mimxrt/mimxrt_flash.c
+++ b/ports/mimxrt/mimxrt_flash.c
@@ -219,6 +219,6 @@ MP_DEFINE_CONST_OBJ_TYPE(
     mimxrt_flash_type,
     MP_QSTR_Flash,
     MP_TYPE_FLAG_NONE,
-    mimxrt_flash_make_new,
+    make_new, mimxrt_flash_make_new,
     locals_dict, &mimxrt_flash_locals_dict
     );
diff --git a/ports/mimxrt/network_lan.c b/ports/mimxrt/network_lan.c
index e15894294b68c..0842cde82d00e 100644
--- a/ports/mimxrt/network_lan.c
+++ b/ports/mimxrt/network_lan.c
@@ -224,7 +224,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     network_lan_type,
     MP_QSTR_LAN,
     MP_TYPE_FLAG_NONE,
-    network_lan_make_new,
+    make_new, network_lan_make_new,
     print, network_lan_print,
     locals_dict, &network_lan_locals_dict
     );
diff --git a/ports/nrf/boards/microbit/modules/iters.c b/ports/nrf/boards/microbit/modules/iters.c
index 2fe14866914fd..e6762421eb579 100644
--- a/ports/nrf/boards/microbit/modules/iters.c
+++ b/ports/nrf/boards/microbit/modules/iters.c
@@ -47,7 +47,6 @@ MP_DEFINE_CONST_OBJ_TYPE(
     microbit_repeat_iterator_type,
     MP_QSTR_iterator,
     MP_TYPE_FLAG_ITER_IS_ITERNEXT,
-    MP_TYPE_NULL_MAKE_NEW,
     iter, microbit_repeat_iter_next
     );
 
diff --git a/ports/nrf/boards/microbit/modules/microbitdisplay.c b/ports/nrf/boards/microbit/modules/microbitdisplay.c
index 5cb25ea1ced48..e4e4d13fe4496 100644
--- a/ports/nrf/boards/microbit/modules/microbitdisplay.c
+++ b/ports/nrf/boards/microbit/modules/microbitdisplay.c
@@ -546,7 +546,6 @@ MP_DEFINE_CONST_OBJ_TYPE(
     microbit_display_type,
     MP_QSTR_MicroBitDisplay,
     MP_TYPE_FLAG_NONE,
-    MP_TYPE_NULL_MAKE_NEW,
     locals_dict, &microbit_display_locals_dict
     );
 
diff --git a/ports/nrf/boards/microbit/modules/microbitimage.c b/ports/nrf/boards/microbit/modules/microbitimage.c
index b22c2e29acec9..17d737dba5e5d 100644
--- a/ports/nrf/boards/microbit/modules/microbitimage.c
+++ b/ports/nrf/boards/microbit/modules/microbitimage.c
@@ -682,7 +682,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     microbit_image_type,
     MP_QSTR_MicroBitImage,
     MP_TYPE_FLAG_NONE,
-    microbit_image_make_new,
+    make_new, microbit_image_make_new,
     print, microbit_image_print,
     binary_op, image_binary_op,
     locals_dict, &microbit_image_locals_dict
@@ -832,7 +832,6 @@ MP_DEFINE_CONST_OBJ_TYPE(
     microbit_scrolling_string_iterator_type,
     MP_QSTR_iterator,
     MP_TYPE_FLAG_ITER_IS_ITERNEXT,
-    MP_TYPE_NULL_MAKE_NEW,
     iter, microbit_scrolling_string_iter_next
     );
 
@@ -912,7 +911,6 @@ MP_DEFINE_CONST_OBJ_TYPE(
     microbit_facade_iterator_type,
     MP_QSTR_iterator,
     MP_TYPE_FLAG_ITER_IS_ITERNEXT,
-    MP_TYPE_NULL_MAKE_NEW,
     iter, microbit_facade_iter_next
     );
 
diff --git a/ports/nrf/main.c b/ports/nrf/main.c
index 83466626fca07..bcfaafd39c7e0 100644
--- a/ports/nrf/main.c
+++ b/ports/nrf/main.c
@@ -170,7 +170,7 @@ int main(int argc, char **argv) {
             MP_OBJ_NEW_SMALL_INT(0),
             MP_OBJ_NEW_SMALL_INT(115200),
         };
-        MP_STATE_PORT(board_stdio_uart) = machine_hard_uart_type.make_new((mp_obj_t)&machine_hard_uart_type, MP_ARRAY_SIZE(args), 0, args);
+        MP_STATE_PORT(board_stdio_uart) = MP_OBJ_TYPE_GET_SLOT(&machine_hard_uart_type, make_new)((mp_obj_t)&machine_hard_uart_type, MP_ARRAY_SIZE(args), 0, args);
     }
     #endif
 
diff --git a/ports/nrf/modules/board/led.c b/ports/nrf/modules/board/led.c
index 577c2b62843f4..57065a48517a2 100644
--- a/ports/nrf/modules/board/led.c
+++ b/ports/nrf/modules/board/led.c
@@ -198,7 +198,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     board_led_type,
     MP_QSTR_LED,
     MP_TYPE_FLAG_NONE,
-    led_obj_make_new,
+    make_new, led_obj_make_new,
     print, led_obj_print,
     locals_dict, &led_locals_dict
     );
diff --git a/ports/nrf/modules/machine/adc.c b/ports/nrf/modules/machine/adc.c
index 84db8d259f2ac..df9d23465a8d3 100644
--- a/ports/nrf/modules/machine/adc.c
+++ b/ports/nrf/modules/machine/adc.c
@@ -298,7 +298,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     machine_adc_type,
     MP_QSTR_ADC,
     MP_TYPE_FLAG_NONE,
-    machine_adc_make_new,
+    make_new, machine_adc_make_new,
     locals_dict, &machine_adc_locals_dict,
     print, machine_adc_print
     );
diff --git a/ports/nrf/modules/machine/i2c.c b/ports/nrf/modules/machine/i2c.c
index 7cb55d078821c..c16c3669ec577 100644
--- a/ports/nrf/modules/machine/i2c.c
+++ b/ports/nrf/modules/machine/i2c.c
@@ -165,7 +165,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     machine_hard_i2c_type,
     MP_QSTR_I2C,
     MP_TYPE_FLAG_NONE,
-    machine_hard_i2c_make_new,
+    make_new, machine_hard_i2c_make_new,
     print, machine_hard_i2c_print,
     protocol, &machine_hard_i2c_p,
     locals_dict, &mp_machine_i2c_locals_dict
diff --git a/ports/nrf/modules/machine/pin.c b/ports/nrf/modules/machine/pin.c
index 4f283e5dba149..db5cc9cbb1360 100644
--- a/ports/nrf/modules/machine/pin.c
+++ b/ports/nrf/modules/machine/pin.c
@@ -600,7 +600,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     pin_type,
     MP_QSTR_Pin,
     MP_TYPE_FLAG_NONE,
-    pin_make_new,
+    make_new, pin_make_new,
     print, pin_print,
     call, pin_call,
     locals_dict, &pin_locals_dict
@@ -676,7 +676,6 @@ MP_DEFINE_CONST_OBJ_TYPE(
     pin_af_type,
     MP_QSTR_PinAF,
     MP_TYPE_FLAG_NONE,
-    MP_TYPE_NULL_MAKE_NEW,
     print, pin_af_obj_print,
     locals_dict, &pin_af_locals_dict
     );
diff --git a/ports/nrf/modules/machine/pwm.c b/ports/nrf/modules/machine/pwm.c
index 54e643ec55ffd..862e1907cbf3a 100644
--- a/ports/nrf/modules/machine/pwm.c
+++ b/ports/nrf/modules/machine/pwm.c
@@ -343,7 +343,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     machine_hard_pwm_type,
     MP_QSTR_PWM,
     MP_TYPE_FLAG_NONE,
-    machine_pwm_make_new,
+    make_new, machine_pwm_make_new,
     print, machine_pwm_print,
     locals_dict, &machine_pwm_locals_dict
     );
diff --git a/ports/nrf/modules/machine/rtcounter.c b/ports/nrf/modules/machine/rtcounter.c
index cafe08b6c6843..d52ca3e9a3366 100644
--- a/ports/nrf/modules/machine/rtcounter.c
+++ b/ports/nrf/modules/machine/rtcounter.c
@@ -266,7 +266,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     machine_rtcounter_type,
     MP_QSTR_RTCounter,
     MP_TYPE_FLAG_NONE,
-    machine_rtc_make_new,
+    make_new, machine_rtc_make_new,
     print, rtc_print,
     locals_dict, &machine_rtc_locals_dict
     );
diff --git a/ports/nrf/modules/machine/spi.c b/ports/nrf/modules/machine/spi.c
index d5613a4643246..fd7f7bb5bcced 100644
--- a/ports/nrf/modules/machine/spi.c
+++ b/ports/nrf/modules/machine/spi.c
@@ -431,7 +431,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     machine_hard_spi_type,
     MP_QSTR_SPI,
     MP_TYPE_FLAG_NONE,
-    machine_spi_make_new,
+    make_new, machine_spi_make_new,
     print, machine_hard_spi_print,
     protocol, &machine_hard_spi_p,
     locals_dict, &machine_spi_locals_dict
diff --git a/ports/nrf/modules/machine/temp.c b/ports/nrf/modules/machine/temp.c
index 00d6329b6498c..dff15a9d14974 100644
--- a/ports/nrf/modules/machine/temp.c
+++ b/ports/nrf/modules/machine/temp.c
@@ -116,7 +116,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     machine_temp_type,
     MP_QSTR_Temp,
     MP_TYPE_FLAG_NONE,
-    machine_temp_make_new,
+    make_new, machine_temp_make_new,
     locals_dict, &machine_temp_locals_dict,
     print, machine_temp_print
     );
diff --git a/ports/nrf/modules/machine/timer.c b/ports/nrf/modules/machine/timer.c
index f7f6101726a6e..091e6d0e32ffc 100644
--- a/ports/nrf/modules/machine/timer.c
+++ b/ports/nrf/modules/machine/timer.c
@@ -238,7 +238,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     machine_timer_type,
     MP_QSTR_Timer,
     MP_TYPE_FLAG_NONE,
-    machine_timer_make_new,
+    make_new, machine_timer_make_new,
     print, timer_print,
     locals_dict, &machine_timer_locals_dict
     );
diff --git a/ports/nrf/modules/machine/uart.c b/ports/nrf/modules/machine/uart.c
index ca0fcf859a55a..035a30df9c015 100644
--- a/ports/nrf/modules/machine/uart.c
+++ b/ports/nrf/modules/machine/uart.c
@@ -374,7 +374,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     machine_hard_uart_type,
     MP_QSTR_UART,
     MP_TYPE_FLAG_ITER_IS_STREAM,
-    machine_hard_uart_make_new,
+    make_new, machine_hard_uart_make_new,
     print, machine_hard_uart_print,
     protocol, &uart_stream_p,
     locals_dict, &machine_hard_uart_locals_dict
diff --git a/ports/nrf/modules/nrf/flashbdev.c b/ports/nrf/modules/nrf/flashbdev.c
index 84a3dd2520b44..e92919cac5a22 100644
--- a/ports/nrf/modules/nrf/flashbdev.c
+++ b/ports/nrf/modules/nrf/flashbdev.c
@@ -187,7 +187,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     nrf_flashbdev_type,
     MP_QSTR_Flash,
     MP_TYPE_FLAG_NONE,
-    nrf_flashbdev_make_new,
+    make_new, nrf_flashbdev_make_new,
     print, nrf_flashbdev_print,
     locals_dict, &nrf_flashbdev_locals_dict
     );
diff --git a/ports/nrf/modules/ubluepy/ubluepy_characteristic.c b/ports/nrf/modules/ubluepy/ubluepy_characteristic.c
index 2be7dab9d3f7c..7b9e3af6a3174 100644
--- a/ports/nrf/modules/ubluepy/ubluepy_characteristic.c
+++ b/ports/nrf/modules/ubluepy/ubluepy_characteristic.c
@@ -213,7 +213,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     ubluepy_characteristic_type,
     MP_QSTR_Characteristic,
     MP_TYPE_FLAG_NONE,
-    ubluepy_characteristic_make_new,
+    make_new, ubluepy_characteristic_make_new,
     print, ubluepy_characteristic_print,
     locals_dict, &ubluepy_characteristic_locals_dict
     );
diff --git a/ports/nrf/modules/ubluepy/ubluepy_constants.c b/ports/nrf/modules/ubluepy/ubluepy_constants.c
index c6c399924573d..cad9adbb03256 100644
--- a/ports/nrf/modules/ubluepy/ubluepy_constants.c
+++ b/ports/nrf/modules/ubluepy/ubluepy_constants.c
@@ -73,7 +73,6 @@ MP_DEFINE_CONST_OBJ_TYPE(
     ubluepy_constants_ad_types_type,
     MP_QSTR_ad_types,
     MP_TYPE_FLAG_NONE,
-    MP_TYPE_NULL_MAKE_NEW,
     locals_dict, &ubluepy_constants_ad_types_locals_dict
     );
 
@@ -96,7 +95,6 @@ MP_DEFINE_CONST_OBJ_TYPE(
     ubluepy_constants_type,
     MP_QSTR_constants,
     MP_TYPE_FLAG_NONE,
-    MP_TYPE_NULL_MAKE_NEW,
     locals_dict, &ubluepy_constants_locals_dict
     );
 
diff --git a/ports/nrf/modules/ubluepy/ubluepy_delegate.c b/ports/nrf/modules/ubluepy/ubluepy_delegate.c
index dd19f70be445b..43720b4186b0a 100644
--- a/ports/nrf/modules/ubluepy/ubluepy_delegate.c
+++ b/ports/nrf/modules/ubluepy/ubluepy_delegate.c
@@ -81,7 +81,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     ubluepy_delegate_type,
     MP_QSTR_DefaultDelegate,
     MP_TYPE_FLAG_NONE,
-    ubluepy_delegate_make_new,
+    make_new, ubluepy_delegate_make_new,
     print, ubluepy_delegate_print,
     locals_dict, &ubluepy_delegate_locals_dict
     );
diff --git a/ports/nrf/modules/ubluepy/ubluepy_descriptor.c b/ports/nrf/modules/ubluepy/ubluepy_descriptor.c
index d942d98223067..062b4210941f7 100644
--- a/ports/nrf/modules/ubluepy/ubluepy_descriptor.c
+++ b/ports/nrf/modules/ubluepy/ubluepy_descriptor.c
@@ -74,7 +74,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     ubluepy_descriptor_type,
     MP_QSTR_Descriptor,
     MP_TYPE_FLAG_NONE,
-    ubluepy_descriptor_make_new,
+    make_new, ubluepy_descriptor_make_new,
     print, ubluepy_descriptor_print,
     locals_dict, &ubluepy_descriptor_locals_dict
     );
diff --git a/ports/nrf/modules/ubluepy/ubluepy_peripheral.c b/ports/nrf/modules/ubluepy/ubluepy_peripheral.c
index 9f638b45d7359..d2a9e0011d124 100644
--- a/ports/nrf/modules/ubluepy/ubluepy_peripheral.c
+++ b/ports/nrf/modules/ubluepy/ubluepy_peripheral.c
@@ -486,7 +486,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     ubluepy_peripheral_type,
     MP_QSTR_Peripheral,
     MP_TYPE_FLAG_NONE,
-    ubluepy_peripheral_make_new,
+    make_new, ubluepy_peripheral_make_new,
     print, ubluepy_peripheral_print,
     locals_dict, &ubluepy_peripheral_locals_dict
     );
diff --git a/ports/nrf/modules/ubluepy/ubluepy_scan_entry.c b/ports/nrf/modules/ubluepy/ubluepy_scan_entry.c
index 89ca65d18c800..2dd4f57860fc9 100644
--- a/ports/nrf/modules/ubluepy/ubluepy_scan_entry.c
+++ b/ports/nrf/modules/ubluepy/ubluepy_scan_entry.c
@@ -140,7 +140,6 @@ MP_DEFINE_CONST_OBJ_TYPE(
     ubluepy_scan_entry_type,
     MP_QSTR_ScanEntry,
     MP_TYPE_FLAG_NONE,
-    MP_TYPE_NULL_MAKE_NEW,
     print, ubluepy_scan_entry_print,
     locals_dict, &ubluepy_scan_entry_locals_dict
     );
diff --git a/ports/nrf/modules/ubluepy/ubluepy_scanner.c b/ports/nrf/modules/ubluepy/ubluepy_scanner.c
index b56ec349d0430..ffb7e946717b2 100644
--- a/ports/nrf/modules/ubluepy/ubluepy_scanner.c
+++ b/ports/nrf/modules/ubluepy/ubluepy_scanner.c
@@ -118,7 +118,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     ubluepy_scanner_type,
     MP_QSTR_Scanner,
     MP_TYPE_FLAG_NONE,
-    ubluepy_scanner_make_new,
+    make_new, ubluepy_scanner_make_new,
     print, ubluepy_scanner_print,
     locals_dict, &ubluepy_scanner_locals_dict
     );
diff --git a/ports/nrf/modules/ubluepy/ubluepy_service.c b/ports/nrf/modules/ubluepy/ubluepy_service.c
index 2bec6befd6894..bf336d04c58ab 100644
--- a/ports/nrf/modules/ubluepy/ubluepy_service.c
+++ b/ports/nrf/modules/ubluepy/ubluepy_service.c
@@ -175,7 +175,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     ubluepy_service_type,
     MP_QSTR_Service,
     MP_TYPE_FLAG_NONE,
-    ubluepy_service_make_new,
+    make_new, ubluepy_service_make_new,
     print, ubluepy_service_print,
     locals_dict, &ubluepy_service_locals_dict
     );
diff --git a/ports/nrf/modules/ubluepy/ubluepy_uuid.c b/ports/nrf/modules/ubluepy/ubluepy_uuid.c
index 0fd6e75e5b628..abfe3cadd525b 100644
--- a/ports/nrf/modules/ubluepy/ubluepy_uuid.c
+++ b/ports/nrf/modules/ubluepy/ubluepy_uuid.c
@@ -164,7 +164,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     ubluepy_uuid_type,
     MP_QSTR_UUID,
     MP_TYPE_FLAG_NONE,
-    ubluepy_uuid_make_new,
+    make_new, ubluepy_uuid_make_new,
     print, ubluepy_uuid_print,
     locals_dict, &ubluepy_uuid_locals_dict
     );
diff --git a/ports/nrf/modules/uos/microbitfs.c b/ports/nrf/modules/uos/microbitfs.c
index d1b320111607b..6d697e1d1a0d1 100644
--- a/ports/nrf/modules/uos/microbitfs.c
+++ b/ports/nrf/modules/uos/microbitfs.c
@@ -630,7 +630,6 @@ MP_DEFINE_CONST_OBJ_TYPE(
     uos_mbfs_textio_type,
     MP_QSTR_TextIO,
     MP_TYPE_FLAG_NONE,
-    MP_TYPE_NULL_MAKE_NEW,
     protocol, &textio_stream_p,
     locals_dict, &uos_mbfs_file_locals_dict
     );
@@ -645,7 +644,6 @@ MP_DEFINE_CONST_OBJ_TYPE(
     uos_mbfs_fileio_type,
     MP_QSTR_FileIO,
     MP_TYPE_FLAG_NONE,
-    MP_TYPE_NULL_MAKE_NEW,
     protocol, &fileio_stream_p,
     locals_dict, &uos_mbfs_file_locals_dict
     );
diff --git a/ports/nrf/pin_named_pins.c b/ports/nrf/pin_named_pins.c
index 84ec89f44aa69..30e60692f7410 100644
--- a/ports/nrf/pin_named_pins.c
+++ b/ports/nrf/pin_named_pins.c
@@ -40,7 +40,6 @@ MP_DEFINE_CONST_OBJ_TYPE(
     pin_cpu_pins_obj_type,
     MP_QSTR_cpu,
     MP_TYPE_FLAG_NONE,
-    MP_TYPE_NULL_MAKE_NEW,
     print, pin_named_pins_obj_print,
     locals_dict, &pin_cpu_pins_locals_dict
     );
@@ -49,7 +48,6 @@ MP_DEFINE_CONST_OBJ_TYPE(
     pin_board_pins_obj_type,
     MP_QSTR_board,
     MP_TYPE_FLAG_NONE,
-    MP_TYPE_NULL_MAKE_NEW,
     print, pin_named_pins_obj_print,
     locals_dict, &pin_board_pins_locals_dict
     );
diff --git a/ports/pic16bit/modpybled.c b/ports/pic16bit/modpybled.c
index 2e5c2dcca3b1b..47e83e0409215 100644
--- a/ports/pic16bit/modpybled.c
+++ b/ports/pic16bit/modpybled.c
@@ -88,7 +88,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     pyb_led_type,
     MP_QSTR_LED,
     MP_TYPE_FLAG_NONE,
-    pyb_led_make_new,
+    make_new, pyb_led_make_new,
     print, pyb_led_print,
     locals_dict, &pyb_led_locals_dict
     );
diff --git a/ports/pic16bit/modpybswitch.c b/ports/pic16bit/modpybswitch.c
index f27cfb9b093af..b7192c5bba69b 100644
--- a/ports/pic16bit/modpybswitch.c
+++ b/ports/pic16bit/modpybswitch.c
@@ -75,7 +75,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     pyb_switch_type,
     MP_QSTR_Switch,
     MP_TYPE_FLAG_NONE,
-    pyb_switch_make_new,
+    make_new, pyb_switch_make_new,
     print, pyb_switch_print,
     call, pyb_switch_call,
     locals_dict, &pyb_switch_locals_dict
diff --git a/ports/renesas-ra/extint.c b/ports/renesas-ra/extint.c
index 496a50c3e827a..915c23e3cd853 100644
--- a/ports/renesas-ra/extint.c
+++ b/ports/renesas-ra/extint.c
@@ -378,7 +378,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     extint_type,
     MP_QSTR_ExtInt,
     MP_TYPE_FLAG_NONE,
-    extint_make_new,
+    make_new, extint_make_new,
     locals_dict, &extint_locals_dict,
     print, extint_obj_print
     );
diff --git a/ports/renesas-ra/led.c b/ports/renesas-ra/led.c
index 9a3f1d40e9651..a2284c5339b94 100644
--- a/ports/renesas-ra/led.c
+++ b/ports/renesas-ra/led.c
@@ -174,7 +174,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     ra_led_type,
     MP_QSTR_LED,
     MP_TYPE_FLAG_NONE,
-    led_obj_make_new,
+    make_new, led_obj_make_new,
     locals_dict, &led_locals_dict,
     print, led_obj_print
     );
diff --git a/ports/renesas-ra/machine_adc.c b/ports/renesas-ra/machine_adc.c
index 99e35f48d997f..b71c3db4b0256 100644
--- a/ports/renesas-ra/machine_adc.c
+++ b/ports/renesas-ra/machine_adc.c
@@ -130,7 +130,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     machine_adc_type,
     MP_QSTR_ADC,
     MP_TYPE_FLAG_NONE,
-    machine_adc_make_new,
+    make_new, machine_adc_make_new,
     locals_dict, &machine_adc_locals_dict,
     print, machine_adc_print
     );
diff --git a/ports/renesas-ra/machine_i2c.c b/ports/renesas-ra/machine_i2c.c
index 563ea8787e523..16bd589964983 100644
--- a/ports/renesas-ra/machine_i2c.c
+++ b/ports/renesas-ra/machine_i2c.c
@@ -160,7 +160,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     machine_i2c_type,
     MP_QSTR_I2C,
     MP_TYPE_FLAG_NONE,
-    machine_i2c_make_new,
+    make_new, machine_i2c_make_new,
     locals_dict, &mp_machine_i2c_locals_dict,
     print, machine_i2c_print,
     protocol, &machine_i2c_p
diff --git a/ports/renesas-ra/machine_pin.c b/ports/renesas-ra/machine_pin.c
index 17ef1e19a4137..0e393b64e5543 100644
--- a/ports/renesas-ra/machine_pin.c
+++ b/ports/renesas-ra/machine_pin.c
@@ -353,7 +353,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     machine_pin_type,
     MP_QSTR_Pin,
     MP_TYPE_FLAG_NONE,
-    mp_pin_make_new,
+    make_new, mp_pin_make_new,
     locals_dict, &machine_pin_locals_dict,
     print, machine_pin_print,
     call, machine_pin_call,
@@ -393,7 +393,6 @@ MP_DEFINE_CONST_OBJ_TYPE(
     pin_cpu_pins_obj_type,
     MP_QSTR_cpu,
     MP_TYPE_FLAG_NONE,
-    MP_TYPE_NULL_MAKE_NEW,
     locals_dict, &pin_cpu_pins_locals_dict
     );
 
@@ -401,7 +400,6 @@ MP_DEFINE_CONST_OBJ_TYPE(
     pin_board_pins_obj_type,
     MP_QSTR_board,
     MP_TYPE_FLAG_NONE,
-    MP_TYPE_NULL_MAKE_NEW,
     locals_dict, &pin_board_pins_locals_dict
     );
 
diff --git a/ports/renesas-ra/machine_rtc.c b/ports/renesas-ra/machine_rtc.c
index c3f64c6971088..e699bea0bcc08 100644
--- a/ports/renesas-ra/machine_rtc.c
+++ b/ports/renesas-ra/machine_rtc.c
@@ -345,6 +345,6 @@ MP_DEFINE_CONST_OBJ_TYPE(
     machine_rtc_type,
     MP_QSTR_RTC,
     MP_TYPE_FLAG_NONE,
-    machine_rtc_make_new,
+    make_new, machine_rtc_make_new,
     locals_dict, &machine_rtc_locals_dict
     );
diff --git a/ports/renesas-ra/machine_spi.c b/ports/renesas-ra/machine_spi.c
index d0e8b03bd12ea..b9f5b1ad1b4eb 100644
--- a/ports/renesas-ra/machine_spi.c
+++ b/ports/renesas-ra/machine_spi.c
@@ -301,7 +301,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     machine_hard_spi_type,
     MP_QSTR_SPI,
     MP_TYPE_FLAG_NONE,
-    machine_hard_spi_make_new,
+    make_new, machine_hard_spi_make_new,
     locals_dict, &mp_machine_spi_locals_dict,
     print, machine_hard_spi_print,
     protocol, &machine_hard_spi_p
diff --git a/ports/renesas-ra/machine_timer.c b/ports/renesas-ra/machine_timer.c
index f3e5aafb7cab2..0f6ff80d27f46 100644
--- a/ports/renesas-ra/machine_timer.c
+++ b/ports/renesas-ra/machine_timer.c
@@ -140,7 +140,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     machine_timer_type,
     MP_QSTR_Timer,
     MP_TYPE_FLAG_NONE,
-    machine_timer_make_new,
+    make_new, machine_timer_make_new,
     locals_dict, &machine_timer_locals_dict,
     print, machine_timer_print
     );
diff --git a/ports/renesas-ra/machine_uart.c b/ports/renesas-ra/machine_uart.c
index 6fa84ca821e4e..86505ea0b953c 100644
--- a/ports/renesas-ra/machine_uart.c
+++ b/ports/renesas-ra/machine_uart.c
@@ -575,7 +575,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     machine_uart_type,
     MP_QSTR_UART,
     MP_TYPE_FLAG_ITER_IS_STREAM,
-    machine_uart_make_new,
+    make_new, machine_uart_make_new,
     locals_dict, &machine_uart_locals_dict,
     print, machine_uart_print,
     protocol, &uart_stream_p
diff --git a/ports/renesas-ra/main.c b/ports/renesas-ra/main.c
index a87ddbd868040..d403dbacbe432 100644
--- a/ports/renesas-ra/main.c
+++ b/ports/renesas-ra/main.c
@@ -182,7 +182,7 @@ MP_NOINLINE STATIC bool init_flash_fs(uint reset_mode) {
     if (len != -1) {
         // Detected a littlefs filesystem so create correct block device for it
         mp_obj_t args[] = { MP_OBJ_NEW_QSTR(MP_QSTR_len), MP_OBJ_NEW_SMALL_INT(len) };
-        bdev = pyb_flash_type.make_new(&pyb_flash_type, 0, 1, args);
+        bdev = MP_OBJ_TYPE_GET_SLOT(&pyb_flash_type, make_new)(&pyb_flash_type, 0, 1, args);
     }
 
     #endif
diff --git a/ports/renesas-ra/storage.c b/ports/renesas-ra/storage.c
index f573894a50148..18dff9780078c 100644
--- a/ports/renesas-ra/storage.c
+++ b/ports/renesas-ra/storage.c
@@ -404,7 +404,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     pyb_flash_type,
     MP_QSTR_Flash,
     MP_TYPE_FLAG_NONE,
-    pyb_flash_make_new,
+    make_new, pyb_flash_make_new,
     locals_dict, &pyb_flash_locals_dict,
     print, pyb_flash_print
     );
diff --git a/ports/renesas-ra/timer.c b/ports/renesas-ra/timer.c
index 8f7acbcdaa476..04bd752b98cc7 100644
--- a/ports/renesas-ra/timer.c
+++ b/ports/renesas-ra/timer.c
@@ -414,7 +414,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     pyb_timer_type,
     MP_QSTR_Timer,
     MP_TYPE_FLAG_NONE,
-    pyb_timer_make_new,
+    make_new, pyb_timer_make_new,
     locals_dict, &pyb_timer_locals_dict,
     print, pyb_timer_print
     );
@@ -507,7 +507,6 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     pyb_timer_channel_type,
     MP_QSTR_TimerChannel,
     MP_TYPE_FLAG_NONE,
-    MP_TYPE_NULL_MAKE_NEW,
     locals_dict, &pyb_timer_channel_locals_dict,
     print, pyb_timer_channel_print
     );
diff --git a/ports/renesas-ra/usrsw.c b/ports/renesas-ra/usrsw.c
index 4107d7850d382..edbe519683013 100644
--- a/ports/renesas-ra/usrsw.c
+++ b/ports/renesas-ra/usrsw.c
@@ -139,7 +139,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     pyb_switch_type,
     MP_QSTR_Switch,
     MP_TYPE_FLAG_NONE,
-    pyb_switch_make_new,
+    make_new, pyb_switch_make_new,
     locals_dict, &pyb_switch_locals_dict,
     print, pyb_switch_print,
     call, pyb_switch_call
diff --git a/ports/rp2/machine_adc.c b/ports/rp2/machine_adc.c
index 85562d5c07583..9e3d7f57a86eb 100644
--- a/ports/rp2/machine_adc.c
+++ b/ports/rp2/machine_adc.c
@@ -117,7 +117,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     machine_adc_type,
     MP_QSTR_ADC,
     MP_TYPE_FLAG_NONE,
-    machine_adc_make_new,
+    make_new, machine_adc_make_new,
     print, machine_adc_print,
     locals_dict, &machine_adc_locals_dict
     );
diff --git a/ports/rp2/machine_i2c.c b/ports/rp2/machine_i2c.c
index 5ab93f63581d6..00dc36a4e0cb2 100644
--- a/ports/rp2/machine_i2c.c
+++ b/ports/rp2/machine_i2c.c
@@ -180,7 +180,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     machine_hw_i2c_type,
     MP_QSTR_I2C,
     MP_TYPE_FLAG_NONE,
-    machine_i2c_make_new,
+    make_new, machine_i2c_make_new,
     print, machine_i2c_print,
     protocol, &machine_i2c_p,
     locals_dict, &mp_machine_i2c_locals_dict
diff --git a/ports/rp2/machine_i2s.c b/ports/rp2/machine_i2s.c
index 53ff7417d79a7..d5175471ae809 100644
--- a/ports/rp2/machine_i2s.c
+++ b/ports/rp2/machine_i2s.c
@@ -1141,7 +1141,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     machine_i2s_type,
     MP_QSTR_I2S,
     MP_TYPE_FLAG_ITER_IS_STREAM,
-    machine_i2s_make_new,
+    make_new, machine_i2s_make_new,
     print, machine_i2s_print,
     protocol, &i2s_stream_p,
     locals_dict, &machine_i2s_locals_dict
diff --git a/ports/rp2/machine_pin.c b/ports/rp2/machine_pin.c
index 8ccfbca3ab426..9abcf064e74eb 100644
--- a/ports/rp2/machine_pin.c
+++ b/ports/rp2/machine_pin.c
@@ -645,7 +645,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     machine_pin_type,
     MP_QSTR_Pin,
     MP_TYPE_FLAG_NONE,
-    mp_pin_make_new,
+    make_new, mp_pin_make_new,
     print, machine_pin_print,
     call, machine_pin_call,
     protocol, &pin_pin_p,
diff --git a/ports/rp2/machine_rtc.c b/ports/rp2/machine_rtc.c
index 6b2c9ac71b65d..a9d3426cf8382 100644
--- a/ports/rp2/machine_rtc.c
+++ b/ports/rp2/machine_rtc.c
@@ -119,6 +119,6 @@ MP_DEFINE_CONST_OBJ_TYPE(
     machine_rtc_type,
     MP_QSTR_RTC,
     MP_TYPE_FLAG_NONE,
-    machine_rtc_make_new,
+    make_new, machine_rtc_make_new,
     locals_dict, &machine_rtc_locals_dict
     );
diff --git a/ports/rp2/machine_spi.c b/ports/rp2/machine_spi.c
index 08c79712cf226..b2b879c9a8ed1 100644
--- a/ports/rp2/machine_spi.c
+++ b/ports/rp2/machine_spi.c
@@ -294,7 +294,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     machine_spi_type,
     MP_QSTR_SPI,
     MP_TYPE_FLAG_NONE,
-    machine_spi_make_new,
+    make_new, machine_spi_make_new,
     print, machine_spi_print,
     protocol, &machine_spi_p,
     locals_dict, &mp_machine_spi_locals_dict
diff --git a/ports/rp2/machine_timer.c b/ports/rp2/machine_timer.c
index 66f632329c723..e4fbb03af437c 100644
--- a/ports/rp2/machine_timer.c
+++ b/ports/rp2/machine_timer.c
@@ -160,7 +160,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     machine_timer_type,
     MP_QSTR_Timer,
     MP_TYPE_FLAG_NONE,
-    machine_timer_make_new,
+    make_new, machine_timer_make_new,
     print, machine_timer_print,
     locals_dict, &machine_timer_locals_dict
     );
diff --git a/ports/rp2/machine_uart.c b/ports/rp2/machine_uart.c
index 06f7e9aaaca2c..e4881cd4f1173 100644
--- a/ports/rp2/machine_uart.c
+++ b/ports/rp2/machine_uart.c
@@ -583,7 +583,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     machine_uart_type,
     MP_QSTR_UART,
     MP_TYPE_FLAG_ITER_IS_STREAM,
-    machine_uart_make_new,
+    make_new, machine_uart_make_new,
     print, machine_uart_print,
     protocol, &uart_stream_p,
     locals_dict, &machine_uart_locals_dict
diff --git a/ports/rp2/machine_wdt.c b/ports/rp2/machine_wdt.c
index c224298d136be..6574a6180f8a2 100644
--- a/ports/rp2/machine_wdt.c
+++ b/ports/rp2/machine_wdt.c
@@ -81,6 +81,6 @@ MP_DEFINE_CONST_OBJ_TYPE(
     machine_wdt_type,
     MP_QSTR_WDT,
     MP_TYPE_FLAG_NONE,
-    machine_wdt_make_new,
+    make_new, machine_wdt_make_new,
     locals_dict, &machine_wdt_locals_dict
     );
diff --git a/ports/rp2/mpbthciport.c b/ports/rp2/mpbthciport.c
index e37167a974dee..8840fe52f124e 100644
--- a/ports/rp2/mpbthciport.c
+++ b/ports/rp2/mpbthciport.c
@@ -103,7 +103,7 @@ int mp_bluetooth_hci_uart_init(uint32_t port, uint32_t baudrate) {
     // This is a statically-allocated UART (see machine_uart.c), and doesn't
     // contain any heap pointers other than the ringbufs (which are already
     // root pointers), so no need to track this as a root pointer.
-    mp_bthci_uart = machine_uart_type.make_new((mp_obj_t)&machine_uart_type, 2, 2, args);
+    mp_bthci_uart = MP_OBJ_TYPE_GET_SLOT(&machine_uart_type, make_new)((mp_obj_t)&machine_uart_type, 2, 2, args);
 
     // Start the HCI polling to process any initial events/packets.
     mp_bluetooth_hci_start_polling();
diff --git a/ports/rp2/rp2_flash.c b/ports/rp2/rp2_flash.c
index df49c881c4a41..0a94b6cc9065e 100644
--- a/ports/rp2/rp2_flash.c
+++ b/ports/rp2/rp2_flash.c
@@ -189,6 +189,6 @@ MP_DEFINE_CONST_OBJ_TYPE(
     rp2_flash_type,
     MP_QSTR_Flash,
     MP_TYPE_FLAG_NONE,
-    rp2_flash_make_new,
+    make_new, rp2_flash_make_new,
     locals_dict, &rp2_flash_locals_dict
     );
diff --git a/ports/rp2/rp2_pio.c b/ports/rp2/rp2_pio.c
index cfba9cce5ae01..87deaf7e5f8b2 100644
--- a/ports/rp2/rp2_pio.c
+++ b/ports/rp2/rp2_pio.c
@@ -380,7 +380,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     rp2_pio_type,
     MP_QSTR_PIO,
     MP_TYPE_FLAG_NONE,
-    rp2_pio_make_new,
+    make_new, rp2_pio_make_new,
     print, rp2_pio_print,
     locals_dict, &rp2_pio_locals_dict
     );
@@ -811,7 +811,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     rp2_state_machine_type,
     MP_QSTR_StateMachine,
     MP_TYPE_FLAG_NONE,
-    rp2_state_machine_make_new,
+    make_new, rp2_state_machine_make_new,
     print, rp2_state_machine_print,
     locals_dict, &rp2_state_machine_locals_dict
     );
diff --git a/ports/samd/machine_led.c b/ports/samd/machine_led.c
index 7a9b2299ae3b9..03b47e7cf2aac 100644
--- a/ports/samd/machine_led.c
+++ b/ports/samd/machine_led.c
@@ -166,7 +166,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     machine_led_type,
     MP_QSTR_LED,
     MP_TYPE_FLAG_NONE,
-    mp_led_make_new,
+    make_new, mp_led_make_new,
     print, machine_led_print,
     call, machine_led_call,
     locals_dict, &machine_led_locals_dict
diff --git a/ports/samd/machine_pin.c b/ports/samd/machine_pin.c
index 75e1a2356c4d2..5f9cbfb99b85e 100644
--- a/ports/samd/machine_pin.c
+++ b/ports/samd/machine_pin.c
@@ -291,7 +291,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     machine_pin_type,
     MP_QSTR_Pin,
     MP_TYPE_FLAG_NONE,
-    mp_pin_make_new,
+    make_new, mp_pin_make_new,
     print, machine_pin_print,
     call, machine_pin_call,
     protocol, &pin_pin_p,
diff --git a/ports/samd/samd_flash.c b/ports/samd/samd_flash.c
index 9d64768cfa020..522522ef84738 100644
--- a/ports/samd/samd_flash.c
+++ b/ports/samd/samd_flash.c
@@ -185,6 +185,6 @@ MP_DEFINE_CONST_OBJ_TYPE(
     samd_flash_type,
     MP_QSTR_Flash,
     MP_TYPE_FLAG_NONE,
-    samd_flash_make_new,
+    make_new, samd_flash_make_new,
     locals_dict, &samd_flash_locals_dict
     );
diff --git a/ports/stm32/accel.c b/ports/stm32/accel.c
index 05fd1898bc11d..19e16831ead84 100644
--- a/ports/stm32/accel.c
+++ b/ports/stm32/accel.c
@@ -285,7 +285,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     pyb_accel_type,
     MP_QSTR_Accel,
     MP_TYPE_FLAG_NONE,
-    pyb_accel_make_new,
+    make_new, pyb_accel_make_new,
     locals_dict, &pyb_accel_locals_dict
     );
 
diff --git a/ports/stm32/adc.c b/ports/stm32/adc.c
index e0759439d1ece..712e9b3adeb2f 100644
--- a/ports/stm32/adc.c
+++ b/ports/stm32/adc.c
@@ -707,7 +707,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     pyb_adc_type,
     MP_QSTR_ADC,
     MP_TYPE_FLAG_NONE,
-    adc_make_new,
+    make_new, adc_make_new,
     print, adc_print,
     locals_dict, &adc_locals_dict
     );
@@ -916,7 +916,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     pyb_adc_all_type,
     MP_QSTR_ADCAll,
     MP_TYPE_FLAG_NONE,
-    adc_all_make_new,
+    make_new, adc_all_make_new,
     locals_dict, &adc_all_locals_dict
     );
 
diff --git a/ports/stm32/boards/LEGO_HUB_NO6/cc2564.c b/ports/stm32/boards/LEGO_HUB_NO6/cc2564.c
index 50ba81c57ac15..6ec20935f001a 100644
--- a/ports/stm32/boards/LEGO_HUB_NO6/cc2564.c
+++ b/ports/stm32/boards/LEGO_HUB_NO6/cc2564.c
@@ -63,7 +63,7 @@ int mp_bluetooth_hci_controller_init(void) {
     //  tim_ch = tim.channel(TIM_CH, pyb.Timer.PWM, pin=btclk)
     //  tim_ch.pulse_width_percent(50)
     mp_obj_t args[6] = { MP_OBJ_NEW_SMALL_INT(CC2564_TIMER_BT_SLOWCLOCK_TIM), MP_OBJ_NEW_QSTR(MP_QSTR_freq), MP_OBJ_NEW_SMALL_INT(32768), MP_OBJ_NULL };
-    mp_obj_t tim = pyb_timer_type.make_new(&pyb_timer_type, 1, 1, args);
+    mp_obj_t tim = MP_OBJ_TYPE_GET_SLOT(&pyb_timer_type, make_new)(&pyb_timer_type, 1, 1, args);
     mp_load_method(tim, MP_QSTR_channel, args);
     args[2] = MP_OBJ_NEW_SMALL_INT(CC2564_TIMER_BT_SLOWCLOCK_TIM_CH);
     args[3] = MP_OBJ_NEW_SMALL_INT(0); // CHANNEL_MODE_PWM_NORMAL
diff --git a/ports/stm32/dac.c b/ports/stm32/dac.c
index ac8d76090ee04..36ef9387f8737 100644
--- a/ports/stm32/dac.c
+++ b/ports/stm32/dac.c
@@ -506,7 +506,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     pyb_dac_type,
     MP_QSTR_DAC,
     MP_TYPE_FLAG_NONE,
-    pyb_dac_make_new,
+    make_new, pyb_dac_make_new,
     print, pyb_dac_print,
     locals_dict, &pyb_dac_locals_dict
     );
diff --git a/ports/stm32/extint.c b/ports/stm32/extint.c
index 0f28610cc3e7e..ca23261ca736e 100644
--- a/ports/stm32/extint.c
+++ b/ports/stm32/extint.c
@@ -663,7 +663,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     extint_type,
     MP_QSTR_ExtInt,
     MP_TYPE_FLAG_NONE,
-    extint_make_new,
+    make_new, extint_make_new,
     print, extint_obj_print,
     locals_dict, &extint_locals_dict
     );
diff --git a/ports/stm32/lcd.c b/ports/stm32/lcd.c
index 5017a68fe5489..e5d7f30efbd02 100644
--- a/ports/stm32/lcd.c
+++ b/ports/stm32/lcd.c
@@ -529,7 +529,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     pyb_lcd_type,
     MP_QSTR_LCD,
     MP_TYPE_FLAG_NONE,
-    pyb_lcd_make_new,
+    make_new, pyb_lcd_make_new,
     locals_dict, &pyb_lcd_locals_dict
     );
 
diff --git a/ports/stm32/led.c b/ports/stm32/led.c
index 6e3229ab32180..fa211f1e145b4 100644
--- a/ports/stm32/led.c
+++ b/ports/stm32/led.c
@@ -385,7 +385,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     pyb_led_type,
     MP_QSTR_LED,
     MP_TYPE_FLAG_NONE,
-    led_obj_make_new,
+    make_new, led_obj_make_new,
     print, led_obj_print,
     locals_dict, &led_locals_dict
     );
diff --git a/ports/stm32/machine_adc.c b/ports/stm32/machine_adc.c
index 3659073d06bf0..000b478f86b04 100644
--- a/ports/stm32/machine_adc.c
+++ b/ports/stm32/machine_adc.c
@@ -496,7 +496,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     machine_adc_type,
     MP_QSTR_ADC,
     MP_TYPE_FLAG_NONE,
-    machine_adc_make_new,
+    make_new, machine_adc_make_new,
     print, machine_adc_print,
     locals_dict, &machine_adc_locals_dict
     );
diff --git a/ports/stm32/machine_i2c.c b/ports/stm32/machine_i2c.c
index 7927daac1bdd7..9a2d338f54982 100644
--- a/ports/stm32/machine_i2c.c
+++ b/ports/stm32/machine_i2c.c
@@ -240,7 +240,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     machine_hard_i2c_type,
     MP_QSTR_I2C,
     MP_TYPE_FLAG_NONE,
-    machine_hard_i2c_make_new,
+    make_new, machine_hard_i2c_make_new,
     print, machine_hard_i2c_print,
     protocol, &machine_hard_i2c_p,
     locals_dict, &mp_machine_i2c_locals_dict
diff --git a/ports/stm32/machine_i2s.c b/ports/stm32/machine_i2s.c
index d68648bc348a5..83ac6bc124eb7 100644
--- a/ports/stm32/machine_i2s.c
+++ b/ports/stm32/machine_i2s.c
@@ -1118,7 +1118,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     machine_i2s_type,
     MP_QSTR_I2S,
     MP_TYPE_FLAG_ITER_IS_STREAM,
-    machine_i2s_make_new,
+    make_new, machine_i2s_make_new,
     print, machine_i2s_print,
     protocol, &i2s_stream_p,
     locals_dict, &machine_i2s_locals_dict
diff --git a/ports/stm32/machine_spi.c b/ports/stm32/machine_spi.c
index d64ff2af8f761..718ae1af5e5a6 100644
--- a/ports/stm32/machine_spi.c
+++ b/ports/stm32/machine_spi.c
@@ -139,7 +139,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     machine_hard_spi_type,
     MP_QSTR_SPI,
     MP_TYPE_FLAG_NONE,
-    machine_hard_spi_make_new,
+    make_new, machine_hard_spi_make_new,
     print, machine_hard_spi_print,
     protocol, &machine_hard_spi_p,
     locals_dict, &mp_machine_spi_locals_dict
diff --git a/ports/stm32/machine_timer.c b/ports/stm32/machine_timer.c
index 2e0120ea8191d..640d1d200fa50 100644
--- a/ports/stm32/machine_timer.c
+++ b/ports/stm32/machine_timer.c
@@ -140,7 +140,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     machine_timer_type,
     MP_QSTR_Timer,
     MP_TYPE_FLAG_NONE,
-    machine_timer_make_new,
+    make_new, machine_timer_make_new,
     print, machine_timer_print,
     locals_dict, &machine_timer_locals_dict
     );
diff --git a/ports/stm32/machine_uart.c b/ports/stm32/machine_uart.c
index 4ccff8c136ada..bb35bac5cc953 100644
--- a/ports/stm32/machine_uart.c
+++ b/ports/stm32/machine_uart.c
@@ -664,7 +664,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     pyb_uart_type,
     MP_QSTR_UART,
     MP_TYPE_FLAG_ITER_IS_STREAM,
-    pyb_uart_make_new,
+    make_new, pyb_uart_make_new,
     print, pyb_uart_print,
     protocol, &uart_stream_p,
     locals_dict, &pyb_uart_locals_dict
diff --git a/ports/stm32/main.c b/ports/stm32/main.c
index c001234704482..7f864a018c2ac 100644
--- a/ports/stm32/main.c
+++ b/ports/stm32/main.c
@@ -182,7 +182,7 @@ MP_NOINLINE STATIC bool init_flash_fs(uint reset_mode) {
     if (len != -1) {
         // Detected a littlefs filesystem so create correct block device for it
         mp_obj_t args[] = { MP_OBJ_NEW_QSTR(MP_QSTR_len), MP_OBJ_NEW_SMALL_INT(len) };
-        bdev = pyb_flash_type.make_new(&pyb_flash_type, 0, 1, args);
+        bdev = MP_OBJ_TYPE_GET_SLOT(&pyb_flash_type, make_new)(&pyb_flash_type, 0, 1, args);
     }
 
     #endif
diff --git a/ports/stm32/network_lan.c b/ports/stm32/network_lan.c
index 25a955508853a..556adebd8fe95 100644
--- a/ports/stm32/network_lan.c
+++ b/ports/stm32/network_lan.c
@@ -162,7 +162,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     network_lan_type,
     MP_QSTR_LAN,
     MP_TYPE_FLAG_NONE,
-    network_lan_make_new,
+    make_new, network_lan_make_new,
     print, network_lan_print,
     locals_dict, &network_lan_locals_dict
     );
diff --git a/ports/stm32/pin.c b/ports/stm32/pin.c
index 3c3cde026568b..0e4a7e9938611 100644
--- a/ports/stm32/pin.c
+++ b/ports/stm32/pin.c
@@ -596,7 +596,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     pin_type,
     MP_QSTR_Pin,
     MP_TYPE_FLAG_NONE,
-    mp_pin_make_new,
+    make_new, mp_pin_make_new,
     print, pin_print,
     call, pin_call,
     protocol, &pin_pin_p,
@@ -674,7 +674,6 @@ MP_DEFINE_CONST_OBJ_TYPE(
     pin_af_type,
     MP_QSTR_PinAF,
     MP_TYPE_FLAG_NONE,
-    MP_TYPE_NULL_MAKE_NEW,
     print, pin_af_obj_print,
     locals_dict, &pin_af_locals_dict
     );
diff --git a/ports/stm32/pin_named_pins.c b/ports/stm32/pin_named_pins.c
index 1a35ec57875fc..8eeb4ed32b118 100644
--- a/ports/stm32/pin_named_pins.c
+++ b/ports/stm32/pin_named_pins.c
@@ -35,7 +35,6 @@ MP_DEFINE_CONST_OBJ_TYPE(
     pin_cpu_pins_obj_type,
     MP_QSTR_cpu,
     MP_TYPE_FLAG_NONE,
-    MP_TYPE_NULL_MAKE_NEW,
     locals_dict, &pin_cpu_pins_locals_dict
     );
 
@@ -43,7 +42,6 @@ MP_DEFINE_CONST_OBJ_TYPE(
     pin_board_pins_obj_type,
     MP_QSTR_board,
     MP_TYPE_FLAG_NONE,
-    MP_TYPE_NULL_MAKE_NEW,
     locals_dict, &pin_board_pins_locals_dict
     );
 
diff --git a/ports/stm32/pyb_can.c b/ports/stm32/pyb_can.c
index a07fc921649cf..69e807c79dfd5 100644
--- a/ports/stm32/pyb_can.c
+++ b/ports/stm32/pyb_can.c
@@ -1076,7 +1076,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     pyb_can_type,
     MP_QSTR_CAN,
     MP_TYPE_FLAG_NONE,
-    pyb_can_make_new,
+    make_new, pyb_can_make_new,
     print, pyb_can_print,
     protocol, &can_stream_p,
     locals_dict, &pyb_can_locals_dict
diff --git a/ports/stm32/pyb_i2c.c b/ports/stm32/pyb_i2c.c
index 9071d92944ee4..0cbb640473b82 100644
--- a/ports/stm32/pyb_i2c.c
+++ b/ports/stm32/pyb_i2c.c
@@ -1108,7 +1108,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     pyb_i2c_type,
     MP_QSTR_I2C,
     MP_TYPE_FLAG_NONE,
-    pyb_i2c_make_new,
+    make_new, pyb_i2c_make_new,
     print, pyb_i2c_print,
     locals_dict, &pyb_i2c_locals_dict
     );
diff --git a/ports/stm32/pyb_spi.c b/ports/stm32/pyb_spi.c
index a225bd84e7534..54582f8e5414f 100644
--- a/ports/stm32/pyb_spi.c
+++ b/ports/stm32/pyb_spi.c
@@ -354,7 +354,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     pyb_spi_type,
     MP_QSTR_SPI,
     MP_TYPE_FLAG_NONE,
-    pyb_spi_make_new,
+    make_new, pyb_spi_make_new,
     print, pyb_spi_print,
     protocol, &pyb_spi_p,
     locals_dict, &pyb_spi_locals_dict
diff --git a/ports/stm32/rtc.c b/ports/stm32/rtc.c
index f501ec23b1b31..aacfc3805e97c 100644
--- a/ports/stm32/rtc.c
+++ b/ports/stm32/rtc.c
@@ -841,6 +841,6 @@ MP_DEFINE_CONST_OBJ_TYPE(
     pyb_rtc_type,
     MP_QSTR_RTC,
     MP_TYPE_FLAG_NONE,
-    pyb_rtc_make_new,
+    make_new, pyb_rtc_make_new,
     locals_dict, &pyb_rtc_locals_dict
     );
diff --git a/ports/stm32/sdcard.c b/ports/stm32/sdcard.c
index cbf1ade5c5b78..964ed49a67dde 100644
--- a/ports/stm32/sdcard.c
+++ b/ports/stm32/sdcard.c
@@ -876,7 +876,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     pyb_sdcard_type,
     MP_QSTR_SDCard,
     MP_TYPE_FLAG_NONE,
-    pyb_sdcard_make_new,
+    make_new, pyb_sdcard_make_new,
     locals_dict, &pyb_sdcard_locals_dict
     );
 #endif
@@ -886,7 +886,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     pyb_mmcard_type,
     MP_QSTR_MMCard,
     MP_TYPE_FLAG_NONE,
-    pyb_mmcard_make_new,
+    make_new, pyb_mmcard_make_new,
     locals_dict, &pyb_sdcard_locals_dict
     );
 #endif
diff --git a/ports/stm32/servo.c b/ports/stm32/servo.c
index 1b0ca0a88224c..e0aa2d6b69f83 100644
--- a/ports/stm32/servo.c
+++ b/ports/stm32/servo.c
@@ -340,7 +340,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     pyb_servo_type,
     MP_QSTR_Servo,
     MP_TYPE_FLAG_NONE,
-    pyb_servo_make_new,
+    make_new, pyb_servo_make_new,
     print, pyb_servo_print,
     locals_dict, &pyb_servo_locals_dict
     );
diff --git a/ports/stm32/storage.c b/ports/stm32/storage.c
index a0154408dd5fb..848602a7878e3 100644
--- a/ports/stm32/storage.c
+++ b/ports/stm32/storage.c
@@ -457,7 +457,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     pyb_flash_type,
     MP_QSTR_Flash,
     MP_TYPE_FLAG_NONE,
-    pyb_flash_make_new,
+    make_new, pyb_flash_make_new,
     print, pyb_flash_print,
     locals_dict, &pyb_flash_locals_dict
     );
diff --git a/ports/stm32/timer.c b/ports/stm32/timer.c
index 91c88df1b3726..7a6ccd4dfd2d9 100644
--- a/ports/stm32/timer.c
+++ b/ports/stm32/timer.c
@@ -1475,7 +1475,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     pyb_timer_type,
     MP_QSTR_Timer,
     MP_TYPE_FLAG_NONE,
-    pyb_timer_make_new,
+    make_new, pyb_timer_make_new,
     print, pyb_timer_print,
     locals_dict, &pyb_timer_locals_dict
     );
@@ -1615,7 +1615,6 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     pyb_timer_channel_type,
     MP_QSTR_TimerChannel,
     MP_TYPE_FLAG_NONE,
-    MP_TYPE_NULL_MAKE_NEW,
     print, pyb_timer_channel_print,
     locals_dict, &pyb_timer_channel_locals_dict
     );
diff --git a/ports/stm32/usb.c b/ports/stm32/usb.c
index e389ef68f2aae..12c5e497de84e 100644
--- a/ports/stm32/usb.c
+++ b/ports/stm32/usb.c
@@ -940,7 +940,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     pyb_usb_vcp_type,
     MP_QSTR_USB_VCP,
     MP_TYPE_FLAG_ITER_IS_STREAM,
-    pyb_usb_vcp_make_new,
+    make_new, pyb_usb_vcp_make_new,
     print, pyb_usb_vcp_print,
     protocol, &pyb_usb_vcp_stream_p,
     locals_dict, &pyb_usb_vcp_locals_dict
@@ -1080,7 +1080,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     pyb_usb_hid_type,
     MP_QSTR_USB_HID,
     MP_TYPE_FLAG_NONE,
-    pyb_usb_hid_make_new,
+    make_new, pyb_usb_hid_make_new,
     protocol, &pyb_usb_hid_stream_p,
     locals_dict, &pyb_usb_hid_locals_dict
     );
diff --git a/ports/stm32/usrsw.c b/ports/stm32/usrsw.c
index 7d406c0ecd717..170c01bd6d043 100644
--- a/ports/stm32/usrsw.c
+++ b/ports/stm32/usrsw.c
@@ -138,7 +138,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     pyb_switch_type,
     MP_QSTR_Switch,
     MP_TYPE_FLAG_NONE,
-    pyb_switch_make_new,
+    make_new, pyb_switch_make_new,
     print, pyb_switch_print,
     call, pyb_switch_call,
     locals_dict, &pyb_switch_locals_dict
diff --git a/ports/stm32/wdt.c b/ports/stm32/wdt.c
index 09780ea9d3cc9..e541e4d36b4fe 100644
--- a/ports/stm32/wdt.c
+++ b/ports/stm32/wdt.c
@@ -106,6 +106,6 @@ MP_DEFINE_CONST_OBJ_TYPE(
     pyb_wdt_type,
     MP_QSTR_WDT,
     MP_TYPE_FLAG_NONE,
-    pyb_wdt_make_new,
+    make_new, pyb_wdt_make_new,
     locals_dict, &pyb_wdt_locals_dict
     );
diff --git a/ports/teensy/led.c b/ports/teensy/led.c
index dd4c65da39e1b..46c6ae492f851 100644
--- a/ports/teensy/led.c
+++ b/ports/teensy/led.c
@@ -138,7 +138,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     pyb_led_type,
     MP_QSTR_LED,
     MP_TYPE_FLAG_NONE,
-    led_obj_make_new,
+    make_new, led_obj_make_new,
     print, led_obj_print,
     locals_dict, &led_locals_dict
     );
diff --git a/ports/teensy/timer.c b/ports/teensy/timer.c
index a0f490d925fbb..8c7609e4479ec 100644
--- a/ports/teensy/timer.c
+++ b/ports/teensy/timer.c
@@ -750,7 +750,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     pyb_timer_type,
     MP_QSTR_Timer,
     MP_TYPE_FLAG_NONE,
-    pyb_timer_make_new,
+    make_new, pyb_timer_make_new,
     print, pyb_timer_print,
     locals_dict, &pyb_timer_locals_dict
     );
@@ -894,7 +894,6 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     pyb_timer_channel_type,
     MP_QSTR_TimerChannel,
     MP_TYPE_FLAG_NONE,
-    MP_TYPE_NULL_MAKE_NEW,
     print, pyb_timer_channel_print,
     locals_dict, &pyb_timer_channel_locals_dict
     );
diff --git a/ports/teensy/uart.c b/ports/teensy/uart.c
index db5b8e2f44336..e71f676d0ae18 100644
--- a/ports/teensy/uart.c
+++ b/ports/teensy/uart.c
@@ -487,7 +487,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     pyb_uart_type,
     MP_QSTR_UART,
     MP_TYPE_FLAG_NONE,
-    pyb_uart_make_new,
+    make_new, pyb_uart_make_new,
     print, pyb_uart_print,
     locals_dict, &pyb_uart_locals_dict
     );
diff --git a/ports/unix/coverage.c b/ports/unix/coverage.c
index 7b4c0c0bf48e7..8b7fc7de67802 100644
--- a/ports/unix/coverage.c
+++ b/ports/unix/coverage.c
@@ -110,7 +110,6 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_stest_fileio,
     MP_QSTR_stest_fileio,
     MP_TYPE_FLAG_NONE,
-    MP_TYPE_NULL_MAKE_NEW,
     protocol, &fileio_stream_p,
     locals_dict, &rawfile_locals_dict
     );
@@ -140,7 +139,6 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_stest_textio2,
     MP_QSTR_stest_textio2,
     MP_TYPE_FLAG_NONE,
-    MP_TYPE_NULL_MAKE_NEW,
     protocol, &textio_stream_p2,
     locals_dict, &rawfile_locals_dict2
     );
diff --git a/ports/unix/main.c b/ports/unix/main.c
index 4f019b6c2c30d..44823ee174776 100644
--- a/ports/unix/main.c
+++ b/ports/unix/main.c
@@ -518,7 +518,7 @@ MP_NOINLINE int main_(int argc, char **argv) {
     {
         // Mount the host FS at the root of our internal VFS
         mp_obj_t args[2] = {
-            mp_type_vfs_posix.make_new(&mp_type_vfs_posix, 0, 0, NULL),
+            MP_OBJ_TYPE_GET_SLOT(&mp_type_vfs_posix, make_new)(&mp_type_vfs_posix, 0, 0, NULL),
             MP_OBJ_NEW_QSTR(MP_QSTR__slash_),
         };
         mp_vfs_mount(2, args, (mp_map_t *)&mp_const_empty_map);
diff --git a/ports/unix/modffi.c b/ports/unix/modffi.c
index 04152f1ad41f2..3df748b80d956 100644
--- a/ports/unix/modffi.c
+++ b/ports/unix/modffi.c
@@ -425,7 +425,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     ffimod_type,
     MP_QSTR_ffimod,
     MP_TYPE_FLAG_NONE,
-    ffimod_make_new,
+    make_new, ffimod_make_new,
     print, ffimod_print,
     locals_dict, &ffimod_locals_dict
     );
@@ -535,7 +535,6 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     ffifunc_type,
     MP_QSTR_ffifunc,
     MP_TYPE_FLAG_NONE,
-    MP_TYPE_NULL_MAKE_NEW,
     print, ffifunc_print,
     call, ffifunc_call
     );
@@ -563,7 +562,6 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     fficallback_type,
     MP_QSTR_fficallback,
     MP_TYPE_FLAG_NONE,
-    MP_TYPE_NULL_MAKE_NEW,
     print, fficallback_print,
     locals_dict, &fficallback_locals_dict
     );
@@ -601,7 +599,6 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     ffivar_type,
     MP_QSTR_ffivar,
     MP_TYPE_FLAG_NONE,
-    MP_TYPE_NULL_MAKE_NEW,
     print, ffivar_print,
     locals_dict, &ffivar_locals_dict
     );
@@ -613,8 +610,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     opaque_type,
     MP_QSTR_opaqueval,
     MP_TYPE_FLAG_NONE,
-    MP_TYPE_NULL_MAKE_NEW,
-    //    .print = opaque_print,
+    make_new, //    .print = opaque_print,
     );
 */
 
diff --git a/ports/unix/modjni.c b/ports/unix/modjni.c
index e6b874b235ecb..5988876f888ab 100644
--- a/ports/unix/modjni.c
+++ b/ports/unix/modjni.c
@@ -178,7 +178,6 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     jclass_type,
     MP_QSTR_jclass,
     MP_TYPE_FLAG_NONE,
-    MP_TYPE_NULL_MAKE_NEW,
     print, jclass_print,
     attr, jclass_attr,
     call, jclass_call,
@@ -326,7 +325,6 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     jobject_type,
     MP_QSTR_jobject,
     MP_TYPE_FLAG_ITER_IS_GETITER,
-    MP_TYPE_NULL_MAKE_NEW,
     print, jobject_print,
     unary_op, jobject_unary_op,
     attr, jobject_attr,
@@ -575,7 +573,6 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     jmethod_type,
     MP_QSTR_jmethod,
     MP_TYPE_FLAG_NONE,
-    MP_TYPE_NULL_MAKE_NEW,
     print, jmethod_print,
     call, jmethod_call,
     //    .attr = jobject_attr,
diff --git a/ports/unix/moduselect.c b/ports/unix/moduselect.c
index 674841bf1871d..8f71813e70aec 100644
--- a/ports/unix/moduselect.c
+++ b/ports/unix/moduselect.c
@@ -315,7 +315,6 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_poll,
     MP_QSTR_poll,
     MP_TYPE_FLAG_ITER_IS_ITERNEXT,
-    MP_TYPE_NULL_MAKE_NEW,
     iter, poll_iternext,
     locals_dict, &poll_locals_dict
     );
diff --git a/ports/unix/modusocket.c b/ports/unix/modusocket.c
index dfbf15cd3efd3..a32fc60163136 100644
--- a/ports/unix/modusocket.c
+++ b/ports/unix/modusocket.c
@@ -520,7 +520,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_socket,
     MP_QSTR_socket,
     MP_TYPE_FLAG_NONE,
-    socket_make_new,
+    make_new, socket_make_new,
     print, socket_print,
     protocol, &usocket_stream_p,
     locals_dict, &usocket_locals_dict
diff --git a/ports/zephyr/machine_i2c.c b/ports/zephyr/machine_i2c.c
index a844eceb50c14..8f0f25257ba54 100644
--- a/ports/zephyr/machine_i2c.c
+++ b/ports/zephyr/machine_i2c.c
@@ -130,7 +130,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     machine_hard_i2c_type,
     MP_QSTR_I2C,
     MP_TYPE_FLAG_NONE,
-    machine_hard_i2c_make_new,
+    make_new, machine_hard_i2c_make_new,
     print, machine_hard_i2c_print,
     protocol, &machine_hard_i2c_p,
     locals_dict, &mp_machine_i2c_locals_dict
diff --git a/ports/zephyr/machine_pin.c b/ports/zephyr/machine_pin.c
index 3114ac36fd008..be0698651bbf6 100644
--- a/ports/zephyr/machine_pin.c
+++ b/ports/zephyr/machine_pin.c
@@ -289,7 +289,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     machine_pin_type,
     MP_QSTR_Pin,
     MP_TYPE_FLAG_NONE,
-    mp_pin_make_new,
+    make_new, mp_pin_make_new,
     print, machine_pin_print,
     call, machine_pin_call,
     protocol, &machine_pin_pin_p,
diff --git a/ports/zephyr/machine_spi.c b/ports/zephyr/machine_spi.c
index d990ed9c150f5..19d4ae6dee684 100644
--- a/ports/zephyr/machine_spi.c
+++ b/ports/zephyr/machine_spi.c
@@ -201,7 +201,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     machine_hard_spi_type,
     MP_QSTR_SPI,
     MP_TYPE_FLAG_NONE,
-    machine_hard_spi_make_new,
+    make_new, machine_hard_spi_make_new,
     print, machine_hard_spi_print,
     protocol, &machine_hard_spi_p,
     locals_dict, &mp_machine_spi_locals_dict
diff --git a/ports/zephyr/machine_uart.c b/ports/zephyr/machine_uart.c
index 867c5ae8863a0..b989c0f4817c4 100644
--- a/ports/zephyr/machine_uart.c
+++ b/ports/zephyr/machine_uart.c
@@ -158,7 +158,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     machine_uart_type,
     MP_QSTR_UART,
     MP_TYPE_FLAG_ITER_IS_STREAM,
-    machine_uart_make_new,
+    make_new, machine_uart_make_new,
     print, machine_uart_print,
     protocol, &uart_stream_p,
     locals_dict, &machine_uart_locals_dict
diff --git a/ports/zephyr/main.c b/ports/zephyr/main.c
index c638f389206e5..869449e7df473 100644
--- a/ports/zephyr/main.c
+++ b/ports/zephyr/main.c
@@ -104,11 +104,11 @@ STATIC void vfs_init(void) {
 
     #ifdef CONFIG_DISK_DRIVER_SDMMC
     mp_obj_t args[] = { mp_obj_new_str(CONFIG_SDMMC_VOLUME_NAME, strlen(CONFIG_SDMMC_VOLUME_NAME)) };
-    bdev = zephyr_disk_access_type.make_new(&zephyr_disk_access_type, ARRAY_SIZE(args), 0, args);
+    bdev = MP_OBJ_TYPE_GET_SLOT(&zephyr_disk_access_type, make_new)(&zephyr_disk_access_type, ARRAY_SIZE(args), 0, args);
     mount_point_str = "/sd";
     #elif defined(CONFIG_FLASH_MAP) && FLASH_AREA_LABEL_EXISTS(storage)
     mp_obj_t args[] = { MP_OBJ_NEW_SMALL_INT(FLASH_AREA_ID(storage)), MP_OBJ_NEW_SMALL_INT(4096) };
-    bdev = zephyr_flash_area_type.make_new(&zephyr_flash_area_type, ARRAY_SIZE(args), 0, args);
+    bdev = MP_OBJ_TYPE_GET_SLOT(&zephyr_flash_area_type, make_new)(&zephyr_flash_area_type, ARRAY_SIZE(args), 0, args);
     mount_point_str = "/flash";
     #endif
 
diff --git a/ports/zephyr/modusocket.c b/ports/zephyr/modusocket.c
index 77f839fdd5104..c79f73a9d2759 100644
--- a/ports/zephyr/modusocket.c
+++ b/ports/zephyr/modusocket.c
@@ -357,7 +357,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     socket_type,
     MP_QSTR_socket,
     MP_TYPE_FLAG_NONE,
-    socket_make_new,
+    make_new, socket_make_new,
     print, socket_print,
     protocol, &socket_stream_p,
     locals_dict, &socket_locals_dict
diff --git a/ports/zephyr/modzsensor.c b/ports/zephyr/modzsensor.c
index beb4d6ad7903a..e35a1716f473f 100644
--- a/ports/zephyr/modzsensor.c
+++ b/ports/zephyr/modzsensor.c
@@ -109,7 +109,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     sensor_type,
     MP_QSTR_Sensor,
     MP_TYPE_FLAG_NONE,
-    sensor_make_new,
+    make_new, sensor_make_new,
     locals_dict, &sensor_locals_dict
     );
 
diff --git a/ports/zephyr/zephyr_storage.c b/ports/zephyr/zephyr_storage.c
index 6ab8271d34766..498fea6fb1c8d 100644
--- a/ports/zephyr/zephyr_storage.c
+++ b/ports/zephyr/zephyr_storage.c
@@ -132,7 +132,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     zephyr_disk_access_type,
     MP_QSTR_DiskAccess,
     MP_TYPE_FLAG_NONE,
-    zephyr_disk_access_make_new,
+    make_new, zephyr_disk_access_make_new,
     print, zephyr_disk_access_print,
     locals_dict, &zephyr_disk_access_locals_dict
     );
@@ -254,7 +254,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     zephyr_flash_area_type,
     MP_QSTR_FlashArea,
     MP_TYPE_FLAG_NONE,
-    zephyr_flash_area_make_new,
+    make_new, zephyr_flash_area_make_new,
     print, zephyr_flash_area_print,
     locals_dict, &zephyr_flash_area_locals_dict
     );
diff --git a/py/builtinevex.c b/py/builtinevex.c
index 403cd95a9deef..173978ef5221d 100644
--- a/py/builtinevex.c
+++ b/py/builtinevex.c
@@ -41,8 +41,7 @@ typedef struct _mp_obj_code_t {
 STATIC MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_code,
     MP_QSTR_code,
-    MP_TYPE_FLAG_NONE,
-    MP_TYPE_NULL_MAKE_NEW
+    MP_TYPE_FLAG_NONE
     );
 
 STATIC mp_obj_t code_execute(mp_obj_code_t *self, mp_obj_dict_t *globals, mp_obj_dict_t *locals) {
diff --git a/py/dynruntime.h b/py/dynruntime.h
index be573bde2ad4a..8564715c0b59f 100644
--- a/py/dynruntime.h
+++ b/py/dynruntime.h
@@ -105,7 +105,7 @@ static inline void *m_realloc_dyn(void *ptr, size_t new_num_bytes) {
 #define mp_const_none                       ((mp_obj_t)mp_fun_table.const_none)
 #define mp_const_false                      ((mp_obj_t)mp_fun_table.const_false)
 #define mp_const_true                       ((mp_obj_t)mp_fun_table.const_true)
-#define mp_const_empty_bytes                (mp_type_bytes.make_new(NULL, 0, 0, NULL))
+#define mp_const_empty_bytes                (MP_OBJ_TYPE_GET_SLOT(&mp_type_bytes, make_new)(NULL, 0, 0, NULL))
 #define mp_const_empty_tuple                (mp_fun_table.new_tuple(0, NULL))
 
 #define mp_obj_new_bool(b)                  ((b) ? (mp_obj_t)mp_fun_table.const_true : (mp_obj_t)mp_fun_table.const_false)
diff --git a/py/modbuiltins.c b/py/modbuiltins.c
index 152323b5ca963..06e9f1acb5e34 100644
--- a/py/modbuiltins.c
+++ b/py/modbuiltins.c
@@ -547,7 +547,7 @@ STATIC mp_obj_t mp_builtin_sorted(size_t n_args, const mp_obj_t *args, mp_map_t
     if (n_args > 1) {
         mp_raise_TypeError(MP_ERROR_TEXT("must use keyword argument for key function"));
     }
-    mp_obj_t self = mp_type_list.make_new(&mp_type_list, 1, 0, args);
+    mp_obj_t self = mp_obj_list_make_new(&mp_type_list, 1, 0, args);
     mp_obj_list_sort(1, &self, kwargs);
 
     return self;
diff --git a/py/modio.c b/py/modio.c
index a1e04e4cac54a..9ec6bbcc4ecd4 100644
--- a/py/modio.c
+++ b/py/modio.c
@@ -101,7 +101,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_iobase,
     MP_QSTR_IOBase,
     MP_TYPE_FLAG_NONE,
-    iobase_make_new,
+    make_new, iobase_make_new,
     protocol, &iobase_p
     );
 
@@ -196,7 +196,7 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_bufwriter,
     MP_QSTR_BufferedWriter,
     MP_TYPE_FLAG_NONE,
-    bufwriter_make_new,
+    make_new, bufwriter_make_new,
     protocol, &bufwriter_stream_p,
     locals_dict, &bufwriter_locals_dict
     );
diff --git a/py/modthread.c b/py/modthread.c
index 3116fe6bd9db5..51d63e4703720 100644
--- a/py/modthread.c
+++ b/py/modthread.c
@@ -120,7 +120,6 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_thread_lock,
     MP_QSTR_lock,
     MP_TYPE_FLAG_NONE,
-    MP_TYPE_NULL_MAKE_NEW,
     locals_dict, &thread_lock_locals_dict
     );
 
diff --git a/py/obj.h b/py/obj.h
index b1d722080c665..34adfbd0f0427 100644
--- a/py/obj.h
+++ b/py/obj.h
@@ -594,15 +594,15 @@ struct _mp_obj_type_t {
     // The name of this type, a qstr.
     uint16_t name;
 
-    // Corresponds to __new__ and __init__ special methods, to make an instance of the type.
-    mp_make_new_fun_t make_new;
-
     // Slots: For the rest of the fields, the slot index points to the
     // relevant function in the variable-length "slots" field. Ideally these
     // would be only 4 bits, but the extra overhead of accessing them adds
     // more code, and we also need to be able to take the address of them for
     // mp_obj_class_lookup.
 
+    // Corresponds to __new__ and __init__ special methods, to make an instance of the type.
+    uint8_t slot_index_make_new;
+
     // Corresponds to __repr__ and __str__ special methods.
     uint8_t slot_index_print;
 
@@ -673,8 +673,8 @@ typedef struct _mp_obj_empty_type_t {
     mp_obj_base_t base;
     uint16_t flags;
     uint16_t name;
-    mp_make_new_fun_t make_new;
 
+    uint8_t slot_index_make_new;
     uint8_t slot_index_print;
     uint8_t slot_index_call;
     uint8_t slot_index_unary_op;
@@ -694,8 +694,8 @@ typedef struct _mp_obj_full_type_t {
     mp_obj_base_t base;
     uint16_t flags;
     uint16_t name;
-    mp_make_new_fun_t make_new;
 
+    uint8_t slot_index_make_new;
     uint8_t slot_index_print;
     uint8_t slot_index_call;
     uint8_t slot_index_unary_op;
@@ -712,8 +712,7 @@ typedef struct _mp_obj_full_type_t {
     const void *slots[11];
 } mp_obj_full_type_t;
 
-#define MP_TYPE_NULL_MAKE_NEW (NULL)
-
+#define _MP_OBJ_TYPE_SLOT_TYPE_make_new (mp_make_new_fun_t)
 #define _MP_OBJ_TYPE_SLOT_TYPE_print (mp_print_fun_t)
 #define _MP_OBJ_TYPE_SLOT_TYPE_call (mp_call_fun_t)
 #define _MP_OBJ_TYPE_SLOT_TYPE_unary_op (mp_unary_op_fun_t)
@@ -730,42 +729,41 @@ typedef struct _mp_obj_full_type_t {
 // Do not use these directly, instead use MP_DEFINE_CONST_OBJ_TYPE.
 // Generated with:
 // for i in range(13):
-//     print(f"#define MP_DEFINE_CONST_OBJ_TYPE_NARGS_{i}(_struct_type, _typename, _name, _flags, _make_new{''.join(f', f{j+1}, v{j+1}' for j in range(i))}) const _struct_type _typename = {{ .base = {{ &mp_type_type }}, .name = _name, .flags = _flags, .make_new = _make_new{''.join(f', .slot_index_##f{j+1} = {j+1}' for j in range(i))}{', .slots = { ' + ''.join(f'v{j+1}, ' for j in range(i)) + '}' if i else '' } }}")
-#define MP_DEFINE_CONST_OBJ_TYPE_NARGS_0(_struct_type, _typename, _name, _flags, _make_new) const _struct_type _typename = { .base = { &mp_type_type }, .name = _name, .flags = _flags, .make_new = _make_new }
-#define MP_DEFINE_CONST_OBJ_TYPE_NARGS_1(_struct_type, _typename, _name, _flags, _make_new, f1, v1) const _struct_type _typename = { .base = { &mp_type_type }, .name = _name, .flags = _flags, .make_new = _make_new, .slot_index_##f1 = 1, .slots = { v1, } }
-#define MP_DEFINE_CONST_OBJ_TYPE_NARGS_2(_struct_type, _typename, _name, _flags, _make_new, f1, v1, f2, v2) const _struct_type _typename = { .base = { &mp_type_type }, .name = _name, .flags = _flags, .make_new = _make_new, .slot_index_##f1 = 1, .slot_index_##f2 = 2, .slots = { v1, v2, } }
-#define MP_DEFINE_CONST_OBJ_TYPE_NARGS_3(_struct_type, _typename, _name, _flags, _make_new, f1, v1, f2, v2, f3, v3) const _struct_type _typename = { .base = { &mp_type_type }, .name = _name, .flags = _flags, .make_new = _make_new, .slot_index_##f1 = 1, .slot_index_##f2 = 2, .slot_index_##f3 = 3, .slots = { v1, v2, v3, } }
-#define MP_DEFINE_CONST_OBJ_TYPE_NARGS_4(_struct_type, _typename, _name, _flags, _make_new, f1, v1, f2, v2, f3, v3, f4, v4) const _struct_type _typename = { .base = { &mp_type_type }, .name = _name, .flags = _flags, .make_new = _make_new, .slot_index_##f1 = 1, .slot_index_##f2 = 2, .slot_index_##f3 = 3, .slot_index_##f4 = 4, .slots = { v1, v2, v3, v4, } }
-#define MP_DEFINE_CONST_OBJ_TYPE_NARGS_5(_struct_type, _typename, _name, _flags, _make_new, f1, v1, f2, v2, f3, v3, f4, v4, f5, v5) const _struct_type _typename = { .base = { &mp_type_type }, .name = _name, .flags = _flags, .make_new = _make_new, .slot_index_##f1 = 1, .slot_index_##f2 = 2, .slot_index_##f3 = 3, .slot_index_##f4 = 4, .slot_index_##f5 = 5, .slots = { v1, v2, v3, v4, v5, } }
-#define MP_DEFINE_CONST_OBJ_TYPE_NARGS_6(_struct_type, _typename, _name, _flags, _make_new, f1, v1, f2, v2, f3, v3, f4, v4, f5, v5, f6, v6) const _struct_type _typename = { .base = { &mp_type_type }, .name = _name, .flags = _flags, .make_new = _make_new, .slot_index_##f1 = 1, .slot_index_##f2 = 2, .slot_index_##f3 = 3, .slot_index_##f4 = 4, .slot_index_##f5 = 5, .slot_index_##f6 = 6, .slots = { v1, v2, v3, v4, v5, v6, } }
-#define MP_DEFINE_CONST_OBJ_TYPE_NARGS_7(_struct_type, _typename, _name, _flags, _make_new, f1, v1, f2, v2, f3, v3, f4, v4, f5, v5, f6, v6, f7, v7) const _struct_type _typename = { .base = { &mp_type_type }, .name = _name, .flags = _flags, .make_new = _make_new, .slot_index_##f1 = 1, .slot_index_##f2 = 2, .slot_index_##f3 = 3, .slot_index_##f4 = 4, .slot_index_##f5 = 5, .slot_index_##f6 = 6, .slot_index_##f7 = 7, .slots = { v1, v2, v3, v4, v5, v6, v7, } }
-#define MP_DEFINE_CONST_OBJ_TYPE_NARGS_8(_struct_type, _typename, _name, _flags, _make_new, f1, v1, f2, v2, f3, v3, f4, v4, f5, v5, f6, v6, f7, v7, f8, v8) const _struct_type _typename = { .base = { &mp_type_type }, .name = _name, .flags = _flags, .make_new = _make_new, .slot_index_##f1 = 1, .slot_index_##f2 = 2, .slot_index_##f3 = 3, .slot_index_##f4 = 4, .slot_index_##f5 = 5, .slot_index_##f6 = 6, .slot_index_##f7 = 7, .slot_index_##f8 = 8, .slots = { v1, v2, v3, v4, v5, v6, v7, v8, } }
-#define MP_DEFINE_CONST_OBJ_TYPE_NARGS_9(_struct_type, _typename, _name, _flags, _make_new, f1, v1, f2, v2, f3, v3, f4, v4, f5, v5, f6, v6, f7, v7, f8, v8, f9, v9) const _struct_type _typename = { .base = { &mp_type_type }, .name = _name, .flags = _flags, .make_new = _make_new, .slot_index_##f1 = 1, .slot_index_##f2 = 2, .slot_index_##f3 = 3, .slot_index_##f4 = 4, .slot_index_##f5 = 5, .slot_index_##f6 = 6, .slot_index_##f7 = 7, .slot_index_##f8 = 8, .slot_index_##f9 = 9, .slots = { v1, v2, v3, v4, v5, v6, v7, v8, v9, } }
-#define MP_DEFINE_CONST_OBJ_TYPE_NARGS_10(_struct_type, _typename, _name, _flags, _make_new, f1, v1, f2, v2, f3, v3, f4, v4, f5, v5, f6, v6, f7, v7, f8, v8, f9, v9, f10, v10) const _struct_type _typename = { .base = { &mp_type_type }, .name = _name, .flags = _flags, .make_new = _make_new, .slot_index_##f1 = 1, .slot_index_##f2 = 2, .slot_index_##f3 = 3, .slot_index_##f4 = 4, .slot_index_##f5 = 5, .slot_index_##f6 = 6, .slot_index_##f7 = 7, .slot_index_##f8 = 8, .slot_index_##f9 = 9, .slot_index_##f10 = 10, .slots = { v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, } }
-#define MP_DEFINE_CONST_OBJ_TYPE_NARGS_11(_struct_type, _typename, _name, _flags, _make_new, f1, v1, f2, v2, f3, v3, f4, v4, f5, v5, f6, v6, f7, v7, f8, v8, f9, v9, f10, v10, f11, v11) const _struct_type _typename = { .base = { &mp_type_type }, .name = _name, .flags = _flags, .make_new = _make_new, .slot_index_##f1 = 1, .slot_index_##f2 = 2, .slot_index_##f3 = 3, .slot_index_##f4 = 4, .slot_index_##f5 = 5, .slot_index_##f6 = 6, .slot_index_##f7 = 7, .slot_index_##f8 = 8, .slot_index_##f9 = 9, .slot_index_##f10 = 10, .slot_index_##f11 = 11, .slots = { v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, } }
-#define MP_DEFINE_CONST_OBJ_TYPE_NARGS_12(_struct_type, _typename, _name, _flags, _make_new, f1, v1, f2, v2, f3, v3, f4, v4, f5, v5, f6, v6, f7, v7, f8, v8, f9, v9, f10, v10, f11, v11, f12, v12) const _struct_type _typename = { .base = { &mp_type_type }, .name = _name, .flags = _flags, .make_new = _make_new, .slot_index_##f1 = 1, .slot_index_##f2 = 2, .slot_index_##f3 = 3, .slot_index_##f4 = 4, .slot_index_##f5 = 5, .slot_index_##f6 = 6, .slot_index_##f7 = 7, .slot_index_##f8 = 8, .slot_index_##f9 = 9, .slot_index_##f10 = 10, .slot_index_##f11 = 11, .slot_index_##f12 = 12, .slots = { v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, } }
+//     print(f"#define MP_DEFINE_CONST_OBJ_TYPE_NARGS_{i}(_struct_type, _typename, _name, _flags{''.join(f', f{j+1}, v{j+1}' for j in range(i))}) const _struct_type _typename = {{ .base = {{ &mp_type_type }}, .name = _name, .flags = _flags{''.join(f', .slot_index_##f{j+1} = {j+1}' for j in range(i))}{', .slots = { ' + ''.join(f'v{j+1}, ' for j in range(i)) + '}' if i else '' } }}")
+#define MP_DEFINE_CONST_OBJ_TYPE_NARGS_0(_struct_type, _typename, _name, _flags) const _struct_type _typename = { .base = { &mp_type_type }, .name = _name, .flags = _flags }
+#define MP_DEFINE_CONST_OBJ_TYPE_NARGS_1(_struct_type, _typename, _name, _flags, f1, v1) const _struct_type _typename = { .base = { &mp_type_type }, .name = _name, .flags = _flags, .slot_index_##f1 = 1, .slots = { v1, } }
+#define MP_DEFINE_CONST_OBJ_TYPE_NARGS_2(_struct_type, _typename, _name, _flags, f1, v1, f2, v2) const _struct_type _typename = { .base = { &mp_type_type }, .name = _name, .flags = _flags, .slot_index_##f1 = 1, .slot_index_##f2 = 2, .slots = { v1, v2, } }
+#define MP_DEFINE_CONST_OBJ_TYPE_NARGS_3(_struct_type, _typename, _name, _flags, f1, v1, f2, v2, f3, v3) const _struct_type _typename = { .base = { &mp_type_type }, .name = _name, .flags = _flags, .slot_index_##f1 = 1, .slot_index_##f2 = 2, .slot_index_##f3 = 3, .slots = { v1, v2, v3, } }
+#define MP_DEFINE_CONST_OBJ_TYPE_NARGS_4(_struct_type, _typename, _name, _flags, f1, v1, f2, v2, f3, v3, f4, v4) const _struct_type _typename = { .base = { &mp_type_type }, .name = _name, .flags = _flags, .slot_index_##f1 = 1, .slot_index_##f2 = 2, .slot_index_##f3 = 3, .slot_index_##f4 = 4, .slots = { v1, v2, v3, v4, } }
+#define MP_DEFINE_CONST_OBJ_TYPE_NARGS_5(_struct_type, _typename, _name, _flags, f1, v1, f2, v2, f3, v3, f4, v4, f5, v5) const _struct_type _typename = { .base = { &mp_type_type }, .name = _name, .flags = _flags, .slot_index_##f1 = 1, .slot_index_##f2 = 2, .slot_index_##f3 = 3, .slot_index_##f4 = 4, .slot_index_##f5 = 5, .slots = { v1, v2, v3, v4, v5, } }
+#define MP_DEFINE_CONST_OBJ_TYPE_NARGS_6(_struct_type, _typename, _name, _flags, f1, v1, f2, v2, f3, v3, f4, v4, f5, v5, f6, v6) const _struct_type _typename = { .base = { &mp_type_type }, .name = _name, .flags = _flags, .slot_index_##f1 = 1, .slot_index_##f2 = 2, .slot_index_##f3 = 3, .slot_index_##f4 = 4, .slot_index_##f5 = 5, .slot_index_##f6 = 6, .slots = { v1, v2, v3, v4, v5, v6, } }
+#define MP_DEFINE_CONST_OBJ_TYPE_NARGS_7(_struct_type, _typename, _name, _flags, f1, v1, f2, v2, f3, v3, f4, v4, f5, v5, f6, v6, f7, v7) const _struct_type _typename = { .base = { &mp_type_type }, .name = _name, .flags = _flags, .slot_index_##f1 = 1, .slot_index_##f2 = 2, .slot_index_##f3 = 3, .slot_index_##f4 = 4, .slot_index_##f5 = 5, .slot_index_##f6 = 6, .slot_index_##f7 = 7, .slots = { v1, v2, v3, v4, v5, v6, v7, } }
+#define MP_DEFINE_CONST_OBJ_TYPE_NARGS_8(_struct_type, _typename, _name, _flags, f1, v1, f2, v2, f3, v3, f4, v4, f5, v5, f6, v6, f7, v7, f8, v8) const _struct_type _typename = { .base = { &mp_type_type }, .name = _name, .flags = _flags, .slot_index_##f1 = 1, .slot_index_##f2 = 2, .slot_index_##f3 = 3, .slot_index_##f4 = 4, .slot_index_##f5 = 5, .slot_index_##f6 = 6, .slot_index_##f7 = 7, .slot_index_##f8 = 8, .slots = { v1, v2, v3, v4, v5, v6, v7, v8, } }
+#define MP_DEFINE_CONST_OBJ_TYPE_NARGS_9(_struct_type, _typename, _name, _flags, f1, v1, f2, v2, f3, v3, f4, v4, f5, v5, f6, v6, f7, v7, f8, v8, f9, v9) const _struct_type _typename = { .base = { &mp_type_type }, .name = _name, .flags = _flags, .slot_index_##f1 = 1, .slot_index_##f2 = 2, .slot_index_##f3 = 3, .slot_index_##f4 = 4, .slot_index_##f5 = 5, .slot_index_##f6 = 6, .slot_index_##f7 = 7, .slot_index_##f8 = 8, .slot_index_##f9 = 9, .slots = { v1, v2, v3, v4, v5, v6, v7, v8, v9, } }
+#define MP_DEFINE_CONST_OBJ_TYPE_NARGS_10(_struct_type, _typename, _name, _flags, f1, v1, f2, v2, f3, v3, f4, v4, f5, v5, f6, v6, f7, v7, f8, v8, f9, v9, f10, v10) const _struct_type _typename = { .base = { &mp_type_type }, .name = _name, .flags = _flags, .slot_index_##f1 = 1, .slot_index_##f2 = 2, .slot_index_##f3 = 3, .slot_index_##f4 = 4, .slot_index_##f5 = 5, .slot_index_##f6 = 6, .slot_index_##f7 = 7, .slot_index_##f8 = 8, .slot_index_##f9 = 9, .slot_index_##f10 = 10, .slots = { v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, } }
+#define MP_DEFINE_CONST_OBJ_TYPE_NARGS_11(_struct_type, _typename, _name, _flags, f1, v1, f2, v2, f3, v3, f4, v4, f5, v5, f6, v6, f7, v7, f8, v8, f9, v9, f10, v10, f11, v11) const _struct_type _typename = { .base = { &mp_type_type }, .name = _name, .flags = _flags, .slot_index_##f1 = 1, .slot_index_##f2 = 2, .slot_index_##f3 = 3, .slot_index_##f4 = 4, .slot_index_##f5 = 5, .slot_index_##f6 = 6, .slot_index_##f7 = 7, .slot_index_##f8 = 8, .slot_index_##f9 = 9, .slot_index_##f10 = 10, .slot_index_##f11 = 11, .slots = { v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, } }
+#define MP_DEFINE_CONST_OBJ_TYPE_NARGS_12(_struct_type, _typename, _name, _flags, f1, v1, f2, v2, f3, v3, f4, v4, f5, v5, f6, v6, f7, v7, f8, v8, f9, v9, f10, v10, f11, v11, f12, v12) const _struct_type _typename = { .base = { &mp_type_type }, .name = _name, .flags = _flags, .slot_index_##f1 = 1, .slot_index_##f2 = 2, .slot_index_##f3 = 3, .slot_index_##f4 = 4, .slot_index_##f5 = 5, .slot_index_##f6 = 6, .slot_index_##f7 = 7, .slot_index_##f8 = 8, .slot_index_##f9 = 9, .slot_index_##f10 = 10, .slot_index_##f11 = 11, .slot_index_##f12 = 12, .slots = { v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, } }
 
 #define MP_OBJ_TYPE_HAS_SLOT(t, f) ((t)->slot_index_##f)
 #define MP_OBJ_TYPE_GET_SLOT(t, f) (_MP_OBJ_TYPE_SLOT_TYPE_##f(t)->slots[(t)->slot_index_##f - 1])
 #define MP_OBJ_TYPE_GET_SLOT_OR_NULL(t, f) (_MP_OBJ_TYPE_SLOT_TYPE_##f(MP_OBJ_TYPE_HAS_SLOT(t, f) ? MP_OBJ_TYPE_GET_SLOT(t, f) : NULL))
 #define MP_OBJ_TYPE_SET_SLOT(t, f, v, n) ((t)->slot_index_##f = (n) + 1, (t)->slots[(t)->slot_index_##f - 1] = (void *)v)
 #define MP_OBJ_TYPE_OFFSETOF_SLOT(f) (offsetof(mp_obj_type_t, slot_index_##f))
-// For everything except make_new, the offset is to the uint8_t index. For make_new, we need to check the pointer.
-#define MP_OBJ_TYPE_HAS_SLOT_BY_OFFSET(t, offset) (*(uint8_t *)((char *)(t) + (offset)) != 0 || (offset == offsetof(mp_obj_type_t, make_new) && t->make_new))
+#define MP_OBJ_TYPE_HAS_SLOT_BY_OFFSET(t, offset) (*(uint8_t *)((char *)(t) + (offset)) != 0)
 
 // Workaround for https://docs.microsoft.com/en-us/cpp/preprocessor/preprocessor-experimental-overview?view=msvc-160#macro-arguments-are-unpacked
 #define MP_DEFINE_CONST_OBJ_TYPE_EXPAND(x) x
 
 // This macro evaluates to MP_DEFINE_CONST_OBJ_TYPE_NARGS_##N, where N is the value
-// of the 30th argument (30 is 13*2 + 4).
-#define MP_DEFINE_CONST_OBJ_TYPE_NARGS(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, N, ...) MP_DEFINE_CONST_OBJ_TYPE_NARGS_##N
+// of the 29th argument (29 is 13*2 + 3).
+#define MP_DEFINE_CONST_OBJ_TYPE_NARGS(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, N, ...) MP_DEFINE_CONST_OBJ_TYPE_NARGS_##N
 
 // These macros are used to define a object type in ROM.
 // Invoke as MP_DEFINE_CONST_OBJ_TYPE(_typename, _name, _flags, _make_new [, slot, func]*)
 // They use the number of arguments to select which MP_DEFINE_CONST_OBJ_TYPE_*
 // macro to use based on the number of arguments. It works by shifting the
 // numeric values 12, 11, ... 0 by the number of arguments, such that the
-// 30th argument ends up being the number to use. The _INV values are
+// 29th argument ends up being the number to use. The _INV values are
 // placeholders because the slot arguments come in pairs.
 #define MP_DEFINE_CONST_OBJ_TYPE(...) MP_DEFINE_CONST_OBJ_TYPE_EXPAND(MP_DEFINE_CONST_OBJ_TYPE_NARGS(__VA_ARGS__, _INV, 12, _INV, 11, _INV, 10, _INV, 9, _INV, 8, _INV, 7, _INV, 6, _INV, 5, _INV, 4, _INV, 3, _INV, 2, _INV, 1, _INV, 0)(mp_obj_type_t, __VA_ARGS__))
 #define MP_DEFINE_CONST_OBJ_FULL_TYPE(...) MP_DEFINE_CONST_OBJ_TYPE_EXPAND(MP_DEFINE_CONST_OBJ_TYPE_NARGS(__VA_ARGS__, _INV, 12, _INV, 11, _INV, 10, _INV, 9, _INV, 8, _INV, 7, _INV, 6, _INV, 5, _INV, 4, _INV, 3, _INV, 2, _INV, 1, _INV, 0)(mp_obj_full_type_t, __VA_ARGS__))
@@ -916,7 +914,7 @@ void *mp_obj_malloc_helper(size_t num_bytes, const mp_obj_type_t *type);
 #define mp_obj_is_int(o) (mp_obj_is_small_int(o) || mp_obj_is_exact_type(o, &mp_type_int))
 #define mp_obj_is_str(o) (mp_obj_is_qstr(o) || mp_obj_is_exact_type(o, &mp_type_str))
 #define mp_obj_is_str_or_bytes(o) (mp_obj_is_qstr(o) || (mp_obj_is_obj(o) && MP_OBJ_TYPE_GET_SLOT_OR_NULL(((mp_obj_base_t *)MP_OBJ_TO_PTR(o))->type, binary_op) == mp_obj_str_binary_op))
-#define mp_obj_is_dict_or_ordereddict(o) (mp_obj_is_obj(o) && ((mp_obj_base_t *)MP_OBJ_TO_PTR(o))->type->make_new == mp_obj_dict_make_new)
+#define mp_obj_is_dict_or_ordereddict(o) (mp_obj_is_obj(o) && MP_OBJ_TYPE_GET_SLOT_OR_NULL(((mp_obj_base_t *)MP_OBJ_TO_PTR(o))->type, make_new) == mp_obj_dict_make_new)
 #define mp_obj_is_fun(o) (mp_obj_is_obj(o) && (((mp_obj_base_t *)MP_OBJ_TO_PTR(o))->type->name == MP_QSTR_function))
 
 mp_obj_t mp_obj_new_type(qstr name, mp_obj_t bases_tuple, mp_obj_t locals_dict);
@@ -1032,7 +1030,7 @@ mp_int_t mp_obj_int_get_checked(mp_const_obj_t self_in);
 mp_uint_t mp_obj_int_get_uint_checked(mp_const_obj_t self_in);
 
 // exception
-#define mp_obj_is_native_exception_instance(o) (mp_obj_get_type(o)->make_new == mp_obj_exception_make_new)
+#define mp_obj_is_native_exception_instance(o) (MP_OBJ_TYPE_GET_SLOT_OR_NULL(mp_obj_get_type(o), make_new) == mp_obj_exception_make_new)
 bool mp_obj_is_exception_type(mp_obj_t self_in);
 bool mp_obj_is_exception_instance(mp_obj_t self_in);
 bool mp_obj_exception_match(mp_obj_t exc, mp_const_obj_t exc_type);
@@ -1044,7 +1042,7 @@ mp_obj_t mp_obj_exception_make_new(const mp_obj_type_t *type_in, size_t n_args,
 mp_obj_t mp_alloc_emergency_exception_buf(mp_obj_t size_in);
 void mp_init_emergency_exception_buf(void);
 static inline mp_obj_t mp_obj_new_exception_arg1(const mp_obj_type_t *exc_type, mp_obj_t arg) {
-    assert(exc_type->make_new == mp_obj_exception_make_new);
+    assert(MP_OBJ_TYPE_GET_SLOT_OR_NULL(exc_type, make_new) == mp_obj_exception_make_new);
     return mp_obj_exception_make_new(exc_type, 1, 0, &arg);
 }
 
diff --git a/py/objarray.c b/py/objarray.c
index 0d1032929f48c..42fc0749d2b2d 100644
--- a/py/objarray.c
+++ b/py/objarray.c
@@ -575,7 +575,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_array,
     MP_QSTR_array,
     MP_TYPE_FLAG_ITER_IS_GETITER,
-    array_make_new,
+    make_new, array_make_new,
     print, array_print,
     iter, array_iterator_new,
     unary_op, array_unary_op,
@@ -591,7 +591,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_bytearray,
     MP_QSTR_bytearray,
     MP_TYPE_FLAG_EQ_CHECKS_OTHER_TYPE | MP_TYPE_FLAG_ITER_IS_GETITER,
-    bytearray_make_new,
+    make_new, bytearray_make_new,
     print, array_print,
     iter, array_iterator_new,
     unary_op, array_unary_op,
@@ -619,7 +619,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_memoryview,
     MP_QSTR_memoryview,
     MP_TYPE_FLAG_EQ_CHECKS_OTHER_TYPE | MP_TYPE_FLAG_ITER_IS_GETITER,
-    memoryview_make_new,
+    make_new, memoryview_make_new,
     iter, array_iterator_new,
     unary_op, array_unary_op,
     binary_op, array_binary_op,
@@ -677,7 +677,6 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_array_it,
     MP_QSTR_iterator,
     MP_TYPE_FLAG_ITER_IS_ITERNEXT,
-    MP_TYPE_NULL_MAKE_NEW,
     iter, array_it_iternext
     );
 
diff --git a/py/objattrtuple.c b/py/objattrtuple.c
index 2e207f4cf0c46..fbe04bedb877a 100644
--- a/py/objattrtuple.c
+++ b/py/objattrtuple.c
@@ -84,7 +84,6 @@ MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_attrtuple,
     MP_QSTR_tuple,
     MP_TYPE_FLAG_ITER_IS_GETITER,
-    MP_TYPE_NULL_MAKE_NEW,
     // reuse tuple to save on a qstr
     print, mp_obj_attrtuple_print,
     unary_op, mp_obj_tuple_unary_op,
diff --git a/py/objbool.c b/py/objbool.c
index 5d014bbb8eaf8..3267ff98bb8a1 100644
--- a/py/objbool.c
+++ b/py/objbool.c
@@ -89,7 +89,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_bool,
     MP_QSTR_bool,
     MP_TYPE_FLAG_EQ_CHECKS_OTHER_TYPE,
-    bool_make_new,
+    make_new, bool_make_new,
     print, bool_print,
     unary_op, bool_unary_op,
     binary_op, bool_binary_op
diff --git a/py/objboundmeth.c b/py/objboundmeth.c
index f4b3b9b7df9ce..8486f876f9a53 100644
--- a/py/objboundmeth.c
+++ b/py/objboundmeth.c
@@ -111,7 +111,6 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_bound_meth,
     MP_QSTR_bound_method,
     MP_TYPE_FLAG_NONE,
-    MP_TYPE_NULL_MAKE_NEW,
     BOUND_METH_TYPE_PRINT
     BOUND_METH_TYPE_ATTR
     call, bound_meth_call
diff --git a/py/objcell.c b/py/objcell.c
index b100fae4fe994..0a74e29d2064a 100644
--- a/py/objcell.c
+++ b/py/objcell.c
@@ -48,7 +48,7 @@ STATIC void cell_print(const mp_print_t *print, mp_obj_t o_in, mp_print_kind_t k
 
 STATIC MP_DEFINE_CONST_OBJ_TYPE(
     // cell representation is just value in < >
-    mp_type_cell, MP_QSTR_, MP_TYPE_FLAG_NONE, MP_TYPE_NULL_MAKE_NEW
+    mp_type_cell, MP_QSTR_, MP_TYPE_FLAG_NONE
     CELL_TYPE_PRINT
     );
 
diff --git a/py/objclosure.c b/py/objclosure.c
index 45a3e83c462d8..6059d18100e03 100644
--- a/py/objclosure.c
+++ b/py/objclosure.c
@@ -99,7 +99,6 @@ MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_closure,
     MP_QSTR_closure,
     MP_TYPE_FLAG_BINDS_SELF,
-    MP_TYPE_NULL_MAKE_NEW,
     CLOSURE_TYPE_ATTR
     CLOSURE_TYPE_PRINT
     call, closure_call
diff --git a/py/objcomplex.c b/py/objcomplex.c
index cf213d718a793..ddd103eeb46e3 100644
--- a/py/objcomplex.c
+++ b/py/objcomplex.c
@@ -152,7 +152,8 @@ STATIC void complex_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
 }
 
 MP_DEFINE_CONST_OBJ_TYPE(
-    mp_type_complex, MP_QSTR_complex, MP_TYPE_FLAG_EQ_NOT_REFLEXIVE | MP_TYPE_FLAG_EQ_CHECKS_OTHER_TYPE, complex_make_new,
+    mp_type_complex, MP_QSTR_complex, MP_TYPE_FLAG_EQ_NOT_REFLEXIVE | MP_TYPE_FLAG_EQ_CHECKS_OTHER_TYPE,
+    make_new, complex_make_new,
     print, complex_print,
     unary_op, complex_unary_op,
     binary_op, complex_binary_op,
diff --git a/py/objdeque.c b/py/objdeque.c
index 1a8f76ca110b1..8b52b8d387303 100644
--- a/py/objdeque.c
+++ b/py/objdeque.c
@@ -159,7 +159,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_deque,
     MP_QSTR_deque,
     MP_TYPE_FLAG_NONE,
-    deque_make_new,
+    make_new, deque_make_new,
     unary_op, deque_unary_op,
     locals_dict, &deque_locals_dict
     );
diff --git a/py/objdict.c b/py/objdict.c
index 7755d7b786d4c..68c33961c70c0 100644
--- a/py/objdict.c
+++ b/py/objdict.c
@@ -465,7 +465,6 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_dict_view_it,
     MP_QSTR_iterator,
     MP_TYPE_FLAG_ITER_IS_ITERNEXT,
-    MP_TYPE_NULL_MAKE_NEW,
     iter, dict_view_it_iternext
     );
 
@@ -517,7 +516,6 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_dict_view,
     MP_QSTR_dict_view,
     MP_TYPE_FLAG_ITER_IS_GETITER,
-    MP_TYPE_NULL_MAKE_NEW,
     print, dict_view_print,
     binary_op, dict_view_binary_op,
     iter, dict_view_getiter
@@ -592,7 +590,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_dict,
     MP_QSTR_dict,
     MP_TYPE_FLAG_ITER_IS_GETITER,
-    mp_obj_dict_make_new,
+    make_new, mp_obj_dict_make_new,
     print, dict_print,
     unary_op, dict_unary_op,
     binary_op, dict_binary_op,
@@ -606,7 +604,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_ordereddict,
     MP_QSTR_OrderedDict,
     MP_TYPE_FLAG_ITER_IS_GETITER,
-    mp_obj_dict_make_new,
+    make_new, mp_obj_dict_make_new,
     print, dict_print,
     unary_op, dict_unary_op,
     binary_op, dict_binary_op,
diff --git a/py/objenumerate.c b/py/objenumerate.c
index eea9e3e381ed4..40bed919ed750 100644
--- a/py/objenumerate.c
+++ b/py/objenumerate.c
@@ -71,7 +71,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_enumerate,
     MP_QSTR_enumerate,
     MP_TYPE_FLAG_ITER_IS_ITERNEXT,
-    enumerate_make_new,
+    make_new, enumerate_make_new,
     iter, enumerate_iternext
     );
 
diff --git a/py/objexcept.c b/py/objexcept.c
index 190213e12f610..3b76ae62ccc69 100644
--- a/py/objexcept.c
+++ b/py/objexcept.c
@@ -288,7 +288,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_BaseException,
     MP_QSTR_BaseException,
     MP_TYPE_FLAG_NONE,
-    mp_obj_exception_make_new,
+    make_new, mp_obj_exception_make_new,
     print, mp_obj_exception_print,
     attr, mp_obj_exception_attr
     );
@@ -375,12 +375,12 @@ MP_DEFINE_EXCEPTION(Exception, BaseException)
 // *FORMAT-ON*
 
 mp_obj_t mp_obj_new_exception(const mp_obj_type_t *exc_type) {
-    assert(exc_type->make_new == mp_obj_exception_make_new);
+    assert(MP_OBJ_TYPE_GET_SLOT_OR_NULL(exc_type, make_new) == mp_obj_exception_make_new);
     return mp_obj_exception_make_new(exc_type, 0, 0, NULL);
 }
 
 mp_obj_t mp_obj_new_exception_args(const mp_obj_type_t *exc_type, size_t n_args, const mp_obj_t *args) {
-    assert(exc_type->make_new == mp_obj_exception_make_new);
+    assert(MP_OBJ_TYPE_GET_SLOT_OR_NULL(exc_type, make_new) == mp_obj_exception_make_new);
     return mp_obj_exception_make_new(exc_type, n_args, 0, args);
 }
 
@@ -388,7 +388,7 @@ mp_obj_t mp_obj_new_exception_args(const mp_obj_type_t *exc_type, size_t n_args,
 
 mp_obj_t mp_obj_new_exception_msg(const mp_obj_type_t *exc_type, mp_rom_error_text_t msg) {
     // Check that the given type is an exception type
-    assert(exc_type->make_new == mp_obj_exception_make_new);
+    assert(MP_OBJ_TYPE_GET_SLOT_OR_NULL(exc_type, make_new) == mp_obj_exception_make_new);
 
     // Try to allocate memory for the message
     mp_obj_str_t *o_str = m_new_obj_maybe(mp_obj_str_t);
@@ -467,7 +467,7 @@ mp_obj_t mp_obj_new_exception_msg_vlist(const mp_obj_type_t *exc_type, mp_rom_er
     assert(fmt != NULL);
 
     // Check that the given type is an exception type
-    assert(exc_type->make_new == mp_obj_exception_make_new);
+    assert(MP_OBJ_TYPE_GET_SLOT_OR_NULL(exc_type, make_new) == mp_obj_exception_make_new);
 
     // Try to allocate memory for the message
     mp_obj_str_t *o_str = m_new_obj_maybe(mp_obj_str_t);
@@ -538,7 +538,7 @@ bool mp_obj_is_exception_type(mp_obj_t self_in) {
     if (mp_obj_is_type(self_in, &mp_type_type)) {
         // optimisation when self_in is a builtin exception
         mp_obj_type_t *self = MP_OBJ_TO_PTR(self_in);
-        if (self->make_new == mp_obj_exception_make_new) {
+        if (MP_OBJ_TYPE_GET_SLOT_OR_NULL(self, make_new) == mp_obj_exception_make_new) {
             return true;
         }
     }
diff --git a/py/objexcept.h b/py/objexcept.h
index 5d56d67d7314f..d532f66609243 100644
--- a/py/objexcept.h
+++ b/py/objexcept.h
@@ -41,7 +41,8 @@ void mp_obj_exception_print(const mp_print_t *print, mp_obj_t o_in, mp_print_kin
 void mp_obj_exception_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest);
 
 #define MP_DEFINE_EXCEPTION(exc_name, base_name) \
-    MP_DEFINE_CONST_OBJ_TYPE(mp_type_##exc_name, MP_QSTR_##exc_name, MP_TYPE_FLAG_NONE, mp_obj_exception_make_new, \
+    MP_DEFINE_CONST_OBJ_TYPE(mp_type_##exc_name, MP_QSTR_##exc_name, MP_TYPE_FLAG_NONE, \
+    make_new, mp_obj_exception_make_new, \
     print, mp_obj_exception_print, \
     attr, mp_obj_exception_attr, \
     parent, &mp_type_##base_name \
diff --git a/py/objfilter.c b/py/objfilter.c
index bfe651f40d036..2a657fde4b71b 100644
--- a/py/objfilter.c
+++ b/py/objfilter.c
@@ -64,7 +64,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_filter,
     MP_QSTR_filter,
     MP_TYPE_FLAG_ITER_IS_ITERNEXT,
-    filter_make_new,
+    make_new, filter_make_new,
     iter, filter_iternext
     );
 
diff --git a/py/objfloat.c b/py/objfloat.c
index 9ecbab7a4dede..c862b4843b278 100644
--- a/py/objfloat.c
+++ b/py/objfloat.c
@@ -183,7 +183,8 @@ STATIC mp_obj_t float_binary_op(mp_binary_op_t op, mp_obj_t lhs_in, mp_obj_t rhs
 }
 
 MP_DEFINE_CONST_OBJ_TYPE(
-    mp_type_float, MP_QSTR_float, MP_TYPE_FLAG_EQ_NOT_REFLEXIVE | MP_TYPE_FLAG_EQ_CHECKS_OTHER_TYPE, float_make_new,
+    mp_type_float, MP_QSTR_float, MP_TYPE_FLAG_EQ_NOT_REFLEXIVE | MP_TYPE_FLAG_EQ_CHECKS_OTHER_TYPE,
+    make_new, float_make_new,
     print, float_print,
     unary_op, float_unary_op,
     binary_op, float_binary_op
diff --git a/py/objfun.c b/py/objfun.c
index d6ff354575bf9..390ddaa2d2821 100644
--- a/py/objfun.c
+++ b/py/objfun.c
@@ -57,7 +57,7 @@ STATIC mp_obj_t fun_builtin_0_call(mp_obj_t self_in, size_t n_args, size_t n_kw,
 }
 
 MP_DEFINE_CONST_OBJ_TYPE(
-    mp_type_fun_builtin_0, MP_QSTR_function, MP_TYPE_FLAG_BINDS_SELF | MP_TYPE_FLAG_BUILTIN_FUN, MP_TYPE_NULL_MAKE_NEW,
+    mp_type_fun_builtin_0, MP_QSTR_function, MP_TYPE_FLAG_BINDS_SELF | MP_TYPE_FLAG_BUILTIN_FUN,
     call, fun_builtin_0_call,
     unary_op, mp_generic_unary_op
     );
@@ -70,7 +70,7 @@ STATIC mp_obj_t fun_builtin_1_call(mp_obj_t self_in, size_t n_args, size_t n_kw,
 }
 
 MP_DEFINE_CONST_OBJ_TYPE(
-    mp_type_fun_builtin_1, MP_QSTR_function, MP_TYPE_FLAG_BINDS_SELF | MP_TYPE_FLAG_BUILTIN_FUN, MP_TYPE_NULL_MAKE_NEW,
+    mp_type_fun_builtin_1, MP_QSTR_function, MP_TYPE_FLAG_BINDS_SELF | MP_TYPE_FLAG_BUILTIN_FUN,
     call, fun_builtin_1_call,
     unary_op, mp_generic_unary_op
     );
@@ -83,7 +83,7 @@ STATIC mp_obj_t fun_builtin_2_call(mp_obj_t self_in, size_t n_args, size_t n_kw,
 }
 
 MP_DEFINE_CONST_OBJ_TYPE(
-    mp_type_fun_builtin_2, MP_QSTR_function, MP_TYPE_FLAG_BINDS_SELF | MP_TYPE_FLAG_BUILTIN_FUN, MP_TYPE_NULL_MAKE_NEW,
+    mp_type_fun_builtin_2, MP_QSTR_function, MP_TYPE_FLAG_BINDS_SELF | MP_TYPE_FLAG_BUILTIN_FUN,
     call, fun_builtin_2_call,
     unary_op, mp_generic_unary_op
     );
@@ -96,7 +96,7 @@ STATIC mp_obj_t fun_builtin_3_call(mp_obj_t self_in, size_t n_args, size_t n_kw,
 }
 
 MP_DEFINE_CONST_OBJ_TYPE(
-    mp_type_fun_builtin_3, MP_QSTR_function, MP_TYPE_FLAG_BINDS_SELF | MP_TYPE_FLAG_BUILTIN_FUN, MP_TYPE_NULL_MAKE_NEW,
+    mp_type_fun_builtin_3, MP_QSTR_function, MP_TYPE_FLAG_BINDS_SELF | MP_TYPE_FLAG_BUILTIN_FUN,
     call, fun_builtin_3_call,
     unary_op, mp_generic_unary_op
     );
@@ -125,7 +125,7 @@ STATIC mp_obj_t fun_builtin_var_call(mp_obj_t self_in, size_t n_args, size_t n_k
 }
 
 MP_DEFINE_CONST_OBJ_TYPE(
-    mp_type_fun_builtin_var, MP_QSTR_function, MP_TYPE_FLAG_BINDS_SELF | MP_TYPE_FLAG_BUILTIN_FUN, MP_TYPE_NULL_MAKE_NEW,
+    mp_type_fun_builtin_var, MP_QSTR_function, MP_TYPE_FLAG_BINDS_SELF | MP_TYPE_FLAG_BUILTIN_FUN,
     call, fun_builtin_var_call,
     unary_op, mp_generic_unary_op
     );
@@ -368,7 +368,6 @@ MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_fun_bc,
     MP_QSTR_function,
     MP_TYPE_FLAG_BINDS_SELF,
-    MP_TYPE_NULL_MAKE_NEW,
     FUN_BC_TYPE_PRINT
     FUN_BC_TYPE_ATTR
     call, fun_bc_call,
@@ -431,7 +430,6 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_fun_native,
     MP_QSTR_function,
     MP_TYPE_FLAG_BINDS_SELF,
-    MP_TYPE_NULL_MAKE_NEW,
     FUN_BC_TYPE_PRINT
     FUN_BC_TYPE_ATTR
     call, fun_native_call,
@@ -542,7 +540,6 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_fun_asm,
     MP_QSTR_function,
     MP_TYPE_FLAG_BINDS_SELF,
-    MP_TYPE_NULL_MAKE_NEW,
     call, fun_asm_call,
     unary_op, mp_generic_unary_op
     );
diff --git a/py/objgenerator.c b/py/objgenerator.c
index d8515c13ce257..8175dbd683db0 100644
--- a/py/objgenerator.c
+++ b/py/objgenerator.c
@@ -80,7 +80,6 @@ MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_gen_wrap,
     MP_QSTR_generator,
     MP_TYPE_FLAG_BINDS_SELF,
-    MP_TYPE_NULL_MAKE_NEW,
     GEN_WRAP_TYPE_ATTR
     call, gen_wrap_call,
     unary_op, mp_generic_unary_op
@@ -146,7 +145,6 @@ MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_native_gen_wrap,
     MP_QSTR_generator,
     MP_TYPE_FLAG_BINDS_SELF,
-    MP_TYPE_NULL_MAKE_NEW,
     call, native_gen_wrap_call,
     NATIVE_GEN_WRAP_TYPE_ATTR
     unary_op, mp_generic_unary_op
@@ -371,7 +369,6 @@ MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_gen_instance,
     MP_QSTR_generator,
     MP_TYPE_FLAG_ITER_IS_ITERNEXT,
-    MP_TYPE_NULL_MAKE_NEW,
     print, gen_instance_print,
     unary_op, mp_generic_unary_op,
     iter, gen_instance_iternext,
diff --git a/py/objgetitemiter.c b/py/objgetitemiter.c
index 134cbcd6299d5..c598d1daaca9a 100644
--- a/py/objgetitemiter.c
+++ b/py/objgetitemiter.c
@@ -60,7 +60,6 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_it,
     MP_QSTR_iterator,
     MP_TYPE_FLAG_ITER_IS_ITERNEXT,
-    MP_TYPE_NULL_MAKE_NEW,
     iter, it_iternext
     );
 
diff --git a/py/objint.c b/py/objint.c
index f06bc441f15d5..1a3ad8694717e 100644
--- a/py/objint.c
+++ b/py/objint.c
@@ -461,7 +461,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_int,
     MP_QSTR_int,
     MP_TYPE_FLAG_NONE,
-    mp_obj_int_make_new,
+    make_new, mp_obj_int_make_new,
     print, mp_obj_int_print,
     unary_op, mp_obj_int_unary_op,
     binary_op, mp_obj_int_binary_op,
diff --git a/py/objlist.c b/py/objlist.c
index 8d18344ea8a71..18da91ba3abc3 100644
--- a/py/objlist.c
+++ b/py/objlist.c
@@ -71,7 +71,7 @@ STATIC mp_obj_t list_extend_from_iter(mp_obj_t list, mp_obj_t iterable) {
     return list;
 }
 
-STATIC mp_obj_t list_make_new(const mp_obj_type_t *type_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
+mp_obj_t mp_obj_list_make_new(const mp_obj_type_t *type_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
     (void)type_in;
     mp_arg_check_num(n_args, n_kw, 0, 1, false);
 
@@ -456,7 +456,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_list,
     MP_QSTR_list,
     MP_TYPE_FLAG_ITER_IS_GETITER,
-    list_make_new,
+    make_new, mp_obj_list_make_new,
     print, list_print,
     unary_op, list_unary_op,
     binary_op, list_binary_op,
diff --git a/py/objlist.h b/py/objlist.h
index a43663db76f8d..a3bba68028f81 100644
--- a/py/objlist.h
+++ b/py/objlist.h
@@ -36,5 +36,6 @@ typedef struct _mp_obj_list_t {
 } mp_obj_list_t;
 
 void mp_obj_list_init(mp_obj_list_t *o, size_t n);
+mp_obj_t mp_obj_list_make_new(const mp_obj_type_t *type_in, size_t n_args, size_t n_kw, const mp_obj_t *args);
 
 #endif // MICROPY_INCLUDED_PY_OBJLIST_H
diff --git a/py/objmap.c b/py/objmap.c
index 115832e387e56..e7e594cd2c54b 100644
--- a/py/objmap.c
+++ b/py/objmap.c
@@ -67,6 +67,6 @@ MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_map,
     MP_QSTR_map,
     MP_TYPE_FLAG_ITER_IS_ITERNEXT,
-    map_make_new,
+    make_new, map_make_new,
     iter, map_iternext
     );
diff --git a/py/objmodule.c b/py/objmodule.c
index 6fc3653e6a24d..d14a59b8632c4 100644
--- a/py/objmodule.c
+++ b/py/objmodule.c
@@ -134,7 +134,6 @@ MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_module,
     MP_QSTR_module,
     MP_TYPE_FLAG_NONE,
-    MP_TYPE_NULL_MAKE_NEW,
     print, module_print,
     attr, module_attr
     );
diff --git a/py/objnamedtuple.c b/py/objnamedtuple.c
index 3b45d8f76f29b..75e21494b4d36 100644
--- a/py/objnamedtuple.c
+++ b/py/objnamedtuple.c
@@ -157,14 +157,14 @@ STATIC mp_obj_t mp_obj_new_namedtuple_type(qstr name, size_t n_fields, mp_obj_t
     type->base.type = &mp_type_type;
     type->flags = MP_TYPE_FLAG_EQ_CHECKS_OTHER_TYPE; // can match tuple
     type->name = name;
-    type->make_new = namedtuple_make_new;
-    MP_OBJ_TYPE_SET_SLOT(type, print, namedtuple_print, 0);
-    MP_OBJ_TYPE_SET_SLOT(type, unary_op, mp_obj_tuple_unary_op, 1);
-    MP_OBJ_TYPE_SET_SLOT(type, binary_op, mp_obj_tuple_binary_op, 2);
-    MP_OBJ_TYPE_SET_SLOT(type, attr, namedtuple_attr, 3);
-    MP_OBJ_TYPE_SET_SLOT(type, subscr, mp_obj_tuple_subscr, 4);
-    MP_OBJ_TYPE_SET_SLOT(type, iter, mp_obj_tuple_getiter, 5);
-    MP_OBJ_TYPE_SET_SLOT(type, parent, &mp_type_tuple, 6);
+    MP_OBJ_TYPE_SET_SLOT(type, make_new, namedtuple_make_new, 0);
+    MP_OBJ_TYPE_SET_SLOT(type, print, namedtuple_print, 1);
+    MP_OBJ_TYPE_SET_SLOT(type, unary_op, mp_obj_tuple_unary_op, 2);
+    MP_OBJ_TYPE_SET_SLOT(type, binary_op, mp_obj_tuple_binary_op, 3);
+    MP_OBJ_TYPE_SET_SLOT(type, attr, namedtuple_attr, 4);
+    MP_OBJ_TYPE_SET_SLOT(type, subscr, mp_obj_tuple_subscr, 5);
+    MP_OBJ_TYPE_SET_SLOT(type, iter, mp_obj_tuple_getiter, 6);
+    MP_OBJ_TYPE_SET_SLOT(type, parent, &mp_type_tuple, 7);
     return MP_OBJ_FROM_PTR(o);
 }
 
diff --git a/py/objnamedtuple.h b/py/objnamedtuple.h
index db4a3d87d87fd..c4f4149fd606b 100644
--- a/py/objnamedtuple.h
+++ b/py/objnamedtuple.h
@@ -29,9 +29,9 @@
 #include "py/objtuple.h"
 
 typedef struct _mp_obj_namedtuple_type_t {
-    // This is a mp_obj_type_t with seven slots.
+    // This is a mp_obj_type_t with eight slots.
     mp_obj_empty_type_t base;
-    void *slots[7];
+    void *slots[8];
     size_t n_fields;
     qstr fields[];
 } mp_obj_namedtuple_type_t;
diff --git a/py/objnone.c b/py/objnone.c
index 4fffbc997e89e..4f8996e897a83 100644
--- a/py/objnone.c
+++ b/py/objnone.c
@@ -47,7 +47,6 @@ MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_NoneType,
     MP_QSTR_NoneType,
     MP_TYPE_FLAG_NONE,
-    MP_TYPE_NULL_MAKE_NEW,
     print, none_print,
     unary_op, mp_generic_unary_op
     );
diff --git a/py/objobject.c b/py/objobject.c
index ffad610707279..1acae6d00b189 100644
--- a/py/objobject.c
+++ b/py/objobject.c
@@ -121,6 +121,6 @@ MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_object,
     MP_QSTR_object,
     MP_TYPE_FLAG_NONE,
-    object_make_new
+    make_new, object_make_new
     OBJECT_TYPE_LOCALS_DICT
     );
diff --git a/py/objpolyiter.c b/py/objpolyiter.c
index 7a45b6b73fe6f..78b600abacdcd 100644
--- a/py/objpolyiter.c
+++ b/py/objpolyiter.c
@@ -49,7 +49,6 @@ MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_polymorph_iter,
     MP_QSTR_iterator,
     MP_TYPE_FLAG_ITER_IS_ITERNEXT,
-    MP_TYPE_NULL_MAKE_NEW,
     iter, polymorph_it_iternext
     );
 
@@ -81,7 +80,6 @@ MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_polymorph_iter_with_finaliser,
     MP_QSTR_iterator,
     MP_TYPE_FLAG_ITER_IS_ITERNEXT,
-    MP_TYPE_NULL_MAKE_NEW,
     iter, polymorph_it_iternext,
     locals_dict, &mp_obj_polymorph_iter_locals_dict
     );
diff --git a/py/objproperty.c b/py/objproperty.c
index ce3b572591d2f..2d3af10e8c70a 100644
--- a/py/objproperty.c
+++ b/py/objproperty.c
@@ -94,7 +94,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_property,
     MP_QSTR_property,
     MP_TYPE_FLAG_NONE,
-    property_make_new,
+    make_new, property_make_new,
     locals_dict, &property_locals_dict
     );
 
diff --git a/py/objrange.c b/py/objrange.c
index 1ad8f6031f292..f0fe56d9db12e 100644
--- a/py/objrange.c
+++ b/py/objrange.c
@@ -54,7 +54,6 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_range_it,
     MP_QSTR_iterator,
     MP_TYPE_FLAG_ITER_IS_ITERNEXT,
-    MP_TYPE_NULL_MAKE_NEW,
     iter, range_it_iternext
     );
 
@@ -225,7 +224,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_range,
     MP_QSTR_range,
     MP_TYPE_FLAG_NONE,
-    range_make_new,
+    make_new, range_make_new,
     RANGE_TYPE_BINOP
     RANGE_TYPE_ATTR
     print, range_print,
diff --git a/py/objreversed.c b/py/objreversed.c
index e265266d3f127..c66698f028adf 100644
--- a/py/objreversed.c
+++ b/py/objreversed.c
@@ -72,7 +72,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_reversed,
     MP_QSTR_reversed,
     MP_TYPE_FLAG_ITER_IS_ITERNEXT,
-    reversed_make_new,
+    make_new, reversed_make_new,
     iter, reversed_iternext
     );
 
diff --git a/py/objset.c b/py/objset.c
index b827f49f40dfe..906807889ab36 100644
--- a/py/objset.c
+++ b/py/objset.c
@@ -543,7 +543,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_set,
     MP_QSTR_set,
     MP_TYPE_FLAG_ITER_IS_GETITER,
-    set_make_new,
+    make_new, set_make_new,
     print, set_print,
     unary_op, set_unary_op,
     binary_op, set_binary_op,
@@ -569,7 +569,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_frozenset,
     MP_QSTR_frozenset,
     MP_TYPE_FLAG_EQ_CHECKS_OTHER_TYPE | MP_TYPE_FLAG_ITER_IS_GETITER,
-    set_make_new,
+    make_new, set_make_new,
     print, set_print,
     unary_op, set_unary_op,
     binary_op, set_binary_op,
diff --git a/py/objsingleton.c b/py/objsingleton.c
index 4a099657d4be4..dc73d28c274cd 100644
--- a/py/objsingleton.c
+++ b/py/objsingleton.c
@@ -44,7 +44,7 @@ STATIC void singleton_print(const mp_print_t *print, mp_obj_t self_in, mp_print_
 }
 
 MP_DEFINE_CONST_OBJ_TYPE(
-    mp_type_singleton, MP_QSTR_, MP_TYPE_FLAG_NONE, MP_TYPE_NULL_MAKE_NEW,
+    mp_type_singleton, MP_QSTR_, MP_TYPE_FLAG_NONE,
     print, singleton_print,
     unary_op, mp_generic_unary_op
     );
diff --git a/py/objslice.c b/py/objslice.c
index d1dbb24586d9f..01d4da0dbda4e 100644
--- a/py/objslice.c
+++ b/py/objslice.c
@@ -104,7 +104,6 @@ MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_slice,
     MP_QSTR_slice,
     MP_TYPE_FLAG_NONE,
-    MP_TYPE_NULL_MAKE_NEW,
     SLICE_TYPE_ATTR_OR_LOCALS_DICT
     print, slice_print
     );
diff --git a/py/objstr.c b/py/objstr.c
index 12f6e15d0498c..50ab0018ed6e6 100644
--- a/py/objstr.c
+++ b/py/objstr.c
@@ -482,7 +482,7 @@ STATIC mp_obj_t str_join(mp_obj_t self_in, mp_obj_t arg) {
     if (!mp_obj_is_type(arg, &mp_type_list) && !mp_obj_is_type(arg, &mp_type_tuple)) {
         // arg is not a list nor a tuple, try to convert it to a list
         // TODO: Try to optimize?
-        arg = mp_type_list.make_new(&mp_type_list, 1, 0, &arg);
+        arg = mp_obj_list_make_new(&mp_type_list, 1, 0, &arg);
     }
     mp_obj_get_array(arg, &seq_len, &seq_items);
 
@@ -2147,7 +2147,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_str,
     MP_QSTR_str,
     MP_TYPE_FLAG_NONE,
-    mp_obj_str_make_new,
+    make_new, mp_obj_str_make_new,
     print, str_print,
     binary_op, mp_obj_str_binary_op,
     subscr, bytes_subscr,
@@ -2162,7 +2162,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_bytes,
     MP_QSTR_bytes,
     MP_TYPE_FLAG_NONE,
-    bytes_make_new,
+    make_new, bytes_make_new,
     print, str_print,
     binary_op, mp_obj_str_binary_op,
     subscr, bytes_subscr,
diff --git a/py/objstringio.c b/py/objstringio.c
index 4e19b83999aac..1a083449bafa9 100644
--- a/py/objstringio.c
+++ b/py/objstringio.c
@@ -248,7 +248,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_stringio,
     MP_QSTR_StringIO,
     MP_TYPE_FLAG_ITER_IS_STREAM,
-    stringio_make_new,
+    make_new, stringio_make_new,
     print, stringio_print,
     protocol, &stringio_stream_p,
     locals_dict, &stringio_locals_dict
@@ -265,7 +265,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_bytesio,
     MP_QSTR_BytesIO,
     MP_TYPE_FLAG_ITER_IS_STREAM,
-    stringio_make_new,
+    make_new, stringio_make_new,
     print, stringio_print,
     protocol, &bytesio_stream_p,
     locals_dict, &stringio_locals_dict
diff --git a/py/objstrunicode.c b/py/objstrunicode.c
index 9b28841ecd177..93383b3c19e95 100644
--- a/py/objstrunicode.c
+++ b/py/objstrunicode.c
@@ -233,7 +233,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_str,
     MP_QSTR_str,
     MP_TYPE_FLAG_ITER_IS_GETITER,
-    mp_obj_str_make_new,
+    make_new, mp_obj_str_make_new,
     print, uni_print,
     unary_op, uni_unary_op,
     binary_op, mp_obj_str_binary_op,
diff --git a/py/objtuple.c b/py/objtuple.c
index 485d44c52a8d7..9d6797b4ffc3f 100644
--- a/py/objtuple.c
+++ b/py/objtuple.c
@@ -228,7 +228,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_tuple,
     MP_QSTR_tuple,
     MP_TYPE_FLAG_ITER_IS_GETITER,
-    mp_obj_tuple_make_new,
+    make_new, mp_obj_tuple_make_new,
     print, mp_obj_tuple_print,
     unary_op, mp_obj_tuple_unary_op,
     binary_op, mp_obj_tuple_binary_op,
diff --git a/py/objtype.c b/py/objtype.c
index 183dce071ee9b..db364e0e5a5de 100644
--- a/py/objtype.c
+++ b/py/objtype.c
@@ -88,7 +88,7 @@ STATIC mp_obj_t native_base_init_wrapper(size_t n_args, const mp_obj_t *args) {
     mp_obj_instance_t *self = MP_OBJ_TO_PTR(args[0]);
     const mp_obj_type_t *native_base = NULL;
     instance_count_native_bases(self->base.type, &native_base);
-    self->subobj[0] = native_base->make_new(native_base, n_args - 1, 0, args + 1);
+    self->subobj[0] = MP_OBJ_TYPE_GET_SLOT(native_base, make_new)(native_base, n_args - 1, 0, args + 1);
     return mp_const_none;
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(native_base_init_wrapper_obj, 1, MP_OBJ_FUN_ARGS_MAX, native_base_init_wrapper);
@@ -285,7 +285,7 @@ mp_obj_t mp_obj_instance_make_new(const mp_obj_type_t *self, size_t n_args, size
     struct class_lookup_data lookup = {
         .obj = NULL,
         .attr = MP_QSTR___new__,
-        .slot_offset = offsetof(mp_obj_type_t, make_new),
+        .slot_offset = MP_OBJ_TYPE_OFFSETOF_SLOT(make_new),
         .dest = init_fn,
         .is_type = false,
     };
@@ -362,7 +362,7 @@ mp_obj_t mp_obj_instance_make_new(const mp_obj_type_t *self, size_t n_args, size
     // If the type had a native base that was not explicitly initialised
     // (constructed) by the Python __init__() method then construct it now.
     if (native_base != NULL && o->subobj[0] == MP_OBJ_FROM_PTR(&native_base_init_wrapper_obj)) {
-        o->subobj[0] = native_base->make_new(native_base, n_args, n_kw, args);
+        o->subobj[0] = MP_OBJ_TYPE_GET_SLOT(native_base, make_new)(native_base, n_args, n_kw, args);
     }
 
     return MP_OBJ_FROM_PTR(o);
@@ -998,7 +998,7 @@ STATIC mp_obj_t type_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const mp
 
     mp_obj_type_t *self = MP_OBJ_TO_PTR(self_in);
 
-    if (self->make_new == NULL) {
+    if (!MP_OBJ_TYPE_HAS_SLOT(self, make_new)) {
         #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
         mp_raise_TypeError(MP_ERROR_TEXT("can't create instance"));
         #else
@@ -1007,7 +1007,7 @@ STATIC mp_obj_t type_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const mp
     }
 
     // make new instance
-    mp_obj_t o = self->make_new(self, n_args, n_kw, args);
+    mp_obj_t o = MP_OBJ_TYPE_GET_SLOT(self, make_new)(self, n_args, n_kw, args);
 
     // return new instance
     return o;
@@ -1109,7 +1109,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_type,
     MP_QSTR_type,
     MP_TYPE_FLAG_NONE,
-    type_make_new,
+    make_new, type_make_new,
     print, type_print,
     call, type_call,
     unary_op, mp_generic_unary_op,
@@ -1141,7 +1141,7 @@ mp_obj_t mp_obj_new_type(qstr name, mp_obj_t bases_tuple, mp_obj_t locals_dict)
         }
         mp_obj_type_t *t = MP_OBJ_TO_PTR(bases_items[i]);
         // TODO: Verify with CPy, tested on function type
-        if (t->make_new == NULL) {
+        if (!MP_OBJ_TYPE_HAS_SLOT(t, make_new)) {
             #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
             mp_raise_TypeError(MP_ERROR_TEXT("type isn't an acceptable base type"));
             #else
@@ -1163,35 +1163,35 @@ mp_obj_t mp_obj_new_type(qstr name, mp_obj_t bases_tuple, mp_obj_t locals_dict)
     }
 
     // Allocate a variable-sized mp_obj_type_t with as many slots as we need
-    // (currently 9, plus 1 for base, plus 1 for base-protocol).
-    // Note: 11 slots pushes it from 4 to 5 GC blocks.
-    mp_obj_type_t *o = m_new_obj_var0(mp_obj_type_t, void *, 9 + (bases_len ? 1 : 0) + (base_protocol ? 1 : 0));
+    // (currently 10, plus 1 for base, plus 1 for base-protocol).
+    // Note: mp_obj_type_t is (2 + 3 + #slots) words, so going from 11 to 12 slots
+    // moves from 4 to 5 gc blocks.
+    mp_obj_type_t *o = m_new_obj_var0(mp_obj_type_t, void *, 10 + (bases_len ? 1 : 0) + (base_protocol ? 1 : 0));
     o->base.type = &mp_type_type;
     o->flags = base_flags;
     o->name = name;
-    o->make_new = mp_obj_instance_make_new;
-    MP_OBJ_TYPE_SET_SLOT(o, print, instance_print, 0);
-    MP_OBJ_TYPE_SET_SLOT(o, call, mp_obj_instance_call, 1);
-    MP_OBJ_TYPE_SET_SLOT(o, unary_op, instance_unary_op, 2);
-    MP_OBJ_TYPE_SET_SLOT(o, binary_op, instance_binary_op, 3);
-    MP_OBJ_TYPE_SET_SLOT(o, attr, mp_obj_instance_attr, 4);
-    MP_OBJ_TYPE_SET_SLOT(o, subscr, instance_subscr, 5);
-    MP_OBJ_TYPE_SET_SLOT(o, iter, mp_obj_instance_getiter, 6);
-    // MP_OBJ_TYPE_SET_SLOT(o, iternext, not implemented)
-    MP_OBJ_TYPE_SET_SLOT(o, buffer, instance_get_buffer, 7);
+    MP_OBJ_TYPE_SET_SLOT(o, make_new, mp_obj_instance_make_new, 0);
+    MP_OBJ_TYPE_SET_SLOT(o, print, instance_print, 1);
+    MP_OBJ_TYPE_SET_SLOT(o, call, mp_obj_instance_call, 2);
+    MP_OBJ_TYPE_SET_SLOT(o, unary_op, instance_unary_op, 3);
+    MP_OBJ_TYPE_SET_SLOT(o, binary_op, instance_binary_op, 4);
+    MP_OBJ_TYPE_SET_SLOT(o, attr, mp_obj_instance_attr, 5);
+    MP_OBJ_TYPE_SET_SLOT(o, subscr, instance_subscr, 6);
+    MP_OBJ_TYPE_SET_SLOT(o, iter, mp_obj_instance_getiter, 7);
+    MP_OBJ_TYPE_SET_SLOT(o, buffer, instance_get_buffer, 8);
 
     mp_obj_dict_t *locals_ptr = MP_OBJ_TO_PTR(locals_dict);
-    MP_OBJ_TYPE_SET_SLOT(o, locals_dict, locals_ptr, 8);
+    MP_OBJ_TYPE_SET_SLOT(o, locals_dict, locals_ptr, 9);
 
     if (bases_len > 0) {
         if (bases_len >= 2) {
             #if MICROPY_MULTIPLE_INHERITANCE
-            MP_OBJ_TYPE_SET_SLOT(o, parent, MP_OBJ_TO_PTR(bases_tuple), 9);
+            MP_OBJ_TYPE_SET_SLOT(o, parent, MP_OBJ_TO_PTR(bases_tuple), 10);
             #else
             mp_raise_NotImplementedError(MP_ERROR_TEXT("multiple inheritance not supported"));
             #endif
         } else {
-            MP_OBJ_TYPE_SET_SLOT(o, parent, MP_OBJ_TO_PTR(bases_items[0]), 9);
+            MP_OBJ_TYPE_SET_SLOT(o, parent, MP_OBJ_TO_PTR(bases_items[0]), 10);
         }
 
         // Inherit protocol from a base class. This allows to define an
@@ -1199,7 +1199,7 @@ mp_obj_t mp_obj_new_type(qstr name, mp_obj_t bases_tuple, mp_obj_t locals_dict)
         // Python method calls, and any subclass inheriting from it will
         // support this feature.
         if (base_protocol) {
-            MP_OBJ_TYPE_SET_SLOT(o, protocol, base_protocol, 10);
+            MP_OBJ_TYPE_SET_SLOT(o, protocol, base_protocol, 11);
         }
     }
 
@@ -1292,7 +1292,7 @@ STATIC void super_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
 
     // Allow a call super().__init__() to reach any native base classes.
     if (attr == MP_QSTR___init__) {
-        lookup.slot_offset = offsetof(mp_obj_type_t, make_new);
+        lookup.slot_offset = MP_OBJ_TYPE_OFFSETOF_SLOT(make_new);
     }
 
     if (!MP_OBJ_TYPE_HAS_SLOT(type, parent)) {
@@ -1340,7 +1340,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_super,
     MP_QSTR_super,
     MP_TYPE_FLAG_NONE,
-    super_make_new,
+    make_new, super_make_new,
     print, super_print,
     attr, super_attr
     );
@@ -1463,12 +1463,12 @@ MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_staticmethod,
     MP_QSTR_staticmethod,
     MP_TYPE_FLAG_NONE,
-    static_class_method_make_new
+    make_new, static_class_method_make_new
     );
 
 MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_classmethod,
     MP_QSTR_classmethod,
     MP_TYPE_FLAG_NONE,
-    static_class_method_make_new
+    make_new, static_class_method_make_new
     );
diff --git a/py/objtype.h b/py/objtype.h
index 2c613b904580b..76a290760c83f 100644
--- a/py/objtype.h
+++ b/py/objtype.h
@@ -46,8 +46,8 @@ mp_obj_instance_t *mp_obj_new_instance(const mp_obj_type_t *cls, const mp_obj_ty
 bool mp_obj_instance_is_callable(mp_obj_t self_in);
 mp_obj_t mp_obj_instance_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const mp_obj_t *args);
 
-#define mp_obj_is_instance_type(type) ((type)->make_new == mp_obj_instance_make_new)
-#define mp_obj_is_native_type(type) ((type)->make_new != mp_obj_instance_make_new)
+#define mp_obj_is_instance_type(type) (MP_OBJ_TYPE_GET_SLOT_OR_NULL(type, make_new) == mp_obj_instance_make_new)
+#define mp_obj_is_native_type(type) (MP_OBJ_TYPE_GET_SLOT_OR_NULL(type, make_new) != mp_obj_instance_make_new)
 // this needs to be exposed for the above macros to work correctly
 mp_obj_t mp_obj_instance_make_new(const mp_obj_type_t *self_in, size_t n_args, size_t n_kw, const mp_obj_t *args);
 
diff --git a/py/objzip.c b/py/objzip.c
index 34d73465ef2bd..3c3138180a28f 100644
--- a/py/objzip.c
+++ b/py/objzip.c
@@ -70,6 +70,6 @@ MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_zip,
     MP_QSTR_zip,
     MP_TYPE_FLAG_ITER_IS_ITERNEXT,
-    zip_make_new,
+    make_new, zip_make_new,
     iter, zip_iternext
     );
diff --git a/py/profile.c b/py/profile.c
index 2b9531e245ac5..fd2d61caa9f87 100644
--- a/py/profile.c
+++ b/py/profile.c
@@ -176,7 +176,6 @@ MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_settrace_codeobj,
     MP_QSTR_code,
     MP_TYPE_FLAG_NONE,
-    MP_TYPE_NULL_MAKE_NEW,
     print, code_print,
     unary_op, mp_generic_unary_op,
     attr, code_attr
@@ -247,7 +246,6 @@ MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_frame,
     MP_QSTR_frame,
     MP_TYPE_FLAG_NONE,
-    MP_TYPE_NULL_MAKE_NEW,
     print, frame_print,
     unary_op, mp_generic_unary_op,
     attr, frame_attr
diff --git a/py/runtime.c b/py/runtime.c
index ec628bfe14b4a..da6c86d971546 100644
--- a/py/runtime.c
+++ b/py/runtime.c
@@ -1076,7 +1076,6 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     mp_type_checked_fun,
     MP_QSTR_function,
     MP_TYPE_FLAG_BINDS_SELF,
-    MP_TYPE_NULL_MAKE_NEW,
     call, checked_fun_call
     );
 
diff --git a/shared/runtime/mpirq.c b/shared/runtime/mpirq.c
index 889fa7a9a82ed..f9a85ebbd61bc 100644
--- a/shared/runtime/mpirq.c
+++ b/shared/runtime/mpirq.c
@@ -129,7 +129,6 @@ MP_DEFINE_CONST_OBJ_TYPE(
     mp_irq_type,
     MP_QSTR_irq,
     MP_TYPE_FLAG_NONE,
-    MP_TYPE_NULL_MAKE_NEW,
     call, mp_irq_call,
     locals_dict, &mp_irq_locals_dict
     );
diff --git a/shared/runtime/sys_stdio_mphal.c b/shared/runtime/sys_stdio_mphal.c
index 325f93dde1d89..ab5bdd34e73c1 100644
--- a/shared/runtime/sys_stdio_mphal.c
+++ b/shared/runtime/sys_stdio_mphal.c
@@ -127,7 +127,6 @@ MP_DEFINE_CONST_OBJ_TYPE(
     stdio_obj_type,
     MP_QSTR_FileIO,
     MP_TYPE_FLAG_ITER_IS_STREAM,
-    MP_TYPE_NULL_MAKE_NEW,
     print, stdio_obj_print,
     protocol, &stdio_obj_stream_p,
     locals_dict, &stdio_locals_dict
@@ -161,7 +160,6 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     stdio_buffer_obj_type,
     MP_QSTR_FileIO,
     MP_TYPE_FLAG_ITER_IS_STREAM,
-    MP_TYPE_NULL_MAKE_NEW,
     print, stdio_obj_print,
     protocol, &stdio_buffer_obj_stream_p,
     locals_dict, &stdio_locals_dict

From b41aaaa8a918a6645ebc6bfa4483bd17286f9263 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Sat, 17 Sep 2022 22:22:32 +1000
Subject: [PATCH 2628/3533] py/obj: Optimise code size and performance for
 make_new as a slot.

The check for make_new (i.e. used to determine something's type) is now
more complicated due to the slot access.  This commit changes the inlining
of a few frequently-used helpers to overall improve code size and
performance.
---
 py/obj.h       |  6 ++++--
 py/objdict.c   |  4 ++++
 py/objexcept.c |  4 ++++
 py/objstr.c    | 20 ++++++++++++--------
 py/objtype.c   |  5 +++--
 py/objtype.h   |  6 ++----
 6 files changed, 29 insertions(+), 16 deletions(-)

diff --git a/py/obj.h b/py/obj.h
index 34adfbd0f0427..8aa5b0a8e667b 100644
--- a/py/obj.h
+++ b/py/obj.h
@@ -521,6 +521,7 @@ typedef mp_obj_t (*mp_fun_kw_t)(size_t n, const mp_obj_t *, mp_map_t *);
 //   mp_getiter_iternext_custom_t struct instance (with both .getiter and .iternext set).
 // If MP_TYPE_FLAG_ITER_IS_STREAM is set then the type implicitly gets a "return self"
 //   getiter, and mp_stream_unbuffered_iter for iternext.
+// If MP_TYPE_FLAG_INSTANCE_TYPE is set then this is an instance type (i.e. defined in Python).
 #define MP_TYPE_FLAG_NONE (0x0000)
 #define MP_TYPE_FLAG_IS_SUBCLASSED (0x0001)
 #define MP_TYPE_FLAG_HAS_SPECIAL_ACCESSORS (0x0002)
@@ -533,6 +534,7 @@ typedef mp_obj_t (*mp_fun_kw_t)(size_t n, const mp_obj_t *, mp_map_t *);
 #define MP_TYPE_FLAG_ITER_IS_ITERNEXT (0x0080)
 #define MP_TYPE_FLAG_ITER_IS_CUSTOM (0x0100)
 #define MP_TYPE_FLAG_ITER_IS_STREAM (MP_TYPE_FLAG_ITER_IS_ITERNEXT | MP_TYPE_FLAG_ITER_IS_CUSTOM)
+#define MP_TYPE_FLAG_INSTANCE_TYPE (0x0200)
 
 typedef enum {
     PRINT_STR = 0,
@@ -914,7 +916,7 @@ void *mp_obj_malloc_helper(size_t num_bytes, const mp_obj_type_t *type);
 #define mp_obj_is_int(o) (mp_obj_is_small_int(o) || mp_obj_is_exact_type(o, &mp_type_int))
 #define mp_obj_is_str(o) (mp_obj_is_qstr(o) || mp_obj_is_exact_type(o, &mp_type_str))
 #define mp_obj_is_str_or_bytes(o) (mp_obj_is_qstr(o) || (mp_obj_is_obj(o) && MP_OBJ_TYPE_GET_SLOT_OR_NULL(((mp_obj_base_t *)MP_OBJ_TO_PTR(o))->type, binary_op) == mp_obj_str_binary_op))
-#define mp_obj_is_dict_or_ordereddict(o) (mp_obj_is_obj(o) && MP_OBJ_TYPE_GET_SLOT_OR_NULL(((mp_obj_base_t *)MP_OBJ_TO_PTR(o))->type, make_new) == mp_obj_dict_make_new)
+bool mp_obj_is_dict_or_ordereddict(mp_obj_t o);
 #define mp_obj_is_fun(o) (mp_obj_is_obj(o) && (((mp_obj_base_t *)MP_OBJ_TO_PTR(o))->type->name == MP_QSTR_function))
 
 mp_obj_t mp_obj_new_type(qstr name, mp_obj_t bases_tuple, mp_obj_t locals_dict);
@@ -1030,7 +1032,7 @@ mp_int_t mp_obj_int_get_checked(mp_const_obj_t self_in);
 mp_uint_t mp_obj_int_get_uint_checked(mp_const_obj_t self_in);
 
 // exception
-#define mp_obj_is_native_exception_instance(o) (MP_OBJ_TYPE_GET_SLOT_OR_NULL(mp_obj_get_type(o), make_new) == mp_obj_exception_make_new)
+bool mp_obj_is_native_exception_instance(mp_obj_t self_in);
 bool mp_obj_is_exception_type(mp_obj_t self_in);
 bool mp_obj_is_exception_instance(mp_obj_t self_in);
 bool mp_obj_exception_match(mp_obj_t exc, mp_const_obj_t exc_type);
diff --git a/py/objdict.c b/py/objdict.c
index 68c33961c70c0..7fad5fc8f4ebb 100644
--- a/py/objdict.c
+++ b/py/objdict.c
@@ -33,6 +33,10 @@
 #include "py/objtype.h"
 #include "py/objstr.h"
 
+bool mp_obj_is_dict_or_ordereddict(mp_obj_t o) {
+    return mp_obj_is_obj(o) && MP_OBJ_TYPE_GET_SLOT_OR_NULL(((mp_obj_base_t *)MP_OBJ_TO_PTR(o))->type, make_new) == mp_obj_dict_make_new;
+}
+
 const mp_obj_dict_t mp_const_empty_dict_obj = {
     .base = { .type = &mp_type_dict },
     .map = {
diff --git a/py/objexcept.c b/py/objexcept.c
index 3b76ae62ccc69..515cbe7425b03 100644
--- a/py/objexcept.c
+++ b/py/objexcept.c
@@ -111,6 +111,10 @@ mp_obj_t mp_alloc_emergency_exception_buf(mp_obj_t size_in) {
 #endif
 #endif  // MICROPY_ENABLE_EMERGENCY_EXCEPTION_BUF
 
+bool mp_obj_is_native_exception_instance(mp_obj_t self_in) {
+    return MP_OBJ_TYPE_GET_SLOT_OR_NULL(mp_obj_get_type(self_in), make_new) == mp_obj_exception_make_new;
+}
+
 STATIC mp_obj_exception_t *get_native_exception(mp_obj_t self_in) {
     assert(mp_obj_is_exception_instance(self_in));
     if (mp_obj_is_native_exception_instance(self_in)) {
diff --git a/py/objstr.c b/py/objstr.c
index 50ab0018ed6e6..62d7bfb4cc396 100644
--- a/py/objstr.c
+++ b/py/objstr.c
@@ -63,6 +63,10 @@ STATIC void str_check_arg_type(const mp_obj_type_t *self_type, const mp_obj_t ar
     }
 }
 
+STATIC void check_is_str_or_bytes(mp_obj_t self_in) {
+    mp_check_self(mp_obj_is_str_or_bytes(self_in));
+}
+
 /******************************************************************************/
 /* str                                                                        */
 
@@ -468,7 +472,7 @@ STATIC mp_obj_t bytes_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) {
 }
 
 STATIC mp_obj_t str_join(mp_obj_t self_in, mp_obj_t arg) {
-    mp_check_self(mp_obj_is_str_or_bytes(self_in));
+    check_is_str_or_bytes(self_in);
     const mp_obj_type_t *self_type = mp_obj_get_type(self_in);
     const mp_obj_type_t *ret_type = self_type;
 
@@ -724,7 +728,7 @@ MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_rsplit_obj, 1, 3, str_rsplit);
 
 STATIC mp_obj_t str_finder(size_t n_args, const mp_obj_t *args, int direction, bool is_index) {
     const mp_obj_type_t *self_type = mp_obj_get_type(args[0]);
-    mp_check_self(mp_obj_is_str_or_bytes(args[0]));
+    check_is_str_or_bytes(args[0]);
 
     // check argument type
     str_check_arg_type(self_type, args[1]);
@@ -820,7 +824,7 @@ MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_endswith_obj, 2, 3, str_endswith);
 enum { LSTRIP, RSTRIP, STRIP };
 
 STATIC mp_obj_t str_uni_strip(int type, size_t n_args, const mp_obj_t *args) {
-    mp_check_self(mp_obj_is_str_or_bytes(args[0]));
+    check_is_str_or_bytes(args[0]);
     const mp_obj_type_t *self_type = mp_obj_get_type(args[0]);
 
     const byte *chars_to_del;
@@ -1422,7 +1426,7 @@ STATIC vstr_t mp_obj_str_format_helper(const char *str, const char *top, int *ar
 }
 
 mp_obj_t mp_obj_str_format(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs) {
-    mp_check_self(mp_obj_is_str_or_bytes(args[0]));
+    check_is_str_or_bytes(args[0]);
 
     GET_STR_DATA_LEN(args[0], str, len);
     int arg_i = 0;
@@ -1433,7 +1437,7 @@ MP_DEFINE_CONST_FUN_OBJ_KW(str_format_obj, 1, mp_obj_str_format);
 
 #if MICROPY_PY_BUILTINS_STR_OP_MODULO
 STATIC mp_obj_t str_modulo_format(mp_obj_t pattern, size_t n_args, const mp_obj_t *args, mp_obj_t dict) {
-    mp_check_self(mp_obj_is_str_or_bytes(pattern));
+    check_is_str_or_bytes(pattern);
 
     GET_STR_DATA_LEN(pattern, str, len);
     #if MICROPY_ERROR_REPORTING > MICROPY_ERROR_REPORTING_TERSE
@@ -1639,7 +1643,7 @@ STATIC mp_obj_t str_modulo_format(mp_obj_t pattern, size_t n_args, const mp_obj_
 // The implementation is optimized, returning the original string if there's
 // nothing to replace.
 STATIC mp_obj_t str_replace(size_t n_args, const mp_obj_t *args) {
-    mp_check_self(mp_obj_is_str_or_bytes(args[0]));
+    check_is_str_or_bytes(args[0]);
 
     mp_int_t max_rep = -1;
     if (n_args == 4) {
@@ -1742,7 +1746,7 @@ MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_replace_obj, 3, 4, str_replace);
 #if MICROPY_PY_BUILTINS_STR_COUNT
 STATIC mp_obj_t str_count(size_t n_args, const mp_obj_t *args) {
     const mp_obj_type_t *self_type = mp_obj_get_type(args[0]);
-    mp_check_self(mp_obj_is_str_or_bytes(args[0]));
+    check_is_str_or_bytes(args[0]);
 
     // check argument type
     str_check_arg_type(self_type, args[1]);
@@ -1782,7 +1786,7 @@ MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_count_obj, 2, 4, str_count);
 
 #if MICROPY_PY_BUILTINS_STR_PARTITION
 STATIC mp_obj_t str_partitioner(mp_obj_t self_in, mp_obj_t arg, int direction) {
-    mp_check_self(mp_obj_is_str_or_bytes(self_in));
+    check_is_str_or_bytes(self_in);
     const mp_obj_type_t *self_type = mp_obj_get_type(self_in);
     str_check_arg_type(self_type, arg);
 
diff --git a/py/objtype.c b/py/objtype.c
index db364e0e5a5de..909fc833931f6 100644
--- a/py/objtype.c
+++ b/py/objtype.c
@@ -277,7 +277,7 @@ STATIC void instance_print(const mp_print_t *print, mp_obj_t self_in, mp_print_k
     mp_printf(print, "<%s object at %p>", mp_obj_get_type_str(self_in), self);
 }
 
-mp_obj_t mp_obj_instance_make_new(const mp_obj_type_t *self, size_t n_args, size_t n_kw, const mp_obj_t *args) {
+STATIC mp_obj_t mp_obj_instance_make_new(const mp_obj_type_t *self, size_t n_args, size_t n_kw, const mp_obj_t *args) {
     assert(mp_obj_is_instance_type(self));
 
     // look for __new__ function
@@ -1131,7 +1131,8 @@ mp_obj_t mp_obj_new_type(qstr name, mp_obj_t bases_tuple, mp_obj_t locals_dict)
     uint16_t base_flags = MP_TYPE_FLAG_EQ_NOT_REFLEXIVE
         | MP_TYPE_FLAG_EQ_CHECKS_OTHER_TYPE
         | MP_TYPE_FLAG_EQ_HAS_NEQ_TEST
-        | MP_TYPE_FLAG_ITER_IS_GETITER;
+        | MP_TYPE_FLAG_ITER_IS_GETITER
+        | MP_TYPE_FLAG_INSTANCE_TYPE;
     size_t bases_len;
     mp_obj_t *bases_items;
     mp_obj_tuple_get(bases_tuple, &bases_len, &bases_items);
diff --git a/py/objtype.h b/py/objtype.h
index 76a290760c83f..839cc6d146bb1 100644
--- a/py/objtype.h
+++ b/py/objtype.h
@@ -46,10 +46,8 @@ mp_obj_instance_t *mp_obj_new_instance(const mp_obj_type_t *cls, const mp_obj_ty
 bool mp_obj_instance_is_callable(mp_obj_t self_in);
 mp_obj_t mp_obj_instance_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const mp_obj_t *args);
 
-#define mp_obj_is_instance_type(type) (MP_OBJ_TYPE_GET_SLOT_OR_NULL(type, make_new) == mp_obj_instance_make_new)
-#define mp_obj_is_native_type(type) (MP_OBJ_TYPE_GET_SLOT_OR_NULL(type, make_new) != mp_obj_instance_make_new)
-// this needs to be exposed for the above macros to work correctly
-mp_obj_t mp_obj_instance_make_new(const mp_obj_type_t *self_in, size_t n_args, size_t n_kw, const mp_obj_t *args);
+#define mp_obj_is_instance_type(type) ((type)->flags & MP_TYPE_FLAG_INSTANCE_TYPE)
+#define mp_obj_is_native_type(type) (!((type)->flags & MP_TYPE_FLAG_INSTANCE_TYPE))
 
 // this needs to be exposed for mp_getiter
 mp_obj_t mp_obj_instance_getiter(mp_obj_t self_in, mp_obj_iter_buf_t *iter_buf);

From d94141e1473aebae0d3c63aeaa8397651ad6fa01 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Sat, 17 Sep 2022 23:57:12 +1000
Subject: [PATCH 2629/3533] py/persistentcode: Introduce .mpy sub-version.

The intent is to allow us to make breaking changes to the native ABI (e.g.
changes to dynruntime.h) without needing the bytecode version to increment.

With this commit the two bits previously used for the feature flags (but
now unused as of .mpy version 6) encode a sub-version.  A bytecode-only
.mpy file can be loaded as long as MPY_VERSION matches, but a native .mpy
(i.e. one with an arch set) must also match MPY_SUB_VERSION.  This allows 3
additional updates to the native ABI per bytecode revision.

The sub-version is set to 1 because the previous commits that changed the
layout of mp_obj_type_t have changed the native ABI.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
Signed-off-by: Damien George <damien@micropython.org>
---
 docs/reference/mpyfiles.rst               |  6 ++++++
 mpy-cross/main.c                          |  2 +-
 py/persistentcode.c                       |  6 +++---
 py/persistentcode.h                       | 23 +++++++++++------------
 tests/micropython/import_mpy_native.py    |  7 ++++---
 tests/micropython/import_mpy_native_gc.py | 12 +++++++-----
 tools/mpy-tool.py                         | 10 ++++++++--
 tools/mpy_ld.py                           |  7 ++++++-
 8 files changed, 46 insertions(+), 27 deletions(-)

diff --git a/docs/reference/mpyfiles.rst b/docs/reference/mpyfiles.rst
index fcb49965652f4..d93a86383e98c 100644
--- a/docs/reference/mpyfiles.rst
+++ b/docs/reference/mpyfiles.rst
@@ -27,6 +27,11 @@ Compatibility is based on the following:
 * Version of the .mpy file: the version of the file must match the version
   supported by the system loading it.
 
+* Sub-version of the .mpy file: if the .mpy file contains native machine code
+  then the sub-version of the file must match the version support by the
+  system loading it.  Otherwise, if there is no native machine code in the .mpy
+  file, then the sub-version is ignored when loading.
+
 * Small integer bits: the .mpy file will require a minimum number of bits in
   a small integer and the system loading it must support at least this many
   bits.
@@ -55,6 +60,7 @@ If importing an .mpy file fails then try the following:
         'armv6', 'armv6m', 'armv7m', 'armv7em', 'armv7emsp', 'armv7emdp',
         'xtensa', 'xtensawin'][sys_mpy >> 10]
     print('mpy version:', sys_mpy & 0xff)
+    print('mpy sub-version:', sys_mpy >> 8 & 3)
     print('mpy flags:', end='')
     if arch:
         print(' -march=' + arch, end='')
diff --git a/mpy-cross/main.c b/mpy-cross/main.c
index f3ffff61fdf80..4975c8ddb2052 100644
--- a/mpy-cross/main.c
+++ b/mpy-cross/main.c
@@ -228,7 +228,7 @@ MP_NOINLINE int main_(int argc, char **argv) {
                 a += 1;
             } else if (strcmp(argv[a], "--version") == 0) {
                 printf("MicroPython " MICROPY_GIT_TAG " on " MICROPY_BUILD_DATE
-                    "; mpy-cross emitting mpy v" MP_STRINGIFY(MPY_VERSION) "\n");
+                    "; mpy-cross emitting mpy v" MP_STRINGIFY(MPY_VERSION) "." MP_STRINGIFY(MPY_SUB_VERSION) "\n");
                 return 0;
             } else if (strcmp(argv[a], "-v") == 0) {
                 mp_verbose_flag++;
diff --git a/py/persistentcode.c b/py/persistentcode.c
index 1b1741f2614e2..de84c17359e3c 100644
--- a/py/persistentcode.c
+++ b/py/persistentcode.c
@@ -393,14 +393,14 @@ STATIC mp_raw_code_t *load_raw_code(mp_reader_t *reader, mp_module_context_t *co
 mp_compiled_module_t mp_raw_code_load(mp_reader_t *reader, mp_module_context_t *context) {
     byte header[4];
     read_bytes(reader, header, sizeof(header));
+    byte arch = MPY_FEATURE_DECODE_ARCH(header[2]);
     if (header[0] != 'M'
         || header[1] != MPY_VERSION
-        || MPY_FEATURE_DECODE_FLAGS(header[2]) != MPY_FEATURE_FLAGS
+        || (arch != MP_NATIVE_ARCH_NONE && MPY_FEATURE_DECODE_SUB_VERSION(header[2]) != MPY_SUB_VERSION)
         || header[3] > MP_SMALL_INT_BITS) {
         mp_raise_ValueError(MP_ERROR_TEXT("incompatible .mpy file"));
     }
     if (MPY_FEATURE_DECODE_ARCH(header[2]) != MP_NATIVE_ARCH_NONE) {
-        byte arch = MPY_FEATURE_DECODE_ARCH(header[2]);
         if (!MPY_FEATURE_ARCH_TEST(arch)) {
             if (MPY_FEATURE_ARCH_TEST(MP_NATIVE_ARCH_NONE)) {
                 // On supported ports this can be resolved by enabling feature, eg
@@ -596,7 +596,7 @@ void mp_raw_code_save(mp_compiled_module_t *cm, mp_print_t *print) {
     byte header[4] = {
         'M',
         MPY_VERSION,
-        MPY_FEATURE_ENCODE_FLAGS(MPY_FEATURE_FLAGS_DYNAMIC),
+        MPY_FEATURE_ENCODE_SUB_VERSION(MPY_SUB_VERSION),
         #if MICROPY_DYNAMIC_COMPILER
         mp_dynamic_compiler.small_int_bits,
         #else
diff --git a/py/persistentcode.h b/py/persistentcode.h
index 29ccce4a3d968..e664358737613 100644
--- a/py/persistentcode.h
+++ b/py/persistentcode.h
@@ -30,24 +30,23 @@
 #include "py/reader.h"
 #include "py/emitglue.h"
 
-// The current version of .mpy files
+// The current version of .mpy files. A bytecode-only .mpy file can be loaded
+// as long as MPY_VERSION matches, but a native .mpy (i.e. one with an arch
+// set) must also match MPY_SUB_VERSION. This allows 3 additional updates to
+// the native ABI per bytecode revision.
 #define MPY_VERSION 6
+#define MPY_SUB_VERSION 1
 
-// Macros to encode/decode flags to/from the feature byte
-#define MPY_FEATURE_ENCODE_FLAGS(flags) (flags)
-#define MPY_FEATURE_DECODE_FLAGS(feat) ((feat) & 3)
+// Macros to encode/decode sub-version to/from the feature byte. This replaces
+// the bits previously used to encode the flags (map caching and unicode)
+// which are no longer used starting at .mpy version 6.
+#define MPY_FEATURE_ENCODE_SUB_VERSION(version) (version)
+#define MPY_FEATURE_DECODE_SUB_VERSION(feat) ((feat) & 3)
 
 // Macros to encode/decode native architecture to/from the feature byte
 #define MPY_FEATURE_ENCODE_ARCH(arch) ((arch) << 2)
 #define MPY_FEATURE_DECODE_ARCH(feat) ((feat) >> 2)
 
-// The feature flag bits encode the compile-time config options that affect
-// the generate bytecode. Note: no longer used.
-// (formerly MICROPY_OPT_CACHE_MAP_LOOKUP_IN_BYTECODE and MICROPY_PY_BUILTINS_STR_UNICODE).
-#define MPY_FEATURE_FLAGS (0)
-// This is a version of the flags that can be configured at runtime.
-#define MPY_FEATURE_FLAGS_DYNAMIC (0)
-
 // Define the host architecture
 #if MICROPY_EMIT_X86
     #define MPY_FEATURE_ARCH (MP_NATIVE_ARCH_X86)
@@ -82,7 +81,7 @@
 
 // 16-bit little-endian integer with the second and third bytes of supported .mpy files
 #define MPY_FILE_HEADER_INT (MPY_VERSION \
-    | (MPY_FEATURE_ENCODE_FLAGS(MPY_FEATURE_FLAGS) | MPY_FEATURE_ENCODE_ARCH(MPY_FEATURE_ARCH)) << 8)
+    | (MPY_FEATURE_ENCODE_SUB_VERSION(MPY_SUB_VERSION) | MPY_FEATURE_ENCODE_ARCH(MPY_FEATURE_ARCH)) << 8)
 
 enum {
     MP_NATIVE_ARCH_NONE = 0,
diff --git a/tests/micropython/import_mpy_native.py b/tests/micropython/import_mpy_native.py
index 449371ddac06a..73e20694cc27e 100644
--- a/tests/micropython/import_mpy_native.py
+++ b/tests/micropython/import_mpy_native.py
@@ -11,7 +11,8 @@
     raise SystemExit
 
 mpy_arch = usys.implementation._mpy >> 8
-if mpy_arch == 0:
+if mpy_arch >> 2 == 0:
+    # This system does not support .mpy files containing native code
     print("SKIP")
     raise SystemExit
 
@@ -54,8 +55,8 @@ def open(self, path, mode):
 valid_header = bytes([77, 6, mpy_arch, 31])
 # fmt: off
 user_files = {
-    # bad architecture
-    '/mod0.mpy': b'M\x06\xfc\x1f',
+    # bad architecture (mpy_arch needed for sub-version)
+    '/mod0.mpy': bytes([77, 6, 0xfc | mpy_arch, 31]),
 
     # test loading of viper and asm
     '/mod1.mpy': valid_header + (
diff --git a/tests/micropython/import_mpy_native_gc.py b/tests/micropython/import_mpy_native_gc.py
index bc8dcafdc7637..e18720fb31473 100644
--- a/tests/micropython/import_mpy_native_gc.py
+++ b/tests/micropython/import_mpy_native_gc.py
@@ -46,24 +46,26 @@ def open(self, path, mode):
 
 
 # Pre-compiled examples/natmod/features0 example for various architectures, keyed
-# by the required value of sys.implementation._mpy.
+# by the required value of sys.implementation._mpy (without sub-version).
 features0_file_contents = {
     # -march=x64
-    0x806: b'M\x06\x08\x1f\x02\x004build/features0.native.mpy\x00\x12factorial\x00\x8a\x02\xe9/\x00\x00\x00SH\x8b\x1d\x83\x00\x00\x00\xbe\x02\x00\x00\x00\xffS\x18\xbf\x01\x00\x00\x00H\x85\xc0u\x0cH\x8bC \xbe\x02\x00\x00\x00[\xff\xe0H\x0f\xaf\xf8H\xff\xc8\xeb\xe6ATUSH\x8b\x1dQ\x00\x00\x00H\x8bG\x08L\x8bc(H\x8bx\x08A\xff\xd4H\x8d5+\x00\x00\x00H\x89\xc5H\x8b\x059\x00\x00\x00\x0f\xb7x\x02\xffShH\x89\xefA\xff\xd4H\x8b\x03[]A\\\xc3\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x05\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x10\x11$\r&\xa3 \x01"\xff',
+    0x806: b'M\x06\x09\x1f\x02\x004build/features0.native.mpy\x00\x12factorial\x00\x8a\x02\xe9/\x00\x00\x00SH\x8b\x1d\x83\x00\x00\x00\xbe\x02\x00\x00\x00\xffS\x18\xbf\x01\x00\x00\x00H\x85\xc0u\x0cH\x8bC \xbe\x02\x00\x00\x00[\xff\xe0H\x0f\xaf\xf8H\xff\xc8\xeb\xe6ATUSH\x8b\x1dQ\x00\x00\x00H\x8bG\x08L\x8bc(H\x8bx\x08A\xff\xd4H\x8d5+\x00\x00\x00H\x89\xc5H\x8b\x059\x00\x00\x00\x0f\xb7x\x02\xffShH\x89\xefA\xff\xd4H\x8b\x03[]A\\\xc3\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x05\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x10\x11$\r&\xa3 \x01"\xff',
     # -march=armv6m
-    0x1006: b"M\x06\x10\x1f\x02\x004build/features0.native.mpy\x00\x12factorial\x00\x88\x02\x18\xe0\x00\x00\x10\xb5\tK\tJ{D\x9cX\x02!\xe3h\x98G\x03\x00\x01 \x00+\x02\xd0XC\x01;\xfa\xe7\x02!#i\x98G\x10\xbd\xc0Fj\x00\x00\x00\x00\x00\x00\x00\xf8\xb5\nN\nK~D\xf4XChgiXh\xb8G\x05\x00\x07K\x08I\xf3XyDX\x88ck\x98G(\x00\xb8G h\xf8\xbd\xc0F:\x00\x00\x00\x00\x00\x00\x00\x04\x00\x00\x00\x1e\x00\x00\x00\x00\x00\x00\x00\x05\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x10\x11<\r>\xa38\x01:\xff",
+    0x1006: b"M\x06\x11\x1f\x02\x004build/features0.native.mpy\x00\x12factorial\x00\x88\x02\x18\xe0\x00\x00\x10\xb5\tK\tJ{D\x9cX\x02!\xe3h\x98G\x03\x00\x01 \x00+\x02\xd0XC\x01;\xfa\xe7\x02!#i\x98G\x10\xbd\xc0Fj\x00\x00\x00\x00\x00\x00\x00\xf8\xb5\nN\nK~D\xf4XChgiXh\xb8G\x05\x00\x07K\x08I\xf3XyDX\x88ck\x98G(\x00\xb8G h\xf8\xbd\xc0F:\x00\x00\x00\x00\x00\x00\x00\x04\x00\x00\x00\x1e\x00\x00\x00\x00\x00\x00\x00\x05\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x10\x11<\r>\xa38\x01:\xff",
 }
 
 # Populate armv7m-derived archs based on armv6m.
 for arch in (0x1406, 0x1806, 0x1C06, 0x2006):
     features0_file_contents[arch] = features0_file_contents[0x1006]
 
-if sys.implementation._mpy not in features0_file_contents:
+# Check that a .mpy exists for the target (ignore sub-version in lookup).
+sys_implementation_mpy = sys.implementation._mpy & ~(3 << 8)
+if sys_implementation_mpy not in features0_file_contents:
     print("SKIP")
     raise SystemExit
 
 # These are the test .mpy files.
-user_files = {"/features0.mpy": features0_file_contents[sys.implementation._mpy]}
+user_files = {"/features0.mpy": features0_file_contents[sys_implementation_mpy]}
 
 # Create and mount a user filesystem.
 uos.mount(UserFS(user_files), "/userfs")
diff --git a/tools/mpy-tool.py b/tools/mpy-tool.py
index 31212fd5bdda8..8b644c137f4c7 100755
--- a/tools/mpy-tool.py
+++ b/tools/mpy-tool.py
@@ -88,6 +88,7 @@ def __str__(self):
 
 class Config:
     MPY_VERSION = 6
+    MPY_SUB_VERSION = 1
     MICROPY_LONGINT_IMPL_NONE = 0
     MICROPY_LONGINT_IMPL_LONGLONG = 1
     MICROPY_LONGINT_IMPL_MPZ = 2
@@ -1335,6 +1336,9 @@ def read_mpy(filename):
         feature_byte = header[2]
         mpy_native_arch = feature_byte >> 2
         if mpy_native_arch != MP_NATIVE_ARCH_NONE:
+            mpy_sub_version = feature_byte & 3
+            if mpy_sub_version != config.MPY_SUB_VERSION:
+                raise MPYReadError(filename, "incompatible .mpy sub-version")
             if config.native_arch == MP_NATIVE_ARCH_NONE:
                 config.native_arch = mpy_native_arch
             elif config.native_arch != mpy_native_arch:
@@ -1658,7 +1662,9 @@ def merge_mpy(compiled_modules, output_file):
     else:
         main_cm_idx = None
         for idx, cm in enumerate(compiled_modules):
-            if cm.header[2]:
+            feature_byte = cm.header[2]
+            mpy_native_arch = feature_byte >> 2
+            if mpy_native_arch:
                 # Must use qstr_table and obj_table from this raw_code
                 if main_cm_idx is not None:
                     raise Exception("can't merge files when more than one contains native code")
@@ -1670,7 +1676,7 @@ def merge_mpy(compiled_modules, output_file):
         header = bytearray(4)
         header[0] = ord("M")
         header[1] = config.MPY_VERSION
-        header[2] = config.native_arch << 2
+        header[2] = config.native_arch << 2 | config.MPY_SUB_VERSION
         header[3] = config.mp_small_int_bits
         merged_mpy.extend(header)
 
diff --git a/tools/mpy_ld.py b/tools/mpy_ld.py
index 09ea90dcd1106..05e70709ad8a4 100755
--- a/tools/mpy_ld.py
+++ b/tools/mpy_ld.py
@@ -36,6 +36,7 @@
 
 # MicroPython constants
 MPY_VERSION = 6
+MPY_SUB_VERSION = 1
 MP_CODE_BYTECODE = 2
 MP_CODE_NATIVE_VIPER = 4
 MP_NATIVE_ARCH_X86 = 1
@@ -917,7 +918,11 @@ def build_mpy(env, entry_offset, fmpy, native_qstr_vals, native_qstr_objs):
     out.open(fmpy)
 
     # MPY: header
-    out.write_bytes(bytearray([ord("M"), MPY_VERSION, env.arch.mpy_feature, MP_SMALL_INT_BITS]))
+    out.write_bytes(
+        bytearray(
+            [ord("M"), MPY_VERSION, env.arch.mpy_feature | MPY_SUB_VERSION, MP_SMALL_INT_BITS]
+        )
+    )
 
     # MPY: n_qstr
     out.write_uint(1 + len(native_qstr_vals))

From 15d0615d5cad430930d160a8ca3e809d7b82da32 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Tue, 13 Sep 2022 14:16:58 +1000
Subject: [PATCH 2630/3533] py/objmodule: Add support for __dict__.

This matches class `__dict__`, and is similarly gated on
MICROPY_CPYTHON_COMPAT. Unlike class though, because modules's globals are
actually dict instances, the result is a mutable dictionary.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 py/objmodule.c              |  4 ++++
 tests/basics/module_dict.py | 13 +++++++++++++
 tests/import/module_dict.py | 17 +++++++++++++++++
 3 files changed, 34 insertions(+)
 create mode 100644 tests/basics/module_dict.py
 create mode 100644 tests/import/module_dict.py

diff --git a/py/objmodule.c b/py/objmodule.c
index d14a59b8632c4..63e9fa47571b0 100644
--- a/py/objmodule.c
+++ b/py/objmodule.c
@@ -89,6 +89,10 @@ STATIC void module_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
         mp_map_elem_t *elem = mp_map_lookup(&self->globals->map, MP_OBJ_NEW_QSTR(attr), MP_MAP_LOOKUP);
         if (elem != NULL) {
             dest[0] = elem->value;
+        #if MICROPY_CPYTHON_COMPAT
+        } else if (attr == MP_QSTR___dict__) {
+            dest[0] = MP_OBJ_FROM_PTR(self->globals);
+        #endif
         #if MICROPY_MODULE_GETATTR
         } else if (attr != MP_QSTR___getattr__) {
             elem = mp_map_lookup(&self->globals->map, MP_OBJ_NEW_QSTR(MP_QSTR___getattr__), MP_MAP_LOOKUP);
diff --git a/tests/basics/module_dict.py b/tests/basics/module_dict.py
new file mode 100644
index 0000000000000..c847294f08916
--- /dev/null
+++ b/tests/basics/module_dict.py
@@ -0,0 +1,13 @@
+# test __dict__ attribute of a built-in module
+# see import/module_dict.py for the equivalent test on user modules
+
+import sys
+
+if not hasattr(sys, "__dict__"):
+    print("SKIP")
+    raise SystemExit
+
+
+# dict of a built-in module (read-only)
+print(type(sys.__dict__))
+print(sys.__dict__["__name__"])
diff --git a/tests/import/module_dict.py b/tests/import/module_dict.py
new file mode 100644
index 0000000000000..431d80b3b43b5
--- /dev/null
+++ b/tests/import/module_dict.py
@@ -0,0 +1,17 @@
+# test __dict__ attribute of a user module
+
+import sys
+
+if not hasattr(sys, "__dict__"):
+    print("SKIP")
+    raise SystemExit
+
+
+import import1b
+
+# dict of a user module (read/write)
+print(import1b.var)
+print(import1b.__dict__["var"])
+import1b.__dict__["var"] = "hello"
+print(import1b.var)
+print(import1b.__dict__["var"])

From cc588ac3a91a16807242347e8b182d4bc8b7f139 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 19 Sep 2022 10:35:12 +1000
Subject: [PATCH 2631/3533] py/runtime: Add mp_raise_OSError_with_filename
 helper function.

Useful when more detail is needed for an OSError associated with a file.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/runtime.c | 9 +++++++++
 py/runtime.h | 1 +
 2 files changed, 10 insertions(+)

diff --git a/py/runtime.c b/py/runtime.c
index da6c86d971546..23fae6041dd0f 100644
--- a/py/runtime.c
+++ b/py/runtime.c
@@ -1692,6 +1692,15 @@ NORETURN void mp_raise_OSError(int errno_) {
     mp_raise_type_arg(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(errno_));
 }
 
+NORETURN void mp_raise_OSError_with_filename(int errno_, const char *filename) {
+    vstr_t vstr;
+    vstr_init(&vstr, 32);
+    vstr_printf(&vstr, "can't open %s", filename);
+    mp_obj_t o_str = mp_obj_new_str_from_vstr(&vstr);
+    mp_obj_t args[2] = { MP_OBJ_NEW_SMALL_INT(errno_), MP_OBJ_FROM_PTR(o_str)};
+    nlr_raise(mp_obj_exception_make_new(&mp_type_OSError, 2, 0, args));
+}
+
 #if MICROPY_STACK_CHECK || MICROPY_ENABLE_PYSTACK
 NORETURN void mp_raise_recursion_depth(void) {
     mp_raise_type_arg(&mp_type_RuntimeError, MP_OBJ_NEW_QSTR(MP_QSTR_maximum_space_recursion_space_depth_space_exceeded));
diff --git a/py/runtime.h b/py/runtime.h
index 779b66f2bd25c..36b3caa6c73e6 100644
--- a/py/runtime.h
+++ b/py/runtime.h
@@ -196,6 +196,7 @@ NORETURN void mp_raise_NotImplementedError(mp_rom_error_text_t msg);
 NORETURN void mp_raise_type_arg(const mp_obj_type_t *exc_type, mp_obj_t arg);
 NORETURN void mp_raise_StopIteration(mp_obj_t arg);
 NORETURN void mp_raise_OSError(int errno_);
+NORETURN void mp_raise_OSError_with_filename(int errno_, const char *filename);
 NORETURN void mp_raise_recursion_depth(void);
 
 #if MICROPY_BUILTIN_METHOD_CHECK_SELF_ARG

From fb77be150636090d69460578ed8458d84db02614 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 19 Sep 2022 10:36:17 +1000
Subject: [PATCH 2632/3533] py: Include filename in errors from loading/saving
 files via "open".

This improves error messages in mpy-cross:
- When loading a .py file that doesn't exist (or can't be opened) it now
  includes the filename in the OSError.
- When saving a .mpy file that can't be opened it now raises an exception
  (prior, it would silently fail), and includes the filename in the
  OSError.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/persistentcode.c | 3 +++
 py/reader.c         | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/py/persistentcode.c b/py/persistentcode.c
index de84c17359e3c..67c8f327f002c 100644
--- a/py/persistentcode.c
+++ b/py/persistentcode.c
@@ -644,6 +644,9 @@ void mp_raw_code_save_file(mp_compiled_module_t *cm, const char *filename) {
     MP_THREAD_GIL_EXIT();
     int fd = open(filename, O_WRONLY | O_CREAT | O_TRUNC, 0644);
     MP_THREAD_GIL_ENTER();
+    if (fd < 0) {
+        mp_raise_OSError_with_filename(errno, filename);
+    }
     mp_print_t fd_print = {(void *)(intptr_t)fd, fd_print_strn};
     mp_raw_code_save(cm, &fd_print);
     MP_THREAD_GIL_EXIT();
diff --git a/py/reader.c b/py/reader.c
index d68406b1c68b3..57b12b3b655ca 100644
--- a/py/reader.c
+++ b/py/reader.c
@@ -139,7 +139,7 @@ void mp_reader_new_file(mp_reader_t *reader, const char *filename) {
     int fd = open(filename, O_RDONLY, 0644);
     MP_THREAD_GIL_ENTER();
     if (fd < 0) {
-        mp_raise_OSError(errno);
+        mp_raise_OSError_with_filename(errno, filename);
     }
     mp_reader_new_file_from_fd(reader, fd, true);
 }

From 9ae8d3820474a9525d707b1e19f7703721aec1c8 Mon Sep 17 00:00:00 2001
From: stijn <stijn@ignitron.net>
Date: Mon, 12 Sep 2022 14:45:39 +0200
Subject: [PATCH 2633/3533] extmod/vfs_posix_file: Implement finaliser for
 files.

Prevent handle leaks when file objects aren't closed explicitly and
fix some MICROPY_CPYTHON_COMPAT issues: this wasn't properly adhered
to because #ifdef was used so it was always on, and closing files
multiple times should be avoided unconditionally.
---
 extmod/vfs_posix_file.c       | 15 ++++++++-------
 tests/extmod/vfs_posix.py     | 29 +++++++++++++++++++++++++++++
 tests/extmod/vfs_posix.py.exp |  1 +
 3 files changed, 38 insertions(+), 7 deletions(-)

diff --git a/extmod/vfs_posix_file.c b/extmod/vfs_posix_file.c
index 4a37489686cd9..ea19de7fd04af 100644
--- a/extmod/vfs_posix_file.c
+++ b/extmod/vfs_posix_file.c
@@ -46,7 +46,7 @@ typedef struct _mp_obj_vfs_posix_file_t {
     int fd;
 } mp_obj_vfs_posix_file_t;
 
-#ifdef MICROPY_CPYTHON_COMPAT
+#if MICROPY_CPYTHON_COMPAT
 STATIC void check_fd_is_open(const mp_obj_vfs_posix_file_t *o) {
     if (o->fd < 0) {
         mp_raise_ValueError(MP_ERROR_TEXT("I/O operation on closed file"));
@@ -63,7 +63,7 @@ STATIC void vfs_posix_file_print(const mp_print_t *print, mp_obj_t self_in, mp_p
 }
 
 mp_obj_t mp_vfs_posix_file_open(const mp_obj_type_t *type, mp_obj_t file_in, mp_obj_t mode_in) {
-    mp_obj_vfs_posix_file_t *o = m_new_obj(mp_obj_vfs_posix_file_t);
+    mp_obj_vfs_posix_file_t *o = m_new_obj_with_finaliser(mp_obj_vfs_posix_file_t);
     const char *mode_s = mp_obj_str_get_str(mode_in);
 
     int mode_rw = 0, mode_x = 0;
@@ -185,12 +185,12 @@ STATIC mp_uint_t vfs_posix_file_ioctl(mp_obj_t o_in, mp_uint_t request, uintptr_
             return 0;
         }
         case MP_STREAM_CLOSE:
-            MP_THREAD_GIL_EXIT();
-            close(o->fd);
-            MP_THREAD_GIL_ENTER();
-            #ifdef MICROPY_CPYTHON_COMPAT
+            if (o->fd >= 0) {
+                MP_THREAD_GIL_EXIT();
+                close(o->fd);
+                MP_THREAD_GIL_ENTER();
+            }
             o->fd = -1;
-            #endif
             return 0;
         case MP_STREAM_GET_FILENO:
             return o->fd;
@@ -237,6 +237,7 @@ STATIC const mp_rom_map_elem_t vfs_posix_rawfile_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_tell), MP_ROM_PTR(&mp_stream_tell_obj) },
     { MP_ROM_QSTR(MP_QSTR_flush), MP_ROM_PTR(&mp_stream_flush_obj) },
     { MP_ROM_QSTR(MP_QSTR_close), MP_ROM_PTR(&mp_stream_close_obj) },
+    { MP_ROM_QSTR(MP_QSTR___del__), MP_ROM_PTR(&mp_stream_close_obj) },
     { MP_ROM_QSTR(MP_QSTR___enter__), MP_ROM_PTR(&mp_identity_obj) },
     { MP_ROM_QSTR(MP_QSTR___exit__), MP_ROM_PTR(&vfs_posix_file___exit___obj) },
 };
diff --git a/tests/extmod/vfs_posix.py b/tests/extmod/vfs_posix.py
index d193236696ea1..3c23140065af8 100644
--- a/tests/extmod/vfs_posix.py
+++ b/tests/extmod/vfs_posix.py
@@ -1,6 +1,7 @@
 # Test for VfsPosix
 
 try:
+    import gc
     import uos
 
     uos.VfsPosix
@@ -51,6 +52,34 @@
 print(f.read())
 f.close()
 
+# file finaliser, also see vfs_fat_finaliser.py
+names = [temp_dir + "/x%d" % i for i in range(4)]
+basefd = temp_dir + "/nextfd1"
+nextfd = temp_dir + "/nextfd2"
+
+with open(basefd, "w") as f:
+    base_file_no = f.fileno()
+
+for i in range(1024):  # move GC head forwards by allocating a lot of single blocks
+    []
+
+
+def write_files_without_closing():
+    for n in names:
+        open(n, "w").write(n)
+    sorted(list(range(128)), key=lambda x: x)  # use up Python and C stack so f is really gone
+
+
+write_files_without_closing()
+gc.collect()
+
+with open(nextfd, "w") as f:
+    next_file_no = f.fileno()
+    print("next_file_no <= base_file_no", next_file_no <= base_file_no)
+
+for n in names + [basefd, nextfd]:
+    uos.remove(n)
+
 # rename
 uos.rename(temp_dir + "/test", temp_dir + "/test2")
 print(uos.listdir(temp_dir))
diff --git a/tests/extmod/vfs_posix.py.exp b/tests/extmod/vfs_posix.py.exp
index eb9ab43106e1d..99922e621d4c2 100644
--- a/tests/extmod/vfs_posix.py.exp
+++ b/tests/extmod/vfs_posix.py.exp
@@ -4,6 +4,7 @@ True
 <class 'list'>
 <io.TextIOWrapper 2>
 hello
+next_file_no <= base_file_no True
 ['test2']
 ['test2']
 <class 'tuple'>

From 6ecdf1a240e43bd60c824c7efd575c0a82d02d7e Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Mon, 19 Sep 2022 12:03:38 +1000
Subject: [PATCH 2634/3533] tests/frozen: Move frozentest.mpy from ports/ to
 tests/.

frozentest.mpy was previously duplicated in ports/minimal and
ports/powerpc.

This needs to be re-generated on every .mpy version increase, so might as
well just have a single copy of it.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/minimal/Makefile                         |   2 +-
 ports/powerpc/Makefile                         |   2 +-
 ports/powerpc/frozentest.mpy                   | Bin 196 -> 0 bytes
 ports/powerpc/frozentest.py                    |   7 -------
 tests/frozen/README.md                         |   2 ++
 {ports/minimal => tests/frozen}/frozentest.mpy | Bin
 {ports/minimal => tests/frozen}/frozentest.py  |   0
 tools/ci.sh                                    |   4 ++--
 8 files changed, 6 insertions(+), 11 deletions(-)
 delete mode 100644 ports/powerpc/frozentest.mpy
 delete mode 100644 ports/powerpc/frozentest.py
 create mode 100644 tests/frozen/README.md
 rename {ports/minimal => tests/frozen}/frozentest.mpy (100%)
 rename {ports/minimal => tests/frozen}/frozentest.py (100%)

diff --git a/ports/minimal/Makefile b/ports/minimal/Makefile
index 5ba6514c9ed43..0e875cc2491a6 100644
--- a/ports/minimal/Makefile
+++ b/ports/minimal/Makefile
@@ -81,7 +81,7 @@ else
 all: $(BUILD)/firmware.elf
 endif
 
-$(BUILD)/_frozen_mpy.c: frozentest.mpy $(BUILD)/genhdr/qstrdefs.generated.h
+$(BUILD)/_frozen_mpy.c: $(TOP)/tests/frozen/frozentest.mpy $(BUILD)/genhdr/qstrdefs.generated.h
 	$(ECHO) "MISC freezing bytecode"
 	$(Q)$(TOP)/tools/mpy-tool.py -f -q $(BUILD)/genhdr/qstrdefs.preprocessed.h -mlongint-impl=none $< > $@
 
diff --git a/ports/powerpc/Makefile b/ports/powerpc/Makefile
index 12ae485bb8f04..0986fd13eba0f 100644
--- a/ports/powerpc/Makefile
+++ b/ports/powerpc/Makefile
@@ -50,7 +50,7 @@ OBJ += $(BUILD)/head.o
 
 all: $(BUILD)/firmware.elf $(BUILD)/firmware.map $(BUILD)/firmware.bin
 
-$(BUILD)/_frozen_mpy.c: frozentest.mpy $(BUILD)/genhdr/qstrdefs.generated.h
+$(BUILD)/_frozen_mpy.c: $(TOP)/tests/frozen/frozentest.mpy $(BUILD)/genhdr/qstrdefs.generated.h
 	$(ECHO) "MISC freezing bytecode"
 	$(Q)$(MPY_TOOL) -f -q $(BUILD)/genhdr/qstrdefs.preprocessed.h -mlongint-impl=mpz $< > $@
 
diff --git a/ports/powerpc/frozentest.mpy b/ports/powerpc/frozentest.mpy
deleted file mode 100644
index 99581617ac3d13e416722a63852da14088ff8db7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 196
zcmeZeW0GfOmP#wiuS(4;Ni8nXE2w1PZ!Bjk4X9*b%4A?wN>s?n&r4S*E-A_cQY9IQ
zB?_6v3VHcJ3aFtdFExdMRV@)kJ|nSMp)@ZuIX@*;;oQb^o6c=kNX|$sDrR8gPO1c2
zqF`ubY{JOUVj#fBs15{LYJyAx%qEPHf=tQ`5Q-5(F@Y(iUGHa!0$B}CKH*|4f=q%e
QKu+V+@RsY&`jLUj0I@qak^lez

diff --git a/ports/powerpc/frozentest.py b/ports/powerpc/frozentest.py
deleted file mode 100644
index 78cdd60bf0431..0000000000000
--- a/ports/powerpc/frozentest.py
+++ /dev/null
@@ -1,7 +0,0 @@
-print("uPy")
-print("a long string that is not interned")
-print("a string that has unicode αβγ chars")
-print(b"bytes 1234\x01")
-print(123456789)
-for i in range(4):
-    print(i)
diff --git a/tests/frozen/README.md b/tests/frozen/README.md
new file mode 100644
index 0000000000000..bd786d5a3c4cc
--- /dev/null
+++ b/tests/frozen/README.md
@@ -0,0 +1,2 @@
+This is a .mpy built against the current .mpy version that can be used to test
+freezing without a dependency on mpy-cross.
diff --git a/ports/minimal/frozentest.mpy b/tests/frozen/frozentest.mpy
similarity index 100%
rename from ports/minimal/frozentest.mpy
rename to tests/frozen/frozentest.mpy
diff --git a/ports/minimal/frozentest.py b/tests/frozen/frozentest.py
similarity index 100%
rename from ports/minimal/frozentest.py
rename to tests/frozen/frozentest.py
diff --git a/tools/ci.sh b/tools/ci.sh
index 9c670b7be5ead..9963f7796cc06 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -75,8 +75,8 @@ function ci_mpy_format_setup {
 
 function ci_mpy_format_test {
     # Test mpy-tool.py dump feature on bytecode
-    python2 ./tools/mpy-tool.py -xd ports/minimal/frozentest.mpy
-    python3 ./tools/mpy-tool.py -xd ports/minimal/frozentest.mpy
+    python2 ./tools/mpy-tool.py -xd tests/frozen/frozentest.mpy
+    python3 ./tools/mpy-tool.py -xd tests/frozen/frozentest.mpy
 
     # Test mpy-tool.py dump feature on native code
     make -C examples/natmod/features1

From 920da9c5e30da58d5f77b2c5e28c74e3670e6a3b Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Mon, 19 Sep 2022 12:05:39 +1000
Subject: [PATCH 2635/3533] unix/variants/coverage: Add test for manifest
 freeze_mpy().

This uses the frozentest.mpy that is also used by ports/minimal.

Also fixes two bugs that these new tests picked up:
 - File extension matching in manifestfile.py.
 - Handling of freeze_mpy results in makemanifest.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/unix/variants/coverage/manifest.py |  1 +
 tests/unix/extra_coverage.py             |  5 +++++
 tests/unix/extra_coverage.py.exp         | 10 ++++++++++
 tools/makemanifest.py                    |  6 +++---
 tools/manifestfile.py                    | 17 +++++++++++++----
 5 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/ports/unix/variants/coverage/manifest.py b/ports/unix/variants/coverage/manifest.py
index 6111050884222..7c3d9a6b64d69 100644
--- a/ports/unix/variants/coverage/manifest.py
+++ b/ports/unix/variants/coverage/manifest.py
@@ -1,2 +1,3 @@
 freeze_as_str("frzstr")
 freeze_as_mpy("frzmpy")
+freeze_mpy("$(MPY_DIR)/tests/frozen")
diff --git a/tests/unix/extra_coverage.py b/tests/unix/extra_coverage.py
index bb22485026e89..00226a68e6010 100644
--- a/tests/unix/extra_coverage.py
+++ b/tests/unix/extra_coverage.py
@@ -96,3 +96,8 @@
 from frzqstr import returns_NULL
 
 print(returns_NULL())
+
+# test for freeze_mpy
+import frozentest
+
+print(frozentest.__file__)
diff --git a/tests/unix/extra_coverage.py.exp b/tests/unix/extra_coverage.py.exp
index 4d6e1e08567d4..29411545569d3 100644
--- a/tests/unix/extra_coverage.py.exp
+++ b/tests/unix/extra_coverage.py.exp
@@ -199,3 +199,13 @@ X
 '\x1b'
 b'\x00\xff'
 NULL
+uPy
+a long string that is not interned
+a string that has unicode αβγ chars
+b'bytes 1234\x01'
+123456789
+0
+1
+2
+3
+frozentest.py
diff --git a/tools/makemanifest.py b/tools/makemanifest.py
index 9dd8815aac5f7..b2e4f7d8441b6 100644
--- a/tools/makemanifest.py
+++ b/tools/makemanifest.py
@@ -210,9 +210,9 @@ def main():
                 ts_outfile = get_timestamp(outfile)
             mpy_files.append(outfile)
         else:
-            assert kind == manifestfile.KIND_FREEZE_MPY
-            mpy_files.append(full_path)
-            ts_outfile = timestamp
+            assert result.kind == manifestfile.KIND_FREEZE_MPY
+            mpy_files.append(result.full_path)
+            ts_outfile = result.timestamp
         ts_newest = max(ts_newest, ts_outfile)
 
     # Check if output file needs generating
diff --git a/tools/manifestfile.py b/tools/manifestfile.py
index 84c79ed82b28f..a4d056137ffc9 100644
--- a/tools/manifestfile.py
+++ b/tools/manifestfile.py
@@ -394,28 +394,37 @@ def freeze(self, path, script=None, opt=None):
         `opt` is the optimisation level to pass to mpy-cross when compiling .py
         to .mpy.
         """
-        self._freeze_internal(path, script, exts=(".py", ".mpy"), kind=KIND_FREEZE_AUTO, opt=opt)
+        self._freeze_internal(
+            path,
+            script,
+            exts=(
+                ".py",
+                ".mpy",
+            ),
+            kind=KIND_FREEZE_AUTO,
+            opt=opt,
+        )
 
     def freeze_as_str(self, path):
         """
         Freeze the given `path` and all .py scripts within it as a string,
         which will be compiled upon import.
         """
-        self._search(path, None, None, exts=(".py"), kind=KIND_FREEZE_AS_STR)
+        self._search(path, None, None, exts=(".py",), kind=KIND_FREEZE_AS_STR)
 
     def freeze_as_mpy(self, path, script=None, opt=None):
         """
         Freeze the input (see above) by first compiling the .py scripts to
         .mpy files, then freezing the resulting .mpy files.
         """
-        self._freeze_internal(path, script, exts=(".py"), kind=KIND_FREEZE_AS_MPY, opt=opt)
+        self._freeze_internal(path, script, exts=(".py",), kind=KIND_FREEZE_AS_MPY, opt=opt)
 
     def freeze_mpy(self, path, script=None, opt=None):
         """
         Freeze the input (see above), which must be .mpy files that are
         frozen directly.
         """
-        self._freeze_internal(path, script, exts=(".mpy"), kind=KIND_FREEZE_MPY, opt=opt)
+        self._freeze_internal(path, script, exts=(".mpy",), kind=KIND_FREEZE_MPY, opt=opt)
 
 
 # Generate a temporary file with a line appended to the end that adds __version__.

From 7589d86b6b6ea4232ff5614f3e73565529d4b3bb Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Tue, 20 Sep 2022 08:54:53 +1000
Subject: [PATCH 2636/3533] tests/run-multitests: Extend usage information.

---
 tests/run-multitests.py | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/tests/run-multitests.py b/tests/run-multitests.py
index bd6cc70f7a516..b5ba83b0ad345 100755
--- a/tests/run-multitests.py
+++ b/tests/run-multitests.py
@@ -3,6 +3,11 @@
 # This file is part of the MicroPython project, http://micropython.org/
 # The MIT License (MIT)
 # Copyright (c) 2020 Damien P. George
+#
+# run-multitests.py
+# Runs a test suite that relies on two micropython instances/devices
+# interacting in some way. Typically used to test networking / bluetooth etc.
+
 
 import sys, os, time, re, select
 import argparse
@@ -471,7 +476,10 @@ def run_tests(test_files, instances_truth, instances_test):
 def main():
     global cmd_args
 
-    cmd_parser = argparse.ArgumentParser(description="Run network tests for MicroPython")
+    cmd_parser = argparse.ArgumentParser(
+        description="Run network tests for MicroPython",
+        formatter_class=argparse.RawTextHelpFormatter,
+    )
     cmd_parser.add_argument(
         "-s", "--show-output", action="store_true", help="show test output after running"
     )
@@ -488,6 +496,14 @@ def main():
         default=1,
         help="repeat the test with this many permutations of the instance order",
     )
+    cmd_parser.epilog = (
+        "Supported instance types:\r\n"
+        " -i pyb:<port>   physical device (eg. pyboard) on provided repl port.\n"
+        " -i micropython  unix micropython instance, path customised with MICROPY_MICROPYTHON env.\n"
+        " -i cpython      desktop python3 instance, path customised with MICROPY_CPYTHON3 env.\n"
+        " -i exec:<path>  custom program run on provided path.\n"
+        "Each instance arg can optionally have custom env provided, eg. <cmd>,ENV=VAR,ENV=VAR...\n"
+    )
     cmd_parser.add_argument("files", nargs="+", help="input test files")
     cmd_args = cmd_parser.parse_args()
 

From 13c4470fd04981fce3fd29771e1d973febbe7d60 Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Tue, 20 Sep 2022 08:54:58 +1000
Subject: [PATCH 2637/3533] tests/run-multitests: Make paths more
 deterministic.

Allows running from a different directory, etc.

This work was funded by Planet Innovation.
---
 tests/run-multitests.py | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/tests/run-multitests.py b/tests/run-multitests.py
index b5ba83b0ad345..70bae59474b47 100755
--- a/tests/run-multitests.py
+++ b/tests/run-multitests.py
@@ -15,15 +15,24 @@
 import subprocess
 import tempfile
 
-sys.path.append("../tools")
+test_dir = os.path.abspath(os.path.dirname(__file__))
+
+if os.path.abspath(sys.path[0]) == test_dir:
+    # remove the micropython/tests dir from path to avoid
+    # accidentally importing tests like micropython/const.py
+    sys.path.pop(0)
+
+sys.path.insert(0, test_dir + "/../tools")
 import pyboard
 
 if os.name == "nt":
     CPYTHON3 = os.getenv("MICROPY_CPYTHON3", "python3.exe")
-    MICROPYTHON = os.getenv("MICROPY_MICROPYTHON", "../ports/windows/micropython.exe")
+    MICROPYTHON = os.getenv("MICROPY_MICROPYTHON", test_dir + "/../ports/windows/micropython.exe")
 else:
     CPYTHON3 = os.getenv("MICROPY_CPYTHON3", "python3")
-    MICROPYTHON = os.getenv("MICROPY_MICROPYTHON", "../ports/unix/build-standard/micropython")
+    MICROPYTHON = os.getenv(
+        "MICROPY_MICROPYTHON", test_dir + "/../ports/unix/build-standard/micropython"
+    )
 
 # For diff'ing test output
 DIFF = os.getenv("MICROPY_DIFF", "diff -u")
@@ -508,7 +517,7 @@ def main():
     cmd_args = cmd_parser.parse_args()
 
     # clear search path to make sure tests use only builtin modules and those in extmod
-    os.environ["MICROPYPATH"] = os.pathsep + "../extmod"
+    os.environ["MICROPYPATH"] = os.pathsep.join(("", ".frozen", "../extmod"))
 
     test_files = prepare_test_file_list(cmd_args.files)
     max_instances = max(t[1] for t in test_files)

From ed41d517466f329112529a20f9808f1c1724f759 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 22 Sep 2022 11:47:03 +1000
Subject: [PATCH 2638/3533] extmod/modbluetooth: Change data_len type from
 size_t to uint16_t.

For consistency, and to remove the need for additional conversion of types.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/modbluetooth.c | 16 ++++++++--------
 extmod/modbluetooth.h |  4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/extmod/modbluetooth.c b/extmod/modbluetooth.c
index 9c168483ba453..f021308187114 100644
--- a/extmod/modbluetooth.c
+++ b/extmod/modbluetooth.c
@@ -1139,7 +1139,7 @@ STATIC mp_obj_t invoke_irq_handler_run(uint16_t event,
     const mp_int_t *numeric, size_t n_unsigned, size_t n_signed,
     const uint8_t *addr,
     const mp_obj_bluetooth_uuid_t *uuid,
-    const uint8_t **data, size_t *data_len, size_t n_data) {
+    const uint8_t **data, uint16_t *data_len, size_t n_data) {
     mp_obj_bluetooth_ble_t *o = MP_OBJ_TO_PTR(MP_STATE_VM(bluetooth));
     if (o->irq_handler == mp_const_none) {
         return mp_const_none;
@@ -1199,7 +1199,7 @@ STATIC mp_obj_t invoke_irq_handler(uint16_t event,
     const mp_int_t *numeric, size_t n_unsigned, size_t n_signed,
     const uint8_t *addr,
     const mp_obj_bluetooth_uuid_t *uuid,
-    const uint8_t **data, size_t *data_len, size_t n_data) {
+    const uint8_t **data, uint16_t *data_len, size_t n_data) {
 
     // This code may run on an existing MicroPython thread, or a non-MicroPython thread
     // that's not using the mp_thread_get_state() value.  In the former case the state
@@ -1249,7 +1249,7 @@ STATIC mp_obj_t invoke_irq_handler(uint16_t event,
     const mp_int_t *numeric, size_t n_unsigned, size_t n_signed,
     const uint8_t *addr,
     const mp_obj_bluetooth_uuid_t *uuid,
-    const uint8_t **data, size_t *data_len, size_t n_data) {
+    const uint8_t **data, uint16_t *data_len, size_t n_data) {
     return invoke_irq_handler_run(event, numeric, n_unsigned, n_signed, addr, uuid, data, data_len, n_data);
 }
 
@@ -1277,7 +1277,7 @@ void mp_bluetooth_gatts_on_encryption_update(uint16_t conn_handle, bool encrypte
     invoke_irq_handler(MP_BLUETOOTH_IRQ_ENCRYPTION_UPDATE, args, 5, 0, NULL_ADDR, NULL_UUID, NULL_DATA, NULL_DATA_LEN, 0);
 }
 
-bool mp_bluetooth_gap_on_get_secret(uint8_t type, uint8_t index, const uint8_t *key, size_t key_len, const uint8_t **value, size_t *value_len) {
+bool mp_bluetooth_gap_on_get_secret(uint8_t type, uint8_t index, const uint8_t *key, uint16_t key_len, const uint8_t **value, size_t *value_len) {
     mp_int_t args[] = {type, index};
     mp_obj_t result = invoke_irq_handler(MP_BLUETOOTH_IRQ_GET_SECRET, args, 2, 0, NULL_ADDR, NULL_UUID, &key, &key_len, 1);
     if (result == mp_const_none) {
@@ -1293,7 +1293,7 @@ bool mp_bluetooth_gap_on_get_secret(uint8_t type, uint8_t index, const uint8_t *
 bool mp_bluetooth_gap_on_set_secret(uint8_t type, const uint8_t *key, size_t key_len, const uint8_t *value, size_t value_len) {
     mp_int_t args[] = { type };
     const uint8_t *data[] = {key, value};
-    size_t data_len[] = {key_len, value_len};
+    uint16_t data_len[] = {key_len, value_len};
     mp_obj_t result = invoke_irq_handler(MP_BLUETOOTH_IRQ_SET_SECRET, args, 1, 0, NULL_ADDR, NULL_UUID, data, data_len, 2);
     return mp_obj_is_true(result);
 }
@@ -1364,7 +1364,7 @@ void mp_bluetooth_gap_on_scan_complete(void) {
     invoke_irq_handler(MP_BLUETOOTH_IRQ_SCAN_DONE, NULL_NUMERIC, 0, 0, NULL_ADDR, NULL_UUID, NULL_DATA, NULL_DATA_LEN, 0);
 }
 
-void mp_bluetooth_gap_on_scan_result(uint8_t addr_type, const uint8_t *addr, uint8_t adv_type, const int8_t rssi, const uint8_t *data, size_t data_len) {
+void mp_bluetooth_gap_on_scan_result(uint8_t addr_type, const uint8_t *addr, uint8_t adv_type, const int8_t rssi, const uint8_t *data, uint16_t data_len) {
     mp_int_t args[] = {addr_type, adv_type, rssi};
     invoke_irq_handler(MP_BLUETOOTH_IRQ_SCAN_RESULT, args, 1, 2, addr, NULL_UUID, &data, &data_len, 1);
 }
@@ -1394,7 +1394,7 @@ void mp_bluetooth_gattc_on_discover_complete(uint8_t event, uint16_t conn_handle
 
 void mp_bluetooth_gattc_on_data_available(uint8_t event, uint16_t conn_handle, uint16_t value_handle, const uint8_t **data, uint16_t *data_len, size_t num) {
     const uint8_t *combined_data;
-    size_t total_len;
+    uint16_t total_len;
 
     if (num > 1) {
         // Fragmented buffer, need to combine into a new heap-allocated buffer
@@ -1553,7 +1553,7 @@ void mp_bluetooth_gap_on_scan_complete(void) {
     schedule_ringbuf(atomic_state);
 }
 
-void mp_bluetooth_gap_on_scan_result(uint8_t addr_type, const uint8_t *addr, uint8_t adv_type, const int8_t rssi, const uint8_t *data, size_t data_len) {
+void mp_bluetooth_gap_on_scan_result(uint8_t addr_type, const uint8_t *addr, uint8_t adv_type, const int8_t rssi, const uint8_t *data, uint16_t data_len) {
     MICROPY_PY_BLUETOOTH_ENTER
     mp_obj_bluetooth_ble_t *o = MP_OBJ_TO_PTR(MP_STATE_VM(bluetooth));
     data_len = MIN(o->irq_data_data_alloc, data_len);
diff --git a/extmod/modbluetooth.h b/extmod/modbluetooth.h
index d490346278203..ca6436b678d15 100644
--- a/extmod/modbluetooth.h
+++ b/extmod/modbluetooth.h
@@ -426,7 +426,7 @@ void mp_bluetooth_gatts_on_encryption_update(uint16_t conn_handle, bool encrypte
 // For get, if key is NULL, then the implementation must return the index'th matching key. Otherwise it should return a specific key.
 // For set, if value is NULL, then delete.
 // The "type" is stack-specific, but could also be used to implement versioning.
-bool mp_bluetooth_gap_on_get_secret(uint8_t type, uint8_t index, const uint8_t *key, size_t key_len, const uint8_t **value, size_t *value_len);
+bool mp_bluetooth_gap_on_get_secret(uint8_t type, uint8_t index, const uint8_t *key, uint16_t key_len, const uint8_t **value, size_t *value_len);
 bool mp_bluetooth_gap_on_set_secret(uint8_t type, const uint8_t *key, size_t key_len, const uint8_t *value, size_t value_len);
 
 // Call this when a passkey verification needs to be processed.
@@ -451,7 +451,7 @@ void mp_bluetooth_gatts_on_mtu_exchanged(uint16_t conn_handle, uint16_t value);
 void mp_bluetooth_gap_on_scan_complete(void);
 
 // Notify modbluetooth of a scan result.
-void mp_bluetooth_gap_on_scan_result(uint8_t addr_type, const uint8_t *addr, uint8_t adv_type, const int8_t rssi, const uint8_t *data, size_t data_len);
+void mp_bluetooth_gap_on_scan_result(uint8_t addr_type, const uint8_t *addr, uint8_t adv_type, const int8_t rssi, const uint8_t *data, uint16_t data_len);
 #endif // MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE
 
 #if MICROPY_PY_BLUETOOTH_ENABLE_GATT_CLIENT

From db668742a5986ab1de9c0474ef268c00fb1879e7 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 21 Sep 2022 13:22:27 +1000
Subject: [PATCH 2639/3533] extmod/modbluetooth: Do GATTC reassembly in
 protected uPy context.

The calls to m_new and m_del require an exclusive uPy (really a GC)
context.  In particular these functions cannot be called directly from a
FreeRTOS task on esp32.

Fixes issue #9369.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/modbluetooth.c | 67 +++++++++++++++++++++++++------------------
 1 file changed, 39 insertions(+), 28 deletions(-)

diff --git a/extmod/modbluetooth.c b/extmod/modbluetooth.c
index f021308187114..acdbf8d85d02b 100644
--- a/extmod/modbluetooth.c
+++ b/extmod/modbluetooth.c
@@ -52,6 +52,9 @@
 #error pairing and bonding require synchronous modbluetooth events
 #endif
 
+// NimBLE can have fragmented data for GATTC events, so requires reassembly.
+#define MICROPY_PY_BLUETOOTH_USE_GATTC_EVENT_DATA_REASSEMBLY MICROPY_BLUETOOTH_NIMBLE
+
 #define MP_BLUETOOTH_CONNECT_DEFAULT_SCAN_DURATION_MS 2000
 
 #define MICROPY_PY_BLUETOOTH_MAX_EVENT_DATA_TUPLE_LEN 5
@@ -1168,6 +1171,34 @@ STATIC mp_obj_t invoke_irq_handler_run(uint16_t event,
         data_tuple->items[data_tuple->len++] = MP_OBJ_FROM_PTR(uuid);
     }
     #endif
+
+    #if MICROPY_PY_BLUETOOTH_USE_GATTC_EVENT_DATA_REASSEMBLY
+    void *buf_to_free = NULL;
+    uint16_t buf_to_free_len = 0;
+    if (event == MP_BLUETOOTH_IRQ_GATTC_NOTIFY || event == MP_BLUETOOTH_IRQ_GATTC_INDICATE || event == MP_BLUETOOTH_IRQ_GATTC_READ_RESULT) {
+        if (n_data > 1) {
+            // Fragmented buffer, need to combine into a new heap-allocated buffer
+            // in order to pass to Python.
+            // Only gattc_on_data_available calls this code, so data and data_len are writable.
+            uint16_t total_len = 0;
+            for (size_t i = 0; i < n_data; ++i) {
+                total_len += data_len[i];
+            }
+            uint8_t *buf = m_new(uint8_t, total_len);
+            uint8_t *p = buf;
+            for (size_t i = 0; i < n_data; ++i) {
+                memcpy(p, data[i], data_len[i]);
+                p += data_len[i];
+            }
+            data[0] = buf;
+            data_len[0] = total_len;
+            n_data = 1;
+            buf_to_free = buf;
+            buf_to_free_len = total_len;
+        }
+    }
+    #endif
+
     for (size_t i = 0; i < n_data; ++i) {
         if (data[i]) {
             mp_obj_memoryview_init(&mv_data[i], 'B', 0, data_len[i], (void *)data[i]);
@@ -1176,10 +1207,17 @@ STATIC mp_obj_t invoke_irq_handler_run(uint16_t event,
             data_tuple->items[data_tuple->len++] = mp_const_none;
         }
     }
+
     assert(data_tuple->len <= MICROPY_PY_BLUETOOTH_MAX_EVENT_DATA_TUPLE_LEN);
 
     mp_obj_t result = mp_call_function_2(o->irq_handler, MP_OBJ_NEW_SMALL_INT(event), MP_OBJ_FROM_PTR(data_tuple));
 
+    #if MICROPY_PY_BLUETOOTH_USE_GATTC_EVENT_DATA_REASSEMBLY
+    if (buf_to_free != NULL) {
+        m_del(uint8_t, (uint8_t *)buf_to_free, buf_to_free_len);
+    }
+    #endif
+
     mp_local_free(data_tuple);
 
     return result;
@@ -1393,35 +1431,8 @@ void mp_bluetooth_gattc_on_discover_complete(uint8_t event, uint16_t conn_handle
 }
 
 void mp_bluetooth_gattc_on_data_available(uint8_t event, uint16_t conn_handle, uint16_t value_handle, const uint8_t **data, uint16_t *data_len, size_t num) {
-    const uint8_t *combined_data;
-    uint16_t total_len;
-
-    if (num > 1) {
-        // Fragmented buffer, need to combine into a new heap-allocated buffer
-        // in order to pass to Python.
-        total_len = 0;
-        for (size_t i = 0; i < num; ++i) {
-            total_len += data_len[i];
-        }
-        uint8_t *buf = m_new(uint8_t, total_len);
-        uint8_t *p = buf;
-        for (size_t i = 0; i < num; ++i) {
-            memcpy(p, data[i], data_len[i]);
-            p += data_len[i];
-        }
-        combined_data = buf;
-    } else {
-        // Single buffer, use directly.
-        combined_data = *data;
-        total_len = *data_len;
-    }
-
     mp_int_t args[] = {conn_handle, value_handle};
-    invoke_irq_handler(event, args, 2, 0, NULL_ADDR, NULL_UUID, &combined_data, &total_len, 1);
-
-    if (num > 1) {
-        m_del(uint8_t, (uint8_t *)combined_data, total_len);
-    }
+    invoke_irq_handler(event, args, 2, 0, NULL_ADDR, NULL_UUID, data, data_len, num);
 }
 
 void mp_bluetooth_gattc_on_read_write_status(uint8_t event, uint16_t conn_handle, uint16_t value_handle, uint16_t status) {

From f2ad152e7e04608cbf57d756f6a4cebbf9976f6c Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 23 Sep 2022 14:20:37 +1000
Subject: [PATCH 2640/3533] extmod/modbluetooth: Run BLE IRQ callback in
 protected NLR context.

The call to invoke_irq_handler_run() always needs to run in a protected NLR
context, to catch exceptions from the Python handler, and the m_new's (and
also mp_local_alloc when PYSTACK is enabled).  With
MICROPY_PY_BLUETOOTH_USE_SYNC_EVENTS_WITH_INTERLOCK enabled there was
already an explicit nlr_push, and that is now used in all cases.

Without this change, on stm32 (for example), the callbacks from the BLE
stack to invoke_irq_handler() were made via static scheduled nodes which do
not have any NLR protection, and hence would lead to a hard fault (uncaught
NLR) if an exception was raised in the Python BLE IRQ handler.  This was a
regression introduced by 8045ac07f599c0ccc447c88a0b778f704b497559, which is
fixed by this commit.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/modbluetooth.c | 51 ++++++++++++++++++++++++++++---------------
 1 file changed, 33 insertions(+), 18 deletions(-)

diff --git a/extmod/modbluetooth.c b/extmod/modbluetooth.c
index acdbf8d85d02b..3a51fb8b2399d 100644
--- a/extmod/modbluetooth.c
+++ b/extmod/modbluetooth.c
@@ -1143,10 +1143,6 @@ STATIC mp_obj_t invoke_irq_handler_run(uint16_t event,
     const uint8_t *addr,
     const mp_obj_bluetooth_uuid_t *uuid,
     const uint8_t **data, uint16_t *data_len, size_t n_data) {
-    mp_obj_bluetooth_ble_t *o = MP_OBJ_TO_PTR(MP_STATE_VM(bluetooth));
-    if (o->irq_handler == mp_const_none) {
-        return mp_const_none;
-    }
 
     mp_obj_array_t mv_addr;
     mp_obj_array_t mv_data[2];
@@ -1210,6 +1206,7 @@ STATIC mp_obj_t invoke_irq_handler_run(uint16_t event,
 
     assert(data_tuple->len <= MICROPY_PY_BLUETOOTH_MAX_EVENT_DATA_TUPLE_LEN);
 
+    mp_obj_bluetooth_ble_t *o = MP_OBJ_TO_PTR(MP_STATE_VM(bluetooth));
     mp_obj_t result = mp_call_function_2(o->irq_handler, MP_OBJ_NEW_SMALL_INT(event), MP_OBJ_FROM_PTR(data_tuple));
 
     #if MICROPY_PY_BLUETOOTH_USE_GATTC_EVENT_DATA_REASSEMBLY
@@ -1223,6 +1220,34 @@ STATIC mp_obj_t invoke_irq_handler_run(uint16_t event,
     return result;
 }
 
+STATIC mp_obj_t invoke_irq_handler_run_protected(uint16_t event,
+    const mp_int_t *numeric, size_t n_unsigned, size_t n_signed,
+    const uint8_t *addr,
+    const mp_obj_bluetooth_uuid_t *uuid,
+    const uint8_t **data, uint16_t *data_len, size_t n_data) {
+
+    mp_obj_bluetooth_ble_t *o = MP_OBJ_TO_PTR(MP_STATE_VM(bluetooth));
+    if (o->irq_handler == mp_const_none) {
+        return mp_const_none;
+    }
+
+    mp_obj_t result = mp_const_none;
+    nlr_buf_t nlr;
+    if (nlr_push(&nlr) == 0) {
+        result = invoke_irq_handler_run(event, numeric, n_unsigned, n_signed, addr, uuid, data, data_len, n_data);
+        nlr_pop();
+    } else {
+        // Uncaught exception, print it out.
+        mp_printf(MICROPY_ERROR_PRINTER, "Unhandled exception in IRQ callback handler\n");
+        mp_obj_print_exception(MICROPY_ERROR_PRINTER, MP_OBJ_FROM_PTR(nlr.ret_val));
+
+        // Disable the BLE IRQ handler.
+        o->irq_handler = mp_const_none;
+    }
+
+    return result;
+}
+
 #if MICROPY_PY_BLUETOOTH_USE_SYNC_EVENTS_WITH_INTERLOCK
 
 // On some systems the BLE event callbacks may occur on a system thread which is not
@@ -1256,19 +1281,9 @@ STATIC mp_obj_t invoke_irq_handler(uint16_t event,
         MP_THREAD_GIL_ENTER();
     }
 
-    mp_obj_t result = mp_const_none;
-    nlr_buf_t nlr;
-    if (nlr_push(&nlr) == 0) {
-        mp_sched_lock();
-        result = invoke_irq_handler_run(event, numeric, n_unsigned, n_signed, addr, uuid, data, data_len, n_data);
-        mp_sched_unlock();
-        nlr_pop();
-    } else {
-        // Uncaught exception, print it out.
-        mp_sched_unlock();
-        mp_printf(MICROPY_ERROR_PRINTER, "Unhandled exception in IRQ callback handler\n");
-        mp_obj_print_exception(MICROPY_ERROR_PRINTER, MP_OBJ_FROM_PTR(nlr.ret_val));
-    }
+    mp_sched_lock();
+    mp_obj_t result = invoke_irq_handler_run_protected(event, numeric, n_unsigned, n_signed, addr, uuid, data, data_len, n_data);
+    mp_sched_unlock();
 
     if (ts_orig == NULL) {
         MP_THREAD_GIL_EXIT();
@@ -1288,7 +1303,7 @@ STATIC mp_obj_t invoke_irq_handler(uint16_t event,
     const uint8_t *addr,
     const mp_obj_bluetooth_uuid_t *uuid,
     const uint8_t **data, uint16_t *data_len, size_t n_data) {
-    return invoke_irq_handler_run(event, numeric, n_unsigned, n_signed, addr, uuid, data, data_len, n_data);
+    return invoke_irq_handler_run_protected(event, numeric, n_unsigned, n_signed, addr, uuid, data, data_len, n_data);
 }
 
 #endif

From f91ebf6fa972a593ede25d33740e693d99dbbc3f Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Mon, 15 Aug 2022 12:02:23 +1000
Subject: [PATCH 2641/3533] tests: Allow 'special' tests to output "SKIP" on a
 single line.

---
 tests/run-tests.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tests/run-tests.py b/tests/run-tests.py
index ca7941f6261bd..6031b35b53347 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -305,6 +305,10 @@ def send_get(what):
     if had_crash or output_mupy in (b"SKIP\n", b"CRASH"):
         return output_mupy
 
+    # skipped special tests will output "SKIP" surrounded by other interpreter debug output
+    if is_special and not had_crash and b"\nSKIP\n" in output_mupy:
+        return b"SKIP\n"
+
     if is_special or test_file in special_tests:
         # convert parts of the output that are not stable across runs
         with open(test_file + ".exp", "rb") as f:

From 25ff5b52d9786beff0b90a268af813b223f31f57 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 27 Jul 2022 12:52:48 +1000
Subject: [PATCH 2642/3533] py/parse: Allow const types other than int to
 optimise as true/false.

Allows optimisation of cases like:

    import micropython
    _DEBUG = micropython.const(False)
    if _DEBUG:
        print('Debugging info')

Previously the 'if' statement was only optimised out if the type of the
const() argument was integer.

The change is implemented in a way that makes the compiler slightly smaller
(-16 bytes on PYBV11) but compilation will also be very slightly slower.

As a bonus, if const support is enabled then the compiler can now optimise
const truthy/falsey expressions of other types, like:

    while "something":
        pass

... unclear if that is useful, but perhaps it could be.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 py/parse.c                            |  28 +++--
 tests/cmdline/cmd_showbc_const.py     |  69 +++++++++++
 tests/cmdline/cmd_showbc_const.py.exp | 160 ++++++++++++++++++++++++++
 3 files changed, 247 insertions(+), 10 deletions(-)
 create mode 100644 tests/cmdline/cmd_showbc_const.py
 create mode 100644 tests/cmdline/cmd_showbc_const.py.exp

diff --git a/py/parse.c b/py/parse.c
index d58098af2e165..62de3282b3443 100644
--- a/py/parse.c
+++ b/py/parse.c
@@ -334,16 +334,6 @@ STATIC uint8_t peek_rule(parser_t *parser, size_t n) {
 }
 #endif
 
-bool mp_parse_node_is_const_false(mp_parse_node_t pn) {
-    return MP_PARSE_NODE_IS_TOKEN_KIND(pn, MP_TOKEN_KW_FALSE)
-           || (MP_PARSE_NODE_IS_SMALL_INT(pn) && MP_PARSE_NODE_LEAF_SMALL_INT(pn) == 0);
-}
-
-bool mp_parse_node_is_const_true(mp_parse_node_t pn) {
-    return MP_PARSE_NODE_IS_TOKEN_KIND(pn, MP_TOKEN_KW_TRUE)
-           || (MP_PARSE_NODE_IS_SMALL_INT(pn) && MP_PARSE_NODE_LEAF_SMALL_INT(pn) != 0);
-}
-
 bool mp_parse_node_get_int_maybe(mp_parse_node_t pn, mp_obj_t *o) {
     if (MP_PARSE_NODE_IS_SMALL_INT(pn)) {
         *o = MP_OBJ_NEW_SMALL_INT(MP_PARSE_NODE_LEAF_SMALL_INT(pn));
@@ -427,6 +417,24 @@ STATIC mp_obj_t mp_parse_node_convert_to_obj(mp_parse_node_t pn) {
 }
 #endif
 
+STATIC bool parse_node_is_const_bool(mp_parse_node_t pn, bool value) {
+    // Returns true if 'pn' is a constant whose boolean value is equivalent to 'value'
+    #if MICROPY_COMP_CONST_TUPLE || MICROPY_COMP_CONST
+    return mp_parse_node_is_const(pn) && mp_obj_is_true(mp_parse_node_convert_to_obj(pn)) == value;
+    #else
+    return MP_PARSE_NODE_IS_TOKEN_KIND(pn, value ? MP_TOKEN_KW_TRUE : MP_TOKEN_KW_FALSE)
+           || (MP_PARSE_NODE_IS_SMALL_INT(pn) && !!MP_PARSE_NODE_LEAF_SMALL_INT(pn) == value);
+    #endif
+}
+
+bool mp_parse_node_is_const_false(mp_parse_node_t pn) {
+    return parse_node_is_const_bool(pn, false);
+}
+
+bool mp_parse_node_is_const_true(mp_parse_node_t pn) {
+    return parse_node_is_const_bool(pn, true);
+}
+
 size_t mp_parse_node_extract_list(mp_parse_node_t *pn, size_t pn_kind, mp_parse_node_t **nodes) {
     if (MP_PARSE_NODE_IS_NULL(*pn)) {
         *nodes = NULL;
diff --git a/tests/cmdline/cmd_showbc_const.py b/tests/cmdline/cmd_showbc_const.py
new file mode 100644
index 0000000000000..54f9ec23cdbee
--- /dev/null
+++ b/tests/cmdline/cmd_showbc_const.py
@@ -0,0 +1,69 @@
+# cmdline: -v -v
+# Test constant-related bytecode optimisations
+# (constant folding, compile-time if/while evaluation, etc.)
+from micropython import const
+import sys
+
+try:
+    sys.settrace
+    # if MICROPY_PY_SYS_SETTRACE is enabled, compile-time const optimizations
+    # are disabled so the bytecode output is very different
+    print("SKIP")
+    raise SystemExit
+except AttributeError:
+    pass
+
+_STR = const("foo")
+_EMPTY_TUPLE = const(())
+_TRUE = const(True)
+_FALSE = const(False)
+_SMALLINT = const(33)
+_ZERO = const(0)
+
+# Bytecode generated for these if/while statements should contain no JUMP_IF
+# and no instances of string 'Eliminated'
+
+if _STR or _EMPTY_TUPLE:
+    print("Kept")
+if _STR and _EMPTY_TUPLE:
+    print("Eliminated")
+if _TRUE:
+    print("Kept")
+if _SMALLINT:
+    print("Kept")
+if _ZERO and _SMALLINT:
+    print("Eliminated")
+if _FALSE:
+    print("Eliminated")
+
+while _SMALLINT:
+    print("Kept")
+    break
+while _ZERO:
+    print("Eliminated")
+while _FALSE:
+    print("Eliminated")
+
+# These values are stored in variables, and therefore bytecode will contain JUMP_IF
+
+a = _EMPTY_TUPLE or _STR
+if a == _STR:
+    print("Kept")
+
+b = _SMALLINT and _STR
+if b == _STR:
+    print("Kept")
+
+# The compiler is also unable to optimise these expressions, even though the arguments are const,
+# so these also contain JUMP_IF
+
+if (_EMPTY_TUPLE or _STR) == _STR:
+    print("Kept")
+
+if (_EMPTY_TUPLE and _STR) == _STR:
+    print("Not Eliminated")
+
+if (not _STR) == _FALSE:
+    print("Kept")
+
+assert True
diff --git a/tests/cmdline/cmd_showbc_const.py.exp b/tests/cmdline/cmd_showbc_const.py.exp
new file mode 100644
index 0000000000000..6cdc3e9c96373
--- /dev/null
+++ b/tests/cmdline/cmd_showbc_const.py.exp
@@ -0,0 +1,160 @@
+File cmdline/cmd_showbc_const.py, code block '<module>' (descriptor: \.\+, bytecode @\.\+ 198 bytes)
+Raw bytecode (code_info_size=40, bytecode_size=158):
+ 2c 4c 01 60 2c 46 22 65 27 4a 83 0c 20 27 40 20
+ 27 20 27 40 60 20 27 24 40 60 40 24 27 47 24 27
+ 67 40 27 47 27 47 26 47 80 10 02 2a 01 1b 03 1c
+ 02 16 02 59 80 51 1b 04 16 04 48 0f 11 04 13 05
+ 59 11 09 10 06 34 01 59 11 0a 65 57 11 0b df 44
+ 43 59 4a 01 5d 11 09 10 07 34 01 59 11 09 10 07
+ 34 01 59 11 09 10 07 34 01 59 11 09 10 07 34 01
+ 59 42 42 42 35 23 00 16 0c 11 0c 23 00 d9 44 47
+ 11 09 10 07 34 01 59 23 00 16 0d 11 0d 23 00 d9
+ 44 47 11 09 10 07 34 01 59 23 00 23 00 d9 44 47
+ 11 09 10 07 34 01 59 23 01 23 00 d9 44 47 11 09
+ 23 02 34 01 59 50 23 03 d9 44 47 11 09 10 07 34
+ 01 59 42 40 51 63
+arg names:
+(N_STATE 6)
+(N_EXC_STACK 1)
+  bc=0 line=1
+  bc=0 line=4
+  bc=12 line=5
+  bc=18 line=7
+  bc=20 line=8
+  bc=25 line=11
+  bc=32 line=12
+  bc=42 line=14
+  bc=45 line=26
+  bc=45 line=27
+  bc=52 line=28
+  bc=52 line=30
+  bc=52 line=31
+  bc=59 line=32
+  bc=59 line=33
+  bc=66 line=34
+  bc=66 line=36
+  bc=66 line=39
+  bc=66 line=40
+  bc=73 line=41
+  bc=77 line=42
+  bc=77 line=44
+  bc=77 line=47
+  bc=77 line=49
+  bc=81 line=50
+  bc=88 line=51
+  bc=95 line=53
+  bc=99 line=54
+  bc=106 line=55
+  bc=113 line=58
+  bc=113 line=60
+  bc=120 line=61
+  bc=127 line=63
+  bc=134 line=64
+  bc=141 line=66
+  bc=147 line=67
+  bc=154 line=69
+00 LOAD_CONST_SMALL_INT 0
+01 LOAD_CONST_STRING 'const'
+03 BUILD_TUPLE 1
+05 IMPORT_NAME 'micropython'
+07 IMPORT_FROM 'const'
+09 STORE_NAME const
+11 POP_TOP
+12 LOAD_CONST_SMALL_INT 0
+13 LOAD_CONST_NONE
+14 IMPORT_NAME 'sys'
+16 STORE_NAME sys
+18 SETUP_EXCEPT 35
+20 LOAD_NAME sys
+22 LOAD_ATTR settrace
+24 POP_TOP
+25 LOAD_NAME print
+27 LOAD_CONST_STRING 'SKIP'
+29 CALL_FUNCTION n=1 nkw=0
+31 POP_TOP
+32 LOAD_NAME SystemExit
+34 RAISE_OBJ
+35 DUP_TOP
+36 LOAD_NAME AttributeError
+38 BINARY_OP 8 
+39 POP_JUMP_IF_FALSE 44
+41 POP_TOP
+42 POP_EXCEPT_JUMP 45
+44 END_FINALLY
+45 LOAD_NAME print
+47 LOAD_CONST_STRING 'Kept'
+49 CALL_FUNCTION n=1 nkw=0
+51 POP_TOP
+52 LOAD_NAME print
+54 LOAD_CONST_STRING 'Kept'
+56 CALL_FUNCTION n=1 nkw=0
+58 POP_TOP
+59 LOAD_NAME print
+61 LOAD_CONST_STRING 'Kept'
+63 CALL_FUNCTION n=1 nkw=0
+65 POP_TOP
+66 LOAD_NAME print
+68 LOAD_CONST_STRING 'Kept'
+70 CALL_FUNCTION n=1 nkw=0
+72 POP_TOP
+73 JUMP 77
+75 JUMP 66
+77 LOAD_CONST_OBJ \.\+='foo'
+79 STORE_NAME a
+81 LOAD_NAME a
+83 LOAD_CONST_OBJ \.\+='foo'
+85 BINARY_OP 2 __eq__
+86 POP_JUMP_IF_FALSE 95
+88 LOAD_NAME print
+90 LOAD_CONST_STRING 'Kept'
+92 CALL_FUNCTION n=1 nkw=0
+94 POP_TOP
+95 LOAD_CONST_OBJ \.\+='foo'
+97 STORE_NAME b
+99 LOAD_NAME b
+101 LOAD_CONST_OBJ \.\+='foo'
+103 BINARY_OP 2 __eq__
+104 POP_JUMP_IF_FALSE 113
+106 LOAD_NAME print
+108 LOAD_CONST_STRING 'Kept'
+110 CALL_FUNCTION n=1 nkw=0
+112 POP_TOP
+113 LOAD_CONST_OBJ \.\+='foo'
+115 LOAD_CONST_OBJ \.\+='foo'
+117 BINARY_OP 2 __eq__
+118 POP_JUMP_IF_FALSE 127
+120 LOAD_NAME print
+122 LOAD_CONST_STRING 'Kept'
+124 CALL_FUNCTION n=1 nkw=0
+126 POP_TOP
+127 LOAD_CONST_OBJ \.\+=()
+129 LOAD_CONST_OBJ \.\+='foo'
+131 BINARY_OP 2 __eq__
+132 POP_JUMP_IF_FALSE 141
+134 LOAD_NAME print
+136 LOAD_CONST_OBJ \.\+='Not Eliminated'
+138 CALL_FUNCTION n=1 nkw=0
+140 POP_TOP
+141 LOAD_CONST_FALSE
+142 LOAD_CONST_OBJ \.\+=False
+144 BINARY_OP 2 __eq__
+145 POP_JUMP_IF_FALSE 154
+147 LOAD_NAME print
+149 LOAD_CONST_STRING 'Kept'
+151 CALL_FUNCTION n=1 nkw=0
+153 POP_TOP
+154 JUMP 156
+156 LOAD_CONST_NONE
+157 RETURN_VALUE
+Kept
+Kept
+Kept
+Kept
+Kept
+Kept
+Kept
+Kept
+mem: total=\\d\+, current=\\d\+, peak=\\d\+
+stack: \\d\+ out of \\d\+
+GC: total: \\d\+, used: \\d\+, free: \\d\+
+ No. of 1-blocks: \\d\+, 2-blocks: \\d\+, max blk sz: \\d\+, max free sz: \\d\+

From 30e50ab1951680a046c224c12f7cc29aed410e2a Mon Sep 17 00:00:00 2001
From: Jatty_ <jattyandriean@outlook.com>
Date: Tue, 13 Sep 2022 18:38:03 +0700
Subject: [PATCH 2643/3533] stm32/make-stmconst.py: Support TypeDef's with a
 single char prefix.

Update the regex to support parsing files from the STM32CubeU5 library.
---
 ports/stm32/make-stmconst.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/stm32/make-stmconst.py b/ports/stm32/make-stmconst.py
index 554d662384454..aab4038e61dfe 100644
--- a/ports/stm32/make-stmconst.py
+++ b/ports/stm32/make-stmconst.py
@@ -72,7 +72,7 @@ class Lexer:
         ("}", re.compile(r"}$")),
         (
             "} TypeDef",
-            re.compile(r"} *(?P<id>[A-Z][A-Za-z0-9_]+)_(?P<global>([A-Za-z0-9_]+)?)TypeDef;$"),
+            re.compile(r"} *(?P<id>[A-Z][A-Za-z0-9_]*)_(?P<global>([A-Za-z0-9_]+)?)TypeDef;$"),
         ),
         (
             "IO reg",

From ae0b0e701899297d057ab8dc578b3bdbf0144fc4 Mon Sep 17 00:00:00 2001
From: yn386 <wf.yn386@gmail.com>
Date: Mon, 19 Sep 2022 17:55:51 +0900
Subject: [PATCH 2644/3533] lib/stm32lib: Update library to get L1 v1.10.3, and
 some other fixes.

Changes in this new library version are:
- Add L1 HAL at v1.10.3.
- H7_HAL/rcc_ex: Add SPI45 to HAL_RCCEx_GetPeriphCLKFreq.
- L4_HAL/gpio_ex: Add #define for GPIO_AF14_TIM2 on L4P5/L4Q5.
- F4_HAL/i2c: Fix I2C frequency calculation macros.
- L1_HAL/utils: Fix compile error when USE_HAL_DRIVER is defined.
---
 .gitmodules  | 2 +-
 lib/stm32lib | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index 3c47b5959aad8..992fec3d1836f 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -13,7 +13,7 @@
 [submodule "lib/stm32lib"]
 	path = lib/stm32lib
 	url = https://github.com/micropython/stm32lib
-	branch = work-F0-1.9.0+F4-1.16.0+F7-1.7.0+G4-1.3.0+H7-1.6.0+L0-1.11.2+L4-1.17.0+WB-1.10.0+WL-1.1.0
+	branch = work-F0-1.9.0+F4-1.16.0+F7-1.7.0+G0-1.5.1+G4-1.3.0+H7-1.6.0+L0-1.11.2+L1-1.10.3+L4-1.17.0+WB-1.10.0+WL-1.1.0
 [submodule "lib/nrfx"]
 	path = lib/nrfx
 	url = https://github.com/NordicSemiconductor/nrfx.git
diff --git a/lib/stm32lib b/lib/stm32lib
index eb80f0126e506..a9f8fee7bb0cb 160000
--- a/lib/stm32lib
+++ b/lib/stm32lib
@@ -1 +1 @@
-Subproject commit eb80f0126e50687aac966f4c39a2b5a5deffbe78
+Subproject commit a9f8fee7bb0cb4ac1b4ff719b6b5b285f613f352

From 427d72667f23ef8758fbfd2352dd28ba5565644a Mon Sep 17 00:00:00 2001
From: yn386 <wf.yn386@gmail.com>
Date: Mon, 19 Sep 2022 17:56:31 +0900
Subject: [PATCH 2645/3533] stm32: Add support for STM32L1 MCUs.

This change adds STM32L1 support to the STM32 port.
---
 ports/stm32/Makefile                         |   7 ++
 ports/stm32/adc.c                            |  55 ++++++++-
 ports/stm32/boards/stm32l152_af.csv          | 117 +++++++++++++++++++
 ports/stm32/boards/stm32l152xe.ld            |  37 ++++++
 ports/stm32/boards/stm32l1xx_hal_conf_base.h |  99 ++++++++++++++++
 ports/stm32/dac.c                            |   2 +
 ports/stm32/dma.c                            |  66 ++++++++++-
 ports/stm32/dma.h                            |  14 +++
 ports/stm32/extint.c                         |   4 +
 ports/stm32/extint.h                         |   2 +-
 ports/stm32/flash.c                          |  10 +-
 ports/stm32/machine_adc.c                    |   7 +-
 ports/stm32/modmachine.c                     |   4 +-
 ports/stm32/mpconfigboard_common.h           |  10 ++
 ports/stm32/mphalport.c                      |   2 +-
 ports/stm32/mphalport.h                      |   2 +
 ports/stm32/powerctrl.c                      |   6 +-
 ports/stm32/powerctrlboot.c                  |  68 +++++++++++
 ports/stm32/resethandler_m3.s                |  75 ++++++++++++
 ports/stm32/rtc.c                            |  17 +++
 ports/stm32/stm32.mk                         |   3 +-
 ports/stm32/stm32_it.c                       |  34 ++++++
 ports/stm32/timer.c                          |  34 ++++--
 ports/stm32/uart.c                           |  17 ++-
 ports/stm32/uart.h                           |   2 +-
 25 files changed, 657 insertions(+), 37 deletions(-)
 create mode 100644 ports/stm32/boards/stm32l152_af.csv
 create mode 100644 ports/stm32/boards/stm32l152xe.ld
 create mode 100644 ports/stm32/boards/stm32l1xx_hal_conf_base.h
 create mode 100644 ports/stm32/resethandler_m3.s

diff --git a/ports/stm32/Makefile b/ports/stm32/Makefile
index ee00d77173640..4b4a9f0ce3801 100644
--- a/ports/stm32/Makefile
+++ b/ports/stm32/Makefile
@@ -347,11 +347,18 @@ SRC_O += \
 	resethandler_m0.o \
 	shared/runtime/gchelper_m0.o
 else
+ifeq ($(MCU_SERIES),l1)
+CFLAGS += -DUSE_HAL_DRIVER
+SRC_O += \
+	resethandler_m3.o \
+	shared/runtime/gchelper_m3.o
+else
 SRC_O += \
 	system_stm32.o \
 	resethandler.o \
 	shared/runtime/gchelper_m3.o
 endif
+endif
 
 HAL_SRC_C += $(addprefix $(STM32LIB_HAL_BASE)/Src/stm32$(MCU_SERIES)xx_,\
 	hal.c \
diff --git a/ports/stm32/adc.c b/ports/stm32/adc.c
index 712e9b3adeb2f..02bbbb58db9e5 100644
--- a/ports/stm32/adc.c
+++ b/ports/stm32/adc.c
@@ -118,6 +118,14 @@
 #define ADC_CAL2                ((uint16_t *)(0x1FF1E840))
 #define ADC_CAL_BITS            (16)
 
+#elif defined(STM32L1)
+
+#define ADC_SCALE_V             (VREFINT_CAL_VREF / 1000.0f)
+#define ADC_CAL_ADDRESS         (VREFINT_CAL_ADDR)
+#define ADC_CAL1                (TEMPSENSOR_CAL1_ADDR)
+#define ADC_CAL2                (TEMPSENSOR_CAL2_ADDR)
+#define ADC_CAL_BITS            (12)
+
 #elif defined(STM32L4) || defined(STM32WB)
 
 #define ADC_SCALE_V             (VREFINT_CAL_VREF / 1000.0f)
@@ -163,6 +171,8 @@
     defined(STM32L476xx) || defined(STM32L496xx) || \
     defined(STM32WB55xx)
 #define VBAT_DIV (3)
+#elif defined(STM32L152xE)
+// STM32L152xE does not have vbat.
 #else
 #error Unsupported processor
 #endif
@@ -179,11 +189,17 @@
 #define VREFIN_CAL ((uint16_t *)ADC_CAL_ADDRESS)
 
 #ifndef __HAL_ADC_IS_CHANNEL_INTERNAL
+#if defined(STM32L1)
+#define __HAL_ADC_IS_CHANNEL_INTERNAL(channel) \
+    (channel == ADC_CHANNEL_VREFINT \
+    || channel == ADC_CHANNEL_TEMPSENSOR)
+#else
 #define __HAL_ADC_IS_CHANNEL_INTERNAL(channel) \
     (channel == ADC_CHANNEL_VBAT \
     || channel == ADC_CHANNEL_VREFINT \
     || channel == ADC_CHANNEL_TEMPSENSOR)
 #endif
+#endif
 
 typedef struct _pyb_obj_adc_t {
     mp_obj_base_t base;
@@ -210,6 +226,10 @@ STATIC bool is_adcx_channel(int channel) {
     return IS_ADC_CHANNEL(channel) || channel == ADC_CHANNEL_TEMPSENSOR;
     #elif defined(STM32F0) || defined(STM32F4) || defined(STM32F7)
     return IS_ADC_CHANNEL(channel);
+    #elif defined(STM32L1)
+    // The HAL of STM32L1 defines some channels those may not be available on package
+    return __HAL_ADC_IS_CHANNEL_INTERNAL(channel)
+           || (channel < MP_ARRAY_SIZE(pin_adcall_table) && pin_adcall_table[channel]);
     #elif defined(STM32G0) || defined(STM32H7)
     return __HAL_ADC_IS_CHANNEL_INTERNAL(channel)
            || IS_ADC_CHANNEL(__HAL_ADC_DECIMAL_NB_TO_CHANNEL(channel));
@@ -225,7 +245,7 @@ STATIC bool is_adcx_channel(int channel) {
 
 STATIC void adc_wait_for_eoc_or_timeout(ADC_HandleTypeDef *adcHandle, int32_t timeout) {
     uint32_t tickstart = HAL_GetTick();
-    #if defined(STM32F4) || defined(STM32F7)
+    #if defined(STM32F4) || defined(STM32F7) || defined(STM32L1)
     while ((adcHandle->Instance->SR & ADC_FLAG_EOC) != ADC_FLAG_EOC) {
     #elif defined(STM32F0) || defined(STM32G0) || defined(STM32G4) || defined(STM32H7) || defined(STM32L4) || defined(STM32WB)
     while (READ_BIT(adcHandle->Instance->ISR, ADC_FLAG_EOC) != ADC_FLAG_EOC) {
@@ -239,7 +259,7 @@ STATIC void adc_wait_for_eoc_or_timeout(ADC_HandleTypeDef *adcHandle, int32_t ti
 }
 
 STATIC void adcx_clock_enable(ADC_HandleTypeDef *adch) {
-    #if defined(STM32F0) || defined(STM32F4) || defined(STM32F7)
+    #if defined(STM32F0) || defined(STM32F4) || defined(STM32F7) || defined(STM32L1)
     ADCx_CLK_ENABLE();
     #elif defined(STM32H7A3xx) || defined(STM32H7A3xxQ) || defined(STM32H7B3xx) || defined(STM32H7B3xxQ)
     __HAL_RCC_ADC12_CLK_ENABLE();
@@ -299,6 +319,12 @@ STATIC void adcx_init_periph(ADC_HandleTypeDef *adch, uint32_t resolution) {
     adch->Init.OversamplingMode = DISABLE;
     adch->Init.LeftBitShift = ADC_LEFTBITSHIFT_NONE;
     adch->Init.ConversionDataManagement = ADC_CONVERSIONDATA_DR;
+    #elif defined(STM32L1)
+    adch->Init.ClockPrescaler = ADC_CLOCK_ASYNC_DIV1;
+    adch->Init.ScanConvMode = ADC_SCAN_DISABLE;
+    adch->Init.LowPowerAutoWait = DISABLE;
+    adch->Init.DataAlign = ADC_DATAALIGN_RIGHT;
+    adch->Init.DMAContinuousRequests = DISABLE;
     #elif defined(STM32G0) || defined(STM32G4) || defined(STM32L4) || defined(STM32WB)
     adch->Init.ClockPrescaler = ADC_CLOCK_ASYNC_DIV1;
     adch->Init.ScanConvMode = ADC_SCAN_DISABLE;
@@ -367,6 +393,12 @@ STATIC void adc_config_channel(ADC_HandleTypeDef *adc_handle, uint32_t channel)
     sConfig.OffsetNumber = ADC_OFFSET_NONE;
     sConfig.OffsetRightShift = DISABLE;
     sConfig.OffsetSignedSaturation = DISABLE;
+    #elif defined(STM32L1)
+    if (__HAL_ADC_IS_CHANNEL_INTERNAL(channel)) {
+        sConfig.SamplingTime = ADC_SAMPLETIME_384CYCLES;
+    } else {
+        sConfig.SamplingTime = ADC_SAMPLETIME_384CYCLES;
+    }
     #elif defined(STM32G0)
     if (__HAL_ADC_IS_CHANNEL_INTERNAL(channel)) {
         sConfig.SamplingTime = ADC_SAMPLETIME_160CYCLES_5;
@@ -555,7 +587,7 @@ STATIC mp_obj_t adc_read_timed(mp_obj_t self_in, mp_obj_t buf_in, mp_obj_t freq_
             HAL_ADC_Start(&self->handle);
         } else {
             // for subsequent samples we can just set the "start sample" bit
-            #if defined(STM32F4) || defined(STM32F7)
+            #if defined(STM32F4) || defined(STM32F7) || defined(STM32L1)
             self->handle.Instance->CR2 |= (uint32_t)ADC_CR2_SWSTART;
             #elif defined(STM32F0) || defined(STM32G0) || defined(STM32G4) || defined(STM32H7) || defined(STM32L4) || defined(STM32WB)
             SET_BIT(self->handle.Instance->CR, ADC_CR_ADSTART);
@@ -665,7 +697,7 @@ STATIC mp_obj_t adc_read_timed_multi(mp_obj_t adc_array_in, mp_obj_t buf_array_i
             adc_config_channel(&adc->handle, adc->channel);
             // for the first sample we need to turn the ADC on
             // ADC is started: set the "start sample" bit
-            #if defined(STM32F4) || defined(STM32F7)
+            #if defined(STM32F4) || defined(STM32F7) || defined(STM32L1)
             adc->handle.Instance->CR2 |= (uint32_t)ADC_CR2_SWSTART;
             #elif defined(STM32F0) || defined(STM32G0) || defined(STM32G4) || defined(STM32H7) || defined(STM32L4) || defined(STM32WB)
             SET_BIT(adc->handle.Instance->CR, ADC_CR_ADSTART);
@@ -720,6 +752,8 @@ typedef struct _pyb_adc_all_obj_t {
     ADC_HandleTypeDef handle;
 } pyb_adc_all_obj_t;
 
+float adc_read_core_vref(ADC_HandleTypeDef *adcHandle);
+
 void adc_init_all(pyb_adc_all_obj_t *adc_all, uint32_t resolution, uint32_t en_mask) {
 
     switch (resolution) {
@@ -762,7 +796,11 @@ void adc_init_all(pyb_adc_all_obj_t *adc_all, uint32_t resolution, uint32_t en_m
 }
 
 int adc_get_resolution(ADC_HandleTypeDef *adcHandle) {
+    #if defined(STM32L1)
+    uint32_t res_reg = adcHandle->Instance->CR1 & ADC_CR1_RES_Msk;
+    #else
     uint32_t res_reg = ADC_GET_RESOLUTION(adcHandle);
+    #endif
 
     switch (res_reg) {
         #if !defined(STM32H7)
@@ -814,6 +852,11 @@ float adc_read_core_temp_float(ADC_HandleTypeDef *adcHandle) {
         return 0;
     }
     #else
+    #if defined(STM32L1)
+    // Update the reference correction factor before reading tempsensor
+    // because TS_CAL1 and TS_CAL2 of STM32L1 are at VDDA=3.0V
+    adc_read_core_vref(adcHandle);
+    #endif
     int32_t raw_value = adc_config_and_read_ref(adcHandle, ADC_CHANNEL_TEMPSENSOR);
     #endif
     float core_temp_avg_slope = (*ADC_CAL2 - *ADC_CAL1) / 80.0f;
@@ -821,8 +864,12 @@ float adc_read_core_temp_float(ADC_HandleTypeDef *adcHandle) {
 }
 
 float adc_read_core_vbat(ADC_HandleTypeDef *adcHandle) {
+    #if defined(STM32L152xE)
+    mp_raise_NotImplementedError(MP_ERROR_TEXT("read_core_vbat not supported"));
+    #else
     uint32_t raw_value = adc_config_and_read_ref(adcHandle, ADC_CHANNEL_VBAT);
     return raw_value * VBAT_DIV * ADC_SCALE * adc_refcor;
+    #endif
 }
 
 float adc_read_core_vref(ADC_HandleTypeDef *adcHandle) {
diff --git a/ports/stm32/boards/stm32l152_af.csv b/ports/stm32/boards/stm32l152_af.csv
new file mode 100644
index 0000000000000..a6f8e80c3028a
--- /dev/null
+++ b/ports/stm32/boards/stm32l152_af.csv
@@ -0,0 +1,117 @@
+Port,,AF0,AF1,AF2,AF3,AF4,AF5,AF6,AF7,AF8,AF9,AF10,AF11,AF12,AF13,AF14,AF15,
+,,SYS_AF,TIM2,TIM3/TIM4/TIM5,TIM9/TIM10/TIM11,I2C1/I2C2,SPI1/SPI2,SPI3,USART1/USART2/USART3,UART4/UART5,,,,,,,,ADC
+PortA,PA0,,TIM2_CH1_ETR,TIM5_CH1,,,,,USART2_CTS,,,,,,,,EVENTOUT,ADC1_IN0
+PortA,PA1,,TIM2_CH2,TIM5_CH2,,,,,USART2_RTS,,,,,,,,EVENTOUT,ADC1_IN1
+PortA,PA2,,TIM2_CH3,TIM5_CH3,TIM9_CH1,,,,USART2_TX,,,,,,,,EVENTOUT,ADC1_IN2
+PortA,PA3,,TIM2_CH4,TIM5_CH4,TIM9_CH2,,,,USART2_RX,,,,,,,,EVENTOUT,ADC1_IN3
+PortA,PA4,,,,,,SPI1_NSS,SPI3_NSS/I2S3_WS,USART2_CK,,,,,,,,EVENTOUT,ADC1_IN4
+PortA,PA5,,TIM2_CH1_ETR,,,,SPI1_SCK,,,,,,,,,,EVENTOUT,ADC1_IN5
+PortA,PA6,,,TIM3_CH1,TIM10_CH1,,SPI1_MISO,,,,,,,,,,EVENTOUT,ADC1_IN6
+PortA,PA7,,,TIM3_CH2,TIM11_CH1,,SPI1_MOSI,,,,,,,,,,EVENTOUT,ADC1_IN7
+PortA,PA8,MCO,,,,,,,USART1_CK,,,,,,,,EVENTOUT,
+PortA,PA9,,,,,,,,USART1_TX,,,,,,,,EVENTOUT,
+PortA,PA10,,,,,,,,USART1_RX,,,,,,,,EVENTOUT,
+PortA,PA11,,,,,,SPI1_MISO,,USART1_CTS,,,,,,,,EVENTOUT,
+PortA,PA12,,,,,,SPI1_MOSI,,USART1_RTS,,,,,,,,EVENTOUT,
+PortA,PA13,JTMS/SWDIO,,,,,,,,,,,,,,,EVENTOUT,
+PortA,PA14,JTCK/SWCLK,,,,,,,,,,,,,,,EVENTOUT,
+PortA,PA15,JTDI,TIM2_CH1_ETR,,,,SPI1_NSS,SPI3_NSS/I2S3_WS,,,,,,,,,EVENTOUT,
+PortB,PB0,,,TIM3_CH3,,,,,,,,,,,,,EVENTOUT,ADC1_IN8
+PortB,PB1,,,TIM3_CH4,,,,,,,,,,,,,EVENTOUT,ADC1_IN9
+PortB,PB2,BOOT1,,,,,,,,,,,,,,,EVENTOUT,
+PortB,PB3,JTDO,TIM2_CH2,,,,SPI1_SCK,SPI3_SCK/I2S3_CK,,,,,,,,,EVENTOUT,
+PortB,PB4,NJTRST,,TIM3_CH1,,,SPI1_MISO,SPI3_MISO,,,,,,,,,EVENTOUT,
+PortB,PB5,,,TIM3_CH2,,I2C1_SMBA,SPI1_MOSI,SPI3_MOSI/I2S3_SD,,,,,,,,,EVENTOUT,
+PortB,PB6,,,TIM4_CH1,,I2C1_SCL,,,USART1_TX,,,,,,,,EVENTOUT,
+PortB,PB7,,,TIM4_CH2,,I2C1_SDA,,,USART1_RX,,,,,,,,EVENTOUT,
+PortB,PB8,,,TIM4_CH3,TIM10_CH1,I2C1_SCL,,,,,,,,,,,EVENTOUT,
+PortB,PB9,,,TIM4_CH4,TIM11_CH1,I2C1_SDA,,,,,,,,,,,EVENTOUT,
+PortB,PB10,,TIM2_CH3,,,I2C2_SCL,,,USART3_TX,,,,,,,,EVENTOUT,
+PortB,PB11,,TIM2_CH4,,,I2C2_SDA,,,USART3_RX,,,,,,,,EVENTOUT,
+PortB,PB12,,,,TIM10_CH1,I2C2_SMBA,SPI2_NSS/I2S2_WS,,USART3_CK,,,,,,,,EVENTOUT,ADC1_IN18
+PortB,PB13,,,,TIM9_CH1,,SPI2_SCK/I2S2_CK,,USART3_CTS,,,,,,,,EVENTOUT,ADC1_IN19
+PortB,PB14,,,,TIM9_CH2,,SPI2_MISO,,USART3_RTS,,,,,,,,EVENTOUT,ADC1_IN20
+PortB,PB15,,,,TIM11_CH1,,SPI2_MOSI/I2S2_SD,,,,,,,,,,EVENTOUT,ADC1_IN21
+PortC,PC0,,,,,,,,,,,,,,,,EVENTOUT,ADC1_IN10
+PortC,PC1,,,,,,,,,,,,,,,,EVENTOUT,ADC1_IN11
+PortC,PC2,,,,,,,,,,,,,,,,EVENTOUT,ADC1_IN12
+PortC,PC3,,,,,,,,,,,,,,,,EVENTOUT,ADC1_IN13
+PortC,PC4,,,,,,,,,,,,,,,,EVENTOUT,ADC1_IN14
+PortC,PC5,,,,,,,,,,,,,,,,EVENTOUT,ADC1_IN15
+PortC,PC6,,,TIM3_CH1,,,I2S2_MCK,,,,,,,,,,EVENTOUT,
+PortC,PC7,,,TIM3_CH2,,,,I2S3_MCK,,,,,,,,,EVENTOUT,
+PortC,PC8,,,TIM3_CH3,,,,,,,,,,,,,EVENTOUT,
+PortC,PC9,,,TIM3_CH4,,,,,,,,,,,,,EVENTOUT,
+PortC,PC10,,,,,,,SPI3_SCK/I2S3_CK,USART3_TX,UART4_TX,,,,,,,EVENTOUT,
+PortC,PC11,,,,,,,SPI3_MISO,USART3_RX,UART4_RX,,,,,,,EVENTOUT,
+PortC,PC12,,,,,,,SPI3_MOSI/I2S3_SD,USART3_CK,UART5_TX,,,,,,,EVENTOUT,
+PortC,PC13,,,,,,,,,,,,,,,,EVENTOUT,
+PortC,PC14,,,,,,,,,,,,,,,,EVENTOUT,
+PortC,PC15,,,,,,,,,,,,,,,,EVENTOUT,
+PortD,PD0,,,,TIM9_CH1,,SPI2_NSS/I2S2_WS,,,,,,,,,,EVENTOUT,
+PortD,PD1,,,,,,SPI2_SCK/I2S2_CK,,,,,,,,,,EVENTOUT,
+PortD,PD2,,,TIM3_ETR,,,,,,UART5_RX,,,,,,,EVENTOUT,
+PortD,PD3,,,,,,SPI2_MISO,,USART2_CTS,,,,,,,,EVENTOUT,
+PortD,PD4,,,,,,SPI2_MOSI/I2S2_SD,,USART2_RTS,,,,,,,,EVENTOUT,
+PortD,PD5,,,,,,,,USART2_TX,,,,,,,,EVENTOUT,
+PortD,PD6,,,,,,,,USART2_RX,,,,,,,,EVENTOUT,
+PortD,PD7,,,,TIM9_CH2,,,,USART2_CK,,,,,,,,EVENTOUT,
+PortD,PD8,,,,,,,,USART3_TX,,,,,,,,EVENTOUT,
+PortD,PD9,,,,,,,,USART3_RX,,,,,,,,EVENTOUT,
+PortD,PD10,,,,,,,,USART3_CK,,,,,,,,EVENTOUT,
+PortD,PD11,,,,,,,,USART3_CTS,,,,,,,,EVENTOUT,
+PortD,PD12,,,TIM4_CH1,,,,,USART3_RTS,,,,,,,,EVENTOUT,
+PortD,PD13,,,TIM4_CH2,,,,,,,,,,,,,EVENTOUT,
+PortD,PD14,,,TIM4_CH3,,,,,,,,,,,,,EVENTOUT,
+PortD,PD15,,,TIM4_CH4,,,,,,,,,,,,,EVENTOUT,
+PortE,PE0,,,TIM4_ETR,TIM10_CH1,,,,,,,,,,,,EVENTOUT,
+PortE,PE1,,,,TIM11_CH1,,,,,,,,,,,,EVENTOUT,
+PortE,PE2,TRACECK,,TIM3_ETR,,,,,,,,,,,,,EVENTOUT,
+PortE,PE3,TRACED0,,TIM3_CH1,,,,,,,,,,,,,EVENTOUT,
+PortE,PE4,TRACED1,,TIM3_CH2,,,,,,,,,,,,,EVENTOUT,
+PortE,PE5,TRACED2,,,TIM9_CH1,,,,,,,,,,,,EVENTOUT,
+PortE,PE6,TRACED3,,,TIM9_CH2,,,,,,,,,,,,EVENTOUT,
+PortE,PE7,,,,,,,,,,,,,,,,EVENTOUT,
+PortE,PE8,,,,,,,,,,,,,,,,EVENTOUT,
+PortE,PE9,,TIM2_CH1_ETR,,,,,,,,,,,,,,EVENTOUT,
+PortE,PE10,,TIM2_CH2,,,,,,,,,,,,,,EVENTOUT,
+PortE,PE11,,TIM2_CH3,,,,,,,,,,,,,,EVENTOUT,
+PortE,PE12,,TIM2_CH4,,,,SPI1_NSS,,,,,,,,,,EVENTOUT,
+PortE,PE13,,,,,,SPI1_SCK,,,,,,,,,,EVENTOUT,
+PortE,PE14,,,,,,SPI1_MISO,,,,,,,,,,EVENTOUT,
+PortE,PE15,,,,,,SPI1_MOSI,,,,,,,,,,EVENTOUT,
+PortF,PF0,,,,,,,,,,,,,,,,EVENTOUT,
+PortF,PF1,,,,,,,,,,,,,,,,EVENTOUT,
+PortF,PF2,,,,,,,,,,,,,,,,EVENTOUT,
+PortF,PF3,,,,,,,,,,,,,,,,EVENTOUT,
+PortF,PF4,,,,,,,,,,,,,,,,EVENTOUT,
+PortF,PF5,,,,,,,,,,,,,,,,EVENTOUT,
+PortF,PF6,,,TIM5_ETR,,,,,,,,,,,,,EVENTOUT,
+PortF,PF7,,,TIM5_CH2,,,,,,,,,,,,,EVENTOUT,
+PortF,PF8,,,TIM5_CH3,,,,,,,,,,,,,EVENTOUT,
+PortF,PF9,,,TIM5_CH4,,,,,,,,,,,,,EVENTOUT,
+PortF,PF10,,,,,,,,,,,,,,,,EVENTOUT,
+PortF,PF11,,,,,,,,,,,,,,,,EVENTOUT,
+PortF,PF12,,,,,,,,,,,,,,,,EVENTOUT,
+PortF,PF13,,,,,,,,,,,,,,,,EVENTOUT,
+PortF,PF14,,,,,,,,,,,,,,,,EVENTOUT,
+PortF,PF15,,,,,,,,,,,,,,,,EVENTOUT,
+PortG,PG0,,,,,,,,,,,,,,,,EVENTOUT,
+PortG,PG1,,,,,,,,,,,,,,,,EVENTOUT,
+PortG,PG2,,,,,,,,,,,,,,,,EVENTOUT,
+PortG,PG3,,,,,,,,,,,,,,,,EVENTOUT,
+PortG,PG4,,,,,,,,,,,,,,,,EVENTOUT,
+PortG,PG5,,,,,,,,,,,,,,,,EVENTOUT,
+PortG,PG6,,,,,,,,,,,,,,,,EVENTOUT,
+PortG,PG7,,,,,,,,,,,,,,,,EVENTOUT,
+PortG,PG8,,,,,,,,,,,,,,,,EVENTOUT,
+PortG,PG9,,,,,,,,,,,,,,,,EVENTOUT,
+PortG,PG10,,,,,,,,,,,,,,,,EVENTOUT,
+PortG,PG11,,,,,,,,,,,,,,,,EVENTOUT,
+PortG,PG12,,,,,,,,,,,,,,,,EVENTOUT,
+PortG,PG13,,,,,,,,,,,,,,,,EVENTOUT,
+PortG,PG14,,,,,,,,,,,,,,,,EVENTOUT,
+PortG,PG15,,,,,,,,,,,,,,,,EVENTOUT,
+PortH,PH0,,,,,,,,,,,,,,,,,
+PortH,PH1,,,,,,,,,,,,,,,,,
+PortH,PH2,,,,,,,,,,,,,,,,,
diff --git a/ports/stm32/boards/stm32l152xe.ld b/ports/stm32/boards/stm32l152xe.ld
new file mode 100644
index 0000000000000..32f8444947e2a
--- /dev/null
+++ b/ports/stm32/boards/stm32l152xe.ld
@@ -0,0 +1,37 @@
+/*
+    GNU linker script for STM32L152xE
+*/
+
+/* Specify the memory areas */
+MEMORY
+{
+    FLASH (rx)      : ORIGIN = 0x08000000, LENGTH = 512K /* entire flash */
+    FLASH_FS (rx)   : ORIGIN = 0x08064000, LENGTH = 112K /* sectors 100-127  */
+    RAM (xrw)       : ORIGIN = 0x20000000, LENGTH = 81408
+    FS_CACHE (xrw)  : ORIGIN = 0x20013e00, LENGTH = 512
+}
+
+/* produce a link error if there is not this amount of RAM for these sections */
+_minimum_stack_size = 2K;
+_minimum_heap_size = 16K;
+
+/* RAM extents for the garbage collector */
+_ram_start = ORIGIN(RAM);
+_ram_end = ORIGIN(RAM) + LENGTH(RAM);
+
+/* Define the stack.  The stack is full descending so begins just above last byte
+   of RAM.  Note that EABI requires the stack to be 8-byte aligned for a call. */
+_estack = ORIGIN(RAM) + LENGTH(RAM) - _estack_reserve;
+_sstack = _estack - 16K; /* tunable */
+
+/* RAM extents for the garbage collector */
+_ram_start = ORIGIN(RAM);
+_ram_end = ORIGIN(RAM) + LENGTH(RAM);
+_heap_start = _ebss; /* heap starts just after statically allocated memory */
+_heap_end = _sstack;
+
+/* Filesystem cache in RAM, and storage in flash */
+_micropy_hw_internal_flash_storage_ram_cache_start = ORIGIN(FS_CACHE);
+_micropy_hw_internal_flash_storage_ram_cache_end = ORIGIN(FS_CACHE) + LENGTH(FS_CACHE);
+_micropy_hw_internal_flash_storage_start = ORIGIN(FLASH_FS);
+_micropy_hw_internal_flash_storage_end = ORIGIN(FLASH_FS) + LENGTH(FLASH_FS);
diff --git a/ports/stm32/boards/stm32l1xx_hal_conf_base.h b/ports/stm32/boards/stm32l1xx_hal_conf_base.h
new file mode 100644
index 0000000000000..b839fd29f0a3d
--- /dev/null
+++ b/ports/stm32/boards/stm32l1xx_hal_conf_base.h
@@ -0,0 +1,99 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2019 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+#ifndef MICROPY_INCLUDED_STM32L1XX_HAL_CONF_BASE_H
+#define MICROPY_INCLUDED_STM32L1XX_HAL_CONF_BASE_H
+
+// Include various HAL modules for convenience
+#include "stm32l1xx_hal_rcc.h"
+#include "stm32l1xx_hal_gpio.h"
+#include "stm32l1xx_hal_dma.h"
+#include "stm32l1xx_hal_cortex.h"
+#include "stm32l1xx_hal_adc.h"
+#include "stm32l1xx_hal_comp.h"
+#include "stm32l1xx_hal_crc.h"
+#include "stm32l1xx_hal_dac.h"
+#include "stm32l1xx_hal_flash.h"
+#include "stm32l1xx_hal_i2c.h"
+#include "stm32l1xx_hal_iwdg.h"
+#include "stm32l1xx_hal_pwr.h"
+#include "stm32l1xx_hal_rtc.h"
+#include "stm32l1xx_hal_spi.h"
+#include "stm32l1xx_hal_tim.h"
+#include "stm32l1xx_hal_uart.h"
+#include "stm32l1xx_hal_usart.h"
+#include "stm32l1xx_hal_wwdg.h"
+#include "stm32l1xx_hal_exti.h"
+#include "stm32l1xx_ll_adc.h"
+#include "stm32l1xx_ll_pwr.h"
+#include "stm32l1xx_ll_rtc.h"
+#include "stm32l1xx_ll_usart.h"
+
+// Enable various HAL modules
+#define HAL_MODULE_ENABLED
+#define HAL_ADC_MODULE_ENABLED
+#define HAL_CORTEX_MODULE_ENABLED
+#define HAL_CRC_MODULE_ENABLED
+#define HAL_DAC_MODULE_ENABLED
+#define HAL_DMA_MODULE_ENABLED
+#define HAL_EXTI_MODULE_ENABLED
+#define HAL_FLASH_MODULE_ENABLED
+#define HAL_GPIO_MODULE_ENABLED
+#define HAL_I2C_MODULE_ENABLED
+#define HAL_PWR_MODULE_ENABLED
+#define HAL_RCC_MODULE_ENABLED
+#define HAL_RTC_MODULE_ENABLED
+#define HAL_SPI_MODULE_ENABLED
+#define HAL_TIM_MODULE_ENABLED
+#define HAL_UART_MODULE_ENABLED
+#define HAL_USART_MODULE_ENABLED
+#define HAL_WWDG_MODULE_ENABLED
+
+// Oscillator values in Hz
+#define HSE_VALUE   (8000000)
+#define HSI_VALUE   (16000000)
+#define HSI48_VALUE (48000000)
+#define LSI_VALUE   (37000)
+#define LSE_VALUE   (32768)
+#define MSI_VALUE   (2097000)
+
+// Oscillator timeouts in ms
+#define HSE_STARTUP_TIMEOUT   (100)
+#define LSE_STARTUP_TIMEOUT   (5000)
+
+// SysTick has the highest priority
+#define TICK_INT_PRIORITY           (0x00)
+
+// Miscellaneous HAL settings
+#define DATA_CACHE_ENABLE           1
+#define INSTRUCTION_CACHE_ENABLE    1
+#define PREFETCH_ENABLE             1
+#define USE_SPI_CRC                 0
+#define USE_RTOS                    0
+
+// HAL parameter assertions are disabled
+#define assert_param(expr) ((void)0)
+
+#endif // MICROPY_INCLUDED_STM32L1XX_HAL_CONF_BASE_H
diff --git a/ports/stm32/dac.c b/ports/stm32/dac.c
index 36ef9387f8737..feadbe5c58170 100644
--- a/ports/stm32/dac.c
+++ b/ports/stm32/dac.c
@@ -261,6 +261,8 @@ STATIC mp_obj_t pyb_dac_init_helper(pyb_dac_obj_t *self, size_t n_args, const mp
     __HAL_RCC_DAC12_CLK_ENABLE();
     #elif defined(STM32F0) || defined(STM32G0) || defined(STM32G4) || defined(STM32L4)
     __HAL_RCC_DAC1_CLK_ENABLE();
+    #elif defined(STM32L1)
+    __HAL_RCC_DAC_CLK_ENABLE();
     #else
     #error Unsupported Processor
     #endif
diff --git a/ports/stm32/dma.c b/ports/stm32/dma.c
index 2dc6e8e8b463b..29306f1b271cc 100644
--- a/ports/stm32/dma.c
+++ b/ports/stm32/dma.c
@@ -80,7 +80,7 @@ typedef union {
 struct _dma_descr_t {
     #if defined(STM32F4) || defined(STM32F7) || defined(STM32H7)
     DMA_Stream_TypeDef *instance;
-    #elif defined(STM32F0) || defined(STM32G0) || defined(STM32G4) || defined(STM32L0) || defined(STM32L4) || defined(STM32WB) || defined(STM32WL)
+    #elif defined(STM32F0) || defined(STM32G0) || defined(STM32G4) || defined(STM32L0) || defined(STM32L1) || defined(STM32L4) || defined(STM32WB) || defined(STM32WL)
     DMA_Channel_TypeDef *instance;
     #else
     #error "Unsupported Processor"
@@ -398,6 +398,57 @@ static const uint8_t dma_irqn[NSTREAM] = {
     DMA1_Channel4_5_6_7_IRQn,
 };
 
+#elif defined(STM32L1)
+
+#define NCONTROLLERS            (2)
+#define NSTREAMS_PER_CONTROLLER (7)
+#define NSTREAM                 (NCONTROLLERS * NSTREAMS_PER_CONTROLLER)
+
+#define DMA_SUB_INSTANCE_AS_UINT8(dma_request) (dma_request)
+
+#define DMA1_ENABLE_MASK (0x007f) // Bits in dma_enable_mask corresponding to DMA1
+#define DMA2_ENABLE_MASK (0x0f80) // Bits in dma_enable_mask corresponding to DMA2
+
+// These descriptors are ordered by DMAx_Channel number, and within a channel by request
+// number. The duplicate streams are ok as long as they aren't used at the same time.
+
+// DMA1 streams
+const dma_descr_t dma_SPI_1_RX = { DMA1_Channel2, 2, dma_id_1,   &dma_init_struct_spi_i2c };
+#if MICROPY_HW_ENABLE_DAC
+const dma_descr_t dma_DAC_1_TX = { DMA1_Channel2, 2, dma_id_1,   &dma_init_struct_dac };
+#endif
+const dma_descr_t dma_SPI_1_TX = { DMA1_Channel3, 3, dma_id_2,   &dma_init_struct_spi_i2c };
+#if MICROPY_HW_ENABLE_DAC
+const dma_descr_t dma_DAC_2_TX = { DMA1_Channel3, 3, dma_id_2,   &dma_init_struct_dac };
+#endif
+const dma_descr_t dma_SPI_2_RX = { DMA1_Channel4, 4, dma_id_3,   &dma_init_struct_spi_i2c };
+const dma_descr_t dma_I2C_2_TX = { DMA1_Channel4, 4, dma_id_3,   &dma_init_struct_spi_i2c };
+const dma_descr_t dma_SPI_2_TX = { DMA1_Channel5, 5, dma_id_4,   &dma_init_struct_spi_i2c };
+const dma_descr_t dma_I2C_2_RX = { DMA1_Channel5, 5, dma_id_4,   &dma_init_struct_spi_i2c };
+const dma_descr_t dma_I2C_1_TX = { DMA1_Channel6, 6, dma_id_5,   &dma_init_struct_spi_i2c };
+const dma_descr_t dma_I2C_1_RX = { DMA1_Channel7, 7, dma_id_6,   &dma_init_struct_spi_i2c };
+
+// DMA2 streams
+const dma_descr_t dma_SPI_3_RX = { DMA2_Channel1, 3, dma_id_7,   &dma_init_struct_spi_i2c };
+const dma_descr_t dma_SPI_3_TX = { DMA2_Channel2, 3, dma_id_8,   &dma_init_struct_spi_i2c };
+
+static const uint8_t dma_irqn[NSTREAM] = {
+    DMA1_Channel1_IRQn,
+    DMA1_Channel2_IRQn,
+    DMA1_Channel3_IRQn,
+    DMA1_Channel4_IRQn,
+    DMA1_Channel5_IRQn,
+    DMA1_Channel6_IRQn,
+    DMA1_Channel7_IRQn,
+    DMA2_Channel1_IRQn,
+    DMA2_Channel2_IRQn,
+    DMA2_Channel3_IRQn,
+    DMA2_Channel4_IRQn,
+    DMA2_Channel5_IRQn,
+    0,
+    0
+};
+
 #elif defined(STM32L4)
 
 #define NCONTROLLERS            (2)
@@ -705,7 +756,7 @@ volatile dma_idle_count_t dma_idle;
 
 #define DMA_INVALID_CHANNEL 0xff    // Value stored in dma_last_channel which means invalid
 
-#if defined(STM32F0) || defined(STM32G0) || defined(STM32L0)
+#if defined(STM32F0) || defined(STM32G0) || defined(STM32L0) || defined(STM32L1)
 #define DMA1_IS_CLK_ENABLED()   ((RCC->AHBENR & RCC_AHBENR_DMA1EN) != 0)
 #if defined(DMA2)
 #define DMA2_IS_CLK_ENABLED()   ((RCC->AHBENR & RCC_AHBENR_DMA2EN) != 0)
@@ -1080,7 +1131,7 @@ void DMA1_Channel4_5_6_7_IRQHandler(void) {
     IRQ_EXIT(DMA1_Channel4_5_6_7_IRQn);
 }
 
-#elif defined(STM32L4) || defined(STM32WB)
+#elif defined(STM32L1) || defined(STM32L4) || defined(STM32WB)
 
 void DMA1_Channel1_IRQHandler(void) {
     IRQ_ENTER(DMA1_Channel1_IRQn);
@@ -1166,6 +1217,7 @@ void DMA2_Channel5_IRQHandler(void) {
     }
     IRQ_EXIT(DMA2_Channel5_IRQn);
 }
+#if !defined(STM32L1)
 void DMA2_Channel6_IRQHandler(void) {
     IRQ_ENTER(DMA2_Channel6_IRQn);
     if (dma_handle[dma_id_12] != NULL) {
@@ -1180,6 +1232,7 @@ void DMA2_Channel7_IRQHandler(void) {
     }
     IRQ_EXIT(DMA2_Channel7_IRQn);
 }
+#endif
 
 #endif
 
@@ -1260,7 +1313,7 @@ void dma_init_handle(DMA_HandleTypeDef *dma, const dma_descr_t *dma_descr, uint3
     #if defined(STM32G0) || defined(STM32G4) || defined(STM32H7) || defined(STM32L0) || defined(STM32L4) || defined(STM32WB) || defined(STM32WL)
     dma->Init.Request = dma_descr->sub_instance;
     #else
-    #if !defined(STM32F0)
+    #if !defined(STM32F0) && !defined(STM32L1)
     dma->Init.Channel = dma_descr->sub_instance;
     #endif
     #endif
@@ -1284,7 +1337,7 @@ void dma_init(DMA_HandleTypeDef *dma, const dma_descr_t *dma_descr, uint32_t dir
 
         dma_enable_clock(dma_id);
 
-        #if defined(STM32G0) || defined(STM32G4) || defined(STM32H7) || defined(STM32L0) || defined(STM32L4) || defined(STM32WB) || defined(STM32WL)
+        #if defined(STM32G0) || defined(STM32G4) || defined(STM32H7) || defined(STM32L0) || defined(STM32L1) || defined(STM32L4) || defined(STM32WB) || defined(STM32WL)
         // Always reset and configure the H7 and G0/G4/H7/L0/L4/WB/WL DMA peripheral
         // (dma->State is set to HAL_DMA_STATE_RESET by memset above)
         // TODO: understand how L0/L4 DMA works so this is not needed
@@ -1410,7 +1463,7 @@ static void dma_idle_handler(uint32_t tick) {
 }
 #endif
 
-#if defined(STM32F0) || defined(STM32G4) || defined(STM32L0) || defined(STM32L4)
+#if defined(STM32F0) || defined(STM32G4) || defined(STM32L0) || defined(STM32L1) || defined(STM32L4)
 
 void dma_nohal_init(const dma_descr_t *descr, uint32_t config) {
     DMA_Channel_TypeDef *dma = descr->instance;
@@ -1436,6 +1489,7 @@ void dma_nohal_init(const dma_descr_t *descr, uint32_t config) {
     #elif defined(STM32G4)
     uint32_t *dmamux_ctrl = (void *)(DMAMUX1_Channel0_BASE + 0x04 * descr->id);
     *dmamux_ctrl = (*dmamux_ctrl & ~(0x7f)) | descr->sub_instance;
+    #elif defined(STM32L1)
     #else
     DMA_Request_TypeDef *dma_ctrl = (void *)(((uint32_t)dma & ~0xff) + (DMA1_CSELR_BASE - DMA1_BASE)); // DMA1_CSELR or DMA2_CSELR
     uint32_t channel_number = (((uint32_t)dma & 0xff) - 0x08) / 20; // 0 through 6
diff --git a/ports/stm32/dma.h b/ports/stm32/dma.h
index 70c7e6a005238..37b8710c214c1 100644
--- a/ports/stm32/dma.h
+++ b/ports/stm32/dma.h
@@ -100,6 +100,20 @@ extern const dma_descr_t dma_I2C_2_RX;
 extern const dma_descr_t dma_I2C_1_TX;
 extern const dma_descr_t dma_I2C_1_RX;
 
+#elif defined(STM32L1)
+extern const dma_descr_t dma_SPI_1_RX;
+extern const dma_descr_t dma_SPI_3_TX;
+extern const dma_descr_t dma_SPI_1_TX;
+extern const dma_descr_t dma_SPI_3_RX;
+extern const dma_descr_t dma_DAC_1_TX;
+extern const dma_descr_t dma_SPI_2_RX;
+extern const dma_descr_t dma_I2C_2_TX;
+extern const dma_descr_t dma_DAC_2_TX;
+extern const dma_descr_t dma_SPI_2_TX;
+extern const dma_descr_t dma_I2C_2_RX;
+extern const dma_descr_t dma_I2C_1_TX;
+extern const dma_descr_t dma_I2C_1_RX;
+
 #elif defined(STM32L4) || defined(STM32WB) || defined(STM32WL)
 
 extern const dma_descr_t dma_ADC_1_RX;
diff --git a/ports/stm32/extint.c b/ports/stm32/extint.c
index ca23261ca736e..fd7950de3e953 100644
--- a/ports/stm32/extint.c
+++ b/ports/stm32/extint.c
@@ -210,7 +210,11 @@ STATIC const uint8_t nvic_irq_channel[EXTI_NUM_VECTORS] = {
     #endif
     ETH_WKUP_IRQn,
     OTG_HS_WKUP_IRQn,
+    #if defined(STM32L1)
+    TAMPER_STAMP_IRQn,
+    #else
     TAMP_STAMP_IRQn,
+    #endif
     RTC_WKUP_IRQn,
     #endif
 
diff --git a/ports/stm32/extint.h b/ports/stm32/extint.h
index 95e29c97fdc7e..fddcc2ae7a017 100644
--- a/ports/stm32/extint.h
+++ b/ports/stm32/extint.h
@@ -43,7 +43,7 @@
 #endif
 #define EXTI_ETH_WAKEUP         (19)
 #define EXTI_USB_OTG_HS_WAKEUP  (20)
-#if defined(STM32F0) || defined(STM32G4) || defined(STM32L4) || defined(STM32WL)
+#if defined(STM32F0) || defined(STM32G4) || defined(STM32L1) || defined(STM32L4) || defined(STM32WL)
 #define EXTI_RTC_TIMESTAMP      (19)
 #define EXTI_RTC_WAKEUP         (20)
 #elif defined(STM32H7) || defined(STM32WB)
diff --git a/ports/stm32/flash.c b/ports/stm32/flash.c
index de537aba212de..16af49c3cfb8a 100644
--- a/ports/stm32/flash.c
+++ b/ports/stm32/flash.c
@@ -117,6 +117,12 @@ static const flash_layout_t flash_layout[] = {
     { (uint32_t)FLASH_BASE, (uint32_t)FLASH_PAGE_SIZE, 512 },
 };
 
+#elif defined(STM32L1)
+
+static const flash_layout_t flash_layout[] = {
+    { (uint32_t)FLASH_BASE, 0x200, 1024 },
+};
+
 #elif defined(STM32H7)
 
 static const flash_layout_t flash_layout[] = {
@@ -264,7 +270,7 @@ int flash_erase(uint32_t flash_dest, uint32_t num_word32) {
     EraseInitStruct.Page = get_page(flash_dest);
     EraseInitStruct.Banks = get_bank(flash_dest);
     EraseInitStruct.NbPages = (4 * num_word32 + FLASH_PAGE_SIZE - 4) / FLASH_PAGE_SIZE;
-    #elif defined(STM32L0)
+    #elif defined(STM32L0) || defined(STM32L1)
     __HAL_FLASH_CLEAR_FLAG(FLASH_FLAG_EOP | FLASH_FLAG_WRPERR | FLASH_FLAG_PGAERR);
     EraseInitStruct.TypeErase = FLASH_TYPEERASE_PAGES;
     EraseInitStruct.PageAddress = flash_dest;
@@ -286,6 +292,8 @@ int flash_erase(uint32_t flash_dest, uint32_t num_word32) {
 
     #if defined(STM32H7)
     __HAL_FLASH_CLEAR_FLAG(FLASH_FLAG_ALL_ERRORS_BANK1 | FLASH_FLAG_ALL_ERRORS_BANK2);
+    #elif defined(STM32L1)
+    __HAL_FLASH_CLEAR_FLAG(FLASH_FLAG_EOP | FLASH_FLAG_WRPERR | FLASH_FLAG_PGAERR);
     #else
     __HAL_FLASH_CLEAR_FLAG(FLASH_FLAG_EOP | FLASH_FLAG_OPERR | FLASH_FLAG_WRPERR |
         FLASH_FLAG_PGAERR | FLASH_FLAG_PGPERR | FLASH_FLAG_PGSERR);
diff --git a/ports/stm32/machine_adc.c b/ports/stm32/machine_adc.c
index 000b478f86b04..1a478cd1cffb4 100644
--- a/ports/stm32/machine_adc.c
+++ b/ports/stm32/machine_adc.c
@@ -42,7 +42,7 @@
 #define ADCx_COMMON __LL_ADC_COMMON_INSTANCE(0)
 #endif
 
-#if defined(STM32F0) || defined(STM32G0) || defined(STM32L0) || defined(STM32WL)
+#if defined(STM32F0) || defined(STM32G0) || defined(STM32L0) || defined(STM32L1) || defined(STM32WL)
 #define ADC_STAB_DELAY_US (1)
 #define ADC_TEMPSENSOR_DELAY_US (10)
 #elif defined(STM32G4)
@@ -68,6 +68,9 @@
 #elif defined(STM32G0) || defined(STM32L0) || defined(STM32WL)
 #define ADC_SAMPLETIME_DEFAULT      ADC_SAMPLETIME_12CYCLES_5
 #define ADC_SAMPLETIME_DEFAULT_INT  ADC_SAMPLETIME_160CYCLES_5
+#elif defined(STM32L1)
+#define ADC_SAMPLETIME_DEFAULT      ADC_SAMPLETIME_384CYCLES
+#define ADC_SAMPLETIME_DEFAULT_INT  ADC_SAMPLETIME_384CYCLES
 #elif defined(STM32L4) || defined(STM32WB)
 #define ADC_SAMPLETIME_DEFAULT      ADC_SAMPLETIME_12CYCLES_5
 #define ADC_SAMPLETIME_DEFAULT_INT  ADC_SAMPLETIME_247CYCLES_5
@@ -239,7 +242,7 @@ void adc_config(ADC_TypeDef *adc, uint32_t bits) {
 STATIC int adc_get_bits(ADC_TypeDef *adc) {
     #if defined(STM32F0) || defined(STM32G0) || defined(STM32L0) || defined(STM32WL)
     uint32_t res = (adc->CFGR1 & ADC_CFGR1_RES) >> ADC_CFGR1_RES_Pos;
-    #elif defined(STM32F4) || defined(STM32F7)
+    #elif defined(STM32F4) || defined(STM32F7) || defined(STM32L1)
     uint32_t res = (adc->CR1 & ADC_CR1_RES) >> ADC_CR1_RES_Pos;
     #elif defined(STM32G4) || defined(STM32H7) || defined(STM32L4) || defined(STM32WB)
     uint32_t res = (adc->CFGR & ADC_CFGR_RES) >> ADC_CFGR_RES_Pos;
diff --git a/ports/stm32/modmachine.c b/ports/stm32/modmachine.c
index acedac7a599a7..e1796d1cf025a 100644
--- a/ports/stm32/modmachine.c
+++ b/ports/stm32/modmachine.c
@@ -138,7 +138,7 @@ void machine_init(void) {
         if (state & RCC_SR_IWDGRSTF || state & RCC_SR_WWDGRSTF) {
             reset_cause = PYB_RESET_WDT;
         } else if (state & RCC_SR_PORRSTF
-                   #if !defined(STM32F0) && !defined(STM32F412Zx)
+                   #if !defined(STM32F0) && !defined(STM32F412Zx) && !defined(STM32L1)
                    || state & RCC_SR_BORRSTF
                    #endif
                    ) {
@@ -309,7 +309,7 @@ STATIC mp_obj_t machine_freq(size_t n_args, const mp_obj_t *args) {
         return mp_obj_new_tuple(MP_ARRAY_SIZE(tuple), tuple);
     } else {
         // set
-        #if defined(STM32F0) || defined(STM32L0) || defined(STM32L4) || defined(STM32G0)
+        #if defined(STM32F0) || defined(STM32L0) || defined(STM32L1) || defined(STM32L4) || defined(STM32G0)
         mp_raise_NotImplementedError(MP_ERROR_TEXT("machine.freq set not supported yet"));
         #else
         mp_int_t sysclk = mp_obj_get_int(args[0]);
diff --git a/ports/stm32/mpconfigboard_common.h b/ports/stm32/mpconfigboard_common.h
index 51bad18dd53ed..b538f78235487 100644
--- a/ports/stm32/mpconfigboard_common.h
+++ b/ports/stm32/mpconfigboard_common.h
@@ -370,6 +370,16 @@
 #define MICROPY_HW_MAX_UART (5)
 #define MICROPY_HW_MAX_LPUART (1)
 
+// Configuration for STM32L1 series
+#elif defined(STM32L1)
+#define MP_HAL_UNIQUE_ID_ADDRESS (UID_BASE)
+#define PYB_EXTI_NUM_VECTORS (23)
+#define MICROPY_HW_MAX_I2C (2)
+// TODO: L1 has 9 timers but tim0 and tim1 don't exist.
+#define MICROPY_HW_MAX_TIMER (11)
+#define MICROPY_HW_MAX_UART (5)
+#define MICROPY_HW_MAX_LPUART (0)
+
 // Configuration for STM32L4 series
 #elif defined(STM32L4)
 
diff --git a/ports/stm32/mphalport.c b/ports/stm32/mphalport.c
index 619bde69bf064..092d63e1bb19e 100644
--- a/ports/stm32/mphalport.c
+++ b/ports/stm32/mphalport.c
@@ -87,7 +87,7 @@ void mp_hal_gpio_clock_enable(GPIO_TypeDef *gpio) {
 
     // This logic assumes that all the GPIOx_EN bits are adjacent and ordered in one register
 
-    #if defined(STM32F0)
+    #if defined(STM32F0) || defined(STM32L1)
     #define AHBxENR AHBENR
     #define AHBxENR_GPIOAEN_Pos RCC_AHBENR_GPIOAEN_Pos
     #elif defined(STM32F4) || defined(STM32F7)
diff --git a/ports/stm32/mphalport.h b/ports/stm32/mphalport.h
index 358d9cd25d0da..5c587c016d041 100644
--- a/ports/stm32/mphalport.h
+++ b/ports/stm32/mphalport.h
@@ -17,6 +17,8 @@
 #define MICROPY_PLATFORM_VERSION "HAL1.6.0"
 #elif defined(STM32L0)
 #define MICROPY_PLATFORM_VERSION "HAL1.11.2"
+#elif defined(STM32L1)
+#define MICROPY_PLATFORM_VERSION "HAL1.10.3"
 #elif defined(STM32L4)
 #define MICROPY_PLATFORM_VERSION "HAL1.17.0"
 #elif defined(STM32WB)
diff --git a/ports/stm32/powerctrl.c b/ports/stm32/powerctrl.c
index f3f1837ece651..c0a0595e5d31b 100644
--- a/ports/stm32/powerctrl.c
+++ b/ports/stm32/powerctrl.c
@@ -143,7 +143,7 @@ void powerctrl_check_enter_bootloader(void) {
     if (BL_STATE_GET_KEY(bl_state) == BL_STATE_KEY && (RCC->RCC_SR & RCC_SR_SFTRSTF)) {
         // Reset by NVIC_SystemReset with bootloader data set -> branch to bootloader
         RCC->RCC_SR = RCC_SR_RMVF;
-        #if defined(STM32F0) || defined(STM32F4) || defined(STM32G0) || defined(STM32G4) || defined(STM32L0) || defined(STM32L4) || defined(STM32WB)
+        #if defined(STM32F0) || defined(STM32F4) || defined(STM32G0) || defined(STM32G4) || defined(STM32L0) || defined(STM32L1) || defined(STM32L4) || defined(STM32WB)
         __HAL_SYSCFG_REMAPMEMORY_SYSTEMFLASH();
         #endif
         branch_to_bootloader(BL_STATE_GET_REG(bl_state), BL_STATE_GET_ADDR(bl_state));
@@ -286,7 +286,7 @@ int powerctrl_rcc_clock_config_pll(RCC_ClkInitTypeDef *rcc_init, uint32_t sysclk
 
 #endif
 
-#if !defined(STM32F0) && !defined(STM32G0) && !defined(STM32L0) && !defined(STM32L4)
+#if !defined(STM32F0) && !defined(STM32G0) && !defined(STM32L0) && !defined(STM32L1) && !defined(STM32L4)
 
 STATIC uint32_t calc_ahb_div(uint32_t wanted_div) {
     #if defined(STM32H7)
@@ -708,7 +708,7 @@ void powerctrl_enter_stop_mode(void) {
     __HAL_RCC_WAKEUPSTOP_CLK_CONFIG(RCC_STOP_WAKEUPCLOCK_MSI);
     #endif
 
-    #if !defined(STM32F0) && !defined(STM32G0) && !defined(STM32G4) && !defined(STM32L0) && !defined(STM32L4) && !defined(STM32WB) && !defined(STM32WL)
+    #if !defined(STM32F0) && !defined(STM32G0) && !defined(STM32G4) && !defined(STM32L0) && !defined(STM32L1) && !defined(STM32L4) && !defined(STM32WB) && !defined(STM32WL)
     // takes longer to wake but reduces stop current
     HAL_PWREx_EnableFlashPowerDown();
     #endif
diff --git a/ports/stm32/powerctrlboot.c b/ports/stm32/powerctrlboot.c
index 555457c582e2f..61d48ffe5c953 100644
--- a/ports/stm32/powerctrlboot.c
+++ b/ports/stm32/powerctrlboot.c
@@ -228,6 +228,74 @@ void SystemClock_Config(void) {
     #endif
 }
 
+#elif defined(STM32L1)
+
+void SystemClock_Config(void) {
+    // Enable power control peripheral
+    __HAL_RCC_PWR_CLK_ENABLE();
+
+    // Set power voltage scaling
+    __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1);
+
+    // Enable the FLASH 64-bit access
+    FLASH->ACR = FLASH_ACR_ACC64;
+    // Set flash latency to 1 because SYSCLK > 16MHz
+    FLASH->ACR |= MICROPY_HW_FLASH_LATENCY;
+
+    #if MICROPY_HW_CLK_USE_HSI
+    // Enable the 16MHz internal oscillator
+    RCC->CR |= RCC_CR_HSION;
+    while (!(RCC->CR & RCC_CR_HSIRDY)) {
+    }
+    RCC->CFGR = RCC_CFGR_PLLSRC_HSI;
+    #else
+    // Enable the 8MHz external oscillator
+    RCC->CR |= RCC_CR_HSEBYP;
+    RCC->CR |= RCC_CR_HSEON;
+    while (!(RCC->CR & RCC_CR_HSERDY)) {
+    }
+    RCC->CFGR = RCC_CFGR_PLLSRC_HSE;
+    #endif
+    // Use HSI16 and the PLL to get a 32MHz SYSCLK
+    RCC->CFGR |= MICROPY_HW_CLK_PLLMUL | MICROPY_HW_CLK_PLLDIV;
+    RCC->CR |= RCC_CR_PLLON;
+    while (!(RCC->CR & RCC_CR_PLLRDY)) {
+        // Wait for PLL to lock
+    }
+    RCC->CFGR |= RCC_CFGR_SW_PLL;
+
+    while ((RCC->CFGR & RCC_CFGR_SWS_Msk) != RCC_CFGR_SWS_PLL) {
+        // Wait for SYSCLK source to change
+    }
+
+    SystemCoreClockUpdate();
+    powerctrl_config_systick();
+
+    #if MICROPY_HW_ENABLE_USB
+    // Enable the 48MHz internal oscillator
+    RCC->CRRCR |= RCC_CRRCR_HSI48ON;
+    RCC->APB2ENR |= RCC_APB2ENR_SYSCFGEN;
+    SYSCFG->CFGR3 |= SYSCFG_CFGR3_ENREF_HSI48;
+    while (!(RCC->CRRCR & RCC_CRRCR_HSI48RDY)) {
+        // Wait for HSI48 to be ready
+    }
+
+    // Select RC48 as HSI48 for USB and RNG
+    RCC->CCIPR |= RCC_CCIPR_HSI48SEL;
+
+    // Synchronise HSI48 with 1kHz USB SoF
+    __HAL_RCC_CRS_CLK_ENABLE();
+    CRS->CR = 0x20 << CRS_CR_TRIM_Pos;
+    CRS->CFGR = 2 << CRS_CFGR_SYNCSRC_Pos | 0x22 << CRS_CFGR_FELIM_Pos
+        | __HAL_RCC_CRS_RELOADVALUE_CALCULATE(48000000, 1000) << CRS_CFGR_RELOAD_Pos;
+    #endif
+
+    // Disable the Debug Module in low-power mode due to prevent
+    // unexpected HardFault after __WFI().
+    #if !defined(NDEBUG)
+    DBGMCU->CR &= ~(DBGMCU_CR_DBG_SLEEP | DBGMCU_CR_DBG_STOP | DBGMCU_CR_DBG_STANDBY);
+    #endif
+}
 #elif defined(STM32WB)
 
 #include "stm32wbxx_ll_hsem.h"
diff --git a/ports/stm32/resethandler_m3.s b/ports/stm32/resethandler_m3.s
new file mode 100644
index 0000000000000..05a44306e1eb6
--- /dev/null
+++ b/ports/stm32/resethandler_m3.s
@@ -0,0 +1,75 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2018 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+    .syntax unified
+    .cpu cortex-m3
+    .fpu softvfp
+    .thumb
+
+    .section .text.Reset_Handler
+    .global Reset_Handler
+    .type Reset_Handler, %function
+
+Reset_Handler:
+    /* Save the first argument to pass through to stm32_main */
+    mov  r4, r0
+
+    /* Load the stack pointer */
+    ldr  r0, =_estack
+    mov  sp, r0
+
+    /* Initialise the data section */
+    ldr  r1, =_sidata
+    ldr  r2, =_sdata
+    ldr  r3, =_edata
+    b    .data_copy_entry
+.data_copy_loop:
+    ldr  r0, [r1]
+    adds r1, #4
+    str  r0, [r2]
+    adds r2, #4
+.data_copy_entry:
+    cmp  r2, r3
+    bcc  .data_copy_loop
+
+    /* Zero out the BSS section */
+    movs r0, #0
+    ldr  r1, =_sbss
+    ldr  r2, =_ebss
+    b    .bss_zero_entry
+.bss_zero_loop:
+    str  r0, [r1]
+    adds r1, #4
+.bss_zero_entry:
+    cmp  r1, r2
+    bcc  .bss_zero_loop
+
+    /* Initialise the system and jump to the main code */
+    bl   SystemInit
+    mov  r0, r4
+    bl   stm32_main
+
+    .size Reset_Handler, .-Reset_Handler
diff --git a/ports/stm32/rtc.c b/ports/stm32/rtc.c
index aacfc3805e97c..874e427cffa01 100644
--- a/ports/stm32/rtc.c
+++ b/ports/stm32/rtc.c
@@ -91,6 +91,15 @@ STATIC bool rtc_need_init_finalise = false;
 #define RCC_BDCR_LSEON RCC_CSR_LSEON
 #define RCC_BDCR_LSERDY RCC_CSR_LSERDY
 #define RCC_BDCR_LSEBYP RCC_CSR_LSEBYP
+#elif defined(STM32L1)
+#define BDCR CR
+#define RCC_BDCR_RTCEN RCC_CSR_RTCEN
+#define RCC_BDCR_RTCSEL RCC_CSR_RTCSEL
+#define RCC_BDCR_RTCSEL_0 RCC_CSR_RTCSEL_0
+#define RCC_BDCR_RTCSEL_1 RCC_CSR_RTCSEL_1
+#define RCC_BDCR_LSEON RCC_CSR_LSEON
+#define RCC_BDCR_LSERDY RCC_CSR_LSERDY
+#define RCC_BDCR_LSEBYP RCC_CSR_LSEBYP
 #endif
 
 void rtc_init_start(bool force_init) {
@@ -664,7 +673,15 @@ mp_obj_t pyb_rtc_wakeup(size_t n_args, const mp_obj_t *args) {
                 wucksel -= 1;
             }
             if (div <= 16) {
+                #if defined(STM32L1)
+                if (rtc_use_lse) {
+                    wut = LSE_VALUE / div * ms / 1000;
+                } else {
+                    wut = LSI_VALUE / div * ms / 1000;
+                }
+                #else
                 wut = 32768 / div * ms / 1000;
+                #endif
             } else {
                 // use 1Hz clock
                 wucksel = 4;
diff --git a/ports/stm32/stm32.mk b/ports/stm32/stm32.mk
index c55b243fe5734..b4f73a67f381d 100644
--- a/ports/stm32/stm32.mk
+++ b/ports/stm32/stm32.mk
@@ -48,7 +48,7 @@ CFLAGS_CORTEX_M += -mfpu=fpv5-d16 -mfloat-abi=hard
 SUPPORTS_HARDWARE_FP_SINGLE = 1
 SUPPORTS_HARDWARE_FP_DOUBLE = 1
 else
-ifeq ($(MCU_SERIES),$(filter $(MCU_SERIES),f0 g0 l0 wl))
+ifeq ($(MCU_SERIES),$(filter $(MCU_SERIES),f0 g0 l0 l1 wl))
 CFLAGS_CORTEX_M += -msoft-float
 else
 CFLAGS_CORTEX_M += -mfpu=fpv4-sp-d16 -mfloat-abi=hard
@@ -64,6 +64,7 @@ CFLAGS_MCU_f7 = $(CFLAGS_CORTEX_M) -mtune=cortex-m7 -mcpu=cortex-m7
 CFLAGS_MCU_g0 = $(CFLAGS_CORTEX_M) -mtune=cortex-m0plus -mcpu=cortex-m0plus
 CFLAGS_MCU_g4 = $(CFLAGS_CORTEX_M) -mtune=cortex-m4 -mcpu=cortex-m4
 CFLAGS_MCU_l0 = $(CFLAGS_CORTEX_M) -mtune=cortex-m0plus -mcpu=cortex-m0plus
+CFLAGS_MCU_l1 = $(CFLAGS_CORTEX_M) -mtune=cortex-m3 -mcpu=cortex-m3
 CFLAGS_MCU_l4 = $(CFLAGS_CORTEX_M) -mtune=cortex-m4 -mcpu=cortex-m4
 CFLAGS_MCU_h7 = $(CFLAGS_CORTEX_M) -mtune=cortex-m7 -mcpu=cortex-m7
 CFLAGS_MCU_wb = $(CFLAGS_CORTEX_M) -mtune=cortex-m4 -mcpu=cortex-m4
diff --git a/ports/stm32/stm32_it.c b/ports/stm32/stm32_it.c
index 2f89f67deb539..c2604992186f9 100644
--- a/ports/stm32/stm32_it.c
+++ b/ports/stm32/stm32_it.c
@@ -520,11 +520,19 @@ void ETH_WKUP_IRQHandler(void) {
 }
 #endif
 
+#if defined(STM32L1)
+void TAMPER_STAMP_IRQHandler(void) {
+    IRQ_ENTER(TAMPER_STAMP_IRQn);
+    Handle_EXTI_Irq(EXTI_RTC_TIMESTAMP);
+    IRQ_EXIT(TAMPER_STAMP_IRQn);
+}
+#else
 void TAMP_STAMP_IRQHandler(void) {
     IRQ_ENTER(TAMP_STAMP_IRQn);
     Handle_EXTI_Irq(EXTI_RTC_TIMESTAMP);
     IRQ_EXIT(TAMP_STAMP_IRQn);
 }
+#endif
 
 void RTC_WKUP_IRQHandler(void) {
     IRQ_ENTER(RTC_WKUP_IRQn);
@@ -698,6 +706,12 @@ void TIM6_DAC_LPTIM1_IRQHandler(void) {
     timer_irq_handler(6);
     IRQ_EXIT(TIM6_DAC_LPTIM1_IRQn);
 }
+#elif defined(STM32L1)
+void TIM6_IRQHandler(void) {
+    IRQ_ENTER(TIM6_IRQn);
+    timer_irq_handler(6);
+    IRQ_EXIT(TIM6_IRQn);
+}
 #else
 void TIM6_DAC_IRQHandler(void) {
     IRQ_ENTER(TIM6_DAC_IRQn);
@@ -764,6 +778,26 @@ void TIM8_TRG_COM_TIM14_IRQHandler(void) {
 }
 #endif
 
+#if defined(STM32L1)
+void TIM9_IRQHandler(void) {
+    IRQ_ENTER(TIM9_IRQn);
+    timer_irq_handler(9);
+    IRQ_EXIT(TIM9_IRQn);
+}
+
+void TIM10_IRQHandler(void) {
+    IRQ_ENTER(TIM9_IRQn);
+    timer_irq_handler(10);
+    IRQ_EXIT(TIM9_IRQn);
+}
+
+void TIM11_IRQHandler(void) {
+    IRQ_ENTER(TIM9_IRQn);
+    timer_irq_handler(11);
+    IRQ_EXIT(TIM9_IRQn);
+}
+#endif
+
 #if defined(STM32G0)
 void TIM14_IRQHandler(void) {
     IRQ_ENTER(TIM14_IRQn);
diff --git a/ports/stm32/timer.c b/ports/stm32/timer.c
index 7a6ccd4dfd2d9..8816c218f5e32 100644
--- a/ports/stm32/timer.c
+++ b/ports/stm32/timer.c
@@ -431,7 +431,7 @@ STATIC mp_obj_t compute_percent_from_pwm_value(uint32_t period, uint32_t cmp) {
     #endif
 }
 
-#if !defined(STM32L0)
+#if !defined(STM32L0) && !defined(STM32L1)
 
 // Computes the 8-bit value for the DTG field in the BDTR register.
 //
@@ -522,7 +522,7 @@ STATIC void pyb_timer_print(const mp_print_t *print, mp_obj_t self_in, mp_print_
             self->tim.Init.ClockDivision == TIM_CLOCKDIVISION_DIV4 ? 4 :
             self->tim.Init.ClockDivision == TIM_CLOCKDIVISION_DIV2 ? 2 : 1);
 
-        #if !defined(STM32L0)
+        #if !defined(STM32L0) && !defined(STM32L1)
         #if defined(IS_TIM_ADVANCED_INSTANCE)
         if (IS_TIM_ADVANCED_INSTANCE(self->tim.Instance))
         #elif defined(IS_TIM_BREAK_INSTANCE)
@@ -640,7 +640,7 @@ STATIC mp_obj_t pyb_timer_init_helper(pyb_timer_obj_t *self, size_t n_args, cons
         args[ARG_div].u_int == 4 ? TIM_CLOCKDIVISION_DIV4 :
         TIM_CLOCKDIVISION_DIV1;
 
-    #if !defined(STM32L0)
+    #if !defined(STM32L0) && !defined(STM32L1)
     init->RepetitionCounter = 0;
     #endif
 
@@ -772,7 +772,7 @@ STATIC mp_obj_t pyb_timer_init_helper(pyb_timer_obj_t *self, size_t n_args, cons
 
     // init TIM
     HAL_TIM_Base_Init(&self->tim);
-    #if !defined(STM32L0)
+    #if !defined(STM32L0) && !defined(STM32L1)
     #if defined(IS_TIM_ADVANCED_INSTANCE)
     if (IS_TIM_ADVANCED_INSTANCE(self->tim.Instance))
     #elif defined(IS_TIM_BREAK_INSTANCE)
@@ -833,7 +833,7 @@ STATIC const uint32_t tim_instance_table[MICROPY_HW_MAX_TIMER] = {
     TIM_ENTRY(5, TIM5_IRQn),
     #endif
     #if defined(TIM6)
-    #if defined(STM32F412Zx)
+    #if defined(STM32F412Zx) || defined(STM32L1)
     TIM_ENTRY(6, TIM6_IRQn),
     #elif defined(STM32G0)
     TIM_ENTRY(6, TIM6_DAC_LPTIM1_IRQn),
@@ -858,14 +858,26 @@ STATIC const uint32_t tim_instance_table[MICROPY_HW_MAX_TIMER] = {
     #endif
     #endif
     #if defined(TIM9)
+    #if defined(STM32L1)
+    TIM_ENTRY(9, TIM9_IRQn),
+    #else
     TIM_ENTRY(9, TIM1_BRK_TIM9_IRQn),
     #endif
+    #endif
     #if defined(TIM10)
+    #if defined(STM32L1)
+    TIM_ENTRY(10, TIM10_IRQn),
+    #else
     TIM_ENTRY(10, TIM1_UP_TIM10_IRQn),
     #endif
+    #endif
     #if defined(TIM11)
+    #if defined(STM32L1)
+    TIM_ENTRY(11, TIM11_IRQn),
+    #else
     TIM_ENTRY(11, TIM1_TRG_COM_TIM11_IRQn),
     #endif
+    #endif
     #if defined(TIM12)
     TIM_ENTRY(12, TIM8_BRK_TIM12_IRQn),
     #endif
@@ -936,7 +948,11 @@ STATIC mp_obj_t pyb_timer_make_new(const mp_obj_type_t *type, size_t n_args, siz
         memset(tim, 0, sizeof(*tim));
         tim->base.type = &pyb_timer_type;
         tim->tim_id = tim_id;
+        #if defined(STM32L1)
+        tim->is_32bit = tim_id == 5;
+        #else
         tim->is_32bit = tim_id == 2 || tim_id == 5;
+        #endif
         tim->callback = mp_const_none;
         uint32_t ti = tim_instance_table[tim_id - 1];
         tim->tim.Instance = (TIM_TypeDef *)(ti & 0xffffff00);
@@ -1168,7 +1184,7 @@ STATIC mp_obj_t pyb_timer_channel(size_t n_args, const mp_obj_t *pos_args, mp_ma
             }
             oc_config.OCPolarity = TIM_OCPOLARITY_HIGH;
             oc_config.OCFastMode = TIM_OCFAST_DISABLE;
-            #if !defined(STM32L0)
+            #if !defined(STM32L0) && !defined(STM32L1)
             oc_config.OCNPolarity = TIM_OCNPOLARITY_HIGH;
             oc_config.OCIdleState = TIM_OCIDLESTATE_SET;
             oc_config.OCNIdleState = TIM_OCNIDLESTATE_SET;
@@ -1180,7 +1196,7 @@ STATIC mp_obj_t pyb_timer_channel(size_t n_args, const mp_obj_t *pos_args, mp_ma
             } else {
                 pyb_timer_channel_callback(MP_OBJ_FROM_PTR(chan), chan->callback);
             }
-            #if !defined(STM32L0)
+            #if !defined(STM32L0) && !defined(STM32L1)
             // Start the complimentary channel too (if its supported)
             if (IS_TIM_CCXN_INSTANCE(self->tim.Instance, TIMER_CHANNEL(chan))) {
                 HAL_TIMEx_PWMN_Start(&self->tim, TIMER_CHANNEL(chan));
@@ -1203,7 +1219,7 @@ STATIC mp_obj_t pyb_timer_channel(size_t n_args, const mp_obj_t *pos_args, mp_ma
                 oc_config.OCPolarity = TIM_OCPOLARITY_HIGH;
             }
             oc_config.OCFastMode = TIM_OCFAST_DISABLE;
-            #if !defined(STM32L0)
+            #if !defined(STM32L0) && !defined(STM32L1)
             if (oc_config.OCPolarity == TIM_OCPOLARITY_HIGH) {
                 oc_config.OCNPolarity = TIM_OCNPOLARITY_HIGH;
             } else {
@@ -1222,7 +1238,7 @@ STATIC mp_obj_t pyb_timer_channel(size_t n_args, const mp_obj_t *pos_args, mp_ma
             } else {
                 pyb_timer_channel_callback(MP_OBJ_FROM_PTR(chan), chan->callback);
             }
-            #if !defined(STM32L0)
+            #if !defined(STM32L0) && !defined(STM32L1)
             // Start the complimentary channel too (if its supported)
             if (IS_TIM_CCXN_INSTANCE(self->tim.Instance, TIMER_CHANNEL(chan))) {
                 HAL_TIMEx_OCN_Start(&self->tim, TIMER_CHANNEL(chan));
diff --git a/ports/stm32/uart.c b/ports/stm32/uart.c
index cea49f4ba1c9b..6d1240cf8d5aa 100644
--- a/ports/stm32/uart.c
+++ b/ports/stm32/uart.c
@@ -38,7 +38,7 @@
 #include "irq.h"
 #include "pendsv.h"
 
-#if defined(STM32F4)
+#if defined(STM32F4) || defined(STM32L1)
 #define UART_RXNE_IS_SET(uart) ((uart)->SR & USART_SR_RXNE)
 #else
 #if defined(STM32G0) || defined(STM32H7) || defined(STM32WL)
@@ -101,6 +101,11 @@
 #define USART_CR2_IE_ALL (USART_CR2_IE_BASE)
 #define USART_CR3_IE_ALL (USART_CR3_IE_BASE | USART_CR3_WUFIE)
 
+#elif defined(STM32L1)
+#define USART_CR1_IE_ALL (USART_CR1_IE_BASE)
+#define USART_CR2_IE_ALL (USART_CR2_IE_BASE)
+#define USART_CR3_IE_ALL (USART_CR3_IE_BASE)
+
 #elif defined(STM32L4) || defined(STM32WB) || defined(STM32WL)
 #define USART_CR1_IE_ALL (USART_CR1_IE_BASE | USART_CR1_EOBIE | USART_CR1_RTOIE | USART_CR1_CMIE)
 #define USART_CR2_IE_ALL (USART_CR2_IE_BASE)
@@ -580,7 +585,7 @@ bool uart_init(pyb_uart_obj_t *uart_obj,
     huart.FifoMode = UART_FIFOMODE_ENABLE;
     #endif
 
-    #if !defined(STM32F4)
+    #if !defined(STM32F4) && !defined(STM32L1)
     huart.Init.OneBitSampling = UART_ONE_BIT_SAMPLE_DISABLE;
     #endif
 
@@ -1016,7 +1021,7 @@ STATIC bool uart_wait_flag_set(pyb_uart_obj_t *self, uint32_t flag, uint32_t tim
     // an interrupt and the flag can be set quickly if the baudrate is large.
     uint32_t start = HAL_GetTick();
     for (;;) {
-        #if defined(STM32F4)
+        #if defined(STM32F4) || defined(STM32L1)
         if (self->uartx->SR & flag) {
             return true;
         }
@@ -1071,7 +1076,7 @@ size_t uart_tx_data(pyb_uart_obj_t *self, const void *src_in, size_t num_chars,
         } else {
             data = *src++;
         }
-        #if defined(STM32F4)
+        #if defined(STM32F4) || defined(STM32L1)
         uart->DR = data;
         #else
         uart->TDR = data;
@@ -1109,7 +1114,7 @@ void uart_irq_handler(mp_uint_t uart_id) {
     }
 
     // Capture IRQ status flags.
-    #if defined(STM32F4)
+    #if defined(STM32F4) || defined(STM32L1)
     self->mp_irq_flags = self->uartx->SR;
     bool rxne_is_set = self->mp_irq_flags & USART_SR_RXNE;
     bool did_clear_sr = false;
@@ -1153,7 +1158,7 @@ void uart_irq_handler(mp_uint_t uart_id) {
     }
 
     // Clear other interrupt flags that can trigger this IRQ handler.
-    #if defined(STM32F4)
+    #if defined(STM32F4) || defined(STM32L1)
     if (did_clear_sr) {
         // SR was cleared above.  Re-enable IDLE if it should be enabled.
         if (self->mp_irq_trigger & UART_FLAG_IDLE) {
diff --git a/ports/stm32/uart.h b/ports/stm32/uart.h
index ec8a27591c1e5..61d1ac4397903 100644
--- a/ports/stm32/uart.h
+++ b/ports/stm32/uart.h
@@ -103,7 +103,7 @@ size_t uart_tx_data(pyb_uart_obj_t *self, const void *src_in, size_t num_chars,
 void uart_tx_strn(pyb_uart_obj_t *uart_obj, const char *str, uint len);
 
 static inline bool uart_tx_avail(pyb_uart_obj_t *self) {
-    #if defined(STM32F4)
+    #if defined(STM32F4) || defined(STM32L1)
     return self->uartx->SR & USART_SR_TXE;
     #elif defined(STM32G0) || defined(STM32H7) || defined(STM32WL)
     return self->uartx->ISR & USART_ISR_TXE_TXFNF;

From e6d351318746495bf88d2c4bd7cbd81e94a2290e Mon Sep 17 00:00:00 2001
From: yn386 <wf.yn386@gmail.com>
Date: Mon, 19 Sep 2022 17:57:27 +0900
Subject: [PATCH 2646/3533] stm32/boards/NUCLEO_L152RE: Add NUCLEO-L152RE board
 support.

This change adds NUCLEO-L152RE support to the STM32 port.
NUCLEO-L152RE: https://www.st.com/en/evaluation-tools/nucleo-l152re.html
This board use STM32L152RE:
https://www.st.com/en/microcontrollers-microprocessors/stm32l152re.html
---
 ports/stm32/boards/NUCLEO_L152RE/board.json   | 15 ++++
 ports/stm32/boards/NUCLEO_L152RE/deploy.md    | 31 ++++++++
 .../boards/NUCLEO_L152RE/mpconfigboard.h      | 74 ++++++++++++++++++
 .../boards/NUCLEO_L152RE/mpconfigboard.mk     |  4 +
 ports/stm32/boards/NUCLEO_L152RE/pins.csv     | 76 +++++++++++++++++++
 .../boards/NUCLEO_L152RE/stm32l1xx_hal_conf.h | 10 +++
 6 files changed, 210 insertions(+)
 create mode 100644 ports/stm32/boards/NUCLEO_L152RE/board.json
 create mode 100644 ports/stm32/boards/NUCLEO_L152RE/deploy.md
 create mode 100644 ports/stm32/boards/NUCLEO_L152RE/mpconfigboard.h
 create mode 100644 ports/stm32/boards/NUCLEO_L152RE/mpconfigboard.mk
 create mode 100644 ports/stm32/boards/NUCLEO_L152RE/pins.csv
 create mode 100644 ports/stm32/boards/NUCLEO_L152RE/stm32l1xx_hal_conf.h

diff --git a/ports/stm32/boards/NUCLEO_L152RE/board.json b/ports/stm32/boards/NUCLEO_L152RE/board.json
new file mode 100644
index 0000000000000..7b34276937553
--- /dev/null
+++ b/ports/stm32/boards/NUCLEO_L152RE/board.json
@@ -0,0 +1,15 @@
+{
+    "deploy": [
+        "./deploy.md"
+    ],
+    "docs": "",
+    "features": [],
+    "images": [
+        "nucleo_l152re.jpg"
+    ],
+    "mcu": "stm32l1",
+    "product": "Nucleo L152RE",
+    "thumbnail": "",
+    "url": "",
+    "vendor": "ST Microelectronics"
+}
diff --git a/ports/stm32/boards/NUCLEO_L152RE/deploy.md b/ports/stm32/boards/NUCLEO_L152RE/deploy.md
new file mode 100644
index 0000000000000..0323981d2d664
--- /dev/null
+++ b/ports/stm32/boards/NUCLEO_L152RE/deploy.md
@@ -0,0 +1,31 @@
+### STM32 via ST-Link
+
+Nucleo and Discovery boards typically include a built-in ST-Link programmer.
+
+A `.bin` or `.hex` file can be flashed using [st-flash](https://github.com/stlink-org/stlink).
+
+```bash
+# Optional erase to clear existing filesystem.
+st-flash erase
+
+# Flash .bin
+st-flash write firmware.bin 0x08000000
+# or, flash .hex
+st-flash --format ihex write firmware.hex
+```
+
+A `.hex` file can be flashed using [STM32 Cube Programmer](https://www.st.com/en/development-tools/stm32cubeprog.html).
+
+```bash
+STM32_Programmer.sh -c port=SWD mode=UR dLPM -d firmware.hex -v -hardRst
+```
+
+### STM32 via DFU
+
+Boards with USB support can also be programmed via the ST DFU bootloader, using e.g. [dfu-util](http://dfu-util.sourceforge.net/) or [pydfu.py](https://github.com/micropython/micropython/blob/master/tools/pydfu.py).
+
+To enter the bootloader the `BOOT0` pin can be connected to `VCC` during reset, or you can use `machine.bootloader()` from the MicroPython REPL.
+
+```bash
+dfu-util --alt 0 -D firmware.dfu
+```
diff --git a/ports/stm32/boards/NUCLEO_L152RE/mpconfigboard.h b/ports/stm32/boards/NUCLEO_L152RE/mpconfigboard.h
new file mode 100644
index 0000000000000..3609955893fe1
--- /dev/null
+++ b/ports/stm32/boards/NUCLEO_L152RE/mpconfigboard.h
@@ -0,0 +1,74 @@
+#define MICROPY_HW_BOARD_NAME       "NUCLEO-L152RE"
+#define MICROPY_HW_MCU_NAME         "STM32L152xE"
+
+#define MICROPY_HW_HAS_SWITCH       (1)
+#define MICROPY_HW_ENABLE_RTC       (1)
+// This board has an external 32kHz crystal
+#define MICROPY_HW_RTC_USE_LSE      (1)
+#define MICROPY_HW_ENABLE_SERVO     (1)
+#define MICROPY_HW_ENABLE_DAC       (1)
+
+// HSE is 8MHz, HSI is 16MHz CPU freq set to 32MHz
+// Default source for the clock is HSI.
+// For revisions of the board greater than C-01, HSE can be used as a
+// clock source by removing the #define MICROPY_HW_CLK_USE_HSE line
+#define MICROPY_HW_CLK_USE_HSI (1)
+
+#if MICROPY_HW_CLK_USE_HSI
+#define MICROPY_HW_CLK_PLLMUL (RCC_CFGR_PLLMUL6)
+#define MICROPY_HW_CLK_PLLDIV (RCC_CFGR_PLLDIV3)
+#else
+#define MICROPY_HW_CLK_PLLMUL (RCC_CFGR_PLLMUL12)
+#define MICROPY_HW_CLK_PLLDIV (RCC_CFGR_PLLDIV3)
+#endif
+
+// UART config
+#define MICROPY_HW_UART1_TX     (pin_A9)
+#define MICROPY_HW_UART1_RX     (pin_A10)
+#define MICROPY_HW_UART2_TX     (pin_A2)
+#define MICROPY_HW_UART2_RX     (pin_A3)
+#define MICROPY_HW_UART3_TX     (pin_B10)
+#define MICROPY_HW_UART3_RX     (pin_B11)
+#define MICROPY_HW_UART4_TX     (pin_C10)
+#define MICROPY_HW_UART4_RX     (pin_C11)
+#define MICROPY_HW_UART5_TX     (pin_C12)
+#define MICROPY_HW_UART5_RX     (pin_D2)
+// UART 2 connects to the STM32F103 (STLINK) on the Nucleo board
+// and this is exposed as a USB Serial port.
+#define MICROPY_HW_UART_REPL        PYB_UART_2
+#define MICROPY_HW_UART_REPL_BAUD   115200
+
+// I2C buses
+#define MICROPY_HW_I2C1_SCL (pin_B8)        // Arduino D15, pin 3 on CN10
+#define MICROPY_HW_I2C1_SDA (pin_B9)        //         D14, pin 5 on CN10
+#define MICROPY_HW_I2C2_SCL (pin_B10)       // Arduino D6,  pin 25 on CN10
+#define MICROPY_HW_I2C2_SDA (pin_B11)       // Arduino D3,  pin 31 on CN10
+
+// SPI buses
+#define MICROPY_HW_SPI1_NSS     (pin_A15)   //              pin 17 on CN7
+#define MICROPY_HW_SPI1_SCK     (pin_A5)    // Arduino D13, pin 11 on CN10
+#define MICROPY_HW_SPI1_MISO    (pin_A6)    // Arduino D12, pin 13 on CN10
+#define MICROPY_HW_SPI1_MOSI    (pin_A7)    // Arduino D11, pin 15 on CN10
+
+#define MICROPY_HW_SPI2_NSS     (pin_B12)   //              pin 16 on CN10
+#define MICROPY_HW_SPI2_SCK     (pin_B13)   //              pin 30 on CN10
+#define MICROPY_HW_SPI2_MISO    (pin_B14)   //              pin 28 on CN10
+#define MICROPY_HW_SPI2_MOSI    (pin_B15)   //              pin 26 on CN10
+
+#define MICROPY_HW_SPI3_NSS     (pin_A4)    // Arduino A2,  pin 32 on CN7
+#define MICROPY_HW_SPI3_SCK     (pin_C10)   // Arduino D3,  pin 31 on CN10
+#define MICROPY_HW_SPI3_MISO    (pin_C11)   // Arduino D5,  pin 27 on CN10
+#define MICROPY_HW_SPI3_MOSI    (pin_C12)   // Arduino D4,  pin 29 on CN10
+
+// USRSW is pulled low. Pressing the button makes the input go high.
+#define MICROPY_HW_USRSW_PIN        (pin_C13)
+#define MICROPY_HW_USRSW_PULL       (GPIO_NOPULL)
+#define MICROPY_HW_USRSW_EXTI_MODE  (GPIO_MODE_IT_FALLING)
+#define MICROPY_HW_USRSW_PRESSED    (0)
+
+// LEDs
+#define MICROPY_HW_LED1             (pin_A5) // Green LD2 LED on Nucleo
+#define MICROPY_HW_LED_ON(pin)      (mp_hal_pin_high(pin))
+#define MICROPY_HW_LED_OFF(pin)     (mp_hal_pin_low(pin))
+
+#define MICROPY_HW_FLASH_LATENCY FLASH_LATENCY_1
diff --git a/ports/stm32/boards/NUCLEO_L152RE/mpconfigboard.mk b/ports/stm32/boards/NUCLEO_L152RE/mpconfigboard.mk
new file mode 100644
index 0000000000000..a62a775ac8ddb
--- /dev/null
+++ b/ports/stm32/boards/NUCLEO_L152RE/mpconfigboard.mk
@@ -0,0 +1,4 @@
+MCU_SERIES = l1
+CMSIS_MCU = STM32L152xE
+AF_FILE = boards/stm32l152_af.csv
+LD_FILES = boards/stm32l152xe.ld boards/common_basic.ld
diff --git a/ports/stm32/boards/NUCLEO_L152RE/pins.csv b/ports/stm32/boards/NUCLEO_L152RE/pins.csv
new file mode 100644
index 0000000000000..035d933f5dd45
--- /dev/null
+++ b/ports/stm32/boards/NUCLEO_L152RE/pins.csv
@@ -0,0 +1,76 @@
+D0,PA3
+D1,PA2
+D2,PA10
+D3,PB3
+D4,PB5
+D5,PB4
+D6,PB10
+D7,PA8
+D8,PA9
+D9,PC7
+D10,PB6
+D11,PA7
+D12,PA6
+D13,PA5
+D14,PB9
+D15,PB8
+A0,PA0
+A1,PA1
+A2,PA4
+A3,PB0
+A4,PC1
+A5,PC0
+PA0,PA0
+PA1,PA1
+PA2,PA2
+PA3,PA3
+PA4,PA4
+PA5,PA5
+PA6,PA6
+PA7,PA7
+PA8,PA8
+PA9,PA9
+PA10,PA10
+PA11,PA11
+PA12,PA12
+PA15,PA15
+PB0,PB0
+PB1,PB1
+PB2,PB2
+PB3,PB3
+PB4,PB4
+PB5,PB5
+PB6,PB6
+PB7,PB7
+PB8,PB8
+PB9,PB9
+PB10,PB10
+PB11,PB11
+PB12,PB12
+PB13,PB13
+PB14,PB14
+PB15,PB15
+PC0,PC0
+PC1,PC1
+PC2,PC2
+PC3,PC3
+PC4,PC4
+PC5,PC5
+PC6,PC6
+PC7,PC7
+PC8,PC8
+PC9,PC9
+PC10,PC10
+PC11,PC11
+PC12,PC12
+PC13,PC13
+PC14,PC14
+PC15,PC15
+PD2,PD2
+PH0,PH0
+PH1,PH1
+LED_GREEN,PA5
+LED_ORANGE,PA5
+LED_RED,PA5
+LED_BLUE,PA4
+SW,PC13
diff --git a/ports/stm32/boards/NUCLEO_L152RE/stm32l1xx_hal_conf.h b/ports/stm32/boards/NUCLEO_L152RE/stm32l1xx_hal_conf.h
new file mode 100644
index 0000000000000..7ee8204cbf064
--- /dev/null
+++ b/ports/stm32/boards/NUCLEO_L152RE/stm32l1xx_hal_conf.h
@@ -0,0 +1,10 @@
+/* This file is part of the MicroPython project, http://micropython.org/
+ * The MIT License (MIT)
+ * Copyright (c) 2019 Damien P. George
+ */
+#ifndef MICROPY_INCLUDED_STM32L1XX_HAL_CONF_H
+#define MICROPY_INCLUDED_STM32L1XX_HAL_CONF_H
+
+#include "boards/stm32l1xx_hal_conf_base.h"
+
+#endif // MICROPY_INCLUDED_STM32L1XX_HAL_CONF_H

From 3abcfb9aecd567c4c74fd3c99703f23c372b7445 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 26 Sep 2022 00:07:58 +1000
Subject: [PATCH 2647/3533] esp32/modsocket: Use mp_obj_is_integer to test port
 type.

Because the value may be a big integer, which is still a valid type to use.

Fixes issue #9410.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/modsocket.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/esp32/modsocket.c b/ports/esp32/modsocket.c
index 334c5bae33c4f..9812eb347689c 100644
--- a/ports/esp32/modsocket.c
+++ b/ports/esp32/modsocket.c
@@ -214,7 +214,7 @@ static int _socket_getaddrinfo2(const mp_obj_t host, const mp_obj_t portx, struc
     };
 
     mp_obj_t port = portx;
-    if (mp_obj_is_small_int(port)) {
+    if (mp_obj_is_integer(port)) {
         // This is perverse, because lwip_getaddrinfo promptly converts it back to an int, but
         // that's the API we have to work with ...
         port = mp_obj_str_binary_op(MP_BINARY_OP_MODULO, mp_obj_new_str_via_qstr("%s", 2), port);

From dd9dcb594c577cb818c336db59a884fd329c3840 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sun, 25 Sep 2022 22:12:29 +1000
Subject: [PATCH 2648/3533] esp32/machine_pwm: Don't use LEDC_USE_REF_TICK on
 ESP32-C3 variants.

Because it's not supported by this particular MCU (since IDF v4.4.2).

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/machine_pwm.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/ports/esp32/machine_pwm.c b/ports/esp32/machine_pwm.c
index 0107187a8c98c..2a456c71c7834 100644
--- a/ports/esp32/machine_pwm.c
+++ b/ports/esp32/machine_pwm.c
@@ -97,8 +97,10 @@ STATIC ledc_timer_config_t timers[PWM_TIMER_MAX];
 // How much to shift from the HIGHEST_PWM_RES duty resolution to the user interface duty resolution UI_RES_16_BIT
 #define UI_RES_SHIFT (UI_RES_16_BIT - HIGHEST_PWM_RES) // 0 for ESP32, 2 for S2, S3, C3
 
+#if SOC_LEDC_SUPPORT_REF_TICK
 // If the PWM frequency is less than EMPIRIC_FREQ, then LEDC_REF_CLK_HZ(1 MHz) source is used, else LEDC_APB_CLK_HZ(80 MHz) source is used
 #define EMPIRIC_FREQ (10) // Hz
+#endif
 
 // Config of timer upon which we run all PWM'ed GPIO pins
 STATIC bool pwm_inited = false;
@@ -208,9 +210,11 @@ STATIC void set_freq(machine_pwm_obj_t *self, unsigned int freq, ledc_timer_conf
     if (freq != timer->freq_hz) {
         // Find the highest bit resolution for the requested frequency
         unsigned int i = LEDC_APB_CLK_HZ; // 80 MHz
+        #if SOC_LEDC_SUPPORT_REF_TICK
         if (freq < EMPIRIC_FREQ) {
             i = LEDC_REF_CLK_HZ; // 1 MHz
         }
+        #endif
 
         #if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 0, 0)
         // original code
@@ -243,9 +247,11 @@ STATIC void set_freq(machine_pwm_obj_t *self, unsigned int freq, ledc_timer_conf
         timer->duty_resolution = res;
         timer->freq_hz = freq;
         timer->clk_cfg = LEDC_USE_APB_CLK;
+        #if SOC_LEDC_SUPPORT_REF_TICK
         if (freq < EMPIRIC_FREQ) {
             timer->clk_cfg = LEDC_USE_REF_TICK;
         }
+        #endif
 
         // Set frequency
         esp_err_t err = ledc_timer_config(timer);

From 9d6f474ea49fd89b7a1a90b830e6014ef70a89b7 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Sun, 25 Sep 2022 22:15:45 +1000
Subject: [PATCH 2649/3533] py/objstr: Don't treat bytes as unicode in
 str.count.

`b'\xaa \xaa'.count(b'\xaa')` now (correctly) returns 2 instead of 1.

Fixes issue #9404.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 py/objstr.c                 | 4 +++-
 tests/basics/bytes_count.py | 7 +++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/py/objstr.c b/py/objstr.c
index 62d7bfb4cc396..55e737fffc4fc 100644
--- a/py/objstr.c
+++ b/py/objstr.c
@@ -1768,6 +1768,8 @@ STATIC mp_obj_t str_count(size_t n_args, const mp_obj_t *args) {
         return MP_OBJ_NEW_SMALL_INT(utf8_charlen(start, end - start) + 1);
     }
 
+    bool is_str = self_type == &mp_type_str;
+
     // count the occurrences
     mp_int_t num_occurrences = 0;
     for (const byte *haystack_ptr = start; haystack_ptr + needle_len <= end;) {
@@ -1775,7 +1777,7 @@ STATIC mp_obj_t str_count(size_t n_args, const mp_obj_t *args) {
             num_occurrences++;
             haystack_ptr += needle_len;
         } else {
-            haystack_ptr = utf8_next_char(haystack_ptr);
+            haystack_ptr = is_str ? utf8_next_char(haystack_ptr) : haystack_ptr + 1;
         }
     }
 
diff --git a/tests/basics/bytes_count.py b/tests/basics/bytes_count.py
index 5fa0730f5cff0..e71f09db00e29 100644
--- a/tests/basics/bytes_count.py
+++ b/tests/basics/bytes_count.py
@@ -48,6 +48,13 @@
 print(b"aaaa".count(b'a', -1, 5))
 print(b"abbabba".count(b"abba"))
 
+print(b'\xaa \xaa'.count(b'\xaa'))
+print(b'\xaa \xaa \xaa \xaa'.count(b'\xaa'))
+print(b'\xaa \xaa \xaa \xaa'.count(b'\xaa'), 1)
+print(b'\xaa \xaa \xaa \xaa'.count(b'\xaa'), 2)
+print(b'\xaa \xaa \xaa \xaa'.count(b'\xaa'), 1, 3)
+print(b'\xaa \xaa \xaa \xaa'.count(b'\xaa'), 2, 3)
+
 def t():
     return True
 

From 0bc1d1055748dd41a2db10a4c6cab32499c488f9 Mon Sep 17 00:00:00 2001
From: Matt Trentini <matt.trentini@gmail.com>
Date: Sun, 11 Sep 2022 11:40:59 +1000
Subject: [PATCH 2650/3533] rp2/Makefile: Add support for BOARD_VARIANTS.

Following stm32.  This allows a single board definition to define variants
of its configuration.
---
 ports/rp2/Makefile | 9 +++++++++
 py/mkrules.cmake   | 6 ++++++
 2 files changed, 15 insertions(+)

diff --git a/ports/rp2/Makefile b/ports/rp2/Makefile
index c603f5403fcac..7057021bfccbe 100644
--- a/ports/rp2/Makefile
+++ b/ports/rp2/Makefile
@@ -22,6 +22,10 @@ ifeq ($(DEBUG),1)
 CMAKE_ARGS += -DCMAKE_BUILD_TYPE=Debug
 endif
 
+ifdef BOARD_VARIANT
+CMAKE_ARGS += -DBOARD_VARIANT=${BOARD_VARIANT}
+endif
+
 HELP_BUILD_ERROR ?= "See \033[1;31mhttps://github.com/micropython/micropython/wiki/Build-Troubleshooting\033[0m"
 
 all:
@@ -38,3 +42,8 @@ submodules:
 	GIT_SUBMODULES=$$(cmake -B $(BUILD)/submodules -DECHO_SUBMODULES=1 ${CMAKE_ARGS} -S . 2>&1 | \
 	                  grep '^GIT_SUBMODULES=' | cut -d= -f2); \
 	$(MAKE) -f ../../py/mkrules.mk GIT_SUBMODULES="$${GIT_SUBMODULES}" submodules
+
+query-variants:
+	@BOARD_VARIANTS=$$(cmake -B $(BUILD)/variants -DECHO_BOARD_VARIANTS=1 ${CMAKE_ARGS} -S . 2>&1 | \
+	                  grep '^BOARD_VARIANTS=' | cut -d= -f2); \
+	echo "VARIANTS: $${BOARD_VARIANTS}"
diff --git a/py/mkrules.cmake b/py/mkrules.cmake
index e7c4101ddb72d..b29986585a798 100644
--- a/py/mkrules.cmake
+++ b/py/mkrules.cmake
@@ -223,3 +223,9 @@ if(ECHO_SUBMODULES)
     execute_process(COMMAND ${CMAKE_COMMAND} -E echo "GIT_SUBMODULES=${GIT_SUBMODULES}")
     message(FATAL_ERROR "Done")
 endif()
+
+# Display BOARD_VARIANTS
+if(ECHO_BOARD_VARIANTS)
+    execute_process(COMMAND ${CMAKE_COMMAND} -E echo "BOARD_VARIANTS=${BOARD_VARIANTS}")
+    message(FATAL_ERROR "Done")
+endif()

From bdbc44474f92db19a40b5f710a140a0bf70fb0ec Mon Sep 17 00:00:00 2001
From: Matt Trentini <matt.trentini@gmail.com>
Date: Thu, 7 Apr 2022 23:33:36 +1000
Subject: [PATCH 2651/3533] rp2/boards/WEACTSTUDIO: Add WEACTSTUDIO with
 multiple variants.

This supports 2, 4, 8 and 16MB flash variants.
---
 ports/rp2/boards/WEACTSTUDIO/README.md        | 34 ++++++++++
 ports/rp2/boards/WEACTSTUDIO/board.json       | 23 +++++++
 ports/rp2/boards/WEACTSTUDIO/deploy.md        |  8 +++
 ports/rp2/boards/WEACTSTUDIO/manifest.py      |  2 +
 ports/rp2/boards/WEACTSTUDIO/modules/board.py |  4 ++
 .../boards/WEACTSTUDIO/mpconfigboard.cmake    | 26 ++++++++
 ports/rp2/boards/WEACTSTUDIO/mpconfigboard.h  |  4 ++
 .../rp2/boards/WEACTSTUDIO/weactstudio_16mb.h | 18 ++++++
 .../rp2/boards/WEACTSTUDIO/weactstudio_2mb.h  | 18 ++++++
 .../rp2/boards/WEACTSTUDIO/weactstudio_4mb.h  | 18 ++++++
 .../rp2/boards/WEACTSTUDIO/weactstudio_8mb.h  | 18 ++++++
 .../boards/WEACTSTUDIO/weactstudio_common.h   | 62 +++++++++++++++++++
 12 files changed, 235 insertions(+)
 create mode 100644 ports/rp2/boards/WEACTSTUDIO/README.md
 create mode 100644 ports/rp2/boards/WEACTSTUDIO/board.json
 create mode 100644 ports/rp2/boards/WEACTSTUDIO/deploy.md
 create mode 100644 ports/rp2/boards/WEACTSTUDIO/manifest.py
 create mode 100644 ports/rp2/boards/WEACTSTUDIO/modules/board.py
 create mode 100644 ports/rp2/boards/WEACTSTUDIO/mpconfigboard.cmake
 create mode 100644 ports/rp2/boards/WEACTSTUDIO/mpconfigboard.h
 create mode 100644 ports/rp2/boards/WEACTSTUDIO/weactstudio_16mb.h
 create mode 100644 ports/rp2/boards/WEACTSTUDIO/weactstudio_2mb.h
 create mode 100644 ports/rp2/boards/WEACTSTUDIO/weactstudio_4mb.h
 create mode 100644 ports/rp2/boards/WEACTSTUDIO/weactstudio_8mb.h
 create mode 100644 ports/rp2/boards/WEACTSTUDIO/weactstudio_common.h

diff --git a/ports/rp2/boards/WEACTSTUDIO/README.md b/ports/rp2/boards/WEACTSTUDIO/README.md
new file mode 100644
index 0000000000000..ae0acfd2c7b0f
--- /dev/null
+++ b/ports/rp2/boards/WEACTSTUDIO/README.md
@@ -0,0 +1,34 @@
+# WeAct Studio RP2040
+
+The WeAct Studio RP2040 Board is based on the Raspberry Pi RP2040 and can be
+purchased with 2/4/8/16 MiB of flash.
+
+These boards are available from a number of resellers and often have the name
+"Pico Board RP2040". WeAct maintain the [WeActStudio.RP2040CoreBoard](https://github.com/WeActTC/WeActStudio.RP2040CoreBoard/tree/master)
+repository containing information on the board.
+
+## Build notes
+
+Builds can be configured with the `BOARD_VARIANT` parameter. Valid variants
+can be displayed with the `query-variant` target. An example:
+
+```bash
+> cd ports/rp2
+> make BOARD=WEACTSTUDIO query-variants
+VARIANTS: flash_2mb flash_4mb flash_8mb flash_16mb
+> make BOARD=WEACTSTUDIO BOARD_VARIANT=flash_8mb submodules all  # Build the 8 MiB variant
+```
+
+`flash_16mb` is the default if `BOARD_VARIANT` is not supplied.
+
+## Board-specific modules
+
+The `board` module contains definitions for the onboard LED and user button.
+
+Example:
+
+```python
+> import board
+> board.led.toggle()  # Toggles the state of the on-board LED
+> board.key.value()  # Returns 0 or 1 corresponding to the state of the user key
+```
diff --git a/ports/rp2/boards/WEACTSTUDIO/board.json b/ports/rp2/boards/WEACTSTUDIO/board.json
new file mode 100644
index 0000000000000..bac5263627ba2
--- /dev/null
+++ b/ports/rp2/boards/WEACTSTUDIO/board.json
@@ -0,0 +1,23 @@
+{
+    "deploy": [
+        "deploy.md"
+    ],
+    "docs": "",
+    "features": [
+        "Breadboard Friendly",
+        "SPI Flash",
+        "USB-C"
+    ],
+    "images": [
+        "weact_rp2040.jpg"
+    ],
+    "mcu": "rp2040",
+    "product": "WeAct Studio RP2040",
+    "url": "https://github.com/WeActTC/WeActStudio.RP2040CoreBoard",
+    "variants": {
+        "flash_2mb": "2 MiB Flash",
+        "flash_4mb": "4 MiB Flash",
+        "flash_8mb": "8 MiB Flash"
+    },
+    "vendor": "WeAct"
+}
diff --git a/ports/rp2/boards/WEACTSTUDIO/deploy.md b/ports/rp2/boards/WEACTSTUDIO/deploy.md
new file mode 100644
index 0000000000000..b4db7675ebb5f
--- /dev/null
+++ b/ports/rp2/boards/WEACTSTUDIO/deploy.md
@@ -0,0 +1,8 @@
+### Flashing via UF2 bootloader
+
+To get the board in bootloader mode ready for the firmware update, execute
+`machine.bootloader()` at the MicroPython REPL.  Alternatively, hold
+down the BOOTSEL button while pressing reset (NRST).  The uf2 file below
+should then be copied to the USB mass storage device that appears.  Once
+programming of the new firmware is complete the device will automatically reset
+and be ready for use.
diff --git a/ports/rp2/boards/WEACTSTUDIO/manifest.py b/ports/rp2/boards/WEACTSTUDIO/manifest.py
new file mode 100644
index 0000000000000..f993d4fa6bd29
--- /dev/null
+++ b/ports/rp2/boards/WEACTSTUDIO/manifest.py
@@ -0,0 +1,2 @@
+include("$(PORT_DIR)/boards/manifest.py")
+freeze("./modules")
diff --git a/ports/rp2/boards/WEACTSTUDIO/modules/board.py b/ports/rp2/boards/WEACTSTUDIO/modules/board.py
new file mode 100644
index 0000000000000..dd3b31b805fd5
--- /dev/null
+++ b/ports/rp2/boards/WEACTSTUDIO/modules/board.py
@@ -0,0 +1,4 @@
+from machine import Pin
+
+led = Pin(25, Pin.OUT, value=0)
+key = Pin(23, Pin.IN, Pin.PULL_UP)
diff --git a/ports/rp2/boards/WEACTSTUDIO/mpconfigboard.cmake b/ports/rp2/boards/WEACTSTUDIO/mpconfigboard.cmake
new file mode 100644
index 0000000000000..5fd3eec897b36
--- /dev/null
+++ b/ports/rp2/boards/WEACTSTUDIO/mpconfigboard.cmake
@@ -0,0 +1,26 @@
+# CMake file for WeAct Studio RP2040 boards
+
+# The WeAct Studio boards don't have official pico-sdk support so we define it
+# See also: https://github.com/raspberrypi/pico-sdk/tree/master/src/boards/include/boards
+list(APPEND PICO_BOARD_HEADER_DIRS ${MICROPY_BOARD_DIR})
+
+# Freeze board.py
+set(MICROPY_FROZEN_MANIFEST ${MICROPY_BOARD_DIR}/manifest.py)
+
+# Provide different variants for the downloads page
+set(BOARD_VARIANTS "flash_2mb flash_4mb flash_8mb flash_16mb")
+
+# Select the 16MB variant as the default
+set(PICO_BOARD "weactstudio_16mb")
+
+if("${BOARD_VARIANT}" STREQUAL "flash_2mb")
+    set(PICO_BOARD "weactstudio_2mb")
+endif()
+
+if("${BOARD_VARIANT}" STREQUAL "flash_4mb")
+set(PICO_BOARD "weactstudio_4mb")
+endif()
+
+if("${BOARD_VARIANT}" STREQUAL "flash_8mb")
+set(PICO_BOARD "weactstudio_8mb")
+endif()
diff --git a/ports/rp2/boards/WEACTSTUDIO/mpconfigboard.h b/ports/rp2/boards/WEACTSTUDIO/mpconfigboard.h
new file mode 100644
index 0000000000000..3c72ef4fca0b3
--- /dev/null
+++ b/ports/rp2/boards/WEACTSTUDIO/mpconfigboard.h
@@ -0,0 +1,4 @@
+#define MICROPY_HW_BOARD_NAME "WeAct Studio RP2040"
+
+// Allow 1MB for the firmware image itself, allocate the remainder to the filesystem
+#define MICROPY_HW_FLASH_STORAGE_BYTES (PICO_FLASH_SIZE_BYTES - (1 * 1024 * 1024))
diff --git a/ports/rp2/boards/WEACTSTUDIO/weactstudio_16mb.h b/ports/rp2/boards/WEACTSTUDIO/weactstudio_16mb.h
new file mode 100644
index 0000000000000..b6208c68972c4
--- /dev/null
+++ b/ports/rp2/boards/WEACTSTUDIO/weactstudio_16mb.h
@@ -0,0 +1,18 @@
+// A pico-sdk board definition is required since the WeAct Studio boards are
+// not officially supported.
+//
+// Officially supported boards:
+//     https://github.com/raspberrypi/pico-sdk/tree/master/src/boards/include/boards
+
+#ifndef _BOARDS_WEACTSTUDIO_16MB_H
+#define _BOARDS_WEACTSTUDIO_16MB_H
+
+#include "weactstudio_common.h"
+
+#define WEACTSTUDIO_16MB
+
+#ifndef PICO_FLASH_SIZE_BYTES
+#define PICO_FLASH_SIZE_BYTES (16 * 1024 * 1024)
+#endif
+
+#endif
diff --git a/ports/rp2/boards/WEACTSTUDIO/weactstudio_2mb.h b/ports/rp2/boards/WEACTSTUDIO/weactstudio_2mb.h
new file mode 100644
index 0000000000000..e6a21ea3bc3fa
--- /dev/null
+++ b/ports/rp2/boards/WEACTSTUDIO/weactstudio_2mb.h
@@ -0,0 +1,18 @@
+// A pico-sdk board definition is required since the WeAct Studio boards are
+// not officially supported.
+//
+// Officially supported boards:
+//     https://github.com/raspberrypi/pico-sdk/tree/master/src/boards/include/boards
+
+#ifndef _BOARDS_WEACTSTUDIO_2MB_H
+#define _BOARDS_WEACTSTUDIO_2MB_H
+
+#include "weactstudio_common.h"
+
+#define WEACTSTUDIO_2MB
+
+#ifndef PICO_FLASH_SIZE_BYTES
+#define PICO_FLASH_SIZE_BYTES (2 * 1024 * 1024)
+#endif
+
+#endif
diff --git a/ports/rp2/boards/WEACTSTUDIO/weactstudio_4mb.h b/ports/rp2/boards/WEACTSTUDIO/weactstudio_4mb.h
new file mode 100644
index 0000000000000..7a2836ab4a3fe
--- /dev/null
+++ b/ports/rp2/boards/WEACTSTUDIO/weactstudio_4mb.h
@@ -0,0 +1,18 @@
+// A pico-sdk board definition is required since the WeAct Studio boards are
+// not officially supported.
+//
+// Officially supported boards:
+//     https://github.com/raspberrypi/pico-sdk/tree/master/src/boards/include/boards
+
+#ifndef _BOARDS_WEACTSTUDIO_4MB_H
+#define _BOARDS_WEACTSTUDIO_4MB_H
+
+#include "weactstudio_common.h"
+
+#define WEACTSTUDIO_4MB
+
+#ifndef PICO_FLASH_SIZE_BYTES
+#define PICO_FLASH_SIZE_BYTES (4 * 1024 * 1024)
+#endif
+
+#endif
diff --git a/ports/rp2/boards/WEACTSTUDIO/weactstudio_8mb.h b/ports/rp2/boards/WEACTSTUDIO/weactstudio_8mb.h
new file mode 100644
index 0000000000000..82baf6688e837
--- /dev/null
+++ b/ports/rp2/boards/WEACTSTUDIO/weactstudio_8mb.h
@@ -0,0 +1,18 @@
+// A pico-sdk board definition is required since the WeAct Studio boards are
+// not officially supported.
+//
+// Officially supported boards:
+//     https://github.com/raspberrypi/pico-sdk/tree/master/src/boards/include/boards
+
+#ifndef _BOARDS_WEACTSTUDIO_8MB_H
+#define _BOARDS_WEACTSTUDIO_8MB_H
+
+#include "weactstudio_common.h"
+
+#define WEACTSTUDIO_8MB
+
+#ifndef PICO_FLASH_SIZE_BYTES
+#define PICO_FLASH_SIZE_BYTES (8 * 1024 * 1024)
+#endif
+
+#endif
diff --git a/ports/rp2/boards/WEACTSTUDIO/weactstudio_common.h b/ports/rp2/boards/WEACTSTUDIO/weactstudio_common.h
new file mode 100644
index 0000000000000..f1c6903601330
--- /dev/null
+++ b/ports/rp2/boards/WEACTSTUDIO/weactstudio_common.h
@@ -0,0 +1,62 @@
+// Common configuration to all WeAct Studio boards (only flash size differs)
+
+#ifndef _BOARDS_WEACTSTUDIO_COMMON_H
+#define _BOARDS_WEACTSTUDIO_COMMON_H
+
+// --- UART ---
+#ifndef PICO_DEFAULT_UART
+#define PICO_DEFAULT_UART 0
+#endif
+#ifndef PICO_DEFAULT_UART_TX_PIN
+#define PICO_DEFAULT_UART_TX_PIN 0
+#endif
+#ifndef PICO_DEFAULT_UART_RX_PIN
+#define PICO_DEFAULT_UART_RX_PIN 1
+#endif
+
+// --- LED ---
+#ifndef PICO_DEFAULT_LED_PIN
+#define PICO_DEFAULT_LED_PIN 25
+#endif
+
+// --- I2C ---
+#ifndef PICO_DEFAULT_I2C
+#define PICO_DEFAULT_I2C 0
+#endif
+#ifndef PICO_DEFAULT_I2C_SDA_PIN
+#define PICO_DEFAULT_I2C_SDA_PIN 4
+#endif
+#ifndef PICO_DEFAULT_I2C_SCL_PIN
+#define PICO_DEFAULT_I2C_SCL_PIN 5
+#endif
+
+// --- SPI ---
+#ifndef PICO_DEFAULT_SPI
+#define PICO_DEFAULT_SPI 0
+#endif
+#ifndef PICO_DEFAULT_SPI_SCK_PIN
+#define PICO_DEFAULT_SPI_SCK_PIN 18
+#endif
+#ifndef PICO_DEFAULT_SPI_TX_PIN
+#define PICO_DEFAULT_SPI_TX_PIN 19
+#endif
+#ifndef PICO_DEFAULT_SPI_RX_PIN
+#define PICO_DEFAULT_SPI_RX_PIN 16
+#endif
+#ifndef PICO_DEFAULT_SPI_CSN_PIN
+#define PICO_DEFAULT_SPI_CSN_PIN 17
+#endif
+
+// --- FLASH ---
+#define PICO_BOOT_STAGE2_CHOOSE_W25Q080 1
+
+#ifndef PICO_FLASH_SPI_CLKDIV
+#define PICO_FLASH_SPI_CLKDIV 2
+#endif
+
+// All boards have B1 RP2040
+#ifndef PICO_RP2040_B0_SUPPORTED
+#define PICO_RP2040_B0_SUPPORTED 0
+#endif
+
+#endif

From 71050870b81a8dbf3c3fac93bd2d86f0ff9a37d2 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Wed, 28 Sep 2022 01:04:05 +1000
Subject: [PATCH 2652/3533] mpy-cross/mpy_cross: Fix default path to mpy-cross
 binary.

Needed to be updated to use build/mpy-cross.

Also fixes some other issues in the Python wrapper:
 - Rename find_mpy_cross_binary to _find_mpy_cross_binary
 - Fix passing of -march arg.
 - Decode stdout from subprocess.
 - Print stdout from mpy-cross in __main__.py.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 mpy-cross/mpy_cross/__init__.py | 12 +++++++-----
 mpy-cross/mpy_cross/__main__.py |  2 +-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/mpy-cross/mpy_cross/__init__.py b/mpy-cross/mpy_cross/__init__.py
index d4c0930bb9198..235271d2ce172 100644
--- a/mpy-cross/mpy_cross/__init__.py
+++ b/mpy-cross/mpy_cross/__init__.py
@@ -62,9 +62,11 @@ class CrossCompileError(Exception):
 
 
 def find_mpy_cross_binary(mpy_cross):
+
+def _find_mpy_cross_binary(mpy_cross):
     if mpy_cross:
         return mpy_cross
-    return os.path.abspath(os.path.join(os.path.dirname(__file__), "../mpy-cross"))
+    return os.path.abspath(os.path.join(os.path.dirname(__file__), "../build/mpy-cross"))
 
 
 def compile(src, dest=None, src_path=None, opt=None, march=None, mpy_cross=None, extra_args=None):
@@ -82,7 +84,7 @@ def compile(src, dest=None, src_path=None, opt=None, march=None, mpy_cross=None,
         args += ["-o", dest]
 
     if march:
-        args += ["-march", march]
+        args += ["-march=" + march]
 
     if opt is not None:
         args += ["-O{}".format(opt)]
@@ -96,7 +98,7 @@ def compile(src, dest=None, src_path=None, opt=None, march=None, mpy_cross=None,
 
 
 def run(args, mpy_cross=None):
-    mpy_cross = find_mpy_cross_binary(mpy_cross)
+    mpy_cross = _find_mpy_cross_binary(mpy_cross)
 
     if not os.path.exists(mpy_cross):
         raise CrossCompileError("mpy-cross binary not found at {}.".format(mpy_cross))
@@ -108,6 +110,6 @@ def run(args, mpy_cross=None):
         pass
 
     try:
-        subprocess.check_output([mpy_cross] + args, stderr=subprocess.STDOUT)
+        return subprocess.check_output([mpy_cross] + args, stderr=subprocess.STDOUT).decode()
     except subprocess.CalledProcessError as er:
-        raise CrossCompileError(er.output)
+        raise CrossCompileError(er.output.decode())
diff --git a/mpy-cross/mpy_cross/__main__.py b/mpy-cross/mpy_cross/__main__.py
index 9d957bca025d6..2b6b81c333362 100644
--- a/mpy-cross/mpy_cross/__main__.py
+++ b/mpy-cross/mpy_cross/__main__.py
@@ -32,7 +32,7 @@
 from . import run, CrossCompileError
 
 try:
-    run(sys.argv[1:])
+    print(run(sys.argv[1:]))
 except CrossCompileError as er:
     print(er.args[0], file=sys.stderr)
     raise SystemExit(1)

From ee1b4a2026e79b662142f0d985643dadf7fff87b Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Wed, 28 Sep 2022 01:05:09 +1000
Subject: [PATCH 2653/3533] mpy-cross/mpy_cross: Add a way to query the mpy
 version.

This returns the mpy version and sub-version for files compiled with this
mpy-cross binary.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 mpy-cross/mpy_cross/__init__.py | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/mpy-cross/mpy_cross/__init__.py b/mpy-cross/mpy_cross/__init__.py
index 235271d2ce172..01fe550a93cef 100644
--- a/mpy-cross/mpy_cross/__init__.py
+++ b/mpy-cross/mpy_cross/__init__.py
@@ -27,6 +27,7 @@
 
 from __future__ import print_function
 import os
+import re
 import stat
 import subprocess
 
@@ -54,14 +55,15 @@
     NATIVE_ARCH_XTENSAWIN,
 ]
 
-__all__ = ["compile", "run", "CrossCompileError"]
+__all__ = ["version", "compile", "run", "CrossCompileError"]
 
 
 class CrossCompileError(Exception):
     pass
 
 
-def find_mpy_cross_binary(mpy_cross):
+_VERSION_RE = re.compile("mpy-cross emitting mpy v([0-9]+)(?:.([0-9]+))?")
+
 
 def _find_mpy_cross_binary(mpy_cross):
     if mpy_cross:
@@ -69,6 +71,16 @@ def _find_mpy_cross_binary(mpy_cross):
     return os.path.abspath(os.path.join(os.path.dirname(__file__), "../build/mpy-cross"))
 
 
+def mpy_version(mpy_cross=None):
+    version_info = run(["--version"], mpy_cross=mpy_cross)
+    match = re.search(_VERSION_RE, version_info)
+    mpy_version, mpy_sub_version = int(match.group(1)), int(match.group(2) or "0")
+    return (
+        mpy_version,
+        mpy_sub_version,
+    )
+
+
 def compile(src, dest=None, src_path=None, opt=None, march=None, mpy_cross=None, extra_args=None):
     if not src:
         raise ValueError("src is required")

From 370a87dd12b92722ba8fac5f3562384d31a864ce Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Wed, 28 Sep 2022 11:33:24 +1000
Subject: [PATCH 2654/3533] mpy-cross/mpy_cross: Add list of architectures to
 `__all__`.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 mpy-cross/mpy_cross/__init__.py | 42 +++++++++++++--------------------
 1 file changed, 17 insertions(+), 25 deletions(-)

diff --git a/mpy-cross/mpy_cross/__init__.py b/mpy-cross/mpy_cross/__init__.py
index 01fe550a93cef..22d175c89cf3c 100644
--- a/mpy-cross/mpy_cross/__init__.py
+++ b/mpy-cross/mpy_cross/__init__.py
@@ -31,31 +31,23 @@
 import stat
 import subprocess
 
-NATIVE_ARCH_X86 = "x86"
-NATIVE_ARCH_X64 = "x64"
-NATIVE_ARCH_ARMV6 = "armv6"
-NATIVE_ARCH_ARMV6M = "armv6m"
-NATIVE_ARCH_ARMV7M = "armv7m"
-NATIVE_ARCH_ARMV7EM = "armv7em"
-NATIVE_ARCH_ARMV7EMSP = "armv7emsp"
-NATIVE_ARCH_ARMV7EMDP = "armv7emdp"
-NATIVE_ARCH_XTENSA = "xtensa"
-NATIVE_ARCH_XTENSAWIN = "xtensawin"
-
-NATIVE_ARCHS = [
-    NATIVE_ARCH_X86,
-    NATIVE_ARCH_X64,
-    NATIVE_ARCH_ARMV6,
-    NATIVE_ARCH_ARMV6M,
-    NATIVE_ARCH_ARMV7M,
-    NATIVE_ARCH_ARMV7EM,
-    NATIVE_ARCH_ARMV7EMSP,
-    NATIVE_ARCH_ARMV7EMDP,
-    NATIVE_ARCH_XTENSA,
-    NATIVE_ARCH_XTENSAWIN,
-]
-
-__all__ = ["version", "compile", "run", "CrossCompileError"]
+NATIVE_ARCHS = {
+    "NATIVE_ARCH_NONE": "",
+    "NATIVE_ARCH_X86": "x86",
+    "NATIVE_ARCH_X64": "x64",
+    "NATIVE_ARCH_ARMV6": "armv6",
+    "NATIVE_ARCH_ARMV6M": "armv6m",
+    "NATIVE_ARCH_ARMV7M": "armv7m",
+    "NATIVE_ARCH_ARMV7EM": "armv7em",
+    "NATIVE_ARCH_ARMV7EMSP": "armv7emsp",
+    "NATIVE_ARCH_ARMV7EMDP": "armv7emdp",
+    "NATIVE_ARCH_XTENSA": "xtensa",
+    "NATIVE_ARCH_XTENSAWIN": "xtensawin",
+}
+
+globals().update(NATIVE_ARCHS)
+
+__all__ = ["version", "compile", "run", "CrossCompileError"] + list(NATIVE_ARCHS.keys())
 
 
 class CrossCompileError(Exception):

From e4d90be680b0a8933daf1bad03a1fa2632e0136e Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Wed, 28 Sep 2022 11:46:45 +1000
Subject: [PATCH 2655/3533] mpy-cross/mpy_cross: Add docstrings to public
 methods.

---
 mpy-cross/mpy_cross/__init__.py | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/mpy-cross/mpy_cross/__init__.py b/mpy-cross/mpy_cross/__init__.py
index 22d175c89cf3c..8eadbc8352c74 100644
--- a/mpy-cross/mpy_cross/__init__.py
+++ b/mpy-cross/mpy_cross/__init__.py
@@ -64,6 +64,13 @@ def _find_mpy_cross_binary(mpy_cross):
 
 
 def mpy_version(mpy_cross=None):
+    """
+    Get the version and sub-version of the .mpy file format generated by this version of mpy-cross.
+
+    Returns: A tuple of `(mpy_version, mpy_sub_version)`
+    Optional keyword arguments:
+     - mpy_cross: Specific mpy-cross binary to use
+    """
     version_info = run(["--version"], mpy_cross=mpy_cross)
     match = re.search(_VERSION_RE, version_info)
     mpy_version, mpy_sub_version = int(match.group(1)), int(match.group(2) or "0")
@@ -74,6 +81,22 @@ def mpy_version(mpy_cross=None):
 
 
 def compile(src, dest=None, src_path=None, opt=None, march=None, mpy_cross=None, extra_args=None):
+    """
+    Compile the specified .py file with mpy-cross.
+
+    Returns: Standard output from mpy-cross as a string.
+
+    Required arguments:
+     - src:        The path to the .py file
+
+    Optional keyword arguments:
+     - dest:       The output .mpy file. Defaults to `src` (with .mpy extension)
+     - src_path:   The path to embed in the .mpy file (defaults to `src`)
+     - opt:        Optimisation level (0-3, default 0)
+     - march:      One of the `NATIVE_ARCH_*` constants (defaults to NATIVE_ARCH_NONE)
+     - mpy_cross:  Specific mpy-cross binary to use
+     - extra_args: Additional arguments to pass to mpy-cross (e.g. `["-X", "emit=native"]`)
+    """
     if not src:
         raise ValueError("src is required")
     if not os.path.exists(src):
@@ -102,6 +125,15 @@ def compile(src, dest=None, src_path=None, opt=None, march=None, mpy_cross=None,
 
 
 def run(args, mpy_cross=None):
+    """
+    Run mpy-cross with the specified command line arguments.
+    Prefer to use `compile()` instead.
+
+    Returns: Standard output from mpy-cross as a string.
+
+    Optional keyword arguments:
+     - mpy_cross: Specific mpy-cross binary to use
+    """
     mpy_cross = _find_mpy_cross_binary(mpy_cross)
 
     if not os.path.exists(mpy_cross):

From fecfbc3f678c8f2f6c450abf840bbefca48a57d0 Mon Sep 17 00:00:00 2001
From: stijn <stijn@ignitron.net>
Date: Thu, 29 Sep 2022 14:17:37 +0200
Subject: [PATCH 2656/3533] py/mkenv.mk: Make CPP definition explicit for
 consistency.

---
 py/mkenv.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/py/mkenv.mk b/py/mkenv.mk
index ea2e34f3b64de..5368279e2908f 100644
--- a/py/mkenv.mk
+++ b/py/mkenv.mk
@@ -45,6 +45,7 @@ PYTHON = python3
 
 AS = $(CROSS_COMPILE)as
 CC = $(CROSS_COMPILE)gcc
+CPP = $(CC) -E
 CXX = $(CROSS_COMPILE)g++
 GDB = $(CROSS_COMPILE)gdb
 LD = $(CROSS_COMPILE)ld

From b76ddcbc83b7235ab373e764ae033c1e5cecddd1 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Thu, 29 Sep 2022 22:31:35 +1000
Subject: [PATCH 2657/3533] docs/Makefile: Enable parallel compilation for
 Sphinx.

This has a fairly dramatic (nearly 3x on a 6-core machine) speedup for docs
compilation, with no impact on correctness.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 docs/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/Makefile b/docs/Makefile
index 05709617c35b9..766a669a500dc 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -3,7 +3,7 @@
 
 # You can set these variables from the command line.
 PYTHON        = python3
-SPHINXOPTS    = -W --keep-going
+SPHINXOPTS    = -W --keep-going -j auto
 SPHINXBUILD   = sphinx-build
 PAPER         =
 BUILDDIR      = build/$(MICROPY_PORT)

From 65ab0ec91cffe5d39ff2e253ac5cc898ecc3c5ce Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Thu, 29 Sep 2022 23:13:52 +1000
Subject: [PATCH 2658/3533] tools/manifestfile.py: Add `author` kwarg to
 metadata().

This allows future micropython-lib packages to specify an author.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 tools/manifestfile.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/tools/manifestfile.py b/tools/manifestfile.py
index a4d056137ffc9..f7966ccb8045d 100644
--- a/tools/manifestfile.py
+++ b/tools/manifestfile.py
@@ -87,14 +87,17 @@ def __init__(self):
         self.version = None
         self.description = None
         self.license = None
+        self.author = None
 
-    def update(self, description=None, version=None, license=None):
+    def update(self, description=None, version=None, license=None, author=None):
         if description:
             self.description = description
         if version:
             self.version = version
         if license:
             self.license = version
+        if author:
+            self.author = author
 
 
 # Turns a dict of options into a object with attributes used to turn the
@@ -228,7 +231,7 @@ def _search(self, base_path, package_path, files, exts, kind, opt=None, strict=F
             if base_path:
                 os.chdir(prev_cwd)
 
-    def metadata(self, description=None, version=None, license=None):
+    def metadata(self, description=None, version=None, license=None, author=None):
         """
         From within a manifest file, use this to set the metadata for the
         package described by current manifest.
@@ -237,7 +240,7 @@ def metadata(self, description=None, version=None, license=None):
         to obtain the metadata for the top-level manifest file.
         """
 
-        self._metadata[-1].update(description, version, license)
+        self._metadata[-1].update(description, version, license, author)
         return self._metadata[-1]
 
     def include(self, manifest_path, top_level=False, **kwargs):

From ba3652f15d96d9dca0f84522639ea2005b07fcb4 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Fri, 30 Sep 2022 00:46:16 +1000
Subject: [PATCH 2659/3533] lib/micropython-lib: Update submodule to latest.

This brings in the `mip` tool for installing packages.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 lib/micropython-lib | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/micropython-lib b/lib/micropython-lib
index 58f8bec54d5b3..d0f97fc218f07 160000
--- a/lib/micropython-lib
+++ b/lib/micropython-lib
@@ -1 +1 @@
-Subproject commit 58f8bec54d5b3b959247b73a6e8f28e8493bd30b
+Subproject commit d0f97fc218f07c381c835d9f632904c1ae1c9d6b

From 924a3e03ec167c4417d89b531794c75ce5a631a3 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Thu, 29 Sep 2022 17:49:58 +1000
Subject: [PATCH 2660/3533] top: Replace upip with mip everywhere.

Updates all README.md and docs, and manifests to `require("mip")`.

Also extend and improve the documentation on freezing and packaging.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 docs/develop/gettingstarted.rst         |   3 +-
 docs/develop/optimizations.rst          |   2 +
 docs/esp8266/tutorial/intro.rst         |   2 +-
 docs/pyboard/tutorial/lcd160cr_skin.rst |   2 +-
 docs/reference/glossary.rst             |  30 +-
 docs/reference/manifest.rst             | 271 ++++++++++----
 docs/reference/packages.rst             | 463 ++++++++----------------
 examples/hwapi/README.md                |   2 +-
 ports/esp32/boards/manifest.py          |   3 +-
 ports/esp8266/README.md                 |  18 +-
 ports/esp8266/boards/manifest.py        |   7 +-
 ports/rp2/boards/PICO_W/manifest.py     |   4 +-
 ports/unix/README.md                    |  26 +-
 ports/unix/variants/manifest.py         |   3 +-
 tools/upip.py                           | 351 ------------------
 tools/upip_utarfile.py                  |  95 -----
 16 files changed, 404 insertions(+), 878 deletions(-)
 delete mode 100644 tools/upip.py
 delete mode 100644 tools/upip_utarfile.py

diff --git a/docs/develop/gettingstarted.rst b/docs/develop/gettingstarted.rst
index 000b7d61390cb..c2d3816d425a4 100644
--- a/docs/develop/gettingstarted.rst
+++ b/docs/develop/gettingstarted.rst
@@ -322,7 +322,8 @@ tests
 
 tools
 
-  Contains helper tools including the ``upip`` and the ``pyboard.py`` module.
+  Contains scripts used by the build and CI process, as well as user tools such
+  as ``pyboard.py`` and ``mpremote``.
 
 examples
 
diff --git a/docs/develop/optimizations.rst b/docs/develop/optimizations.rst
index d972cde66616a..7f2c8cbe7282c 100644
--- a/docs/develop/optimizations.rst
+++ b/docs/develop/optimizations.rst
@@ -25,6 +25,8 @@ into the firmware image as part of the main firmware compilation process, which
 the bytecode will be executed from ROM. This can lead to a significant memory saving, and
 reduce heap fragmentation.
 
+See :ref:`manifest` for more information.
+
 Variables
 ---------
 
diff --git a/docs/esp8266/tutorial/intro.rst b/docs/esp8266/tutorial/intro.rst
index ac46e68b5a5cc..75739bd6f96fd 100644
--- a/docs/esp8266/tutorial/intro.rst
+++ b/docs/esp8266/tutorial/intro.rst
@@ -23,7 +23,7 @@ convertor to make the UART available to your PC.
 The minimum requirement for flash size is 1Mbyte. There is also a special
 build for boards with 512KB, but it is highly limited comparing to the
 normal build: there is no support for filesystem, and thus features which
-depend on it won't work (WebREPL, upip, etc.). As such, 512KB build will
+depend on it won't work (WebREPL, mip, etc.). As such, 512KB build will
 be more interesting for users who build from source and fine-tune parameters
 for their particular application.
 
diff --git a/docs/pyboard/tutorial/lcd160cr_skin.rst b/docs/pyboard/tutorial/lcd160cr_skin.rst
index fa0debcb1ce3f..a0fe88a2e692c 100644
--- a/docs/pyboard/tutorial/lcd160cr_skin.rst
+++ b/docs/pyboard/tutorial/lcd160cr_skin.rst
@@ -42,7 +42,7 @@ There is a test program which you can use to test the features of the display,
 and which also serves as a basis to start creating your own code that uses the
 LCD.  This test program is available on GitHub
 `here <https://github.com/micropython/micropython/blob/master/drivers/display/lcd160cr_test.py>`__.
-Copy it to the board over USB mass storage, or by using `mpremote`.
+Copy it to the board over USB mass storage, or by using :ref:`mpremote`.
 
 To run the test from the MicroPython prompt do::
 
diff --git a/docs/reference/glossary.rst b/docs/reference/glossary.rst
index da951189e2045..4c66f70319ba4 100644
--- a/docs/reference/glossary.rst
+++ b/docs/reference/glossary.rst
@@ -52,7 +52,7 @@ Glossary
     cross-compiler
         Also known as ``mpy-cross``. This tool runs on your PC and converts a
         :term:`.py file` containing MicroPython code into a :term:`.mpy file`
-        containing MicroPython bytecode. This means it loads faster (the board
+        containing MicroPython :term:`bytecode`. This means it loads faster (the board
         doesn't have to compile the code), and uses less space on flash (the
         bytecode is more space efficient).
 
@@ -128,7 +128,7 @@ Glossary
 
         Unlike the :term:`CPython` stdlib, micropython-lib modules are
         intended to be installed individually - either using manual copying or
-        using :term:`upip`.
+        using :term:`mip`.
 
     MicroPython port
         MicroPython supports different :term:`boards <board>`, RTOSes, and
@@ -151,16 +151,26 @@ Glossary
         machine-independent features. It can also function in a similar way to
         :term:`CPython`'s ``python`` executable.
 
+    mip
+        A package installer for MicroPython (mip - "mip installs packages"). It
+        installs MicroPython packages either from :term:`micropython-lib`,
+        GitHub, or arbitrary URLs.  mip can be used on-device on
+        network-capable boards, and internally by tools such
+        as :term:`mpremote`.
+
+    mpremote
+        A tool for interacting with a MicroPython device. See :ref:`mpremote`.
+
     .mpy file
         The output of the :term:`cross-compiler`. A compiled form of a
-        :term:`.py file` that contains MicroPython bytecode instead of Python
-        source code.
+        :term:`.py file` that contains MicroPython :term:`bytecode` instead of
+        Python source code.
 
     native
         Usually refers to "native code", i.e. machine code for the target
         microcontroller (such as ARM Thumb, Xtensa, x86/x64). The ``@native``
         decorator can be applied to a MicroPython function to generate native
-        code instead of bytecode for that function, which will likely be
+        code instead of :term:`bytecode` for that function, which will likely be
         faster but use more RAM.
 
     port
@@ -193,8 +203,10 @@ Glossary
         as a serial port over USB.
 
     upip
-        (Literally, "micro pip"). A package manager for MicroPython, inspired
+        A now-obsolete package manager for MicroPython, inspired
         by :term:`CPython`'s pip, but much smaller and with reduced
-        functionality.
-        upip runs both on the :term:`Unix port <MicroPython Unix port>` and on
-        :term:`baremetal` ports which offer filesystem and networking support.
+        functionality. See its replacement, :term:`mip`.
+
+    webrepl
+        A way of connecting to the REPL (and transferring files) on a device
+        over the internet from a browser. See https://micropython.org/webrepl
diff --git a/docs/reference/manifest.rst b/docs/reference/manifest.rst
index b756de47ed032..9bcafd5839cab 100644
--- a/docs/reference/manifest.rst
+++ b/docs/reference/manifest.rst
@@ -1,35 +1,177 @@
+.. _manifest:
+
 MicroPython manifest files
 ==========================
 
-When building firmware for a device the following components are included in
-the compilation process:
+Summary
+-------
+
+MicroPython has a feature that allows Python code to be "frozen" into the
+firmware, as an alternative to loading code from the filesystem.
+
+This has the following benefits:
+
+- the code is pre-compiled to bytecode, avoiding the need for the Python
+  source to be compiled at load-time.
+- the bytecode can be executed directly from ROM (i.e. flash memory) rather than
+  being copied into RAM. Similarly any constant objects (strings, tuples, etc)
+  are loaded from ROM also. This can lead to significantly more memory being
+  available for your application.
+- on devices that do not have a filesystem, this is the only way to
+  load Python code.
+
+During development, freezing is generally not recommended as it will
+significantly slow down your development cycle, as each update will require
+re-flashing the entire firmware. However, it can still be useful to
+selectively freeze some rarely-changing dependencies (such as third-party
+libraries).
+
+The way to list the Python files to be be frozen into the firmware is via
+a "manifest", which is a Python file that will be interpreted by the build
+process. Typically you would write a manifest file as part of a board
+definition, but you can also write a stand-alone manifest file and use it with
+an existing board definition.
+
+Manifest files can define dependencies on libraries from :term:`micropython-lib`
+as well as Python files on the filesystem, and also on other manifest files.
+
+Writing manifest files
+----------------------
+
+A manifest file is a Python file containing a series of function calls. See the
+available functions defined below.
+
+Any paths used in manifest files can include the following variables. These all
+resolve to absolute paths.
+
+- ``$(MPY_DIR)`` -- path to the micropython repo.
+- ``$(MPY_LIB_DIR)`` -- path to the micropython-lib submodule. Prefer to use
+  ``require()``.
+- ``$(PORT_DIR)`` -- path to the current port (e.g. ``ports/stm32``)
+- ``$(BOARD_DIR)`` -- path to the current board
+  (e.g. ``ports/stm32/boards/PYBV11``)
+
+Custom manifest files should not live in the main MicroPython repository. You
+should keep them in version control with the rest of your project.
+
+Typically a manifest used for compiling firmware will need to include the port
+manifest, which might include frozen modules that are required for the board to
+function. If you just want to add additional modules to an existing board, then
+include the board manifest (which will in turn include the port manifest).
+
+Building with a custom manifest
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Your manifest can be specified on the ``make`` command line with:
+
+.. code-block:: bash
+
+    $ make BOARD=MYBOARD FROZEN_MANIFEST=/path/to/my/project/manifest.py
+
+This applies to all ports, including CMake-based ones (e.g. esp32, rp2), as the
+Makefile wrapper that will pass this into the CMake build.
+
+Adding a manifest to a board definition
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+If you have a custom board definition, you can make it include your custom
+manifest automatically. On make-based ports (most ports), in your
+``mpconfigboard.mk`` set the ``FROZEN_MANIFEST`` variable.
+
+.. code-block:: makefile
+
+    FROZEN_MANIFEST ?= $(BOARD_DIR)/manifest.py
+
+On CMake-based ports (e.g. esp32, rp2), instead use ``mpconfigboard.cmake``
+
+.. code-block:: cmake
+
+    set(MICROPY_FROZEN_MANIFEST ${MICROPY_BOARD_DIR}/manifest.py)
+
+High-level functions
+~~~~~~~~~~~~~~~~~~~~
+
+Note: The ``opt`` keyword argument can be set on the various functions, this controls
+the optimisation level used by the cross-compiler.
+See :func:`micropython.opt_level`.
+
+.. function:: package(package_path, files=None, base_path=".", opt=None)
+
+    This is equivalent to copying the "package_path" directory to the device
+    (except as frozen code).
+
+    In the simplest case, to freeze a package "foo" in the current directory:
+
+    .. code-block:: python3
+
+        package("foo")
+
+    will recursively include all .py files in foo, and will be frozen as
+    ``foo/**/*.py``.
+
+    If the package isn't in the same directory as the manifest file, use ``base_path``:
+
+    .. code-block:: python3
+
+        package("foo", base_path="path/to/libraries")
+
+    You can use the variables above, such as ``$(PORT_DIR)`` in ``base_path``.
+
+    To restrict to certain files in the package use ``files`` (note: paths
+    should be relative to the package): ``package("foo", files=["bar/baz.py"])``.
+
+.. function:: module(module_path, base_path=".", opt=None)
+
+    Include a single Python file as a module.
+
+    If the file is in the current directory:
+
+    .. code-block:: python3
+
+        module("foo.py")
+
+    Otherwise use base_path to locate the file:
+
+    .. code-block:: python3
+
+        module("foo.py", base_path="src/drivers")
+
+    You can use the variables above, such as ``$(PORT_DIR)`` in ``base_path``.
+
+.. function:: require(name, unix_ffi=False)
+
+    Require a package by name (and its dependencies) from :term:`micropython-lib`.
+
+    Optionally specify unix_ffi=True to use a module from the unix-ffi directory.
+
+.. function:: include(manifest_path)
 
-- the core MicroPython virtual machine and runtime
-- port-specific system code and drivers to interface with the
-  microcontroller/device that the firmware is targeting
-- standard built-in modules, like ``sys``
-- extended built-in modules, like ``json`` and ``machine``
-- extra modules written in C/C++
-- extra modules written in Python
+    Include another manifest.
+
+    Typically a manifest used for compiling firmware will need to include the
+    port manifest, which might include frozen modules that are required for
+    the board to function.
+
+    The *manifest* argument can be a string (filename) or an iterable of
+    strings.
 
-All the modules included in the firmware are available via ``import`` from
-Python code.  The extra modules written in Python that are included in a build
-(the last point above) are called *frozen modules*, and are specified by a
-``manifest.py`` file.  Changing this manifest requires rebuilding the firmware.
+    Relative paths are resolved with respect to the current manifest file.
 
-It's also possible to add additional modules to the filesystem of the device
-once it is up and running.  Adding and removing modules to/from the filesystem
-does not require rebuilding the firmware so is a simpler process than rebuilding
-firmware.  The benefit of using a manifest is that frozen modules are more
-efficient: they are faster to import and take up less RAM once imported.
+    If the path is to a directory, then it implicitly includes the
+    manifest.py file inside that directory.
 
-MicroPython manifest files are Python files and can contain arbitrary Python
-code.  There are also a set of commands (predefined functions) which are used
-to specify the Python source files to include.  These commands are described
-below.
+    You can use the variables above, such as ``$(PORT_DIR)`` in ``manifest_path``.
 
-Freezing source code
---------------------
+.. function:: metadata(description=None, version=None, license=None, author=None)
+
+    Define metadata for this manifest file. This is useful for manifests for
+    micropython-lib packages.
+
+Low-level functions
+~~~~~~~~~~~~~~~~~~~
+
+These functions are documented for completeness, but with the exception of
+``freeze_as_str`` all functionality can be accessed via the high-level functions.
 
 .. function:: freeze(path, script=None, opt=0)
 
@@ -42,9 +184,7 @@ Freezing source code
     module will start after *path*, i.e. *path* is excluded from the module
     name.
 
-    If *path* is relative, it is resolved to the current ``manifest.py``.  Use
-    ``$(MPY_DIR)``, ``$(MPY_LIB_DIR)``, ``$(PORT_DIR)``, ``$(BOARD_DIR)`` if you
-    need to access specific paths.
+    If *path* is relative, it is resolved to the current ``manifest.py``.
 
     If *script* is None, all files in *path* will be frozen.
 
@@ -75,71 +215,48 @@ Freezing source code
     Freeze the input, which must be ``.mpy`` files that are frozen directly.
     See ``freeze()`` for further details on the arguments.
 
-
-Including other manifest files
-------------------------------
-
-.. function:: include(manifest, **kwargs)
-
-    Include another manifest.
-
-    The *manifest* argument can be a string (filename) or an iterable of
-    strings.
-
-    Relative paths are resolved with respect to the current manifest file.
-
-    Optional *kwargs* can be provided which will be available to the included
-    script via the *options* variable.
-
-    For example:
-
-    .. code-block:: python3
-
-        include("path.py", extra_features=True)
-
-    then in path.py:
-
-    .. code-block:: python3
-
-            options.defaults(standard_features=True)
-            # freeze minimal modules.
-            if options.standard_features:
-                # freeze standard modules.
-            if options.extra_features:
-                # freeze extra modules.
-
-
 Examples
 --------
 
-To freeze a single file which is available as ``import mydriver``, use:
+To freeze a single file from the current directory which will be available as
+``import mydriver``, use:
 
 .. code-block:: python3
 
-    freeze(".", "mydriver.py")
+    module("mydriver.py")
 
-To freeze a set of files which are available as ``import test1`` and
-``import test2``, and which are compiled with optimisation level 3, use:
+To freeze a directory of files in a subdirectory "mydriver" of the current
+directory which will be available as ``import mydriver``, use:
 
 .. code-block:: python3
 
-    freeze("/path/to/tests", ("test1.py", "test2.py"), opt=3)
+    package("mydriver")
 
-To freeze a module which can be imported as ``import mymodule``, use:
+To freeze the "hmac" library from :term:`micropython-lib`, use:
 
 .. code-block:: python3
 
-    freeze(
-        "../relative/path",
-        (
-            "mymodule/__init__.py",
-            "mymodule/core.py",
-            "mymodule/extra.py",
-        ),
-    )
+    require("hmac")
 
-To include a manifest from the MicroPython repository, use:
+A more complete example of a custom ``manifest.py`` file for the ``PYBD_SF2``
+board is:
 
 .. code-block:: python3
 
-    include("$(MPY_DIR)/extmod/uasyncio/manifest.py")
+    # Include the board's default manifest.
+    include("$(BOARD_DIR)/manifest.py")
+    # Add a custom driver
+    module("mydriver.py")
+    # Add aiorepl from micropython-lib
+    require("aiorepl")
+
+Then the board can be compiled with
+
+.. code-block:: bash
+
+    $ cd ports/stm32
+    $ make BOARD=PYBD_SF2 FROZEN_MANIFEST=~/src/myproject/manifest.py
+
+Note that most boards do not have their own ``manifest.py``, rather they use the
+port one directly, in which case your manifest should just
+``include("$(PORT_DIR)/boards/manifest.py")`` instead.
diff --git a/docs/reference/packages.rst b/docs/reference/packages.rst
index eb44992ed6324..0c049d1fb2fc2 100644
--- a/docs/reference/packages.rst
+++ b/docs/reference/packages.rst
@@ -1,314 +1,153 @@
 .. _packages:
 
-Distribution packages, package management, and deploying applications
-=====================================================================
-
-Just as the "big" Python, MicroPython supports creation of "third party"
-packages, distributing them, and easily installing them in each user's
-environment. This chapter discusses how these actions are achieved.
-Some familiarity with Python packaging is recommended.
-
-Overview
---------
-
-Steps below represent a high-level workflow when creating and consuming
-packages:
-
-1. Python modules and packages are turned into distribution package
-   archives, and published at the Python Package Index (PyPI).
-2. :term:`upip` package manager can be used to install a distribution package
-   on a :term:`MicroPython port` with networking capabilities (for example,
-   on the Unix port).
-3. For ports without networking capabilities, an "installation image"
-   can be prepared on the Unix port, and transferred to a device by
-   suitable means.
-4. For low-memory ports, the installation image can be frozen as the
-   bytecode into MicroPython executable, thus minimizing the memory
-   storage overheads.
-
-The sections below describe this process in details.
-
-Distribution packages
----------------------
-
-Python modules and packages can be packaged into archives suitable for
-transfer between systems, storing at the well-known location (PyPI),
-and downloading on demand for deployment. These archives are known as
-*distribution packages* (to differentiate them from Python packages
-(means to organize Python source code)).
-
-The MicroPython distribution package format is a well-known tar.gz
-format, with some adaptations however. The Gzip compressor, used as
-an external wrapper for TAR archives, by default uses 32KB dictionary
-size, which means that to uncompress a compressed stream, 32KB of
-contiguous memory needs to be allocated. This requirement may be not
-satisfiable on low-memory devices, which may have total memory available
-less than that amount, and even if not, a contiguous block like that
-may be hard to allocate due to memory fragmentation. To accommodate
-these constraints, MicroPython distribution packages use Gzip compression
-with the dictionary size of 4K, which should be a suitable compromise
-with still achieving some compression while being able to uncompressed
-even by the smallest devices.
-
-Besides the small compression dictionary size, MicroPython distribution
-packages also have other optimizations, like removing any files from
-the archive which aren't used by the installation process. In particular,
-:term:`upip` package manager doesn't execute ``setup.py`` during installation
-(see below), and thus that file is not included in the archive.
-
-At the same time, these optimizations make MicroPython distribution
-packages not compatible with :term:`CPython`'s package manager, ``pip``.
-This isn't considered a big problem, because:
-
-1. Packages can be installed with :term:`upip`, and then can be used with
-   CPython (if they are compatible with it).
-2. In the other direction, majority of CPython packages would be
-   incompatible with MicroPython by various reasons, first of all,
-   the reliance on features not implemented by MicroPython.
-
-Summing up, the MicroPython distribution package archives are highly
-optimized for MicroPython's target environments, which are highly
-resource constrained devices.
-
-
-``upip`` package manager
-------------------------
-
-MicroPython distribution packages are intended to be installed using
-the :term:`upip` package manager. :term:`upip` is a Python application which is
-usually distributed (as frozen bytecode) with network-enabled
-:term:`MicroPython ports <MicroPython port>`. At the very least,
-:term:`upip` is available in the :term:`MicroPython Unix port`.
-
-On any :term:`MicroPython port` providing :term:`upip`, it can be accessed as
-following::
-
-    import upip
-    upip.help()
-    upip.install(package_or_package_list, [path])
-
-Where *package_or_package_list* is the name of a distribution
-package to install, or a list of such names to install multiple
-packages. Optional *path* parameter specifies filesystem
-location to install under and defaults to the standard library
-location (see below).
-
-An example of installing a specific package and then using it::
-
-    >>> import upip
-    >>> upip.install("micropython-pystone_lowmem")
-    [...]
-    >>> import pystone_lowmem
-    >>> pystone_lowmem.main()
-
-Note that the name of Python package and the name of distribution
-package for it in general don't have to match, and oftentimes they
-don't. This is because PyPI provides a central package repository
-for all different Python implementations and versions, and thus
-distribution package names may need to be namespaced for a particular
-implementation. For example, all packages from `micropython-lib`
-follow this naming convention: for a Python module or package named
-``foo``, the distribution package name is ``micropython-foo``.
-
-For the ports which run MicroPython executable from the OS command
-prompts (like the Unix port), `upip` can be (and indeed, usually is)
-run from the command line instead of MicroPython's own REPL. The
-commands which corresponds to the example above are::
-
-    micropython -m upip -h
-    micropython -m upip install [-p <path>] <packages>...
-    micropython -m upip install micropython-pystone_lowmem
-
-[TODO: Describe installation path.]
-
-
-Cross-installing packages
--------------------------
-
-For :term:`MicroPython ports <MicroPython port>` without native networking
-capabilities, the recommend process is "cross-installing" them into a
-"directory image" using the :term:`MicroPython Unix port`, and then
-transferring this image to a device by suitable means.
-
-Installing to a directory image involves using ``-p`` switch to :term:`upip`::
-
-    micropython -m upip install -p install_dir micropython-pystone_lowmem
-
-After this command, the package content (and contents of every dependency
-packages) will be available in the ``install_dir/`` subdirectory. You
-would need to transfer contents of this directory (without the
-``install_dir/`` prefix) to the device, at the suitable location, where
-it can be found by the Python ``import`` statement (see discussion of
-the :term:`upip` installation path above).
-
-
-Cross-installing packages with freezing
----------------------------------------
-
-For the low-memory :term:`MicroPython ports <MicroPython port>`, the process
-described in the previous section does not provide the most efficient
-resource usage,because the packages are installed in the source form,
-so need to be compiled to the bytecome on each import. This compilation
-requires RAM, and the resulting bytecode is also stored in RAM, reducing
-its amount available for storing application data. Moreover, the process
-above requires presence of the filesystem on a device, and the most
-resource-constrained devices may not even have it.
-
-The bytecode freezing is a process which resolves all the issues
-mentioned above:
-
-* The source code is pre-compiled into bytecode and store as such.
-* The bytecode is stored in ROM, not RAM.
-* Filesystem is not required for frozen packages.
-
-Using frozen bytecode requires building the executable (firmware)
-for a given :term:`MicroPython port` from the C source code. Consequently,
-the process is:
-
-1. Follow the instructions for a particular port on setting up a
-   toolchain and building the port. For example, for ESP8266 port,
-   study instructions in ``ports/esp8266/README.md`` and follow them.
-   Make sure you can build the port and deploy the resulting
-   executable/firmware successfully before proceeding to the next steps.
-2. Build :term:`MicroPython Unix port` and make sure it is in your PATH and
-   you can execute ``micropython``.
-3. Change to port's directory (e.g. ``ports/esp8266/`` for ESP8266).
-4. Run ``make clean-frozen``. This step cleans up any previous
-   modules which were installed for freezing (consequently, you need
-   to skip this step to add additional modules, instead of starting
-   from scratch).
-5. Run ``micropython -m upip install -p modules <packages>...`` to
-   install packages you want to freeze.
-6. Run ``make clean``.
-7. Run ``make``.
-
-After this, you should have the executable/firmware with modules as
-the bytecode inside, which you can deploy the usual way.
-
-Few notes:
-
-1. Step 5 in the sequence above assumes that the distribution package
-   is available from PyPI. If that is not the case, you would need
-   to copy Python source files manually to ``modules/`` subdirectory
-   of the port directory. (Note that upip does not support
-   installing from e.g. version control repositories).
-2. The firmware for baremetal devices usually has size restrictions,
-   so adding too many frozen modules may overflow it. Usually, you
-   would get a linking error if this happens. However, in some cases,
-   an image may be produced, which is not runnable on a device. Such
-   cases are in general bugs, and should be reported and further
-   investigated. If you face such a situation, as an initial step,
-   you may want to decrease the amount of frozen modules included.
-
-
-Creating distribution packages
-------------------------------
-
-Distribution packages for MicroPython are created in the same manner
-as for CPython or any other Python implementation, see references at
-the end of chapter. Setuptools (instead of distutils) should be used,
-because distutils do not support dependencies and other features. "Source
-distribution" (``sdist``) format is used for packaging. The post-processing
-discussed above, (and pre-processing discussed in the following section)
-is achieved by using custom ``sdist`` command for setuptools. Thus, packaging
-steps remain the same as for the standard setuptools, the user just
-needs to override ``sdist`` command implementation by passing the
-appropriate argument to ``setup()`` call::
-
-    from setuptools import setup
-    import sdist_upip
-
-    setup(
-        ...,
-        cmdclass={'sdist': sdist_upip.sdist}
-    )
-
-The sdist_upip.py module as referenced above can be found in
-`micropython-lib`:
-https://github.com/micropython/micropython-lib/blob/master/sdist_upip.py
-
-
-Application resources
----------------------
-
-A complete application, besides the source code, oftentimes also consists
-of data files, e.g. web page templates, game images, etc. It's clear how
-to deal with those when application is installed manually - you just put
-those data files in the filesystem at some location and use the normal
-file access functions.
-
-The situation is different when deploying applications from packages - this
-is more advanced, streamlined and flexible way, but also requires more
-advanced approach to accessing data files. This approach is treating
-the data files as "resources", and abstracting away access to them.
-
-Python supports resource access using its "setuptools" library, using
-``pkg_resources`` module. MicroPython, following its usual approach,
-implements subset of the functionality of that module, specifically
-``pkg_resources.resource_stream(package, resource)`` function.
-The idea is that an application calls this function, passing a
-resource identifier, which is a relative path to data file within
-the specified package (usually top-level application package). It
-returns a stream object which can be used to access resource contents.
-Thus, the ``resource_stream()`` emulates interface of the standard
-`open()` function.
-
-Implementation-wise, ``resource_stream()`` uses file operations
-underlyingly, if distribution package is install in the filesystem.
-However, it also supports functioning without the underlying filesystem,
-e.g. if the package is frozen as the bytecode. This however requires
-an extra intermediate step when packaging application - creation of
-"Python resource module".
-
-The idea of this module is to convert binary data to a Python bytes
-object, and put it into the dictionary, indexed by the resource name.
-This conversion is done automatically using overridden ``sdist`` command
-described in the previous section.
-
-Let's trace the complete process using the following example. Suppose
-your application has the following structure::
-
-    my_app/
-        __main__.py
-        utils.py
-        data/
-            page.html
-            image.png
-
-``__main__.py`` and ``utils.py`` should access resources using the
-following calls::
-
-    import pkg_resources
-
-    pkg_resources.resource_stream(__name__, "data/page.html")
-    pkg_resources.resource_stream(__name__, "data/image.png")
-
-You can develop and debug using the :term:`MicroPython Unix port` as usual.
-When time comes to make a distribution package out of it, just use
-overridden "sdist" command from sdist_upip.py module as described in
-the previous section.
-
-This will create a Python resource module named ``R.py``, based on the
-files declared in ``MANIFEST`` or ``MANIFEST.in`` files (any non-``.py``
-file will be considered a resource and added to ``R.py``) - before
-proceeding with the normal packaging steps.
-
-Prepared like this, your application will work both when deployed to
-filesystem and as frozen bytecode.
-
-If you would like to debug ``R.py`` creation, you can run::
-
-    python3 setup.py sdist --manifest-only
-
-Alternatively, you can use tools/mpy_bin2res.py script from the
-MicroPython distribution, in which can you will need to pass paths
-to all resource files::
-
-    mpy_bin2res.py data/page.html data/image.png
-
-References
-----------
-
-* Python Packaging User Guide: https://packaging.python.org/
-* Setuptools documentation: https://setuptools.readthedocs.io/
-* Distutils documentation: https://docs.python.org/3/library/distutils.html
+Package management
+==================
+
+Installing packages with ``mip``
+--------------------------------
+
+Network-capable boards include the ``mip`` module, which can install packages
+from :term:`micropython-lib` and from third-party sites (including GitHub).
+
+``mip`` ("mip installs packages") is similar in concept to Python's ``pip`` tool,
+however it does not use the PyPI index, rather it uses :term:`micropython-lib`
+as its index by default. ``mip`` will automatically fetch compiled
+:term:`.mpy file` when downloading from micropython-lib.
+
+The most common way to use ``mip`` is from the REPL::
+
+    >>> import mip
+    >>> mip.install("pkgname")  # Installs the latest version of "pkgname" (and dependencies)
+    >>> mip.install("pkgname", version="x.y")  # Installs version x.y of "pkgname"
+    >>> mip.install("pkgname", mpy=False)  # Installs the source version (i.e. .py rather than .mpy files)
+
+``mip`` will detect an appropriate location on the filesystem by searching
+``sys.path`` for the first entry ending in ``/lib``. You can override the
+destination using ``target``, but note that this path must be in ``sys.path`` to be
+able to subsequently import it.::
+
+    >>> mip.install("pkgname", target="third-party")
+    >>> sys.path.append("third-party")
+
+As well as downloading packages from the micropython-lib index, ``mip`` can also
+install third-party libraries. The simplest way is to download a file directly::
+
+    >>> mip.install("http://example.com/x/y/foo.py")
+    >>> mip.install("http://example.com/x/y/foo.mpy")
+
+When installing a file directly, the ``target`` argument is still supported to set
+the destination path, but ``mpy`` and ``version`` are ignored.
+
+The URL can also start with ``github:`` as a simple way of pointing to content
+hosted on GitHub::
+
+    >>> mip.install("github:org/repo/path/foo.py")  # Uses default branch
+    >>> mip.install("github:org/repo/path/foo.py", version="branch-or-tag")  # Optionally specify the branch or tag
+
+More sophisticated packages (i.e. with more than one file, or with dependencies)
+can be downloaded by specifying the path to their ``package.json``.
+
+    >>> mip.install("http://example.com/x/package.json")
+    >>> mip.install("github:org/user/path/package.json")
+
+If no json file is specified, then "package.json" is implicitly added::
+
+    >>> mip.install("http://example.com/x/")
+    >>> mip.install("github:org/repo")
+    >>> mip.install("github:org/repo", version="branch-or-tag")
+
+
+Using ``mip`` on the Unix port
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+On the Unix port, ``mip`` can be used at the REPL as above, and also by using ``-m``::
+
+    $ ./micropython -m mip install pkgname-or-url
+    $ ./micropython -m mip install pkgname-or-url@version
+
+The ``--target=path``, ``--no-mpy``, and ``--index`` arguments can be set::
+
+    $ ./micropython -m mip install --target=third-party pkgname
+    $ ./micropython -m mip install --no-mpy pkgname
+    $ ./micropython -m mip install --index https://host/pi pkgname
+
+Installing packages with ``mpremote``
+-------------------------------------
+
+The :term:`mpremote` tool also includes the same functionality as ``mip`` and
+can be used from a host PC to install packages to a locally connected device
+(e.g. via USB or UART)::
+
+    $ mpremote install pkgname
+    $ mpremote install pkgname@x.y
+    $ mpremote install http://example.com/x/y/foo.py
+    $ mpremote install github:org/repo
+    $ mpremote install github:org/repo@branch-or-tag
+
+The ``--target=path``, ``--no-mpy``, and ``--index`` arguments can be set::
+
+    $ mpremote install --target=/flash/third-party pkgname
+    $ mpremote install --no-mpy pkgname
+    $ mpremote install --index https://host/pi pkgname
+
+Installing packages manually
+----------------------------
+
+Packages can also be installed (in either .py or .mpy form) by manually copying
+the files to the device. Depending on the board this might be via USB Mass Storage,
+the :term:`mpremote` tool (e.g. ``mpremote fs cp path/to/package.py :package.py``),
+:term:`webrepl`, etc.
+
+Writing & publishing packages
+-----------------------------
+
+Publishing to :term:`micropython-lib` is the easiest way to make your package
+broadly accessible to MicroPython users, and automatically available via
+``mip`` and ``mpremote`` and compiled to bytecode. See
+https://github.com/micropython/micropython-lib for more information.
+
+To write a "self-hosted" package that can be downloaded by ``mip`` or
+``mpremote``, you need a static webserver (or GitHub) to host either a
+single .py file, or a package.json file alongside your .py files.
+
+A typical package.json for an example ``mlx90640`` library looks like::
+
+    {
+      "urls": [
+        ["mlx90640/__init__.py", "github:org/micropython-mlx90640/mlx90640/__init__.py"],
+        ["mlx90640/utils.py", "github:org/micropython-mlx90640/mlx90640/utils.py"]
+      ],
+      "deps": [
+        ["collections-defaultdict", "latest"],
+        ["os-path", "latest"]
+      ],
+      "version": "0.2"
+    }
+
+This includes two files, hosted at a GitHub repo named
+``org/micropython-mlx90640``, which install into the ``mlx90640`` directory on
+the device. It depends on ``collections-defaultdict`` and ``os-path`` which will
+be installed automatically.
+
+Freezing packages
+-----------------
+
+When a Python module or package is imported from the device filesystem, it is
+compiled into :term:`bytecode` in RAM, ready to be executed by the VM. For
+a :term:`.mpy file`, this conversion has been done already, but the bytecode
+still ends up in RAM.
+
+For low-memory devices, or for large applications, it can be advantageous to
+instead run the bytecode from ROM (i.e. flash memory). This can be done
+by "freezing" the bytecode into the MicroPython firmware, which is then flashed
+to the device. The runtime performance is the same (although importing is
+faster), but it can free up significant amounts of RAM for your program to
+use.
+
+The downside of this approach is that it's much slower to develop, because you
+have to flash the firmware each time, but it can be still useful to freeze
+dependencies that don't change often.
+
+Freezing is done by writing a manifest file and using it in the build, often as
+part of a custom board definition. See the :ref:`manifest` guide for more
+information.
diff --git a/examples/hwapi/README.md b/examples/hwapi/README.md
index 1992eb66094e8..df16b4c86be57 100644
--- a/examples/hwapi/README.md
+++ b/examples/hwapi/README.md
@@ -116,7 +116,7 @@ For example, one may invent a "configuration manager" helper module which will
 try to detect current board (among well-known ones), and load appropriate
 `hwconfig_*.py` - this assumes that a user would lazily deploy them all
 (or that application will be automatically installed, e.g. using MicroPython's
-`upip` package manager). The key point in this case remains the same as
+`mip` package manager). The key point in this case remains the same as
 elaborated above - always assume there can, and will be a custom configuration,
 and it should be well supported. So, any automatic detection should be
 overridable by a user, and instructions how to do so are among the most
diff --git a/ports/esp32/boards/manifest.py b/ports/esp32/boards/manifest.py
index fcc48d721805a..3f6c8cfde5a90 100644
--- a/ports/esp32/boards/manifest.py
+++ b/ports/esp32/boards/manifest.py
@@ -1,11 +1,10 @@
 freeze("$(PORT_DIR)/modules")
-module("upip.py", base_path="$(MPY_DIR)/tools", opt=3)
-module("upip_utarfile.py", base_path="$(MPY_DIR)/tools", opt=3)
 include("$(MPY_DIR)/extmod/uasyncio")
 
 # Require some micropython-lib modules.
 require("dht")
 require("ds18x20")
+require("mip")
 require("neopixel")
 require("ntptime")
 require("onewire")
diff --git a/ports/esp8266/README.md b/ports/esp8266/README.md
index dd50fc1af943f..b54d8958d77d8 100644
--- a/ports/esp8266/README.md
+++ b/ports/esp8266/README.md
@@ -200,20 +200,22 @@ Python prompt over WiFi, connecting through a browser.
 - GitHub repository https://github.com/micropython/webrepl.
   Please follow the instructions there.
 
-__upip__
+__mip__
 
-The ESP8266 port comes with builtin `upip` package manager, which can
-be used to install additional modules (see the main README for more
-information):
+The ESP8266 port comes with the built-in `mip` package manager, which can
+be used to install additional modules:
 
 ```
->>> import upip
->>> upip.install("micropython-pystone_lowmem")
+>>> import mip
+>>> mip.install("hmac")
 [...]
->>> import pystone_lowmem
->>> pystone_lowmem.main()
+>>> import hmac
+>>> hmac.new(b"1234567890", msg="hello world").hexdigest()
 ```
 
+See [Package management](https://docs.micropython.org/en/latest/reference/packages.html) for more
+information about `mip`.
+
 Downloading and installing packages may requite a lot of free memory,
 if you get an error, retry immediately after the hard reset.
 
diff --git a/ports/esp8266/boards/manifest.py b/ports/esp8266/boards/manifest.py
index e7defd0bb70ff..53975f6a6baf8 100644
--- a/ports/esp8266/boards/manifest.py
+++ b/ports/esp8266/boards/manifest.py
@@ -1,9 +1,8 @@
 freeze("$(PORT_DIR)/modules")
-module("upip.py", base_path="$(MPY_DIR)/tools", opt=3)
-module("upip_utarfile.py", base_path="$(MPY_DIR)/tools", opt=3)
-require("ntptime")
 require("dht")
-require("onewire")
 require("ds18x20")
+require("mip")
 require("neopixel")
+require("ntptime")
+require("onewire")
 require("webrepl")
diff --git a/ports/rp2/boards/PICO_W/manifest.py b/ports/rp2/boards/PICO_W/manifest.py
index 4d9eb87f20f3c..8a74006c64f7e 100644
--- a/ports/rp2/boards/PICO_W/manifest.py
+++ b/ports/rp2/boards/PICO_W/manifest.py
@@ -1,7 +1,5 @@
 include("../manifest.py")
 
-module("upip.py", base_path="$(MPY_DIR)/tools", opt=3)
-module("upip_utarfile.py", base_path="$(MPY_DIR)/tools", opt=3)
-
+require("mip")
 require("ntptime")
 require("urequests")
diff --git a/ports/unix/README.md b/ports/unix/README.md
index efc68b2455f90..a3a0dba75a131 100644
--- a/ports/unix/README.md
+++ b/ports/unix/README.md
@@ -24,21 +24,26 @@ Use `CTRL-D` (i.e. EOF) to exit the shell.
 Learn about command-line options (in particular, how to increase heap size
 which may be needed for larger applications):
 
-    $ ./micropython -h
+    $ ./build-standard/micropython -h
 
 To run the complete testsuite, use:
 
     $ make test
 
-The Unix port comes with a builtin package manager called upip, e.g.:
+The Unix port comes with a built-in package manager called `mip`, e.g.:
 
-    $ ./micropython -m upip install micropython-pystone
-    $ ./micropython -m pystone
+    $ ./build-standard/micropython -m mip install hmac
 
-Browse available modules on
-[PyPI](https://pypi.python.org/pypi?%3Aaction=search&term=micropython).
-Standard library modules come from the
-[micropython-lib](https://github.com/micropython/micropython-lib) project.
+or
+
+    $ ./build-standard/micropython
+    >>> import mip
+    >>> mip.install("hmac")
+
+Browse available modules at [micropython-lib]
+(https://github.com/micropython/micropython-lib). See
+[Package management](https://docs.micropython.org/en/latest/reference/packages.html)
+for more information about `mip`.
 
 External dependencies
 ---------------------
@@ -65,6 +70,5 @@ or not). If you intend to build MicroPython with additional options
 (like cross-compiling), the same set of options should be passed to `make
 deplibs`. To actually enable/disable use of dependencies, edit the
 `ports/unix/mpconfigport.mk` file, which has inline descriptions of the
-options. For example, to build SSL module (required for the `upip` tool
-described above, and so enabled by default), `MICROPY_PY_USSL` should be set
-to 1.
+options. For example, to build the SSL module, `MICROPY_PY_USSL` should be
+set to 1.
diff --git a/ports/unix/variants/manifest.py b/ports/unix/variants/manifest.py
index bf7ce992ade0d..e7fe747cb7976 100644
--- a/ports/unix/variants/manifest.py
+++ b/ports/unix/variants/manifest.py
@@ -1,2 +1 @@
-module("upip.py", base_path="$(MPY_DIR)/tools", opt=3)
-module("upip_utarfile.py", base_path="$(MPY_DIR)/tools", opt=3)
+require("mip")
diff --git a/tools/upip.py b/tools/upip.py
deleted file mode 100644
index 2932cca50cc9d..0000000000000
--- a/tools/upip.py
+++ /dev/null
@@ -1,351 +0,0 @@
-#
-# upip - Package manager for MicroPython
-#
-# Copyright (c) 2015-2018 Paul Sokolovsky
-#
-# Licensed under the MIT license.
-#
-import sys
-import gc
-import uos as os
-import uerrno as errno
-import ujson as json
-import uzlib
-import upip_utarfile as tarfile
-
-gc.collect()
-
-
-debug = False
-index_urls = ["https://micropython.org/pi", "https://pypi.org/pypi"]
-install_path = None
-cleanup_files = []
-gzdict_sz = 16 + 15
-
-file_buf = bytearray(512)
-
-
-class NotFoundError(Exception):
-    pass
-
-
-def op_split(path):
-    if path == "":
-        return ("", "")
-    r = path.rsplit("/", 1)
-    if len(r) == 1:
-        return ("", path)
-    head = r[0]
-    if not head:
-        head = "/"
-    return (head, r[1])
-
-
-# Expects *file* name
-def _makedirs(name, mode=0o777):
-    ret = False
-    s = ""
-    comps = name.rstrip("/").split("/")[:-1]
-    if comps[0] == "":
-        s = "/"
-    for c in comps:
-        if s and s[-1] != "/":
-            s += "/"
-        s += c
-        try:
-            os.mkdir(s)
-            ret = True
-        except OSError as e:
-            if e.errno != errno.EEXIST and e.errno != errno.EISDIR:
-                raise e
-            ret = False
-    return ret
-
-
-def save_file(fname, subf):
-    global file_buf
-    with open(fname, "wb") as outf:
-        while True:
-            sz = subf.readinto(file_buf)
-            if not sz:
-                break
-            outf.write(file_buf, sz)
-
-
-def install_tar(f, prefix):
-    meta = {}
-    for info in f:
-        # print(info)
-        fname = info.name
-        try:
-            fname = fname[fname.index("/") + 1 :]
-        except ValueError:
-            fname = ""
-
-        save = True
-        for p in ("setup.", "PKG-INFO", "README"):
-            # print(fname, p)
-            if fname.startswith(p) or ".egg-info" in fname:
-                if fname.endswith("/requires.txt"):
-                    meta["deps"] = f.extractfile(info).read()
-                save = False
-                if debug:
-                    print("Skipping", fname)
-                break
-
-        if save:
-            outfname = prefix + fname
-            if info.type != tarfile.DIRTYPE:
-                if debug:
-                    print("Extracting " + outfname)
-                _makedirs(outfname)
-                subf = f.extractfile(info)
-                save_file(outfname, subf)
-    return meta
-
-
-def expandhome(s):
-    if "~/" in s:
-        h = os.getenv("HOME")
-        s = s.replace("~/", h + "/")
-    return s
-
-
-import ussl
-import usocket
-
-warn_ussl = True
-
-
-def url_open(url):
-    global warn_ussl
-
-    if debug:
-        print(url)
-
-    proto, _, host, urlpath = url.split("/", 3)
-    try:
-        port = 443
-        if ":" in host:
-            host, port = host.split(":")
-            port = int(port)
-        ai = usocket.getaddrinfo(host, port, 0, usocket.SOCK_STREAM)
-    except OSError as e:
-        fatal("Unable to resolve %s (no Internet?)" % host, e)
-    # print("Address infos:", ai)
-    ai = ai[0]
-
-    s = usocket.socket(ai[0], ai[1], ai[2])
-    try:
-        # print("Connect address:", addr)
-        s.connect(ai[-1])
-
-        if proto == "https:":
-            s = ussl.wrap_socket(s, server_hostname=host)
-            if warn_ussl:
-                print("Warning: %s SSL certificate is not validated" % host)
-                warn_ussl = False
-
-        # MicroPython rawsocket module supports file interface directly
-        s.write("GET /%s HTTP/1.0\r\nHost: %s:%s\r\n\r\n" % (urlpath, host, port))
-        l = s.readline()
-        protover, status, msg = l.split(None, 2)
-        if status != b"200":
-            if status == b"404" or status == b"301":
-                raise NotFoundError("Package not found")
-            raise ValueError(status)
-        while 1:
-            l = s.readline()
-            if not l:
-                raise ValueError("Unexpected EOF in HTTP headers")
-            if l == b"\r\n":
-                break
-    except Exception as e:
-        s.close()
-        raise e
-
-    return s
-
-
-def get_pkg_metadata(name):
-    for url in index_urls:
-        try:
-            f = url_open("%s/%s/json" % (url, name))
-        except NotFoundError:
-            continue
-        try:
-            return json.load(f)
-        finally:
-            f.close()
-    raise NotFoundError("Package not found")
-
-
-def fatal(msg, exc=None):
-    print("Error:", msg)
-    if exc and debug:
-        raise exc
-    sys.exit(1)
-
-
-def install_pkg(pkg_spec, install_path):
-    package = pkg_spec.split("==")
-    data = get_pkg_metadata(package[0])
-
-    if len(package) == 1:
-        latest_ver = data["info"]["version"]
-    else:
-        latest_ver = package[1]
-    packages = data["releases"][latest_ver]
-    del data
-    gc.collect()
-    assert len(packages) == 1
-    package_url = packages[0]["url"]
-    print("Installing %s %s from %s" % (pkg_spec, latest_ver, package_url))
-    f1 = url_open(package_url)
-    try:
-        f2 = uzlib.DecompIO(f1, gzdict_sz)
-        f3 = tarfile.TarFile(fileobj=f2)
-        meta = install_tar(f3, install_path)
-    finally:
-        f1.close()
-    del f3
-    del f2
-    gc.collect()
-    return meta
-
-
-def install(to_install, install_path=None):
-    # Calculate gzip dictionary size to use
-    global gzdict_sz
-    sz = gc.mem_free() + gc.mem_alloc()
-    if sz <= 65536:
-        gzdict_sz = 16 + 12
-
-    if install_path is None:
-        install_path = get_install_path()
-    if install_path[-1] != "/":
-        install_path += "/"
-    if not isinstance(to_install, list):
-        to_install = [to_install]
-    print("Installing to: " + install_path)
-    # sets would be perfect here, but don't depend on them
-    installed = []
-    try:
-        while to_install:
-            if debug:
-                print("Queue:", to_install)
-            pkg_spec = to_install.pop(0)
-            if pkg_spec in installed:
-                continue
-            meta = install_pkg(pkg_spec, install_path)
-            installed.append(pkg_spec)
-            if debug:
-                print(meta)
-            deps = meta.get("deps", "").rstrip()
-            if deps:
-                deps = deps.decode("utf-8").split("\n")
-                to_install.extend(deps)
-    except Exception as e:
-        print(
-            "Error installing '{}': {}, packages may be partially installed".format(pkg_spec, e),
-            file=sys.stderr,
-        )
-
-
-def get_install_path():
-    global install_path
-    if install_path is None:
-        # sys.path[0] is current module's path
-        install_path = sys.path[1]
-        if install_path == ".frozen":
-            install_path = sys.path[2]
-    install_path = expandhome(install_path)
-    return install_path
-
-
-def cleanup():
-    for fname in cleanup_files:
-        try:
-            os.unlink(fname)
-        except OSError:
-            print("Warning: Cannot delete " + fname)
-
-
-def help():
-    print(
-        """\
-upip - Simple PyPI package manager for MicroPython
-Usage: micropython -m upip install [-p <path>] <package>... | -r <requirements.txt>
-import upip; upip.install(package_or_list, [<path>])
-
-If <path> isn't given, packages will be installed to sys.path[1], or
-sys.path[2] if the former is .frozen (path can be set from MICROPYPATH
-environment variable if supported)."""
-    )
-    print("Default install path:", get_install_path())
-    print(
-        """\
-
-Note: only MicroPython packages (usually, named micropython-*) are supported
-for installation, upip does not support arbitrary code in setup.py.
-"""
-    )
-
-
-def main():
-    global debug
-    global index_urls
-    global install_path
-    install_path = None
-
-    if len(sys.argv) < 2 or sys.argv[1] == "-h" or sys.argv[1] == "--help":
-        help()
-        return
-
-    if sys.argv[1] != "install":
-        fatal("Only 'install' command supported")
-
-    to_install = []
-
-    i = 2
-    while i < len(sys.argv) and sys.argv[i][0] == "-":
-        opt = sys.argv[i]
-        i += 1
-        if opt == "-h" or opt == "--help":
-            help()
-            return
-        elif opt == "-p":
-            install_path = sys.argv[i]
-            i += 1
-        elif opt == "-r":
-            list_file = sys.argv[i]
-            i += 1
-            with open(list_file) as f:
-                while True:
-                    l = f.readline()
-                    if not l:
-                        break
-                    if l[0] == "#":
-                        continue
-                    to_install.append(l.rstrip())
-        elif opt == "-i":
-            index_urls = [sys.argv[i]]
-            i += 1
-        elif opt == "--debug":
-            debug = True
-        else:
-            fatal("Unknown/unsupported option: " + opt)
-
-    to_install.extend(sys.argv[i:])
-    if not to_install:
-        help()
-        return
-
-    install(to_install)
-
-    if not debug:
-        cleanup()
-
-
-if __name__ == "__main__":
-    main()
diff --git a/tools/upip_utarfile.py b/tools/upip_utarfile.py
deleted file mode 100644
index 21b899f020a90..0000000000000
--- a/tools/upip_utarfile.py
+++ /dev/null
@@ -1,95 +0,0 @@
-import uctypes
-
-# http://www.gnu.org/software/tar/manual/html_node/Standard.html
-TAR_HEADER = {
-    "name": (uctypes.ARRAY | 0, uctypes.UINT8 | 100),
-    "size": (uctypes.ARRAY | 124, uctypes.UINT8 | 11),
-}
-
-DIRTYPE = "dir"
-REGTYPE = "file"
-
-
-def roundup(val, align):
-    return (val + align - 1) & ~(align - 1)
-
-
-class FileSection:
-    def __init__(self, f, content_len, aligned_len):
-        self.f = f
-        self.content_len = content_len
-        self.align = aligned_len - content_len
-
-    def read(self, sz=65536):
-        if self.content_len == 0:
-            return b""
-        if sz > self.content_len:
-            sz = self.content_len
-        data = self.f.read(sz)
-        sz = len(data)
-        self.content_len -= sz
-        return data
-
-    def readinto(self, buf):
-        if self.content_len == 0:
-            return 0
-        if len(buf) > self.content_len:
-            buf = memoryview(buf)[: self.content_len]
-        sz = self.f.readinto(buf)
-        self.content_len -= sz
-        return sz
-
-    def skip(self):
-        sz = self.content_len + self.align
-        if sz:
-            buf = bytearray(16)
-            while sz:
-                s = min(sz, 16)
-                self.f.readinto(buf, s)
-                sz -= s
-
-
-class TarInfo:
-    def __str__(self):
-        return "TarInfo(%r, %s, %d)" % (self.name, self.type, self.size)
-
-
-class TarFile:
-    def __init__(self, name=None, fileobj=None):
-        if fileobj:
-            self.f = fileobj
-        else:
-            self.f = open(name, "rb")
-        self.subf = None
-
-    def next(self):
-        if self.subf:
-            self.subf.skip()
-        buf = self.f.read(512)
-        if not buf:
-            return None
-
-        h = uctypes.struct(uctypes.addressof(buf), TAR_HEADER, uctypes.LITTLE_ENDIAN)
-
-        # Empty block means end of archive
-        if h.name[0] == 0:
-            return None
-
-        d = TarInfo()
-        d.name = str(h.name, "utf-8").rstrip("\0")
-        d.size = int(bytes(h.size), 8)
-        d.type = [REGTYPE, DIRTYPE][d.name[-1] == "/"]
-        self.subf = d.subf = FileSection(self.f, d.size, roundup(d.size, 512))
-        return d
-
-    def __iter__(self):
-        return self
-
-    def __next__(self):
-        v = self.next()
-        if v is None:
-            raise StopIteration
-        return v
-
-    def extractfile(self, tarinfo):
-        return tarinfo.subf

From 282401da5c6e689e63af7b9858cf9b0d23a24b2b Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Fri, 30 Sep 2022 15:33:43 +1000
Subject: [PATCH 2661/3533] tools/manifestfile.py: Replace recursive glob with
 os.walk.

Recursive glob isn't supported before Python 3.5.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 tools/manifestfile.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/tools/manifestfile.py b/tools/manifestfile.py
index f7966ccb8045d..fb9691d2931ac 100644
--- a/tools/manifestfile.py
+++ b/tools/manifestfile.py
@@ -311,14 +311,14 @@ def require(self, name, version=None, unix_ffi=False, **kwargs):
                 lib_dirs = ["unix-ffi"] + lib_dirs
 
             for lib_dir in lib_dirs:
-                for manifest_path in glob.glob(
-                    os.path.join(
-                        self._path_vars["MPY_LIB_DIR"], lib_dir, "**", name, "manifest.py"
-                    ),
-                    recursive=True,
+                # Search for {lib_dir}/**/{name}/manifest.py.
+                for root, dirnames, filenames in os.walk(
+                    os.path.join(self._path_vars["MPY_LIB_DIR"], lib_dir)
                 ):
-                    self.include(manifest_path, **kwargs)
-                    return
+                    if os.path.basename(root) == name and "manifest.py" in filenames:
+                        self.include(root, **kwargs)
+                        return
+
             raise ValueError("Library not found in local micropython-lib: {}".format(name))
         else:
             # TODO: HTTP request to obtain URLs from manifest.json.

From 413a69b94b92d1ae1cdd132e41d460259d22b9b8 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Fri, 30 Sep 2022 11:46:23 +1000
Subject: [PATCH 2662/3533] tools/mpremote: Simplify dispatch of commands.

No functional change.

This makes each built-in command defined by just a handler method and
simplifies a lot of the logic around tracking the board state.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 tools/mpremote/mpremote/commands.py | 261 +++++++++++++
 tools/mpremote/mpremote/main.py     | 557 ++++++++--------------------
 tools/mpremote/mpremote/repl.py     | 101 +++++
 3 files changed, 510 insertions(+), 409 deletions(-)
 create mode 100644 tools/mpremote/mpremote/commands.py
 create mode 100644 tools/mpremote/mpremote/repl.py

diff --git a/tools/mpremote/mpremote/commands.py b/tools/mpremote/mpremote/commands.py
new file mode 100644
index 0000000000000..60a625d5e854c
--- /dev/null
+++ b/tools/mpremote/mpremote/commands.py
@@ -0,0 +1,261 @@
+import os
+import sys
+import tempfile
+
+import serial.tools.list_ports
+
+from . import pyboardextended as pyboard
+
+
+class CommandError(Exception):
+    pass
+
+    do_disconnect(state)
+
+    try:
+        if dev == "list":
+            # List attached devices.
+            for p in sorted(serial.tools.list_ports.comports()):
+                print(
+                    "{} {} {:04x}:{:04x} {} {}".format(
+                        p.device,
+                        p.serial_number,
+                        p.vid if isinstance(p.vid, int) else 0,
+                        p.pid if isinstance(p.pid, int) else 0,
+                        p.manufacturer,
+                        p.product,
+                    )
+                )
+            # Don't do implicit REPL command.
+            state.did_action()
+        elif dev == "auto":
+            # Auto-detect and auto-connect to the first available device.
+            for p in sorted(serial.tools.list_ports.comports()):
+                try:
+                    state.pyb = pyboard.PyboardExtended(p.device, baudrate=115200)
+                    return
+                except pyboard.PyboardError as er:
+                    if not er.args[0].startswith("failed to access"):
+                        raise er
+            raise pyboard.PyboardError("no device found")
+        elif dev.startswith("id:"):
+            # Search for a device with the given serial number.
+            serial_number = dev[len("id:") :]
+            dev = None
+            for p in serial.tools.list_ports.comports():
+                if p.serial_number == serial_number:
+                    state.pyb = pyboard.PyboardExtended(p.device, baudrate=115200)
+                    return
+            raise pyboard.PyboardError("no device with serial number {}".format(serial_number))
+        else:
+            # Connect to the given device.
+            if dev.startswith("port:"):
+                dev = dev[len("port:") :]
+            state.pyb = pyboard.PyboardExtended(dev, baudrate=115200)
+            return
+    except pyboard.PyboardError as er:
+        msg = er.args[0]
+        if msg.startswith("failed to access"):
+            msg += " (it may be in use by another program)"
+        print(msg)
+        sys.exit(1)
+
+
+def do_disconnect(state, _args=None):
+    if not state.pyb:
+        return
+
+    try:
+        if state.pyb.mounted:
+            if not state.pyb.in_raw_repl:
+                state.pyb.enter_raw_repl(soft_reset=False)
+            state.pyb.umount_local()
+        if state.pyb.in_raw_repl:
+            state.pyb.exit_raw_repl()
+    except OSError:
+        # Ignore any OSError exceptions when shutting down, eg:
+        # - pyboard.filesystem_command will close the connecton if it had an error
+        # - umounting will fail if serial port disappeared
+        pass
+    state.pyb.close()
+    state.pyb = None
+    state._auto_soft_reset = True
+
+
+def show_progress_bar(size, total_size, op="copying"):
+    if not sys.stdout.isatty():
+        return
+    verbose_size = 2048
+    bar_length = 20
+    if total_size < verbose_size:
+        return
+    elif size >= total_size:
+        # Clear progress bar when copy completes
+        print("\r" + " " * (13 + len(op) + bar_length) + "\r", end="")
+    else:
+        bar = size * bar_length // total_size
+        progress = size * 100 // total_size
+        print(
+            "\r ... {} {:3d}% [{}{}]".format(op, progress, "#" * bar, "-" * (bar_length - bar)),
+            end="",
+        )
+
+
+# Get all args up to the terminator ("+").
+# The passed args will be updated with these ones removed.
+def _get_fs_args(args):
+    n = 0
+    for src in args:
+        if src == "+":
+            break
+        n += 1
+    fs_args = args[:n]
+    args[:] = args[n + 1 :]
+    return fs_args
+
+
+def do_filesystem(state, args):
+    state.ensure_raw_repl()
+    state.did_action()
+
+    def _list_recursive(files, path):
+        if os.path.isdir(path):
+            for entry in os.listdir(path):
+                _list_recursive(files, "/".join((path, entry)))
+        else:
+            files.append(os.path.split(path))
+
+    fs_args = _get_fs_args(args)
+
+    # Don't be verbose when using cat, so output can be redirected to something.
+    verbose = fs_args[0] != "cat"
+
+    if fs_args[0] == "cp" and fs_args[1] == "-r":
+        fs_args.pop(0)
+        fs_args.pop(0)
+        if fs_args[-1] != ":":
+            print(f"{_PROG}: 'cp -r' destination must be ':'")
+            sys.exit(1)
+        fs_args.pop()
+        src_files = []
+        for path in fs_args:
+            if path.startswith(":"):
+                raise CommandError("'cp -r' source files must be local")
+            _list_recursive(src_files, path)
+        known_dirs = {""}
+        state.pyb.exec_("import uos")
+        for dir, file in src_files:
+            dir_parts = dir.split("/")
+            for i in range(len(dir_parts)):
+                d = "/".join(dir_parts[: i + 1])
+                if d not in known_dirs:
+                    state.pyb.exec_("try:\n uos.mkdir('%s')\nexcept OSError as e:\n print(e)" % d)
+                    known_dirs.add(d)
+            pyboard.filesystem_command(
+                state.pyb,
+                ["cp", "/".join((dir, file)), ":" + dir + "/"],
+                progress_callback=show_progress_bar,
+                verbose=verbose,
+            )
+    else:
+        try:
+            pyboard.filesystem_command(
+                state.pyb, fs_args, progress_callback=show_progress_bar, verbose=verbose
+            )
+        except OSError as er:
+            raise CommandError(er)
+
+
+def do_edit(state, args):
+    state.ensure_raw_repl()
+    state.did_action()
+
+    if not os.getenv("EDITOR"):
+        raise pyboard.PyboardError("edit: $EDITOR not set")
+    for src in _get_fs_args(args):
+        src = src.lstrip(":")
+        dest_fd, dest = tempfile.mkstemp(suffix=os.path.basename(src))
+        try:
+            print("edit :%s" % (src,))
+            os.close(dest_fd)
+            state.pyb.fs_touch(src)
+            state.pyb.fs_get(src, dest, progress_callback=show_progress_bar)
+            if os.system("$EDITOR '%s'" % (dest,)) == 0:
+                state.pyb.fs_put(dest, src, progress_callback=show_progress_bar)
+        finally:
+            os.unlink(dest)
+
+
+def _get_follow_arg(args):
+    if args[0] == "--no-follow":
+        args.pop(0)
+        return False
+    else:
+        return True
+
+
+def _do_execbuffer(state, buf, follow):
+    state.ensure_raw_repl()
+    state.did_action()
+
+    try:
+        state.pyb.exec_raw_no_follow(buf)
+        if follow:
+            ret, ret_err = state.pyb.follow(timeout=None, data_consumer=pyboard.stdout_write_bytes)
+            if ret_err:
+                pyboard.stdout_write_bytes(ret_err)
+                sys.exit(1)
+    except pyboard.PyboardError as er:
+        print(er)
+        sys.exit(1)
+    except KeyboardInterrupt:
+        sys.exit(1)
+
+
+def do_exec(state, args):
+    follow = _get_follow_arg(args)
+    buf = args.pop(0)
+    _do_execbuffer(state, buf, follow)
+
+
+def do_eval(state, args):
+    follow = _get_follow_arg(args)
+    buf = "print(" + args.pop(0) + ")"
+    _do_execbuffer(state, buf, follow)
+
+
+def do_run(state, args):
+    follow = _get_follow_arg(args)
+    filename = args.pop(0)
+    try:
+        with open(filename, "rb") as f:
+            buf = f.read()
+    except OSError:
+        raise CommandError(f"could not read file '{filename}'")
+        sys.exit(1)
+    _do_execbuffer(state, buf, follow)
+
+
+def do_mount(state, args):
+    state.ensure_raw_repl()
+
+    unsafe_links = False
+    if args[0] == "--unsafe-links" or args[0] == "-l":
+        args.pop(0)
+        unsafe_links = True
+    path = args.pop(0)
+    state.pyb.mount_local(path, unsafe_links=unsafe_links)
+    print(f"Local directory {path} is mounted at /remote")
+
+
+def do_umount(state, path):
+    state.ensure_raw_repl()
+    state.pyb.umount_local()
+
+
+def do_resume(state, _args=None):
+    state._auto_soft_reset = False
+
+
+def do_soft_reset(state, _args=None):
+    state.ensure_raw_repl(soft_reset=True)
diff --git a/tools/mpremote/mpremote/main.py b/tools/mpremote/mpremote/main.py
index bd98da88248c1..b96e3f46b1bf6 100644
--- a/tools/mpremote/mpremote/main.py
+++ b/tools/mpremote/mpremote/main.py
@@ -19,45 +19,101 @@
 
 import os, sys
 from collections.abc import Mapping
-import tempfile
 from textwrap import dedent
 
-import serial.tools.list_ports
-
-from . import pyboardextended as pyboard
-from .console import Console, ConsolePosix
+from .commands import (
+    CommandError,
+    do_connect,
+    do_disconnect,
+    do_edit,
+    do_filesystem,
+    do_mount,
+    do_umount,
+    do_exec,
+    do_eval,
+    do_run,
+    do_resume,
+    do_soft_reset,
+)
+from .repl import do_repl
 
 _PROG = "mpremote"
 
-# (need_raw_repl, is_action, num_args_min, help_text)
+
+def do_help(state, _args=None):
+    def print_commands_help(cmds, help_idx):
+        max_command_len = max(len(cmd) for cmd in cmds.keys())
+        for cmd in sorted(cmds.keys()):
+            help_message_lines = dedent(cmds[cmd][help_idx]).split("\n")
+            help_message = help_message_lines[0]
+            for line in help_message_lines[1:]:
+                help_message = "{}\n{}{}".format(help_message, " " * (max_command_len + 4), line)
+            print("  ", cmd, " " * (max_command_len - len(cmd) + 2), help_message, sep="")
+
+    print(_PROG, "-- MicroPython remote control")
+    print("See https://docs.micropython.org/en/latest/reference/mpremote.html")
+
+    print("\nList of commands:")
+    print_commands_help(_COMMANDS, 1)
+
+    print("\nList of shortcuts:")
+    print_commands_help(_command_expansions, 2)
+
+    sys.exit(0)
+
+
+def do_version(state, _args=None):
+    from . import __version__
+
+    print(f"{_PROG} {__version__}")
+    sys.exit(0)
+
+
+# Map of "command" to tuple of (num_args_min, help_text, handler).
 _COMMANDS = {
     "connect": (
-        False,
-        False,
         1,
         """\
         connect to given device
         device may be: list, auto, id:x, port:x
         or any valid device name/path""",
+        do_connect,
+    ),
+    "disconnect": (
+        0,
+        "disconnect current device",
+        do_disconnect,
+    ),
+    "edit": (
+        1,
+        "edit files on the device",
+        do_edit,
+    ),
+    "resume": (
+        0,
+        "resume a previous mpremote session (will not auto soft-reset)",
+        do_resume,
+    ),
+    "soft-reset": (
+        0,
+        "perform a soft-reset of the device",
+        do_soft_reset,
     ),
-    "disconnect": (False, False, 0, "disconnect current device"),
-    "edit": (True, True, 1, "edit files on the device"),
-    "resume": (False, False, 0, "resume a previous mpremote session (will not auto soft-reset)"),
-    "soft-reset": (False, True, 0, "perform a soft-reset of the device"),
     "mount": (
-        True,
-        False,
         1,
         """\
         mount local directory on device
         options:
             --unsafe-links, -l
                 follow symbolic links pointing outside of local directory""",
+        do_mount,
+    ),
+    "umount": (
+        0,
+        "unmount the local directory",
+        do_umount,
     ),
-    "umount": (True, False, 0, "unmount the local directory"),
     "repl": (
-        False,
-        True,
         0,
         """\
         enter REPL
@@ -65,15 +121,45 @@
             --capture <file>
             --inject-code <string>
             --inject-file <file>""",
+        do_repl,
+    ),
+    "eval": (
+        1,
+        "evaluate and print the string",
+        do_eval,
+    ),
+    "exec": (
+        1,
+        "execute the string",
+        do_exec,
+    ),
+    "run": (
+        1,
+        "run the given local script",
+        do_run,
+    ),
+    "fs": (
+        1,
+        "execute filesystem commands on the device",
+        do_filesystem,
+    ),
+    "help": (
+        0,
+        "print help and exit",
+        do_help,
+    ),
+    "version": (
+        0,
+        "print version and exit",
+        do_version,
     ),
-    "eval": (True, True, 1, "evaluate and print the string"),
-    "exec": (True, True, 1, "execute the string"),
-    "run": (True, True, 1, "run the given local script"),
-    "fs": (True, True, 1, "execute filesystem commands on the device"),
-    "help": (False, False, 0, "print help and exit"),
-    "version": (False, False, 0, "print version and exit"),
 }
 
+# Additional commands aliases.
+# The value can either be:
+#   - A command string.
+#   - A list of command strings, each command will be executed sequentially.
+#   - A dict of command: { [], help: ""}
 _BUILTIN_COMMAND_EXPANSIONS = {
     # Device connection shortcuts.
     "devs": {
@@ -117,6 +203,8 @@
     "--version": "version",
 }
 
+# Add "a0", "a1", ..., "u0", "u1", ..., "c0", "c1", ... as aliases
+# for "connect /dev/ttyACMn" (and /dev/ttyUSBn, COMn) etc.
 for port_num in range(4):
     for prefix, port in [("a", "/dev/ttyACM"), ("u", "/dev/ttyUSB"), ("c", "COM")]:
         _BUILTIN_COMMAND_EXPANSIONS["{}{}".format(prefix, port_num)] = {
@@ -220,307 +308,33 @@ def usage_error(cmd, exp_args, msg):
         args[0:0] = ["exec", ";".join(pre)]
 
 
-def do_connect(args):
-    dev = args.pop(0)
-    try:
-        if dev == "list":
-            # List attached devices.
-            for p in sorted(serial.tools.list_ports.comports()):
-                print(
-                    "{} {} {:04x}:{:04x} {} {}".format(
-                        p.device,
-                        p.serial_number,
-                        p.vid if isinstance(p.vid, int) else 0,
-                        p.pid if isinstance(p.pid, int) else 0,
-                        p.manufacturer,
-                        p.product,
-                    )
-                )
-            return None
-        elif dev == "auto":
-            # Auto-detect and auto-connect to the first available device.
-            for p in sorted(serial.tools.list_ports.comports()):
-                try:
-                    return pyboard.PyboardExtended(p.device, baudrate=115200)
-                except pyboard.PyboardError as er:
-                    if not er.args[0].startswith("failed to access"):
-                        raise er
-            raise pyboard.PyboardError("no device found")
-        elif dev.startswith("id:"):
-            # Search for a device with the given serial number.
-            serial_number = dev[len("id:") :]
-            dev = None
-            for p in serial.tools.list_ports.comports():
-                if p.serial_number == serial_number:
-                    return pyboard.PyboardExtended(p.device, baudrate=115200)
-            raise pyboard.PyboardError("no device with serial number {}".format(serial_number))
-        else:
-            # Connect to the given device.
-            if dev.startswith("port:"):
-                dev = dev[len("port:") :]
-            return pyboard.PyboardExtended(dev, baudrate=115200)
-    except pyboard.PyboardError as er:
-        msg = er.args[0]
-        if msg.startswith("failed to access"):
-            msg += " (it may be in use by another program)"
-        print(msg)
-        sys.exit(1)
+class State:
+    def __init__(self):
+        self.pyb = None
+        self._did_action = False
+        self._auto_soft_reset = True
 
+    def did_action(self):
+        self._did_action = True
 
-def do_disconnect(pyb):
-    try:
-        if pyb.mounted:
-            if not pyb.in_raw_repl:
-                pyb.enter_raw_repl(soft_reset=False)
-            pyb.umount_local()
-        if pyb.in_raw_repl:
-            pyb.exit_raw_repl()
-    except OSError:
-        # Ignore any OSError exceptions when shutting down, eg:
-        # - pyboard.filesystem_command will close the connecton if it had an error
-        # - umounting will fail if serial port disappeared
-        pass
-    pyb.close()
-
-
-def show_progress_bar(size, total_size):
-    if not sys.stdout.isatty():
-        return
-    verbose_size = 2048
-    bar_length = 20
-    if total_size < verbose_size:
-        return
-    elif size >= total_size:
-        # Clear progress bar when copy completes
-        print("\r" + " " * (20 + bar_length) + "\r", end="")
-    else:
-        progress = size / total_size
-        bar = round(progress * bar_length)
-        print(
-            "\r ... copying {:3.0f}% [{}{}]".format(
-                progress * 100, "#" * bar, "-" * (bar_length - bar)
-            ),
-            end="",
-        )
-
-
-# Get all args up to the terminator ("+").
-# The passed args will be updated with these ones removed.
-def get_fs_args(args):
-    n = 0
-    for src in args:
-        if src == "+":
-            break
-        n += 1
-    fs_args = args[:n]
-    args[:] = args[n + 1 :]
-    return fs_args
-
-
-def do_filesystem(pyb, args):
-    def _list_recursive(files, path):
-        if os.path.isdir(path):
-            for entry in os.listdir(path):
-                _list_recursive(files, "/".join((path, entry)))
-        else:
-            files.append(os.path.split(path))
-
-    fs_args = get_fs_args(args)
-
-    # Don't be verbose when using cat, so output can be redirected to something.
-    verbose = fs_args[0] != "cat"
-
-    if fs_args[0] == "cp" and fs_args[1] == "-r":
-        fs_args.pop(0)
-        fs_args.pop(0)
-        if fs_args[-1] != ":":
-            print(f"{_PROG}: 'cp -r' destination must be ':'")
-            sys.exit(1)
-        fs_args.pop()
-        src_files = []
-        for path in fs_args:
-            if path.startswith(":"):
-                print(f"{_PROG}: 'cp -r' source files must be local")
-                sys.exit(1)
-            _list_recursive(src_files, path)
-        known_dirs = {""}
-        pyb.exec_("import uos")
-        for dir, file in src_files:
-            dir_parts = dir.split("/")
-            for i in range(len(dir_parts)):
-                d = "/".join(dir_parts[: i + 1])
-                if d not in known_dirs:
-                    pyb.exec_("try:\n uos.mkdir('%s')\nexcept OSError as e:\n print(e)" % d)
-                    known_dirs.add(d)
-            pyboard.filesystem_command(
-                pyb,
-                ["cp", "/".join((dir, file)), ":" + dir + "/"],
-                progress_callback=show_progress_bar,
-                verbose=verbose,
-            )
-    else:
-        try:
-            pyboard.filesystem_command(
-                pyb, fs_args, progress_callback=show_progress_bar, verbose=verbose
-            )
-        except OSError as er:
-            print(f"{_PROG}: {er}")
-            sys.exit(1)
-
-
-def do_edit(pyb, args):
-    if not os.getenv("EDITOR"):
-        raise pyboard.PyboardError("edit: $EDITOR not set")
-    for src in get_fs_args(args):
-        src = src.lstrip(":")
-        dest_fd, dest = tempfile.mkstemp(suffix=os.path.basename(src))
-        try:
-            print("edit :%s" % (src,))
-            os.close(dest_fd)
-            pyb.fs_touch(src)
-            pyb.fs_get(src, dest, progress_callback=show_progress_bar)
-            if os.system("$EDITOR '%s'" % (dest,)) == 0:
-                pyb.fs_put(dest, src, progress_callback=show_progress_bar)
-        finally:
-            os.unlink(dest)
-
-
-def do_repl_main_loop(pyb, console_in, console_out_write, *, code_to_inject, file_to_inject):
-    while True:
-        console_in.waitchar(pyb.serial)
-        c = console_in.readchar()
-        if c:
-            if c == b"\x1d":  # ctrl-], quit
-                break
-            elif c == b"\x04":  # ctrl-D
-                # special handling needed for ctrl-D if filesystem is mounted
-                pyb.write_ctrl_d(console_out_write)
-            elif c == b"\x0a" and code_to_inject is not None:  # ctrl-j, inject code
-                pyb.serial.write(code_to_inject)
-            elif c == b"\x0b" and file_to_inject is not None:  # ctrl-k, inject script
-                console_out_write(bytes("Injecting %s\r\n" % file_to_inject, "utf8"))
-                pyb.enter_raw_repl(soft_reset=False)
-                with open(file_to_inject, "rb") as f:
-                    pyfile = f.read()
-                try:
-                    pyb.exec_raw_no_follow(pyfile)
-                except pyboard.PyboardError as er:
-                    console_out_write(b"Error:\r\n")
-                    console_out_write(er)
-                pyb.exit_raw_repl()
-            else:
-                pyb.serial.write(c)
-
-        try:
-            n = pyb.serial.inWaiting()
-        except OSError as er:
-            if er.args[0] == 5:  # IO error, device disappeared
-                print("device disconnected")
-                break
-
-        if n > 0:
-            c = pyb.serial.read(1)
-            if c is not None:
-                # pass character through to the console
-                oc = ord(c)
-                if oc in (8, 9, 10, 13, 27) or 32 <= oc <= 126:
-                    console_out_write(c)
-                else:
-                    console_out_write(b"[%02x]" % ord(c))
-
-
-def do_repl(pyb, args):
-    capture_file = None
-    code_to_inject = None
-    file_to_inject = None
-
-    while len(args):
-        if args[0] == "--capture":
-            args.pop(0)
-            capture_file = args.pop(0)
-        elif args[0] == "--inject-code":
-            args.pop(0)
-            code_to_inject = bytes(args.pop(0).replace("\\n", "\r\n"), "utf8")
-        elif args[0] == "--inject-file":
-            args.pop(0)
-            file_to_inject = args.pop(0)
-        else:
-            break
-
-    print("Connected to MicroPython at %s" % pyb.device_name)
-    print("Use Ctrl-] to exit this shell")
-    if capture_file is not None:
-        print('Capturing session to file "%s"' % capture_file)
-        capture_file = open(capture_file, "wb")
-    if code_to_inject is not None:
-        print("Use Ctrl-J to inject", code_to_inject)
-    if file_to_inject is not None:
-        print('Use Ctrl-K to inject file "%s"' % file_to_inject)
-
-    console = Console()
-    console.enter()
-
-    def console_out_write(b):
-        console.write(b)
-        if capture_file is not None:
-            capture_file.write(b)
-            capture_file.flush()
+    def run_repl_on_completion(self):
+        return not self._did_action
 
-    try:
-        do_repl_main_loop(
-            pyb,
-            console,
-            console_out_write,
-            code_to_inject=code_to_inject,
-            file_to_inject=file_to_inject,
-        )
-    finally:
-        console.exit()
-        if capture_file is not None:
-            capture_file.close()
+    def ensure_connected(self):
+        if self.pyb is None:
+            do_connect(self, ["auto"])
 
+    def ensure_raw_repl(self, soft_reset=None):
+        self.ensure_connected()
+        soft_reset = self._auto_soft_reset if soft_reset is None else soft_reset
+        if soft_reset or not self.pyb.in_raw_repl:
+            self.pyb.enter_raw_repl(soft_reset=soft_reset)
+            self._auto_soft_reset = False
 
-def execbuffer(pyb, buf, follow):
-    ret_val = 0
-    try:
-        pyb.exec_raw_no_follow(buf)
-        if follow:
-            ret, ret_err = pyb.follow(timeout=None, data_consumer=pyboard.stdout_write_bytes)
-            if ret_err:
-                pyboard.stdout_write_bytes(ret_err)
-                ret_val = 1
-    except pyboard.PyboardError as er:
-        print(er)
-        ret_val = 1
-    except KeyboardInterrupt:
-        ret_val = 1
-    return ret_val
-
-
-def print_help():
-    def print_commands_help(cmds, help_idx):
-        max_command_len = max(len(cmd) for cmd in cmds.keys())
-        for cmd in sorted(cmds.keys()):
-            help_message_lines = dedent(cmds[cmd][help_idx]).split("\n")
-            help_message = help_message_lines[0]
-            for line in help_message_lines[1:]:
-                help_message = "{}\n{}{}".format(help_message, " " * (max_command_len + 4), line)
-            print("  ", cmd, " " * (max_command_len - len(cmd) + 2), help_message, sep="")
-
-    print(_PROG, "-- MicroPython remote control")
-    print("See https://docs.micropython.org/en/latest/reference/mpremote.html")
-
-    print("\nList of commands:")
-    print_commands_help(_COMMANDS, 3)
-
-    print("\nList of shortcuts:")
-    print_commands_help(_command_expansions, 2)
-
-
-def print_version():
-    from . import __version__
-
-    print(f"{_PROG} {__version__}")
+    def ensure_friendly_repl(self):
+        self.ensure_connected()
+        if self.pyb.in_raw_repl:
+            self.pyb.exit_raw_repl()
 
 
 def main():
@@ -528,106 +342,31 @@ def main():
     prepare_command_expansions(config)
 
     args = sys.argv[1:]
-    pyb = None
-    auto_soft_reset = True
-    did_action = False
+    state = State()
 
     try:
         while args:
             do_command_expansion(args)
             cmd = args.pop(0)
             try:
-                need_raw_repl, is_action, num_args_min, _ = _COMMANDS[cmd]
+                num_args_min, _help, handler = _COMMANDS[cmd]
             except KeyError:
-                print(f"{_PROG}: '{cmd}' is not a command")
-                return 1
+                raise CommandError(f"'{cmd}' is not a command")
 
             if len(args) < num_args_min:
                 print(f"{_PROG}: '{cmd}' neads at least {num_args_min} argument(s)")
                 return 1
 
-            if cmd == "connect":
-                if pyb is not None:
-                    do_disconnect(pyb)
-                pyb = do_connect(args)
-                if pyb is None:
-                    did_action = True
-                continue
-            elif cmd == "help":
-                print_help()
-                sys.exit(0)
-            elif cmd == "version":
-                print_version()
-                sys.exit(0)
-            elif cmd == "resume":
-                auto_soft_reset = False
-                continue
-
-            # The following commands need a connection, and either a raw or friendly REPL.
-
-            if pyb is None:
-                pyb = do_connect(["auto"])
-
-            if need_raw_repl:
-                if not pyb.in_raw_repl:
-                    pyb.enter_raw_repl(soft_reset=auto_soft_reset)
-                    auto_soft_reset = False
-            else:
-                if pyb.in_raw_repl:
-                    pyb.exit_raw_repl()
-            if is_action:
-                did_action = True
-
-            if cmd == "disconnect":
-                do_disconnect(pyb)
-                pyb = None
-                auto_soft_reset = True
-            elif cmd == "soft-reset":
-                pyb.enter_raw_repl(soft_reset=True)
-                auto_soft_reset = False
-            elif cmd == "mount":
-                unsafe_links = False
-                if args[0] == "--unsafe-links" or args[0] == "-l":
-                    args.pop(0)
-                    unsafe_links = True
-                path = args.pop(0)
-                pyb.mount_local(path, unsafe_links=unsafe_links)
-                print(f"Local directory {path} is mounted at /remote")
-            elif cmd == "umount":
-                pyb.umount_local()
-            elif cmd in ("exec", "eval", "run"):
-                follow = True
-                if args[0] == "--no-follow":
-                    args.pop(0)
-                    follow = False
-                if cmd == "exec":
-                    buf = args.pop(0)
-                elif cmd == "eval":
-                    buf = "print(" + args.pop(0) + ")"
-                else:
-                    filename = args.pop(0)
-                    try:
-                        with open(filename, "rb") as f:
-                            buf = f.read()
-                    except OSError:
-                        print(f"{_PROG}: could not read file '{filename}'")
-                        return 1
-                ret = execbuffer(pyb, buf, follow)
-                if ret:
-                    return ret
-            elif cmd == "fs":
-                do_filesystem(pyb, args)
-            elif cmd == "edit":
-                do_edit(pyb, args)
-            elif cmd == "repl":
-                do_repl(pyb, args)
-
-        if not did_action:
-            if pyb is None:
-                pyb = do_connect(["auto"])
-            if pyb.in_raw_repl:
-                pyb.exit_raw_repl()
-            do_repl(pyb, args)
+            handler(state, args)
+
+
+        # If no commands were "actions" then implicitly finish with the REPL.
+        if state.run_repl_on_completion():
+            do_repl(state, args)
+
+        return 0
+    except CommandError as e:
+        print(f"{_PROG}: {e}", file=sys.stderr)
+        return 1
     finally:
-        if pyb is not None:
-            do_disconnect(pyb)
+        do_disconnect(state)
diff --git a/tools/mpremote/mpremote/repl.py b/tools/mpremote/mpremote/repl.py
new file mode 100644
index 0000000000000..f92d20ae79721
--- /dev/null
+++ b/tools/mpremote/mpremote/repl.py
@@ -0,0 +1,101 @@
+from .console import Console, ConsolePosix
+
+from . import pyboardextended as pyboard
+
+
+def do_repl_main_loop(state, console_in, console_out_write, *, code_to_inject, file_to_inject):
+    while True:
+        console_in.waitchar(state.pyb.serial)
+        c = console_in.readchar()
+        if c:
+            if c == b"\x1d":  # ctrl-], quit
+                break
+            elif c == b"\x04":  # ctrl-D
+                # special handling needed for ctrl-D if filesystem is mounted
+                state.pyb.write_ctrl_d(console_out_write)
+            elif c == b"\x0a" and code_to_inject is not None:  # ctrl-j, inject code
+                state.pyb.serial.write(code_to_inject)
+            elif c == b"\x0b" and file_to_inject is not None:  # ctrl-k, inject script
+                console_out_write(bytes("Injecting %s\r\n" % file_to_inject, "utf8"))
+                state.pyb.enter_raw_repl(soft_reset=False)
+                with open(file_to_inject, "rb") as f:
+                    pyfile = f.read()
+                try:
+                    state.pyb.exec_raw_no_follow(pyfile)
+                except pyboard.PyboardError as er:
+                    console_out_write(b"Error:\r\n")
+                    console_out_write(er)
+                state.pyb.exit_raw_repl()
+            else:
+                state.pyb.serial.write(c)
+
+        try:
+            n = state.pyb.serial.inWaiting()
+        except OSError as er:
+            if er.args[0] == 5:  # IO error, device disappeared
+                print("device disconnected")
+                break
+
+        if n > 0:
+            c = state.pyb.serial.read(1)
+            if c is not None:
+                # pass character through to the console
+                oc = ord(c)
+                if oc in (8, 9, 10, 13, 27) or 32 <= oc <= 126:
+                    console_out_write(c)
+                else:
+                    console_out_write(b"[%02x]" % ord(c))
+
+
+def do_repl(state, args):
+    state.ensure_friendly_repl()
+    state.did_action()
+
+    capture_file = None
+    code_to_inject = None
+    file_to_inject = None
+
+    while len(args):
+        if args[0] == "--capture":
+            args.pop(0)
+            capture_file = args.pop(0)
+        elif args[0] == "--inject-code":
+            args.pop(0)
+            code_to_inject = bytes(args.pop(0).replace("\\n", "\r\n"), "utf8")
+        elif args[0] == "--inject-file":
+            args.pop(0)
+            file_to_inject = args.pop(0)
+        else:
+            break
+
+    print("Connected to MicroPython at %s" % state.pyb.device_name)
+    print("Use Ctrl-] to exit this shell")
+    if capture_file is not None:
+        print('Capturing session to file "%s"' % capture_file)
+        capture_file = open(capture_file, "wb")
+    if code_to_inject is not None:
+        print("Use Ctrl-J to inject", code_to_inject)
+    if file_to_inject is not None:
+        print('Use Ctrl-K to inject file "%s"' % file_to_inject)
+
+    console = Console()
+    console.enter()
+
+    def console_out_write(b):
+        console.write(b)
+        if capture_file is not None:
+            capture_file.write(b)
+            capture_file.flush()
+
+    try:
+        do_repl_main_loop(
+            state,
+            console,
+            console_out_write,
+            code_to_inject=code_to_inject,
+            file_to_inject=file_to_inject,
+        )
+    finally:
+        console.exit()
+        if capture_file is not None:
+            capture_file.close()

From 68d094358ec71aa8cdec97e9e6fc3c6d46dedfbf Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Fri, 30 Sep 2022 14:36:39 +1000
Subject: [PATCH 2663/3533] tools/mpremote: Use argparse for command line
 parsing.

No functional change other than to allow slightly more flexibility in how
--foo arguments are specified.

This removes all custom handling for --foo args in all commands and
replaces it with per-command argparse configs.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 tools/mpremote/mpremote/commands.py |  78 ++++------
 tools/mpremote/mpremote/main.py     | 224 ++++++++++++++++++++--------
 tools/mpremote/mpremote/repl.py     |  19 +--
 3 files changed, 193 insertions(+), 128 deletions(-)

diff --git a/tools/mpremote/mpremote/commands.py b/tools/mpremote/mpremote/commands.py
index 60a625d5e854c..bf56df69993a8 100644
--- a/tools/mpremote/mpremote/commands.py
+++ b/tools/mpremote/mpremote/commands.py
@@ -10,6 +10,9 @@
 class CommandError(Exception):
     pass
 
+
+def do_connect(state, args=None):
+    dev = args.device[0] if args else "auto"
     do_disconnect(state)
 
     try:
@@ -101,19 +104,6 @@ def show_progress_bar(size, total_size, op="copying"):
         )
 
 
-# Get all args up to the terminator ("+").
-# The passed args will be updated with these ones removed.
-def _get_fs_args(args):
-    n = 0
-    for src in args:
-        if src == "+":
-            break
-        n += 1
-    fs_args = args[:n]
-    args[:] = args[n + 1 :]
-    return fs_args
-
-
 def do_filesystem(state, args):
     state.ensure_raw_repl()
     state.did_action()
@@ -125,20 +115,22 @@ def _list_recursive(files, path):
         else:
             files.append(os.path.split(path))
 
-    fs_args = _get_fs_args(args)
+    command = args.command[0]
+    paths = args.path
 
-    # Don't be verbose when using cat, so output can be redirected to something.
-    verbose = fs_args[0] != "cat"
+    if command == "cat":
+        # Don't be verbose by default when using cat, so output can be
+        # redirected to something.
+        verbose = args.verbose == True
+    else:
+        verbose = args.verbose != False
 
-    if fs_args[0] == "cp" and fs_args[1] == "-r":
-        fs_args.pop(0)
-        fs_args.pop(0)
-        if fs_args[-1] != ":":
-            print(f"{_PROG}: 'cp -r' destination must be ':'")
-            sys.exit(1)
-        fs_args.pop()
+    if command == "cp" and args.recursive:
+        if paths[-1] != ":":
+            raise CommandError("'cp -r' destination must be ':'")
+        paths.pop()
         src_files = []
-        for path in fs_args:
+        for path in paths:
             if path.startswith(":"):
                 raise CommandError("'cp -r' source files must be local")
             _list_recursive(src_files, path)
@@ -158,9 +150,11 @@ def _list_recursive(files, path):
                 verbose=verbose,
             )
     else:
+        if args.recursive:
+            raise CommandError("'-r' only supported for 'cp'")
         try:
             pyboard.filesystem_command(
-                state.pyb, fs_args, progress_callback=show_progress_bar, verbose=verbose
+                state.pyb, [command] + paths, progress_callback=show_progress_bar, verbose=verbose
             )
         except OSError as er:
             raise CommandError(er)
@@ -172,7 +166,7 @@ def do_edit(state, args):
 
     if not os.getenv("EDITOR"):
         raise pyboard.PyboardError("edit: $EDITOR not set")
-    for src in _get_fs_args(args):
+    for src in args.files:
         src = src.lstrip(":")
         dest_fd, dest = tempfile.mkstemp(suffix=os.path.basename(src))
         try:
@@ -186,14 +180,6 @@ def do_edit(state, args):
             os.unlink(dest)
 
 
-def _get_follow_arg(args):
-    if args[0] == "--no-follow":
-        args.pop(0)
-        return False
-    else:
-        return True
-
-
 def _do_execbuffer(state, buf, follow):
     state.ensure_raw_repl()
     state.did_action()
@@ -213,38 +199,28 @@ def _do_execbuffer(state, buf, follow):
 
 
 def do_exec(state, args):
-    follow = _get_follow_arg(args)
-    buf = args.pop(0)
-    _do_execbuffer(state, buf, follow)
+    _do_execbuffer(state, args.expr[0], args.follow)
 
 
 def do_eval(state, args):
-    follow = _get_follow_arg(args)
-    buf = "print(" + args.pop(0) + ")"
-    _do_execbuffer(state, buf, follow)
+    buf = "print(" + args.expr[0] + ")"
+    _do_execbuffer(state, buf, args.follow)
 
 
 def do_run(state, args):
-    follow = _get_follow_arg(args)
-    filename = args.pop(0)
+    filename = args.path[0]
     try:
         with open(filename, "rb") as f:
             buf = f.read()
     except OSError:
         raise CommandError(f"could not read file '{filename}'")
-        sys.exit(1)
-    _do_execbuffer(state, buf, follow)
+    _do_execbuffer(state, buf, args.follow)
 
 
 def do_mount(state, args):
     state.ensure_raw_repl()
-
-    unsafe_links = False
-    if args[0] == "--unsafe-links" or args[0] == "-l":
-        args.pop(0)
-        unsafe_links = True
-    path = args.pop(0)
-    state.pyb.mount_local(path, unsafe_links=unsafe_links)
+    path = args.path[0]
+    state.pyb.mount_local(path, unsafe_links=args.unsafe_links)
     print(f"Local directory {path} is mounted at /remote")
 
 
diff --git a/tools/mpremote/mpremote/main.py b/tools/mpremote/mpremote/main.py
index b96e3f46b1bf6..17d2b33738344 100644
--- a/tools/mpremote/mpremote/main.py
+++ b/tools/mpremote/mpremote/main.py
@@ -17,6 +17,7 @@
     mpremote repl                    -- enter REPL
 """
 
+import argparse
 import os, sys
 from collections.abc import Mapping
 from textwrap import dedent
@@ -41,10 +42,10 @@
 
 
 def do_help(state, _args=None):
-    def print_commands_help(cmds, help_idx):
+    def print_commands_help(cmds, help_key):
         max_command_len = max(len(cmd) for cmd in cmds.keys())
         for cmd in sorted(cmds.keys()):
-            help_message_lines = dedent(cmds[cmd][help_idx]).split("\n")
+            help_message_lines = dedent(help_key(cmds[cmd])).split("\n")
             help_message = help_message_lines[0]
             for line in help_message_lines[1:]:
                 help_message = "{}\n{}{}".format(help_message, " " * (max_command_len + 4), line)
@@ -54,10 +55,12 @@ def print_commands_help(cmds, help_idx):
     print("See https://docs.micropython.org/en/latest/reference/mpremote.html")
 
     print("\nList of commands:")
-    print_commands_help(_COMMANDS, 1)
+    print_commands_help(
+        _COMMANDS, lambda x: x[1]().description
+    )  # extract description from argparse
 
     print("\nList of shortcuts:")
-    print_commands_help(_command_expansions, 2)
+    print_commands_help(_command_expansions, lambda x: x[2])  # (args, sub, help_message)
 
     sys.exit(0)
 
@@ -69,89 +72,157 @@ def do_version(state, _args=None):
     sys.exit(0)
 
 
-# Map of "command" to tuple of (num_args_min, help_text, handler).
+def _bool_flag(cmd_parser, name, short_name, default, description):
+    # In Python 3.9+ this can be replaced with argparse.BooleanOptionalAction.
+    group = cmd_parser.add_mutually_exclusive_group()
+    group.add_argument(
+        "--" + name,
+        "-" + short_name,
+        action="store_true",
+        default=default,
+        help=description,
+    )
+    group.add_argument(
+        "--no-" + name,
+        action="store_false",
+        dest=name,
+    )
+
+
+def argparse_connect():
+    cmd_parser = argparse.ArgumentParser(description="connect to given device")
+    cmd_parser.add_argument(
+        "device", nargs=1, help="Either list, auto, id:x, port:x, or any valid device name/path"
+    )
+    return cmd_parser
+
+
+def argparse_edit():
+    cmd_parser = argparse.ArgumentParser(description="edit files on the device")
+    cmd_parser.add_argument("files", nargs="+", help="list of remote paths")
+    return cmd_parser
+
+
+def argparse_mount():
+    cmd_parser = argparse.ArgumentParser(description="mount local directory on device")
+    _bool_flag(
+        cmd_parser,
+        "unsafe-links",
+        "l",
+        False,
+        "follow symbolic links pointing outside of local directory",
+    )
+    cmd_parser.add_argument("path", nargs=1, help="local path to mount")
+    return cmd_parser
+
+
+def argparse_repl():
+    cmd_parser = argparse.ArgumentParser(description="connect to given device")
+    cmd_parser.add_argument("--capture", type=str, required=False, help="TODO")
+    cmd_parser.add_argument("--inject-code", type=str, required=False, help="TODO")
+    cmd_parser.add_argument("--inject-file", type=str, required=False, help="TODO")
+    return cmd_parser
+
+
+def argparse_eval():
+    cmd_parser = argparse.ArgumentParser(description="evaluate and print the string")
+    _bool_flag(cmd_parser, "follow", "f", True, "TODO")
+    cmd_parser.add_argument("expr", nargs=1, help="expression to execute")
+    return cmd_parser
+
+
+def argparse_exec():
+    cmd_parser = argparse.ArgumentParser(description="execute the string")
+    _bool_flag(cmd_parser, "follow", "f", True, "TODO")
+    cmd_parser.add_argument("expr", nargs=1, help="expression to execute")
+    return cmd_parser
+
+
+def argparse_run():
+    cmd_parser = argparse.ArgumentParser(description="run the given local script")
+    _bool_flag(cmd_parser, "follow", "f", False, "TODO")
+    cmd_parser.add_argument("path", nargs=1, help="expression to execute")
+    return cmd_parser
+
+
+def argparse_filesystem():
+    cmd_parser = argparse.ArgumentParser(description="execute filesystem commands on the device")
+    _bool_flag(cmd_parser, "recursive", "r", False, "recursive copy (for cp command only)")
+    _bool_flag(
+        cmd_parser,
+        "verbose",
+        "v",
+        None,
+        "enable verbose output (defaults to True for all commands except cat)",
+    )
+    cmd_parser.add_argument(
+        "command", nargs=1, help="filesystem command (e.g. cat, cp, ls, rm, touch)"
+    )
+    cmd_parser.add_argument("path", nargs="+", help="local and remote paths")
+    return cmd_parser
+
+
+def argparse_none(description):
+    return lambda: argparse.ArgumentParser(description=description)
+
+
+# Map of "command" to tuple of (handler_func, argparse_func).
 _COMMANDS = {
     "connect": (
-        1,
-        """\
-        connect to given device
-        device may be: list, auto, id:x, port:x
-        or any valid device name/path""",
         do_connect,
+        argparse_connect,
     ),
     "disconnect": (
-        0,
-        "disconnect current device",
         do_disconnect,
+        argparse_none("disconnect current device"),
     ),
     "edit": (
-        1,
-        "edit files on the device",
         do_edit,
+        argparse_edit,
     ),
     "resume": (
-        0,
-        "resume a previous mpremote session (will not auto soft-reset)",
         do_resume,
+        argparse_none("resume a previous mpremote session (will not auto soft-reset)"),
     ),
     "soft-reset": (
-        0,
-        "perform a soft-reset of the device",
         do_soft_reset,
+        argparse_none("perform a soft-reset of the device"),
     ),
     "mount": (
-        1,
-        """\
-        mount local directory on device
-        options:
-            --unsafe-links, -l
-                follow symbolic links pointing outside of local directory""",
         do_mount,
+        argparse_mount,
     ),
     "umount": (
-        0,
-        "unmount the local directory",
         do_umount,
+        argparse_none("unmount the local directory"),
     ),
     "repl": (
-        0,
-        """\
-        enter REPL
-        options:
-            --capture <file>
-            --inject-code <string>
-            --inject-file <file>""",
         do_repl,
+        argparse_repl,
     ),
     "eval": (
-        1,
-        "evaluate and print the string",
         do_eval,
+        argparse_eval,
     ),
     "exec": (
-        1,
-        "execute the string",
         do_exec,
+        argparse_exec,
     ),
     "run": (
-        1,
-        "run the given local script",
         do_run,
+        argparse_run,
     ),
     "fs": (
-        1,
-        "execute filesystem commands on the device",
         do_filesystem,
+        argparse_filesystem,
     ),
     "help": (
-        0,
-        "print help and exit",
         do_help,
+        argparse_none("print help and exit"),
     ),
     "version": (
-        0,
-        "print version and exit",
         do_version,
+        argparse_none("print version and exit"),
     ),
 }
 
@@ -301,7 +372,6 @@ def usage_error(cmd, exp_args, msg):
         # Extra unknown arguments given.
         arg = args[last_arg_idx].split("=", 1)[0]
         usage_error(cmd, exp_args, f"given unexpected argument {arg}")
-        sys.exit(1)
 
     # Insert expansion with optional setting of arguments.
     if pre:
@@ -322,7 +392,7 @@ def run_repl_on_completion(self):
 
     def ensure_connected(self):
         if self.pyb is None:
-            do_connect(self, ["auto"])
+            do_connect(self)
 
     def ensure_raw_repl(self, soft_reset=None):
         self.ensure_connected()
@@ -341,28 +411,60 @@ def main():
     config = load_user_config()
     prepare_command_expansions(config)
 
-    args = sys.argv[1:]
+    remaining_args = sys.argv[1:]
     state = State()
 
     try:
-        while args:
-            do_command_expansion(args)
-            cmd = args.pop(0)
+        while remaining_args:
+            # Skip the terminator.
+            if remaining_args[0] == "+":
+                remaining_args.pop(0)
+                continue
+
+            # Rewrite the front of the list with any matching expansion.
+            do_command_expansion(remaining_args)
+
+            # The (potentially rewritten) command must now be a base command.
+            cmd = remaining_args.pop(0)
             try:
-                num_args_min, _help, handler = _COMMANDS[cmd]
+                handler_func, parser_func = _COMMANDS[cmd]
             except KeyError:
                 raise CommandError(f"'{cmd}' is not a command")
 
-            if len(args) < num_args_min:
-                print(f"{_PROG}: '{cmd}' neads at least {num_args_min} argument(s)")
-                return 1
-
-            handler(state, args)
-
-
-        # If no commands were "actions" then implicitly finish with the REPL.
+            # If this command (or any down the chain) has a terminator, then
+            # limit the arguments passed for this command. They will be added
+            # back after processing this command.
+            try:
+                terminator = remaining_args.index("+")
+                command_args = remaining_args[:terminator]
+                extra_args = remaining_args[terminator:]
+            except ValueError:
+                command_args = remaining_args
+                extra_args = []
+
+            # Special case: "fs ls" allowed have no path specified.
+            if cmd == "fs" and len(command_args) == 1 and command_args[0] == "ls":
+                command_args.append("")
+
+            # Use the command-specific argument parser.
+            cmd_parser = parser_func()
+            cmd_parser.prog = cmd
+            # Catch all for unhandled positional arguments (this is the next command).
+            cmd_parser.add_argument(
+                "next_command", nargs=argparse.REMAINDER, help=f"Next {_PROG} command"
+            )
+            args = cmd_parser.parse_args(command_args)
+
+            # Execute command.
+            handler_func(state, args)
+
+            # Get any leftover unprocessed args.
+            remaining_args = args.next_command + extra_args
+
+        # If no commands were "actions" then implicitly finish with the REPL
+        # using default args.
         if state.run_repl_on_completion():
-            do_repl(state, args)
+            do_repl(state, argparse_repl().parse_args([]))
 
         return 0
     except CommandError as e:
diff --git a/tools/mpremote/mpremote/repl.py b/tools/mpremote/mpremote/repl.py
index f92d20ae79721..7da00c0fdef0c 100644
--- a/tools/mpremote/mpremote/repl.py
+++ b/tools/mpremote/mpremote/repl.py
@@ -51,22 +51,9 @@ def do_repl(state, args):
     state.ensure_friendly_repl()
     state.did_action()
 
-    capture_file = None
-    code_to_inject = None
-    file_to_inject = None
-
-    while len(args):
-        if args[0] == "--capture":
-            args.pop(0)
-            capture_file = args.pop(0)
-        elif args[0] == "--inject-code":
-            args.pop(0)
-            code_to_inject = bytes(args.pop(0).replace("\\n", "\r\n"), "utf8")
-        elif args[0] == "--inject-file":
-            args.pop(0)
-            file_to_inject = args.pop(0)
-        else:
-            break
+    capture_file = args.capture
+    code_to_inject = args.inject_code
+    file_to_inject = args.inject_file
 
     print("Connected to MicroPython at %s" % state.pyb.device_name)
     print("Use Ctrl-] to exit this shell")

From 12ca918eb2ac062f6e6df0772e528eef9d050cb7 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Thu, 29 Sep 2022 00:45:34 +1000
Subject: [PATCH 2664/3533] tools/mpremote: Add `mpremote mip install` to
 install packages.

This supports the same package sources as the new `mip` tool.
 - micropython-lib (by name)
 - http(s) & github packages with json description
 - directly downloading a .py/.mpy file

The version is specified with an optional `@version` on the end of the
package name. The target dir, index, and mpy/no-mpy can be set through
command line args.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 docs/reference/mpremote.rst     |  14 +++
 docs/reference/packages.rst     |  16 +--
 tools/mpremote/README.md        |  41 ++++---
 tools/mpremote/mpremote/main.py |  28 +++++
 tools/mpremote/mpremote/mip.py  | 191 ++++++++++++++++++++++++++++++++
 tools/pyboard.py                |   7 ++
 6 files changed, 272 insertions(+), 25 deletions(-)
 create mode 100644 tools/mpremote/mpremote/mip.py

diff --git a/docs/reference/mpremote.rst b/docs/reference/mpremote.rst
index e3902f8e5d7e9..bb0686237abd4 100644
--- a/docs/reference/mpremote.rst
+++ b/docs/reference/mpremote.rst
@@ -146,6 +146,14 @@ The full list of supported commands are:
   variable ``$EDITOR``). If the editor exits successfully, the updated file will
   be copied back to the device.
 
+- install packages from :term:`micropython-lib` (or GitHub) using the ``mip`` tool:
+
+  .. code-block:: bash
+
+      $ mpremote mip install <packages...>
+
+  See :ref:`packages` for more information.
+
 - mount the local directory on the remote device:
 
   .. code-block:: bash
@@ -269,3 +277,9 @@ Examples
   mpremote cp -r dir/ :
 
   mpremote cp a.py b.py : + repl
+
+  mpremote mip install aioble
+
+  mpremote mip install github:org/repo@branch
+
+  mpremote mip install --target /flash/third-party functools
diff --git a/docs/reference/packages.rst b/docs/reference/packages.rst
index 0c049d1fb2fc2..1ddbecb582b4a 100644
--- a/docs/reference/packages.rst
+++ b/docs/reference/packages.rst
@@ -78,17 +78,17 @@ The :term:`mpremote` tool also includes the same functionality as ``mip`` and
 can be used from a host PC to install packages to a locally connected device
 (e.g. via USB or UART)::
 
-    $ mpremote install pkgname
-    $ mpremote install pkgname@x.y
-    $ mpremote install http://example.com/x/y/foo.py
-    $ mpremote install github:org/repo
-    $ mpremote install github:org/repo@branch-or-tag
+    $ mpremote mip install pkgname
+    $ mpremote mip install pkgname@x.y
+    $ mpremote mip install http://example.com/x/y/foo.py
+    $ mpremote mip install github:org/repo
+    $ mpremote mip install github:org/repo@branch-or-tag
 
 The ``--target=path``, ``--no-mpy``, and ``--index`` arguments can be set::
 
-    $ mpremote install --target=/flash/third-party pkgname
-    $ mpremote install --no-mpy pkgname
-    $ mpremote install --index https://host/pi pkgname
+    $ mpremote mip install --target=/flash/third-party pkgname
+    $ mpremote mip install --no-mpy pkgname
+    $ mpremote mip install --index https://host/pi pkgname
 
 Installing packages manually
 ----------------------------
diff --git a/tools/mpremote/README.md b/tools/mpremote/README.md
index c294b20811821..7f58788fbe4cb 100644
--- a/tools/mpremote/README.md
+++ b/tools/mpremote/README.md
@@ -11,23 +11,28 @@ This will automatically connect to the device and provide an interactive REPL.
 
 The full list of supported commands are:
 
-    mpremote connect <device>        -- connect to given device
-                                        device may be: list, auto, id:x, port:x
-                                        or any valid device name/path
-    mpremote disconnect              -- disconnect current device
-    mpremote mount <local-dir>       -- mount local directory on device
-    mpremote eval <string>           -- evaluate and print the string
-    mpremote exec <string>           -- execute the string
-    mpremote run <file>              -- run the given local script
-    mpremote fs <command> <args...>  -- execute filesystem commands on the device
-                                        command may be: cat, ls, cp, rm, mkdir, rmdir
-                                        use ":" as a prefix to specify a file on the device
-    mpremote repl                    -- enter REPL
-                                        options:
-                                            --capture <file>
-                                            --inject-code <string>
-                                            --inject-file <file>
-    mpremote help                    -- print list of commands and exit
+    mpremote connect <device>         -- connect to given device
+                                         device may be: list, auto, id:x, port:x
+                                         or any valid device name/path
+    mpremote disconnect               -- disconnect current device
+    mpremote mount <local-dir>        -- mount local directory on device
+    mpremote eval <string>            -- evaluate and print the string
+    mpremote exec <string>            -- execute the string
+    mpremote run <file>               -- run the given local script
+    mpremote fs <command> <args...>   -- execute filesystem commands on the device
+                                         command may be: cat, ls, cp, rm, mkdir, rmdir
+                                         use ":" as a prefix to specify a file on the device
+    mpremote repl                     -- enter REPL
+                                         options:
+                                             --capture <file>
+                                             --inject-code <string>
+                                             --inject-file <file>
+    mpremote mip install <package...> -- Install packages (from micropython-lib or third-party sources)
+                                         options:
+                                             --target <path>
+                                             --index <url>
+                                             --no-mpy
+    mpremote help                     -- print list of commands and exit
 
 Multiple commands can be specified and they will be run sequentially.  Connection
 and disconnection will be done automatically at the start and end of the execution
@@ -73,3 +78,5 @@ Examples:
     mpremote cp :main.py .
     mpremote cp main.py :
     mpremote cp -r dir/ :
+    mpremote mip install aioble
+    mpremote mip install github:org/repo@branch
diff --git a/tools/mpremote/mpremote/main.py b/tools/mpremote/mpremote/main.py
index 17d2b33738344..4f541685a0cfd 100644
--- a/tools/mpremote/mpremote/main.py
+++ b/tools/mpremote/mpremote/main.py
@@ -36,6 +36,7 @@
     do_resume,
     do_soft_reset,
 )
+from .mip import do_mip
 from .repl import do_repl
 
 _PROG = "mpremote"
@@ -162,6 +163,29 @@ def argparse_filesystem():
     return cmd_parser
 
 
+def argparse_mip():
+    cmd_parser = argparse.ArgumentParser(
+        description="install packages from micropython-lib or third-party sources"
+    )
+    _bool_flag(cmd_parser, "mpy", "m", True, "download as compiled .mpy files (default)")
+    cmd_parser.add_argument(
+        "--target", type=str, required=False, help="destination direction on the device"
+    )
+    cmd_parser.add_argument(
+        "--index",
+        type=str,
+        required=False,
+        help="package index to use (defaults to micropython-lib)",
+    )
+    cmd_parser.add_argument("command", nargs=1, help="mip command (e.g. install)")
+    cmd_parser.add_argument(
+        "packages",
+        nargs="+",
+        help="list package specifications, e.g. name, name@version, github:org/repo, github:org/repo@branch",
+    )
+    return cmd_parser
+
+
 def argparse_none(description):
     return lambda: argparse.ArgumentParser(description=description)
 
@@ -216,6 +240,10 @@ def argparse_none(description):
         do_filesystem,
         argparse_filesystem,
     ),
+    "mip": (
+        do_mip,
+        argparse_mip,
+    ),
     "help": (
         do_help,
         argparse_none("print help and exit"),
diff --git a/tools/mpremote/mpremote/mip.py b/tools/mpremote/mpremote/mip.py
new file mode 100644
index 0000000000000..99ca9ff7e3878
--- /dev/null
+++ b/tools/mpremote/mpremote/mip.py
@@ -0,0 +1,191 @@
+# Micropython package installer
+# Ported from micropython-lib/micropython/mip/mip.py.
+# MIT license; Copyright (c) 2022 Jim Mussared
+
+import urllib.error
+import urllib.request
+import json
+import tempfile
+import os
+
+from .commands import CommandError, show_progress_bar
+
+
+_PACKAGE_INDEX = "https://micropython.org/pi/v2"
+_CHUNK_SIZE = 128
+
+
+# This implements os.makedirs(os.dirname(path))
+def _ensure_path_exists(pyb, path):
+    import os
+
+    split = path.split("/")
+
+    # Handle paths starting with "/".
+    if not split[0]:
+        split.pop(0)
+        split[0] = "/" + split[0]
+
+    prefix = ""
+    for i in range(len(split) - 1):
+        prefix += split[i]
+        if not pyb.fs_exists(prefix):
+            pyb.fs_mkdir(prefix)
+        prefix += "/"
+
+
+# Copy from src (stream) to dest (function-taking-bytes)
+def _chunk(src, dest, length=None, op="downloading"):
+    buf = memoryview(bytearray(_CHUNK_SIZE))
+    total = 0
+    if length:
+        show_progress_bar(0, length, op)
+    while True:
+        n = src.readinto(buf)
+        if n == 0:
+            break
+        dest(buf if n == _CHUNK_SIZE else buf[:n])
+        total += n
+        if length:
+            show_progress_bar(total, length, op)
+
+
+def _rewrite_url(url, branch=None):
+    if not branch:
+        branch = "HEAD"
+    if url.startswith("github:"):
+        url = url[7:].split("/")
+        url = (
+            "https://raw.githubusercontent.com/"
+            + url[0]
+            + "/"
+            + url[1]
+            + "/"
+            + branch
+            + "/"
+            + "/".join(url[2:])
+        )
+    return url
+
+
+def _download_file(pyb, url, dest):
+    try:
+        with urllib.request.urlopen(url) as src:
+            fd, path = tempfile.mkstemp()
+            try:
+                print("Installing:", dest)
+                with os.fdopen(fd, "wb") as f:
+                    _chunk(src, f.write, src.length)
+                _ensure_path_exists(pyb, dest)
+                pyb.fs_put(path, dest, progress_callback=show_progress_bar)
+            finally:
+                os.unlink(path)
+    except urllib.error.HTTPError as e:
+        if e.status == 404:
+            raise CommandError(f"File not found: {url}")
+        else:
+            raise CommandError(f"Error {e.status} requesting {url}")
+    except urllib.error.URLError as e:
+        raise CommandError(f"{e.reason} requesting {url}")
+
+
+def _install_json(pyb, package_json_url, index, target, version, mpy):
+    try:
+        with urllib.request.urlopen(_rewrite_url(package_json_url, version)) as response:
+            package_json = json.load(response)
+    except urllib.error.HTTPError as e:
+        if e.status == 404:
+            raise CommandError(f"Package not found: {package_json_url}")
+        else:
+            raise CommandError(f"Error {e.status} requesting {package_json_url}")
+    except urllib.error.URLError as e:
+        raise CommandError(f"{e.reason} requesting {package_json_url}")
+    for target_path, short_hash in package_json.get("hashes", ()):
+        fs_target_path = target + "/" + target_path
+        file_url = f"{index}/file/{short_hash[:2]}/{short_hash}"
+        _download_file(pyb, file_url, fs_target_path)
+    for target_path, url in package_json.get("urls", ()):
+        fs_target_path = target + "/" + target_path
+        _download_file(pyb, _rewrite_url(url, version), fs_target_path)
+    for dep, dep_version in package_json.get("deps", ()):
+        _install_package(pyb, dep, index, target, dep_version, mpy)
+
+
+def _install_package(pyb, package, index, target, version, mpy):
+    if (
+        package.startswith("http://")
+        or package.startswith("https://")
+        or package.startswith("github:")
+    ):
+        if package.endswith(".py") or package.endswith(".mpy"):
+            print(f"Downloading {package} to {target}")
+            _download_file(
+                pyb, _rewrite_url(package, version), target + "/" + package.rsplit("/")[-1]
+            )
+            return
+        else:
+            if not package.endswith(".json"):
+                if not package.endswith("/"):
+                    package += "/"
+                package += "package.json"
+            print(f"Installing {package} to {target}")
+    else:
+        if not version:
+            version = "latest"
+        print(f"Installing {package} ({version}) from {index} to {target}")
+
+        mpy_version = "py"
+        if mpy:
+            pyb.exec("import sys")
+            mpy_version = (
+                int(pyb.eval("getattr(sys.implementation, '_mpy', 0) & 0xFF").decode()) or "py"
+            )
+
+        package = f"{index}/package/{mpy_version}/{package}/{version}.json"
+
+    _install_json(pyb, package, index, target, version, mpy)
+
+
+def do_mip(state, args):
+    state.did_action()
+
+    if args.command[0] == "install":
+        state.ensure_raw_repl()
+
+        for package in args.packages:
+            version = None
+            if "@" in package:
+                package, version = package.split("@")
+
+            print("Install", package)
+
+            if args.index is None:
+                args.index = _PACKAGE_INDEX
+
+            if args.target is None:
+                state.pyb.exec("import sys")
+                lib_paths = (
+                    state.pyb.eval("'\\n'.join(p for p in sys.path if p.endswith('/lib'))")
+                    .decode()
+                    .split("\n")
+                )
+                if lib_paths and lib_paths[0]:
+                    args.target = lib_paths[0]
+                else:
+                    raise CommandError(
+                        "Unable to find lib dir in sys.path, use --target to override"
+                    )
+
+            if args.mpy is None:
+                args.mpy = True
+
+            try:
+                _install_package(
+                    state.pyb, package, args.index.rstrip("/"), args.target, version, args.mpy
+                )
+            except CommandError:
+                print("Package may be partially installed")
+                raise
+            print("Done")
+    else:
+        raise CommandError(f"mip: '{args.command[0]}' is not a command")
diff --git a/tools/pyboard.py b/tools/pyboard.py
index 60cc06508ebef..043f4f06fb87f 100755
--- a/tools/pyboard.py
+++ b/tools/pyboard.py
@@ -476,6 +476,13 @@ def get_time(self):
         t = str(self.eval("pyb.RTC().datetime()"), encoding="utf8")[1:-1].split(", ")
         return int(t[4]) * 3600 + int(t[5]) * 60 + int(t[6])
 
+    def fs_exists(self, src):
+        try:
+            self.exec_("import uos\nuos.stat(%s)" % (("'%s'" % src) if src else ""))
+            return True
+        except PyboardError:
+            return False
+
     def fs_ls(self, src):
         cmd = (
             "import uos\nfor f in uos.ilistdir(%s):\n"

From 7705b9b9d50b3665de135f314fd1f8cb5d0641f0 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Fri, 30 Sep 2022 23:43:23 +1000
Subject: [PATCH 2665/3533] tools/pyboard.py: Handle unsupported fs command.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 tools/pyboard.py | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/tools/pyboard.py b/tools/pyboard.py
index 043f4f06fb87f..55c00fbca1944 100755
--- a/tools/pyboard.py
+++ b/tools/pyboard.py
@@ -621,23 +621,28 @@ def fname_cp_dest(src, dest):
                 dest2 = fname_cp_dest(src2, fname_remote(dest))
                 op(src2, dest2, progress_callback=progress_callback)
         else:
-            op = {
+            ops = {
                 "cat": pyb.fs_cat,
                 "ls": pyb.fs_ls,
                 "mkdir": pyb.fs_mkdir,
                 "rm": pyb.fs_rm,
                 "rmdir": pyb.fs_rmdir,
                 "touch": pyb.fs_touch,
-            }[cmd]
+            }
+            if cmd not in ops:
+                raise PyboardError("'{}' is not a filesystem command".format(cmd))
             if cmd == "ls" and not args:
                 args = [""]
             for src in args:
                 src = fname_remote(src)
                 if verbose:
                     print("%s :%s" % (cmd, src))
-                op(src)
+                ops[cmd](src)
     except PyboardError as er:
-        print(str(er.args[2], "ascii"))
+        if len(er.args) > 1:
+            print(str(er.args[2], "ascii"))
+        else:
+            print(er)
         pyb.exit_raw_repl()
         pyb.close()
         sys.exit(1)

From 0ee877a20732039e603b41c63a221bfc2c8fbde9 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 4 Oct 2022 11:47:06 +1100
Subject: [PATCH 2666/3533] esp32/machine_i2s: Add I2S finaliser which calls
 deinit().

So that the FreeRTOS resources can be freed, eg on soft reset.

Fixes issue #9366.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/machine_i2s.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ports/esp32/machine_i2s.c b/ports/esp32/machine_i2s.c
index eecf71549871f..ce1cb59849dc1 100644
--- a/ports/esp32/machine_i2s.c
+++ b/ports/esp32/machine_i2s.c
@@ -533,7 +533,8 @@ STATIC mp_obj_t machine_i2s_make_new(const mp_obj_type_t *type, size_t n_pos_arg
 
     machine_i2s_obj_t *self;
     if (MP_STATE_PORT(machine_i2s_obj)[port] == NULL) {
-        self = mp_obj_malloc(machine_i2s_obj_t, &machine_i2s_type);
+        self = m_new_obj_with_finaliser(machine_i2s_obj_t);
+        self->base.type = &machine_i2s_type;
         MP_STATE_PORT(machine_i2s_obj)[port] = self;
         self->port = port;
     } else {
@@ -688,6 +689,7 @@ STATIC const mp_rom_map_elem_t machine_i2s_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_write),           MP_ROM_PTR(&mp_stream_write_obj) },
     { MP_ROM_QSTR(MP_QSTR_deinit),          MP_ROM_PTR(&machine_i2s_deinit_obj) },
     { MP_ROM_QSTR(MP_QSTR_irq),             MP_ROM_PTR(&machine_i2s_irq_obj) },
+    { MP_ROM_QSTR(MP_QSTR___del__),         MP_ROM_PTR(&machine_i2s_deinit_obj) },
 
     // Static method
     { MP_ROM_QSTR(MP_QSTR_shift),           MP_ROM_PTR(&machine_i2s_shift_obj) },

From bdac8272d8b1a726012bec897dc51dacbe70b295 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Mon, 29 Aug 2022 16:50:49 +1000
Subject: [PATCH 2667/3533] tools: Add note about uncrustify versions.

Uncrustify versions are not mutually compatible:

1. Version 0.73 or newer produce slightly different formatting. It may be
possible to tweak these by adding more config items, but this will cause
older versions to error out with 'Unknown option'.

2. Version 0.75 prints a range of deprecation warnings due to config file
changes, and returns a non-zero exit code. These are actually fixable
as most are the default value, and pp_indent has changed from 'true' to '1'
which is backwards compatible. However issue 1 remains, so probably better
to have it fail explicitly.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 CODECONVENTIONS.md   | 4 ++++
 tools/uncrustify.cfg | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/CODECONVENTIONS.md b/CODECONVENTIONS.md
index 78fb912a6ab75..bceab746182c4 100644
--- a/CODECONVENTIONS.md
+++ b/CODECONVENTIONS.md
@@ -65,6 +65,10 @@ changes to the correct style.  Without arguments this tool will reformat all
 source code (and may take some time to run).  Otherwise pass as arguments to
 the tool the files that changed and it will only reformat those.
 
+**Important**: Use only [uncrustify](https://github.com/uncrustify/uncrustify)
+v0.71 or v0.72 for MicroPython. Different uncrustify versions produce slightly
+different formatting, and the configuration file formats are often incompatible.
+
 Python code conventions
 =======================
 
diff --git a/tools/uncrustify.cfg b/tools/uncrustify.cfg
index 221fb458e9132..28eb49faf7e7a 100644
--- a/tools/uncrustify.cfg
+++ b/tools/uncrustify.cfg
@@ -1,5 +1,8 @@
 # Uncrustify-0.71.0_f
 
+# IMPORTANT: Output is different if using Uncrustify 0.73 or newer, and config file format has changed in newer versions.
+# Use version 0.71 or 0.72 to get matching code formatting.
+
 #
 # General options
 #

From 0e35c4de9b9d55f9288eeb908efd2f7f577dc13b Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Mon, 29 Aug 2022 17:30:14 +1000
Subject: [PATCH 2668/3533] tools: Add pre-commit support.

Tweak the existing codeformat.py and verifygitlog.py to allow them to be
easily called by pre-commit.

(This turned out to be easier than using any existing pre-commit hooks,
without making subtle changes in the formatting.)

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 .pre-commit-config.yaml | 13 ++++++
 CODECONVENTIONS.md      | 32 ++++++++++++++
 tools/codeformat.py     | 15 +++++++
 tools/verifygitlog.py   | 97 ++++++++++++++++++++++++++---------------
 4 files changed, 122 insertions(+), 35 deletions(-)
 create mode 100644 .pre-commit-config.yaml

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
new file mode 100644
index 0000000000000..12f3d79c93533
--- /dev/null
+++ b/.pre-commit-config.yaml
@@ -0,0 +1,13 @@
+repos:
+  - repo: local
+    hooks:
+      - id: codeformat
+        name: MicroPython codeformat.py for changed files
+        entry: tools/codeformat.py -v -f
+        language: python
+      - id: verifygitlog
+        name: MicroPython git commit message format checker
+        entry: tools/verifygitlog.py --check-file --ignore-rebase
+        language: python
+        verbose: true
+        stages: [commit-msg]
diff --git a/CODECONVENTIONS.md b/CODECONVENTIONS.md
index bceab746182c4..2daea8431f99a 100644
--- a/CODECONVENTIONS.md
+++ b/CODECONVENTIONS.md
@@ -69,6 +69,38 @@ the tool the files that changed and it will only reformat those.
 v0.71 or v0.72 for MicroPython. Different uncrustify versions produce slightly
 different formatting, and the configuration file formats are often incompatible.
 
+Automatic Pre-Commit Hooks
+==========================
+
+To have code formatting and commit message conventions automatically checked
+using [pre-commit](https://pre-commit.com/), run the following commands in your
+local MicroPython directory:
+
+```
+$ pip install pre-commit
+
+$ pre-commit install
+
+$ pre-commit install --hook-type commit-msg
+```
+
+pre-commit will now automatically run during `git commit` for both code and
+commit message formatting.
+
+The same formatting checks will be run by CI for any Pull Request submitted to
+MicroPython. Pre-commit allows you to see any failure more quickly, and in many
+cases will automatically correct it in your local working copy.
+
+Tips:
+
+* To skip pre-commit checks on a single commit, use `git commit -n` (for
+  `--no-verify`).
+* To ignore the pre-commit message format check temporarily, start the commit
+  message subject line with "WIP" (for "Work In Progress").
+
+(It is also possible to install pre-commit using Brew or other sources, see
+[the docs](https://pre-commit.com/index.html#install) for details.)
+
 Python code conventions
 =======================
 
diff --git a/tools/codeformat.py b/tools/codeformat.py
index 1c865663a495c..13a699065e30c 100755
--- a/tools/codeformat.py
+++ b/tools/codeformat.py
@@ -151,6 +151,11 @@ def main():
     cmd_parser.add_argument("-c", action="store_true", help="Format C code only")
     cmd_parser.add_argument("-p", action="store_true", help="Format Python code only")
     cmd_parser.add_argument("-v", action="store_true", help="Enable verbose output")
+    cmd_parser.add_argument(
+        "-f",
+        action="store_true",
+        help="Filter files provided on the command line against the default list of files to check.",
+    )
     cmd_parser.add_argument("files", nargs="*", help="Run on specific globs")
     args = cmd_parser.parse_args()
 
@@ -162,6 +167,16 @@ def main():
     files = []
     if args.files:
         files = list_files(args.files)
+        if args.f:
+            # Filter against the default list of files. This is a little fiddly
+            # because we need to apply both the inclusion globs given in PATHS
+            # as well as the EXCLUSIONS, and use absolute paths
+            files = set(os.path.abspath(f) for f in files)
+            all_files = set(list_files(PATHS, EXCLUSIONS, TOP))
+            if args.v:  # In verbose mode, log any files we're skipping
+                for f in files - all_files:
+                    print("Not checking: {}".format(f))
+            files = list(files & all_files)
     else:
         files = list_files(PATHS, EXCLUSIONS, TOP)
 
diff --git a/tools/verifygitlog.py b/tools/verifygitlog.py
index ce3679125617f..f9d98106d6f3c 100755
--- a/tools/verifygitlog.py
+++ b/tools/verifygitlog.py
@@ -7,6 +7,8 @@
 verbosity = 0  # Show what's going on, 0 1 or 2.
 suggestions = 1  # Set to 0 to not include lengthy suggestions in error messages.
 
+ignore_prefixes = []
+
 
 def verbose(*args):
     if verbosity:
@@ -18,6 +20,22 @@ def very_verbose(*args):
         print(*args)
 
 
+class ErrorCollection:
+    # Track errors and warnings as the program runs
+    def __init__(self):
+        self.has_errors = False
+        self.has_warnings = False
+        self.prefix = ""
+
+    def error(self, text):
+        print("error: {}{}".format(self.prefix, text))
+        self.has_errors = True
+
+    def warning(self, text):
+        print("warning: {}{}".format(self.prefix, text))
+        self.has_warnings = True
+
+
 def git_log(pretty_format, *args):
     # Delete pretty argument from user args so it doesn't interfere with what we do.
     args = ["git", "log"] + [arg for arg in args if "--pretty" not in args]
@@ -28,83 +46,88 @@ def git_log(pretty_format, *args):
         yield line.decode().rstrip("\r\n")
 
 
-def verify(sha):
+def verify(sha, err):
     verbose("verify", sha)
-    errors = []
-    warnings = []
-
-    def error_text(err):
-        return "commit " + sha + ": " + err
-
-    def error(err):
-        errors.append(error_text(err))
-
-    def warning(err):
-        warnings.append(error_text(err))
+    err.prefix = "commit " + sha + ": "
 
     # Author and committer email.
     for line in git_log("%ae%n%ce", sha, "-n1"):
         very_verbose("email", line)
         if "noreply" in line:
-            error("Unwanted email address: " + line)
+            err.error("Unwanted email address: " + line)
 
     # Message body.
     raw_body = list(git_log("%B", sha, "-n1"))
+    verify_message_body(raw_body, err)
+
+
+def verify_message_body(raw_body, err):
     if not raw_body:
-        error("Message is empty")
-        return errors, warnings
+        err.error("Message is empty")
+        return
 
     # Subject line.
     subject_line = raw_body[0]
+    for prefix in ignore_prefixes:
+        if subject_line.startswith(prefix):
+            verbose("Skipping ignored commit message")
+            return
     very_verbose("subject_line", subject_line)
     subject_line_format = r"^[^!]+: [A-Z]+.+ .+\.$"
     if not re.match(subject_line_format, subject_line):
-        error("Subject line should match " + repr(subject_line_format) + ": " + subject_line)
+        err.error("Subject line should match " + repr(subject_line_format) + ": " + subject_line)
     if len(subject_line) >= 73:
-        error("Subject line should be 72 or less characters: " + subject_line)
+        err.error("Subject line should be 72 or less characters: " + subject_line)
 
     # Second one divides subject and body.
     if len(raw_body) > 1 and raw_body[1]:
-        error("Second message line should be empty: " + raw_body[1])
+        err.error("Second message line should be empty: " + raw_body[1])
 
     # Message body lines.
     for line in raw_body[2:]:
         # Long lines with URLs are exempt from the line length rule.
         if len(line) >= 76 and "://" not in line:
-            error("Message lines should be 75 or less characters: " + line)
+            err.error("Message lines should be 75 or less characters: " + line)
 
     if not raw_body[-1].startswith("Signed-off-by: ") or "@" not in raw_body[-1]:
-        warning("Message should be signed-off")
-
-    return errors, warnings
+        err.warning("Message should be signed-off")
 
 
 def run(args):
     verbose("run", *args)
-    has_errors = False
-    has_warnings = False
-    for sha in git_log("%h", *args):
-        errors, warnings = verify(sha)
-        has_errors |= any(errors)
-        has_warnings |= any(warnings)
-        for err in errors:
-            print("error:", err)
-        for err in warnings:
-            print("warning:", err)
-    if has_errors or has_warnings:
+
+    err = ErrorCollection()
+
+    if "--check-file" in args:
+        filename = args[-1]
+        verbose("checking commit message from", filename)
+        with open(args[-1]) as f:
+            lines = [line.rstrip("\r\n") for line in f]
+            verify_message_body(lines, err)
+    else:  # Normal operation, pass arguments to git log
+        for sha in git_log("%h", *args):
+            verify(sha, err)
+
+    if err.has_errors or err.has_warnings:
         if suggestions:
             print("See https://github.com/micropython/micropython/blob/master/CODECONVENTIONS.md")
     else:
         print("ok")
-    if has_errors:
+    if err.has_errors:
         sys.exit(1)
 
 
 def show_help():
-    print("usage: verifygitlog.py [-v -n -h] ...")
+    print("usage: verifygitlog.py [-v -n -h --check-file] ...")
     print("-v  : increase verbosity, can be speficied multiple times")
     print("-n  : do not print multi-line suggestions")
     print("-h  : print this help message and exit")
+    print(
+        "--check-file : Pass a single argument which is a file containing a candidate commit message"
+    )
+    print(
+        "--ignore-rebase : Skip checking commits with git rebase autosquash prefixes or WIP as a prefix"
+    )
     print("... : arguments passed to git log to retrieve commits to verify")
     print("      see https://www.git-scm.com/docs/git-log")
     print("      passing no arguments at all will verify all commits")
@@ -117,6 +140,10 @@ def show_help():
     args = sys.argv[1:]
     verbosity = args.count("-v")
     suggestions = args.count("-n") == 0
+    if "--ignore-rebase" in args:
+        args.remove("--ignore-rebase")
+        ignore_prefixes = ["squash!", "fixup!", "amend!", "WIP"]
+
     if "-h" in args:
         show_help()
     else:

From 95c614e2b60b5c1c83c85aefe88a2aadbf43b9ed Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 4 Oct 2022 17:43:04 +1100
Subject: [PATCH 2669/3533] esp32/machine_hw_spi: Use auto DMA channel on S2,
 S3, C3 chips.

Auto DMA channel is supported in IDF v4.4, and is required to be used on S3
chips, so use this simpler configuration option where possible.

Fixes issue #8634.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/machine_hw_spi.c | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/ports/esp32/machine_hw_spi.c b/ports/esp32/machine_hw_spi.c
index 05b1c871cb3cf..647874e17f648 100644
--- a/ports/esp32/machine_hw_spi.c
+++ b/ports/esp32/machine_hw_spi.c
@@ -267,21 +267,15 @@ STATIC void machine_hw_spi_init_internal(
 
     // Select DMA channel based on the hardware SPI host
     int dma_chan = 0;
+    #if CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3 || CONFIG_IDF_TARGET_ESP32C3
+    dma_chan = SPI_DMA_CH_AUTO;
+    #else
     if (self->host == HSPI_HOST) {
-        #if CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3 || CONFIG_IDF_TARGET_ESP32C3
-        dma_chan = 3;
-        #else
         dma_chan = 1;
-        #endif
-    #ifdef FSPI_HOST
-    } else if (self->host == FSPI_HOST) {
-        dma_chan = 1;
-    #endif
-    #ifdef VSPI_HOST
-    } else if (self->host == VSPI_HOST) {
+    } else {
         dma_chan = 2;
-    #endif
     }
+    #endif
 
     ret = spi_bus_initialize(self->host, &buscfg, dma_chan);
     switch (ret) {

From f13134e40308c24bcb2c09084f17fc9d54efe5db Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Wed, 5 Oct 2022 22:30:29 +1100
Subject: [PATCH 2670/3533] tools/mpremote: Fix argument handling for follow
 and add help strings.

Fixes in this commit are:
- Make --follow the default for "run" (accidentally changed in 68d094358).
- Add help strings for "repl": --capture --inject-file --inject-code
- Update help strings for "run".
- Fix encoding for --inject-code (accidentally broken in 68d094358).
- Remove ability to --no-follow for "eval". It was there previously because
  it shared the same code path with "exec" and "run", but makes no sense
  for "eval", so might as well remove.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 tools/mpremote/mpremote/commands.py |  2 +-
 tools/mpremote/mpremote/main.py     | 29 ++++++++++++++++++++++-------
 tools/mpremote/mpremote/repl.py     |  1 +
 3 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/tools/mpremote/mpremote/commands.py b/tools/mpremote/mpremote/commands.py
index bf56df69993a8..558cd82f10800 100644
--- a/tools/mpremote/mpremote/commands.py
+++ b/tools/mpremote/mpremote/commands.py
@@ -204,7 +204,7 @@ def do_exec(state, args):
 
 def do_eval(state, args):
     buf = "print(" + args.expr[0] + ")"
-    _do_execbuffer(state, buf, args.follow)
+    _do_execbuffer(state, buf, True)
 
 
 def do_run(state, args):
diff --git a/tools/mpremote/mpremote/main.py b/tools/mpremote/mpremote/main.py
index 4f541685a0cfd..988ffe8f60f1a 100644
--- a/tools/mpremote/mpremote/main.py
+++ b/tools/mpremote/mpremote/main.py
@@ -119,30 +119,45 @@ def argparse_mount():
 
 def argparse_repl():
     cmd_parser = argparse.ArgumentParser(description="connect to given device")
-    cmd_parser.add_argument("--capture", type=str, required=False, help="TODO")
-    cmd_parser.add_argument("--inject-code", type=str, required=False, help="TODO")
-    cmd_parser.add_argument("--inject-file", type=str, required=False, help="TODO")
+    cmd_parser.add_argument(
+        "--capture",
+        type=str,
+        required=False,
+        help="saves a copy of the REPL session to the specified path",
+    )
+    cmd_parser.add_argument(
+        "--inject-code", type=str, required=False, help="code to be run when Ctrl-J is pressed"
+    )
+    cmd_parser.add_argument(
+        "--inject-file",
+        type=str,
+        required=False,
+        help="path to file to be run when Ctrl-K is pressed",
+    )
     return cmd_parser
 
 
 def argparse_eval():
     cmd_parser = argparse.ArgumentParser(description="evaluate and print the string")
-    _bool_flag(cmd_parser, "follow", "f", True, "TODO")
     cmd_parser.add_argument("expr", nargs=1, help="expression to execute")
     return cmd_parser
 
 
 def argparse_exec():
     cmd_parser = argparse.ArgumentParser(description="execute the string")
-    _bool_flag(cmd_parser, "follow", "f", True, "TODO")
+    _bool_flag(
+        cmd_parser, "follow", "f", True, "follow output until the expression completes (default)"
+    )
     cmd_parser.add_argument("expr", nargs=1, help="expression to execute")
     return cmd_parser
 
 
 def argparse_run():
     cmd_parser = argparse.ArgumentParser(description="run the given local script")
-    _bool_flag(cmd_parser, "follow", "f", False, "TODO")
-    cmd_parser.add_argument("path", nargs=1, help="expression to execute")
+    _bool_flag(
+        cmd_parser, "follow", "f", True, "follow output until the script completes (default)"
+    )
+    cmd_parser.add_argument("path", nargs=1, help="path to script to execute")
     return cmd_parser
 
 
diff --git a/tools/mpremote/mpremote/repl.py b/tools/mpremote/mpremote/repl.py
index 7da00c0fdef0c..3d6ca1881b1e7 100644
--- a/tools/mpremote/mpremote/repl.py
+++ b/tools/mpremote/mpremote/repl.py
@@ -61,6 +61,7 @@ def do_repl(state, args):
         print('Capturing session to file "%s"' % capture_file)
         capture_file = open(capture_file, "wb")
     if code_to_inject is not None:
+        code_to_inject = bytes(code_to_inject.replace("\\n", "\r\n"), "utf8")
         print("Use Ctrl-J to inject", code_to_inject)
     if file_to_inject is not None:
         print('Use Ctrl-K to inject file "%s"' % file_to_inject)

From 46d02c2469ec7947fe3aae2d68e07236baf5c72e Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 6 Oct 2022 01:02:39 +1100
Subject: [PATCH 2671/3533] tools/mpremote: Bump version to 0.4.0.

Signed-off-by: Damien George <damien@micropython.org>
---
 tools/mpremote/mpremote/__init__.py | 2 +-
 tools/mpremote/setup.cfg            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/mpremote/mpremote/__init__.py b/tools/mpremote/mpremote/__init__.py
index 493f7415d73d5..6a9beea82f651 100644
--- a/tools/mpremote/mpremote/__init__.py
+++ b/tools/mpremote/mpremote/__init__.py
@@ -1 +1 @@
-__version__ = "0.3.0"
+__version__ = "0.4.0"
diff --git a/tools/mpremote/setup.cfg b/tools/mpremote/setup.cfg
index 16880d77f895c..7fae3cbcb3906 100644
--- a/tools/mpremote/setup.cfg
+++ b/tools/mpremote/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = mpremote
-version = 0.3.0
+version = 0.4.0
 author = Damien George
 author_email = damien@micropython.org
 description = Tool for interacting remotely with MicroPython

From 85afed569d3d435b2611856356ff9c78d244f25c Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Fri, 27 May 2022 15:43:48 +0200
Subject: [PATCH 2672/3533] samd: Remove the existing provisional support for
 REPL on UART.

It was only partially working and will be rpelaced later by a full
machine.UART class implementation.
---
 .../mpconfigboard.h                           | 16 -----
 .../boards/ADAFRUIT_FEATHER_M0_EXPRESS/pins.c |  1 +
 .../mpconfigboard.h                           | 15 ----
 .../ADAFRUIT_ITSYBITSY_M4_EXPRESS/pins.c      |  1 +
 .../ADAFRUIT_TRINKET_M0/mpconfigboard.h       | 15 ----
 ports/samd/boards/ADAFRUIT_TRINKET_M0/pins.c  |  1 +
 ports/samd/boards/MINISAM_M4/mpconfigboard.h  | 15 ----
 ports/samd/boards/MINISAM_M4/pins.c           |  1 +
 .../SAMD21_XPLAINED_PRO/mpconfigboard.h       | 16 -----
 ports/samd/boards/SAMD21_XPLAINED_PRO/pins.c  |  1 +
 .../boards/SEEED_WIO_TERMINAL/mpconfigboard.h | 15 ----
 ports/samd/boards/SEEED_WIO_TERMINAL/pins.c   |  1 +
 ports/samd/boards/SEEED_XIAO/mpconfigboard.h  | 15 ----
 ports/samd/boards/SEEED_XIAO/pins.c           |  1 +
 ports/samd/modmachine.c                       |  5 --
 ports/samd/modmachine.h                       |  3 -
 ports/samd/mphalport.c                        |  8 ---
 ports/samd/samd_soc.c                         | 70 -------------------
 18 files changed, 7 insertions(+), 193 deletions(-)

diff --git a/ports/samd/boards/ADAFRUIT_FEATHER_M0_EXPRESS/mpconfigboard.h b/ports/samd/boards/ADAFRUIT_FEATHER_M0_EXPRESS/mpconfigboard.h
index 6d3b7987e39de..bdb22d2e0adf5 100644
--- a/ports/samd/boards/ADAFRUIT_FEATHER_M0_EXPRESS/mpconfigboard.h
+++ b/ports/samd/boards/ADAFRUIT_FEATHER_M0_EXPRESS/mpconfigboard.h
@@ -9,20 +9,4 @@
 #define MICROPY_HW_FLASH_STORAGE_BYTES      (0xFFFF)
 #define VFS_BLOCK_SIZE_BYTES                (1536) // 24x 64B flash pages;
 
-// ASF4 MCU package specific Pin definitions
-#include "samd21g18a.h"
-
-// Please consult the SAM_D21 Datasheet, I/O Multiplexing and Considerations.
-// On this board (see https://learn.adafruit.com/assets/40553) TX is D1 (PA10) and RX is D0 (PA11)
-// USART pin assignments: Tx=PA10=SERCOM0/PAD[2], Rx=PA11==SERCOM0/PAD[3]
 #define CPU_FREQ (48000000) // For selecting Baud from clock.
-#define MP_PIN_GRP 0 // A=0, B=1
-#define MP_TX_PIN 10 // 'n'
-#define MP_RX_PIN 11
-#define MP_PERIPHERAL_MUX 5 // 'n'th group of 2 pins
-#define USARTx SERCOM0 // SERCOM0: tx/rx
-#define MP_PORT_FUNC 0x22 // Sets PMUXE & PMUXO to the Alternative Function.(A-H=0-7)
-#define MP_RXPO_PAD 3 // RXPO- Receive Data Pinout
-#define MP_TXPO_PAD 1 // TXPO- Transmit Data Pinout
-#define MP_SERCOMx SERCOM0_ // APBCMASK
-#define MP_SERCOM_GCLK_ID_x_CORE GCLK_CLKCTRL_ID_SERCOM0_CORE // Generic Clock Control
diff --git a/ports/samd/boards/ADAFRUIT_FEATHER_M0_EXPRESS/pins.c b/ports/samd/boards/ADAFRUIT_FEATHER_M0_EXPRESS/pins.c
index e0dd752ec900d..fbb5032a40628 100644
--- a/ports/samd/boards/ADAFRUIT_FEATHER_M0_EXPRESS/pins.c
+++ b/ports/samd/boards/ADAFRUIT_FEATHER_M0_EXPRESS/pins.c
@@ -27,6 +27,7 @@
  */
 
 #include "modmachine.h"
+#include "sam.h"
 #include "pins.h"
 
 // Ensure Declaration in 'pins.h' reflects # of Pins defined here.
diff --git a/ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/mpconfigboard.h b/ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/mpconfigboard.h
index c1c4fd8cad4cf..80baf39e5d6db 100644
--- a/ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/mpconfigboard.h
+++ b/ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/mpconfigboard.h
@@ -14,19 +14,4 @@
 #define MICROPY_HW_FLASH_STORAGE_BYTES      (0x1FFFF)
 #define VFS_BLOCK_SIZE_BYTES                (1536) //
 
-// ASF4 MCU package specific Pin definitions
-#include "samd51g19a.h"
-
-// Please consult the SAM_D51 Datasheet, I/O Multiplexing and Considerations.
-// USART pin assignments: Tx=TX_D1=PA17=SERCOM3/PAD[0], Rx=RX_D0=PA16=SERCOM3/PAD[1]
 #define CPU_FREQ (48000000) // For selecting Baud from clock.
-#define MP_PIN_GRP 1 // A-D=0-3
-#define MP_TX_PIN 17
-#define MP_RX_PIN 16 // 'n'
-#define MP_PERIPHERAL_MUX 8 // 'n'th group of 2 pins
-#define USARTx SERCOM3 //
-#define MP_PORT_FUNC 0x33 // Sets PMUXE & PMUXO to the Alternative Function.A-N=0-13
-#define MP_RXPO_PAD 1 // RXPO- Receive Data Pinout
-#define MP_TXPO_PAD 0 // TXPO- Tranmit Data Pinout
-#define MP_SERCOMx SERCOM3_ // APBCMASK
-#define MP_SERCOM_GCLK_ID_x_CORE SERCOM3_GCLK_ID_CORE
diff --git a/ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/pins.c b/ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/pins.c
index 82948ccbc4f18..0342b0d00c58a 100644
--- a/ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/pins.c
+++ b/ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/pins.c
@@ -27,6 +27,7 @@
  */
 
 #include "modmachine.h"
+#include "sam.h"
 #include "pins.h"
 
 // Ensure Declaration in 'pins.h' reflects # of Pins defined here.
diff --git a/ports/samd/boards/ADAFRUIT_TRINKET_M0/mpconfigboard.h b/ports/samd/boards/ADAFRUIT_TRINKET_M0/mpconfigboard.h
index 128689f4f74a7..066c7ee1429e2 100644
--- a/ports/samd/boards/ADAFRUIT_TRINKET_M0/mpconfigboard.h
+++ b/ports/samd/boards/ADAFRUIT_TRINKET_M0/mpconfigboard.h
@@ -9,19 +9,4 @@
 #define MICROPY_HW_FLASH_STORAGE_BYTES      (0xFFFF)
 #define VFS_BLOCK_SIZE_BYTES                (1536) // 24x 64B flash pages;
 
-// ASF4 MCU package specific Pin definitions
-#include "samd21e18a.h"
-
-// Please consult the SAM_D21 Datasheet, I/O Multiplexing and Considerations.
-// USART pin assignments: Tx=D4=PA06=SERCOM0/PAD[2], Rx=D3=PA07=SERCOM0/PAD[3]
 #define CPU_FREQ (48000000) // For selecting Baud from clock.
-#define MP_PIN_GRP 1 // A=0, B=1
-#define MP_TX_PIN 6 // 'n'
-#define MP_RX_PIN 7
-#define MP_PERIPHERAL_MUX 3 // 'n'th group of 2 pins
-#define USARTx SERCOM0 // SERCOM0: tx/rx
-#define MP_PORT_FUNC 0x33 // Sets PMUXE & PMUXO to the Alternative Function.A-H=0-7
-#define MP_RXPO_PAD 3 // RXPO- Receive Data Pinout
-#define MP_TXPO_PAD 2 // TXPO- Tranmit Data Pinout
-#define MP_SERCOMx SERCOM0_ // APBCMASK
-#define MP_SERCOM_GCLK_ID_x_CORE GCLK_CLKCTRL_ID_SERCOM0_CORE // Generic Clock Control
diff --git a/ports/samd/boards/ADAFRUIT_TRINKET_M0/pins.c b/ports/samd/boards/ADAFRUIT_TRINKET_M0/pins.c
index 9fecddb6cd872..676b4794e89b6 100644
--- a/ports/samd/boards/ADAFRUIT_TRINKET_M0/pins.c
+++ b/ports/samd/boards/ADAFRUIT_TRINKET_M0/pins.c
@@ -27,6 +27,7 @@
  */
 
 #include "modmachine.h"
+#include "sam.h"
 #include "pins.h"
 
 // Ensure Declaration in 'pins.h' reflects # of Pins defined here.
diff --git a/ports/samd/boards/MINISAM_M4/mpconfigboard.h b/ports/samd/boards/MINISAM_M4/mpconfigboard.h
index a65eb54b495f1..a8f1f96242c8a 100644
--- a/ports/samd/boards/MINISAM_M4/mpconfigboard.h
+++ b/ports/samd/boards/MINISAM_M4/mpconfigboard.h
@@ -14,19 +14,4 @@
 #define MICROPY_HW_FLASH_STORAGE_BYTES      (0x1FFFF)
 #define VFS_BLOCK_SIZE_BYTES                (1536) //
 
-// ASF4 MCU package specific Pin definitions
-#include "samd51g19a.h"
-
-// Please consult the SAM_D51 Datasheet, I/O Multiplexing and Considerations.
-// USART pin assignments: Tx=TX_D1=PA17=SERCOM3/PAD[0], Rx=RX_D0=PA16=SERCOM3/PAD[1]
 #define CPU_FREQ (48000000) // For selecting Baud from clock.
-#define MP_PIN_GRP 0 // A-D=0-3
-#define MP_TX_PIN 17
-#define MP_RX_PIN 16 // 'n'
-#define MP_PERIPHERAL_MUX 8 // 'n'th group of 2 pins
-#define USARTx SERCOM3 //
-#define MP_PORT_FUNC 0x33 // Sets PMUXE & PMUXO to the Alternative Function.A-N=0-13
-#define MP_RXPO_PAD 1 // RXPO- Receive Data Pinout
-#define MP_TXPO_PAD 0 // TXPO- Tranmit Data Pinout
-#define MP_SERCOMx SERCOM3_ // APBCMASK
-#define MP_SERCOM_GCLK_ID_x_CORE SERCOM3_GCLK_ID_CORE
diff --git a/ports/samd/boards/MINISAM_M4/pins.c b/ports/samd/boards/MINISAM_M4/pins.c
index 6cdd840b6bc78..17ed58d3c4182 100644
--- a/ports/samd/boards/MINISAM_M4/pins.c
+++ b/ports/samd/boards/MINISAM_M4/pins.c
@@ -27,6 +27,7 @@
  */
 
 #include "modmachine.h"
+#include "sam.h"
 #include "pins.h"
 
 // Ensure Declaration in 'pins.h' reflects # of Pins defined here.
diff --git a/ports/samd/boards/SAMD21_XPLAINED_PRO/mpconfigboard.h b/ports/samd/boards/SAMD21_XPLAINED_PRO/mpconfigboard.h
index a7dbf76144bc7..860cb6b977783 100644
--- a/ports/samd/boards/SAMD21_XPLAINED_PRO/mpconfigboard.h
+++ b/ports/samd/boards/SAMD21_XPLAINED_PRO/mpconfigboard.h
@@ -9,20 +9,4 @@
 #define MICROPY_HW_FLASH_STORAGE_BYTES      (0xFFFF)
 #define VFS_BLOCK_SIZE_BYTES                (1536) // 24x 64B flash pages;
 
-// ASF4 MCU package specific Pin definitions
-#include "samd21j18a.h"
-
-// Please consult the SAM_D21 Datasheet, I/O Multiplexing and Considerations.
-// USART pin assignments: (This board has 3 USARTS brought out to the pins. See https://docs.zephyrproject.org/1.14.1/boards/arm/atsamd21_xpro/doc/index.html#serial-port )
-// Tx=PA10=SERCOM0/PAD[2], Rx=PA11=SERCOM0/PAD[3]
 #define CPU_FREQ (48000000) // For selecting Baud from clock.
-#define MP_PIN_GRP 1 // A=0, B=1
-#define MP_TX_PIN 10 // 'n'
-#define MP_RX_PIN 11
-#define MP_PERIPHERAL_MUX 5 // 'n'th group of 2 pins
-#define USARTx SERCOM0 // SERCOM0: tx/rx
-#define MP_PORT_FUNC 0x22 // Sets PMUXE & PMUXO to the Alternative Function.(A-H=0-7)
-#define MP_RXPO_PAD 3 // RXPO- Receive Data Pinout
-#define MP_TXPO_PAD 2 // TXPO- Tranmit Data Pinout
-#define MP_SERCOMx SERCOM0_ // APBCMASK
-#define MP_SERCOM_GCLK_ID_x_CORE GCLK_CLKCTRL_ID_SERCOM0_CORE // Generic Clock Control
diff --git a/ports/samd/boards/SAMD21_XPLAINED_PRO/pins.c b/ports/samd/boards/SAMD21_XPLAINED_PRO/pins.c
index 2a2d50eb48fcc..35718ea7f3d7f 100644
--- a/ports/samd/boards/SAMD21_XPLAINED_PRO/pins.c
+++ b/ports/samd/boards/SAMD21_XPLAINED_PRO/pins.c
@@ -27,6 +27,7 @@
  */
 
 #include "modmachine.h"
+#include "sam.h"
 #include "pins.h"
 
 // Ensure Declaration in 'pins.h' reflects # of Pins defined here.
diff --git a/ports/samd/boards/SEEED_WIO_TERMINAL/mpconfigboard.h b/ports/samd/boards/SEEED_WIO_TERMINAL/mpconfigboard.h
index 290bd802b8a0b..bb0f1c828e784 100644
--- a/ports/samd/boards/SEEED_WIO_TERMINAL/mpconfigboard.h
+++ b/ports/samd/boards/SEEED_WIO_TERMINAL/mpconfigboard.h
@@ -14,19 +14,4 @@
 #define MICROPY_HW_FLASH_STORAGE_BYTES      (0x1FFFF)
 #define VFS_BLOCK_SIZE_BYTES                (1536) // 24x 64B flash pages;
 
-// ASF4 MCU package specific Pin definitions
-#include "samd51p19a.h"
-
-// Please consult the SAM_D51 Datasheet, I/O Multiplexing and Considerations.
-// WIO_Terminal USART pin assignments: Tx=BCM14=PB27=SERCOM2/PAD[0], Rx=BCM15=PB26=SERCOM2/PAD[1]
 #define CPU_FREQ (48000000) // For selecting Baud from clock.
-#define MP_PIN_GRP 1 // A-D=0-3
-#define MP_TX_PIN 27
-#define MP_RX_PIN 26 // 'n'
-#define MP_PERIPHERAL_MUX 13 // 'n'th group of 2 pins
-#define USARTx SERCOM2 //
-#define MP_PORT_FUNC 0x22 // Sets PMUXE & PMUXO to the Alternative Function.A-N=0-13
-#define MP_RXPO_PAD 1 // RXPO- Receive Data Pinout
-#define MP_TXPO_PAD 0 // TXPO- Tranmit Data Pinout
-#define MP_SERCOMx SERCOM2_ // APBCMASK
-#define MP_SERCOM_GCLK_ID_x_CORE SERCOM2_GCLK_ID_CORE
diff --git a/ports/samd/boards/SEEED_WIO_TERMINAL/pins.c b/ports/samd/boards/SEEED_WIO_TERMINAL/pins.c
index 9862552fa3d85..d7833416d3c73 100644
--- a/ports/samd/boards/SEEED_WIO_TERMINAL/pins.c
+++ b/ports/samd/boards/SEEED_WIO_TERMINAL/pins.c
@@ -27,6 +27,7 @@
  */
 
 #include "modmachine.h"
+#include "sam.h"
 #include "pins.h"
 
 // Ensure Declaration in "pins.h" reflects # of Pins defined here.
diff --git a/ports/samd/boards/SEEED_XIAO/mpconfigboard.h b/ports/samd/boards/SEEED_XIAO/mpconfigboard.h
index 6422d7ea0232e..a2f2a9fb0b01c 100644
--- a/ports/samd/boards/SEEED_XIAO/mpconfigboard.h
+++ b/ports/samd/boards/SEEED_XIAO/mpconfigboard.h
@@ -9,19 +9,4 @@
 #define MICROPY_HW_FLASH_STORAGE_BYTES      (0xFFFF)
 #define VFS_BLOCK_SIZE_BYTES                (1536) // 24x 64B flash pages;
 
-// ASF4 MCU package specific Pin definitions
-#include "samd21g18a.h"
-
-// Please consult the SAM_D21 Datasheet, I/O Multiplexing and Considerations.
-// XIAO_M0 USART pin assignments: Tx=A6=PB8=SERCOM4/PAD[0], Rx=PB9=A7=SERCOM4/PAD[1]
 #define CPU_FREQ (48000000) // For selecting Baud from clock.
-#define MP_PIN_GRP 1 // A=0, B=1
-#define MP_TX_PIN 8 // 'n'
-#define MP_RX_PIN 9
-#define MP_PERIPHERAL_MUX 4 // 'n'th group of 2 pins
-#define USARTx SERCOM4 // SERCOM4:XIAO_M0 tx/rx
-#define MP_PORT_FUNC 0x33 // Sets PMUXE & PMUXO to the Alternative Function.A-H=0-7
-#define MP_RXPO_PAD 1 // RXPO- Receive Data Pinout
-#define MP_TXPO_PAD 0 // TXPO- Tranmit Data Pinout
-#define MP_SERCOMx SERCOM4_ // APBCMASK
-#define MP_SERCOM_GCLK_ID_x_CORE GCLK_CLKCTRL_ID_SERCOM4_CORE // Generic Clock Control
diff --git a/ports/samd/boards/SEEED_XIAO/pins.c b/ports/samd/boards/SEEED_XIAO/pins.c
index 6043913d2badb..e2f7c264b4bda 100644
--- a/ports/samd/boards/SEEED_XIAO/pins.c
+++ b/ports/samd/boards/SEEED_XIAO/pins.c
@@ -27,6 +27,7 @@
  */
 
 #include "modmachine.h"
+#include "sam.h"
 #include "pins.h"
 
 // Ensure Declaration in 'pins.h' reflects # of Pins defined here.
diff --git a/ports/samd/modmachine.c b/ports/samd/modmachine.c
index 74e3571759420..1b78b687e1803 100644
--- a/ports/samd/modmachine.c
+++ b/ports/samd/modmachine.c
@@ -45,9 +45,6 @@
 #define DBL_TAP_MAGIC_LOADER 0xf01669ef
 #define DBL_TAP_MAGIC_RESET 0xf02669ef
 
-MP_DEFINE_CONST_FUN_OBJ_0(machine_uart_init_obj, machine_uart_init);
-MP_DEFINE_CONST_FUN_OBJ_0(machine_uart_deinit_obj, machine_uart_deinit);
-
 STATIC mp_obj_t machine_reset(void) {
     *DBL_TAP_ADDR = DBL_TAP_MAGIC_RESET;
     NVIC_SystemReset();
@@ -119,8 +116,6 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_mem16),               MP_ROM_PTR(&machine_mem16_obj) },
     { MP_ROM_QSTR(MP_QSTR_mem32),               MP_ROM_PTR(&machine_mem32_obj) },
     { MP_ROM_QSTR(MP_QSTR_unique_id),           MP_ROM_PTR(&machine_unique_id_obj) },
-    { MP_ROM_QSTR(MP_QSTR_uart_init),           MP_ROM_PTR(&machine_uart_init_obj) },
-    { MP_ROM_QSTR(MP_QSTR_uart_deinit),         MP_ROM_PTR(&machine_uart_deinit_obj) },
     { MP_ROM_QSTR(MP_QSTR_Pin),                 MP_ROM_PTR(&machine_pin_type) },
     { MP_ROM_QSTR(MP_QSTR_LED),                 MP_ROM_PTR(&machine_led_type) },
 };
diff --git a/ports/samd/modmachine.h b/ports/samd/modmachine.h
index 61bd2f4d29912..f7ad2b5e5cbc4 100644
--- a/ports/samd/modmachine.h
+++ b/ports/samd/modmachine.h
@@ -31,7 +31,4 @@
 extern const mp_obj_type_t machine_pin_type;
 extern const mp_obj_type_t machine_led_type;
 
-mp_obj_t machine_uart_init(void);
-mp_obj_t machine_uart_deinit(void);
-
 #endif // MICROPY_INCLUDED_SAMD_MODMACHINE_H
diff --git a/ports/samd/mphalport.c b/ports/samd/mphalport.c
index c19d542a85566..beade14a6e3da 100644
--- a/ports/samd/mphalport.c
+++ b/ports/samd/mphalport.c
@@ -71,9 +71,6 @@ uintptr_t mp_hal_stdio_poll(uintptr_t poll_flags) {
 
 int mp_hal_stdin_rx_chr(void) {
     for (;;) {
-        if (USARTx->USART.INTFLAG.bit.RXC) {
-            return USARTx->USART.DATA.bit.DATA;
-        }
         if (tud_cdc_connected() && tud_cdc_available()) {
             uint8_t buf[1];
             uint32_t count = tud_cdc_read(buf, sizeof(buf));
@@ -100,9 +97,4 @@ void mp_hal_stdout_tx_strn(const char *str, mp_uint_t len) {
             i += n2;
         }
     }
-    while (len--) {
-        while (!(USARTx->USART.INTFLAG.bit.DRE)) {
-        }
-        USARTx->USART.DATA.bit.DATA = *str++;
-    }
 }
diff --git a/ports/samd/samd_soc.c b/ports/samd/samd_soc.c
index 7f4df1bb1c756..7a96cbb4800fd 100644
--- a/ports/samd/samd_soc.c
+++ b/ports/samd/samd_soc.c
@@ -35,75 +35,6 @@
 #include "samd_soc.h"
 #include "tusb.h"
 
-// "MP" macros defined in "boards/$(BOARD)/mpconfigboard.h"
-mp_obj_t machine_uart_init(void) {
-    // Firstly, assign alternate function SERCOM PADs to GPIO pins.
-    PORT->Group[MP_PIN_GRP].PINCFG[MP_TX_PIN].bit.PMUXEN = 1; // Enable
-    PORT->Group[MP_PIN_GRP].PINCFG[MP_RX_PIN].bit.PMUXEN = 1; // Enable
-    PORT->Group[MP_PIN_GRP].PMUX[MP_PERIPHERAL_MUX].reg = MP_PORT_FUNC; // Sets PMUXE & PMUXO in 1 hit.
-    uint32_t rxpo = MP_RXPO_PAD; // 1=Pad1,3=Pad3 Rx data
-    uint32_t txpo = MP_TXPO_PAD; // 0=pad0,1=Pad2 Tx data
-
-    // Initialise the clocks
-    #if defined(MCU_SAMD21)
-    PM->APBCMASK.bit.MP_SERCOMx = 1; // Enable synchronous clock
-    GCLK->CLKCTRL.reg = GCLK_CLKCTRL_CLKEN | GCLK_CLKCTRL_GEN_GCLK0 | MP_SERCOM_GCLK_ID_x_CORE; // Select multiplexer generic clock source and enable.
-    // Wait while it updates synchronously.
-    while (GCLK->STATUS.bit.SYNCBUSY) {
-    }
-    #elif defined(MCU_SAMD51)
-    GCLK->PCHCTRL[MP_SERCOM_GCLK_ID_x_CORE].reg = GCLK_PCHCTRL_CHEN | GCLK_PCHCTRL_GEN_GCLK0;
-    MCLK->APBBMASK.bit.MP_SERCOMx = 1;
-    #endif
-
-    // Setup the Peripheral.
-    // Reset (clear) the peripheral registers.
-    while (USARTx->USART.SYNCBUSY.bit.SWRST) {
-    }
-    USARTx->USART.CTRLA.bit.SWRST = 1; // Reset all Registers, disable peripheral
-    while (USARTx->USART.SYNCBUSY.bit.SWRST) {
-    }
-
-    // Set the register bits as needed
-    // (CMODE (async),CHSIZE (8),FORM (no parity),SBMODE (1 stop) already 0).
-    USARTx->USART.CTRLA.reg =   // USARTx = SERCOMx set in "boards/$(BOARD)/mpconfigboard.h"
-        SERCOM_USART_CTRLA_DORD // Data order
-        | SERCOM_USART_CTRLA_RXPO(rxpo) // Set Pad#
-        | SERCOM_USART_CTRLA_TXPO(txpo) // Set Pad#
-        | SERCOM_USART_CTRLA_MODE(1) // USART with internal clock
-    ;
-    USARTx->USART.CTRLB.reg = SERCOM_USART_CTRLB_RXEN | SERCOM_USART_CTRLB_TXEN; // Enable Rx & Tx
-    while (USARTx->USART.SYNCBUSY.bit.CTRLB) {
-    }
-
-    // Baud rate is clock dependant.
-    #if CPU_FREQ == 8000000
-    uint32_t baud = 50437; // 115200 baud; 65536*(1 - 16 * 115200/8e6)
-    #elif CPU_FREQ == 48000000
-    uint32_t baud = 63019; // 115200 baud; 65536*(1 - 16 * 115200/48e6)
-    #elif CPU_FREQ == 120000000
-    uint32_t baud = 64529; // 115200 baud; 65536*(1 - 16 * 115200/120e6)
-    #endif
-    USARTx->USART.BAUD.bit.BAUD = baud; // Set Baud
-    USARTx->USART.CTRLA.bit.ENABLE = 1; // Enable the peripheral
-    // Wait for the Registers to update.
-    while (USARTx->USART.SYNCBUSY.bit.ENABLE) {
-    }
-
-    return mp_const_none;
-}
-
-// Disconnect SERCOM from GPIO pins. (Can't SWRST, as that will totally kill USART).
-mp_obj_t machine_uart_deinit(void) {
-    // Reset
-    printf("Disabling the Alt-Funct, releasing the USART pins for GPIO... \n");
-    PORT->Group[MP_PIN_GRP].PINCFG[MP_TX_PIN].bit.PMUXEN = 0; // Disable
-    PORT->Group[MP_PIN_GRP].PINCFG[MP_RX_PIN].bit.PMUXEN = 0; // Disable
-
-    return mp_const_none;
-}
-
-
 static void usb_init(void) {
     // Init USB clock
     #if defined(MCU_SAMD21)
@@ -168,6 +99,5 @@ void samd_init(void) {
     #endif
 
     SysTick_Config(CPU_FREQ / 1000);
-    machine_uart_init();
     usb_init();
 }

From 0420799a847d4bb74c9a92666e2cd35c23b1c12c Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Fri, 27 May 2022 21:19:47 +0200
Subject: [PATCH 2673/3533] samd/boards: Replace pins.c and pins.h by pins.csv.

The files pins.c and pins.h are generated during the build process from
pins.csv, using a make-pins.py script.
---
 ports/samd/Makefile                           |  11 +-
 .../boards/ADAFRUIT_FEATHER_M0_EXPRESS/pins.c |  59 --------
 .../ADAFRUIT_FEATHER_M0_EXPRESS/pins.csv      |  37 +++++
 .../boards/ADAFRUIT_FEATHER_M0_EXPRESS/pins.h |  42 ------
 .../ADAFRUIT_ITSYBITSY_M4_EXPRESS/pins.c      |  59 --------
 .../ADAFRUIT_ITSYBITSY_M4_EXPRESS/pins.csv    |  36 +++++
 .../ADAFRUIT_ITSYBITSY_M4_EXPRESS/pins.h      |  42 ------
 ports/samd/boards/ADAFRUIT_TRINKET_M0/pins.c  |  44 ------
 .../samd/boards/ADAFRUIT_TRINKET_M0/pins.csv  |  16 +++
 ports/samd/boards/ADAFRUIT_TRINKET_M0/pins.h  |  42 ------
 ports/samd/boards/MINISAM_M4/pins.c           |  52 --------
 ports/samd/boards/MINISAM_M4/pins.csv         |  27 ++++
 ports/samd/boards/MINISAM_M4/pins.h           |  42 ------
 ports/samd/boards/SAMD21_XPLAINED_PRO/pins.c  |  92 -------------
 .../samd/boards/SAMD21_XPLAINED_PRO/pins.csv  |  63 +++++++++
 ports/samd/boards/SAMD21_XPLAINED_PRO/pins.h  |  42 ------
 ports/samd/boards/SEEED_WIO_TERMINAL/pins.c   |  61 ---------
 ports/samd/boards/SEEED_WIO_TERMINAL/pins.csv |  30 +++++
 ports/samd/boards/SEEED_WIO_TERMINAL/pins.h   |  42 ------
 ports/samd/boards/SEEED_XIAO/pins.c           |  53 --------
 ports/samd/boards/SEEED_XIAO/pins.csv         |  22 +++
 ports/samd/boards/SEEED_XIAO/pins.h           |  42 ------
 ports/samd/boards/make-pins.py                | 126 ++++++++++++++++++
 23 files changed, 367 insertions(+), 715 deletions(-)
 delete mode 100644 ports/samd/boards/ADAFRUIT_FEATHER_M0_EXPRESS/pins.c
 create mode 100644 ports/samd/boards/ADAFRUIT_FEATHER_M0_EXPRESS/pins.csv
 delete mode 100644 ports/samd/boards/ADAFRUIT_FEATHER_M0_EXPRESS/pins.h
 delete mode 100644 ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/pins.c
 create mode 100644 ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/pins.csv
 delete mode 100644 ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/pins.h
 delete mode 100644 ports/samd/boards/ADAFRUIT_TRINKET_M0/pins.c
 create mode 100644 ports/samd/boards/ADAFRUIT_TRINKET_M0/pins.csv
 delete mode 100644 ports/samd/boards/ADAFRUIT_TRINKET_M0/pins.h
 delete mode 100644 ports/samd/boards/MINISAM_M4/pins.c
 create mode 100644 ports/samd/boards/MINISAM_M4/pins.csv
 delete mode 100644 ports/samd/boards/MINISAM_M4/pins.h
 delete mode 100644 ports/samd/boards/SAMD21_XPLAINED_PRO/pins.c
 create mode 100644 ports/samd/boards/SAMD21_XPLAINED_PRO/pins.csv
 delete mode 100644 ports/samd/boards/SAMD21_XPLAINED_PRO/pins.h
 delete mode 100644 ports/samd/boards/SEEED_WIO_TERMINAL/pins.c
 create mode 100644 ports/samd/boards/SEEED_WIO_TERMINAL/pins.csv
 delete mode 100644 ports/samd/boards/SEEED_WIO_TERMINAL/pins.h
 delete mode 100644 ports/samd/boards/SEEED_XIAO/pins.c
 create mode 100644 ports/samd/boards/SEEED_XIAO/pins.csv
 delete mode 100644 ports/samd/boards/SEEED_XIAO/pins.h
 create mode 100644 ports/samd/boards/make-pins.py

diff --git a/ports/samd/Makefile b/ports/samd/Makefile
index aed8637abcc1f..1ef35c1a025ea 100644
--- a/ports/samd/Makefile
+++ b/ports/samd/Makefile
@@ -56,6 +56,11 @@ LDFLAGS += $(LDFLAGS_MOD)
 
 LIBS = $(shell $(CC) $(CFLAGS) -print-libgcc-file-name)
 
+MAKE_PINS = boards/make-pins.py
+BOARD_PINS = $(BOARD_DIR)/pins.csv
+GEN_PINS_SRC = $(BUILD)/pins.c
+GEN_PINS_HDR = $(BUILD)/pins.h
+
 # Tune for Debugging or Optimization
 CFLAGS += -g  # always include debug info in the ELF
 ifeq ($(DEBUG),1)
@@ -79,7 +84,7 @@ SRC_C = \
 	help.c \
 	modutime.c \
 	modmachine.c \
-	$(BOARD_DIR)/pins.c \
+	$(BUILD)/pins.c \
 	machine_pin.c \
 	machine_led.c \
 	modsamd.c \
@@ -160,4 +165,8 @@ $(BUILD)/firmware.bin: $(BUILD)/firmware.elf
 $(BUILD)/firmware.uf2: $(BUILD)/firmware.bin
 	$(Q)$(PYTHON) $(UF2CONV) -b $(TEXT0) -c -o $@ $<
 
+$(GEN_PINS_SRC): $(BOARD_PINS)
+	$(ECHO) "Create $@"
+	$(Q)$(PYTHON) $(MAKE_PINS) --board $(BOARD_PINS) --pins $(GEN_PINS_SRC) --inc $(GEN_PINS_HDR)
+
 include $(TOP)/py/mkrules.mk
diff --git a/ports/samd/boards/ADAFRUIT_FEATHER_M0_EXPRESS/pins.c b/ports/samd/boards/ADAFRUIT_FEATHER_M0_EXPRESS/pins.c
deleted file mode 100644
index fbb5032a40628..0000000000000
--- a/ports/samd/boards/ADAFRUIT_FEATHER_M0_EXPRESS/pins.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2021 Peter van der Burg
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- * Used by machine_pin.c. Holds Board/MCU specific Pin allocations.
- */
-
-#include "modmachine.h"
-#include "sam.h"
-#include "pins.h"
-
-// Ensure Declaration in 'pins.h' reflects # of Pins defined here.
-const machine_pin_obj_t machine_pin_obj[] = {
-    {{&machine_pin_type}, PIN_PA11}, // D0
-    {{&machine_pin_type}, PIN_PA10}, // D1
-    {{&machine_pin_type}, PIN_PA14}, // D2
-    {{&machine_pin_type}, PIN_PA09}, // D3/
-    {{&machine_pin_type}, PIN_PA08}, // D4/
-    {{&machine_pin_type}, PIN_PA15}, // D5
-    {{&machine_pin_type}, PIN_PA20}, // D6
-    {{&machine_pin_type}, PIN_PA21}, // D7
-    {{&machine_pin_type}, PIN_PA06}, // D8/
-    {{&machine_pin_type}, PIN_PA07}, // D9/
-    {{&machine_pin_type}, PIN_PA18}, // D10
-    {{&machine_pin_type}, PIN_PA16}, // D11
-    {{&machine_pin_type}, PIN_PA19}, // D12
-    {{&machine_pin_type}, PIN_PA17}, // D13/
-    {{&machine_pin_type}, PIN_PA02},     // A0
-    {{&machine_pin_type}, PIN_PB08}, // A1
-    {{&machine_pin_type}, PIN_PB09}, // A2
-    {{&machine_pin_type}, PIN_PA04}, // A3/
-    {{&machine_pin_type}, PIN_PA05}, // A4/
-    {{&machine_pin_type}, PIN_PB02}, // A5
-};
-
-const machine_led_obj_t machine_led_obj[] = {
-    {{&machine_led_type}, PIN_PA17}, // D13/ user LED
-};
diff --git a/ports/samd/boards/ADAFRUIT_FEATHER_M0_EXPRESS/pins.csv b/ports/samd/boards/ADAFRUIT_FEATHER_M0_EXPRESS/pins.csv
new file mode 100644
index 0000000000000..84e68157acbc3
--- /dev/null
+++ b/ports/samd/boards/ADAFRUIT_FEATHER_M0_EXPRESS/pins.csv
@@ -0,0 +1,37 @@
+# Pin rows contain Pin number and pin name.
+# Pin rows start with PIN_
+# LED rows start with LED_
+# If the pin name is omitted, the pin number is added as name.
+# Rows for empty entries have to start with '-'
+# Empty lines and lines starting with # are ignored
+
+PIN_PA11,D0
+PIN_PA10,D1
+PIN_PA14,D2
+PIN_PA09,D3
+PIN_PA08,D4
+PIN_PA15,D5
+PIN_PA20,D6
+PIN_PA21,D7
+PIN_PA06,D8
+PIN_PA07,D9
+PIN_PA18,D10
+PIN_PA16,D11
+PIN_PA19,D12
+PIN_PA17,D13
+PIN_PA02,A0
+PIN_PB08,A1
+PIN_PB09,A2
+PIN_PA04,A3
+PIN_PA05,A4
+PIN_PB02,A5
+PIN_PB22,TX
+PIN_PB23,RX
+PIN_PA23,SCL
+PIN_PA22,SDA
+PIN_PA06,NEOPIXEL
+PIN_PA13,FLASH_CS
+
+LED_PA17,LED
+LED_PA27,LED_TX
+LED_PB03,LED_RX
diff --git a/ports/samd/boards/ADAFRUIT_FEATHER_M0_EXPRESS/pins.h b/ports/samd/boards/ADAFRUIT_FEATHER_M0_EXPRESS/pins.h
deleted file mode 100644
index 45bee6167837c..0000000000000
--- a/ports/samd/boards/ADAFRUIT_FEATHER_M0_EXPRESS/pins.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2021 Peter van der Burg
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- * Used by machine_pin.c & board specific pins.c. Holds Board/MCU specific Pin
- * allocations.
- */
-
-typedef struct _machine_pin_obj_t {
-    mp_obj_base_t base;
-    uint32_t id;
-} machine_pin_obj_t;
-
-typedef struct _machine_led_obj_t {
-    mp_obj_base_t base;
-    uint32_t id;
-} machine_led_obj_t;
-
-// MUST explicitly hold array # of rows, else machine_pin.c wont compile.
-extern const machine_pin_obj_t machine_pin_obj[20];
-extern const machine_led_obj_t machine_led_obj[1];
diff --git a/ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/pins.c b/ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/pins.c
deleted file mode 100644
index 0342b0d00c58a..0000000000000
--- a/ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/pins.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2021 Peter van der Burg
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- * Used by machine_pin.c. Holds Board/MCU specific Pin allocations.
- */
-
-#include "modmachine.h"
-#include "sam.h"
-#include "pins.h"
-
-// Ensure Declaration in 'pins.h' reflects # of Pins defined here.
-const machine_pin_obj_t machine_pin_obj[] = {
-    {{&machine_pin_type}, PIN_PA16}, // RX_D0
-    {{&machine_pin_type}, PIN_PA17}, // TX_D1
-    {{&machine_pin_type}, PIN_PA07}, // D2
-    {{&machine_pin_type}, PIN_PB22}, // D3
-    {{&machine_pin_type}, PIN_PA14}, // D4
-    {{&machine_pin_type}, PIN_PA15}, // D5
-    {{NULL}, -1}, // D6- not terminated on breakout.
-    {{&machine_pin_type}, PIN_PA18}, // D7
-    {{NULL}, -1}, // D8- not terminated on breakout.
-    {{&machine_pin_type}, PIN_PA19}, // D9
-    {{&machine_pin_type}, PIN_PA20}, // D10
-    {{&machine_pin_type}, PIN_PA21}, // D11
-    {{&machine_pin_type}, PIN_PA23}, // D12
-    {{&machine_pin_type}, PIN_PA22}, // D13
-    {{&machine_pin_type}, PIN_PA02},     // A0
-    {{&machine_pin_type}, PIN_PA05}, // A1
-    {{&machine_pin_type}, PIN_PB08}, // A2
-    {{&machine_pin_type}, PIN_PB09}, // A3
-    {{&machine_pin_type}, PIN_PA04}, // A4
-    {{&machine_pin_type}, PIN_PA06}, // A5
-};
-
-const machine_led_obj_t machine_led_obj[] = {
-    {{&machine_led_type}, PIN_PA22}, // D13
-};
diff --git a/ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/pins.csv b/ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/pins.csv
new file mode 100644
index 0000000000000..90e38761a10ce
--- /dev/null
+++ b/ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/pins.csv
@@ -0,0 +1,36 @@
+# Pin rows contain Pin number and pin name.
+# Pin rows start with PIN_
+# LED rows start with LED_
+# If the pin name is omitted, the pin number is added as name.
+# Rows for empty entries have to start with '-'
+# Empty lines and lines starting with # are ignored
+
+PIN_PA16,D0
+PIN_PA17,D1
+PIN_PA07,D2
+PIN_PB22,D3
+PIN_PA14,D4
+PIN_PA15,D5
+-
+PIN_PA18,D7
+-
+PIN_PA19,D9
+PIN_PA20,D10
+PIN_PA21,D11
+PIN_PA23,D12
+PIN_PA22,D13
+PIN_PA02,A0
+PIN_PA05,A1
+PIN_PB08,A2
+PIN_PB09,A3
+PIN_PA04,A4
+PIN_PA06,A5
+PIN_PA12,SDA
+PIN_PA13,SCL
+PIN_PA00,MO
+PIN_PB23,MI
+PIN_PA01,SCK
+PIN_PB02,DOTSTAR_CLK
+PIN_PB03,DOTSTAR_DATA
+
+LED_PA22,LED
diff --git a/ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/pins.h b/ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/pins.h
deleted file mode 100644
index 45bee6167837c..0000000000000
--- a/ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/pins.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2021 Peter van der Burg
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- * Used by machine_pin.c & board specific pins.c. Holds Board/MCU specific Pin
- * allocations.
- */
-
-typedef struct _machine_pin_obj_t {
-    mp_obj_base_t base;
-    uint32_t id;
-} machine_pin_obj_t;
-
-typedef struct _machine_led_obj_t {
-    mp_obj_base_t base;
-    uint32_t id;
-} machine_led_obj_t;
-
-// MUST explicitly hold array # of rows, else machine_pin.c wont compile.
-extern const machine_pin_obj_t machine_pin_obj[20];
-extern const machine_led_obj_t machine_led_obj[1];
diff --git a/ports/samd/boards/ADAFRUIT_TRINKET_M0/pins.c b/ports/samd/boards/ADAFRUIT_TRINKET_M0/pins.c
deleted file mode 100644
index 676b4794e89b6..0000000000000
--- a/ports/samd/boards/ADAFRUIT_TRINKET_M0/pins.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2021 Peter van der Burg
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- * Used by machine_pin.c. Holds Board/MCU specific Pin allocations.
- */
-
-#include "modmachine.h"
-#include "sam.h"
-#include "pins.h"
-
-// Ensure Declaration in 'pins.h' reflects # of Pins defined here.
-const machine_pin_obj_t machine_pin_obj[] = {
-    {{&machine_pin_type}, PIN_PA08}, // D0
-    {{&machine_pin_type}, PIN_PA02}, // D1
-    {{&machine_pin_type}, PIN_PA09}, // D2
-    {{&machine_pin_type}, PIN_PA07}, // D3/ RxD
-    {{&machine_pin_type}, PIN_PA06}, // D4/ TxD
-};
-
-const machine_led_obj_t machine_led_obj[] = {
-    {{&machine_led_type}, PIN_PA10}, // user LED
-};
diff --git a/ports/samd/boards/ADAFRUIT_TRINKET_M0/pins.csv b/ports/samd/boards/ADAFRUIT_TRINKET_M0/pins.csv
new file mode 100644
index 0000000000000..797b3f70bb921
--- /dev/null
+++ b/ports/samd/boards/ADAFRUIT_TRINKET_M0/pins.csv
@@ -0,0 +1,16 @@
+# Pin rows contain Pin number and pin name.
+# Pin rows start with PIN_
+# LED rows start with LED_
+# If the pin name is omitted, the pin number is added as name.
+# Rows for empty entries have to start with '-'
+# Empty lines and lines starting with # are ignored
+
+PIN_PA08,D0
+PIN_PA02,D1
+PIN_PA09,D2
+PIN_PA07,D3
+PIN_PA06,D4
+PIN_PA00,DOTSTAR_DATA
+PIN_PA01,DOTSTAR_CLK
+
+LED_PA10,LED
diff --git a/ports/samd/boards/ADAFRUIT_TRINKET_M0/pins.h b/ports/samd/boards/ADAFRUIT_TRINKET_M0/pins.h
deleted file mode 100644
index 843d69addc0f2..0000000000000
--- a/ports/samd/boards/ADAFRUIT_TRINKET_M0/pins.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2021 Peter van der Burg
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- * Used by machine_pin.c & board specific pins.c. Holds Board/MCU specific Pin
- * allocations.
- */
-
-typedef struct _machine_pin_obj_t {
-    mp_obj_base_t base;
-    uint32_t id;
-} machine_pin_obj_t;
-
-typedef struct _machine_led_obj_t {
-    mp_obj_base_t base;
-    uint32_t id;
-} machine_led_obj_t;
-
-// MUST explicitly hold array # of rows, else machine_pin.c wont compile.
-extern const machine_pin_obj_t machine_pin_obj[5];
-extern const machine_led_obj_t machine_led_obj[1];
diff --git a/ports/samd/boards/MINISAM_M4/pins.c b/ports/samd/boards/MINISAM_M4/pins.c
deleted file mode 100644
index 17ed58d3c4182..0000000000000
--- a/ports/samd/boards/MINISAM_M4/pins.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2021 Peter van der Burg
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- * Used by machine_pin.c. Holds Board/MCU specific Pin allocations.
- */
-
-#include "modmachine.h"
-#include "sam.h"
-#include "pins.h"
-
-// Ensure Declaration in 'pins.h' reflects # of Pins defined here.
-const machine_pin_obj_t machine_pin_obj[] = {
-    {{&machine_pin_type}, PIN_PA02}, // A0,D9
-    {{&machine_pin_type}, PIN_PB08}, // A1,D10
-    {{&machine_pin_type}, PIN_PB09}, // A2,D11
-    {{&machine_pin_type}, PIN_PA04}, // A3,D12
-    {{&machine_pin_type}, PIN_PA05}, // A4,D13
-    {{&machine_pin_type}, PIN_PA06}, // A5
-    {{&machine_pin_type}, PIN_PA16}, // RX_D0
-    {{&machine_pin_type}, PIN_PA17}, // TX_D1
-    {{&machine_pin_type}, PIN_PA07}, // D2,A6
-    {{&machine_pin_type}, PIN_PA19}, // D3
-    {{&machine_pin_type}, PIN_PA20}, // D4
-    {{&machine_pin_type}, PIN_PA21}, // D5
-    {{&machine_pin_type}, PIN_PA00}, // BUTTON
-};
-
-const machine_led_obj_t machine_led_obj[] = {
-    {{&machine_led_type}, PIN_PA15}, // LED
-};
diff --git a/ports/samd/boards/MINISAM_M4/pins.csv b/ports/samd/boards/MINISAM_M4/pins.csv
new file mode 100644
index 0000000000000..7442a028d12a5
--- /dev/null
+++ b/ports/samd/boards/MINISAM_M4/pins.csv
@@ -0,0 +1,27 @@
+# Pin rows contain Pin number and pin name.
+# Pin rows start with PIN_
+# LED rows start with LED_
+# If the pin name is omitted, the pin number is added as name.
+# Rows for empty entries have to start with '-'
+# Empty lines and lines starting with # are ignored
+
+PIN_PA02,A0_D9
+PIN_PB08,A1_D10
+PIN_PB09,A2_D11
+PIN_PA04,A3_D12
+PIN_PA05,A4_D13
+PIN_PA06,A5
+PIN_PA16,D0
+PIN_PA17,D1
+PIN_PA07,A6_D2
+PIN_PA19,D3
+PIN_PA20,D4
+PIN_PA21,D5
+PIN_PA00,BUTTON
+PIN_PA03,AREF
+PIN_PA12,SDA
+PIN_PA13,SCL
+PIN_PB03,DOTSTAR_DATA
+PIN_PB02,DOTSTAR_CLK
+
+LED_PA15,LED
diff --git a/ports/samd/boards/MINISAM_M4/pins.h b/ports/samd/boards/MINISAM_M4/pins.h
deleted file mode 100644
index 892b0e7b9763d..0000000000000
--- a/ports/samd/boards/MINISAM_M4/pins.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2021 Peter van der Burg
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- * Used by machine_pin.c & board specific pins.c. Holds Board/MCU specific Pin
- * allocations.
- */
-
-typedef struct _machine_pin_obj_t {
-    mp_obj_base_t base;
-    uint32_t id;
-} machine_pin_obj_t;
-
-typedef struct _machine_led_obj_t {
-    mp_obj_base_t base;
-    uint32_t id;
-} machine_led_obj_t;
-
-// MUST explicitly hold array # of rows, else machine_pin.c wont compile.
-extern const machine_pin_obj_t machine_pin_obj[13];
-extern const machine_led_obj_t machine_led_obj[1];
diff --git a/ports/samd/boards/SAMD21_XPLAINED_PRO/pins.c b/ports/samd/boards/SAMD21_XPLAINED_PRO/pins.c
deleted file mode 100644
index 35718ea7f3d7f..0000000000000
--- a/ports/samd/boards/SAMD21_XPLAINED_PRO/pins.c
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2021 Peter van der Burg
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- * Used by machine_pin.c. Holds Board/MCU specific Pin allocations.
- */
-
-#include "modmachine.h"
-#include "sam.h"
-#include "pins.h"
-
-// Ensure Declaration in 'pins.h' reflects # of Pins defined here.
-const machine_pin_obj_t machine_pin_obj[] = {
-    // EXT1
-    {{&machine_pin_type}, PIN_PB00}, // PIN3_ADC(+)
-    {{&machine_pin_type}, PIN_PB01}, // PIN4_ADC(-)
-    {{&machine_pin_type}, PIN_PB06}, // PIN5_GPIO
-    {{&machine_pin_type}, PIN_PB07}, // PIN6_GPIO
-    {{&machine_pin_type}, PIN_PB02}, // PIN7_PWM(+)
-    {{&machine_pin_type}, PIN_PB03}, // PIN8_PWM(-)
-    {{&machine_pin_type}, PIN_PB04}, // PIN9_IRQ/GPIO
-    {{&machine_pin_type}, PIN_PB05}, // PIN10_SPI_SS_B/GPIO
-    {{&machine_pin_type}, PIN_PA08}, // PIN11_TWI_SDA
-    {{&machine_pin_type}, PIN_PA09}, // PIN12_TWI_SCL
-    {{&machine_pin_type}, PIN_PB09}, // PIN13_UART_RX
-    {{&machine_pin_type}, PIN_PB08}, // PIN14_UART_TX
-    {{&machine_pin_type}, PIN_PA05}, // PIN15_SPI_SS_A
-    {{&machine_pin_type}, PIN_PA06}, // PIN16_SPI_MOSI
-    {{&machine_pin_type}, PIN_PA04}, // PIN17_SPI_MISO
-    {{&machine_pin_type}, PIN_PA07}, // PIN18_SPI_SCK
-
-    // EXT2
-    {{&machine_pin_type}, PIN_PA10}, // PIN3_ADC(+)
-    {{&machine_pin_type}, PIN_PA11}, // PIN4_ADC(-)
-    {{&machine_pin_type}, PIN_PA20}, // PIN5_GPIO
-    {{&machine_pin_type}, PIN_PA21}, // PIN6_GPIO
-    {{&machine_pin_type}, PIN_PB12}, // PIN7_PWM(+)
-    {{&machine_pin_type}, PIN_PB13}, // PIN8_PWM(-)
-    {{&machine_pin_type}, PIN_PB14}, // PIN9_IRQ/GPIO
-    {{&machine_pin_type}, PIN_PB15}, // PIN10_SPI_SS_B/GPIO
-    {{NULL}, -1}, // PIN_PA08/ PIN11_TWI_SDA already defined
-    {{NULL}, -1}, // PIN_PA09/ PIN12_TWI_SCL already defined
-    {{&machine_pin_type}, PIN_PB11}, // PIN13_UART_RX
-    {{&machine_pin_type}, PIN_PB10}, // PIN14_UART_TX
-    {{&machine_pin_type}, PIN_PA17}, // PIN15_SPI_SS_A
-    {{&machine_pin_type}, PIN_PA18}, // PIN16_SPI_MOSI
-    {{&machine_pin_type}, PIN_PA16}, // PIN17_SPI_MISO
-    {{&machine_pin_type}, PIN_PA19}, // PIN18_SPI_SCK
-
-    // EXT3
-    {{&machine_pin_type}, PIN_PA02}, // PIN3_ADC(+)
-    {{&machine_pin_type}, PIN_PA03}, // PIN4_ADC(-)
-    {{NULL}, -1}, // PIN_PB30/ PIN5_GPIO already defined
-    {{&machine_pin_type}, PIN_PA15}, // PIN6_GPIO; USER_BUTTON
-    {{&machine_pin_type}, PIN_PA12}, // PIN7_PWM(+)
-    {{&machine_pin_type}, PIN_PA13}, // PIN8_PWM(-)
-    {{&machine_pin_type}, PIN_PA28}, // PIN9_IRQ/GPIO
-    {{&machine_pin_type}, PIN_PA27}, // PIN10_SPI_SS_B/GPIO
-    {{NULL}, -1}, // PIN_PA08/ PIN11_TWI_SDA already defined
-    {{NULL}, -1}, // PIN_PA09/ PIN12_TWI_SCL already defined
-    {{NULL}, -1}, // PIN_PB11/ PIN13_UART_RX already defined
-    {{NULL}, -1}, // PIN_PB10/ PIN14_UART_TX already defined
-    {{&machine_pin_type}, PIN_PB17}, // PIN15_SPI_SS_A
-    {{&machine_pin_type}, PIN_PB22}, // PIN16_SPI_MOSI
-    {{&machine_pin_type}, PIN_PB16}, // PIN17_SPI_MISO
-    {{&machine_pin_type}, PIN_PB23}, // PIN18_SPI_SCK
-};
-
-const machine_led_obj_t machine_led_obj[] = {
-    {{&machine_led_type}, PIN_PB30}, // USER_LED
-};
diff --git a/ports/samd/boards/SAMD21_XPLAINED_PRO/pins.csv b/ports/samd/boards/SAMD21_XPLAINED_PRO/pins.csv
new file mode 100644
index 0000000000000..438119d90c1a8
--- /dev/null
+++ b/ports/samd/boards/SAMD21_XPLAINED_PRO/pins.csv
@@ -0,0 +1,63 @@
+# Pin rows contain Pin number and pin name.
+# Pin rows start with PIN_
+# LED rows start with LED_
+# If the pin name is omitted, the pin number is added as name.
+# Rows for empty entries have to start with '-'
+# Empty lines and lines starting with # are ignored
+
+# EXT1
+PIN_PB00,EXT1_PIN3
+PIN_PB01,EXT1_PIN4
+PIN_PB06,EXT1_PIN5
+PIN_PB07,EXT1_PIN6
+PIN_PB02,EXT1_PIN7
+PIN_PB03,EXT1_PIN8
+PIN_PB04,EXT1_PIN9
+PIN_PB05,EXT1_PIN10
+PIN_PA08,EXT1_PIN11
+PIN_PA09,EXT1_PIN12
+PIN_PB09,EXT1_PIN13
+PIN_PB08,EXT1_PIN14
+PIN_PA05,EXT1_PIN15
+PIN_PA06,EXT1_PIN16
+PIN_PA04,EXT1_PIN17
+PIN_PA07,EXT1_PIN18
+
+# EXT2
+PIN_PA10,EXT2_PIN3
+PIN_PA11,EXT2_PIN4
+PIN_PA20,EXT2_PIN5
+PIN_PA21,EXT2_PIN6
+PIN_PB12,EXT2_PIN7
+PIN_PB13,EXT2_PIN8
+PIN_PB14,EXT2_PIN9
+PIN_PB15,EXT2_PIN10
+-
+-
+PIN_PB11,EXT2_PIN13
+PIN_PB10,EXT2_PIN14
+PIN_PA17,EXT2_PIN15
+PIN_PA18,EXT2_PIN16
+PIN_PA16,EXT2_PIN17
+PIN_PA19,EXT2_PIN18
+
+# EXT3
+PIN_PA02,EXT3_PIN3
+PIN_PA03,EXT3_PIN4
+-
+PIN_PA15,EXT3_PIN6
+PIN_PA12,EXT3_PIN7
+PIN_PA13,EXT3_PIN8
+PIN_PA28,EXT3_PIN9
+PIN_PA27,EXT3_PIN10
+-
+-
+-
+-
+PIN_PB17,EXT3_PIN15
+PIN_PB22,EXT3_PIN16
+PIN_PB16,EXT3_PIN17
+PIN_PB23,EXT3_PIN18
+
+LED_PB30,LED
+
diff --git a/ports/samd/boards/SAMD21_XPLAINED_PRO/pins.h b/ports/samd/boards/SAMD21_XPLAINED_PRO/pins.h
deleted file mode 100644
index 0b0e878b43e1f..0000000000000
--- a/ports/samd/boards/SAMD21_XPLAINED_PRO/pins.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2021 Peter van der Burg
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- * Used by machine_pin.c & board specific pins.c. Holds Board/MCU specific Pin
- * allocations.
- */
-
-typedef struct _machine_pin_obj_t {
-    mp_obj_base_t base;
-    uint32_t id;
-} machine_pin_obj_t;
-
-typedef struct _machine_led_obj_t {
-    mp_obj_base_t base;
-    uint32_t id;
-} machine_led_obj_t;
-
-// MUST explicitly hold array # of rows, else machine_pin.c wont compile.
-extern const machine_pin_obj_t machine_pin_obj[48];
-extern const machine_led_obj_t machine_led_obj[1];
diff --git a/ports/samd/boards/SEEED_WIO_TERMINAL/pins.c b/ports/samd/boards/SEEED_WIO_TERMINAL/pins.c
deleted file mode 100644
index d7833416d3c73..0000000000000
--- a/ports/samd/boards/SEEED_WIO_TERMINAL/pins.c
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2021 Peter van der Burg
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- * Used by machine_pin.c. Holds Board/MCU specific Pin allocations.
- */
-
-#include "modmachine.h"
-#include "sam.h"
-#include "pins.h"
-
-// Ensure Declaration in "pins.h" reflects # of Pins defined here.
-const machine_pin_obj_t machine_pin_obj[] = {
-    {{&machine_pin_type}, PIN_PB08}, // A0/D0
-    {{&machine_pin_type}, PIN_PB09}, // A1/D1
-    {{&machine_pin_type}, PIN_PA07}, // A2/D2
-    {{&machine_pin_type}, PIN_PB04}, // A3/D3
-    {{&machine_pin_type}, PIN_PB05}, // A4/D4
-    {{&machine_pin_type}, PIN_PB06}, // A5/D5
-    {{&machine_pin_type}, PIN_PA04}, // A6/D6
-    {{&machine_pin_type}, PIN_PB07}, // A7/D7
-    {{&machine_pin_type}, PIN_PA06}, // A8/D8
-    {{&machine_pin_type}, PIN_PD08}, // SWITCH_X
-    {{&machine_pin_type}, PIN_PD09}, // SWITCH_Y
-    {{&machine_pin_type}, PIN_PD10}, // SWITCH_Z
-    {{&machine_pin_type}, PIN_PD12}, // SWITCH_B
-    {{&machine_pin_type}, PIN_PD20}, // SWITCH_U
-    {{&machine_pin_type}, PIN_PC26}, // BUTTON_1
-    {{&machine_pin_type}, PIN_PC27}, // BUTTON_2
-    {{&machine_pin_type}, PIN_PC28}, // BUTTON_3
-    {{&machine_pin_type}, PIN_PD11}, // BUZZER_CTR
-    {{&machine_pin_type}, PIN_PC14}, // 5V_OUTPUT_CTR- enable 5V on hdr
-    {{&machine_pin_type}, PIN_PC15}, // 3V3_OUTPUT_CTR- enable 3V3 on hdr
-};
-
-// Ensure Declaration in 'pins.h' reflects # of Pins defined here.
-const machine_led_obj_t machine_led_obj[] = {
-    {{&machine_led_type}, PIN_PA15}, // USER_LED (Blue)
-    {{&machine_led_type}, PIN_PC05}, // LCD_BACKLIGHT_CTR
-};
diff --git a/ports/samd/boards/SEEED_WIO_TERMINAL/pins.csv b/ports/samd/boards/SEEED_WIO_TERMINAL/pins.csv
new file mode 100644
index 0000000000000..72da71224a4d4
--- /dev/null
+++ b/ports/samd/boards/SEEED_WIO_TERMINAL/pins.csv
@@ -0,0 +1,30 @@
+# Pin rows contain Pin number and pin name.
+# Pin rows start with PIN_
+# LED rows start with LED_
+# If the pin name is omitted, the pin number is added as name.
+# Rows for empty entries have to start with '-'
+# Empty lines and lines starting with # are ignored
+
+PIN_PB08,A0_D0
+PIN_PB09,A1_D1
+PIN_PA07,A2_D2
+PIN_PB04,A3_D3
+PIN_PB05,A4_D4
+PIN_PB06,A5_D5
+PIN_PA04,A6_D6
+PIN_PB07,A7_D7
+PIN_PA06,A8_D8
+PIN_PD08,SWITCH_X
+PIN_PD09,SWITCH_Y
+PIN_PD10,SWITCH_Z
+PIN_PD12,SWITCH_B
+PIN_PD20,SWITCH_U
+PIN_PC26,BUTTON_1
+PIN_PC27,BUTTON_2
+PIN_PC28,BUTTON_3
+PIN_PD11,BUZZER_CTR
+PIN_PC14,5V_ENABLE
+PIN_PC15,3V3_ENABLE
+
+LED_PA15,LED_BLUE
+LED_PC05,LED_LCD
diff --git a/ports/samd/boards/SEEED_WIO_TERMINAL/pins.h b/ports/samd/boards/SEEED_WIO_TERMINAL/pins.h
deleted file mode 100644
index 45ecc254f11ee..0000000000000
--- a/ports/samd/boards/SEEED_WIO_TERMINAL/pins.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2021 Peter van der Burg
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- * Used by machine_pin.c & board specific pins.c. Holds Board/MCU specific Pin
- * allocations.
- */
-
-typedef struct _machine_pin_obj_t {
-    mp_obj_base_t base;
-    uint32_t id;
-} machine_pin_obj_t;
-
-typedef struct _machine_led_obj_t {
-    mp_obj_base_t base;
-    uint32_t id;
-} machine_led_obj_t;
-
-// MUST explicitly hold array # of rows, else machine_pin.c wont compile.
-extern const machine_pin_obj_t machine_pin_obj[20];
-extern const machine_led_obj_t machine_led_obj[2];
diff --git a/ports/samd/boards/SEEED_XIAO/pins.c b/ports/samd/boards/SEEED_XIAO/pins.c
deleted file mode 100644
index e2f7c264b4bda..0000000000000
--- a/ports/samd/boards/SEEED_XIAO/pins.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2021 Peter van der Burg
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- * Used by machine_pin.c. Holds Board/MCU specific Pin allocations.
- */
-
-#include "modmachine.h"
-#include "sam.h"
-#include "pins.h"
-
-// Ensure Declaration in 'pins.h' reflects # of Pins defined here.
-const machine_pin_obj_t machine_pin_obj[] = {
-    {{&machine_pin_type}, PIN_PA02}, // A0/D0
-    {{&machine_pin_type}, PIN_PA04}, // A1/D1
-    {{&machine_pin_type}, PIN_PA10}, // A2/D2
-    {{&machine_pin_type}, PIN_PA11}, // A3/D3
-    {{&machine_pin_type}, PIN_PA08}, // A4/D4
-    {{&machine_pin_type}, PIN_PA09}, // A5/D5
-    {{&machine_pin_type}, PIN_PB08}, // A6/D6
-    {{&machine_pin_type}, PIN_PB09}, // A7/D7
-    {{&machine_pin_type}, PIN_PA07}, // A8/D8
-    {{&machine_pin_type}, PIN_PA05}, // A9/D9
-    {{&machine_pin_type}, PIN_PA06}, // A10/D10
-};
-
-const machine_led_obj_t machine_led_obj[] = {
-// XIAO: Just the available LED Pins: User LED (PA17), Rx & Tx.
-    {{&machine_led_type}, PIN_PA17}, // W13
-    {{&machine_led_type}, PIN_PA18}, // RX_LED
-    {{&machine_led_type}, PIN_PA19}, // TX_LED
-};
diff --git a/ports/samd/boards/SEEED_XIAO/pins.csv b/ports/samd/boards/SEEED_XIAO/pins.csv
new file mode 100644
index 0000000000000..8a70a77145639
--- /dev/null
+++ b/ports/samd/boards/SEEED_XIAO/pins.csv
@@ -0,0 +1,22 @@
+# Pin rows contain Pin number and pin name.
+# Pin rows start with PIN_
+# LED rows start with LED_
+# If the pin name is omitted, the pin number is added as name.
+# Rows for empty entries have to start with '-'
+# Empty lines and lines starting with # are ignored
+
+PIN_PA02,A0_D0
+PIN_PA04,A1_D1
+PIN_PA10,A2_D2
+PIN_PA11,A3_D3
+PIN_PA08,A4_D4
+PIN_PA09,A5_D5
+PIN_PB08,A6_D6
+PIN_PB09,A7_D7
+PIN_PA07,A8_D8
+PIN_PA05,A9_D9
+PIN_PA06,A10_D10
+
+LED_PA17,USER_LED
+LED_PA18,RX_LED
+LED_PA19,TX_LED
diff --git a/ports/samd/boards/SEEED_XIAO/pins.h b/ports/samd/boards/SEEED_XIAO/pins.h
deleted file mode 100644
index 226b3f1d7b07a..0000000000000
--- a/ports/samd/boards/SEEED_XIAO/pins.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2021 Peter van der Burg
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- * Used by machine_pin.c & board specific pins.c. Holds Board/MCU specific Pin
- * allocations.
- */
-
-typedef struct _machine_pin_obj_t {
-    mp_obj_base_t base;
-    uint32_t id;
-} machine_pin_obj_t;
-
-typedef struct _machine_led_obj_t {
-    mp_obj_base_t base;
-    uint32_t id;
-} machine_led_obj_t;
-
-// MUST explicitly hold array # of rows, else machine_pin.c wont compile.
-extern const machine_pin_obj_t machine_pin_obj[11];
-extern const machine_led_obj_t machine_led_obj[3];
diff --git a/ports/samd/boards/make-pins.py b/ports/samd/boards/make-pins.py
new file mode 100644
index 0000000000000..400a9c9b8870f
--- /dev/null
+++ b/ports/samd/boards/make-pins.py
@@ -0,0 +1,126 @@
+#!/usr/bin/env python
+"""Generates the pins file for the SAMD port."""
+
+from __future__ import print_function
+
+import argparse
+import sys
+import csv
+
+pins_header_prefix = """// This file was automatically generated by make-pins.py
+//
+typedef struct _machine_pin_obj_t {
+    mp_obj_base_t base;
+    uint32_t id;
+    char *name;
+} machine_pin_obj_t;
+
+"""
+
+led_header_prefix = """typedef struct _machine_led_obj_t {
+    mp_obj_base_t base;
+    uint32_t id;
+    char *name;
+} machine_led_obj_t;
+
+"""
+
+
+class Pins:
+    def __init__(self):
+        self.board_pins = []  # list of pin objects
+        self.board_leds = []  # list of led objects
+
+    def parse_csv_file(self, filename):
+        with open(filename, "r") as csvfile:
+            rows = csv.reader(csvfile)
+            for row in rows:
+                # Pin numbers must start with "PIN_"
+                # LED numbers must start with "LED_"
+                if len(row) > 0:
+                    if row[0].strip().startswith("PIN_"):
+                        if len(row) == 1:
+                            self.board_pins.append([row[0], row[0][4:]])
+                        else:
+                            self.board_pins.append([row[0], row[1]])
+                    elif row[0].strip().startswith("LED_"):
+                        self.board_leds.append(["PIN_" + row[0][4:], row[1]])
+                    elif row[0].strip().startswith("-"):
+                        self.board_pins.append(["-1", ""])
+
+    def print_pins(self, pins_filename):
+        with open(pins_filename, "wt") as pins_file:
+            pins_file.write("// This file was automatically generated by make-pins.py\n")
+            pins_file.write("//\n")
+            pins_file.write('#include "modmachine.h"\n')
+            pins_file.write('#include "sam.h"\n')
+            pins_file.write('#include "pins.h"\n\n')
+
+            pins_file.write("const machine_pin_obj_t machine_pin_obj[] = {\n")
+            for pin in self.board_pins:
+                pins_file.write("    {{&machine_pin_type}, ")
+                pins_file.write(pin[0] + ', "' + pin[1])
+                pins_file.write('"},\n')
+            pins_file.write("};\n")
+
+            if self.board_leds:
+                pins_file.write("\nconst machine_led_obj_t machine_led_obj[] = {\n")
+                for pin in self.board_leds:
+                    pins_file.write("    {{&machine_pin_type}, ")
+                    pins_file.write(pin[0] + ', "' + pin[1])
+                    pins_file.write('"},\n')
+                pins_file.write("};\n")
+
+    def print_header(self, hdr_filename):
+        with open(hdr_filename, "wt") as hdr_file:
+            hdr_file.write(pins_header_prefix)
+            if self.board_leds:
+                hdr_file.write(led_header_prefix)
+            hdr_file.write(
+                "extern const machine_pin_obj_t machine_pin_obj[%d];\n" % len(self.board_pins)
+            )
+            if self.board_leds:
+                hdr_file.write(
+                    "extern const machine_led_obj_t machine_led_obj[%d];\n" % len(self.board_leds)
+                )
+
+
+def main():
+    parser = argparse.ArgumentParser(
+        prog="make-pins.py",
+        usage="%(prog)s [options] [command]",
+        description="Generate board specific pin file",
+    )
+    parser.add_argument(
+        "-b",
+        "--board",
+        dest="csv_filename",
+        help="Specifies the pins.csv filename",
+    )
+    parser.add_argument(
+        "-p",
+        "--pins",
+        dest="pins_filename",
+        help="Specifies the name of the generated pins.c file",
+    )
+    parser.add_argument(
+        "-i",
+        "--inc",
+        dest="hdr_filename",
+        help="Specifies name of generated pin header file",
+    )
+    args = parser.parse_args(sys.argv[1:])
+
+    pins = Pins()
+
+    if args.csv_filename:
+        pins.parse_csv_file(args.csv_filename)
+
+    if args.pins_filename:
+        pins.print_pins(args.pins_filename)
+
+    pins.print_header(args.hdr_filename)
+
+
+if __name__ == "__main__":
+    main()

From a5d5ecbf8434e480b42a8a477ef9ba7979bba927 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sat, 4 Jun 2022 13:27:12 +0200
Subject: [PATCH 2674/3533] samd/boards: Move mcu-specific settings into a
 mpconfig_samdXX.h file.

Located at the boards directory. That way, the mpconfigboard.h files are
almost empty, just setting the board name and the MCU name.
---
 ports/samd/Makefile                           |  3 +++
 .../mpconfigboard.h                           | 10 ---------
 .../mpconfigboard.h                           | 15 -------------
 .../ADAFRUIT_TRINKET_M0/mpconfigboard.h       | 10 ---------
 ports/samd/boards/MINISAM_M4/mpconfigboard.h  | 15 -------------
 .../SAMD21_XPLAINED_PRO/mpconfigboard.h       | 10 ---------
 .../boards/SEEED_WIO_TERMINAL/mpconfigboard.h | 15 -------------
 ports/samd/boards/SEEED_XIAO/mpconfigboard.h  | 10 ---------
 ports/samd/boards/mpconfig_samd21.h           |  9 ++++++++
 ports/samd/boards/mpconfig_samd51.h           | 21 +++++++++++++++++++
 ports/samd/mpconfigport.h                     |  2 ++
 11 files changed, 35 insertions(+), 85 deletions(-)
 create mode 100644 ports/samd/boards/mpconfig_samd21.h
 create mode 100644 ports/samd/boards/mpconfig_samd51.h

diff --git a/ports/samd/Makefile b/ports/samd/Makefile
index 1ef35c1a025ea..4dd6356c1e0d4 100644
--- a/ports/samd/Makefile
+++ b/ports/samd/Makefile
@@ -50,6 +50,9 @@ CFLAGS_MCU_SAMD51 = -mtune=cortex-m4 -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-a
 CFLAGS = $(INC) -Wall -Werror -std=c99 -nostdlib -mthumb $(CFLAGS_MCU_$(MCU_SERIES)) -fsingle-precision-constant -Wdouble-promotion
 CFLAGS += -DMCU_$(MCU_SERIES) -D__$(CMSIS_MCU)__
 CFLAGS += $(CFLAGS_MOD) $(CFLAGS_EXTRA)
+CFLAGS += -DMPCONFIG_MCU_H='<boards/mpconfig_$(MCU_SERIES_LOWER).h>'
+
+QSTR_GLOBAL_DEPENDENCIES += boards/mpconfig_$(MCU_SERIES_LOWER).h
 
 LDFLAGS = -nostdlib $(addprefix -T,$(LD_FILES)) -Map=$@.map --cref
 LDFLAGS += $(LDFLAGS_MOD)
diff --git a/ports/samd/boards/ADAFRUIT_FEATHER_M0_EXPRESS/mpconfigboard.h b/ports/samd/boards/ADAFRUIT_FEATHER_M0_EXPRESS/mpconfigboard.h
index bdb22d2e0adf5..cec9e9ccdda46 100644
--- a/ports/samd/boards/ADAFRUIT_FEATHER_M0_EXPRESS/mpconfigboard.h
+++ b/ports/samd/boards/ADAFRUIT_FEATHER_M0_EXPRESS/mpconfigboard.h
@@ -1,12 +1,2 @@
 #define MICROPY_HW_BOARD_NAME "Feather M0 Express"
 #define MICROPY_HW_MCU_NAME   "SAMD21G18A"
-
-// MicroPython configs
-// samd_flash.c flash parameters
-// Build a 64k Flash storage at top. 256k-64k=196k
-// 256*1024=262144 minus 64*1024=65536 = 196608 = 0x30000
-#define MICROPY_HW_FLASH_STORAGE_BASE       (0x30000)
-#define MICROPY_HW_FLASH_STORAGE_BYTES      (0xFFFF)
-#define VFS_BLOCK_SIZE_BYTES                (1536) // 24x 64B flash pages;
-
-#define CPU_FREQ (48000000) // For selecting Baud from clock.
diff --git a/ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/mpconfigboard.h b/ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/mpconfigboard.h
index 80baf39e5d6db..2fffc9c7de28a 100644
--- a/ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/mpconfigboard.h
+++ b/ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/mpconfigboard.h
@@ -1,17 +1,2 @@
 #define MICROPY_HW_BOARD_NAME "ItsyBitsy M4 Express"
 #define MICROPY_HW_MCU_NAME   "SAMD51G19A"
-
-#define MICROPY_FLOAT_IMPL              (MICROPY_FLOAT_IMPL_FLOAT)
-#define MICROPY_PY_BUILTINS_COMPLEX     (0)
-#define MICROPY_PY_MATH                 (0)
-#define MICROPY_PY_CMATH                (0)
-
-// MicroPython configs
-// samd_flash.c flash parameters
-// Build a 128k Flash storage at top. 512k-128k=384k=0x60000
-// 512*1024= 0x80000 minus 128*1024= 0x20000 =  0x60000
-#define MICROPY_HW_FLASH_STORAGE_BASE       (0x60000)
-#define MICROPY_HW_FLASH_STORAGE_BYTES      (0x1FFFF)
-#define VFS_BLOCK_SIZE_BYTES                (1536) //
-
-#define CPU_FREQ (48000000) // For selecting Baud from clock.
diff --git a/ports/samd/boards/ADAFRUIT_TRINKET_M0/mpconfigboard.h b/ports/samd/boards/ADAFRUIT_TRINKET_M0/mpconfigboard.h
index 066c7ee1429e2..d3a6ba2d8687e 100644
--- a/ports/samd/boards/ADAFRUIT_TRINKET_M0/mpconfigboard.h
+++ b/ports/samd/boards/ADAFRUIT_TRINKET_M0/mpconfigboard.h
@@ -1,12 +1,2 @@
 #define MICROPY_HW_BOARD_NAME "Trinket M0"
 #define MICROPY_HW_MCU_NAME   "SAMD21E18A"
-
-// MicroPython configs
-// samd_flash.c flash parameters
-// Build a 64k Flash storage at top. 256k-64k=196k
-// 256*1024=262144 minus 64*1024=65536 = 196608 = 0x30000
-#define MICROPY_HW_FLASH_STORAGE_BASE       (0x30000)
-#define MICROPY_HW_FLASH_STORAGE_BYTES      (0xFFFF)
-#define VFS_BLOCK_SIZE_BYTES                (1536) // 24x 64B flash pages;
-
-#define CPU_FREQ (48000000) // For selecting Baud from clock.
diff --git a/ports/samd/boards/MINISAM_M4/mpconfigboard.h b/ports/samd/boards/MINISAM_M4/mpconfigboard.h
index a8f1f96242c8a..6715a16f01450 100644
--- a/ports/samd/boards/MINISAM_M4/mpconfigboard.h
+++ b/ports/samd/boards/MINISAM_M4/mpconfigboard.h
@@ -1,17 +1,2 @@
 #define MICROPY_HW_BOARD_NAME "Mini SAM M4"
 #define MICROPY_HW_MCU_NAME   "SAMD51G19A"
-
-#define MICROPY_FLOAT_IMPL              (MICROPY_FLOAT_IMPL_FLOAT)
-#define MICROPY_PY_BUILTINS_COMPLEX     (0)
-#define MICROPY_PY_MATH                 (0)
-#define MICROPY_PY_CMATH                (0)
-
-// MicroPython configs
-// samd_flash.c flash parameters
-// Build a 128k Flash storage at top. 512k-128k=384k=0x60000
-// 512*1024= 0x80000 minus 128*1024= 0x20000 =  0x60000
-#define MICROPY_HW_FLASH_STORAGE_BASE       (0x60000)
-#define MICROPY_HW_FLASH_STORAGE_BYTES      (0x1FFFF)
-#define VFS_BLOCK_SIZE_BYTES                (1536) //
-
-#define CPU_FREQ (48000000) // For selecting Baud from clock.
diff --git a/ports/samd/boards/SAMD21_XPLAINED_PRO/mpconfigboard.h b/ports/samd/boards/SAMD21_XPLAINED_PRO/mpconfigboard.h
index 860cb6b977783..c69b5b4c149de 100644
--- a/ports/samd/boards/SAMD21_XPLAINED_PRO/mpconfigboard.h
+++ b/ports/samd/boards/SAMD21_XPLAINED_PRO/mpconfigboard.h
@@ -1,12 +1,2 @@
 #define MICROPY_HW_BOARD_NAME "SAMD21-XPLAINED-PRO"
 #define MICROPY_HW_MCU_NAME   "SAMD21J18A"
-
-// MicroPython configs
-// samd_flash.c flash parameters
-// Build a 64k Flash storage at top. 256k-64k=196k
-// 256*1024=262144 minus 64*1024=65536 = 196608 = 0x30000
-#define MICROPY_HW_FLASH_STORAGE_BASE       (0x30000)
-#define MICROPY_HW_FLASH_STORAGE_BYTES      (0xFFFF)
-#define VFS_BLOCK_SIZE_BYTES                (1536) // 24x 64B flash pages;
-
-#define CPU_FREQ (48000000) // For selecting Baud from clock.
diff --git a/ports/samd/boards/SEEED_WIO_TERMINAL/mpconfigboard.h b/ports/samd/boards/SEEED_WIO_TERMINAL/mpconfigboard.h
index bb0f1c828e784..cfda18d11c965 100644
--- a/ports/samd/boards/SEEED_WIO_TERMINAL/mpconfigboard.h
+++ b/ports/samd/boards/SEEED_WIO_TERMINAL/mpconfigboard.h
@@ -1,17 +1,2 @@
 #define MICROPY_HW_BOARD_NAME "Wio Terminal D51R"
 #define MICROPY_HW_MCU_NAME   "SAMD51P19A"
-
-#define MICROPY_FLOAT_IMPL              (MICROPY_FLOAT_IMPL_FLOAT)
-#define MICROPY_PY_BUILTINS_COMPLEX     (0)
-#define MICROPY_PY_MATH                 (0)
-#define MICROPY_PY_CMATH                (0)
-
-// MicroPython configs
-// samd_flash.c flash parameters
-// Build a 128k Flash storage at top. 512k-128k=384k=0x60000
-// 512*1024= 0x80000 minus 128*1024= 0x20000 =  0x60000
-#define MICROPY_HW_FLASH_STORAGE_BASE       (0x60000)
-#define MICROPY_HW_FLASH_STORAGE_BYTES      (0x1FFFF)
-#define VFS_BLOCK_SIZE_BYTES                (1536) // 24x 64B flash pages;
-
-#define CPU_FREQ (48000000) // For selecting Baud from clock.
diff --git a/ports/samd/boards/SEEED_XIAO/mpconfigboard.h b/ports/samd/boards/SEEED_XIAO/mpconfigboard.h
index a2f2a9fb0b01c..2026efc6b153b 100644
--- a/ports/samd/boards/SEEED_XIAO/mpconfigboard.h
+++ b/ports/samd/boards/SEEED_XIAO/mpconfigboard.h
@@ -1,12 +1,2 @@
 #define MICROPY_HW_BOARD_NAME "Seeed Xiao"
 #define MICROPY_HW_MCU_NAME   "SAMD21G18A"
-
-// MicroPython configs
-// samd_flash.c flash parameters
-// Build a 64k Flash storage at top. 256k-64k=196k
-// 256*1024=262144 minus 64*1024=65536 = 196608 = 0x30000
-#define MICROPY_HW_FLASH_STORAGE_BASE       (0x30000)
-#define MICROPY_HW_FLASH_STORAGE_BYTES      (0xFFFF)
-#define VFS_BLOCK_SIZE_BYTES                (1536) // 24x 64B flash pages;
-
-#define CPU_FREQ (48000000) // For selecting Baud from clock.
diff --git a/ports/samd/boards/mpconfig_samd21.h b/ports/samd/boards/mpconfig_samd21.h
new file mode 100644
index 0000000000000..1924f66f06047
--- /dev/null
+++ b/ports/samd/boards/mpconfig_samd21.h
@@ -0,0 +1,9 @@
+// Deinitions common to all SAMD21 boards
+#include "samd21.h"
+
+#define MICROPY_HW_FLASH_STORAGE_BASE       (0x30000)
+#define MICROPY_HW_FLASH_STORAGE_BYTES      (0xFFFF)
+#define VFS_BLOCK_SIZE_BYTES                (1536) // 24x 64B flash pages;
+
+#define CPU_FREQ            (48000000)
+#define APB_FREQ            (48000000)
diff --git a/ports/samd/boards/mpconfig_samd51.h b/ports/samd/boards/mpconfig_samd51.h
new file mode 100644
index 0000000000000..1b67b1d02d5c0
--- /dev/null
+++ b/ports/samd/boards/mpconfig_samd51.h
@@ -0,0 +1,21 @@
+// Deinitions common to all SAMD51 boards
+#include "samd51.h"
+
+#define MICROPY_FLOAT_IMPL              (MICROPY_FLOAT_IMPL_FLOAT)
+#define MICROPY_PY_BUILTINS_COMPLEX     (0)
+#define MICROPY_PY_MATH                 (0)
+#define MICROPY_PY_CMATH                (0)
+
+// Due to a limitation in the TC counter for us, the ticks period is 2**29
+#define MICROPY_PY_UTIME_TICKS_PERIOD   (0x20000000)
+// MicroPython configs
+// samd_flash.c flash parameters
+// Build a 128k Flash storage at top. 512k-128k=384k=0x60000
+// 512*1024= 0x80000 minus 128*1024= 0x20000 =  0x60000
+#define MICROPY_HW_FLASH_STORAGE_BASE       (0x60000)
+#define MICROPY_HW_FLASH_STORAGE_BYTES      (0x1FFFF)
+#define VFS_BLOCK_SIZE_BYTES                (1536) //
+
+#define CPU_FREQ            (120000000)
+#define APB_FREQ            (48000000)
+#define DPLLx_REF_FREQ      (32768)
diff --git a/ports/samd/mpconfigport.h b/ports/samd/mpconfigport.h
index 2c6052149ba30..c29043c5d0a2a 100644
--- a/ports/samd/mpconfigport.h
+++ b/ports/samd/mpconfigport.h
@@ -28,6 +28,8 @@
 
 // Board specific definitions
 #include "mpconfigboard.h"
+// MCU-Specific definitions
+#include MPCONFIG_MCU_H
 
 // Memory allocation policies
 #define MICROPY_GC_STACK_ENTRY_TYPE         uint16_t

From c4f7c0b8a2504e8a13644ea692c4a66d6f124871 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sat, 4 Jun 2022 16:16:22 +0200
Subject: [PATCH 2675/3533] samd/Makefile: Alphabetically sort the source code
 files in Makefile.

---
 ports/samd/Makefile | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/ports/samd/Makefile b/ports/samd/Makefile
index 4dd6356c1e0d4..66e23bae69d0f 100644
--- a/ports/samd/Makefile
+++ b/ports/samd/Makefile
@@ -83,16 +83,16 @@ LDFLAGS += -L"$(shell dirname $(LIBSTDCPP_FILE_NAME))"
 endif
 
 SRC_C = \
-	main.c \
 	help.c \
+	machine_led.c \
+	machine_pin.c \
+	main.c \
 	modutime.c \
 	modmachine.c \
-	$(BUILD)/pins.c \
-	machine_pin.c \
-	machine_led.c \
 	modsamd.c \
-	samd_flash.c \
 	mphalport.c \
+	$(BUILD)/pins.c \
+	samd_flash.c \
 	samd_isr.c \
 	samd_soc.c \
 	tusb_port.c \
@@ -130,10 +130,10 @@ endif
 
 # List of sources for qstr extraction
 SRC_QSTR += \
+	machine_led.c \
+	machine_pin.c \
 	modutime.c \
 	modmachine.c \
-	machine_pin.c \
-	machine_led.c \
 	modsamd.c \
 	samd_flash.c \
 	shared/readline/readline.c \

From 949a808076f10f9f7e25fd9ebe4a03b8cc397e1f Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sat, 4 Jun 2022 15:42:56 +0200
Subject: [PATCH 2676/3533] samd/boards: Add ADAFRUIT_FEATHER_M4_EXPRESS and
 _ITSYBITSY_M0_EXPRESS.

These two boards are used for testing, so it is favorable to have them
added early.

The full test set is:
- ADAFRUIT_FEATHER_M4_EXPRESS: SAMD51 with 32kHz crystal.
- ADAFRUIT_ITSYBITSY_M0_EXPRESS: SAMD21 without crystal.
- ADAFRUIT_ITSYBITSY_M4_EXPRESS: SAMD51 without crystal.
- SEEED_XIAO: SAM21 with 32kHz crystal.
---
 .../ADAFRUIT_FEATHER_M4_EXPRESS/board.json    | 22 ++++++++++
 .../mpconfigboard.h                           |  2 +
 .../mpconfigboard.mk                          |  8 ++++
 .../ADAFRUIT_FEATHER_M4_EXPRESS/pins.csv      | 34 ++++++++++++++++
 .../ADAFRUIT_ITSYBITSY_M0_EXPRESS/board.json  | 20 ++++++++++
 .../mpconfigboard.h                           |  2 +
 .../mpconfigboard.mk                          |  8 ++++
 .../ADAFRUIT_ITSYBITSY_M0_EXPRESS/pins.csv    | 40 +++++++++++++++++++
 ports/samd/boards/samd51j19a.ld               | 17 ++++++++
 9 files changed, 153 insertions(+)
 create mode 100644 ports/samd/boards/ADAFRUIT_FEATHER_M4_EXPRESS/board.json
 create mode 100644 ports/samd/boards/ADAFRUIT_FEATHER_M4_EXPRESS/mpconfigboard.h
 create mode 100644 ports/samd/boards/ADAFRUIT_FEATHER_M4_EXPRESS/mpconfigboard.mk
 create mode 100644 ports/samd/boards/ADAFRUIT_FEATHER_M4_EXPRESS/pins.csv
 create mode 100644 ports/samd/boards/ADAFRUIT_ITSYBITSY_M0_EXPRESS/board.json
 create mode 100644 ports/samd/boards/ADAFRUIT_ITSYBITSY_M0_EXPRESS/mpconfigboard.h
 create mode 100644 ports/samd/boards/ADAFRUIT_ITSYBITSY_M0_EXPRESS/mpconfigboard.mk
 create mode 100644 ports/samd/boards/ADAFRUIT_ITSYBITSY_M0_EXPRESS/pins.csv
 create mode 100644 ports/samd/boards/samd51j19a.ld

diff --git a/ports/samd/boards/ADAFRUIT_FEATHER_M4_EXPRESS/board.json b/ports/samd/boards/ADAFRUIT_FEATHER_M4_EXPRESS/board.json
new file mode 100644
index 0000000000000..c8042aa254733
--- /dev/null
+++ b/ports/samd/boards/ADAFRUIT_FEATHER_M4_EXPRESS/board.json
@@ -0,0 +1,22 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [
+        "Battery Charging",
+        "Breadboard Friendly",
+        "Feather",
+        "Micro USB",
+        "RGB LED",
+        "SPI Flash"
+    ],
+    "images": [
+        "feather_m4_express.jpg"
+    ],
+    "mcu": "samd51",
+    "product": "Feather M4 Express",
+    "thumbnail": "",
+    "url": "https://www.adafruit.com/product/3857",
+    "vendor": "Adafruit"
+}
diff --git a/ports/samd/boards/ADAFRUIT_FEATHER_M4_EXPRESS/mpconfigboard.h b/ports/samd/boards/ADAFRUIT_FEATHER_M4_EXPRESS/mpconfigboard.h
new file mode 100644
index 0000000000000..48599eec47297
--- /dev/null
+++ b/ports/samd/boards/ADAFRUIT_FEATHER_M4_EXPRESS/mpconfigboard.h
@@ -0,0 +1,2 @@
+#define MICROPY_HW_BOARD_NAME "Feather M4 Express"
+#define MICROPY_HW_MCU_NAME   "SAMD51J19A"
diff --git a/ports/samd/boards/ADAFRUIT_FEATHER_M4_EXPRESS/mpconfigboard.mk b/ports/samd/boards/ADAFRUIT_FEATHER_M4_EXPRESS/mpconfigboard.mk
new file mode 100644
index 0000000000000..d29e2b1097b1f
--- /dev/null
+++ b/ports/samd/boards/ADAFRUIT_FEATHER_M4_EXPRESS/mpconfigboard.mk
@@ -0,0 +1,8 @@
+MCU_SERIES = SAMD51
+CMSIS_MCU = SAMD51J19A
+LD_FILES = boards/samd51j19a.ld sections.ld
+TEXT0 = 0x4000
+
+# The ?='s allow overriding in mpconfigboard.mk.
+# MicroPython settings
+MICROPY_VFS_LFS1 ?= 1
diff --git a/ports/samd/boards/ADAFRUIT_FEATHER_M4_EXPRESS/pins.csv b/ports/samd/boards/ADAFRUIT_FEATHER_M4_EXPRESS/pins.csv
new file mode 100644
index 0000000000000..5b999c39e0224
--- /dev/null
+++ b/ports/samd/boards/ADAFRUIT_FEATHER_M4_EXPRESS/pins.csv
@@ -0,0 +1,34 @@
+# Pin rows contain Pin number and pin name.
+# Pin rows start with PIN_
+# LED rows start with LED_
+# If the pin name is omitted, the pin number is added as name.
+# Rows for empty entries have to start with '-'
+# Empty lines and lines starting with PIN_ or LED_ are ignored
+
+PIN_PB17,D0
+PIN_PB16,D1
+PIN_PA14,D4
+PIN_PA16,D5
+PIN_PA18,D6
+-
+PIN_PB03,D8
+PIN_PA19,D9
+PIN_PA20,D10
+PIN_PA21,D11
+PIN_PA22,D12
+PIN_PA23,D13
+PIN_PA02,A0
+PIN_PA05,A1
+PIN_PB08,A2
+PIN_PB09,A3
+PIN_PA04,A4
+PIN_PB06,A5
+PIN_PA13,SCL
+PIN_PA12,SDA
+PIN_PB23,MOSI
+PIN_PB22,MISO
+PIN_PA17,SCK
+PIN_PB01,VDIV
+PIN_PA03,AREF
+
+LED_PA17,LED
diff --git a/ports/samd/boards/ADAFRUIT_ITSYBITSY_M0_EXPRESS/board.json b/ports/samd/boards/ADAFRUIT_ITSYBITSY_M0_EXPRESS/board.json
new file mode 100644
index 0000000000000..f99d19ca87f87
--- /dev/null
+++ b/ports/samd/boards/ADAFRUIT_ITSYBITSY_M0_EXPRESS/board.json
@@ -0,0 +1,20 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [
+        "Breadboard Friendly",
+        "Micro USB",
+        "RGB LED",
+        "SPI Flash"
+    ],
+    "images": [
+        "itsybitsy_m0_express.jpg"
+    ],
+    "mcu": "samd21",
+    "product": "ItsyBitsy M0 Express",
+    "thumbnail": "",
+    "url": "https://www.adafruit.com/product/3727",
+    "vendor": "Adafruit"
+}
diff --git a/ports/samd/boards/ADAFRUIT_ITSYBITSY_M0_EXPRESS/mpconfigboard.h b/ports/samd/boards/ADAFRUIT_ITSYBITSY_M0_EXPRESS/mpconfigboard.h
new file mode 100644
index 0000000000000..d647af9312eda
--- /dev/null
+++ b/ports/samd/boards/ADAFRUIT_ITSYBITSY_M0_EXPRESS/mpconfigboard.h
@@ -0,0 +1,2 @@
+#define MICROPY_HW_BOARD_NAME "ItsyBitsy M0 Express"
+#define MICROPY_HW_MCU_NAME   "SAMD21G18A"
diff --git a/ports/samd/boards/ADAFRUIT_ITSYBITSY_M0_EXPRESS/mpconfigboard.mk b/ports/samd/boards/ADAFRUIT_ITSYBITSY_M0_EXPRESS/mpconfigboard.mk
new file mode 100644
index 0000000000000..a760cf047e629
--- /dev/null
+++ b/ports/samd/boards/ADAFRUIT_ITSYBITSY_M0_EXPRESS/mpconfigboard.mk
@@ -0,0 +1,8 @@
+MCU_SERIES = SAMD21
+CMSIS_MCU = SAMD21G18A
+LD_FILES = boards/samd21x18a.ld sections.ld
+TEXT0 = 0x2000
+
+# The ?='s allow overriding in mpconfigboard.mk.
+# MicroPython settings
+MICROPY_VFS_LFS1 ?= 1
diff --git a/ports/samd/boards/ADAFRUIT_ITSYBITSY_M0_EXPRESS/pins.csv b/ports/samd/boards/ADAFRUIT_ITSYBITSY_M0_EXPRESS/pins.csv
new file mode 100644
index 0000000000000..50c3c1cf68f51
--- /dev/null
+++ b/ports/samd/boards/ADAFRUIT_ITSYBITSY_M0_EXPRESS/pins.csv
@@ -0,0 +1,40 @@
+# Pin rows contain Pin number and pin name.
+# Pin rows start with PIN_
+# LED rows start with LED_
+# If the pin name is omitted, the pin number is added as name.
+# Rows for empty entries have to start with '-'
+# Empty lines and lines not starting with PIN_ or LED_ are ignored
+
+PIN_PA11,D0
+PIN_PA10,D1
+PIN_PA14,D2
+PIN_PB09,D3
+PIN_PA08,D4
+PIN_PA15,D5
+-
+PIN_PA21,D7
+-
+PIN_PA07,D9
+PIN_PA18,D10
+PIN_PA16,D11
+PIN_PA19,D12
+PIN_PA17,D13
+PIN_PA02,A0
+PIN_PB08,A1
+PIN_PB09,A2
+PIN_PA04,A3
+PIN_PA05,A4
+PIN_PB02,A5
+PIN_PA22,SDA
+PIN_PA23,SCL
+PIN_PB10,MO
+PIN_PA12,MI
+PIN_PB11,SCK
+PIN_PA00,DOTSTAR_CLK
+PIN_PA01,DOTSTAR_DATA
+PIN_PB22,FLASH_MOSI
+PIN_PB03,FLASH_MISO
+PIN_PB23,FLASH_SCK
+PIN_PA27,FLASH_CS
+
+LED_PA17,LED
diff --git a/ports/samd/boards/samd51j19a.ld b/ports/samd/boards/samd51j19a.ld
new file mode 100644
index 0000000000000..e0baa9bba0281
--- /dev/null
+++ b/ports/samd/boards/samd51j19a.ld
@@ -0,0 +1,17 @@
+/*
+    GNU linker script for SAMD51
+*/
+
+/* Specify the memory areas */
+MEMORY
+{
+    FLASH (rx)  : ORIGIN = 0x00004000, LENGTH = 512K - 16K
+    RAM (xrw)   : ORIGIN = 0x20000000, LENGTH = 192K
+}
+
+/* Top end of the stack, with room for double-tap variable */
+_estack = ORIGIN(RAM) + LENGTH(RAM) - 8;
+_sstack = _estack - 16K;
+
+_sheap = _ebss;
+_eheap = _sstack;

From b4d29fd47a52526bc9626e5dc28794fa1d95dcf2 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sat, 4 Jun 2022 16:31:46 +0200
Subject: [PATCH 2677/3533] samd/clock_config: Set up the clock configuration.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Clock settings:
- GCLK0: 48 MHz (SAMD21) or 120 MHz(SAMD51).
- GCLK1: 32768 Hz for driving the PLL.
- GCLK2: 48 MHz for tzhe peripheral clock.
- GCLK3: 1 MHz (SAMD21) or 8 MHz (SAMD51) for the µs ticks timer.
- GCLK8: 1 kHz for WDT (SAMD21 only).

If a 32 kHz crystal is present, it will be used as clock source.  Otherwise
the DFLL48M in open-loop mode is used.

GCLK0 for SAM51 can be changed between 48 MHz and 200 MHz.  The specified
range is 96 MHz - 120 MHz.
---
 ports/samd/Makefile       |   1 +
 ports/samd/clock_config.c | 348 ++++++++++++++++++++++++++++++++++++++
 ports/samd/clock_config.h |  33 ++++
 ports/samd/samd_soc.c     |  64 ++++---
 ports/samd/samd_soc.h     |  11 ++
 5 files changed, 430 insertions(+), 27 deletions(-)
 create mode 100644 ports/samd/clock_config.c
 create mode 100644 ports/samd/clock_config.h

diff --git a/ports/samd/Makefile b/ports/samd/Makefile
index 66e23bae69d0f..e3316a9d6c114 100644
--- a/ports/samd/Makefile
+++ b/ports/samd/Makefile
@@ -83,6 +83,7 @@ LDFLAGS += -L"$(shell dirname $(LIBSTDCPP_FILE_NAME))"
 endif
 
 SRC_C = \
+	clock_config.c \
 	help.c \
 	machine_led.c \
 	machine_pin.c \
diff --git a/ports/samd/clock_config.c b/ports/samd/clock_config.c
new file mode 100644
index 0000000000000..0f5634fdb7373
--- /dev/null
+++ b/ports/samd/clock_config.c
@@ -0,0 +1,348 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * This file provides functions for configuring the clocks.
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2022 Robert Hammelrath
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include <stdint.h>
+
+#include "py/runtime.h"
+#include "samd_soc.h"
+
+static uint32_t cpu_freq = CPU_FREQ;
+static uint32_t apb_freq = APB_FREQ;
+
+#if defined(MCU_SAMD21)
+int sercom_gclk_id[] = {
+    GCLK_CLKCTRL_ID_SERCOM0_CORE, GCLK_CLKCTRL_ID_SERCOM1_CORE,
+    GCLK_CLKCTRL_ID_SERCOM2_CORE, GCLK_CLKCTRL_ID_SERCOM3_CORE,
+    GCLK_CLKCTRL_ID_SERCOM4_CORE, GCLK_CLKCTRL_ID_SERCOM5_CORE
+};
+#elif defined(MCU_SAMD51)
+int sercom_gclk_id[] = {
+    SERCOM0_GCLK_ID_CORE, SERCOM1_GCLK_ID_CORE,
+    SERCOM2_GCLK_ID_CORE, SERCOM3_GCLK_ID_CORE,
+    SERCOM4_GCLK_ID_CORE, SERCOM5_GCLK_ID_CORE,
+    #if defined(SERCOM7_GCLK_ID_CORE)
+    SERCOM6_GCLK_ID_CORE, SERCOM7_GCLK_ID_CORE,
+    #endif
+};
+#endif
+
+uint32_t get_cpu_freq(void) {
+    return cpu_freq;
+}
+
+uint32_t get_apb_freq(void) {
+    return apb_freq;
+}
+
+#if defined(MCU_SAMD21)
+void set_cpu_freq(uint32_t cpu_freq_arg) {
+    cpu_freq = cpu_freq_arg;
+}
+
+#elif defined(MCU_SAMD51)
+void set_cpu_freq(uint32_t cpu_freq_arg) {
+    cpu_freq = cpu_freq_arg;
+
+    // Setup GCLK0 for 48MHz as default state to keep the MCU running during config change.
+    GCLK->GENCTRL[0].reg = GCLK_GENCTRL_RUNSTDBY | GCLK_GENCTRL_GENEN | GCLK_GENCTRL_SRC_DFLL;
+    while (GCLK->SYNCBUSY.bit.GENCTRL0) {
+    }
+
+    // Setup DPLL0 for 120 MHz
+    // first: disable DPLL0 in case it is running
+    OSCCTRL->Dpll[0].DPLLCTRLA.bit.ENABLE = 0;
+    while (OSCCTRL->Dpll[0].DPLLSYNCBUSY.bit.ENABLE == 1) {
+    }
+    // Now configure the registers
+    OSCCTRL->Dpll[0].DPLLCTRLB.reg = OSCCTRL_DPLLCTRLB_DIV(1) | OSCCTRL_DPLLCTRLB_LBYPASS |
+        OSCCTRL_DPLLCTRLB_REFCLK(0) | OSCCTRL_DPLLCTRLB_WUF | OSCCTRL_DPLLCTRLB_FILTER(0x01);
+
+    uint32_t div = cpu_freq / DPLLx_REF_FREQ;
+    uint32_t frac = (cpu_freq - div * DPLLx_REF_FREQ) / (DPLLx_REF_FREQ / 32);
+    OSCCTRL->Dpll[0].DPLLRATIO.reg = (frac << 16) + div - 1;
+    // enable it again
+    OSCCTRL->Dpll[0].DPLLCTRLA.reg = OSCCTRL_DPLLCTRLA_ENABLE | OSCCTRL_DPLLCTRLA_RUNSTDBY;
+
+    // Per errata 2.13.1
+    while (!(OSCCTRL->Dpll[0].DPLLSTATUS.bit.CLKRDY == 1)) {
+    }
+
+    // Setup GCLK0 for DPLL0 output (48 or 48-200MHz)
+    GCLK->GENCTRL[0].reg = GCLK_GENCTRL_RUNSTDBY | GCLK_GENCTRL_GENEN | GCLK_GENCTRL_SRC_DPLL0;
+    while (GCLK->SYNCBUSY.bit.GENCTRL0) {
+    }
+}
+#endif
+
+void init_clocks(uint32_t cpu_freq) {
+    #if defined(MCU_SAMD21)
+
+    // SAMD21 Clock settings
+    // GCLK0: 48MHz from DFLL open loop mode or closed loop mode from 32k Crystal
+    // GCLK1: 32768 Hz from 32K ULP or 32k Crystal
+    // GCLK2: 48MHz from DFLL for Peripherals
+    // GCLK3: 1Mhz for the us-counter (TC3/TC4)
+    // GCLK8: 1kHz clock for WDT
+
+    NVMCTRL->CTRLB.bit.MANW = 1; // errata "Spurious Writes"
+    NVMCTRL->CTRLB.bit.RWS = 1; // 1 read wait state for 48MHz
+
+    #if MICROPY_HW_XOSC32K
+    // Set up OSC32K according datasheet 17.6.3
+    SYSCTRL->XOSC32K.reg = SYSCTRL_XOSC32K_STARTUP(0x3) | SYSCTRL_XOSC32K_EN32K |
+        SYSCTRL_XOSC32K_XTALEN;
+    SYSCTRL->XOSC32K.bit.ENABLE = 1;
+    while (SYSCTRL->PCLKSR.bit.XOSC32KRDY == 0) {
+    }
+    // Set up the DFLL48 according to the data sheet 17.6.7.1.2
+    // Step 1: Set up the reference clock
+    // Connect the OSC32K via GCLK1 to the DFLL input and for further use.
+    GCLK->GENDIV.reg = GCLK_GENDIV_ID(1) | GCLK_GENDIV_DIV(1);
+    GCLK->GENCTRL.reg = GCLK_GENCTRL_GENEN | GCLK_GENCTRL_SRC_XOSC32K | GCLK_GENCTRL_ID(1);
+    while (GCLK->STATUS.bit.SYNCBUSY) {
+    }
+    GCLK->CLKCTRL.reg = GCLK_CLKCTRL_ID_DFLL48 | GCLK_CLKCTRL_GEN_GCLK1 | GCLK_CLKCTRL_CLKEN;
+    // Enable access to the DFLLCTRL reg acc. to Errata 1.2.1
+    SYSCTRL->DFLLCTRL.reg = SYSCTRL_DFLLCTRL_ENABLE;
+    while (SYSCTRL->PCLKSR.bit.DFLLRDY == 0) {
+    }
+    // Step 2: Set the coarse and fine values.
+    // The coarse setting will be taken from the calibration data. So the value used here
+    // does not matter. Get the coarse value from the calib data. In case it is not set,
+    // set a midrange value.
+    uint32_t coarse = (*((uint32_t *)FUSES_DFLL48M_COARSE_CAL_ADDR) & FUSES_DFLL48M_COARSE_CAL_Msk)
+        >> FUSES_DFLL48M_COARSE_CAL_Pos;
+    if (coarse == 0x3f) {
+        coarse = 0x1f;
+    }
+    SYSCTRL->DFLLVAL.reg = SYSCTRL_DFLLVAL_COARSE(coarse) | SYSCTRL_DFLLVAL_FINE(512);
+    while (SYSCTRL->PCLKSR.bit.DFLLRDY == 0) {
+    }
+    // Step 3: Set the multiplication values. The offset of 16384 to the freq is for rounding.
+    SYSCTRL->DFLLMUL.reg = SYSCTRL_DFLLMUL_MUL((CPU_FREQ + 16384) / 32768) |
+        SYSCTRL_DFLLMUL_FSTEP(1) | SYSCTRL_DFLLMUL_CSTEP(1);
+    while (SYSCTRL->PCLKSR.bit.DFLLRDY == 0) {
+    }
+    // Step 4: Start the DFLL and wait for the PLL lock. We just wait for the fine lock, since
+    // coarse adjusting is bypassed.
+    SYSCTRL->DFLLCTRL.reg |= SYSCTRL_DFLLCTRL_MODE | SYSCTRL_DFLLCTRL_WAITLOCK |
+        SYSCTRL_DFLLCTRL_BPLCKC | SYSCTRL_DFLLCTRL_ENABLE;
+    while (SYSCTRL->PCLKSR.bit.DFLLLCKF == 0) {
+    }
+
+    #else // MICROPY_HW_XOSC32K
+
+    // Enable DFLL48M
+    SYSCTRL->DFLLCTRL.reg = SYSCTRL_DFLLCTRL_ENABLE;
+    while (!SYSCTRL->PCLKSR.bit.DFLLRDY) {
+    }
+    SYSCTRL->DFLLMUL.reg = SYSCTRL_DFLLMUL_CSTEP(1) | SYSCTRL_DFLLMUL_FSTEP(1)
+        | SYSCTRL_DFLLMUL_MUL(48000);
+    uint32_t coarse = (*((uint32_t *)FUSES_DFLL48M_COARSE_CAL_ADDR) & FUSES_DFLL48M_COARSE_CAL_Msk)
+        >> FUSES_DFLL48M_COARSE_CAL_Pos;
+    if (coarse == 0x3f) {
+        coarse = 0x1f;
+    }
+    SYSCTRL->DFLLVAL.reg = SYSCTRL_DFLLVAL_COARSE(coarse) | SYSCTRL_DFLLVAL_FINE(512);
+    SYSCTRL->DFLLCTRL.reg = SYSCTRL_DFLLCTRL_CCDIS | SYSCTRL_DFLLCTRL_USBCRM
+        | SYSCTRL_DFLLCTRL_MODE | SYSCTRL_DFLLCTRL_ENABLE;
+    while (!SYSCTRL->PCLKSR.bit.DFLLRDY) {
+    }
+    // Enable 32768 Hz on GCLK1 for consistency
+    GCLK->GENDIV.reg = GCLK_GENDIV_ID(1) | GCLK_GENDIV_DIV(48016384 / 32768);
+    GCLK->GENCTRL.reg = GCLK_GENCTRL_GENEN | GCLK_GENCTRL_SRC_DFLL48M | GCLK_GENCTRL_ID(1);
+    while (GCLK->STATUS.bit.SYNCBUSY) {
+    }
+
+    #endif // MICROPY_HW_XOSC32K
+
+    // Enable GCLK output: 48M on both CCLK0 and GCLK2
+    GCLK->GENDIV.reg = GCLK_GENDIV_ID(0) | GCLK_GENDIV_DIV(1);
+    GCLK->GENCTRL.reg = GCLK_GENCTRL_GENEN | GCLK_GENCTRL_SRC_DFLL48M | GCLK_GENCTRL_ID(0);
+    while (GCLK->STATUS.bit.SYNCBUSY) {
+    }
+    GCLK->GENDIV.reg = GCLK_GENDIV_ID(2) | GCLK_GENDIV_DIV(1);
+    GCLK->GENCTRL.reg = GCLK_GENCTRL_GENEN | GCLK_GENCTRL_SRC_DFLL48M | GCLK_GENCTRL_ID(2);
+    while (GCLK->STATUS.bit.SYNCBUSY) {
+    }
+
+    // Enable GCLK output: 1MHz on GCLK3 for TC3
+    GCLK->GENDIV.reg = GCLK_GENDIV_ID(3) | GCLK_GENDIV_DIV(48);
+    GCLK->GENCTRL.reg = GCLK_GENCTRL_GENEN | GCLK_GENCTRL_SRC_DFLL48M | GCLK_GENCTRL_ID(3);
+    while (GCLK->STATUS.bit.SYNCBUSY) {
+    }
+    // Set GCLK8 to 1 kHz.
+    GCLK->GENDIV.reg = GCLK_GENDIV_ID(8) | GCLK_GENDIV_DIV(32);
+    GCLK->GENCTRL.reg = GCLK_GENCTRL_GENEN | GCLK_GENCTRL_SRC_OSCULP32K | GCLK_GENCTRL_ID(8);
+    while (GCLK->STATUS.bit.SYNCBUSY) {
+    }
+
+    #elif defined(MCU_SAMD51)
+
+    // SAMD51 clock settings
+    // GCLK0: 48MHz from DFLL48M or 48 - 200 MHz from DPLL0 (SAMD51)
+    // GCLK1: DPLLx_REF_FREQ 32768 Hz from 32KULP or 32k Crystal
+    // GCLK2: 48MHz from DFLL48M for Peripheral devices
+    // GCLK3: 16Mhz for the us-counter (TC0/TC1)
+    // DPLL0: 48 - 200 MHz
+
+    // Steps to set up clocks:
+    // Reset Clocks
+    // Switch GCLK0 to DFLL 48MHz
+    // Setup 32768 Hz source and DFLL48M in closed loop mode, if a crystal is present.
+    // Setup GCLK1 to the DPLL0 Reference freq. of 32768 Hz
+    // Setup GCLK1 to drive peripheral channel 1
+    // Setup DPLL0 to 120MHz
+    // Setup GCLK0 to 120MHz
+    // Setup GCLK2 to 48MHz for Peripherals
+    // Setup GCLK3 to 8MHz for TC0/TC1
+
+    // Setup GCLK0 for 48MHz as default state to keep the MCU running during config change.
+    GCLK->GENCTRL[0].reg = GCLK_GENCTRL_RUNSTDBY | GCLK_GENCTRL_GENEN | GCLK_GENCTRL_SRC_DFLL;
+    while (GCLK->SYNCBUSY.bit.GENCTRL0) {
+    }
+
+    #if MICROPY_HW_XOSC32K
+    // OSCILLATOR CONTROL
+    // Setup XOSC32K
+    OSC32KCTRL->INTFLAG.reg = OSC32KCTRL_INTFLAG_XOSC32KRDY | OSC32KCTRL_INTFLAG_XOSC32KFAIL;
+    OSC32KCTRL->XOSC32K.bit.CGM = OSC32KCTRL_XOSC32K_CGM_HS_Val;
+    OSC32KCTRL->XOSC32K.bit.XTALEN = 1; // 0: Generator 1: Crystal
+    OSC32KCTRL->XOSC32K.bit.EN32K = 1;
+    OSC32KCTRL->XOSC32K.bit.ONDEMAND = 0;
+    OSC32KCTRL->XOSC32K.bit.RUNSTDBY = 1;
+    OSC32KCTRL->XOSC32K.bit.STARTUP = 4;
+    OSC32KCTRL->CFDCTRL.bit.CFDEN = 1; // Fall back to internal Osc on crystal fail
+    OSC32KCTRL->XOSC32K.bit.ENABLE = 1;
+    // make sure osc32kcrtl is ready
+    while (OSC32KCTRL->STATUS.bit.XOSC32KRDY == 0) {
+    }
+
+    // Setup GCLK1 for 32kHz crystal
+    GCLK->GENCTRL[1].reg = GCLK_GENCTRL_RUNSTDBY | GCLK_GENCTRL_GENEN | GCLK_GENCTRL_SRC_XOSC32K;
+    while (GCLK->SYNCBUSY.bit.GENCTRL1) {
+    }
+
+    // Set-up the DFLL48M in closed loop mode with input from the 32kHz crystal
+
+    // Step 1: Peripheral channel 0 is driven by GCLK1 and it feeds DFLL48M
+    GCLK->PCHCTRL[0].reg = GCLK_PCHCTRL_GEN_GCLK1 | GCLK_PCHCTRL_CHEN;
+    while (GCLK->PCHCTRL[0].bit.CHEN == 0) {
+    }
+    // Step 2: Set the multiplication values. The offset of 16384 to the freq is for rounding.
+    OSCCTRL->DFLLMUL.reg = OSCCTRL_DFLLMUL_MUL((APB_FREQ + DPLLx_REF_FREQ / 2) / DPLLx_REF_FREQ) |
+        OSCCTRL_DFLLMUL_FSTEP(1) | OSCCTRL_DFLLMUL_CSTEP(1);
+    while (OSCCTRL->DFLLSYNC.bit.DFLLMUL == 1) {
+    }
+    // Step 3: Set the mode to closed loop
+    OSCCTRL->DFLLCTRLB.reg = OSCCTRL_DFLLCTRLB_BPLCKC | OSCCTRL_DFLLCTRLB_MODE;
+    while (OSCCTRL->DFLLSYNC.bit.DFLLCTRLB == 1) {
+    }
+    // Wait for lock fine
+    while (OSCCTRL->STATUS.bit.DFLLLCKF == 0) {
+    }
+    // Step 4: Start the DFLL.
+    OSCCTRL->DFLLCTRLA.reg = OSCCTRL_DFLLCTRLA_RUNSTDBY | OSCCTRL_DFLLCTRLA_ENABLE;
+    while (OSCCTRL->DFLLSYNC.bit.ENABLE == 1) {
+    }
+
+    #else // MICROPY_HW_XOSC32K
+
+    // Set GCLK1 to DPLL0_REF_FREQ as defined in mpconfigboard.h (e.g. 32768 Hz)
+    GCLK->GENCTRL[1].reg = ((APB_FREQ + DPLLx_REF_FREQ / 2) / DPLLx_REF_FREQ) << GCLK_GENCTRL_DIV_Pos
+        | GCLK_GENCTRL_GENEN | GCLK_GENCTRL_SRC_DFLL;
+    while (GCLK->SYNCBUSY.bit.GENCTRL1) {
+    }
+
+    #endif // MICROPY_HW_XOSC32K
+
+    // Peripheral channel 1 is driven by GCLK1 and it feeds DPLL0
+    GCLK->PCHCTRL[1].reg = GCLK_PCHCTRL_GEN_GCLK1 | GCLK_PCHCTRL_CHEN;
+    while (GCLK->PCHCTRL[1].bit.CHEN == 0) {
+    }
+
+    set_cpu_freq(cpu_freq);
+
+    apb_freq = APB_FREQ;  // To be changed if CPU_FREQ < 48M
+
+    // Setup GCLK2 for DPLL1 output (48 MHz)
+    GCLK->GENCTRL[2].reg = GCLK_GENCTRL_DIV(1) | GCLK_GENCTRL_RUNSTDBY | GCLK_GENCTRL_GENEN | GCLK_GENCTRL_SRC_DFLL;
+    while (GCLK->SYNCBUSY.bit.GENCTRL2) {
+    }
+
+    // Setup GCLK3 for 8MHz, Used for TC0/1 counter
+    GCLK->GENCTRL[3].reg = GCLK_GENCTRL_DIV(6) | GCLK_GENCTRL_RUNSTDBY | GCLK_GENCTRL_GENEN | GCLK_GENCTRL_SRC_DFLL;
+    while (GCLK->SYNCBUSY.bit.GENCTRL3) {
+    }
+
+    #endif // defined(MCU_SAMD51)
+}
+
+void enable_sercom_clock(int id) {
+    // Next: Set up the clocks
+    #if defined(MCU_SAMD21)
+    // Enable synchronous clock. The bits are nicely arranged
+    PM->APBCMASK.reg |= 0x04 << id;
+    // Select multiplexer generic clock source and enable.
+    GCLK->CLKCTRL.reg = GCLK_CLKCTRL_CLKEN | GCLK_CLKCTRL_GEN_GCLK2 | sercom_gclk_id[id];
+    // Wait while it updates synchronously.
+    while (GCLK->STATUS.bit.SYNCBUSY) {
+    }
+    #elif defined(MCU_SAMD51)
+    GCLK->PCHCTRL[sercom_gclk_id[id]].reg = GCLK_PCHCTRL_CHEN | GCLK_PCHCTRL_GEN_GCLK2;
+    // no easy way to set the clocks, except enabling all of them
+    switch (id) {
+        case 0:
+            MCLK->APBAMASK.bit.SERCOM0_ = 1;
+            break;
+        case 1:
+            MCLK->APBAMASK.bit.SERCOM1_ = 1;
+            break;
+        case 2:
+            MCLK->APBBMASK.bit.SERCOM2_ = 1;
+            break;
+        case 3:
+            MCLK->APBBMASK.bit.SERCOM3_ = 1;
+            break;
+        case 4:
+            MCLK->APBDMASK.bit.SERCOM4_ = 1;
+            break;
+        case 5:
+            MCLK->APBDMASK.bit.SERCOM5_ = 1;
+            break;
+        #ifdef SERCOM7_GCLK_ID_CORE
+        case 6:
+            MCLK->APBDMASK.bit.SERCOM6_ = 1;
+            break;
+        case 7:
+            MCLK->APBDMASK.bit.SERCOM7_ = 1;
+            break;
+        #endif
+    }
+    #endif
+}
diff --git a/ports/samd/clock_config.h b/ports/samd/clock_config.h
new file mode 100644
index 0000000000000..0e7a9e3280ec3
--- /dev/null
+++ b/ports/samd/clock_config.h
@@ -0,0 +1,33 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * This file provides functions for configuring the clocks.
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2022 Robert Hammelrath
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+void init_clocks(uint32_t cpu_freq);
+void set_cpu_freq(uint32_t cpu_freq);
+uint32_t get_cpu_freq(void);
+uint32_t get_apb_freq(void);
+void enable_sercom_clock(int id);
diff --git a/ports/samd/samd_soc.c b/ports/samd/samd_soc.c
index 7a96cbb4800fd..8d6e808f63904 100644
--- a/ports/samd/samd_soc.c
+++ b/ports/samd/samd_soc.c
@@ -10,6 +10,7 @@
  * The MIT License (MIT)
  *
  * Copyright (c) 2019 Damien P. George
+ * Copyright (c) 2022 Robert Hammelrath
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -33,6 +34,7 @@
 #include "py/runtime.h"
 #include "modmachine.h"
 #include "samd_soc.h"
+#include "sam.h"
 #include "tusb.h"
 
 static void usb_init(void) {
@@ -43,7 +45,7 @@ static void usb_init(void) {
     PM->APBBMASK.bit.USB_ = 1;
     uint8_t alt = 6; // alt G, USB
     #elif defined(MCU_SAMD51)
-    GCLK->PCHCTRL[USB_GCLK_ID].reg = GCLK_PCHCTRL_CHEN | GCLK_PCHCTRL_GEN_GCLK1;
+    GCLK->PCHCTRL[USB_GCLK_ID].reg = GCLK_PCHCTRL_CHEN | GCLK_PCHCTRL_GEN_GCLK2;
     while (GCLK->PCHCTRL[USB_GCLK_ID].bit.CHEN == 0) {
     }
     MCLK->AHBMASK.bit.USB_ = 1;
@@ -61,43 +63,51 @@ static void usb_init(void) {
     tusb_init();
 }
 
-void samd_init(void) {
+// Initialize the microsecond counter on TC 0/1
+void init_us_counter(void) {
     #if defined(MCU_SAMD21)
 
-    NVMCTRL->CTRLB.bit.MANW = 1; // errata "Spurious Writes"
-    NVMCTRL->CTRLB.bit.RWS = 1; // 1 read wait state for 48MHz
-
-    // Enable DFLL48M
-    SYSCTRL->DFLLCTRL.reg = SYSCTRL_DFLLCTRL_ENABLE;
-    while (!SYSCTRL->PCLKSR.bit.DFLLRDY) {
-    }
-    SYSCTRL->DFLLMUL.reg = SYSCTRL_DFLLMUL_CSTEP(1) | SYSCTRL_DFLLMUL_FSTEP(1)
-        | SYSCTRL_DFLLMUL_MUL(48000);
-    uint32_t coarse = (*((uint32_t *)FUSES_DFLL48M_COARSE_CAL_ADDR) & FUSES_DFLL48M_COARSE_CAL_Msk)
-        >> FUSES_DFLL48M_COARSE_CAL_Pos;
-    if (coarse == 0x3f) {
-        coarse = 0x1f;
-    }
-    uint32_t fine = 512;
-    SYSCTRL->DFLLVAL.reg = SYSCTRL_DFLLVAL_COARSE(coarse) | SYSCTRL_DFLLVAL_FINE(fine);
-    SYSCTRL->DFLLCTRL.reg = SYSCTRL_DFLLCTRL_CCDIS | SYSCTRL_DFLLCTRL_USBCRM
-        | SYSCTRL_DFLLCTRL_MODE | SYSCTRL_DFLLCTRL_ENABLE;
-    while (!SYSCTRL->PCLKSR.bit.DFLLRDY) {
+    PM->APBCMASK.bit.TC3_ = 1; // Enable TC3 clock
+    PM->APBCMASK.bit.TC4_ = 1; // Enable TC4 clock
+    // Select multiplexer generic clock source and enable.
+    GCLK->CLKCTRL.reg = GCLK_CLKCTRL_CLKEN | GCLK_CLKCTRL_GEN_GCLK3 | GCLK_CLKCTRL_ID_TC4_TC5;
+    // Wait while it updates synchronously.
+    while (GCLK->STATUS.bit.SYNCBUSY) {
     }
 
-    GCLK->GENDIV.reg = GCLK_GENDIV_ID(0) | GCLK_GENDIV_DIV(1);
-    GCLK->GENCTRL.reg = GCLK_GENCTRL_GENEN | GCLK_GENCTRL_SRC_DFLL48M | GCLK_GENCTRL_ID(0);
-    while (GCLK->STATUS.bit.SYNCBUSY) {
+    // configure the timer
+    TC4->COUNT32.CTRLA.bit.MODE = TC_CTRLA_MODE_COUNT32_Val;
+    TC4->COUNT32.CTRLA.bit.RUNSTDBY = 1;
+    TC4->COUNT32.CTRLA.bit.ENABLE = 1;
+    while (TC4->COUNT32.STATUS.bit.SYNCBUSY) {
+    }
+    TC4->COUNT32.READREQ.reg = TC_READREQ_RREQ | TC_READREQ_RCONT | 0x10;
+    while (TC4->COUNT32.STATUS.bit.SYNCBUSY) {
     }
 
     #elif defined(MCU_SAMD51)
 
-    GCLK->GENCTRL[1].reg = 1 << GCLK_GENCTRL_DIV_Pos | GCLK_GENCTRL_GENEN | GCLK_GENCTRL_SRC_DFLL;
-    while (GCLK->SYNCBUSY.bit.GENCTRL1) {
+    MCLK->APBAMASK.bit.TC0_ = 1; // Enable TC0 clock
+    MCLK->APBAMASK.bit.TC1_ = 1; // Enable TC1 clock
+    // Peripheral channel 9 is driven by GCLK3, 8 MHz.
+    GCLK->PCHCTRL[TC0_GCLK_ID].reg = GCLK_PCHCTRL_GEN_GCLK3 | GCLK_PCHCTRL_CHEN;
+    while (GCLK->PCHCTRL[TC0_GCLK_ID].bit.CHEN == 0) {
+    }
+
+    // configure the timer
+    TC0->COUNT32.CTRLA.bit.PRESCALER = 0;
+    TC0->COUNT32.CTRLA.bit.MODE = TC_CTRLA_MODE_COUNT32_Val;
+    TC0->COUNT32.CTRLA.bit.RUNSTDBY = 1;
+    TC0->COUNT32.CTRLA.bit.ENABLE = 1;
+    while (TC0->COUNT32.SYNCBUSY.bit.ENABLE) {
     }
 
     #endif
+}
 
-    SysTick_Config(CPU_FREQ / 1000);
+void samd_init(void) {
+    init_clocks(get_cpu_freq());
+    SysTick_Config(get_cpu_freq() / 1000);
+    init_us_counter();
     usb_init();
 }
diff --git a/ports/samd/samd_soc.h b/ports/samd/samd_soc.h
index a07e68dbed646..b97159dc7fc5e 100644
--- a/ports/samd/samd_soc.h
+++ b/ports/samd/samd_soc.h
@@ -28,6 +28,7 @@
 
 #include <stdint.h>
 #include "sam.h"
+#include "clock_config.h"
 
 void samd_init(void);
 void samd_main(void);
@@ -38,4 +39,14 @@ void USB_1_Handler_wrapper(void);
 void USB_2_Handler_wrapper(void);
 void USB_3_Handler_wrapper(void);
 
+void common_uart_irq_handler(int uart_nr);
+void common_spi_irq_handler(int spi_nr);
+void common_i2c_irq_handler(int i2c_nr);
+void sercom_enable(Sercom *spi, int state);
+void sercom_register_irq(int sercom_id, int mode);
+
+#define SERCOM_IRQ_TYPE_UART  (0)
+#define SERCOM_IRQ_TYPE_SPI   (1)
+#define SERCOM_IRQ_TYPE_I2C   (2)
+
 #endif // MICROPY_INCLUDED_SAMD_SAMD_SOC_H

From 5af54ad61feb52f4c1367d6f9a8a60d972f02419 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sat, 4 Jun 2022 17:00:32 +0200
Subject: [PATCH 2678/3533] samd/modmachine: Allow changing the CPU freq with
 machine.freq(f).

SAMD51 only.  Accepted values are 48_000_000 to 200_000_000.  The range
specified by Atmel is 96_000_000 to 120_000_000.
---
 ports/samd/modmachine.c | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/ports/samd/modmachine.c b/ports/samd/modmachine.c
index 1b78b687e1803..99fccf5bf0085 100644
--- a/ports/samd/modmachine.c
+++ b/ports/samd/modmachine.c
@@ -59,10 +59,21 @@ STATIC mp_obj_t machine_bootloader(void) {
 }
 MP_DEFINE_CONST_FUN_OBJ_0(machine_bootloader_obj, machine_bootloader);
 
-STATIC mp_obj_t machine_freq(void) {
-    return MP_OBJ_NEW_SMALL_INT(CPU_FREQ);
+STATIC mp_obj_t machine_freq(size_t n_args, const mp_obj_t *args) {
+    if (n_args == 0) {
+        return MP_OBJ_NEW_SMALL_INT(get_cpu_freq());
+    } else {
+        #if defined(MCU_SAMD51)
+        uint32_t freq = mp_obj_get_int(args[0]);
+        if (freq >= 48000000 && freq <= 200000000) {
+            set_cpu_freq(freq);
+            SysTick_Config(freq / 1000);
+        }
+        #endif
+        return mp_const_none;
+    }
 }
-MP_DEFINE_CONST_FUN_OBJ_0(machine_freq_obj, machine_freq);
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_freq_obj, 0, 1, machine_freq);
 
 STATIC mp_obj_t machine_unique_id(void) {
     // Each device has a unique 128-bit serial number which is a concatenation of four 32-bit

From 3d9940bc28e66464e22386916cb71100d6b24f1d Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sat, 4 Jun 2022 18:09:11 +0200
Subject: [PATCH 2679/3533] samd/mphalport: Add pin open-drain funcs, and
 improve delay and ticks.

The changes in this commit are:
- Add an interface for pin open-drain mode.
- Improve ticks_us() by using the us-counter.
- Improve ticks_cpu() by using the CPU's SysTick.
---
 ports/samd/mphalport.c | 47 ++++++++++++++++++++++++++++--------
 ports/samd/mphalport.h | 54 +++++++++++++++++++++++++++++++++++-------
 2 files changed, 82 insertions(+), 19 deletions(-)

diff --git a/ports/samd/mphalport.c b/ports/samd/mphalport.c
index beade14a6e3da..e51f13ab7e9fc 100644
--- a/ports/samd/mphalport.c
+++ b/ports/samd/mphalport.c
@@ -4,6 +4,7 @@
  * The MIT License (MIT)
  *
  * Copyright (c) 2019 Damien P. George
+ * Copyright (c) 2022 Robert Hammelrath
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -27,10 +28,13 @@
 #include "py/runtime.h"
 #include "py/mphal.h"
 #include "py/stream.h"
+#include "shared/runtime/interrupt_char.h"
+#include "extmod/misc.h"
 #include "samd_soc.h"
 #include "tusb.h"
 
 #if MICROPY_KBD_EXCEPTION
+int mp_interrupt_char = -1;
 
 void tud_cdc_rx_wanted_cb(uint8_t itf, char wanted_char) {
     (void)itf;
@@ -40,24 +44,47 @@ void tud_cdc_rx_wanted_cb(uint8_t itf, char wanted_char) {
 }
 
 void mp_hal_set_interrupt_char(int c) {
+    mp_interrupt_char = c;
     tud_cdc_set_wanted_char(c);
 }
 
 #endif
 
+void mp_hal_set_pin_mux(mp_hal_pin_obj_t pin, uint8_t mux) {
+    int pin_grp = pin / 32;
+    int port_grp = (pin % 32) / 2;
+    PORT->Group[pin_grp].PINCFG[pin % 32].bit.PMUXEN = 1; // Enable Mux
+    if (pin & 1) {
+        PORT->Group[pin_grp].PMUX[port_grp].bit.PMUXO = mux;
+    } else {
+        PORT->Group[pin_grp].PMUX[port_grp].bit.PMUXE = mux;
+    }
+}
+
+
 void mp_hal_delay_ms(mp_uint_t ms) {
-    ms += 1;
-    uint32_t t0 = systick_ms;
-    while (systick_ms - t0 < ms) {
-        MICROPY_EVENT_POLL_HOOK
+    if (ms > 10) {
+        uint32_t t0 = systick_ms;
+        while (systick_ms - t0 < ms) {
+            MICROPY_EVENT_POLL_HOOK
+        }
+    } else {
+        mp_hal_delay_us(ms * 1000);
     }
 }
 
 void mp_hal_delay_us(mp_uint_t us) {
-    uint32_t ms = us / 1000 + 1;
-    uint32_t t0 = systick_ms;
-    while (systick_ms - t0 < ms) {
-        __WFI();
+    if (us > 0) {
+        uint32_t start = mp_hal_ticks_us();
+        #if defined(MCU_SAMD21)
+        // SAMD21 counter has effective 32 bit width
+        while ((mp_hal_ticks_us() - start) < us) {
+        }
+        #elif defined(MCU_SAMD51)
+        // SAMD51 counter has effective 29 bit width
+        while (((mp_hal_ticks_us() - start) & (MICROPY_PY_UTIME_TICKS_PERIOD - 1)) < us) {
+        }
+        #endif
     }
 }
 
@@ -78,7 +105,7 @@ int mp_hal_stdin_rx_chr(void) {
                 return buf[0];
             }
         }
-        __WFI();
+        MICROPY_EVENT_POLL_HOOK
     }
 }
 
@@ -90,7 +117,7 @@ void mp_hal_stdout_tx_strn(const char *str, mp_uint_t len) {
                 n = CFG_TUD_CDC_EP_BUFSIZE;
             }
             while (n > tud_cdc_write_available()) {
-                __WFI();
+                MICROPY_EVENT_POLL_HOOK
             }
             uint32_t n2 = tud_cdc_write(str + i, n);
             tud_cdc_write_flush();
diff --git a/ports/samd/mphalport.h b/ports/samd/mphalport.h
index 2bbde4390e333..b18aa2f9b4355 100644
--- a/ports/samd/mphalport.h
+++ b/ports/samd/mphalport.h
@@ -4,6 +4,7 @@
  * The MIT License (MIT)
  *
  * Copyright (c) 2019-2021 Damien P. George
+ * Copyright (c) 2022 Robert Hammelrath
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -27,25 +28,49 @@
 #define MICROPY_INCLUDED_SAMD_MPHALPORT_H
 
 #include "py/mpconfig.h"
-#include "py/ringbuf.h"
 
 // ASF4
 #include "hal_gpio.h"
+#include "hpl_time_measure.h"
+#include "sam.h"
 
 extern int mp_interrupt_char;
-extern ringbuf_t stdin_ringbuf;
 extern volatile uint32_t systick_ms;
+extern volatile uint32_t systick_ms_upper;
 
 void mp_hal_set_interrupt_char(int c);
 
+#define mp_hal_delay_us_fast  mp_hal_delay_us
+
 static inline mp_uint_t mp_hal_ticks_ms(void) {
     return systick_ms;
 }
+
 static inline mp_uint_t mp_hal_ticks_us(void) {
+    #if defined(MCU_SAMD21)
+
+    return REG_TC4_COUNT32_COUNT;
+
+    #elif defined(MCU_SAMD51)
+
+    TC0->COUNT32.CTRLBSET.reg = TC_CTRLBSET_CMD_READSYNC;
+    while (TC0->COUNT32.CTRLBSET.reg != 0) {
+    }
+    return REG_TC0_COUNT32_COUNT >> 3;
+
+    #else
     return systick_ms * 1000;
+    #endif
 }
+
+// ticks_cpu is limited to a 1 ms period, since the CPU SysTick counter
+// is used for the 1 ms SysTick_Handler interrupt.
 static inline mp_uint_t mp_hal_ticks_cpu(void) {
-    return 0;
+    return (system_time_t)SysTick->VAL;
+}
+
+static inline uint64_t mp_hal_time_ns(void) {
+    return ((uint64_t)systick_ms + (uint64_t)systick_ms_upper * 0x100000000) * 1000000;
 }
 
 // C-level pin HAL
@@ -55,9 +80,10 @@ static inline mp_uint_t mp_hal_ticks_cpu(void) {
 #define MP_HAL_PIN_FMT "%u"
 #define mp_hal_pin_obj_t uint
 
-extern uint32_t machine_pin_open_drain_mask;
+extern uint32_t machine_pin_open_drain_mask[];
 
 mp_hal_pin_obj_t mp_hal_get_pin_obj(mp_obj_t pin_in);
+void mp_hal_set_pin_mux(mp_hal_pin_obj_t pin, uint8_t mux);
 
 static inline unsigned int mp_hal_pin_name(mp_hal_pin_obj_t pin) {
     return pin;
@@ -65,18 +91,22 @@ static inline unsigned int mp_hal_pin_name(mp_hal_pin_obj_t pin) {
 
 static inline void mp_hal_pin_input(mp_hal_pin_obj_t pin) {
     gpio_set_pin_direction(pin, GPIO_DIRECTION_IN);
-    machine_pin_open_drain_mask &= ~(1 << pin);
+    machine_pin_open_drain_mask[pin / 32] &= ~(1 << (pin % 32));
 }
 
 static inline void mp_hal_pin_output(mp_hal_pin_obj_t pin) {
     gpio_set_pin_direction(pin, GPIO_DIRECTION_OUT);
-    machine_pin_open_drain_mask &= ~(1 << pin);
+    machine_pin_open_drain_mask[pin / 32] &= ~(1 << (pin % 32));
 }
 
 static inline void mp_hal_pin_open_drain(mp_hal_pin_obj_t pin) {
     gpio_set_pin_direction(pin, GPIO_DIRECTION_IN);
     gpio_set_pin_level(pin, 0);
-    machine_pin_open_drain_mask |= 1 << pin;
+    machine_pin_open_drain_mask[pin / 32] |= 1 << (pin % 32);
+}
+
+static inline unsigned int mp_hal_get_pin_direction(mp_hal_pin_obj_t pin) {
+    return (PORT->Group[pin / 32].DIR.reg & (1 << (pin % 32))) >> (pin % 32);
 }
 
 static inline int mp_hal_pin_read(mp_hal_pin_obj_t pin) {
@@ -87,7 +117,14 @@ static inline void mp_hal_pin_write(mp_hal_pin_obj_t pin, int v) {
     gpio_set_pin_level(pin, v);
 }
 
-/*
+static inline void mp_hal_pin_low(mp_hal_pin_obj_t pin) {
+    gpio_set_pin_level(pin, 0);
+}
+
+static inline void mp_hal_pin_high(mp_hal_pin_obj_t pin) {
+    gpio_set_pin_level(pin, 1);
+}
+
 static inline void mp_hal_pin_od_low(mp_hal_pin_obj_t pin) {
     gpio_set_pin_direction(pin, GPIO_DIRECTION_OUT);
 }
@@ -95,6 +132,5 @@ static inline void mp_hal_pin_od_low(mp_hal_pin_obj_t pin) {
 static inline void mp_hal_pin_od_high(mp_hal_pin_obj_t pin) {
     gpio_set_pin_direction(pin, GPIO_DIRECTION_IN);
 }
-*/
 
 #endif // MICROPY_INCLUDED_SAMD_MPHALPORT_H

From 98ae3126402260eab306e846d01d12af317d96a2 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sat, 4 Jun 2022 20:23:56 +0200
Subject: [PATCH 2680/3533] samd/samd_isr: Extend systick_ms to 64 bit.

By adding a 32 bit overflow counter.  This allows it to be used for the
time functions.
---
 ports/samd/samd_isr.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/ports/samd/samd_isr.c b/ports/samd/samd_isr.c
index dcf80d28cab0c..a7956c49305fa 100644
--- a/ports/samd/samd_isr.c
+++ b/ports/samd/samd_isr.c
@@ -32,6 +32,7 @@ extern uint32_t _estack, _sidata, _sdata, _edata, _sbss, _ebss;
 
 const ISR isr_vector[];
 uint32_t systick_ms;
+volatile uint32_t systick_ms_upper;
 
 void Reset_Handler(void) __attribute__((naked));
 void Reset_Handler(void) {
@@ -81,7 +82,11 @@ void Default_Handler(void) {
 }
 
 void SysTick_Handler(void) {
-    systick_ms += 1;
+    uint32_t next_tick = systick_ms + 1;
+    systick_ms = next_tick;
+    if (systick_ms == 0) {
+        systick_ms_upper += 1;
+    }
 }
 
 const ISR isr_vector[] __attribute__((section(".isr_vector"))) = {

From 33eaf739d2e0502ec77bdd212dfb6a3106db30b8 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sat, 4 Jun 2022 20:33:48 +0200
Subject: [PATCH 2681/3533] samd/machine_pin: Add OPEN_DRAIN mode for pins.

Changes in this commit are:
- Use mphal_xx functions whenever possible.
- Remove obsolete includes.
- Clean up traces of a non-functional pin.irq() from earlier builds.
  Pin.irq() will be added in further commits in a working manner.
---
 ports/samd/machine_pin.c | 124 +++++++++++++++------------------------
 ports/samd/mphalport.h   |   4 +-
 2 files changed, 50 insertions(+), 78 deletions(-)

diff --git a/ports/samd/machine_pin.c b/ports/samd/machine_pin.c
index 5f9cbfb99b85e..49aecba011e9b 100644
--- a/ports/samd/machine_pin.c
+++ b/ports/samd/machine_pin.c
@@ -31,35 +31,25 @@
 #include "extmod/virtpin.h"
 #include "modmachine.h"
 #include "samd_soc.h"
-#include "pins.h" // boards/<BOARD>/
+#include "pins.h"
 
-// ASF4 (MCU package specific pin defs in 'boards')
 #include "hal_gpio.h"
-#include "hpl_gpio.h"
-#include "hal_atomic.h"
 
 #define GPIO_MODE_IN (0)
 #define GPIO_MODE_OUT (1)
-// #define GPIO_MODE_ALT (3)
+#define GPIO_MODE_OPEN_DRAIN (2)
 
 #define GPIO_STRENGTH_2MA (0)
 #define GPIO_STRENGTH_8MA (1)
 
-// asf4 hpl_gpio.h gpio_pull_mode
+uint32_t machine_pin_open_drain_mask[4];
 
-/*
-typedef struct _machine_pin_irq_obj_t {
-    mp_irq_obj_t base;
-    uint32_t flags;
-    uint32_t trigger;
-} machine_pin_irq_obj_t;
-
-STATIC const mp_irq_methods_t machine_pin_irq_methods;
-*/
+// Open drain behaviour is simulated.
+#define GPIO_IS_OPEN_DRAIN(id) (machine_pin_open_drain_mask[id / 32] & (1 << (id % 32)))
 
 STATIC void machine_pin_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     machine_pin_obj_t *self = self_in;
-    mp_printf(print, "Pin(%u)", self->id);
+    mp_printf(print, "GPIO P%c%02u", "ABCD"[self->id / 32], self->id % 32);
 }
 
 STATIC void pin_validate_drive(bool strength) {
@@ -84,24 +74,26 @@ STATIC mp_obj_t machine_pin_obj_init_helper(const machine_pin_obj_t *self, size_
 
     // set initial value (do this before configuring mode/pull)
     if (args[ARG_value].u_obj != mp_const_none) {
-        gpio_set_pin_level(self->id, mp_obj_is_true(args[ARG_value].u_obj));
+        mp_hal_pin_write(self->id, mp_obj_is_true(args[ARG_value].u_obj));
     }
 
     // configure mode
     if (args[ARG_mode].u_obj != mp_const_none) {
         mp_int_t mode = mp_obj_get_int(args[ARG_mode].u_obj);
         if (mode == GPIO_MODE_IN) {
-            gpio_set_pin_direction(self->id, GPIO_DIRECTION_IN);
+            mp_hal_pin_input(self->id);
         } else if (mode == GPIO_MODE_OUT) {
-            gpio_set_pin_direction(self->id, GPIO_DIRECTION_OUT);
+            mp_hal_pin_output(self->id);
+        } else if (mode == GPIO_MODE_OPEN_DRAIN) {
+            mp_hal_pin_open_drain(self->id);
         } else {
-            gpio_set_pin_direction(self->id, GPIO_DIRECTION_IN); // If no args are given, the Pin is 'input'.
+            mp_hal_pin_input(self->id); // If no args are given, the Pin is 'input'.
         }
     }
     // configure pull. Only to be used with IN mode. The function sets the pin to INPUT.
     uint32_t pull = 0;
-    mp_int_t mode = mp_obj_get_int(args[ARG_mode].u_obj);
-    if (mode == GPIO_MODE_OUT && args[ARG_pull].u_obj != mp_const_none) {
+    mp_int_t dir = mp_hal_get_pin_direction(self->id);
+    if (dir == GPIO_DIRECTION_OUT && args[ARG_pull].u_obj != mp_const_none) {
         mp_raise_ValueError(MP_ERROR_TEXT("OUT incompatible with pull"));
     } else if (args[ARG_pull].u_obj != mp_const_none) {
         pull = mp_obj_get_int(args[ARG_pull].u_obj);
@@ -143,17 +135,24 @@ mp_obj_t mp_pin_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw,
 }
 
 // fast method for getting/setting pin value
-STATIC mp_obj_t machine_pin_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
+mp_obj_t machine_pin_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
     mp_arg_check_num(n_args, n_kw, 0, 1, false);
     machine_pin_obj_t *self = self_in;
     if (n_args == 0) {
         // get pin
-        return MP_OBJ_NEW_SMALL_INT(gpio_get_pin_level(self->id));
+        return MP_OBJ_NEW_SMALL_INT(mp_hal_pin_read(self->id));
     } else {
         // set pin
         bool value = mp_obj_is_true(args[0]);
-        gpio_set_pin_level(self->id, value);
-
+        if (GPIO_IS_OPEN_DRAIN(self->id)) {
+            if (value == 0) {
+                mp_hal_pin_od_low(self->id);
+            } else {
+                mp_hal_pin_od_high(self->id);
+            }
+        } else {
+            mp_hal_pin_write(self->id, value);
+        }
         return mp_const_none;
     }
 }
@@ -165,7 +164,7 @@ STATIC mp_obj_t machine_pin_obj_init(size_t n_args, const mp_obj_t *args, mp_map
 MP_DEFINE_CONST_FUN_OBJ_KW(machine_pin_init_obj, 1, machine_pin_obj_init);
 
 // Pin.value([value])
-STATIC mp_obj_t machine_pin_value(size_t n_args, const mp_obj_t *args) {
+mp_obj_t machine_pin_value(size_t n_args, const mp_obj_t *args) {
     return machine_pin_call(args[0], n_args - 1, 0, args + 1);
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_pin_value_obj, 1, 2, machine_pin_value);
@@ -181,9 +180,11 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_pin_disable_obj, machine_pin_disable);
 // Pin.low() Totem-pole (push-pull)
 STATIC mp_obj_t machine_pin_low(mp_obj_t self_in) {
     machine_pin_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    gpio_set_pin_direction(self->id, GPIO_DIRECTION_OUT);
-    gpio_set_pin_level(self->id, false);
-
+    if (GPIO_IS_OPEN_DRAIN(self->id)) {
+        mp_hal_pin_od_low(self->id);
+    } else {
+        mp_hal_pin_low(self->id);
+    }
     return mp_const_none;
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_pin_low_obj, machine_pin_low);
@@ -191,9 +192,11 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_pin_low_obj, machine_pin_low);
 // Pin.high() Totem-pole (push-pull)
 STATIC mp_obj_t machine_pin_high(mp_obj_t self_in) {
     machine_pin_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    gpio_set_pin_direction(self->id, GPIO_DIRECTION_OUT);
-    gpio_set_pin_level(self->id, true);
-
+    if (GPIO_IS_OPEN_DRAIN(self->id)) {
+        mp_hal_pin_od_high(self->id);
+    } else {
+        mp_hal_pin_high(self->id);
+    }
     return mp_const_none;
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_pin_high_obj, machine_pin_high);
@@ -205,18 +208,18 @@ STATIC mp_obj_t machine_pin_toggle(mp_obj_t self_in) {
     // Determine DIRECTION of PIN.
     bool pin_dir;
 
-    pin_dir = (PORT->Group[(enum gpio_port)GPIO_PORT(self->id)].DIR.reg // Get PORT#
-        & (1 << GPIO_PIN(self->id)))      // Isolate the Pin in question
-        >> GPIO_PIN(self->id);            // Shift to LSB for binary result.
-
-    if (pin_dir) {
-        // Pin is OUTPUT
-        gpio_set_pin_direction(self->id, GPIO_DIRECTION_OUT);
-        gpio_toggle_pin_level(self->id);
+    if (GPIO_IS_OPEN_DRAIN(self->id)) {
+        pin_dir = mp_hal_get_pin_direction(self->id);
+        if (pin_dir) {
+            // Pin is output, thus low, switch to high
+            mp_hal_pin_od_high(self->id);
+        } else {
+            mp_hal_pin_od_low(self->id);
+        }
     } else {
-        mp_raise_ValueError(MP_ERROR_TEXT("Cannot TOGGLE INPUT pin!\n"));
+        gpio_toggle_pin_level(self->id);
     }
-    return mp_const_true;
+    return mp_const_none;
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_pin_toggle_obj, machine_pin_toggle);
 
@@ -250,20 +253,15 @@ STATIC const mp_rom_map_elem_t machine_pin_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_disable), MP_ROM_PTR(&machine_pin_disable_obj) },
     { MP_ROM_QSTR(MP_QSTR_drive), MP_ROM_PTR(&machine_pin_drive_obj) },
 
-
-    // { MP_ROM_QSTR(MP_QSTR_irq), MP_ROM_PTR(&machine_pin_irq_obj) },
-
     // class constants
     { MP_ROM_QSTR(MP_QSTR_IN), MP_ROM_INT(GPIO_MODE_IN) },
     { MP_ROM_QSTR(MP_QSTR_OUT), MP_ROM_INT(GPIO_MODE_OUT) },
-    // { MP_ROM_QSTR(MP_QSTR_ALT), MP_ROM_INT(GPIO_MODE_ALT) },
+    { MP_ROM_QSTR(MP_QSTR_OPEN_DRAIN), MP_ROM_INT(GPIO_MODE_OPEN_DRAIN) },
     { MP_ROM_QSTR(MP_QSTR_PULL_OFF), MP_ROM_INT(GPIO_PULL_OFF) },
     { MP_ROM_QSTR(MP_QSTR_PULL_UP), MP_ROM_INT(GPIO_PULL_UP) },
     { MP_ROM_QSTR(MP_QSTR_PULL_DOWN), MP_ROM_INT(GPIO_PULL_DOWN) },
     { MP_ROM_QSTR(MP_QSTR_LOW_POWER), MP_ROM_INT(GPIO_STRENGTH_2MA) },
     { MP_ROM_QSTR(MP_QSTR_HIGH_POWER), MP_ROM_INT(GPIO_STRENGTH_8MA) },
-    // { MP_ROM_QSTR(MP_QSTR_IRQ_RISING), MP_ROM_INT(GPIO_IRQ_EDGE_RISE) },
-    // { MP_ROM_QSTR(MP_QSTR_IRQ_FALLING), MP_ROM_INT(GPIO_IRQ_EDGE_FALL) },
 };
 STATIC MP_DEFINE_CONST_DICT(machine_pin_locals_dict, machine_pin_locals_dict_table);
 
@@ -298,34 +296,6 @@ MP_DEFINE_CONST_OBJ_TYPE(
     locals_dict, &machine_pin_locals_dict
     );
 
-/*
-STATIC mp_uint_t machine_pin_irq_trigger(mp_obj_t self_in, mp_uint_t new_trigger) {
-    machine_pin_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    machine_pin_irq_obj_t *irq = MP_STATE_PORT(machine_pin_irq_obj[self->id]);
-    gpio_set_irq_enabled(self->id, GPIO_IRQ_ALL, false);
-    irq->flags = 0;
-    irq->trigger = new_trigger;
-    gpio_set_irq_enabled(self->id, new_trigger, true);
-    return 0;
-}
-
-STATIC mp_uint_t machine_pin_irq_info(mp_obj_t self_in, mp_uint_t info_type) {
-    machine_pin_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    machine_pin_irq_obj_t *irq = MP_STATE_PORT(machine_pin_irq_obj[self->id]);
-    if (info_type == MP_IRQ_INFO_FLAGS) {
-        return irq->flags;
-    } else if (info_type == MP_IRQ_INFO_TRIGGERS) {
-        return irq->trigger;
-    }
-    return 0;
-}
-
-STATIC const mp_irq_methods_t machine_pin_irq_methods = {
-    .trigger = machine_pin_irq_trigger,
-    .info = machine_pin_irq_info,
-};
-*/
-
 mp_hal_pin_obj_t mp_hal_get_pin_obj(mp_obj_t obj) {
     if (!mp_obj_is_type(obj, &machine_pin_type)) {
         mp_raise_ValueError(MP_ERROR_TEXT("expecting a Pin"));
diff --git a/ports/samd/mphalport.h b/ports/samd/mphalport.h
index b18aa2f9b4355..0a1db7df0c5b1 100644
--- a/ports/samd/mphalport.h
+++ b/ports/samd/mphalport.h
@@ -101,7 +101,7 @@ static inline void mp_hal_pin_output(mp_hal_pin_obj_t pin) {
 
 static inline void mp_hal_pin_open_drain(mp_hal_pin_obj_t pin) {
     gpio_set_pin_direction(pin, GPIO_DIRECTION_IN);
-    gpio_set_pin_level(pin, 0);
+    gpio_set_pin_pull_mode(pin, GPIO_PULL_UP);
     machine_pin_open_drain_mask[pin / 32] |= 1 << (pin % 32);
 }
 
@@ -127,10 +127,12 @@ static inline void mp_hal_pin_high(mp_hal_pin_obj_t pin) {
 
 static inline void mp_hal_pin_od_low(mp_hal_pin_obj_t pin) {
     gpio_set_pin_direction(pin, GPIO_DIRECTION_OUT);
+    gpio_set_pin_level(pin, 0);
 }
 
 static inline void mp_hal_pin_od_high(mp_hal_pin_obj_t pin) {
     gpio_set_pin_direction(pin, GPIO_DIRECTION_IN);
+    gpio_set_pin_pull_mode(pin, GPIO_PULL_UP);
 }
 
 #endif // MICROPY_INCLUDED_SAMD_MPHALPORT_H

From e8615f5813855a3f839714fb62c7d8a5e0082072 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sat, 4 Jun 2022 20:56:18 +0200
Subject: [PATCH 2682/3533] samd/machine_pin: Allow specifying a pin or LED by
 its name as a string.

The names are defined in pins.csv.
---
 ports/samd/boards/make-pins.py | 10 ++++++----
 ports/samd/machine_led.c       |  6 ++----
 ports/samd/machine_pin.c       | 23 ++++++++++++++++++++++-
 3 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/ports/samd/boards/make-pins.py b/ports/samd/boards/make-pins.py
index 400a9c9b8870f..2b62ba7c59593 100644
--- a/ports/samd/boards/make-pins.py
+++ b/ports/samd/boards/make-pins.py
@@ -15,6 +15,8 @@
     char *name;
 } machine_pin_obj_t;
 
+int pin_find(mp_obj_t pin, const machine_pin_obj_t machine_pin_obj[], int table_size);
+
 """
 
 led_header_prefix = """typedef struct _machine_led_obj_t {
@@ -33,19 +35,19 @@ def __init__(self):
 
     def parse_csv_file(self, filename):
         with open(filename, "r") as csvfile:
-            rows = csv.reader(csvfile)
+            rows = csv.reader(csvfile, skipinitialspace=True)
             for row in rows:
                 # Pin numbers must start with "PIN_"
                 # LED numbers must start with "LED_"
                 if len(row) > 0:
-                    if row[0].strip().startswith("PIN_"):
+                    if row[0].startswith("PIN_"):
                         if len(row) == 1:
                             self.board_pins.append([row[0], row[0][4:]])
                         else:
                             self.board_pins.append([row[0], row[1]])
-                    elif row[0].strip().startswith("LED_"):
+                    elif row[0].startswith("LED_"):
                         self.board_leds.append(["PIN_" + row[0][4:], row[1]])
-                    elif row[0].strip().startswith("-"):
+                    elif row[0].startswith("-"):
                         self.board_pins.append(["-1", ""])
 
     def print_pins(self, pins_filename):
diff --git a/ports/samd/machine_led.c b/ports/samd/machine_led.c
index 03b47e7cf2aac..9c157695818a8 100644
--- a/ports/samd/machine_led.c
+++ b/ports/samd/machine_led.c
@@ -30,12 +30,10 @@
 #include "py/mphal.h"
 #include "extmod/virtpin.h"
 #include "modmachine.h"
-#include "pins.h" // boards/<BOARD>/
+#include "pins.h"
 
 // ASF4 (MCU package specific pin defs in 'boards')
 #include "hal_gpio.h"
-#include "hpl_gpio.h"
-#include "hal_atomic.h"
 
 STATIC void machine_led_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     machine_led_obj_t *self = self_in;
@@ -70,7 +68,7 @@ mp_obj_t mp_led_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw,
     mp_arg_check_num(n_args, n_kw, 1, MP_OBJ_FUN_ARGS_MAX, true);
 
     // get the wanted LED object
-    int wanted_led = mp_obj_get_int(args[0]);
+    int wanted_led = pin_find(args[0], (const machine_pin_obj_t *)machine_led_obj, MP_ARRAY_SIZE(machine_led_obj));
     const machine_led_obj_t *self = NULL;
     if (0 <= wanted_led && wanted_led < MP_ARRAY_SIZE(machine_led_obj)) {
         self = (machine_led_obj_t *)&machine_led_obj[wanted_led];
diff --git a/ports/samd/machine_pin.c b/ports/samd/machine_pin.c
index 49aecba011e9b..98317abbf26a0 100644
--- a/ports/samd/machine_pin.c
+++ b/ports/samd/machine_pin.c
@@ -26,6 +26,7 @@
  * Uses pins.h & pins.c to create board (MCU package) specific 'machine_pin_obj' array.
  */
 
+#include "string.h"
 #include "py/runtime.h"
 #include "py/mphal.h"
 #include "extmod/virtpin.h"
@@ -58,6 +59,26 @@ STATIC void pin_validate_drive(bool strength) {
     }
 }
 
+int pin_find(mp_obj_t pin, const machine_pin_obj_t machine_pin_obj[], int table_size) {
+    int wanted_pin = -1;
+    if (mp_obj_is_small_int(pin)) {
+        // Pin defined by the index of pin table
+        wanted_pin = mp_obj_get_int(pin);
+    } else if (mp_obj_is_str(pin)) {
+        // Search by name
+        size_t slen;
+        const char *s = mp_obj_str_get_data(pin, &slen);
+        for (wanted_pin = 0; wanted_pin < table_size; wanted_pin++) {
+            if (slen == strlen(machine_pin_obj[wanted_pin].name) &&
+                strncmp(s, machine_pin_obj[wanted_pin].name, slen) == 0) {
+                break;
+            }
+        }
+    }
+    return wanted_pin;
+}
+
+
 // Pin.init(mode, pull=None, *, value=None, drive=0). No 'alt' yet.
 STATIC mp_obj_t machine_pin_obj_init_helper(const machine_pin_obj_t *self, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_mode, ARG_pull, ARG_value, ARG_drive, ARG_alt };
@@ -112,7 +133,7 @@ mp_obj_t mp_pin_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw,
     mp_arg_check_num(n_args, n_kw, 1, MP_OBJ_FUN_ARGS_MAX, true);
 
     // get the wanted pin object
-    int wanted_pin = mp_obj_get_int(args[0]);
+    int wanted_pin = pin_find(args[0], machine_pin_obj, MP_ARRAY_SIZE(machine_pin_obj));
 
     const machine_pin_obj_t *self = NULL;
     if (0 <= wanted_pin && wanted_pin < MP_ARRAY_SIZE(machine_pin_obj)) {

From 4013577af2f530599db80a6696c23be2ed335bee Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sat, 4 Jun 2022 21:26:45 +0200
Subject: [PATCH 2683/3533] samd/modmachine: Enable SoftSPI and SoftI2C.

---
 ports/samd/Makefile       | 1 +
 ports/samd/modmachine.c   | 4 ++++
 ports/samd/mpconfigport.h | 2 ++
 3 files changed, 7 insertions(+)

diff --git a/ports/samd/Makefile b/ports/samd/Makefile
index e3316a9d6c114..ea71973bd7635 100644
--- a/ports/samd/Makefile
+++ b/ports/samd/Makefile
@@ -110,6 +110,7 @@ SRC_C = \
 	lib/tinyusb/src/device/usbd_control.c \
 	lib/tinyusb/src/portable/microchip/samd/dcd_samd.c \
 	lib/tinyusb/src/tusb.c \
+	drivers/bus/softspi.c \
 	shared/libc/printf.c \
 	shared/libc/string0.c \
 	shared/readline/readline.c \
diff --git a/ports/samd/modmachine.c b/ports/samd/modmachine.c
index 99fccf5bf0085..b095a6b39dc96 100644
--- a/ports/samd/modmachine.c
+++ b/ports/samd/modmachine.c
@@ -28,6 +28,8 @@
 #include "extmod/machine_mem.h"
 #include "samd_soc.h"
 #include "modmachine.h"
+#include "extmod/machine_i2c.h"
+#include "extmod/machine_spi.h"
 
 // ASF 4
 #include "hal_flash.h"
@@ -129,6 +131,8 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_unique_id),           MP_ROM_PTR(&machine_unique_id_obj) },
     { MP_ROM_QSTR(MP_QSTR_Pin),                 MP_ROM_PTR(&machine_pin_type) },
     { MP_ROM_QSTR(MP_QSTR_LED),                 MP_ROM_PTR(&machine_led_type) },
+    { MP_ROM_QSTR(MP_QSTR_SoftI2C),             MP_ROM_PTR(&mp_machine_soft_i2c_type) },
+    { MP_ROM_QSTR(MP_QSTR_SoftSPI),             MP_ROM_PTR(&mp_machine_soft_spi_type) },
 };
 STATIC MP_DEFINE_CONST_DICT(machine_module_globals, machine_module_globals_table);
 
diff --git a/ports/samd/mpconfigport.h b/ports/samd/mpconfigport.h
index c29043c5d0a2a..6441818ba2c5f 100644
--- a/ports/samd/mpconfigport.h
+++ b/ports/samd/mpconfigport.h
@@ -97,6 +97,8 @@
 #define MICROPY_PY_URANDOM                  (1)
 #define MICROPY_PY_UZLIB                    (1)
 #define MICROPY_PY_UASYNCIO                 (1)
+#define MICROPY_PY_MACHINE_SOFTI2C          (1)
+#define MICROPY_PY_MACHINE_SOFTSPI          (1)
 
 #define MP_STATE_PORT MP_STATE_VM
 

From 6c037af086acd90755f93cd323a5114984885449 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sun, 5 Jun 2022 08:55:27 +0200
Subject: [PATCH 2684/3533] samd/boards: Create pin_af_table.c from
 pin_af_table_SAMDxx.csv files.

This step just creates the table.  The firmware cannot be built at this
commit.  The next commit will complete the pin-af mechanism.
---
 ports/samd/Makefile                       |  23 ++++-
 ports/samd/boards/make-pin-af.py          | 104 ++++++++++++++++++++
 ports/samd/boards/pin-af-table-SAMD21.csv |  65 +++++++++++++
 ports/samd/boards/pin-af-table-SAMD51.csv | 113 ++++++++++++++++++++++
 4 files changed, 300 insertions(+), 5 deletions(-)
 create mode 100644 ports/samd/boards/make-pin-af.py
 create mode 100644 ports/samd/boards/pin-af-table-SAMD21.csv
 create mode 100644 ports/samd/boards/pin-af-table-SAMD51.csv

diff --git a/ports/samd/Makefile b/ports/samd/Makefile
index ea71973bd7635..1556d81617201 100644
--- a/ports/samd/Makefile
+++ b/ports/samd/Makefile
@@ -45,12 +45,22 @@ INC += -I$(TOP)/lib/asf4/$(MCU_SERIES_LOWER)/include
 INC += -I$(TOP)/lib/asf4/$(MCU_SERIES_LOWER)/include/pio
 INC += -I$(TOP)/lib/tinyusb/src
 
+MAKE_PIN_AF = boards/make-pin-af.py
+PIN_AF_TABLE_CSV = boards/pin-af-table-$(MCU_SERIES).csv
+GEN_PIN_AF = pin_af_table.c
+
+MAKE_PINS = boards/make-pins.py
+BOARD_PINS = $(BOARD_DIR)/pins.csv
+GEN_PINS_SRC = $(BUILD)/pins.c
+GEN_PINS_HDR = $(BUILD)/pins.h
+
 CFLAGS_MCU_SAMD21 = -mtune=cortex-m0plus -mcpu=cortex-m0plus -msoft-float
 CFLAGS_MCU_SAMD51 = -mtune=cortex-m4 -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard
 CFLAGS = $(INC) -Wall -Werror -std=c99 -nostdlib -mthumb $(CFLAGS_MCU_$(MCU_SERIES)) -fsingle-precision-constant -Wdouble-promotion
 CFLAGS += -DMCU_$(MCU_SERIES) -D__$(CMSIS_MCU)__
 CFLAGS += $(CFLAGS_MOD) $(CFLAGS_EXTRA)
 CFLAGS += -DMPCONFIG_MCU_H='<boards/mpconfig_$(MCU_SERIES_LOWER).h>'
+CFLAGS += -DPIN_AF_TABLE_C='<$(BUILD)/$(GEN_PIN_AF)>'
 
 QSTR_GLOBAL_DEPENDENCIES += boards/mpconfig_$(MCU_SERIES_LOWER).h
 
@@ -59,11 +69,6 @@ LDFLAGS += $(LDFLAGS_MOD)
 
 LIBS = $(shell $(CC) $(CFLAGS) -print-libgcc-file-name)
 
-MAKE_PINS = boards/make-pins.py
-BOARD_PINS = $(BOARD_DIR)/pins.csv
-GEN_PINS_SRC = $(BUILD)/pins.c
-GEN_PINS_HDR = $(BUILD)/pins.h
-
 # Tune for Debugging or Optimization
 CFLAGS += -g  # always include debug info in the ELF
 ifeq ($(DEBUG),1)
@@ -92,6 +97,7 @@ SRC_C = \
 	modmachine.c \
 	modsamd.c \
 	mphalport.c \
+	pin_af.c \
 	$(BUILD)/pins.c \
 	samd_flash.c \
 	samd_isr.c \
@@ -170,6 +176,13 @@ $(BUILD)/firmware.bin: $(BUILD)/firmware.elf
 $(BUILD)/firmware.uf2: $(BUILD)/firmware.bin
 	$(Q)$(PYTHON) $(UF2CONV) -b $(TEXT0) -c -o $@ $<
 
+pin_af.c: $(BUILD)/$(GEN_PIN_AF)
+
+$(BUILD)/$(GEN_PIN_AF): $(PIN_AF_TABLE_CSV)
+	$(ECHO) "Create $@"
+	$(Q)$(PYTHON) $(MAKE_PIN_AF) --csv $(PIN_AF_TABLE_CSV) --table $(BUILD)/$(GEN_PIN_AF) --mcu $(MCU_SERIES)
+
+
 $(GEN_PINS_SRC): $(BOARD_PINS)
 	$(ECHO) "Create $@"
 	$(Q)$(PYTHON) $(MAKE_PINS) --board $(BOARD_PINS) --pins $(GEN_PINS_SRC) --inc $(GEN_PINS_HDR)
diff --git a/ports/samd/boards/make-pin-af.py b/ports/samd/boards/make-pin-af.py
new file mode 100644
index 0000000000000..d895ef9dd99a4
--- /dev/null
+++ b/ports/samd/boards/make-pin-af.py
@@ -0,0 +1,104 @@
+#!/usr/bin/env python
+"""Generates the pin_cap table file for the SAMD port."""
+
+from __future__ import print_function
+
+import argparse
+import sys
+import csv
+
+table_header = """// This file was automatically generated by make-pin-cap.py
+//
+
+"""
+
+
+class Pins:
+    def __init__(self):
+        self.board_pins = []  # list of pin objects
+
+    def parse_csv_file(self, filename):
+        with open(filename, "r") as csvfile:
+            rows = csv.reader(csvfile)
+            for row in rows:
+                # Pin numbers must start with "PA", "PB", "PC" or "PD"
+                if len(row) > 0 and row[0].strip().upper()[:2] in ("PA", "PB", "PC", "PD"):
+                    self.board_pins.append(row)
+
+    def print_table(self, table_filename, mcu_name):
+        with open(table_filename, "wt") as table_file:
+            table_file.write(table_header)
+            table_file.write("const pin_af_t pin_af_table[] = {\n")
+            if mcu_name == "SAMD21":
+                for row in self.board_pins:
+                    pin = "PIN_" + row[0].upper()
+                    table_file.write("    #ifdef " + pin + "\n")
+                    eic = row[1] if row[1] else "0xff"
+                    adc = row[2] if row[2] else "0xff"
+                    table_file.write("    {%s, %s, %s" % (pin, eic, adc))
+                    for cell in row[3:]:
+                        if cell:
+                            table_file.write(
+                                ", 0x%s" % cell if len(cell) == 2 else ", 0x0%s" % cell
+                            )
+                        else:
+                            table_file.write(", 0xff")
+                    table_file.write("},\n")
+                    table_file.write("    #endif\n")
+            else:
+                for row in self.board_pins:
+                    pin = "PIN_" + row[0].upper()
+                    table_file.write("    #ifdef " + pin + "\n")
+                    eic = row[1] if row[1] else "0xff"
+                    adc0 = row[2] if row[2] else "0xff"
+                    adc1 = row[3] if row[3] else "0xff"
+                    table_file.write("    {%s, %s, %s, %s" % (pin, eic, adc0, adc1))
+                    for cell in row[4:]:
+                        if cell:
+                            table_file.write(
+                                ", 0x%s" % cell if len(cell) == 2 else ", 0x0%s" % cell
+                            )
+                        else:
+                            table_file.write(", 0xff")
+                    table_file.write("},\n")
+                    table_file.write("    #endif\n")
+            table_file.write("};\n")
+
+
+def main():
+    parser = argparse.ArgumentParser(
+        prog="make-pin-cap.py",
+        usage="%(prog)s [options] [command]",
+        description="Generate MCU-specific pin cap table file",
+    )
+    parser.add_argument(
+        "-c",
+        "--csv",
+        dest="csv_filename",
+        help="Specifies the pin-mux-xxxx.csv filename",
+    )
+    parser.add_argument(
+        "-t",
+        "--table",
+        dest="table_filename",
+        help="Specifies the name of the generated pin cap table file",
+    )
+    parser.add_argument(
+        "-m",
+        "--mcu",
+        dest="mcu_name",
+        help="Specifies type of the MCU (SAMD21 or SAMD51)",
+    )
+    args = parser.parse_args(sys.argv[1:])
+
+    pins = Pins()
+
+    if args.csv_filename:
+        pins.parse_csv_file(args.csv_filename)
+
+    if args.table_filename:
+        pins.print_table(args.table_filename, args.mcu_name)
+
+
+if __name__ == "__main__":
+    main()
diff --git a/ports/samd/boards/pin-af-table-SAMD21.csv b/ports/samd/boards/pin-af-table-SAMD21.csv
new file mode 100644
index 0000000000000..d8ab903c9e7c4
--- /dev/null
+++ b/ports/samd/boards/pin-af-table-SAMD21.csv
@@ -0,0 +1,65 @@
+# The pin_cap_tables contain the information anbout pin mux set and pad
+# for some of the peripheral devices with many possible assignments.
+# The pin_cap_table is a subset from table 7-1 of the data sheet.
+# It contain the information about pin mux set and pad
+# The eic and adc columns contain the decimal numer for the respecitive
+# quantity, the columns for sercom, tc and tcc have in each cell
+# the device number in the upper nibble, and the pad number in the lower
+# nibble. If a signal is not available, the cell in the csv table is left empty.
+# The first column is the pin id, not the number of the board pin.
+# Rows not starting with pa, pb, pc or pd are ignored.
+# When editing the table with a spread sheet, take care to import the data as text.
+#
+# Pin,EIC,ADC,SERCOM1,SERCOM2,TC,TCC
+pa00,0,,,10,20,
+pa01,1,,,11,21,
+pa02,2,0,,,,
+pa03,3,1,,,,
+pb04,4,12,,,,
+pb05,5,13,,,,
+pb06,6,14,,,,
+pb07,7,15,,,,
+pb08,8,2,,40,40,
+pb09,9,3,,41,41,
+pa04,4,4,,00,00,
+pa05,5,5,,01,01,
+pa06,6,6,,02,10,
+pa07,7,7,,03,11,
+pa08,,16,00,20,00,12
+pa09,9,17,01,21,01,13
+pa10,10,18,02,22,10,02
+pa11,11,19,03,23,11,03
+pb10,10,,,42,50,04
+pb11,11,,,43,51,05
+pb12,12,,40,,40,06
+pb13,13,,41,,41,07
+pb14,14,,42,,50,
+pb15,15,,43,,51,
+pa12,12,,20,40,20,06
+pa13,13,,21,41,20,07
+pa14,14,,22,42,30,04
+pa15,15,,23,43,31,05
+pa16,0,,10,30,20,06
+pa17,1,,11,31,21,07
+pa18,2,,12,32,30,02
+pa19,3,,13,33,31,03
+pb16,9,,50,,60,04
+pb17,1,,51,,61,05
+pa20,4,,52,32,70,04
+pa21,5,,53,33,71,07
+pa22,6,,30,50,40,04
+pa23,7,,31,51,41,05
+pa24,12,,32,52,50,12
+pa25,13,,33,53,51,13
+pb22,6,,,52,70,
+pb23,7,,,53,71,
+pa27,15,,,,,
+pa28,8,,,,,
+pa30,10,,,12,10,
+pa31,11,,,13,11,
+pb30,14,,,50,00,12
+pb31,15,,,51,01,13
+pb00,0,,,52,70,
+pb01,1,,,53,71,
+pb02,2,,,50,60,
+pb03,3,,,51,61,
diff --git a/ports/samd/boards/pin-af-table-SAMD51.csv b/ports/samd/boards/pin-af-table-SAMD51.csv
new file mode 100644
index 0000000000000..70a009ba52231
--- /dev/null
+++ b/ports/samd/boards/pin-af-table-SAMD51.csv
@@ -0,0 +1,113 @@
+# The pin_cap_table is a subset from table 6-1 of the data sheet.
+# It  contain the information about pin mux set and pad
+# for some of the peripheral devices with many possible assignments.
+# The colums represent the peripheral class, as defined in pin_cap_t. The
+# column number is equivalent to the mux class.
+# The eic and adc columns contain the decimal numer for the respecitive
+# quantity, the columns for sercom, tc and tcc have in each cell
+# the device number in the first, and the pad number in the second
+# digit. If a signal is not available, the cell in the csv table is left empty.
+# The first column is the pin id, not the number of the board pin.
+# Rows not starting with pa, pb, pc or pd are ignored.
+# When editing the table with a spread sheet, take care to import the data as text.
+#
+# Pin,EIC,ADC0,ADC1,SERCOM1,SERCOM2,TC,TCC1,TCC2
+pb03,9,15,,,51,61,,
+pa00,0,,,,10,20,,
+pa01,1,,,,11,21,,
+pc00,0,,10,,,,,
+pc01,1,,11,,,,,
+pc02,2,,4,,,,,
+pc03,3,,5,,,,,
+pa02,2,0,,,,,,
+pa03,3,10,,,,,,
+pb04,4,,6,,,,,
+pb05,5,,7,,,,,
+pd00,0,,14,,,,,
+pd01,1,,15,,,,,
+pb06,6,,8,,,,,
+pb07,7,,9,,,,,
+pb08,8,2,0,,40,40,,
+pb09,9,3,1,,41,41,,
+pa04,4,4,,,00,00,,
+pa05,5,5,,,01,01,,
+pa06,6,6,,,02,10,,
+pa07,7,7,,,03,11,,
+pc04,4,,,60,,,00,
+pc05,5,,,61,,,,
+pc06,6,,,62,,,,
+pc07,9,,,63,,,,
+pa08,,8,2,00,21,00,00,14
+pa09,9,9,3,01,20,01,01,15
+pa10,10,10,,02,22,10,02,16
+pa11,11,11,,03,23,11,03,17
+pb10,10,,,,42,50,04,10
+pb11,12,,,,43,51,05,11
+pb12,12,,,40,,40,30,00
+pb13,13,,,41,,41,31,01
+pb14,14,,,42,,50,40,02
+pb15,15,,,43,,51,41,03
+pd08,3,,,70,61,,01,
+pd09,4,,,71,60,,02,
+pd10,5,,,72,62,,03,
+pd11,6,,,73,63,,04,
+pd12,7,,,,,,05,
+pc10,10,,,62,72,,00,14
+pc11,11,,,63,73,,01,15
+pc12,12,,,70,61,,02,16
+pc13,13,,,71,60,,03,17
+pc14,14,,,72,62,,04,10
+pc15,15,,,73,63,,05,11
+pa12,12,,,20,41,20,06,12
+pa13,13,,,21,40,21,07,13
+pa14,14,,,22,42,30,20,12
+pa15,15,,,23,43,31,21,13
+pa16,0,,,10,31,20,10,04
+pa17,1,,,11,30,21,11,05
+pa18,2,,,12,32,30,12,06
+pa19,3,,,13,33,31,13,07
+pc16,0,,,60,01,,00,
+pc17,1,,,61,00,,01,
+pc18,2,,,62,02,,02,
+pc19,3,,,63,03,,03,
+pc20,4,,,,,,04,
+pc21,5,,,,,,05,
+pc22,6,,,10,31,,05,
+pc23,7,,,11,30,,07,
+pd20,10,,,12,32,,10,
+pd21,11,,,13,33,,11,
+pb16,0,,,50,,60,30,04
+pb17,1,,,51,,61,31,05
+pb18,2,,,52,72,,10,
+pb19,3,,,53,73,,11,
+pb20,4,,,30,71,,12,
+pb21,5,,,31,70,,13,
+pa20,4,,,52,32,70,14,00
+pa21,5,,,53,33,71,15,01
+pa22,6,,,30,51,40,16,02
+pa23,7,,,31,50,41,17,03
+pa24,8,,,32,52,50,22,
+pa25,9,,,33,53,51,,
+pb22,22,,,12,52,70,,
+pb23,7,,,13,53,71,,
+pb24,8,,,00,21,,,
+pb25,9,,,01,20,,,
+pb26,12,,,20,41,,12,
+pb27,13,,,21,40,,13,
+pb28,14,,,22,42,,14,
+pb29,15,,,23,43,,15,
+pc24,8,,,02,22,,,
+pc25,9,,,03,23,,,
+pc26,10,,,,,,,
+pc27,11,,,10,,,,
+pc28,12,,,11,,,,
+pa27,11,,,,,,,
+pa30,14,,,72,12,60,20,
+pa31,15,,,73,13,61,21,
+pb30,14,,,70,51,00,40,06
+pb31,15,,,71,50,01,41,07
+pc30,14,,12,,,,,
+pc31,15,,13,,,,,
+pb00,9,12,,,52,70,,
+pb01,1,13,,,53,71,,
+pb02,2,14,,,50,60,22,

From 6765d4bbd66c19898158504ed8102ebd8de4c645 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sun, 5 Jun 2022 09:26:49 +0200
Subject: [PATCH 2685/3533] samd/pin_af: Add the pin af table and its helper
 functions.

The pin af table is a representation of the MUX table from the data sheet.
It provides information for each pin about the supported device functions.

That information is needed by pin.irq, machine.ADC, machine.PWM,
machine.UART, machine.SPI and machine.I2C.  For each of these, the table
tells for each pin, which device number, af number and pad number is
assigned.  Using the table gives a straight, uniform access to the
information, where the benefit outweights the size of the table, which is
not that large.

The tables are MCU-specific.  It is not required to tell for each board,
which and where each of the above devices is available.  That makes addding
boards easy.

Note: The information for DAC and I2S was not included, since it affects
only a few pins.
---
 ports/samd/pin_af.c | 125 ++++++++++++++++++++++++++++++++++++++++++++
 ports/samd/pin_af.h |  90 +++++++++++++++++++++++++++++++
 2 files changed, 215 insertions(+)
 create mode 100644 ports/samd/pin_af.c
 create mode 100644 ports/samd/pin_af.h

diff --git a/ports/samd/pin_af.c b/ports/samd/pin_af.c
new file mode 100644
index 0000000000000..8c152e0d8be02
--- /dev/null
+++ b/ports/samd/pin_af.c
@@ -0,0 +1,125 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2022 Robert Hammelrath
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * This file provides and checks pin capabilities as required
+ * for USART, I2C, SPI, PWM, ADC
+ *
+ */
+
+#include <stdint.h>
+
+#include "py/runtime.h"
+#include "py/misc.h"
+#include "pin_af.h"
+#include "sam.h"
+
+
+extern const uint8_t tcc_channel_count[];
+
+#include PIN_AF_TABLE_C
+
+// Just look for an table entry for a given pin and raise an error
+// in case of no match (which should not happen).
+
+const pin_af_t *get_pin_af_info(int pin_id) {
+    for (int i = 0; i < MP_ARRAY_SIZE(pin_af_table); i++) {
+        if (pin_af_table[i].pin_id == pin_id) { // Pin match
+            return &pin_af_table[i];
+        }
+    }
+    mp_raise_ValueError(MP_ERROR_TEXT("wrong pin"));
+}
+
+// Test, wether the given pin is defined and has signals for sercom.
+// If that applies return the alt_fct and pad_nr.
+// If not, an error will be raised.
+
+sercom_pad_config_t get_sercom_config(int pin_id, uint8_t sercom_nr) {
+    const pin_af_t *pct_ptr = get_pin_af_info(pin_id);
+    if ((pct_ptr->sercom1 >> 4) == sercom_nr) {
+        return (sercom_pad_config_t) {ALT_FCT_SERCOM1, pct_ptr->sercom1 & 0x0f};
+    } else if ((pct_ptr->sercom2 >> 4) == sercom_nr) {
+        return (sercom_pad_config_t) {ALT_FCT_SERCOM2, pct_ptr->sercom2 & 0x0f};
+    } else {
+        mp_raise_ValueError(MP_ERROR_TEXT("wrong serial device"));
+    }
+}
+
+// Test, wether the given pin is defined as ADC.
+// If that applies return the adc instance and channel.
+// If not, an error will be raised.
+
+adc_config_t get_adc_config(int pin_id, int32_t flag) {
+    const pin_af_t *pct_ptr = get_pin_af_info(pin_id);
+    if (pct_ptr->adc0 != 0xff && (flag & (1 << pct_ptr->adc0)) == 0) {
+        return (adc_config_t) {0, pct_ptr->adc0};
+    #if defined(MUC_SAMD51)
+    } else if (pct_ptr->adc1 != 0xff && (flag & (1 << (pct_ptr->adc1 + 16))) == 0) {
+        return (adc_config_t) {1, pct_ptr->adc1};
+    #endif
+    } else {
+        mp_raise_ValueError(MP_ERROR_TEXT("ADC pin used"));
+    }
+}
+
+// Test, wether the given pin is defined and has signals for pwm.
+// If that applies return the alt_fct, tcc number and channel number.
+// If not, an error will be raised.
+// The function either supplies a channel from a wanted device, or
+// tries to provide an unused device, if available.
+
+pwm_config_t get_pwm_config(int pin_id, int wanted_dev, uint8_t device_status[]) {
+    const pin_af_t *pct_ptr = get_pin_af_info(pin_id);
+    uint8_t tcc1 = pct_ptr->tcc1;
+    uint8_t tcc2 = pct_ptr->tcc2;
+
+    if (wanted_dev != -1) {
+        if ((tcc1 >> 4) == wanted_dev) {
+            return (pwm_config_t) {ALT_FCT_TCC1, tcc1};
+        } else if ((tcc2 >> 4) == wanted_dev) {
+            return (pwm_config_t) {ALT_FCT_TCC2, tcc2};
+        } else {
+            mp_raise_ValueError(MP_ERROR_TEXT("wrong device or channel"));
+        }
+    } else {
+        pwm_config_t ret = {};
+        if ((tcc1 >> 4) < TCC_INST_NUM) {
+            ret = (pwm_config_t) {ALT_FCT_TCC1, tcc1};
+            if (tcc2 == 0xff) {
+                return ret;
+            }
+        }
+        if ((tcc2 >> 4) < TCC_INST_NUM) {
+            // if a device in slot 1 is not available or already in use, use the one in slot 2
+            if (tcc1 == 0xff || device_status[(ret.device_channel >> 4)] != 0) {
+                return (pwm_config_t) {ALT_FCT_TCC2, tcc2};
+            } else {
+                return ret;
+            }
+        } else {
+            mp_raise_ValueError(MP_ERROR_TEXT("not a PWM pin"));
+        }
+    }
+}
diff --git a/ports/samd/pin_af.h b/ports/samd/pin_af.h
new file mode 100644
index 0000000000000..f9dec6b7da052
--- /dev/null
+++ b/ports/samd/pin_af.h
@@ -0,0 +1,90 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2022 Robert Hammelrath
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * This file initialises provides and checks pin capabilities as required
+ * for USART, I2C, SPI, PWM, ADC
+ *
+ */
+
+#if defined(MCU_SAMD21)
+
+typedef struct {
+    uint8_t pin_id;
+    uint8_t eic;
+    uint8_t adc0;
+    uint8_t sercom1;
+    uint8_t sercom2;
+    uint8_t tcc1;
+    uint8_t tcc2;
+} pin_af_t;
+
+#define ALT_FCT_TC        4
+#define ALT_FCT_TCC1      4
+#define ALT_FCT_TCC2      5
+
+#elif defined(MCU_SAMD51)
+
+typedef struct {
+    uint8_t pin_id;
+    uint8_t eic;
+    uint8_t adc0;
+    uint8_t adc1;
+    uint8_t sercom1;
+    uint8_t sercom2;
+    uint8_t tc;
+    uint8_t tcc1;
+    uint8_t tcc2;
+} pin_af_t;
+
+#define ALT_FCT_TC        4
+#define ALT_FCT_TCC1      5
+#define ALT_FCT_TCC2      6
+
+#endif
+
+typedef struct _sercom_pad_config_t {
+    uint8_t alt_fct;
+    uint8_t pad_nr;
+} sercom_pad_config_t;
+
+typedef struct _adc_config_t {
+    uint8_t device;
+    uint8_t channel;
+} adc_config_t;
+
+typedef struct _pwm_config_t {
+    uint8_t alt_fct;
+    uint8_t device_channel;
+} pwm_config_t;
+
+#define ALT_FCT_EIC       0
+#define ALT_FCT_ADC       1
+#define ALT_FCT_SERCOM1   2
+#define ALT_FCT_SERCOM2   3
+
+sercom_pad_config_t get_sercom_config(int pin_id, uint8_t sercom);
+adc_config_t get_adc_config(int pin_id, int32_t flag);
+pwm_config_t get_pwm_config(int pin_id, int wanted_dev, uint8_t used_dev[]);
+const pin_af_t *get_pin_af_info(int pin_id);

From 5c7e93ec48b04a6a049cc7f2ec90230cd64ecba2 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sun, 5 Jun 2022 10:34:23 +0200
Subject: [PATCH 2686/3533] samd/machine_adc: Add the machine.ADC class.

With the method read_u16().  Keyword arguments of the constructor are:
- bits=n    The resolution; default is 12.
- average=n The average of samples, which are taken and cumulated.  The
            default value is 16.  Averaging by hw is faster than averaging
            in code.

The ADC runs at a clock freq 1.5 MHz.  A single 12 bit conversion takes
8 microseconds.
---
 ports/samd/Makefile      |   2 +
 ports/samd/machine_adc.c | 238 +++++++++++++++++++++++++++++++++++++++
 ports/samd/main.c        |   2 +
 ports/samd/modmachine.c  |   4 +-
 ports/samd/modmachine.h  |   3 +-
 5 files changed, 247 insertions(+), 2 deletions(-)
 create mode 100644 ports/samd/machine_adc.c

diff --git a/ports/samd/Makefile b/ports/samd/Makefile
index 1556d81617201..910ecdac31035 100644
--- a/ports/samd/Makefile
+++ b/ports/samd/Makefile
@@ -90,6 +90,7 @@ endif
 SRC_C = \
 	clock_config.c \
 	help.c \
+	machine_adc.c \
 	machine_led.c \
 	machine_pin.c \
 	main.c \
@@ -138,6 +139,7 @@ endif
 
 # List of sources for qstr extraction
 SRC_QSTR += \
+	machine_adc.c \
 	machine_led.c \
 	machine_pin.c \
 	modutime.c \
diff --git a/ports/samd/machine_adc.c b/ports/samd/machine_adc.c
new file mode 100644
index 0000000000000..97b6a14f17a49
--- /dev/null
+++ b/ports/samd/machine_adc.c
@@ -0,0 +1,238 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Philipp Ebensberger
+ * Copyright (c) 2022 Robert Hammelrath
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include <stdint.h>
+#include "py/obj.h"
+#include "py/runtime.h"
+#include "py/mphal.h"
+
+#include "sam.h"
+#include "pin_af.h"
+#include "modmachine.h"
+
+typedef struct _machine_adc_obj_t {
+    mp_obj_base_t base;
+    adc_config_t adc_config;
+    uint8_t id;
+    uint8_t avg;
+    uint8_t bits;
+} machine_adc_obj_t;
+
+#define DEFAULT_ADC_BITS    12
+#define DEFAULT_ADC_AVG     16
+
+Adc *const adc_bases[] = ADC_INSTS;
+uint32_t busy_flags = 0;
+bool init_flags[2] = {false, false};
+static void adc_init(machine_adc_obj_t *self);
+static uint8_t resolution[] = {
+    ADC_CTRLB_RESSEL_8BIT_Val, ADC_CTRLB_RESSEL_10BIT_Val, ADC_CTRLB_RESSEL_12BIT_Val
+};
+
+// Calculate the floor value of log2(n)
+mp_int_t log2i(mp_int_t num) {
+    mp_int_t res = 0;
+    for (; num > 1; num >>= 1) {
+        res += 1;
+    }
+    return res;
+}
+
+STATIC void adc_obj_print(const mp_print_t *print, mp_obj_t o, mp_print_kind_t kind) {
+    (void)kind;
+    machine_adc_obj_t *self = MP_OBJ_TO_PTR(o);
+
+    mp_printf(print, "ADC(P%c%02u, ADC%u, channel=%u, bits=%u, average=%u)",
+        "ABCD"[self->id / 32], self->id % 32, self->adc_config.device,
+        self->adc_config.channel, self->bits, 1 << self->avg);
+}
+
+STATIC mp_obj_t adc_obj_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
+    enum { ARG_id, ARG_bits, ARG_average };
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_id,       MP_ARG_REQUIRED | MP_ARG_OBJ },
+        { MP_QSTR_bits,     MP_ARG_INT, {.u_int = DEFAULT_ADC_BITS} },
+        { MP_QSTR_average,  MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = DEFAULT_ADC_AVG} },
+    };
+
+    // Parse the arguments.
+    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
+    mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
+
+    // Unpack and check, whther the pin has ADC capability
+    int id = mp_hal_get_pin_obj(args[ARG_id].u_obj);
+    adc_config_t adc_config = get_adc_config(id, busy_flags);
+
+    // Now that we have a valid device and channel, create and populate the ADC instance
+    machine_adc_obj_t *self = mp_obj_malloc(machine_adc_obj_t, &machine_adc_type);
+    self->id = id;
+    self->adc_config = adc_config;
+    self->bits = DEFAULT_ADC_BITS;
+    uint16_t bits = args[ARG_bits].u_int;
+    if (bits >= 8 && bits <= 12) {
+        self->bits = bits;
+    }
+    uint32_t avg = log2i(args[ARG_average].u_int);
+    self->avg = (avg <= 10 ? avg : 10);
+
+    // flag the device/channel as being in use.
+    busy_flags |= (1 << (self->adc_config.device * 16 + self->adc_config.channel));
+
+    adc_init(self);
+
+    return MP_OBJ_FROM_PTR(self);
+}
+
+// read_u16()
+STATIC mp_obj_t machine_adc_read_u16(mp_obj_t self_in) {
+    machine_adc_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    Adc *adc = adc_bases[self->adc_config.device];
+    // Set Input channel and resolution
+    // Select the pin as positive input and gnd as negative input reference, non-diff mode by default
+    adc->INPUTCTRL.reg = ADC_INPUTCTRL_MUXNEG_GND | self->adc_config.channel;
+    // set resolution. Scale 8-16 to 0 - 4 for table access.
+    adc->CTRLB.bit.RESSEL = resolution[(self->bits - 8) / 2];
+    // Measure input voltage
+    adc->SWTRIG.bit.START = 1;
+    while (adc->INTFLAG.bit.RESRDY == 0) {
+    }
+    // Get and return the result
+    return MP_OBJ_NEW_SMALL_INT(adc->RESULT.reg * (65536 / (1 << self->bits)));
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_adc_read_u16_obj, machine_adc_read_u16);
+
+// deinit() : release the ADC channel
+STATIC mp_obj_t machine_adc_deinit(mp_obj_t self_in) {
+    machine_adc_obj_t *self = MP_OBJ_TO_PTR(self_in);
+
+    busy_flags &= ~((1 << (self->adc_config.device * 16 + self->adc_config.channel)));
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_adc_deinit_obj, machine_adc_deinit);
+
+void adc_deinit_all(void) {
+    busy_flags = 0;
+    init_flags[0] = 0;
+    init_flags[1] = 0;
+}
+
+STATIC const mp_rom_map_elem_t adc_locals_dict_table[] = {
+    { MP_ROM_QSTR(MP_QSTR_read_u16), MP_ROM_PTR(&machine_adc_read_u16_obj) },
+    { MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&machine_adc_deinit_obj) },
+};
+
+STATIC MP_DEFINE_CONST_DICT(adc_locals_dict, adc_locals_dict_table);
+
+MP_DEFINE_CONST_OBJ_TYPE(
+    machine_adc_type,
+    MP_QSTR_ADC,
+    MP_TYPE_FLAG_NONE,
+    make_new, adc_obj_make_new,
+    print, adc_obj_print,
+    locals_dict, &adc_locals_dict
+    );
+
+static void adc_init(machine_adc_obj_t *self) {
+    // ADC & clock init is done only once per ADC
+    if (init_flags[self->adc_config.device] == false) {
+        Adc *adc = adc_bases[self->adc_config.device];
+
+        init_flags[self->adc_config.device] = true;
+
+        #if defined(MCU_SAMD21)
+        // Configuration SAMD21
+        // Enable APBD clocks and PCHCTRL clocks; GCLK2 at 48 MHz
+        PM->APBCMASK.reg |= PM_APBCMASK_ADC;
+        GCLK->CLKCTRL.reg = GCLK_CLKCTRL_CLKEN | GCLK_CLKCTRL_GEN_GCLK2 | GCLK_CLKCTRL_ID_ADC;
+        while (GCLK->STATUS.bit.SYNCBUSY) {
+        }
+        // Reset ADC registers
+        adc->CTRLA.bit.SWRST = 1;
+        while (adc->CTRLA.bit.SWRST) {
+        }
+        // Get the calibration data
+        uint32_t bias = (*((uint32_t *)ADC_FUSES_BIASCAL_ADDR) & ADC_FUSES_BIASCAL_Msk) >> ADC_FUSES_BIASCAL_Pos;
+        uint32_t linearity = (*((uint32_t *)ADC_FUSES_LINEARITY_0_ADDR) & ADC_FUSES_LINEARITY_0_Msk) >> ADC_FUSES_LINEARITY_0_Pos;
+        linearity |= ((*((uint32_t *)ADC_FUSES_LINEARITY_1_ADDR) & ADC_FUSES_LINEARITY_1_Msk) >> ADC_FUSES_LINEARITY_1_Pos) << 5;
+        /* Write the calibration data. */
+        ADC->CALIB.reg = ADC_CALIB_BIAS_CAL(bias) | ADC_CALIB_LINEARITY_CAL(linearity);
+        // Divide 48MHz clock by 32 to obtain 1.5 MHz clock to adc
+        adc->CTRLB.reg = ADC_CTRLB_PRESCALER_DIV32;
+        // Select external AREFA as reference voltage.
+        adc->REFCTRL.reg = ADC_REFCTRL_REFSEL_AREFA;
+        // Average: Accumulate samples and scale them down accordingly
+        adc->AVGCTRL.reg = self->avg | ADC_AVGCTRL_ADJRES(self->avg);
+        // Enable ADC and wait to be ready
+        adc->CTRLA.bit.ENABLE = 1;
+        while (adc->STATUS.bit.SYNCBUSY) {
+        }
+
+        #elif defined(MCU_SAMD51)
+        // Configuration SAMD51
+        // Enable APBD clocks and PCHCTRL clocks; GCLK2 at 48 MHz
+        if (self->adc_config.device == 0) {
+            GCLK->PCHCTRL[ADC0_GCLK_ID].reg = GCLK_PCHCTRL_GEN_GCLK2 | GCLK_PCHCTRL_CHEN;
+            MCLK->APBDMASK.bit.ADC0_ = 1;
+        } else {
+            GCLK->PCHCTRL[ADC1_GCLK_ID].reg = GCLK_PCHCTRL_GEN_GCLK2 | GCLK_PCHCTRL_CHEN;
+            MCLK->APBDMASK.bit.ADC1_ = 1;
+        }
+        // Reset ADC registers
+        adc->CTRLA.bit.SWRST = 1;
+        while (adc->CTRLA.bit.SWRST) {
+        }
+        // Get the calibration data
+        uint32_t biascomp;
+        uint32_t biasr2r;
+        uint32_t biasrefbuf;
+        if (self->adc_config.device == 0) {
+            biascomp = (*((uint32_t *)ADC0_FUSES_BIASCOMP_ADDR) & ADC0_FUSES_BIASCOMP_Msk) >> ADC0_FUSES_BIASCOMP_Pos;
+            biasr2r = (*((uint32_t *)ADC0_FUSES_BIASR2R_ADDR) & ADC0_FUSES_BIASR2R_Msk) >> ADC0_FUSES_BIASR2R_Pos;
+            biasrefbuf = (*((uint32_t *)ADC0_FUSES_BIASREFBUF_ADDR) & ADC0_FUSES_BIASREFBUF_Msk) >> ADC0_FUSES_BIASREFBUF_Pos;
+        } else {
+            biascomp = (*((uint32_t *)ADC1_FUSES_BIASCOMP_ADDR) & ADC1_FUSES_BIASCOMP_Msk) >> ADC1_FUSES_BIASCOMP_Pos;
+            biasr2r = (*((uint32_t *)ADC1_FUSES_BIASR2R_ADDR) & ADC1_FUSES_BIASR2R_Msk) >> ADC1_FUSES_BIASR2R_Pos;
+            biasrefbuf = (*((uint32_t *)ADC1_FUSES_BIASREFBUF_ADDR) & ADC1_FUSES_BIASREFBUF_Msk) >> ADC1_FUSES_BIASREFBUF_Pos;
+        }
+        /* Write the calibration data. */
+        adc->CALIB.reg = ADC_CALIB_BIASCOMP(biascomp) | ADC_CALIB_BIASR2R(biasr2r) | ADC_CALIB_BIASREFBUF(biasrefbuf);
+        // Divide 48MHz clock by 32 to obtain 1.5 MHz clock to adc
+        adc->CTRLA.reg = ADC_CTRLA_PRESCALER_DIV32;
+        // Select external AREFA as reference voltage.
+        adc->REFCTRL.reg = ADC_REFCTRL_REFSEL_AREFA;
+        // Average: Accumulate samples and scale them down accordingly
+        adc->AVGCTRL.reg = self->avg | ADC_AVGCTRL_ADJRES(self->avg);
+        // Enable ADC and wait to be ready
+        adc->CTRLA.bit.ENABLE = 1;
+        while (adc->SYNCBUSY.bit.ENABLE) {
+        }
+
+        #endif
+    }
+    // Set the port as given in self->id as ADC
+    mp_hal_set_pin_mux(self->id, ALT_FCT_ADC);
+}
diff --git a/ports/samd/main.c b/ports/samd/main.c
index d8c1c596c5b06..ece86f5889b6a 100644
--- a/ports/samd/main.c
+++ b/ports/samd/main.c
@@ -33,6 +33,7 @@
 #include "shared/runtime/pyexec.h"
 
 extern uint8_t _sstack, _estack, _sheap, _eheap;
+extern void adc_deinit_all(void);
 
 void samd_main(void) {
     mp_stack_set_top(&_estack);
@@ -62,6 +63,7 @@ void samd_main(void) {
         }
 
         mp_printf(MP_PYTHON_PRINTER, "MPY: soft reboot\n");
+        adc_deinit_all();
         gc_sweep_all();
         mp_deinit();
     }
diff --git a/ports/samd/modmachine.c b/ports/samd/modmachine.c
index b095a6b39dc96..287641cc33aa6 100644
--- a/ports/samd/modmachine.c
+++ b/ports/samd/modmachine.c
@@ -129,8 +129,10 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_mem16),               MP_ROM_PTR(&machine_mem16_obj) },
     { MP_ROM_QSTR(MP_QSTR_mem32),               MP_ROM_PTR(&machine_mem32_obj) },
     { MP_ROM_QSTR(MP_QSTR_unique_id),           MP_ROM_PTR(&machine_unique_id_obj) },
-    { MP_ROM_QSTR(MP_QSTR_Pin),                 MP_ROM_PTR(&machine_pin_type) },
+
+    { MP_ROM_QSTR(MP_QSTR_ADC),                 MP_ROM_PTR(&machine_adc_type) },
     { MP_ROM_QSTR(MP_QSTR_LED),                 MP_ROM_PTR(&machine_led_type) },
+    { MP_ROM_QSTR(MP_QSTR_Pin),                 MP_ROM_PTR(&machine_pin_type) },
     { MP_ROM_QSTR(MP_QSTR_SoftI2C),             MP_ROM_PTR(&mp_machine_soft_i2c_type) },
     { MP_ROM_QSTR(MP_QSTR_SoftSPI),             MP_ROM_PTR(&mp_machine_soft_spi_type) },
 };
diff --git a/ports/samd/modmachine.h b/ports/samd/modmachine.h
index f7ad2b5e5cbc4..53914a10c7fc3 100644
--- a/ports/samd/modmachine.h
+++ b/ports/samd/modmachine.h
@@ -28,7 +28,8 @@
 
 #include "py/obj.h"
 
-extern const mp_obj_type_t machine_pin_type;
+extern const mp_obj_type_t machine_adc_type;
 extern const mp_obj_type_t machine_led_type;
+extern const mp_obj_type_t machine_pin_type;
 
 #endif // MICROPY_INCLUDED_SAMD_MODMACHINE_H

From d693758ab28a6b25601f019db78c7f9bc213be38 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sun, 5 Jun 2022 11:03:59 +0200
Subject: [PATCH 2687/3533] samd/machine_pwm: Add the machine.PWM class.

Features are:
- 3 to 5 different frequency groups.
- Freq range of 1Hz - 24 MHz.
- Duty rate stays stable on freq change.

Keyword options to the PWM constructor:
- device=n Select a specific PWM device.  If no device is specified, a free
           device is chosen, if available at that pin.
- freq=nnnn
- duty_u16=nnnn
- duty_ns=nnnn
- invert=True/False Allowing two outputs on the same device/channel to have
                    complementary signals.

If both freq and duty are provided, PWM output will start immediately.

Pins at the same device have the same frequency.  If the PWM output number
exceeds the number of channels at the PWM device, the effctive channel_no
is output_no % channel_count.  So with a channel count of 4, output 7 is
assigned to channel 3.  Pins at a certain channel have the same frequency
and duty rate, but may be seperately inverted.
---
 ports/samd/Makefile       |   1 +
 ports/samd/machine_pwm.c  | 362 ++++++++++++++++++++++++++++++++++++++
 ports/samd/main.c         |   2 +
 ports/samd/modmachine.c   |   1 +
 ports/samd/modmachine.h   |   1 +
 ports/samd/mpconfigport.h |   4 +
 ports/samd/mphalport.c    |   4 +
 ports/samd/mphalport.h    |   1 +
 8 files changed, 376 insertions(+)
 create mode 100644 ports/samd/machine_pwm.c

diff --git a/ports/samd/Makefile b/ports/samd/Makefile
index 910ecdac31035..514c92ba1bd6f 100644
--- a/ports/samd/Makefile
+++ b/ports/samd/Makefile
@@ -142,6 +142,7 @@ SRC_QSTR += \
 	machine_adc.c \
 	machine_led.c \
 	machine_pin.c \
+	machine_pwm.c \
 	modutime.c \
 	modmachine.c \
 	modsamd.c \
diff --git a/ports/samd/machine_pwm.c b/ports/samd/machine_pwm.c
new file mode 100644
index 0000000000000..6f9ca42b1b2aa
--- /dev/null
+++ b/ports/samd/machine_pwm.c
@@ -0,0 +1,362 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020-2021 Damien P. George
+ * Copyright (c) 2022 Robert Hammelrath
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "py/runtime.h"
+#include "py/mphal.h"
+#include "modmachine.h"
+
+#include "sam.h"
+#include "pin_af.h"
+
+/******************************************************************************/
+// MicroPython bindings for machine.PWM
+
+typedef struct _machine_pwm_obj_t {
+    mp_obj_base_t base;
+    Tcc *instance;
+    uint8_t pin_id;
+    uint8_t alt_fct;
+    uint8_t device;
+    uint8_t channel;
+    uint8_t output;
+    uint16_t prescaler;
+    uint32_t period;  // full period count ticks
+} machine_pwm_obj_t;
+
+#define PWM_NOT_INIT    (0)
+#define PWM_CLK_READY   (1)
+#define PWM_TCC_ENABLED (2)
+#define PWM_MASTER_CLK  (48000000)
+#define PWM_FULL_SCALE  (65536)
+
+static Tcc *tcc_instance[] = TCC_INSTS;
+
+#if defined(MCU_SAMD21)
+
+static const int tcc_gclk_id[] = {
+    GCLK_CLKCTRL_ID_TCC0_TCC1, GCLK_CLKCTRL_ID_TCC0_TCC1, GCLK_CLKCTRL_ID_TCC2_TC3
+};
+const uint8_t tcc_channel_count[] = {4, 2, 2};
+const static uint8_t tcc_channel_offset[] = {0, 4, 6};
+static uint32_t pwm_duty_values[8];
+
+#define PERBUF      PERB
+#define CCBUF       CCB
+
+#elif defined(MCU_SAMD51)
+
+static const int tcc_gclk_id[] = {
+    TCC0_GCLK_ID, TCC1_GCLK_ID, TCC2_GCLK_ID,
+    #if TCC_INST_NUM > 3
+    TCC3_GCLK_ID, TCC4_GCLK_ID
+    #endif
+};
+
+#if TCC_INST_NUM > 3
+const uint8_t tcc_channel_count[] = {6, 4, 3, 2, 2};
+const static uint8_t tcc_channel_offset[] = {0, 6, 10, 13, 15};
+static uint32_t pwm_duty_values[17];
+#else
+const uint8_t tcc_channel_count[] = {6, 4, 3};
+const static uint8_t tcc_channel_offset[] = {0, 6, 10};
+static uint32_t pwm_duty_values[13];
+#endif // TCC_INST_NUM > 3
+
+#endif // defined(MCU_SAMD51)
+
+#define put_duty_value(device, channel, duty) \
+    pwm_duty_values[tcc_channel_offset[device] + channel] = duty;
+
+#define get_duty_value(device, channel) \
+    pwm_duty_values[tcc_channel_offset[device] + channel]
+
+static uint8_t duty_type_flags[TCC_INST_NUM];
+static uint8_t device_status[TCC_INST_NUM];
+static uint8_t output_active[TCC_INST_NUM];
+const uint16_t prescaler_table[] = {1, 2, 4, 8, 16, 64, 256, 1024};
+
+STATIC void pwm_stop_device(int device);
+STATIC void mp_machine_pwm_freq_set(machine_pwm_obj_t *self, mp_int_t freq);
+STATIC void mp_machine_pwm_duty_set_u16(machine_pwm_obj_t *self, mp_int_t duty_u16);
+STATIC void mp_machine_pwm_duty_set_ns(machine_pwm_obj_t *self, mp_int_t duty_ns);
+
+STATIC void mp_machine_pwm_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+    machine_pwm_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    mp_printf(print, "PWM P%c%02u device=%u channel=%u output=%u",
+        "ABCD"[self->pin_id / 32], self->pin_id % 32, self->device, self->channel, self->output);
+}
+
+// PWM(pin)
+STATIC mp_obj_t mp_machine_pwm_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
+    enum { ARG_pin, ARG_freq, ARG_duty_u16, ARG_duty_ns, ARG_invert, ARG_device };
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_pin,      MP_ARG_REQUIRED | MP_ARG_OBJ },
+        { MP_QSTR_freq,     MP_ARG_INT, {.u_int = -1} },
+        { MP_QSTR_duty_u16, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} },
+        { MP_QSTR_duty_ns,  MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} },
+        { MP_QSTR_invert,   MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} },
+        { MP_QSTR_device,   MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} },
+    };
+
+    // Parse the arguments.
+    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
+    mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
+
+    // Get GPIO and optional device to connect to PWM.
+    uint32_t pin_id = mp_hal_get_pin_obj(args[ARG_pin].u_obj);
+    int32_t wanted_dev = args[ARG_device].u_int; // -1 = any
+
+    // Get the peripheral object and populate it
+
+    pwm_config_t config = get_pwm_config(pin_id, wanted_dev, device_status);
+    uint8_t device = config.device_channel >> 4;
+    if (device >= TCC_INST_NUM) {
+        mp_raise_ValueError(MP_ERROR_TEXT("wrong device"));
+    }
+
+    machine_pwm_obj_t *self = mp_obj_malloc(machine_pwm_obj_t, &machine_pwm_type);
+    self->instance = tcc_instance[device];
+    self->device = device;
+    self->pin_id = pin_id;
+    self->alt_fct = config.alt_fct;
+    self->channel = (config.device_channel & 0x0f) % tcc_channel_count[device];
+    self->output = config.device_channel & 0x0f;
+    self->prescaler = 1;
+    self->period = 1; // Use an invalid but safe value
+    put_duty_value(self->device, self->channel, 0);
+
+    Tcc *tcc = self->instance;
+
+    if (device_status[device] == PWM_NOT_INIT) {
+        // Enable the device clock at first use.
+        #if defined(MCU_SAMD21)
+        // Enable synchronous clock. The bits are nicely arranged
+        PM->APBCMASK.reg |= PM_APBCMASK_TCC0 << device;
+        // Select multiplexer generic clock source and enable.
+        GCLK->CLKCTRL.reg = GCLK_CLKCTRL_CLKEN | GCLK_CLKCTRL_GEN_GCLK2 | tcc_gclk_id[device];
+        // Wait while it updates synchronously.
+        while (GCLK->STATUS.bit.SYNCBUSY) {
+        }
+        #elif defined(MCU_SAMD51)
+        // GenClk2 to the tcc
+        GCLK->PCHCTRL[tcc_gclk_id[device]].reg = GCLK_PCHCTRL_CHEN | GCLK_PCHCTRL_GEN(2);
+        while (GCLK->SYNCBUSY.reg & GCLK_SYNCBUSY_GENCTRL_GCLK2) {
+        }
+        // Enable MCLK
+        switch (device) {
+            case 0:
+                MCLK->APBBMASK.reg |= MCLK_APBBMASK_TCC0;
+                break;
+            case 1:
+                MCLK->APBBMASK.reg |= MCLK_APBBMASK_TCC1;
+                break;
+            case 2:
+                MCLK->APBCMASK.reg |= MCLK_APBCMASK_TCC2;
+                break;
+            #if TCC_INST_NUM > 3
+            case 3:
+                MCLK->APBCMASK.reg |= MCLK_APBCMASK_TCC3;
+                break;
+            case 4:
+                MCLK->APBDMASK.reg |= MCLK_APBDMASK_TCC4;
+                break;
+            #endif
+        }
+        #endif
+        // Reset the device
+        tcc->CTRLA.reg = TCC_CTRLA_SWRST;
+        while (tcc->SYNCBUSY.reg & TCC_SYNCBUSY_SWRST) {
+        }
+        tcc->CTRLA.reg = TCC_CTRLA_PRESCALER_DIV1;
+        tcc->WAVE.reg = TCC_WAVE_WAVEGEN_NPWM;
+        // Flag the clock as initialized, but not the device as enabled.
+        device_status[device] = PWM_CLK_READY;
+    }
+
+    if (args[ARG_invert].u_int != -1) {
+        bool invert = !!args[ARG_invert].u_int;
+        if (device_status[device] != PWM_CLK_READY) {
+            pwm_stop_device(device);
+        }
+        uint32_t mask = 1 << (self->output + TCC_DRVCTRL_INVEN0_Pos);
+        if (invert) {
+            tcc->DRVCTRL.reg |= mask;
+        } else {
+            tcc->DRVCTRL.reg &= ~(mask);
+        }
+    }
+    if (args[ARG_duty_u16].u_int != -1) {
+        mp_machine_pwm_duty_set_u16(self, args[ARG_duty_u16].u_int);
+    }
+    if (args[ARG_duty_ns].u_int != -1) {
+        mp_machine_pwm_duty_set_ns(self, args[ARG_duty_ns].u_int);
+    }
+    if (args[ARG_freq].u_int != -1) {
+        mp_machine_pwm_freq_set(self, args[ARG_freq].u_int);
+    }
+    return MP_OBJ_FROM_PTR(self);
+}
+
+STATIC void pwm_stop_device(int device) {
+    Tcc *tcc = tcc_instance[device];
+    tcc->CTRLA.bit.ENABLE = 0;
+    while (tcc->SYNCBUSY.reg & TCC_SYNCBUSY_ENABLE) {
+    }
+    device_status[device] = PWM_CLK_READY;
+}
+
+// Stop all TTC devices
+void pwm_deinit_all(void) {
+    for (int i = 0; i < TCC_INST_NUM; i++) {
+        Tcc *tcc = tcc_instance[i];
+        tcc->CTRLA.reg = TCC_CTRLA_SWRST;
+        while (tcc->SYNCBUSY.reg & TCC_SYNCBUSY_SWRST) {
+        }
+        device_status[i] = PWM_NOT_INIT;
+        duty_type_flags[i] = 0;
+        output_active[i] = 0;
+    }
+}
+
+// Switch off an output. If all outputs of a device are off,
+// switch off that device.
+// This stops all channels, but keeps the configuration
+// Calling pwm.freq(n) will start an instance again.
+STATIC void mp_machine_pwm_deinit(machine_pwm_obj_t *self) {
+    mp_hal_clr_pin_mux(self->pin_id); // Switch the output off
+    output_active[self->device] &= ~(1 << self->output);  // clear output flasg
+    // Stop the device, if no output is active.
+    if (output_active[self->device] == 0) {
+        pwm_stop_device(self->device);
+    }
+}
+
+STATIC mp_obj_t mp_machine_pwm_freq_get(machine_pwm_obj_t *self) {
+    return MP_OBJ_NEW_SMALL_INT(PWM_MASTER_CLK / self->prescaler / self->period);
+}
+
+STATIC void mp_machine_pwm_freq_set(machine_pwm_obj_t *self, mp_int_t freq) {
+    // Set the frequency. The period counter is 24 bit or 16 bit with a pre-scaling
+    // of up to 1024, allowing a range from 24 MHz down to 1 Hz.
+    static const uint32_t max_period[5] = {1 << 24, 1 << 24, 1 << 16, 1 << 16, 1 << 16};
+
+    Tcc *tcc = self->instance;
+    if (freq < 1) {
+        mp_raise_ValueError(MP_ERROR_TEXT("invalid freq"));
+    }
+
+    // Get the actual settings of prescaler & period from the unit
+    // To be able for cope for changes.
+    uint32_t prev_period = tcc->PER.reg + 1;
+
+    // Check for the right prescaler
+    uint8_t index;
+    for (index = 0; index < 8; index++) {
+        uint32_t temp = PWM_MASTER_CLK / prescaler_table[index] / freq;
+        if (temp < max_period[self->device]) {
+            break;
+        }
+    }
+    self->prescaler = prescaler_table[index];
+
+    uint32_t period = PWM_MASTER_CLK / self->prescaler / freq;
+    if (period < 2) {
+        mp_raise_ValueError(MP_ERROR_TEXT("freq too large"));
+    }
+    // Check, if the prescaler has to be changed and stop the device if so.
+    if (index != tcc->CTRLA.bit.PRESCALER) {
+        // stop the device
+        pwm_stop_device(self->device);
+        // update the prescaler
+        tcc->CTRLA.bit.PRESCALER = index;
+    }
+    // Lock the update to get a glitch-free change of period and duty cycle
+    tcc->CTRLBSET.reg = TCC_CTRLBSET_LUPD;
+    tcc->PERBUF.reg = period - 1;
+    self->period = period;
+
+    // Check if the Duty rate has to be aligned again when freq or prescaler were changed.
+    // This condition is as well true on first call after instantiation. So (re-)configure
+    // all channels with a duty_u16 setting.
+    if (period != prev_period) {
+        for (uint16_t ch = 0; ch < tcc_channel_count[self->device]; ch++) {
+            if ((duty_type_flags[self->device] & (1 << ch)) != 0) {  // duty_u16 type?
+                tcc->CCBUF[ch].reg = (uint64_t)get_duty_value(self->device, ch) * period /
+                    PWM_FULL_SCALE;
+            }
+        }
+    }
+    // If the prescaler was changed, the device is disabled. So this condition is true
+    // after the instantiation and after a prescaler change.
+    // (re-)configure all channels with a duty_ns setting.
+    if (!(tcc->CTRLA.reg & TCC_CTRLA_ENABLE)) {
+        for (uint16_t ch = 0; ch < tcc_channel_count[self->device]; ch++) {
+            if ((duty_type_flags[self->device] & (1 << ch)) == 0) {  // duty_ns type?
+                tcc->CCBUF[ch].reg = (uint64_t)get_duty_value(self->device, ch) * PWM_MASTER_CLK /
+                    self->prescaler / 1000000000ULL;
+            }
+        }
+    }
+    // Remember the output as active.
+    output_active[self->device] |= 1 << self->output; // set output flag
+    // (Re-)Select PWM function for given GPIO.
+    mp_hal_set_pin_mux(self->pin_id, self->alt_fct);
+    // Enable the device, if required.
+    if ((device_status[self->device] & PWM_TCC_ENABLED) == 0) {
+        tcc->CTRLBSET.reg = TCC_CTRLBSET_CMD_UPDATE;
+        tcc->CTRLA.reg |= TCC_CTRLA_ENABLE;
+        while (tcc->SYNCBUSY.reg & TCC_SYNCBUSY_ENABLE) {
+        }
+        device_status[self->device] |= PWM_TCC_ENABLED;
+    }
+    // Unlock the register update, now that the settings are complete
+    tcc->CTRLBCLR.reg = TCC_CTRLBCLR_LUPD;
+}
+
+STATIC mp_obj_t mp_machine_pwm_duty_get_u16(machine_pwm_obj_t *self) {
+    return MP_OBJ_NEW_SMALL_INT(self->instance->CC[self->channel].reg * PWM_FULL_SCALE / (self->instance->PER.reg + 1));
+}
+
+STATIC void mp_machine_pwm_duty_set_u16(machine_pwm_obj_t *self, mp_int_t duty_u16) {
+    put_duty_value(self->device, self->channel, duty_u16);
+    // If the device is enabled, than the period is set and we get a reasonable value for
+    // the duty cycle, set to the CCBUF register. Otherwise, PWM does not start.
+    if (self->instance->CTRLA.reg & TCC_CTRLA_ENABLE) {
+        self->instance->CCBUF[self->channel].reg = (uint64_t)duty_u16 * (self->instance->PER.reg + 1) / PWM_FULL_SCALE;
+    }
+    duty_type_flags[self->device] |= 1 << self->channel;
+}
+
+STATIC mp_obj_t mp_machine_pwm_duty_get_ns(machine_pwm_obj_t *self) {
+    return MP_OBJ_NEW_SMALL_INT(1000000000ULL * self->instance->CC[self->channel].reg * self->prescaler / PWM_MASTER_CLK);
+}
+
+STATIC void mp_machine_pwm_duty_set_ns(machine_pwm_obj_t *self, mp_int_t duty_ns) {
+    put_duty_value(self->device, self->channel, duty_ns);
+    self->instance->CCBUF[self->channel].reg = (uint64_t)duty_ns * PWM_MASTER_CLK / self->prescaler / 1000000000ULL;
+    duty_type_flags[self->device] &= ~(1 << self->channel);
+}
diff --git a/ports/samd/main.c b/ports/samd/main.c
index ece86f5889b6a..4af4b2b4f8e5e 100644
--- a/ports/samd/main.c
+++ b/ports/samd/main.c
@@ -34,6 +34,7 @@
 
 extern uint8_t _sstack, _estack, _sheap, _eheap;
 extern void adc_deinit_all(void);
+extern void pwm_deinit_all(void);
 
 void samd_main(void) {
     mp_stack_set_top(&_estack);
@@ -64,6 +65,7 @@ void samd_main(void) {
 
         mp_printf(MP_PYTHON_PRINTER, "MPY: soft reboot\n");
         adc_deinit_all();
+        pwm_deinit_all();
         gc_sweep_all();
         mp_deinit();
     }
diff --git a/ports/samd/modmachine.c b/ports/samd/modmachine.c
index 287641cc33aa6..e0a0378461560 100644
--- a/ports/samd/modmachine.c
+++ b/ports/samd/modmachine.c
@@ -133,6 +133,7 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_ADC),                 MP_ROM_PTR(&machine_adc_type) },
     { MP_ROM_QSTR(MP_QSTR_LED),                 MP_ROM_PTR(&machine_led_type) },
     { MP_ROM_QSTR(MP_QSTR_Pin),                 MP_ROM_PTR(&machine_pin_type) },
+    { MP_ROM_QSTR(MP_QSTR_PWM),                 MP_ROM_PTR(&machine_pwm_type) },
     { MP_ROM_QSTR(MP_QSTR_SoftI2C),             MP_ROM_PTR(&mp_machine_soft_i2c_type) },
     { MP_ROM_QSTR(MP_QSTR_SoftSPI),             MP_ROM_PTR(&mp_machine_soft_spi_type) },
 };
diff --git a/ports/samd/modmachine.h b/ports/samd/modmachine.h
index 53914a10c7fc3..00e72ede1a7fd 100644
--- a/ports/samd/modmachine.h
+++ b/ports/samd/modmachine.h
@@ -31,5 +31,6 @@
 extern const mp_obj_type_t machine_adc_type;
 extern const mp_obj_type_t machine_led_type;
 extern const mp_obj_type_t machine_pin_type;
+extern const mp_obj_type_t machine_pwm_type;
 
 #endif // MICROPY_INCLUDED_SAMD_MODMACHINE_H
diff --git a/ports/samd/mpconfigport.h b/ports/samd/mpconfigport.h
index 6441818ba2c5f..70bd202a313b3 100644
--- a/ports/samd/mpconfigport.h
+++ b/ports/samd/mpconfigport.h
@@ -99,6 +99,10 @@
 #define MICROPY_PY_UASYNCIO                 (1)
 #define MICROPY_PY_MACHINE_SOFTI2C          (1)
 #define MICROPY_PY_MACHINE_SOFTSPI          (1)
+#define MICROPY_PY_MACHINE_PWM              (1)
+#define MICROPY_PY_MACHINE_PWM_INIT         (0)
+#define MICROPY_PY_MACHINE_PWM_DUTY_U16_NS  (1)
+#define MICROPY_PY_MACHINE_PWM_INCLUDEFILE  "ports/samd/machine_pwm.c"
 
 #define MP_STATE_PORT MP_STATE_VM
 
diff --git a/ports/samd/mphalport.c b/ports/samd/mphalport.c
index e51f13ab7e9fc..7a3786be8c316 100644
--- a/ports/samd/mphalport.c
+++ b/ports/samd/mphalport.c
@@ -61,6 +61,10 @@ void mp_hal_set_pin_mux(mp_hal_pin_obj_t pin, uint8_t mux) {
     }
 }
 
+void mp_hal_clr_pin_mux(mp_hal_pin_obj_t pin) {
+    int pin_grp = pin / 32;
+    PORT->Group[pin_grp].PINCFG[pin % 32].bit.PMUXEN = 0; // Disable Mux
+}
 
 void mp_hal_delay_ms(mp_uint_t ms) {
     if (ms > 10) {
diff --git a/ports/samd/mphalport.h b/ports/samd/mphalport.h
index 0a1db7df0c5b1..6161d9821ff99 100644
--- a/ports/samd/mphalport.h
+++ b/ports/samd/mphalport.h
@@ -84,6 +84,7 @@ extern uint32_t machine_pin_open_drain_mask[];
 
 mp_hal_pin_obj_t mp_hal_get_pin_obj(mp_obj_t pin_in);
 void mp_hal_set_pin_mux(mp_hal_pin_obj_t pin, uint8_t mux);
+void mp_hal_clr_pin_mux(mp_hal_pin_obj_t pin);
 
 static inline unsigned int mp_hal_pin_name(mp_hal_pin_obj_t pin) {
     return pin;

From a9eef1b27653b1604d945f95c7ca6d1ce875b9de Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sun, 5 Jun 2022 11:52:33 +0200
Subject: [PATCH 2688/3533] samd/samd_isr: Rework the interrupt tables.

Changes are:
- Have two separate tables for SAM21 and SAMD51.
- Use a short table for SAMD21.
- Add a comment to each line telling what it's for, making further use
  easier.
- Add preliminary handlers/entries for PendSV, EIC and Sercom.  These will
  be replaced later when the respecitve modules are added.
---
 ports/samd/samd_isr.c | 406 ++++++++++++++++++++++++++----------------
 1 file changed, 256 insertions(+), 150 deletions(-)

diff --git a/ports/samd/samd_isr.c b/ports/samd/samd_isr.c
index a7956c49305fa..e16018c5348ce 100644
--- a/ports/samd/samd_isr.c
+++ b/ports/samd/samd_isr.c
@@ -24,14 +24,23 @@
  * THE SOFTWARE.
  */
 
+#include "py/runtime.h"
+#include "py/mphal.h"
 #include "samd_soc.h"
+// includes for Softtimer
+// #include "pendsv.h"
+// #include "softtimer.h"
 
 typedef void (*ISR)(void);
 
 extern uint32_t _estack, _sidata, _sdata, _edata, _sbss, _ebss;
+extern void Default_Handler(void);
+extern void SysTick_Handler(void);
+extern void PendSV_Handler(void);
+extern void EIC_Handler(void);
 
 const ISR isr_vector[];
-uint32_t systick_ms;
+volatile uint32_t systick_ms;
 volatile uint32_t systick_ms_upper;
 
 void Reset_Handler(void) __attribute__((naked));
@@ -87,8 +96,115 @@ void SysTick_Handler(void) {
     if (systick_ms == 0) {
         systick_ms_upper += 1;
     }
+
+    // if (soft_timer_next == next_tick) {
+    //     pendsv_schedule_dispatch(PENDSV_DISPATCH_SOFT_TIMER, soft_timer_handler);
+    // }
+}
+
+// Temporary Handlers to allow builds.
+// Will be removed when the respecitve module is added.
+void EIC_Handler(void) {
+}
+
+void PendSV_Handler(void) {
+}
+
+
+static uint8_t sercom_irq_type[SERCOM_INST_NUM] = {};
+void (*sercom_irq_handler_table[])(int num) = {
+    // Temporarily commented until the module is added
+    NULL, // common_uart_irq_handler,
+    NULL, // common_spi_irq_handler,
+    NULL  // common_i2c_irq_handler
+};
+
+void sercom_register_irq(int sercom_id, int mode) {
+    sercom_irq_type[sercom_id] = mode;
+}
+
+static inline void common_sercom_irq_handler(int sercom_id) {
+    if (sercom_irq_handler_table[sercom_irq_type[sercom_id]]) {
+        sercom_irq_handler_table[sercom_irq_type[sercom_id]](sercom_id);
+    }
+}
+
+void Sercom0_Handler(void) {
+    common_sercom_irq_handler(0);
+}
+void Sercom1_Handler(void) {
+    common_sercom_irq_handler(1);
+}
+void Sercom2_Handler(void) {
+    common_sercom_irq_handler(2);
+}
+void Sercom3_Handler(void) {
+    common_sercom_irq_handler(3);
+}
+void Sercom4_Handler(void) {
+    common_sercom_irq_handler(4);
+}
+void Sercom5_Handler(void) {
+    common_sercom_irq_handler(5);
+}
+#if defined(MCU_SAMD51)
+void Sercom6_Handler(void) {
+    common_sercom_irq_handler(6);
 }
+void Sercom7_Handler(void) {
+    common_sercom_irq_handler(7);
+}
+#endif
+
+#if defined(MCU_SAMD21)
+const ISR isr_vector[] __attribute__((section(".isr_vector"))) = {
+    (ISR)&_estack,
+    &Reset_Handler,
+    &Default_Handler,   // NMI_Handler
+    &Default_Handler,   // HardFault_Handler
+    &Default_Handler,   // MemManage_Handler
+    &Default_Handler,   // BusFault_Handler
+    &Default_Handler,   // UsageFault_Handler
+    0,
+    0,
+    0,
+    0,
+    &Default_Handler,   //  SVC_Handler
+    &Default_Handler,   //  DebugMon_Handler
+    0,
+    &PendSV_Handler,    //  PendSV_Handler
+    &SysTick_Handler,   //  SysTick_Handler
+    0,                  //  0 Power Manager (PM)
+    0,                  //  1 System Control (SYSCTRL)
+    0,                  //  2 Watchdog Timer (WDT)
+    0,                  //  3 Real-Time Counter (RTC)
+    &EIC_Handler,       //  4 External Interrupt Controller (EIC)
+    0,                  //  5 Non-Volatile Memory Controller (NVMCTRL)
+    0,                  //  6 Direct Memory Access Controller (DMAC)
+    USB_Handler_wrapper,//  7 Universal Serial Bus (USB)
+    0,                  //  8 Event System Interface (EVSYS)
+    &Sercom0_Handler,   //  9 Serial Communication Interface 0 (SERCOM0)
+    &Sercom1_Handler,   // 10 SAMD21G18A Serial Communication Interface 1 (SERCOM1)
+    &Sercom2_Handler,   // 11 SAMD21G18A Serial Communication Interface 2 (SERCOM2)
+    &Sercom3_Handler,   // 12 SAMD21G18A Serial Communication Interface 3 (SERCOM3)
+    &Sercom4_Handler,   // 13 SAMD21G18A Serial Communication Interface 4 (SERCOM4)
+    &Sercom5_Handler,   // 14 SAMD21G18A Serial Communication Interface 5 (SERCOM5)
+    0,                  // 15 Timer Counter Control 0 (TCC0)
+    0,                  // 16 Timer Counter Control 1 (TCC1)
+    0,                  // 17 Timer Counter Control 2 (TCC2)
+    0,                  // 18 Basic Timer Counter 3 (TC3)
+    0,                  // 19 Basic Timer Counter 4 (TC4)
+    0,                  // 20 Basic Timer Counter 5 (TC5)
+    0,                  // 21 Basic Timer Counter 6 (TC6)
+    0,                  // 22 Basic Timer Counter 7 (TC7)
+    0,                  // 23 Analog Digital Converter (ADC)
+    0,                  // 24 Analog Comparators (AC)
+    0,                  // 25 Digital Analog Converter (DAC)
+    0,                  // 26 Peripheral Touch Controller (PTC)
+    0,                  // 27 Inter-IC Sound Interface (I2S)
 
+};
+#else
 const ISR isr_vector[] __attribute__((section(".isr_vector"))) = {
     (ISR)&_estack,
     &Reset_Handler,
@@ -104,154 +220,144 @@ const ISR isr_vector[] __attribute__((section(".isr_vector"))) = {
     &Default_Handler, // SVC_Handler
     &Default_Handler, // DebugMon_Handler
     0,
-    &Default_Handler, // PendSV_Handler
+    &PendSV_Handler,  //  PendSV_Handler
     &SysTick_Handler, // SysTick_Handler
-    0, // line 0
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    #if defined(MCU_SAMD21)
-    USB_Handler_wrapper, // line 7
-    #else
-    0,
-    #endif
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    #if defined(MCU_SAMD51)
-    &USB_0_Handler_wrapper, // line 80
-    &USB_1_Handler_wrapper,
-    &USB_2_Handler_wrapper,
-    &USB_3_Handler_wrapper,
-    #else
-    0,
-    0,
-    0,
-    0,
-    #endif
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
-    0,
+    0,                //  0 Power Manager (PM)
+    0,                //  1 Main Clock (MCLK)
+    0,                //  2 Oscillators Control (OSCCTRL): OSCCTRL_XOSCFAIL_0, OSCCTRL_XOSCRDY_0
+    0,                //  3 Oscillators Control (OSCCTRL): OSCCTRL_XOSCFAIL_1, OSCCTRL_XOSCRDY_1
+    0,                //  4 Oscillators Control (OSCCTRL): OSCCTRL_DFLLLOCKC, OSCCTRL_DFLLLOCKF, OSCCTRL_DFLLOOB, OSCCTRL_DFLLRCS, OSCCTRL_DFLLRDY
+    0,                //  5 Oscillators Control (OSCCTRL): OSCCTRL_DPLLLCKF_0, OSCCTRL_DPLLLCKR_0, OSCCTRL_DPLLLDRTO_0, OSCCTRL_DPLLLTO_0
+    0,                //  6 Oscillators Control (OSCCTRL): OSCCTRL_DPLLLCKF_1, OSCCTRL_DPLLLCKR_1, OSCCTRL_DPLLLDRTO_1, OSCCTRL_DPLLLTO_1
+    0,                //  7 32kHz Oscillators Control (OSC32KCTRL)
+    0,                //  8 Supply Controller (SUPC): SUPC_B12SRDY, SUPC_B33SRDY, SUP
+    0,                //  9 Supply Controller (SUPC): SUPC_BOD12DET, SUPC_BOD33DET
+    0,                // 10 Watchdog Timer (WDT)
+    0,                // 11 Real-Time Counter (RTC)
+    &EIC_Handler,     // 12 External Interrupt Controller (EIC): EIC_EXTINT_0
+    &EIC_Handler,     // 13 External Interrupt Controller (EIC): EIC_EXTINT_1
+    &EIC_Handler,     // 14 External Interrupt Controller (EIC): EIC_EXTINT_2
+    &EIC_Handler,     // 15 External Interrupt Controller (EIC): EIC_EXTINT_3
+    &EIC_Handler,     // 16 External Interrupt Controller (EIC): EIC_EXTINT_4
+    &EIC_Handler,     // 17 External Interrupt Controller (EIC): EIC_EXTINT_5
+    &EIC_Handler,     // 18 External Interrupt Controller (EIC): EIC_EXTINT_6
+    &EIC_Handler,     // 19 External Interrupt Controller (EIC): EIC_EXTINT_7
+    &EIC_Handler,     // 20 External Interrupt Controller (EIC): EIC_EXTINT_8
+    &EIC_Handler,     // 21 External Interrupt Controller (EIC): EIC_EXTINT_9
+    &EIC_Handler,     // 22 External Interrupt Controller (EIC): EIC_EXTINT_10
+    &EIC_Handler,     // 23 External Interrupt Controller (EIC): EIC_EXTINT_11
+    &EIC_Handler,     // 24 External Interrupt Controller (EIC): EIC_EXTINT_12
+    &EIC_Handler,     // 25 External Interrupt Controller (EIC): EIC_EXTINT_13
+    &EIC_Handler,     // 26 External Interrupt Controller (EIC): EIC_EXTINT_14
+    &EIC_Handler,     // 27 External Interrupt Controller (EIC): EIC_EXTINT_15
+    0,                // 28 Frequency Meter (FREQM)
+    0,                // 29 Non-Volatile Memory Controller (NVMCTRL): NVMCTRL_0 - _7
+    0,                // 30 Non-Volatile Memory Controller (NVMCTRL): NVMCTRL_8 - _10
+    0,                // 31 Direct Memory Access Controller (DMAC): DMAC_SUSP_0, DMAC_TCMPL_0, DMAC_TERR_0
+    0,                // 32 Direct Memory Access Controller (DMAC): DMAC_SUSP_1, DMAC_TCMPL_1, DMAC_TERR_1
+    0,                // 33 Direct Memory Access Controller (DMAC): DMAC_SUSP_2, DMAC_TCMPL_2, DMAC_TERR_2
+    0,                // 34 Direct Memory Access Controller (DMAC): DMAC_SUSP_3, DMAC_TCMPL_3, DMAC_TERR_3
+    0,                // 35 Direct Memory Access Controller (DMAC): DMAC_SUSP_4 - _31, DMAC_TCMPL_4 _31, DMAC_TERR_4- _31
+    0,                // 36 Event System Interface (EVSYS): EVSYS_EVD_0, EVSYS_OVR_0
+    0,                // 37 Event System Interface (EVSYS): EVSYS_EVD_1, EVSYS_OVR_1
+    0,                // 38 Event System Interface (EVSYS): EVSYS_EVD_2, EVSYS_OVR_2
+    0,                // 39 Event System Interface (EVSYS): EVSYS_EVD_3, EVSYS_OVR_3
+    0,                // 40 Event System Interface (EVSYS): EVSYS_EVD_10, EVSYS_EVD_11
+    0,                // 41 Peripheral Access Controller (PAC)
+    0,                // 42 Trigger Allocator (TAL): TAL_BRK
+    0,                // 43 Trigger Allocator (TAL): TAL_IPS_x
+    0,
+    0,                // 45 RAM ECC (RAMECC)
+    &Sercom0_Handler, // 46 Serial Communication Interface 0 (SERCOM0): SERCOM0_0
+    &Sercom0_Handler, // 47 Serial Communication Interface 0 (SERCOM0): SERCOM0_1
+    &Sercom0_Handler, // 48 Serial Communication Interface 0 (SERCOM0): SERCOM0_2
+    &Sercom0_Handler, // 49 Serial Communication Interface 0 (SERCOM0): SERCOM0_3 - 6
+    &Sercom1_Handler, // 50 Serial Communication Interface 1 (SERCOM1): SERCOM1_0
+    &Sercom1_Handler, // 51 Serial Communication Interface 1 (SERCOM1): SERCOM1_1
+    &Sercom1_Handler, // 52 Serial Communication Interface 1 (SERCOM1): SERCOM1_2
+    &Sercom1_Handler, // 53 Serial Communication Interface 1 (SERCOM1): SERCOM1_3 - 6
+    &Sercom2_Handler, // 54 Serial Communication Interface 2 (SERCOM2): SERCOM2_0
+    &Sercom2_Handler, // 55 Serial Communication Interface 2 (SERCOM2): SERCOM2_1
+    &Sercom2_Handler, // 56 Serial Communication Interface 2 (SERCOM2): SERCOM2_2
+    &Sercom2_Handler, // 57 Serial Communication Interface 2 (SERCOM2): SERCOM2_3 - 6
+    &Sercom3_Handler, // 58 Serial Communication Interface 3 (SERCOM3): SERCOM3_0
+    &Sercom3_Handler, // 59 Serial Communication Interface 3 (SERCOM3): SERCOM3_1
+    &Sercom3_Handler, // 60 Serial Communication Interface 3 (SERCOM3): SERCOM3_2
+    &Sercom3_Handler, // 61 Serial Communication Interface 3 (SERCOM3): SERCOM3_3 - 6
+    &Sercom4_Handler, // 62 Serial Communication Interface 4 (SERCOM4): SERCOM4_0
+    &Sercom4_Handler, // 63 Serial Communication Interface 4 (SERCOM4): SERCOM4_1
+    &Sercom4_Handler, // 64 Serial Communication Interface 4 (SERCOM4): SERCOM4_2
+    &Sercom4_Handler, // 65 Serial Communication Interface 4 (SERCOM4): SERCOM4_3 - 6
+    &Sercom5_Handler, // 66 Serial Communication Interface 5 (SERCOM5): SERCOM5_0
+    &Sercom5_Handler, // 67 Serial Communication Interface 5 (SERCOM5): SERCOM5_1
+    &Sercom5_Handler, // 68 Serial Communication Interface 5 (SERCOM5): SERCOM5_2
+    &Sercom5_Handler, // 69 Serial Communication Interface 5 (SERCOM5): SERCOM5_3 - 6
+    &Sercom6_Handler, // 70 Serial Communication Interface 6 (SERCOM6): SERCOM6_0
+    &Sercom6_Handler, // 71 Serial Communication Interface 6 (SERCOM6): SERCOM6_1
+    &Sercom6_Handler, // 72 Serial Communication Interface 6 (SERCOM6): SERCOM6_2
+    &Sercom6_Handler, // 73 Serial Communication Interface 6 (SERCOM6): SERCOM6_3 - 6
+    &Sercom7_Handler, // 74 Serial Communication Interface 7 (SERCOM7): SERCOM7_0
+    &Sercom7_Handler, // 75 Serial Communication Interface 7 (SERCOM7): SERCOM7_1
+    &Sercom7_Handler, // 76 Serial Communication Interface 7 (SERCOM7): SERCOM7_2
+    &Sercom7_Handler, // 77 Serial Communication Interface 7 (SERCOM7): SERCOM7_3 - 6
+    0,                // 78 Control Area Network 0 (CAN0)
+    0,                // 79 Control Area Network 1 (CAN1)
+    &USB_0_Handler_wrapper, // 80 Universal Serial Bus (USB): USB_EORSM_DNRS, ...
+    &USB_1_Handler_wrapper, // 81 Universal Serial Bus (USB): USB_SOF_HSOF
+    &USB_2_Handler_wrapper, // 82 Universal Serial Bus (USB): USB_TRCPT0_0 - _7
+    &USB_3_Handler_wrapper, // 83 Universal Serial Bus (USB): USB_TRCPT1_0 - _7
+    0,                // 84 Ethernet MAC (GMAC)
+    0,                // 85 Timer Counter Control 0 (TCC0): TCC0_CNT_A ...
+    0,                // 86 Timer Counter Control 0 (TCC0): TCC0_MC_0
+    0,                // 87 Timer Counter Control 0 (TCC0): TCC0_MC_1
+    0,                // 88 Timer Counter Control 0 (TCC0): TCC0_MC_2
+    0,                // 89 Timer Counter Control 0 (TCC0): TCC0_MC_3
+    0,                // 90 Timer Counter Control 0 (TCC0): TCC0_MC_4
+    0,                // 91 Timer Counter Control 0 (TCC0): TCC0_MC_5
+    0,                // 92 Timer Counter Control 1 (TCC1): TCC1_CNT_A ...
+    0,                // 93 Timer Counter Control 1 (TCC1): TCC1_MC_0
+    0,                // 94 Timer Counter Control 1 (TCC1): TCC1_MC_1
+    0,                // 95 Timer Counter Control 1 (TCC1): TCC1_MC_2
+    0,                // 96 Timer Counter Control 1 (TCC1): TCC1_MC_3
+    0,                // 97 Timer Counter Control 2 (TCC2): TCC2_CNT_A ...
+    0,                // 98 Timer Counter Control 2 (TCC2): TCC2_MC_0
+    0,                // 99 Timer Counter Control 2 (TCC2): TCC2_MC_1
+    0,                // 100 Timer Counter Control 2 (TCC2): TCC2_MC_2
+    0,                // 101 Timer Counter Control 3 (TCC3): TCC3_CNT_A ...
+    0,                // 102 Timer Counter Control 3 (TCC3): TCC3_MC_0
+    0,                // 103 Timer Counter Control 3 (TCC3): TCC3_MC_1
+    0,                // 104 Timer Counter Control 4 (TCC4): TCC4_CNT_A ...
+    0,                // 105 Timer Counter Control 4 (TCC4): TCC4_MC_0
+    0,                // 106 Timer Counter Control 4 (TCC4): TCC4_MC_1
+    0,                // 107 Basic Timer Counter 0 (TC0)
+    0,                // 108 Basic Timer Counter 1 (TC1)
+    0,                // 109 Basic Timer Counter 2 (TC2)
+    0,                // 110 Basic Timer Counter 3 (TC3)
+    0,                // 111 Basic Timer Counter 4 (TC4)
+    0,                // 112 Basic Timer Counter 5 (TC5)
+    0,                // 113 Basic Timer Counter 6 (TC6)
+    0,                // 114 Basic Timer Counter 7 (TC7)
+    0,                // 115 Quadrature Decoder (PDEC): PDEC_DIR_A, PDEC_ERR_A, PDEC_OVF, PDEC_VLC_A
+    0,                // 116 Quadrature Decoder (PDEC): PDEC_MC_0
+    0,                // 117 Quadrature Decoder (PDEC): PDEC_MC_1
+    0,                // 118 Analog Digital Converter 0 (ADC0): ADC0_OVERRUN, ADC0_WINMON
+    0,                // 119 Analog Digital Converter 0 (ADC0): ADC0_RESRDY
+    0,                // 120 Analog Digital Converter 1 (ADC1): ADC1_OVERRUN, ADC1_WINMON
+    0,                // 121 Analog Digital Converter 1 (ADC1): ADC1_RESRDY
+    0,                // 122 Analog Comparators (AC)
+    0,                // 123 Digital-to-Analog Converter (DAC): DAC_OVERRUN_A_x, DAC_UNDERRUN_A_x
+    0,                // 124 Digital-to-Analog Converter (DAC): DAC_EMPTY_0
+    0,                // 125 Digital-to-Analog Converter (DAC): DAC_EMPTY_1
+    0,                // 126 Digital-to-Analog Converter (DAC): DAC_RESRDY_0
+    0,                // 127 Digital-to-Analog Converter (DAC): DAC_RESRDY_1
+    0,                // 128 Inter-IC Sound Interface (I2S)
+    0,                // 129 Parallel Capture Controller (PCC)
+    0,                // 130 Advanced Encryption Standard (AES)
+    0,                // 131 True Random Generator (TRNG)
+    0,                // 132 Integrity Check Monitor (ICM)
+    0,                // 133 PUblic-Key Cryptography Controller (PUKCC)
+    0,                // 134 Quad SPI interface (QSPI)
+    0,                // 135 SD/MMC Host Controller 0 (SDHC0)
+    0,                // 136 SD/MMC Host Controller 1 (SDHC1)
 };
+#endif

From 4b6f6ccf88c652401e39e621b515d06140d35225 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sun, 5 Jun 2022 14:08:44 +0200
Subject: [PATCH 2689/3533] samd/machine_pin: Add pin.irq() to the machine.Pin
 class.

Its API conforms to the docs.  There are 16 IRQ channels available, which
will be used as assignable to the GPIO numbers.  In most cases, the irq
channel is GPIO_no % 16.
---
 ports/samd/Makefile       |   2 +
 ports/samd/machine_pin.c  | 200 +++++++++++++++++++++++++++++++++++++-
 ports/samd/main.c         |   2 +
 ports/samd/mpconfigport.h |   6 +-
 ports/samd/samd_isr.c     |   3 -
 5 files changed, 207 insertions(+), 6 deletions(-)

diff --git a/ports/samd/Makefile b/ports/samd/Makefile
index 514c92ba1bd6f..163971cde7344 100644
--- a/ports/samd/Makefile
+++ b/ports/samd/Makefile
@@ -118,6 +118,7 @@ SRC_C = \
 	lib/tinyusb/src/portable/microchip/samd/dcd_samd.c \
 	lib/tinyusb/src/tusb.c \
 	drivers/bus/softspi.c \
+	shared/runtime/mpirq.c \
 	shared/libc/printf.c \
 	shared/libc/string0.c \
 	shared/readline/readline.c \
@@ -148,6 +149,7 @@ SRC_QSTR += \
 	modsamd.c \
 	samd_flash.c \
 	shared/readline/readline.c \
+	shared/runtime/mpirq.c \
 
 SRC_QSTR += $(SRC_MOD) $(SRC_CXX)
 
diff --git a/ports/samd/machine_pin.c b/ports/samd/machine_pin.c
index 98317abbf26a0..a70e9ad0115d7 100644
--- a/ports/samd/machine_pin.c
+++ b/ports/samd/machine_pin.c
@@ -4,6 +4,7 @@
  * The MIT License (MIT)
  *
  * Copyright (c) 2016-2021 Damien P. George
+ * Copyright (c) 2022 Robert Hammelrath (pin.irq)
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -29,10 +30,12 @@
 #include "string.h"
 #include "py/runtime.h"
 #include "py/mphal.h"
+#include "shared/runtime/mpirq.h"
 #include "extmod/virtpin.h"
 #include "modmachine.h"
 #include "samd_soc.h"
 #include "pins.h"
+#include "pin_af.h"
 
 #include "hal_gpio.h"
 
@@ -42,6 +45,17 @@
 
 #define GPIO_STRENGTH_2MA (0)
 #define GPIO_STRENGTH_8MA (1)
+#define GPIO_IRQ_EDGE_RISE (1)
+#define GPIO_IRQ_EDGE_FALL (2)
+
+typedef struct _machine_pin_irq_obj_t {
+    mp_irq_obj_t base;
+    uint32_t flags;
+    uint32_t trigger;
+    uint8_t pin_id;
+} machine_pin_irq_obj_t;
+
+STATIC const mp_irq_methods_t machine_pin_irq_methods;
 
 uint32_t machine_pin_open_drain_mask[4];
 
@@ -262,6 +276,141 @@ STATIC mp_obj_t machine_pin_drive(size_t n_args, const mp_obj_t *args) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_pin_drive_obj, 1, 2, machine_pin_drive);
 
+// pin.irq(handler=None, trigger=IRQ_FALLING|IRQ_RISING, hard=False)
+STATIC mp_obj_t machine_pin_irq(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    enum { ARG_handler, ARG_trigger, ARG_hard };
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_handler, MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
+        { MP_QSTR_trigger, MP_ARG_INT, {.u_int = 3} },
+        { MP_QSTR_hard, MP_ARG_BOOL, {.u_bool = false} },
+    };
+    machine_pin_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]);
+    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
+    mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
+
+    // Get the IRQ object.
+    uint8_t eic_id = get_pin_af_info(self->id)->eic;
+    machine_pin_irq_obj_t *irq = MP_STATE_PORT(machine_pin_irq_objects[eic_id]);
+    if (irq != NULL && irq->pin_id != self->id) {
+        mp_raise_ValueError(MP_ERROR_TEXT("IRQ already used"));
+    }
+
+    // Allocate the IRQ object if it doesn't already exist.
+    if (irq == NULL) {
+        irq = m_new_obj(machine_pin_irq_obj_t);
+        irq->base.base.type = &mp_irq_type;
+        irq->base.methods = (mp_irq_methods_t *)&machine_pin_irq_methods;
+        irq->base.parent = MP_OBJ_FROM_PTR(self);
+        irq->base.handler = mp_const_none;
+        irq->base.ishard = false;
+        irq->pin_id = 0xff;
+        MP_STATE_PORT(machine_pin_irq_objects[eic_id]) = irq;
+    }
+    // (Re-)configure the irq.
+    if (n_args > 1 || kw_args->used != 0) {
+
+        // set the mux config of the pin.
+        mp_hal_set_pin_mux(self->id, ALT_FCT_EIC);
+
+        // Configure IRQ.
+        #if defined(MCU_SAMD21)
+
+        uint32_t irq_num = 4;
+        // Disable all IRQs from the affected source while data is updated.
+        NVIC_DisableIRQ(irq_num);
+        // Disable EIC
+        EIC->CTRL.bit.ENABLE = 0;
+        while (EIC->STATUS.bit.SYNCBUSY != 0) {
+        }
+        EIC->INTENCLR.reg = (1 << eic_id);
+        // Enable the clocks
+        PM->APBAMASK.bit.EIC_ |= 1;
+        GCLK->CLKCTRL.reg = GCLK_CLKCTRL_CLKEN | GCLK_CLKCTRL_GEN_GCLK2 | EIC_GCLK_ID;
+
+        #elif defined(MCU_SAMD51)
+
+        uint32_t irq_num = eic_id + 12;
+        // Disable all IRQs from the affected source while data is updated.
+        NVIC_DisableIRQ(irq_num);
+        // Disable EIC
+        EIC->CTRLA.bit.ENABLE = 0;
+        while (EIC->SYNCBUSY.bit.ENABLE != 0) {
+        }
+        EIC->INTENCLR.reg = (1 << eic_id);
+        // Enable the clocks
+        MCLK->APBAMASK.bit.EIC_ |= 1;
+        GCLK->PCHCTRL[EIC_GCLK_ID].reg = GCLK_PCHCTRL_CHEN | GCLK_PCHCTRL_GEN_GCLK2;
+
+        #endif
+        // Clear the pending interrupts flag
+        EIC->INTENCLR.reg = (1 << eic_id);
+
+        // Update IRQ data.
+        irq->base.handler = args[ARG_handler].u_obj;
+        irq->base.ishard = args[ARG_hard].u_bool;
+        irq->flags = 0;
+        irq->trigger = args[ARG_trigger].u_int;
+        irq->pin_id = self->id;
+
+        // Enable IRQ if a handler is given.
+        if (args[ARG_handler].u_obj != mp_const_none) {
+            // Set EIC channel mode
+            EIC->CONFIG[eic_id / 8].reg |= irq->trigger << ((eic_id % 8) * 4);
+            EIC->INTENSET.reg = (1 << eic_id);
+            EIC->INTFLAG.reg |= (1 << eic_id);
+        }
+
+        // Enable EIC (again)
+        #if defined(MCU_SAMD21)
+        EIC->CTRL.bit.ENABLE = 1;
+        while (EIC->STATUS.bit.SYNCBUSY != 0) {
+        }
+        #elif defined(MCU_SAMD51)
+        EIC->CTRLA.bit.ENABLE = 1;
+        while (EIC->SYNCBUSY.bit.ENABLE != 0) {
+        }
+        #endif
+        // Enable interrupt again
+        NVIC_EnableIRQ(irq_num);
+    }
+    return MP_OBJ_FROM_PTR(irq);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_KW(machine_pin_irq_obj, 1, machine_pin_irq);
+
+void pin_irq_deinit_all(void) {
+
+    EIC->INTENCLR.reg = 0xffff;  // Disable all interrupts from the EIC.
+    for (int i = 0; i < 16; i++) { // Clear all irq object pointers
+        MP_STATE_PORT(machine_pin_irq_objects[i]) = NULL;
+    }
+    // Disable all irq's at the NVIC controller
+    #if defined(MCU_SAMD21)
+    NVIC_DisableIRQ(4);
+    #elif defined(MCU_SAMD51)
+    for (int i = 12; i < 20; i++) {
+        NVIC_DisableIRQ(i);
+    }
+    #endif
+}
+
+// Common EIC handler for all events.
+void EIC_Handler() {
+    uint32_t mask = 1;
+    uint32_t isr = EIC->INTFLAG.reg;
+    for (int eic_id = 0; eic_id < 16; eic_id++, mask <<= 1) {
+        // Did the ISR fire?
+        if (isr & mask) {
+            EIC->INTFLAG.reg |= mask; // clear the ISR flag
+            machine_pin_irq_obj_t *irq = MP_STATE_PORT(machine_pin_irq_objects[eic_id]);
+            if (irq != NULL) {
+                irq->flags = irq->trigger;
+                mp_irq_handler(&irq->base);
+                break;
+            }
+        }
+    }
+}
+
 STATIC const mp_rom_map_elem_t machine_pin_locals_dict_table[] = {
     // instance methods
     { MP_ROM_QSTR(MP_QSTR_init), MP_ROM_PTR(&machine_pin_init_obj) },
@@ -273,6 +422,7 @@ STATIC const mp_rom_map_elem_t machine_pin_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_toggle), MP_ROM_PTR(&machine_pin_toggle_obj) },
     { MP_ROM_QSTR(MP_QSTR_disable), MP_ROM_PTR(&machine_pin_disable_obj) },
     { MP_ROM_QSTR(MP_QSTR_drive), MP_ROM_PTR(&machine_pin_drive_obj) },
+    { MP_ROM_QSTR(MP_QSTR_irq), MP_ROM_PTR(&machine_pin_irq_obj) },
 
     // class constants
     { MP_ROM_QSTR(MP_QSTR_IN), MP_ROM_INT(GPIO_MODE_IN) },
@@ -283,6 +433,8 @@ STATIC const mp_rom_map_elem_t machine_pin_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_PULL_DOWN), MP_ROM_INT(GPIO_PULL_DOWN) },
     { MP_ROM_QSTR(MP_QSTR_LOW_POWER), MP_ROM_INT(GPIO_STRENGTH_2MA) },
     { MP_ROM_QSTR(MP_QSTR_HIGH_POWER), MP_ROM_INT(GPIO_STRENGTH_8MA) },
+    { MP_ROM_QSTR(MP_QSTR_IRQ_RISING), MP_ROM_INT(GPIO_IRQ_EDGE_RISE) },
+    { MP_ROM_QSTR(MP_QSTR_IRQ_FALLING), MP_ROM_INT(GPIO_IRQ_EDGE_FALL) },
 };
 STATIC MP_DEFINE_CONST_DICT(machine_pin_locals_dict, machine_pin_locals_dict_table);
 
@@ -292,10 +444,10 @@ STATIC mp_uint_t pin_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_t arg, i
 
     switch (request) {
         case MP_PIN_READ: {
-            return gpio_get_pin_level(self->id);
+            return mp_hal_pin_read(self->id);
         }
         case MP_PIN_WRITE: {
-            gpio_set_pin_level(self->id, arg);
+            mp_hal_pin_write(self->id, arg);
             return 0;
         }
     }
@@ -317,6 +469,48 @@ MP_DEFINE_CONST_OBJ_TYPE(
     locals_dict, &machine_pin_locals_dict
     );
 
+static uint8_t find_eic_id(int pin) {
+    for (int eic_id = 0; eic_id < 16; eic_id++) {
+        machine_pin_irq_obj_t *irq = MP_STATE_PORT(machine_pin_irq_objects[eic_id]);
+        if (irq != NULL && irq->pin_id == pin) {
+            return eic_id;
+        }
+    }
+    return 0xff;
+}
+
+STATIC mp_uint_t machine_pin_irq_trigger(mp_obj_t self_in, mp_uint_t new_trigger) {
+    machine_pin_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    uint8_t eic_id = find_eic_id(self->id);
+    if (eic_id != 0xff) {
+        machine_pin_irq_obj_t *irq = MP_STATE_PORT(machine_pin_irq_objects[eic_id]);
+        EIC->INTENCLR.reg |= (1 << eic_id);
+        irq->flags = 0;
+        irq->trigger = new_trigger;
+        EIC->INTENSET.reg |= (1 << eic_id);
+    }
+    return 0;
+}
+
+STATIC mp_uint_t machine_pin_irq_info(mp_obj_t self_in, mp_uint_t info_type) {
+    machine_pin_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    uint8_t eic_id = find_eic_id(self->id);
+    if (eic_id != 0xff) {
+        machine_pin_irq_obj_t *irq = MP_STATE_PORT(machine_pin_irq_objects[eic_id]);
+        if (info_type == MP_IRQ_INFO_FLAGS) {
+            return irq->flags;
+        } else if (info_type == MP_IRQ_INFO_TRIGGERS) {
+            return irq->trigger;
+        }
+    }
+    return 0;
+}
+
+STATIC const mp_irq_methods_t machine_pin_irq_methods = {
+    .trigger = machine_pin_irq_trigger,
+    .info = machine_pin_irq_info,
+};
+
 mp_hal_pin_obj_t mp_hal_get_pin_obj(mp_obj_t obj) {
     if (!mp_obj_is_type(obj, &machine_pin_type)) {
         mp_raise_ValueError(MP_ERROR_TEXT("expecting a Pin"));
@@ -324,3 +518,5 @@ mp_hal_pin_obj_t mp_hal_get_pin_obj(mp_obj_t obj) {
     machine_pin_obj_t *pin = MP_OBJ_TO_PTR(obj);
     return pin->id;
 }
+
+MP_REGISTER_ROOT_POINTER(void *machine_pin_irq_objects[16]);
diff --git a/ports/samd/main.c b/ports/samd/main.c
index 4af4b2b4f8e5e..520763b5aa4ae 100644
--- a/ports/samd/main.c
+++ b/ports/samd/main.c
@@ -34,6 +34,7 @@
 
 extern uint8_t _sstack, _estack, _sheap, _eheap;
 extern void adc_deinit_all(void);
+extern void pin_irq_deinit_all(void);
 extern void pwm_deinit_all(void);
 
 void samd_main(void) {
@@ -65,6 +66,7 @@ void samd_main(void) {
 
         mp_printf(MP_PYTHON_PRINTER, "MPY: soft reboot\n");
         adc_deinit_all();
+        pin_irq_deinit_all();
         pwm_deinit_all();
         gc_sweep_all();
         mp_deinit();
diff --git a/ports/samd/mpconfigport.h b/ports/samd/mpconfigport.h
index 70bd202a313b3..574d47b035ded 100644
--- a/ports/samd/mpconfigport.h
+++ b/ports/samd/mpconfigport.h
@@ -54,7 +54,7 @@
 #define MICROPY_PY_BUILTINS_HELP            (1)
 #define MICROPY_PY_BUILTINS_HELP_TEXT       samd_help_text
 #define MICROPY_PY_BUILTINS_HELP_MODULES    (1)
-
+#define MICROPY_ENABLE_SCHEDULER            (1)
 // fixes sys/usys import issue
 #define MICROPY_MODULE_WEAK_LINKS           (1)
 // Control over Python builtins
@@ -104,6 +104,10 @@
 #define MICROPY_PY_MACHINE_PWM_DUTY_U16_NS  (1)
 #define MICROPY_PY_MACHINE_PWM_INCLUDEFILE  "ports/samd/machine_pwm.c"
 
+// Use VfsLfs's types for fileio/textio
+#define mp_type_fileio mp_type_vfs_lfs1_fileio
+#define mp_type_textio mp_type_vfs_lfs1_textio
+
 #define MP_STATE_PORT MP_STATE_VM
 
 // Miscellaneous settings
diff --git a/ports/samd/samd_isr.c b/ports/samd/samd_isr.c
index e16018c5348ce..a4e1dd708c41d 100644
--- a/ports/samd/samd_isr.c
+++ b/ports/samd/samd_isr.c
@@ -104,9 +104,6 @@ void SysTick_Handler(void) {
 
 // Temporary Handlers to allow builds.
 // Will be removed when the respecitve module is added.
-void EIC_Handler(void) {
-}
-
 void PendSV_Handler(void) {
 }
 

From 7d281f6165d50a75ba21eda4d8d253a8982f3543 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sun, 5 Jun 2022 14:28:08 +0200
Subject: [PATCH 2690/3533] samd/modmachine: Add disable_irq(), enable_irq()
 and idle() to machine.

No specific features.
---
 ports/samd/modmachine.c   | 23 +++++++++++++++++++++++
 ports/samd/mpconfigport.h | 12 ++++++++++++
 2 files changed, 35 insertions(+)

diff --git a/ports/samd/modmachine.c b/ports/samd/modmachine.c
index e0a0378461560..eafe9972d065e 100644
--- a/ports/samd/modmachine.c
+++ b/ports/samd/modmachine.c
@@ -120,6 +120,25 @@ STATIC mp_obj_t machine_unique_id(void) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_0(machine_unique_id_obj, machine_unique_id);
 
+STATIC mp_obj_t machine_idle(void) {
+    MICROPY_EVENT_POLL_HOOK;
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(machine_idle_obj, machine_idle);
+
+STATIC mp_obj_t machine_disable_irq(void) {
+    uint32_t state = MICROPY_BEGIN_ATOMIC_SECTION();
+    return mp_obj_new_int(state);
+}
+MP_DEFINE_CONST_FUN_OBJ_0(machine_disable_irq_obj, machine_disable_irq);
+
+STATIC mp_obj_t machine_enable_irq(mp_obj_t state_in) {
+    uint32_t state = mp_obj_get_int(state_in);
+    MICROPY_END_ATOMIC_SECTION(state);
+    return mp_const_none;
+}
+MP_DEFINE_CONST_FUN_OBJ_1(machine_enable_irq_obj, machine_enable_irq);
+
 STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__),            MP_ROM_QSTR(MP_QSTR_umachine) },
     { MP_ROM_QSTR(MP_QSTR_reset),               MP_ROM_PTR(&machine_reset_obj) },
@@ -136,6 +155,10 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_PWM),                 MP_ROM_PTR(&machine_pwm_type) },
     { MP_ROM_QSTR(MP_QSTR_SoftI2C),             MP_ROM_PTR(&mp_machine_soft_i2c_type) },
     { MP_ROM_QSTR(MP_QSTR_SoftSPI),             MP_ROM_PTR(&mp_machine_soft_spi_type) },
+
+    { MP_ROM_QSTR(MP_QSTR_idle),                MP_ROM_PTR(&machine_idle_obj) },
+    { MP_ROM_QSTR(MP_QSTR_disable_irq),         MP_ROM_PTR(&machine_disable_irq_obj) },
+    { MP_ROM_QSTR(MP_QSTR_enable_irq),          MP_ROM_PTR(&machine_enable_irq_obj) },
 };
 STATIC MP_DEFINE_CONST_DICT(machine_module_globals, machine_module_globals_table);
 
diff --git a/ports/samd/mpconfigport.h b/ports/samd/mpconfigport.h
index 574d47b035ded..fba4ee13d2867 100644
--- a/ports/samd/mpconfigport.h
+++ b/ports/samd/mpconfigport.h
@@ -111,6 +111,18 @@
 #define MP_STATE_PORT MP_STATE_VM
 
 // Miscellaneous settings
+__attribute__((always_inline)) static inline void enable_irq(uint32_t state) {
+    __set_PRIMASK(state);
+}
+
+__attribute__((always_inline)) static inline uint32_t disable_irq(void) {
+    uint32_t state = __get_PRIMASK();
+    __disable_irq();
+    return state;
+}
+
+#define MICROPY_BEGIN_ATOMIC_SECTION()     disable_irq()
+#define MICROPY_END_ATOMIC_SECTION(state)  enable_irq(state)
 
 #define MICROPY_EVENT_POLL_HOOK \
     do { \

From b33f2045290a379d2cefc1798780aa46f56e29a1 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sun, 5 Jun 2022 15:03:52 +0200
Subject: [PATCH 2691/3533] samd/machine_uart: Add the machine.UART class.

All board pins that have UART's assigned can be used.  Baud rate range is
75 Baud to ~2 MBaud.

No flow control yet, and only RX is buffered.  TX buffer and flow control
may be added later for SAMD51 with its larger RAM and Flash.
---
 ports/samd/Makefile       |   2 +
 ports/samd/machine_uart.c | 475 ++++++++++++++++++++++++++++++++++++++
 ports/samd/main.c         |   2 +
 ports/samd/modmachine.c   |   1 +
 ports/samd/modmachine.h   |   1 +
 ports/samd/mpconfigport.h |   1 +
 ports/samd/samd_isr.c     |   4 +-
 7 files changed, 484 insertions(+), 2 deletions(-)
 create mode 100644 ports/samd/machine_uart.c

diff --git a/ports/samd/Makefile b/ports/samd/Makefile
index 163971cde7344..196b7acf11bfa 100644
--- a/ports/samd/Makefile
+++ b/ports/samd/Makefile
@@ -93,6 +93,7 @@ SRC_C = \
 	machine_adc.c \
 	machine_led.c \
 	machine_pin.c \
+	machine_uart.c \
 	main.c \
 	modutime.c \
 	modmachine.c \
@@ -144,6 +145,7 @@ SRC_QSTR += \
 	machine_led.c \
 	machine_pin.c \
 	machine_pwm.c \
+	machine_uart.c \
 	modutime.c \
 	modmachine.c \
 	modsamd.c \
diff --git a/ports/samd/machine_uart.c b/ports/samd/machine_uart.c
new file mode 100644
index 0000000000000..9c5cfce839945
--- /dev/null
+++ b/ports/samd/machine_uart.c
@@ -0,0 +1,475 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020-2021 Damien P. George
+ * Copyright (c) 2022 Robert Hammelrath
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+#include "py/runtime.h"
+#include "py/mphal.h"
+#include "py/stream.h"
+#include "py/ringbuf.h"
+#include "modmachine.h"
+#include "samd_soc.h"
+#include "pin_af.h"
+#include "clock_config.h"
+
+#define DEFAULT_UART_BAUDRATE (115200)
+#define DEFAULT_BUFFER_SIZE (256)
+#define MIN_BUFFER_SIZE  (32)
+#define MAX_BUFFER_SIZE  (32766)
+#define USART_BUFFER_TX  (0)
+
+typedef struct _machine_uart_obj_t {
+    mp_obj_base_t base;
+    uint8_t id;
+    uint32_t baudrate;
+    uint8_t bits;
+    uint8_t parity;
+    uint8_t stop;
+    uint8_t tx;
+    sercom_pad_config_t tx_pad_config;
+    uint8_t rx;
+    sercom_pad_config_t rx_pad_config;
+    uint16_t timeout;       // timeout waiting for first char (in ms)
+    uint16_t timeout_char;  // timeout waiting between chars (in ms)
+    bool new;
+    ringbuf_t read_buffer;
+    #if USART_BUFFER_TX
+    ringbuf_t write_buffer;
+    #endif
+} machine_uart_obj_t;
+
+Sercom *sercom_instance[] = SERCOM_INSTS;
+machine_uart_obj_t *uart_table[SERCOM_INST_NUM] = {};
+
+STATIC const char *_parity_name[] = {"None", "", "0", "1"};  // Is defined as 0, 2, 3
+
+// Irq handler
+
+// take all bytes from the fifo and store them in the buffer
+STATIC void uart_drain_rx_fifo(machine_uart_obj_t *self, Sercom *uart) {
+    while (uart->USART.INTFLAG.bit.RXC != 0) {
+        if (ringbuf_free(&self->read_buffer) > 0) {
+            // get a byte from uart and put into the buffer
+            ringbuf_put(&(self->read_buffer), uart->USART.DATA.bit.DATA);
+        } else {
+            // if the buffer is full, discard the data for now
+            // t.b.d.: flow control
+            uint32_t temp;
+            (void)temp;
+            temp = uart->USART.DATA.bit.DATA;
+        }
+    }
+}
+
+void common_uart_irq_handler(int uart_id) {
+    machine_uart_obj_t *self = uart_table[uart_id];
+    // Handle IRQ
+    if (self != NULL) {
+        Sercom *uart = sercom_instance[self->id];
+        if (uart->USART.INTFLAG.bit.RXC != 0) {
+            // Now handler the incoming data
+            uart_drain_rx_fifo(self, uart);
+        } else if (uart->USART.INTFLAG.bit.DRE != 0) {
+            // handle the outgoing data
+        } else {
+            // Disable the other interrupts, if set by error
+            uart->USART.INTENCLR.reg = (uint8_t) ~(SERCOM_USART_INTENCLR_DRE | SERCOM_USART_INTENCLR_RXC);
+        }
+    }
+}
+
+void sercom_enable(Sercom *uart, int state) {
+    uart->USART.CTRLA.bit.ENABLE = state; // Set the state on/off
+    // Wait for the Registers to update.
+    while (uart->USART.SYNCBUSY.bit.ENABLE) {
+    }
+}
+
+STATIC void machine_uart_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+    machine_uart_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    mp_printf(print, "UART(%u, baudrate=%u, bits=%u, parity=%s, stop=%u, "
+        "timeout=%u, timeout_char=%u, rxbuf=%d)",
+        self->id, self->baudrate, self->bits, _parity_name[self->parity],
+        self->stop + 1, self->timeout, self->timeout_char, self->read_buffer.size - 1);
+}
+
+STATIC mp_obj_t machine_uart_init_helper(machine_uart_obj_t *self, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    enum { ARG_baudrate, ARG_bits, ARG_parity, ARG_stop, ARG_tx, ARG_rx,
+           ARG_timeout, ARG_timeout_char, ARG_rxbuf, ARG_txbuf};
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_baudrate, MP_ARG_INT, {.u_int = -1} },
+        { MP_QSTR_bits, MP_ARG_INT, {.u_int = -1} },
+        { MP_QSTR_parity, MP_ARG_OBJ, {.u_rom_obj = MP_ROM_INT(-1)} },
+        { MP_QSTR_stop, MP_ARG_INT, {.u_int = -1} },
+        { MP_QSTR_tx, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
+        { MP_QSTR_rx, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
+        { MP_QSTR_timeout, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} },
+        { MP_QSTR_timeout_char, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} },
+        { MP_QSTR_rxbuf, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} },
+        #if USART_BUFFER_TX
+        { MP_QSTR_txbuf, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} },
+        #endif
+    };
+
+    // Parse args
+    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
+    mp_arg_parse_all(n_args, pos_args, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
+
+    // Set baudrate if configured.
+    if (args[ARG_baudrate].u_int > 0) {
+        self->baudrate = args[ARG_baudrate].u_int;
+    }
+
+    // Set bits if configured.
+    if (args[ARG_bits].u_int > 0) {
+        self->bits = args[ARG_bits].u_int;
+    }
+
+    // Set parity if configured.
+    if (args[ARG_parity].u_obj != MP_OBJ_NEW_SMALL_INT(-1)) {
+        if (args[ARG_parity].u_obj == mp_const_none) {
+            self->parity = 0;
+        } else if (mp_obj_get_int(args[ARG_parity].u_obj) & 1) {
+            self->parity = 1;  // odd
+        } else {
+            self->parity = 2;  // even
+        }
+    }
+
+    // Set stop bits if configured.
+    if (args[ARG_stop].u_int > 0) {
+        self->stop = (args[ARG_stop].u_int - 1) & 1;
+    }
+
+    // Set TX/RX pins if configured.
+    if (args[ARG_tx].u_obj != mp_const_none) {
+        self->tx = mp_hal_get_pin_obj(args[ARG_tx].u_obj);
+    }
+    if (args[ARG_rx].u_obj != mp_const_none) {
+        self->rx = mp_hal_get_pin_obj(args[ARG_rx].u_obj);
+    }
+
+    // Set timeout if configured.
+    if (args[ARG_timeout].u_int >= 0) {
+        self->timeout = args[ARG_timeout].u_int;
+    }
+
+    // Set timeout_char if configured.
+    if (args[ARG_timeout_char].u_int >= 0) {
+        self->timeout_char = args[ARG_timeout_char].u_int;
+    }
+
+    // Set the RX buffer size if configured.
+    size_t rxbuf_len = DEFAULT_BUFFER_SIZE;
+    if (args[ARG_rxbuf].u_int > 0) {
+        rxbuf_len = args[ARG_rxbuf].u_int;
+        if (rxbuf_len < MIN_BUFFER_SIZE) {
+            rxbuf_len = MIN_BUFFER_SIZE;
+        } else if (rxbuf_len > MAX_BUFFER_SIZE) {
+            mp_raise_ValueError(MP_ERROR_TEXT("rxbuf too large"));
+        }
+    }
+
+    #if USART_BUFFER_TX
+    // Set the TX buffer size if configured.
+    size_t txbuf_len = DEFAULT_BUFFER_SIZE;
+    if (args[ARG_txbuf].u_int > 0) {
+        txbuf_len = args[ARG_txbuf].u_int;
+        if (txbuf_len < MIN_BUFFER_SIZE) {
+            txbuf_len = MIN_BUFFER_SIZE;
+        } else if (txbuf_len > MAX_BUFFER_SIZE) {
+            mp_raise_ValueError(MP_ERROR_TEXT("txbuf too large"));
+        }
+    }
+    #endif
+    // Initialise the UART peripheral if any arguments given, or it was not initialised previously.
+    if (n_args > 0 || kw_args->used > 0 || self->new) {
+        self->new = false;
+
+        // Check the rx/tx pin assignments
+        if (self->tx == 0xff || self->rx == 0xff || (self->tx / 4) != (self->rx / 4)) {
+            mp_raise_ValueError(MP_ERROR_TEXT("Non-matching or missing rx/tx"));
+        }
+        self->rx_pad_config = get_sercom_config(self->rx, self->id);
+        self->tx_pad_config = get_sercom_config(self->tx, self->id);
+
+        // Make sure timeout_char is at least as long as a whole character (13 bits to be safe).
+        uint32_t min_timeout_char = 13000 / self->baudrate + 1;
+        if (self->timeout_char < min_timeout_char) {
+            self->timeout_char = min_timeout_char;
+        }
+
+        // Allocate the RX/TX buffers.
+        ringbuf_alloc(&(self->read_buffer), rxbuf_len + 1);
+        MP_STATE_PORT(samd_uart_rx_buffer[self->id]) = self->read_buffer.buf;
+
+        #if USART_BUFFER_TX
+        ringbuf_alloc(&(self->write_buffer), txbuf_len + 1);
+        MP_STATE_PORT(samd_uart_tx_buffer[self->id]) = self->write_buffer.buf;
+        #endif
+
+        // Step 1: Configure the Pin mux.
+        mp_hal_set_pin_mux(self->rx, self->rx_pad_config.alt_fct);
+        mp_hal_set_pin_mux(self->tx, self->tx_pad_config.alt_fct);
+
+        // Next: Set up the clocks
+        enable_sercom_clock(self->id);
+
+        // Next: Configure the USART
+        Sercom *uart = sercom_instance[self->id];
+        // Reset (clear) the peripheral registers.
+        while (uart->USART.SYNCBUSY.bit.SWRST) {
+        }
+        uart->USART.CTRLA.bit.SWRST = 1; // Reset all Registers, disable peripheral
+        while (uart->USART.SYNCBUSY.bit.SWRST) {
+        }
+
+        uint8_t txpo = self->tx_pad_config.pad_nr;
+        #if defined(MCU_SAMD21)
+        if (self->tx_pad_config.pad_nr == 2) { // Map pad 2 to TXPO = 1
+            txpo = 1;
+        }
+        #endif
+
+        uart->USART.CTRLA.reg =
+            SERCOM_USART_CTRLA_DORD // Data order
+            | SERCOM_USART_CTRLA_FORM(self->parity != 0 ? 1 : 0)  // Enable parity or not
+            | SERCOM_USART_CTRLA_RXPO(self->rx_pad_config.pad_nr) // Set Pad#
+            | SERCOM_USART_CTRLA_TXPO(txpo) // Set Pad#
+            | SERCOM_USART_CTRLA_MODE(1) // USART with internal clock
+        ;
+        uart->USART.CTRLB.reg =
+            SERCOM_USART_CTRLB_RXEN   // Enable Rx & Tx
+            | SERCOM_USART_CTRLB_TXEN
+            | ((self->parity & 1) << SERCOM_USART_CTRLB_PMODE_Pos)
+            | (self->stop << SERCOM_USART_CTRLB_SBMODE_Pos)
+            | SERCOM_USART_CTRLB_CHSIZE((self->bits & 7) | (self->bits & 1))
+        ;
+        while (uart->USART.SYNCBUSY.bit.CTRLB) {
+        }
+
+        // USART is driven by the clock of GCLK Generator 2, freq by get_apb_freq()
+        // baud rate; 65536 * (1 - 16 * 115200/bus_freq)
+        uint32_t baud = 65536 - ((uint64_t)(65536 * 16) * self->baudrate + get_apb_freq() / 2) / get_apb_freq();
+        uart->USART.BAUD.bit.BAUD = baud; // Set Baud
+
+        // Enable RXC interrupt
+        uart->USART.INTENSET.bit.RXC = 1;
+        #if defined(MCU_SAMD21)
+        NVIC_EnableIRQ(SERCOM0_IRQn + self->id);
+        #elif defined(MCU_SAMD51)
+        NVIC_EnableIRQ(SERCOM0_0_IRQn + 4 * self->id + 2);
+        #endif
+        sercom_register_irq(self->id, SERCOM_IRQ_TYPE_UART);
+
+        sercom_enable(uart, 1);
+    }
+
+    return MP_OBJ_FROM_PTR(self);
+}
+
+STATIC mp_obj_t machine_uart_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
+    mp_arg_check_num(n_args, n_kw, 1, MP_OBJ_FUN_ARGS_MAX, true);
+
+    // Get UART bus.
+    int uart_id = mp_obj_get_int(args[0]);
+    if (uart_id < 0 || uart_id > SERCOM_INST_NUM) {
+        mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("UART(%d) doesn't exist"), uart_id);
+    }
+
+    // Create the UART object and fill it with defaults.
+    machine_uart_obj_t *self = mp_obj_malloc(machine_uart_obj_t, &machine_uart_type);
+    self->id = uart_id;
+    self->baudrate = DEFAULT_UART_BAUDRATE;
+    self->bits = 8;
+    self->stop = 0;
+    self->timeout = 1;
+    self->timeout_char = 1;
+    self->tx = 0xff;
+    self->rx = 0xff;
+    self->new = true;
+    uart_table[uart_id] = self;
+
+    mp_map_t kw_args;
+    mp_map_init_fixed_table(&kw_args, n_kw, args + n_args);
+    return machine_uart_init_helper(self, n_args - 1, args + 1, &kw_args);
+}
+
+// uart.init(baud, [kwargs])
+STATIC mp_obj_t machine_uart_init(size_t n_args, const mp_obj_t *args, mp_map_t *kw_args) {
+    return machine_uart_init_helper(args[0], n_args - 1, args + 1, kw_args);
+}
+MP_DEFINE_CONST_FUN_OBJ_KW(machine_uart_init_obj, 1, machine_uart_init);
+
+STATIC mp_obj_t machine_uart_deinit(mp_obj_t self_in) {
+    machine_uart_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    Sercom *uart = sercom_instance[self->id];
+    // clear table entry of uart
+    uart_table[self->id] = NULL;
+    // Disable interrupts
+    uart->USART.INTENCLR.reg = 0xff;
+    MP_STATE_PORT(samd_uart_rx_buffer[self->id]) = NULL;
+    #if USART_BUFFER_TX
+    MP_STATE_PORT(samd_uart_tx_buffer[self->id]) = NULL;
+    #endif
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_uart_deinit_obj, machine_uart_deinit);
+
+STATIC mp_obj_t machine_uart_any(mp_obj_t self_in) {
+    machine_uart_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    // get all bytes from the fifo first
+    uart_drain_rx_fifo(self, sercom_instance[self->id]);
+    return MP_OBJ_NEW_SMALL_INT(ringbuf_avail(&self->read_buffer));
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_uart_any_obj, machine_uart_any);
+
+STATIC mp_obj_t machine_uart_sendbreak(mp_obj_t self_in) {
+    machine_uart_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    uint32_t break_time_us = 13 * 1000000 / self->baudrate;
+
+    // Wait for the TX queue & register to clear
+    // Since the flags are not safe, just wait sufficiently long.
+    // Once tx buffering is implemented, wait as well for the buffer to clear.
+    mp_hal_delay_us(2 * break_time_us);
+    // Disable MUX
+    PORT->Group[self->tx / 32].PINCFG[self->tx % 32].bit.PMUXEN = 0;
+    // Set TX pin to low for break time
+    mp_hal_pin_low(self->tx);
+    mp_hal_delay_us(break_time_us);
+    mp_hal_pin_high(self->tx);
+    // Enable Mux again
+    mp_hal_set_pin_mux(self->tx, self->tx_pad_config.alt_fct);
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_uart_sendbreak_obj, machine_uart_sendbreak);
+
+void uart_deinit_all(void) {
+    for (int i = 0; i < SERCOM_INST_NUM; i++) {
+        if (uart_table[i] != NULL) {
+            machine_uart_deinit((mp_obj_t)uart_table[i]);
+        }
+    }
+}
+
+STATIC const mp_rom_map_elem_t machine_uart_locals_dict_table[] = {
+    { MP_ROM_QSTR(MP_QSTR_init), MP_ROM_PTR(&machine_uart_init_obj) },
+    { MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&machine_uart_deinit_obj) },
+
+    { MP_ROM_QSTR(MP_QSTR_any), MP_ROM_PTR(&machine_uart_any_obj) },
+    { MP_ROM_QSTR(MP_QSTR_sendbreak), MP_ROM_PTR(&machine_uart_sendbreak_obj) },
+
+    { MP_ROM_QSTR(MP_QSTR_read), MP_ROM_PTR(&mp_stream_read_obj) },
+    { MP_ROM_QSTR(MP_QSTR_readline), MP_ROM_PTR(&mp_stream_unbuffered_readline_obj) },
+    { MP_ROM_QSTR(MP_QSTR_readinto), MP_ROM_PTR(&mp_stream_readinto_obj) },
+    { MP_ROM_QSTR(MP_QSTR_write), MP_ROM_PTR(&mp_stream_write_obj) },
+};
+STATIC MP_DEFINE_CONST_DICT(machine_uart_locals_dict, machine_uart_locals_dict_table);
+
+STATIC mp_uint_t machine_uart_read(mp_obj_t self_in, void *buf_in, mp_uint_t size, int *errcode) {
+    machine_uart_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    uint64_t t = mp_hal_ticks_ms() + self->timeout;
+    uint64_t timeout_char = self->timeout_char;
+    uint8_t *dest = buf_in;
+    Sercom *uart = sercom_instance[self->id];
+
+    // t.b.d. Cater timeout for timer wrap after 50 days.
+    for (size_t i = 0; i < size; i++) {
+        // Wait for the first/next character
+        while (ringbuf_avail(&self->read_buffer) == 0) {
+            if (uart->USART.INTFLAG.bit.RXC != 0) {
+                // Force a few incoming bytes to the buffer
+                uart_drain_rx_fifo(self, uart);
+                break;
+            }
+            if (mp_hal_ticks_ms() > t) {  // timed out
+                if (i <= 0) {
+                    *errcode = MP_EAGAIN;
+                    return MP_STREAM_ERROR;
+                } else {
+                    return i;
+                }
+            }
+            MICROPY_EVENT_POLL_HOOK
+        }
+        *dest++ = ringbuf_get(&(self->read_buffer));
+        t = mp_hal_ticks_ms() + timeout_char;
+    }
+    return size;
+}
+
+STATIC mp_uint_t machine_uart_write(mp_obj_t self_in, const void *buf_in, mp_uint_t size, int *errcode) {
+    machine_uart_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    size_t remaining = size;
+    const uint8_t *src = buf_in;
+    Sercom *uart = sercom_instance[self->id];
+
+    while (remaining--) {
+        while (!(uart->USART.INTFLAG.bit.DRE)) {
+        }
+        uart->USART.DATA.bit.DATA = *src;
+        src += 1;
+    }
+
+    return size;
+}
+
+STATIC mp_uint_t machine_uart_ioctl(mp_obj_t self_in, mp_uint_t request, mp_uint_t arg, int *errcode) {
+    machine_uart_obj_t *self = self_in;
+    mp_uint_t ret;
+    Sercom *uart = sercom_instance[self->id];
+    if (request == MP_STREAM_POLL) {
+        uintptr_t flags = arg;
+        ret = 0;
+        if ((flags & MP_STREAM_POLL_RD) && (uart->USART.INTFLAG.bit.RXC != 0 || ringbuf_avail(&self->read_buffer) > 0)) {
+            ret |= MP_STREAM_POLL_RD;
+        }
+        if ((flags & MP_STREAM_POLL_WR) && (uart->USART.INTFLAG.bit.DRE != 0)) {
+            ret |= MP_STREAM_POLL_WR;
+        }
+    } else {
+        *errcode = MP_EINVAL;
+        ret = MP_STREAM_ERROR;
+    }
+    return ret;
+}
+
+STATIC const mp_stream_p_t uart_stream_p = {
+    .read = machine_uart_read,
+    .write = machine_uart_write,
+    .ioctl = machine_uart_ioctl,
+    .is_text = false,
+};
+
+MP_DEFINE_CONST_OBJ_TYPE(
+    machine_uart_type,
+    MP_QSTR_UART,
+    MP_TYPE_FLAG_ITER_IS_STREAM,
+    make_new, machine_uart_make_new,
+    print, machine_uart_print,
+    protocol, &uart_stream_p,
+    locals_dict, &machine_uart_locals_dict
+    );
+
+MP_REGISTER_ROOT_POINTER(void *samd_uart_rx_buffer[SERCOM_INST_NUM]);
diff --git a/ports/samd/main.c b/ports/samd/main.c
index 520763b5aa4ae..60b8e57faa445 100644
--- a/ports/samd/main.c
+++ b/ports/samd/main.c
@@ -36,6 +36,7 @@ extern uint8_t _sstack, _estack, _sheap, _eheap;
 extern void adc_deinit_all(void);
 extern void pin_irq_deinit_all(void);
 extern void pwm_deinit_all(void);
+extern void uart_deinit_all(void);
 
 void samd_main(void) {
     mp_stack_set_top(&_estack);
@@ -68,6 +69,7 @@ void samd_main(void) {
         adc_deinit_all();
         pin_irq_deinit_all();
         pwm_deinit_all();
+        uart_deinit_all();
         gc_sweep_all();
         mp_deinit();
     }
diff --git a/ports/samd/modmachine.c b/ports/samd/modmachine.c
index eafe9972d065e..8c3033f891bda 100644
--- a/ports/samd/modmachine.c
+++ b/ports/samd/modmachine.c
@@ -155,6 +155,7 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_PWM),                 MP_ROM_PTR(&machine_pwm_type) },
     { MP_ROM_QSTR(MP_QSTR_SoftI2C),             MP_ROM_PTR(&mp_machine_soft_i2c_type) },
     { MP_ROM_QSTR(MP_QSTR_SoftSPI),             MP_ROM_PTR(&mp_machine_soft_spi_type) },
+    { MP_ROM_QSTR(MP_QSTR_UART),                MP_ROM_PTR(&machine_uart_type) },
 
     { MP_ROM_QSTR(MP_QSTR_idle),                MP_ROM_PTR(&machine_idle_obj) },
     { MP_ROM_QSTR(MP_QSTR_disable_irq),         MP_ROM_PTR(&machine_disable_irq_obj) },
diff --git a/ports/samd/modmachine.h b/ports/samd/modmachine.h
index 00e72ede1a7fd..30de339b4a2d6 100644
--- a/ports/samd/modmachine.h
+++ b/ports/samd/modmachine.h
@@ -32,5 +32,6 @@ extern const mp_obj_type_t machine_adc_type;
 extern const mp_obj_type_t machine_led_type;
 extern const mp_obj_type_t machine_pin_type;
 extern const mp_obj_type_t machine_pwm_type;
+extern const mp_obj_type_t machine_uart_type;
 
 #endif // MICROPY_INCLUDED_SAMD_MODMACHINE_H
diff --git a/ports/samd/mpconfigport.h b/ports/samd/mpconfigport.h
index fba4ee13d2867..b8cb0f3eb74f2 100644
--- a/ports/samd/mpconfigport.h
+++ b/ports/samd/mpconfigport.h
@@ -48,6 +48,7 @@
 #define MICROPY_HELPER_REPL                 (1)
 #define MICROPY_LONGINT_IMPL                (MICROPY_LONGINT_IMPL_MPZ)
 #define MICROPY_ENABLE_SOURCE_LINE          (1)
+#define MICROPY_STREAMS_NON_BLOCK           (1)
 #define MICROPY_ERROR_REPORTING             (MICROPY_ERROR_REPORTING_TERSE)
 #define MICROPY_CPYTHON_COMPAT              (0)
 #define MICROPY_CAN_OVERRIDE_BUILTINS       (1)
diff --git a/ports/samd/samd_isr.c b/ports/samd/samd_isr.c
index a4e1dd708c41d..0e0d84db6906a 100644
--- a/ports/samd/samd_isr.c
+++ b/ports/samd/samd_isr.c
@@ -109,9 +109,9 @@ void PendSV_Handler(void) {
 
 
 static uint8_t sercom_irq_type[SERCOM_INST_NUM] = {};
+// Temporarily commented until the module is added
 void (*sercom_irq_handler_table[])(int num) = {
-    // Temporarily commented until the module is added
-    NULL, // common_uart_irq_handler,
+    common_uart_irq_handler,
     NULL, // common_spi_irq_handler,
     NULL  // common_i2c_irq_handler
 };

From aa870708ac262824ab5829e0f163f8f1e1332ada Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sun, 5 Jun 2022 17:02:46 +0200
Subject: [PATCH 2692/3533] samd/machine_spi: Add the machine.SPI class.

Suported by both SAMD21 and SAMD51.  It follows the generic API, except for
the bits=nn option, which is not implemented (yet).
---
 ports/samd/Makefile       |   2 +
 ports/samd/machine_spi.c  | 330 ++++++++++++++++++++++++++++++++++++++
 ports/samd/main.c         |   2 +
 ports/samd/modmachine.c   |   1 +
 ports/samd/modmachine.h   |   1 +
 ports/samd/mpconfigport.h |   1 +
 ports/samd/samd_isr.c     |   2 +-
 7 files changed, 338 insertions(+), 1 deletion(-)
 create mode 100644 ports/samd/machine_spi.c

diff --git a/ports/samd/Makefile b/ports/samd/Makefile
index 196b7acf11bfa..ca0309fa69935 100644
--- a/ports/samd/Makefile
+++ b/ports/samd/Makefile
@@ -93,6 +93,7 @@ SRC_C = \
 	machine_adc.c \
 	machine_led.c \
 	machine_pin.c \
+	machine_spi.c \
 	machine_uart.c \
 	main.c \
 	modutime.c \
@@ -145,6 +146,7 @@ SRC_QSTR += \
 	machine_led.c \
 	machine_pin.c \
 	machine_pwm.c \
+	machine_spi.c \
 	machine_uart.c \
 	modutime.c \
 	modmachine.c \
diff --git a/ports/samd/machine_spi.c b/ports/samd/machine_spi.c
new file mode 100644
index 0000000000000..b3504aeba32ba
--- /dev/null
+++ b/ports/samd/machine_spi.c
@@ -0,0 +1,330 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020-2021 Damien P. George
+ * Copyright (c) 2022 Robert Hammelrath
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+#include "py/runtime.h"
+#include "py/mphal.h"
+#include "extmod/machine_spi.h"
+#include "modmachine.h"
+#include "samd_soc.h"
+#include "pin_af.h"
+#include "clock_config.h"
+
+#define DEFAULT_SPI_BAUDRATE    (1000000)
+#define DEFAULT_SPI_POLARITY    (0)
+#define DEFAULT_SPI_PHASE       (0)
+#define DEFAULT_SPI_BITS        (8)
+#define DEFAULT_SPI_FIRSTBIT    (0)
+
+typedef struct _machine_spi_obj_t {
+    mp_obj_base_t base;
+    uint8_t id;
+    uint8_t polarity;
+    uint8_t phase;
+    uint8_t firstbit;
+    uint8_t sck;
+    uint8_t mosi;
+    uint8_t miso;
+    uint8_t new;
+    uint32_t baudrate;
+    sercom_pad_config_t sck_pad_config;
+    sercom_pad_config_t mosi_pad_config;
+    sercom_pad_config_t miso_pad_config;
+    uint8_t *dest;
+    size_t rxlen;
+} machine_spi_obj_t;
+
+extern Sercom *sercom_instance[];
+void *sercom_table[SERCOM_INST_NUM] = {};
+
+void common_spi_irq_handler(int spi_id) {
+    // handle Sercom IRQ RXC
+    machine_spi_obj_t *self = sercom_table[spi_id];
+    // Handle IRQ
+    if (self != NULL) {
+        Sercom *spi = sercom_instance[self->id];
+        if (spi->SPI.INTFLAG.bit.RXC != 0) {
+            if (self->rxlen > 0) {
+                *(self->dest)++ = spi->SPI.DATA.bit.DATA;
+                self->rxlen--;
+            } else {
+                // Just in the unlikely case there is data but no space in the buffer
+                // discard the data and clear the intflag
+                uint32_t temp;
+                (void)temp;
+                temp = spi->SPI.DATA.bit.DATA;
+            }
+        }
+    }
+}
+
+STATIC void machine_spi_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+    machine_spi_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    mp_printf(print, "SPI(%u), baudrate=%u, firstbit=%u, polarity=%u, phase=%u, bits=8",
+        self->id, self->baudrate, self->firstbit, self->polarity, self->phase);
+}
+
+STATIC void machine_spi_init(mp_obj_base_t *self_in, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    enum { ARG_baudrate, ARG_polarity, ARG_phase, ARG_firstbit,
+           ARG_sck, ARG_mosi, ARG_miso};
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_baudrate, MP_ARG_INT, {.u_int = -1} },
+        { MP_QSTR_polarity, MP_ARG_INT, {.u_int = -1} },
+        { MP_QSTR_phase, MP_ARG_INT, {.u_int = -1} },
+        { MP_QSTR_firstbit, MP_ARG_INT, {.u_int = -1} },
+        { MP_QSTR_sck, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
+        { MP_QSTR_mosi, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
+        { MP_QSTR_miso, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
+    };
+
+    machine_spi_obj_t *self = MP_OBJ_TO_PTR(self_in);
+
+    // Parse args
+    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
+    mp_arg_parse_all(n_args, pos_args, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
+
+    // Set baudrate if configured.
+    if (args[ARG_baudrate].u_int >= 0) {
+        self->baudrate = args[ARG_baudrate].u_int;
+    }
+
+    // Set polarity if configured.
+    if (args[ARG_polarity].u_int >= 0) {
+        self->polarity = args[ARG_polarity].u_int;
+    }
+
+    // Set phase if configured.
+    if (args[ARG_phase].u_int >= 0) {
+        self->phase = args[ARG_phase].u_int;
+    }
+
+    // Set firstbit if configured.
+    if (args[ARG_firstbit].u_int >= 0) {
+        self->firstbit = args[ARG_firstbit].u_int;
+    }
+
+    // Set SCK/MOSI/MISO pins if configured.
+    if (args[ARG_sck].u_obj != mp_const_none) {
+        self->sck = mp_hal_get_pin_obj(args[ARG_sck].u_obj);
+    }
+    if (args[ARG_mosi].u_obj != mp_const_none) {
+        self->mosi = mp_hal_get_pin_obj(args[ARG_mosi].u_obj);
+    }
+    if (args[ARG_miso].u_obj != mp_const_none) {
+        self->miso = mp_hal_get_pin_obj(args[ARG_miso].u_obj);
+    }
+
+    // Initialise the SPI peripheral if any arguments given, or it was not initialised previously.
+    if (n_args > 0 || kw_args->used > 0 || self->new) {
+        self->new = false;
+
+        // Get the pad and alt-fct numbers.
+        self->sck_pad_config = get_sercom_config(self->sck, self->id);
+        self->mosi_pad_config = get_sercom_config(self->mosi, self->id);
+
+        uint8_t dopo = 0;
+        #if defined(MCU_SAMD21)
+        if (self->mosi_pad_config.pad_nr == 0 && self->sck_pad_config.pad_nr == 1) {
+            dopo = 0;
+        } else if (self->mosi_pad_config.pad_nr == 2 && self->sck_pad_config.pad_nr == 3) {
+            dopo = 1;
+        } else if (self->mosi_pad_config.pad_nr == 3 && self->sck_pad_config.pad_nr == 1) {
+            dopo = 2;
+        } else if (self->mosi_pad_config.pad_nr == 0 && self->sck_pad_config.pad_nr == 3) {
+            dopo = 3;
+        } else {
+            mp_raise_ValueError(MP_ERROR_TEXT("invalid pin for sck or mosi"));
+        }
+        #elif defined(MCU_SAMD51)
+        if (self->mosi_pad_config.pad_nr == 0 && self->sck_pad_config.pad_nr == 1) {
+            dopo = 0;
+        } else if (self->mosi_pad_config.pad_nr == 3 && self->sck_pad_config.pad_nr == 1) {
+            dopo = 2;
+        } else {
+            mp_raise_ValueError(MP_ERROR_TEXT("invalid pin for sck or mosi"));
+        }
+        #endif
+
+        if (self->miso != 0xff) { // Miso may be undefined
+            self->miso_pad_config = get_sercom_config(self->miso, self->id);
+            mp_hal_set_pin_mux(self->miso, self->miso_pad_config.alt_fct);
+        }
+        // Configure the Pin mux.
+        mp_hal_set_pin_mux(self->sck, self->sck_pad_config.alt_fct);
+        mp_hal_set_pin_mux(self->mosi, self->mosi_pad_config.alt_fct);
+
+        // Set up the clocks
+        enable_sercom_clock(self->id);
+
+        // Configure the SPI
+        Sercom *spi = sercom_instance[self->id];
+        // Reset (clear) the peripheral registers.
+        while (spi->SPI.SYNCBUSY.bit.SWRST) {
+        }
+        spi->SPI.CTRLA.bit.SWRST = 1;
+        while (spi->SPI.SYNCBUSY.bit.SWRST) {
+        }
+
+        // Set the registers
+        spi->SPI.CTRLA.bit.MODE = 0x03; // SPI master mode
+        spi->SPI.CTRLA.bit.CPOL = self->polarity;
+        spi->SPI.CTRLA.bit.CPHA = self->phase;
+        spi->SPI.CTRLA.bit.DIPO = self->miso_pad_config.pad_nr;
+        spi->SPI.CTRLA.bit.DOPO = dopo;
+        spi->SPI.CTRLA.bit.DORD = self->firstbit;
+
+        // Enable receive only if miso is defined
+        if (self->miso != 0xff) {
+            spi->SPI.CTRLB.reg = SERCOM_SPI_CTRLB_RXEN;
+            while (spi->SPI.SYNCBUSY.bit.CTRLB) {
+            }
+        }
+
+        #if defined(MCU_SAMD51)
+        spi->SPI.CTRLC.reg = 1; // 1 clock cycle character spacing
+        #endif
+
+        // SPI is driven by the clock of GCLK Generator 2, freq in bus_freq
+        // baud = bus_freq / (2 * baudrate) - 1
+        uint32_t baud = get_apb_freq() / (2 * self->baudrate) - 1;
+        spi->SPI.BAUD.reg = baud; // Set Baud
+
+        // Enable RXC interrupt only if miso is defined
+        if (self->miso != 0xff) {
+            #if defined(MCU_SAMD21)
+            NVIC_EnableIRQ(SERCOM0_IRQn + self->id);
+            #elif defined(MCU_SAMD51)
+            NVIC_EnableIRQ(SERCOM0_0_IRQn + 4 * self->id + 2);
+            #endif
+            sercom_register_irq(self->id, SERCOM_IRQ_TYPE_SPI);
+        }
+
+        sercom_enable(spi, 1);
+    }
+}
+
+STATIC mp_obj_t machine_spi_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
+    mp_arg_check_num(n_args, n_kw, 1, MP_OBJ_FUN_ARGS_MAX, true);
+
+    // Get SPI bus.
+    int spi_id = mp_obj_get_int(args[0]);
+    if (spi_id < 0 || spi_id > SERCOM_INST_NUM) {
+        mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("SPI(%d) doesn't exist"), spi_id);
+    }
+
+    // Create the SPI object and fill it with defaults.
+    machine_spi_obj_t *self = mp_obj_malloc(machine_spi_obj_t, &machine_spi_type);
+    self->id = spi_id;
+    self->baudrate = DEFAULT_SPI_BAUDRATE;
+    self->polarity = DEFAULT_SPI_POLARITY;
+    self->phase = DEFAULT_SPI_PHASE;
+    self->firstbit = DEFAULT_SPI_FIRSTBIT;
+    self->mosi = 0xff; // 0xff: pin not defined (yet)
+    self->miso = 0xff;
+    self->sck = 0xff;
+
+    self->new = true;
+    sercom_table[spi_id] = self;
+
+    mp_map_t kw_args;
+    mp_map_init_fixed_table(&kw_args, n_kw, args + n_args);
+    machine_spi_init((mp_obj_base_t *)self, n_args - 1, args + 1, &kw_args);
+    return self;
+}
+
+void sercom_deinit_all(void) {
+    for (int i = 0; i < SERCOM_INST_NUM; i++) {
+        if (sercom_table[i] != NULL) {
+            machine_spi_obj_t *self = sercom_table[i];
+            Sercom *spi = sercom_instance[self->id];
+            // Disable interrupts (if any)
+            spi->SPI.INTENCLR.reg = 0xff;
+            // clear table entry of spi
+            sercom_table[i] = NULL;
+            sercom_enable(spi, 0);
+        }
+    }
+}
+
+STATIC void machine_spi_transfer(mp_obj_base_t *self_in, size_t len, const uint8_t *src, uint8_t *dest) {
+    machine_spi_obj_t *self = (machine_spi_obj_t *)self_in;
+
+    Sercom *spi = sercom_instance[self->id];
+    size_t txlen = len;
+    // Clear the input queue, if needed
+    while (dest && spi->SPI.INTFLAG.bit.RXC) {
+        uint32_t temp;
+        (void)temp;
+        temp = spi->SPI.DATA.bit.DATA;
+    }
+    // Set up the irq data pointers and enable IRQ
+    if (dest) {
+        if (self->miso == 0xff) {
+            mp_raise_ValueError(MP_ERROR_TEXT("read is not enabled"));
+        }
+        spi->SPI.INTENSET.bit.RXC = 1;
+        self->dest = dest;
+        self->rxlen = len;
+    }
+
+    // Send by polling & receive by IRQ
+    while (txlen) {
+        if (spi->SPI.INTFLAG.bit.DRE) {
+            spi->SPI.DATA.bit.DATA = *src;
+            src += 1;
+            txlen--;
+        }
+    }
+    // Receive the remaining data, if any and clear IRQ
+    // Do no wait forever.
+    if (dest) {
+        int32_t timeout = 1000;
+        while (self->rxlen > 0 && timeout) {
+            timeout--;
+            MICROPY_EVENT_POLL_HOOK
+        }
+        spi->SPI.INTENCLR.bit.RXC = 1;
+    } else {
+        // Wait for the data being shifted out.
+        while (!spi->SPI.INTFLAG.bit.TXC) {
+        }
+    }
+}
+
+
+STATIC const mp_machine_spi_p_t machine_spi_p = {
+    .init = machine_spi_init,
+    .transfer = machine_spi_transfer,
+};
+
+MP_DEFINE_CONST_OBJ_TYPE(
+    machine_spi_type,
+    MP_QSTR_SPI,
+    MP_TYPE_FLAG_NONE,
+    make_new, machine_spi_make_new,
+    print, machine_spi_print,
+    protocol, &machine_spi_p,
+    locals_dict, &mp_machine_spi_locals_dict
+    );
diff --git a/ports/samd/main.c b/ports/samd/main.c
index 60b8e57faa445..1f056083a1f99 100644
--- a/ports/samd/main.c
+++ b/ports/samd/main.c
@@ -36,6 +36,7 @@ extern uint8_t _sstack, _estack, _sheap, _eheap;
 extern void adc_deinit_all(void);
 extern void pin_irq_deinit_all(void);
 extern void pwm_deinit_all(void);
+extern void sercom_deinit_all(void);
 extern void uart_deinit_all(void);
 
 void samd_main(void) {
@@ -69,6 +70,7 @@ void samd_main(void) {
         adc_deinit_all();
         pin_irq_deinit_all();
         pwm_deinit_all();
+        sercom_deinit_all();
         uart_deinit_all();
         gc_sweep_all();
         mp_deinit();
diff --git a/ports/samd/modmachine.c b/ports/samd/modmachine.c
index 8c3033f891bda..712b520f54fb3 100644
--- a/ports/samd/modmachine.c
+++ b/ports/samd/modmachine.c
@@ -155,6 +155,7 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_PWM),                 MP_ROM_PTR(&machine_pwm_type) },
     { MP_ROM_QSTR(MP_QSTR_SoftI2C),             MP_ROM_PTR(&mp_machine_soft_i2c_type) },
     { MP_ROM_QSTR(MP_QSTR_SoftSPI),             MP_ROM_PTR(&mp_machine_soft_spi_type) },
+    { MP_ROM_QSTR(MP_QSTR_SPI),                 MP_ROM_PTR(&machine_spi_type) },
     { MP_ROM_QSTR(MP_QSTR_UART),                MP_ROM_PTR(&machine_uart_type) },
 
     { MP_ROM_QSTR(MP_QSTR_idle),                MP_ROM_PTR(&machine_idle_obj) },
diff --git a/ports/samd/modmachine.h b/ports/samd/modmachine.h
index 30de339b4a2d6..143e3488f098f 100644
--- a/ports/samd/modmachine.h
+++ b/ports/samd/modmachine.h
@@ -32,6 +32,7 @@ extern const mp_obj_type_t machine_adc_type;
 extern const mp_obj_type_t machine_led_type;
 extern const mp_obj_type_t machine_pin_type;
 extern const mp_obj_type_t machine_pwm_type;
+extern const mp_obj_type_t machine_spi_type;
 extern const mp_obj_type_t machine_uart_type;
 
 #endif // MICROPY_INCLUDED_SAMD_MODMACHINE_H
diff --git a/ports/samd/mpconfigport.h b/ports/samd/mpconfigport.h
index b8cb0f3eb74f2..22fed00b24821 100644
--- a/ports/samd/mpconfigport.h
+++ b/ports/samd/mpconfigport.h
@@ -99,6 +99,7 @@
 #define MICROPY_PY_UZLIB                    (1)
 #define MICROPY_PY_UASYNCIO                 (1)
 #define MICROPY_PY_MACHINE_SOFTI2C          (1)
+#define MICROPY_PY_MACHINE_SPI              (1)
 #define MICROPY_PY_MACHINE_SOFTSPI          (1)
 #define MICROPY_PY_MACHINE_PWM              (1)
 #define MICROPY_PY_MACHINE_PWM_INIT         (0)
diff --git a/ports/samd/samd_isr.c b/ports/samd/samd_isr.c
index 0e0d84db6906a..2a5a3e042ccff 100644
--- a/ports/samd/samd_isr.c
+++ b/ports/samd/samd_isr.c
@@ -112,7 +112,7 @@ static uint8_t sercom_irq_type[SERCOM_INST_NUM] = {};
 // Temporarily commented until the module is added
 void (*sercom_irq_handler_table[])(int num) = {
     common_uart_irq_handler,
-    NULL, // common_spi_irq_handler,
+    common_spi_irq_handler,
     NULL  // common_i2c_irq_handler
 };
 

From 94d27ae28fd4b815b3ace7dd91643aa0d1b620cd Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sun, 5 Jun 2022 18:11:06 +0200
Subject: [PATCH 2693/3533] samd/machine_i2c: Add the machine.I2C class.

Using the common API.  Tested with SAMD21 and SAMD51 boards.
---
 ports/samd/Makefile       |   2 +
 ports/samd/machine_i2c.c  | 270 ++++++++++++++++++++++++++++++++++++++
 ports/samd/modmachine.c   |   1 +
 ports/samd/modmachine.h   |   1 +
 ports/samd/mpconfigport.h |   1 +
 ports/samd/samd_isr.c     |   4 +-
 6 files changed, 277 insertions(+), 2 deletions(-)
 create mode 100644 ports/samd/machine_i2c.c

diff --git a/ports/samd/Makefile b/ports/samd/Makefile
index ca0309fa69935..c5d36adda4b71 100644
--- a/ports/samd/Makefile
+++ b/ports/samd/Makefile
@@ -91,6 +91,7 @@ SRC_C = \
 	clock_config.c \
 	help.c \
 	machine_adc.c \
+	machine_i2c.c \
 	machine_led.c \
 	machine_pin.c \
 	machine_spi.c \
@@ -143,6 +144,7 @@ endif
 # List of sources for qstr extraction
 SRC_QSTR += \
 	machine_adc.c \
+	machine_i2c.c \
 	machine_led.c \
 	machine_pin.c \
 	machine_pwm.c \
diff --git a/ports/samd/machine_i2c.c b/ports/samd/machine_i2c.c
new file mode 100644
index 0000000000000..4d1b03f7d578a
--- /dev/null
+++ b/ports/samd/machine_i2c.c
@@ -0,0 +1,270 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020-2021 Damien P. George
+ * Copyright (c) 2022 Robert Hammelrath
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "py/runtime.h"
+#include "py/mphal.h"
+#include "py/mperrno.h"
+#include "extmod/machine_i2c.h"
+#include "modmachine.h"
+#include "samd_soc.h"
+#include "pin_af.h"
+#include "clock_config.h"
+
+#define DEFAULT_I2C_FREQ  (400000)
+#define RISETIME_NS       (300)
+#define I2C_TIMEOUT       (100)
+
+#define IS_BUS_BUSY       (i2c->I2CM.STATUS.bit.BUSSTATE == 3)
+#define NACK_RECVD        (i2c->I2CM.STATUS.bit.RXNACK == 1)
+#define IRQ_DATA_SENT     (i2c->I2CM.INTFLAG.bit.MB == 1)
+#define IRQ_DATA_RECVD    (i2c->I2CM.INTFLAG.bit.SB == 1)
+#define READ_MODE         ((flags & MP_MACHINE_I2C_FLAG_READ) != 0)
+
+#define PREPARE_ACK       i2c->I2CM.CTRLB.bit.ACKACT = 0
+#define PREPARE_NACK      i2c->I2CM.CTRLB.bit.ACKACT = 1
+#define SET_STOP_STATE    i2c_send_command(i2c, 0x03)
+
+enum state_t {
+    state_done = 0,
+    state_busy,
+    state_buserr,
+    state_nack
+};
+
+typedef struct _machine_i2c_obj_t {
+    mp_obj_base_t base;
+    Sercom *instance;
+    uint8_t id;
+    uint8_t scl;
+    uint8_t sda;
+    uint8_t state;
+    uint32_t freq;
+    uint32_t timeout;
+    size_t len;
+    uint8_t *buf;
+} machine_i2c_obj_t;
+
+extern Sercom *sercom_instance[];
+extern void *sercom_table[SERCOM_INST_NUM];
+
+STATIC void i2c_send_command(Sercom *i2c, uint8_t command) {
+    i2c->I2CM.CTRLB.bit.CMD = command;
+    while (i2c->I2CM.SYNCBUSY.bit.SYSOP) {
+    }
+}
+
+void common_i2c_irq_handler(int i2c_id) {
+    // handle Sercom I2C IRQ
+    machine_i2c_obj_t *self = sercom_table[i2c_id];
+    // Handle IRQ
+    if (self != NULL) {
+        Sercom *i2c = self->instance;
+        // For now, clear all interrupts
+        if (IRQ_DATA_RECVD) {
+            if (self->len > 0) {
+                *(self->buf)++ = i2c->I2CM.DATA.reg;
+                self->len--;
+                self->timeout = I2C_TIMEOUT;
+            }
+            if (self->len > 0) { // no ACK at the last byte
+                PREPARE_ACK; // Send ACK
+                i2c_send_command(i2c, 0x02);
+            } else {
+                PREPARE_NACK; // Send NACK after the last byte
+                self->state = state_done;
+                i2c->I2CM.INTFLAG.reg |= SERCOM_I2CM_INTFLAG_SB;
+            }
+        } else if (IRQ_DATA_SENT) {
+            if (NACK_RECVD) { // e.g. NACK after adress for both read and write.
+                self->state = state_nack; // force stop of transmission
+                i2c->I2CM.INTFLAG.reg |= SERCOM_I2CM_INTFLAG_MB;
+            } else if (self->len > 0) { // data to be sent
+                i2c->I2CM.DATA.bit.DATA = *(self->buf)++;
+                self->len--;
+                self->timeout = I2C_TIMEOUT;
+            } else { // No data left, if there was any.
+                self->state = state_done;
+                i2c->I2CM.INTFLAG.reg |= SERCOM_I2CM_INTFLAG_MB;
+            }
+        } else { // On any error, e.g. ARBLOST or BUSERROR, stop the transmission
+            self->len = 0;
+            self->state = state_buserr;
+            i2c->I2CM.INTFLAG.reg |= SERCOM_I2CM_INTFLAG_ERROR;
+        }
+    }
+}
+
+STATIC void machine_i2c_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+    machine_i2c_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    mp_printf(print, "I2C(%u, freq=%u, scl=%u, sda=%u)",
+        self->id, self->freq, self->scl, self->sda);
+}
+
+mp_obj_t machine_i2c_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
+    enum { ARG_id, ARG_freq, ARG_scl, ARG_sda };
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_id, MP_ARG_REQUIRED | MP_ARG_OBJ },
+        { MP_QSTR_freq, MP_ARG_INT, {.u_int = DEFAULT_I2C_FREQ} },
+        { MP_QSTR_scl, MP_ARG_REQUIRED | MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
+        { MP_QSTR_sda, MP_ARG_REQUIRED | MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
+    };
+
+    // Parse args.
+    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
+    mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
+
+    // Get I2C bus.
+    int id = mp_obj_get_int(args[ARG_id].u_obj);
+    if (id < 0 || id >= SERCOM_INST_NUM) {
+        mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("I2C(%d) doesn't exist"), id);
+    }
+
+    // Get the peripheral object.
+    machine_i2c_obj_t *self = mp_obj_malloc(machine_i2c_obj_t, &machine_hw_i2c_type);
+    self->id = id;
+    self->instance = sercom_instance[self->id];
+
+    // Set SCL/SDA pins.
+    sercom_pad_config_t scl_pad_config;
+    self->scl = mp_hal_get_pin_obj(args[ARG_scl].u_obj);
+    scl_pad_config = get_sercom_config(self->scl, self->id);
+
+    sercom_pad_config_t sda_pad_config;
+    self->sda = mp_hal_get_pin_obj(args[ARG_sda].u_obj);
+    sda_pad_config = get_sercom_config(self->sda, self->id);
+    if (sda_pad_config.pad_nr != 0 || scl_pad_config.pad_nr != 1) {
+        mp_raise_ValueError(MP_ERROR_TEXT("invalid pin for sda or scl"));
+    }
+    sercom_table[self->id] = self;
+    self->freq = args[ARG_freq].u_int;
+
+    // Configure the Pin mux.
+    mp_hal_set_pin_mux(self->scl, scl_pad_config.alt_fct);
+    mp_hal_set_pin_mux(self->sda, sda_pad_config.alt_fct);
+
+    // Set up the clocks
+    enable_sercom_clock(self->id);
+
+    // Initialise the I2C peripheral
+    Sercom *i2c = self->instance;
+
+    // Reset the device
+    i2c->I2CM.CTRLA.reg = SERCOM_I2CM_CTRLA_SWRST;
+    while (i2c->I2CM.SYNCBUSY.bit.SWRST == 1) {
+    }
+    // Set to master mode, inactivity timeout of 20 SCL cycles and speed.
+    i2c->I2CM.CTRLA.reg = SERCOM_I2CM_CTRLA_MODE(0x05)
+        | SERCOM_I2CM_CTRLA_INACTOUT(3)
+        | SERCOM_I2CM_CTRLA_SPEED(self->freq > 400000 ? 1 : 0);
+
+    // I2C is driven by the clock of GCLK Generator 2, with it's freq in variable bus_freq
+    // baud = peripheral_freq / (2 * baudrate) - 5 - (rise_time * peripheral_freq) / 2
+    // Just set the minimal configuration for standard and fast mode.
+    // Set Baud. Assume ~300ns rise time. Maybe set later by a keyword argument.
+    i2c->I2CM.BAUD.reg = get_apb_freq() / (2 * self->freq) - 5 - (get_apb_freq() / 1000000) * RISETIME_NS / 2000;
+
+    // Enable interrupts
+    sercom_register_irq(self->id, SERCOM_IRQ_TYPE_SPI);
+    #if defined(MCU_SAMD21)
+    NVIC_EnableIRQ(SERCOM0_IRQn + self->id);
+    #elif defined(MCU_SAMD51)
+    NVIC_EnableIRQ(SERCOM0_0_IRQn + 4 * self->id); // MB interrupt
+    NVIC_EnableIRQ(SERCOM0_0_IRQn + 4 * self->id + 1); // SB interrupt
+    NVIC_EnableIRQ(SERCOM0_0_IRQn + 4 * self->id + 3); // ERRROR interrupt
+    #endif
+
+    // Now enable I2C.
+    sercom_enable(i2c, 1);
+
+    // Force the bus state to idle
+    i2c->I2CM.STATUS.bit.BUSSTATE = 1;
+
+    return MP_OBJ_FROM_PTR(self);
+}
+
+STATIC int machine_i2c_transfer_single(mp_obj_base_t *self_in, uint16_t addr, size_t len, uint8_t *buf, unsigned int flags) {
+    machine_i2c_obj_t *self = (machine_i2c_obj_t *)self_in;
+    Sercom *i2c = self->instance;
+
+    self->timeout = I2C_TIMEOUT;
+    self->len = len;
+    self->buf = buf;
+    // Wait a while if the bus is busy
+    while (IS_BUS_BUSY && self->timeout) {
+        MICROPY_EVENT_POLL_HOOK
+        if (--self->timeout == 0) {
+            return -MP_ETIMEDOUT;
+        }
+    }
+    // Enable interrupts and set the state
+    i2c->I2CM.INTENSET.reg = SERCOM_I2CM_INTENSET_MB | SERCOM_I2CM_INTENSET_SB | SERCOM_I2CM_INTENSET_ERROR;
+    self->state = state_busy;
+
+    // Send the adress, which kicks off the transfer
+    i2c->I2CM.ADDR.bit.ADDR = (addr << 1) | READ_MODE;
+
+    // Transfer the data
+    self->timeout = I2C_TIMEOUT;
+    while (self->state == state_busy && self->timeout) {
+        self->timeout--;
+        MICROPY_EVENT_POLL_HOOK
+    }
+    i2c->I2CM.INTENCLR.reg = SERCOM_I2CM_INTENSET_MB | SERCOM_I2CM_INTENSET_SB | SERCOM_I2CM_INTENSET_ERROR;
+
+    // Check the error states after the transfer is stopped
+    if (self->state == state_nack) {
+        SET_STOP_STATE;
+        return self->len == len ? -MP_ENODEV : -MP_EIO;
+    } else if (self->state == state_buserr) {
+        SET_STOP_STATE;
+        return -MP_EIO;
+    } else if (self->timeout == 0) {
+        SET_STOP_STATE;
+        return -MP_ETIMEDOUT;
+    }
+
+    if (flags & MP_MACHINE_I2C_FLAG_STOP) {
+        SET_STOP_STATE;
+    }
+
+    return len;
+}
+
+STATIC const mp_machine_i2c_p_t machine_i2c_p = {
+    .transfer = mp_machine_i2c_transfer_adaptor,
+    .transfer_single = machine_i2c_transfer_single,
+};
+
+MP_DEFINE_CONST_OBJ_TYPE(
+    machine_hw_i2c_type,
+    MP_QSTR_I2C,
+    MP_TYPE_FLAG_NONE,
+    make_new, machine_i2c_make_new,
+    print, machine_i2c_print,
+    protocol, &machine_i2c_p,
+    locals_dict, &mp_machine_i2c_locals_dict
+    );
diff --git a/ports/samd/modmachine.c b/ports/samd/modmachine.c
index 712b520f54fb3..acd672fafef36 100644
--- a/ports/samd/modmachine.c
+++ b/ports/samd/modmachine.c
@@ -154,6 +154,7 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_Pin),                 MP_ROM_PTR(&machine_pin_type) },
     { MP_ROM_QSTR(MP_QSTR_PWM),                 MP_ROM_PTR(&machine_pwm_type) },
     { MP_ROM_QSTR(MP_QSTR_SoftI2C),             MP_ROM_PTR(&mp_machine_soft_i2c_type) },
+    { MP_ROM_QSTR(MP_QSTR_I2C),                 MP_ROM_PTR(&machine_hw_i2c_type) },
     { MP_ROM_QSTR(MP_QSTR_SoftSPI),             MP_ROM_PTR(&mp_machine_soft_spi_type) },
     { MP_ROM_QSTR(MP_QSTR_SPI),                 MP_ROM_PTR(&machine_spi_type) },
     { MP_ROM_QSTR(MP_QSTR_UART),                MP_ROM_PTR(&machine_uart_type) },
diff --git a/ports/samd/modmachine.h b/ports/samd/modmachine.h
index 143e3488f098f..4319867190ccc 100644
--- a/ports/samd/modmachine.h
+++ b/ports/samd/modmachine.h
@@ -29,6 +29,7 @@
 #include "py/obj.h"
 
 extern const mp_obj_type_t machine_adc_type;
+extern const mp_obj_type_t machine_hw_i2c_type;
 extern const mp_obj_type_t machine_led_type;
 extern const mp_obj_type_t machine_pin_type;
 extern const mp_obj_type_t machine_pwm_type;
diff --git a/ports/samd/mpconfigport.h b/ports/samd/mpconfigport.h
index 22fed00b24821..425ecc59777c8 100644
--- a/ports/samd/mpconfigport.h
+++ b/ports/samd/mpconfigport.h
@@ -98,6 +98,7 @@
 #define MICROPY_PY_URANDOM                  (1)
 #define MICROPY_PY_UZLIB                    (1)
 #define MICROPY_PY_UASYNCIO                 (1)
+#define MICROPY_PY_MACHINE_I2C              (1)
 #define MICROPY_PY_MACHINE_SOFTI2C          (1)
 #define MICROPY_PY_MACHINE_SPI              (1)
 #define MICROPY_PY_MACHINE_SOFTSPI          (1)
diff --git a/ports/samd/samd_isr.c b/ports/samd/samd_isr.c
index 2a5a3e042ccff..5cb0668c25161 100644
--- a/ports/samd/samd_isr.c
+++ b/ports/samd/samd_isr.c
@@ -109,11 +109,11 @@ void PendSV_Handler(void) {
 
 
 static uint8_t sercom_irq_type[SERCOM_INST_NUM] = {};
-// Temporarily commented until the module is added
+
 void (*sercom_irq_handler_table[])(int num) = {
     common_uart_irq_handler,
     common_spi_irq_handler,
-    NULL  // common_i2c_irq_handler
+    common_i2c_irq_handler
 };
 
 void sercom_register_irq(int sercom_id, int mode) {

From 15212ae8d423dced7698219def0f2d13287a64b8 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sun, 5 Jun 2022 20:34:37 +0200
Subject: [PATCH 2694/3533] samd/moduos: Add uos.dupterm().

---
 ports/samd/Makefile       |  2 ++
 ports/samd/moduos.c       | 57 +++++++++++++++++++++++++++++++++++++++
 ports/samd/mpconfigport.h |  2 ++
 ports/samd/mphalport.c    | 12 +++++++++
 4 files changed, 73 insertions(+)
 create mode 100644 ports/samd/moduos.c

diff --git a/ports/samd/Makefile b/ports/samd/Makefile
index c5d36adda4b71..f31e5ba6ece46 100644
--- a/ports/samd/Makefile
+++ b/ports/samd/Makefile
@@ -121,6 +121,7 @@ SRC_C = \
 	lib/tinyusb/src/portable/microchip/samd/dcd_samd.c \
 	lib/tinyusb/src/tusb.c \
 	drivers/bus/softspi.c \
+	extmod/uos_dupterm.c \
 	shared/runtime/mpirq.c \
 	shared/libc/printf.c \
 	shared/libc/string0.c \
@@ -155,6 +156,7 @@ SRC_QSTR += \
 	modsamd.c \
 	samd_flash.c \
 	shared/readline/readline.c \
+	extmod/uos_dupterm.c \
 	shared/runtime/mpirq.c \
 
 SRC_QSTR += $(SRC_MOD) $(SRC_CXX)
diff --git a/ports/samd/moduos.c b/ports/samd/moduos.c
new file mode 100644
index 0000000000000..b1118f0195b89
--- /dev/null
+++ b/ports/samd/moduos.c
@@ -0,0 +1,57 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2016 Damien P. George
+ *
+ * use of the TRNG by
+ * Copyright (c) 2017 Scott Shawcroft for Adafruit Industries
+ * Copyright (c) 2019 Artur Pacholec
+ * Copyright (c) 2022 Robert Hammelrath
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "py/runtime.h"
+#include "py/mphal.h"
+#include "modmachine.h"
+#include "sam.h"
+
+#if MICROPY_PY_UOS_DUPTERM_BUILTIN_STREAM
+bool mp_uos_dupterm_is_builtin_stream(mp_const_obj_t stream) {
+    const mp_obj_type_t *type = mp_obj_get_type(stream);
+    return type == &machine_uart_type;
+}
+#endif
+
+#if MICROPY_PY_UOS_DUPTERM_NOTIFY
+STATIC mp_obj_t mp_uos_dupterm_notify(mp_obj_t obj_in) {
+    (void)obj_in;
+    for (;;) {
+        int c = mp_uos_dupterm_rx_chr();
+        if (c < 0) {
+            break;
+        }
+        ringbuf_put(&stdin_ringbuf, c);
+    }
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_uos_dupterm_notify_obj, mp_uos_dupterm_notify);
+#endif
diff --git a/ports/samd/mpconfigport.h b/ports/samd/mpconfigport.h
index 425ecc59777c8..8238c3d2b55e3 100644
--- a/ports/samd/mpconfigport.h
+++ b/ports/samd/mpconfigport.h
@@ -88,6 +88,7 @@
 #define MICROPY_PY_UTIME_MP_HAL             (1)
 #define MICROPY_PY_MACHINE                  (1)
 #define MICROPY_PY_UOS                      (1)
+#define MICROPY_PY_UOS_INCLUDEFILE          "ports/samd/moduos.c"
 #define MICROPY_READER_VFS                  (1)
 #define MICROPY_VFS                         (1)
 #define MICROPY_PY_UJSON                    (1)
@@ -102,6 +103,7 @@
 #define MICROPY_PY_MACHINE_SOFTI2C          (1)
 #define MICROPY_PY_MACHINE_SPI              (1)
 #define MICROPY_PY_MACHINE_SOFTSPI          (1)
+#define MICROPY_PY_OS_DUPTERM               (3)
 #define MICROPY_PY_MACHINE_PWM              (1)
 #define MICROPY_PY_MACHINE_PWM_INIT         (0)
 #define MICROPY_PY_MACHINE_PWM_DUTY_U16_NS  (1)
diff --git a/ports/samd/mphalport.c b/ports/samd/mphalport.c
index 7a3786be8c316..fc451023903ce 100644
--- a/ports/samd/mphalport.c
+++ b/ports/samd/mphalport.c
@@ -97,6 +97,9 @@ uintptr_t mp_hal_stdio_poll(uintptr_t poll_flags) {
     if (tud_cdc_connected() && tud_cdc_available()) {
         ret |= MP_STREAM_POLL_RD;
     }
+    #if MICROPY_PY_OS_DUPTERM
+    ret |= mp_uos_dupterm_poll(poll_flags);
+    #endif
     return ret;
 }
 
@@ -109,6 +112,12 @@ int mp_hal_stdin_rx_chr(void) {
                 return buf[0];
             }
         }
+        #if MICROPY_PY_OS_DUPTERM
+        int dupterm_c = mp_uos_dupterm_rx_chr();
+        if (dupterm_c >= 0) {
+            return dupterm_c;
+        }
+        #endif
         MICROPY_EVENT_POLL_HOOK
     }
 }
@@ -128,4 +137,7 @@ void mp_hal_stdout_tx_strn(const char *str, mp_uint_t len) {
             i += n2;
         }
     }
+    #if MICROPY_PY_OS_DUPTERM
+    mp_uos_dupterm_tx_strn(str, len);
+    #endif
 }

From 45bf25a0022033474b9fe699267297f882ca9772 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sun, 5 Jun 2022 21:08:37 +0200
Subject: [PATCH 2695/3533] samd/moduos: Add uos.urandom() for SAMD51.

Based on the hardware RNG.
---
 ports/samd/boards/mpconfig_samd51.h |  3 +++
 ports/samd/moduos.c                 | 40 +++++++++++++++++++++++++++++
 2 files changed, 43 insertions(+)

diff --git a/ports/samd/boards/mpconfig_samd51.h b/ports/samd/boards/mpconfig_samd51.h
index 1b67b1d02d5c0..d963fe1dd295b 100644
--- a/ports/samd/boards/mpconfig_samd51.h
+++ b/ports/samd/boards/mpconfig_samd51.h
@@ -5,6 +5,9 @@
 #define MICROPY_PY_BUILTINS_COMPLEX     (0)
 #define MICROPY_PY_MATH                 (0)
 #define MICROPY_PY_CMATH                (0)
+#define MICROPY_PY_UOS_URANDOM          (1)
+#define MICROPY_PY_URANDOM_SEED_INIT_FUNC (trng_random_u32())
+unsigned long trng_random_u32(void);
 
 // Due to a limitation in the TC counter for us, the ticks period is 2**29
 #define MICROPY_PY_UTIME_TICKS_PERIOD   (0x20000000)
diff --git a/ports/samd/moduos.c b/ports/samd/moduos.c
index b1118f0195b89..e0237fd88f0c8 100644
--- a/ports/samd/moduos.c
+++ b/ports/samd/moduos.c
@@ -34,6 +34,46 @@
 #include "modmachine.h"
 #include "sam.h"
 
+#if defined(MCU_SAMD51)
+static bool initialized = false;
+
+STATIC void trng_start(void) {
+    if (!initialized) {
+        MCLK->APBCMASK.bit.TRNG_ = 1;
+        REG_TRNG_CTRLA = TRNG_CTRLA_ENABLE;
+        initialized = true;
+    }
+}
+
+uint32_t trng_random_u32(void) {
+    trng_start();
+    while ((REG_TRNG_INTFLAG & TRNG_INTFLAG_DATARDY) == 0) {
+    }
+    return REG_TRNG_DATA;
+}
+
+#if MICROPY_PY_UOS_URANDOM
+STATIC mp_obj_t mp_uos_urandom(mp_obj_t num) {
+    mp_int_t n = mp_obj_get_int(num);
+    vstr_t vstr;
+    vstr_init_len(&vstr, n);
+    uint32_t rngval = 0;
+
+    trng_start();
+    for (int i = 0; i < n; i++) {
+        if ((i % 4) == 0) {
+            rngval = trng_random_u32();
+        }
+        vstr.buf[i] = rngval & 0xff;
+        rngval >>= 8;
+    }
+    return mp_obj_new_bytes_from_vstr(&vstr);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_uos_urandom_obj, mp_uos_urandom);
+
+#endif // MICROPY_PY_UOS_URANDOM
+#endif // defined(MCU_SAMD51)
+
 #if MICROPY_PY_UOS_DUPTERM_BUILTIN_STREAM
 bool mp_uos_dupterm_is_builtin_stream(mp_const_obj_t stream) {
     const mp_obj_type_t *type = mp_obj_get_type(stream);

From 4ef2da176f2ca1e7f3cb02488aba61a018033575 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sun, 5 Jun 2022 21:55:30 +0200
Subject: [PATCH 2696/3533] samd/main: Use the common execution mode of boot.py
 and main.py.

Behaviour is:
- Do not execute main.py if boot.py failed.
- On a forced exit, do a soft reset.
---
 ports/samd/main.c | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/ports/samd/main.c b/ports/samd/main.c
index 1f056083a1f99..5aab39e5099de 100644
--- a/ports/samd/main.c
+++ b/ports/samd/main.c
@@ -51,8 +51,17 @@ void samd_main(void) {
         pyexec_frozen_module("_boot.py");
 
         // Execute user scripts.
-        pyexec_file_if_exists("boot.py");
-        pyexec_file_if_exists("main.py");
+        int ret = pyexec_file_if_exists("boot.py");
+        if (ret & PYEXEC_FORCED_EXIT) {
+            goto soft_reset_exit;
+        }
+        // Do not execute main.py if boot.py failed
+        if (pyexec_mode_kind == PYEXEC_MODE_FRIENDLY_REPL && ret != 0) {
+            ret = pyexec_file_if_exists("main.py");
+            if (ret & PYEXEC_FORCED_EXIT) {
+                goto soft_reset_exit;
+            }
+        }
 
         for (;;) {
             if (pyexec_mode_kind == PYEXEC_MODE_RAW_REPL) {
@@ -66,6 +75,7 @@ void samd_main(void) {
             }
         }
 
+    soft_reset_exit:
         mp_printf(MP_PYTHON_PRINTER, "MPY: soft reboot\n");
         adc_deinit_all();
         pin_irq_deinit_all();

From 009c51c13fc13233a28386d5e78ac79cd773cc79 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sun, 5 Jun 2022 22:03:16 +0200
Subject: [PATCH 2697/3533] samd/mpconfigport: Enable a few more MicroPython
 features.

Additional features are:
- Support executing .mpy files.
- Allow const().
- Enable auto-indent in REPL.
- Enable enumerate, min/max, attrtuple, input.
---
 ports/samd/mpconfigport.h | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/ports/samd/mpconfigport.h b/ports/samd/mpconfigport.h
index 8238c3d2b55e3..c2c614e10b462 100644
--- a/ports/samd/mpconfigport.h
+++ b/ports/samd/mpconfigport.h
@@ -38,14 +38,20 @@
 #define MICROPY_ALLOC_PATH_MAX              (256)
 #define MICROPY_QSTR_BYTES_IN_HASH          (1)
 
+// MicroPython emitters
+#define MICROPY_PERSISTENT_CODE_LOAD        (1)
+#define MICROPY_EMIT_THUMB                  (0)
+#define MICROPY_EMIT_INLINE_THUMB           (0)
+
 // Compiler configuration
-#define MICROPY_COMP_CONST                  (0)
+#define MICROPY_COMP_CONST                  (1)
 
 // Python internal features
 #define MICROPY_ENABLE_GC                   (1)
 #define MICROPY_ENABLE_FINALISER            (1)
 #define MICROPY_KBD_EXCEPTION               (1)
 #define MICROPY_HELPER_REPL                 (1)
+#define MICROPY_REPL_AUTO_INDENT            (1)
 #define MICROPY_LONGINT_IMPL                (MICROPY_LONGINT_IMPL_MPZ)
 #define MICROPY_ENABLE_SOURCE_LINE          (1)
 #define MICROPY_STREAMS_NON_BLOCK           (1)
@@ -66,15 +72,16 @@
 #define MICROPY_PY_BUILTINS_SET             (0)
 #define MICROPY_PY_BUILTINS_FROZENSET       (0)
 #define MICROPY_PY_BUILTINS_PROPERTY        (0)
-#define MICROPY_PY_BUILTINS_ENUMERATE       (0)
+#define MICROPY_PY_BUILTINS_ENUMERATE       (1)
 #define MICROPY_PY_BUILTINS_FILTER          (0)
 #define MICROPY_PY_BUILTINS_REVERSED        (0)
 #define MICROPY_PY_BUILTINS_NOTIMPLEMENTED  (1)
-#define MICROPY_PY_BUILTINS_MIN_MAX         (0)
+#define MICROPY_PY_BUILTINS_MIN_MAX         (1)
+#define MICROPY_PY_BUILTINS_INPUT           (1)
 #define MICROPY_PY___FILE__                 (0)
 #define MICROPY_PY_MICROPYTHON_MEM_INFO     (1)
 #define MICROPY_PY_ARRAY_SLICE_ASSIGN       (1)
-#define MICROPY_PY_ATTRTUPLE                (0)
+#define MICROPY_PY_ATTRTUPLE                (1)
 #define MICROPY_PY_COLLECTIONS              (0)
 #define MICROPY_PY_SYS                      (1)
 #define MICROPY_PY_SYS_PLATFORM             "samd"

From 3625388d8ce028df4bb23077e1a569c987fa91fb Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Mon, 6 Jun 2022 10:20:44 +0200
Subject: [PATCH 2698/3533] samd/samd_isr: Change the way a Sercom ISR is
 registered and called.

Code size diff: +12 Bytes
BSS diff: -12 Bytes
RAM usage: +16 Bytes
Speed increase: a few clock cycles per call
Style improvement: ++
---
 ports/samd/machine_i2c.c  |  2 +-
 ports/samd/machine_spi.c  |  2 +-
 ports/samd/machine_uart.c |  2 +-
 ports/samd/samd_isr.c     | 18 +++++++-----------
 ports/samd/samd_soc.h     |  5 +----
 5 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/ports/samd/machine_i2c.c b/ports/samd/machine_i2c.c
index 4d1b03f7d578a..90ea5e10ca43b 100644
--- a/ports/samd/machine_i2c.c
+++ b/ports/samd/machine_i2c.c
@@ -188,7 +188,7 @@ mp_obj_t machine_i2c_make_new(const mp_obj_type_t *type, size_t n_args, size_t n
     i2c->I2CM.BAUD.reg = get_apb_freq() / (2 * self->freq) - 5 - (get_apb_freq() / 1000000) * RISETIME_NS / 2000;
 
     // Enable interrupts
-    sercom_register_irq(self->id, SERCOM_IRQ_TYPE_SPI);
+    sercom_register_irq(self->id, &common_i2c_irq_handler);
     #if defined(MCU_SAMD21)
     NVIC_EnableIRQ(SERCOM0_IRQn + self->id);
     #elif defined(MCU_SAMD51)
diff --git a/ports/samd/machine_spi.c b/ports/samd/machine_spi.c
index b3504aeba32ba..ddb8756e9a34e 100644
--- a/ports/samd/machine_spi.c
+++ b/ports/samd/machine_spi.c
@@ -218,7 +218,7 @@ STATIC void machine_spi_init(mp_obj_base_t *self_in, size_t n_args, const mp_obj
             #elif defined(MCU_SAMD51)
             NVIC_EnableIRQ(SERCOM0_0_IRQn + 4 * self->id + 2);
             #endif
-            sercom_register_irq(self->id, SERCOM_IRQ_TYPE_SPI);
+            sercom_register_irq(self->id, &common_spi_irq_handler);
         }
 
         sercom_enable(spi, 1);
diff --git a/ports/samd/machine_uart.c b/ports/samd/machine_uart.c
index 9c5cfce839945..0ed7fb95d0c3f 100644
--- a/ports/samd/machine_uart.c
+++ b/ports/samd/machine_uart.c
@@ -281,7 +281,7 @@ STATIC mp_obj_t machine_uart_init_helper(machine_uart_obj_t *self, size_t n_args
         #elif defined(MCU_SAMD51)
         NVIC_EnableIRQ(SERCOM0_0_IRQn + 4 * self->id + 2);
         #endif
-        sercom_register_irq(self->id, SERCOM_IRQ_TYPE_UART);
+        sercom_register_irq(self->id, &common_uart_irq_handler);
 
         sercom_enable(uart, 1);
     }
diff --git a/ports/samd/samd_isr.c b/ports/samd/samd_isr.c
index 5cb0668c25161..ed88ca229dc5a 100644
--- a/ports/samd/samd_isr.c
+++ b/ports/samd/samd_isr.c
@@ -108,21 +108,17 @@ void PendSV_Handler(void) {
 }
 
 
-static uint8_t sercom_irq_type[SERCOM_INST_NUM] = {};
+void (*sercom_irq_handler_table[SERCOM_INST_NUM])(int num) = {};
 
-void (*sercom_irq_handler_table[])(int num) = {
-    common_uart_irq_handler,
-    common_spi_irq_handler,
-    common_i2c_irq_handler
-};
-
-void sercom_register_irq(int sercom_id, int mode) {
-    sercom_irq_type[sercom_id] = mode;
+void sercom_register_irq(int sercom_id, void (*sercom_irq_handler)) {
+    if (sercom_id < SERCOM_INST_NUM) {
+        sercom_irq_handler_table[sercom_id] = sercom_irq_handler;
+    }
 }
 
 static inline void common_sercom_irq_handler(int sercom_id) {
-    if (sercom_irq_handler_table[sercom_irq_type[sercom_id]]) {
-        sercom_irq_handler_table[sercom_irq_type[sercom_id]](sercom_id);
+    if (sercom_irq_handler_table[sercom_id]) {
+        sercom_irq_handler_table[sercom_id](sercom_id);
     }
 }
 
diff --git a/ports/samd/samd_soc.h b/ports/samd/samd_soc.h
index b97159dc7fc5e..e8560b50e8461 100644
--- a/ports/samd/samd_soc.h
+++ b/ports/samd/samd_soc.h
@@ -39,11 +39,8 @@ void USB_1_Handler_wrapper(void);
 void USB_2_Handler_wrapper(void);
 void USB_3_Handler_wrapper(void);
 
-void common_uart_irq_handler(int uart_nr);
-void common_spi_irq_handler(int spi_nr);
-void common_i2c_irq_handler(int i2c_nr);
 void sercom_enable(Sercom *spi, int state);
-void sercom_register_irq(int sercom_id, int mode);
+void sercom_register_irq(int sercom_id, void (*sercom_irq_handler));
 
 #define SERCOM_IRQ_TYPE_UART  (0)
 #define SERCOM_IRQ_TYPE_SPI   (1)

From 32c973d554a31d919ca582d77f4d524760093d4d Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Mon, 6 Jun 2022 11:13:25 +0200
Subject: [PATCH 2699/3533] samd/machine_timer: Add machine.Timer based on the
 shared soft-timer.

---
 ports/samd/Makefile                 |   4 +
 ports/samd/boards/mpconfig_samd21.h |  11 +++
 ports/samd/boards/mpconfig_samd51.h |  20 ++++
 ports/samd/machine_timer.c          | 146 ++++++++++++++++++++++++++++
 ports/samd/main.c                   |   2 +
 ports/samd/modmachine.c             |   1 +
 ports/samd/modmachine.h             |   1 +
 ports/samd/mphalport.h              |   4 +
 ports/samd/pendsv.c                 |  71 ++++++++++++++
 ports/samd/pendsv.h                 |  41 ++++++++
 ports/samd/samd_isr.c               |  18 ++--
 11 files changed, 307 insertions(+), 12 deletions(-)
 create mode 100644 ports/samd/machine_timer.c
 create mode 100644 ports/samd/pendsv.c
 create mode 100644 ports/samd/pendsv.h

diff --git a/ports/samd/Makefile b/ports/samd/Makefile
index f31e5ba6ece46..e3d0d28f8f18b 100644
--- a/ports/samd/Makefile
+++ b/ports/samd/Makefile
@@ -95,12 +95,14 @@ SRC_C = \
 	machine_led.c \
 	machine_pin.c \
 	machine_spi.c \
+	machine_timer.c \
 	machine_uart.c \
 	main.c \
 	modutime.c \
 	modmachine.c \
 	modsamd.c \
 	mphalport.c \
+	pendsv.c \
 	pin_af.c \
 	$(BUILD)/pins.c \
 	samd_flash.c \
@@ -128,6 +130,7 @@ SRC_C = \
 	shared/readline/readline.c \
 	shared/runtime/gchelper_native.c \
 	shared/runtime/pyexec.c \
+	shared/runtime/softtimer.c \
 	shared/runtime/stdout_helpers.c \
 	shared/runtime/sys_stdio_mphal.c \
 	shared/timeutils/timeutils.c \
@@ -150,6 +153,7 @@ SRC_QSTR += \
 	machine_pin.c \
 	machine_pwm.c \
 	machine_spi.c \
+	machine_timer.c \
 	machine_uart.c \
 	modutime.c \
 	modmachine.c \
diff --git a/ports/samd/boards/mpconfig_samd21.h b/ports/samd/boards/mpconfig_samd21.h
index 1924f66f06047..587f3f4b3ad68 100644
--- a/ports/samd/boards/mpconfig_samd21.h
+++ b/ports/samd/boards/mpconfig_samd21.h
@@ -7,3 +7,14 @@
 
 #define CPU_FREQ            (48000000)
 #define APB_FREQ            (48000000)
+
+#define IRQ_PRI_PENDSV          ((1 << __NVIC_PRIO_BITS) - 1)
+
+static inline uint32_t raise_irq_pri(uint32_t pri) {
+    (void)pri;
+    return 0;
+}
+
+static inline void restore_irq_pri(uint32_t basepri) {
+    (void)basepri;
+}
diff --git a/ports/samd/boards/mpconfig_samd51.h b/ports/samd/boards/mpconfig_samd51.h
index d963fe1dd295b..95fc635e5e32d 100644
--- a/ports/samd/boards/mpconfig_samd51.h
+++ b/ports/samd/boards/mpconfig_samd51.h
@@ -22,3 +22,23 @@ unsigned long trng_random_u32(void);
 #define CPU_FREQ            (120000000)
 #define APB_FREQ            (48000000)
 #define DPLLx_REF_FREQ      (32768)
+
+#define NVIC_PRIORITYGROUP_4    ((uint32_t)0x00000003)
+#define IRQ_PRI_PENDSV          NVIC_EncodePriority(NVIC_PRIORITYGROUP_4, 7, 0)
+
+static inline uint32_t raise_irq_pri(uint32_t pri) {
+    uint32_t basepri = __get_BASEPRI();
+    // If non-zero, the processor does not process any exception with a
+    // priority value greater than or equal to BASEPRI.
+    // When writing to BASEPRI_MAX the write goes to BASEPRI only if either:
+    //   - Rn is non-zero and the current BASEPRI value is 0
+    //   - Rn is non-zero and less than the current BASEPRI value
+    pri <<= (8 - __NVIC_PRIO_BITS);
+    __ASM volatile ("msr basepri_max, %0" : : "r" (pri) : "memory");
+    return basepri;
+}
+
+// "basepri" should be the value returned from raise_irq_pri
+static inline void restore_irq_pri(uint32_t basepri) {
+    __set_BASEPRI(basepri);
+}
diff --git a/ports/samd/machine_timer.c b/ports/samd/machine_timer.c
new file mode 100644
index 0000000000000..640d1d200fa50
--- /dev/null
+++ b/ports/samd/machine_timer.c
@@ -0,0 +1,146 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2019 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "py/runtime.h"
+#include "py/mphal.h"
+#include "shared/runtime/softtimer.h"
+
+typedef soft_timer_entry_t machine_timer_obj_t;
+
+const mp_obj_type_t machine_timer_type;
+
+STATIC void machine_timer_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+    machine_timer_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    qstr mode = self->mode == SOFT_TIMER_MODE_ONE_SHOT ? MP_QSTR_ONE_SHOT : MP_QSTR_PERIODIC;
+    mp_printf(print, "Timer(mode=%q, period=%u)", mode, self->delta_ms);
+}
+
+STATIC mp_obj_t machine_timer_init_helper(machine_timer_obj_t *self, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    enum { ARG_mode, ARG_callback, ARG_period, ARG_tick_hz, ARG_freq, };
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_mode,         MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = SOFT_TIMER_MODE_PERIODIC} },
+        { MP_QSTR_callback,     MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
+        { MP_QSTR_period,       MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 0xffffffff} },
+        { MP_QSTR_tick_hz,      MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 1000} },
+        { MP_QSTR_freq,         MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
+    };
+
+    // Parse args
+    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
+    mp_arg_parse_all(n_args, pos_args, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
+
+    self->mode = args[ARG_mode].u_int;
+
+    uint64_t delta_ms = self->delta_ms;
+    if (args[ARG_freq].u_obj != mp_const_none) {
+        // Frequency specified in Hz
+        #if MICROPY_PY_BUILTINS_FLOAT
+        delta_ms = (uint32_t)(MICROPY_FLOAT_CONST(1000.0) / mp_obj_get_float(args[ARG_freq].u_obj));
+        #else
+        delta_ms = 1000 / mp_obj_get_int(args[ARG_freq].u_obj);
+        #endif
+    } else if (args[ARG_period].u_int != 0xffffffff) {
+        // Period specified
+        delta_ms = (uint64_t)args[ARG_period].u_int * 1000 / args[ARG_tick_hz].u_int;
+    }
+
+    if (delta_ms < 1) {
+        delta_ms = 1;
+    } else if (delta_ms >= 0x40000000) {
+        mp_raise_ValueError(MP_ERROR_TEXT("period too large"));
+    }
+    self->delta_ms = (uint32_t)delta_ms;
+
+    if (args[ARG_callback].u_obj != MP_OBJ_NULL) {
+        self->py_callback = args[ARG_callback].u_obj;
+    }
+
+    if (self->py_callback != mp_const_none) {
+        soft_timer_insert(self, self->delta_ms);
+    }
+
+    return mp_const_none;
+}
+
+STATIC mp_obj_t machine_timer_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
+    machine_timer_obj_t *self = m_new_obj(machine_timer_obj_t);
+    self->pairheap.base.type = &machine_timer_type;
+    self->flags = SOFT_TIMER_FLAG_PY_CALLBACK | SOFT_TIMER_FLAG_GC_ALLOCATED;
+    self->delta_ms = 1000;
+    self->py_callback = mp_const_none;
+
+    // Get timer id (only soft timer (-1) supported at the moment)
+    mp_int_t id = -1;
+    if (n_args > 0) {
+        id = mp_obj_get_int(args[0]);
+        --n_args;
+        ++args;
+    }
+    if (id != -1) {
+        mp_raise_ValueError(MP_ERROR_TEXT("Timer doesn't exist"));
+    }
+
+    if (n_args > 0 || n_kw > 0) {
+        // Start the timer
+        mp_map_t kw_args;
+        mp_map_init_fixed_table(&kw_args, n_kw, args + n_args);
+        machine_timer_init_helper(self, n_args, args, &kw_args);
+    }
+
+    return MP_OBJ_FROM_PTR(self);
+}
+
+STATIC mp_obj_t machine_timer_init(size_t n_args, const mp_obj_t *args, mp_map_t *kw_args) {
+    machine_timer_obj_t *self = MP_OBJ_TO_PTR(args[0]);
+    soft_timer_remove(self);
+    return machine_timer_init_helper(self, n_args - 1, args + 1, kw_args);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_KW(machine_timer_init_obj, 1, machine_timer_init);
+
+STATIC mp_obj_t machine_timer_deinit(mp_obj_t self_in) {
+    machine_timer_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    soft_timer_remove(self);
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_timer_deinit_obj, machine_timer_deinit);
+
+STATIC const mp_rom_map_elem_t machine_timer_locals_dict_table[] = {
+    { MP_ROM_QSTR(MP_QSTR_init), MP_ROM_PTR(&machine_timer_init_obj) },
+    { MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&machine_timer_deinit_obj) },
+
+    { MP_ROM_QSTR(MP_QSTR_ONE_SHOT), MP_ROM_INT(SOFT_TIMER_MODE_ONE_SHOT) },
+    { MP_ROM_QSTR(MP_QSTR_PERIODIC), MP_ROM_INT(SOFT_TIMER_MODE_PERIODIC) },
+};
+STATIC MP_DEFINE_CONST_DICT(machine_timer_locals_dict, machine_timer_locals_dict_table);
+
+MP_DEFINE_CONST_OBJ_TYPE(
+    machine_timer_type,
+    MP_QSTR_Timer,
+    MP_TYPE_FLAG_NONE,
+    make_new, machine_timer_make_new,
+    print, machine_timer_print,
+    locals_dict, &machine_timer_locals_dict
+    );
diff --git a/ports/samd/main.c b/ports/samd/main.c
index 5aab39e5099de..889af4a1e4736 100644
--- a/ports/samd/main.c
+++ b/ports/samd/main.c
@@ -31,6 +31,7 @@
 #include "py/stackctrl.h"
 #include "shared/runtime/gchelper.h"
 #include "shared/runtime/pyexec.h"
+#include "shared/runtime/softtimer.h"
 
 extern uint8_t _sstack, _estack, _sheap, _eheap;
 extern void adc_deinit_all(void);
@@ -82,6 +83,7 @@ void samd_main(void) {
         pwm_deinit_all();
         sercom_deinit_all();
         uart_deinit_all();
+        soft_timer_deinit();
         gc_sweep_all();
         mp_deinit();
     }
diff --git a/ports/samd/modmachine.c b/ports/samd/modmachine.c
index acd672fafef36..852d10912d7ce 100644
--- a/ports/samd/modmachine.c
+++ b/ports/samd/modmachine.c
@@ -157,6 +157,7 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_I2C),                 MP_ROM_PTR(&machine_hw_i2c_type) },
     { MP_ROM_QSTR(MP_QSTR_SoftSPI),             MP_ROM_PTR(&mp_machine_soft_spi_type) },
     { MP_ROM_QSTR(MP_QSTR_SPI),                 MP_ROM_PTR(&machine_spi_type) },
+    { MP_ROM_QSTR(MP_QSTR_Timer),               MP_ROM_PTR(&machine_timer_type) },
     { MP_ROM_QSTR(MP_QSTR_UART),                MP_ROM_PTR(&machine_uart_type) },
 
     { MP_ROM_QSTR(MP_QSTR_idle),                MP_ROM_PTR(&machine_idle_obj) },
diff --git a/ports/samd/modmachine.h b/ports/samd/modmachine.h
index 4319867190ccc..b6da5e46f5ad6 100644
--- a/ports/samd/modmachine.h
+++ b/ports/samd/modmachine.h
@@ -34,6 +34,7 @@ extern const mp_obj_type_t machine_led_type;
 extern const mp_obj_type_t machine_pin_type;
 extern const mp_obj_type_t machine_pwm_type;
 extern const mp_obj_type_t machine_spi_type;
+extern const mp_obj_type_t machine_timer_type;
 extern const mp_obj_type_t machine_uart_type;
 
 #endif // MICROPY_INCLUDED_SAMD_MODMACHINE_H
diff --git a/ports/samd/mphalport.h b/ports/samd/mphalport.h
index 6161d9821ff99..2eb4ce7ca680e 100644
--- a/ports/samd/mphalport.h
+++ b/ports/samd/mphalport.h
@@ -40,6 +40,10 @@ extern volatile uint32_t systick_ms_upper;
 
 void mp_hal_set_interrupt_char(int c);
 
+// Define an alias fo systick_ms, because the shared softtimer.c uses
+// the symbol uwTick for the systick ms counter.
+#define uwTick systick_ms
+
 #define mp_hal_delay_us_fast  mp_hal_delay_us
 
 static inline mp_uint_t mp_hal_ticks_ms(void) {
diff --git a/ports/samd/pendsv.c b/ports/samd/pendsv.c
new file mode 100644
index 0000000000000..00dd6068d1e1c
--- /dev/null
+++ b/ports/samd/pendsv.c
@@ -0,0 +1,71 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013, 2014 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include <stdlib.h>
+
+#include "py/runtime.h"
+#include "shared/runtime/interrupt_char.h"
+#include "sam.h"
+#include "pendsv.h"
+
+
+#if defined(PENDSV_DISPATCH_NUM_SLOTS)
+uint32_t pendsv_dispatch_active;
+pendsv_dispatch_t pendsv_dispatch_table[PENDSV_DISPATCH_NUM_SLOTS];
+#endif
+
+void pendsv_init(void) {
+    #if defined(PENDSV_DISPATCH_NUM_SLOTS)
+    pendsv_dispatch_active = false;
+    #endif
+
+    // set PendSV interrupt at lowest priority
+    NVIC_SetPriority(PendSV_IRQn, IRQ_PRI_PENDSV);
+}
+
+#if defined(PENDSV_DISPATCH_NUM_SLOTS)
+void pendsv_schedule_dispatch(size_t slot, pendsv_dispatch_t f) {
+    pendsv_dispatch_table[slot] = f;
+    pendsv_dispatch_active = true;
+    SCB->ICSR = SCB_ICSR_PENDSVSET_Msk;
+}
+
+void pendsv_dispatch_handler(void) {
+    for (size_t i = 0; i < PENDSV_DISPATCH_NUM_SLOTS; ++i) {
+        if (pendsv_dispatch_table[i] != NULL) {
+            pendsv_dispatch_t f = pendsv_dispatch_table[i];
+            pendsv_dispatch_table[i] = NULL;
+            f();
+        }
+    }
+}
+
+void PendSV_Handler(void) {
+    if (pendsv_dispatch_active) {
+        pendsv_dispatch_handler();
+    }
+}
+#endif
diff --git a/ports/samd/pendsv.h b/ports/samd/pendsv.h
new file mode 100644
index 0000000000000..c21af906b4385
--- /dev/null
+++ b/ports/samd/pendsv.h
@@ -0,0 +1,41 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013, 2014 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+#ifndef MICROPY_INCLUDED_SAMD_PENDSV_H
+#define MICROPY_INCLUDED_SAMD_PENDSV_H
+
+enum {
+    PENDSV_DISPATCH_SOFT_TIMER,  // For later & for having at least one entry
+    PENDSV_DISPATCH_MAX
+};
+
+#define PENDSV_DISPATCH_NUM_SLOTS PENDSV_DISPATCH_MAX
+
+typedef void (*pendsv_dispatch_t)(void);
+
+void pendsv_init(void);
+void pendsv_schedule_dispatch(size_t slot, pendsv_dispatch_t f);
+
+#endif // MICROPY_INCLUDED_SAMD_PENDSV_H
diff --git a/ports/samd/samd_isr.c b/ports/samd/samd_isr.c
index ed88ca229dc5a..b507d5d1aa737 100644
--- a/ports/samd/samd_isr.c
+++ b/ports/samd/samd_isr.c
@@ -27,9 +27,9 @@
 #include "py/runtime.h"
 #include "py/mphal.h"
 #include "samd_soc.h"
-// includes for Softtimer
-// #include "pendsv.h"
-// #include "softtimer.h"
+
+#include "pendsv.h"
+#include "shared/runtime/softtimer.h"
 
 typedef void (*ISR)(void);
 
@@ -97,17 +97,11 @@ void SysTick_Handler(void) {
         systick_ms_upper += 1;
     }
 
-    // if (soft_timer_next == next_tick) {
-    //     pendsv_schedule_dispatch(PENDSV_DISPATCH_SOFT_TIMER, soft_timer_handler);
-    // }
-}
-
-// Temporary Handlers to allow builds.
-// Will be removed when the respecitve module is added.
-void PendSV_Handler(void) {
+    if (soft_timer_next == next_tick) {
+        pendsv_schedule_dispatch(PENDSV_DISPATCH_SOFT_TIMER, soft_timer_handler);
+    }
 }
 
-
 void (*sercom_irq_handler_table[SERCOM_INST_NUM])(int num) = {};
 
 void sercom_register_irq(int sercom_id, void (*sercom_irq_handler)) {

From 7a2f2d88f74dcad73acd1f4f7721a3575f68ffc2 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Mon, 6 Jun 2022 11:23:09 +0200
Subject: [PATCH 2700/3533] samd/machine_wdt: Add the machine.WDT class.

---
 ports/samd/Makefile      |   2 +
 ports/samd/machine_wdt.c | 141 +++++++++++++++++++++++++++++++++++++++
 ports/samd/modmachine.c  |   1 +
 ports/samd/modmachine.h  |   1 +
 4 files changed, 145 insertions(+)
 create mode 100644 ports/samd/machine_wdt.c

diff --git a/ports/samd/Makefile b/ports/samd/Makefile
index e3d0d28f8f18b..71a902a0a535e 100644
--- a/ports/samd/Makefile
+++ b/ports/samd/Makefile
@@ -97,6 +97,7 @@ SRC_C = \
 	machine_spi.c \
 	machine_timer.c \
 	machine_uart.c \
+	machine_wdt.c \
 	main.c \
 	modutime.c \
 	modmachine.c \
@@ -155,6 +156,7 @@ SRC_QSTR += \
 	machine_spi.c \
 	machine_timer.c \
 	machine_uart.c \
+	machine_wdt.c \
 	modutime.c \
 	modmachine.c \
 	modsamd.c \
diff --git a/ports/samd/machine_wdt.c b/ports/samd/machine_wdt.c
new file mode 100644
index 0000000000000..c0fbfdbfbc7d3
--- /dev/null
+++ b/ports/samd/machine_wdt.c
@@ -0,0 +1,141 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020-2021 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "py/runtime.h"
+#include "modmachine.h"
+
+#include "sam.h"
+
+#define MIN_TIMEOUT         512
+#define MAX_TIMEOUT         16384
+
+typedef struct _machine_wdt_obj_t {
+    mp_obj_base_t base;
+} machine_wdt_obj_t;
+
+extern mp_int_t log2i(mp_int_t num);
+
+STATIC const machine_wdt_obj_t machine_wdt = {{&machine_wdt_type}};
+
+STATIC void set_timeout(uint32_t timeout) {
+    // Set new timeout. Have to disable WDT first.
+
+    // Confine to the valid range
+    if (timeout < MIN_TIMEOUT) {
+        timeout = MIN_TIMEOUT;
+    } else if (timeout > MAX_TIMEOUT) {
+        timeout = MAX_TIMEOUT;
+    }
+
+    #if defined(MCU_SAMD21)
+    WDT->CTRL.reg = 0;
+    while (WDT->STATUS.reg & WDT_STATUS_SYNCBUSY) {
+    }
+    WDT->CONFIG.reg = log2i(timeout) - 3;
+    WDT->CTRL.reg = WDT_CTRL_ENABLE;
+    while (WDT->STATUS.reg & WDT_STATUS_SYNCBUSY) {
+    }
+    #elif defined(MCU_SAMD51)
+    WDT->CTRLA.reg = 0;
+    while (WDT->SYNCBUSY.reg & WDT_SYNCBUSY_ENABLE) {
+    }
+    WDT->CONFIG.reg = log2i(timeout) - 3;
+    WDT->CTRLA.reg = WDT_CTRLA_ENABLE;
+    while (WDT->SYNCBUSY.reg & WDT_SYNCBUSY_ENABLE) {
+    }
+    #endif
+}
+
+STATIC mp_obj_t machine_wdt_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
+    enum { ARG_id, ARG_timeout, ARG_lock };
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_id, MP_ARG_INT, {.u_int = 0} },
+        { MP_QSTR_timeout, MP_ARG_INT, {.u_int = 5000} },
+    };
+
+    // Parse the arguments.
+    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
+    mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
+
+    #if defined(MCU_SAMD51)
+    // Verify the WDT id. SAMD51 only, saving a few bytes for SAMD21
+    mp_int_t id = args[ARG_id].u_int;
+    if (id != 0) {
+        mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("WDT(%d) doesn't exist"), id);
+    }
+    #endif
+
+    // Start the watchdog (timeout is in milliseconds).
+    uint32_t timeout = args[ARG_timeout].u_int;
+    // Configure the WDT
+    #if defined(MCU_SAMD21)
+
+    // Enable APBx clocks and GCLK clock
+    PM->APBAMASK.reg |= PM_APBAMASK_WDT;
+    GCLK->CLKCTRL.reg = GCLK_CLKCTRL_CLKEN | GCLK_CLKCTRL_GEN_GCLK8 | GCLK_CLKCTRL_ID_WDT;
+
+    #elif defined(MCU_SAMD51)
+
+    // Enable APBx clocks and 1kHz clock
+    MCLK->APBAMASK.reg |= MCLK_APBAMASK_WDT;
+    OSC32KCTRL->OSCULP32K.bit.EN1K = 1;
+
+    #endif
+
+    set_timeout(timeout);
+
+    return MP_OBJ_FROM_PTR(&machine_wdt);
+}
+
+STATIC mp_obj_t machine_wdt_feed(mp_obj_t self_in) {
+    (void)self_in;
+    WDT->CLEAR.reg = 0xa5;
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_wdt_feed_obj, machine_wdt_feed);
+
+STATIC mp_obj_t machine_wdt_timeout_ms(mp_obj_t self_in, mp_obj_t timout_in) {
+    uint32_t timeout = mp_obj_get_int(timout_in);
+
+    set_timeout(timeout);
+
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(machine_wdt_timeout_ms_obj, machine_wdt_timeout_ms);
+
+STATIC const mp_rom_map_elem_t machine_wdt_locals_dict_table[] = {
+    { MP_ROM_QSTR(MP_QSTR_feed), MP_ROM_PTR(&machine_wdt_feed_obj) },
+    { MP_ROM_QSTR(MP_QSTR_timeout_ms), MP_ROM_PTR(&machine_wdt_timeout_ms_obj) },
+};
+STATIC MP_DEFINE_CONST_DICT(machine_wdt_locals_dict, machine_wdt_locals_dict_table);
+
+MP_DEFINE_CONST_OBJ_TYPE(
+    machine_wdt_type,
+    MP_QSTR_WDT,
+    MP_TYPE_FLAG_NONE,
+    make_new, machine_wdt_make_new,
+    locals_dict, &machine_wdt_locals_dict
+    );
diff --git a/ports/samd/modmachine.c b/ports/samd/modmachine.c
index 852d10912d7ce..cabd6b9c5782d 100644
--- a/ports/samd/modmachine.c
+++ b/ports/samd/modmachine.c
@@ -159,6 +159,7 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_SPI),                 MP_ROM_PTR(&machine_spi_type) },
     { MP_ROM_QSTR(MP_QSTR_Timer),               MP_ROM_PTR(&machine_timer_type) },
     { MP_ROM_QSTR(MP_QSTR_UART),                MP_ROM_PTR(&machine_uart_type) },
+    { MP_ROM_QSTR(MP_QSTR_WDT),                 MP_ROM_PTR(&machine_wdt_type) },
 
     { MP_ROM_QSTR(MP_QSTR_idle),                MP_ROM_PTR(&machine_idle_obj) },
     { MP_ROM_QSTR(MP_QSTR_disable_irq),         MP_ROM_PTR(&machine_disable_irq_obj) },
diff --git a/ports/samd/modmachine.h b/ports/samd/modmachine.h
index b6da5e46f5ad6..61b26a1fa302b 100644
--- a/ports/samd/modmachine.h
+++ b/ports/samd/modmachine.h
@@ -36,5 +36,6 @@ extern const mp_obj_type_t machine_pwm_type;
 extern const mp_obj_type_t machine_spi_type;
 extern const mp_obj_type_t machine_timer_type;
 extern const mp_obj_type_t machine_uart_type;
+extern const mp_obj_type_t machine_wdt_type;
 
 #endif // MICROPY_INCLUDED_SAMD_MODMACHINE_H

From 6e2dff6baea2a6109fa030a97d2ffdcafd6c3681 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Mon, 6 Jun 2022 12:26:13 +0200
Subject: [PATCH 2701/3533] samd/modsamd: Add pininfo() function to the samd
 module.

samd.pininfo() returns the data stored in the pin af table for a pin.
Using a small script, a nice representation of the table can be created.
---
 ports/samd/machine_pin.c |  2 --
 ports/samd/modsamd.c     | 44 +++++++++++++++++++++++++++++++++++++++-
 2 files changed, 43 insertions(+), 3 deletions(-)

diff --git a/ports/samd/machine_pin.c b/ports/samd/machine_pin.c
index a70e9ad0115d7..bef19d177d9a1 100644
--- a/ports/samd/machine_pin.c
+++ b/ports/samd/machine_pin.c
@@ -92,7 +92,6 @@ int pin_find(mp_obj_t pin, const machine_pin_obj_t machine_pin_obj[], int table_
     return wanted_pin;
 }
 
-
 // Pin.init(mode, pull=None, *, value=None, drive=0). No 'alt' yet.
 STATIC mp_obj_t machine_pin_obj_init_helper(const machine_pin_obj_t *self, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_mode, ARG_pull, ARG_value, ARG_drive, ARG_alt };
@@ -157,7 +156,6 @@ mp_obj_t mp_pin_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw,
     if (self == NULL || self->base.type == NULL) {
         mp_raise_ValueError(MP_ERROR_TEXT("invalid pin"));
     }
-    self = (machine_pin_obj_t *)&machine_pin_obj[wanted_pin];
 
     if (n_args > 1 || n_kw > 0) {
         // pin mode given, so configure this GPIO
diff --git a/ports/samd/modsamd.c b/ports/samd/modsamd.c
index 68fd6b53e56d4..05ed69bad014b 100644
--- a/ports/samd/modsamd.c
+++ b/ports/samd/modsamd.c
@@ -24,14 +24,56 @@
  * THE SOFTWARE.
  */
 
+#include "string.h"
 #include "py/runtime.h"
+#include "py/mphal.h"
+
+#include "sam.h"
+#include "pin_af.h"
+#include "pins.h"
 #include "samd_soc.h"
 
 extern const mp_obj_type_t samd_flash_type;
 
+STATIC mp_obj_t samd_pininfo(mp_obj_t pin_obj) {
+    mp_hal_pin_obj_t pin = mp_hal_get_pin_obj(pin_obj);
+    const pin_af_t *pin_af = get_pin_af_info(pin);
+    const char *name = ((machine_pin_obj_t *)MP_OBJ_TO_PTR(pin_obj))->name;
+    if (pin_af) {
+        #if defined(MCU_SAMD21)
+        mp_obj_t tuple[7] = {
+            tuple[0] = mp_obj_new_str(name, strlen(name)),
+            tuple[1] = mp_obj_new_int(pin_af->eic),
+            tuple[2] = mp_obj_new_int(pin_af->adc0),
+            tuple[3] = mp_obj_new_int(pin_af->sercom1),
+            tuple[4] = mp_obj_new_int(pin_af->sercom2),
+            tuple[5] = mp_obj_new_int(pin_af->tcc1),
+            tuple[6] = mp_obj_new_int(pin_af->tcc2),
+        };
+        return mp_obj_new_tuple(7, tuple);
+        #elif defined(MCU_SAMD51)
+        mp_obj_t tuple[9] = {
+            tuple[0] = mp_obj_new_str(name, strlen(name)),
+            tuple[1] = mp_obj_new_int(pin_af->eic),
+            tuple[2] = mp_obj_new_int(pin_af->adc0),
+            tuple[3] = mp_obj_new_int(pin_af->adc1),
+            tuple[4] = mp_obj_new_int(pin_af->sercom1),
+            tuple[5] = mp_obj_new_int(pin_af->sercom2),
+            tuple[6] = mp_obj_new_int(pin_af->tc),
+            tuple[7] = mp_obj_new_int(pin_af->tcc1),
+            tuple[8] = mp_obj_new_int(pin_af->tcc2),
+        };
+        return mp_obj_new_tuple(9, tuple);
+        #endif
+    }
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(samd_pininfo_obj, samd_pininfo);
+
 STATIC const mp_rom_map_elem_t samd_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_samd) },
-    { MP_ROM_QSTR(MP_QSTR_Flash), MP_ROM_PTR(&samd_flash_type) },
+    { MP_ROM_QSTR(MP_QSTR_Flash),    MP_ROM_PTR(&samd_flash_type) },
+    { MP_ROM_QSTR(MP_QSTR_pininfo),  MP_ROM_PTR(&samd_pininfo_obj) },
 };
 STATIC MP_DEFINE_CONST_DICT(samd_module_globals, samd_module_globals_table);
 

From aa2d746ef4ef64cbf8093b22facabca2c495be1f Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Mon, 6 Jun 2022 13:35:16 +0200
Subject: [PATCH 2702/3533] samd/machine_led: Optimise size of the machine.LED
 class.

By reducing the methods to on(), off(), toggle() and call, and using the
method implementation of the machine.Pin class.

The code size reduction is 756 byte.
---
 ports/samd/machine_led.c | 108 ++++-----------------------------------
 ports/samd/machine_pin.c |   6 +--
 2 files changed, 13 insertions(+), 101 deletions(-)

diff --git a/ports/samd/machine_led.c b/ports/samd/machine_led.c
index 9c157695818a8..48ab869199ade 100644
--- a/ports/samd/machine_led.c
+++ b/ports/samd/machine_led.c
@@ -32,37 +32,16 @@
 #include "modmachine.h"
 #include "pins.h"
 
-// ASF4 (MCU package specific pin defs in 'boards')
-#include "hal_gpio.h"
+extern mp_obj_t machine_pin_low_obj;
+extern mp_obj_t machine_pin_high_obj;
+extern mp_obj_t machine_pin_toggle_obj;
+extern mp_obj_t machine_pin_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const mp_obj_t *args);
 
 STATIC void machine_led_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     machine_led_obj_t *self = self_in;
     mp_printf(print, "LED(%u)", self->id);
 }
 
-// LED.init(mode, *, value=None)
-STATIC mp_obj_t machine_led_obj_init_helper(const machine_led_obj_t *self, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
-    enum { ARG_mode, ARG_value };
-    static const mp_arg_t allowed_args[] = {
-        { MP_QSTR_mode, MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
-        { MP_QSTR_value, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
-    };
-
-    // parse args
-    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
-    mp_arg_parse_all(n_args, pos_args, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
-
-    // set initial value (do this before configuring mode/pull)
-    if (args[ARG_value].u_obj != mp_const_none) {
-        gpio_set_pin_level(self->id, mp_obj_is_true(args[ARG_value].u_obj));
-    }
-
-    // configure mode
-    gpio_set_pin_direction(self->id, GPIO_DIRECTION_OUT);
-
-    return mp_const_none;
-}
-
 // constructor(id, ...)
 mp_obj_t mp_led_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
     mp_arg_check_num(n_args, n_kw, 1, MP_OBJ_FUN_ARGS_MAX, true);
@@ -73,90 +52,23 @@ mp_obj_t mp_led_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw,
     if (0 <= wanted_led && wanted_led < MP_ARRAY_SIZE(machine_led_obj)) {
         self = (machine_led_obj_t *)&machine_led_obj[wanted_led];
     }
-
     // the array could be padded with 'nulls' (see other Ports).
     // Will also error if the asked for LED (index) is greater than the array row size.
     if (self == NULL || self->base.type == NULL) {
         mp_raise_ValueError(MP_ERROR_TEXT("invalid LED"));
     }
-
-    if (n_args > 1 || n_kw > 0) {
-        // mode given, so configure this GPIO
-        mp_map_t kw_args;
-        mp_map_init_fixed_table(&kw_args, n_kw, args + n_args);
-        machine_led_obj_init_helper(self, n_args - 1, args + 1, &kw_args);
-    }
+    mp_hal_pin_output(self->id);
+    mp_hal_pin_low(self->id);
 
     return MP_OBJ_FROM_PTR(self);
 }
 
-// fast method for getting/setting pin value
-STATIC mp_obj_t machine_led_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
-    mp_arg_check_num(n_args, n_kw, 0, 1, false);
-    machine_led_obj_t *self = self_in;
-    if (n_args == 0) {
-        // get pin
-        return MP_OBJ_NEW_SMALL_INT(gpio_get_pin_level(self->id));
-    } else {
-        // set pin
-        bool value = mp_obj_is_true(args[0]);
-        gpio_set_pin_level(self->id, value);
-
-        return mp_const_none;
-    }
-}
-
-// pin.init(mode)
-STATIC mp_obj_t machine_led_obj_init(size_t n_args, const mp_obj_t *args, mp_map_t *kw_args) {
-    return machine_led_obj_init_helper(args[0], n_args - 1, args + 1, kw_args);
-}
-MP_DEFINE_CONST_FUN_OBJ_KW(machine_led_init_obj, 1, machine_led_obj_init);
-
-// pin.value([value])
-STATIC mp_obj_t machine_led_value(size_t n_args, const mp_obj_t *args) {
-    return machine_led_call(args[0], n_args - 1, 0, args + 1);
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_led_value_obj, 1, 2, machine_led_value);
-
-// pin.low()
-STATIC mp_obj_t machine_led_low(mp_obj_t self_in) {
-    machine_led_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    gpio_set_pin_direction(self->id, GPIO_DIRECTION_OUT);
-    gpio_set_pin_level(self->id, false);
-
-    return mp_const_none;
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_led_low_obj, machine_led_low);
-
-// pin.high()
-STATIC mp_obj_t machine_led_high(mp_obj_t self_in) {
-    machine_led_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    gpio_set_pin_direction(self->id, GPIO_DIRECTION_OUT);
-    gpio_set_pin_level(self->id, true);
-
-    return mp_const_none;
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_led_high_obj, machine_led_high);
-
-// pin.toggle()
-STATIC mp_obj_t machine_led_toggle(mp_obj_t self_in) {
-    machine_led_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    gpio_set_pin_direction(self->id, GPIO_DIRECTION_OUT);
-    gpio_toggle_pin_level(self->id);
-
-    return mp_const_none;
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_led_toggle_obj, machine_led_toggle);
 
 STATIC const mp_rom_map_elem_t machine_led_locals_dict_table[] = {
     // instance methods
-    { MP_ROM_QSTR(MP_QSTR_init), MP_ROM_PTR(&machine_led_init_obj) },
-    { MP_ROM_QSTR(MP_QSTR_value), MP_ROM_PTR(&machine_led_value_obj) },
-    { MP_ROM_QSTR(MP_QSTR_low), MP_ROM_PTR(&machine_led_low_obj) },
-    { MP_ROM_QSTR(MP_QSTR_high), MP_ROM_PTR(&machine_led_high_obj) },
-    { MP_ROM_QSTR(MP_QSTR_off), MP_ROM_PTR(&machine_led_low_obj) },
-    { MP_ROM_QSTR(MP_QSTR_on), MP_ROM_PTR(&machine_led_high_obj) },
-    { MP_ROM_QSTR(MP_QSTR_toggle), MP_ROM_PTR(&machine_led_toggle_obj) },
+    { MP_ROM_QSTR(MP_QSTR_off), MP_ROM_PTR(&machine_pin_low_obj) },
+    { MP_ROM_QSTR(MP_QSTR_on), MP_ROM_PTR(&machine_pin_high_obj) },
+    { MP_ROM_QSTR(MP_QSTR_toggle), MP_ROM_PTR(&machine_pin_toggle_obj) },
 };
 STATIC MP_DEFINE_CONST_DICT(machine_led_locals_dict, machine_led_locals_dict_table);
 
@@ -166,6 +78,6 @@ MP_DEFINE_CONST_OBJ_TYPE(
     MP_TYPE_FLAG_NONE,
     make_new, mp_led_make_new,
     print, machine_led_print,
-    call, machine_led_call,
+    call, machine_pin_call,
     locals_dict, &machine_led_locals_dict
     );
diff --git a/ports/samd/machine_pin.c b/ports/samd/machine_pin.c
index bef19d177d9a1..e900174a9150f 100644
--- a/ports/samd/machine_pin.c
+++ b/ports/samd/machine_pin.c
@@ -220,7 +220,7 @@ STATIC mp_obj_t machine_pin_low(mp_obj_t self_in) {
     }
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_pin_low_obj, machine_pin_low);
+MP_DEFINE_CONST_FUN_OBJ_1(machine_pin_low_obj, machine_pin_low);
 
 // Pin.high() Totem-pole (push-pull)
 STATIC mp_obj_t machine_pin_high(mp_obj_t self_in) {
@@ -232,7 +232,7 @@ STATIC mp_obj_t machine_pin_high(mp_obj_t self_in) {
     }
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_pin_high_obj, machine_pin_high);
+MP_DEFINE_CONST_FUN_OBJ_1(machine_pin_high_obj, machine_pin_high);
 
 // Pin.toggle(). Only TOGGLE pins set as OUTPUT.
 STATIC mp_obj_t machine_pin_toggle(mp_obj_t self_in) {
@@ -254,7 +254,7 @@ STATIC mp_obj_t machine_pin_toggle(mp_obj_t self_in) {
     }
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_pin_toggle_obj, machine_pin_toggle);
+MP_DEFINE_CONST_FUN_OBJ_1(machine_pin_toggle_obj, machine_pin_toggle);
 
 // Pin.drive(). Normal (0) is 2mA, High (1) allows 8mA.
 STATIC mp_obj_t machine_pin_drive(size_t n_args, const mp_obj_t *args) {

From f5da77b5ce66a393984fe8f71627f93e95c39edc Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Tue, 7 Jun 2022 20:37:44 +0200
Subject: [PATCH 2703/3533] samd/machine_dac: Add the machine.DAC class.

It suuports 1 channel @ 10 bit for SAMD21, 2 channels @ 12 bit for SAMD51.

Instantiation by:

    dac = machine.DAC(ch) # 0 or 1

Method write:

    dac.write(value)

The output voltage range is 0..Vdd.
---
 ports/samd/Makefile      |   2 +
 ports/samd/machine_dac.c | 162 +++++++++++++++++++++++++++++++++++++++
 ports/samd/modmachine.c  |   1 +
 ports/samd/modmachine.h  |   1 +
 ports/samd/pin_af.h      |   1 +
 5 files changed, 167 insertions(+)
 create mode 100644 ports/samd/machine_dac.c

diff --git a/ports/samd/Makefile b/ports/samd/Makefile
index 71a902a0a535e..43b6a1adc3f23 100644
--- a/ports/samd/Makefile
+++ b/ports/samd/Makefile
@@ -91,6 +91,7 @@ SRC_C = \
 	clock_config.c \
 	help.c \
 	machine_adc.c \
+	machine_dac.c \
 	machine_i2c.c \
 	machine_led.c \
 	machine_pin.c \
@@ -149,6 +150,7 @@ endif
 # List of sources for qstr extraction
 SRC_QSTR += \
 	machine_adc.c \
+	machine_dac.c \
 	machine_i2c.c \
 	machine_led.c \
 	machine_pin.c \
diff --git a/ports/samd/machine_dac.c b/ports/samd/machine_dac.c
new file mode 100644
index 0000000000000..41c6784cceb8b
--- /dev/null
+++ b/ports/samd/machine_dac.c
@@ -0,0 +1,162 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2017 Nick Moore
+ * Copyright (c) 2022 Robert Hammelrath
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include <stdint.h>
+#include "py/obj.h"
+#include "py/runtime.h"
+#include "py/mphal.h"
+
+#include "sam.h"
+#include "pin_af.h"
+#include "modmachine.h"
+
+typedef struct _dac_obj_t {
+    mp_obj_base_t base;
+    uint8_t id;
+    mp_hal_pin_obj_t gpio_id;
+} dac_obj_t;
+
+STATIC const dac_obj_t dac_obj[] = {
+    #if defined(MCU_SAMD21)
+    {{&machine_dac_type}, 0, PIN_PA02},
+    #elif defined(MCU_SAMD51)
+    {{&machine_dac_type}, 0, PIN_PA02},
+    {{&machine_dac_type}, 1, PIN_PA05},
+    #endif
+};
+Dac *const dac_bases[] = DAC_INSTS;
+
+#if defined(MCU_SAMD21)
+#define MAX_DAC_VALUE  (1023)
+#elif defined(MCU_SAMD51)
+#define MAX_DAC_VALUE  (4095)
+static bool dac_init = false;
+#endif
+
+
+STATIC mp_obj_t dac_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw,
+    const mp_obj_t *args) {
+
+    mp_arg_check_num(n_args, n_kw, 1, 1, true);
+    uint8_t id = mp_obj_get_int(args[0]);
+    const dac_obj_t *self = NULL;
+    if (0 <= id && id <= MP_ARRAY_SIZE(dac_obj)) {
+        self = &dac_obj[id];
+    } else {
+        mp_raise_ValueError(MP_ERROR_TEXT("invalid Pin for DAC"));
+    }
+
+    Dac *dac = dac_bases[0]; // Just one DAC
+
+    // Init DAC
+    #if defined(MCU_SAMD21)
+
+    // Configuration SAMD21
+    // Enable APBC clocks and PCHCTRL clocks; GCLK3 at 1 MHz
+    PM->APBCMASK.reg |= PM_APBCMASK_DAC;
+    GCLK->CLKCTRL.reg = GCLK_CLKCTRL_CLKEN | GCLK_CLKCTRL_GEN_GCLK3 | GCLK_CLKCTRL_ID_DAC;
+    while (GCLK->STATUS.bit.SYNCBUSY) {
+    }
+    // Reset DAC registers
+    dac->CTRLA.bit.SWRST = 1;
+    while (dac->CTRLA.bit.SWRST) {
+    }
+    dac->CTRLB.reg = DAC_CTRLB_EOEN | DAC_CTRLB_REFSEL(DAC_CTRLB_REFSEL_AVCC_Val);
+    // Enable DAC and wait to be ready
+    dac->CTRLA.bit.ENABLE = 1;
+    while (dac->STATUS.bit.SYNCBUSY) {
+    }
+
+    #elif defined(MCU_SAMD51)
+
+    // Configuration SAMD51
+    // Enable APBD clocks and PCHCTRL clocks; GCLK3 at 8 MHz
+    if (!dac_init) {
+        dac_init = true;
+        MCLK->APBDMASK.reg |= MCLK_APBDMASK_DAC;
+        GCLK->PCHCTRL[DAC_GCLK_ID].reg = GCLK_PCHCTRL_GEN_GCLK3 | GCLK_PCHCTRL_CHEN;
+
+        // Reset DAC registers
+        dac->CTRLA.bit.SWRST = 1;
+        while (dac->CTRLA.bit.SWRST) {
+        }
+        dac->CTRLB.reg = DAC_CTRLB_REFSEL(DAC_CTRLB_REFSEL_VDDANA_Val);
+    } else {
+        dac->CTRLA.bit.ENABLE = 0;
+        while (dac->SYNCBUSY.bit.ENABLE) {
+        }
+    }
+    dac->DACCTRL[self->id].reg = DAC_DACCTRL_ENABLE | DAC_DACCTRL_REFRESH(2) | DAC_DACCTRL_CCTRL_CC12M;
+
+    // Enable DAC and wait to be ready
+    dac->CTRLA.bit.ENABLE = 1;
+    while (dac->SYNCBUSY.bit.ENABLE) {
+    }
+    #endif
+
+    // Set the port as given in self->gpio_id as DAC
+    mp_hal_set_pin_mux(self->gpio_id, ALT_FCT_DAC);
+
+    return MP_OBJ_FROM_PTR(self);
+}
+
+STATIC void dac_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+    dac_obj_t *self = self_in;
+    mp_printf(print, "DAC(%u) PIN_PA%02u", self->id, self->gpio_id);
+}
+
+STATIC mp_obj_t dac_write(mp_obj_t self_in, mp_obj_t value_in) {
+    Dac *dac = dac_bases[0]; // Just one DAC
+    int value = mp_obj_get_int(value_in);
+    if (value < 0 || value > MAX_DAC_VALUE) {
+        mp_raise_ValueError(MP_ERROR_TEXT("value out of range"));
+    }
+    #if defined(MCU_SAMD21)
+    dac->DATA.reg = value;
+    #elif defined(MCU_SAMD51)
+    dac_obj_t *self = self_in;
+    dac->DATA[self->id].reg = value;
+    #endif
+
+    return mp_const_none;
+}
+MP_DEFINE_CONST_FUN_OBJ_2(dac_write_obj, dac_write);
+
+STATIC const mp_rom_map_elem_t dac_locals_dict_table[] = {
+    { MP_ROM_QSTR(MP_QSTR_write), MP_ROM_PTR(&dac_write_obj) },
+};
+
+STATIC MP_DEFINE_CONST_DICT(dac_locals_dict, dac_locals_dict_table);
+
+MP_DEFINE_CONST_OBJ_TYPE(
+    machine_dac_type,
+    MP_QSTR_DAC,
+    MP_TYPE_FLAG_NONE,
+    make_new, dac_make_new,
+    print, dac_print,
+    locals_dict, &dac_locals_dict
+    );
diff --git a/ports/samd/modmachine.c b/ports/samd/modmachine.c
index cabd6b9c5782d..f7ad47b3c5291 100644
--- a/ports/samd/modmachine.c
+++ b/ports/samd/modmachine.c
@@ -150,6 +150,7 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_unique_id),           MP_ROM_PTR(&machine_unique_id_obj) },
 
     { MP_ROM_QSTR(MP_QSTR_ADC),                 MP_ROM_PTR(&machine_adc_type) },
+    { MP_ROM_QSTR(MP_QSTR_DAC),                 MP_ROM_PTR(&machine_dac_type) },
     { MP_ROM_QSTR(MP_QSTR_LED),                 MP_ROM_PTR(&machine_led_type) },
     { MP_ROM_QSTR(MP_QSTR_Pin),                 MP_ROM_PTR(&machine_pin_type) },
     { MP_ROM_QSTR(MP_QSTR_PWM),                 MP_ROM_PTR(&machine_pwm_type) },
diff --git a/ports/samd/modmachine.h b/ports/samd/modmachine.h
index 61b26a1fa302b..6a745da0675a5 100644
--- a/ports/samd/modmachine.h
+++ b/ports/samd/modmachine.h
@@ -29,6 +29,7 @@
 #include "py/obj.h"
 
 extern const mp_obj_type_t machine_adc_type;
+extern const mp_obj_type_t machine_dac_type;
 extern const mp_obj_type_t machine_hw_i2c_type;
 extern const mp_obj_type_t machine_led_type;
 extern const mp_obj_type_t machine_pin_type;
diff --git a/ports/samd/pin_af.h b/ports/samd/pin_af.h
index f9dec6b7da052..b75f4ddd02562 100644
--- a/ports/samd/pin_af.h
+++ b/ports/samd/pin_af.h
@@ -81,6 +81,7 @@ typedef struct _pwm_config_t {
 
 #define ALT_FCT_EIC       0
 #define ALT_FCT_ADC       1
+#define ALT_FCT_DAC       1
 #define ALT_FCT_SERCOM1   2
 #define ALT_FCT_SERCOM2   3
 

From 029e9af4576f3000aabf5e6eac589f6bb644af92 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Tue, 7 Jun 2022 21:52:03 +0200
Subject: [PATCH 2704/3533] samd/modmachine: Add machine.time_pulse_us.

Software based. Resolution:
- +/-2 microseconds on SAMD51.
- +/-4 microseconds on SAMD21.
---
 ports/samd/modmachine.c   | 6 ++++--
 ports/samd/mpconfigport.h | 1 +
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/ports/samd/modmachine.c b/ports/samd/modmachine.c
index f7ad47b3c5291..c191afda7910f 100644
--- a/ports/samd/modmachine.c
+++ b/ports/samd/modmachine.c
@@ -26,10 +26,11 @@
 
 #include "py/runtime.h"
 #include "extmod/machine_mem.h"
-#include "samd_soc.h"
-#include "modmachine.h"
+#include "extmod/machine_pulse.h"
 #include "extmod/machine_i2c.h"
 #include "extmod/machine_spi.h"
+#include "modmachine.h"
+#include "samd_soc.h"
 
 // ASF 4
 #include "hal_flash.h"
@@ -165,6 +166,7 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_idle),                MP_ROM_PTR(&machine_idle_obj) },
     { MP_ROM_QSTR(MP_QSTR_disable_irq),         MP_ROM_PTR(&machine_disable_irq_obj) },
     { MP_ROM_QSTR(MP_QSTR_enable_irq),          MP_ROM_PTR(&machine_enable_irq_obj) },
+    { MP_ROM_QSTR(MP_QSTR_time_pulse_us),       MP_ROM_PTR(&machine_time_pulse_us_obj) },
 };
 STATIC MP_DEFINE_CONST_DICT(machine_module_globals, machine_module_globals_table);
 
diff --git a/ports/samd/mpconfigport.h b/ports/samd/mpconfigport.h
index c2c614e10b462..48631080d27fa 100644
--- a/ports/samd/mpconfigport.h
+++ b/ports/samd/mpconfigport.h
@@ -111,6 +111,7 @@
 #define MICROPY_PY_MACHINE_SPI              (1)
 #define MICROPY_PY_MACHINE_SOFTSPI          (1)
 #define MICROPY_PY_OS_DUPTERM               (3)
+#define MICROPY_PY_MACHINE_PULSE            (1)
 #define MICROPY_PY_MACHINE_PWM              (1)
 #define MICROPY_PY_MACHINE_PWM_INIT         (0)
 #define MICROPY_PY_MACHINE_PWM_DUTY_U16_NS  (1)

From aa6dbbcffd4f0a5c7572b8aa1ef256794838f969 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Wed, 8 Jun 2022 10:54:02 +0200
Subject: [PATCH 2705/3533] samd/mcu: Factor out MCU policy for SAMD21 and
 SAMD51.

Which contains a mpconfigmcu.h, mpconfigmcu.mk and manifest.py file for
each MCU group.  That looks better than the previous choice.
---
 ports/samd/Makefile                              | 16 +++++-----------
 .../samd21/mpconfigmcu.h}                        |  0
 ports/samd/mcu/samd21/mpconfigmcu.mk             |  1 +
 .../samd51/mpconfigmcu.h}                        |  0
 ports/samd/mcu/samd51/mpconfigmcu.mk             |  1 +
 ports/samd/mpconfigport.h                        |  2 +-
 6 files changed, 8 insertions(+), 12 deletions(-)
 rename ports/samd/{boards/mpconfig_samd21.h => mcu/samd21/mpconfigmcu.h} (100%)
 create mode 100644 ports/samd/mcu/samd21/mpconfigmcu.mk
 rename ports/samd/{boards/mpconfig_samd51.h => mcu/samd51/mpconfigmcu.h} (100%)
 create mode 100644 ports/samd/mcu/samd51/mpconfigmcu.mk

diff --git a/ports/samd/Makefile b/ports/samd/Makefile
index 43b6a1adc3f23..1455e748cc3af 100644
--- a/ports/samd/Makefile
+++ b/ports/samd/Makefile
@@ -9,14 +9,15 @@ ifeq ($(wildcard $(BOARD_DIR)/.),)
 $(error Invalid BOARD specified: $(BOARD_DIR))
 endif
 
+MCU_SERIES_LOWER = $(shell echo $(MCU_SERIES) | tr '[:upper:]' '[:lower:]')
+
 include ../../py/mkenv.mk
 include $(BOARD_DIR)/mpconfigboard.mk
+include mcu/$(MCU_SERIES_LOWER)/mpconfigmcu.mk
 
 # Qstr definitions (must come before including py.mk)
 QSTR_DEFS = qstrdefsport.h
-QSTR_GLOBAL_DEPENDENCIES = $(BOARD_DIR)/mpconfigboard.h
-
-MCU_SERIES_LOWER = $(shell echo $(MCU_SERIES) | tr '[:upper:]' '[:lower:]')
+QSTR_GLOBAL_DEPENDENCIES = $(BOARD_DIR)/mpconfigboard.h mcu/$(MCU_SERIES_LOWER)/mpconfigmcu.h
 
 FROZEN_MANIFEST ?= boards/manifest.py
 
@@ -30,6 +31,7 @@ INC += -I.
 INC += -I$(TOP)
 INC += -I$(BUILD)
 INC += -I$(BOARD_DIR)
+INC += -Imcu/$(MCU_SERIES_LOWER)
 INC += -I$(TOP)/lib/cmsis/inc
 INC += -I$(TOP)/lib/asf4/$(MCU_SERIES_LOWER)/hal/include
 INC += -I$(TOP)/lib/asf4/$(MCU_SERIES_LOWER)/hal/utils/include
@@ -62,8 +64,6 @@ CFLAGS += $(CFLAGS_MOD) $(CFLAGS_EXTRA)
 CFLAGS += -DMPCONFIG_MCU_H='<boards/mpconfig_$(MCU_SERIES_LOWER).h>'
 CFLAGS += -DPIN_AF_TABLE_C='<$(BUILD)/$(GEN_PIN_AF)>'
 
-QSTR_GLOBAL_DEPENDENCIES += boards/mpconfig_$(MCU_SERIES_LOWER).h
-
 LDFLAGS = -nostdlib $(addprefix -T,$(LD_FILES)) -Map=$@.map --cref
 LDFLAGS += $(LDFLAGS_MOD)
 
@@ -141,12 +141,6 @@ SRC_C += $(SRC_MOD)
 
 SRC_CXX += $(SRC_MOD_CXX)
 
-ifeq ($(MCU_SERIES),SAMD21)
-SRC_S = shared/runtime/gchelper_m0.s
-else
-SRC_S = shared/runtime/gchelper_m3.s
-endif
-
 # List of sources for qstr extraction
 SRC_QSTR += \
 	machine_adc.c \
diff --git a/ports/samd/boards/mpconfig_samd21.h b/ports/samd/mcu/samd21/mpconfigmcu.h
similarity index 100%
rename from ports/samd/boards/mpconfig_samd21.h
rename to ports/samd/mcu/samd21/mpconfigmcu.h
diff --git a/ports/samd/mcu/samd21/mpconfigmcu.mk b/ports/samd/mcu/samd21/mpconfigmcu.mk
new file mode 100644
index 0000000000000..cc435da8cc913
--- /dev/null
+++ b/ports/samd/mcu/samd21/mpconfigmcu.mk
@@ -0,0 +1 @@
+SRC_S += shared/runtime/gchelper_m0.s
diff --git a/ports/samd/boards/mpconfig_samd51.h b/ports/samd/mcu/samd51/mpconfigmcu.h
similarity index 100%
rename from ports/samd/boards/mpconfig_samd51.h
rename to ports/samd/mcu/samd51/mpconfigmcu.h
diff --git a/ports/samd/mcu/samd51/mpconfigmcu.mk b/ports/samd/mcu/samd51/mpconfigmcu.mk
new file mode 100644
index 0000000000000..461a0182ef019
--- /dev/null
+++ b/ports/samd/mcu/samd51/mpconfigmcu.mk
@@ -0,0 +1 @@
+SRC_S += shared/runtime/gchelper_m3.s
diff --git a/ports/samd/mpconfigport.h b/ports/samd/mpconfigport.h
index 48631080d27fa..8a067d3482393 100644
--- a/ports/samd/mpconfigport.h
+++ b/ports/samd/mpconfigport.h
@@ -29,7 +29,7 @@
 // Board specific definitions
 #include "mpconfigboard.h"
 // MCU-Specific definitions
-#include MPCONFIG_MCU_H
+#include "mpconfigmcu.h"
 
 // Memory allocation policies
 #define MICROPY_GC_STACK_ENTRY_TYPE         uint16_t

From 7da76639027057245cfee043733193b3265e7a54 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Thu, 9 Jun 2022 13:44:22 +0200
Subject: [PATCH 2706/3533] samd/mphalport: Add a mp_hal_ticks_ms_64()
 function.

Returning a 64 bit number.  This will be used by the utime module and the
machine.UART module for timeout avoiding overflow.
---
 ports/samd/mphalport.h | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/ports/samd/mphalport.h b/ports/samd/mphalport.h
index 2eb4ce7ca680e..c2aca8b0e273f 100644
--- a/ports/samd/mphalport.h
+++ b/ports/samd/mphalport.h
@@ -50,6 +50,10 @@ static inline mp_uint_t mp_hal_ticks_ms(void) {
     return systick_ms;
 }
 
+static inline uint64_t mp_hal_ticks_ms_64(void) {
+    return ((uint64_t)systick_ms_upper << 32) + systick_ms;
+}
+
 static inline mp_uint_t mp_hal_ticks_us(void) {
     #if defined(MCU_SAMD21)
 
@@ -74,7 +78,7 @@ static inline mp_uint_t mp_hal_ticks_cpu(void) {
 }
 
 static inline uint64_t mp_hal_time_ns(void) {
-    return ((uint64_t)systick_ms + (uint64_t)systick_ms_upper * 0x100000000) * 1000000;
+    return mp_hal_ticks_ms_64() * 1000000;
 }
 
 // C-level pin HAL

From 37449df821a47698779b48e6c101b084cfbdb6c7 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Thu, 9 Jun 2022 14:33:31 +0200
Subject: [PATCH 2707/3533] samd/modutime: Enable time.time() based on
 systick_ms().

Allowing to set a time and retrieve the time.  It is based on systick_ms()
with the precision of the MCU clock.  Unless that is based on a crystal,
the error seen was about 0.5% at room temperature.
---
 ports/samd/modutime.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/ports/samd/modutime.c b/ports/samd/modutime.c
index bbeedcfda070f..a54544e62c6ca 100644
--- a/ports/samd/modutime.c
+++ b/ports/samd/modutime.c
@@ -27,6 +27,9 @@
 #include "py/runtime.h"
 #include "extmod/utime_mphal.h"
 #include "shared/timeutils/timeutils.h"
+#include "mphalport.h"
+
+static uint32_t time_offset = 0;
 
 // localtime([secs])
 STATIC mp_obj_t time_localtime(size_t n_args, const mp_obj_t *args) {
@@ -34,9 +37,10 @@ STATIC mp_obj_t time_localtime(size_t n_args, const mp_obj_t *args) {
     mp_int_t seconds;
     if (n_args == 0 || args[0] == mp_const_none) {
         // seconds = pyb_rtc_get_us_since_epoch() / 1000 / 1000;
-        seconds = mp_obj_get_int(args[0]);
+        seconds = mp_hal_ticks_ms_64() / 1000 + time_offset;
     } else {
         seconds = mp_obj_get_int(args[0]);
+        time_offset = seconds - mp_hal_ticks_ms_64() / 1000;
     }
     timeutils_seconds_since_epoch_to_struct_time(seconds, &tm);
     mp_obj_t tuple[8] = {
@@ -72,7 +76,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(time_mktime_obj, time_mktime);
 
 // time()
 STATIC mp_obj_t time_time(void) {
-    mp_raise_NotImplementedError("time");
+    return mp_obj_new_int_from_uint(mp_hal_ticks_ms_64() / 1000 + time_offset);
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_0(time_time_obj, time_time);
 

From 9a567b04e7c43024a2a4dce2618b24f822dfe5bc Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Thu, 9 Jun 2022 13:46:54 +0200
Subject: [PATCH 2708/3533] samd/machine_uart: Support buffered TX for UART.

It can be enabled/disabled by a configuration switch.  The code size
increase is 308 bytes, but it requires RAM space for buffers, the larger
UART object and root pointers.
---
 ports/samd/machine_uart.c           | 78 +++++++++++++++++++++++------
 ports/samd/mcu/samd21/mpconfigmcu.h |  2 +
 ports/samd/mcu/samd51/mpconfigmcu.h |  2 +
 3 files changed, 66 insertions(+), 16 deletions(-)

diff --git a/ports/samd/machine_uart.c b/ports/samd/machine_uart.c
index 0ed7fb95d0c3f..92e63ee51e6f2 100644
--- a/ports/samd/machine_uart.c
+++ b/ports/samd/machine_uart.c
@@ -37,7 +37,6 @@
 #define DEFAULT_BUFFER_SIZE (256)
 #define MIN_BUFFER_SIZE  (32)
 #define MAX_BUFFER_SIZE  (32766)
-#define USART_BUFFER_TX  (0)
 
 typedef struct _machine_uart_obj_t {
     mp_obj_base_t base;
@@ -54,7 +53,7 @@ typedef struct _machine_uart_obj_t {
     uint16_t timeout_char;  // timeout waiting between chars (in ms)
     bool new;
     ringbuf_t read_buffer;
-    #if USART_BUFFER_TX
+    #if MICROPY_HW_UART_TXBUF
     ringbuf_t write_buffer;
     #endif
 } machine_uart_obj_t;
@@ -91,7 +90,15 @@ void common_uart_irq_handler(int uart_id) {
             // Now handler the incoming data
             uart_drain_rx_fifo(self, uart);
         } else if (uart->USART.INTFLAG.bit.DRE != 0) {
+            #if MICROPY_HW_UART_TXBUF
             // handle the outgoing data
+            if (ringbuf_avail(&self->write_buffer) > 0) {
+                uart->USART.DATA.bit.DATA = ringbuf_get(&self->write_buffer);
+            } else {
+                // Stop the interrupt if there is no more data
+                uart->USART.INTENCLR.bit.DRE = 1;
+            }
+            #endif
         } else {
             // Disable the other interrupts, if set by error
             uart->USART.INTENCLR.reg = (uint8_t) ~(SERCOM_USART_INTENCLR_DRE | SERCOM_USART_INTENCLR_RXC);
@@ -127,7 +134,7 @@ STATIC mp_obj_t machine_uart_init_helper(machine_uart_obj_t *self, size_t n_args
         { MP_QSTR_timeout, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} },
         { MP_QSTR_timeout_char, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} },
         { MP_QSTR_rxbuf, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} },
-        #if USART_BUFFER_TX
+        #if MICROPY_HW_UART_TXBUF
         { MP_QSTR_txbuf, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} },
         #endif
     };
@@ -191,7 +198,7 @@ STATIC mp_obj_t machine_uart_init_helper(machine_uart_obj_t *self, size_t n_args
         }
     }
 
-    #if USART_BUFFER_TX
+    #if MICROPY_HW_UART_TXBUF
     // Set the TX buffer size if configured.
     size_t txbuf_len = DEFAULT_BUFFER_SIZE;
     if (args[ARG_txbuf].u_int > 0) {
@@ -224,7 +231,7 @@ STATIC mp_obj_t machine_uart_init_helper(machine_uart_obj_t *self, size_t n_args
         ringbuf_alloc(&(self->read_buffer), rxbuf_len + 1);
         MP_STATE_PORT(samd_uart_rx_buffer[self->id]) = self->read_buffer.buf;
 
-        #if USART_BUFFER_TX
+        #if MICROPY_HW_UART_TXBUF
         ringbuf_alloc(&(self->write_buffer), txbuf_len + 1);
         MP_STATE_PORT(samd_uart_tx_buffer[self->id]) = self->write_buffer.buf;
         #endif
@@ -274,6 +281,8 @@ STATIC mp_obj_t machine_uart_init_helper(machine_uart_obj_t *self, size_t n_args
         uint32_t baud = 65536 - ((uint64_t)(65536 * 16) * self->baudrate + get_apb_freq() / 2) / get_apb_freq();
         uart->USART.BAUD.bit.BAUD = baud; // Set Baud
 
+        sercom_register_irq(self->id, &common_uart_irq_handler);
+
         // Enable RXC interrupt
         uart->USART.INTENSET.bit.RXC = 1;
         #if defined(MCU_SAMD21)
@@ -281,7 +290,13 @@ STATIC mp_obj_t machine_uart_init_helper(machine_uart_obj_t *self, size_t n_args
         #elif defined(MCU_SAMD51)
         NVIC_EnableIRQ(SERCOM0_0_IRQn + 4 * self->id + 2);
         #endif
-        sercom_register_irq(self->id, &common_uart_irq_handler);
+        #if MICROPY_HW_UART_TXBUF
+        // Enable DRE interrupt
+        // SAMD21 has just 1 IRQ for all USART events, so no need for an additional NVIC enable
+        #if defined(MCU_SAMD51)
+        NVIC_EnableIRQ(SERCOM0_0_IRQn + 4 * self->id + 0);
+        #endif
+        #endif
 
         sercom_enable(uart, 1);
     }
@@ -330,7 +345,7 @@ STATIC mp_obj_t machine_uart_deinit(mp_obj_t self_in) {
     // Disable interrupts
     uart->USART.INTENCLR.reg = 0xff;
     MP_STATE_PORT(samd_uart_rx_buffer[self->id]) = NULL;
-    #if USART_BUFFER_TX
+    #if MICROPY_HW_UART_TXBUF
     MP_STATE_PORT(samd_uart_tx_buffer[self->id]) = NULL;
     #endif
     return mp_const_none;
@@ -339,7 +354,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_uart_deinit_obj, machine_uart_deinit);
 
 STATIC mp_obj_t machine_uart_any(mp_obj_t self_in) {
     machine_uart_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    // get all bytes from the fifo first
+    // get all bytes from the fifo first. May be obsolete.
     uart_drain_rx_fifo(self, sercom_instance[self->id]);
     return MP_OBJ_NEW_SMALL_INT(ringbuf_avail(&self->read_buffer));
 }
@@ -349,9 +364,14 @@ STATIC mp_obj_t machine_uart_sendbreak(mp_obj_t self_in) {
     machine_uart_obj_t *self = MP_OBJ_TO_PTR(self_in);
     uint32_t break_time_us = 13 * 1000000 / self->baudrate;
 
+    // Wait for the tx buffer to drain.
+    #if MICROPY_HW_UART_TXBUF
+    while (ringbuf_avail(&self->write_buffer) > 0) {
+        MICROPY_EVENT_POLL_HOOK
+    }
+    #endif
     // Wait for the TX queue & register to clear
     // Since the flags are not safe, just wait sufficiently long.
-    // Once tx buffering is implemented, wait as well for the buffer to clear.
     mp_hal_delay_us(2 * break_time_us);
     // Disable MUX
     PORT->Group[self->tx / 32].PINCFG[self->tx % 32].bit.PMUXEN = 0;
@@ -389,7 +409,7 @@ STATIC MP_DEFINE_CONST_DICT(machine_uart_locals_dict, machine_uart_locals_dict_t
 
 STATIC mp_uint_t machine_uart_read(mp_obj_t self_in, void *buf_in, mp_uint_t size, int *errcode) {
     machine_uart_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    uint64_t t = mp_hal_ticks_ms() + self->timeout;
+    uint64_t t = mp_hal_ticks_ms_64() + self->timeout;
     uint64_t timeout_char = self->timeout_char;
     uint8_t *dest = buf_in;
     Sercom *uart = sercom_instance[self->id];
@@ -403,7 +423,7 @@ STATIC mp_uint_t machine_uart_read(mp_obj_t self_in, void *buf_in, mp_uint_t siz
                 uart_drain_rx_fifo(self, uart);
                 break;
             }
-            if (mp_hal_ticks_ms() > t) {  // timed out
+            if (mp_hal_ticks_ms_64() > t) {  // timed out
                 if (i <= 0) {
                     *errcode = MP_EAGAIN;
                     return MP_STREAM_ERROR;
@@ -421,17 +441,40 @@ STATIC mp_uint_t machine_uart_read(mp_obj_t self_in, void *buf_in, mp_uint_t siz
 
 STATIC mp_uint_t machine_uart_write(mp_obj_t self_in, const void *buf_in, mp_uint_t size, int *errcode) {
     machine_uart_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    size_t remaining = size;
+    size_t i = 0;
     const uint8_t *src = buf_in;
     Sercom *uart = sercom_instance[self->id];
 
-    while (remaining--) {
-        while (!(uart->USART.INTFLAG.bit.DRE)) {
+    #if MICROPY_HW_UART_TXBUF
+    uint64_t t = mp_hal_ticks_ms_64() + self->timeout;
+
+    while (i < size) {
+        // Wait for the first/next character to be sent.
+        while (ringbuf_free(&(self->write_buffer)) == 0) {
+            if (mp_hal_ticks_ms_64() > t) {  // timed out
+                if (i <= 0) {
+                    *errcode = MP_EAGAIN;
+                    return MP_STREAM_ERROR;
+                } else {
+                    return i;
+                }
+            }
+            MICROPY_EVENT_POLL_HOOK
         }
-        uart->USART.DATA.bit.DATA = *src;
-        src += 1;
+        ringbuf_put(&(self->write_buffer), *src++);
+        i++;
+        uart->USART.INTENSET.bit.DRE = 1; // kick off the IRQ
     }
 
+    #else
+
+    while (i < size) {
+        while (!(uart->USART.INTFLAG.bit.DRE)) {
+        }
+        uart->USART.DATA.bit.DATA = *src++;
+        i++;
+    }
+    #endif
     return size;
 }
 
@@ -473,3 +516,6 @@ MP_DEFINE_CONST_OBJ_TYPE(
     );
 
 MP_REGISTER_ROOT_POINTER(void *samd_uart_rx_buffer[SERCOM_INST_NUM]);
+#if MICROPY_HW_UART_TXBUF
+MP_REGISTER_ROOT_POINTER(void *samd_uart_tx_buffer[SERCOM_INST_NUM]);
+#endif
diff --git a/ports/samd/mcu/samd21/mpconfigmcu.h b/ports/samd/mcu/samd21/mpconfigmcu.h
index 587f3f4b3ad68..7b91be1430a0d 100644
--- a/ports/samd/mcu/samd21/mpconfigmcu.h
+++ b/ports/samd/mcu/samd21/mpconfigmcu.h
@@ -5,6 +5,8 @@
 #define MICROPY_HW_FLASH_STORAGE_BYTES      (0xFFFF)
 #define VFS_BLOCK_SIZE_BYTES                (1536) // 24x 64B flash pages;
 
+#define MICROPY_HW_UART_TXBUF               (1)
+
 #define CPU_FREQ            (48000000)
 #define APB_FREQ            (48000000)
 
diff --git a/ports/samd/mcu/samd51/mpconfigmcu.h b/ports/samd/mcu/samd51/mpconfigmcu.h
index 95fc635e5e32d..089ca48de88bd 100644
--- a/ports/samd/mcu/samd51/mpconfigmcu.h
+++ b/ports/samd/mcu/samd51/mpconfigmcu.h
@@ -19,6 +19,8 @@ unsigned long trng_random_u32(void);
 #define MICROPY_HW_FLASH_STORAGE_BYTES      (0x1FFFF)
 #define VFS_BLOCK_SIZE_BYTES                (1536) //
 
+#define MICROPY_HW_UART_TXBUF               (1)
+
 #define CPU_FREQ            (120000000)
 #define APB_FREQ            (48000000)
 #define DPLLx_REF_FREQ      (32768)

From a9304af8fa7165c41be1cad3d55042a5cc14d13c Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Mon, 6 Jun 2022 21:06:09 +0200
Subject: [PATCH 2709/3533] samd/boards: Add missing/lost board config and pin
 definitions.

Fixes are:
- Pin definitions for ADAFRUIT_FEATHER_Mx_EXPRESS and
  ADAFRUIT_ITSYBITSY_M4_EXPRESS.
- For ADAFRUIT_ITSYBITSY_M0_EXPRESS, change the MISO/MOSI name.
- For MINISAM_M4, add the default SPI pins.
- For boards with 32k crystal, add the XOSC32K setting.
---
 .../boards/ADAFRUIT_FEATHER_M0_EXPRESS/mpconfigboard.h |  2 ++
 ports/samd/boards/ADAFRUIT_FEATHER_M0_EXPRESS/pins.csv |  3 +++
 .../boards/ADAFRUIT_FEATHER_M4_EXPRESS/mpconfigboard.h |  2 ++
 ports/samd/boards/ADAFRUIT_FEATHER_M4_EXPRESS/pins.csv |  9 +++++++++
 .../samd/boards/ADAFRUIT_ITSYBITSY_M0_EXPRESS/pins.csv |  6 +++---
 .../samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/pins.csv | 10 ++++++++--
 ports/samd/boards/MINISAM_M4/pins.csv                  |  3 +++
 ports/samd/boards/SAMD21_XPLAINED_PRO/mpconfigboard.h  |  2 ++
 ports/samd/boards/SEEED_XIAO/mpconfigboard.h           |  2 ++
 9 files changed, 34 insertions(+), 5 deletions(-)

diff --git a/ports/samd/boards/ADAFRUIT_FEATHER_M0_EXPRESS/mpconfigboard.h b/ports/samd/boards/ADAFRUIT_FEATHER_M0_EXPRESS/mpconfigboard.h
index cec9e9ccdda46..815597899c4ae 100644
--- a/ports/samd/boards/ADAFRUIT_FEATHER_M0_EXPRESS/mpconfigboard.h
+++ b/ports/samd/boards/ADAFRUIT_FEATHER_M0_EXPRESS/mpconfigboard.h
@@ -1,2 +1,4 @@
 #define MICROPY_HW_BOARD_NAME "Feather M0 Express"
 #define MICROPY_HW_MCU_NAME   "SAMD21G18A"
+
+#define MICROPY_HW_XOSC32K  (1)
diff --git a/ports/samd/boards/ADAFRUIT_FEATHER_M0_EXPRESS/pins.csv b/ports/samd/boards/ADAFRUIT_FEATHER_M0_EXPRESS/pins.csv
index 84e68157acbc3..0985ee1646d1f 100644
--- a/ports/samd/boards/ADAFRUIT_FEATHER_M0_EXPRESS/pins.csv
+++ b/ports/samd/boards/ADAFRUIT_FEATHER_M0_EXPRESS/pins.csv
@@ -29,6 +29,9 @@ PIN_PB22,TX
 PIN_PB23,RX
 PIN_PA23,SCL
 PIN_PA22,SDA
+PIN_PB10,MOSI
+PIN_PA12,MISO
+PIN_PB11,SCK
 PIN_PA06,NEOPIXEL
 PIN_PA13,FLASH_CS
 
diff --git a/ports/samd/boards/ADAFRUIT_FEATHER_M4_EXPRESS/mpconfigboard.h b/ports/samd/boards/ADAFRUIT_FEATHER_M4_EXPRESS/mpconfigboard.h
index 48599eec47297..35945395fcc0d 100644
--- a/ports/samd/boards/ADAFRUIT_FEATHER_M4_EXPRESS/mpconfigboard.h
+++ b/ports/samd/boards/ADAFRUIT_FEATHER_M4_EXPRESS/mpconfigboard.h
@@ -1,2 +1,4 @@
 #define MICROPY_HW_BOARD_NAME "Feather M4 Express"
 #define MICROPY_HW_MCU_NAME   "SAMD51J19A"
+
+#define MICROPY_HW_XOSC32K  (1)
diff --git a/ports/samd/boards/ADAFRUIT_FEATHER_M4_EXPRESS/pins.csv b/ports/samd/boards/ADAFRUIT_FEATHER_M4_EXPRESS/pins.csv
index 5b999c39e0224..32daac3d0f4c7 100644
--- a/ports/samd/boards/ADAFRUIT_FEATHER_M4_EXPRESS/pins.csv
+++ b/ports/samd/boards/ADAFRUIT_FEATHER_M4_EXPRESS/pins.csv
@@ -7,6 +7,8 @@
 
 PIN_PB17,D0
 PIN_PB16,D1
+-
+-
 PIN_PA14,D4
 PIN_PA16,D5
 PIN_PA18,D6
@@ -30,5 +32,12 @@ PIN_PB22,MISO
 PIN_PA17,SCK
 PIN_PB01,VDIV
 PIN_PA03,AREF
+PIN_PB03,NEOPIXEL
+PIN_PB11,FLASH_CS
+PIN_PB10,FLASH_SCK
+PIN_PA08,FLASH_MOSI
+PIN_PA09,FLASH_MISO
+PIN_PA10,FLASH_WP
+PIN_PA11,FLASH_HOLD
 
 LED_PA17,LED
diff --git a/ports/samd/boards/ADAFRUIT_ITSYBITSY_M0_EXPRESS/pins.csv b/ports/samd/boards/ADAFRUIT_ITSYBITSY_M0_EXPRESS/pins.csv
index 50c3c1cf68f51..d7d59c23575da 100644
--- a/ports/samd/boards/ADAFRUIT_ITSYBITSY_M0_EXPRESS/pins.csv
+++ b/ports/samd/boards/ADAFRUIT_ITSYBITSY_M0_EXPRESS/pins.csv
@@ -8,7 +8,7 @@
 PIN_PA11,D0
 PIN_PA10,D1
 PIN_PA14,D2
-PIN_PB09,D3
+PIN_PA09,D3
 PIN_PA08,D4
 PIN_PA15,D5
 -
@@ -27,8 +27,8 @@ PIN_PA05,A4
 PIN_PB02,A5
 PIN_PA22,SDA
 PIN_PA23,SCL
-PIN_PB10,MO
-PIN_PA12,MI
+PIN_PB10,MOSI
+PIN_PA12,MISO
 PIN_PB11,SCK
 PIN_PA00,DOTSTAR_CLK
 PIN_PA01,DOTSTAR_DATA
diff --git a/ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/pins.csv b/ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/pins.csv
index 90e38761a10ce..ce760a269c243 100644
--- a/ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/pins.csv
+++ b/ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/pins.csv
@@ -27,10 +27,16 @@ PIN_PA04,A4
 PIN_PA06,A5
 PIN_PA12,SDA
 PIN_PA13,SCL
-PIN_PA00,MO
-PIN_PB23,MI
+PIN_PA00,MOSI
+PIN_PB23,MISO
 PIN_PA01,SCK
 PIN_PB02,DOTSTAR_CLK
 PIN_PB03,DOTSTAR_DATA
+PIN_PB11,FLASH_CS
+PIN_PB10,FLASH_SCK
+PIN_PA08,FLASH_MOSI
+PIN_PA09,FLASH_MISO
+PIN_PA10,FLASH_WP
+PIN_PA11,FLASH_HOLD
 
 LED_PA22,LED
diff --git a/ports/samd/boards/MINISAM_M4/pins.csv b/ports/samd/boards/MINISAM_M4/pins.csv
index 7442a028d12a5..cf9a3bd19b214 100644
--- a/ports/samd/boards/MINISAM_M4/pins.csv
+++ b/ports/samd/boards/MINISAM_M4/pins.csv
@@ -21,6 +21,9 @@ PIN_PA00,BUTTON
 PIN_PA03,AREF
 PIN_PA12,SDA
 PIN_PA13,SCL
+PIN_PB22,MOSI
+PIN_PB23,MISO
+PIN_PA01,SCK
 PIN_PB03,DOTSTAR_DATA
 PIN_PB02,DOTSTAR_CLK
 
diff --git a/ports/samd/boards/SAMD21_XPLAINED_PRO/mpconfigboard.h b/ports/samd/boards/SAMD21_XPLAINED_PRO/mpconfigboard.h
index c69b5b4c149de..064d1ecc0d030 100644
--- a/ports/samd/boards/SAMD21_XPLAINED_PRO/mpconfigboard.h
+++ b/ports/samd/boards/SAMD21_XPLAINED_PRO/mpconfigboard.h
@@ -1,2 +1,4 @@
 #define MICROPY_HW_BOARD_NAME "SAMD21-XPLAINED-PRO"
 #define MICROPY_HW_MCU_NAME   "SAMD21J18A"
+
+#define MICROPY_HW_XOSC32K  (1)
diff --git a/ports/samd/boards/SEEED_XIAO/mpconfigboard.h b/ports/samd/boards/SEEED_XIAO/mpconfigboard.h
index 2026efc6b153b..98994a5bc06bd 100644
--- a/ports/samd/boards/SEEED_XIAO/mpconfigboard.h
+++ b/ports/samd/boards/SEEED_XIAO/mpconfigboard.h
@@ -1,2 +1,4 @@
 #define MICROPY_HW_BOARD_NAME "Seeed Xiao"
 #define MICROPY_HW_MCU_NAME   "SAMD21G18A"
+
+#define MICROPY_HW_XOSC32K  (1)

From fd7b57dd22ce0105e04c5f9b2d12ca3a3075ca0a Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Fri, 10 Jun 2022 08:23:09 +0200
Subject: [PATCH 2710/3533] samd/mphalport: Use CYCCNT for SAMD51's
 mp_hal_ticks_cpu().

And use mp_hal_ticks_us() for SAM21's mp_hal_ticks_cpu().  The SAMD21 has
no CYCCNT register, and the SysTick register has only a 1 ms span (== 48000
count range).
---
 ports/samd/mphalport.h | 16 +++++++++++++---
 ports/samd/samd_soc.c  |  4 ++++
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/ports/samd/mphalport.h b/ports/samd/mphalport.h
index c2aca8b0e273f..b7e65da35dc05 100644
--- a/ports/samd/mphalport.h
+++ b/ports/samd/mphalport.h
@@ -71,11 +71,21 @@ static inline mp_uint_t mp_hal_ticks_us(void) {
     #endif
 }
 
-// ticks_cpu is limited to a 1 ms period, since the CPU SysTick counter
-// is used for the 1 ms SysTick_Handler interrupt.
+#if defined (MCU_SAMD21)
+
+#define mp_hal_ticks_cpu mp_hal_ticks_us
+
+#elif defined (MCU_SAMD51)
+static inline void mp_hal_ticks_cpu_enable(void) {
+    CoreDebug->DEMCR |= CoreDebug_DEMCR_TRCENA_Msk;
+    DWT->CYCCNT = 0;
+    DWT->CTRL |= DWT_CTRL_CYCCNTENA_Msk;
+}
+
 static inline mp_uint_t mp_hal_ticks_cpu(void) {
-    return (system_time_t)SysTick->VAL;
+    return (system_time_t)DWT->CYCCNT;
 }
+#endif
 
 static inline uint64_t mp_hal_time_ns(void) {
     return mp_hal_ticks_ms_64() * 1000000;
diff --git a/ports/samd/samd_soc.c b/ports/samd/samd_soc.c
index 8d6e808f63904..aca6df0dd88e6 100644
--- a/ports/samd/samd_soc.c
+++ b/ports/samd/samd_soc.c
@@ -36,6 +36,7 @@
 #include "samd_soc.h"
 #include "sam.h"
 #include "tusb.h"
+#include "mphalport.h"
 
 static void usb_init(void) {
     // Init USB clock
@@ -110,4 +111,7 @@ void samd_init(void) {
     SysTick_Config(get_cpu_freq() / 1000);
     init_us_counter();
     usb_init();
+    #if defined (MCU_SAMD51)
+    mp_hal_ticks_cpu_enable();
+    #endif
 }

From a4157521731878c7363ff59f15d68eb68b486cb5 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Fri, 10 Jun 2022 16:40:50 +0200
Subject: [PATCH 2711/3533] samd/machine_bitstream: Add the machine.bitstream()
 function.

The SAMD21 implementation is an adaption of @jimmo's code for STM32Lxx.
The only changes are the addresses and names of the port registers and the
timing parameters.

SAMD21: The precision is about +/-25ns at 48MHz clock frequency.  The first
two cycles are about 40-60 ns longer than set.  But still good enough to
drive a neopixel device.

SAMD51: The precision is about +/-30ns at 120MHz clock frequency.  Good
enough to drive a neopixel device.
---
 ports/samd/Makefile            |   3 +-
 ports/samd/machine_bitstream.c | 206 +++++++++++++++++++++++++++++++++
 ports/samd/modmachine.c        |   2 +
 ports/samd/mpconfigport.h      |   1 +
 ports/samd/mphalport.h         |   4 +-
 ports/samd/samd_soc.c          |   2 +-
 6 files changed, 214 insertions(+), 4 deletions(-)
 create mode 100644 ports/samd/machine_bitstream.c

diff --git a/ports/samd/Makefile b/ports/samd/Makefile
index 1455e748cc3af..f1bc67e6ee4d6 100644
--- a/ports/samd/Makefile
+++ b/ports/samd/Makefile
@@ -87,10 +87,11 @@ LIBSTDCPP_FILE_NAME = "$(shell $(CXX) $(CXXFLAGS) -print-file-name=libstdc++.a)"
 LDFLAGS += -L"$(shell dirname $(LIBSTDCPP_FILE_NAME))"
 endif
 
-SRC_C = \
+SRC_C += \
 	clock_config.c \
 	help.c \
 	machine_adc.c \
+	machine_bitstream.c \
 	machine_dac.c \
 	machine_i2c.c \
 	machine_led.c \
diff --git a/ports/samd/machine_bitstream.c b/ports/samd/machine_bitstream.c
new file mode 100644
index 0000000000000..9959d947cb449
--- /dev/null
+++ b/ports/samd/machine_bitstream.c
@@ -0,0 +1,206 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Jim Mussared
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+// This is a translation of the cycle counter implementation in ports/stm32/machine_bitstream.c.
+
+#include "py/mpconfig.h"
+#include "py/mphal.h"
+#include "clock_config.h"
+
+#if MICROPY_PY_MACHINE_BITSTREAM
+
+#if __CORTEX_M == 0
+
+// No cycle counter on M0, do manual cycle counting instead.
+
+// STM32F091 @ 48MHz
+#define NS_CYCLES_PER_ITER_HIGH (3)
+#define NS_CYCLES_PER_ITER_LOW (3)
+#define NS_OVERHEAD_CYCLES_HIGH (12)
+#define NS_OVERHEAD_CYCLES_LOW (15)
+
+uint32_t mp_hal_delay_ns_calc(uint32_t ns, bool high) {
+    uint32_t ncycles = (get_cpu_freq() / 1000000 * ns + 500) / 1000; // + 500 for proper rounding
+    uint32_t overhead = MIN(ncycles, high ? NS_OVERHEAD_CYCLES_HIGH : NS_OVERHEAD_CYCLES_LOW);
+    return MAX(1, MP_ROUND_DIVIDE(ncycles - overhead, high ? NS_CYCLES_PER_ITER_HIGH : NS_CYCLES_PER_ITER_LOW));
+}
+
+void machine_bitstream_high_low(mp_hal_pin_obj_t pin, uint32_t *timing_ns, const uint8_t *buf, size_t len) {
+    volatile const uint32_t mask = 1 << (pin % 32);
+    volatile uint32_t *outclr = &PORT->Group[pin / 32].OUTCLR.reg;
+    volatile uint32_t *outset = &PORT->Group[pin / 32].OUTSET.reg;
+
+    // Convert ns to loop iterations [high_time_0, low_time_0, high_time_1, low_time_1].
+    for (size_t i = 0; i < 4; ++i) {
+        timing_ns[i] = mp_hal_delay_ns_calc(timing_ns[i], i % 2 == 0);
+    }
+
+    mp_uint_t atomic_state = MICROPY_BEGIN_ATOMIC_SECTION();
+
+    // Measured timing for SAMD21 at 48MHz (cycle=20.83ns)
+    // timing_ns = (1,1,1,1)
+    //   high:  310
+    //   low:   375
+    //   high0: 375
+    //   low0:  400
+    // timing_ns = (500, 500, 500, 500)
+    //   high:  500
+    //   low:   500
+    //   high0: 565
+    //   low0:  540
+    // timing_ns = (1000, 1000, 1000, 1000)
+    //   high:  1000
+    //   low:   1000
+    //   high0: 1065
+    //   low0:  1040
+
+    // --> high is 12 + n*3 cycles
+    //     low is 15 + n*3 cycles
+
+    // NeoPixel timing (400, 850, 800, 450) (+/-150ns) gives timing_ns=(2, 9, 8, 3) which in cycles is
+    // (12 + 6, 15 + 27, 15 + 24, 12 + 9) = (18, 42, 39, 21)
+    // --> (375, 875, 812, 437) nanoseconds.
+    // Measured output on logic analyser is (375, 875, 815, 435) (+/-5ns at 200MHz)
+
+    // Note: the first high/low cycle is longer by 2-3 cycles (40-60ns).
+    // This is slightly outside spec, but doesn't seem to cause a problem.
+
+    __asm volatile (
+        // Force consistent register assignment.
+        // r6 = len
+        "ldr r6, %0\n"
+        // r4 = buf
+        "ldr r4, %1\n"
+        // r5 = timing_ms
+        "ldr r5, %2\n"
+
+        // Must align for consistent timing.
+        ".align 4\n"
+
+        // Don't increment/decrement before first iteration.
+        "b .outer2\n"
+        ".outer:\n"
+        // ++buf, --len
+        "  add r4, #1\n"
+        "  sub r6, #1\n"
+
+        // len iterations
+        ".outer2:\n"
+        "  cmp r6, #0\n"
+        "  beq .done\n"
+
+        // r0 = *buf
+        "  ldrb r0, [r4, #0]\n"
+
+        // 8 bits in byte
+        "  mov r7, #8\n"
+        "  .inner:\n"
+        //   *outset = mask
+        "    ldr r2, %3\n"
+        "    ldr r1, %5\n"
+        "    str r1, [r2, #0]\n"
+
+        //   r3 = (r0 >> 4) & 8    (r0 is 8 if high bit is 1 else 0)
+        "    mov r8, r6\n"
+        "    lsr r3, r0, #4\n"
+        "    mov r6, #8\n"
+        "    and r3, r6\n"
+        "    mov r6, r8\n"
+
+        //   r2 = timing_ns[r2]
+        "    ldr r2, [r5, r3]\n"
+        "    .loop1:\n sub r2, #1\n bne .loop1\n"
+
+        //   *outclr = mask
+        "    ldr r2, %4\n"
+        "    str r1, [r2, #0]\n"
+
+        //   r2 = timing_ns[r3 + 4]
+        "    add r3, #4\n"
+        "    ldr r2, [r5, r3]\n"
+        "    .loop2:\n sub r2, #1\n bne .loop2\n"
+
+        //   b >>= 1
+        "    lsl r0, r0, #1\n"
+
+        "    sub r7, #1\n"
+        //   end of inner loop
+        "    beq .outer\n"
+        //   continue inner loop
+        "    b .inner\n"
+
+        ".done:\n"
+        :
+        : "m" (len), "m" (buf), "m" (timing_ns), "m" (outset), "m" (outclr), "m" (mask)
+        : "r0", "r1", "r2", "r3", "r4", "r5", "r6", "r7", "r8"
+        );
+
+    MICROPY_END_ATOMIC_SECTION(atomic_state);
+}
+
+#else // > CORTEX_M0
+
+#define NS_TICKS_OVERHEAD (70)
+
+void machine_bitstream_high_low(mp_hal_pin_obj_t pin, uint32_t *timing_ns, const uint8_t *buf, size_t len) {
+    uint32_t fcpu_mhz = get_cpu_freq() / 1000000;
+    uint32_t ticks_overhead = fcpu_mhz * NS_TICKS_OVERHEAD / 1000;
+    // Convert ns to us ticks [high_time_0, period_0, high_time_1, period_1].
+    for (size_t i = 0; i < 4; ++i) {
+        timing_ns[i] = fcpu_mhz * timing_ns[i] / 1000;
+        if (timing_ns[i] > ticks_overhead) {
+            timing_ns[i] -= ticks_overhead;
+        }
+        if (i % 2 == 1) {
+            // Convert low_time to period (i.e. add high_time).
+            timing_ns[i] += timing_ns[i - 1] - ticks_overhead;
+        }
+    }
+
+    mp_uint_t atomic_state = MICROPY_BEGIN_ATOMIC_SECTION();
+    DWT->CYCCNT = 0;
+
+    for (size_t i = 0; i < len; ++i) {
+        uint8_t b = buf[i];
+        for (size_t j = 0; j < 8; ++j) {
+            uint32_t start_ticks = mp_hal_ticks_cpu();
+            uint32_t *t = &timing_ns[b >> 6 & 2];
+            mp_hal_pin_high(pin);
+            while ((mp_hal_ticks_cpu() - start_ticks) < t[0]) {
+            }
+            b <<= 1;
+            mp_hal_pin_low(pin);
+            while ((mp_hal_ticks_cpu() - start_ticks) < t[1]) {
+            }
+        }
+    }
+    MICROPY_END_ATOMIC_SECTION(atomic_state);
+
+}
+
+#endif // > CORTEX_M0
+
+#endif // MICROPY_PY_MACHINE_BITSTREAM
diff --git a/ports/samd/modmachine.c b/ports/samd/modmachine.c
index c191afda7910f..f6cf7f8155c96 100644
--- a/ports/samd/modmachine.c
+++ b/ports/samd/modmachine.c
@@ -25,6 +25,7 @@
  */
 
 #include "py/runtime.h"
+#include "extmod/machine_bitstream.h"
 #include "extmod/machine_mem.h"
 #include "extmod/machine_pulse.h"
 #include "extmod/machine_i2c.h"
@@ -167,6 +168,7 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_disable_irq),         MP_ROM_PTR(&machine_disable_irq_obj) },
     { MP_ROM_QSTR(MP_QSTR_enable_irq),          MP_ROM_PTR(&machine_enable_irq_obj) },
     { MP_ROM_QSTR(MP_QSTR_time_pulse_us),       MP_ROM_PTR(&machine_time_pulse_us_obj) },
+    { MP_ROM_QSTR(MP_QSTR_bitstream),           MP_ROM_PTR(&machine_bitstream_obj) },
 };
 STATIC MP_DEFINE_CONST_DICT(machine_module_globals, machine_module_globals_table);
 
diff --git a/ports/samd/mpconfigport.h b/ports/samd/mpconfigport.h
index 8a067d3482393..986c42fc7f84d 100644
--- a/ports/samd/mpconfigport.h
+++ b/ports/samd/mpconfigport.h
@@ -111,6 +111,7 @@
 #define MICROPY_PY_MACHINE_SPI              (1)
 #define MICROPY_PY_MACHINE_SOFTSPI          (1)
 #define MICROPY_PY_OS_DUPTERM               (3)
+#define MICROPY_PY_MACHINE_BITSTREAM        (1)
 #define MICROPY_PY_MACHINE_PULSE            (1)
 #define MICROPY_PY_MACHINE_PWM              (1)
 #define MICROPY_PY_MACHINE_PWM_INIT         (0)
diff --git a/ports/samd/mphalport.h b/ports/samd/mphalport.h
index b7e65da35dc05..f1efd550035af 100644
--- a/ports/samd/mphalport.h
+++ b/ports/samd/mphalport.h
@@ -71,11 +71,11 @@ static inline mp_uint_t mp_hal_ticks_us(void) {
     #endif
 }
 
-#if defined (MCU_SAMD21)
+#if defined(MCU_SAMD21)
 
 #define mp_hal_ticks_cpu mp_hal_ticks_us
 
-#elif defined (MCU_SAMD51)
+#elif defined(MCU_SAMD51)
 static inline void mp_hal_ticks_cpu_enable(void) {
     CoreDebug->DEMCR |= CoreDebug_DEMCR_TRCENA_Msk;
     DWT->CYCCNT = 0;
diff --git a/ports/samd/samd_soc.c b/ports/samd/samd_soc.c
index aca6df0dd88e6..d0df4a7e28cc1 100644
--- a/ports/samd/samd_soc.c
+++ b/ports/samd/samd_soc.c
@@ -111,7 +111,7 @@ void samd_init(void) {
     SysTick_Config(get_cpu_freq() / 1000);
     init_us_counter();
     usb_init();
-    #if defined (MCU_SAMD51)
+    #if defined(MCU_SAMD51)
     mp_hal_ticks_cpu_enable();
     #endif
 }

From 929dfc66a30c361d2a0bd5b64dec021a49c7b471 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Wed, 15 Jun 2022 15:16:07 +0200
Subject: [PATCH 2712/3533] samd/mpconfigport: Restructure to use ROM feature
 levels.

Changes are:
- Set the feature level for each MCU: CORE features for SAMD21, and EXTRA
  features for SAMD51.
- Remove all definitions that are included in the core feature level.
- Keep the default settings for feature level and float, to make the choice
  obvious.
---
 ports/samd/Makefile                 |  1 +
 ports/samd/mcu/samd21/mpconfigmcu.h | 22 +++++++++++++++-------
 ports/samd/mcu/samd51/mpconfigmcu.h | 25 ++++++++++++++++---------
 ports/samd/mpconfigport.h           | 23 +----------------------
 4 files changed, 33 insertions(+), 38 deletions(-)

diff --git a/ports/samd/Makefile b/ports/samd/Makefile
index f1bc67e6ee4d6..5b268286c3a23 100644
--- a/ports/samd/Makefile
+++ b/ports/samd/Makefile
@@ -161,6 +161,7 @@ SRC_QSTR += \
 	shared/readline/readline.c \
 	extmod/uos_dupterm.c \
 	shared/runtime/mpirq.c \
+	shared/runtime/sys_stdio_mphal.c \
 
 SRC_QSTR += $(SRC_MOD) $(SRC_CXX)
 
diff --git a/ports/samd/mcu/samd21/mpconfigmcu.h b/ports/samd/mcu/samd21/mpconfigmcu.h
index 7b91be1430a0d..dd16a6c8affd4 100644
--- a/ports/samd/mcu/samd21/mpconfigmcu.h
+++ b/ports/samd/mcu/samd21/mpconfigmcu.h
@@ -1,16 +1,24 @@
 // Deinitions common to all SAMD21 boards
 #include "samd21.h"
 
-#define MICROPY_HW_FLASH_STORAGE_BASE       (0x30000)
-#define MICROPY_HW_FLASH_STORAGE_BYTES      (0xFFFF)
-#define VFS_BLOCK_SIZE_BYTES                (1536) // 24x 64B flash pages;
+#define MICROPY_CONFIG_ROM_LEVEL        (MICROPY_CONFIG_ROM_LEVEL_CORE_FEATURES)
 
-#define MICROPY_HW_UART_TXBUF               (1)
+// MicroPython emitters
+#define MICROPY_EMIT_THUMB              (0)
+#define MICROPY_EMIT_INLINE_THUMB       (0)
 
-#define CPU_FREQ            (48000000)
-#define APB_FREQ            (48000000)
+#define MICROPY_FLOAT_IMPL              (MICROPY_FLOAT_IMPL_NONE)
 
-#define IRQ_PRI_PENDSV          ((1 << __NVIC_PRIO_BITS) - 1)
+#define MICROPY_HW_FLASH_STORAGE_BASE   (0x30000)
+#define MICROPY_HW_FLASH_STORAGE_BYTES  (0xFFFF)
+#define VFS_BLOCK_SIZE_BYTES            (1536) // 24x 64B flash pages;
+
+#define MICROPY_HW_UART_TXBUF           (1)
+
+#define CPU_FREQ                        (48000000)
+#define APB_FREQ                        (48000000)
+
+#define IRQ_PRI_PENDSV                  ((1 << __NVIC_PRIO_BITS) - 1)
 
 static inline uint32_t raise_irq_pri(uint32_t pri) {
     (void)pri;
diff --git a/ports/samd/mcu/samd51/mpconfigmcu.h b/ports/samd/mcu/samd51/mpconfigmcu.h
index 089ca48de88bd..c3253fcbecb73 100644
--- a/ports/samd/mcu/samd51/mpconfigmcu.h
+++ b/ports/samd/mcu/samd51/mpconfigmcu.h
@@ -1,10 +1,17 @@
 // Deinitions common to all SAMD51 boards
 #include "samd51.h"
 
+#define MICROPY_CONFIG_ROM_LEVEL        (MICROPY_CONFIG_ROM_LEVEL_FULL_FEATURES)
+
+// MicroPython emitters
+#define MICROPY_EMIT_THUMB              (1)
+#define MICROPY_EMIT_INLINE_THUMB       (1)
+
 #define MICROPY_FLOAT_IMPL              (MICROPY_FLOAT_IMPL_FLOAT)
 #define MICROPY_PY_BUILTINS_COMPLEX     (0)
 #define MICROPY_PY_MATH                 (0)
 #define MICROPY_PY_CMATH                (0)
+
 #define MICROPY_PY_UOS_URANDOM          (1)
 #define MICROPY_PY_URANDOM_SEED_INIT_FUNC (trng_random_u32())
 unsigned long trng_random_u32(void);
@@ -15,18 +22,18 @@ unsigned long trng_random_u32(void);
 // samd_flash.c flash parameters
 // Build a 128k Flash storage at top. 512k-128k=384k=0x60000
 // 512*1024= 0x80000 minus 128*1024= 0x20000 =  0x60000
-#define MICROPY_HW_FLASH_STORAGE_BASE       (0x60000)
-#define MICROPY_HW_FLASH_STORAGE_BYTES      (0x1FFFF)
-#define VFS_BLOCK_SIZE_BYTES                (1536) //
+#define MICROPY_HW_FLASH_STORAGE_BASE   (0x60000)
+#define MICROPY_HW_FLASH_STORAGE_BYTES  (0x1FFFF)
+#define VFS_BLOCK_SIZE_BYTES            (1536) //
 
-#define MICROPY_HW_UART_TXBUF               (1)
+#define MICROPY_HW_UART_TXBUF           (1)
 
-#define CPU_FREQ            (120000000)
-#define APB_FREQ            (48000000)
-#define DPLLx_REF_FREQ      (32768)
+#define CPU_FREQ                        (120000000)
+#define APB_FREQ                        (48000000)
+#define DPLLx_REF_FREQ                  (32768)
 
-#define NVIC_PRIORITYGROUP_4    ((uint32_t)0x00000003)
-#define IRQ_PRI_PENDSV          NVIC_EncodePriority(NVIC_PRIORITYGROUP_4, 7, 0)
+#define NVIC_PRIORITYGROUP_4            ((uint32_t)0x00000003)
+#define IRQ_PRI_PENDSV                  NVIC_EncodePriority(NVIC_PRIORITYGROUP_4, 7, 0)
 
 static inline uint32_t raise_irq_pri(uint32_t pri) {
     uint32_t basepri = __get_BASEPRI();
diff --git a/ports/samd/mpconfigport.h b/ports/samd/mpconfigport.h
index 986c42fc7f84d..8b8305f0b47e7 100644
--- a/ports/samd/mpconfigport.h
+++ b/ports/samd/mpconfigport.h
@@ -40,8 +40,6 @@
 
 // MicroPython emitters
 #define MICROPY_PERSISTENT_CODE_LOAD        (1)
-#define MICROPY_EMIT_THUMB                  (0)
-#define MICROPY_EMIT_INLINE_THUMB           (0)
 
 // Compiler configuration
 #define MICROPY_COMP_CONST                  (1)
@@ -56,33 +54,18 @@
 #define MICROPY_ENABLE_SOURCE_LINE          (1)
 #define MICROPY_STREAMS_NON_BLOCK           (1)
 #define MICROPY_ERROR_REPORTING             (MICROPY_ERROR_REPORTING_TERSE)
-#define MICROPY_CPYTHON_COMPAT              (0)
-#define MICROPY_CAN_OVERRIDE_BUILTINS       (1)
 #define MICROPY_PY_BUILTINS_HELP            (1)
 #define MICROPY_PY_BUILTINS_HELP_TEXT       samd_help_text
 #define MICROPY_PY_BUILTINS_HELP_MODULES    (1)
 #define MICROPY_ENABLE_SCHEDULER            (1)
-// fixes sys/usys import issue
 #define MICROPY_MODULE_WEAK_LINKS           (1)
+
 // Control over Python builtins
-#define MICROPY_PY_ASYNC_AWAIT              (0)
 #define MICROPY_PY_BUILTINS_BYTES_HEX       (1)
-#define MICROPY_PY_BUILTINS_STR_COUNT       (0)
 #define MICROPY_PY_BUILTINS_MEMORYVIEW      (1)
-#define MICROPY_PY_BUILTINS_SET             (0)
-#define MICROPY_PY_BUILTINS_FROZENSET       (0)
-#define MICROPY_PY_BUILTINS_PROPERTY        (0)
-#define MICROPY_PY_BUILTINS_ENUMERATE       (1)
-#define MICROPY_PY_BUILTINS_FILTER          (0)
-#define MICROPY_PY_BUILTINS_REVERSED        (0)
-#define MICROPY_PY_BUILTINS_NOTIMPLEMENTED  (1)
-#define MICROPY_PY_BUILTINS_MIN_MAX         (1)
 #define MICROPY_PY_BUILTINS_INPUT           (1)
-#define MICROPY_PY___FILE__                 (0)
 #define MICROPY_PY_MICROPYTHON_MEM_INFO     (1)
 #define MICROPY_PY_ARRAY_SLICE_ASSIGN       (1)
-#define MICROPY_PY_ATTRTUPLE                (1)
-#define MICROPY_PY_COLLECTIONS              (0)
 #define MICROPY_PY_SYS                      (1)
 #define MICROPY_PY_SYS_PLATFORM             "samd"
 #define MICROPY_PY_SYS_EXIT                 (1)
@@ -118,10 +101,6 @@
 #define MICROPY_PY_MACHINE_PWM_DUTY_U16_NS  (1)
 #define MICROPY_PY_MACHINE_PWM_INCLUDEFILE  "ports/samd/machine_pwm.c"
 
-// Use VfsLfs's types for fileio/textio
-#define mp_type_fileio mp_type_vfs_lfs1_fileio
-#define mp_type_textio mp_type_vfs_lfs1_textio
-
 #define MP_STATE_PORT MP_STATE_VM
 
 // Miscellaneous settings

From f00356a486ed7ea9650f59f1259b2732d9a1bb21 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Wed, 15 Jun 2022 18:49:24 +0200
Subject: [PATCH 2713/3533] samd/clock_config: Split clock_config.c to separate
 SAMD21/SAMD51 files.

And put the file into the mcu directory.  The file got a little bit long
and hard to read.
---
 ports/samd/Makefile                        |   2 +-
 ports/samd/mcu/samd21/clock_config.c       | 168 +++++++++++++++++++++
 ports/samd/{ => mcu/samd51}/clock_config.c | 131 ----------------
 3 files changed, 169 insertions(+), 132 deletions(-)
 create mode 100644 ports/samd/mcu/samd21/clock_config.c
 rename ports/samd/{ => mcu/samd51}/clock_config.c (59%)

diff --git a/ports/samd/Makefile b/ports/samd/Makefile
index 5b268286c3a23..8d49778b3bcc8 100644
--- a/ports/samd/Makefile
+++ b/ports/samd/Makefile
@@ -88,7 +88,7 @@ LDFLAGS += -L"$(shell dirname $(LIBSTDCPP_FILE_NAME))"
 endif
 
 SRC_C += \
-	clock_config.c \
+	mcu/$(MCU_SERIES_LOWER)/clock_config.c \
 	help.c \
 	machine_adc.c \
 	machine_bitstream.c \
diff --git a/ports/samd/mcu/samd21/clock_config.c b/ports/samd/mcu/samd21/clock_config.c
new file mode 100644
index 0000000000000..3d189d67e18ca
--- /dev/null
+++ b/ports/samd/mcu/samd21/clock_config.c
@@ -0,0 +1,168 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * This file provides functions for configuring the clocks.
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2022 Robert Hammelrath
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include <stdint.h>
+
+#include "py/runtime.h"
+#include "samd_soc.h"
+
+static uint32_t cpu_freq = CPU_FREQ;
+static uint32_t apb_freq = APB_FREQ;
+
+int sercom_gclk_id[] = {
+    GCLK_CLKCTRL_ID_SERCOM0_CORE, GCLK_CLKCTRL_ID_SERCOM1_CORE,
+    GCLK_CLKCTRL_ID_SERCOM2_CORE, GCLK_CLKCTRL_ID_SERCOM3_CORE,
+    GCLK_CLKCTRL_ID_SERCOM4_CORE, GCLK_CLKCTRL_ID_SERCOM5_CORE
+};
+
+uint32_t get_cpu_freq(void) {
+    return cpu_freq;
+}
+
+uint32_t get_apb_freq(void) {
+    return apb_freq;
+}
+
+void set_cpu_freq(uint32_t cpu_freq_arg) {
+    cpu_freq = cpu_freq_arg;
+}
+
+
+void init_clocks(uint32_t cpu_freq) {
+
+    // SAMD21 Clock settings
+    // GCLK0: 48MHz from DFLL open loop mode or closed loop mode from 32k Crystal
+    // GCLK1: 32768 Hz from 32K ULP or 32k Crystal
+    // GCLK2: 48MHz from DFLL for Peripherals
+    // GCLK3: 1Mhz for the us-counter (TC4/TC5)
+    // GCLK8: 1kHz clock for WDT
+
+    NVMCTRL->CTRLB.bit.MANW = 1; // errata "Spurious Writes"
+    NVMCTRL->CTRLB.bit.RWS = 1; // 1 read wait state for 48MHz
+
+    #if MICROPY_HW_XOSC32K
+    // Set up OSC32K according datasheet 17.6.3
+    SYSCTRL->XOSC32K.reg = SYSCTRL_XOSC32K_STARTUP(0x3) | SYSCTRL_XOSC32K_EN32K |
+        SYSCTRL_XOSC32K_XTALEN;
+    SYSCTRL->XOSC32K.bit.ENABLE = 1;
+    while (SYSCTRL->PCLKSR.bit.XOSC32KRDY == 0) {
+    }
+    // Set up the DFLL48 according to the data sheet 17.6.7.1.2
+    // Step 1: Set up the reference clock
+    // Connect the OSC32K via GCLK1 to the DFLL input and for further use.
+    GCLK->GENDIV.reg = GCLK_GENDIV_ID(1) | GCLK_GENDIV_DIV(1);
+    GCLK->GENCTRL.reg = GCLK_GENCTRL_GENEN | GCLK_GENCTRL_SRC_XOSC32K | GCLK_GENCTRL_ID(1);
+    while (GCLK->STATUS.bit.SYNCBUSY) {
+    }
+    GCLK->CLKCTRL.reg = GCLK_CLKCTRL_ID_DFLL48 | GCLK_CLKCTRL_GEN_GCLK1 | GCLK_CLKCTRL_CLKEN;
+    // Enable access to the DFLLCTRL reg acc. to Errata 1.2.1
+    SYSCTRL->DFLLCTRL.reg = SYSCTRL_DFLLCTRL_ENABLE;
+    while (SYSCTRL->PCLKSR.bit.DFLLRDY == 0) {
+    }
+    // Step 2: Set the coarse and fine values.
+    // The coarse setting will be taken from the calibration data. So the value used here
+    // does not matter. Get the coarse value from the calib data. In case it is not set,
+    // set a midrange value.
+    uint32_t coarse = (*((uint32_t *)FUSES_DFLL48M_COARSE_CAL_ADDR) & FUSES_DFLL48M_COARSE_CAL_Msk)
+        >> FUSES_DFLL48M_COARSE_CAL_Pos;
+    if (coarse == 0x3f) {
+        coarse = 0x1f;
+    }
+    SYSCTRL->DFLLVAL.reg = SYSCTRL_DFLLVAL_COARSE(coarse) | SYSCTRL_DFLLVAL_FINE(512);
+    while (SYSCTRL->PCLKSR.bit.DFLLRDY == 0) {
+    }
+    // Step 3: Set the multiplication values. The offset of 16384 to the freq is for rounding.
+    SYSCTRL->DFLLMUL.reg = SYSCTRL_DFLLMUL_MUL((CPU_FREQ + 16384) / 32768) |
+        SYSCTRL_DFLLMUL_FSTEP(1) | SYSCTRL_DFLLMUL_CSTEP(1);
+    while (SYSCTRL->PCLKSR.bit.DFLLRDY == 0) {
+    }
+    // Step 4: Start the DFLL and wait for the PLL lock. We just wait for the fine lock, since
+    // coarse adjusting is bypassed.
+    SYSCTRL->DFLLCTRL.reg |= SYSCTRL_DFLLCTRL_MODE | SYSCTRL_DFLLCTRL_WAITLOCK |
+        SYSCTRL_DFLLCTRL_BPLCKC | SYSCTRL_DFLLCTRL_ENABLE;
+    while (SYSCTRL->PCLKSR.bit.DFLLLCKF == 0) {
+    }
+
+    #else // MICROPY_HW_XOSC32K
+
+    // Enable DFLL48M
+    SYSCTRL->DFLLCTRL.reg = SYSCTRL_DFLLCTRL_ENABLE;
+    while (!SYSCTRL->PCLKSR.bit.DFLLRDY) {
+    }
+    SYSCTRL->DFLLMUL.reg = SYSCTRL_DFLLMUL_CSTEP(1) | SYSCTRL_DFLLMUL_FSTEP(1)
+        | SYSCTRL_DFLLMUL_MUL(48000);
+    uint32_t coarse = (*((uint32_t *)FUSES_DFLL48M_COARSE_CAL_ADDR) & FUSES_DFLL48M_COARSE_CAL_Msk)
+        >> FUSES_DFLL48M_COARSE_CAL_Pos;
+    if (coarse == 0x3f) {
+        coarse = 0x1f;
+    }
+    SYSCTRL->DFLLVAL.reg = SYSCTRL_DFLLVAL_COARSE(coarse) | SYSCTRL_DFLLVAL_FINE(512);
+    SYSCTRL->DFLLCTRL.reg = SYSCTRL_DFLLCTRL_CCDIS | SYSCTRL_DFLLCTRL_USBCRM
+        | SYSCTRL_DFLLCTRL_MODE | SYSCTRL_DFLLCTRL_ENABLE;
+    while (!SYSCTRL->PCLKSR.bit.DFLLRDY) {
+    }
+    // Enable 32768 Hz on GCLK1 for consistency
+    GCLK->GENDIV.reg = GCLK_GENDIV_ID(1) | GCLK_GENDIV_DIV(48016384 / 32768);
+    GCLK->GENCTRL.reg = GCLK_GENCTRL_GENEN | GCLK_GENCTRL_SRC_DFLL48M | GCLK_GENCTRL_ID(1);
+    while (GCLK->STATUS.bit.SYNCBUSY) {
+    }
+
+    #endif // MICROPY_HW_XOSC32K
+
+    // Enable GCLK output: 48M on both CCLK0 and GCLK2
+    GCLK->GENDIV.reg = GCLK_GENDIV_ID(0) | GCLK_GENDIV_DIV(1);
+    GCLK->GENCTRL.reg = GCLK_GENCTRL_GENEN | GCLK_GENCTRL_SRC_DFLL48M | GCLK_GENCTRL_ID(0);
+    while (GCLK->STATUS.bit.SYNCBUSY) {
+    }
+    GCLK->GENDIV.reg = GCLK_GENDIV_ID(2) | GCLK_GENDIV_DIV(1);
+    GCLK->GENCTRL.reg = GCLK_GENCTRL_GENEN | GCLK_GENCTRL_SRC_DFLL48M | GCLK_GENCTRL_ID(2);
+    while (GCLK->STATUS.bit.SYNCBUSY) {
+    }
+
+    // Enable GCLK output: 1MHz on GCLK3 for TC4
+    GCLK->GENDIV.reg = GCLK_GENDIV_ID(3) | GCLK_GENDIV_DIV(48);
+    GCLK->GENCTRL.reg = GCLK_GENCTRL_GENEN | GCLK_GENCTRL_SRC_DFLL48M | GCLK_GENCTRL_ID(3);
+    while (GCLK->STATUS.bit.SYNCBUSY) {
+    }
+    // Set GCLK8 to 1 kHz.
+    GCLK->GENDIV.reg = GCLK_GENDIV_ID(8) | GCLK_GENDIV_DIV(32);
+    GCLK->GENCTRL.reg = GCLK_GENCTRL_GENEN | GCLK_GENCTRL_SRC_OSCULP32K | GCLK_GENCTRL_ID(8);
+    while (GCLK->STATUS.bit.SYNCBUSY) {
+    }
+}
+
+void enable_sercom_clock(int id) {
+    // Next: Set up the clocks
+    // Enable synchronous clock. The bits are nicely arranged
+    PM->APBCMASK.reg |= 0x04 << id;
+    // Select multiplexer generic clock source and enable.
+    GCLK->CLKCTRL.reg = GCLK_CLKCTRL_CLKEN | GCLK_CLKCTRL_GEN_GCLK2 | sercom_gclk_id[id];
+    // Wait while it updates synchronously.
+    while (GCLK->STATUS.bit.SYNCBUSY) {
+    }
+}
diff --git a/ports/samd/clock_config.c b/ports/samd/mcu/samd51/clock_config.c
similarity index 59%
rename from ports/samd/clock_config.c
rename to ports/samd/mcu/samd51/clock_config.c
index 0f5634fdb7373..3a3f40385f5d3 100644
--- a/ports/samd/clock_config.c
+++ b/ports/samd/mcu/samd51/clock_config.c
@@ -34,13 +34,6 @@
 static uint32_t cpu_freq = CPU_FREQ;
 static uint32_t apb_freq = APB_FREQ;
 
-#if defined(MCU_SAMD21)
-int sercom_gclk_id[] = {
-    GCLK_CLKCTRL_ID_SERCOM0_CORE, GCLK_CLKCTRL_ID_SERCOM1_CORE,
-    GCLK_CLKCTRL_ID_SERCOM2_CORE, GCLK_CLKCTRL_ID_SERCOM3_CORE,
-    GCLK_CLKCTRL_ID_SERCOM4_CORE, GCLK_CLKCTRL_ID_SERCOM5_CORE
-};
-#elif defined(MCU_SAMD51)
 int sercom_gclk_id[] = {
     SERCOM0_GCLK_ID_CORE, SERCOM1_GCLK_ID_CORE,
     SERCOM2_GCLK_ID_CORE, SERCOM3_GCLK_ID_CORE,
@@ -49,7 +42,6 @@ int sercom_gclk_id[] = {
     SERCOM6_GCLK_ID_CORE, SERCOM7_GCLK_ID_CORE,
     #endif
 };
-#endif
 
 uint32_t get_cpu_freq(void) {
     return cpu_freq;
@@ -59,12 +51,6 @@ uint32_t get_apb_freq(void) {
     return apb_freq;
 }
 
-#if defined(MCU_SAMD21)
-void set_cpu_freq(uint32_t cpu_freq_arg) {
-    cpu_freq = cpu_freq_arg;
-}
-
-#elif defined(MCU_SAMD51)
 void set_cpu_freq(uint32_t cpu_freq_arg) {
     cpu_freq = cpu_freq_arg;
 
@@ -97,113 +83,8 @@ void set_cpu_freq(uint32_t cpu_freq_arg) {
     while (GCLK->SYNCBUSY.bit.GENCTRL0) {
     }
 }
-#endif
 
 void init_clocks(uint32_t cpu_freq) {
-    #if defined(MCU_SAMD21)
-
-    // SAMD21 Clock settings
-    // GCLK0: 48MHz from DFLL open loop mode or closed loop mode from 32k Crystal
-    // GCLK1: 32768 Hz from 32K ULP or 32k Crystal
-    // GCLK2: 48MHz from DFLL for Peripherals
-    // GCLK3: 1Mhz for the us-counter (TC3/TC4)
-    // GCLK8: 1kHz clock for WDT
-
-    NVMCTRL->CTRLB.bit.MANW = 1; // errata "Spurious Writes"
-    NVMCTRL->CTRLB.bit.RWS = 1; // 1 read wait state for 48MHz
-
-    #if MICROPY_HW_XOSC32K
-    // Set up OSC32K according datasheet 17.6.3
-    SYSCTRL->XOSC32K.reg = SYSCTRL_XOSC32K_STARTUP(0x3) | SYSCTRL_XOSC32K_EN32K |
-        SYSCTRL_XOSC32K_XTALEN;
-    SYSCTRL->XOSC32K.bit.ENABLE = 1;
-    while (SYSCTRL->PCLKSR.bit.XOSC32KRDY == 0) {
-    }
-    // Set up the DFLL48 according to the data sheet 17.6.7.1.2
-    // Step 1: Set up the reference clock
-    // Connect the OSC32K via GCLK1 to the DFLL input and for further use.
-    GCLK->GENDIV.reg = GCLK_GENDIV_ID(1) | GCLK_GENDIV_DIV(1);
-    GCLK->GENCTRL.reg = GCLK_GENCTRL_GENEN | GCLK_GENCTRL_SRC_XOSC32K | GCLK_GENCTRL_ID(1);
-    while (GCLK->STATUS.bit.SYNCBUSY) {
-    }
-    GCLK->CLKCTRL.reg = GCLK_CLKCTRL_ID_DFLL48 | GCLK_CLKCTRL_GEN_GCLK1 | GCLK_CLKCTRL_CLKEN;
-    // Enable access to the DFLLCTRL reg acc. to Errata 1.2.1
-    SYSCTRL->DFLLCTRL.reg = SYSCTRL_DFLLCTRL_ENABLE;
-    while (SYSCTRL->PCLKSR.bit.DFLLRDY == 0) {
-    }
-    // Step 2: Set the coarse and fine values.
-    // The coarse setting will be taken from the calibration data. So the value used here
-    // does not matter. Get the coarse value from the calib data. In case it is not set,
-    // set a midrange value.
-    uint32_t coarse = (*((uint32_t *)FUSES_DFLL48M_COARSE_CAL_ADDR) & FUSES_DFLL48M_COARSE_CAL_Msk)
-        >> FUSES_DFLL48M_COARSE_CAL_Pos;
-    if (coarse == 0x3f) {
-        coarse = 0x1f;
-    }
-    SYSCTRL->DFLLVAL.reg = SYSCTRL_DFLLVAL_COARSE(coarse) | SYSCTRL_DFLLVAL_FINE(512);
-    while (SYSCTRL->PCLKSR.bit.DFLLRDY == 0) {
-    }
-    // Step 3: Set the multiplication values. The offset of 16384 to the freq is for rounding.
-    SYSCTRL->DFLLMUL.reg = SYSCTRL_DFLLMUL_MUL((CPU_FREQ + 16384) / 32768) |
-        SYSCTRL_DFLLMUL_FSTEP(1) | SYSCTRL_DFLLMUL_CSTEP(1);
-    while (SYSCTRL->PCLKSR.bit.DFLLRDY == 0) {
-    }
-    // Step 4: Start the DFLL and wait for the PLL lock. We just wait for the fine lock, since
-    // coarse adjusting is bypassed.
-    SYSCTRL->DFLLCTRL.reg |= SYSCTRL_DFLLCTRL_MODE | SYSCTRL_DFLLCTRL_WAITLOCK |
-        SYSCTRL_DFLLCTRL_BPLCKC | SYSCTRL_DFLLCTRL_ENABLE;
-    while (SYSCTRL->PCLKSR.bit.DFLLLCKF == 0) {
-    }
-
-    #else // MICROPY_HW_XOSC32K
-
-    // Enable DFLL48M
-    SYSCTRL->DFLLCTRL.reg = SYSCTRL_DFLLCTRL_ENABLE;
-    while (!SYSCTRL->PCLKSR.bit.DFLLRDY) {
-    }
-    SYSCTRL->DFLLMUL.reg = SYSCTRL_DFLLMUL_CSTEP(1) | SYSCTRL_DFLLMUL_FSTEP(1)
-        | SYSCTRL_DFLLMUL_MUL(48000);
-    uint32_t coarse = (*((uint32_t *)FUSES_DFLL48M_COARSE_CAL_ADDR) & FUSES_DFLL48M_COARSE_CAL_Msk)
-        >> FUSES_DFLL48M_COARSE_CAL_Pos;
-    if (coarse == 0x3f) {
-        coarse = 0x1f;
-    }
-    SYSCTRL->DFLLVAL.reg = SYSCTRL_DFLLVAL_COARSE(coarse) | SYSCTRL_DFLLVAL_FINE(512);
-    SYSCTRL->DFLLCTRL.reg = SYSCTRL_DFLLCTRL_CCDIS | SYSCTRL_DFLLCTRL_USBCRM
-        | SYSCTRL_DFLLCTRL_MODE | SYSCTRL_DFLLCTRL_ENABLE;
-    while (!SYSCTRL->PCLKSR.bit.DFLLRDY) {
-    }
-    // Enable 32768 Hz on GCLK1 for consistency
-    GCLK->GENDIV.reg = GCLK_GENDIV_ID(1) | GCLK_GENDIV_DIV(48016384 / 32768);
-    GCLK->GENCTRL.reg = GCLK_GENCTRL_GENEN | GCLK_GENCTRL_SRC_DFLL48M | GCLK_GENCTRL_ID(1);
-    while (GCLK->STATUS.bit.SYNCBUSY) {
-    }
-
-    #endif // MICROPY_HW_XOSC32K
-
-    // Enable GCLK output: 48M on both CCLK0 and GCLK2
-    GCLK->GENDIV.reg = GCLK_GENDIV_ID(0) | GCLK_GENDIV_DIV(1);
-    GCLK->GENCTRL.reg = GCLK_GENCTRL_GENEN | GCLK_GENCTRL_SRC_DFLL48M | GCLK_GENCTRL_ID(0);
-    while (GCLK->STATUS.bit.SYNCBUSY) {
-    }
-    GCLK->GENDIV.reg = GCLK_GENDIV_ID(2) | GCLK_GENDIV_DIV(1);
-    GCLK->GENCTRL.reg = GCLK_GENCTRL_GENEN | GCLK_GENCTRL_SRC_DFLL48M | GCLK_GENCTRL_ID(2);
-    while (GCLK->STATUS.bit.SYNCBUSY) {
-    }
-
-    // Enable GCLK output: 1MHz on GCLK3 for TC3
-    GCLK->GENDIV.reg = GCLK_GENDIV_ID(3) | GCLK_GENDIV_DIV(48);
-    GCLK->GENCTRL.reg = GCLK_GENCTRL_GENEN | GCLK_GENCTRL_SRC_DFLL48M | GCLK_GENCTRL_ID(3);
-    while (GCLK->STATUS.bit.SYNCBUSY) {
-    }
-    // Set GCLK8 to 1 kHz.
-    GCLK->GENDIV.reg = GCLK_GENDIV_ID(8) | GCLK_GENDIV_DIV(32);
-    GCLK->GENCTRL.reg = GCLK_GENCTRL_GENEN | GCLK_GENCTRL_SRC_OSCULP32K | GCLK_GENCTRL_ID(8);
-    while (GCLK->STATUS.bit.SYNCBUSY) {
-    }
-
-    #elif defined(MCU_SAMD51)
-
     // SAMD51 clock settings
     // GCLK0: 48MHz from DFLL48M or 48 - 200 MHz from DPLL0 (SAMD51)
     // GCLK1: DPLLx_REF_FREQ 32768 Hz from 32KULP or 32k Crystal
@@ -299,21 +180,10 @@ void init_clocks(uint32_t cpu_freq) {
     GCLK->GENCTRL[3].reg = GCLK_GENCTRL_DIV(6) | GCLK_GENCTRL_RUNSTDBY | GCLK_GENCTRL_GENEN | GCLK_GENCTRL_SRC_DFLL;
     while (GCLK->SYNCBUSY.bit.GENCTRL3) {
     }
-
-    #endif // defined(MCU_SAMD51)
 }
 
 void enable_sercom_clock(int id) {
     // Next: Set up the clocks
-    #if defined(MCU_SAMD21)
-    // Enable synchronous clock. The bits are nicely arranged
-    PM->APBCMASK.reg |= 0x04 << id;
-    // Select multiplexer generic clock source and enable.
-    GCLK->CLKCTRL.reg = GCLK_CLKCTRL_CLKEN | GCLK_CLKCTRL_GEN_GCLK2 | sercom_gclk_id[id];
-    // Wait while it updates synchronously.
-    while (GCLK->STATUS.bit.SYNCBUSY) {
-    }
-    #elif defined(MCU_SAMD51)
     GCLK->PCHCTRL[sercom_gclk_id[id]].reg = GCLK_PCHCTRL_CHEN | GCLK_PCHCTRL_GEN_GCLK2;
     // no easy way to set the clocks, except enabling all of them
     switch (id) {
@@ -344,5 +214,4 @@ void enable_sercom_clock(int id) {
             break;
         #endif
     }
-    #endif
 }

From 20e7313453b34778df7cddbe3bc6bd72d3b737d7 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Wed, 15 Jun 2022 18:58:02 +0200
Subject: [PATCH 2714/3533] samd/clock_config: Add HW_DFLL_USB_SYNC and
 HW_MCU_OSC32KULP extensions.

Two new compile flags are:

MICROPY_HW_DFLL_USB_SYNC: Effective only if DFLL48 does not run from the
crystal.  It will synchronize the DFLL48M clock with the USB's SOF pulse.
If no USB is connected, it will fall back to open loop mode.  The DFLL48M
clock is then pretty precise, but with a higher clock jitter at SAMD51
devices.

MICROPY_HW_MCU_OSC32KULP: Effective only if the devics uses a crystal as
clock source.  Run the MCU clock from the ULP 32kHz oszillator instead of
the crystal.  This flag was added to cater for a interference problem of
the crystal and Neopixel/Debug pins at Adafruit FEATHER Mx boards, which
causes the board to crash.  Drawback: ticks_ms() and time.time() vs. than
ticks_us() and the peripherals like PWM run at not synchronous clocks.
---
 .../mpconfigboard.h                           |  3 +-
 .../mpconfigboard.h                           |  2 +
 .../mpconfigboard.h                           |  2 +
 ports/samd/clock_config.h                     |  1 +
 ports/samd/mcu/samd21/clock_config.c          | 68 +++++++++++++---
 ports/samd/mcu/samd51/clock_config.c          | 78 +++++++++++++++++--
 ports/samd/samd_soc.c                         |  1 +
 7 files changed, 137 insertions(+), 18 deletions(-)

diff --git a/ports/samd/boards/ADAFRUIT_FEATHER_M4_EXPRESS/mpconfigboard.h b/ports/samd/boards/ADAFRUIT_FEATHER_M4_EXPRESS/mpconfigboard.h
index 35945395fcc0d..b78c003b19a5d 100644
--- a/ports/samd/boards/ADAFRUIT_FEATHER_M4_EXPRESS/mpconfigboard.h
+++ b/ports/samd/boards/ADAFRUIT_FEATHER_M4_EXPRESS/mpconfigboard.h
@@ -1,4 +1,5 @@
 #define MICROPY_HW_BOARD_NAME "Feather M4 Express"
 #define MICROPY_HW_MCU_NAME   "SAMD51J19A"
 
-#define MICROPY_HW_XOSC32K  (1)
+#define MICROPY_HW_XOSC32K          (1)
+#define MICROPY_HW_MCU_OSC32KULP    (1)
diff --git a/ports/samd/boards/ADAFRUIT_ITSYBITSY_M0_EXPRESS/mpconfigboard.h b/ports/samd/boards/ADAFRUIT_ITSYBITSY_M0_EXPRESS/mpconfigboard.h
index d647af9312eda..160c61ea2aaae 100644
--- a/ports/samd/boards/ADAFRUIT_ITSYBITSY_M0_EXPRESS/mpconfigboard.h
+++ b/ports/samd/boards/ADAFRUIT_ITSYBITSY_M0_EXPRESS/mpconfigboard.h
@@ -1,2 +1,4 @@
 #define MICROPY_HW_BOARD_NAME "ItsyBitsy M0 Express"
 #define MICROPY_HW_MCU_NAME   "SAMD21G18A"
+
+#define MICROPY_HW_DFLL_USB_SYNC    (1)
diff --git a/ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/mpconfigboard.h b/ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/mpconfigboard.h
index 2fffc9c7de28a..f53481d631917 100644
--- a/ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/mpconfigboard.h
+++ b/ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/mpconfigboard.h
@@ -1,2 +1,4 @@
 #define MICROPY_HW_BOARD_NAME "ItsyBitsy M4 Express"
 #define MICROPY_HW_MCU_NAME   "SAMD51G19A"
+
+#define MICROPY_HW_DFLL_USB_SYNC    (1)
diff --git a/ports/samd/clock_config.h b/ports/samd/clock_config.h
index 0e7a9e3280ec3..6e48b286f4989 100644
--- a/ports/samd/clock_config.h
+++ b/ports/samd/clock_config.h
@@ -30,4 +30,5 @@ void init_clocks(uint32_t cpu_freq);
 void set_cpu_freq(uint32_t cpu_freq);
 uint32_t get_cpu_freq(void);
 uint32_t get_apb_freq(void);
+void check_usb_recovery_mode(void);
 void enable_sercom_clock(int id);
diff --git a/ports/samd/mcu/samd21/clock_config.c b/ports/samd/mcu/samd21/clock_config.c
index 3d189d67e18ca..e330d7ba6af23 100644
--- a/ports/samd/mcu/samd21/clock_config.c
+++ b/ports/samd/mcu/samd21/clock_config.c
@@ -29,10 +29,12 @@
 #include <stdint.h>
 
 #include "py/runtime.h"
+#include "py/mphal.h"
 #include "samd_soc.h"
 
 static uint32_t cpu_freq = CPU_FREQ;
 static uint32_t apb_freq = APB_FREQ;
+static uint32_t dfll48m_calibration;
 
 int sercom_gclk_id[] = {
     GCLK_CLKCTRL_ID_SERCOM0_CORE, GCLK_CLKCTRL_ID_SERCOM1_CORE,
@@ -52,14 +54,28 @@ void set_cpu_freq(uint32_t cpu_freq_arg) {
     cpu_freq = cpu_freq_arg;
 }
 
+void check_usb_recovery_mode(void) {
+    #if !MICROPY_HW_XOSC32K
+    mp_hal_delay_ms(500);
+    // Check USB status. If not connected, switch DFLL48M back to open loop
+    if (USB->DEVICE.DeviceEndpoint[0].EPCFG.reg == 0) {
+        // Set/keep the open loop mode of the device.
+        SYSCTRL->DFLLVAL.reg = dfll48m_calibration;
+        SYSCTRL->DFLLCTRL.reg = SYSCTRL_DFLLCTRL_CCDIS | SYSCTRL_DFLLCTRL_ENABLE;
+    }
+    #endif // MICROPY_HW_XOSC32K
+}
 
 void init_clocks(uint32_t cpu_freq) {
 
+    dfll48m_calibration = 0; // please the compiler
+
     // SAMD21 Clock settings
     // GCLK0: 48MHz from DFLL open loop mode or closed loop mode from 32k Crystal
-    // GCLK1: 32768 Hz from 32K ULP or 32k Crystal
+    // GCLK1: 32768 Hz from 32K ULP or DFLL48M
     // GCLK2: 48MHz from DFLL for Peripherals
     // GCLK3: 1Mhz for the us-counter (TC4/TC5)
+    // GCLK4: 32kHz from crystal, if present
     // GCLK8: 1kHz clock for WDT
 
     NVMCTRL->CTRLB.bit.MANW = 1; // errata "Spurious Writes"
@@ -74,19 +90,34 @@ void init_clocks(uint32_t cpu_freq) {
     }
     // Set up the DFLL48 according to the data sheet 17.6.7.1.2
     // Step 1: Set up the reference clock
-    // Connect the OSC32K via GCLK1 to the DFLL input and for further use.
+
+    #if MICROPY_HW_MCU_OSC32KULP
+    // Connect the GCLK1 to the XOSC32KULP
+    GCLK->GENDIV.reg = GCLK_GENDIV_ID(1) | GCLK_GENDIV_DIV(1);
+    GCLK->GENCTRL.reg = GCLK_GENCTRL_GENEN | GCLK_GENCTRL_SRC_OSCULP32K | GCLK_GENCTRL_ID(1);
+    #else
+    // Connect the GCLK1 to OSC32K via GCLK1 to the DFLL input and for further use.
     GCLK->GENDIV.reg = GCLK_GENDIV_ID(1) | GCLK_GENDIV_DIV(1);
     GCLK->GENCTRL.reg = GCLK_GENCTRL_GENEN | GCLK_GENCTRL_SRC_XOSC32K | GCLK_GENCTRL_ID(1);
+    #endif
+
     while (GCLK->STATUS.bit.SYNCBUSY) {
     }
-    GCLK->CLKCTRL.reg = GCLK_CLKCTRL_ID_DFLL48 | GCLK_CLKCTRL_GEN_GCLK1 | GCLK_CLKCTRL_CLKEN;
+
+    // Connect the GCLK4 to OSC32K via GCLK1 to the DFLL input and for further use.
+    GCLK->GENDIV.reg = GCLK_GENDIV_ID(4) | GCLK_GENDIV_DIV(1);
+    GCLK->GENCTRL.reg = GCLK_GENCTRL_GENEN | GCLK_GENCTRL_SRC_XOSC32K | GCLK_GENCTRL_ID(4);
+    while (GCLK->STATUS.bit.SYNCBUSY) {
+    }
+
+    // Connect GCLK4 to the DFLL input and for further use.
+    GCLK->CLKCTRL.reg = GCLK_CLKCTRL_ID_DFLL48 | GCLK_CLKCTRL_GEN_GCLK4 | GCLK_CLKCTRL_CLKEN;
     // Enable access to the DFLLCTRL reg acc. to Errata 1.2.1
     SYSCTRL->DFLLCTRL.reg = SYSCTRL_DFLLCTRL_ENABLE;
     while (SYSCTRL->PCLKSR.bit.DFLLRDY == 0) {
     }
     // Step 2: Set the coarse and fine values.
-    // The coarse setting will be taken from the calibration data. So the value used here
-    // does not matter. Get the coarse value from the calib data. In case it is not set,
+    // Get the coarse value from the calib data. In case it is not set,
     // set a midrange value.
     uint32_t coarse = (*((uint32_t *)FUSES_DFLL48M_COARSE_CAL_ADDR) & FUSES_DFLL48M_COARSE_CAL_Msk)
         >> FUSES_DFLL48M_COARSE_CAL_Pos;
@@ -103,7 +134,7 @@ void init_clocks(uint32_t cpu_freq) {
     }
     // Step 4: Start the DFLL and wait for the PLL lock. We just wait for the fine lock, since
     // coarse adjusting is bypassed.
-    SYSCTRL->DFLLCTRL.reg |= SYSCTRL_DFLLCTRL_MODE | SYSCTRL_DFLLCTRL_WAITLOCK |
+    SYSCTRL->DFLLCTRL.reg |= SYSCTRL_DFLLCTRL_MODE | SYSCTRL_DFLLCTRL_WAITLOCK | SYSCTRL_DFLLCTRL_STABLE |
         SYSCTRL_DFLLCTRL_BPLCKC | SYSCTRL_DFLLCTRL_ENABLE;
     while (SYSCTRL->PCLKSR.bit.DFLLLCKF == 0) {
     }
@@ -114,18 +145,33 @@ void init_clocks(uint32_t cpu_freq) {
     SYSCTRL->DFLLCTRL.reg = SYSCTRL_DFLLCTRL_ENABLE;
     while (!SYSCTRL->PCLKSR.bit.DFLLRDY) {
     }
-    SYSCTRL->DFLLMUL.reg = SYSCTRL_DFLLMUL_CSTEP(1) | SYSCTRL_DFLLMUL_FSTEP(1)
-        | SYSCTRL_DFLLMUL_MUL(48000);
+
     uint32_t coarse = (*((uint32_t *)FUSES_DFLL48M_COARSE_CAL_ADDR) & FUSES_DFLL48M_COARSE_CAL_Msk)
         >> FUSES_DFLL48M_COARSE_CAL_Pos;
     if (coarse == 0x3f) {
         coarse = 0x1f;
     }
-    SYSCTRL->DFLLVAL.reg = SYSCTRL_DFLLVAL_COARSE(coarse) | SYSCTRL_DFLLVAL_FINE(512);
-    SYSCTRL->DFLLCTRL.reg = SYSCTRL_DFLLCTRL_CCDIS | SYSCTRL_DFLLCTRL_USBCRM
+    SYSCTRL->DFLLVAL.reg = SYSCTRL_DFLLVAL_COARSE(coarse) | SYSCTRL_DFLLVAL_FINE(511);
+
+    #if MICROPY_HW_DFLL_USB_SYNC
+    // Configure the DFLL48M for USB clock recovery.
+    // Will have to switch back if no USB
+    SYSCTRL->DFLLSYNC.bit.READREQ = 1;
+    dfll48m_calibration = SYSCTRL->DFLLVAL.reg;
+    // Set the Multiplication factor.
+    SYSCTRL->DFLLMUL.reg = SYSCTRL_DFLLMUL_CSTEP(1) | SYSCTRL_DFLLMUL_FSTEP(1)
+        | SYSCTRL_DFLLMUL_MUL(48000);
+    // Set the mode to closed loop USB Recovery mode
+    SYSCTRL->DFLLCTRL.reg = SYSCTRL_DFLLCTRL_USBCRM | SYSCTRL_DFLLCTRL_CCDIS
         | SYSCTRL_DFLLCTRL_MODE | SYSCTRL_DFLLCTRL_ENABLE;
+    #else
+    // Set/keep the open loop mode of the device.
+    SYSCTRL->DFLLCTRL.reg = SYSCTRL_DFLLCTRL_CCDIS | SYSCTRL_DFLLCTRL_ENABLE;
+    #endif
+
     while (!SYSCTRL->PCLKSR.bit.DFLLRDY) {
     }
+
     // Enable 32768 Hz on GCLK1 for consistency
     GCLK->GENDIV.reg = GCLK_GENDIV_ID(1) | GCLK_GENDIV_DIV(48016384 / 32768);
     GCLK->GENCTRL.reg = GCLK_GENCTRL_GENEN | GCLK_GENCTRL_SRC_DFLL48M | GCLK_GENCTRL_ID(1);
@@ -154,10 +200,10 @@ void init_clocks(uint32_t cpu_freq) {
     GCLK->GENCTRL.reg = GCLK_GENCTRL_GENEN | GCLK_GENCTRL_SRC_OSCULP32K | GCLK_GENCTRL_ID(8);
     while (GCLK->STATUS.bit.SYNCBUSY) {
     }
+
 }
 
 void enable_sercom_clock(int id) {
-    // Next: Set up the clocks
     // Enable synchronous clock. The bits are nicely arranged
     PM->APBCMASK.reg |= 0x04 << id;
     // Select multiplexer generic clock source and enable.
diff --git a/ports/samd/mcu/samd51/clock_config.c b/ports/samd/mcu/samd51/clock_config.c
index 3a3f40385f5d3..62c05193dd8b6 100644
--- a/ports/samd/mcu/samd51/clock_config.c
+++ b/ports/samd/mcu/samd51/clock_config.c
@@ -29,10 +29,12 @@
 #include <stdint.h>
 
 #include "py/runtime.h"
+#include "py/mphal.h"
 #include "samd_soc.h"
 
 static uint32_t cpu_freq = CPU_FREQ;
 static uint32_t apb_freq = APB_FREQ;
+static uint32_t dfll48m_calibration;
 
 int sercom_gclk_id[] = {
     SERCOM0_GCLK_ID_CORE, SERCOM1_GCLK_ID_CORE,
@@ -84,12 +86,43 @@ void set_cpu_freq(uint32_t cpu_freq_arg) {
     }
 }
 
+void check_usb_recovery_mode(void) {
+    #if !MICROPY_HW_XOSC32K
+    mp_hal_delay_ms(500);
+    // Check USB status. If not connected, switch DFLL48M back to open loop
+    if (USB->DEVICE.DeviceEndpoint[0].EPCFG.reg == 0) {
+        // as per Errata 2.8.3
+        OSCCTRL->DFLLMUL.reg = 0;
+        while (OSCCTRL->DFLLSYNC.bit.DFLLMUL == 1) {
+        }
+        // Set the mode to open loop mode
+        OSCCTRL->DFLLCTRLB.reg = 0;
+        while (OSCCTRL->DFLLSYNC.bit.DFLLCTRLB == 1) {
+        }
+        OSCCTRL->DFLLCTRLA.reg = OSCCTRL_DFLLCTRLA_RUNSTDBY | OSCCTRL_DFLLCTRLA_ENABLE;
+        while (OSCCTRL->DFLLSYNC.bit.ENABLE == 1) {
+        }
+        OSCCTRL->DFLLVAL.reg = dfll48m_calibration; // Reload DFLLVAL register
+        while (OSCCTRL->DFLLSYNC.bit.DFLLVAL == 1) {
+        }
+        // Set the mode to open loop mode
+        OSCCTRL->DFLLCTRLB.reg = 0;
+        while (OSCCTRL->DFLLSYNC.bit.DFLLCTRLB == 1) {
+        }
+    }
+    #endif // MICROPY_HW_XOSC32K
+}
+
 void init_clocks(uint32_t cpu_freq) {
+
+    dfll48m_calibration = 0; // please the compiler
+
     // SAMD51 clock settings
     // GCLK0: 48MHz from DFLL48M or 48 - 200 MHz from DPLL0 (SAMD51)
-    // GCLK1: DPLLx_REF_FREQ 32768 Hz from 32KULP or 32k Crystal
+    // GCLK1: 32768 Hz from 32KULP or DFLL48M
     // GCLK2: 48MHz from DFLL48M for Peripheral devices
     // GCLK3: 16Mhz for the us-counter (TC0/TC1)
+    // GCLK4: 32kHz from crystal, if present
     // DPLL0: 48 - 200 MHz
 
     // Steps to set up clocks:
@@ -102,6 +135,7 @@ void init_clocks(uint32_t cpu_freq) {
     // Setup GCLK0 to 120MHz
     // Setup GCLK2 to 48MHz for Peripherals
     // Setup GCLK3 to 8MHz for TC0/TC1
+    // Setup GCLK4 to 32kHz crystal, if present
 
     // Setup GCLK0 for 48MHz as default state to keep the MCU running during config change.
     GCLK->GENCTRL[0].reg = GCLK_GENCTRL_RUNSTDBY | GCLK_GENCTRL_GENEN | GCLK_GENCTRL_SRC_DFLL;
@@ -124,15 +158,26 @@ void init_clocks(uint32_t cpu_freq) {
     while (OSC32KCTRL->STATUS.bit.XOSC32KRDY == 0) {
     }
 
+    #if MICROPY_HW_MCU_OSC32KULP
+    // Setup GCLK1 for 32kHz ULP
+    GCLK->GENCTRL[1].reg = GCLK_GENCTRL_RUNSTDBY | GCLK_GENCTRL_GENEN | GCLK_GENCTRL_SRC_OSCULP32K;
+    #else
     // Setup GCLK1 for 32kHz crystal
     GCLK->GENCTRL[1].reg = GCLK_GENCTRL_RUNSTDBY | GCLK_GENCTRL_GENEN | GCLK_GENCTRL_SRC_XOSC32K;
+    #endif
+
     while (GCLK->SYNCBUSY.bit.GENCTRL1) {
     }
 
+    // Setup GCLK4 for 32kHz crystal
+    GCLK->GENCTRL[4].reg = GCLK_GENCTRL_RUNSTDBY | GCLK_GENCTRL_GENEN | GCLK_GENCTRL_SRC_XOSC32K;
+    while (GCLK->SYNCBUSY.bit.GENCTRL4) {
+    }
+
     // Set-up the DFLL48M in closed loop mode with input from the 32kHz crystal
 
-    // Step 1: Peripheral channel 0 is driven by GCLK1 and it feeds DFLL48M
-    GCLK->PCHCTRL[0].reg = GCLK_PCHCTRL_GEN_GCLK1 | GCLK_PCHCTRL_CHEN;
+    // Step 1: Peripheral channel 0 is driven by GCLK4 and it feeds DFLL48M
+    GCLK->PCHCTRL[0].reg = GCLK_PCHCTRL_GEN_GCLK4 | GCLK_PCHCTRL_CHEN;
     while (GCLK->PCHCTRL[0].bit.CHEN == 0) {
     }
     // Step 2: Set the multiplication values. The offset of 16384 to the freq is for rounding.
@@ -141,7 +186,7 @@ void init_clocks(uint32_t cpu_freq) {
     while (OSCCTRL->DFLLSYNC.bit.DFLLMUL == 1) {
     }
     // Step 3: Set the mode to closed loop
-    OSCCTRL->DFLLCTRLB.reg = OSCCTRL_DFLLCTRLB_BPLCKC | OSCCTRL_DFLLCTRLB_MODE;
+    OSCCTRL->DFLLCTRLB.reg = OSCCTRL_DFLLCTRLB_BPLCKC | OSCCTRL_DFLLCTRLB_STABLE | OSCCTRL_DFLLCTRLB_MODE;
     while (OSCCTRL->DFLLSYNC.bit.DFLLCTRLB == 1) {
     }
     // Wait for lock fine
@@ -154,12 +199,34 @@ void init_clocks(uint32_t cpu_freq) {
 
     #else // MICROPY_HW_XOSC32K
 
-    // Set GCLK1 to DPLL0_REF_FREQ as defined in mpconfigboard.h (e.g. 32768 Hz)
+    // Derive GCLK1 from DFLL48M at DPLL0_REF_FREQ as defined in mpconfigboard.h (e.g. 32768 Hz)
     GCLK->GENCTRL[1].reg = ((APB_FREQ + DPLLx_REF_FREQ / 2) / DPLLx_REF_FREQ) << GCLK_GENCTRL_DIV_Pos
         | GCLK_GENCTRL_GENEN | GCLK_GENCTRL_SRC_DFLL;
     while (GCLK->SYNCBUSY.bit.GENCTRL1) {
     }
 
+    OSCCTRL->DFLLCTRLA.bit.RUNSTDBY = 1;
+    OSCCTRL->DFLLCTRLA.bit.ONDEMAND = 0;
+
+    OSCCTRL->DFLLCTRLA.bit.ENABLE = 1;
+    while (OSCCTRL->DFLLSYNC.bit.ENABLE == 1) {
+    }
+
+    #if MICROPY_HW_DFLL_USB_SYNC
+    // Configure the DFLL48M for USB clock recovery.
+    // Will have to switch back if no USB
+    dfll48m_calibration = OSCCTRL->DFLLVAL.reg;
+    // Set the Multiplication factor.
+    OSCCTRL->DFLLMUL.reg = OSCCTRL_DFLLMUL_MUL(48000) |
+        OSCCTRL_DFLLMUL_FSTEP(1) | OSCCTRL_DFLLMUL_CSTEP(1);
+    while (OSCCTRL->DFLLSYNC.bit.DFLLMUL == 1) {
+    }
+    // Set the mode to closed loop USB Recovery
+    OSCCTRL->DFLLCTRLB.reg = OSCCTRL_DFLLCTRLB_USBCRM | OSCCTRL_DFLLCTRLB_CCDIS | OSCCTRL_DFLLCTRLB_MODE;
+    while (OSCCTRL->DFLLSYNC.bit.DFLLCTRLB == 1) {
+    }
+    #endif
+
     #endif // MICROPY_HW_XOSC32K
 
     // Peripheral channel 1 is driven by GCLK1 and it feeds DPLL0
@@ -183,7 +250,6 @@ void init_clocks(uint32_t cpu_freq) {
 }
 
 void enable_sercom_clock(int id) {
-    // Next: Set up the clocks
     GCLK->PCHCTRL[sercom_gclk_id[id]].reg = GCLK_PCHCTRL_CHEN | GCLK_PCHCTRL_GEN_GCLK2;
     // no easy way to set the clocks, except enabling all of them
     switch (id) {
diff --git a/ports/samd/samd_soc.c b/ports/samd/samd_soc.c
index d0df4a7e28cc1..f4a27f3df740b 100644
--- a/ports/samd/samd_soc.c
+++ b/ports/samd/samd_soc.c
@@ -111,6 +111,7 @@ void samd_init(void) {
     SysTick_Config(get_cpu_freq() / 1000);
     init_us_counter();
     usb_init();
+    check_usb_recovery_mode();
     #if defined(MCU_SAMD51)
     mp_hal_ticks_cpu_enable();
     #endif

From 85fb8b8b027d0af560a2b74e5bd4a0554600f6bd Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Thu, 16 Jun 2022 11:32:21 +0200
Subject: [PATCH 2715/3533] samd/pin_af: Simplify the pin-af-table handling.

Changes are:
- The pin-af-table-SAMDxx.csv file are moved to the mcu directories with
  the name as pin-af-table.csv.
- The handling in Makefile and pin_af.c is simplified.
---
 ports/samd/Makefile                                       | 3 +--
 .../samd21/pin-af-table.csv}                              | 8 ++++----
 .../samd51/pin-af-table.csv}                              | 0
 ports/samd/pin_af.c                                       | 2 +-
 4 files changed, 6 insertions(+), 7 deletions(-)
 rename ports/samd/{boards/pin-af-table-SAMD21.csv => mcu/samd21/pin-af-table.csv} (95%)
 rename ports/samd/{boards/pin-af-table-SAMD51.csv => mcu/samd51/pin-af-table.csv} (100%)

diff --git a/ports/samd/Makefile b/ports/samd/Makefile
index 8d49778b3bcc8..9a03502abcdd4 100644
--- a/ports/samd/Makefile
+++ b/ports/samd/Makefile
@@ -48,7 +48,7 @@ INC += -I$(TOP)/lib/asf4/$(MCU_SERIES_LOWER)/include/pio
 INC += -I$(TOP)/lib/tinyusb/src
 
 MAKE_PIN_AF = boards/make-pin-af.py
-PIN_AF_TABLE_CSV = boards/pin-af-table-$(MCU_SERIES).csv
+PIN_AF_TABLE_CSV = mcu/$(MCU_SERIES_LOWER)/pin-af-table.csv
 GEN_PIN_AF = pin_af_table.c
 
 MAKE_PINS = boards/make-pins.py
@@ -62,7 +62,6 @@ CFLAGS = $(INC) -Wall -Werror -std=c99 -nostdlib -mthumb $(CFLAGS_MCU_$(MCU_SERI
 CFLAGS += -DMCU_$(MCU_SERIES) -D__$(CMSIS_MCU)__
 CFLAGS += $(CFLAGS_MOD) $(CFLAGS_EXTRA)
 CFLAGS += -DMPCONFIG_MCU_H='<boards/mpconfig_$(MCU_SERIES_LOWER).h>'
-CFLAGS += -DPIN_AF_TABLE_C='<$(BUILD)/$(GEN_PIN_AF)>'
 
 LDFLAGS = -nostdlib $(addprefix -T,$(LD_FILES)) -Map=$@.map --cref
 LDFLAGS += $(LDFLAGS_MOD)
diff --git a/ports/samd/boards/pin-af-table-SAMD21.csv b/ports/samd/mcu/samd21/pin-af-table.csv
similarity index 95%
rename from ports/samd/boards/pin-af-table-SAMD21.csv
rename to ports/samd/mcu/samd21/pin-af-table.csv
index d8ab903c9e7c4..6445d148b8fae 100644
--- a/ports/samd/boards/pin-af-table-SAMD21.csv
+++ b/ports/samd/mcu/samd21/pin-af-table.csv
@@ -59,7 +59,7 @@ pa30,10,,,12,10,
 pa31,11,,,13,11,
 pb30,14,,,50,00,12
 pb31,15,,,51,01,13
-pb00,0,,,52,70,
-pb01,1,,,53,71,
-pb02,2,,,50,60,
-pb03,3,,,51,61,
+pb00,0,8,,52,70,
+pb01,1,9,,53,71,
+pb02,2,10,,50,60,
+pb03,3,11,,51,61,
diff --git a/ports/samd/boards/pin-af-table-SAMD51.csv b/ports/samd/mcu/samd51/pin-af-table.csv
similarity index 100%
rename from ports/samd/boards/pin-af-table-SAMD51.csv
rename to ports/samd/mcu/samd51/pin-af-table.csv
diff --git a/ports/samd/pin_af.c b/ports/samd/pin_af.c
index 8c152e0d8be02..926c4ae0c23aa 100644
--- a/ports/samd/pin_af.c
+++ b/ports/samd/pin_af.c
@@ -38,7 +38,7 @@
 
 extern const uint8_t tcc_channel_count[];
 
-#include PIN_AF_TABLE_C
+#include "pin_af_table.c"
 
 // Just look for an table entry for a given pin and raise an error
 // in case of no match (which should not happen).

From 560170de024353354b4bcd1682392f2bb282c12d Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Tue, 21 Jun 2022 18:00:51 +0200
Subject: [PATCH 2716/3533] samd/samd_flash: Remove obsolete printf's and
 return values instead.

Returning values is much more useful.
---
 ports/samd/samd_flash.c | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/ports/samd/samd_flash.c b/ports/samd/samd_flash.c
index 522522ef84738..2fffd614f9720 100644
--- a/ports/samd/samd_flash.c
+++ b/ports/samd/samd_flash.c
@@ -96,21 +96,17 @@ STATIC mp_obj_t eraseblock(uint32_t sector_in) {
 }
 
 STATIC mp_obj_t samd_flash_version(void) {
-    printf("Flash Driver Version: %lu\n", flash_get_version());
-    return mp_const_none;
+    return MP_OBJ_NEW_SMALL_INT(flash_get_version());
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_0(samd_flash_version_obj, samd_flash_version);
-STATIC MP_DEFINE_CONST_STATICMETHOD_OBJ(samd_flash_version_static_obj, MP_ROM_PTR(&samd_flash_version_obj));
 
 STATIC mp_obj_t samd_flash_size(void) {
     // ASF4 API calls
     mp_int_t PAGES = flash_get_total_pages(&flash_desc);
     mp_int_t PAGE_SIZE = flash_get_page_size(&flash_desc);
-    printf("Flash Size: %u Bytes\n",  PAGES * PAGE_SIZE);
-    return mp_const_none;
+    return MP_OBJ_NEW_SMALL_INT(PAGES * PAGE_SIZE);
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_0(samd_flash_size_obj, samd_flash_size);
-STATIC MP_DEFINE_CONST_STATICMETHOD_OBJ(samd_flash_size_static_obj, MP_ROM_PTR(&samd_flash_size_obj));
 
 STATIC mp_obj_t samd_flash_readblocks(size_t n_args, const mp_obj_t *args) {
     uint32_t offset = (mp_obj_get_int(args[1]) * BLOCK_SIZE) + samd_flash_obj.flash_base;
@@ -172,8 +168,8 @@ STATIC mp_obj_t samd_flash_ioctl(mp_obj_t self_in, mp_obj_t cmd_in, mp_obj_t arg
 STATIC MP_DEFINE_CONST_FUN_OBJ_3(samd_flash_ioctl_obj, samd_flash_ioctl);
 
 STATIC const mp_rom_map_elem_t samd_flash_locals_dict_table[] = {
-    { MP_ROM_QSTR(MP_QSTR_flash_version), MP_ROM_PTR(&samd_flash_version_static_obj) },
-    { MP_ROM_QSTR(MP_QSTR_flash_size), MP_ROM_PTR(&samd_flash_size_static_obj) },
+    { MP_ROM_QSTR(MP_QSTR_flash_version), MP_ROM_PTR(&samd_flash_version_obj) },
+    { MP_ROM_QSTR(MP_QSTR_flash_size), MP_ROM_PTR(&samd_flash_size_obj) },
     { MP_ROM_QSTR(MP_QSTR_flash_init), MP_ROM_PTR(&samd_flash_init_obj) },
     { MP_ROM_QSTR(MP_QSTR_readblocks), MP_ROM_PTR(&samd_flash_readblocks_obj) },
     { MP_ROM_QSTR(MP_QSTR_writeblocks), MP_ROM_PTR(&samd_flash_writeblocks_obj) },

From b0017304625b5d33bea548166b010bd2c3bf465d Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Fri, 24 Jun 2022 08:27:23 +0200
Subject: [PATCH 2717/3533] samd/Makefile: Fix a dependency problem with "make
 -j".

The build directory was not created before attempting to create the
generated files in it.
---
 ports/samd/Makefile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/ports/samd/Makefile b/ports/samd/Makefile
index 9a03502abcdd4..d8ca0f8ba6980 100644
--- a/ports/samd/Makefile
+++ b/ports/samd/Makefile
@@ -194,12 +194,13 @@ $(BUILD)/firmware.uf2: $(BUILD)/firmware.bin
 
 pin_af.c: $(BUILD)/$(GEN_PIN_AF)
 
-$(BUILD)/$(GEN_PIN_AF): $(PIN_AF_TABLE_CSV)
+$(BUILD)/$(GEN_PIN_AF): $(PIN_AF_TABLE_CSV) | $(HEADER_BUILD)
 	$(ECHO) "Create $@"
 	$(Q)$(PYTHON) $(MAKE_PIN_AF) --csv $(PIN_AF_TABLE_CSV) --table $(BUILD)/$(GEN_PIN_AF) --mcu $(MCU_SERIES)
 
+machine_led.c machine_pin.c modsamd.c: $(GEN_PINS_HDR)
 
-$(GEN_PINS_SRC): $(BOARD_PINS)
+$(GEN_PINS_SRC) $(GEN_PINS_HDR): $(BOARD_PINS) | $(HEADER_BUILD)
 	$(ECHO) "Create $@"
 	$(Q)$(PYTHON) $(MAKE_PINS) --board $(BOARD_PINS) --pins $(GEN_PINS_SRC) --inc $(GEN_PINS_HDR)
 

From e9a76310ec567dd94712a92876ca150bac43f103 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Tue, 28 Jun 2022 16:59:01 +0200
Subject: [PATCH 2718/3533] samd/mphalport: Fix USB endpoint handling ignoring
 Ctrl-C.

Porting PR #8040 by @hoihu to SAMD, following the commit
587339022689187a1acbccc1d0e2425a67385ff7.

One small addition: before executing keyboard interrupt, the input buffer
is cleared.
---
 ports/samd/Makefile    |  1 +
 ports/samd/mphalport.c | 75 +++++++++++++++++++++++++++++++-----------
 ports/samd/mphalport.h |  1 +
 3 files changed, 57 insertions(+), 20 deletions(-)

diff --git a/ports/samd/Makefile b/ports/samd/Makefile
index d8ca0f8ba6980..5ff00f21f9266 100644
--- a/ports/samd/Makefile
+++ b/ports/samd/Makefile
@@ -131,6 +131,7 @@ SRC_C += \
 	shared/libc/string0.c \
 	shared/readline/readline.c \
 	shared/runtime/gchelper_native.c \
+	shared/runtime/interrupt_char.c \
 	shared/runtime/pyexec.c \
 	shared/runtime/softtimer.c \
 	shared/runtime/stdout_helpers.c \
diff --git a/ports/samd/mphalport.c b/ports/samd/mphalport.c
index fc451023903ce..ad3817768f777 100644
--- a/ports/samd/mphalport.c
+++ b/ports/samd/mphalport.c
@@ -33,22 +33,54 @@
 #include "samd_soc.h"
 #include "tusb.h"
 
-#if MICROPY_KBD_EXCEPTION
-int mp_interrupt_char = -1;
-
-void tud_cdc_rx_wanted_cb(uint8_t itf, char wanted_char) {
-    (void)itf;
-    (void)wanted_char;
-    tud_cdc_read_char(); // discard interrupt char
-    mp_sched_keyboard_interrupt();
-}
+#ifndef MICROPY_HW_STDIN_BUFFER_LEN
+#define MICROPY_HW_STDIN_BUFFER_LEN 128
+#endif
+
+STATIC uint8_t stdin_ringbuf_array[MICROPY_HW_STDIN_BUFFER_LEN];
+ringbuf_t stdin_ringbuf = { stdin_ringbuf_array, sizeof(stdin_ringbuf_array), 0, 0 };
 
-void mp_hal_set_interrupt_char(int c) {
-    mp_interrupt_char = c;
-    tud_cdc_set_wanted_char(c);
+uint8_t cdc_itf_pending; // keep track of cdc interfaces which need attention to poll
+
+void poll_cdc_interfaces(void) {
+    // any CDC interfaces left to poll?
+    if (cdc_itf_pending && ringbuf_free(&stdin_ringbuf)) {
+        for (uint8_t itf = 0; itf < 8; ++itf) {
+            if (cdc_itf_pending & (1 << itf)) {
+                tud_cdc_rx_cb(itf);
+                if (!cdc_itf_pending) {
+                    break;
+                }
+            }
+        }
+    }
 }
 
-#endif
+void tud_cdc_rx_cb(uint8_t itf) {
+    // consume pending USB data immediately to free usb buffer and keep the endpoint from stalling.
+    // in case the ringbuffer is full, mark the CDC interface that need attention later on for polling
+    cdc_itf_pending &= ~(1 << itf);
+    for (uint32_t bytes_avail = tud_cdc_n_available(itf); bytes_avail > 0; --bytes_avail) {
+        if (ringbuf_free(&stdin_ringbuf)) {
+            int data_char = tud_cdc_read_char();
+            #if MICROPY_KBD_EXCEPTION
+            if (data_char == mp_interrupt_char) {
+                // Clear the ring buffer
+                stdin_ringbuf.iget = stdin_ringbuf.iput = 0;
+                // and stop
+                mp_sched_keyboard_interrupt();
+            } else {
+                ringbuf_put(&stdin_ringbuf, data_char);
+            }
+            #else
+            ringbuf_put(&stdin_ringbuf, data_char);
+            #endif
+        } else {
+            cdc_itf_pending |= (1 << itf);
+            return;
+        }
+    }
+}
 
 void mp_hal_set_pin_mux(mp_hal_pin_obj_t pin, uint8_t mux) {
     int pin_grp = pin / 32;
@@ -94,9 +126,12 @@ void mp_hal_delay_us(mp_uint_t us) {
 
 uintptr_t mp_hal_stdio_poll(uintptr_t poll_flags) {
     uintptr_t ret = 0;
-    if (tud_cdc_connected() && tud_cdc_available()) {
+
+    poll_cdc_interfaces();
+    if ((poll_flags & MP_STREAM_POLL_RD) && ringbuf_peek(&stdin_ringbuf) != -1) {
         ret |= MP_STREAM_POLL_RD;
     }
+
     #if MICROPY_PY_OS_DUPTERM
     ret |= mp_uos_dupterm_poll(poll_flags);
     #endif
@@ -105,13 +140,13 @@ uintptr_t mp_hal_stdio_poll(uintptr_t poll_flags) {
 
 int mp_hal_stdin_rx_chr(void) {
     for (;;) {
-        if (tud_cdc_connected() && tud_cdc_available()) {
-            uint8_t buf[1];
-            uint32_t count = tud_cdc_read(buf, sizeof(buf));
-            if (count) {
-                return buf[0];
-            }
+
+        poll_cdc_interfaces();
+        int c = ringbuf_get(&stdin_ringbuf);
+        if (c != -1) {
+            return c;
         }
+
         #if MICROPY_PY_OS_DUPTERM
         int dupterm_c = mp_uos_dupterm_rx_chr();
         if (dupterm_c >= 0) {
diff --git a/ports/samd/mphalport.h b/ports/samd/mphalport.h
index f1efd550035af..ced0d642b4ed4 100644
--- a/ports/samd/mphalport.h
+++ b/ports/samd/mphalport.h
@@ -27,6 +27,7 @@
 #ifndef MICROPY_INCLUDED_SAMD_MPHALPORT_H
 #define MICROPY_INCLUDED_SAMD_MPHALPORT_H
 
+#include "py/ringbuf.h"
 #include "py/mpconfig.h"
 
 // ASF4

From d9338aabc5647979f4a0ec3cb0a7e987a2a2249f Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Thu, 30 Jun 2022 16:50:15 +0200
Subject: [PATCH 2719/3533] samd: Change the symbol names for the peripheral
 clocks.

From APB_FREQ to DFLL48M_FREQ, and from apb_freq to peripheral_freq.
---
 ports/samd/clock_config.h            |  2 +-
 ports/samd/machine_i2c.c             |  2 +-
 ports/samd/machine_pwm.c             |  3 ++-
 ports/samd/machine_spi.c             |  4 ++--
 ports/samd/machine_uart.c            |  4 ++--
 ports/samd/mcu/samd21/clock_config.c |  6 +++---
 ports/samd/mcu/samd21/mpconfigmcu.h  |  2 +-
 ports/samd/mcu/samd51/clock_config.c | 12 ++++++------
 ports/samd/mcu/samd51/mpconfigmcu.h  |  2 +-
 9 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/ports/samd/clock_config.h b/ports/samd/clock_config.h
index 6e48b286f4989..35b7e532814b4 100644
--- a/ports/samd/clock_config.h
+++ b/ports/samd/clock_config.h
@@ -29,6 +29,6 @@
 void init_clocks(uint32_t cpu_freq);
 void set_cpu_freq(uint32_t cpu_freq);
 uint32_t get_cpu_freq(void);
-uint32_t get_apb_freq(void);
+uint32_t get_peripheral_freq(void);
 void check_usb_recovery_mode(void);
 void enable_sercom_clock(int id);
diff --git a/ports/samd/machine_i2c.c b/ports/samd/machine_i2c.c
index 90ea5e10ca43b..25dfa99340ffe 100644
--- a/ports/samd/machine_i2c.c
+++ b/ports/samd/machine_i2c.c
@@ -185,7 +185,7 @@ mp_obj_t machine_i2c_make_new(const mp_obj_type_t *type, size_t n_args, size_t n
     // baud = peripheral_freq / (2 * baudrate) - 5 - (rise_time * peripheral_freq) / 2
     // Just set the minimal configuration for standard and fast mode.
     // Set Baud. Assume ~300ns rise time. Maybe set later by a keyword argument.
-    i2c->I2CM.BAUD.reg = get_apb_freq() / (2 * self->freq) - 5 - (get_apb_freq() / 1000000) * RISETIME_NS / 2000;
+    i2c->I2CM.BAUD.reg = get_peripheral_freq() / (2 * self->freq) - 5 - (get_peripheral_freq() / 1000000) * RISETIME_NS / 2000;
 
     // Enable interrupts
     sercom_register_irq(self->id, &common_i2c_irq_handler);
diff --git a/ports/samd/machine_pwm.c b/ports/samd/machine_pwm.c
index 6f9ca42b1b2aa..d987927d310c3 100644
--- a/ports/samd/machine_pwm.c
+++ b/ports/samd/machine_pwm.c
@@ -28,6 +28,7 @@
 #include "py/runtime.h"
 #include "py/mphal.h"
 #include "modmachine.h"
+#include "clock_config.h"
 
 #include "sam.h"
 #include "pin_af.h"
@@ -50,7 +51,7 @@ typedef struct _machine_pwm_obj_t {
 #define PWM_NOT_INIT    (0)
 #define PWM_CLK_READY   (1)
 #define PWM_TCC_ENABLED (2)
-#define PWM_MASTER_CLK  (48000000)
+#define PWM_MASTER_CLK  (get_peripheral_freq())
 #define PWM_FULL_SCALE  (65536)
 
 static Tcc *tcc_instance[] = TCC_INSTS;
diff --git a/ports/samd/machine_spi.c b/ports/samd/machine_spi.c
index ddb8756e9a34e..8321f19cf0dd8 100644
--- a/ports/samd/machine_spi.c
+++ b/ports/samd/machine_spi.c
@@ -206,9 +206,9 @@ STATIC void machine_spi_init(mp_obj_base_t *self_in, size_t n_args, const mp_obj
         spi->SPI.CTRLC.reg = 1; // 1 clock cycle character spacing
         #endif
 
-        // SPI is driven by the clock of GCLK Generator 2, freq in bus_freq
+        // SPI is driven by the clock of GCLK Generator 2, freq by get_peripheral_freq()
         // baud = bus_freq / (2 * baudrate) - 1
-        uint32_t baud = get_apb_freq() / (2 * self->baudrate) - 1;
+        uint32_t baud = get_peripheral_freq() / (2 * self->baudrate) - 1;
         spi->SPI.BAUD.reg = baud; // Set Baud
 
         // Enable RXC interrupt only if miso is defined
diff --git a/ports/samd/machine_uart.c b/ports/samd/machine_uart.c
index 92e63ee51e6f2..1031f26c26488 100644
--- a/ports/samd/machine_uart.c
+++ b/ports/samd/machine_uart.c
@@ -276,9 +276,9 @@ STATIC mp_obj_t machine_uart_init_helper(machine_uart_obj_t *self, size_t n_args
         while (uart->USART.SYNCBUSY.bit.CTRLB) {
         }
 
-        // USART is driven by the clock of GCLK Generator 2, freq by get_apb_freq()
+        // USART is driven by the clock of GCLK Generator 2, freq by get_peripheral_freq()
         // baud rate; 65536 * (1 - 16 * 115200/bus_freq)
-        uint32_t baud = 65536 - ((uint64_t)(65536 * 16) * self->baudrate + get_apb_freq() / 2) / get_apb_freq();
+        uint32_t baud = 65536 - ((uint64_t)(65536 * 16) * self->baudrate + get_peripheral_freq() / 2) / get_peripheral_freq();
         uart->USART.BAUD.bit.BAUD = baud; // Set Baud
 
         sercom_register_irq(self->id, &common_uart_irq_handler);
diff --git a/ports/samd/mcu/samd21/clock_config.c b/ports/samd/mcu/samd21/clock_config.c
index e330d7ba6af23..2402ed2e3107a 100644
--- a/ports/samd/mcu/samd21/clock_config.c
+++ b/ports/samd/mcu/samd21/clock_config.c
@@ -33,7 +33,7 @@
 #include "samd_soc.h"
 
 static uint32_t cpu_freq = CPU_FREQ;
-static uint32_t apb_freq = APB_FREQ;
+static uint32_t peripheral_freq = DFLL48M_FREQ;
 static uint32_t dfll48m_calibration;
 
 int sercom_gclk_id[] = {
@@ -46,8 +46,8 @@ uint32_t get_cpu_freq(void) {
     return cpu_freq;
 }
 
-uint32_t get_apb_freq(void) {
-    return apb_freq;
+uint32_t get_peripheral_freq(void) {
+    return peripheral_freq;
 }
 
 void set_cpu_freq(uint32_t cpu_freq_arg) {
diff --git a/ports/samd/mcu/samd21/mpconfigmcu.h b/ports/samd/mcu/samd21/mpconfigmcu.h
index dd16a6c8affd4..ecb125bbdb771 100644
--- a/ports/samd/mcu/samd21/mpconfigmcu.h
+++ b/ports/samd/mcu/samd21/mpconfigmcu.h
@@ -16,7 +16,7 @@
 #define MICROPY_HW_UART_TXBUF           (1)
 
 #define CPU_FREQ                        (48000000)
-#define APB_FREQ                        (48000000)
+#define DFLL48M_FREQ                    (48000000)
 
 #define IRQ_PRI_PENDSV                  ((1 << __NVIC_PRIO_BITS) - 1)
 
diff --git a/ports/samd/mcu/samd51/clock_config.c b/ports/samd/mcu/samd51/clock_config.c
index 62c05193dd8b6..31c8f5a8654c2 100644
--- a/ports/samd/mcu/samd51/clock_config.c
+++ b/ports/samd/mcu/samd51/clock_config.c
@@ -33,7 +33,7 @@
 #include "samd_soc.h"
 
 static uint32_t cpu_freq = CPU_FREQ;
-static uint32_t apb_freq = APB_FREQ;
+static uint32_t peripheral_freq = DFLL48M_FREQ;
 static uint32_t dfll48m_calibration;
 
 int sercom_gclk_id[] = {
@@ -49,8 +49,8 @@ uint32_t get_cpu_freq(void) {
     return cpu_freq;
 }
 
-uint32_t get_apb_freq(void) {
-    return apb_freq;
+uint32_t get_peripheral_freq(void) {
+    return peripheral_freq;
 }
 
 void set_cpu_freq(uint32_t cpu_freq_arg) {
@@ -181,7 +181,7 @@ void init_clocks(uint32_t cpu_freq) {
     while (GCLK->PCHCTRL[0].bit.CHEN == 0) {
     }
     // Step 2: Set the multiplication values. The offset of 16384 to the freq is for rounding.
-    OSCCTRL->DFLLMUL.reg = OSCCTRL_DFLLMUL_MUL((APB_FREQ + DPLLx_REF_FREQ / 2) / DPLLx_REF_FREQ) |
+    OSCCTRL->DFLLMUL.reg = OSCCTRL_DFLLMUL_MUL((DFLL48M_FREQ + DPLLx_REF_FREQ / 2) / DPLLx_REF_FREQ) |
         OSCCTRL_DFLLMUL_FSTEP(1) | OSCCTRL_DFLLMUL_CSTEP(1);
     while (OSCCTRL->DFLLSYNC.bit.DFLLMUL == 1) {
     }
@@ -200,7 +200,7 @@ void init_clocks(uint32_t cpu_freq) {
     #else // MICROPY_HW_XOSC32K
 
     // Derive GCLK1 from DFLL48M at DPLL0_REF_FREQ as defined in mpconfigboard.h (e.g. 32768 Hz)
-    GCLK->GENCTRL[1].reg = ((APB_FREQ + DPLLx_REF_FREQ / 2) / DPLLx_REF_FREQ) << GCLK_GENCTRL_DIV_Pos
+    GCLK->GENCTRL[1].reg = ((DFLL48M_FREQ + DPLLx_REF_FREQ / 2) / DPLLx_REF_FREQ) << GCLK_GENCTRL_DIV_Pos
         | GCLK_GENCTRL_GENEN | GCLK_GENCTRL_SRC_DFLL;
     while (GCLK->SYNCBUSY.bit.GENCTRL1) {
     }
@@ -236,7 +236,7 @@ void init_clocks(uint32_t cpu_freq) {
 
     set_cpu_freq(cpu_freq);
 
-    apb_freq = APB_FREQ;  // To be changed if CPU_FREQ < 48M
+    peripheral_freq = DFLL48M_FREQ;  // To be changed if CPU_FREQ < 48M
 
     // Setup GCLK2 for DPLL1 output (48 MHz)
     GCLK->GENCTRL[2].reg = GCLK_GENCTRL_DIV(1) | GCLK_GENCTRL_RUNSTDBY | GCLK_GENCTRL_GENEN | GCLK_GENCTRL_SRC_DFLL;
diff --git a/ports/samd/mcu/samd51/mpconfigmcu.h b/ports/samd/mcu/samd51/mpconfigmcu.h
index c3253fcbecb73..2c1ea7fee2574 100644
--- a/ports/samd/mcu/samd51/mpconfigmcu.h
+++ b/ports/samd/mcu/samd51/mpconfigmcu.h
@@ -29,7 +29,7 @@ unsigned long trng_random_u32(void);
 #define MICROPY_HW_UART_TXBUF           (1)
 
 #define CPU_FREQ                        (120000000)
-#define APB_FREQ                        (48000000)
+#define DFLL48M_FREQ                    (48000000)
 #define DPLLx_REF_FREQ                  (32768)
 
 #define NVIC_PRIORITYGROUP_4            ((uint32_t)0x00000003)

From 00dcf0464318764066f81f90992d5bfc40acebf1 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Tue, 21 Jun 2022 17:32:48 +0200
Subject: [PATCH 2720/3533] samd/mcu: Add floating point suport for SAMD21
 devices.

For consistency it should be there.
---
 ports/samd/mcu/samd21/mpconfigmcu.h | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ports/samd/mcu/samd21/mpconfigmcu.h b/ports/samd/mcu/samd21/mpconfigmcu.h
index ecb125bbdb771..9329a6eb89bc7 100644
--- a/ports/samd/mcu/samd21/mpconfigmcu.h
+++ b/ports/samd/mcu/samd21/mpconfigmcu.h
@@ -7,7 +7,10 @@
 #define MICROPY_EMIT_THUMB              (0)
 #define MICROPY_EMIT_INLINE_THUMB       (0)
 
-#define MICROPY_FLOAT_IMPL              (MICROPY_FLOAT_IMPL_NONE)
+#define MICROPY_FLOAT_IMPL              (MICROPY_FLOAT_IMPL_FLOAT)
+#define MICROPY_PY_BUILTINS_COMPLEX     (0)
+#define MICROPY_PY_MATH                 (0)
+#define MICROPY_PY_CMATH                (0)
 
 #define MICROPY_HW_FLASH_STORAGE_BASE   (0x30000)
 #define MICROPY_HW_FLASH_STORAGE_BYTES  (0xFFFF)

From 387025f5d12ec6313b396e63e770dd9f22f9daeb Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Tue, 21 Jun 2022 20:31:20 +0200
Subject: [PATCH 2721/3533] samd/mcu: Enable the math module on SAMD51.

---
 ports/samd/mcu/samd51/mpconfigmcu.h  |  3 ++-
 ports/samd/mcu/samd51/mpconfigmcu.mk | 29 ++++++++++++++++++++++++++++
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/ports/samd/mcu/samd51/mpconfigmcu.h b/ports/samd/mcu/samd51/mpconfigmcu.h
index 2c1ea7fee2574..0e5a8856556e4 100644
--- a/ports/samd/mcu/samd51/mpconfigmcu.h
+++ b/ports/samd/mcu/samd51/mpconfigmcu.h
@@ -9,7 +9,8 @@
 
 #define MICROPY_FLOAT_IMPL              (MICROPY_FLOAT_IMPL_FLOAT)
 #define MICROPY_PY_BUILTINS_COMPLEX     (0)
-#define MICROPY_PY_MATH                 (0)
+#define MICROPY_PY_MATH                 (1)
+#define MP_NEED_LOG2                    (1)
 #define MICROPY_PY_CMATH                (0)
 
 #define MICROPY_PY_UOS_URANDOM          (1)
diff --git a/ports/samd/mcu/samd51/mpconfigmcu.mk b/ports/samd/mcu/samd51/mpconfigmcu.mk
index 461a0182ef019..0aedbbe28a373 100644
--- a/ports/samd/mcu/samd51/mpconfigmcu.mk
+++ b/ports/samd/mcu/samd51/mpconfigmcu.mk
@@ -1 +1,30 @@
 SRC_S += shared/runtime/gchelper_m3.s
+
+SRC_MOD +=  $(addprefix lib/libm/,\
+	acoshf.c \
+	asinfacosf.c \
+	asinhf.c \
+	atan2f.c \
+	atanf.c \
+	atanhf.c \
+	ef_rem_pio2.c \
+	erf_lgamma.c \
+	fmodf.c \
+	kf_cos.c \
+	kf_rem_pio2.c \
+	kf_sin.c \
+	kf_tan.c \
+	log1pf.c \
+	math.c \
+	nearbyintf.c \
+	roundf.c \
+	sf_cos.c \
+	sf_erf.c \
+	sf_frexp.c \
+	sf_ldexp.c \
+	sf_modf.c \
+	sf_sin.c \
+	sf_tan.c \
+	wf_lgamma.c \
+	wf_tgamma.c \
+	)

From 9f4df86016d8181dc06683d528dbd85473a1dbb9 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sat, 2 Jul 2022 16:26:17 +0200
Subject: [PATCH 2722/3533] samd/boards: Move the flash filesystem definitions
 to the linker files.

They used to be in mpconfigmcu.h, but have to be different for different
chip variants, like the SAMD51x20.
---
 ports/samd/boards/samd21x18a.ld     | 3 +++
 ports/samd/boards/samd51g19a.ld     | 3 +++
 ports/samd/boards/samd51j19a.ld     | 3 +++
 ports/samd/boards/samd51p19a.ld     | 3 +++
 ports/samd/mcu/samd21/mpconfigmcu.h | 2 --
 ports/samd/mcu/samd51/mpconfigmcu.h | 7 +------
 ports/samd/samd_flash.c             | 6 ++++--
 7 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/ports/samd/boards/samd21x18a.ld b/ports/samd/boards/samd21x18a.ld
index b7d59c315b643..81a84a15d7d75 100644
--- a/ports/samd/boards/samd21x18a.ld
+++ b/ports/samd/boards/samd21x18a.ld
@@ -13,5 +13,8 @@ MEMORY
 _estack = ORIGIN(RAM) + LENGTH(RAM) - 8;
 _sstack = _estack - 8K;
 
+_oflash_fs = ORIGIN(FLASH) + 192K - 8K;
+_sflash_fs = LENGTH(FLASH) - 192K + 8K - 1;
+
 _sheap = _ebss;
 _eheap = _sstack;
diff --git a/ports/samd/boards/samd51g19a.ld b/ports/samd/boards/samd51g19a.ld
index e0baa9bba0281..cd03320ba43d7 100644
--- a/ports/samd/boards/samd51g19a.ld
+++ b/ports/samd/boards/samd51g19a.ld
@@ -13,5 +13,8 @@ MEMORY
 _estack = ORIGIN(RAM) + LENGTH(RAM) - 8;
 _sstack = _estack - 16K;
 
+_oflash_fs = ORIGIN(FLASH) + 384K - 16K;
+_sflash_fs = LENGTH(FLASH) - 384K + 16K - 1;
+
 _sheap = _ebss;
 _eheap = _sstack;
diff --git a/ports/samd/boards/samd51j19a.ld b/ports/samd/boards/samd51j19a.ld
index e0baa9bba0281..cd03320ba43d7 100644
--- a/ports/samd/boards/samd51j19a.ld
+++ b/ports/samd/boards/samd51j19a.ld
@@ -13,5 +13,8 @@ MEMORY
 _estack = ORIGIN(RAM) + LENGTH(RAM) - 8;
 _sstack = _estack - 16K;
 
+_oflash_fs = ORIGIN(FLASH) + 384K - 16K;
+_sflash_fs = LENGTH(FLASH) - 384K + 16K - 1;
+
 _sheap = _ebss;
 _eheap = _sstack;
diff --git a/ports/samd/boards/samd51p19a.ld b/ports/samd/boards/samd51p19a.ld
index e0baa9bba0281..cd03320ba43d7 100644
--- a/ports/samd/boards/samd51p19a.ld
+++ b/ports/samd/boards/samd51p19a.ld
@@ -13,5 +13,8 @@ MEMORY
 _estack = ORIGIN(RAM) + LENGTH(RAM) - 8;
 _sstack = _estack - 16K;
 
+_oflash_fs = ORIGIN(FLASH) + 384K - 16K;
+_sflash_fs = LENGTH(FLASH) - 384K + 16K - 1;
+
 _sheap = _ebss;
 _eheap = _sstack;
diff --git a/ports/samd/mcu/samd21/mpconfigmcu.h b/ports/samd/mcu/samd21/mpconfigmcu.h
index 9329a6eb89bc7..7ee23b59b1598 100644
--- a/ports/samd/mcu/samd21/mpconfigmcu.h
+++ b/ports/samd/mcu/samd21/mpconfigmcu.h
@@ -12,8 +12,6 @@
 #define MICROPY_PY_MATH                 (0)
 #define MICROPY_PY_CMATH                (0)
 
-#define MICROPY_HW_FLASH_STORAGE_BASE   (0x30000)
-#define MICROPY_HW_FLASH_STORAGE_BYTES  (0xFFFF)
 #define VFS_BLOCK_SIZE_BYTES            (1536) // 24x 64B flash pages;
 
 #define MICROPY_HW_UART_TXBUF           (1)
diff --git a/ports/samd/mcu/samd51/mpconfigmcu.h b/ports/samd/mcu/samd51/mpconfigmcu.h
index 0e5a8856556e4..19193992f058d 100644
--- a/ports/samd/mcu/samd51/mpconfigmcu.h
+++ b/ports/samd/mcu/samd51/mpconfigmcu.h
@@ -19,12 +19,7 @@ unsigned long trng_random_u32(void);
 
 // Due to a limitation in the TC counter for us, the ticks period is 2**29
 #define MICROPY_PY_UTIME_TICKS_PERIOD   (0x20000000)
-// MicroPython configs
-// samd_flash.c flash parameters
-// Build a 128k Flash storage at top. 512k-128k=384k=0x60000
-// 512*1024= 0x80000 minus 128*1024= 0x20000 =  0x60000
-#define MICROPY_HW_FLASH_STORAGE_BASE   (0x60000)
-#define MICROPY_HW_FLASH_STORAGE_BYTES  (0x1FFFF)
+
 #define VFS_BLOCK_SIZE_BYTES            (1536) //
 
 #define MICROPY_HW_UART_TXBUF           (1)
diff --git a/ports/samd/samd_flash.c b/ports/samd/samd_flash.c
index 2fffd614f9720..6d9ee96895b01 100644
--- a/ports/samd/samd_flash.c
+++ b/ports/samd/samd_flash.c
@@ -53,11 +53,13 @@ typedef struct _samd_flash_obj_t {
     uint32_t flash_size;
 } samd_flash_obj_t;
 
+extern uint8_t _oflash_fs, _sflash_fs;
+
 // Build a Flash storage at top.
 STATIC samd_flash_obj_t samd_flash_obj = {
     .base = { &samd_flash_type },
-    .flash_base = MICROPY_HW_FLASH_STORAGE_BASE, // Board specific: mpconfigboard.h
-    .flash_size = MICROPY_HW_FLASH_STORAGE_BYTES, // Board specific: mpconfigboard.h
+    .flash_base = (uint32_t)&_oflash_fs, // Get from MCU-Specific loader script.
+    .flash_size = (uint32_t)&_sflash_fs, // Get from MCU-Specific loader script.
 };
 
 // FLASH stuff

From 65f99e371d3459cdaca4ae01895e706ff93ab285 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sat, 2 Jul 2022 16:36:11 +0200
Subject: [PATCH 2723/3533] samd/boards: Use the same linker file for all
 SAMD51x19 variants.

---
 .../mpconfigboard.mk                          |  2 +-
 .../mpconfigboard.mk                          |  2 +-
 ports/samd/boards/MINISAM_M4/mpconfigboard.mk |  2 +-
 .../SEEED_WIO_TERMINAL/mpconfigboard.mk       |  2 +-
 ports/samd/boards/samd51j19a.ld               | 20 -------------------
 ports/samd/boards/samd51p19a.ld               | 20 -------------------
 .../boards/{samd51g19a.ld => samd51x19a.ld}   |  0
 7 files changed, 4 insertions(+), 44 deletions(-)
 delete mode 100644 ports/samd/boards/samd51j19a.ld
 delete mode 100644 ports/samd/boards/samd51p19a.ld
 rename ports/samd/boards/{samd51g19a.ld => samd51x19a.ld} (100%)

diff --git a/ports/samd/boards/ADAFRUIT_FEATHER_M4_EXPRESS/mpconfigboard.mk b/ports/samd/boards/ADAFRUIT_FEATHER_M4_EXPRESS/mpconfigboard.mk
index d29e2b1097b1f..781faa24106dd 100644
--- a/ports/samd/boards/ADAFRUIT_FEATHER_M4_EXPRESS/mpconfigboard.mk
+++ b/ports/samd/boards/ADAFRUIT_FEATHER_M4_EXPRESS/mpconfigboard.mk
@@ -1,6 +1,6 @@
 MCU_SERIES = SAMD51
 CMSIS_MCU = SAMD51J19A
-LD_FILES = boards/samd51j19a.ld sections.ld
+LD_FILES = boards/samd51x19a.ld sections.ld
 TEXT0 = 0x4000
 
 # The ?='s allow overriding in mpconfigboard.mk.
diff --git a/ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/mpconfigboard.mk b/ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/mpconfigboard.mk
index 6b0192c77b9ea..da3e47589ad05 100644
--- a/ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/mpconfigboard.mk
+++ b/ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/mpconfigboard.mk
@@ -1,6 +1,6 @@
 MCU_SERIES = SAMD51
 CMSIS_MCU = SAMD51G19A
-LD_FILES = boards/samd51g19a.ld sections.ld
+LD_FILES = boards/samd51x19a.ld sections.ld
 TEXT0 = 0x4000
 
 # The ?='s allow overriding in mpconfigboard.mk.
diff --git a/ports/samd/boards/MINISAM_M4/mpconfigboard.mk b/ports/samd/boards/MINISAM_M4/mpconfigboard.mk
index 6ed0ff552b013..73afb0210446f 100644
--- a/ports/samd/boards/MINISAM_M4/mpconfigboard.mk
+++ b/ports/samd/boards/MINISAM_M4/mpconfigboard.mk
@@ -1,7 +1,7 @@
 # https://www.minifigboards.com/mini-sam-m4/mini-sam-m4-hardware/
 MCU_SERIES = SAMD51
 CMSIS_MCU = SAMD51G19A
-LD_FILES = boards/samd51g19a.ld sections.ld
+LD_FILES = boards/samd51x19a.ld sections.ld
 TEXT0 = 0x4000
 
 # The ?='s allow overriding in mpconfigboard.mk.
diff --git a/ports/samd/boards/SEEED_WIO_TERMINAL/mpconfigboard.mk b/ports/samd/boards/SEEED_WIO_TERMINAL/mpconfigboard.mk
index 90fb7f2dd076a..c2c4da6152738 100644
--- a/ports/samd/boards/SEEED_WIO_TERMINAL/mpconfigboard.mk
+++ b/ports/samd/boards/SEEED_WIO_TERMINAL/mpconfigboard.mk
@@ -1,6 +1,6 @@
 MCU_SERIES = SAMD51
 CMSIS_MCU = SAMD51P19A
-LD_FILES = boards/samd51p19a.ld sections.ld
+LD_FILES = boards/samd51x19a.ld sections.ld
 TEXT0 = 0x4000
 
 # The ?='s allow overriding in mpconfigboard.mk.
diff --git a/ports/samd/boards/samd51j19a.ld b/ports/samd/boards/samd51j19a.ld
deleted file mode 100644
index cd03320ba43d7..0000000000000
--- a/ports/samd/boards/samd51j19a.ld
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
-    GNU linker script for SAMD51
-*/
-
-/* Specify the memory areas */
-MEMORY
-{
-    FLASH (rx)  : ORIGIN = 0x00004000, LENGTH = 512K - 16K
-    RAM (xrw)   : ORIGIN = 0x20000000, LENGTH = 192K
-}
-
-/* Top end of the stack, with room for double-tap variable */
-_estack = ORIGIN(RAM) + LENGTH(RAM) - 8;
-_sstack = _estack - 16K;
-
-_oflash_fs = ORIGIN(FLASH) + 384K - 16K;
-_sflash_fs = LENGTH(FLASH) - 384K + 16K - 1;
-
-_sheap = _ebss;
-_eheap = _sstack;
diff --git a/ports/samd/boards/samd51p19a.ld b/ports/samd/boards/samd51p19a.ld
deleted file mode 100644
index cd03320ba43d7..0000000000000
--- a/ports/samd/boards/samd51p19a.ld
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
-    GNU linker script for SAMD51
-*/
-
-/* Specify the memory areas */
-MEMORY
-{
-    FLASH (rx)  : ORIGIN = 0x00004000, LENGTH = 512K - 16K
-    RAM (xrw)   : ORIGIN = 0x20000000, LENGTH = 192K
-}
-
-/* Top end of the stack, with room for double-tap variable */
-_estack = ORIGIN(RAM) + LENGTH(RAM) - 8;
-_sstack = _estack - 16K;
-
-_oflash_fs = ORIGIN(FLASH) + 384K - 16K;
-_sflash_fs = LENGTH(FLASH) - 384K + 16K - 1;
-
-_sheap = _ebss;
-_eheap = _sstack;
diff --git a/ports/samd/boards/samd51g19a.ld b/ports/samd/boards/samd51x19a.ld
similarity index 100%
rename from ports/samd/boards/samd51g19a.ld
rename to ports/samd/boards/samd51x19a.ld

From 4cf527eb05d9b9a93a92ec427e719bf81a8de305 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Fri, 15 Jul 2022 22:44:23 +0200
Subject: [PATCH 2724/3533] samd/main: Initialize readline on start up.

Somehow that was forgotten.
---
 ports/samd/main.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ports/samd/main.c b/ports/samd/main.c
index 889af4a1e4736..0f24e2382ee89 100644
--- a/ports/samd/main.c
+++ b/ports/samd/main.c
@@ -29,6 +29,7 @@
 #include "py/gc.h"
 #include "py/mperrno.h"
 #include "py/stackctrl.h"
+#include "shared/readline/readline.h"
 #include "shared/runtime/gchelper.h"
 #include "shared/runtime/pyexec.h"
 #include "shared/runtime/softtimer.h"
@@ -48,6 +49,9 @@ void samd_main(void) {
         gc_init(&_sheap, &_eheap);
         mp_init();
 
+        // Initialise sub-systems.
+        readline_init0();
+
         // Execute _boot.py to set up the filesystem.
         pyexec_frozen_module("_boot.py");
 

From 972212907ddc7f611f41d7e267ceca396f1bb4ba Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sun, 10 Jul 2022 11:55:56 +0200
Subject: [PATCH 2725/3533] samd/mcu: Use lf2s for SAMD51 and lfs1 for SAMD21.

Using lfs1 gives a smaller code, but lfs2 has more features.
---
 ports/samd/mcu/samd21/mpconfigmcu.h  | 1 +
 ports/samd/mcu/samd51/mpconfigmcu.mk | 2 ++
 ports/samd/modules/_boot.py          | 8 +++++---
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/ports/samd/mcu/samd21/mpconfigmcu.h b/ports/samd/mcu/samd21/mpconfigmcu.h
index 7ee23b59b1598..a84b31276b428 100644
--- a/ports/samd/mcu/samd21/mpconfigmcu.h
+++ b/ports/samd/mcu/samd21/mpconfigmcu.h
@@ -6,6 +6,7 @@
 // MicroPython emitters
 #define MICROPY_EMIT_THUMB              (0)
 #define MICROPY_EMIT_INLINE_THUMB       (0)
+#define MICROPY_MODULE_BUILTIN_INIT     (1)
 
 #define MICROPY_FLOAT_IMPL              (MICROPY_FLOAT_IMPL_FLOAT)
 #define MICROPY_PY_BUILTINS_COMPLEX     (0)
diff --git a/ports/samd/mcu/samd51/mpconfigmcu.mk b/ports/samd/mcu/samd51/mpconfigmcu.mk
index 0aedbbe28a373..e83e8911ddbff 100644
--- a/ports/samd/mcu/samd51/mpconfigmcu.mk
+++ b/ports/samd/mcu/samd51/mpconfigmcu.mk
@@ -1,3 +1,5 @@
+MICROPY_VFS_LFS2 ?= 1
+
 SRC_S += shared/runtime/gchelper_m3.s
 
 SRC_MOD +=  $(addprefix lib/libm/,\
diff --git a/ports/samd/modules/_boot.py b/ports/samd/modules/_boot.py
index 84b02480b7456..e183125f2e4bf 100644
--- a/ports/samd/modules/_boot.py
+++ b/ports/samd/modules/_boot.py
@@ -6,11 +6,13 @@
 bdev = samd.Flash()
 
 # Try to mount the filesystem, and format the flash if it doesn't exist.
+fs_type = uos.VfsLfs2 if hasattr(uos, "VfsLfs2") else uos.VfsLfs1
+
 try:
-    vfs = uos.VfsLfs1(bdev)
+    vfs = fs_type(bdev)
 except:
-    uos.VfsLfs1.mkfs(bdev)
-    vfs = uos.VfsLfs1(bdev)
+    fs_type.mkfs(bdev)
+    vfs = fs_type(bdev)
 uos.mount(vfs, "/")
 
 gc.collect()

From 366c801b3553191241e329c2f6d7f718f49af105 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Tue, 4 Oct 2022 09:17:29 +0200
Subject: [PATCH 2726/3533] samd/machine_pin: Change the printing of Pin and
 LED objects.

It now prints lines like:

    Pin("D9", mode=IN, pull=PULL_UP, GPIO=PA07)

or

    LED("LED")

showing for consistency the names as given in pins.csv.  For pins, the GPIO
numer is printed as well for a reference.
---
 ports/samd/boards/make-pins.py |  2 +-
 ports/samd/machine_led.c       |  2 +-
 ports/samd/machine_pin.c       | 14 +++++++++++++-
 ports/samd/mphalport.h         | 12 +++++++++++-
 4 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/ports/samd/boards/make-pins.py b/ports/samd/boards/make-pins.py
index 2b62ba7c59593..679e2c9d192cb 100644
--- a/ports/samd/boards/make-pins.py
+++ b/ports/samd/boards/make-pins.py
@@ -68,7 +68,7 @@ def print_pins(self, pins_filename):
             if self.board_leds:
                 pins_file.write("\nconst machine_led_obj_t machine_led_obj[] = {\n")
                 for pin in self.board_leds:
-                    pins_file.write("    {{&machine_pin_type}, ")
+                    pins_file.write("    {{&machine_led_type}, ")
                     pins_file.write(pin[0] + ', "' + pin[1])
                     pins_file.write('"},\n')
                 pins_file.write("};\n")
diff --git a/ports/samd/machine_led.c b/ports/samd/machine_led.c
index 48ab869199ade..54c2cb18bc86f 100644
--- a/ports/samd/machine_led.c
+++ b/ports/samd/machine_led.c
@@ -39,7 +39,7 @@ extern mp_obj_t machine_pin_call(mp_obj_t self_in, size_t n_args, size_t n_kw, c
 
 STATIC void machine_led_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     machine_led_obj_t *self = self_in;
-    mp_printf(print, "LED(%u)", self->id);
+    mp_printf(print, "LED(\"%s\")", self->name);
 }
 
 // constructor(id, ...)
diff --git a/ports/samd/machine_pin.c b/ports/samd/machine_pin.c
index e900174a9150f..fc72c8f7569fb 100644
--- a/ports/samd/machine_pin.c
+++ b/ports/samd/machine_pin.c
@@ -64,7 +64,19 @@ uint32_t machine_pin_open_drain_mask[4];
 
 STATIC void machine_pin_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     machine_pin_obj_t *self = self_in;
-    mp_printf(print, "GPIO P%c%02u", "ABCD"[self->id / 32], self->id % 32);
+    char *mode_str;
+    char *pull_str[] = {"PULL_OFF", "PULL_UP", "PULL_DOWN"};
+    if (GPIO_IS_OPEN_DRAIN(self->id)) {
+        mode_str = "OPEN_DRAIN";
+    } else {
+        mode_str = (mp_hal_get_pin_direction(self->id) == GPIO_DIRECTION_OUT) ? "OUT" : "IN";
+    }
+
+    mp_printf(print, "Pin(\"%s\", mode=%s, pull=%s, GPIO=P%c%02u)",
+        self->name,
+        mode_str,
+        pull_str[mp_hal_get_pull_mode(self->id)],
+        "ABCD"[self->id / 32], self->id % 32);
 }
 
 STATIC void pin_validate_drive(bool strength) {
diff --git a/ports/samd/mphalport.h b/ports/samd/mphalport.h
index ced0d642b4ed4..6f4f838cfba2f 100644
--- a/ports/samd/mphalport.h
+++ b/ports/samd/mphalport.h
@@ -126,7 +126,17 @@ static inline void mp_hal_pin_open_drain(mp_hal_pin_obj_t pin) {
 }
 
 static inline unsigned int mp_hal_get_pin_direction(mp_hal_pin_obj_t pin) {
-    return (PORT->Group[pin / 32].DIR.reg & (1 << (pin % 32))) >> (pin % 32);
+    return (PORT->Group[pin / 32].DIR.reg & (1 << (pin % 32))) ?
+           GPIO_DIRECTION_OUT : GPIO_DIRECTION_IN;
+}
+
+static inline unsigned int mp_hal_get_pull_mode(mp_hal_pin_obj_t pin) {
+    bool pull_en = (PORT->Group[pin / 32].PINCFG[pin % 32].reg & PORT_PINCFG_PULLEN) != 0;
+    if (pull_en) {
+        return gpio_get_pin_level(pin) ? GPIO_PULL_UP : GPIO_PULL_DOWN;
+    } else {
+        return GPIO_PULL_OFF;
+    }
 }
 
 static inline int mp_hal_pin_read(mp_hal_pin_obj_t pin) {

From f6d06b3ce0f476f9edeaeae855876c83b61d9175 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Thu, 6 Oct 2022 10:06:56 +1100
Subject: [PATCH 2727/3533] tools/verifygitlog.py: Ignore comment lines in
 commit messages.

The "signed-off" check assumes that the Signed-off-by: line is the last,
but there may me many lines of comments after this.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 tools/verifygitlog.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tools/verifygitlog.py b/tools/verifygitlog.py
index f9d98106d6f3c..5d45e4a4cc615 100755
--- a/tools/verifygitlog.py
+++ b/tools/verifygitlog.py
@@ -102,7 +102,10 @@ def run(args):
         filename = args[-1]
         verbose("checking commit message from", filename)
         with open(args[-1]) as f:
-            lines = [line.rstrip("\r\n") for line in f]
+            # Remove comment lines as well as any empty lines at the end.
+            lines = [line.rstrip("\r\n") for line in f if not line.startswith("#")]
+            while not lines[-1]:
+                lines.pop()
             verify_message_body(lines, err)
     else:  # Normal operation, pass arguments to git log
         for sha in git_log("%h", *args):

From b8982ec5f90a5aa9d802e9d54912dc4e7ba0916a Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Fri, 5 Aug 2022 13:55:56 +1000
Subject: [PATCH 2728/3533] tools/verifygitlog.py: Add additional help for
 subject line issues.

This check used to just show the regular expression that failed to match,
but the rules are pretty subtle and hard to interpret from the regular
expression alone.

Add some basic checks for the main things that go wrong:
 - Missing capitalisation.
 - Missing full-stop.
 - Missing path.
 - Single-word subject.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 tools/verifygitlog.py | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/tools/verifygitlog.py b/tools/verifygitlog.py
index 5d45e4a4cc615..c237cb46beef1 100755
--- a/tools/verifygitlog.py
+++ b/tools/verifygitlog.py
@@ -46,6 +46,23 @@ def git_log(pretty_format, *args):
         yield line.decode().rstrip("\r\n")
 
 
+def diagnose_subject_line(subject_line, subject_line_format, err):
+    err.error("Subject line: " + subject_line)
+    if not subject_line.endswith("."):
+        err.error('* should end with "."')
+    if not re.match(r"^[^!]+: ", subject_line):
+        err.error('* should start with "path: "')
+    if re.match(r"^[^!]+: *$", subject_line):
+        err.error("* should contain a subject after the path.")
+    m = re.match(r"^[^!]+: ([a-z][^ ]*)", subject_line)
+    if m:
+        err.error('* first word of subject ("{}") should be capitalised.'.format(m.group(1)))
+    if re.match(r"^[^!]+: [^ ]+$", subject_line):
+        err.error("* subject should contain more than one word.")
+    err.error("* should match: " + repr(subject_line_format))
+    err.error('* Example: "py/runtime: Add support for foo to bar."')
+
+
 def verify(sha, err):
     verbose("verify", sha)
     err.prefix = "commit " + sha + ": "
@@ -75,9 +92,9 @@ def verify_message_body(raw_body, err):
     very_verbose("subject_line", subject_line)
     subject_line_format = r"^[^!]+: [A-Z]+.+ .+\.$"
     if not re.match(subject_line_format, subject_line):
-        err.error("Subject line should match " + repr(subject_line_format) + ": " + subject_line)
+        diagnose_subject_line(subject_line, subject_line_format, err)
     if len(subject_line) >= 73:
-        err.error("Subject line should be 72 or less characters: " + subject_line)
+        err.error("Subject line should be 72 or fewer characters: " + subject_line)
 
     # Second one divides subject and body.
     if len(raw_body) > 1 and raw_body[1]:
@@ -90,7 +107,7 @@ def verify_message_body(raw_body, err):
             err.error("Message lines should be 75 or less characters: " + line)
 
     if not raw_body[-1].startswith("Signed-off-by: ") or "@" not in raw_body[-1]:
-        err.warning("Message should be signed-off")
+        err.warning('Message should be signed-off. Use "git commit -s".')
 
 
 def run(args):

From 4fc543c829add6bb13b111b5e12103893bbc0706 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Thu, 6 Oct 2022 00:43:28 +1100
Subject: [PATCH 2729/3533] CODECONVENTIONS.md: Update pre-commit instructions.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 CODECONVENTIONS.md | 31 +++++++++++++++++++++++--------
 1 file changed, 23 insertions(+), 8 deletions(-)

diff --git a/CODECONVENTIONS.md b/CODECONVENTIONS.md
index 2daea8431f99a..53b202ea371ef 100644
--- a/CODECONVENTIONS.md
+++ b/CODECONVENTIONS.md
@@ -72,16 +72,27 @@ different formatting, and the configuration file formats are often incompatible.
 Automatic Pre-Commit Hooks
 ==========================
 
-To have code formatting and commit message conventions automatically checked
-using [pre-commit](https://pre-commit.com/), run the following commands in your
-local MicroPython directory:
+To have code formatting and commit message conventions automatically checked,
+a configuration file is provided for the [pre-commit]
+(https://pre-commit.com/) tool.
 
+First install `pre-commit`, either from your system package manager or via
+`pip`. When installing `pre-commit` via pip, it is recommended to use a
+virtual environment. Other sources, such as Brew are also available, see
+[the docs](https://pre-commit.com/index.html#install) for details.
+
+```
+$ apt install pre-commit       # Ubuntu
+$ pacman -Sy python-precommit  # Arch Linux
+$ brew install pre-commit      # Brew
+$ pip install pre-commit       # PyPI
 ```
-$ pip install pre-commit
 
-$ pre-commit install
+Then inside the MicroPython repository, register the git hooks for pre-commit
+by running:
 
-$ pre-commit install --hook-type commit-msg
+```
+$ pre-commit install --hook-type pre-commit --hook-type commit-msg
 ```
 
 pre-commit will now automatically run during `git commit` for both code and
@@ -91,6 +102,12 @@ The same formatting checks will be run by CI for any Pull Request submitted to
 MicroPython. Pre-commit allows you to see any failure more quickly, and in many
 cases will automatically correct it in your local working copy.
 
+To unregister `pre-commit` from your MicroPython repository, run:
+
+```
+$ pre-commit uninstall --hook-type pre-commit --hook-type commit-msg
+```
+
 Tips:
 
 * To skip pre-commit checks on a single commit, use `git commit -n` (for
@@ -98,8 +115,6 @@ Tips:
 * To ignore the pre-commit message format check temporarily, start the commit
   message subject line with "WIP" (for "Work In Progress").
 
-(It is also possible to install pre-commit using Brew or other sources, see
-[the docs](https://pre-commit.com/index.html#install) for details.)
 
 Python code conventions
 =======================

From c44b3927b8f464e1e01c07b2431e7db251e6d8c0 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Fri, 7 Oct 2022 11:06:43 +1100
Subject: [PATCH 2730/3533] py/objstr: Add a helper to set mp_obj_str_t data.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 py/objstr.c | 6 ++++++
 py/objstr.h | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/py/objstr.c b/py/objstr.c
index 55e737fffc4fc..8c639e735493b 100644
--- a/py/objstr.c
+++ b/py/objstr.c
@@ -2045,6 +2045,12 @@ mp_int_t mp_obj_str_get_buffer(mp_obj_t self_in, mp_buffer_info_t *bufinfo, mp_u
     }
 }
 
+void mp_obj_str_set_data(mp_obj_str_t *str, const byte *data, size_t len) {
+    str->data = data;
+    str->len = len;
+    str->hash = qstr_compute_hash(data, len);
+}
+
 // This locals table is used for the following types: str, bytes, bytearray, array.array.
 // Each type takes a different section (start to end offset) of this table.
 STATIC const mp_rom_map_elem_t array_bytearray_str_bytes_locals_table[] = {
diff --git a/py/objstr.h b/py/objstr.h
index 6c6735bf5efa0..72fe1cfef01a6 100644
--- a/py/objstr.h
+++ b/py/objstr.h
@@ -94,6 +94,8 @@ mp_obj_t mp_obj_new_str_of_type(const mp_obj_type_t *type, const byte *data, siz
 mp_obj_t mp_obj_str_binary_op(mp_binary_op_t op, mp_obj_t lhs_in, mp_obj_t rhs_in);
 mp_int_t mp_obj_str_get_buffer(mp_obj_t self_in, mp_buffer_info_t *bufinfo, mp_uint_t flags);
 
+void mp_obj_str_set_data(mp_obj_str_t *str, const byte *data, size_t len);
+
 const byte *str_index_to_ptr(const mp_obj_type_t *type, const byte *self_data, size_t self_len,
     mp_obj_t index, bool is_slice);
 const byte *find_subbytes(const byte *haystack, size_t hlen, const byte *needle, size_t nlen, int direction);

From 0e8dfaf5384c672fc61bc10926688809db2b2ab2 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Fri, 7 Oct 2022 02:13:58 +1100
Subject: [PATCH 2731/3533] py/modsys: Add support for sys.executable.

Only intended to be used on Unix and other "OS" ports.  Matches CPython.
This should give the absolute path to the executing binary.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
Signed-off-by: Damien George <damien@micropython.org>
---
 py/modsys.c   | 10 ++++++++++
 py/mpconfig.h |  7 +++++++
 2 files changed, 17 insertions(+)

diff --git a/py/modsys.c b/py/modsys.c
index 56e83029c465b..35af761a08f12 100644
--- a/py/modsys.c
+++ b/py/modsys.c
@@ -115,6 +115,12 @@ STATIC const mp_rom_obj_tuple_t mp_sys_implementation_obj = {
 STATIC const MP_DEFINE_STR_OBJ(mp_sys_platform_obj, MICROPY_PY_SYS_PLATFORM);
 #endif
 
+#ifdef MICROPY_PY_SYS_EXECUTABLE
+// executable - the path to the micropython binary
+// This object is non-const and is populated at startup in main()
+MP_DEFINE_STR_OBJ(mp_sys_executable_obj, "");
+#endif
+
 // exit([retval]): raise SystemExit, with optional argument given to the exception
 STATIC mp_obj_t mp_sys_exit(size_t n_args, const mp_obj_t *args) {
     if (n_args == 0) {
@@ -262,6 +268,10 @@ STATIC const mp_rom_map_elem_t mp_module_sys_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_getsizeof), MP_ROM_PTR(&mp_sys_getsizeof_obj) },
     #endif
 
+    #if MICROPY_PY_SYS_EXECUTABLE
+    { MP_ROM_QSTR(MP_QSTR_executable), MP_ROM_PTR(&mp_sys_executable_obj) },
+    #endif
+
     /*
      * Extensions to CPython
      */
diff --git a/py/mpconfig.h b/py/mpconfig.h
index 698d264d2e800..99fa87e5c1536 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -1372,6 +1372,13 @@ typedef double mp_float_t;
 #define MICROPY_PY_SYS_EXC_INFO (0)
 #endif
 
+// Whether to provide "sys.executable", which is the absolute path to the
+// micropython binary
+// Intended for use on the "OS" ports (e.g. Unix)
+#ifndef MICROPY_PY_SYS_EXECUTABLE
+#define MICROPY_PY_SYS_EXECUTABLE (0)
+#endif
+
 // Whether to provide "sys.exit" function
 #ifndef MICROPY_PY_SYS_EXIT
 #define MICROPY_PY_SYS_EXIT (1)

From 8e912a501a926f59f330f8a71c2ac1bd4af88a9e Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Fri, 7 Oct 2022 02:13:58 +1100
Subject: [PATCH 2732/3533] unix: Enable sys.executable.

Gives the absolute path to the unix micropython binary.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
Signed-off-by: Damien George <damien@micropython.org>
---
 ports/unix/main.c                | 16 ++++++++++++++++
 ports/unix/mpconfigport.h        |  3 +++
 tests/unix/extra_coverage.py.exp |  9 +++++----
 3 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/ports/unix/main.c b/ports/unix/main.c
index 44823ee174776..7920db02f29ae 100644
--- a/ports/unix/main.c
+++ b/ports/unix/main.c
@@ -43,6 +43,7 @@
 #include "py/builtin.h"
 #include "py/repl.h"
 #include "py/gc.h"
+#include "py/objstr.h"
 #include "py/stackctrl.h"
 #include "py/mphal.h"
 #include "py/mpthread.h"
@@ -435,6 +436,17 @@ STATIC void set_sys_argv(char *argv[], int argc, int start_arg) {
     }
 }
 
+#if MICROPY_PY_SYS_EXECUTABLE
+extern mp_obj_str_t mp_sys_executable_obj;
+STATIC char executable_path[MICROPY_ALLOC_PATH_MAX];
+
+STATIC void sys_set_excecutable(char *argv0) {
+    if (realpath(argv0, executable_path)) {
+        mp_obj_str_set_data(&mp_sys_executable_obj, (byte *)executable_path, strlen(executable_path));
+    }
+}
+#endif
+
 #ifdef _WIN32
 #define PATHLIST_SEP_CHAR ';'
 #else
@@ -598,6 +610,10 @@ MP_NOINLINE int main_(int argc, char **argv) {
     printf("    peak  %d\n", m_get_peak_bytes_allocated());
     */
 
+    #if MICROPY_PY_SYS_EXECUTABLE
+    sys_set_excecutable(argv[0]);
+    #endif
+
     const int NOTHING_EXECUTED = -2;
     int ret = NOTHING_EXECUTED;
     bool inspect = false;
diff --git a/ports/unix/mpconfigport.h b/ports/unix/mpconfigport.h
index 08ddd21f63ba1..a67d11b9e7e42 100644
--- a/ports/unix/mpconfigport.h
+++ b/ports/unix/mpconfigport.h
@@ -154,6 +154,9 @@ typedef long mp_off_t;
 // Don't default sys.argv because we do that in main.
 #define MICROPY_PY_SYS_PATH_ARGV_DEFAULTS (0)
 
+// Enable sys.executable.
+#define MICROPY_PY_SYS_EXECUTABLE (1)
+
 #define MICROPY_PY_USOCKET_LISTEN_BACKLOG_DEFAULT (SOMAXCONN < 128 ? SOMAXCONN : 128)
 
 // Bare-metal ports don't have stderr. Printing debug to stderr may give tests
diff --git a/tests/unix/extra_coverage.py.exp b/tests/unix/extra_coverage.py.exp
index 29411545569d3..2f5409b85b45f 100644
--- a/tests/unix/extra_coverage.py.exp
+++ b/tests/unix/extra_coverage.py.exp
@@ -62,10 +62,11 @@ ime
 utime           utimeq
 
 argv            atexit          byteorder       exc_info
-exit            getsizeof       implementation  maxsize
-modules         path            platform        print_exception
-ps1             ps2             stderr          stdin
-stdout          tracebacklimit  version         version_info
+executable      exit            getsizeof       implementation
+maxsize         modules         path            platform
+print_exception                 ps1             ps2
+stderr          stdin           stdout          tracebacklimit
+version         version_info
 ementation
 # attrtuple
 (start=1, stop=2, step=3)

From 17f2783e4aa4534823e2dc33e77389ad498f2d24 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Sat, 8 Oct 2022 23:08:53 +1100
Subject: [PATCH 2733/3533] all: Use += rather than = everywhere for
 CFLAGS/LDFLAGS/LIBS.

This avoids a surprise where an = can cancel out an earlier +=.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 docs/develop/porting.rst           | 4 ++--
 examples/embedding/Makefile        | 4 ++--
 examples/embedding/Makefile.upylib | 4 ++--
 ports/cc3200/Makefile              | 4 ++--
 ports/esp8266/Makefile             | 6 +++---
 ports/mimxrt/Makefile              | 2 +-
 ports/minimal/Makefile             | 8 ++++----
 ports/nrf/Makefile                 | 2 +-
 ports/pic16bit/Makefile            | 6 +++---
 ports/powerpc/Makefile             | 4 ++--
 ports/renesas-ra/Makefile          | 2 +-
 ports/samd/Makefile                | 6 +++---
 ports/stm32/Makefile               | 2 +-
 ports/stm32/mboot/Makefile         | 6 +++---
 ports/teensy/Makefile              | 4 ++--
 ports/windows/Makefile             | 4 ++--
 16 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/docs/develop/porting.rst b/docs/develop/porting.rst
index 0511f5d276d80..74974a39e1b4d 100644
--- a/docs/develop/porting.rst
+++ b/docs/develop/porting.rst
@@ -98,8 +98,8 @@ We also need a Makefile at this point for the port:
    include $(TOP)/extmod/extmod.mk
 
    # Set CFLAGS and libraries.
-   CFLAGS = -I. -I$(BUILD) -I$(TOP)
-   LIBS = -lm
+   CFLAGS += -I. -I$(BUILD) -I$(TOP)
+   LIBS += -lm
 
    # Define the required source files.
    SRC_C = \
diff --git a/examples/embedding/Makefile b/examples/embedding/Makefile
index 7de1219b26442..edaa577f57341 100644
--- a/examples/embedding/Makefile
+++ b/examples/embedding/Makefile
@@ -1,6 +1,6 @@
 MPTOP = ../..
-CFLAGS = -std=c99 -I. -I$(MPTOP) -DNO_QSTR
-LDFLAGS = -L./build
+CFLAGS += -std=c99 -I. -I$(MPTOP) -DNO_QSTR
+LDFLAGS += -L./build
 
 hello-embed: hello-embed.o -lmicropython
 
diff --git a/examples/embedding/Makefile.upylib b/examples/embedding/Makefile.upylib
index a8e2b91d56105..99ce94b7add00 100644
--- a/examples/embedding/Makefile.upylib
+++ b/examples/embedding/Makefile.upylib
@@ -20,7 +20,7 @@ INC += -I$(BUILD)
 # compiler settings
 CWARN = -Wall -Werror
 CWARN += -Wpointer-arith -Wuninitialized
-CFLAGS = $(INC) $(CWARN) -std=gnu99 -DUNIX $(CFLAGS_MOD) $(COPT) $(CFLAGS_EXTRA)
+CFLAGS += $(INC) $(CWARN) -std=gnu99 -DUNIX $(CFLAGS_MOD) $(COPT) $(CFLAGS_EXTRA)
 
 # Some systems (eg MacOS) need -fno-common so that mp_state_ctx is placed in the BSS.
 CFLAGS += -fno-common
@@ -70,7 +70,7 @@ else
 # Use gcc syntax for map file
 LDFLAGS_ARCH = -Wl,-Map=$@.map,--cref
 endif
-LDFLAGS = $(LDFLAGS_MOD) $(LDFLAGS_ARCH) -lm $(LDFLAGS_EXTRA)
+LDFLAGS += $(LDFLAGS_MOD) $(LDFLAGS_ARCH) -lm $(LDFLAGS_EXTRA)
 
 ifeq ($(MICROPY_FORCE_32BIT),1)
 # Note: you may need to install i386 versions of dependency packages,
diff --git a/ports/cc3200/Makefile b/ports/cc3200/Makefile
index b880ad646bb39..6c034c58637e7 100644
--- a/ports/cc3200/Makefile
+++ b/ports/cc3200/Makefile
@@ -20,7 +20,7 @@ include ../../py/mkenv.mk
 CROSS_COMPILE ?= arm-none-eabi-
 
 CFLAGS_CORTEX_M4 = -mthumb -mtune=cortex-m4 -march=armv7e-m -mabi=aapcs -mcpu=cortex-m4 -msoft-float -mfloat-abi=soft -fsingle-precision-constant -Wdouble-promotion
-CFLAGS = -Wall -Wpointer-arith -Werror -std=gnu99 -nostdlib $(CFLAGS_CORTEX_M4) -Os
+CFLAGS += -Wall -Wpointer-arith -Werror -std=gnu99 -nostdlib $(CFLAGS_CORTEX_M4) -Os
 CFLAGS += -g -ffunction-sections -fdata-sections -fno-common -fsigned-char -mno-unaligned-access
 CFLAGS += -Iboards/$(BOARD)
 CFLAGS += $(CFLAGS_MOD)
@@ -28,7 +28,7 @@ CFLAGS += $(CFLAGS_MOD)
 # Workaround gcc 12.1 bug.
 CFLAGS += -Wno-array-bounds
 
-LDFLAGS = -Wl,-nostdlib -Wl,--gc-sections -Wl,-Map=$@.map
+LDFLAGS += -Wl,-nostdlib -Wl,--gc-sections -Wl,-Map=$@.map
 
 FLASH_SIZE_WIPY = 2M
 FLASH_SIZE_LAUNCHXL = 1M
diff --git a/ports/esp8266/Makefile b/ports/esp8266/Makefile
index c027f690fb107..6002dc5e5ab57 100644
--- a/ports/esp8266/Makefile
+++ b/ports/esp8266/Makefile
@@ -57,12 +57,12 @@ CFLAGS_XTENSA = -fsingle-precision-constant -Wdouble-promotion \
 	-Wl,-EL -mlongcalls -mtext-section-literals -mforce-l32 \
 	-DLWIP_OPEN_SRC
 
-CFLAGS = $(INC) -Wall -Wpointer-arith -Werror -std=gnu99 -nostdlib -DUART_OS=$(UART_OS) \
+CFLAGS += $(INC) -Wall -Wpointer-arith -Werror -std=gnu99 -nostdlib -DUART_OS=$(UART_OS) \
 	$(CFLAGS_XTENSA) $(CFLAGS_MOD) $(COPT) $(CFLAGS_EXTRA) -I$(BOARD_DIR)
 
 LD_FILES ?= boards/esp8266_2m.ld
-LDFLAGS = -nostdlib -T $(LD_FILES) -Map=$(@:.elf=.map) --cref
-LIBS = -L$(ESP_SDK)/lib -lmain -ljson -llwip_open -lpp -lnet80211 -lwpa -lphy -lnet80211 $(LDFLAGS_MOD)
+LDFLAGS += -nostdlib -T $(LD_FILES) -Map=$(@:.elf=.map) --cref
+LIBS += -L$(ESP_SDK)/lib -lmain -ljson -llwip_open -lpp -lnet80211 -lwpa -lphy -lnet80211 $(LDFLAGS_MOD)
 
 LIBGCC_FILE_NAME = $(shell $(CC) $(CFLAGS) -print-libgcc-file-name)
 LIBS += -L$(dir $(LIBGCC_FILE_NAME)) -lgcc
diff --git a/ports/mimxrt/Makefile b/ports/mimxrt/Makefile
index 6a18879ac5833..8493c47a715c1 100644
--- a/ports/mimxrt/Makefile
+++ b/ports/mimxrt/Makefile
@@ -393,7 +393,7 @@ CFLAGS += $(CFLAGS_MOD) $(CFLAGS_EXTRA)
 # Linker Flags
 # =============================================================================
 
-LDFLAGS = \
+LDFLAGS += \
 	--cref \
 	--gc-sections \
 	--print-memory-usage \
diff --git a/ports/minimal/Makefile b/ports/minimal/Makefile
index 0e875cc2491a6..2e85bd912e413 100644
--- a/ports/minimal/Makefile
+++ b/ports/minimal/Makefile
@@ -23,12 +23,12 @@ ifeq ($(CROSS), 1)
 DFU = $(TOP)/tools/dfu.py
 PYDFU = $(TOP)/tools/pydfu.py
 CFLAGS_CORTEX_M4 = -mthumb -mtune=cortex-m4 -mcpu=cortex-m4 -msoft-float -fsingle-precision-constant -Wdouble-promotion -Wfloat-conversion
-CFLAGS = $(INC) -Wall -Werror -std=c99 -nostdlib $(CFLAGS_CORTEX_M4) $(COPT)
-LDFLAGS = -nostdlib -T stm32f405.ld -Map=$@.map --cref --gc-sections
+CFLAGS += $(INC) -Wall -Werror -std=c99 -nostdlib $(CFLAGS_CORTEX_M4) $(COPT)
+LDFLAGS += -nostdlib -T stm32f405.ld -Map=$@.map --cref --gc-sections
 else
 LD = gcc
-CFLAGS = $(INC) -Wall -Werror -Wdouble-promotion -Wfloat-conversion -std=c99 $(COPT)
-LDFLAGS = -Wl,-Map=$@.map,--cref -Wl,--gc-sections
+CFLAGS += $(INC) -Wall -Werror -Wdouble-promotion -Wfloat-conversion -std=c99 $(COPT)
+LDFLAGS += -Wl,-Map=$@.map,--cref -Wl,--gc-sections
 endif
 
 CSUPEROPT = -Os # save some code space
diff --git a/ports/nrf/Makefile b/ports/nrf/Makefile
index bc295cac808e8..38d0bd7fce72a 100644
--- a/ports/nrf/Makefile
+++ b/ports/nrf/Makefile
@@ -129,7 +129,7 @@ CFLAGS += -fno-strict-aliasing
 CFLAGS += -Iboards/$(BOARD)
 CFLAGS += -DNRF5_HAL_H='<$(MCU_VARIANT)_hal.h>'
 
-LDFLAGS = $(CFLAGS)
+LDFLAGS += $(CFLAGS)
 LDFLAGS += -Xlinker -Map=$(@:.elf=.map)
 LDFLAGS += -mthumb -mabi=aapcs $(addprefix -T,$(LD_FILES)) -L boards/
 
diff --git a/ports/pic16bit/Makefile b/ports/pic16bit/Makefile
index 392196cbc2609..d2c8df4707e0d 100644
--- a/ports/pic16bit/Makefile
+++ b/ports/pic16bit/Makefile
@@ -21,7 +21,7 @@ INC += -I$(XC16)/include
 INC += -I$(XC16)/support/$(PARTFAMILY)/h
 
 CFLAGS_PIC16BIT = -mcpu=$(PART) -mlarge-code
-CFLAGS = $(INC) -Wall -Werror -std=gnu99 -nostdlib $(CFLAGS_PIC16BIT) $(COPT)
+CFLAGS += $(INC) -Wall -Werror -std=gnu99 -nostdlib $(CFLAGS_PIC16BIT) $(COPT)
 
 #Debugging/Optimization
 ifeq ($(DEBUG), 1)
@@ -30,8 +30,8 @@ else
 CFLAGS += -O1 -DNDEBUG
 endif
 
-LDFLAGS = --heap=0 -nostdlib -T $(XC16)/support/$(PARTFAMILY)/gld/p$(PART).gld -Map=$@.map --cref -p$(PART)
-LIBS = -L$(XC16)/lib -L$(XC16)/lib/$(PARTFAMILY) -lc -lm -lpic30
+LDFLAGS += --heap=0 -nostdlib -T $(XC16)/support/$(PARTFAMILY)/gld/p$(PART).gld -Map=$@.map --cref -p$(PART)
+LIBS += -L$(XC16)/lib -L$(XC16)/lib/$(PARTFAMILY) -lc -lm -lpic30
 
 SRC_C = \
 	main.c \
diff --git a/ports/powerpc/Makefile b/ports/powerpc/Makefile
index 0986fd13eba0f..8fc9b11166e63 100644
--- a/ports/powerpc/Makefile
+++ b/ports/powerpc/Makefile
@@ -21,14 +21,14 @@ INC += -I.
 INC += -I$(TOP)
 INC += -I$(BUILD)
 
-CFLAGS = $(INC) -g -Wall -Wdouble-promotion -Wfloat-conversion -std=c99 $(COPT)
+CFLAGS += $(INC) -g -Wall -Wdouble-promotion -Wfloat-conversion -std=c99 $(COPT)
 CFLAGS += -mno-string -mno-multiple -mno-vsx -mno-altivec -nostdlib
 CFLAGS += -mlittle-endian -mstrict-align -msoft-float
 CFLAGS += -Os
 CFLAGS += -fdata-sections -ffunction-sections -fno-stack-protector -ffreestanding
 CFLAGS += -U_FORTIFY_SOURCE
 
-LDFLAGS = -N -T powerpc.lds -nostdlib
+LDFLAGS += -N -T powerpc.lds -nostdlib
 
 LIBS =
 
diff --git a/ports/renesas-ra/Makefile b/ports/renesas-ra/Makefile
index 92d8be0692af3..6c37aeb1e198d 100644
--- a/ports/renesas-ra/Makefile
+++ b/ports/renesas-ra/Makefile
@@ -139,7 +139,7 @@ CFLAGS += -fsingle-precision-constant
 endif
 endif
 
-LDFLAGS = -nostdlib -L $(LD_DIR) $(addprefix -T,$(LD_FILES)) -Map=$(@:.elf=.map) --cref
+LDFLAGS += -nostdlib -L $(LD_DIR) $(addprefix -T,$(LD_FILES)) -Map=$(@:.elf=.map) --cref
 LDFLAGS += --defsym=_estack_reserve=8
 LIBS += "$(shell $(CC) $(CFLAGS) -print-libgcc-file-name)"
 
diff --git a/ports/samd/Makefile b/ports/samd/Makefile
index 5ff00f21f9266..512820088a68a 100644
--- a/ports/samd/Makefile
+++ b/ports/samd/Makefile
@@ -58,15 +58,15 @@ GEN_PINS_HDR = $(BUILD)/pins.h
 
 CFLAGS_MCU_SAMD21 = -mtune=cortex-m0plus -mcpu=cortex-m0plus -msoft-float
 CFLAGS_MCU_SAMD51 = -mtune=cortex-m4 -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard
-CFLAGS = $(INC) -Wall -Werror -std=c99 -nostdlib -mthumb $(CFLAGS_MCU_$(MCU_SERIES)) -fsingle-precision-constant -Wdouble-promotion
+CFLAGS += $(INC) -Wall -Werror -std=c99 -nostdlib -mthumb $(CFLAGS_MCU_$(MCU_SERIES)) -fsingle-precision-constant -Wdouble-promotion
 CFLAGS += -DMCU_$(MCU_SERIES) -D__$(CMSIS_MCU)__
 CFLAGS += $(CFLAGS_MOD) $(CFLAGS_EXTRA)
 CFLAGS += -DMPCONFIG_MCU_H='<boards/mpconfig_$(MCU_SERIES_LOWER).h>'
 
-LDFLAGS = -nostdlib $(addprefix -T,$(LD_FILES)) -Map=$@.map --cref
+LDFLAGS += -nostdlib $(addprefix -T,$(LD_FILES)) -Map=$@.map --cref
 LDFLAGS += $(LDFLAGS_MOD)
 
-LIBS = $(shell $(CC) $(CFLAGS) -print-libgcc-file-name)
+LIBS += $(shell $(CC) $(CFLAGS) -print-libgcc-file-name)
 
 # Tune for Debugging or Optimization
 CFLAGS += -g  # always include debug info in the ELF
diff --git a/ports/stm32/Makefile b/ports/stm32/Makefile
index 4b4a9f0ce3801..903730982ea01 100644
--- a/ports/stm32/Makefile
+++ b/ports/stm32/Makefile
@@ -99,7 +99,7 @@ CFLAGS += -fsingle-precision-constant
 endif
 endif
 
-LDFLAGS = -nostdlib -L $(LD_DIR) $(addprefix -T,$(LD_FILES)) -Wl,-Map=$(@:.elf=.map) -Wl,--cref
+LDFLAGS += -nostdlib -L $(LD_DIR) $(addprefix -T,$(LD_FILES)) -Wl,-Map=$(@:.elf=.map) -Wl,--cref
 LDFLAGS += -Wl,--defsym=_estack_reserve=8
 LIBS += "$(shell $(CC) $(CFLAGS) -print-libgcc-file-name)"
 
diff --git a/ports/stm32/mboot/Makefile b/ports/stm32/mboot/Makefile
index 4c903b4ff603e..176092f8c0a5f 100755
--- a/ports/stm32/mboot/Makefile
+++ b/ports/stm32/mboot/Makefile
@@ -58,7 +58,7 @@ INC += -I../$(USBDEV_DIR)/core/inc -I../$(USBDEV_DIR)/class/inc
 # the compiler does not optimise these functions in terms of themselves.
 CFLAGS_BUILTIN ?= -ffreestanding -fno-builtin -fno-lto
 
-CFLAGS = $(INC) -Wall -Wpointer-arith -Wdouble-promotion -Wfloat-conversion -Werror -std=gnu99 -nostdlib $(CFLAGS_MOD) $(CFLAGS_EXTRA)
+CFLAGS += $(INC) -Wall -Wpointer-arith -Wdouble-promotion -Wfloat-conversion -Werror -std=gnu99 -nostdlib $(CFLAGS_MOD) $(CFLAGS_EXTRA)
 CFLAGS += -D$(CMSIS_MCU)
 CFLAGS += $(CFLAGS_MCU_$(MCU_SERIES))
 CFLAGS += $(COPT)
@@ -75,8 +75,8 @@ CFLAGS += -DMICROPY_HW_STM32WB_FLASH_SYNCRONISATION=0
 CFLAGS += -DBOOTLOADER_DFU_USB_VID=$(BOOTLOADER_DFU_USB_VID) -DBOOTLOADER_DFU_USB_PID=$(BOOTLOADER_DFU_USB_PID)
 
 MBOOT_LD_FILES ?= stm32_memory.ld stm32_sections.ld
-LDFLAGS = -nostdlib -L . $(addprefix -T,$(MBOOT_LD_FILES)) -Map=$(@:.elf=.map) --cref
-LIBS = $(shell $(CC) $(CFLAGS) -print-libgcc-file-name)
+LDFLAGS += -nostdlib -L . $(addprefix -T,$(MBOOT_LD_FILES)) -Map=$(@:.elf=.map) --cref
+LIBS += $(shell $(CC) $(CFLAGS) -print-libgcc-file-name)
 
 # Remove uncalled code from the final image.
 CFLAGS += -fdata-sections -ffunction-sections
diff --git a/ports/teensy/Makefile b/ports/teensy/Makefile
index d7161fcbbc3b1..52fc812ad4e73 100644
--- a/ports/teensy/Makefile
+++ b/ports/teensy/Makefile
@@ -75,8 +75,8 @@ INC += -I$(TOP)/ports/stm32
 INC += -I$(BUILD)
 INC += -Icore
 
-CFLAGS = $(INC) -Wall -Wpointer-arith -Werror -std=c99 -nostdlib $(CFLAGS_CORTEX_M4)
-LDFLAGS = -nostdlib -T mk20dx256.ld -msoft-float -mfloat-abi=soft
+CFLAGS += $(INC) -Wall -Wpointer-arith -Werror -std=c99 -nostdlib $(CFLAGS_CORTEX_M4)
+LDFLAGS += -nostdlib -T mk20dx256.ld -msoft-float -mfloat-abi=soft
 
 ifeq ($(USE_ARDUINO_TOOLCHAIN),1)
 
diff --git a/ports/windows/Makefile b/ports/windows/Makefile
index 1e793800f804b..64334bc18b278 100644
--- a/ports/windows/Makefile
+++ b/ports/windows/Makefile
@@ -32,8 +32,8 @@ INC += -I$(BUILD)
 INC += -I$(VARIANT_DIR)
 
 # compiler settings
-CFLAGS = $(INC) -Wall -Wpointer-arith -Wdouble-promotion -Werror -std=gnu99 -DUNIX -D__USE_MINGW_ANSI_STDIO=1 $(CFLAGS_MOD) $(COPT) $(CFLAGS_EXTRA)
-LDFLAGS = $(LDFLAGS_MOD) -lm -lbcrypt $(LDFLAGS_EXTRA)
+CFLAGS += $(INC) -Wall -Wpointer-arith -Wdouble-promotion -Werror -std=gnu99 -DUNIX -D__USE_MINGW_ANSI_STDIO=1 $(CFLAGS_MOD) $(COPT) $(CFLAGS_EXTRA)
+LDFLAGS += -lm -lbcrypt $(LDFLAGS_EXTRA)
 
 # Debugging/Optimization
 ifdef DEBUG

From 67d05ed02b26b6ba2dcc638f2deed937a08417d7 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Sat, 8 Oct 2022 23:23:52 +1100
Subject: [PATCH 2734/3533] ports: Make generated pin.c handling more
 consistent across ports.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/mimxrt/Makefile |  7 +++---
 ports/nrf/Makefile    | 26 ++++++++++----------
 ports/samd/Makefile   |  5 +++-
 ports/stm32/Makefile  | 57 +++++++++++++++++++++----------------------
 ports/teensy/Makefile | 26 ++++++++++----------
 5 files changed, 61 insertions(+), 60 deletions(-)

diff --git a/ports/mimxrt/Makefile b/ports/mimxrt/Makefile
index 8493c47a715c1..6095f5fd23359 100644
--- a/ports/mimxrt/Makefile
+++ b/ports/mimxrt/Makefile
@@ -15,7 +15,7 @@ MICROPY_VFS_LFS2 ?= 1
 MICROPY_VFS_FAT ?= 1
 
 # qstr definitions (must come before including py.mk)
-QSTR_DEFS = qstrdefsport.h
+QSTR_DEFS += qstrdefsport.h
 QSTR_GLOBAL_DEPENDENCIES = $(BOARD_DIR)/mpconfigboard.h
 
 # Generation scripts
@@ -49,7 +49,6 @@ GEN_FLEXRAM_CONFIG_SRC = $(BUILD)/flexram_config.s
 GEN_PINS_AF_CONST = $(HEADER_BUILD)/pins_af_const.h
 GEN_PINS_AF_PY = $(BUILD)/pins_af.py
 GEN_PINS_HDR = $(HEADER_BUILD)/pins.h
-GEN_PINS_QSTR = $(BUILD)/pins_qstr.h
 GEN_PINS_SRC = $(BUILD)/pins_gen.c
 
 # =============================================================================
@@ -435,7 +434,7 @@ OBJ += $(addprefix $(BUILD)/, $(SRC_C:.c=.o))
 OBJ += $(addprefix $(BUILD)/, $(SRC_S:.s=.o))
 OBJ += $(addprefix $(BUILD)/, $(SRC_SS:.S=.o))
 OBJ += $(addprefix $(BUILD)/, $(SRC_MOD:.c=.o))
-OBJ += $(BUILD)/pins_gen.o
+OBJ += $(GEN_PINS_SRC:.c=.o)
 
 # Workaround for bug in older gcc, warning on "static usbd_device_t _usbd_dev = { 0 };"
 $(BUILD)/lib/tinyusb/src/device/usbd.o: CFLAGS += -Wno-missing-braces
@@ -486,7 +485,7 @@ $(BUILD)/%_gen.c $(HEADER_BUILD)/%.h: $(BOARD_PINS) $(MAKE_PINS) $(AF_FILE) $(PR
 		--iomux $(abspath $(TOP)/$(MCU_DIR)/drivers/fsl_iomuxc.h) \
 		--prefix $(PREFIX_FILE) --hdr $(GEN_PINS_HDR) > $(GEN_PINS_SRC)
 
-$(BUILD)/pins_gen.o: $(BUILD)/pins_gen.c
+$(GEN_PINS_SRC:.c=.o): $(GEN_PINS_SRC)
 	$(call compile_c)
 
 include $(TOP)/py/mkrules.mk
diff --git a/ports/nrf/Makefile b/ports/nrf/Makefile
index 38d0bd7fce72a..9e0354194dd63 100644
--- a/ports/nrf/Makefile
+++ b/ports/nrf/Makefile
@@ -45,7 +45,7 @@ endif
 -include boards/$(BOARD)/modules/boardmodules.mk
 
 # qstr definitions (must come before including py.mk)
-QSTR_DEFS = qstrdefsport.h $(BUILD)/pins_qstr.h
+QSTR_DEFS = qstrdefsport.h $(GEN_PINS_QSTR)
 
 # MicroPython feature configurations
 ifeq ($(DEBUG), 0)
@@ -106,6 +106,16 @@ endif
 NRF_DEFINES += -D$(MCU_SUB_VARIANT_UPPER)
 NRF_DEFINES += -DCONFIG_GPIO_AS_PINRESET
 
+MAKE_PINS = boards/make-pins.py
+BOARD_PINS = boards/$(BOARD)/pins.csv
+AF_FILE = $(MCU_VARIANT)_af.csv
+PREFIX_FILE = boards/$(MCU_VARIANT)_prefix.c
+GEN_PINS_SRC = $(BUILD)/pins_gen.c
+GEN_PINS_HDR = $(HEADER_BUILD)/pins.h
+GEN_PINS_QSTR = $(BUILD)/pins_qstr.h
+GEN_PINS_AF_CONST = $(HEADER_BUILD)/pins_af_const.h
+GEN_PINS_AF_PY = $(BUILD)/pins_af.py
+
 CFLAGS_CORTEX_M = -mthumb -mabi=aapcs -fsingle-precision-constant -Wdouble-promotion
 
 CFLAGS_MCU_m33 = $(CFLAGS_CORTEX_M) -mcpu=cortex-m33 -march=armv8-m.main+dsp -mcmse -mfpu=fpv5-sp-d16 -mfloat-abi=hard
@@ -354,7 +364,7 @@ OBJ += $(addprefix $(BUILD)/, $(SRC_NRFX_HAL:.c=.o))
 OBJ += $(addprefix $(BUILD)/, $(DRIVERS_SRC_C:.c=.o))
 OBJ += $(addprefix $(BUILD)/, $(SYSTEM_C_SRC:.c=.o))
 OBJ += $(addprefix $(BUILD)/, $(SRC_LIB:.c=.o))
-OBJ += $(BUILD)/pins_gen.o
+OBJ += $(GEN_PINS_SRC:.c=.o)
 
 $(BUILD)/$(OOFATFS_DIR)/ff.o: COPT += -Os
 $(filter $(PY_BUILD)/../extmod/vfs_fat_%.o, $(PY_O)): COPT += -Os
@@ -528,19 +538,9 @@ $(BUILD)/%_gen.c $(HEADER_BUILD)/%.h $(HEADER_BUILD)/%_af_const.h $(BUILD)/%_qst
 	$(ECHO) "Create $@"
 	$(Q)$(PYTHON) $(MAKE_PINS) --board $(BOARD_PINS) --af $(AF_FILE) --prefix $(PREFIX_FILE) --hdr $(GEN_PINS_HDR) --qstr $(GEN_PINS_QSTR) --af-const $(GEN_PINS_AF_CONST) --af-py $(GEN_PINS_AF_PY) > $(GEN_PINS_SRC)
 
-$(BUILD)/pins_gen.o: $(BUILD)/pins_gen.c
+$(GEN_PINS_SRC:.c=.o): $(GEN_PINS_SRC)
 	$(call compile_c)
 
-MAKE_PINS = boards/make-pins.py
-BOARD_PINS = boards/$(BOARD)/pins.csv
-AF_FILE = $(MCU_VARIANT)_af.csv
-PREFIX_FILE = boards/$(MCU_VARIANT)_prefix.c
-GEN_PINS_SRC = $(BUILD)/pins_gen.c
-GEN_PINS_HDR = $(HEADER_BUILD)/pins.h
-GEN_PINS_QSTR = $(BUILD)/pins_qstr.h
-GEN_PINS_AF_CONST = $(HEADER_BUILD)/pins_af_const.h
-GEN_PINS_AF_PY = $(BUILD)/pins_af.py
-
 ifneq ($(FROZEN_MANIFEST),)
 CFLAGS += -DMICROPY_QSTR_EXTRA_POOL=mp_qstr_frozen_const_pool
 CFLAGS += -DMICROPY_MODULE_FROZEN_MPY
diff --git a/ports/samd/Makefile b/ports/samd/Makefile
index 512820088a68a..735d25bf27cbe 100644
--- a/ports/samd/Makefile
+++ b/ports/samd/Makefile
@@ -106,7 +106,6 @@ SRC_C += \
 	mphalport.c \
 	pendsv.c \
 	pin_af.c \
-	$(BUILD)/pins.c \
 	samd_flash.c \
 	samd_isr.c \
 	samd_soc.c \
@@ -170,6 +169,7 @@ OBJ += $(addprefix $(BUILD)/, $(SRC_C:.c=.o))
 OBJ += $(addprefix $(BUILD)/, $(SRC_CXX:.cpp=.o))
 OBJ += $(addprefix $(BUILD)/, $(SRC_S:.s=.o))
 OBJ += $(addprefix $(BUILD)/, $(SRC_MOD:.c=.o))
+OBJ += $(GEN_PINS_SRC:.c=.o)
 
 ifneq ($(FROZEN_MANIFEST),)
 CFLAGS += -DMICROPY_MODULE_FROZEN_MPY
@@ -205,4 +205,7 @@ $(GEN_PINS_SRC) $(GEN_PINS_HDR): $(BOARD_PINS) | $(HEADER_BUILD)
 	$(ECHO) "Create $@"
 	$(Q)$(PYTHON) $(MAKE_PINS) --board $(BOARD_PINS) --pins $(GEN_PINS_SRC) --inc $(GEN_PINS_HDR)
 
+$(GEN_PINS_SRC:.c=.o): $(GEN_PINS_SRC)
+	$(call compile_c)
+
 include $(TOP)/py/mkrules.mk
diff --git a/ports/stm32/Makefile b/ports/stm32/Makefile
index 903730982ea01..403b68b240a1e 100644
--- a/ports/stm32/Makefile
+++ b/ports/stm32/Makefile
@@ -15,7 +15,7 @@ include ../../py/mkenv.mk
 include $(BOARD_DIR)/mpconfigboard.mk
 
 # Files that are generated and needed before the QSTR build.
-QSTR_GENERATED_HEADERS = $(BUILD)/pins_qstr.h $(BUILD)/modstm_qstr.h
+QSTR_GENERATED_HEADERS = $(GEN_PINS_QSTR) $(GEN_STMCONST_QSTR)
 
 # qstr definitions (must come before including py.mk)
 QSTR_DEFS += qstrdefsport.h $(QSTR_GENERATED_HEADERS)
@@ -57,6 +57,31 @@ OPENOCD_CONFIG ?= boards/openocd_stm32f4.cfg
 
 include stm32.mk
 
+PLLVALUES = boards/pllvalues.py
+MAKE_PINS = boards/make-pins.py
+BOARD_PINS = $(BOARD_DIR)/pins.csv
+PREFIX_FILE = boards/stm32f4xx_prefix.c
+GEN_PINS_SRC = $(BUILD)/pins_$(BOARD).c
+GEN_PINS_HDR = $(HEADER_BUILD)/pins.h
+GEN_PINS_QSTR = $(BUILD)/pins_qstr.h
+GEN_PINS_AF_CONST = $(HEADER_BUILD)/pins_af_const.h
+GEN_PINS_AF_DEFS = $(HEADER_BUILD)/pins_af_defs.h
+GEN_PINS_AF_PY = $(BUILD)/pins_af.py
+
+INSERT_USB_IDS = $(TOP)/tools/insert-usb-ids.py
+FILE2H = $(TOP)/tools/file2h.py
+
+USB_IDS_FILE = mpconfigboard_common.h
+CDCINF_TEMPLATE = pybcdc.inf_template
+GEN_CDCINF_FILE = $(HEADER_BUILD)/pybcdc.inf
+GEN_CDCINF_HEADER = $(HEADER_BUILD)/pybcdc_inf.h
+
+GEN_PLLFREQTABLE_HDR = $(HEADER_BUILD)/pllfreqtable.h
+GEN_STMCONST_HDR = $(HEADER_BUILD)/modstm_const.h
+GEN_STMCONST_QSTR = $(BUILD)/modstm_qstr.h
+GEN_STMCONST_MPZ = $(HEADER_BUILD)/modstm_mpz.h
+CMSIS_MCU_HDR = $(STM32LIB_CMSIS_ABS)/Include/$(CMSIS_MCU_LOWER).h
+
 # Select the cross compile prefix
 CROSS_COMPILE ?= arm-none-eabi-
 
@@ -537,8 +562,7 @@ OBJ += $(addprefix $(BUILD)/, $(HAL_SRC_C:.c=.o))
 OBJ += $(addprefix $(BUILD)/, $(USBDEV_SRC_C:.c=.o))
 OBJ += $(addprefix $(BUILD)/, $(SRC_C:.c=.o))
 OBJ += $(addprefix $(BUILD)/, $(SRC_CXX:.cpp=.o))
-OBJ += $(addprefix $(BUILD)/, $(SRC_MOD:.c=.o))
-OBJ += $(BUILD)/pins_$(BOARD).o
+OBJ += $(GEN_PINS_SRC:.c=.o)
 
 # This file contains performance critical functions so turn up the optimisation
 # level.  It doesn't add much to the code size and improves performance a bit.
@@ -689,25 +713,6 @@ $(BUILD)/firmware.hex: $(BUILD)/firmware.elf
 $(BUILD)/firmware.elf: $(OBJ)
 	$(call GENERATE_ELF,$@,$^)
 
-PLLVALUES = boards/pllvalues.py
-MAKE_PINS = boards/make-pins.py
-BOARD_PINS = $(BOARD_DIR)/pins.csv
-PREFIX_FILE = boards/stm32f4xx_prefix.c
-GEN_PINS_SRC = $(BUILD)/pins_$(BOARD).c
-GEN_PINS_HDR = $(HEADER_BUILD)/pins.h
-GEN_PINS_QSTR = $(BUILD)/pins_qstr.h
-GEN_PINS_AF_CONST = $(HEADER_BUILD)/pins_af_const.h
-GEN_PINS_AF_DEFS = $(HEADER_BUILD)/pins_af_defs.h
-GEN_PINS_AF_PY = $(BUILD)/pins_af.py
-
-INSERT_USB_IDS = $(TOP)/tools/insert-usb-ids.py
-FILE2H = $(TOP)/tools/file2h.py
-
-USB_IDS_FILE = mpconfigboard_common.h
-CDCINF_TEMPLATE = pybcdc.inf_template
-GEN_CDCINF_FILE = $(HEADER_BUILD)/pybcdc.inf
-GEN_CDCINF_HEADER = $(HEADER_BUILD)/pybcdc_inf.h
-
 # List of sources for qstr extraction
 SRC_QSTR += $(SRC_C) $(SRC_CXX) $(SRC_MOD) $(SHARED_SRC_C) $(EXTMOD_SRC_C)
 # Append any auto-generated sources that are needed by sources listed in
@@ -738,15 +743,9 @@ $(BUILD)/%_$(BOARD).c $(HEADER_BUILD)/%.h $(HEADER_BUILD)/%_af_const.h $(HEADER_
 		--af-defs $(GEN_PINS_AF_DEFS) --af-defs-cmp-strings \
 		--af-py $(GEN_PINS_AF_PY) > $(GEN_PINS_SRC)
 
-$(BUILD)/pins_$(BOARD).o: $(BUILD)/pins_$(BOARD).c
+$(GEN_PINS_SRC:.c=.o): $(GEN_PINS_SRC)
 	$(call compile_c)
 
-GEN_PLLFREQTABLE_HDR = $(HEADER_BUILD)/pllfreqtable.h
-GEN_STMCONST_HDR = $(HEADER_BUILD)/modstm_const.h
-GEN_STMCONST_QSTR = $(BUILD)/modstm_qstr.h
-GEN_STMCONST_MPZ = $(HEADER_BUILD)/modstm_mpz.h
-CMSIS_MCU_HDR = $(STM32LIB_CMSIS_ABS)/Include/$(CMSIS_MCU_LOWER).h
-
 modmachine.c: $(GEN_PLLFREQTABLE_HDR)
 $(GEN_PLLFREQTABLE_HDR): $(PLLVALUES) | $(HEADER_BUILD)
 	$(ECHO) "GEN $@"
diff --git a/ports/teensy/Makefile b/ports/teensy/Makefile
index 52fc812ad4e73..876ddf1c1da35 100644
--- a/ports/teensy/Makefile
+++ b/ports/teensy/Makefile
@@ -1,7 +1,7 @@
 include ../../py/mkenv.mk
 
 # qstr definitions (must come before including py.mk)
-QSTR_DEFS = qstrdefsport.h $(BUILD)/pins_qstr.h
+QSTR_DEFS = qstrdefsport.h $(GEN_PINS_QSTR)
 
 # MicroPython feature configurations
 MICROPY_ROM_TEXT_COMPRESSION ?= 1
@@ -66,6 +66,16 @@ $(info Using toolchain from PATH)
 CROSS_COMPILE ?= arm-none-eabi-
 endif
 
+MAKE_PINS = make-pins.py
+BOARD_PINS = teensy_pins.csv
+AF_FILE = mk20dx256_af.csv
+PREFIX_FILE = mk20dx256_prefix.c
+GEN_PINS_SRC = $(BUILD)/pins_gen.c
+GEN_PINS_HDR = $(HEADER_BUILD)/pins.h
+GEN_PINS_QSTR = $(BUILD)/pins_qstr.h
+GEN_PINS_AF_CONST = $(HEADER_BUILD)/pins_af_const.h
+GEN_PINS_AF_PY = $(BUILD)/pins_af.py
+
 CFLAGS_TEENSY = -DF_CPU=96000000 -DUSB_SERIAL -D__MK20DX256__
 CFLAGS_CORTEX_M4 = -mthumb -mtune=cortex-m4 -mcpu=cortex-m4 -msoft-float -mfloat-abi=soft -fsingle-precision-constant -Wdouble-promotion $(CFLAGS_TEENSY)
 
@@ -157,7 +167,7 @@ SRC_TEENSY = $(addprefix core/,\
 OBJ = $(PY_O) $(addprefix $(BUILD)/, $(SRC_C:.c=.o) $(STM_SRC_C:.c=.o) $(SRC_TEENSY:.c=.o))
 OBJ += $(addprefix $(BUILD)/, $(SHARED_SRC_C:.c=.o))
 OBJ += $(BUILD)/shared/runtime/gchelper_m3.o
-OBJ += $(BUILD)/pins_gen.o
+OBJ += $(GEN_PINS_SRC:.c=.o)
 
 all: hex
 hex: $(BUILD)/micropython.hex
@@ -195,16 +205,6 @@ $(BUILD)/%.hex: $(BUILD)/%.elf
 	$(ECHO) "HEX $<"
 	$(Q)$(OBJCOPY) -O ihex -R .eeprom "$<" "$@"
 
-MAKE_PINS = make-pins.py
-BOARD_PINS = teensy_pins.csv
-AF_FILE = mk20dx256_af.csv
-PREFIX_FILE = mk20dx256_prefix.c
-GEN_PINS_SRC = $(BUILD)/pins_gen.c
-GEN_PINS_HDR = $(HEADER_BUILD)/pins.h
-GEN_PINS_QSTR = $(BUILD)/pins_qstr.h
-GEN_PINS_AF_CONST = $(HEADER_BUILD)/pins_af_const.h
-GEN_PINS_AF_PY = $(BUILD)/pins_af.py
-
 # List of sources for qstr extraction
 SRC_QSTR += $(SRC_C) $(STM_SRC_C) $(SHARED_SRC_C)
 # Append any auto-generated sources that are needed by sources listed in
@@ -224,7 +224,7 @@ $(BUILD)/%_gen.c $(HEADER_BUILD)/%.h $(HEADER_BUILD)/%_af_const.h $(BUILD)/%_qst
 	$(ECHO) "Create $@"
 	$(Q)$(PYTHON) $(MAKE_PINS) --board $(BOARD_PINS) --af $(AF_FILE) --prefix $(PREFIX_FILE) --hdr $(GEN_PINS_HDR) --qstr $(GEN_PINS_QSTR) --af-const $(GEN_PINS_AF_CONST) --af-py $(GEN_PINS_AF_PY) > $(GEN_PINS_SRC)
 
-$(BUILD)/pins_gen.o: $(BUILD)/pins_gen.c
+$(GEN_PINS_SRC:.c=.o): $(GEN_PINS_SRC)
 	$(call compile_c)
 
 $(BUILD)/%.pp: $(BUILD)/%.c

From 3cc6decfc4d6b459014940ae01f90d4f1fae0da6 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Sat, 8 Oct 2022 23:28:24 +1100
Subject: [PATCH 2735/3533] py/py.mk: Make user-C-module handling
 self-contained in py.mk.

Removes the need for the port to add anything to OBJS or SRC_QSTR.

Also makes it possible for user-C-modules to differentiate between code
that should be processed for QSTR vs other files (e.g. helpers and
libraries).

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 docs/develop/cmodules.rst | 14 +++++++++++---
 ports/samd/Makefile       |  3 ++-
 ports/stm32/Makefile      |  3 ++-
 py/py.mk                  | 34 ++++++++++++++++++++++++++++------
 4 files changed, 43 insertions(+), 11 deletions(-)

diff --git a/docs/develop/cmodules.rst b/docs/develop/cmodules.rst
index 143057f7f1e06..1b3ba04da4af4 100644
--- a/docs/develop/cmodules.rst
+++ b/docs/develop/cmodules.rst
@@ -49,9 +49,17 @@ A MicroPython user C module is a directory with the following files:
   in your ``micropython.mk`` to a local make variable,
   eg ``EXAMPLE_MOD_DIR := $(USERMOD_DIR)``
 
-  Your ``micropython.mk`` must add your modules source files relative to your
-  expanded copy of ``$(USERMOD_DIR)`` to ``SRC_USERMOD``, eg
-  ``SRC_USERMOD += $(EXAMPLE_MOD_DIR)/example.c``
+  Your ``micropython.mk`` must add your modules source files to the
+  ``SRC_USERMOD_C`` or ``SRC_USERMOD_LIB_C`` variables. The former will be
+  processed for ``MP_QSTR_`` and ``MP_REGISTER_MODULE`` definitions, the latter
+  will not (e.g. helpers and library code that isn't MicroPython-specific).
+  These paths should include your expaned copy of ``$(USERMOD_DIR)``, e.g.::
+
+    SRC_USERMOD_C += $(EXAMPLE_MOD_DIR)/modexample.c
+    SRC_USERMOD_LIB_C += $(EXAMPLE_MOD_DIR)/utils/algorithm.c
+
+  Similarly, use ``SRC_USERMOD_CXX`` and ``SRC_USERMOD_LIB_CXX`` for C++
+  source files.
 
   If you have custom compiler options (like ``-I`` to add directories to search
   for header files), these should be added to ``CFLAGS_USERMOD`` for C code
diff --git a/ports/samd/Makefile b/ports/samd/Makefile
index 735d25bf27cbe..9386a8dacc5de 100644
--- a/ports/samd/Makefile
+++ b/ports/samd/Makefile
@@ -81,7 +81,8 @@ endif
 # Flags for optional C++ source code
 CXXFLAGS += $(filter-out -std=c99,$(CFLAGS))
 CXXFLAGS += $(CXXFLAGS_MOD)
-ifneq ($(SRC_CXX)$(SRC_MOD_CXX),)
+# TODO make this common -- shouldn't be using these "private" vars from py.mk
+ifneq ($(SRC_CXX)$(SRC_USERMOD_CXX)$(SRC_USERMOD_LIB_CXX),)
 LIBSTDCPP_FILE_NAME = "$(shell $(CXX) $(CXXFLAGS) -print-file-name=libstdc++.a)"
 LDFLAGS += -L"$(shell dirname $(LIBSTDCPP_FILE_NAME))"
 endif
diff --git a/ports/stm32/Makefile b/ports/stm32/Makefile
index 403b68b240a1e..4e594d19ff6b4 100644
--- a/ports/stm32/Makefile
+++ b/ports/stm32/Makefile
@@ -157,7 +157,8 @@ endif
 # Flags for optional C++ source code
 CXXFLAGS += $(filter-out -Wmissing-prototypes -Wold-style-definition -std=gnu99,$(CFLAGS))
 CXXFLAGS += $(CXXFLAGS_MOD)
-ifneq ($(SRC_CXX)$(SRC_MOD_CXX),)
+# TODO make this common -- shouldn't be using these "private" vars from py.mk
+ifneq ($(SRC_CXX)$(SRC_USERMOD_CXX)$(SRC_USERMOD_LIB_CXX),)
 LIBSTDCPP_FILE_NAME = "$(shell $(CXX) $(CXXFLAGS) -print-file-name=libstdc++.a)"
 LDFLAGS += -L"$(shell dirname $(LIBSTDCPP_FILE_NAME))"
 endif
diff --git a/py/py.mk b/py/py.mk
index 8aac460b478a0..ec69ca42d9715 100644
--- a/py/py.mk
+++ b/py/py.mk
@@ -32,22 +32,44 @@ endif
 ifneq ($(USER_C_MODULES),)
 # pre-define USERMOD variables as expanded so that variables are immediate
 # expanded as they're added to them
-SRC_USERMOD :=
+
+# C/C++ files that are included in the QSTR/module build
+SRC_USERMOD_C :=
 SRC_USERMOD_CXX :=
+# Other C/C++ files (e.g. libraries or helpers)
+SRC_USERMOD_LIB_C :=
+SRC_USERMOD_LIB_CXX :=
+# Optionally set flags
 CFLAGS_USERMOD :=
 CXXFLAGS_USERMOD :=
 LDFLAGS_USERMOD :=
+
+# Backwards compatibility with older user c modules that set SRC_USERMOD
+# added to SRC_USERMOD_C below
+SRC_USERMOD :=
+
 $(foreach module, $(wildcard $(USER_C_MODULES)/*/micropython.mk), \
     $(eval USERMOD_DIR = $(patsubst %/,%,$(dir $(module))))\
     $(info Including User C Module from $(USERMOD_DIR))\
 	$(eval include $(module))\
 )
 
-SRC_MOD += $(patsubst $(USER_C_MODULES)/%.c,%.c,$(SRC_USERMOD))
-SRC_MOD_CXX += $(patsubst $(USER_C_MODULES)/%.cpp,%.cpp,$(SRC_USERMOD_CXX))
-CFLAGS_MOD += $(CFLAGS_USERMOD)
-CXXFLAGS_MOD += $(CXXFLAGS_USERMOD)
-LDFLAGS_MOD += $(LDFLAGS_USERMOD)
+SRC_USERMOD_C += $(SRC_USERMOD)
+
+SRC_USERMOD_PATHFIX_C += $(patsubst $(USER_C_MODULES)/%.c,%.c,$(SRC_USERMOD_C))
+SRC_USERMOD_PATHFIX_CXX += $(patsubst $(USER_C_MODULES)/%.cpp,%.cpp,$(SRC_USERMOD_CXX))
+SRC_USERMOD_PATHFIX_LIB_C += $(patsubst $(USER_C_MODULES)/%.c,%.c,$(SRC_USERMOD_LIB_C))
+SRC_USERMOD_PATHFIX_LIB_CXX += $(patsubst $(USER_C_MODULES)/%.cpp,%.cpp,$(SRC_USERMOD_LIB_CXX))
+
+CFLAGS += $(CFLAGS_USERMOD)
+CXXFLAGS += $(CXXFLAGS_USERMOD)
+LDFLAGS += $(LDFLAGS_USERMOD)
+
+SRC_QSTR += $(SRC_USERMOD_PATHFIX_C) $(SRC_USERMOD_PATHFIX_CXX)
+PY_O += $(addprefix $(BUILD)/, $(SRC_USERMOD_PATHFIX_C:.c=.o))
+PY_O += $(addprefix $(BUILD)/, $(SRC_USERMOD_PATHFIX_CXX:.cpp=.o))
+PY_O += $(addprefix $(BUILD)/, $(SRC_USERMOD_PATHFIX_LIB_C:.c=.o))
+PY_O += $(addprefix $(BUILD)/, $(SRC_USERMOD_PATHFIX_LIB_CXX:.cpp=.o))
 endif
 
 # py object files

From 065af04a4e86aa5bdbdedb89140241e5d0030ffb Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Sat, 8 Oct 2022 23:38:18 +1100
Subject: [PATCH 2736/3533] unix/Makefile: Don't use _MOD variable names.

This conflicts with the triple-usage of these variables for user-C-modules
and extmod source.

For CFLAGS_MOD, just use CFLAGS directly. For SRC, use SRC_C directly as
the relevant files are all guarded by the preprocessor anyway.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/unix/Makefile | 46 ++++++++++++++++++++++-----------------------
 ports/unix/modjni.c | 10 +++++-----
 2 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/ports/unix/Makefile b/ports/unix/Makefile
index 709cc79853d57..e234621346fa0 100644
--- a/ports/unix/Makefile
+++ b/ports/unix/Makefile
@@ -110,27 +110,25 @@ ifeq ($(MICROPY_FORCE_32BIT),1)
 # starting with linux-libc-dev:i386
 ifeq ($(MICROPY_PY_FFI),1)
 ifeq ($(UNAME_S),Linux)
-CFLAGS_MOD += -I/usr/include/i686-linux-gnu
+CFLAGS += -I/usr/include/i686-linux-gnu
 endif
 endif
 endif
 
 ifeq ($(MICROPY_USE_READLINE),1)
 INC += -I$(TOP)/shared/readline
-CFLAGS_MOD += -DMICROPY_USE_READLINE=1
+CFLAGS += -DMICROPY_USE_READLINE=1
 SHARED_SRC_C_EXTRA += readline/readline.c
 endif
 ifeq ($(MICROPY_PY_TERMIOS),1)
-CFLAGS_MOD += -DMICROPY_PY_TERMIOS=1
-SRC_MOD += modtermios.c
+CFLAGS += -DMICROPY_PY_TERMIOS=1
 endif
 ifeq ($(MICROPY_PY_SOCKET),1)
-CFLAGS_MOD += -DMICROPY_PY_SOCKET=1
-SRC_MOD += modusocket.c
+CFLAGS += -DMICROPY_PY_SOCKET=1
 endif
 ifeq ($(MICROPY_PY_THREAD),1)
-CFLAGS_MOD += -DMICROPY_PY_THREAD=1 -DMICROPY_PY_THREAD_GIL=0
-LDFLAGS_MOD += $(LIBPTHREAD)
+CFLAGS += -DMICROPY_PY_THREAD=1 -DMICROPY_PY_THREAD_GIL=0
+LDFLAGS += $(LIBPTHREAD)
 endif
 
 ifeq ($(MICROPY_PY_USSL),1)
@@ -139,7 +137,7 @@ GIT_SUBMODULES += lib/axtls
 endif
 ifeq ($(MICROPY_SSL_MBEDTLS),1)
 GIT_SUBMODULES += lib/mbedtls
-CFLAGS_MOD += -DMBEDTLS_CONFIG_FILE='"mbedtls/mbedtls_config.h"'
+CFLAGS += -DMBEDTLS_CONFIG_FILE='"mbedtls/mbedtls_config.h"'
 endif
 endif
 
@@ -163,8 +161,8 @@ MICROPY_BLUETOOTH_BTSTACK ?= 1
 endif
 endif
 
-CFLAGS_MOD += -DMICROPY_PY_BLUETOOTH=1
-CFLAGS_MOD += -DMICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE=1
+CFLAGS += -DMICROPY_PY_BLUETOOTH=1
+CFLAGS += -DMICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE=1
 
 ifeq ($(MICROPY_BLUETOOTH_BTSTACK),1)
 
@@ -192,7 +190,7 @@ else
 
 # NimBLE is enabled.
 GIT_SUBMODULES += lib/mynewt-nimble
-CFLAGS_MOD += -DMICROPY_PY_BLUETOOTH_ENABLE_L2CAP_CHANNELS=1
+CFLAGS += -DMICROPY_PY_BLUETOOTH_ENABLE_L2CAP_CHANNELS=1
 include $(TOP)/extmod/nimble/nimble.mk
 
 endif
@@ -205,31 +203,29 @@ ifeq ($(MICROPY_STANDALONE),1)
 # Build libffi from source.
 GIT_SUBMODULES += lib/libffi
 DEPLIBS += libffi
-LIBFFI_CFLAGS_MOD := -I$(shell ls -1d $(BUILD)/lib/libffi/out/lib/libffi-*/include)
+LIBFFI_CFLAGS := -I$(shell ls -1d $(BUILD)/lib/libffi/out/lib/libffi-*/include)
  ifeq ($(MICROPY_FORCE_32BIT),1)
-  LIBFFI_LDFLAGS_MOD = $(BUILD)/lib/libffi/out/lib32/libffi.a
+  LIBFFI_LDFLAGS = $(BUILD)/lib/libffi/out/lib32/libffi.a
  else
-  LIBFFI_LDFLAGS_MOD = $(BUILD)/lib/libffi/out/lib/libffi.a
+  LIBFFI_LDFLAGS = $(BUILD)/lib/libffi/out/lib/libffi.a
  endif
 else
 # Use system version of libffi.
-LIBFFI_CFLAGS_MOD := $(shell pkg-config --cflags libffi)
-LIBFFI_LDFLAGS_MOD := $(shell pkg-config --libs libffi)
+LIBFFI_CFLAGS := $(shell pkg-config --cflags libffi)
+LIBFFI_LDFLAGS := $(shell pkg-config --libs libffi)
 endif
 
 ifeq ($(UNAME_S),Linux)
-LIBFFI_LDFLAGS_MOD += -ldl
+LIBFFI_LDFLAGS += -ldl
 endif
 
-CFLAGS_MOD += $(LIBFFI_CFLAGS_MOD) -DMICROPY_PY_FFI=1
-LDFLAGS_MOD += $(LIBFFI_LDFLAGS_MOD)
-SRC_MOD += modffi.c
+CFLAGS += $(LIBFFI_CFLAGS) -DMICROPY_PY_FFI=1
+LDFLAGS += $(LIBFFI_LDFLAGS)
 endif
 
 ifeq ($(MICROPY_PY_JNI),1)
 # Path for 64-bit OpenJDK, should be adjusted for other JDKs
-CFLAGS_MOD += -I/usr/lib/jvm/java-7-openjdk-amd64/include -DMICROPY_PY_JNI=1
-SRC_MOD += modjni.c
+CFLAGS += -I/usr/lib/jvm/java-7-openjdk-amd64/include -DMICROPY_PY_JNI=1
 endif
 
 # source files
@@ -250,6 +246,10 @@ SRC_C += \
 	mpbtstackport_usb.c \
 	mpnimbleport.c \
 	$(SRC_MOD) \
+	modtermios.c \
+	modusocket.c \
+	modffi.c \
+	modjni.c \
 	$(wildcard $(VARIANT_DIR)/*.c)
 
 SHARED_SRC_C += $(addprefix shared/,\
diff --git a/ports/unix/modjni.c b/ports/unix/modjni.c
index 5988876f888ab..10622f588f8aa 100644
--- a/ports/unix/modjni.c
+++ b/ports/unix/modjni.c
@@ -24,19 +24,19 @@
  * THE SOFTWARE.
  */
 
+#include "py/runtime.h"
+#include "py/binary.h"
+
+#if MICROPY_PY_JNI
+
 #include <assert.h>
 #include <string.h>
 #include <errno.h>
 #include <dlfcn.h>
 #include <ctype.h>
 
-#include "py/runtime.h"
-#include "py/binary.h"
-
 #include <jni.h>
 
-#if MICROPY_PY_JNI
-
 #define JJ(call, ...) (*env)->call(env, __VA_ARGS__)
 #define JJ1(call) (*env)->call(env)
 #define MATCH(s, static) (!strncmp(s, static, sizeof(static) - 1))

From 87011f63530f55411843622af8b1bc2dbf98a6f7 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Sat, 8 Oct 2022 23:47:57 +1100
Subject: [PATCH 2737/3533] extmod/extmod.mk: Make extmod.mk handle
 GIT_SUBMODULES.

This applies to nimble, btstack, axtls, mbedtls, lwip.

Rather than having the ports individually manage GIT_SUBMODULES for these
components, make extmod.mk append them when the relevant feature is
enabled.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 extmod/btstack/btstack.mk | 1 +
 extmod/extmod.mk          | 4 +++-
 extmod/nimble/nimble.mk   | 2 ++
 ports/mimxrt/Makefile     | 2 +-
 ports/stm32/Makefile      | 4 +---
 ports/unix/Makefile       | 5 +----
 tools/ci.sh               | 6 ++++--
 7 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/extmod/btstack/btstack.mk b/extmod/btstack/btstack.mk
index 7ecc230003175..14b8d08bf1d36 100644
--- a/extmod/btstack/btstack.mk
+++ b/extmod/btstack/btstack.mk
@@ -2,6 +2,7 @@
 
 ifeq ($(MICROPY_BLUETOOTH_BTSTACK),1)
 
+GIT_SUBMODULES += lib/btstack
 MICROPY_BLUETOOTH_BTSTACK_USB ?= 0
 
 BTSTACK_EXTMOD_DIR = extmod/btstack
diff --git a/extmod/extmod.mk b/extmod/extmod.mk
index ae3e45bd55cb7..bd897199178a2 100644
--- a/extmod/extmod.mk
+++ b/extmod/extmod.mk
@@ -100,6 +100,7 @@ CFLAGS_MOD += -DMICROPY_PY_USSL=1
 ifeq ($(MICROPY_SSL_AXTLS),1)
 CFLAGS_MOD += -DMICROPY_SSL_AXTLS=1 -I$(TOP)/lib/axtls/ssl -I$(TOP)/lib/axtls/crypto -I$(TOP)/extmod/axtls-include
 AXTLS_DIR = lib/axtls
+GIT_SUBMODULES += $(AXTLS_DIR)
 $(BUILD)/$(AXTLS_DIR)/%.o: CFLAGS += -Wno-all -Wno-unused-parameter -Wno-uninitialized -Wno-sign-compare -Wno-old-style-definition -Dmp_stream_errno=errno $(AXTLS_DEFS_EXTRA)
 SRC_MOD += $(addprefix $(AXTLS_DIR)/,\
 	ssl/asn1.c \
@@ -118,7 +119,7 @@ SRC_MOD += $(addprefix $(AXTLS_DIR)/,\
 	)
 else ifeq ($(MICROPY_SSL_MBEDTLS),1)
 MBEDTLS_DIR = lib/mbedtls
-CFLAGS_MOD += -DMICROPY_SSL_MBEDTLS=1 -I$(TOP)/$(MBEDTLS_DIR)/include
+GIT_SUBMODULES += $(MBEDTLS_DIR)
 SRC_MOD += lib/mbedtls_errors/mp_mbedtls_errors.c
 SRC_MOD += $(addprefix $(MBEDTLS_DIR)/library/,\
 	aes.c \
@@ -199,6 +200,7 @@ endif
 # lwip
 
 ifeq ($(MICROPY_PY_LWIP),1)
+GIT_SUBMODULES += lib/lwip
 # A port should add an include path where lwipopts.h can be found (eg extmod/lwip-include)
 LWIP_DIR = lib/lwip/src
 INC += -I$(TOP)/$(LWIP_DIR)/include
diff --git a/extmod/nimble/nimble.mk b/extmod/nimble/nimble.mk
index 806630074eb87..e825261eeadc7 100644
--- a/extmod/nimble/nimble.mk
+++ b/extmod/nimble/nimble.mk
@@ -17,6 +17,8 @@ CFLAGS_MOD += -DMICROPY_BLUETOOTH_NIMBLE_BINDINGS_ONLY=$(MICROPY_BLUETOOTH_NIMBL
 
 ifeq ($(MICROPY_BLUETOOTH_NIMBLE_BINDINGS_ONLY),0)
 
+GIT_SUBMODULES += lib/mynewt-nimble
+
 # On all ports where we provide the full implementation (i.e. not just
 # bindings like on ESP32), then we don't need to use the ringbuffer. In this
 # case, all NimBLE events are run by the MicroPython scheduler. On Unix, the
diff --git a/ports/mimxrt/Makefile b/ports/mimxrt/Makefile
index 6095f5fd23359..b8b08cb011f3a 100644
--- a/ports/mimxrt/Makefile
+++ b/ports/mimxrt/Makefile
@@ -7,7 +7,7 @@ BOARD_DIR ?= boards/$(BOARD)
 BUILD ?= build-$(BOARD)
 PORT ?= /dev/ttyACM0
 CROSS_COMPILE ?= arm-none-eabi-
-GIT_SUBMODULES += lib/tinyusb lib/nxp_driver lib/lwip lib/mbedtls
+GIT_SUBMODULES += lib/tinyusb lib/nxp_driver
 
 # MicroPython feature configurations
 FROZEN_MANIFEST ?= boards/manifest.py
diff --git a/ports/stm32/Makefile b/ports/stm32/Makefile
index 4e594d19ff6b4..8b503112aef7f 100644
--- a/ports/stm32/Makefile
+++ b/ports/stm32/Makefile
@@ -35,7 +35,7 @@ MBOOT_TEXT0_ADDR ?= 0x08000000
 include $(TOP)/py/py.mk
 include $(TOP)/extmod/extmod.mk
 
-GIT_SUBMODULES += lib/libhydrogen lib/lwip lib/mbedtls lib/stm32lib
+GIT_SUBMODULES += lib/libhydrogen lib/stm32lib
 
 query-variants:
 	$(ECHO) "VARIANTS:" $(BOARD_VARIANTS)
@@ -531,14 +531,12 @@ endif
 endif
 
 ifeq ($(MICROPY_BLUETOOTH_NIMBLE),1)
-GIT_SUBMODULES += lib/mynewt-nimble
 CFLAGS_MOD += -DMICROPY_PY_BLUETOOTH_ENABLE_L2CAP_CHANNELS=1
 include $(TOP)/extmod/nimble/nimble.mk
 SRC_C += mpnimbleport.c
 endif
 
 ifeq ($(MICROPY_BLUETOOTH_BTSTACK),1)
-GIT_SUBMODULES += lib/btstack
 MICROPY_BLUETOOTH_BTSTACK_H4 ?= 1
 include $(TOP)/extmod/btstack/btstack.mk
 SRC_C += mpbtstackport.c
diff --git a/ports/unix/Makefile b/ports/unix/Makefile
index e234621346fa0..facdab2e045dd 100644
--- a/ports/unix/Makefile
+++ b/ports/unix/Makefile
@@ -133,10 +133,9 @@ endif
 
 ifeq ($(MICROPY_PY_USSL),1)
 ifeq ($(MICROPY_SSL_AXTLS),1)
-GIT_SUBMODULES += lib/axtls
+
 endif
 ifeq ($(MICROPY_SSL_MBEDTLS),1)
-GIT_SUBMODULES += lib/mbedtls
 CFLAGS += -DMBEDTLS_CONFIG_FILE='"mbedtls/mbedtls_config.h"'
 endif
 endif
@@ -182,14 +181,12 @@ endif
 endif
 
 # BTstack is enabled.
-GIT_SUBMODULES += lib/btstack
 include $(TOP)/extmod/btstack/btstack.mk
 SRC_BTSTACK += lib/btstack/platform/embedded/btstack_run_loop_embedded.c
 
 else
 
 # NimBLE is enabled.
-GIT_SUBMODULES += lib/mynewt-nimble
 CFLAGS += -DMICROPY_PY_BLUETOOTH_ENABLE_L2CAP_CHANNELS=1
 include $(TOP)/extmod/nimble/nimble.mk
 
diff --git a/tools/ci.sh b/tools/ci.sh
index 9963f7796cc06..86fd44fdfbae6 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -198,8 +198,9 @@ function ci_mimxrt_setup {
 
 function ci_mimxrt_build {
     make ${MAKEOPTS} -C mpy-cross
-    make ${MAKEOPTS} -C ports/mimxrt submodules
+    make ${MAKEOPTS} -C ports/mimxrt BOARD=MIMXRT1020_EVK submodules
     make ${MAKEOPTS} -C ports/mimxrt BOARD=MIMXRT1020_EVK
+    make ${MAKEOPTS} -C ports/mimxrt BOARD=TEENSY40 submodules
     make ${MAKEOPTS} -C ports/mimxrt BOARD=TEENSY40
 }
 
@@ -310,6 +311,7 @@ function ci_stm32_setup {
 function ci_stm32_pyb_build {
     make ${MAKEOPTS} -C mpy-cross
     make ${MAKEOPTS} -C ports/stm32 MICROPY_PY_NETWORK_WIZNET5K=5200 submodules
+    make ${MAKEOPTS} -C ports/stm32 BOARD=PYBD_SF2 submodules
     git submodule update --init lib/btstack
     git submodule update --init lib/mynewt-nimble
     make ${MAKEOPTS} -C ports/stm32 BOARD=PYBV11 MICROPY_PY_NETWORK_WIZNET5K=5200 USER_C_MODULES=../../examples/usercmodule
@@ -326,7 +328,7 @@ function ci_stm32_pyb_build {
 
 function ci_stm32_nucleo_build {
     make ${MAKEOPTS} -C mpy-cross
-    make ${MAKEOPTS} -C ports/stm32 submodules
+    make ${MAKEOPTS} -C ports/stm32 BOARD=NUCLEO_H743ZI submodules
     git submodule update --init lib/mynewt-nimble
 
     # Test building various MCU families, some with additional options.

From d6d87225585a9494093d791c807bce652e4c82d8 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Sat, 8 Oct 2022 23:59:08 +1100
Subject: [PATCH 2738/3533] extmod: Make extmod.mk self-contained.

This makes it so that all a port needs to do is set the relevant variables
and "include extmod.mk" and doesn't need to worry about adding anything to
OBJ, CFLAGS, SRC_QSTR, etc.

Make all extmod variables (src, flags, etc) private to extmod.mk.

Also move common/shared, extmod-related fragments (e.g. wiznet, cyw43,
bluetooth) into extmod.mk.

Now that SRC_MOD, CFLAGS_MOD, CXXFLAGS_MOD are unused by both extmod.mk
(and user-C-modules in a previous commit), remove all uses of them from
port makefiles.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 extmod/btstack/btstack.mk            |  38 +++--
 extmod/extmod.mk                     | 208 ++++++++++++++++++---------
 extmod/network_wiznet5k.c            |   5 +-
 extmod/nimble/nimble.mk              |  14 +-
 mpy-cross/Makefile                   |   2 +-
 ports/cc3200/Makefile                |   1 -
 ports/esp8266/Makefile               |  13 +-
 ports/mimxrt/Makefile                |  17 +--
 ports/minimal/Makefile               |  13 +-
 ports/nrf/Makefile                   |  11 +-
 ports/renesas-ra/Makefile            |  18 +--
 ports/samd/Makefile                  |  23 ++-
 ports/samd/mcu/samd51/mpconfigmcu.mk |   2 +-
 ports/stm32/Makefile                 |  67 +--------
 ports/stm32/mboot/Makefile           |   2 +-
 ports/stm32/mpconfigport.h           |   8 ++
 ports/teensy/Makefile                |   5 +-
 ports/unix/Makefile                  |  48 +------
 ports/unix/mpconfigport.h            |   8 ++
 ports/windows/Makefile               |  13 +-
 py/py.mk                             |   2 +-
 21 files changed, 235 insertions(+), 283 deletions(-)

diff --git a/extmod/btstack/btstack.mk b/extmod/btstack/btstack.mk
index 14b8d08bf1d36..ca95931562cde 100644
--- a/extmod/btstack/btstack.mk
+++ b/extmod/btstack/btstack.mk
@@ -3,17 +3,19 @@
 ifeq ($(MICROPY_BLUETOOTH_BTSTACK),1)
 
 GIT_SUBMODULES += lib/btstack
+
 MICROPY_BLUETOOTH_BTSTACK_USB ?= 0
+MICROPY_BLUETOOTH_BTSTACK_H4 ?= 1
 
 BTSTACK_EXTMOD_DIR = extmod/btstack
 
-EXTMOD_SRC_C += extmod/btstack/modbluetooth_btstack.c
+SRC_EXTMOD_C += $(BTSTACK_EXTMOD_DIR)/modbluetooth_btstack.c
 
 INC += -I$(TOP)/$(BTSTACK_EXTMOD_DIR)
 
-CFLAGS_MOD += -DMICROPY_BLUETOOTH_BTSTACK=1
-CFLAGS_MOD += -DMICROPY_PY_BLUETOOTH_USE_SYNC_EVENTS=1
-CFLAGS_MOD += -DMICROPY_PY_BLUETOOTH_ENABLE_PAIRING_BONDING=1
+CFLAGS_EXTMOD += -DMICROPY_BLUETOOTH_BTSTACK=1
+CFLAGS_EXTMOD += -DMICROPY_PY_BLUETOOTH_USE_SYNC_EVENTS=1
+CFLAGS_EXTMOD += -DMICROPY_PY_BLUETOOTH_ENABLE_PAIRING_BONDING=1
 
 BTSTACK_DIR = $(TOP)/lib/btstack
 
@@ -28,44 +30,50 @@ INC += -I$(BTSTACK_DIR)/3rd-party/bluedroid/encoder/include
 INC += -I$(BTSTACK_DIR)/3rd-party/md5
 INC += -I$(BTSTACK_DIR)/3rd-party/yxml
 
-SRC_BTSTACK = \
+SRC_BTSTACK_C = \
 	$(addprefix lib/btstack/src/, $(SRC_FILES)) \
 	$(addprefix lib/btstack/src/ble/, $(filter-out %_tlv.c, $(SRC_BLE_FILES))) \
 
 ifeq ($(MICROPY_BLUETOOTH_BTSTACK_USB),1)
 ifeq ($(MICROPY_BLUETOOTH_BTSTACK_H4),1)
-	$(error Cannot specifiy both MICROPY_BLUETOOTH_BTSTACK_USB and MICROPY_BLUETOOTH_BTSTACK_H4)
+	$(error Cannot enable both MICROPY_BLUETOOTH_BTSTACK_USB and MICROPY_BLUETOOTH_BTSTACK_H4)
+endif
+endif
+
+ifneq ($(MICROPY_BLUETOOTH_BTSTACK_USB),1)
+ifneq ($(MICROPY_BLUETOOTH_BTSTACK_H4),1)
+	$(error Must enable one of MICROPY_BLUETOOTH_BTSTACK_USB or MICROPY_BLUETOOTH_BTSTACK_H4)
 endif
 endif
 
 ifeq ($(MICROPY_BLUETOOTH_BTSTACK_USB),1)
-SRC_BTSTACK += \
+SRC_BTSTACK_C += \
 	lib/btstack/platform/libusb/hci_transport_h2_libusb.c
 
-CFLAGS_MOD += -DMICROPY_BLUETOOTH_BTSTACK_USB=1
+CFLAGS_EXTMOD += -DMICROPY_BLUETOOTH_BTSTACK_USB=1
 
-CFLAGS  += $(shell pkg-config libusb-1.0 --cflags)
-LDFLAGS += $(shell pkg-config libusb-1.0 --libs)
+CFLAGS_THIRDPARTY += $(shell pkg-config libusb-1.0 --cflags)
+LDFLAGS_THIRDPARTY += $(shell pkg-config libusb-1.0 --libs)
 endif
 
 ifeq ($(MICROPY_BLUETOOTH_BTSTACK_H4),1)
-SRC_BTSTACK += \
+SRC_BTSTACK_C += \
 	lib/btstack/src/hci_transport_h4.c \
 	lib/btstack/chipset/zephyr/btstack_chipset_zephyr.c
 
-EXTMOD_SRC_C += \
+SRC_BTSTACK_C += \
 	extmod/btstack/btstack_hci_uart.c \
 
-CFLAGS_MOD += -DMICROPY_BLUETOOTH_BTSTACK_H4=1
+CFLAGS_EXTMOD += -DMICROPY_BLUETOOTH_BTSTACK_H4=1
 endif
 
 ifeq ($(MICROPY_BLUETOOTH_BTSTACK_ENABLE_CLASSIC),1)
 include $(BTSTACK_DIR)/src/classic/Makefile.inc
-SRC_BTSTACK += \
+SRC_BTSTACK_C += \
 	$(addprefix lib/btstack/src/classic/, $(SRC_CLASSIC_FILES))
 endif
 
-LIB_SRC_C += $(SRC_BTSTACK)
+SRC_THIRDPARTY_C += $(SRC_BTSTACK_C)
 
 # Suppress some warnings.
 BTSTACK_WARNING_CFLAGS = -Wno-old-style-definition -Wno-unused-variable -Wno-unused-parameter -Wno-implicit-fallthrough
diff --git a/extmod/extmod.mk b/extmod/extmod.mk
index bd897199178a2..3b10fc857c80e 100644
--- a/extmod/extmod.mk
+++ b/extmod/extmod.mk
@@ -1,55 +1,66 @@
 # This makefile fragment adds the source code files for the core extmod modules
 # and provides rules to build 3rd-party components for extmod modules.
 
-PY_EXTMOD_O_BASENAME = \
-	extmod/moduasyncio.o \
-	extmod/moductypes.o \
-	extmod/modujson.o \
-	extmod/moduos.o \
-	extmod/modure.o \
-	extmod/moduzlib.o \
-	extmod/moduheapq.o \
-	extmod/modutimeq.o \
-	extmod/moduhashlib.o \
-	extmod/moducryptolib.o \
-	extmod/modubinascii.o \
-	extmod/virtpin.o \
-	extmod/machine_bitstream.o \
-	extmod/machine_mem.o \
-	extmod/machine_pinbase.o \
-	extmod/machine_signal.o \
-	extmod/machine_pulse.o \
-	extmod/machine_pwm.o \
-	extmod/machine_i2c.o \
-	extmod/machine_spi.o \
-	extmod/modbluetooth.o \
-	extmod/modlwip.o \
-	extmod/modussl_axtls.o \
-	extmod/modussl_mbedtls.o \
-	extmod/moduplatform.o\
-	extmod/modurandom.o \
-	extmod/moduselect.o \
-	extmod/moduwebsocket.o \
-	extmod/modwebrepl.o \
-	extmod/modframebuf.o \
-	extmod/vfs.o \
-	extmod/vfs_blockdev.o \
-	extmod/vfs_reader.o \
-	extmod/vfs_posix.o \
-	extmod/vfs_posix_file.o \
-	extmod/vfs_fat.o \
-	extmod/vfs_fat_diskio.o \
-	extmod/vfs_fat_file.o \
-	extmod/vfs_lfs.o \
-	extmod/utime_mphal.o \
-	extmod/uos_dupterm.o \
-	shared/libc/abort_.o \
-	shared/libc/printf.o \
+SRC_EXTMOD_C += \
+	extmod/machine_bitstream.c \
+	extmod/machine_i2c.c \
+	extmod/machine_mem.c \
+	extmod/machine_pinbase.c \
+	extmod/machine_pulse.c \
+	extmod/machine_pwm.c \
+	extmod/machine_signal.c \
+	extmod/machine_spi.c \
+	extmod/modbluetooth.c \
+	extmod/modbtree.c \
+	extmod/modframebuf.c \
+	extmod/modlwip.c \
+	extmod/modnetwork.c \
+	extmod/modonewire.c \
+	extmod/moduasyncio.c \
+	extmod/modubinascii.c \
+	extmod/moducryptolib.c \
+	extmod/moductypes.c \
+	extmod/moduhashlib.c \
+	extmod/moduheapq.c \
+	extmod/modujson.c \
+	extmod/moduos.c \
+	extmod/moduplatform.c\
+	extmod/modurandom.c \
+	extmod/modure.c \
+	extmod/moduselect.c \
+	extmod/modusocket.c \
+	extmod/modussl_axtls.c \
+	extmod/modussl_mbedtls.c \
+	extmod/modutimeq.c \
+	extmod/moduwebsocket.c \
+	extmod/moduzlib.c \
+	extmod/modwebrepl.c \
+	extmod/network_cyw43.c \
+	extmod/network_ninaw10.c \
+	extmod/network_wiznet5k.c \
+	extmod/uos_dupterm.c \
+	extmod/utime_mphal.c \
+	extmod/vfs.c \
+	extmod/vfs_blockdev.c \
+	extmod/vfs_fat.c \
+	extmod/vfs_fat_diskio.c \
+	extmod/vfs_fat_file.c \
+	extmod/vfs_lfs.c \
+	extmod/vfs_posix.c \
+	extmod/vfs_posix_file.c \
+	extmod/vfs_reader.c \
+	extmod/virtpin.c \
+	shared/libc/abort_.c \
+	shared/libc/printf.c \
 
-PY_EXTMOD_O = $(addprefix $(BUILD)/, $(PY_EXTMOD_O_BASENAME))
+SRC_THIRDPARTY_C += \
 
-PY_O += $(PY_EXTMOD_O)
-SRC_QSTR += $(PY_EXTMOD_O_BASENAME:.o=.c)
+PY_O += $(addprefix $(BUILD)/, $(SRC_EXTMOD_C:.c=.o))
+PY_O += $(addprefix $(BUILD)/, $(SRC_THIRDPARTY_C:.c=.o))
+SRC_QSTR += $(SRC_EXTMOD_C)
+
+CFLAGS += $(CFLAGS_EXTMOD) $(CFLAGS_THIRDPARTY)
+LDFLAGS += $(LDFLAGS_EXTMOD) $(LDFLAGS_THIRDPARTY)
 
 ################################################################################
 # VFS FAT FS
@@ -57,11 +68,11 @@ SRC_QSTR += $(PY_EXTMOD_O_BASENAME:.o=.c)
 OOFATFS_DIR = lib/oofatfs
 
 # this sets the config file for FatFs
-CFLAGS_MOD += -DFFCONF_H=\"$(OOFATFS_DIR)/ffconf.h\"
+CFLAGS_THIRDPARTY += -DFFCONF_H=\"$(OOFATFS_DIR)/ffconf.h\"
 
 ifeq ($(MICROPY_VFS_FAT),1)
-CFLAGS_MOD += -DMICROPY_VFS_FAT=1
-SRC_MOD += $(addprefix $(OOFATFS_DIR)/,\
+CFLAGS_EXTMOD += -DMICROPY_VFS_FAT=1
+SRC_THIRDPARTY_C += $(addprefix $(OOFATFS_DIR)/,\
 	ff.c \
 	ffunicode.c \
 	)
@@ -73,18 +84,18 @@ endif
 LITTLEFS_DIR = lib/littlefs
 
 ifeq ($(MICROPY_VFS_LFS1),1)
-CFLAGS_MOD += -DMICROPY_VFS_LFS1=1
-CFLAGS_MOD += -DLFS1_NO_MALLOC -DLFS1_NO_DEBUG -DLFS1_NO_WARN -DLFS1_NO_ERROR -DLFS1_NO_ASSERT
-SRC_MOD += $(addprefix $(LITTLEFS_DIR)/,\
+CFLAGS_EXTMOD += -DMICROPY_VFS_LFS1=1
+CFLAGS_THIRDPARTY += -DLFS1_NO_MALLOC -DLFS1_NO_DEBUG -DLFS1_NO_WARN -DLFS1_NO_ERROR -DLFS1_NO_ASSERT
+SRC_THIRDPARTY_C += $(addprefix $(LITTLEFS_DIR)/,\
 	lfs1.c \
 	lfs1_util.c \
 	)
 endif
 
 ifeq ($(MICROPY_VFS_LFS2),1)
-CFLAGS_MOD += -DMICROPY_VFS_LFS2=1
-CFLAGS_MOD += -DLFS2_NO_MALLOC -DLFS2_NO_DEBUG -DLFS2_NO_WARN -DLFS2_NO_ERROR -DLFS2_NO_ASSERT
-SRC_MOD += $(addprefix $(LITTLEFS_DIR)/,\
+CFLAGS_EXTMOD += -DMICROPY_VFS_LFS2=1
+CFLAGS_THIRDPARTY += -DLFS2_NO_MALLOC -DLFS2_NO_DEBUG -DLFS2_NO_WARN -DLFS2_NO_ERROR -DLFS2_NO_ASSERT
+SRC_THIRDPARTY_C += $(addprefix $(LITTLEFS_DIR)/,\
 	lfs2.c \
 	lfs2_util.c \
 	)
@@ -96,13 +107,13 @@ endif
 # ussl
 
 ifeq ($(MICROPY_PY_USSL),1)
-CFLAGS_MOD += -DMICROPY_PY_USSL=1
+CFLAGS_EXTMOD += -DMICROPY_PY_USSL=1
 ifeq ($(MICROPY_SSL_AXTLS),1)
-CFLAGS_MOD += -DMICROPY_SSL_AXTLS=1 -I$(TOP)/lib/axtls/ssl -I$(TOP)/lib/axtls/crypto -I$(TOP)/extmod/axtls-include
 AXTLS_DIR = lib/axtls
 GIT_SUBMODULES += $(AXTLS_DIR)
+CFLAGS_EXTMOD += -DMICROPY_SSL_AXTLS=1 -I$(TOP)/lib/axtls/ssl -I$(TOP)/lib/axtls/crypto -I$(TOP)/extmod/axtls-include
 $(BUILD)/$(AXTLS_DIR)/%.o: CFLAGS += -Wno-all -Wno-unused-parameter -Wno-uninitialized -Wno-sign-compare -Wno-old-style-definition -Dmp_stream_errno=errno $(AXTLS_DEFS_EXTRA)
-SRC_MOD += $(addprefix $(AXTLS_DIR)/,\
+SRC_THIRDPARTY_C += $(addprefix $(AXTLS_DIR)/,\
 	ssl/asn1.c \
 	ssl/loader.c \
 	ssl/tls1.c \
@@ -120,8 +131,9 @@ SRC_MOD += $(addprefix $(AXTLS_DIR)/,\
 else ifeq ($(MICROPY_SSL_MBEDTLS),1)
 MBEDTLS_DIR = lib/mbedtls
 GIT_SUBMODULES += $(MBEDTLS_DIR)
-SRC_MOD += lib/mbedtls_errors/mp_mbedtls_errors.c
-SRC_MOD += $(addprefix $(MBEDTLS_DIR)/library/,\
+CFLAGS_EXTMOD += -DMICROPY_SSL_MBEDTLS=1 -I$(TOP)/$(MBEDTLS_DIR)/include
+SRC_THIRDPARTY_C += lib/mbedtls_errors/mp_mbedtls_errors.c
+SRC_THIRDPARTY_C += $(addprefix $(MBEDTLS_DIR)/library/,\
 	aes.c \
 	aesni.c \
 	arc4.c \
@@ -204,10 +216,10 @@ GIT_SUBMODULES += lib/lwip
 # A port should add an include path where lwipopts.h can be found (eg extmod/lwip-include)
 LWIP_DIR = lib/lwip/src
 INC += -I$(TOP)/$(LWIP_DIR)/include
-CFLAGS_MOD += -DMICROPY_PY_LWIP=1
-$(BUILD)/$(LWIP_DIR)/core/ipv4/dhcp.o: CFLAGS_MOD += -Wno-address
-SRC_MOD += shared/netutils/netutils.c
-SRC_MOD += $(addprefix $(LWIP_DIR)/,\
+CFLAGS_EXTMOD += -DMICROPY_PY_LWIP=1
+$(BUILD)/$(LWIP_DIR)/core/ipv4/dhcp.o: CFLAGS += -Wno-address
+SRC_THIRDPARTY_C += shared/netutils/netutils.c
+SRC_THIRDPARTY_C += $(addprefix $(LWIP_DIR)/,\
 	apps/mdns/mdns.c \
 	core/def.c \
 	core/dns.c \
@@ -246,8 +258,8 @@ SRC_MOD += $(addprefix $(LWIP_DIR)/,\
 	netif/ethernet.c \
 	)
 ifeq ($(MICROPY_PY_LWIP_SLIP),1)
-CFLAGS_MOD += -DMICROPY_PY_LWIP_SLIP=1
-SRC_MOD += $(LWIP_DIR)/netif/slipif.c
+CFLAGS_EXTMOD += -DMICROPY_PY_LWIP_SLIP=1
+SRC_THIRDPARTY_C += $(LWIP_DIR)/netif/slipif.c
 endif
 endif
 
@@ -258,8 +270,7 @@ ifeq ($(MICROPY_PY_BTREE),1)
 BTREE_DIR = lib/berkeley-db-1.xx
 BTREE_DEFS = -D__DBINTERFACE_PRIVATE=1 -Dmpool_error=printf -Dabort=abort_ "-Dvirt_fd_t=void*" $(BTREE_DEFS_EXTRA)
 INC += -I$(TOP)/$(BTREE_DIR)/PORT/include
-SRC_MOD += extmod/modbtree.c
-SRC_MOD += $(addprefix $(BTREE_DIR)/,\
+SRC_THIRDPARTY_C += $(addprefix $(BTREE_DIR)/,\
 	btree/bt_close.c \
 	btree/bt_conv.c \
 	btree/bt_debug.c \
@@ -275,10 +286,67 @@ SRC_MOD += $(addprefix $(BTREE_DIR)/,\
 	btree/bt_utils.c \
 	mpool/mpool.c \
 	)
-CFLAGS_MOD += -DMICROPY_PY_BTREE=1
+CFLAGS_EXTMOD += -DMICROPY_PY_BTREE=1
 # we need to suppress certain warnings to get berkeley-db to compile cleanly
 # and we have separate BTREE_DEFS so the definitions don't interfere with other source code
 $(BUILD)/$(BTREE_DIR)/%.o: CFLAGS += -Wno-old-style-definition -Wno-sign-compare -Wno-unused-parameter $(BTREE_DEFS)
 $(BUILD)/extmod/modbtree.o: CFLAGS += $(BTREE_DEFS)
 endif
 
+################################################################################
+# networking
+
+ifeq ($(MICROPY_PY_NETWORK_CYW43),1)
+CFLAGS_EXTMOD += -DMICROPY_PY_NETWORK_CYW43=1
+DRIVERS_SRC_C += drivers/cyw43/cyw43_ctrl.c drivers/cyw43/cyw43_lwip.c
+LIBS += $(TOP)/drivers/cyw43/libcyw43.a
+endif
+
+ifneq ($(MICROPY_PY_NETWORK_WIZNET5K),)
+ifneq ($(MICROPY_PY_NETWORK_WIZNET5K),0)
+WIZNET5K_DIR=lib/wiznet5k
+GIT_SUBMODULES += lib/wiznet5k
+INC += -I$(TOP)/$(WIZNET5K_DIR) -I$(TOP)/$(WIZNET5K_DIR)/Ethernet
+CFLAGS += -DMICROPY_PY_NETWORK_WIZNET5K=$(MICROPY_PY_NETWORK_WIZNET5K) -D_WIZCHIP_=$(MICROPY_PY_NETWORK_WIZNET5K)
+CFLAGS_THIRDPARTY += -DWIZCHIP_PREFIXED_EXPORTS=1
+ifeq ($(MICROPY_PY_LWIP),1)
+# When using MACRAW mode (with lwIP), maximum buffer space must be used for the raw socket
+CFLAGS_THIRDPARTY += -DWIZCHIP_USE_MAX_BUFFER
+endif
+SRC_THIRDPARTY_C += $(addprefix $(WIZNET5K_DIR)/,\
+	Ethernet/W$(MICROPY_PY_NETWORK_WIZNET5K)/w$(MICROPY_PY_NETWORK_WIZNET5K).c \
+	Ethernet/wizchip_conf.c \
+	Ethernet/socket.c \
+	Internet/DNS/dns.c \
+	Internet/DHCP/dhcp.c \
+	)
+endif
+endif
+
+################################################################################
+# bluetooth
+
+ifeq ($(MICROPY_PY_BLUETOOTH),1)
+CFLAGS_EXTMOD += -DMICROPY_PY_BLUETOOTH=1
+
+ifeq ($(MICROPY_BLUETOOTH_NIMBLE),1)
+ifeq ($(MICROPY_BLUETOOTH_BTSTACK),1)
+$(error Cannot enable both NimBLE and BTstack at the same time)
+endif
+endif
+
+ifneq ($(MICROPY_BLUETOOTH_NIMBLE),1)
+ifneq ($(MICROPY_BLUETOOTH_BTSTACK),1)
+$(error Must enable one of MICROPY_BLUETOOTH_NIMBLE or MICROPY_BLUETOOTH_BTSTACK)
+endif
+endif
+
+ifeq ($(MICROPY_BLUETOOTH_NIMBLE),1)
+include $(TOP)/extmod/nimble/nimble.mk
+endif
+
+ifeq ($(MICROPY_BLUETOOTH_BTSTACK),1)
+include $(TOP)/extmod/btstack/btstack.mk
+endif
+
+endif
diff --git a/extmod/network_wiznet5k.c b/extmod/network_wiznet5k.c
index af2014508127c..78cbff4ce2dfa 100644
--- a/extmod/network_wiznet5k.c
+++ b/extmod/network_wiznet5k.c
@@ -33,6 +33,9 @@
 #include "py/stream.h"
 #include "py/mperrno.h"
 #include "py/mphal.h"
+
+#if MICROPY_PY_NETWORK_WIZNET5K
+
 #include "shared/netutils/netutils.h"
 #include "extmod/modnetwork.h"
 #include "extmod/machine_spi.h"
@@ -40,8 +43,6 @@
 #include "modmachine.h"
 #include "drivers/bus/spi.h"
 
-#if MICROPY_PY_NETWORK_WIZNET5K
-
 #include "lib/wiznet5k/Ethernet/wizchip_conf.h"
 
 // The WIZNET5K module supports two usage modes:
diff --git a/extmod/nimble/nimble.mk b/extmod/nimble/nimble.mk
index e825261eeadc7..fc1709f0e50ab 100644
--- a/extmod/nimble/nimble.mk
+++ b/extmod/nimble/nimble.mk
@@ -5,15 +5,15 @@ ifeq ($(MICROPY_BLUETOOTH_NIMBLE),1)
 EXTMOD_DIR = extmod
 NIMBLE_EXTMOD_DIR = $(EXTMOD_DIR)/nimble
 
-EXTMOD_SRC_C += $(NIMBLE_EXTMOD_DIR)/modbluetooth_nimble.c
+SRC_EXTMOD_C += $(NIMBLE_EXTMOD_DIR)/modbluetooth_nimble.c
 
-CFLAGS_MOD += -DMICROPY_BLUETOOTH_NIMBLE=1
+CFLAGS_EXTMOD += -DMICROPY_BLUETOOTH_NIMBLE=1
 
 # Use NimBLE from the submodule in lib/mynewt-nimble by default,
 # allowing a port to use their own system version (e.g. ESP32).
 MICROPY_BLUETOOTH_NIMBLE_BINDINGS_ONLY ?= 0
 
-CFLAGS_MOD += -DMICROPY_BLUETOOTH_NIMBLE_BINDINGS_ONLY=$(MICROPY_BLUETOOTH_NIMBLE_BINDINGS_ONLY)
+CFLAGS_EXTMOD += -DMICROPY_BLUETOOTH_NIMBLE_BINDINGS_ONLY=$(MICROPY_BLUETOOTH_NIMBLE_BINDINGS_ONLY)
 
 ifeq ($(MICROPY_BLUETOOTH_NIMBLE_BINDINGS_ONLY),0)
 
@@ -24,16 +24,16 @@ GIT_SUBMODULES += lib/mynewt-nimble
 # case, all NimBLE events are run by the MicroPython scheduler. On Unix, the
 # scheduler is also responsible for polling the UART, whereas on STM32 the
 # UART is also polled by the RX IRQ.
-CFLAGS_MOD += -DMICROPY_PY_BLUETOOTH_USE_SYNC_EVENTS=1
+CFLAGS_EXTMOD += -DMICROPY_PY_BLUETOOTH_USE_SYNC_EVENTS=1
 
 # Without the ringbuffer, and with the full implementation, we can also
 # enable pairing and bonding. This requires both synchronous events and
 # some customisation of the key store.
-CFLAGS_MOD += -DMICROPY_PY_BLUETOOTH_ENABLE_PAIRING_BONDING=1
+CFLAGS_EXTMOD += -DMICROPY_PY_BLUETOOTH_ENABLE_PAIRING_BONDING=1
 
 NIMBLE_LIB_DIR = lib/mynewt-nimble
 
-LIB_SRC_C += $(addprefix $(NIMBLE_LIB_DIR)/, \
+SRC_THIRDPARTY_C += $(addprefix $(NIMBLE_LIB_DIR)/, \
 	$(addprefix ext/tinycrypt/src/, \
 		aes_encrypt.c \
 		cmac_mode.c \
@@ -98,7 +98,7 @@ LIB_SRC_C += $(addprefix $(NIMBLE_LIB_DIR)/, \
 	)
 	# nimble/host/store/ram/src/ble_store_ram.c \
 
-EXTMOD_SRC_C += $(addprefix $(NIMBLE_EXTMOD_DIR)/, \
+SRC_THIRDPARTY_C += $(addprefix $(NIMBLE_EXTMOD_DIR)/, \
 	nimble/nimble_npl_os.c \
 	hal/hal_uart.c \
 	)
diff --git a/mpy-cross/Makefile b/mpy-cross/Makefile
index 4b6e03df8e844..7a71577e2bb1a 100644
--- a/mpy-cross/Makefile
+++ b/mpy-cross/Makefile
@@ -19,7 +19,7 @@ INC += -I$(TOP)
 # compiler settings
 CWARN = -Wall -Werror
 CWARN += -Wextra -Wno-unused-parameter -Wpointer-arith
-CFLAGS += $(INC) $(CWARN) -std=gnu99 $(CFLAGS_MOD) $(COPT) $(CFLAGS_EXTRA)
+CFLAGS += $(INC) $(CWARN) -std=gnu99 $(COPT) $(CFLAGS_EXTRA)
 CFLAGS += -fdata-sections -ffunction-sections -fno-asynchronous-unwind-tables
 
 # Debugging/Optimization
diff --git a/ports/cc3200/Makefile b/ports/cc3200/Makefile
index 6c034c58637e7..61af0bfd98445 100644
--- a/ports/cc3200/Makefile
+++ b/ports/cc3200/Makefile
@@ -23,7 +23,6 @@ CFLAGS_CORTEX_M4 = -mthumb -mtune=cortex-m4 -march=armv7e-m -mabi=aapcs -mcpu=co
 CFLAGS += -Wall -Wpointer-arith -Werror -std=gnu99 -nostdlib $(CFLAGS_CORTEX_M4) -Os
 CFLAGS += -g -ffunction-sections -fdata-sections -fno-common -fsigned-char -mno-unaligned-access
 CFLAGS += -Iboards/$(BOARD)
-CFLAGS += $(CFLAGS_MOD)
 
 # Workaround gcc 12.1 bug.
 CFLAGS += -Wno-array-bounds
diff --git a/ports/esp8266/Makefile b/ports/esp8266/Makefile
index 6002dc5e5ab57..168d1d9f6ab66 100644
--- a/ports/esp8266/Makefile
+++ b/ports/esp8266/Makefile
@@ -58,11 +58,11 @@ CFLAGS_XTENSA = -fsingle-precision-constant -Wdouble-promotion \
 	-DLWIP_OPEN_SRC
 
 CFLAGS += $(INC) -Wall -Wpointer-arith -Werror -std=gnu99 -nostdlib -DUART_OS=$(UART_OS) \
-	$(CFLAGS_XTENSA) $(CFLAGS_MOD) $(COPT) $(CFLAGS_EXTRA) -I$(BOARD_DIR)
+	$(CFLAGS_XTENSA) $(COPT) $(CFLAGS_EXTRA) -I$(BOARD_DIR)
 
 LD_FILES ?= boards/esp8266_2m.ld
 LDFLAGS += -nostdlib -T $(LD_FILES) -Map=$(@:.elf=.map) --cref
-LIBS += -L$(ESP_SDK)/lib -lmain -ljson -llwip_open -lpp -lnet80211 -lwpa -lphy -lnet80211 $(LDFLAGS_MOD)
+LIBS += -L$(ESP_SDK)/lib -lmain -ljson -llwip_open -lpp -lnet80211 -lwpa -lphy -lnet80211
 
 LIBGCC_FILE_NAME = $(shell $(CC) $(CFLAGS) -print-libgcc-file-name)
 LIBS += -L$(dir $(LIBGCC_FILE_NAME)) -lgcc
@@ -107,11 +107,6 @@ SRC_C = \
 	posix_helpers.c \
 	hspi.c \
 	$(wildcard $(BOARD_DIR)/*.c) \
-	$(SRC_MOD)
-
-EXTMOD_SRC_C = $(addprefix extmod/,\
-	modonewire.c \
-        )
 
 LIB_SRC_C = $(addprefix lib/,\
 	libm/math.c \
@@ -163,17 +158,15 @@ DRIVERS_SRC_C = $(addprefix drivers/,\
 SRC_S = \
 	gchelper.s \
 
-OBJ =
 OBJ += $(PY_O)
 OBJ += $(addprefix $(BUILD)/, $(SRC_C:.c=.o))
 OBJ += $(addprefix $(BUILD)/, $(SRC_S:.s=.o))
-OBJ += $(addprefix $(BUILD)/, $(EXTMOD_SRC_C:.c=.o))
 OBJ += $(addprefix $(BUILD)/, $(SHARED_SRC_C:.c=.o))
 OBJ += $(addprefix $(BUILD)/, $(LIB_SRC_C:.c=.o))
 OBJ += $(addprefix $(BUILD)/, $(DRIVERS_SRC_C:.c=.o))
 
 # List of sources for qstr extraction
-SRC_QSTR += $(SRC_C) $(EXTMOD_SRC_C) $(SHARED_SRC_C) $(DRIVERS_SRC_C)
+SRC_QSTR += $(SRC_C) $(SHARED_SRC_C)
 # Append any auto-generated sources that are needed by sources listed in SRC_QSTR
 SRC_QSTR_AUTO_DEPS +=
 
diff --git a/ports/mimxrt/Makefile b/ports/mimxrt/Makefile
index b8b08cb011f3a..640864e582951 100644
--- a/ports/mimxrt/Makefile
+++ b/ports/mimxrt/Makefile
@@ -150,10 +150,6 @@ SRC_C += \
 	drivers/bus/softspi.c \
 	drivers/dht/dht.c \
 	eth.c \
-	extmod/modnetwork.c \
-	extmod/modonewire.c \
-	extmod/modusocket.c \
-	extmod/uos_dupterm.c \
 	fatfs_port.c \
 	hal/pwm_backport.c \
 	led.c \
@@ -257,16 +253,6 @@ SRC_S += shared/runtime/gchelper_m3.s \
 # QSTR Sources
 # =============================================================================
 
-# All settings for Ethernet support are controller by the value of MICROPY_PY_LWIP
-ifeq ($(MICROPY_PY_LWIP),1)
-SRC_QSTR += \
-	extmod/modlwip.c \
-	extmod/modnetwork.c \
-	extmod/modusocket.c \
-	extmod/moduwebsocket.c \
-	network_lan.c
-endif
-
 # List of sources for qstr extraction
 SRC_QSTR += \
 	extmod/modonewire.c \
@@ -386,7 +372,7 @@ CFLAGS += \
 	-DMBEDTLS_CONFIG_FILE='"mbedtls/mbedtls_config.h"'
 endif
 
-CFLAGS += $(CFLAGS_MOD) $(CFLAGS_EXTRA)
+CFLAGS += $(CFLAGS_EXTRA)
 
 # =============================================================================
 # Linker Flags
@@ -433,7 +419,6 @@ OBJ += $(LIBM_O)
 OBJ += $(addprefix $(BUILD)/, $(SRC_C:.c=.o))
 OBJ += $(addprefix $(BUILD)/, $(SRC_S:.s=.o))
 OBJ += $(addprefix $(BUILD)/, $(SRC_SS:.S=.o))
-OBJ += $(addprefix $(BUILD)/, $(SRC_MOD:.c=.o))
 OBJ += $(GEN_PINS_SRC:.c=.o)
 
 # Workaround for bug in older gcc, warning on "static usbd_device_t _usbd_dev = { 0 };"
diff --git a/ports/minimal/Makefile b/ports/minimal/Makefile
index 2e85bd912e413..1a20412e0da5d 100644
--- a/ports/minimal/Makefile
+++ b/ports/minimal/Makefile
@@ -44,11 +44,6 @@ endif
 
 # Flags for optional C++ source code
 CXXFLAGS += $(filter-out -std=c99,$(CFLAGS))
-CXXFLAGS += $(CXXFLAGS_MOD)
-
-# Flags for user C modules
-CFLAGS += $(CFLAGS_MOD)
-LDFLAGS += $(LDFLAGS_MOD)
 
 LIBS =
 
@@ -65,14 +60,10 @@ ifeq ($(CROSS), 1)
 SRC_C += shared/libc/string0.c
 endif
 
-SRC_C += $(SRC_MOD)
-
-SRC_CXX += $(SRC_MOD_CXX)
-
 SRC_QSTR += shared/readline/readline.c shared/runtime/pyexec.c
-SRC_QSTR += $(SRC_MOD) $(SRC_MOD_CXX)
 
-OBJ += $(PY_CORE_O) $(addprefix $(BUILD)/, $(SRC_C:.c=.o))
+OBJ += $(PY_CORE_O)
+OBJ += $(addprefix $(BUILD)/, $(SRC_C:.c=.o))
 OBJ += $(addprefix $(BUILD)/, $(SRC_CXX:.cpp=.o))
 
 ifeq ($(CROSS), 1)
diff --git a/ports/nrf/Makefile b/ports/nrf/Makefile
index 9e0354194dd63..4128404da4a80 100644
--- a/ports/nrf/Makefile
+++ b/ports/nrf/Makefile
@@ -132,9 +132,8 @@ CFLAGS += -ffunction-sections -fdata-sections
 LDFLAGS += -Wl,--gc-sections
 endif
 
-
 CFLAGS += $(CFLAGS_MCU_$(MCU_SERIES))
-CFLAGS += $(INC) -Wall -Werror -ansi -std=c11 -nostdlib $(COPT) $(NRF_DEFINES) $(CFLAGS_MOD) $(CFLAGS_EXTRA)
+CFLAGS += $(INC) -Wall -Werror -ansi -std=c11 -nostdlib $(COPT) $(NRF_DEFINES) $(CFLAGS_EXTRA)
 CFLAGS += -fno-strict-aliasing
 CFLAGS += -Iboards/$(BOARD)
 CFLAGS += -DNRF5_HAL_H='<$(MCU_VARIANT)_hal.h>'
@@ -357,8 +356,8 @@ SRC_C += \
 LIBGCC_FILE_NAME = $(shell $(CC) $(CFLAGS) -print-libgcc-file-name)
 LIBS += -L $(dir $(LIBGCC_FILE_NAME)) -lgcc
 
-OBJ += $(PY_O) $(addprefix $(BUILD)/, $(SRC_C:.c=.o))
-OBJ += $(addprefix $(BUILD)/, $(SRC_MOD:.c=.o))
+OBJ += $(PY_O)
+OBJ += $(addprefix $(BUILD)/, $(SRC_C:.c=.o))
 OBJ += $(addprefix $(BUILD)/, $(SRC_NRFX:.c=.o))
 OBJ += $(addprefix $(BUILD)/, $(SRC_NRFX_HAL:.c=.o))
 OBJ += $(addprefix $(BUILD)/, $(DRIVERS_SRC_C:.c=.o))
@@ -515,11 +514,11 @@ flash: deploy
 
 $(BUILD)/$(OUTPUT_FILENAME).elf: $(OBJ)
 	$(ECHO) "LINK $@"
-	$(Q)$(CC) $(LDFLAGS) -o $@ $(OBJ) $(LDFLAGS_MOD) $(LIBS)
+	$(Q)$(CC) $(LDFLAGS) -o $@ $(OBJ) $(LIBS)
 	$(Q)$(SIZE) $@
 
 # List of sources for qstr extraction
-SRC_QSTR += $(SRC_C) $(SRC_LIB) $(DRIVERS_SRC_C) $(SRC_BOARD_MODULES) $(SRC_MOD)
+SRC_QSTR += $(SRC_C) $(SRC_LIB) $(DRIVERS_SRC_C) $(SRC_BOARD_MODULES)
 
 # Append any auto-generated sources that are needed by sources listed in
 # SRC_QSTR
diff --git a/ports/renesas-ra/Makefile b/ports/renesas-ra/Makefile
index 6c37aeb1e198d..2b0358b27076a 100644
--- a/ports/renesas-ra/Makefile
+++ b/ports/renesas-ra/Makefile
@@ -121,7 +121,7 @@ CFLAGS_MCU_RA4W1 = $(CFLAGS_CORTEX_M) -mtune=cortex-m4 -mcpu=cortex-m4
 CFLAGS_MCU_RA6M1 = $(CFLAGS_CORTEX_M) -mtune=cortex-m4 -mcpu=cortex-m4
 CFLAGS_MCU_RA6M2 = $(CFLAGS_CORTEX_M) -mtune=cortex-m4 -mcpu=cortex-m4
 
-CFLAGS += $(INC) -Wall -Wpointer-arith -Werror -Wdouble-promotion -Wfloat-conversion -std=gnu99 -nostdlib $(CFLAGS_MOD) $(CFLAGS_EXTRA)
+CFLAGS += $(INC) -Wall -Wpointer-arith -Werror -Wdouble-promotion -Wfloat-conversion -std=gnu99 -nostdlib $(CFLAGS_EXTRA)
 #CFLAGS += -D$(CMSIS_MCU)
 CFLAGS += $(CFLAGS_MCU_$(CMSIS_MCU))
 CFLAGS += $(COPT)
@@ -161,8 +161,9 @@ endif
 
 # Flags for optional C++ source code
 CXXFLAGS += $(filter-out -Wmissing-prototypes -Wold-style-definition -std=gnu99,$(CFLAGS))
-CXXFLAGS += $(CXXFLAGS_MOD)
-ifneq ($(SRC_CXX)$(SRC_MOD_CXX),)
+
+# TODO make this common -- shouldn't be using these "private" vars from py.mk
+ifneq ($(SRC_CXX)$(SRC_USERMOD_CXX)$(SRC_USERMOD_LIB_CXX),)
 LIBSTDCPP_FILE_NAME = "$(shell $(CXX) $(CXXFLAGS) -print-file-name=libstdc++.a)"
 LDFLAGS += -L"$(shell dirname $(LIBSTDCPP_FILE_NAME))"
 endif
@@ -279,10 +280,6 @@ ifeq ($(MICROPY_FLOAT_IMPL),double)
 $(LIBM_O): CFLAGS := $(filter-out -Wdouble-promotion -Wfloat-conversion, $(CFLAGS))
 endif
 
-EXTMOD_SRC_C += $(addprefix extmod/,\
-	modonewire.c \
-	)
-
 DRIVERS_SRC_C += $(addprefix drivers/,\
 	bus/softspi.c \
 	bus/softqspi.c \
@@ -334,9 +331,6 @@ SRC_C += $(addprefix $(BOARD_DIR)/ra_gen/,\
 	vector_data.c \
 	)
 
-SRC_CXX += \
-	$(SRC_MOD_CXX)
-
 SRC_O += \
 	$(STARTUP_FILE) \
 	$(SYSTEM_FILE)
@@ -408,13 +402,11 @@ OBJ += $(PY_O)
 OBJ += $(addprefix $(BUILD)/, $(LIB_SRC_C:.c=.o))
 OBJ += $(LIBM_O)
 OBJ += $(addprefix $(BUILD)/, $(SHARED_SRC_C:.c=.o))
-OBJ += $(addprefix $(BUILD)/, $(EXTMOD_SRC_C:.c=.o))
 OBJ += $(addprefix $(BUILD)/, $(DRIVERS_SRC_C:.c=.o))
 OBJ += $(addprefix $(BUILD)/, $(HAL_SRC_C:.c=.o))
 OBJ += $(addprefix $(BUILD)/, $(SRC_C:.c=.o))
 OBJ += $(addprefix $(BUILD)/, $(SRC_CXX:.cpp=.o))
 OBJ += $(addprefix $(BUILD)/, $(SRC_O))
-OBJ += $(addprefix $(BUILD)/, $(SRC_MOD:.c=.o))
 OBJ += $(BUILD)/pins_$(BOARD).o
 
 # This file contains performance critical functions so turn up the optimisation
@@ -514,7 +506,7 @@ GEN_PINS_AF_PY = $(BUILD)/pins_af.py
 FILE2H = $(TOP)/tools/file2h.py
 
 # List of sources for qstr extraction
-SRC_QSTR += $(SRC_C) $(SRC_CXX) $(SRC_MOD) $(SHARED_SRC_C) $(EXTMOD_SRC_C)
+SRC_QSTR += $(SRC_C) $(SRC_CXX) $(SHARED_SRC_C)
 
 # Making OBJ use an order-only depenedency on the generated pins.h file
 # has the side effect of making the pins.h file before we actually compile
diff --git a/ports/samd/Makefile b/ports/samd/Makefile
index 9386a8dacc5de..2c5f6a1ab2210 100644
--- a/ports/samd/Makefile
+++ b/ports/samd/Makefile
@@ -60,11 +60,10 @@ CFLAGS_MCU_SAMD21 = -mtune=cortex-m0plus -mcpu=cortex-m0plus -msoft-float
 CFLAGS_MCU_SAMD51 = -mtune=cortex-m4 -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard
 CFLAGS += $(INC) -Wall -Werror -std=c99 -nostdlib -mthumb $(CFLAGS_MCU_$(MCU_SERIES)) -fsingle-precision-constant -Wdouble-promotion
 CFLAGS += -DMCU_$(MCU_SERIES) -D__$(CMSIS_MCU)__
-CFLAGS += $(CFLAGS_MOD) $(CFLAGS_EXTRA)
+CFLAGS += $(CFLAGS_EXTRA)
 CFLAGS += -DMPCONFIG_MCU_H='<boards/mpconfig_$(MCU_SERIES_LOWER).h>'
 
 LDFLAGS += -nostdlib $(addprefix -T,$(LD_FILES)) -Map=$@.map --cref
-LDFLAGS += $(LDFLAGS_MOD)
 
 LIBS += $(shell $(CC) $(CFLAGS) -print-libgcc-file-name)
 
@@ -80,7 +79,7 @@ endif
 
 # Flags for optional C++ source code
 CXXFLAGS += $(filter-out -std=c99,$(CFLAGS))
-CXXFLAGS += $(CXXFLAGS_MOD)
+
 # TODO make this common -- shouldn't be using these "private" vars from py.mk
 ifneq ($(SRC_CXX)$(SRC_USERMOD_CXX)$(SRC_USERMOD_LIB_CXX),)
 LIBSTDCPP_FILE_NAME = "$(shell $(CXX) $(CXXFLAGS) -print-file-name=libstdc++.a)"
@@ -114,10 +113,6 @@ SRC_C += \
 	lib/asf4/$(MCU_SERIES_LOWER)/hal/src/hal_atomic.c \
 	lib/asf4/$(MCU_SERIES_LOWER)/hal/src/hal_flash.c \
 	lib/asf4/$(MCU_SERIES_LOWER)/hpl/nvmctrl/hpl_nvmctrl.c \
-	lib/libm/ef_sqrt.c \
-	lib/libm/fmodf.c \
-	lib/libm/math.c \
-	lib/libm/nearbyintf.c \
 	lib/tinyusb/src/class/cdc/cdc_device.c \
 	lib/tinyusb/src/common/tusb_fifo.c \
 	lib/tinyusb/src/device/usbd.c \
@@ -125,7 +120,6 @@ SRC_C += \
 	lib/tinyusb/src/portable/microchip/samd/dcd_samd.c \
 	lib/tinyusb/src/tusb.c \
 	drivers/bus/softspi.c \
-	extmod/uos_dupterm.c \
 	shared/runtime/mpirq.c \
 	shared/libc/printf.c \
 	shared/libc/string0.c \
@@ -138,9 +132,11 @@ SRC_C += \
 	shared/runtime/sys_stdio_mphal.c \
 	shared/timeutils/timeutils.c \
 
-SRC_C += $(SRC_MOD)
-
-SRC_CXX += $(SRC_MOD_CXX)
+LIBM_SRC_C += \
+	lib/libm/ef_sqrt.c \
+	lib/libm/fmodf.c \
+	lib/libm/math.c \
+	lib/libm/nearbyintf.c \
 
 # List of sources for qstr extraction
 SRC_QSTR += \
@@ -159,17 +155,16 @@ SRC_QSTR += \
 	modsamd.c \
 	samd_flash.c \
 	shared/readline/readline.c \
-	extmod/uos_dupterm.c \
 	shared/runtime/mpirq.c \
 	shared/runtime/sys_stdio_mphal.c \
 
-SRC_QSTR += $(SRC_MOD) $(SRC_CXX)
+SRC_QSTR += $(SRC_CXX)
 
 OBJ += $(PY_O)
 OBJ += $(addprefix $(BUILD)/, $(SRC_C:.c=.o))
 OBJ += $(addprefix $(BUILD)/, $(SRC_CXX:.cpp=.o))
 OBJ += $(addprefix $(BUILD)/, $(SRC_S:.s=.o))
-OBJ += $(addprefix $(BUILD)/, $(SRC_MOD:.c=.o))
+OBJ += $(addprefix $(BUILD)/, $(LIBM_SRC_C:.c=.o))
 OBJ += $(GEN_PINS_SRC:.c=.o)
 
 ifneq ($(FROZEN_MANIFEST),)
diff --git a/ports/samd/mcu/samd51/mpconfigmcu.mk b/ports/samd/mcu/samd51/mpconfigmcu.mk
index e83e8911ddbff..f8ed02f841d9d 100644
--- a/ports/samd/mcu/samd51/mpconfigmcu.mk
+++ b/ports/samd/mcu/samd51/mpconfigmcu.mk
@@ -2,7 +2,7 @@ MICROPY_VFS_LFS2 ?= 1
 
 SRC_S += shared/runtime/gchelper_m3.s
 
-SRC_MOD +=  $(addprefix lib/libm/,\
+LIBM_SRC_C +=  $(addprefix lib/libm/,\
 	acoshf.c \
 	asinfacosf.c \
 	asinhf.c \
diff --git a/ports/stm32/Makefile b/ports/stm32/Makefile
index 8b503112aef7f..79bf8b54bf2c9 100644
--- a/ports/stm32/Makefile
+++ b/ports/stm32/Makefile
@@ -95,7 +95,7 @@ INC += -I$(USBDEV_DIR)/core/inc -I$(USBDEV_DIR)/class/inc
 #INC += -I$(USBHOST_DIR)
 INC += -Ilwip_inc
 
-CFLAGS += $(INC) -Wall -Wpointer-arith -Werror -Wdouble-promotion -Wfloat-conversion -std=gnu99 -nostdlib $(CFLAGS_MOD) $(CFLAGS_EXTRA)
+CFLAGS += $(INC) -Wall -Wpointer-arith -Werror -Wdouble-promotion -Wfloat-conversion -std=gnu99 -nostdlib $(CFLAGS_EXTRA)
 CFLAGS += -D$(CMSIS_MCU) -DUSE_FULL_LL_DRIVER
 CFLAGS += $(CFLAGS_MCU_$(MCU_SERIES))
 CFLAGS += $(COPT)
@@ -156,7 +156,7 @@ endif
 
 # Flags for optional C++ source code
 CXXFLAGS += $(filter-out -Wmissing-prototypes -Wold-style-definition -std=gnu99,$(CFLAGS))
-CXXFLAGS += $(CXXFLAGS_MOD)
+
 # TODO make this common -- shouldn't be using these "private" vars from py.mk
 ifneq ($(SRC_CXX)$(SRC_USERMOD_CXX)$(SRC_USERMOD_LIB_CXX),)
 LIBSTDCPP_FILE_NAME = "$(shell $(CXX) $(CXXFLAGS) -print-file-name=libstdc++.a)"
@@ -275,12 +275,6 @@ ifeq ($(MICROPY_FLOAT_IMPL),double)
 $(LIBM_O): CFLAGS := $(filter-out -Wdouble-promotion -Wfloat-conversion, $(CFLAGS))
 endif
 
-EXTMOD_SRC_C += $(addprefix extmod/,\
-	modonewire.c \
-	modnetwork.c \
-	modusocket.c \
-	)
-
 DRIVERS_SRC_C += $(addprefix drivers/,\
 	bus/softspi.c \
 	bus/softqspi.c \
@@ -358,11 +352,9 @@ SRC_C += \
 	servo.c \
 	dac.c \
 	adc.c \
+	sdio.c \
 	$(wildcard $(BOARD_DIR)/*.c)
 
-SRC_CXX += \
-	$(SRC_MOD_CXX)
-
 SRC_O += \
 	$(STARTUP_FILE) \
 	$(SYSTEM_FILE)
@@ -482,70 +474,26 @@ USBDEV_SRC_C += $(addprefix $(USBDEV_DIR)/,\
 	class/src/usbd_msc_scsi.c \
 	)
 
-ifeq ($(MICROPY_PY_BLUETOOTH),1)
-CFLAGS_MOD += -DMICROPY_PY_BLUETOOTH=1
-CFLAGS_MOD += -DMICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE=1
-endif
-
-ifeq ($(MICROPY_PY_NETWORK_CYW43),1)
-CFLAGS_MOD += -DMICROPY_PY_NETWORK_CYW43=1
-SRC_C += sdio.c
-EXTMOD_SRC_C += extmod/network_cyw43.c
-DRIVERS_SRC_C += drivers/cyw43/cyw43_ctrl.c drivers/cyw43/cyw43_lwip.c
-LIBS += $(TOP)/drivers/cyw43/libcyw43.a
-endif
-
-ifneq ($(MICROPY_PY_NETWORK_WIZNET5K),0)
-WIZNET5K_DIR=lib/wiznet5k
-GIT_SUBMODULES += lib/wiznet5k
-INC += -I$(TOP)/$(WIZNET5K_DIR) -I$(TOP)/$(WIZNET5K_DIR)/Ethernet
-CFLAGS_MOD += -DMICROPY_PY_NETWORK_WIZNET5K=$(MICROPY_PY_NETWORK_WIZNET5K) -D_WIZCHIP_=$(MICROPY_PY_NETWORK_WIZNET5K)
-CFLAGS_MOD += -DWIZCHIP_PREFIXED_EXPORTS=1
-ifeq ($(MICROPY_PY_LWIP),1)
-# When using MACRAW mode (with lwIP), maximum buffer space must be used for the raw socket
-CFLAGS_MOD += -DWIZCHIP_USE_MAX_BUFFER
-endif
-SRC_MOD += extmod/network_wiznet5k.c
-SRC_MOD += $(addprefix $(WIZNET5K_DIR)/,\
-	Ethernet/W$(MICROPY_PY_NETWORK_WIZNET5K)/w$(MICROPY_PY_NETWORK_WIZNET5K).c \
-	Ethernet/wizchip_conf.c \
-	Ethernet/socket.c \
-	Internet/DNS/dns.c \
-	Internet/DHCP/dhcp.c \
-	)
-endif
-
 ifeq ($(MICROPY_SSL_MBEDTLS),1)
-CFLAGS_MOD += -DMBEDTLS_CONFIG_FILE='"mbedtls/mbedtls_config.h"'
-SRC_MOD += mbedtls/mbedtls_port.c
+CFLAGS += -DMBEDTLS_CONFIG_FILE='"mbedtls/mbedtls_config.h"'
+LIB_SRC_C += mbedtls/mbedtls_port.c
 endif
 
 ifeq ($(MICROPY_PY_BLUETOOTH),1)
-
 SRC_C += mpbthciport.c
 
 ifeq ($(MICROPY_BLUETOOTH_NIMBLE),1)
-ifeq ($(MICROPY_BLUETOOTH_BTSTACK),1)
-$(error Cannot enable both NimBLE and BTstack at the same time)
-endif
-endif
-
-ifeq ($(MICROPY_BLUETOOTH_NIMBLE),1)
-CFLAGS_MOD += -DMICROPY_PY_BLUETOOTH_ENABLE_L2CAP_CHANNELS=1
-include $(TOP)/extmod/nimble/nimble.mk
 SRC_C += mpnimbleport.c
 endif
 
 ifeq ($(MICROPY_BLUETOOTH_BTSTACK),1)
-MICROPY_BLUETOOTH_BTSTACK_H4 ?= 1
-include $(TOP)/extmod/btstack/btstack.mk
 SRC_C += mpbtstackport.c
+MICROPY_BLUETOOTH_BTSTACK_H4 ?= 1
 endif
 
 ifeq ($(MICROPY_PY_NETWORK_CYW43),1)
 DRIVERS_SRC_C += drivers/cyw43/cywbt.c
 endif
-
 endif
 
 # SRC_O should be placed first to work around this LTO bug with binutils <2.35:
@@ -555,7 +503,6 @@ OBJ += $(PY_O)
 OBJ += $(addprefix $(BUILD)/, $(LIB_SRC_C:.c=.o))
 OBJ += $(LIBM_O)
 OBJ += $(addprefix $(BUILD)/, $(SHARED_SRC_C:.c=.o))
-OBJ += $(addprefix $(BUILD)/, $(EXTMOD_SRC_C:.c=.o))
 OBJ += $(addprefix $(BUILD)/, $(DRIVERS_SRC_C:.c=.o))
 OBJ += $(addprefix $(BUILD)/, $(HAL_SRC_C:.c=.o))
 OBJ += $(addprefix $(BUILD)/, $(USBDEV_SRC_C:.c=.o))
@@ -713,7 +660,7 @@ $(BUILD)/firmware.elf: $(OBJ)
 	$(call GENERATE_ELF,$@,$^)
 
 # List of sources for qstr extraction
-SRC_QSTR += $(SRC_C) $(SRC_CXX) $(SRC_MOD) $(SHARED_SRC_C) $(EXTMOD_SRC_C)
+SRC_QSTR += $(SRC_C) $(SRC_CXX) $(SHARED_SRC_C)
 # Append any auto-generated sources that are needed by sources listed in
 # SRC_QSTR
 SRC_QSTR_AUTO_DEPS += $(GEN_CDCINF_HEADER)
diff --git a/ports/stm32/mboot/Makefile b/ports/stm32/mboot/Makefile
index 176092f8c0a5f..12ffdbc7e4682 100755
--- a/ports/stm32/mboot/Makefile
+++ b/ports/stm32/mboot/Makefile
@@ -58,7 +58,7 @@ INC += -I../$(USBDEV_DIR)/core/inc -I../$(USBDEV_DIR)/class/inc
 # the compiler does not optimise these functions in terms of themselves.
 CFLAGS_BUILTIN ?= -ffreestanding -fno-builtin -fno-lto
 
-CFLAGS += $(INC) -Wall -Wpointer-arith -Wdouble-promotion -Wfloat-conversion -Werror -std=gnu99 -nostdlib $(CFLAGS_MOD) $(CFLAGS_EXTRA)
+CFLAGS += $(INC) -Wall -Wpointer-arith -Wdouble-promotion -Wfloat-conversion -Werror -std=gnu99 -nostdlib $(CFLAGS_EXTRA)
 CFLAGS += -D$(CMSIS_MCU)
 CFLAGS += $(CFLAGS_MCU_$(MCU_SERIES))
 CFLAGS += $(COPT)
diff --git a/ports/stm32/mpconfigport.h b/ports/stm32/mpconfigport.h
index 69b29e8ec3932..34b3a6abad7b1 100644
--- a/ports/stm32/mpconfigport.h
+++ b/ports/stm32/mpconfigport.h
@@ -309,6 +309,14 @@ static inline mp_uint_t disable_irq(void) {
 #define MICROPY_PY_BLUETOOTH_HCI_READ_MODE MICROPY_PY_BLUETOOTH_HCI_READ_MODE_BYTE
 #endif
 
+#ifndef MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE
+#define MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE (1)
+#endif
+
+#ifndef MICROPY_PY_BLUETOOTH_ENABLE_L2CAP_CHANNELS
+#define MICROPY_PY_BLUETOOTH_ENABLE_L2CAP_CHANNELS (MICROPY_BLUETOOTH_NIMBLE)
+#endif
+
 // We need an implementation of the log2 function which is not a macro
 #define MP_NEED_LOG2 (1)
 
diff --git a/ports/teensy/Makefile b/ports/teensy/Makefile
index 876ddf1c1da35..89e5cbce9dcca 100644
--- a/ports/teensy/Makefile
+++ b/ports/teensy/Makefile
@@ -164,7 +164,10 @@ SRC_TEENSY = $(addprefix core/,\
 	yield.c \
 	)
 
-OBJ = $(PY_O) $(addprefix $(BUILD)/, $(SRC_C:.c=.o) $(STM_SRC_C:.c=.o) $(SRC_TEENSY:.c=.o))
+OBJ += $(PY_O)
+OBJ += $(addprefix $(BUILD)/, $(SRC_C:.c=.o))
+OBJ += $(addprefix $(BUILD)/, $(STM_SRC_C:.c=.o))
+OBJ += $(addprefix $(BUILD)/, $(SRC_TEENSY:.c=.o))
 OBJ += $(addprefix $(BUILD)/, $(SHARED_SRC_C:.c=.o))
 OBJ += $(BUILD)/shared/runtime/gchelper_m3.o
 OBJ += $(GEN_PINS_SRC:.c=.o)
diff --git a/ports/unix/Makefile b/ports/unix/Makefile
index facdab2e045dd..360cdd6f8ce90 100644
--- a/ports/unix/Makefile
+++ b/ports/unix/Makefile
@@ -39,7 +39,7 @@ INC += -I$(BUILD)
 # compiler settings
 CWARN = -Wall -Werror
 CWARN += -Wextra -Wno-unused-parameter -Wpointer-arith -Wdouble-promotion -Wfloat-conversion
-CFLAGS += $(INC) $(CWARN) -std=gnu99 -DUNIX $(CFLAGS_MOD) $(COPT) -I$(VARIANT_DIR) $(CFLAGS_EXTRA)
+CFLAGS += $(INC) $(CWARN) -std=gnu99 -DUNIX $(COPT) -I$(VARIANT_DIR) $(CFLAGS_EXTRA)
 
 # Debugging/Optimization
 ifdef DEBUG
@@ -142,35 +142,10 @@ endif
 
 # If the variant enables it, enable modbluetooth.
 ifeq ($(MICROPY_PY_BLUETOOTH),1)
-
-HAVE_LIBUSB := $(shell (which pkg-config > /dev/null && pkg-config --exists libusb-1.0) 2>/dev/null && echo '1')
-
-# Only one stack can be enabled.
-ifeq ($(MICROPY_BLUETOOTH_NIMBLE),1)
-ifeq ($(MICROPY_BLUETOOTH_BTSTACK),1)
-$(error Cannot enable both NimBLE and BTstack at the same time)
-endif
-endif
-
-# Default to btstack, but a variant (or make command line) can set NimBLE
-# explicitly (which is always via H4 UART).
-ifneq ($(MICROPY_BLUETOOTH_NIMBLE),1)
-ifneq ($(MICROPY_BLUETOOTH_BTSTACK),1)
-MICROPY_BLUETOOTH_BTSTACK ?= 1
-endif
-endif
-
-CFLAGS += -DMICROPY_PY_BLUETOOTH=1
-CFLAGS += -DMICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE=1
-
 ifeq ($(MICROPY_BLUETOOTH_BTSTACK),1)
+HAVE_LIBUSB := $(shell (which pkg-config > /dev/null && pkg-config --exists libusb-1.0) 2>/dev/null && echo '1')
 
 # Figure out which BTstack transport to use.
-ifeq ($(MICROPY_BLUETOOTH_BTSTACK_H4),1)
-ifeq ($(MICROPY_BLUETOOTH_BTSTACK_USB),1)
-$(error Cannot enable BTstack support for USB and H4 UART at the same time)
-endif
-else
 ifeq ($(HAVE_LIBUSB),1)
 # Default to btstack-over-usb.
 MICROPY_BLUETOOTH_BTSTACK_USB ?= 1
@@ -178,20 +153,9 @@ else
 # Fallback to HCI controller via a H4 UART (e.g. Zephyr on nRF) over a /dev/tty serial port.
 MICROPY_BLUETOOTH_BTSTACK_H4 ?= 1
 endif
-endif
-
-# BTstack is enabled.
-include $(TOP)/extmod/btstack/btstack.mk
-SRC_BTSTACK += lib/btstack/platform/embedded/btstack_run_loop_embedded.c
-
-else
-
-# NimBLE is enabled.
-CFLAGS += -DMICROPY_PY_BLUETOOTH_ENABLE_L2CAP_CHANNELS=1
-include $(TOP)/extmod/nimble/nimble.mk
 
+SRC_BTSTACK_C += lib/btstack/platform/embedded/btstack_run_loop_embedded.c
 endif
-
 endif
 
 ifeq ($(MICROPY_PY_FFI),1)
@@ -242,7 +206,6 @@ SRC_C += \
 	mpbtstackport_h4.c \
 	mpbtstackport_usb.c \
 	mpnimbleport.c \
-	$(SRC_MOD) \
 	modtermios.c \
 	modusocket.c \
 	modffi.c \
@@ -256,17 +219,14 @@ SHARED_SRC_C += $(addprefix shared/,\
 	)
 
 SRC_CXX += \
-	$(SRC_MOD_CXX)
 
 OBJ = $(PY_O)
 OBJ += $(addprefix $(BUILD)/, $(SRC_C:.c=.o))
 OBJ += $(addprefix $(BUILD)/, $(SRC_CXX:.cpp=.o))
 OBJ += $(addprefix $(BUILD)/, $(SHARED_SRC_C:.c=.o))
-OBJ += $(addprefix $(BUILD)/, $(EXTMOD_SRC_C:.c=.o))
-OBJ += $(addprefix $(BUILD)/, $(LIB_SRC_C:.c=.o))
 
 # List of sources for qstr extraction
-SRC_QSTR += $(SRC_C) $(SRC_CXX) $(SHARED_SRC_C) $(EXTMOD_SRC_C)
+SRC_QSTR += $(SRC_C) $(SRC_CXX) $(SHARED_SRC_C)
 # Append any auto-generated sources that are needed by sources listed in
 # SRC_QSTR
 SRC_QSTR_AUTO_DEPS +=
diff --git a/ports/unix/mpconfigport.h b/ports/unix/mpconfigport.h
index a67d11b9e7e42..a0b9192bfcf27 100644
--- a/ports/unix/mpconfigport.h
+++ b/ports/unix/mpconfigport.h
@@ -240,3 +240,11 @@ static inline unsigned long mp_urandom_seed_init(void) {
 // Configure the implementation of machine.idle().
 #include <sched.h>
 #define MICROPY_UNIX_MACHINE_IDLE sched_yield();
+
+#ifndef MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE
+#define MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE (1)
+#endif
+
+#ifndef MICROPY_PY_BLUETOOTH_ENABLE_L2CAP_CHANNELS
+#define MICROPY_PY_BLUETOOTH_ENABLE_L2CAP_CHANNELS (MICROPY_BLUETOOTH_NIMBLE)
+#endif
diff --git a/ports/windows/Makefile b/ports/windows/Makefile
index 64334bc18b278..e7f0f2ff618b3 100644
--- a/ports/windows/Makefile
+++ b/ports/windows/Makefile
@@ -32,7 +32,7 @@ INC += -I$(BUILD)
 INC += -I$(VARIANT_DIR)
 
 # compiler settings
-CFLAGS += $(INC) -Wall -Wpointer-arith -Wdouble-promotion -Werror -std=gnu99 -DUNIX -D__USE_MINGW_ANSI_STDIO=1 $(CFLAGS_MOD) $(COPT) $(CFLAGS_EXTRA)
+CFLAGS += $(INC) -Wall -Wpointer-arith -Wdouble-promotion -Werror -std=gnu99 -DUNIX -D__USE_MINGW_ANSI_STDIO=1 $(COPT) $(CFLAGS_EXTRA)
 LDFLAGS += -lm -lbcrypt $(LDFLAGS_EXTRA)
 
 # Debugging/Optimization
@@ -56,31 +56,26 @@ SRC_C = \
 	realpath.c \
 	init.c \
 	fmode.c \
-	$(SRC_MOD) \
 	$(wildcard $(VARIANT_DIR)/*.c)
 
 SHARED_SRC_C += $(addprefix shared/,\
 	$(SHARED_SRC_C_EXTRA) \
 	)
 
-SRC_CXX += \
-	$(SRC_MOD_CXX)
-
 OBJ = $(PY_O) $(addprefix $(BUILD)/, $(SRC_C:.c=.o))
 OBJ += $(addprefix $(BUILD)/, $(SRC_CXX:.cpp=.o))
 OBJ += $(addprefix $(BUILD)/, $(SHARED_SRC_C:.c=.o))
-OBJ += $(addprefix $(BUILD)/, $(EXTMOD_SRC_C:.c=.o))
 OBJ += $(addprefix $(BUILD)/, $(LIB_SRC_C:.c=.o))
 
 ifeq ($(MICROPY_USE_READLINE),1)
-CFLAGS_MOD += -DMICROPY_USE_READLINE=1
+CFLAGS += -DMICROPY_USE_READLINE=1
 SRC_C += shared/readline/readline.c
 endif
 
 LIB += -lws2_32
 
 # List of sources for qstr extraction
-SRC_QSTR += $(SRC_C) $(SRC_CXX) $(SHARED_SRC_C) $(EXTMOD_SRC_C)
+SRC_QSTR += $(SRC_C) $(SRC_CXX) $(SHARED_SRC_C)
 # Append any auto-generated sources that are needed by sources listed in
 # SRC_QSTR
 SRC_QSTR_AUTO_DEPS +=
@@ -89,7 +84,7 @@ ifneq ($(FROZEN_MANIFEST),)
 CFLAGS += -DMICROPY_QSTR_EXTRA_POOL=mp_qstr_frozen_const_pool -DMICROPY_MODULE_FROZEN_MPY=1 -DMPZ_DIG_SIZE=16
 endif
 
-CXXFLAGS += $(filter-out -std=gnu99,$(CFLAGS) $(CXXFLAGS_MOD))
+CXXFLAGS += $(filter-out -std=gnu99,$(CFLAGS))
 
 include $(TOP)/py/mkrules.mk
 
diff --git a/py/py.mk b/py/py.mk
index ec69ca42d9715..fde612d80465b 100644
--- a/py/py.mk
+++ b/py/py.mk
@@ -207,7 +207,7 @@ endif
 
 # Sources that may contain qstrings
 SRC_QSTR_IGNORE = py/nlr%
-SRC_QSTR += $(SRC_MOD) $(filter-out $(SRC_QSTR_IGNORE),$(PY_CORE_O_BASENAME:.o=.c))
+SRC_QSTR += $(filter-out $(SRC_QSTR_IGNORE),$(PY_CORE_O_BASENAME:.o=.c))
 
 # Anything that depends on FORCE will be considered out-of-date
 FORCE:

From 43bcfb148b21d0f6dfa18d6d565f2c686dec80af Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Sun, 9 Oct 2022 00:05:11 +1100
Subject: [PATCH 2739/3533] mimxrt/Makefile: Split up SRC_C variables.

This improves clarity a bit, but also ensures that only the required files
are added to SRC_QSTR.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/mimxrt/Makefile | 47 +++++++++++++------------------------------
 1 file changed, 14 insertions(+), 33 deletions(-)

diff --git a/ports/mimxrt/Makefile b/ports/mimxrt/Makefile
index 640864e582951..2119e027ef59f 100644
--- a/ports/mimxrt/Makefile
+++ b/ports/mimxrt/Makefile
@@ -178,6 +178,11 @@ SRC_C += \
 	pendsv.c \
 	pin.c \
 	sdcard.c \
+	systick.c \
+	ticks.c \
+	tusb_port.c \
+
+SHARED_SRC_C += \
 	shared/libc/printf.c \
 	shared/libc/string0.c \
 	shared/netutils/dhcpserver.c \
@@ -191,23 +196,17 @@ SRC_C += \
 	shared/runtime/stdout_helpers.c \
 	shared/runtime/sys_stdio_mphal.c \
 	shared/timeutils/timeutils.c \
-	systick.c \
-	ticks.c \
-	tusb_port.c \
-	$(SRC_TINYUSB_C) \
-	$(SRC_HAL_IMX_C) \
-	$(SRC_ETH_C)
 
 # Add sources for respective board flash type
 ifeq ($(MICROPY_HW_FLASH_TYPE),$(filter $(MICROPY_HW_FLASH_TYPE),qspi_nor_flash qspi_hyper_flash))
     # Add hal/flexspi_nor_flash.c or hal/flashspi_hyper_flash.c respectively
-    SRC_C += hal/flexspi_$(subst qspi_,,$(MICROPY_HW_FLASH_TYPE)).c
+    SRC_HAL_C += hal/flexspi_$(subst qspi_,,$(MICROPY_HW_FLASH_TYPE)).c
     #
     # Add custom (board specific) or default configuration
     ifeq ($(MICROPY_HW_BOARD_FLASH_FILES),1)
-        SRC_C += $(BOARD_DIR)/$(MICROPY_HW_FLASH_TYPE)_config.c
+        SRC_HAL_C += $(BOARD_DIR)/$(MICROPY_HW_FLASH_TYPE)_config.c
     else
-        SRC_C += hal/$(MICROPY_HW_FLASH_TYPE)_config.c
+        SRC_HAL_C += hal/$(MICROPY_HW_FLASH_TYPE)_config.c
     endif
 else
     $(error Error: Unknown board flash type $(MICROPY_HW_FLASH_TYPE))
@@ -254,29 +253,7 @@ SRC_S += shared/runtime/gchelper_m3.s \
 # =============================================================================
 
 # List of sources for qstr extraction
-SRC_QSTR += \
-	extmod/modonewire.c \
-	extmod/uos_dupterm.c \
-	machine_adc.c \
-	machine_i2s.c \
-	machine_led.c \
-	machine_pin.c \
-	machine_pwm.c \
-	machine_rtc.c \
-	machine_sdcard.c \
-	machine_spi.c \
-	machine_timer.c \
-	machine_uart.c \
-	machine_wdt.c \
-	mimxrt_flash.c \
-	modmachine.c \
-	modmimxrt.c \
-	modutime.c \
-	pin.c \
-	shared/readline/readline.c \
-	shared/runtime/mpirq.c \
-	shared/runtime/sys_stdio_mphal.c \
-	$(GEN_PINS_SRC)
+SRC_QSTR += $(SRC_C) $(SHARED_SRC_C) $(GEN_PINS_SRC)
 
 # =============================================================================
 # Compiler Flags
@@ -413,12 +390,16 @@ ifeq ($(MICROPY_FLOAT_IMPL),double)
 $(LIBM_O): CFLAGS := $(filter-out -Wdouble-promotion -Wfloat-conversion, $(CFLAGS))
 endif
 
-
 OBJ += $(PY_O)
 OBJ += $(LIBM_O)
 OBJ += $(addprefix $(BUILD)/, $(SRC_C:.c=.o))
+OBJ += $(addprefix $(BUILD)/, $(SHARED_SRC_C:.c=.o))
 OBJ += $(addprefix $(BUILD)/, $(SRC_S:.s=.o))
 OBJ += $(addprefix $(BUILD)/, $(SRC_SS:.S=.o))
+OBJ += $(addprefix $(BUILD)/, $(SRC_TINYUSB_C:.c=.o))
+OBJ += $(addprefix $(BUILD)/, $(SRC_HAL_C:.c=.o))
+OBJ += $(addprefix $(BUILD)/, $(SRC_HAL_IMX_C:.c=.o))
+OBJ += $(addprefix $(BUILD)/, $(SRC_ETH_C:.c=.o))
 OBJ += $(GEN_PINS_SRC:.c=.o)
 
 # Workaround for bug in older gcc, warning on "static usbd_device_t _usbd_dev = { 0 };"

From a2aceb50074f625c0d9b08ab8902bef1557c1ec6 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Sun, 9 Oct 2022 00:05:17 +1100
Subject: [PATCH 2740/3533] nrf/Makefile: Split up SRC_C variables.

This improves clarity a bit, but also ensures that only the required files
are added to SRC_QSTR.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/nrf/Makefile | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/ports/nrf/Makefile b/ports/nrf/Makefile
index 4128404da4a80..a80a37e1fb464 100644
--- a/ports/nrf/Makefile
+++ b/ports/nrf/Makefile
@@ -163,7 +163,7 @@ LIBS = \
 
 ifeq ($(MCU_VARIANT), nrf52)
 
-SRC_LIB += $(addprefix lib/,\
+SRC_LIB_C += $(addprefix lib/,\
         libm/math.c \
         libm/fmodf.c \
         libm/nearbyintf.c \
@@ -197,7 +197,7 @@ endif
 
 ifeq ($(MCU_VARIANT), nrf91)
 
-SRC_LIB += $(addprefix lib/,\
+SRC_LIB_C += $(addprefix lib/,\
         libm/math.c \
         libm/fmodf.c \
         libm/nearbyintf.c \
@@ -236,7 +236,7 @@ include drivers/secureboot/secureboot.mk
 
 endif
 
-SRC_LIB += $(addprefix shared/,\
+SRC_SHARED_C += $(addprefix shared/,\
 	libc/string0.c \
 	readline/readline.c \
 	runtime/pyexec.c \
@@ -247,7 +247,7 @@ SRC_LIB += $(addprefix shared/,\
 	)
 
 ifeq ($(MICROPY_FATFS), 1)
-SRC_LIB += $(addprefix lib/,\
+SRC_LIB_C += $(addprefix lib/,\
         oofatfs/ff.c \
         oofatfs/ffunicode.c \
         )
@@ -362,7 +362,8 @@ OBJ += $(addprefix $(BUILD)/, $(SRC_NRFX:.c=.o))
 OBJ += $(addprefix $(BUILD)/, $(SRC_NRFX_HAL:.c=.o))
 OBJ += $(addprefix $(BUILD)/, $(DRIVERS_SRC_C:.c=.o))
 OBJ += $(addprefix $(BUILD)/, $(SYSTEM_C_SRC:.c=.o))
-OBJ += $(addprefix $(BUILD)/, $(SRC_LIB:.c=.o))
+OBJ += $(addprefix $(BUILD)/, $(SRC_LIB_C:.c=.o))
+OBJ += $(addprefix $(BUILD)/, $(SRC_SHARED_C:.c=.o))
 OBJ += $(GEN_PINS_SRC:.c=.o)
 
 $(BUILD)/$(OOFATFS_DIR)/ff.o: COPT += -Os
@@ -518,7 +519,7 @@ $(BUILD)/$(OUTPUT_FILENAME).elf: $(OBJ)
 	$(Q)$(SIZE) $@
 
 # List of sources for qstr extraction
-SRC_QSTR += $(SRC_C) $(SRC_LIB) $(DRIVERS_SRC_C) $(SRC_BOARD_MODULES)
+SRC_QSTR += $(SRC_C) $(SRC_SHARED_C) $(DRIVERS_SRC_C) $(SRC_BOARD_MODULES)
 
 # Append any auto-generated sources that are needed by sources listed in
 # SRC_QSTR

From b25087fc6ff6460bf464dbd402febc86799068a9 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Sun, 9 Oct 2022 00:05:26 +1100
Subject: [PATCH 2741/3533] samd/Makefile: Split up SRC_C variables.

This improves clarity a bit, but also ensures that only the required files
are added to SRC_QSTR.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/samd/Makefile | 66 +++++++++++++++++++++------------------------
 1 file changed, 31 insertions(+), 35 deletions(-)

diff --git a/ports/samd/Makefile b/ports/samd/Makefile
index 2c5f6a1ab2210..2f97b1993e99a 100644
--- a/ports/samd/Makefile
+++ b/ports/samd/Makefile
@@ -110,16 +110,8 @@ SRC_C += \
 	samd_isr.c \
 	samd_soc.c \
 	tusb_port.c \
-	lib/asf4/$(MCU_SERIES_LOWER)/hal/src/hal_atomic.c \
-	lib/asf4/$(MCU_SERIES_LOWER)/hal/src/hal_flash.c \
-	lib/asf4/$(MCU_SERIES_LOWER)/hpl/nvmctrl/hpl_nvmctrl.c \
-	lib/tinyusb/src/class/cdc/cdc_device.c \
-	lib/tinyusb/src/common/tusb_fifo.c \
-	lib/tinyusb/src/device/usbd.c \
-	lib/tinyusb/src/device/usbd_control.c \
-	lib/tinyusb/src/portable/microchip/samd/dcd_samd.c \
-	lib/tinyusb/src/tusb.c \
-	drivers/bus/softspi.c \
+
+SHARED_SRC_C += \
 	shared/runtime/mpirq.c \
 	shared/libc/printf.c \
 	shared/libc/string0.c \
@@ -132,39 +124,43 @@ SRC_C += \
 	shared/runtime/sys_stdio_mphal.c \
 	shared/timeutils/timeutils.c \
 
-LIBM_SRC_C += \
-	lib/libm/ef_sqrt.c \
-	lib/libm/fmodf.c \
-	lib/libm/math.c \
-	lib/libm/nearbyintf.c \
+ASF4_SRC_C += $(addprefix lib/asf4/$(MCU_SERIES_LOWER)/,\
+	hal/src/hal_atomic.c \
+	hal/src/hal_flash.c \
+	hpl/nvmctrl/hpl_nvmctrl.c \
+	)
+
+LIBM_SRC_C += $(addprefix lib/libm/,\
+	ef_sqrt.c \
+	fmodf.c \
+	math.c \
+	nearbyintf.c \
+	)
+
+TINYUSB_SRC_C += $(addprefix lib/tinyusb/src/,\
+	class/cdc/cdc_device.c \
+	common/tusb_fifo.c \
+	device/usbd.c \
+	device/usbd_control.c \
+	portable/microchip/samd/dcd_samd.c \
+	tusb.c \
+	)
+
+DRIVERS_SRC_C += \
+	drivers/bus/softspi.c \
 
 # List of sources for qstr extraction
-SRC_QSTR += \
-	machine_adc.c \
-	machine_dac.c \
-	machine_i2c.c \
-	machine_led.c \
-	machine_pin.c \
-	machine_pwm.c \
-	machine_spi.c \
-	machine_timer.c \
-	machine_uart.c \
-	machine_wdt.c \
-	modutime.c \
-	modmachine.c \
-	modsamd.c \
-	samd_flash.c \
-	shared/readline/readline.c \
-	shared/runtime/mpirq.c \
-	shared/runtime/sys_stdio_mphal.c \
-
-SRC_QSTR += $(SRC_CXX)
+SRC_QSTR += $(SRC_C) $(SHARED_SRC_C) $(SRC_CXX) $(GEN_PINS_SRC)
 
 OBJ += $(PY_O)
 OBJ += $(addprefix $(BUILD)/, $(SRC_C:.c=.o))
 OBJ += $(addprefix $(BUILD)/, $(SRC_CXX:.cpp=.o))
 OBJ += $(addprefix $(BUILD)/, $(SRC_S:.s=.o))
+OBJ += $(addprefix $(BUILD)/, $(SHARED_SRC_C:.c=.o))
+OBJ += $(addprefix $(BUILD)/, $(ASF4_SRC_C:.c=.o))
 OBJ += $(addprefix $(BUILD)/, $(LIBM_SRC_C:.c=.o))
+OBJ += $(addprefix $(BUILD)/, $(DRIVERS_SRC_C:.c=.o))
+OBJ += $(addprefix $(BUILD)/, $(TINYUSB_SRC_C:.c=.o))
 OBJ += $(GEN_PINS_SRC:.c=.o)
 
 ifneq ($(FROZEN_MANIFEST),)

From 92d911803812100fac109b6108ab005e7bbd4c82 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Fri, 7 Oct 2022 21:08:08 +0200
Subject: [PATCH 2742/3533] rp2/fatfs_port: Fix the modification date of files.

It was off by 2000 % 128 == 80 years.

Addresses issue #9535.
---
 ports/rp2/fatfs_port.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/rp2/fatfs_port.c b/ports/rp2/fatfs_port.c
index 3821d6586c13f..9706b6fe7dc70 100644
--- a/ports/rp2/fatfs_port.c
+++ b/ports/rp2/fatfs_port.c
@@ -30,5 +30,5 @@
 MP_WEAK DWORD get_fattime(void) {
     datetime_t t;
     rtc_get_datetime(&t);
-    return ((2000 + t.year - 1980) << 25) | ((t.month) << 21) | ((t.day) << 16) | ((t.hour) << 11) | ((t.min) << 5) | (t.sec / 2);
+    return ((t.year - 1980) << 25) | ((t.month) << 21) | ((t.day) << 16) | ((t.hour) << 11) | ((t.min) << 5) | (t.sec / 2);
 }

From ab317a0d66005ea88f162994130f61d0d488db93 Mon Sep 17 00:00:00 2001
From: David Lechner <david@pybricks.com>
Date: Sat, 8 Oct 2022 17:32:22 -0500
Subject: [PATCH 2743/3533] py/misc: Remove use of bitfield from vstr_t.

Since there is only one flag, we don't need to use a bitfield in vstr_t.
Compilers emit extra instructions to access a bitfield, so this should
reduce the binary size a small amount.

Signed-off-by: David Lechner <david@pybricks.com>
---
 py/misc.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/py/misc.h b/py/misc.h
index 7350d2f9b0c08..32061a009ed31 100644
--- a/py/misc.h
+++ b/py/misc.h
@@ -179,7 +179,7 @@ typedef struct _vstr_t {
     size_t alloc;
     size_t len;
     char *buf;
-    bool fixed_buf : 1;
+    bool fixed_buf;
 } vstr_t;
 
 // convenience macro to declare a vstr with a fixed size buffer on the stack

From 89b320737652829edbab921e86d7ad3962d86d9e Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 14 Oct 2022 14:36:17 +1100
Subject: [PATCH 2744/3533] unix/modffi: Move header includes inside
 MICROPY_PY_FFI guard.

So ffi.h is not needed if this module is disabled.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/unix/modffi.c | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/ports/unix/modffi.c b/ports/unix/modffi.c
index 3df748b80d956..bc585f8647bc6 100644
--- a/ports/unix/modffi.c
+++ b/ports/unix/modffi.c
@@ -25,13 +25,6 @@
  * THE SOFTWARE.
  */
 
-#include <assert.h>
-#include <string.h>
-#include <errno.h>
-#include <dlfcn.h>
-#include <ffi.h>
-#include <stdint.h>
-
 #include "py/runtime.h"
 #include "py/binary.h"
 #include "py/mperrno.h"
@@ -40,6 +33,12 @@
 
 #if MICROPY_PY_FFI
 
+#include <assert.h>
+#include <string.h>
+#include <errno.h>
+#include <dlfcn.h>
+#include <ffi.h>
+
 /*
  * modffi uses character codes to encode a value type, based on "struct"
  * module type codes, with some extensions and overridings.

From 815920c87f9bda6b3fb7ec24686154210c9e8774 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 14 Oct 2022 15:49:52 +1100
Subject: [PATCH 2745/3533] extmod/utime_mphal: Make ticks_add check for
 overflow of delta.

Work done in collaboration with @jimmo.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/utime_mphal.c          | 13 +++++++++++
 tests/extmod/ticks_add.py     | 42 +++++++++++++++++++++++++++++++++++
 tests/extmod/ticks_add.py.exp | 36 ++++++++++++++++++++++++++++++
 3 files changed, 91 insertions(+)
 create mode 100644 tests/extmod/ticks_add.py
 create mode 100644 tests/extmod/ticks_add.py.exp

diff --git a/extmod/utime_mphal.c b/extmod/utime_mphal.c
index 3d1cdfd820629..cd91c95530cba 100644
--- a/extmod/utime_mphal.c
+++ b/extmod/utime_mphal.c
@@ -95,6 +95,19 @@ STATIC mp_obj_t time_ticks_add(mp_obj_t ticks_in, mp_obj_t delta_in) {
     // we assume that first argument come from ticks_xx so is small int
     mp_uint_t ticks = MP_OBJ_SMALL_INT_VALUE(ticks_in);
     mp_uint_t delta = mp_obj_get_int(delta_in);
+
+    // Check that delta does not overflow the range that ticks_diff can handle.
+    // This ensures the following:
+    //  - ticks_diff(ticks_add(T, delta), T) == delta
+    //  - ticks_diff(T, ticks_add(T, delta)) == -delta
+    // The latter requires excluding delta=-TICKS_PERIOD/2.
+    //
+    // This unsigned comparison is equivalent to a signed comparison of:
+    //   delta <= TICKS_PERIOD/2 || delta >= TICKS_PERIOD/2
+    if (delta + MICROPY_PY_UTIME_TICKS_PERIOD / 2 - 1 >= MICROPY_PY_UTIME_TICKS_PERIOD - 1) {
+        mp_raise_msg(&mp_type_OverflowError, MP_ERROR_TEXT("ticks interval overflow"));
+    }
+
     return MP_OBJ_NEW_SMALL_INT((ticks + delta) & (MICROPY_PY_UTIME_TICKS_PERIOD - 1));
 }
 MP_DEFINE_CONST_FUN_OBJ_2(mp_utime_ticks_add_obj, time_ticks_add);
diff --git a/tests/extmod/ticks_add.py b/tests/extmod/ticks_add.py
new file mode 100644
index 0000000000000..2f1ba6c8109de
--- /dev/null
+++ b/tests/extmod/ticks_add.py
@@ -0,0 +1,42 @@
+try:
+    from utime import ticks_diff, ticks_add
+except ImportError:
+    print("SKIP")
+    raise SystemExit
+
+# Maximum value returned from ticks_add, ticks_ms, etc.
+TICKS_MAX = ticks_add(0, -1)
+# Maximum value returned from ticks_diff.
+TICKS_INTERVAL_MAX = TICKS_MAX // 2
+
+# Invariants:
+# - ticks_diff(ticks_add(T, delta), T) == delta
+# - ticks_diff(T, ticks_add(T, delta)) == -delta
+
+# Check actual values of ticks_add.
+print(ticks_add(20, 12))
+print(ticks_add(20, -12))
+
+# Check invariant.
+print(ticks_diff(ticks_add(100, 123), 100))
+print(ticks_diff(ticks_add(100, -123), 100))
+print(ticks_diff(100, ticks_add(100, 123)))
+print(ticks_diff(100, ticks_add(100, -123)))
+
+# Check limits.
+for T in (0, 10, TICKS_MAX):
+    for delta in (
+        -TICKS_INTERVAL_MAX - 1,
+        -TICKS_INTERVAL_MAX,
+        0,
+        TICKS_INTERVAL_MAX,
+        TICKS_INTERVAL_MAX + 1,
+    ):
+        try:
+            print(ticks_diff(ticks_add(T, delta), T) == delta)
+        except OverflowError:
+            print("OverflowError")
+        try:
+            print(ticks_diff(T, ticks_add(T, delta)) == -delta)
+        except OverflowError:
+            print("OverflowError")
diff --git a/tests/extmod/ticks_add.py.exp b/tests/extmod/ticks_add.py.exp
new file mode 100644
index 0000000000000..60dc6f5afda6b
--- /dev/null
+++ b/tests/extmod/ticks_add.py.exp
@@ -0,0 +1,36 @@
+32
+8
+123
+-123
+-123
+123
+OverflowError
+OverflowError
+True
+True
+True
+True
+True
+True
+OverflowError
+OverflowError
+OverflowError
+OverflowError
+True
+True
+True
+True
+True
+True
+OverflowError
+OverflowError
+OverflowError
+OverflowError
+True
+True
+True
+True
+True
+True
+OverflowError
+OverflowError

From 965a87b53cd9da32a546b03cdd01042058080498 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 14 Oct 2022 16:10:38 +1100
Subject: [PATCH 2746/3533] tests/extmod: Add test for sleep_ms value that
 overflows ticks.

Addresses #9516.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/extmod/uasyncio_micropython.py     | 6 ++++++
 tests/extmod/uasyncio_micropython.py.exp | 1 +
 2 files changed, 7 insertions(+)

diff --git a/tests/extmod/uasyncio_micropython.py b/tests/extmod/uasyncio_micropython.py
index 69e5fa3224df7..a6b65bb2a84c0 100644
--- a/tests/extmod/uasyncio_micropython.py
+++ b/tests/extmod/uasyncio_micropython.py
@@ -22,6 +22,12 @@ async def main():
     await uasyncio.sleep_ms(1)
     print(utime.ticks_diff(utime.ticks_ms(), t0) < 100)
 
+    try:
+        # Sleep 1ms beyond maximum allowed sleep value
+        await uasyncio.sleep_ms(utime.ticks_add(0, -1) // 2 + 1)
+    except OverflowError:
+        print("OverflowError")
+
     # When task finished before the timeout
     print(await uasyncio.wait_for_ms(task(1, 5), 50))
 
diff --git a/tests/extmod/uasyncio_micropython.py.exp b/tests/extmod/uasyncio_micropython.py.exp
index f5be1dc75a254..4d1c6d681f2f6 100644
--- a/tests/extmod/uasyncio_micropython.py.exp
+++ b/tests/extmod/uasyncio_micropython.py.exp
@@ -1,4 +1,5 @@
 True
+OverflowError
 task start 1
 task end 1
 2

From af4ba6d1b4558e0ce1c81b8acd975f0bcbe83072 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Thu, 6 Oct 2022 19:48:07 +0200
Subject: [PATCH 2747/3533] stm32: Rename machine I2C and SPI types
 consistently across ports.

This renames:
- machine_hard_i2c_type -> machine_i2c_type
- machine_hard_spi_type -> machine_spi_type
---
 ports/stm32/machine_i2c.c | 18 +++++++++---------
 ports/stm32/machine_spi.c | 14 +++++++-------
 ports/stm32/modmachine.c  |  4 ++--
 ports/stm32/modmachine.h  |  4 +++-
 ports/stm32/spi.c         |  4 ++--
 ports/stm32/spi.h         |  2 +-
 6 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/ports/stm32/machine_i2c.c b/ports/stm32/machine_i2c.c
index 9a2d338f54982..7718d1bfe0384 100644
--- a/ports/stm32/machine_i2c.c
+++ b/ports/stm32/machine_i2c.c
@@ -49,16 +49,16 @@ typedef struct _machine_hard_i2c_obj_t {
 
 STATIC const machine_hard_i2c_obj_t machine_hard_i2c_obj[MICROPY_HW_MAX_I2C] = {
     #if defined(MICROPY_HW_I2C1_SCL)
-    [0] = {{&machine_hard_i2c_type}, I2C1, MICROPY_HW_I2C1_SCL, MICROPY_HW_I2C1_SDA},
+    [0] = {{&machine_i2c_type}, I2C1, MICROPY_HW_I2C1_SCL, MICROPY_HW_I2C1_SDA},
     #endif
     #if defined(MICROPY_HW_I2C2_SCL)
-    [1] = {{&machine_hard_i2c_type}, I2C2, MICROPY_HW_I2C2_SCL, MICROPY_HW_I2C2_SDA},
+    [1] = {{&machine_i2c_type}, I2C2, MICROPY_HW_I2C2_SCL, MICROPY_HW_I2C2_SDA},
     #endif
     #if defined(MICROPY_HW_I2C3_SCL)
-    [2] = {{&machine_hard_i2c_type}, I2C3, MICROPY_HW_I2C3_SCL, MICROPY_HW_I2C3_SDA},
+    [2] = {{&machine_i2c_type}, I2C3, MICROPY_HW_I2C3_SCL, MICROPY_HW_I2C3_SDA},
     #endif
     #if defined(MICROPY_HW_I2C4_SCL)
-    [3] = {{&machine_hard_i2c_type}, I2C4, MICROPY_HW_I2C4_SCL, MICROPY_HW_I2C4_SDA},
+    [3] = {{&machine_i2c_type}, I2C4, MICROPY_HW_I2C4_SCL, MICROPY_HW_I2C4_SDA},
     #endif
 };
 
@@ -140,16 +140,16 @@ typedef mp_machine_soft_i2c_obj_t machine_hard_i2c_obj_t;
 
 STATIC machine_hard_i2c_obj_t machine_hard_i2c_obj[MICROPY_HW_MAX_I2C] = {
     #if defined(MICROPY_HW_I2C1_SCL)
-    [0] = {{&machine_hard_i2c_type}, 1, I2C_POLL_DEFAULT_TIMEOUT_US, MICROPY_HW_I2C1_SCL, MICROPY_HW_I2C1_SDA},
+    [0] = {{&machine_i2c_type}, 1, I2C_POLL_DEFAULT_TIMEOUT_US, MICROPY_HW_I2C1_SCL, MICROPY_HW_I2C1_SDA},
     #endif
     #if defined(MICROPY_HW_I2C2_SCL)
-    [1] = {{&machine_hard_i2c_type}, 1, I2C_POLL_DEFAULT_TIMEOUT_US, MICROPY_HW_I2C2_SCL, MICROPY_HW_I2C2_SDA},
+    [1] = {{&machine_i2c_type}, 1, I2C_POLL_DEFAULT_TIMEOUT_US, MICROPY_HW_I2C2_SCL, MICROPY_HW_I2C2_SDA},
     #endif
     #if defined(MICROPY_HW_I2C3_SCL)
-    [2] = {{&machine_hard_i2c_type}, 1, I2C_POLL_DEFAULT_TIMEOUT_US, MICROPY_HW_I2C3_SCL, MICROPY_HW_I2C3_SDA},
+    [2] = {{&machine_i2c_type}, 1, I2C_POLL_DEFAULT_TIMEOUT_US, MICROPY_HW_I2C3_SCL, MICROPY_HW_I2C3_SDA},
     #endif
     #if defined(MICROPY_HW_I2C4_SCL)
-    [3] = {{&machine_hard_i2c_type}, 1, I2C_POLL_DEFAULT_TIMEOUT_US, MICROPY_HW_I2C4_SCL, MICROPY_HW_I2C4_SDA},
+    [3] = {{&machine_i2c_type}, 1, I2C_POLL_DEFAULT_TIMEOUT_US, MICROPY_HW_I2C4_SCL, MICROPY_HW_I2C4_SDA},
     #endif
 };
 
@@ -237,7 +237,7 @@ STATIC const mp_machine_i2c_p_t machine_hard_i2c_p = {
 };
 
 MP_DEFINE_CONST_OBJ_TYPE(
-    machine_hard_i2c_type,
+    machine_i2c_type,
     MP_QSTR_I2C,
     MP_TYPE_FLAG_NONE,
     make_new, machine_hard_i2c_make_new,
diff --git a/ports/stm32/machine_spi.c b/ports/stm32/machine_spi.c
index 718ae1af5e5a6..7ccff75f1ccf1 100644
--- a/ports/stm32/machine_spi.c
+++ b/ports/stm32/machine_spi.c
@@ -32,12 +32,12 @@
 // Implementation of hard SPI for machine module
 
 STATIC const machine_hard_spi_obj_t machine_hard_spi_obj[] = {
-    {{&machine_hard_spi_type}, &spi_obj[0]},
-    {{&machine_hard_spi_type}, &spi_obj[1]},
-    {{&machine_hard_spi_type}, &spi_obj[2]},
-    {{&machine_hard_spi_type}, &spi_obj[3]},
-    {{&machine_hard_spi_type}, &spi_obj[4]},
-    {{&machine_hard_spi_type}, &spi_obj[5]},
+    {{&machine_spi_type}, &spi_obj[0]},
+    {{&machine_spi_type}, &spi_obj[1]},
+    {{&machine_spi_type}, &spi_obj[2]},
+    {{&machine_spi_type}, &spi_obj[3]},
+    {{&machine_spi_type}, &spi_obj[4]},
+    {{&machine_spi_type}, &spi_obj[5]},
 };
 
 STATIC void machine_hard_spi_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
@@ -136,7 +136,7 @@ STATIC const mp_machine_spi_p_t machine_hard_spi_p = {
 };
 
 MP_DEFINE_CONST_OBJ_TYPE(
-    machine_hard_spi_type,
+    machine_spi_type,
     MP_QSTR_SPI,
     MP_TYPE_FLAG_NONE,
     make_new, machine_hard_spi_make_new,
diff --git a/ports/stm32/modmachine.c b/ports/stm32/modmachine.c
index e1796d1cf025a..06fdd0e2c1bd3 100644
--- a/ports/stm32/modmachine.c
+++ b/ports/stm32/modmachine.c
@@ -424,14 +424,14 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_ADC),                 MP_ROM_PTR(&machine_adc_type) },
     #if MICROPY_PY_MACHINE_I2C
     #if MICROPY_HW_ENABLE_HW_I2C
-    { MP_ROM_QSTR(MP_QSTR_I2C),                 MP_ROM_PTR(&machine_hard_i2c_type) },
+    { MP_ROM_QSTR(MP_QSTR_I2C),                 MP_ROM_PTR(&machine_i2c_type) },
     #else
     { MP_ROM_QSTR(MP_QSTR_I2C),                 MP_ROM_PTR(&mp_machine_soft_i2c_type) },
     #endif
     { MP_ROM_QSTR(MP_QSTR_SoftI2C),             MP_ROM_PTR(&mp_machine_soft_i2c_type) },
     #endif
     #if MICROPY_PY_MACHINE_SPI
-    { MP_ROM_QSTR(MP_QSTR_SPI),                 MP_ROM_PTR(&machine_hard_spi_type) },
+    { MP_ROM_QSTR(MP_QSTR_SPI),                 MP_ROM_PTR(&machine_spi_type) },
     { MP_ROM_QSTR(MP_QSTR_SoftSPI),             MP_ROM_PTR(&mp_machine_soft_spi_type) },
     #endif
     #if MICROPY_HW_ENABLE_I2S
diff --git a/ports/stm32/modmachine.h b/ports/stm32/modmachine.h
index 9fa7851582e1a..0c776280b416c 100644
--- a/ports/stm32/modmachine.h
+++ b/ports/stm32/modmachine.h
@@ -30,8 +30,10 @@
 
 extern const mp_obj_type_t machine_adc_type;
 extern const mp_obj_type_t machine_timer_type;
-extern const mp_obj_type_t machine_hard_i2c_type;
+extern const mp_obj_type_t machine_i2c_type;
 extern const mp_obj_type_t machine_i2s_type;
+extern const mp_obj_type_t machine_spi_type;
+extern const mp_obj_type_t machine_timer_type;
 
 void machine_init(void);
 void machine_deinit(void);
diff --git a/ports/stm32/spi.c b/ports/stm32/spi.c
index 9c031cad2e28d..e21ebcd02b9da 100644
--- a/ports/stm32/spi.c
+++ b/ports/stm32/spi.c
@@ -678,7 +678,7 @@ const spi_t *spi_from_mp_obj(mp_obj_t o) {
     if (mp_obj_is_type(o, &pyb_spi_type)) {
         pyb_spi_obj_t *self = MP_OBJ_TO_PTR(o);
         return self->spi;
-    } else if (mp_obj_is_type(o, &machine_hard_spi_type)) {
+    } else if (mp_obj_is_type(o, &machine_spi_type)) {
         machine_hard_spi_obj_t *self = MP_OBJ_TO_PTR(o);
         return self->spi;
     } else {
@@ -687,7 +687,7 @@ const spi_t *spi_from_mp_obj(mp_obj_t o) {
 }
 
 mp_obj_base_t *mp_hal_get_spi_obj(mp_obj_t o) {
-    if (mp_obj_is_type(o, &machine_hard_spi_type)) {
+    if (mp_obj_is_type(o, &machine_spi_type)) {
         return MP_OBJ_TO_PTR(o);
     }
     #if MICROPY_PY_MACHINE_SOFTSPI
diff --git a/ports/stm32/spi.h b/ports/stm32/spi.h
index 17f1bf6c4ab90..ef3d718cddfd4 100644
--- a/ports/stm32/spi.h
+++ b/ports/stm32/spi.h
@@ -65,7 +65,7 @@ extern const spi_t spi_obj[6];
 
 extern const mp_spi_proto_t spi_proto;
 extern const mp_obj_type_t pyb_spi_type;
-extern const mp_obj_type_t machine_hard_spi_type;
+extern const mp_obj_type_t machine_spi_type;
 
 // A transfer of "len" bytes should take len*8*1000/baudrate milliseconds.
 // To simplify the calculation we assume the baudrate is never less than 8kHz

From 427670c21047585fb9295ddf35cdbdaa8265fbe1 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Thu, 6 Oct 2022 20:20:03 +0200
Subject: [PATCH 2748/3533] esp32: Rename machine I2C and SPI types
 consistently across ports.

This renames:
- machine_hw_i2c_type -> machine_i2c_type
- machine_hw_spi_type -> machine_spi_type
---
 ports/esp32/machine_hw_spi.c | 4 ++--
 ports/esp32/machine_i2c.c    | 4 ++--
 ports/esp32/modmachine.c     | 4 ++--
 ports/esp32/modmachine.h     | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/ports/esp32/machine_hw_spi.c b/ports/esp32/machine_hw_spi.c
index 647874e17f648..35ecc397b339b 100644
--- a/ports/esp32/machine_hw_spi.c
+++ b/ports/esp32/machine_hw_spi.c
@@ -490,7 +490,7 @@ mp_obj_t machine_hw_spi_make_new(const mp_obj_type_t *type, size_t n_args, size_
         self = &machine_hw_spi_obj[1];
         default_pins = &machine_hw_spi_default_pins[1];
     }
-    self->base.type = &machine_hw_spi_type;
+    self->base.type = &machine_spi_type;
 
     int8_t sck, mosi, miso;
 
@@ -540,7 +540,7 @@ STATIC const mp_machine_spi_p_t machine_hw_spi_p = {
 };
 
 MP_DEFINE_CONST_OBJ_TYPE(
-    machine_hw_spi_type,
+    machine_spi_type,
     MP_QSTR_SPI,
     MP_TYPE_FLAG_NONE,
     make_new, machine_hw_spi_make_new,
diff --git a/ports/esp32/machine_i2c.c b/ports/esp32/machine_i2c.c
index 9244343dcf618..17e98ffc5bb4b 100644
--- a/ports/esp32/machine_i2c.c
+++ b/ports/esp32/machine_i2c.c
@@ -161,7 +161,7 @@ mp_obj_t machine_hw_i2c_make_new(const mp_obj_type_t *type, size_t n_args, size_
     bool first_init = false;
     if (self->base.type == NULL) {
         // Created for the first time, set default pins
-        self->base.type = &machine_hw_i2c_type;
+        self->base.type = &machine_i2c_type;
         self->port = i2c_id;
         if (self->port == I2C_NUM_0) {
             self->scl = MICROPY_HW_I2C0_SCL;
@@ -193,7 +193,7 @@ STATIC const mp_machine_i2c_p_t machine_hw_i2c_p = {
 };
 
 MP_DEFINE_CONST_OBJ_TYPE(
-    machine_hw_i2c_type,
+    machine_i2c_type,
     MP_QSTR_I2C,
     MP_TYPE_FLAG_NONE,
     make_new, machine_hw_i2c_make_new,
diff --git a/ports/esp32/modmachine.c b/ports/esp32/modmachine.c
index a70f2fbedb59c..e24afd0403502 100644
--- a/ports/esp32/modmachine.c
+++ b/ports/esp32/modmachine.c
@@ -315,14 +315,14 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     #if MICROPY_PY_MACHINE_DAC
     { MP_ROM_QSTR(MP_QSTR_DAC), MP_ROM_PTR(&machine_dac_type) },
     #endif
-    { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&machine_hw_i2c_type) },
+    { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&machine_i2c_type) },
     { MP_ROM_QSTR(MP_QSTR_SoftI2C), MP_ROM_PTR(&mp_machine_soft_i2c_type) },
     #if MICROPY_PY_MACHINE_I2S
     { MP_ROM_QSTR(MP_QSTR_I2S), MP_ROM_PTR(&machine_i2s_type) },
     #endif
     { MP_ROM_QSTR(MP_QSTR_PWM), MP_ROM_PTR(&machine_pwm_type) },
     { MP_ROM_QSTR(MP_QSTR_RTC), MP_ROM_PTR(&machine_rtc_type) },
-    { MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&machine_hw_spi_type) },
+    { MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&machine_spi_type) },
     { MP_ROM_QSTR(MP_QSTR_SoftSPI), MP_ROM_PTR(&mp_machine_soft_spi_type) },
     { MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&machine_uart_type) },
 
diff --git a/ports/esp32/modmachine.h b/ports/esp32/modmachine.h
index 4d2ab9020d16f..138a89e9c33d5 100644
--- a/ports/esp32/modmachine.h
+++ b/ports/esp32/modmachine.h
@@ -16,8 +16,8 @@ extern const mp_obj_type_t machine_touchpad_type;
 extern const mp_obj_type_t machine_adc_type;
 extern const mp_obj_type_t machine_adcblock_type;
 extern const mp_obj_type_t machine_dac_type;
-extern const mp_obj_type_t machine_hw_i2c_type;
-extern const mp_obj_type_t machine_hw_spi_type;
+extern const mp_obj_type_t machine_i2c_type;
+extern const mp_obj_type_t machine_spi_type;
 extern const mp_obj_type_t machine_i2s_type;
 extern const mp_obj_type_t machine_uart_type;
 extern const mp_obj_type_t machine_rtc_type;

From 22ad45fda649b754916883f246139e35ff20e126 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Thu, 6 Oct 2022 20:21:51 +0200
Subject: [PATCH 2749/3533] rp2: Rename machine I2C type consistently across
 ports.

This renames:
- machine_hw_i2c_type -> machine_i2c_type
---
 ports/rp2/machine_i2c.c | 6 +++---
 ports/rp2/modmachine.c  | 2 +-
 ports/rp2/modmachine.h  | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ports/rp2/machine_i2c.c b/ports/rp2/machine_i2c.c
index 00dc36a4e0cb2..85d12c7713684 100644
--- a/ports/rp2/machine_i2c.c
+++ b/ports/rp2/machine_i2c.c
@@ -68,8 +68,8 @@ typedef struct _machine_i2c_obj_t {
 } machine_i2c_obj_t;
 
 STATIC machine_i2c_obj_t machine_i2c_obj[] = {
-    {{&machine_hw_i2c_type}, i2c0, 0, MICROPY_HW_I2C0_SCL, MICROPY_HW_I2C0_SDA, 0},
-    {{&machine_hw_i2c_type}, i2c1, 1, MICROPY_HW_I2C1_SCL, MICROPY_HW_I2C1_SDA, 0},
+    {{&machine_i2c_type}, i2c0, 0, MICROPY_HW_I2C0_SCL, MICROPY_HW_I2C0_SDA, 0},
+    {{&machine_i2c_type}, i2c1, 1, MICROPY_HW_I2C1_SCL, MICROPY_HW_I2C1_SDA, 0},
 };
 
 STATIC void machine_i2c_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
@@ -177,7 +177,7 @@ STATIC const mp_machine_i2c_p_t machine_i2c_p = {
 };
 
 MP_DEFINE_CONST_OBJ_TYPE(
-    machine_hw_i2c_type,
+    machine_i2c_type,
     MP_QSTR_I2C,
     MP_TYPE_FLAG_NONE,
     make_new, machine_i2c_make_new,
diff --git a/ports/rp2/modmachine.c b/ports/rp2/modmachine.c
index 3c8922c417210..8058189a92b63 100644
--- a/ports/rp2/modmachine.c
+++ b/ports/rp2/modmachine.c
@@ -239,7 +239,7 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_mem32),               MP_ROM_PTR(&machine_mem32_obj) },
 
     { MP_ROM_QSTR(MP_QSTR_ADC),                 MP_ROM_PTR(&machine_adc_type) },
-    { MP_ROM_QSTR(MP_QSTR_I2C),                 MP_ROM_PTR(&machine_hw_i2c_type) },
+    { MP_ROM_QSTR(MP_QSTR_I2C),                 MP_ROM_PTR(&machine_i2c_type) },
     { MP_ROM_QSTR(MP_QSTR_SoftI2C),             MP_ROM_PTR(&mp_machine_soft_i2c_type) },
     { MP_ROM_QSTR(MP_QSTR_I2S),                 MP_ROM_PTR(&machine_i2s_type) },
     { MP_ROM_QSTR(MP_QSTR_Pin),                 MP_ROM_PTR(&machine_pin_type) },
diff --git a/ports/rp2/modmachine.h b/ports/rp2/modmachine.h
index 503c1ca86c8ab..6ea4def91d974 100644
--- a/ports/rp2/modmachine.h
+++ b/ports/rp2/modmachine.h
@@ -4,7 +4,7 @@
 #include "py/obj.h"
 
 extern const mp_obj_type_t machine_adc_type;
-extern const mp_obj_type_t machine_hw_i2c_type;
+extern const mp_obj_type_t machine_i2c_type;
 extern const mp_obj_type_t machine_i2s_type;
 extern const mp_obj_type_t machine_pin_type;
 extern const mp_obj_type_t machine_rtc_type;

From e275a58ac12c72d8d8e99f8c558f6e4a1f6637c1 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Thu, 6 Oct 2022 20:22:57 +0200
Subject: [PATCH 2750/3533] samd: Rename machine I2C type consistently across
 ports.

This renames:
- machine_hw_i2c_type -> machine_i2c_type
---
 ports/samd/machine_i2c.c | 4 ++--
 ports/samd/modmachine.c  | 2 +-
 ports/samd/modmachine.h  | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ports/samd/machine_i2c.c b/ports/samd/machine_i2c.c
index 25dfa99340ffe..0a8f5b94db081 100644
--- a/ports/samd/machine_i2c.c
+++ b/ports/samd/machine_i2c.c
@@ -144,7 +144,7 @@ mp_obj_t machine_i2c_make_new(const mp_obj_type_t *type, size_t n_args, size_t n
     }
 
     // Get the peripheral object.
-    machine_i2c_obj_t *self = mp_obj_malloc(machine_i2c_obj_t, &machine_hw_i2c_type);
+    machine_i2c_obj_t *self = mp_obj_malloc(machine_i2c_obj_t, &machine_i2c_type);
     self->id = id;
     self->instance = sercom_instance[self->id];
 
@@ -260,7 +260,7 @@ STATIC const mp_machine_i2c_p_t machine_i2c_p = {
 };
 
 MP_DEFINE_CONST_OBJ_TYPE(
-    machine_hw_i2c_type,
+    machine_i2c_type,
     MP_QSTR_I2C,
     MP_TYPE_FLAG_NONE,
     make_new, machine_i2c_make_new,
diff --git a/ports/samd/modmachine.c b/ports/samd/modmachine.c
index f6cf7f8155c96..b9de026ed425c 100644
--- a/ports/samd/modmachine.c
+++ b/ports/samd/modmachine.c
@@ -157,7 +157,7 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_Pin),                 MP_ROM_PTR(&machine_pin_type) },
     { MP_ROM_QSTR(MP_QSTR_PWM),                 MP_ROM_PTR(&machine_pwm_type) },
     { MP_ROM_QSTR(MP_QSTR_SoftI2C),             MP_ROM_PTR(&mp_machine_soft_i2c_type) },
-    { MP_ROM_QSTR(MP_QSTR_I2C),                 MP_ROM_PTR(&machine_hw_i2c_type) },
+    { MP_ROM_QSTR(MP_QSTR_I2C),                 MP_ROM_PTR(&machine_i2c_type) },
     { MP_ROM_QSTR(MP_QSTR_SoftSPI),             MP_ROM_PTR(&mp_machine_soft_spi_type) },
     { MP_ROM_QSTR(MP_QSTR_SPI),                 MP_ROM_PTR(&machine_spi_type) },
     { MP_ROM_QSTR(MP_QSTR_Timer),               MP_ROM_PTR(&machine_timer_type) },
diff --git a/ports/samd/modmachine.h b/ports/samd/modmachine.h
index 6a745da0675a5..e99ca990fbba3 100644
--- a/ports/samd/modmachine.h
+++ b/ports/samd/modmachine.h
@@ -30,7 +30,7 @@
 
 extern const mp_obj_type_t machine_adc_type;
 extern const mp_obj_type_t machine_dac_type;
-extern const mp_obj_type_t machine_hw_i2c_type;
+extern const mp_obj_type_t machine_i2c_type;
 extern const mp_obj_type_t machine_led_type;
 extern const mp_obj_type_t machine_pin_type;
 extern const mp_obj_type_t machine_pwm_type;

From bfa6f34404374bb7c7d892ca6cb32175e8dd19f6 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Thu, 6 Oct 2022 20:25:34 +0200
Subject: [PATCH 2751/3533] renesas-ra: Rename machine SPI type consistently
 across ports.

This renames:
- machine_hard_spi_type -> machine_spi_type
---
 ports/renesas-ra/machine_spi.c | 6 +++---
 ports/renesas-ra/modmachine.c  | 2 +-
 ports/renesas-ra/modmachine.h  | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ports/renesas-ra/machine_spi.c b/ports/renesas-ra/machine_spi.c
index b9f5b1ad1b4eb..2c71c83b666c1 100644
--- a/ports/renesas-ra/machine_spi.c
+++ b/ports/renesas-ra/machine_spi.c
@@ -70,7 +70,7 @@ typedef struct _machine_hard_spi_obj_t {
 STATIC machine_hard_spi_obj_t machine_hard_spi_obj[] = {
     #if defined(MICROPY_HW_SPI0_RSPCK)
     {
-        {&machine_hard_spi_type}, 0,
+        {&machine_spi_type}, 0,
         DEFAULT_SPI_POLARITY, DEFAULT_SPI_PHASE, DEFAULT_SPI_BITS,
         DEFAULT_SPI_FIRSTBIT, DEFAULT_SPI_BAUDRATE,
         MICROPY_HW_SPI0_RSPCK, MICROPY_HW_SPI0_MOSI, MICROPY_HW_SPI0_MISO,
@@ -78,7 +78,7 @@ STATIC machine_hard_spi_obj_t machine_hard_spi_obj[] = {
     #endif
     #if defined(MICROPY_HW_SPI1_RSPCK)
     {
-        {&machine_hard_spi_type}, 1,
+        {&machine_spi_type}, 1,
         DEFAULT_SPI_POLARITY, DEFAULT_SPI_PHASE, DEFAULT_SPI_BITS,
         DEFAULT_SPI_FIRSTBIT, DEFAULT_SPI_BAUDRATE,
         MICROPY_HW_SPI1_RSPCK, MICROPY_HW_SPI1_MOSI, MICROPY_HW_SPI1_MISO,
@@ -298,7 +298,7 @@ STATIC const mp_machine_spi_p_t machine_hard_spi_p = {
 };
 
 MP_DEFINE_CONST_OBJ_TYPE(
-    machine_hard_spi_type,
+    machine_spi_type,
     MP_QSTR_SPI,
     MP_TYPE_FLAG_NONE,
     make_new, machine_hard_spi_make_new,
diff --git a/ports/renesas-ra/modmachine.c b/ports/renesas-ra/modmachine.c
index e6f78747fdbac..7db36298db4a7 100644
--- a/ports/renesas-ra/modmachine.c
+++ b/ports/renesas-ra/modmachine.c
@@ -286,7 +286,7 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_SoftI2C),             MP_ROM_PTR(&mp_machine_soft_i2c_type) },
     #endif
     #if MICROPY_PY_MACHINE_SPI
-    { MP_ROM_QSTR(MP_QSTR_SPI),                 MP_ROM_PTR(&machine_hard_spi_type) },
+    { MP_ROM_QSTR(MP_QSTR_SPI),                 MP_ROM_PTR(&machine_spi_type) },
     { MP_ROM_QSTR(MP_QSTR_SoftSPI),             MP_ROM_PTR(&mp_machine_soft_spi_type) },
     #endif
     { MP_ROM_QSTR(MP_QSTR_UART),                MP_ROM_PTR(&machine_uart_type) },
diff --git a/ports/renesas-ra/modmachine.h b/ports/renesas-ra/modmachine.h
index de421c5db81ff..5dbda6bda8ae7 100644
--- a/ports/renesas-ra/modmachine.h
+++ b/ports/renesas-ra/modmachine.h
@@ -37,7 +37,7 @@ extern const mp_obj_type_t machine_adc_type;
 extern const mp_obj_type_t machine_adcblock_type;
 extern const mp_obj_type_t machine_dac_type;
 extern const mp_obj_type_t machine_i2c_type;
-extern const mp_obj_type_t machine_hard_spi_type;
+extern const mp_obj_type_t machine_spi_type;
 extern const mp_obj_type_t machine_i2s_type;
 extern const mp_obj_type_t machine_uart_type;
 extern const mp_obj_type_t machine_rtc_type;

From 5e90ec233139e90b5dc022932b15b3bc9fd7865c Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Thu, 6 Oct 2022 20:28:31 +0200
Subject: [PATCH 2752/3533] zephyr: Rename machine I2C and SPI types
 consistently across ports.

This renames:
- machine_hard_i2c_type -> machine_i2c_type
- machine_hard_spi_type -> machine_spi_type
---
 ports/zephyr/machine_i2c.c | 4 ++--
 ports/zephyr/machine_spi.c | 4 ++--
 ports/zephyr/modmachine.c  | 4 ++--
 ports/zephyr/modmachine.h  | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/ports/zephyr/machine_i2c.c b/ports/zephyr/machine_i2c.c
index 8f0f25257ba54..c261ffad0d251 100644
--- a/ports/zephyr/machine_i2c.c
+++ b/ports/zephyr/machine_i2c.c
@@ -84,7 +84,7 @@ mp_obj_t machine_hard_i2c_make_new(const mp_obj_type_t *type, size_t n_args, siz
         mp_raise_NotImplementedError(MP_ERROR_TEXT("explicit choice of timeout is not implemented"));
     }
 
-    machine_hard_i2c_obj_t *self = mp_obj_malloc(machine_hard_i2c_obj_t, &machine_hard_i2c_type);
+    machine_hard_i2c_obj_t *self = mp_obj_malloc(machine_hard_i2c_obj_t, &machine_i2c_type);
     self->dev = dev;
     self->restart = false;
 
@@ -127,7 +127,7 @@ STATIC const mp_machine_i2c_p_t machine_hard_i2c_p = {
 };
 
 MP_DEFINE_CONST_OBJ_TYPE(
-    machine_hard_i2c_type,
+    machine_i2c_type,
     MP_QSTR_I2C,
     MP_TYPE_FLAG_NONE,
     make_new, machine_hard_i2c_make_new,
diff --git a/ports/zephyr/machine_spi.c b/ports/zephyr/machine_spi.c
index 19d4ae6dee684..507d839c66442 100644
--- a/ports/zephyr/machine_spi.c
+++ b/ports/zephyr/machine_spi.c
@@ -106,7 +106,7 @@ mp_obj_t machine_hard_spi_make_new(const mp_obj_type_t *type, size_t n_args, siz
         .cs = NULL
     };
 
-    machine_hard_spi_obj_t *self = mp_obj_malloc(machine_hard_spi_obj_t, &machine_hard_spi_type);
+    machine_hard_spi_obj_t *self = mp_obj_malloc(machine_hard_spi_obj_t, &machine_spi_type);
     self->dev = dev;
     self->config = cfg;
 
@@ -198,7 +198,7 @@ STATIC const mp_machine_spi_p_t machine_hard_spi_p = {
 };
 
 MP_DEFINE_CONST_OBJ_TYPE(
-    machine_hard_spi_type,
+    machine_spi_type,
     MP_QSTR_SPI,
     MP_TYPE_FLAG_NONE,
     make_new, machine_hard_spi_make_new,
diff --git a/ports/zephyr/modmachine.c b/ports/zephyr/modmachine.c
index 63bd3369897dd..95a66c51199b1 100644
--- a/ports/zephyr/modmachine.c
+++ b/ports/zephyr/modmachine.c
@@ -69,10 +69,10 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_idle), MP_ROM_PTR(&machine_idle_obj) },
 
     #if MICROPY_PY_MACHINE_I2C
-    { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&machine_hard_i2c_type) },
+    { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&machine_i2c_type) },
     #endif
     #if MICROPY_PY_MACHINE_SPI
-    { MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&machine_hard_spi_type) },
+    { MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&machine_spi_type) },
     #endif
     { MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&machine_uart_type) },
     { MP_ROM_QSTR(MP_QSTR_Pin), MP_ROM_PTR(&machine_pin_type) },
diff --git a/ports/zephyr/modmachine.h b/ports/zephyr/modmachine.h
index a3cdd2b30fe6d..a605ada0de76c 100644
--- a/ports/zephyr/modmachine.h
+++ b/ports/zephyr/modmachine.h
@@ -4,8 +4,8 @@
 #include "py/obj.h"
 
 extern const mp_obj_type_t machine_pin_type;
-extern const mp_obj_type_t machine_hard_i2c_type;
-extern const mp_obj_type_t machine_hard_spi_type;
+extern const mp_obj_type_t machine_i2c_type;
+extern const mp_obj_type_t machine_spi_type;
 extern const mp_obj_type_t machine_uart_type;
 
 MP_DECLARE_CONST_FUN_OBJ_0(machine_info_obj);

From 93f3910fe7e43de5661ff0d6f961c6eccb8537e5 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Thu, 6 Oct 2022 20:27:09 +0200
Subject: [PATCH 2753/3533] nrf: Rename machine I2C, PWM, SPI, UART types
 consistently across ports.

This renames:
- machine_hard_i2c_type -> machine_i2c_type
- machine_hard_pwm_type -> machine_pwm_type
- machine_hard_spi_type -> machine_spi_type
- machine_hard_uart_type -> machine_uart_type
---
 ports/nrf/main.c                       |  2 +-
 ports/nrf/modules/machine/i2c.c        |  6 +++---
 ports/nrf/modules/machine/i2c.h        |  2 +-
 ports/nrf/modules/machine/modmachine.c |  8 ++++----
 ports/nrf/modules/machine/pwm.c        | 16 ++++++++--------
 ports/nrf/modules/machine/pwm.h        |  2 +-
 ports/nrf/modules/machine/spi.c        | 14 +++++++-------
 ports/nrf/modules/machine/spi.h        |  2 +-
 ports/nrf/modules/machine/uart.c       |  4 ++--
 ports/nrf/modules/machine/uart.h       |  2 +-
 ports/nrf/modules/uos/moduos.c         |  2 +-
 11 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/ports/nrf/main.c b/ports/nrf/main.c
index bcfaafd39c7e0..989db58b3fa85 100644
--- a/ports/nrf/main.c
+++ b/ports/nrf/main.c
@@ -170,7 +170,7 @@ int main(int argc, char **argv) {
             MP_OBJ_NEW_SMALL_INT(0),
             MP_OBJ_NEW_SMALL_INT(115200),
         };
-        MP_STATE_PORT(board_stdio_uart) = MP_OBJ_TYPE_GET_SLOT(&machine_hard_uart_type, make_new)((mp_obj_t)&machine_hard_uart_type, MP_ARRAY_SIZE(args), 0, args);
+        MP_STATE_PORT(board_stdio_uart) = MP_OBJ_TYPE_GET_SLOT(&machine_uart_type, make_new)((mp_obj_t)&machine_uart_type, MP_ARRAY_SIZE(args), 0, args);
     }
     #endif
 
diff --git a/ports/nrf/modules/machine/i2c.c b/ports/nrf/modules/machine/i2c.c
index c16c3669ec577..ac331b8d7af6a 100644
--- a/ports/nrf/modules/machine/i2c.c
+++ b/ports/nrf/modules/machine/i2c.c
@@ -69,8 +69,8 @@ typedef struct _machine_hard_i2c_obj_t {
 } machine_hard_i2c_obj_t;
 
 STATIC const machine_hard_i2c_obj_t machine_hard_i2c_obj[] = {
-    {{&machine_hard_i2c_type}, .p_twi = NRFX_TWI_INSTANCE(0)},
-    {{&machine_hard_i2c_type}, .p_twi = NRFX_TWI_INSTANCE(1)},
+    {{&machine_i2c_type}, .p_twi = NRFX_TWI_INSTANCE(0)},
+    {{&machine_i2c_type}, .p_twi = NRFX_TWI_INSTANCE(1)},
 };
 
 void i2c_init0(void) {
@@ -162,7 +162,7 @@ STATIC const mp_machine_i2c_p_t machine_hard_i2c_p = {
 };
 
 MP_DEFINE_CONST_OBJ_TYPE(
-    machine_hard_i2c_type,
+    machine_i2c_type,
     MP_QSTR_I2C,
     MP_TYPE_FLAG_NONE,
     make_new, machine_hard_i2c_make_new,
diff --git a/ports/nrf/modules/machine/i2c.h b/ports/nrf/modules/machine/i2c.h
index 1dfb1f077a446..5c5befc285354 100644
--- a/ports/nrf/modules/machine/i2c.h
+++ b/ports/nrf/modules/machine/i2c.h
@@ -29,7 +29,7 @@
 
 #include "extmod/machine_i2c.h"
 
-extern const mp_obj_type_t machine_hard_i2c_type;
+extern const mp_obj_type_t machine_i2c_type;
 
 void i2c_init0(void);
 
diff --git a/ports/nrf/modules/machine/modmachine.c b/ports/nrf/modules/machine/modmachine.c
index d322e450671f9..d315582ae6fd5 100644
--- a/ports/nrf/modules/machine/modmachine.c
+++ b/ports/nrf/modules/machine/modmachine.c
@@ -217,13 +217,13 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_mem32),              MP_ROM_PTR(&machine_mem32_obj) },
     
 #if MICROPY_PY_MACHINE_UART
-    { MP_ROM_QSTR(MP_QSTR_UART),               MP_ROM_PTR(&machine_hard_uart_type) },
+    { MP_ROM_QSTR(MP_QSTR_UART),               MP_ROM_PTR(&machine_uart_type) },
 #endif
 #if MICROPY_PY_MACHINE_HW_SPI
-    { MP_ROM_QSTR(MP_QSTR_SPI),                MP_ROM_PTR(&machine_hard_spi_type) },
+    { MP_ROM_QSTR(MP_QSTR_SPI),                MP_ROM_PTR(&machine_spi_type) },
 #endif
 #if MICROPY_PY_MACHINE_I2C
-    { MP_ROM_QSTR(MP_QSTR_I2C),                MP_ROM_PTR(&machine_hard_i2c_type) },
+    { MP_ROM_QSTR(MP_QSTR_I2C),                MP_ROM_PTR(&machine_i2c_type) },
     { MP_ROM_QSTR(MP_QSTR_SoftI2C),            MP_ROM_PTR(&mp_machine_soft_i2c_type) },
 #endif
 #if MICROPY_PY_MACHINE_ADC
@@ -236,7 +236,7 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_Timer),              MP_ROM_PTR(&machine_timer_type) },
 #endif
 #if MICROPY_PY_MACHINE_HW_PWM
-    { MP_ROM_QSTR(MP_QSTR_PWM),                MP_ROM_PTR(&machine_hard_pwm_type) },
+    { MP_ROM_QSTR(MP_QSTR_PWM),                MP_ROM_PTR(&machine_pwm_type) },
 #endif
 #if MICROPY_PY_MACHINE_TEMP
     { MP_ROM_QSTR(MP_QSTR_Temp),               MP_ROM_PTR(&machine_temp_type) },
diff --git a/ports/nrf/modules/machine/pwm.c b/ports/nrf/modules/machine/pwm.c
index 862e1907cbf3a..7c84a8c885f90 100644
--- a/ports/nrf/modules/machine/pwm.c
+++ b/ports/nrf/modules/machine/pwm.c
@@ -77,11 +77,11 @@ STATIC machine_pwm_config_t hard_configs[MP_ARRAY_SIZE(machine_hard_pwm_instance
 
 STATIC const machine_hard_pwm_obj_t machine_hard_pwm_obj[] = {
 #if defined(NRF52_SERIES)
-    {{&machine_hard_pwm_type}, .p_pwm = &machine_hard_pwm_instances[0], .p_config = &hard_configs[0]},
-    {{&machine_hard_pwm_type}, .p_pwm = &machine_hard_pwm_instances[1], .p_config = &hard_configs[1]},
-    {{&machine_hard_pwm_type}, .p_pwm = &machine_hard_pwm_instances[2], .p_config = &hard_configs[2]},
+    {{&machine_pwm_type}, .p_pwm = &machine_hard_pwm_instances[0], .p_config = &hard_configs[0]},
+    {{&machine_pwm_type}, .p_pwm = &machine_hard_pwm_instances[1], .p_config = &hard_configs[1]},
+    {{&machine_pwm_type}, .p_pwm = &machine_hard_pwm_instances[2], .p_config = &hard_configs[2]},
 #if NRF52840
-    {{&machine_hard_pwm_type}, .p_pwm = &machine_hard_pwm_instances[3], .p_config = &hard_configs[3]},
+    {{&machine_pwm_type}, .p_pwm = &machine_hard_pwm_instances[3], .p_config = &hard_configs[3]},
 #endif
 #endif
 };
@@ -155,7 +155,7 @@ STATIC mp_obj_t machine_pwm_init(size_t n_args, const mp_obj_t *pos_args, mp_map
     mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
 
     // dispatch to specific implementation
-    if (mp_obj_get_type(self) == &machine_hard_pwm_type) {
+    if (mp_obj_get_type(self) == &machine_pwm_type) {
         machine_hard_pwm_init(self, args);
     }
 
@@ -165,7 +165,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_KW(machine_pwm_init_obj, 1, machine_pwm_init);
 
 STATIC mp_obj_t machine_pwm_deinit(mp_obj_t self) {
     // dispatch to specific implementation
-    if (mp_obj_get_type(self) == &machine_hard_pwm_type) {
+    if (mp_obj_get_type(self) == &machine_pwm_type) {
         machine_hard_pwm_deinit(self);
     }
     return mp_const_none;
@@ -182,7 +182,7 @@ STATIC mp_obj_t machine_pwm_freq(size_t n_args, const mp_obj_t *pos_args, mp_map
     mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
     mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
 
-    if (mp_obj_get_type(self) == &machine_hard_pwm_type) {
+    if (mp_obj_get_type(self) == &machine_pwm_type) {
         machine_hard_pwm_freq(self, args);
     } else {
         // soft pwm
@@ -340,7 +340,7 @@ STATIC mp_obj_t machine_hard_pwm_freq(mp_obj_t self_in, mp_arg_val_t *args) {
 }
 
 MP_DEFINE_CONST_OBJ_TYPE(
-    machine_hard_pwm_type,
+    machine_pwm_type,
     MP_QSTR_PWM,
     MP_TYPE_FLAG_NONE,
     make_new, machine_pwm_make_new,
diff --git a/ports/nrf/modules/machine/pwm.h b/ports/nrf/modules/machine/pwm.h
index 7a5b72e0e84fa..ab2d927fa4e50 100644
--- a/ports/nrf/modules/machine/pwm.h
+++ b/ports/nrf/modules/machine/pwm.h
@@ -26,4 +26,4 @@
 
 void pwm_init0(void);
 
-extern const mp_obj_type_t machine_hard_pwm_type;
+extern const mp_obj_type_t machine_pwm_type;
diff --git a/ports/nrf/modules/machine/spi.c b/ports/nrf/modules/machine/spi.c
index fd7f7bb5bcced..0dee20027b2d2 100644
--- a/ports/nrf/modules/machine/spi.c
+++ b/ports/nrf/modules/machine/spi.c
@@ -117,12 +117,12 @@ STATIC const nrfx_spi_t machine_spi_instances[] = {
 STATIC nrfx_spi_config_t configs[MP_ARRAY_SIZE(machine_spi_instances)];
 
 STATIC const machine_hard_spi_obj_t machine_hard_spi_obj[] = {
-    {{&machine_hard_spi_type}, .p_spi = &machine_spi_instances[0], .p_config = &configs[0]},
-    {{&machine_hard_spi_type}, .p_spi = &machine_spi_instances[1], .p_config = &configs[1]},
+    {{&machine_spi_type}, .p_spi = &machine_spi_instances[0], .p_config = &configs[0]},
+    {{&machine_spi_type}, .p_spi = &machine_spi_instances[1], .p_config = &configs[1]},
 #if defined(NRF52_SERIES)
-    {{&machine_hard_spi_type}, .p_spi = &machine_spi_instances[2], .p_config = &configs[2]},
+    {{&machine_spi_type}, .p_spi = &machine_spi_instances[2], .p_config = &configs[2]},
 #if defined(NRF52840_XXAA) && NRFX_SPIM_ENABLED
-    {{&machine_hard_spi_type}, .p_spi = &machine_spi_instances[3], .p_config = &configs[3]},
+    {{&machine_spi_type}, .p_spi = &machine_spi_instances[3], .p_config = &configs[3]},
 #endif // NRF52840_XXAA && NRFX_SPIM_ENABLED
 #endif // NRF52_SERIES
 };
@@ -235,7 +235,7 @@ STATIC mp_obj_t machine_spi_init(size_t n_args, const mp_obj_t *pos_args, mp_map
     mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
 
     // dispatch to specific implementation
-    if (mp_obj_get_type(self) == &machine_hard_spi_type) {
+    if (mp_obj_get_type(self) == &machine_spi_type) {
         machine_hard_spi_init(self, args);
     }
 
@@ -245,7 +245,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_KW(machine_spi_init_obj, 1, machine_spi_init);
 
 STATIC mp_obj_t machine_spi_deinit(mp_obj_t self) {
     // dispatch to specific implementation
-    if (mp_obj_get_type(self) == &machine_hard_spi_type) {
+    if (mp_obj_get_type(self) == &machine_spi_type) {
         machine_hard_spi_deinit(self);
     }
     return mp_const_none;
@@ -428,7 +428,7 @@ STATIC const mp_machine_spi_p_t machine_hard_spi_p = {
 };
 
 MP_DEFINE_CONST_OBJ_TYPE(
-    machine_hard_spi_type,
+    machine_spi_type,
     MP_QSTR_SPI,
     MP_TYPE_FLAG_NONE,
     make_new, machine_spi_make_new,
diff --git a/ports/nrf/modules/machine/spi.h b/ports/nrf/modules/machine/spi.h
index c6f64a19da2a7..e1505781ac38d 100644
--- a/ports/nrf/modules/machine/spi.h
+++ b/ports/nrf/modules/machine/spi.h
@@ -27,7 +27,7 @@
 #include "py/obj.h"
 
 typedef struct _machine_hard_spi_obj_t machine_hard_spi_obj_t;
-extern const mp_obj_type_t machine_hard_spi_type;
+extern const mp_obj_type_t machine_spi_type;
 
 void spi_init0(void);
 void spi_transfer(const machine_hard_spi_obj_t * self,
diff --git a/ports/nrf/modules/machine/uart.c b/ports/nrf/modules/machine/uart.c
index 035a30df9c015..eee5b8b79eac9 100644
--- a/ports/nrf/modules/machine/uart.c
+++ b/ports/nrf/modules/machine/uart.c
@@ -106,7 +106,7 @@ static const nrfx_uart_t instance0 = NRFX_UART_INSTANCE(0);
 STATIC machine_hard_uart_buf_t machine_hard_uart_buf[1];
 
 STATIC const machine_hard_uart_obj_t machine_hard_uart_obj[] = {
-    {{&machine_hard_uart_type}, .p_uart = &instance0, .buf = &machine_hard_uart_buf[0]},
+    {{&machine_uart_type}, .p_uart = &instance0, .buf = &machine_hard_uart_buf[0]},
 };
 
 void uart_init0(void) {
@@ -371,7 +371,7 @@ STATIC const mp_stream_p_t uart_stream_p = {
 };
 
 MP_DEFINE_CONST_OBJ_TYPE(
-    machine_hard_uart_type,
+    machine_uart_type,
     MP_QSTR_UART,
     MP_TYPE_FLAG_ITER_IS_STREAM,
     make_new, machine_hard_uart_make_new,
diff --git a/ports/nrf/modules/machine/uart.h b/ports/nrf/modules/machine/uart.h
index 121f83cd39b39..d3e23645b902d 100644
--- a/ports/nrf/modules/machine/uart.h
+++ b/ports/nrf/modules/machine/uart.h
@@ -32,7 +32,7 @@
 #include "genhdr/pins.h"
 
 typedef struct _machine_hard_uart_obj_t machine_hard_uart_obj_t;
-extern const mp_obj_type_t machine_hard_uart_type;
+extern const mp_obj_type_t machine_uart_type;
 
 void uart_init0(void);
 void uart_deinit(void);
diff --git a/ports/nrf/modules/uos/moduos.c b/ports/nrf/modules/uos/moduos.c
index 3fdd8eb19ec15..402096aacd789 100644
--- a/ports/nrf/modules/uos/moduos.c
+++ b/ports/nrf/modules/uos/moduos.c
@@ -126,7 +126,7 @@ STATIC mp_obj_t os_dupterm(mp_uint_t n_args, const mp_obj_t *args) {
     } else {
         if (args[0] == mp_const_none) {
             MP_STATE_PORT(board_stdio_uart) = NULL;
-        } else if (mp_obj_get_type(args[0]) == &machine_hard_uart_type) {
+        } else if (mp_obj_get_type(args[0]) == &machine_uart_type) {
             MP_STATE_PORT(board_stdio_uart) = args[0];
         } else {
             mp_raise_ValueError(MP_ERROR_TEXT("need a UART object"));

From 4f946ba963b452cb79524225e0a88134921f2ebb Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 8 Sep 2022 12:51:10 +1000
Subject: [PATCH 2754/3533] lib/btstack: Update to v1.5.3.

Signed-off-by: Damien George <damien@micropython.org>
---
 lib/btstack | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/btstack b/lib/btstack
index c8b9823f68c6a..87087689bb0c3 160000
--- a/lib/btstack
+++ b/lib/btstack
@@ -1 +1 @@
-Subproject commit c8b9823f68c6af0fa52e2c4e009aba4dbf257232
+Subproject commit 87087689bb0c37ff4b9b3e3ba670b7019c306ebd

From 67f98ba10c3d894e737f275f0a508b7ccf4f1807 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 8 Sep 2022 12:51:19 +1000
Subject: [PATCH 2755/3533] extmod/btstack: Update BTstack bindings to work
 with latest BTstack.

The following multi-tests pass (eg with PYBD_SF6+LEGO_HUB_NO6):

    ble_gap_advertise.py
    ble_gap_connect.py
    ble_gap_device_name.py
    ble_gattc_discover_services.py
    ble_gatt_data_transfer.py
    perf_gatt_char_write.py
    perf_gatt_notify.py
    stress_log_filesystem.py

These are the same tests that passed prior to this BTstack update.

Also tested on the unix port using H4 transport.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/btstack/btstack_config.h       |  2 +-
 extmod/btstack/btstack_hci_uart.c     |  6 ++++++
 extmod/btstack/btstack_hci_uart.h     |  2 +-
 extmod/btstack/modbluetooth_btstack.c | 28 ++++++++++++++++++++++-----
 ports/stm32/mpbtstackport.c           | 11 +++--------
 ports/unix/mpbtstackport_common.c     |  8 +-------
 ports/unix/mpbtstackport_h4.c         | 14 ++++++++------
 ports/unix/mpbtstackport_usb.c        |  1 +
 8 files changed, 44 insertions(+), 28 deletions(-)

diff --git a/extmod/btstack/btstack_config.h b/extmod/btstack/btstack_config.h
index e56a84f94a16d..7de938cb6f7e1 100644
--- a/extmod/btstack/btstack_config.h
+++ b/extmod/btstack/btstack_config.h
@@ -6,7 +6,7 @@
 #define ENABLE_LE_PERIPHERAL
 #define ENABLE_LE_CENTRAL
 // #define ENABLE_CLASSIC
-#define ENABLE_LE_DATA_CHANNELS
+#define ENABLE_L2CAP_LE_CREDIT_BASED_FLOW_CONTROL_MODE
 // #define ENABLE_LOG_INFO
 // #define ENABLE_LOG_DEBUG
 #define ENABLE_LOG_ERROR
diff --git a/extmod/btstack/btstack_hci_uart.c b/extmod/btstack/btstack_hci_uart.c
index 83e865b71d2d3..f945efc762cbf 100644
--- a/extmod/btstack/btstack_hci_uart.c
+++ b/extmod/btstack/btstack_hci_uart.c
@@ -159,6 +159,12 @@ const btstack_uart_block_t mp_bluetooth_btstack_hci_uart_block = {
     &btstack_uart_get_supported_sleep_modes,
     &btstack_uart_set_sleep,
     &btstack_uart_set_wakeup_handler,
+
+    // The following are needed for H5 mode only.
+    NULL, // set_frame_received
+    NULL, // set_frame_sent,
+    NULL, // receive_frame,
+    NULL, // send_frame,
 };
 
 void mp_bluetooth_btstack_hci_uart_process(void) {
diff --git a/extmod/btstack/btstack_hci_uart.h b/extmod/btstack/btstack_hci_uart.h
index 8011e587dee3f..74983808ec28d 100644
--- a/extmod/btstack/btstack_hci_uart.h
+++ b/extmod/btstack/btstack_hci_uart.h
@@ -28,7 +28,7 @@
 #ifndef MICROPY_INCLUDED_EXTMOD_BTSTACK_HCI_UART_H
 #define MICROPY_INCLUDED_EXTMOD_BTSTACK_HCI_UART_H
 
-#include "lib/btstack/src/btstack.h"
+#include "lib/btstack/src/btstack_uart_block.h"
 
 // --- Used by the port to create the HCI transport ---------------------------
 extern const btstack_uart_block_t mp_bluetooth_btstack_hci_uart_block;
diff --git a/extmod/btstack/modbluetooth_btstack.c b/extmod/btstack/modbluetooth_btstack.c
index b58be78a9942d..e9c0037394b21 100644
--- a/extmod/btstack/modbluetooth_btstack.c
+++ b/extmod/btstack/modbluetooth_btstack.c
@@ -368,7 +368,7 @@ STATIC void btstack_packet_handler(uint8_t packet_type, uint8_t *packet, uint8_t
                event_type == SM_EVENT_PAIRING_COMPLETE ||
                // event_type == GAP_EVENT_DEDICATED_BONDING_COMPLETED || // No conn_handle
                event_type == HCI_EVENT_ENCRYPTION_CHANGE) {
-        DEBUG_printf("  --> enc/auth/pair/bond change\n", );
+        DEBUG_printf("  --> enc/auth/pair/bond change\n");
         #if MICROPY_PY_BLUETOOTH_ENABLE_PAIRING_BONDING
         uint16_t conn_handle;
         switch (event_type) {
@@ -420,6 +420,11 @@ STATIC void btstack_packet_handler(uint8_t packet_type, uint8_t *packet, uint8_t
         mp_bluetooth_gap_on_scan_result(address_type, address, adv_event_type, rssi, data, length);
     #endif // MICROPY_PY_BLUETOOTH_ENABLE_CENTRAL_MODE
     #if MICROPY_PY_BLUETOOTH_ENABLE_GATT_CLIENT
+    } else if (event_type == GATT_EVENT_MTU) {
+        // This is triggered in client mode.
+        uint16_t conn_handle = gatt_event_mtu_get_handle(packet);
+        uint16_t mtu = gatt_event_mtu_get_MTU(packet);
+        mp_bluetooth_gatts_on_mtu_exchanged(conn_handle, mtu);
     } else if (event_type == GATT_EVENT_QUERY_COMPLETE) {
         uint16_t conn_handle = gatt_event_query_complete_get_handle(packet);
         uint16_t status = gatt_event_query_complete_get_att_status(packet);
@@ -625,6 +630,19 @@ STATIC void set_random_address(void) {
     DEBUG_printf("set_random_address: Address loaded by controller\n");
 }
 
+STATIC void deinit_stack(void) {
+    mp_bluetooth_btstack_state = MP_BLUETOOTH_BTSTACK_STATE_OFF;
+
+    // Deinitialise BTstack components.
+    sm_deinit();
+    l2cap_deinit();
+    hci_deinit();
+    btstack_memory_deinit();
+    btstack_run_loop_deinit();
+
+    MP_STATE_PORT(bluetooth_btstack_root_pointers) = NULL;
+}
+
 int mp_bluetooth_init(void) {
     DEBUG_printf("mp_bluetooth_init\n");
 
@@ -702,8 +720,8 @@ int mp_bluetooth_init(void) {
         // Attempt a shutdown (may not do anything).
         mp_bluetooth_btstack_port_deinit();
 
-        // Clean up.
-        MP_STATE_PORT(bluetooth_btstack_root_pointers) = NULL;
+        // Clean up BTstack.
+        deinit_stack();
 
         return timeout ? MP_ETIMEDOUT : MP_EINVAL;
     }
@@ -757,8 +775,8 @@ void mp_bluetooth_deinit(void) {
     }
     btstack_run_loop_remove_timer(&btstack_init_deinit_timeout);
 
-    mp_bluetooth_btstack_state = MP_BLUETOOTH_BTSTACK_STATE_OFF;
-    MP_STATE_PORT(bluetooth_btstack_root_pointers) = NULL;
+    // Clean up BTstack.
+    deinit_stack();
 
     DEBUG_printf("mp_bluetooth_deinit: complete\n");
 }
diff --git a/ports/stm32/mpbtstackport.c b/ports/stm32/mpbtstackport.c
index 795534042eaec..301ac30e2060d 100644
--- a/ports/stm32/mpbtstackport.c
+++ b/ports/stm32/mpbtstackport.c
@@ -31,6 +31,7 @@
 #if MICROPY_PY_BLUETOOTH && MICROPY_BLUETOOTH_BTSTACK
 
 #include "lib/btstack/src/btstack.h"
+#include "lib/btstack/src/hci_transport_h4.h"
 #include "extmod/mpbthci.h"
 #include "extmod/btstack/btstack_hci_uart.h"
 #include "extmod/btstack/modbluetooth_btstack.h"
@@ -137,16 +138,10 @@ void mp_bluetooth_hci_poll(void) {
 }
 
 void mp_bluetooth_btstack_port_init(void) {
-    static bool run_loop_init = false;
-    if (!run_loop_init) {
-        run_loop_init = true;
-        btstack_run_loop_init(&mp_btstack_runloop_stm32);
-    } else {
-        mp_btstack_runloop_stm32.init();
-    }
+    btstack_run_loop_init(&mp_btstack_runloop_stm32);
 
     // hci_dump_open(NULL, HCI_DUMP_STDOUT);
-    const hci_transport_t *transport = hci_transport_h4_instance(&mp_bluetooth_btstack_hci_uart_block);
+    const hci_transport_t *transport = hci_transport_h4_instance_for_uart(&mp_bluetooth_btstack_hci_uart_block);
     hci_init(transport, &hci_transport_config_uart);
 
     #ifdef MICROPY_HW_BLE_BTSTACK_CHIPSET_INSTANCE
diff --git a/ports/unix/mpbtstackport_common.c b/ports/unix/mpbtstackport_common.c
index ec40db65bc3a4..66a3a0536aed3 100644
--- a/ports/unix/mpbtstackport_common.c
+++ b/ports/unix/mpbtstackport_common.c
@@ -79,13 +79,7 @@ uint32_t hal_time_ms(void) {
 }
 
 void mp_bluetooth_btstack_port_init(void) {
-    static bool run_loop_init = false;
-    if (!run_loop_init) {
-        run_loop_init = true;
-        btstack_run_loop_init(btstack_run_loop_embedded_get_instance());
-    } else {
-        btstack_run_loop_embedded_get_instance()->init();
-    }
+    btstack_run_loop_init(btstack_run_loop_embedded_get_instance());
 
     // hci_dump_open(NULL, HCI_DUMP_STDOUT);
 
diff --git a/ports/unix/mpbtstackport_h4.c b/ports/unix/mpbtstackport_h4.c
index 4fdc20c22b69b..dacfff9a498af 100644
--- a/ports/unix/mpbtstackport_h4.c
+++ b/ports/unix/mpbtstackport_h4.c
@@ -32,6 +32,7 @@
 
 #if MICROPY_PY_BLUETOOTH && MICROPY_BLUETOOTH_BTSTACK && MICROPY_BLUETOOTH_BTSTACK_H4
 
+#include "lib/btstack/src/hci_transport_h4.h"
 #include "lib/btstack/chipset/zephyr/btstack_chipset_zephyr.h"
 
 #include "extmod/btstack/btstack_hci_uart.h"
@@ -42,11 +43,12 @@
 #define DEBUG_printf(...) // printf(__VA_ARGS__)
 
 STATIC hci_transport_config_uart_t hci_transport_config_uart = {
-    HCI_TRANSPORT_CONFIG_UART,
-    1000000, // initial baudrate
-    0,       // main baudrate
-    1,       // flow control
-    NULL,    // device name
+    .type = HCI_TRANSPORT_CONFIG_UART,
+    .baudrate_init = 1000000,
+    .baudrate_main = 0,
+    .flowcontrol = 1,
+    .device_name = NULL,
+    .parity = BTSTACK_UART_PARITY_OFF,
 };
 
 void mp_bluetooth_hci_poll_h4(void) {
@@ -58,7 +60,7 @@ void mp_bluetooth_hci_poll_h4(void) {
 void mp_bluetooth_btstack_port_init_h4(void) {
     DEBUG_printf("mp_bluetooth_btstack_port_init_h4\n");
 
-    const hci_transport_t *transport = hci_transport_h4_instance(&mp_bluetooth_btstack_hci_uart_block);
+    const hci_transport_t *transport = hci_transport_h4_instance_for_uart(&mp_bluetooth_btstack_hci_uart_block);
     hci_init(transport, &hci_transport_config_uart);
 
     hci_set_chipset(btstack_chipset_zephyr_instance());
diff --git a/ports/unix/mpbtstackport_usb.c b/ports/unix/mpbtstackport_usb.c
index 28d2c8c543f71..b8c7b758d93e6 100644
--- a/ports/unix/mpbtstackport_usb.c
+++ b/ports/unix/mpbtstackport_usb.c
@@ -34,6 +34,7 @@
 #if MICROPY_PY_BLUETOOTH && MICROPY_BLUETOOTH_BTSTACK && MICROPY_BLUETOOTH_BTSTACK_USB
 
 #include "lib/btstack/src/btstack.h"
+#include "lib/btstack/src/hci_transport_usb.h"
 #include "lib/btstack/platform/embedded/btstack_run_loop_embedded.h"
 #include "lib/btstack/platform/embedded/hal_cpu.h"
 #include "lib/btstack/platform/embedded/hal_time_ms.h"

From b33767896430a36f163c0f9bb7020e688ccb9c5b Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 5 Oct 2022 10:46:11 +1100
Subject: [PATCH 2756/3533] extmod/mbedtls: Add common configuration file, and
 use it in all ports.

This is a no-op change.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/mbedtls/mbedtls_config_common.h | 110 +++++++++++++++++++++++++
 ports/mimxrt/mbedtls/mbedtls_config.h  |  69 +---------------
 ports/rp2/mbedtls/mbedtls_config.h     |  73 ++--------------
 ports/stm32/mbedtls/mbedtls_config.h   |  69 +---------------
 ports/unix/mbedtls/mbedtls_config.h    |  58 +------------
 5 files changed, 125 insertions(+), 254 deletions(-)
 create mode 100644 extmod/mbedtls/mbedtls_config_common.h

diff --git a/extmod/mbedtls/mbedtls_config_common.h b/extmod/mbedtls/mbedtls_config_common.h
new file mode 100644
index 0000000000000..6c9385dea5f79
--- /dev/null
+++ b/extmod/mbedtls/mbedtls_config_common.h
@@ -0,0 +1,110 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2018-2022 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+#ifndef MICROPY_INCLUDED_MBEDTLS_CONFIG_COMMON_H
+#define MICROPY_INCLUDED_MBEDTLS_CONFIG_COMMON_H
+
+// If you want to debug MBEDTLS uncomment the following and
+// pass "3" to mbedtls_debug_set_threshold in socket_new.
+// #define MBEDTLS_DEBUG_C
+
+// Set mbedtls configuration.
+#define MBEDTLS_DEPRECATED_REMOVED
+#define MBEDTLS_AES_ROM_TABLES
+#define MBEDTLS_CIPHER_MODE_CBC
+#define MBEDTLS_ECP_DP_SECP192R1_ENABLED
+#define MBEDTLS_ECP_DP_SECP224R1_ENABLED
+#define MBEDTLS_ECP_DP_SECP256R1_ENABLED
+#define MBEDTLS_ECP_DP_SECP384R1_ENABLED
+#define MBEDTLS_ECP_DP_SECP521R1_ENABLED
+#define MBEDTLS_ECP_DP_SECP192K1_ENABLED
+#define MBEDTLS_ECP_DP_SECP224K1_ENABLED
+#define MBEDTLS_ECP_DP_SECP256K1_ENABLED
+#define MBEDTLS_ECP_DP_BP256R1_ENABLED
+#define MBEDTLS_ECP_DP_BP384R1_ENABLED
+#define MBEDTLS_ECP_DP_BP512R1_ENABLED
+#define MBEDTLS_ECP_DP_CURVE25519_ENABLED
+#define MBEDTLS_KEY_EXCHANGE_RSA_ENABLED
+#define MBEDTLS_NO_PLATFORM_ENTROPY
+#define MBEDTLS_PKCS1_V15
+#define MBEDTLS_SHA256_SMALLER
+#define MBEDTLS_SSL_PROTO_TLS1
+#define MBEDTLS_SSL_PROTO_TLS1_1
+#define MBEDTLS_SSL_PROTO_TLS1_2
+#define MBEDTLS_SSL_SERVER_NAME_INDICATION
+
+// Use a smaller output buffer to reduce size of SSL context.
+#define MBEDTLS_SSL_MAX_CONTENT_LEN (16384)
+#define MBEDTLS_SSL_IN_CONTENT_LEN  (MBEDTLS_SSL_MAX_CONTENT_LEN)
+#define MBEDTLS_SSL_OUT_CONTENT_LEN (4096)
+
+// Enable mbedtls modules.
+#define MBEDTLS_AES_C
+#define MBEDTLS_ASN1_PARSE_C
+#define MBEDTLS_BIGNUM_C
+#define MBEDTLS_CIPHER_C
+#define MBEDTLS_CTR_DRBG_C
+#define MBEDTLS_ENTROPY_C
+#define MBEDTLS_ERROR_C
+#define MBEDTLS_MD_C
+#define MBEDTLS_MD5_C
+#define MBEDTLS_OID_C
+#define MBEDTLS_PKCS5_C
+#define MBEDTLS_PK_C
+#define MBEDTLS_PK_PARSE_C
+#define MBEDTLS_PLATFORM_C
+#define MBEDTLS_RSA_C
+#define MBEDTLS_SHA1_C
+#define MBEDTLS_SHA256_C
+#define MBEDTLS_SHA512_C
+#define MBEDTLS_SSL_CLI_C
+#define MBEDTLS_SSL_SRV_C
+#define MBEDTLS_SSL_TLS_C
+#define MBEDTLS_X509_CRT_PARSE_C
+#define MBEDTLS_X509_USE_C
+
+// A port may enable this option to select additional bare-metal configuration.
+#if MICROPY_MBEDTLS_CONFIG_BARE_METAL
+
+// Bare-metal mbedtls configuration.
+#define MBEDTLS_PLATFORM_MEMORY
+#define MBEDTLS_PLATFORM_NO_STD_FUNCTIONS
+#define MBEDTLS_ENTROPY_HARDWARE_ALT
+
+// Bare-metal memory allocation hooks.
+#include <stdlib.h>
+#include <stdio.h>
+void *m_tracked_calloc(size_t nmemb, size_t size);
+void m_tracked_free(void *ptr);
+#define MBEDTLS_PLATFORM_STD_CALLOC m_tracked_calloc
+#define MBEDTLS_PLATFORM_STD_FREE m_tracked_free
+#define MBEDTLS_PLATFORM_SNPRINTF_MACRO snprintf
+
+#endif
+
+// Include mbedtls configuration checker.
+#include "mbedtls/check_config.h"
+
+#endif // MICROPY_INCLUDED_MBEDTLS_CONFIG_COMMON_H
diff --git a/ports/mimxrt/mbedtls/mbedtls_config.h b/ports/mimxrt/mbedtls/mbedtls_config.h
index 8e054ed51713a..cc71aa7ec1132 100644
--- a/ports/mimxrt/mbedtls/mbedtls_config.h
+++ b/ports/mimxrt/mbedtls/mbedtls_config.h
@@ -26,74 +26,13 @@
 #ifndef MICROPY_INCLUDED_MBEDTLS_CONFIG_H
 #define MICROPY_INCLUDED_MBEDTLS_CONFIG_H
 
-// Set mbedtls configuration
-#define MBEDTLS_PLATFORM_MEMORY
-#define MBEDTLS_PLATFORM_NO_STD_FUNCTIONS
-#define MBEDTLS_DEPRECATED_REMOVED
-#define MBEDTLS_ENTROPY_HARDWARE_ALT
-#define MBEDTLS_AES_ROM_TABLES
-#define MBEDTLS_CIPHER_MODE_CBC
-#define MBEDTLS_ECP_DP_SECP192R1_ENABLED
-#define MBEDTLS_ECP_DP_SECP224R1_ENABLED
-#define MBEDTLS_ECP_DP_SECP256R1_ENABLED
-#define MBEDTLS_ECP_DP_SECP384R1_ENABLED
-#define MBEDTLS_ECP_DP_SECP521R1_ENABLED
-#define MBEDTLS_ECP_DP_SECP192K1_ENABLED
-#define MBEDTLS_ECP_DP_SECP224K1_ENABLED
-#define MBEDTLS_ECP_DP_SECP256K1_ENABLED
-#define MBEDTLS_ECP_DP_BP256R1_ENABLED
-#define MBEDTLS_ECP_DP_BP384R1_ENABLED
-#define MBEDTLS_ECP_DP_BP512R1_ENABLED
-#define MBEDTLS_ECP_DP_CURVE25519_ENABLED
-#define MBEDTLS_KEY_EXCHANGE_RSA_ENABLED
-#define MBEDTLS_NO_PLATFORM_ENTROPY
-#define MBEDTLS_PKCS1_V15
-#define MBEDTLS_SHA256_SMALLER
-#define MBEDTLS_SSL_PROTO_TLS1
-#define MBEDTLS_SSL_PROTO_TLS1_1
-#define MBEDTLS_SSL_PROTO_TLS1_2
-#define MBEDTLS_SSL_SERVER_NAME_INDICATION
-
-// Use a smaller output buffer to reduce size of SSL context
-#define MBEDTLS_SSL_MAX_CONTENT_LEN (16384)
-#define MBEDTLS_SSL_IN_CONTENT_LEN  (MBEDTLS_SSL_MAX_CONTENT_LEN)
-#define MBEDTLS_SSL_OUT_CONTENT_LEN (4096)
-
 // Enable mbedtls modules
-#define MBEDTLS_AES_C
-#define MBEDTLS_ASN1_PARSE_C
-#define MBEDTLS_BIGNUM_C
-#define MBEDTLS_CIPHER_C
-#define MBEDTLS_CTR_DRBG_C
 // #define MBEDTLS_ECP_C
-#define MBEDTLS_ENTROPY_C
-#define MBEDTLS_ERROR_C
-#define MBEDTLS_MD_C
-#define MBEDTLS_MD5_C
-#define MBEDTLS_OID_C
-#define MBEDTLS_PKCS5_C
-#define MBEDTLS_PK_C
-#define MBEDTLS_PK_PARSE_C
-#define MBEDTLS_PLATFORM_C
-#define MBEDTLS_RSA_C
-#define MBEDTLS_SHA1_C
-#define MBEDTLS_SHA256_C
-#define MBEDTLS_SHA512_C
-#define MBEDTLS_SSL_CLI_C
-#define MBEDTLS_SSL_SRV_C
-#define MBEDTLS_SSL_TLS_C
-#define MBEDTLS_X509_CRT_PARSE_C
-#define MBEDTLS_X509_USE_C
 
-// Memory allocation hooks
-#include <stdlib.h>
-#include <stdio.h>
-void *m_tracked_calloc(size_t nmemb, size_t size);
-void m_tracked_free(void *ptr);
-#define MBEDTLS_PLATFORM_STD_CALLOC m_tracked_calloc
-#define MBEDTLS_PLATFORM_STD_FREE m_tracked_free
-#define MBEDTLS_PLATFORM_SNPRINTF_MACRO snprintf
+// Set MicroPython-specific options.
+#define MICROPY_MBEDTLS_CONFIG_BARE_METAL (1)
 
-#include "mbedtls/check_config.h"
+// Include common mbedtls configuration.
+#include "extmod/mbedtls/mbedtls_config_common.h"
 
 #endif /* MICROPY_INCLUDED_MBEDTLS_CONFIG_H */
diff --git a/ports/rp2/mbedtls/mbedtls_config.h b/ports/rp2/mbedtls/mbedtls_config.h
index c80aa5bc18c2a..61f622295ffa7 100644
--- a/ports/rp2/mbedtls/mbedtls_config.h
+++ b/ports/rp2/mbedtls/mbedtls_config.h
@@ -26,90 +26,27 @@
 #ifndef MICROPY_INCLUDED_MBEDTLS_CONFIG_H
 #define MICROPY_INCLUDED_MBEDTLS_CONFIG_H
 
-// If you want to debug MBEDTLS uncomment the following and
-// Pass 3 to mbedtls_debug_set_threshold in socket_new
-// #define MBEDTLS_DEBUG_C
-
 // Set mbedtls configuration
-#define MBEDTLS_PLATFORM_MEMORY
-#define MBEDTLS_PLATFORM_NO_STD_FUNCTIONS
-#define MBEDTLS_DEPRECATED_REMOVED
-#define MBEDTLS_ENTROPY_HARDWARE_ALT
-#define MBEDTLS_AES_ROM_TABLES
-#define MBEDTLS_CIPHER_MODE_CBC
-#define MBEDTLS_ECP_DP_SECP192R1_ENABLED
-#define MBEDTLS_ECP_DP_SECP224R1_ENABLED
-#define MBEDTLS_ECP_DP_SECP256R1_ENABLED
-#define MBEDTLS_ECP_DP_SECP384R1_ENABLED
-#define MBEDTLS_ECP_DP_SECP521R1_ENABLED
-#define MBEDTLS_ECP_DP_SECP192K1_ENABLED
-#define MBEDTLS_ECP_DP_SECP224K1_ENABLED
-#define MBEDTLS_ECP_DP_SECP256K1_ENABLED
-#define MBEDTLS_ECP_DP_BP256R1_ENABLED
-#define MBEDTLS_ECP_DP_BP384R1_ENABLED
-#define MBEDTLS_ECP_DP_BP512R1_ENABLED
-#define MBEDTLS_ECP_DP_CURVE25519_ENABLED
 #define MBEDTLS_ECP_NIST_OPTIM
 #define MBEDTLS_KEY_EXCHANGE_ECDHE_RSA_ENABLED
-#define MBEDTLS_KEY_EXCHANGE_RSA_ENABLED
-#define MBEDTLS_NO_PLATFORM_ENTROPY
-#define MBEDTLS_PKCS1_V15
-#define MBEDTLS_SHA256_SMALLER
-#define MBEDTLS_SSL_PROTO_TLS1
-#define MBEDTLS_SSL_PROTO_TLS1_1
-#define MBEDTLS_SSL_PROTO_TLS1_2
-#define MBEDTLS_SSL_SERVER_NAME_INDICATION
-
-// Use a smaller output buffer to reduce size of SSL context
-#define MBEDTLS_SSL_MAX_CONTENT_LEN (16384)
-#define MBEDTLS_SSL_IN_CONTENT_LEN  (MBEDTLS_SSL_MAX_CONTENT_LEN)
-#define MBEDTLS_SSL_OUT_CONTENT_LEN (4096)
 
 // Enable mbedtls modules
-#define MBEDTLS_AES_C
-#define MBEDTLS_ASN1_PARSE_C
-#define MBEDTLS_BIGNUM_C
-#define MBEDTLS_CIPHER_C
-#define MBEDTLS_CTR_DRBG_C
 #define MBEDTLS_ECDH_C
 #define MBEDTLS_ECP_C
-#define MBEDTLS_ENTROPY_C
-#define MBEDTLS_ERROR_C
 #define MBEDTLS_GCM_C
-#define MBEDTLS_MD_C
-#define MBEDTLS_MD5_C
-#define MBEDTLS_OID_C
-#define MBEDTLS_PKCS5_C
-#define MBEDTLS_PK_C
-#define MBEDTLS_PK_PARSE_C
-#define MBEDTLS_PLATFORM_C
-#define MBEDTLS_RSA_C
-#define MBEDTLS_SHA1_C
-#define MBEDTLS_SHA256_C
-#define MBEDTLS_SHA512_C
-#define MBEDTLS_SSL_CLI_C
-#define MBEDTLS_SSL_SRV_C
-#define MBEDTLS_SSL_TLS_C
 #define MBEDTLS_TLS_DEFAULT_ALLOW_SHA1_IN_KEY_EXCHANGE
-#define MBEDTLS_X509_CRT_PARSE_C
-#define MBEDTLS_X509_USE_C
 #define MBEDTLS_HAVE_TIME
 #define MBEDTLS_HAVE_TIME_DATE
 
-// Memory allocation hooks
-#include <stdlib.h>
-#include <stdio.h>
-void *m_tracked_calloc(size_t nmemb, size_t size);
-void m_tracked_free(void *ptr);
-#define MBEDTLS_PLATFORM_STD_CALLOC m_tracked_calloc
-#define MBEDTLS_PLATFORM_STD_FREE m_tracked_free
-#define MBEDTLS_PLATFORM_SNPRINTF_MACRO snprintf
-
 // Time hook
 #include <time.h>
 time_t rp2_rtctime_seconds(time_t *timer);
 #define MBEDTLS_PLATFORM_TIME_MACRO rp2_rtctime_seconds
 
-#include "mbedtls/check_config.h"
+// Set MicroPython-specific options.
+#define MICROPY_MBEDTLS_CONFIG_BARE_METAL (1)
+
+// Include common mbedtls configuration.
+#include "extmod/mbedtls/mbedtls_config_common.h"
 
 #endif /* MICROPY_INCLUDED_MBEDTLS_CONFIG_H */
diff --git a/ports/stm32/mbedtls/mbedtls_config.h b/ports/stm32/mbedtls/mbedtls_config.h
index 2e0cb7651a48b..b8548866f1683 100644
--- a/ports/stm32/mbedtls/mbedtls_config.h
+++ b/ports/stm32/mbedtls/mbedtls_config.h
@@ -26,75 +26,14 @@
 #ifndef MICROPY_INCLUDED_MBEDTLS_CONFIG_H
 #define MICROPY_INCLUDED_MBEDTLS_CONFIG_H
 
-// Set mbedtls configuration
-#define MBEDTLS_PLATFORM_MEMORY
-#define MBEDTLS_PLATFORM_NO_STD_FUNCTIONS
-#define MBEDTLS_DEPRECATED_REMOVED
-#define MBEDTLS_ENTROPY_HARDWARE_ALT
-#define MBEDTLS_AES_ROM_TABLES
-#define MBEDTLS_CIPHER_MODE_CBC
-#define MBEDTLS_ECP_DP_SECP192R1_ENABLED
-#define MBEDTLS_ECP_DP_SECP224R1_ENABLED
-#define MBEDTLS_ECP_DP_SECP256R1_ENABLED
-#define MBEDTLS_ECP_DP_SECP384R1_ENABLED
-#define MBEDTLS_ECP_DP_SECP521R1_ENABLED
-#define MBEDTLS_ECP_DP_SECP192K1_ENABLED
-#define MBEDTLS_ECP_DP_SECP224K1_ENABLED
-#define MBEDTLS_ECP_DP_SECP256K1_ENABLED
-#define MBEDTLS_ECP_DP_BP256R1_ENABLED
-#define MBEDTLS_ECP_DP_BP384R1_ENABLED
-#define MBEDTLS_ECP_DP_BP512R1_ENABLED
-#define MBEDTLS_ECP_DP_CURVE25519_ENABLED
-#define MBEDTLS_KEY_EXCHANGE_RSA_ENABLED
-#define MBEDTLS_NO_PLATFORM_ENTROPY
-#define MBEDTLS_PKCS1_V15
-#define MBEDTLS_SHA256_SMALLER
-#define MBEDTLS_SSL_PROTO_TLS1
-#define MBEDTLS_SSL_PROTO_TLS1_1
-#define MBEDTLS_SSL_PROTO_TLS1_2
-#define MBEDTLS_SSL_SERVER_NAME_INDICATION
-
-// Use a smaller output buffer to reduce size of SSL context
-#define MBEDTLS_SSL_MAX_CONTENT_LEN (16384)
-#define MBEDTLS_SSL_IN_CONTENT_LEN  (MBEDTLS_SSL_MAX_CONTENT_LEN)
-#define MBEDTLS_SSL_OUT_CONTENT_LEN (4096)
-
 // Enable mbedtls modules
-#define MBEDTLS_AES_C
-#define MBEDTLS_ASN1_PARSE_C
-#define MBEDTLS_BIGNUM_C
-#define MBEDTLS_CIPHER_C
-#define MBEDTLS_CTR_DRBG_C
 // #define MBEDTLS_ECP_C
-#define MBEDTLS_ENTROPY_C
-#define MBEDTLS_ERROR_C
-#define MBEDTLS_MD_C
-#define MBEDTLS_MD5_C
-#define MBEDTLS_OID_C
-#define MBEDTLS_PKCS5_C
-#define MBEDTLS_PK_C
-#define MBEDTLS_PK_PARSE_C
-#define MBEDTLS_PLATFORM_C
-#define MBEDTLS_RSA_C
-#define MBEDTLS_SHA1_C
-#define MBEDTLS_SHA256_C
-#define MBEDTLS_SHA512_C
-#define MBEDTLS_SSL_CLI_C
-#define MBEDTLS_SSL_SRV_C
-#define MBEDTLS_SSL_TLS_C
 #define MBEDTLS_TLS_DEFAULT_ALLOW_SHA1_IN_KEY_EXCHANGE
-#define MBEDTLS_X509_CRT_PARSE_C
-#define MBEDTLS_X509_USE_C
 
-// Memory allocation hooks
-#include <stdlib.h>
-#include <stdio.h>
-void *m_tracked_calloc(size_t nmemb, size_t size);
-void m_tracked_free(void *ptr);
-#define MBEDTLS_PLATFORM_STD_CALLOC m_tracked_calloc
-#define MBEDTLS_PLATFORM_STD_FREE m_tracked_free
-#define MBEDTLS_PLATFORM_SNPRINTF_MACRO snprintf
+// Set MicroPython-specific options.
+#define MICROPY_MBEDTLS_CONFIG_BARE_METAL (1)
 
-#include "mbedtls/check_config.h"
+// Include common mbedtls configuration.
+#include "extmod/mbedtls/mbedtls_config_common.h"
 
 #endif /* MICROPY_INCLUDED_MBEDTLS_CONFIG_H */
diff --git a/ports/unix/mbedtls/mbedtls_config.h b/ports/unix/mbedtls/mbedtls_config.h
index b119d09092f0a..c83f1c86f3ddd 100644
--- a/ports/unix/mbedtls/mbedtls_config.h
+++ b/ports/unix/mbedtls/mbedtls_config.h
@@ -26,69 +26,15 @@
 #ifndef MICROPY_INCLUDED_MBEDTLS_CONFIG_H
 #define MICROPY_INCLUDED_MBEDTLS_CONFIG_H
 
-// If you want to debug MBEDTLS uncomment the following and
-// Pass 3 to mbedtls_debug_set_threshold in socket_new
-// #define MBEDTLS_DEBUG_C
-
 // Set mbedtls configuration
-#define MBEDTLS_DEPRECATED_REMOVED
-#define MBEDTLS_AES_ROM_TABLES
-#define MBEDTLS_CIPHER_MODE_CBC
 #define MBEDTLS_CIPHER_MODE_CTR // needed for MICROPY_PY_UCRYPTOLIB_CTR
-#define MBEDTLS_ECP_DP_SECP192R1_ENABLED
-#define MBEDTLS_ECP_DP_SECP224R1_ENABLED
-#define MBEDTLS_ECP_DP_SECP256R1_ENABLED
-#define MBEDTLS_ECP_DP_SECP384R1_ENABLED
-#define MBEDTLS_ECP_DP_SECP521R1_ENABLED
-#define MBEDTLS_ECP_DP_SECP192K1_ENABLED
-#define MBEDTLS_ECP_DP_SECP224K1_ENABLED
-#define MBEDTLS_ECP_DP_SECP256K1_ENABLED
-#define MBEDTLS_ECP_DP_BP256R1_ENABLED
-#define MBEDTLS_ECP_DP_BP384R1_ENABLED
-#define MBEDTLS_ECP_DP_BP512R1_ENABLED
-#define MBEDTLS_ECP_DP_CURVE25519_ENABLED
-#define MBEDTLS_KEY_EXCHANGE_RSA_ENABLED
-#define MBEDTLS_NO_PLATFORM_ENTROPY
-#define MBEDTLS_PKCS1_V15
-#define MBEDTLS_SHA256_SMALLER
-#define MBEDTLS_SSL_PROTO_TLS1
-#define MBEDTLS_SSL_PROTO_TLS1_1
-#define MBEDTLS_SSL_PROTO_TLS1_2
-#define MBEDTLS_SSL_SERVER_NAME_INDICATION
-
-// Use a smaller output buffer to reduce size of SSL context
-#define MBEDTLS_SSL_MAX_CONTENT_LEN (16384)
-#define MBEDTLS_SSL_IN_CONTENT_LEN  (MBEDTLS_SSL_MAX_CONTENT_LEN)
-#define MBEDTLS_SSL_OUT_CONTENT_LEN (4096)
 
 // Enable mbedtls modules
-#define MBEDTLS_AES_C
-#define MBEDTLS_ASN1_PARSE_C
-#define MBEDTLS_BIGNUM_C
-#define MBEDTLS_CIPHER_C
-#define MBEDTLS_CTR_DRBG_C
-#define MBEDTLS_ENTROPY_C
-#define MBEDTLS_ERROR_C
 #define MBEDTLS_HAVEGE_C
-#define MBEDTLS_MD_C
-#define MBEDTLS_MD5_C
-#define MBEDTLS_OID_C
-#define MBEDTLS_PKCS5_C
-#define MBEDTLS_PK_C
-#define MBEDTLS_PK_PARSE_C
-#define MBEDTLS_PLATFORM_C
-#define MBEDTLS_RSA_C
-#define MBEDTLS_SHA1_C
-#define MBEDTLS_SHA256_C
-#define MBEDTLS_SHA512_C
-#define MBEDTLS_SSL_CLI_C
-#define MBEDTLS_SSL_SRV_C
-#define MBEDTLS_SSL_TLS_C
 #define MBEDTLS_TIMING_C
 #define MBEDTLS_TLS_DEFAULT_ALLOW_SHA1_IN_KEY_EXCHANGE
-#define MBEDTLS_X509_CRT_PARSE_C
-#define MBEDTLS_X509_USE_C
 
-#include "mbedtls/check_config.h"
+// Include common mbedtls configuration.
+#include "extmod/mbedtls/mbedtls_config_common.h"
 
 #endif /* MICROPY_INCLUDED_MBEDTLS_CONFIG_H */

From 9347545f9ee66210a835cb2f1e9860949feb139f Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 5 Oct 2022 10:48:31 +1100
Subject: [PATCH 2757/3533] extmod/mbedtls: Enable
 MBEDTLS_TLS_DEFAULT_ALLOW_SHA1_IN_KEY_EXCHANGE.

This was already enabled on all ports except mimxrt.  Now it's enabled on
all of them.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/mbedtls/mbedtls_config_common.h | 1 +
 ports/rp2/mbedtls/mbedtls_config.h     | 1 -
 ports/stm32/mbedtls/mbedtls_config.h   | 1 -
 ports/unix/mbedtls/mbedtls_config.h    | 1 -
 4 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/extmod/mbedtls/mbedtls_config_common.h b/extmod/mbedtls/mbedtls_config_common.h
index 6c9385dea5f79..4c2be6228af0b 100644
--- a/extmod/mbedtls/mbedtls_config_common.h
+++ b/extmod/mbedtls/mbedtls_config_common.h
@@ -82,6 +82,7 @@
 #define MBEDTLS_SSL_CLI_C
 #define MBEDTLS_SSL_SRV_C
 #define MBEDTLS_SSL_TLS_C
+#define MBEDTLS_TLS_DEFAULT_ALLOW_SHA1_IN_KEY_EXCHANGE
 #define MBEDTLS_X509_CRT_PARSE_C
 #define MBEDTLS_X509_USE_C
 
diff --git a/ports/rp2/mbedtls/mbedtls_config.h b/ports/rp2/mbedtls/mbedtls_config.h
index 61f622295ffa7..9c930b7d9c490 100644
--- a/ports/rp2/mbedtls/mbedtls_config.h
+++ b/ports/rp2/mbedtls/mbedtls_config.h
@@ -34,7 +34,6 @@
 #define MBEDTLS_ECDH_C
 #define MBEDTLS_ECP_C
 #define MBEDTLS_GCM_C
-#define MBEDTLS_TLS_DEFAULT_ALLOW_SHA1_IN_KEY_EXCHANGE
 #define MBEDTLS_HAVE_TIME
 #define MBEDTLS_HAVE_TIME_DATE
 
diff --git a/ports/stm32/mbedtls/mbedtls_config.h b/ports/stm32/mbedtls/mbedtls_config.h
index b8548866f1683..cc71aa7ec1132 100644
--- a/ports/stm32/mbedtls/mbedtls_config.h
+++ b/ports/stm32/mbedtls/mbedtls_config.h
@@ -28,7 +28,6 @@
 
 // Enable mbedtls modules
 // #define MBEDTLS_ECP_C
-#define MBEDTLS_TLS_DEFAULT_ALLOW_SHA1_IN_KEY_EXCHANGE
 
 // Set MicroPython-specific options.
 #define MICROPY_MBEDTLS_CONFIG_BARE_METAL (1)
diff --git a/ports/unix/mbedtls/mbedtls_config.h b/ports/unix/mbedtls/mbedtls_config.h
index c83f1c86f3ddd..c8ffab0832a16 100644
--- a/ports/unix/mbedtls/mbedtls_config.h
+++ b/ports/unix/mbedtls/mbedtls_config.h
@@ -32,7 +32,6 @@
 // Enable mbedtls modules
 #define MBEDTLS_HAVEGE_C
 #define MBEDTLS_TIMING_C
-#define MBEDTLS_TLS_DEFAULT_ALLOW_SHA1_IN_KEY_EXCHANGE
 
 // Include common mbedtls configuration.
 #include "extmod/mbedtls/mbedtls_config_common.h"

From 8874a09119e74bb0edf73a63495b559d983767b7 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 5 Oct 2022 11:02:47 +1100
Subject: [PATCH 2758/3533] extmod/mbedtls: Enable elliptic curve DH and DSA
 cryptography.

This is necessary to access sites that only support these protocols.

The rp2 port already has ECDH enabled, so this just adds ECDSA there.  The
other ports now gain both ECDH and ECDSA.  The code size increase is:

- rp2 (PICO_W): +2916 bytes flash, +24 bytes BSS
- stm32 (PYBD_SF6): +20480 bytes flash, +32 bytes data, +48 bytes BSS
- mimxrt (TEENSY41): +20708 bytes flash, +32 bytes data, +48 bytes BSS
- unix (standard x86-64): +39344 executable, +1744 bytes data, +96 BSS

This is obviously a large increase in code size.  But there doesn't seem to
be any other option because without elliptic curve cryptography devices are
partially cut off from the internet.  For use cases that require small
firmware size, they'll need to build custom firmware with a custom mbedtls
config.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/mbedtls/mbedtls_config_common.h | 6 ++++++
 ports/mimxrt/mbedtls/mbedtls_config.h  | 3 ---
 ports/rp2/mbedtls/mbedtls_config.h     | 2 --
 ports/stm32/mbedtls/mbedtls_config.h   | 3 ---
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/extmod/mbedtls/mbedtls_config_common.h b/extmod/mbedtls/mbedtls_config_common.h
index 4c2be6228af0b..252f293e03379 100644
--- a/extmod/mbedtls/mbedtls_config_common.h
+++ b/extmod/mbedtls/mbedtls_config_common.h
@@ -47,6 +47,8 @@
 #define MBEDTLS_ECP_DP_BP512R1_ENABLED
 #define MBEDTLS_ECP_DP_CURVE25519_ENABLED
 #define MBEDTLS_KEY_EXCHANGE_RSA_ENABLED
+// #define MBEDTLS_KEY_EXCHANGE_ECDHE_RSA_ENABLED // enabling this currently breaks ssl_data.py test
+#define MBEDTLS_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED
 #define MBEDTLS_NO_PLATFORM_ENTROPY
 #define MBEDTLS_PKCS1_V15
 #define MBEDTLS_SHA256_SMALLER
@@ -63,9 +65,13 @@
 // Enable mbedtls modules.
 #define MBEDTLS_AES_C
 #define MBEDTLS_ASN1_PARSE_C
+#define MBEDTLS_ASN1_WRITE_C
 #define MBEDTLS_BIGNUM_C
 #define MBEDTLS_CIPHER_C
 #define MBEDTLS_CTR_DRBG_C
+#define MBEDTLS_ECDH_C
+#define MBEDTLS_ECDSA_C
+#define MBEDTLS_ECP_C
 #define MBEDTLS_ENTROPY_C
 #define MBEDTLS_ERROR_C
 #define MBEDTLS_MD_C
diff --git a/ports/mimxrt/mbedtls/mbedtls_config.h b/ports/mimxrt/mbedtls/mbedtls_config.h
index cc71aa7ec1132..4140bb5145555 100644
--- a/ports/mimxrt/mbedtls/mbedtls_config.h
+++ b/ports/mimxrt/mbedtls/mbedtls_config.h
@@ -26,9 +26,6 @@
 #ifndef MICROPY_INCLUDED_MBEDTLS_CONFIG_H
 #define MICROPY_INCLUDED_MBEDTLS_CONFIG_H
 
-// Enable mbedtls modules
-// #define MBEDTLS_ECP_C
-
 // Set MicroPython-specific options.
 #define MICROPY_MBEDTLS_CONFIG_BARE_METAL (1)
 
diff --git a/ports/rp2/mbedtls/mbedtls_config.h b/ports/rp2/mbedtls/mbedtls_config.h
index 9c930b7d9c490..1b6d3dd43a653 100644
--- a/ports/rp2/mbedtls/mbedtls_config.h
+++ b/ports/rp2/mbedtls/mbedtls_config.h
@@ -31,8 +31,6 @@
 #define MBEDTLS_KEY_EXCHANGE_ECDHE_RSA_ENABLED
 
 // Enable mbedtls modules
-#define MBEDTLS_ECDH_C
-#define MBEDTLS_ECP_C
 #define MBEDTLS_GCM_C
 #define MBEDTLS_HAVE_TIME
 #define MBEDTLS_HAVE_TIME_DATE
diff --git a/ports/stm32/mbedtls/mbedtls_config.h b/ports/stm32/mbedtls/mbedtls_config.h
index cc71aa7ec1132..4140bb5145555 100644
--- a/ports/stm32/mbedtls/mbedtls_config.h
+++ b/ports/stm32/mbedtls/mbedtls_config.h
@@ -26,9 +26,6 @@
 #ifndef MICROPY_INCLUDED_MBEDTLS_CONFIG_H
 #define MICROPY_INCLUDED_MBEDTLS_CONFIG_H
 
-// Enable mbedtls modules
-// #define MBEDTLS_ECP_C
-
 // Set MicroPython-specific options.
 #define MICROPY_MBEDTLS_CONFIG_BARE_METAL (1)
 

From e24159dec9588d83fc532aa6fcc2f418aae9df85 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 11 Oct 2022 19:22:48 +1100
Subject: [PATCH 2759/3533] extmod/mbedtls: Remove
 MBEDTLS_ECP_DP_CURVE25519_ENABLED config.

Curve25519 arithmetic is supported in mbedtls, but it's not used for TLS.
So there's no need to have this option enabled.

Reduces rp2 PICO_W firmware by 2440 bytes.

Thanks to @Carglglz for the information.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/mbedtls/mbedtls_config_common.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/extmod/mbedtls/mbedtls_config_common.h b/extmod/mbedtls/mbedtls_config_common.h
index 252f293e03379..9ec2af85537f9 100644
--- a/extmod/mbedtls/mbedtls_config_common.h
+++ b/extmod/mbedtls/mbedtls_config_common.h
@@ -45,7 +45,6 @@
 #define MBEDTLS_ECP_DP_BP256R1_ENABLED
 #define MBEDTLS_ECP_DP_BP384R1_ENABLED
 #define MBEDTLS_ECP_DP_BP512R1_ENABLED
-#define MBEDTLS_ECP_DP_CURVE25519_ENABLED
 #define MBEDTLS_KEY_EXCHANGE_RSA_ENABLED
 // #define MBEDTLS_KEY_EXCHANGE_ECDHE_RSA_ENABLED // enabling this currently breaks ssl_data.py test
 #define MBEDTLS_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED

From 68f166dae9ad6dfd94038d5f4394defbb44238af Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 11 Oct 2022 19:25:05 +1100
Subject: [PATCH 2760/3533] extmod/mbedtls: Remove brainpool curves from
 config.

They are much slower than NIST (SECP) curves and shouldn't be needed.

Reduces rp2 PICO_W firmware by 1328 bytes.

Thanks to @Carglglz for the information.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/mbedtls/mbedtls_config_common.h | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/extmod/mbedtls/mbedtls_config_common.h b/extmod/mbedtls/mbedtls_config_common.h
index 9ec2af85537f9..bfbc6f7ba298f 100644
--- a/extmod/mbedtls/mbedtls_config_common.h
+++ b/extmod/mbedtls/mbedtls_config_common.h
@@ -42,9 +42,6 @@
 #define MBEDTLS_ECP_DP_SECP192K1_ENABLED
 #define MBEDTLS_ECP_DP_SECP224K1_ENABLED
 #define MBEDTLS_ECP_DP_SECP256K1_ENABLED
-#define MBEDTLS_ECP_DP_BP256R1_ENABLED
-#define MBEDTLS_ECP_DP_BP384R1_ENABLED
-#define MBEDTLS_ECP_DP_BP512R1_ENABLED
 #define MBEDTLS_KEY_EXCHANGE_RSA_ENABLED
 // #define MBEDTLS_KEY_EXCHANGE_ECDHE_RSA_ENABLED // enabling this currently breaks ssl_data.py test
 #define MBEDTLS_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED

From b161abc574b8e4fb2b00ef76be2b9c8967e18584 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Tue, 18 Oct 2022 00:18:54 +1100
Subject: [PATCH 2761/3533] py/obj: Verify floating point type is correct for
 repr C.

Prevents double-precision floats being enabled on 32-bit architectures
where they will not fit into the mp_obj_t encoding.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 py/obj.h | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/py/obj.h b/py/obj.h
index 8aa5b0a8e667b..8d62dd4f3cf01 100644
--- a/py/obj.h
+++ b/py/obj.h
@@ -173,6 +173,10 @@ static inline bool mp_obj_is_obj(mp_const_obj_t o) {
 
 #elif MICROPY_OBJ_REPR == MICROPY_OBJ_REPR_C
 
+#if MICROPY_FLOAT_IMPL == MICROPY_FLOAT_IMPL_NONE
+#error "MICROPY_OBJ_REPR_C requires float to be enabled."
+#endif
+
 static inline bool mp_obj_is_small_int(mp_const_obj_t o) {
     return (((mp_int_t)(o)) & 1) != 0;
 }
@@ -189,6 +193,9 @@ static inline bool mp_obj_is_small_int(mp_const_obj_t o) {
 #endif
 
 static inline bool mp_obj_is_float(mp_const_obj_t o) {
+    // Ensure that 32-bit arch can only use single precision.
+    MP_STATIC_ASSERT(sizeof(mp_float_t) <= sizeof(mp_obj_t));
+
     return (((mp_uint_t)(o)) & 3) == 2 && (((mp_uint_t)(o)) & 0xff800007) != 0x00000006;
 }
 static inline mp_float_t mp_obj_float_get(mp_const_obj_t o) {

From 5ee1cb27711d3747747db3ecd7b761c2a064addf Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Tue, 18 Oct 2022 00:22:53 +1100
Subject: [PATCH 2762/3533] stm32/boards/ARDUINO_PORTENTA_H7: Revert to
 single-precision float.

Using repr C is incompatible with double-precision floats on 32-bit arch.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/stm32/boards/ARDUINO_PORTENTA_H7/mpconfigboard.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/stm32/boards/ARDUINO_PORTENTA_H7/mpconfigboard.mk b/ports/stm32/boards/ARDUINO_PORTENTA_H7/mpconfigboard.mk
index e5b48d0644f0f..7151a5abc5d7a 100644
--- a/ports/stm32/boards/ARDUINO_PORTENTA_H7/mpconfigboard.mk
+++ b/ports/stm32/boards/ARDUINO_PORTENTA_H7/mpconfigboard.mk
@@ -10,7 +10,7 @@ BOOTLOADER_DFU_USB_PID = 0x035b
 # MCU settings
 MCU_SERIES = h7
 CMSIS_MCU = STM32H747xx
-MICROPY_FLOAT_IMPL = double
+MICROPY_FLOAT_IMPL = single
 AF_FILE = boards/stm32h743_af.csv
 LD_FILES = boards/ARDUINO_PORTENTA_H7/stm32h747.ld
 TEXT0_ADDR = 0x08040000

From 1ba0e8ff96334af986d2b7d90f6d86af27595d28 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Thu, 20 Oct 2022 13:14:25 +1100
Subject: [PATCH 2763/3533] py/persistentcode: Only emit sub-version if
 generated code has native.

In order for v1.19.1 to load a .mpy, the formerly-feature-flags which are
now used for the sub-version must be zero.

The sub-version is only used to indicate a native version change, so it
should be zero when emitting bytecode-only .mpy files.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 py/persistentcode.c | 7 ++-----
 tools/mpy-tool.py   | 2 +-
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/py/persistentcode.c b/py/persistentcode.c
index 67c8f327f002c..5408f756cf8f9 100644
--- a/py/persistentcode.c
+++ b/py/persistentcode.c
@@ -591,21 +591,18 @@ void mp_raw_code_save(mp_compiled_module_t *cm, mp_print_t *print) {
     // header contains:
     //  byte  'M'
     //  byte  version
-    //  byte  feature flags
+    //  byte  native arch (and sub-version if native)
     //  byte  number of bits in a small int
     byte header[4] = {
         'M',
         MPY_VERSION,
-        MPY_FEATURE_ENCODE_SUB_VERSION(MPY_SUB_VERSION),
+        cm->has_native ? MPY_FEATURE_ENCODE_SUB_VERSION(MPY_SUB_VERSION) | MPY_FEATURE_ENCODE_ARCH(MPY_FEATURE_ARCH_DYNAMIC) : 0,
         #if MICROPY_DYNAMIC_COMPILER
         mp_dynamic_compiler.small_int_bits,
         #else
         MP_SMALL_INT_BITS,
         #endif
     };
-    if (cm->has_native) {
-        header[2] |= MPY_FEATURE_ENCODE_ARCH(MPY_FEATURE_ARCH_DYNAMIC);
-    }
     mp_print_bytes(print, header, sizeof(header));
 
     // Number of entries in constant table.
diff --git a/tools/mpy-tool.py b/tools/mpy-tool.py
index 8b644c137f4c7..0b8a0403ca286 100755
--- a/tools/mpy-tool.py
+++ b/tools/mpy-tool.py
@@ -1676,7 +1676,7 @@ def merge_mpy(compiled_modules, output_file):
         header = bytearray(4)
         header[0] = ord("M")
         header[1] = config.MPY_VERSION
-        header[2] = config.native_arch << 2 | config.MPY_SUB_VERSION
+        header[2] = config.native_arch << 2 | config.MPY_SUB_VERSION if config.native_arch else 0
         header[3] = config.mp_small_int_bits
         merged_mpy.extend(header)
 

From edc3f3d0d3c4099dc6bce5371df0e1c3c5a4aecb Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Wed, 29 Jun 2022 15:31:21 +0200
Subject: [PATCH 2764/3533] samd/clock_config: Extend the range of
 machine.freq().

The value given for machine.freq(f) is extend to the range of 1_000_000 to
200_000_000.  Frequencies below 48 MHz will be forced to an integer
fraction of 48 MHz.  At frequencies below 8 MHz USB is switched off.  The
power consumption e.g. of ADAFRUIT_ITSYBITSY_M4_EXPRESS drops to about
1.5 mA at 1 MHz.

Since the peripheral frequency is dropped as well, timing e.g. of PWM,
UART, I2C and SPI is affected and frequency/baud rate has to set again
after a frequency change below 48 MHz.
---
 ports/samd/mcu/samd51/clock_config.c | 72 ++++++++++++++++++++--------
 ports/samd/modmachine.c              |  4 +-
 ports/samd/samd_soc.c                |  2 +-
 3 files changed, 54 insertions(+), 24 deletions(-)

diff --git a/ports/samd/mcu/samd51/clock_config.c b/ports/samd/mcu/samd51/clock_config.c
index 31c8f5a8654c2..9fb48705adcba 100644
--- a/ports/samd/mcu/samd51/clock_config.c
+++ b/ports/samd/mcu/samd51/clock_config.c
@@ -54,35 +54,63 @@ uint32_t get_peripheral_freq(void) {
 }
 
 void set_cpu_freq(uint32_t cpu_freq_arg) {
-    cpu_freq = cpu_freq_arg;
 
     // Setup GCLK0 for 48MHz as default state to keep the MCU running during config change.
     GCLK->GENCTRL[0].reg = GCLK_GENCTRL_RUNSTDBY | GCLK_GENCTRL_GENEN | GCLK_GENCTRL_SRC_DFLL;
     while (GCLK->SYNCBUSY.bit.GENCTRL0) {
     }
-
     // Setup DPLL0 for 120 MHz
     // first: disable DPLL0 in case it is running
     OSCCTRL->Dpll[0].DPLLCTRLA.bit.ENABLE = 0;
     while (OSCCTRL->Dpll[0].DPLLSYNCBUSY.bit.ENABLE == 1) {
     }
-    // Now configure the registers
-    OSCCTRL->Dpll[0].DPLLCTRLB.reg = OSCCTRL_DPLLCTRLB_DIV(1) | OSCCTRL_DPLLCTRLB_LBYPASS |
-        OSCCTRL_DPLLCTRLB_REFCLK(0) | OSCCTRL_DPLLCTRLB_WUF | OSCCTRL_DPLLCTRLB_FILTER(0x01);
-
-    uint32_t div = cpu_freq / DPLLx_REF_FREQ;
-    uint32_t frac = (cpu_freq - div * DPLLx_REF_FREQ) / (DPLLx_REF_FREQ / 32);
-    OSCCTRL->Dpll[0].DPLLRATIO.reg = (frac << 16) + div - 1;
-    // enable it again
-    OSCCTRL->Dpll[0].DPLLCTRLA.reg = OSCCTRL_DPLLCTRLA_ENABLE | OSCCTRL_DPLLCTRLA_RUNSTDBY;
-
-    // Per errata 2.13.1
-    while (!(OSCCTRL->Dpll[0].DPLLSTATUS.bit.CLKRDY == 1)) {
+    if (cpu_freq_arg > DFLL48M_FREQ) {
+
+        cpu_freq = cpu_freq_arg;
+        peripheral_freq = DFLL48M_FREQ;
+        // Now configure the registers
+        OSCCTRL->Dpll[0].DPLLCTRLB.reg = OSCCTRL_DPLLCTRLB_DIV(1) | OSCCTRL_DPLLCTRLB_LBYPASS |
+            OSCCTRL_DPLLCTRLB_REFCLK(0) | OSCCTRL_DPLLCTRLB_WUF | OSCCTRL_DPLLCTRLB_FILTER(0x01);
+
+        uint32_t div = cpu_freq / DPLLx_REF_FREQ;
+        uint32_t frac = (cpu_freq - div * DPLLx_REF_FREQ) / (DPLLx_REF_FREQ / 32);
+        OSCCTRL->Dpll[0].DPLLRATIO.reg = (frac << 16) + div - 1;
+        // enable it again
+        OSCCTRL->Dpll[0].DPLLCTRLA.reg = OSCCTRL_DPLLCTRLA_ENABLE | OSCCTRL_DPLLCTRLA_RUNSTDBY;
+
+        // Per errata 2.13.1
+        while (!(OSCCTRL->Dpll[0].DPLLSTATUS.bit.CLKRDY == 1)) {
+        }
+        // Setup GCLK0 for DPLL0 output (48 or 48-200MHz)
+        GCLK->GENCTRL[0].reg = GCLK_GENCTRL_RUNSTDBY | GCLK_GENCTRL_GENEN | GCLK_GENCTRL_SRC_DPLL0;
+        while (GCLK->SYNCBUSY.bit.GENCTRL0) {
+        }
+        // Set GCLK 2 back to 48 MHz
+        GCLK->GENCTRL[2].reg = GCLK_GENCTRL_DIV(1) | GCLK_GENCTRL_RUNSTDBY | GCLK_GENCTRL_GENEN | GCLK_GENCTRL_SRC_DFLL;
+        while (GCLK->SYNCBUSY.bit.GENCTRL2) {
+        }
+    } else {
+        int div = DFLL48M_FREQ / cpu_freq_arg;
+        // Setup GCLK1 for the low freq
+        GCLK->GENCTRL[2].reg = GCLK_GENCTRL_DIV(div) | GCLK_GENCTRL_RUNSTDBY | GCLK_GENCTRL_GENEN | GCLK_GENCTRL_SRC_DFLL;
+        while (GCLK->SYNCBUSY.bit.GENCTRL2) {
+        }
+        GCLK->GENCTRL[0].reg = GCLK_GENCTRL_DIV(div) | GCLK_GENCTRL_RUNSTDBY | GCLK_GENCTRL_GENEN | GCLK_GENCTRL_SRC_DFLL;
+        while (GCLK->SYNCBUSY.bit.GENCTRL0) {
+        }
+        peripheral_freq = DFLL48M_FREQ / div;
+        cpu_freq = DFLL48M_FREQ / div;
     }
-
-    // Setup GCLK0 for DPLL0 output (48 or 48-200MHz)
-    GCLK->GENCTRL[0].reg = GCLK_GENCTRL_RUNSTDBY | GCLK_GENCTRL_GENEN | GCLK_GENCTRL_SRC_DPLL0;
-    while (GCLK->SYNCBUSY.bit.GENCTRL0) {
+    if (cpu_freq >= 8000000) {
+        // Setup GCLK5 for DFLL48M output (48 MHz)
+        GCLK->GENCTRL[5].reg = GCLK_GENCTRL_DIV(1) | GCLK_GENCTRL_RUNSTDBY | GCLK_GENCTRL_GENEN | GCLK_GENCTRL_SRC_DFLL;
+        while (GCLK->SYNCBUSY.bit.GENCTRL5) {
+        }
+    } else {
+        // Setup GCLK5 off if CPU Clk < 8 MHz
+        GCLK->GENCTRL[5].reg = 0;
+        while (GCLK->SYNCBUSY.bit.GENCTRL5) {
+        }
     }
 }
 
@@ -120,9 +148,10 @@ void init_clocks(uint32_t cpu_freq) {
     // SAMD51 clock settings
     // GCLK0: 48MHz from DFLL48M or 48 - 200 MHz from DPLL0 (SAMD51)
     // GCLK1: 32768 Hz from 32KULP or DFLL48M
-    // GCLK2: 48MHz from DFLL48M for Peripheral devices
-    // GCLK3: 16Mhz for the us-counter (TC0/TC1)
+    // GCLK2: 8-48MHz from DFLL48M for Peripheral devices
+    // GCLK3: 8Mhz for the us-counter (TC0/TC1)
     // GCLK4: 32kHz from crystal, if present
+    // GCLK5: 48MHz from DFLL48M for USB
     // DPLL0: 48 - 200 MHz
 
     // Steps to set up clocks:
@@ -136,6 +165,7 @@ void init_clocks(uint32_t cpu_freq) {
     // Setup GCLK2 to 48MHz for Peripherals
     // Setup GCLK3 to 8MHz for TC0/TC1
     // Setup GCLK4 to 32kHz crystal, if present
+    // Setup GCLK5 to 48 MHz
 
     // Setup GCLK0 for 48MHz as default state to keep the MCU running during config change.
     GCLK->GENCTRL[0].reg = GCLK_GENCTRL_RUNSTDBY | GCLK_GENCTRL_GENEN | GCLK_GENCTRL_SRC_DFLL;
@@ -238,7 +268,7 @@ void init_clocks(uint32_t cpu_freq) {
 
     peripheral_freq = DFLL48M_FREQ;  // To be changed if CPU_FREQ < 48M
 
-    // Setup GCLK2 for DPLL1 output (48 MHz)
+    // Setup GCLK2 for DFLL48M output (48 MHz), may be scaled down later by calls to set_cpu_freq
     GCLK->GENCTRL[2].reg = GCLK_GENCTRL_DIV(1) | GCLK_GENCTRL_RUNSTDBY | GCLK_GENCTRL_GENEN | GCLK_GENCTRL_SRC_DFLL;
     while (GCLK->SYNCBUSY.bit.GENCTRL2) {
     }
diff --git a/ports/samd/modmachine.c b/ports/samd/modmachine.c
index b9de026ed425c..d16b660645f3b 100644
--- a/ports/samd/modmachine.c
+++ b/ports/samd/modmachine.c
@@ -69,9 +69,9 @@ STATIC mp_obj_t machine_freq(size_t n_args, const mp_obj_t *args) {
     } else {
         #if defined(MCU_SAMD51)
         uint32_t freq = mp_obj_get_int(args[0]);
-        if (freq >= 48000000 && freq <= 200000000) {
+        if (freq >= 1000000 && freq <= 200000000) {
             set_cpu_freq(freq);
-            SysTick_Config(freq / 1000);
+            SysTick_Config(get_cpu_freq() / 1000);
         }
         #endif
         return mp_const_none;
diff --git a/ports/samd/samd_soc.c b/ports/samd/samd_soc.c
index f4a27f3df740b..113529aeea36b 100644
--- a/ports/samd/samd_soc.c
+++ b/ports/samd/samd_soc.c
@@ -46,7 +46,7 @@ static void usb_init(void) {
     PM->APBBMASK.bit.USB_ = 1;
     uint8_t alt = 6; // alt G, USB
     #elif defined(MCU_SAMD51)
-    GCLK->PCHCTRL[USB_GCLK_ID].reg = GCLK_PCHCTRL_CHEN | GCLK_PCHCTRL_GEN_GCLK2;
+    GCLK->PCHCTRL[USB_GCLK_ID].reg = GCLK_PCHCTRL_CHEN | GCLK_PCHCTRL_GEN_GCLK5;
     while (GCLK->PCHCTRL[USB_GCLK_ID].bit.CHEN == 0) {
     }
     MCLK->AHBMASK.bit.USB_ = 1;

From 1c32cec7f11864a9bc67f988e39e7dfc7c33188e Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Wed, 29 Jun 2022 17:22:20 +0200
Subject: [PATCH 2765/3533] samd/clock_config: Support changing machine.freq()
 for SAMD21.

The range is 1MHz - 48 MHz.  Note that below 8 MHz there is no USB support.
The frequency will be set to an integer fraction of 48 MHz.  And after
changing the frequency, the peripherals like PWM, UART, I2C, SPI have to be
reconfigured.

Current consumption e.g. of the Seeed Xiao board at 1 MHz is about 1.5 mA,
mostly caused by the on-board LED (green LED with 1k resistor at 3.3V).
---
 ports/samd/mcu/samd21/clock_config.c | 43 +++++++++++++++++++++-------
 ports/samd/mcu/samd21/mpconfigmcu.h  |  1 +
 ports/samd/mcu/samd51/mpconfigmcu.h  |  1 +
 ports/samd/modmachine.c              |  4 +--
 ports/samd/samd_soc.c                |  2 +-
 5 files changed, 36 insertions(+), 15 deletions(-)

diff --git a/ports/samd/mcu/samd21/clock_config.c b/ports/samd/mcu/samd21/clock_config.c
index 2402ed2e3107a..204a5294f2576 100644
--- a/ports/samd/mcu/samd21/clock_config.c
+++ b/ports/samd/mcu/samd21/clock_config.c
@@ -51,7 +51,36 @@ uint32_t get_peripheral_freq(void) {
 }
 
 void set_cpu_freq(uint32_t cpu_freq_arg) {
-    cpu_freq = cpu_freq_arg;
+
+    // Set 1 waitstate to be safe
+    NVMCTRL->CTRLB.reg = NVMCTRL_CTRLB_MANW | NVMCTRL_CTRLB_RWS(1);
+
+    int div = DFLL48M_FREQ / cpu_freq_arg;
+    peripheral_freq = cpu_freq = DFLL48M_FREQ / div;
+
+    // Enable GCLK output: 48M on both CCLK0 and GCLK2
+    GCLK->GENDIV.reg = GCLK_GENDIV_ID(0) | GCLK_GENDIV_DIV(div);
+    GCLK->GENCTRL.reg = GCLK_GENCTRL_GENEN | GCLK_GENCTRL_SRC_DFLL48M | GCLK_GENCTRL_ID(0);
+    while (GCLK->STATUS.bit.SYNCBUSY) {
+    }
+    GCLK->GENDIV.reg = GCLK_GENDIV_ID(2) | GCLK_GENDIV_DIV(div);
+    GCLK->GENCTRL.reg = GCLK_GENCTRL_GENEN | GCLK_GENCTRL_SRC_DFLL48M | GCLK_GENCTRL_ID(2);
+    while (GCLK->STATUS.bit.SYNCBUSY) {
+    }
+    if (cpu_freq >= 8000000) {
+        // Enable GCLK output: 48MHz on GCLK5 for USB
+        GCLK->GENDIV.reg = GCLK_GENDIV_ID(5) | GCLK_GENDIV_DIV(1);
+        GCLK->GENCTRL.reg = GCLK_GENCTRL_GENEN | GCLK_GENCTRL_SRC_DFLL48M | GCLK_GENCTRL_ID(5);
+        while (GCLK->STATUS.bit.SYNCBUSY) {
+        }
+    } else {
+        // Disable GCLK output on GCLK5 for USB, since USB is not reliable below 8 Mhz.
+        GCLK->GENCTRL.reg = GCLK_GENCTRL_ID(5);
+        while (GCLK->STATUS.bit.SYNCBUSY) {
+        }
+    }
+    // Set 0 waitstates for slower CPU clock
+    NVMCTRL->CTRLB.reg = NVMCTRL_CTRLB_MANW | NVMCTRL_CTRLB_RWS(cpu_freq > 24000000 ? 1 : 0);
 }
 
 void check_usb_recovery_mode(void) {
@@ -76,6 +105,7 @@ void init_clocks(uint32_t cpu_freq) {
     // GCLK2: 48MHz from DFLL for Peripherals
     // GCLK3: 1Mhz for the us-counter (TC4/TC5)
     // GCLK4: 32kHz from crystal, if present
+    // GCLK5: 48MHz from DFLL for USB
     // GCLK8: 1kHz clock for WDT
 
     NVMCTRL->CTRLB.bit.MANW = 1; // errata "Spurious Writes"
@@ -180,15 +210,7 @@ void init_clocks(uint32_t cpu_freq) {
 
     #endif // MICROPY_HW_XOSC32K
 
-    // Enable GCLK output: 48M on both CCLK0 and GCLK2
-    GCLK->GENDIV.reg = GCLK_GENDIV_ID(0) | GCLK_GENDIV_DIV(1);
-    GCLK->GENCTRL.reg = GCLK_GENCTRL_GENEN | GCLK_GENCTRL_SRC_DFLL48M | GCLK_GENCTRL_ID(0);
-    while (GCLK->STATUS.bit.SYNCBUSY) {
-    }
-    GCLK->GENDIV.reg = GCLK_GENDIV_ID(2) | GCLK_GENDIV_DIV(1);
-    GCLK->GENCTRL.reg = GCLK_GENCTRL_GENEN | GCLK_GENCTRL_SRC_DFLL48M | GCLK_GENCTRL_ID(2);
-    while (GCLK->STATUS.bit.SYNCBUSY) {
-    }
+    set_cpu_freq(cpu_freq);
 
     // Enable GCLK output: 1MHz on GCLK3 for TC4
     GCLK->GENDIV.reg = GCLK_GENDIV_ID(3) | GCLK_GENDIV_DIV(48);
@@ -200,7 +222,6 @@ void init_clocks(uint32_t cpu_freq) {
     GCLK->GENCTRL.reg = GCLK_GENCTRL_GENEN | GCLK_GENCTRL_SRC_OSCULP32K | GCLK_GENCTRL_ID(8);
     while (GCLK->STATUS.bit.SYNCBUSY) {
     }
-
 }
 
 void enable_sercom_clock(int id) {
diff --git a/ports/samd/mcu/samd21/mpconfigmcu.h b/ports/samd/mcu/samd21/mpconfigmcu.h
index a84b31276b428..e0af60552b022 100644
--- a/ports/samd/mcu/samd21/mpconfigmcu.h
+++ b/ports/samd/mcu/samd21/mpconfigmcu.h
@@ -19,6 +19,7 @@
 
 #define CPU_FREQ                        (48000000)
 #define DFLL48M_FREQ                    (48000000)
+#define MAX_CPU_FREQ                    (48000000)
 
 #define IRQ_PRI_PENDSV                  ((1 << __NVIC_PRIO_BITS) - 1)
 
diff --git a/ports/samd/mcu/samd51/mpconfigmcu.h b/ports/samd/mcu/samd51/mpconfigmcu.h
index 19193992f058d..819bc1bb11b72 100644
--- a/ports/samd/mcu/samd51/mpconfigmcu.h
+++ b/ports/samd/mcu/samd51/mpconfigmcu.h
@@ -26,6 +26,7 @@ unsigned long trng_random_u32(void);
 
 #define CPU_FREQ                        (120000000)
 #define DFLL48M_FREQ                    (48000000)
+#define MAX_CPU_FREQ                    (200000000)
 #define DPLLx_REF_FREQ                  (32768)
 
 #define NVIC_PRIORITYGROUP_4            ((uint32_t)0x00000003)
diff --git a/ports/samd/modmachine.c b/ports/samd/modmachine.c
index d16b660645f3b..21d700ac31ca5 100644
--- a/ports/samd/modmachine.c
+++ b/ports/samd/modmachine.c
@@ -67,13 +67,11 @@ STATIC mp_obj_t machine_freq(size_t n_args, const mp_obj_t *args) {
     if (n_args == 0) {
         return MP_OBJ_NEW_SMALL_INT(get_cpu_freq());
     } else {
-        #if defined(MCU_SAMD51)
         uint32_t freq = mp_obj_get_int(args[0]);
-        if (freq >= 1000000 && freq <= 200000000) {
+        if (freq >= 1000000 && freq <= MAX_CPU_FREQ) {
             set_cpu_freq(freq);
             SysTick_Config(get_cpu_freq() / 1000);
         }
-        #endif
         return mp_const_none;
     }
 }
diff --git a/ports/samd/samd_soc.c b/ports/samd/samd_soc.c
index 113529aeea36b..6d8348ebcd833 100644
--- a/ports/samd/samd_soc.c
+++ b/ports/samd/samd_soc.c
@@ -41,7 +41,7 @@
 static void usb_init(void) {
     // Init USB clock
     #if defined(MCU_SAMD21)
-    GCLK->CLKCTRL.reg = GCLK_CLKCTRL_CLKEN | GCLK_CLKCTRL_GEN_GCLK0 | GCLK_CLKCTRL_ID_USB;
+    GCLK->CLKCTRL.reg = GCLK_CLKCTRL_CLKEN | GCLK_CLKCTRL_GEN_GCLK5 | GCLK_CLKCTRL_ID_USB;
     PM->AHBMASK.bit.USB_ = 1;
     PM->APBBMASK.bit.USB_ = 1;
     uint8_t alt = 6; // alt G, USB

From 64e3c351de0959660d1a6b691ee7dbf2de565fbe Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Wed, 29 Jun 2022 14:09:57 +0200
Subject: [PATCH 2766/3533] samd/modmachine: Add machine.reset_cause().

---
 ports/samd/modmachine.c | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/ports/samd/modmachine.c b/ports/samd/modmachine.c
index 21d700ac31ca5..db3f159cc2c37 100644
--- a/ports/samd/modmachine.c
+++ b/ports/samd/modmachine.c
@@ -139,6 +139,17 @@ STATIC mp_obj_t machine_enable_irq(mp_obj_t state_in) {
 }
 MP_DEFINE_CONST_FUN_OBJ_1(machine_enable_irq_obj, machine_enable_irq);
 
+STATIC mp_obj_t machine_reset_cause(void) {
+    #if defined(MCU_SAMD21)
+    return MP_OBJ_NEW_SMALL_INT(PM->RCAUSE.reg);
+    #elif defined(MCU_SAMD51)
+    return MP_OBJ_NEW_SMALL_INT(RSTC->RCAUSE.reg);
+    #else
+    return MP_OBJ_NEW_SMALL_INT(0);
+    #endif
+}
+MP_DEFINE_CONST_FUN_OBJ_0(machine_reset_cause_obj, machine_reset_cause);
+
 STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__),            MP_ROM_QSTR(MP_QSTR_umachine) },
     { MP_ROM_QSTR(MP_QSTR_reset),               MP_ROM_PTR(&machine_reset_obj) },
@@ -165,8 +176,18 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_idle),                MP_ROM_PTR(&machine_idle_obj) },
     { MP_ROM_QSTR(MP_QSTR_disable_irq),         MP_ROM_PTR(&machine_disable_irq_obj) },
     { MP_ROM_QSTR(MP_QSTR_enable_irq),          MP_ROM_PTR(&machine_enable_irq_obj) },
+    { MP_ROM_QSTR(MP_QSTR_reset_cause),         MP_ROM_PTR(&machine_reset_cause_obj) },
     { MP_ROM_QSTR(MP_QSTR_time_pulse_us),       MP_ROM_PTR(&machine_time_pulse_us_obj) },
     { MP_ROM_QSTR(MP_QSTR_bitstream),           MP_ROM_PTR(&machine_bitstream_obj) },
+
+    // Class constants.
+    // Use numerical constants instead of the symbolic names,
+    // since the names differ between SAMD21 and SAMD51.
+    { MP_ROM_QSTR(MP_QSTR_PWRON_RESET),         MP_ROM_INT(0x01) },
+    { MP_ROM_QSTR(MP_QSTR_HARD_RESET),          MP_ROM_INT(0x10) },
+    { MP_ROM_QSTR(MP_QSTR_WDT_RESET),           MP_ROM_INT(0x20) },
+    { MP_ROM_QSTR(MP_QSTR_SOFT_RESET),          MP_ROM_INT(0x40) },
+    { MP_ROM_QSTR(MP_QSTR_DEEPSLEEP_RESET),     MP_ROM_INT(0x80) },
 };
 STATIC MP_DEFINE_CONST_DICT(machine_module_globals, machine_module_globals_table);
 

From 0d3f0d7470586f9c328a047ac3043420df16d4ab Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sat, 2 Jul 2022 18:12:55 +0200
Subject: [PATCH 2767/3533] samd/boards/SPARKFUN_SAMD51_THING_PLUS: Add board
 files for Thing Plus.

That device uses an SAMD51J20 MCU with 256k RAM and 1024k flash.
---
 .../SPARKFUN_SAMD51_THING_PLUS/board.json     | 21 ++++++++++
 .../mpconfigboard.h                           |  4 ++
 .../mpconfigboard.mk                          |  8 ++++
 .../SPARKFUN_SAMD51_THING_PLUS/pins.csv       | 42 +++++++++++++++++++
 ports/samd/boards/samd51x20a.ld               | 20 +++++++++
 5 files changed, 95 insertions(+)
 create mode 100644 ports/samd/boards/SPARKFUN_SAMD51_THING_PLUS/board.json
 create mode 100644 ports/samd/boards/SPARKFUN_SAMD51_THING_PLUS/mpconfigboard.h
 create mode 100644 ports/samd/boards/SPARKFUN_SAMD51_THING_PLUS/mpconfigboard.mk
 create mode 100644 ports/samd/boards/SPARKFUN_SAMD51_THING_PLUS/pins.csv
 create mode 100644 ports/samd/boards/samd51x20a.ld

diff --git a/ports/samd/boards/SPARKFUN_SAMD51_THING_PLUS/board.json b/ports/samd/boards/SPARKFUN_SAMD51_THING_PLUS/board.json
new file mode 100644
index 0000000000000..af643f5c5f3c2
--- /dev/null
+++ b/ports/samd/boards/SPARKFUN_SAMD51_THING_PLUS/board.json
@@ -0,0 +1,21 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [
+        "Battery Charging",
+        "Breadboard Friendly",
+        "Micro USB",
+        "QWIIC",
+        "SPI Flash"
+    ],
+    "images": [
+        "sparkfun_samd51_thing_plus.jpg"
+    ],
+    "mcu": "samd51",
+    "product": "Sparkfun SAMD51 Thing Plus",
+    "thumbnail": "",
+    "url": "https://www.sparkfun.com/products/14713",
+    "vendor": "Sparkfun"
+}
diff --git a/ports/samd/boards/SPARKFUN_SAMD51_THING_PLUS/mpconfigboard.h b/ports/samd/boards/SPARKFUN_SAMD51_THING_PLUS/mpconfigboard.h
new file mode 100644
index 0000000000000..e797ccca9da11
--- /dev/null
+++ b/ports/samd/boards/SPARKFUN_SAMD51_THING_PLUS/mpconfigboard.h
@@ -0,0 +1,4 @@
+#define MICROPY_HW_BOARD_NAME       "Sparkfun SAMD51 Thing Plus"
+#define MICROPY_HW_MCU_NAME         "SAMD51J20A"
+
+#define MICROPY_HW_XOSC32K          (1)
diff --git a/ports/samd/boards/SPARKFUN_SAMD51_THING_PLUS/mpconfigboard.mk b/ports/samd/boards/SPARKFUN_SAMD51_THING_PLUS/mpconfigboard.mk
new file mode 100644
index 0000000000000..9e5cf887dfce3
--- /dev/null
+++ b/ports/samd/boards/SPARKFUN_SAMD51_THING_PLUS/mpconfigboard.mk
@@ -0,0 +1,8 @@
+MCU_SERIES = SAMD51
+CMSIS_MCU = SAMD51J20A
+LD_FILES = boards/samd51x20a.ld sections.ld
+TEXT0 = 0x4000
+
+# The ?='s allow overriding in mpconfigboard.mk.
+# MicroPython settings
+MICROPY_VFS_LFS1 ?= 1
diff --git a/ports/samd/boards/SPARKFUN_SAMD51_THING_PLUS/pins.csv b/ports/samd/boards/SPARKFUN_SAMD51_THING_PLUS/pins.csv
new file mode 100644
index 0000000000000..b60fb909714e1
--- /dev/null
+++ b/ports/samd/boards/SPARKFUN_SAMD51_THING_PLUS/pins.csv
@@ -0,0 +1,42 @@
+# Pin rows contain Pin number and pin name.
+# Pin rows start with PIN_
+# LED rows start with LED_
+# If the pin name is omitted, the pin number is added as name.
+# Rows for empty entries have to start with '-'
+# Empty lines and lines not starting with PIN_ or LED_ are ignored
+
+PIN_PA13,D0
+PIN_PA12,D1
+PIN_PB23,RXD
+PIN_PB22,TXD
+PIN_PA06,D4
+PIN_PA15,D5
+PIN_PA20,D6
+PIN_PA21,D7
+-
+PIN_PA07,D9
+PIN_PA18,D10
+PIN_PA16,D11
+PIN_PA19,D12
+PIN_PA17,D13
+PIN_PA02,A0
+PIN_PB08,A1
+PIN_PB09,A2
+PIN_PA04,A3
+PIN_PA05,A4
+PIN_PB02,A5
+PIN_PA22,SDA
+PIN_PA23,SCL
+PIN_PB12,MOSI
+PIN_PB11,MISO
+PIN_PB13,SCK
+PIN_PA08,FLASH_MOSI
+PIN_PA09,FLASH_SCK
+PIN_PA10,FLASH_CS
+PIN_PA11,FLASH_MISO
+PIN_PA30,SWDCLK
+PIN_PA31,SWDIO
+
+LED_PA17,LED
+LED_PB03,RXLED
+LED_PA27,TXLED
diff --git a/ports/samd/boards/samd51x20a.ld b/ports/samd/boards/samd51x20a.ld
new file mode 100644
index 0000000000000..f0d5e5c6aeb60
--- /dev/null
+++ b/ports/samd/boards/samd51x20a.ld
@@ -0,0 +1,20 @@
+/*
+    GNU linker script for SAMD51x20
+*/
+
+/* Specify the memory areas */
+MEMORY
+{
+    FLASH (rx)  : ORIGIN = 0x00004000, LENGTH = 1024K - 16K
+    RAM (xrw)   : ORIGIN = 0x20000000, LENGTH = 256K
+}
+
+/* Top end of the stack, with room for double-tap variable */
+_estack = ORIGIN(RAM) + LENGTH(RAM) - 8;
+_sstack = _estack - 16K;
+
+_oflash_fs = ORIGIN(FLASH) + 384K - 16K;
+_sflash_fs = LENGTH(FLASH) - 384K + 16K - 1;
+
+_sheap = _ebss;
+_eheap = _sstack;

From a7113e95d78583a47f8074965e17d1e0499e0494 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Thu, 7 Jul 2022 09:49:51 +0200
Subject: [PATCH 2768/3533] samd/modmachine: Add machine.dht_readinto and
 enable on SAMD51.

---
 ports/samd/mcu/samd51/mpconfigmcu.h  | 1 +
 ports/samd/mcu/samd51/mpconfigmcu.mk | 2 ++
 ports/samd/modmachine.c              | 4 ++++
 ports/samd/mphalport.h               | 3 +++
 4 files changed, 10 insertions(+)

diff --git a/ports/samd/mcu/samd51/mpconfigmcu.h b/ports/samd/mcu/samd51/mpconfigmcu.h
index 819bc1bb11b72..a266adf93cad8 100644
--- a/ports/samd/mcu/samd51/mpconfigmcu.h
+++ b/ports/samd/mcu/samd51/mpconfigmcu.h
@@ -13,6 +13,7 @@
 #define MP_NEED_LOG2                    (1)
 #define MICROPY_PY_CMATH                (0)
 
+#define MICROPY_PY_MACHINE_DHT_READINTO (1)
 #define MICROPY_PY_UOS_URANDOM          (1)
 #define MICROPY_PY_URANDOM_SEED_INIT_FUNC (trng_random_u32())
 unsigned long trng_random_u32(void);
diff --git a/ports/samd/mcu/samd51/mpconfigmcu.mk b/ports/samd/mcu/samd51/mpconfigmcu.mk
index f8ed02f841d9d..ed4df82c69121 100644
--- a/ports/samd/mcu/samd51/mpconfigmcu.mk
+++ b/ports/samd/mcu/samd51/mpconfigmcu.mk
@@ -2,6 +2,8 @@ MICROPY_VFS_LFS2 ?= 1
 
 SRC_S += shared/runtime/gchelper_m3.s
 
+SRC_C += drivers/dht/dht.c \
+
 LIBM_SRC_C +=  $(addprefix lib/libm/,\
 	acoshf.c \
 	asinfacosf.c \
diff --git a/ports/samd/modmachine.c b/ports/samd/modmachine.c
index db3f159cc2c37..14baf279d549c 100644
--- a/ports/samd/modmachine.c
+++ b/ports/samd/modmachine.c
@@ -30,6 +30,7 @@
 #include "extmod/machine_pulse.h"
 #include "extmod/machine_i2c.h"
 #include "extmod/machine_spi.h"
+#include "drivers/dht/dht.h"
 #include "modmachine.h"
 #include "samd_soc.h"
 
@@ -179,6 +180,9 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_reset_cause),         MP_ROM_PTR(&machine_reset_cause_obj) },
     { MP_ROM_QSTR(MP_QSTR_time_pulse_us),       MP_ROM_PTR(&machine_time_pulse_us_obj) },
     { MP_ROM_QSTR(MP_QSTR_bitstream),           MP_ROM_PTR(&machine_bitstream_obj) },
+    #if MICROPY_PY_MACHINE_DHT_READINTO
+    { MP_ROM_QSTR(MP_QSTR_dht_readinto),        MP_ROM_PTR(&dht_readinto_obj) },
+    #endif
 
     // Class constants.
     // Use numerical constants instead of the symbolic names,
diff --git a/ports/samd/mphalport.h b/ports/samd/mphalport.h
index 6f4f838cfba2f..3879240f9a6a1 100644
--- a/ports/samd/mphalport.h
+++ b/ports/samd/mphalport.h
@@ -99,6 +99,9 @@ static inline uint64_t mp_hal_time_ns(void) {
 #define MP_HAL_PIN_FMT "%u"
 #define mp_hal_pin_obj_t uint
 
+#define mp_hal_quiet_timing_enter() MICROPY_BEGIN_ATOMIC_SECTION()
+#define mp_hal_quiet_timing_exit(irq_state) MICROPY_END_ATOMIC_SECTION(irq_state)
+
 extern uint32_t machine_pin_open_drain_mask[];
 
 mp_hal_pin_obj_t mp_hal_get_pin_obj(mp_obj_t pin_in);

From fe31fca462011785cf78b4730bf34bb552e9a707 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Tue, 21 Jun 2022 14:27:20 +0200
Subject: [PATCH 2769/3533] samd/mcu/samd51: Enable onewire support for SAMD51.

---
 ports/samd/mcu/samd51/mpconfigmcu.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/samd/mcu/samd51/mpconfigmcu.h b/ports/samd/mcu/samd51/mpconfigmcu.h
index a266adf93cad8..5735f512b5a79 100644
--- a/ports/samd/mcu/samd51/mpconfigmcu.h
+++ b/ports/samd/mcu/samd51/mpconfigmcu.h
@@ -14,6 +14,7 @@
 #define MICROPY_PY_CMATH                (0)
 
 #define MICROPY_PY_MACHINE_DHT_READINTO (1)
+#define MICROPY_PY_ONEWIRE              (1)
 #define MICROPY_PY_UOS_URANDOM          (1)
 #define MICROPY_PY_URANDOM_SEED_INIT_FUNC (trng_random_u32())
 unsigned long trng_random_u32(void);

From 4c9e4c3310faff5ec05b183454df88d0f33f9e78 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sun, 10 Jul 2022 12:04:14 +0200
Subject: [PATCH 2770/3533] samd/mcu/samd51: Enable FAT support for SAMD51.

Tested with a SD card connected to a SAMD51 board.  The SEEED WIO terminal
has a SD-Card reader built-in.

Also a side change to remove a few obsolete lines from Makefile.
---
 ports/samd/Makefile                  |  4 ---
 ports/samd/fatfs_port.c              | 41 ++++++++++++++++++++++++++++
 ports/samd/mcu/samd51/mpconfigmcu.h  |  6 ++++
 ports/samd/mcu/samd51/mpconfigmcu.mk |  5 +++-
 ports/samd/modutime.c                |  2 +-
 5 files changed, 52 insertions(+), 6 deletions(-)
 create mode 100644 ports/samd/fatfs_port.c

diff --git a/ports/samd/Makefile b/ports/samd/Makefile
index 2f97b1993e99a..abec4e83a5539 100644
--- a/ports/samd/Makefile
+++ b/ports/samd/Makefile
@@ -61,7 +61,6 @@ CFLAGS_MCU_SAMD51 = -mtune=cortex-m4 -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-a
 CFLAGS += $(INC) -Wall -Werror -std=c99 -nostdlib -mthumb $(CFLAGS_MCU_$(MCU_SERIES)) -fsingle-precision-constant -Wdouble-promotion
 CFLAGS += -DMCU_$(MCU_SERIES) -D__$(CMSIS_MCU)__
 CFLAGS += $(CFLAGS_EXTRA)
-CFLAGS += -DMPCONFIG_MCU_H='<boards/mpconfig_$(MCU_SERIES_LOWER).h>'
 
 LDFLAGS += -nostdlib $(addprefix -T,$(LD_FILES)) -Map=$@.map --cref
 
@@ -169,9 +168,6 @@ CFLAGS += -DMICROPY_MODULE_FROZEN_STR
 CFLAGS += -DMICROPY_QSTR_EXTRA_POOL=mp_qstr_frozen_const_pool
 endif
 
-# Workaround for bug in older gcc, warning on "static usbd_device_t _usbd_dev = { 0 };"
-$(BUILD)/lib/tinyusb/src/device/usbd.o: CFLAGS += -Wno-missing-braces
-
 all: $(BUILD)/firmware.uf2
 
 $(BUILD)/firmware.elf: $(OBJ)
diff --git a/ports/samd/fatfs_port.c b/ports/samd/fatfs_port.c
new file mode 100644
index 0000000000000..9ee1764ebc0a9
--- /dev/null
+++ b/ports/samd/fatfs_port.c
@@ -0,0 +1,41 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013, 2014 Damien P. George
+ * Copyright (c) 2021 Robert Hammelrath
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "mphalport.h"
+#include "py/runtime.h"
+#include "shared/timeutils/timeutils.h"
+#include "lib/oofatfs/ff.h"
+
+extern uint32_t time_offset;
+
+MP_WEAK DWORD get_fattime(void) {
+    timeutils_struct_time_t tm;
+
+    timeutils_seconds_since_epoch_to_struct_time(mp_hal_ticks_ms_64() / 1000 + time_offset, &tm);
+    return ((tm.tm_year - 1980) << 25) | ((tm.tm_mon) << 21) | ((tm.tm_mday) << 16) |
+           ((tm.tm_hour) << 11) | ((tm.tm_min) << 5) | (tm.tm_sec / 2);
+}
diff --git a/ports/samd/mcu/samd51/mpconfigmcu.h b/ports/samd/mcu/samd51/mpconfigmcu.h
index 5735f512b5a79..686cfd6104df0 100644
--- a/ports/samd/mcu/samd51/mpconfigmcu.h
+++ b/ports/samd/mcu/samd51/mpconfigmcu.h
@@ -22,6 +22,12 @@ unsigned long trng_random_u32(void);
 // Due to a limitation in the TC counter for us, the ticks period is 2**29
 #define MICROPY_PY_UTIME_TICKS_PERIOD   (0x20000000)
 
+// fatfs configuration used in ffconf.h
+#define MICROPY_FATFS_ENABLE_LFN            (1)
+#define MICROPY_FATFS_RPATH                 (2)
+#define MICROPY_FATFS_MAX_SS                (4096)
+#define MICROPY_FATFS_LFN_CODE_PAGE         437 /* 1=SFN/ANSI 437=LFN/U.S.(OEM) */
+
 #define VFS_BLOCK_SIZE_BYTES            (1536) //
 
 #define MICROPY_HW_UART_TXBUF           (1)
diff --git a/ports/samd/mcu/samd51/mpconfigmcu.mk b/ports/samd/mcu/samd51/mpconfigmcu.mk
index ed4df82c69121..305e780b8787f 100644
--- a/ports/samd/mcu/samd51/mpconfigmcu.mk
+++ b/ports/samd/mcu/samd51/mpconfigmcu.mk
@@ -1,8 +1,11 @@
 MICROPY_VFS_LFS2 ?= 1
+MICROPY_VFS_FAT ?= 1
 
 SRC_S += shared/runtime/gchelper_m3.s
 
-SRC_C += drivers/dht/dht.c \
+SRC_C += \
+	fatfs_port.c \
+	drivers/dht/dht.c \
 
 LIBM_SRC_C +=  $(addprefix lib/libm/,\
 	acoshf.c \
diff --git a/ports/samd/modutime.c b/ports/samd/modutime.c
index a54544e62c6ca..4169c15d91172 100644
--- a/ports/samd/modutime.c
+++ b/ports/samd/modutime.c
@@ -29,7 +29,7 @@
 #include "shared/timeutils/timeutils.h"
 #include "mphalport.h"
 
-static uint32_t time_offset = 0;
+uint32_t time_offset = 0;
 
 // localtime([secs])
 STATIC mp_obj_t time_localtime(size_t n_args, const mp_obj_t *args) {

From 03075a68399a6450fd0e238dd75314805f8365b7 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Mon, 1 Aug 2022 17:23:11 +0200
Subject: [PATCH 2771/3533] samd/modmachine: Implement machine.lightsleep().

Which just sets the CPU clock to 200kHz and switches the peripheral clock
off.  There are two modes:

    machine.lightsleep(duration_ms)

and

    machine.lightsleep()

In any mode any configured pin.irq() event will terminate the sleep.

Current consumption in lightsleep for some boards:
- 1.5 - 2.5 mA when supplied trough an active USB
  (Seeed XIAO w/o power LED, Adafruit ItsyBitsy)
- 0.8 - 2 mA when supplied through Gnd/+5V (Vusb)
  (Seeed XIAO w/o power LED, Adafruit ItsyBitsy)
- < 1 mA for SAMD51 when supplied trough a battery connector
  (Sparkfun Thing SAMD51 plus)

Related change: move the calls to SysTick_Config() into set_cpu_freq().  It
is required after each CPU freq change to have ticks_ms run at the proper
rate.
---
 ports/samd/machine_pin.c             |  3 ++
 ports/samd/mcu/samd21/clock_config.c |  1 +
 ports/samd/mcu/samd51/clock_config.c |  1 +
 ports/samd/modmachine.c              | 61 +++++++++++++++++++++++++++-
 ports/samd/samd_soc.c                |  1 -
 5 files changed, 65 insertions(+), 2 deletions(-)

diff --git a/ports/samd/machine_pin.c b/ports/samd/machine_pin.c
index fc72c8f7569fb..2dc10f9b46344 100644
--- a/ports/samd/machine_pin.c
+++ b/ports/samd/machine_pin.c
@@ -57,6 +57,8 @@ typedef struct _machine_pin_irq_obj_t {
 
 STATIC const mp_irq_methods_t machine_pin_irq_methods;
 
+bool EIC_occured;
+
 uint32_t machine_pin_open_drain_mask[4];
 
 // Open drain behaviour is simulated.
@@ -410,6 +412,7 @@ void EIC_Handler() {
     for (int eic_id = 0; eic_id < 16; eic_id++, mask <<= 1) {
         // Did the ISR fire?
         if (isr & mask) {
+            EIC_occured = true;
             EIC->INTFLAG.reg |= mask; // clear the ISR flag
             machine_pin_irq_obj_t *irq = MP_STATE_PORT(machine_pin_irq_objects[eic_id]);
             if (irq != NULL) {
diff --git a/ports/samd/mcu/samd21/clock_config.c b/ports/samd/mcu/samd21/clock_config.c
index 204a5294f2576..a4011c05cbbc7 100644
--- a/ports/samd/mcu/samd21/clock_config.c
+++ b/ports/samd/mcu/samd21/clock_config.c
@@ -81,6 +81,7 @@ void set_cpu_freq(uint32_t cpu_freq_arg) {
     }
     // Set 0 waitstates for slower CPU clock
     NVMCTRL->CTRLB.reg = NVMCTRL_CTRLB_MANW | NVMCTRL_CTRLB_RWS(cpu_freq > 24000000 ? 1 : 0);
+    SysTick_Config(cpu_freq / 1000);
 }
 
 void check_usb_recovery_mode(void) {
diff --git a/ports/samd/mcu/samd51/clock_config.c b/ports/samd/mcu/samd51/clock_config.c
index 9fb48705adcba..f67d297e8eb1d 100644
--- a/ports/samd/mcu/samd51/clock_config.c
+++ b/ports/samd/mcu/samd51/clock_config.c
@@ -112,6 +112,7 @@ void set_cpu_freq(uint32_t cpu_freq_arg) {
         while (GCLK->SYNCBUSY.bit.GENCTRL5) {
         }
     }
+    SysTick_Config(cpu_freq / 1000);
 }
 
 void check_usb_recovery_mode(void) {
diff --git a/ports/samd/modmachine.c b/ports/samd/modmachine.c
index 14baf279d549c..2a8e34a966a8d 100644
--- a/ports/samd/modmachine.c
+++ b/ports/samd/modmachine.c
@@ -50,6 +50,10 @@
 #define DBL_TAP_MAGIC_LOADER 0xf01669ef
 #define DBL_TAP_MAGIC_RESET 0xf02669ef
 
+#define LIGHTSLEEP_CPU_FREQ 200000
+
+extern bool EIC_occured;
+
 STATIC mp_obj_t machine_reset(void) {
     *DBL_TAP_ADDR = DBL_TAP_MAGIC_RESET;
     NVIC_SystemReset();
@@ -71,7 +75,6 @@ STATIC mp_obj_t machine_freq(size_t n_args, const mp_obj_t *args) {
         uint32_t freq = mp_obj_get_int(args[0]);
         if (freq >= 1000000 && freq <= MAX_CPU_FREQ) {
             set_cpu_freq(freq);
-            SysTick_Config(get_cpu_freq() / 1000);
         }
         return mp_const_none;
     }
@@ -151,6 +154,60 @@ STATIC mp_obj_t machine_reset_cause(void) {
 }
 MP_DEFINE_CONST_FUN_OBJ_0(machine_reset_cause_obj, machine_reset_cause);
 
+STATIC mp_obj_t machine_lightsleep(size_t n_args, const mp_obj_t *args) {
+    int32_t duration = -1;
+    uint32_t freq = get_cpu_freq();
+    if (n_args > 0) {
+        duration = mp_obj_get_int(args[0]);
+    }
+    EIC_occured = false;
+    // Slow down
+    set_cpu_freq(LIGHTSLEEP_CPU_FREQ);
+    #if defined(MCU_SAMD21)
+    // Switch the peripheral clock off
+    GCLK->GENCTRL.reg = GCLK_GENCTRL_ID(2);
+    while (GCLK->STATUS.bit.SYNCBUSY) {
+    }
+    // Switch the EIC temporarily to GCLK3, since GCLK2 is off
+    GCLK->CLKCTRL.reg = GCLK_CLKCTRL_CLKEN | GCLK_CLKCTRL_GEN_GCLK3 | EIC_GCLK_ID;
+    if (duration > 0) {
+        uint32_t t0 = systick_ms;
+        while ((systick_ms - t0 < duration) && (EIC_occured == false)) {
+            __WFI();
+        }
+    } else {
+        while (EIC_occured == false) {
+            __WFI();
+        }
+    }
+    GCLK->CLKCTRL.reg = GCLK_CLKCTRL_CLKEN | GCLK_CLKCTRL_GEN_GCLK2 | EIC_GCLK_ID;
+
+    #elif defined(MCU_SAMD51)
+    // Switch the peripheral clock off
+    GCLK->GENCTRL[2].reg = 0;
+    while (GCLK->SYNCBUSY.bit.GENCTRL2) {
+    }
+    // Switch the EIC temporarily to GCLK3, since GCLK2 is off
+    GCLK->PCHCTRL[EIC_GCLK_ID].reg = GCLK_PCHCTRL_CHEN | GCLK_PCHCTRL_GEN_GCLK3;
+    if (duration > 0) {
+        uint32_t t0 = systick_ms;
+        while ((systick_ms - t0 < duration) && (EIC_occured == false)) {
+            __WFI();
+        }
+    } else {
+        while (EIC_occured == false) {
+            __WFI();
+        }
+    }
+    GCLK->PCHCTRL[EIC_GCLK_ID].reg = GCLK_PCHCTRL_CHEN | GCLK_PCHCTRL_GEN_GCLK2;
+
+    #endif
+    // Speed up again
+    set_cpu_freq(freq);
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_lightsleep_obj, 0, 1, machine_lightsleep);
+
 STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__),            MP_ROM_QSTR(MP_QSTR_umachine) },
     { MP_ROM_QSTR(MP_QSTR_reset),               MP_ROM_PTR(&machine_reset_obj) },
@@ -179,6 +236,8 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_enable_irq),          MP_ROM_PTR(&machine_enable_irq_obj) },
     { MP_ROM_QSTR(MP_QSTR_reset_cause),         MP_ROM_PTR(&machine_reset_cause_obj) },
     { MP_ROM_QSTR(MP_QSTR_time_pulse_us),       MP_ROM_PTR(&machine_time_pulse_us_obj) },
+    { MP_ROM_QSTR(MP_QSTR_lightsleep),          MP_ROM_PTR(&machine_lightsleep_obj) },
+
     { MP_ROM_QSTR(MP_QSTR_bitstream),           MP_ROM_PTR(&machine_bitstream_obj) },
     #if MICROPY_PY_MACHINE_DHT_READINTO
     { MP_ROM_QSTR(MP_QSTR_dht_readinto),        MP_ROM_PTR(&dht_readinto_obj) },
diff --git a/ports/samd/samd_soc.c b/ports/samd/samd_soc.c
index 6d8348ebcd833..3608306e87194 100644
--- a/ports/samd/samd_soc.c
+++ b/ports/samd/samd_soc.c
@@ -108,7 +108,6 @@ void init_us_counter(void) {
 
 void samd_init(void) {
     init_clocks(get_cpu_freq());
-    SysTick_Config(get_cpu_freq() / 1000);
     init_us_counter();
     usb_init();
     check_usb_recovery_mode();

From f0399d35e4f7ad4e48b22f02b80a7ee506c9ec64 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Thu, 11 Aug 2022 11:22:58 +0200
Subject: [PATCH 2772/3533] samd/modmachine: Get the bootloader magic address
 from the lib.

Instead of being hard-coded, and then it works for all MCUs.

That fits except for a Sparkfun SAMD51 Thing Plus (known) bug, which uses
192k - 4 as magic address.  Therefore, that address is set as well to avoid
a problem when this bug is fixed by Sparkfun.
---
 .../SPARKFUN_SAMD51_THING_PLUS/mpconfigboard.h     |  6 ++++++
 ports/samd/modmachine.c                            | 14 +++++++++++---
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/ports/samd/boards/SPARKFUN_SAMD51_THING_PLUS/mpconfigboard.h b/ports/samd/boards/SPARKFUN_SAMD51_THING_PLUS/mpconfigboard.h
index e797ccca9da11..a51b71c363e18 100644
--- a/ports/samd/boards/SPARKFUN_SAMD51_THING_PLUS/mpconfigboard.h
+++ b/ports/samd/boards/SPARKFUN_SAMD51_THING_PLUS/mpconfigboard.h
@@ -2,3 +2,9 @@
 #define MICROPY_HW_MCU_NAME         "SAMD51J20A"
 
 #define MICROPY_HW_XOSC32K          (1)
+
+// There seems to be an inconsistency in the SAMD51 Thing bootloader in that
+// the bootloader magic address is at the end of a 192k RAM area, instead of
+// 256k. Since the SAMD51x20A has 256k RAM, the loader symbol is at that address
+// and so there is a fix here using the previous definition.
+#define DBL_TAP_ADDR_ALT    ((volatile uint32_t *)(HSRAM_ADDR + HSRAM_SIZE - 0x10000 - 4))
diff --git a/ports/samd/modmachine.c b/ports/samd/modmachine.c
index 2a8e34a966a8d..ce5fef76f753c 100644
--- a/ports/samd/modmachine.c
+++ b/ports/samd/modmachine.c
@@ -41,21 +41,26 @@
 #include "hpl_pm_base.h"
 
 #if MICROPY_PY_MACHINE
-
 #if defined(MCU_SAMD21)
-#define DBL_TAP_ADDR ((volatile uint32_t *)(0x20000000 + 32 * 1024 - 4))
+#define DBL_TAP_ADDR    ((volatile uint32_t *)(HMCRAMC0_ADDR + HMCRAMC0_SIZE - 4))
 #elif defined(MCU_SAMD51)
-#define DBL_TAP_ADDR ((volatile uint32_t *)(0x20000000 + 192 * 1024 - 4))
+#define DBL_TAP_ADDR    ((volatile uint32_t *)(HSRAM_ADDR + HSRAM_SIZE - 4))
 #endif
+// A board may define a DPL_TAP_ADDR_ALT, which will be set as well
+// Needed at the moment for Sparkfun SAMD51 Thing Plus
 #define DBL_TAP_MAGIC_LOADER 0xf01669ef
 #define DBL_TAP_MAGIC_RESET 0xf02669ef
 
 #define LIGHTSLEEP_CPU_FREQ 200000
 
 extern bool EIC_occured;
+extern uint32_t _dbl_tap_addr;
 
 STATIC mp_obj_t machine_reset(void) {
     *DBL_TAP_ADDR = DBL_TAP_MAGIC_RESET;
+    #ifdef DBL_TAP_ADDR_ALT
+    *DBL_TAP_ADDR_ALT = DBL_TAP_MAGIC_RESET;
+    #endif
     NVIC_SystemReset();
     return mp_const_none;
 }
@@ -63,6 +68,9 @@ MP_DEFINE_CONST_FUN_OBJ_0(machine_reset_obj, machine_reset);
 
 STATIC mp_obj_t machine_bootloader(void) {
     *DBL_TAP_ADDR = DBL_TAP_MAGIC_LOADER;
+    #ifdef DBL_TAP_ADDR_ALT
+    *DBL_TAP_ADDR_ALT = DBL_TAP_MAGIC_LOADER;
+    #endif
     NVIC_SystemReset();
     return mp_const_none;
 }

From ddd41b8bbf6823ea730e781d508babbecdd41304 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sat, 13 Aug 2022 17:33:04 +0200
Subject: [PATCH 2773/3533] samd/clock_config: Document the #defines use in
 init_clocks().

Which may be set in the respective mpconfigboard.h files.
---
 ports/samd/mcu/samd21/clock_config.c | 34 +++++++++++++++++++++++
 ports/samd/mcu/samd51/clock_config.c | 40 ++++++++++++++++++++++++++++
 2 files changed, 74 insertions(+)

diff --git a/ports/samd/mcu/samd21/clock_config.c b/ports/samd/mcu/samd21/clock_config.c
index a4011c05cbbc7..a195cb6920536 100644
--- a/ports/samd/mcu/samd21/clock_config.c
+++ b/ports/samd/mcu/samd21/clock_config.c
@@ -96,6 +96,40 @@ void check_usb_recovery_mode(void) {
     #endif // MICROPY_HW_XOSC32K
 }
 
+// Purpose of the #defines for the clock configuration.
+//
+// Both CPU and periperal devices are clocked by the DFLL48M clock.
+// DFLL48M is either free running, or controlled by the 32kHz crystal, or
+// Synchronized with the USB clock.
+//
+// #define MICROPY_HW_XOSC32K (0 | 1)
+//
+// If MICROPY_HW_XOSC32K = 1, the 32kHz crystal is used as input for GCLK 1, which
+// serves as refernce clock source for the DFLL48M oscillator,
+// The crystal is used, unless MICROPY_HW_MCU_OSC32KULP is set.
+// In that case GCLK1 (and the CPU clock) is driven by the 32K Low power oscillator.
+// The reason for offering this option is a design flaw of the Adafruit
+// Feather boards, where the RGB Led and Debug signals interfere with the
+// crystal, causing the CPU to fail if it is driven by the crystal.
+//
+// If MICROPY_HW_XOSC32K = 0, the 32kHz signal for GCLK1 (and the CPU) is
+// created by dividing the 48MHz clock of DFLL48M, but not used otherwise.
+//
+// If MICROPY_HW_DFLL_USB_SYNC = 0, the DFLL48M oscillator is free running using
+// the pre-configured trim values. In that mode, the peripheral clock is
+// not exactly 48Mhz and has a substantional temperature drift.
+//
+// If MICROPY_HW_DFLL_USB_SYNC = 1, the DFLL48 is synchronized with the 1 kHz USB sync
+// signal. If after boot there is no USB sync withing 500ms, the configuratuion falls
+// back to a free running 48Mhz oscillator.
+//
+// In all modes, the 48MHz signal has a substantial jitter, largest when
+// MICROPY_HW_DFLL_USB_SYNC is active. That is caused by the repective
+// reference frequencies of 32kHz or 1 kHz being low. That affects most
+// PWM. Std Dev at 1kHz 0.156Hz (w. Crystal) up to 0.4 Hz (with USB sync).
+//
+// If none of the mentioned defines is set, the device uses the internal oscillators.
+
 void init_clocks(uint32_t cpu_freq) {
 
     dfll48m_calibration = 0; // please the compiler
diff --git a/ports/samd/mcu/samd51/clock_config.c b/ports/samd/mcu/samd51/clock_config.c
index f67d297e8eb1d..3bc4616de9e9d 100644
--- a/ports/samd/mcu/samd51/clock_config.c
+++ b/ports/samd/mcu/samd51/clock_config.c
@@ -142,6 +142,46 @@ void check_usb_recovery_mode(void) {
     #endif // MICROPY_HW_XOSC32K
 }
 
+// Purpose of the #defines for the clock configuration.
+//
+// The CPU clock is generated by DPLL0, which takes 32768 Hz as reference frequency,
+// supplied through GCLK1.
+//
+// DFLL48M is used for the peripheral clock, e.g. for PWM, UART, SPI, I2C.
+// DFLL48M is either free running, or controlled by the 32kHz crystal, or
+// Synchronized with the USB clock.
+//
+// GCLK1 takes it's input either from the 32kHz crystal, the internal low power
+// RC oscillator or from DFLL48M.
+//
+// #define MICROPY_HW_XOSC32K (0 | 1)
+//
+// If MICROPY_HW_XOSC32K = 1, the 32kHz crystal is used for the DFLL48M oscillator
+// and for GCLK1, feeding the CPU, unless MICROPY_HW_MCU_OSC32KULP is set.
+// In that case GCLK1 (and the CPU clock) is driven by the 32K Low power oscillator.
+// The reason for offering this option is a design flaw of the Adafruit
+// Feather boards, where the RGB Led and Debug signals interfere with the
+// crystal, causing the CPU to fail if it is driven by the crystal. The
+// peripheral devices are affected as well, but continue it's operation.
+//
+// If MICROPY_HW_XOSC32K = 0, the 32kHz signal for GCLK1 (and the CPU) is
+// created by dividing the 48MHz clock of DFLL48M.
+//
+// If MICROPY_HW_DFLL_USB_SYNC = 0, the DFLL48M oscillator is free running using
+// the pre-configured trim values. In that mode, the peripheral clock is
+// not exactly 48Mhz and has a substantional temperature drift.
+//
+// If MICROPY_HW_DFLL_USB_SYNC = 1, the DFLL48 is synchronized with the 1 kHz USB sync
+// signal. If after boot there is no USB sync withing 500ms, the configuratuion falls
+// back to a free running 48Mhz oscillator.
+//
+// In all modes, the 48MHz signal has a substantial jitter, largest when
+// MICROPY_HW_DFLL_USB_SYNC is active. That is caused by the repective
+// reference frequencies of 32kHz or 1 kHz being low. That affects most
+// PWM. Std Dev at 1kHz 0.156Hz (w. Crystal) up to 0.4 Hz (with USB sync).
+//
+// If none of the mentioned defines is set, the device uses the internal oscillators.
+
 void init_clocks(uint32_t cpu_freq) {
 
     dfll48m_calibration = 0; // please the compiler

From 2251cb774b7b7db12323a32b339903fa27ff7b08 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Thu, 18 Aug 2022 11:58:09 +0200
Subject: [PATCH 2774/3533] samd/machine_uart: Implement uart.txdone() and
 uart.flush().

Using the stream method for uart.flush().

uart.txdone() returns True, if the uart not busy, False otherwise.

uart.flush() waits until all bytes have been transmitted or a timeout
triggers.  The timeout is determined by the buffer size and the baud rate.

Also fix two inconsistencies when not using txbuf:
- Report in ioctl as being writeable if there is room in the tx buffer,
  only if it is configured.
- Print the txbuf size if configured.
---
 ports/samd/machine_uart.c | 53 ++++++++++++++++++++++++++++++++++++---
 1 file changed, 49 insertions(+), 4 deletions(-)

diff --git a/ports/samd/machine_uart.c b/ports/samd/machine_uart.c
index 1031f26c26488..76b564e874a66 100644
--- a/ports/samd/machine_uart.c
+++ b/ports/samd/machine_uart.c
@@ -116,9 +116,17 @@ void sercom_enable(Sercom *uart, int state) {
 STATIC void machine_uart_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     machine_uart_obj_t *self = MP_OBJ_TO_PTR(self_in);
     mp_printf(print, "UART(%u, baudrate=%u, bits=%u, parity=%s, stop=%u, "
-        "timeout=%u, timeout_char=%u, rxbuf=%d)",
+        "timeout=%u, timeout_char=%u, rxbuf=%d"
+        #if MICROPY_HW_UART_TXBUF
+        ", txbuf=%d"
+        #endif
+        ")",
         self->id, self->baudrate, self->bits, _parity_name[self->parity],
-        self->stop + 1, self->timeout, self->timeout_char, self->read_buffer.size - 1);
+        self->stop + 1, self->timeout, self->timeout_char, self->read_buffer.size - 1
+        #if MICROPY_HW_UART_TXBUF
+        , self->write_buffer.size - 1
+        #endif
+        );
 }
 
 STATIC mp_obj_t machine_uart_init_helper(machine_uart_obj_t *self, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
@@ -385,6 +393,22 @@ STATIC mp_obj_t machine_uart_sendbreak(mp_obj_t self_in) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_uart_sendbreak_obj, machine_uart_sendbreak);
 
+STATIC mp_obj_t machine_uart_txdone(mp_obj_t self_in) {
+    machine_uart_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    Sercom *uart = sercom_instance[self->id];
+
+    if (uart->USART.INTFLAG.bit.DRE
+        #if MICROPY_HW_UART_TXBUF
+        && ringbuf_avail(&self->write_buffer) == 0
+        #endif
+        && uart->USART.INTFLAG.bit.TXC) {
+        return mp_const_true;
+    } else {
+        return mp_const_false;
+    }
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_uart_txdone_obj, machine_uart_txdone);
+
 void uart_deinit_all(void) {
     for (int i = 0; i < SERCOM_INST_NUM; i++) {
         if (uart_table[i] != NULL) {
@@ -399,7 +423,9 @@ STATIC const mp_rom_map_elem_t machine_uart_locals_dict_table[] = {
 
     { MP_ROM_QSTR(MP_QSTR_any), MP_ROM_PTR(&machine_uart_any_obj) },
     { MP_ROM_QSTR(MP_QSTR_sendbreak), MP_ROM_PTR(&machine_uart_sendbreak_obj) },
+    { MP_ROM_QSTR(MP_QSTR_txdone), MP_ROM_PTR(&machine_uart_txdone_obj) },
 
+    { MP_ROM_QSTR(MP_QSTR_flush), MP_ROM_PTR(&mp_stream_flush_obj) },
     { MP_ROM_QSTR(MP_QSTR_read), MP_ROM_PTR(&mp_stream_read_obj) },
     { MP_ROM_QSTR(MP_QSTR_readline), MP_ROM_PTR(&mp_stream_unbuffered_readline_obj) },
     { MP_ROM_QSTR(MP_QSTR_readinto), MP_ROM_PTR(&mp_stream_readinto_obj) },
@@ -414,7 +440,6 @@ STATIC mp_uint_t machine_uart_read(mp_obj_t self_in, void *buf_in, mp_uint_t siz
     uint8_t *dest = buf_in;
     Sercom *uart = sercom_instance[self->id];
 
-    // t.b.d. Cater timeout for timer wrap after 50 days.
     for (size_t i = 0; i < size; i++) {
         // Wait for the first/next character
         while (ringbuf_avail(&self->read_buffer) == 0) {
@@ -488,9 +513,29 @@ STATIC mp_uint_t machine_uart_ioctl(mp_obj_t self_in, mp_uint_t request, mp_uint
         if ((flags & MP_STREAM_POLL_RD) && (uart->USART.INTFLAG.bit.RXC != 0 || ringbuf_avail(&self->read_buffer) > 0)) {
             ret |= MP_STREAM_POLL_RD;
         }
-        if ((flags & MP_STREAM_POLL_WR) && (uart->USART.INTFLAG.bit.DRE != 0)) {
+        if ((flags & MP_STREAM_POLL_WR) && (uart->USART.INTFLAG.bit.DRE != 0
+                                            #if MICROPY_HW_UART_TXBUF
+                                            || ringbuf_avail(&self->write_buffer) > 0
+                                            #endif
+                                            )) {
             ret |= MP_STREAM_POLL_WR;
         }
+    } else if (request == MP_STREAM_FLUSH) {
+        // The timeout is defined by the buffer size and the baudrate.
+        // Take the worst case assumtions at 13 bit symbol size times 2.
+        uint64_t timeout = mp_hal_ticks_ms_64() + (3
+            #if MICROPY_HW_UART_TXBUF
+            + self->write_buffer.size
+            #endif
+            ) * 13000 * 2 / self->baudrate;
+        do {
+            if (machine_uart_txdone((mp_obj_t)self) == mp_const_true) {
+                return 0;
+            }
+            MICROPY_EVENT_POLL_HOOK
+        } while (mp_hal_ticks_ms_64() < timeout);
+        *errcode = MP_ETIMEDOUT;
+        ret = MP_STREAM_ERROR;
     } else {
         *errcode = MP_EINVAL;
         ret = MP_STREAM_ERROR;

From be31fde012e0cf522ec9d70f50923a0a899f438c Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Thu, 8 Sep 2022 17:55:08 +0200
Subject: [PATCH 2775/3533] samd/mcu: Make some settings in mpconfigmcu.h
 conditional.

And set the default for MICROPY_PY_MATH as 1 for both MCU types.
---
 ports/samd/mcu/samd21/mpconfigmcu.h  | 13 ++++++++++++-
 ports/samd/mcu/samd21/mpconfigmcu.mk | 29 ++++++++++++++++++++++++++++
 ports/samd/mcu/samd51/mpconfigmcu.h  | 11 +++++++++++
 3 files changed, 52 insertions(+), 1 deletion(-)

diff --git a/ports/samd/mcu/samd21/mpconfigmcu.h b/ports/samd/mcu/samd21/mpconfigmcu.h
index e0af60552b022..8d155f93ab032 100644
--- a/ports/samd/mcu/samd21/mpconfigmcu.h
+++ b/ports/samd/mcu/samd21/mpconfigmcu.h
@@ -9,13 +9,24 @@
 #define MICROPY_MODULE_BUILTIN_INIT     (1)
 
 #define MICROPY_FLOAT_IMPL              (MICROPY_FLOAT_IMPL_FLOAT)
+
+#ifndef MICROPY_PY_BUILTINS_COMPLEX
 #define MICROPY_PY_BUILTINS_COMPLEX     (0)
-#define MICROPY_PY_MATH                 (0)
+#endif
+
+#ifndef MICROPY_PY_MATH
+#define MICROPY_PY_MATH                 (1)
+#endif
+
+#ifndef MICROPY_PY_CMATH
 #define MICROPY_PY_CMATH                (0)
+#endif
 
 #define VFS_BLOCK_SIZE_BYTES            (1536) // 24x 64B flash pages;
 
+#ifndef MICROPY_HW_UART_TXBUF
 #define MICROPY_HW_UART_TXBUF           (1)
+#endif
 
 #define CPU_FREQ                        (48000000)
 #define DFLL48M_FREQ                    (48000000)
diff --git a/ports/samd/mcu/samd21/mpconfigmcu.mk b/ports/samd/mcu/samd21/mpconfigmcu.mk
index cc435da8cc913..287d6d18be7bd 100644
--- a/ports/samd/mcu/samd21/mpconfigmcu.mk
+++ b/ports/samd/mcu/samd21/mpconfigmcu.mk
@@ -1 +1,30 @@
 SRC_S += shared/runtime/gchelper_m0.s
+
+LIBM_SRC_C +=  $(addprefix lib/libm/,\
+	acoshf.c \
+	asinfacosf.c \
+	asinhf.c \
+	atan2f.c \
+	atanf.c \
+	atanhf.c \
+	ef_rem_pio2.c \
+	erf_lgamma.c \
+	fmodf.c \
+	kf_cos.c \
+	kf_rem_pio2.c \
+	kf_sin.c \
+	kf_tan.c \
+	log1pf.c \
+	math.c \
+	nearbyintf.c \
+	roundf.c \
+	sf_cos.c \
+	sf_erf.c \
+	sf_frexp.c \
+	sf_ldexp.c \
+	sf_modf.c \
+	sf_sin.c \
+	sf_tan.c \
+	wf_lgamma.c \
+	wf_tgamma.c \
+	)
diff --git a/ports/samd/mcu/samd51/mpconfigmcu.h b/ports/samd/mcu/samd51/mpconfigmcu.h
index 686cfd6104df0..666370c983b72 100644
--- a/ports/samd/mcu/samd51/mpconfigmcu.h
+++ b/ports/samd/mcu/samd51/mpconfigmcu.h
@@ -8,10 +8,19 @@
 #define MICROPY_EMIT_INLINE_THUMB       (1)
 
 #define MICROPY_FLOAT_IMPL              (MICROPY_FLOAT_IMPL_FLOAT)
+
+#ifndef MICROPY_PY_BUILTINS_COMPLEX
 #define MICROPY_PY_BUILTINS_COMPLEX     (0)
+#endif
+
+#ifndef MICROPY_PY_MATH
 #define MICROPY_PY_MATH                 (1)
 #define MP_NEED_LOG2                    (1)
+#endif
+
+#ifndef MICROPY_PY_CMATH
 #define MICROPY_PY_CMATH                (0)
+#endif
 
 #define MICROPY_PY_MACHINE_DHT_READINTO (1)
 #define MICROPY_PY_ONEWIRE              (1)
@@ -30,7 +39,9 @@ unsigned long trng_random_u32(void);
 
 #define VFS_BLOCK_SIZE_BYTES            (1536) //
 
+#ifndef MICROPY_HW_UART_TXBUF
 #define MICROPY_HW_UART_TXBUF           (1)
+#endif
 
 #define CPU_FREQ                        (120000000)
 #define DFLL48M_FREQ                    (48000000)

From fc9d66fac64422a6a6ea4a79bfd8b2460cc8e9e8 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Thu, 15 Sep 2022 15:58:54 +0200
Subject: [PATCH 2776/3533] samd/machine_rtc: Add the machine.RTC class.

Methods implemented are:
- rtc.init(date)
- rtc.datetime([new_date])
- rtc.calibration(value)

The presence of this class can be controlled by MICROPY_PY_MACHINE_RTC.  If
the RTC module is used, the time module uses the RTC as well.

For boards without a 32kHz crystal, using RTC makes no sense, since it will
then use the ULP32K oscillator, which is not precise at all.  Therefore, it
will by default only be enabled for boards using a crystal, but can be
enabled in the respective mpconfigboard.h.
---
 ports/samd/Makefile                  |   1 +
 ports/samd/fatfs_port.c              |   6 +-
 ports/samd/machine_rtc.c             | 181 +++++++++++++++++++++++++++
 ports/samd/mcu/samd21/clock_config.c |  17 ++-
 ports/samd/mcu/samd21/mpconfigmcu.h  |   6 +
 ports/samd/mcu/samd51/clock_config.c |  20 +--
 ports/samd/mcu/samd51/mpconfigmcu.h  |   6 +
 ports/samd/modmachine.c              |   3 +
 ports/samd/modmachine.h              |   3 +
 ports/samd/modutime.c                |  30 ++++-
 ports/samd/samd_soc.c                |   7 ++
 11 files changed, 263 insertions(+), 17 deletions(-)
 create mode 100644 ports/samd/machine_rtc.c

diff --git a/ports/samd/Makefile b/ports/samd/Makefile
index abec4e83a5539..e6e592a0352bf 100644
--- a/ports/samd/Makefile
+++ b/ports/samd/Makefile
@@ -94,6 +94,7 @@ SRC_C += \
 	machine_i2c.c \
 	machine_led.c \
 	machine_pin.c \
+	machine_rtc.c \
 	machine_spi.c \
 	machine_timer.c \
 	machine_uart.c \
diff --git a/ports/samd/fatfs_port.c b/ports/samd/fatfs_port.c
index 9ee1764ebc0a9..a3e3f1b67b3a9 100644
--- a/ports/samd/fatfs_port.c
+++ b/ports/samd/fatfs_port.c
@@ -33,9 +33,13 @@
 extern uint32_t time_offset;
 
 MP_WEAK DWORD get_fattime(void) {
+    #if MICROPY_PY_MACHINE_RTC
+    return (RTC->MODE2.CLOCK.reg >> 1) + (20 << 25);
+    #else
+    extern void rtc_gettime(timeutils_struct_time_t *tm);
     timeutils_struct_time_t tm;
-
     timeutils_seconds_since_epoch_to_struct_time(mp_hal_ticks_ms_64() / 1000 + time_offset, &tm);
     return ((tm.tm_year - 1980) << 25) | ((tm.tm_mon) << 21) | ((tm.tm_mday) << 16) |
            ((tm.tm_hour) << 11) | ((tm.tm_min) << 5) | (tm.tm_sec / 2);
+    #endif
 }
diff --git a/ports/samd/machine_rtc.c b/ports/samd/machine_rtc.c
new file mode 100644
index 0000000000000..57bfa998e583b
--- /dev/null
+++ b/ports/samd/machine_rtc.c
@@ -0,0 +1,181 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021 Damien P. George
+ * Copyright (c) 2022 "Robert Hammelrath" <robert@hammelrath.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "py/runtime.h"
+#include "shared/timeutils/timeutils.h"
+#include "modmachine.h"
+#include "py/mphal.h"
+#include "sam.h"
+
+#if MICROPY_PY_MACHINE_RTC
+
+typedef struct _machine_rtc_obj_t {
+    mp_obj_base_t base;
+    mp_obj_t callback;
+} machine_rtc_obj_t;
+
+// Singleton RTC object.
+STATIC const machine_rtc_obj_t machine_rtc_obj = {{&machine_rtc_type}};
+
+// Start the RTC Timer.
+void machine_rtc_start(bool force) {
+    #if defined(MCU_SAMD21)
+
+    if (RTC->MODE2.CTRL.bit.ENABLE == 0 || force) {
+        // Enable the 1k Clock
+        GCLK->CLKCTRL.reg = GCLK_CLKCTRL_CLKEN | GCLK_CLKCTRL_GEN_GCLK8 | GCLK_CLKCTRL_ID_RTC;
+
+        RTC->MODE2.CTRL.reg = RTC_MODE2_CTRL_SWRST;
+        while (RTC->MODE2.STATUS.bit.SYNCBUSY) {
+        }
+        RTC->MODE2.CTRL.reg =
+            RTC_MODE2_CTRL_MODE_CLOCK |
+            RTC_MODE2_CTRL_PRESCALER_DIV1024 |
+            RTC_MODE2_CTRL_ENABLE;
+        while (RTC->MODE2.STATUS.bit.SYNCBUSY) {
+        }
+    }
+
+    #elif defined(MCU_SAMD51)
+
+    if (RTC->MODE2.CTRLA.bit.ENABLE == 0 || force) {
+        RTC->MODE2.CTRLA.reg = RTC_MODE2_CTRLA_SWRST;
+        while (RTC->MODE2.SYNCBUSY.bit.SWRST) {
+        }
+        RTC->MODE2.CTRLA.reg =
+            RTC_MODE2_CTRLA_MODE_CLOCK |
+            RTC_MODE2_CTRLA_CLOCKSYNC |
+            RTC_MODE2_CTRLA_PRESCALER_DIV1024 |
+            RTC_MODE2_CTRLA_ENABLE;
+        while (RTC->MODE2.SYNCBUSY.bit.ENABLE) {
+        }
+    }
+    #endif
+}
+
+// Get the time from the RTC and put it into a tm struct.
+void rtc_gettime(timeutils_struct_time_t *tm) {
+    tm->tm_year = RTC->MODE2.CLOCK.bit.YEAR + 2000;
+    tm->tm_mon = RTC->MODE2.CLOCK.bit.MONTH;
+    tm->tm_mday = RTC->MODE2.CLOCK.bit.DAY;
+    tm->tm_hour = RTC->MODE2.CLOCK.bit.HOUR;
+    tm->tm_min = RTC->MODE2.CLOCK.bit.MINUTE;
+    tm->tm_sec = RTC->MODE2.CLOCK.bit.SECOND;
+}
+
+STATIC mp_obj_t machine_rtc_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
+    // Check arguments.
+    mp_arg_check_num(n_args, n_kw, 0, 0, false);
+    // RTC was already started at boot time. So nothing to do here.
+    // Return constant object.
+    return (mp_obj_t)&machine_rtc_obj;
+}
+
+STATIC mp_obj_t machine_rtc_datetime_helper(size_t n_args, const mp_obj_t *args) {
+    // Rtc *rtc = RTC;
+    if (n_args == 1) {
+        // Get date and time.
+        timeutils_struct_time_t tm;
+        rtc_gettime(&tm);
+
+        mp_obj_t tuple[8] = {
+            mp_obj_new_int(tm.tm_year),
+            mp_obj_new_int(tm.tm_mon),
+            mp_obj_new_int(tm.tm_mday),
+            mp_obj_new_int(timeutils_calc_weekday(tm.tm_year, tm.tm_mon, tm.tm_mday)),
+            mp_obj_new_int(tm.tm_hour),
+            mp_obj_new_int(tm.tm_min),
+            mp_obj_new_int(tm.tm_sec),
+            mp_obj_new_int(0),
+        };
+        return mp_obj_new_tuple(8, tuple);
+    } else {
+        // Set date and time.
+        mp_obj_t *items;
+        mp_obj_get_array_fixed_n(args[1], 8, &items);
+
+        uint32_t date =
+            RTC_MODE2_CLOCK_YEAR(mp_obj_get_int(items[0]) % 100) |
+            RTC_MODE2_CLOCK_MONTH(mp_obj_get_int(items[1])) |
+            RTC_MODE2_CLOCK_DAY(mp_obj_get_int(items[2])) |
+            RTC_MODE2_CLOCK_HOUR(mp_obj_get_int(items[4])) |
+            RTC_MODE2_CLOCK_MINUTE(mp_obj_get_int(items[5])) |
+            RTC_MODE2_CLOCK_SECOND(mp_obj_get_int(items[6]));
+
+        RTC->MODE2.CLOCK.reg = date;
+        #if defined(MCU_SAMD21)
+        while (RTC->MODE2.STATUS.bit.SYNCBUSY) {
+        }
+        #elif defined(MCU_SAMD51)
+        while (RTC->MODE2.SYNCBUSY.bit.CLOCKSYNC) {
+        }
+        #endif
+
+        return mp_const_none;
+    }
+}
+
+STATIC mp_obj_t machine_rtc_datetime(mp_uint_t n_args, const mp_obj_t *args) {
+    return machine_rtc_datetime_helper(n_args, args);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_rtc_datetime_obj, 1, 2, machine_rtc_datetime);
+
+STATIC mp_obj_t machine_rtc_init(mp_obj_t self_in, mp_obj_t date) {
+    mp_obj_t args[2] = {self_in, date};
+    machine_rtc_datetime_helper(2, args);
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(machine_rtc_init_obj, machine_rtc_init);
+
+// calibration(cal)
+// When the argument is a number in the range [-16 to 15], set the calibration value.
+STATIC mp_obj_t machine_rtc_calibration(mp_obj_t self_in, mp_obj_t cal_in) {
+    int8_t cal = 0;
+    // Make it negative for a "natural" behavior:
+    // value > 0: faster, value < 0: slower
+    cal = -mp_obj_get_int(cal_in);
+    RTC->MODE2.FREQCORR.reg = (uint8_t)cal;
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(machine_rtc_calibration_obj, machine_rtc_calibration);
+
+STATIC const mp_rom_map_elem_t machine_rtc_locals_dict_table[] = {
+    { MP_ROM_QSTR(MP_QSTR_init), MP_ROM_PTR(&machine_rtc_init_obj) },
+    { MP_ROM_QSTR(MP_QSTR_datetime), MP_ROM_PTR(&machine_rtc_datetime_obj) },
+    { MP_ROM_QSTR(MP_QSTR_calibration), MP_ROM_PTR(&machine_rtc_calibration_obj) },
+};
+STATIC MP_DEFINE_CONST_DICT(machine_rtc_locals_dict, machine_rtc_locals_dict_table);
+
+MP_DEFINE_CONST_OBJ_TYPE(
+    machine_rtc_type,
+    MP_QSTR_RTC,
+    MP_TYPE_FLAG_NONE,
+    make_new, machine_rtc_make_new,
+    locals_dict, &machine_rtc_locals_dict
+    );
+
+#endif // MICROPY_PY_MACHINE_RTC
diff --git a/ports/samd/mcu/samd21/clock_config.c b/ports/samd/mcu/samd21/clock_config.c
index a195cb6920536..00f743cc49d15 100644
--- a/ports/samd/mcu/samd21/clock_config.c
+++ b/ports/samd/mcu/samd21/clock_config.c
@@ -141,7 +141,7 @@ void init_clocks(uint32_t cpu_freq) {
     // GCLK3: 1Mhz for the us-counter (TC4/TC5)
     // GCLK4: 32kHz from crystal, if present
     // GCLK5: 48MHz from DFLL for USB
-    // GCLK8: 1kHz clock for WDT
+    // GCLK8: 1kHz clock for WDT and RTC
 
     NVMCTRL->CTRLB.bit.MANW = 1; // errata "Spurious Writes"
     NVMCTRL->CTRLB.bit.RWS = 1; // 1 read wait state for 48MHz
@@ -203,6 +203,11 @@ void init_clocks(uint32_t cpu_freq) {
         SYSCTRL_DFLLCTRL_BPLCKC | SYSCTRL_DFLLCTRL_ENABLE;
     while (SYSCTRL->PCLKSR.bit.DFLLLCKF == 0) {
     }
+    // Set GCLK8 to 1 kHz.
+    GCLK->GENDIV.reg = GCLK_GENDIV_ID(8) | GCLK_GENDIV_DIV(32);
+    GCLK->GENCTRL.reg = GCLK_GENCTRL_GENEN | GCLK_GENCTRL_SRC_XOSC32K | GCLK_GENCTRL_ID(8);
+    while (GCLK->STATUS.bit.SYNCBUSY) {
+    }
 
     #else // MICROPY_HW_XOSC32K
 
@@ -242,6 +247,11 @@ void init_clocks(uint32_t cpu_freq) {
     GCLK->GENCTRL.reg = GCLK_GENCTRL_GENEN | GCLK_GENCTRL_SRC_DFLL48M | GCLK_GENCTRL_ID(1);
     while (GCLK->STATUS.bit.SYNCBUSY) {
     }
+    // Set GCLK8 to 1 kHz.
+    GCLK->GENDIV.reg = GCLK_GENDIV_ID(8) | GCLK_GENDIV_DIV(32);
+    GCLK->GENCTRL.reg = GCLK_GENCTRL_GENEN | GCLK_GENCTRL_SRC_OSCULP32K | GCLK_GENCTRL_ID(8);
+    while (GCLK->STATUS.bit.SYNCBUSY) {
+    }
 
     #endif // MICROPY_HW_XOSC32K
 
@@ -252,11 +262,6 @@ void init_clocks(uint32_t cpu_freq) {
     GCLK->GENCTRL.reg = GCLK_GENCTRL_GENEN | GCLK_GENCTRL_SRC_DFLL48M | GCLK_GENCTRL_ID(3);
     while (GCLK->STATUS.bit.SYNCBUSY) {
     }
-    // Set GCLK8 to 1 kHz.
-    GCLK->GENDIV.reg = GCLK_GENDIV_ID(8) | GCLK_GENDIV_DIV(32);
-    GCLK->GENCTRL.reg = GCLK_GENCTRL_GENEN | GCLK_GENCTRL_SRC_OSCULP32K | GCLK_GENCTRL_ID(8);
-    while (GCLK->STATUS.bit.SYNCBUSY) {
-    }
 }
 
 void enable_sercom_clock(int id) {
diff --git a/ports/samd/mcu/samd21/mpconfigmcu.h b/ports/samd/mcu/samd21/mpconfigmcu.h
index 8d155f93ab032..331df8e2130a0 100644
--- a/ports/samd/mcu/samd21/mpconfigmcu.h
+++ b/ports/samd/mcu/samd21/mpconfigmcu.h
@@ -28,6 +28,12 @@
 #define MICROPY_HW_UART_TXBUF           (1)
 #endif
 
+#ifndef MICROPY_PY_MACHINE_RTC
+#if MICROPY_HW_XOSC32K
+#define MICROPY_PY_MACHINE_RTC          (1)
+#endif
+#endif
+
 #define CPU_FREQ                        (48000000)
 #define DFLL48M_FREQ                    (48000000)
 #define MAX_CPU_FREQ                    (48000000)
diff --git a/ports/samd/mcu/samd51/clock_config.c b/ports/samd/mcu/samd51/clock_config.c
index 3bc4616de9e9d..c5f508cae8b6f 100644
--- a/ports/samd/mcu/samd51/clock_config.c
+++ b/ports/samd/mcu/samd51/clock_config.c
@@ -215,16 +215,19 @@ void init_clocks(uint32_t cpu_freq) {
 
     #if MICROPY_HW_XOSC32K
     // OSCILLATOR CONTROL
+    // Enable the clock for RTC
+    OSC32KCTRL->RTCCTRL.reg = OSC32KCTRL_RTCCTRL_RTCSEL_XOSC1K;
     // Setup XOSC32K
     OSC32KCTRL->INTFLAG.reg = OSC32KCTRL_INTFLAG_XOSC32KRDY | OSC32KCTRL_INTFLAG_XOSC32KFAIL;
-    OSC32KCTRL->XOSC32K.bit.CGM = OSC32KCTRL_XOSC32K_CGM_HS_Val;
-    OSC32KCTRL->XOSC32K.bit.XTALEN = 1; // 0: Generator 1: Crystal
-    OSC32KCTRL->XOSC32K.bit.EN32K = 1;
-    OSC32KCTRL->XOSC32K.bit.ONDEMAND = 0;
-    OSC32KCTRL->XOSC32K.bit.RUNSTDBY = 1;
-    OSC32KCTRL->XOSC32K.bit.STARTUP = 4;
     OSC32KCTRL->CFDCTRL.bit.CFDEN = 1; // Fall back to internal Osc on crystal fail
-    OSC32KCTRL->XOSC32K.bit.ENABLE = 1;
+    OSC32KCTRL->XOSC32K.reg =
+        OSC32KCTRL_XOSC32K_CGM_HS |
+        OSC32KCTRL_XOSC32K_XTALEN |
+        OSC32KCTRL_XOSC32K_EN32K |
+        OSC32KCTRL_XOSC32K_EN1K |
+        OSC32KCTRL_XOSC32K_RUNSTDBY |
+        OSC32KCTRL_XOSC32K_STARTUP(4) |
+        OSC32KCTRL_XOSC32K_ENABLE;
     // make sure osc32kcrtl is ready
     while (OSC32KCTRL->STATUS.bit.XOSC32KRDY == 0) {
     }
@@ -270,6 +273,9 @@ void init_clocks(uint32_t cpu_freq) {
 
     #else // MICROPY_HW_XOSC32K
 
+    // Enable the clock for RTC
+    OSC32KCTRL->RTCCTRL.reg = OSC32KCTRL_RTCCTRL_RTCSEL_ULP1K;
+
     // Derive GCLK1 from DFLL48M at DPLL0_REF_FREQ as defined in mpconfigboard.h (e.g. 32768 Hz)
     GCLK->GENCTRL[1].reg = ((DFLL48M_FREQ + DPLLx_REF_FREQ / 2) / DPLLx_REF_FREQ) << GCLK_GENCTRL_DIV_Pos
         | GCLK_GENCTRL_GENEN | GCLK_GENCTRL_SRC_DFLL;
diff --git a/ports/samd/mcu/samd51/mpconfigmcu.h b/ports/samd/mcu/samd51/mpconfigmcu.h
index 666370c983b72..541fba9009f3a 100644
--- a/ports/samd/mcu/samd51/mpconfigmcu.h
+++ b/ports/samd/mcu/samd51/mpconfigmcu.h
@@ -28,6 +28,12 @@
 #define MICROPY_PY_URANDOM_SEED_INIT_FUNC (trng_random_u32())
 unsigned long trng_random_u32(void);
 
+#ifndef MICROPY_PY_MACHINE_RTC
+#if MICROPY_HW_XOSC32K
+#define MICROPY_PY_MACHINE_RTC          (1)
+#endif
+#endif
+
 // Due to a limitation in the TC counter for us, the ticks period is 2**29
 #define MICROPY_PY_UTIME_TICKS_PERIOD   (0x20000000)
 
diff --git a/ports/samd/modmachine.c b/ports/samd/modmachine.c
index ce5fef76f753c..12e9f7c34134c 100644
--- a/ports/samd/modmachine.c
+++ b/ports/samd/modmachine.c
@@ -238,6 +238,9 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_Timer),               MP_ROM_PTR(&machine_timer_type) },
     { MP_ROM_QSTR(MP_QSTR_UART),                MP_ROM_PTR(&machine_uart_type) },
     { MP_ROM_QSTR(MP_QSTR_WDT),                 MP_ROM_PTR(&machine_wdt_type) },
+    #if MICROPY_PY_MACHINE_RTC
+    { MP_ROM_QSTR(MP_QSTR_RTC),                 MP_ROM_PTR(&machine_rtc_type) },
+    #endif
 
     { MP_ROM_QSTR(MP_QSTR_idle),                MP_ROM_PTR(&machine_idle_obj) },
     { MP_ROM_QSTR(MP_QSTR_disable_irq),         MP_ROM_PTR(&machine_disable_irq_obj) },
diff --git a/ports/samd/modmachine.h b/ports/samd/modmachine.h
index e99ca990fbba3..8f85e149896f3 100644
--- a/ports/samd/modmachine.h
+++ b/ports/samd/modmachine.h
@@ -38,5 +38,8 @@ extern const mp_obj_type_t machine_spi_type;
 extern const mp_obj_type_t machine_timer_type;
 extern const mp_obj_type_t machine_uart_type;
 extern const mp_obj_type_t machine_wdt_type;
+#if MICROPY_PY_MACHINE_RTC
+extern const mp_obj_type_t machine_rtc_type;
+#endif
 
 #endif // MICROPY_INCLUDED_SAMD_MODMACHINE_H
diff --git a/ports/samd/modutime.c b/ports/samd/modutime.c
index 4169c15d91172..6b04134497fb8 100644
--- a/ports/samd/modutime.c
+++ b/ports/samd/modutime.c
@@ -29,20 +29,34 @@
 #include "shared/timeutils/timeutils.h"
 #include "mphalport.h"
 
+#if !MICROPY_PY_MACHINE_RTC
 uint32_t time_offset = 0;
+#endif // !MICROPY_PY_MACHINE_RTC
 
 // localtime([secs])
 STATIC mp_obj_t time_localtime(size_t n_args, const mp_obj_t *args) {
     timeutils_struct_time_t tm;
     mp_int_t seconds;
+
+    #if MICROPY_PY_MACHINE_RTC
+    extern void rtc_gettime(timeutils_struct_time_t *tm);
+    if (n_args == 0 || args[0] == mp_const_none) {
+        rtc_gettime(&tm);
+    } else {
+        seconds = mp_obj_get_int(args[0]);
+        timeutils_seconds_since_epoch_to_struct_time(seconds, &tm);
+    }
+
+    #else
     if (n_args == 0 || args[0] == mp_const_none) {
-        // seconds = pyb_rtc_get_us_since_epoch() / 1000 / 1000;
         seconds = mp_hal_ticks_ms_64() / 1000 + time_offset;
     } else {
         seconds = mp_obj_get_int(args[0]);
         time_offset = seconds - mp_hal_ticks_ms_64() / 1000;
     }
     timeutils_seconds_since_epoch_to_struct_time(seconds, &tm);
+
+    #endif // MICROPY_PY_MACHINE_RTC
     mp_obj_t tuple[8] = {
         tuple[0] = mp_obj_new_int(tm.tm_year),
         tuple[1] = mp_obj_new_int(tm.tm_mon),
@@ -50,8 +64,8 @@ STATIC mp_obj_t time_localtime(size_t n_args, const mp_obj_t *args) {
         tuple[3] = mp_obj_new_int(tm.tm_hour),
         tuple[4] = mp_obj_new_int(tm.tm_min),
         tuple[5] = mp_obj_new_int(tm.tm_sec),
-        tuple[6] = mp_obj_new_int(tm.tm_wday),
-        tuple[7] = mp_obj_new_int(tm.tm_yday),
+        tuple[6] = mp_obj_new_int(timeutils_calc_weekday(tm.tm_year, tm.tm_mon, tm.tm_mday)),
+        tuple[7] = mp_obj_new_int(timeutils_year_day(tm.tm_year, tm.tm_mon, tm.tm_mday)),
     };
     return mp_obj_new_tuple(8, tuple);
 }
@@ -76,7 +90,17 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(time_mktime_obj, time_mktime);
 
 // time()
 STATIC mp_obj_t time_time(void) {
+    #if MICROPY_PY_MACHINE_RTC
+    extern void rtc_gettime(timeutils_struct_time_t *tm);
+    timeutils_struct_time_t tm;
+    rtc_gettime(&tm);
+    return mp_obj_new_int_from_uint(timeutils_mktime(
+        tm.tm_year, tm.tm_mon, tm.tm_mday, tm.tm_hour, tm.tm_min, tm.tm_sec));
+
+    #else
     return mp_obj_new_int_from_uint(mp_hal_ticks_ms_64() / 1000 + time_offset);
+
+    #endif // MICROPY_PY_MACHINE_RTC
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_0(time_time_obj, time_time);
 
diff --git a/ports/samd/samd_soc.c b/ports/samd/samd_soc.c
index 3608306e87194..bd3eea536fdbb 100644
--- a/ports/samd/samd_soc.c
+++ b/ports/samd/samd_soc.c
@@ -38,6 +38,10 @@
 #include "tusb.h"
 #include "mphalport.h"
 
+#if MICROPY_PY_MACHINE_RTC
+extern void machine_rtc_start(bool force);
+#endif
+
 static void usb_init(void) {
     // Init USB clock
     #if defined(MCU_SAMD21)
@@ -114,4 +118,7 @@ void samd_init(void) {
     #if defined(MCU_SAMD51)
     mp_hal_ticks_cpu_enable();
     #endif
+    #if MICROPY_PY_MACHINE_RTC
+    machine_rtc_start(false);
+    #endif
 }

From e33db80a5958772095a16b0b3753ed3aa72d07b2 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Thu, 29 Sep 2022 16:13:23 +0200
Subject: [PATCH 2777/3533] samd/clock_config: Extend the SAMD51 us-counter to
 60 bit.

This removes the difference in the time.ticks_us() range between SAMD21 and
SAMD51.

The function mp_hal_ticks_us_64() is added and used for:
- SAMD51's mp_hal_ticks_us and mp_hal_delay_us().
  For SAMD21, keep the previous methods, which are faster.
- mp_hal_ticks_ms() and mp_hal_tick_ms_64(), which saves some bytes
  and removes a potential race condition every 50 days.

Also set the us-counter for SAMD51 to 16 MHz for a faster reading of the
microsecond value.

Note: With SAMD51, mp_hal_ticks_us_64() has a 60 bit range only, which is
still a long time (~36000 years).
---
 ports/samd/mcu/samd51/clock_config.c |  8 +++---
 ports/samd/mcu/samd51/mpconfigmcu.h  |  3 ---
 ports/samd/mphalport.c               | 40 ++++++++++++++++++++++++----
 ports/samd/mphalport.h               | 23 +++++-----------
 ports/samd/samd_isr.c                | 24 ++++++++++++-----
 ports/samd/samd_soc.c                |  8 +++++-
 6 files changed, 71 insertions(+), 35 deletions(-)

diff --git a/ports/samd/mcu/samd51/clock_config.c b/ports/samd/mcu/samd51/clock_config.c
index c5f508cae8b6f..b55419d24b67b 100644
--- a/ports/samd/mcu/samd51/clock_config.c
+++ b/ports/samd/mcu/samd51/clock_config.c
@@ -190,7 +190,7 @@ void init_clocks(uint32_t cpu_freq) {
     // GCLK0: 48MHz from DFLL48M or 48 - 200 MHz from DPLL0 (SAMD51)
     // GCLK1: 32768 Hz from 32KULP or DFLL48M
     // GCLK2: 8-48MHz from DFLL48M for Peripheral devices
-    // GCLK3: 8Mhz for the us-counter (TC0/TC1)
+    // GCLK3: 16Mhz for the us-counter (TC0/TC1)
     // GCLK4: 32kHz from crystal, if present
     // GCLK5: 48MHz from DFLL48M for USB
     // DPLL0: 48 - 200 MHz
@@ -204,7 +204,7 @@ void init_clocks(uint32_t cpu_freq) {
     // Setup DPLL0 to 120MHz
     // Setup GCLK0 to 120MHz
     // Setup GCLK2 to 48MHz for Peripherals
-    // Setup GCLK3 to 8MHz for TC0/TC1
+    // Setup GCLK3 to 16MHz for TC0/TC1
     // Setup GCLK4 to 32kHz crystal, if present
     // Setup GCLK5 to 48 MHz
 
@@ -320,8 +320,8 @@ void init_clocks(uint32_t cpu_freq) {
     while (GCLK->SYNCBUSY.bit.GENCTRL2) {
     }
 
-    // Setup GCLK3 for 8MHz, Used for TC0/1 counter
-    GCLK->GENCTRL[3].reg = GCLK_GENCTRL_DIV(6) | GCLK_GENCTRL_RUNSTDBY | GCLK_GENCTRL_GENEN | GCLK_GENCTRL_SRC_DFLL;
+    // Setup GCLK3 for 16MHz, Used for TC0/1 counter
+    GCLK->GENCTRL[3].reg = GCLK_GENCTRL_DIV(3) | GCLK_GENCTRL_RUNSTDBY | GCLK_GENCTRL_GENEN | GCLK_GENCTRL_SRC_DFLL;
     while (GCLK->SYNCBUSY.bit.GENCTRL3) {
     }
 }
diff --git a/ports/samd/mcu/samd51/mpconfigmcu.h b/ports/samd/mcu/samd51/mpconfigmcu.h
index 541fba9009f3a..16b2c101f02b9 100644
--- a/ports/samd/mcu/samd51/mpconfigmcu.h
+++ b/ports/samd/mcu/samd51/mpconfigmcu.h
@@ -34,9 +34,6 @@ unsigned long trng_random_u32(void);
 #endif
 #endif
 
-// Due to a limitation in the TC counter for us, the ticks period is 2**29
-#define MICROPY_PY_UTIME_TICKS_PERIOD   (0x20000000)
-
 // fatfs configuration used in ffconf.h
 #define MICROPY_FATFS_ENABLE_LFN            (1)
 #define MICROPY_FATFS_RPATH                 (2)
diff --git a/ports/samd/mphalport.c b/ports/samd/mphalport.c
index ad3817768f777..b60bada480b46 100644
--- a/ports/samd/mphalport.c
+++ b/ports/samd/mphalport.c
@@ -37,6 +37,8 @@
 #define MICROPY_HW_STDIN_BUFFER_LEN 128
 #endif
 
+extern volatile uint32_t ticks_us64_upper;
+
 STATIC uint8_t stdin_ringbuf_array[MICROPY_HW_STDIN_BUFFER_LEN];
 ringbuf_t stdin_ringbuf = { stdin_ringbuf_array, sizeof(stdin_ringbuf_array), 0, 0 };
 
@@ -111,19 +113,47 @@ void mp_hal_delay_ms(mp_uint_t ms) {
 
 void mp_hal_delay_us(mp_uint_t us) {
     if (us > 0) {
-        uint32_t start = mp_hal_ticks_us();
         #if defined(MCU_SAMD21)
-        // SAMD21 counter has effective 32 bit width
+        uint32_t start = mp_hal_ticks_us();
         while ((mp_hal_ticks_us() - start) < us) {
         }
-        #elif defined(MCU_SAMD51)
-        // SAMD51 counter has effective 29 bit width
-        while (((mp_hal_ticks_us() - start) & (MICROPY_PY_UTIME_TICKS_PERIOD - 1)) < us) {
+        #else
+        uint64_t stop = mp_hal_ticks_us_64() + us;
+        while (mp_hal_ticks_us_64() < stop) {
         }
         #endif
     }
 }
 
+uint64_t mp_hal_ticks_us_64(void) {
+    uint32_t us64_upper = ticks_us64_upper;
+    uint32_t us64_lower;
+    uint8_t intflag;
+    __disable_irq();
+    #if defined(MCU_SAMD21)
+    us64_lower = REG_TC4_COUNT32_COUNT;
+    intflag = TC4->COUNT32.INTFLAG.reg;
+    #elif defined(MCU_SAMD51)
+    TC0->COUNT32.CTRLBSET.reg = TC_CTRLBSET_CMD_READSYNC;
+    while (TC0->COUNT32.CTRLBSET.reg != 0) {
+    }
+    us64_lower = REG_TC0_COUNT32_COUNT;
+    intflag = TC0->COUNT32.INTFLAG.reg;
+    #endif
+    __enable_irq();
+    if ((intflag & TC_INTFLAG_OVF) && us64_lower < 0x10000000) {
+        // The timer counter overflowed before reading it but the IRQ handler
+        // has not yet been called, so perform the IRQ arithmetic now.
+        us64_upper++;
+    }
+    #if defined(MCU_SAMD21)
+    return ((uint64_t)us64_upper << 32) | us64_lower;
+    #elif defined(MCU_SAMD51)
+    return ((uint64_t)us64_upper << 28) | (us64_lower >> 4);
+    #endif
+
+}
+
 uintptr_t mp_hal_stdio_poll(uintptr_t poll_flags) {
     uintptr_t ret = 0;
 
diff --git a/ports/samd/mphalport.h b/ports/samd/mphalport.h
index 3879240f9a6a1..2cbb3333f60f6 100644
--- a/ports/samd/mphalport.h
+++ b/ports/samd/mphalport.h
@@ -37,7 +37,7 @@
 
 extern int mp_interrupt_char;
 extern volatile uint32_t systick_ms;
-extern volatile uint32_t systick_ms_upper;
+uint64_t mp_hal_ticks_us_64(void);
 
 void mp_hal_set_interrupt_char(int c);
 
@@ -47,28 +47,19 @@ void mp_hal_set_interrupt_char(int c);
 
 #define mp_hal_delay_us_fast  mp_hal_delay_us
 
-static inline mp_uint_t mp_hal_ticks_ms(void) {
-    return systick_ms;
+static inline uint64_t mp_hal_ticks_ms_64(void) {
+    return mp_hal_ticks_us_64() / 1000;
 }
 
-static inline uint64_t mp_hal_ticks_ms_64(void) {
-    return ((uint64_t)systick_ms_upper << 32) + systick_ms;
+static inline mp_uint_t mp_hal_ticks_ms(void) {
+    return (mp_uint_t)mp_hal_ticks_ms_64();
 }
 
 static inline mp_uint_t mp_hal_ticks_us(void) {
     #if defined(MCU_SAMD21)
-
     return REG_TC4_COUNT32_COUNT;
-
-    #elif defined(MCU_SAMD51)
-
-    TC0->COUNT32.CTRLBSET.reg = TC_CTRLBSET_CMD_READSYNC;
-    while (TC0->COUNT32.CTRLBSET.reg != 0) {
-    }
-    return REG_TC0_COUNT32_COUNT >> 3;
-
     #else
-    return systick_ms * 1000;
+    return (mp_uint_t)mp_hal_ticks_us_64();
     #endif
 }
 
@@ -89,7 +80,7 @@ static inline mp_uint_t mp_hal_ticks_cpu(void) {
 #endif
 
 static inline uint64_t mp_hal_time_ns(void) {
-    return mp_hal_ticks_ms_64() * 1000000;
+    return mp_hal_ticks_us_64() * 1000;
 }
 
 // C-level pin HAL
diff --git a/ports/samd/samd_isr.c b/ports/samd/samd_isr.c
index b507d5d1aa737..1d6febaaa226b 100644
--- a/ports/samd/samd_isr.c
+++ b/ports/samd/samd_isr.c
@@ -41,7 +41,7 @@ extern void EIC_Handler(void);
 
 const ISR isr_vector[];
 volatile uint32_t systick_ms;
-volatile uint32_t systick_ms_upper;
+volatile uint32_t ticks_us64_upper;
 
 void Reset_Handler(void) __attribute__((naked));
 void Reset_Handler(void) {
@@ -93,15 +93,27 @@ void Default_Handler(void) {
 void SysTick_Handler(void) {
     uint32_t next_tick = systick_ms + 1;
     systick_ms = next_tick;
-    if (systick_ms == 0) {
-        systick_ms_upper += 1;
-    }
 
     if (soft_timer_next == next_tick) {
         pendsv_schedule_dispatch(PENDSV_DISPATCH_SOFT_TIMER, soft_timer_handler);
     }
 }
 
+void us_timer_IRQ(void) {
+    #if defined(MCU_SAMD21)
+    if (TC4->COUNT32.INTFLAG.reg & TC_INTFLAG_OVF) {
+        ticks_us64_upper++;
+    }
+    TC4->COUNT32.INTFLAG.reg = TC_INTFLAG_OVF;
+    #elif defined(MCU_SAMD51)
+    if (TC0->COUNT32.INTFLAG.reg & TC_INTFLAG_OVF) {
+        ticks_us64_upper++;
+    }
+    TC0->COUNT32.INTFLAG.reg = TC_INTFLAG_OVF;
+    #endif
+}
+
+// Sercom IRQ handler support
 void (*sercom_irq_handler_table[SERCOM_INST_NUM])(int num) = {};
 
 void sercom_register_irq(int sercom_id, void (*sercom_irq_handler)) {
@@ -180,7 +192,7 @@ const ISR isr_vector[] __attribute__((section(".isr_vector"))) = {
     0,                  // 16 Timer Counter Control 1 (TCC1)
     0,                  // 17 Timer Counter Control 2 (TCC2)
     0,                  // 18 Basic Timer Counter 3 (TC3)
-    0,                  // 19 Basic Timer Counter 4 (TC4)
+    &us_timer_IRQ,      // 19 Basic Timer Counter 4 (TC4)
     0,                  // 20 Basic Timer Counter 5 (TC5)
     0,                  // 21 Basic Timer Counter 6 (TC6)
     0,                  // 22 Basic Timer Counter 7 (TC7)
@@ -316,7 +328,7 @@ const ISR isr_vector[] __attribute__((section(".isr_vector"))) = {
     0,                // 104 Timer Counter Control 4 (TCC4): TCC4_CNT_A ...
     0,                // 105 Timer Counter Control 4 (TCC4): TCC4_MC_0
     0,                // 106 Timer Counter Control 4 (TCC4): TCC4_MC_1
-    0,                // 107 Basic Timer Counter 0 (TC0)
+    &us_timer_IRQ,    // 107 Basic Timer Counter 0 (TC0)
     0,                // 108 Basic Timer Counter 1 (TC1)
     0,                // 109 Basic Timer Counter 2 (TC2)
     0,                // 110 Basic Timer Counter 3 (TC3)
diff --git a/ports/samd/samd_soc.c b/ports/samd/samd_soc.c
index bd3eea536fdbb..a81e7c68810da 100644
--- a/ports/samd/samd_soc.c
+++ b/ports/samd/samd_soc.c
@@ -68,7 +68,7 @@ static void usb_init(void) {
     tusb_init();
 }
 
-// Initialize the microsecond counter on TC 0/1
+// Initialize the µs counter on TC 0/1 or TC4/5
 void init_us_counter(void) {
     #if defined(MCU_SAMD21)
 
@@ -89,6 +89,9 @@ void init_us_counter(void) {
     TC4->COUNT32.READREQ.reg = TC_READREQ_RREQ | TC_READREQ_RCONT | 0x10;
     while (TC4->COUNT32.STATUS.bit.SYNCBUSY) {
     }
+    // Enable the IRQ
+    TC4->COUNT32.INTENSET.reg = TC_INTENSET_OVF;
+    NVIC_EnableIRQ(TC4_IRQn);
 
     #elif defined(MCU_SAMD51)
 
@@ -107,6 +110,9 @@ void init_us_counter(void) {
     while (TC0->COUNT32.SYNCBUSY.bit.ENABLE) {
     }
 
+    // Enable the IRQ
+    TC0->COUNT32.INTENSET.reg = TC_INTENSET_OVF;
+    NVIC_EnableIRQ(TC0_IRQn);
     #endif
 }
 

From e7aa9700cad4ace55fb9100c98b2bbfa811870d2 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Tue, 4 Oct 2022 13:39:43 +0200
Subject: [PATCH 2778/3533] samd/boards/SEEED_WIO_TERMINAL: Declare more pins
 for SEEED WIO board.

Defining all pins from the external 40 Pin connector, and some internal
pins like the one for SD and LCD.
---
 ports/samd/boards/SEEED_WIO_TERMINAL/pins.csv | 36 ++++++++++++++++++-
 1 file changed, 35 insertions(+), 1 deletion(-)

diff --git a/ports/samd/boards/SEEED_WIO_TERMINAL/pins.csv b/ports/samd/boards/SEEED_WIO_TERMINAL/pins.csv
index 72da71224a4d4..9bc57070d1985 100644
--- a/ports/samd/boards/SEEED_WIO_TERMINAL/pins.csv
+++ b/ports/samd/boards/SEEED_WIO_TERMINAL/pins.csv
@@ -22,9 +22,43 @@ PIN_PD20,SWITCH_U
 PIN_PC26,BUTTON_1
 PIN_PC27,BUTTON_2
 PIN_PC28,BUTTON_3
-PIN_PD11,BUZZER_CTR
 PIN_PC14,5V_ENABLE
 PIN_PC15,3V3_ENABLE
+PIN_PB26,TX
+PIN_PB27,RX
+PIN_PA13,SDA0
+PIN_PA12,SCL0
+PIN_PA17,SDA1
+PIN_PA16,SCL1
+PIN_PB02,MOSI
+PIN_PB00,MISO
+PIN_PB03,SCK
+PIN_PB01,CS
+PIN_PB15,GPCLK0
+PIN_PB12,GPCLK1
+PIN_PB13,GPCLK2
+PIN_PC16,SD_MOSI
+PIN_PC18,SD_MISO
+PIN_PC17,SD_SCK
+PIN_PC19,SD_CS
+PIN_PD21,SD_DET
+PIN_PA20,I2S_LRCLK
+PIN_PA21,I2S_SDIN
+PIN_PA22,I2S_SDOUT
+PIN_PB16,I2C_BCLK
+PIN_PB18,LCD_MISO
+PIN_PB19,LCD_MOSI
+PIN_PB20,LCD_SCK
+PIN_PB21,LCD_CS
+PIN_PC05,LCD_BACKLIGHT
+PIN_PC06,LCD_D/C
+PIN_PC07,LCD_RESET
+PIN_PC10,LCD_XL
+PIN_PC11,LCD_YU
+PIN_PC12,LCD_XR
+PIN_PC13,LCD_YD
+PIN_PC30,MIC
+PIN_PD11,BUZZER
 
 LED_PA15,LED_BLUE
 LED_PC05,LED_LCD

From e5cf3fab951adf39e7d39c2a8600b61f84e517ce Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sat, 17 Sep 2022 17:27:27 +0200
Subject: [PATCH 2779/3533] samd/machine_pin: Change the pin handling and
 naming/numbering.

Pin numbers are now the MCU port numbers in the range:

    PA0..PA31:  0..31
    PB0..PB31: 32..63
    PC0..PC31: 64..95
    PD0..PD31: 96..127

Pins can be denoted by the GPIO port number, the name as defined in
pins.csv or a string in the form Pxnn, like "PA16" or "PD03".

The pins.c and pins.h files are now obsolete.  The pin objects are part of
the AF table.

As result of a simplification, the code now supports using pin names or
numbers instead of pin objects for modules like UART, SPI, PWM, I2C, ADC,
pininfo.
---
 ports/samd/Makefile                           |  26 +---
 .../{make-pin-af.py => make-pin-table.py}     |  54 +++++++-
 ports/samd/boards/make-pins.py                | 128 ------------------
 ports/samd/machine_adc.c                      |   4 +-
 ports/samd/machine_led.c                      |  27 ++--
 ports/samd/machine_pin.c                      | 119 ++++++----------
 ports/samd/machine_pwm.c                      |   4 +-
 ports/samd/modsamd.c                          |  60 ++++----
 ports/samd/pin_af.c                           |  69 +++++++++-
 ports/samd/pin_af.h                           |  18 ++-
 10 files changed, 221 insertions(+), 288 deletions(-)
 rename ports/samd/boards/{make-pin-af.py => make-pin-table.py} (59%)
 delete mode 100644 ports/samd/boards/make-pins.py

diff --git a/ports/samd/Makefile b/ports/samd/Makefile
index e6e592a0352bf..f512fb0b2e339 100644
--- a/ports/samd/Makefile
+++ b/ports/samd/Makefile
@@ -47,14 +47,10 @@ INC += -I$(TOP)/lib/asf4/$(MCU_SERIES_LOWER)/include
 INC += -I$(TOP)/lib/asf4/$(MCU_SERIES_LOWER)/include/pio
 INC += -I$(TOP)/lib/tinyusb/src
 
-MAKE_PIN_AF = boards/make-pin-af.py
+MAKE_PIN_AF = boards/make-pin-table.py
 PIN_AF_TABLE_CSV = mcu/$(MCU_SERIES_LOWER)/pin-af-table.csv
-GEN_PIN_AF = pin_af_table.c
-
-MAKE_PINS = boards/make-pins.py
 BOARD_PINS = $(BOARD_DIR)/pins.csv
-GEN_PINS_SRC = $(BUILD)/pins.c
-GEN_PINS_HDR = $(BUILD)/pins.h
+GEN_PIN_AF = pin_af_table.c
 
 CFLAGS_MCU_SAMD21 = -mtune=cortex-m0plus -mcpu=cortex-m0plus -msoft-float
 CFLAGS_MCU_SAMD51 = -mtune=cortex-m4 -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard
@@ -150,7 +146,7 @@ DRIVERS_SRC_C += \
 	drivers/bus/softspi.c \
 
 # List of sources for qstr extraction
-SRC_QSTR += $(SRC_C) $(SHARED_SRC_C) $(SRC_CXX) $(GEN_PINS_SRC)
+SRC_QSTR += $(SRC_C) $(SHARED_SRC_C) $(SRC_CXX)
 
 OBJ += $(PY_O)
 OBJ += $(addprefix $(BUILD)/, $(SRC_C:.c=.o))
@@ -161,7 +157,6 @@ OBJ += $(addprefix $(BUILD)/, $(ASF4_SRC_C:.c=.o))
 OBJ += $(addprefix $(BUILD)/, $(LIBM_SRC_C:.c=.o))
 OBJ += $(addprefix $(BUILD)/, $(DRIVERS_SRC_C:.c=.o))
 OBJ += $(addprefix $(BUILD)/, $(TINYUSB_SRC_C:.c=.o))
-OBJ += $(GEN_PINS_SRC:.c=.o)
 
 ifneq ($(FROZEN_MANIFEST),)
 CFLAGS += -DMICROPY_MODULE_FROZEN_MPY
@@ -182,19 +177,10 @@ $(BUILD)/firmware.bin: $(BUILD)/firmware.elf
 $(BUILD)/firmware.uf2: $(BUILD)/firmware.bin
 	$(Q)$(PYTHON) $(UF2CONV) -b $(TEXT0) -c -o $@ $<
 
-pin_af.c: $(BUILD)/$(GEN_PIN_AF)
+pin_af.c: $(BUILD)/$(GEN_PIN_AF) | $(HEADER_BUILD)
 
-$(BUILD)/$(GEN_PIN_AF): $(PIN_AF_TABLE_CSV) | $(HEADER_BUILD)
+$(BUILD)/$(GEN_PIN_AF): $(PIN_AF_TABLE_CSV) $(BOARD_PINS) | $(HEADER_BUILD)
 	$(ECHO) "Create $@"
-	$(Q)$(PYTHON) $(MAKE_PIN_AF) --csv $(PIN_AF_TABLE_CSV) --table $(BUILD)/$(GEN_PIN_AF) --mcu $(MCU_SERIES)
-
-machine_led.c machine_pin.c modsamd.c: $(GEN_PINS_HDR)
-
-$(GEN_PINS_SRC) $(GEN_PINS_HDR): $(BOARD_PINS) | $(HEADER_BUILD)
-	$(ECHO) "Create $@"
-	$(Q)$(PYTHON) $(MAKE_PINS) --board $(BOARD_PINS) --pins $(GEN_PINS_SRC) --inc $(GEN_PINS_HDR)
-
-$(GEN_PINS_SRC:.c=.o): $(GEN_PINS_SRC)
-	$(call compile_c)
+	$(Q)$(PYTHON) $(MAKE_PIN_AF) --csv $(PIN_AF_TABLE_CSV) --board $(BOARD_PINS) --table $(BUILD)/$(GEN_PIN_AF) --mcu $(MCU_SERIES)
 
 include $(TOP)/py/mkrules.mk
diff --git a/ports/samd/boards/make-pin-af.py b/ports/samd/boards/make-pin-table.py
similarity index 59%
rename from ports/samd/boards/make-pin-af.py
rename to ports/samd/boards/make-pin-table.py
index d895ef9dd99a4..327478568afa9 100644
--- a/ports/samd/boards/make-pin-af.py
+++ b/ports/samd/boards/make-pin-table.py
@@ -16,6 +16,7 @@
 class Pins:
     def __init__(self):
         self.board_pins = []  # list of pin objects
+        self.pin_names = {}
 
     def parse_csv_file(self, filename):
         with open(filename, "r") as csvfile:
@@ -25,17 +26,43 @@ def parse_csv_file(self, filename):
                 if len(row) > 0 and row[0].strip().upper()[:2] in ("PA", "PB", "PC", "PD"):
                     self.board_pins.append(row)
 
+    def parse_pin_file(self, filename):
+        with open(filename, "r") as csvfile:
+            rows = csv.reader(csvfile, skipinitialspace=True)
+            for row in rows:
+                # Pin numbers must start with "PIN_"
+                # LED numbers must start with "LED_"
+                if len(row) > 0:
+                    # for compatibility, map LED_ to PIN_
+                    if row[0].startswith("LED_"):
+                        row[0] = "PIN_" + row[0][4:]
+                        if len(row) == 1:
+                            self.pin_names[row[0]] = (row[0][4:], "{&machine_led_type}")
+                        else:
+                            self.pin_names[row[0]] = (row[1], "{&machine_led_type}")
+                    elif row[0].startswith("PIN_"):
+                        if len(row) == 1:
+                            self.pin_names[row[0]] = (row[0][4:], "{&machine_pin_type}")
+                        else:
+                            self.pin_names[row[0]] = (row[1], "{&machine_pin_type}")
+
     def print_table(self, table_filename, mcu_name):
         with open(table_filename, "wt") as table_file:
             table_file.write(table_header)
-            table_file.write("const pin_af_t pin_af_table[] = {\n")
+            table_file.write("const machine_pin_obj_t pin_af_table[] = {\n")
             if mcu_name == "SAMD21":
                 for row in self.board_pins:
                     pin = "PIN_" + row[0].upper()
                     table_file.write("    #ifdef " + pin + "\n")
                     eic = row[1] if row[1] else "0xff"
                     adc = row[2] if row[2] else "0xff"
-                    table_file.write("    {%s, %s, %s" % (pin, eic, adc))
+                    if pin in self.pin_names:
+                        name = '"%s"' % self.pin_names[pin][0]
+                        type = self.pin_names[pin][1]
+                    else:
+                        name = '"-"'
+                        type = "{&machine_pin_type}"
+                    table_file.write("    {%s, %s, %s, %s, %s" % (type, pin, name, eic, adc))
                     for cell in row[3:]:
                         if cell:
                             table_file.write(
@@ -52,7 +79,15 @@ def print_table(self, table_filename, mcu_name):
                     eic = row[1] if row[1] else "0xff"
                     adc0 = row[2] if row[2] else "0xff"
                     adc1 = row[3] if row[3] else "0xff"
-                    table_file.write("    {%s, %s, %s, %s" % (pin, eic, adc0, adc1))
+                    if pin in self.pin_names:
+                        name = '"%s"' % self.pin_names[pin][0]
+                        type = self.pin_names[pin][1]
+                    else:
+                        name = '"-"'
+                        type = "{&machine_pin_type}"
+                    table_file.write(
+                        "    {%s, %s, %s, %s, %s, %s" % (type, pin, name, eic, adc0, adc1)
+                    )
                     for cell in row[4:]:
                         if cell:
                             table_file.write(
@@ -67,7 +102,7 @@ def print_table(self, table_filename, mcu_name):
 
 def main():
     parser = argparse.ArgumentParser(
-        prog="make-pin-cap.py",
+        prog="make-pin-af.py",
         usage="%(prog)s [options] [command]",
         description="Generate MCU-specific pin cap table file",
     )
@@ -75,7 +110,13 @@ def main():
         "-c",
         "--csv",
         dest="csv_filename",
-        help="Specifies the pin-mux-xxxx.csv filename",
+        help="Specifies the pin-af-table.csv filename",
+    )
+    parser.add_argument(
+        "-b",
+        "--board",
+        dest="pin_filename",
+        help="Specifies the pins.csv filename",
     )
     parser.add_argument(
         "-t",
@@ -96,6 +137,9 @@ def main():
     if args.csv_filename:
         pins.parse_csv_file(args.csv_filename)
 
+    if args.pin_filename:
+        pins.parse_pin_file(args.pin_filename)
+
     if args.table_filename:
         pins.print_table(args.table_filename, args.mcu_name)
 
diff --git a/ports/samd/boards/make-pins.py b/ports/samd/boards/make-pins.py
deleted file mode 100644
index 679e2c9d192cb..0000000000000
--- a/ports/samd/boards/make-pins.py
+++ /dev/null
@@ -1,128 +0,0 @@
-#!/usr/bin/env python
-"""Generates the pins file for the SAMD port."""
-
-from __future__ import print_function
-
-import argparse
-import sys
-import csv
-
-pins_header_prefix = """// This file was automatically generated by make-pins.py
-//
-typedef struct _machine_pin_obj_t {
-    mp_obj_base_t base;
-    uint32_t id;
-    char *name;
-} machine_pin_obj_t;
-
-int pin_find(mp_obj_t pin, const machine_pin_obj_t machine_pin_obj[], int table_size);
-
-"""
-
-led_header_prefix = """typedef struct _machine_led_obj_t {
-    mp_obj_base_t base;
-    uint32_t id;
-    char *name;
-} machine_led_obj_t;
-
-"""
-
-
-class Pins:
-    def __init__(self):
-        self.board_pins = []  # list of pin objects
-        self.board_leds = []  # list of led objects
-
-    def parse_csv_file(self, filename):
-        with open(filename, "r") as csvfile:
-            rows = csv.reader(csvfile, skipinitialspace=True)
-            for row in rows:
-                # Pin numbers must start with "PIN_"
-                # LED numbers must start with "LED_"
-                if len(row) > 0:
-                    if row[0].startswith("PIN_"):
-                        if len(row) == 1:
-                            self.board_pins.append([row[0], row[0][4:]])
-                        else:
-                            self.board_pins.append([row[0], row[1]])
-                    elif row[0].startswith("LED_"):
-                        self.board_leds.append(["PIN_" + row[0][4:], row[1]])
-                    elif row[0].startswith("-"):
-                        self.board_pins.append(["-1", ""])
-
-    def print_pins(self, pins_filename):
-        with open(pins_filename, "wt") as pins_file:
-            pins_file.write("// This file was automatically generated by make-pins.py\n")
-            pins_file.write("//\n")
-            pins_file.write('#include "modmachine.h"\n')
-            pins_file.write('#include "sam.h"\n')
-            pins_file.write('#include "pins.h"\n\n')
-
-            pins_file.write("const machine_pin_obj_t machine_pin_obj[] = {\n")
-            for pin in self.board_pins:
-                pins_file.write("    {{&machine_pin_type}, ")
-                pins_file.write(pin[0] + ', "' + pin[1])
-                pins_file.write('"},\n')
-            pins_file.write("};\n")
-
-            if self.board_leds:
-                pins_file.write("\nconst machine_led_obj_t machine_led_obj[] = {\n")
-                for pin in self.board_leds:
-                    pins_file.write("    {{&machine_led_type}, ")
-                    pins_file.write(pin[0] + ', "' + pin[1])
-                    pins_file.write('"},\n')
-                pins_file.write("};\n")
-
-    def print_header(self, hdr_filename):
-        with open(hdr_filename, "wt") as hdr_file:
-            hdr_file.write(pins_header_prefix)
-            if self.board_leds:
-                hdr_file.write(led_header_prefix)
-            hdr_file.write(
-                "extern const machine_pin_obj_t machine_pin_obj[%d];\n" % len(self.board_pins)
-            )
-            if self.board_leds:
-                hdr_file.write(
-                    "extern const machine_led_obj_t machine_led_obj[%d];\n" % len(self.board_leds)
-                )
-
-
-def main():
-    parser = argparse.ArgumentParser(
-        prog="make-pins.py",
-        usage="%(prog)s [options] [command]",
-        description="Generate board specific pin file",
-    )
-    parser.add_argument(
-        "-b",
-        "--board",
-        dest="csv_filename",
-        help="Specifies the pins.csv filename",
-    )
-    parser.add_argument(
-        "-p",
-        "--pins",
-        dest="pins_filename",
-        help="Specifies the name of the generated pins.c file",
-    )
-    parser.add_argument(
-        "-i",
-        "--inc",
-        dest="hdr_filename",
-        help="Specifies name of generated pin header file",
-    )
-    args = parser.parse_args(sys.argv[1:])
-
-    pins = Pins()
-
-    if args.csv_filename:
-        pins.parse_csv_file(args.csv_filename)
-
-    if args.pins_filename:
-        pins.print_pins(args.pins_filename)
-
-    pins.print_header(args.hdr_filename)
-
-
-if __name__ == "__main__":
-    main()
diff --git a/ports/samd/machine_adc.c b/ports/samd/machine_adc.c
index 97b6a14f17a49..efe0f041cdfa5 100644
--- a/ports/samd/machine_adc.c
+++ b/ports/samd/machine_adc.c
@@ -66,8 +66,8 @@ STATIC void adc_obj_print(const mp_print_t *print, mp_obj_t o, mp_print_kind_t k
     (void)kind;
     machine_adc_obj_t *self = MP_OBJ_TO_PTR(o);
 
-    mp_printf(print, "ADC(P%c%02u, ADC%u, channel=%u, bits=%u, average=%u)",
-        "ABCD"[self->id / 32], self->id % 32, self->adc_config.device,
+    mp_printf(print, "ADC(%s, ADC%u, channel=%u, bits=%u, average=%u)",
+        pin_name(self->id), self->adc_config.device,
         self->adc_config.channel, self->bits, 1 << self->avg);
 }
 
diff --git a/ports/samd/machine_led.c b/ports/samd/machine_led.c
index 54c2cb18bc86f..c18bc052bd2f3 100644
--- a/ports/samd/machine_led.c
+++ b/ports/samd/machine_led.c
@@ -30,7 +30,7 @@
 #include "py/mphal.h"
 #include "extmod/virtpin.h"
 #include "modmachine.h"
-#include "pins.h"
+#include "pin_af.h"
 
 extern mp_obj_t machine_pin_low_obj;
 extern mp_obj_t machine_pin_high_obj;
@@ -38,8 +38,10 @@ extern mp_obj_t machine_pin_toggle_obj;
 extern mp_obj_t machine_pin_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const mp_obj_t *args);
 
 STATIC void machine_led_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
-    machine_led_obj_t *self = self_in;
-    mp_printf(print, "LED(\"%s\")", self->name);
+    machine_pin_obj_t *self = self_in;
+    mp_printf(print, "LED(\"%s\", GPIO=P%c%02u)",
+        pin_name(self->pin_id),
+        "ABCD"[self->pin_id / 32], self->pin_id % 32);
 }
 
 // constructor(id, ...)
@@ -47,23 +49,16 @@ mp_obj_t mp_led_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw,
     mp_arg_check_num(n_args, n_kw, 1, MP_OBJ_FUN_ARGS_MAX, true);
 
     // get the wanted LED object
-    int wanted_led = pin_find(args[0], (const machine_pin_obj_t *)machine_led_obj, MP_ARRAY_SIZE(machine_led_obj));
-    const machine_led_obj_t *self = NULL;
-    if (0 <= wanted_led && wanted_led < MP_ARRAY_SIZE(machine_led_obj)) {
-        self = (machine_led_obj_t *)&machine_led_obj[wanted_led];
-    }
-    // the array could be padded with 'nulls' (see other Ports).
-    // Will also error if the asked for LED (index) is greater than the array row size.
-    if (self == NULL || self->base.type == NULL) {
-        mp_raise_ValueError(MP_ERROR_TEXT("invalid LED"));
-    }
-    mp_hal_pin_output(self->id);
-    mp_hal_pin_low(self->id);
+    const machine_pin_obj_t *self;
+
+    self = pin_find(args[0], &machine_led_type);
+
+    mp_hal_pin_output(self->pin_id);
+    mp_hal_pin_low(self->pin_id);
 
     return MP_OBJ_FROM_PTR(self);
 }
 
-
 STATIC const mp_rom_map_elem_t machine_led_locals_dict_table[] = {
     // instance methods
     { MP_ROM_QSTR(MP_QSTR_off), MP_ROM_PTR(&machine_pin_low_obj) },
diff --git a/ports/samd/machine_pin.c b/ports/samd/machine_pin.c
index 2dc10f9b46344..a7cd86d386ed9 100644
--- a/ports/samd/machine_pin.c
+++ b/ports/samd/machine_pin.c
@@ -34,7 +34,6 @@
 #include "extmod/virtpin.h"
 #include "modmachine.h"
 #include "samd_soc.h"
-#include "pins.h"
 #include "pin_af.h"
 
 #include "hal_gpio.h"
@@ -68,17 +67,17 @@ STATIC void machine_pin_print(const mp_print_t *print, mp_obj_t self_in, mp_prin
     machine_pin_obj_t *self = self_in;
     char *mode_str;
     char *pull_str[] = {"PULL_OFF", "PULL_UP", "PULL_DOWN"};
-    if (GPIO_IS_OPEN_DRAIN(self->id)) {
+    if (GPIO_IS_OPEN_DRAIN(self->pin_id)) {
         mode_str = "OPEN_DRAIN";
     } else {
-        mode_str = (mp_hal_get_pin_direction(self->id) == GPIO_DIRECTION_OUT) ? "OUT" : "IN";
+        mode_str = (mp_hal_get_pin_direction(self->pin_id) == GPIO_DIRECTION_OUT) ? "OUT" : "IN";
     }
 
     mp_printf(print, "Pin(\"%s\", mode=%s, pull=%s, GPIO=P%c%02u)",
-        self->name,
+        pin_name(self->pin_id),
         mode_str,
-        pull_str[mp_hal_get_pull_mode(self->id)],
-        "ABCD"[self->id / 32], self->id % 32);
+        pull_str[mp_hal_get_pull_mode(self->pin_id)],
+        "ABCD"[self->pin_id / 32], self->pin_id % 32);
 }
 
 STATIC void pin_validate_drive(bool strength) {
@@ -87,25 +86,6 @@ STATIC void pin_validate_drive(bool strength) {
     }
 }
 
-int pin_find(mp_obj_t pin, const machine_pin_obj_t machine_pin_obj[], int table_size) {
-    int wanted_pin = -1;
-    if (mp_obj_is_small_int(pin)) {
-        // Pin defined by the index of pin table
-        wanted_pin = mp_obj_get_int(pin);
-    } else if (mp_obj_is_str(pin)) {
-        // Search by name
-        size_t slen;
-        const char *s = mp_obj_str_get_data(pin, &slen);
-        for (wanted_pin = 0; wanted_pin < table_size; wanted_pin++) {
-            if (slen == strlen(machine_pin_obj[wanted_pin].name) &&
-                strncmp(s, machine_pin_obj[wanted_pin].name, slen) == 0) {
-                break;
-            }
-        }
-    }
-    return wanted_pin;
-}
-
 // Pin.init(mode, pull=None, *, value=None, drive=0). No 'alt' yet.
 STATIC mp_obj_t machine_pin_obj_init_helper(const machine_pin_obj_t *self, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_mode, ARG_pull, ARG_value, ARG_drive, ARG_alt };
@@ -120,32 +100,34 @@ STATIC mp_obj_t machine_pin_obj_init_helper(const machine_pin_obj_t *self, size_
     mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
     mp_arg_parse_all(n_args, pos_args, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
 
+    // clear any existing mux setting
+    mp_hal_clr_pin_mux(self->pin_id);
     // set initial value (do this before configuring mode/pull)
     if (args[ARG_value].u_obj != mp_const_none) {
-        mp_hal_pin_write(self->id, mp_obj_is_true(args[ARG_value].u_obj));
+        mp_hal_pin_write(self->pin_id, mp_obj_is_true(args[ARG_value].u_obj));
     }
 
     // configure mode
     if (args[ARG_mode].u_obj != mp_const_none) {
         mp_int_t mode = mp_obj_get_int(args[ARG_mode].u_obj);
         if (mode == GPIO_MODE_IN) {
-            mp_hal_pin_input(self->id);
+            mp_hal_pin_input(self->pin_id);
         } else if (mode == GPIO_MODE_OUT) {
-            mp_hal_pin_output(self->id);
+            mp_hal_pin_output(self->pin_id);
         } else if (mode == GPIO_MODE_OPEN_DRAIN) {
-            mp_hal_pin_open_drain(self->id);
+            mp_hal_pin_open_drain(self->pin_id);
         } else {
-            mp_hal_pin_input(self->id); // If no args are given, the Pin is 'input'.
+            mp_hal_pin_input(self->pin_id); // If no args are given, the Pin is 'input'.
         }
     }
     // configure pull. Only to be used with IN mode. The function sets the pin to INPUT.
     uint32_t pull = 0;
-    mp_int_t dir = mp_hal_get_pin_direction(self->id);
+    mp_int_t dir = mp_hal_get_pin_direction(self->pin_id);
     if (dir == GPIO_DIRECTION_OUT && args[ARG_pull].u_obj != mp_const_none) {
         mp_raise_ValueError(MP_ERROR_TEXT("OUT incompatible with pull"));
     } else if (args[ARG_pull].u_obj != mp_const_none) {
         pull = mp_obj_get_int(args[ARG_pull].u_obj);
-        gpio_set_pin_pull_mode(self->id, pull); // hal_gpio.h
+        gpio_set_pin_pull_mode(self->pin_id, pull); // hal_gpio.h
     }
 
     // get the strength
@@ -158,18 +140,10 @@ STATIC mp_obj_t machine_pin_obj_init_helper(const machine_pin_obj_t *self, size_
 // constructor(id, ...)
 mp_obj_t mp_pin_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
     mp_arg_check_num(n_args, n_kw, 1, MP_OBJ_FUN_ARGS_MAX, true);
+    const machine_pin_obj_t *self;
 
     // get the wanted pin object
-    int wanted_pin = pin_find(args[0], machine_pin_obj, MP_ARRAY_SIZE(machine_pin_obj));
-
-    const machine_pin_obj_t *self = NULL;
-    if (0 <= wanted_pin && wanted_pin < MP_ARRAY_SIZE(machine_pin_obj)) {
-        self = (machine_pin_obj_t *)&machine_pin_obj[wanted_pin];
-    }
-
-    if (self == NULL || self->base.type == NULL) {
-        mp_raise_ValueError(MP_ERROR_TEXT("invalid pin"));
-    }
+    self = pin_find(args[0], &machine_pin_type);
 
     if (n_args > 1 || n_kw > 0) {
         // pin mode given, so configure this GPIO
@@ -187,18 +161,18 @@ mp_obj_t machine_pin_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const mp
     machine_pin_obj_t *self = self_in;
     if (n_args == 0) {
         // get pin
-        return MP_OBJ_NEW_SMALL_INT(mp_hal_pin_read(self->id));
+        return MP_OBJ_NEW_SMALL_INT(mp_hal_pin_read(self->pin_id));
     } else {
         // set pin
         bool value = mp_obj_is_true(args[0]);
-        if (GPIO_IS_OPEN_DRAIN(self->id)) {
+        if (GPIO_IS_OPEN_DRAIN(self->pin_id)) {
             if (value == 0) {
-                mp_hal_pin_od_low(self->id);
+                mp_hal_pin_od_low(self->pin_id);
             } else {
-                mp_hal_pin_od_high(self->id);
+                mp_hal_pin_od_high(self->pin_id);
             }
         } else {
-            mp_hal_pin_write(self->id, value);
+            mp_hal_pin_write(self->pin_id, value);
         }
         return mp_const_none;
     }
@@ -219,7 +193,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_pin_value_obj, 1, 2, machine_
 // Pin.disable(pin)
 STATIC mp_obj_t machine_pin_disable(mp_obj_t self_in) {
     machine_pin_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    gpio_set_pin_direction(self->id, GPIO_DIRECTION_OFF); // Disables the pin (low power state)
+    gpio_set_pin_direction(self->pin_id, GPIO_DIRECTION_OFF); // Disables the pin (low power state)
     return mp_const_none;
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_pin_disable_obj, machine_pin_disable);
@@ -227,10 +201,10 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_pin_disable_obj, machine_pin_disable);
 // Pin.low() Totem-pole (push-pull)
 STATIC mp_obj_t machine_pin_low(mp_obj_t self_in) {
     machine_pin_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    if (GPIO_IS_OPEN_DRAIN(self->id)) {
-        mp_hal_pin_od_low(self->id);
+    if (GPIO_IS_OPEN_DRAIN(self->pin_id)) {
+        mp_hal_pin_od_low(self->pin_id);
     } else {
-        mp_hal_pin_low(self->id);
+        mp_hal_pin_low(self->pin_id);
     }
     return mp_const_none;
 }
@@ -239,10 +213,10 @@ MP_DEFINE_CONST_FUN_OBJ_1(machine_pin_low_obj, machine_pin_low);
 // Pin.high() Totem-pole (push-pull)
 STATIC mp_obj_t machine_pin_high(mp_obj_t self_in) {
     machine_pin_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    if (GPIO_IS_OPEN_DRAIN(self->id)) {
-        mp_hal_pin_od_high(self->id);
+    if (GPIO_IS_OPEN_DRAIN(self->pin_id)) {
+        mp_hal_pin_od_high(self->pin_id);
     } else {
-        mp_hal_pin_high(self->id);
+        mp_hal_pin_high(self->pin_id);
     }
     return mp_const_none;
 }
@@ -255,16 +229,16 @@ STATIC mp_obj_t machine_pin_toggle(mp_obj_t self_in) {
     // Determine DIRECTION of PIN.
     bool pin_dir;
 
-    if (GPIO_IS_OPEN_DRAIN(self->id)) {
-        pin_dir = mp_hal_get_pin_direction(self->id);
+    if (GPIO_IS_OPEN_DRAIN(self->pin_id)) {
+        pin_dir = mp_hal_get_pin_direction(self->pin_id);
         if (pin_dir) {
             // Pin is output, thus low, switch to high
-            mp_hal_pin_od_high(self->id);
+            mp_hal_pin_od_high(self->pin_id);
         } else {
-            mp_hal_pin_od_low(self->id);
+            mp_hal_pin_od_low(self->pin_id);
         }
     } else {
-        gpio_toggle_pin_level(self->id);
+        gpio_toggle_pin_level(self->pin_id);
     }
     return mp_const_none;
 }
@@ -280,8 +254,8 @@ STATIC mp_obj_t machine_pin_drive(size_t n_args, const mp_obj_t *args) {
         pin_validate_drive(strength);
         // Set the DRVSTR bit (ASF hri/hri_port_dxx.h
         hri_port_write_PINCFG_DRVSTR_bit(PORT,
-            (enum gpio_port)GPIO_PORT(self->id),
-            GPIO_PIN(self->id),
+            (enum gpio_port)GPIO_PORT(self->pin_id),
+            GPIO_PIN(self->pin_id),
             strength);
         return mp_const_none;
     }
@@ -301,9 +275,9 @@ STATIC mp_obj_t machine_pin_irq(size_t n_args, const mp_obj_t *pos_args, mp_map_
     mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
 
     // Get the IRQ object.
-    uint8_t eic_id = get_pin_af_info(self->id)->eic;
+    uint8_t eic_id = get_pin_obj_ptr(self->pin_id)->eic;
     machine_pin_irq_obj_t *irq = MP_STATE_PORT(machine_pin_irq_objects[eic_id]);
-    if (irq != NULL && irq->pin_id != self->id) {
+    if (irq != NULL && irq->pin_id != self->pin_id) {
         mp_raise_ValueError(MP_ERROR_TEXT("IRQ already used"));
     }
 
@@ -322,7 +296,7 @@ STATIC mp_obj_t machine_pin_irq(size_t n_args, const mp_obj_t *pos_args, mp_map_
     if (n_args > 1 || kw_args->used != 0) {
 
         // set the mux config of the pin.
-        mp_hal_set_pin_mux(self->id, ALT_FCT_EIC);
+        mp_hal_set_pin_mux(self->pin_id, ALT_FCT_EIC);
 
         // Configure IRQ.
         #if defined(MCU_SAMD21)
@@ -362,7 +336,7 @@ STATIC mp_obj_t machine_pin_irq(size_t n_args, const mp_obj_t *pos_args, mp_map_
         irq->base.ishard = args[ARG_hard].u_bool;
         irq->flags = 0;
         irq->trigger = args[ARG_trigger].u_int;
-        irq->pin_id = self->id;
+        irq->pin_id = self->pin_id;
 
         // Enable IRQ if a handler is given.
         if (args[ARG_handler].u_obj != mp_const_none) {
@@ -457,10 +431,10 @@ STATIC mp_uint_t pin_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_t arg, i
 
     switch (request) {
         case MP_PIN_READ: {
-            return mp_hal_pin_read(self->id);
+            return mp_hal_pin_read(self->pin_id);
         }
         case MP_PIN_WRITE: {
-            mp_hal_pin_write(self->id, arg);
+            mp_hal_pin_write(self->pin_id, arg);
             return 0;
         }
     }
@@ -494,7 +468,7 @@ static uint8_t find_eic_id(int pin) {
 
 STATIC mp_uint_t machine_pin_irq_trigger(mp_obj_t self_in, mp_uint_t new_trigger) {
     machine_pin_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    uint8_t eic_id = find_eic_id(self->id);
+    uint8_t eic_id = find_eic_id(self->pin_id);
     if (eic_id != 0xff) {
         machine_pin_irq_obj_t *irq = MP_STATE_PORT(machine_pin_irq_objects[eic_id]);
         EIC->INTENCLR.reg |= (1 << eic_id);
@@ -507,7 +481,7 @@ STATIC mp_uint_t machine_pin_irq_trigger(mp_obj_t self_in, mp_uint_t new_trigger
 
 STATIC mp_uint_t machine_pin_irq_info(mp_obj_t self_in, mp_uint_t info_type) {
     machine_pin_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    uint8_t eic_id = find_eic_id(self->id);
+    uint8_t eic_id = find_eic_id(self->pin_id);
     if (eic_id != 0xff) {
         machine_pin_irq_obj_t *irq = MP_STATE_PORT(machine_pin_irq_objects[eic_id]);
         if (info_type == MP_IRQ_INFO_FLAGS) {
@@ -525,11 +499,8 @@ STATIC const mp_irq_methods_t machine_pin_irq_methods = {
 };
 
 mp_hal_pin_obj_t mp_hal_get_pin_obj(mp_obj_t obj) {
-    if (!mp_obj_is_type(obj, &machine_pin_type)) {
-        mp_raise_ValueError(MP_ERROR_TEXT("expecting a Pin"));
-    }
-    machine_pin_obj_t *pin = MP_OBJ_TO_PTR(obj);
-    return pin->id;
+    const machine_pin_obj_t *pin = pin_find(obj, &machine_pin_type);
+    return pin->pin_id;
 }
 
 MP_REGISTER_ROOT_POINTER(void *machine_pin_irq_objects[16]);
diff --git a/ports/samd/machine_pwm.c b/ports/samd/machine_pwm.c
index d987927d310c3..91982a6f74a8f 100644
--- a/ports/samd/machine_pwm.c
+++ b/ports/samd/machine_pwm.c
@@ -107,8 +107,8 @@ STATIC void mp_machine_pwm_duty_set_ns(machine_pwm_obj_t *self, mp_int_t duty_ns
 
 STATIC void mp_machine_pwm_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     machine_pwm_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    mp_printf(print, "PWM P%c%02u device=%u channel=%u output=%u",
-        "ABCD"[self->pin_id / 32], self->pin_id % 32, self->device, self->channel, self->output);
+    mp_printf(print, "PWM %s device=%u channel=%u output=%u",
+        pin_name(self->pin_id), self->device, self->channel, self->output);
 }
 
 // PWM(pin)
diff --git a/ports/samd/modsamd.c b/ports/samd/modsamd.c
index 05ed69bad014b..79e7b4cc35f1c 100644
--- a/ports/samd/modsamd.c
+++ b/ports/samd/modsamd.c
@@ -30,42 +30,40 @@
 
 #include "sam.h"
 #include "pin_af.h"
-#include "pins.h"
 #include "samd_soc.h"
 
 extern const mp_obj_type_t samd_flash_type;
 
 STATIC mp_obj_t samd_pininfo(mp_obj_t pin_obj) {
-    mp_hal_pin_obj_t pin = mp_hal_get_pin_obj(pin_obj);
-    const pin_af_t *pin_af = get_pin_af_info(pin);
-    const char *name = ((machine_pin_obj_t *)MP_OBJ_TO_PTR(pin_obj))->name;
-    if (pin_af) {
-        #if defined(MCU_SAMD21)
-        mp_obj_t tuple[7] = {
-            tuple[0] = mp_obj_new_str(name, strlen(name)),
-            tuple[1] = mp_obj_new_int(pin_af->eic),
-            tuple[2] = mp_obj_new_int(pin_af->adc0),
-            tuple[3] = mp_obj_new_int(pin_af->sercom1),
-            tuple[4] = mp_obj_new_int(pin_af->sercom2),
-            tuple[5] = mp_obj_new_int(pin_af->tcc1),
-            tuple[6] = mp_obj_new_int(pin_af->tcc2),
-        };
-        return mp_obj_new_tuple(7, tuple);
-        #elif defined(MCU_SAMD51)
-        mp_obj_t tuple[9] = {
-            tuple[0] = mp_obj_new_str(name, strlen(name)),
-            tuple[1] = mp_obj_new_int(pin_af->eic),
-            tuple[2] = mp_obj_new_int(pin_af->adc0),
-            tuple[3] = mp_obj_new_int(pin_af->adc1),
-            tuple[4] = mp_obj_new_int(pin_af->sercom1),
-            tuple[5] = mp_obj_new_int(pin_af->sercom2),
-            tuple[6] = mp_obj_new_int(pin_af->tc),
-            tuple[7] = mp_obj_new_int(pin_af->tcc1),
-            tuple[8] = mp_obj_new_int(pin_af->tcc2),
-        };
-        return mp_obj_new_tuple(9, tuple);
-        #endif
-    }
+    const machine_pin_obj_t *pin_af = pin_find(pin_obj, NULL);
+    // Get the name, now that it is not in the pin object
+    const char *name = pin_af->name;
+
+    #if defined(MCU_SAMD21)
+    mp_obj_t tuple[7] = {
+        tuple[0] = mp_obj_new_str(name, strlen(name)),
+        tuple[1] = mp_obj_new_int(pin_af->eic),
+        tuple[2] = mp_obj_new_int(pin_af->adc0),
+        tuple[3] = mp_obj_new_int(pin_af->sercom1),
+        tuple[4] = mp_obj_new_int(pin_af->sercom2),
+        tuple[5] = mp_obj_new_int(pin_af->tcc1),
+        tuple[6] = mp_obj_new_int(pin_af->tcc2),
+    };
+    return mp_obj_new_tuple(7, tuple);
+    #elif defined(MCU_SAMD51)
+    mp_obj_t tuple[9] = {
+        tuple[0] = mp_obj_new_str(name, strlen(name)),
+        tuple[1] = mp_obj_new_int(pin_af->eic),
+        tuple[2] = mp_obj_new_int(pin_af->adc0),
+        tuple[3] = mp_obj_new_int(pin_af->adc1),
+        tuple[4] = mp_obj_new_int(pin_af->sercom1),
+        tuple[5] = mp_obj_new_int(pin_af->sercom2),
+        tuple[6] = mp_obj_new_int(pin_af->tc),
+        tuple[7] = mp_obj_new_int(pin_af->tcc1),
+        tuple[8] = mp_obj_new_int(pin_af->tcc2),
+    };
+    return mp_obj_new_tuple(9, tuple);
+    #endif
     return mp_const_none;
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(samd_pininfo_obj, samd_pininfo);
diff --git a/ports/samd/pin_af.c b/ports/samd/pin_af.c
index 926c4ae0c23aa..fc2a0f3d54d93 100644
--- a/ports/samd/pin_af.c
+++ b/ports/samd/pin_af.c
@@ -29,7 +29,9 @@
  */
 
 #include <stdint.h>
+#include "string.h"
 
+#include "modmachine.h"
 #include "py/runtime.h"
 #include "py/misc.h"
 #include "pin_af.h"
@@ -43,13 +45,65 @@ extern const uint8_t tcc_channel_count[];
 // Just look for an table entry for a given pin and raise an error
 // in case of no match (which should not happen).
 
-const pin_af_t *get_pin_af_info(int pin_id) {
+const machine_pin_obj_t *get_pin_obj_ptr(int pin_id) {
     for (int i = 0; i < MP_ARRAY_SIZE(pin_af_table); i++) {
         if (pin_af_table[i].pin_id == pin_id) { // Pin match
             return &pin_af_table[i];
         }
     }
-    mp_raise_ValueError(MP_ERROR_TEXT("wrong pin"));
+    mp_raise_ValueError(MP_ERROR_TEXT("not a Pin"));
+}
+
+const machine_pin_obj_t *pin_find(mp_obj_t pin, const mp_obj_type_t *type) {
+    const machine_pin_obj_t *self = NULL;
+    // Is already a object of the proper type
+    if (mp_obj_is_type(pin, type)) {
+        return pin;
+    }
+    if (mp_obj_is_small_int(pin)) {
+        // Pin defined by pin number for PAnn, PBnn, etc.
+        self = get_pin_obj_ptr(mp_obj_get_int(pin));
+    } else if (mp_obj_is_str(pin)) {
+        // Search by name
+        size_t slen;
+        const char *s = mp_obj_str_get_data(pin, &slen);
+        // Check for a string like PA02 or PD12
+        if (slen == 4 && s[0] == 'P' && strchr("ABCD", s[1]) != NULL &&
+            strchr("0123456789", s[2]) != NULL && strchr("0123456789", s[2]) != NULL) {
+            int num = (s[1] - 'A') * 32 + (s[2] - '0') * 10 + (s[3] - '0');
+            self = get_pin_obj_ptr(num);
+        } else {
+            for (int i = 0; i < MP_ARRAY_SIZE(pin_af_table); i++) {
+                if (slen == strlen(pin_af_table[i].name) &&
+                    strncmp(s, pin_af_table[i].name, slen) == 0) {
+                    self = &pin_af_table[i];
+                }
+            }
+        }
+    }
+    if (self != NULL && (type == NULL || mp_obj_is_type(self, type))) {
+        return self;
+    } else {
+        mp_raise_ValueError(MP_ERROR_TEXT("not a Pin"));
+    }
+}
+
+const char *pin_name(int id) {
+    static char board_name[5] = "Pxnn";
+    for (int i = 0; i < sizeof(pin_af_table); i++) {
+        if (pin_af_table[i].pin_id == id) {
+            if (pin_af_table[i].name[0] != '-') {
+                return pin_af_table[i].name;
+            } else {
+                board_name[1] = "ABCD"[id / 32];
+                id %= 32;
+                board_name[2] = '0' + id / 10;
+                board_name[3] = '0' + id % 10;
+                return board_name;
+            }
+        }
+    }
+    return "-";
 }
 
 // Test, wether the given pin is defined and has signals for sercom.
@@ -57,7 +111,7 @@ const pin_af_t *get_pin_af_info(int pin_id) {
 // If not, an error will be raised.
 
 sercom_pad_config_t get_sercom_config(int pin_id, uint8_t sercom_nr) {
-    const pin_af_t *pct_ptr = get_pin_af_info(pin_id);
+    const machine_pin_obj_t *pct_ptr = get_pin_obj_ptr(pin_id);
     if ((pct_ptr->sercom1 >> 4) == sercom_nr) {
         return (sercom_pad_config_t) {ALT_FCT_SERCOM1, pct_ptr->sercom1 & 0x0f};
     } else if ((pct_ptr->sercom2 >> 4) == sercom_nr) {
@@ -72,7 +126,12 @@ sercom_pad_config_t get_sercom_config(int pin_id, uint8_t sercom_nr) {
 // If not, an error will be raised.
 
 adc_config_t get_adc_config(int pin_id, int32_t flag) {
-    const pin_af_t *pct_ptr = get_pin_af_info(pin_id);
+    const machine_pin_obj_t *pct_ptr = get_pin_obj_ptr(pin_id);
+    #if defined(MCU_SAMD51)
+    if (pct_ptr->adc1 != 0xff && (flag & (1 << (pct_ptr->adc1 + 16))) == 0) {
+        return (adc_config_t) {1, pct_ptr->adc1};
+    } else
+    #endif
     if (pct_ptr->adc0 != 0xff && (flag & (1 << pct_ptr->adc0)) == 0) {
         return (adc_config_t) {0, pct_ptr->adc0};
     #if defined(MUC_SAMD51)
@@ -91,7 +150,7 @@ adc_config_t get_adc_config(int pin_id, int32_t flag) {
 // tries to provide an unused device, if available.
 
 pwm_config_t get_pwm_config(int pin_id, int wanted_dev, uint8_t device_status[]) {
-    const pin_af_t *pct_ptr = get_pin_af_info(pin_id);
+    const machine_pin_obj_t *pct_ptr = get_pin_obj_ptr(pin_id);
     uint8_t tcc1 = pct_ptr->tcc1;
     uint8_t tcc2 = pct_ptr->tcc2;
 
diff --git a/ports/samd/pin_af.h b/ports/samd/pin_af.h
index b75f4ddd02562..5bb65a098a65c 100644
--- a/ports/samd/pin_af.h
+++ b/ports/samd/pin_af.h
@@ -30,15 +30,17 @@
 
 #if defined(MCU_SAMD21)
 
-typedef struct {
+typedef struct _machine_pin_obj_t {
+    mp_obj_base_t base;
     uint8_t pin_id;
+    char *name;
     uint8_t eic;
     uint8_t adc0;
     uint8_t sercom1;
     uint8_t sercom2;
     uint8_t tcc1;
     uint8_t tcc2;
-} pin_af_t;
+} machine_pin_obj_t;
 
 #define ALT_FCT_TC        4
 #define ALT_FCT_TCC1      4
@@ -46,8 +48,10 @@ typedef struct {
 
 #elif defined(MCU_SAMD51)
 
-typedef struct {
+typedef struct _machine_pin_obj_t {
+    mp_obj_base_t base;
     uint8_t pin_id;
+    char *name;
     uint8_t eic;
     uint8_t adc0;
     uint8_t adc1;
@@ -56,7 +60,7 @@ typedef struct {
     uint8_t tc;
     uint8_t tcc1;
     uint8_t tcc2;
-} pin_af_t;
+} machine_pin_obj_t;
 
 #define ALT_FCT_TC        4
 #define ALT_FCT_TCC1      5
@@ -85,7 +89,11 @@ typedef struct _pwm_config_t {
 #define ALT_FCT_SERCOM1   2
 #define ALT_FCT_SERCOM2   3
 
+extern const machine_pin_obj_t pin_af_table[];
+
 sercom_pad_config_t get_sercom_config(int pin_id, uint8_t sercom);
 adc_config_t get_adc_config(int pin_id, int32_t flag);
 pwm_config_t get_pwm_config(int pin_id, int wanted_dev, uint8_t used_dev[]);
-const pin_af_t *get_pin_af_info(int pin_id);
+const machine_pin_obj_t *get_pin_obj_ptr(int pin_id);
+const char *pin_name(int id);
+const machine_pin_obj_t *pin_find(mp_obj_t pin, const mp_obj_type_t *type);

From 4d38ab652ea57a60c6f2ff085547f72012ac7df6 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Fri, 7 Oct 2022 09:40:45 +0200
Subject: [PATCH 2780/3533] samd: Make ADC, DAC, PWM, SPI objects consistent in
 how they print out.

All of ADC, DAC, Pin, PWM and SPI looked different before this change.
---
 ports/samd/machine_adc.c | 2 +-
 ports/samd/machine_dac.c | 2 +-
 ports/samd/machine_pwm.c | 2 +-
 ports/samd/machine_spi.c | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ports/samd/machine_adc.c b/ports/samd/machine_adc.c
index efe0f041cdfa5..8fd3e3bf4e7fa 100644
--- a/ports/samd/machine_adc.c
+++ b/ports/samd/machine_adc.c
@@ -66,7 +66,7 @@ STATIC void adc_obj_print(const mp_print_t *print, mp_obj_t o, mp_print_kind_t k
     (void)kind;
     machine_adc_obj_t *self = MP_OBJ_TO_PTR(o);
 
-    mp_printf(print, "ADC(%s, ADC%u, channel=%u, bits=%u, average=%u)",
+    mp_printf(print, "ADC(%s, device=%u, channel=%u, bits=%u, average=%u)",
         pin_name(self->id), self->adc_config.device,
         self->adc_config.channel, self->bits, 1 << self->avg);
 }
diff --git a/ports/samd/machine_dac.c b/ports/samd/machine_dac.c
index 41c6784cceb8b..53407c0d375aa 100644
--- a/ports/samd/machine_dac.c
+++ b/ports/samd/machine_dac.c
@@ -126,7 +126,7 @@ STATIC mp_obj_t dac_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_
 
 STATIC void dac_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     dac_obj_t *self = self_in;
-    mp_printf(print, "DAC(%u) PIN_PA%02u", self->id, self->gpio_id);
+    mp_printf(print, "DAC(%u, Pin=%s)", self->id, pin_name(self->gpio_id));
 }
 
 STATIC mp_obj_t dac_write(mp_obj_t self_in, mp_obj_t value_in) {
diff --git a/ports/samd/machine_pwm.c b/ports/samd/machine_pwm.c
index 91982a6f74a8f..2ae841a9743ba 100644
--- a/ports/samd/machine_pwm.c
+++ b/ports/samd/machine_pwm.c
@@ -107,7 +107,7 @@ STATIC void mp_machine_pwm_duty_set_ns(machine_pwm_obj_t *self, mp_int_t duty_ns
 
 STATIC void mp_machine_pwm_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     machine_pwm_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    mp_printf(print, "PWM %s device=%u channel=%u output=%u",
+    mp_printf(print, "PWM(%s, device=%u, channel=%u, output=%u)",
         pin_name(self->pin_id), self->device, self->channel, self->output);
 }
 
diff --git a/ports/samd/machine_spi.c b/ports/samd/machine_spi.c
index 8321f19cf0dd8..43150f67f15a3 100644
--- a/ports/samd/machine_spi.c
+++ b/ports/samd/machine_spi.c
@@ -82,7 +82,7 @@ void common_spi_irq_handler(int spi_id) {
 
 STATIC void machine_spi_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     machine_spi_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    mp_printf(print, "SPI(%u), baudrate=%u, firstbit=%u, polarity=%u, phase=%u, bits=8",
+    mp_printf(print, "SPI(%u, baudrate=%u, firstbit=%u, polarity=%u, phase=%u, bits=8)",
         self->id, self->baudrate, self->firstbit, self->polarity, self->phase);
 }
 

From a6760bd4efa883ef463795036ff74d678ff65c7b Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sun, 9 Oct 2022 10:56:29 +0200
Subject: [PATCH 2781/3533] samd/modmachine: Replace the LED class by the
 Signal class.

It simplifies and improves the code.  The LED_Pxxx lines of the board.csv
lines can still be used, but will be taken as Pin definitions.
---
 ports/samd/Makefile                 |  1 -
 ports/samd/boards/make-pin-table.py |  6 +--
 ports/samd/machine_led.c            | 78 -----------------------------
 ports/samd/machine_pin.c            |  4 +-
 ports/samd/modmachine.c             |  3 +-
 ports/samd/modmachine.h             |  1 -
 ports/samd/modsamd.c                |  2 +-
 ports/samd/mpconfigport.h           |  1 +
 ports/samd/pin_af.c                 |  6 +--
 ports/samd/pin_af.h                 |  2 +-
 10 files changed, 11 insertions(+), 93 deletions(-)
 delete mode 100644 ports/samd/machine_led.c

diff --git a/ports/samd/Makefile b/ports/samd/Makefile
index f512fb0b2e339..b2e84460ea266 100644
--- a/ports/samd/Makefile
+++ b/ports/samd/Makefile
@@ -88,7 +88,6 @@ SRC_C += \
 	machine_bitstream.c \
 	machine_dac.c \
 	machine_i2c.c \
-	machine_led.c \
 	machine_pin.c \
 	machine_rtc.c \
 	machine_spi.c \
diff --git a/ports/samd/boards/make-pin-table.py b/ports/samd/boards/make-pin-table.py
index 327478568afa9..40bcd166dd08f 100644
--- a/ports/samd/boards/make-pin-table.py
+++ b/ports/samd/boards/make-pin-table.py
@@ -36,11 +36,7 @@ def parse_pin_file(self, filename):
                     # for compatibility, map LED_ to PIN_
                     if row[0].startswith("LED_"):
                         row[0] = "PIN_" + row[0][4:]
-                        if len(row) == 1:
-                            self.pin_names[row[0]] = (row[0][4:], "{&machine_led_type}")
-                        else:
-                            self.pin_names[row[0]] = (row[1], "{&machine_led_type}")
-                    elif row[0].startswith("PIN_"):
+                    if row[0].startswith("PIN_"):
                         if len(row) == 1:
                             self.pin_names[row[0]] = (row[0][4:], "{&machine_pin_type}")
                         else:
diff --git a/ports/samd/machine_led.c b/ports/samd/machine_led.c
deleted file mode 100644
index c18bc052bd2f3..0000000000000
--- a/ports/samd/machine_led.c
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * This is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2016-2021 Damien P. George
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- * Uses pins.h & pins.c to create board (MCU package) specific 'machine_led_obj' array.
- */
-
-#include "py/runtime.h"
-#include "py/mphal.h"
-#include "extmod/virtpin.h"
-#include "modmachine.h"
-#include "pin_af.h"
-
-extern mp_obj_t machine_pin_low_obj;
-extern mp_obj_t machine_pin_high_obj;
-extern mp_obj_t machine_pin_toggle_obj;
-extern mp_obj_t machine_pin_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const mp_obj_t *args);
-
-STATIC void machine_led_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
-    machine_pin_obj_t *self = self_in;
-    mp_printf(print, "LED(\"%s\", GPIO=P%c%02u)",
-        pin_name(self->pin_id),
-        "ABCD"[self->pin_id / 32], self->pin_id % 32);
-}
-
-// constructor(id, ...)
-mp_obj_t mp_led_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
-    mp_arg_check_num(n_args, n_kw, 1, MP_OBJ_FUN_ARGS_MAX, true);
-
-    // get the wanted LED object
-    const machine_pin_obj_t *self;
-
-    self = pin_find(args[0], &machine_led_type);
-
-    mp_hal_pin_output(self->pin_id);
-    mp_hal_pin_low(self->pin_id);
-
-    return MP_OBJ_FROM_PTR(self);
-}
-
-STATIC const mp_rom_map_elem_t machine_led_locals_dict_table[] = {
-    // instance methods
-    { MP_ROM_QSTR(MP_QSTR_off), MP_ROM_PTR(&machine_pin_low_obj) },
-    { MP_ROM_QSTR(MP_QSTR_on), MP_ROM_PTR(&machine_pin_high_obj) },
-    { MP_ROM_QSTR(MP_QSTR_toggle), MP_ROM_PTR(&machine_pin_toggle_obj) },
-};
-STATIC MP_DEFINE_CONST_DICT(machine_led_locals_dict, machine_led_locals_dict_table);
-
-MP_DEFINE_CONST_OBJ_TYPE(
-    machine_led_type,
-    MP_QSTR_LED,
-    MP_TYPE_FLAG_NONE,
-    make_new, mp_led_make_new,
-    print, machine_led_print,
-    call, machine_pin_call,
-    locals_dict, &machine_led_locals_dict
-    );
diff --git a/ports/samd/machine_pin.c b/ports/samd/machine_pin.c
index a7cd86d386ed9..87684858325fb 100644
--- a/ports/samd/machine_pin.c
+++ b/ports/samd/machine_pin.c
@@ -143,7 +143,7 @@ mp_obj_t mp_pin_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw,
     const machine_pin_obj_t *self;
 
     // get the wanted pin object
-    self = pin_find(args[0], &machine_pin_type);
+    self = pin_find(args[0]);
 
     if (n_args > 1 || n_kw > 0) {
         // pin mode given, so configure this GPIO
@@ -499,7 +499,7 @@ STATIC const mp_irq_methods_t machine_pin_irq_methods = {
 };
 
 mp_hal_pin_obj_t mp_hal_get_pin_obj(mp_obj_t obj) {
-    const machine_pin_obj_t *pin = pin_find(obj, &machine_pin_type);
+    const machine_pin_obj_t *pin = pin_find(obj);
     return pin->pin_id;
 }
 
diff --git a/ports/samd/modmachine.c b/ports/samd/modmachine.c
index 12e9f7c34134c..47fc03d824100 100644
--- a/ports/samd/modmachine.c
+++ b/ports/samd/modmachine.c
@@ -29,6 +29,7 @@
 #include "extmod/machine_mem.h"
 #include "extmod/machine_pulse.h"
 #include "extmod/machine_i2c.h"
+#include "extmod/machine_signal.h"
 #include "extmod/machine_spi.h"
 #include "drivers/dht/dht.h"
 #include "modmachine.h"
@@ -228,8 +229,8 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
 
     { MP_ROM_QSTR(MP_QSTR_ADC),                 MP_ROM_PTR(&machine_adc_type) },
     { MP_ROM_QSTR(MP_QSTR_DAC),                 MP_ROM_PTR(&machine_dac_type) },
-    { MP_ROM_QSTR(MP_QSTR_LED),                 MP_ROM_PTR(&machine_led_type) },
     { MP_ROM_QSTR(MP_QSTR_Pin),                 MP_ROM_PTR(&machine_pin_type) },
+    { MP_ROM_QSTR(MP_QSTR_Signal),              MP_ROM_PTR(&machine_signal_type) },
     { MP_ROM_QSTR(MP_QSTR_PWM),                 MP_ROM_PTR(&machine_pwm_type) },
     { MP_ROM_QSTR(MP_QSTR_SoftI2C),             MP_ROM_PTR(&mp_machine_soft_i2c_type) },
     { MP_ROM_QSTR(MP_QSTR_I2C),                 MP_ROM_PTR(&machine_i2c_type) },
diff --git a/ports/samd/modmachine.h b/ports/samd/modmachine.h
index 8f85e149896f3..792fca1b92920 100644
--- a/ports/samd/modmachine.h
+++ b/ports/samd/modmachine.h
@@ -31,7 +31,6 @@
 extern const mp_obj_type_t machine_adc_type;
 extern const mp_obj_type_t machine_dac_type;
 extern const mp_obj_type_t machine_i2c_type;
-extern const mp_obj_type_t machine_led_type;
 extern const mp_obj_type_t machine_pin_type;
 extern const mp_obj_type_t machine_pwm_type;
 extern const mp_obj_type_t machine_spi_type;
diff --git a/ports/samd/modsamd.c b/ports/samd/modsamd.c
index 79e7b4cc35f1c..5a2cf4616d1d1 100644
--- a/ports/samd/modsamd.c
+++ b/ports/samd/modsamd.c
@@ -35,7 +35,7 @@
 extern const mp_obj_type_t samd_flash_type;
 
 STATIC mp_obj_t samd_pininfo(mp_obj_t pin_obj) {
-    const machine_pin_obj_t *pin_af = pin_find(pin_obj, NULL);
+    const machine_pin_obj_t *pin_af = pin_find(pin_obj);
     // Get the name, now that it is not in the pin object
     const char *name = pin_af->name;
 
diff --git a/ports/samd/mpconfigport.h b/ports/samd/mpconfigport.h
index 8b8305f0b47e7..f03f8a11d7649 100644
--- a/ports/samd/mpconfigport.h
+++ b/ports/samd/mpconfigport.h
@@ -100,6 +100,7 @@
 #define MICROPY_PY_MACHINE_PWM_INIT         (0)
 #define MICROPY_PY_MACHINE_PWM_DUTY_U16_NS  (1)
 #define MICROPY_PY_MACHINE_PWM_INCLUDEFILE  "ports/samd/machine_pwm.c"
+#define MICROPY_PY_MACHINE_PIN_MAKE_NEW     mp_pin_make_new
 
 #define MP_STATE_PORT MP_STATE_VM
 
diff --git a/ports/samd/pin_af.c b/ports/samd/pin_af.c
index fc2a0f3d54d93..a7a72ac96abe3 100644
--- a/ports/samd/pin_af.c
+++ b/ports/samd/pin_af.c
@@ -54,10 +54,10 @@ const machine_pin_obj_t *get_pin_obj_ptr(int pin_id) {
     mp_raise_ValueError(MP_ERROR_TEXT("not a Pin"));
 }
 
-const machine_pin_obj_t *pin_find(mp_obj_t pin, const mp_obj_type_t *type) {
+const machine_pin_obj_t *pin_find(mp_obj_t pin) {
     const machine_pin_obj_t *self = NULL;
     // Is already a object of the proper type
-    if (mp_obj_is_type(pin, type)) {
+    if (mp_obj_is_type(pin, &machine_pin_type)) {
         return pin;
     }
     if (mp_obj_is_small_int(pin)) {
@@ -81,7 +81,7 @@ const machine_pin_obj_t *pin_find(mp_obj_t pin, const mp_obj_type_t *type) {
             }
         }
     }
-    if (self != NULL && (type == NULL || mp_obj_is_type(self, type))) {
+    if (self != NULL) {
         return self;
     } else {
         mp_raise_ValueError(MP_ERROR_TEXT("not a Pin"));
diff --git a/ports/samd/pin_af.h b/ports/samd/pin_af.h
index 5bb65a098a65c..4b0c80250cd56 100644
--- a/ports/samd/pin_af.h
+++ b/ports/samd/pin_af.h
@@ -96,4 +96,4 @@ adc_config_t get_adc_config(int pin_id, int32_t flag);
 pwm_config_t get_pwm_config(int pin_id, int wanted_dev, uint8_t used_dev[]);
 const machine_pin_obj_t *get_pin_obj_ptr(int pin_id);
 const char *pin_name(int id);
-const machine_pin_obj_t *pin_find(mp_obj_t pin, const mp_obj_type_t *type);
+const machine_pin_obj_t *pin_find(mp_obj_t pin);

From ac1e31267b0bf21caa31b8136208c116b1612789 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sat, 8 Oct 2022 21:12:50 +0200
Subject: [PATCH 2782/3533] samd/boards: Rework the pins.csv files.

Changes are:
- Remove the LED_Pxxx definitions from pins.csv, now that the LED class is
  gone.
- Remove the '-' lines.
- Add default lines for USB and SWCLK, SWDIO.
---
 .../boards/ADAFRUIT_FEATHER_M0_EXPRESS/pins.csv   | 11 ++++++++---
 .../boards/ADAFRUIT_FEATHER_M4_EXPRESS/pins.csv   | 10 ++++++----
 .../boards/ADAFRUIT_ITSYBITSY_M0_EXPRESS/pins.csv |  8 +++++---
 .../boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/pins.csv |  9 ++++++---
 ports/samd/boards/ADAFRUIT_TRINKET_M0/pins.csv    |  8 +++++++-
 ports/samd/boards/MINISAM_M4/pins.csv             |  9 ++++++++-
 ports/samd/boards/SAMD21_XPLAINED_PRO/pins.csv    | 15 +++++++--------
 ports/samd/boards/SEEED_WIO_TERMINAL/pins.csv     | 11 +++++++++--
 ports/samd/boards/SEEED_XIAO/pins.csv             | 12 +++++++++---
 .../boards/SPARKFUN_SAMD51_THING_PLUS/pins.csv    | 15 +++++++++------
 10 files changed, 74 insertions(+), 34 deletions(-)

diff --git a/ports/samd/boards/ADAFRUIT_FEATHER_M0_EXPRESS/pins.csv b/ports/samd/boards/ADAFRUIT_FEATHER_M0_EXPRESS/pins.csv
index 0985ee1646d1f..45b05c2694f5b 100644
--- a/ports/samd/boards/ADAFRUIT_FEATHER_M0_EXPRESS/pins.csv
+++ b/ports/samd/boards/ADAFRUIT_FEATHER_M0_EXPRESS/pins.csv
@@ -5,6 +5,9 @@
 # Rows for empty entries have to start with '-'
 # Empty lines and lines starting with # are ignored
 
+PIN_PA27,LED_TX
+PIN_PB03,LED_RX
+
 PIN_PA11,D0
 PIN_PA10,D1
 PIN_PA14,D2
@@ -35,6 +38,8 @@ PIN_PB11,SCK
 PIN_PA06,NEOPIXEL
 PIN_PA13,FLASH_CS
 
-LED_PA17,LED
-LED_PA27,LED_TX
-LED_PB03,LED_RX
+PIN_PA24,USB_DM
+PIN_PA25,USB_DP
+
+PIN_PA30,SWCLK
+PIN_PA31,SWDIO
diff --git a/ports/samd/boards/ADAFRUIT_FEATHER_M4_EXPRESS/pins.csv b/ports/samd/boards/ADAFRUIT_FEATHER_M4_EXPRESS/pins.csv
index 32daac3d0f4c7..ca58a4be79f6b 100644
--- a/ports/samd/boards/ADAFRUIT_FEATHER_M4_EXPRESS/pins.csv
+++ b/ports/samd/boards/ADAFRUIT_FEATHER_M4_EXPRESS/pins.csv
@@ -7,12 +7,9 @@
 
 PIN_PB17,D0
 PIN_PB16,D1
--
--
 PIN_PA14,D4
 PIN_PA16,D5
 PIN_PA18,D6
--
 PIN_PB03,D8
 PIN_PA19,D9
 PIN_PA20,D10
@@ -40,4 +37,9 @@ PIN_PA09,FLASH_MISO
 PIN_PA10,FLASH_WP
 PIN_PA11,FLASH_HOLD
 
-LED_PA17,LED
+PIN_PA24,USB_DM
+PIN_PA25,USB_DP
+PIN_PA26,USB_SOF
+
+PIN_PA30,SWCLK
+PIN_PA31,SWDIO
diff --git a/ports/samd/boards/ADAFRUIT_ITSYBITSY_M0_EXPRESS/pins.csv b/ports/samd/boards/ADAFRUIT_ITSYBITSY_M0_EXPRESS/pins.csv
index d7d59c23575da..e93e00ab9c944 100644
--- a/ports/samd/boards/ADAFRUIT_ITSYBITSY_M0_EXPRESS/pins.csv
+++ b/ports/samd/boards/ADAFRUIT_ITSYBITSY_M0_EXPRESS/pins.csv
@@ -11,9 +11,7 @@ PIN_PA14,D2
 PIN_PA09,D3
 PIN_PA08,D4
 PIN_PA15,D5
--
 PIN_PA21,D7
--
 PIN_PA07,D9
 PIN_PA18,D10
 PIN_PA16,D11
@@ -37,4 +35,8 @@ PIN_PB03,FLASH_MISO
 PIN_PB23,FLASH_SCK
 PIN_PA27,FLASH_CS
 
-LED_PA17,LED
+PIN_PA24,USB_DM
+PIN_PA25,USB_DP
+
+PIN_PA30,SWCLK
+PIN_PA31,SWDIO
diff --git a/ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/pins.csv b/ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/pins.csv
index ce760a269c243..3dee9bf4c35d9 100644
--- a/ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/pins.csv
+++ b/ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/pins.csv
@@ -11,9 +11,7 @@ PIN_PA07,D2
 PIN_PB22,D3
 PIN_PA14,D4
 PIN_PA15,D5
--
 PIN_PA18,D7
--
 PIN_PA19,D9
 PIN_PA20,D10
 PIN_PA21,D11
@@ -39,4 +37,9 @@ PIN_PA09,FLASH_MISO
 PIN_PA10,FLASH_WP
 PIN_PA11,FLASH_HOLD
 
-LED_PA22,LED
+PIN_PA24,USB_DM
+PIN_PA25,USB_DP
+PIN_PA26,USB_SOF
+
+PIN_PA30,SWCLK
+PIN_PA31,SWDIO
diff --git a/ports/samd/boards/ADAFRUIT_TRINKET_M0/pins.csv b/ports/samd/boards/ADAFRUIT_TRINKET_M0/pins.csv
index 797b3f70bb921..95f76815f9808 100644
--- a/ports/samd/boards/ADAFRUIT_TRINKET_M0/pins.csv
+++ b/ports/samd/boards/ADAFRUIT_TRINKET_M0/pins.csv
@@ -13,4 +13,10 @@ PIN_PA06,D4
 PIN_PA00,DOTSTAR_DATA
 PIN_PA01,DOTSTAR_CLK
 
-LED_PA10,LED
+PIN_PA10,LED
+
+PIN_PA24,USB_DM
+PIN_PA25,USB_DP
+
+PIN_PA30,SWCLK
+PIN_PA31,SWDIO
diff --git a/ports/samd/boards/MINISAM_M4/pins.csv b/ports/samd/boards/MINISAM_M4/pins.csv
index cf9a3bd19b214..f6d0ab657fefb 100644
--- a/ports/samd/boards/MINISAM_M4/pins.csv
+++ b/ports/samd/boards/MINISAM_M4/pins.csv
@@ -27,4 +27,11 @@ PIN_PA01,SCK
 PIN_PB03,DOTSTAR_DATA
 PIN_PB02,DOTSTAR_CLK
 
-LED_PA15,LED
+PIN_PA15,LED
+
+PIN_PA24,USB_DM
+PIN_PA25,USB_DP
+PIN_PA26,USB_SOF
+
+PIN_PA30,SWCLK
+PIN_PA31,SWDIO
diff --git a/ports/samd/boards/SAMD21_XPLAINED_PRO/pins.csv b/ports/samd/boards/SAMD21_XPLAINED_PRO/pins.csv
index 438119d90c1a8..bd0757d5647c0 100644
--- a/ports/samd/boards/SAMD21_XPLAINED_PRO/pins.csv
+++ b/ports/samd/boards/SAMD21_XPLAINED_PRO/pins.csv
@@ -32,8 +32,6 @@ PIN_PB12,EXT2_PIN7
 PIN_PB13,EXT2_PIN8
 PIN_PB14,EXT2_PIN9
 PIN_PB15,EXT2_PIN10
--
--
 PIN_PB11,EXT2_PIN13
 PIN_PB10,EXT2_PIN14
 PIN_PA17,EXT2_PIN15
@@ -44,20 +42,21 @@ PIN_PA19,EXT2_PIN18
 # EXT3
 PIN_PA02,EXT3_PIN3
 PIN_PA03,EXT3_PIN4
--
 PIN_PA15,EXT3_PIN6
 PIN_PA12,EXT3_PIN7
 PIN_PA13,EXT3_PIN8
 PIN_PA28,EXT3_PIN9
 PIN_PA27,EXT3_PIN10
--
--
--
--
 PIN_PB17,EXT3_PIN15
 PIN_PB22,EXT3_PIN16
 PIN_PB16,EXT3_PIN17
 PIN_PB23,EXT3_PIN18
 
-LED_PB30,LED
+PIN_PB30,LED
+
+PIN_PA24,USB_DM
+PIN_PA25,USB_DP
+
+PIN_PA30,SWCLK
+PIN_PA31,SWDIO
 
diff --git a/ports/samd/boards/SEEED_WIO_TERMINAL/pins.csv b/ports/samd/boards/SEEED_WIO_TERMINAL/pins.csv
index 9bc57070d1985..4a3d9e21aee0a 100644
--- a/ports/samd/boards/SEEED_WIO_TERMINAL/pins.csv
+++ b/ports/samd/boards/SEEED_WIO_TERMINAL/pins.csv
@@ -60,5 +60,12 @@ PIN_PC13,LCD_YD
 PIN_PC30,MIC
 PIN_PD11,BUZZER
 
-LED_PA15,LED_BLUE
-LED_PC05,LED_LCD
+PIN_PA15,LED_BLUE
+PIN_PC05,LED_LCD
+
+PIN_PA24,USB_DM
+PIN_PA25,USB_DP
+PIN_PA26,USB_SOF
+
+PIN_PA30,SWCLK
+PIN_PA31,SWDIO
diff --git a/ports/samd/boards/SEEED_XIAO/pins.csv b/ports/samd/boards/SEEED_XIAO/pins.csv
index 8a70a77145639..a06d3ac6ac606 100644
--- a/ports/samd/boards/SEEED_XIAO/pins.csv
+++ b/ports/samd/boards/SEEED_XIAO/pins.csv
@@ -17,6 +17,12 @@ PIN_PA07,A8_D8
 PIN_PA05,A9_D9
 PIN_PA06,A10_D10
 
-LED_PA17,USER_LED
-LED_PA18,RX_LED
-LED_PA19,TX_LED
+PIN_PA17,USER_LED
+PIN_PA18,RX_LED
+PIN_PA19,TX_LED
+
+PIN_PA24,USB_DM
+PIN_PA25,USB_DP
+
+PIN_PA30,SWCLK
+PIN_PA31,SWDIO
diff --git a/ports/samd/boards/SPARKFUN_SAMD51_THING_PLUS/pins.csv b/ports/samd/boards/SPARKFUN_SAMD51_THING_PLUS/pins.csv
index b60fb909714e1..dfd6641333fa3 100644
--- a/ports/samd/boards/SPARKFUN_SAMD51_THING_PLUS/pins.csv
+++ b/ports/samd/boards/SPARKFUN_SAMD51_THING_PLUS/pins.csv
@@ -13,7 +13,6 @@ PIN_PA06,D4
 PIN_PA15,D5
 PIN_PA20,D6
 PIN_PA21,D7
--
 PIN_PA07,D9
 PIN_PA18,D10
 PIN_PA16,D11
@@ -34,9 +33,13 @@ PIN_PA08,FLASH_MOSI
 PIN_PA09,FLASH_SCK
 PIN_PA10,FLASH_CS
 PIN_PA11,FLASH_MISO
-PIN_PA30,SWDCLK
-PIN_PA31,SWDIO
 
-LED_PA17,LED
-LED_PB03,RXLED
-LED_PA27,TXLED
+PIN_PB03,RXLED
+PIN_PA27,TXLED
+
+PIN_PA24,USB_DM
+PIN_PA25,USB_DP
+PIN_PA26,USB_SOF
+
+PIN_PA30,SWCLK
+PIN_PA31,SWDIO

From 474233c250536612a5245231aff1ef3ad74ccf20 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Tue, 11 Oct 2022 10:05:01 +0200
Subject: [PATCH 2783/3533] samd/machine_pwm: Serialize fast update of PWM
 settings.

Any update of freq or duty_cycle requires the previous PWM cycle to be
finished.  Otherwise the new settings are not accepted.

Other changes in this commit:
- Report the set duty cycles even when the PWM is not yet started.
- pwm.freq(0) stops the pwm device, instead of raising an expception.
- Clear the duty cycle value cache on soft reset.
---
 ports/samd/machine_pwm.c | 51 ++++++++++++++++++++++++++++++++++++----
 1 file changed, 46 insertions(+), 5 deletions(-)

diff --git a/ports/samd/machine_pwm.c b/ports/samd/machine_pwm.c
index 2ae841a9743ba..f6b417631e1de 100644
--- a/ports/samd/machine_pwm.c
+++ b/ports/samd/machine_pwm.c
@@ -25,6 +25,7 @@
  * THE SOFTWARE.
  */
 
+#include <string.h>
 #include "py/runtime.h"
 #include "py/mphal.h"
 #include "modmachine.h"
@@ -46,6 +47,8 @@ typedef struct _machine_pwm_obj_t {
     uint8_t output;
     uint16_t prescaler;
     uint32_t period;  // full period count ticks
+    uint32_t duty_ns; // just for reporting
+    uint16_t duty_u16; // just for reporting
 } machine_pwm_obj_t;
 
 #define PWM_NOT_INIT    (0)
@@ -53,6 +56,7 @@ typedef struct _machine_pwm_obj_t {
 #define PWM_TCC_ENABLED (2)
 #define PWM_MASTER_CLK  (get_peripheral_freq())
 #define PWM_FULL_SCALE  (65536)
+#define PWM_UPDATE_TIMEOUT (2000)
 
 static Tcc *tcc_instance[] = TCC_INSTS;
 
@@ -148,6 +152,7 @@ STATIC mp_obj_t mp_machine_pwm_make_new(const mp_obj_type_t *type, size_t n_args
     self->output = config.device_channel & 0x0f;
     self->prescaler = 1;
     self->period = 1; // Use an invalid but safe value
+    self->duty_u16 = self->duty_ns = 0;
     put_duty_value(self->device, self->channel, 0);
 
     Tcc *tcc = self->instance;
@@ -240,6 +245,7 @@ void pwm_deinit_all(void) {
         device_status[i] = PWM_NOT_INIT;
         duty_type_flags[i] = 0;
         output_active[i] = 0;
+        memset(pwm_duty_values, 0, sizeof(pwm_duty_values));
     }
 }
 
@@ -256,8 +262,25 @@ STATIC void mp_machine_pwm_deinit(machine_pwm_obj_t *self) {
     }
 }
 
+STATIC void wait_for_register_update(Tcc *tcc) {
+    // Wait for a period's end (may be long) to have the change settled
+    // Each loop cycle takes at least 1 ms, giving an implicit timeout.
+    for (int i = 0; i < PWM_UPDATE_TIMEOUT; i++) {
+        if (tcc->INTFLAG.reg & TCC_INTFLAG_OVF) {
+            break;
+        }
+        MICROPY_EVENT_POLL_HOOK
+    }
+    // Clear the flag, telling that a cycle has been handled.
+    tcc->INTFLAG.reg = TCC_INTFLAG_OVF;
+}
+
 STATIC mp_obj_t mp_machine_pwm_freq_get(machine_pwm_obj_t *self) {
-    return MP_OBJ_NEW_SMALL_INT(PWM_MASTER_CLK / self->prescaler / self->period);
+    if (self->instance->CTRLA.reg & TCC_CTRLA_ENABLE) {
+        return MP_OBJ_NEW_SMALL_INT(PWM_MASTER_CLK / self->prescaler / self->period);
+    } else {
+        return MP_OBJ_NEW_SMALL_INT(0);
+    }
 }
 
 STATIC void mp_machine_pwm_freq_set(machine_pwm_obj_t *self, mp_int_t freq) {
@@ -267,7 +290,8 @@ STATIC void mp_machine_pwm_freq_set(machine_pwm_obj_t *self, mp_int_t freq) {
 
     Tcc *tcc = self->instance;
     if (freq < 1) {
-        mp_raise_ValueError(MP_ERROR_TEXT("invalid freq"));
+        pwm_stop_device(self->device);
+        return;
     }
 
     // Get the actual settings of prescaler & period from the unit
@@ -288,6 +312,11 @@ STATIC void mp_machine_pwm_freq_set(machine_pwm_obj_t *self, mp_int_t freq) {
     if (period < 2) {
         mp_raise_ValueError(MP_ERROR_TEXT("freq too large"));
     }
+    // If the PWM is running, ensure that a cycle has passed since the
+    // previous setting before setting a new frequency/duty value
+    if (tcc->CTRLA.reg & TCC_CTRLA_ENABLE) {
+        wait_for_register_update(tcc);
+    }
     // Check, if the prescaler has to be changed and stop the device if so.
     if (index != tcc->CTRLA.bit.PRESCALER) {
         // stop the device
@@ -339,25 +368,37 @@ STATIC void mp_machine_pwm_freq_set(machine_pwm_obj_t *self, mp_int_t freq) {
 }
 
 STATIC mp_obj_t mp_machine_pwm_duty_get_u16(machine_pwm_obj_t *self) {
-    return MP_OBJ_NEW_SMALL_INT(self->instance->CC[self->channel].reg * PWM_FULL_SCALE / (self->instance->PER.reg + 1));
+    return MP_OBJ_NEW_SMALL_INT(self->duty_u16);
 }
 
 STATIC void mp_machine_pwm_duty_set_u16(machine_pwm_obj_t *self, mp_int_t duty_u16) {
+    // Remember the values for update & reporting
     put_duty_value(self->device, self->channel, duty_u16);
+    self->duty_u16 = duty_u16;
+    self->duty_ns = 0;
     // If the device is enabled, than the period is set and we get a reasonable value for
     // the duty cycle, set to the CCBUF register. Otherwise, PWM does not start.
     if (self->instance->CTRLA.reg & TCC_CTRLA_ENABLE) {
-        self->instance->CCBUF[self->channel].reg = (uint64_t)duty_u16 * (self->instance->PER.reg + 1) / PWM_FULL_SCALE;
+        // Ensure that a cycle has passed updating the registers
+        // since the previous setting before setting a new duty value
+        wait_for_register_update(self->instance);
+        self->instance->CCBUF[self->channel].reg = (uint64_t)duty_u16 * (self->period) / PWM_FULL_SCALE;
     }
     duty_type_flags[self->device] |= 1 << self->channel;
 }
 
 STATIC mp_obj_t mp_machine_pwm_duty_get_ns(machine_pwm_obj_t *self) {
-    return MP_OBJ_NEW_SMALL_INT(1000000000ULL * self->instance->CC[self->channel].reg * self->prescaler / PWM_MASTER_CLK);
+    return MP_OBJ_NEW_SMALL_INT(self->duty_ns);
 }
 
 STATIC void mp_machine_pwm_duty_set_ns(machine_pwm_obj_t *self, mp_int_t duty_ns) {
+    // Remember the values for update & reporting
     put_duty_value(self->device, self->channel, duty_ns);
+    self->duty_ns = duty_ns;
+    self->duty_u16 = 0;
+    // Ensure that a cycle has passed updating the registers
+    // since the previous setting before setting a new duty value
+    wait_for_register_update(self->instance);
     self->instance->CCBUF[self->channel].reg = (uint64_t)duty_ns * PWM_MASTER_CLK / self->prescaler / 1000000000ULL;
     duty_type_flags[self->device] &= ~(1 << self->channel);
 }

From 9c2bc379f183ff9f3280842eb236e8f4b8635835 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sat, 8 Oct 2022 12:32:55 +0200
Subject: [PATCH 2784/3533] samd/machine_uart: Use a finaliser to tidy up UART
 on soft reset.

And use the common sercom_table, saving a few bytes of RAM.
---
 ports/samd/machine_uart.c | 22 ++++++++--------------
 ports/samd/main.c         |  2 --
 2 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/ports/samd/machine_uart.c b/ports/samd/machine_uart.c
index 76b564e874a66..2526b450931bc 100644
--- a/ports/samd/machine_uart.c
+++ b/ports/samd/machine_uart.c
@@ -59,7 +59,7 @@ typedef struct _machine_uart_obj_t {
 } machine_uart_obj_t;
 
 Sercom *sercom_instance[] = SERCOM_INSTS;
-machine_uart_obj_t *uart_table[SERCOM_INST_NUM] = {};
+extern void *sercom_table[SERCOM_INST_NUM];
 
 STATIC const char *_parity_name[] = {"None", "", "0", "1"};  // Is defined as 0, 2, 3
 
@@ -82,7 +82,7 @@ STATIC void uart_drain_rx_fifo(machine_uart_obj_t *self, Sercom *uart) {
 }
 
 void common_uart_irq_handler(int uart_id) {
-    machine_uart_obj_t *self = uart_table[uart_id];
+    machine_uart_obj_t *self = sercom_table[uart_id];
     // Handle IRQ
     if (self != NULL) {
         Sercom *uart = sercom_instance[self->id];
@@ -322,7 +322,8 @@ STATIC mp_obj_t machine_uart_make_new(const mp_obj_type_t *type, size_t n_args,
     }
 
     // Create the UART object and fill it with defaults.
-    machine_uart_obj_t *self = mp_obj_malloc(machine_uart_obj_t, &machine_uart_type);
+    machine_uart_obj_t *self = m_new_obj_with_finaliser(machine_uart_obj_t);
+    self->base.type = &machine_uart_type;
     self->id = uart_id;
     self->baudrate = DEFAULT_UART_BAUDRATE;
     self->bits = 8;
@@ -332,7 +333,7 @@ STATIC mp_obj_t machine_uart_make_new(const mp_obj_type_t *type, size_t n_args,
     self->tx = 0xff;
     self->rx = 0xff;
     self->new = true;
-    uart_table[uart_id] = self;
+    sercom_table[uart_id] = self;
 
     mp_map_t kw_args;
     mp_map_init_fixed_table(&kw_args, n_kw, args + n_args);
@@ -348,10 +349,10 @@ MP_DEFINE_CONST_FUN_OBJ_KW(machine_uart_init_obj, 1, machine_uart_init);
 STATIC mp_obj_t machine_uart_deinit(mp_obj_t self_in) {
     machine_uart_obj_t *self = MP_OBJ_TO_PTR(self_in);
     Sercom *uart = sercom_instance[self->id];
-    // clear table entry of uart
-    uart_table[self->id] = NULL;
     // Disable interrupts
     uart->USART.INTENCLR.reg = 0xff;
+    // clear table entry of uart
+    sercom_table[self->id] = NULL;
     MP_STATE_PORT(samd_uart_rx_buffer[self->id]) = NULL;
     #if MICROPY_HW_UART_TXBUF
     MP_STATE_PORT(samd_uart_tx_buffer[self->id]) = NULL;
@@ -409,14 +410,6 @@ STATIC mp_obj_t machine_uart_txdone(mp_obj_t self_in) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_uart_txdone_obj, machine_uart_txdone);
 
-void uart_deinit_all(void) {
-    for (int i = 0; i < SERCOM_INST_NUM; i++) {
-        if (uart_table[i] != NULL) {
-            machine_uart_deinit((mp_obj_t)uart_table[i]);
-        }
-    }
-}
-
 STATIC const mp_rom_map_elem_t machine_uart_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_init), MP_ROM_PTR(&machine_uart_init_obj) },
     { MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&machine_uart_deinit_obj) },
@@ -430,6 +423,7 @@ STATIC const mp_rom_map_elem_t machine_uart_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_readline), MP_ROM_PTR(&mp_stream_unbuffered_readline_obj) },
     { MP_ROM_QSTR(MP_QSTR_readinto), MP_ROM_PTR(&mp_stream_readinto_obj) },
     { MP_ROM_QSTR(MP_QSTR_write), MP_ROM_PTR(&mp_stream_write_obj) },
+    { MP_ROM_QSTR(MP_QSTR___del__), MP_ROM_PTR(&machine_uart_deinit_obj) },
 };
 STATIC MP_DEFINE_CONST_DICT(machine_uart_locals_dict, machine_uart_locals_dict_table);
 
diff --git a/ports/samd/main.c b/ports/samd/main.c
index 0f24e2382ee89..725fd651d02c2 100644
--- a/ports/samd/main.c
+++ b/ports/samd/main.c
@@ -39,7 +39,6 @@ extern void adc_deinit_all(void);
 extern void pin_irq_deinit_all(void);
 extern void pwm_deinit_all(void);
 extern void sercom_deinit_all(void);
-extern void uart_deinit_all(void);
 
 void samd_main(void) {
     mp_stack_set_top(&_estack);
@@ -86,7 +85,6 @@ void samd_main(void) {
         pin_irq_deinit_all();
         pwm_deinit_all();
         sercom_deinit_all();
-        uart_deinit_all();
         soft_timer_deinit();
         gc_sweep_all();
         mp_deinit();

From d74215a3137da5e9001aed92c8c1b06d828ff9d2 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sat, 8 Oct 2022 12:34:45 +0200
Subject: [PATCH 2785/3533] samd/machine_spi: Implement spi.deinit() and
 simplify sercom_deinit_all.

The sercom_deinit_all() function does not need the object pointers.
---
 ports/samd/machine_spi.c | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/ports/samd/machine_spi.c b/ports/samd/machine_spi.c
index 43150f67f15a3..d4c7a05bb60f1 100644
--- a/ports/samd/machine_spi.c
+++ b/ports/samd/machine_spi.c
@@ -254,17 +254,23 @@ STATIC mp_obj_t machine_spi_make_new(const mp_obj_type_t *type, size_t n_args, s
     return self;
 }
 
+STATIC void machine_sercom_deinit(mp_obj_base_t *self_in) {
+    machine_spi_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    Sercom *spi = sercom_instance[self->id];
+    // Disable interrupts (if any)
+    spi->SPI.INTENCLR.reg = 0xff;
+    sercom_enable(spi, 0);
+    // clear table entry of spi
+    sercom_table[self->id] = NULL;
+}
+
 void sercom_deinit_all(void) {
     for (int i = 0; i < SERCOM_INST_NUM; i++) {
-        if (sercom_table[i] != NULL) {
-            machine_spi_obj_t *self = sercom_table[i];
-            Sercom *spi = sercom_instance[self->id];
-            // Disable interrupts (if any)
-            spi->SPI.INTENCLR.reg = 0xff;
-            // clear table entry of spi
-            sercom_table[i] = NULL;
-            sercom_enable(spi, 0);
-        }
+        Sercom *spi = sercom_instance[i];
+        spi->SPI.INTENCLR.reg = 0xff;
+        sercom_register_irq(i, NULL);
+        sercom_enable(spi, 0);
+        sercom_table[i] = NULL;
     }
 }
 
@@ -316,6 +322,7 @@ STATIC void machine_spi_transfer(mp_obj_base_t *self_in, size_t len, const uint8
 
 STATIC const mp_machine_spi_p_t machine_spi_p = {
     .init = machine_spi_init,
+    .deinit = machine_sercom_deinit,
     .transfer = machine_spi_transfer,
 };
 

From a1eebc507eda8f5ec052d0ef0450c52f2320e106 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Thu, 13 Oct 2022 19:04:37 +0200
Subject: [PATCH 2786/3533] samd/machine_spi: Register SerCom objects as root
 pointers.

Protect SerCom (UART, SPI, I2C) objects from getting freed by the GC when
they go out of scope without being deinitialized.  Otherwise the ISR of a
Sercom may access an invalid data structure.
---
 ports/samd/machine_i2c.c  |  5 ++---
 ports/samd/machine_spi.c  | 10 +++++-----
 ports/samd/machine_uart.c |  7 +++----
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/ports/samd/machine_i2c.c b/ports/samd/machine_i2c.c
index 0a8f5b94db081..d943b6b2f4221 100644
--- a/ports/samd/machine_i2c.c
+++ b/ports/samd/machine_i2c.c
@@ -69,7 +69,6 @@ typedef struct _machine_i2c_obj_t {
 } machine_i2c_obj_t;
 
 extern Sercom *sercom_instance[];
-extern void *sercom_table[SERCOM_INST_NUM];
 
 STATIC void i2c_send_command(Sercom *i2c, uint8_t command) {
     i2c->I2CM.CTRLB.bit.CMD = command;
@@ -79,7 +78,7 @@ STATIC void i2c_send_command(Sercom *i2c, uint8_t command) {
 
 void common_i2c_irq_handler(int i2c_id) {
     // handle Sercom I2C IRQ
-    machine_i2c_obj_t *self = sercom_table[i2c_id];
+    machine_i2c_obj_t *self = MP_STATE_PORT(sercom_table[i2c_id]);
     // Handle IRQ
     if (self != NULL) {
         Sercom *i2c = self->instance;
@@ -159,7 +158,7 @@ mp_obj_t machine_i2c_make_new(const mp_obj_type_t *type, size_t n_args, size_t n
     if (sda_pad_config.pad_nr != 0 || scl_pad_config.pad_nr != 1) {
         mp_raise_ValueError(MP_ERROR_TEXT("invalid pin for sda or scl"));
     }
-    sercom_table[self->id] = self;
+    MP_STATE_PORT(sercom_table[self->id]) = self;
     self->freq = args[ARG_freq].u_int;
 
     // Configure the Pin mux.
diff --git a/ports/samd/machine_spi.c b/ports/samd/machine_spi.c
index d4c7a05bb60f1..4ffc7095cc2ee 100644
--- a/ports/samd/machine_spi.c
+++ b/ports/samd/machine_spi.c
@@ -57,11 +57,11 @@ typedef struct _machine_spi_obj_t {
 } machine_spi_obj_t;
 
 extern Sercom *sercom_instance[];
-void *sercom_table[SERCOM_INST_NUM] = {};
+MP_REGISTER_ROOT_POINTER(void *sercom_table[SERCOM_INST_NUM]);
 
 void common_spi_irq_handler(int spi_id) {
     // handle Sercom IRQ RXC
-    machine_spi_obj_t *self = sercom_table[spi_id];
+    machine_spi_obj_t *self = MP_STATE_PORT(sercom_table[spi_id]);
     // Handle IRQ
     if (self != NULL) {
         Sercom *spi = sercom_instance[self->id];
@@ -246,7 +246,7 @@ STATIC mp_obj_t machine_spi_make_new(const mp_obj_type_t *type, size_t n_args, s
     self->sck = 0xff;
 
     self->new = true;
-    sercom_table[spi_id] = self;
+    MP_STATE_PORT(sercom_table[spi_id]) = self;
 
     mp_map_t kw_args;
     mp_map_init_fixed_table(&kw_args, n_kw, args + n_args);
@@ -261,7 +261,7 @@ STATIC void machine_sercom_deinit(mp_obj_base_t *self_in) {
     spi->SPI.INTENCLR.reg = 0xff;
     sercom_enable(spi, 0);
     // clear table entry of spi
-    sercom_table[self->id] = NULL;
+    MP_STATE_PORT(sercom_table[self->id]) = NULL;
 }
 
 void sercom_deinit_all(void) {
@@ -270,7 +270,7 @@ void sercom_deinit_all(void) {
         spi->SPI.INTENCLR.reg = 0xff;
         sercom_register_irq(i, NULL);
         sercom_enable(spi, 0);
-        sercom_table[i] = NULL;
+        MP_STATE_PORT(sercom_table[i]) = NULL;
     }
 }
 
diff --git a/ports/samd/machine_uart.c b/ports/samd/machine_uart.c
index 2526b450931bc..4b8fa3b60d8f8 100644
--- a/ports/samd/machine_uart.c
+++ b/ports/samd/machine_uart.c
@@ -59,7 +59,6 @@ typedef struct _machine_uart_obj_t {
 } machine_uart_obj_t;
 
 Sercom *sercom_instance[] = SERCOM_INSTS;
-extern void *sercom_table[SERCOM_INST_NUM];
 
 STATIC const char *_parity_name[] = {"None", "", "0", "1"};  // Is defined as 0, 2, 3
 
@@ -82,7 +81,7 @@ STATIC void uart_drain_rx_fifo(machine_uart_obj_t *self, Sercom *uart) {
 }
 
 void common_uart_irq_handler(int uart_id) {
-    machine_uart_obj_t *self = sercom_table[uart_id];
+    machine_uart_obj_t *self = MP_STATE_PORT(sercom_table[uart_id]);
     // Handle IRQ
     if (self != NULL) {
         Sercom *uart = sercom_instance[self->id];
@@ -333,7 +332,7 @@ STATIC mp_obj_t machine_uart_make_new(const mp_obj_type_t *type, size_t n_args,
     self->tx = 0xff;
     self->rx = 0xff;
     self->new = true;
-    sercom_table[uart_id] = self;
+    MP_STATE_PORT(sercom_table[uart_id]) = self;
 
     mp_map_t kw_args;
     mp_map_init_fixed_table(&kw_args, n_kw, args + n_args);
@@ -352,7 +351,7 @@ STATIC mp_obj_t machine_uart_deinit(mp_obj_t self_in) {
     // Disable interrupts
     uart->USART.INTENCLR.reg = 0xff;
     // clear table entry of uart
-    sercom_table[self->id] = NULL;
+    MP_STATE_PORT(sercom_table[self->id]) = NULL;
     MP_STATE_PORT(samd_uart_rx_buffer[self->id]) = NULL;
     #if MICROPY_HW_UART_TXBUF
     MP_STATE_PORT(samd_uart_tx_buffer[self->id]) = NULL;

From fcccfc176b225001b402ce2ced062344990789e0 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Mon, 17 Oct 2022 18:05:28 +0200
Subject: [PATCH 2787/3533] samd/modmachine: Add machine.softreset().

For consistency with other ports.
---
 ports/samd/modmachine.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/ports/samd/modmachine.c b/ports/samd/modmachine.c
index 47fc03d824100..8adc06f526540 100644
--- a/ports/samd/modmachine.c
+++ b/ports/samd/modmachine.c
@@ -32,6 +32,7 @@
 #include "extmod/machine_signal.h"
 #include "extmod/machine_spi.h"
 #include "drivers/dht/dht.h"
+#include "shared/runtime/pyexec.h"
 #include "modmachine.h"
 #include "samd_soc.h"
 
@@ -57,6 +58,12 @@
 extern bool EIC_occured;
 extern uint32_t _dbl_tap_addr;
 
+STATIC mp_obj_t machine_soft_reset(void) {
+    pyexec_system_exit = PYEXEC_FORCED_EXIT;
+    mp_raise_type(&mp_type_SystemExit);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(machine_soft_reset_obj, machine_soft_reset);
+
 STATIC mp_obj_t machine_reset(void) {
     *DBL_TAP_ADDR = DBL_TAP_MAGIC_RESET;
     #ifdef DBL_TAP_ADDR_ALT
@@ -219,6 +226,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_lightsleep_obj, 0, 1, machine
 
 STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__),            MP_ROM_QSTR(MP_QSTR_umachine) },
+    { MP_ROM_QSTR(MP_QSTR_soft_reset),          MP_ROM_PTR(&machine_soft_reset_obj) },
     { MP_ROM_QSTR(MP_QSTR_reset),               MP_ROM_PTR(&machine_reset_obj) },
     { MP_ROM_QSTR(MP_QSTR_bootloader),          MP_ROM_PTR(&machine_bootloader_obj) },
     { MP_ROM_QSTR(MP_QSTR_freq),                MP_ROM_PTR(&machine_freq_obj) },

From d75c7e822cbfe7014fede1420f996a0af04bb13c Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Wed, 21 Sep 2022 09:57:10 +1000
Subject: [PATCH 2788/3533] py/obj: Add comments explaining the slot index
 scheme.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 py/obj.h | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/py/obj.h b/py/obj.h
index 8d62dd4f3cf01..b5b855bad395c 100644
--- a/py/obj.h
+++ b/py/obj.h
@@ -753,10 +753,16 @@ typedef struct _mp_obj_full_type_t {
 #define MP_DEFINE_CONST_OBJ_TYPE_NARGS_11(_struct_type, _typename, _name, _flags, f1, v1, f2, v2, f3, v3, f4, v4, f5, v5, f6, v6, f7, v7, f8, v8, f9, v9, f10, v10, f11, v11) const _struct_type _typename = { .base = { &mp_type_type }, .name = _name, .flags = _flags, .slot_index_##f1 = 1, .slot_index_##f2 = 2, .slot_index_##f3 = 3, .slot_index_##f4 = 4, .slot_index_##f5 = 5, .slot_index_##f6 = 6, .slot_index_##f7 = 7, .slot_index_##f8 = 8, .slot_index_##f9 = 9, .slot_index_##f10 = 10, .slot_index_##f11 = 11, .slots = { v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, } }
 #define MP_DEFINE_CONST_OBJ_TYPE_NARGS_12(_struct_type, _typename, _name, _flags, f1, v1, f2, v2, f3, v3, f4, v4, f5, v5, f6, v6, f7, v7, f8, v8, f9, v9, f10, v10, f11, v11, f12, v12) const _struct_type _typename = { .base = { &mp_type_type }, .name = _name, .flags = _flags, .slot_index_##f1 = 1, .slot_index_##f2 = 2, .slot_index_##f3 = 3, .slot_index_##f4 = 4, .slot_index_##f5 = 5, .slot_index_##f6 = 6, .slot_index_##f7 = 7, .slot_index_##f8 = 8, .slot_index_##f9 = 9, .slot_index_##f10 = 10, .slot_index_##f11 = 11, .slot_index_##f12 = 12, .slots = { v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, } }
 
+// Because the mp_obj_type_t instances are in (zero-initialised) ROM, we take
+// slot_index_foo=0 to mean that the slot is unset. This also simplifies checking
+// if the slot is set. That means that we need to store index+1 in slot_index_foo
+// though and then access it as slots[slot_index_foo - 1]. This is an implementation
+// detail, the user of these macros doesn't need to be aware of it, and when using
+// MP_OBJ_TYPE_OFFSETOF_SLOT you should use zero-based indexing.
 #define MP_OBJ_TYPE_HAS_SLOT(t, f) ((t)->slot_index_##f)
 #define MP_OBJ_TYPE_GET_SLOT(t, f) (_MP_OBJ_TYPE_SLOT_TYPE_##f(t)->slots[(t)->slot_index_##f - 1])
 #define MP_OBJ_TYPE_GET_SLOT_OR_NULL(t, f) (_MP_OBJ_TYPE_SLOT_TYPE_##f(MP_OBJ_TYPE_HAS_SLOT(t, f) ? MP_OBJ_TYPE_GET_SLOT(t, f) : NULL))
-#define MP_OBJ_TYPE_SET_SLOT(t, f, v, n) ((t)->slot_index_##f = (n) + 1, (t)->slots[(t)->slot_index_##f - 1] = (void *)v)
+#define MP_OBJ_TYPE_SET_SLOT(t, f, v, n) ((t)->slot_index_##f = (n) + 1, (t)->slots[(n)] = (void *)v)
 #define MP_OBJ_TYPE_OFFSETOF_SLOT(f) (offsetof(mp_obj_type_t, slot_index_##f))
 #define MP_OBJ_TYPE_HAS_SLOT_BY_OFFSET(t, offset) (*(uint8_t *)((char *)(t) + (offset)) != 0)
 

From 64af916c111b61bce82c00f356a6b1cb81946d87 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Tue, 18 Oct 2022 16:24:33 +1100
Subject: [PATCH 2789/3533] docs/templates/layout.html: Indicate latest vs
 release docs.

When looking at latest (the default for docs.micropython.org), make it
clear that this isn't the release version.
 - Changes the version in the top-left to "latest".
 - Adds a message to the top of each page to explain.

For future release versions, add a short message to link to the latest
version.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 docs/conf.py                 |  3 ++-
 docs/templates/layout.html   | 25 +++++++++++++++++++++++++
 docs/templates/topindex.html |  3 +--
 3 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/docs/conf.py b/docs/conf.py
index 5533bf01918a7..ce5c037568adf 100755
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -33,6 +33,7 @@
     'downloads':[
         ('PDF', url_pattern % micropy_version + '/micropython-docs.pdf'),
     ],
+    'is_release': micropy_version != 'latest',
 }
 
 
@@ -74,7 +75,7 @@
 #
 # We don't follow "The short X.Y version" vs "The full version, including alpha/beta/rc tags"
 # breakdown, so use the same version identifier for both to avoid confusion.
-version = release = '1.19.1'
+version = release = micropy_version
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/docs/templates/layout.html b/docs/templates/layout.html
index a6caa0bc5a113..8563f02af00a1 100644
--- a/docs/templates/layout.html
+++ b/docs/templates/layout.html
@@ -4,3 +4,28 @@
 {# we change the master_doc variable so that links to the index
    page are to index.html instead of <port>_index.html #}
 {% set master_doc = "index" %}
+
+{% block document %}
+  {% if is_release %}
+    <div class="wy-alert wy-alert-danger">
+      <p>
+        This is the v{{ release }} version of the MicroPython
+        documentation. The <a href="/en/latest/{{ pagename }}.html">latest
+        development version</a> of this page may be more current.
+      </p>
+    </div>
+  {% else %}
+    <div class="wy-alert wy-alert-danger">
+      <p>
+        This is the documentation for the latest development branch of
+        MicroPython and may refer to features that are not available in released
+        versions.
+      </p>
+      <p>
+        If you are looking for the documentation for a specific release, use
+        the drop-down menu on the left and select the desired version.
+      </p>
+    </div>
+  {% endif %}
+  {{ super() }}
+{% endblock %}
diff --git a/docs/templates/topindex.html b/docs/templates/topindex.html
index cfe3ad1516ac6..4e163b6efe90f 100644
--- a/docs/templates/topindex.html
+++ b/docs/templates/topindex.html
@@ -5,8 +5,7 @@
   <h1>MicroPython documentation</h1>
 
   <p>
-    {{ _('Welcome! This is the documentation for MicroPython') }}
-    v{{ release|e }}{% if last_updated %}, {{ _('last updated') }} {{ last_updated|e }}{% endif %}.
+    {{ _('Welcome! This is the documentation for MicroPython') }}{% if last_updated %}, {{ _('last updated') }} {{ last_updated|e }}{% endif %}.
   </p>
 
   <p>

From 11910e2fa1c8f5dc76cbc90598ff81526d1f6312 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Mon, 20 Jun 2022 14:02:30 +0200
Subject: [PATCH 2790/3533] docs/samd: Add documentation for the samd port.

Includes a general overview, a quickref, pinout tables, and the beginnings
of a tutorial.
---
 docs/index.rst                         |   1 +
 docs/samd/general.rst                  |  88 +++
 docs/samd/img/itsybitsy_m4_express.jpg | Bin 0 -> 151296 bytes
 docs/samd/pinout.rst                   | 850 +++++++++++++++++++++++++
 docs/samd/quickref.rst                 | 469 ++++++++++++++
 docs/samd/tutorial/intro.rst           |  84 +++
 docs/templates/topindex.html           |   4 +
 7 files changed, 1496 insertions(+)
 create mode 100644 docs/samd/general.rst
 create mode 100644 docs/samd/img/itsybitsy_m4_express.jpg
 create mode 100644 docs/samd/pinout.rst
 create mode 100644 docs/samd/quickref.rst
 create mode 100644 docs/samd/tutorial/intro.rst

diff --git a/docs/index.rst b/docs/index.rst
index 9a021b3906d46..64b83618da149 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -17,3 +17,4 @@ MicroPython documentation and references
     unix/quickref.rst
     zephyr/quickref.rst
     renesas-ra/quickref.rst
+    samd/quickref.rst
diff --git a/docs/samd/general.rst b/docs/samd/general.rst
new file mode 100644
index 0000000000000..66e6d2a31f69d
--- /dev/null
+++ b/docs/samd/general.rst
@@ -0,0 +1,88 @@
+.. _samd_general:
+
+General information about the SAMD port
+=======================================
+
+The SAMD21/SAMD51 MCU family is a high performance family of devices made by MicroChip.
+The SAMD21 devices are based on an ARM M0+ core, the SAMD51 device on ARM Cortex M4 core.
+They provide many on-chip I/O units for building small to medium sized devices.
+
+Multitude of boards
+-------------------
+
+There is a multitude of modules and boards from different sources which carry
+an SAMD21/SAMD51 chip.  MicroPython aims to provide a generic port which runs on
+as many boards/modules as possible, but there may be limitations.  The
+Adafruit ItsyBitsy M0 Express, Adafruit Feather M4 Express and the Adafruit ItsyBitsy M4 Express
+development boards are taken as reference for the port (for example, testing is performed on them).
+For any board you are using please make sure you have a data sheet, schematics
+and other reference materials so you can look up any board-specific functions.
+
+The following boards are at the moment supported by the port:
+
+- ADAFRUIT FEATHER M0 EXPRESS
+- ADAFRUIT FEATHER M4 EXPRESS
+- ADAFRUIT ITSYBITSY M0 EXPRESS
+- ADAFRUIT ITSYBITSY M4 EXPRESS
+- ADAFRUIT TRINKET M0
+- MINISAM M4
+- SAMD21 XPLAINED PRO
+- SEEED WIO TERMINAL
+- SEEED XIAO
+
+To make a generic SAMD port and support as many boards as possible the
+following design and implementation decision were made:
+
+* GPIO pin numbering is based on the board numbering.
+  Please have the manual/pin diagram of your board at hand
+  to find correspondence between your board pins and actual SAMD21/SAMD51 pins.
+  For the boards listed above, the relation between the board pin number and
+  the GPIO number can be found at :ref:`samd_pinout`.
+* The pins that can be used by MicroPython are limited to those listed
+  in the board definition files.
+
+Technical specifications and SoC data sheets
+--------------------------------------------
+
+The data sheets and other reference material for SAMD21/SAMD51 chip are available
+from the vendor site: https://www.microchip.com/en-us/products/microcontrollers-and-microprocessors/32-bit-mcus/sam-32-bit-mcus
+They are the primary reference for the chip technical specifications, capabilities,
+operating modes, internal functioning, etc.
+
+For your convenience, a few technical specifications are provided below:
+
+SAMD21:
+
+* Architecture: ARM Cortex M0+
+* CPU frequency: up to 48MHz
+* Total RAM available: up to 32 kB (see table)
+* Internal FlashROM: up to 256 kB
+  Some boards provide additional external SPI flash.
+* GPIO: up to 52 (GPIOs are multiplexed with other functions, including
+  external FlashROM, UART, etc.)
+* UART: up to 6 serial devices, which can used for UART, SPI or I2C.
+* I2S: 1 I2S interfaces
+* ADC: One 12-bit SAR ADC converter with 16 channels.
+* Programming: using BootROM bootloader from USB.
+
+SAMD51:
+
+* Architecture: ARM Cortex M4
+* CPU frequency: up to 120MHz
+* Total RAM available: up to 256 kB
+* Internal FlashROM: up to 1 MB
+  Some boards provide additional external SPI flash.
+* GPIO: up to 99 (GPIOs are multiplexed with other functions, including
+  external FlashROM, UART, etc.)
+* UART: up to 8 serial devices, which can used for UART, SPI or I2C.
+* I2S: 1 I2S interfaces
+* ADC: Dual 12-bit SAR ADC converter with 16 channels.
+* Programming: using BootROM bootloader from USB.
+
+
+For more information see the excellent SAMD21/SAMD51 data sheets or reference manuals.
+
+At the moment, the SAM21 port of MicroPython requires 256kB flash, of which 64kB is used
+for a small file system. The SAM51 port requires 512 kB of flash, of which all flash beyond
+384kB is used for a file system. Some boards have additional flash memory, which can be used
+as additional file space.
diff --git a/docs/samd/img/itsybitsy_m4_express.jpg b/docs/samd/img/itsybitsy_m4_express.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..ea18b5c3899dee9a6668451c794d3d50ad0fa390
GIT binary patch
literal 151296
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%0A%4ow`
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
Xh{Ssd+t0FRX#At&<8SrXIs^aN+iI5(

literal 0
HcmV?d00001

diff --git a/docs/samd/pinout.rst b/docs/samd/pinout.rst
new file mode 100644
index 0000000000000..7e8d7ad9014eb
--- /dev/null
+++ b/docs/samd/pinout.rst
@@ -0,0 +1,850 @@
+.. _samd_pinout:
+
+Pinout for the SAMD machine modules
+===================================
+
+The assignment of device functions to pins is very flexible. The same function may be used
+at different pins. The representation of the assignment choices are given by a table,
+which is a subset of the MCU's Pin MUX table and is specific to each board, as the
+available pin set varies. The structure of the table is the same for each board, but
+the set of rows is different.
+
+.. _samd21_pinout_table:
+
+Adafruit ItsyBitsy M0 Express pin assignment table
+--------------------------------------------------
+
+=== ==== ============ ==== ==== ====== ====== ====== ======
+Pin GPIO Pin name     IRQ  ADC  Serial Serial TCC/TC TCC/TC
+=== ==== ============ ==== ==== ====== ====== ====== ======
+  0 PA11           D0  11   19    0/3    2/3   1/1    0/3
+  1 PA10           D1  10   18    0/2    2/2   1/0    0/2
+  2 PA14           D2  14    -    2/2    4/2   3/0    0/4
+  3 PA09           D3   9   17    0/1    2/1   0/1    1/3
+  4 PA08           D4   -   16    0/0    2/0   0/0    1/2
+  5 PA15           D5  15    -    2/3    4/3   3/1    0/5
+  7 PA21           D7   5    -    5/3    3/3   7/1    0/7
+  9 PA07           D9   7    7     -     0/3   1/1     -
+ 10 PA18          D10   2    -    1/2    3/2   3/0    0/2
+ 11 PA16          D11   0    -    1/0    3/0   2/0    0/6
+ 12 PA19          D12   3    -    1/3    3/3   3/1    0/3
+ 13 PA17          D13   1    -    1/1    3/1   2/1    0/7
+ 14 PA02           A0   2    0     -      -     -      -
+ 15 PB08           A1   8    2     -     4/0   4/0     -
+ 16 PB09           A2   9    3     -     4/1   4/1     -
+ 17 PA04           A3   4    4     -     0/0   0/0     -
+ 18 PA05           A4   5    5     -     0/1   0/1     -
+ 19 PB02           A5   2    -     -     5/0   6/0     -
+ 20 PA22          SDA   6    -    3/0    5/0   4/0    0/4
+ 21 PA23          SCL   7    -    3/1    5/1   4/1    0/5
+ 22 PB10         MOSI  10    -     -     4/2   5/0    0/4
+ 23 PA12         MISO  12    -    2/0    4/0   2/0    0/6
+ 24 PB11          SCK  11    -     -     4/3   5/1    0/5
+ 25 PA00  DOTSTAR_CLK   0    -     -     1/0   2/0     -
+ 26 PA01 DOTSTAR_DATA   1    -     -     1/1   2/1     -
+ 27 PB22   FLASH_MOSI   6    -     -     5/2   7/0     -
+ 28 PB03   FLASH_MISO   3    -     -     5/1   6/1     -
+ 29 PB23    FLASH_SCK   7    -     -     5/3   7/1     -
+=== ==== ============ ==== ==== ====== ====== ====== ======
+
+
+Description of the columns:
+
+- *Pin* - The number that is expected at ``machine.Pin(n)``, if the pin is given
+  as a number. This is NOT the GPIO number, but the board pin number, as
+  given in the board specific definition file.
+- *GPIO* - The GPIO number.
+- *Pin Name* - The name of a Pin which is expected argument to ``machine.Pin("name")``.
+- *IRQ* - The IRQ number assigned to that GPIO, used internally by ``Pin.irq()``. When
+  using ``Pin.irq()``, different pins must use different IRQs
+- *ADC* - The ADC channel assigned to the pin. When using ADC, different pins must
+  not use the same ADC channel.
+- *Serial* - Two columns with optional Serial signal assignments. Both may be used.
+  The cell content is device #/pad #. The pad # is the respective internal
+  signal of that serial device. Details below.
+- *TCC/TC* - Two columns with assignments of the TCC modules for PWM.
+  The cell content is device #/output #. For PWM, devices 0, 1, and 2
+  are used. The TC device pair 3/4 is used for ``ticks_us()``.
+
+SAMD21 UART assignments
+```````````````````````
+The UART devices and signals must be chosen according to the following rules:
+
+- The TX signal must be at a Pin with pad numbers 2 or 0, like Pin 1 with serial
+  device 0 or 2.
+- The RX pin may be assigned to one of the other pads.
+
+Examples for Adafruit ItsyBitsy M0 Express:
+
+- uart 0 at pins 0/1  This is the default UART at the RX/TX labelled pins
+- uart 1 at pins 12/10
+- uart 2 at pins 0/1
+- uart 3 at pins 11/13
+- uart 4 at pins 2/5
+- uart 5 at pins SCL/SDA
+
+or other combinations.
+
+SAMD21 I2C assignments
+``````````````````````
+The I2C devices and signals must be chosen according to the following rules:
+
+- The SDA signal must be at a Pin with pad numbers 0.
+- The SCL signal must be at a Pin with pad numbers 1.
+
+Examples for Adafruit ItsyBitsy M0 Express:
+
+- I2C 0 at Pin A3/A4
+- I2C 1 at pins 11/13
+- I2C 2 at the pins 4/3
+- I2C 3 at the pins SDA/SCL This is the default I2C device at the SDA/SCl labelled pin
+- I2C 4 at the pins A1/A2
+- I2C 5 at the pins SDA/SCL,
+
+or other combinations.
+
+SAMD21 SPI assignments
+``````````````````````
+The I2C devices and signals must be chosen according to the following rules:
+
+- The following pad number pairs are suitable for MOSI/SCK: 0/1, 2/3, 3/1, and 0/3.
+- The MISO signal must be at a Pin with a different pad number than MOSI or SCK.
+
+Examples for Adafruit ItsyBitsy M0 Express:
+
+- SPI 0 at pins 0/4/1
+- SPI 1 at pins 11/12/13
+- SPI 2 at pins 0/4/1
+- SPI 3 at pins 11/12/13
+- SPI 4 at Pin MOSI/MISO/SCK This is the default SPI device at the MOSI/MISO/SCK labelled pins.
+
+or other combinations.
+
+
+SAMD21 PWM assignments
+``````````````````````
+
+The TCC/TC device numbers 0, 1 and 2 can be used for PWM. Device 0 has four
+channels, device 1 and 2 have two channels. So in total 3 different PWM
+frequencies can be used, and 8 different duty cycle values.
+
+The DAC output for the Adafruit ItsyBitsy M0 Express board is available at the pin A0.
+
+.. _samd51_pinout_table:
+
+Adafruit ItsyBitsy M4 Express pin assignment table
+--------------------------------------------------
+
+=== ==== ============ ==== ==== ==== ====== ====== ===== ===== =====
+Pin GPIO Pin name     IRQ  ADC  ADC  Serial Serial  TC    PWM   PWM
+=== ==== ============ ==== ==== ==== ====== ====== ===== ===== =====
+  2 PA02           A0   2    0    -     -      -     -     -     -
+  5 PA05           A1   5    5    -     -     0/1   0/1    -     -
+ 40 PB08           A2   8    2    0     -     4/0   4/0    -     -
+ 41 PB09           A3   9    3    1     -     4/1   4/1    -     -
+  4 PA04           A4   4    4    -     -     0/0   0/0    -     -
+  6 PA06           A5   6    6    -     -     0/2   1/0    -     -
+ 16 PA16           D0   0    -    -    1/0    3/1   2/0   1/0   0/4
+ 17 PA17           D1   1    -    -    1/1    3/0   2/1   1/1   0/5
+  7 PA07           D2   7    7    -     -     0/3   1/1    -     -
+ 54 PB22           D3  22    -    -    1/2    5/2   7/0    -     -
+ 14 PA14           D4  14    -    -    2/2    4/2   3/0   2/0   1/2
+ 15 PA15           D5  15    -    -    2/3    4/3   3/1   2/1   1/3
+ 18 PA18           D7   2    -    -    1/2    3/2   3/0   1/2   0/6
+ 19 PA19           D9   3    -    -    1/3    3/3   3/1   1/3   0/7
+ 20 PA20          D10   4    -    -    5/2    3/2   7/0   1/4   0/0
+ 21 PA21          D11   5    -    -    5/3    3/3   7/1   1/5   0/1
+ 23 PA23          D12   7    -    -    3/1    5/0   4/1   1/7   0/3
+ 22 PA22          D13   6    -    -    3/0    5/1   4/0   1/6   0/2
+ 34 PB02  DOTSTAR_CLK   2   14    -     -     5/0   6/0   2/2    -
+ 35 PB03 DOTSTAR_DATA   9   15    -     -     5/1   6/1    -     -
+ 43 PB11     FLASH_CS  12    -    -     -     4/3   5/1   0/5   1/1
+ 11 PA11   FLASH_HOLD  11   11    -    0/3    2/3   1/1   0/3   1/7
+  9 PA09   FLASH_MISO   9    9    3    0/1    2/0   0/1   0/1   1/5
+  8 PA08   FLASH_MOSI   -    8    2    0/0    2/1   0/0   0/0   1/4
+ 42 PB10    FLASH_SCK  10    -    -     -     4/2   5/0   0/4   1/0
+ 10 PA10     FLASH_WP  10   10    -    0/2    2/2   1/0   0/2   1/6
+ 55 PB23         MISO   7    -    -    1/3    5/3   7/1    -     -
+  0 PA00         MOSI   0    -    -     -     1/0   2/0    -     -
+  1 PA01          SCK   1    -    -     -     1/1   2/1    -     -
+ 13 PA13          SCL  13    -    -    2/1    4/0   2/1   0/7   1/3
+ 12 PA12          SDA  12    -    -    2/0    4/1   2/0   0/6   1/2
+ 30 PA30        SWCLK  14    -    -    7/2    1/2   6/0   2/0    -
+ 31 PA31        SWDIO  15    -    -    7/3    1/3   6/1   2/1    -
+ 24 PA24       USB_DM   8    -    -    3/2    5/2   5/0   2/2    -
+ 25 PA25       USB_DP   9    -    -    3/3    5/3   5/1    -     -
+  3 PA03            -   3   10    -     -      -     -     -     -
+ 27 PA27            -  11    -    -     -      -     -     -     -
+=== ==== ============ ==== ==== ==== ====== ====== ===== ===== =====
+
+
+Description of the columns:
+
+- *Pin* - The number that is expected at ``machine.Pin(n)``, if the pin is given
+  as a number. This is NOT the GPIO number, but the board pin number, as
+  given in the board specific definition file.
+- *GPIO* - The GPIO number.
+- *Pin Name* The name of a Pin which is expected argument to ``machine.Pin("name")``.
+- *IRQ* - The IRQ number assigned to that GPIO, used internally by ``Pin.irq()``. When
+  using ``Pin.irq()``, different pins must use different IRQs
+- *ADC* - The ADC0/1 channel assigned to the pin. When using ADC, different pins must
+  not use the same ADC device and channel.
+- *Serial* - Two columns with optional Serial signal assignments. Both may be used.
+  The cell content is device #/pad #. The pad # is the respective internal
+  signal of that serial device. Details below.
+- *TC* - These device are currently not assigned to Pin. the TC device pair 0/1
+  is used for ``ticks_us()``.
+- *PWM* - Two columns with assignments of the TCC modules for PWM
+  The cell content is device #/output #. Details below.
+
+SAMD51 UART assignments
+```````````````````````
+The UART devices and signals must be chosen according to the following rules:
+
+- The TX signal must be at a Pin with pad numbers 0, like Pin 1 with serial
+  device 3.
+- The RX pin may be assigned to one of the other pads.
+
+Examples for Adafruit ItsyBitsy 4 Express:
+
+- uart 0 at pins A4/A1
+- uart 1 at pins 1/0   This is the default UART at the RX/TX labelled pins
+- uart 2 at pins SCL/SDA  This is the default I2C device at the SDA/SCl labelled pin
+- uart 3 at pins 0/1
+- uart 4 at pins SDA/SCL
+- uart 5 at pins D12/D13
+
+or other combinations.
+
+SAMD51 I2C assignments
+``````````````````````
+The I2C devices and signals must be chosen according to the following rules:
+
+- The SDA signal must be at a Pin with pad numbers 0.
+- The SCL signal must be at a Pin with pad numbers 1.
+
+Examples for Adafruit ItsyBitsy M0 Express:
+
+- I2C 0 at pins A3/A4
+- I2C 1 at pins 0/1
+- I2C 2 at the pins SDA/SCL
+- I2C 3 at the pins 1/0
+- I2C 4 at the pins A2/A3
+- I2C 5 at the pins 12/13
+
+or other combinations.
+
+SAMD51 SPI assignments
+``````````````````````
+The SPI devices and signals must be chosen according to the following rules:
+
+- The following pad number pairs are suitable for MOSI/SCK: 0/1 and 3/1.
+- The MISO signal must be at a Pin with a different pad number than MOSI or SCK.
+
+Examples for Adafruit ItsyBitsy M0 Express:
+
+- SPI 1 at Pin MOSI/MISO/SCK  This is the default SPI device at the MOSI/MISO/SCK labelled pins.
+- SPI 3 at pins 13/11/12
+- SPI 5 at pins 12/3/13
+
+or other combinations.
+
+
+SAMD51 PWM assignments
+``````````````````````
+
+The TCC/PWM device numbers 0 through 4 can be used for PWM. Device 0 has six
+channels, device 1 has four channels, device 2 has three channels and devices
+3 and 4 have two channels. So in total up to 5 different PWM frequencies
+can be used, and up to 17 different duty cycle values. Note that these numbers
+do not apply to every board.
+
+The DAC outputs for the Adafruit ItsyBitsy M4 Express board are available at the pins A0 and A1.
+
+Adafruit Feather M4 Express pin assignment table
+------------------------------------------------
+
+=== ==== ============ ==== ==== ==== ====== ====== ===== ===== =====
+Pin GPIO Pin name     IRQ  ADC  ADC  Serial Serial  TC    PWM   PWM
+=== ==== ============ ==== ==== ==== ====== ====== ===== ===== =====
+  2 PA02           A0   2    0    -     -      -     -     -      -
+  5 PA05           A1   5    5    -     -     0/1   0/1    -      -
+ 40 PB08           A2   8    2    0     -     4/0   4/0    -      -
+ 41 PB09           A3   9    3    1     -     4/1   4/1    -      -
+  4 PA04           A4   4    4    -     -     0/0   0/0    -      -
+ 38 PB06           A5   6    -    8     -      -     -     -      -
+ 49 PB17           D0   1    -    -    5/1     -    6/1   3/1    0/5
+ 48 PB16           D1   0    -    -    5/0     -    6/0   3/0    0/4
+ 14 PA14           D4  14    -    -    2/2    4/2   3/0   2/0    1/2
+ 16 PA16           D5   0    -    -    1/0    3/1   2/0   1/0    0/4
+ 18 PA18           D6   2    -    -    1/2    3/2   3/0   1/2    0/6
+ 19 PA19           D9   3    -    -    1/3    3/3   3/1   1/3    0/7
+  3 PA03         AREF   3   10    -     -      -     -     -      -
+ 20 PA20          D10   4    -    -    5/2    3/2   7/0   1/4    0/0
+ 21 PA21          D11   5    -    -    5/3    3/3   7/1   1/5    0/1
+ 22 PA22          D12   6    -    -    3/0    5/1   4/0   1/6    0/2
+ 23 PA23          D13   7    -    -    3/1    5/0   4/1   1/7    0/3
+ 43 PB11     FLASH_CS  12    -    -     -     4/3   5/1   0/5    1/1
+ 11 PA11   FLASH_HOLD  11   11    -    0/3    2/3   1/1   0/3    1/7
+  9 PA09   FLASH_MISO   9    9    3    0/1    2/0   0/1   0/1    1/5
+  8 PA08   FLASH_MOSI   -    8    2    0/0    2/1   0/0   0/0    1/4
+ 42 PB10    FLASH_SCK  10    -    -     -     4/2   5/0   0/4    1/0
+ 10 PA10     FLASH_WP  10   10    -    0/2    2/2   1/0   0/2    1/6
+ 54 PB22         MISO  22    -    -    1/2    5/2   7/0    -      -
+ 55 PB23         MOSI   7    -    -    1/3    5/3   7/1    -      -
+ 35 PB03     NEOPIXEL   9   15    -     -     5/1   6/1    -      -
+ 17 PA17          SCK   1    -    -    1/1    3/0   2/1   1/1    0/5
+ 13 PA13          SCL  13    -    -    2/1    4/0   2/1   0/7    1/3
+ 12 PA12          SDA  12    -    -    2/0    4/1   2/0   0/6    1/2
+ 30 PA30        SWCLK  14    -    -    7/2    1/2   6/0   2/0     -
+ 31 PA31        SWDIO  15    -    -    7/3    1/3   6/1   2/1     -
+ 24 PA24       USB_DM   8    -    -    3/2    5/2   5/0   2/2     -
+ 25 PA25       USB_DP   9    -    -    3/3    5/3   5/1    -      -
+ 33 PB01         VDIV   1   13    -     -     5/3   7/1    -      -
+  0 PA00            -   0    -    -     -     1/0   2/0    -      -
+  1 PA01            -   1    -    -     -     1/1   2/1    -      -
+  6 PA06            -   6    6    -     -     0/2   1/0    -      -
+  7 PA07            -   7    7    -     -     0/3   1/1    -      -
+ 15 PA15            -  15    -    -    2/3    4/3   3/1   2/1    1/3
+ 27 PA27            -  11    -    -     -      -     -     -      -
+ 32 PB00            -   9   12    -     -     5/2   7/0    -      -
+ 34 PB02            -   2   14    -     -     5/0   6/0   2/2     -
+ 36 PB04            -   4    -    6     -      -     -     -      -
+ 37 PB05            -   5    -    7     -      -     -     -      -
+ 39 PB07            -   7    -    9     -      -     -     -      -
+ 44 PB12            -  12    -    -    4/0     -    4/0   3/0    0/0
+ 45 PB13            -  13    -    -    4/1     -    4/1   3/1    0/1
+ 46 PB14            -  14    -    -    4/2     -    5/0   4/0    0/2
+ 47 PB15            -  15    -    -    4/3     -    5/1   4/1    0/3
+ 62 PB30            -  14    -    -    7/0    5/1   0/0   4/0    0/6
+ 63 PB31            -  15    -    -    7/1    5/0   0/1   4/1    0/7
+=== ==== ============ ==== ==== ==== ====== ====== ===== ===== =====
+
+For the definition of the table columns see the explanation at the table for
+Adafruit ItsyBitsy M4 Express :ref:`samd51_pinout_table`.
+
+The default devices at the board are:
+
+- UART 5 at pins 0/1, labelled RX/TX
+- I2C 2 at pins 21/20, labelled SDA/SCL
+- SPI 1 at pins 22/23/24, labelled MOSI, MISO and SCK
+- DAC output on pins 14 and 15, labelled A0 and A1
+
+SEEED XIAO pin assignment table
+-------------------------------
+
+=== ==== ============ ==== ==== ====== ====== ====== ======
+Pin GPIO Pin name     IRQ  ADC  Serial Serial TCC/TC TCC/TC
+=== ==== ============ ==== ==== ====== ====== ====== ======
+  2 PA02        A0_D0   2    0     -      -     -      -
+  4 PA04        A1_D1   4    4     -     0/0   0/0     -
+ 10 PA10        A2_D2  10   18    0/2    2/2   1/0    0/2
+ 11 PA11        A3_D3  11   19    0/3    2/3   1/1    0/3
+  8 PA08        A4_D4   -   16    0/0    2/0   0/0    1/2
+  9 PA09        A5_D5   9   17    0/1    2/1   0/1    1/3
+ 40 PB08        A6_D6   8    2     -     4/0   4/0     -
+ 41 PB09        A7_D7   9    3     -     4/1   4/1     -
+  7 PA07        A8_D8   7    7     -     0/3   1/1     -
+  5 PA05        A9_D9   5    5     -     0/1   0/1     -
+  6 PA06      A10_D10   6    6     -     0/2   1/0     -
+ 18 PA18       RX_LED   2    -    1/2    3/2   3/0    0/2
+ 30 PA30        SWCLK  10    -     -     1/2   1/0     -
+ 31 PA31        SWDIO  11    -     -     1/3   1/1     -
+ 19 PA19       TX_LED   3    -    1/3    3/3   3/1    0/3
+ 24 PA24       USB_DM  12    -    3/2    5/2   5/0    1/2
+ 25 PA25       USB_DP  13    -    3/3    5/3   5/1    1/3
+ 17 PA17     USER_LED   1    -    1/1    3/1   2/1    0/7
+  0 PA00            -   0    -     -     1/0   2/0     -
+  1 PA01            -   1    -     -     1/1   2/1     -
+  3 PA03            -   3    1     -      -     -      -
+ 12 PA12            -  12    -    2/0    4/0   2/0    0/6
+ 13 PA13            -  13    -    2/1    4/1   2/0    0/7
+ 14 PA14            -  14    -    2/2    4/2   3/0    0/4
+ 15 PA15            -  15    -    2/3    4/3   3/1    0/5
+ 16 PA16            -   0    -    1/0    3/0   2/0    0/6
+ 20 PA20            -   4    -    5/2    3/2   7/0    0/4
+ 21 PA21            -   5    -    5/3    3/3   7/1    0/7
+ 22 PA22            -   6    -    3/0    5/0   4/0    0/4
+ 23 PA23            -   7    -    3/1    5/1   4/1    0/5
+ 27 PA27            -  15    -     -      -     -      -
+ 28 PA28            -   8    -     -      -     -      -
+ 34 PB02            -   2   10     -     5/0   6/0     -
+ 35 PB03            -   3   11     -     5/1   6/1     -
+ 42 PB10            -  10    -     -     4/2   5/0    0/4
+ 43 PB11            -  11    -     -     4/3   5/1    0/5
+ 54 PB22            -   6    -     -     5/2   7/0     -
+ 55 PB23            -   7    -     -     5/3   7/1     -
+=== ==== ============ ==== ==== ====== ====== ====== ======
+
+For the definition of the table columns see the explanation at the table for
+Adafruit ItsyBitsy M0 Express :ref:`samd21_pinout_table`.
+
+The default devices at the board are:
+
+- UART 4 at pins 7/6, labelled A6_D6/A7_D7
+- I2C 2 at pins 4/5, labelled A4_D4/A5_D5
+- SPI 0 at pins 10/9/8, labelled A10_D10, A9_D9 and A8_D8
+- DAC output on pin 0, labelled A0_D0
+
+Adafruit Feather M0 Express pin assignment table
+------------------------------------------------
+
+=== ==== ============ ==== ==== ====== ====== ====== ======
+Pin GPIO Pin name     IRQ  ADC  Serial Serial TCC/TC TCC/TC
+=== ==== ============ ==== ==== ====== ====== ====== ======
+  2 PA02           A0   2    0     -      -     -      -
+ 40 PB08           A1   8    2     -     4/0   4/0     -
+ 41 PB09           A2   9    3     -     4/1   4/1     -
+  4 PA04           A3   4    4     -     0/0   0/0     -
+  5 PA05           A4   5    5     -     0/1   0/1     -
+ 34 PB02           A5   2   10     -     5/0   6/0     -
+ 11 PA11           D0  11   19    0/3    2/3   1/1    0/3
+ 10 PA10           D1  10   18    0/2    2/2   1/0    0/2
+ 14 PA14           D2  14    -    2/2    4/2   3/0    0/4
+  9 PA09           D3   9   17    0/1    2/1   0/1    1/3
+  8 PA08           D4   -   16    0/0    2/0   0/0    1/2
+ 15 PA15           D5  15    -    2/3    4/3   3/1    0/5
+ 20 PA20           D6   4    -    5/2    3/2   7/0    0/4
+ 21 PA21           D7   5    -    5/3    3/3   7/1    0/7
+  7 PA07           D9   7    7     -     0/3   1/1     -
+ 55 PB23           RX   7    -     -     5/3   7/1     -
+ 54 PB22           TX   6    -     -     5/2   7/0     -
+ 18 PA18          D10   2    -    1/2    3/2   3/0    0/2
+ 16 PA16          D11   0    -    1/0    3/0   2/0    0/6
+ 19 PA19          D12   3    -    1/3    3/3   3/1    0/3
+ 17 PA17          D13   1    -    1/1    3/1   2/1    0/7
+ 13 PA13     FLASH_CS  13    -    2/1    4/1   2/0    0/7
+ 35 PB03       LED_RX   3   11     -     5/1   6/1     -
+ 27 PA27       LED_TX  15    -     -      -     -      -
+ 12 PA12         MISO  12    -    2/0    4/0   2/0    0/6
+ 42 PB10         MOSI  10    -     -     4/2   5/0    0/4
+  6 PA06     NEOPIXEL   6    6     -     0/2   1/0     -
+ 43 PB11          SCK  11    -     -     4/3   5/1    0/5
+ 23 PA23          SCL   7    -    3/1    5/1   4/1    0/5
+ 22 PA22          SDA   6    -    3/0    5/0   4/0    0/4
+ 30 PA30        SWCLK  10    -     -     1/2   1/0     -
+ 31 PA31        SWDIO  11    -     -     1/3   1/1     -
+ 24 PA24       USB_DM  12    -    3/2    5/2   5/0    1/2
+ 25 PA25       USB_DP  13    -    3/3    5/3   5/1    1/3
+  0 PA00            -   0    -     -     1/0   2/0     -
+  1 PA01            -   1    -     -     1/1   2/1     -
+  3 PA03            -   3    1     -      -     -      -
+ 28 PA28            -   8    -     -      -     -      -
+=== ==== ============ ==== ==== ====== ====== ====== ======
+
+For the definition of the table columns see the explanation at the table for
+Adafruit ItsyBitsy M0 Express :ref:`samd21_pinout_table`.
+
+The default devices at the board are:
+
+- UART 5 at pins 21/20, labelled RX/TX
+- I2C 3 at pins 22/23, labelled SDA/SCL
+- SPI 4 at pins 24/25/26, labelled MOSI, MISO and SCK
+- DAC output on pin 14, labelled A0
+
+Adafruit Trinket M0 pin assignment table
+------------------------------------------------
+
+=== ==== ============ ==== ==== ====== ====== ====== ======
+Pin GPIO Pin name     IRQ  ADC  Serial Serial TCC/TC TCC/TC
+=== ==== ============ ==== ==== ====== ====== ====== ======
+  8 PA08           D0   -   16    0/0    2/0   0/0    1/2
+  2 PA02           D1   2    0     -      -     -      -
+  9 PA09           D2   9   17    0/1    2/1   0/1    1/3
+  7 PA07           D3   7    7     -     0/3   1/1     -
+  6 PA06           D4   6    6     -     0/2   1/0     -
+  1 PA01  DOTSTAR_CLK   1    -     -     1/1   2/1     -
+  0 PA00 DOTSTAR_DATA   0    -     -     1/0   2/0     -
+ 10 PA10          LED  10   18    0/2    2/2   1/0    0/2
+ 30 PA30        SWCLK  10    -     -     1/2   1/0     -
+ 31 PA31        SWDIO  11    -     -     1/3   1/1     -
+ 24 PA24       USB_DM  12    -    3/2    5/2   5/0    1/2
+ 25 PA25       USB_DP  13    -    3/3    5/3   5/1    1/3
+  3 PA03            -   3    1     -      -     -      -
+  4 PA04            -   4    4     -     0/0   0/0     -
+  5 PA05            -   5    5     -     0/1   0/1     -
+ 11 PA11            -  11   19    0/3    2/3   1/1    0/3
+ 14 PA14            -  14    -    2/2    4/2   3/0    0/4
+ 15 PA15            -  15    -    2/3    4/3   3/1    0/5
+ 16 PA16            -   0    -    1/0    3/0   2/0    0/6
+ 17 PA17            -   1    -    1/1    3/1   2/1    0/7
+ 18 PA18            -   2    -    1/2    3/2   3/0    0/2
+ 19 PA19            -   3    -    1/3    3/3   3/1    0/3
+ 22 PA22            -   6    -    3/0    5/0   4/0    0/4
+ 23 PA23            -   7    -    3/1    5/1   4/1    0/5
+ 27 PA27            -  15    -     -      -     -      -
+ 28 PA28            -   8    -     -      -     -      -
+=== ==== ============ ==== ==== ====== ====== ====== ======
+
+For the definition of the table columns see the explanation at the table for
+Adafruit ItsyBitsy M0 Express :ref:`samd21_pinout_table`.
+
+The default devices at the board are:
+
+- UART 0 at pins 3/4, labelled D3/D4
+- I2C 2 at pins 0/2, labelled D0/D2
+- SPI 0 at pins 4/2/3, labelled D4, D2 and D0
+- DAC output on pin 1, labelled D1
+
+SAMD21 Xplained PRO pin assignment table
+----------------------------------------
+
+=== ==== ============ ==== ==== ====== ====== ====== ======
+Pin GPIO Pin name     IRQ  ADC  Serial Serial TCC/TC TCC/TC
+=== ==== ============ ==== ==== ====== ====== ====== ======
+ 32 PB00    EXT1_PIN3   0    8     -     5/2   7/0     -
+ 33 PB01    EXT1_PIN4   1    9     -     5/3   7/1     -
+ 38 PB06    EXT1_PIN5   6   14     -      -     -      -
+ 39 PB07    EXT1_PIN6   7   15     -      -     -      -
+ 34 PB02    EXT1_PIN7   2   10     -     5/0   6/0     -
+ 35 PB03    EXT1_PIN8   3   11     -     5/1   6/1     -
+ 36 PB04    EXT1_PIN9   4   12     -      -     -      -
+ 37 PB05   EXT1_PIN10   5   13     -      -     -      -
+  8 PA08   EXT1_PIN11   -   16    0/0    2/0   0/0    1/2
+  9 PA09   EXT1_PIN12   9   17    0/1    2/1   0/1    1/3
+ 41 PB09   EXT1_PIN13   9    3     -     4/1   4/1     -
+ 40 PB08   EXT1_PIN14   8    2     -     4/0   4/0     -
+  5 PA05   EXT1_PIN15   5    5     -     0/1   0/1     -
+  6 PA06   EXT1_PIN16   6    6     -     0/2   1/0     -
+  4 PA04   EXT1_PIN17   4    4     -     0/0   0/0     -
+  7 PA07   EXT1_PIN18   7    7     -     0/3   1/1     -
+ 10 PA10    EXT2_PIN3  10   18    0/2    2/2   1/0    0/2
+ 11 PA11    EXT2_PIN4  11   19    0/3    2/3   1/1    0/3
+ 20 PA20    EXT2_PIN5   4    -    5/2    3/2   7/0    0/4
+ 21 PA21    EXT2_PIN6   5    -    5/3    3/3   7/1    0/7
+ 44 PB12    EXT2_PIN7  12    -    4/0     -    4/0    0/6
+ 45 PB13    EXT2_PIN8  13    -    4/1     -    4/1    0/7
+ 46 PB14    EXT2_PIN9  14    -    4/2     -    5/0     -
+ 47 PB15   EXT2_PIN10  15    -    4/3     -    5/1     -
+ 43 PB11   EXT2_PIN13  11    -     -     4/3   5/1    0/5
+ 42 PB10   EXT2_PIN14  10    -     -     4/2   5/0    0/4
+ 17 PA17   EXT2_PIN15   1    -    1/1    3/1   2/1    0/7
+ 18 PA18   EXT2_PIN16   2    -    1/2    3/2   3/0    0/2
+ 16 PA16   EXT2_PIN17   0    -    1/0    3/0   2/0    0/6
+ 19 PA19   EXT2_PIN18   3    -    1/3    3/3   3/1    0/3
+  2 PA02    EXT3_PIN3   2    0     -      -     -      -
+  3 PA03    EXT3_PIN4   3    1     -      -     -      -
+ 15 PA15    EXT3_PIN6  15    -    2/3    4/3   3/1    0/5
+ 12 PA12    EXT3_PIN7  12    -    2/0    4/0   2/0    0/6
+ 13 PA13    EXT3_PIN8  13    -    2/1    4/1   2/0    0/7
+ 28 PA28    EXT3_PIN9   8    -     -      -     -      -
+ 27 PA27   EXT3_PIN10  15    -     -      -     -      -
+ 49 PB17   EXT3_PIN15   1    -    5/1     -    6/1    0/5
+ 54 PB22   EXT3_PIN16   6    -     -     5/2   7/0     -
+ 48 PB16   EXT3_PIN17   9    -    5/0     -    6/0    0/4
+ 55 PB23   EXT3_PIN18   7    -     -     5/3   7/1     -
+ 62 PB30          LED  14    -     -     5/0   0/0    1/2
+ 30 PA30        SWCLK  10    -     -     1/2   1/0     -
+ 31 PA31        SWDIO  11    -     -     1/3   1/1     -
+ 24 PA24       USB_DM  12    -    3/2    5/2   5/0    1/2
+ 25 PA25       USB_DP  13    -    3/3    5/3   5/1    1/3
+  0 PA00            -   0    -     -     1/0   2/0     -
+  1 PA01            -   1    -     -     1/1   2/1     -
+ 14 PA14            -  14    -    2/2    4/2   3/0    0/4
+ 22 PA22            -   6    -    3/0    5/0   4/0    0/4
+ 23 PA23            -   7    -    3/1    5/1   4/1    0/5
+ 63 PB31            -  15    -     -     5/1   0/1    1/3
+=== ==== ============ ==== ==== ====== ====== ====== ======
+
+For the definition of the table columns see the explanation at the table for
+Adafruit ItsyBitsy M0 Express :ref:`samd21_pinout_table`.
+
+There are no pins labelled for default devices on this board. DAC output
+is on pin 32, labelled EXT3_PIN3
+
+Minisam M4 pin assignment table
+-------------------------------
+
+=== ==== ============ ==== ==== ==== ====== ====== ===== ===== =====
+Pin GPIO Pin name     IRQ  ADC  ADC  Serial Serial  TC    PWM   PWM
+=== ==== ============ ==== ==== ==== ====== ====== ===== ===== =====
+ 16 PA16           D0   0    -    -    1/0    3/1   2/0   1/0   0/4
+ 17 PA17           D1   1    -    -    1/1    3/0   2/1   1/1   0/5
+ 19 PA19           D3   3    -    -    1/3    3/3   3/1   1/3   0/7
+ 20 PA20           D4   4    -    -    5/2    3/2   7/0   1/4   0/0
+ 21 PA21           D5   5    -    -    5/3    3/3   7/1   1/5   0/1
+  2 PA02        A0_D9   2    0    -     -      -     -     -     -
+ 40 PB08       A1_D10   8    2    0     -     4/0   4/0    -     -
+ 41 PB09       A2_D11   9    3    1     -     4/1   4/1    -     -
+  4 PA04       A3_D12   4    4    -     -     0/0   0/0    -     -
+  5 PA05       A4_D13   5    5    -     -     0/1   0/1    -     -
+  6 PA06           A5   6    6    -     -     0/2   1/0    -     -
+  7 PA07        A6_D2   7    7    -     -     0/3   1/1    -     -
+  3 PA03         AREF   3   10    -     -      -     -     -     -
+  0 PA00       BUTTON   0    -    -     -     1/0   2/0    -     -
+ 34 PB02  DOTSTAR_CLK   2   14    -     -     5/0   6/0   2/2    -
+ 35 PB03 DOTSTAR_DATA   9   15    -     -     5/1   6/1    -     -
+ 15 PA15          LED  15    -    -    2/3    4/3   3/1   2/1   1/3
+ 55 PB23         MISO   7    -    -    1/3    5/3   7/1    -     -
+ 54 PB22         MOSI  22    -    -    1/2    5/2   7/0    -     -
+  1 PA01          SCK   1    -    -     -     1/1   2/1    -     -
+ 13 PA13          SCL  13    -    -    2/1    4/0   2/1   0/7   1/3
+ 12 PA12          SDA  12    -    -    2/0    4/1   2/0   0/6   1/2
+ 30 PA30        SWCLK  14    -    -    7/2    1/2   6/0   2/0    -
+ 31 PA31        SWDIO  15    -    -    7/3    1/3   6/1   2/1    -
+ 24 PA24       USB_DM   8    -    -    3/2    5/2   5/0   2/2    -
+ 25 PA25       USB_DP   9    -    -    3/3    5/3   5/1    -     -
+  8 PA08            -   -    8    2    0/0    2/1   0/0   0/0   1/4
+  9 PA09            -   9    9    3    0/1    2/0   0/1   0/1   1/5
+ 10 PA10            -  10   10    -    0/2    2/2   1/0   0/2   1/6
+ 11 PA11            -  11   11    -    0/3    2/3   1/1   0/3   1/7
+ 14 PA14            -  14    -    -    2/2    4/2   3/0   2/0   1/2
+ 18 PA18            -   2    -    -    1/2    3/2   3/0   1/2   0/6
+ 22 PA22            -   6    -    -    3/0    5/1   4/0   1/6   0/2
+ 23 PA23            -   7    -    -    3/1    5/0   4/1   1/7   0/3
+ 27 PA27            -  11    -    -     -      -     -     -     -
+ 42 PB10            -  10    -    -     -     4/2   5/0   0/4   1/0
+ 43 PB11            -  12    -    -     -     4/3   5/1   0/5   1/1
+=== ==== ============ ==== ==== ==== ====== ====== ===== ===== =====
+
+For the definition of the table columns see the explanation at the table for
+Adafruit ItsyBitsy M4 Express :ref:`samd51_pinout_table`.
+
+The default devices at the board are:
+
+- UART 1 at pins 6/7, labelled D0/D1
+- I2C 2 at pins 14/15, labelled SDA/SCL
+- SPI 1 at pins 16/17/18, labelled MOSI, MISO and SCK
+- DAC output on pins 0 and 4, labelled A0_D9 and A4_D13
+
+Seeed WIO Terminal pin assignment table
+---------------------------------------
+
+=== ==== ============ ==== ==== ==== ====== ====== ===== ===== =====
+Pin GPIO Pin name     IRQ  ADC  ADC  Serial Serial  TC    PWM   PWM
+=== ==== ============ ==== ==== ==== ====== ====== ===== ===== =====
+ 33 PB01           CS   1   13    -     -    5/3    7/1    -     -
+ 59 PB27           RX  13    -    -    2/1   4/0     -    1/3    -
+ 58 PB26           TX  12    -    -    2/0   4/1     -    1/2    -
+ 79 PC15   3V3_ENABLE  15    -    -    7/3   6/3     -    0/5   1/1
+ 78 PC14    5V_ENABLE  14    -    -    7/2   6/2     -    0/4   1/0
+ 40 PB08        A0_D0   8    2    0     -    4/0    4/0    -     -
+ 41 PB09        A1_D1   9    3    1     -    4/1    4/1    -     -
+  7 PA07        A2_D2   7    7    -     -    0/3    1/1    -     -
+ 36 PB04        A3_D3   4    -    6     -     -      -     -     -
+ 37 PB05        A4_D4   5    -    7     -     -      -     -     -
+ 38 PB06        A5_D5   6    -    8     -     -      -     -     -
+  4 PA04        A6_D6   4    4    -     -    0/0    0/0    -     -
+ 39 PB07        A7_D7   7    -    9     -     -      -     -     -
+  6 PA06        A8_D8   6    6    -     -    0/2    1/0    -     -
+ 90 PC26     BUTTON_1  10    -    -     -     -      -     -     -
+ 91 PC27     BUTTON_2  11    -    -    1/0    -      -     -     -
+ 92 PC28     BUTTON_3  12    -    -    1/1    -      -     -     -
+107 PD11       BUZZER   6    -    -    7/3   6/3     -    0/4    -
+ 47 PB15       GPCLK0  15    -    -    4/3    -     5/1   4/1   0/3
+ 44 PB12       GPCLK1  12    -    -    4/0    -     4/0   3/0   0/0
+ 45 PB13       GPCLK2  13    -    -    4/1    -     4/1   3/1   0/1
+ 48 PB16     I2C_BCLK   0    -    -    5/0    -     6/0   3/0   0/4
+ 20 PA20    I2S_LRCLK   4    -    -    5/2   3/2    7/0   1/4   0/0
+ 21 PA21     I2S_SDIN   5    -    -    5/3   3/3    7/1   1/5   0/1
+ 22 PA22    I2S_SDOUT   6    -    -    3/0   5/1    4/0   1/6   0/2
+ 50 PB18     LCD_MISO   2    -    -    5/2   7/2     -    1/0    -
+ 51 PB19     LCD_MOSI   3    -    -    5/3   7/3     -    1/1    -
+ 52 PB20      LCD_SCK   4    -    -    3/0   7/1     -    1/2    -
+ 53 PB21       LCD_CS   5    -    -    3/1   7/0     -    1/3    -
+ 70 PC06      LCD_D/C   6    -    -    6/2    -      -     -     -
+ 71 PC07    LCD_RESET   9    -    -    6/3    -      -     -     -
+ 74 PC10       LCD_XL  10    -    -    6/2   7/2     -    0/0   1/4
+ 76 PC12       LCD_XR  12    -    -    7/0   6/1     -    0/2   1/6
+ 77 PC13       LCD_YD  13    -    -    7/1   6/0     -    0/3   1/7
+ 75 PC11       LCD_YU  11    -    -    6/3   7/3     -    0/1   1/5
+ 15 PA15     LED_BLUE  15    -    -    2/3   4/3    3/1   2/1   1/3
+ 69 PC05      LED_LCD   5    -    -    6/1    -      -     -     -
+ 94 PC30          MIC  14    -   12     -     -      -     -     -
+ 32 PB00         MISO   9   12    -     -    5/2    7/0    -     -
+ 34 PB02         MOSI   2   14    -     -    5/0    6/0   2/2    -
+ 35 PB03          SCK   9   15    -     -    5/1    6/1    -     -
+ 12 PA12         SCL0  12    -    -    2/0   4/1    2/0   0/6   1/2
+ 13 PA13         SDA0  13    -    -    2/1   4/0    2/1   0/7   1/3
+ 16 PA16         SCL1   0    -    -    1/0   3/1    2/0   1/0   0/4
+ 17 PA17         SDA1   1    -    -    1/1   3/0    2/1   1/1   0/5
+117 PD21       SD_DET  11    -    -    1/3   3/3     -    1/1    -
+ 83 PC19        SD_CS   3    -    -    6/3   0/3     -    0/3    -
+ 82 PC18      SD_MISO   2    -    -    6/2   0/2     -    0/2    -
+ 80 PC16      SD_MOSI   0    -    -    6/0   0/1     -    0/0    -
+ 81 PC17       SD_SCK   1    -    -    6/1   0/0     -    0/1    -
+ 30 PA30        SWCLK  14    -    -    7/2   1/2    6/0   2/0    -
+ 31 PA31        SWDIO  15    -    -    7/3   1/3    6/1   2/1    -
+108 PD12     SWITCH_B   7    -    -     -     -      -    0/5    -
+116 PD20     SWITCH_U  10    -    -    1/2   3/2     -    1/0    -
+104 PD08     SWITCH_X   3    -    -    7/0   6/1     -    0/1    -
+105 PD09     SWITCH_Y   4    -    -    7/1   6/0     -    0/2    -
+106 PD10     SWITCH_Z   5    -    -    7/2   6/2     -    0/3    -
+ 24 PA24       USB_DM   8    -    -    3/2   5/2    5/0   2/2    -
+ 25 PA25       USB_DP   9    -    -    3/3   5/3    5/1    -     -
+  0 PA00            -   0    -    -     -    1/0    2/0    -     -
+  1 PA01            -   1    -    -     -    1/1    2/1    -     -
+  2 PA02            -   2    0    -     -     -      -     -     -
+  3 PA03            -   3   10    -     -     -      -     -     -
+  5 PA05            -   5    5    -     -    0/1    0/1    -     -
+  8 PA08            -   -    8    2    0/0   2/1    0/0   0/0   1/4
+  9 PA09            -   9    9    3    0/1   2/0    0/1   0/1   1/5
+ 10 PA10            -  10   10    -    0/2   2/2    1/0   0/2   1/6
+ 11 PA11            -  11   11    -    0/3   2/3    1/1   0/3   1/7
+ 14 PA14            -  14    -    -    2/2   4/2    3/0   2/0   1/2
+ 18 PA18            -   2    -    -    1/2   3/2    3/0   1/2   0/6
+ 19 PA19            -   3    -    -    1/3   3/3    3/1   1/3   0/7
+ 23 PA23            -   7    -    -    3/1   5/0    4/1   1/7   0/3
+ 27 PA27            -  11    -    -     -     -      -     -     -
+ 42 PB10            -  10    -    -     -    4/2    5/0   0/4   1/0
+ 43 PB11            -  12    -    -     -    4/3    5/1   0/5   1/1
+ 46 PB14            -  14    -    -    4/2    -     5/0   4/0   0/2
+ 49 PB17            -   1    -    -    5/1    -     6/1   3/1   0/5
+ 54 PB22            -  22    -    -    1/2   5/2    7/0    -     -
+ 55 PB23            -   7    -    -    1/3   5/3    7/1    -     -
+ 56 PB24            -   8    -    -    0/0   2/1     -     -     -
+ 57 PB25            -   9    -    -    0/1   2/0     -     -     -
+ 60 PB28            -  14    -    -    2/2   4/2     -    1/4    -
+ 61 PB29            -  15    -    -    2/3   4/3     -    1/5    -
+ 62 PB30            -  14    -    -    7/0   5/1    0/0   4/0   0/6
+ 63 PB31            -  15    -    -    7/1   5/0    0/1   4/1   0/7
+ 64 PC00            -   0    -   10     -     -      -     -     -
+ 65 PC01            -   1    -   11     -     -      -     -     -
+ 66 PC02            -   2    -    4     -     -      -     -     -
+ 67 PC03            -   3    -    5     -     -      -     -     -
+ 68 PC04            -   4    -    -    6/0    -      -    0/0    -
+ 84 PC20            -   4    -    -     -     -      -    0/4    -
+ 85 PC21            -   5    -    -     -     -      -    0/5    -
+ 86 PC22            -   6    -    -    1/0   3/1     -    0/5    -
+ 87 PC23            -   7    -    -    1/1   3/0     -    0/7    -
+ 88 PC24            -   8    -    -    0/2   2/2     -     -     -
+ 89 PC25            -   9    -    -    0/3   2/3     -     -     -
+ 95 PC31            -  15    -   13     -     -      -     -     -
+ 96 PD00            -   0    -   14     -     -      -     -     -
+ 97 PD01            -   1    -   15     -     -      -     -     -
+=== ==== ============ ==== ==== ==== ====== ====== ===== ===== =====
+
+For the definition of the table columns see the explanation at the table for
+Adafruit ItsyBitsy M4 Express :ref:`samd51_pinout_table`.
+
+There seems to be no default pin assignment for this board.
+
+Sparkfun SAMD51 Thing Plus pin assignment table
+------------------------------------------------
+
+=== ==== ============ ==== ==== ==== ====== ====== ===== ===== =====
+Pin GPIO Pin name     IRQ  ADC  ADC  Serial Serial  TC    PWM   PWM
+=== ==== ============ ==== ==== ==== ====== ====== ===== ===== =====
+  2 PA02           A0   2    0    -     -      -     -     -     -
+ 40 PB08           A1   8    2    0     -     4/0   4/0    -     -
+ 41 PB09           A2   9    3    1     -     4/1   4/1    -     -
+  4 PA04           A3   4    4    -     -     0/0   0/0    -     -
+  5 PA05           A4   5    5    -     -     0/1   0/1    -     -
+ 34 PB02           A5   2   14    -     -     5/0   6/0   2/2    -
+ 13 PA13           D0  13    -    -    2/1    4/0   2/1   0/7   1/3
+ 12 PA12           D1  12    -    -    2/0    4/1   2/0   0/6   1/2
+  6 PA06           D4   6    6    -     -     0/2   1/0    -     -
+ 15 PA15           D5  15    -    -    2/3    4/3   3/1   2/1   1/3
+ 20 PA20           D6   4    -    -    5/2    3/2   7/0   1/4   0/0
+ 21 PA21           D7   5    -    -    5/3    3/3   7/1   1/5   0/1
+  7 PA07           D9   7    7    -     -     0/3   1/1    -     -
+ 18 PA18          D10   2    -    -    1/2    3/2   3/0   1/2   0/6
+ 16 PA16          D11   0    -    -    1/0    3/1   2/0   1/0   0/4
+ 19 PA19          D12   3    -    -    1/3    3/3   3/1   1/3   0/7
+ 17 PA17          D13   1    -    -    1/1    3/0   2/1   1/1   0/5
+ 10 PA10     FLASH_CS  10   10    -    0/2    2/2   1/0   0/2   1/6
+ 11 PA11   FLASH_MISO  11   11    -    0/3    2/3   1/1   0/3   1/7
+  8 PA08   FLASH_MOSI   -    8    2    0/0    2/1   0/0   0/0   1/4
+  9 PA09    FLASH_SCK   9    9    3    0/1    2/0   0/1   0/1   1/5
+ 43 PB11         MISO  12    -    -     -     4/3   5/1   0/5   1/1
+ 44 PB12         MOSI  12    -    -    4/0     -    4/0   3/0   0/0
+ 55 PB23          RXD   7    -    -    1/3    5/3   7/1    -     -
+ 35 PB03        RXLED   9   15    -     -     5/1   6/1    -     -
+ 45 PB13          SCK  13    -    -    4/1     -    4/1   3/1   0/1
+ 23 PA23          SCL   7    -    -    3/1    5/0   4/1   1/7   0/3
+ 22 PA22          SDA   6    -    -    3/0    5/1   4/0   1/6   0/2
+ 30 PA30        SWCLK  14    -    -    7/2    1/2   6/0   2/0    -
+ 31 PA31        SWDIO  15    -    -    7/3    1/3   6/1   2/1    -
+ 54 PB22          TXD  22    -    -    1/2    5/2   7/0    -     -
+ 27 PA27        TXLED  11    -    -     -      -     -     -     -
+ 24 PA24       USB_DM   8    -    -    3/2    5/2   5/0   2/2    -
+ 25 PA25       USB_DP   9    -    -    3/3    5/3   5/1    -     -
+  0 PA00            -   0    -    -     -     1/0   2/0    -     -
+  1 PA01            -   1    -    -     -     1/1   2/1    -     -
+  3 PA03            -   3   10    -     -      -     -     -     -
+ 14 PA14            -  14    -    -    2/2    4/2   3/0   2/0   1/2
+ 32 PB00            -   9   12    -     -     5/2   7/0    -     -
+ 33 PB01            -   1   13    -     -     5/3   7/1    -     -
+ 36 PB04            -   4    -    6     -      -     -     -     -
+ 37 PB05            -   5    -    7     -      -     -     -     -
+ 38 PB06            -   6    -    8     -      -     -     -     -
+ 39 PB07            -   7    -    9     -      -     -     -     -
+ 42 PB10            -  10    -    -     -     4/2   5/0   0/4   1/0
+ 46 PB14            -  14    -    -    4/2     -    5/0   4/0   0/2
+ 47 PB15            -  15    -    -    4/3     -    5/1   4/1   0/3
+ 48 PB16            -   0    -    -    5/0     -    6/0   3/0   0/4
+ 49 PB17            -   1    -    -    5/1     -    6/1   3/1   0/5
+ 62 PB30            -  14    -    -    7/0    5/1   0/0   4/0   0/6
+ 63 PB31            -  15    -    -    7/1    5/0   0/1   4/1   0/7
+=== ==== ============ ==== ==== ==== ====== ====== ===== ===== =====
+
+For the definition of the table columns see the explanation at the table for
+Adafruit ItsyBitsy M4 Express :ref:`samd51_pinout_table`.
+
+The default devices at the board are:
+
+- UART 1 at pins 2/3, labelled RXD/TXD
+- I2C 5 at pins 20/21, labelled SDA/SCL
+- SPI 4 at pins 22/23/24, labelled MOSI, MISO and SCK
+- DAC output on pins 14 and 18, labelled A0 and A4
+
+Scripts for creating the pin assignment tables
+----------------------------------------------
+
+The tables shown above were created with small a Python script running on the target board::
+
+  from samd import pininfo
+  from machine import Pin
+  import os
+
+  def print_entry(e, txt):
+      print(txt, end=": ")
+      if e == 255:
+          print(" - ", end="")
+      else:
+          print("%d/%d" % (e >> 4, e & 0x0f), end="")
+
+  def print_pininfo(pin, info):
+      print("%3d" % pin, end=" ")
+      print("P%c%02d" % ("ABCD"[pin // 32], pin % 32), end="")
+      print(" %12s" % info[0], end="")
+      print(" IRQ:%2s" % (info[1] if info[1] != 255 else "-"), end="")
+      print(" ADC0:%2s" % (info[2] if info[2] != 255 else "-"), end="")
+      if len(info) == 7:
+          print_entry(info[3], " Serial1")
+          print_entry(info[4], " Serial2")
+          print_entry(info[5], " PWM1" if (info[5] >> 4) < 3 else "   TC")
+          print_entry(info[6], " PWM2")
+      else:
+          print(" ADC1:%2s" % (info[3] if info[3] != 255 else "-"), end="")
+          print_entry(info[4], " Serial1")
+          print_entry(info[5], " Serial2")
+          print_entry(info[6], " TC")
+          print_entry(info[7], " PWM1")
+          print_entry(info[8], " PWM2")
+      print()
+
+  def tblkey(i):
+      name = i[1][0]
+      if name != "-":
+          if len(name) < 3:
+              return " " + name
+          else:
+              return name
+      else:
+          return "zzzzzzz%03d" % i[0]
+
+  def table(num = 127):
+      pintbl = []
+      for i in range(num):
+          try:
+              pintbl.append((i, pininfo(i)))
+          except:
+              pass
+              # print("not defined")
+
+      pintbl.sort(key=tblkey)
+      for item in pintbl:
+          print_pininfo(item[0], item[1])
+
+  table()
diff --git a/docs/samd/quickref.rst b/docs/samd/quickref.rst
new file mode 100644
index 0000000000000..5e8298d1b366f
--- /dev/null
+++ b/docs/samd/quickref.rst
@@ -0,0 +1,469 @@
+.. _samd_quickref:
+
+Quick reference for the SAMD21/SAMD51 family
+============================================
+
+.. image:: img/itsybitsy_m4_express.jpg
+    :alt: Adafruit ItsyBitsy M4 Express board
+    :width: 640px
+
+The Adafruit ItsyBitsy M4 Express board.
+
+Below is a quick reference for SAMD21/SAMD51-based boards.  If it is your first time
+working with this board it may be useful to get an overview of the microcontroller:
+
+.. toctree::
+   :maxdepth: 1
+
+   general.rst
+   tutorial/intro.rst
+   pinout.rst
+
+
+Installing MicroPython
+----------------------
+
+See the corresponding section of tutorial: :ref:`samd_intro`. It also includes
+a troubleshooting subsection.
+
+General board control
+---------------------
+
+The MicroPython REPL is on the USB port, configured in VCP mode.
+Tab-completion is useful to find out what methods an object has.
+Paste mode (Ctrl-E) is useful to paste a large slab of Python code into
+the REPL.
+
+The :mod:`machine` module::
+
+    import machine
+
+    machine.freq()            # get the current frequency of the CPU
+    machine.freq(96_000_000)  # set the CPU frequency to 96 MHz
+
+The range accepted by the function call is 1_000_000 to 200_000_000 (1 MHz to 200 MHz)
+for SAMD51 and 1_000_000 to 48_000_000 (1 MHz to 48 MHz) for SAMD21. The safe
+range for SAMD51 according to the data sheet is 96 MHz to 120 MHz.
+At frequencies below 8 MHz USB will be disabled. Changing the frequency below 48 MHz
+impacts the baud rates of UART, I2C and SPI. These have to be set again after
+changing the CPU frequency. The ms and µs timers are not affected by the frequency
+change.
+
+
+Delay and timing
+----------------
+
+Use the :mod:`time <time>` module::
+
+    import time
+
+    time.sleep(1)           # sleep for 1 second
+    time.sleep_ms(500)      # sleep for 500 milliseconds
+    time.sleep_us(10)       # sleep for 10 microseconds
+    start = time.ticks_ms() # get millisecond counter
+    delta = time.ticks_diff(time.ticks_ms(), start) # compute time difference
+
+
+Clock and time
+--------------
+
+Two groups of functions are provided for time information. All boards have the
+datetime(), mktime() and time() functions. Boards with a 32kHz crystal also
+provide an RTC() module. The epoch start date is 1.1.2000.
+
+Use the :mod:`time <time>` module::
+
+    import time
+
+    date_time = time.localtime()        # Show the actual date/time information
+    date_time = time.localtime(seconds) # decode the date/time form the seconds value
+    seconds = time.mktime(date_time_tuple) # Convert seconds to a datetime tuple
+    second = time.time()                # Return the actual system time.
+
+The format of the date_time tuple follows the standard. The µs value of the date_time
+tuple is ignored. On boards without the RTC module, time.localtime(seconds) sets the
+system time. Use of the Use the :mod:`RTC <RTC>` module::
+
+    from machine import RTC
+    rtc = RTC()
+    date_time = rtc.datetime()      # return the actual date & time.
+    rtc.datetime(date_time_tuple)   # Set date & time, ignoring weekday
+    date_time = rtc.now()           # Return date & time in Unix order.
+    rtc.calibration(value)          # Set a calibration factor
+
+The weekday value set will be ignored and calculated in the returned tuple from the
+actual date. rtc.now() is only provided at SAMD51 boards. The value used in the
+rtc.calibration() call has a range from -127 - 127. It defines roughly a
+ppm quantity, by which the clock can run faster or slower.
+
+
+Timers
+------
+
+The SAMD21/SAMD51 uses software timers. Use the :ref:`machine.Timer <machine.Timer>` class::
+
+    from machine import Timer
+
+    tim0 = Timer()
+    tim0.init(period=5000, mode=Timer.ONE_SHOT, callback=lambda t:print(0))
+
+    tim1 = Timer()
+    tim1.init(period=2000, mode=Timer.PERIODIC, callback=lambda t:print(1))
+
+The period is in milliseconds.
+
+.. _samd_Pins_and_GPIO:
+
+Pins and GPIO
+-------------
+
+Use the :ref:`machine.Pin <machine.Pin>` class::
+
+    from machine import Pin
+
+    p0 = Pin('D0', Pin.OUT) # create output pin on GPIO0
+    p0.on()                 # set pin to "on" (high) level
+    p0.off()                # set pin to "off" (low) level
+    p0.value(1)             # set pin to on/high
+
+    p2 = Pin('D2', Pin.IN)  # create input pin on GPIO2
+    print(p2.value())       # get value, 0 or 1
+
+    p4 = Pin('D4', Pin.IN, Pin.PULL_UP) # enable internal pull-up resistor
+    p7 = Pin("PA07", Pin.OUT, value=1) # set pin high on creation
+
+Pins can be denoted by a string or a number. The string is either the
+pin label of the respective board, like "D0" or "SDA", or in the form
+"Pxnn", where x is A,B,C or D, and nn a two digit number in the range 0-31.
+Examples: "PA03", PD31".
+
+Pin numbers are the MCU port numbers in the range::
+
+    PA0..PA31:  0..31
+    PB0..PB31: 32..63
+    PC0..PC31: 64..95
+    PD0..PD31: 96..127
+
+Note: On Adafruit Feather and ItsyBity boards, pin D5 is connected to an external
+gate output and can therefore only be used as input.
+
+UART (serial bus)
+-----------------
+
+See :ref:`machine.UART <machine.UART>`. ::
+
+    # Use UART 3 on a ItsyBitsy M4 board
+    from machine import UART
+
+    uart3 = UART(3, tx=Pin(1), rx=Pin(0), baudrate=115200)
+    uart3.write('hello')  # write 5 bytes
+    uart3.read(5)         # read up to 5 bytes
+
+The SAMD21/SAMD51 MCUs have up to eight hardware so called SERCOM devices, which can be used as UART,
+SPI or I2C device, but not every MCU variant and board exposes all
+TX and RX pins for users. For the assignment of Pins to devices and UART signals,
+refer to the :ref:`SAMD pinout <samd_pinout>`.
+
+PWM (pulse width modulation)
+----------------------------
+
+Up to five timer device of the SAMD21/SAMD51 MCUs are used for creating PWM signals.
+
+The PWM functions are provided by the :ref:`machine.PWM <machine.PWM>` class.
+It supports all basic methods listed for that class. ::
+
+    # Samples for Adafruit ItsyBitsy M4 Express
+
+    from machine import Pin, PWM
+
+    pwm = PWM(Pin(7))      # create PWM object from a pin
+    pwm.freq()             # get current frequency
+    pwm.freq(1000)         # set frequency
+    pwm.duty_u16()         # get current duty cycle, range 0-65535
+    pwm.duty_u16(200)      # set duty cycle, range 0-65535
+    pwm.deinit()           # turn off PWM on the pin
+
+    pwm                    # show the PWM objects properties
+
+
+PWM Constructor
+```````````````
+
+.. class:: PWM(dest, freq, duty_u16, duty_ns, *, invert, device)
+  :noindex:
+
+    Construct and return a new PWM object using the following parameters:
+
+      - *dest* is the Pin object on which the PWM is output.
+
+    PWM objects are provided by TCC timer module. The TCC timer modules have up
+    to six channels and eight outputs. All channels of a module run at the same
+    frequency, but allow for different duty cycles. Outputs are assigned to channels
+    in modulo-n fashion, where n is the number of channels. Outputs of a channel
+    have the same frequency and duty rate, but may have different polarity.
+    So if for instance a module has four channels, output 0 and 4, 1 and 5,
+    2 and 6, 3, and 7 share the same frequency and duty rate.
+
+    Only one of *duty_u16* and *duty_ns* should be specified at a time.
+
+    Keyword arguments:
+
+      - *freq* should be an integer which sets the frequency in Hz for the
+        PWM cycle. The valid frequency range is 1 Hz to 24 MHz.
+      - *duty_u16* sets the duty cycle as a ratio ``duty_u16 / 65536``.
+        The duty cycle of a X channel can only be changed, if the A and B channel
+        of the respective submodule is not used. Otherwise the duty_16 value of the
+        X channel is 32768 (50%).
+      - *duty_ns* sets the pulse width in nanoseconds. The limitation for X channels
+        apply as well.
+      - *invert*\=True|False. Setting a bit inverts the respective output.
+      - *device*\=n Use TCC module n if available. At some pins two TCC modules could be
+        used. If not device is mentioned, the software tries to use a module which is not yet
+        used for a PWM signal. But if pins shall have the same frequency and/or duty cycle
+        to be changed synchronously, they must be driven by the same TCC module.
+
+PWM Methods
+```````````
+
+The methods are identical to the generic :ref:`machine.PWM <machine.PWM>` class,
+with additional keyword arguments to the init() method, matchings those of the constructor.
+
+PWM Pin Assignment
+``````````````````
+
+Pins are specified in the same way as for the Pin class.  For the assignment of Pins
+to PWM signals, refer to the :ref:`SAMD pinout <samd_pinout>`.
+
+ADC (analog to digital conversion)
+----------------------------------
+
+On the SAMD21/SAMD51 ADC functionality is available on Pins labelled 'Ann'.
+
+Use the :ref:`machine.ADC <machine.ADC>` class::
+
+    from machine import ADC
+
+    adc0 = ADC(Pin("A0"))            # create ADC object on ADC pin, average=16
+    adc0.read_u16()                  # read value, 0-65536 across voltage range 0.0v - 3.3v
+    adc1 = ADC(Pin("A1"), average=1) # create ADC object on ADC pin, average=1
+
+The resolution of the ADC is 12 bit with 12 bit accuracy, irrespective of the
+value returned by read_u16(). If you need a higher resolution or better accuracy, use
+an external ADC.
+
+ADC Constructor
+```````````````
+
+.. class:: ADC(dest, *, average=16)
+  :noindex:
+
+    Construct and return a new ADC object using the following parameters:
+
+      - *dest* is the Pin object on which the ADC is output.
+
+    Keyword arguments:
+
+      - *average* is used to reduce the noise. With a value of 16 the LSB noise is about 1 digit.
+
+DAC (digital to analog conversion)
+----------------------------------
+
+The DAC class provides a fast digital to analog conversion. Usage example::
+
+    from machine import DAC
+
+    dac0 = DAC(0)                    # create DAC object on DAC pin A0
+    dac0.write(1023)                 # write value, 0-4095 across voltage range 0.0v - 3.3v
+    dac1 = DAC(1)                    # create DAC object on DAC pin A1
+    dac1.write(2000)                 # write value, 0-4095 across voltage range 0.0v - 3.3v
+
+The resolution of the DAC is 12 bit for SAMD51 and 10 bit for SAMD21. SAMD21 devices
+have 1 DAC channel at GPIO PA02, SAMD51 devices have 2 DAC channels at GPIO PA02 and PA05.
+
+Software SPI bus
+----------------
+
+Software SPI (using bit-banging) works on all pins, and is accessed via the
+:ref:`machine.SoftSPI <machine.SoftSPI>` class. ::
+
+    from machine import Pin, SoftSPI
+
+    # construct a SoftSPI bus on the given pins
+    # polarity is the idle state of SCK
+    # phase=0 means sample on the first edge of SCK, phase=1 means the second
+    spi = SoftSPI(baudrate=100000, polarity=1, phase=0, sck=Pin(7), mosi=Pin(9), miso=Pin(10))
+
+    spi.init(baudrate=200000) # set the baud rate
+
+    spi.read(10)            # read 10 bytes on MISO
+    spi.read(10, 0xff)      # read 10 bytes while outputting 0xff on MOSI
+
+    buf = bytearray(50)     # create a buffer
+    spi.readinto(buf)       # read into the given buffer (reads 50 bytes in this case)
+    spi.readinto(buf, 0xff) # read into the given buffer and output 0xff on MOSI
+
+    spi.write(b'12345')     # write 5 bytes on MOSI
+
+    buf = bytearray(4)      # create a buffer
+    spi.write_readinto(b'1234', buf) # write to MOSI and read from MISO into the buffer
+    spi.write_readinto(buf, buf) # write buf to MOSI and read MISO back into buf
+
+The highest supported baud rate is 500000.
+
+Hardware SPI bus
+----------------
+
+The SAMD21/SAMD51 MCUs have up to eight hardware so called SERCOM devices, which can be used as UART,
+SPI or I2C device, but not every MCU variant and board exposes all
+signal pins for users.  Hardware SPI is accessed via the
+:ref:`machine.SPI <machine.SPI>` class and has the same methods as software SPI above::
+
+    from machine import SPI
+
+    spi = SPI(1, sck=Pin("SCK"), mosi=Pin("MOSI"), miso=Pin("MISO"), baudrate=10000000)
+    spi.write('Hello World')
+
+If miso is not specified, it is not used. For the assignment of Pins to SPI devices and signals, refer to
+:ref:`SAMD pinout <samd_pinout>`.
+
+Note: Even if the highest reliable baud rate at the moment is about 24 Mhz,
+setting a baud rate will not always result in exactly that frequency, especially
+at high baud rates.
+
+Software I2C bus
+----------------
+
+Software I2C (using bit-banging) works on all output-capable pins, and is
+accessed via the :ref:`machine.SoftI2C <machine.SoftI2C>` class::
+
+    from machine import Pin, SoftI2C
+
+    i2c = SoftI2C(scl=Pin(10), sda=Pin(11), freq=100000)
+
+    i2c.scan()              # scan for devices
+
+    i2c.readfrom(0x3a, 4)   # read 4 bytes from device with address 0x3a
+    i2c.writeto(0x3a, '12') # write '12' to device with address 0x3a
+
+    buf = bytearray(10)     # create a buffer with 10 bytes
+    i2c.writeto(0x3a, buf)  # write the given buffer to the slave
+
+The highest supported freq is 400000.
+
+Hardware I2C bus
+----------------
+
+The SAMD21/SAMD51 MCUs have up to eight hardware so called SERCOM devices,
+which can be used as UART, SPI or I2C device, but not every MCU variant
+and board exposes all signal pins for users.
+For the assignment of Pins to devices and I2C signals, refer to :ref:`SAMD pinout <samd_pinout>`.
+
+Hardware I2C is accessed via the :ref:`machine.I2C <machine.I2C>` class and
+has the same methods as software SPI above::
+
+    from machine import I2C
+
+    i2c = I2C(2, scl=Pin("SCL"), sda=Pin("SDA"), freq=400_000)
+    i2c.writeto(0x76, b"Hello World")
+
+OneWire driver
+--------------
+
+The OneWire driver is implemented in software and works on all pins::
+
+    from machine import Pin
+    import onewire
+
+    ow = onewire.OneWire(Pin(12)) # create a OneWire bus on GPIO12
+    ow.scan()                     # return a list of devices on the bus
+    ow.reset()                    # reset the bus
+    ow.readbyte()                 # read a byte
+    ow.writebyte(0x12)            # write a byte on the bus
+    ow.write('123')               # write bytes on the bus
+    ow.select_rom(b'12345678')    # select a specific device by its ROM code
+
+There is a specific driver for DS18S20 and DS18B20 devices::
+
+    import time, ds18x20
+    ds = ds18x20.DS18X20(ow)
+    roms = ds.scan()
+    ds.convert_temp()
+    time.sleep_ms(750)
+    for rom in roms:
+        print(ds.read_temp(rom))
+
+Be sure to put a 4.7k pull-up resistor on the data line.  Note that
+the ``convert_temp()`` method must be called each time you want to
+sample the temperature.
+
+DHT driver
+----------
+
+The DHT driver is implemented in software and works on all pins::
+
+    import dht
+    import machine
+
+    d = dht.DHT11(machine.Pin(4))
+    d.measure()
+    d.temperature() # eg. 23 (°C)
+    d.humidity()    # eg. 41 (% RH)
+
+    d = dht.DHT22(machine.Pin(4))
+    d.measure()
+    d.temperature() # eg. 23.6 (°C)
+    d.humidity()    # eg. 41.3 (% RH)
+
+Be sure to have a 4.7k pull-up resistor on the data line.  Some
+DHT modules may already have one.
+
+Driving an APA102 LED
+---------------------
+
+The APA102 on some Adafruit boards can be controlled using SoftSPI::
+
+    from machine import SoftSPI, Pin
+    # create the SPI object. miso can be any unused pin.
+    spi=SoftSPI(sck=Pin(25), mosi=Pin(26), miso=Pin(14))
+
+    # define a little function that writes the data with
+    # preamble and postfix
+    def write(red, green, blue):
+        spi.write(b"\x00\x00\x00\x00\xff")
+        spi.write(bytearray((blue, green, red)))
+        spi.write(b"\xff\xff\xff")
+
+    # set the LED to red
+    write(128, 0, 0)
+
+Since SoftSPI does not allow miso to be undefined, miso has to be
+assigned to an otherwise unused pin.
+
+Driving a Neopixel LED
+----------------------
+
+The built-in machine.bitstream() method supports driving Neopixel LEDs in combination
+with the Neopixel driver from the MicroPython driver library::
+
+    import neopixel
+    import machine
+
+    # 1 LED connected to Pin D8 on Adafruit Feather boards
+    p = machine.Pin(8, machine.Pin.OUT)
+    n = neopixel.NeoPixel(p, 1)
+
+    # set the led to red.
+    n[0] = (128, 0, 0)
+
+    # Update the LED.
+    n.write()
+
+machine.bitstream() is set up for a SAMD21 clock frequency of 48MHz and a SAMD51
+clock frequency of 120 MHz. At other clock frequencies, the timing will not fit.
+
+Transferring files
+------------------
+
+Files can be transferred to the SAMD21/SAMD51 devices for instance with the
+:ref:`mpremote <mpremote>` tool. See the MicroPython forum for community-supported
+alternatives to transfer files to an SAMD21/SAMD51 board, like rshell or Thonny.
diff --git a/docs/samd/tutorial/intro.rst b/docs/samd/tutorial/intro.rst
new file mode 100644
index 0000000000000..40038f4a720b8
--- /dev/null
+++ b/docs/samd/tutorial/intro.rst
@@ -0,0 +1,84 @@
+.. _samd_intro:
+
+Getting started with MicroPython on the SAMD
+==============================================
+
+Using MicroPython is a great way to get the most of your SAMD board.  And
+vice versa, the SAMD chip is a great platform for using MicroPython.  This
+tutorial will guide you through setting up MicroPython, getting a prompt, using
+the hardware peripherals, and controlling some external components.
+
+Let's get started!
+
+Requirements
+------------
+
+The first thing you need is a board with an SAMD chip.  The MicroPython
+software supports the SAMD chip itself and any board should work.  The main
+characteristic of a board is how the GPIO pins are connected to the outside
+world, and whether it includes a built-in USB-serial converter to make the
+UART available to your PC.
+
+Names of pins will be given in this tutorial using the board names ("D0")
+and it should be straightforward to find which pin this corresponds to on your
+particular board.
+
+Powering the board
+------------------
+
+If your board has a USB connector on it then most likely it is powered through
+this when connected to your PC.  Otherwise you will need to power it directly.
+Please refer to the documentation for your board for further details.
+
+Getting the firmware
+--------------------
+
+Firmware versions are provided at the
+`MicroPython download page <https://micropython.org/download/?port=samd>`_.
+You can download the most recent MicroPython firmware .uf2 file to load
+onto your SAMD device.  From that download page you have two main choices:
+
+* stable firmware builds
+* daily firmware builds
+
+If you are just starting with MicroPython, the best bet is to go for the stable
+firmware builds. If you are an advanced, experienced MicroPython SAMD user
+who would like to follow development closely and help with testing new
+features, there are daily builds. They run through the same rigid internal
+test sequence as the stable builds, but the firmware features may change.
+
+Deploying the firmware
+----------------------
+
+Once you have the MicroPython firmware you need to load it onto your
+SAMD device. Most of the boards support the following easy procedure for
+firmware upload.
+
+- Connect the board by an USB-A/USB-Micro cable to your PC.
+- Push the reset button twice. Then, a drive should pop up at the
+  PC's file manager. Many boards have a on-board RGB LED, which first lights up
+  red, and then changes it's colour to green. The timing of the double push is
+  sometimes tricky. So you may have to try to get the proper rhythm.
+- Copy the .uf2 file to that newly opened drive. A LED on the board may
+  flash a while. When the copy is finished, the board drive will disappear and the
+  RGB led will turn from green to the initial state.
+
+Serial prompt
+-------------
+
+Once you have the firmware on the device you can access the REPL (Python prompt)
+over USB.
+
+From there you can follow the SAMD tutorial.
+
+Troubleshooting installation problems
+-------------------------------------
+
+If you experience problems during flashing or with running firmware immediately
+after it, here are some troubleshooting recommendations:
+
+* Be aware of and try to exclude hardware problems.  There are two common
+  problems: bad power source quality, and worn-out/defective Flash ROM.
+  Speaking of power source, not just raw amperage is important, but also low
+  ripple and noise/EMI in general.  The most reliable and convenient power
+  source is a USB port.
diff --git a/docs/templates/topindex.html b/docs/templates/topindex.html
index 4e163b6efe90f..e3bcd7cce14cc 100644
--- a/docs/templates/topindex.html
+++ b/docs/templates/topindex.html
@@ -81,6 +81,10 @@ <h1>MicroPython documentation</h1>
         <a class="biglink" href="{{ pathto("renesas-ra/quickref") }}">Quick reference for the Renesas RA</a><br/>
         <span class="linkdescr">general information for Renesas RA based boards, snippets of useful code, and a tutorial</span>
       </p>
+      <p class="biglink">
+        <a class="biglink" href="{{ pathto("samd/quickref") }}">Quick reference for the SAMD21/SAMD51</a><br/>
+        <span class="linkdescr">general information for SAMD21/SAMD51 based boards, snippets of useful code, and a tutorial</span>
+      </p>
     </td>
   </tr></table>
 

From c138e10fbb60981ca9e9b7459e7b9ae0c2528c94 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 27 Oct 2022 12:57:10 +1100
Subject: [PATCH 2791/3533] py/makeversionhdr: Fall back to py/mpconfig.h
 instead of docs/conf.py.

Commit 64af916c111b61bce82c00f356a6b1cb81946d87 removed the version string
from docs/conf.py.  py/mpconfig.h is a better place to get the version
from, so use that (when there is no git repository).

Signed-off-by: Damien George <damien@micropython.org>
---
 py/makeversionhdr.py | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/py/makeversionhdr.py b/py/makeversionhdr.py
index 54b7fa9ab7d2a..d1b41e63b0845 100644
--- a/py/makeversionhdr.py
+++ b/py/makeversionhdr.py
@@ -62,21 +62,27 @@ def get_version_info_from_git():
     return git_tag, git_hash
 
 
-def get_version_info_from_docs_conf():
-    with open(os.path.join(os.path.dirname(sys.argv[0]), "..", "docs", "conf.py")) as f:
+def get_version_info_from_mpconfig():
+    with open(os.path.join(os.path.dirname(sys.argv[0]), "..", "py", "mpconfig.h")) as f:
         for line in f:
-            if line.startswith("version = release = '"):
-                ver = line.strip().split(" = ")[2].strip("'")
-                git_tag = "v" + ver
+            if line.startswith("#define MICROPY_VERSION_MAJOR "):
+                ver_major = int(line.strip().split()[2])
+            elif line.startswith("#define MICROPY_VERSION_MINOR "):
+                ver_minor = int(line.strip().split()[2])
+            elif line.startswith("#define MICROPY_VERSION_MICRO "):
+                ver_micro = int(line.strip().split()[2])
+                git_tag = "v%d.%d" % (ver_major, ver_minor)
+                if ver_micro != 0:
+                    git_tag += ".%d" % (ver_micro,)
                 return git_tag, "<no hash>"
     return None
 
 
 def make_version_header(filename):
-    # Get version info using git, with fallback to docs/conf.py
+    # Get version info using git, with fallback to py/mpconfig.h
     info = get_version_info_from_git()
     if info is None:
-        info = get_version_info_from_docs_conf()
+        info = get_version_info_from_mpconfig()
 
     git_tag, git_hash = info
 

From e20bb98392c988a410ba04d01d3f573e6c15803d Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sat, 15 Oct 2022 21:37:51 +0200
Subject: [PATCH 2792/3533] mimxrt/machine_pin: Add the Pin.toggle() method.

For consistency with other ports, even if this method is undocumented at
the moment.
---
 ports/mimxrt/machine_pin.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/ports/mimxrt/machine_pin.c b/ports/mimxrt/machine_pin.c
index 836bd8524b729..bb2c820100be5 100644
--- a/ports/mimxrt/machine_pin.c
+++ b/ports/mimxrt/machine_pin.c
@@ -285,6 +285,14 @@ STATIC mp_obj_t machine_pin_on(mp_obj_t self_in) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_pin_on_obj, machine_pin_on);
 
+// pin.toggle()
+STATIC mp_obj_t machine_pin_toggle(mp_obj_t self_in) {
+    machine_pin_obj_t *self = self_in;
+    mp_hal_pin_toggle(self);
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_pin_toggle_obj, machine_pin_toggle);
+
 // pin.value([value])
 STATIC mp_obj_t machine_pin_value(size_t n_args, const mp_obj_t *args) {
     return machine_pin_obj_call(args[0], (n_args - 1), 0, args + 1);
@@ -366,6 +374,7 @@ STATIC const mp_rom_map_elem_t machine_pin_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_on),      MP_ROM_PTR(&machine_pin_on_obj) },
     { MP_ROM_QSTR(MP_QSTR_low),     MP_ROM_PTR(&machine_pin_off_obj) },
     { MP_ROM_QSTR(MP_QSTR_high),    MP_ROM_PTR(&machine_pin_on_obj) },
+    { MP_ROM_QSTR(MP_QSTR_toggle),  MP_ROM_PTR(&machine_pin_toggle_obj) },
     { MP_ROM_QSTR(MP_QSTR_value),   MP_ROM_PTR(&machine_pin_value_obj) },
     { MP_ROM_QSTR(MP_QSTR_init),    MP_ROM_PTR(&machine_pin_init_obj) },
     { MP_ROM_QSTR(MP_QSTR_irq),     MP_ROM_PTR(&machine_pin_irq_obj) },

From 9d2e179fa565d8af96fb6ce3643e00f999c9210a Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sat, 22 Oct 2022 21:28:42 +0200
Subject: [PATCH 2793/3533] mimxrt: Fix CPU freeze when calling __WFE() in
 MICROPY_EVENT_POLL_HOOK.

This issue affected i.MX RT 1052, 1062 and 1064.  It seems to be addressed
by Errata ERR006223, which also mentions i.MX RT101x and 102x, but these
devices worked well even without the change.  As a side effect, the current
consumption at an idle REPL drops significantly with this fix.

Fixes issue #7235.
---
 ports/mimxrt/boards/MIMXRT1052_clock_config.c | 1 +
 ports/mimxrt/boards/MIMXRT1062_clock_config.c | 1 +
 ports/mimxrt/boards/MIMXRT1064_clock_config.c | 1 +
 ports/mimxrt/mpconfigport.h                   | 1 +
 4 files changed, 4 insertions(+)

diff --git a/ports/mimxrt/boards/MIMXRT1052_clock_config.c b/ports/mimxrt/boards/MIMXRT1052_clock_config.c
index 93492812977ab..fa7450d487a63 100644
--- a/ports/mimxrt/boards/MIMXRT1052_clock_config.c
+++ b/ports/mimxrt/boards/MIMXRT1052_clock_config.c
@@ -465,4 +465,5 @@ void BOARD_BootClockRUN(void) {
     IOMUXC_GPR->GPR5 &= ~IOMUXC_GPR_GPR5_VREF_1M_CLK_GPT2_MASK;
     /* Set SystemCoreClock variable. */
     SystemCoreClock = BOARD_BOOTCLOCKRUN_CORE_CLOCK;
+    CLOCK_SetMode(kCLOCK_ModeRun);
 }
diff --git a/ports/mimxrt/boards/MIMXRT1062_clock_config.c b/ports/mimxrt/boards/MIMXRT1062_clock_config.c
index 05474167bd85b..589ffb0b58311 100644
--- a/ports/mimxrt/boards/MIMXRT1062_clock_config.c
+++ b/ports/mimxrt/boards/MIMXRT1062_clock_config.c
@@ -487,4 +487,5 @@ void BOARD_BootClockRUN(void) {
     IOMUXC_GPR->GPR5 &= ~IOMUXC_GPR_GPR5_VREF_1M_CLK_GPT2_MASK;
     /* Set SystemCoreClock variable. */
     SystemCoreClock = BOARD_BOOTCLOCKRUN_CORE_CLOCK;
+    CLOCK_SetMode(kCLOCK_ModeRun);
 }
diff --git a/ports/mimxrt/boards/MIMXRT1064_clock_config.c b/ports/mimxrt/boards/MIMXRT1064_clock_config.c
index 5e49a2fff80e3..56dd75d7fbf6f 100644
--- a/ports/mimxrt/boards/MIMXRT1064_clock_config.c
+++ b/ports/mimxrt/boards/MIMXRT1064_clock_config.c
@@ -487,4 +487,5 @@ void BOARD_BootClockRUN(void) {
     IOMUXC_GPR->GPR5 &= ~IOMUXC_GPR_GPR5_VREF_1M_CLK_GPT2_MASK;
     /* Set SystemCoreClock variable. */
     SystemCoreClock = BOARD_BOOTCLOCKRUN_CORE_CLOCK;
+    CLOCK_SetMode(kCLOCK_ModeRun);
 }
diff --git a/ports/mimxrt/mpconfigport.h b/ports/mimxrt/mpconfigport.h
index 8642d53ecc455..3f87800e3056d 100644
--- a/ports/mimxrt/mpconfigport.h
+++ b/ports/mimxrt/mpconfigport.h
@@ -241,6 +241,7 @@ extern const struct _mp_obj_type_t network_lan_type;
     do { \
         extern void mp_handle_pending(bool); \
         mp_handle_pending(true); \
+        __WFE(); \
     } while (0);
 
 #define MICROPY_MAKE_POINTER_CALLABLE(p) ((void *)((mp_uint_t)(p) | 1))

From 65fa7fd8bbaf570be3f4654bcc597a46c70e4b75 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sat, 15 Oct 2022 11:40:22 +0200
Subject: [PATCH 2794/3533] mimxrt/machine_timer: Use soft-timer implementation
 for machine.Timer.

This releases the hardware timers for other tasks, which need a higher
resolution and faster response.  And it is less port-specific code.
---
 docs/mimxrt/quickref.rst     |   9 +-
 ports/mimxrt/Makefile        |   1 +
 ports/mimxrt/board_init.c    |   3 -
 ports/mimxrt/machine_timer.c | 158 +++++++++--------------------------
 ports/mimxrt/main.c          |   2 +
 ports/mimxrt/mphalport.h     |   4 +
 ports/mimxrt/systick.c       |   7 ++
 7 files changed, 58 insertions(+), 126 deletions(-)

diff --git a/docs/mimxrt/quickref.rst b/docs/mimxrt/quickref.rst
index c75fe60c8d66b..06f91f7f50312 100644
--- a/docs/mimxrt/quickref.rst
+++ b/docs/mimxrt/quickref.rst
@@ -56,21 +56,18 @@ Use the :mod:`time <time>` module::
 Timers
 ------
 
-The i.MXRT port has three hardware timers. Use the :ref:`machine.Timer <machine.Timer>` class
-with a timer ID from 0 to 2 (inclusive)::
+The i.MXRT port supports virtual Timers. Example of usage::
 
     from machine import Timer
 
-    tim0 = Timer(0)
+    tim0 = Timer(-1)
     tim0.init(period=5000, mode=Timer.ONE_SHOT, callback=lambda t:print(0))
 
-    tim1 = Timer(1)
+    tim1 = Timer(-1)
     tim1.init(period=2000, mode=Timer.PERIODIC, callback=lambda t:print(1))
 
 The period is in milliseconds.
 
-Virtual timers are not currently supported on this port.
-
 .. _mimxrt_Pins_and_GPIO:
 
 Pins and GPIO
diff --git a/ports/mimxrt/Makefile b/ports/mimxrt/Makefile
index 2119e027ef59f..db03b7bef266d 100644
--- a/ports/mimxrt/Makefile
+++ b/ports/mimxrt/Makefile
@@ -193,6 +193,7 @@ SHARED_SRC_C += \
 	shared/runtime/interrupt_char.c \
 	shared/runtime/mpirq.c \
 	shared/runtime/pyexec.c \
+	shared/runtime/softtimer.c \
 	shared/runtime/stdout_helpers.c \
 	shared/runtime/sys_stdio_mphal.c \
 	shared/timeutils/timeutils.c \
diff --git a/ports/mimxrt/board_init.c b/ports/mimxrt/board_init.c
index 12496890ac4a3..d0625aac37493 100644
--- a/ports/mimxrt/board_init.c
+++ b/ports/mimxrt/board_init.c
@@ -89,9 +89,6 @@ void board_init(void) {
     // ADC
     machine_adc_init();
 
-    // PIT
-    machine_timer_init_PIT();
-
     // SDCard
     #if MICROPY_PY_MACHINE_SDCARD
     machine_sdcard_init0();
diff --git a/ports/mimxrt/machine_timer.c b/ports/mimxrt/machine_timer.c
index a237272390ce4..54ae06b6b3462 100644
--- a/ports/mimxrt/machine_timer.c
+++ b/ports/mimxrt/machine_timer.c
@@ -26,66 +26,24 @@
  */
 
 #include "py/runtime.h"
-#include "py/mperrno.h"
 #include "py/mphal.h"
-#include "fsl_pit.h"
-#include "modmachine.h"
-#include CLOCK_CONFIG_H
-
-#define TIMER_MODE_ONE_SHOT (0)
-#define TIMER_MODE_PERIODIC (1)
-#define TIMER_MIN_PERIOD 1
-
-#define alarm_callback PIT_IRQHandler
-#define PIT_IRQ_ID PIT_IRQn
-
-typedef struct _machine_timer_obj_t {
-    mp_obj_base_t base;
-    int8_t id;
-    int8_t channel;
-    uint32_t mode;
-    uint32_t tick_hz;
-    uint32_t delta_us; // for periodic mode
-    mp_obj_t callback;
-} machine_timer_obj_t;
-
-static const int8_t channel_no[MICROPY_HW_PIT_NUM_CHANNELS] = {0, 2, 3}; // no channel 1
-static pit_config_t pit_config;
-
-// This is the interrupt handler
-// To tell which channel fired one has to poll the flags
-void alarm_callback(void) {
-    for (uint8_t index = 0; index < MICROPY_HW_PIT_NUM_CHANNELS; index++) {
-        uint32_t flag;
-        machine_timer_obj_t *self = MP_STATE_PORT(timer_table)[index];
-        if (self != NULL) {
-            flag = PIT_GetStatusFlags(PIT, self->channel);
-            if (flag & kPIT_TimerFlag) { // channel fired
-                PIT_ClearStatusFlags(PIT, self->channel, kPIT_TimerFlag);
-                __DSB();
-
-                mp_sched_schedule(self->callback, MP_OBJ_FROM_PTR(self));
-
-                if (self->mode == TIMER_MODE_ONE_SHOT) {
-                    PIT_StopTimer(PIT, self->channel);
-                }
-            }
-        }
-    }
-}
+#include "shared/runtime/softtimer.h"
+
+typedef soft_timer_entry_t machine_timer_obj_t;
+
+const mp_obj_type_t machine_timer_type;
 
 STATIC void machine_timer_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     machine_timer_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    qstr mode = self->mode == TIMER_MODE_ONE_SHOT ? MP_QSTR_ONE_SHOT : MP_QSTR_PERIODIC;
-    mp_printf(print, "Timer(channel=%d, mode=%q, period=%d, tick_hz=%d)",
-        self->id, mode, self->delta_us / self->tick_hz, self->tick_hz);
+    qstr mode = self->mode == SOFT_TIMER_MODE_ONE_SHOT ? MP_QSTR_ONE_SHOT : MP_QSTR_PERIODIC;
+    mp_printf(print, "Timer(mode=%q, period=%u)", mode, self->delta_ms);
 }
 
 STATIC mp_obj_t machine_timer_init_helper(machine_timer_obj_t *self, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_mode, ARG_callback, ARG_period, ARG_tick_hz, ARG_freq, };
     static const mp_arg_t allowed_args[] = {
-        { MP_QSTR_mode,         MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = TIMER_MODE_PERIODIC} },
-        { MP_QSTR_callback,     MP_ARG_REQUIRED | MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
+        { MP_QSTR_mode,         MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = SOFT_TIMER_MODE_PERIODIC} },
+        { MP_QSTR_callback,     MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
         { MP_QSTR_period,       MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 0xffffffff} },
         { MP_QSTR_tick_hz,      MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 1000} },
         { MP_QSTR_freq,         MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
@@ -96,67 +54,56 @@ STATIC mp_obj_t machine_timer_init_helper(machine_timer_obj_t *self, size_t n_ar
     mp_arg_parse_all(n_args, pos_args, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
 
     self->mode = args[ARG_mode].u_int;
+
+    uint64_t delta_ms = self->delta_ms;
     if (args[ARG_freq].u_obj != mp_const_none) {
         // Frequency specified in Hz
         #if MICROPY_PY_BUILTINS_FLOAT
-        self->delta_us = (uint32_t)(MICROPY_FLOAT_CONST(1000000.0) / mp_obj_get_float(args[ARG_freq].u_obj));
+        delta_ms = (uint32_t)(MICROPY_FLOAT_CONST(1000.0) / mp_obj_get_float(args[ARG_freq].u_obj));
         #else
-        self->delta_us = 1000000 / mp_obj_get_int(args[ARG_freq].u_obj);
+        delta_ms = 1000 / mp_obj_get_int(args[ARG_freq].u_obj);
         #endif
-    } else {
+    } else if (args[ARG_period].u_int != 0xffffffff) {
         // Period specified
-        self->tick_hz = args[ARG_tick_hz].u_int;
-        self->delta_us = (uint64_t)args[ARG_period].u_int * 1000000 / self->tick_hz;
-    }
-    if (self->delta_us < TIMER_MIN_PERIOD) {
-        self->delta_us = TIMER_MIN_PERIOD;
+        delta_ms = (uint64_t)args[ARG_period].u_int * 1000 / args[ARG_tick_hz].u_int;
     }
 
-    self->callback = args[ARG_callback].u_obj;
-
-    // Set timer period for channel id
-    PIT_SetTimerPeriod(PIT, self->channel, USEC_TO_COUNT(self->delta_us, BOARD_BOOTCLOCKRUN_IPG_CLK_ROOT));
-
-    // Enable timer interrupts for the channel
-    PIT_EnableInterrupts(PIT, self->channel, kPIT_TimerInterruptEnable);
+    if (delta_ms < 1) {
+        delta_ms = 1;
+    } else if (delta_ms >= 0x40000000) {
+        mp_raise_ValueError(MP_ERROR_TEXT("period too large"));
+    }
+    self->delta_ms = (uint32_t)delta_ms;
 
-    // Enable at the NVIC
-    EnableIRQ(PIT_IRQ_ID);
+    if (args[ARG_callback].u_obj != MP_OBJ_NULL) {
+        self->py_callback = args[ARG_callback].u_obj;
+    }
 
-    // Start channel 0
-    PIT_StartTimer(PIT, self->channel);
+    if (self->py_callback != mp_const_none) {
+        soft_timer_insert(self, self->delta_ms);
+    }
 
     return mp_const_none;
 }
 
 STATIC mp_obj_t machine_timer_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
-    machine_timer_obj_t *self;
-
-    // Get timer id in the range of 0..2
-    mp_int_t id = 0;
+    machine_timer_obj_t *self = m_new_obj(machine_timer_obj_t);
+    self->pairheap.base.type = &machine_timer_type;
+    self->flags = SOFT_TIMER_FLAG_PY_CALLBACK | SOFT_TIMER_FLAG_GC_ALLOCATED;
+    self->delta_ms = 1000;
+    self->py_callback = mp_const_none;
+
+    // Get timer id (only soft timer (-1) supported at the moment)
+    mp_int_t id = -1;
     if (n_args > 0) {
         id = mp_obj_get_int(args[0]);
         --n_args;
         ++args;
     }
-    if (id < 0 || id >= MICROPY_HW_PIT_NUM_CHANNELS) {
-        mp_raise_ValueError(MP_ERROR_TEXT("Timer does not exist"));
+    if (id != -1) {
+        mp_raise_ValueError(MP_ERROR_TEXT("Timer doesn't exist"));
     }
 
-    // check, if a timer exists at that channel and stop it first
-    if (MP_STATE_PORT(timer_table)[id] != NULL) {
-        PIT_StopTimer(PIT, channel_no[id]);
-        self = MP_STATE_PORT(timer_table)[id];
-    } else {
-        self = m_new_obj_with_finaliser(machine_timer_obj_t);
-        self->base.type = &machine_timer_type;
-        MP_STATE_PORT(timer_table)[id] = self;
-    }
-
-    // Set initial values
-    self->id = id;
-    self->channel = channel_no[id];
-
     if (n_args > 0 || n_kw > 0) {
         // Start the timer
         mp_map_t kw_args;
@@ -167,47 +114,26 @@ STATIC mp_obj_t machine_timer_make_new(const mp_obj_type_t *type, size_t n_args,
     return MP_OBJ_FROM_PTR(self);
 }
 
-STATIC mp_obj_t machine_timer___del__(mp_obj_t self_in) {
-    machine_timer_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    PIT_StopTimer(PIT, self->channel);
-    MP_STATE_PORT(timer_table)[self->id] = NULL;
-    return mp_const_none;
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_timer___del___obj, machine_timer___del__);
-
 STATIC mp_obj_t machine_timer_init(size_t n_args, const mp_obj_t *args, mp_map_t *kw_args) {
     machine_timer_obj_t *self = MP_OBJ_TO_PTR(args[0]);
-    PIT_StopTimer(PIT, self->channel);
+    soft_timer_remove(self);
     return machine_timer_init_helper(self, n_args - 1, args + 1, kw_args);
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_KW(machine_timer_init_obj, 1, machine_timer_init);
 
 STATIC mp_obj_t machine_timer_deinit(mp_obj_t self_in) {
     machine_timer_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    PIT_StopTimer(PIT, self->channel);
+    soft_timer_remove(self);
     return mp_const_none;
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_timer_deinit_obj, machine_timer_deinit);
 
-// Initialize clock an first config
-void machine_timer_init_PIT(void) {
-    // PIT timer
-    // Enable clock gate for GPIO1
-    CLOCK_EnableClock(kCLOCK_Gpio1); // ?
-    // Set PERCLK_CLK divider to 1
-    CLOCK_SetDiv(kCLOCK_PerclkDiv, 0U);
-
-    PIT_GetDefaultConfig(&pit_config);
-    PIT_Init(PIT, &pit_config);
-}
-
 STATIC const mp_rom_map_elem_t machine_timer_locals_dict_table[] = {
-    { MP_ROM_QSTR(MP_QSTR___del__), MP_ROM_PTR(&machine_timer___del___obj) },
     { MP_ROM_QSTR(MP_QSTR_init), MP_ROM_PTR(&machine_timer_init_obj) },
     { MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&machine_timer_deinit_obj) },
 
-    { MP_ROM_QSTR(MP_QSTR_ONE_SHOT), MP_ROM_INT(TIMER_MODE_ONE_SHOT) },
-    { MP_ROM_QSTR(MP_QSTR_PERIODIC), MP_ROM_INT(TIMER_MODE_PERIODIC) },
+    { MP_ROM_QSTR(MP_QSTR_ONE_SHOT), MP_ROM_INT(SOFT_TIMER_MODE_ONE_SHOT) },
+    { MP_ROM_QSTR(MP_QSTR_PERIODIC), MP_ROM_INT(SOFT_TIMER_MODE_PERIODIC) },
 };
 STATIC MP_DEFINE_CONST_DICT(machine_timer_locals_dict, machine_timer_locals_dict_table);
 
@@ -219,5 +145,3 @@ MP_DEFINE_CONST_OBJ_TYPE(
     print, machine_timer_print,
     locals_dict, &machine_timer_locals_dict
     );
-
-MP_REGISTER_ROOT_POINTER(struct _machine_timer_obj_t *timer_table[MICROPY_HW_PIT_NUM_CHANNELS]);
diff --git a/ports/mimxrt/main.c b/ports/mimxrt/main.c
index 82e07868a1d41..b81a44e2788e0 100644
--- a/ports/mimxrt/main.c
+++ b/ports/mimxrt/main.c
@@ -33,6 +33,7 @@
 #include "shared/readline/readline.h"
 #include "shared/runtime/gchelper.h"
 #include "shared/runtime/pyexec.h"
+#include "shared/runtime/softtimer.h"
 #include "ticks.h"
 #include "tusb.h"
 #include "led.h"
@@ -120,6 +121,7 @@ int main(void) {
         mod_network_deinit();
         #endif
         machine_pwm_deinit_all();
+        soft_timer_deinit();
         gc_sweep_all();
         mp_deinit();
     }
diff --git a/ports/mimxrt/mphalport.h b/ports/mimxrt/mphalport.h
index 124b905604d0b..30390a4a4c10f 100644
--- a/ports/mimxrt/mphalport.h
+++ b/ports/mimxrt/mphalport.h
@@ -38,6 +38,10 @@
 #define MP_HAL_PIN_FMT                  "%q"
 extern ringbuf_t stdin_ringbuf;
 
+// Define an alias fo systick_ms, because the shared softtimer.c uses
+// the symbol uwTick for the systick ms counter.
+#define uwTick systick_ms
+
 #define mp_hal_pin_obj_t const machine_pin_obj_t *
 #define mp_hal_get_pin_obj(o)   pin_find(o)
 #define mp_hal_pin_name(p)      ((p)->name)
diff --git a/ports/mimxrt/systick.c b/ports/mimxrt/systick.c
index 086bf1670161f..8b0f5eb7b2dec 100644
--- a/ports/mimxrt/systick.c
+++ b/ports/mimxrt/systick.c
@@ -28,6 +28,9 @@
 #include "py/mphal.h"
 #include "systick.h"
 
+#include "pendsv.h"
+#include "shared/runtime/softtimer.h"
+
 volatile uint32_t systick_ms = 0;
 
 systick_dispatch_t systick_dispatch_table[SYSTICK_DISPATCH_NUM_SLOTS];
@@ -44,6 +47,10 @@ void SysTick_Handler(void) {
     if (f != NULL) {
         f(uw_tick);
     }
+
+    if (soft_timer_next == uw_tick) {
+        pendsv_schedule_dispatch(PENDSV_DISPATCH_SOFT_TIMER, soft_timer_handler);
+    }
 }
 
 bool systick_has_passed(uint32_t start_tick, uint32_t delay_ms) {

From e8f5cfe0e140f510fa0c94c6a5f474430e4a4bef Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 27 Oct 2022 14:30:58 +1100
Subject: [PATCH 2795/3533] nrf: Rename MICROPY_PY_MACHINE_TIMER to
 MICROPY_PY_MACHINE_TIMER_NRF.

So that it doesn't clash with the extmod version.

Also make the default for this enabled, so that most boards do not need to
configure it.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/nrf/boards/actinius_icarus/mpconfigboard.h           | 1 -
 ports/nrf/boards/arduino_nano_33_ble_sense/mpconfigboard.h | 1 -
 ports/nrf/boards/arduino_primo/mpconfigboard.h             | 1 -
 ports/nrf/boards/blueio_tag_evim/mpconfigboard.h           | 1 -
 ports/nrf/boards/dvk_bl652/mpconfigboard.h                 | 1 -
 ports/nrf/boards/evk_nina_b1/mpconfigboard.h               | 1 -
 ports/nrf/boards/evk_nina_b3/mpconfigboard.h               | 1 -
 ports/nrf/boards/feather52/mpconfigboard.h                 | 1 -
 ports/nrf/boards/ibk_blyst_nano/mpconfigboard.h            | 1 -
 ports/nrf/boards/idk_blyst_nano/mpconfigboard.h            | 1 -
 ports/nrf/boards/microbit/mpconfigboard.h                  | 1 -
 ports/nrf/boards/nrf52840-mdk-usb-dongle/mpconfigboard.h   | 1 -
 ports/nrf/boards/particle_xenon/mpconfigboard.h            | 1 -
 ports/nrf/boards/pca10000/mpconfigboard.h                  | 1 -
 ports/nrf/boards/pca10001/mpconfigboard.h                  | 1 -
 ports/nrf/boards/pca10028/mpconfigboard.h                  | 1 -
 ports/nrf/boards/pca10031/mpconfigboard.h                  | 1 -
 ports/nrf/boards/pca10040/mpconfigboard.h                  | 1 -
 ports/nrf/boards/pca10056/mpconfigboard.h                  | 1 -
 ports/nrf/boards/pca10059/mpconfigboard.h                  | 1 -
 ports/nrf/boards/pca10090/mpconfigboard.h                  | 2 +-
 ports/nrf/boards/wt51822_s4at/mpconfigboard.h              | 1 -
 ports/nrf/main.c                                           | 2 +-
 ports/nrf/modules/machine/modmachine.c                     | 2 +-
 ports/nrf/modules/machine/timer.c                          | 4 ++--
 ports/nrf/mpconfigport.h                                   | 4 ++--
 ports/nrf/nrfx_config.h                                    | 2 +-
 27 files changed, 8 insertions(+), 29 deletions(-)

diff --git a/ports/nrf/boards/actinius_icarus/mpconfigboard.h b/ports/nrf/boards/actinius_icarus/mpconfigboard.h
index e99d731df941d..46960cab83bb1 100644
--- a/ports/nrf/boards/actinius_icarus/mpconfigboard.h
+++ b/ports/nrf/boards/actinius_icarus/mpconfigboard.h
@@ -33,7 +33,6 @@
 #define MICROPY_PY_MACHINE_UART     (1)
 #define MICROPY_PY_MACHINE_HW_PWM   (0)
 #define MICROPY_PY_MACHINE_HW_SPI   (1)
-#define MICROPY_PY_MACHINE_TIMER    (1)
 #define MICROPY_PY_MACHINE_RTCOUNTER (1)
 #define MICROPY_PY_MACHINE_I2C      (1)
 #define MICROPY_PY_MACHINE_ADC      (0)
diff --git a/ports/nrf/boards/arduino_nano_33_ble_sense/mpconfigboard.h b/ports/nrf/boards/arduino_nano_33_ble_sense/mpconfigboard.h
index 4a16b6110bc9c..0e6c5a44abf48 100644
--- a/ports/nrf/boards/arduino_nano_33_ble_sense/mpconfigboard.h
+++ b/ports/nrf/boards/arduino_nano_33_ble_sense/mpconfigboard.h
@@ -16,7 +16,6 @@
 #define MICROPY_PY_MACHINE_UART         (1)
 #define MICROPY_PY_MACHINE_HW_PWM       (1)
 #define MICROPY_PY_MACHINE_HW_SPI       (1)
-#define MICROPY_PY_MACHINE_TIMER        (1)
 #define MICROPY_PY_MACHINE_RTCOUNTER    (1)
 #define MICROPY_PY_MACHINE_I2C          (1)
 #define MICROPY_PY_MACHINE_ADC          (1)
diff --git a/ports/nrf/boards/arduino_primo/mpconfigboard.h b/ports/nrf/boards/arduino_primo/mpconfigboard.h
index 639b6869c0980..9d58a823cd2ed 100644
--- a/ports/nrf/boards/arduino_primo/mpconfigboard.h
+++ b/ports/nrf/boards/arduino_primo/mpconfigboard.h
@@ -34,7 +34,6 @@
 #define MICROPY_PY_MACHINE_UART     (1)
 #define MICROPY_PY_MACHINE_HW_PWM   (1)
 #define MICROPY_PY_MACHINE_HW_SPI   (1)
-#define MICROPY_PY_MACHINE_TIMER    (1)
 #define MICROPY_PY_MACHINE_RTCOUNTER (1)
 #define MICROPY_PY_MACHINE_I2C      (1)
 #define MICROPY_PY_MACHINE_ADC      (1)
diff --git a/ports/nrf/boards/blueio_tag_evim/mpconfigboard.h b/ports/nrf/boards/blueio_tag_evim/mpconfigboard.h
index 2ceeadf8eb939..1b58a4d8c1f6f 100644
--- a/ports/nrf/boards/blueio_tag_evim/mpconfigboard.h
+++ b/ports/nrf/boards/blueio_tag_evim/mpconfigboard.h
@@ -34,7 +34,6 @@
 #define MICROPY_PY_MACHINE_UART     (1)
 #define MICROPY_PY_MACHINE_HW_PWM   (1)
 #define MICROPY_PY_MACHINE_HW_SPI   (1)
-#define MICROPY_PY_MACHINE_TIMER    (1)
 #define MICROPY_PY_MACHINE_RTCOUNTER (1)
 #define MICROPY_PY_MACHINE_I2C      (1)
 #define MICROPY_PY_MACHINE_ADC      (1)
diff --git a/ports/nrf/boards/dvk_bl652/mpconfigboard.h b/ports/nrf/boards/dvk_bl652/mpconfigboard.h
index d0b19a318453b..e83e555178ffd 100644
--- a/ports/nrf/boards/dvk_bl652/mpconfigboard.h
+++ b/ports/nrf/boards/dvk_bl652/mpconfigboard.h
@@ -31,7 +31,6 @@
 #define MICROPY_PY_MACHINE_UART     (1)
 #define MICROPY_PY_MACHINE_PWM      (1)
 #define MICROPY_PY_MACHINE_HW_SPI   (1)
-#define MICROPY_PY_MACHINE_TIMER    (1)
 #define MICROPY_PY_MACHINE_RTCOUNTER (1)
 #define MICROPY_PY_MACHINE_I2C      (1)
 #define MICROPY_PY_MACHINE_ADC      (1)
diff --git a/ports/nrf/boards/evk_nina_b1/mpconfigboard.h b/ports/nrf/boards/evk_nina_b1/mpconfigboard.h
index f0629b3a23031..72aeb449285f8 100644
--- a/ports/nrf/boards/evk_nina_b1/mpconfigboard.h
+++ b/ports/nrf/boards/evk_nina_b1/mpconfigboard.h
@@ -32,7 +32,6 @@
 
 #define MICROPY_PY_MACHINE_UART     (1)
 #define MICROPY_PY_MACHINE_HW_SPI   (1)
-#define MICROPY_PY_MACHINE_TIMER    (1)
 #define MICROPY_PY_MACHINE_RTCOUNTER (1)
 #define MICROPY_PY_MACHINE_I2C      (1)
 #define MICROPY_PY_MACHINE_ADC      (1)
diff --git a/ports/nrf/boards/evk_nina_b3/mpconfigboard.h b/ports/nrf/boards/evk_nina_b3/mpconfigboard.h
index eaca796be4d67..e554b65207ab6 100644
--- a/ports/nrf/boards/evk_nina_b3/mpconfigboard.h
+++ b/ports/nrf/boards/evk_nina_b3/mpconfigboard.h
@@ -48,7 +48,6 @@
 #define MICROPY_PY_MACHINE_UART     (1)
 #define MICROPY_PY_MACHINE_HW_PWM   (1)
 #define MICROPY_PY_MACHINE_HW_SPI   (1)
-#define MICROPY_PY_MACHINE_TIMER    (1)
 #define MICROPY_PY_MACHINE_RTCOUNTER (1)
 #define MICROPY_PY_MACHINE_I2C      (1)
 #define MICROPY_PY_MACHINE_ADC      (1)
diff --git a/ports/nrf/boards/feather52/mpconfigboard.h b/ports/nrf/boards/feather52/mpconfigboard.h
index 10e0d999cebcd..f653832c620d3 100644
--- a/ports/nrf/boards/feather52/mpconfigboard.h
+++ b/ports/nrf/boards/feather52/mpconfigboard.h
@@ -31,7 +31,6 @@
 #define MICROPY_PY_MACHINE_UART     (1)
 #define MICROPY_PY_MACHINE_HW_PWM   (1)
 #define MICROPY_PY_MACHINE_HW_SPI   (1)
-#define MICROPY_PY_MACHINE_TIMER    (1)
 #define MICROPY_PY_MACHINE_RTCOUNTER (1)
 #define MICROPY_PY_MACHINE_I2C      (1)
 #define MICROPY_PY_MACHINE_ADC      (1)
diff --git a/ports/nrf/boards/ibk_blyst_nano/mpconfigboard.h b/ports/nrf/boards/ibk_blyst_nano/mpconfigboard.h
index 4897471ea56ce..c367c92b7fb3d 100644
--- a/ports/nrf/boards/ibk_blyst_nano/mpconfigboard.h
+++ b/ports/nrf/boards/ibk_blyst_nano/mpconfigboard.h
@@ -34,7 +34,6 @@
 #define MICROPY_PY_MACHINE_UART     (1)
 #define MICROPY_PY_MACHINE_HW_PWM   (1)
 #define MICROPY_PY_MACHINE_HW_SPI   (1)
-#define MICROPY_PY_MACHINE_TIMER    (1)
 #define MICROPY_PY_MACHINE_RTCOUNTER (1)
 #define MICROPY_PY_MACHINE_I2C      (1)
 #define MICROPY_PY_MACHINE_ADC      (1)
diff --git a/ports/nrf/boards/idk_blyst_nano/mpconfigboard.h b/ports/nrf/boards/idk_blyst_nano/mpconfigboard.h
index 06c16477387c7..f0760ec2c01e4 100644
--- a/ports/nrf/boards/idk_blyst_nano/mpconfigboard.h
+++ b/ports/nrf/boards/idk_blyst_nano/mpconfigboard.h
@@ -34,7 +34,6 @@
 #define MICROPY_PY_MACHINE_UART     (1)
 #define MICROPY_PY_MACHINE_HW_PWM   (1)
 #define MICROPY_PY_MACHINE_HW_SPI   (1)
-#define MICROPY_PY_MACHINE_TIMER    (1)
 #define MICROPY_PY_MACHINE_RTCOUNTER (1)
 #define MICROPY_PY_MACHINE_I2C      (1)
 #define MICROPY_PY_MACHINE_ADC      (1)
diff --git a/ports/nrf/boards/microbit/mpconfigboard.h b/ports/nrf/boards/microbit/mpconfigboard.h
index f05317fb5910d..63f45587af8d2 100644
--- a/ports/nrf/boards/microbit/mpconfigboard.h
+++ b/ports/nrf/boards/microbit/mpconfigboard.h
@@ -32,7 +32,6 @@
 #define MICROPY_PY_MUSIC            (1)
 #define MICROPY_PY_MACHINE_SOFT_PWM (1)
 #define MICROPY_PY_MACHINE_HW_SPI   (1)
-#define MICROPY_PY_MACHINE_TIMER    (1)
 #define MICROPY_PY_MACHINE_RTCOUNTER (1)
 #define MICROPY_PY_MACHINE_I2C      (1)
 #define MICROPY_PY_MACHINE_ADC      (1)
diff --git a/ports/nrf/boards/nrf52840-mdk-usb-dongle/mpconfigboard.h b/ports/nrf/boards/nrf52840-mdk-usb-dongle/mpconfigboard.h
index f048c39e0efdd..d502c86575c27 100644
--- a/ports/nrf/boards/nrf52840-mdk-usb-dongle/mpconfigboard.h
+++ b/ports/nrf/boards/nrf52840-mdk-usb-dongle/mpconfigboard.h
@@ -31,7 +31,6 @@
 #define MICROPY_PY_MACHINE_UART      (1)
 #define MICROPY_PY_MACHINE_HW_PWM    (1)
 #define MICROPY_PY_MACHINE_HW_SPI    (1)
-#define MICROPY_PY_MACHINE_TIMER     (1)
 #define MICROPY_PY_MACHINE_RTCOUNTER (1)
 #define MICROPY_PY_MACHINE_I2C       (1)
 #define MICROPY_PY_MACHINE_ADC       (1)
diff --git a/ports/nrf/boards/particle_xenon/mpconfigboard.h b/ports/nrf/boards/particle_xenon/mpconfigboard.h
index 7c814e377f603..d77e104ce2c8a 100644
--- a/ports/nrf/boards/particle_xenon/mpconfigboard.h
+++ b/ports/nrf/boards/particle_xenon/mpconfigboard.h
@@ -31,7 +31,6 @@
 #define MICROPY_PY_MACHINE_UART     (1)
 #define MICROPY_PY_MACHINE_HW_PWM   (1)
 #define MICROPY_PY_MACHINE_HW_SPI   (1)
-#define MICROPY_PY_MACHINE_TIMER    (1)
 #define MICROPY_PY_MACHINE_RTCOUNTER (1)
 #define MICROPY_PY_MACHINE_I2C      (1)
 #define MICROPY_PY_MACHINE_ADC      (1)
diff --git a/ports/nrf/boards/pca10000/mpconfigboard.h b/ports/nrf/boards/pca10000/mpconfigboard.h
index f61405d0480bb..61a03d42a8373 100644
--- a/ports/nrf/boards/pca10000/mpconfigboard.h
+++ b/ports/nrf/boards/pca10000/mpconfigboard.h
@@ -30,7 +30,6 @@
 
 #define MICROPY_PY_MACHINE_UART     (1)
 #define MICROPY_PY_MACHINE_HW_SPI   (0)
-#define MICROPY_PY_MACHINE_TIMER    (1)
 #define MICROPY_PY_MACHINE_RTCOUNTER (1)
 #define MICROPY_PY_MACHINE_I2C      (0)
 #define MICROPY_PY_MACHINE_ADC      (0)
diff --git a/ports/nrf/boards/pca10001/mpconfigboard.h b/ports/nrf/boards/pca10001/mpconfigboard.h
index c101b0886aad7..7eb02ecfeb4ae 100644
--- a/ports/nrf/boards/pca10001/mpconfigboard.h
+++ b/ports/nrf/boards/pca10001/mpconfigboard.h
@@ -30,7 +30,6 @@
 
 #define MICROPY_PY_MACHINE_UART     (1)
 #define MICROPY_PY_MACHINE_HW_SPI   (0)
-#define MICROPY_PY_MACHINE_TIMER    (1)
 #define MICROPY_PY_MACHINE_RTCOUNTER (1)
 #define MICROPY_PY_MACHINE_I2C      (1)
 #define MICROPY_PY_MACHINE_ADC      (1)
diff --git a/ports/nrf/boards/pca10028/mpconfigboard.h b/ports/nrf/boards/pca10028/mpconfigboard.h
index 5488b4ba534c1..6b1852d82790e 100644
--- a/ports/nrf/boards/pca10028/mpconfigboard.h
+++ b/ports/nrf/boards/pca10028/mpconfigboard.h
@@ -30,7 +30,6 @@
 
 #define MICROPY_PY_MACHINE_UART     (1)
 #define MICROPY_PY_MACHINE_HW_SPI   (1)
-#define MICROPY_PY_MACHINE_TIMER    (1)
 #define MICROPY_PY_MACHINE_RTCOUNTER (1)
 #define MICROPY_PY_MACHINE_I2C      (1)
 #define MICROPY_PY_MACHINE_ADC      (1)
diff --git a/ports/nrf/boards/pca10031/mpconfigboard.h b/ports/nrf/boards/pca10031/mpconfigboard.h
index f16ffd7057ff5..42f9b8c6392ca 100644
--- a/ports/nrf/boards/pca10031/mpconfigboard.h
+++ b/ports/nrf/boards/pca10031/mpconfigboard.h
@@ -30,7 +30,6 @@
 
 #define MICROPY_PY_MACHINE_UART     (1)
 #define MICROPY_PY_MACHINE_HW_SPI   (1)
-#define MICROPY_PY_MACHINE_TIMER    (1)
 #define MICROPY_PY_MACHINE_RTCOUNTER (1)
 #define MICROPY_PY_MACHINE_I2C      (1)
 #define MICROPY_PY_MACHINE_ADC      (1)
diff --git a/ports/nrf/boards/pca10040/mpconfigboard.h b/ports/nrf/boards/pca10040/mpconfigboard.h
index 1dd01d66a0482..7202f6a0b1323 100644
--- a/ports/nrf/boards/pca10040/mpconfigboard.h
+++ b/ports/nrf/boards/pca10040/mpconfigboard.h
@@ -31,7 +31,6 @@
 #define MICROPY_PY_MACHINE_UART     (1)
 #define MICROPY_PY_MACHINE_HW_PWM   (1)
 #define MICROPY_PY_MACHINE_HW_SPI   (1)
-#define MICROPY_PY_MACHINE_TIMER    (1)
 #define MICROPY_PY_MACHINE_RTCOUNTER (1)
 #define MICROPY_PY_MACHINE_I2C      (1)
 #define MICROPY_PY_MACHINE_ADC      (1)
diff --git a/ports/nrf/boards/pca10056/mpconfigboard.h b/ports/nrf/boards/pca10056/mpconfigboard.h
index c037e2ecf5b28..f7daf48a62223 100644
--- a/ports/nrf/boards/pca10056/mpconfigboard.h
+++ b/ports/nrf/boards/pca10056/mpconfigboard.h
@@ -31,7 +31,6 @@
 #define MICROPY_PY_MACHINE_UART     (1)
 #define MICROPY_PY_MACHINE_HW_PWM   (1)
 #define MICROPY_PY_MACHINE_HW_SPI   (1)
-#define MICROPY_PY_MACHINE_TIMER    (1)
 #define MICROPY_PY_MACHINE_RTCOUNTER (1)
 #define MICROPY_PY_MACHINE_I2C      (1)
 #define MICROPY_PY_MACHINE_ADC      (1)
diff --git a/ports/nrf/boards/pca10059/mpconfigboard.h b/ports/nrf/boards/pca10059/mpconfigboard.h
index 3db599f2c35dd..f4c78915c6a12 100644
--- a/ports/nrf/boards/pca10059/mpconfigboard.h
+++ b/ports/nrf/boards/pca10059/mpconfigboard.h
@@ -31,7 +31,6 @@
 #define MICROPY_PY_MACHINE_UART     (1)
 #define MICROPY_PY_MACHINE_HW_PWM   (1)
 #define MICROPY_PY_MACHINE_HW_SPI   (1)
-#define MICROPY_PY_MACHINE_TIMER    (1)
 #define MICROPY_PY_MACHINE_RTCOUNTER (1)
 #define MICROPY_PY_MACHINE_I2C      (1)
 #define MICROPY_PY_MACHINE_ADC      (1)
diff --git a/ports/nrf/boards/pca10090/mpconfigboard.h b/ports/nrf/boards/pca10090/mpconfigboard.h
index 28381c40d1e6f..95cf8d6544b03 100644
--- a/ports/nrf/boards/pca10090/mpconfigboard.h
+++ b/ports/nrf/boards/pca10090/mpconfigboard.h
@@ -33,7 +33,7 @@
 #define MICROPY_PY_MACHINE_UART     (1)
 #define MICROPY_PY_MACHINE_HW_PWM   (0)
 #define MICROPY_PY_MACHINE_HW_SPI   (1)
-#define MICROPY_PY_MACHINE_TIMER    (0)
+#define MICROPY_PY_MACHINE_TIMER_NRF (0)
 #define MICROPY_PY_MACHINE_RTCOUNTER (1)
 #define MICROPY_PY_MACHINE_I2C      (1)
 #define MICROPY_PY_MACHINE_ADC      (0)
diff --git a/ports/nrf/boards/wt51822_s4at/mpconfigboard.h b/ports/nrf/boards/wt51822_s4at/mpconfigboard.h
index 8117bbd2a6c18..7997aa2697dc2 100644
--- a/ports/nrf/boards/wt51822_s4at/mpconfigboard.h
+++ b/ports/nrf/boards/wt51822_s4at/mpconfigboard.h
@@ -32,7 +32,6 @@
 
 #define MICROPY_PY_MACHINE_UART     (1)
 #define MICROPY_PY_MACHINE_HW_SPI   (1)
-#define MICROPY_PY_MACHINE_TIMER    (1)
 #define MICROPY_PY_MACHINE_RTCOUNTER (1)
 #define MICROPY_PY_MACHINE_I2C      (1)
 #define MICROPY_PY_MACHINE_ADC      (1)
diff --git a/ports/nrf/main.c b/ports/nrf/main.c
index 989db58b3fa85..339633d86374d 100644
--- a/ports/nrf/main.c
+++ b/ports/nrf/main.c
@@ -156,7 +156,7 @@ int main(int argc, char **argv) {
     rtc_init0();
     #endif
 
-    #if MICROPY_PY_MACHINE_TIMER
+    #if MICROPY_PY_MACHINE_TIMER_NRF
     timer_init0();
     #endif
 
diff --git a/ports/nrf/modules/machine/modmachine.c b/ports/nrf/modules/machine/modmachine.c
index d315582ae6fd5..895e1ae9f9902 100644
--- a/ports/nrf/modules/machine/modmachine.c
+++ b/ports/nrf/modules/machine/modmachine.c
@@ -232,7 +232,7 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
 #if MICROPY_PY_MACHINE_RTCOUNTER
     { MP_ROM_QSTR(MP_QSTR_RTCounter),          MP_ROM_PTR(&machine_rtcounter_type) },
 #endif
-#if MICROPY_PY_MACHINE_TIMER
+#if MICROPY_PY_MACHINE_TIMER_NRF
     { MP_ROM_QSTR(MP_QSTR_Timer),              MP_ROM_PTR(&machine_timer_type) },
 #endif
 #if MICROPY_PY_MACHINE_HW_PWM
diff --git a/ports/nrf/modules/machine/timer.c b/ports/nrf/modules/machine/timer.c
index 091e6d0e32ffc..f6a0e544636d6 100644
--- a/ports/nrf/modules/machine/timer.c
+++ b/ports/nrf/modules/machine/timer.c
@@ -29,7 +29,7 @@
 #include "timer.h"
 #include "nrfx_timer.h"
 
-#if MICROPY_PY_MACHINE_TIMER
+#if MICROPY_PY_MACHINE_TIMER_NRF
 
 enum {
     TIMER_MODE_ONESHOT,
@@ -243,4 +243,4 @@ MP_DEFINE_CONST_OBJ_TYPE(
     locals_dict, &machine_timer_locals_dict
     );
 
-#endif // MICROPY_PY_MACHINE_TIMER
+#endif // MICROPY_PY_MACHINE_TIMER_NRF
diff --git a/ports/nrf/mpconfigport.h b/ports/nrf/mpconfigport.h
index ac238057dd427..27dbd3b584dcf 100644
--- a/ports/nrf/mpconfigport.h
+++ b/ports/nrf/mpconfigport.h
@@ -196,8 +196,8 @@
 #define MICROPY_PY_MACHINE_SOFT_PWM (0)
 #endif
 
-#ifndef MICROPY_PY_MACHINE_TIMER
-#define MICROPY_PY_MACHINE_TIMER    (0)
+#ifndef MICROPY_PY_MACHINE_TIMER_NRF
+#define MICROPY_PY_MACHINE_TIMER_NRF (1)
 #endif
 
 #ifndef MICROPY_PY_MACHINE_RTCOUNTER
diff --git a/ports/nrf/nrfx_config.h b/ports/nrf/nrfx_config.h
index 2b0555dda077d..f1f8595640108 100644
--- a/ports/nrf/nrfx_config.h
+++ b/ports/nrf/nrfx_config.h
@@ -132,7 +132,7 @@
 #define NRFX_RTC1_ENABLED 1
 #define NRFX_RTC2_ENABLED (!NRF51) && (!NRF9160_XXAA)
 
-#define NRFX_TIMER_ENABLED (MICROPY_PY_MACHINE_TIMER)
+#define NRFX_TIMER_ENABLED (MICROPY_PY_MACHINE_TIMER_NRF)
 #define NRFX_TIMER0_ENABLED 1
 #define NRFX_TIMER1_ENABLED (!MICROPY_PY_MACHINE_SOFT_PWM)
 #define NRFX_TIMER2_ENABLED 1

From cd35b8a2a3f27499d36c522930ca70d6f26997cd Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 27 Oct 2022 14:32:43 +1100
Subject: [PATCH 2796/3533] extmod/machine_timer: Move stm32's implementation
 of machine.Timer here.

So it can be reused by other ports.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/extmod.mk                        | 1 +
 {ports/stm32 => extmod}/machine_timer.c | 4 ++++
 ports/stm32/Makefile                    | 1 -
 ports/stm32/mpconfigport.h              | 1 +
 py/mpconfig.h                           | 5 +++++
 5 files changed, 11 insertions(+), 1 deletion(-)
 rename {ports/stm32 => extmod}/machine_timer.c (98%)

diff --git a/extmod/extmod.mk b/extmod/extmod.mk
index 3b10fc857c80e..c087e13cbd3b3 100644
--- a/extmod/extmod.mk
+++ b/extmod/extmod.mk
@@ -10,6 +10,7 @@ SRC_EXTMOD_C += \
 	extmod/machine_pwm.c \
 	extmod/machine_signal.c \
 	extmod/machine_spi.c \
+	extmod/machine_timer.c \
 	extmod/modbluetooth.c \
 	extmod/modbtree.c \
 	extmod/modframebuf.c \
diff --git a/ports/stm32/machine_timer.c b/extmod/machine_timer.c
similarity index 98%
rename from ports/stm32/machine_timer.c
rename to extmod/machine_timer.c
index 640d1d200fa50..cdace4ee249be 100644
--- a/ports/stm32/machine_timer.c
+++ b/extmod/machine_timer.c
@@ -28,6 +28,8 @@
 #include "py/mphal.h"
 #include "shared/runtime/softtimer.h"
 
+#if MICROPY_PY_MACHINE_TIMER
+
 typedef soft_timer_entry_t machine_timer_obj_t;
 
 const mp_obj_type_t machine_timer_type;
@@ -144,3 +146,5 @@ MP_DEFINE_CONST_OBJ_TYPE(
     print, machine_timer_print,
     locals_dict, &machine_timer_locals_dict
     );
+
+#endif // MICROPY_PY_MACHINE_TIMER
diff --git a/ports/stm32/Makefile b/ports/stm32/Makefile
index 79bf8b54bf2c9..e99d386e492a9 100644
--- a/ports/stm32/Makefile
+++ b/ports/stm32/Makefile
@@ -329,7 +329,6 @@ SRC_C += \
 	machine_i2c.c \
 	machine_i2s.c \
 	machine_spi.c \
-	machine_timer.c \
 	machine_uart.c \
 	modmachine.c \
 	modpyb.c \
diff --git a/ports/stm32/mpconfigport.h b/ports/stm32/mpconfigport.h
index 34b3a6abad7b1..de12f03207157 100644
--- a/ports/stm32/mpconfigport.h
+++ b/ports/stm32/mpconfigport.h
@@ -126,6 +126,7 @@
 #define MICROPY_PY_MACHINE_SPI_MSB  (SPI_FIRSTBIT_MSB)
 #define MICROPY_PY_MACHINE_SPI_LSB  (SPI_FIRSTBIT_LSB)
 #define MICROPY_PY_MACHINE_SOFTSPI  (1)
+#define MICROPY_PY_MACHINE_TIMER    (1)
 #endif
 #define MICROPY_HW_SOFTSPI_MIN_DELAY (0)
 #define MICROPY_HW_SOFTSPI_MAX_BAUDRATE (HAL_RCC_GetSysClockFreq() / 48)
diff --git a/py/mpconfig.h b/py/mpconfig.h
index 99fa87e5c1536..0ae6fcdd1169f 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -1631,6 +1631,11 @@ typedef double mp_float_t;
 #define MICROPY_PY_MACHINE_SOFTSPI (0)
 #endif
 
+// Whether to provide the "machine.Timer" class
+#ifndef MICROPY_PY_MACHINE_TIMER
+#define MICROPY_PY_MACHINE_TIMER (0)
+#endif
+
 // The default backlog value for socket.listen(backlog)
 #ifndef MICROPY_PY_USOCKET_LISTEN_BACKLOG_DEFAULT
 #define MICROPY_PY_USOCKET_LISTEN_BACKLOG_DEFAULT (2)

From 98cbace299d5fdadcf88c0ffe3b1267991fe01ca Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 27 Oct 2022 14:43:03 +1100
Subject: [PATCH 2797/3533] mimxrt/machine_timer: Use extmod version of
 machine.Timer.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/mimxrt/Makefile        |   1 -
 ports/mimxrt/machine_timer.c | 147 -----------------------------------
 ports/mimxrt/mpconfigport.h  |   1 +
 3 files changed, 1 insertion(+), 148 deletions(-)
 delete mode 100644 ports/mimxrt/machine_timer.c

diff --git a/ports/mimxrt/Makefile b/ports/mimxrt/Makefile
index db03b7bef266d..ae8cf16f16eb6 100644
--- a/ports/mimxrt/Makefile
+++ b/ports/mimxrt/Makefile
@@ -162,7 +162,6 @@ SRC_C += \
 	machine_rtc.c \
 	machine_sdcard.c \
 	machine_spi.c \
-	machine_timer.c \
 	machine_uart.c \
 	machine_wdt.c \
 	main.c \
diff --git a/ports/mimxrt/machine_timer.c b/ports/mimxrt/machine_timer.c
deleted file mode 100644
index 54ae06b6b3462..0000000000000
--- a/ports/mimxrt/machine_timer.c
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2020-2021 Damien P. George
- * Copyright (c) 2021 Robert Hammelrath
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#include "py/runtime.h"
-#include "py/mphal.h"
-#include "shared/runtime/softtimer.h"
-
-typedef soft_timer_entry_t machine_timer_obj_t;
-
-const mp_obj_type_t machine_timer_type;
-
-STATIC void machine_timer_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
-    machine_timer_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    qstr mode = self->mode == SOFT_TIMER_MODE_ONE_SHOT ? MP_QSTR_ONE_SHOT : MP_QSTR_PERIODIC;
-    mp_printf(print, "Timer(mode=%q, period=%u)", mode, self->delta_ms);
-}
-
-STATIC mp_obj_t machine_timer_init_helper(machine_timer_obj_t *self, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
-    enum { ARG_mode, ARG_callback, ARG_period, ARG_tick_hz, ARG_freq, };
-    static const mp_arg_t allowed_args[] = {
-        { MP_QSTR_mode,         MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = SOFT_TIMER_MODE_PERIODIC} },
-        { MP_QSTR_callback,     MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
-        { MP_QSTR_period,       MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 0xffffffff} },
-        { MP_QSTR_tick_hz,      MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 1000} },
-        { MP_QSTR_freq,         MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
-    };
-
-    // Parse args
-    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
-    mp_arg_parse_all(n_args, pos_args, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
-
-    self->mode = args[ARG_mode].u_int;
-
-    uint64_t delta_ms = self->delta_ms;
-    if (args[ARG_freq].u_obj != mp_const_none) {
-        // Frequency specified in Hz
-        #if MICROPY_PY_BUILTINS_FLOAT
-        delta_ms = (uint32_t)(MICROPY_FLOAT_CONST(1000.0) / mp_obj_get_float(args[ARG_freq].u_obj));
-        #else
-        delta_ms = 1000 / mp_obj_get_int(args[ARG_freq].u_obj);
-        #endif
-    } else if (args[ARG_period].u_int != 0xffffffff) {
-        // Period specified
-        delta_ms = (uint64_t)args[ARG_period].u_int * 1000 / args[ARG_tick_hz].u_int;
-    }
-
-    if (delta_ms < 1) {
-        delta_ms = 1;
-    } else if (delta_ms >= 0x40000000) {
-        mp_raise_ValueError(MP_ERROR_TEXT("period too large"));
-    }
-    self->delta_ms = (uint32_t)delta_ms;
-
-    if (args[ARG_callback].u_obj != MP_OBJ_NULL) {
-        self->py_callback = args[ARG_callback].u_obj;
-    }
-
-    if (self->py_callback != mp_const_none) {
-        soft_timer_insert(self, self->delta_ms);
-    }
-
-    return mp_const_none;
-}
-
-STATIC mp_obj_t machine_timer_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
-    machine_timer_obj_t *self = m_new_obj(machine_timer_obj_t);
-    self->pairheap.base.type = &machine_timer_type;
-    self->flags = SOFT_TIMER_FLAG_PY_CALLBACK | SOFT_TIMER_FLAG_GC_ALLOCATED;
-    self->delta_ms = 1000;
-    self->py_callback = mp_const_none;
-
-    // Get timer id (only soft timer (-1) supported at the moment)
-    mp_int_t id = -1;
-    if (n_args > 0) {
-        id = mp_obj_get_int(args[0]);
-        --n_args;
-        ++args;
-    }
-    if (id != -1) {
-        mp_raise_ValueError(MP_ERROR_TEXT("Timer doesn't exist"));
-    }
-
-    if (n_args > 0 || n_kw > 0) {
-        // Start the timer
-        mp_map_t kw_args;
-        mp_map_init_fixed_table(&kw_args, n_kw, args + n_args);
-        machine_timer_init_helper(self, n_args, args, &kw_args);
-    }
-
-    return MP_OBJ_FROM_PTR(self);
-}
-
-STATIC mp_obj_t machine_timer_init(size_t n_args, const mp_obj_t *args, mp_map_t *kw_args) {
-    machine_timer_obj_t *self = MP_OBJ_TO_PTR(args[0]);
-    soft_timer_remove(self);
-    return machine_timer_init_helper(self, n_args - 1, args + 1, kw_args);
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(machine_timer_init_obj, 1, machine_timer_init);
-
-STATIC mp_obj_t machine_timer_deinit(mp_obj_t self_in) {
-    machine_timer_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    soft_timer_remove(self);
-    return mp_const_none;
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_timer_deinit_obj, machine_timer_deinit);
-
-STATIC const mp_rom_map_elem_t machine_timer_locals_dict_table[] = {
-    { MP_ROM_QSTR(MP_QSTR_init), MP_ROM_PTR(&machine_timer_init_obj) },
-    { MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&machine_timer_deinit_obj) },
-
-    { MP_ROM_QSTR(MP_QSTR_ONE_SHOT), MP_ROM_INT(SOFT_TIMER_MODE_ONE_SHOT) },
-    { MP_ROM_QSTR(MP_QSTR_PERIODIC), MP_ROM_INT(SOFT_TIMER_MODE_PERIODIC) },
-};
-STATIC MP_DEFINE_CONST_DICT(machine_timer_locals_dict, machine_timer_locals_dict_table);
-
-MP_DEFINE_CONST_OBJ_TYPE(
-    machine_timer_type,
-    MP_QSTR_Timer,
-    MP_TYPE_FLAG_NONE,
-    make_new, machine_timer_make_new,
-    print, machine_timer_print,
-    locals_dict, &machine_timer_locals_dict
-    );
diff --git a/ports/mimxrt/mpconfigport.h b/ports/mimxrt/mpconfigport.h
index 3f87800e3056d..d86885814c19e 100644
--- a/ports/mimxrt/mpconfigport.h
+++ b/ports/mimxrt/mpconfigport.h
@@ -147,6 +147,7 @@ uint32_t trng_random_u32(void);
 #define MICROPY_PY_MACHINE_SOFTI2C          (1)
 #define MICROPY_PY_MACHINE_SPI              (1)
 #define MICROPY_PY_MACHINE_SOFTSPI          (1)
+#define MICROPY_PY_MACHINE_TIMER            (1)
 #define MICROPY_PY_FRAMEBUF                 (1)
 #define MICROPY_PY_ONEWIRE                  (1)
 #define MICROPY_PY_UPLATFORM                (1)

From 01590856666762b1f37051a8c32f53f1ed52a5ad Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 27 Oct 2022 14:44:12 +1100
Subject: [PATCH 2798/3533] renesas-ra/machine_timer: Use extmod version of
 machine.Timer.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/renesas-ra/Makefile        |   1 -
 ports/renesas-ra/machine_timer.c | 146 -------------------------------
 ports/renesas-ra/mpconfigport.h  |   1 +
 3 files changed, 1 insertion(+), 147 deletions(-)
 delete mode 100644 ports/renesas-ra/machine_timer.c

diff --git a/ports/renesas-ra/Makefile b/ports/renesas-ra/Makefile
index 2b0358b27076a..b02379b47236b 100644
--- a/ports/renesas-ra/Makefile
+++ b/ports/renesas-ra/Makefile
@@ -308,7 +308,6 @@ SRC_C += \
 	machine_adc.c \
 	machine_i2c.c \
 	machine_spi.c \
-	machine_timer.c \
 	machine_uart.c \
 	machine_pin.c \
 	machine_rtc.c \
diff --git a/ports/renesas-ra/machine_timer.c b/ports/renesas-ra/machine_timer.c
deleted file mode 100644
index 0f6ff80d27f46..0000000000000
--- a/ports/renesas-ra/machine_timer.c
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2019 Damien P. George
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#include "py/runtime.h"
-#include "py/mphal.h"
-#include "shared/runtime/softtimer.h"
-
-typedef soft_timer_entry_t machine_timer_obj_t;
-
-const mp_obj_type_t machine_timer_type;
-
-STATIC void machine_timer_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
-    machine_timer_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    qstr mode = self->mode == SOFT_TIMER_MODE_ONE_SHOT ? MP_QSTR_ONE_SHOT : MP_QSTR_PERIODIC;
-    mp_printf(print, "Timer(mode=%q, period=%u)", mode, self->delta_ms);
-}
-
-STATIC mp_obj_t machine_timer_init_helper(machine_timer_obj_t *self, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
-    enum { ARG_mode, ARG_callback, ARG_period, ARG_tick_hz, ARG_freq, };
-    static const mp_arg_t allowed_args[] = {
-        { MP_QSTR_mode,         MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = SOFT_TIMER_MODE_PERIODIC} },
-        { MP_QSTR_callback,     MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
-        { MP_QSTR_period,       MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 0xffffffff} },
-        { MP_QSTR_tick_hz,      MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 1000} },
-        { MP_QSTR_freq,         MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
-    };
-
-    // Parse args
-    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
-    mp_arg_parse_all(n_args, pos_args, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
-
-    self->mode = args[ARG_mode].u_int;
-
-    uint64_t delta_ms = self->delta_ms;
-    if (args[ARG_freq].u_obj != mp_const_none) {
-        // Frequency specified in Hz
-        #if MICROPY_PY_BUILTINS_FLOAT
-        delta_ms = (uint32_t)(MICROPY_FLOAT_CONST(1000.0) / mp_obj_get_float(args[ARG_freq].u_obj));
-        #else
-        delta_ms = 1000 / mp_obj_get_int(args[ARG_freq].u_obj);
-        #endif
-    } else if (args[ARG_period].u_int != 0xffffffff) {
-        // Period specified
-        delta_ms = (uint64_t)args[ARG_period].u_int * 1000 / args[ARG_tick_hz].u_int;
-    }
-
-    if (delta_ms < 1) {
-        delta_ms = 1;
-    } else if (delta_ms >= 0x40000000) {
-        mp_raise_ValueError(MP_ERROR_TEXT("period too large"));
-    }
-    self->delta_ms = (uint32_t)delta_ms;
-
-    if (args[ARG_callback].u_obj != MP_OBJ_NULL) {
-        self->py_callback = args[ARG_callback].u_obj;
-    }
-
-    if (self->py_callback != mp_const_none) {
-        soft_timer_insert(self, self->delta_ms);
-    }
-
-    return mp_const_none;
-}
-
-STATIC mp_obj_t machine_timer_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
-    machine_timer_obj_t *self = m_new_obj(machine_timer_obj_t);
-    self->pairheap.base.type = &machine_timer_type;
-    self->flags = SOFT_TIMER_FLAG_PY_CALLBACK | SOFT_TIMER_FLAG_GC_ALLOCATED;
-    self->delta_ms = 1000;
-    self->py_callback = mp_const_none;
-
-    // Get timer id (only soft timer (-1) supported at the moment)
-    mp_int_t id = -1;
-    if (n_args > 0) {
-        id = mp_obj_get_int(args[0]);
-        --n_args;
-        ++args;
-    }
-    if (id != -1) {
-        mp_raise_ValueError(MP_ERROR_TEXT("Timer doesn't exist"));
-    }
-
-    if (n_args > 0 || n_kw > 0) {
-        // Start the timer
-        mp_map_t kw_args;
-        mp_map_init_fixed_table(&kw_args, n_kw, args + n_args);
-        machine_timer_init_helper(self, n_args, args, &kw_args);
-    }
-
-    return MP_OBJ_FROM_PTR(self);
-}
-
-STATIC mp_obj_t machine_timer_init(size_t n_args, const mp_obj_t *args, mp_map_t *kw_args) {
-    machine_timer_obj_t *self = MP_OBJ_TO_PTR(args[0]);
-    soft_timer_remove(self);
-    return machine_timer_init_helper(self, n_args - 1, args + 1, kw_args);
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(machine_timer_init_obj, 1, machine_timer_init);
-
-STATIC mp_obj_t machine_timer_deinit(mp_obj_t self_in) {
-    machine_timer_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    soft_timer_remove(self);
-    return mp_const_none;
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_timer_deinit_obj, machine_timer_deinit);
-
-STATIC const mp_rom_map_elem_t machine_timer_locals_dict_table[] = {
-    { MP_ROM_QSTR(MP_QSTR_init), MP_ROM_PTR(&machine_timer_init_obj) },
-    { MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&machine_timer_deinit_obj) },
-
-    { MP_ROM_QSTR(MP_QSTR_ONE_SHOT), MP_ROM_INT(SOFT_TIMER_MODE_ONE_SHOT) },
-    { MP_ROM_QSTR(MP_QSTR_PERIODIC), MP_ROM_INT(SOFT_TIMER_MODE_PERIODIC) },
-};
-STATIC MP_DEFINE_CONST_DICT(machine_timer_locals_dict, machine_timer_locals_dict_table);
-
-MP_DEFINE_CONST_OBJ_TYPE(
-    machine_timer_type,
-    MP_QSTR_Timer,
-    MP_TYPE_FLAG_NONE,
-    make_new, machine_timer_make_new,
-    locals_dict, &machine_timer_locals_dict,
-    print, machine_timer_print
-    );
diff --git a/ports/renesas-ra/mpconfigport.h b/ports/renesas-ra/mpconfigport.h
index b77a3c492323b..9336ec4add75e 100644
--- a/ports/renesas-ra/mpconfigport.h
+++ b/ports/renesas-ra/mpconfigport.h
@@ -119,6 +119,7 @@
 #define MICROPY_PY_MACHINE_SPI_MSB  (SPI_FIRSTBIT_MSB)
 #define MICROPY_PY_MACHINE_SPI_LSB  (SPI_FIRSTBIT_LSB)
 #define MICROPY_PY_MACHINE_SOFTSPI  (1)
+#define MICROPY_PY_MACHINE_TIMER    (1)
 #endif
 #define MICROPY_HW_SOFTSPI_MIN_DELAY (0)
 #define MICROPY_HW_SOFTSPI_MAX_BAUDRATE (48000000 / 48)

From 6643b4f0ccf1e7d3f56eb27d51ff985971a79356 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 27 Oct 2022 14:45:24 +1100
Subject: [PATCH 2799/3533] samd/machine_timer: Use extmod version of
 machine.Timer.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/samd/Makefile        |   1 -
 ports/samd/machine_timer.c | 146 -------------------------------------
 ports/samd/mpconfigport.h  |   1 +
 3 files changed, 1 insertion(+), 147 deletions(-)
 delete mode 100644 ports/samd/machine_timer.c

diff --git a/ports/samd/Makefile b/ports/samd/Makefile
index b2e84460ea266..ff1701374a9c6 100644
--- a/ports/samd/Makefile
+++ b/ports/samd/Makefile
@@ -91,7 +91,6 @@ SRC_C += \
 	machine_pin.c \
 	machine_rtc.c \
 	machine_spi.c \
-	machine_timer.c \
 	machine_uart.c \
 	machine_wdt.c \
 	main.c \
diff --git a/ports/samd/machine_timer.c b/ports/samd/machine_timer.c
deleted file mode 100644
index 640d1d200fa50..0000000000000
--- a/ports/samd/machine_timer.c
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2019 Damien P. George
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#include "py/runtime.h"
-#include "py/mphal.h"
-#include "shared/runtime/softtimer.h"
-
-typedef soft_timer_entry_t machine_timer_obj_t;
-
-const mp_obj_type_t machine_timer_type;
-
-STATIC void machine_timer_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
-    machine_timer_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    qstr mode = self->mode == SOFT_TIMER_MODE_ONE_SHOT ? MP_QSTR_ONE_SHOT : MP_QSTR_PERIODIC;
-    mp_printf(print, "Timer(mode=%q, period=%u)", mode, self->delta_ms);
-}
-
-STATIC mp_obj_t machine_timer_init_helper(machine_timer_obj_t *self, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
-    enum { ARG_mode, ARG_callback, ARG_period, ARG_tick_hz, ARG_freq, };
-    static const mp_arg_t allowed_args[] = {
-        { MP_QSTR_mode,         MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = SOFT_TIMER_MODE_PERIODIC} },
-        { MP_QSTR_callback,     MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
-        { MP_QSTR_period,       MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 0xffffffff} },
-        { MP_QSTR_tick_hz,      MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 1000} },
-        { MP_QSTR_freq,         MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_rom_obj = MP_ROM_NONE} },
-    };
-
-    // Parse args
-    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
-    mp_arg_parse_all(n_args, pos_args, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
-
-    self->mode = args[ARG_mode].u_int;
-
-    uint64_t delta_ms = self->delta_ms;
-    if (args[ARG_freq].u_obj != mp_const_none) {
-        // Frequency specified in Hz
-        #if MICROPY_PY_BUILTINS_FLOAT
-        delta_ms = (uint32_t)(MICROPY_FLOAT_CONST(1000.0) / mp_obj_get_float(args[ARG_freq].u_obj));
-        #else
-        delta_ms = 1000 / mp_obj_get_int(args[ARG_freq].u_obj);
-        #endif
-    } else if (args[ARG_period].u_int != 0xffffffff) {
-        // Period specified
-        delta_ms = (uint64_t)args[ARG_period].u_int * 1000 / args[ARG_tick_hz].u_int;
-    }
-
-    if (delta_ms < 1) {
-        delta_ms = 1;
-    } else if (delta_ms >= 0x40000000) {
-        mp_raise_ValueError(MP_ERROR_TEXT("period too large"));
-    }
-    self->delta_ms = (uint32_t)delta_ms;
-
-    if (args[ARG_callback].u_obj != MP_OBJ_NULL) {
-        self->py_callback = args[ARG_callback].u_obj;
-    }
-
-    if (self->py_callback != mp_const_none) {
-        soft_timer_insert(self, self->delta_ms);
-    }
-
-    return mp_const_none;
-}
-
-STATIC mp_obj_t machine_timer_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
-    machine_timer_obj_t *self = m_new_obj(machine_timer_obj_t);
-    self->pairheap.base.type = &machine_timer_type;
-    self->flags = SOFT_TIMER_FLAG_PY_CALLBACK | SOFT_TIMER_FLAG_GC_ALLOCATED;
-    self->delta_ms = 1000;
-    self->py_callback = mp_const_none;
-
-    // Get timer id (only soft timer (-1) supported at the moment)
-    mp_int_t id = -1;
-    if (n_args > 0) {
-        id = mp_obj_get_int(args[0]);
-        --n_args;
-        ++args;
-    }
-    if (id != -1) {
-        mp_raise_ValueError(MP_ERROR_TEXT("Timer doesn't exist"));
-    }
-
-    if (n_args > 0 || n_kw > 0) {
-        // Start the timer
-        mp_map_t kw_args;
-        mp_map_init_fixed_table(&kw_args, n_kw, args + n_args);
-        machine_timer_init_helper(self, n_args, args, &kw_args);
-    }
-
-    return MP_OBJ_FROM_PTR(self);
-}
-
-STATIC mp_obj_t machine_timer_init(size_t n_args, const mp_obj_t *args, mp_map_t *kw_args) {
-    machine_timer_obj_t *self = MP_OBJ_TO_PTR(args[0]);
-    soft_timer_remove(self);
-    return machine_timer_init_helper(self, n_args - 1, args + 1, kw_args);
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_KW(machine_timer_init_obj, 1, machine_timer_init);
-
-STATIC mp_obj_t machine_timer_deinit(mp_obj_t self_in) {
-    machine_timer_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    soft_timer_remove(self);
-    return mp_const_none;
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_timer_deinit_obj, machine_timer_deinit);
-
-STATIC const mp_rom_map_elem_t machine_timer_locals_dict_table[] = {
-    { MP_ROM_QSTR(MP_QSTR_init), MP_ROM_PTR(&machine_timer_init_obj) },
-    { MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&machine_timer_deinit_obj) },
-
-    { MP_ROM_QSTR(MP_QSTR_ONE_SHOT), MP_ROM_INT(SOFT_TIMER_MODE_ONE_SHOT) },
-    { MP_ROM_QSTR(MP_QSTR_PERIODIC), MP_ROM_INT(SOFT_TIMER_MODE_PERIODIC) },
-};
-STATIC MP_DEFINE_CONST_DICT(machine_timer_locals_dict, machine_timer_locals_dict_table);
-
-MP_DEFINE_CONST_OBJ_TYPE(
-    machine_timer_type,
-    MP_QSTR_Timer,
-    MP_TYPE_FLAG_NONE,
-    make_new, machine_timer_make_new,
-    print, machine_timer_print,
-    locals_dict, &machine_timer_locals_dict
-    );
diff --git a/ports/samd/mpconfigport.h b/ports/samd/mpconfigport.h
index f03f8a11d7649..c3a0d237006c6 100644
--- a/ports/samd/mpconfigport.h
+++ b/ports/samd/mpconfigport.h
@@ -93,6 +93,7 @@
 #define MICROPY_PY_MACHINE_SOFTI2C          (1)
 #define MICROPY_PY_MACHINE_SPI              (1)
 #define MICROPY_PY_MACHINE_SOFTSPI          (1)
+#define MICROPY_PY_MACHINE_TIMER            (1)
 #define MICROPY_PY_OS_DUPTERM               (3)
 #define MICROPY_PY_MACHINE_BITSTREAM        (1)
 #define MICROPY_PY_MACHINE_PULSE            (1)

From 12f99481518b0ebcb14f00b2323865a845c2a4f1 Mon Sep 17 00:00:00 2001
From: Mark Grosen <mark@grosen.org>
Date: Mon, 26 Sep 2022 11:28:39 -0700
Subject: [PATCH 2800/3533] esp32/machine_i2c: Fix clocks and timeouts for
 ESP32-C3, ESP32-S3.

Each SoC family has its own clocks and timings/timeouts. For I2C, the
default source clock is either APB (ESP32, ESP32-S2) or XTAL (ESP32-S3,
ESP32-C3) as shown in the datasheets.  Since
machine_i2c.c/machine_hw_i2c_init() uses the default clk_flags (0), the
alternate low-power clock source is never selected in ESP-IDF
i2c.c/i2c_param_config().  There is not an API in i2c.c to get the source
clock frequency, so a compile-time value is used based on SoC family.

Also, the maximum timeout is different across the SoC families, so use the
I2C_LL_MAX_TIMEOUT constant to eliminate the warning from
i2c_set_timeout().

With these changes, the following results were obtained.  The I2C SCL
frequencies were measured with a Saleae logic analyzer.

ESP32 (TTGO T Dislay)
    I2C(0, scl=22, sda=21, freq=101781)  Measured: 100KHz
    I2C(0, scl=22, sda=21, freq=430107)  Measured: 400KHz
    I2C(0, scl=22, sda=21, freq=1212121) Measured: 941KHz

ESP32-S3 (TTGO T-QT)
    I2C(0, scl=34, sda=33, freq=111111)  Measured: 107KHz
    I2C(0, scl=34, sda=33, freq=444444)  Measured: 400KHz
    I2C(0, scl=34, sda=33, freq=1111111) Measured: 842KHz

ESP32-C3 (XIAO ESP32C3)
    I2C(0, scl=7, sda=6, freq=107816)  Measured: 103KHz
    I2C(0, scl=7, sda=6, freq=444444)  Measured: 380KHz
    I2C(0, scl=7, sda=6, freq=1176470) Measured: 800KHz

(ESP32-S2 board was not available for testing.)
---
 ports/esp32/machine_i2c.c | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/ports/esp32/machine_i2c.c b/ports/esp32/machine_i2c.c
index 17e98ffc5bb4b..c805dab87ee24 100644
--- a/ports/esp32/machine_i2c.c
+++ b/ports/esp32/machine_i2c.c
@@ -32,6 +32,13 @@
 
 #include "driver/i2c.h"
 
+#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(4, 4, 0)
+#include "hal/i2c_ll.h"
+#else
+#include "soc/i2c_reg.h"
+#define I2C_LL_MAX_TIMEOUT I2C_TIME_OUT_REG_V
+#endif
+
 #ifndef MICROPY_HW_I2C0_SCL
 #define MICROPY_HW_I2C0_SCL (GPIO_NUM_18)
 #define MICROPY_HW_I2C0_SDA (GPIO_NUM_19)
@@ -47,6 +54,14 @@
 #endif
 #endif
 
+#if CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32S3
+#define I2C_SCLK_FREQ XTAL_CLK_FREQ
+#elif CONFIG_IDF_TARGET_ESP32 || CONFIG_IDF_TARGET_ESP32S2
+#define I2C_SCLK_FREQ I2C_APB_CLK_FREQ
+#else
+#error "unsupported I2C for ESP32 SoC variant"
+#endif
+
 #define I2C_DEFAULT_TIMEOUT_US (10000) // 10ms
 
 typedef struct _machine_hw_i2c_obj_t {
@@ -71,7 +86,8 @@ STATIC void machine_hw_i2c_init(machine_hw_i2c_obj_t *self, uint32_t freq, uint3
         .master.clk_speed = freq,
     };
     i2c_param_config(self->port, &conf);
-    i2c_set_timeout(self->port, I2C_APB_CLK_FREQ / 1000000 * timeout_us);
+    int timeout = I2C_SCLK_FREQ / 1000000 * timeout_us;
+    i2c_set_timeout(self->port, (timeout > I2C_LL_MAX_TIMEOUT) ? I2C_LL_MAX_TIMEOUT : timeout);
     i2c_driver_install(self->port, I2C_MODE_MASTER, 0, 0, 0);
 }
 
@@ -131,7 +147,7 @@ STATIC void machine_hw_i2c_print(const mp_print_t *print, mp_obj_t self_in, mp_p
     int h, l;
     i2c_get_period(self->port, &h, &l);
     mp_printf(print, "I2C(%u, scl=%u, sda=%u, freq=%u)",
-        self->port, self->scl, self->sda, I2C_APB_CLK_FREQ / (h + l));
+        self->port, self->scl, self->sda, I2C_SCLK_FREQ / (h + l));
 }
 
 mp_obj_t machine_hw_i2c_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {

From 5b2929a0e69a4f3667ae9f0dbbfe3677ebc840ad Mon Sep 17 00:00:00 2001
From: Ihor Nehrutsa <Ihor.Nehrutsa@gmail.com>
Date: Fri, 28 Oct 2022 19:02:28 +0300
Subject: [PATCH 2801/3533] esp32/machine_pin: Fix size of
 machine_pin_irq_handler array.

Set the size of machine_pin_irq_handler array to GPIO_NUM_MAX:
- Min GPIO_NUM_MAX is 22 for IDF_TARGET_ESP32C3.
- Max GPIO_NUM_MAX is 49 for IDF_TARGET_ESP32S3.

The MP_REGISTER_ROOT_POINTER entry must be hard-coded, because the location
that it's evaluated by the compiler does not include the relevant IDF
header to get a definition of GPIO_NUM_MAX.
---
 ports/esp32/machine_pin.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ports/esp32/machine_pin.c b/ports/esp32/machine_pin.c
index 4f6f948d52af5..8a892d2316303 100644
--- a/ports/esp32/machine_pin.c
+++ b/ports/esp32/machine_pin.c
@@ -64,7 +64,7 @@ typedef struct _machine_pin_irq_obj_t {
     gpio_num_t id;
 } machine_pin_irq_obj_t;
 
-STATIC const machine_pin_obj_t machine_pin_obj[] = {
+STATIC const machine_pin_obj_t machine_pin_obj[GPIO_NUM_MAX] = {
     #if CONFIG_IDF_TARGET_ESP32
 
     {{&machine_pin_type}, GPIO_NUM_0},
@@ -225,7 +225,7 @@ STATIC const machine_pin_obj_t machine_pin_obj[] = {
 };
 
 // forward declaration
-STATIC const machine_pin_irq_obj_t machine_pin_irq_object[];
+STATIC const machine_pin_irq_obj_t machine_pin_irq_object[GPIO_NUM_MAX];
 
 void machine_pins_init(void) {
     static bool did_install = false;
@@ -545,7 +545,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
 
 STATIC const mp_obj_type_t machine_pin_irq_type;
 
-STATIC const machine_pin_irq_obj_t machine_pin_irq_object[] = {
+STATIC const machine_pin_irq_obj_t machine_pin_irq_object[GPIO_NUM_MAX] = {
     #if CONFIG_IDF_TARGET_ESP32
 
     {{&machine_pin_irq_type}, GPIO_NUM_0},
@@ -732,4 +732,4 @@ STATIC MP_DEFINE_CONST_OBJ_TYPE(
     locals_dict, &machine_pin_irq_locals_dict
     );
 
-MP_REGISTER_ROOT_POINTER(mp_obj_t machine_pin_irq_handler[40]);
+MP_REGISTER_ROOT_POINTER(mp_obj_t machine_pin_irq_handler[49]); // 49 is the biggest of GPIO_NUM_MAX's

From 7775523b2ded41ee8929522341c242eee43e9a48 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sun, 25 Sep 2022 15:50:37 +0200
Subject: [PATCH 2802/3533] esp32/machine_pwm: Verify PWM is active when config
 methods are called.

Checks are added for pwm.freq(), pwm_duty(), pwm_duty_u10() and
pwm.duty_u16().  This avoids a core dump on ESP32C3, and misleading error
messages on Xtensa ESP32 devices.
---
 ports/esp32/machine_pwm.c | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/ports/esp32/machine_pwm.c b/ports/esp32/machine_pwm.c
index 2a456c71c7834..99bef88e9a082 100644
--- a/ports/esp32/machine_pwm.c
+++ b/ports/esp32/machine_pwm.c
@@ -298,7 +298,14 @@ STATIC int duty_to_ns(machine_pwm_obj_t *self, int duty) {
 
 #define get_duty_raw(self) ledc_get_duty(self->mode, self->channel)
 
+STATIC void pwm_is_active(machine_pwm_obj_t *self) {
+    if (self->active == false) {
+        mp_raise_msg(&mp_type_RuntimeError, MP_ERROR_TEXT("PWM inactive"));
+    }
+}
+
 STATIC uint32_t get_duty_u16(machine_pwm_obj_t *self) {
+    pwm_is_active(self);
     int resolution = timers[TIMER_IDX(self->mode, self->timer)].duty_resolution;
     int duty = ledc_get_duty(self->mode, self->channel);
     if (resolution <= UI_RES_16_BIT) {
@@ -310,14 +317,17 @@ STATIC uint32_t get_duty_u16(machine_pwm_obj_t *self) {
 }
 
 STATIC uint32_t get_duty_u10(machine_pwm_obj_t *self) {
+    pwm_is_active(self);
     return get_duty_u16(self) >> 6; // Scale down from 16 bit to 10 bit resolution
 }
 
 STATIC uint32_t get_duty_ns(machine_pwm_obj_t *self) {
+    pwm_is_active(self);
     return duty_to_ns(self, get_duty_u16(self));
 }
 
 STATIC void set_duty_u16(machine_pwm_obj_t *self, int duty) {
+    pwm_is_active(self);
     if ((duty < 0) || (duty > UI_MAX_DUTY)) {
         mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("duty_u16 must be from 0 to %d"), UI_MAX_DUTY);
     }
@@ -356,6 +366,7 @@ STATIC void set_duty_u16(machine_pwm_obj_t *self, int duty) {
 }
 
 STATIC void set_duty_u10(machine_pwm_obj_t *self, int duty) {
+    pwm_is_active(self);
     if ((duty < 0) || (duty > MAX_DUTY_U10)) {
         mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("duty must be from 0 to %u"), MAX_DUTY_U10);
     }
@@ -365,6 +376,7 @@ STATIC void set_duty_u10(machine_pwm_obj_t *self, int duty) {
 }
 
 STATIC void set_duty_ns(machine_pwm_obj_t *self, int ns) {
+    pwm_is_active(self);
     if ((ns < 0) || (ns > duty_to_ns(self, UI_MAX_DUTY))) {
         mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("duty_ns must be from 0 to %d ns"), duty_to_ns(self, UI_MAX_DUTY));
     }
@@ -598,10 +610,12 @@ STATIC void mp_machine_pwm_deinit(machine_pwm_obj_t *self) {
 // Set's and get's methods of PWM class
 
 STATIC mp_obj_t mp_machine_pwm_freq_get(machine_pwm_obj_t *self) {
+    pwm_is_active(self);
     return MP_OBJ_NEW_SMALL_INT(ledc_get_freq(self->mode, self->timer));
 }
 
 STATIC void mp_machine_pwm_freq_set(machine_pwm_obj_t *self, mp_int_t freq) {
+    pwm_is_active(self);
     if ((freq <= 0) || (freq > 40000000)) {
         mp_raise_ValueError(MP_ERROR_TEXT("freqency must be from 1Hz to 40MHz"));
     }

From 3427e12e8f3879bb5d285a6d379744ffadd8e986 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Wed, 26 Oct 2022 22:03:46 +1100
Subject: [PATCH 2803/3533] tools/mpremote: Handle FileNotFound exceptions in
 listdir.

The except handler for OSError didn't include the line that actually calls
os.listdir, so an invalid path wasn't handled correctly.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 tools/mpremote/mpremote/pyboardextended.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/tools/mpremote/mpremote/pyboardextended.py b/tools/mpremote/mpremote/pyboardextended.py
index d3b4cb6d8c72a..075b95ae558e4 100644
--- a/tools/mpremote/mpremote/pyboardextended.py
+++ b/tools/mpremote/mpremote/pyboardextended.py
@@ -428,12 +428,11 @@ def do_ilistdir_start(self):
         path = self.root + self.rd_str()
         try:
             self.path_check(path)
+            self.data_ilistdir[0] = path
+            self.data_ilistdir[1] = os.listdir(path)
             self.wr_s8(0)
         except OSError as er:
             self.wr_s8(-abs(er.errno))
-        else:
-            self.data_ilistdir[0] = path
-            self.data_ilistdir[1] = os.listdir(path)
 
     def do_ilistdir_next(self):
         if self.data_ilistdir[1]:

From 3ed017677b7a955098b51ebbabaa445ebc0a5bbd Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 27 Oct 2022 13:36:20 +1100
Subject: [PATCH 2804/3533] tools/mpremote: Make RemoteFile objects iterable.

So that filesystems mounted with "mpremote mount" can have their files
iterated over, making them consistent with other files.

Signed-off-by: Damien George <damien@micropython.org>
---
 tools/mpremote/mpremote/pyboardextended.py | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/tools/mpremote/mpremote/pyboardextended.py b/tools/mpremote/mpremote/pyboardextended.py
index 075b95ae558e4..dba8172b848a4 100644
--- a/tools/mpremote/mpremote/pyboardextended.py
+++ b/tools/mpremote/mpremote/pyboardextended.py
@@ -143,6 +143,15 @@ def __enter__(self):
     def __exit__(self, a, b, c):
         self.close()
 
+    def __iter__(self):
+        return self
+
+    def __next__(self):
+        l = self.readline()
+        if not l:
+            raise StopIteration
+        return l
+
     def ioctl(self, request, arg):
         if request == 1:  # FLUSH
             self.flush()

From da36b84d453eae0468cc77c0904b3b22c9e30387 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 28 Oct 2022 12:56:56 +1100
Subject: [PATCH 2805/3533] extmod/vfs_posix: Include errno.h and unistd.h
 headers.

errno.h is needed for the errno variable, and unistd.h is needed for chdir.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/vfs_posix.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/extmod/vfs_posix.c b/extmod/vfs_posix.c
index 3694ebaf99743..0a8274373419d 100644
--- a/extmod/vfs_posix.c
+++ b/extmod/vfs_posix.c
@@ -37,9 +37,11 @@
 #error "MICROPY_VFS_POSIX requires MICROPY_ENABLE_FINALISER"
 #endif
 
+#include <errno.h>
 #include <stdio.h>
 #include <string.h>
 #include <sys/stat.h>
+#include <unistd.h>
 #include <dirent.h>
 #ifdef _MSC_VER
 #include <direct.h> // For mkdir etc.

From 54478eb9e7fc26c3b7bf3079efe6b55d7875b83a Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 28 Oct 2022 12:47:58 +1100
Subject: [PATCH 2806/3533] webassembly/mpconfigport: Use
 MICROPY_CONFIG_ROM_LEVEL_EXTRA_FEATURES.

This simplifies the config file.  This is not a no-op, it does enable a few
new features to bring the port in line with this config level.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/webassembly/mpconfigport.h | 119 +++----------------------------
 1 file changed, 11 insertions(+), 108 deletions(-)

diff --git a/ports/webassembly/mpconfigport.h b/ports/webassembly/mpconfigport.h
index 4fbd922e15642..34e231a1ff8ea 100644
--- a/ports/webassembly/mpconfigport.h
+++ b/ports/webassembly/mpconfigport.h
@@ -3,7 +3,8 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2013, 2014 Damien P. George and 2017, 2018 Rami Ali
+ * Copyright (c) 2013-2022 Damien P. George
+ * Copyright (c) 2017, 2018 Rami Ali
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -28,130 +29,35 @@
 
 // options to control how MicroPython is built
 
+#define MICROPY_CONFIG_ROM_LEVEL (MICROPY_CONFIG_ROM_LEVEL_EXTRA_FEATURES)
+
 // You can disable the built-in MicroPython compiler by setting the following
 // config option to 0.  If you do this then you won't get a REPL prompt, but you
 // will still be able to execute pre-compiled scripts, compiled with mpy-cross.
 #define MICROPY_ENABLE_COMPILER     (1)
 
-#define MICROPY_QSTR_BYTES_IN_HASH  (2)
 #define MICROPY_ALLOC_PATH_MAX      (256)
-#define MICROPY_ALLOC_PARSE_CHUNK_INIT (16)
-#define MICROPY_EMIT_X64            (0) // BROKEN
-#define MICROPY_EMIT_THUMB          (0) // BROKEN
-#define MICROPY_EMIT_INLINE_THUMB   (0)
-#define MICROPY_COMP_MODULE_CONST   (0)
-#define MICROPY_COMP_CONST          (1)
-#define MICROPY_COMP_DOUBLE_TUPLE_ASSIGN (1)
-#define MICROPY_COMP_TRIPLE_TUPLE_ASSIGN (0)
-#define MICROPY_MEM_STATS           (0) // BROKEN
-#define MICROPY_DEBUG_PRINTERS      (0)
 #define MICROPY_ENABLE_GC           (1)
-#define MICROPY_GC_ALLOC_THRESHOLD  (1)
-#define MICROPY_GC_USES_ALLOCATED_SIZE (1)
+#define MICROPY_ENABLE_PYSTACK      (1)
+#define MICROPY_STACK_CHECK         (0)
+#define MICROPY_KBD_EXCEPTION       (1)
 #define MICROPY_REPL_EVENT_DRIVEN   (1)
-#define MICROPY_HELPER_REPL         (1)
-#define MICROPY_HELPER_LEXER_UNIX   (0)
-#define MICROPY_ENABLE_SOURCE_LINE  (1)
+#define MICROPY_LONGINT_IMPL        (MICROPY_LONGINT_IMPL_MPZ)
 #define MICROPY_ENABLE_DOC_STRING   (1)
 #define MICROPY_WARNINGS            (1)
-#define MICROPY_BUILTIN_METHOD_CHECK_SELF_ARG (1)
-#define MICROPY_PY_ASYNC_AWAIT      (1)
-#define MICROPY_PY_BUILTINS_BYTEARRAY (1)
-#define MICROPY_PY_BUILTINS_MEMORYVIEW (1)
-#define MICROPY_PY_BUILTINS_ENUMERATE (1)
-#define MICROPY_PY_BUILTINS_FILTER  (1)
-#define MICROPY_PY_BUILTINS_FROZENSET (1)
-#define MICROPY_PY_BUILTINS_REVERSED (1)
-#define MICROPY_PY_BUILTINS_SET     (1)
-#define MICROPY_PY_BUILTINS_SLICE   (1)
-#define MICROPY_PY_BUILTINS_PROPERTY (1)
-#define MICROPY_PY_BUILTINS_MIN_MAX (1)
-#define MICROPY_PY___FILE__         (1)
-#define MICROPY_PY_GC               (1)
-#define MICROPY_PY_ARRAY            (1)
-#define MICROPY_PY_ATTRTUPLE        (1)
-#define MICROPY_PY_COLLECTIONS      (1)
-#define MICROPY_PY_MATH             (1)
-#define MICROPY_PY_MATH_SPECIAL_FUNCTIONS (1)
-#define MICROPY_PY_MATH_ISCLOSE     (1)
-#define MICROPY_PY_CMATH            (1)
-#define MICROPY_PY_IO               (1)
-#define MICROPY_PY_STRUCT           (1)
-#define MICROPY_PY_SYS              (1)
-#define MICROPY_PY_SYS_MAXSIZE      (1)
-#define MICROPY_CPYTHON_COMPAT      (1)
-#define MICROPY_LONGINT_IMPL        (MICROPY_LONGINT_IMPL_MPZ)
 #define MICROPY_FLOAT_IMPL          (MICROPY_FLOAT_IMPL_DOUBLE)
-
+#define MICROPY_USE_INTERNAL_ERRNO  (1)
 #define MICROPY_USE_INTERNAL_PRINTF (0)
-#define MICROPY_ENABLE_PYSTACK      (1)
-#define MICROPY_KBD_EXCEPTION       (1)
 #define MICROPY_PY_UTIME_MP_HAL     (1)
-#define MICROPY_REPL_AUTO_INDENT    (1)
-#define MICROPY_PY_FUNCTION_ATTRS   (1)
-#define MICROPY_PY_BUILTINS_BYTES_HEX (1)
-#define MICROPY_PY_BUILTINS_STR_UNICODE (1)
-#define MICROPY_PY_BUILTINS_STR_CENTER (1)
-#define MICROPY_PY_BUILTINS_STR_PARTITION (1)
-#define MICROPY_PY_BUILTINS_STR_SPLITLINES (1)
-#define MICROPY_PY_BUILTINS_SLICE_ATTRS (1)
-#define MICROPY_PY_ALL_SPECIAL_METHODS (1)
-#define MICROPY_PY_BUILTINS_COMPILE (1)
-#define MICROPY_PY_BUILTINS_EXECFILE (1)
-#define MICROPY_PY_BUILTINS_INPUT (1)
-#define MICROPY_PY_BUILTINS_POW3 (1)
-#define MICROPY_PY_BUILTINS_HELP (1)
-#define MICROPY_PY_BUILTINS_HELP_MODULES (1)
-#define MICROPY_PY_MICROPYTHON_MEM_INFO (1)
-#define MICROPY_PY_ARRAY_SLICE_ASSIGN (1)
-#define MICROPY_PY_COLLECTIONS_ORDEREDDICT (1)
 #define MICROPY_PY_SYS_PLATFORM     "webassembly"
-#define MICROPY_PY_UERRNO           (1)
-#define MICROPY_PY_UCTYPES          (1)
-#define MICROPY_PY_UZLIB            (1)
-#define MICROPY_PY_UJSON            (1)
-#define MICROPY_PY_URE              (1)
-#define MICROPY_PY_UHEAPQ           (1)
-#define MICROPY_PY_UHASHLIB         (1)
-#define MICROPY_PY_UBINASCII        (1)
-#define MICROPY_PY_URANDOM          (1)
-#define MICROPY_PY_URANDOM_EXTRA_FUNCS (1)
-#define MICROPY_PY_USELECT          (1)
-#define MICROPY_PY_FRAMEBUF         (1)
-#define MICROPY_STREAMS_NON_BLOCK   (1)
-#define MICROPY_MODULE_WEAK_LINKS   (1)
-#define MICROPY_CAN_OVERRIDE_BUILTINS (1)
-#define MICROPY_USE_INTERNAL_ERRNO  (1)
-#define MICROPY_ENABLE_SCHEDULER    (1)
-#define MICROPY_SCHEDULER_DEPTH     (1)
+#define MICROPY_PY_SYS_STDFILES     (0)
 
-#define MP_SSIZE_MAX (0x7fffffff)
-
-// #define MICROPY_EVENT_POLL_HOOK {ets_event_poll();}
-#if MICROPY_PY_THREAD
-#define MICROPY_EVENT_POLL_HOOK \
-    do { \
-        extern void mp_handle_pending(bool); \
-        mp_handle_pending(true); \
-        if (pyb_thread_enabled) { \
-            MP_THREAD_GIL_EXIT(); \
-            pyb_thread_yield(); \
-            MP_THREAD_GIL_ENTER(); \
-        } else { \
-        } \
-    } while (0);
-
-#define MICROPY_THREAD_YIELD() pyb_thread_yield()
-#else
 #define MICROPY_EVENT_POLL_HOOK \
     do { \
         extern void mp_handle_pending(bool); \
         mp_handle_pending(true); \
     } while (0);
 
-#define MICROPY_THREAD_YIELD()
-#endif
-
 #define MICROPY_VM_HOOK_COUNT (10)
 #define MICROPY_VM_HOOK_INIT static uint vm_hook_divisor = MICROPY_VM_HOOK_COUNT;
 #define MICROPY_VM_HOOK_POLL if (--vm_hook_divisor == 0) { \
@@ -164,7 +70,7 @@
 
 // type definitions for the specific machine
 
-// #define MICROPY_MAKE_POINTER_CALLABLE(p) ((void*)((mp_uint_t)(p) | 1))
+#define MP_SSIZE_MAX (0x7fffffff)
 
 // This port is intended to be 32-bit, but unfortunately, int32_t for
 // different targets may be defined in different ways - either as int
@@ -176,9 +82,6 @@ typedef int mp_int_t; // must be pointer size
 typedef unsigned mp_uint_t; // must be pointer size
 typedef long mp_off_t;
 
-// We need to provide a declaration/definition of alloca()
-#include <alloca.h>
-
 #define MICROPY_HW_BOARD_NAME "JS"
 #define MICROPY_HW_MCU_NAME "Emscripten"
 

From 46bb52adf6822684942d760dc09fdc893a411cdc Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 28 Oct 2022 12:58:05 +1100
Subject: [PATCH 2807/3533] webassembly: Add support for VFS and enable
 VFS_POSIX.

This gets filesystem support working.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/webassembly/Makefile       |  5 ++++-
 ports/webassembly/main.c         | 16 ++++++++++++++++
 ports/webassembly/mpconfigport.h | 10 ++++++++++
 ports/webassembly/mphalport.h    | 23 +++++++++++++++++++++++
 4 files changed, 53 insertions(+), 1 deletion(-)

diff --git a/ports/webassembly/Makefile b/ports/webassembly/Makefile
index db3f36ad8eb13..09660cd396295 100644
--- a/ports/webassembly/Makefile
+++ b/ports/webassembly/Makefile
@@ -37,7 +37,10 @@ OBJ += $(addprefix $(BUILD)/, $(SRC_SHARED:.c=.o))
 OBJ += $(addprefix $(BUILD)/, $(SRC_C:.c=.o))
 
 JSFLAGS += -s ASYNCIFY
-JSFLAGS += -s EXPORTED_FUNCTIONS="['_mp_js_init', '_mp_js_init_repl', '_mp_js_do_str', '_mp_js_process_char', '_mp_hal_get_interrupt_char', '_mp_sched_keyboard_interrupt']" -s EXPORTED_RUNTIME_METHODS="['ccall', 'cwrap']" -s --memory-init-file 0 --js-library library.js
+JSFLAGS += -s EXPORTED_FUNCTIONS="['_mp_js_init', '_mp_js_init_repl', '_mp_js_do_str', '_mp_js_process_char', '_mp_hal_get_interrupt_char', '_mp_sched_keyboard_interrupt']"
+JSFLAGS += -s EXPORTED_RUNTIME_METHODS="['ccall', 'cwrap', 'FS']"
+JSFLAGS += -s --memory-init-file 0
+JSFLAGS += --js-library library.js
 
 all: $(BUILD)/micropython.js
 
diff --git a/ports/webassembly/main.c b/ports/webassembly/main.c
index 36ea9e98bead5..e6273282608a6 100644
--- a/ports/webassembly/main.c
+++ b/ports/webassembly/main.c
@@ -35,6 +35,8 @@
 #include "py/repl.h"
 #include "py/gc.h"
 #include "py/mperrno.h"
+#include "extmod/vfs.h"
+#include "extmod/vfs_posix.h"
 #include "shared/runtime/pyexec.h"
 
 #include "emscripten.h"
@@ -92,6 +94,18 @@ void mp_js_init(int heap_size) {
     #endif
 
     mp_init();
+
+    #if MICROPY_VFS_POSIX
+    {
+        // Mount the host FS at the root of our internal VFS
+        mp_obj_t args[2] = {
+            MP_OBJ_TYPE_GET_SLOT(&mp_type_vfs_posix, make_new)(&mp_type_vfs_posix, 0, 0, NULL),
+            MP_OBJ_NEW_QSTR(qstr_from_str("/")),
+        };
+        mp_vfs_mount(2, args, (mp_map_t *)&mp_const_empty_map);
+        MP_STATE_VM(vfs_cur) = MP_STATE_VM(vfs_mount_table);
+    }
+    #endif
 }
 
 void mp_js_init_repl() {
@@ -109,6 +123,7 @@ void gc_collect(void) {
     gc_collect_end();
 }
 
+#if !MICROPY_VFS
 mp_lexer_t *mp_lexer_new_from_file(const char *filename) {
     mp_raise_OSError(MP_ENOENT);
 }
@@ -121,6 +136,7 @@ mp_obj_t mp_builtin_open(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs)
     return mp_const_none;
 }
 MP_DEFINE_CONST_FUN_OBJ_KW(mp_builtin_open_obj, 1, mp_builtin_open);
+#endif
 
 void nlr_jump_fail(void *val) {
     while (1) {
diff --git a/ports/webassembly/mpconfigport.h b/ports/webassembly/mpconfigport.h
index 34e231a1ff8ea..46335607e5a5d 100644
--- a/ports/webassembly/mpconfigport.h
+++ b/ports/webassembly/mpconfigport.h
@@ -37,6 +37,7 @@
 #define MICROPY_ENABLE_COMPILER     (1)
 
 #define MICROPY_ALLOC_PATH_MAX      (256)
+#define MICROPY_READER_VFS          (MICROPY_VFS)
 #define MICROPY_ENABLE_GC           (1)
 #define MICROPY_ENABLE_PYSTACK      (1)
 #define MICROPY_STACK_CHECK         (0)
@@ -48,6 +49,10 @@
 #define MICROPY_FLOAT_IMPL          (MICROPY_FLOAT_IMPL_DOUBLE)
 #define MICROPY_USE_INTERNAL_ERRNO  (1)
 #define MICROPY_USE_INTERNAL_PRINTF (0)
+#ifndef MICROPY_VFS
+#define MICROPY_VFS                 (1)
+#endif
+#define MICROPY_VFS_POSIX           (MICROPY_VFS)
 #define MICROPY_PY_UTIME_MP_HAL     (1)
 #define MICROPY_PY_SYS_PLATFORM     "webassembly"
 #define MICROPY_PY_SYS_STDFILES     (0)
@@ -86,3 +91,8 @@ typedef long mp_off_t;
 #define MICROPY_HW_MCU_NAME "Emscripten"
 
 #define MP_STATE_PORT MP_STATE_VM
+
+#if MICROPY_VFS
+// _GNU_SOURCE must be defined to get definitions of DT_xxx symbols from dirent.h.
+#define _GNU_SOURCE
+#endif
diff --git a/ports/webassembly/mphalport.h b/ports/webassembly/mphalport.h
index 3e2c439f32784..89efee69747d2 100644
--- a/ports/webassembly/mphalport.h
+++ b/ports/webassembly/mphalport.h
@@ -37,3 +37,26 @@ mp_uint_t mp_hal_ticks_us(void);
 mp_uint_t mp_hal_ticks_cpu(void);
 
 int mp_hal_get_interrupt_char(void);
+
+#if MICROPY_VFS_POSIX
+
+#include <errno.h>
+
+// This macro is used to implement PEP 475 to retry specified syscalls on EINTR
+#define MP_HAL_RETRY_SYSCALL(ret, syscall, raise) \
+    { \
+        for (;;) { \
+            ret = syscall; \
+            if (ret == -1) { \
+                int err = errno; \
+                if (err == EINTR) { \
+                    mp_handle_pending(true); \
+                    continue; \
+                } \
+                raise; \
+            } \
+            break; \
+        } \
+    }
+
+#endif

From b52fe52d31aaa5f127586173bfea29d03d1e798d Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 2 Nov 2022 14:06:18 +1100
Subject: [PATCH 2808/3533] tools/makemanifest.py: Fix printing of
 mpy_cross.CrossCompileError.

This change was missed by 5852fd7708d02d6ca85e4a5ed01d8263e3962631

Signed-off-by: Damien George <damien@micropython.org>
---
 tools/makemanifest.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/makemanifest.py b/tools/makemanifest.py
index b2e4f7d8441b6..a74a6934aeabe 100644
--- a/tools/makemanifest.py
+++ b/tools/makemanifest.py
@@ -204,7 +204,7 @@ def main():
                             extra_args=args.mpy_cross_flags.split(),
                         )
                     except mpy_cross.CrossCompileError as ex:
-                        print("error compiling {}:".format(target_path))
+                        print("error compiling {}:".format(result.target_path))
                         print(ex.args[0])
                         raise SystemExit(1)
                 ts_outfile = get_timestamp(outfile)

From 329f8252b9c79655a92d0df06668560ce4684b5b Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 3 Nov 2022 17:33:25 +1100
Subject: [PATCH 2809/3533] tests/run-perfbench: Support --heapsize argument
 and pass to executable.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/run-perfbench.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tests/run-perfbench.py b/tests/run-perfbench.py
index 6f340968b2f90..f87169d491dcc 100755
--- a/tests/run-perfbench.py
+++ b/tests/run-perfbench.py
@@ -258,6 +258,7 @@ def main():
     cmd_parser.add_argument(
         "--emit", default="bytecode", help="MicroPython emitter to use (bytecode or native)"
     )
+    cmd_parser.add_argument("--heapsize", help="heapsize to use (use default if not specified)")
     cmd_parser.add_argument("--via-mpy", action="store_true", help="compile code to .mpy first")
     cmd_parser.add_argument("--mpy-cross-flags", default="", help="flags to pass to mpy-cross")
     cmd_parser.add_argument(
@@ -285,6 +286,8 @@ def main():
         target.enter_raw_repl()
     else:
         target = [MICROPYTHON, "-X", "emit=" + args.emit]
+        if args.heapsize is not None:
+            target.extend(["-X", "heapsize=" + args.heapsize])
 
     if len(args.files) == 0:
         tests_skip = ("benchrun.py",)

From 49ce93eeece0268b5ee10ca67c8f93dc19bbd24f Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 3 Nov 2022 18:47:09 +1100
Subject: [PATCH 2810/3533] github/workflows: Print test failures for
 webassembly workflow.

Signed-off-by: Damien George <damien@micropython.org>
---
 .github/workflows/ports_webassembly.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/ports_webassembly.yml b/.github/workflows/ports_webassembly.yml
index 861039c0fcffd..49c04c7d2131b 100644
--- a/.github/workflows/ports_webassembly.yml
+++ b/.github/workflows/ports_webassembly.yml
@@ -22,3 +22,6 @@ jobs:
       run: source tools/ci.sh && ci_webassembly_build
     - name: Run tests
       run: source tools/ci.sh && ci_webassembly_run_tests
+    - name: Print failures
+      if: failure()
+      run: tests/run-tests.py --print-failures

From d65edaa232c92677033b077ddbe87b722b689833 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 3 Nov 2022 17:34:59 +1100
Subject: [PATCH 2811/3533] webassembly: Use Date's now() instead of getTime().

Using now() is a bit faster because it doesn't need to create a new Date.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/webassembly/library.js | 2 +-
 ports/webassembly/wrapper.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/webassembly/library.js b/ports/webassembly/library.js
index a8e54aaacae1d..27078e504fe6e 100644
--- a/ports/webassembly/library.js
+++ b/ports/webassembly/library.js
@@ -42,7 +42,7 @@ mergeInto(LibraryManager.library, {
     },
 
     mp_js_ticks_ms: function() {
-        return (new Date()).getTime() - MP_JS_EPOCH;
+        return Date.now() - MP_JS_EPOCH;
     },
 
     mp_js_hook: function() {
diff --git a/ports/webassembly/wrapper.js b/ports/webassembly/wrapper.js
index ae0f24e7e46d1..dcbfe6c01797e 100644
--- a/ports/webassembly/wrapper.js
+++ b/ports/webassembly/wrapper.js
@@ -33,7 +33,7 @@ var mainProgram = function()
   mp_js_init_repl = Module.cwrap('mp_js_init_repl', 'null', ['null']);
   mp_js_process_char = Module.cwrap('mp_js_process_char', 'number', ['number']);
 
-  MP_JS_EPOCH = (new Date()).getTime();
+  MP_JS_EPOCH = Date.now();
 
   if (typeof window === 'undefined' && require.main === module) {
       var fs = require('fs');

From 7a505d57dc07cc6aa869c3f99082dcc93871377b Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 3 Nov 2022 17:36:14 +1100
Subject: [PATCH 2812/3533] webassembly: Change "stack" argument to "heapsize".

Because that's what mp_js_init() takes as its argument.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/webassembly/wrapper.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/ports/webassembly/wrapper.js b/ports/webassembly/wrapper.js
index dcbfe6c01797e..24f4f8a72c71c 100644
--- a/ports/webassembly/wrapper.js
+++ b/ports/webassembly/wrapper.js
@@ -37,18 +37,18 @@ var mainProgram = function()
 
   if (typeof window === 'undefined' && require.main === module) {
       var fs = require('fs');
-      var stack_size = 64 * 1024;
+      var heap_size = 128 * 1024;
       var contents = '';
       var repl = true;
 
       for (var i = 0; i < process.argv.length; i++) {
           if (process.argv[i] === '-X' && i < process.argv.length - 1) {
-              if (process.argv[i + 1].includes('stack=')) {
-                  stack_size = parseInt(process.argv[i + 1].split('stack=')[1]);
+              if (process.argv[i + 1].includes('heapsize=')) {
+                  heap_size = parseInt(process.argv[i + 1].split('heapsize=')[1]);
                   if (process.argv[i + 1].substr(-1).toLowerCase() === 'k') {
-                      stack_size *= 1024;
+                      heap_size *= 1024;
                   } else if (process.argv[i + 1].substr(-1).toLowerCase() === 'm') {
-                      stack_size *= 1024 * 1024;
+                      heap_size *= 1024 * 1024;
                   }
               }
           } else if (process.argv[i].includes('.py')) {
@@ -56,7 +56,7 @@ var mainProgram = function()
               repl = false;;
           }
       }
-      mp_js_init(stack_size);
+      mp_js_init(heap_size);
 
       if (repl) {
           mp_js_init_repl();

From 2d406f2226a9220fcdf321b11d302914e77b7c94 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 3 Nov 2022 17:37:38 +1100
Subject: [PATCH 2813/3533] webassembly: Support piping in a program on stdin.

The performance benchmark suite can now be run on the webassembly port.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/webassembly/wrapper.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/ports/webassembly/wrapper.js b/ports/webassembly/wrapper.js
index 24f4f8a72c71c..981ade5d80113 100644
--- a/ports/webassembly/wrapper.js
+++ b/ports/webassembly/wrapper.js
@@ -56,6 +56,12 @@ var mainProgram = function()
               repl = false;;
           }
       }
+
+      if (process.stdin.isTTY === false) {
+          contents = fs.readFileSync(0, 'utf8');
+          repl = 0;
+      }
+
       mp_js_init(heap_size);
 
       if (repl) {

From db978d715510a1fa01e4c13d209d0fc0df0b23d1 Mon Sep 17 00:00:00 2001
From: "Nicholas H.Tollervey" <ntoll@ntoll.org>
Date: Thu, 6 Oct 2022 16:38:52 +0100
Subject: [PATCH 2814/3533] webassembly: Dispatch micropython-print via
 document not mp_js_stdout.

---
 ports/webassembly/library.js | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/ports/webassembly/library.js b/ports/webassembly/library.js
index 27078e504fe6e..6d9b07cfffd75 100644
--- a/ports/webassembly/library.js
+++ b/ports/webassembly/library.js
@@ -33,10 +33,9 @@ mergeInto(LibraryManager.library, {
                 process.stdout.write(b);
             } else {
                 var c = String.fromCharCode(getValue(ptr + i, 'i8'));
-                var mp_js_stdout = document.getElementById('mp_js_stdout');
-                var print = new Event('print');
-                print.data = c;
-                mp_js_stdout.dispatchEvent(print);
+                var printEvent = new CustomEvent('micropython-print');
+                printEvent.data = c;
+                document.dispatchEvent(printEvent);
             }
         }
     },

From 1ed740b152b4acd47aeb02da114cdb3150009a13 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 7 Nov 2022 17:16:26 +1100
Subject: [PATCH 2815/3533] webassembly/README: Update README to describe new
 stdout behaviour.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/webassembly/README.md | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/ports/webassembly/README.md b/ports/webassembly/README.md
index 3b577233fffe5..9ad04ccb980d3 100644
--- a/ports/webassembly/README.md
+++ b/ports/webassembly/README.md
@@ -55,9 +55,9 @@ mp_js_do_str("print('hello world')\n");
 Running with HTML
 -----------------
 
-The prerequisite for browser operation of micropython.js is an element with
-the id `mp_js_stdout` which receives `print` events. The following code
-demonstrates basic functionality:
+The prerequisite for browser operation of micropython.js is to listen to the
+`micropython-print` event, which is passed data when MicroPython code prints
+something to stdout.  The following code demonstrates basic functionality:
 
 ```html
 <!doctype html>
@@ -66,14 +66,19 @@ demonstrates basic functionality:
     <script src="build/micropython.js"></script>
   </head>
   <body>
-    <div id='mp_js_stdout'></div>
+    <pre id="micropython-stdout"></pre>
     <script>
-      mp_js_stdout.addEventListener('print', function(e) {
-        document.write(e.data);
+      document.addEventListener("micropython-print", function(e) {
+        let output = document.getElementById("micropython-stdout");
+        output.innerText += e.data;
       }, false);
 
-      mp_js_init(64 * 1024);
-      mp_js_do_str('print(\'hello world\')');
+      var mp_js_startup = Module["onRuntimeInitialized"];
+      Module["onRuntimeInitialized"] = async function() {
+        mp_js_startup();
+        mp_js_init(64 * 1024);
+        mp_js_do_str("print('hello world')");
+      };
     </script>
   </body>
 </html>

From 5987130afdf1063f06d5bf3c8826d36435834649 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 7 Nov 2022 15:11:14 +1100
Subject: [PATCH 2816/3533] webassembly/Makefile: Change compiler optimisation
 from O3 to Os.

Emscripten strongly advises the use of optimisation when compiling with
ASYNCIFY enabled.  Testing the difference betwen O3 and Os for various
configurations gives:

    flags                      firmware.wasm   micropython.js  perf
    -O3 -s ASYNCIFY            1342003          212845         0 (baseline)
    -O3 -s ASYNCIFY -s WASM=0        -         7064750         -30%
    -O3                         367131          196569         +140%
    -O3 -s WASM=0                    -         2818260         +30%
    -Os -s ASYNCIFY            1135450          213064         +40%
    -Os -s ASYNCIFY -s WASM=0        -         6239768         -30%
    -Os                         295028          196569         +180%
    -Os -s WASM=0                    -         2271358         +30%

The first row is prior to this commit.  The second and third columns show
firmware size (add them to get the total size).  The fourth column shows
the approximate change in performance compared to the baseline.  The
performance was measured using run-perfbench.py and the error was large, up
to 20%, although general trends in the change in performance could still be
seen.

In summary, using using Os instead of O3 makes it a little bit faster in
all cases, and smaller output (wasm/js) in all cases.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/webassembly/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/webassembly/Makefile b/ports/webassembly/Makefile
index 09660cd396295..db42d00966225 100644
--- a/ports/webassembly/Makefile
+++ b/ports/webassembly/Makefile
@@ -15,7 +15,7 @@ INC += -I$(TOP)
 INC += -I$(BUILD)
 
 CFLAGS += -std=c99 -Wall -Werror -Wdouble-promotion -Wfloat-conversion
-CFLAGS += -O3 -DNDEBUG
+CFLAGS += -Os -DNDEBUG
 CFLAGS += $(INC)
 
 SRC_SHARED = $(addprefix shared/,\

From 43dd3ea74dad79dc144d03a1caba8a4f220a5b27 Mon Sep 17 00:00:00 2001
From: Simon Arlott <sa.me.uk>
Date: Tue, 1 Nov 2022 12:20:08 +0000
Subject: [PATCH 2817/3533] shared/runtime/gchelper_native: Fix pointer cast on
 x86_64.

gc_helper_collect_regs_and_stack() is casting a pointer to uint32_t; the
variables involved are always pointers so it should be using uintptr_t.
---
 shared/runtime/gchelper_native.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shared/runtime/gchelper_native.c b/shared/runtime/gchelper_native.c
index 1e4af9c84479e..dbab8d601725f 100644
--- a/shared/runtime/gchelper_native.c
+++ b/shared/runtime/gchelper_native.c
@@ -41,7 +41,7 @@ MP_NOINLINE void gc_helper_collect_regs_and_stack(void) {
     uintptr_t sp = gc_helper_get_regs_and_sp(regs);
 
     // trace the stack, including the registers (since they live on the stack in this function)
-    gc_collect_root((void **)sp, ((uint32_t)MP_STATE_THREAD(stack_top) - sp) / sizeof(uint32_t));
+    gc_collect_root((void **)sp, ((uintptr_t)MP_STATE_THREAD(stack_top) - sp) / sizeof(uintptr_t));
 }
 
 #endif

From f8b0ae32d31cfb95db4294c43b821c205c17e1d3 Mon Sep 17 00:00:00 2001
From: Simon Arlott <sa.me.uk>
Date: Tue, 1 Nov 2022 18:44:23 +0000
Subject: [PATCH 2818/3533] py/builtinimport: Fix crash handling "weak link"
 module names.

There are two calls to mp_builtin___import__():
1. ports/unix/main.c:main_() which provides a str in args[0]
2. py/runtime.c:mp_import_name() which provides a qstr in args[0]

The default implementation of mp_builtin___import__() is
mp_builtin___import___default() which has a different implementation based
on MICROPY_ENABLE_EXTERNAL_IMPORT.

If MICROPY_ENABLE_EXTERNAL_IMPORT is disabled then the handling of weak
links assumes that args[0] is a `const char *`, when it is either a str or
qstr object.

Use the existing qstr of the module name instead, and also use a vstr
instead of strcpy() to ensure no overflow occurs.
---
 py/builtinimport.c | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/py/builtinimport.c b/py/builtinimport.c
index a578d4ad2732e..aa31b69db92bf 100644
--- a/py/builtinimport.c
+++ b/py/builtinimport.c
@@ -45,6 +45,15 @@
 #define DEBUG_printf(...) (void)0
 #endif
 
+#if MICROPY_MODULE_WEAK_LINKS
+STATIC qstr make_weak_link_name(vstr_t *buffer, qstr name) {
+    vstr_reset(buffer);
+    vstr_add_char(buffer, 'u');
+    vstr_add_str(buffer, qstr_str(name));
+    return qstr_from_strn(buffer->buf, buffer->len);
+}
+#endif
+
 #if MICROPY_ENABLE_EXTERNAL_IMPORT
 
 // Must be a string of one byte.
@@ -367,10 +376,7 @@ STATIC mp_obj_t process_import_at_level(qstr full_mod_name, qstr level_mod_name,
         // formerly known as "weak links").
         #if MICROPY_MODULE_WEAK_LINKS
         if (stat == MP_IMPORT_STAT_NO_EXIST && module_obj == MP_OBJ_NULL) {
-            char *umodule_buf = vstr_str(path);
-            umodule_buf[0] = 'u';
-            strcpy(umodule_buf + 1, qstr_str(level_mod_name));
-            qstr umodule_name = qstr_from_str(umodule_buf);
+            qstr umodule_name = make_weak_link_name(path, level_mod_name);
             module_obj = mp_module_get_builtin(umodule_name);
         }
         #elif MICROPY_PY_SYS
@@ -581,10 +587,8 @@ mp_obj_t mp_builtin___import___default(size_t n_args, const mp_obj_t *args) {
 
     #if MICROPY_MODULE_WEAK_LINKS
     // Check if there is a weak link to this module
-    char umodule_buf[MICROPY_ALLOC_PATH_MAX];
-    umodule_buf[0] = 'u';
-    strcpy(umodule_buf + 1, args[0]);
-    qstr umodule_name_qstr = qstr_from_str(umodule_buf);
+    VSTR_FIXED(umodule_path, MICROPY_ALLOC_PATH_MAX);
+    qstr umodule_name_qstr = make_weak_link_name(&umodule_path, module_name_qstr);
     module_obj = mp_module_get_loaded_or_builtin(umodule_name_qstr);
     if (module_obj != MP_OBJ_NULL) {
         return module_obj;

From 2c8dab7ab4ec0884c6428afc613d9dcc322d8c6d Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Mon, 7 Nov 2022 12:55:31 +1100
Subject: [PATCH 2819/3533] py/objarray: Detect bytearray(str) without an
 encoding.

This prevents a very subtle bug caused by writing e.g. `bytearray('\xfd')`
which gives you `(0xc3, 0xbd)`.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 py/objarray.c                       | 8 ++++++++
 py/objstr.c                         | 4 ++++
 tests/basics/bytearray_construct.py | 5 +++++
 tests/micropython/viper_addr.py     | 2 +-
 4 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/py/objarray.c b/py/objarray.c
index 42fc0749d2b2d..c660705389d41 100644
--- a/py/objarray.c
+++ b/py/objarray.c
@@ -192,6 +192,14 @@ STATIC mp_obj_t bytearray_make_new(const mp_obj_type_t *type_in, size_t n_args,
         return MP_OBJ_FROM_PTR(o);
     } else {
         // 1 arg: construct the bytearray from that
+        if (mp_obj_is_str(args[0]) && n_args == 1) {
+            #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
+            // Match bytes_make_new.
+            mp_raise_TypeError(MP_ERROR_TEXT("wrong number of arguments"));
+            #else
+            mp_raise_TypeError(MP_ERROR_TEXT("string argument without an encoding"));
+            #endif
+        }
         return array_construct(BYTEARRAY_TYPECODE, args[0]);
     }
 }
diff --git a/py/objstr.c b/py/objstr.c
index 8c639e735493b..bd3e16e7f23d6 100644
--- a/py/objstr.c
+++ b/py/objstr.c
@@ -233,7 +233,11 @@ STATIC mp_obj_t bytes_make_new(const mp_obj_type_t *type_in, size_t n_args, size
 
     if (mp_obj_is_str(args[0])) {
         if (n_args < 2 || n_args > 3) {
+            #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
             goto wrong_args;
+            #else
+            mp_raise_TypeError(MP_ERROR_TEXT("string argument without an encoding"));
+            #endif
         }
         GET_STR_DATA_LEN(args[0], str_data, str_len);
         GET_STR_HASH(args[0], str_hash);
diff --git a/tests/basics/bytearray_construct.py b/tests/basics/bytearray_construct.py
index 75fdc411782b8..eb4d4e641f0ca 100644
--- a/tests/basics/bytearray_construct.py
+++ b/tests/basics/bytearray_construct.py
@@ -5,3 +5,8 @@
 print(bytearray('12345', 'utf-8', 'strict'))
 print(bytearray((1, 2)))
 print(bytearray([1, 2]))
+
+try:
+    print(bytearray('1234'))
+except TypeError:
+    print("TypeError")
diff --git a/tests/micropython/viper_addr.py b/tests/micropython/viper_addr.py
index 84bc6c002e8fd..8e79fadb2a84e 100644
--- a/tests/micropython/viper_addr.py
+++ b/tests/micropython/viper_addr.py
@@ -21,7 +21,7 @@ def memsum(src: ptr8, n: int) -> int:
 
 
 # create array and get its address
-ar = bytearray("0000")
+ar = bytearray(b"0000")
 addr = get_addr(ar)
 print(type(ar))
 print(type(addr))

From e65b12a1b9d153991026b194341b881534a882c7 Mon Sep 17 00:00:00 2001
From: Matt Trentini <matt.trentini@gmail.com>
Date: Mon, 24 Oct 2022 20:28:34 +1100
Subject: [PATCH 2820/3533] docs/library/machine: Add machine.memX to docs with
 brief example.

---
 docs/library/machine.rst | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/docs/library/machine.rst b/docs/library/machine.rst
index c3bf43896136b..3f5cd6f13c72b 100644
--- a/docs/library/machine.rst
+++ b/docs/library/machine.rst
@@ -19,6 +19,44 @@ This is true for both physical devices with IDs >= 0 and "virtual" devices
 with negative IDs like -1 (these "virtual" devices are still thin shims on
 top of real hardware and real hardware interrupts). See :ref:`isr_rules`.
 
+Memory access
+-------------
+
+The module exposes three objects used for raw memory access.
+
+.. data:: mem8
+
+    Read/write 8 bits of memory.
+
+.. data:: mem16
+
+    Read/write 16 bits of memory.
+
+.. data:: mem32
+
+    Read/write 32 bits of memory.
+
+Use subscript notation ``[...]`` to index these objects with the address of
+interest. Note that the address is the byte address, regardless of the size of
+memory being accessed.
+
+Example use (registers are specific to an stm32 microcontroller):
+
+.. code-block:: python3
+
+    import machine
+    from micropython import const
+
+    GPIOA = const(0x48000000)
+    GPIO_BSRR = const(0x18)
+    GPIO_IDR = const(0x10)
+
+    # set PA2 high
+    machine.mem32[GPIOA + GPIO_BSRR] = 1 << 2
+
+    # read PA3
+    value = (machine.mem32[GPIOA + GPIO_IDR] >> 3) & 1
+
 Reset related functions
 -----------------------
 

From 144e5ec6459655ecf123da830cd36d4632fda9c2 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Wed, 26 Oct 2022 20:17:19 +0200
Subject: [PATCH 2821/3533] samd/mcu/samd51: Use an additional manifest.py for
 SAMD51 boards.

Including the uasyncio scripts and the drivers for DHT, DS18x20 and
onewire.  The uasyncio scripts need about 8k of flash and are not included
for the SAMD21 boards by default.
---
 ports/samd/mcu/samd51/manifest.py    | 5 +++++
 ports/samd/mcu/samd51/mpconfigmcu.mk | 1 +
 2 files changed, 6 insertions(+)
 create mode 100644 ports/samd/mcu/samd51/manifest.py

diff --git a/ports/samd/mcu/samd51/manifest.py b/ports/samd/mcu/samd51/manifest.py
new file mode 100644
index 0000000000000..4a79f6818f8b9
--- /dev/null
+++ b/ports/samd/mcu/samd51/manifest.py
@@ -0,0 +1,5 @@
+include("$(PORT_DIR)/boards/manifest.py")
+include("$(MPY_DIR)/extmod/uasyncio")
+require("onewire")
+require("ds18x20")
+require("dht")
diff --git a/ports/samd/mcu/samd51/mpconfigmcu.mk b/ports/samd/mcu/samd51/mpconfigmcu.mk
index 305e780b8787f..a016ba0a7feea 100644
--- a/ports/samd/mcu/samd51/mpconfigmcu.mk
+++ b/ports/samd/mcu/samd51/mpconfigmcu.mk
@@ -1,5 +1,6 @@
 MICROPY_VFS_LFS2 ?= 1
 MICROPY_VFS_FAT ?= 1
+FROZEN_MANIFEST ?= mcu/$(MCU_SERIES_LOWER)/manifest.py
 
 SRC_S += shared/runtime/gchelper_m3.s
 

From b3ce059767c823c8f4eee54ab6f8955b5931642b Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Fri, 28 Oct 2022 16:27:08 +0200
Subject: [PATCH 2822/3533] docs/samd/pinout: Fix the pin numbering for the
 default assignments.

It still used the 'old' pin numbers.
---
 docs/samd/pinout.rst | 96 +++++++++++++++++++++++---------------------
 1 file changed, 51 insertions(+), 45 deletions(-)

diff --git a/docs/samd/pinout.rst b/docs/samd/pinout.rst
index 7e8d7ad9014eb..46d9d7a29d1b1 100644
--- a/docs/samd/pinout.rst
+++ b/docs/samd/pinout.rst
@@ -70,17 +70,17 @@ SAMD21 UART assignments
 ```````````````````````
 The UART devices and signals must be chosen according to the following rules:
 
-- The TX signal must be at a Pin with pad numbers 2 or 0, like Pin 1 with serial
+- The TX signal must be at a Pin with pad numbers 2 or 0, like Pin D1 with serial
   device 0 or 2.
 - The RX pin may be assigned to one of the other pads.
 
 Examples for Adafruit ItsyBitsy M0 Express:
 
-- uart 0 at pins 0/1  This is the default UART at the RX/TX labelled pins
-- uart 1 at pins 12/10
-- uart 2 at pins 0/1
-- uart 3 at pins 11/13
-- uart 4 at pins 2/5
+- uart 0 at pins D0/D1  This is the default UART at the RX/TX labelled pins
+- uart 1 at pins D12/D10
+- uart 2 at pins D0/D1
+- uart 3 at pins D11/D13
+- uart 4 at pins D2/D5
 - uart 5 at pins SCL/SDA
 
 or other combinations.
@@ -95,8 +95,8 @@ The I2C devices and signals must be chosen according to the following rules:
 Examples for Adafruit ItsyBitsy M0 Express:
 
 - I2C 0 at Pin A3/A4
-- I2C 1 at pins 11/13
-- I2C 2 at the pins 4/3
+- I2C 1 at pins D11/D13
+- I2C 2 at the pins D4/D3
 - I2C 3 at the pins SDA/SCL This is the default I2C device at the SDA/SCl labelled pin
 - I2C 4 at the pins A1/A2
 - I2C 5 at the pins SDA/SCL,
@@ -112,10 +112,10 @@ The I2C devices and signals must be chosen according to the following rules:
 
 Examples for Adafruit ItsyBitsy M0 Express:
 
-- SPI 0 at pins 0/4/1
-- SPI 1 at pins 11/12/13
-- SPI 2 at pins 0/4/1
-- SPI 3 at pins 11/12/13
+- SPI 0 at pins D0/D4/D1
+- SPI 1 at pins D11/D12/D13
+- SPI 2 at pins D0/D4/D1
+- SPI 3 at pins D11/D12/D13
 - SPI 4 at Pin MOSI/MISO/SCK This is the default SPI device at the MOSI/MISO/SCK labelled pins.
 
 or other combinations.
@@ -201,16 +201,16 @@ SAMD51 UART assignments
 ```````````````````````
 The UART devices and signals must be chosen according to the following rules:
 
-- The TX signal must be at a Pin with pad numbers 0, like Pin 1 with serial
+- The TX signal must be at a Pin with pad numbers 0, like Pin D1 with serial
   device 3.
 - The RX pin may be assigned to one of the other pads.
 
 Examples for Adafruit ItsyBitsy 4 Express:
 
 - uart 0 at pins A4/A1
-- uart 1 at pins 1/0   This is the default UART at the RX/TX labelled pins
+- uart 1 at pins D1/D0   This is the default UART at the RX/TX labelled pins
 - uart 2 at pins SCL/SDA  This is the default I2C device at the SDA/SCl labelled pin
-- uart 3 at pins 0/1
+- uart 3 at pins D0/D1
 - uart 4 at pins SDA/SCL
 - uart 5 at pins D12/D13
 
@@ -226,11 +226,11 @@ The I2C devices and signals must be chosen according to the following rules:
 Examples for Adafruit ItsyBitsy M0 Express:
 
 - I2C 0 at pins A3/A4
-- I2C 1 at pins 0/1
+- I2C 1 at pins D0/D1
 - I2C 2 at the pins SDA/SCL
-- I2C 3 at the pins 1/0
+- I2C 3 at the pins D1/D0
 - I2C 4 at the pins A2/A3
-- I2C 5 at the pins 12/13
+- I2C 5 at the pins D12/D13
 
 or other combinations.
 
@@ -244,8 +244,8 @@ The SPI devices and signals must be chosen according to the following rules:
 Examples for Adafruit ItsyBitsy M0 Express:
 
 - SPI 1 at Pin MOSI/MISO/SCK  This is the default SPI device at the MOSI/MISO/SCK labelled pins.
-- SPI 3 at pins 13/11/12
-- SPI 5 at pins 12/3/13
+- SPI 3 at pins D13/D11/D12
+- SPI 5 at pins D12/D3/D13
 
 or other combinations.
 
@@ -325,10 +325,10 @@ Adafruit ItsyBitsy M4 Express :ref:`samd51_pinout_table`.
 
 The default devices at the board are:
 
-- UART 5 at pins 0/1, labelled RX/TX
-- I2C 2 at pins 21/20, labelled SDA/SCL
-- SPI 1 at pins 22/23/24, labelled MOSI, MISO and SCK
-- DAC output on pins 14 and 15, labelled A0 and A1
+- UART 5 at pins D0/D1, labelled RX/TX
+- I2C 2 at pins PA12/PA13, labelled SDA/SCL
+- SPI 1 at pins PA23/PA22/PA17, labelled MOSI, MISO and SCK
+- DAC output on pins PA02 and PA05, labelled A0 and A1
 
 SEEED XIAO pin assignment table
 -------------------------------
@@ -381,10 +381,10 @@ Adafruit ItsyBitsy M0 Express :ref:`samd21_pinout_table`.
 
 The default devices at the board are:
 
-- UART 4 at pins 7/6, labelled A6_D6/A7_D7
-- I2C 2 at pins 4/5, labelled A4_D4/A5_D5
-- SPI 0 at pins 10/9/8, labelled A10_D10, A9_D9 and A8_D8
-- DAC output on pin 0, labelled A0_D0
+- UART 4 at pins PB08/PB09, labelled A6_D6/A7_D7
+- I2C 2 at pins PA08/PA09, labelled A4_D4/A5_D5
+- SPI 0 at pins PA06/PA05/PA07, labelled A10_D10, A9_D9 and A8_D8
+- DAC output on pin PA02, labelled A0_D0
 
 Adafruit Feather M0 Express pin assignment table
 ------------------------------------------------
@@ -437,10 +437,10 @@ Adafruit ItsyBitsy M0 Express :ref:`samd21_pinout_table`.
 
 The default devices at the board are:
 
-- UART 5 at pins 21/20, labelled RX/TX
-- I2C 3 at pins 22/23, labelled SDA/SCL
-- SPI 4 at pins 24/25/26, labelled MOSI, MISO and SCK
-- DAC output on pin 14, labelled A0
+- UART 5 at pins PB23/PB22, labelled RX/TX
+- I2C 3 at pins PA22/PA23, labelled SDA/SCL
+- SPI 4 at pins PA10/PA12/PA11, labelled MOSI, MISO and SCK
+- DAC output on pin PA02, labelled A0
 
 Adafruit Trinket M0 pin assignment table
 ------------------------------------------------
@@ -481,10 +481,10 @@ Adafruit ItsyBitsy M0 Express :ref:`samd21_pinout_table`.
 
 The default devices at the board are:
 
-- UART 0 at pins 3/4, labelled D3/D4
-- I2C 2 at pins 0/2, labelled D0/D2
-- SPI 0 at pins 4/2/3, labelled D4, D2 and D0
-- DAC output on pin 1, labelled D1
+- UART 0 at pins PA07/PA06, labelled D3/D4
+- I2C 2 at pins PA08/PA09, labelled D0/D2
+- SPI 0 at pins PA06/PA09/PA08, labelled D4, D2 and D0
+- DAC output on pin PA02, labelled D1
 
 SAMD21 Xplained PRO pin assignment table
 ----------------------------------------
@@ -550,7 +550,7 @@ For the definition of the table columns see the explanation at the table for
 Adafruit ItsyBitsy M0 Express :ref:`samd21_pinout_table`.
 
 There are no pins labelled for default devices on this board. DAC output
-is on pin 32, labelled EXT3_PIN3
+is on pin PA02, labelled EXT3_PIN3
 
 Minisam M4 pin assignment table
 -------------------------------
@@ -602,10 +602,10 @@ Adafruit ItsyBitsy M4 Express :ref:`samd51_pinout_table`.
 
 The default devices at the board are:
 
-- UART 1 at pins 6/7, labelled D0/D1
-- I2C 2 at pins 14/15, labelled SDA/SCL
-- SPI 1 at pins 16/17/18, labelled MOSI, MISO and SCK
-- DAC output on pins 0 and 4, labelled A0_D9 and A4_D13
+- UART 1 at pins PA16/PA17, labelled D0/D1
+- I2C 2 at pins PA12/PA13, labelled SDA/SCL
+- SPI 1 at pins PB22/PB23/PA01, labelled MOSI, MISO and SCK
+- DAC output on pins PA02 and PA05, labelled A0_D9 and A4_D13
 
 Seeed WIO Terminal pin assignment table
 ---------------------------------------
@@ -717,6 +717,12 @@ Pin GPIO Pin name     IRQ  ADC  ADC  Serial Serial  TC    PWM   PWM
 For the definition of the table columns see the explanation at the table for
 Adafruit ItsyBitsy M4 Express :ref:`samd51_pinout_table`.
 
+Default pin assignments:
+- UART 2 at pins PB27 and PB26, labelled RX and TX
+- I2C 4 at pins PA12 and PA13, labelled SCL0 and SDA0
+- I2C 3 at pins PA16 and PA17, labelled SCL1 and SDA1
+- SPI 5 at pins PB00, PB02 and PB03, labelle MISO, MOSI and SCK
+
 There seems to be no default pin assignment for this board.
 
 Sparkfun SAMD51 Thing Plus pin assignment table
@@ -783,10 +789,10 @@ Adafruit ItsyBitsy M4 Express :ref:`samd51_pinout_table`.
 
 The default devices at the board are:
 
-- UART 1 at pins 2/3, labelled RXD/TXD
-- I2C 5 at pins 20/21, labelled SDA/SCL
-- SPI 4 at pins 22/23/24, labelled MOSI, MISO and SCK
-- DAC output on pins 14 and 18, labelled A0 and A4
+- UART 1 at pins PB23/PB22, labelled RXD/TXD
+- I2C 5 at pins PA22/PA23, labelled SDA/SCL
+- SPI 4 at pins PB12/PB11/PB13, labelled MOSI, MISO and SCK
+- DAC output on pins PA02 and PA05, labelled A0 and A4
 
 Scripts for creating the pin assignment tables
 ----------------------------------------------

From fadfc305474484f3fc77d8c7c41c8fdde19bfb4e Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sun, 30 Oct 2022 18:06:33 +0100
Subject: [PATCH 2823/3533] samd/README: Update README to reflect recent
 changes to the port.

Most of the content of README.md became obsolete and was replaced by the
documentation of MicroPython.  Instead, README.md now shows build
instructions like the other ports.
---
 ports/samd/README.md | 201 +++++++++++++------------------------------
 1 file changed, 58 insertions(+), 143 deletions(-)

diff --git a/ports/samd/README.md b/ports/samd/README.md
index 4b434963d9798..49e967102ecd9 100644
--- a/ports/samd/README.md
+++ b/ports/samd/README.md
@@ -1,146 +1,61 @@
 Port of MicroPython to Microchip SAMD MCUs
 ==========================================
 
-Supports SAMD21 and SAMD51.
-
-## Features:
-
-### REPL
-
-- REPL over USB VCP
-- REPL over USART using board specified USART pins (initialised on startup).
-  - The USART Pins are board specific, defined in `boards/$(BOARD)/mpconfigboard.h`,
-    and set at compile time. See the table below. At this stage, the USART cannot be
-    moved to different pins unless `mpconfigboard.h` is edited and the port recompiled.
-  - Two USART functions are accessible through MicroPython:
-    - `uart_init()`. The 'C' function behind this function is what initialises the
-      USART on startup. Calling this function in MicroPython resets any other peripheral
-      operating on these pins and reconnects the USART SERCOM to the designated pins.
-    - `uart_deinit()`. This simply 'disconnects' the SERCOM from the pins. The USART
-      remains operating over USB VCP to maintain access to the REPL.
-
-### Boards
-
-| Board                                                        | USART                                                       | LFS1 Flash size | Tested |
-| ------------------------------------------------------------ | ----------------------------------------------------------- | --------------- | ------ |
-| ADAFRUIT_FEATHER_M0_EXPRESS                                  | Tx=PA10=SERCOM0/PAD[2], Rx=PA11=SERCOM0/PAD[3]              | 64k             | No     |
-| ADAFRUIT_ITSYBITSY_M4_EXPRESS                                | Tx=TX_D1=PA17=SERCOM3/PAD[0],  Rx=RX_D0=PA16=SERCOM3/PAD[1] | 128k            | No     |
-| ADAFRUIT_TRINKET_M0                                          | Tx=D4=PA06=SERCOM0/PAD[2], Rx=D3=PA07=SERCOM0/PAD[3]        | 64k             | No     |
-| MINISAM_M4                                                   | Tx=TX_D1=PA17=SERCOM3/PAD[0], Rx=RX_D0=PA16=SERCOM3/PAD[1]  | 128k            | No     |
-| SAMD21_XPLAINED_PRO                                          | Tx=PA10=SERCOM0/PAD[2], Rx=PA11=SERCOM0/PAD[3]              | 64k             | No     |
-| SEEED_WIO_TERMINAL                                           | Tx=BCM14=PB27=SERCOM2/PAD[0], Rx=BCM15=PB26=SERCOM2/PAD[1]  | 128k            | Yes    |
-| SEEED_XIAO                                                   | Tx=A6=PB8=SERCOM4/PAD[0], Rx=A7=PB9=SERCOM4/PAD[1]          | 64k             | Yes    |
-
-Note: all USARTs are set to: async, 8 bit, 1 stop bit, no parity, 115200 bps.
-
-### Modules
-
-- Internal modules and functions:
-
-`>>>help('modules')`
-`__main__          micropython       uheapq            ustruct`
-`_boot             samd              uio               usys`
-`_uasyncio         uarray            ujson             utime`
-`builtins          uasyncio          uos               uzlib`
-`gc                ubinascii         urandom`
-`machine           uctypes           ure`
-`Plus any modules on the filesystem`
-
-#### Flash
-
-- Internal Flash Block Device `samd.Flash()` initialised with littlefs1 in frozen module '`_boot.py`'.
-
-- **No external SPI Flash driver** (ToDo).
-
-- Block Device size is set in `ports/samd/boards/$(BOARD)/mpconfigboard.h` :
-
-  - SAMD21: (eg; SEEED_XIAO): 64k `0xFFFF`
-
-   *  SAMD51: (eg; M4's): 128k `0x1FFFF`
-
-#### Pins & LEDs
-
-##### `machine.Pin()` class.
-
-- GPIO methods & constants:
-
-    value           IN              OUT             PULL_DOWN
-    PULL_UP         high            init            low
-    off             on              toggle
-
-- Each board has its own pin numbering scheme, so please see the table below (the
-  structure is defined in`boards/$(BOARD)/pins.c`) for pin numbers referenced
-  (index) by 'Pin'. Eg; `SEEED_XIAO/pins.c`: `{{&machine_pin_type}, PIN_PA02}, // A0/D0`
-  means MicroPython `Pin(0)` is SEEED_XIAO pin "A0/D0" on SAMD21G18A PortA, Pin2.
-
-- Note: on the SEEED_XIAO, if the TX & TX pins are used by the `Pin()` class, the `Pin()`
-  initialisation disconnects the pins from the SERCOM similar to the way
-  `machine.uart_deinit()` does.
-
-| MicroPython Pin() | SAMD51 Pin#/  ItsyBitsy_M4 | SAMD21 Pin#/  Feather_M0 | SAMD21 Pin#/  Xplained Pro          | SAMD21 Pin#/  Trinket_M0 | SAMD51 Pin#/ Minisam | SAMD21 Pin#/ SEEED_XIAO | SAMD51 Pin#/  SEEED_WIO_TERMINAL      |
-| ----------------- | -------------------------- | ------------------------ | ----------------------------------- | ------------------------ | -------------------- | ----------------------- | ------------------------------------- |
-| Pin(0)            | PA16/ RX_D0                | PA11/ D0                 | PB00/ PIN3_ADC(+) (ext1)            | PA08/ D0                 | PA02/ A0,D9          | PA02 / A0/D0            | PB08 / A0/D0                          |
-| Pin(1)            | PA17/ TX_D1                | PA10/ D1                 | PB01/ PIN4_ADC(-) (ext1)            | PA02/ D1                 | PB08/ A1,D10         | PA04 / A1/D1            | PB09 / A1/D1                          |
-| Pin(2)            | PA07/ D2                   | PA14/ D2                 | PB06/ PIN5_GPIO (ext1)              | PA09/ D2                 | PB09/ A2,D11         | PA10 / A2/D2            | PA07 / A2/D2                          |
-| Pin(3)            | PB22/ D3                   | PA09/ D3/                | PB07/ PIN6_GPIO (ext1)              | PA07/ D3/ RxD            | PA04/ A3,D12         | PA11 / A3/D3            | PB04 / A3/D3                          |
-| Pin(4)            | PA14/ D4                   | PA08/ D4/                | PB02/ PIN7_PWM(+) (ext1)            | PA06/ D4/ TxD            | PA05/ A4,D13         | PA08 / A4/D4            | PB05 / A4/D4                          |
-| Pin(5)            | PA15/ D5                   | PA15/ D5                 | PB03/ PIN8_PWM(-) (ext1)            |                          | PA06/ A5             | PA09 / A5/D5            | PB06 / A5/D5                          |
-| Pin(6)            | -1/ D6                     | PA20/ D6                 | PB04/ PIN9_IRQ/GPIO (ext1)          |                          | PA16/ RX_D0          | PB08 / A6/D6/TX         | PA04 / A6/D6                          |
-| Pin(7)            | PA18/ D7                   | PA21/ D7                 | PB05/ PIN10_SPI_SS_B/GPIO (ext1)    |                          | PA17/ TX_D1          | PB09 / A7/D7/RX         | PB07 / A7/D7                          |
-| Pin(8)            | -1/ D8                     | PA06/ D8/                | PA08/ PIN11_TWI_SDA (ext1)          |                          | PA07/ D2,A6          | PA07 / A8/D8            | PA06 / A8/D8                          |
-| Pin(9)            | PA19/ D9                   | PA07/ D9/                | PA09/ PIN12_TWI_SCL (ext1)          |                          | PA19/ D3             | PA05 / A9/D9            | PD08 / SWITCH_X                       |
-| Pin(10)           | PA20/ D10                  | PA18/ D10                | PB09/ PIN13_UART_RX (ext1)          |                          | PA20/ D4             | PA06 / A10/D10          | PD09 / SWITCH_Y                       |
-| Pin(11)           | PA21/ D11                  | PA16/ D11                | PB08/ PIN14_UART_TX (ext1)          |                          | PA21/ D5             |                         | PD10 / SWITCH_Z                       |
-| Pin(12)           | PA23/ D12                  | PA19/ D12                | PA05/ PIN15_SPI_SS_A (ext1)         |                          | PA00/ BUTTON         |                         | PD12 / SWITCH_B                       |
-| Pin(13)           | PA22/ D13                  | PA17/ D13/               | PA06/ PIN16_SPI_MOSI (ext1)         |                          |                      |                         | PD20 / SWITCH_U                       |
-| Pin(14)           | PA02/ A0                   | PA02/ A0                 | PA04/ PIN17_SPI_MISO (ext1)         |                          |                      |                         | PC26 / BUTTON_1                       |
-| Pin(15)           | PA05/ A1                   | PB08/ A1                 | PA07/ PIN18_SPI_SCK (ext1)          |                          |                      |                         | PC27 / BUTTON_2                       |
-| Pin(16)           | PB08/ A2                   | PB09/ A2                 | PA10/ PIN3_ADC(+) (ext2)            |                          |                      |                         | PC28 / BUTTON_3                       |
-| Pin(17)           | PB09/ A3                   | PA04/ A3/                | PA11/ PIN4_ADC(-) (ext2)            |                          |                      |                         | PD11 / BUZZER_CTR                     |
-| Pin(18)           | PA04/ A4                   | PA05/ A4/                | PA20/ PIN5_GPIO (ext2)              |                          |                      |                         | PC14/ 5V_OUTPUT_CTR- '1'= 5V on hdr   |
-| Pin(19)           | PA06/ A5                   | PB02/ A5                 | PA21/ PIN6_GPIO (ext2)              |                          |                      |                         | PC15/ 3V3_OUTPUT_CTR- '0'= 3V3 on hdr |
-| Pin(20)           |                            |                          | PB12/ PIN7_PWM(+) (ext2)            |                          |                      |                         |                                       |
-| Pin(21)           |                            |                          | PB13/ PIN8_PWM(-) (ext2)            |                          |                      |                         |                                       |
-| Pin(22)           |                            |                          | PB14/ PIN9_IRQ/GPIO (ext2)          |                          |                      |                         |                                       |
-| Pin(23)           |                            |                          | PB15/ PIN10_SPI_SS_B/GPIO (ext2)    |                          |                      |                         |                                       |
-| Pin(24)           |                            |                          | -1 / PIN11_TWI_SDA already defined  |                          |                      |                         |                                       |
-| Pin(25)           |                            |                          | -1 / PIN12_TWI_SCL already defined  |                          |                      |                         |                                       |
-| Pin(26)           |                            |                          | PB11/ PIN13_UART_RX (ext2)          |                          |                      |                         |                                       |
-| Pin(27)           |                            |                          | PB10/ PIN14_UART_TX (ext2)          |                          |                      |                         |                                       |
-| Pin(28)           |                            |                          | PA17/ PIN15_SPI_SS_A (ext2)         |                          |                      |                         |                                       |
-| Pin(29)           |                            |                          | PA18/ PIN16_SPI_MOSI (ext2)         |                          |                      |                         |                                       |
-| Pin(30)           |                            |                          | PA16/ PIN17_SPI_MISO (ext2)         |                          |                      |                         |                                       |
-| Pin(31)           |                            |                          | PA19/ PIN18_SPI_SCK (ext2)          |                          |                      |                         |                                       |
-| Pin(32)           |                            |                          | PA02/ PIN3_ADC(+) (ext3)            |                          |                      |                         |                                       |
-| Pin(33)           |                            |                          | PA03/ PIN4_ADC(-) (ext3)            |                          |                      |                         |                                       |
-| Pin(34)           |                            |                          | -1/ PIN5_GPIO already defined       |                          |                      |                         |                                       |
-| Pin(35)           |                            |                          | PA15/ PIN6_GPIO; USER_BUTTON (ext3) |                          |                      |                         |                                       |
-| Pin(36)           |                            |                          | PA12/ PIN7_PWM(+) (ext3)            |                          |                      |                         |                                       |
-| Pin(37)           |                            |                          | PA13/ PIN8_PWM(-) (ext3)            |                          |                      |                         |                                       |
-| Pin(38)           |                            |                          | PA28/ PIN9_IRQ/GPIO (ext3)          |                          |                      |                         |                                       |
-| Pin(39)           |                            |                          | PA27/ PIN10_SPI_SS_B/GPIO (ext3)    |                          |                      |                         |                                       |
-| Pin(40)           |                            |                          | -1/ PIN11_TWI_SDA already defined   |                          |                      |                         |                                       |
-| Pin(41)           |                            |                          | -1/ PIN12_TWI_SCL already defined   |                          |                      |                         |                                       |
-| Pin(42)           |                            |                          | -1/ PIN13_UART_RX already defined   |                          |                      |                         |                                       |
-| Pin(43)           |                            |                          | -1/ PIN14_UART_TX already defined   |                          |                      |                         |                                       |
-| Pin(44)           |                            |                          | PA15/ PIN6_GPIO; USER_BUTTON (ext3) |                          |                      |                         |                                       |
-| Pin(45)           |                            |                          | PB22/ PIN16_SPI_MOSI (ext3)         |                          |                      |                         |                                       |
-| Pin(46)           |                            |                          | PB16/ PIN17_SPI_MISO (ext3)         |                          |                      |                         |                                       |
-| Pin(47)           |                            |                          | PB23/ PIN18_SPI_SCK (ext3)          |                          |                      |                         |                                       |
-
-##### `machine.LED()` class.
-
-- GPIO methods & constants:
-
-`value           OUT             high            low`
-`off             on              toggle`
-
-- As above, please see `boards/$(BOARD)/pins.c` for pin numbers referenced by 'LED'.
-Eg; `SEEED_XIAO/pins.c`: `{{&machine_led_type}, PIN_PA17}, // W13` means MicroPython
-`LED(0)` is SEEED_XIAO LED "W13" connected to SAMD21G18A PortA, Pin17.
-
-| MicroPython  LED() | SAMD51 Pin#/  ItsyBitsy_M4 | SAMD21 Pin#/  Feather_M0 | SAMD21 Pin#/  Xplained Pro | SAMD21 Pin#/  Trinket_M0 | SAMD51  Pin#/ Minisam | SAMD21  Pin#/ SEEED_XIAO | SAMD51  Pin#/ SEEED_WIO_TERMINAL |
-| ------------------ | -------------------------- | ------------------------ | -------------------------- | ------------------------ | --------------------- | ------------------------ | -------------------------------- |
-| LED(0)             | PA22/ D13/ user LED        | PA17/ D13/ user LED      | PB30/ USER_LED             | PA10/ USER_LED           | PA15/ LED             | PA17 / W13               | PA15 / USER_LED (Blue)           |
-| LED(1)             |                            |                          |                            |                          |                       | PA18 / RX_LED            | PC05 / LCD_BACKLIGHT_CTR         |
-| LED(2)             |                            |                          |                            |                          |                       | PA19 / TX_LED            |                                  |
+Supports SAMD21 and SAMD51. For each supported device there is a
+subdirectory in the `boards/` directory.
+
+The entry point for the specific port documentation is at
+https://docs.micropython.org/en/latest/samd/quickref.html, which also
+shows the assignment of IO-Functions to pins. The generic MicroPython
+documentation applies for anything not specific for the SAM port.
+
+Due to the different flash sizes of SAMD21 and SAMD51 devices, the
+coverage of MicroPython modules differ. Use help("modules") to tell,
+which MicroPython modules are provided.
+
+Build instructions
+------------------
+
+Before building the firmware for a given board the MicroPython cross-compiler
+must be built; it will be used to pre-compile some of the built-in scripts to
+bytecode.  The cross-compiler is built and run on the host machine, using:
+
+    $ make -C mpy-cross
+
+This command should be executed from the root directory of this repository.
+All other commands below should be executed from the ports/stm32/ directory.
+
+An ARM compiler is required for the build, along with the associated binary
+utilities.  The default compiler is `arm-none-eabi-gcc`, which is available for
+Arch Linux via the package `arm-none-eabi-gcc`, for Ubuntu via instructions
+[here](https://launchpad.net/~team-gcc-arm-embedded/+archive/ubuntu/ppa), or
+see [here](https://launchpad.net/gcc-arm-embedded) for the main GCC ARM
+Embedded page.  The compiler can be changed using the `CROSS_COMPILE` variable
+when invoking `make`.
+
+Next, the board to build must be selected.  There is no default board. Any
+of the names of the subdirectories in the `boards/` directory is a valid board.
+The board name must be passed as the argument to `BOARD=` when invoking `make`.
+
+All boards require certain submodules to be obtained before they can be built.
+The correct set of submodules can be initialised using (with
+`ADAFRUIT_ITSYBITSY_M4_EXPRESS` as an example of the selected board):
+
+    $ make BOARD=ADAFRUIT_ITSYBITSY_M4_EXPRESS submodules
+
+Then to build the board's firmware run:
+
+    $ make BOARD=ADAFRUIT_ITSYBITSY_M4_EXPRESS clean
+    $ make BOARD=ADAFRUIT_ITSYBITSY_M4_EXPRESS
+
+The above command produces binary images in the
+`build-ADAFRUIT_ITSYBITSY_M4_EXPRESS/` subdirectory (or the equivalent
+directory for the board specified).
+
+### Flashing the Firmware
+
+Most SAMD21 and SAMD51 boards have a built in firmware loader. To start it, push
+the reset button of the boards twice. The speed varies a little bit. If the
+firmware loader starts, a drive will appear in the file manager of your PC.
+Copy the created `firmware.uf2` file to that drive. If the upload is finished, the
+drive will disappear and the board will reboot.

From 9d0aefe719b8a56650e840a87a5e659dd884a0db Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sat, 5 Nov 2022 21:16:21 +0100
Subject: [PATCH 2824/3533] samd/boards/SEEED_WIO_TERMINAL: Enable using the
 32kHz crystal.

That was missing from the configuration.
---
 ports/samd/boards/SEEED_WIO_TERMINAL/mpconfigboard.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ports/samd/boards/SEEED_WIO_TERMINAL/mpconfigboard.h b/ports/samd/boards/SEEED_WIO_TERMINAL/mpconfigboard.h
index cfda18d11c965..8260992101c5d 100644
--- a/ports/samd/boards/SEEED_WIO_TERMINAL/mpconfigboard.h
+++ b/ports/samd/boards/SEEED_WIO_TERMINAL/mpconfigboard.h
@@ -1,2 +1,4 @@
 #define MICROPY_HW_BOARD_NAME "Wio Terminal D51R"
 #define MICROPY_HW_MCU_NAME   "SAMD51P19A"
+
+#define MICROPY_HW_XOSC32K          (1)

From efe7dac0aaf98018d8725df873024a0f9ab91c10 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Mon, 10 Oct 2022 19:41:33 +0200
Subject: [PATCH 2825/3533] stm32/mbedtls: Enable mbedtls certificate time
 validation.

This is a reimplementation of b560b9fe715e293caef80533d61d8c3b179b0339 for
the stm32 port.
---
 ports/stm32/mbedtls/mbedtls_config.h |  9 +++++++
 ports/stm32/mbedtls/mbedtls_port.c   | 36 ++++++++++++++++++++++++++++
 2 files changed, 45 insertions(+)

diff --git a/ports/stm32/mbedtls/mbedtls_config.h b/ports/stm32/mbedtls/mbedtls_config.h
index 4140bb5145555..bdac073399849 100644
--- a/ports/stm32/mbedtls/mbedtls_config.h
+++ b/ports/stm32/mbedtls/mbedtls_config.h
@@ -26,6 +26,15 @@
 #ifndef MICROPY_INCLUDED_MBEDTLS_CONFIG_H
 #define MICROPY_INCLUDED_MBEDTLS_CONFIG_H
 
+// Enable mbedtls modules.
+#define MBEDTLS_HAVE_TIME
+#define MBEDTLS_HAVE_TIME_DATE
+
+// Time hook.
+#include <time.h>
+extern time_t stm32_rtctime_seconds(time_t *timer);
+#define MBEDTLS_PLATFORM_TIME_MACRO stm32_rtctime_seconds
+
 // Set MicroPython-specific options.
 #define MICROPY_MBEDTLS_CONFIG_BARE_METAL (1)
 
diff --git a/ports/stm32/mbedtls/mbedtls_port.c b/ports/stm32/mbedtls/mbedtls_port.c
index 5c4f8d0f99731..cdfcd172a819d 100644
--- a/ports/stm32/mbedtls/mbedtls_port.c
+++ b/ports/stm32/mbedtls/mbedtls_port.c
@@ -27,6 +27,11 @@
 #include "rng.h"
 #include "mbedtls_config.h"
 
+#if defined(MBEDTLS_HAVE_TIME) || defined(MBEDTLS_HAVE_TIME_DATE)
+#include "rtc.h"
+#include "shared/timeutils/timeutils.h"
+#endif
+
 int mbedtls_hardware_poll(void *data, unsigned char *output, size_t len, size_t *olen) {
     uint32_t val = 0;
     int n = 0;
@@ -42,3 +47,34 @@ int mbedtls_hardware_poll(void *data, unsigned char *output, size_t len, size_t
     }
     return 0;
 }
+
+#if defined(MBEDTLS_HAVE_TIME)
+time_t stm32_rtctime_seconds(time_t *timer) {
+    rtc_init_finalise();
+    RTC_DateTypeDef date;
+    RTC_TimeTypeDef time;
+    HAL_RTC_GetTime(&RTCHandle, &time, RTC_FORMAT_BIN);
+    HAL_RTC_GetDate(&RTCHandle, &date, RTC_FORMAT_BIN);
+    return timeutils_seconds_since_epoch(2000 + date.Year, date.Month, date.Date, time.Hours, time.Minutes, time.Seconds);
+}
+#endif
+
+#if defined(MBEDTLS_HAVE_TIME_DATE)
+struct tm *gmtime(const time_t *timep) {
+    static struct tm tm;
+    timeutils_struct_time_t tm_buf = {0};
+    timeutils_seconds_since_epoch_to_struct_time(*timep, &tm_buf);
+
+    tm.tm_sec = tm_buf.tm_sec;
+    tm.tm_min = tm_buf.tm_min;
+    tm.tm_hour = tm_buf.tm_hour;
+    tm.tm_mday = tm_buf.tm_mday;
+    tm.tm_mon = tm_buf.tm_mon - 1;
+    tm.tm_year = tm_buf.tm_year - 1900;
+    tm.tm_wday = tm_buf.tm_wday;
+    tm.tm_yday = tm_buf.tm_yday;
+    tm.tm_isdst = -1;
+
+    return &tm;
+}
+#endif

From d2c284682065feb857a6e7b0921ede686d0b8a98 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Tue, 8 Nov 2022 09:02:05 +0100
Subject: [PATCH 2826/3533] stm32/Makefile: Allow overriding the default
 MBEDTLS_CONFIG_FILE.

---
 ports/stm32/Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ports/stm32/Makefile b/ports/stm32/Makefile
index e99d386e492a9..141aadcf3861f 100644
--- a/ports/stm32/Makefile
+++ b/ports/stm32/Makefile
@@ -474,7 +474,8 @@ USBDEV_SRC_C += $(addprefix $(USBDEV_DIR)/,\
 	)
 
 ifeq ($(MICROPY_SSL_MBEDTLS),1)
-CFLAGS += -DMBEDTLS_CONFIG_FILE='"mbedtls/mbedtls_config.h"'
+MBEDTLS_CONFIG_FILE ?= '"mbedtls/mbedtls_config.h"'
+CFLAGS += -DMBEDTLS_CONFIG_FILE=$(MBEDTLS_CONFIG_FILE)
 LIB_SRC_C += mbedtls/mbedtls_port.c
 endif
 

From ebb1a4ecb05ccf8347b40dee5c79940d574fe2b7 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Tue, 8 Nov 2022 09:35:35 +0100
Subject: [PATCH 2827/3533] stm32/boards/ARDUINO_PORTENTA_H7: Add custom
 mbedtls config.

---
 .../boards/ARDUINO_PORTENTA_H7/mbedtls_config_board.h     | 8 ++++++++
 ports/stm32/boards/ARDUINO_PORTENTA_H7/mpconfigboard.mk   | 1 +
 2 files changed, 9 insertions(+)
 create mode 100644 ports/stm32/boards/ARDUINO_PORTENTA_H7/mbedtls_config_board.h

diff --git a/ports/stm32/boards/ARDUINO_PORTENTA_H7/mbedtls_config_board.h b/ports/stm32/boards/ARDUINO_PORTENTA_H7/mbedtls_config_board.h
new file mode 100644
index 0000000000000..0e1703f1bf962
--- /dev/null
+++ b/ports/stm32/boards/ARDUINO_PORTENTA_H7/mbedtls_config_board.h
@@ -0,0 +1,8 @@
+#ifndef MICROPY_INCLUDED_MBEDTLS_CONFIG_BOARD_H
+#define MICROPY_INCLUDED_MBEDTLS_CONFIG_BOARD_H
+
+#define MBEDTLS_ECP_NIST_OPTIM
+
+#include "ports/stm32/mbedtls/mbedtls_config.h"
+
+#endif /* MICROPY_INCLUDED_MBEDTLS_CONFIG_BOARD_H */
diff --git a/ports/stm32/boards/ARDUINO_PORTENTA_H7/mpconfigboard.mk b/ports/stm32/boards/ARDUINO_PORTENTA_H7/mpconfigboard.mk
index 7151a5abc5d7a..3bfd40dc92458 100644
--- a/ports/stm32/boards/ARDUINO_PORTENTA_H7/mpconfigboard.mk
+++ b/ports/stm32/boards/ARDUINO_PORTENTA_H7/mpconfigboard.mk
@@ -25,3 +25,4 @@ MICROPY_PY_USSL = 1
 MICROPY_SSL_MBEDTLS = 1
 
 FROZEN_MANIFEST = $(BOARD_DIR)/manifest.py
+MBEDTLS_CONFIG_FILE = '"$(BOARD_DIR)/mbedtls_config_board.h"'

From ecd4d54391b908a55f7ac53fd0196972c96a04c9 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Tue, 8 Nov 2022 09:28:52 +0100
Subject: [PATCH 2828/3533] extmod/extmod.cmake: Allow overriding the default
 MBEDTLS_CONFIG_FILE.

---
 extmod/extmod.cmake | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/extmod/extmod.cmake b/extmod/extmod.cmake
index 954bfc7e96e1f..2207a951ad66f 100644
--- a/extmod/extmod.cmake
+++ b/extmod/extmod.cmake
@@ -187,8 +187,12 @@ if(MICROPY_SSL_MBEDTLS)
         ${MICROPY_LIB_MBEDTLS_DIR}/library/xtea.c
     )
 
+    if(NOT MBEDTLS_CONFIG_FILE)
+        set(MBEDTLS_CONFIG_FILE "${MICROPY_PORT_DIR}/mbedtls/mbedtls_config.h")
+    endif()
+
     target_compile_definitions(micropy_lib_mbedtls INTERFACE
-        MBEDTLS_CONFIG_FILE="${MICROPY_PORT_DIR}/mbedtls/mbedtls_config.h"
+        MBEDTLS_CONFIG_FILE="${MBEDTLS_CONFIG_FILE}"
     )
 
     list(APPEND MICROPY_INC_CORE

From a2fd382c34ad9ccca3bf9f0b6ca8c42db7ea6282 Mon Sep 17 00:00:00 2001
From: Jared Hancock <jared.hancock@centeredsolutions.com>
Date: Mon, 7 Nov 2022 11:21:27 -0600
Subject: [PATCH 2829/3533] extmod/modlwip: Use actual errno in exception for
 error in listen.

The actual underlying error number raised from the lwIP subsystem when
attempting to listen on a socket is swallowed and replaced with an
out-of-memory error which is confusing.

This commit passes the underlying error message from the lwIP subsystem to
the appropriate OSError exception.
---
 extmod/modlwip.c | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/extmod/modlwip.c b/extmod/modlwip.c
index f64a5a6250bae..734722f83a124 100644
--- a/extmod/modlwip.c
+++ b/extmod/modlwip.c
@@ -931,9 +931,20 @@ STATIC mp_obj_t lwip_socket_listen(size_t n_args, const mp_obj_t *args) {
         mp_raise_OSError(MP_EOPNOTSUPP);
     }
 
-    struct tcp_pcb *new_pcb = tcp_listen_with_backlog(socket->pcb.tcp, (u8_t)backlog);
+    struct tcp_pcb *new_pcb;
+    #if LWIP_VERSION_MACRO < 0x02000100
+    new_pcb = tcp_listen_with_backlog(socket->pcb.tcp, (u8_t)backlog);
+    #else
+    err_t error;
+    new_pcb = tcp_listen_with_backlog_and_err(socket->pcb.tcp, (u8_t)backlog, &error);
+    #endif
+
     if (new_pcb == NULL) {
+        #if LWIP_VERSION_MACRO < 0x02000100
         mp_raise_OSError(MP_ENOMEM);
+        #else
+        mp_raise_OSError(error_lookup_table[-error]);
+        #endif
     }
     socket->pcb.tcp = new_pcb;
 

From d0687e90ab27c064270aed648c27424d06c9814c Mon Sep 17 00:00:00 2001
From: Patrick <patrick@joytech.com.au>
Date: Wed, 9 Nov 2022 00:21:53 +1100
Subject: [PATCH 2830/3533] esp32: Add 32MiB partition table templates.

Signed-off-by: Patrick <patrick@joytech.com.au>
---
 ports/esp32/partitions-32MiB-ota.csv | 10 ++++++++++
 ports/esp32/partitions-32MiB.csv     |  7 +++++++
 2 files changed, 17 insertions(+)
 create mode 100644 ports/esp32/partitions-32MiB-ota.csv
 create mode 100644 ports/esp32/partitions-32MiB.csv

diff --git a/ports/esp32/partitions-32MiB-ota.csv b/ports/esp32/partitions-32MiB-ota.csv
new file mode 100644
index 0000000000000..7366a2ad8df79
--- /dev/null
+++ b/ports/esp32/partitions-32MiB-ota.csv
@@ -0,0 +1,10 @@
+# Partition table for MicroPython with OTA support using 32MB flash
+# Notes: the offset of the partition table itself is set in
+# $IDF_PATH/components/partition_table/Kconfig.projbuild.
+# Name,   Type, SubType, Offset,   Size,     Flags
+nvs,      data, nvs,     0x9000,   0x4000,
+otadata,  data, ota,     0xd000,   0x2000,
+phy_init, data, phy,     0xf000,   0x1000,
+ota_0,    app,  ota_0,   0x10000,  0x270000,
+ota_1,    app,  ota_1,   0x280000, 0x270000,
+vfs,      data, fat,     0x4f0000, 0x1B10000,
diff --git a/ports/esp32/partitions-32MiB.csv b/ports/esp32/partitions-32MiB.csv
new file mode 100644
index 0000000000000..31591c99495f9
--- /dev/null
+++ b/ports/esp32/partitions-32MiB.csv
@@ -0,0 +1,7 @@
+# Notes: the offset of the partition table itself is set in
+# $IDF_PATH/components/partition_table/Kconfig.projbuild.
+# Name,   Type, SubType, Offset,  Size, Flags
+nvs,      data, nvs,     0x9000,  0x6000,
+phy_init, data, phy,     0xf000,  0x1000,
+factory,  app,  factory, 0x10000, 0x1F0000,
+vfs,      data, fat,     0x200000, 0x1E00000,

From 8447fef9f9d0db8104d0e600b79870c4aafa9725 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sun, 16 Oct 2022 12:06:58 +0200
Subject: [PATCH 2831/3533] rp2/mphalport: Add a timeout to
 mp_hal_stdout_tx_strn().

If USB CDC is connected and the board sends data, but the host does not
receive the data, the device locks up.  This is fixed in this commit by
having a timeout of 500ms, after which time the transmission is skipped.

Fixes issue #9634.
---
 ports/rp2/mphalport.c | 7 ++++++-
 ports/rp2/mphalport.h | 1 +
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/ports/rp2/mphalport.c b/ports/rp2/mphalport.c
index 63ff76f5d9bf8..6ba234c662e04 100644
--- a/ports/rp2/mphalport.c
+++ b/ports/rp2/mphalport.c
@@ -139,9 +139,14 @@ void mp_hal_stdout_tx_strn(const char *str, mp_uint_t len) {
             if (n > CFG_TUD_CDC_EP_BUFSIZE) {
                 n = CFG_TUD_CDC_EP_BUFSIZE;
             }
-            while (n > tud_cdc_write_available()) {
+            int timeout = 0;
+            // Wait with a max of USC_CDC_TIMEOUT ms
+            while (n > tud_cdc_write_available() && timeout++ < MICROPY_HW_USB_CDC_TX_TIMEOUT) {
                 MICROPY_EVENT_POLL_HOOK
             }
+            if (timeout >= MICROPY_HW_USB_CDC_TX_TIMEOUT) {
+                break;
+            }
             uint32_t n2 = tud_cdc_write(str + i, n);
             tud_cdc_write_flush();
             i += n2;
diff --git a/ports/rp2/mphalport.h b/ports/rp2/mphalport.h
index 31bedf3381245..73a503f5a9a0c 100644
--- a/ports/rp2/mphalport.h
+++ b/ports/rp2/mphalport.h
@@ -33,6 +33,7 @@
 #include "RP2040.h" // cmsis, for __WFI
 
 #define SYSTICK_MAX (0xffffff)
+#define MICROPY_HW_USB_CDC_TX_TIMEOUT (500)
 
 extern int mp_interrupt_char;
 extern ringbuf_t stdin_ringbuf;

From ca63ead2d8b242296d1fc2f6965e25dfdddeec15 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sun, 16 Oct 2022 12:08:52 +0200
Subject: [PATCH 2832/3533] samd/mphalport: Add a timeout to
 mp_hal_stdout_tx_strn().

If USB CDC is connected and the board sends data, but the host does not
receive the data, the device locks up.  This is fixed in this commit by
having a timeout of 500ms, after which time the transmission is skipped.
---
 ports/samd/mphalport.c | 7 ++++++-
 ports/samd/mphalport.h | 2 ++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/ports/samd/mphalport.c b/ports/samd/mphalport.c
index b60bada480b46..44d1470fc544c 100644
--- a/ports/samd/mphalport.c
+++ b/ports/samd/mphalport.c
@@ -194,9 +194,14 @@ void mp_hal_stdout_tx_strn(const char *str, mp_uint_t len) {
             if (n > CFG_TUD_CDC_EP_BUFSIZE) {
                 n = CFG_TUD_CDC_EP_BUFSIZE;
             }
-            while (n > tud_cdc_write_available()) {
+            int timeout = 0;
+            // Wait with a max of USC_CDC_TIMEOUT ms
+            while (n > tud_cdc_write_available() && timeout++ < MICROPY_HW_USB_CDC_TX_TIMEOUT) {
                 MICROPY_EVENT_POLL_HOOK
             }
+            if (timeout >= MICROPY_HW_USB_CDC_TX_TIMEOUT) {
+                break;
+            }
             uint32_t n2 = tud_cdc_write(str + i, n);
             tud_cdc_write_flush();
             i += n2;
diff --git a/ports/samd/mphalport.h b/ports/samd/mphalport.h
index 2cbb3333f60f6..4799c575c985e 100644
--- a/ports/samd/mphalport.h
+++ b/ports/samd/mphalport.h
@@ -35,6 +35,8 @@
 #include "hpl_time_measure.h"
 #include "sam.h"
 
+#define MICROPY_HW_USB_CDC_TX_TIMEOUT (500)
+
 extern int mp_interrupt_char;
 extern volatile uint32_t systick_ms;
 uint64_t mp_hal_ticks_us_64(void);

From 5d473d309396942092077f4917be3e044c9a6c39 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sun, 16 Oct 2022 12:28:05 +0200
Subject: [PATCH 2833/3533] mimxrt/mphalport: Add a timeout to
 mp_hal_stdout_tx_strn().

If USB CDC is connected and the board sends data, but the host does not
receive the data, the device locks up.  This is fixed in this commit by
having a timeout of 500ms, after which time the transmission is skipped.
---
 ports/mimxrt/mphalport.c | 10 ++++++++--
 ports/mimxrt/mphalport.h |  2 ++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/ports/mimxrt/mphalport.c b/ports/mimxrt/mphalport.c
index 87741e0b5cf98..33f9c2691d58a 100644
--- a/ports/mimxrt/mphalport.c
+++ b/ports/mimxrt/mphalport.c
@@ -116,9 +116,15 @@ void mp_hal_stdout_tx_strn(const char *str, mp_uint_t len) {
             if (n > CFG_TUD_CDC_EP_BUFSIZE) {
                 n = CFG_TUD_CDC_EP_BUFSIZE;
             }
-            while (n > tud_cdc_write_available()) {
-                __WFE();
+            uint64_t timeout = ticks_us64() + (uint64_t)(MICROPY_HW_USB_CDC_TX_TIMEOUT * 1000);
+            // Wait with a max of USC_CDC_TIMEOUT ms
+            while (n > tud_cdc_write_available() && ticks_us64() < timeout) {
+                MICROPY_EVENT_POLL_HOOK
             }
+            if (ticks_us64() >= timeout) {
+                break;
+            }
+
             uint32_t n2 = tud_cdc_write(str + i, n);
             tud_cdc_write_flush();
             i += n2;
diff --git a/ports/mimxrt/mphalport.h b/ports/mimxrt/mphalport.h
index 30390a4a4c10f..5136a36b38057 100644
--- a/ports/mimxrt/mphalport.h
+++ b/ports/mimxrt/mphalport.h
@@ -35,6 +35,8 @@
 
 #define MICROPY_HAL_VERSION             "2.8.0"
 
+#define MICROPY_HW_USB_CDC_TX_TIMEOUT   (500)
+
 #define MP_HAL_PIN_FMT                  "%q"
 extern ringbuf_t stdin_ringbuf;
 

From d68e3b03b1053a6de0c7eb28f5989132c138364b Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sun, 16 Oct 2022 13:49:03 +0200
Subject: [PATCH 2834/3533] esp32/usb: Add a timeout to usb_tx_strn().

If USB CDC is connected and the board sends data, but the host does not
receive the data, the device locks up.  This is fixed in this commit by
having a timeout of 500ms, after which time the transmission is skipped.
---
 ports/esp32/usb.c | 3 ++-
 ports/esp32/usb.h | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/ports/esp32/usb.c b/ports/esp32/usb.c
index 5a613d24412c8..953c5422b2b2e 100644
--- a/ports/esp32/usb.c
+++ b/ports/esp32/usb.c
@@ -88,7 +88,8 @@ void usb_init(void) {
 
 void usb_tx_strn(const char *str, size_t len) {
     // Write out the data to the CDC interface, but only while the USB host is connected.
-    while (usb_cdc_connected && len) {
+    uint64_t timeout = esp_timer_get_time() + (uint64_t)(MICROPY_HW_USB_CDC_TX_TIMEOUT * 1000);
+    while (usb_cdc_connected && len && esp_timer_get_time() < timeout) {
         size_t l = tinyusb_cdcacm_write_queue(CDC_ITF, (uint8_t *)str, len);
         str += l;
         len -= l;
diff --git a/ports/esp32/usb.h b/ports/esp32/usb.h
index a1037803337f8..009bf42624d98 100644
--- a/ports/esp32/usb.h
+++ b/ports/esp32/usb.h
@@ -26,6 +26,8 @@
 #ifndef MICROPY_INCLUDED_ESP32_USB_H
 #define MICROPY_INCLUDED_ESP32_USB_H
 
+#define MICROPY_HW_USB_CDC_TX_TIMEOUT  (500)
+
 void usb_init(void);
 void usb_tx_strn(const char *str, size_t len);
 

From 345f1d23957be43e1157463a6405ba9cb04bd43d Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Tue, 8 Nov 2022 16:17:59 +0100
Subject: [PATCH 2835/3533] rp2/cyw43_configport: Make sure only core0 executes
 a __WFI().

This commit executes __WFI() on core 0 only to avoid core1 locking up since
it doesn't enable any interrupts by default (except for `SIO_IRQ_PROC1`).
This fixes a lockup when calling `cyw43_do_ioctl` from core1.

Fixes issue #9597.
---
 ports/rp2/cyw43_configport.h | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/ports/rp2/cyw43_configport.h b/ports/rp2/cyw43_configport.h
index a5ce8a9e74de6..848fb9dbf715e 100644
--- a/ports/rp2/cyw43_configport.h
+++ b/ports/rp2/cyw43_configport.h
@@ -47,8 +47,15 @@
 #define CYW43_THREAD_EXIT               MICROPY_PY_LWIP_EXIT
 #define CYW43_THREAD_LOCK_CHECK
 
-#define CYW43_SDPCM_SEND_COMMON_WAIT    __WFI();
-#define CYW43_DO_IOCTL_WAIT             __WFI();
+#define CYW43_SDPCM_SEND_COMMON_WAIT \
+    if (get_core_num() == 0) { \
+        __WFI(); \
+    } \
+
+#define CYW43_DO_IOCTL_WAIT \
+    if (get_core_num() == 0) { \
+        __WFI(); \
+    } \
 
 #define CYW43_ARRAY_SIZE(a)             MP_ARRAY_SIZE(a)
 

From 1531a7c8cad89023e3ad5e29ccd2e50b385e49d8 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 9 Nov 2022 14:48:21 +1100
Subject: [PATCH 2836/3533] lib/micropython-lib: Update submodule to latest.

This brings in mip-cmdline, espflash, use of machine.dht_readinto, and
other improvements to existing libraries.

Signed-off-by: Damien George <damien@micropython.org>
---
 lib/micropython-lib | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/micropython-lib b/lib/micropython-lib
index d0f97fc218f07..038b4ac6572d0 160000
--- a/lib/micropython-lib
+++ b/lib/micropython-lib
@@ -1 +1 @@
-Subproject commit d0f97fc218f07c381c835d9f632904c1ae1c9d6b
+Subproject commit 038b4ac6572d0d5b4c18148dc7d7fdc026369fa4

From 3bb371c5f222c833a55d7bb055ff8469fd682f39 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 9 Nov 2022 14:58:54 +1100
Subject: [PATCH 2837/3533] unix/variants: Change mip package to mip-cmdline.

mip-cmdline adds command-line support to mip, useful for the unix port, via
micropython -m mip ...

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/unix/variants/manifest.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/unix/variants/manifest.py b/ports/unix/variants/manifest.py
index e7fe747cb7976..f8e8f250ac653 100644
--- a/ports/unix/variants/manifest.py
+++ b/ports/unix/variants/manifest.py
@@ -1 +1 @@
-require("mip")
+require("mip-cmdline")

From 8afa6df23db55f54367d653e66a39ac77844fe8a Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Tue, 25 Oct 2022 10:50:09 +0200
Subject: [PATCH 2838/3533] mimxrt/modmachine: Move dht_readinto() to the
 machine module.

---
 ports/mimxrt/modmachine.c | 2 ++
 ports/mimxrt/modmimxrt.c  | 3 ---
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/ports/mimxrt/modmachine.c b/ports/mimxrt/modmachine.c
index ad4e4a59412e8..9eb2431c03d8c 100644
--- a/ports/mimxrt/modmachine.c
+++ b/ports/mimxrt/modmachine.c
@@ -26,6 +26,7 @@
  */
 
 #include "py/runtime.h"
+#include "drivers/dht/dht.h"
 #include "extmod/machine_bitstream.h"
 #include "extmod/machine_mem.h"
 #include "extmod/machine_i2c.h"
@@ -149,6 +150,7 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_bitstream),           MP_ROM_PTR(&machine_bitstream_obj) },
     #endif
     { MP_ROM_QSTR(MP_QSTR_time_pulse_us),       MP_ROM_PTR(&machine_time_pulse_us_obj) },
+    { MP_ROM_QSTR(MP_QSTR_dht_readinto),        MP_ROM_PTR(&dht_readinto_obj) },
 
     // Reset reasons
     { MP_ROM_QSTR(MP_QSTR_PWRON_RESET),         MP_ROM_INT(MP_PWRON_RESET) },
diff --git a/ports/mimxrt/modmimxrt.c b/ports/mimxrt/modmimxrt.c
index 9dd38ee07f307..4756efc0a27e7 100644
--- a/ports/mimxrt/modmimxrt.c
+++ b/ports/mimxrt/modmimxrt.c
@@ -26,14 +26,11 @@
 
 #include "py/mperrno.h"
 #include "py/runtime.h"
-#include "drivers/dht/dht.h"
 #include "modmimxrt.h"
 
 STATIC const mp_rom_map_elem_t mimxrt_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__),            MP_ROM_QSTR(MP_QSTR_mimxrt) },
     { MP_ROM_QSTR(MP_QSTR_Flash),               MP_ROM_PTR(&mimxrt_flash_type) },
-
-    { MP_ROM_QSTR(MP_QSTR_dht_readinto), MP_ROM_PTR(&dht_readinto_obj) },
 };
 STATIC MP_DEFINE_CONST_DICT(mimxrt_module_globals, mimxrt_module_globals_table);
 

From acadc0a7dc268edc37d33651f1a9788cf45cbb19 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Thu, 27 Oct 2022 16:54:44 +0200
Subject: [PATCH 2839/3533] rp2/modmachine: Move dht_readinto() to the machine
 module.

---
 ports/rp2/modmachine.c | 2 ++
 ports/rp2/modrp2.c     | 2 --
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/rp2/modmachine.c b/ports/rp2/modmachine.c
index 8058189a92b63..fc3f706a18ed1 100644
--- a/ports/rp2/modmachine.c
+++ b/ports/rp2/modmachine.c
@@ -26,6 +26,7 @@
 
 #include "py/runtime.h"
 #include "py/mphal.h"
+#include "drivers/dht/dht.h"
 #include "shared/runtime/pyexec.h"
 #include "extmod/machine_bitstream.h"
 #include "extmod/machine_i2c.h"
@@ -233,6 +234,7 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_bitstream),           MP_ROM_PTR(&machine_bitstream_obj) },
     #endif
     { MP_ROM_QSTR(MP_QSTR_time_pulse_us),       MP_ROM_PTR(&machine_time_pulse_us_obj) },
+    { MP_ROM_QSTR(MP_QSTR_dht_readinto),        MP_ROM_PTR(&dht_readinto_obj) },
 
     { MP_ROM_QSTR(MP_QSTR_mem8),                MP_ROM_PTR(&machine_mem8_obj) },
     { MP_ROM_QSTR(MP_QSTR_mem16),               MP_ROM_PTR(&machine_mem16_obj) },
diff --git a/ports/rp2/modrp2.c b/ports/rp2/modrp2.c
index 19c7ad6083a71..2601a7f443de4 100644
--- a/ports/rp2/modrp2.c
+++ b/ports/rp2/modrp2.c
@@ -56,8 +56,6 @@ STATIC const mp_rom_map_elem_t rp2_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_PIO),                 MP_ROM_PTR(&rp2_pio_type) },
     { MP_ROM_QSTR(MP_QSTR_StateMachine),        MP_ROM_PTR(&rp2_state_machine_type) },
 
-    { MP_ROM_QSTR(MP_QSTR_dht_readinto),        MP_ROM_PTR(&dht_readinto_obj) },
-
     #if MICROPY_PY_NETWORK_CYW43
     { MP_ROM_QSTR(MP_QSTR_country), MP_ROM_PTR(&rp2_country_obj) },
     #endif

From 2426ddb57502dc80248d1f8a9c8264eaab6d9a0b Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Thu, 27 Oct 2022 16:59:36 +0200
Subject: [PATCH 2840/3533] stm32/modmachine: Move dht_readinto() to the
 machine module.

---
 ports/stm32/modmachine.c | 2 ++
 ports/stm32/modpyb.c     | 4 ----
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/ports/stm32/modmachine.c b/ports/stm32/modmachine.c
index 06fdd0e2c1bd3..f51a2fd703455 100644
--- a/ports/stm32/modmachine.c
+++ b/ports/stm32/modmachine.c
@@ -32,6 +32,7 @@
 #include "py/runtime.h"
 #include "py/mperrno.h"
 #include "py/mphal.h"
+#include "drivers/dht/dht.h"
 #include "extmod/machine_bitstream.h"
 #include "extmod/machine_mem.h"
 #include "extmod/machine_signal.h"
@@ -412,6 +413,7 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     #if MICROPY_PY_MACHINE_PULSE
     { MP_ROM_QSTR(MP_QSTR_time_pulse_us),       MP_ROM_PTR(&machine_time_pulse_us_obj) },
     #endif
+    { MP_ROM_QSTR(MP_QSTR_dht_readinto),        MP_ROM_PTR(&dht_readinto_obj) },
 
     { MP_ROM_QSTR(MP_QSTR_mem8),                MP_ROM_PTR(&machine_mem8_obj) },
     { MP_ROM_QSTR(MP_QSTR_mem16),               MP_ROM_PTR(&machine_mem16_obj) },
diff --git a/ports/stm32/modpyb.c b/ports/stm32/modpyb.c
index 96e719c6bf9d2..7f87dd5820ec6 100644
--- a/ports/stm32/modpyb.c
+++ b/ports/stm32/modpyb.c
@@ -30,7 +30,6 @@
 #include "py/runtime.h"
 #include "py/mphal.h"
 #include "shared/runtime/pyexec.h"
-#include "drivers/dht/dht.h"
 #include "stm32_it.h"
 #include "irq.h"
 #include "led.h"
@@ -191,9 +190,6 @@ STATIC const mp_rom_map_elem_t pyb_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_mount), MP_ROM_PTR(&mp_vfs_mount_obj) },
     #endif
 
-    // This function is not intended to be public and may be moved elsewhere
-    { MP_ROM_QSTR(MP_QSTR_dht_readinto), MP_ROM_PTR(&dht_readinto_obj) },
-
     { MP_ROM_QSTR(MP_QSTR_Timer), MP_ROM_PTR(&pyb_timer_type) },
 
     #if MICROPY_HW_ENABLE_RNG

From a495eb432feb09d14fca02b49ff3f9ccd504a12b Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Thu, 27 Oct 2022 17:04:29 +0200
Subject: [PATCH 2841/3533] esp8266/modmachine: Move dht_readinto() to the
 machine module.

---
 ports/esp8266/modesp.c     | 2 --
 ports/esp8266/modmachine.c | 2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/esp8266/modesp.c b/ports/esp8266/modesp.c
index 645de7fe9b0a5..878d9392a16cf 100644
--- a/ports/esp8266/modesp.c
+++ b/ports/esp8266/modesp.c
@@ -31,7 +31,6 @@
 #include "py/persistentcode.h"
 #include "py/mperrno.h"
 #include "py/mphal.h"
-#include "drivers/dht/dht.h"
 #include "uart.h"
 #include "user_interface.h"
 #include "mem.h"
@@ -355,7 +354,6 @@ STATIC const mp_rom_map_elem_t esp_module_globals_table[] = {
     #if MICROPY_ESP8266_APA102
     { MP_ROM_QSTR(MP_QSTR_apa102_write), MP_ROM_PTR(&esp_apa102_write_obj) },
     #endif
-    { MP_ROM_QSTR(MP_QSTR_dht_readinto), MP_ROM_PTR(&dht_readinto_obj) },
     { MP_ROM_QSTR(MP_QSTR_freemem), MP_ROM_PTR(&esp_freemem_obj) },
     { MP_ROM_QSTR(MP_QSTR_meminfo), MP_ROM_PTR(&esp_meminfo_obj) },
     { MP_ROM_QSTR(MP_QSTR_check_fw), MP_ROM_PTR(&esp_check_fw_obj) },
diff --git a/ports/esp8266/modmachine.c b/ports/esp8266/modmachine.c
index af46cbbfe7478..3c75a2d7ffda6 100644
--- a/ports/esp8266/modmachine.c
+++ b/ports/esp8266/modmachine.c
@@ -31,6 +31,7 @@
 #include "py/obj.h"
 #include "py/runtime.h"
 #include "shared/runtime/pyexec.h"
+#include "drivers/dht/dht.h"
 
 // This needs to be set before we include the RTOS headers
 #define USE_US_TIMER 1
@@ -418,6 +419,7 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     #endif
 
     { MP_ROM_QSTR(MP_QSTR_time_pulse_us), MP_ROM_PTR(&machine_time_pulse_us_obj) },
+    { MP_ROM_QSTR(MP_QSTR_dht_readinto), MP_ROM_PTR(&dht_readinto_obj) },
 
     { MP_ROM_QSTR(MP_QSTR_RTC), MP_ROM_PTR(&pyb_rtc_type) },
     { MP_ROM_QSTR(MP_QSTR_Timer), MP_ROM_PTR(&esp_timer_type) },

From eefd946e60aba3ac61c7bfbd0272d07be289e3f3 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Thu, 27 Oct 2022 17:12:45 +0200
Subject: [PATCH 2842/3533] esp32/modmachine: Move dht_readinto() to the
 machine module.

---
 ports/esp32/modesp.c     | 3 ---
 ports/esp32/modmachine.c | 2 ++
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/ports/esp32/modesp.c b/ports/esp32/modesp.c
index 0c6429be7f1ed..f125b614bda95 100644
--- a/ports/esp32/modesp.c
+++ b/ports/esp32/modesp.c
@@ -35,7 +35,6 @@
 #include "py/runtime.h"
 #include "py/mperrno.h"
 #include "py/mphal.h"
-#include "drivers/dht/dht.h"
 
 STATIC mp_obj_t esp_osdebug(size_t n_args, const mp_obj_t *args) {
     esp_log_level_t level = LOG_LOCAL_LEVEL;
@@ -125,8 +124,6 @@ STATIC const mp_rom_map_elem_t esp_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_gpio_matrix_in), MP_ROM_PTR(&esp_gpio_matrix_in_obj) },
     { MP_ROM_QSTR(MP_QSTR_gpio_matrix_out), MP_ROM_PTR(&esp_gpio_matrix_out_obj) },
 
-    { MP_ROM_QSTR(MP_QSTR_dht_readinto), MP_ROM_PTR(&dht_readinto_obj) },
-
     // Constants for second arg of osdebug()
     { MP_ROM_QSTR(MP_QSTR_LOG_NONE), MP_ROM_INT((mp_uint_t)ESP_LOG_NONE)},
     { MP_ROM_QSTR(MP_QSTR_LOG_ERROR), MP_ROM_INT((mp_uint_t)ESP_LOG_ERROR)},
diff --git a/ports/esp32/modmachine.c b/ports/esp32/modmachine.c
index e24afd0403502..624e4d32036b5 100644
--- a/ports/esp32/modmachine.c
+++ b/ports/esp32/modmachine.c
@@ -49,6 +49,7 @@
 #include "py/obj.h"
 #include "py/runtime.h"
 #include "shared/runtime/pyexec.h"
+#include "drivers/dht/dht.h"
 #include "extmod/machine_bitstream.h"
 #include "extmod/machine_mem.h"
 #include "extmod/machine_signal.h"
@@ -295,6 +296,7 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     #if MICROPY_PY_MACHINE_PULSE
     { MP_ROM_QSTR(MP_QSTR_time_pulse_us), MP_ROM_PTR(&machine_time_pulse_us_obj) },
     #endif
+    { MP_ROM_QSTR(MP_QSTR_dht_readinto), MP_ROM_PTR(&dht_readinto_obj) },
 
     { MP_ROM_QSTR(MP_QSTR_Timer), MP_ROM_PTR(&machine_timer_type) },
     { MP_ROM_QSTR(MP_QSTR_WDT), MP_ROM_PTR(&machine_wdt_type) },

From 71881116e6442274a7c12967f02dea00eeb7568c Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Wed, 9 Nov 2022 18:35:40 +0100
Subject: [PATCH 2843/3533] extmod/extmod.mk: Set default mbedtls config file
 in extmod Makefile.

---
 extmod/extmod.mk      | 2 ++
 ports/mimxrt/Makefile | 3 +--
 ports/stm32/Makefile  | 2 --
 ports/unix/Makefile   | 3 ---
 4 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/extmod/extmod.mk b/extmod/extmod.mk
index c087e13cbd3b3..08138ead56a17 100644
--- a/extmod/extmod.mk
+++ b/extmod/extmod.mk
@@ -131,7 +131,9 @@ SRC_THIRDPARTY_C += $(addprefix $(AXTLS_DIR)/,\
 	)
 else ifeq ($(MICROPY_SSL_MBEDTLS),1)
 MBEDTLS_DIR = lib/mbedtls
+MBEDTLS_CONFIG_FILE ?= \"mbedtls/mbedtls_config.h\"
 GIT_SUBMODULES += $(MBEDTLS_DIR)
+CFLAGS_EXTMOD += -DMBEDTLS_CONFIG_FILE=$(MBEDTLS_CONFIG_FILE)
 CFLAGS_EXTMOD += -DMICROPY_SSL_MBEDTLS=1 -I$(TOP)/$(MBEDTLS_DIR)/include
 SRC_THIRDPARTY_C += lib/mbedtls_errors/mp_mbedtls_errors.c
 SRC_THIRDPARTY_C += $(addprefix $(MBEDTLS_DIR)/library/,\
diff --git a/ports/mimxrt/Makefile b/ports/mimxrt/Makefile
index ae8cf16f16eb6..c65e2a433cb3e 100644
--- a/ports/mimxrt/Makefile
+++ b/ports/mimxrt/Makefile
@@ -345,8 +345,7 @@ endif
 # All settings for Ethernet support are controller by the value of MICROPY_PY_LWIP
 ifeq ($(MICROPY_PY_LWIP),1)
 CFLAGS += \
-	-DFSL_FEATURE_PHYKSZ8081_USE_RMII50M_MODE=1 \
-	-DMBEDTLS_CONFIG_FILE='"mbedtls/mbedtls_config.h"'
+	-DFSL_FEATURE_PHYKSZ8081_USE_RMII50M_MODE=1
 endif
 
 CFLAGS += $(CFLAGS_EXTRA)
diff --git a/ports/stm32/Makefile b/ports/stm32/Makefile
index 141aadcf3861f..07d366bfea5b9 100644
--- a/ports/stm32/Makefile
+++ b/ports/stm32/Makefile
@@ -474,8 +474,6 @@ USBDEV_SRC_C += $(addprefix $(USBDEV_DIR)/,\
 	)
 
 ifeq ($(MICROPY_SSL_MBEDTLS),1)
-MBEDTLS_CONFIG_FILE ?= '"mbedtls/mbedtls_config.h"'
-CFLAGS += -DMBEDTLS_CONFIG_FILE=$(MBEDTLS_CONFIG_FILE)
 LIB_SRC_C += mbedtls/mbedtls_port.c
 endif
 
diff --git a/ports/unix/Makefile b/ports/unix/Makefile
index 360cdd6f8ce90..cd18a6ed1e570 100644
--- a/ports/unix/Makefile
+++ b/ports/unix/Makefile
@@ -134,9 +134,6 @@ endif
 ifeq ($(MICROPY_PY_USSL),1)
 ifeq ($(MICROPY_SSL_AXTLS),1)
 
-endif
-ifeq ($(MICROPY_SSL_MBEDTLS),1)
-CFLAGS += -DMBEDTLS_CONFIG_FILE='"mbedtls/mbedtls_config.h"'
 endif
 endif
 

From 0eead94181127b6e4c0084dba36b3dfd60ed6660 Mon Sep 17 00:00:00 2001
From: David Lechner <david@pybricks.com>
Date: Wed, 9 Nov 2022 12:03:31 -0600
Subject: [PATCH 2844/3533] lib/libm: Use __asm__ instead of asm.

`asm` is not part of the C standard and causes a complier error when
`-std=c99` is used. `__asm__` is the recommended alternative.

https://gcc.gnu.org/onlinedocs/gcc/extensions-to-the-c-language-family/alternate-keywords.html

Signed-off-by: David Lechner <david@pybricks.com>
---
 lib/libm/thumb_vfp_sqrtf.c    | 2 +-
 lib/libm_dbl/thumb_vfp_sqrt.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/libm/thumb_vfp_sqrtf.c b/lib/libm/thumb_vfp_sqrtf.c
index 12ffebf827090..25b8823163c6c 100644
--- a/lib/libm/thumb_vfp_sqrtf.c
+++ b/lib/libm/thumb_vfp_sqrtf.c
@@ -3,7 +3,7 @@
 #include <math.h>
 
 float sqrtf(float x) {
-    asm volatile (
+    __asm__ volatile (
             "vsqrt.f32  %[r], %[x]\n"
             : [r] "=t" (x)
             : [x] "t"  (x));
diff --git a/lib/libm_dbl/thumb_vfp_sqrt.c b/lib/libm_dbl/thumb_vfp_sqrt.c
index dd37a07b053c5..ccd33e97960f4 100644
--- a/lib/libm_dbl/thumb_vfp_sqrt.c
+++ b/lib/libm_dbl/thumb_vfp_sqrt.c
@@ -2,7 +2,7 @@
 
 double sqrt(double x) {
     double ret;
-    asm volatile (
+    __asm__ volatile (
             "vsqrt.f64  %P0, %P1\n"
             : "=w" (ret)
             : "w"  (x));

From 451ded8d7b746bf73a1f4a4db500716cb7587257 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 10 Nov 2022 11:42:51 +1100
Subject: [PATCH 2845/3533] tests/basics: Add exp file for builtin_str_hex
 test.

Because bytes.hex() only supports the sep argument since Python 3.8.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/basics/builtin_str_hex.py.exp | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 tests/basics/builtin_str_hex.py.exp

diff --git a/tests/basics/builtin_str_hex.py.exp b/tests/basics/builtin_str_hex.py.exp
new file mode 100644
index 0000000000000..990dd8570767e
--- /dev/null
+++ b/tests/basics/builtin_str_hex.py.exp
@@ -0,0 +1,28 @@
+0001020304050607
+0001020304050607
+0001020304050607
+00:01:02:03:04:05:06:07
+00:01:02:03:04:05:06:07
+00:01:02:03:04:05:06:07
+08090a0b0c0d0e0f
+08090a0b0c0d0e0f
+08090a0b0c0d0e0f
+08:09:0a:0b:0c:0d:0e:0f
+08:09:0a:0b:0c:0d:0e:0f
+08:09:0a:0b:0c:0d:0e:0f
+7f80ff
+7f80ff
+7f80ff
+7f:80:ff
+7f:80:ff
+7f:80:ff
+313233344142434461626364
+313233344142434461626364
+313233344142434461626364
+31:32:33:34:41:42:43:44:61:62:63:64
+31:32:33:34:41:42:43:44:61:62:63:64
+31:32:33:34:41:42:43:44:61:62:63:64
+b'\x00\x01\x02\x03\x04\x05\x06\x07'
+b'\x08\t\n\x0b\x0c\r\x0e\x0f'
+b'\x7f\x80\xff'
+b'1234ABCDabcd'

From 0698dd72ea3b9d7897e63c6e219061bff8d162cf Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 11 Nov 2022 12:25:32 +1100
Subject: [PATCH 2846/3533] py/emitnative: Ensure load_subscr does not clobber
 existing REG_ARG_2.

Follow up from a similar fix in 426785a19eeb12aef7383fbda4693575d8c4dddf

Fixes issue #6314.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/emitnative.c                             |  3 +++
 tests/micropython/viper_subscr_multi.py     | 17 +++++++++++++----
 tests/micropython/viper_subscr_multi.py.exp |  1 +
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/py/emitnative.c b/py/emitnative.c
index 7e98ba1556073..2d694983bd2ab 100644
--- a/py/emitnative.c
+++ b/py/emitnative.c
@@ -1527,6 +1527,7 @@ STATIC void emit_native_load_subscr(emit_t *emit) {
                             break;
                         }
                         #endif
+                        need_reg_single(emit, reg_index, 0);
                         ASM_MOV_REG_IMM(emit->as, reg_index, index_value);
                         ASM_ADD_REG_REG(emit->as, reg_index, reg_base); // add index to base
                         reg_base = reg_index;
@@ -1544,6 +1545,7 @@ STATIC void emit_native_load_subscr(emit_t *emit) {
                             break;
                         }
                         #endif
+                        need_reg_single(emit, reg_index, 0);
                         ASM_MOV_REG_IMM(emit->as, reg_index, index_value << 1);
                         ASM_ADD_REG_REG(emit->as, reg_index, reg_base); // add 2*index to base
                         reg_base = reg_index;
@@ -1561,6 +1563,7 @@ STATIC void emit_native_load_subscr(emit_t *emit) {
                             break;
                         }
                         #endif
+                        need_reg_single(emit, reg_index, 0);
                         ASM_MOV_REG_IMM(emit->as, reg_index, index_value << 2);
                         ASM_ADD_REG_REG(emit->as, reg_index, reg_base); // add 4*index to base
                         reg_base = reg_index;
diff --git a/tests/micropython/viper_subscr_multi.py b/tests/micropython/viper_subscr_multi.py
index 1561e5534db57..a2baba2411681 100644
--- a/tests/micropython/viper_subscr_multi.py
+++ b/tests/micropython/viper_subscr_multi.py
@@ -6,15 +6,24 @@ def f1(b: ptr8):
     b[0] += b[1]
 
 
+b = bytearray(b"\x01\x02")
+f1(b)
+print(b)
+
+
 @micropython.viper
 def f2(b: ptr8, i: int):
     b[0] += b[i]
 
 
-b = bytearray(b"\x01\x02")
-f1(b)
-print(b)
-
 b = bytearray(b"\x01\x02")
 f2(b, 1)
 print(b)
+
+
+@micropython.viper
+def f3(b: ptr8) -> int:
+    return b[0] << 24 | b[1] << 16 | b[2] << 8 | b[3]
+
+
+print(hex(f3(b"\x01\x02\x03\x04")))
diff --git a/tests/micropython/viper_subscr_multi.py.exp b/tests/micropython/viper_subscr_multi.py.exp
index a2c298bb16c91..ea644c046d85c 100644
--- a/tests/micropython/viper_subscr_multi.py.exp
+++ b/tests/micropython/viper_subscr_multi.py.exp
@@ -1,2 +1,3 @@
 bytearray(b'\x03\x02')
 bytearray(b'\x03\x02')
+0x1020304

From ea07ab04f80dbabd050aef972119e72c133aaa09 Mon Sep 17 00:00:00 2001
From: David Lechner <david@pybricks.com>
Date: Wed, 9 Nov 2022 12:27:28 -0600
Subject: [PATCH 2847/3533] webassembly/library: Make use of CustomEvent detail
 property.

This changes the CustomEvent for stdout to use the existing `detail`
property of CustomEvent instead of adding a `data` property.

Signed-off-by: David Lechner <david@pybricks.com>
---
 ports/webassembly/README.md  | 2 +-
 ports/webassembly/library.js | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/ports/webassembly/README.md b/ports/webassembly/README.md
index 9ad04ccb980d3..89b8b1def7355 100644
--- a/ports/webassembly/README.md
+++ b/ports/webassembly/README.md
@@ -70,7 +70,7 @@ something to stdout.  The following code demonstrates basic functionality:
     <script>
       document.addEventListener("micropython-print", function(e) {
         let output = document.getElementById("micropython-stdout");
-        output.innerText += e.data;
+        output.innerText += e.detail;
       }, false);
 
       var mp_js_startup = Module["onRuntimeInitialized"];
diff --git a/ports/webassembly/library.js b/ports/webassembly/library.js
index 6d9b07cfffd75..fb31b0fe56033 100644
--- a/ports/webassembly/library.js
+++ b/ports/webassembly/library.js
@@ -33,8 +33,7 @@ mergeInto(LibraryManager.library, {
                 process.stdout.write(b);
             } else {
                 var c = String.fromCharCode(getValue(ptr + i, 'i8'));
-                var printEvent = new CustomEvent('micropython-print');
-                printEvent.data = c;
+                var printEvent = new CustomEvent('micropython-print', { detail: c });
                 document.dispatchEvent(printEvent);
             }
         }

From b3e38ac632e6e38555f539e73a24c43053ae71f6 Mon Sep 17 00:00:00 2001
From: Angus Gratton <gus@projectgus.com>
Date: Fri, 8 Jul 2022 12:47:52 +1000
Subject: [PATCH 2848/3533] stm32/spi: Downgrade SPIHandle definitions to
 static.

Seems unused outside of spi.c, spi_obj[] array is the expected way to
iterate these.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/stm32/spi.c | 12 ++++++------
 ports/stm32/spi.h |  7 -------
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/ports/stm32/spi.c b/ports/stm32/spi.c
index e21ebcd02b9da..946e83e43a985 100644
--- a/ports/stm32/spi.c
+++ b/ports/stm32/spi.c
@@ -47,22 +47,22 @@
 // SPI6_RX: DMA2_Stream6.CHANNEL_1
 
 #if defined(MICROPY_HW_SPI1_SCK)
-SPI_HandleTypeDef SPIHandle1 = {.Instance = NULL};
+STATIC SPI_HandleTypeDef SPIHandle1 = {.Instance = NULL};
 #endif
 #if defined(MICROPY_HW_SPI2_SCK)
-SPI_HandleTypeDef SPIHandle2 = {.Instance = NULL};
+STATIC SPI_HandleTypeDef SPIHandle2 = {.Instance = NULL};
 #endif
 #if defined(MICROPY_HW_SPI3_SCK)
-SPI_HandleTypeDef SPIHandle3 = {.Instance = NULL};
+STATIC SPI_HandleTypeDef SPIHandle3 = {.Instance = NULL};
 #endif
 #if defined(MICROPY_HW_SPI4_SCK)
-SPI_HandleTypeDef SPIHandle4 = {.Instance = NULL};
+STATIC SPI_HandleTypeDef SPIHandle4 = {.Instance = NULL};
 #endif
 #if defined(MICROPY_HW_SPI5_SCK)
-SPI_HandleTypeDef SPIHandle5 = {.Instance = NULL};
+STATIC SPI_HandleTypeDef SPIHandle5 = {.Instance = NULL};
 #endif
 #if defined(MICROPY_HW_SPI6_SCK)
-SPI_HandleTypeDef SPIHandle6 = {.Instance = NULL};
+STATIC SPI_HandleTypeDef SPIHandle6 = {.Instance = NULL};
 #endif
 
 const spi_t spi_obj[6] = {
diff --git a/ports/stm32/spi.h b/ports/stm32/spi.h
index ef3d718cddfd4..b2aceafbf515c 100644
--- a/ports/stm32/spi.h
+++ b/ports/stm32/spi.h
@@ -54,13 +54,6 @@ typedef struct _machine_hard_spi_obj_t {
     const spi_t *spi;
 } machine_hard_spi_obj_t;
 
-extern SPI_HandleTypeDef SPIHandle1;
-extern SPI_HandleTypeDef SPIHandle2;
-extern SPI_HandleTypeDef SPIHandle3;
-extern SPI_HandleTypeDef SPIHandle4;
-extern SPI_HandleTypeDef SPIHandle5;
-extern SPI_HandleTypeDef SPIHandle6;
-
 extern const spi_t spi_obj[6];
 
 extern const mp_spi_proto_t spi_proto;

From 86c3c1d80dcd210be9d13d9e951f761a6e8ee994 Mon Sep 17 00:00:00 2001
From: Chris Swan <478926+cpswan@users.noreply.github.com>
Date: Thu, 10 Nov 2022 15:50:38 +0000
Subject: [PATCH 2849/3533] github/workflows: Bump actions/checkout to v3.

The existing actions/checkout@v2 is causing Node v12 deprecation warnings
to be shown in GitHub Actions.  v3 uses Node v16, which will stop the
warnings.
---
 .github/workflows/code_formatting.yml   |  2 +-
 .github/workflows/code_size.yml         |  2 +-
 .github/workflows/commit_formatting.yml |  2 +-
 .github/workflows/docs.yml              |  2 +-
 .github/workflows/examples.yml          |  2 +-
 .github/workflows/mpy_format.yml        |  2 +-
 .github/workflows/ports.yml             |  2 +-
 .github/workflows/ports_cc3200.yml      |  2 +-
 .github/workflows/ports_esp32.yml       |  4 ++--
 .github/workflows/ports_esp8266.yml     |  2 +-
 .github/workflows/ports_mimxrt.yml      |  2 +-
 .github/workflows/ports_nrf.yml         |  2 +-
 .github/workflows/ports_powerpc.yml     |  2 +-
 .github/workflows/ports_qemu-arm.yml    |  2 +-
 .github/workflows/ports_renesas-ra.yml  |  2 +-
 .github/workflows/ports_rp2.yml         |  2 +-
 .github/workflows/ports_samd.yml        |  2 +-
 .github/workflows/ports_stm32.yml       |  4 ++--
 .github/workflows/ports_teensy.yml      |  2 +-
 .github/workflows/ports_unix.yml        | 28 ++++++++++++-------------
 .github/workflows/ports_webassembly.yml |  2 +-
 .github/workflows/ports_windows.yml     |  2 +-
 .github/workflows/ports_zephyr.yml      |  2 +-
 23 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/.github/workflows/code_formatting.yml b/.github/workflows/code_formatting.yml
index 5c0196d2edbfa..49336941dcfbf 100644
--- a/.github/workflows/code_formatting.yml
+++ b/.github/workflows/code_formatting.yml
@@ -6,7 +6,7 @@ jobs:
   build:
     runs-on: ubuntu-22.04
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - uses: actions/setup-python@v1
     - name: Install packages
       run: source tools/ci.sh && ci_code_formatting_setup
diff --git a/.github/workflows/code_size.yml b/.github/workflows/code_size.yml
index 7570261e7d23b..3811d91349918 100644
--- a/.github/workflows/code_size.yml
+++ b/.github/workflows/code_size.yml
@@ -16,7 +16,7 @@ jobs:
   build:
     runs-on: ubuntu-20.04
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
       with:
         fetch-depth: 100
     - name: Install packages
diff --git a/.github/workflows/commit_formatting.yml b/.github/workflows/commit_formatting.yml
index 5f96fbb934426..08e38f95059b2 100644
--- a/.github/workflows/commit_formatting.yml
+++ b/.github/workflows/commit_formatting.yml
@@ -6,7 +6,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
       with:
         fetch-depth: '100'
     - uses: actions/setup-python@v1
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index ec6b4c7f1962a..0803e4b3e0ac9 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - uses: actions/setup-python@v1
     - name: Install Python packages
       run: pip install Sphinx
diff --git a/.github/workflows/examples.yml b/.github/workflows/examples.yml
index 53a817af2b313..d50af705fef9d 100644
--- a/.github/workflows/examples.yml
+++ b/.github/workflows/examples.yml
@@ -14,7 +14,7 @@ jobs:
   embedding:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Build
       run: make -C examples/embedding
     - name: Run
diff --git a/.github/workflows/mpy_format.yml b/.github/workflows/mpy_format.yml
index ab90bb339aa1b..d3b7a27642e55 100644
--- a/.github/workflows/mpy_format.yml
+++ b/.github/workflows/mpy_format.yml
@@ -11,7 +11,7 @@ jobs:
   test:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Install packages
       run: source tools/ci.sh && ci_mpy_format_setup
     - name: Test mpy-tool.py
diff --git a/.github/workflows/ports.yml b/.github/workflows/ports.yml
index e9e6de284cfae..41540d5b983b2 100644
--- a/.github/workflows/ports.yml
+++ b/.github/workflows/ports.yml
@@ -13,6 +13,6 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Build ports download metadata
       run: mkdir boards && ./tools/autobuild/build-downloads.py . ./boards
diff --git a/.github/workflows/ports_cc3200.yml b/.github/workflows/ports_cc3200.yml
index 0eaa36da3796e..879eedea246b1 100644
--- a/.github/workflows/ports_cc3200.yml
+++ b/.github/workflows/ports_cc3200.yml
@@ -16,7 +16,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Install packages
       run: source tools/ci.sh && ci_cc3200_setup
     - name: Build
diff --git a/.github/workflows/ports_esp32.yml b/.github/workflows/ports_esp32.yml
index de88de3755421..a5df4b7bbc56a 100644
--- a/.github/workflows/ports_esp32.yml
+++ b/.github/workflows/ports_esp32.yml
@@ -16,7 +16,7 @@ jobs:
   build_idf402:
     runs-on: ubuntu-20.04
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Install packages
       run: source tools/ci.sh && ci_esp32_idf402_setup
     - name: Build
@@ -25,7 +25,7 @@ jobs:
   build_idf44:
     runs-on: ubuntu-20.04
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Install packages
       run: source tools/ci.sh && ci_esp32_idf44_setup
     - name: Build
diff --git a/.github/workflows/ports_esp8266.yml b/.github/workflows/ports_esp8266.yml
index f4ce1f8212d87..27be97d5bb8dd 100644
--- a/.github/workflows/ports_esp8266.yml
+++ b/.github/workflows/ports_esp8266.yml
@@ -16,7 +16,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Install packages
       run: source tools/ci.sh && ci_esp8266_setup && ci_esp8266_path >> $GITHUB_PATH
     - name: Build
diff --git a/.github/workflows/ports_mimxrt.yml b/.github/workflows/ports_mimxrt.yml
index 8fbc2209e4139..a98170f3539c9 100644
--- a/.github/workflows/ports_mimxrt.yml
+++ b/.github/workflows/ports_mimxrt.yml
@@ -16,7 +16,7 @@ jobs:
   build:
     runs-on: ubuntu-20.04
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Install packages
       run: source tools/ci.sh && ci_mimxrt_setup
     - name: Build
diff --git a/.github/workflows/ports_nrf.yml b/.github/workflows/ports_nrf.yml
index 1ba3b0ce61e96..b13d229841182 100644
--- a/.github/workflows/ports_nrf.yml
+++ b/.github/workflows/ports_nrf.yml
@@ -16,7 +16,7 @@ jobs:
   build:
     runs-on: ubuntu-20.04
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Install packages
       run: source tools/ci.sh && ci_nrf_setup
     - name: Build
diff --git a/.github/workflows/ports_powerpc.yml b/.github/workflows/ports_powerpc.yml
index 88fa59767b756..03f6c87560122 100644
--- a/.github/workflows/ports_powerpc.yml
+++ b/.github/workflows/ports_powerpc.yml
@@ -16,7 +16,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Install packages
       run: source tools/ci.sh && ci_powerpc_setup
     - name: Build
diff --git a/.github/workflows/ports_qemu-arm.yml b/.github/workflows/ports_qemu-arm.yml
index 0489a93d5ad16..88ea6e52824be 100644
--- a/.github/workflows/ports_qemu-arm.yml
+++ b/.github/workflows/ports_qemu-arm.yml
@@ -17,7 +17,7 @@ jobs:
   build_and_test:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Install packages
       run: source tools/ci.sh && ci_qemu_arm_setup
     - name: Build and run test suite
diff --git a/.github/workflows/ports_renesas-ra.yml b/.github/workflows/ports_renesas-ra.yml
index 20e068ee75d75..f363109e98cc1 100644
--- a/.github/workflows/ports_renesas-ra.yml
+++ b/.github/workflows/ports_renesas-ra.yml
@@ -16,7 +16,7 @@ jobs:
   build_renesas_ra_board:
     runs-on: ubuntu-20.04
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Install packages
       run: source tools/ci.sh && ci_renesas_ra_setup
     - name: Build
diff --git a/.github/workflows/ports_rp2.yml b/.github/workflows/ports_rp2.yml
index 668b79cae256c..d4367a21fba95 100644
--- a/.github/workflows/ports_rp2.yml
+++ b/.github/workflows/ports_rp2.yml
@@ -16,7 +16,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Install packages
       run: source tools/ci.sh && ci_rp2_setup
     - name: Build
diff --git a/.github/workflows/ports_samd.yml b/.github/workflows/ports_samd.yml
index bde4ed965faa0..a9d18c35a14d2 100644
--- a/.github/workflows/ports_samd.yml
+++ b/.github/workflows/ports_samd.yml
@@ -16,7 +16,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Install packages
       run: source tools/ci.sh && ci_samd_setup
     - name: Build
diff --git a/.github/workflows/ports_stm32.yml b/.github/workflows/ports_stm32.yml
index 4634339c96a6a..08e1e590759f9 100644
--- a/.github/workflows/ports_stm32.yml
+++ b/.github/workflows/ports_stm32.yml
@@ -16,7 +16,7 @@ jobs:
   build_pyb:
     runs-on: ubuntu-20.04
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Install packages
       run: source tools/ci.sh && ci_stm32_setup
     - name: Build
@@ -25,7 +25,7 @@ jobs:
   build_nucleo:
     runs-on: ubuntu-20.04
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Install packages
       run: source tools/ci.sh && ci_stm32_setup
     - name: Build
diff --git a/.github/workflows/ports_teensy.yml b/.github/workflows/ports_teensy.yml
index 7ae77c80af604..ee461d002ffdd 100644
--- a/.github/workflows/ports_teensy.yml
+++ b/.github/workflows/ports_teensy.yml
@@ -16,7 +16,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Install packages
       run: source tools/ci.sh && ci_teensy_setup
     - name: Build
diff --git a/.github/workflows/ports_unix.yml b/.github/workflows/ports_unix.yml
index 3b738634a67fe..3087ebfd802ca 100644
--- a/.github/workflows/ports_unix.yml
+++ b/.github/workflows/ports_unix.yml
@@ -17,7 +17,7 @@ jobs:
   minimal:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Build
       run: source tools/ci.sh && ci_unix_minimal_build
     - name: Run main test suite
@@ -29,7 +29,7 @@ jobs:
   reproducible:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Build with reproducible date
       run: source tools/ci.sh && ci_unix_minimal_build
       env:
@@ -40,7 +40,7 @@ jobs:
   standard:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Build
       run: source tools/ci.sh && ci_unix_standard_build
     - name: Run main test suite
@@ -52,7 +52,7 @@ jobs:
   coverage:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Install packages
       run: source tools/ci.sh && ci_unix_coverage_setup
     - name: Build
@@ -81,7 +81,7 @@ jobs:
   coverage_32bit:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Install packages
       run: source tools/ci.sh && ci_unix_32bit_setup
     - name: Build
@@ -99,7 +99,7 @@ jobs:
   nanbox:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Install packages
       run: source tools/ci.sh && ci_unix_32bit_setup
     - name: Build
@@ -113,7 +113,7 @@ jobs:
   float:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Build
       run: source tools/ci.sh && ci_unix_float_build
     - name: Run main test suite
@@ -125,7 +125,7 @@ jobs:
   stackless_clang:
     runs-on: ubuntu-20.04
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Install packages
       run: source tools/ci.sh && ci_unix_clang_setup
     - name: Build
@@ -139,7 +139,7 @@ jobs:
   float_clang:
     runs-on: ubuntu-20.04
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Install packages
       run: source tools/ci.sh && ci_unix_clang_setup
     - name: Build
@@ -153,7 +153,7 @@ jobs:
   settrace:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Build
       run: source tools/ci.sh && ci_unix_settrace_build
     - name: Run main test suite
@@ -165,7 +165,7 @@ jobs:
   settrace_stackless:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Build
       run: source tools/ci.sh && ci_unix_settrace_stackless_build
     - name: Run main test suite
@@ -177,7 +177,7 @@ jobs:
   macos:
     runs-on: macos-11.0
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - uses: actions/setup-python@v2
       with:
         python-version: '3.8'
@@ -192,7 +192,7 @@ jobs:
   qemu_mips:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Install packages
       run: source tools/ci.sh && ci_unix_qemu_mips_setup
     - name: Build
@@ -206,7 +206,7 @@ jobs:
   qemu_arm:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Install packages
       run: source tools/ci.sh && ci_unix_qemu_arm_setup
     - name: Build
diff --git a/.github/workflows/ports_webassembly.yml b/.github/workflows/ports_webassembly.yml
index 49c04c7d2131b..16b63c1f7e494 100644
--- a/.github/workflows/ports_webassembly.yml
+++ b/.github/workflows/ports_webassembly.yml
@@ -15,7 +15,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Install packages
       run: source tools/ci.sh && ci_webassembly_setup
     - name: Build
diff --git a/.github/workflows/ports_windows.yml b/.github/workflows/ports_windows.yml
index 1bfe40c7fded2..582f80df988bc 100644
--- a/.github/workflows/ports_windows.yml
+++ b/.github/workflows/ports_windows.yml
@@ -16,7 +16,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Install packages
       run: source tools/ci.sh && ci_windows_setup
     - name: Build
diff --git a/.github/workflows/ports_zephyr.yml b/.github/workflows/ports_zephyr.yml
index d9ae2b8c55a2a..9b4c8638707c5 100644
--- a/.github/workflows/ports_zephyr.yml
+++ b/.github/workflows/ports_zephyr.yml
@@ -15,7 +15,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Install packages
       run: source tools/ci.sh && ci_zephyr_setup
     - name: Install Zephyr

From 90c7568ca4c54168e494316da184014e511ecf62 Mon Sep 17 00:00:00 2001
From: Chris Swan <478926+cpswan@users.noreply.github.com>
Date: Thu, 10 Nov 2022 15:52:50 +0000
Subject: [PATCH 2850/3533] github: Add dependabot to update GitHub Actions.

Add a dependabot.yml file so that workflows will be checked daily and Pull
Requests automatically raised when newer Actions are available.
---
 .github/dependabot.yml | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 .github/dependabot.yml

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 0000000000000..2c7d1708395e2
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,7 @@
+version: 2
+updates:
+  # Maintain dependencies for GitHub Actions
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"

From 846aa1f13a9c374f3500f93cba3abc790f5c571c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 11 Nov 2022 02:27:23 +0000
Subject: [PATCH 2851/3533] github/workflows: Bump codecov/codecov-action from
 1 to 3.

Bumps [codecov/codecov-action](https://github.com/codecov/codecov-action)
from 1 to 3.
- [Release notes](https://github.com/codecov/codecov-action/releases)
- [Changelog](https://github.com/codecov/codecov-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/codecov/codecov-action/compare/v1...v3)

---
updated-dependencies:
- dependency-name: codecov/codecov-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/ports_unix.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ports_unix.yml b/.github/workflows/ports_unix.yml
index 3087ebfd802ca..201f96a0326b1 100644
--- a/.github/workflows/ports_unix.yml
+++ b/.github/workflows/ports_unix.yml
@@ -70,7 +70,7 @@ jobs:
         (cd ports/unix && gcov -o build-coverage/py ../../py/*.c || true)
         (cd ports/unix && gcov -o build-coverage/extmod ../../extmod/*.c || true)
     - name: Upload coverage to Codecov
-      uses: codecov/codecov-action@v1
+      uses: codecov/codecov-action@v3
       with:
         fail_ci_if_error: true
         verbose: true

From ada76021c0aad0982b6b96a1a3de73ecc86370ed Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 11 Nov 2022 02:27:28 +0000
Subject: [PATCH 2852/3533] github/workflows: Bump actions/setup-python from 1
 or 2 to 4.

Bumps [actions/setup-python](https://github.com/actions/setup-python) from
1 or 2 to 4.
- [Release notes](https://github.com/actions/setup-python/releases)
- [Commits](https://github.com/actions/setup-python/compare/v2...v4)

---
updated-dependencies:
- dependency-name: actions/setup-python
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/code_formatting.yml   | 2 +-
 .github/workflows/commit_formatting.yml | 2 +-
 .github/workflows/docs.yml              | 2 +-
 .github/workflows/ports_unix.yml        | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/code_formatting.yml b/.github/workflows/code_formatting.yml
index 49336941dcfbf..4ca020a877859 100644
--- a/.github/workflows/code_formatting.yml
+++ b/.github/workflows/code_formatting.yml
@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
     - uses: actions/checkout@v3
-    - uses: actions/setup-python@v1
+    - uses: actions/setup-python@v4
     - name: Install packages
       run: source tools/ci.sh && ci_code_formatting_setup
     - name: Run code formatting
diff --git a/.github/workflows/commit_formatting.yml b/.github/workflows/commit_formatting.yml
index 08e38f95059b2..2fb959e5b3b0e 100644
--- a/.github/workflows/commit_formatting.yml
+++ b/.github/workflows/commit_formatting.yml
@@ -9,6 +9,6 @@ jobs:
     - uses: actions/checkout@v3
       with:
         fetch-depth: '100'
-    - uses: actions/setup-python@v1
+    - uses: actions/setup-python@v4
     - name: Check commit message formatting
       run: source tools/ci.sh && ci_commit_formatting_run
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index 0803e4b3e0ac9..431d5c498e981 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -11,7 +11,7 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
-    - uses: actions/setup-python@v1
+    - uses: actions/setup-python@v4
     - name: Install Python packages
       run: pip install Sphinx
     - name: Build docs
diff --git a/.github/workflows/ports_unix.yml b/.github/workflows/ports_unix.yml
index 201f96a0326b1..46b90fc70efc4 100644
--- a/.github/workflows/ports_unix.yml
+++ b/.github/workflows/ports_unix.yml
@@ -178,7 +178,7 @@ jobs:
     runs-on: macos-11.0
     steps:
     - uses: actions/checkout@v3
-    - uses: actions/setup-python@v2
+    - uses: actions/setup-python@v4
       with:
         python-version: '3.8'
     - name: Build

From 5de8d7eb6485a724b439b53fb230d87500d45c83 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 10 Nov 2022 11:00:07 +1100
Subject: [PATCH 2853/3533] lib/btstack: Update to v1.5.4.

This update includes a few bug fixes for BLE, support for LE audio, updates
to classic BT support, cmake support, and other things.

Signed-off-by: Damien George <damien@micropython.org>
---
 lib/btstack | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/btstack b/lib/btstack
index 87087689bb0c3..1635e36d06821 160000
--- a/lib/btstack
+++ b/lib/btstack
@@ -1 +1 @@
-Subproject commit 87087689bb0c37ff4b9b3e3ba670b7019c306ebd
+Subproject commit 1635e36d06821af8b61302509e91bfcc1ade84c4

From 9c9f06ad9dbf49ffd2fe0d336091f4293e403ee7 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 10 Nov 2022 11:02:12 +1100
Subject: [PATCH 2854/3533] extmod/btstack: Allow the BTstack config to be
 overridden by a board.

If a board defines MICROPY_BLUETOOTH_BTSTACK_CONFIG_FILE as the path to a
header file, then that file will be used for the BTstack config.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/btstack/btstack.mk              |  2 ++
 extmod/btstack/btstack_config.h        | 44 +----------------------
 extmod/btstack/btstack_config_common.h | 48 ++++++++++++++++++++++++++
 3 files changed, 51 insertions(+), 43 deletions(-)
 create mode 100644 extmod/btstack/btstack_config_common.h

diff --git a/extmod/btstack/btstack.mk b/extmod/btstack/btstack.mk
index ca95931562cde..ef730d2cf33eb 100644
--- a/extmod/btstack/btstack.mk
+++ b/extmod/btstack/btstack.mk
@@ -6,6 +6,7 @@ GIT_SUBMODULES += lib/btstack
 
 MICROPY_BLUETOOTH_BTSTACK_USB ?= 0
 MICROPY_BLUETOOTH_BTSTACK_H4 ?= 1
+MICROPY_BLUETOOTH_BTSTACK_CONFIG_FILE ?= '"extmod/btstack/btstack_config_common.h"'
 
 BTSTACK_EXTMOD_DIR = extmod/btstack
 
@@ -14,6 +15,7 @@ SRC_EXTMOD_C += $(BTSTACK_EXTMOD_DIR)/modbluetooth_btstack.c
 INC += -I$(TOP)/$(BTSTACK_EXTMOD_DIR)
 
 CFLAGS_EXTMOD += -DMICROPY_BLUETOOTH_BTSTACK=1
+CFLAGS_EXTMOD += -DMICROPY_BLUETOOTH_BTSTACK_CONFIG_FILE=$(MICROPY_BLUETOOTH_BTSTACK_CONFIG_FILE)
 CFLAGS_EXTMOD += -DMICROPY_PY_BLUETOOTH_USE_SYNC_EVENTS=1
 CFLAGS_EXTMOD += -DMICROPY_PY_BLUETOOTH_ENABLE_PAIRING_BONDING=1
 
diff --git a/extmod/btstack/btstack_config.h b/extmod/btstack/btstack_config.h
index 7de938cb6f7e1..84f0dab2bdb42 100644
--- a/extmod/btstack/btstack_config.h
+++ b/extmod/btstack/btstack_config.h
@@ -1,48 +1,6 @@
 #ifndef MICROPY_INCLUDED_EXTMOD_BTSTACK_BTSTACK_CONFIG_H
 #define MICROPY_INCLUDED_EXTMOD_BTSTACK_BTSTACK_CONFIG_H
 
-// BTstack features that can be enabled
-#define ENABLE_BLE
-#define ENABLE_LE_PERIPHERAL
-#define ENABLE_LE_CENTRAL
-// #define ENABLE_CLASSIC
-#define ENABLE_L2CAP_LE_CREDIT_BASED_FLOW_CONTROL_MODE
-// #define ENABLE_LOG_INFO
-// #define ENABLE_LOG_DEBUG
-#define ENABLE_LOG_ERROR
-
-// BTstack configuration. buffers, sizes, ...
-#define HCI_ACL_PAYLOAD_SIZE 1021
-#define MAX_NR_GATT_CLIENTS 1
-#define MAX_NR_HCI_CONNECTIONS 1
-#define MAX_NR_L2CAP_SERVICES  3
-#define MAX_NR_L2CAP_CHANNELS  3
-#define MAX_NR_RFCOMM_MULTIPLEXERS 1
-#define MAX_NR_RFCOMM_SERVICES 1
-#define MAX_NR_RFCOMM_CHANNELS 1
-#define MAX_NR_BTSTACK_LINK_KEY_DB_MEMORY_ENTRIES  2
-#define MAX_NR_BNEP_SERVICES 1
-#define MAX_NR_BNEP_CHANNELS 1
-#define MAX_NR_HFP_CONNECTIONS 1
-#define MAX_NR_WHITELIST_ENTRIES 1
-#define MAX_NR_SM_LOOKUP_ENTRIES 3
-#define MAX_NR_SERVICE_RECORD_ITEMS 1
-#define MAX_NR_AVDTP_STREAM_ENDPOINTS 1
-#define MAX_NR_AVDTP_CONNECTIONS 1
-#define MAX_NR_AVRCP_CONNECTIONS 1
-
-#define MAX_NR_LE_DEVICE_DB_ENTRIES 4
-
-// Link Key DB and LE Device DB using TLV on top of Flash Sector interface
-// #define NVM_NUM_DEVICE_DB_ENTRIES 16
-
-// We don't give btstack a malloc, so use a fixed-size ATT DB.
-#define MAX_ATT_DB_SIZE 512
-
-// BTstack HAL configuration
-#define HAVE_EMBEDDED_TIME_MS
-
-// Some USB dongles take longer to respond to HCI reset (e.g. BCM20702A).
-#define HCI_RESET_RESEND_TIMEOUT_MS 1000
+#include MICROPY_BLUETOOTH_BTSTACK_CONFIG_FILE
 
 #endif // MICROPY_INCLUDED_EXTMOD_BTSTACK_BTSTACK_CONFIG_H
diff --git a/extmod/btstack/btstack_config_common.h b/extmod/btstack/btstack_config_common.h
new file mode 100644
index 0000000000000..8118c4c1a958d
--- /dev/null
+++ b/extmod/btstack/btstack_config_common.h
@@ -0,0 +1,48 @@
+#ifndef MICROPY_INCLUDED_EXTMOD_BTSTACK_BTSTACK_CONFIG_COMMON_H
+#define MICROPY_INCLUDED_EXTMOD_BTSTACK_BTSTACK_CONFIG_COMMON_H
+
+// BTstack features that can be enabled
+#define ENABLE_BLE
+#define ENABLE_LE_PERIPHERAL
+#define ENABLE_LE_CENTRAL
+// #define ENABLE_CLASSIC
+#define ENABLE_L2CAP_LE_CREDIT_BASED_FLOW_CONTROL_MODE
+// #define ENABLE_LOG_INFO
+// #define ENABLE_LOG_DEBUG
+#define ENABLE_LOG_ERROR
+
+// BTstack configuration. buffers, sizes, ...
+#define HCI_ACL_PAYLOAD_SIZE 1021
+#define MAX_NR_GATT_CLIENTS 1
+#define MAX_NR_HCI_CONNECTIONS 1
+#define MAX_NR_L2CAP_SERVICES  3
+#define MAX_NR_L2CAP_CHANNELS  3
+#define MAX_NR_RFCOMM_MULTIPLEXERS 1
+#define MAX_NR_RFCOMM_SERVICES 1
+#define MAX_NR_RFCOMM_CHANNELS 1
+#define MAX_NR_BTSTACK_LINK_KEY_DB_MEMORY_ENTRIES  2
+#define MAX_NR_BNEP_SERVICES 1
+#define MAX_NR_BNEP_CHANNELS 1
+#define MAX_NR_HFP_CONNECTIONS 1
+#define MAX_NR_WHITELIST_ENTRIES 1
+#define MAX_NR_SM_LOOKUP_ENTRIES 3
+#define MAX_NR_SERVICE_RECORD_ITEMS 1
+#define MAX_NR_AVDTP_STREAM_ENDPOINTS 1
+#define MAX_NR_AVDTP_CONNECTIONS 1
+#define MAX_NR_AVRCP_CONNECTIONS 1
+
+#define MAX_NR_LE_DEVICE_DB_ENTRIES 4
+
+// Link Key DB and LE Device DB using TLV on top of Flash Sector interface
+// #define NVM_NUM_DEVICE_DB_ENTRIES 16
+
+// We don't give btstack a malloc, so use a fixed-size ATT DB.
+#define MAX_ATT_DB_SIZE 512
+
+// BTstack HAL configuration
+#define HAVE_EMBEDDED_TIME_MS
+
+// Some USB dongles take longer to respond to HCI reset (e.g. BCM20702A).
+#define HCI_RESET_RESEND_TIMEOUT_MS 1000
+
+#endif // MICROPY_INCLUDED_EXTMOD_BTSTACK_BTSTACK_CONFIG_COMMON_H

From ec12cc5ba670d8ac82ca421d0739d61291a82b5e Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 11 Nov 2022 15:43:48 +1100
Subject: [PATCH 2855/3533] docs/develop: Fix mp_compile snippet to match
 latest code.

Signed-off-by: Damien George <damien.p.george@gmail.com>
---
 docs/develop/compiler.rst | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/docs/develop/compiler.rst b/docs/develop/compiler.rst
index 2007657490f55..4b43bc08f29dd 100644
--- a/docs/develop/compiler.rst
+++ b/docs/develop/compiler.rst
@@ -147,10 +147,15 @@ The most relevant method you should know about is this:
 .. code-block:: c
 
    mp_obj_t mp_compile(mp_parse_tree_t *parse_tree, qstr source_file, bool is_repl) {
+       // Create a context for this module, and set its globals dict.
+       mp_module_context_t *context = m_new_obj(mp_module_context_t);
+       context->module.globals = mp_globals_get();
+
        // Compile the input parse_tree to a raw-code structure.
-       mp_raw_code_t *rc = mp_compile_to_raw_code(parse_tree, source_file, is_repl);
+       mp_compiled_module_t cm = mp_compile_to_raw_code(parse_tree, source_file, is_repl, context);
+
        // Create and return a function object that executes the outer module.
-       return mp_make_function_from_raw_code(rc, MP_OBJ_NULL, MP_OBJ_NULL);
+       return mp_make_function_from_raw_code(cm.rc, cm.context, NULL);
    }
 
 The compiler compiles the code in four passes: scope, stack size, code size and emit.

From 2f0565367339595bf3130acf8e20d3d4e9bad499 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 11 Nov 2022 15:43:53 +1100
Subject: [PATCH 2856/3533] shared/netutils: Add "py/obj.h" header include.

So this header can be included by itself.

Signed-off-by: Damien George <damien.p.george@gmail.com>
---
 shared/netutils/netutils.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/shared/netutils/netutils.h b/shared/netutils/netutils.h
index 9261337858963..f82960ba800bb 100644
--- a/shared/netutils/netutils.h
+++ b/shared/netutils/netutils.h
@@ -27,6 +27,8 @@
 #ifndef MICROPY_INCLUDED_LIB_NETUTILS_NETUTILS_H
 #define MICROPY_INCLUDED_LIB_NETUTILS_NETUTILS_H
 
+#include "py/obj.h"
+
 #define NETUTILS_IPV4ADDR_BUFSIZE    4
 
 #define NETUTILS_TRACE_IS_TX        (0x0001)

From a513558e3a72b47880faa847de64949e7fc746f6 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 11 Nov 2022 15:43:55 +1100
Subject: [PATCH 2857/3533] extmod: Add and reorganise compilation guards and
 includes.

To reduce dependencies on header files when extmod components are disabled.

Signed-off-by: Damien George <damien.p.george@gmail.com>
---
 extmod/machine_spi.c   | 5 +++--
 extmod/machine_timer.c | 3 ++-
 extmod/modnetwork.c    | 5 +++--
 extmod/modusocket.c    | 5 +++--
 extmod/uos_dupterm.c   | 3 ++-
 extmod/vfs_lfs.c       | 5 +++--
 extmod/vfs_lfsx.c      | 5 +++++
 extmod/vfs_lfsx_file.c | 5 +++++
 8 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/extmod/machine_spi.c b/extmod/machine_spi.c
index bb35cff38e618..8c4d91a3cf632 100644
--- a/extmod/machine_spi.c
+++ b/extmod/machine_spi.c
@@ -28,6 +28,9 @@
 #include <string.h>
 
 #include "py/runtime.h"
+
+#if MICROPY_PY_MACHINE_SPI || MICROPY_PY_MACHINE_SOFTSPI
+
 #include "extmod/machine_spi.h"
 
 // if a port didn't define MSB/LSB constants then provide them
@@ -39,8 +42,6 @@
 /******************************************************************************/
 // MicroPython bindings for generic machine.SPI
 
-#if MICROPY_PY_MACHINE_SPI || MICROPY_PY_MACHINE_SOFTSPI
-
 STATIC mp_obj_t machine_spi_init(size_t n_args, const mp_obj_t *args, mp_map_t *kw_args) {
     mp_obj_base_t *s = (mp_obj_base_t *)MP_OBJ_TO_PTR(args[0]);
     mp_machine_spi_p_t *spi_p = (mp_machine_spi_p_t *)MP_OBJ_TYPE_GET_SLOT(s->type, protocol);
diff --git a/extmod/machine_timer.c b/extmod/machine_timer.c
index cdace4ee249be..68702cb74f605 100644
--- a/extmod/machine_timer.c
+++ b/extmod/machine_timer.c
@@ -26,10 +26,11 @@
 
 #include "py/runtime.h"
 #include "py/mphal.h"
-#include "shared/runtime/softtimer.h"
 
 #if MICROPY_PY_MACHINE_TIMER
 
+#include "shared/runtime/softtimer.h"
+
 typedef soft_timer_entry_t machine_timer_obj_t;
 
 const mp_obj_type_t machine_timer_type;
diff --git a/extmod/modnetwork.c b/extmod/modnetwork.c
index b698ee4cf45e4..0ff8683b74824 100644
--- a/extmod/modnetwork.c
+++ b/extmod/modnetwork.c
@@ -31,11 +31,12 @@
 #include "py/objlist.h"
 #include "py/runtime.h"
 #include "py/mphal.h"
-#include "shared/netutils/netutils.h"
-#include "modnetwork.h"
 
 #if MICROPY_PY_NETWORK
 
+#include "shared/netutils/netutils.h"
+#include "modnetwork.h"
+
 #if MICROPY_PY_LWIP
 #include "lwip/netif.h"
 #include "lwip/timeouts.h"
diff --git a/extmod/modusocket.c b/extmod/modusocket.c
index 194ee6899ede3..0006465924110 100644
--- a/extmod/modusocket.c
+++ b/extmod/modusocket.c
@@ -32,11 +32,12 @@
 #include "py/runtime.h"
 #include "py/stream.h"
 #include "py/mperrno.h"
-#include "shared/netutils/netutils.h"
-#include "modnetwork.h"
 
 #if MICROPY_PY_NETWORK && MICROPY_PY_USOCKET && !MICROPY_PY_LWIP
 
+#include "shared/netutils/netutils.h"
+#include "modnetwork.h"
+
 /******************************************************************************/
 // socket class
 
diff --git a/extmod/uos_dupterm.c b/extmod/uos_dupterm.c
index 826bf1715df3f..981d05a63839d 100644
--- a/extmod/uos_dupterm.c
+++ b/extmod/uos_dupterm.c
@@ -33,10 +33,11 @@
 #include "py/objarray.h"
 #include "py/stream.h"
 #include "extmod/misc.h"
-#include "shared/runtime/interrupt_char.h"
 
 #if MICROPY_PY_OS_DUPTERM
 
+#include "shared/runtime/interrupt_char.h"
+
 void mp_uos_deactivate(size_t dupterm_idx, const char *msg, mp_obj_t exc) {
     mp_obj_t term = MP_STATE_VM(dupterm_objs[dupterm_idx]);
     MP_STATE_VM(dupterm_objs[dupterm_idx]) = MP_OBJ_NULL;
diff --git a/extmod/vfs_lfs.c b/extmod/vfs_lfs.c
index f6a9a24623a93..4fb86b89b76c3 100644
--- a/extmod/vfs_lfs.c
+++ b/extmod/vfs_lfs.c
@@ -26,12 +26,13 @@
 
 #include "py/runtime.h"
 #include "py/mphal.h"
+
+#if MICROPY_VFS && (MICROPY_VFS_LFS1 || MICROPY_VFS_LFS2)
+
 #include "shared/timeutils/timeutils.h"
 #include "extmod/vfs.h"
 #include "extmod/vfs_lfs.h"
 
-#if MICROPY_VFS && (MICROPY_VFS_LFS1 || MICROPY_VFS_LFS2)
-
 enum { LFS_MAKE_ARG_bdev, LFS_MAKE_ARG_readsize, LFS_MAKE_ARG_progsize, LFS_MAKE_ARG_lookahead, LFS_MAKE_ARG_mtime };
 
 static const mp_arg_t lfs_make_allowed_args[] = {
diff --git a/extmod/vfs_lfsx.c b/extmod/vfs_lfsx.c
index d9617817f9565..de1f421977fd9 100644
--- a/extmod/vfs_lfsx.c
+++ b/extmod/vfs_lfsx.c
@@ -24,6 +24,9 @@
  * THE SOFTWARE.
  */
 
+// This file should be compiled when included from vfs_lfs.c.
+#if defined(LFS_BUILD_VERSION)
+
 #include <stdio.h>
 #include <string.h>
 
@@ -518,3 +521,5 @@ MP_DEFINE_CONST_OBJ_TYPE(
     );
 
 #undef VFS_LFSx_QSTR
+
+#endif // defined(LFS_BUILD_VERSION)
diff --git a/extmod/vfs_lfsx_file.c b/extmod/vfs_lfsx_file.c
index 2c87fd5b994c6..5f0155d3c5c04 100644
--- a/extmod/vfs_lfsx_file.c
+++ b/extmod/vfs_lfsx_file.c
@@ -24,6 +24,9 @@
  * THE SOFTWARE.
  */
 
+// This file should be compiled when included from vfs_lfs.c.
+#if defined(LFS_BUILD_VERSION)
+
 #include <stdio.h>
 #include <string.h>
 
@@ -244,3 +247,5 @@ MP_DEFINE_CONST_OBJ_TYPE(
     protocol, &MP_VFS_LFSx(textio_stream_p),
     locals_dict, &MP_VFS_LFSx(file_locals_dict)
     );
+
+#endif // defined(LFS_BUILD_VERSION)

From eed4eb2645aa3975ef822f4b34110730811690b7 Mon Sep 17 00:00:00 2001
From: Blake Felt <blake.w.felt@gmail.com>
Date: Sat, 17 Sep 2022 20:34:09 -0600
Subject: [PATCH 2858/3533] shared/tinyusb: Create common TinyUSB code for
 reuse by ports.

This code originates from the rp2 port, and the rp2 port has been updated
to use this common code.
---
 ports/rp2/CMakeLists.txt                      |  9 +++-
 ports/rp2/main.c                              |  5 +++
 ports/rp2/mpconfigport.h                      |  7 ++++
 ports/rp2/usbd.c                              | 39 ++++++++++++++++++
 {ports/rp2 => shared/tinyusb}/tusb_config.h   |  8 ++--
 shared/tinyusb/usbd.c                         | 32 +++++++++++++++
 shared/tinyusb/usbd.h                         | 41 +++++++++++++++++++
 .../tinyusb/usbd_descriptor.c                 | 40 ++++++++++--------
 8 files changed, 160 insertions(+), 21 deletions(-)
 create mode 100644 ports/rp2/usbd.c
 rename {ports/rp2 => shared/tinyusb}/tusb_config.h (89%)
 create mode 100644 shared/tinyusb/usbd.c
 create mode 100644 shared/tinyusb/usbd.h
 rename ports/rp2/tusb_port.c => shared/tinyusb/usbd_descriptor.c (85%)

diff --git a/ports/rp2/CMakeLists.txt b/ports/rp2/CMakeLists.txt
index 37ac78b7339f4..6037eafbe862e 100644
--- a/ports/rp2/CMakeLists.txt
+++ b/ports/rp2/CMakeLists.txt
@@ -96,6 +96,8 @@ set(MICROPY_SOURCE_LIB
     ${MICROPY_DIR}/shared/runtime/sys_stdio_mphal.c
     ${MICROPY_DIR}/shared/runtime/tinyusb_helpers.c
     ${MICROPY_DIR}/shared/timeutils/timeutils.c
+    ${MICROPY_DIR}/shared/tinyusb/usbd.c
+    ${MICROPY_DIR}/shared/tinyusb/usbd_descriptor.c
 )
 
 set(MICROPY_SOURCE_DRIVERS
@@ -125,8 +127,8 @@ set(MICROPY_SOURCE_PORT
     pendsv.c
     rp2_flash.c
     rp2_pio.c
-    tusb_port.c
     uart.c
+    usbd.c
     msc_disk.c
     mbedtls/mbedtls_port.c
 )
@@ -233,6 +235,11 @@ if(MICROPY_BLUETOOTH_NIMBLE)
     list(APPEND MICROPY_INC_CORE ${NIMBLE_INCLUDE})
 endif()
 
+# tinyusb helper
+target_include_directories(${MICROPY_TARGET} PRIVATE
+    ${MICROPY_DIR}/shared/tinyusb/
+)
+
 if (MICROPY_PY_NETWORK_CYW43)
     string(CONCAT GIT_SUBMODULES "${GIT_SUBMODULES} " lib/cyw43-driver)
     if((NOT (${ECHO_SUBMODULES})) AND NOT EXISTS ${MICROPY_DIR}/lib/cyw43-driver/src/cyw43.h)
diff --git a/ports/rp2/main.c b/ports/rp2/main.c
index 1062236a3916b..572e9e42c18f2 100644
--- a/ports/rp2/main.c
+++ b/ports/rp2/main.c
@@ -43,6 +43,7 @@
 #include "modrp2.h"
 #include "mpbthciport.h"
 #include "genhdr/mpversion.h"
+#include "usbd.h"
 
 #include "pico/stdlib.h"
 #include "pico/binary_info.h"
@@ -87,6 +88,7 @@ int main(int argc, char **argv) {
     #if MICROPY_HW_ENABLE_USBDEV
     bi_decl(bi_program_feature("USB REPL"))
     tusb_init();
+    usbd_reset_all(); // run now just in case usb initialization occurs early
     #endif
 
     #if MICROPY_PY_THREAD
@@ -159,6 +161,9 @@ int main(int argc, char **argv) {
         machine_pin_init();
         rp2_pio_init();
         machine_i2s_init0();
+        #if MICROPY_HW_ENABLE_USBDEV
+        usbd_reset_all();
+        #endif
 
         #if MICROPY_PY_BLUETOOTH
         mp_bluetooth_hci_init();
diff --git a/ports/rp2/mpconfigport.h b/ports/rp2/mpconfigport.h
index a3725789f0848..2518a275b0bbc 100644
--- a/ports/rp2/mpconfigport.h
+++ b/ports/rp2/mpconfigport.h
@@ -198,6 +198,13 @@ extern const struct _mod_network_nic_type_t mod_network_nic_type_wiznet5k;
 
 // Miscellaneous settings
 
+#ifndef MICROPY_HW_USB_VID
+#define MICROPY_HW_USB_VID (0x2E8A) // Raspberry Pi
+#endif
+#ifndef MICROPY_HW_USB_PID
+#define MICROPY_HW_USB_PID (0x0005) // RP2 MicroPython
+#endif
+
 // Entering a critical section.
 extern uint32_t mp_thread_begin_atomic_section(void);
 extern void mp_thread_end_atomic_section(uint32_t);
diff --git a/ports/rp2/usbd.c b/ports/rp2/usbd.c
new file mode 100644
index 0000000000000..38c6dcdd42d4c
--- /dev/null
+++ b/ports/rp2/usbd.c
@@ -0,0 +1,39 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2022 Blake W. Felt
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "usbd.h"
+#include "string.h"
+#include "pico/unique_id.h"
+
+int usbd_serialnumber(uint8_t *buf) {
+    pico_unique_board_id_t id;
+    const int len = 8;
+
+    pico_get_unique_board_id(&id);
+    memcpy(buf, id.id, len);
+
+    return len;
+}
diff --git a/ports/rp2/tusb_config.h b/shared/tinyusb/tusb_config.h
similarity index 89%
rename from ports/rp2/tusb_config.h
rename to shared/tinyusb/tusb_config.h
index ce321616a6bc3..b50c70260613a 100644
--- a/ports/rp2/tusb_config.h
+++ b/shared/tinyusb/tusb_config.h
@@ -22,9 +22,11 @@
  * THE SOFTWARE.
  *
  */
-#ifndef MICROPY_INCLUDED_RP2_TUSB_CONFIG_H
-#define MICROPY_INCLUDED_RP2_TUSB_CONFIG_H
 
+#ifndef MICROPY_INCLUDED_SHARED_TINYUSB_TUSB_CONFIG_H
+#define MICROPY_INCLUDED_SHARED_TINYUSB_TUSB_CONFIG_H
+
+#include <py/mpconfig.h>
 #include "mpconfigport.h"
 
 #define CFG_TUSB_RHPORT0_MODE   (OPT_MODE_DEVICE)
@@ -41,4 +43,4 @@
 #define CFG_TUD_MSC_BUFSIZE     (MICROPY_FATFS_MAX_SS)
 #endif
 
-#endif // MICROPY_INCLUDED_RP2_TUSB_CONFIG_H
+#endif // MICROPY_INCLUDED_SHARED_TINYUSB_TUSB_CONFIG_H
diff --git a/shared/tinyusb/usbd.c b/shared/tinyusb/usbd.c
new file mode 100644
index 0000000000000..01e04b9462e20
--- /dev/null
+++ b/shared/tinyusb/usbd.c
@@ -0,0 +1,32 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2022 Blake W. Felt
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "py/runtime.h"
+#include "usbd.h"
+
+void usbd_reset_all(void) {
+    usbd_reset_descriptor();
+}
diff --git a/shared/tinyusb/usbd.h b/shared/tinyusb/usbd.h
new file mode 100644
index 0000000000000..9c450fb5527dc
--- /dev/null
+++ b/shared/tinyusb/usbd.h
@@ -0,0 +1,41 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2022 Blake W. Felt
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#ifndef MICROPY_INCLUDED_SHARED_TINYUSB_USBD_H
+#define MICROPY_INCLUDED_SHARED_TINYUSB_USBD_H
+
+#include "py/obj.h"
+
+// defined externally (needed per port)
+
+int usbd_serialnumber(uint8_t *buf);
+
+// external use
+
+void usbd_reset_all(void);
+void usbd_reset_descriptor(void);
+
+#endif // MICROPY_INCLUDED_SHARED_TINYUSB_USBD_H
diff --git a/ports/rp2/tusb_port.c b/shared/tinyusb/usbd_descriptor.c
similarity index 85%
rename from ports/rp2/tusb_port.c
rename to shared/tinyusb/usbd_descriptor.c
index 4aac08791e94e..d3c65aee8aa37 100644
--- a/ports/rp2/tusb_port.c
+++ b/shared/tinyusb/usbd_descriptor.c
@@ -4,6 +4,7 @@
  * The MIT License (MIT)
  *
  * Copyright (c) 2019 Damien P. George
+ * Copyright (c) 2022 Blake W. Felt
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -24,15 +25,9 @@
  * THE SOFTWARE.
  */
 
+#include "mpconfigport.h"
 #include "tusb.h"
-#include "pico/unique_id.h"
-
-#ifndef MICROPY_HW_USB_VID
-#define MICROPY_HW_USB_VID (0x2E8A) // Raspberry Pi
-#endif
-#ifndef MICROPY_HW_USB_PID
-#define MICROPY_HW_USB_PID (0x0005) // RP2 MicroPython
-#endif
+#include "usbd.h"
 
 #if CFG_TUD_MSC
 #define USBD_DESC_LEN (TUD_CONFIG_DESC_LEN + TUD_CDC_DESC_LEN + TUD_MSC_DESC_LEN)
@@ -65,6 +60,9 @@
 #define USBD_STR_CDC (0x04)
 #define USBD_STR_MSC (0x05)
 
+#define USBD_DESC_STR_MAX (20)
+#define USBD_DESC_SERIAL_MAX (32)
+
 // Note: descriptors returned from callbacks must exist long enough for transfer to complete
 
 static const tusb_desc_device_t usbd_desc_device = {
@@ -115,8 +113,7 @@ const uint8_t *tud_descriptor_configuration_cb(uint8_t index) {
 }
 
 const uint16_t *tud_descriptor_string_cb(uint8_t index, uint16_t langid) {
-    #define DESC_STR_MAX (20)
-    static uint16_t desc_str[DESC_STR_MAX];
+    static uint16_t desc_str[USBD_DESC_STR_MAX];
 
     uint8_t len;
     if (index == 0) {
@@ -128,17 +125,22 @@ const uint16_t *tud_descriptor_string_cb(uint8_t index, uint16_t langid) {
         }
         // check, if serial is requested
         if (index == USBD_STR_SERIAL) {
-            pico_unique_board_id_t id;
-            pico_get_unique_board_id(&id);
+            uint8_t buffer[USBD_DESC_SERIAL_MAX] = {0};
+            int buflen;
+            const char *hexdig = "0123456789abcdef";
+
+            buflen = usbd_serialnumber(buffer);
             // byte by byte conversion
-            for (len = 0; len < 16; len += 2) {
-                const char *hexdig = "0123456789abcdef";
-                desc_str[1 + len] = hexdig[id.id[len >> 1] >> 4];
-                desc_str[1 + len + 1] = hexdig[id.id[len >> 1] & 0x0f];
+            len = 0;
+            for (int i=0; i<buflen; i++) {
+                uint8_t val = buffer[i];
+                desc_str[1 + len] = hexdig[val >> 4];
+                desc_str[2 + len] = hexdig[val & 0x0F];
+                len += 2;
             }
         } else {
             const char *str = usbd_desc_str[index];
-            for (len = 0; len < DESC_STR_MAX - 1 && str[len]; ++len) {
+            for (len = 0; len < USBD_DESC_STR_MAX - 1 && str[len]; ++len) {
                 desc_str[1 + len] = str[len];
             }
         }
@@ -149,3 +151,7 @@ const uint16_t *tud_descriptor_string_cb(uint8_t index, uint16_t langid) {
 
     return desc_str;
 }
+
+void usbd_reset_descriptor(void) {
+    // not used yet
+}

From 2e6e53057b62a010d541e5a267c4088cd565203b Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Tue, 4 Oct 2022 10:25:56 +1100
Subject: [PATCH 2859/3533] shared/tinyusb: Further refactor static USB device
 implementation.

App the mp_ prefix to usbd_ symbols and files which are defined here and
not in TinyUSB.

rp2 only for now. This includes some groundwork for dynamic USB devices
(defined in Python).

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 ports/nrf/Makefile                            |   2 +-
 ports/rp2/CMakeLists.txt                      |   6 +-
 ports/rp2/main.c                              |   6 +-
 ports/rp2/mpconfigport.h                      |   2 +-
 ports/rp2/usbd.c                              |  21 ++-
 .../mp_cdc_common.c}                          |   0
 shared/tinyusb/{usbd.c => mp_usbd.c}          |  15 +-
 shared/tinyusb/{usbd.h => mp_usbd.h}          |  18 +-
 shared/tinyusb/mp_usbd_descriptor.c           | 124 ++++++++++++++
 shared/tinyusb/mp_usbd_internal.h             |  34 ++++
 shared/tinyusb/tusb_config.h                  |  64 ++++++-
 shared/tinyusb/usbd_descriptor.c              | 157 ------------------
 tools/codeformat.py                           |   1 +
 13 files changed, 258 insertions(+), 192 deletions(-)
 rename shared/{runtime/tinyusb_helpers.c => tinyusb/mp_cdc_common.c} (100%)
 rename shared/tinyusb/{usbd.c => mp_usbd.c} (80%)
 rename shared/tinyusb/{usbd.h => mp_usbd.h} (76%)
 create mode 100644 shared/tinyusb/mp_usbd_descriptor.c
 create mode 100644 shared/tinyusb/mp_usbd_internal.h
 delete mode 100644 shared/tinyusb/usbd_descriptor.c

diff --git a/ports/nrf/Makefile b/ports/nrf/Makefile
index a80a37e1fb464..78a17e09e9c19 100644
--- a/ports/nrf/Makefile
+++ b/ports/nrf/Makefile
@@ -242,7 +242,7 @@ SRC_SHARED_C += $(addprefix shared/,\
 	runtime/pyexec.c \
 	runtime/sys_stdio_mphal.c \
 	runtime/interrupt_char.c \
-	runtime/tinyusb_helpers.c \
+	tinyusb/mp_cdc_common.c \
 	timeutils/timeutils.c \
 	)
 
diff --git a/ports/rp2/CMakeLists.txt b/ports/rp2/CMakeLists.txt
index 6037eafbe862e..15264bf8ad614 100644
--- a/ports/rp2/CMakeLists.txt
+++ b/ports/rp2/CMakeLists.txt
@@ -94,10 +94,10 @@ set(MICROPY_SOURCE_LIB
     ${MICROPY_DIR}/shared/runtime/pyexec.c
     ${MICROPY_DIR}/shared/runtime/stdout_helpers.c
     ${MICROPY_DIR}/shared/runtime/sys_stdio_mphal.c
-    ${MICROPY_DIR}/shared/runtime/tinyusb_helpers.c
     ${MICROPY_DIR}/shared/timeutils/timeutils.c
-    ${MICROPY_DIR}/shared/tinyusb/usbd.c
-    ${MICROPY_DIR}/shared/tinyusb/usbd_descriptor.c
+    ${MICROPY_DIR}/shared/tinyusb/mp_cdc_common.c
+    ${MICROPY_DIR}/shared/tinyusb/mp_usbd.c
+    ${MICROPY_DIR}/shared/tinyusb/mp_usbd_descriptor.c
 )
 
 set(MICROPY_SOURCE_DRIVERS
diff --git a/ports/rp2/main.c b/ports/rp2/main.c
index 572e9e42c18f2..8983f0781650e 100644
--- a/ports/rp2/main.c
+++ b/ports/rp2/main.c
@@ -43,7 +43,7 @@
 #include "modrp2.h"
 #include "mpbthciport.h"
 #include "genhdr/mpversion.h"
-#include "usbd.h"
+#include "mp_usbd.h"
 
 #include "pico/stdlib.h"
 #include "pico/binary_info.h"
@@ -88,7 +88,6 @@ int main(int argc, char **argv) {
     #if MICROPY_HW_ENABLE_USBDEV
     bi_decl(bi_program_feature("USB REPL"))
     tusb_init();
-    usbd_reset_all(); // run now just in case usb initialization occurs early
     #endif
 
     #if MICROPY_PY_THREAD
@@ -161,9 +160,6 @@ int main(int argc, char **argv) {
         machine_pin_init();
         rp2_pio_init();
         machine_i2s_init0();
-        #if MICROPY_HW_ENABLE_USBDEV
-        usbd_reset_all();
-        #endif
 
         #if MICROPY_PY_BLUETOOTH
         mp_bluetooth_hci_init();
diff --git a/ports/rp2/mpconfigport.h b/ports/rp2/mpconfigport.h
index 2518a275b0bbc..b58d7bed0d844 100644
--- a/ports/rp2/mpconfigport.h
+++ b/ports/rp2/mpconfigport.h
@@ -217,7 +217,7 @@ extern void mp_thread_end_atomic_section(uint32_t);
 #define MICROPY_PY_LWIP_EXIT    lwip_lock_release();
 
 #if MICROPY_HW_ENABLE_USBDEV
-#define MICROPY_HW_USBDEV_TASK_HOOK extern void tud_task_ext(uint32_t, bool); tud_task_ext(0, false);
+#define MICROPY_HW_USBDEV_TASK_HOOK extern void usbd_task(void); usbd_task();
 #define MICROPY_VM_HOOK_COUNT (10)
 #define MICROPY_VM_HOOK_INIT static uint vm_hook_divisor = MICROPY_VM_HOOK_COUNT;
 #define MICROPY_VM_HOOK_POLL if (get_core_num() == 0 && --vm_hook_divisor == 0) { \
diff --git a/ports/rp2/usbd.c b/ports/rp2/usbd.c
index 38c6dcdd42d4c..e17c546c6101d 100644
--- a/ports/rp2/usbd.c
+++ b/ports/rp2/usbd.c
@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2022 Blake W. Felt
+ * Copyright (c) 2022 Blake W. Felt & Angus Gratton
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -24,16 +24,21 @@
  * THE SOFTWARE.
  */
 
-#include "usbd.h"
+#include "mp_usbd.h"
 #include "string.h"
+#include "tusb.h"
 #include "pico/unique_id.h"
 
-int usbd_serialnumber(uint8_t *buf) {
+void mp_usbd_port_get_serial_number(char *serial_buf) {
     pico_unique_board_id_t id;
-    const int len = 8;
-
     pico_get_unique_board_id(&id);
-    memcpy(buf, id.id, len);
-
-    return len;
+    // convert to hex
+    int hexlen = sizeof(id.id) * 2;
+    MP_STATIC_ASSERT(hexlen <= USBD_DESC_STR_MAX);
+    for (int i = 0; i < hexlen; i += 2) {
+        static const char *hexdig = "0123456789abcdef";
+        serial_buf[i] = hexdig[id.id[i / 2] >> 4];
+        serial_buf[i + 1] = hexdig[id.id[i / 2] & 0x0f];
+    }
+    serial_buf[hexlen] = 0;
 }
diff --git a/shared/runtime/tinyusb_helpers.c b/shared/tinyusb/mp_cdc_common.c
similarity index 100%
rename from shared/runtime/tinyusb_helpers.c
rename to shared/tinyusb/mp_cdc_common.c
diff --git a/shared/tinyusb/usbd.c b/shared/tinyusb/mp_usbd.c
similarity index 80%
rename from shared/tinyusb/usbd.c
rename to shared/tinyusb/mp_usbd.c
index 01e04b9462e20..91d35a2b4a07b 100644
--- a/shared/tinyusb/usbd.c
+++ b/shared/tinyusb/mp_usbd.c
@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2022 Blake W. Felt
+ * Copyright (c) 2022 Blake W. Felt & Angus Gratton
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -24,9 +24,14 @@
  * THE SOFTWARE.
  */
 
-#include "py/runtime.h"
-#include "usbd.h"
+#include <stdlib.h>
 
-void usbd_reset_all(void) {
-    usbd_reset_descriptor();
+#ifndef NO_QSTR
+#include "tusb.h" // TinyUSB is not avaiable when running the string preprocessor
+#include "device/usbd.h"
+#include "device/usbd_pvt.h"
+#endif
+
+void usbd_task(void) {
+    tud_task_ext(0, false);
 }
diff --git a/shared/tinyusb/usbd.h b/shared/tinyusb/mp_usbd.h
similarity index 76%
rename from shared/tinyusb/usbd.h
rename to shared/tinyusb/mp_usbd.h
index 9c450fb5527dc..a118bc34d92dc 100644
--- a/shared/tinyusb/usbd.h
+++ b/shared/tinyusb/mp_usbd.h
@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2022 Blake W. Felt
+ * Copyright (c) 2022 Blake W. Felt & Angus Gratton
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -24,18 +24,16 @@
  * THE SOFTWARE.
  */
 
-#ifndef MICROPY_INCLUDED_SHARED_TINYUSB_USBD_H
-#define MICROPY_INCLUDED_SHARED_TINYUSB_USBD_H
+#ifndef MICROPY_INCLUDED_SHARED_TINYUSB_MP_USBD_H
+#define MICROPY_INCLUDED_SHARED_TINYUSB_MP_USBD_H
 
 #include "py/obj.h"
 
-// defined externally (needed per port)
+// Call instead of tud_task()
+void mp_usbd_task(void);
 
-int usbd_serialnumber(uint8_t *buf);
-
-// external use
-
-void usbd_reset_all(void);
-void usbd_reset_descriptor(void);
+// Function to be implemented in port code.
+// Can write a string up to USBD_DESC_STR_MAX characters long, plus terminating byte.
+extern void mp_usbd_port_get_serial_number(char *buf);
 
 #endif // MICROPY_INCLUDED_SHARED_TINYUSB_USBD_H
diff --git a/shared/tinyusb/mp_usbd_descriptor.c b/shared/tinyusb/mp_usbd_descriptor.c
new file mode 100644
index 0000000000000..1e9cc9876ef3a
--- /dev/null
+++ b/shared/tinyusb/mp_usbd_descriptor.c
@@ -0,0 +1,124 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2019 Damien P. George
+ * Copyright (c) 2022 Blake W. Felt & Angus Gratton
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "mpconfigport.h"
+#include "tusb.h"
+#include "mp_usbd.h"
+#include "mp_usbd_internal.h"
+
+#define USBD_CDC_CMD_MAX_SIZE (8)
+#define USBD_CDC_IN_OUT_MAX_SIZE (64)
+
+const tusb_desc_device_t mp_usbd_desc_device_static = {
+    .bLength = sizeof(tusb_desc_device_t),
+    .bDescriptorType = TUSB_DESC_DEVICE,
+    .bcdUSB = 0x0200,
+    .bDeviceClass = TUSB_CLASS_MISC,
+    .bDeviceSubClass = MISC_SUBCLASS_COMMON,
+    .bDeviceProtocol = MISC_PROTOCOL_IAD,
+    .bMaxPacketSize0 = CFG_TUD_ENDPOINT0_SIZE,
+    .idVendor = MICROPY_HW_USB_VID,
+    .idProduct = MICROPY_HW_USB_PID,
+    .bcdDevice = 0x0100,
+    .iManufacturer = USBD_STR_MANUF,
+    .iProduct = USBD_STR_PRODUCT,
+    .iSerialNumber = USBD_STR_SERIAL,
+    .bNumConfigurations = 1,
+};
+
+const uint8_t mp_usbd_desc_cfg_static[USBD_STATIC_DESC_LEN] = {
+    TUD_CONFIG_DESCRIPTOR(1, USBD_ITF_STATIC_MAX, USBD_STR_0, USBD_STATIC_DESC_LEN,
+        0, USBD_MAX_POWER_MA),
+
+    TUD_CDC_DESCRIPTOR(USBD_ITF_CDC, USBD_STR_CDC, USBD_CDC_EP_CMD,
+        USBD_CDC_CMD_MAX_SIZE, USBD_CDC_EP_OUT, USBD_CDC_EP_IN, USBD_CDC_IN_OUT_MAX_SIZE),
+    #if CFG_TUD_MSC
+    TUD_MSC_DESCRIPTOR(USBD_ITF_MSC, 5, EPNUM_MSC_OUT, EPNUM_MSC_IN, 64),
+    #endif
+};
+
+const uint16_t *tud_descriptor_string_cb(uint8_t index, uint16_t langid) {
+    char serial_buf[USBD_DESC_STR_MAX + 1]; // Includes terminating NUL byte
+    static uint16_t desc_wstr[USBD_DESC_STR_MAX + 1]; // Includes prefix uint16_t
+    const char *desc_str;
+    uint16_t desc_len;
+
+    switch (index) {
+        case 0:
+            desc_wstr[1] = 0x0409; // supported language is English
+            desc_len = 4;
+            break;
+        case USBD_STR_SERIAL:
+            // TODO: make a port-specific serial number callback
+            mp_usbd_port_get_serial_number(serial_buf);
+            desc_str = serial_buf;
+            break;
+        case USBD_STR_MANUF:
+            desc_str = MICROPY_HW_USB_MANUFACTURER_STRING;
+            break;
+        case USBD_STR_PRODUCT:
+            desc_str = MICROPY_HW_USB_PRODUCT_FS_STRING;
+            break;
+        case USBD_STR_CDC:
+            desc_str = MICROPY_HW_USB_CDC_INTERFACE_STRING;
+            break;
+        #if CFG_TUD_MSC
+        case USBD_STR_MSC:
+            desc_str = MICROPY_HW_USB_MSC_INTERFACE_STRING;
+            break;
+        #endif
+        default:
+            desc_str = NULL;
+    }
+
+    if (index != 0) {
+        if (desc_str == NULL) {
+            return NULL; // Will STALL the endpoint
+        }
+
+        // Convert from narrow string to wide string
+        desc_len = 2;
+        for (int i = 0; i < USBD_DESC_STR_MAX && desc_str[i] != 0; i++) {
+            desc_wstr[1 + i] = desc_str[i];
+            desc_len += 2;
+        }
+    }
+    // first byte is length (including header), second byte is string type
+    desc_wstr[0] = (TUSB_DESC_STRING << 8) | desc_len;
+
+    return desc_wstr;
+}
+
+
+const uint8_t *tud_descriptor_device_cb(void) {
+    return (const void *)&mp_usbd_desc_device_static;
+}
+
+const uint8_t *tud_descriptor_configuration_cb(uint8_t index) {
+    (void)index;
+    return mp_usbd_desc_cfg_static;
+}
diff --git a/shared/tinyusb/mp_usbd_internal.h b/shared/tinyusb/mp_usbd_internal.h
new file mode 100644
index 0000000000000..8b8f50bae88ee
--- /dev/null
+++ b/shared/tinyusb/mp_usbd_internal.h
@@ -0,0 +1,34 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2022 Angus Gratton
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+#ifndef MICROPY_INCLUDED_SHARED_TINYUSB_MP_USBD_INTERNAL_H
+#define MICROPY_INCLUDED_SHARED_TINYUSB_MP_USBD_INTERNAL_H
+#include "tusb.h"
+
+// Static USB device descriptor values
+extern const tusb_desc_device_t mp_usbd_desc_device_static;
+extern const uint8_t mp_usbd_desc_cfg_static[USBD_STATIC_DESC_LEN];
+
+#endif // MICROPY_INCLUDED_SHARED_TINYUSB_MP_USBD_INTERNAL_H
diff --git a/shared/tinyusb/tusb_config.h b/shared/tinyusb/tusb_config.h
index b50c70260613a..15e5acf554eb2 100644
--- a/shared/tinyusb/tusb_config.h
+++ b/shared/tinyusb/tusb_config.h
@@ -2,6 +2,7 @@
  * The MIT License (MIT)
  *
  * Copyright (c) 2020-2021 Damien P. George
+ * Copyright (c) 2022 Angus Gratton
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -29,6 +30,20 @@
 #include <py/mpconfig.h>
 #include "mpconfigport.h"
 
+#if MICROPY_HW_ENABLE_USBDEV
+
+#ifndef MICROPY_HW_USB_MANUFACTURER_STRING
+#define MICROPY_HW_USB_MANUFACTURER_STRING "MicroPython"
+#endif
+
+#ifndef MICROPY_HW_USB_PRODUCT_FS_STRING
+#define MICROPY_HW_USB_PRODUCT_FS_STRING "Board in FS mode"
+#endif
+
+#ifndef MICROPY_HW_USB_CDC_INTERFACE_STRING
+#define MICROPY_HW_USB_CDC_INTERFACE_STRING "Board CDC"
+#endif
+
 #define CFG_TUSB_RHPORT0_MODE   (OPT_MODE_DEVICE)
 
 #define CFG_TUD_CDC             (1)
@@ -36,11 +51,56 @@
 #define CFG_TUD_CDC_RX_BUFSIZE  (256)
 #define CFG_TUD_CDC_TX_BUFSIZE  (256)
 
-#if MICROPY_HW_USB_MSC
-// Board and hardware specific configuration
+// MSC Configuration
+#if CFG_TUD_MSC
+#ifndef MICROPY_HW_USB_MSC_INTERFACE_STRING
+#define MICROPY_HW_USB_MSC_INTERFACE_STRING "Board MSC"
+#endif
 #define CFG_TUD_MSC             (1)
 // Set MSC EP buffer size to FatFS block size to avoid partial read/writes (offset arg).
 #define CFG_TUD_MSC_BUFSIZE     (MICROPY_FATFS_MAX_SS)
 #endif
 
+// Define static descriptor size and interface count based on the above config
+
+#if CFG_TUD_MSC
+#define USBD_STATIC_DESC_LEN (TUD_CONFIG_DESC_LEN + TUD_CDC_DESC_LEN + TUD_MSC_DESC_LEN)
+#else
+#define USBD_STATIC_DESC_LEN (TUD_CONFIG_DESC_LEN + TUD_CDC_DESC_LEN)
+#endif
+
+#define USBD_STR_0 (0x00)
+#define USBD_STR_MANUF (0x01)
+#define USBD_STR_PRODUCT (0x02)
+#define USBD_STR_SERIAL (0x03)
+#define USBD_STR_CDC (0x04)
+#define USBD_STR_MSC (0x05)
+
+#define USBD_MAX_POWER_MA (250)
+
+#define USBD_DESC_STR_MAX (20)
+
+#define USBD_ITF_CDC (0) // needs 2 interfaces
+
+#define USBD_CDC_EP_CMD (0x81)
+#define USBD_CDC_EP_OUT (0x02)
+#define USBD_CDC_EP_IN (0x82)
+
+#if CFG_TUD_MSC
+#define USBD_ITF_MSC (2)
+#define EPNUM_MSC_OUT    (0x03)
+#define EPNUM_MSC_IN     (0x83)
+#endif
+
+/* Limits of statically defined USB interfaces, endpoints, strings */
+#if CFG_TUD_MSC
+#define USBD_ITF_STATIC_MAX (3)
+#define USBD_STR_STATIC_MAX (USBD_STR_MSC + 1)
+#define USBD_EP_STATIC_MAX (0x04) // ignoring the IN EP flag 0x80
+#else
+#define USBD_ITF_STATIC_MAX (2)
+#define USBD_STR_STATIC_MAX (USBD_STR_CDC + 1)
+#define USBD_EP_STATIC_MAX (0x03) // ignoring the IN EP flag 0x80
+#endif
+
 #endif // MICROPY_INCLUDED_SHARED_TINYUSB_TUSB_CONFIG_H
diff --git a/shared/tinyusb/usbd_descriptor.c b/shared/tinyusb/usbd_descriptor.c
deleted file mode 100644
index d3c65aee8aa37..0000000000000
--- a/shared/tinyusb/usbd_descriptor.c
+++ /dev/null
@@ -1,157 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2019 Damien P. George
- * Copyright (c) 2022 Blake W. Felt
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#include "mpconfigport.h"
-#include "tusb.h"
-#include "usbd.h"
-
-#if CFG_TUD_MSC
-#define USBD_DESC_LEN (TUD_CONFIG_DESC_LEN + TUD_CDC_DESC_LEN + TUD_MSC_DESC_LEN)
-#else
-#define USBD_DESC_LEN (TUD_CONFIG_DESC_LEN + TUD_CDC_DESC_LEN)
-#endif
-#define USBD_MAX_POWER_MA (250)
-
-#define USBD_ITF_CDC (0) // needs 2 interfaces
-#define USBD_ITF_MSC (2)
-#if CFG_TUD_MSC
-#define USBD_ITF_MAX (3)
-#else
-#define USBD_ITF_MAX (2)
-#endif
-
-#define USBD_CDC_EP_CMD (0x81)
-#define USBD_CDC_EP_OUT (0x02)
-#define USBD_CDC_EP_IN (0x82)
-#define USBD_CDC_CMD_MAX_SIZE (8)
-#define USBD_CDC_IN_OUT_MAX_SIZE (64)
-
-#define EPNUM_MSC_OUT    (0x03)
-#define EPNUM_MSC_IN     (0x83)
-
-#define USBD_STR_0 (0x00)
-#define USBD_STR_MANUF (0x01)
-#define USBD_STR_PRODUCT (0x02)
-#define USBD_STR_SERIAL (0x03)
-#define USBD_STR_CDC (0x04)
-#define USBD_STR_MSC (0x05)
-
-#define USBD_DESC_STR_MAX (20)
-#define USBD_DESC_SERIAL_MAX (32)
-
-// Note: descriptors returned from callbacks must exist long enough for transfer to complete
-
-static const tusb_desc_device_t usbd_desc_device = {
-    .bLength = sizeof(tusb_desc_device_t),
-    .bDescriptorType = TUSB_DESC_DEVICE,
-    .bcdUSB = 0x0200,
-    .bDeviceClass = TUSB_CLASS_MISC,
-    .bDeviceSubClass = MISC_SUBCLASS_COMMON,
-    .bDeviceProtocol = MISC_PROTOCOL_IAD,
-    .bMaxPacketSize0 = CFG_TUD_ENDPOINT0_SIZE,
-    .idVendor = MICROPY_HW_USB_VID,
-    .idProduct = MICROPY_HW_USB_PID,
-    .bcdDevice = 0x0100,
-    .iManufacturer = USBD_STR_MANUF,
-    .iProduct = USBD_STR_PRODUCT,
-    .iSerialNumber = USBD_STR_SERIAL,
-    .bNumConfigurations = 1,
-};
-
-static const uint8_t usbd_desc_cfg[USBD_DESC_LEN] = {
-    TUD_CONFIG_DESCRIPTOR(1, USBD_ITF_MAX, USBD_STR_0, USBD_DESC_LEN,
-        0, USBD_MAX_POWER_MA),
-
-    TUD_CDC_DESCRIPTOR(USBD_ITF_CDC, USBD_STR_CDC, USBD_CDC_EP_CMD,
-        USBD_CDC_CMD_MAX_SIZE, USBD_CDC_EP_OUT, USBD_CDC_EP_IN, USBD_CDC_IN_OUT_MAX_SIZE),
-    #if CFG_TUD_MSC
-    TUD_MSC_DESCRIPTOR(USBD_ITF_MSC, 5, EPNUM_MSC_OUT, EPNUM_MSC_IN, 64),
-    #endif
-};
-
-static const char *const usbd_desc_str[] = {
-    [USBD_STR_MANUF] = "MicroPython",
-    [USBD_STR_PRODUCT] = "Board in FS mode",
-    [USBD_STR_SERIAL] = NULL, // generated dynamically
-    [USBD_STR_CDC] = "Board CDC",
-    #if CFG_TUD_MSC
-    [USBD_STR_MSC] = "Board MSC",
-    #endif
-};
-
-const uint8_t *tud_descriptor_device_cb(void) {
-    return (const uint8_t *)&usbd_desc_device;
-}
-
-const uint8_t *tud_descriptor_configuration_cb(uint8_t index) {
-    (void)index;
-    return usbd_desc_cfg;
-}
-
-const uint16_t *tud_descriptor_string_cb(uint8_t index, uint16_t langid) {
-    static uint16_t desc_str[USBD_DESC_STR_MAX];
-
-    uint8_t len;
-    if (index == 0) {
-        desc_str[1] = 0x0409; // supported language is English
-        len = 1;
-    } else {
-        if (index >= sizeof(usbd_desc_str) / sizeof(usbd_desc_str[0])) {
-            return NULL;
-        }
-        // check, if serial is requested
-        if (index == USBD_STR_SERIAL) {
-            uint8_t buffer[USBD_DESC_SERIAL_MAX] = {0};
-            int buflen;
-            const char *hexdig = "0123456789abcdef";
-
-            buflen = usbd_serialnumber(buffer);
-            // byte by byte conversion
-            len = 0;
-            for (int i=0; i<buflen; i++) {
-                uint8_t val = buffer[i];
-                desc_str[1 + len] = hexdig[val >> 4];
-                desc_str[2 + len] = hexdig[val & 0x0F];
-                len += 2;
-            }
-        } else {
-            const char *str = usbd_desc_str[index];
-            for (len = 0; len < USBD_DESC_STR_MAX - 1 && str[len]; ++len) {
-                desc_str[1 + len] = str[len];
-            }
-        }
-    }
-
-    // first byte is length (including header), second byte is string type
-    desc_str[0] = (TUSB_DESC_STRING << 8) | (2 * len + 2);
-
-    return desc_str;
-}
-
-void usbd_reset_descriptor(void) {
-    // not used yet
-}
diff --git a/tools/codeformat.py b/tools/codeformat.py
index 13a699065e30c..4a2cfb3367d91 100755
--- a/tools/codeformat.py
+++ b/tools/codeformat.py
@@ -43,6 +43,7 @@
     "shared/netutils/*.[ch]",
     "shared/timeutils/*.[ch]",
     "shared/runtime/*.[ch]",
+    "shared/tinyusb/*.[ch]",
     "mpy-cross/*.[ch]",
     "ports/**/*.[ch]",
     "py/*.[ch]",

From c8913fdbfadd43c879bba4d6d565be8b644f1feb Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 2 Nov 2022 15:21:21 +1100
Subject: [PATCH 2860/3533] rp2: Allow enabling USB device without enabling
 USB-CDC.

Requires changing the USB-CDC stdin/stdout guards from
MICROPY_HW_ENABLE_USBDEV to the new (in this port)
MICROPY_HW_USB_CDC.
---
 ports/rp2/boards/PICO/mpconfigboard.h |  3 --
 ports/rp2/main.c                      |  2 +
 ports/rp2/mpconfigport.h              | 15 +++++--
 ports/rp2/mphalport.c                 | 12 +++---
 shared/tinyusb/mp_usbd_descriptor.c   |  4 ++
 shared/tinyusb/tusb_config.h          | 58 +++++++++++++++++++--------
 6 files changed, 66 insertions(+), 28 deletions(-)

diff --git a/ports/rp2/boards/PICO/mpconfigboard.h b/ports/rp2/boards/PICO/mpconfigboard.h
index fb7f8054aaa1a..c39bc4d489bb6 100644
--- a/ports/rp2/boards/PICO/mpconfigboard.h
+++ b/ports/rp2/boards/PICO/mpconfigboard.h
@@ -1,6 +1,3 @@
 // Board and hardware specific configuration
 #define MICROPY_HW_BOARD_NAME                   "Raspberry Pi Pico"
 #define MICROPY_HW_FLASH_STORAGE_BYTES          (1408 * 1024)
-
-// Enable USB Mass Storage with FatFS filesystem.
-// #define MICROPY_HW_USB_MSC  (1)
diff --git a/ports/rp2/main.c b/ports/rp2/main.c
index 8983f0781650e..fdcdd90d4c303 100644
--- a/ports/rp2/main.c
+++ b/ports/rp2/main.c
@@ -86,7 +86,9 @@ int main(int argc, char **argv) {
     #endif
 
     #if MICROPY_HW_ENABLE_USBDEV
+    #if MICROPY_HW_USB_CDC
     bi_decl(bi_program_feature("USB REPL"))
+    #endif
     tusb_init();
     #endif
 
diff --git a/ports/rp2/mpconfigport.h b/ports/rp2/mpconfigport.h
index b58d7bed0d844..d5e4de7b5a595 100644
--- a/ports/rp2/mpconfigport.h
+++ b/ports/rp2/mpconfigport.h
@@ -27,20 +27,29 @@
 // Options controlling how MicroPython is built, overriding defaults in py/mpconfig.h
 
 #include <stdint.h>
+#include "hardware/flash.h"
 #include "hardware/spi.h"
 #include "hardware/sync.h"
 #include "pico/binary_info.h"
 #include "pico/multicore.h"
 #include "mpconfigboard.h"
-#if MICROPY_HW_USB_MSC
-#include "hardware/flash.h"
-#endif
 
 // Board and hardware specific configuration
 #define MICROPY_HW_MCU_NAME                     "RP2040"
 #define MICROPY_HW_ENABLE_UART_REPL             (0) // useful if there is no USB
 #define MICROPY_HW_ENABLE_USBDEV                (1)
 
+#if MICROPY_HW_ENABLE_USBDEV
+// Enable USB-CDC serial port
+#ifndef MICROPY_HW_USB_CDC
+#define MICROPY_HW_USB_CDC (1)
+#endif
+// Enable USB Mass Storage with FatFS filesystem.
+#ifndef MICROPY_HW_USB_MSC
+#define MICROPY_HW_USB_MSC (0)
+#endif
+#endif
+
 #ifndef MICROPY_CONFIG_ROM_LEVEL
 #define MICROPY_CONFIG_ROM_LEVEL                (MICROPY_CONFIG_ROM_LEVEL_EXTRA_FEATURES)
 #endif
diff --git a/ports/rp2/mphalport.c b/ports/rp2/mphalport.c
index 6ba234c662e04..510d486d96a57 100644
--- a/ports/rp2/mphalport.c
+++ b/ports/rp2/mphalport.c
@@ -39,7 +39,7 @@
 #include "lib/cyw43-driver/src/cyw43.h"
 #endif
 
-#if MICROPY_HW_ENABLE_UART_REPL || MICROPY_HW_ENABLE_USBDEV
+#if MICROPY_HW_ENABLE_UART_REPL || MICROPY_HW_USB_CDC
 
 #ifndef MICROPY_HW_STDIN_BUFFER_LEN
 #define MICROPY_HW_STDIN_BUFFER_LEN 512
@@ -50,7 +50,7 @@ ringbuf_t stdin_ringbuf = { stdin_ringbuf_array, sizeof(stdin_ringbuf_array) };
 
 #endif
 
-#if MICROPY_HW_ENABLE_USBDEV
+#if MICROPY_HW_USB_CDC
 
 uint8_t cdc_itf_pending; // keep track of cdc interfaces which need attention to poll
 
@@ -91,10 +91,10 @@ void tud_cdc_rx_cb(uint8_t itf) {
 
 uintptr_t mp_hal_stdio_poll(uintptr_t poll_flags) {
     uintptr_t ret = 0;
-    #if MICROPY_HW_ENABLE_USBDEV
+    #if MICROPY_HW_USB_CDC
     poll_cdc_interfaces();
     #endif
-    #if MICROPY_HW_ENABLE_UART_REPL || MICROPY_HW_ENABLE_USBDEV
+    #if MICROPY_HW_ENABLE_UART_REPL || MICROPY_HW_USB_CDC
     if ((poll_flags & MP_STREAM_POLL_RD) && ringbuf_peek(&stdin_ringbuf) != -1) {
         ret |= MP_STREAM_POLL_RD;
     }
@@ -108,7 +108,7 @@ uintptr_t mp_hal_stdio_poll(uintptr_t poll_flags) {
 // Receive single character
 int mp_hal_stdin_rx_chr(void) {
     for (;;) {
-        #if MICROPY_HW_ENABLE_USBDEV
+        #if MICROPY_HW_USB_CDC
         poll_cdc_interfaces();
         #endif
 
@@ -132,7 +132,7 @@ void mp_hal_stdout_tx_strn(const char *str, mp_uint_t len) {
     mp_uart_write_strn(str, len);
     #endif
 
-    #if MICROPY_HW_ENABLE_USBDEV
+    #if MICROPY_HW_USB_CDC
     if (tud_cdc_connected()) {
         for (size_t i = 0; i < len;) {
             uint32_t n = len - i;
diff --git a/shared/tinyusb/mp_usbd_descriptor.c b/shared/tinyusb/mp_usbd_descriptor.c
index 1e9cc9876ef3a..3a21baf5bf289 100644
--- a/shared/tinyusb/mp_usbd_descriptor.c
+++ b/shared/tinyusb/mp_usbd_descriptor.c
@@ -54,8 +54,10 @@ const uint8_t mp_usbd_desc_cfg_static[USBD_STATIC_DESC_LEN] = {
     TUD_CONFIG_DESCRIPTOR(1, USBD_ITF_STATIC_MAX, USBD_STR_0, USBD_STATIC_DESC_LEN,
         0, USBD_MAX_POWER_MA),
 
+    #if CFG_TUD_CDC
     TUD_CDC_DESCRIPTOR(USBD_ITF_CDC, USBD_STR_CDC, USBD_CDC_EP_CMD,
         USBD_CDC_CMD_MAX_SIZE, USBD_CDC_EP_OUT, USBD_CDC_EP_IN, USBD_CDC_IN_OUT_MAX_SIZE),
+    #endif
     #if CFG_TUD_MSC
     TUD_MSC_DESCRIPTOR(USBD_ITF_MSC, 5, EPNUM_MSC_OUT, EPNUM_MSC_IN, 64),
     #endif
@@ -83,9 +85,11 @@ const uint16_t *tud_descriptor_string_cb(uint8_t index, uint16_t langid) {
         case USBD_STR_PRODUCT:
             desc_str = MICROPY_HW_USB_PRODUCT_FS_STRING;
             break;
+        #if CFG_TUD_CDC
         case USBD_STR_CDC:
             desc_str = MICROPY_HW_USB_CDC_INTERFACE_STRING;
             break;
+        #endif
         #if CFG_TUD_MSC
         case USBD_STR_MSC:
             desc_str = MICROPY_HW_USB_MSC_INTERFACE_STRING;
diff --git a/shared/tinyusb/tusb_config.h b/shared/tinyusb/tusb_config.h
index 15e5acf554eb2..71769b67c8860 100644
--- a/shared/tinyusb/tusb_config.h
+++ b/shared/tinyusb/tusb_config.h
@@ -46,28 +46,40 @@
 
 #define CFG_TUSB_RHPORT0_MODE   (OPT_MODE_DEVICE)
 
+#if MICROPY_HW_USB_CDC
 #define CFG_TUD_CDC             (1)
+#else
+#define CFG_TUD_CDC             (0)
+#endif
+
+#if MICROPY_HW_USB_MSC
+#define CFG_TUD_MSC             (1)
+#else
+#define CFG_TUD_MSC             (0)
+#endif
+
+// CDC Configuration
+#if CFG_TUD_CDC
 #define CFG_TUD_CDC_EP_BUFSIZE  (256)
 #define CFG_TUD_CDC_RX_BUFSIZE  (256)
 #define CFG_TUD_CDC_TX_BUFSIZE  (256)
+#endif
 
 // MSC Configuration
 #if CFG_TUD_MSC
 #ifndef MICROPY_HW_USB_MSC_INTERFACE_STRING
 #define MICROPY_HW_USB_MSC_INTERFACE_STRING "Board MSC"
 #endif
-#define CFG_TUD_MSC             (1)
 // Set MSC EP buffer size to FatFS block size to avoid partial read/writes (offset arg).
-#define CFG_TUD_MSC_BUFSIZE     (MICROPY_FATFS_MAX_SS)
+#define CFG_TUD_MSC_BUFSIZE (MICROPY_FATFS_MAX_SS)
 #endif
 
 // Define static descriptor size and interface count based on the above config
 
-#if CFG_TUD_MSC
-#define USBD_STATIC_DESC_LEN (TUD_CONFIG_DESC_LEN + TUD_CDC_DESC_LEN + TUD_MSC_DESC_LEN)
-#else
-#define USBD_STATIC_DESC_LEN (TUD_CONFIG_DESC_LEN + TUD_CDC_DESC_LEN)
-#endif
+#define USBD_STATIC_DESC_LEN (TUD_CONFIG_DESC_LEN +                     \
+    (CFG_TUD_CDC ? (TUD_CDC_DESC_LEN) : 0) +  \
+    (CFG_TUD_MSC ? (TUD_MSC_DESC_LEN) : 0)    \
+    )
 
 #define USBD_STR_0 (0x00)
 #define USBD_STR_MANUF (0x01)
@@ -80,27 +92,41 @@
 
 #define USBD_DESC_STR_MAX (20)
 
+#if CFG_TUD_CDC
 #define USBD_ITF_CDC (0) // needs 2 interfaces
-
 #define USBD_CDC_EP_CMD (0x81)
 #define USBD_CDC_EP_OUT (0x02)
 #define USBD_CDC_EP_IN (0x82)
+#endif // CFG_TUD_CDC
 
 #if CFG_TUD_MSC
+// Interface & Endpoint numbers for MSC come after CDC, if it is enabled
+#if CFG_TUD_CDC
 #define USBD_ITF_MSC (2)
-#define EPNUM_MSC_OUT    (0x03)
-#define EPNUM_MSC_IN     (0x83)
-#endif
+#define EPNUM_MSC_OUT (0x03)
+#define EPNUM_MSC_IN (0x83)
+#else
+#define USBD_ITF_MSC (0)
+#define EPNUM_MSC_OUT (0x01)
+#define EPNUM_MSC_IN (0x81)
+#endif // CFG_TUD_CDC
+#endif // CFG_TUD_MSC
 
 /* Limits of statically defined USB interfaces, endpoints, strings */
 #if CFG_TUD_MSC
-#define USBD_ITF_STATIC_MAX (3)
+#define USBD_ITF_STATIC_MAX (USBD_ITF_MSC + 1)
 #define USBD_STR_STATIC_MAX (USBD_STR_MSC + 1)
-#define USBD_EP_STATIC_MAX (0x04) // ignoring the IN EP flag 0x80
-#else
-#define USBD_ITF_STATIC_MAX (2)
+#define USBD_EP_STATIC_MAX (EPNUM_MSC_OUT + 1)
+#elif CFG_TUD_CDC
+#define USBD_ITF_STATIC_MAX (USBD_ITF_CDC + 1)
 #define USBD_STR_STATIC_MAX (USBD_STR_CDC + 1)
-#define USBD_EP_STATIC_MAX (0x03) // ignoring the IN EP flag 0x80
+#define USBD_EP_STATIC_MAX (((EPNUM_CDC_EP_IN)&~TUSB_DIR_IN_MASK) + 1)
+#else // !CFG_TUD_MSC && !CFG_TUD_CDC
+#define USBD_ITF_STATIC_MAX (0)
+#define USBD_STR_STATIC_MAX (0)
+#define USBD_EP_STATIC_MAX (0)
 #endif
 
+#endif // MICROPY_HW_ENABLE_USBDEV
+
 #endif // MICROPY_INCLUDED_SHARED_TINYUSB_TUSB_CONFIG_H

From dbb0019666a3270b0ed032e2cb9479eadc599c46 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 14 Nov 2022 13:03:33 +1100
Subject: [PATCH 2861/3533] shared/tinyusb: Fix CDC bNumInterfaces value.

This fixes a regression from c8913fdbfadd43c879bba4d6d565be8b644f1feb

Signed-off-by: Damien George <damien@micropython.org>
---
 shared/tinyusb/tusb_config.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shared/tinyusb/tusb_config.h b/shared/tinyusb/tusb_config.h
index 71769b67c8860..23dbd14a52d55 100644
--- a/shared/tinyusb/tusb_config.h
+++ b/shared/tinyusb/tusb_config.h
@@ -118,7 +118,7 @@
 #define USBD_STR_STATIC_MAX (USBD_STR_MSC + 1)
 #define USBD_EP_STATIC_MAX (EPNUM_MSC_OUT + 1)
 #elif CFG_TUD_CDC
-#define USBD_ITF_STATIC_MAX (USBD_ITF_CDC + 1)
+#define USBD_ITF_STATIC_MAX (USBD_ITF_CDC + 2)
 #define USBD_STR_STATIC_MAX (USBD_STR_CDC + 1)
 #define USBD_EP_STATIC_MAX (((EPNUM_CDC_EP_IN)&~TUSB_DIR_IN_MASK) + 1)
 #else // !CFG_TUD_MSC && !CFG_TUD_CDC

From 8ddb4567ff94c58e56a23c652a7323575f0079d1 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Mon, 17 Oct 2022 13:14:03 +0200
Subject: [PATCH 2862/3533] stm32/boards/ARDUINO_PORTENTA_H7: Add more modules,
 I2C1 and SE pin.

Changes in this commit are:
- Increase CDC buffer size.
- Define I2C1 SCL/SDA pins.
- Add crypto device enable pin to board pins.
- Update deploy instructions.
- Add ntptime, urequests and logging to manifest.
---
 ports/stm32/boards/ARDUINO_PORTENTA_H7/deploy.md       | 2 +-
 ports/stm32/boards/ARDUINO_PORTENTA_H7/manifest.py     | 9 +++++++++
 ports/stm32/boards/ARDUINO_PORTENTA_H7/mpconfigboard.h | 7 +++++--
 ports/stm32/boards/ARDUINO_PORTENTA_H7/pins.csv        | 1 +
 4 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/ports/stm32/boards/ARDUINO_PORTENTA_H7/deploy.md b/ports/stm32/boards/ARDUINO_PORTENTA_H7/deploy.md
index 8de726b43b4c3..7f738c5791584 100644
--- a/ports/stm32/boards/ARDUINO_PORTENTA_H7/deploy.md
+++ b/ports/stm32/boards/ARDUINO_PORTENTA_H7/deploy.md
@@ -4,7 +4,7 @@ This board can programmed via DFU bootloader, using e.g. [dfu-util](http://dfu-u
 To enter the DFU bootloader, double tap the reset (blue) button, or you can use `machine.bootloader()` from the MicroPython REPL.
 
 ```bash
-dfu-util -w -d 2341:035b -a 0 -d 0x8040000 -D firmware.dfu
+dfu-util -w -a 0 -d 2341:035b -D build-ARDUINO_PORTENTA_H7/firmware.dfu
 ```
 
 Or from MicroPython source repository:
diff --git a/ports/stm32/boards/ARDUINO_PORTENTA_H7/manifest.py b/ports/stm32/boards/ARDUINO_PORTENTA_H7/manifest.py
index 4fa92b7205327..3041e77fdb048 100644
--- a/ports/stm32/boards/ARDUINO_PORTENTA_H7/manifest.py
+++ b/ports/stm32/boards/ARDUINO_PORTENTA_H7/manifest.py
@@ -1,3 +1,12 @@
 include("$(PORT_DIR)/boards/manifest.py")
+
+# Networking
 require("webrepl")
+require("urequests")
+require("ntptime")
+
+# Utils
+require("logging")
+
+# Bluetooth
 require("aioble", client=True, central=True, l2cap=True, security=True)
diff --git a/ports/stm32/boards/ARDUINO_PORTENTA_H7/mpconfigboard.h b/ports/stm32/boards/ARDUINO_PORTENTA_H7/mpconfigboard.h
index 31e19c9eb51ab..a2981352a1b80 100644
--- a/ports/stm32/boards/ARDUINO_PORTENTA_H7/mpconfigboard.h
+++ b/ports/stm32/boards/ARDUINO_PORTENTA_H7/mpconfigboard.h
@@ -159,6 +159,9 @@ extern struct _spi_bdev_t spi_bdev;
 #define MICROPY_HW_UART7_CTS        (pyb_pin_BT_CTS)
 
 // I2C busses
+#define MICROPY_HW_I2C1_SCL         (pin_B6)
+#define MICROPY_HW_I2C1_SDA         (pin_B7)
+
 #define MICROPY_HW_I2C3_SCL         (pin_H7)
 #define MICROPY_HW_I2C3_SDA         (pin_H8)
 
@@ -206,8 +209,8 @@ extern struct _spi_bdev_t spi_bdev;
 #define MICROPY_HW_USB_HS_ULPI_DIR  (pin_I11)
 #define MICROPY_HW_USB_HS_ULPI3320  (1)
 
-#define MICROPY_HW_USB_CDC_RX_DATA_SIZE     (512)
-#define MICROPY_HW_USB_CDC_TX_DATA_SIZE     (512)
+#define MICROPY_HW_USB_CDC_RX_DATA_SIZE     (1024)
+#define MICROPY_HW_USB_CDC_TX_DATA_SIZE     (1024)
 #define MICROPY_HW_USB_CDC_1200BPS_TOUCH    (1)
 #define GPIO_AF10_OTG_HS                    (GPIO_AF10_OTG2_HS)
 
diff --git a/ports/stm32/boards/ARDUINO_PORTENTA_H7/pins.csv b/ports/stm32/boards/ARDUINO_PORTENTA_H7/pins.csv
index b22da66dd4c08..6ab00f02ec402 100644
--- a/ports/stm32/boards/ARDUINO_PORTENTA_H7/pins.csv
+++ b/ports/stm32/boards/ARDUINO_PORTENTA_H7/pins.csv
@@ -231,3 +231,4 @@ I2C3_SCL,PH7
 -QSPI2_D1,PD12
 -QSPI2_D2,-PF7
 -QSPI2_D3,PD13
+-SE05X_EN,-PI12

From e35bcb0f0b940ffb73396cd6c023ac29b16e5b9b Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Fri, 4 Nov 2022 18:42:50 +0100
Subject: [PATCH 2863/3533] rp2/boards/ARDUINO_NANO_RP2040: Add more modules
 and enable MD5 hash.

Changes in this commit are:
- Enable MD5 hash to verify Nina WiFi firmware.
- Add ntptime, urequests and espflash to manifest.
---
 ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/manifest.py     | 5 +++++
 ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/mpconfigboard.h | 3 +++
 2 files changed, 8 insertions(+)

diff --git a/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/manifest.py b/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/manifest.py
index dbd45fa408e63..5061e2cf0516a 100644
--- a/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/manifest.py
+++ b/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/manifest.py
@@ -3,9 +3,14 @@
 # Networking
 require("webrepl")
 require("urequests")
+require("ntptime")
 
 # Drivers
 require("lsm6dsox")
+require("espflash")
+
+# Utils
+require("logging")
 
 # Bluetooth
 require("aioble", client=True, central=True, l2cap=True, security=True)
diff --git a/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/mpconfigboard.h b/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/mpconfigboard.h
index 5ea9b8cdb850f..1818b56a689fe 100644
--- a/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/mpconfigboard.h
+++ b/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/mpconfigboard.h
@@ -7,6 +7,9 @@
 // Enable networking.
 #define MICROPY_PY_NETWORK              (1)
 
+// Enable MD5 hash.
+#define MICROPY_PY_UHASHLIB_MD5         (1)
+
 // Disable internal error numbers.
 #define MICROPY_USE_INTERNAL_ERRNO      (0)
 

From 45a85f5a357f0064388a42627f3c39e811c78780 Mon Sep 17 00:00:00 2001
From: Takeo Takahashi <takeo.takahashi.xv@renesas.com>
Date: Fri, 16 Sep 2022 22:47:38 +0900
Subject: [PATCH 2864/3533] renesas-ra/boards: Update linker script to detect
 code flash overflow.

Changes in this commit:
- Add FLASH_FS region to linker script.
- Add flash storage start & end symbols to linker script.
- Use flash storage start & end symbols in flashbdev.c

Signed-off-by: Takeo Takahashi <takeo.takahashi.xv@renesas.com>
---
 .../boards/RA4M1_CLICKER/ra4m1_clicker.ld     |  6 +-
 ports/renesas-ra/boards/RA4M1_EK/ra4m1_ek.ld  |  6 +-
 ports/renesas-ra/boards/RA4W1_EK/ra4w1_ek.ld  |  6 +-
 ports/renesas-ra/boards/RA6M1_EK/ra6m1_ek.ld  |  6 +-
 ports/renesas-ra/boards/RA6M2_EK/ra6m2_ek.ld  |  6 +-
 ports/renesas-ra/flashbdev.c                  | 59 ++++---------------
 6 files changed, 37 insertions(+), 52 deletions(-)

diff --git a/ports/renesas-ra/boards/RA4M1_CLICKER/ra4m1_clicker.ld b/ports/renesas-ra/boards/RA4M1_CLICKER/ra4m1_clicker.ld
index 0ce4e9267160f..52f8acf93eb33 100644
--- a/ports/renesas-ra/boards/RA4M1_CLICKER/ra4m1_clicker.ld
+++ b/ports/renesas-ra/boards/RA4M1_CLICKER/ra4m1_clicker.ld
@@ -5,7 +5,8 @@
 /* Linker script to configure memory regions. */
 MEMORY
 {
-  FLASH (rx)         : ORIGIN = 0x00000000, LENGTH = 0x00040000  /* 256KB */
+  FLASH (rx)         : ORIGIN = 0x00000000, LENGTH = 0x00037000  /* 220KB/256KB */
+  FLASH_FS (r)       : ORIGIN = 0x00037000, LENGTH = 0x00009000  /* 36KB/256KB */
   RAM (rwx)          : ORIGIN = 0x20000000, LENGTH = 0x00008000  /* 32KB */
   DATA_FLASH (rx)    : ORIGIN = 0x40100000, LENGTH = 0x00002000  /* 8KB */
   ID_CODE (rx)       : ORIGIN = 0x01010018, LENGTH = 0x00000020  /* 32bytes */
@@ -296,3 +297,6 @@ _ram_start = ORIGIN(RAM);
 _ram_end = ORIGIN(RAM) + LENGTH(RAM);
 _heap_start = __HeapBase;	/* heap starts just after statically allocated memory */
 _heap_end = __HeapLimit;	/* tunable */
+
+_micropy_hw_internal_flash_storage_start = ORIGIN(FLASH_FS);
+_micropy_hw_internal_flash_storage_end   = ORIGIN(FLASH_FS) + LENGTH(FLASH_FS);
diff --git a/ports/renesas-ra/boards/RA4M1_EK/ra4m1_ek.ld b/ports/renesas-ra/boards/RA4M1_EK/ra4m1_ek.ld
index 0ce4e9267160f..52f8acf93eb33 100644
--- a/ports/renesas-ra/boards/RA4M1_EK/ra4m1_ek.ld
+++ b/ports/renesas-ra/boards/RA4M1_EK/ra4m1_ek.ld
@@ -5,7 +5,8 @@
 /* Linker script to configure memory regions. */
 MEMORY
 {
-  FLASH (rx)         : ORIGIN = 0x00000000, LENGTH = 0x00040000  /* 256KB */
+  FLASH (rx)         : ORIGIN = 0x00000000, LENGTH = 0x00037000  /* 220KB/256KB */
+  FLASH_FS (r)       : ORIGIN = 0x00037000, LENGTH = 0x00009000  /* 36KB/256KB */
   RAM (rwx)          : ORIGIN = 0x20000000, LENGTH = 0x00008000  /* 32KB */
   DATA_FLASH (rx)    : ORIGIN = 0x40100000, LENGTH = 0x00002000  /* 8KB */
   ID_CODE (rx)       : ORIGIN = 0x01010018, LENGTH = 0x00000020  /* 32bytes */
@@ -296,3 +297,6 @@ _ram_start = ORIGIN(RAM);
 _ram_end = ORIGIN(RAM) + LENGTH(RAM);
 _heap_start = __HeapBase;	/* heap starts just after statically allocated memory */
 _heap_end = __HeapLimit;	/* tunable */
+
+_micropy_hw_internal_flash_storage_start = ORIGIN(FLASH_FS);
+_micropy_hw_internal_flash_storage_end   = ORIGIN(FLASH_FS) + LENGTH(FLASH_FS);
diff --git a/ports/renesas-ra/boards/RA4W1_EK/ra4w1_ek.ld b/ports/renesas-ra/boards/RA4W1_EK/ra4w1_ek.ld
index 172f124fc8de3..1241b5bc2302b 100644
--- a/ports/renesas-ra/boards/RA4W1_EK/ra4w1_ek.ld
+++ b/ports/renesas-ra/boards/RA4W1_EK/ra4w1_ek.ld
@@ -5,7 +5,8 @@
 /* Linker script to configure memory regions. */
 MEMORY
 {
-  FLASH (rx)         : ORIGIN = 0x00000000, LENGTH = 0x00080000  /* 512KB */
+  FLASH (rx)         : ORIGIN = 0x00000000, LENGTH = 0x00070000  /* 448KB/512KB */
+  FLASH_FS (r)       : ORIGIN = 0x00070000, LENGTH = 0x00010000  /* 64KB/512KB */
   RAM (rwx)          : ORIGIN = 0x20000000, LENGTH = 0x00018000  /* 96KB */
   DATA_FLASH (rx)    : ORIGIN = 0x40100000, LENGTH = 0x00002000  /* 8KB */
   ID_CODE (rx)       : ORIGIN = 0x01010018, LENGTH = 0x00000020  /* 32bytes */
@@ -296,3 +297,6 @@ _ram_start = ORIGIN(RAM);
 _ram_end = ORIGIN(RAM) + LENGTH(RAM);
 _heap_start = __HeapBase;	/* heap starts just after statically allocated memory */
 _heap_end = __HeapLimit;	/* tunable */
+
+_micropy_hw_internal_flash_storage_start = ORIGIN(FLASH_FS);
+_micropy_hw_internal_flash_storage_end   = ORIGIN(FLASH_FS) + LENGTH(FLASH_FS);
diff --git a/ports/renesas-ra/boards/RA6M1_EK/ra6m1_ek.ld b/ports/renesas-ra/boards/RA6M1_EK/ra6m1_ek.ld
index 10ec87aaa60c6..90a425bdecb0d 100644
--- a/ports/renesas-ra/boards/RA6M1_EK/ra6m1_ek.ld
+++ b/ports/renesas-ra/boards/RA6M1_EK/ra6m1_ek.ld
@@ -5,7 +5,8 @@
 /* Linker script to configure memory regions. */
 MEMORY
 {
-  FLASH (rx)         : ORIGIN = 0x00000000, LENGTH = 0x00080000  /* 512KB */
+  FLASH (rx)         : ORIGIN = 0x00000000, LENGTH = 0x00060000  /* 384KB/512KB */
+  FLASH_FS (r)       : ORIGIN = 0x00060000, LENGTH = 0x00020000  /* 128KB/512KB */
   RAM (rwx)          : ORIGIN = 0x1FFE0000, LENGTH = 0x00040000  /* 256KB */
   DATA_FLASH (rx)    : ORIGIN = 0x40100000, LENGTH = 0x00002000  /* 8KB */
   ID_CODE (rx)       : ORIGIN = 0x0100A150, LENGTH = 0x00000010  /* 32bytes */
@@ -296,3 +297,6 @@ _ram_start = ORIGIN(RAM);
 _ram_end = ORIGIN(RAM) + LENGTH(RAM);
 _heap_start = __HeapBase;	/* heap starts just after statically allocated memory */
 _heap_end = __HeapLimit;	/* tunable */
+
+_micropy_hw_internal_flash_storage_start = ORIGIN(FLASH_FS);
+_micropy_hw_internal_flash_storage_end   = ORIGIN(FLASH_FS) + LENGTH(FLASH_FS);
diff --git a/ports/renesas-ra/boards/RA6M2_EK/ra6m2_ek.ld b/ports/renesas-ra/boards/RA6M2_EK/ra6m2_ek.ld
index 4ad1b1ac1b8b0..086f6630c110a 100644
--- a/ports/renesas-ra/boards/RA6M2_EK/ra6m2_ek.ld
+++ b/ports/renesas-ra/boards/RA6M2_EK/ra6m2_ek.ld
@@ -5,7 +5,8 @@
 /* Linker script to configure memory regions. */
 MEMORY
 {
-  FLASH (rx)         : ORIGIN = 0x00000000, LENGTH = 0x00100000  /* 1MB */
+  FLASH (rx)         : ORIGIN = 0x00000000, LENGTH = 0x000e0000  /* 896KB/1MB */
+  FLASH_FS (r)       : ORIGIN = 0x000e0000, LENGTH = 0x00020000  /* 128KB/1MB */
   RAM (rwx)          : ORIGIN = 0x1FFE0000, LENGTH = 0x00060000  /* 384KB */
   DATA_FLASH (rx)    : ORIGIN = 0x40100000, LENGTH = 0x00008000  /* 32KB */
   ID_CODE (rx)       : ORIGIN = 0x0100A150, LENGTH = 0x00000010  /* 32bytes */
@@ -296,3 +297,6 @@ _ram_start = ORIGIN(RAM);
 _ram_end = ORIGIN(RAM) + LENGTH(RAM);
 _heap_start = __HeapBase;	/* heap starts just after statically allocated memory */
 _heap_end = __HeapLimit;	/* tunable */
+
+_micropy_hw_internal_flash_storage_start = ORIGIN(FLASH_FS);
+_micropy_hw_internal_flash_storage_end   = ORIGIN(FLASH_FS) + LENGTH(FLASH_FS);
diff --git a/ports/renesas-ra/flashbdev.c b/ports/renesas-ra/flashbdev.c
index 8fb20c66eada1..3e890d31d9cab 100644
--- a/ports/renesas-ra/flashbdev.c
+++ b/ports/renesas-ra/flashbdev.c
@@ -34,65 +34,30 @@
 #include "led.h"
 #include "flash.h"
 #include "storage.h"
-#if defined(RA4M1) | defined(RA4M3) | defined(RA4W1) | defined(RA6M1) | defined(RA6M2) | defined(RA6M3)
 #include "ra_flash.h"
-#endif
 
 #if MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE
 
-// #define DEBUG_FLASH_BDEV
-
-// Here we try to automatically configure the location and size of the flash
-// pages to use for the internal storage.  We also configure the location of the
-// cache used for writing.
-
-#if defined(RA4M1)
-
-STATIC byte flash_cache_mem[0x800] __attribute__((aligned(16))); // 2K
-#define CACHE_MEM_START_ADDR (&flash_cache_mem[0])
-#define FLASH_SECTOR_SIZE_MAX (0x800)           // 2k max
-#define FLASH_MEM_SEG1_START_ADDR (0x37000)     // sector 1
-#define FLASH_MEM_SEG1_NUM_BLOCKS (72)          // sectors 1,2,...,72
+// The linker script specifies flash storage locations.
+extern uint8_t _micropy_hw_internal_flash_storage_start;
+extern uint8_t _micropy_hw_internal_flash_storage_end;
 
-#elif defined(RA4M3)
-STATIC byte flash_cache_mem[0x800] __attribute__((aligned(16))); // 2K
-#define CACHE_MEM_START_ADDR (&flash_cache_mem[0])
-#define FLASH_SECTOR_SIZE_MAX (0x800)           // 2k max
-#define FLASH_MEM_SEG1_START_ADDR (0x37000)     // sector 1
-#define FLASH_MEM_SEG1_NUM_BLOCKS (72)          // sectors 1,2,...,72
+#define FLASH_MEM_SEG1_START_ADDR \
+    ((long)&_micropy_hw_internal_flash_storage_start)
+#define FLASH_MEM_SEG1_NUM_BLOCKS \
+    ((&_micropy_hw_internal_flash_storage_end - &_micropy_hw_internal_flash_storage_start) / 512)
 
-#elif defined(RA4W1)
-STATIC byte flash_cache_mem[0x800] __attribute__((aligned(16))); // 2K
-#define CACHE_MEM_START_ADDR (&flash_cache_mem[0])
+#if defined(RA4M1) | defined(RA4M3) | defined(RA4W1)
 #define FLASH_SECTOR_SIZE_MAX (0x800)           // 2k max
-#define FLASH_MEM_SEG1_START_ADDR (0x70000)     // sector 1
-#define FLASH_MEM_SEG1_NUM_BLOCKS (128)         // sectors 1,2,...,128
-
-#elif defined(RA6M1)
-STATIC byte flash_cache_mem[0x8000] __attribute__((aligned(16))); // 32K
-#define CACHE_MEM_START_ADDR (&flash_cache_mem[0])
-#define FLASH_SECTOR_SIZE_MAX (0x8000)          // 32k max
-#define FLASH_MEM_SEG1_START_ADDR (0x60000)     // sector 1
-#define FLASH_MEM_SEG1_NUM_BLOCKS (256)         // sectors 1,2,...,256
-
-#elif defined(RA6M2)
-STATIC byte flash_cache_mem[0x8000] __attribute__((aligned(16))); // 32K
-#define CACHE_MEM_START_ADDR (&flash_cache_mem[0])
-#define FLASH_SECTOR_SIZE_MAX (0x8000)          // 32k max
-#define FLASH_MEM_SEG1_START_ADDR (0xe0000)     // sector 1
-#define FLASH_MEM_SEG1_NUM_BLOCKS (512)         // sectors 1,2,...,512
-
-#elif defined(RA6M3)
-STATIC byte flash_cache_mem[0x8000] __attribute__((aligned(16))); // 32K
-#define CACHE_MEM_START_ADDR (&flash_cache_mem[0])
+#elif defined(RA6M1) | defined(RA6M2) | defined(RA6M3)
 #define FLASH_SECTOR_SIZE_MAX (0x8000)          // 32k max
-#define FLASH_MEM_SEG1_START_ADDR (0x60000)     // sector 1
-#define FLASH_MEM_SEG1_NUM_BLOCKS (256)         // sectors 1,2,...,256
-
 #else
 #error "no internal flash storage support for this MCU"
 #endif
 
+STATIC byte flash_cache_mem[FLASH_SECTOR_SIZE_MAX] __attribute__((aligned(16)));
+#define CACHE_MEM_START_ADDR (&flash_cache_mem[0])
+
 #if !defined(FLASH_MEM_SEG2_START_ADDR)
 #define FLASH_MEM_SEG2_START_ADDR (0) // no second segment
 #define FLASH_MEM_SEG2_NUM_BLOCKS (0) // no second segment

From 376f15395ca0c71172ad996229d93a1c2125b2c1 Mon Sep 17 00:00:00 2001
From: Takeo Takahashi <takeo.takahashi.xv@renesas.com>
Date: Fri, 16 Sep 2022 22:52:50 +0900
Subject: [PATCH 2865/3533] renesas-ra: Disable debugging option for RA4 to
 reduce code size.

Signed-off-by: Takeo Takahashi <takeo.takahashi.xv@renesas.com>
---
 ports/renesas-ra/build_all_boards.sh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/ports/renesas-ra/build_all_boards.sh b/ports/renesas-ra/build_all_boards.sh
index 49b1cab85d21f..351047e079a0e 100644
--- a/ports/renesas-ra/build_all_boards.sh
+++ b/ports/renesas-ra/build_all_boards.sh
@@ -2,8 +2,8 @@
 set -eu -o pipefail
 export BOARD="RA4M1_CLICKER"
 DT=`date +%Y%m%d%H%M`
-make DEBUG=1 BOARD=${BOARD} clean 2>&1 | tee ${BOARD}_build_${DT}.log
-make DEBUG=1 BOARD=${BOARD}       2>&1 | tee -a ${BOARD}_build_${DT}.log
+make DEBUG=0 BOARD=${BOARD} clean 2>&1 | tee ${BOARD}_build_${DT}.log
+make DEBUG=0 BOARD=${BOARD}       2>&1 | tee -a ${BOARD}_build_${DT}.log
 #
 export BOARD="RA6M2_EK"
 DT=`date +%Y%m%d%H%M`
@@ -12,13 +12,13 @@ make DEBUG=1 BOARD=${BOARD}       2>&1 | tee -a ${BOARD}_build_${DT}.log
 #
 export BOARD="RA4M1_EK"
 DT=`date +%Y%m%d%H%M`
-make DEBUG=1 BOARD=${BOARD} clean 2>&1 | tee ${BOARD}_build_${DT}.log
-make DEBUG=1 BOARD=${BOARD}       2>&1 | tee -a ${BOARD}_build_${DT}.log
+make DEBUG=0 BOARD=${BOARD} clean 2>&1 | tee ${BOARD}_build_${DT}.log
+make DEBUG=0 BOARD=${BOARD}       2>&1 | tee -a ${BOARD}_build_${DT}.log
 #
 export BOARD="RA4W1_EK"
 DT=`date +%Y%m%d%H%M`
-make DEBUG=1 BOARD=${BOARD} clean 2>&1 | tee ${BOARD}_build_${DT}.log
-make DEBUG=1 BOARD=${BOARD}       2>&1 | tee -a ${BOARD}_build_${DT}.log
+make DEBUG=0 BOARD=${BOARD} clean 2>&1 | tee ${BOARD}_build_${DT}.log
+make DEBUG=0 BOARD=${BOARD}       2>&1 | tee -a ${BOARD}_build_${DT}.log
 #
 export BOARD="RA6M1_EK"
 DT=`date +%Y%m%d%H%M`

From 75012cfd6ec68d229523620f827a658ca3c6afd3 Mon Sep 17 00:00:00 2001
From: Takeo Takahashi <takeo.takahashi.xv@renesas.com>
Date: Fri, 16 Sep 2022 22:55:57 +0900
Subject: [PATCH 2866/3533] docs/renesas-ra: Correct the internal file system
 size of EK-RA6M2.

Signed-off-by: Takeo Takahashi <takeo.takahashi.xv@renesas.com>
---
 docs/renesas-ra/tutorial/program_in_flash.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/renesas-ra/tutorial/program_in_flash.rst b/docs/renesas-ra/tutorial/program_in_flash.rst
index ec276a6125c66..4abb95222c439 100644
--- a/docs/renesas-ra/tutorial/program_in_flash.rst
+++ b/docs/renesas-ra/tutorial/program_in_flash.rst
@@ -19,7 +19,7 @@ As the factory setting, following size is allocated for the file system:
  EK-RA4M1           36KB ( 36864B)
  EK-RA4W1           64KB ( 65536B)
  EK-RA6M1          128KB (131072B)
- EK-RA6M2          256KB (262144B)
+ EK-RA6M2          128KB (131072B)
  RA4M1 CLICKER      36KB ( 36864B)
 ===============  ===================
 

From 5228f4067da028f0663e1ec2ceda139e07865b9d Mon Sep 17 00:00:00 2001
From: Takeo Takahashi <takeo.takahashi.xv@renesas.com>
Date: Mon, 14 Nov 2022 11:16:49 +0900
Subject: [PATCH 2867/3533] renesas-ra: Change file system size to 64KB for
 RA6M1.

Changes in this commit:
- Change file system size from 128KB to 64KB in ra6m1_ek.ld.
- Change EK-RA6M1's file system size in renesas-ra port document.

Signed-off-by: Takeo Takahashi <takeo.takahashi.xv@renesas.com>
---
 docs/renesas-ra/tutorial/program_in_flash.rst | 2 +-
 ports/renesas-ra/boards/RA6M1_EK/ra6m1_ek.ld  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/renesas-ra/tutorial/program_in_flash.rst b/docs/renesas-ra/tutorial/program_in_flash.rst
index 4abb95222c439..99a7a3839dd46 100644
--- a/docs/renesas-ra/tutorial/program_in_flash.rst
+++ b/docs/renesas-ra/tutorial/program_in_flash.rst
@@ -18,7 +18,7 @@ As the factory setting, following size is allocated for the file system:
 ---------------  -------------------
  EK-RA4M1           36KB ( 36864B)
  EK-RA4W1           64KB ( 65536B)
- EK-RA6M1          128KB (131072B)
+ EK-RA6M1           64KB ( 65536B)
  EK-RA6M2          128KB (131072B)
  RA4M1 CLICKER      36KB ( 36864B)
 ===============  ===================
diff --git a/ports/renesas-ra/boards/RA6M1_EK/ra6m1_ek.ld b/ports/renesas-ra/boards/RA6M1_EK/ra6m1_ek.ld
index 90a425bdecb0d..c7d85ed3db0a1 100644
--- a/ports/renesas-ra/boards/RA6M1_EK/ra6m1_ek.ld
+++ b/ports/renesas-ra/boards/RA6M1_EK/ra6m1_ek.ld
@@ -5,8 +5,8 @@
 /* Linker script to configure memory regions. */
 MEMORY
 {
-  FLASH (rx)         : ORIGIN = 0x00000000, LENGTH = 0x00060000  /* 384KB/512KB */
-  FLASH_FS (r)       : ORIGIN = 0x00060000, LENGTH = 0x00020000  /* 128KB/512KB */
+  FLASH (rx)         : ORIGIN = 0x00000000, LENGTH = 0x00070000  /* 448KB/512KB */
+  FLASH_FS (r)       : ORIGIN = 0x00070000, LENGTH = 0x00010000  /* 64KB/512KB */
   RAM (rwx)          : ORIGIN = 0x1FFE0000, LENGTH = 0x00040000  /* 256KB */
   DATA_FLASH (rx)    : ORIGIN = 0x40100000, LENGTH = 0x00002000  /* 8KB */
   ID_CODE (rx)       : ORIGIN = 0x0100A150, LENGTH = 0x00000010  /* 32bytes */

From 96a2cc5e13113338c3e4b12a145a852819b623cf Mon Sep 17 00:00:00 2001
From: Trammell hudson <hudson@trmm.net>
Date: Tue, 25 Feb 2020 22:53:46 +0100
Subject: [PATCH 2868/3533] esp8266/machine_pwm: Enable real open drain output
 on pin driven by PWM.

The PWM module now detects if the pin is open drain and if so switches it
to hardware open drain before starting the PWM.

The code that was explicitly turning off the open drain output during PWM
is also removed.

Together these changes allow driving external transistor high-current
switches with PWM.

Signed-off-by: Trammell hudson <hudson@trmm.net>
---
 ports/esp8266/esppwm.c      |  1 -
 ports/esp8266/machine_pin.c | 10 +---------
 ports/esp8266/machine_pwm.c |  9 +++++++++
 ports/esp8266/modmachine.h  | 10 ++++++++++
 4 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/ports/esp8266/esppwm.c b/ports/esp8266/esppwm.c
index 6164e2fc8b111..3b705fb94e467 100644
--- a/ports/esp8266/esppwm.c
+++ b/ports/esp8266/esppwm.c
@@ -389,7 +389,6 @@ pwm_add(uint8_t pin_id, uint32_t pin_mux, uint32_t pin_func) {
             pwm.duty[i] = 0;
             pwm_gpio |= (1 << pin_num[channel]);
             PIN_FUNC_SELECT(pin_mux, pin_func);
-            GPIO_REG_WRITE(GPIO_PIN_ADDR(GPIO_ID_PIN(pin_num[channel])), GPIO_REG_READ(GPIO_PIN_ADDR(GPIO_ID_PIN(pin_num[channel]))) & (~GPIO_PIN_PAD_DRIVER_SET(GPIO_PAD_DRIVER_ENABLE)));  // disable open drain;
             pwm_channel_num++;
             UNLOCK_PWM(critical);   // leave critical
             return channel;
diff --git a/ports/esp8266/machine_pin.c b/ports/esp8266/machine_pin.c
index ea17728e2359b..f5e17c7e14dc3 100644
--- a/ports/esp8266/machine_pin.c
+++ b/ports/esp8266/machine_pin.c
@@ -46,14 +46,6 @@
     (GPIO_REG_READ(GPIO_PIN_ADDR(phys_port)) & ~GPIO_PIN_INT_TYPE_MASK) \
     | GPIO_PIN_INT_TYPE_SET(trig))) \
 
-#define GPIO_MODE_INPUT (0)
-#define GPIO_MODE_OUTPUT (1)
-#define GPIO_MODE_OPEN_DRAIN (2) // synthesised
-#define GPIO_PULL_NONE (0)
-#define GPIO_PULL_UP (1)
-// Removed in SDK 1.1.0
-// #define GPIO_PULL_DOWN (2)
-
 typedef struct _pin_irq_obj_t {
     mp_obj_base_t base;
     uint16_t phys_port;
@@ -84,7 +76,7 @@ const pyb_pin_obj_t pyb_pin_obj[16 + 1] = {
     {{&pyb_pin_type}, 16, -1, -1},
 };
 
-STATIC uint8_t pin_mode[16 + 1];
+uint8_t pin_mode[16 + 1];
 
 // forward declaration
 STATIC const pin_irq_obj_t pin_irq_obj[16];
diff --git a/ports/esp8266/machine_pwm.c b/ports/esp8266/machine_pwm.c
index 00547195f9a9f..6b7728deadeee 100644
--- a/ports/esp8266/machine_pwm.c
+++ b/ports/esp8266/machine_pwm.c
@@ -25,6 +25,7 @@
  */
 
 #include "py/runtime.h"
+#include "py/mphal.h"
 #include "modmachine.h"
 
 #include "esppwm.h"
@@ -74,6 +75,10 @@ STATIC void mp_machine_pwm_init_helper(machine_pwm_obj_t *self, size_t n_args, c
         pwm_set_duty(args[ARG_duty].u_int, self->channel);
     }
 
+    if (pin_mode[self->pin->phys_port] == GPIO_MODE_OPEN_DRAIN) {
+        mp_hal_pin_open_drain(self->pin->phys_port);
+    }
+
     pwm_start();
 }
 
@@ -120,6 +125,10 @@ STATIC mp_obj_t mp_machine_pwm_duty_get(machine_pwm_obj_t *self) {
     if (!self->active) {
         pwm_add(self->pin->phys_port, self->pin->periph, self->pin->func);
         self->active = 1;
+
+        if (pin_mode[self->pin->phys_port] == GPIO_MODE_OPEN_DRAIN) {
+            mp_hal_pin_open_drain(self->pin->phys_port);
+        }
     }
     return MP_OBJ_NEW_SMALL_INT(pwm_get_duty(self->channel));
 }
diff --git a/ports/esp8266/modmachine.h b/ports/esp8266/modmachine.h
index 4a73d3b8e8013..9b7a5e3cb226e 100644
--- a/ports/esp8266/modmachine.h
+++ b/ports/esp8266/modmachine.h
@@ -21,6 +21,16 @@ typedef struct _pyb_pin_obj_t {
 
 const pyb_pin_obj_t pyb_pin_obj[16 + 1];
 
+#define GPIO_MODE_INPUT (0)
+#define GPIO_MODE_OUTPUT (1)
+#define GPIO_MODE_OPEN_DRAIN (2) // synthesised
+#define GPIO_PULL_NONE (0)
+#define GPIO_PULL_UP (1)
+// Removed in SDK 1.1.0
+// #define GPIO_PULL_DOWN (2)
+
+extern uint8_t pin_mode[16 + 1];
+
 void pin_init0(void);
 
 uint mp_obj_get_pin(mp_obj_t pin_in);

From d9bca305e576a98192724c212c31413395d31cb4 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 15 Nov 2022 12:44:29 +1100
Subject: [PATCH 2869/3533] esp8266/machine_pin: Disable open drain when pin
 becomes input/output.

Otherwise the pin stays in open drain mode.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp8266/machine_pin.c | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/ports/esp8266/machine_pin.c b/ports/esp8266/machine_pin.c
index f5e17c7e14dc3..a76f55423799c 100644
--- a/ports/esp8266/machine_pin.c
+++ b/ports/esp8266/machine_pin.c
@@ -46,6 +46,16 @@
     (GPIO_REG_READ(GPIO_PIN_ADDR(phys_port)) & ~GPIO_PIN_INT_TYPE_MASK) \
     | GPIO_PIN_INT_TYPE_SET(trig))) \
 
+#define ENABLE_OPEN_DRAIN(phys_port) \
+    (GPIO_REG_WRITE(GPIO_PIN_ADDR(GPIO_ID_PIN(phys_port)), \
+    GPIO_REG_READ(GPIO_PIN_ADDR(GPIO_ID_PIN(phys_port))) \
+    | GPIO_PIN_PAD_DRIVER_SET(GPIO_PAD_DRIVER_ENABLE)))
+
+#define DISABLE_OPEN_DRAIN(phys_port) \
+    (GPIO_REG_WRITE(GPIO_PIN_ADDR(GPIO_ID_PIN(phys_port)), \
+    GPIO_REG_READ(GPIO_PIN_ADDR(GPIO_ID_PIN(phys_port))) \
+    & ~GPIO_PIN_PAD_DRIVER_SET(GPIO_PAD_DRIVER_ENABLE))) \
+
 typedef struct _pin_irq_obj_t {
     mp_obj_base_t base;
     uint16_t phys_port;
@@ -165,9 +175,7 @@ void mp_hal_pin_open_drain(mp_hal_pin_obj_t pin_id) {
 
     ETS_GPIO_INTR_DISABLE();
     PIN_FUNC_SELECT(pin->periph, pin->func);
-    GPIO_REG_WRITE(GPIO_PIN_ADDR(GPIO_ID_PIN(pin->phys_port)),
-        GPIO_REG_READ(GPIO_PIN_ADDR(GPIO_ID_PIN(pin->phys_port)))
-        | GPIO_PIN_PAD_DRIVER_SET(GPIO_PAD_DRIVER_ENABLE)); // open drain
+    ENABLE_OPEN_DRAIN(pin->phys_port);
     GPIO_REG_WRITE(GPIO_ENABLE_ADDRESS,
         GPIO_REG_READ(GPIO_ENABLE_ADDRESS) | (1 << pin->phys_port));
     ETS_GPIO_INTR_ENABLE();
@@ -271,6 +279,7 @@ STATIC mp_obj_t pyb_pin_obj_init_helper(pyb_pin_obj_t *self, size_t n_args, cons
             mp_raise_ValueError(MP_ERROR_TEXT("Pin(16) doesn't support pull"));
         }
     } else {
+        DISABLE_OPEN_DRAIN(self->phys_port);
         PIN_FUNC_SELECT(self->periph, self->func);
         #if 0
         // Removed in SDK 1.1.0

From e7875829c2d3540c2a261a256442db747bfd34aa Mon Sep 17 00:00:00 2001
From: Koen De Vleeschauwer <kdv@kdvelectronics.eu>
Date: Sat, 27 Jun 2020 12:23:38 +0200
Subject: [PATCH 2870/3533] stm32/usbd_desc: Support USB strings on CDC
 interface descriptors.

A board can now name the CDC ports, eg:

    #define MICROPY_HW_USB_CDC_NUM                  (3)
    #define MICROPY_HW_USB_INTERFACE_CDC0_STRING    "REPL"
    #define MICROPY_HW_USB_INTERFACE_CDC1_STRING    "GDB Server"
    #define MICROPY_HW_USB_INTERFACE_CDC2_STRING    "UART Port"

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/usbd_desc.c                        | 18 ++++++++++++++++++
 .../stm32/usbdev/class/src/usbd_cdc_msc_hid.c  | 17 +++++++++++++++++
 ports/stm32/usbdev/core/inc/usbd_def.h         |  3 +++
 3 files changed, 38 insertions(+)

diff --git a/ports/stm32/usbd_desc.c b/ports/stm32/usbd_desc.c
index fd50029fc5acf..3f6b74b800cbe 100644
--- a/ports/stm32/usbd_desc.c
+++ b/ports/stm32/usbd_desc.c
@@ -156,6 +156,24 @@ STATIC uint8_t *USBD_StrDescriptor(USBD_HandleTypeDef *pdev, uint8_t idx, uint16
             }
             break;
 
+        #ifdef MICROPY_HW_USB_INTERFACE_CDC0_STRING
+        case USBD_IDX_INTERFACE_CDC0_STR:
+            str = MICROPY_HW_USB_INTERFACE_CDC0_STRING;
+            break;
+        #endif
+
+        #ifdef MICROPY_HW_USB_INTERFACE_CDC1_STRING
+        case USBD_IDX_INTERFACE_CDC1_STR:
+            str = MICROPY_HW_USB_INTERFACE_CDC1_STRING;
+            break;
+        #endif
+
+        #ifdef MICROPY_HW_USB_INTERFACE_CDC2_STRING
+        case USBD_IDX_INTERFACE_CDC2_STR:
+            str = MICROPY_HW_USB_INTERFACE_CDC2_STRING;
+            break;
+        #endif
+
         default:
             // invalid string index
             return NULL;
diff --git a/ports/stm32/usbdev/class/src/usbd_cdc_msc_hid.c b/ports/stm32/usbdev/class/src/usbd_cdc_msc_hid.c
index 5e24730a0fac9..3708c75589e42 100644
--- a/ports/stm32/usbdev/class/src/usbd_cdc_msc_hid.c
+++ b/ports/stm32/usbdev/class/src/usbd_cdc_msc_hid.c
@@ -438,6 +438,23 @@ static size_t make_cdc_desc(uint8_t *dest, int need_iad, uint8_t iface_num) {
         memcpy(dest, cdc_class_desc_data + 8, sizeof(cdc_class_desc_data) - 8);
     }
     dest[2] = iface_num;        // bInterfaceNumber, main class
+
+    #ifdef MICROPY_HW_USB_INTERFACE_CDC0_STRING
+    if (iface_num == CDC_IFACE_NUM_ALONE || iface_num == CDC_IFACE_NUM_WITH_MSC || iface_num == CDC_IFACE_NUM_WITH_HID) {
+        dest[8] = USBD_IDX_INTERFACE_CDC0_STR; // iInterface
+    }
+    #endif
+    #ifdef MICROPY_HW_USB_INTERFACE_CDC1_STRING
+    if (iface_num == CDC2_IFACE_NUM_WITH_CDC || iface_num == CDC2_IFACE_NUM_WITH_MSC) {
+        dest[8] = USBD_IDX_INTERFACE_CDC1_STR; // iInterface
+    }
+    #endif
+    #ifdef MICROPY_HW_USB_INTERFACE_CDC2_STRING
+    if (iface_num == CDC3_IFACE_NUM_WITH_CDC || iface_num == CDC3_IFACE_NUM_WITH_MSC) {
+        dest[8] = USBD_IDX_INTERFACE_CDC2_STR; // iInterface
+    }
+    #endif
+
     dest[18] = iface_num + 1;   // bDataInterface
     dest[26] = iface_num + 0;   // bMasterInterface
     dest[27] = iface_num + 1;   // bSlaveInterface
diff --git a/ports/stm32/usbdev/core/inc/usbd_def.h b/ports/stm32/usbdev/core/inc/usbd_def.h
index 44c8dd8d93b2e..fb29d57056b16 100644
--- a/ports/stm32/usbdev/core/inc/usbd_def.h
+++ b/ports/stm32/usbdev/core/inc/usbd_def.h
@@ -66,6 +66,9 @@
 #define  USBD_IDX_SERIAL_STR                            0x03
 #define  USBD_IDX_CONFIG_STR                            0x04
 #define  USBD_IDX_INTERFACE_STR                         0x05
+#define  USBD_IDX_INTERFACE_CDC0_STR                    0x06
+#define  USBD_IDX_INTERFACE_CDC1_STR                    0x07
+#define  USBD_IDX_INTERFACE_CDC2_STR                    0x08
 
 #define  USB_REQ_TYPE_STANDARD                          0x00
 #define  USB_REQ_TYPE_CLASS                             0x20

From fbc96009f8e97abf78fe447f644e5ca8ca2bb05f Mon Sep 17 00:00:00 2001
From: stijn <stijn@ignitron.net>
Date: Tue, 18 Oct 2022 12:21:50 +0200
Subject: [PATCH 2871/3533] windows: Make project file read-only for IDE.

Avoids the 'warning: Wildcards in project items are not supported'
message from the C++ project system in Visual Studio, while otherwise
remaining completely functional.
---
 ports/windows/micropython.vcxproj | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/windows/micropython.vcxproj b/ports/windows/micropython.vcxproj
index 4fa0c47df8424..0294b9fa73018 100644
--- a/ports/windows/micropython.vcxproj
+++ b/ports/windows/micropython.vcxproj
@@ -21,6 +21,7 @@
   <PropertyGroup Label="Globals">
     <ProjectGuid>{740F3C30-EB6C-4B59-9C50-AE4D5A4A9D12}</ProjectGuid>
     <RootNamespace>micropython</RootNamespace>
+    <ReadOnlyProject>true</ReadOnlyProject>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

From 043dc4dd0cc4679fca96a2d36f1bf7cf1656606f Mon Sep 17 00:00:00 2001
From: Jan Willeke <willeke@smartmote.de>
Date: Mon, 10 Jan 2022 13:53:44 +0100
Subject: [PATCH 2872/3533] minimal/Makefile: Set linker to $(CC).

Changed 'LD = gcc' too 'LD = $(CC)' to support other compilers.

Signed-off-by: Jan Willeke <willeke@smartmote.de>
---
 ports/minimal/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/minimal/Makefile b/ports/minimal/Makefile
index 1a20412e0da5d..050c4ddf526a5 100644
--- a/ports/minimal/Makefile
+++ b/ports/minimal/Makefile
@@ -26,7 +26,7 @@ CFLAGS_CORTEX_M4 = -mthumb -mtune=cortex-m4 -mcpu=cortex-m4 -msoft-float -fsingl
 CFLAGS += $(INC) -Wall -Werror -std=c99 -nostdlib $(CFLAGS_CORTEX_M4) $(COPT)
 LDFLAGS += -nostdlib -T stm32f405.ld -Map=$@.map --cref --gc-sections
 else
-LD = gcc
+LD = $(CC)
 CFLAGS += $(INC) -Wall -Werror -Wdouble-promotion -Wfloat-conversion -std=c99 $(COPT)
 LDFLAGS += -Wl,-Map=$@.map,--cref -Wl,--gc-sections
 endif

From 40a3aa709c874f1eb3cabd6d8a393ea8042d976c Mon Sep 17 00:00:00 2001
From: Jan Willeke <willeke@smartmote.de>
Date: Fri, 7 Jan 2022 21:57:20 +0100
Subject: [PATCH 2873/3533] py/nlrmips: Add native NLR support for MIPS
 architecture.

This can be tested using ports/minimal and qemu:

    make CC=mips-linux-gnu-gcc-8

Then run with qemu-mips:

    stty raw opost -echo;
    QEMU_LD_PREFIX=/usr/mips-linux-gnu/ qemu-mips build/firmware.elf;
    sleep 1; reset

Signed-off-by: Jan Willeke <willeke@smartmote.de>
---
 py/nlr.h     |  4 +++
 py/nlrmips.c | 86 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 py/py.cmake  |  1 +
 py/py.mk     |  1 +
 4 files changed, 92 insertions(+)
 create mode 100644 py/nlrmips.c

diff --git a/py/nlr.h b/py/nlr.h
index dade10771eec5..338a67570409f 100644
--- a/py/nlr.h
+++ b/py/nlr.h
@@ -40,6 +40,7 @@
 #define MICROPY_NLR_NUM_REGS_ARM_THUMB      (10)
 #define MICROPY_NLR_NUM_REGS_ARM_THUMB_FP   (10 + 6)
 #define MICROPY_NLR_NUM_REGS_AARCH64        (13)
+#define MICROPY_NLR_NUM_REGS_MIPS           (13)
 #define MICROPY_NLR_NUM_REGS_XTENSA         (10)
 #define MICROPY_NLR_NUM_REGS_XTENSAWIN      (17)
 
@@ -83,6 +84,9 @@
     #define MICROPY_NLR_POWERPC (1)
     // this could be less but using 128 for safety
     #define MICROPY_NLR_NUM_REGS (128)
+#elif defined(__mips__)
+    #define MICROPY_NLR_MIPS (1)
+    #define MICROPY_NLR_NUM_REGS (MICROPY_NLR_NUM_REGS_MIPS)
 #else
     #define MICROPY_NLR_SETJMP (1)
     //#warning "No native NLR support for this arch, using setjmp implementation"
diff --git a/py/nlrmips.c b/py/nlrmips.c
new file mode 100644
index 0000000000000..bd5d73b6f767b
--- /dev/null
+++ b/py/nlrmips.c
@@ -0,0 +1,86 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013-2017 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "py/mpstate.h"
+
+#if MICROPY_NLR_MIPS
+
+__attribute__((used)) unsigned int nlr_push_tail(nlr_buf_t *nlr);
+
+__asm(
+    ".globl  nlr_push         \n"
+    "nlr_push:                \n"
+    ".ent    nlr_push         \n"
+    ".frame  $29, 0, $31      \n"
+    ".set    noreorder        \n"
+    ".cpload $25              \n"
+    ".set    reorder          \n"
+    "sw $31, 8($4)            \n"    /* is the offset of regs in nlr_buf_t */
+    "sw $30, 12($4)           \n"
+    "sw $29, 16($4)           \n"
+    "sw $28, 20($4)           \n"
+    "sw $23, 24($4)           \n"
+    "sw $22, 28($4)           \n"
+    "sw $21, 32($4)           \n"
+    "sw $20, 36($4)           \n"
+    "sw $19, 40($4)           \n"
+    "sw $18, 44($4)           \n"
+    "sw $17, 48($4)           \n"
+    "sw $16, 52($4)           \n"
+#ifdef __pic__
+    "la $25, nlr_push_tail    \n"
+#endif
+    "j nlr_push_tail          \n"
+    ".end nlr_push            \n"
+    );
+
+NORETURN void nlr_jump(void *val) {
+    MP_NLR_JUMP_HEAD(val, top)
+    __asm(
+        "move $4, %0    \n"
+        "lw $31, 8($4)  \n"
+        "lw $30, 12($4) \n"
+        "lw $29, 16($4) \n"
+        "lw $28, 20($4) \n"
+        "lw $23, 24($4) \n"
+        "lw $22, 28($4) \n"
+        "lw $21, 32($4) \n"
+        "lw $20, 36($4) \n"
+        "lw $19, 40($4) \n"
+        "lw $18, 44($4) \n"
+        "lw $17, 48($4) \n"
+        "lw $16, 52($4) \n"
+        "lui $2,1       \n"   // set return value 1
+        "j $31          \n"
+        "nop            \n"
+        :
+        : "r" (top)
+        :
+        );
+    MP_UNREACHABLE
+}
+
+#endif // MICROPY_NLR_MIPS
diff --git a/py/py.cmake b/py/py.cmake
index 2b5d437b5762b..07d1fe05ffacc 100644
--- a/py/py.cmake
+++ b/py/py.cmake
@@ -53,6 +53,7 @@ set(MICROPY_SOURCE_PY
     ${MICROPY_PY_DIR}/mpz.c
     ${MICROPY_PY_DIR}/nativeglue.c
     ${MICROPY_PY_DIR}/nlr.c
+    ${MICROPY_PY_DIR}/nlrmips.c
     ${MICROPY_PY_DIR}/nlrpowerpc.c
     ${MICROPY_PY_DIR}/nlrsetjmp.c
     ${MICROPY_PY_DIR}/nlrthumb.c
diff --git a/py/py.mk b/py/py.mk
index fde612d80465b..1dc0c8641f30b 100644
--- a/py/py.mk
+++ b/py/py.mk
@@ -80,6 +80,7 @@ PY_CORE_O_BASENAME = $(addprefix py/,\
 	nlrx64.o \
 	nlrthumb.o \
 	nlraarch64.o \
+	nlrmips.o \
 	nlrpowerpc.o \
 	nlrxtensa.o \
 	nlrsetjmp.o \

From d2f8127258d91e4af5f5880e3519fc6d5cf879d9 Mon Sep 17 00:00:00 2001
From: Howard Lovatt <howard.lovatt@gmail.com>
Date: Sat, 10 Oct 2020 08:48:41 +1100
Subject: [PATCH 2874/3533] docs/library/array: Add docs for dunder methods.

Signed-off-by: Damien George <damien@micropython.org>
---
 docs/library/array.rst | 52 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 52 insertions(+)

diff --git a/docs/library/array.rst b/docs/library/array.rst
index 88d6d2263ca6b..f94cece2b7ccf 100644
--- a/docs/library/array.rst
+++ b/docs/library/array.rst
@@ -27,3 +27,55 @@ Classes
 
         Append new elements as contained in *iterable* to the end of
         array, growing it.
+
+    .. method:: __getitem__(index)
+
+        Indexed read of the array, called as ``a[index]`` (where ``a`` is an ``array``).
+        Returns a value if *index* is an ``int`` and an ``array`` if *index* is a slice.
+        Negative indices count from the end and ``IndexError`` is thrown if the index is
+        out of range.
+
+        **Note:** ``__getitem__`` cannot be called directly (``a.__getitem__(index)`` fails) and
+        is not present in ``__dict__``, however ``a[index]`` does work.
+
+    .. method:: __setitem__(index, value)
+
+        Indexed write into the array, called as ``a[index] = value`` (where ``a`` is an ``array``).
+        ``value`` is a single value if *index* is an ``int`` and an ``array`` if *index* is a slice.
+        Negative indices count from the end and ``IndexError`` is thrown if the index is out of range.
+
+        **Note:** ``__setitem__`` cannot be called directly (``a.__setitem__(index, value)`` fails) and
+        is not present in ``__dict__``, however ``a[index] = value`` does work.
+
+    .. method:: __len__()
+
+        Returns the number of items in the array, called as ``len(a)`` (where ``a`` is an ``array``).
+
+        **Note:** ``__len__`` cannot be called directly (``a.__len__()`` fails) and the
+        method is not present in ``__dict__``, however ``len(a)`` does work.
+
+    .. method:: __add__(other)
+
+        Return a new ``array`` that is the concatenation of the array with *other*, called as
+        ``a + other`` (where ``a`` and *other* are both ``arrays``).
+
+        **Note:** ``__add__`` cannot be called directly (``a.__add__(other)`` fails) and
+        is not present in ``__dict__``, however ``a + other`` does work.
+
+    .. method:: __iadd__(other)
+
+        Concatenates the array with *other* in-place, called as ``a += other`` (where ``a`` and *other*
+        are both ``arrays``).  Equivalent to ``extend(other)``.
+
+        **Note:** ``__iadd__`` cannot be called directly (``a.__iadd__(other)`` fails) and
+        is not present in ``__dict__``, however ``a += other`` does work.
+
+    .. method:: __repr__()
+
+        Returns the string representation of the array, called as ``str(a)`` or ``repr(a)```
+        (where ``a`` is an ``array``).  Returns the string ``"array(<type>, [<elements>])"``,
+        where ``<type>`` is the type code letter for the array and ``<elements>`` is a comma
+        seperated list of the elements of the array.
+
+        **Note:** ``__repr__`` cannot be called directly (``a.__repr__()`` fails) and
+        is not present in ``__dict__``, however ``str(a)`` and ``repr(a)`` both work.

From c1ae7d75343e777df0c801789bca5a76f3b5cf5d Mon Sep 17 00:00:00 2001
From: Sky <51057802+IlysvlVEizbr@users.noreply.github.com>
Date: Wed, 14 Sep 2022 16:57:49 +0800
Subject: [PATCH 2875/3533] docs/library/pyb.CAN: Update the recv example to
 take a 5-tuple.

A supplement to commit 5cdf9645711cc12b45e602ef5795c33895116fc4
---
 docs/library/pyb.CAN.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/library/pyb.CAN.rst b/docs/library/pyb.CAN.rst
index 54377091db2b1..5ca00b65e5c58 100644
--- a/docs/library/pyb.CAN.rst
+++ b/docs/library/pyb.CAN.rst
@@ -252,7 +252,7 @@ Methods
    For example::
 
         buf = bytearray(8)
-        lst = [0, 0, 0, memoryview(buf)]
+        lst = [0, 0, 0, 0, memoryview(buf)]
         # No heap memory is allocated in the following call
         can.recv(0, lst)
 

From 02ad71468f1d52f9521bf89dd8b9594a4d437e51 Mon Sep 17 00:00:00 2001
From: Andrew Scheller <github@loowis.durge.org>
Date: Sat, 22 Aug 2020 16:49:10 +0100
Subject: [PATCH 2876/3533] tools/gen-cpydiff.py: Use os.path.join and
 os.path.isdir.

Makes path handling clearer and simpler.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 tools/gen-cpydiff.py | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/tools/gen-cpydiff.py b/tools/gen-cpydiff.py
index 46b3079cac2ea..de69a94673e04 100644
--- a/tools/gen-cpydiff.py
+++ b/tools/gen-cpydiff.py
@@ -27,7 +27,6 @@
     manually using the command make gen-cpydiff. """
 
 import os
-import errno
 import subprocess
 import time
 import re
@@ -44,8 +43,8 @@
     CPYTHON3 = os.getenv("MICROPY_CPYTHON3", "python3")
     MICROPYTHON = os.getenv("MICROPY_MICROPYTHON", "../ports/unix/build-standard/micropython")
 
-TESTPATH = "../tests/cpydiff/"
-DOCPATH = "../docs/genrst/"
+TESTPATH = "../tests/cpydiff"
+DOCPATH = "../docs/genrst"
 INDEXTEMPLATE = "../docs/differences/index_template.txt"
 INDEX = "index.rst"
 
@@ -79,7 +78,8 @@ def readfiles():
     files = []
 
     for test in tests:
-        text = open(TESTPATH + test, "r").read()
+        test_fullpath = os.path.join(TESTPATH, test)
+        text = open(test_fullpath, "r").read()
 
         try:
             class_, desc, cause, workaround, code = [
@@ -98,7 +98,7 @@ def readfiles():
             output = Output(test, class_, desc, cause, workaround, code, "", "", "")
             files.append(output)
         except IndexError:
-            print("Incorrect format in file " + TESTPATH + test)
+            print("Incorrect format in file " + test_fullpath)
 
     return files
 
@@ -107,7 +107,8 @@ def run_tests(tests):
     """executes all tests"""
     results = []
     for test in tests:
-        with open(TESTPATH + test.name, "rb") as f:
+        test_fullpath = os.path.join(TESTPATH, test.name)
+        with open(test_fullpath, "rb") as f:
             input_py = f.read()
 
         process = subprocess.Popen(
@@ -130,7 +131,7 @@ def run_tests(tests):
 
         if output_cpy[0] == output_upy[0] and output_cpy[1] == output_upy[1]:
             status = "Supported"
-            print("Supported operation!\nFile: " + TESTPATH + test.name)
+            print("Supported operation!\nFile: " + test_fullpath)
         else:
             status = "Unsupported"
 
@@ -197,11 +198,8 @@ def gen_rst(results):
     """creates restructured text documents to display tests"""
 
     # make sure the destination directory exists
-    try:
+    if not os.path.isdir(DOCPATH):
         os.mkdir(DOCPATH)
-    except OSError as e:
-        if e.args[0] != errno.EEXIST and e.args[0] != errno.EISDIR:
-            raise
 
     toctree = []
     class_ = []
@@ -214,7 +212,7 @@ def gen_rst(results):
             if i >= len(class_) or section[i] != class_[i]:
                 if i == 0:
                     filename = section[i].replace(" ", "_").lower()
-                    rst = open(DOCPATH + filename + ".rst", "w")
+                    rst = open(os.path.join(DOCPATH, filename + ".rst"), "w")
                     rst.write(HEADER)
                     rst.write(section[i] + "\n")
                     rst.write(RSTCHARS[0] * len(section[i]))
@@ -225,7 +223,7 @@ def gen_rst(results):
                     rst.write(RSTCHARS[min(i, len(RSTCHARS) - 1)] * len(section[i]))
                     rst.write("\n\n")
         class_ = section
-        rst.write(".. _cpydiff_%s:\n\n" % output.name.rsplit(".", 1)[0])
+        rst.write(".. _cpydiff_%s:\n\n" % os.path.splitext(output.name)[0])
         rst.write(output.desc + "\n")
         rst.write("~" * len(output.desc) + "\n\n")
         if output.cause != "Unknown":
@@ -242,7 +240,7 @@ def gen_rst(results):
         rst.write(table)
 
     template = open(INDEXTEMPLATE, "r")
-    index = open(DOCPATH + INDEX, "w")
+    index = open(os.path.join(DOCPATH, INDEX), "w")
     index.write(HEADER)
     index.write(template.read())
     for section in INDEXPRIORITY:

From 1504204606d6eb611c9f50c436b7d0912ae232f6 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Tue, 15 Nov 2022 15:09:54 +1100
Subject: [PATCH 2877/3533] tools/gendoc.py: Remove unused script.

This used to be used to generate .rst docs from inline comments in the C
code (specifically for APIs) but is now unused.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 tools/gendoc.py | 551 ------------------------------------------------
 1 file changed, 551 deletions(-)
 delete mode 100644 tools/gendoc.py

diff --git a/tools/gendoc.py b/tools/gendoc.py
deleted file mode 100644
index 0f13056995c90..0000000000000
--- a/tools/gendoc.py
+++ /dev/null
@@ -1,551 +0,0 @@
-"""
-Generate documentation for pyboard API from C files.
-"""
-
-import os
-import argparse
-import re
-import markdown
-
-# given a list of (name,regex) pairs, find the first one that matches the given line
-def re_match_first(regexs, line):
-    for name, regex in regexs:
-        match = re.match(regex, line)
-        if match:
-            return name, match
-    return None, None
-
-
-def makedirs(d):
-    if not os.path.isdir(d):
-        os.makedirs(d)
-
-
-class Lexer:
-    class LexerError(Exception):
-        pass
-
-    class EOF(Exception):
-        pass
-
-    class Break(Exception):
-        pass
-
-    def __init__(self, file):
-        self.filename = file
-        with open(file, "rt") as f:
-            line_num = 0
-            lines = []
-            for line in f:
-                line_num += 1
-                line = line.strip()
-                if line == "///":
-                    lines.append((line_num, ""))
-                elif line.startswith("/// "):
-                    lines.append((line_num, line[4:]))
-                elif len(lines) > 0 and lines[-1][1] is not None:
-                    lines.append((line_num, None))
-        if len(lines) > 0 and lines[-1][1] is not None:
-            lines.append((line_num, None))
-        self.cur_line = 0
-        self.lines = lines
-
-    def opt_break(self):
-        if len(self.lines) > 0 and self.lines[0][1] is None:
-            self.lines.pop(0)
-
-    def next(self):
-        if len(self.lines) == 0:
-            raise Lexer.EOF
-        else:
-            l = self.lines.pop(0)
-            self.cur_line = l[0]
-            if l[1] is None:
-                raise Lexer.Break
-            else:
-                return l[1]
-
-    def error(self, msg):
-        print("({}:{}) {}".format(self.filename, self.cur_line, msg))
-        raise Lexer.LexerError
-
-
-class MarkdownWriter:
-    def __init__(self):
-        pass
-
-    def start(self):
-        self.lines = []
-
-    def end(self):
-        return "\n".join(self.lines)
-
-    def heading(self, level, text):
-        if len(self.lines) > 0:
-            self.lines.append("")
-        self.lines.append(level * "#" + " " + text)
-        self.lines.append("")
-
-    def para(self, text):
-        if len(self.lines) > 0 and self.lines[-1] != "":
-            self.lines.append("")
-        if isinstance(text, list):
-            self.lines.extend(text)
-        elif isinstance(text, str):
-            self.lines.append(text)
-        else:
-            assert False
-        self.lines.append("")
-
-    def single_line(self, text):
-        self.lines.append(text)
-
-    def module(self, name, short_descr, descr):
-        self.heading(1, "module {}".format(name))
-        self.para(descr)
-
-    def function(self, ctx, name, args, descr):
-        proto = "{}.{}{}".format(ctx, self.name, self.args)
-        self.heading(3, "`" + proto + "`")
-        self.para(descr)
-
-    def method(self, ctx, name, args, descr):
-        if name == "\\constructor":
-            proto = "{}{}".format(ctx, args)
-        elif name == "\\call":
-            proto = "{}{}".format(ctx, args)
-        else:
-            proto = "{}.{}{}".format(ctx, name, args)
-        self.heading(3, "`" + proto + "`")
-        self.para(descr)
-
-    def constant(self, ctx, name, descr):
-        self.single_line("`{}.{}` - {}".format(ctx, name, descr))
-
-
-class ReStructuredTextWriter:
-    head_chars = {1: "=", 2: "-", 3: "."}
-
-    def __init__(self):
-        pass
-
-    def start(self):
-        self.lines = []
-
-    def end(self):
-        return "\n".join(self.lines)
-
-    def _convert(self, text):
-        return text.replace("`", "``").replace("*", "\\*")
-
-    def heading(self, level, text, convert=True):
-        if len(self.lines) > 0:
-            self.lines.append("")
-        if convert:
-            text = self._convert(text)
-        self.lines.append(text)
-        self.lines.append(len(text) * self.head_chars[level])
-        self.lines.append("")
-
-    def para(self, text, indent=""):
-        if len(self.lines) > 0 and self.lines[-1] != "":
-            self.lines.append("")
-        if isinstance(text, list):
-            for t in text:
-                self.lines.append(indent + self._convert(t))
-        elif isinstance(text, str):
-            self.lines.append(indent + self._convert(text))
-        else:
-            assert False
-        self.lines.append("")
-
-    def single_line(self, text):
-        self.lines.append(self._convert(text))
-
-    def module(self, name, short_descr, descr):
-        self.heading(1, ":mod:`{}` --- {}".format(name, self._convert(short_descr)), convert=False)
-        self.lines.append(".. module:: {}".format(name))
-        self.lines.append("   :synopsis: {}".format(short_descr))
-        self.para(descr)
-
-    def function(self, ctx, name, args, descr):
-        args = self._convert(args)
-        self.lines.append(".. function:: " + name + args)
-        self.para(descr, indent="   ")
-
-    def method(self, ctx, name, args, descr):
-        args = self._convert(args)
-        if name == "\\constructor":
-            self.lines.append(".. class:: " + ctx + args)
-        elif name == "\\call":
-            self.lines.append(".. method:: " + ctx + args)
-        else:
-            self.lines.append(".. method:: " + ctx + "." + name + args)
-        self.para(descr, indent="   ")
-
-    def constant(self, ctx, name, descr):
-        self.lines.append(".. data:: " + name)
-        self.para(descr, indent="   ")
-
-
-class DocValidateError(Exception):
-    pass
-
-
-class DocItem:
-    def __init__(self):
-        self.doc = []
-
-    def add_doc(self, lex):
-        try:
-            while True:
-                line = lex.next()
-                if len(line) > 0 or len(self.doc) > 0:
-                    self.doc.append(line)
-        except Lexer.Break:
-            pass
-
-    def dump(self, writer):
-        writer.para(self.doc)
-
-
-class DocConstant(DocItem):
-    def __init__(self, name, descr):
-        super().__init__()
-        self.name = name
-        self.descr = descr
-
-    def dump(self, ctx, writer):
-        writer.constant(ctx, self.name, self.descr)
-
-
-class DocFunction(DocItem):
-    def __init__(self, name, args):
-        super().__init__()
-        self.name = name
-        self.args = args
-
-    def dump(self, ctx, writer):
-        writer.function(ctx, self.name, self.args, self.doc)
-
-
-class DocMethod(DocItem):
-    def __init__(self, name, args):
-        super().__init__()
-        self.name = name
-        self.args = args
-
-    def dump(self, ctx, writer):
-        writer.method(ctx, self.name, self.args, self.doc)
-
-
-class DocClass(DocItem):
-    def __init__(self, name, descr):
-        super().__init__()
-        self.name = name
-        self.descr = descr
-        self.constructors = {}
-        self.classmethods = {}
-        self.methods = {}
-        self.constants = {}
-
-    def process_classmethod(self, lex, d):
-        name = d["id"]
-        if name == "\\constructor":
-            dict_ = self.constructors
-        else:
-            dict_ = self.classmethods
-        if name in dict_:
-            lex.error("multiple definition of method '{}'".format(name))
-        method = dict_[name] = DocMethod(name, d["args"])
-        method.add_doc(lex)
-
-    def process_method(self, lex, d):
-        name = d["id"]
-        dict_ = self.methods
-        if name in dict_:
-            lex.error("multiple definition of method '{}'".format(name))
-        method = dict_[name] = DocMethod(name, d["args"])
-        method.add_doc(lex)
-
-    def process_constant(self, lex, d):
-        name = d["id"]
-        if name in self.constants:
-            lex.error("multiple definition of constant '{}'".format(name))
-        self.constants[name] = DocConstant(name, d["descr"])
-        lex.opt_break()
-
-    def dump(self, writer):
-        writer.heading(1, "class {}".format(self.name))
-        super().dump(writer)
-        if len(self.constructors) > 0:
-            writer.heading(2, "Constructors")
-            for f in sorted(self.constructors.values(), key=lambda x: x.name):
-                f.dump(self.name, writer)
-        if len(self.classmethods) > 0:
-            writer.heading(2, "Class methods")
-            for f in sorted(self.classmethods.values(), key=lambda x: x.name):
-                f.dump(self.name, writer)
-        if len(self.methods) > 0:
-            writer.heading(2, "Methods")
-            for f in sorted(self.methods.values(), key=lambda x: x.name):
-                f.dump(self.name.lower(), writer)
-        if len(self.constants) > 0:
-            writer.heading(2, "Constants")
-            for c in sorted(self.constants.values(), key=lambda x: x.name):
-                c.dump(self.name, writer)
-
-
-class DocModule(DocItem):
-    def __init__(self, name, descr):
-        super().__init__()
-        self.name = name
-        self.descr = descr
-        self.functions = {}
-        self.constants = {}
-        self.classes = {}
-        self.cur_class = None
-
-    def new_file(self):
-        self.cur_class = None
-
-    def process_function(self, lex, d):
-        name = d["id"]
-        if name in self.functions:
-            lex.error("multiple definition of function '{}'".format(name))
-        function = self.functions[name] = DocFunction(name, d["args"])
-        function.add_doc(lex)
-
-    # def process_classref(self, lex, d):
-    #    name = d['id']
-    #    self.classes[name] = name
-    #    lex.opt_break()
-
-    def process_class(self, lex, d):
-        name = d["id"]
-        if name in self.classes:
-            lex.error("multiple definition of class '{}'".format(name))
-        self.cur_class = self.classes[name] = DocClass(name, d["descr"])
-        self.cur_class.add_doc(lex)
-
-    def process_classmethod(self, lex, d):
-        self.cur_class.process_classmethod(lex, d)
-
-    def process_method(self, lex, d):
-        self.cur_class.process_method(lex, d)
-
-    def process_constant(self, lex, d):
-        if self.cur_class is None:
-            # a module-level constant
-            name = d["id"]
-            if name in self.constants:
-                lex.error("multiple definition of constant '{}'".format(name))
-            self.constants[name] = DocConstant(name, d["descr"])
-            lex.opt_break()
-        else:
-            # a class-level constant
-            self.cur_class.process_constant(lex, d)
-
-    def validate(self):
-        if self.descr is None:
-            raise DocValidateError("module {} referenced but never defined".format(self.name))
-
-    def dump(self, writer):
-        writer.module(self.name, self.descr, self.doc)
-        if self.functions:
-            writer.heading(2, "Functions")
-            for f in sorted(self.functions.values(), key=lambda x: x.name):
-                f.dump(self.name, writer)
-        if self.constants:
-            writer.heading(2, "Constants")
-            for c in sorted(self.constants.values(), key=lambda x: x.name):
-                c.dump(self.name, writer)
-        if self.classes:
-            writer.heading(2, "Classes")
-            for c in sorted(self.classes.values(), key=lambda x: x.name):
-                writer.para("[`{}.{}`]({}) - {}".format(self.name, c.name, c.name, c.descr))
-
-    def write_html(self, dir):
-        md_writer = MarkdownWriter()
-        md_writer.start()
-        self.dump(md_writer)
-        with open(os.path.join(dir, "index.html"), "wt") as f:
-            f.write(markdown.markdown(md_writer.end()))
-        for c in self.classes.values():
-            class_dir = os.path.join(dir, c.name)
-            makedirs(class_dir)
-            md_writer.start()
-            md_writer.para("part of the [{} module](./)".format(self.name))
-            c.dump(md_writer)
-            with open(os.path.join(class_dir, "index.html"), "wt") as f:
-                f.write(markdown.markdown(md_writer.end()))
-
-    def write_rst(self, dir):
-        rst_writer = ReStructuredTextWriter()
-        rst_writer.start()
-        self.dump(rst_writer)
-        with open(dir + "/" + self.name + ".rst", "wt") as f:
-            f.write(rst_writer.end())
-        for c in self.classes.values():
-            rst_writer.start()
-            c.dump(rst_writer)
-            with open(dir + "/" + self.name + "." + c.name + ".rst", "wt") as f:
-                f.write(rst_writer.end())
-
-
-class Doc:
-    def __init__(self):
-        self.modules = {}
-        self.cur_module = None
-
-    def new_file(self):
-        self.cur_module = None
-        for m in self.modules.values():
-            m.new_file()
-
-    def check_module(self, lex):
-        if self.cur_module is None:
-            lex.error("module not defined")
-
-    def process_module(self, lex, d):
-        name = d["id"]
-        if name not in self.modules:
-            self.modules[name] = DocModule(name, None)
-        self.cur_module = self.modules[name]
-        if self.cur_module.descr is not None:
-            lex.error("multiple definition of module '{}'".format(name))
-        self.cur_module.descr = d["descr"]
-        self.cur_module.add_doc(lex)
-
-    def process_moduleref(self, lex, d):
-        name = d["id"]
-        if name not in self.modules:
-            self.modules[name] = DocModule(name, None)
-        self.cur_module = self.modules[name]
-        lex.opt_break()
-
-    def process_class(self, lex, d):
-        self.check_module(lex)
-        self.cur_module.process_class(lex, d)
-
-    def process_function(self, lex, d):
-        self.check_module(lex)
-        self.cur_module.process_function(lex, d)
-
-    def process_classmethod(self, lex, d):
-        self.check_module(lex)
-        self.cur_module.process_classmethod(lex, d)
-
-    def process_method(self, lex, d):
-        self.check_module(lex)
-        self.cur_module.process_method(lex, d)
-
-    def process_constant(self, lex, d):
-        self.check_module(lex)
-        self.cur_module.process_constant(lex, d)
-
-    def validate(self):
-        for m in self.modules.values():
-            m.validate()
-
-    def dump(self, writer):
-        writer.heading(1, "Modules")
-        writer.para("These are the Python modules that are implemented.")
-        for m in sorted(self.modules.values(), key=lambda x: x.name):
-            writer.para("[`{}`]({}/) - {}".format(m.name, m.name, m.descr))
-
-    def write_html(self, dir):
-        md_writer = MarkdownWriter()
-        with open(os.path.join(dir, "module", "index.html"), "wt") as f:
-            md_writer.start()
-            self.dump(md_writer)
-            f.write(markdown.markdown(md_writer.end()))
-        for m in self.modules.values():
-            mod_dir = os.path.join(dir, "module", m.name)
-            makedirs(mod_dir)
-            m.write_html(mod_dir)
-
-    def write_rst(self, dir):
-        # with open(os.path.join(dir, 'module', 'index.html'), 'wt') as f:
-        #    f.write(markdown.markdown(self.dump()))
-        for m in self.modules.values():
-            m.write_rst(dir)
-
-
-regex_descr = r"(?P<descr>.*)"
-
-doc_regexs = (
-    (Doc.process_module, re.compile(r"\\module (?P<id>[a-z][a-z0-9]*) - " + regex_descr + r"$")),
-    (Doc.process_moduleref, re.compile(r"\\moduleref (?P<id>[a-z]+)$")),
-    (Doc.process_function, re.compile(r"\\function (?P<id>[a-z0-9_]+)(?P<args>\(.*\))$")),
-    (Doc.process_classmethod, re.compile(r"\\classmethod (?P<id>\\?[a-z0-9_]+)(?P<args>\(.*\))$")),
-    (Doc.process_method, re.compile(r"\\method (?P<id>\\?[a-z0-9_]+)(?P<args>\(.*\))$")),
-    (
-        Doc.process_constant,
-        re.compile(r"\\constant (?P<id>[A-Za-z0-9_]+) - " + regex_descr + r"$"),
-    ),
-    # (Doc.process_classref, re.compile(r'\\classref (?P<id>[A-Za-z0-9_]+)$')),
-    (Doc.process_class, re.compile(r"\\class (?P<id>[A-Za-z0-9_]+) - " + regex_descr + r"$")),
-)
-
-
-def process_file(file, doc):
-    lex = Lexer(file)
-    doc.new_file()
-    try:
-        try:
-            while True:
-                line = lex.next()
-                fun, match = re_match_first(doc_regexs, line)
-                if fun == None:
-                    lex.error("unknown line format: {}".format(line))
-                fun(doc, lex, match.groupdict())
-
-        except Lexer.Break:
-            lex.error("unexpected break")
-
-        except Lexer.EOF:
-            pass
-
-    except Lexer.LexerError:
-        return False
-
-    return True
-
-
-def main():
-    cmd_parser = argparse.ArgumentParser(
-        description="Generate documentation for pyboard API from C files."
-    )
-    cmd_parser.add_argument(
-        "--outdir", metavar="<output dir>", default="gendoc-out", help="ouput directory"
-    )
-    cmd_parser.add_argument("--format", default="html", help="output format: html or rst")
-    cmd_parser.add_argument("files", nargs="+", help="input files")
-    args = cmd_parser.parse_args()
-
-    doc = Doc()
-    for file in args.files:
-        print("processing", file)
-        if not process_file(file, doc):
-            return
-    try:
-        doc.validate()
-    except DocValidateError as e:
-        print(e)
-
-    makedirs(args.outdir)
-
-    if args.format == "html":
-        doc.write_html(args.outdir)
-    elif args.format == "rst":
-        doc.write_rst(args.outdir)
-    else:
-        print("unknown format:", args.format)
-        return
-
-    print("written to", args.outdir)
-
-
-if __name__ == "__main__":
-    main()

From 8a91c719668b9aa652d1c055208a9b04e5c682df Mon Sep 17 00:00:00 2001
From: PGE <pge@ik.me>
Date: Sun, 13 Nov 2022 19:57:01 +0100
Subject: [PATCH 2878/3533] esp32/boards/GENERIC_S3_SPIRAM: Enable BLE support.

---
 ports/esp32/boards/GENERIC_S3_SPIRAM/mpconfigboard.cmake | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/esp32/boards/GENERIC_S3_SPIRAM/mpconfigboard.cmake b/ports/esp32/boards/GENERIC_S3_SPIRAM/mpconfigboard.cmake
index b7351b90fe8e4..e0b92dcd2640d 100644
--- a/ports/esp32/boards/GENERIC_S3_SPIRAM/mpconfigboard.cmake
+++ b/ports/esp32/boards/GENERIC_S3_SPIRAM/mpconfigboard.cmake
@@ -3,6 +3,7 @@ set(IDF_TARGET esp32s3)
 set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.base
     boards/sdkconfig.usb
+    boards/sdkconfig.ble
     boards/sdkconfig.spiram_sx
     boards/GENERIC_S3_SPIRAM/sdkconfig.board
 )

From b9c1e4c20555a963ffa173781cb26ffe7fadd446 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Fri, 21 Oct 2022 20:51:42 +0200
Subject: [PATCH 2879/3533] drivers/ninaw10: Connect to WiFi asynchronously.

Before this patch, WiFi connection was blocking, and could raise exceptions
if the connection failed for any reason (including timeouts).  This doesn't
match the behavior of other WiFi modules, which connect asynchronously, and
requires handling of exceptions on connect.  This change makes `connect()`
work asynchronously by scheduling code to poll connection status, and
handle reconnects (if needed), and return immediately without blocking.
---
 drivers/ninaw10/nina_wifi_drv.c | 37 ++++++---------------------
 drivers/ninaw10/nina_wifi_drv.h | 26 +++++++++++++++++++
 extmod/network_ninaw10.c        | 45 +++++++++++++++++++++++++++++++++
 3 files changed, 79 insertions(+), 29 deletions(-)

diff --git a/drivers/ninaw10/nina_wifi_drv.c b/drivers/ninaw10/nina_wifi_drv.c
index 7a1167b2c94c0..22ad0aae70ea1 100644
--- a/drivers/ninaw10/nina_wifi_drv.c
+++ b/drivers/ninaw10/nina_wifi_drv.c
@@ -108,6 +108,7 @@ typedef enum {
     // Disonnect/status commands.
     NINA_CMD_DISCONNECT             = 0x30,
     NINA_CMD_CONN_STATUS            = 0x20,
+    NINA_CMD_CONN_REASON            = 0x1F,
 
     // Interface config commands.
     NINA_CMD_SET_IF_CONFIG          = 0x14,
@@ -173,19 +174,6 @@ typedef enum {
     NINA_CMD_CMD_DOWNLOAD_OTA       = 0x67,
 } nina_cmd_t;
 
-typedef enum {
-    NINA_STATUS_IDLE      = 0,
-    NINA_STATUS_NO_SSID_AVAIL,
-    NINA_STATUS_SCAN_COMPLETED,
-    NINA_STATUS_CONNECTED,
-    NINA_STATUS_CONNECT_FAILED,
-    NINA_STATUS_CONNECTION_LOST,
-    NINA_STATUS_DISCONNECTED,
-    NINA_STATUS_AP_LISTENING,
-    NINA_STATUS_AP_CONNECTED,
-    NINA_STATUS_AP_FAILED
-} nina_status_t;
-
 typedef enum  {
     SOCKET_STATE_CLOSED = 0,
     SOCKET_STATE_LISTEN,
@@ -364,13 +352,15 @@ int nina_deinit(void) {
     return nina_bsp_deinit();
 }
 
-static int nina_connection_status() {
+int nina_connection_status(void) {
     return nina_send_command_read_ack(NINA_CMD_CONN_STATUS, 0, ARG_8BITS, NULL);
 }
 
-int nina_connect(const char *ssid, uint8_t security, const char *key, uint16_t channel) {
-    uint8_t status = NINA_STATUS_CONNECT_FAILED;
+int nina_connection_reason(void) {
+    return nina_send_command_read_ack(NINA_CMD_CONN_REASON, 0, ARG_8BITS, NULL);
+}
 
+int nina_connect(const char *ssid, uint8_t security, const char *key, uint16_t channel) {
     if (key == NULL && security != NINA_SEC_OPEN) {
         return -1;
     }
@@ -398,18 +388,7 @@ int nina_connect(const char *ssid, uint8_t security, const char *key, uint16_t c
             return -1;
     }
 
-    for (mp_uint_t start = mp_hal_ticks_ms(); ; mp_hal_delay_ms(10)) {
-        status = nina_connection_status();
-        if ((status != NINA_STATUS_IDLE) && (status != NINA_STATUS_NO_SSID_AVAIL) && (status != NINA_STATUS_SCAN_COMPLETED)) {
-            break;
-        }
-
-        if ((mp_hal_ticks_ms() - start) >= NINA_CONNECT_TIMEOUT) {
-            break;
-        }
-    }
-
-    return (status == NINA_STATUS_CONNECTED) ? 0 : -1;
+    return 0;
 }
 
 int nina_start_ap(const char *ssid, uint8_t security, const char *key, uint16_t channel) {
@@ -439,7 +418,7 @@ int nina_start_ap(const char *ssid, uint8_t security, const char *key, uint16_t
 
     for (mp_uint_t start = mp_hal_ticks_ms(); ; mp_hal_delay_ms(10)) {
         status = nina_connection_status();
-        if ((status != NINA_STATUS_IDLE) && (status != NINA_STATUS_NO_SSID_AVAIL) && (status != NINA_STATUS_SCAN_COMPLETED)) {
+        if ((status != NINA_STATUS_IDLE) && (status != NINA_STATUS_NO_SSID_AVAIL)) {
             break;
         }
 
diff --git a/drivers/ninaw10/nina_wifi_drv.h b/drivers/ninaw10/nina_wifi_drv.h
index 22163c7286e9e..4b09ac8bd24ab 100644
--- a/drivers/ninaw10/nina_wifi_drv.h
+++ b/drivers/ninaw10/nina_wifi_drv.h
@@ -46,6 +46,17 @@
 #define NINA_FW_VER_MINOR_OFFS  (2)
 #define NINA_FW_VER_PATCH_OFFS  (4)
 
+#define NINA_ESP_REASON_AUTH_EXPIRE             (2)
+#define NINA_ESP_REASON_ASSOC_EXPIRE            (4)
+#define NINA_ESP_REASON_NOT_AUTHED              (6)
+#define NINA_ESP_REASON_4WAY_HANDSHAKE_TIMEOUT  (15)
+#define NINA_ESP_REASON_BEACON_TIMEOUT          (200)
+#define NINA_ESP_REASON_NO_AP_FOUND             (201)
+#define NINA_ESP_REASON_AUTH_FAIL               (202)
+#define NINA_ESP_REASON_ASSOC_FAIL              (203)
+#define NINA_ESP_REASON_HANDSHAKE_TIMEOUT       (204)
+#define NINA_ESP_REASON_CONNECTION_FAIL         (205)
+
 typedef enum {
     NINA_SEC_INVALID = 0,
     NINA_SEC_OPEN,
@@ -59,6 +70,19 @@ typedef enum {
     NINA_SOCKET_TYPE_RAW = 3,
 } nina_socket_type_t;
 
+typedef enum {
+    NINA_STATUS_IDLE = 0,
+    NINA_STATUS_NO_SSID_AVAIL = 1,
+    NINA_STATUS_SCAN_COMPLETED = 2,
+    NINA_STATUS_CONNECTED = 3,
+    NINA_STATUS_CONNECT_FAILED = 4,
+    NINA_STATUS_CONNECTION_LOST = 5,
+    NINA_STATUS_DISCONNECTED = 6,
+    NINA_STATUS_AP_LISTENING = 7,
+    NINA_STATUS_AP_CONNECTED = 8,
+    NINA_STATUS_AP_FAILED = 9
+} nina_status_t;
+
 typedef struct {
     uint8_t ip_addr[NINA_IPV4_ADDR_LEN];
     uint8_t subnet_addr[NINA_IPV4_ADDR_LEN];
@@ -85,6 +109,8 @@ typedef int (*nina_scan_callback_t)(nina_scan_result_t *, void *);
 
 int nina_init(void);
 int nina_deinit(void);
+int nina_connection_status(void);
+int nina_connection_reason(void);
 int nina_connect(const char *ssid, uint8_t security, const char *key, uint16_t channel);
 int nina_start_ap(const char *ssid, uint8_t security, const char *key, uint16_t channel);
 int nina_disconnect(void);
diff --git a/extmod/network_ninaw10.c b/extmod/network_ninaw10.c
index f4cc0b22244dd..0852deabe9dcf 100644
--- a/extmod/network_ninaw10.c
+++ b/extmod/network_ninaw10.c
@@ -51,6 +51,9 @@ typedef struct _nina_obj_t {
     mp_obj_base_t base;
     bool active;
     uint32_t itf;
+    mp_uint_t security;
+    char ssid[NINA_MAX_SSID_LEN + 1];
+    char key[NINA_MAX_WPA_LEN + 1];
 } nina_obj_t;
 
 // For auto-binding UDP sockets
@@ -78,6 +81,7 @@ const mod_network_nic_type_t mod_network_nic_type_nina;
 static nina_obj_t network_nina_wl_sta = {{(mp_obj_type_t *)&mod_network_nic_type_nina}, false, MOD_NETWORK_STA_IF};
 static nina_obj_t network_nina_wl_ap = {{(mp_obj_type_t *)&mod_network_nic_type_nina}, false, MOD_NETWORK_AP_IF};
 static mp_sched_node_t mp_wifi_sockpoll_node;
+static mp_sched_node_t mp_wifi_connpoll_node;
 
 STATIC void network_ninaw10_poll_sockets(mp_sched_node_t *node) {
     (void)node;
@@ -99,6 +103,40 @@ STATIC void network_ninaw10_poll_sockets(mp_sched_node_t *node) {
     }
 }
 
+STATIC void network_ninaw10_poll_connect(mp_sched_node_t *node) {
+    nina_obj_t *self = &network_nina_wl_sta;
+
+    int status = nina_connection_status();
+    if (status == NINA_STATUS_CONNECTED) {
+        // Connected to AP, nothing else to do.
+        return;
+    }
+
+    if (status != NINA_STATUS_NO_SSID_AVAIL) {
+        // If not connected, and no connection in progress, the connection attempt has failed.
+        // Read the ESP failure reason, reconnect and reschedule the connection polling code.
+        int reason = nina_connection_reason();
+        if (reason == NINA_ESP_REASON_AUTH_EXPIRE ||
+            reason == NINA_ESP_REASON_ASSOC_EXPIRE ||
+            reason == NINA_ESP_REASON_NOT_AUTHED ||
+            reason == NINA_ESP_REASON_4WAY_HANDSHAKE_TIMEOUT ||
+            reason >= NINA_ESP_REASON_BEACON_TIMEOUT) {
+            debug_printf(&mp_plat_print, "poll_connect() status: %d reason %d\n", status, reason);
+            if (nina_connect(self->ssid, self->security, self->key, 0) != 0) {
+                mp_raise_msg_varg(&mp_type_OSError,
+                    MP_ERROR_TEXT("could not connect to ssid=%s, sec=%d, key=%s\n"),
+                    self->ssid, self->security, self->key);
+            }
+        } else {
+            // Will not attempt to reconnect if there's another error code set.
+            return;
+        }
+    }
+
+    // Reschedule the connection polling code.
+    mp_sched_schedule_node(&mp_wifi_connpoll_node, network_ninaw10_poll_connect);
+}
+
 STATIC mp_obj_t network_ninaw10_timer_callback(mp_obj_t none_in) {
     if (MP_STATE_PORT(mp_wifi_sockpoll_list) != MP_OBJ_NULL && MP_STATE_PORT(mp_wifi_sockpoll_list)->len) {
         mp_sched_schedule_node(&mp_wifi_sockpoll_node, network_ninaw10_poll_sockets);
@@ -240,6 +278,12 @@ STATIC mp_obj_t network_ninaw10_connect(mp_uint_t n_args, const mp_obj_t *pos_ar
             mp_raise_msg_varg(&mp_type_OSError,
                 MP_ERROR_TEXT("could not connect to ssid=%s, sec=%d, key=%s\n"), ssid, security, key);
         }
+
+        // Save connection info to re-connect if needed.
+        self->security = security;
+        strncpy(self->key, key, NINA_MAX_WPA_LEN);
+        strncpy(self->ssid, ssid, NINA_MAX_SSID_LEN);
+        mp_sched_schedule_node(&mp_wifi_connpoll_node, network_ninaw10_poll_connect);
     } else {
         mp_uint_t channel = args[ARG_channel].u_int;
 
@@ -252,6 +296,7 @@ STATIC mp_obj_t network_ninaw10_connect(mp_uint_t n_args, const mp_obj_t *pos_ar
             mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("failed to start in AP mode"));
         }
     }
+
     return mp_const_none;
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_KW(network_ninaw10_connect_obj, 1, network_ninaw10_connect);

From 3bae10417edbb37b2489065f2a1a17486eaf4dc2 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Tue, 15 Nov 2022 14:16:06 +0100
Subject: [PATCH 2880/3533] tools/ci.sh: Add ARDUINO_NANO_RP2040_CONNECT to rp2
 CI build.

---
 tools/ci.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tools/ci.sh b/tools/ci.sh
index 86fd44fdfbae6..ee205b4291c9e 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -284,6 +284,10 @@ function ci_rp2_build {
     make ${MAKEOPTS} -C ports/rp2 USER_C_MODULES=../../examples/usercmodule/micropython.cmake
     make ${MAKEOPTS} -C ports/rp2 BOARD=W5100S_EVB_PICO submodules
     make ${MAKEOPTS} -C ports/rp2 BOARD=W5100S_EVB_PICO
+
+    # Test building ninaw10 driver and NIC interface.
+    make ${MAKEOPTS} -C ports/rp2 BOARD=ARDUINO_NANO_RP2040_CONNECT submodules
+    make ${MAKEOPTS} -C ports/rp2 BOARD=ARDUINO_NANO_RP2040_CONNECT
 }
 
 ########################################################################################

From 3927ce60357a9b09fca03ff566aca14aeeca1798 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 16 Nov 2022 10:05:17 +1100
Subject: [PATCH 2881/3533] tools/ci.sh: Remove one build from zephyr CI to
 speed it up.

The zephyr CI takes the most time out of all CI jobs, so remove the
standard qemu_x86 build to speed it up.  The remaining builds should still
cover enough cases to catch errors.

Signed-off-by: Damien George <damien@micropython.org>
---
 tools/ci.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tools/ci.sh b/tools/ci.sh
index ee205b4291c9e..2005034c4aa14 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -691,7 +691,6 @@ function ci_zephyr_install {
 
 function ci_zephyr_build {
     docker exec zephyr-ci west build -p auto -b qemu_x86 -- -DCONF_FILE=prj_minimal.conf
-    docker exec zephyr-ci west build -p auto -b qemu_x86
     docker exec zephyr-ci west build -p auto -b frdm_k64f
     docker exec zephyr-ci west build -p auto -b mimxrt1050_evk
     docker exec zephyr-ci west build -p auto -b nucleo_wb55rg # for bluetooth

From d1ed0f161099175319bbdb7a3546634c4a8c2b25 Mon Sep 17 00:00:00 2001
From: Peter Hinch <peterhinch@users.noreply.github.com>
Date: Tue, 15 Nov 2022 11:48:25 +0000
Subject: [PATCH 2882/3533] docs/library/uasyncio: Describe restriction on
 ThreadSafeFlag.

As per Issue #7965, this class does not work on the Unix build.
---
 docs/library/uasyncio.rst | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/library/uasyncio.rst b/docs/library/uasyncio.rst
index 859d505d79a92..4cbcfa9f98ada 100644
--- a/docs/library/uasyncio.rst
+++ b/docs/library/uasyncio.rst
@@ -149,7 +149,8 @@ class ThreadSafeFlag
 
     Create a new flag which can be used to synchronise a task with code running
     outside the uasyncio loop, such as other threads, IRQs, or scheduler
-    callbacks.  Flags start in the cleared state.
+    callbacks.  Flags start in the cleared state.  The class does not currently
+    work under the Unix build of MicroPython.
 
 .. method:: ThreadSafeFlag.set()
 

From 5e990cc27f86aee07555a5c9188c252108309746 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Wed, 20 Oct 2021 21:24:20 +0200
Subject: [PATCH 2883/3533] mimxrt: Add support for MIMXRT1176 MCUs, and
 MIMXRT1170_EVK board.

The RT1176 has two cores, but the actual firmware supports only the CM7.
There are currently no good plans on how to use the CM4.

The actual MIMXRT1170_EVK board is on par with the existing MIMXRT boards,
with the following extensions:
- Use 64 MB RAM for the heap.
- Support both LAN interfaces as LAN(0) and LAN(1), with LAN(1)
  being the 1GB interface.

The dual LAN port interface can eventually be adapted as well for the
RT1062 MCU.

This work was done in collaboration with @alphaFred.
---
 ports/mimxrt/Makefile                         |  41 +-
 ports/mimxrt/board_init.c                     |  80 +-
 .../boards/MIMXRT1010_EVK/mpconfigboard.h     |   1 +
 .../boards/MIMXRT1015_EVK/mpconfigboard.h     |   1 +
 .../boards/MIMXRT1020_EVK/mpconfigboard.h     |   5 +-
 .../boards/MIMXRT1050_EVK/mpconfigboard.h     |   5 +-
 .../boards/MIMXRT1060_EVK/mpconfigboard.h     |   5 +-
 .../boards/MIMXRT1064_EVK/mpconfigboard.h     |   5 +-
 ports/mimxrt/boards/MIMXRT1170_EVK/board.json |  28 +
 .../boards/MIMXRT1170_EVK/mpconfigboard.h     | 254 +++++++
 .../boards/MIMXRT1170_EVK/mpconfigboard.mk    |  23 +
 ports/mimxrt/boards/MIMXRT1170_EVK/pins.csv   |  59 ++
 ports/mimxrt/boards/MIMXRT1176.ld             |  59 ++
 ports/mimxrt/boards/MIMXRT1176_af.csv         | 173 +++++
 ports/mimxrt/boards/MIMXRT1176_clock_config.c | 693 ++++++++++++++++++
 ports/mimxrt/boards/MIMXRT1176_clock_config.h | 210 ++++++
 .../boards/OLIMEX_RT1010/mpconfigboard.h      |   1 +
 .../boards/SEEED_ARCH_MIX/mpconfigboard.h     |   3 +
 .../boards/SEEED_ARCH_MIX/mpconfigboard.mk    |   2 +
 ports/mimxrt/boards/TEENSY40/mpconfigboard.h  |   1 +
 ports/mimxrt/boards/TEENSY41/mpconfigboard.h  |   5 +-
 ports/mimxrt/boards/common.ld                 |   2 +-
 ports/mimxrt/boards/make-flexram-config.py    |  38 +
 ports/mimxrt/boards/make-pins.py              |  59 +-
 ports/mimxrt/boards/mimxrt_prefix.c           |  14 +
 ports/mimxrt/eth.c                            | 432 +++++++----
 ports/mimxrt/eth.h                            |  10 +-
 ports/mimxrt/hal/flexspi_hyper_flash.c        |   4 +-
 ports/mimxrt/hal/flexspi_hyper_flash.h        |  14 +-
 ports/mimxrt/hal/flexspi_nor_flash.c          |   2 +-
 ports/mimxrt/hal/flexspi_nor_flash.h          |  31 +-
 .../phy/device/phyrtl8211f/fsl_phyrtl8211f.c  | 387 ++++++++++
 .../phy/device/phyrtl8211f/fsl_phyrtl8211f.h  | 163 ++++
 ports/mimxrt/hal/resethandler_MIMXRT10xx.S    |   7 +
 ports/mimxrt/machine_adc.c                    |  75 +-
 ports/mimxrt/machine_i2c.c                    |   8 +-
 ports/mimxrt/machine_i2s.c                    |  93 ++-
 ports/mimxrt/machine_pin.c                    |  10 +
 ports/mimxrt/machine_pwm.c                    |  15 +-
 ports/mimxrt/machine_sdcard.c                 |   5 +
 ports/mimxrt/machine_spi.c                    |   8 +
 ports/mimxrt/machine_uart.c                   |   3 +-
 ports/mimxrt/main.c                           |   7 +-
 ports/mimxrt/mbedtls/mbedtls_port.c           |   4 +-
 ports/mimxrt/mimxrt_flash.c                   |  18 +-
 ports/mimxrt/mimxrt_sdram.c                   | 173 +++--
 ports/mimxrt/modmachine.c                     |   1 -
 ports/mimxrt/moduos.c                         |  45 +-
 ports/mimxrt/mpconfigport.h                   |  13 +-
 ports/mimxrt/mphalport.c                      |   5 +
 ports/mimxrt/network_lan.c                    |  58 +-
 ports/mimxrt/pin.h                            |   1 +
 ports/mimxrt/ticks.c                          |   4 +
 53 files changed, 3012 insertions(+), 351 deletions(-)
 create mode 100644 ports/mimxrt/boards/MIMXRT1170_EVK/board.json
 create mode 100644 ports/mimxrt/boards/MIMXRT1170_EVK/mpconfigboard.h
 create mode 100644 ports/mimxrt/boards/MIMXRT1170_EVK/mpconfigboard.mk
 create mode 100644 ports/mimxrt/boards/MIMXRT1170_EVK/pins.csv
 create mode 100644 ports/mimxrt/boards/MIMXRT1176.ld
 create mode 100644 ports/mimxrt/boards/MIMXRT1176_af.csv
 create mode 100644 ports/mimxrt/boards/MIMXRT1176_clock_config.c
 create mode 100644 ports/mimxrt/boards/MIMXRT1176_clock_config.h
 create mode 100644 ports/mimxrt/hal/phy/device/phyrtl8211f/fsl_phyrtl8211f.c
 create mode 100644 ports/mimxrt/hal/phy/device/phyrtl8211f/fsl_phyrtl8211f.h

diff --git a/ports/mimxrt/Makefile b/ports/mimxrt/Makefile
index c65e2a433cb3e..d9c150525da16 100644
--- a/ports/mimxrt/Makefile
+++ b/ports/mimxrt/Makefile
@@ -101,13 +101,12 @@ SRC_ETH_C += \
 	hal/phy/device/phydp83848/fsl_phydp83848.c \
 	hal/phy/device/phyksz8081/fsl_phyksz8081.c \
 	hal/phy/device/phylan8720/fsl_phylan8720.c \
+	hal/phy/device/phyrtl8211f/fsl_phyrtl8211f.c \
 	hal/phy/mdio/enet/fsl_enet_mdio.c
 endif
 
 # NXP SDK sources
 SRC_HAL_IMX_C += \
-	$(MCU_DIR)/drivers/fsl_adc.c \
-	$(MCU_DIR)/drivers/fsl_cache.c \
 	$(MCU_DIR)/drivers/fsl_clock.c \
 	$(MCU_DIR)/drivers/fsl_common.c \
 	$(MCU_DIR)/drivers/fsl_dmamux.c \
@@ -124,10 +123,9 @@ SRC_HAL_IMX_C += \
 	$(MCU_DIR)/drivers/fsl_pwm.c \
 	$(MCU_DIR)/drivers/fsl_sai.c \
 	$(MCU_DIR)/drivers/fsl_snvs_lp.c \
-	$(MCU_DIR)/drivers/fsl_trng.c \
 	$(MCU_DIR)/drivers/fsl_wdog.c \
-	$(MCU_DIR)/system_$(MCU_SERIES).c \
-	hal/fsl_flexspi_nor_boot.c \
+	$(MCU_DIR)/system_$(MCU_SERIES)$(MCU_CORE).c \
+	$(MCU_DIR)/xip/fsl_flexspi_nor_boot.c \
 
 ifeq ($(MICROPY_HW_SDRAM_AVAIL),1)
 SRC_HAL_IMX_C += $(MCU_DIR)/drivers/fsl_semc.c
@@ -137,11 +135,29 @@ ifeq ($(MICROPY_PY_MACHINE_SDCARD),1)
 SRC_HAL_IMX_C += $(MCU_DIR)/drivers/fsl_usdhc.c
 endif
 
-ifeq ($(MCU_SERIES),$(filter $(MCU_SERIES), MIMXRT1015 MIMXRT1021 MIMXRT1052 MIMXRT1062 MIMXRT1064))
+ifeq ($(MCU_SERIES),$(filter $(MCU_SERIES), MIMXRT1015 MIMXRT1021 MIMXRT1052 MIMXRT1062 MIMXRT1064 MIMXRT1176))
 SRC_HAL_IMX_C += \
 	$(MCU_DIR)/drivers/fsl_qtmr.c
 endif
 
+ifeq ($(MCU_SERIES), MIMXRT1176)
+INC += -I$(TOP)/$(MCU_DIR)/drivers/cm7
+
+SRC_HAL_IMX_C += \
+	$(MCU_DIR)/drivers/cm7/fsl_cache.c \
+	$(MCU_DIR)/drivers/fsl_dcdc.c \
+	$(MCU_DIR)/drivers/fsl_pmu.c \
+	$(MCU_DIR)/drivers/fsl_common_arm.c \
+	$(MCU_DIR)/drivers/fsl_anatop_ai.c \
+	$(MCU_DIR)/drivers/fsl_caam.c \
+	$(MCU_DIR)/drivers/fsl_lpadc.c
+else
+SRC_HAL_IMX_C += \
+	$(MCU_DIR)/drivers/fsl_adc.c \
+	$(MCU_DIR)/drivers/fsl_cache.c \
+	$(MCU_DIR)/drivers/fsl_trng.c
+endif
+
 # C source files
 SRC_C += \
 	board_init.c \
@@ -243,7 +259,7 @@ SUPPORTS_HARDWARE_FP_DOUBLE = 0
 
 # Assembly source files
 SRC_SS = \
-	$(MCU_DIR)/gcc/startup_$(MCU_SERIES).S \
+	$(MCU_DIR)/gcc/startup_$(MCU_SERIES)$(MCU_CORE).S \
 	hal/resethandler_MIMXRT10xx.S
 
 SRC_S += shared/runtime/gchelper_m3.s \
@@ -279,11 +295,11 @@ CFLAGS += \
 	-D__STARTUP_INITIALIZE_RAMFUNCTION \
 	-DBOARD_$(BOARD) \
 	-DBOARD_FLASH_SIZE=$(MICROPY_HW_FLASH_SIZE) \
-	-DCFG_TUSB_MCU=OPT_MCU_MIMXRT10XX \
+	-DCFG_TUSB_MCU=OPT_MCU_MIMXRT \
 	-DCLOCK_CONFIG_H='<boards/$(MCU_SERIES)_clock_config.h>' \
-	-DCPU_$(MCU_SERIES) \
+	-DCPU_$(MCU_SERIES)$(MCU_CORE) \
 	-DCPU_$(MCU_VARIANT) \
-	-DCPU_HEADER_H='<$(MCU_SERIES).h>' \
+	-DCPU_HEADER_H='<$(MCU_SERIES)$(MCU_CORE).h>' \
 	-DFSL_SDK_ENABLE_DRIVER_CACHE_CONTROL=1 \
 	-DI2C_RETRY_TIMES=1000000 \
 	-DMICROPY_HW_FLASH_SIZE=$(MICROPY_HW_FLASH_SIZE) \
@@ -438,9 +454,8 @@ $(HEADER_BUILD)/qstrdefs.generated.h: $(BOARD_DIR)/mpconfigboard.h
 
 $(GEN_FLEXRAM_CONFIG_SRC):
 	$(ECHO) "Create $@"
-	$(Q)$(PYTHON) $(MAKE_FLEXRAM_LD) -d $(TOP)/$(MCU_DIR)/$(MCU_SERIES).h \
-		-f $(TOP)/$(MCU_DIR)/$(MCU_SERIES)_features.h -l boards/$(MCU_SERIES).ld -c $(MCU_SERIES) > $(GEN_FLEXRAM_CONFIG_SRC)
-
+	$(Q)$(PYTHON) $(MAKE_FLEXRAM_LD) -d $(TOP)/$(MCU_DIR)/$(MCU_SERIES)$(MCU_CORE).h \
+		-f $(TOP)/$(MCU_DIR)/$(MCU_SERIES)$(MCU_CORE)_features.h -l boards/$(MCU_SERIES).ld -c $(MCU_SERIES) > $(GEN_FLEXRAM_CONFIG_SRC)
 
 # Use a pattern rule here so that make will only call make-pins.py once to make
 # both pins_gen.c and pins.h
diff --git a/ports/mimxrt/board_init.c b/ports/mimxrt/board_init.c
index d0625aac37493..78001862f05d2 100644
--- a/ports/mimxrt/board_init.c
+++ b/ports/mimxrt/board_init.c
@@ -40,10 +40,15 @@
 #include CLOCK_CONFIG_H
 #include "modmachine.h"
 
-
 const uint8_t dcd_data[] = { 0x00 };
 
+void usb_phy0_init(uint8_t d_cal, uint8_t txcal45dp, uint8_t txcal45dn);
+
 void board_init(void) {
+    // Clean and enable cache
+    SCB_CleanDCache();
+    SCB_EnableDCache();
+    SCB_EnableICache();
     // Init clock
     BOARD_BootClockRUN();
     SystemCoreClockUpdate();
@@ -51,7 +56,7 @@ void board_init(void) {
     // Enable IOCON clock
     CLOCK_EnableClock(kCLOCK_Iomuxc);
 
-    // ------------- SDRAM ------------ //
+    // SDRAM
     #if MICROPY_HW_SDRAM_AVAIL
     mimxrt_sdram_init();
     #endif
@@ -59,32 +64,8 @@ void board_init(void) {
     // 1ms tick timer
     SysTick_Config(SystemCoreClock / 1000);
 
-    // ------------- USB0 ------------- //
-    // Clock
-    CLOCK_EnableUsbhs0PhyPllClock(kCLOCK_Usbphy480M, 480000000U);
-    CLOCK_EnableUsbhs0Clock(kCLOCK_Usb480M, 480000000U);
-
-    #ifdef USBPHY1
-    USBPHY_Type *usb_phy = USBPHY1;
-    #else
-    USBPHY_Type *usb_phy = USBPHY;
-    #endif
-
-    // Enable PHY support for Low speed device + LS via FS Hub
-    usb_phy->CTRL |= USBPHY_CTRL_SET_ENUTMILEVEL2_MASK | USBPHY_CTRL_SET_ENUTMILEVEL3_MASK;
-
-    // Enable all power for normal operation
-    usb_phy->PWD = 0;
-
-    // TX Timing
-    uint32_t phytx = usb_phy->TX;
-    phytx &= ~(USBPHY_TX_D_CAL_MASK | USBPHY_TX_TXCAL45DM_MASK | USBPHY_TX_TXCAL45DP_MASK);
-    phytx |= USBPHY_TX_D_CAL(0x0C) | USBPHY_TX_TXCAL45DP(0x06) | USBPHY_TX_TXCAL45DM(0x06);
-    usb_phy->TX = phytx;
-
-    // USB1
-    //  CLOCK_EnableUsbhs1PhyPllClock(kCLOCK_Usbphy480M, 480000000U);
-    //  CLOCK_EnableUsbhs1Clock(kCLOCK_Usb480M, 480000000U);
+    // USB0
+    usb_phy0_init(0b0111, 0b0110, 0b0110);  // Configure nominal values for D_CAL and TXCAL45DP/DN
 
     // ADC
     machine_adc_init();
@@ -99,6 +80,49 @@ void board_init(void) {
     #endif
     // RTC
     machine_rtc_start();
+
+    // OCRAM wait states (discarded, but code kept)
+    #if 0
+    MECC1->PIPE_ECC_EN =
+        MECC_PIPE_ECC_EN_READ_DATA_WAIT_EN(1) |
+        MECC_PIPE_ECC_EN_READ_ADDR_PIPE_EN(1) |
+        MECC_PIPE_ECC_EN_WRITE_DATA_PIPE_EN(1) |
+        MECC_PIPE_ECC_EN_WRITE_ADDR_PIPE_EN(1);
+
+    MECC2->PIPE_ECC_EN =
+        MECC_PIPE_ECC_EN_READ_DATA_WAIT_EN(1) |
+        MECC_PIPE_ECC_EN_READ_ADDR_PIPE_EN(1) |
+        MECC_PIPE_ECC_EN_WRITE_DATA_PIPE_EN(1) |
+        MECC_PIPE_ECC_EN_WRITE_ADDR_PIPE_EN(1);
+
+    FLEXRAM->FLEXRAM_CTRL =
+        FLEXRAM_FLEXRAM_CTRL_OCRAM_RDATA_WAIT_EN(1) |
+        FLEXRAM_FLEXRAM_CTRL_OCRAM_RADDR_PIPELINE_EN(1) |
+        FLEXRAM_FLEXRAM_CTRL_OCRAM_WRDATA_PIPELINE_EN(1) |
+        FLEXRAM_FLEXRAM_CTRL_OCRAM_WRADDR_PIPELINE_EN(1);
+    #endif
+}
+
+void usb_phy0_init(uint8_t d_cal, uint8_t txcal45dp, uint8_t txcal45dn) {
+    #ifdef USBPHY1
+    USBPHY_Type *usb_phy = USBPHY1;
+    #else
+    USBPHY_Type *usb_phy = USBPHY;
+    #endif
+
+    CLOCK_EnableUsbhs0PhyPllClock(kCLOCK_Usbphy480M, BOARD_XTAL0_CLK_HZ);
+    CLOCK_EnableUsbhs0Clock(kCLOCK_Usb480M, BOARD_XTAL0_CLK_HZ);
+
+    #if defined(MIMXRT117x_SERIES)
+    usb_phy->TRIM_OVERRIDE_EN = USBPHY_TRIM_OVERRIDE_EN_TRIM_DIV_SEL_OVERRIDE(1) |
+        USBPHY_TRIM_OVERRIDE_EN_TRIM_ENV_TAIL_ADJ_VD_OVERRIDE(1) |
+        USBPHY_TRIM_OVERRIDE_EN_TRIM_TX_D_CAL_OVERRIDE(1) |
+        USBPHY_TRIM_OVERRIDE_EN_TRIM_TX_CAL45DP_OVERRIDE(1) |
+        USBPHY_TRIM_OVERRIDE_EN_TRIM_TX_CAL45DN_OVERRIDE(1);  // Enable override for D_CAL and TXCAL45DP/DN
+    #endif
+    usb_phy->PWD = 0U;  // Set all bits in PWD register to normal operation
+    usb_phy->TX = ((usb_phy->TX & (~(USBPHY_TX_D_CAL_MASK | USBPHY_TX_TXCAL45DM_MASK | USBPHY_TX_TXCAL45DP_MASK))) |
+        (USBPHY_TX_D_CAL(d_cal) | USBPHY_TX_TXCAL45DP(txcal45dp) | USBPHY_TX_TXCAL45DM(txcal45dn)));  // Configure values for D_CAL and TXCAL45DP/DN
 }
 
 void USB_OTG1_IRQHandler(void) {
diff --git a/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.h b/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.h
index 6c9aaff96ab53..73055526a0857 100644
--- a/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.h
+++ b/ports/mimxrt/boards/MIMXRT1010_EVK/mpconfigboard.h
@@ -54,6 +54,7 @@
 #define I2S_DMA_REQ_SRC_RX { 0, kDmaRequestMuxSai1Rx }
 #define I2S_DMA_REQ_SRC_TX { 0, kDmaRequestMuxSai1Tx }
 #define I2S_WM8960_RX_MODE  (1)
+#define I2S_AUDIO_PLL_CLOCK (2U)
 
 #define I2S_GPIO(_hwid, _fn, _mode, _pin, _iomux) \
     { \
diff --git a/ports/mimxrt/boards/MIMXRT1015_EVK/mpconfigboard.h b/ports/mimxrt/boards/MIMXRT1015_EVK/mpconfigboard.h
index adb97fd24e9f9..f37ba824f4859 100644
--- a/ports/mimxrt/boards/MIMXRT1015_EVK/mpconfigboard.h
+++ b/ports/mimxrt/boards/MIMXRT1015_EVK/mpconfigboard.h
@@ -59,6 +59,7 @@
 #define I2S_IOMUXC_GPR_MODE { 0, kIOMUXC_GPR_SAI1MClkOutputDir, kIOMUXC_GPR_SAI2MClkOutputDir }
 #define I2S_DMA_REQ_SRC_RX { 0, kDmaRequestMuxSai1Rx, kDmaRequestMuxSai2Rx }
 #define I2S_DMA_REQ_SRC_TX { 0, kDmaRequestMuxSai1Tx, kDmaRequestMuxSai2Tx }
+#define I2S_AUDIO_PLL_CLOCK (2U)
 
 #define I2S_GPIO(_hwid, _fn, _mode, _pin, _iomux) \
     { \
diff --git a/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.h b/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.h
index 762499f6c2f21..9a9befa126cd8 100644
--- a/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.h
+++ b/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.h
@@ -73,6 +73,7 @@
 #define I2S_IOMUXC_GPR_MODE { 0, kIOMUXC_GPR_SAI1MClkOutputDir, kIOMUXC_GPR_SAI2MClkOutputDir }
 #define I2S_DMA_REQ_SRC_RX { 0, kDmaRequestMuxSai1Rx, kDmaRequestMuxSai2Rx }
 #define I2S_DMA_REQ_SRC_TX { 0, kDmaRequestMuxSai1Tx, kDmaRequestMuxSai2Tx }
+#define I2S_AUDIO_PLL_CLOCK (2U)
 
 #define I2S_GPIO(_hwid, _fn, _mode, _pin, _iomux) \
     { \
@@ -158,8 +159,8 @@
 #define ENET_PHY_OPS        phyksz8081_ops
 
 // Etherner PIN definitions
-#define ENET_RESET_PIN      pin_GPIO_AD_B0_04
-#define ENET_INT_PIN        pin_GPIO_AD_B1_06
+#define ENET_RESET_PIN      &pin_GPIO_AD_B0_04
+#define ENET_INT_PIN        &pin_GPIO_AD_B1_06
 
 #define IOMUX_TABLE_ENET \
     { IOMUXC_GPIO_AD_B0_08_ENET_REF_CLK1, 1, 0xB0E9u }, \
diff --git a/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.h b/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.h
index f2a7b0b78b432..9cc740b1a631c 100644
--- a/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.h
+++ b/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.h
@@ -62,6 +62,7 @@
 #define I2S_DMA_REQ_SRC_RX { 0, kDmaRequestMuxSai1Rx, kDmaRequestMuxSai2Rx }
 #define I2S_DMA_REQ_SRC_TX { 0, kDmaRequestMuxSai1Tx, kDmaRequestMuxSai2Tx }
 #define I2S_WM8960_RX_MODE  (1)
+#define I2S_AUDIO_PLL_CLOCK (2U)
 
 #define I2S_GPIO(_hwid, _fn, _mode, _pin, _iomux) \
     { \
@@ -148,8 +149,8 @@
 #define ENET_PHY_OPS        phyksz8081_ops
 
 // Etherner PIN definitions
-#define ENET_RESET_PIN      pin_GPIO_AD_B0_09
-#define ENET_INT_PIN        pin_GPIO_AD_B0_10
+#define ENET_RESET_PIN      &pin_GPIO_AD_B0_09
+#define ENET_INT_PIN        &pin_GPIO_AD_B0_10
 
 #define IOMUX_TABLE_ENET \
     { IOMUXC_GPIO_B1_04_ENET_RX_DATA00, 0, 0xB0E9u }, \
diff --git a/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.h b/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.h
index 5670902d11a5c..7eecb1f6b4db9 100644
--- a/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.h
+++ b/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.h
@@ -62,6 +62,7 @@
 #define I2S_DMA_REQ_SRC_RX { 0, kDmaRequestMuxSai1Rx, kDmaRequestMuxSai2Rx }
 #define I2S_DMA_REQ_SRC_TX { 0, kDmaRequestMuxSai1Tx, kDmaRequestMuxSai2Tx }
 #define I2S_WM8960_RX_MODE  (1)
+#define I2S_AUDIO_PLL_CLOCK (2U)
 
 #define I2S_GPIO(_hwid, _fn, _mode, _pin, _iomux) \
     { \
@@ -146,8 +147,8 @@
 #define ENET_PHY_OPS        phyksz8081_ops
 
 // Etherner PIN definitions
-#define ENET_RESET_PIN      pin_GPIO_AD_B0_09
-#define ENET_INT_PIN        pin_GPIO_AD_B0_10
+#define ENET_RESET_PIN      &pin_GPIO_AD_B0_09
+#define ENET_INT_PIN        &pin_GPIO_AD_B0_10
 
 #define IOMUX_TABLE_ENET \
     { IOMUXC_GPIO_B1_04_ENET_RX_DATA00, 0, 0xB0E9u }, \
diff --git a/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.h b/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.h
index 0f4eaf246da12..367b4a780bde9 100644
--- a/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.h
+++ b/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.h
@@ -62,6 +62,7 @@
 #define I2S_DMA_REQ_SRC_RX { 0, kDmaRequestMuxSai1Rx, kDmaRequestMuxSai2Rx }
 #define I2S_DMA_REQ_SRC_TX { 0, kDmaRequestMuxSai1Tx, kDmaRequestMuxSai2Tx }
 #define I2S_WM8960_RX_MODE  (1)
+#define I2S_AUDIO_PLL_CLOCK (2U)
 
 #define I2S_GPIO(_hwid, _fn, _mode, _pin, _iomux) \
     { \
@@ -146,8 +147,8 @@
 #define ENET_PHY_OPS        phyksz8081_ops
 
 // Etherner PIN definitions
-#define ENET_RESET_PIN      pin_GPIO_AD_B0_09
-#define ENET_INT_PIN        pin_GPIO_AD_B0_10
+#define ENET_RESET_PIN      &pin_GPIO_AD_B0_09
+#define ENET_INT_PIN        &pin_GPIO_AD_B0_10
 
 #define IOMUX_TABLE_ENET \
     { IOMUXC_GPIO_B1_04_ENET_RX_DATA00, 0, 0xB0E9u }, \
diff --git a/ports/mimxrt/boards/MIMXRT1170_EVK/board.json b/ports/mimxrt/boards/MIMXRT1170_EVK/board.json
new file mode 100644
index 0000000000000..01e554751b466
--- /dev/null
+++ b/ports/mimxrt/boards/MIMXRT1170_EVK/board.json
@@ -0,0 +1,28 @@
+{
+    "deploy": [
+        "../deploy_mimxrt.md"
+    ],
+    "docs": "",
+    "features": [
+        "Ethernet",
+        "SDRAM",
+        "MicroSD",
+        "MicroUSB",
+        "Microphone",
+        "AudioCodec",
+        "SPDIF",
+        "CAN",
+        "Camera",
+        "SIM Socket",
+        "OpenSDA",
+        "JLink"
+    ],
+    "images": [
+        "IMX-RT1170-EVK-TOP.jpg"
+    ],
+    "mcu": "mimxrt",
+    "product": "MIMXRT1170_EVK",
+    "thumbnail": "",
+    "url": "https://www.nxp.com/design/development-boards/i-mx-evaluation-and-development-boards/i-mx-rt1170-evaluation-kit:MIMXRT1170-EVK",
+    "vendor": "NXP"
+}
diff --git a/ports/mimxrt/boards/MIMXRT1170_EVK/mpconfigboard.h b/ports/mimxrt/boards/MIMXRT1170_EVK/mpconfigboard.h
new file mode 100644
index 0000000000000..0ec7ed7778432
--- /dev/null
+++ b/ports/mimxrt/boards/MIMXRT1170_EVK/mpconfigboard.h
@@ -0,0 +1,254 @@
+#define MICROPY_HW_BOARD_NAME "i.MX RT1170 EVK"
+#define MICROPY_HW_MCU_NAME   "MIMXRT1176DVMAA"
+#define MICROPY_EVENT_POLL_HOOK \
+    do { \
+        extern void mp_handle_pending(bool); \
+        mp_handle_pending(true); \
+    } while (0);
+
+// MIMXRT1170_EVK has 2 user LEDs
+#define MICROPY_HW_LED1_PIN (pin_GPIO_AD_04)
+#define MICROPY_HW_LED2_PIN (pin_GPIO_AD_26)
+#define MICROPY_HW_LED_OFF(pin) (mp_hal_pin_low(pin))
+#define MICROPY_HW_LED_ON(pin) (mp_hal_pin_high(pin))
+
+#define MICROPY_HW_NUM_PIN_IRQS (6 * 32)
+
+// Define mapping hardware UART # to logical UART #
+// LPUART2  on D0/D1    -> 1
+// LPUART3  on D12/D11  -> 2
+// LPUART5  on D10/D13  -> 3
+// LPUART11 on D15/D14  -> 4
+// LPUART12 on D25/D26  -> 5
+// LPUART8  on D33/D34  -> 6
+// LPUART7  on D35/D36  -> 7
+
+#define MICROPY_HW_UART_NUM     (sizeof(uart_index_table) / sizeof(uart_index_table)[0])
+#define MICROPY_HW_UART_INDEX   { 1, 2, 3, 5, 11, 12, 8, 7 }
+
+#define IOMUX_TABLE_UART \
+    { IOMUXC_GPIO_AD_24_LPUART1_TXD }, { IOMUXC_GPIO_AD_25_LPUART1_RXD }, \
+    { IOMUXC_GPIO_DISP_B2_10_LPUART2_TXD }, { IOMUXC_GPIO_DISP_B2_11_LPUART2_RXD }, \
+    { IOMUXC_GPIO_AD_30_LPUART3_TXD }, { IOMUXC_GPIO_AD_31_LPUART3_RXD }, \
+    { 0 }, { 0 }, \
+    { IOMUXC_GPIO_AD_28_LPUART5_TXD }, { IOMUXC_GPIO_AD_29_LPUART5_RXD }, \
+    { 0 }, { 0 }, \
+    { IOMUXC_GPIO_AD_00_LPUART7_TXD }, { IOMUXC_GPIO_AD_01_LPUART7_RXD }, \
+    { IOMUXC_GPIO_AD_02_LPUART8_TXD }, { IOMUXC_GPIO_AD_03_LPUART8_RXD }, \
+    { 0 }, { 0 }, \
+    { 0 }, { 0 }, \
+    { IOMUXC_GPIO_LPSR_04_LPUART11_TXD }, { IOMUXC_GPIO_LPSR_05_LPUART11_RXD }, \
+    { IOMUXC_GPIO_LPSR_10_LPUART12_TXD }, { IOMUXC_GPIO_LPSR_11_LPUART12_RXD },
+
+// Define the mapping hardware SPI # to logical SPI #
+// SCK/CS/SDO/SDI  HW-SPI   Logical SPI
+// D13/D10/D11/D12 LPSPI1  ->  0
+// D26/D28/D25/D24 LPSPI6  ->  1
+// D24/ - /D14/D15 LPSPI5  ->  2
+
+#define MICROPY_HW_SPI_INDEX { 1, 6, 5 }
+
+#define IOMUX_TABLE_SPI \
+    { IOMUXC_GPIO_AD_28_LPSPI1_SCK }, { IOMUXC_GPIO_AD_29_LPSPI1_PCS0 }, \
+    { IOMUXC_GPIO_AD_30_LPSPI1_SOUT }, { IOMUXC_GPIO_AD_31_LPSPI1_SIN }, \
+    { 0 }, { 0 }, \
+    { 0 }, { 0 }, \
+    { 0 }, { 0 }, \
+    { 0 }, { 0 }, \
+    { 0 }, { 0 }, \
+    { 0 }, { 0 }, \
+    { IOMUXC_GPIO_LPSR_12_LPSPI5_SCK }, { IOMUXC_GPIO_LPSR_13_LPSPI5_PCS0 }, \
+    { IOMUXC_GPIO_LPSR_04_LPSPI5_SOUT }, { IOMUXC_GPIO_LPSR_05_LPSPI5_SIN }, \
+    { IOMUXC_GPIO_LPSR_10_LPSPI6_SCK }, { IOMUXC_GPIO_LPSR_09_LPSPI6_PCS0 }, \
+    { IOMUXC_GPIO_LPSR_11_LPSPI6_SOUT }, { IOMUXC_GPIO_LPSR_12_LPSPI6_SIN },
+
+
+#define DMA_REQ_SRC_RX { 0, kDmaRequestMuxLPSPI1Rx, kDmaRequestMuxLPSPI2Rx, \
+                         kDmaRequestMuxLPSPI3Rx, kDmaRequestMuxLPSPI4Rx }
+
+#define DMA_REQ_SRC_TX { 0, kDmaRequestMuxLPSPI1Tx, kDmaRequestMuxLPSPI2Tx, \
+                         kDmaRequestMuxLPSPI3Tx, kDmaRequestMuxLPSPI4Tx }
+
+// Define the mapping hardware I2C # to logical I2C #
+// SDA/SCL  HW-I2C    Logical I2C
+// D14/D15  LPI2C5 ->    0
+// D1/D0    LPI2C3 ->    1
+// A4/A5    LPI2C1 ->    2
+// D26/D25  LPI2C6 ->    3
+// D19/D18  LPI2C2 ->    4
+
+#define MICROPY_HW_I2C_INDEX   { 5, 3, 1, 6, 2 }
+
+#define IOMUX_TABLE_I2C \
+    { IOMUXC_GPIO_AD_08_LPI2C1_SCL }, { IOMUXC_GPIO_AD_09_LPI2C1_SDA }, \
+    { IOMUXC_GPIO_AD_18_LPI2C2_SCL }, { IOMUXC_GPIO_AD_19_LPI2C2_SDA }, \
+    { IOMUXC_GPIO_DISP_B2_10_LPI2C3_SCL }, { IOMUXC_GPIO_DISP_B2_11_LPI2C3_SDA }, \
+    { 0 }, { 0 }, \
+    { IOMUXC_GPIO_LPSR_05_LPI2C5_SCL }, { IOMUXC_GPIO_LPSR_04_LPI2C5_SDA }, \
+    { IOMUXC_GPIO_LPSR_11_LPI2C6_SCL }, { IOMUXC_GPIO_LPSR_10_LPI2C6_SDA },
+
+#define MICROPY_PY_MACHINE_I2S (1)
+#define MICROPY_HW_I2S_NUM (1)
+#define I2S_CLOCK_MUX { 0, kCLOCK_Root_Sai1, kCLOCK_Root_Sai2, kCLOCK_Root_Sai3, kCLOCK_Root_Sai4 }
+#define I2S_DMA_REQ_SRC_RX { 0, kDmaRequestMuxSai1Rx, kDmaRequestMuxSai2Rx, kDmaRequestMuxSai3Rx, kDmaRequestMuxSai4Rx }
+#define I2S_DMA_REQ_SRC_TX { 0, kDmaRequestMuxSai1Tx, kDmaRequestMuxSai2Tx, kDmaRequestMuxSai3Tx, kDmaRequestMuxSai4Tx }
+#define I2S_WM8960_RX_MODE  (1)
+#define I2S_AUDIO_PLL_CLOCK (4U)
+#define DMAMUX DMAMUX0
+
+#define I2S_GPIO(_hwid, _fn, _mode, _pin, _iomux) \
+    { \
+        .hw_id = _hwid, \
+        .fn = _fn, \
+        .mode = _mode, \
+        .name = MP_QSTR_##_pin, \
+        .iomux = {_iomux}, \
+    }
+
+#define I2S_GPIO_MAP \
+    { \
+        I2S_GPIO(1, MCK, TX, GPIO_AD_17, IOMUXC_GPIO_AD_17_SAI1_MCLK), \
+        I2S_GPIO(1, SCK, RX, GPIO_AD_19, IOMUXC_GPIO_AD_19_SAI1_RX_BCLK), \
+        I2S_GPIO(1, WS, RX, GPIO_AD_18, IOMUXC_GPIO_AD_18_SAI1_RX_SYNC), \
+        I2S_GPIO(1, SD, RX, GPIO_AD_20, IOMUXC_GPIO_AD_20_SAI1_RX_DATA00),  \
+        I2S_GPIO(1, SCK, TX, GPIO_AD_22, IOMUXC_GPIO_AD_22_SAI1_TX_BCLK), \
+        I2S_GPIO(1, WS, TX, GPIO_AD_23, IOMUXC_GPIO_AD_23_SAI1_TX_SYNC),  \
+        I2S_GPIO(1, SD, TX, GPIO_AD_21, IOMUXC_GPIO_AD_21_SAI1_TX_DATA00), \
+    }
+
+// USDHC1
+
+#define USDHC_DUMMY_PIN NULL, 0
+#define MICROPY_USDHC1 \
+    { \
+        .cmd = {GPIO_SD_B1_00_USDHC1_CMD}, \
+        .clk = { GPIO_SD_B1_01_USDHC1_CLK }, \
+        .cd_b = { USDHC_DUMMY_PIN }, \
+        .data0 = { GPIO_SD_B1_02_USDHC1_DATA0 }, \
+        .data1 = { GPIO_SD_B1_03_USDHC1_DATA1 }, \
+        .data2 = { GPIO_SD_B1_04_USDHC1_DATA2 }, \
+        .data3 = { GPIO_SD_B1_05_USDHC1_DATA3 }, \
+    }
+#define USDHC_DATA3_PULL_DOWN_ON_BOARD    (1)
+
+// Network definitions
+
+// Transceiver Phy Parameters
+#define ENET_PHY_ADDRESS    (2)
+#define ENET_PHY            KSZ8081
+#define ENET_PHY_OPS        phyksz8081_ops
+
+// 10/100 Ethernet PIN definitions
+#define ENET_RESET_PIN      &pin_GPIO_LPSR_12
+#define ENET_INT_PIN        &pin_GPIO_AD_12
+
+#define IOMUX_TABLE_ENET \
+    { IOMUXC_GPIO_DISP_B2_06_ENET_RX_DATA00, 0, 0x06u }, \
+    { IOMUXC_GPIO_DISP_B2_07_ENET_RX_DATA01, 0, 0x06u }, \
+    { IOMUXC_GPIO_DISP_B2_08_ENET_RX_EN, 0, 0x06u }, \
+    { IOMUXC_GPIO_DISP_B2_02_ENET_TX_DATA00, 0, 0x02u }, \
+    { IOMUXC_GPIO_DISP_B2_03_ENET_TX_DATA01, 0, 0x02u }, \
+    { IOMUXC_GPIO_DISP_B2_04_ENET_TX_EN, 0, 0x06u }, \
+    { IOMUXC_GPIO_DISP_B2_05_ENET_REF_CLK, 1, 0x03u }, \
+    { IOMUXC_GPIO_DISP_B2_09_ENET_RX_ER, 0, 0x06u }, \
+    { IOMUXC_GPIO_AD_33_ENET_MDIO, 0, 0x06u }, \
+    { IOMUXC_GPIO_AD_32_ENET_MDC, 0, 0x06u },
+
+// A second ETH port is present.
+#define ENET_DUAL_PORT         (1)
+// 1G Transceiver Phy Parameters
+#define ENET_1_PHY_ADDRESS     (1)
+#define ENET_1_PHY             RTL8211F
+#define ENET_1_PHY_OPS         phyrtl8211f_ops
+
+// 1G Ethernet PIN definitions
+// No INT pin for ENET_1G
+#define ENET_1_RESET_PIN       &pin_GPIO_DISP_B2_13
+#define ENET_1_INT_PIN         NULL
+
+#define IOMUX_TABLE_ENET_1 \
+    { IOMUXC_GPIO_DISP_B1_00_ENET_1G_RX_EN, 0, 0x08U }, \
+    { IOMUXC_GPIO_DISP_B1_01_ENET_1G_RX_CLK, 0, 0x08U }, \
+    { IOMUXC_GPIO_DISP_B1_02_ENET_1G_RX_DATA00, 0, 0x08U }, \
+    { IOMUXC_GPIO_DISP_B1_03_ENET_1G_RX_DATA01, 0, 0x08U }, \
+    { IOMUXC_GPIO_DISP_B1_04_ENET_1G_RX_DATA02, 0, 0x08U }, \
+    { IOMUXC_GPIO_DISP_B1_05_ENET_1G_RX_DATA03, 0, 0x08U }, \
+    { IOMUXC_GPIO_DISP_B1_06_ENET_1G_TX_DATA03, 0, 0x0CU }, \
+    { IOMUXC_GPIO_DISP_B1_07_ENET_1G_TX_DATA02, 0, 0x0CU }, \
+    { IOMUXC_GPIO_DISP_B1_08_ENET_1G_TX_DATA01, 0, 0x0CU }, \
+    { IOMUXC_GPIO_DISP_B1_09_ENET_1G_TX_DATA00, 0, 0x0CU }, \
+    { IOMUXC_GPIO_DISP_B1_10_ENET_1G_TX_EN, 0, 0x0CU }, \
+    { IOMUXC_GPIO_DISP_B1_11_ENET_1G_TX_CLK_IO, 0, 0x0CU }, \
+    { IOMUXC_GPIO_EMC_B2_20_ENET_1G_MDIO, 0, 0x06u }, \
+    { IOMUXC_GPIO_EMC_B2_19_ENET_1G_MDC, 0, 0x06u },
+
+// --- SEMC --- //
+#define MIMXRT_IOMUXC_SEMC_DATA00 IOMUXC_GPIO_EMC_B1_00_SEMC_DATA00
+#define MIMXRT_IOMUXC_SEMC_DATA01 IOMUXC_GPIO_EMC_B1_01_SEMC_DATA01
+#define MIMXRT_IOMUXC_SEMC_DATA02 IOMUXC_GPIO_EMC_B1_02_SEMC_DATA02
+#define MIMXRT_IOMUXC_SEMC_DATA03 IOMUXC_GPIO_EMC_B1_03_SEMC_DATA03
+#define MIMXRT_IOMUXC_SEMC_DATA04 IOMUXC_GPIO_EMC_B1_04_SEMC_DATA04
+#define MIMXRT_IOMUXC_SEMC_DATA05 IOMUXC_GPIO_EMC_B1_05_SEMC_DATA05
+#define MIMXRT_IOMUXC_SEMC_DATA06 IOMUXC_GPIO_EMC_B1_06_SEMC_DATA06
+#define MIMXRT_IOMUXC_SEMC_DATA07 IOMUXC_GPIO_EMC_B1_07_SEMC_DATA07
+#define MIMXRT_IOMUXC_SEMC_DATA08 IOMUXC_GPIO_EMC_B1_30_SEMC_DATA08
+#define MIMXRT_IOMUXC_SEMC_DATA09 IOMUXC_GPIO_EMC_B1_31_SEMC_DATA09
+#define MIMXRT_IOMUXC_SEMC_DATA10 IOMUXC_GPIO_EMC_B1_32_SEMC_DATA10
+#define MIMXRT_IOMUXC_SEMC_DATA11 IOMUXC_GPIO_EMC_B1_33_SEMC_DATA11
+#define MIMXRT_IOMUXC_SEMC_DATA12 IOMUXC_GPIO_EMC_B1_34_SEMC_DATA12
+#define MIMXRT_IOMUXC_SEMC_DATA13 IOMUXC_GPIO_EMC_B1_35_SEMC_DATA13
+#define MIMXRT_IOMUXC_SEMC_DATA14 IOMUXC_GPIO_EMC_B1_36_SEMC_DATA14
+#define MIMXRT_IOMUXC_SEMC_DATA15 IOMUXC_GPIO_EMC_B1_37_SEMC_DATA15
+
+#define MIMXRT_IOMUXC_SEMC_ADDR00 IOMUXC_GPIO_EMC_B1_09_SEMC_ADDR00
+#define MIMXRT_IOMUXC_SEMC_ADDR01 IOMUXC_GPIO_EMC_B1_10_SEMC_ADDR01
+#define MIMXRT_IOMUXC_SEMC_ADDR02 IOMUXC_GPIO_EMC_B1_11_SEMC_ADDR02
+#define MIMXRT_IOMUXC_SEMC_ADDR03 IOMUXC_GPIO_EMC_B1_12_SEMC_ADDR03
+#define MIMXRT_IOMUXC_SEMC_ADDR04 IOMUXC_GPIO_EMC_B1_13_SEMC_ADDR04
+#define MIMXRT_IOMUXC_SEMC_ADDR05 IOMUXC_GPIO_EMC_B1_14_SEMC_ADDR05
+#define MIMXRT_IOMUXC_SEMC_ADDR06 IOMUXC_GPIO_EMC_B1_15_SEMC_ADDR06
+#define MIMXRT_IOMUXC_SEMC_ADDR07 IOMUXC_GPIO_EMC_B1_16_SEMC_ADDR07
+#define MIMXRT_IOMUXC_SEMC_ADDR08 IOMUXC_GPIO_EMC_B1_17_SEMC_ADDR08
+#define MIMXRT_IOMUXC_SEMC_ADDR09 IOMUXC_GPIO_EMC_B1_18_SEMC_ADDR09
+#define MIMXRT_IOMUXC_SEMC_ADDR10 IOMUXC_GPIO_EMC_B1_23_SEMC_ADDR10
+#define MIMXRT_IOMUXC_SEMC_ADDR11 IOMUXC_GPIO_EMC_B1_19_SEMC_ADDR11
+#define MIMXRT_IOMUXC_SEMC_ADDR12 IOMUXC_GPIO_EMC_B1_20_SEMC_ADDR12
+
+#define MIMXRT_IOMUXC_SEMC_BA0 IOMUXC_GPIO_EMC_B1_21_SEMC_BA0
+#define MIMXRT_IOMUXC_SEMC_BA1 IOMUXC_GPIO_EMC_B1_22_SEMC_BA1
+#define MIMXRT_IOMUXC_SEMC_CAS IOMUXC_GPIO_EMC_B1_24_SEMC_CAS
+#define MIMXRT_IOMUXC_SEMC_RAS IOMUXC_GPIO_EMC_B1_25_SEMC_RAS
+#define MIMXRT_IOMUXC_SEMC_CLK IOMUXC_GPIO_EMC_B1_26_SEMC_CLK
+#define MIMXRT_IOMUXC_SEMC_CKE IOMUXC_GPIO_EMC_B1_27_SEMC_CKE
+#define MIMXRT_IOMUXC_SEMC_WE IOMUXC_GPIO_EMC_B1_28_SEMC_WE
+#define MIMXRT_IOMUXC_SEMC_DM00 IOMUXC_GPIO_EMC_B1_08_SEMC_DM00
+#define MIMXRT_IOMUXC_SEMC_DM01 IOMUXC_GPIO_EMC_B1_38_SEMC_DM01
+#define MIMXRT_IOMUXC_SEMC_DQS IOMUXC_GPIO_EMC_B1_39_SEMC_DQS
+
+#define MIMXRT_IOMUXC_SEMC_CS0 IOMUXC_GPIO_EMC_B1_29_SEMC_CS0
+
+#define MIMXRT_IOMUXC_SEMC_DATA16 IOMUXC_GPIO_EMC_B2_00_SEMC_DATA16
+#define MIMXRT_IOMUXC_SEMC_DATA17 IOMUXC_GPIO_EMC_B2_01_SEMC_DATA17
+#define MIMXRT_IOMUXC_SEMC_DATA18 IOMUXC_GPIO_EMC_B2_02_SEMC_DATA18
+#define MIMXRT_IOMUXC_SEMC_DATA19 IOMUXC_GPIO_EMC_B2_03_SEMC_DATA19
+#define MIMXRT_IOMUXC_SEMC_DATA20 IOMUXC_GPIO_EMC_B2_04_SEMC_DATA20
+#define MIMXRT_IOMUXC_SEMC_DATA21 IOMUXC_GPIO_EMC_B2_05_SEMC_DATA21
+#define MIMXRT_IOMUXC_SEMC_DATA22 IOMUXC_GPIO_EMC_B2_06_SEMC_DATA22
+#define MIMXRT_IOMUXC_SEMC_DATA23 IOMUXC_GPIO_EMC_B2_07_SEMC_DATA23
+#define MIMXRT_IOMUXC_SEMC_DM02   IOMUXC_GPIO_EMC_B2_08_SEMC_DM02
+
+#define MIMXRT_IOMUXC_SEMC_DATA24 IOMUXC_GPIO_EMC_B2_09_SEMC_DATA24
+#define MIMXRT_IOMUXC_SEMC_DATA25 IOMUXC_GPIO_EMC_B2_10_SEMC_DATA25
+#define MIMXRT_IOMUXC_SEMC_DATA26 IOMUXC_GPIO_EMC_B2_11_SEMC_DATA26
+#define MIMXRT_IOMUXC_SEMC_DATA27 IOMUXC_GPIO_EMC_B2_12_SEMC_DATA27
+#define MIMXRT_IOMUXC_SEMC_DATA28 IOMUXC_GPIO_EMC_B2_13_SEMC_DATA28
+#define MIMXRT_IOMUXC_SEMC_DATA29 IOMUXC_GPIO_EMC_B2_14_SEMC_DATA29
+#define MIMXRT_IOMUXC_SEMC_DATA30 IOMUXC_GPIO_EMC_B2_15_SEMC_DATA30
+#define MIMXRT_IOMUXC_SEMC_DATA31 IOMUXC_GPIO_EMC_B2_16_SEMC_DATA31
+#define MIMXRT_IOMUXC_SEMC_DM03   IOMUXC_GPIO_EMC_B2_17_SEMC_DM03
+#define MIMXRT_IOMUXC_SEMC_DQS4   IOMUXC_GPIO_EMC_B2_18_SEMC_DQS4
+
+#if MICROPY_PY_MACHINE_I2S
+#define MICROPY_BOARD_ROOT_POINTERS \
+    struct _machine_i2s_obj_t *machine_i2s_obj[MICROPY_HW_I2S_NUM];
+#endif
diff --git a/ports/mimxrt/boards/MIMXRT1170_EVK/mpconfigboard.mk b/ports/mimxrt/boards/MIMXRT1170_EVK/mpconfigboard.mk
new file mode 100644
index 0000000000000..ea72008d51415
--- /dev/null
+++ b/ports/mimxrt/boards/MIMXRT1170_EVK/mpconfigboard.mk
@@ -0,0 +1,23 @@
+MCU_SERIES = MIMXRT1176
+MCU_VARIANT = MIMXRT1176DVMAA
+MCU_CORE = _cm7
+
+MICROPY_FLOAT_IMPL = double
+MICROPY_PY_MACHINE_SDCARD = 1
+MICROPY_HW_FLASH_TYPE ?= qspi_nor_flash
+MICROPY_HW_FLASH_SIZE ?= 0x1000000  # 16MB
+MICROPY_HW_FLASH_RESERVED ?= 0x100000  # 1MB CM4 Code address space
+
+MICROPY_HW_SDRAM_AVAIL = 1
+MICROPY_HW_SDRAM_SIZE  = 0x4000000  # 64MB
+
+MICROPY_PY_LWIP = 1
+MICROPY_PY_USSL = 1
+MICROPY_SSL_MBEDTLS = 1
+
+CFLAGS += -DCPU_MIMXRT1176DVMAA_cm7 \
+		-DMIMXRT117x_SERIES \
+		-DENET_ENHANCEDBUFFERDESCRIPTOR_MODE=1 \
+		-DCPU_HEADER_H='<$(MCU_SERIES)$(MCU_CORE).h>' \
+		-DUSB1_BASE=USB_OTG1_BASE \
+		-DUSB2_BASE=USB_OTG2_BASE
diff --git a/ports/mimxrt/boards/MIMXRT1170_EVK/pins.csv b/ports/mimxrt/boards/MIMXRT1170_EVK/pins.csv
new file mode 100644
index 0000000000000..77f87e8ba15c7
--- /dev/null
+++ b/ports/mimxrt/boards/MIMXRT1170_EVK/pins.csv
@@ -0,0 +1,59 @@
+D0,GPIO_DISP_B2_11
+D1,GPIO_DISP_B2_10
+D2,GPIO_DISP_B2_12
+D3,GPIO_AD_04
+D4,GPIO_AD_06
+D5,GPIO_AD_05
+D6,GPIO_AD_00
+D7,GPIO_AD_14
+D8,GPIO_AD_07
+D9,GPIO_AD_01
+D10,GPIO_AD_29
+D11,GPIO_AD_30
+D12,GPIO_AD_31
+D13,GPIO_AD_28
+D14,GPIO_LPSR_04
+D15,GPIO_LPSR_05
+D16,GPIO_AD_19
+D17,GPIO_DISP_B2_12
+D18,GPIO_AD_18
+D19,GPIO_AD_20
+D20,GPIO_AD_21
+D21,GPIO_AD_22
+D22,GPIO_AD_23
+D23,GPIO_AD_17
+D24,GPIO_LPSR_12
+D25,GPIO_LPSR_11
+D26,GPIO_LPSR_10
+D27,GPIO_LPSR_09
+D29,GPIO_DISP_B2_11
+D30,GPIO_DISP_B2_10
+D31,GPIO_AD_05
+D32,GPIO_AD_04
+D33,GPIO_AD_03
+D34,GPIO_AD_02
+D35,GPIO_AD_01
+D36,GPIO_AD_00
+A0,GPIO_AD_10
+A1,GPIO_AD_11
+A2,GPIO_AD_12
+A3,GPIO_AD_13
+A4,GPIO_AD_09
+A5,GPIO_AD_08
+RX,GPIO_DISP_B2_11
+TX,GPIO_DISP_B2_10
+SCL,GPIO_LPSR_05
+SDA,GPIO_LPSR_04
+SCK,GPIO_AD_28
+SDI,GPIO_AD_31
+SDO,GPIO_AD_30
+CS,GPIO_AD_29
+LED1,GPIO_AD_04
+LED2,GPIO_AD_26
+MCK,GPIO_AD_17
+SCK_RX,GPIO_AD_19
+WS_RX,GPIO_AD_18
+SD_RX,GPIO_AD_20
+SCK_TX,GPIO_AD_22
+WS_TX,GPIO_AD_23
+SD_TX,GPIO_AD_21
diff --git a/ports/mimxrt/boards/MIMXRT1176.ld b/ports/mimxrt/boards/MIMXRT1176.ld
new file mode 100644
index 0000000000000..2408977b9410b
--- /dev/null
+++ b/ports/mimxrt/boards/MIMXRT1176.ld
@@ -0,0 +1,59 @@
+/* Memory configuration */
+
+/* Reserved Area
+ * Users can create a reserved area at the end of the flash memory via
+ * 'reserved_size' variable. The size of the reserved area should be a multiple
+ * of the sector size of the flash memory!
+ */
+#if defined MICROPY_HW_FLASH_RESERVED
+reserved_size = MICROPY_HW_FLASH_RESERVED;
+#endif
+
+#if MICROPY_HW_FLASH_TYPE == qspi_nor
+flash_start         = 0x30000000;
+#else
+#error Unknown MICROPY_HW_FLASH_TYPE
+#endif
+flash_size      = MICROPY_HW_FLASH_SIZE;
+flash_end           = DEFINED(reserved_size) ? ((flash_start) + (flash_size - reserved_size)) : ((flash_start) + (flash_size));
+flash_config_start  = flash_start + 0x400;  /* TODO: check why config_start is on 0x400 instead of 0x0 offset */
+flash_config_size   = 0x00000C00;
+ivt_start           = flash_start + 0x00001000;
+ivt_size            = 0x00001000;
+interrupts_start    = flash_start + 0x00002000;
+interrupts_size     = 0x00000400;
+text_start          = flash_start + 0x00002400;
+vfs_start           = flash_start + 0x00200000;
+
+#if defined MULTI_CORE
+m_core1_image_start = vfs_start - 0x00040000;
+m_core1_image_size  = 0x00040000;
+#endif
+
+text_size           = ((vfs_start) - (text_start));
+vfs_size            = ((flash_end) - (vfs_start));
+itcm_start          = 0x00000000;
+itcm_size           = 0x00020000;
+dtcm_start          = 0x20000000;
+dtcm_size           = 0x00020000;
+ocrm_start          = 0x20240000;
+ocrm_size           = 0x00100000;
+
+#ifdef MICROPY_HW_SDRAM_AVAIL
+sdram_start         = 0x80000000;
+sdram_size          = MICROPY_HW_SDRAM_SIZE;
+#endif
+
+/* 32kiB stack. */
+__stack_size__ = 0x8000;
+_estack = __StackTop;
+_sstack = __StackLimit;
+
+#ifdef MICROPY_HW_SDRAM_AVAIL
+_gc_heap_start = ORIGIN(m_sdram);
+_gc_heap_end = ORIGIN(m_sdram) + LENGTH(m_sdram);
+#else
+/* Use second OCRAM bank for GC heap. */
+_gc_heap_start = ORIGIN(m_ocrm);
+_gc_heap_end = ORIGIN(m_ocrm) + LENGTH(m_ocrm);
+#endif
diff --git a/ports/mimxrt/boards/MIMXRT1176_af.csv b/ports/mimxrt/boards/MIMXRT1176_af.csv
new file mode 100644
index 0000000000000..fe31f502e4ed2
--- /dev/null
+++ b/ports/mimxrt/boards/MIMXRT1176_af.csv
@@ -0,0 +1,173 @@
+Pad,ALT0,ALT1,ALT2,ALT3,ALT4,ALT5,ALT6,ALT7,ALT8,ALT9,ALT10,ADC,ACMP,Default
+GPIO_SD_B1_00,USDHC1_CMD,,XBAR1_INOUT20,GPT4_CAPTURE1,,GPIO4_IO03,FLEXSPI2_A_SS0_B,,KPP_ROW07,,GPIO10_IO03,,,
+GPIO_SD_B1_01,USDHC1_CLK,,XBAR1_INOUT21,GPT4_CAPTURE2,,GPIO4_IO04,FLEXSPI2_A_SCLK,,KPP_COL07,,GPIO10_IO04,,,
+GPIO_SD_B1_02,USDHC1_DATA0,,XBAR1_INOUT22,GPT4_COMPARE1,,GPIO4_IO05,FLEXSPI2_A_DATA00,,KPP_ROW06,FLEXSPI1_A_SS1_B,GPIO10_IO05,,,
+GPIO_SD_B1_03,USDHC1_DATA1,,XBAR1_INOUT23,GPT4_COMPARE2,,GPIO4_IO06,FLEXSPI2_A_DATA01,,KPP_COL06,FLEXSPI1_B_SS1_B,GPIO10_IO06,,,
+GPIO_SD_B1_04,USDHC1_DATA2,,XBAR1_INOUT24,GPT4_COMPARE3,,GPIO4_IO07,FLEXSPI2_A_DATA02,,FLEXSPI1_B_SS0_B,ENET_QOS_1588_EVENT2_AUX_IN,GPIO10_IO07,,,
+GPIO_SD_B1_05,USDHC1_DATA3,,XBAR1_INOUT25,GPT4_CLK,,GPIO4_IO08,FLEXSPI2_A_DATA03,,FLEXSPI1_B_DQS,ENET_QOS_1588_EVENT3_AUX_IN,GPIO10_IO08,,,
+GPIO_SD_B2_00,USDHC2_DATA3,FLEXSPI1_B_DATA03,ENET_1G_RX_EN,LPUART9_TXD,LPSPI4_SCK,GPIO4_IO09,,,,,GPIO10_IO09,,,
+GPIO_SD_B2_01,USDHC2_DATA2,FLEXSPI1_B_DATA02,ENET_1G_RX_CLK,LPUART9_RXD,LPSPI4_PCS0,GPIO4_IO10,,,,,GPIO10_IO10,,,
+GPIO_SD_B2_02,USDHC2_DATA1,FLEXSPI1_B_DATA01,ENET_1G_RX_DATA00,LPUART9_CTS_B,LPSPI4_SOUT,GPIO4_IO11,,,,,GPIO10_IO11,,,
+GPIO_SD_B2_03,USDHC2_DATA0,FLEXSPI1_B_DATA00,ENET_1G_RX_DATA01,LPUART9_RTS_B,LPSPI4_SIN,GPIO4_IO12,,,,,GPIO10_IO12,,,
+GPIO_SD_B2_04,USDHC2_CLK,FLEXSPI1_B_SCLK,ENET_1G_RX_DATA02,FLEXSPI1_A_SS1_B,LPSPI4_PCS1,GPIO4_IO13,,,,,GPIO10_IO13,,,
+GPIO_SD_B2_05,USDHC2_CMD,FLEXSPI1_A_DQS,ENET_1G_RX_DATA03,FLEXSPI1_B_SS0_B,LPSPI4_PCS2,GPIO4_IO14,,,,,GPIO10_IO14,,,
+GPIO_SD_B2_06,USDHC2_RESET_B,FLEXSPI1_A_SS0_B,ENET_1G_TX_DATA03,LPSPI4_PCS3,GPT6_CAPTURE1,GPIO4_IO15,,,,,GPIO10_IO15,,,
+GPIO_SD_B2_07,USDHC2_STROBE,FLEXSPI1_A_SCLK,ENET_1G_TX_DATA02,LPUART3_CTS_B,GPT6_CAPTURE2,GPIO4_IO16,LPSPI2_SCK,,ENET_TX_ER,ENET_QOS_REF_CLK,GPIO10_IO16,,,
+GPIO_SD_B2_08,USDHC2_DATA4,FLEXSPI1_A_DATA00,ENET_1G_TX_DATA01,LPUART3_RTS_B,GPT6_COMPARE1,GPIO4_IO17,LPSPI2_PCS0,,,,GPIO10_IO17,,,
+GPIO_SD_B2_09,USDHC2_DATA5,FLEXSPI1_A_DATA01,ENET_1G_TX_DATA00,LPUART5_CTS_B,GPT6_COMPARE2,GPIO4_IO18,LPSPI2_SOUT,,,,GPIO10_IO18,,,
+GPIO_SD_B2_10,USDHC2_DATA6,FLEXSPI1_A_DATA02,ENET_1G_TX_EN,LPUART5_RTS_B,GPT6_COMPARE3,GPIO4_IO19,LPSPI2_SIN,,,,GPIO10_IO19,,,
+GPIO_SD_B2_11,USDHC2_DATA7,FLEXSPI1_A_DATA03,ENET_1G_TX_CLK_IO,ENET_1G_REF_CLK,GPT6_CLK,GPIO4_IO20,LPSPI2_PCS1,,,,GPIO10_IO20,,,
+GPIO_EMC_B1_00,SEMC_DATA00,FLEXPWM4_PWM0_A,,,,GPIO1_IO00,,,FLEXIO1_D00,,GPIO7_IO00,,,
+GPIO_EMC_B1_01,SEMC_DATA01,FLEXPWM4_PWM0_B,,,,GPIO1_IO01,,,FLEXIO1_D01,,GPIO7_IO01,,,
+GPIO_EMC_B1_02,SEMC_DATA02,FLEXPWM4_PWM1_A,,,,GPIO1_IO02,,,FLEXIO1_D02,,GPIO7_IO02,,,
+GPIO_EMC_B1_03,SEMC_DATA03,FLEXPWM4_PWM1_B,,,,GPIO1_IO03,,,FLEXIO1_D03,,GPIO7_IO03,,,
+GPIO_EMC_B1_04,SEMC_DATA04,FLEXPWM4_PWM2_A,,,,GPIO1_IO04,,,FLEXIO1_D04,,GPIO7_IO04,,,
+GPIO_EMC_B1_05,SEMC_DATA05,FLEXPWM4_PWM2_B,,,,GPIO1_IO05,,,FLEXIO1_D05,,GPIO7_IO05,,,
+GPIO_EMC_B1_06,SEMC_DATA06,FLEXPWM2_PWM0_A,,,,GPIO1_IO06,,,FLEXIO1_D06,,GPIO7_IO06,,,
+GPIO_EMC_B1_07,SEMC_DATA07,FLEXPWM2_PWM0_B,,,,GPIO1_IO07,,,FLEXIO1_D07,,GPIO7_IO07,,,
+GPIO_EMC_B1_08,SEMC_DM00,FLEXPWM2_PWM1_A,,,,GPIO1_IO08,,,FLEXIO1_D08,,GPIO7_IO08,,,
+GPIO_EMC_B1_09,SEMC_ADDR00,FLEXPWM2_PWM1_B,GPT5_CAPTURE1,,,GPIO1_IO09,,,FLEXIO1_D09,,GPIO7_IO09,,,
+GPIO_EMC_B1_10,SEMC_ADDR01,FLEXPWM2_PWM2_A,GPT5_CAPTURE2,,,GPIO1_IO10,,,FLEXIO1_D10,,GPIO7_IO10,,,
+GPIO_EMC_B1_11,SEMC_ADDR02,FLEXPWM2_PWM2_B,GPT5_COMPARE1,,,GPIO1_IO11,,,FLEXIO1_D11,,GPIO7_IO11,,,
+GPIO_EMC_B1_12,SEMC_ADDR03,XBAR1_INOUT04,GPT5_COMPARE2,,,GPIO1_IO12,,,FLEXIO1_D12,,GPIO7_IO12,,,
+GPIO_EMC_B1_13,SEMC_ADDR04,XBAR1_INOUT05,GPT5_COMPARE3,,,GPIO1_IO13,,,FLEXIO1_D13,,GPIO7_IO13,,,
+GPIO_EMC_B1_14,SEMC_ADDR05,XBAR1_INOUT06,GPT5_CLK,,,GPIO1_IO14,,,FLEXIO1_D14,,GPIO7_IO14,,,
+GPIO_EMC_B1_15,SEMC_ADDR06,XBAR1_INOUT07,,,,GPIO1_IO15,,,FLEXIO1_D15,,GPIO7_IO15,,,
+GPIO_EMC_B1_16,SEMC_ADDR07,XBAR1_INOUT08,,,,GPIO1_IO16,,,FLEXIO1_D16,,GPIO7_IO16,,,
+GPIO_EMC_B1_17,SEMC_ADDR08,FLEXPWM4_PWM3_A,TMR1_TIMER0,,,GPIO1_IO17,,,FLEXIO1_D17,,GPIO7_IO17,,,
+GPIO_EMC_B1_18,SEMC_ADDR09,FLEXPWM4_PWM3_B,TMR2_TIMER0,,,GPIO1_IO18,,,FLEXIO1_D18,,GPIO7_IO18,,,
+GPIO_EMC_B1_19,SEMC_ADDR11,FLEXPWM2_PWM3_A,TMR3_TIMER0,,,GPIO1_IO19,,,FLEXIO1_D19,,GPIO7_IO19,,,
+GPIO_EMC_B1_20,SEMC_ADDR12,FLEXPWM2_PWM3_B,TMR4_TIMER0,,,GPIO1_IO20,,,FLEXIO1_D20,,GPIO7_IO20,,,
+GPIO_EMC_B1_21,SEMC_BA0,FLEXPWM3_PWM3_A,,,,GPIO1_IO21,,,FLEXIO1_D21,,GPIO7_IO21,,,
+GPIO_EMC_B1_22,SEMC_BA1,FLEXPWM3_PWM3_B,,,,GPIO1_IO22,,,FLEXIO1_D22,,GPIO7_IO22,,,
+GPIO_EMC_B1_23,SEMC_ADDR10,FLEXPWM1_PWM0_A,,,,GPIO1_IO23,,,FLEXIO1_D23,,GPIO7_IO23,,,
+GPIO_EMC_B1_24,SEMC_CAS,FLEXPWM1_PWM0_B,,,,GPIO1_IO24,,,FLEXIO1_D24,,GPIO7_IO24,,,
+GPIO_EMC_B1_25,SEMC_RAS,FLEXPWM1_PWM1_A,,,,GPIO1_IO25,,,FLEXIO1_D25,,GPIO7_IO25,,,
+GPIO_EMC_B1_26,SEMC_CLK,FLEXPWM1_PWM1_B,,,,GPIO1_IO26,,,FLEXIO1_D26,,GPIO7_IO26,,,
+GPIO_EMC_B1_27,SEMC_CKE,FLEXPWM1_PWM2_A,,,,GPIO1_IO27,,,FLEXIO1_D27,,GPIO7_IO27,,,
+GPIO_EMC_B1_28,SEMC_WE,FLEXPWM1_PWM2_B,,,,GPIO1_IO28,,,FLEXIO1_D28,,GPIO7_IO28,,,
+GPIO_EMC_B1_29,SEMC_CS0,FLEXPWM3_PWM0_A,,,,GPIO1_IO29,,,FLEXIO1_D29,,GPIO7_IO29,,,
+GPIO_EMC_B1_30,SEMC_DATA08,FLEXPWM3_PWM0_B,,,,GPIO1_IO30,,,FLEXIO1_D30,,GPIO7_IO30,,,
+GPIO_EMC_B1_31,SEMC_DATA09,FLEXPWM3_PWM1_A,,,,GPIO1_IO31,,,FLEXIO1_D31,,GPIO7_IO31,,,
+GPIO_EMC_B1_32,SEMC_DATA10,FLEXPWM3_PWM1_B,,,,GPIO2_IO00,,,,,GPIO8_IO00,,,
+GPIO_EMC_B1_33,SEMC_DATA11,FLEXPWM3_PWM2_A,,,,GPIO2_IO01,,,,,GPIO8_IO01,,,
+GPIO_EMC_B1_34,SEMC_DATA12,FLEXPWM3_PWM2_B,,,,GPIO2_IO02,,,,,GPIO8_IO02,,,
+GPIO_EMC_B1_35,SEMC_DATA13,XBAR1_INOUT09,,,,GPIO2_IO03,,,,,GPIO8_IO03,,,
+GPIO_EMC_B1_36,SEMC_DATA14,XBAR1_INOUT10,,,,GPIO2_IO04,,,,,GPIO8_IO04,,,
+GPIO_EMC_B1_37,SEMC_DATA15,XBAR1_INOUT11,,,,GPIO2_IO05,,,,,GPIO8_IO05,,,
+GPIO_EMC_B1_38,SEMC_DM01,FLEXPWM1_PWM3_A,TMR1_TIMER1,,,GPIO2_IO06,,,,,GPIO8_IO06,,,
+GPIO_EMC_B1_39,SEMC_DQS,FLEXPWM1_PWM3_B,TMR2_TIMER1,,,GPIO2_IO07,,,,,GPIO8_IO07,,,
+GPIO_EMC_B1_40,SEMC_RDY,XBAR1_INOUT12,MQS_RIGHT,LPUART6_TXD,,GPIO2_IO08,,ENET_1G_MDC,,CCM_CLKO1,GPIO8_IO08,,,
+GPIO_EMC_B1_41,SEMC_CSX00,XBAR1_INOUT13,MQS_LEFT,LPUART6_RXD,FLEXSPI2_B_DATA07,GPIO2_IO09,,ENET_1G_MDIO,,CCM_CLKO2,GPIO8_IO09,,,
+GPIO_EMC_B2_00,SEMC_DATA16,CCM_ENET_REF_CLK_25M,TMR3_TIMER1,LPUART6_CTS_B,FLEXSPI2_B_DATA06,GPIO2_IO10,XBAR1_INOUT20,ENET_QOS_1588_EVENT1_OUT,LPSPI1_SCK,LPI2C2_SCL,GPIO8_IO10,,,
+GPIO_EMC_B2_01,SEMC_DATA17,USDHC2_CD_B,TMR4_TIMER1,LPUART6_RTS_B,FLEXSPI2_B_DATA05,GPIO2_IO11,XBAR1_INOUT21,ENET_QOS_1588_EVENT1_IN,LPSPI1_PCS0,LPI2C2_SDA,GPIO8_IO11,,,
+GPIO_EMC_B2_02,SEMC_DATA18,USDHC2_WP,,VIDEO_MUX_CSI_DATA23,FLEXSPI2_B_DATA04,GPIO2_IO12,XBAR1_INOUT22,ENET_QOS_1588_EVENT1_AUX_IN,LPSPI1_SOUT,,GPIO8_IO12,,,
+GPIO_EMC_B2_03,SEMC_DATA19,USDHC2_VSELECT,,VIDEO_MUX_CSI_DATA22,FLEXSPI2_B_DATA03,GPIO2_IO13,XBAR1_INOUT23,ENET_1G_TX_DATA03,LPSPI1_SIN,,GPIO8_IO13,,,
+GPIO_EMC_B2_04,SEMC_DATA20,USDHC2_RESET_B,SAI2_MCLK,VIDEO_MUX_CSI_DATA21,FLEXSPI2_B_DATA02,GPIO2_IO14,XBAR1_INOUT24,ENET_1G_TX_DATA02,LPSPI3_SCK,,GPIO8_IO14,,,
+GPIO_EMC_B2_05,SEMC_DATA21,GPT3_CLK,SAI2_RX_SYNC,VIDEO_MUX_CSI_DATA20,FLEXSPI2_B_DATA01,GPIO2_IO15,XBAR1_INOUT25,ENET_1G_RX_CLK,LPSPI3_PCS0,PIT1_TRIGGER0,GPIO8_IO15,,,
+GPIO_EMC_B2_06,SEMC_DATA22,GPT3_CAPTURE1,SAI2_RX_BCLK,VIDEO_MUX_CSI_DATA19,FLEXSPI2_B_DATA00,GPIO2_IO16,XBAR1_INOUT26,ENET_1G_TX_ER,LPSPI3_SOUT,PIT1_TRIGGER1,GPIO8_IO16,,,
+GPIO_EMC_B2_07,SEMC_DATA23,GPT3_CAPTURE2,SAI2_RX_DATA,VIDEO_MUX_CSI_DATA18,FLEXSPI2_B_DQS,GPIO2_IO17,XBAR1_INOUT27,ENET_1G_RX_DATA03,LPSPI3_SIN,PIT1_TRIGGER2,GPIO8_IO17,,,
+GPIO_EMC_B2_08,SEMC_DM02,GPT3_COMPARE1,SAI2_TX_DATA,VIDEO_MUX_CSI_DATA17,FLEXSPI2_B_SS0_B,GPIO2_IO18,XBAR1_INOUT28,ENET_1G_RX_DATA02,LPSPI3_PCS1,PIT1_TRIGGER3,GPIO8_IO18,,,
+GPIO_EMC_B2_09,SEMC_DATA24,GPT3_COMPARE2,SAI2_TX_BCLK,VIDEO_MUX_CSI_DATA16,FLEXSPI2_B_SCLK,GPIO2_IO19,XBAR1_INOUT29,ENET_1G_CRS,LPSPI3_PCS2,TMR1_TIMER0,GPIO8_IO19,,,
+GPIO_EMC_B2_10,SEMC_DATA25,GPT3_COMPARE3,SAI2_TX_SYNC,VIDEO_MUX_CSI_FIELD,FLEXSPI2_A_SCLK,GPIO2_IO20,XBAR1_INOUT30,ENET_1G_COL,LPSPI3_PCS3,TMR1_TIMER1,GPIO8_IO20,,,
+GPIO_EMC_B2_11,SEMC_DATA26,SPDIF_IN,ENET_1G_TX_DATA00,SAI3_RX_SYNC,FLEXSPI2_A_SS0_B,GPIO2_IO21,XBAR1_INOUT31,,EMVSIM1_IO,TMR1_TIMER2,GPIO8_IO21,,,
+GPIO_EMC_B2_12,SEMC_DATA27,SPDIF_OUT,ENET_1G_TX_DATA01,SAI3_RX_BCLK,FLEXSPI2_A_DQS,GPIO2_IO22,XBAR1_INOUT32,,EMVSIM1_CLK,TMR1_TIMER3,GPIO8_IO22,,,
+GPIO_EMC_B2_13,SEMC_DATA28,,ENET_1G_TX_EN,SAI3_RX_DATA,FLEXSPI2_A_DATA00,GPIO2_IO23,XBAR1_INOUT33,,EMVSIM1_RST,TMR2_TIMER0,GPIO8_IO23,,,
+GPIO_EMC_B2_14,SEMC_DATA29,,ENET_1G_TX_CLK_IO,SAI3_TX_DATA,FLEXSPI2_A_DATA01,GPIO2_IO24,XBAR1_INOUT34,SFA_ipp_do_atx_clk_under_test,EMVSIM1_SVEN,TMR2_TIMER1,GPIO8_IO24,,,
+GPIO_EMC_B2_15,SEMC_DATA30,,ENET_1G_RX_DATA00,SAI3_TX_BCLK,FLEXSPI2_A_DATA02,GPIO2_IO25,XBAR1_INOUT35,,EMVSIM1_PD,TMR2_TIMER2,GPIO8_IO25,,,
+GPIO_EMC_B2_16,SEMC_DATA31,XBAR1_INOUT14,ENET_1G_RX_DATA01,SAI3_TX_SYNC,FLEXSPI2_A_DATA03,GPIO2_IO26,,,EMVSIM1_POWER_FAIL,TMR2_TIMER3,GPIO8_IO26,,,
+GPIO_EMC_B2_17,SEMC_DM03,XBAR1_INOUT15,ENET_1G_RX_EN,SAI3_MCLK,FLEXSPI2_A_DATA04,GPIO2_IO27,,,WDOG1_ANY,TMR3_TIMER0,GPIO8_IO27,,,
+GPIO_EMC_B2_18,SEMC_DQS4,XBAR1_INOUT16,ENET_1G_RX_ER,EWM_OUT_B,FLEXSPI2_A_DATA05,GPIO2_IO28,FLEXSPI1_A_DQS,,WDOG1_B,TMR3_TIMER1,GPIO8_IO28,,,
+GPIO_EMC_B2_19,SEMC_CLKX00,ENET_MDC,ENET_1G_MDC,ENET_1G_REF_CLK,FLEXSPI2_A_DATA06,GPIO2_IO29,,,ENET_QOS_MDC,TMR3_TIMER2,GPIO8_IO29,,,
+GPIO_EMC_B2_20,SEMC_CLKX01,ENET_MDIO,ENET_1G_MDIO,ENET_QOS_REF_CLK,FLEXSPI2_A_DATA07,GPIO2_IO30,,,ENET_QOS_MDIO,TMR3_TIMER3,GPIO8_IO30,,,
+GPIO_SNVS_00,SNVS_TAMPER0,,,,,GPIO13_IO03,,,,,,,,
+GPIO_SNVS_01,SNVS_TAMPER1,,,,,GPIO13_IO04,,,,,,,,
+GPIO_SNVS_02,SNVS_TAMPER2,,,,,GPIO13_IO05,,,,,,,,
+GPIO_SNVS_03,SNVS_TAMPER3,,,,,GPIO13_IO06,,,,,,,,
+GPIO_SNVS_04,SNVS_TAMPER4,,,,,GPIO13_IO07,,,,,,,,
+GPIO_SNVS_05,SNVS_TAMPER5,,,,,GPIO13_IO08,,,,,,,,
+GPIO_SNVS_06,SNVS_TAMPER6,,,,,GPIO13_IO09,,,,,,,,
+GPIO_SNVS_07,SNVS_TAMPER7,,,,,GPIO13_IO10,,,,,,,,
+GPIO_SNVS_08,SNVS_TAMPER8,,,,,GPIO13_IO11,,,,,,,,
+GPIO_SNVS_09,SNVS_TAMPER9,,,,,GPIO13_IO12,,,,,,,,
+GPIO_LPSR_00,FLEXCAN3_TX,MIC_CLK,MQS_RIGHT,ARM_CM4_EVENTO,,GPIO6_IO00,LPUART12_TXD,SAI4_MCLK,,,GPIO12_IO00,,,
+GPIO_LPSR_01,FLEXCAN3_RX,MIC_BITSTREAM0,MQS_LEFT,ARM_CM4_EVENTI,,GPIO6_IO01,LPUART12_RXD,,,,GPIO12_IO01,,,
+GPIO_LPSR_02,SRC_BOOT_MODE00,LPSPI5_SCK,SAI4_TX_DATA,MQS_RIGHT,,GPIO6_IO02,,,,,GPIO12_IO02,,,
+GPIO_LPSR_03,SRC_BOOT_MODE01,LPSPI5_PCS0,SAI4_TX_SYNC,MQS_LEFT,,GPIO6_IO03,,,,,GPIO12_IO03,,,
+GPIO_LPSR_04,LPI2C5_SDA,LPSPI5_SOUT,SAI4_TX_BCLK,LPUART12_RTS_B,,GPIO6_IO04,LPUART11_TXD,,,,GPIO12_IO04,,,
+GPIO_LPSR_05,LPI2C5_SCL,LPSPI5_SIN,SAI4_MCLK,LPUART12_CTS_B,,GPIO6_IO05,LPUART11_RXD,NMI_GLUE_NMI,,,GPIO12_IO05,,,
+GPIO_LPSR_06,LPI2C6_SDA,,SAI4_RX_DATA,LPUART12_TXD,LPSPI6_PCS3,GPIO6_IO06,FLEXCAN3_TX,PIT2_TRIGGER3,LPSPI5_PCS1,,GPIO12_IO06,,,
+GPIO_LPSR_07,LPI2C6_SCL,,SAI4_RX_BCLK,LPUART12_RXD,LPSPI6_PCS2,GPIO6_IO07,FLEXCAN3_RX,PIT2_TRIGGER2,LPSPI5_PCS2,,GPIO12_IO07,,,
+GPIO_LPSR_08,LPUART11_TXD,FLEXCAN3_TX,SAI4_RX_SYNC,MIC_CLK,LPSPI6_PCS1,GPIO6_IO08,LPI2C5_SDA,PIT2_TRIGGER1,LPSPI5_PCS3,,GPIO12_IO08,,,
+GPIO_LPSR_09,LPUART11_RXD,FLEXCAN3_RX,PIT2_TRIGGER0,MIC_BITSTREAM0,LPSPI6_PCS0,GPIO6_IO09,LPI2C5_SCL,SAI4_TX_DATA,,,GPIO12_IO09,,,
+GPIO_LPSR_10,JTAG_MUX_TRSTB,LPUART11_CTS_B,LPI2C6_SDA,MIC_BITSTREAM1,LPSPI6_SCK,GPIO6_IO10,LPI2C5_SCLS,SAI4_TX_SYNC,LPUART12_TXD,,GPIO12_IO10,,,
+GPIO_LPSR_11,JTAG_MUX_TDO,LPUART11_RTS_B,LPI2C6_SCL,MIC_BITSTREAM2,LPSPI6_SOUT,GPIO6_IO11,LPI2C5_SDAS,ARM_TRACE_SWO,LPUART12_RXD,,GPIO12_IO11,,,
+GPIO_LPSR_12,JTAG_MUX_TDI,PIT2_TRIGGER0,,MIC_BITSTREAM3,LPSPI6_SIN,GPIO6_IO12,LPI2C5_HREQ,SAI4_TX_BCLK,LPSPI5_SCK,,GPIO12_IO12,,,
+GPIO_LPSR_13,JTAG_MUX_MOD,MIC_BITSTREAM1,PIT2_TRIGGER1,,,GPIO6_IO13,,SAI4_RX_DATA,LPSPI5_PCS0,,GPIO12_IO13,,,
+GPIO_LPSR_14,JTAG_MUX_TCK,MIC_BITSTREAM2,PIT2_TRIGGER2,,,GPIO6_IO14,,SAI4_RX_BCLK,LPSPI5_SOUT,,GPIO12_IO14,,,
+GPIO_LPSR_15,JTAG_MUX_TMS,MIC_BITSTREAM3,PIT2_TRIGGER3,,,GPIO6_IO15,,SAI4_RX_SYNC,LPSPI5_SIN,,GPIO12_IO15,,,
+WAKEUP_DIG,,,,,,GPIO13_IO00,,NMI_GLUE_NMI,,,,,,
+GPIO_DISP_B1_00,VIDEO_MUX_LCDIF_CLK,ENET_1G_RX_EN,,TMR1_TIMER0,XBAR1_INOUT26,GPIO4_IO21,,,ENET_QOS_RX_EN,,GPIO10_IO21,,,
+GPIO_DISP_B1_01,VIDEO_MUX_LCDIF_ENABLE,ENET_1G_RX_CLK,ENET_1G_RX_ER,TMR1_TIMER1,XBAR1_INOUT27,GPIO4_IO22,,,ENET_QOS_RX_CLK,ENET_QOS_RX_ER,GPIO10_IO22,,,
+GPIO_DISP_B1_02,VIDEO_MUX_LCDIF_HSYNC,ENET_1G_RX_DATA00,LPI2C3_SCL,TMR1_TIMER2,XBAR1_INOUT28,GPIO4_IO23,,,ENET_QOS_RX_DATA00,LPUART1_TXD,GPIO10_IO23,,,
+GPIO_DISP_B1_03,VIDEO_MUX_LCDIF_VSYNC,ENET_1G_RX_DATA01,LPI2C3_SDA,TMR2_TIMER0,XBAR1_INOUT29,GPIO4_IO24,,,ENET_QOS_RX_DATA01,LPUART1_RXD,GPIO10_IO24,,,
+GPIO_DISP_B1_04,VIDEO_MUX_LCDIF_DATA00,ENET_1G_RX_DATA02,LPUART4_RXD,TMR2_TIMER1,XBAR1_INOUT30,GPIO4_IO25,,,ENET_QOS_RX_DATA02,LPSPI3_SCK,GPIO10_IO25,,,
+GPIO_DISP_B1_05,VIDEO_MUX_LCDIF_DATA01,ENET_1G_RX_DATA03,LPUART4_CTS_B,TMR2_TIMER2,XBAR1_INOUT31,GPIO4_IO26,,,ENET_QOS_RX_DATA03,LPSPI3_SIN,GPIO10_IO26,,,
+GPIO_DISP_B1_06,VIDEO_MUX_LCDIF_DATA02,ENET_1G_TX_DATA03,LPUART4_TXD,TMR3_TIMER0,XBAR1_INOUT32,GPIO4_IO27,SRC_BT_CFG00,,ENET_QOS_TX_DATA03,LPSPI3_SOUT,GPIO10_IO27,,,
+GPIO_DISP_B1_07,VIDEO_MUX_LCDIF_DATA03,ENET_1G_TX_DATA02,LPUART4_RTS_B,TMR3_TIMER1,XBAR1_INOUT33,GPIO4_IO28,SRC_BT_CFG01,,ENET_QOS_TX_DATA02,LPSPI3_PCS0,GPIO10_IO28,,,
+GPIO_DISP_B1_08,VIDEO_MUX_LCDIF_DATA04,ENET_1G_TX_DATA01,USDHC1_CD_B,TMR3_TIMER2,XBAR1_INOUT34,GPIO4_IO29,SRC_BT_CFG02,,ENET_QOS_TX_DATA01,LPSPI3_PCS1,GPIO10_IO29,,,
+GPIO_DISP_B1_09,VIDEO_MUX_LCDIF_DATA05,ENET_1G_TX_DATA00,USDHC1_WP,TMR4_TIMER0,XBAR1_INOUT35,GPIO4_IO30,SRC_BT_CFG03,,ENET_QOS_TX_DATA00,LPSPI3_PCS2,GPIO10_IO30,,,
+GPIO_DISP_B1_10,VIDEO_MUX_LCDIF_DATA06,ENET_1G_TX_EN,USDHC1_RESET_B,TMR4_TIMER1,XBAR1_INOUT36,GPIO4_IO31,SRC_BT_CFG04,,ENET_QOS_TX_EN,LPSPI3_PCS3,GPIO10_IO31,,,
+GPIO_DISP_B1_11,VIDEO_MUX_LCDIF_DATA07,ENET_1G_TX_CLK_IO,ENET_1G_REF_CLK,TMR4_TIMER2,XBAR1_INOUT37,GPIO5_IO00,SRC_BT_CFG05,,ENET_QOS_TX_CLK,ENET_QOS_REF_CLK,GPIO11_IO00,,,
+GPIO_DISP_B2_00,VIDEO_MUX_LCDIF_DATA08,WDOG1_B,MQS_RIGHT,ENET_1G_TX_ER,SAI1_TX_DATA03,GPIO5_IO01,SRC_BT_CFG06,,ENET_QOS_TX_ER,,GPIO11_IO01,,,
+GPIO_DISP_B2_01,VIDEO_MUX_LCDIF_DATA09,USDHC1_VSELECT,MQS_LEFT,WDOG2_B,SAI1_TX_DATA02,GPIO5_IO02,SRC_BT_CFG07,,EWM_OUT_B,CCM_ENET_REF_CLK_25M,GPIO11_IO02,,,
+GPIO_DISP_B2_02,VIDEO_MUX_LCDIF_DATA10,ENET_TX_DATA00,PIT1_TRIGGER3,ARM_TRACE00,SAI1_TX_DATA01,GPIO5_IO03,SRC_BT_CFG08,,ENET_QOS_TX_DATA00,,GPIO11_IO03,,,
+GPIO_DISP_B2_03,VIDEO_MUX_LCDIF_DATA11,ENET_TX_DATA01,PIT1_TRIGGER2,ARM_TRACE01,SAI1_MCLK,GPIO5_IO04,SRC_BT_CFG09,,ENET_QOS_TX_DATA01,,GPIO11_IO04,,,
+GPIO_DISP_B2_04,VIDEO_MUX_LCDIF_DATA12,ENET_TX_EN,PIT1_TRIGGER1,ARM_TRACE02,SAI1_RX_SYNC,GPIO5_IO05,SRC_BT_CFG10,,ENET_QOS_TX_EN,,GPIO11_IO05,,,
+GPIO_DISP_B2_05,VIDEO_MUX_LCDIF_DATA13,ENET_TX_CLK,ENET_REF_CLK,ARM_TRACE03,SAI1_RX_BCLK,GPIO5_IO06,SRC_BT_CFG11,,ENET_QOS_TX_CLK,,GPIO11_IO06,,,
+GPIO_DISP_B2_06,VIDEO_MUX_LCDIF_DATA14,ENET_RX_DATA00,LPUART7_TXD,ARM_TRACE_CLK,SAI1_RX_DATA00,GPIO5_IO07,,,ENET_QOS_RX_DATA00,,GPIO11_IO07,,,
+GPIO_DISP_B2_07,VIDEO_MUX_LCDIF_DATA15,ENET_RX_DATA01,LPUART7_RXD,ARM_TRACE_SWO,SAI1_TX_DATA00,GPIO5_IO08,,,ENET_QOS_RX_DATA01,,GPIO11_IO08,,,
+GPIO_DISP_B2_08,VIDEO_MUX_LCDIF_DATA16,ENET_RX_EN,LPUART8_TXD,ARM_CM7_EVENTO,SAI1_TX_BCLK,GPIO5_IO09,,,ENET_QOS_RX_EN,LPUART1_TXD,GPIO11_IO09,,,
+GPIO_DISP_B2_09,VIDEO_MUX_LCDIF_DATA17,ENET_RX_ER,LPUART8_RXD,ARM_CM7_EVENTI,SAI1_TX_SYNC,GPIO5_IO10,,,ENET_QOS_RX_ER,LPUART1_RXD,GPIO11_IO10,,,
+GPIO_DISP_B2_10,VIDEO_MUX_LCDIF_DATA18,EMVSIM2_IO,LPUART2_TXD,WDOG2_RESET_B_DEB,XBAR1_INOUT38,GPIO5_IO11,LPI2C3_SCL,,ENET_QOS_RX_ER,SPDIF_IN,GPIO11_IO11,,,
+GPIO_DISP_B2_11,VIDEO_MUX_LCDIF_DATA19,EMVSIM2_CLK,LPUART2_RXD,WDOG1_RESET_B_DEB,XBAR1_INOUT39,GPIO5_IO12,LPI2C3_SDA,,ENET_QOS_CRS,SPDIF_OUT,GPIO11_IO12,,,
+GPIO_DISP_B2_12,VIDEO_MUX_LCDIF_DATA20,EMVSIM2_RST,FLEXCAN1_TX,LPUART2_CTS_B,XBAR1_INOUT40,GPIO5_IO13,LPI2C4_SCL,,ENET_QOS_COL,LPSPI4_SCK,GPIO11_IO13,,,
+GPIO_DISP_B2_13,VIDEO_MUX_LCDIF_DATA21,EMVSIM2_SVEN,FLEXCAN1_RX,LPUART2_RTS_B,ENET_REF_CLK,GPIO5_IO14,LPI2C4_SDA,,ENET_QOS_1588_EVENT0_OUT,LPSPI4_SIN,GPIO11_IO14,,,
+GPIO_DISP_B2_14,VIDEO_MUX_LCDIF_DATA22,EMVSIM2_PD,WDOG2_B,VIDEO_MUX_EXT_DCIC1,ENET_1G_REF_CLK,GPIO5_IO15,FLEXCAN1_TX,,ENET_QOS_1588_EVENT0_IN,LPSPI4_SOUT,GPIO11_IO15,,,
+GPIO_DISP_B2_15,VIDEO_MUX_LCDIF_DATA23,EMVSIM2_POWER_FAIL,WDOG1_B,VIDEO_MUX_EXT_DCIC2,PIT1_TRIGGER0,GPIO5_IO16,FLEXCAN1_RX,,ENET_QOS_1588_EVENT0_AUX_IN,LPSPI4_PCS0,GPIO11_IO16,,,
+GPIO_AD_00,EMVSIM1_IO,FLEXCAN2_TX,ENET_1G_1588_EVENT1_IN,GPT2_CAPTURE1,FLEXPWM1_PWM0_A,GPIO2_IO31,LPUART7_TXD,,FLEXIO2_D00,FLEXSPI2_B_SS1_B,GPIO8_IO31,,ACMP1_IN1,
+GPIO_AD_01,EMVSIM1_CLK,FLEXCAN2_RX,ENET_1G_1588_EVENT1_OUT,GPT2_CAPTURE2,FLEXPWM1_PWM0_B,GPIO3_IO00,LPUART7_RXD,,FLEXIO2_D01,FLEXSPI2_A_SS1_B,GPIO9_IO00,,ACMP1_IN2,
+GPIO_AD_02,EMVSIM1_RST,LPUART7_CTS_B,ENET_1G_1588_EVENT2_IN,GPT2_COMPARE1,FLEXPWM1_PWM1_A,GPIO3_IO01,LPUART8_TXD,,FLEXIO2_D02,VIDEO_MUX_EXT_DCIC1,GPIO9_IO01,,ACMP1_IN3,
+GPIO_AD_03,EMVSIM1_SVEN,LPUART7_RTS_B,ENET_1G_1588_EVENT2_OUT,GPT2_COMPARE2,FLEXPWM1_PWM1_B,GPIO3_IO02,LPUART8_RXD,,FLEXIO2_D03,VIDEO_MUX_EXT_DCIC2,GPIO9_IO02,,ACMP1_IN4,
+GPIO_AD_04,EMVSIM1_PD,LPUART8_CTS_B,ENET_1G_1588_EVENT3_IN,GPT2_COMPARE3,FLEXPWM1_PWM2_A,GPIO3_IO03,WDOG1_B,,FLEXIO2_D04,TMR4_TIMER0,GPIO9_IO03,,ACMP2_IN1,
+GPIO_AD_05,EMVSIM1_POWER_FAIL,LPUART8_RTS_B,ENET_1G_1588_EVENT3_OUT,GPT2_CLK,FLEXPWM1_PWM2_B,GPIO3_IO04,WDOG2_B,,FLEXIO2_D05,TMR4_TIMER1,GPIO9_IO04,,ACMP2_IN2,
+GPIO_AD_06,USB_OTG2_OC,FLEXCAN1_TX,EMVSIM2_IO,GPT3_CAPTURE1,VIDEO_MUX_CSI_DATA15,GPIO3_IO05,ENET_1588_EVENT1_IN,,FLEXIO2_D06,TMR4_TIMER2,GPIO9_IO05,ADC1_CH0A,,
+GPIO_AD_07,USB_OTG2_PWR,FLEXCAN1_RX,EMVSIM2_CLK,GPT3_CAPTURE2,VIDEO_MUX_CSI_DATA14,GPIO3_IO06,ENET_1588_EVENT1_OUT,,FLEXIO2_D07,TMR4_TIMER3,GPIO9_IO06,ADC1_CH0B,,
+GPIO_AD_08,USBPHY2_OTG_ID,LPI2C1_SCL,EMVSIM2_RST,GPT3_COMPARE1,VIDEO_MUX_CSI_DATA13,GPIO3_IO07,ENET_1588_EVENT2_IN,,FLEXIO2_D08,,GPIO9_IO07,ADC1_CH1A,,
+GPIO_AD_09,USBPHY1_OTG_ID,LPI2C1_SDA,EMVSIM2_SVEN,GPT3_COMPARE2,VIDEO_MUX_CSI_DATA12,GPIO3_IO08,ENET_1588_EVENT2_OUT,,FLEXIO2_D09,,GPIO9_IO08,ADC1_CH1B,,
+GPIO_AD_10,USB_OTG1_PWR,LPI2C1_SCLS,EMVSIM2_PD,GPT3_COMPARE3,VIDEO_MUX_CSI_DATA11,GPIO3_IO09,ENET_1588_EVENT3_IN,,FLEXIO2_D10,,GPIO9_IO09,ADC1_CH2A,,
+GPIO_AD_11,USB_OTG1_OC,LPI2C1_SDAS,EMVSIM2_POWER_FAIL,GPT3_CLK,VIDEO_MUX_CSI_DATA10,GPIO3_IO10,ENET_1588_EVENT3_OUT,,FLEXIO2_D11,,GPIO9_IO10,ADC1_CH2B,,
+GPIO_AD_12,SPDIF_LOCK,LPI2C1_HREQ,GPT1_CAPTURE1,FLEXSPI1_B_DATA03,VIDEO_MUX_CSI_PIXCLK,GPIO3_IO11,ENET_TX_DATA03,,FLEXIO2_D12,EWM_OUT_B,GPIO9_IO11,"ADC1_CH3A,ADC2_CH3A",,
+GPIO_AD_13,SPDIF_SR_CLK,PIT1_TRIGGER0,GPT1_CAPTURE2,FLEXSPI1_B_DATA02,VIDEO_MUX_CSI_MCLK,GPIO3_IO12,ENET_TX_DATA02,,FLEXIO2_D13,REF_CLK_32K,GPIO9_IO12,"ADC1_CH3B,ADC2_CH3B",,
+GPIO_AD_14,SPDIF_EXT_CLK,REF_CLK_24M,GPT1_COMPARE1,FLEXSPI1_B_DATA01,VIDEO_MUX_CSI_VSYNC,GPIO3_IO13,ENET_RX_CLK,,FLEXIO2_D14,CCM_ENET_REF_CLK_25M,GPIO9_IO13,"ADC1_CH4A,ADC2_CH4A",,
+GPIO_AD_15,SPDIF_IN,LPUART10_TXD,GPT1_COMPARE2,FLEXSPI1_B_DATA00,VIDEO_MUX_CSI_HSYNC,GPIO3_IO14,ENET_TX_ER,,FLEXIO2_D15,,GPIO9_IO14,"ADC1_CH4B,ADC2_CH4B",,
+GPIO_AD_16,SPDIF_OUT,LPUART10_RXD,GPT1_COMPARE3,FLEXSPI1_B_SCLK,VIDEO_MUX_CSI_DATA09,GPIO3_IO15,ENET_RX_DATA03,,FLEXIO2_D16,ENET_1G_MDC,GPIO9_IO15,"ADC1_CH5A,ADC2_CH5A",,
+GPIO_AD_17,SAI1_MCLK,ACMP1_OUT,GPT1_CLK,FLEXSPI1_A_DQS,VIDEO_MUX_CSI_DATA08,GPIO3_IO16,ENET_RX_DATA02,,FLEXIO2_D17,ENET_1G_MDIO,GPIO9_IO16,"ADC1_CH5B,ADC2_CH5B",ACMP1_OUT,
+GPIO_AD_18,SAI1_RX_SYNC,ACMP2_OUT,LPSPI1_PCS1,FLEXSPI1_A_SS0_B,VIDEO_MUX_CSI_DATA07,GPIO3_IO17,ENET_CRS,,FLEXIO2_D18,LPI2C2_SCL,GPIO9_IO17,ADC2_CH0A,ACMP2_OUT,
+GPIO_AD_19,SAI1_RX_BCLK,ACMP3_OUT,LPSPI1_PCS2,FLEXSPI1_A_SCLK,VIDEO_MUX_CSI_DATA06,GPIO3_IO18,ENET_COL,,FLEXIO2_D19,LPI2C2_SDA,GPIO9_IO18,ADC2_CH0B,ACMP3_OUT,
+GPIO_AD_20,SAI1_RX_DATA00,ACMP4_OUT,LPSPI1_PCS3,FLEXSPI1_A_DATA00,VIDEO_MUX_CSI_DATA05,GPIO3_IO19,KPP_ROW07,,FLEXIO2_D20,ENET_QOS_1588_EVENT2_OUT,GPIO9_IO19,ADC2_CH1A,ACMP4_OUT,
+GPIO_AD_21,SAI1_TX_DATA00,,LPSPI2_PCS1,FLEXSPI1_A_DATA01,VIDEO_MUX_CSI_DATA04,GPIO3_IO20,KPP_COL07,,FLEXIO2_D21,ENET_QOS_1588_EVENT2_IN,GPIO9_IO20,ADC2_CH1B,,
+GPIO_AD_22,SAI1_TX_BCLK,,LPSPI2_PCS2,FLEXSPI1_A_DATA02,VIDEO_MUX_CSI_DATA03,GPIO3_IO21,KPP_ROW06,,FLEXIO2_D22,ENET_QOS_1588_EVENT3_OUT,GPIO9_IO21,ADC2_CH2A,,
+GPIO_AD_23,SAI1_TX_SYNC,,LPSPI2_PCS3,FLEXSPI1_A_DATA03,VIDEO_MUX_CSI_DATA02,GPIO3_IO22,KPP_COL06,,FLEXIO2_D23,ENET_QOS_1588_EVENT3_IN,GPIO9_IO22,ADC2_CH2B,,
+GPIO_AD_24,LPUART1_TXD,LPSPI2_SCK,VIDEO_MUX_CSI_DATA00,ENET_RX_EN,FLEXPWM2_PWM0_A,GPIO3_IO23,KPP_ROW05,,FLEXIO2_D24,LPI2C4_SCL,GPIO9_IO23,ADC2_CH6A,,
+GPIO_AD_25,LPUART1_RXD,LPSPI2_PCS0,VIDEO_MUX_CSI_DATA01,ENET_RX_ER,FLEXPWM2_PWM0_B,GPIO3_IO24,KPP_COL05,,FLEXIO2_D25,LPI2C4_SDA,GPIO9_IO24,ADC2_CH6B,,
+GPIO_AD_26,LPUART1_CTS_B,LPSPI2_SOUT,SEMC_CSX01,ENET_RX_DATA00,FLEXPWM2_PWM1_A,GPIO3_IO25,KPP_ROW04,,FLEXIO2_D26,ENET_QOS_MDC,GPIO9_IO25,,ACMP2_IN3,
+GPIO_AD_27,LPUART1_RTS_B,LPSPI2_SIN,SEMC_CSX02,ENET_RX_DATA01,FLEXPWM2_PWM1_B,GPIO3_IO26,KPP_COL04,,FLEXIO2_D27,ENET_QOS_MDIO,GPIO9_IO26,,ACMP2_IN4,
+GPIO_AD_28,LPSPI1_SCK,LPUART5_TXD,SEMC_CSX03,ENET_TX_EN,FLEXPWM2_PWM2_A,GPIO3_IO27,KPP_ROW03,,FLEXIO2_D28,VIDEO_MUX_EXT_DCIC1,GPIO9_IO27,,ACMP3_IN1,
+GPIO_AD_29,LPSPI1_PCS0,LPUART5_RXD,ENET_REF_CLK,ENET_TX_CLK,FLEXPWM2_PWM2_B,GPIO3_IO28,KPP_COL03,,FLEXIO2_D29,VIDEO_MUX_EXT_DCIC2,GPIO9_IO28,,ACMP3_IN2,
+GPIO_AD_30,LPSPI1_SOUT,USB_OTG2_OC,FLEXCAN2_TX,ENET_TX_DATA00,LPUART3_TXD,GPIO3_IO29,KPP_ROW02,,FLEXIO2_D30,WDOG2_RESET_B_DEB,GPIO9_IO29,,ACMP3_IN3,
+GPIO_AD_31,LPSPI1_SIN,USB_OTG2_PWR,FLEXCAN2_RX,ENET_TX_DATA01,LPUART3_RXD,GPIO3_IO30,KPP_COL02,,FLEXIO2_D31,WDOG1_RESET_B_DEB,GPIO9_IO30,,ACMP3_IN4,
+GPIO_AD_32,LPI2C1_SCL,USBPHY2_OTG_ID,PGMC_PMIC_RDY,ENET_MDC,USDHC1_CD_B,GPIO3_IO31,KPP_ROW01,,LPUART10_TXD,ENET_1G_MDC,GPIO9_IO31,,ACMP4_IN1,
+GPIO_AD_33,LPI2C1_SDA,USBPHY1_OTG_ID,XBAR1_INOUT17,ENET_MDIO,USDHC1_WP,GPIO4_IO00,KPP_COL01,,LPUART10_RXD,ENET_1G_MDIO,GPIO10_IO00,,ACMP4_IN2,
+GPIO_AD_34,ENET_1G_1588_EVENT0_IN,USB_OTG1_PWR,XBAR1_INOUT18,ENET_1588_EVENT0_IN,USDHC1_VSELECT,GPIO4_IO01,KPP_ROW00,,LPUART10_CTS_B,WDOG1_ANY,GPIO10_IO01,,ACMP4_IN3,
+GPIO_AD_35,ENET_1G_1588_EVENT0_OUT,USB_OTG1_OC,XBAR1_INOUT19,ENET_1588_EVENT0_OUT,USDHC1_RESET_B,GPIO4_IO02,KPP_COL00,,LPUART10_RTS_B,FLEXSPI1_B_SS1_B,GPIO10_IO02,,ACMP4_IN4,
diff --git a/ports/mimxrt/boards/MIMXRT1176_clock_config.c b/ports/mimxrt/boards/MIMXRT1176_clock_config.c
new file mode 100644
index 0000000000000..4e01448ba3bd4
--- /dev/null
+++ b/ports/mimxrt/boards/MIMXRT1176_clock_config.c
@@ -0,0 +1,693 @@
+/*
+ * Copyright 2020 NXP
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+/*
+ * How to setup clock using clock driver functions:
+ *
+ * 1. Call CLOCK_InitXXXPLL() to configure corresponding PLL clock.
+ *
+ * 2. Call CLOCK_InitXXXpfd() to configure corresponding PLL pfd clock.
+ *
+ * 3. Call CLOCK_SetRootClock() to configure corresponding module clock source and divider.
+ *
+ */
+
+#include CLOCK_CONFIG_H
+#include "fsl_iomuxc.h"
+#include "fsl_dcdc.h"
+#include "fsl_pmu.h"
+#include "fsl_clock.h"
+
+/*******************************************************************************
+ * Definitions
+ ******************************************************************************/
+
+/*******************************************************************************
+ * Variables
+ ******************************************************************************/
+/* System clock frequency. */
+extern uint32_t SystemCoreClock;
+
+/*******************************************************************************
+ ************************ BOARD_InitBootClocks function ************************
+ ******************************************************************************/
+void BOARD_InitBootClocks(void) {
+    BOARD_BootClockRUN();
+}
+
+#if defined(XIP_BOOT_HEADER_ENABLE) && (XIP_BOOT_HEADER_ENABLE == 1)
+#if defined(XIP_BOOT_HEADER_DCD_ENABLE) && (XIP_BOOT_HEADER_DCD_ENABLE == 1)
+/* This function should not run from SDRAM since it will change SEMC configuration. */
+AT_QUICKACCESS_SECTION_CODE(void UpdateSemcClock(void));
+void UpdateSemcClock(void) {
+    /* Enable self-refresh mode and update semc clock root to 200MHz. */
+    SEMC->IPCMD = 0xA55A000D;
+    while ((SEMC->INTR & 0x3) == 0) {
+        ;
+    }
+    SEMC->INTR = 0x3;
+    SEMC->DCCR = 0x0B;
+    /*
+    * Currently we are using SEMC parameter which fit both 166MHz and 200MHz, only
+    * need to change the SEMC clock root here. If customer is using their own DCD and
+    * want to switch from 166MHz to 200MHz, extra SEMC configuration might need to be
+    * adjusted here to fine tune the SDRAM performance
+    */
+    CCM->CLOCK_ROOT[kCLOCK_Root_Semc].CONTROL = 0x602;
+}
+#endif
+#endif
+
+/*******************************************************************************
+ ********************** Configuration BOARD_BootClockRUN ***********************
+ ******************************************************************************/
+
+/*******************************************************************************
+ * Variables for BOARD_BootClockRUN configuration
+ ******************************************************************************/
+
+#ifndef SKIP_POWER_ADJUSTMENT
+#if __CORTEX_M == 7
+#define BYPASS_LDO_LPSR 1
+#define SKIP_LDO_ADJUSTMENT 1
+#elif __CORTEX_M == 4
+#define SKIP_DCDC_ADJUSTMENT 1
+#define SKIP_FBB_ENABLE 1
+#endif
+#endif
+
+const clock_arm_pll_config_t armPllConfig_BOARD_BootClockRUN = {
+    .postDivider = kCLOCK_PllPostDiv2,            /* Post divider, 0 - DIV by 2, 1 - DIV by 4, 2 - DIV by 8, 3 - DIV by 1 */
+    .loopDivider = 166,                           /* PLL Loop divider, Fout = Fin * ( loopDivider / ( 2 * postDivider ) ) */
+};
+
+const clock_sys_pll1_config_t sysPll1Config_BOARD_BootClockRUN = {
+    .pllDiv2En = true,
+};
+
+const clock_sys_pll2_config_t sysPll2Config_BOARD_BootClockRUN = {
+    .mfd = 268435455,                             /* Denominator of spread spectrum */
+    .ss = NULL,                                   /* Spread spectrum parameter */
+    .ssEnable = false,                            /* Enable spread spectrum or not */
+};
+
+const clock_video_pll_config_t videoPllConfig_BOARD_BootClockRUN = {
+    .loopDivider = 41,                            /* PLL Loop divider, valid range for DIV_SELECT divider value: 27 ~ 54. */
+    .postDivider = 0,                             /* Divider after PLL, should only be 1, 2, 4, 8, 16, 32 */
+    .numerator = 1,                               /* 30 bit numerator of fractional loop divider, Fout = Fin * ( loopDivider + numerator / denominator ) */
+    .denominator = 960000,                        /* 30 bit denominator of fractional loop divider, Fout = Fin * ( loopDivider + numerator / denominator ) */
+    .ss = NULL,                                   /* Spread spectrum parameter */
+    .ssEnable = false,                            /* Enable spread spectrum or not */
+};
+
+/*******************************************************************************
+ * Code for BOARD_BootClockRUN configuration
+ ******************************************************************************/
+void BOARD_BootClockRUN(void) {
+    clock_root_config_t rootCfg = {0};
+
+    #if !defined(SKIP_DCDC_ADJUSTMENT) || (!SKIP_DCDC_ADJUSTMENT)
+    if ((OCOTP->FUSEN[16].FUSE == 0x57AC5969U) && ((OCOTP->FUSEN[17].FUSE & 0xFFU) == 0x0BU)) {
+        DCDC_SetVDD1P0BuckModeTargetVoltage(DCDC, kDCDC_1P0BuckTarget1P15V);
+    } else {
+        /* Set 1.125V for production samples to align with data sheet requirement */
+        DCDC_SetVDD1P0BuckModeTargetVoltage(DCDC, kDCDC_1P0BuckTarget1P125V);
+    }
+    #endif
+
+    #if !defined(SKIP_FBB_ENABLE) || (!SKIP_FBB_ENABLE)
+    /* Check if FBB need to be enabled in OverDrive(OD) mode */
+    if (((OCOTP->FUSEN[7].FUSE & 0x10U) >> 4U) != 1) {
+        PMU_EnableBodyBias(ANADIG_PMU, kPMU_FBB_CM7, true);
+    } else {
+        PMU_EnableBodyBias(ANADIG_PMU, kPMU_FBB_CM7, false);
+    }
+    #endif
+
+    #if defined(BYPASS_LDO_LPSR) && BYPASS_LDO_LPSR
+    PMU_StaticEnableLpsrAnaLdoBypassMode(ANADIG_LDO_SNVS, true);
+    PMU_StaticEnableLpsrDigLdoBypassMode(ANADIG_LDO_SNVS, true);
+    #endif
+
+    #if !defined(SKIP_LDO_ADJUSTMENT) || (!SKIP_LDO_ADJUSTMENT)
+    pmu_static_lpsr_ana_ldo_config_t lpsrAnaConfig;
+    pmu_static_lpsr_dig_config_t lpsrDigConfig;
+
+    if ((ANADIG_LDO_SNVS->PMU_LDO_LPSR_ANA & ANADIG_LDO_SNVS_PMU_LDO_LPSR_ANA_BYPASS_MODE_EN_MASK) == 0UL) {
+        PMU_StaticGetLpsrAnaLdoDefaultConfig(&lpsrAnaConfig);
+        PMU_StaticLpsrAnaLdoInit(ANADIG_LDO_SNVS, &lpsrAnaConfig);
+    }
+
+    if ((ANADIG_LDO_SNVS->PMU_LDO_LPSR_DIG & ANADIG_LDO_SNVS_PMU_LDO_LPSR_DIG_BYPASS_MODE_MASK) == 0UL) {
+        PMU_StaticGetLpsrDigLdoDefaultConfig(&lpsrDigConfig);
+        lpsrDigConfig.targetVoltage = kPMU_LpsrDigTargetStableVoltage1P117V;
+        PMU_StaticLpsrDigLdoInit(ANADIG_LDO_SNVS, &lpsrDigConfig);
+    }
+    #endif
+
+    /* PLL LDO shall be enabled first before enable PLLs */
+
+    /* Config CLK_1M */
+    CLOCK_OSC_Set1MHzOutputBehavior(kCLOCK_1MHzOutEnableFreeRunning1Mhz);
+
+    /* Init OSC RC 16M */
+    ANADIG_OSC->OSC_16M_CTRL |= ANADIG_OSC_OSC_16M_CTRL_EN_IRC4M16M_MASK;
+
+    /* Init OSC RC 400M */
+    CLOCK_OSC_EnableOscRc400M();
+    CLOCK_OSC_GateOscRc400M(true);
+
+    /* Init OSC RC 48M */
+    CLOCK_OSC_EnableOsc48M(true);
+    CLOCK_OSC_EnableOsc48MDiv2(true);
+
+    /* Config OSC 24M */
+    ANADIG_OSC->OSC_24M_CTRL |= ANADIG_OSC_OSC_24M_CTRL_OSC_EN(1) | ANADIG_OSC_OSC_24M_CTRL_BYPASS_EN(0) | ANADIG_OSC_OSC_24M_CTRL_BYPASS_CLK(0) | ANADIG_OSC_OSC_24M_CTRL_LP_EN(1) | ANADIG_OSC_OSC_24M_CTRL_OSC_24M_GATE(0);
+    /* Wait for 24M OSC to be stable. */
+    while (ANADIG_OSC_OSC_24M_CTRL_OSC_24M_STABLE_MASK !=
+           (ANADIG_OSC->OSC_24M_CTRL & ANADIG_OSC_OSC_24M_CTRL_OSC_24M_STABLE_MASK)) {
+    }
+
+    /* Swicth both core, M7 Systick and Bus_Lpsr to OscRC48MDiv2 first */
+    rootCfg.mux = kCLOCK_M7_ClockRoot_MuxOscRc48MDiv2;
+    rootCfg.div = 1;
+    #if __CORTEX_M == 7
+    CLOCK_SetRootClock(kCLOCK_Root_M7, &rootCfg);
+    CLOCK_SetRootClock(kCLOCK_Root_M7_Systick, &rootCfg);
+    #endif
+    #if __CORTEX_M == 4
+    CLOCK_SetRootClock(kCLOCK_Root_M4, &rootCfg);
+    CLOCK_SetRootClock(kCLOCK_Root_Bus_Lpsr, &rootCfg);
+    #endif
+
+    /*
+    * if DCD is used, please make sure the clock source of SEMC is not changed in the following PLL/PFD configuration code.
+    */
+    /* Init Arm Pll. */
+    CLOCK_InitArmPll(&armPllConfig_BOARD_BootClockRUN);
+
+    /* Bypass Sys Pll1. */
+    // CLOCK_SetPllBypass(kCLOCK_PllSys1, true);
+
+    /* Init Sys Pll1 and enable PllSys1_Div2 output */
+    CLOCK_InitSysPll1(&sysPll1Config_BOARD_BootClockRUN);
+
+
+    /* Init Sys Pll2. */
+    CLOCK_InitSysPll2(&sysPll2Config_BOARD_BootClockRUN);
+
+    /* Init System Pll2 pfd0. */
+    CLOCK_InitPfd(kCLOCK_PllSys2, kCLOCK_Pfd0, 27);
+
+    /* Init System Pll2 pfd1. */
+    CLOCK_InitPfd(kCLOCK_PllSys2, kCLOCK_Pfd1, 16);
+
+    /* Init System Pll2 pfd2. */
+    CLOCK_InitPfd(kCLOCK_PllSys2, kCLOCK_Pfd2, 24);
+
+    /* Init System Pll2 pfd3. */
+    CLOCK_InitPfd(kCLOCK_PllSys2, kCLOCK_Pfd3, 32);
+
+    /* Init Sys Pll3. */
+    CLOCK_InitSysPll3();
+
+    /* Init System Pll3 pfd0. */
+    CLOCK_InitPfd(kCLOCK_PllSys3, kCLOCK_Pfd0, 13);
+
+    /* Init System Pll3 pfd1. */
+    CLOCK_InitPfd(kCLOCK_PllSys3, kCLOCK_Pfd1, 17);
+
+    /* Init System Pll3 pfd2. */
+    CLOCK_InitPfd(kCLOCK_PllSys3, kCLOCK_Pfd2, 32);
+
+    /* Init System Pll3 pfd3. */
+    CLOCK_InitPfd(kCLOCK_PllSys3, kCLOCK_Pfd3, 22);
+
+    /* Bypass Audio Pll. */
+    CLOCK_SetPllBypass(kCLOCK_PllAudio, true);
+
+    /* DeInit Audio Pll. */
+    CLOCK_DeinitAudioPll();
+
+    /* Init Video Pll. */
+    CLOCK_InitVideoPll(&videoPllConfig_BOARD_BootClockRUN);
+
+    /* Module clock root configurations. */
+    /* Configure M7 using ARM_PLL_CLK */
+    #if __CORTEX_M == 7
+    rootCfg.mux = kCLOCK_M7_ClockRoot_MuxArmPllOut;
+    rootCfg.div = 1;
+    CLOCK_SetRootClock(kCLOCK_Root_M7, &rootCfg);
+    #endif
+
+    /* Configure M4 using SYS_PLL3_PFD3_CLK */
+    #if __CORTEX_M == 4
+    rootCfg.mux = kCLOCK_M4_ClockRoot_MuxSysPll3Pfd3;
+    rootCfg.div = 1;
+    CLOCK_SetRootClock(kCLOCK_Root_M4, &rootCfg);
+    #endif
+
+    /* Configure BUS using SYS_PLL3_CLK */
+    rootCfg.mux = kCLOCK_BUS_ClockRoot_MuxSysPll3Out;
+    rootCfg.div = 3;
+    CLOCK_SetRootClock(kCLOCK_Root_Bus, &rootCfg);
+
+    /* Configure BUS_LPSR using SYS_PLL3_CLK */
+    /* BUS_LPSR must not be more than 120MHz */
+    rootCfg.mux = kCLOCK_BUS_LPSR_ClockRoot_MuxSysPll3Out;
+    rootCfg.div = 4;
+    CLOCK_SetRootClock(kCLOCK_Root_Bus_Lpsr, &rootCfg);
+
+    /* Configure SEMC using SYS_PLL2_PFD1_CLK */
+    #ifndef SKIP_SEMC_INIT
+    rootCfg.mux = kCLOCK_SEMC_ClockRoot_MuxSysPll2Pfd1;
+    rootCfg.div = 3;
+    CLOCK_SetRootClock(kCLOCK_Root_Semc, &rootCfg);
+    #endif
+
+    #if defined(XIP_BOOT_HEADER_ENABLE) && (XIP_BOOT_HEADER_ENABLE == 1)
+    #if defined(XIP_BOOT_HEADER_DCD_ENABLE) && (XIP_BOOT_HEADER_DCD_ENABLE == 1)
+    UpdateSemcClock();
+    #endif
+    #endif
+
+    /* Configure CSSYS using OSC_RC_48M_DIV2 */
+    rootCfg.mux = kCLOCK_CSSYS_ClockRoot_MuxOscRc48MDiv2;
+    rootCfg.div = 1;
+    CLOCK_SetRootClock(kCLOCK_Root_Cssys, &rootCfg);
+
+    /* Configure CSTRACE using SYS_PLL2_CLK */
+    rootCfg.mux = kCLOCK_CSTRACE_ClockRoot_MuxSysPll2Out;
+    rootCfg.div = 4;
+    CLOCK_SetRootClock(kCLOCK_Root_Cstrace, &rootCfg);
+
+    // Strange settings for SYSTICK: 24MHz for M4, 100kHz for M7 ?
+    /* Configure M4_SYSTICK using OSC_RC_48M_DIV2 */
+    #if __CORTEX_M == 4
+    rootCfg.mux = kCLOCK_M4_SYSTICK_ClockRoot_MuxOscRc48MDiv2;
+    rootCfg.div = 1;
+    CLOCK_SetRootClock(kCLOCK_Root_M4_Systick, &rootCfg);
+    #endif
+
+    /* Configure M7_SYSTICK using OSC_RC_48M_DIV2 */
+    #if __CORTEX_M == 7
+    rootCfg.mux = kCLOCK_M7_SYSTICK_ClockRoot_MuxOscRc48MDiv2;
+    rootCfg.div = 240;
+    CLOCK_SetRootClock(kCLOCK_Root_M7_Systick, &rootCfg);
+    #endif
+
+    /* Configure ADC1 using OSC_RC_48M_DIV2 */
+    rootCfg.mux = kCLOCK_ADC1_ClockRoot_MuxOscRc48MDiv2;
+    rootCfg.div = 1;
+    CLOCK_SetRootClock(kCLOCK_Root_Adc1, &rootCfg);
+
+    /* Configure ADC2 using OSC_RC_48M_DIV2 */
+    rootCfg.mux = kCLOCK_ADC2_ClockRoot_MuxOscRc48MDiv2;
+    rootCfg.div = 1;
+    CLOCK_SetRootClock(kCLOCK_Root_Adc2, &rootCfg);
+
+    /* Configure ACMP using OSC_RC_48M_DIV2 */
+    rootCfg.mux = kCLOCK_ACMP_ClockRoot_MuxOscRc48MDiv2;
+    rootCfg.div = 1;
+    CLOCK_SetRootClock(kCLOCK_Root_Acmp, &rootCfg);
+
+    /* Configure FLEXIO1 using OSC_RC_48M_DIV2 */
+    rootCfg.mux = kCLOCK_FLEXIO1_ClockRoot_MuxOscRc48MDiv2;
+    rootCfg.div = 1;
+    CLOCK_SetRootClock(kCLOCK_Root_Flexio1, &rootCfg);
+
+    /* Configure FLEXIO2 using OSC_RC_48M_DIV2 */
+    rootCfg.mux = kCLOCK_FLEXIO2_ClockRoot_MuxOscRc48MDiv2;
+    rootCfg.div = 1;
+    CLOCK_SetRootClock(kCLOCK_Root_Flexio2, &rootCfg);
+
+    /* Configure GPT1 using OSC_24M*/
+    rootCfg.mux = kCLOCK_GPT1_ClockRoot_MuxOsc24MOut;
+    rootCfg.div = 1;
+    CLOCK_SetRootClock(kCLOCK_Root_Gpt1, &rootCfg);
+
+    /* Configure GPT2 using OSC_24M */
+    rootCfg.mux = kCLOCK_GPT2_ClockRoot_MuxOsc24MOut;
+    rootCfg.div = 1;
+    CLOCK_SetRootClock(kCLOCK_Root_Gpt2, &rootCfg);
+
+    /* Configure GPT3 using OSC_24M */
+    rootCfg.mux = kCLOCK_GPT3_ClockRoot_MuxOsc24MOut;
+    rootCfg.div = 1;
+    CLOCK_SetRootClock(kCLOCK_Root_Gpt3, &rootCfg);
+
+    /* Configure GPT4 using OSC_24M */
+    rootCfg.mux = kCLOCK_GPT4_ClockRoot_MuxOsc24MOut;
+    rootCfg.div = 1;
+    CLOCK_SetRootClock(kCLOCK_Root_Gpt4, &rootCfg);
+
+    /* Configure GPT5 using OSC_24M */
+    rootCfg.mux = kCLOCK_GPT5_ClockRoot_MuxOsc24MOut;
+    rootCfg.div = 1;
+    CLOCK_SetRootClock(kCLOCK_Root_Gpt5, &rootCfg);
+
+    /* Configure GPT6 using OSC_24M */
+    rootCfg.mux = kCLOCK_GPT6_ClockRoot_MuxOsc24MOut;
+    rootCfg.div = 1;
+    CLOCK_SetRootClock(kCLOCK_Root_Gpt6, &rootCfg);
+
+    /* Configure FLEXSPI1 using OSC_RC_48M_DIV2 */
+    #if !(defined(XIP_EXTERNAL_FLASH) && (XIP_EXTERNAL_FLASH == 1))
+    rootCfg.mux = kCLOCK_FLEXSPI1_ClockRoot_MuxOscRc48MDiv2;
+    rootCfg.div = 1;
+    CLOCK_SetRootClock(kCLOCK_Root_Flexspi1, &rootCfg);
+    #endif
+
+    /* Configure FLEXSPI2 using OSC_RC_48M_DIV2 */
+    rootCfg.mux = kCLOCK_FLEXSPI2_ClockRoot_MuxOscRc48MDiv2;
+    rootCfg.div = 1;
+    CLOCK_SetRootClock(kCLOCK_Root_Flexspi2, &rootCfg);
+
+    /* Configure CAN1 using OSC_RC_48M_DIV2 */
+    rootCfg.mux = kCLOCK_CAN1_ClockRoot_MuxOscRc48MDiv2;
+    rootCfg.div = 1;
+    CLOCK_SetRootClock(kCLOCK_Root_Can1, &rootCfg);
+
+    /* Configure CAN2 using OSC_RC_48M_DIV2 */
+    rootCfg.mux = kCLOCK_CAN2_ClockRoot_MuxOscRc48MDiv2;
+    rootCfg.div = 1;
+    CLOCK_SetRootClock(kCLOCK_Root_Can2, &rootCfg);
+
+    /* Configure CAN3 using OSC_RC_48M_DIV2 */
+    rootCfg.mux = kCLOCK_CAN3_ClockRoot_MuxOscRc48MDiv2;
+    rootCfg.div = 1;
+    CLOCK_SetRootClock(kCLOCK_Root_Can3, &rootCfg);
+
+    /* Configure LPUART1 using SYS_PLL3_PFD3_CLK */
+    rootCfg.mux = kCLOCK_LPUART1_ClockRoot_MuxSysPll2Pfd3;
+    rootCfg.div = 4;
+    CLOCK_SetRootClock(kCLOCK_Root_Lpuart1, &rootCfg);
+
+    /* Configure LPUART2 using SYS_PLL3_PFD3_CLK */
+    rootCfg.mux = kCLOCK_LPUART2_ClockRoot_MuxSysPll2Pfd3;
+    rootCfg.div = 4;
+    CLOCK_SetRootClock(kCLOCK_Root_Lpuart2, &rootCfg);
+
+    /* Configure LPUART3 using SYS_PLL3_PFD3_CLK */
+    rootCfg.mux = kCLOCK_LPUART3_ClockRoot_MuxSysPll2Pfd3;
+    rootCfg.div = 4;
+    CLOCK_SetRootClock(kCLOCK_Root_Lpuart3, &rootCfg);
+
+    /* Configure LPUART4 using SYS_PLL3_PFD3_CLK */
+    rootCfg.mux = kCLOCK_LPUART4_ClockRoot_MuxSysPll2Pfd3;
+    rootCfg.div = 4;
+    CLOCK_SetRootClock(kCLOCK_Root_Lpuart4, &rootCfg);
+
+    /* Configure LPUART5 using SYS_PLL3_PFD3_CLK */
+    rootCfg.mux = kCLOCK_LPUART5_ClockRoot_MuxSysPll2Pfd3;
+    rootCfg.div = 4;
+    CLOCK_SetRootClock(kCLOCK_Root_Lpuart5, &rootCfg);
+
+    /* Configure LPUART6 using SYS_PLL3_PFD3_CLK */
+    rootCfg.mux = kCLOCK_LPUART6_ClockRoot_MuxSysPll2Pfd3;
+    rootCfg.div = 4;
+    CLOCK_SetRootClock(kCLOCK_Root_Lpuart6, &rootCfg);
+
+    /* Configure LPUART7 using SYS_PLL3_PFD3_CLK */
+    rootCfg.mux = kCLOCK_LPUART7_ClockRoot_MuxSysPll2Pfd3;
+    rootCfg.div = 4;
+    CLOCK_SetRootClock(kCLOCK_Root_Lpuart7, &rootCfg);
+
+    /* Configure LPUART8 using SYS_PLL3_PFD3_CLK */
+    rootCfg.mux = kCLOCK_LPUART8_ClockRoot_MuxSysPll2Pfd3;
+    rootCfg.div = 4;
+    CLOCK_SetRootClock(kCLOCK_Root_Lpuart8, &rootCfg);
+
+    /* Configure LPUART9 using SYS_PLL3_PFD3_CLK */
+    rootCfg.mux = kCLOCK_LPUART9_ClockRoot_MuxSysPll2Pfd3;
+    rootCfg.div = 4;
+    CLOCK_SetRootClock(kCLOCK_Root_Lpuart9, &rootCfg);
+
+    /* Configure LPUART10 using SYS_PLL3_PFD3_CLK */
+    rootCfg.mux = kCLOCK_LPUART10_ClockRoot_MuxSysPll2Pfd3;
+    rootCfg.div = 4;
+    CLOCK_SetRootClock(kCLOCK_Root_Lpuart10, &rootCfg);
+
+    /* Configure LPUART11 using SYS_PLL3_PFD3_CLK */
+    rootCfg.mux = kCLOCK_LPUART11_ClockRoot_MuxSysPll2Pfd3;
+    rootCfg.div = 4;
+    CLOCK_SetRootClock(kCLOCK_Root_Lpuart11, &rootCfg);
+
+    /* Configure LPUART12 using SYS_PLL3_PFD3_CLK */
+    rootCfg.mux = kCLOCK_LPUART12_ClockRoot_MuxSysPll2Pfd3;
+    rootCfg.div = 4;
+    CLOCK_SetRootClock(kCLOCK_Root_Lpuart12, &rootCfg);
+
+
+    /* Configure LPI2C1 using SYS_PLL3_DIV2 (240MHz) */
+    rootCfg.mux = kCLOCK_LPI2C1_ClockRoot_MuxSysPll3Div2;
+    rootCfg.div = 4;
+    CLOCK_SetRootClock(kCLOCK_Root_Lpi2c1, &rootCfg);
+
+    /* Configure LPI2C2 using SYS_PLL3_DIV2 (240MHz) */
+    rootCfg.mux = kCLOCK_LPI2C2_ClockRoot_MuxSysPll3Div2;
+    rootCfg.div = 4;
+    CLOCK_SetRootClock(kCLOCK_Root_Lpi2c2, &rootCfg);
+
+    /* Configure LPI2C3 using SYS_PLL3_DIV2 (240MHz) */
+    rootCfg.mux = kCLOCK_LPI2C3_ClockRoot_MuxSysPll3Div2;
+    rootCfg.div = 4;
+    CLOCK_SetRootClock(kCLOCK_Root_Lpi2c3, &rootCfg);
+
+    /* Configure LPI2C4 using SYS_PLL3_DIV2 (240MHz) */
+    rootCfg.mux = kCLOCK_LPI2C4_ClockRoot_MuxSysPll3Div2;
+    rootCfg.div = 4;
+    CLOCK_SetRootClock(kCLOCK_Root_Lpi2c4, &rootCfg);
+
+    /* Configure LPI2C5 using SYS_PLL3_OUT (480MHz) */
+    rootCfg.mux = kCLOCK_LPI2C5_ClockRoot_MuxSysPll3Out;
+    rootCfg.div = 8;
+    CLOCK_SetRootClock(kCLOCK_Root_Lpi2c5, &rootCfg);
+
+    /* Configure LPI2C6 using SYS_PLL3_OUT (480MHz) */
+    rootCfg.mux = kCLOCK_LPI2C6_ClockRoot_MuxSysPll3Out;
+    rootCfg.div = 8;
+    CLOCK_SetRootClock(kCLOCK_Root_Lpi2c6, &rootCfg);
+
+
+    /* Configure LPSPI1 using SYS_PLL_3_PDF2 (270MHz) */
+    rootCfg.mux = kCLOCK_LPSPI1_ClockRoot_MuxSysPll3Pfd2;
+    rootCfg.div = 2;
+    CLOCK_SetRootClock(kCLOCK_Root_Lpspi1, &rootCfg);
+
+    /* Configure LPSPI2 using SYS_PLL_3_PDF2 (270MHz) */
+    rootCfg.mux = kCLOCK_LPSPI2_ClockRoot_MuxSysPll3Pfd2;
+    rootCfg.div = 2;
+    CLOCK_SetRootClock(kCLOCK_Root_Lpspi2, &rootCfg);
+
+    /* Configure LPSPI3 using SYS_PLL_3_PDF2 (270MHz) */
+    rootCfg.mux = kCLOCK_LPSPI3_ClockRoot_MuxSysPll3Pfd2;
+    rootCfg.div = 2;
+    CLOCK_SetRootClock(kCLOCK_Root_Lpspi3, &rootCfg);
+
+    /* Configure LPSPI4 using SYS_PLL_3_PDF2 (270MHz) */
+    rootCfg.mux = kCLOCK_LPSPI4_ClockRoot_MuxSysPll3Pfd2;
+    rootCfg.div = 2;
+    CLOCK_SetRootClock(kCLOCK_Root_Lpspi4, &rootCfg);
+
+    /* Configure LPSPI5 using SYS_PLL_3_PDF2 (270MHz) */
+    rootCfg.mux = kCLOCK_LPSPI5_ClockRoot_MuxSysPll3Pfd2;
+    rootCfg.div = 2;
+    CLOCK_SetRootClock(kCLOCK_Root_Lpspi5, &rootCfg);
+
+    /* Configure LPSPI6 using SYS_PLL_3_PDF2 (270MHz) */
+    rootCfg.mux = kCLOCK_LPSPI6_ClockRoot_MuxSysPll3Pfd2;
+    rootCfg.div = 2;
+    CLOCK_SetRootClock(kCLOCK_Root_Lpspi6, &rootCfg);
+
+
+    /* Configure EMV1 using OSC_RC_48M_DIV2 */
+    rootCfg.mux = kCLOCK_EMV1_ClockRoot_MuxOscRc48MDiv2;
+    rootCfg.div = 1;
+    CLOCK_SetRootClock(kCLOCK_Root_Emv1, &rootCfg);
+
+    /* Configure EMV2 using OSC_RC_48M_DIV2 */
+    rootCfg.mux = kCLOCK_EMV2_ClockRoot_MuxOscRc48MDiv2;
+    rootCfg.div = 1;
+    CLOCK_SetRootClock(kCLOCK_Root_Emv2, &rootCfg);
+
+    /* Configure ENET1 using OSC_RC_48M_DIV2 */
+    rootCfg.mux = kCLOCK_ENET1_ClockRoot_MuxOscRc48MDiv2;
+    rootCfg.div = 1;
+    CLOCK_SetRootClock(kCLOCK_Root_Enet1, &rootCfg);
+
+    /* Configure ENET2 using OSC_RC_48M_DIV2 */
+    rootCfg.mux = kCLOCK_ENET2_ClockRoot_MuxOscRc48MDiv2;
+    rootCfg.div = 1;
+    CLOCK_SetRootClock(kCLOCK_Root_Enet2, &rootCfg);
+
+    /* Configure ENET_QOS using OSC_RC_48M_DIV2 */
+    rootCfg.mux = kCLOCK_ENET_QOS_ClockRoot_MuxOscRc48MDiv2;
+    rootCfg.div = 1;
+    CLOCK_SetRootClock(kCLOCK_Root_Enet_Qos, &rootCfg);
+
+    /* Configure ENET_25M using OSC_RC_48M_DIV2 */
+    rootCfg.mux = kCLOCK_ENET_25M_ClockRoot_MuxOscRc48MDiv2;
+    rootCfg.div = 1;
+    CLOCK_SetRootClock(kCLOCK_Root_Enet_25m, &rootCfg);
+
+    /* Configure ENET_TIMER1 using OSC_RC_48M_DIV2 */
+    rootCfg.mux = kCLOCK_ENET_TIMER1_ClockRoot_MuxOscRc48MDiv2;
+    rootCfg.div = 1;
+    CLOCK_SetRootClock(kCLOCK_Root_Enet_Timer1, &rootCfg);
+
+    /* Configure ENET_TIMER2 using OSC_RC_48M_DIV2 */
+    rootCfg.mux = kCLOCK_ENET_TIMER2_ClockRoot_MuxOscRc48MDiv2;
+    rootCfg.div = 1;
+    CLOCK_SetRootClock(kCLOCK_Root_Enet_Timer2, &rootCfg);
+
+    /* Configure ENET_TIMER3 using OSC_RC_48M_DIV2 */
+    rootCfg.mux = kCLOCK_ENET_TIMER3_ClockRoot_MuxOscRc48MDiv2;
+    rootCfg.div = 1;
+    CLOCK_SetRootClock(kCLOCK_Root_Enet_Timer3, &rootCfg);
+
+    /* Configure USDHC1 using OSC_RC_48M_DIV2 */
+    rootCfg.mux = kCLOCK_USDHC1_ClockRoot_MuxOscRc48MDiv2;
+    rootCfg.div = 1;
+    CLOCK_SetRootClock(kCLOCK_Root_Usdhc1, &rootCfg);
+
+    /* Configure USDHC2 using OSC_RC_48M_DIV2 */
+    rootCfg.mux = kCLOCK_USDHC2_ClockRoot_MuxOscRc48MDiv2;
+    rootCfg.div = 1;
+    CLOCK_SetRootClock(kCLOCK_Root_Usdhc2, &rootCfg);
+
+    /* Configure ASRC using OSC_RC_48M_DIV2 */
+    rootCfg.mux = kCLOCK_ASRC_ClockRoot_MuxOscRc48MDiv2;
+    rootCfg.div = 1;
+    CLOCK_SetRootClock(kCLOCK_Root_Asrc, &rootCfg);
+
+    /* Configure MQS using OSC_RC_48M_DIV2 */
+    rootCfg.mux = kCLOCK_MQS_ClockRoot_MuxOscRc48MDiv2;
+    rootCfg.div = 1;
+    CLOCK_SetRootClock(kCLOCK_Root_Mqs, &rootCfg);
+
+    /* Configure MIC using OSC_RC_48M_DIV2 */
+    rootCfg.mux = kCLOCK_MIC_ClockRoot_MuxOscRc48MDiv2;
+    rootCfg.div = 1;
+    CLOCK_SetRootClock(kCLOCK_Root_Mic, &rootCfg);
+
+    /* Configure SPDIF using OSC_RC_48M_DIV2 */
+    rootCfg.mux = kCLOCK_SPDIF_ClockRoot_MuxOscRc48MDiv2;
+    rootCfg.div = 1;
+    CLOCK_SetRootClock(kCLOCK_Root_Spdif, &rootCfg);
+
+    /* Configure SAI1 using OSC_RC_48M_DIV2 */
+    rootCfg.mux = kCLOCK_SAI1_ClockRoot_MuxOsc24MOut;
+    rootCfg.div = 1;
+    CLOCK_SetRootClock(kCLOCK_Root_Sai1, &rootCfg);
+
+    /* Configure SAI2 using OSC_RC_48M_DIV2 */
+    rootCfg.mux = kCLOCK_SAI2_ClockRoot_MuxOscRc48MDiv2;
+    rootCfg.div = 1;
+    CLOCK_SetRootClock(kCLOCK_Root_Sai2, &rootCfg);
+
+    /* Configure SAI3 using OSC_RC_48M_DIV2 */
+    rootCfg.mux = kCLOCK_SAI3_ClockRoot_MuxOscRc48MDiv2;
+    rootCfg.div = 1;
+    CLOCK_SetRootClock(kCLOCK_Root_Sai3, &rootCfg);
+
+    /* Configure SAI4 using OSC_RC_48M_DIV2 */
+    rootCfg.mux = kCLOCK_SAI4_ClockRoot_MuxOscRc48MDiv2;
+    rootCfg.div = 1;
+    CLOCK_SetRootClock(kCLOCK_Root_Sai4, &rootCfg);
+
+    /* Configure GC355 using PLL_VIDEO_CLK */
+    rootCfg.mux = kCLOCK_GC355_ClockRoot_MuxVideoPllOut;
+    rootCfg.div = 2;
+    CLOCK_SetRootClock(kCLOCK_Root_Gc355, &rootCfg);
+
+    /* Configure LCDIF using OSC_RC_48M_DIV2 */
+    rootCfg.mux = kCLOCK_LCDIF_ClockRoot_MuxOscRc48MDiv2;
+    rootCfg.div = 1;
+    CLOCK_SetRootClock(kCLOCK_Root_Lcdif, &rootCfg);
+
+    /* Configure LCDIFV2 using OSC_RC_48M_DIV2 */
+    rootCfg.mux = kCLOCK_LCDIFV2_ClockRoot_MuxOscRc48MDiv2;
+    rootCfg.div = 1;
+    CLOCK_SetRootClock(kCLOCK_Root_Lcdifv2, &rootCfg);
+
+    /* Configure MIPI_REF using OSC_RC_48M_DIV2 */
+    rootCfg.mux = kCLOCK_MIPI_REF_ClockRoot_MuxOscRc48MDiv2;
+    rootCfg.div = 1;
+    CLOCK_SetRootClock(kCLOCK_Root_Mipi_Ref, &rootCfg);
+
+    /* Configure MIPI_ESC using OSC_RC_48M_DIV2 */
+    rootCfg.mux = kCLOCK_MIPI_ESC_ClockRoot_MuxOscRc48MDiv2;
+    rootCfg.div = 1;
+    CLOCK_SetRootClock(kCLOCK_Root_Mipi_Esc, &rootCfg);
+
+    /* Configure CSI2 using OSC_RC_48M_DIV2 */
+    rootCfg.mux = kCLOCK_CSI2_ClockRoot_MuxOscRc48MDiv2;
+    rootCfg.div = 1;
+    CLOCK_SetRootClock(kCLOCK_Root_Csi2, &rootCfg);
+
+    /* Configure CSI2_ESC using OSC_RC_48M_DIV2 */
+    rootCfg.mux = kCLOCK_CSI2_ESC_ClockRoot_MuxOscRc48MDiv2;
+    rootCfg.div = 1;
+    CLOCK_SetRootClock(kCLOCK_Root_Csi2_Esc, &rootCfg);
+
+    /* Configure CSI2_UI using OSC_RC_48M_DIV2 */
+    rootCfg.mux = kCLOCK_CSI2_UI_ClockRoot_MuxOscRc48MDiv2;
+    rootCfg.div = 1;
+    CLOCK_SetRootClock(kCLOCK_Root_Csi2_Ui, &rootCfg);
+
+    /* Configure CSI using OSC_RC_48M_DIV2 */
+    rootCfg.mux = kCLOCK_CSI_ClockRoot_MuxOscRc48MDiv2;
+    rootCfg.div = 1;
+    CLOCK_SetRootClock(kCLOCK_Root_Csi, &rootCfg);
+
+    /* Configure CKO1 using OSC_RC_48M_DIV2 */
+    rootCfg.mux = kCLOCK_CKO1_ClockRoot_MuxOscRc48MDiv2;
+    rootCfg.div = 1;
+    CLOCK_SetRootClock(kCLOCK_Root_Cko1, &rootCfg);
+
+    /* Configure CKO2 using OSC_RC_48M_DIV2 */
+    rootCfg.mux = kCLOCK_CKO2_ClockRoot_MuxOscRc48MDiv2;
+    rootCfg.div = 1;
+    CLOCK_SetRootClock(kCLOCK_Root_Cko2, &rootCfg);
+
+    /* Set SAI1 MCLK1 clock source. */
+    IOMUXC_SetSaiMClkClockSource(IOMUXC_GPR, kIOMUXC_GPR_SAI1MClk1Sel, 0);
+    /* Set SAI1 MCLK2 clock source. */
+    IOMUXC_SetSaiMClkClockSource(IOMUXC_GPR, kIOMUXC_GPR_SAI1MClk2Sel, 3);
+    /* Set SAI1 MCLK3 clock source. */
+    IOMUXC_SetSaiMClkClockSource(IOMUXC_GPR, kIOMUXC_GPR_SAI1MClk3Sel, 0);
+    /* Set SAI2 MCLK3 clock source. */
+    IOMUXC_SetSaiMClkClockSource(IOMUXC_GPR, kIOMUXC_GPR_SAI2MClk3Sel, 0);
+    /* Set SAI3 MCLK3 clock source. */
+    IOMUXC_SetSaiMClkClockSource(IOMUXC_GPR, kIOMUXC_GPR_SAI3MClk3Sel, 0);
+
+    /* Set MQS configuration. */
+    IOMUXC_MQSConfig(IOMUXC_GPR, kIOMUXC_MqsPwmOverSampleRate32, 0);
+    /* Set ENET Tx clock source. */
+    IOMUXC_GPR->GPR4 &= ~IOMUXC_GPR_GPR4_ENET_TX_CLK_SEL_MASK;
+    /* Set ENET_1G Tx clock source. */
+    IOMUXC_GPR->GPR5 = ((IOMUXC_GPR->GPR5 & ~IOMUXC_GPR_GPR5_ENET1G_TX_CLK_SEL_MASK) | IOMUXC_GPR_GPR5_ENET1G_RGMII_EN_MASK);
+    /* Set GPT1 High frequency reference clock source. */
+    IOMUXC_GPR->GPR22 &= ~IOMUXC_GPR_GPR22_REF_1M_CLK_GPT1_MASK;
+    /* Set GPT2 High frequency reference clock source. */
+    IOMUXC_GPR->GPR23 &= ~IOMUXC_GPR_GPR23_REF_1M_CLK_GPT2_MASK;
+    /* Set GPT3 High frequency reference clock source. */
+    IOMUXC_GPR->GPR24 &= ~IOMUXC_GPR_GPR24_REF_1M_CLK_GPT3_MASK;
+    /* Set GPT4 High frequency reference clock source. */
+    IOMUXC_GPR->GPR25 &= ~IOMUXC_GPR_GPR25_REF_1M_CLK_GPT4_MASK;
+    /* Set GPT5 High frequency reference clock source. */
+    IOMUXC_GPR->GPR26 &= ~IOMUXC_GPR_GPR26_REF_1M_CLK_GPT5_MASK;
+    /* Set GPT6 High frequency reference clock source. */
+    IOMUXC_GPR->GPR27 &= ~IOMUXC_GPR_GPR27_REF_1M_CLK_GPT6_MASK;
+
+    #if __CORTEX_M == 7
+    SystemCoreClock = CLOCK_GetRootClockFreq(kCLOCK_Root_M7);
+    #else
+    SystemCoreClock = CLOCK_GetRootClockFreq(kCLOCK_Root_M4);
+    #endif
+}
diff --git a/ports/mimxrt/boards/MIMXRT1176_clock_config.h b/ports/mimxrt/boards/MIMXRT1176_clock_config.h
new file mode 100644
index 0000000000000..df2748a658113
--- /dev/null
+++ b/ports/mimxrt/boards/MIMXRT1176_clock_config.h
@@ -0,0 +1,210 @@
+/*
+ * Copyright 2020 NXP
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#ifndef _CLOCK_CONFIG_H_
+#define _CLOCK_CONFIG_H_
+
+#include "fsl_common.h"
+
+/*******************************************************************************
+ * Definitions
+ ******************************************************************************/
+
+#define BOARD_XTAL0_CLK_HZ 24000000U /*!< Board xtal0 frequency in Hz */
+
+#define BOARD_XTAL32K_CLK_HZ 32768U  /*!< Board xtal32k frequency in Hz */
+
+/*******************************************************************************
+ ************************ BOARD_InitBootClocks function ************************
+ ******************************************************************************/
+
+#if defined(__cplusplus)
+extern "C" {
+#endif /* __cplusplus*/
+
+/*!
+ * @brief This function executes default configuration of clocks.
+ *
+ */
+void BOARD_InitBootClocks(void);
+
+#if defined(__cplusplus)
+}
+#endif /* __cplusplus*/
+
+/*******************************************************************************
+ ********************** Configuration BOARD_BootClockRUN ***********************
+ ******************************************************************************/
+/*******************************************************************************
+ * Definitions for BOARD_BootClockRUN configuration
+ ******************************************************************************/
+#if __CORTEX_M == 7
+    #define BOARD_BOOTCLOCKRUN_CORE_CLOCK 996000000UL /*!< CM7 Core clock frequency: 996000000Hz */
+#else
+    #define BOARD_BOOTCLOCKRUN_CORE_CLOCK 392727272UL /*!< CM4 Core clock frequency: 392727272Hz */
+#endif
+
+/* Clock outputs (values are in Hz): */
+#define BOARD_BOOTCLOCKRUN_ACMP_CLK_ROOT              24000000UL
+#define BOARD_BOOTCLOCKRUN_ADC1_CLK_ROOT              24000000UL
+#define BOARD_BOOTCLOCKRUN_ADC2_CLK_ROOT              24000000UL
+#define BOARD_BOOTCLOCKRUN_ARM_PLL_CLK                996000000UL
+#define BOARD_BOOTCLOCKRUN_ASRC_CLK_ROOT              24000000UL
+#define BOARD_BOOTCLOCKRUN_AXI_CLK_ROOT               996000000UL
+#define BOARD_BOOTCLOCKRUN_BUS_CLK_ROOT               160000000UL  // 160MHz
+#define BOARD_BOOTCLOCKRUN_BUS_LPSR_CLK_ROOT          120000000UL  // 120MHz
+#define BOARD_BOOTCLOCKRUN_CAN1_CLK_ROOT              24000000UL
+#define BOARD_BOOTCLOCKRUN_CAN2_CLK_ROOT              24000000UL
+#define BOARD_BOOTCLOCKRUN_CAN3_CLK_ROOT              24000000UL
+#define BOARD_BOOTCLOCKRUN_CCM_CLKO1_CLK_ROOT         24000000UL
+#define BOARD_BOOTCLOCKRUN_CCM_CLKO2_CLK_ROOT         24000000UL
+#define BOARD_BOOTCLOCKRUN_CLK_1M                     1000000UL
+#define BOARD_BOOTCLOCKRUN_CSI2_CLK_ROOT              24000000UL
+#define BOARD_BOOTCLOCKRUN_CSI2_ESC_CLK_ROOT          24000000UL
+#define BOARD_BOOTCLOCKRUN_CSI2_UI_CLK_ROOT           24000000UL
+#define BOARD_BOOTCLOCKRUN_CSI_CLK_ROOT               24000000UL
+#define BOARD_BOOTCLOCKRUN_CSSYS_CLK_ROOT             24000000UL
+#define BOARD_BOOTCLOCKRUN_CSTRACE_CLK_ROOT           132000000UL
+#define BOARD_BOOTCLOCKRUN_ELCDIF_CLK_ROOT            24000000UL
+#define BOARD_BOOTCLOCKRUN_EMV1_CLK_ROOT              24000000UL
+#define BOARD_BOOTCLOCKRUN_EMV2_CLK_ROOT              24000000UL
+#define BOARD_BOOTCLOCKRUN_ENET1_CLK_ROOT             24000000UL
+#define BOARD_BOOTCLOCKRUN_ENET2_CLK_ROOT             24000000UL
+#define BOARD_BOOTCLOCKRUN_ENET_1G_TX_CLK             24000000UL
+#define BOARD_BOOTCLOCKRUN_ENET_25M_CLK_ROOT          24000000UL
+#define BOARD_BOOTCLOCKRUN_ENET_QOS_CLK_ROOT          24000000UL
+#define BOARD_BOOTCLOCKRUN_ENET_TIMER1_CLK_ROOT       24000000UL
+#define BOARD_BOOTCLOCKRUN_ENET_TIMER2_CLK_ROOT       24000000UL
+#define BOARD_BOOTCLOCKRUN_ENET_TIMER3_CLK_ROOT       24000000UL
+#define BOARD_BOOTCLOCKRUN_ENET_TX_CLK                24000000UL
+#define BOARD_BOOTCLOCKRUN_FLEXIO1_CLK_ROOT           24000000UL
+#define BOARD_BOOTCLOCKRUN_FLEXIO2_CLK_ROOT           24000000UL
+#define BOARD_BOOTCLOCKRUN_FLEXSPI1_CLK_ROOT          24000000UL
+#define BOARD_BOOTCLOCKRUN_FLEXSPI2_CLK_ROOT          24000000UL
+#define BOARD_BOOTCLOCKRUN_GC355_CLK_ROOT             492000012UL
+#define BOARD_BOOTCLOCKRUN_GPT1_CLK_ROOT              24000000UL
+#define BOARD_BOOTCLOCKRUN_GPT1_IPG_CLK_HIGHFREQ      24000000UL
+#define BOARD_BOOTCLOCKRUN_GPT2_CLK_ROOT              24000000UL
+#define BOARD_BOOTCLOCKRUN_GPT2_IPG_CLK_HIGHFREQ      24000000UL
+#define BOARD_BOOTCLOCKRUN_GPT3_CLK_ROOT              24000000UL
+#define BOARD_BOOTCLOCKRUN_GPT3_IPG_CLK_HIGHFREQ      24000000UL
+#define BOARD_BOOTCLOCKRUN_GPT4_CLK_ROOT              24000000UL
+#define BOARD_BOOTCLOCKRUN_GPT4_IPG_CLK_HIGHFREQ      24000000UL
+#define BOARD_BOOTCLOCKRUN_GPT5_CLK_ROOT              24000000UL
+#define BOARD_BOOTCLOCKRUN_GPT5_IPG_CLK_HIGHFREQ      24000000UL
+#define BOARD_BOOTCLOCKRUN_GPT6_CLK_ROOT              24000000UL
+#define BOARD_BOOTCLOCKRUN_GPT6_IPG_CLK_HIGHFREQ      24000000UL
+#define BOARD_BOOTCLOCKRUN_LCDIFV2_CLK_ROOT           24000000UL
+#define BOARD_BOOTCLOCKRUN_LPI2C1_CLK_ROOT            60000000UL  // 60MHz
+#define BOARD_BOOTCLOCKRUN_LPI2C2_CLK_ROOT            60000000UL  // 60MHz
+#define BOARD_BOOTCLOCKRUN_LPI2C3_CLK_ROOT            60000000UL  // 60MHz
+#define BOARD_BOOTCLOCKRUN_LPI2C4_CLK_ROOT            60000000UL  // 60MHz
+#define BOARD_BOOTCLOCKRUN_LPI2C5_CLK_ROOT            60000000UL  // 60MHz
+#define BOARD_BOOTCLOCKRUN_LPI2C6_CLK_ROOT            60000000UL  // 60MHz
+#define BOARD_BOOTCLOCKRUN_LPSPI1_CLK_ROOT            13500000UL  // 135MHz
+#define BOARD_BOOTCLOCKRUN_LPSPI2_CLK_ROOT            13500000UL  // 135MHz
+#define BOARD_BOOTCLOCKRUN_LPSPI3_CLK_ROOT            13500000UL  // 135MHz
+#define BOARD_BOOTCLOCKRUN_LPSPI4_CLK_ROOT            13500000UL  // 135MHz
+#define BOARD_BOOTCLOCKRUN_LPSPI5_CLK_ROOT            13500000UL  // 135MHz
+#define BOARD_BOOTCLOCKRUN_LPSPI6_CLK_ROOT            13500000UL  // 135MHz
+#define BOARD_BOOTCLOCKRUN_LPUART10_CLK_ROOT          74250000UL
+#define BOARD_BOOTCLOCKRUN_LPUART11_CLK_ROOT          74250000UL
+#define BOARD_BOOTCLOCKRUN_LPUART12_CLK_ROOT          74250000UL
+#define BOARD_BOOTCLOCKRUN_LPUART1_CLK_ROOT           74250000UL
+#define BOARD_BOOTCLOCKRUN_LPUART2_CLK_ROOT           74250000UL
+#define BOARD_BOOTCLOCKRUN_LPUART3_CLK_ROOT           74250000UL
+#define BOARD_BOOTCLOCKRUN_LPUART4_CLK_ROOT           74250000UL
+#define BOARD_BOOTCLOCKRUN_LPUART5_CLK_ROOT           74250000UL
+#define BOARD_BOOTCLOCKRUN_LPUART6_CLK_ROOT           74250000UL
+#define BOARD_BOOTCLOCKRUN_LPUART7_CLK_ROOT           74250000UL
+#define BOARD_BOOTCLOCKRUN_LPUART8_CLK_ROOT           74250000UL
+#define BOARD_BOOTCLOCKRUN_LPUART9_CLK_ROOT           74250000UL
+#define BOARD_BOOTCLOCKRUN_M4_CLK_ROOT                392727272UL
+#define BOARD_BOOTCLOCKRUN_M4_SYSTICK_CLK_ROOT        24000000UL
+#define BOARD_BOOTCLOCKRUN_M7_CLK_ROOT                996000000UL
+#define BOARD_BOOTCLOCKRUN_M7_SYSTICK_CLK_ROOT        100000UL
+#define BOARD_BOOTCLOCKRUN_MIC_CLK_ROOT               24000000UL
+#define BOARD_BOOTCLOCKRUN_MIPI_DSI_TX_CLK_ESC_ROOT   24000000UL
+#define BOARD_BOOTCLOCKRUN_MIPI_ESC_CLK_ROOT          24000000UL
+#define BOARD_BOOTCLOCKRUN_MIPI_REF_CLK_ROOT          24000000UL
+#define BOARD_BOOTCLOCKRUN_MQS_CLK_ROOT               24000000UL
+#define BOARD_BOOTCLOCKRUN_MQS_MCLK                   24000000UL
+#define BOARD_BOOTCLOCKRUN_OSC_24M                    24000000UL
+#define BOARD_BOOTCLOCKRUN_OSC_32K                    32768UL
+#define BOARD_BOOTCLOCKRUN_OSC_RC_16M                 16000000UL
+#define BOARD_BOOTCLOCKRUN_OSC_RC_400M                400000000UL
+#define BOARD_BOOTCLOCKRUN_OSC_RC_48M                 48000000UL
+#define BOARD_BOOTCLOCKRUN_OSC_RC_48M_DIV2            24000000UL
+#define BOARD_BOOTCLOCKRUN_PLL_AUDIO_CLK              0UL
+#define BOARD_BOOTCLOCKRUN_PLL_AUDIO_SS_MODULATION    0UL
+#define BOARD_BOOTCLOCKRUN_PLL_AUDIO_SS_RANGE         0UL
+#define BOARD_BOOTCLOCKRUN_PLL_VIDEO_CLK              984000025UL
+#define BOARD_BOOTCLOCKRUN_PLL_VIDEO_SS_MODULATION    0UL
+#define BOARD_BOOTCLOCKRUN_PLL_VIDEO_SS_RANGE         0UL
+#define BOARD_BOOTCLOCKRUN_SAI1_CLK_ROOT              24000000UL
+#define BOARD_BOOTCLOCKRUN_SAI1_MCLK1                 24000000UL
+#define BOARD_BOOTCLOCKRUN_SAI1_MCLK2                 0UL
+#define BOARD_BOOTCLOCKRUN_SAI1_MCLK3                 24000000UL
+#define BOARD_BOOTCLOCKRUN_SAI2_CLK_ROOT              24000000UL
+#define BOARD_BOOTCLOCKRUN_SAI2_MCLK1                 24000000UL
+#define BOARD_BOOTCLOCKRUN_SAI2_MCLK2                 0UL
+#define BOARD_BOOTCLOCKRUN_SAI2_MCLK3                 24000000UL
+#define BOARD_BOOTCLOCKRUN_SAI3_CLK_ROOT              24000000UL
+#define BOARD_BOOTCLOCKRUN_SAI3_MCLK1                 24000000UL
+#define BOARD_BOOTCLOCKRUN_SAI3_MCLK2                 0UL
+#define BOARD_BOOTCLOCKRUN_SAI3_MCLK3                 24000000UL
+#define BOARD_BOOTCLOCKRUN_SAI4_CLK_ROOT              24000000UL
+#define BOARD_BOOTCLOCKRUN_SAI4_MCLK1                 24000000UL
+#define BOARD_BOOTCLOCKRUN_SAI4_MCLK2                 0UL
+#define BOARD_BOOTCLOCKRUN_SEMC_CLK_ROOT              198000000UL
+#define BOARD_BOOTCLOCKRUN_SPDIF_CLK_ROOT             24000000UL
+#define BOARD_BOOTCLOCKRUN_SPDIF_EXTCLK_OUT           0UL
+#define BOARD_BOOTCLOCKRUN_SYS_PLL1_CLK               0UL
+#define BOARD_BOOTCLOCKRUN_SYS_PLL1_DIV2_CLK          0UL
+#define BOARD_BOOTCLOCKRUN_SYS_PLL1_DIV5_CLK          0UL
+#define BOARD_BOOTCLOCKRUN_SYS_PLL1_SS_MODULATION     0UL
+#define BOARD_BOOTCLOCKRUN_SYS_PLL1_SS_RANGE          0UL
+#define BOARD_BOOTCLOCKRUN_SYS_PLL2_CLK               528000000UL
+#define BOARD_BOOTCLOCKRUN_SYS_PLL2_PFD0_CLK          352000000UL
+#define BOARD_BOOTCLOCKRUN_SYS_PLL2_PFD1_CLK          594000000UL
+#define BOARD_BOOTCLOCKRUN_SYS_PLL2_PFD2_CLK          396000000UL
+#define BOARD_BOOTCLOCKRUN_SYS_PLL2_PFD3_CLK          297000000UL
+#define BOARD_BOOTCLOCKRUN_SYS_PLL2_SS_MODULATION     0UL
+#define BOARD_BOOTCLOCKRUN_SYS_PLL2_SS_RANGE          0UL
+#define BOARD_BOOTCLOCKRUN_SYS_PLL3_CLK               480000000UL
+#define BOARD_BOOTCLOCKRUN_SYS_PLL3_DIV2_CLK          240000000UL
+#define BOARD_BOOTCLOCKRUN_SYS_PLL3_PFD0_CLK          664615384UL
+#define BOARD_BOOTCLOCKRUN_SYS_PLL3_PFD1_CLK          508235294UL
+#define BOARD_BOOTCLOCKRUN_SYS_PLL3_PFD2_CLK          270000000UL
+#define BOARD_BOOTCLOCKRUN_SYS_PLL3_PFD3_CLK          392727272UL
+#define BOARD_BOOTCLOCKRUN_USDHC1_CLK_ROOT            24000000UL
+#define BOARD_BOOTCLOCKRUN_USDHC2_CLK_ROOT            24000000UL
+
+
+// Configuration for all instances of peripherals are identical
+#define BOARD_BOOTCLOCKRUN_LPI2C_CLK_ROOT             60000000UL  // 60MHz
+#define BOARD_BOOTCLOCKRUN_LPSPI_CLK_ROOT             135000000UL // 135MHz
+#define BOARD_BOOTCLOCKRUN_PERCLK_CLK_ROOT            160000000UL // 160MHz
+#define BOARD_BOOTCLOCKRUN_UART_CLK_ROOT              74250000UL  // 74.25MHz
+/*******************************************************************************
+ * API for BOARD_BootClockRUN configuration
+ ******************************************************************************/
+#if defined(__cplusplus)
+extern "C" {
+#endif /* __cplusplus*/
+
+/*!
+ * @brief This function executes configuration of clocks.
+ *
+ */
+void BOARD_BootClockRUN(void);
+
+#if defined(__cplusplus)
+}
+#endif /* __cplusplus*/
+
+#endif /* _CLOCK_CONFIG_H_ */
diff --git a/ports/mimxrt/boards/OLIMEX_RT1010/mpconfigboard.h b/ports/mimxrt/boards/OLIMEX_RT1010/mpconfigboard.h
index 8c6d159fb7aec..6f4c528f9baa6 100644
--- a/ports/mimxrt/boards/OLIMEX_RT1010/mpconfigboard.h
+++ b/ports/mimxrt/boards/OLIMEX_RT1010/mpconfigboard.h
@@ -57,6 +57,7 @@
 #define I2S_IOMUXC_GPR_MODE { 0, kIOMUXC_GPR_SAI1MClkOutputDir, 0, kIOMUXC_GPR_SAI3MClkOutputDir }
 #define I2S_DMA_REQ_SRC_RX { 0, kDmaRequestMuxSai1Rx, 0, kDmaRequestMuxSai3Rx }
 #define I2S_DMA_REQ_SRC_TX { 0, kDmaRequestMuxSai1Tx, 0, kDmaRequestMuxSai3Tx }
+#define I2S_AUDIO_PLL_CLOCK (2U)
 
 #define I2S_GPIO(_hwid, _fn, _mode, _pin, _iomux) \
     { \
diff --git a/ports/mimxrt/boards/SEEED_ARCH_MIX/mpconfigboard.h b/ports/mimxrt/boards/SEEED_ARCH_MIX/mpconfigboard.h
index d366b4535d702..37ff6a94c2bf2 100644
--- a/ports/mimxrt/boards/SEEED_ARCH_MIX/mpconfigboard.h
+++ b/ports/mimxrt/boards/SEEED_ARCH_MIX/mpconfigboard.h
@@ -73,6 +73,7 @@
 #define I2S_IOMUXC_GPR_MODE { 0, kIOMUXC_GPR_SAI1MClkOutputDir }
 #define I2S_DMA_REQ_SRC_RX { 0, kDmaRequestMuxSai1Rx }
 #define I2S_DMA_REQ_SRC_TX { 0, kDmaRequestMuxSai1Tx }
+#define I2S_AUDIO_PLL_CLOCK (2U)
 
 #define I2S_GPIO(_hwid, _fn, _mode, _pin, _iomux) \
     { \
@@ -116,6 +117,8 @@
 
 // Etherner PIN definitions
 // No reset and interrupt pin by intention
+#define ENET_RESET_PIN      NULL
+#define ENET_INT_PIN        NULL
 
 #define IOMUX_TABLE_ENET \
     { IOMUXC_GPIO_B1_04_ENET_RX_DATA00, 0, 0xB0E9u }, \
diff --git a/ports/mimxrt/boards/SEEED_ARCH_MIX/mpconfigboard.mk b/ports/mimxrt/boards/SEEED_ARCH_MIX/mpconfigboard.mk
index 2312d11311e50..82a95c493c95b 100644
--- a/ports/mimxrt/boards/SEEED_ARCH_MIX/mpconfigboard.mk
+++ b/ports/mimxrt/boards/SEEED_ARCH_MIX/mpconfigboard.mk
@@ -12,3 +12,5 @@ MICROPY_HW_SDRAM_SIZE  = 0x2000000  # 32MB
 MICROPY_PY_LWIP = 1
 MICROPY_PY_USSL = 1
 MICROPY_SSL_MBEDTLS = 1
+
+CFLAGS += -DSPI_RETRY_TIMES=1000000
\ No newline at end of file
diff --git a/ports/mimxrt/boards/TEENSY40/mpconfigboard.h b/ports/mimxrt/boards/TEENSY40/mpconfigboard.h
index 877573d038658..07da87db10fce 100644
--- a/ports/mimxrt/boards/TEENSY40/mpconfigboard.h
+++ b/ports/mimxrt/boards/TEENSY40/mpconfigboard.h
@@ -66,6 +66,7 @@
 #define I2S_IOMUXC_GPR_MODE { 0, kIOMUXC_GPR_SAI1MClkOutputDir, kIOMUXC_GPR_SAI2MClkOutputDir }
 #define I2S_DMA_REQ_SRC_RX { 0, kDmaRequestMuxSai1Rx, kDmaRequestMuxSai2Rx }
 #define I2S_DMA_REQ_SRC_TX { 0, kDmaRequestMuxSai1Tx, kDmaRequestMuxSai2Tx }
+#define I2S_AUDIO_PLL_CLOCK (2U)
 
 #define I2S_GPIO(_hwid, _fn, _mode, _pin, _iomux) \
     { \
diff --git a/ports/mimxrt/boards/TEENSY41/mpconfigboard.h b/ports/mimxrt/boards/TEENSY41/mpconfigboard.h
index 3c6a05185da4c..7fe97fd9ccf61 100644
--- a/ports/mimxrt/boards/TEENSY41/mpconfigboard.h
+++ b/ports/mimxrt/boards/TEENSY41/mpconfigboard.h
@@ -66,6 +66,7 @@
 #define I2S_IOMUXC_GPR_MODE { 0, kIOMUXC_GPR_SAI1MClkOutputDir, kIOMUXC_GPR_SAI2MClkOutputDir }
 #define I2S_DMA_REQ_SRC_RX { 0, kDmaRequestMuxSai1Rx, kDmaRequestMuxSai2Rx }
 #define I2S_DMA_REQ_SRC_TX { 0, kDmaRequestMuxSai1Tx, kDmaRequestMuxSai2Tx }
+#define I2S_AUDIO_PLL_CLOCK (2U)
 
 #define I2S_GPIO(_hwid, _fn, _mode, _pin, _iomux) \
     { \
@@ -113,8 +114,8 @@
 #define ENET_PHY_OPS        phydp83825_ops
 
 // Ethernet PIN definitions
-#define ENET_RESET_PIN      pin_GPIO_B0_14
-#define ENET_INT_PIN        pin_GPIO_B0_15
+#define ENET_RESET_PIN      &pin_GPIO_B0_14
+#define ENET_INT_PIN        &pin_GPIO_B0_15
 
 #define IOMUX_TABLE_ENET \
     { IOMUXC_GPIO_B1_04_ENET_RX_DATA00, 0, 0xB0E9u }, \
diff --git a/ports/mimxrt/boards/common.ld b/ports/mimxrt/boards/common.ld
index 3aaa14c83bf21..c2aa369f66b3a 100644
--- a/ports/mimxrt/boards/common.ld
+++ b/ports/mimxrt/boards/common.ld
@@ -96,7 +96,7 @@ SECTIONS
   .text :
   {
     . = ALIGN(4);
-    *(EXCLUDE_FILE(*fsl_flexspi.o *gc*.o *vm.o *parse.o *runtime*.o *mpirq.o *map.o) .text*) /* .text* sections (code) */
+    *(EXCLUDE_FILE(*fsl_flexspi.o *gc.o *vm.o *parse*.o *runtime*.o *map.o *mpirq.o ) .text*) /* .text* sections (code) */
     *(.rodata)               /* .rodata sections (constants, strings, etc.) */
     *(.rodata*)              /* .rodata* sections (constants, strings, etc.) */
     *(.glue_7)               /* glue arm to thumb code */
diff --git a/ports/mimxrt/boards/make-flexram-config.py b/ports/mimxrt/boards/make-flexram-config.py
index 5d9c1a8c7c025..1afa7f798519b 100644
--- a/ports/mimxrt/boards/make-flexram-config.py
+++ b/ports/mimxrt/boards/make-flexram-config.py
@@ -169,6 +169,43 @@ def mimxrt_106x_gen_code(extract_dict):
     )
 
 
+def mimxrt_1176_gen_code(extract_dict):
+    flexram_bank_cfg = "0b"
+    avail_flexram = extract_dict["fsl_ram_bank_size"] * extract_dict["fsl_bank_nbr"]
+    flexram_configurable_ocram = (
+        extract_dict["ocram_size"] % 524288
+    )  # 512kB OCRAM are not part of FlexRAM configurable memory
+
+    if (
+        flexram_configurable_ocram + extract_dict["dtcm_size"] + extract_dict["itcm_size"]
+    ) > avail_flexram:
+        raise ValueError("Configuration exceeds available FlexRAM!")
+
+    for size, pattern in (
+        (flexram_configurable_ocram, "01"),
+        (extract_dict["dtcm_size"], "10"),
+        (extract_dict["itcm_size"], "11"),
+    ):
+        for _ in range(0, size, extract_dict["fsl_ram_bank_size"]):
+            flexram_bank_cfg += pattern
+
+    # Generate GPR Register config
+    print(".equ __iomux_gpr14_adr, 0x{:08X}".format(extract_dict["gpr_base_addr"] + 0x38))
+    print(".equ __iomux_gpr16_adr, 0x{:08X}".format(extract_dict["gpr_base_addr"] + 0x40))
+    print(".equ __iomux_gpr17_adr, 0x{:08X}".format(extract_dict["gpr_base_addr"] + 0x44))
+    print(".equ __iomux_gpr18_adr, 0x{:08X}".format(extract_dict["gpr_base_addr"] + 0x48))
+    print(
+        ".equ __iomux_gpr17_value, 0x{:08X} /* {}k OCRAM (512k OCRAM, {}k from FlexRAM), {}k DTCM, {}k ITCM */".format(
+            int(flexram_bank_cfg, 2) & 0xFFFF,
+            extract_dict["ocram_size"] // 1024,
+            flexram_configurable_ocram // 1024,
+            extract_dict["dtcm_size"] // 1024,
+            extract_dict["itcm_size"] // 1024,
+        )
+    )
+    print(".equ __iomux_gpr18_value, 0x{:08X}".format((int(flexram_bank_cfg, 2) >> 16) & 0xFFFF))
+
+
 def main(defines_file, features_file, ld_script, controller):
     dispatcher = {
         "MIMXRT1011": (mimxrt_default_parser, mimxrt_default_gen_code),
@@ -177,6 +214,7 @@ def main(defines_file, features_file, ld_script, controller):
         "MIMXRT1052": (mimxrt_default_parser, mimxrt_default_gen_code),
         "MIMXRT1062": (mimxrt_default_parser, mimxrt_106x_gen_code),
         "MIMXRT1064": (mimxrt_default_parser, mimxrt_106x_gen_code),
+        "MIMXRT1176": (mimxrt_default_parser, mimxrt_1176_gen_code),
     }
 
     extractor, code_generator = dispatcher[controller]
diff --git a/ports/mimxrt/boards/make-pins.py b/ports/mimxrt/boards/make-pins.py
index 441676adde628..9d11feb13ac9c 100644
--- a/ports/mimxrt/boards/make-pins.py
+++ b/ports/mimxrt/boards/make-pins.py
@@ -21,6 +21,9 @@
     r"IOMUXC_(?P<pin>GPIO_\d\d)_(?P<function>\w+) (?P<muxRegister>\w+), (?P<muxMode>\w+), (?P<inputRegister>\w+), (?P<inputDaisy>\w+), (?P<configRegister>\w+)",
     r"IOMUXC_(?P<pin>GPIO_AD_\d\d)_(?P<function>\w+) (?P<muxRegister>\w+), (?P<muxMode>\w+), (?P<inputRegister>\w+), (?P<inputDaisy>\w+), (?P<configRegister>\w+)",
     r"IOMUXC_(?P<pin>GPIO_SD_\d\d)_(?P<function>\w+) (?P<muxRegister>\w+), (?P<muxMode>\w+), (?P<inputRegister>\w+), (?P<inputDaisy>\w+), (?P<configRegister>\w+)",
+    r"IOMUXC_(?P<pin>GPIO_EMC_B\d_\d\d)_(?P<function>\w+) (?P<muxRegister>\w+), (?P<muxMode>\w+), (?P<inputRegister>\w+), (?P<inputDaisy>\w+), (?P<configRegister>\w+)",
+    r"IOMUXC_(?P<pin>GPIO_DISP_B\d_\d\d)_(?P<function>\w+) (?P<muxRegister>\w+), (?P<muxMode>\w+), (?P<inputRegister>\w+), (?P<inputDaisy>\w+), (?P<configRegister>\w+)",
+    r"IOMUXC_(?P<pin>GPIO_LPSR_\d\d)_(?P<function>\w+) (?P<muxRegister>\w+), (?P<muxMode>\w+), (?P<inputRegister>\w+), (?P<inputDaisy>\w+), (?P<configRegister>\w+)",
 ]
 
 
@@ -62,6 +65,7 @@ def is_board_pin(self):
 
     def parse_adc(self, adc_str):
         adc_regex = r"ADC(?P<instance>\d*)_IN(?P<channel>\d*)"
+        lpadc_regex = r"ADC(?P<instance>\d*)_CH(?P<channel>\d*)"  # LPADC for MIMXRT11xx chips
 
         matches = re.finditer(adc_regex, adc_str, re.MULTILINE)
         for match in matches:
@@ -69,6 +73,16 @@ def parse_adc(self, adc_str):
                 AdcFunction(instance=match.group("instance"), channel=match.group("channel"))
             )
 
+        matches = re.finditer(lpadc_regex, adc_str, re.MULTILINE)
+        for match in matches:
+            self.adc_fns.append(
+                AdcFunction(
+                    peripheral="LPADC",
+                    instance=match.group("instance"),
+                    channel=match.group("channel"),
+                )
+            )
+
     def parse_af(self, af_idx, af_strs_in):
         pass
 
@@ -104,18 +118,16 @@ def print(self):
             self.print_pin_af()
             self.print_pin_adc()
 
-            if self.adc_fns:
-                print(
-                    "const machine_pin_obj_t pin_{0} = PIN({0}, {1}, {2}, pin_{0}_af, {3}, pin_{0}_adc);\n".format(
-                        self.name, self.gpio, int(self.pin), len(self.adc_fns)
-                    )
-                )
-            else:
-                print(
-                    "const machine_pin_obj_t pin_{0} = PIN({0}, {1}, {2}, pin_{0}_af, {3}, NULL);\n".format(
-                        self.name, self.gpio, int(self.pin), len(self.adc_fns)
-                    )
+            print(
+                "const machine_pin_obj_t pin_{0} = {1}({0}, {2}, {3}, pin_{0}_af, {4}, {5});\n".format(
+                    self.name,
+                    "PIN_LPSR" if "LPSR" in self.name else "PIN",
+                    self.gpio,
+                    int(self.pin),
+                    len(self.adc_fns),
+                    "pin_{}_adc".format(self.name) if self.adc_fns else "NULL",
                 )
+            )
         else:
             raise ValueError("Pin '{}' has no alternative functions".format(self.name))
 
@@ -126,13 +138,14 @@ def print_header(self, hdr_file):
 class AdcFunction(object):
     """Holds the information associated with a pins ADC function."""
 
-    def __init__(self, instance, channel):
+    def __init__(self, instance, channel, peripheral="ADC"):
+        self.peripheral = peripheral
         self.instance = instance
         self.channel = channel
 
     def print(self):
         """Prints the C representation of this AF."""
-        print(f"    PIN_ADC(ADC{self.instance}, {self.channel}),")
+        print(f"    PIN_ADC({self.peripheral}{self.instance}, {self.channel}),")
 
 
 class AlternateFunction(object):
@@ -190,11 +203,8 @@ def parse_board_file(self, filename):
                 if pin and row[0]:  # Only add board pins that have a name
                     self.board_pins.append(NamedPin(row[0], pin.pad, pin.idx))
 
-    def parse_af_file(self, filename, iomux_filename, pad_col, af_start_col):
-        af_end_col = af_start_col + MAX_AF
-
+    def parse_af_file(self, filename, iomux_filename):
         iomux_pin_config = dict()
-
         with open(iomux_filename, "r") as ipt:
             input_str = ipt.read()
             for regex in regexes:
@@ -213,16 +223,23 @@ def parse_af_file(self, filename, iomux_filename, pad_col, af_start_col):
         with open(filename, "r") as csvfile:
             rows = csv.reader(csvfile)
             header = next(rows)
+            # Extract indexes from header row
+            pad_col = header.index("Pad")
+            adc_col = header.index("ADC")
+            acmp_col = header.index("ACMP")
+            #
             for idx, row in enumerate(rows):
                 pad = row[pad_col]
                 gpio, pin = row[6].split("_")
                 pin_number = pin.lstrip("IO")
-
                 pin = Pin(pad, gpio, pin_number, idx=idx)
 
+                if any(s in pad for s in ("SNVS", "WAKEUP")):
+                    continue
+
                 # Parse alternate functions
                 af_idx = 0
-                for af_idx, af in enumerate(row[af_start_col:af_end_col]):
+                for af_idx, af in enumerate(row[(pad_col + 1) : adc_col]):
                     if af and af_supported(af):
                         pin.add_af(
                             AlternateFunction(
@@ -235,7 +252,7 @@ def parse_af_file(self, filename, iomux_filename, pad_col, af_start_col):
                             )
                         )
 
-                pin.parse_adc(row[ADC_COL])
+                pin.parse_adc(row[adc_col])
 
                 self.cpu_pins.append(pin)
 
@@ -363,7 +380,7 @@ def main():
 
     if args.af_filename:
         print("// --af {:s}".format(args.af_filename))
-        pins.parse_af_file(args.af_filename, args.iomux_filename, 0, 1)
+        pins.parse_af_file(args.af_filename, args.iomux_filename)
 
     if args.board_filename:
         print("// --board {:s}".format(args.board_filename))
diff --git a/ports/mimxrt/boards/mimxrt_prefix.c b/ports/mimxrt/boards/mimxrt_prefix.c
index 938efc8104567..09c0aa109ebff 100644
--- a/ports/mimxrt/boards/mimxrt_prefix.c
+++ b/ports/mimxrt/boards/mimxrt_prefix.c
@@ -35,3 +35,17 @@
         .adc_list = (_adc_list), \
     } \
 
+#define PIN_LPSR(_name, _gpio, _pin, _af_list, _adc_list_len, _adc_list) \
+    { \
+        .base = { &machine_pin_type }, \
+        .name = MP_QSTR_##_name, \
+        .gpio = (_gpio), \
+        .pin = (uint32_t)(_pin), \
+        .muxRegister = (uint32_t)&(IOMUXC_LPSR->SW_MUX_CTL_PAD[kIOMUXC_LPSR_SW_MUX_CTL_PAD_##_name]), \
+        .configRegister = (uint32_t)&(IOMUXC_LPSR->SW_PAD_CTL_PAD[kIOMUXC_LPSR_SW_PAD_CTL_PAD_##_name]), \
+        .af_list_len = (uint8_t)(sizeof((_af_list)) / sizeof(machine_pin_af_obj_t)), \
+        .adc_list_len = (_adc_list_len), \
+        .af_list = (_af_list), \
+        .adc_list = (_adc_list), \
+    } \
+
diff --git a/ports/mimxrt/eth.c b/ports/mimxrt/eth.c
index 50e1cbb0fe822..ad015941a220b 100644
--- a/ports/mimxrt/eth.c
+++ b/ports/mimxrt/eth.c
@@ -43,7 +43,9 @@
 #include "hal/phy/mdio/enet/fsl_enet_mdio.h"
 #include "hal/phy/device/phyksz8081/fsl_phyksz8081.h"
 #include "hal/phy/device/phydp83825/fsl_phydp83825.h"
+#include "hal/phy/device/phydp83848/fsl_phydp83848.h"
 #include "hal/phy/device/phylan8720/fsl_phylan8720.h"
+#include "hal/phy/device/phyrtl8211f/fsl_phyrtl8211f.h"
 
 #include "eth.h"
 #include "lwip/etharp.h"
@@ -53,50 +55,9 @@
 
 #include "ticks.h"
 
-// Configuration values
-enet_config_t enet_config;
-phy_config_t phyConfig = {0};
-
-// Prepare the buffer configuration.
-
 #define ENET_RXBD_NUM          (5)
 #define ENET_TXBD_NUM          (5)
 
-AT_NONCACHEABLE_SECTION_ALIGN(enet_rx_bd_struct_t g_rxBuffDescrip[ENET_RXBD_NUM], ENET_BUFF_ALIGNMENT);
-AT_NONCACHEABLE_SECTION_ALIGN(enet_tx_bd_struct_t g_txBuffDescrip[ENET_TXBD_NUM], ENET_BUFF_ALIGNMENT);
-SDK_ALIGN(uint8_t g_rxDataBuff[ENET_RXBD_NUM][SDK_SIZEALIGN(ENET_FRAME_MAX_FRAMELEN, ENET_BUFF_ALIGNMENT)],
-    ENET_BUFF_ALIGNMENT);
-SDK_ALIGN(uint8_t g_txDataBuff[ENET_TXBD_NUM][SDK_SIZEALIGN(ENET_FRAME_MAX_FRAMELEN, ENET_BUFF_ALIGNMENT)],
-    ENET_BUFF_ALIGNMENT);
-
-// ENET Handles & Buffers
-enet_handle_t g_handle;
-
-static mdio_handle_t mdioHandle = {.ops = &enet_ops};
-static phy_handle_t phyHandle = {.phyAddr = ENET_PHY_ADDRESS, .mdioHandle = &mdioHandle, .ops = &ENET_PHY_OPS};
-
-enet_buffer_config_t buffConfig[] = {{
-                                         ENET_RXBD_NUM,
-                                         ENET_TXBD_NUM,
-                                         SDK_SIZEALIGN(ENET_FRAME_MAX_FRAMELEN, ENET_BUFF_ALIGNMENT),
-                                         SDK_SIZEALIGN(ENET_FRAME_MAX_FRAMELEN, ENET_BUFF_ALIGNMENT),
-                                         &g_rxBuffDescrip[0],
-                                         &g_txBuffDescrip[0],
-                                         &g_rxDataBuff[0][0],
-                                         &g_txDataBuff[0][0],
-                                         #if FSL_ENET_DRIVER_VERSION >= 0x020300
-                                         0,
-                                         0,
-                                         NULL
-                                         #endif
-                                     }};
-
-static uint8_t hw_addr[6]; // The MAC address field
-eth_t eth_instance;
-
-#define PHY_INIT_TIMEOUT_MS (10000)
-#define PHY_AUTONEGO_TIMEOUT_US (5000000)
-
 typedef struct _eth_t {
     uint32_t trace_flags;
     struct netif netif;
@@ -113,16 +74,108 @@ typedef struct _iomux_table_t {
     uint32_t configValue;
 } iomux_table_t;
 
+// ETH0 buffers and handles
+static AT_NONCACHEABLE_SECTION_ALIGN(enet_rx_bd_struct_t g_rxBuffDescrip[ENET_RXBD_NUM], ENET_BUFF_ALIGNMENT);
+static AT_NONCACHEABLE_SECTION_ALIGN(enet_tx_bd_struct_t g_txBuffDescrip[ENET_TXBD_NUM], ENET_BUFF_ALIGNMENT);
+static SDK_ALIGN(uint8_t g_rxDataBuff[ENET_RXBD_NUM][SDK_SIZEALIGN(ENET_FRAME_MAX_FRAMELEN, ENET_BUFF_ALIGNMENT)],
+    ENET_BUFF_ALIGNMENT);
+static SDK_ALIGN(uint8_t g_txDataBuff[ENET_TXBD_NUM][SDK_SIZEALIGN(ENET_FRAME_MAX_FRAMELEN, ENET_BUFF_ALIGNMENT)],
+    ENET_BUFF_ALIGNMENT);
+
+// ENET Handles & Buffers
+static enet_handle_t g_handle;
+static mdio_handle_t mdioHandle = {.ops = &enet_ops};
+static phy_handle_t phyHandle;
+eth_t eth_instance0;
+
+static enet_buffer_config_t buffConfig[] = {{
+                                                ENET_RXBD_NUM,
+                                                ENET_TXBD_NUM,
+                                                SDK_SIZEALIGN(ENET_FRAME_MAX_FRAMELEN, ENET_BUFF_ALIGNMENT),
+                                                SDK_SIZEALIGN(ENET_FRAME_MAX_FRAMELEN, ENET_BUFF_ALIGNMENT),
+                                                &g_rxBuffDescrip[0],
+                                                &g_txBuffDescrip[0],
+                                                &g_rxDataBuff[0][0],
+                                                &g_txDataBuff[0][0],
+                                                #if FSL_ENET_DRIVER_VERSION >= 0x020300
+                                                true,
+                                                true,
+                                                NULL,
+                                                #endif
+                                            }};
+
 static const iomux_table_t iomux_table_enet[] = {
     IOMUX_TABLE_ENET
 };
 
-#define IOTE (iomux_table_enet[i])
+static uint8_t hw_addr[6]; // The MAC address field
+
+#if defined(ENET_DUAL_PORT)
+
+// ETH1 buffers and handles
+static AT_NONCACHEABLE_SECTION_ALIGN(enet_rx_bd_struct_t g_rxBuffDescrip_1[ENET_RXBD_NUM], ENET_BUFF_ALIGNMENT);
+static AT_NONCACHEABLE_SECTION_ALIGN(enet_tx_bd_struct_t g_txBuffDescrip_1[ENET_TXBD_NUM], ENET_BUFF_ALIGNMENT);
+static SDK_ALIGN(uint8_t g_rxDataBuff_1[ENET_RXBD_NUM][SDK_SIZEALIGN(ENET_FRAME_MAX_FRAMELEN, ENET_BUFF_ALIGNMENT)],
+    ENET_BUFF_ALIGNMENT);
+static SDK_ALIGN(uint8_t g_txDataBuff_1[ENET_TXBD_NUM][SDK_SIZEALIGN(ENET_FRAME_MAX_FRAMELEN, ENET_BUFF_ALIGNMENT)],
+    ENET_BUFF_ALIGNMENT);
+
+static enet_handle_t g_handle_1;
+static mdio_handle_t mdioHandle_1 = {.ops = &enet_ops};
+static phy_handle_t phyHandle_1;
+eth_t eth_instance1;
+
+static enet_buffer_config_t buffConfig_1[] = {{
+                                                  ENET_RXBD_NUM,
+                                                  ENET_TXBD_NUM,
+                                                  SDK_SIZEALIGN(ENET_FRAME_MAX_FRAMELEN, ENET_BUFF_ALIGNMENT),
+                                                  SDK_SIZEALIGN(ENET_FRAME_MAX_FRAMELEN, ENET_BUFF_ALIGNMENT),
+                                                  &g_rxBuffDescrip_1[0],
+                                                  &g_txBuffDescrip_1[0],
+                                                  &g_rxDataBuff_1[0][0],
+                                                  &g_txDataBuff_1[0][0],
+                                                  #if FSL_ENET_DRIVER_VERSION >= 0x020300
+                                                  true,
+                                                  true,
+                                                  NULL,
+                                                  #endif
+                                              }};
+
+static const iomux_table_t iomux_table_enet_1[] = {
+    IOMUX_TABLE_ENET_1
+};
+
+static uint8_t hw_addr_1[6]; // The MAC address field
+
+#endif
+
+#if defined(ENET_DUAL_PORT)
+#if defined MIMXRT117x_SERIES
+#define ENET_1 ENET_1G
+#else
+#define ENET_1 ENET2
+#endif
+#else
+#define ENET_1 ENET
+#endif
+
+#define PHY_AUTONEGO_TIMEOUT_US (5000000)
+#define PHY_SETTLE_TIME_US      (1000)
+// Settle time must be 500000 for the 1G interface
+#define PHY_SETTLE_TIME_US_1    (500000)
+#define ENET_RESET_LOW_TIME_US  (10000)
+#define ENET_RESET_WAIT_TIME_US (30000)
+
+#define IOTE (iomux_table[i])
+
+#ifndef ENET_TX_CLK_OUTPUT
+#define ENET_TX_CLK_OUTPUT true
+#endif
 
-#define TRACE_ASYNC_EV (0x0001)
-#define TRACE_ETH_TX (0x0002)
-#define TRACE_ETH_RX (0x0004)
-#define TRACE_ETH_FULL (0x0008)
+#define TRACE_ASYNC_EV  (0x0001)
+#define TRACE_ETH_TX    (0x0002)
+#define TRACE_ETH_RX    (0x0004)
+#define TRACE_ETH_FULL  (0x0008)
 
 STATIC void eth_trace(eth_t *self, size_t len, const void *data, unsigned int flags) {
     if (((flags & NETUTILS_TRACE_IS_TX) && (self->trace_flags & TRACE_ETH_TX))
@@ -186,106 +239,146 @@ void eth_irq_handler(ENET_Type *base, enet_handle_t *handle,
     }
 }
 
-// eth_init: Set up GPIO and the transceiver
-void eth_init(eth_t *self, int mac_idx, const phy_operations_t *phy_ops, int phy_addr, bool phy_clock) {
-
-    self->netif.num = mac_idx; // Set the interface number
+// Configure the ethernet clock
+STATIC uint32_t eth_clock_init(int eth_id, bool phy_clock) {
 
     CLOCK_EnableClock(kCLOCK_Iomuxc);
 
-    gpio_pin_config_t gpio_config = {kGPIO_DigitalOutput, 0, kGPIO_NoIntmode};
-    (void)gpio_config;
+    #if defined MIMXRT117x_SERIES
 
-    #ifdef ENET_RESET_PIN
-    // Configure the Reset Pin
-    const machine_pin_obj_t *reset_pin = &ENET_RESET_PIN;
-    const machine_pin_af_obj_t *af_obj = pin_find_af(reset_pin, PIN_AF_MODE_ALT5);
+    clock_root_config_t rootCfg = {0};
 
-    IOMUXC_SetPinMux(reset_pin->muxRegister, af_obj->af_mode, 0, 0, reset_pin->configRegister, 0U);
-    IOMUXC_SetPinConfig(reset_pin->muxRegister, af_obj->af_mode, 0, 0, reset_pin->configRegister,
-        pin_generate_config(PIN_PULL_DISABLED, PIN_MODE_OUT, PIN_DRIVE_5, reset_pin->configRegister));
-    GPIO_PinInit(reset_pin->gpio, reset_pin->pin, &gpio_config);
-    #endif
+    if (eth_id == MP_HAL_MAC_ETH0) {
+        // Generate 50M root clock.
+        rootCfg.mux = kCLOCK_ENET1_ClockRoot_MuxSysPll1Div2; // 500 MHz
+        rootCfg.div = 10;
+        CLOCK_SetRootClock(kCLOCK_Root_Enet1, &rootCfg);
+        // 50M ENET_REF_CLOCK output to PHY and ENET module.
+        // if required, handle phy_clock direction here
+        IOMUXC_GPR->GPR4 |= 0x3;
+    } else {
+        // Generate 125M root clock.
+        rootCfg.mux = kCLOCK_ENET1_ClockRoot_MuxSysPll1Div2; // 500 MHz
+        rootCfg.div = 4;
+        CLOCK_SetRootClock(kCLOCK_Root_Enet2, &rootCfg);
+        IOMUXC_GPR->GPR5 |= IOMUXC_GPR_GPR5_ENET1G_RGMII_EN_MASK; /* bit1:iomuxc_gpr_enet_clk_dir
+                                                                     bit0:GPR_ENET_TX_CLK_SEL(internal or OSC) */
+    }
+    return CLOCK_GetRootClockFreq(kCLOCK_Root_Bus);
 
-    #ifdef ENET_INT_PIN
-    // Configure the Int Pin
-    const machine_pin_obj_t *int_pin = &ENET_INT_PIN;
-    af_obj = pin_find_af(int_pin, PIN_AF_MODE_ALT5);
+    #else
+
+    const clock_enet_pll_config_t config = {
+        .enableClkOutput = phy_clock, .enableClkOutput25M = false, .loopDivider = 1
+    };
+    CLOCK_InitEnetPll(&config);
+
+    IOMUXC_EnableMode(IOMUXC_GPR, kIOMUXC_GPR_ENET1RefClkMode, false); // Drive ENET_REF_CLK from PAD
+    IOMUXC_EnableMode(IOMUXC_GPR, kIOMUXC_GPR_ENET1TxClkOutputDir, phy_clock);  // Enable output driver
+
+    return CLOCK_GetFreq(kCLOCK_IpgClk);
 
-    IOMUXC_SetPinMux(int_pin->muxRegister, af_obj->af_mode, 0, 0, int_pin->configRegister, 0U);
-    IOMUXC_SetPinConfig(int_pin->muxRegister, af_obj->af_mode, 0, 0, int_pin->configRegister,
-        pin_generate_config(PIN_PULL_UP_47K, PIN_MODE_IN, PIN_DRIVE_5, int_pin->configRegister));
-    GPIO_PinInit(int_pin->gpio, int_pin->pin, &gpio_config);
     #endif
+}
+
+// eth_gpio_init: Configure the GPIO pins
+STATIC void eth_gpio_init(const iomux_table_t iomux_table[], size_t iomux_table_size,
+    const machine_pin_obj_t *reset_pin, const machine_pin_obj_t *int_pin) {
+
+    gpio_pin_config_t gpio_config = {kGPIO_DigitalOutput, 1, kGPIO_NoIntmode};
+    (void)gpio_config;
+    const machine_pin_af_obj_t *af_obj;
+
+    if (reset_pin != NULL) {
+        // Configure the Reset Pin
+        af_obj = pin_find_af(reset_pin, PIN_AF_MODE_ALT5);
+
+        IOMUXC_SetPinMux(reset_pin->muxRegister, af_obj->af_mode, 0, 0, reset_pin->configRegister, 0U);
+        IOMUXC_SetPinConfig(reset_pin->muxRegister, af_obj->af_mode, 0, 0, reset_pin->configRegister,
+            pin_generate_config(PIN_PULL_DISABLED, PIN_MODE_OUT, PIN_DRIVE_5, reset_pin->configRegister));
+        GPIO_PinInit(reset_pin->gpio, reset_pin->pin, &gpio_config);
+    }
+
+    if (int_pin != NULL) {
+        // Configure the Int Pin
+        af_obj = pin_find_af(int_pin, PIN_AF_MODE_ALT5);
+
+        IOMUXC_SetPinMux(int_pin->muxRegister, af_obj->af_mode, 0, 0, int_pin->configRegister, 0U);
+        IOMUXC_SetPinConfig(int_pin->muxRegister, af_obj->af_mode, 0, 0, int_pin->configRegister,
+            pin_generate_config(PIN_PULL_UP_47K, PIN_MODE_IN, PIN_DRIVE_5, int_pin->configRegister));
+        GPIO_PinInit(int_pin->gpio, int_pin->pin, &gpio_config);
+    }
 
     // Configure the Transceiver Pins, Settings except for CLK:
     // Slew Rate Field: Fast Slew Rate, Drive Strength, R0/5, Speed max(200MHz)
     // Open Drain Disabled, Pull Enabled, Pull 100K Ohm Pull Up
     // Hysteresis Disabled
-
-    for (int i = 0; i < ARRAY_SIZE(iomux_table_enet); i++) {
+    for (int i = 0; i < iomux_table_size; i++) {
         IOMUXC_SetPinMux(IOTE.muxRegister, IOTE.muxMode, IOTE.inputRegister, IOTE.inputDaisy, IOTE.configRegister, IOTE.inputOnfield);
         IOMUXC_SetPinConfig(IOTE.muxRegister, IOTE.muxMode, IOTE.inputRegister, IOTE.inputDaisy, IOTE.configRegister, IOTE.configValue);
     }
 
-    const clock_enet_pll_config_t config = {
-        .enableClkOutput = phy_clock, .enableClkOutput25M = false, .loopDivider = 1
-    };
-    CLOCK_InitEnetPll(&config);
-
-    IOMUXC_EnableMode(IOMUXC_GPR, kIOMUXC_GPR_ENET1RefClkMode, false); // Do not use the 25 MHz MII clock
-    IOMUXC_EnableMode(IOMUXC_GPR, kIOMUXC_GPR_ENET1TxClkOutputDir, phy_clock);  // Set the clock pad direction
-
-    // Reset transceiver
-    // pull up the ENET_INT before RESET.
-    #ifdef ENET_INT_PIN
-    GPIO_WritePinOutput(int_pin->gpio, int_pin->pin, 1);
-    #endif
-
-    #ifdef ENET_RESET_PIN
-    GPIO_WritePinOutput(reset_pin->gpio, reset_pin->pin, 0);
-    mp_hal_delay_us(1000);
-    GPIO_WritePinOutput(reset_pin->gpio, reset_pin->pin, 1);
-    mp_hal_delay_us(1000);
-    #endif
+    // Reset the transceiver
+    if (reset_pin != NULL) {
+        GPIO_PinWrite(reset_pin->gpio, reset_pin->pin, 0);
+        mp_hal_delay_us(ENET_RESET_LOW_TIME_US);
+        GPIO_PinWrite(reset_pin->gpio, reset_pin->pin, 1);
+        mp_hal_delay_us(ENET_RESET_WAIT_TIME_US);
+    }
+}
 
-    mp_hal_get_mac(0, hw_addr);
+// eth_phy_init: Initilaize the PHY interface
+STATIC void eth_phy_init(phy_handle_t *phyHandle, phy_config_t *phy_config,
+    phy_speed_t *speed, phy_duplex_t *duplex, uint32_t phy_settle_time) {
 
-    phyHandle.ops = phy_ops;
-    phyConfig.phyAddr = phy_addr;
-    phyConfig.autoNeg = true;
-    mdioHandle.resource.base = ENET;
-    mdioHandle.resource.csrClock_Hz = CLOCK_GetFreq(kCLOCK_IpgClk);
-
-    // Init the PHY interface & negotiate the speed
     bool link = false;
     bool autonego = false;
-    phy_speed_t speed = kENET_MiiSpeed100M;
-    phy_duplex_t duplex = kENET_MiiFullDuplex;
+    phy_config->autoNeg = true;
 
-
-    status_t status = PHY_Init(&phyHandle, &phyConfig);
+    status_t status = PHY_Init(phyHandle, phy_config);
     if (status == kStatus_Success) {
-        if (phyConfig.autoNeg) {
-            uint64_t t = ticks_us64() + PHY_AUTONEGO_TIMEOUT_US;
-            // Wait for auto-negotiation success and link up
-            do {
-                PHY_GetAutoNegotiationStatus(&phyHandle, &autonego);
-                PHY_GetLinkStatus(&phyHandle, &link);
-                if (autonego && link) {
-                    break;
-                }
-            } while (ticks_us64() < t);
-            if (!autonego) {
-                mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("PHY Auto-negotiation failed."));
+        uint64_t t = ticks_us64() + PHY_AUTONEGO_TIMEOUT_US;
+        // Wait for auto-negotiation success and link up
+        do {
+            PHY_GetAutoNegotiationStatus(phyHandle, &autonego);
+            PHY_GetLinkStatus(phyHandle, &link);
+            if (autonego && link) {
+                break;
             }
-            PHY_GetLinkSpeedDuplex(&phyHandle, &speed, &duplex);
-        } else {
-            PHY_SetLinkSpeedDuplex(&phyHandle, speed, duplex);
+        } while (ticks_us64() < t);
+        if (!autonego) {
+            mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("PHY Auto-negotiation failed."));
         }
+        PHY_GetLinkSpeedDuplex(phyHandle, speed, duplex);
     } else {
         mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("PHY Init failed."));
     }
+    mp_hal_delay_us(phy_settle_time);
+}
+
+// eth_init: Set up GPIO and the transceiver
+void eth_init_0(eth_t *self, int eth_id, const phy_operations_t *phy_ops, int phy_addr, bool phy_clock) {
+    // Configuration values
+    enet_config_t enet_config;
+
+    phy_config_t phy_config = {0};
+
+    uint32_t source_clock = eth_clock_init(eth_id, phy_clock);
+
+    eth_gpio_init(iomux_table_enet, ARRAY_SIZE(iomux_table_enet), ENET_RESET_PIN, ENET_INT_PIN);
+
+    mp_hal_get_mac(0, hw_addr);
+
+    // Init the PHY interface & negotiate the speed
+    phyHandle.ops = phy_ops;
+    phy_config.phyAddr = phy_addr;
+    phyHandle.mdioHandle = &mdioHandle;
+    mdioHandle.resource.base = ENET;
+    mdioHandle.resource.csrClock_Hz = source_clock;
+
+    phy_speed_t speed = kENET_MiiSpeed100M;
+    phy_duplex_t duplex = kENET_MiiFullDuplex;
+    eth_phy_init(&phyHandle, &phy_config, &speed, &duplex, PHY_SETTLE_TIME_US);
 
     ENET_Reset(ENET);
     ENET_GetDefaultConfig(&enet_config);
@@ -297,14 +390,70 @@ void eth_init(eth_t *self, int mac_idx, const phy_operations_t *phy_ops, int phy
     // Set interrupt
     enet_config.interrupt |= ENET_TX_INTERRUPT | ENET_RX_INTERRUPT;
 
-    ENET_Init(ENET, &g_handle, &enet_config, &buffConfig[0], hw_addr, CLOCK_GetFreq(kCLOCK_IpgClk));
+    ENET_Init(ENET, &g_handle, &enet_config, &buffConfig[0], hw_addr, source_clock);
     ENET_SetCallback(&g_handle, eth_irq_handler, (void *)self);
     NVIC_SetPriority(ENET_IRQn, IRQ_PRI_PENDSV);
     ENET_EnableInterrupts(ENET, ENET_RX_INTERRUPT);
     ENET_ClearInterruptStatus(ENET, ENET_TX_INTERRUPT | ENET_RX_INTERRUPT | ENET_ERR_INTERRUPT);
+    NVIC_SetPriority(ENET_IRQn, IRQ_PRI_PENDSV);
+    ENET_EnableInterrupts(ENET, ENET_RX_INTERRUPT);
     ENET_ActiveRead(ENET);
 }
 
+#if defined(ENET_DUAL_PORT)
+
+// eth_init: Set up GPIO and the transceiver
+void eth_init_1(eth_t *self, int eth_id, const phy_operations_t *phy_ops, int phy_addr, bool phy_clock) {
+    // Configuration values
+    enet_config_t enet_config;
+
+    phy_config_t phy_config = {0};
+
+    uint32_t source_clock = eth_clock_init(eth_id, phy_clock);
+
+    eth_gpio_init(iomux_table_enet_1, ARRAY_SIZE(iomux_table_enet_1), ENET_1_RESET_PIN, ENET_1_INT_PIN);
+
+    #if defined MIMXRT117x_SERIES
+    NVIC_SetPriority(ENET_1G_MAC0_Tx_Rx_1_IRQn, IRQ_PRI_PENDSV);
+    NVIC_SetPriority(ENET_1G_MAC0_Tx_Rx_2_IRQn, IRQ_PRI_PENDSV);
+    NVIC_SetPriority(ENET_1G_IRQn, IRQ_PRI_PENDSV);
+    EnableIRQ(ENET_1G_MAC0_Tx_Rx_1_IRQn);
+    EnableIRQ(ENET_1G_MAC0_Tx_Rx_2_IRQn);
+    phy_speed_t speed = kENET_MiiSpeed1000M;
+    #else
+    NVIC_SetPriority(ENET2_IRQn, IRQ_PRI_PENDSV);
+    phy_speed_t speed = kENET_MiiSpeed100M;
+    #endif
+
+    mp_hal_get_mac(1, hw_addr_1);
+
+    // Init the PHY interface & negotiate the speed
+    phyHandle_1.ops = phy_ops;
+    phy_config.phyAddr = phy_addr;
+    phyHandle_1.mdioHandle = &mdioHandle_1;
+    mdioHandle_1.resource.base = ENET_1;
+    mdioHandle_1.resource.csrClock_Hz = source_clock;
+
+    phy_duplex_t duplex = kENET_MiiFullDuplex;
+    eth_phy_init(&phyHandle_1, &phy_config, &speed, &duplex, PHY_SETTLE_TIME_US_1);
+
+    ENET_Reset(ENET_1);
+    ENET_GetDefaultConfig(&enet_config);
+    enet_config.miiSpeed = (enet_mii_speed_t)speed;
+    enet_config.miiDuplex = (enet_mii_duplex_t)duplex;
+    // Enable checksum generation by the ENET controller
+    enet_config.txAccelerConfig = kENET_TxAccelIpCheckEnabled | kENET_TxAccelProtoCheckEnabled;
+    // Set interrupt
+    enet_config.interrupt = ENET_TX_INTERRUPT | ENET_RX_INTERRUPT;
+
+    ENET_Init(ENET_1, &g_handle_1, &enet_config, &buffConfig_1[0], hw_addr_1, source_clock);
+    ENET_SetCallback(&g_handle_1, eth_irq_handler, (void *)self);
+    ENET_ClearInterruptStatus(ENET_1, ENET_TX_INTERRUPT | ENET_RX_INTERRUPT | ENET_ERR_INTERRUPT);
+    ENET_EnableInterrupts(ENET_1, ENET_RX_INTERRUPT);
+    ENET_ActiveRead(ENET_1);
+}
+
+#endif
 // Initialize the phy interface
 STATIC int eth_mac_init(eth_t *self) {
     return 0;
@@ -312,6 +461,8 @@ STATIC int eth_mac_init(eth_t *self) {
 
 // Deinit the interface
 STATIC void eth_mac_deinit(eth_t *self) {
+    // Just as a reminder: Calling ENET_Deinit() twice causes the board to stall
+    // with a bus error. Reason unclear. So don't do that for now (or ever).
 }
 
 void eth_set_trace(eth_t *self, uint32_t value) {
@@ -332,7 +483,7 @@ STATIC err_t eth_send_frame_blocking(ENET_Type *base, enet_handle_t *handle, uin
         if (status != kStatus_ENET_TxFrameBusy) {
             break;
         }
-        ticks_delay_us64(100);
+        ticks_delay_us64(base == ENET ? 100 : 20);
     }
     return status;
 }
@@ -340,12 +491,20 @@ STATIC err_t eth_send_frame_blocking(ENET_Type *base, enet_handle_t *handle, uin
 STATIC err_t eth_netif_output(struct netif *netif, struct pbuf *p) {
     // This function should always be called from a context where PendSV-level IRQs are disabled
     status_t status;
+    ENET_Type *enet = ENET;
+    enet_handle_t *handle = &g_handle;
+
+    #if defined ENET_DUAL_PORT
+    if (netif->state == &eth_instance1) {
+        enet = ENET_1;
+        handle = &g_handle_1;
+    }
+    #endif
 
-    LINK_STATS_INC(link.xmit);
     eth_trace(netif->state, (size_t)-1, p, NETUTILS_TRACE_IS_TX | NETUTILS_TRACE_NEWLINE);
 
     if (p->next == NULL) {
-        status = eth_send_frame_blocking(ENET, &g_handle, p->payload, p->len);
+        status = eth_send_frame_blocking(enet, handle, p->payload, p->len);
     } else {
         // frame consists of several parts. Copy them together and send them
         size_t length = 0;
@@ -356,7 +515,7 @@ STATIC err_t eth_netif_output(struct netif *netif, struct pbuf *p) {
             length += p->len;
             p = p->next;
         }
-        status = eth_send_frame_blocking(ENET, &g_handle, tx_frame, length);
+        status = eth_send_frame_blocking(enet, handle, tx_frame, length);
     }
     return status == kStatus_Success ? ERR_OK : ERR_BUF;
 }
@@ -378,20 +537,27 @@ STATIC err_t eth_netif_init(struct netif *netif) {
 }
 
 STATIC void eth_lwip_init(eth_t *self) {
+    struct netif *n = &self->netif;
     ip_addr_t ipconfig[4];
-    IP4_ADDR(&ipconfig[0], 192, 168, 0, 2);
+
+    self->netif.hwaddr_len = 6;
+    if (self == &eth_instance0) {
+        memcpy(self->netif.hwaddr, hw_addr, 6);
+        IP4_ADDR(&ipconfig[0], 192, 168, 0, 2);
+    #if defined ENET_DUAL_PORT
+    } else {
+        memcpy(self->netif.hwaddr, hw_addr_1, 6);
+        IP4_ADDR(&ipconfig[0], 192, 168, 0, 3);
+    #endif
+    }
     IP4_ADDR(&ipconfig[1], 255, 255, 255, 0);
     IP4_ADDR(&ipconfig[2], 192, 168, 0, 1);
     IP4_ADDR(&ipconfig[3], 8, 8, 8, 8);
 
-    self->netif.hwaddr_len = 6;
-    memcpy(self->netif.hwaddr, hw_addr, 6);
-
     MICROPY_PY_LWIP_ENTER
 
-    struct netif *n = &self->netif;
     n->name[0] = 'e';
-    n->name[1] = '0';
+    n->name[1] = (self == &eth_instance0 ? '0' : '1');
     netif_add(n, &ipconfig[0], &ipconfig[1], &ipconfig[2], self, eth_netif_init, ethernet_input);
     netif_set_hostname(n, "MPY");
     netif_set_default(n);
@@ -433,7 +599,11 @@ int eth_link_status(eth_t *self) {
         }
     } else {
         bool link;
+        #if defined ENET_DUAL_PORT
+        PHY_GetLinkStatus(self == &eth_instance0 ? &phyHandle : &phyHandle_1, &link);
+        #else
         PHY_GetLinkStatus(&phyHandle, &link);
+        #endif
         if (link) {
             return 1; // link up
         } else {
@@ -463,6 +633,10 @@ int eth_stop(eth_t *self) {
 }
 
 void eth_low_power_mode(eth_t *self, bool enable) {
+    #if defined ENET_DUAL_PORT
+    ENET_EnableSleepMode(self == &eth_instance0 ? ENET : ENET_1, enable);
+    #else
     ENET_EnableSleepMode(ENET, enable);
+    #endif
 }
 #endif // defined(MICROPY_HW_ETH_MDC)
diff --git a/ports/mimxrt/eth.h b/ports/mimxrt/eth.h
index b225d00492486..afb5d5edf375e 100644
--- a/ports/mimxrt/eth.h
+++ b/ports/mimxrt/eth.h
@@ -28,9 +28,14 @@
 #define MICROPY_INCLUDED_MIMXRT_ETH_H
 
 typedef struct _eth_t eth_t;
-extern eth_t eth_instance;
+extern eth_t eth_instance0;
+extern eth_t eth_instance1;
+void eth_init_0(eth_t *self, int mac_idx, const phy_operations_t *phy_ops, int phy_addr, bool phy_clock);
+
+#if defined(ENET_DUAL_PORT)
+void eth_init_1(eth_t *self, int mac_idx, const phy_operations_t *phy_ops, int phy_addr, bool phy_clock);
+#endif
 
-void eth_init(eth_t *self, int mac_idx, const phy_operations_t *phy_ops, int phy_addr, bool phy_clock);
 void eth_set_trace(eth_t *self, uint32_t value);
 struct netif *eth_netif(eth_t *self);
 int eth_link_status(eth_t *self);
@@ -43,6 +48,7 @@ enum {
     PHY_DP83825,
     PHY_DP83848,
     PHY_LAN8720,
+    PHY_RTL8211F,
 };
 
 enum {
diff --git a/ports/mimxrt/hal/flexspi_hyper_flash.c b/ports/mimxrt/hal/flexspi_hyper_flash.c
index c7b41658a4988..a9f17f2d1c19c 100644
--- a/ports/mimxrt/hal/flexspi_hyper_flash.c
+++ b/ports/mimxrt/hal/flexspi_hyper_flash.c
@@ -51,11 +51,11 @@ __attribute__((always_inline)) static inline void clock_disable_clock(clock_ip_n
 
 static void SetFlexSPIDiv(uint32_t div) __attribute__((section(".ram_functions")));
 static void SetFlexSPIDiv(uint32_t div) {
-    FLEXSPI_Enable(FLEXSPI, false);
+    FLEXSPI_Enable(BOARD_FLEX_SPI, false);
     clock_disable_clock(kCLOCK_FlexSpi);
     clock_set_div(kCLOCK_FlexspiDiv, div); /* flexspi clock 332M, DDR mode, internal clock 166M. */
     clock_enable_clock(kCLOCK_FlexSpi);
-    FLEXSPI_Enable(FLEXSPI, true);
+    FLEXSPI_Enable(BOARD_FLEX_SPI, true);
 }
 
 status_t flexspi_nor_hyperbus_read(FLEXSPI_Type *base, uint32_t addr, uint32_t *buffer, uint32_t bytes) __attribute__((section(".ram_functions")));
diff --git a/ports/mimxrt/hal/flexspi_hyper_flash.h b/ports/mimxrt/hal/flexspi_hyper_flash.h
index dbd028fd6f718..fe9acea429f62 100644
--- a/ports/mimxrt/hal/flexspi_hyper_flash.h
+++ b/ports/mimxrt/hal/flexspi_hyper_flash.h
@@ -26,14 +26,24 @@
 #ifndef MICROPY_INCLUDED_MIMXRT_HAL_FLEXSPI_HYPER_FLASH_H
 #define MICROPY_INCLUDED_MIMXRT_HAL_FLEXSPI_HYPER_FLASH_H
 
-#include "fsl_flexspi.h"
 #include "mpconfigboard.h"
-#include BOARD_FLASH_CONFIG_HEADER_H
+#include "flexspi_flash_config.h"
+#include "fsl_flexspi.h"
+// #include BOARD_FLASH_CONFIG_HEADER_H
+
+#if defined MIMXRT117x_SERIES
+#define BOARD_FLEX_SPI FLEXSPI1
+#define BOARD_FLEX_SPI_ADDR_BASE FlexSPI1_AMBA_BASE
+#else
+#define BOARD_FLEX_SPI FLEXSPI
+#define BOARD_FLEX_SPI_ADDR_BASE FlexSPI_AMBA_BASE
+#endif
 
 // Defined in boards flash_config.c
 extern flexspi_nor_config_t qspiflash_config;
 
 status_t flexspi_nor_hyperflash_cfi(FLEXSPI_Type *base);
+void flexspi_hyper_flash_init(void);
 void flexspi_nor_update_lut(void);
 status_t flexspi_nor_flash_erase_sector(FLEXSPI_Type *base, uint32_t address);
 status_t flexspi_nor_flash_page_program(FLEXSPI_Type *base, uint32_t address, const uint32_t *src, uint32_t size);
diff --git a/ports/mimxrt/hal/flexspi_nor_flash.c b/ports/mimxrt/hal/flexspi_nor_flash.c
index 8c04150d12738..48792ec487eb8 100644
--- a/ports/mimxrt/hal/flexspi_nor_flash.c
+++ b/ports/mimxrt/hal/flexspi_nor_flash.c
@@ -193,7 +193,7 @@ status_t flexspi_nor_flash_page_program(FLEXSPI_Type *base, uint32_t dstAddr, co
 
     status = flexspi_nor_wait_bus_busy(base);
 
-    flexspi_nor_reset(FLEXSPI);
+    flexspi_nor_reset(BOARD_FLEX_SPI);
 
     return status;
 }
diff --git a/ports/mimxrt/hal/flexspi_nor_flash.h b/ports/mimxrt/hal/flexspi_nor_flash.h
index f8c31488a9883..69d57da6919e4 100644
--- a/ports/mimxrt/hal/flexspi_nor_flash.h
+++ b/ports/mimxrt/hal/flexspi_nor_flash.h
@@ -27,36 +27,23 @@
 #define MICROPY_INCLUDED_MIMXRT_HAL_FLEXSPI_NOR_FLASH_H
 
 #include "fsl_flexspi.h"
-#include "mpconfigboard.h"
 #include BOARD_FLASH_CONFIG_HEADER_H
 
+#if defined MIMXRT117x_SERIES
+#define BOARD_FLEX_SPI FLEXSPI1
+#define BOARD_FLEX_SPI_ADDR_BASE FlexSPI1_AMBA_BASE
+#else
+#define BOARD_FLEX_SPI FLEXSPI
+#define BOARD_FLEX_SPI_ADDR_BASE FlexSPI_AMBA_BASE
+#endif
+
 // Defined in boards flash_config.c
 extern flexspi_nor_config_t qspiflash_config;
 
 status_t flexspi_nor_get_vendor_id(FLEXSPI_Type *base, uint8_t *vendorId);
+status_t flexspi_nor_init(void);
 void flexspi_nor_update_lut(void);
 status_t flexspi_nor_flash_erase_sector(FLEXSPI_Type *base, uint32_t address);
 status_t flexspi_nor_flash_page_program(FLEXSPI_Type *base, uint32_t address, const uint32_t *src, uint32_t size);
 
-static inline uint32_t flexspi_get_frequency(void) {
-    uint32_t div;
-    uint32_t fre;
-
-    /* Clock divider:
-       000 divided by 1
-       001 divided by 2
-       010 divided by 3
-       011 divided by 4
-       100 divided by 5
-       101 divided by 6
-       110 divided by 7
-       111 divided by 8
-     */
-    div = CLOCK_GetDiv(kCLOCK_FlexspiDiv);
-    /* Get frequency */
-    fre = CLOCK_GetFreq(kCLOCK_Usb1PllPfd0Clk) / (div + 0x01U);
-
-    return fre;
-}
-
 #endif // MICROPY_INCLUDED_MIMXRT_HAL_FLEXSPI_NOR_FLASH_H
diff --git a/ports/mimxrt/hal/phy/device/phyrtl8211f/fsl_phyrtl8211f.c b/ports/mimxrt/hal/phy/device/phyrtl8211f/fsl_phyrtl8211f.c
new file mode 100644
index 0000000000000..0c6cf82dae4a6
--- /dev/null
+++ b/ports/mimxrt/hal/phy/device/phyrtl8211f/fsl_phyrtl8211f.c
@@ -0,0 +1,387 @@
+/*
+ * Copyright 2020 NXP
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#include "fsl_phyrtl8211f.h"
+
+/*******************************************************************************
+ * Definitions
+ ******************************************************************************/
+
+/*! @brief Defines the PHY RTL8211F vendor defined registers. */
+#define PHY_SPECIFIC_STATUS_REG 0x1AU /*!< The PHY specific status register. */
+#define PHY_PAGE_SELECT_REG     0x1FU /*!< The PHY page select register. */
+
+/*! @brief Defines the PHY RTL8211F ID number. */
+#define PHY_CONTROL_ID1 0x001CU /*!< The PHY ID1 . */
+
+/*! @brief Defines the mask flag in specific status register. */
+#define PHY_SSTATUS_LINKSTATUS_MASK 0x04U /*!< The PHY link status mask. */
+#define PHY_SSTATUS_LINKSPEED_MASK  0x30U /*!< The PHY link speed mask. */
+#define PHY_SSTATUS_LINKDUPLEX_MASK 0x08U /*!< The PHY link duplex mask. */
+#define PHY_SSTATUS_LINKSPEED_SHIFT 4U    /*!< The link speed shift */
+
+/*! @brief Defines the PHY RTL8211F extra page and the registers in specified page. */
+#define PHY_PAGE_RGMII_TXRX_DELAY_ADDR 0xD08U /*!< The register page including RGMII TX/RX delay setting. */
+#define PHY_RGMII_TX_DELAY_REG         0x11U  /*!< The RGMII TXC delay register. */
+#define PHY_RGMII_RX_DELAY_REG         0x15U  /*!< The RGMII RXC delay register. */
+#define PHY_RGMII_TX_DELAY_MASK        0x100U /*!< The RGMII TXC delay mask. */
+#define PHY_RGMII_RX_DELAY_MASK        0x8U   /*!< The RGMII RXC delay mask. */
+
+/*! @brief MDIO MMD Devices .*/
+#define PHY_MDIO_MMD_PCS 3U
+#define PHY_MDIO_MMD_AN  7U
+
+/*! @brief MDIO MMD Physical Coding layer device registers .*/
+#define PHY_MDIO_PCS_EEE_CAP 0x14U /* EEE capability */
+
+/*! @brief MDIO MMD AutoNegotiation device registers .*/
+#define PHY_MDIO_AN_EEE_ADV 0x3CU /* EEE advertisement */
+
+/*! @brief MDIO MMD EEE mask flags. (common for adv and cap) */
+#define PHY_MDIO_EEE_100TX 0x2U
+#define PHY_MDIO_EEE_1000T 0x4U
+
+/*! @brief Defines the timeout macro. */
+#define PHY_READID_TIMEOUT_COUNT 1000U
+
+/*******************************************************************************
+ * Prototypes
+ ******************************************************************************/
+
+static status_t PHY_RTL8211F_MMD_SetDevice(phy_handle_t *handle,
+    uint8_t device,
+    uint16_t addr,
+    phy_mmd_access_mode_t mode);
+static inline status_t PHY_RTL8211F_MMD_ReadData(phy_handle_t *handle, uint32_t *data);
+static inline status_t PHY_RTL8211F_MMD_WriteData(phy_handle_t *handle, uint32_t data);
+static status_t PHY_RTL8211F_MMD_Read(phy_handle_t *handle, uint8_t device, uint16_t addr, uint32_t *data);
+static status_t PHY_RTL8211F_MMD_Write(phy_handle_t *handle, uint8_t device, uint16_t addr, uint32_t data);
+
+/*******************************************************************************
+ * Variables
+ ******************************************************************************/
+
+const phy_operations_t phyrtl8211f_ops = {.phyInit = PHY_RTL8211F_Init,
+                                          .phyWrite = PHY_RTL8211F_Write,
+                                          .phyRead = PHY_RTL8211F_Read,
+                                          .getAutoNegoStatus = PHY_RTL8211F_GetAutoNegotiationStatus,
+                                          .getLinkStatus = PHY_RTL8211F_GetLinkStatus,
+                                          .getLinkSpeedDuplex = PHY_RTL8211F_GetLinkSpeedDuplex,
+                                          .setLinkSpeedDuplex = PHY_RTL8211F_SetLinkSpeedDuplex,
+                                          .enableLoopback = PHY_RTL8211F_EnableLoopback};
+
+/*******************************************************************************
+ * Code
+ ******************************************************************************/
+
+status_t PHY_RTL8211F_Init(phy_handle_t *handle, const phy_config_t *config) {
+    uint32_t counter = PHY_READID_TIMEOUT_COUNT;
+    status_t result;
+    uint32_t regValue = 0U;
+
+    /* Init MDIO interface. */
+    MDIO_Init(handle->mdioHandle);
+
+    /* Assign phy address. */
+    handle->phyAddr = config->phyAddr;
+
+    /* Check PHY ID. */
+    do
+    {
+        result = MDIO_Read(handle->mdioHandle, handle->phyAddr, PHY_ID1_REG, &regValue);
+        if (result != kStatus_Success) {
+            return result;
+        }
+        counter--;
+    } while ((regValue != PHY_CONTROL_ID1) && (counter != 0U));
+
+    if (counter == 0U) {
+        return kStatus_Fail;
+    }
+
+    /* Reset PHY. */
+    result = MDIO_Write(handle->mdioHandle, handle->phyAddr, PHY_BASICCONTROL_REG, PHY_BCTL_RESET_MASK);
+    if (result != kStatus_Success) {
+        return result;
+    }
+
+    /* The RGMII specifies output TXC/RXC and TXD/RXD without any clock skew. Need to add skew on clock line
+       to make sure the other side sample right data. This can also be done in PCB traces. */
+    result = MDIO_Write(handle->mdioHandle, handle->phyAddr, PHY_PAGE_SELECT_REG, PHY_PAGE_RGMII_TXRX_DELAY_ADDR);
+    if (result != kStatus_Success) {
+        return result;
+    }
+    /* Set Tx Delay. */
+    result = MDIO_Read(handle->mdioHandle, handle->phyAddr, PHY_RGMII_TX_DELAY_REG, &regValue);
+    if (result == kStatus_Success) {
+        regValue |= PHY_RGMII_TX_DELAY_MASK;
+        result = MDIO_Write(handle->mdioHandle, handle->phyAddr, PHY_RGMII_TX_DELAY_REG, regValue);
+        if (result != kStatus_Success) {
+            return result;
+        }
+    } else {
+        return result;
+    }
+    /* Set Rx Delay. */
+    result = MDIO_Read(handle->mdioHandle, handle->phyAddr, PHY_RGMII_RX_DELAY_REG, &regValue);
+    if (result == kStatus_Success) {
+        regValue |= PHY_RGMII_RX_DELAY_MASK;
+        result = MDIO_Write(handle->mdioHandle, handle->phyAddr, PHY_RGMII_RX_DELAY_REG, regValue);
+        if (result != kStatus_Success) {
+            return result;
+        }
+    } else {
+        return result;
+    }
+    /* Restore to default page 0 */
+    result = MDIO_Write(handle->mdioHandle, handle->phyAddr, PHY_PAGE_SELECT_REG, 0x0);
+    if (result != kStatus_Success) {
+        return result;
+    }
+
+    /* Energy Efficient Ethernet configuration */
+    if (config->enableEEE) {
+        /* Get capabilities */
+        result = PHY_RTL8211F_MMD_Read(handle, PHY_MDIO_MMD_PCS, PHY_MDIO_PCS_EEE_CAP, &regValue);
+        if (result == kStatus_Success) {
+            /* Enable EEE for 100TX and 1000T */
+            result = PHY_RTL8211F_MMD_Write(handle, PHY_MDIO_MMD_AN, PHY_MDIO_AN_EEE_ADV,
+                regValue & (PHY_MDIO_EEE_1000T | PHY_MDIO_EEE_100TX));
+        }
+    } else {
+        result = PHY_RTL8211F_MMD_Write(handle, PHY_MDIO_MMD_AN, PHY_MDIO_AN_EEE_ADV, 0);
+    }
+    if (result != kStatus_Success) {
+        return result;
+    }
+
+    if (config->autoNeg) {
+        /* Set the auto-negotiation. */
+        result =
+            MDIO_Write(handle->mdioHandle, handle->phyAddr, PHY_AUTONEG_ADVERTISE_REG,
+                PHY_100BASETX_FULLDUPLEX_MASK | PHY_100BASETX_HALFDUPLEX_MASK | PHY_10BASETX_FULLDUPLEX_MASK |
+                PHY_10BASETX_HALFDUPLEX_MASK | PHY_IEEE802_3_SELECTOR_MASK);
+        if (result == kStatus_Success) {
+            result = MDIO_Write(handle->mdioHandle, handle->phyAddr, PHY_1000BASET_CONTROL_REG,
+                PHY_1000BASET_FULLDUPLEX_MASK);
+            if (result == kStatus_Success) {
+                result = MDIO_Read(handle->mdioHandle, handle->phyAddr, PHY_BASICCONTROL_REG, &regValue);
+                if (result == kStatus_Success) {
+                    result = MDIO_Write(handle->mdioHandle, handle->phyAddr, PHY_BASICCONTROL_REG,
+                        (regValue | PHY_BCTL_AUTONEG_MASK | PHY_BCTL_RESTART_AUTONEG_MASK));
+                }
+            }
+        }
+    } else {
+        /* Disable isolate mode */
+        result = MDIO_Read(handle->mdioHandle, handle->phyAddr, PHY_BASICCONTROL_REG, &regValue);
+        if (result != kStatus_Success) {
+            return result;
+        }
+        regValue &= PHY_BCTL_ISOLATE_MASK;
+        result = MDIO_Write(handle->mdioHandle, handle->phyAddr, PHY_BASICCONTROL_REG, regValue);
+        if (result != kStatus_Success) {
+            return result;
+        }
+
+        /* Disable the auto-negotiation and set user-defined speed/duplex configuration. */
+        result = PHY_RTL8211F_SetLinkSpeedDuplex(handle, config->speed, config->duplex);
+    }
+    return result;
+}
+
+status_t PHY_RTL8211F_Write(phy_handle_t *handle, uint32_t phyReg, uint32_t data) {
+    return MDIO_Write(handle->mdioHandle, handle->phyAddr, phyReg, data);
+}
+
+status_t PHY_RTL8211F_Read(phy_handle_t *handle, uint32_t phyReg, uint32_t *dataPtr) {
+    return MDIO_Read(handle->mdioHandle, handle->phyAddr, phyReg, dataPtr);
+}
+
+status_t PHY_RTL8211F_GetAutoNegotiationStatus(phy_handle_t *handle, bool *status) {
+    assert(status);
+
+    status_t result;
+    uint32_t regValue;
+
+    *status = false;
+
+    /* Check auto negotiation complete. */
+    result = MDIO_Read(handle->mdioHandle, handle->phyAddr, PHY_BASICSTATUS_REG, &regValue);
+    if (result == kStatus_Success) {
+        if ((regValue & PHY_BSTATUS_AUTONEGCOMP_MASK) != 0U) {
+            *status = true;
+        }
+    }
+    return result;
+}
+
+status_t PHY_RTL8211F_GetLinkStatus(phy_handle_t *handle, bool *status) {
+    assert(status);
+
+    status_t result;
+    uint32_t regValue;
+
+    /* Read the basic status register. */
+    result = MDIO_Read(handle->mdioHandle, handle->phyAddr, PHY_SPECIFIC_STATUS_REG, &regValue);
+    if (result == kStatus_Success) {
+        if ((PHY_SSTATUS_LINKSTATUS_MASK & regValue) != 0U) {
+            /* Link up. */
+            *status = true;
+        } else {
+            /* Link down. */
+            *status = false;
+        }
+    }
+    return result;
+}
+
+status_t PHY_RTL8211F_GetLinkSpeedDuplex(phy_handle_t *handle, phy_speed_t *speed, phy_duplex_t *duplex) {
+    assert(!((speed == NULL) && (duplex == NULL)));
+
+    status_t result;
+    uint32_t regValue;
+
+    /* Read the status register. */
+    result = MDIO_Read(handle->mdioHandle, handle->phyAddr, PHY_SPECIFIC_STATUS_REG, &regValue);
+    if (result == kStatus_Success) {
+        if (speed != NULL) {
+            switch ((regValue & PHY_SSTATUS_LINKSPEED_MASK) >> PHY_SSTATUS_LINKSPEED_SHIFT)
+            {
+                case (uint32_t)kPHY_Speed10M:
+                    *speed = kPHY_Speed10M;
+                    break;
+                case (uint32_t)kPHY_Speed100M:
+                    *speed = kPHY_Speed100M;
+                    break;
+                case (uint32_t)kPHY_Speed1000M:
+                    *speed = kPHY_Speed1000M;
+                    break;
+                default:
+                    *speed = kPHY_Speed10M;
+                    break;
+            }
+        }
+
+        if (duplex != NULL) {
+            if ((regValue & PHY_SSTATUS_LINKDUPLEX_MASK) != 0U) {
+                *duplex = kPHY_FullDuplex;
+            } else {
+                *duplex = kPHY_HalfDuplex;
+            }
+        }
+    }
+    return result;
+}
+
+status_t PHY_RTL8211F_SetLinkSpeedDuplex(phy_handle_t *handle, phy_speed_t speed, phy_duplex_t duplex) {
+    status_t result;
+    uint32_t regValue;
+
+    result = MDIO_Read(handle->mdioHandle, handle->phyAddr, PHY_BASICCONTROL_REG, &regValue);
+    if (result == kStatus_Success) {
+        /* Disable the auto-negotiation and set according to user-defined configuration. */
+        regValue &= ~PHY_BCTL_AUTONEG_MASK;
+        if (speed == kPHY_Speed1000M) {
+            regValue &= PHY_BCTL_SPEED0_MASK;
+            regValue |= PHY_BCTL_SPEED1_MASK;
+        } else if (speed == kPHY_Speed100M) {
+            regValue |= PHY_BCTL_SPEED0_MASK;
+            regValue &= ~PHY_BCTL_SPEED1_MASK;
+        } else {
+            regValue &= ~PHY_BCTL_SPEED0_MASK;
+            regValue &= ~PHY_BCTL_SPEED1_MASK;
+        }
+        if (duplex == kPHY_FullDuplex) {
+            regValue |= PHY_BCTL_DUPLEX_MASK;
+        } else {
+            regValue &= ~PHY_BCTL_DUPLEX_MASK;
+        }
+        result = MDIO_Write(handle->mdioHandle, handle->phyAddr, PHY_BASICCONTROL_REG, regValue);
+    }
+    return result;
+}
+
+status_t PHY_RTL8211F_EnableLoopback(phy_handle_t *handle, phy_loop_t mode, phy_speed_t speed, bool enable) {
+    /* This PHY only supports local loopback. */
+    assert(mode == kPHY_LocalLoop);
+
+    status_t result;
+    uint32_t regValue;
+
+    /* Set the loop mode. */
+    if (enable) {
+        if (speed == kPHY_Speed1000M) {
+            regValue = PHY_BCTL_SPEED1_MASK | PHY_BCTL_DUPLEX_MASK | PHY_BCTL_LOOP_MASK;
+        } else if (speed == kPHY_Speed100M) {
+            regValue = PHY_BCTL_SPEED0_MASK | PHY_BCTL_DUPLEX_MASK | PHY_BCTL_LOOP_MASK;
+        } else {
+            regValue = PHY_BCTL_DUPLEX_MASK | PHY_BCTL_LOOP_MASK;
+        }
+        result = MDIO_Write(handle->mdioHandle, handle->phyAddr, PHY_BASICCONTROL_REG, regValue);
+    } else {
+        /* First read the current status in control register. */
+        result = MDIO_Read(handle->mdioHandle, handle->phyAddr, PHY_BASICCONTROL_REG, &regValue);
+        if (result == kStatus_Success) {
+            regValue &= ~PHY_BCTL_LOOP_MASK;
+            result = MDIO_Write(handle->mdioHandle, handle->phyAddr, PHY_BASICCONTROL_REG,
+                (regValue | PHY_BCTL_RESTART_AUTONEG_MASK));
+        }
+    }
+    return result;
+}
+
+static status_t PHY_RTL8211F_MMD_SetDevice(phy_handle_t *handle,
+    uint8_t device,
+    uint16_t addr,
+    phy_mmd_access_mode_t mode) {
+    status_t result = kStatus_Success;
+
+    /* Set Function mode of address access(b00) and device address. */
+    result = MDIO_Write(handle->mdioHandle, handle->phyAddr, PHY_MMD_ACCESS_CONTROL_REG, device);
+    if (result != kStatus_Success) {
+        return result;
+    }
+
+    /* Set register address. */
+    result = MDIO_Write(handle->mdioHandle, handle->phyAddr, PHY_MMD_ACCESS_DATA_REG, addr);
+    if (result != kStatus_Success) {
+        return result;
+    }
+
+    /* Set Function mode of data access(b01~11) and device address. */
+    result =
+        MDIO_Write(handle->mdioHandle, handle->phyAddr, PHY_MMD_ACCESS_CONTROL_REG, (uint32_t)mode | (uint32_t)device);
+    return result;
+}
+
+static inline status_t PHY_RTL8211F_MMD_ReadData(phy_handle_t *handle, uint32_t *data) {
+    return MDIO_Read(handle->mdioHandle, handle->phyAddr, PHY_MMD_ACCESS_DATA_REG, data);
+}
+
+static inline status_t PHY_RTL8211F_MMD_WriteData(phy_handle_t *handle, uint32_t data) {
+    return MDIO_Write(handle->mdioHandle, handle->phyAddr, PHY_MMD_ACCESS_DATA_REG, data);
+}
+
+static status_t PHY_RTL8211F_MMD_Read(phy_handle_t *handle, uint8_t device, uint16_t addr, uint32_t *data) {
+    status_t result = kStatus_Success;
+    result = PHY_RTL8211F_MMD_SetDevice(handle, device, addr, kPHY_MMDAccessNoPostIncrement);
+    if (result == kStatus_Success) {
+        result = PHY_RTL8211F_MMD_ReadData(handle, data);
+    }
+    return result;
+}
+
+static status_t PHY_RTL8211F_MMD_Write(phy_handle_t *handle, uint8_t device, uint16_t addr, uint32_t data) {
+    status_t result = kStatus_Success;
+
+    result = PHY_RTL8211F_MMD_SetDevice(handle, device, addr, kPHY_MMDAccessNoPostIncrement);
+    if (result == kStatus_Success) {
+        result = PHY_RTL8211F_MMD_WriteData(handle, data);
+    }
+    return result;
+}
diff --git a/ports/mimxrt/hal/phy/device/phyrtl8211f/fsl_phyrtl8211f.h b/ports/mimxrt/hal/phy/device/phyrtl8211f/fsl_phyrtl8211f.h
new file mode 100644
index 0000000000000..225c249a6e3d5
--- /dev/null
+++ b/ports/mimxrt/hal/phy/device/phyrtl8211f/fsl_phyrtl8211f.h
@@ -0,0 +1,163 @@
+/*
+ * Copyright 2020 NXP
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+/*****************************************************************************
+ * PHY RTL8211F driver change log
+ *****************************************************************************/
+
+/*!
+@page driver_log Driver Change Log
+
+@section phyrtl8211 PHYRTL8211F
+  The current PHYRTL8211F driver version is 2.0.0.
+
+  - 2.0.0
+    - Initial version.
+*/
+
+#ifndef _FSL_PHYRTL8211F_H_
+#define _FSL_PHYRTL8211F_H_
+
+#include "fsl_phy.h"
+
+/*!
+ * @addtogroup phy_driver
+ * @{
+ */
+
+/*******************************************************************************
+ * Definitions
+ ******************************************************************************/
+
+/*! @brief PHY driver version */
+#define FSL_PHY_DRIVER_VERSION (MAKE_VERSION(2, 0, 0))
+
+/*! @brief PHY operations structure. */
+extern const phy_operations_t phyrtl8211f_ops;
+
+/*******************************************************************************
+ * API
+ ******************************************************************************/
+
+#if defined(__cplusplus)
+extern "C" {
+#endif
+
+/*!
+ * @name PHY Driver
+ * @{
+ */
+
+/*!
+ * @brief Initializes PHY.
+ *
+ *  This function initialize PHY.
+ *
+ * @param handle       PHY device handle.
+ * @param config       Pointer to structure of phy_config_t.
+ * @retval kStatus_Success  PHY initialization succeeds
+ * @retval kStatus_Fail  PHY initialization fails
+ * @retval kStatus_PHY_SMIVisitTimeout  PHY SMI visit time out
+ */
+status_t PHY_RTL8211F_Init(phy_handle_t *handle, const phy_config_t *config);
+
+/*!
+ * @brief PHY Write function. This function writes data over the SMI to
+ * the specified PHY register. This function is called by all PHY interfaces.
+ *
+ * @param handle  PHY device handle.
+ * @param phyReg  The PHY register.
+ * @param data    The data written to the PHY register.
+ * @retval kStatus_Success     PHY write success
+ * @retval kStatus_PHY_SMIVisitTimeout  PHY SMI visit time out
+ */
+status_t PHY_RTL8211F_Write(phy_handle_t *handle, uint32_t phyReg, uint32_t data);
+
+/*!
+ * @brief PHY Read function. This interface reads data over the SMI from the
+ * specified PHY register. This function is called by all PHY interfaces.
+ *
+ * @param handle   PHY device handle.
+ * @param phyReg   The PHY register.
+ * @param dataPtr  The address to store the data read from the PHY register.
+ * @retval kStatus_Success  PHY read success
+ * @retval kStatus_PHY_SMIVisitTimeout  PHY SMI visit time out
+ */
+status_t PHY_RTL8211F_Read(phy_handle_t *handle, uint32_t phyReg, uint32_t *dataPtr);
+
+/*!
+ * @brief Gets the PHY auto-negotiation status.
+ *
+ * @param handle   PHY device handle.
+ * @param status   The auto-negotiation status of the PHY.
+ *         - true the auto-negotiation is over.
+ *         - false the auto-negotiation is on-going or not started.
+ * @retval kStatus_Success   PHY gets status success
+ * @retval kStatus_PHY_SMIVisitTimeout  PHY SMI visit time out
+ */
+status_t PHY_RTL8211F_GetAutoNegotiationStatus(phy_handle_t *handle, bool *status);
+
+/*!
+ * @brief Gets the PHY link status.
+ *
+ * @param handle   PHY device handle.
+ * @param status   The link up or down status of the PHY.
+ *         - true the link is up.
+ *         - false the link is down.
+ * @retval kStatus_Success   PHY gets link status success
+ * @retval kStatus_PHY_SMIVisitTimeout  PHY SMI visit time out
+ */
+status_t PHY_RTL8211F_GetLinkStatus(phy_handle_t *handle, bool *status);
+
+/*!
+ * @brief Gets the PHY link speed and duplex.
+ *
+ * @brief This function gets the speed and duplex mode of PHY. User can give one of speed
+ * and duplex address paramter and set the other as NULL if only wants to get one of them.
+ *
+ * @param handle   PHY device handle.
+ * @param speed    The address of PHY link speed.
+ * @param duplex   The link duplex of PHY.
+ * @retval kStatus_Success   PHY gets link speed and duplex success
+ * @retval kStatus_PHY_SMIVisitTimeout  PHY SMI visit time out
+ */
+status_t PHY_RTL8211F_GetLinkSpeedDuplex(phy_handle_t *handle, phy_speed_t *speed, phy_duplex_t *duplex);
+
+/*!
+ * @brief Sets the PHY link speed and duplex.
+ *
+ * @param handle   PHY device handle.
+ * @param speed    Specified PHY link speed.
+ * @param duplex   Specified PHY link duplex.
+ * @retval kStatus_Success   PHY gets status success
+ * @retval kStatus_PHY_SMIVisitTimeout  PHY SMI visit time out
+ */
+status_t PHY_RTL8211F_SetLinkSpeedDuplex(phy_handle_t *handle, phy_speed_t speed, phy_duplex_t duplex);
+
+/*!
+ * @brief Enables/disables PHY loopback.
+ *
+ * @param handle   PHY device handle.
+ * @param mode     The loopback mode to be enabled, please see "phy_loop_t".
+ * All loopback modes should not be set together, when one loopback mode is set
+ * another should be disabled.
+ * @param speed    PHY speed for loopback mode.
+ * @param enable   True to enable, false to disable.
+ * @retval kStatus_Success  PHY loopback success
+ * @retval kStatus_PHY_SMIVisitTimeout  PHY SMI visit time out
+ */
+status_t PHY_RTL8211F_EnableLoopback(phy_handle_t *handle, phy_loop_t mode, phy_speed_t speed, bool enable);
+
+/* @} */
+
+#if defined(__cplusplus)
+}
+#endif
+
+/*! @}*/
+
+#endif /* _FSL_PHY_H_ */
diff --git a/ports/mimxrt/hal/resethandler_MIMXRT10xx.S b/ports/mimxrt/hal/resethandler_MIMXRT10xx.S
index 8fe061103388b..efca1a7ec6d48 100644
--- a/ports/mimxrt/hal/resethandler_MIMXRT10xx.S
+++ b/ports/mimxrt/hal/resethandler_MIMXRT10xx.S
@@ -37,6 +37,13 @@ Reset_Handler:
     str r1,[r0]                  /* store FLEXRAM configuration value to IOMUXC_GPR17 */
     dsb
     isb
+#if defined MIMXRT117x_SERIES
+    ldr r0, =__iomux_gpr18_adr   /* load IOMUXC_GPR18 register address to R0 */
+    ldr r1, =__iomux_gpr18_value /* move FlexRAM configuration value to R1 */
+    str r1,[r0]                  /* store FLEXRAM configuration value to IOMUXC_GPR18 */
+    dsb
+    isb
+#endif
     ldr r0, =__iomux_gpr16_adr  /* load IOMUXC_GPR16 register address to R0 */
     ldr r1,[r0]                 /* load IOMUXC_GPR16 register value to R1 */
     orr r1, r1, #4              /* set corresponding FLEXRAM_BANK_CFG_SEL bit */
diff --git a/ports/mimxrt/machine_adc.c b/ports/mimxrt/machine_adc.c
index d63157d36efba..36e5fafc984b8 100644
--- a/ports/mimxrt/machine_adc.c
+++ b/ports/mimxrt/machine_adc.c
@@ -29,7 +29,12 @@
 #include "py/runtime.h"
 #include "py/mphal.h"
 
+#if defined(MIMXRT117x_SERIES)
+#include "fsl_lpadc.h"
+#else
 #include "fsl_adc.h"
+#endif
+
 #include "fsl_gpio.h"
 #include "fsl_iomuxc.h"
 
@@ -72,12 +77,14 @@ STATIC mp_obj_t adc_obj_make_new(const mp_obj_type_t *type, size_t n_args, size_
     ADC_Type *adc_instance = pin->adc_list[0].instance;  // NOTE: we only use the first ADC assignment - multiple assignments are not supported for now
     uint8_t channel = pin->adc_list[0].channel;
 
+    #if 0 // done in adc_read_u16
     // Configure ADC peripheral channel
     adc_channel_config_t channel_config = {
         .channelNumber = (uint32_t)channel,
         .enableInterruptOnConversionCompleted = false,
     };
     ADC_SetChannelConfig(adc_instance, 0UL, &channel_config);  // NOTE: we always choose channel group '0' since we only perform software triggered conversion
+    #endif
 
     // Create ADC Instance
     machine_adc_obj_t *o = mp_obj_malloc(machine_adc_obj_t, &machine_adc_type);
@@ -90,6 +97,43 @@ STATIC mp_obj_t adc_obj_make_new(const mp_obj_type_t *type, size_t n_args, size_
 }
 
 // read_u16()
+#if defined(MIMXRT117x_SERIES)
+STATIC mp_obj_t machine_adc_read_u16(mp_obj_t self_in) {
+    machine_adc_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    lpadc_conv_command_config_t adc_config;
+    lpadc_conv_trigger_config_t trigger_config;
+
+    // Set ADC configuration
+    LPADC_GetDefaultConvCommandConfig(&adc_config);
+    adc_config.channelNumber = self->channel;
+    adc_config.sampleScaleMode = kLPADC_SamplePartScale;
+    LPADC_SetConvCommandConfig(self->adc, 1, &adc_config);
+
+    // Set Trigger mode
+    LPADC_GetDefaultConvTriggerConfig(&trigger_config);
+    trigger_config.targetCommandId = 1;
+    LPADC_SetConvTriggerConfig(self->adc, 0U, &trigger_config);
+
+    // Measure input voltage
+    LPADC_DoSoftwareTrigger(self->adc, 1U);
+    lpadc_conv_result_t result_struct;
+    while (!LPADC_GetConvResult(self->adc, &result_struct)) {
+    }
+
+    return MP_OBJ_NEW_SMALL_INT(result_struct.convValue * 2);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_adc_read_u16_obj, machine_adc_read_u16);
+
+void machine_adc_init(void) {
+    lpadc_config_t adc_config;        // Set ADC configuration
+    LPADC_GetDefaultConfig(&adc_config);
+    adc_config.enableAnalogPreliminary = true;
+    adc_config.referenceVoltageSource = kLPADC_ReferenceVoltageAlt1;
+    LPADC_Init(LPADC1, &adc_config);
+}
+
+#else
+
 STATIC mp_obj_t machine_adc_read_u16(mp_obj_t self_in) {
     machine_adc_obj_t *self = MP_OBJ_TO_PTR(self_in);
 
@@ -111,21 +155,6 @@ STATIC mp_obj_t machine_adc_read_u16(mp_obj_t self_in) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_adc_read_u16_obj, machine_adc_read_u16);
 
-STATIC const mp_rom_map_elem_t adc_locals_dict_table[] = {
-    { MP_ROM_QSTR(MP_QSTR_read_u16), MP_ROM_PTR(&machine_adc_read_u16_obj) },
-};
-
-STATIC MP_DEFINE_CONST_DICT(adc_locals_dict, adc_locals_dict_table);
-
-MP_DEFINE_CONST_OBJ_TYPE(
-    machine_adc_type,
-    MP_QSTR_ADC,
-    MP_TYPE_FLAG_NONE,
-    make_new, adc_obj_make_new,
-    print, adc_obj_print,
-    locals_dict, &adc_locals_dict
-    );
-
 void machine_adc_init(void) {
     for (int i = 1; i < sizeof(adc_bases) / sizeof(ADC_Type *); ++i) {
         ADC_Type *adc_instance = adc_bases[i];
@@ -143,3 +172,19 @@ void machine_adc_init(void) {
         }
     }
 }
+#endif
+
+STATIC const mp_rom_map_elem_t adc_locals_dict_table[] = {
+    { MP_ROM_QSTR(MP_QSTR_read_u16), MP_ROM_PTR(&machine_adc_read_u16_obj) },
+};
+
+STATIC MP_DEFINE_CONST_DICT(adc_locals_dict, adc_locals_dict_table);
+
+MP_DEFINE_CONST_OBJ_TYPE(
+    machine_adc_type,
+    MP_QSTR_ADC,
+    MP_TYPE_FLAG_NONE,
+    make_new, adc_obj_make_new,
+    print, adc_obj_print,
+    locals_dict, &adc_locals_dict
+    );
diff --git a/ports/mimxrt/machine_i2c.c b/ports/mimxrt/machine_i2c.c
index f00ba6b1ba768..c0a3dee98a406 100644
--- a/ports/mimxrt/machine_i2c.c
+++ b/ports/mimxrt/machine_i2c.c
@@ -30,6 +30,7 @@
 #include "extmod/machine_i2c.h"
 #include "modmachine.h"
 #include CLOCK_CONFIG_H
+#include "pin.h"
 
 #include "fsl_iomuxc.h"
 #include "fsl_lpi2c.h"
@@ -37,13 +38,6 @@
 #define DEFAULT_I2C_FREQ        (400000)
 #define DEFAULT_I2C_DRIVE       (6)
 
-// Select USB1 PLL (480 MHz) as master lpi2c clock source
-#define LPI2C_CLOCK_SOURCE_SELECT (0U)
-// Clock divider for master lpi2c clock source
-#define LPI2C_CLOCK_SOURCE_DIVIDER (1U)
-// Get frequency of lpi2c clock = 30 MHz
-#define LPI2C_CLOCK_FREQUENCY ((CLOCK_GetFreq(kCLOCK_Usb1PllClk) / 8) / (LPI2C_CLOCK_SOURCE_DIVIDER + 1U))
-
 typedef struct _machine_i2c_obj_t {
     mp_obj_base_t base;
     LPI2C_Type *i2c_inst;
diff --git a/ports/mimxrt/machine_i2s.c b/ports/mimxrt/machine_i2s.c
index 1733140fb57ee..32daad0853aba 100644
--- a/ports/mimxrt/machine_i2s.c
+++ b/ports/mimxrt/machine_i2s.c
@@ -99,7 +99,6 @@
 
 #define NUM_I2S_USER_FORMATS (4)
 #define I2S_RX_FRAME_SIZE_IN_BYTES (8)
-#define AUDIO_PLL_CLOCK (2U)
 #define SAI_CHANNEL_0 (0)
 #define SAI_NUM_AUDIO_CHANNELS (2U)
 
@@ -208,42 +207,69 @@ STATIC const int8_t i2s_frame_map[NUM_I2S_USER_FORMATS][I2S_RX_FRAME_SIZE_IN_BYT
 // PLL output frequency = 24MHz * (.loopDivider + .numerator/.denominator)
 
 // Configuration 1: for sampling frequencies [Hz]:  8000, 12000, 16000, 24000, 32000, 48000
-// Clock frequency = 786,432,480 Hz
+// Clock frequency = 786,432,000 Hz = 48000 * 64 * 256
 STATIC const clock_audio_pll_config_t audioPllConfig_8000_48000 = {
     .loopDivider = 32,          // PLL loop divider. Valid range for DIV_SELECT divider value: 27~54
     .postDivider = 1,           // Divider after the PLL, should only be 1, 2, 4, 8, 16
-    .numerator = 76802,         // 30 bit numerator of fractional loop divider
+    .numerator = 76800,         // 30 bit numerator of fractional loop divider
     .denominator = 100000,      // 30 bit denominator of fractional loop divider
+    #if !defined(MIMXRT117x_SERIES)
     .src = kCLOCK_PllClkSrc24M  // Pll clock source
+    #endif
 };
 
 // Configuration 2: for sampling frequencies [Hz]:  11025, 22050, 44100
-// Clock frequency = 722,534,880
+// Clock frequency = 722,534,400 = 44100 * 64 * 256
 STATIC const clock_audio_pll_config_t audioPllConfig_11025_44100 = {
     .loopDivider = 30,          // PLL loop divider. Valid range for DIV_SELECT divider value: 27~54
     .postDivider = 1,           // Divider after the PLL, should only be 1, 2, 4, 8, 16
-    .numerator = 10562,         // 30 bit numerator of fractional loop divider
+    .numerator = 10560,         // 30 bit numerator of fractional loop divider
     .denominator = 100000,      // 30 bit denominator of fractional loop divider
+    #if !defined(MIMXRT117x_SERIES)
     .src = kCLOCK_PllClkSrc24M  // Pll clock source
+    #endif
 };
 
+#if defined(MIMXRT117x_SERIES)
+// for 1176 the pre_div value is used for post_div of the Audio PLL,
+// which is 2**n: 0->1, 1->2, 2->4, 3->8, 4->16, 5->32
+// The divider is 8 bit and must be given as n (not n-1)
+// So the total division factor is given by (2**p) * d
 STATIC const i2s_clock_config_t clock_config_map[] = {
-    {kSAI_SampleRate8KHz, &audioPllConfig_8000_48000, 5, 63},
-    {kSAI_SampleRate11025Hz, &audioPllConfig_11025_44100, 3, 63},
-    {kSAI_SampleRate12KHz, &audioPllConfig_8000_48000, 3, 63},
-    {kSAI_SampleRate16KHz, &audioPllConfig_8000_48000, 2, 63},
-    {kSAI_SampleRate22050Hz, &audioPllConfig_11025_44100, 1, 63},
-    {kSAI_SampleRate24KHz, &audioPllConfig_8000_48000, 1, 63},
-    {kSAI_SampleRate32KHz, &audioPllConfig_8000_48000, 1, 47},
-    {kSAI_SampleRate44100Hz, &audioPllConfig_11025_44100, 0, 63},
-    {kSAI_SampleRate48KHz, &audioPllConfig_8000_48000, 0, 63}
+    {kSAI_SampleRate8KHz, &audioPllConfig_8000_48000, 1, 192},     // 384
+    {kSAI_SampleRate11025Hz, &audioPllConfig_11025_44100, 1, 128}, // 256
+    {kSAI_SampleRate12KHz, &audioPllConfig_8000_48000, 1, 128},    // 256
+    {kSAI_SampleRate16KHz, &audioPllConfig_8000_48000, 0, 192},    // 192
+    {kSAI_SampleRate22050Hz, &audioPllConfig_11025_44100, 0, 128}, // 128
+    {kSAI_SampleRate24KHz, &audioPllConfig_8000_48000, 0, 128},    // 128
+    {kSAI_SampleRate32KHz, &audioPllConfig_8000_48000, 0, 96},     // 96
+    {kSAI_SampleRate44100Hz, &audioPllConfig_11025_44100, 0, 64},  // 64
+    {kSAI_SampleRate48KHz, &audioPllConfig_8000_48000, 0, 64}      // 64
+};
+
+STATIC const clock_root_t i2s_clock_mux[] = I2S_CLOCK_MUX;
+#else
+// for 10xx the total division factor is given by (p + 1) * (d + 1)
+STATIC const i2s_clock_config_t clock_config_map[] = {
+    {kSAI_SampleRate8KHz, &audioPllConfig_8000_48000, 5, 63},      // 384
+    {kSAI_SampleRate11025Hz, &audioPllConfig_11025_44100, 3, 63},  // 256
+    {kSAI_SampleRate12KHz, &audioPllConfig_8000_48000, 3, 63},     // 256
+    {kSAI_SampleRate16KHz, &audioPllConfig_8000_48000, 2, 63},     // 192
+    {kSAI_SampleRate22050Hz, &audioPllConfig_11025_44100, 1, 63},  // 128
+    {kSAI_SampleRate24KHz, &audioPllConfig_8000_48000, 1, 63},     // 128
+    {kSAI_SampleRate32KHz, &audioPllConfig_8000_48000, 1, 47},     // 96
+    {kSAI_SampleRate44100Hz, &audioPllConfig_11025_44100, 0, 63},  // 64
+    {kSAI_SampleRate48KHz, &audioPllConfig_8000_48000, 0, 63}      // 64
 };
 
-STATIC const I2S_Type *i2s_base_ptr[] = I2S_BASE_PTRS;
 STATIC const clock_mux_t i2s_clock_mux[] = I2S_CLOCK_MUX;
 STATIC const clock_div_t i2s_clock_pre_div[] = I2S_CLOCK_PRE_DIV;
 STATIC const clock_div_t i2s_clock_div[] = I2S_CLOCK_DIV;
 STATIC const iomuxc_gpr_mode_t i2s_iomuxc_gpr_mode[] = I2S_IOMUXC_GPR_MODE;
+#endif
+
+STATIC const I2S_Type *i2s_base_ptr[] = I2S_BASE_PTRS;
+
 STATIC const dma_request_source_t i2s_dma_req_src_tx[] = I2S_DMA_REQ_SRC_TX;
 STATIC const dma_request_source_t i2s_dma_req_src_rx[] = I2S_DMA_REQ_SRC_RX;
 STATIC const gpio_map_t i2s_gpio_map[] = I2S_GPIO_MAP;
@@ -674,10 +700,24 @@ STATIC void edma_i2s_callback(edma_handle_t *handle, void *userData, bool transf
 
 STATIC bool i2s_init(machine_i2s_obj_t *self) {
 
+    #if defined(MIMXRT117x_SERIES)
+    clock_audio_pll_config_t pll_config = *get_pll_config(self->rate);
+    pll_config.postDivider = get_clock_pre_divider(self->rate);
+    CLOCK_InitAudioPll(&pll_config);
+    CLOCK_SetRootClockMux(i2s_clock_mux[self->i2s_id], I2S_AUDIO_PLL_CLOCK);
+    CLOCK_SetRootClockDiv(i2s_clock_mux[self->i2s_id], get_clock_divider(self->rate));
+    uint32_t clock_freq = CLOCK_GetFreq(kCLOCK_AudioPllOut) / get_clock_divider(self->rate);
+
+    #else
+
     CLOCK_InitAudioPll(get_pll_config(self->rate));
-    CLOCK_SetMux(i2s_clock_mux[self->i2s_id], AUDIO_PLL_CLOCK);
+    CLOCK_SetMux(i2s_clock_mux[self->i2s_id], I2S_AUDIO_PLL_CLOCK);
     CLOCK_SetDiv(i2s_clock_pre_div[self->i2s_id], get_clock_pre_divider(self->rate));
     CLOCK_SetDiv(i2s_clock_div[self->i2s_id], get_clock_divider(self->rate));
+    uint32_t clock_freq =
+        (CLOCK_GetFreq(kCLOCK_AudioPllClk) / (get_clock_divider(self->rate) + 1U) /
+            (get_clock_pre_divider(self->rate) + 1U));
+    #endif
 
     if (!set_iomux(self->sck, SCK, self->i2s_id)) {
         return false;
@@ -695,7 +735,24 @@ STATIC bool i2s_init(machine_i2s_obj_t *self) {
         if (!set_iomux(self->mck, MCK, self->i2s_id)) {
             return false;
         }
+        #if defined(MIMXRT117x_SERIES)
+        switch (self->i2s_id) {
+            case 1:
+                IOMUXC_GPR->GPR0 |= IOMUXC_GPR_GPR0_SAI1_MCLK_DIR_MASK;
+                break;
+            case 2:
+                IOMUXC_GPR->GPR1 |= IOMUXC_GPR_GPR1_SAI2_MCLK_DIR_MASK;
+                break;
+            case 3:
+                IOMUXC_GPR->GPR2 |= IOMUXC_GPR_GPR2_SAI3_MCLK_DIR_MASK;
+                break;
+            case 4:
+                IOMUXC_GPR->GPR2 |= IOMUXC_GPR_GPR2_SAI4_MCLK_DIR_MASK;
+                break;
+        }
+        #else
         IOMUXC_EnableMode(IOMUXC_GPR, i2s_iomuxc_gpr_mode[self->i2s_id], true);
+        #endif
     }
 
     self->dma_channel = allocate_dma_channel();
@@ -743,10 +800,6 @@ STATIC bool i2s_init(machine_i2s_obj_t *self) {
         return false; // should never happen
     }
 
-    uint32_t clock_freq =
-        (CLOCK_GetFreq(kCLOCK_AudioPllClk) / (get_clock_divider(self->rate) + 1U) /
-            (get_clock_pre_divider(self->rate) + 1U));
-
     SAI_TxSetBitClockRate(self->i2s_inst, clock_freq, self->rate, get_dma_bits(self->mode, self->bits),
         SAI_NUM_AUDIO_CHANNELS);
     SAI_RxSetBitClockRate(self->i2s_inst, clock_freq, self->rate, get_dma_bits(self->mode, self->bits),
diff --git a/ports/mimxrt/machine_pin.c b/ports/mimxrt/machine_pin.c
index bb2c820100be5..d44e649964f72 100644
--- a/ports/mimxrt/machine_pin.c
+++ b/ports/mimxrt/machine_pin.c
@@ -149,6 +149,16 @@ void GPIO5_Combined_16_31_IRQHandler(void) {
     call_handler(gpiobases[5], 5, 16);
 }
 
+#if defined(MIMXRT117x_SERIES)
+void GPIO6_Combined_0_15_IRQHandler(void) {
+    call_handler(gpiobases[6], 6, 0);
+}
+
+void GPIO6_Combined_16_31_IRQHandler(void) {
+    call_handler(gpiobases[6], 6, 16);
+}
+#endif
+
 // Deinit all pin IRQ handlers.
 void machine_pin_irq_deinit(void) {
     for (int i = 0; i < ARRAY_SIZE(MP_STATE_PORT(machine_pin_irq_objects)); ++i) {
diff --git a/ports/mimxrt/machine_pwm.c b/ports/mimxrt/machine_pwm.c
index d5bb029e689eb..661ec1665894f 100644
--- a/ports/mimxrt/machine_pwm.c
+++ b/ports/mimxrt/machine_pwm.c
@@ -214,7 +214,11 @@ STATIC void configure_flexpwm(machine_pwm_obj_t *self) {
     pwm_signal_param_u16_t pwmSignal;
 
     // Initialize PWM module.
+    #if defined(MIMXRT117x_SERIES)
+    uint32_t pwmSourceClockInHz = CLOCK_GetRootClockFreq(kCLOCK_Root_Bus);
+    #else
     uint32_t pwmSourceClockInHz = CLOCK_GetFreq(kCLOCK_IpgClk);
+    #endif
 
     int prescale = calc_prescaler(pwmSourceClockInHz, self->freq);
     if (prescale < 0) {
@@ -296,10 +300,15 @@ STATIC void configure_flexpwm(machine_pwm_obj_t *self) {
 STATIC void configure_qtmr(machine_pwm_obj_t *self) {
     qtmr_config_t qtmrConfig;
     int prescale;
+    #if defined(MIMXRT117x_SERIES)
+    uint32_t pwmSourceClockInHz = CLOCK_GetRootClockFreq(kCLOCK_Root_Bus);
+    #else
+    uint32_t pwmSourceClockInHz = CLOCK_GetFreq(kCLOCK_IpgClk);
+    #endif
 
     TMR_Type *instance = (TMR_Type *)self->instance;
 
-    prescale = calc_prescaler(CLOCK_GetFreq(kCLOCK_IpgClk), self->freq);
+    prescale = calc_prescaler(pwmSourceClockInHz, self->freq);
     if (prescale < 0) {
         mp_raise_ValueError(MP_ERROR_TEXT(ERRMSG_FREQ));
     }
@@ -311,7 +320,7 @@ STATIC void configure_qtmr(machine_pwm_obj_t *self) {
     }
     // Set up the PWM channel
     if (QTMR_SetupPwm_u16(instance, self->channel1, self->freq, self->duty_u16,
-        self->invert, CLOCK_GetFreq(kCLOCK_IpgClk) / (1 << prescale), self->is_init) == kStatus_Fail) {
+        self->invert, pwmSourceClockInHz / (1 << prescale), self->is_init) == kStatus_Fail) {
         mp_raise_ValueError(MP_ERROR_TEXT(ERRMSG_INIT));
     }
     // Start the output
@@ -325,7 +334,9 @@ STATIC void configure_pwm(machine_pwm_obj_t *self) {
     static bool set_frequency = true;
     // set the frequency only once
     if (set_frequency) {
+        #if !defined(MIMXRT117x_SERIES)
         CLOCK_SetDiv(kCLOCK_IpgDiv, 0x3); // Set IPG PODF to 3, divide by 4
+        #endif
         set_frequency = false;
     }
 
diff --git a/ports/mimxrt/machine_sdcard.c b/ports/mimxrt/machine_sdcard.c
index 9254faf14a441..35e1ef7eeb4d9 100644
--- a/ports/mimxrt/machine_sdcard.c
+++ b/ports/mimxrt/machine_sdcard.c
@@ -30,7 +30,12 @@
 #include "py/mperrno.h"
 #include "extmod/vfs.h"
 #include "ticks.h"
+
+#if defined(MIMXRT1170x_SERIES)
+#include "cm7/fsl_cache.h"
+#else
 #include "fsl_cache.h"
+#endif
 
 #include "sdcard.h"
 
diff --git a/ports/mimxrt/machine_spi.c b/ports/mimxrt/machine_spi.c
index a3a6bb414edde..d6aff2a329a0f 100644
--- a/ports/mimxrt/machine_spi.c
+++ b/ports/mimxrt/machine_spi.c
@@ -45,6 +45,14 @@
 #define DEFAULT_SPI_FIRSTBIT    (kLPSPI_MsbFirst)
 #define DEFAULT_SPI_DRIVE       (6)
 
+#define CLOCK_DIVIDER           (1)
+
+#if defined(MIMXRT117x_SERIES)
+#define LPSPI_DMAMUX            DMAMUX0
+#else
+#define LPSPI_DMAMUX            DMAMUX
+#endif
+
 #define MICROPY_HW_SPI_NUM MP_ARRAY_SIZE(spi_index_table)
 
 #define SCK (iomux_table[index])
diff --git a/ports/mimxrt/machine_uart.c b/ports/mimxrt/machine_uart.c
index a0706c8f4fcae..ac9351da8a30e 100644
--- a/ports/mimxrt/machine_uart.c
+++ b/ports/mimxrt/machine_uart.c
@@ -33,6 +33,7 @@
 #include "fsl_lpuart.h"
 #include "fsl_iomuxc.h"
 #include CLOCK_CONFIG_H
+#include "pin.h"
 
 #define DEFAULT_UART_BAUDRATE (115200)
 #define DEFAULT_BUFFER_SIZE (256)
@@ -221,7 +222,7 @@ STATIC mp_obj_t machine_uart_init_helper(machine_uart_obj_t *self, size_t n_args
             self->timeout_char = min_timeout_char;
         }
 
-        LPUART_Init(self->lpuart, &self->config, BOARD_BOOTCLOCKRUN_UART_CLK_ROOT); // ??
+        LPUART_Init(self->lpuart, &self->config, BOARD_BOOTCLOCKRUN_UART_CLK_ROOT);
         LPUART_TransferCreateHandle(self->lpuart, &self->handle,  LPUART_UserCallback, self);
         uint8_t *buffer = m_new(uint8_t, rxbuf_len + 1);
         LPUART_TransferStartRingBuffer(self->lpuart, &self->handle, buffer, rxbuf_len);
diff --git a/ports/mimxrt/main.c b/ports/mimxrt/main.c
index b81a44e2788e0..907de373dee6a 100644
--- a/ports/mimxrt/main.c
+++ b/ports/mimxrt/main.c
@@ -58,9 +58,6 @@ int main(void) {
     led_init();
     pendsv_init();
 
-    mp_stack_set_top(&_estack);
-    mp_stack_set_limit(&_estack - &_sstack - 1024);
-
     #if MICROPY_PY_LWIP
     // lwIP doesn't allow to reinitialise itself by subsequent calls to this function
     // because the system timeout list (next_timeout) is only ever reset by BSS clearing.
@@ -69,10 +66,14 @@ int main(void) {
     #if LWIP_MDNS_RESPONDER
     mdns_resp_init();
     #endif
+
     systick_enable_dispatch(SYSTICK_DISPATCH_LWIP, mod_network_lwip_poll_wrapper);
     #endif
 
     for (;;) {
+        mp_stack_set_top(&_estack);
+        mp_stack_set_limit(&_estack - &_sstack - 1024);
+
         gc_init(&_gc_heap_start, &_gc_heap_end);
         mp_init();
 
diff --git a/ports/mimxrt/mbedtls/mbedtls_port.c b/ports/mimxrt/mbedtls/mbedtls_port.c
index e2002274b1c48..a9db174726adf 100644
--- a/ports/mimxrt/mbedtls/mbedtls_port.c
+++ b/ports/mimxrt/mbedtls/mbedtls_port.c
@@ -26,14 +26,14 @@
 
 #ifdef MICROPY_SSL_MBEDTLS
 
-#include "fsl_trng.h"
 #include "mbedtls_config.h"
+void trng_random_data(unsigned char *output, size_t len);
 
 int mbedtls_hardware_poll(void *data, unsigned char *output, size_t len, size_t *olen) {
 
     // assumes that TRNG_Init was called during startup
     *olen = len;
-    TRNG_GetRandomData(TRNG, output, len);
+    trng_random_data(output, len);
 
     return 0;
 }
diff --git a/ports/mimxrt/mimxrt_flash.c b/ports/mimxrt/mimxrt_flash.c
index fd2e7558f9f8d..536fb6098170e 100644
--- a/ports/mimxrt/mimxrt_flash.c
+++ b/ports/mimxrt/mimxrt_flash.c
@@ -68,7 +68,7 @@ status_t flash_erase_block(uint32_t erase_addr) {
     SCB_CleanInvalidateDCache();
     SCB_DisableDCache();
     __disable_irq();
-    status = flexspi_nor_flash_erase_sector(FLEXSPI, erase_addr);
+    status = flexspi_nor_flash_erase_sector(BOARD_FLEX_SPI, erase_addr);
     __enable_irq();
     SCB_EnableDCache();
     return status;
@@ -93,7 +93,7 @@ status_t flash_write_block(uint32_t dest_addr, const uint8_t *src, uint32_t leng
             size = length;
         }
         __disable_irq();
-        status = flexspi_nor_flash_page_program(FLEXSPI, dest_addr, (uint32_t *)src, size);
+        status = flexspi_nor_flash_page_program(BOARD_FLEX_SPI, dest_addr, (uint32_t *)src, size);
         __enable_irq();
         if (status != kStatus_Success) {
             break;
@@ -112,15 +112,15 @@ STATIC mp_obj_t mimxrt_flash_make_new(const mp_obj_type_t *type, size_t n_args,
 
     // Upload the custom flash configuration
     // This should be performed by the boot ROM but for some reason it is not.
-    FLEXSPI_UpdateLUT(FLEXSPI, 0,
+    FLEXSPI_UpdateLUT(BOARD_FLEX_SPI, 0,
         qspiflash_config.memConfig.lookupTable,
         ARRAY_SIZE(qspiflash_config.memConfig.lookupTable));
 
-    // Configure FLEXSPI IP FIFO access.
-    FLEXSPI->MCR0 &= ~(FLEXSPI_MCR0_ARDFEN_MASK);
-    FLEXSPI->MCR0 &= ~(FLEXSPI_MCR0_ATDFEN_MASK);
-    FLEXSPI->MCR0 |= FLEXSPI_MCR0_ARDFEN(0);
-    FLEXSPI->MCR0 |= FLEXSPI_MCR0_ATDFEN(0);
+    // Configure BOARD_FLEX_SPI IP FIFO access.
+    BOARD_FLEX_SPI->MCR0 &= ~(FLEXSPI_MCR0_ARDFEN_MASK);
+    BOARD_FLEX_SPI->MCR0 &= ~(FLEXSPI_MCR0_ATDFEN_MASK);
+    BOARD_FLEX_SPI->MCR0 |= FLEXSPI_MCR0_ARDFEN(0);
+    BOARD_FLEX_SPI->MCR0 |= FLEXSPI_MCR0_ATDFEN(0);
 
     // Update information based on linker symbols.
     mimxrt_flash_obj.flash_base = MICROPY_HW_FLASH_STORAGE_BASE;
@@ -142,7 +142,7 @@ STATIC mp_obj_t mimxrt_flash_readblocks(size_t n_args, const mp_obj_t *args) {
     if (n_args == 4) {
         offset += mp_obj_get_int(args[3]);
     }
-    memcpy(bufinfo.buf, (uint8_t *)(FlexSPI_AMBA_BASE + self->flash_base + offset), bufinfo.len);
+    memcpy(bufinfo.buf, (uint8_t *)(BOARD_FLEX_SPI_ADDR_BASE + self->flash_base + offset), bufinfo.len);
     return mp_const_none;
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mimxrt_flash_readblocks_obj, 3, 4, mimxrt_flash_readblocks);
diff --git a/ports/mimxrt/mimxrt_sdram.c b/ports/mimxrt/mimxrt_sdram.c
index 8c336bb607ef4..c6c1776a554c0 100644
--- a/ports/mimxrt/mimxrt_sdram.c
+++ b/ports/mimxrt/mimxrt_sdram.c
@@ -29,123 +29,176 @@
 #include "modmachine.h"
 #include "fsl_semc.h"
 #include "fsl_iomuxc.h"
+#include "fsl_clock.h"
 
 // Linker symbols
 extern uint8_t __sdram_start;
 
+#if defined(MIMXRT117x_SERIES)
+// Pull Up, High drive strength
+#define SDRAM_PIN_CONFIG  (0x07UL)
+#else
+// Pull up 22K, high slew rate
+#define SDRAM_PIN_CONFIG  (0xE1UL)
+#endif
 
 void mimxrt_sdram_init(void) {
+
+    #if !defined(MIMXRT117x_SERIES)
     // Set Clocks
     CLOCK_InitSysPfd(kCLOCK_Pfd2, 29);   // '29' PLL2 PFD2 frequency = 528MHz * 18 / 29 = 327.72MHz (with 528MHz = PLL2 frequency)
     CLOCK_SetMux(kCLOCK_SemcAltMux, 0);  // '0'  PLL2 PFD2 will be selected as alternative clock for SEMC root clock
     CLOCK_SetMux(kCLOCK_SemcMux, 1);     // '1'  SEMC alternative clock will be used as SEMC clock root
     CLOCK_SetDiv(kCLOCK_SemcDiv, 1);     // '1'  divide by 2 -> SEMC clock = 163.86 MHz
+    #endif
 
     // Set Pins
 
-    // Data Pins
+    // Data Pins 0..15
     IOMUXC_SetPinMux(MIMXRT_IOMUXC_SEMC_DATA00, 0UL);
-    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_DATA00, 0xE1UL);
+    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_DATA00, SDRAM_PIN_CONFIG);
     IOMUXC_SetPinMux(MIMXRT_IOMUXC_SEMC_DATA01, 0UL);
-    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_DATA01, 0xE1UL);
+    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_DATA01, SDRAM_PIN_CONFIG);
     IOMUXC_SetPinMux(MIMXRT_IOMUXC_SEMC_DATA02, 0UL);
-    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_DATA02, 0xE1UL);
+    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_DATA02, SDRAM_PIN_CONFIG);
     IOMUXC_SetPinMux(MIMXRT_IOMUXC_SEMC_DATA03, 0UL);
-    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_DATA03, 0xE1UL);
+    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_DATA03, SDRAM_PIN_CONFIG);
     IOMUXC_SetPinMux(MIMXRT_IOMUXC_SEMC_DATA04, 0UL);
-    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_DATA04, 0xE1UL);
+    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_DATA04, SDRAM_PIN_CONFIG);
     IOMUXC_SetPinMux(MIMXRT_IOMUXC_SEMC_DATA05, 0UL);
-    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_DATA05, 0xE1UL);
+    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_DATA05, SDRAM_PIN_CONFIG);
     IOMUXC_SetPinMux(MIMXRT_IOMUXC_SEMC_DATA06, 0UL);
-    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_DATA06, 0xE1UL);
+    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_DATA06, SDRAM_PIN_CONFIG);
     IOMUXC_SetPinMux(MIMXRT_IOMUXC_SEMC_DATA07, 0UL);
-    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_DATA07, 0xE1UL);
+    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_DATA07, SDRAM_PIN_CONFIG);
     IOMUXC_SetPinMux(MIMXRT_IOMUXC_SEMC_DATA08, 0UL);
-    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_DATA08, 0xE1UL);
+    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_DATA08, SDRAM_PIN_CONFIG);
     IOMUXC_SetPinMux(MIMXRT_IOMUXC_SEMC_DATA09, 0UL);
-    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_DATA09, 0xE1UL);
+    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_DATA09, SDRAM_PIN_CONFIG);
     IOMUXC_SetPinMux(MIMXRT_IOMUXC_SEMC_DATA10, 0UL);
-    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_DATA10, 0xE1UL);
+    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_DATA10, SDRAM_PIN_CONFIG);
     IOMUXC_SetPinMux(MIMXRT_IOMUXC_SEMC_DATA11, 0UL);
-    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_DATA11, 0xE1UL);
+    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_DATA11, SDRAM_PIN_CONFIG);
     IOMUXC_SetPinMux(MIMXRT_IOMUXC_SEMC_DATA12, 0UL);
-    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_DATA12, 0xE1UL);
+    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_DATA12, SDRAM_PIN_CONFIG);
     IOMUXC_SetPinMux(MIMXRT_IOMUXC_SEMC_DATA13, 0UL);
-    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_DATA13, 0xE1UL);
+    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_DATA13, SDRAM_PIN_CONFIG);
     IOMUXC_SetPinMux(MIMXRT_IOMUXC_SEMC_DATA14, 0UL);
-    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_DATA14, 0xE1UL);
+    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_DATA14, SDRAM_PIN_CONFIG);
     IOMUXC_SetPinMux(MIMXRT_IOMUXC_SEMC_DATA15, 0UL);
-    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_DATA15, 0xE1UL);
+    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_DATA15, SDRAM_PIN_CONFIG);
 
     // Address Pins
     IOMUXC_SetPinMux(MIMXRT_IOMUXC_SEMC_ADDR00, 0UL);
-    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_ADDR00, 0xE1UL);
+    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_ADDR00, SDRAM_PIN_CONFIG);
     IOMUXC_SetPinMux(MIMXRT_IOMUXC_SEMC_ADDR01, 0UL);
-    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_ADDR01, 0xE1UL);
+    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_ADDR01, SDRAM_PIN_CONFIG);
     IOMUXC_SetPinMux(MIMXRT_IOMUXC_SEMC_ADDR02, 0UL);
-    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_ADDR02, 0xE1UL);
+    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_ADDR02, SDRAM_PIN_CONFIG);
     IOMUXC_SetPinMux(MIMXRT_IOMUXC_SEMC_ADDR03, 0UL);
-    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_ADDR03, 0xE1UL);
+    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_ADDR03, SDRAM_PIN_CONFIG);
     IOMUXC_SetPinMux(MIMXRT_IOMUXC_SEMC_ADDR04, 0UL);
-    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_ADDR04, 0xE1UL);
+    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_ADDR04, SDRAM_PIN_CONFIG);
     IOMUXC_SetPinMux(MIMXRT_IOMUXC_SEMC_ADDR05, 0UL);
-    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_ADDR05, 0xE1UL);
+    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_ADDR05, SDRAM_PIN_CONFIG);
     IOMUXC_SetPinMux(MIMXRT_IOMUXC_SEMC_ADDR06, 0UL);
-    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_ADDR06, 0xE1UL);
+    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_ADDR06, SDRAM_PIN_CONFIG);
     IOMUXC_SetPinMux(MIMXRT_IOMUXC_SEMC_ADDR07, 0UL);
-    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_ADDR07, 0xE1UL);
+    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_ADDR07, SDRAM_PIN_CONFIG);
     IOMUXC_SetPinMux(MIMXRT_IOMUXC_SEMC_ADDR08, 0UL);
-    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_ADDR08, 0xE1UL);
+    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_ADDR08, SDRAM_PIN_CONFIG);
     IOMUXC_SetPinMux(MIMXRT_IOMUXC_SEMC_ADDR09, 0UL);
-    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_ADDR09, 0xE1UL);
+    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_ADDR09, SDRAM_PIN_CONFIG);
     IOMUXC_SetPinMux(MIMXRT_IOMUXC_SEMC_ADDR10, 0UL);
-    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_ADDR10, 0xE1UL);
+    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_ADDR10, SDRAM_PIN_CONFIG);
     IOMUXC_SetPinMux(MIMXRT_IOMUXC_SEMC_ADDR11, 0UL);
-    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_ADDR11, 0xE1UL);
+    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_ADDR11, SDRAM_PIN_CONFIG);
     IOMUXC_SetPinMux(MIMXRT_IOMUXC_SEMC_ADDR12, 0UL);
-    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_ADDR12, 0xE1UL);
+    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_ADDR12, SDRAM_PIN_CONFIG);
 
     IOMUXC_SetPinMux(MIMXRT_IOMUXC_SEMC_DM00, 0UL);
-    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_DM00, 0xE1UL);
+    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_DM00, SDRAM_PIN_CONFIG);
     IOMUXC_SetPinMux(MIMXRT_IOMUXC_SEMC_BA0, 0UL);
-    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_BA0, 0xE1UL);
+    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_BA0, SDRAM_PIN_CONFIG);
     IOMUXC_SetPinMux(MIMXRT_IOMUXC_SEMC_BA1, 0UL);
-    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_BA1, 0xE1UL);
+    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_BA1, SDRAM_PIN_CONFIG);
     IOMUXC_SetPinMux(MIMXRT_IOMUXC_SEMC_CAS, 0UL);
-    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_CAS, 0xE1UL);
+    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_CAS, SDRAM_PIN_CONFIG);
     IOMUXC_SetPinMux(MIMXRT_IOMUXC_SEMC_RAS, 0UL);
-    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_RAS, 0xE1UL);
+    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_RAS, SDRAM_PIN_CONFIG);
     IOMUXC_SetPinMux(MIMXRT_IOMUXC_SEMC_CLK, 0UL);
-    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_CLK, 0xE1UL);
+    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_CLK, SDRAM_PIN_CONFIG);
     IOMUXC_SetPinMux(MIMXRT_IOMUXC_SEMC_CKE, 0UL);
-    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_CKE, 0xE1UL);
+    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_CKE, SDRAM_PIN_CONFIG);
     IOMUXC_SetPinMux(MIMXRT_IOMUXC_SEMC_WE, 0UL);
-    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_WE, 0xE1UL);
+    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_WE, SDRAM_PIN_CONFIG);
     IOMUXC_SetPinMux(MIMXRT_IOMUXC_SEMC_DM01, 0UL);
-    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_DM01, 0xE1UL);
+    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_DM01, SDRAM_PIN_CONFIG);
     IOMUXC_SetPinMux(MIMXRT_IOMUXC_SEMC_DQS, 1UL);
-    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_DQS, 0xE1UL);
+    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_DQS, SDRAM_PIN_CONFIG);
+
+    #if defined(MIMXRT117x_SERIES)
+    // Data Pins 16..31
+    IOMUXC_SetPinMux(MIMXRT_IOMUXC_SEMC_DATA16, 0UL);
+    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_DATA16, SDRAM_PIN_CONFIG);
+    IOMUXC_SetPinMux(MIMXRT_IOMUXC_SEMC_DATA17, 0UL);
+    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_DATA17, SDRAM_PIN_CONFIG);
+    IOMUXC_SetPinMux(MIMXRT_IOMUXC_SEMC_DATA18, 0UL);
+    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_DATA18, SDRAM_PIN_CONFIG);
+    IOMUXC_SetPinMux(MIMXRT_IOMUXC_SEMC_DATA19, 0UL);
+    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_DATA19, SDRAM_PIN_CONFIG);
+    IOMUXC_SetPinMux(MIMXRT_IOMUXC_SEMC_DATA20, 0UL);
+    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_DATA20, SDRAM_PIN_CONFIG);
+    IOMUXC_SetPinMux(MIMXRT_IOMUXC_SEMC_DATA21, 0UL);
+    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_DATA21, SDRAM_PIN_CONFIG);
+    IOMUXC_SetPinMux(MIMXRT_IOMUXC_SEMC_DATA22, 0UL);
+    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_DATA22, SDRAM_PIN_CONFIG);
+    IOMUXC_SetPinMux(MIMXRT_IOMUXC_SEMC_DATA23, 0UL);
+    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_DATA23, SDRAM_PIN_CONFIG);
+    IOMUXC_SetPinMux(MIMXRT_IOMUXC_SEMC_DATA24, 0UL);
+    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_DATA24, SDRAM_PIN_CONFIG);
+    IOMUXC_SetPinMux(MIMXRT_IOMUXC_SEMC_DATA25, 0UL);
+    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_DATA25, SDRAM_PIN_CONFIG);
+    IOMUXC_SetPinMux(MIMXRT_IOMUXC_SEMC_DATA26, 0UL);
+    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_DATA26, SDRAM_PIN_CONFIG);
+    IOMUXC_SetPinMux(MIMXRT_IOMUXC_SEMC_DATA27, 0UL);
+    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_DATA27, SDRAM_PIN_CONFIG);
+    IOMUXC_SetPinMux(MIMXRT_IOMUXC_SEMC_DATA28, 0UL);
+    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_DATA28, SDRAM_PIN_CONFIG);
+    IOMUXC_SetPinMux(MIMXRT_IOMUXC_SEMC_DATA29, 0UL);
+    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_DATA29, SDRAM_PIN_CONFIG);
+    IOMUXC_SetPinMux(MIMXRT_IOMUXC_SEMC_DATA30, 0UL);
+    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_DATA30, SDRAM_PIN_CONFIG);
+    IOMUXC_SetPinMux(MIMXRT_IOMUXC_SEMC_DATA31, 0UL);
+    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_DATA31, SDRAM_PIN_CONFIG);
+
+    IOMUXC_SetPinMux(MIMXRT_IOMUXC_SEMC_DM02, 0UL);
+    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_DM02, SDRAM_PIN_CONFIG);
+    IOMUXC_SetPinMux(MIMXRT_IOMUXC_SEMC_DM03, 0UL);
+    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_DM03, SDRAM_PIN_CONFIG);
+
+    #endif
 
     // Chip Select Pins
     #ifndef MIMXRT_IOMUXC_SEMC_CS0
     #error No SEMC CS0 defined!
     #endif
     IOMUXC_SetPinMux(MIMXRT_IOMUXC_SEMC_CS0, 0UL);
-    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_CS0, 0xE1UL);
+    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_CS0, SDRAM_PIN_CONFIG);
 
     #ifdef MIMXRT_IOMUXC_SEMC_CS1
     IOMUXC_SetPinMux(MIMXRT_IOMUXC_SEMC_CS1, 0UL);
-    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_CS1, 0xE1UL);
+    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_CS1, SDRAM_PIN_CONFIG);
     #endif
 
     #ifdef MIMXRT_IOMUXC_SEMC_CS2
     IOMUXC_SetPinMux(MIMXRT_IOMUXC_SEMC_CS2, 0UL);
-    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_CS2, 0xE1UL);
+    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_CS2, SDRAM_PIN_CONFIG);
     #endif
 
     #ifdef MIMXRT_IOMUXC_SEMC_CS3
     IOMUXC_SetPinMux(MIMXRT_IOMUXC_SEMC_CS3, 0UL);
-    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_CS3, 0xE1UL);
+    IOMUXC_SetPinConfig(MIMXRT_IOMUXC_SEMC_CS3, SDRAM_PIN_CONFIG);
     #endif
 
     // Configure SEMC
@@ -155,6 +208,36 @@ void mimxrt_sdram_init(void) {
     semc_cfg.dqsMode = kSEMC_Loopbackdqspad;  // For more accurate timing.
     SEMC_Init(SEMC, &semc_cfg);
 
+    #if defined(MIMXRT117x_SERIES)
+
+    uint32_t clock_freq = CLOCK_GetRootClockFreq(kCLOCK_Root_Semc);
+
+    semc_sdram_config_t sdram_cfg = {
+        .csxPinMux = kSEMC_MUXCSX0,
+        .address = 0x80000000,
+        .memsize_kbytes = (MICROPY_HW_SDRAM_SIZE >> 10),
+        .portSize = kSEMC_PortSize32Bit, // two 16-bit SDRAMs make up 32-bit portsize
+        .burstLen = kSEMC_Sdram_BurstLen8,
+        .columnAddrBitNum = kSEMC_SdramColunm_9bit,
+        .casLatency = kSEMC_LatencyThree,
+        .tPrecharge2Act_Ns = 15, // tRP 15ns
+        .tAct2ReadWrite_Ns = 15, // tRCD 15ns
+        .tRefreshRecovery_Ns = 70, // Use the maximum of the (Trfc , Txsr).
+        .tWriteRecovery_Ns = 2,  // tWR 2ns
+        .tCkeOff_Ns = 42, // The minimum cycle of SDRAM CLK off state. CKE is off in self refresh at a minimum period tRAS.
+        .tAct2Prechage_Ns = 40, // tRAS 40ns
+        .tSelfRefRecovery_Ns = 70,
+        .tRefresh2Refresh_Ns = 60,
+        .tAct2Act_Ns = 2, // tRC/tRDD 2ns
+        .tPrescalePeriod_Ns = 160 * (1000000000 / clock_freq),
+        .refreshPeriod_nsPerRow = 64 * 1000000 / 8192, // 64ms/8192
+        .refreshUrgThreshold = sdram_cfg.refreshPeriod_nsPerRow,
+        .refreshBurstLen = 1,
+        .delayChain = 2,
+    };
+
+    #else
+
     uint32_t clock_freq = CLOCK_GetFreq(kCLOCK_SemcClk);
     semc_sdram_config_t sdram_cfg = {
         .csxPinMux = kSEMC_MUXCSX0,
@@ -180,6 +263,8 @@ void mimxrt_sdram_init(void) {
         .refreshBurstLen = 1
     };
 
+    #endif
+
     (status_t)SEMC_ConfigureSDRAM(SEMC, kSEMC_SDRAM_CS0, &sdram_cfg, clock_freq);
 }
 
diff --git a/ports/mimxrt/modmachine.c b/ports/mimxrt/modmachine.c
index 9eb2431c03d8c..9097289e79bdc 100644
--- a/ports/mimxrt/modmachine.c
+++ b/ports/mimxrt/modmachine.c
@@ -37,7 +37,6 @@
 #include "led.h"
 #include "pin.h"
 #include "modmachine.h"
-#include "fsl_clock.h"
 #include "fsl_wdog.h"
 
 #if MICROPY_PY_MACHINE
diff --git a/ports/mimxrt/moduos.c b/ports/mimxrt/moduos.c
index ddb4826db9cf3..b3f97693fa5ab 100644
--- a/ports/mimxrt/moduos.c
+++ b/ports/mimxrt/moduos.c
@@ -30,10 +30,44 @@
 
 #include "py/runtime.h"
 #include "py/mphal.h"
+
+#if defined(MIMXRT117x_SERIES)
+#include "fsl_caam.h"
+#else
 #include "fsl_trng.h"
+#endif
 
 static bool initialized = false;
 
+#if defined(MIMXRT117x_SERIES)
+STATIC caam_handle_t caam_handle;
+STATIC caam_rng_state_handle_t caam_state_handle = kCAAM_RngStateHandle0;
+
+#if defined(FSL_FEATURE_HAS_L1CACHE) || defined(__DCACHE_PRESENT)
+AT_NONCACHEABLE_SECTION(static caam_job_ring_interface_t s_jrif0);
+#else
+static caam_job_ring_interface_t s_jrif0;
+#endif
+
+STATIC void trng_start(void) {
+    caam_config_t config;
+
+    if (!initialized) {
+        CAAM_GetDefaultConfig(&config);
+        config.jobRingInterface[0] = &s_jrif0;
+        CAAM_Init(CAAM, &config);
+        initialized = true;
+    }
+}
+
+void trng_random_data(unsigned char *output, size_t len) {
+    trng_start();
+    CAAM_RNG_GetRandomData(CAAM, &caam_handle, caam_state_handle, output, len,
+        kCAAM_RngDataAny, NULL);
+}
+
+#else
+
 STATIC void trng_start(void) {
     trng_config_t trngConfig;
 
@@ -46,11 +80,18 @@ STATIC void trng_start(void) {
     }
 }
 
+void trng_random_data(unsigned char *output, size_t len) {
+    trng_start();
+    TRNG_GetRandomData(TRNG, output, len);
+}
+
+#endif
+
 uint32_t trng_random_u32(void) {
     uint32_t rngval;
 
     trng_start();
-    TRNG_GetRandomData(TRNG, (uint8_t *)&rngval, 4);
+    trng_random_data((uint8_t *)&rngval, 4);
     return rngval;
 }
 
@@ -61,7 +102,7 @@ STATIC mp_obj_t mp_uos_urandom(mp_obj_t num) {
     vstr_init_len(&vstr, n);
 
     trng_start();
-    TRNG_GetRandomData(TRNG, vstr.buf, n);
+    trng_random_data((uint8_t *)vstr.buf, n);
 
     return mp_obj_new_bytes_from_vstr(&vstr);
 }
diff --git a/ports/mimxrt/mpconfigport.h b/ports/mimxrt/mpconfigport.h
index d86885814c19e..88c5e9e881ead 100644
--- a/ports/mimxrt/mpconfigport.h
+++ b/ports/mimxrt/mpconfigport.h
@@ -29,9 +29,13 @@
 // Board specific definitions
 #include "mpconfigboard.h"
 #include "fsl_common.h"
+#include "lib/nxp_driver/sdk/CMSIS/Include/core_cm7.h"
 
 uint32_t trng_random_u32(void);
 
+// Config level
+#define MICROPY_CONFIG_ROM_LEVEL (MICROPY_CONFIG_ROM_LEVEL_FULL_FEATURES)
+
 // Memory allocation policies
 #define MICROPY_GC_STACK_ENTRY_TYPE         uint16_t
 #define MICROPY_GC_ALLOC_THRESHOLD          (0)
@@ -44,8 +48,8 @@ uint32_t trng_random_u32(void);
 #define MICROPY_EMIT_INLINE_THUMB           (1)
 
 // Optimisations
-#define MICROPY_OPT_LOAD_ATTR_FAST_PATH     (1)
 #define MICROPY_OPT_MAP_LOOKUP_CACHE        (1)
+#define MICROPY_OPT_LOAD_ATTR_FAST_PATH     (1)
 
 // Python internal features
 #define MICROPY_TRACKED_ALLOC               (MICROPY_SSL_MBEDTLS)
@@ -234,16 +238,21 @@ extern const struct _mp_obj_type_t network_lan_type;
 
 #define MICROPY_HW_PIT_NUM_CHANNELS 3
 
+#ifndef MICROPY_BOARD_ROOT_POINTERS
+#define MICROPY_BOARD_ROOT_POINTERS
+#endif
+
 #define MP_STATE_PORT MP_STATE_VM
 
 // Miscellaneous settings
-
+#ifndef  MICROPY_EVENT_POLL_HOOK
 #define MICROPY_EVENT_POLL_HOOK \
     do { \
         extern void mp_handle_pending(bool); \
         mp_handle_pending(true); \
         __WFE(); \
     } while (0);
+#endif
 
 #define MICROPY_MAKE_POINTER_CALLABLE(p) ((void *)((mp_uint_t)(p) | 1))
 
diff --git a/ports/mimxrt/mphalport.c b/ports/mimxrt/mphalport.c
index 33f9c2691d58a..2730b9a855d3a 100644
--- a/ports/mimxrt/mphalport.c
+++ b/ports/mimxrt/mphalport.c
@@ -146,8 +146,13 @@ uint64_t mp_hal_time_ns(void) {
 // MAC address
 
 void mp_hal_get_unique_id(uint8_t id[]) {
+    #if defined CPU_MIMXRT1176_cm7
+    *(uint32_t *)id = OCOTP->FUSEN[0x10].FUSE;
+    *(uint32_t *)(id + 4) = OCOTP->FUSEN[0x11].FUSE;
+    #else
     *(uint32_t *)id = OCOTP->CFG0;
     *(uint32_t *)(id + 4) = OCOTP->CFG1;
+    #endif
 }
 
 // Generate a random locally administered MAC address (LAA)
diff --git a/ports/mimxrt/network_lan.c b/ports/mimxrt/network_lan.c
index 0842cde82d00e..59c3310a5bb7d 100644
--- a/ports/mimxrt/network_lan.c
+++ b/ports/mimxrt/network_lan.c
@@ -36,25 +36,36 @@
 #include "hal/phy/device/phydp83825/fsl_phydp83825.h"
 #include "hal/phy/device/phydp83848/fsl_phydp83848.h"
 #include "hal/phy/device/phylan8720/fsl_phylan8720.h"
+#include "hal/phy/device/phyrtl8211f/fsl_phyrtl8211f.h"
 
 #include "lwip/netif.h"
+#include "lwip/apps/mdns.h"
 
 #ifndef ENET_TX_CLK_OUTPUT
 #define ENET_TX_CLK_OUTPUT true
 #endif
 
+#ifndef ENET_1_TX_CLK_OUTPUT
+#define ENET_1_TX_CLK_OUTPUT true
+#endif
+
 typedef struct _network_lan_obj_t {
     mp_obj_base_t base;
     eth_t *eth;
 } network_lan_obj_t;
 
-STATIC const network_lan_obj_t network_lan_eth0 = { { &network_lan_type }, &eth_instance };
+
+STATIC const network_lan_obj_t network_lan_eth0 = { { &network_lan_type }, &eth_instance0 };
+#if defined(ENET_DUAL_PORT)
+STATIC const network_lan_obj_t network_lan_eth1 = { { &network_lan_type }, &eth_instance1 };
+#endif
 
 STATIC void network_lan_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     network_lan_obj_t *self = MP_OBJ_TO_PTR(self_in);
     struct netif *netif = eth_netif(self->eth);
     int status = eth_link_status(self->eth);
-    mp_printf(print, "<ETH %u %u.%u.%u.%u>",
+    mp_printf(print, "<ETH%d status=%u ip=%u.%u.%u.%u>",
+        self->eth == &eth_instance0 ? 0 : 1,
         status,
         netif->ip_addr.addr & 0xff,
         netif->ip_addr.addr >> 8 & 0xff,
@@ -68,14 +79,30 @@ STATIC mp_obj_t network_lan_make_new(const mp_obj_type_t *type, size_t n_args, s
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_id, MP_ARG_INT, {.u_int = 0} },
         { MP_QSTR_phy_type, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} },
-        { MP_QSTR_phy_addr, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = ENET_PHY_ADDRESS} },
-        { MP_QSTR_phy_clock, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = ENET_TX_CLK_OUTPUT} },
+        { MP_QSTR_phy_addr, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} },
+        { MP_QSTR_phy_clock, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} },
     };
     // Parse args.
     mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
     mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
 
-    const phy_operations_t *phy_ops = &ENET_PHY_OPS;
+    const phy_operations_t *phy_ops;
+    int phy_addr;
+    bool phy_clock;
+
+    int mac_id = args[ARG_id].u_int;
+    // set default
+    if (mac_id == 0) {
+        phy_ops = &ENET_PHY_OPS;
+        phy_addr = ENET_PHY_ADDRESS;
+        phy_clock = ENET_TX_CLK_OUTPUT;
+    #if defined(ENET_DUAL_PORT)
+    } else {
+        phy_ops = &ENET_1_PHY_OPS;
+        phy_addr = ENET_1_PHY_ADDRESS;
+        phy_clock = ENET_1_TX_CLK_OUTPUT;
+    #endif
+    }
 
     // Select PHY driver
     int phy_type = args[ARG_phy_type].u_int;
@@ -88,28 +115,34 @@ STATIC mp_obj_t network_lan_make_new(const mp_obj_type_t *type, size_t n_args, s
             phy_ops = &phydp83848_ops;
         } else if (phy_type == PHY_LAN8720) {
             phy_ops = &phylan8720_ops;
+        } else if (phy_type == PHY_RTL8211F) {
+            phy_ops = &phyrtl8211f_ops;
         } else {
             mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("Invalid value %d for phy"), phy_type);
         }
     }
-    int phy_addr = args[ARG_phy_addr].u_int;
+    if (args[ARG_phy_addr].u_int != -1) {
+        phy_addr = args[ARG_phy_addr].u_int;
+    }
 
-    bool phy_clock = args[ARG_phy_clock].u_int;
+    if (args[ARG_phy_clock].u_int != -1) {
+        phy_clock = args[ARG_phy_clock].u_int;
+    }
 
     // Prepare for two ETH interfaces.
     const network_lan_obj_t *self;
-    int mac_id = args[ARG_id].u_int;
     if (mac_id == 0) {
         self = &network_lan_eth0;
-        mac_id = MP_HAL_MAC_ETH0;
+        eth_init_0(self->eth, MP_HAL_MAC_ETH0, phy_ops, phy_addr, phy_clock);
+    #if defined(ENET_DUAL_PORT)
     } else if (mac_id == 1) {
-        self = &network_lan_eth0;
-        mac_id = MP_HAL_MAC_ETH1;
+        self = &network_lan_eth1;
+        eth_init_1(self->eth, MP_HAL_MAC_ETH1, phy_ops, phy_addr, phy_clock);
+    #endif
     } else {
         mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("Invalid LAN interface %d"), mac_id);
     }
 
-    eth_init(self->eth, mac_id, phy_ops, phy_addr, phy_clock);
     // register with network module
     mod_network_register_nic((mp_obj_t *)self);
     return MP_OBJ_FROM_PTR(self);
@@ -215,6 +248,7 @@ STATIC const mp_rom_map_elem_t network_lan_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_PHY_DP83825), MP_ROM_INT(PHY_DP83825) },
     { MP_ROM_QSTR(MP_QSTR_PHY_DP83848), MP_ROM_INT(PHY_DP83848) },
     { MP_ROM_QSTR(MP_QSTR_PHY_LAN8720), MP_ROM_INT(PHY_LAN8720) },
+    { MP_ROM_QSTR(MP_QSTR_PHY_RTL8211F), MP_ROM_INT(PHY_RTL8211F) },
     { MP_ROM_QSTR(MP_QSTR_IN), MP_ROM_INT(PHY_TX_CLK_IN) },
     { MP_ROM_QSTR(MP_QSTR_OUT), MP_ROM_INT(PHY_TX_CLK_OUT) },
 };
diff --git a/ports/mimxrt/pin.h b/ports/mimxrt/pin.h
index 583d1c30231c9..63db55f8a7c55 100644
--- a/ports/mimxrt/pin.h
+++ b/ports/mimxrt/pin.h
@@ -69,6 +69,7 @@ enum {
     PIN_AF_MODE_ALT7,
     PIN_AF_MODE_ALT8,
     PIN_AF_MODE_ALT9,
+    PIN_AF_MODE_ALT10,
 };
 
 enum {
diff --git a/ports/mimxrt/ticks.c b/ports/mimxrt/ticks.c
index 0fc9babc04b46..858a5c574f825 100644
--- a/ports/mimxrt/ticks.c
+++ b/ports/mimxrt/ticks.c
@@ -41,7 +41,11 @@ void ticks_init(void) {
     ticks_ms_upper = 0;
 
     gpt_config_t config;
+    #if defined MIMXRT117x_SERIES
+    config.clockSource = kGPT_ClockSource_HighFreq;
+    #else
     config.clockSource = kGPT_ClockSource_Osc;
+    #endif
     config.divider = 24; // XTAL is 24MHz
     config.enableFreeRun = true;
     config.enableRunInWait = true;

From f44246c4c95f3a6a3740df10f7e6a100d491be0f Mon Sep 17 00:00:00 2001
From: Patrick Joy <74940387+ThinkTransit@users.noreply.github.com>
Date: Tue, 25 Oct 2022 17:10:29 +1100
Subject: [PATCH 2884/3533] mimxrt/README: Add build and flashing instructions.

---
 ports/mimxrt/README.md | 44 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/ports/mimxrt/README.md b/ports/mimxrt/README.md
index c8c5d989b9c82..de3de1e2817f4 100644
--- a/ports/mimxrt/README.md
+++ b/ports/mimxrt/README.md
@@ -29,3 +29,47 @@ Known issues:
 TODO:
   - More peripherals (Counter, I2S, CAN, etc)
   - More Python options
+
+## Build Instructions
+
+Before building the firmware for a given board the MicroPython cross-compiler
+must be built; it will be used to pre-compile some of the built-in scripts to
+bytecode.  The cross-compiler is built and run on the host machine, using:
+
+    $ make -C mpy-cross
+
+This command should be executed from the root directory of this repository.
+All other commands below should be executed from the ports/mimxrt/ directory.
+
+An ARM compiler is required for the build, along with the associated binary
+utilities.  The default compiler is `arm-none-eabi-gcc`, which is available for
+Arch Linux via the package `arm-none-eabi-gcc`, for Ubuntu via instructions
+[here](https://launchpad.net/~team-gcc-arm-embedded/+archive/ubuntu/ppa), or
+see [here](https://launchpad.net/gcc-arm-embedded) for the main GCC ARM
+Embedded page.  The compiler can be changed using the `CROSS_COMPILE` variable
+when invoking `make`.
+
+In addition newlib is required which is available for Arch Linux via the
+package `arm-none-eabi-newlib`, for Ubuntu/Debian install package `libnewlib-arm-none-eabi`
+
+Next, the board to build must be selected.  Any of the board names of the
+subdirectories in the `boards/` directory is a valid board.  The board name
+must be passed as the argument to `BOARD=` when invoking `make`.
+
+All boards require certain submodules to be obtained before they can be built.
+The correct set of submodules can be initialised using (with `SEEED_ARCH_MIX`
+as an example of the selected board):
+
+    $ make BOARD=SEEED_ARCH_MIX submodules
+
+Then to build the board's firmware run:
+
+    $ make BOARD=SEEED_ARCH_MIX
+
+The above command should produce binary images in the `build-SEEED_ARCH_MIX/`
+subdirectory (or the equivalent directory for the board specified).
+
+## Flashing
+
+Deploy the firmware following the instructions here
+https://docs.micropython.org/en/latest/mimxrt/tutorial/intro.html#deploying-the-firmware

From 2a4825848caa20df158ab3634ba36d763505ab8d Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Wed, 9 Nov 2022 07:39:54 +0100
Subject: [PATCH 2885/3533] mimxrt/usb: Change macro name
 MICROPY_HW_USB_STR_MANUF.

Change it into MICROPY_HW_USB_MANUFACTURER_STRING to be compatible with
other ports.
---
 ports/mimxrt/boards/OLIMEX_RT1010/mpconfigboard.h | 2 +-
 ports/mimxrt/tusb_port.c                          | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ports/mimxrt/boards/OLIMEX_RT1010/mpconfigboard.h b/ports/mimxrt/boards/OLIMEX_RT1010/mpconfigboard.h
index 6f4c528f9baa6..d63c0dc403900 100644
--- a/ports/mimxrt/boards/OLIMEX_RT1010/mpconfigboard.h
+++ b/ports/mimxrt/boards/OLIMEX_RT1010/mpconfigboard.h
@@ -1,6 +1,6 @@
 #define MICROPY_HW_BOARD_NAME "RT1010-Py-DevKIT"
 #define MICROPY_HW_MCU_NAME   "MIMXRT1011DAE5A"
-#define MICROPY_HW_USB_STR_MANUF "Olimex Ltd."
+#define MICROPY_HW_USB_MANUFACTURER_STRING "Olimex Ltd."
 #define MICROPY_HW_USB_VID 0x15ba
 #define MICROPY_HW_USB_PID 0x0046
 #define MICROPY_PY_UOS_DUPTERM_BUILTIN_STREAM (0)
diff --git a/ports/mimxrt/tusb_port.c b/ports/mimxrt/tusb_port.c
index 55855674c6293..f359d44e4d276 100644
--- a/ports/mimxrt/tusb_port.c
+++ b/ports/mimxrt/tusb_port.c
@@ -35,8 +35,8 @@
 #define MICROPY_HW_USB_PID (0x9802)
 #endif
 
-#ifndef MICROPY_HW_USB_STR_MANUF
-#define MICROPY_HW_USB_STR_MANUF ("MicroPython")
+#ifndef MICROPY_HW_USB_MANUFACTURER_STRING
+#define MICROPY_HW_USB_MANUFACTURER_STRING ("MicroPython")
 #endif
 
 #define USBD_DESC_LEN (TUD_CONFIG_DESC_LEN + TUD_CDC_DESC_LEN)
@@ -85,7 +85,7 @@ static const uint8_t usbd_desc_cfg[USBD_DESC_LEN] = {
 };
 
 static const char *const usbd_desc_str[] = {
-    [USBD_STR_MANUF] = MICROPY_HW_USB_STR_MANUF,
+    [USBD_STR_MANUF] = MICROPY_HW_USB_MANUFACTURER_STRING,
     [USBD_STR_PRODUCT] = MICROPY_HW_BOARD_NAME,
     [USBD_STR_SERIAL] = "00000000000000000000",
     [USBD_STR_CDC] = "Board CDC",

From 3459a4fa3d511179e46e1953bd860c851e9c6653 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Tue, 15 Nov 2022 15:55:27 +0100
Subject: [PATCH 2886/3533] mimxrt/network: Rename the argument clock_mode to
 ref_clk_mode.

The definitions for LAN.IN and LAN.OUT are kept, but in the code Pin.IN
and Pin.OUT can be used as well as values for the ref_clk_mode argument.
---
 docs/library/network.LAN.rst | 12 +++++++-----
 ports/mimxrt/network_lan.c   |  8 ++++----
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/docs/library/network.LAN.rst b/docs/library/network.LAN.rst
index 58bd61ebbd873..375e02cefecd0 100644
--- a/docs/library/network.LAN.rst
+++ b/docs/library/network.LAN.rst
@@ -19,7 +19,7 @@ Example usage::
 Constructors
 ------------
 
-.. class:: LAN(id, *, phy_type=<board_default>, phy_addr=<board_default>, phy_clock=<board_default>)
+.. class:: LAN(id, *, phy_type=<board_default>, phy_addr=<board_default>, ref_clk_mode=<board_default>)
 
    Create a LAN driver object, initialise the LAN module using the given
    PHY driver name, and return the LAN object.
@@ -31,13 +31,15 @@ Constructors
        is the default. Suitable values are port specific.
      - *phy_addr* specifies the address of the PHY interface. As with *phy_type*, the hardwired value has
        to be used for most boards and that value is the default.
-     - *phy_clock* specifies, whether the data clock is provided by the Ethernet controller or the PYH interface.
-       The default value is the one that matches the board. If set to ``True``, the clock is driven by the
-       Ethernet controller, otherwise by the PHY interface.
+     - *ref_clk_mode* specifies, whether the data clock is provided by the Ethernet controller or
+       the PYH interface.
+       The default value is the one that matches the board. If set to ``LAN.OUT`` or ``Pin.OUT``
+       or ``True``, the clock is driven by the Ethernet controller, if set to ``LAN.IN``
+       or ``Pin.IN`` or ``False``, the clock is driven by the PHY interface.
 
    For example, with the Seeed Arch Mix board you can  use::
 
-     nic = LAN(0, phy_type=LAN.PHY_LAN8720, phy_addr=2, phy_clock=False)
+     nic = LAN(0, phy_type=LAN.PHY_LAN8720, phy_addr=1, ref_clk_mode=Pin.IN)
 
 Methods
 -------
diff --git a/ports/mimxrt/network_lan.c b/ports/mimxrt/network_lan.c
index 59c3310a5bb7d..39565c5917602 100644
--- a/ports/mimxrt/network_lan.c
+++ b/ports/mimxrt/network_lan.c
@@ -75,12 +75,12 @@ STATIC void network_lan_print(const mp_print_t *print, mp_obj_t self_in, mp_prin
 }
 
 STATIC mp_obj_t network_lan_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
-    enum { ARG_id, ARG_phy_type, ARG_phy_addr, ARG_phy_clock};
+    enum { ARG_id, ARG_phy_type, ARG_phy_addr, ARG_ref_clk_mode};
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_id, MP_ARG_INT, {.u_int = 0} },
         { MP_QSTR_phy_type, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} },
         { MP_QSTR_phy_addr, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} },
-        { MP_QSTR_phy_clock, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} },
+        { MP_QSTR_ref_clk_mode, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} },
     };
     // Parse args.
     mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
@@ -125,8 +125,8 @@ STATIC mp_obj_t network_lan_make_new(const mp_obj_type_t *type, size_t n_args, s
         phy_addr = args[ARG_phy_addr].u_int;
     }
 
-    if (args[ARG_phy_clock].u_int != -1) {
-        phy_clock = args[ARG_phy_clock].u_int;
+    if (args[ARG_ref_clk_mode].u_int != -1) {
+        phy_clock = args[ARG_ref_clk_mode].u_int;
     }
 
     // Prepare for two ETH interfaces.

From 72817a179c27e457c00a164280102de587ef9c48 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Wed, 16 Nov 2022 14:39:49 +1100
Subject: [PATCH 2887/3533] mimxrt/Makefile: Set MPY_CROSS_FLAGS.

Otherwise this port will be unable to freeze `@native`/`@viper` code.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/mimxrt/Makefile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ports/mimxrt/Makefile b/ports/mimxrt/Makefile
index d9c150525da16..e08f2ad6025a4 100644
--- a/ports/mimxrt/Makefile
+++ b/ports/mimxrt/Makefile
@@ -366,6 +366,8 @@ endif
 
 CFLAGS += $(CFLAGS_EXTRA)
 
+MPY_CROSS_FLAGS += -march=armv7m
+
 # =============================================================================
 # Linker Flags
 # =============================================================================

From 92c35efb633e9c914f57ef381da1339a61f0fa10 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Thu, 17 Nov 2022 10:44:03 +1100
Subject: [PATCH 2888/3533] samd: Move MCU-specific CFLAGS to mpconfigmcu.mk.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/samd/Makefile                  | 4 +---
 ports/samd/mcu/samd21/mpconfigmcu.mk | 2 ++
 ports/samd/mcu/samd51/mpconfigmcu.mk | 2 ++
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/ports/samd/Makefile b/ports/samd/Makefile
index ff1701374a9c6..2f90836d576ec 100644
--- a/ports/samd/Makefile
+++ b/ports/samd/Makefile
@@ -52,9 +52,7 @@ PIN_AF_TABLE_CSV = mcu/$(MCU_SERIES_LOWER)/pin-af-table.csv
 BOARD_PINS = $(BOARD_DIR)/pins.csv
 GEN_PIN_AF = pin_af_table.c
 
-CFLAGS_MCU_SAMD21 = -mtune=cortex-m0plus -mcpu=cortex-m0plus -msoft-float
-CFLAGS_MCU_SAMD51 = -mtune=cortex-m4 -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard
-CFLAGS += $(INC) -Wall -Werror -std=c99 -nostdlib -mthumb $(CFLAGS_MCU_$(MCU_SERIES)) -fsingle-precision-constant -Wdouble-promotion
+CFLAGS += $(INC) -Wall -Werror -std=c99 -nostdlib -mthumb $(CFLAGS_MCU) -fsingle-precision-constant -Wdouble-promotion
 CFLAGS += -DMCU_$(MCU_SERIES) -D__$(CMSIS_MCU)__
 CFLAGS += $(CFLAGS_EXTRA)
 
diff --git a/ports/samd/mcu/samd21/mpconfigmcu.mk b/ports/samd/mcu/samd21/mpconfigmcu.mk
index 287d6d18be7bd..5f003e470d705 100644
--- a/ports/samd/mcu/samd21/mpconfigmcu.mk
+++ b/ports/samd/mcu/samd21/mpconfigmcu.mk
@@ -1,3 +1,5 @@
+CFLAGS_MCU += -mtune=cortex-m0plus -mcpu=cortex-m0plus -msoft-float
+
 SRC_S += shared/runtime/gchelper_m0.s
 
 LIBM_SRC_C +=  $(addprefix lib/libm/,\
diff --git a/ports/samd/mcu/samd51/mpconfigmcu.mk b/ports/samd/mcu/samd51/mpconfigmcu.mk
index a016ba0a7feea..b8fe5dd24a72f 100644
--- a/ports/samd/mcu/samd51/mpconfigmcu.mk
+++ b/ports/samd/mcu/samd51/mpconfigmcu.mk
@@ -1,3 +1,5 @@
+CFLAGS_MCU += -mtune=cortex-m4 -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard
+
 MICROPY_VFS_LFS2 ?= 1
 MICROPY_VFS_FAT ?= 1
 FROZEN_MANIFEST ?= mcu/$(MCU_SERIES_LOWER)/manifest.py

From f34eedeb1b9524a045fba446b759305526a4cd64 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Wed, 16 Nov 2022 14:39:59 +1100
Subject: [PATCH 2889/3533] samd/Makefile: Set MPY_CROSS_FLAGS.

Otherwise this port will be unable to freeze `@native`/`@viper` code.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/samd/Makefile                  | 2 ++
 ports/samd/mcu/samd21/mpconfigmcu.mk | 2 ++
 ports/samd/mcu/samd51/mpconfigmcu.mk | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/ports/samd/Makefile b/ports/samd/Makefile
index 2f90836d576ec..5817620916527 100644
--- a/ports/samd/Makefile
+++ b/ports/samd/Makefile
@@ -79,6 +79,8 @@ LIBSTDCPP_FILE_NAME = "$(shell $(CXX) $(CXXFLAGS) -print-file-name=libstdc++.a)"
 LDFLAGS += -L"$(shell dirname $(LIBSTDCPP_FILE_NAME))"
 endif
 
+MPY_CROSS_FLAGS += -march=$(MPY_CROSS_MCU_ARCH)
+
 SRC_C += \
 	mcu/$(MCU_SERIES_LOWER)/clock_config.c \
 	help.c \
diff --git a/ports/samd/mcu/samd21/mpconfigmcu.mk b/ports/samd/mcu/samd21/mpconfigmcu.mk
index 5f003e470d705..90112759b9129 100644
--- a/ports/samd/mcu/samd21/mpconfigmcu.mk
+++ b/ports/samd/mcu/samd21/mpconfigmcu.mk
@@ -1,5 +1,7 @@
 CFLAGS_MCU += -mtune=cortex-m0plus -mcpu=cortex-m0plus -msoft-float
 
+MPY_CROSS_MCU_ARCH = armv6m
+
 SRC_S += shared/runtime/gchelper_m0.s
 
 LIBM_SRC_C +=  $(addprefix lib/libm/,\
diff --git a/ports/samd/mcu/samd51/mpconfigmcu.mk b/ports/samd/mcu/samd51/mpconfigmcu.mk
index b8fe5dd24a72f..e79dbc3aa63f0 100644
--- a/ports/samd/mcu/samd51/mpconfigmcu.mk
+++ b/ports/samd/mcu/samd51/mpconfigmcu.mk
@@ -1,5 +1,7 @@
 CFLAGS_MCU += -mtune=cortex-m4 -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard
 
+MPY_CROSS_MCU_ARCH = armv7m
+
 MICROPY_VFS_LFS2 ?= 1
 MICROPY_VFS_FAT ?= 1
 FROZEN_MANIFEST ?= mcu/$(MCU_SERIES_LOWER)/manifest.py

From 5ef3aec33c457d535ae1cce8ff617d0c1cf52a90 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Wed, 16 Nov 2022 14:45:29 +1100
Subject: [PATCH 2890/3533] stm32/Makefile: Set MPY_CROSS_FLAGS based on MCU
 type.

Previously it was hardcoded to armv7m, which would have failed on M0/M0+.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/stm32/Makefile |  2 +-
 ports/stm32/stm32.mk | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/ports/stm32/Makefile b/ports/stm32/Makefile
index 07d366bfea5b9..418562f7cbdea 100644
--- a/ports/stm32/Makefile
+++ b/ports/stm32/Makefile
@@ -164,7 +164,7 @@ LDFLAGS += -L"$(shell dirname $(LIBSTDCPP_FILE_NAME))"
 endif
 
 # Options for mpy-cross
-MPY_CROSS_FLAGS += -march=armv7m
+MPY_CROSS_FLAGS += -march=$(MPY_CROSS_MCU_ARCH_$(MCU_SERIES))
 
 SHARED_SRC_C += $(addprefix shared/,\
 	libc/string0.c \
diff --git a/ports/stm32/stm32.mk b/ports/stm32/stm32.mk
index b4f73a67f381d..ae267a599596b 100644
--- a/ports/stm32/stm32.mk
+++ b/ports/stm32/stm32.mk
@@ -69,3 +69,15 @@ CFLAGS_MCU_l4 = $(CFLAGS_CORTEX_M) -mtune=cortex-m4 -mcpu=cortex-m4
 CFLAGS_MCU_h7 = $(CFLAGS_CORTEX_M) -mtune=cortex-m7 -mcpu=cortex-m7
 CFLAGS_MCU_wb = $(CFLAGS_CORTEX_M) -mtune=cortex-m4 -mcpu=cortex-m4
 CFLAGS_MCU_wl = $(CFLAGS_CORTEX_M) -mtune=cortex-m4 -mcpu=cortex-m4
+
+MPY_CROSS_MCU_ARCH_f0 = armv6m
+MPY_CROSS_MCU_ARCH_f4 = armv7m
+MPY_CROSS_MCU_ARCH_f7 = armv7m
+MPY_CROSS_MCU_ARCH_g0 = armv6m
+MPY_CROSS_MCU_ARCH_g4 = armv7m
+MPY_CROSS_MCU_ARCH_l0 = armv6m
+MPY_CROSS_MCU_ARCH_l1 = armv7m
+MPY_CROSS_MCU_ARCH_l4 = armv7m
+MPY_CROSS_MCU_ARCH_h7 = armv7m
+MPY_CROSS_MCU_ARCH_wb = armv7m
+MPY_CROSS_MCU_ARCH_wl = armv7m

From f31a358eb222aac98f797bd51302d5b5b2711fb6 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Wed, 16 Nov 2022 14:53:03 +1100
Subject: [PATCH 2891/3533] mpy-cross/main: Don't set a default native
 architecture.

If `-march` isn't set then it means the user hasn't thought about it, or in
the case of freezing, MPY_CROSS_FLAGS isn't set.  It's almost certainly
going to lead to problems, as there's no reason why the host architecture
is likely to be the right choice.

Compiling regular Python code is unaffected, but if `@native`/`@viper` is
used, the compiler will raise `SyntaxError: invalid arch`.

For situations where you explicitly want to use the host architecture (e.g.
for running tests on the unix port), added -march=host that keeps the old
behavior.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 mpy-cross/main.c | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/mpy-cross/main.c b/mpy-cross/main.c
index 4975c8ddb2052..55aefb65c1cfc 100644
--- a/mpy-cross/main.c
+++ b/mpy-cross/main.c
@@ -203,19 +203,9 @@ MP_NOINLINE int main_(int argc, char **argv) {
 
     // set default compiler configuration
     mp_dynamic_compiler.small_int_bits = 31;
-    #if defined(__i386__)
-    mp_dynamic_compiler.native_arch = MP_NATIVE_ARCH_X86;
-    mp_dynamic_compiler.nlr_buf_num_regs = MICROPY_NLR_NUM_REGS_X86;
-    #elif defined(__x86_64__)
-    mp_dynamic_compiler.native_arch = MP_NATIVE_ARCH_X64;
-    mp_dynamic_compiler.nlr_buf_num_regs = MAX(MICROPY_NLR_NUM_REGS_X64, MICROPY_NLR_NUM_REGS_X64_WIN);
-    #elif defined(__arm__) && !defined(__thumb2__)
-    mp_dynamic_compiler.native_arch = MP_NATIVE_ARCH_ARMV6;
-    mp_dynamic_compiler.nlr_buf_num_regs = MICROPY_NLR_NUM_REGS_ARM_THUMB_FP;
-    #else
+    // don't support native emitter unless -march is specified
     mp_dynamic_compiler.native_arch = MP_NATIVE_ARCH_NONE;
     mp_dynamic_compiler.nlr_buf_num_regs = 0;
-    #endif
 
     const char *input_file = NULL;
     const char *output_file = NULL;
@@ -292,6 +282,20 @@ MP_NOINLINE int main_(int argc, char **argv) {
                 } else if (strcmp(arch, "xtensawin") == 0) {
                     mp_dynamic_compiler.native_arch = MP_NATIVE_ARCH_XTENSAWIN;
                     mp_dynamic_compiler.nlr_buf_num_regs = MICROPY_NLR_NUM_REGS_XTENSAWIN;
+                } else if (strcmp(arch, "host") == 0) {
+                    #if defined(__i386__)
+                    mp_dynamic_compiler.native_arch = MP_NATIVE_ARCH_X86;
+                    mp_dynamic_compiler.nlr_buf_num_regs = MICROPY_NLR_NUM_REGS_X86;
+                    #elif defined(__x86_64__)
+                    mp_dynamic_compiler.native_arch = MP_NATIVE_ARCH_X64;
+                    mp_dynamic_compiler.nlr_buf_num_regs = MAX(MICROPY_NLR_NUM_REGS_X64, MICROPY_NLR_NUM_REGS_X64_WIN);
+                    #elif defined(__arm__) && !defined(__thumb2__)
+                    mp_dynamic_compiler.native_arch = MP_NATIVE_ARCH_ARMV6;
+                    mp_dynamic_compiler.nlr_buf_num_regs = MICROPY_NLR_NUM_REGS_ARM_THUMB_FP;
+                    #else
+                    mp_printf(&mp_stderr_print, "unable to determine host architecture for -march=host\n");
+                    exit(1);
+                    #endif
                 } else {
                     return usage(argv);
                 }

From beb9b85c591146802772fe236a2c74382bb778a5 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 17 Nov 2022 22:20:57 +1100
Subject: [PATCH 2892/3533] github/workflows: Run unix port workflow if
 mpy-cross changes.

Otherwise there is no CI for mpy-cross if only it changes.

Signed-off-by: Damien George <damien@micropython.org>
---
 .github/workflows/ports_unix.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/ports_unix.yml b/.github/workflows/ports_unix.yml
index 46b90fc70efc4..257c4c7c095bb 100644
--- a/.github/workflows/ports_unix.yml
+++ b/.github/workflows/ports_unix.yml
@@ -10,6 +10,7 @@ on:
       - 'extmod/**'
       - 'lib/**'
       - 'examples/**'
+      - 'mpy-cross/**'
       - 'ports/unix/**'
       - 'tests/**'
 

From 4ff10b59767b408aad24602176b7c49e48ceeb46 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Thu, 17 Nov 2022 22:49:36 +1100
Subject: [PATCH 2893/3533] tests/run-tests.py: Use host arch for mpy-cross for
 target=unix.

This will make mpy-cross auto-detect. Allow overriding for non-default
configurations (e.g. using 32-bit build of the unix port).

Also use armv7m by default for qemu-arm (the default qemu target is
Cortex-M3).

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 tests/run-tests.py | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/tests/run-tests.py b/tests/run-tests.py
index 6031b35b53347..35740318e29b6 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -918,8 +918,15 @@ def main():
         "renesas-ra",
         "rp2",
     )
-    if args.target in LOCAL_TARGETS or args.list_tests:
+    if args.list_tests:
+        pyb = None
+    elif args.target in LOCAL_TARGETS:
         pyb = None
+        if not args.mpy_cross_flags:
+            if args.target == "unix":
+                args.mpy_cross_flags = "-march=host"
+            elif args.target == "qemu-arm":
+                args.mpy_cross_flags = "-march=armv7m"
     elif args.target in EXTERNAL_TARGETS:
         global pyboard
         sys.path.append(base_path("../tools"))

From 859d0e9529b90d6745dba347271d0d9b610da4aa Mon Sep 17 00:00:00 2001
From: TPReal <tpreal@gmail.com>
Date: Wed, 16 Nov 2022 12:37:43 +0100
Subject: [PATCH 2894/3533] docs/library/framebuf: Clarify docs for blit
 regarding palette.

Clarified the behaviour when both key and palette are specified.
---
 docs/library/framebuf.rst | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/library/framebuf.rst b/docs/library/framebuf.rst
index 78ae0c1c346b7..149f4d6609be9 100644
--- a/docs/library/framebuf.rst
+++ b/docs/library/framebuf.rst
@@ -133,7 +133,9 @@ Other methods
     Draw another FrameBuffer on top of the current one at the given coordinates.
     If *key* is specified then it should be a color integer and the
     corresponding color will be considered transparent: all pixels with that
-    color value will not be drawn.
+    color value will not be drawn. (If the *palette* is specified then the *key*
+    is compared to the value from *palette*, not to the value directly from
+    *fbuf*.)
 
     The *palette* argument enables blitting between FrameBuffers with differing
     formats. Typical usage is to render a monochrome or grayscale glyph/icon to

From 4dcfd19bbfa5e1009bd4e0fe95f41a47452493f9 Mon Sep 17 00:00:00 2001
From: David Lechner <david@pybricks.com>
Date: Wed, 16 Nov 2022 17:31:21 -0600
Subject: [PATCH 2895/3533] extmod/extmod.cmake: Add MICROPY_PY_BTREE compiler
 definition.

Instead of defining `MICROPY_PY_BTREE` in `mpconfigport.h` we can define
it via CMake similar to how other ports that use Makefiles define it in
`mpconfigport.mk`.

Signed-off-by: David Lechner <david@pybricks.com>
---
 extmod/extmod.cmake        | 1 +
 ports/esp32/mpconfigport.h | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/extmod/extmod.cmake b/extmod/extmod.cmake
index 2207a951ad66f..ed7d16d1b5ca9 100644
--- a/extmod/extmod.cmake
+++ b/extmod/extmod.cmake
@@ -93,6 +93,7 @@ if(MICROPY_PY_BTREE)
     )
 
     list(APPEND MICROPY_DEF_CORE
+        MICROPY_PY_BTREE=1
         __DBINTERFACE_PRIVATE=1
         "virt_fd_t=void*"
     )
diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h
index 957aa2e93bce0..d8822980b7de8 100644
--- a/ports/esp32/mpconfigport.h
+++ b/ports/esp32/mpconfigport.h
@@ -123,7 +123,6 @@
 #define MICROPY_PY_USSL_FINALISER           (1)
 #define MICROPY_PY_UWEBSOCKET               (1)
 #define MICROPY_PY_WEBREPL                  (1)
-#define MICROPY_PY_BTREE                    (1)
 #define MICROPY_PY_ONEWIRE                  (1)
 #define MICROPY_PY_UPLATFORM                (1)
 #define MICROPY_PY_USOCKET_EVENTS           (MICROPY_PY_WEBREPL)

From 65d82066a8267d7dd96d747d09f9ed3883d40078 Mon Sep 17 00:00:00 2001
From: yn386 <wf.yn386@gmail.com>
Date: Wed, 14 Sep 2022 15:29:15 +0900
Subject: [PATCH 2896/3533] stm32/pyb_i2c: Fix failing pyb.I2C(dma=True) after
 receiving 1 byte.

Excuting the code:

    i2c = I2C(1, I2C.CONTROLLER, dma=True)
    tmp = i2c.recv(1, i2c_addr)
    recv_data = bytearray(56)
    i2c.recv(recv_data, i2c_addr)

The second i2c.recv() fails with OSError: [Errno 110] ETIMEDOUT.  When
receiving greater than or equal to 2 bytes at first i2c.recv(), the second
i2c.recv() succeeds.  This issue does not occur without DMA.

Details of change: when executing I2C with DMA:

- Bit 11 of I2Cx_CR2 (DMA Request Enable) should be 1 to indicate that DMA
  transfer is enabled.  This bit is set after I2C event interrupt is
  enabled in HAL_I2C_Master_Transmit_DMA()/HAL_I2C_Master_Receive_DMA(), so
  DMA Request Enable bit might be 0 in IRQHandler.

- In case of data receive:
    - When only 1 byte receiption, clear I2Cx_CR1's bit 10 (ACK).
    - When only 2 byte receiption, clear I2Cx_CR1's bit 10 (ACK) and set
      bit 11 (POS).
    - When greater than or equal to 2 byte receiption, bit 12 of I2Cx_CR2
      (DMA Last Transfer) should set to generate NACK when DMA transfer
      completed.

Otherwise, the I2C bus may be busy after received data from peripheral.
---
 ports/stm32/pyb_i2c.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/ports/stm32/pyb_i2c.c b/ports/stm32/pyb_i2c.c
index 0cbb640473b82..9aac9274e05f0 100644
--- a/ports/stm32/pyb_i2c.c
+++ b/ports/stm32/pyb_i2c.c
@@ -478,8 +478,20 @@ void i2c_ev_irq_handler(mp_uint_t i2c_id) {
         } else {
             hi2c->Instance->DR = I2C_7BIT_ADD_READ(hi2c->Devaddress);
         }
+        hi2c->Instance->CR2 |= I2C_CR2_DMAEN;
     } else if (hi2c->Instance->SR1 & I2C_FLAG_ADDR) {
         __IO uint32_t tmp_sr2;
+        if (hi2c->State == HAL_I2C_STATE_BUSY_RX) {
+            if (hi2c->XferCount == 1U) {
+                hi2c->Instance->CR1 &= ~I2C_CR1_ACK;
+            } else {
+                if (hi2c->XferCount == 2U) {
+                    hi2c->Instance->CR1 &= ~I2C_CR1_ACK;
+                    hi2c->Instance->CR1 |= I2C_CR1_POS;
+                }
+                hi2c->Instance->CR2 |= I2C_CR2_LAST;
+            }
+        }
         tmp_sr2 = hi2c->Instance->SR2;
         UNUSED(tmp_sr2);
     } else if (hi2c->Instance->SR1 & I2C_FLAG_BTF && hi2c->State == HAL_I2C_STATE_BUSY_TX) {

From a74e4fabeb0d7bc4dc68284047248fa173f5237b Mon Sep 17 00:00:00 2001
From: yn386 <wf.yn386@gmail.com>
Date: Mon, 19 Sep 2022 10:14:27 +0900
Subject: [PATCH 2897/3533] stm32/i2c: Fix I2C frequency calc so it doesn't
 exceed requested rate.

Prior to this commit, the actual I2C frequency can be faster than specified
one and it may exceed the I2C's specification for Fast Mode.  The frequency
of SCL should be less than or equal to 400KHz in Fast Mode.

This commit fixes this issue for F4 MCUs by rounding up the division in the
frequency calculation.
---
 docs/library/machine.I2C.rst | 4 ++++
 docs/library/pyb.I2C.rst     | 4 ++++
 ports/stm32/i2c.c            | 5 +++--
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/docs/library/machine.I2C.rst b/docs/library/machine.I2C.rst
index 2a33b1da47a31..0eb1b67f586d1 100644
--- a/docs/library/machine.I2C.rst
+++ b/docs/library/machine.I2C.rst
@@ -91,6 +91,10 @@ General Methods
      - *sda* is a pin object for the SDA line
      - *freq* is the SCL clock rate
 
+   In the case of hardware I2C the actual clock frequency may be lower than the
+   requested frequency. This is dependant on the platform hardware. The actual
+   rate may be determined by printing the I2C object.
+
 .. method:: I2C.deinit()
 
    Turn off the I2C bus.
diff --git a/docs/library/pyb.I2C.rst b/docs/library/pyb.I2C.rst
index 24b9cb8c3aaf3..2c526854aa2ec 100644
--- a/docs/library/pyb.I2C.rst
+++ b/docs/library/pyb.I2C.rst
@@ -96,6 +96,10 @@ Methods
        that DMA transfers have more precise timing but currently do not handle bus
        errors properly)
 
+   The actual clock frequency may be lower than the requested frequency.
+   This is dependant on the platform hardware. The actual rate may be determined
+   by printing the I2C object.
+
 .. method:: I2C.is_ready(addr)
 
    Check if an I2C device responds to the given address.  Only valid when in controller mode.
diff --git a/ports/stm32/i2c.c b/ports/stm32/i2c.c
index c63fe216247bd..a05a0954af405 100644
--- a/ports/stm32/i2c.c
+++ b/ports/stm32/i2c.c
@@ -70,10 +70,11 @@ int i2c_init(i2c_t *i2c, mp_hal_pin_obj_t scl, mp_hal_pin_obj_t sda, uint32_t fr
 
     // SM: MAX(4, PCLK1 / (F * 2))
     // FM, 16:9 duty: 0xc000 | MAX(1, (PCLK1 / (F * (16 + 9))))
+    // (the PCLK1-1 and +1 at the end is to round the division up)
     if (freq <= 100000) {
-        i2c->CCR = MAX(4, PCLK1 / (freq * 2));
+        i2c->CCR = MAX(4, ((PCLK1 - 1) / (freq * 2) + 1));
     } else {
-        i2c->CCR = 0xc000 | MAX(1, PCLK1 / (freq * 25));
+        i2c->CCR = 0xc000 | MAX(1, ((PCLK1 - 1) / (freq * 25) + 1));
     }
 
     // SM: 1000ns / (1/PCLK1) + 1 = PCLK1 * 1e-6 + 1

From 2154ee21635c85baf07e50ca1bfaf8c89cae192a Mon Sep 17 00:00:00 2001
From: yn386 <wf.yn386@gmail.com>
Date: Sat, 22 Oct 2022 16:56:56 +0900
Subject: [PATCH 2898/3533] stm32/adc: Fix reading internal ADC channels on L4
 MCUs.

For STM32L4 series, the internal sensors are connected to:
- ADC1_IN0: Internal voltage reference
- ADC1_IN17: Temperature sensor
- ADC1_IN18: VBAT battery voltage monitoring
but ADC_CHANNEL_VREFINT, ADC_CHANNEL_VBAT, ADC_CHANNEL_TEMPSENSOR are not
defined as 0, 17, 18.

This commit converts channel 0, 17, 18 to ADC_CHANNEL_x in
adc_get_internal_channel().
---
 ports/stm32/adc.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/ports/stm32/adc.c b/ports/stm32/adc.c
index 02bbbb58db9e5..5aa7ce42624ab 100644
--- a/ports/stm32/adc.c
+++ b/ports/stm32/adc.c
@@ -216,6 +216,14 @@ static inline uint32_t adc_get_internal_channel(uint32_t channel) {
     if (channel == 16) {
         channel = ADC_CHANNEL_TEMPSENSOR;
     }
+    #elif defined(STM32L4)
+    if (channel == 0) {
+        channel = ADC_CHANNEL_VREFINT;
+    } else if (channel == 17) {
+        channel = ADC_CHANNEL_TEMPSENSOR;
+    } else if (channel == 18) {
+        channel = ADC_CHANNEL_VBAT;
+    }
     #endif
     return channel;
 }

From f6b5d1838b2c76cf4e5a18509c8fad91dbb01ed9 Mon Sep 17 00:00:00 2001
From: yn386 <wf.yn386@gmail.com>
Date: Sat, 22 Oct 2022 16:19:58 +0900
Subject: [PATCH 2899/3533] stm32/adc: Fix ADCAll.read_core_temp() on L4 MCUs.

TS_CAL1 and TS_CAL2 of STM32L4 are at VDDA=3.0V, so the reference
correction factor should be updated before reading tempsensor.
---
 ports/stm32/adc.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/stm32/adc.c b/ports/stm32/adc.c
index 5aa7ce42624ab..2df6b7abf0841 100644
--- a/ports/stm32/adc.c
+++ b/ports/stm32/adc.c
@@ -860,9 +860,9 @@ float adc_read_core_temp_float(ADC_HandleTypeDef *adcHandle) {
         return 0;
     }
     #else
-    #if defined(STM32L1)
+    #if defined(STM32L1) || defined(STM32L4)
     // Update the reference correction factor before reading tempsensor
-    // because TS_CAL1 and TS_CAL2 of STM32L1 are at VDDA=3.0V
+    // because TS_CAL1 and TS_CAL2 of STM32L1/L4 are at VDDA=3.0V
     adc_read_core_vref(adcHandle);
     #endif
     int32_t raw_value = adc_config_and_read_ref(adcHandle, ADC_CHANNEL_TEMPSENSOR);

From d0bea69c5e81edc2895709fc308fbe3fc908a2fc Mon Sep 17 00:00:00 2001
From: yn386 <wf.yn386@gmail.com>
Date: Sun, 23 Oct 2022 09:08:19 +0900
Subject: [PATCH 2900/3533] stm32/i2c: Add hardware I2C implementation for
 STM32L1.

For STM32L1, hardware I2C can be implemented the same as STM32F4 for
machine.I2C.

Tested on NUCLEO-L152RE.
---
 ports/stm32/i2c.c         | 2 +-
 ports/stm32/machine_i2c.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ports/stm32/i2c.c b/ports/stm32/i2c.c
index a05a0954af405..cb5ec56cb2f51 100644
--- a/ports/stm32/i2c.c
+++ b/ports/stm32/i2c.c
@@ -31,7 +31,7 @@
 
 #if MICROPY_HW_ENABLE_HW_I2C
 
-#if defined(STM32F4)
+#if defined(STM32F4) || defined(STM32L1)
 
 STATIC uint16_t i2c_timeout_ms[MICROPY_HW_MAX_I2C];
 
diff --git a/ports/stm32/machine_i2c.c b/ports/stm32/machine_i2c.c
index 7718d1bfe0384..1af68bda9e5ef 100644
--- a/ports/stm32/machine_i2c.c
+++ b/ports/stm32/machine_i2c.c
@@ -38,7 +38,7 @@
 
 #define I2C_POLL_DEFAULT_TIMEOUT_US (50000) // 50ms
 
-#if defined(STM32F0) || defined(STM32F4) || defined(STM32F7) || defined(STM32H7)
+#if defined(STM32F0) || defined(STM32F4) || defined(STM32F7) || defined(STM32H7) || defined(STM32L1)
 
 typedef struct _machine_hard_i2c_obj_t {
     mp_obj_base_t base;
@@ -65,7 +65,7 @@ STATIC const machine_hard_i2c_obj_t machine_hard_i2c_obj[MICROPY_HW_MAX_I2C] = {
 STATIC void machine_hard_i2c_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     machine_hard_i2c_obj_t *self = MP_OBJ_TO_PTR(self_in);
 
-    #if defined(STM32F4)
+    #if defined(STM32F4) || defined(STM32L1)
 
     uint32_t freq = self->i2c->CR2 & 0x3f;
     uint32_t ccr = self->i2c->CCR;

From e18e47fa81c22df71cab00595aa5987be0775128 Mon Sep 17 00:00:00 2001
From: yn386 <wf.yn386@gmail.com>
Date: Sun, 23 Oct 2022 11:35:26 +0900
Subject: [PATCH 2901/3533] stm32/i2c: Add hardware I2C implementation for
 STM32L4.

For STM32L4, hardware I2C can be implemented by using TIMINGR.
This commit enables:
- Use of hardware I2C in machine.I2C.
- Specifying a frequency greater than or equal to 400KHz with pyb.I2C.
---
 ports/stm32/i2c.c         | 22 +++++++++++++++++++++-
 ports/stm32/machine_i2c.c |  4 ++--
 ports/stm32/pyb_i2c.c     | 13 ++++++++-----
 3 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/ports/stm32/i2c.c b/ports/stm32/i2c.c
index cb5ec56cb2f51..65271b3525251 100644
--- a/ports/stm32/i2c.c
+++ b/ports/stm32/i2c.c
@@ -269,11 +269,18 @@ int i2c_write(i2c_t *i2c, const uint8_t *src, size_t len, size_t next_len) {
     return num_acks;
 }
 
-#elif defined(STM32F0) || defined(STM32F7) || defined(STM32H7)
+#elif defined(STM32F0) || defined(STM32F7) || defined(STM32H7) || defined(STM32L4)
 
 #if defined(STM32H7)
 #define APB1ENR            APB1LENR
 #define RCC_APB1ENR_I2C1EN RCC_APB1LENR_I2C1EN
+#elif defined(STM32L4)
+#define APB1ENR            APB1ENR1
+#define RCC_APB1ENR_I2C1EN RCC_APB1ENR1_I2C1EN
+#if defined(STM32L432xx)
+// Not a real peripheral, only needed for i2c_id calculation in i2c_init.
+#define I2C2_BASE          (APB1PERIPH_BASE + 0x5800UL)
+#endif
 #endif
 
 STATIC uint16_t i2c_timeout_ms[MICROPY_HW_MAX_I2C];
@@ -303,6 +310,18 @@ int i2c_init(i2c_t *i2c, mp_hal_pin_obj_t scl, mp_hal_pin_obj_t sda, uint32_t fr
     i2c->OAR1 = 0;
     i2c->OAR2 = 0;
 
+    #if defined(STM32L4)
+    // These timing values are with f_I2CCLK=80MHz and are only approximate
+    if (freq >= 1000000) {
+        i2c->TIMINGR = 0x00300F33;
+    } else if (freq >= 400000) {
+        i2c->TIMINGR = 0x00702991;
+    } else if (freq >= 100000) {
+        i2c->TIMINGR = 0x10909CEC;
+    } else {
+        return -MP_EINVAL;
+    }
+    #else
     // These timing values are for f_I2CCLK=54MHz and are only approximate
     if (freq >= 1000000) {
         i2c->TIMINGR = 0x50100103;
@@ -313,6 +332,7 @@ int i2c_init(i2c_t *i2c, mp_hal_pin_obj_t scl, mp_hal_pin_obj_t sda, uint32_t fr
     } else {
         return -MP_EINVAL;
     }
+    #endif
 
     i2c->TIMEOUTR = 0;
 
diff --git a/ports/stm32/machine_i2c.c b/ports/stm32/machine_i2c.c
index 1af68bda9e5ef..f4b0b33125623 100644
--- a/ports/stm32/machine_i2c.c
+++ b/ports/stm32/machine_i2c.c
@@ -38,7 +38,7 @@
 
 #define I2C_POLL_DEFAULT_TIMEOUT_US (50000) // 50ms
 
-#if defined(STM32F0) || defined(STM32F4) || defined(STM32F7) || defined(STM32H7) || defined(STM32L1)
+#if defined(STM32F0) || defined(STM32F4) || defined(STM32F7) || defined(STM32H7) || defined(STM32L1) || defined(STM32L4)
 
 typedef struct _machine_hard_i2c_obj_t {
     mp_obj_base_t base;
@@ -186,7 +186,7 @@ STATIC void machine_hard_i2c_init(machine_hard_i2c_obj_t *self, uint32_t freq, u
 /******************************************************************************/
 /* MicroPython bindings for machine API                                       */
 
-#if defined(STM32F0) || defined(STM32F7) || defined(STM32H7)
+#if defined(STM32F0) || defined(STM32F7) || defined(STM32H7) || defined(STM32L4)
 #define MACHINE_I2C_TIMINGR (1)
 #else
 #define MACHINE_I2C_TIMINGR (0)
diff --git a/ports/stm32/pyb_i2c.c b/ports/stm32/pyb_i2c.c
index 9aac9274e05f0..89bd6b46dc13c 100644
--- a/ports/stm32/pyb_i2c.c
+++ b/ports/stm32/pyb_i2c.c
@@ -208,11 +208,14 @@ const pyb_i2c_obj_t pyb_i2c_obj[] = {
 
 #elif defined(STM32L4)
 
-// The value 0x90112626 was obtained from the DISCOVERY_I2C1_TIMING constant
-// defined in the STM32L4Cube file Drivers/BSP/STM32L476G-Discovery/stm32l476g_discovery.h
-#define MICROPY_HW_I2C_BAUDRATE_TIMING {{PYB_I2C_SPEED_STANDARD, 0x90112626}}
-#define MICROPY_HW_I2C_BAUDRATE_DEFAULT (PYB_I2C_SPEED_STANDARD)
-#define MICROPY_HW_I2C_BAUDRATE_MAX (PYB_I2C_SPEED_STANDARD)
+// generated using CubeMX
+#define MICROPY_HW_I2C_BAUDRATE_TIMING { \
+        {PYB_I2C_SPEED_STANDARD, 0x10909CEC}, \
+        {PYB_I2C_SPEED_FULL, 0x00702991}, \
+        {PYB_I2C_SPEED_FAST, 0x00300F33}, \
+}
+#define MICROPY_HW_I2C_BAUDRATE_DEFAULT (PYB_I2C_SPEED_FULL)
+#define MICROPY_HW_I2C_BAUDRATE_MAX (PYB_I2C_SPEED_FAST)
 
 #else
 #error "no I2C timings for this MCU"

From 28a5107d813d444ee32b1d81c3a347e0a807e35f Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Thu, 17 Nov 2022 17:06:30 +0100
Subject: [PATCH 2902/3533] mimxrt/mpconfigport: Remove config options that are
 set by default.

Remove every setting that is already included in
MICROPY_CONFIG_ROM_LEVEL_FULL_FEATURES.
---
 ports/mimxrt/mpconfigport.h | 65 -------------------------------------
 1 file changed, 65 deletions(-)

diff --git a/ports/mimxrt/mpconfigport.h b/ports/mimxrt/mpconfigport.h
index 88c5e9e881ead..911fd41b46206 100644
--- a/ports/mimxrt/mpconfigport.h
+++ b/ports/mimxrt/mpconfigport.h
@@ -38,7 +38,6 @@ uint32_t trng_random_u32(void);
 
 // Memory allocation policies
 #define MICROPY_GC_STACK_ENTRY_TYPE         uint16_t
-#define MICROPY_GC_ALLOC_THRESHOLD          (0)
 #define MICROPY_ALLOC_PARSE_CHUNK_INIT      (32)
 #define MICROPY_ALLOC_PATH_MAX              (256)
 
@@ -48,94 +47,31 @@ uint32_t trng_random_u32(void);
 #define MICROPY_EMIT_INLINE_THUMB           (1)
 
 // Optimisations
-#define MICROPY_OPT_MAP_LOOKUP_CACHE        (1)
-#define MICROPY_OPT_LOAD_ATTR_FAST_PATH     (1)
 
 // Python internal features
 #define MICROPY_TRACKED_ALLOC               (MICROPY_SSL_MBEDTLS)
 #define MICROPY_READER_VFS                  (1)
 #define MICROPY_ENABLE_GC                   (1)
-#define MICROPY_ENABLE_FINALISER            (1)
-#define MICROPY_STACK_CHECK                 (1)
 #define MICROPY_ENABLE_EMERGENCY_EXCEPTION_BUF  (1)
-#define MICROPY_KBD_EXCEPTION               (1)
-#define MICROPY_HELPER_REPL                 (1)
-#define MICROPY_REPL_AUTO_INDENT            (1)
 #define MICROPY_LONGINT_IMPL                (MICROPY_LONGINT_IMPL_MPZ)
-#define MICROPY_ENABLE_SOURCE_LINE          (1)
-#define MICROPY_STREAMS_NON_BLOCK           (1)
-#define MICROPY_MODULE_BUILTIN_INIT         (1)
-#define MICROPY_MODULE_WEAK_LINKS           (1)
-#define MICROPY_CAN_OVERRIDE_BUILTINS       (1)
-#define MICROPY_ENABLE_SCHEDULER            (1)
 #define MICROPY_SCHEDULER_DEPTH             (8)
 #define MICROPY_VFS                         (1)
 #define MICROPY_MODULE_FROZEN_MPY           (1)
 #define MICROPY_QSTR_EXTRA_POOL             mp_qstr_frozen_const_pool
 
 // Control over Python builtins
-#define MICROPY_PY_FUNCTION_ATTRS           (1)
-#define MICROPY_PY_DESCRIPTORS              (1)
-#define MICROPY_PY_DELATTR_SETATTR          (1)
-#define MICROPY_PY_FSTRINGS                 (1)
-#define MICROPY_PY_BUILTINS_BYTES_HEX       (1)
-#define MICROPY_PY_BUILTINS_STR_UNICODE     (1)
-#define MICROPY_PY_BUILTINS_STR_CENTER      (1)
-#define MICROPY_PY_BUILTINS_STR_PARTITION   (1)
-#define MICROPY_PY_BUILTINS_STR_SPLITLINES  (1)
-#define MICROPY_PY_BUILTINS_MEMORYVIEW      (1)
-#define MICROPY_PY_BUILTINS_SLICE_ATTRS     (1)
-#define MICROPY_PY_BUILTINS_SLICE_INDICES   (1)
-#define MICROPY_PY_BUILTINS_FROZENSET       (1)
-#define MICROPY_PY_BUILTINS_ROUND_INT       (1)
-#define MICROPY_PY_ALL_SPECIAL_METHODS      (1)
-#define MICROPY_PY_REVERSE_SPECIAL_METHODS  (1)
-#define MICROPY_PY_BUILTINS_COMPILE         (1)
-#define MICROPY_PY_BUILTINS_INPUT           (1)
-#define MICROPY_PY_BUILTINS_POW3            (1)
-#define MICROPY_PY_BUILTINS_HELP            (1)
-#define MICROPY_PY_BUILTINS_HELP_MODULES    (1)
 #define MICROPY_PY_BUILTINS_HELP_TEXT       mimxrt_help_text
-#define MICROPY_PY_MICROPYTHON_MEM_INFO     (1)
-#define MICROPY_PY_ARRAY_SLICE_ASSIGN       (1)
-#define MICROPY_PY_COLLECTIONS_DEQUE        (1)
-#define MICROPY_PY_COLLECTIONS_ORDEREDDICT  (1)
-#define MICROPY_PY_MATH_SPECIAL_FUNCTIONS   (1)
-#define MICROPY_PY_MATH_FACTORIAL           (1)
-#define MICROPY_PY_MATH_ISCLOSE             (1)
-#define MICROPY_PY_CMATH                    (1)
-#define MICROPY_PY_IO_IOBASE                (1)
-#define MICROPY_PY_SYS_MAXSIZE              (1)
 #define MICROPY_PY_SYS_PLATFORM             "mimxrt"
-#define MICROPY_PY_SYS_STDFILES             (1)
-#define MICROPY_PY_SYS_STDIO_BUFFER         (1)
-#define MICROPY_PY_UERRNO                   (1)
 
 // Extended modules
 #define MICROPY_EPOCH_IS_1970               (1)
-#define MICROPY_PY_UASYNCIO                 (1)
-#define MICROPY_PY_UCTYPES                  (1)
-#define MICROPY_PY_UZLIB                    (1)
-#define MICROPY_PY_UJSON                    (1)
-#define MICROPY_PY_URE                      (1)
-#define MICROPY_PY_URE_MATCH_GROUPS         (1)
-#define MICROPY_PY_URE_MATCH_SPAN_START_END (1)
-#define MICROPY_PY_URE_SUB                  (1)
 #define MICROPY_PY_USSL_FINALISER           (MICROPY_PY_USSL)
-#define MICROPY_PY_UHASHLIB                 (1)
-#define MICROPY_PY_UBINASCII                (1)
-#define MICROPY_PY_UBINASCII_CRC32          (1)
 #define MICROPY_PY_UTIME_MP_HAL             (1)
-#define MICROPY_PY_UOS                      (1)
 #define MICROPY_PY_UOS_INCLUDEFILE          "ports/mimxrt/moduos.c"
 #define MICROPY_PY_OS_DUPTERM               (3)
 #define MICROPY_PY_UOS_DUPTERM_NOTIFY       (1)
 #define MICROPY_PY_UOS_UNAME                (1)
-#define MICROPY_PY_UOS_URANDOM              (1)
-#define MICROPY_PY_URANDOM                  (1)
-#define MICROPY_PY_URANDOM_EXTRA_FUNCS      (1)
 #define MICROPY_PY_URANDOM_SEED_INIT_FUNC   (trng_random_u32())
-#define MICROPY_PY_USELECT                  (1)
 #define MICROPY_PY_MACHINE                  (1)
 #define MICROPY_PY_MACHINE_PIN_MAKE_NEW     mp_pin_make_new
 #define MICROPY_PY_MACHINE_BITSTREAM        (1)
@@ -152,7 +88,6 @@ uint32_t trng_random_u32(void);
 #define MICROPY_PY_MACHINE_SPI              (1)
 #define MICROPY_PY_MACHINE_SOFTSPI          (1)
 #define MICROPY_PY_MACHINE_TIMER            (1)
-#define MICROPY_PY_FRAMEBUF                 (1)
 #define MICROPY_PY_ONEWIRE                  (1)
 #define MICROPY_PY_UPLATFORM                (1)
 

From 67e919db329bb4db079514bb0c8cf2922affe6a3 Mon Sep 17 00:00:00 2001
From: David Lechner <david@pybricks.com>
Date: Thu, 17 Nov 2022 15:19:07 -0600
Subject: [PATCH 2903/3533] extmod/moduplatform: Remove _M_IX86 test for
 xtensa.

Since _M_IX86 is already being checked in the x86 case, it will never
be true in the xtensa case and can be removed.

Signed-off-by: David Lechner <david@pybricks.com>
---
 extmod/moduplatform.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extmod/moduplatform.h b/extmod/moduplatform.h
index 2b9ad3ae49b73..d911d33dddc26 100644
--- a/extmod/moduplatform.h
+++ b/extmod/moduplatform.h
@@ -41,7 +41,7 @@
 #define MICROPY_PLATFORM_ARCH   "x86_64"
 #elif defined(__i386__) || defined(_M_IX86)
 #define MICROPY_PLATFORM_ARCH   "x86"
-#elif defined(__xtensa__) || defined(_M_IX86)
+#elif defined(__xtensa__)
 #define MICROPY_PLATFORM_ARCH   "xtensa"
 #else
 #define MICROPY_PLATFORM_ARCH   ""

From 5b08e0361e5c38f910444e48c1f0bb29ac3e9f69 Mon Sep 17 00:00:00 2001
From: David Lechner <david@pybricks.com>
Date: Thu, 17 Nov 2022 15:36:52 -0600
Subject: [PATCH 2904/3533] extmod/moduplatform: Fix MSVC x86_64 check.

`_WIN64` is defined for all 64-bit targets, including Arm, so it doesn't
work for detecting `x86_64`. We can use `_M_X64` instead.

Signed-off-by: David Lechner <david@pybricks.com>
---
 extmod/moduplatform.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extmod/moduplatform.h b/extmod/moduplatform.h
index d911d33dddc26..42ed4de248711 100644
--- a/extmod/moduplatform.h
+++ b/extmod/moduplatform.h
@@ -37,7 +37,7 @@
 
 #if defined(__ARM_ARCH)
 #define MICROPY_PLATFORM_ARCH   "arm"
-#elif defined(__x86_64__) || defined(_WIN64)
+#elif defined(__x86_64__) || defined(_M_X64)
 #define MICROPY_PLATFORM_ARCH   "x86_64"
 #elif defined(__i386__) || defined(_M_IX86)
 #define MICROPY_PLATFORM_ARCH   "x86"

From ac5934c96b66555ba8fe43465b34cb2b2a692ff0 Mon Sep 17 00:00:00 2001
From: David Lechner <david@pybricks.com>
Date: Thu, 17 Nov 2022 15:32:19 -0600
Subject: [PATCH 2905/3533] mpy-cross/main: Add MSVC-compatible architecture
 checks.

MSVC doesn't define `__i386__` or `__x86_64__` so we have to check
`_M_IX86` and `_M_X64` as well.

Signed-off-by: David Lechner <david@pybricks.com>
---
 mpy-cross/main.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mpy-cross/main.c b/mpy-cross/main.c
index 55aefb65c1cfc..fd326439f1ce9 100644
--- a/mpy-cross/main.c
+++ b/mpy-cross/main.c
@@ -283,10 +283,10 @@ MP_NOINLINE int main_(int argc, char **argv) {
                     mp_dynamic_compiler.native_arch = MP_NATIVE_ARCH_XTENSAWIN;
                     mp_dynamic_compiler.nlr_buf_num_regs = MICROPY_NLR_NUM_REGS_XTENSAWIN;
                 } else if (strcmp(arch, "host") == 0) {
-                    #if defined(__i386__)
+                    #if defined(__i386__) || defined(_M_IX86)
                     mp_dynamic_compiler.native_arch = MP_NATIVE_ARCH_X86;
                     mp_dynamic_compiler.nlr_buf_num_regs = MICROPY_NLR_NUM_REGS_X86;
-                    #elif defined(__x86_64__)
+                    #elif defined(__x86_64__) || defined(_M_X64)
                     mp_dynamic_compiler.native_arch = MP_NATIVE_ARCH_X64;
                     mp_dynamic_compiler.nlr_buf_num_regs = MAX(MICROPY_NLR_NUM_REGS_X64, MICROPY_NLR_NUM_REGS_X64_WIN);
                     #elif defined(__arm__) && !defined(__thumb2__)

From 6873a14b6149616ba3c78ce03fb94c9a34983d19 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Tue, 22 Nov 2022 14:15:49 +1100
Subject: [PATCH 2906/3533] py/makeversionhdr.py: Allow running outside of
 repo.

If a CMake-build is run with `make BUILD=/outside/path` then
makeversionheader.py is run with the CWD set to the build directory, which
means the git version lookup will fail and silently fall back to the
mpconfig.h mode (giving the wrong result).

This commit:
 - Uses the location of makeversionheader.py to find the repo path.
 - Allows overriding this path via --repo-path.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 py/makeversionhdr.py | 41 ++++++++++++++++++++++++++++++++---------
 1 file changed, 32 insertions(+), 9 deletions(-)

diff --git a/py/makeversionhdr.py b/py/makeversionhdr.py
index d1b41e63b0845..5766330989289 100644
--- a/py/makeversionhdr.py
+++ b/py/makeversionhdr.py
@@ -6,13 +6,14 @@
 
 from __future__ import print_function
 
+import argparse
 import sys
 import os
 import datetime
 import subprocess
 
 
-def get_version_info_from_git():
+def get_version_info_from_git(repo_path):
     # Python 2.6 doesn't have check_output, so check for that
     try:
         subprocess.check_output
@@ -24,6 +25,7 @@ def get_version_info_from_git():
     try:
         git_tag = subprocess.check_output(
             ["git", "describe", "--tags", "--dirty", "--always", "--match", "v[1-9].*"],
+            cwd=repo_path,
             stderr=subprocess.STDOUT,
             universal_newlines=True,
         ).strip()
@@ -37,6 +39,7 @@ def get_version_info_from_git():
     try:
         git_hash = subprocess.check_output(
             ["git", "rev-parse", "--short", "HEAD"],
+            cwd=repo_path,
             stderr=subprocess.STDOUT,
             universal_newlines=True,
         ).strip()
@@ -48,11 +51,15 @@ def get_version_info_from_git():
     try:
         # Check if there are any modified files.
         subprocess.check_call(
-            ["git", "diff", "--no-ext-diff", "--quiet", "--exit-code"], stderr=subprocess.STDOUT
+            ["git", "diff", "--no-ext-diff", "--quiet", "--exit-code"],
+            cwd=repo_path,
+            stderr=subprocess.STDOUT,
         )
         # Check if there are any staged files.
         subprocess.check_call(
-            ["git", "diff-index", "--cached", "--quiet", "HEAD", "--"], stderr=subprocess.STDOUT
+            ["git", "diff-index", "--cached", "--quiet", "HEAD", "--"],
+            cwd=repo_path,
+            stderr=subprocess.STDOUT,
         )
     except subprocess.CalledProcessError:
         git_hash += "-dirty"
@@ -62,8 +69,8 @@ def get_version_info_from_git():
     return git_tag, git_hash
 
 
-def get_version_info_from_mpconfig():
-    with open(os.path.join(os.path.dirname(sys.argv[0]), "..", "py", "mpconfig.h")) as f:
+def get_version_info_from_mpconfig(repo_path):
+    with open(os.path.join(repo_path, "py", "mpconfig.h")) as f:
         for line in f:
             if line.startswith("#define MICROPY_VERSION_MAJOR "):
                 ver_major = int(line.strip().split()[2])
@@ -78,11 +85,11 @@ def get_version_info_from_mpconfig():
     return None
 
 
-def make_version_header(filename):
+def make_version_header(repo_path, filename):
     # Get version info using git, with fallback to py/mpconfig.h
-    info = get_version_info_from_git()
+    info = get_version_info_from_git(repo_path)
     if info is None:
-        info = get_version_info_from_mpconfig()
+        info = get_version_info_from_mpconfig(repo_path)
 
     git_tag, git_hash = info
 
@@ -119,5 +126,21 @@ def make_version_header(filename):
             f.write(file_data)
 
 
+def main():
+    parser = argparse.ArgumentParser()
+    # makeversionheader.py lives in repo/py, so default repo_path to the
+    # parent of sys.argv[0]'s directory.
+    parser.add_argument(
+        "-r",
+        "--repo-path",
+        default=os.path.join(os.path.dirname(sys.argv[0]), ".."),
+        help="path to MicroPython Git repo to query for version",
+    )
+    parser.add_argument("dest", nargs=1, help="output file path")
+    args = parser.parse_args()
+
+    make_version_header(args.repo_path, args.dest[0])
+
+
 if __name__ == "__main__":
-    make_version_header(sys.argv[1])
+    main()

From b705732d5f385721f5c50d9735252bfe10f180ec Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Tue, 22 Nov 2022 14:29:41 +1100
Subject: [PATCH 2907/3533] esp32/boards/GENERIC_S3_SPIRAM: Enable BLE.

Follow up to 8a91c719 to no longer explicitly disable BLE in
mpconfigport.h.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/esp32/boards/GENERIC_S3_SPIRAM/mpconfigboard.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ports/esp32/boards/GENERIC_S3_SPIRAM/mpconfigboard.h b/ports/esp32/boards/GENERIC_S3_SPIRAM/mpconfigboard.h
index f9126c98d76e3..1a8560a2d7ead 100644
--- a/ports/esp32/boards/GENERIC_S3_SPIRAM/mpconfigboard.h
+++ b/ports/esp32/boards/GENERIC_S3_SPIRAM/mpconfigboard.h
@@ -1,7 +1,6 @@
 #define MICROPY_HW_BOARD_NAME               "ESP32S3 module (spiram)"
 #define MICROPY_HW_MCU_NAME                 "ESP32S3"
 
-#define MICROPY_PY_BLUETOOTH                (0)
 #define MICROPY_PY_MACHINE_DAC              (0)
 
 // Enable UART REPL for modules that have an external USB-UART and don't use native USB.

From ecb46f93e071a7957f10b214d1d7da045b9d7a7d Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 23 Nov 2022 10:05:54 +1100
Subject: [PATCH 2908/3533] github/workflows: Use ubuntu-20.04 when python2 is
 required.

Python 2 is no longer included in the latest Ubuntu 22.04.

Signed-off-by: Damien George <damien@micropython.org>
---
 .github/workflows/mpy_format.yml | 2 +-
 .github/workflows/ports_unix.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/mpy_format.yml b/.github/workflows/mpy_format.yml
index d3b7a27642e55..07d22e1539247 100644
--- a/.github/workflows/mpy_format.yml
+++ b/.github/workflows/mpy_format.yml
@@ -9,7 +9,7 @@ on:
 
 jobs:
   test:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04 # use 20.04 to get python2
     steps:
     - uses: actions/checkout@v3
     - name: Install packages
diff --git a/.github/workflows/ports_unix.yml b/.github/workflows/ports_unix.yml
index 257c4c7c095bb..6d35ea510efb7 100644
--- a/.github/workflows/ports_unix.yml
+++ b/.github/workflows/ports_unix.yml
@@ -98,7 +98,7 @@ jobs:
       run: tests/run-tests.py --print-failures
 
   nanbox:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04 # use 20.04 to get python2
     steps:
     - uses: actions/checkout@v3
     - name: Install packages

From 8b5642914a3515a5a8ac62f9e543e9badee8e8a6 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 23 Nov 2022 10:06:09 +1100
Subject: [PATCH 2909/3533] github/workflows: Run mpy-format CI when tests and
 examples change.

Signed-off-by: Damien George <damien@micropython.org>
---
 .github/workflows/mpy_format.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/mpy_format.yml b/.github/workflows/mpy_format.yml
index 07d22e1539247..b69be93ef095a 100644
--- a/.github/workflows/mpy_format.yml
+++ b/.github/workflows/mpy_format.yml
@@ -5,6 +5,8 @@ on:
   pull_request:
     paths:
       - '.github/workflows/*.yml'
+      - 'examples/**'
+      - 'tests/**'
       - 'tools/**'
 
 jobs:

From d75f49c0f04280f5725f635a4b041f409a25fa7d Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 23 Nov 2022 10:16:18 +1100
Subject: [PATCH 2910/3533] tools/ci.sh: Don't print python2 version.

Because python2 may not be available.

Signed-off-by: Damien George <damien@micropython.org>
---
 tools/ci.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tools/ci.sh b/tools/ci.sh
index 2005034c4aa14..0522702049a17 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -512,7 +512,6 @@ function ci_unix_32bit_setup {
     sudo pip3 install setuptools
     sudo pip3 install pyelftools
     gcc --version
-    python2 --version
     python3 --version
 }
 

From 1d27c7d423f4e7b2c1f2e9b68d99a33ac26d81eb Mon Sep 17 00:00:00 2001
From: Laurens Valk <laurens@pybricks.com>
Date: Mon, 21 Nov 2022 15:13:24 +0100
Subject: [PATCH 2911/3533] tests/misc: Add test for cexample module.

This also moves the existing test for cexample.add_ints
originally done in extra_coverage.

Signed-off-by: Laurens Valk <laurens@pybricks.com>
---
 tests/misc/cexample_module.py     | 14 ++++++++++++++
 tests/misc/cexample_module.py.exp |  2 ++
 tests/unix/extra_coverage.py      |  5 -----
 tests/unix/extra_coverage.py.exp  |  1 -
 4 files changed, 16 insertions(+), 6 deletions(-)
 create mode 100644 tests/misc/cexample_module.py
 create mode 100644 tests/misc/cexample_module.py.exp

diff --git a/tests/misc/cexample_module.py b/tests/misc/cexample_module.py
new file mode 100644
index 0000000000000..cf1d46f7509e5
--- /dev/null
+++ b/tests/misc/cexample_module.py
@@ -0,0 +1,14 @@
+# test custom builtin module
+
+try:
+    import cexample
+except ImportError:
+    print("SKIP")
+    raise SystemExit
+
+print(cexample)
+
+d = dir(cexample)
+d.index("add_ints")
+
+print(cexample.add_ints(1, 3))
diff --git a/tests/misc/cexample_module.py.exp b/tests/misc/cexample_module.py.exp
new file mode 100644
index 0000000000000..81fcc2f2dda80
--- /dev/null
+++ b/tests/misc/cexample_module.py.exp
@@ -0,0 +1,2 @@
+<module 'cexample'>
+4
diff --git a/tests/unix/extra_coverage.py b/tests/unix/extra_coverage.py
index 00226a68e6010..a51b5b856a271 100644
--- a/tests/unix/extra_coverage.py
+++ b/tests/unix/extra_coverage.py
@@ -49,11 +49,6 @@
 # function defined in C++ code
 print("cpp", extra_cpp_coverage())
 
-# test user C module
-import cexample
-
-print(cexample.add_ints(3, 2))
-
 # test user C module mixed with C++ code
 import cppexample
 
diff --git a/tests/unix/extra_coverage.py.exp b/tests/unix/extra_coverage.py.exp
index 2f5409b85b45f..2f8e37c5feeea 100644
--- a/tests/unix/extra_coverage.py.exp
+++ b/tests/unix/extra_coverage.py.exp
@@ -179,7 +179,6 @@ OSError
 None
 None
 cpp None
-5
 (3, 'hellocpp')
 frzstr1
 frzstr1.py

From a67989aa201817efaaefebdc7fd491358da45df8 Mon Sep 17 00:00:00 2001
From: Laurens Valk <laurens@pybricks.com>
Date: Mon, 21 Nov 2022 14:10:02 +0100
Subject: [PATCH 2912/3533] examples/usercmodule: Add example of a native C
 class.

This shows how ports can add their own custom types/classes.

It is part of the unix coverage build, so we can use it for tests too.

Signed-off-by: Laurens Valk <laurens@pybricks.com>
---
 docs/develop/cmodules.rst                     | 19 ++++++-
 examples/usercmodule/cexample/examplemodule.c | 57 +++++++++++++++++++
 tests/misc/cexample_class.py                  | 20 +++++++
 tests/misc/cexample_class.py.exp              |  2 +
 4 files changed, 95 insertions(+), 3 deletions(-)
 create mode 100644 tests/misc/cexample_class.py
 create mode 100644 tests/misc/cexample_class.py.exp

diff --git a/docs/develop/cmodules.rst b/docs/develop/cmodules.rst
index 1b3ba04da4af4..6bc2f62ab4d5a 100644
--- a/docs/develop/cmodules.rst
+++ b/docs/develop/cmodules.rst
@@ -95,9 +95,12 @@ A MicroPython user C module is a directory with the following files:
 Basic example
 -------------
 
-This simple module named ``cexample`` provides a single function
-``cexample.add_ints(a, b)`` which adds the two integer args together and returns
-the result. It can be found in the MicroPython source tree
+The ``cexample`` module provides examples for a function and a class. The
+``cexample.add_ints(a, b)`` function adds two integer args together and returns
+the result. The ``cexample.Timer()`` type creates timers that can be used to
+measure the elapsed time since the object is instantiated.
+
+The module can be found in the MicroPython source tree
 `in the examples directory <https://github.com/micropython/micropython/tree/master/examples/usercmodule/cexample>`_
 and has a source file and a Makefile fragment with content as described above::
 
@@ -272,3 +275,13 @@ can now be accessed in Python just like any other builtin module, e.g.
     import cexample
     print(cexample.add_ints(1, 3))
     # should display 4
+
+.. code-block:: python
+
+    from cexample import Timer
+    from time import sleep_ms
+
+    watch = Timer()
+    sleep_ms(1000)
+    print(watch.time())
+    # should display approximately 1000
diff --git a/examples/usercmodule/cexample/examplemodule.c b/examples/usercmodule/cexample/examplemodule.c
index 93a58be2ed280..b2457b28011af 100644
--- a/examples/usercmodule/cexample/examplemodule.c
+++ b/examples/usercmodule/cexample/examplemodule.c
@@ -1,6 +1,9 @@
 // Include MicroPython API.
 #include "py/runtime.h"
 
+// Used to get the time in the Timer class example.
+#include "py/mphal.h"
+
 // This is the function which will be called from Python as cexample.add_ints(a, b).
 STATIC mp_obj_t example_add_ints(mp_obj_t a_obj, mp_obj_t b_obj) {
     // Extract the ints from the micropython input objects.
@@ -13,6 +16,59 @@ STATIC mp_obj_t example_add_ints(mp_obj_t a_obj, mp_obj_t b_obj) {
 // Define a Python reference to the function above.
 STATIC MP_DEFINE_CONST_FUN_OBJ_2(example_add_ints_obj, example_add_ints);
 
+// This structure represents Timer instance objects.
+typedef struct _example_Timer_obj_t {
+    // All objects start with the base.
+    mp_obj_base_t base;
+    // Everything below can be thought of as instance attributes, but they
+    // cannot be accessed by MicroPython code directly. In this example we
+    // store the time at which the object was created.
+    mp_uint_t start_time;
+} example_Timer_obj_t;
+
+// This is the Timer.time() method. After creating a Timer object, this
+// can be called to get the time elapsed since creating the Timer.
+STATIC mp_obj_t example_Timer_time(mp_obj_t self_in) {
+    // The first argument is self. It is cast to the *example_Timer_obj_t
+    // type so we can read its attributes.
+    example_Timer_obj_t *self = MP_OBJ_TO_PTR(self_in);
+
+    // Get the elapsed time and return it as a MicroPython integer.
+    mp_uint_t elapsed = mp_hal_ticks_ms() - self->start_time;
+    return mp_obj_new_int_from_uint(elapsed);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(example_Timer_time_obj, example_Timer_time);
+
+// This represents Timer.__new__ and Timer.__init__, which is called when
+// the user instantiates a Timer object.
+STATIC mp_obj_t example_Timer_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
+    // Allocates the new object and sets the type.
+    example_Timer_obj_t *self = m_new_obj(example_Timer_obj_t);
+    self->base.type = (mp_obj_type_t *)type;
+
+    // Initializes the time for this Timer instance.
+    self->start_time = mp_hal_ticks_ms();
+
+    // The make_new function always returns self.
+    return MP_OBJ_FROM_PTR(self);
+}
+
+// This collects all methods and other static class attributes of the Timer.
+// The table structure is similar to the module table, as detailed below.
+STATIC const mp_rom_map_elem_t example_Timer_locals_dict_table[] = {
+    { MP_ROM_QSTR(MP_QSTR_time), MP_ROM_PTR(&example_Timer_time_obj) },
+};
+STATIC MP_DEFINE_CONST_DICT(example_Timer_locals_dict, example_Timer_locals_dict_table);
+
+// This defines the type(Timer) object.
+MP_DEFINE_CONST_OBJ_TYPE(
+    example_type_Timer,
+    MP_QSTR_Timer,
+    MP_TYPE_FLAG_NONE,
+    make_new, example_Timer_make_new,
+    locals_dict, &example_Timer_locals_dict
+    );
+
 // Define all properties of the module.
 // Table entries are key/value pairs of the attribute name (a string)
 // and the MicroPython object reference.
@@ -21,6 +77,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(example_add_ints_obj, example_add_ints);
 STATIC const mp_rom_map_elem_t example_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_cexample) },
     { MP_ROM_QSTR(MP_QSTR_add_ints), MP_ROM_PTR(&example_add_ints_obj) },
+    { MP_ROM_QSTR(MP_QSTR_Timer),    MP_ROM_PTR(&example_type_Timer) },
 };
 STATIC MP_DEFINE_CONST_DICT(example_module_globals, example_module_globals_table);
 
diff --git a/tests/misc/cexample_class.py b/tests/misc/cexample_class.py
new file mode 100644
index 0000000000000..bdeb9a8cb21b2
--- /dev/null
+++ b/tests/misc/cexample_class.py
@@ -0,0 +1,20 @@
+# test custom native class
+
+try:
+    import cexample
+    import time
+except ImportError:
+    print("SKIP")
+    raise SystemExit
+
+t = cexample.Timer()
+
+print(t)
+print(t.time() <= 1)
+
+time.sleep_ms(100)
+
+elapsed = t.time()
+
+if not (99 <= elapsed <= 110):
+    print("Elapsed time should be approx. 100ms but it is", elapsed)
diff --git a/tests/misc/cexample_class.py.exp b/tests/misc/cexample_class.py.exp
new file mode 100644
index 0000000000000..67d98761b0a64
--- /dev/null
+++ b/tests/misc/cexample_class.py.exp
@@ -0,0 +1,2 @@
+<Timer>
+True

From 7fe7c55bb817c88981b1b237a8b4fa7762ff107a Mon Sep 17 00:00:00 2001
From: Brian Cooke <bdscooke@gmail.com>
Date: Fri, 18 Nov 2022 13:40:05 +0100
Subject: [PATCH 2913/3533] esp32/machine_timer: Fix ESP32C3 timer period
 doubling.

The original ESP32 only supports timer source clock APB so it doesn't need
and doesn't have a clk_src field.

The ESP32C3 supports timer source clock APB and XTAL so it does have a
clk_src field, and this needs to be configured to get the correct period.

Fixes #8084.
---
 ports/esp32/machine_timer.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ports/esp32/machine_timer.c b/ports/esp32/machine_timer.c
index 83fe81f6eee34..c66cb2a48d903 100644
--- a/ports/esp32/machine_timer.c
+++ b/ports/esp32/machine_timer.c
@@ -189,6 +189,9 @@ STATIC void machine_timer_enable(machine_timer_obj_t *self) {
     config.divider = TIMER_DIVIDER;
     config.intr_type = TIMER_INTR_LEVEL;
     config.counter_en = TIMER_PAUSE;
+    #if SOC_TIMER_GROUP_SUPPORT_XTAL
+    config.clk_src = TIMER_SRC_CLK_APB;
+    #endif
 
     check_esp_err(timer_init(self->group, self->index, &config));
     check_esp_err(timer_set_counter_value(self->group, self->index, 0x00000000));

From f3e4c505d1a2d29caf0a6095445c53f0b493208f Mon Sep 17 00:00:00 2001
From: Rayane Chatrieux <rayane.chatrieux@gmail.com>
Date: Mon, 11 Apr 2022 17:35:56 -0400
Subject: [PATCH 2914/3533] py/objdict: Implement dictionary union (PEP 584).

Implements dictionary union according to PEP 584's specifications, minus
the fact that dictionary entries are not guaranteed to be in insertion
order.  This feature is enabled with MICROPY_CPYTHON_COMPAT.

Includes a new test.

With the assistance of Fangrui Qin <qinf@purdue.edu>

Signed-off-by: Rayane Chatrieux <rayane.chatrieux@gmail.com>
Signed-off-by: Damien George <damien@micropython.org>
---
 py/objdict.c                   | 11 +++++++++++
 tests/basics/dict_union.py     | 36 ++++++++++++++++++++++++++++++++++
 tests/basics/dict_union.py.exp | 12 ++++++++++++
 3 files changed, 59 insertions(+)
 create mode 100644 tests/basics/dict_union.py
 create mode 100644 tests/basics/dict_union.py.exp

diff --git a/py/objdict.c b/py/objdict.c
index 7fad5fc8f4ebb..baad8a1b9ec3a 100644
--- a/py/objdict.c
+++ b/py/objdict.c
@@ -190,6 +190,17 @@ STATIC mp_obj_t dict_binary_op(mp_binary_op_t op, mp_obj_t lhs_in, mp_obj_t rhs_
                 return mp_const_false;
             }
         }
+        #if MICROPY_CPYTHON_COMPAT
+        case MP_BINARY_OP_INPLACE_OR:
+        case MP_BINARY_OP_OR: {
+            if (op == MP_BINARY_OP_OR) {
+                lhs_in = mp_obj_dict_copy(lhs_in);
+            }
+            mp_obj_t dicts[2] = {lhs_in, rhs_in};
+            dict_update(2, dicts, (mp_map_t *)&mp_const_empty_map);
+            return lhs_in;
+        }
+        #endif
         default:
             // op not supported
             return MP_OBJ_NULL;
diff --git a/tests/basics/dict_union.py b/tests/basics/dict_union.py
new file mode 100644
index 0000000000000..606b1c4c52071
--- /dev/null
+++ b/tests/basics/dict_union.py
@@ -0,0 +1,36 @@
+# Test dictionary union.
+#
+# The tests sort the resulting dictionaries for now, since map insertion
+# order is not implemented in MicroPython.
+
+try:
+    {} | {}
+except TypeError:
+    print("SKIP")
+    raise SystemExit
+
+
+def print_sorted_dict(d):
+    print(sorted(d.items()))
+
+
+def test_union(a, b):
+    print_sorted_dict(a | b)
+    print_sorted_dict(b | a)
+    a |= a
+    print_sorted_dict(a)
+    a |= b
+    print_sorted_dict(a)
+
+
+d = {}
+e = {}
+test_union(d, e)
+
+d = {1: "apple"}
+e = {1: "cheese"}
+test_union(d, e)
+
+d = {"spam": 1, "eggs": 2, "cheese": 3}
+e = {"cheese": "cheddar", "aardvark": "Ethel"}
+test_union(d, e)
diff --git a/tests/basics/dict_union.py.exp b/tests/basics/dict_union.py.exp
new file mode 100644
index 0000000000000..7a8f83bd546ce
--- /dev/null
+++ b/tests/basics/dict_union.py.exp
@@ -0,0 +1,12 @@
+[]
+[]
+[]
+[]
+[(1, 'cheese')]
+[(1, 'apple')]
+[(1, 'apple')]
+[(1, 'cheese')]
+[('aardvark', 'Ethel'), ('cheese', 'cheddar'), ('eggs', 2), ('spam', 1)]
+[('aardvark', 'Ethel'), ('cheese', 3), ('eggs', 2), ('spam', 1)]
+[('cheese', 3), ('eggs', 2), ('spam', 1)]
+[('aardvark', 'Ethel'), ('cheese', 'cheddar'), ('eggs', 2), ('spam', 1)]

From 2fcd93cdd0cf33a83346eb4a6ed47ec1404a985b Mon Sep 17 00:00:00 2001
From: Tobias Thyrrestrup <tt@LEGO.com>
Date: Fri, 14 Oct 2022 09:16:44 +0200
Subject: [PATCH 2915/3533] tools/mpremote: Allow EDITOR environment variable
 to work on Windows.

---
 tools/mpremote/mpremote/commands.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/mpremote/mpremote/commands.py b/tools/mpremote/mpremote/commands.py
index 558cd82f10800..3bd8732bd0914 100644
--- a/tools/mpremote/mpremote/commands.py
+++ b/tools/mpremote/mpremote/commands.py
@@ -174,7 +174,7 @@ def do_edit(state, args):
             os.close(dest_fd)
             state.pyb.fs_touch(src)
             state.pyb.fs_get(src, dest, progress_callback=show_progress_bar)
-            if os.system("$EDITOR '%s'" % (dest,)) == 0:
+            if os.system('%s "%s"' % (os.getenv("EDITOR"), dest)) == 0:
                 state.pyb.fs_put(dest, src, progress_callback=show_progress_bar)
         finally:
             os.unlink(dest)

From 5588647ad28ea51682fafab50b95ae9f161d18fe Mon Sep 17 00:00:00 2001
From: Laurens Valk <laurens@pybricks.com>
Date: Thu, 24 Nov 2022 09:06:49 +0100
Subject: [PATCH 2916/3533] tests/misc/cexample_module: Test class presence.

Now that the Timer class has been merged in a separate pull request,
this can be added to the module test too.

Signed-off-by: Laurens Valk <laurens@pybricks.com>
---
 tests/misc/cexample_module.py     | 2 ++
 tests/misc/cexample_module.py.exp | 1 +
 2 files changed, 3 insertions(+)

diff --git a/tests/misc/cexample_module.py b/tests/misc/cexample_module.py
index cf1d46f7509e5..c1da2ecf7ab24 100644
--- a/tests/misc/cexample_module.py
+++ b/tests/misc/cexample_module.py
@@ -7,8 +7,10 @@
     raise SystemExit
 
 print(cexample)
+print(cexample.__name__)
 
 d = dir(cexample)
 d.index("add_ints")
+d.index("Timer")
 
 print(cexample.add_ints(1, 3))
diff --git a/tests/misc/cexample_module.py.exp b/tests/misc/cexample_module.py.exp
index 81fcc2f2dda80..bb305060e90f8 100644
--- a/tests/misc/cexample_module.py.exp
+++ b/tests/misc/cexample_module.py.exp
@@ -1,2 +1,3 @@
 <module 'cexample'>
+cexample
 4

From 3c1a2a942a3264da7861891eb9852cdd2a889666 Mon Sep 17 00:00:00 2001
From: Laurens Valk <laurens@pybricks.com>
Date: Thu, 24 Nov 2022 08:58:10 +0100
Subject: [PATCH 2917/3533] tests/misc/cexample_class: Fix timing sensitivity.

This test could occasionally fail because some operations take longer
than expected. This relaxes the timing constraints and defers printing
until the very end.

Signed-off-by: Laurens Valk <laurens@pybricks.com>
---
 tests/misc/cexample_class.py     | 16 ++++++++++------
 tests/misc/cexample_class.py.exp |  1 +
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/tests/misc/cexample_class.py b/tests/misc/cexample_class.py
index bdeb9a8cb21b2..6b8718ad8cc5f 100644
--- a/tests/misc/cexample_class.py
+++ b/tests/misc/cexample_class.py
@@ -7,14 +7,18 @@
     print("SKIP")
     raise SystemExit
 
-t = cexample.Timer()
 
-print(t)
-print(t.time() <= 1)
+SLEEP_MS = 100
+TOLERANCE_MS = 20
+
+timer = cexample.Timer()
+
+t_start = timer.time()
 
 time.sleep_ms(100)
 
-elapsed = t.time()
+t_end = timer.time()
 
-if not (99 <= elapsed <= 110):
-    print("Elapsed time should be approx. 100ms but it is", elapsed)
+print(timer)
+print(0 <= t_start <= TOLERANCE_MS)
+print(SLEEP_MS - TOLERANCE_MS <= t_end <= SLEEP_MS + TOLERANCE_MS)
diff --git a/tests/misc/cexample_class.py.exp b/tests/misc/cexample_class.py.exp
index 67d98761b0a64..b9a06602a316a 100644
--- a/tests/misc/cexample_class.py.exp
+++ b/tests/misc/cexample_class.py.exp
@@ -1,2 +1,3 @@
 <Timer>
 True
+True

From 921f397acb205c4f2d2ce2d09a7873c3f29b5009 Mon Sep 17 00:00:00 2001
From: Michael Mogenson <michael.mogenson@gmail.com>
Date: Tue, 22 Nov 2022 18:35:15 -0500
Subject: [PATCH 2918/3533] tools/mpremote: Only auto connect to serial device
 with USB VID/PID.

On MacOS and Windows there are a few default serial devices that are
returned by `serial.tools.list_ports.comports()`. For example on MacOS:

```
{'description': 'n/a',
 'device': '/dev/cu.Bluetooth-Incoming-Port',
 'hwid': 'n/a',
 'interface': None,
 'location': None,
 'manufacturer': None,
 'name': 'cu.Bluetooth-Incoming-Port',
 'pid': None,
 'product': None,
 'serial_number': None,
 'vid': None}

{'description': 'n/a',
 'device': '/dev/cu.wlan-debug',
 'hwid': 'n/a',
 'interface': None,
 'location': None,
 'manufacturer': None,
 'name': 'cu.wlan-debug',
 'pid': None,
 'product': None,
 'serial_number': None,
 'vid': None}
```

Users of mpremote most likely do not want to connect to these ports. It
would be desirable if mpremote did not select this ports when using the
auto connect behavior. These serial ports do not have USB VID or PID
values and serial ports for Micropython boards with FTDI/serial-to-USB
adapter or native USB CDC/ACM support do.

Check for the presence of a USB VID / PID int value when selecting a
serial port to auto connect to. All serial ports will still be listed by
the `list` command and can still be selected by name when connecting.

Signed-off-by: Michael Mogenson <michael.mogenson@gmail.com>
---
 docs/reference/mpremote.rst         | 14 +++++++-------
 tools/mpremote/README.md            |  2 +-
 tools/mpremote/mpremote/commands.py | 15 ++++++++-------
 3 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/docs/reference/mpremote.rst b/docs/reference/mpremote.rst
index bb0686237abd4..3225fc5f244b2 100644
--- a/docs/reference/mpremote.rst
+++ b/docs/reference/mpremote.rst
@@ -19,10 +19,10 @@ The simplest way to use this tool is just by invoking it without any arguments:
 
     mpremote
 
-This command automatically detects and connects to the first available serial
-device and provides an interactive REPL.  Serial ports are opened in exclusive
-mode, so running a second (or third, etc) instance of ``mpremote`` will connect
-to subsequent serial devices, if any are available.
+This command automatically detects and connects to the first available USB
+serial device and provides an interactive REPL.  Serial ports are opened in
+exclusive mode, so running a second (or third, etc) instance of ``mpremote``
+will connect to subsequent serial devices, if any are available.
 
 
 Commands
@@ -52,7 +52,7 @@ The full list of supported commands are:
   ``<device>`` may be one of:
 
   - ``list``: list available devices
-  - ``auto``: connect to the first available device
+  - ``auto``: connect to the first available USB serial port
   - ``id:<serial>``: connect to the device with USB serial number
     ``<serial>`` (the second entry in the output from the ``connect list``
     command)
@@ -186,8 +186,8 @@ Auto connection and soft-reset
 
 Connection and disconnection will be done automatically at the start and end of
 the execution of the tool, if such commands are not explicitly given.  Automatic
-connection will search for the first available serial device. If no action is
-specified then the REPL will be entered.
+connection will search for the first available USB serial device. If no action
+is specified then the REPL will be entered.
 
 Once connected to a device, ``mpremote`` will automatically soft-reset the
 device if needed.  This clears the Python heap and restarts the interpreter,
diff --git a/tools/mpremote/README.md b/tools/mpremote/README.md
index 7f58788fbe4cb..4eb1b86fb4dbf 100644
--- a/tools/mpremote/README.md
+++ b/tools/mpremote/README.md
@@ -7,7 +7,7 @@ The simplest way to use this tool is:
 
     mpremote
 
-This will automatically connect to the device and provide an interactive REPL.
+This will automatically connect to a USB serial port and provide an interactive REPL.
 
 The full list of supported commands are:
 
diff --git a/tools/mpremote/mpremote/commands.py b/tools/mpremote/mpremote/commands.py
index 3bd8732bd0914..d05a27d9f2788 100644
--- a/tools/mpremote/mpremote/commands.py
+++ b/tools/mpremote/mpremote/commands.py
@@ -32,14 +32,15 @@ def do_connect(state, args=None):
             # Don't do implicit REPL command.
             state.did_action()
         elif dev == "auto":
-            # Auto-detect and auto-connect to the first available device.
+            # Auto-detect and auto-connect to the first available USB serial port.
             for p in sorted(serial.tools.list_ports.comports()):
-                try:
-                    state.pyb = pyboard.PyboardExtended(p.device, baudrate=115200)
-                    return
-                except pyboard.PyboardError as er:
-                    if not er.args[0].startswith("failed to access"):
-                        raise er
+                if p.vid is not None and p.pid is not None:
+                    try:
+                        state.pyb = pyboard.PyboardExtended(p.device, baudrate=115200)
+                        return
+                    except pyboard.PyboardError as er:
+                        if not er.args[0].startswith("failed to access"):
+                            raise er
             raise pyboard.PyboardError("no device found")
         elif dev.startswith("id:"):
             # Search for a device with the given serial number.

From 7543b475b141b6cee6ea920074274be9ba14fd7a Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 25 Nov 2022 12:08:43 +1100
Subject: [PATCH 2919/3533] gitignore: Simplify top-level gitignore file.

All build artefacts are now placed in build*/ directories so there's no
longer any need to hide files like .o with .gitignore.

Signed-off-by: Damien George <damien@micropython.org>
---
 .gitignore | 33 +--------------------------------
 1 file changed, 1 insertion(+), 32 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7342489927888..f33e4bec42e7e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,48 +1,17 @@
-# Compiled Sources
-###################
-*.o
-*.a
-*.elf
-*.bin
-*.map
-*.hex
-*.dis
-*.exe
-
-# Packages
-############
-
-# Logs and Databases
-######################
-*.log
-
-# VIM Swap Files
-######################
-*.swp
-
 # Build directories
-######################
 build/
 build-*/
+docs/genrst/
 
 # Test failure outputs
-######################
 tests/results/*
 
 # Python cache files
-######################
 __pycache__/
-*.pyc
 
 # Customized Makefile/project overrides
-######################
 GNUmakefile
 user.props
 
-# Generated rst files
-######################
-genrst/
-
 # MacOS desktop metadata files
-######################
 .DS_Store

From cc26bf7406dac7822de347d14a9935c101d7e8aa Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 25 Nov 2022 12:18:32 +1100
Subject: [PATCH 2920/3533] gitignore: Add comment about keeping this file
 minimal.

Signed-off-by: Damien George <damien@micropython.org>
---
 .gitignore | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/.gitignore b/.gitignore
index f33e4bec42e7e..2d20cb18970e8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,11 @@
+# This .gitignore file is intended to be minimal.
+#
+# If you find that you need additional rules, such as IDE temporary
+# files, please do so either via a global .gitignore file (registered
+# with core.excludesFile), or by adding private repository-specific
+# rules to .git/info/exclude.  See https://git-scm.com/docs/gitignore
+# for more information.
+
 # Build directories
 build/
 build-*/

From d5181034f2daa11199a1785e391c0fa8eb672de3 Mon Sep 17 00:00:00 2001
From: David Lechner <david@pybricks.com>
Date: Sat, 26 Nov 2022 12:12:00 -0600
Subject: [PATCH 2921/3533] py/bc: Fix checking for duplicate **kwargs.

The code was already checking for duplicate kwargs for named parameters but
if `**kwargs` was given as a parameter, it did not check for multiples of
the same argument name.

This fixes the issue by adding an addition test to catch duplicates and
adds a test to exercise the code.

Fixes issue #10083.

Signed-off-by: David Lechner <david@pybricks.com>
---
 py/bc.c                         |  8 +++++++-
 tests/basics/fun_calldblstar.py | 10 ++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/py/bc.c b/py/bc.c
index e002bca262d31..e1795ce410653 100644
--- a/py/bc.c
+++ b/py/bc.c
@@ -213,6 +213,7 @@ STATIC void mp_setup_code_state_helper(mp_code_state_t *code_state, size_t n_arg
                 #endif
                 if (wanted_arg_name == MP_OBJ_NEW_QSTR(arg_qstr)) {
                     if (code_state_state[n_state - 1 - j] != MP_OBJ_NULL) {
+                    error_multiple:
                         mp_raise_msg_varg(&mp_type_TypeError,
                             MP_ERROR_TEXT("function got multiple values for argument '%q'"), MP_OBJ_QSTR_VALUE(wanted_arg_name));
                     }
@@ -229,7 +230,12 @@ STATIC void mp_setup_code_state_helper(mp_code_state_t *code_state, size_t n_arg
                     MP_ERROR_TEXT("unexpected keyword argument '%q'"), MP_OBJ_QSTR_VALUE(wanted_arg_name));
                 #endif
             }
-            mp_obj_dict_store(dict, kwargs[2 * i], kwargs[2 * i + 1]);
+            mp_map_elem_t *elem = mp_map_lookup(mp_obj_dict_get_map(dict), wanted_arg_name, MP_MAP_LOOKUP_ADD_IF_NOT_FOUND);
+            if (elem->value == MP_OBJ_NULL) {
+                elem->value = kwargs[2 * i + 1];
+            } else {
+                goto error_multiple;
+            }
         continue2:;
         }
 
diff --git a/tests/basics/fun_calldblstar.py b/tests/basics/fun_calldblstar.py
index 4a503698ff728..0308f42bdb60d 100644
--- a/tests/basics/fun_calldblstar.py
+++ b/tests/basics/fun_calldblstar.py
@@ -20,3 +20,13 @@ def f(self, a, b):
 a = A()
 a.f(1, **{'b':2})
 a.f(1, **{'b':val for val in range(1)})
+
+# test for duplicate keys in **kwargs not allowed
+
+def f1(**kwargs):
+    print(kwargs)
+
+try:
+    f1(**{'a': 1, 'b': 2}, **{'b': 3, 'c': 4})
+except TypeError:
+    print('TypeError')

From 1b774b373eb7fafebaa43adf9e086a690461201d Mon Sep 17 00:00:00 2001
From: David Lechner <david@pybricks.com>
Date: Wed, 30 Mar 2022 11:32:04 -0500
Subject: [PATCH 2922/3533] github/workflows: Comment on code size change
 instead of failing CI.

This changes the code size workflow to post a comment on pull requests with
the code size report.  It also removes the error threshold so that the test
won't fail if code size increases.

Allowable code size changes are subjective, so shouldn't cause CI to fail.
In addition, failing CI tests can cause other hooks like code coverage
reports to be suppressed, so this fixes that problem as well.

Fixes issue #8464.

Signed-off-by: David Lechner <david@pybricks.com>
---
 .github/workflows/code_size.yml         | 16 ++++++-
 .github/workflows/code_size_comment.yml | 64 +++++++++++++++++++++++++
 2 files changed, 79 insertions(+), 1 deletion(-)
 create mode 100644 .github/workflows/code_size_comment.yml

diff --git a/.github/workflows/code_size.yml b/.github/workflows/code_size.yml
index 3811d91349918..d4f8b195ad900 100644
--- a/.github/workflows/code_size.yml
+++ b/.github/workflows/code_size.yml
@@ -24,4 +24,18 @@ jobs:
     - name: Build
       run: source tools/ci.sh && ci_code_size_build
     - name: Compute code size difference
-      run: tools/metrics.py diff --error-threshold 0 ~/size0 ~/size1
+      run: tools/metrics.py diff ~/size0 ~/size1 | tee > diff
+    - name: Save PR number
+      if: github.event_name == 'pull_request'
+      env:
+        PR_NUMBER: ${{ github.event.number }}
+      run: echo $PR_NUMBER > pr_number
+    - name: Upload diff
+      if: github.event_name == 'pull_request'
+      uses: actions/upload-artifact@v3
+      with:
+        name: code-size-report
+        path: |
+          diff
+          pr_number
+        retention-days: 1
diff --git a/.github/workflows/code_size_comment.yml b/.github/workflows/code_size_comment.yml
new file mode 100644
index 0000000000000..100e82f8286b0
--- /dev/null
+++ b/.github/workflows/code_size_comment.yml
@@ -0,0 +1,64 @@
+name: Code size comment
+
+on:
+  workflow_run:
+    workflows: [Check code size]
+    types: [completed]
+
+jobs:
+  comment:
+    runs-on: ubuntu-20.04
+    steps:
+      - name: 'Download artifact'
+        id: download-artifact
+        uses: actions/github-script@v6
+        with:
+          script: |
+            const fs = require('fs');
+
+            const allArtifacts = await github.rest.actions.listWorkflowRunArtifacts({
+               owner: context.repo.owner,
+               repo: context.repo.repo,
+               run_id: context.payload.workflow_run.id,
+            });
+
+            const matchArtifact = allArtifacts.data.artifacts.filter((artifact) => {
+              return artifact.name == "code-size-report"
+            });
+
+            if (matchArtifact.length === 0) {
+              return false;
+            }
+
+            const download = await github.rest.actions.downloadArtifact({
+               owner: context.repo.owner,
+               repo: context.repo.repo,
+               artifact_id: matchArtifact[0].id,
+               archive_format: 'zip',
+            });
+
+            fs.writeFileSync(`${process.env.GITHUB_WORKSPACE}/code-size-report.zip`, Buffer.from(download.data));
+
+            return true;
+      - name: 'Unzip artifact'
+        if: steps.download-artifact.outputs.result
+        run: unzip code-size-report.zip
+      - name: Post comment to pull request
+        if: steps.download-artifact.outputs.result
+        uses: actions/github-script@v6
+        with:
+          github-token: ${{secrets.GITHUB_TOKEN}}
+          script: |
+            const fs = require('fs');
+
+            github.rest.issues.createComment({
+              issue_number: Number(fs.readFileSync('pr_number')),
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              body: `Code size report:
+
+            \`\`\`
+            ${fs.readFileSync('diff')}
+            \`\`\`
+            `,
+            });

From 771c16f3d9d10f596b77c85bc12d49b027a37130 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 23 Nov 2022 21:41:48 +1100
Subject: [PATCH 2923/3533] stm32/mboot: Make all mboot sectors erase/write
 protected.

Prior to this commit, only sector 0 was erase/write protected, which may
not be enough to protect all of mboot (especially if mboot lives at a
higher address than the start of flash).

This commit makes sure all internal flash sectors that mboot lives in are
protected from erasing and writing.  The linker script must define
_mboot_writable_flash_start for this to work.

Signed-off-by: Damien George <damien@micropython.org>
---
 .../stm32/boards/LEGO_HUB_NO6/mboot_memory.ld |  3 +++
 ports/stm32/mboot/main.c                      | 23 +++++++++++++++----
 ports/stm32/mboot/mboot.h                     |  1 +
 ports/stm32/mboot/stm32_memory.ld             |  4 ++++
 4 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/ports/stm32/boards/LEGO_HUB_NO6/mboot_memory.ld b/ports/stm32/boards/LEGO_HUB_NO6/mboot_memory.ld
index dd914c8e88e33..f48f2056cae61 100644
--- a/ports/stm32/boards/LEGO_HUB_NO6/mboot_memory.ld
+++ b/ports/stm32/boards/LEGO_HUB_NO6/mboot_memory.ld
@@ -8,3 +8,6 @@ MEMORY
     RAM (xrw)       : ORIGIN = 0x20000000, LENGTH = 120K
 }
 
+/* Location from which mboot is allowed to write to flash.
+   Must be the start of a flash erase sector. */
+_mboot_writable_flash_start = ORIGIN(FLASH_BL) + LENGTH(FLASH_BL);
diff --git a/ports/stm32/mboot/main.c b/ports/stm32/mboot/main.c
index 734c6a3b7d4ef..74c70e76e6128 100644
--- a/ports/stm32/mboot/main.c
+++ b/ports/stm32/mboot/main.c
@@ -108,9 +108,15 @@
 // These bits are used to detect valid application firmware at APPLICATION_ADDR
 #define APP_VALIDITY_BITS (0x00000003)
 
+// Symbol provided by the linker, at the address in flash where mboot can start erasing/writing.
+extern uint8_t _mboot_writable_flash_start;
+
 // For 1ms system ticker.
 volatile uint32_t systick_ms;
 
+// The sector number of the first sector that can be erased/written.
+int32_t first_writable_flash_sector;
+
 // Global dfu state
 dfu_context_t dfu_context SECTION_NOZERO_BSS;
 
@@ -403,7 +409,6 @@ void mp_hal_pin_config_speed(uint32_t port_pin, uint32_t speed) {
 #if defined(STM32WB)
 #define FLASH_END FLASH_END_ADDR
 #endif
-#define APPLICATION_FLASH_LENGTH (FLASH_END + 1 - APPLICATION_ADDR)
 
 #ifndef MBOOT_SPIFLASH_LAYOUT
 #define MBOOT_SPIFLASH_LAYOUT ""
@@ -431,7 +436,9 @@ void mp_hal_pin_config_speed(uint32_t port_pin, uint32_t speed) {
 
 static int mboot_flash_mass_erase(void) {
     // Erase all flash pages after mboot.
-    int ret = flash_erase(APPLICATION_ADDR, APPLICATION_FLASH_LENGTH / sizeof(uint32_t));
+    uint32_t start_addr = (uint32_t)&_mboot_writable_flash_start;
+    uint32_t num_words = (FLASH_END + 1 - start_addr) / sizeof(uint32_t);
+    int ret = flash_erase(start_addr, num_words);
     return ret;
 }
 
@@ -439,7 +446,7 @@ static int mboot_flash_page_erase(uint32_t addr, uint32_t *next_addr) {
     uint32_t sector_size = 0;
     uint32_t sector_start = 0;
     int32_t sector = flash_get_sector_info(addr, &sector_start, &sector_size);
-    if (sector <= 0) {
+    if (sector < first_writable_flash_sector) {
         // Don't allow to erase the sector with this bootloader in it, or invalid sectors
         dfu_context.status = DFU_STATUS_ERROR_ADDRESS;
         dfu_context.error = (sector == 0) ? MBOOT_ERROR_STR_OVERWRITE_BOOTLOADER_IDX
@@ -467,8 +474,8 @@ static int mboot_flash_page_erase(uint32_t addr, uint32_t *next_addr) {
 
 static int mboot_flash_write(uint32_t addr, const uint8_t *src8, size_t len) {
     int32_t sector = flash_get_sector_info(addr, NULL, NULL);
-    if (sector <= 0) {
-        // Don't allow to write the sector with this bootloader in it
+    if (sector < first_writable_flash_sector) {
+        // Don't allow to write the sector with this bootloader in it, or invalid sectors.
         dfu_context.status = DFU_STATUS_ERROR_ADDRESS;
         dfu_context.error = (sector == 0) ? MBOOT_ERROR_STR_OVERWRITE_BOOTLOADER_IDX
                                           : MBOOT_ERROR_STR_INVALID_ADDRESS_IDX;
@@ -1379,6 +1386,12 @@ void stm32_main(uint32_t initial_r0) {
     __ASM volatile ("msr basepri_max, %0" : : "r" (pri) : "memory");
     #endif
 
+    // Compute the first erasable/writable internal flash sector.
+    first_writable_flash_sector = flash_get_sector_info((uint32_t)&_mboot_writable_flash_start, NULL, NULL);
+    if (first_writable_flash_sector < 0) {
+        first_writable_flash_sector = INT32_MAX;
+    }
+
     #if defined(MBOOT_SPIFLASH_ADDR)
     MBOOT_SPIFLASH_SPIFLASH->config = MBOOT_SPIFLASH_CONFIG;
     mp_spiflash_init(MBOOT_SPIFLASH_SPIFLASH);
diff --git a/ports/stm32/mboot/mboot.h b/ports/stm32/mboot/mboot.h
index d86fe57303fbd..2fce9a230d2b1 100644
--- a/ports/stm32/mboot/mboot.h
+++ b/ports/stm32/mboot/mboot.h
@@ -169,6 +169,7 @@ typedef uint32_t mboot_addr_t;
 
 extern volatile uint32_t systick_ms;
 extern uint8_t _estack[ELEM_DATA_SIZE];
+extern int32_t first_writable_flash_sector;
 
 void systick_init(void);
 void led_init(void);
diff --git a/ports/stm32/mboot/stm32_memory.ld b/ports/stm32/mboot/stm32_memory.ld
index cfcac4096b6d1..ef1b83f30bf72 100644
--- a/ports/stm32/mboot/stm32_memory.ld
+++ b/ports/stm32/mboot/stm32_memory.ld
@@ -8,3 +8,7 @@ MEMORY
     FLASH_BL (rx)   : ORIGIN = 0x08000000, LENGTH = 32K
     RAM (xrw)       : ORIGIN = 0x20000000, LENGTH = 120K
 }
+
+/* Location from which mboot is allowed to write to flash.
+   Must be the start of a flash erase sector. */
+_mboot_writable_flash_start = ORIGIN(FLASH_BL) + LENGTH(FLASH_BL);

From fb7d211530d842b6efdc230c8834d9d0bd6f6f67 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Mon, 28 Nov 2022 12:21:27 +0100
Subject: [PATCH 2924/3533] stm32/boards: Add missing LPUART macros for H7 HAL.

The STM32H7xx HAL LPUART AF macros are missing the number, this HAL is the
only one that's inconsistent in the way it defines LPUART AF macros, so we
only need to define them for H7.
---
 ports/stm32/boards/stm32h7xx_hal_conf_base.h | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/ports/stm32/boards/stm32h7xx_hal_conf_base.h b/ports/stm32/boards/stm32h7xx_hal_conf_base.h
index 08928ed5933cd..9c5ec8cb2c59a 100644
--- a/ports/stm32/boards/stm32h7xx_hal_conf_base.h
+++ b/ports/stm32/boards/stm32h7xx_hal_conf_base.h
@@ -101,4 +101,10 @@
 // HAL parameter assertions are disabled
 #define assert_param(expr) ((void)0)
 
+// The STM32H7xx HAL defines LPUART1 AF macros without numbers.
+#ifndef GPIO_AF3_LPUART1
+#define GPIO_AF3_LPUART1 GPIO_AF3_LPUART
+#define GPIO_AF8_LPUART1 GPIO_AF8_LPUART
+#endif
+
 #endif // MICROPY_INCLUDED_STM32H7XX_HAL_CONF_BASE_H

From f724d90e6c0c6dadf0a746ba1413517d6ce497db Mon Sep 17 00:00:00 2001
From: Laurens Valk <laurens@pybricks.com>
Date: Tue, 29 Nov 2022 10:38:57 +0100
Subject: [PATCH 2925/3533] py/modmicropython: Make module optional.

This module is useful, but it is not always needed. Disabling it saves
several kilobytes of build size, depending on other config options.

Signed-off-by: Laurens Valk <laurens@pybricks.com>
---
 py/modmicropython.c | 4 ++++
 py/mpconfig.h       | 5 +++++
 2 files changed, 9 insertions(+)

diff --git a/py/modmicropython.c b/py/modmicropython.c
index eafff90c60eba..c717926e6631e 100644
--- a/py/modmicropython.c
+++ b/py/modmicropython.c
@@ -32,6 +32,8 @@
 #include "py/gc.h"
 #include "py/mphal.h"
 
+#if MICROPY_PY_MICROPYTHON
+
 // Various builtins specific to MicroPython runtime,
 // living in micropython module
 
@@ -211,3 +213,5 @@ const mp_obj_module_t mp_module_micropython = {
 };
 
 MP_REGISTER_MODULE(MP_QSTR_micropython, mp_module_micropython);
+
+#endif // MICROPY_PY_MICROPYTHON
diff --git a/py/mpconfig.h b/py/mpconfig.h
index 0ae6fcdd1169f..62c123bc0bed2 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -1311,6 +1311,11 @@ typedef double mp_float_t;
 #define MICROPY_PY_CMATH (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES)
 #endif
 
+// Whether to provide "micropython" module
+#ifndef MICROPY_PY_MICROPYTHON
+#define MICROPY_PY_MICROPYTHON (1)
+#endif
+
 // Whether to provide "gc" module
 #ifndef MICROPY_PY_GC
 #define MICROPY_PY_GC (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_CORE_FEATURES)

From 632d43ed44afec4c3dd16429077fe6505bf2733d Mon Sep 17 00:00:00 2001
From: Laurens Valk <laurens@pybricks.com>
Date: Tue, 29 Nov 2022 12:31:09 +0100
Subject: [PATCH 2926/3533] py/mpconfig: Include micropython module in core
 features.

This excludes it from the minimal builds.

Signed-off-by: Laurens Valk <laurens@pybricks.com>
---
 py/mpconfig.h                   | 2 +-
 tests/basics/nanbox_smallint.py | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/py/mpconfig.h b/py/mpconfig.h
index 62c123bc0bed2..765a8f45ce611 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -1313,7 +1313,7 @@ typedef double mp_float_t;
 
 // Whether to provide "micropython" module
 #ifndef MICROPY_PY_MICROPYTHON
-#define MICROPY_PY_MICROPYTHON (1)
+#define MICROPY_PY_MICROPYTHON (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_CORE_FEATURES)
 #endif
 
 // Whether to provide "gc" module
diff --git a/tests/basics/nanbox_smallint.py b/tests/basics/nanbox_smallint.py
index 167b196010a2d..b3a502e447e3a 100644
--- a/tests/basics/nanbox_smallint.py
+++ b/tests/basics/nanbox_smallint.py
@@ -1,6 +1,10 @@
 # Test creating small integers without heap allocation in nan-boxing mode.
 
-import micropython
+try:
+    import micropython
+except ImportError:
+    print("SKIP")
+    raise SystemExit
 
 try:
     # Test for nan-box build by allocating a float while heap is locked.

From a2347433b01cb58468da51792e7e0229ebe6453d Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 6 Dec 2022 13:34:52 +1100
Subject: [PATCH 2927/3533] py: Remove the word "yet" from exception messages.

These unimplemented features may never be implemented, and having the word
"yet" there takes up space.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/argcheck.c | 2 +-
 py/objstr.c   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/py/argcheck.c b/py/argcheck.c
index ffcca4cb65dc2..35b116ec0d414 100644
--- a/py/argcheck.c
+++ b/py/argcheck.c
@@ -143,6 +143,6 @@ NORETURN void mp_arg_error_terse_mismatch(void) {
 
 #if MICROPY_CPYTHON_COMPAT
 NORETURN void mp_arg_error_unimpl_kw(void) {
-    mp_raise_NotImplementedError(MP_ERROR_TEXT("keyword argument(s) not yet implemented - use normal args instead"));
+    mp_raise_NotImplementedError(MP_ERROR_TEXT("keyword argument(s) not implemented - use normal args instead"));
 }
 #endif
diff --git a/py/objstr.c b/py/objstr.c
index bd3e16e7f23d6..4d9dca04af59a 100644
--- a/py/objstr.c
+++ b/py/objstr.c
@@ -1118,7 +1118,7 @@ STATIC vstr_t mp_obj_str_format_helper(const char *str, const char *top, int *ar
                 arg = key_elem->value;
             }
             if (field_name < field_name_top) {
-                mp_raise_NotImplementedError(MP_ERROR_TEXT("attributes not supported yet"));
+                mp_raise_NotImplementedError(MP_ERROR_TEXT("attributes not supported"));
             }
         } else {
             if (*arg_i < 0) {

From 6503cd47afae82e7839d1f8456a397c2835bdf0b Mon Sep 17 00:00:00 2001
From: Laurens Valk <laurens@pybricks.com>
Date: Thu, 1 Dec 2022 15:52:33 +0100
Subject: [PATCH 2928/3533] docs/library/struct: Fix buffer argument
 description.

The buffer is the data in this case. There is no buffer argument.

Signed-off-by: Laurens Valk <laurens@pybricks.com>
---
 docs/library/struct.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/library/struct.rst b/docs/library/struct.rst
index 92757aba8d50a..896c027939a25 100644
--- a/docs/library/struct.rst
+++ b/docs/library/struct.rst
@@ -43,5 +43,5 @@ Functions
 .. function:: unpack_from(fmt, data, offset=0, /)
 
    Unpack from the *data* starting at *offset* according to the format string
-   *fmt*. *offset* may be negative to count from the end of *buffer*. The return
+   *fmt*. *offset* may be negative to count from the end of *data*. The return
    value is a tuple of the unpacked values.

From a6fd13a02673a3723e737a5cd2443cc0375ba29e Mon Sep 17 00:00:00 2001
From: Laurens Valk <laurens@pybricks.com>
Date: Thu, 1 Dec 2022 16:30:03 +0100
Subject: [PATCH 2929/3533] docs/library/struct: Embed format tables.

Also add note about long support.

Signed-off-by: Laurens Valk <laurens@pybricks.com>
---
 docs/library/struct.rst | 57 +++++++++++++++++++++++++++++++++++++----
 1 file changed, 52 insertions(+), 5 deletions(-)

diff --git a/docs/library/struct.rst b/docs/library/struct.rst
index 896c027939a25..026cb5e8ac3b4 100644
--- a/docs/library/struct.rst
+++ b/docs/library/struct.rst
@@ -6,11 +6,58 @@
 
 |see_cpython_module| :mod:`python:struct`.
 
-Supported size/byte order prefixes: ``@``, ``<``, ``>``, ``!``.
-
-Supported format codes: ``b``, ``B``, ``h``, ``H``, ``i``, ``I``, ``l``,
-``L``, ``q``, ``Q``, ``s``, ``P``, ``f``, ``d`` (the latter 2 depending
-on the floating-point support).
+The following byte orders are supported:
+
++-----------+------------------------+----------+-----------+
+| Character | Byte order             | Size     | Alignment |
++===========+========================+==========+===========+
+| @         | native                 | native   | native    |
++-----------+------------------------+----------+-----------+
+| <         | little-endian          | standard | none      |
++-----------+------------------------+----------+-----------+
+| >         | big-endian             | standard | none      |
++-----------+------------------------+----------+-----------+
+| !         | network (= big-endian) | standard | none      |
++-----------+------------------------+----------+-----------+
+
+The following data types are supported:
+
++--------+--------------------+-------------------+---------------+
+| Format | C Type             | Python type       | Standard size |
++========+====================+===================+===============+
+| b      | signed char        | integer           | 1             |
++--------+--------------------+-------------------+---------------+
+| B      | unsigned char      | integer           | 1             |
++--------+--------------------+-------------------+---------------+
+| h      | short              | integer           | 2             |
++--------+--------------------+-------------------+---------------+
+| H      | unsigned short     | integer           | 2             |
++--------+--------------------+-------------------+---------------+
+| i      | int                | integer (`1<fn>`) | 4             |
++--------+--------------------+-------------------+---------------+
+| I      | unsigned int       | integer (`1<fn>`) | 4             |
++--------+--------------------+-------------------+---------------+
+| l      | long               | integer (`1<fn>`) | 4             |
++--------+--------------------+-------------------+---------------+
+| L      | unsigned long      | integer (`1<fn>`) | 4             |
++--------+--------------------+-------------------+---------------+
+| q      | long long          | integer (`1<fn>`) | 8             |
++--------+--------------------+-------------------+---------------+
+| Q      | unsigned long long | integer (`1<fn>`) | 8             |
++--------+--------------------+-------------------+---------------+
+| f      | float              | float (`2<fn>`)   | 4             |
++--------+--------------------+-------------------+---------------+
+| d      | double             | float (`2<fn>`)   | 8             |
++--------+--------------------+-------------------+---------------+
+| s      | char[]             | bytes             |               |
++--------+--------------------+-------------------+---------------+
+| P      | void *             | integer           |               |
++--------+--------------------+-------------------+---------------+
+
+.. _fn:
+
+(1) Requires long support when used with values larger than 30 bits.
+(2) Requires floating point support.
 
 .. admonition:: Difference to CPython
    :class: attention

From 3ecbaf1e068faf5a0cf52589ed7f88755acabd71 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Mon, 5 Dec 2022 17:31:41 +1100
Subject: [PATCH 2930/3533] docs/library/neopixel: Update GitHub URL for
 neopixel.py link.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 docs/library/neopixel.rst   | 6 ++++--
 docs/reference/glossary.rst | 2 ++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/docs/library/neopixel.rst b/docs/library/neopixel.rst
index bc3b4e68a40eb..543f2588125e0 100644
--- a/docs/library/neopixel.rst
+++ b/docs/library/neopixel.rst
@@ -7,8 +7,10 @@
 This module provides a driver for WS2818 / NeoPixel LEDs.
 
 .. note:: This module is only included by default on the ESP8266, ESP32 and RP2
-   ports. On STM32 / Pyboard, you can `download the module
-   <https://github.com/micropython/micropython/blob/master/drivers/neopixel/neopixel.py>`_
+   ports. On STM32 / Pyboard and others, you can either install the
+   ``neopixel`` package using :term:`mip`, or you can download the module
+   directly from
+   <https://raw.githubusercontent.com/micropython/micropython-lib/master/micropython/drivers/led/neopixel/neopixel.py>`_
    and copy it to the filesystem.
 
 class NeoPixel
diff --git a/docs/reference/glossary.rst b/docs/reference/glossary.rst
index 4c66f70319ba4..74524b22fd4c2 100644
--- a/docs/reference/glossary.rst
+++ b/docs/reference/glossary.rst
@@ -158,6 +158,8 @@ Glossary
         network-capable boards, and internally by tools such
         as :term:`mpremote`.
 
+        See :ref:`packages` for more information on using ``mip``.
+
     mpremote
         A tool for interacting with a MicroPython device. See :ref:`mpremote`.
 

From 96c23432f6ef448fdcccdfa6a442d64d7ed06277 Mon Sep 17 00:00:00 2001
From: David Lechner <david@pybricks.com>
Date: Tue, 6 Dec 2022 11:53:32 -0600
Subject: [PATCH 2931/3533] github/workflows: Fix code size comment workflow
 for non-PR.

This fixes the case for the code size comment action where there is no
matching artifact.  Apparently, the result of the github-script action was
not treating `false` as a boolean value.  To fix the problem we change the
result to use string.  Also add some logging to make the step a bit less
cryptic.

Signed-off-by: David Lechner <david@pybricks.com>
---
 .github/workflows/code_size_comment.yml | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/code_size_comment.yml b/.github/workflows/code_size_comment.yml
index 100e82f8286b0..6310528c9588d 100644
--- a/.github/workflows/code_size_comment.yml
+++ b/.github/workflows/code_size_comment.yml
@@ -13,6 +13,7 @@ jobs:
         id: download-artifact
         uses: actions/github-script@v6
         with:
+          result-encoding: string
           script: |
             const fs = require('fs');
 
@@ -27,7 +28,10 @@ jobs:
             });
 
             if (matchArtifact.length === 0) {
-              return false;
+              console.log('no matching artifact found');
+              console.log('result: "skip"');
+
+              return 'skip';
             }
 
             const download = await github.rest.actions.downloadArtifact({
@@ -39,12 +43,15 @@ jobs:
 
             fs.writeFileSync(`${process.env.GITHUB_WORKSPACE}/code-size-report.zip`, Buffer.from(download.data));
 
-            return true;
+            console.log('artifact downloaded to `code-size-report.zip`');
+            console.log('result: "ok"');
+
+            return 'ok';
       - name: 'Unzip artifact'
-        if: steps.download-artifact.outputs.result
+        if: steps.download-artifact.outputs.result == 'ok'
         run: unzip code-size-report.zip
       - name: Post comment to pull request
-        if: steps.download-artifact.outputs.result
+        if: steps.download-artifact.outputs.result == 'ok'
         uses: actions/github-script@v6
         with:
           github-token: ${{secrets.GITHUB_TOKEN}}

From 2283b6d68fe77b72e7beeb1bf24778834231b190 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 7 Dec 2022 14:42:35 +1100
Subject: [PATCH 2932/3533] py: Pass in address to compiled module instead of
 returning it.

This change makes it so the compiler and persistent code loader take a
mp_compiled_module_t* as their last argument, instead of returning this
struct.  This eliminates a duplicate context variable for all callers of
these functions (because the context is now stored in the
mp_compiled_module_t by the caller), and also eliminates any confusion
about which context to use after the mp_compile_to_raw_code or
mp_raw_code_load function returns (because there is now only one context,
that stored in mp_compiled_module_t.context).

Reduces code size by 16 bytes on ARM Cortex-based ports.

Signed-off-by: Damien George <damien@micropython.org>
---
 docs/develop/compiler.rst |  4 +++-
 mpy-cross/main.c          |  5 +++--
 py/bc.h                   |  2 +-
 py/builtinimport.c        |  4 +++-
 py/compile.c              | 29 +++++++++++++----------------
 py/compile.h              |  2 +-
 py/persistentcode.c       | 28 ++++++++++++----------------
 py/persistentcode.h       |  6 +++---
 8 files changed, 39 insertions(+), 41 deletions(-)

diff --git a/docs/develop/compiler.rst b/docs/develop/compiler.rst
index 4b43bc08f29dd..cac92585ff4ee 100644
--- a/docs/develop/compiler.rst
+++ b/docs/develop/compiler.rst
@@ -152,7 +152,9 @@ The most relevant method you should know about is this:
        context->module.globals = mp_globals_get();
 
        // Compile the input parse_tree to a raw-code structure.
-       mp_compiled_module_t cm = mp_compile_to_raw_code(parse_tree, source_file, is_repl, context);
+       mp_compiled_module_t cm;
+       cm.context = context;
+       mp_compile_to_raw_code(parse_tree, source_file, is_repl, &cm);
 
        // Create and return a function object that executes the outer module.
        return mp_make_function_from_raw_code(cm.rc, cm.context, NULL);
diff --git a/mpy-cross/main.c b/mpy-cross/main.c
index fd326439f1ce9..4a21d75846e0b 100644
--- a/mpy-cross/main.c
+++ b/mpy-cross/main.c
@@ -73,8 +73,9 @@ STATIC int compile_and_save(const char *file, const char *output_file, const cha
         #endif
 
         mp_parse_tree_t parse_tree = mp_parse(lex, MP_PARSE_FILE_INPUT);
-        mp_module_context_t *ctx = m_new_obj(mp_module_context_t);
-        mp_compiled_module_t cm = mp_compile_to_raw_code(&parse_tree, source_name, false, ctx);
+        mp_compiled_module_t cm;
+        cm.context = m_new_obj(mp_module_context_t);
+        mp_compile_to_raw_code(&parse_tree, source_name, false, &cm);
 
         vstr_t vstr;
         vstr_init(&vstr, 16);
diff --git a/py/bc.h b/py/bc.h
index 6350eee52e669..0e23255f764f4 100644
--- a/py/bc.h
+++ b/py/bc.h
@@ -214,7 +214,7 @@ typedef struct _mp_module_context_t {
 
 // Outer level struct defining a compiled module.
 typedef struct _mp_compiled_module_t {
-    const mp_module_context_t *context;
+    mp_module_context_t *context;
     const struct _mp_raw_code_t *rc;
     #if MICROPY_PERSISTENT_CODE_SAVE
     bool has_native;
diff --git a/py/builtinimport.c b/py/builtinimport.c
index aa31b69db92bf..6f1f7b485f04a 100644
--- a/py/builtinimport.c
+++ b/py/builtinimport.c
@@ -245,7 +245,9 @@ STATIC void do_load(mp_module_context_t *module_obj, vstr_t *file) {
     // the correct format and, if so, load and execute the file.
     #if MICROPY_HAS_FILE_READER && MICROPY_PERSISTENT_CODE_LOAD
     if (file_str[file->len - 3] == 'm') {
-        mp_compiled_module_t cm = mp_raw_code_load_file(file_str, module_obj);
+        mp_compiled_module_t cm;
+        cm.context = module_obj;
+        mp_raw_code_load_file(file_str, &cm);
         do_execute_raw_code(cm.context, cm.rc, file_str);
         return;
     }
diff --git a/py/compile.c b/py/compile.c
index 8aaf885327497..76d4c1bf5aa0a 100644
--- a/py/compile.c
+++ b/py/compile.c
@@ -3427,7 +3427,7 @@ STATIC void scope_compute_things(scope_t *scope) {
 #if !MICROPY_PERSISTENT_CODE_SAVE
 STATIC
 #endif
-mp_compiled_module_t mp_compile_to_raw_code(mp_parse_tree_t *parse_tree, qstr source_file, bool is_repl, mp_module_context_t *context) {
+void mp_compile_to_raw_code(mp_parse_tree_t *parse_tree, qstr source_file, bool is_repl, mp_compiled_module_t *cm) {
     // put compiler state on the stack, it's relatively small
     compiler_t comp_state = {0};
     compiler_t *comp = &comp_state;
@@ -3568,26 +3568,24 @@ mp_compiled_module_t mp_compile_to_raw_code(mp_parse_tree_t *parse_tree, qstr so
     }
 
     // construct the global qstr/const table for this module
-    mp_compiled_module_t cm;
-    cm.rc = module_scope->raw_code;
-    cm.context = context;
+    cm->rc = module_scope->raw_code;
     #if MICROPY_PERSISTENT_CODE_SAVE
-    cm.has_native = false;
+    cm->has_native = false;
     #if MICROPY_EMIT_NATIVE
     if (emit_native != NULL) {
-        cm.has_native = true;
+        cm->has_native = true;
     }
     #endif
     #if MICROPY_EMIT_INLINE_ASM
     if (comp->emit_inline_asm != NULL) {
-        cm.has_native = true;
+        cm->has_native = true;
     }
     #endif
-    cm.n_qstr = comp->emit_common.qstr_map.used;
-    cm.n_obj = comp->emit_common.const_obj_list.len;
+    cm->n_qstr = comp->emit_common.qstr_map.used;
+    cm->n_obj = comp->emit_common.const_obj_list.len;
     #endif
     if (comp->compile_error == MP_OBJ_NULL) {
-        mp_emit_common_populate_module_context(&comp->emit_common, source_file, context);
+        mp_emit_common_populate_module_context(&comp->emit_common, source_file, cm->context);
 
         #if MICROPY_DEBUG_PRINTERS
         // now that the module context is valid, the raw codes can be printed
@@ -3595,7 +3593,7 @@ mp_compiled_module_t mp_compile_to_raw_code(mp_parse_tree_t *parse_tree, qstr so
             for (scope_t *s = comp->scope_head; s != NULL; s = s->next) {
                 mp_raw_code_t *rc = s->raw_code;
                 if (rc->kind == MP_CODE_BYTECODE) {
-                    mp_bytecode_print(&mp_plat_print, rc, &cm.context->constants);
+                    mp_bytecode_print(&mp_plat_print, rc, &cm->context->constants);
                 }
             }
         }
@@ -3629,14 +3627,13 @@ mp_compiled_module_t mp_compile_to_raw_code(mp_parse_tree_t *parse_tree, qstr so
     if (comp->compile_error != MP_OBJ_NULL) {
         nlr_raise(comp->compile_error);
     }
-
-    return cm;
 }
 
 mp_obj_t mp_compile(mp_parse_tree_t *parse_tree, qstr source_file, bool is_repl) {
-    mp_module_context_t *context = m_new_obj(mp_module_context_t);
-    context->module.globals = mp_globals_get();
-    mp_compiled_module_t cm = mp_compile_to_raw_code(parse_tree, source_file, is_repl, context);
+    mp_compiled_module_t cm;
+    cm.context = m_new_obj(mp_module_context_t);
+    cm.context->module.globals = mp_globals_get();
+    mp_compile_to_raw_code(parse_tree, source_file, is_repl, &cm);
     // return function that executes the outer module
     return mp_make_function_from_raw_code(cm.rc, cm.context, NULL);
 }
diff --git a/py/compile.h b/py/compile.h
index ae87bf2a04cba..5e0fd8b31c4a8 100644
--- a/py/compile.h
+++ b/py/compile.h
@@ -37,7 +37,7 @@ mp_obj_t mp_compile(mp_parse_tree_t *parse_tree, qstr source_file, bool is_repl)
 
 #if MICROPY_PERSISTENT_CODE_SAVE
 // this has the same semantics as mp_compile
-mp_compiled_module_t mp_compile_to_raw_code(mp_parse_tree_t *parse_tree, qstr source_file, bool is_repl, mp_module_context_t *globals);
+void mp_compile_to_raw_code(mp_parse_tree_t *parse_tree, qstr source_file, bool is_repl, mp_compiled_module_t *cm);
 #endif
 
 // this is implemented in runtime.c
diff --git a/py/persistentcode.c b/py/persistentcode.c
index 5408f756cf8f9..fdc87d5cc8c3a 100644
--- a/py/persistentcode.c
+++ b/py/persistentcode.c
@@ -390,7 +390,7 @@ STATIC mp_raw_code_t *load_raw_code(mp_reader_t *reader, mp_module_context_t *co
     return rc;
 }
 
-mp_compiled_module_t mp_raw_code_load(mp_reader_t *reader, mp_module_context_t *context) {
+void mp_raw_code_load(mp_reader_t *reader, mp_compiled_module_t *cm) {
     byte header[4];
     read_bytes(reader, header, sizeof(header));
     byte arch = MPY_FEATURE_DECODE_ARCH(header[2]);
@@ -414,46 +414,42 @@ mp_compiled_module_t mp_raw_code_load(mp_reader_t *reader, mp_module_context_t *
 
     size_t n_qstr = read_uint(reader);
     size_t n_obj = read_uint(reader);
-    mp_module_context_alloc_tables(context, n_qstr, n_obj);
+    mp_module_context_alloc_tables(cm->context, n_qstr, n_obj);
 
     // Load qstrs.
     for (size_t i = 0; i < n_qstr; ++i) {
-        context->constants.qstr_table[i] = load_qstr(reader);
+        cm->context->constants.qstr_table[i] = load_qstr(reader);
     }
 
     // Load constant objects.
     for (size_t i = 0; i < n_obj; ++i) {
-        context->constants.obj_table[i] = load_obj(reader);
+        cm->context->constants.obj_table[i] = load_obj(reader);
     }
 
     // Load top-level module.
-    mp_compiled_module_t cm2;
-    cm2.rc = load_raw_code(reader, context);
-    cm2.context = context;
+    cm->rc = load_raw_code(reader, cm->context);
 
     #if MICROPY_PERSISTENT_CODE_SAVE
-    cm2.has_native = MPY_FEATURE_DECODE_ARCH(header[2]) != MP_NATIVE_ARCH_NONE;
-    cm2.n_qstr = n_qstr;
-    cm2.n_obj = n_obj;
+    cm->has_native = MPY_FEATURE_DECODE_ARCH(header[2]) != MP_NATIVE_ARCH_NONE;
+    cm->n_qstr = n_qstr;
+    cm->n_obj = n_obj;
     #endif
 
     reader->close(reader->data);
-
-    return cm2;
 }
 
-mp_compiled_module_t mp_raw_code_load_mem(const byte *buf, size_t len, mp_module_context_t *context) {
+void mp_raw_code_load_mem(const byte *buf, size_t len, mp_compiled_module_t *context) {
     mp_reader_t reader;
     mp_reader_new_mem(&reader, buf, len, 0);
-    return mp_raw_code_load(&reader, context);
+    mp_raw_code_load(&reader, context);
 }
 
 #if MICROPY_HAS_FILE_READER
 
-mp_compiled_module_t mp_raw_code_load_file(const char *filename, mp_module_context_t *context) {
+void mp_raw_code_load_file(const char *filename, mp_compiled_module_t *context) {
     mp_reader_t reader;
     mp_reader_new_file(&reader, filename);
-    return mp_raw_code_load(&reader, context);
+    mp_raw_code_load(&reader, context);
 }
 
 #endif // MICROPY_HAS_FILE_READER
diff --git a/py/persistentcode.h b/py/persistentcode.h
index e664358737613..d363f544ad558 100644
--- a/py/persistentcode.h
+++ b/py/persistentcode.h
@@ -111,9 +111,9 @@ enum {
     MP_PERSISTENT_OBJ_TUPLE,
 };
 
-mp_compiled_module_t mp_raw_code_load(mp_reader_t *reader, mp_module_context_t *ctx);
-mp_compiled_module_t mp_raw_code_load_mem(const byte *buf, size_t len, mp_module_context_t *ctx);
-mp_compiled_module_t mp_raw_code_load_file(const char *filename, mp_module_context_t *ctx);
+void mp_raw_code_load(mp_reader_t *reader, mp_compiled_module_t *ctx);
+void mp_raw_code_load_mem(const byte *buf, size_t len, mp_compiled_module_t *ctx);
+void mp_raw_code_load_file(const char *filename, mp_compiled_module_t *ctx);
 
 void mp_raw_code_save(mp_compiled_module_t *cm, mp_print_t *print);
 void mp_raw_code_save_file(mp_compiled_module_t *cm, const char *filename);

From 84071590b3d76a647fe9cd9055a089605fedc219 Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Fri, 27 Aug 2021 09:02:03 -0500
Subject: [PATCH 2933/3533] py/gc: Avoid valgrind false positives.

When you want to use the valgrind memory analysis tool on MicroPython, you
can arrange to define MICROPY_DEBUG_VALGRIND to enable use of special
valgrind macros.  For now, this only fixes `gc_get_ptr` so that it never
emits the diagnostic "Conditional jump or move depends on uninitialised
value(s)".

Signed-off-by: Jeff Epler <jepler@gmail.com>
---
 py/gc.c       | 9 +++++++++
 py/mpconfig.h | 5 +++++
 2 files changed, 14 insertions(+)

diff --git a/py/gc.c b/py/gc.c
index 120213783b2cd..7ed60fe2ccbfd 100644
--- a/py/gc.c
+++ b/py/gc.c
@@ -32,6 +32,10 @@
 #include "py/gc.h"
 #include "py/runtime.h"
 
+#if MICROPY_DEBUG_VALGRIND
+#include <valgrind/memcheck.h>
+#endif
+
 #if MICROPY_ENABLE_GC
 
 #if MICROPY_DEBUG_VERBOSE // print debugging info
@@ -449,6 +453,11 @@ void gc_collect_start(void) {
 __attribute__((no_sanitize_address))
 #endif
 static void *gc_get_ptr(void **ptrs, int i) {
+    #if MICROPY_DEBUG_VALGRIND
+    if (!VALGRIND_CHECK_MEM_IS_ADDRESSABLE(&ptrs[i], sizeof(*ptrs))) {
+        return NULL;
+    }
+    #endif
     return ptrs[i];
 }
 
diff --git a/py/mpconfig.h b/py/mpconfig.h
index 765a8f45ce611..564580c02df6c 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -510,6 +510,11 @@
 #define MICROPY_DEBUG_VM_STACK_OVERFLOW (0)
 #endif
 
+// Whether to enable extra instrumentation for valgrind
+#ifndef MICROPY_DEBUG_VALGRIND
+#define MICROPY_DEBUG_VALGRIND (0)
+#endif
+
 /*****************************************************************************/
 /* Optimisations                                                             */
 

From 9f434dd8de3c327c194d531c5496f603d6288d98 Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Fri, 27 Aug 2021 09:04:32 -0500
Subject: [PATCH 2934/3533] py/gc: Ensure a gap of one byte after the ATB.

Prior to this fix the follow crash occurred.  With a GC layout of:

    GC layout:
      alloc table at 0x3fd80428, length 32001 bytes, 128004 blocks
      finaliser table at 0x3fd88129, length 16001 bytes, 128008 blocks
      pool at 0x3fd8bfc0, length 2048064 bytes, 128004 blocks

Block 128003 is an AT_HEAD and eventually is passed to gc_mark_subtree.
This causes gc_mark_subtree to call ATB_GET_KIND(128004).  When block 1 is
created with a finaliser, the first byte of the finaliser table becomes
0x2, but ATB_GET_KIND(128004) reads these bits as AT_TAIL, and then
gc_mark_subtree references past the end of the heap, which happened to be
past the end of PSRAM on the esp32-s2.

The fix in this commit is to ensure there is a one-byte gap after the ATB
filled permanently with AT_FREE.

Fixes issue #7116.

See also https://github.com/adafruit/circuitpython/issues/5021

Signed-off-by: Jeff Epler <jepler@gmail.com>
Signed-off-by: Damien George <damien@micropython.org>
---
 py/gc.c | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/py/gc.c b/py/gc.c
index 7ed60fe2ccbfd..99eacfbe6f37c 100644
--- a/py/gc.c
+++ b/py/gc.c
@@ -95,6 +95,12 @@
 #define BLOCK_FROM_PTR(area, ptr) (((byte *)(ptr) - area->gc_pool_start) / BYTES_PER_BLOCK)
 #define PTR_FROM_BLOCK(area, block) (((block) * BYTES_PER_BLOCK + (uintptr_t)area->gc_pool_start))
 
+// After the ATB, there must be a byte filled with AT_FREE so that gc_mark_tree
+// cannot erroneously conclude that a block extends past the end of the GC heap
+// due to bit patterns in the FTB (or first block, if finalizers are disabled)
+// being interpreted as AT_TAIL.
+#define ALLOC_TABLE_GAP_BYTE (1)
+
 #if MICROPY_ENABLE_FINALISER
 // FTB = finaliser table byte
 // if set, then the corresponding block may have a finaliser
@@ -123,16 +129,16 @@ STATIC void gc_setup_area(mp_state_mem_area_t *area, void *start, void *end) {
     // => T = A * (1 + BLOCKS_PER_ATB / BLOCKS_PER_FTB + BLOCKS_PER_ATB * BYTES_PER_BLOCK)
     size_t total_byte_len = (byte *)end - (byte *)start;
     #if MICROPY_ENABLE_FINALISER
-    area->gc_alloc_table_byte_len = total_byte_len * MP_BITS_PER_BYTE / (MP_BITS_PER_BYTE + MP_BITS_PER_BYTE * BLOCKS_PER_ATB / BLOCKS_PER_FTB + MP_BITS_PER_BYTE * BLOCKS_PER_ATB * BYTES_PER_BLOCK);
+    area->gc_alloc_table_byte_len = (total_byte_len - ALLOC_TABLE_GAP_BYTE) * MP_BITS_PER_BYTE / (MP_BITS_PER_BYTE + MP_BITS_PER_BYTE * BLOCKS_PER_ATB / BLOCKS_PER_FTB + MP_BITS_PER_BYTE * BLOCKS_PER_ATB * BYTES_PER_BLOCK);
     #else
-    area->gc_alloc_table_byte_len = total_byte_len / (1 + MP_BITS_PER_BYTE / 2 * BYTES_PER_BLOCK);
+    area->gc_alloc_table_byte_len = (total_byte_len - ALLOC_TABLE_GAP_BYTE) / (1 + MP_BITS_PER_BYTE / 2 * BYTES_PER_BLOCK);
     #endif
 
     area->gc_alloc_table_start = (byte *)start;
 
     #if MICROPY_ENABLE_FINALISER
     size_t gc_finaliser_table_byte_len = (area->gc_alloc_table_byte_len * BLOCKS_PER_ATB + BLOCKS_PER_FTB - 1) / BLOCKS_PER_FTB;
-    area->gc_finaliser_table_start = area->gc_alloc_table_start + area->gc_alloc_table_byte_len;
+    area->gc_finaliser_table_start = area->gc_alloc_table_start + area->gc_alloc_table_byte_len + ALLOC_TABLE_GAP_BYTE;
     #endif
 
     size_t gc_pool_block_len = area->gc_alloc_table_byte_len * BLOCKS_PER_ATB;
@@ -143,12 +149,12 @@ STATIC void gc_setup_area(mp_state_mem_area_t *area, void *start, void *end) {
     assert(area->gc_pool_start >= area->gc_finaliser_table_start + gc_finaliser_table_byte_len);
     #endif
 
-    // clear ATBs
-    memset(area->gc_alloc_table_start, 0, area->gc_alloc_table_byte_len);
-
     #if MICROPY_ENABLE_FINALISER
-    // clear FTBs
-    memset(area->gc_finaliser_table_start, 0, gc_finaliser_table_byte_len);
+    // clear ATBs and FTBs
+    memset(area->gc_alloc_table_start, 0, gc_finaliser_table_byte_len + area->gc_alloc_table_byte_len + ALLOC_TABLE_GAP_BYTE);
+    #else
+    // clear ATBs
+    memset(area->gc_alloc_table_start, 0, area->gc_alloc_table_byte_len + ALLOC_TABLE_GAP_BYTE);
     #endif
 
     area->gc_last_free_atb_index = 0;

From d75ff422972189232345108ecd2037ac148acda1 Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Wed, 15 Sep 2021 10:54:48 -0500
Subject: [PATCH 2935/3533] unix/coverage: Add extra GC coverage test for ATB
 gap byte.

The assertion that is added here (to gc.c) fails when running this new test
if ALLOC_TABLE_GAP_BYTE is set to 0.

Signed-off-by: Jeff Epler <jepler@gmail.com>
Signed-off-by: Damien George <damien@micropython.org>
---
 ports/unix/coverage.c            | 37 ++++++++++++++++++++++++++++++++
 py/gc.c                          |  3 +++
 tests/unix/extra_coverage.py.exp |  2 ++
 3 files changed, 42 insertions(+)

diff --git a/ports/unix/coverage.c b/ports/unix/coverage.c
index 8b7fc7de67802..f545674ceeb80 100644
--- a/ports/unix/coverage.c
+++ b/ports/unix/coverage.c
@@ -1,4 +1,5 @@
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 
 #include "py/obj.h"
@@ -224,6 +225,42 @@ STATIC mp_obj_t extra_coverage(void) {
         mp_printf(&mp_plat_print, "%p\n", gc_nbytes(NULL));
     }
 
+    // GC initialisation and allocation stress test, to check the logic behind ALLOC_TABLE_GAP_BYTE
+    // (the following test should fail when ALLOC_TABLE_GAP_BYTE=0)
+    {
+        mp_printf(&mp_plat_print, "# GC part 2\n");
+
+        // check the GC is unlocked and save its state
+        assert(MP_STATE_THREAD(gc_lock_depth) == 0);
+        mp_state_mem_t mp_state_mem_orig = mp_state_ctx.mem;
+
+        // perform the test
+        unsigned heap_size = 64 * MICROPY_BYTES_PER_GC_BLOCK;
+        for (unsigned j = 0; j < 256 * MP_BYTES_PER_OBJ_WORD; ++j) {
+            char *heap = calloc(heap_size, 1);
+            gc_init(heap, heap + heap_size);
+
+            m_malloc(MICROPY_BYTES_PER_GC_BLOCK);
+            void *o = gc_alloc(MICROPY_BYTES_PER_GC_BLOCK, GC_ALLOC_FLAG_HAS_FINALISER);
+            ((mp_obj_base_t *)o)->type = NULL; // ensure type is cleared so GC doesn't look for finaliser
+            for (unsigned i = 0; i < heap_size / MICROPY_BYTES_PER_GC_BLOCK; ++i) {
+                void *p = m_malloc_maybe(MICROPY_BYTES_PER_GC_BLOCK);
+                if (!p) {
+                    break;
+                }
+                *(void **)p = o;
+                o = p;
+            }
+            gc_collect();
+            free(heap);
+            heap_size += MICROPY_BYTES_PER_GC_BLOCK / 16;
+        }
+        mp_printf(&mp_plat_print, "pass\n");
+
+        // restore the GC state (the original heap)
+        mp_state_ctx.mem = mp_state_mem_orig;
+    }
+
     // tracked allocation
     {
         #define NUM_PTRS (8)
diff --git a/py/gc.c b/py/gc.c
index 99eacfbe6f37c..3c106fd671790 100644
--- a/py/gc.c
+++ b/py/gc.c
@@ -297,6 +297,9 @@ STATIC void gc_mark_subtree(size_t block)
             n_blocks += 1;
         } while (ATB_GET_KIND(area, block + n_blocks) == AT_TAIL);
 
+        // check that the consecutive blocks didn't overflow past the end of the area
+        assert(area->gc_pool_start + (block + n_blocks) * BYTES_PER_BLOCK <= area->gc_pool_end);
+
         // check this block's children
         void **ptrs = (void **)PTR_FROM_BLOCK(area, block);
         for (size_t i = n_blocks * BYTES_PER_BLOCK / sizeof(void *); i > 0; i--, ptrs++) {
diff --git a/tests/unix/extra_coverage.py.exp b/tests/unix/extra_coverage.py.exp
index 2f8e37c5feeea..ab6d497723012 100644
--- a/tests/unix/extra_coverage.py.exp
+++ b/tests/unix/extra_coverage.py.exp
@@ -17,6 +17,8 @@ abc
 # GC
 0
 0
+# GC part 2
+pass
 # tracked allocation
 m_tracked_head = 0
 0 1

From ab0258fb1ef58c7fcadd9e964921ab5adf89b443 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 8 Dec 2022 14:11:24 +1100
Subject: [PATCH 2936/3533] py/gc: Fix debug printing of GC layout.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/gc.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/py/gc.c b/py/gc.c
index 3c106fd671790..22cfdae9985f7 100644
--- a/py/gc.c
+++ b/py/gc.c
@@ -162,6 +162,13 @@ STATIC void gc_setup_area(mp_state_mem_area_t *area, void *start, void *end) {
     #if MICROPY_GC_SPLIT_HEAP
     area->next = NULL;
     #endif
+
+    DEBUG_printf("GC layout:\n");
+    DEBUG_printf("  alloc table at %p, length " UINT_FMT " bytes, " UINT_FMT " blocks\n", MP_STATE_MEM(area).gc_alloc_table_start, MP_STATE_MEM(area).gc_alloc_table_byte_len, MP_STATE_MEM(area).gc_alloc_table_byte_len * BLOCKS_PER_ATB);
+    #if MICROPY_ENABLE_FINALISER
+    DEBUG_printf("  finaliser table at %p, length " UINT_FMT " bytes, " UINT_FMT " blocks\n", MP_STATE_MEM(area).gc_finaliser_table_start, gc_finaliser_table_byte_len, gc_finaliser_table_byte_len * BLOCKS_PER_FTB);
+    #endif
+    DEBUG_printf("  pool at %p, length " UINT_FMT " bytes, " UINT_FMT " blocks\n", MP_STATE_MEM(area).gc_pool_start, gc_pool_block_len * BYTES_PER_BLOCK, gc_pool_block_len);
 }
 
 void gc_init(void *start, void *end) {
@@ -191,13 +198,6 @@ void gc_init(void *start, void *end) {
     #if MICROPY_PY_THREAD && !MICROPY_PY_THREAD_GIL
     mp_thread_mutex_init(&MP_STATE_MEM(gc_mutex));
     #endif
-
-    DEBUG_printf("GC layout:\n");
-    DEBUG_printf("  alloc table at %p, length " UINT_FMT " bytes, " UINT_FMT " blocks\n", MP_STATE_MEM(gc_alloc_table_start), MP_STATE_MEM(gc_alloc_table_byte_len), MP_STATE_MEM(gc_alloc_table_byte_len) * BLOCKS_PER_ATB);
-    #if MICROPY_ENABLE_FINALISER
-    DEBUG_printf("  finaliser table at %p, length " UINT_FMT " bytes, " UINT_FMT " blocks\n", MP_STATE_MEM(gc_finaliser_table_start), gc_finaliser_table_byte_len, gc_finaliser_table_byte_len * BLOCKS_PER_FTB);
-    #endif
-    DEBUG_printf("  pool at %p, length " UINT_FMT " bytes, " UINT_FMT " blocks\n", MP_STATE_MEM(gc_pool_start), gc_pool_block_len * BYTES_PER_BLOCK, gc_pool_block_len);
 }
 
 #if MICROPY_GC_SPLIT_HEAP

From 7ee5afe8d16e4b53a2468df097e6e1a91b8127ce Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Fri, 5 Mar 2021 10:15:29 +1100
Subject: [PATCH 2937/3533] drivers/bus: Detect QSPI transfer errors and pass
 up to spiflash driver.

This changes the signatures of QSPI write_cmd_data, write_cmd_addr_data and
read_cmd_qaddr_qdata so they return an error code.  The softqspi and stm32
hardware qspi driver are updated to follow this new signature.  Also the
spiflash driver is updated to use these new return values.

Signed-off-by: Damien George <damien@micropython.org>
---
 drivers/bus/qspi.h        |  6 +--
 drivers/bus/softqspi.c    |  9 ++--
 drivers/memory/spiflash.c | 94 ++++++++++++++++++++++++++-------------
 drivers/memory/spiflash.h |  6 +--
 ports/stm32/qspi.c        | 31 +++++++++++--
 ports/stm32/spibdev.c     | 24 +++++-----
 6 files changed, 117 insertions(+), 53 deletions(-)

diff --git a/drivers/bus/qspi.h b/drivers/bus/qspi.h
index 7dfaaf3d40c63..33f482127d722 100644
--- a/drivers/bus/qspi.h
+++ b/drivers/bus/qspi.h
@@ -41,10 +41,10 @@ enum {
 
 typedef struct _mp_qspi_proto_t {
     int (*ioctl)(void *self, uint32_t cmd);
-    void (*write_cmd_data)(void *self, uint8_t cmd, size_t len, uint32_t data);
-    void (*write_cmd_addr_data)(void *self, uint8_t cmd, uint32_t addr, size_t len, const uint8_t *src);
+    int (*write_cmd_data)(void *self, uint8_t cmd, size_t len, uint32_t data);
+    int (*write_cmd_addr_data)(void *self, uint8_t cmd, uint32_t addr, size_t len, const uint8_t *src);
     uint32_t (*read_cmd)(void *self, uint8_t cmd, size_t len);
-    void (*read_cmd_qaddr_qdata)(void *self, uint8_t cmd, uint32_t addr, size_t len, uint8_t *dest);
+    int (*read_cmd_qaddr_qdata)(void *self, uint8_t cmd, uint32_t addr, size_t len, uint8_t *dest);
 } mp_qspi_proto_t;
 
 typedef struct _mp_soft_qspi_obj_t {
diff --git a/drivers/bus/softqspi.c b/drivers/bus/softqspi.c
index 71ab559768b1b..6ede29dcd787b 100644
--- a/drivers/bus/softqspi.c
+++ b/drivers/bus/softqspi.c
@@ -158,15 +158,16 @@ STATIC void mp_soft_qspi_qwrite(mp_soft_qspi_obj_t *self, size_t len, const uint
     //mp_hal_pin_input(self->io1);
 }
 
-STATIC void mp_soft_qspi_write_cmd_data(void *self_in, uint8_t cmd, size_t len, uint32_t data) {
+STATIC int mp_soft_qspi_write_cmd_data(void *self_in, uint8_t cmd, size_t len, uint32_t data) {
     mp_soft_qspi_obj_t *self = (mp_soft_qspi_obj_t*)self_in;
     uint32_t cmd_buf = cmd | data << 8;
     CS_LOW(self);
     mp_soft_qspi_transfer(self, 1 + len, (uint8_t*)&cmd_buf, NULL);
     CS_HIGH(self);
+    return 0;
 }
 
-STATIC void mp_soft_qspi_write_cmd_addr_data(void *self_in, uint8_t cmd, uint32_t addr, size_t len, const uint8_t *src) {
+STATIC int mp_soft_qspi_write_cmd_addr_data(void *self_in, uint8_t cmd, uint32_t addr, size_t len, const uint8_t *src) {
     mp_soft_qspi_obj_t *self = (mp_soft_qspi_obj_t*)self_in;
     uint8_t cmd_buf[5] = {cmd};
     uint8_t addr_len = mp_spi_set_addr_buff(&cmd_buf[1], addr);
@@ -174,6 +175,7 @@ STATIC void mp_soft_qspi_write_cmd_addr_data(void *self_in, uint8_t cmd, uint32_
     mp_soft_qspi_transfer(self, addr_len + 1, cmd_buf, NULL);
     mp_soft_qspi_transfer(self, len, src, NULL);
     CS_HIGH(self);
+    return 0;
 }
 
 STATIC uint32_t mp_soft_qspi_read_cmd(void *self_in, uint8_t cmd, size_t len) {
@@ -185,7 +187,7 @@ STATIC uint32_t mp_soft_qspi_read_cmd(void *self_in, uint8_t cmd, size_t len) {
     return cmd_buf >> 8;
 }
 
-STATIC void mp_soft_qspi_read_cmd_qaddr_qdata(void *self_in, uint8_t cmd, uint32_t addr, size_t len, uint8_t *dest) {
+STATIC int mp_soft_qspi_read_cmd_qaddr_qdata(void *self_in, uint8_t cmd, uint32_t addr, size_t len, uint8_t *dest) {
     mp_soft_qspi_obj_t *self = (mp_soft_qspi_obj_t*)self_in;
     uint8_t cmd_buf[7] = {cmd};
     uint8_t addr_len = mp_spi_set_addr_buff(&cmd_buf[1], addr);
@@ -194,6 +196,7 @@ STATIC void mp_soft_qspi_read_cmd_qaddr_qdata(void *self_in, uint8_t cmd, uint32
     mp_soft_qspi_qwrite(self, addr_len + 3, &cmd_buf[1]); // 3/4 addr bytes, 1 extra byte (0), 2 dummy bytes (4 dummy cycles)
     mp_soft_qspi_qread(self, len, dest);
     CS_HIGH(self);
+    return 0;
 }
 
 const mp_qspi_proto_t mp_soft_qspi_proto = {
diff --git a/drivers/memory/spiflash.c b/drivers/memory/spiflash.c
index 9f8dc29a734de..a71ef41f468ce 100644
--- a/drivers/memory/spiflash.c
+++ b/drivers/memory/spiflash.c
@@ -70,7 +70,8 @@ STATIC void mp_spiflash_release_bus(mp_spiflash_t *self) {
     }
 }
 
-STATIC void mp_spiflash_write_cmd_data(mp_spiflash_t *self, uint8_t cmd, size_t len, uint32_t data) {
+STATIC int mp_spiflash_write_cmd_data(mp_spiflash_t *self, uint8_t cmd, size_t len, uint32_t data) {
+    int ret = 0;
     const mp_spiflash_config_t *c = self->config;
     if (c->bus_kind == MP_SPIFLASH_BUS_SPI) {
         // Note: len/data are unused for standard SPI
@@ -78,11 +79,13 @@ STATIC void mp_spiflash_write_cmd_data(mp_spiflash_t *self, uint8_t cmd, size_t
         c->bus.u_spi.proto->transfer(c->bus.u_spi.data, 1, &cmd, NULL);
         mp_hal_pin_write(c->bus.u_spi.cs, 1);
     } else {
-        c->bus.u_qspi.proto->write_cmd_data(c->bus.u_qspi.data, cmd, len, data);
+        ret = c->bus.u_qspi.proto->write_cmd_data(c->bus.u_qspi.data, cmd, len, data);
     }
+    return ret;
 }
 
-STATIC void mp_spiflash_transfer_cmd_addr_data(mp_spiflash_t *self, uint8_t cmd, uint32_t addr, size_t len, const uint8_t *src, uint8_t *dest) {
+STATIC int mp_spiflash_transfer_cmd_addr_data(mp_spiflash_t *self, uint8_t cmd, uint32_t addr, size_t len, const uint8_t *src, uint8_t *dest) {
+    int ret = 0;
     const mp_spiflash_config_t *c = self->config;
     if (c->bus_kind == MP_SPIFLASH_BUS_SPI) {
         uint8_t buf[5] = {cmd, 0};
@@ -98,11 +101,12 @@ STATIC void mp_spiflash_transfer_cmd_addr_data(mp_spiflash_t *self, uint8_t cmd,
         mp_hal_pin_write(c->bus.u_spi.cs, 1);
     } else {
         if (dest != NULL) {
-            c->bus.u_qspi.proto->read_cmd_qaddr_qdata(c->bus.u_qspi.data, cmd, addr, len, dest);
+            ret = c->bus.u_qspi.proto->read_cmd_qaddr_qdata(c->bus.u_qspi.data, cmd, addr, len, dest);
         } else {
-            c->bus.u_qspi.proto->write_cmd_addr_data(c->bus.u_qspi.data, cmd, addr, len, src);
+            ret = c->bus.u_qspi.proto->write_cmd_addr_data(c->bus.u_qspi.data, cmd, addr, len, src);
         }
     }
+    return ret;
 }
 
 STATIC uint32_t mp_spiflash_read_cmd(mp_spiflash_t *self, uint8_t cmd, size_t len) {
@@ -119,7 +123,7 @@ STATIC uint32_t mp_spiflash_read_cmd(mp_spiflash_t *self, uint8_t cmd, size_t le
     }
 }
 
-STATIC void mp_spiflash_read_data(mp_spiflash_t *self, uint32_t addr, size_t len, uint8_t *dest) {
+STATIC int mp_spiflash_read_data(mp_spiflash_t *self, uint32_t addr, size_t len, uint8_t *dest) {
     const mp_spiflash_config_t *c = self->config;
     uint8_t cmd;
     if (c->bus_kind == MP_SPIFLASH_BUS_SPI) {
@@ -127,11 +131,11 @@ STATIC void mp_spiflash_read_data(mp_spiflash_t *self, uint32_t addr, size_t len
     } else {
         cmd = MICROPY_HW_SPI_ADDR_IS_32BIT(addr) ? CMD_C4READ_32 : CMD_C4READ;
     }
-    mp_spiflash_transfer_cmd_addr_data(self, cmd, addr, len, NULL, dest);
+    return mp_spiflash_transfer_cmd_addr_data(self, cmd, addr, len, NULL, dest);
 }
 
-STATIC void mp_spiflash_write_cmd(mp_spiflash_t *self, uint8_t cmd) {
-    mp_spiflash_write_cmd_data(self, cmd, 0, 0);
+STATIC int mp_spiflash_write_cmd(mp_spiflash_t *self, uint8_t cmd) {
+    return mp_spiflash_write_cmd_data(self, cmd, 0, 0);
 }
 
 STATIC int mp_spiflash_wait_sr(mp_spiflash_t *self, uint8_t mask, uint8_t val, uint32_t timeout) {
@@ -208,36 +212,50 @@ void mp_spiflash_deepsleep(mp_spiflash_t *self, int value) {
 }
 
 STATIC int mp_spiflash_erase_block_internal(mp_spiflash_t *self, uint32_t addr) {
+    int ret = 0;
     // enable writes
-    mp_spiflash_write_cmd(self, CMD_WREN);
+    ret = mp_spiflash_write_cmd(self, CMD_WREN);
+    if (ret != 0) {
+        return ret;
+    }
 
     // wait WEL=1
-    int ret = mp_spiflash_wait_wel1(self);
+    ret = mp_spiflash_wait_wel1(self);
     if (ret != 0) {
         return ret;
     }
 
     // erase the sector
     uint8_t cmd = MICROPY_HW_SPI_ADDR_IS_32BIT(addr) ? CMD_SEC_ERASE_32 : CMD_SEC_ERASE;
-    mp_spiflash_transfer_cmd_addr_data(self, cmd, addr, 0, NULL, NULL);
+    ret = mp_spiflash_transfer_cmd_addr_data(self, cmd, addr, 0, NULL, NULL);
+    if (ret != 0) {
+        return ret;
+    }
 
     // wait WIP=0
     return mp_spiflash_wait_wip0(self);
 }
 
 STATIC int mp_spiflash_write_page(mp_spiflash_t *self, uint32_t addr, size_t len, const uint8_t *src) {
+    int ret = 0;
     // enable writes
-    mp_spiflash_write_cmd(self, CMD_WREN);
+    ret = mp_spiflash_write_cmd(self, CMD_WREN);
+    if (ret != 0) {
+        return ret;
+    }
 
     // wait WEL=1
-    int ret = mp_spiflash_wait_wel1(self);
+    ret = mp_spiflash_wait_wel1(self);
     if (ret != 0) {
         return ret;
     }
 
     // write the page
     uint8_t cmd = MICROPY_HW_SPI_ADDR_IS_32BIT(addr) ? CMD_WRITE_32 : CMD_WRITE;
-    mp_spiflash_transfer_cmd_addr_data(self, cmd, addr, len, src, NULL);
+    ret = mp_spiflash_transfer_cmd_addr_data(self, cmd, addr, len, src, NULL);
+    if (ret != 0) {
+        return ret;
+    }
 
     // wait WIP=0
     return mp_spiflash_wait_wip0(self);
@@ -253,13 +271,14 @@ int mp_spiflash_erase_block(mp_spiflash_t *self, uint32_t addr) {
     return ret;
 }
 
-void mp_spiflash_read(mp_spiflash_t *self, uint32_t addr, size_t len, uint8_t *dest) {
+int mp_spiflash_read(mp_spiflash_t *self, uint32_t addr, size_t len, uint8_t *dest) {
     if (len == 0) {
-        return;
+        return 0;
     }
     mp_spiflash_acquire_bus(self);
-    mp_spiflash_read_data(self, addr, len, dest);
+    int ret = mp_spiflash_read_data(self, addr, len, dest);
     mp_spiflash_release_bus(self);
+    return ret;
 }
 
 int mp_spiflash_write(mp_spiflash_t *self, uint32_t addr, size_t len, const uint8_t *src) {
@@ -289,9 +308,9 @@ int mp_spiflash_write(mp_spiflash_t *self, uint32_t addr, size_t len, const uint
 
 #if MICROPY_HW_SPIFLASH_ENABLE_CACHE
 
-void mp_spiflash_cached_read(mp_spiflash_t *self, uint32_t addr, size_t len, uint8_t *dest) {
+int mp_spiflash_cached_read(mp_spiflash_t *self, uint32_t addr, size_t len, uint8_t *dest) {
     if (len == 0) {
-        return;
+        return 0;
     }
     mp_spiflash_acquire_bus(self);
     mp_spiflash_cache_t *cache = self->config->cache;
@@ -304,7 +323,11 @@ void mp_spiflash_cached_read(mp_spiflash_t *self, uint32_t addr, size_t len, uin
             if (bis < cache->block) {
                 // Read direct from flash for first part
                 rest = cache->block * SECTOR_SIZE - addr;
-                mp_spiflash_read_data(self, addr, rest, dest);
+                int ret = mp_spiflash_read_data(self, addr, rest, dest);
+                if (ret != 0) {
+                    mp_spiflash_release_bus(self);
+                    return ret;
+                }
                 len -= rest;
                 dest += rest;
                 addr += rest;
@@ -318,21 +341,22 @@ void mp_spiflash_cached_read(mp_spiflash_t *self, uint32_t addr, size_t len, uin
             len -= rest;
             if (len == 0) {
                 mp_spiflash_release_bus(self);
-                return;
+                return 0;
             }
             dest += rest;
             addr += rest;
         }
     }
     // Read rest direct from flash
-    mp_spiflash_read_data(self, addr, len, dest);
+    int ret = mp_spiflash_read_data(self, addr, len, dest);
     mp_spiflash_release_bus(self);
+    return ret;
 }
 
-STATIC void mp_spiflash_cache_flush_internal(mp_spiflash_t *self) {
+STATIC int mp_spiflash_cache_flush_internal(mp_spiflash_t *self) {
     #if USE_WR_DELAY
     if (!(self->flags & 1)) {
-        return;
+        return 0;
     }
 
     self->flags &= ~1;
@@ -342,7 +366,7 @@ STATIC void mp_spiflash_cache_flush_internal(mp_spiflash_t *self) {
     // Erase sector
     int ret = mp_spiflash_erase_block_internal(self, cache->block * SECTOR_SIZE);
     if (ret != 0) {
-        return;
+        return ret;
     }
 
     // Write
@@ -350,16 +374,18 @@ STATIC void mp_spiflash_cache_flush_internal(mp_spiflash_t *self) {
         uint32_t addr = cache->block * SECTOR_SIZE + i * PAGE_SIZE;
         int ret = mp_spiflash_write_page(self, addr, PAGE_SIZE, cache->buf + i * PAGE_SIZE);
         if (ret != 0) {
-            return;
+            return ret;
         }
     }
     #endif
+    return 0;
 }
 
-void mp_spiflash_cache_flush(mp_spiflash_t *self) {
+int mp_spiflash_cache_flush(mp_spiflash_t *self) {
     mp_spiflash_acquire_bus(self);
-    mp_spiflash_cache_flush_internal(self);
+    int ret = mp_spiflash_cache_flush_internal(self);
     mp_spiflash_release_bus(self);
+    return ret;
 }
 
 STATIC int mp_spiflash_cached_write_part(mp_spiflash_t *self, uint32_t addr, size_t len, const uint8_t *src) {
@@ -389,10 +415,16 @@ STATIC int mp_spiflash_cached_write_part(mp_spiflash_t *self, uint32_t addr, siz
         // Read sector
         #if USE_WR_DELAY
         if (cache->block != 0xffffffff) {
-            mp_spiflash_cache_flush_internal(self);
+            int ret = mp_spiflash_cache_flush_internal(self);
+            if (ret != 0) {
+                return ret;
+            }
         }
         #endif
-        mp_spiflash_read_data(self, addr, SECTOR_SIZE, cache->buf);
+        int ret = mp_spiflash_read_data(self, addr, SECTOR_SIZE, cache->buf);
+        if (ret != 0) {
+            return ret;
+        }
     }
 
     #if USE_WR_DELAY
diff --git a/drivers/memory/spiflash.h b/drivers/memory/spiflash.h
index c4162ff21cdc6..5ccf7d44c97de 100644
--- a/drivers/memory/spiflash.h
+++ b/drivers/memory/spiflash.h
@@ -76,13 +76,13 @@ void mp_spiflash_deepsleep(mp_spiflash_t *self, int value);
 
 // These functions go direct to the SPI flash device
 int mp_spiflash_erase_block(mp_spiflash_t *self, uint32_t addr);
-void mp_spiflash_read(mp_spiflash_t *self, uint32_t addr, size_t len, uint8_t *dest);
+int mp_spiflash_read(mp_spiflash_t *self, uint32_t addr, size_t len, uint8_t *dest);
 int mp_spiflash_write(mp_spiflash_t *self, uint32_t addr, size_t len, const uint8_t *src);
 
 #if MICROPY_HW_SPIFLASH_ENABLE_CACHE
 // These functions use the cache (which must already be configured)
-void mp_spiflash_cache_flush(mp_spiflash_t *self);
-void mp_spiflash_cached_read(mp_spiflash_t *self, uint32_t addr, size_t len, uint8_t *dest);
+int mp_spiflash_cache_flush(mp_spiflash_t *self);
+int mp_spiflash_cached_read(mp_spiflash_t *self, uint32_t addr, size_t len, uint8_t *dest);
 int mp_spiflash_cached_write(mp_spiflash_t *self, uint32_t addr, size_t len, const uint8_t *src);
 #endif
 
diff --git a/ports/stm32/qspi.c b/ports/stm32/qspi.c
index 04e226697eeab..3036f6f3847d1 100644
--- a/ports/stm32/qspi.c
+++ b/ports/stm32/qspi.c
@@ -196,7 +196,7 @@ STATIC int qspi_ioctl(void *self_in, uint32_t cmd) {
     return 0; // success
 }
 
-STATIC void qspi_write_cmd_data(void *self_in, uint8_t cmd, size_t len, uint32_t data) {
+STATIC int qspi_write_cmd_data(void *self_in, uint8_t cmd, size_t len, uint32_t data) {
     (void)self_in;
 
     QUADSPI->FCR = QUADSPI_FCR_CTCF; // clear TC flag
@@ -238,12 +238,17 @@ STATIC void qspi_write_cmd_data(void *self_in, uint8_t cmd, size_t len, uint32_t
 
     // Wait for write to finish
     while (!(QUADSPI->SR & QUADSPI_SR_TCF)) {
+        if (QUADSPI->SR & QUADSPI_SR_TEF) {
+            return -MP_EIO;
+        }
     }
 
     QUADSPI->FCR = QUADSPI_FCR_CTCF; // clear TC flag
+
+    return 0;
 }
 
-STATIC void qspi_write_cmd_addr_data(void *self_in, uint8_t cmd, uint32_t addr, size_t len, const uint8_t *src) {
+STATIC int qspi_write_cmd_addr_data(void *self_in, uint8_t cmd, uint32_t addr, size_t len, const uint8_t *src) {
     (void)self_in;
 
     uint8_t adsize = MICROPY_HW_SPI_ADDR_IS_32BIT(addr) ? 3 : 2;
@@ -286,6 +291,9 @@ STATIC void qspi_write_cmd_addr_data(void *self_in, uint8_t cmd, uint32_t addr,
         // Write out the data 1 byte at a time
         while (len) {
             while (!(QUADSPI->SR & QUADSPI_SR_FTF)) {
+                if (QUADSPI->SR & QUADSPI_SR_TEF) {
+                    return -MP_EIO;
+                }
             }
             *(volatile uint8_t *)&QUADSPI->DR = *src++;
             --len;
@@ -294,9 +302,14 @@ STATIC void qspi_write_cmd_addr_data(void *self_in, uint8_t cmd, uint32_t addr,
 
     // Wait for write to finish
     while (!(QUADSPI->SR & QUADSPI_SR_TCF)) {
+        if (QUADSPI->SR & QUADSPI_SR_TEF) {
+            return -MP_EIO;
+        }
     }
 
     QUADSPI->FCR = QUADSPI_FCR_CTCF; // clear TC flag
+
+    return 0;
 }
 
 STATIC uint32_t qspi_read_cmd(void *self_in, uint8_t cmd, size_t len) {
@@ -320,6 +333,10 @@ STATIC uint32_t qspi_read_cmd(void *self_in, uint8_t cmd, size_t len) {
 
     // Wait for read to finish
     while (!(QUADSPI->SR & QUADSPI_SR_TCF)) {
+        if (QUADSPI->SR & QUADSPI_SR_TEF) {
+            // Not sure that calling functions will deal with this appropriately
+            return -MP_EIO;
+        }
     }
 
     QUADSPI->FCR = QUADSPI_FCR_CTCF; // clear TC flag
@@ -328,7 +345,7 @@ STATIC uint32_t qspi_read_cmd(void *self_in, uint8_t cmd, size_t len) {
     return QUADSPI->DR;
 }
 
-STATIC void qspi_read_cmd_qaddr_qdata(void *self_in, uint8_t cmd, uint32_t addr, size_t len, uint8_t *dest) {
+STATIC int qspi_read_cmd_qaddr_qdata(void *self_in, uint8_t cmd, uint32_t addr, size_t len, uint8_t *dest) {
     (void)self_in;
 
     uint8_t adsize = MICROPY_HW_SPI_ADDR_IS_32BIT(addr) ? 3 : 2;
@@ -366,6 +383,9 @@ STATIC void qspi_read_cmd_qaddr_qdata(void *self_in, uint8_t cmd, uint32_t addr,
     if (((uintptr_t)dest & 3) == 0) {
         while (len >= 4) {
             while (!(QUADSPI->SR & QUADSPI_SR_FTF)) {
+                if (QUADSPI->SR & QUADSPI_SR_TEF) {
+                    return -MP_EIO;
+                }
             }
             *(uint32_t *)dest = QUADSPI->DR;
             dest += 4;
@@ -376,12 +396,17 @@ STATIC void qspi_read_cmd_qaddr_qdata(void *self_in, uint8_t cmd, uint32_t addr,
     // Read in remaining data 1 byte at a time
     while (len) {
         while (!((QUADSPI->SR >> QUADSPI_SR_FLEVEL_Pos) & 0x3f)) {
+            if (QUADSPI->SR & QUADSPI_SR_TEF) {
+                return -MP_EIO;
+            }
         }
         *dest++ = *(volatile uint8_t *)&QUADSPI->DR;
         --len;
     }
 
     QUADSPI->FCR = QUADSPI_FCR_CTCF; // clear TC flag
+
+    return 0;
 }
 
 const mp_qspi_proto_t qspi_proto = {
diff --git a/ports/stm32/spibdev.c b/ports/stm32/spibdev.c
index afa6f4ecdccb0..fecd4a991536c 100644
--- a/ports/stm32/spibdev.c
+++ b/ports/stm32/spibdev.c
@@ -40,25 +40,29 @@ int32_t spi_bdev_ioctl(spi_bdev_t *bdev, uint32_t op, uint32_t arg) {
             bdev->flash_tick_counter_last_write = 0;
             return 0;
 
-        case BDEV_IOCTL_IRQ_HANDLER:
+        case BDEV_IOCTL_IRQ_HANDLER: {
+            int ret = 0;
             #if MICROPY_HW_SPIFLASH_ENABLE_CACHE
             if ((bdev->spiflash.flags & 1) && HAL_GetTick() - bdev->flash_tick_counter_last_write >= 1000) {
-                mp_spiflash_cache_flush(&bdev->spiflash);
+                ret = mp_spiflash_cache_flush(&bdev->spiflash);
                 led_state(PYB_LED_RED, 0); // indicate a clean cache with LED off
             }
             #endif
-            return 0;
+            return ret;
+        }
 
-        case BDEV_IOCTL_SYNC:
+        case BDEV_IOCTL_SYNC: {
+            int ret = 0;
             #if MICROPY_HW_SPIFLASH_ENABLE_CACHE
             if (bdev->spiflash.flags & 1) {
                 uint32_t basepri = raise_irq_pri(IRQ_PRI_FLASH); // prevent cache flushing and USB access
-                mp_spiflash_cache_flush(&bdev->spiflash);
+                ret = mp_spiflash_cache_flush(&bdev->spiflash);
                 led_state(PYB_LED_RED, 0); // indicate a clean cache with LED off
                 restore_irq_pri(basepri);
             }
             #endif
-            return 0;
+            return ret;
+        }
     }
     return -MP_EINVAL;
 }
@@ -66,10 +70,10 @@ int32_t spi_bdev_ioctl(spi_bdev_t *bdev, uint32_t op, uint32_t arg) {
 #if MICROPY_HW_SPIFLASH_ENABLE_CACHE
 int spi_bdev_readblocks(spi_bdev_t *bdev, uint8_t *dest, uint32_t block_num, uint32_t num_blocks) {
     uint32_t basepri = raise_irq_pri(IRQ_PRI_FLASH); // prevent cache flushing and USB access
-    mp_spiflash_cached_read(&bdev->spiflash, block_num * FLASH_BLOCK_SIZE, num_blocks * FLASH_BLOCK_SIZE, dest);
+    int ret = mp_spiflash_cached_read(&bdev->spiflash, block_num * FLASH_BLOCK_SIZE, num_blocks * FLASH_BLOCK_SIZE, dest);
     restore_irq_pri(basepri);
 
-    return 0;
+    return ret;
 }
 
 int spi_bdev_writeblocks(spi_bdev_t *bdev, const uint8_t *src, uint32_t block_num, uint32_t num_blocks) {
@@ -87,10 +91,10 @@ int spi_bdev_writeblocks(spi_bdev_t *bdev, const uint8_t *src, uint32_t block_nu
 
 int spi_bdev_readblocks_raw(spi_bdev_t *bdev, uint8_t *dest, uint32_t block_num, uint32_t block_offset, uint32_t num_bytes) {
     uint32_t basepri = raise_irq_pri(IRQ_PRI_FLASH); // prevent cache flushing and USB access
-    mp_spiflash_read(&bdev->spiflash, block_num * MP_SPIFLASH_ERASE_BLOCK_SIZE + block_offset, num_bytes, dest);
+    int ret = mp_spiflash_read(&bdev->spiflash, block_num * MP_SPIFLASH_ERASE_BLOCK_SIZE + block_offset, num_bytes, dest);
     restore_irq_pri(basepri);
 
-    return 0;
+    return ret;
 }
 
 int spi_bdev_writeblocks_raw(spi_bdev_t *bdev, const uint8_t *src, uint32_t block_num, uint32_t block_offset, uint32_t num_bytes) {

From b042fd5120e5c0b0ef2b5bebf2c00aa12e5a0fb0 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 9 Dec 2022 12:28:54 +1100
Subject: [PATCH 2938/3533] drivers/bus: Change QSPI read_cmd signature to
 return an error code.

Signed-off-by: Damien George <damien@micropython.org>
---
 drivers/bus/qspi.h        |  2 +-
 drivers/bus/softqspi.c    |  5 +++--
 drivers/memory/spiflash.c | 34 +++++++++++++++++++++-------------
 ports/stm32/qspi.c        |  7 ++++---
 4 files changed, 29 insertions(+), 19 deletions(-)

diff --git a/drivers/bus/qspi.h b/drivers/bus/qspi.h
index 33f482127d722..009f55b159d41 100644
--- a/drivers/bus/qspi.h
+++ b/drivers/bus/qspi.h
@@ -43,7 +43,7 @@ typedef struct _mp_qspi_proto_t {
     int (*ioctl)(void *self, uint32_t cmd);
     int (*write_cmd_data)(void *self, uint8_t cmd, size_t len, uint32_t data);
     int (*write_cmd_addr_data)(void *self, uint8_t cmd, uint32_t addr, size_t len, const uint8_t *src);
-    uint32_t (*read_cmd)(void *self, uint8_t cmd, size_t len);
+    int (*read_cmd)(void *self, uint8_t cmd, size_t len, uint32_t *dest);
     int (*read_cmd_qaddr_qdata)(void *self, uint8_t cmd, uint32_t addr, size_t len, uint8_t *dest);
 } mp_qspi_proto_t;
 
diff --git a/drivers/bus/softqspi.c b/drivers/bus/softqspi.c
index 6ede29dcd787b..dc205da3a7c40 100644
--- a/drivers/bus/softqspi.c
+++ b/drivers/bus/softqspi.c
@@ -178,13 +178,14 @@ STATIC int mp_soft_qspi_write_cmd_addr_data(void *self_in, uint8_t cmd, uint32_t
     return 0;
 }
 
-STATIC uint32_t mp_soft_qspi_read_cmd(void *self_in, uint8_t cmd, size_t len) {
+STATIC int mp_soft_qspi_read_cmd(void *self_in, uint8_t cmd, size_t len, uint32_t *dest) {
     mp_soft_qspi_obj_t *self = (mp_soft_qspi_obj_t*)self_in;
     uint32_t cmd_buf = cmd;
     CS_LOW(self);
     mp_soft_qspi_transfer(self, 1 + len, (uint8_t*)&cmd_buf, (uint8_t*)&cmd_buf);
     CS_HIGH(self);
-    return cmd_buf >> 8;
+    *dest = cmd_buf >> 8;
+    return 0;
 }
 
 STATIC int mp_soft_qspi_read_cmd_qaddr_qdata(void *self_in, uint8_t cmd, uint32_t addr, size_t len, uint8_t *dest) {
diff --git a/drivers/memory/spiflash.c b/drivers/memory/spiflash.c
index a71ef41f468ce..52739b1d8bdf7 100644
--- a/drivers/memory/spiflash.c
+++ b/drivers/memory/spiflash.c
@@ -109,17 +109,16 @@ STATIC int mp_spiflash_transfer_cmd_addr_data(mp_spiflash_t *self, uint8_t cmd,
     return ret;
 }
 
-STATIC uint32_t mp_spiflash_read_cmd(mp_spiflash_t *self, uint8_t cmd, size_t len) {
+STATIC int mp_spiflash_read_cmd(mp_spiflash_t *self, uint8_t cmd, size_t len, uint32_t *dest) {
     const mp_spiflash_config_t *c = self->config;
     if (c->bus_kind == MP_SPIFLASH_BUS_SPI) {
-        uint32_t buf;
         mp_hal_pin_write(c->bus.u_spi.cs, 0);
         c->bus.u_spi.proto->transfer(c->bus.u_spi.data, 1, &cmd, NULL);
-        c->bus.u_spi.proto->transfer(c->bus.u_spi.data, len, (void*)&buf, (void*)&buf);
+        c->bus.u_spi.proto->transfer(c->bus.u_spi.data, len, (void*)dest, (void*)dest);
         mp_hal_pin_write(c->bus.u_spi.cs, 1);
-        return buf;
+        return 0;
     } else {
-        return c->bus.u_qspi.proto->read_cmd(c->bus.u_qspi.data, cmd, len);
+        return c->bus.u_qspi.proto->read_cmd(c->bus.u_qspi.data, cmd, len, dest);
     }
 }
 
@@ -139,9 +138,12 @@ STATIC int mp_spiflash_write_cmd(mp_spiflash_t *self, uint8_t cmd) {
 }
 
 STATIC int mp_spiflash_wait_sr(mp_spiflash_t *self, uint8_t mask, uint8_t val, uint32_t timeout) {
-    uint8_t sr;
     do {
-        sr = mp_spiflash_read_cmd(self, CMD_RDSR, 1);
+        uint32_t sr;
+        int ret = mp_spiflash_read_cmd(self, CMD_RDSR, 1, &sr);
+        if (ret != 0) {
+            return ret;
+        }
         if ((sr & mask) == val) {
             return 0; // success
         }
@@ -180,17 +182,23 @@ void mp_spiflash_init(mp_spiflash_t *self) {
 
     #if defined(CHECK_DEVID)
     // Validate device id
-    uint32_t devid = mp_spiflash_read_cmd(self, CMD_RD_DEVID, 3);
-    if (devid != CHECK_DEVID) {
-        return 0;
+    uint32_t devid;
+    int ret = mp_spiflash_read_cmd(self, CMD_RD_DEVID, 3, &devid);
+    if (ret != 0 || devid != CHECK_DEVID) {
+        mp_spiflash_release_bus(self);
+        return;
     }
     #endif
 
     if (self->config->bus_kind == MP_SPIFLASH_BUS_QSPI) {
         // Set QE bit
-        uint32_t data = (mp_spiflash_read_cmd(self, CMD_RDSR, 1) & 0xff)
-            | (mp_spiflash_read_cmd(self, CMD_RDCR, 1) & 0xff) << 8;
-        if (!(data & (QSPI_QE_MASK << 8))) {
+        uint32_t sr = 0, cr = 0;
+        int ret = mp_spiflash_read_cmd(self, CMD_RDSR, 1, &sr);
+        if (ret == 0) {
+            ret = mp_spiflash_read_cmd(self, CMD_RDCR, 1, &cr);
+        }
+        uint32_t data = (sr & 0xff) | (cr & 0xff) << 8;
+        if (ret == 0 && !(data & (QSPI_QE_MASK << 8))) {
             data |= QSPI_QE_MASK << 8;
             mp_spiflash_write_cmd(self, CMD_WREN);
             mp_spiflash_write_cmd_data(self, CMD_WRSR, 2, data);
diff --git a/ports/stm32/qspi.c b/ports/stm32/qspi.c
index 3036f6f3847d1..a79e692e0ec80 100644
--- a/ports/stm32/qspi.c
+++ b/ports/stm32/qspi.c
@@ -312,7 +312,7 @@ STATIC int qspi_write_cmd_addr_data(void *self_in, uint8_t cmd, uint32_t addr, s
     return 0;
 }
 
-STATIC uint32_t qspi_read_cmd(void *self_in, uint8_t cmd, size_t len) {
+STATIC int qspi_read_cmd(void *self_in, uint8_t cmd, size_t len, uint32_t *dest) {
     (void)self_in;
 
     QUADSPI->FCR = QUADSPI_FCR_CTCF; // clear TC flag
@@ -334,7 +334,6 @@ STATIC uint32_t qspi_read_cmd(void *self_in, uint8_t cmd, size_t len) {
     // Wait for read to finish
     while (!(QUADSPI->SR & QUADSPI_SR_TCF)) {
         if (QUADSPI->SR & QUADSPI_SR_TEF) {
-            // Not sure that calling functions will deal with this appropriately
             return -MP_EIO;
         }
     }
@@ -342,7 +341,9 @@ STATIC uint32_t qspi_read_cmd(void *self_in, uint8_t cmd, size_t len) {
     QUADSPI->FCR = QUADSPI_FCR_CTCF; // clear TC flag
 
     // Read result
-    return QUADSPI->DR;
+    *dest = QUADSPI->DR;
+
+    return 0;
 }
 
 STATIC int qspi_read_cmd_qaddr_qdata(void *self_in, uint8_t cmd, uint32_t addr, size_t len, uint8_t *dest) {

From 002f54ab4edcc334b9641148dde94a6d7673c0fd Mon Sep 17 00:00:00 2001
From: TPReal <tpreal@gmail.com>
Date: Sat, 26 Nov 2022 13:22:34 +0100
Subject: [PATCH 2939/3533] tests/extmod/framebuf_scroll: Add tests for
 FrameBuffer scrolling.

Includes a currently-failing test of scrolling by at least the size of the
buffer.
---
 tests/extmod/framebuf_scroll.py     | 45 +++++++++++++++++++++++++++
 tests/extmod/framebuf_scroll.py.exp | 48 +++++++++++++++++++++++++++++
 2 files changed, 93 insertions(+)
 create mode 100644 tests/extmod/framebuf_scroll.py
 create mode 100644 tests/extmod/framebuf_scroll.py.exp

diff --git a/tests/extmod/framebuf_scroll.py b/tests/extmod/framebuf_scroll.py
new file mode 100644
index 0000000000000..db9b6ea1e9649
--- /dev/null
+++ b/tests/extmod/framebuf_scroll.py
@@ -0,0 +1,45 @@
+try:
+    import framebuf
+except ImportError:
+    print("SKIP")
+    raise SystemExit
+
+
+def printbuf():
+    print("--8<--")
+    bytes_per_row = w // 2
+    for y in range(h):
+        for x in range(bytes_per_row):
+            print("%02x" % buf[(x + y * bytes_per_row)], end="")
+        print()
+    print("-->8--")
+
+
+w = 10
+h = 10
+buf = bytearray(w * h // 2)
+fbuf = framebuf.FrameBuffer(buf, w, h, framebuf.GS4_HMSB)
+
+
+def prepare_buffer():
+    fbuf.fill(0)
+    fbuf.rect(2, 0, 6, 10, 0x07, True)
+    fbuf.rect(0, 2, 10, 6, 0x01, True)
+
+
+prepare_buffer()
+printbuf()
+
+fbuf.scroll(5, -1)
+printbuf()
+
+prepare_buffer()
+fbuf.scroll(-5, 5)
+printbuf()
+
+prepare_buffer()
+# Scrolling by at least the size of buffer, no change to buffer.
+fbuf.scroll(15, 7)
+fbuf.scroll(10, -1)
+fbuf.scroll(1, -10)
+printbuf()
diff --git a/tests/extmod/framebuf_scroll.py.exp b/tests/extmod/framebuf_scroll.py.exp
new file mode 100644
index 0000000000000..7e99b275da7c1
--- /dev/null
+++ b/tests/extmod/framebuf_scroll.py.exp
@@ -0,0 +1,48 @@
+--8<--
+0077777700
+0077777700
+1111111111
+1111111111
+1111111111
+1111111111
+1111111111
+1111111111
+0077777700
+0077777700
+-->8--
+--8<--
+0077700777
+0077711111
+1111111111
+1111111111
+1111111111
+1111111111
+1111111111
+1111100777
+0077700777
+0077777700
+-->8--
+--8<--
+0077777700
+0077777700
+1111111111
+1111111111
+1111111111
+7770011111
+7770011111
+1111111111
+1111177700
+1111177700
+-->8--
+--8<--
+0077777700
+0077777700
+1111111111
+1111111111
+1111111111
+1111111111
+1111111111
+1111111111
+0077777700
+0077777700
+-->8--

From bf49a087b2005e45f7ec5672f5ecd2668e2deb4f Mon Sep 17 00:00:00 2001
From: TPReal <tpreal@gmail.com>
Date: Sat, 26 Nov 2022 13:25:08 +0100
Subject: [PATCH 2940/3533] extmod/modframebuf: Fix crash in FrameBuffer
 scrolling beyond extents.

Fixed the crash occurring when scrolling by at least the size of the
framebuffer.
---
 extmod/modframebuf.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/extmod/modframebuf.c b/extmod/modframebuf.c
index e7825b59128ef..87f7609dd8a85 100644
--- a/extmod/modframebuf.c
+++ b/extmod/modframebuf.c
@@ -748,19 +748,31 @@ STATIC mp_obj_t framebuf_scroll(mp_obj_t self_in, mp_obj_t xstep_in, mp_obj_t ys
     if (xstep < 0) {
         sx = 0;
         xend = self->width + xstep;
+        if (xend <= 0) {
+            return mp_const_none;
+        }
         dx = 1;
     } else {
         sx = self->width - 1;
         xend = xstep - 1;
+        if (xend >= sx) {
+            return mp_const_none;
+        }
         dx = -1;
     }
     if (ystep < 0) {
         y = 0;
         yend = self->height + ystep;
+        if (yend <= 0) {
+            return mp_const_none;
+        }
         dy = 1;
     } else {
         y = self->height - 1;
         yend = ystep - 1;
+        if (yend >= y) {
+            return mp_const_none;
+        }
         dy = -1;
     }
     for (; y != yend; y += dy) {

From 918e0ae1647b5aca0cd79589917e1bb87207342b Mon Sep 17 00:00:00 2001
From: David Lechner <david@pybricks.com>
Date: Sun, 27 Nov 2022 17:02:35 -0600
Subject: [PATCH 2941/3533] docs/differences: Update Python 3.9 status.

This marks PEP 584 as complete and notes a few PEPs as not relevant.

Signed-off-by: David Lechner <david@pybricks.com>
---
 docs/differences/python_39.rst | 52 ++++++++++++++++++----------------
 1 file changed, 28 insertions(+), 24 deletions(-)

diff --git a/docs/differences/python_39.rst b/docs/differences/python_39.rst
index 023c6d7c1e398..f68abc50740ac 100644
--- a/docs/differences/python_39.rst
+++ b/docs/differences/python_39.rst
@@ -11,30 +11,30 @@ and a detailed description of the changes can be found in
 .. table::
   :widths: 20 60 20
 
-  +--------------------------------------------------------+----------------------------------------------------+--------------+
-  | **Features**                                           |                                                    | **Status**   |
-  +--------------------------------------------------------+----------------------------------------------------+--------------+
-  | `PEP 573 <https://www.python.org/dev/peps/pep-0573/>`_ | Fast access to module state from methods of C      |              |
-  |                                                        | extension types                                    |              |
-  +--------------------------------------------------------+----------------------------------------------------+--------------+
-  | `PEP 584 <https://www.python.org/dev/peps/pep-0584/>`_ | Union operators added to dict                      |              |
-  +--------------------------------------------------------+----------------------------------------------------+--------------+
-  | `PEP 585 <https://www.python.org/dev/peps/pep-0584/>`_ | Type hinting generics in standard collections      |              |
-  +--------------------------------------------------------+----------------------------------------------------+--------------+
-  | `PEP 593 <https://www.python.org/dev/peps/pep-0593/>`_ | Flexible function and variable annotations         |              |
-  +--------------------------------------------------------+----------------------------------------------------+--------------+
-  | `PEP 602 <https://www.python.org/dev/peps/pep-0602/>`_ | CPython adopts an annual release cycle. Instead of |              |
-  |                                                        | annual, aiming for two month release cycle         |              |
-  +--------------------------------------------------------+----------------------------------------------------+--------------+
-  | `PEP 614 <https://www.python.org/dev/peps/pep-0614/>`_ | Relaxed grammar restrictions on decorators         |              |
-  +--------------------------------------------------------+----------------------------------------------------+--------------+
-  | `PEP 615 <https://www.python.org/dev/peps/pep-0615/>`_ | The IANA Time Zone Database is now present in the  |              |
-  |                                                        | standard library in the zoneinfo module            |              |
-  +--------------------------------------------------------+----------------------------------------------------+--------------+
-  | `PEP 616 <https://www.python.org/dev/peps/pep-0616/>`_ | String methods to remove prefixes and suffixes     |              |
-  +--------------------------------------------------------+----------------------------------------------------+--------------+
-  | `PEP 617 <https://www.python.org/dev/peps/pep-0617/>`_ | CPython now uses a new parser based on PEG         |              |
-  +--------------------------------------------------------+----------------------------------------------------+--------------+
+  +--------------------------------------------------------+----------------------------------------------------+----------------------+
+  | **Features**                                           |                                                    | **Status**           |
+  +--------------------------------------------------------+----------------------------------------------------+----------------------+
+  | `PEP 573 <https://www.python.org/dev/peps/pep-0573/>`_ | Fast access to module state from methods of C      | Not relevant         |
+  |                                                        | extension types                                    |                      |
+  +--------------------------------------------------------+----------------------------------------------------+----------------------+
+  | `PEP 584 <https://www.python.org/dev/peps/pep-0584/>`_ | Union operators added to dict                      | Complete [#pep584]_  |
+  +--------------------------------------------------------+----------------------------------------------------+----------------------+
+  | `PEP 585 <https://www.python.org/dev/peps/pep-0584/>`_ | Type hinting generics in standard collections      |                      |
+  +--------------------------------------------------------+----------------------------------------------------+----------------------+
+  | `PEP 593 <https://www.python.org/dev/peps/pep-0593/>`_ | Flexible function and variable annotations         |                      |
+  +--------------------------------------------------------+----------------------------------------------------+----------------------+
+  | `PEP 602 <https://www.python.org/dev/peps/pep-0602/>`_ | CPython adopts an annual release cycle. Instead of | Not relevant         |
+  |                                                        | annual, aiming for two month release cycle         |                      |
+  +--------------------------------------------------------+----------------------------------------------------+----------------------+
+  | `PEP 614 <https://www.python.org/dev/peps/pep-0614/>`_ | Relaxed grammar restrictions on decorators         |                      |
+  +--------------------------------------------------------+----------------------------------------------------+----------------------+
+  | `PEP 615 <https://www.python.org/dev/peps/pep-0615/>`_ | The IANA Time Zone Database is now present in the  |                      |
+  |                                                        | standard library in the zoneinfo module            |                      |
+  +--------------------------------------------------------+----------------------------------------------------+----------------------+
+  | `PEP 616 <https://www.python.org/dev/peps/pep-0616/>`_ | String methods to remove prefixes and suffixes     |                      |
+  +--------------------------------------------------------+----------------------------------------------------+----------------------+
+  | `PEP 617 <https://www.python.org/dev/peps/pep-0617/>`_ | CPython now uses a new parser based on PEG         | Not relevant         |
+  +--------------------------------------------------------+----------------------------------------------------+----------------------+
 
 Other Language Changes:
 
@@ -128,3 +128,7 @@ Changes to built-in modules:
   | Previously, *sys.stderr* was block-buffered when non-interactive. Now stderr defaults to always being         |               |
   | line-buffered                                                                                                 |               |
   +---------------------------------------------------------------------------------------------------------------+---------------+
+
+.. rubric:: Notes
+
+.. [#pep584] PEP 584 ``dict`` union operator is only available on MicroPython builds with ``MICROPY_CPYTHON_COMPAT`` enabled.

From f3d9fe7b2cd9884bbe9459b39024902ba5e960a6 Mon Sep 17 00:00:00 2001
From: David Lechner <david@pybricks.com>
Date: Sun, 27 Nov 2022 16:23:02 -0600
Subject: [PATCH 2942/3533] docs/differences: Add Python 3.10 page.

This adds a new page for Python 3.10 implementation status similar to
previous releases.

Signed-off-by: David Lechner <david@pybricks.com>
---
 docs/differences/index_template.txt |   1 +
 docs/differences/python_310.rst     | 238 ++++++++++++++++++++++++++++
 2 files changed, 239 insertions(+)
 create mode 100644 docs/differences/python_310.rst

diff --git a/docs/differences/index_template.txt b/docs/differences/index_template.txt
index dbbd7fc099a25..1bbfbfedce921 100644
--- a/docs/differences/index_template.txt
+++ b/docs/differences/index_template.txt
@@ -13,6 +13,7 @@ above.  The sections below describe the current status of these features.
     ../differences/python_37.rst
     ../differences/python_38.rst
     ../differences/python_39.rst
+    ../differences/python_310.rst
 
 For the features of Python that are implemented by MicroPython, there are
 sometimes differences in their behaviour compared to standard Python.  The
diff --git a/docs/differences/python_310.rst b/docs/differences/python_310.rst
new file mode 100644
index 0000000000000..f9d92db655372
--- /dev/null
+++ b/docs/differences/python_310.rst
@@ -0,0 +1,238 @@
+.. _python_310:
+
+Python 3.10
+===========
+
+Python 3.10.0 (final) was released on the 4 October 2021. The Features for 3.10 are
+defined in `PEP 619 <https://www.python.org/dev/peps/pep-0619/#features-for-3-10>`_
+and a detailed description of the changes can be found in
+`What's New in Python 3.10 <https://docs.python.org/3/whatsnew/3.10.html>`_.
+
+.. table::
+  :widths: 20 60 20
+
+  +--------------------------------------------------------+----------------------------------------------------+--------------+
+  | **New syntax features**                                                                                     | **Status**   |
+  +--------------------------------------------------------+----------------------------------------------------+--------------+
+  | `PEP 634 <https://www.python.org/dev/peps/pep-0634/>`_ | Structural Pattern Matching: Specification         | [#spm]_      |
+  +--------------------------------------------------------+----------------------------------------------------+--------------+
+  | `PEP 635 <https://www.python.org/dev/peps/pep-0635/>`_ | Structural Pattern Matching: Motivation and        | [#spm]_      |
+  |                                                        | Rationale                                          |              |
+  +--------------------------------------------------------+----------------------------------------------------+--------------+
+  | `PEP 636 <https://www.python.org/dev/peps/pep-0636/>`_ | Structural Pattern Matching: Tutorial              | [#spm]_      |
+  +--------------------------------------------------------+----------------------------------------------------+--------------+
+  | `bpo-12782                                             | Parenthesized context managers are now officially  |              |
+  | <https://github.com/python/cpython/issues/56991>`_     | allowed                                            |              |
+  +--------------------------------------------------------+----------------------------------------------------+--------------+
+  | **New features in the standard library**                                                                                   |
+  +--------------------------------------------------------+----------------------------------------------------+--------------+
+  | `PEP 618 <https://www.python.org/dev/peps/pep-0618/>`_ | Add Optional Length-Checking To zip                |              |
+  +--------------------------------------------------------+----------------------------------------------------+--------------+
+  | **Interpreter improvements**                                                                                               |
+  +--------------------------------------------------------+----------------------------------------------------+--------------+
+  | `PEP 626 <https://www.python.org/dev/peps/pep-0626/>`_ | Precise line numbers for debugging and other tools |              |
+  +--------------------------------------------------------+----------------------------------------------------+--------------+
+  | **New typing features**                                                                                                    |
+  +--------------------------------------------------------+----------------------------------------------------+--------------+
+  | `PEP 604 <https://www.python.org/dev/peps/pep-0604/>`_ | Allow writing union types as X | Y                 |              |
+  +--------------------------------------------------------+----------------------------------------------------+--------------+
+  | `PEP 613 <https://www.python.org/dev/peps/pep-0613/>`_ | Explicit Type Aliases                              |              |
+  +--------------------------------------------------------+----------------------------------------------------+--------------+
+  | `PEP 612 <https://www.python.org/dev/peps/pep-0612/>`_ | Parameter Specification Variables                  |              |
+  +--------------------------------------------------------+----------------------------------------------------+--------------+
+  | **Important deprecations, removals or restrictions**                                                                       |
+  +--------------------------------------------------------+----------------------------------------------------+--------------+
+  | `PEP 644 <https://www.python.org/dev/peps/pep-0644/>`_ | Require OpenSSL 1.1.1 or newer                     |              |
+  +--------------------------------------------------------+----------------------------------------------------+--------------+
+  | `PEP 632 <https://www.python.org/dev/peps/pep-0632/>`_ | Deprecate distutils module.                        | Not relevant |
+  +--------------------------------------------------------+----------------------------------------------------+--------------+
+  | `PEP 623 <https://www.python.org/dev/peps/pep-0623/>`_ | Deprecate and prepare for the removal of the wstr  | Not relevant |
+  |                                                        | member in PyUnicodeObject.                         |              |
+  +--------------------------------------------------------+----------------------------------------------------+--------------+
+  | `PEP 624 <https://www.python.org/dev/peps/pep-0624/>`_ | Remove Py_UNICODE encoder APIs                     | Not relevant |
+  +--------------------------------------------------------+----------------------------------------------------+--------------+
+  | `PEP 597 <https://www.python.org/dev/peps/pep-0597/>`_ | Add optional EncodingWarning                       |              |
+  +--------------------------------------------------------+----------------------------------------------------+--------------+
+
+
+Other Language Changes:
+
+.. table::
+  :widths: 90 10
+
+  +-------------------------------------------------------------------------------------------------------------+---------------+
+  | The :class:`int` type has a new method :meth:`int.bit_count`, returning the                                 |               |
+  | number of ones in the binary expansion of a given integer, also known                                       |               |
+  | as the population count.                                                                                    |               |
+  +-------------------------------------------------------------------------------------------------------------+---------------+
+  | The views returned by :meth:`dict.keys`, :meth:`dict.values` and                                            |               |
+  | :meth:`dict.items` now all have a ``mapping`` attribute that gives a                                        |               |
+  | :class:`types.MappingProxyType` object wrapping the original                                                |               |
+  | dictionary.                                                                                                 |               |
+  +-------------------------------------------------------------------------------------------------------------+---------------+
+  | :pep:`618`: The :func:`zip` function now has an optional ``strict`` flag, used                              |               |
+  | to require that all the iterables have an equal length.                                                     |               |
+  +-------------------------------------------------------------------------------------------------------------+---------------+
+  | Builtin and extension functions that take integer arguments no longer accept                                |               |
+  | :class:`~decimal.Decimal`\ s, :class:`~fractions.Fraction`\ s and other                                     |               |
+  | objects that can be converted to integers only with a loss (e.g. that have                                  |               |
+  | the :meth:`~object.__int__` method but do not have the                                                      |               |
+  | :meth:`~object.__index__` method).                                                                          |               |
+  +-------------------------------------------------------------------------------------------------------------+---------------+
+  | If :func:`object.__ipow__` returns :const:`NotImplemented`, the operator will                               |               |
+  | correctly fall back to :func:`object.__pow__` and :func:`object.__rpow__` as expected.                      |               |
+  +-------------------------------------------------------------------------------------------------------------+---------------+
+  | Assignment expressions can now be used unparenthesized within set literals                                  |               |
+  | and set comprehensions, as well as in sequence indexes (but not slices).                                    |               |
+  +-------------------------------------------------------------------------------------------------------------+---------------+
+  | Functions have a new ``__builtins__`` attribute which is used to look for                                   |               |
+  | builtin symbols when a function is executed, instead of looking into                                        |               |
+  | ``__globals__['__builtins__']``. The attribute is initialized from                                          |               |
+  | ``__globals__["__builtins__"]`` if it exists, else from the current builtins.                               |               |
+  +-------------------------------------------------------------------------------------------------------------+---------------+
+  | Two new builtin functions -- :func:`aiter` and :func:`anext` have been added                                |               |
+  | to provide asynchronous counterparts to :func:`iter` and :func:`next`,                                      |               |
+  | respectively.                                                                                               |               |
+  +-------------------------------------------------------------------------------------------------------------+---------------+
+  | Static methods (:func:`@staticmethod <staticmethod>`) and class methods                                     |               |
+  | (:func:`@classmethod <classmethod>`) now inherit the method attributes                                      |               |
+  | (``__module__``, ``__name__``, ``__qualname__``, ``__doc__``,                                               |               |
+  | ``__annotations__``) and have a new ``__wrapped__`` attribute.                                              |               |
+  | Moreover, static methods are now callable as regular functions.                                             |               |
+  +-------------------------------------------------------------------------------------------------------------+---------------+
+  | Annotations for complex targets (everything beside ``simple name`` targets                                  |               |
+  | defined by :pep:`526`) no longer cause any runtime effects with ``from __future__ import annotations``.     |               |
+  +-------------------------------------------------------------------------------------------------------------+---------------+
+  | Class and module objects now lazy-create empty annotations dicts on demand.                                 |               |
+  | The annotations dicts are stored in the object’s ``__dict__`` for                                           |               |
+  | backwards compatibility.  This improves the best practices for working                                      |               |
+  | with ``__annotations__``.                                                                                   |               |
+  +-------------------------------------------------------------------------------------------------------------+---------------+
+  | Annotations consist of ``yield``, ``yield from``, ``await`` or named expressions                            |               |
+  | are now forbidden under ``from __future__ import annotations`` due to their side                            |               |
+  | effects.                                                                                                    |               |
+  +-------------------------------------------------------------------------------------------------------------+---------------+
+  | Usage of unbound variables, ``super()`` and other expressions that might                                    |               |
+  | alter the processing of symbol table as annotations are now rendered                                        |               |
+  | effectless under ``from __future__ import annotations``.                                                    |               |
+  +-------------------------------------------------------------------------------------------------------------+---------------+
+  | Hashes of NaN values of both :class:`float` type and                                                        |               |
+  | :class:`decimal.Decimal` type now depend on object identity. Formerly, they                                 |               |
+  | always hashed to ``0`` even though NaN values are not equal to one another.                                 |               |
+  | This caused potentially quadratic runtime behavior due to excessive hash                                    |               |
+  | collisions when creating dictionaries and sets containing multiple NaNs.                                    |               |
+  +-------------------------------------------------------------------------------------------------------------+---------------+
+  | A :exc:`SyntaxError` (instead of a :exc:`NameError`) will be raised when deleting                           |               |
+  | the :const:`__debug__` constant.                                                                            |               |
+  +-------------------------------------------------------------------------------------------------------------+---------------+
+  | :exc:`SyntaxError` exceptions now have ``end_lineno`` and                                                   |               |
+  | ``end_offset`` attributes.  They will be ``None`` if not determined.                                        |               |
+  +-------------------------------------------------------------------------------------------------------------+---------------+
+
+Changes to built-in modules:
+
+.. table::
+  :widths: 90 10
+
+  +---------------------------------------------------------------------------------------------------------------+---------------+
+  | `asyncio <https://docs.python.org/3/whatsnew/3.10.html#asyncio>`_                                                             |
+  +---------------------------------------------------------------------------------------------------------------+---------------+
+  | Add missing :meth:`~asyncio.events.AbstractEventLoop.connect_accepted_socket`                                 |               |
+  | method.                                                                                                       |               |
+  +---------------------------------------------------------------------------------------------------------------+---------------+
+  | `array <https://docs.python.org/3/whatsnew/3.10.html#array>`_                                                                 |
+  +---------------------------------------------------------------------------------------------------------------+---------------+
+  | The :meth:`~array.array.index` method of :class:`array.array` now has                                         |               |
+  | optional *start* and *stop* parameters.                                                                       |               |
+  +---------------------------------------------------------------------------------------------------------------+---------------+
+  | `gc <https://docs.python.org/3/whatsnew/3.10.html#gc>`_                                                                       |
+  +---------------------------------------------------------------------------------------------------------------+---------------+
+  | Add audit hooks for :func:`gc.get_objects`, :func:`gc.get_referrers` and                                      |               |
+  | :func:`gc.get_referents`.                                                                                     |               |
+  +---------------------------------------------------------------------------------------------------------------+---------------+
+  | `hashlib <https://docs.python.org/3/whatsnew/3.10.html#hashlib>`_                                                             |
+  +---------------------------------------------------------------------------------------------------------------+---------------+
+  | The hashlib module requires OpenSSL 1.1.1 or newer.                                                           |               |
+  +---------------------------------------------------------------------------------------------------------------+---------------+
+  | The hashlib module has preliminary support for OpenSSL 3.0.0.                                                 |               |
+  +---------------------------------------------------------------------------------------------------------------+---------------+
+  | The pure-Python fallback of :func:`~hashlib.pbkdf2_hmac` is deprecated. In                                    |               |
+  | the future PBKDF2-HMAC will only be available when Python has been built with                                 |               |
+  | OpenSSL support.                                                                                              |               |
+  +---------------------------------------------------------------------------------------------------------------+---------------+
+  | `os <https://docs.python.org/3/whatsnew/3.10.html#os>`_                                                                       |
+  +---------------------------------------------------------------------------------------------------------------+---------------+
+  | Add :func:`os.cpu_count()` support for VxWorks RTOS.                                                          |               |
+  +---------------------------------------------------------------------------------------------------------------+---------------+
+  | Add a new function :func:`os.eventfd` and related helpers to wrap the                                         |               |
+  | ``eventfd2`` syscall on Linux.                                                                                |               |
+  +---------------------------------------------------------------------------------------------------------------+---------------+
+  | Add :func:`os.splice()` that allows to move data between two file                                             |               |
+  | descriptors without copying between kernel address space and user                                             |               |
+  | address space, where one of the file descriptors must refer to a                                              |               |
+  | pipe.                                                                                                         |               |
+  +---------------------------------------------------------------------------------------------------------------+---------------+
+  | Add :data:`~os.O_EVTONLY`, :data:`~os.O_FSYNC`, :data:`~os.O_SYMLINK`                                         |               |
+  | and :data:`~os.O_NOFOLLOW_ANY` for macOS.                                                                     |               |
+  +---------------------------------------------------------------------------------------------------------------+---------------+
+  | `platform <https://docs.python.org/3/whatsnew/3.10.html#platform>`_                                                           |
+  +---------------------------------------------------------------------------------------------------------------+---------------+
+  | Add :func:`platform.freedesktop_os_release()` to retrieve operation system                                    |               |
+  | identification from `freedesktop.org os-release                                                               |               |
+  | <https://www.freedesktop.org/software/systemd/man/os-release.html>`_ standard file.                           |               |
+  +---------------------------------------------------------------------------------------------------------------+---------------+
+  | `socket <https://docs.python.org/3/whatsnew/3.10.html#socket>`_                                                               |
+  +---------------------------------------------------------------------------------------------------------------+---------------+
+  | The exception :exc:`socket.timeout` is now an alias of :exc:`TimeoutError`.                                   |               |
+  +---------------------------------------------------------------------------------------------------------------+---------------+
+  | Add option to create MPTCP sockets with ``IPPROTO_MPTCP``.                                                    |               |
+  +---------------------------------------------------------------------------------------------------------------+---------------+
+  | Add ``IP_RECVTOS`` option to receive the type of service (ToS) or DSCP/ECN fields.                            |               |
+  +---------------------------------------------------------------------------------------------------------------+---------------+
+  | `ssl <https://docs.python.org/3/whatsnew/3.10.html#ssl>`_                                                                     |
+  +---------------------------------------------------------------------------------------------------------------+---------------+
+  | The ssl module requires OpenSSL 1.1.1 or newer.                                                               |               |
+  +---------------------------------------------------------------------------------------------------------------+---------------+
+  | The ssl module has preliminary support for OpenSSL 3.0.0 and new option                                       |               |
+  | :data:`~ssl.OP_IGNORE_UNEXPECTED_EOF`.                                                                        |               |
+  +---------------------------------------------------------------------------------------------------------------+---------------+
+  | Deprecated function and use of deprecated constants now result in                                             |               |
+  | a :exc:`DeprecationWarning`. :attr:`ssl.SSLContext.options` has                                               |               |
+  | :data:`~ssl.OP_NO_SSLv2` and :data:`~ssl.OP_NO_SSLv3` set by default and                                      |               |
+  | therefore cannot warn about setting the flag again.                                                           |               |
+  +---------------------------------------------------------------------------------------------------------------+---------------+
+  | The ssl module now has more secure default settings. Ciphers without forward                                  |               |
+  | secrecy or SHA-1 MAC are disabled by default. Security level 2 prohibits                                      |               |
+  | weak RSA, DH, and ECC keys with less than 112 bits of security.                                               |               |
+  | :class:`~ssl.SSLContext` defaults to minimum protocol version TLS 1.2.                                        |               |
+  | Settings are based on Hynek Schlawack's research.                                                             |               |
+  +---------------------------------------------------------------------------------------------------------------+---------------+
+  | The deprecated protocols SSL 3.0, TLS 1.0, and TLS 1.1 are no longer                                          |               |
+  | officially supported. Python does not block them actively. However                                            |               |
+  | OpenSSL build options, distro configurations, vendor patches, and cipher                                      |               |
+  | suites may prevent a successful handshake.                                                                    |               |
+  +---------------------------------------------------------------------------------------------------------------+---------------+
+  | Add a *timeout* parameter to the :func:`ssl.get_server_certificate` function.                                 |               |
+  +---------------------------------------------------------------------------------------------------------------+---------------+
+  | The ssl module uses heap-types and multi-phase initialization.                                                |               |
+  +---------------------------------------------------------------------------------------------------------------+---------------+
+  | A new verify flag :data:`~ssl.VERIFY_X509_PARTIAL_CHAIN` has been added.                                      |               |
+  +---------------------------------------------------------------------------------------------------------------+---------------+
+  | `sys <https://docs.python.org/3/whatsnew/3.10.html#sys>`_                                                                     |
+  +---------------------------------------------------------------------------------------------------------------+---------------+
+  | Add :data:`sys.orig_argv` attribute: the list of the original command line                                    |               |
+  | arguments passed to the Python executable.                                                                    |               |
+  +---------------------------------------------------------------------------------------------------------------+---------------+
+  | Add :data:`sys.stdlib_module_names`, containing the list of the standard library                              |               |
+  | module names.                                                                                                 |               |
+  +---------------------------------------------------------------------------------------------------------------+---------------+
+  | `_thread <https://docs.python.org/3/whatsnew/3.10.html#_thread>`_                                                             |
+  +---------------------------------------------------------------------------------------------------------------+---------------+
+  | :func:`_thread.interrupt_main` now takes an optional signal number to                                         |               |
+  | simulate (the default is still :data:`signal.SIGINT`).                                                        |               |
+  +---------------------------------------------------------------------------------------------------------------+---------------+
+
+.. rubric:: Notes
+
+.. [#spm] The structural pattern matching feature is discussed in `issue #7847 <https://github.com/micropython/micropython/issues/7847>`_.
+

From db19ee7e15309a7b59756d5176ff20e5ade8dfa1 Mon Sep 17 00:00:00 2001
From: Antonin ENFRUN <antonin.e@me.com>
Date: Wed, 23 Nov 2022 21:41:35 +0100
Subject: [PATCH 2943/3533] webassembly/library: Extract and send data to print
 as UInt8Array.

This allows utf-8 data to work.  It's the receiving layer's responsibility
to deal with decoding the data.
---
 ports/webassembly/README.md  |  2 +-
 ports/webassembly/library.js | 16 ++++++----------
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/ports/webassembly/README.md b/ports/webassembly/README.md
index 89b8b1def7355..5019d6f9059c7 100644
--- a/ports/webassembly/README.md
+++ b/ports/webassembly/README.md
@@ -70,7 +70,7 @@ something to stdout.  The following code demonstrates basic functionality:
     <script>
       document.addEventListener("micropython-print", function(e) {
         let output = document.getElementById("micropython-stdout");
-        output.innerText += e.detail;
+        output.innerText += new TextDecoder().decode(e.detail);
       }, false);
 
       var mp_js_startup = Module["onRuntimeInitialized"];
diff --git a/ports/webassembly/library.js b/ports/webassembly/library.js
index fb31b0fe56033..fc5b542488a6a 100644
--- a/ports/webassembly/library.js
+++ b/ports/webassembly/library.js
@@ -26,16 +26,12 @@
 
 mergeInto(LibraryManager.library, {
     mp_js_write: function(ptr, len) {
-        for (var i = 0; i < len; ++i) {
-            if (typeof window === 'undefined') {
-                var b = Buffer.alloc(1);
-                b.writeInt8(getValue(ptr + i, 'i8'));
-                process.stdout.write(b);
-            } else {
-                var c = String.fromCharCode(getValue(ptr + i, 'i8'));
-                var printEvent = new CustomEvent('micropython-print', { detail: c });
-                document.dispatchEvent(printEvent);
-            }
+        const buffer = HEAPU8.subarray(ptr, ptr + len)
+        if (typeof window === 'undefined') {
+            process.stdout.write(buffer);
+        } else {
+            const printEvent = new CustomEvent('micropython-print', { detail: buffer });
+            document.dispatchEvent(printEvent);
         }
     },
 

From 9c7ff876439309e1b89a9fb0cb6880d525217425 Mon Sep 17 00:00:00 2001
From: stijn <stijn@ignitron.net>
Date: Tue, 29 Nov 2022 16:58:21 +0100
Subject: [PATCH 2944/3533] all: Keep msvc build output in build/ directories.

This follow the change made for Makefile-based projects in b2e82402.
---
 mpy-cross/mpy-cross.vcxproj    | 1 -
 ports/windows/.appveyor.yml    | 2 +-
 ports/windows/README.md        | 2 +-
 ports/windows/msvc/paths.props | 4 ++--
 tests/run-internalbench.py     | 4 +++-
 tests/run-multitests.py        | 4 +++-
 tests/run-perfbench.py         | 4 +++-
 tests/run-tests.py             | 6 ++++--
 tools/gen-cpydiff.py           | 4 +++-
 9 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/mpy-cross/mpy-cross.vcxproj b/mpy-cross/mpy-cross.vcxproj
index 53cb0fa1fec71..322d8c25d109b 100644
--- a/mpy-cross/mpy-cross.vcxproj
+++ b/mpy-cross/mpy-cross.vcxproj
@@ -24,7 +24,6 @@
     <PyBuildingMpyCross>True</PyBuildingMpyCross>
     <PyBuildDir>$(MSBuildThisFileDirectory)build\</PyBuildDir>
     <PyIncDirs>$(MSBuildThisFileDirectory)</PyIncDirs>
-    <PyTargetDir>$(MSBuildThisFileDirectory)</PyTargetDir>
     <PyMsvcDir>$(MSBuildThisFileDirectory)..\ports\windows\msvc\</PyMsvcDir>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
diff --git a/ports/windows/.appveyor.yml b/ports/windows/.appveyor.yml
index 110511fe22c6b..41b554b2d964c 100644
--- a/ports/windows/.appveyor.yml
+++ b/ports/windows/.appveyor.yml
@@ -78,7 +78,7 @@ after_test:
     if ($LASTEXITCODE -ne 0) {
       throw "$env:MSYSTEM build exited with code $LASTEXITCODE"
     }
-    C:\msys64\usr\bin\bash.exe -l -c "make -B -j4 V=1 MICROPY_MPYCROSS=../../mpy-cross/mpy-cross.exe VARIANT=$($env:PyVariant)"
+    C:\msys64\usr\bin\bash.exe -l -c "make -B -j4 V=1 MICROPY_MPYCROSS=../../mpy-cross/build/mpy-cross.exe VARIANT=$($env:PyVariant)"
     if ($LASTEXITCODE -ne 0) {
       throw "$env:MSYSTEM build exited with code $LASTEXITCODE"
     }
diff --git a/ports/windows/README.md b/ports/windows/README.md
index 1fa8008910c3d..7b5f92f10a4e1 100644
--- a/ports/windows/README.md
+++ b/ports/windows/README.md
@@ -128,7 +128,7 @@ functions and thus should be ran using the `wineconsole` tool. Depending
 on the Wine build configuration, you may also want to select the curses
 backend which has the look&feel of a standard Unix console:
 
-    wineconsole --backend=curses ./micropython.exe
+    wineconsole --backend=curses ./build-standard/micropython.exe
 
 For more info, see https://www.winehq.org/docs/wineusr-guide/cui-programs .
 
diff --git a/ports/windows/msvc/paths.props b/ports/windows/msvc/paths.props
index 1a41919328875..767772a1aaf2e 100644
--- a/ports/windows/msvc/paths.props
+++ b/ports/windows/msvc/paths.props
@@ -22,14 +22,14 @@
                         |- standard [PyVariantDir]
 
          Note that the micropython executable will be copied from PyOutDir
-         to PyWinDir after each build. -->
+         to PyTargetDir after each build. -->
 
     <!-- Start from project root -->
     <PyBaseDir>$([System.IO.Path]::GetFullPath(`$(MSBuildThisFileDirectory)..\..\..`))\</PyBaseDir>
     <PyWinDir>$(PyBaseDir)ports\windows\</PyWinDir>
     <PyBuildDir Condition="'$(PyBuildDir)' == ''">$(PyWinDir)$(PyBuild)\</PyBuildDir>
     <PyVariantDir Condition="'$(PyVariantDir)' == ''">$(PyWinDir)variants\$(PyVariant)\</PyVariantDir>
-    <PyTargetDir Condition="'$(PyTargetDir)' == ''">$(PyWinDir)</PyTargetDir>
+    <PyTargetDir Condition="'$(PyTargetDir)' == ''">$(PyBuildDir)</PyTargetDir>
 
     <!-- All include directories needed for uPy -->
     <PyIncDirs>$(PyIncDirs);$(PyBaseDir);$(PyWinDir);$(PyBuildDir);$(PyWinDir)msvc;$(PyVariantDir)</PyIncDirs>
diff --git a/tests/run-internalbench.py b/tests/run-internalbench.py
index 0d21978501101..b71b38cab8538 100755
--- a/tests/run-internalbench.py
+++ b/tests/run-internalbench.py
@@ -13,7 +13,9 @@
 # to the correct executable.
 if os.name == "nt":
     CPYTHON3 = os.getenv("MICROPY_CPYTHON3", "python3.exe")
-    MICROPYTHON = os.getenv("MICROPY_MICROPYTHON", "../ports/windows/micropython.exe")
+    MICROPYTHON = os.getenv(
+        "MICROPY_MICROPYTHON", "../ports/windows/build-standard/micropython.exe"
+    )
 else:
     CPYTHON3 = os.getenv("MICROPY_CPYTHON3", "python3")
     MICROPYTHON = os.getenv("MICROPY_MICROPYTHON", "../ports/unix/build-standard/micropython")
diff --git a/tests/run-multitests.py b/tests/run-multitests.py
index 70bae59474b47..2fd5f027e722a 100755
--- a/tests/run-multitests.py
+++ b/tests/run-multitests.py
@@ -27,7 +27,9 @@
 
 if os.name == "nt":
     CPYTHON3 = os.getenv("MICROPY_CPYTHON3", "python3.exe")
-    MICROPYTHON = os.getenv("MICROPY_MICROPYTHON", test_dir + "/../ports/windows/micropython.exe")
+    MICROPYTHON = os.getenv(
+        "MICROPY_MICROPYTHON", test_dir + "/../ports/windows/build-standard/micropython.exe"
+    )
 else:
     CPYTHON3 = os.getenv("MICROPY_CPYTHON3", "python3")
     MICROPYTHON = os.getenv(
diff --git a/tests/run-perfbench.py b/tests/run-perfbench.py
index f87169d491dcc..578f975bb8424 100755
--- a/tests/run-perfbench.py
+++ b/tests/run-perfbench.py
@@ -18,7 +18,9 @@
 # Paths for host executables
 if os.name == "nt":
     CPYTHON3 = os.getenv("MICROPY_CPYTHON3", "python3.exe")
-    MICROPYTHON = os.getenv("MICROPY_MICROPYTHON", "../ports/windows/micropython.exe")
+    MICROPYTHON = os.getenv(
+        "MICROPY_MICROPYTHON", "../ports/windows/build-standard/micropython.exe"
+    )
 else:
     CPYTHON3 = os.getenv("MICROPY_CPYTHON3", "python3")
     MICROPYTHON = os.getenv("MICROPY_MICROPYTHON", "../ports/unix/build-standard/micropython")
diff --git a/tests/run-tests.py b/tests/run-tests.py
index 35740318e29b6..02cad5aed8c07 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -30,9 +30,11 @@ def base_path(*p):
 # to the correct executable.
 if os.name == "nt":
     CPYTHON3 = os.getenv("MICROPY_CPYTHON3", "python")
-    MICROPYTHON = os.getenv("MICROPY_MICROPYTHON", base_path("../ports/windows/micropython.exe"))
+    MICROPYTHON = os.getenv(
+        "MICROPY_MICROPYTHON", base_path("../ports/windows/build-standard/micropython.exe")
+    )
     # mpy-cross is only needed if --via-mpy command-line arg is passed
-    MPYCROSS = os.getenv("MICROPY_MPYCROSS", base_path("../mpy-cross/mpy-cross.exe"))
+    MPYCROSS = os.getenv("MICROPY_MPYCROSS", base_path("../mpy-cross/build/mpy-cross.exe"))
 else:
     CPYTHON3 = os.getenv("MICROPY_CPYTHON3", "python3")
     MICROPYTHON = os.getenv(
diff --git a/tools/gen-cpydiff.py b/tools/gen-cpydiff.py
index de69a94673e04..29545bad0b479 100644
--- a/tools/gen-cpydiff.py
+++ b/tools/gen-cpydiff.py
@@ -38,7 +38,9 @@
 # to the correct executable.
 if os.name == "nt":
     CPYTHON3 = os.getenv("MICROPY_CPYTHON3", "python3.exe")
-    MICROPYTHON = os.getenv("MICROPY_MICROPYTHON", "../ports/windows/micropython.exe")
+    MICROPYTHON = os.getenv(
+        "MICROPY_MICROPYTHON", "../ports/windows/build-standard/micropython.exe"
+    )
 else:
     CPYTHON3 = os.getenv("MICROPY_CPYTHON3", "python3")
     MICROPYTHON = os.getenv("MICROPY_MICROPYTHON", "../ports/unix/build-standard/micropython")

From f6f177807fe4b9552e1bdd84698c03f683f381d6 Mon Sep 17 00:00:00 2001
From: stijn <stijn@ignitron.net>
Date: Tue, 29 Nov 2022 16:59:43 +0100
Subject: [PATCH 2945/3533] windows/.gitignore: Simplify by removing build
 artefacts.

Since all output is now in the build-<variant>/ directory, which is already
excluded by the root .gitignore, we don't need to repeat that.
---
 ports/windows/.gitignore | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/ports/windows/.gitignore b/ports/windows/.gitignore
index 12235e7c9e227..4228ca48da7c7 100644
--- a/ports/windows/.gitignore
+++ b/ports/windows/.gitignore
@@ -2,10 +2,6 @@
 *.*sdf
 *.suo
 *.sln
-*.exe
-*.pdb
-*.ilk
 *.filters
-/build/*
 .vs/*
 *.VC.*db

From f2de289ef36e666ca66127263cf752a6e9899e50 Mon Sep 17 00:00:00 2001
From: Dale Weber <hybotics.sd@gmail.com>
Date: Mon, 28 Nov 2022 19:08:25 -0800
Subject: [PATCH 2946/3533] stm32/boards/NUCLEO_F429ZI: Enable I2C1 and I2C2
 with default pins.

The datasheet on page 55 shows PF0 (SDA) and PF1 (SCL) are the pins for
I2C2, but these pins do not work.  Checking the MBED pinout for the
NUCLEO-F429ZI shows:

    I2C1: PB8 (SCL) and PB9 (SDA).
    I2C2: PB10 (SCL) and PB11 (SDA).

Both of these work and can be scanned and find devices connected to them.

Signed-off-by: Dale Weber <hybotics.sd@gmail.com>.
---
 ports/stm32/boards/NUCLEO_F429ZI/mpconfigboard.h | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/ports/stm32/boards/NUCLEO_F429ZI/mpconfigboard.h b/ports/stm32/boards/NUCLEO_F429ZI/mpconfigboard.h
index 76f075546c452..dab3d442bb915 100644
--- a/ports/stm32/boards/NUCLEO_F429ZI/mpconfigboard.h
+++ b/ports/stm32/boards/NUCLEO_F429ZI/mpconfigboard.h
@@ -40,6 +40,12 @@
 #define MICROPY_HW_UART_REPL_BAUD   115200
 
 // I2C buses
+#define MICROPY_HW_I2C1_SCL (pin_B8)  // Pin 2 on CN7
+#define MICROPY_HW_I2C1_SDA (pin_B9)  // Pin 4 on CN7
+
+#define MICROPY_HW_I2C2_SCL (pin_B10) // Pin 32 on CN10
+#define MICROPY_HW_I2C2_SDA (pin_B11) // Pin 34 on CN10
+
 #define MICROPY_HW_I2C3_SCL (pin_A8)
 #define MICROPY_HW_I2C3_SDA (pin_C9)
 

From 3cc359c20473f8b64fed9daa86410bec9669cc79 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Thu, 10 Nov 2022 21:30:12 +0100
Subject: [PATCH 2947/3533] samd/mpconfigport: Support
 MICROPY_HW_SOFTSPI_MIN_DELAY.

Bringing the SoftSPI baudrate up to about 500 kHz.
---
 ports/samd/mpconfigport.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ports/samd/mpconfigport.h b/ports/samd/mpconfigport.h
index c3a0d237006c6..0e940e1c9af9c 100644
--- a/ports/samd/mpconfigport.h
+++ b/ports/samd/mpconfigport.h
@@ -93,6 +93,8 @@
 #define MICROPY_PY_MACHINE_SOFTI2C          (1)
 #define MICROPY_PY_MACHINE_SPI              (1)
 #define MICROPY_PY_MACHINE_SOFTSPI          (1)
+#define MICROPY_HW_SOFTSPI_MIN_DELAY        (1)
+#define MICROPY_HW_SOFTSPI_MAX_BAUDRATE     (1000000)
 #define MICROPY_PY_MACHINE_TIMER            (1)
 #define MICROPY_PY_OS_DUPTERM               (3)
 #define MICROPY_PY_MACHINE_BITSTREAM        (1)

From 43fc133dbd976ece5c746d76b828260057060a6b Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sat, 12 Nov 2022 20:40:26 +0100
Subject: [PATCH 2948/3533] samd/mpconfigport: Use __WFE() in
 MICROPY_EVENT_POLL_HOOK.

Like WFI, WFE also responds to a hardware interrupt, and using WFE speeds
up at least spi.read().  Power consumption at an idle REPL is unchanged.
---
 ports/samd/mpconfigport.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/samd/mpconfigport.h b/ports/samd/mpconfigport.h
index 0e940e1c9af9c..878f481f4f3fe 100644
--- a/ports/samd/mpconfigport.h
+++ b/ports/samd/mpconfigport.h
@@ -125,7 +125,7 @@ __attribute__((always_inline)) static inline uint32_t disable_irq(void) {
     do { \
         extern void mp_handle_pending(bool); \
         mp_handle_pending(true); \
-        __WFI(); \
+        __WFE(); \
     } while (0);
 
 #define MICROPY_MAKE_POINTER_CALLABLE(p) ((void *)((mp_uint_t)(p) | 1))

From fcd1788937c267da7eddea1925391b906a49e9e6 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Wed, 16 Nov 2022 08:17:48 +0100
Subject: [PATCH 2949/3533] samd: Avoid under-/overflow in I2C and SPI baudrate
 calculations.

Applies to both SPI and I2C.  The underflow caused high baudrate settings
resulting in the lowest possible baudrate.  The overflow resulted in
erratic baudrates, not just the lowest possible.
---
 ports/samd/machine_i2c.c | 11 +++++++++--
 ports/samd/machine_spi.c |  8 +++++++-
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/ports/samd/machine_i2c.c b/ports/samd/machine_i2c.c
index d943b6b2f4221..76d24674f0020 100644
--- a/ports/samd/machine_i2c.c
+++ b/ports/samd/machine_i2c.c
@@ -35,7 +35,7 @@
 #include "clock_config.h"
 
 #define DEFAULT_I2C_FREQ  (400000)
-#define RISETIME_NS       (300)
+#define RISETIME_NS       (200)
 #define I2C_TIMEOUT       (100)
 
 #define IS_BUS_BUSY       (i2c->I2CM.STATUS.bit.BUSSTATE == 3)
@@ -184,7 +184,14 @@ mp_obj_t machine_i2c_make_new(const mp_obj_type_t *type, size_t n_args, size_t n
     // baud = peripheral_freq / (2 * baudrate) - 5 - (rise_time * peripheral_freq) / 2
     // Just set the minimal configuration for standard and fast mode.
     // Set Baud. Assume ~300ns rise time. Maybe set later by a keyword argument.
-    i2c->I2CM.BAUD.reg = get_peripheral_freq() / (2 * self->freq) - 5 - (get_peripheral_freq() / 1000000) * RISETIME_NS / 2000;
+    int32_t baud = get_peripheral_freq() / (2 * self->freq) - 5 - (get_peripheral_freq() / 1000000) * RISETIME_NS / 2000;
+    if (baud < 0) {
+        baud = 0;
+    }
+    if (baud > 255) {
+        baud = 255;
+    }
+    i2c->I2CM.BAUD.reg = baud;
 
     // Enable interrupts
     sercom_register_irq(self->id, &common_i2c_irq_handler);
diff --git a/ports/samd/machine_spi.c b/ports/samd/machine_spi.c
index 4ffc7095cc2ee..d2cdf2cd4c504 100644
--- a/ports/samd/machine_spi.c
+++ b/ports/samd/machine_spi.c
@@ -208,7 +208,13 @@ STATIC void machine_spi_init(mp_obj_base_t *self_in, size_t n_args, const mp_obj
 
         // SPI is driven by the clock of GCLK Generator 2, freq by get_peripheral_freq()
         // baud = bus_freq / (2 * baudrate) - 1
-        uint32_t baud = get_peripheral_freq() / (2 * self->baudrate) - 1;
+        uint32_t baud = get_peripheral_freq() / (2 * self->baudrate);
+        if (baud > 0) {  // Avoid underflow
+            baud -= 1;
+        }
+        if (baud > 255) { // Avoid overflow
+            baud = 255;
+        }
         spi->SPI.BAUD.reg = baud; // Set Baud
 
         // Enable RXC interrupt only if miso is defined

From 4199f986ad7873f51aee5e9e51bffead775b06a1 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sat, 19 Nov 2022 12:43:34 +0100
Subject: [PATCH 2950/3533] samd/machine_uart: Fix IRQ flag setting and
 clearing.

Clearing the DRE flag for the transmit interrupt at the end of a
uart.write() also cleared the RXC flag disabling the receive interrupt.

This commit also changes the flag set/clear mechanism in the driver for SPI
as well, even if it did not cause a problem there.  But at least it saves a
few bytes of code.
---
 ports/samd/machine_spi.c  | 4 ++--
 ports/samd/machine_uart.c | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ports/samd/machine_spi.c b/ports/samd/machine_spi.c
index d2cdf2cd4c504..bbd7031e940eb 100644
--- a/ports/samd/machine_spi.c
+++ b/ports/samd/machine_spi.c
@@ -296,7 +296,7 @@ STATIC void machine_spi_transfer(mp_obj_base_t *self_in, size_t len, const uint8
         if (self->miso == 0xff) {
             mp_raise_ValueError(MP_ERROR_TEXT("read is not enabled"));
         }
-        spi->SPI.INTENSET.bit.RXC = 1;
+        spi->SPI.INTENSET.reg = SERCOM_SPI_INTENSET_RXC;
         self->dest = dest;
         self->rxlen = len;
     }
@@ -317,7 +317,7 @@ STATIC void machine_spi_transfer(mp_obj_base_t *self_in, size_t len, const uint8
             timeout--;
             MICROPY_EVENT_POLL_HOOK
         }
-        spi->SPI.INTENCLR.bit.RXC = 1;
+        spi->SPI.INTENCLR.reg = SERCOM_SPI_INTENCLR_RXC;
     } else {
         // Wait for the data being shifted out.
         while (!spi->SPI.INTFLAG.bit.TXC) {
diff --git a/ports/samd/machine_uart.c b/ports/samd/machine_uart.c
index 4b8fa3b60d8f8..eb1415789f688 100644
--- a/ports/samd/machine_uart.c
+++ b/ports/samd/machine_uart.c
@@ -95,7 +95,7 @@ void common_uart_irq_handler(int uart_id) {
                 uart->USART.DATA.bit.DATA = ringbuf_get(&self->write_buffer);
             } else {
                 // Stop the interrupt if there is no more data
-                uart->USART.INTENCLR.bit.DRE = 1;
+                uart->USART.INTENCLR.reg = SERCOM_USART_INTENCLR_DRE;
             }
             #endif
         } else {
@@ -291,7 +291,7 @@ STATIC mp_obj_t machine_uart_init_helper(machine_uart_obj_t *self, size_t n_args
         sercom_register_irq(self->id, &common_uart_irq_handler);
 
         // Enable RXC interrupt
-        uart->USART.INTENSET.bit.RXC = 1;
+        uart->USART.INTENSET.reg = SERCOM_USART_INTENSET_RXC;
         #if defined(MCU_SAMD21)
         NVIC_EnableIRQ(SERCOM0_IRQn + self->id);
         #elif defined(MCU_SAMD51)
@@ -452,7 +452,7 @@ STATIC mp_uint_t machine_uart_read(mp_obj_t self_in, void *buf_in, mp_uint_t siz
             MICROPY_EVENT_POLL_HOOK
         }
         *dest++ = ringbuf_get(&(self->read_buffer));
-        t = mp_hal_ticks_ms() + timeout_char;
+        t = mp_hal_ticks_ms_64() + timeout_char;
     }
     return size;
 }
@@ -481,7 +481,7 @@ STATIC mp_uint_t machine_uart_write(mp_obj_t self_in, const void *buf_in, mp_uin
         }
         ringbuf_put(&(self->write_buffer), *src++);
         i++;
-        uart->USART.INTENSET.bit.DRE = 1; // kick off the IRQ
+        uart->USART.INTENSET.reg = SERCOM_USART_INTENSET_DRE; // kick off the IRQ
     }
 
     #else

From 5b1fd8802a14bb59ca1ecc30df317e5994b2a327 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sat, 19 Nov 2022 22:23:02 +0100
Subject: [PATCH 2951/3533] samd/machine_uart: Simplify machine_uart_any() and
 machine_uart_read().

Remove the call to uart_drain_rx_fifo().  It is not required, and may cause
a race condition.
---
 ports/samd/machine_uart.c | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/ports/samd/machine_uart.c b/ports/samd/machine_uart.c
index eb1415789f688..c8f25d9854fbb 100644
--- a/ports/samd/machine_uart.c
+++ b/ports/samd/machine_uart.c
@@ -362,8 +362,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_uart_deinit_obj, machine_uart_deinit);
 
 STATIC mp_obj_t machine_uart_any(mp_obj_t self_in) {
     machine_uart_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    // get all bytes from the fifo first. May be obsolete.
-    uart_drain_rx_fifo(self, sercom_instance[self->id]);
     return MP_OBJ_NEW_SMALL_INT(ringbuf_avail(&self->read_buffer));
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_uart_any_obj, machine_uart_any);
@@ -431,16 +429,10 @@ STATIC mp_uint_t machine_uart_read(mp_obj_t self_in, void *buf_in, mp_uint_t siz
     uint64_t t = mp_hal_ticks_ms_64() + self->timeout;
     uint64_t timeout_char = self->timeout_char;
     uint8_t *dest = buf_in;
-    Sercom *uart = sercom_instance[self->id];
 
     for (size_t i = 0; i < size; i++) {
         // Wait for the first/next character
         while (ringbuf_avail(&self->read_buffer) == 0) {
-            if (uart->USART.INTFLAG.bit.RXC != 0) {
-                // Force a few incoming bytes to the buffer
-                uart_drain_rx_fifo(self, uart);
-                break;
-            }
             if (mp_hal_ticks_ms_64() > t) {  // timed out
                 if (i <= 0) {
                     *errcode = MP_EAGAIN;

From f78dd25a2cb729cc5b59f5df8cda1b57535c4244 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Thu, 24 Nov 2022 11:51:09 +0100
Subject: [PATCH 2952/3533] samd/machine_uart: Check the UART TX pin
 assignment.

Check, if TX is at Pad 0 (SAMD51), or Pad 0 or 2 (SAMD21).
---
 ports/samd/machine_uart.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ports/samd/machine_uart.c b/ports/samd/machine_uart.c
index c8f25d9854fbb..28261c2fcdfe3 100644
--- a/ports/samd/machine_uart.c
+++ b/ports/samd/machine_uart.c
@@ -263,8 +263,11 @@ STATIC mp_obj_t machine_uart_init_helper(machine_uart_obj_t *self, size_t n_args
         #if defined(MCU_SAMD21)
         if (self->tx_pad_config.pad_nr == 2) { // Map pad 2 to TXPO = 1
             txpo = 1;
-        }
+        } else
         #endif
+        if (self->tx_pad_config.pad_nr != 0) {
+            mp_raise_ValueError(MP_ERROR_TEXT("invalid tx pin"));
+        }
 
         uart->USART.CTRLA.reg =
             SERCOM_USART_CTRLA_DORD // Data order

From a73dcb3d228008a6225fd80627d3b9566470c687 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Fri, 25 Nov 2022 21:28:30 +0100
Subject: [PATCH 2953/3533] samd/machine_uart: Fix uart.deinit() and save some
 RAM.

Changes in this commit:
- Do not deinit IRQ when uart.deinit() is called with an inactive object.
- Remove using it for the finaliser.  There is another machanism for soft
  reset, and it is not needed otherwise.
- Do not tag the UART buffers with MP_STATE_PORT, it is not required.
---
 ports/samd/machine_uart.c | 30 +++++++++++-------------------
 1 file changed, 11 insertions(+), 19 deletions(-)

diff --git a/ports/samd/machine_uart.c b/ports/samd/machine_uart.c
index 28261c2fcdfe3..7917529fb9ada 100644
--- a/ports/samd/machine_uart.c
+++ b/ports/samd/machine_uart.c
@@ -236,11 +236,9 @@ STATIC mp_obj_t machine_uart_init_helper(machine_uart_obj_t *self, size_t n_args
 
         // Allocate the RX/TX buffers.
         ringbuf_alloc(&(self->read_buffer), rxbuf_len + 1);
-        MP_STATE_PORT(samd_uart_rx_buffer[self->id]) = self->read_buffer.buf;
 
         #if MICROPY_HW_UART_TXBUF
         ringbuf_alloc(&(self->write_buffer), txbuf_len + 1);
-        MP_STATE_PORT(samd_uart_tx_buffer[self->id]) = self->write_buffer.buf;
         #endif
 
         // Step 1: Configure the Pin mux.
@@ -324,8 +322,7 @@ STATIC mp_obj_t machine_uart_make_new(const mp_obj_type_t *type, size_t n_args,
     }
 
     // Create the UART object and fill it with defaults.
-    machine_uart_obj_t *self = m_new_obj_with_finaliser(machine_uart_obj_t);
-    self->base.type = &machine_uart_type;
+    machine_uart_obj_t *self = mp_obj_malloc(machine_uart_obj_t, &machine_uart_type);
     self->id = uart_id;
     self->baudrate = DEFAULT_UART_BAUDRATE;
     self->bits = 8;
@@ -350,15 +347,16 @@ MP_DEFINE_CONST_FUN_OBJ_KW(machine_uart_init_obj, 1, machine_uart_init);
 
 STATIC mp_obj_t machine_uart_deinit(mp_obj_t self_in) {
     machine_uart_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    Sercom *uart = sercom_instance[self->id];
-    // Disable interrupts
-    uart->USART.INTENCLR.reg = 0xff;
-    // clear table entry of uart
-    MP_STATE_PORT(sercom_table[self->id]) = NULL;
-    MP_STATE_PORT(samd_uart_rx_buffer[self->id]) = NULL;
-    #if MICROPY_HW_UART_TXBUF
-    MP_STATE_PORT(samd_uart_tx_buffer[self->id]) = NULL;
-    #endif
+    // Check if it is the active object.
+    if (MP_STATE_PORT(sercom_table)[self->id] == self) {
+        Sercom *uart = sercom_instance[self->id];
+        // Disable interrupts and de-register the IRQ
+        if (uart) {
+            uart->USART.INTENCLR.reg = 0xff;
+            sercom_register_irq(self->id, NULL);
+            sercom_enable(uart, 0);
+        }
+    }
     return mp_const_none;
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_uart_deinit_obj, machine_uart_deinit);
@@ -423,7 +421,6 @@ STATIC const mp_rom_map_elem_t machine_uart_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_readline), MP_ROM_PTR(&mp_stream_unbuffered_readline_obj) },
     { MP_ROM_QSTR(MP_QSTR_readinto), MP_ROM_PTR(&mp_stream_readinto_obj) },
     { MP_ROM_QSTR(MP_QSTR_write), MP_ROM_PTR(&mp_stream_write_obj) },
-    { MP_ROM_QSTR(MP_QSTR___del__), MP_ROM_PTR(&machine_uart_deinit_obj) },
 };
 STATIC MP_DEFINE_CONST_DICT(machine_uart_locals_dict, machine_uart_locals_dict_table);
 
@@ -547,8 +544,3 @@ MP_DEFINE_CONST_OBJ_TYPE(
     protocol, &uart_stream_p,
     locals_dict, &machine_uart_locals_dict
     );
-
-MP_REGISTER_ROOT_POINTER(void *samd_uart_rx_buffer[SERCOM_INST_NUM]);
-#if MICROPY_HW_UART_TXBUF
-MP_REGISTER_ROOT_POINTER(void *samd_uart_tx_buffer[SERCOM_INST_NUM]);
-#endif

From e69313f89c607976da2a7e06ad49b8db9fe1caf9 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Fri, 2 Dec 2022 21:08:46 +0100
Subject: [PATCH 2954/3533] samd: Add a vref=num option to the ADC and DAC
 constructor.

ADC: The argument of vref=num is an integer. Values for num are:

    SAMD21:
    0  INT1V   1.0V voltage reference
    1  INTVCC0 1/1.48 Analog voltage supply
    2  INTVCC1 1/2 Analog voltage supply (only for VDDANA > 2.0V)
    3  VREFA   External reference
    4  VREFB   External reference

    SAMD51:
    0  INTREF  internal bandgap reference
    1  INTVCC1 Analog voltage supply
    2  INTVCC0 1/2 Analog voltage supply (only for VDDANA > 2.0v)
    3  AREFA   External reference A
    4  AREFB   External reference B
    5  AREFC   External reference C (ADC1 only)

DAC: The argument of vref=num is an integer. Suitable values:

    SAMD21:
    0  INT1V   Internal voltage reference
    1  VDDANA  Analog voltage supply
    2  VREFA   External reference

    SAMD51:
    0  INTREF Internal bandgap reference
    1  VDDANA Analog voltage supply
    2  VREFAU Unbuffered external voltage reference (not buffered in DAC)
    4  VREFAB Buffered external voltage reference (buffered in DAC).
---
 docs/samd/quickref.rst                       | 58 ++++++++++++++--
 ports/samd/boards/SEEED_XIAO/mpconfigboard.h |  1 +
 ports/samd/machine_adc.c                     | 50 ++++++++++++--
 ports/samd/machine_dac.c                     | 69 +++++++++++++-------
 4 files changed, 144 insertions(+), 34 deletions(-)

diff --git a/docs/samd/quickref.rst b/docs/samd/quickref.rst
index 5e8298d1b366f..aa3d563f7c8ed 100644
--- a/docs/samd/quickref.rst
+++ b/docs/samd/quickref.rst
@@ -254,16 +254,38 @@ an external ADC.
 ADC Constructor
 ```````````````
 
-.. class:: ADC(dest, *, average=16)
+.. class:: ADC(dest, *, average=16, vref=n)
   :noindex:
 
-    Construct and return a new ADC object using the following parameters:
+Construct and return a new ADC object using the following parameters:
 
-      - *dest* is the Pin object on which the ADC is output.
+  - *dest* is the Pin object on which the ADC is output.
 
-    Keyword arguments:
+Keyword arguments:
+
+  - *average* is used to reduce the noise. With a value of 16 the LSB noise is about 1 digit.
+  - *vref* sets the reference voltage for the ADC.
+
+    The default setting is for 3.3V. Other values are:
 
-      - *average* is used to reduce the noise. With a value of 16 the LSB noise is about 1 digit.
+    ==== ==============================  ===============================
+    vref SAMD21                          SAMD51
+    ==== ==============================  ===============================
+    0    1.0V voltage reference          internal bandgap reference (1V)
+    1    1/1.48 Analogue voltage supply  Analogue voltage supply
+    2    1/2 Analogue voltage supply     1/2 Analogue voltage supply
+    3    External reference A            External reference A
+    4    External reference B            External reference B
+    5    -                               External reference C
+    ==== ==============================  ===============================
+
+ADC Methods
+```````````
+
+.. method:: read_u16()
+
+Read a single ADC value as unsigned 16 bit quantity. The voltage range is defined
+by the vref option of the constructor, the resolutions by the bits option.
 
 DAC (digital to analog conversion)
 ----------------------------------
@@ -280,6 +302,32 @@ The DAC class provides a fast digital to analog conversion. Usage example::
 The resolution of the DAC is 12 bit for SAMD51 and 10 bit for SAMD21. SAMD21 devices
 have 1 DAC channel at GPIO PA02, SAMD51 devices have 2 DAC channels at GPIO PA02 and PA05.
 
+DAC Constructor
+```````````````
+
+.. class:: DAC(id, *, vref=3)
+  :noindex:
+
+The vref arguments defines the output voltage range, the callback option is used for
+dac_timed(). Suitable values for vref are:
+
+==== ============================  ================================
+vref SAMD21                        SAMD51
+==== ============================  ================================
+0    Internal voltage reference    Internal bandgap reference (~1V)
+1    Analogue voltage supply       Analogue voltage supply
+2    External reference            Unbuffered external reference
+3    -                             Buffered external reference
+==== ============================  ================================
+
+DAC Methods
+```````````
+
+.. method:: write(value)
+
+Write a single value to the selected DAC output. The value range is 0-1023 for
+SAMD21 and 0-4095 for SAMD51. The voltage range depends on the vref setting.
+
 Software SPI bus
 ----------------
 
diff --git a/ports/samd/boards/SEEED_XIAO/mpconfigboard.h b/ports/samd/boards/SEEED_XIAO/mpconfigboard.h
index 98994a5bc06bd..7447c5c3acf70 100644
--- a/ports/samd/boards/SEEED_XIAO/mpconfigboard.h
+++ b/ports/samd/boards/SEEED_XIAO/mpconfigboard.h
@@ -2,3 +2,4 @@
 #define MICROPY_HW_MCU_NAME   "SAMD21G18A"
 
 #define MICROPY_HW_XOSC32K  (1)
+#define MICROPY_HW_ADC_VREF (2)
diff --git a/ports/samd/machine_adc.c b/ports/samd/machine_adc.c
index 8fd3e3bf4e7fa..d4078825297f4 100644
--- a/ports/samd/machine_adc.c
+++ b/ports/samd/machine_adc.c
@@ -40,11 +40,40 @@ typedef struct _machine_adc_obj_t {
     uint8_t id;
     uint8_t avg;
     uint8_t bits;
+    uint8_t vref;
 } machine_adc_obj_t;
 
 #define DEFAULT_ADC_BITS    12
 #define DEFAULT_ADC_AVG     16
 
+#if defined(MCU_SAMD21)
+static uint8_t adc_vref_table[] = {
+    ADC_REFCTRL_REFSEL_INT1V_Val, ADC_REFCTRL_REFSEL_INTVCC0_Val,
+    ADC_REFCTRL_REFSEL_INTVCC1_Val, ADC_REFCTRL_REFSEL_AREFA_Val, ADC_REFCTRL_REFSEL_AREFB_Val
+};
+#if MICROPY_HW_ADC_VREF
+#define DEFAULT_ADC_VREF    MICROPY_HW_ADC_VREF
+#else
+#define DEFAULT_ADC_VREF    (3)
+#endif
+
+#define ADC_EVSYS_CHANNEL    0
+
+#elif defined(MCU_SAMD51)
+
+static uint8_t adc_vref_table[] = {
+    ADC_REFCTRL_REFSEL_INTREF_Val, ADC_REFCTRL_REFSEL_INTVCC1_Val,
+    ADC_REFCTRL_REFSEL_INTVCC0_Val, ADC_REFCTRL_REFSEL_AREFA_Val,
+    ADC_REFCTRL_REFSEL_AREFB_Val, ADC_REFCTRL_REFSEL_AREFC_Val
+};
+#if MICROPY_HW_ADC_VREF
+#define DEFAULT_ADC_VREF    MICROPY_HW_ADC_VREF
+#else
+#define DEFAULT_ADC_VREF    (3)
+#endif
+
+#endif  // defined(MCU_SAMD21)
+
 Adc *const adc_bases[] = ADC_INSTS;
 uint32_t busy_flags = 0;
 bool init_flags[2] = {false, false};
@@ -66,17 +95,18 @@ STATIC void adc_obj_print(const mp_print_t *print, mp_obj_t o, mp_print_kind_t k
     (void)kind;
     machine_adc_obj_t *self = MP_OBJ_TO_PTR(o);
 
-    mp_printf(print, "ADC(%s, device=%u, channel=%u, bits=%u, average=%u)",
+    mp_printf(print, "ADC(%s, device=%u, channel=%u, bits=%u, average=%u, vref=%d)",
         pin_name(self->id), self->adc_config.device,
-        self->adc_config.channel, self->bits, 1 << self->avg);
+        self->adc_config.channel, self->bits, 1 << self->avg, self->vref);
 }
 
 STATIC mp_obj_t adc_obj_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
-    enum { ARG_id, ARG_bits, ARG_average };
+    enum { ARG_id, ARG_bits, ARG_average, ARG_vref };
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_id,       MP_ARG_REQUIRED | MP_ARG_OBJ },
         { MP_QSTR_bits,     MP_ARG_INT, {.u_int = DEFAULT_ADC_BITS} },
         { MP_QSTR_average,  MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = DEFAULT_ADC_AVG} },
+        { MP_QSTR_vref,     MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = DEFAULT_ADC_VREF} },
     };
 
     // Parse the arguments.
@@ -99,8 +129,14 @@ STATIC mp_obj_t adc_obj_make_new(const mp_obj_type_t *type, size_t n_args, size_
     uint32_t avg = log2i(args[ARG_average].u_int);
     self->avg = (avg <= 10 ? avg : 10);
 
+    uint8_t vref = args[ARG_vref].u_int;
+    if (0 <= vref && vref < sizeof(adc_vref_table)) {
+        self->vref = vref;
+    }
+
     // flag the device/channel as being in use.
     busy_flags |= (1 << (self->adc_config.device * 16 + self->adc_config.channel));
+    init_flags[self->adc_config.device] = false;
 
     adc_init(self);
 
@@ -111,6 +147,8 @@ STATIC mp_obj_t adc_obj_make_new(const mp_obj_type_t *type, size_t n_args, size_
 STATIC mp_obj_t machine_adc_read_u16(mp_obj_t self_in) {
     machine_adc_obj_t *self = MP_OBJ_TO_PTR(self_in);
     Adc *adc = adc_bases[self->adc_config.device];
+    // Set the reference voltage. Default: external AREFA.
+    adc->REFCTRL.reg = adc_vref_table[self->vref];
     // Set Input channel and resolution
     // Select the pin as positive input and gnd as negative input reference, non-diff mode by default
     adc->INPUTCTRL.reg = ADC_INPUTCTRL_MUXNEG_GND | self->adc_config.channel;
@@ -183,7 +221,7 @@ static void adc_init(machine_adc_obj_t *self) {
         // Divide 48MHz clock by 32 to obtain 1.5 MHz clock to adc
         adc->CTRLB.reg = ADC_CTRLB_PRESCALER_DIV32;
         // Select external AREFA as reference voltage.
-        adc->REFCTRL.reg = ADC_REFCTRL_REFSEL_AREFA;
+        adc->REFCTRL.reg = adc_vref_table[self->vref];
         // Average: Accumulate samples and scale them down accordingly
         adc->AVGCTRL.reg = self->avg | ADC_AVGCTRL_ADJRES(self->avg);
         // Enable ADC and wait to be ready
@@ -222,8 +260,8 @@ static void adc_init(machine_adc_obj_t *self) {
         adc->CALIB.reg = ADC_CALIB_BIASCOMP(biascomp) | ADC_CALIB_BIASR2R(biasr2r) | ADC_CALIB_BIASREFBUF(biasrefbuf);
         // Divide 48MHz clock by 32 to obtain 1.5 MHz clock to adc
         adc->CTRLA.reg = ADC_CTRLA_PRESCALER_DIV32;
-        // Select external AREFA as reference voltage.
-        adc->REFCTRL.reg = ADC_REFCTRL_REFSEL_AREFA;
+        // Set the reference voltage. Default: external AREFA.
+        adc->REFCTRL.reg = adc_vref_table[self->vref];
         // Average: Accumulate samples and scale them down accordingly
         adc->AVGCTRL.reg = self->avg | ADC_AVGCTRL_ADJRES(self->avg);
         // Enable ADC and wait to be ready
diff --git a/ports/samd/machine_dac.c b/ports/samd/machine_dac.c
index 53407c0d375aa..a1da9285e5fbe 100644
--- a/ports/samd/machine_dac.c
+++ b/ports/samd/machine_dac.c
@@ -38,9 +38,10 @@ typedef struct _dac_obj_t {
     mp_obj_base_t base;
     uint8_t id;
     mp_hal_pin_obj_t gpio_id;
+    uint8_t vref;
 } dac_obj_t;
 
-STATIC const dac_obj_t dac_obj[] = {
+STATIC dac_obj_t dac_obj[] = {
     #if defined(MCU_SAMD21)
     {{&machine_dac_type}, 0, PIN_PA02},
     #elif defined(MCU_SAMD51)
@@ -51,25 +52,53 @@ STATIC const dac_obj_t dac_obj[] = {
 Dac *const dac_bases[] = DAC_INSTS;
 
 #if defined(MCU_SAMD21)
-#define MAX_DAC_VALUE  (1023)
+
+#define MAX_DAC_VALUE       (1023)
+#define DEFAULT_DAC_VREF    (1)
+#define MAX_DAC_VREF        (2)
+
 #elif defined(MCU_SAMD51)
-#define MAX_DAC_VALUE  (4095)
+
+// According to Errata 2.9.2, VDDANA as ref value is not available. However it worked
+// in tests. So I keep the selection here but set the default to Aref, which is usually
+// connected at the Board to VDDANA
+static uint8_t dac_vref_table[] = {
+    DAC_CTRLB_REFSEL_INTREF_Val, DAC_CTRLB_REFSEL_VDDANA_Val,
+    DAC_CTRLB_REFSEL_VREFPU_Val, DAC_CTRLB_REFSEL_VREFPB_Val
+};
+#define MAX_DAC_VALUE       (4095)
+#define DEFAULT_DAC_VREF    (2)
+#define MAX_DAC_VREF        (3)
 static bool dac_init = false;
 #endif
 
 
 STATIC mp_obj_t dac_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw,
-    const mp_obj_t *args) {
+    const mp_obj_t *all_args) {
 
-    mp_arg_check_num(n_args, n_kw, 1, 1, true);
-    uint8_t id = mp_obj_get_int(args[0]);
-    const dac_obj_t *self = NULL;
+    enum { ARG_id, ARG_vref };
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_id,       MP_ARG_REQUIRED | MP_ARG_INT, {.u_int = 0} },
+        { MP_QSTR_vref,     MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = DEFAULT_DAC_VREF} },
+    };
+
+    // Parse the arguments.
+    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
+    mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
+
+    uint8_t id = args[ARG_id].u_int;
+    dac_obj_t *self = NULL;
     if (0 <= id && id <= MP_ARRAY_SIZE(dac_obj)) {
         self = &dac_obj[id];
     } else {
         mp_raise_ValueError(MP_ERROR_TEXT("invalid Pin for DAC"));
     }
 
+    uint8_t vref = args[ARG_vref].u_int;
+    if (0 <= vref && vref <= MAX_DAC_VREF) {
+        self->vref = vref;
+    }
+
     Dac *dac = dac_bases[0]; // Just one DAC
 
     // Init DAC
@@ -85,7 +114,7 @@ STATIC mp_obj_t dac_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_
     dac->CTRLA.bit.SWRST = 1;
     while (dac->CTRLA.bit.SWRST) {
     }
-    dac->CTRLB.reg = DAC_CTRLB_EOEN | DAC_CTRLB_REFSEL(DAC_CTRLB_REFSEL_AVCC_Val);
+    dac->CTRLB.reg = DAC_CTRLB_EOEN | DAC_CTRLB_REFSEL(self->vref);
     // Enable DAC and wait to be ready
     dac->CTRLA.bit.ENABLE = 1;
     while (dac->STATUS.bit.SYNCBUSY) {
@@ -95,21 +124,15 @@ STATIC mp_obj_t dac_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_
 
     // Configuration SAMD51
     // Enable APBD clocks and PCHCTRL clocks; GCLK3 at 8 MHz
-    if (!dac_init) {
-        dac_init = true;
-        MCLK->APBDMASK.reg |= MCLK_APBDMASK_DAC;
-        GCLK->PCHCTRL[DAC_GCLK_ID].reg = GCLK_PCHCTRL_GEN_GCLK3 | GCLK_PCHCTRL_CHEN;
-
-        // Reset DAC registers
-        dac->CTRLA.bit.SWRST = 1;
-        while (dac->CTRLA.bit.SWRST) {
-        }
-        dac->CTRLB.reg = DAC_CTRLB_REFSEL(DAC_CTRLB_REFSEL_VDDANA_Val);
-    } else {
-        dac->CTRLA.bit.ENABLE = 0;
-        while (dac->SYNCBUSY.bit.ENABLE) {
-        }
+    dac_init = true;
+    MCLK->APBDMASK.reg |= MCLK_APBDMASK_DAC;
+    GCLK->PCHCTRL[DAC_GCLK_ID].reg = GCLK_PCHCTRL_GEN_GCLK3 | GCLK_PCHCTRL_CHEN;
+
+    // Reset DAC registers
+    dac->CTRLA.bit.SWRST = 1;
+    while (dac->CTRLA.bit.SWRST) {
     }
+    dac->CTRLB.reg = DAC_CTRLB_REFSEL(dac_vref_table[self->vref]);
     dac->DACCTRL[self->id].reg = DAC_DACCTRL_ENABLE | DAC_DACCTRL_REFRESH(2) | DAC_DACCTRL_CCTRL_CC12M;
 
     // Enable DAC and wait to be ready
@@ -126,7 +149,7 @@ STATIC mp_obj_t dac_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_
 
 STATIC void dac_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     dac_obj_t *self = self_in;
-    mp_printf(print, "DAC(%u, Pin=%s)", self->id, pin_name(self->gpio_id));
+    mp_printf(print, "DAC(%u, Pin=%s, vref=%d)", self->id, pin_name(self->gpio_id), self->vref);
 }
 
 STATIC mp_obj_t dac_write(mp_obj_t self_in, mp_obj_t value_in) {

From 17ab2f671b1abe93ccd0024c6750a63e0c20ee6a Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sun, 11 Dec 2022 15:33:16 +0100
Subject: [PATCH 2955/3533] samd: Support entering bootloader via USB CDC
 1200bps touch.

---
 ports/samd/Makefile       | 1 +
 ports/samd/modmachine.c   | 5 ++---
 ports/samd/modmachine.h   | 2 ++
 ports/samd/mpconfigport.h | 2 ++
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/ports/samd/Makefile b/ports/samd/Makefile
index 5817620916527..fc5fa9e4375de 100644
--- a/ports/samd/Makefile
+++ b/ports/samd/Makefile
@@ -117,6 +117,7 @@ SHARED_SRC_C += \
 	shared/runtime/stdout_helpers.c \
 	shared/runtime/sys_stdio_mphal.c \
 	shared/timeutils/timeutils.c \
+	shared/tinyusb/mp_cdc_common.c \
 
 ASF4_SRC_C += $(addprefix lib/asf4/$(MCU_SERIES_LOWER)/,\
 	hal/src/hal_atomic.c \
diff --git a/ports/samd/modmachine.c b/ports/samd/modmachine.c
index 8adc06f526540..ec3e99f163a55 100644
--- a/ports/samd/modmachine.c
+++ b/ports/samd/modmachine.c
@@ -74,15 +74,14 @@ STATIC mp_obj_t machine_reset(void) {
 }
 MP_DEFINE_CONST_FUN_OBJ_0(machine_reset_obj, machine_reset);
 
-STATIC mp_obj_t machine_bootloader(void) {
+NORETURN mp_obj_t machine_bootloader(size_t n_args, const mp_obj_t *args) {
     *DBL_TAP_ADDR = DBL_TAP_MAGIC_LOADER;
     #ifdef DBL_TAP_ADDR_ALT
     *DBL_TAP_ADDR_ALT = DBL_TAP_MAGIC_LOADER;
     #endif
     NVIC_SystemReset();
-    return mp_const_none;
 }
-MP_DEFINE_CONST_FUN_OBJ_0(machine_bootloader_obj, machine_bootloader);
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_bootloader_obj, 0, 1, machine_bootloader);
 
 STATIC mp_obj_t machine_freq(size_t n_args, const mp_obj_t *args) {
     if (n_args == 0) {
diff --git a/ports/samd/modmachine.h b/ports/samd/modmachine.h
index 792fca1b92920..e8738df4b5ed5 100644
--- a/ports/samd/modmachine.h
+++ b/ports/samd/modmachine.h
@@ -41,4 +41,6 @@ extern const mp_obj_type_t machine_wdt_type;
 extern const mp_obj_type_t machine_rtc_type;
 #endif
 
+NORETURN mp_obj_t machine_bootloader(size_t n_args, const mp_obj_t *args);
+
 #endif // MICROPY_INCLUDED_SAMD_MODMACHINE_H
diff --git a/ports/samd/mpconfigport.h b/ports/samd/mpconfigport.h
index 878f481f4f3fe..b3ca67caec618 100644
--- a/ports/samd/mpconfigport.h
+++ b/ports/samd/mpconfigport.h
@@ -58,7 +58,9 @@
 #define MICROPY_PY_BUILTINS_HELP_TEXT       samd_help_text
 #define MICROPY_PY_BUILTINS_HELP_MODULES    (1)
 #define MICROPY_ENABLE_SCHEDULER            (1)
+#define MICROPY_SCHEDULER_STATIC_NODES      (1)
 #define MICROPY_MODULE_WEAK_LINKS           (1)
+#define MICROPY_HW_USB_CDC_1200BPS_TOUCH    (1)
 
 // Control over Python builtins
 #define MICROPY_PY_BUILTINS_BYTES_HEX       (1)

From 913f9ad5ad9bb446c6e4310b6b5eda310098a1cf Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Mon, 28 Nov 2022 20:56:14 +0100
Subject: [PATCH 2956/3533] mimxrt/machine_rtc: Set the microsecond value to 0.

Set the subsecond value reported by rtc.datetime() and rtc.now() to 0.
Synchronizing the roll-over with the second change was not precise.
---
 ports/mimxrt/machine_rtc.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/ports/mimxrt/machine_rtc.c b/ports/mimxrt/machine_rtc.c
index da7a437491f72..702c1b903e50e 100644
--- a/ports/mimxrt/machine_rtc.c
+++ b/ports/mimxrt/machine_rtc.c
@@ -38,7 +38,6 @@ typedef struct _machine_rtc_obj_t {
 
 // Singleton RTC object.
 STATIC const machine_rtc_obj_t machine_rtc_obj = {{&machine_rtc_type}};
-uint32_t us_offset = 0;
 
 // Start the RTC Timer.
 void machine_rtc_start(void) {
@@ -83,7 +82,7 @@ STATIC mp_obj_t machine_rtc_datetime_helper(size_t n_args, const mp_obj_t *args)
             mp_obj_new_int(srtc_date.hour),
             mp_obj_new_int(srtc_date.minute),
             mp_obj_new_int(srtc_date.second),
-            mp_obj_new_int((ticks_us64() + us_offset) % 1000000),
+            mp_obj_new_int(0),
         };
         return mp_obj_new_tuple(8, tuple);
     } else {
@@ -104,7 +103,6 @@ STATIC mp_obj_t machine_rtc_datetime_helper(size_t n_args, const mp_obj_t *args)
         if (SNVS_LP_SRTC_SetDatetime(SNVS, &srtc_date) != kStatus_Success) {
             mp_raise_ValueError(NULL);
         }
-        us_offset = (1000000 + mp_obj_get_int(items[7]) - ticks_us64() % 1000000) % 1000000;
 
         return mp_const_none;
     }
@@ -127,7 +125,7 @@ STATIC mp_obj_t machine_rtc_now(mp_obj_t self_in) {
         mp_obj_new_int(srtc_date.hour),
         mp_obj_new_int(srtc_date.minute),
         mp_obj_new_int(srtc_date.second),
-        mp_obj_new_int((ticks_us64() + us_offset) % 1000000),
+        mp_obj_new_int(0),
         mp_const_none,
     };
     return mp_obj_new_tuple(8, tuple);

From aea4174937d8ba2748c8a6700b2c6dbcee89f7a3 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Tue, 29 Nov 2022 13:05:44 +0100
Subject: [PATCH 2957/3533] mimxrt/sdcard: Fix an error when writing large
 blocks.

Which happened when a read followed a large write.
---
 ports/mimxrt/sdcard.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ports/mimxrt/sdcard.c b/ports/mimxrt/sdcard.c
index 20f76cc88f313..5172067884154 100644
--- a/ports/mimxrt/sdcard.c
+++ b/ports/mimxrt/sdcard.c
@@ -360,7 +360,8 @@ static status_t sdcard_transfer_blocking(USDHC_Type *base, usdhc_handle_t *handl
     status = kStatus_Timeout;
     for (int i = 0; i < timeout_ms * 100; i++) {
         // Wait until Data0 is low any more. Low indicates "Busy".
-        if ((transfer->data->txData == NULL) || (USDHC_GetPresentStatusFlags(base) & (uint32_t)kUSDHC_Data0LineLevelFlag) != 0) {
+        if (((transfer->data->txData == NULL) && (transfer->data->rxData == NULL)) ||
+            (USDHC_GetPresentStatusFlags(base) & (uint32_t)kUSDHC_Data0LineLevelFlag) != 0) {
             // Not busy anymore or no TX-Data
             status = USDHC_TransferBlocking(base, &dma_config, transfer);
             if (status != kStatus_Success) {

From b75b5c102c4e4197ff4ed6967070cbf9a5b63b92 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Tue, 29 Nov 2022 13:16:35 +0100
Subject: [PATCH 2958/3533] mimxrt/sdcard: Remove obsolete code already
 excluded by preprocessor.

---
 ports/mimxrt/sdcard.c | 60 -------------------------------------------
 1 file changed, 60 deletions(-)

diff --git a/ports/mimxrt/sdcard.c b/ports/mimxrt/sdcard.c
index 5172067884154..1d548599016c5 100644
--- a/ports/mimxrt/sdcard.c
+++ b/ports/mimxrt/sdcard.c
@@ -31,10 +31,6 @@
 #include "fsl_iomuxc.h"
 #include "pin.h"
 
-#if FSL_USDHC_DRIVER_VERSION == 0x020208
-#define USHDC_USE_TRANSFER_NONBLOCKING_10XX  (1)
-#endif
-
 #define SDCARD_VOLTAGE_WINDOW_SD                (0x80100000U)
 #define SDCARD_HIGH_CAPACITY                    (0x40000000U)
 #define SDCARD_SWITCH_1_8V_CAPACITY             ((uint32_t)0x01000000U)
@@ -143,16 +139,6 @@ enum
     SDCARD_STATE_DISCONNECT  = 8U,
 };
 
-// ---
-// SD Card transfer status
-// ---
-typedef enum
-{
-    SDCARD_TRANSFER_SUCCESS = 0,
-    SDCARD_TRANSFER_ERROR,
-    SDCARD_TRANSFER_PENDING
-} sdcard_transfer_status_t;
-
 // ---
 // SD Card type definitions
 // ---
@@ -220,9 +206,6 @@ mimxrt_sdcard_obj_t mimxrt_sdcard_objs[] =
     #endif
 };
 
-volatile status_t sdcard_transfer_status;
-volatile bool sdcard_transfer_done;
-
 // ---
 // Local function declarations
 // ---
@@ -286,16 +269,6 @@ void sdcard_card_removed_callback(USDHC_Type *base, void *userData) {
     USDHC_ClearInterruptStatusFlags(base, kUSDHC_CardRemovalFlag);
 }
 
-#if USHDC_USE_TRANSFER_NONBLOCKING_10XX
-
-void sdcard_transfer_complete_callback(USDHC_Type *base, usdhc_handle_t *handle, status_t status, void *userData) {
-    sdcard_transfer_status = status;
-    sdcard_transfer_done = true;
-    USDHC_ClearInterruptStatusFlags(base, kUSDHC_CommandCompleteFlag | kUSDHC_DataCompleteFlag);
-}
-
-#endif
-
 void sdcard_dummy_callback(USDHC_Type *base, void *userData) {
     return;
 }
@@ -331,31 +304,6 @@ static status_t sdcard_transfer_blocking(USDHC_Type *base, usdhc_handle_t *handl
     dma_config.admaTable = sdcard_adma_descriptor_table;
     dma_config.admaTableWords = DMA_DESCRIPTOR_BUFFER_SIZE;
 
-    #if USHDC_USE_TRANSFER_NONBLOCKING_10XX
-
-    uint32_t retry_ctr = 0UL;
-
-    do {
-        status = USDHC_TransferNonBlocking(base, handle, &dma_config, transfer);
-        retry_ctr++;
-    } while (!(status == kStatus_Success) && (retry_ctr < 1000000UL));
-
-    if (status == kStatus_Success) {
-        for (int i = 0; i < timeout_ms * 100; i++) {
-            if ((sdcard_transfer_done == true) && (sdcard_transfer_status == kStatus_Success)) {
-                sdcard_transfer_done = false;
-                return kStatus_Success;
-            }
-            ticks_delay_us64(10);
-        }
-        return kStatus_Timeout;
-    } else {
-        sdcard_error_recovery(base);
-        return status;
-    }
-
-    #else // USHDC_USE_TRANSFER_NONBLOCKING_10XX
-
     // Wait while the card is busy before a transfer
     status = kStatus_Timeout;
     for (int i = 0; i < timeout_ms * 100; i++) {
@@ -373,7 +321,6 @@ static status_t sdcard_transfer_blocking(USDHC_Type *base, usdhc_handle_t *handl
     }
     return status;
 
-    #endif // USHDC_USE_TRANSFER_NONBLOCKING_11XX
 }
 
 static void sdcard_decode_csd(mimxrt_sdcard_obj_t *card, csd_t *csd) {
@@ -771,18 +718,15 @@ void sdcard_init(mimxrt_sdcard_obj_t *card, uint32_t base_clk) {
     (void)sdcard_reset(card);
     card->base_clk = base_clk;
 
-    #if USHDC_USE_TRANSFER_NONBLOCKING_10XX
     usdhc_transfer_callback_t callbacks = {
         .CardInserted = sdcard_card_inserted_callback,
         .CardRemoved = sdcard_card_removed_callback,
         .SdioInterrupt = sdcard_dummy_callback,
         .BlockGap = sdcard_dummy_callback,
-        .TransferComplete = sdcard_transfer_complete_callback,
         .ReTuning = sdcard_dummy_callback,
     };
 
     USDHC_TransferCreateHandle(card->usdhc_inst, &card->handle, &callbacks, NULL);
-    #endif // USHDC_USE_TRANSFER_NONBLOCKING_10XX
 }
 
 void sdcard_deinit(mimxrt_sdcard_obj_t *card) {
@@ -1053,8 +997,6 @@ bool sdcard_power_off(mimxrt_sdcard_obj_t *card) {
 bool sdcard_detect(mimxrt_sdcard_obj_t *card) {
     bool detect = false;
 
-    #if USHDC_USE_TRANSFER_NONBLOCKING_10XX
-
     #if defined MICROPY_USDHC1 && USDHC1_AVAIL
     if ((card->usdhc_inst == USDHC1) && (sdcard_usdhc1_state.inserted == true)) {
         return true;
@@ -1066,8 +1008,6 @@ bool sdcard_detect(mimxrt_sdcard_obj_t *card) {
     }
     #endif
 
-    #endif // USHDC_USE_TRANSFER_NONBLOCKING_10XX
-
     if (card->pins->cd_b.pin) {
         detect = USDHC_DetectCardInsert(card->usdhc_inst);
     } else {

From 0eba00a92cd422febff560f0f0d1b89f3d0c008f Mon Sep 17 00:00:00 2001
From: Damien Tournoud <damien@platform.sh>
Date: Tue, 13 Dec 2022 08:22:11 -0800
Subject: [PATCH 2959/3533] extmod/uasyncio: Fix syntax of generator functions.

The compiler is not picky right now, but these are actually all syntax
errors:
- await is only valid in an async function
- async functions that use yield are actually async generators (a construct
  not supported by the compiler right now)
---
 extmod/uasyncio/event.py  |  3 ++-
 extmod/uasyncio/funcs.py  |  5 +++--
 extmod/uasyncio/lock.py   |  3 ++-
 extmod/uasyncio/stream.py | 21 ++++++++++++++-------
 4 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/extmod/uasyncio/event.py b/extmod/uasyncio/event.py
index 3b5e79d8f23ea..1525bcf3a97d5 100644
--- a/extmod/uasyncio/event.py
+++ b/extmod/uasyncio/event.py
@@ -23,7 +23,8 @@ def set(self):
     def clear(self):
         self.state = False
 
-    async def wait(self):
+    # async
+    def wait(self):
         if not self.state:
             # Event not set, put the calling task on the event's waiting queue
             self.waiting.push(core.cur_task)
diff --git a/extmod/uasyncio/funcs.py b/extmod/uasyncio/funcs.py
index 96883e4fe1061..23a585aa94d95 100644
--- a/extmod/uasyncio/funcs.py
+++ b/extmod/uasyncio/funcs.py
@@ -4,7 +4,7 @@
 from . import core
 
 
-def _run(waiter, aw):
+async def _run(waiter, aw):
     try:
         result = await aw
         status = True
@@ -61,7 +61,8 @@ def remove(t):
         pass
 
 
-async def gather(*aws, return_exceptions=False):
+# async
+def gather(*aws, return_exceptions=False):
     if not aws:
         return []
 
diff --git a/extmod/uasyncio/lock.py b/extmod/uasyncio/lock.py
index f50213d7c1862..4dae36bc2b6f1 100644
--- a/extmod/uasyncio/lock.py
+++ b/extmod/uasyncio/lock.py
@@ -28,7 +28,8 @@ def release(self):
             # No Task waiting so unlock
             self.state = 0
 
-    async def acquire(self):
+    # async
+    def acquire(self):
         if self.state != 0:
             # Lock unavailable, put the calling Task on the waiting queue
             self.waiting.push(core.cur_task)
diff --git a/extmod/uasyncio/stream.py b/extmod/uasyncio/stream.py
index 785e43555ddd9..875353c940f03 100644
--- a/extmod/uasyncio/stream.py
+++ b/extmod/uasyncio/stream.py
@@ -26,7 +26,8 @@ async def wait_closed(self):
         # TODO yield?
         self.s.close()
 
-    async def read(self, n=-1):
+    # async
+    def read(self, n=-1):
         r = b""
         while True:
             yield core._io_queue.queue_read(self.s)
@@ -38,11 +39,13 @@ async def read(self, n=-1):
                     return r
                 r += r2
 
-    async def readinto(self, buf):
+    # async
+    def readinto(self, buf):
         yield core._io_queue.queue_read(self.s)
         return self.s.readinto(buf)
 
-    async def readexactly(self, n):
+    # async
+    def readexactly(self, n):
         r = b""
         while n:
             yield core._io_queue.queue_read(self.s)
@@ -54,7 +57,8 @@ async def readexactly(self, n):
                 n -= len(r2)
         return r
 
-    async def readline(self):
+    # async
+    def readline(self):
         l = b""
         while True:
             yield core._io_queue.queue_read(self.s)
@@ -73,10 +77,11 @@ def write(self, buf):
                 buf = buf[ret:]
         self.out_buf += buf
 
-    async def drain(self):
+    # async
+    def drain(self):
         if not self.out_buf:
             # Drain must always yield, so a tight loop of write+drain can't block the scheduler.
-            return await core.sleep_ms(0)
+            return (yield from core.sleep_ms(0))
         mv = memoryview(self.out_buf)
         off = 0
         while off < len(mv):
@@ -93,7 +98,9 @@ async def drain(self):
 
 
 # Create a TCP stream connection to a remote host
-async def open_connection(host, port):
+#
+# async
+def open_connection(host, port):
     from uerrno import EINPROGRESS
     import usocket as socket
 

From 958f748e53ec03c8880e9e208498de5a101362b4 Mon Sep 17 00:00:00 2001
From: David Lechner <david@pybricks.com>
Date: Tue, 13 Dec 2022 12:06:04 -0600
Subject: [PATCH 2960/3533] unix/moduos: Implement 2-arg version of
 os.getenv().

This adds the `default` argument of `os.getenv(key, default=None)`.

Signed-off-by: David Lechner <david@pybricks.com>
---
 ports/unix/moduos.c                         |  9 ++++++---
 tests/cpydiff/modules_os_getenv_argcount.py | 14 --------------
 2 files changed, 6 insertions(+), 17 deletions(-)
 delete mode 100644 tests/cpydiff/modules_os_getenv_argcount.py

diff --git a/ports/unix/moduos.c b/ports/unix/moduos.c
index 854ff335faa47..e44ceb677b5c6 100644
--- a/ports/unix/moduos.c
+++ b/ports/unix/moduos.c
@@ -32,14 +32,17 @@
 #include "py/runtime.h"
 #include "py/mphal.h"
 
-STATIC mp_obj_t mp_uos_getenv(mp_obj_t var_in) {
-    const char *s = getenv(mp_obj_str_get_str(var_in));
+STATIC mp_obj_t mp_uos_getenv(size_t n_args, const mp_obj_t *args) {
+    const char *s = getenv(mp_obj_str_get_str(args[0]));
     if (s == NULL) {
+        if (n_args == 2) {
+            return args[1];
+        }
         return mp_const_none;
     }
     return mp_obj_new_str(s, strlen(s));
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_uos_getenv_obj, mp_uos_getenv);
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_uos_getenv_obj, 1, 2, mp_uos_getenv);
 
 STATIC mp_obj_t mp_uos_putenv(mp_obj_t key_in, mp_obj_t value_in) {
     const char *key = mp_obj_str_get_str(key_in);
diff --git a/tests/cpydiff/modules_os_getenv_argcount.py b/tests/cpydiff/modules_os_getenv_argcount.py
deleted file mode 100644
index d7838a92ccba2..0000000000000
--- a/tests/cpydiff/modules_os_getenv_argcount.py
+++ /dev/null
@@ -1,14 +0,0 @@
-"""
-categories: Modules,os
-description: ``getenv`` only allows one argument
-cause: Unknown
-workaround: Test that the return value is ``None``
-"""
-import os
-
-try:
-    print(os.getenv("NEW_VARIABLE", "DEFAULT"))
-except TypeError:
-    print("should not get here")
-    # this assumes NEW_VARIABLE is never an empty variable
-    print(os.getenv("NEW_VARIABLE") or "DEFAULT")

From 3c2d7563d26ab457c84e6392c103bce6d2fc6e02 Mon Sep 17 00:00:00 2001
From: David Lechner <david@pybricks.com>
Date: Tue, 13 Dec 2022 12:08:12 -0600
Subject: [PATCH 2961/3533] tests/unix/mod_os: Add test for os module.

This adds a test to get coverage of the unix port-specific implementation
of the `os` module.

Signed-off-by: David Lechner <david@pybricks.com>
---
 tests/unix/mod_os.py     | 21 +++++++++++++++++++++
 tests/unix/mod_os.py.exp |  7 +++++++
 2 files changed, 28 insertions(+)
 create mode 100644 tests/unix/mod_os.py
 create mode 100644 tests/unix/mod_os.py.exp

diff --git a/tests/unix/mod_os.py b/tests/unix/mod_os.py
new file mode 100644
index 0000000000000..17554d9375ac3
--- /dev/null
+++ b/tests/unix/mod_os.py
@@ -0,0 +1,21 @@
+# This module is not entirely compatible with CPython
+import os
+
+
+os.putenv("TEST_VARIABLE", "TEST_VALUE")
+
+print(os.getenv("TEST_VARIABLE"))
+print(os.getenv("TEST_VARIABLE", "TEST_DEFAULT_VALUE"))
+
+os.unsetenv("TEST_VARIABLE")
+
+print(os.getenv("TEST_VARIABLE"))
+print(os.getenv("TEST_VARIABLE", "TEST_DEFAULT_VALUE"))
+
+print(os.system("true"))
+
+rand = os.urandom(4)
+print(type(rand) is bytes, len(rand))
+
+os.errno(2)
+print(os.errno())
diff --git a/tests/unix/mod_os.py.exp b/tests/unix/mod_os.py.exp
new file mode 100644
index 0000000000000..465163085b5d6
--- /dev/null
+++ b/tests/unix/mod_os.py.exp
@@ -0,0 +1,7 @@
+TEST_VALUE
+TEST_VALUE
+None
+TEST_DEFAULT_VALUE
+0
+True 4
+2

From 5608226cfd7b90bf9886dcf34eebb74e1a82a420 Mon Sep 17 00:00:00 2001
From: David Lechner <david@pybricks.com>
Date: Tue, 13 Dec 2022 12:57:34 -0600
Subject: [PATCH 2962/3533] github/workflows: Cancel when branch is updated.

This adds a concurrency section to all github workflows to cancel any
in progress workflow when a branch is updated. This should cancel any
ongoing or queued workflows, e.g. when a pull request is updated.

Signed-off-by: David Lechner <david@pybricks.com>
---
 .github/workflows/code_formatting.yml   | 4 ++++
 .github/workflows/code_size.yml         | 4 ++++
 .github/workflows/code_size_comment.yml | 4 ++++
 .github/workflows/commit_formatting.yml | 4 ++++
 .github/workflows/docs.yml              | 4 ++++
 .github/workflows/examples.yml          | 4 ++++
 .github/workflows/mpy_format.yml        | 4 ++++
 .github/workflows/ports.yml             | 4 ++++
 .github/workflows/ports_cc3200.yml      | 4 ++++
 .github/workflows/ports_esp32.yml       | 4 ++++
 .github/workflows/ports_esp8266.yml     | 4 ++++
 .github/workflows/ports_mimxrt.yml      | 4 ++++
 .github/workflows/ports_nrf.yml         | 4 ++++
 .github/workflows/ports_powerpc.yml     | 4 ++++
 .github/workflows/ports_qemu-arm.yml    | 4 ++++
 .github/workflows/ports_renesas-ra.yml  | 4 ++++
 .github/workflows/ports_rp2.yml         | 4 ++++
 .github/workflows/ports_samd.yml        | 4 ++++
 .github/workflows/ports_stm32.yml       | 4 ++++
 .github/workflows/ports_teensy.yml      | 4 ++++
 .github/workflows/ports_unix.yml        | 4 ++++
 .github/workflows/ports_webassembly.yml | 4 ++++
 .github/workflows/ports_windows.yml     | 4 ++++
 .github/workflows/ports_zephyr.yml      | 4 ++++
 24 files changed, 96 insertions(+)

diff --git a/.github/workflows/code_formatting.yml b/.github/workflows/code_formatting.yml
index 4ca020a877859..542edd46cfa20 100644
--- a/.github/workflows/code_formatting.yml
+++ b/.github/workflows/code_formatting.yml
@@ -2,6 +2,10 @@ name: Check code formatting
 
 on: [push, pull_request]
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   build:
     runs-on: ubuntu-22.04
diff --git a/.github/workflows/code_size.yml b/.github/workflows/code_size.yml
index d4f8b195ad900..de75bfe08fa2b 100644
--- a/.github/workflows/code_size.yml
+++ b/.github/workflows/code_size.yml
@@ -12,6 +12,10 @@ on:
       - 'ports/bare-arm/**'
       - 'ports/minimal/**'
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   build:
     runs-on: ubuntu-20.04
diff --git a/.github/workflows/code_size_comment.yml b/.github/workflows/code_size_comment.yml
index 6310528c9588d..6ef6e633dfc74 100644
--- a/.github/workflows/code_size_comment.yml
+++ b/.github/workflows/code_size_comment.yml
@@ -5,6 +5,10 @@ on:
     workflows: [Check code size]
     types: [completed]
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   comment:
     runs-on: ubuntu-20.04
diff --git a/.github/workflows/commit_formatting.yml b/.github/workflows/commit_formatting.yml
index 2fb959e5b3b0e..0b27038f2d264 100644
--- a/.github/workflows/commit_formatting.yml
+++ b/.github/workflows/commit_formatting.yml
@@ -2,6 +2,10 @@ name: Check commit message formatting
 
 on: [push, pull_request]
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   build:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index 431d5c498e981..e9b17007476c1 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -5,6 +5,10 @@ on:
     paths:
       - docs/**
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   build:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/examples.yml b/.github/workflows/examples.yml
index d50af705fef9d..e4105e8d43227 100644
--- a/.github/workflows/examples.yml
+++ b/.github/workflows/examples.yml
@@ -10,6 +10,10 @@ on:
       - 'py/**'
       - 'shared/**'
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   embedding:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/mpy_format.yml b/.github/workflows/mpy_format.yml
index b69be93ef095a..66abb19b81a46 100644
--- a/.github/workflows/mpy_format.yml
+++ b/.github/workflows/mpy_format.yml
@@ -9,6 +9,10 @@ on:
       - 'tests/**'
       - 'tools/**'
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   test:
     runs-on: ubuntu-20.04 # use 20.04 to get python2
diff --git a/.github/workflows/ports.yml b/.github/workflows/ports.yml
index 41540d5b983b2..fb574ad981908 100644
--- a/.github/workflows/ports.yml
+++ b/.github/workflows/ports.yml
@@ -8,6 +8,10 @@ on:
       - 'tools/**'
       - ports/**
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   build:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/ports_cc3200.yml b/.github/workflows/ports_cc3200.yml
index 879eedea246b1..52adc7dbcea60 100644
--- a/.github/workflows/ports_cc3200.yml
+++ b/.github/workflows/ports_cc3200.yml
@@ -12,6 +12,10 @@ on:
       - 'drivers/**'
       - 'ports/cc3200/**'
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   build:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/ports_esp32.yml b/.github/workflows/ports_esp32.yml
index a5df4b7bbc56a..9a583e3f998ff 100644
--- a/.github/workflows/ports_esp32.yml
+++ b/.github/workflows/ports_esp32.yml
@@ -12,6 +12,10 @@ on:
       - 'drivers/**'
       - 'ports/esp32/**'
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   build_idf402:
     runs-on: ubuntu-20.04
diff --git a/.github/workflows/ports_esp8266.yml b/.github/workflows/ports_esp8266.yml
index 27be97d5bb8dd..ae66fb95d944d 100644
--- a/.github/workflows/ports_esp8266.yml
+++ b/.github/workflows/ports_esp8266.yml
@@ -12,6 +12,10 @@ on:
       - 'drivers/**'
       - 'ports/esp8266/**'
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   build:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/ports_mimxrt.yml b/.github/workflows/ports_mimxrt.yml
index a98170f3539c9..ae3ac086370e2 100644
--- a/.github/workflows/ports_mimxrt.yml
+++ b/.github/workflows/ports_mimxrt.yml
@@ -12,6 +12,10 @@ on:
       - 'drivers/**'
       - 'ports/mimxrt/**'
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   build:
     runs-on: ubuntu-20.04
diff --git a/.github/workflows/ports_nrf.yml b/.github/workflows/ports_nrf.yml
index b13d229841182..0ca994c382045 100644
--- a/.github/workflows/ports_nrf.yml
+++ b/.github/workflows/ports_nrf.yml
@@ -12,6 +12,10 @@ on:
       - 'drivers/**'
       - 'ports/nrf/**'
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   build:
     runs-on: ubuntu-20.04
diff --git a/.github/workflows/ports_powerpc.yml b/.github/workflows/ports_powerpc.yml
index 03f6c87560122..7895e772acde5 100644
--- a/.github/workflows/ports_powerpc.yml
+++ b/.github/workflows/ports_powerpc.yml
@@ -12,6 +12,10 @@ on:
       - 'drivers/**'
       - 'ports/powerpc/**'
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   build:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/ports_qemu-arm.yml b/.github/workflows/ports_qemu-arm.yml
index 88ea6e52824be..509ef0bf0780f 100644
--- a/.github/workflows/ports_qemu-arm.yml
+++ b/.github/workflows/ports_qemu-arm.yml
@@ -13,6 +13,10 @@ on:
       - 'ports/qemu-arm/**'
       - 'tests/**'
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   build_and_test:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/ports_renesas-ra.yml b/.github/workflows/ports_renesas-ra.yml
index f363109e98cc1..79600949f2e87 100644
--- a/.github/workflows/ports_renesas-ra.yml
+++ b/.github/workflows/ports_renesas-ra.yml
@@ -12,6 +12,10 @@ on:
       - 'drivers/**'
       - 'ports/renesas-ra/**'
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   build_renesas_ra_board:
     runs-on: ubuntu-20.04
diff --git a/.github/workflows/ports_rp2.yml b/.github/workflows/ports_rp2.yml
index d4367a21fba95..96b52ea36b703 100644
--- a/.github/workflows/ports_rp2.yml
+++ b/.github/workflows/ports_rp2.yml
@@ -12,6 +12,10 @@ on:
       - 'drivers/**'
       - 'ports/rp2/**'
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   build:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/ports_samd.yml b/.github/workflows/ports_samd.yml
index a9d18c35a14d2..8a82632c6baec 100644
--- a/.github/workflows/ports_samd.yml
+++ b/.github/workflows/ports_samd.yml
@@ -12,6 +12,10 @@ on:
       - 'drivers/**'
       - 'ports/samd/**'
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   build:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/ports_stm32.yml b/.github/workflows/ports_stm32.yml
index 08e1e590759f9..482f49df2a654 100644
--- a/.github/workflows/ports_stm32.yml
+++ b/.github/workflows/ports_stm32.yml
@@ -12,6 +12,10 @@ on:
       - 'drivers/**'
       - 'ports/stm32/**'
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   build_pyb:
     runs-on: ubuntu-20.04
diff --git a/.github/workflows/ports_teensy.yml b/.github/workflows/ports_teensy.yml
index ee461d002ffdd..b53d20a70cbfc 100644
--- a/.github/workflows/ports_teensy.yml
+++ b/.github/workflows/ports_teensy.yml
@@ -12,6 +12,10 @@ on:
       - 'drivers/**'
       - 'ports/teensy/**'
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   build:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/ports_unix.yml b/.github/workflows/ports_unix.yml
index 6d35ea510efb7..f19833202fd53 100644
--- a/.github/workflows/ports_unix.yml
+++ b/.github/workflows/ports_unix.yml
@@ -14,6 +14,10 @@ on:
       - 'ports/unix/**'
       - 'tests/**'
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   minimal:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/ports_webassembly.yml b/.github/workflows/ports_webassembly.yml
index 16b63c1f7e494..cc9d65f960f9c 100644
--- a/.github/workflows/ports_webassembly.yml
+++ b/.github/workflows/ports_webassembly.yml
@@ -11,6 +11,10 @@ on:
       - 'lib/**'
       - 'ports/webassembly/**'
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   build:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/ports_windows.yml b/.github/workflows/ports_windows.yml
index 582f80df988bc..301332ab43138 100644
--- a/.github/workflows/ports_windows.yml
+++ b/.github/workflows/ports_windows.yml
@@ -12,6 +12,10 @@ on:
       - 'ports/unix/**'
       - 'ports/windows/**'
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   build:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/ports_zephyr.yml b/.github/workflows/ports_zephyr.yml
index 9b4c8638707c5..966e08483fc8a 100644
--- a/.github/workflows/ports_zephyr.yml
+++ b/.github/workflows/ports_zephyr.yml
@@ -11,6 +11,10 @@ on:
       - 'lib/**'
       - 'ports/zephyr/**'
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   build:
     runs-on: ubuntu-latest

From 3a3739037d8110c771fcd451c59fb900fe8c710e Mon Sep 17 00:00:00 2001
From: Wind-stormger <storm-wind@foxmail.com>
Date: Sun, 24 Jul 2022 17:15:35 +0800
Subject: [PATCH 2963/3533] esp32/machine_touchpad: Fix TouchPad for ESP32S2,
 ESP32S3.

---
 ports/esp32/machine_touchpad.c | 31 ++++++++++++++++++++++---------
 ports/esp32/modmachine.c       |  2 +-
 2 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/ports/esp32/machine_touchpad.c b/ports/esp32/machine_touchpad.c
index ad1f6c9474cde..d9f4ef3ebc7f4 100644
--- a/ports/esp32/machine_touchpad.c
+++ b/ports/esp32/machine_touchpad.c
@@ -27,10 +27,10 @@
 #include "py/runtime.h"
 #include "py/mphal.h"
 #include "modmachine.h"
+#include "driver/gpio.h"
 
-#if CONFIG_IDF_TARGET_ESP32
+#if CONFIG_IDF_TARGET_ESP32 || CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3
 
-#include "driver/gpio.h"
 #if CONFIG_IDF_TARGET_ESP32
 #include "driver/touch_pad.h"
 #elif CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3
@@ -43,8 +43,8 @@ typedef struct _mtp_obj_t {
     touch_pad_t touchpad_id;
 } mtp_obj_t;
 
-#if CONFIG_IDF_TARGET_ESP32
 STATIC const mtp_obj_t touchpad_obj[] = {
+    #if CONFIG_IDF_TARGET_ESP32
     {{&machine_touchpad_type}, GPIO_NUM_4, TOUCH_PAD_NUM0},
     {{&machine_touchpad_type}, GPIO_NUM_0, TOUCH_PAD_NUM1},
     {{&machine_touchpad_type}, GPIO_NUM_2, TOUCH_PAD_NUM2},
@@ -55,9 +55,7 @@ STATIC const mtp_obj_t touchpad_obj[] = {
     {{&machine_touchpad_type}, GPIO_NUM_27, TOUCH_PAD_NUM7},
     {{&machine_touchpad_type}, GPIO_NUM_33, TOUCH_PAD_NUM8},
     {{&machine_touchpad_type}, GPIO_NUM_32, TOUCH_PAD_NUM9},
-};
-#elif CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3
-STATIC const mtp_obj_t touchpad_obj[] = {
+    #elif CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3
     {{&machine_touchpad_type}, GPIO_NUM_1, TOUCH_PAD_NUM1},
     {{&machine_touchpad_type}, GPIO_NUM_2, TOUCH_PAD_NUM2},
     {{&machine_touchpad_type}, GPIO_NUM_3, TOUCH_PAD_NUM3},
@@ -72,12 +70,11 @@ STATIC const mtp_obj_t touchpad_obj[] = {
     {{&machine_touchpad_type}, GPIO_NUM_12, TOUCH_PAD_NUM12},
     {{&machine_touchpad_type}, GPIO_NUM_13, TOUCH_PAD_NUM13},
     {{&machine_touchpad_type}, GPIO_NUM_14, TOUCH_PAD_NUM14},
+    #endif
 };
-#endif
 
 STATIC mp_obj_t mtp_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw,
     const mp_obj_t *args) {
-
     mp_arg_check_num(n_args, n_kw, 1, 1, true);
     gpio_num_t pin_id = machine_pin_get_id(args[0]);
     const mtp_obj_t *self = NULL;
@@ -95,9 +92,16 @@ STATIC mp_obj_t mtp_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_
     if (!initialized) {
         touch_pad_init();
         touch_pad_set_fsm_mode(TOUCH_FSM_MODE_TIMER);
+        #if CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3
+        touch_pad_fsm_start();
+        #endif
         initialized = 1;
     }
+    #if CONFIG_IDF_TARGET_ESP32
     esp_err_t err = touch_pad_config(self->touchpad_id, 0);
+    #elif CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3
+    esp_err_t err = touch_pad_config(self->touchpad_id);
+    #endif
     if (err == ESP_OK) {
         return MP_OBJ_FROM_PTR(self);
     }
@@ -106,8 +110,12 @@ STATIC mp_obj_t mtp_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_
 
 STATIC mp_obj_t mtp_config(mp_obj_t self_in, mp_obj_t value_in) {
     mtp_obj_t *self = self_in;
+    #if CONFIG_IDF_TARGET_ESP32
     uint16_t value = mp_obj_get_int(value_in);
     esp_err_t err = touch_pad_config(self->touchpad_id, value);
+    #elif CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3
+    esp_err_t err = touch_pad_config(self->touchpad_id);
+    #endif
     if (err == ESP_OK) {
         return mp_const_none;
     }
@@ -117,8 +125,13 @@ MP_DEFINE_CONST_FUN_OBJ_2(mtp_config_obj, mtp_config);
 
 STATIC mp_obj_t mtp_read(mp_obj_t self_in) {
     mtp_obj_t *self = self_in;
+    #if CONFIG_IDF_TARGET_ESP32
     uint16_t value;
     esp_err_t err = touch_pad_read(self->touchpad_id, &value);
+    #elif CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3
+    uint32_t value;
+    esp_err_t err = touch_pad_read_raw_data(self->touchpad_id, &value);
+    #endif
     if (err == ESP_OK) {
         return MP_OBJ_NEW_SMALL_INT(value);
     }
@@ -142,4 +155,4 @@ MP_DEFINE_CONST_OBJ_TYPE(
     locals_dict, &mtp_locals_dict
     );
 
-#endif // CONFIG_IDF_TARGET_ESP32
+#endif
diff --git a/ports/esp32/modmachine.c b/ports/esp32/modmachine.c
index 624e4d32036b5..37d4f424d4216 100644
--- a/ports/esp32/modmachine.c
+++ b/ports/esp32/modmachine.c
@@ -309,7 +309,7 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_DEEPSLEEP), MP_ROM_INT(MACHINE_WAKE_DEEPSLEEP) },
     { MP_ROM_QSTR(MP_QSTR_Pin), MP_ROM_PTR(&machine_pin_type) },
     { MP_ROM_QSTR(MP_QSTR_Signal), MP_ROM_PTR(&machine_signal_type) },
-    #if CONFIG_IDF_TARGET_ESP32
+    #if CONFIG_IDF_TARGET_ESP32 || CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3
     { MP_ROM_QSTR(MP_QSTR_TouchPad), MP_ROM_PTR(&machine_touchpad_type) },
     #endif
     { MP_ROM_QSTR(MP_QSTR_ADC), MP_ROM_PTR(&machine_adc_type) },

From 9bec52a2f8371847e1d75fee84bf37a9b2876cd4 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Wed, 14 Dec 2022 12:17:42 +1100
Subject: [PATCH 2964/3533] esp32/main: Don't call usocket_events_deinit if
 unavailable.

usocket_events_deinit will only be available if MICROPY_PY_USOCKET_EVENTS
is enabled (which is only enabled when webrepl is enabled).

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/esp32/main.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ports/esp32/main.c b/ports/esp32/main.c
index c543c5b645d5f..e2a803fcb621e 100644
--- a/ports/esp32/main.c
+++ b/ports/esp32/main.c
@@ -215,7 +215,9 @@ void mp_task(void *pvParameter) {
     // TODO: machine_rmt_deinit_all();
     machine_pins_deinit();
     machine_deinit();
+    #if MICROPY_PY_USOCKET_EVENTS
     usocket_events_deinit();
+    #endif
 
     mp_deinit();
     fflush(stdout);

From fd1e66edb3ef479016dbcc5aa7158d8fdfec5793 Mon Sep 17 00:00:00 2001
From: Damien Tournoud <damien@platform.sh>
Date: Tue, 13 Dec 2022 20:38:48 -0800
Subject: [PATCH 2965/3533] esp32/usb: Cleanup connection detection.

This was introduced by 35fb90bd57e1a3259aaf67cede50628da6888485, but
it is much simpler and essentially the same to just use
`tud_cdc_n_connected()`.

The only difference is that tud_cdc_n_connected() only checks for DTR,
but this is correct anyway: DTR indicates device presence, RTS indicates
that the host wants to receive data.

Signed-off-by: Damien Tournoud <damien@platform.sh>
---
 ports/esp32/usb.c | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/ports/esp32/usb.c b/ports/esp32/usb.c
index 953c5422b2b2e..80612cd276e74 100644
--- a/ports/esp32/usb.c
+++ b/ports/esp32/usb.c
@@ -36,7 +36,6 @@
 #define CDC_ITF TINYUSB_CDC_ACM_0
 
 static uint8_t usb_rx_buf[CONFIG_USB_CDC_RX_BUFSIZE];
-static uint8_t usb_cdc_connected;
 
 static void usb_callback_rx(int itf, cdcacm_event_t *event) {
     // TODO: what happens if more chars come in during this function, are they lost?
@@ -59,13 +58,6 @@ static void usb_callback_rx(int itf, cdcacm_event_t *event) {
     }
 }
 
-void usb_callback_line_state_changed(int itf, cdcacm_event_t *event) {
-    int dtr = event->line_state_changed_data.dtr;
-    int rts = event->line_state_changed_data.rts;
-    // If dtr && rts are both true, the CDC is connected to a HOST.
-    usb_cdc_connected = dtr && rts;
-}
-
 void usb_init(void) {
     // Initialise the USB with defaults.
     tinyusb_config_t tusb_cfg = {0};
@@ -78,10 +70,9 @@ void usb_init(void) {
         .rx_unread_buf_sz = 256,
         .callback_rx = &usb_callback_rx,
         .callback_rx_wanted_char = NULL,
-        .callback_line_state_changed = &usb_callback_line_state_changed,
+        .callback_line_state_changed = NULL,
         .callback_line_coding_changed = NULL
     };
-    usb_cdc_connected = 0;
     ESP_ERROR_CHECK(tusb_cdc_acm_init(&amc_cfg));
 
 }
@@ -89,7 +80,7 @@ void usb_init(void) {
 void usb_tx_strn(const char *str, size_t len) {
     // Write out the data to the CDC interface, but only while the USB host is connected.
     uint64_t timeout = esp_timer_get_time() + (uint64_t)(MICROPY_HW_USB_CDC_TX_TIMEOUT * 1000);
-    while (usb_cdc_connected && len && esp_timer_get_time() < timeout) {
+    while (tud_cdc_n_connected(CDC_ITF) && len && esp_timer_get_time() < timeout) {
         size_t l = tinyusb_cdcacm_write_queue(CDC_ITF, (uint8_t *)str, len);
         str += l;
         len -= l;

From 6d460d33dca94cac6b3c1e59ca96d60d2a2d17d9 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Wed, 14 Dec 2022 13:32:01 +1100
Subject: [PATCH 2966/3533] samd/boards/SEEED_XIAO: Rename to
 SEEED_XIAO_SAMD21.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/samd/boards/{SEEED_XIAO => SEEED_XIAO_SAMD21}/board.json  | 2 +-
 .../boards/{SEEED_XIAO => SEEED_XIAO_SAMD21}/mpconfigboard.h    | 0
 .../boards/{SEEED_XIAO => SEEED_XIAO_SAMD21}/mpconfigboard.mk   | 0
 ports/samd/boards/{SEEED_XIAO => SEEED_XIAO_SAMD21}/pins.csv    | 0
 4 files changed, 1 insertion(+), 1 deletion(-)
 rename ports/samd/boards/{SEEED_XIAO => SEEED_XIAO_SAMD21}/board.json (88%)
 rename ports/samd/boards/{SEEED_XIAO => SEEED_XIAO_SAMD21}/mpconfigboard.h (100%)
 rename ports/samd/boards/{SEEED_XIAO => SEEED_XIAO_SAMD21}/mpconfigboard.mk (100%)
 rename ports/samd/boards/{SEEED_XIAO => SEEED_XIAO_SAMD21}/pins.csv (100%)

diff --git a/ports/samd/boards/SEEED_XIAO/board.json b/ports/samd/boards/SEEED_XIAO_SAMD21/board.json
similarity index 88%
rename from ports/samd/boards/SEEED_XIAO/board.json
rename to ports/samd/boards/SEEED_XIAO_SAMD21/board.json
index f5fe27184724e..4e6217e19e4a8 100644
--- a/ports/samd/boards/SEEED_XIAO/board.json
+++ b/ports/samd/boards/SEEED_XIAO_SAMD21/board.json
@@ -8,7 +8,7 @@
     ],
     "images": ["seeeduino-xiao.jpg"],
     "mcu": "samd21",
-    "product": "Seeeduino XIAO",
+    "product": "Seeeduino XIAO (SAMD21)",
     "thumbnail": "",
     "url": "https://www.seeedstudio.com/Seeeduino-XIAO-Arduino-Microcontroller-SAMD21-Cortex-M0+-p-4426.html",
     "vendor": "Seeed Studio"
diff --git a/ports/samd/boards/SEEED_XIAO/mpconfigboard.h b/ports/samd/boards/SEEED_XIAO_SAMD21/mpconfigboard.h
similarity index 100%
rename from ports/samd/boards/SEEED_XIAO/mpconfigboard.h
rename to ports/samd/boards/SEEED_XIAO_SAMD21/mpconfigboard.h
diff --git a/ports/samd/boards/SEEED_XIAO/mpconfigboard.mk b/ports/samd/boards/SEEED_XIAO_SAMD21/mpconfigboard.mk
similarity index 100%
rename from ports/samd/boards/SEEED_XIAO/mpconfigboard.mk
rename to ports/samd/boards/SEEED_XIAO_SAMD21/mpconfigboard.mk
diff --git a/ports/samd/boards/SEEED_XIAO/pins.csv b/ports/samd/boards/SEEED_XIAO_SAMD21/pins.csv
similarity index 100%
rename from ports/samd/boards/SEEED_XIAO/pins.csv
rename to ports/samd/boards/SEEED_XIAO_SAMD21/pins.csv

From 564945a2a0b47fc7e0f198ef4b0797080550f1d1 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Tue, 6 Dec 2022 08:00:56 +0100
Subject: [PATCH 2967/3533] nrf/boards/seeed_xiao_nrf52: Add defn for Seeed
 XIAO NRF52840 Sense.

It keeps compatibility with the XIAO bootloader by:
- using Soft Device 7.3.0
- reserving 48k memory for the bootloader.

So on double reset a drive pops for uploading an uf2 image or a nrfutil zip
pkg file.  Instructions to create it from a hex file are included.  The
bootloader can as well be activated with the touch 1200 option of nrfutil.

The script download_ble_stack.sh has been adapted to get the version 7.3.0
soft device files.  It may have to be executed once before building.

The file system is set to 256k and the pin definitions are adapted.
Besides that, it has the common functionality and omissions.  The on-board
sensors and additional flash can be supported by Python scripts.
---
 ports/nrf/boards/s140_7.3.0.ld                |  4 +
 .../seeed_xiao_nrf52/XIAO_bootloader.ld       |  4 +
 ports/nrf/boards/seeed_xiao_nrf52/board.c     | 68 +++++++++++++++
 ports/nrf/boards/seeed_xiao_nrf52/board.json  | 24 ++++++
 ports/nrf/boards/seeed_xiao_nrf52/deploy.md   | 31 +++++++
 .../boards/seeed_xiao_nrf52/mpconfigboard.h   | 82 +++++++++++++++++++
 .../boards/seeed_xiao_nrf52/mpconfigboard.mk  | 16 ++++
 ports/nrf/boards/seeed_xiao_nrf52/pins.csv    | 48 +++++++++++
 .../drivers/bluetooth/download_ble_stack.sh   | 22 +++++
 9 files changed, 299 insertions(+)
 create mode 100644 ports/nrf/boards/s140_7.3.0.ld
 create mode 100644 ports/nrf/boards/seeed_xiao_nrf52/XIAO_bootloader.ld
 create mode 100644 ports/nrf/boards/seeed_xiao_nrf52/board.c
 create mode 100644 ports/nrf/boards/seeed_xiao_nrf52/board.json
 create mode 100644 ports/nrf/boards/seeed_xiao_nrf52/deploy.md
 create mode 100644 ports/nrf/boards/seeed_xiao_nrf52/mpconfigboard.h
 create mode 100644 ports/nrf/boards/seeed_xiao_nrf52/mpconfigboard.mk
 create mode 100644 ports/nrf/boards/seeed_xiao_nrf52/pins.csv

diff --git a/ports/nrf/boards/s140_7.3.0.ld b/ports/nrf/boards/s140_7.3.0.ld
new file mode 100644
index 0000000000000..47b7665c95ffc
--- /dev/null
+++ b/ports/nrf/boards/s140_7.3.0.ld
@@ -0,0 +1,4 @@
+/* GNU linker script for s140 SoftDevice version 7.3.0 */
+
+_sd_size = 0x00027000;
+_sd_ram  = 0x0000e000;
diff --git a/ports/nrf/boards/seeed_xiao_nrf52/XIAO_bootloader.ld b/ports/nrf/boards/seeed_xiao_nrf52/XIAO_bootloader.ld
new file mode 100644
index 0000000000000..0ff02f2182c29
--- /dev/null
+++ b/ports/nrf/boards/seeed_xiao_nrf52/XIAO_bootloader.ld
@@ -0,0 +1,4 @@
+/* GNU linker script for Adafruit nrf52840 Bootloader */
+
+_bootloader_head_size = 0x1000;  /* MBR */
+_bootloader_tail_size = 0xC000;  /* Bootloader start address 0x000F4000 */
diff --git a/ports/nrf/boards/seeed_xiao_nrf52/board.c b/ports/nrf/boards/seeed_xiao_nrf52/board.c
new file mode 100644
index 0000000000000..25c9e17215987
--- /dev/null
+++ b/ports/nrf/boards/seeed_xiao_nrf52/board.c
@@ -0,0 +1,68 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2022 Arduino SA
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "nrf.h"
+#include "nrf_gpio.h"
+#include "nrf_rtc.h"
+
+#define PIN_ENABLE_SENSORS_3V3        (40)
+#define DFU_MAGIC_SERIAL_ONLY_RESET   0x4e
+#define DFU_MAGIC_UF2_RESET           0x57
+#define DFU_MAGIC_OTA_RESET           0xA8
+
+void XIAO_board_early_init(void) {
+    // Errata XIAOBLE - I2C pullup is on SWO line, need to disable TRACE
+    // was being enabled by nrfx_clock_anomaly_132
+    CoreDebug->DEMCR = 0;
+    NRF_CLOCK->TRACECONFIG = 0;
+
+    // Bootloader enables interrupt on COMPARE[0], which we don't handle
+    // Disable it here to avoid getting stuck when OVERFLOW irq is triggered
+    nrf_rtc_event_disable(NRF_RTC1, NRF_RTC_INT_COMPARE0_MASK);
+    nrf_rtc_int_disable(NRF_RTC1, NRF_RTC_INT_COMPARE0_MASK);
+
+    // Always enable IMU power and I2C Pull-up on startup
+    nrf_gpio_cfg(PIN_ENABLE_SENSORS_3V3,
+                 NRF_GPIO_PIN_DIR_OUTPUT,
+                 NRF_GPIO_PIN_INPUT_DISCONNECT,
+                 NRF_GPIO_PIN_NOPULL,
+                 GPIO_PIN_CNF_DRIVE_S0H1,
+                 NRF_GPIO_PIN_NOSENSE);
+
+    nrf_gpio_pin_set(PIN_ENABLE_SENSORS_3V3);
+}
+
+void XIAO_board_deinit(void) {
+    nrf_gpio_cfg_output(PIN_ENABLE_SENSORS_3V3);
+
+    nrf_gpio_pin_clear(PIN_ENABLE_SENSORS_3V3);
+}
+
+void XIAO_board_enter_bootloader(void) {
+    __disable_irq();
+    NRF_POWER->GPREGRET = DFU_MAGIC_UF2_RESET;
+    NVIC_SystemReset();
+}
diff --git a/ports/nrf/boards/seeed_xiao_nrf52/board.json b/ports/nrf/boards/seeed_xiao_nrf52/board.json
new file mode 100644
index 0000000000000..619a7c23b9e8b
--- /dev/null
+++ b/ports/nrf/boards/seeed_xiao_nrf52/board.json
@@ -0,0 +1,24 @@
+{
+    "deploy": [
+        "deploy.md"
+    ],
+    "docs": "",
+    "features": [
+        "Bluetooth 5.0",
+        "IMU LSM6DS3TR",
+        "Microphone MSM261D3526H1CPM",
+        "USB-C",
+        "Breadboard Friendly",
+        "Battery Management",
+        "RGB LED",
+        "QSPI Flash"
+    ],
+    "images": [
+        "XIAO_nrf52840_front.jpg"
+    ],
+    "mcu": "nrf52",
+    "product": "SEEED XIAO nRF52840 Sense",
+    "thumbnail": "",
+    "url": "https://www.seeedstudio.com",
+    "vendor": "Seeed Studio"
+}
diff --git a/ports/nrf/boards/seeed_xiao_nrf52/deploy.md b/ports/nrf/boards/seeed_xiao_nrf52/deploy.md
new file mode 100644
index 0000000000000..a66731c30946f
--- /dev/null
+++ b/ports/nrf/boards/seeed_xiao_nrf52/deploy.md
@@ -0,0 +1,31 @@
+The steps below let you create and install the firmware file. For
+a .uf2 type file taken from the MicroPython downloads source only
+step 4 is needed. For the .hex version of the firmware file, steps
+1, 3 and 4 are required.
+
+1. Download and install u2fconv.py. It is available e.g. in the tools
+   directory of MicroPython.
+
+2. Create a firmware for the SEEED nrf52840 if needed, with the command
+
+   `make BOARD=SEEED_XIAO_NRF52 -j5`
+
+   in the directory build-SEEED_XIAO_NRF52-s140. The firmware file will have the
+   name firmware.uf2.
+
+3. Create the .uf2 file if needed in the build directory with the command:
+
+   `uf2conv.py -c -f 0xADA52840 -o firmware.uf2 firmware.hex`
+
+   It must report the start address as 0x27000. If you omit the -o option,
+   the output file will have the name flash.uf2.
+
+4. Enable the upload mode by pushing reset twice or calling
+   machine.bootloader() and copy the file firmware.uf2 to the board drive,
+   which will pop up on your PC.
+
+In case the XIAO bootloader is lost or overwritten, it can be found
+at https://github.com/Seeed-Studio/Adafruit_nRF52_Arduino.git in different
+formats. Using a JLINK adapter or interface, it can be uploaded as hex version.
+The bootloader is as well available through the Arduino IDE.
+
diff --git a/ports/nrf/boards/seeed_xiao_nrf52/mpconfigboard.h b/ports/nrf/boards/seeed_xiao_nrf52/mpconfigboard.h
new file mode 100644
index 0000000000000..1a2d14f1d4e86
--- /dev/null
+++ b/ports/nrf/boards/seeed_xiao_nrf52/mpconfigboard.h
@@ -0,0 +1,82 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2016 Glenn Ruben Bakke
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#define MICROPY_HW_BOARD_NAME       "XIAO nRF52840 Sense"
+#define MICROPY_HW_MCU_NAME         "NRF52840"
+#define MICROPY_PY_SYS_PLATFORM     "nrf52"
+
+#define MICROPY_BOARD_EARLY_INIT        XIAO_board_early_init
+#define MICROPY_BOARD_DEINIT            XIAO_board_deinit
+#define MICROPY_BOARD_ENTER_BOOTLOADER(nargs, args) XIAO_board_enter_bootloader()
+
+#define MICROPY_HW_USB_CDC          (1)
+#define MICROPY_PY_MACHINE_UART     (1)
+#define MICROPY_PY_MACHINE_HW_PWM   (1)
+#define MICROPY_PY_MACHINE_HW_SPI   (1)
+#define MICROPY_PY_MACHINE_RTCOUNTER (1)
+#define MICROPY_PY_MACHINE_I2C      (1)
+#define MICROPY_PY_MACHINE_ADC      (1)
+#define MICROPY_PY_MACHINE_TEMP     (1)
+#define MICROPY_HW_HAS_FLASH        (1)
+
+#define MICROPY_HW_ENABLE_RNG       (1)
+
+#define MICROPY_HW_HAS_LED          (1)
+#define MICROPY_HW_LED_COUNT        (4)
+#define MICROPY_HW_LED_PULLUP       (1)
+
+#define MICROPY_HW_LED1             (17) // LED1
+#define MICROPY_HW_LED2             (26) // LED2
+#define MICROPY_HW_LED3             (30) // LED3
+#define MICROPY_HW_LED4             (6)  // LED4
+
+// UART config
+#define MICROPY_HW_UART1_TX         (32 + 11)
+#define MICROPY_HW_UART1_RX         (32 + 12)
+
+// SPI0 config
+#define MICROPY_HW_SPI0_NAME        "SPI0"
+
+#define MICROPY_HW_SPI0_SCK         (32 + 13)
+#define MICROPY_HW_SPI0_MISO        (32 + 14)
+#define MICROPY_HW_SPI0_MOSI        (32 + 15)
+
+#define MICROPY_HW_PWM0_NAME        "PWM0"
+#define MICROPY_HW_PWM1_NAME        "PWM1"
+#define MICROPY_HW_PWM2_NAME        "PWM2"
+
+#define HELP_TEXT_BOARD_LED         "1,2,3,4"
+
+// Enabling these VID/PID values require to include mpconfigboard.h into usb_descriptors.c.
+// But there is an open discussion on whether specific VID/PID values are wanted.
+// 1200BPS touch is not supported at the moment in the USB driver, but at least the flag is set.
+#define MICROPY_HW_USB_VID          (0x2886)
+#define MICROPY_HW_USB_PID          (0x0045)
+#define MICROPY_HW_USB_CDC_1200BPS_TOUCH (1)
+
+void XIAO_board_early_init(void);
+void XIAO_board_deinit(void);
+void XIAO_board_enter_bootloader(void);
diff --git a/ports/nrf/boards/seeed_xiao_nrf52/mpconfigboard.mk b/ports/nrf/boards/seeed_xiao_nrf52/mpconfigboard.mk
new file mode 100644
index 0000000000000..c2fc219187e39
--- /dev/null
+++ b/ports/nrf/boards/seeed_xiao_nrf52/mpconfigboard.mk
@@ -0,0 +1,16 @@
+MCU_SERIES = m4
+MCU_VARIANT = nrf52
+MCU_SUB_VARIANT = nrf52840
+SOFTDEV_VERSION = 7.3.0
+SD=s140
+LD_FILES += boards/seeed_xiao_nrf52/XIAO_bootloader.ld boards/nrf52840_1M_256k.ld
+
+NRF_DEFINES += -DNRF52840_XXAA
+
+MICROPY_VFS_LFS2 = 1
+FS_SIZE = 256k
+
+# DEBUG ?= 1
+
+uf2: hex
+	python3 $(TOP)/tools/uf2conv.py -c -o $(BUILD)/firmware.uf2 -f 0xADA52840 $(BUILD)/firmware.hex
diff --git a/ports/nrf/boards/seeed_xiao_nrf52/pins.csv b/ports/nrf/boards/seeed_xiao_nrf52/pins.csv
new file mode 100644
index 0000000000000..6cb050c578a58
--- /dev/null
+++ b/ports/nrf/boards/seeed_xiao_nrf52/pins.csv
@@ -0,0 +1,48 @@
+P0,P0
+P1,P1
+D0_A0,P2
+D1_A1,P3
+D4_A4,P4
+D5_A5,P5
+P6,P6
+IMU_SDA,P7
+P8,P8
+NFC1,P9
+NFC2,P10
+IMU_INT1,P11
+P12,P12
+P13,P13
+READ_BAT,P14
+P15,P15
+PDM_DATA,P16
+P17,P17
+P18,P18
+P19,P19
+QSPI_D0,P20
+QSPI_SCK,P21
+QSPI_D2,P22
+QSPI_D3,P23
+QSPI_D1,P24
+QSPI_CS,P25
+P26,P26
+IMU_SCL,P27
+D2_A2,P28
+D3_A3,P29
+P30,P30
+ADC0_BAT,P31
+PDM_CLK,P32
+P33,P33
+P34,P34
+P35,P35
+P36,P36
+P37,P37
+P38,P38
+P39,P39
+IMU_PWR,P40
+P41,P41
+P42,P42
+UART1_TX,P43
+UART1_RX,P44
+SPI0_SCK,P45
+SPI0_MISO,P46
+SPI0_MOSI,P47
diff --git a/ports/nrf/drivers/bluetooth/download_ble_stack.sh b/ports/nrf/drivers/bluetooth/download_ble_stack.sh
index 2c32018583992..6498278f496c7 100755
--- a/ports/nrf/drivers/bluetooth/download_ble_stack.sh
+++ b/ports/nrf/drivers/bluetooth/download_ble_stack.sh
@@ -57,6 +57,25 @@ function download_s140_nrf52_6_1_1
     cd -
 }
 
+function download_s140_nrf52_7_3_0
+{
+    echo ""
+    echo "####################################"
+    echo "### Downloading s140_nrf52_7.3.0 ###"
+    echo "####################################"
+    echo ""
+
+    mkdir -p $1/s140_nrf52_7.3.0
+    cd $1/s140_nrf52_7.3.0
+    wget --post-data="fileName=DeviceDownload&ids=59452FDD13BA46EEAD0810A57359F294" https://www.nordicsemi.com/api/sitecore/Products/MedialibraryZipDownload2
+    mv MedialibraryZipDownload2 temp.zip
+    unzip -u temp.zip
+    unzip -u s140_nrf52_7.3.0.zip
+    rm s140_nrf52_7.3.0.zip
+    rm temp.zip
+    cd -
+}
+
 SCRIPT_DIR="$(cd -P "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 
 if [ $# -eq 0 ]; then 
@@ -64,6 +83,7 @@ if [ $# -eq 0 ]; then
     download_s110_nrf51_8_0_0 ${SCRIPT_DIR}
     download_s132_nrf52_6_1_1 ${SCRIPT_DIR}
     download_s140_nrf52_6_1_1 ${SCRIPT_DIR}
+    download_s140_nrf52_7_3_0 ${SCRIPT_DIR}
 else 
     case $1 in
         "s110_nrf51" )
@@ -72,6 +92,8 @@ else
             download_s132_nrf52_6_1_1 ${SCRIPT_DIR} ;;
         "s140_nrf52_6_1_1" )
             download_s140_nrf52_6_1_1 ${SCRIPT_DIR} ;;
+        "s140_nrf52_7_3_0" )
+            download_s140_nrf52_7_3_0 ${SCRIPT_DIR} ;;
     esac
 fi
 

From 5b7f71882b0eaa964f76f6ec0a6a036a9ed469b5 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Sat, 3 Dec 2022 19:58:24 +0100
Subject: [PATCH 2968/3533] stm32/powerctrl: Improve standby mode entry code
 for H7 MCUs.

Changes in this commit:
- Clear and mask D2 EXTIs.
- Set correct voltage scaling level for standby mode.
- Disable debug MCU (if debugging is disabled), for all MCU series.
---
 ports/stm32/powerctrl.c | 27 +++++++++++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/ports/stm32/powerctrl.c b/ports/stm32/powerctrl.c
index c0a0595e5d31b..ca5a424732a4c 100644
--- a/ports/stm32/powerctrl.c
+++ b/ports/stm32/powerctrl.c
@@ -875,6 +875,18 @@ void powerctrl_enter_standby_mode(void) {
     MICROPY_BOARD_ENTER_STANDBY
     #endif
 
+    #if defined(STM32H7)
+    // Note: According to ST reference manual, RM0399, Rev 3, Section 7.7.10,
+    // before entering Standby mode, voltage scale VOS0 must not be active.
+    uint32_t vscaling = POWERCTRL_GET_VOLTAGE_SCALING();
+    if (vscaling == PWR_REGULATOR_VOLTAGE_SCALE0) {
+        __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE3);
+        // Wait for PWR_FLAG_VOSRDY
+        while (!__HAL_PWR_GET_FLAG(PWR_FLAG_VOSRDY)) {
+        }
+    }
+    #endif
+
     // We need to clear the PWR wake-up-flag before entering standby, since
     // the flag may have been set by a previous wake-up event.  Furthermore,
     // we need to disable the wake-up sources while clearing this flag, so
@@ -926,8 +938,14 @@ void powerctrl_enter_standby_mode(void) {
     // Restore EWUP state
     PWR->CSR2 |= csr2_ewup;
     #elif defined(STM32H7)
-    EXTI_D1->PR1 = 0x3fffff;
-    PWR->WKUPCR |= PWR_WAKEUP_FLAG1 | PWR_WAKEUP_FLAG2 | PWR_WAKEUP_FLAG3 | PWR_WAKEUP_FLAG4 | PWR_WAKEUP_FLAG5 | PWR_WAKEUP_FLAG6;
+    // Clear and mask D1 EXTIs.
+    EXTI_D1->PR1 = 0x3fffffu;
+    EXTI_D1->IMR1 &= ~(0xFFFFu); // 16 lines
+    // Clear and mask D2 EXTIs.
+    EXTI_D2->PR1 = 0x3fffffu;
+    EXTI_D2->IMR1 &= ~(0xFFFFu); // 16 lines
+    // Clear all wake-up flags.
+    PWR->WKUPCR |= PWR_WAKEUP_FLAG_ALL;
     #elif defined(STM32G0) || defined(STM32G4) || defined(STM32L4) || defined(STM32WB)
     // clear all wake-up flags
     PWR->SCR |= PWR_SCR_CWUF5 | PWR_SCR_CWUF4 | PWR_SCR_CWUF3 | PWR_SCR_CWUF2 | PWR_SCR_CWUF1;
@@ -952,6 +970,11 @@ void powerctrl_enter_standby_mode(void) {
     PWR->CSR1 |= PWR_CSR1_EIWUP;
     #endif
 
+    #if defined(NDEBUG)
+    // Disable Debug MCU.
+    DBGMCU->CR = 0;
+    #endif
+
     // enter standby mode
     HAL_PWR_EnterSTANDBYMode();
     // we never return; MCU is reset on exit from standby

From 7f71057a89322d8a0b82b94abbe04b86a74f69da Mon Sep 17 00:00:00 2001
From: brave ulysses <brave_ulysses@email.com>
Date: Wed, 14 Dec 2022 00:12:34 -0600
Subject: [PATCH 2969/3533] stm32/boards/NUCLEO_F756ZG: Add board definition
 for NUCLEO-F756ZG.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/adc.c                             |  4 +-
 ports/stm32/boards/NUCLEO_F756ZG/board.json   | 15 ++++
 .../boards/NUCLEO_F756ZG/mpconfigboard.h      | 88 +++++++++++++++++++
 .../boards/NUCLEO_F756ZG/mpconfigboard.mk     | 11 +++
 ports/stm32/boards/NUCLEO_F756ZG/pins.csv     | 77 ++++++++++++++++
 .../boards/NUCLEO_F756ZG/stm32f7xx_hal_conf.h | 19 ++++
 ports/stm32/pyb_i2c.c                         |  2 +-
 7 files changed, 213 insertions(+), 3 deletions(-)
 create mode 100644 ports/stm32/boards/NUCLEO_F756ZG/board.json
 create mode 100644 ports/stm32/boards/NUCLEO_F756ZG/mpconfigboard.h
 create mode 100644 ports/stm32/boards/NUCLEO_F756ZG/mpconfigboard.mk
 create mode 100644 ports/stm32/boards/NUCLEO_F756ZG/pins.csv
 create mode 100644 ports/stm32/boards/NUCLEO_F756ZG/stm32f7xx_hal_conf.h

diff --git a/ports/stm32/adc.c b/ports/stm32/adc.c
index 2df6b7abf0841..2df1bde19aa42 100644
--- a/ports/stm32/adc.c
+++ b/ports/stm32/adc.c
@@ -154,8 +154,8 @@
 #define VBAT_DIV (4)
 #elif defined(STM32F722xx) || defined(STM32F723xx) || \
     defined(STM32F732xx) || defined(STM32F733xx) || \
-    defined(STM32F745xx) || \
-    defined(STM32F746xx) || defined(STM32F765xx) || \
+    defined(STM32F745xx) || defined(STM32F746xx) || \
+    defined(STM32F756xx) || defined(STM32F765xx) || \
     defined(STM32F767xx) || defined(STM32F769xx)
 #define VBAT_DIV (4)
 #elif defined(STM32G0) || defined(STM32G4)
diff --git a/ports/stm32/boards/NUCLEO_F756ZG/board.json b/ports/stm32/boards/NUCLEO_F756ZG/board.json
new file mode 100644
index 0000000000000..416c0b9154e1a
--- /dev/null
+++ b/ports/stm32/boards/NUCLEO_F756ZG/board.json
@@ -0,0 +1,15 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [],
+    "images": [
+        "nucleo_f756zg.jpg"
+    ],
+    "mcu": "stm32f7",
+    "product": "Nucleo F756ZG",
+    "thumbnail": "",
+    "url": "",
+    "vendor": "ST Microelectronics"
+}
diff --git a/ports/stm32/boards/NUCLEO_F756ZG/mpconfigboard.h b/ports/stm32/boards/NUCLEO_F756ZG/mpconfigboard.h
new file mode 100644
index 0000000000000..fd0d328033b5c
--- /dev/null
+++ b/ports/stm32/boards/NUCLEO_F756ZG/mpconfigboard.h
@@ -0,0 +1,88 @@
+// This board is only confirmed to operate using DFU mode and openocd.
+// DFU mode can be accessed by setting BOOT0 (see schematics)
+// To use openocd run "OPENOCD_CONFIG=boards/openocd_stm32f7.cfg" in
+// the make command.
+
+#define MICROPY_HW_BOARD_NAME       "NUCLEO-F756ZG"
+#define MICROPY_HW_MCU_NAME         "STM32F756"
+
+#define MICROPY_HW_HAS_SWITCH       (1)
+#define MICROPY_HW_HAS_FLASH        (1)
+#define MICROPY_HW_ENABLE_RNG       (1)
+#define MICROPY_HW_ENABLE_RTC       (1)
+#define MICROPY_HW_ENABLE_DAC       (1)
+#define MICROPY_HW_ENABLE_USB       (1)
+
+// HSE is 8MHz
+// VCOClock = HSE * PLLN / PLLM = 8 MHz * 216 / 4 = 432 MHz
+// SYSCLK = VCOClock / PLLP = 432 MHz / 2 = 216 MHz
+// USB/SDMMC/RNG Clock = VCOClock / PLLQ = 432 MHz / 9 = 48 MHz
+#define MICROPY_HW_CLK_PLLM (4)
+#define MICROPY_HW_CLK_PLLN (216)
+#define MICROPY_HW_CLK_PLLP (RCC_PLLP_DIV2)
+#define MICROPY_HW_CLK_PLLQ (9)
+
+// From the reference manual, for 2.7V to 3.6V
+// 151-180 MHz => 5 wait states
+// 181-210 MHz => 6 wait states
+// 211-216 MHz => 7 wait states
+#define MICROPY_HW_FLASH_LATENCY    FLASH_LATENCY_7 // 210-216 MHz needs 7 wait states
+
+// UART config
+#define MICROPY_HW_UART2_TX         (pin_D5)
+#define MICROPY_HW_UART2_RX         (pin_D6)
+#define MICROPY_HW_UART2_RTS        (pin_D4)
+#define MICROPY_HW_UART2_CTS        (pin_D3)
+#define MICROPY_HW_UART3_TX         (pin_D8)
+#define MICROPY_HW_UART3_RX         (pin_D9)
+#define MICROPY_HW_UART6_TX         (pin_G14)
+#define MICROPY_HW_UART6_RX         (pin_G9)
+#define MICROPY_HW_UART_REPL        PYB_UART_3
+#define MICROPY_HW_UART_REPL_BAUD   115200
+
+// I2C buses
+#define MICROPY_HW_I2C1_SCL         (pin_B8)
+#define MICROPY_HW_I2C1_SDA         (pin_B9)
+#define MICROPY_HW_I2C3_SCL         (pin_H7)
+#define MICROPY_HW_I2C3_SDA         (pin_H8)
+
+// SPI buses
+#define MICROPY_HW_SPI3_NSS         (pin_A4)
+#define MICROPY_HW_SPI3_SCK         (pin_B3)
+#define MICROPY_HW_SPI3_MISO        (pin_B4)
+#define MICROPY_HW_SPI3_MOSI        (pin_B5)
+
+// CAN buses
+#define MICROPY_HW_CAN1_TX          (pin_B9)
+#define MICROPY_HW_CAN1_RX          (pin_B8)
+#define MICROPY_HW_CAN2_TX          (pin_B13)
+#define MICROPY_HW_CAN2_RX          (pin_B12)
+
+// USRSW is pulled low. Pressing the button makes the input go high.
+#define MICROPY_HW_USRSW_PIN        (pin_C13)
+#define MICROPY_HW_USRSW_PULL       (GPIO_NOPULL)
+#define MICROPY_HW_USRSW_EXTI_MODE  (GPIO_MODE_IT_RISING)
+#define MICROPY_HW_USRSW_PRESSED    (1)
+
+// LEDs
+#define MICROPY_HW_LED1             (pin_B0) // green
+#define MICROPY_HW_LED2             (pin_B7) // blue
+#define MICROPY_HW_LED3             (pin_B14) // red
+#define MICROPY_HW_LED_ON(pin)      (mp_hal_pin_high(pin))
+#define MICROPY_HW_LED_OFF(pin)     (mp_hal_pin_low(pin))
+
+// USB config (CN13 - USB OTG FS)
+#define MICROPY_HW_USB_FS              (1)
+#define MICROPY_HW_USB_VBUS_DETECT_PIN (pin_A9)
+#define MICROPY_HW_USB_OTG_ID_PIN      (pin_A10)
+
+// Ethernet via RMII
+#define MICROPY_HW_ETH_MDC          (pin_C1)
+#define MICROPY_HW_ETH_MDIO         (pin_A2)
+#define MICROPY_HW_ETH_RMII_REF_CLK (pin_A1)
+#define MICROPY_HW_ETH_RMII_CRS_DV  (pin_A7)
+#define MICROPY_HW_ETH_RMII_RXD0    (pin_C4)
+#define MICROPY_HW_ETH_RMII_RXD1    (pin_C5)
+#define MICROPY_HW_ETH_RMII_TX_EN   (pin_G11)
+#define MICROPY_HW_ETH_RMII_TXD0    (pin_G13)
+#define MICROPY_HW_ETH_RMII_TXD1    (pin_B13)
diff --git a/ports/stm32/boards/NUCLEO_F756ZG/mpconfigboard.mk b/ports/stm32/boards/NUCLEO_F756ZG/mpconfigboard.mk
new file mode 100644
index 0000000000000..f656ed0e5841b
--- /dev/null
+++ b/ports/stm32/boards/NUCLEO_F756ZG/mpconfigboard.mk
@@ -0,0 +1,11 @@
+MCU_SERIES = f7
+CMSIS_MCU = STM32F756xx
+AF_FILE = boards/stm32f746_af.csv
+LD_FILES = boards/stm32f746.ld boards/common_ifs.ld
+TEXT0_ADDR = 0x08000000
+TEXT1_ADDR = 0x08020000
+
+# MicroPython settings
+MICROPY_PY_LWIP = 1
+MICROPY_PY_USSL = 1
+MICROPY_SSL_MBEDTLS = 1
diff --git a/ports/stm32/boards/NUCLEO_F756ZG/pins.csv b/ports/stm32/boards/NUCLEO_F756ZG/pins.csv
new file mode 100644
index 0000000000000..c129f7417b595
--- /dev/null
+++ b/ports/stm32/boards/NUCLEO_F756ZG/pins.csv
@@ -0,0 +1,77 @@
+A0,PA3
+A1,PC0
+A2,PC3
+A3,PF3
+A4,PF5
+A5,PF10
+D0,PG9
+D1,PG14
+D2,PF15
+D3,PE13
+D4,PF14
+D5,PE11
+D6,PE9
+D7,PF13
+D8,PF12
+D9,PD15
+D10,PD14
+D11,PA7
+D12,PA6
+D13,PA5
+D14,PB9
+D15,PB8
+D16,PC6
+D17,PB15
+D18,PB13
+D19,PB12
+D20,PA15
+D21,PC7
+D22,PB5
+D23,PB3
+D24,PA4
+D25,PB4
+LED1,PB0
+LED2,PB7
+LED3,PB14
+SW,PC13
+TP1,PH2
+TP2,PI8
+TP3,PH15
+AUDIO_INT,PD6
+AUDIO_SDA,PH8
+AUDIO_SCL,PH7
+EXT_SDA,PB9
+EXT_SCL,PB8
+EXT_RST,PG3
+SD_SW,PC13
+LCD_BL_CTRL,PK3
+LCD_INT,PI13
+LCD_SDA,PH8
+LCD_SCL,PH7
+OTG_FS_POWER,PD5
+OTG_FS_OVER_CURRENT,PD4
+OTG_HS_OVER_CURRENT,PE3
+USB_VBUS,PA9
+USB_ID,PA10
+USB_DM,PA11
+USB_DP,PA12
+VCP_TX,PD8
+VCP_RX,PD9
+UART2_TX,PD5
+UART2_RX,PD6
+UART2_RTS,PD4
+UART2_CTS,PD3
+UART6_TX,PG14
+UART6_RX,PG9
+SPI_B_NSS,PA4
+SPI_B_SCK,PB3
+SPI_B_MOSI,PB5
+ETH_MDC,PC1
+ETH_MDIO,PA2
+ETH_RMII_REF_CLK,PA1
+ETH_RMII_CRS_DV,PA7
+ETH_RMII_RXD0,PC4
+ETH_RMII_RXD1,PC5
+ETH_RMII_TX_EN,PG11
+ETH_RMII_TXD0,PG13
+ETH_RMII_TXD1,PB13
diff --git a/ports/stm32/boards/NUCLEO_F756ZG/stm32f7xx_hal_conf.h b/ports/stm32/boards/NUCLEO_F756ZG/stm32f7xx_hal_conf.h
new file mode 100644
index 0000000000000..e241921ddd25b
--- /dev/null
+++ b/ports/stm32/boards/NUCLEO_F756ZG/stm32f7xx_hal_conf.h
@@ -0,0 +1,19 @@
+/* This file is part of the MicroPython project, http://micropython.org/
+ * The MIT License (MIT)
+ * Copyright (c) 2019 Damien P. George
+ */
+#ifndef MICROPY_INCLUDED_STM32F7XX_HAL_CONF_H
+#define MICROPY_INCLUDED_STM32F7XX_HAL_CONF_H
+
+#include "boards/stm32f7xx_hal_conf_base.h"
+
+// Oscillator values in Hz
+#define HSE_VALUE (8000000)
+#define LSE_VALUE (32768)
+#define EXTERNAL_CLOCK_VALUE (12288000)
+
+// Oscillator timeouts in ms
+#define HSE_STARTUP_TIMEOUT (5000)
+#define LSE_STARTUP_TIMEOUT (5000)
+
+#endif // MICROPY_INCLUDED_STM32F7XX_HAL_CONF_H
diff --git a/ports/stm32/pyb_i2c.c b/ports/stm32/pyb_i2c.c
index 89bd6b46dc13c..2463669ed0d12 100644
--- a/ports/stm32/pyb_i2c.c
+++ b/ports/stm32/pyb_i2c.c
@@ -137,7 +137,7 @@ const pyb_i2c_obj_t pyb_i2c_obj[] = {
 
 #define PYB_I2C_TIMINGR (1)
 
-#if defined(STM32F745xx) || defined(STM32F746xx)
+#if defined(STM32F745xx) || defined(STM32F746xx) || defined(STM32F756xx)
 
 // The value 0x40912732 was obtained from the DISCOVERY_I2Cx_TIMING constant
 // defined in the STM32F7Cube file Drivers/BSP/STM32F746G-Discovery/stm32f7456g_discovery.h

From 5f8f32f917479d5fdd052292eae64f9d43b07217 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Wed, 14 Dec 2022 16:29:30 +1100
Subject: [PATCH 2970/3533] extmod/modnetwork: Use a type protocol to implement
 NIC functions.

This was previously implemented by adding additional members to the
mp_obj_type_t defined for each NIC, which is difficult to do cleanly with
the new object type slots mechanism. The way this works is also not
supported on GCC 8.x and below.

Instead replace it with the type protocol, which is a much simpler way of
achieving the same thing.

This affects the WizNet (in non-LWIP mode) and Nina NIC drivers.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 extmod/modnetwork.c        |  2 +-
 extmod/modnetwork.h        |  9 +++----
 extmod/modusocket.c        | 50 +++++++++++++++++++-------------------
 extmod/network_ninaw10.c   | 26 ++++++++++----------
 extmod/network_wiznet5k.c  | 29 +++++++++-------------
 ports/rp2/mpconfigport.h   |  6 +----
 ports/stm32/mpconfigport.h |  4 ---
 7 files changed, 55 insertions(+), 71 deletions(-)

diff --git a/extmod/modnetwork.c b/extmod/modnetwork.c
index 0ff8683b74824..d5c8f83ea4718 100644
--- a/extmod/modnetwork.c
+++ b/extmod/modnetwork.c
@@ -77,7 +77,7 @@ mp_obj_t mod_network_find_nic(const uint8_t *ip) {
     for (mp_uint_t i = 0; i < MP_STATE_PORT(mod_network_nic_list).len; i++) {
         mp_obj_t nic = MP_STATE_PORT(mod_network_nic_list).items[i];
         // TODO check IP suitability here
-        // mod_network_nic_type_t *nic_type = (mod_network_nic_type_t*)mp_obj_get_type(nic);
+        // mod_network_nic_protocol_t *nic_protocol = (mod_network_nic_protocol_t *)MP_OBJ_TYPE_GET_SLOT(mp_obj_get_type(nic), protocol);
         return nic;
     }
 
diff --git a/extmod/modnetwork.h b/extmod/modnetwork.h
index 55ee4eb4d3e35..a28ec6e420cb6 100644
--- a/extmod/modnetwork.h
+++ b/extmod/modnetwork.h
@@ -61,10 +61,7 @@ mp_obj_t mod_network_nic_ifconfig(struct netif *netif, size_t n_args, const mp_o
 
 struct _mod_network_socket_obj_t;
 
-typedef struct _mod_network_nic_type_t {
-    // Ensure that this struct is big enough to hold any type size.
-    mp_obj_full_type_t base;
-
+typedef struct _mod_network_nic_protocol_t {
     // API for non-socket operations
     int (*gethostbyname)(mp_obj_t nic, const char *name, mp_uint_t len, uint8_t *ip_out);
 
@@ -82,12 +79,12 @@ typedef struct _mod_network_nic_type_t {
     int (*setsockopt)(struct _mod_network_socket_obj_t *socket, mp_uint_t level, mp_uint_t opt, const void *optval, mp_uint_t optlen, int *_errno);
     int (*settimeout)(struct _mod_network_socket_obj_t *socket, mp_uint_t timeout_ms, int *_errno);
     int (*ioctl)(struct _mod_network_socket_obj_t *socket, mp_uint_t request, mp_uint_t arg, int *_errno);
-} mod_network_nic_type_t;
+} mod_network_nic_protocol_t;
 
 typedef struct _mod_network_socket_obj_t {
     mp_obj_base_t base;
     mp_obj_t nic;
-    mod_network_nic_type_t *nic_type;
+    mod_network_nic_protocol_t *nic_protocol;
     uint32_t domain : 5;
     uint32_t type   : 5;
     uint32_t proto  : 5;
diff --git a/extmod/modusocket.c b/extmod/modusocket.c
index 0006465924110..2aa6010884a00 100644
--- a/extmod/modusocket.c
+++ b/extmod/modusocket.c
@@ -57,7 +57,7 @@ STATIC mp_obj_t socket_make_new(const mp_obj_type_t *type, size_t n_args, size_t
     mod_network_socket_obj_t *s = m_new_obj_with_finaliser(mod_network_socket_obj_t);
     s->base.type = &socket_type;
     s->nic = MP_OBJ_NULL;
-    s->nic_type = NULL;
+    s->nic_protocol = NULL;
     s->domain = MOD_NETWORK_AF_INET;
     s->type = MOD_NETWORK_SOCK_STREAM;
     s->proto = 0;
@@ -86,17 +86,17 @@ STATIC void socket_select_nic(mod_network_socket_obj_t *self, const byte *ip) {
     if (self->nic == MP_OBJ_NULL) {
         // select NIC based on IP
         self->nic = mod_network_find_nic(ip);
-        self->nic_type = (mod_network_nic_type_t *)mp_obj_get_type(self->nic);
+        self->nic_protocol = (mod_network_nic_protocol_t *)MP_OBJ_TYPE_GET_SLOT(mp_obj_get_type(self->nic), protocol);
 
         // call the NIC to open the socket
         int _errno;
-        if (self->nic_type->socket(self, &_errno) != 0) {
+        if (self->nic_protocol->socket(self, &_errno) != 0) {
             mp_raise_OSError(_errno);
         }
 
         #if MICROPY_PY_USOCKET_EXTENDED_STATE
         // if a timeout was set before binding a NIC, call settimeout to reset it
-        if (self->timeout != -1 && self->nic_type->settimeout(self, self->timeout, &_errno) != 0) {
+        if (self->timeout != -1 && self->nic_protocol->settimeout(self, self->timeout, &_errno) != 0) {
             mp_raise_OSError(_errno);
         }
         #endif
@@ -116,7 +116,7 @@ STATIC mp_obj_t socket_bind(mp_obj_t self_in, mp_obj_t addr_in) {
 
     // call the NIC to bind the socket
     int _errno;
-    if (self->nic_type->bind(self, ip, port, &_errno) != 0) {
+    if (self->nic_protocol->bind(self, ip, port, &_errno) != 0) {
         mp_raise_OSError(_errno);
     }
 
@@ -141,7 +141,7 @@ STATIC mp_obj_t socket_listen(size_t n_args, const mp_obj_t *args) {
     }
 
     int _errno;
-    if (self->nic_type->listen(self, backlog, &_errno) != 0) {
+    if (self->nic_protocol->listen(self, backlog, &_errno) != 0) {
         mp_raise_OSError(_errno);
     }
 
@@ -166,7 +166,7 @@ STATIC mp_obj_t socket_accept(mp_obj_t self_in) {
     mod_network_socket_obj_t *socket2 = m_new_obj_with_finaliser(mod_network_socket_obj_t);
     socket2->base.type = &socket_type;
     socket2->nic = MP_OBJ_NULL;
-    socket2->nic_type = NULL;
+    socket2->nic_protocol = NULL;
 
     // set the same address family, socket type and protocol as parent
     socket2->domain = self->domain;
@@ -185,13 +185,13 @@ STATIC mp_obj_t socket_accept(mp_obj_t self_in) {
     uint8_t ip[MOD_NETWORK_IPADDR_BUF_SIZE];
     mp_uint_t port;
     int _errno;
-    if (self->nic_type->accept(self, socket2, ip, &port, &_errno) != 0) {
+    if (self->nic_protocol->accept(self, socket2, ip, &port, &_errno) != 0) {
         mp_raise_OSError(_errno);
     }
 
     // new socket has valid state, so set the NIC to the same as parent
     socket2->nic = self->nic;
-    socket2->nic_type = self->nic_type;
+    socket2->nic_protocol = self->nic_protocol;
 
     // make the return value
     mp_obj_tuple_t *client = MP_OBJ_TO_PTR(mp_obj_new_tuple(2, NULL));
@@ -215,7 +215,7 @@ STATIC mp_obj_t socket_connect(mp_obj_t self_in, mp_obj_t addr_in) {
 
     // call the NIC to connect the socket
     int _errno;
-    if (self->nic_type->connect(self, ip, port, &_errno) != 0) {
+    if (self->nic_protocol->connect(self, ip, port, &_errno) != 0) {
         mp_raise_OSError(_errno);
     }
 
@@ -236,7 +236,7 @@ STATIC mp_obj_t socket_send(mp_obj_t self_in, mp_obj_t buf_in) {
     mp_buffer_info_t bufinfo;
     mp_get_buffer_raise(buf_in, &bufinfo, MP_BUFFER_READ);
     int _errno;
-    mp_uint_t ret = self->nic_type->send(self, bufinfo.buf, bufinfo.len, &_errno);
+    mp_uint_t ret = self->nic_protocol->send(self, bufinfo.buf, bufinfo.len, &_errno);
     if (ret == -1) {
         mp_raise_OSError(_errno);
     }
@@ -256,7 +256,7 @@ STATIC mp_obj_t socket_sendall(mp_obj_t self_in, mp_obj_t buf_in) {
     int _errno;
     mp_uint_t ret = 0;
     if (self->timeout == 0) {
-        ret = self->nic_type->send(self, bufinfo.buf, bufinfo.len, &_errno);
+        ret = self->nic_protocol->send(self, bufinfo.buf, bufinfo.len, &_errno);
         if (ret == -1) {
             mp_raise_OSError(_errno);
         } else if (bufinfo.len > ret) {
@@ -266,7 +266,7 @@ STATIC mp_obj_t socket_sendall(mp_obj_t self_in, mp_obj_t buf_in) {
         // TODO: In CPython3.5, socket timeout should apply to the
         // entire sendall() operation, not to individual send() chunks.
         while (bufinfo.len != 0) {
-            ret = self->nic_type->send(self, bufinfo.buf, bufinfo.len, &_errno);
+            ret = self->nic_protocol->send(self, bufinfo.buf, bufinfo.len, &_errno);
             if (ret == -1) {
                 mp_raise_OSError(_errno);
             }
@@ -289,7 +289,7 @@ STATIC mp_obj_t socket_recv(mp_obj_t self_in, mp_obj_t len_in) {
     vstr_t vstr;
     vstr_init_len(&vstr, len);
     int _errno;
-    mp_uint_t ret = self->nic_type->recv(self, (byte *)vstr.buf, len, &_errno);
+    mp_uint_t ret = self->nic_protocol->recv(self, (byte *)vstr.buf, len, &_errno);
     if (ret == -1) {
         mp_raise_OSError(_errno);
     }
@@ -318,7 +318,7 @@ STATIC mp_obj_t socket_sendto(mp_obj_t self_in, mp_obj_t data_in, mp_obj_t addr_
 
     // call the NIC to sendto
     int _errno;
-    mp_int_t ret = self->nic_type->sendto(self, bufinfo.buf, bufinfo.len, ip, port, &_errno);
+    mp_int_t ret = self->nic_protocol->sendto(self, bufinfo.buf, bufinfo.len, ip, port, &_errno);
     if (ret == -1) {
         mp_raise_OSError(_errno);
     }
@@ -339,7 +339,7 @@ STATIC mp_obj_t socket_recvfrom(mp_obj_t self_in, mp_obj_t len_in) {
     byte ip[4];
     mp_uint_t port;
     int _errno;
-    mp_int_t ret = self->nic_type->recvfrom(self, (byte *)vstr.buf, vstr.len, ip, &port, &_errno);
+    mp_int_t ret = self->nic_protocol->recvfrom(self, (byte *)vstr.buf, vstr.len, ip, &port, &_errno);
     if (ret == -1) {
         mp_raise_OSError(_errno);
     }
@@ -389,7 +389,7 @@ STATIC mp_obj_t socket_setsockopt(size_t n_args, const mp_obj_t *args) {
     }
 
     int _errno;
-    if (self->nic_type->setsockopt(self, level, opt, optval, optlen, &_errno) != 0) {
+    if (self->nic_protocol->setsockopt(self, level, opt, optval, optlen, &_errno) != 0) {
         mp_raise_OSError(_errno);
     }
 
@@ -429,7 +429,7 @@ STATIC mp_obj_t socket_settimeout(mp_obj_t self_in, mp_obj_t timeout_in) {
         #endif
     } else {
         int _errno;
-        if (self->nic_type->settimeout(self, timeout, &_errno) != 0) {
+        if (self->nic_protocol->settimeout(self, timeout, &_errno) != 0) {
             mp_raise_OSError(_errno);
         }
     }
@@ -477,7 +477,7 @@ mp_uint_t socket_read(mp_obj_t self_in, void *buf, mp_uint_t size, int *errcode)
     if (self->nic == MP_OBJ_NULL) {
         return MP_STREAM_ERROR;
     }
-    mp_int_t ret = self->nic_type->recv(self, (byte *)buf, size, errcode);
+    mp_int_t ret = self->nic_protocol->recv(self, (byte *)buf, size, errcode);
     if (ret < 0) {
         ret = MP_STREAM_ERROR;
     }
@@ -489,7 +489,7 @@ mp_uint_t socket_write(mp_obj_t self_in, const void *buf, mp_uint_t size, int *e
     if (self->nic == MP_OBJ_NULL) {
         return MP_STREAM_ERROR;
     }
-    mp_int_t ret = self->nic_type->send(self, buf, size, errcode);
+    mp_int_t ret = self->nic_protocol->send(self, buf, size, errcode);
     if (ret < 0) {
         ret = MP_STREAM_ERROR;
     }
@@ -500,7 +500,7 @@ mp_uint_t socket_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_t arg, int *
     mod_network_socket_obj_t *self = MP_OBJ_TO_PTR(self_in);
     if (request == MP_STREAM_CLOSE) {
         if (self->nic != MP_OBJ_NULL) {
-            self->nic_type->close(self);
+            self->nic_protocol->close(self);
             self->nic = MP_OBJ_NULL;
         }
         self->state = MOD_NETWORK_SS_CLOSED;
@@ -519,7 +519,7 @@ mp_uint_t socket_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_t arg, int *
         *errcode = MP_EINVAL;
         return MP_STREAM_ERROR;
     }
-    return self->nic_type->ioctl(self, request, arg, errcode);
+    return self->nic_protocol->ioctl(self, request, arg, errcode);
 }
 
 STATIC const mp_stream_p_t socket_stream_p = {
@@ -589,9 +589,9 @@ STATIC mp_obj_t mod_usocket_getaddrinfo(size_t n_args, const mp_obj_t *args) {
         // find a NIC that can do a name lookup
         for (mp_uint_t i = 0; i < MP_STATE_PORT(mod_network_nic_list).len; i++) {
             mp_obj_t nic = MP_STATE_PORT(mod_network_nic_list).items[i];
-            mod_network_nic_type_t *nic_type = (mod_network_nic_type_t *)mp_obj_get_type(nic);
-            if (nic_type->gethostbyname != NULL) {
-                int ret = nic_type->gethostbyname(nic, host, hlen, out_ip);
+            mod_network_nic_protocol_t *nic_protocol = (mod_network_nic_protocol_t *)MP_OBJ_TYPE_GET_SLOT(mp_obj_get_type(nic), protocol);
+            if (nic_protocol->gethostbyname != NULL) {
+                int ret = nic_protocol->gethostbyname(nic, host, hlen, out_ip);
                 if (ret != 0) {
                     mp_raise_OSError(ret);
                 }
diff --git a/extmod/network_ninaw10.c b/extmod/network_ninaw10.c
index 0852deabe9dcf..8e806cb423f2c 100644
--- a/extmod/network_ninaw10.c
+++ b/extmod/network_ninaw10.c
@@ -77,7 +77,7 @@ typedef struct _nina_obj_t {
 #define debug_printf(...) // mp_printf(&mp_plat_print, __VA_ARGS__)
 
 static uint16_t bind_port = BIND_PORT_RANGE_MIN;
-const mod_network_nic_type_t mod_network_nic_type_nina;
+const mp_obj_type_t mod_network_nic_type_nina;
 static nina_obj_t network_nina_wl_sta = {{(mp_obj_type_t *)&mod_network_nic_type_nina}, false, MOD_NETWORK_STA_IF};
 static nina_obj_t network_nina_wl_ap = {{(mp_obj_type_t *)&mod_network_nic_type_nina}, false, MOD_NETWORK_AP_IF};
 static mp_sched_node_t mp_wifi_sockpoll_node;
@@ -798,7 +798,7 @@ STATIC int network_ninaw10_socket_ioctl(mod_network_socket_obj_t *socket, mp_uin
     return ret;
 }
 
-static const mp_rom_map_elem_t nina_locals_dict_table[] = {
+STATIC const mp_rom_map_elem_t nina_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_active),              MP_ROM_PTR(&network_ninaw10_active_obj) },
     { MP_ROM_QSTR(MP_QSTR_scan),                MP_ROM_PTR(&network_ninaw10_scan_obj) },
     { MP_ROM_QSTR(MP_QSTR_connect),             MP_ROM_PTR(&network_ninaw10_connect_obj) },
@@ -817,18 +817,9 @@ static const mp_rom_map_elem_t nina_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_WPA_PSK),             MP_ROM_INT(NINA_SEC_WPA_PSK) },
 };
 
-static MP_DEFINE_CONST_DICT(nina_locals_dict, nina_locals_dict_table);
+STATIC MP_DEFINE_CONST_DICT(nina_locals_dict, nina_locals_dict_table);
 
-STATIC MP_DEFINE_CONST_OBJ_FULL_TYPE(
-    mod_network_nic_type_nina_base,
-    MP_QSTR_nina,
-    MP_TYPE_FLAG_NONE,
-    make_new, network_ninaw10_make_new,
-    locals_dict, &nina_locals_dict
-    );
-
-const mod_network_nic_type_t mod_network_nic_type_nina = {
-    .base = mod_network_nic_type_nina_base,
+STATIC const mod_network_nic_protocol_t mod_network_nic_protocol_nina = {
     .gethostbyname = network_ninaw10_gethostbyname,
     .socket = network_ninaw10_socket_socket,
     .close = network_ninaw10_socket_close,
@@ -845,6 +836,15 @@ const mod_network_nic_type_t mod_network_nic_type_nina = {
     .ioctl = network_ninaw10_socket_ioctl,
 };
 
+MP_DEFINE_CONST_OBJ_TYPE(
+    mod_network_nic_type_nina,
+    MP_QSTR_nina,
+    MP_TYPE_FLAG_NONE,
+    make_new, network_ninaw10_make_new,
+    locals_dict, &nina_locals_dict,
+    protocol, &mod_network_nic_protocol_nina
+    );
+
 MP_REGISTER_ROOT_POINTER(struct _machine_spi_obj_t *mp_wifi_spi);
 MP_REGISTER_ROOT_POINTER(struct _machine_timer_obj_t *mp_wifi_timer);
 MP_REGISTER_ROOT_POINTER(struct _mp_obj_list_t *mp_wifi_sockpoll_list);
diff --git a/extmod/network_wiznet5k.c b/extmod/network_wiznet5k.c
index 78cbff4ce2dfa..eed656ee2419d 100644
--- a/extmod/network_wiznet5k.c
+++ b/extmod/network_wiznet5k.c
@@ -1017,24 +1017,9 @@ STATIC const mp_rom_map_elem_t wiznet5k_locals_dict_table[] = {
 STATIC MP_DEFINE_CONST_DICT(wiznet5k_locals_dict, wiznet5k_locals_dict_table);
 
 #if WIZNET5K_WITH_LWIP_STACK
-MP_DEFINE_CONST_OBJ_TYPE(
-    mod_network_nic_type_wiznet5k,
-    MP_QSTR_WIZNET5K,
-    MP_TYPE_FLAG_NONE,
-    make_new, wiznet5k_make_new,
-    locals_dict, &wiznet5k_locals_dict
-    );
+#define NIC_TYPE_WIZNET_PROTOCOL
 #else // WIZNET5K_PROVIDED_STACK
-STATIC MP_DEFINE_CONST_OBJ_FULL_TYPE(
-    mod_network_nic_type_wiznet5k_base,
-    MP_QSTR_WIZNET5K,
-    MP_TYPE_FLAG_NONE,
-    make_new, wiznet5k_make_new,
-    locals_dict, &wiznet5k_locals_dict
-    );
-
-const mod_network_nic_type_t mod_network_nic_type_wiznet5k = {
-    .base = mod_network_nic_type_wiznet5k_base,
+const mod_network_nic_protocol_t mod_network_nic_protocol_wiznet = {
     .gethostbyname = wiznet5k_gethostbyname,
     .socket = wiznet5k_socket_socket,
     .close = wiznet5k_socket_close,
@@ -1050,6 +1035,16 @@ const mod_network_nic_type_t mod_network_nic_type_wiznet5k = {
     .settimeout = wiznet5k_socket_settimeout,
     .ioctl = wiznet5k_socket_ioctl,
 };
+#define NIC_TYPE_WIZNET_PROTOCOL protocol, &mod_network_nic_protocol_wiznet,
 #endif
 
+MP_DEFINE_CONST_OBJ_TYPE(
+    mod_network_nic_type_wiznet5k,
+    MP_QSTR_WIZNET5K,
+    MP_TYPE_FLAG_NONE,
+    make_new, wiznet5k_make_new,
+    NIC_TYPE_WIZNET_PROTOCOL
+    locals_dict, &wiznet5k_locals_dict
+    );
+
 #endif // MICROPY_PY_NETWORK_WIZNET5K
diff --git a/ports/rp2/mpconfigport.h b/ports/rp2/mpconfigport.h
index d5e4de7b5a595..a21c141e4b445 100644
--- a/ports/rp2/mpconfigport.h
+++ b/ports/rp2/mpconfigport.h
@@ -176,18 +176,14 @@ extern const struct _mp_obj_type_t mp_network_cyw43_type;
 #ifndef MICROPY_PY_USOCKET_EXTENDED_STATE
 #define MICROPY_PY_USOCKET_EXTENDED_STATE   (1)
 #endif
-extern const struct _mod_network_nic_type_t mod_network_nic_type_nina;
+extern const struct _mp_obj_type_t mod_network_nic_type_nina;
 #define MICROPY_HW_NIC_NINAW10              { MP_ROM_QSTR(MP_QSTR_WLAN), MP_ROM_PTR(&mod_network_nic_type_nina) },
 #else
 #define MICROPY_HW_NIC_NINAW10
 #endif
 
 #if MICROPY_PY_NETWORK_WIZNET5K
-#if MICROPY_PY_LWIP
 extern const struct _mp_obj_type_t mod_network_nic_type_wiznet5k;
-#else
-extern const struct _mod_network_nic_type_t mod_network_nic_type_wiznet5k;
-#endif
 #define MICROPY_HW_NIC_WIZNET5K             { MP_ROM_QSTR(MP_QSTR_WIZNET5K), MP_ROM_PTR(&mod_network_nic_type_wiznet5k) },
 #else
 #define MICROPY_HW_NIC_WIZNET5K
diff --git a/ports/stm32/mpconfigport.h b/ports/stm32/mpconfigport.h
index de12f03207157..2898b01a3845b 100644
--- a/ports/stm32/mpconfigport.h
+++ b/ports/stm32/mpconfigport.h
@@ -191,11 +191,7 @@ extern const struct _mp_obj_type_t mp_network_cyw43_type;
 #endif
 
 #if MICROPY_PY_NETWORK_WIZNET5K
-#if MICROPY_PY_LWIP
 extern const struct _mp_obj_type_t mod_network_nic_type_wiznet5k;
-#else
-extern const struct _mod_network_nic_type_t mod_network_nic_type_wiznet5k;
-#endif
 #define MICROPY_HW_NIC_WIZNET5K             { MP_ROM_QSTR(MP_QSTR_WIZNET5K), MP_ROM_PTR(&mod_network_nic_type_wiznet5k) },
 #else
 #define MICROPY_HW_NIC_WIZNET5K

From 68090cc6cd832f62f0c12474ee63b56571a4c6a5 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Wed, 14 Dec 2022 16:30:02 +1100
Subject: [PATCH 2971/3533] cc3200: Remove unused NIC type customisation.

See the previous commit, except in this case the customisation didn't
actually do anything so can just be removed.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/cc3200/mods/modnetwork.h | 7 +------
 ports/cc3200/mods/modwlan.c    | 8 ++------
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/ports/cc3200/mods/modnetwork.h b/ports/cc3200/mods/modnetwork.h
index c15a6467f2788..9bc2c71c29335 100644
--- a/ports/cc3200/mods/modnetwork.h
+++ b/ports/cc3200/mods/modnetwork.h
@@ -35,11 +35,6 @@
 /******************************************************************************
  DEFINE TYPES
  ******************************************************************************/
-typedef struct _mod_network_nic_type_t {
-    // Ensure that this struct is big enough to hold any type size.
-    mp_obj_full_type_t base;
-} mod_network_nic_type_t;
-
 typedef struct _mod_network_socket_base_t {
     union {
         struct {
@@ -64,7 +59,7 @@ typedef struct _mod_network_socket_obj_t {
 /******************************************************************************
  EXPORTED DATA
  ******************************************************************************/
-extern const mod_network_nic_type_t mod_network_nic_type_wlan;
+extern const mp_obj_type_t mod_network_nic_type_wlan;
 
 /******************************************************************************
  DECLARE FUNCTIONS
diff --git a/ports/cc3200/mods/modwlan.c b/ports/cc3200/mods/modwlan.c
index 6cf1cbee4e414..ca18b34823c0d 100644
--- a/ports/cc3200/mods/modwlan.c
+++ b/ports/cc3200/mods/modwlan.c
@@ -1285,18 +1285,14 @@ STATIC const mp_rom_map_elem_t wlan_locals_dict_table[] = {
 };
 STATIC MP_DEFINE_CONST_DICT(wlan_locals_dict, wlan_locals_dict_table);
 
-STATIC MP_DEFINE_CONST_OBJ_FULL_TYPE(
-    mod_network_nic_type_wlan_base,
+MP_DEFINE_CONST_OBJ_TYPE(
+    mod_network_nic_type_wlan,
     MP_QSTR_WLAN,
     MP_TYPE_FLAG_NONE,
     make_new, wlan_make_new,
     locals_dict, &wlan_locals_dict
     );
 
-const mod_network_nic_type_t mod_network_nic_type_wlan = {
-    .base = mod_network_nic_type_wlan_base,
-};
-
 STATIC const mp_irq_methods_t wlan_irq_methods = {
     .init = wlan_irq,
     .enable = wlan_lpds_irq_enable,

From 9e9176467179bcb477b92f32033e62fcde14ea41 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Wed, 14 Dec 2022 16:30:22 +1100
Subject: [PATCH 2972/3533] py/obj: Remove unused MP_DEFINE_CONST_OBJ_FULL_TYPE
 macro.

This was previously used for the definition of NIC types, but they have
been updated to use a protocol instead.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 py/obj.h | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/py/obj.h b/py/obj.h
index b5b855bad395c..cb9a6cc4593a1 100644
--- a/py/obj.h
+++ b/py/obj.h
@@ -773,15 +773,14 @@ typedef struct _mp_obj_full_type_t {
 // of the 29th argument (29 is 13*2 + 3).
 #define MP_DEFINE_CONST_OBJ_TYPE_NARGS(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, N, ...) MP_DEFINE_CONST_OBJ_TYPE_NARGS_##N
 
-// These macros are used to define a object type in ROM.
+// This macros is used to define a object type in ROM.
 // Invoke as MP_DEFINE_CONST_OBJ_TYPE(_typename, _name, _flags, _make_new [, slot, func]*)
-// They use the number of arguments to select which MP_DEFINE_CONST_OBJ_TYPE_*
+// It uses the number of arguments to select which MP_DEFINE_CONST_OBJ_TYPE_*
 // macro to use based on the number of arguments. It works by shifting the
 // numeric values 12, 11, ... 0 by the number of arguments, such that the
 // 29th argument ends up being the number to use. The _INV values are
 // placeholders because the slot arguments come in pairs.
 #define MP_DEFINE_CONST_OBJ_TYPE(...) MP_DEFINE_CONST_OBJ_TYPE_EXPAND(MP_DEFINE_CONST_OBJ_TYPE_NARGS(__VA_ARGS__, _INV, 12, _INV, 11, _INV, 10, _INV, 9, _INV, 8, _INV, 7, _INV, 6, _INV, 5, _INV, 4, _INV, 3, _INV, 2, _INV, 1, _INV, 0)(mp_obj_type_t, __VA_ARGS__))
-#define MP_DEFINE_CONST_OBJ_FULL_TYPE(...) MP_DEFINE_CONST_OBJ_TYPE_EXPAND(MP_DEFINE_CONST_OBJ_TYPE_NARGS(__VA_ARGS__, _INV, 12, _INV, 11, _INV, 10, _INV, 9, _INV, 8, _INV, 7, _INV, 6, _INV, 5, _INV, 4, _INV, 3, _INV, 2, _INV, 1, _INV, 0)(mp_obj_full_type_t, __VA_ARGS__))
 
 // Constant types, globally accessible
 extern const mp_obj_type_t mp_type_type;

From 988b6e2dae4e7f6b6f85c3b149fabeb50bb0519f Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Tue, 27 Sep 2022 20:40:05 +0200
Subject: [PATCH 2973/3533] renesas-ra: Add the UART methods uart.txdone() and
 uart.flush().

This required to add two functions down the stack to uart.c and ra.sci.c.

- One for telling, whther the transmission is busy.
- One for reporting the size of the TX buffer.

Tested with a EK-RA6M2 board.
---
 docs/library/machine.UART.rst   |  4 ++--
 ports/renesas-ra/machine_uart.c | 23 +++++++++++++++++++++++
 ports/renesas-ra/ra/ra_sci.c    | 10 ++++++++++
 ports/renesas-ra/ra/ra_sci.h    |  2 ++
 ports/renesas-ra/uart.c         | 10 ++++++++++
 ports/renesas-ra/uart.h         |  2 ++
 6 files changed, 49 insertions(+), 2 deletions(-)

diff --git a/docs/library/machine.UART.rst b/docs/library/machine.UART.rst
index c3eca8f55a693..072bdb7188a3d 100644
--- a/docs/library/machine.UART.rst
+++ b/docs/library/machine.UART.rst
@@ -188,7 +188,7 @@ Methods
        For the rp2, esp8266 and nrf ports the call returns while the last byte is sent.
        If required, a one character wait time has to be added in the calling script.
 
-   Availability: rp2, esp32, esp8266, mimxrt, cc3200, stm32, nrf ports
+   Availability: rp2, esp32, esp8266, mimxrt, cc3200, stm32, nrf ports, renesas-ra
 
 .. method:: UART.txdone()
 
@@ -201,7 +201,7 @@ Methods
        of a transfer is still being sent. If required, a one character wait time has to be
        added in the calling script.
 
-   Availability: rp2, esp32, esp8266, mimxrt, cc3200, stm32, nrf ports
+   Availability: rp2, esp32, esp8266, mimxrt, cc3200, stm32, nrf ports, renesas-ra
 
 Constants
 ---------
diff --git a/ports/renesas-ra/machine_uart.c b/ports/renesas-ra/machine_uart.c
index 86505ea0b953c..f365223afaba8 100644
--- a/ports/renesas-ra/machine_uart.c
+++ b/ports/renesas-ra/machine_uart.c
@@ -409,6 +409,14 @@ STATIC mp_obj_t machine_uart_sendbreak(mp_obj_t self_in) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_uart_sendbreak_obj, machine_uart_sendbreak);
 
+// \method uart.txdone()
+// Return `True` if all characters have been sent.
+STATIC mp_obj_t machine_uart_txdone(mp_obj_t self_in) {
+    machine_uart_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    return uart_tx_busy(self) ? mp_const_false : mp_const_true;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_uart_txdone_obj, machine_uart_txdone);
+
 // irq(handler, trigger, hard)
 STATIC mp_obj_t machine_uart_irq(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     mp_arg_val_t args[MP_IRQ_ARG_INIT_NUM_ARGS];
@@ -452,6 +460,8 @@ STATIC const mp_rom_map_elem_t machine_uart_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_init), MP_ROM_PTR(&machine_uart_init_obj) },
     { MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&machine_uart_deinit_obj) },
     { MP_ROM_QSTR(MP_QSTR_any), MP_ROM_PTR(&machine_uart_any_obj) },
+    { MP_ROM_QSTR(MP_QSTR_txdone), MP_ROM_PTR(&machine_uart_txdone_obj) },
+    { MP_ROM_QSTR(MP_QSTR_flush), MP_ROM_PTR(&mp_stream_flush_obj) },
 
     /// \method read([nbytes])
     { MP_ROM_QSTR(MP_QSTR_read), MP_ROM_PTR(&mp_stream_read_obj) },
@@ -557,6 +567,19 @@ STATIC mp_uint_t machine_uart_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr
         if ((flags & MP_STREAM_POLL_WR) && uart_tx_avail(self)) {
             ret |= MP_STREAM_POLL_WR;
         }
+    } else if (request == MP_STREAM_FLUSH) {
+        // The timeout is estimated using the buffer size and the baudrate.
+        // Take the worst case assumptions at 13 bit symbol size times 2.
+        uint32_t timeout = mp_hal_ticks_ms() +
+            (uint32_t)(uart_tx_txbuf(self)) * 13000ll * 2 / self->baudrate;
+        do {
+            if (!uart_tx_busy(self)) {
+                return 0;
+            }
+            MICROPY_EVENT_POLL_HOOK
+        } while (mp_hal_ticks_ms() < timeout);
+        *errcode = MP_ETIMEDOUT;
+        ret = MP_STREAM_ERROR;
     } else {
         *errcode = MP_EINVAL;
         ret = MP_STREAM_ERROR;
diff --git a/ports/renesas-ra/ra/ra_sci.c b/ports/renesas-ra/ra/ra_sci.c
index 2e7c81c4ac477..3f8bf2444401d 100644
--- a/ports/renesas-ra/ra/ra_sci.c
+++ b/ports/renesas-ra/ra/ra_sci.c
@@ -1026,6 +1026,16 @@ int ra_sci_tx_wait(uint32_t ch) {
     return (int)(tx_fifo[idx].len != (tx_fifo[idx].size - 1));
 }
 
+int ra_sci_tx_busy(uint32_t ch) {
+    uint32_t idx = ch_to_idx[ch];
+    return (int)(tx_fifo[idx].busy);
+}
+
+int ra_sci_tx_bufsize(uint32_t ch) {
+    uint32_t idx = ch_to_idx[ch];
+    return (int)(tx_fifo[idx].size - 1);
+}
+
 void ra_sci_tx_break(uint32_t ch) {
     uint32_t idx = ch_to_idx[ch];
     R_SCI0_Type *sci_reg = sci_regs[idx];
diff --git a/ports/renesas-ra/ra/ra_sci.h b/ports/renesas-ra/ra/ra_sci.h
index 0a672f3672d1c..87e4154e8ee03 100644
--- a/ports/renesas-ra/ra/ra_sci.h
+++ b/ports/renesas-ra/ra/ra_sci.h
@@ -52,6 +52,8 @@ bool ra_sci_is_rxirq_enable(uint32_t ch);
 void ra_sci_isr_te(uint32_t ch);
 int ra_sci_rx_ch(uint32_t ch);
 int ra_sci_rx_any(uint32_t ch);
+int ra_sci_tx_busy(uint32_t ch);
+int ra_sci_tx_bufsize(uint32_t ch);
 void ra_sci_tx_ch(uint32_t ch, int c);
 int ra_sci_tx_wait(uint32_t ch);
 void ra_sci_tx_break(uint32_t ch);
diff --git a/ports/renesas-ra/uart.c b/ports/renesas-ra/uart.c
index 0e2e9004cd41a..e41c68f0c442a 100644
--- a/ports/renesas-ra/uart.c
+++ b/ports/renesas-ra/uart.c
@@ -420,6 +420,16 @@ mp_uint_t uart_tx_avail(machine_uart_obj_t *self) {
     return ra_sci_tx_wait(ch);
 }
 
+mp_uint_t uart_tx_busy(machine_uart_obj_t *self) {
+    int ch = (int)self->uart_id;
+    return ra_sci_tx_busy(ch);
+}
+
+mp_uint_t uart_tx_txbuf(machine_uart_obj_t *self) {
+    int ch = (int)self->uart_id;
+    return ra_sci_tx_bufsize(ch);
+}
+
 // Waits at most timeout milliseconds for at least 1 char to become ready for
 // reading (from buf or for direct reading).
 // Returns true if something available, false if not.
diff --git a/ports/renesas-ra/uart.h b/ports/renesas-ra/uart.h
index 9c7aea737dab8..245be24d1a4d3 100644
--- a/ports/renesas-ra/uart.h
+++ b/ports/renesas-ra/uart.h
@@ -106,6 +106,8 @@ void uart_attach_to_repl(machine_uart_obj_t *self, bool attached);
 uint32_t uart_get_baudrate(machine_uart_obj_t *self);
 mp_uint_t uart_rx_any(machine_uart_obj_t *uart_obj);
 mp_uint_t uart_tx_avail(machine_uart_obj_t *uart_obj);
+mp_uint_t uart_tx_busy(machine_uart_obj_t *uart_obj);
+mp_uint_t uart_tx_txbuf(machine_uart_obj_t *self);
 bool uart_rx_wait(machine_uart_obj_t *self, uint32_t timeout);
 int uart_rx_char(machine_uart_obj_t *uart_obj);
 bool uart_tx_wait(machine_uart_obj_t *self, uint32_t timeout);

From ed58d6e4ce5878d5f53457e72686962e7f57f5df Mon Sep 17 00:00:00 2001
From: Damien Tournoud <damien@platform.sh>
Date: Thu, 15 Dec 2022 10:15:18 -0800
Subject: [PATCH 2974/3533] extmod/modussl_mbedtls: Fix support for
 ioctl(MP_STREAM_POLL).

During the initial handshake or subsequent renegotiation, the protocol
might need to read in order to write (or conversely to write in order
to read). It might be blocked from doing so by the state of the
underlying socket (i.e. there is no data to read, or there is no space
to write).

The library indicates this condition by returning one of the errors
`MBEDTLS_ERR_SSL_WANT_READ` or `MBEDTLS_ERR_SSL_WANT_WRITE`. When that
happens, we need to enforce that the next poll operation only considers
the direction that the library indicated.

In addition, mbedtls does its own read buffering that we need to take
into account while polling, and we need to save the last error between
read()/write() and ioctl().
---
 extmod/modussl_mbedtls.c       |  69 +++++++++++-
 tests/extmod/ussl_basic.py.exp |   1 -
 tests/extmod/ussl_poll.py      | 196 +++++++++++++++++++++++++++++++++
 tests/extmod/ussl_poll.py.exp  |   0
 tests/run-tests.py             |   1 +
 5 files changed, 265 insertions(+), 2 deletions(-)
 create mode 100644 tests/extmod/ussl_poll.py
 create mode 100644 tests/extmod/ussl_poll.py.exp

diff --git a/extmod/modussl_mbedtls.c b/extmod/modussl_mbedtls.c
index 95cf12c975af2..eea2d79532d86 100644
--- a/extmod/modussl_mbedtls.c
+++ b/extmod/modussl_mbedtls.c
@@ -46,6 +46,8 @@
 #include "mbedtls/debug.h"
 #include "mbedtls/error.h"
 
+#define MP_STREAM_POLL_RDWR (MP_STREAM_POLL_RD | MP_STREAM_POLL_WR)
+
 typedef struct _mp_obj_ssl_socket_t {
     mp_obj_base_t base;
     mp_obj_t sock;
@@ -56,6 +58,9 @@ typedef struct _mp_obj_ssl_socket_t {
     mbedtls_x509_crt cacert;
     mbedtls_x509_crt cert;
     mbedtls_pk_context pkey;
+
+    uintptr_t poll_mask; // Indicates which read or write operations the protocol needs next
+    int last_error; // The last error code, if any
 } mp_obj_ssl_socket_t;
 
 struct ssl_args {
@@ -165,6 +170,8 @@ STATIC mp_obj_ssl_socket_t *socket_new(mp_obj_t sock, struct ssl_args *args) {
     #endif
     o->base.type = &ussl_socket_type;
     o->sock = sock;
+    o->poll_mask = 0;
+    o->last_error = 0;
 
     int ret;
     mbedtls_ssl_init(&o->ssl);
@@ -306,6 +313,12 @@ STATIC void socket_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kin
 
 STATIC mp_uint_t socket_read(mp_obj_t o_in, void *buf, mp_uint_t size, int *errcode) {
     mp_obj_ssl_socket_t *o = MP_OBJ_TO_PTR(o_in);
+    o->poll_mask = 0;
+
+    if (o->last_error) {
+        *errcode = o->last_error;
+        return MP_STREAM_ERROR;
+    }
 
     int ret = mbedtls_ssl_read(&o->ssl, buf, size);
     if (ret == MBEDTLS_ERR_SSL_PEER_CLOSE_NOTIFY) {
@@ -322,6 +335,9 @@ STATIC mp_uint_t socket_read(mp_obj_t o_in, void *buf, mp_uint_t size, int *errc
         // wanting to write next handshake message. The same may happen with
         // renegotation.
         ret = MP_EWOULDBLOCK;
+        o->poll_mask = MP_STREAM_POLL_WR;
+    } else {
+        o->last_error = ret;
     }
     *errcode = ret;
     return MP_STREAM_ERROR;
@@ -329,6 +345,12 @@ STATIC mp_uint_t socket_read(mp_obj_t o_in, void *buf, mp_uint_t size, int *errc
 
 STATIC mp_uint_t socket_write(mp_obj_t o_in, const void *buf, mp_uint_t size, int *errcode) {
     mp_obj_ssl_socket_t *o = MP_OBJ_TO_PTR(o_in);
+    o->poll_mask = 0;
+
+    if (o->last_error) {
+        *errcode = o->last_error;
+        return MP_STREAM_ERROR;
+    }
 
     int ret = mbedtls_ssl_write(&o->ssl, buf, size);
     if (ret >= 0) {
@@ -341,6 +363,9 @@ STATIC mp_uint_t socket_write(mp_obj_t o_in, const void *buf, mp_uint_t size, in
         // wanting to read next handshake message. The same may happen with
         // renegotation.
         ret = MP_EWOULDBLOCK;
+        o->poll_mask = MP_STREAM_POLL_RD;
+    } else {
+        o->last_error = ret;
     }
     *errcode = ret;
     return MP_STREAM_ERROR;
@@ -358,7 +383,16 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(socket_setblocking_obj, socket_setblocking);
 
 STATIC mp_uint_t socket_ioctl(mp_obj_t o_in, mp_uint_t request, uintptr_t arg, int *errcode) {
     mp_obj_ssl_socket_t *self = MP_OBJ_TO_PTR(o_in);
+    mp_uint_t ret = 0;
+    uintptr_t saved_arg = 0;
+    mp_obj_t sock = self->sock;
+    if (sock == MP_OBJ_NULL || (request != MP_STREAM_CLOSE && self->last_error != 0)) {
+        // Closed or error socket:
+        return MP_STREAM_POLL_NVAL;
+    }
+
     if (request == MP_STREAM_CLOSE) {
+        self->sock = MP_OBJ_NULL;
         mbedtls_pk_free(&self->pkey);
         mbedtls_x509_crt_free(&self->cert);
         mbedtls_x509_crt_free(&self->cacert);
@@ -366,9 +400,39 @@ STATIC mp_uint_t socket_ioctl(mp_obj_t o_in, mp_uint_t request, uintptr_t arg, i
         mbedtls_ssl_config_free(&self->conf);
         mbedtls_ctr_drbg_free(&self->ctr_drbg);
         mbedtls_entropy_free(&self->entropy);
+    } else if (request == MP_STREAM_POLL) {
+        // If the library signaled us that it needs reading or writing, only check that direction,
+        // but save what the caller asked because we need to restore it later
+        if (self->poll_mask && (arg & MP_STREAM_POLL_RDWR)) {
+            saved_arg = arg & MP_STREAM_POLL_RDWR;
+            arg = (arg & ~saved_arg) | self->poll_mask;
+        }
+
+        // Take into account that the library might have buffered data already
+        int has_pending = 0;
+        if (arg & MP_STREAM_POLL_RD) {
+            has_pending = mbedtls_ssl_check_pending(&self->ssl);
+            if (has_pending) {
+                ret |= MP_STREAM_POLL_RD;
+                if (arg == MP_STREAM_POLL_RD) {
+                    // Shortcut if we only need to read and we have buffered data, no need to go to the underlying socket
+                    return MP_STREAM_POLL_RD;
+                }
+            }
+        }
     }
+
     // Pass all requests down to the underlying socket
-    return mp_get_stream(self->sock)->ioctl(self->sock, request, arg, errcode);
+    ret |= mp_get_stream(sock)->ioctl(sock, request, arg, errcode);
+
+    if (request == MP_STREAM_POLL) {
+        // The direction the library needed is available, return a fake result to the caller so that
+        // it reenters a read or a write to allow the handshake to progress
+        if (ret & self->poll_mask) {
+            ret |= saved_arg;
+        }
+    }
+    return ret;
 }
 
 STATIC const mp_rom_map_elem_t ussl_socket_locals_dict_table[] = {
@@ -381,6 +445,9 @@ STATIC const mp_rom_map_elem_t ussl_socket_locals_dict_table[] = {
     #if MICROPY_PY_USSL_FINALISER
     { MP_ROM_QSTR(MP_QSTR___del__), MP_ROM_PTR(&mp_stream_close_obj) },
     #endif
+    #if MICROPY_UNIX_COVERAGE
+    { MP_ROM_QSTR(MP_QSTR_ioctl), MP_ROM_PTR(&mp_stream_ioctl_obj) },
+    #endif
     { MP_ROM_QSTR(MP_QSTR_getpeercert), MP_ROM_PTR(&mod_ssl_getpeercert_obj) },
 };
 
diff --git a/tests/extmod/ussl_basic.py.exp b/tests/extmod/ussl_basic.py.exp
index 34355c5183188..30bfd3a43676a 100644
--- a/tests/extmod/ussl_basic.py.exp
+++ b/tests/extmod/ussl_basic.py.exp
@@ -3,6 +3,5 @@ OSError: client
 TestSocket.setblocking(False)
 TestSocket.setblocking(True)
 TestSocket.ioctl 4 0
-TestSocket.ioctl 4 0
 OSError: read
 OSError: write
diff --git a/tests/extmod/ussl_poll.py b/tests/extmod/ussl_poll.py
new file mode 100644
index 0000000000000..8080ec5112248
--- /dev/null
+++ b/tests/extmod/ussl_poll.py
@@ -0,0 +1,196 @@
+try:
+    import uselect
+    import ussl
+    import io
+    import ubinascii as binascii
+except ImportError:
+    print("SKIP")
+    raise SystemExit
+
+from micropython import const
+
+_MP_STREAM_POLL_RD = const(0x0001)
+_MP_STREAM_POLL_WR = const(0x0004)
+_MP_STREAM_POLL_NVAL = const(0x0020)
+_MP_STREAM_POLL = const(3)
+_MP_STREAM_CLOSE = const(4)
+
+
+# This self-signed key/cert pair is randomly generated and to be used for
+# testing/demonstration only.  You should always generate your own key/cert.
+key = binascii.unhexlify(
+    b"3082013b020100024100cc20643fd3d9c21a0acba4f48f61aadd675f52175a9dcf07fbef"
+    b"610a6a6ba14abb891745cd18a1d4c056580d8ff1a639460f867013c8391cdc9f2e573b0f"
+    b"872d0203010001024100bb17a54aeb3dd7ae4edec05e775ca9632cf02d29c2a089b563b0"
+    b"d05cdf95aeca507de674553f28b4eadaca82d5549a86058f9996b07768686a5b02cb240d"
+    b"d9f1022100f4a63f5549e817547dca97b5c658038e8593cb78c5aba3c4642cc4cd031d86"
+    b"8f022100d598d870ffe4a34df8de57047a50b97b71f4d23e323f527837c9edae88c79483"
+    b"02210098560c89a70385c36eb07fd7083235c4c1184e525d838aedf7128958bedfdbb102"
+    b"2051c0dab7057a8176ca966f3feb81123d4974a733df0f958525f547dfd1c271f9022044"
+    b"6c2cafad455a671a8cf398e642e1be3b18a3d3aec2e67a9478f83c964c4f1f"
+)
+cert = binascii.unhexlify(
+    b"308201d53082017f020203e8300d06092a864886f70d01010505003075310b3009060355"
+    b"0406130258583114301206035504080c0b54686550726f76696e63653110300e06035504"
+    b"070c075468654369747931133011060355040a0c0a436f6d70616e7958595a3113301106"
+    b"0355040b0c0a436f6d70616e7958595a3114301206035504030c0b546865486f73744e61"
+    b"6d65301e170d3139313231383033333935355a170d3239313231353033333935355a3075"
+    b"310b30090603550406130258583114301206035504080c0b54686550726f76696e636531"
+    b"10300e06035504070c075468654369747931133011060355040a0c0a436f6d70616e7958"
+    b"595a31133011060355040b0c0a436f6d70616e7958595a3114301206035504030c0b5468"
+    b"65486f73744e616d65305c300d06092a864886f70d0101010500034b003048024100cc20"
+    b"643fd3d9c21a0acba4f48f61aadd675f52175a9dcf07fbef610a6a6ba14abb891745cd18"
+    b"a1d4c056580d8ff1a639460f867013c8391cdc9f2e573b0f872d0203010001300d06092a"
+    b"864886f70d0101050500034100b0513fe2829e9ecbe55b6dd14c0ede7502bde5d46153c8"
+    b"e960ae3ebc247371b525caeb41bbcf34686015a44c50d226e66aef0a97a63874ca5944ef"
+    b"979b57f0b3"
+)
+
+
+class _Pipe(io.IOBase):
+    def __init__(self):
+        self._other = None
+        self.block_reads = False
+        self.block_writes = False
+
+        self.write_buffers = []
+        self.last_poll_arg = None
+
+    def readinto(self, buf):
+        if self.block_reads or len(self._other.write_buffers) == 0:
+            return None
+
+        read_buf = self._other.write_buffers[0]
+        l = min(len(buf), len(read_buf))
+        buf[:l] = read_buf[:l]
+        if l == len(read_buf):
+            self._other.write_buffers.pop(0)
+        else:
+            self._other.write_buffers[0] = read_buf[l:]
+        return l
+
+    def write(self, buf):
+        if self.block_writes:
+            return None
+
+        self.write_buffers.append(memoryview(bytes(buf)))
+        return len(buf)
+
+    def ioctl(self, request, arg):
+        if request == _MP_STREAM_POLL:
+            self.last_poll_arg = arg
+            ret = 0
+            if arg & _MP_STREAM_POLL_RD:
+                if not self.block_reads and self._other.write_buffers:
+                    ret |= _MP_STREAM_POLL_RD
+            if arg & _MP_STREAM_POLL_WR:
+                if not self.block_writes:
+                    ret |= _MP_STREAM_POLL_WR
+            return ret
+
+        elif request == _MP_STREAM_CLOSE:
+            return 0
+
+        raise NotImplementedError()
+
+    @classmethod
+    def new_pair(cls):
+        p1 = cls()
+        p2 = cls()
+        p1._other = p2
+        p2._other = p1
+        return p1, p2
+
+
+def assert_poll(s, i, arg, expected_arg, expected_ret):
+    ret = s.ioctl(_MP_STREAM_POLL, arg)
+    assert i.last_poll_arg == expected_arg
+    i.last_poll_arg = None
+    assert ret == expected_ret
+
+
+def assert_raises(cb, *args, **kwargs):
+    try:
+        cb(*args, **kwargs)
+        raise AssertionError("should have raised")
+    except Exception as exc:
+        pass
+
+
+client_io, server_io = _Pipe.new_pair()
+
+client_io.block_reads = True
+client_io.block_writes = True
+client_sock = ussl.wrap_socket(client_io, do_handshake=False)
+
+server_sock = ussl.wrap_socket(server_io, key=key, cert=cert, server_side=True, do_handshake=False)
+
+# Do a test read, at this point the TLS handshake wants to write,
+# so it returns None:
+assert client_sock.read(128) is None
+
+# Polling for either read or write actually check if the underlying socket can write:
+assert_poll(client_sock, client_io, _MP_STREAM_POLL_RD, _MP_STREAM_POLL_WR, 0)
+assert_poll(client_sock, client_io, _MP_STREAM_POLL_WR, _MP_STREAM_POLL_WR, 0)
+
+# Mark the socket as writable, and do another test read:
+client_io.block_writes = False
+assert client_sock.read(128) is None
+
+# The client wrote the CLIENT_HELLO message
+assert len(client_io.write_buffers) == 1
+
+# At this point the TLS handshake wants to read, but we don't know that yet:
+assert_poll(client_sock, client_io, _MP_STREAM_POLL_RD, _MP_STREAM_POLL_RD, 0)
+assert_poll(client_sock, client_io, _MP_STREAM_POLL_WR, _MP_STREAM_POLL_WR, _MP_STREAM_POLL_WR)
+
+# Do a test write
+client_sock.write(b"foo")
+
+# Now we know that we want to read:
+assert_poll(client_sock, client_io, _MP_STREAM_POLL_RD, _MP_STREAM_POLL_RD, 0)
+assert_poll(client_sock, client_io, _MP_STREAM_POLL_WR, _MP_STREAM_POLL_RD, 0)
+
+# Unblock reads and nudge the two sockets:
+client_io.block_reads = False
+while server_io.write_buffers or client_io.write_buffers:
+    if server_io.write_buffers:
+        assert client_sock.read(128) is None
+    if client_io.write_buffers:
+        assert server_sock.read(128) is None
+
+# At this point, the handshake is done, try writing data:
+client_sock.write(b"foo")
+assert server_sock.read(3) == b"foo"
+
+# Test reading partial data:
+client_sock.write(b"foobar")
+assert server_sock.read(3) == b"foo"
+server_io.block_reads = True
+assert_poll(
+    server_sock, server_io, _MP_STREAM_POLL_RD, None, _MP_STREAM_POLL_RD
+)  # Did not go to the socket, just consumed buffered data
+assert server_sock.read(3) == b"bar"
+
+
+# Polling on a closed socket errors out:
+client_io, _ = _Pipe.new_pair()
+client_sock = ussl.wrap_socket(client_io, do_handshake=False)
+client_sock.close()
+assert_poll(
+    client_sock, client_io, _MP_STREAM_POLL_RD, None, _MP_STREAM_POLL_NVAL
+)  # Did not go to the socket
+
+
+# Errors propagates to poll:
+client_io, server_io = _Pipe.new_pair()
+client_sock = ussl.wrap_socket(client_io, do_handshake=False)
+
+# The server returns garbage:
+server_io.write(b"fooba")  # Needs to be exactly 5 bytes
+
+assert_poll(client_sock, client_io, _MP_STREAM_POLL_RD, _MP_STREAM_POLL_RD, _MP_STREAM_POLL_RD)
+assert_raises(client_sock.read, 128)
+assert_poll(
+    client_sock, client_io, _MP_STREAM_POLL_RD, None, _MP_STREAM_POLL_NVAL
+)  # Did not go to the socket
diff --git a/tests/extmod/ussl_poll.py.exp b/tests/extmod/ussl_poll.py.exp
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/tests/run-tests.py b/tests/run-tests.py
index 02cad5aed8c07..e548059b1cea0 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -541,6 +541,7 @@ def run_tests(pyb, tests, args, result_dir, num_threads=1):
     if not has_coverage:
         skip_tests.add("cmdline/cmd_parsetree.py")
         skip_tests.add("cmdline/repl_sys_ps1_ps2.py")
+        skip_tests.add("extmod/ussl_poll.py")
 
     # Some tests shouldn't be run on a PC
     if args.target == "unix":

From 910f5794037bc32a48a0bc2658305b571ad84362 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 15 Dec 2022 16:11:27 +1100
Subject: [PATCH 2975/3533] py/emitnative: Initialise locals as Python object
 type for native code.

In @micropython.native code the types of variables and expressions are
always Python objects, so they can be initialised as such.  This prevents
problems with compiling optimised code like while-loops where a local may
be referenced before it is assigned to.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/emitnative.c                 |  2 +-
 tests/basics/assign_expr.py     | 11 +++++++++++
 tests/basics/assign_expr.py.exp |  2 ++
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/py/emitnative.c b/py/emitnative.c
index 2d694983bd2ab..b02559ad7ddc6 100644
--- a/py/emitnative.c
+++ b/py/emitnative.c
@@ -401,7 +401,7 @@ STATIC void emit_native_start_pass(emit_t *emit, pass_kind_t pass, scope_t *scop
 
     // local variables begin unbound, and have unknown type
     for (mp_uint_t i = num_args; i < emit->local_vtype_alloc; i++) {
-        emit->local_vtype[i] = VTYPE_UNBOUND;
+        emit->local_vtype[i] = emit->do_viper_types ? VTYPE_UNBOUND : VTYPE_PYOBJ;
     }
 
     // values on stack begin unbound
diff --git a/tests/basics/assign_expr.py b/tests/basics/assign_expr.py
index f243905dc2a63..2cf604193b3e0 100644
--- a/tests/basics/assign_expr.py
+++ b/tests/basics/assign_expr.py
@@ -12,6 +12,17 @@
 print(x, x := 5, x)
 print(x)
 
+# Test "while" with assignment expression as conditional, assigning to a new local.
+# The while conditional is compiled after the while body, so this tests how the
+# compiler handles the case of an unbound local being compiled before it is assigned.
+def f():
+    l = [0, 1]
+    while local := len(l):
+        print(local, l.pop())
+
+
+f()
+
 
 def foo():
     print("any", any((hit := i) % 5 == 3 and (hit % 2) == 0 for i in range(10)))
diff --git a/tests/basics/assign_expr.py.exp b/tests/basics/assign_expr.py.exp
index e38e1ae7a626c..47da56b80d47b 100644
--- a/tests/basics/assign_expr.py.exp
+++ b/tests/basics/assign_expr.py.exp
@@ -5,6 +5,8 @@ True
 5
 1 5 5
 5
+2 1
+1 0
 any True
 8
 123

From bb77c1d5a37feab6bc386ca189bacc0c4cecada3 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 16 Dec 2022 16:48:59 +1100
Subject: [PATCH 2976/3533] stm32/powerctrl: Fix build on STM32G0xx and
 STM32H7Bx MCUs.

STM32G0xx doesn't have DBGMCU, and STM32H7Bx doesn't have EXTI_D2.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/powerctrl.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ports/stm32/powerctrl.c b/ports/stm32/powerctrl.c
index ca5a424732a4c..2f5e78f346a64 100644
--- a/ports/stm32/powerctrl.c
+++ b/ports/stm32/powerctrl.c
@@ -941,9 +941,11 @@ void powerctrl_enter_standby_mode(void) {
     // Clear and mask D1 EXTIs.
     EXTI_D1->PR1 = 0x3fffffu;
     EXTI_D1->IMR1 &= ~(0xFFFFu); // 16 lines
+    #if defined(EXTI_D2)
     // Clear and mask D2 EXTIs.
     EXTI_D2->PR1 = 0x3fffffu;
     EXTI_D2->IMR1 &= ~(0xFFFFu); // 16 lines
+    #endif
     // Clear all wake-up flags.
     PWR->WKUPCR |= PWR_WAKEUP_FLAG_ALL;
     #elif defined(STM32G0) || defined(STM32G4) || defined(STM32L4) || defined(STM32WB)
@@ -970,7 +972,7 @@ void powerctrl_enter_standby_mode(void) {
     PWR->CSR1 |= PWR_CSR1_EIWUP;
     #endif
 
-    #if defined(NDEBUG)
+    #if defined(NDEBUG) && defined(DBGMCU)
     // Disable Debug MCU.
     DBGMCU->CR = 0;
     #endif

From 1290329415b2a61af2f5b42e1e9bc922d7915d48 Mon Sep 17 00:00:00 2001
From: Red_M <git@red-m.net>
Date: Mon, 23 May 2022 03:08:11 +1000
Subject: [PATCH 2977/3533] esp32/boards/GENERIC_S3_SPIRAM_OCT: Add ESP32S3
 board with Octal SPIRAM.

---
 .../boards/GENERIC_S3_SPIRAM_OCT/board.json    | 18 ++++++++++++++++++
 .../GENERIC_S3_SPIRAM_OCT/mpconfigboard.cmake  | 11 +++++++++++
 .../GENERIC_S3_SPIRAM_OCT/mpconfigboard.h      | 10 ++++++++++
 .../GENERIC_S3_SPIRAM_OCT/sdkconfig.board      | 12 ++++++++++++
 ports/esp32/boards/sdkconfig.spiram_oct        |  3 +++
 5 files changed, 54 insertions(+)
 create mode 100644 ports/esp32/boards/GENERIC_S3_SPIRAM_OCT/board.json
 create mode 100644 ports/esp32/boards/GENERIC_S3_SPIRAM_OCT/mpconfigboard.cmake
 create mode 100644 ports/esp32/boards/GENERIC_S3_SPIRAM_OCT/mpconfigboard.h
 create mode 100644 ports/esp32/boards/GENERIC_S3_SPIRAM_OCT/sdkconfig.board
 create mode 100644 ports/esp32/boards/sdkconfig.spiram_oct

diff --git a/ports/esp32/boards/GENERIC_S3_SPIRAM_OCT/board.json b/ports/esp32/boards/GENERIC_S3_SPIRAM_OCT/board.json
new file mode 100644
index 0000000000000..f3ca177ef974a
--- /dev/null
+++ b/ports/esp32/boards/GENERIC_S3_SPIRAM_OCT/board.json
@@ -0,0 +1,18 @@
+{
+    "deploy": [
+        "../deploy_s3.md"
+    ],
+    "docs": "",
+    "features": [
+        "BLE",
+        "WiFi"
+    ],
+    "images": [
+        "generic_s3.jpg"
+    ],
+    "mcu": "esp32s3",
+    "product": "Generic ESP32-S3 (SPIRAM Octal)",
+    "thumbnail": "",
+    "url": "https://www.espressif.com/en/products/modules",
+    "vendor": "Espressif"
+}
diff --git a/ports/esp32/boards/GENERIC_S3_SPIRAM_OCT/mpconfigboard.cmake b/ports/esp32/boards/GENERIC_S3_SPIRAM_OCT/mpconfigboard.cmake
new file mode 100644
index 0000000000000..7a767c49d403f
--- /dev/null
+++ b/ports/esp32/boards/GENERIC_S3_SPIRAM_OCT/mpconfigboard.cmake
@@ -0,0 +1,11 @@
+set(IDF_TARGET esp32s3)
+
+set(SDKCONFIG_DEFAULTS
+    boards/sdkconfig.base
+    boards/sdkconfig.usb
+    boards/sdkconfig.ble
+    boards/sdkconfig.240mhz
+    boards/sdkconfig.spiram_sx
+    boards/sdkconfig.spiram_oct
+    boards/GENERIC_S3_SPIRAM_OCT/sdkconfig.board
+)
diff --git a/ports/esp32/boards/GENERIC_S3_SPIRAM_OCT/mpconfigboard.h b/ports/esp32/boards/GENERIC_S3_SPIRAM_OCT/mpconfigboard.h
new file mode 100644
index 0000000000000..88f6835c94201
--- /dev/null
+++ b/ports/esp32/boards/GENERIC_S3_SPIRAM_OCT/mpconfigboard.h
@@ -0,0 +1,10 @@
+#define MICROPY_HW_BOARD_NAME               "ESP32S3 module (spiram octal)"
+#define MICROPY_HW_MCU_NAME                 "ESP32S3"
+
+#define MICROPY_PY_MACHINE_DAC              (0)
+
+// Enable UART REPL for modules that have an external USB-UART and don't use native USB.
+#define MICROPY_HW_ENABLE_UART_REPL         (1)
+
+#define MICROPY_HW_I2C0_SCL                 (9)
+#define MICROPY_HW_I2C0_SDA                 (8)
diff --git a/ports/esp32/boards/GENERIC_S3_SPIRAM_OCT/sdkconfig.board b/ports/esp32/boards/GENERIC_S3_SPIRAM_OCT/sdkconfig.board
new file mode 100644
index 0000000000000..c9726d4232ed4
--- /dev/null
+++ b/ports/esp32/boards/GENERIC_S3_SPIRAM_OCT/sdkconfig.board
@@ -0,0 +1,12 @@
+CONFIG_FLASHMODE_QIO=y
+CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
+CONFIG_ESPTOOLPY_FLASHSIZE_DETECT=y
+CONFIG_ESPTOOLPY_AFTER_NORESET=y
+
+CONFIG_SPIRAM_MEMTEST=
+
+CONFIG_ESPTOOLPY_FLASHSIZE_4MB=
+CONFIG_ESPTOOLPY_FLASHSIZE_8MB=y
+CONFIG_ESPTOOLPY_FLASHSIZE_16MB=
+CONFIG_PARTITION_TABLE_CUSTOM=y
+CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions-8MiB.csv"
diff --git a/ports/esp32/boards/sdkconfig.spiram_oct b/ports/esp32/boards/sdkconfig.spiram_oct
new file mode 100644
index 0000000000000..aaea64fcd5c08
--- /dev/null
+++ b/ports/esp32/boards/sdkconfig.spiram_oct
@@ -0,0 +1,3 @@
+# MicroPython on ESP32-S2 and ESP32-PAD1_subscript_3, ESP IDF configuration with SPIRAM support in Octal mode
+CONFIG_SPIRAM_MODE_QUAD=
+CONFIG_SPIRAM_MODE_OCT=y

From 3b285326e3ae7d986489b974420f0d438769de40 Mon Sep 17 00:00:00 2001
From: David Lechner <david@pybricks.com>
Date: Sun, 18 Dec 2022 20:17:30 -0600
Subject: [PATCH 2978/3533] github/workflows: Update existing comments for
 code_size_comment.

This modifies the automated code size comment to edit an existing comment
if one already exists instead of always creating a new comment.  This
reduces noise on pull requests that are repeatedly updated.

Signed-off-by: David Lechner <david@pybricks.com>
---
 .github/workflows/code_size_comment.yml | 44 +++++++++++++++++++++----
 1 file changed, 37 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/code_size_comment.yml b/.github/workflows/code_size_comment.yml
index 6ef6e633dfc74..8baf76a47a7f6 100644
--- a/.github/workflows/code_size_comment.yml
+++ b/.github/workflows/code_size_comment.yml
@@ -62,14 +62,44 @@ jobs:
           script: |
             const fs = require('fs');
 
-            github.rest.issues.createComment({
-              issue_number: Number(fs.readFileSync('pr_number')),
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              body: `Code size report:
+            const prNumber = Number(fs.readFileSync('pr_number'));
+            const codeSizeReport = `Code size report:
 
             \`\`\`
             ${fs.readFileSync('diff')}
             \`\`\`
-            `,
-            });
+            `;
+
+            const comments = await github.paginate(
+              github.rest.issues.listComments,
+              {
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                issue_number: prNumber,
+              }
+            );
+
+            comments.reverse();
+
+            const previousComment = comments.find(comment =>
+              comment.user.login === 'github-actions[bot]'
+            )
+
+            // if github-actions[bot] already made a comment, update it,
+            // otherwise create a new comment.
+
+            if (previousComment) {
+              await github.rest.issues.updateComment({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                comment_id: previousComment.id,
+                body: codeSizeReport,
+              });
+            } else {
+              await github.rest.issues.createComment({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                issue_number: prNumber,
+                body: codeSizeReport,
+              });
+            }

From 57bb1e0474a4a5bd6d72c063a8acfc96a8b1bbef Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Fri, 16 Dec 2022 11:15:17 +0100
Subject: [PATCH 2979/3533] tools/autobuild: Create .uf2 file for
 seeed_xiao_nrf52.

And for all other nrf boards that have or get a uf2 build tag.
---
 tools/autobuild/build-boards.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/autobuild/build-boards.sh b/tools/autobuild/build-boards.sh
index 48c7b81841aa6..0a0e127f2eb81 100755
--- a/tools/autobuild/build-boards.sh
+++ b/tools/autobuild/build-boards.sh
@@ -99,7 +99,7 @@ function build_mimxrt_boards {
 }
 
 function build_nrf_boards {
-    build_boards nrfx_glue.h $1 $2 bin hex
+    build_boards nrfx_glue.h $1 $2 bin hex uf2
 }
 
 function build_renesas_ra_boards {

From 439298be154df4e83da717a407d4fb3bb3ec33ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20D=C3=B6rre?= <felix@dogcraft.de>
Date: Tue, 27 Sep 2022 09:37:34 +0000
Subject: [PATCH 2980/3533] rp2: Fix lightsleep to work with interrupts and
 cyw43 driver.

This commit prevents the device from "hanging" when using lightsleep while
the WiFi chip is active.

Whenever the WiFi chip wants to interrupt the microcontroller to notify it
for a new package, it sets the CYW43_PIN_WL_HOST_WAKE pin to high,
triggering an IRQ.  However, as polling the chip cannot happen in an
interrupt handler, it subsequently notifies the pendsv-service to do a poll
as soon as the interrupt handler ended.  In order to prevent a new
interrupt from happening immediately afterwards, even before the poll has
run, the IRQ handler disables interrupts from the pin.

The first problem occurs, when a WiFi package arrives while the main loop
is in cyw43-code.  In order to prevent concurrent access of the hardware,
the network code blocks pendsv from running again while entering lwIP code.

The same holds for direct cyw43 code (like changing the cyw43-gpios, i.e.
the LED on the Pico W).  While the pendsv is disabled, interrupts can still
occur to schedule a poll (and disable further interrupts), but it will not
run.  This can happen while the microcontroller is anywhere in rp2040 code.

In order to preserve power while waiting for cyw43 responses,
cyw43_configport.h defines CYW43_DO_IOCTL_WAIT and
CYW43_SDPCM_SEND_COMMON_WAIT to __WFI().  While this might work in most
cases, there are 2 edge cases where it fails:
- When an interrupt has already been received by the cyw43 stack, for
  example due to an incoming ethernet packet.
- When the interrupt from the cyw43 response comes before the
  microcontroller entered the __WFI() instruction.

When that happens, wfi will just block forever as no further interrupts are
received.  The only way to safely use wfi to wake up from an interrupt is
inside a critical section, as this delays interrupts until the wfi is
entered, possibly resuming immediately until interrupts are reenabled and
the interrupt handler is run.  Additionally this critical section needs to
check whether the interrupt has already been disabled and pendsv was
triggered, as in such a case, wfi can never be woken up, and needs to be
skipped, because there is already a package from the network chip waiting.
Note that this turns cyw43_yield into a nop (and thereby the cyw43-loops
into busy waits) from the second time onwards, as after the first call, a
pendsv request will definitely be pending.  More logic could be added, to
explicitly enable the interrupt in this case.

Regarding lightsleep, this code has a similar problem.  When an interrupt
occurs during lightsleep, the IRQ and pendsv handler and thereby poll are
run immediately, with the clocks still disabled, causing the SPI transfers
to fail.  If we don't want to add complex logic inside the IRQ handler we
need to protect the whole lightsleep procedure form interrupts with a
critical section, exiting out early if an interrupt is pending for whatever
reason.  Only then we can start to shut down clocks and only enable
interrupts when the system is ready again.  Other interrupt handlers might
also be happy, that they are only run when the system is fully operational.

Tested on a Pico W, calling machine.lightsleep() within an endless loop and
pinging from the outside.
---
 ports/rp2/cyw43_configport.h | 15 ++++++++++++---
 ports/rp2/modmachine.c       | 14 ++++++++++++++
 ports/rp2/mpnetworkport.c    |  3 +++
 3 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/ports/rp2/cyw43_configport.h b/ports/rp2/cyw43_configport.h
index 848fb9dbf715e..b5a22e6354741 100644
--- a/ports/rp2/cyw43_configport.h
+++ b/ports/rp2/cyw43_configport.h
@@ -49,12 +49,12 @@
 
 #define CYW43_SDPCM_SEND_COMMON_WAIT \
     if (get_core_num() == 0) { \
-        __WFI(); \
+        cyw43_yield(); \
     } \
 
 #define CYW43_DO_IOCTL_WAIT \
     if (get_core_num() == 0) { \
-        __WFI(); \
+        cyw43_yield(); \
     } \
 
 #define CYW43_ARRAY_SIZE(a)             MP_ARRAY_SIZE(a)
@@ -88,6 +88,15 @@
 #define cyw43_schedule_internal_poll_dispatch(func) pendsv_schedule_dispatch(PENDSV_DISPATCH_CYW43, func)
 
 void cyw43_post_poll_hook(void);
+extern volatile int cyw43_has_pending;
+
+static inline void cyw43_yield(void) {
+    uint32_t my_interrupts = save_and_disable_interrupts();
+    if (!cyw43_has_pending) {
+        __WFI();
+    }
+    restore_interrupts(my_interrupts);
+}
 
 static inline void cyw43_delay_us(uint32_t us) {
     uint32_t start = mp_hal_ticks_us();
@@ -99,7 +108,7 @@ static inline void cyw43_delay_ms(uint32_t ms) {
     uint32_t us = ms * 1000;
     int32_t start = mp_hal_ticks_us();
     while (mp_hal_ticks_us() - start < us) {
-        __WFI();
+        cyw43_yield();
         MICROPY_EVENT_POLL_HOOK_FAST;
     }
 }
diff --git a/ports/rp2/modmachine.c b/ports/rp2/modmachine.c
index fc3f706a18ed1..81154c94cecad 100644
--- a/ports/rp2/modmachine.c
+++ b/ports/rp2/modmachine.c
@@ -48,6 +48,9 @@
 #include "pico/bootrom.h"
 #include "pico/stdlib.h"
 #include "pico/unique_id.h"
+#if MICROPY_PY_NETWORK_CYW43
+#include "lib/cyw43-driver/src/cyw43.h"
+#endif
 
 #if MICROPY_PY_MACHINE
 
@@ -141,6 +144,13 @@ STATIC mp_obj_t machine_lightsleep(size_t n_args, const mp_obj_t *args) {
 
     const uint32_t xosc_hz = XOSC_MHZ * 1000000;
 
+    uint32_t my_interrupts = save_and_disable_interrupts();
+    #if MICROPY_PY_NETWORK_CYW43
+    if (cyw43_has_pending) {
+        restore_interrupts(my_interrupts);
+        return mp_const_none;
+    }
+    #endif
     // Disable USB and ADC clocks.
     clock_stop(clk_usb);
     clock_stop(clk_adc);
@@ -165,6 +175,9 @@ STATIC mp_obj_t machine_lightsleep(size_t n_args, const mp_obj_t *args) {
     rosc_hw->ctrl = ROSC_CTRL_ENABLE_VALUE_DISABLE << ROSC_CTRL_ENABLE_LSB;
 
     if (n_args == 0) {
+        #if MICROPY_PY_NETWORK_CYW43
+        gpio_set_dormant_irq_enabled(CYW43_PIN_WL_HOST_WAKE, GPIO_IRQ_LEVEL_HIGH, true);
+        #endif
         xosc_dormant();
     } else {
         uint32_t sleep_en0 = clocks_hw->sleep_en0;
@@ -190,6 +203,7 @@ STATIC mp_obj_t machine_lightsleep(size_t n_args, const mp_obj_t *args) {
 
     // Bring back all clocks.
     clocks_init();
+    restore_interrupts(my_interrupts);
 
     return mp_const_none;
 }
diff --git a/ports/rp2/mpnetworkport.c b/ports/rp2/mpnetworkport.c
index 0cd6eb14ceb3e..96cd16af0f594 100644
--- a/ports/rp2/mpnetworkport.c
+++ b/ports/rp2/mpnetworkport.c
@@ -48,6 +48,7 @@ static alarm_id_t lwip_alarm_id = -1;
 #define CYW43_SHARED_IRQ_HANDLER_PRIORITY PICO_SHARED_IRQ_HANDLER_HIGHEST_ORDER_PRIORITY
 
 uint32_t cyw43_country_code = CYW43_COUNTRY_WORLDWIDE;
+volatile int cyw43_has_pending = 0;
 
 static void gpio_irq_handler(void) {
     uint32_t events = gpio_get_irq_event_mask(CYW43_PIN_WL_HOST_WAKE);
@@ -56,6 +57,7 @@ static void gpio_irq_handler(void) {
         // So disable the interrupt until this is done.  It's re-enabled again by
         // CYW43_POST_POLL_HOOK which is called at the end of cyw43_poll_func.
         gpio_set_irq_enabled(CYW43_PIN_WL_HOST_WAKE, CYW43_IRQ_LEVEL, false);
+        cyw43_has_pending = 1;
         pendsv_schedule_dispatch(PENDSV_DISPATCH_CYW43, cyw43_poll);
         CYW43_STAT_INC(IRQ_COUNT);
     }
@@ -68,6 +70,7 @@ void cyw43_irq_init(void) {
 }
 
 void cyw43_post_poll_hook(void) {
+    cyw43_has_pending = 0;
     gpio_set_irq_enabled(CYW43_PIN_WL_HOST_WAKE, CYW43_IRQ_LEVEL, true);
 }
 

From b151422cb2066a475329002c7a529df6cf220ba0 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 19 Dec 2022 23:46:49 +1100
Subject: [PATCH 2981/3533] lib/cyw43-driver: Update driver to latest version.

Changes since the previous version:
- remove mDNS
- implement lwIP IGMP MAC filter callback
- implement IPv6 support
- allow building with IGMP disabled
- fix handshake meggase WAIT_G1 event value
- increase EAPOL timeout from 2500ms to 500ms
- add function to get RSSI
- fix handling of open security networks
- remove support for automatically setting auth type

Signed-off-by: Damien George <damien@micropython.org>
---
 lib/cyw43-driver | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/cyw43-driver b/lib/cyw43-driver
index 2ab6ca93f9cd0..2cf328d9e4160 160000
--- a/lib/cyw43-driver
+++ b/lib/cyw43-driver
@@ -1 +1 @@
-Subproject commit 2ab6ca93f9cd044bc6f35c1403b1284e4161294a
+Subproject commit 2cf328d9e41603405a037a29e081a7d30dd519e6

From 699477d12d1aa1cb57ff6cfc3f5dc5e97524dbe6 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 19 Dec 2022 23:51:24 +1100
Subject: [PATCH 2982/3533] extmod/network_cyw43: Fix handling of networks with
 open security.

Prior to this commit, the default security=-1 would be passed directly
through to the cyw43 driver to auto-detect the security type, but that
driver did not correctly handle the case of open security.

The cyw43 driver has now been changed to no longer support auto-detection,
rather it is up to the caller to always select the security type.  The
defaults are now implemented in the Python bindings and are:
- if no key is given then it selects open security
- if a key is given then it selects WPA2_MIXED_PSK

Calling `wlan.connect(<ssid>)` will now connect to an open network, on
both rp2 and stm32 ports.  The form `wlan.connect(<ssid>, <key>)` will
connect to a WPA2 network.

Fixes issue #9016.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/network_cyw43.c | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/extmod/network_cyw43.c b/extmod/network_cyw43.c
index 87d9b9f614282..90d964a67b123 100644
--- a/extmod/network_cyw43.c
+++ b/extmod/network_cyw43.c
@@ -244,13 +244,18 @@ STATIC mp_obj_t network_cyw43_connect(size_t n_args, const mp_obj_t *pos_args, m
         args[ARG_security] = args[ARG_auth];
     }
 
+    // Extract the SSID.
     mp_buffer_info_t ssid;
     mp_get_buffer_raise(args[ARG_ssid].u_obj, &ssid, MP_BUFFER_READ);
+
+    // Extract the key, if given.
     mp_buffer_info_t key;
     key.buf = NULL;
     if (args[ARG_key].u_obj != mp_const_none) {
         mp_get_buffer_raise(args[ARG_key].u_obj, &key, MP_BUFFER_READ);
     }
+
+    // Extract the BSSID, if given.
     mp_buffer_info_t bssid;
     bssid.buf = NULL;
     if (args[ARG_bssid].u_obj != mp_const_none) {
@@ -259,8 +264,26 @@ STATIC mp_obj_t network_cyw43_connect(size_t n_args, const mp_obj_t *pos_args, m
             mp_raise_ValueError(NULL);
         }
     }
+
+    // Extract the security type, if given.
+    uint32_t auth_type;
+    if (args[ARG_security].u_int == -1) {
+        if (key.buf == NULL || key.len == 0) {
+            auth_type = 0; // open security
+        } else {
+            #if MICROPY_PY_NETWORK_CYW43_USE_LIB_DRIVER
+            auth_type = CYW43_AUTH_WPA2_MIXED_PSK;
+            #else
+            auth_type = 0x008006; // WPA2_MIXED_PSK
+            #endif
+        }
+    } else {
+        auth_type = args[ARG_security].u_int;
+    }
+
+    // Start the WiFi join procedure.  It will run in the background.
     int ret = cyw43_wifi_join(self->cyw, ssid.len, ssid.buf, key.len, key.buf,
-        args[ARG_security].u_int, bssid.buf, args[ARG_channel].u_int);
+        auth_type, bssid.buf, args[ARG_channel].u_int);
     if (ret != 0) {
         mp_raise_OSError(-ret);
     }

From f24cfd1a69df9ef1a8233c5bd57c56f701762b49 Mon Sep 17 00:00:00 2001
From: Florian Weimer <fweimer@redhat.com>
Date: Mon, 12 Dec 2022 14:16:59 +0100
Subject: [PATCH 2983/3533] extmod/axtls-include: Add back needed header files
 for building axTLS.

MicroPython overrides the axTLS port configuration file, but fails to
include <arpa/inet.h> (needed for htonl) and <sys/time.h> (needed for
gettimeofday).  This results in build failures with compilers which do not
support implicit function declarations (which were removed from C in 1999).

This commit adds back the needed headers that were removed in this commit:
https://github.com/micropython/axtls/commit/bd0801730969a290572c72b8c65e53f160ed2680

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/axtls-include/axtls_os_port.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/extmod/axtls-include/axtls_os_port.h b/extmod/axtls-include/axtls_os_port.h
index ef2683acfc701..057642f9741b7 100644
--- a/extmod/axtls-include/axtls_os_port.h
+++ b/extmod/axtls-include/axtls_os_port.h
@@ -26,7 +26,11 @@
 #ifndef AXTLS_OS_PORT_H
 #define AXTLS_OS_PORT_H
 
+#ifndef __ets__
+#include <arpa/inet.h>
+#endif
 #include <errno.h>
+#include <sys/time.h>
 #include "py/stream.h"
 #include "lib/crypto-algorithms/sha256.h"
 

From b5823604a005de9232b482ce8f820735e8f69106 Mon Sep 17 00:00:00 2001
From: Paul Grayson <pdg@alum.mit.edu>
Date: Wed, 23 Nov 2022 12:01:37 -0800
Subject: [PATCH 2984/3533] rp2/machine_pwm: Use more accurate formulas for
 freq and duty_u16.

This changes the freq() and duty_u16() functions to use more simpler, more
accurate formulas, in particular increasing the frequency accuracy from a
few percent to a fraction of a percent in many cases.

Signed-off-by: Paul Grayson <pdg@alum.mit.edu>
---
 ports/rp2/machine_pwm.c | 50 +++++++++++++++++++++++------------------
 1 file changed, 28 insertions(+), 22 deletions(-)

diff --git a/ports/rp2/machine_pwm.c b/ports/rp2/machine_pwm.c
index 41dc3ab4761e5..1b70746a7392f 100644
--- a/ports/rp2/machine_pwm.c
+++ b/ports/rp2/machine_pwm.c
@@ -113,30 +113,31 @@ STATIC void mp_machine_pwm_freq_set(machine_pwm_obj_t *self, mp_int_t freq) {
     // Maximum "top" is set at 65534 to be able to achieve 100% duty with 65535.
     #define TOP_MAX 65534
     uint32_t source_hz = clock_get_hz(clk_sys);
-    uint32_t div16_top = 16 * source_hz / freq;
-    uint32_t top = 1;
-    for (;;) {
-        // Try a few small prime factors to get close to the desired frequency.
-        if (div16_top >= 16 * 5 && div16_top % 5 == 0 && top * 5 <= TOP_MAX) {
-            div16_top /= 5;
-            top *= 5;
-        } else if (div16_top >= 16 * 3 && div16_top % 3 == 0 && top * 3 <= TOP_MAX) {
-            div16_top /= 3;
-            top *= 3;
-        } else if (div16_top >= 16 * 2 && top * 2 <= TOP_MAX) {
-            div16_top /= 2;
-            top *= 2;
-        } else {
-            break;
-        }
+    uint32_t div16;
+
+    if ((source_hz + freq / 2) / freq < TOP_MAX) {
+        // If possible (based on the formula for TOP below), use a DIV of 1.
+        // This also prevents overflow in the DIV calculation.
+        div16 = 16;
+    } else {
+        // Otherwise, choose the smallest possible DIV for maximum
+        // duty cycle resolution.
+        // Constraint: 16*F/(div16*freq) < TOP_MAX
+        // So: div16 = ceil(16*F/(TOP_MAX*freq))
+
+        div16 = (16 * source_hz + TOP_MAX * freq - 1) / (TOP_MAX * freq);
     }
-    if (div16_top < 16) {
+
+    // Set TOP as accurately as possible using rounding.
+    uint32_t top = (16 * source_hz + div16 * freq / 2) / (div16 * freq) - 1;
+
+    if (div16 < 16) {
         mp_raise_ValueError(MP_ERROR_TEXT("freq too large"));
-    } else if (div16_top >= 256 * 16) {
+    } else if (div16 >= 256 * 16) {
         mp_raise_ValueError(MP_ERROR_TEXT("freq too small"));
     }
-    pwm_hw->slice[self->slice].div = div16_top;
-    pwm_hw->slice[self->slice].top = top - 1;
+    pwm_hw->slice[self->slice].div = div16;
+    pwm_hw->slice[self->slice].top = top;
     if (self->duty_type == DUTY_U16) {
         mp_machine_pwm_duty_set_u16(self, self->duty);
     } else if (self->duty_type == DUTY_NS) {
@@ -148,12 +149,17 @@ STATIC mp_obj_t mp_machine_pwm_duty_get_u16(machine_pwm_obj_t *self) {
     uint32_t top = pwm_hw->slice[self->slice].top;
     uint32_t cc = pwm_hw->slice[self->slice].cc;
     cc = (cc >> (self->channel ? PWM_CH0_CC_B_LSB : PWM_CH0_CC_A_LSB)) & 0xffff;
-    return MP_OBJ_NEW_SMALL_INT(cc * 65535 / (top + 1));
+
+    // Use rounding (instead of flooring) here to give as accurate an
+    // estimate as possible.
+    return MP_OBJ_NEW_SMALL_INT((cc * 65535 + (top + 1) / 2) / (top + 1));
 }
 
 STATIC void mp_machine_pwm_duty_set_u16(machine_pwm_obj_t *self, mp_int_t duty_u16) {
     uint32_t top = pwm_hw->slice[self->slice].top;
-    uint32_t cc = duty_u16 * (top + 1) / 65535;
+
+    // Use rounding here to set it as accurately as possible.
+    uint32_t cc = (duty_u16 * (top + 1) + 65535 / 2) / 65535;
     pwm_set_chan_level(self->slice, self->channel, cc);
     pwm_set_enabled(self->slice, true);
     self->duty = duty_u16;

From f0f5c6568de8a194f4f77c19f4e2087b87d1ab7e Mon Sep 17 00:00:00 2001
From: Paul Grayson <pdg@alum.mit.edu>
Date: Wed, 14 Dec 2022 19:19:21 -0800
Subject: [PATCH 2985/3533] rp2/machine_pwm: Fix overflows with freq > 268 MHz.

There were several places where 32-bit integer could overflow with
frequencies of 2^28 Hz or above (~268 MHz).  This fixes those overflows and
also introduces rounding for more accurate duty_ns computations.

Signed-off-by: Paul Grayson <pdg@alum.mit.edu>
---
 ports/rp2/machine_pwm.c | 49 +++++++++++++++++++++++++++++++----------
 1 file changed, 37 insertions(+), 12 deletions(-)

diff --git a/ports/rp2/machine_pwm.c b/ports/rp2/machine_pwm.c
index 1b70746a7392f..0c840eca94360 100644
--- a/ports/rp2/machine_pwm.c
+++ b/ports/rp2/machine_pwm.c
@@ -100,11 +100,33 @@ STATIC void mp_machine_pwm_deinit(machine_pwm_obj_t *self) {
     pwm_set_enabled(self->slice, false);
 }
 
-STATIC mp_obj_t mp_machine_pwm_freq_get(machine_pwm_obj_t *self) {
+// Returns: floor((16*F + offset) / div16)
+// Avoids overflow in the numerator that would occur if
+//   16*F + offset > 2**32
+//   F + offset/16 > 2**28 = 268435456 (approximately, due to flooring)
+uint32_t get_slice_hz(uint32_t offset, uint32_t div16) {
     uint32_t source_hz = clock_get_hz(clk_sys);
+    if (source_hz + offset / 16 > 268000000) {
+        return (16 * (uint64_t)source_hz + offset) / div16;
+    } else {
+        return (16 * source_hz + offset) / div16;
+    }
+}
+
+// Returns 16*F / denom, rounded.
+uint32_t get_slice_hz_round(uint32_t div16) {
+    return get_slice_hz(div16 / 2, div16);
+}
+
+// Returns ceil(16*F / denom).
+uint32_t get_slice_hz_ceil(uint32_t div16) {
+    return get_slice_hz(div16 - 1, div16);
+}
+
+STATIC mp_obj_t mp_machine_pwm_freq_get(machine_pwm_obj_t *self) {
     uint32_t div16 = pwm_hw->slice[self->slice].div;
     uint32_t top = pwm_hw->slice[self->slice].top;
-    uint32_t pwm_freq = 16 * source_hz / div16 / (top + 1);
+    uint32_t pwm_freq = get_slice_hz_round(div16 * (top + 1));
     return MP_OBJ_NEW_SMALL_INT(pwm_freq);
 }
 
@@ -114,22 +136,27 @@ STATIC void mp_machine_pwm_freq_set(machine_pwm_obj_t *self, mp_int_t freq) {
     #define TOP_MAX 65534
     uint32_t source_hz = clock_get_hz(clk_sys);
     uint32_t div16;
+    uint32_t top;
 
     if ((source_hz + freq / 2) / freq < TOP_MAX) {
         // If possible (based on the formula for TOP below), use a DIV of 1.
         // This also prevents overflow in the DIV calculation.
         div16 = 16;
+
+        // Same as get_slice_hz_round() below but canceling the 16s
+        // to avoid overflow for high freq.
+        top = (source_hz + freq / 2) / freq - 1;
     } else {
         // Otherwise, choose the smallest possible DIV for maximum
         // duty cycle resolution.
         // Constraint: 16*F/(div16*freq) < TOP_MAX
-        // So: div16 = ceil(16*F/(TOP_MAX*freq))
+        // So:
+        div16 = get_slice_hz_ceil(TOP_MAX * freq);
 
-        div16 = (16 * source_hz + TOP_MAX * freq - 1) / (TOP_MAX * freq);
+        // Set TOP as accurately as possible using rounding.
+        top = get_slice_hz_round(div16 * freq) - 1;
     }
 
-    // Set TOP as accurately as possible using rounding.
-    uint32_t top = (16 * source_hz + div16 * freq / 2) / (div16 * freq) - 1;
 
     if (div16 < 16) {
         mp_raise_ValueError(MP_ERROR_TEXT("freq too large"));
@@ -167,17 +194,15 @@ STATIC void mp_machine_pwm_duty_set_u16(machine_pwm_obj_t *self, mp_int_t duty_u
 }
 
 STATIC mp_obj_t mp_machine_pwm_duty_get_ns(machine_pwm_obj_t *self) {
-    uint32_t source_hz = clock_get_hz(clk_sys);
-    uint32_t slice_hz = 16 * source_hz / pwm_hw->slice[self->slice].div;
+    uint32_t slice_hz = get_slice_hz_round(pwm_hw->slice[self->slice].div);
     uint32_t cc = pwm_hw->slice[self->slice].cc;
     cc = (cc >> (self->channel ? PWM_CH0_CC_B_LSB : PWM_CH0_CC_A_LSB)) & 0xffff;
-    return MP_OBJ_NEW_SMALL_INT((uint64_t)cc * 1000000000ULL / slice_hz);
+    return MP_OBJ_NEW_SMALL_INT(((uint64_t)cc * 1000000000ULL + slice_hz / 2) / slice_hz);
 }
 
 STATIC void mp_machine_pwm_duty_set_ns(machine_pwm_obj_t *self, mp_int_t duty_ns) {
-    uint32_t source_hz = clock_get_hz(clk_sys);
-    uint32_t slice_hz = 16 * source_hz / pwm_hw->slice[self->slice].div;
-    uint32_t cc = (uint64_t)duty_ns * slice_hz / 1000000000ULL;
+    uint32_t slice_hz = get_slice_hz_round(pwm_hw->slice[self->slice].div);
+    uint32_t cc = ((uint64_t)duty_ns * slice_hz + 500000000ULL) / 1000000000ULL;
     if (cc > 65535) {
         mp_raise_ValueError(MP_ERROR_TEXT("duty larger than period"));
     }

From b208cf23e290c169bf346137c30bc2a0176a223d Mon Sep 17 00:00:00 2001
From: Paul Grayson <pdg@alum.mit.edu>
Date: Sat, 24 Dec 2022 09:55:12 -0800
Subject: [PATCH 2986/3533] rp2/mphalport: Change order of pin operations to
 prevent glitches.

When switching from a special function like SPI to an input or output,
there was a brief period after the function was disabled but before the
pin's I/O state was configured, in which the state would be poorly defined.
This fixes the problem by switching off the special function after fully
configuring the I/O state.

Fixes #10226.

Signed-off-by: Paul Grayson <pdg@alum.mit.edu>
---
 ports/rp2/mphalport.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ports/rp2/mphalport.h b/ports/rp2/mphalport.h
index 73a503f5a9a0c..2cb9121fa2ade 100644
--- a/ports/rp2/mphalport.h
+++ b/ports/rp2/mphalport.h
@@ -91,22 +91,22 @@ static inline unsigned int mp_hal_pin_name(mp_hal_pin_obj_t pin) {
 }
 
 static inline void mp_hal_pin_input(mp_hal_pin_obj_t pin) {
-    gpio_set_function(pin, GPIO_FUNC_SIO);
     gpio_set_dir(pin, GPIO_IN);
     machine_pin_open_drain_mask &= ~(1 << pin);
+    gpio_set_function(pin, GPIO_FUNC_SIO);
 }
 
 static inline void mp_hal_pin_output(mp_hal_pin_obj_t pin) {
-    gpio_set_function(pin, GPIO_FUNC_SIO);
     gpio_set_dir(pin, GPIO_OUT);
     machine_pin_open_drain_mask &= ~(1 << pin);
+    gpio_set_function(pin, GPIO_FUNC_SIO);
 }
 
 static inline void mp_hal_pin_open_drain(mp_hal_pin_obj_t pin) {
-    gpio_set_function(pin, GPIO_FUNC_SIO);
     gpio_set_dir(pin, GPIO_IN);
     gpio_put(pin, 0);
     machine_pin_open_drain_mask |= 1 << pin;
+    gpio_set_function(pin, GPIO_FUNC_SIO);
 }
 
 static inline void mp_hal_pin_config(mp_hal_pin_obj_t pin, uint32_t mode, uint32_t pull, uint32_t alt) {

From 5890a17ae049aad39f97744cadf5844c06a5a4c0 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Fri, 6 Jan 2023 11:36:18 +0100
Subject: [PATCH 2987/3533] rp2/rp2_flash: Call MICROPY_EVENT_POLL_HOOK_FAST
 after reading flash.

To allow the USB to work in cases where there is a lot of filesystem
access, in particular on boot.

For example, registering of the USB CDC interface may fail if:
- the board file system is lfs2 (default), and
- sys.path contains entries for the local file system (default), and
- files are imported by boot.py or main.py from frozen bytecode of the file
  system (common) and the file system contains many files, like 100.

In that case the board is very busy with scanning LFS, and registering the
USB interface seems to time out.  This commit fixes this by allowing the
USB to make progress during filesystem reads.

Also switch existing MICROPY_EVENT_POLL_HOOK uses in this file to
MICROPY_EVENT_POLL_HOOK_FAST now that the latter macro exists.
---
 ports/rp2/rp2_flash.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/ports/rp2/rp2_flash.c b/ports/rp2/rp2_flash.c
index 0a94b6cc9065e..26ec41949e9d8 100644
--- a/ports/rp2/rp2_flash.c
+++ b/ports/rp2/rp2_flash.c
@@ -120,6 +120,11 @@ STATIC mp_obj_t rp2_flash_readblocks(size_t n_args, const mp_obj_t *args) {
         offset += mp_obj_get_int(args[3]);
     }
     memcpy(bufinfo.buf, (void *)(XIP_BASE + self->flash_base + offset), bufinfo.len);
+    // MICROPY_EVENT_POLL_HOOK_FAST is called here to avoid a fail in registering
+    // USB at boot time, if the board is busy loading files or scanning the file
+    // system. MICROPY_EVENT_POLL_HOOK_FAST calls tud_task(). As the alternative
+    // tud_task() should be called in the USB IRQ. See discussion in PR #10423.
+    MICROPY_EVENT_POLL_HOOK_FAST;
     return mp_const_none;
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(rp2_flash_readblocks_obj, 3, 4, rp2_flash_readblocks);
@@ -134,7 +139,7 @@ STATIC mp_obj_t rp2_flash_writeblocks(size_t n_args, const mp_obj_t *args) {
         mp_uint_t atomic_state = MICROPY_BEGIN_ATOMIC_SECTION();
         flash_range_erase(self->flash_base + offset, bufinfo.len);
         MICROPY_END_ATOMIC_SECTION(atomic_state);
-        MICROPY_EVENT_POLL_HOOK
+        MICROPY_EVENT_POLL_HOOK_FAST;
         // TODO check return value
     } else {
         offset += mp_obj_get_int(args[3]);
@@ -143,7 +148,7 @@ STATIC mp_obj_t rp2_flash_writeblocks(size_t n_args, const mp_obj_t *args) {
     mp_uint_t atomic_state = MICROPY_BEGIN_ATOMIC_SECTION();
     flash_range_program(self->flash_base + offset, bufinfo.buf, bufinfo.len);
     MICROPY_END_ATOMIC_SECTION(atomic_state);
-    MICROPY_EVENT_POLL_HOOK
+    MICROPY_EVENT_POLL_HOOK_FAST;
     // TODO check return value
     return mp_const_none;
 }

From 209a6bb6b7b39882e0efdf25eab29931fb2de859 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stig=20Bj=C3=B8rlykke?= <stig@bjorlykke.org>
Date: Thu, 15 Dec 2022 18:32:10 +0100
Subject: [PATCH 2988/3533] docs/rp2: Make LED have exactly 50% duty cycle in
 PIO 1Hz example.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This ensures the same number of cycles are used for LED on and LED off in
the PIO 1Hz example.  It's also possible to swap the first set() and the
irq() to avoid using an extra instruction, but this tutorial is a good
example of how to calculate the cycles.

Signed-off-by: Stig Bjørlykke <stig@bjorlykke.org>
---
 docs/rp2/tutorial/pio.rst | 7 +++++--
 examples/rp2/pio_1hz.py   | 5 +++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/docs/rp2/tutorial/pio.rst b/docs/rp2/tutorial/pio.rst
index 9981aed832e7e..4e519650eea6d 100644
--- a/docs/rp2/tutorial/pio.rst
+++ b/docs/rp2/tutorial/pio.rst
@@ -76,9 +76,10 @@ and state machines. Below is the code for reference.
         nop()                       [29]
         jmp(x_dec, "delay_high")
 
-        # Cycles: 1 + 7 + 32 * (30 + 1) = 1000
+        # Cycles: 1 + 1 + 6 + 32 * (30 + 1) = 1000
+        nop()
         set(pins, 0)
-        set(x, 31)                  [6]
+        set(x, 31)                  [5]
         label("delay_low")
         nop()                       [29]
         jmp(x_dec, "delay_low")
@@ -113,6 +114,8 @@ the following:
   X starts with the value 31 this jump will happen 31 times, so the ``nop() [29]``
   runs 32 times in total (note there is also one instruction cycle taken by the
   ``jmp`` for each of these 32 loops).
+- The single ``nop()`` correlates with the cycle used for IRQ raise, and ensures
+  the same number of cycles are used for LED on and LED off.
 - ``set(pins, 0)`` will turn the LED off by setting pin 25 low.
 - Another 32 loops of ``nop() [29]`` and ``jmp(...)`` will execute.
 - Because ``wrap_target()`` and ``wrap()`` are not specified, their default will
diff --git a/examples/rp2/pio_1hz.py b/examples/rp2/pio_1hz.py
index c18aa22fc0ece..4b6fe95bbdcf3 100644
--- a/examples/rp2/pio_1hz.py
+++ b/examples/rp2/pio_1hz.py
@@ -16,9 +16,10 @@ def blink_1hz():
     nop()                       [29]
     jmp(x_dec, "delay_high")
 
-    # Cycles: 1 + 7 + 32 * (30 + 1) = 1000
+    # Cycles: 1 + 1 + 6 + 32 * (30 + 1) = 1000
+    nop()
     set(pins, 0)
-    set(x, 31)                  [6]
+    set(x, 31)                  [5]
     label("delay_low")
     nop()                       [29]
     jmp(x_dec, "delay_low")

From a322ebafc0427f03e1423cf7642b1e6ded5a90a8 Mon Sep 17 00:00:00 2001
From: Paul Warren <pdw@ex-parrot.com>
Date: Wed, 11 Jan 2023 14:08:08 +0000
Subject: [PATCH 2989/3533] docs/library/rp2.StateMachine: Expand put()
 documentation.

Document that put() can also accept arrays/bytearrays as values.

Fixes issue #10465.

Signed-off-by: Paul Warren <pdw@ex-parrot.com>
---
 docs/library/rp2.StateMachine.rst | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/docs/library/rp2.StateMachine.rst b/docs/library/rp2.StateMachine.rst
index 7e38ba8b1a754..d39194e6ffbec 100644
--- a/docs/library/rp2.StateMachine.rst
+++ b/docs/library/rp2.StateMachine.rst
@@ -99,13 +99,17 @@ Methods
 
 .. method:: StateMachine.put(value, shift=0)
 
-    Push a word onto the state machine's TX FIFO.
+    Push words onto the state machine's TX FIFO.
 
-    If the FIFO is full, it blocks until there is space (i.e. the state machine
-    pulls a word).
+    *value* can be an integer, an array of type ``B``, ``H`` or ``I``, or a
+    `bytearray`.
 
-    The value is first shifted left by *shift* bits, i.e. the state machine
-    receives ``value << shift``.
+    This method will block until all words have been written to the FIFO.  If
+    the FIFO is, or becomes, full, the method will block until the state machine
+    pulls enough words to complete the write.
+
+    Each word is first shifted left by *shift* bits, i.e. the state machine
+    receives ``word << shift``.
 
 .. method:: StateMachine.rx_fifo()
 

From edc92d18db3e80c95ee565075fbe81f5b79d7df1 Mon Sep 17 00:00:00 2001
From: Philip Peitsch <philip.peitsch@gmail.com>
Date: Tue, 9 Jun 2020 12:34:58 +1000
Subject: [PATCH 2990/3533] py/map: Clear value when re-using slot with ordered
 dictionaries.

To adhere to the contract of mp_map_lookup, namely:

    MP_MAP_LOOKUP_ADD_IF_NOT_FOUND behaviour:
    - returns slot, with key non-null and value=MP_OBJ_NULL if it was added
---
 py/map.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/py/map.c b/py/map.c
index 7a6f2233e6000..c18df5a9f333c 100644
--- a/py/map.c
+++ b/py/map.c
@@ -221,6 +221,7 @@ mp_map_elem_t *MICROPY_WRAP_MP_MAP_LOOKUP(mp_map_lookup)(mp_map_t * map, mp_obj_
         }
         mp_map_elem_t *elem = map->table + map->used++;
         elem->key = index;
+        elem->value = MP_OBJ_NULL;
         if (!mp_obj_is_qstr(index)) {
             map->all_keys_are_qstrs = 0;
         }

From fa57ee971bcdffeeadf84dc608bd25dcb6af464f Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Mon, 15 Aug 2022 08:35:23 +1000
Subject: [PATCH 2991/3533] stm32/boards: Consolidate linker snippets to reduce
 duplication.

This commit uses the REGION_ALIAS GNU linker command to simplify the linker
snippets and consolidate the duplication.

Signed-off-by: Damien George <damien@micropython.org>
---
 .../boards/ARDUINO_PORTENTA_H7/stm32h747.ld   | 11 +++-----
 ports/stm32/boards/PYBD_SF2/f722_qspi.ld      | 22 ++++-----------
 ports/stm32/boards/PYBD_SF6/f767.ld           | 11 +++-----
 ports/stm32/boards/STM32F769DISC/f769_qspi.ld | 24 ++++------------
 ports/stm32/boards/common_basic.ld            | 26 +++--------------
 ports/stm32/boards/common_bl.ld               | 28 ++++---------------
 ports/stm32/boards/common_blifs.ld            | 28 ++++---------------
 .../boards/common_extratext_data_in_flash.ld  |  4 +--
 .../common_extratext_data_in_flash_app.ld     | 22 ---------------
 .../common_extratext_data_in_flash_text.ld    | 22 ---------------
 ports/stm32/boards/common_ifs.ld              | 18 +++---------
 ports/stm32/boards/common_isr.ld              |  9 ++++++
 ports/stm32/boards/common_text.ld             | 14 ++++++++++
 13 files changed, 61 insertions(+), 178 deletions(-)
 delete mode 100644 ports/stm32/boards/common_extratext_data_in_flash_app.ld
 delete mode 100644 ports/stm32/boards/common_extratext_data_in_flash_text.ld
 create mode 100644 ports/stm32/boards/common_isr.ld
 create mode 100644 ports/stm32/boards/common_text.ld

diff --git a/ports/stm32/boards/ARDUINO_PORTENTA_H7/stm32h747.ld b/ports/stm32/boards/ARDUINO_PORTENTA_H7/stm32h747.ld
index 650756a19f665..7a973289cb6bb 100644
--- a/ports/stm32/boards/ARDUINO_PORTENTA_H7/stm32h747.ld
+++ b/ports/stm32/boards/ARDUINO_PORTENTA_H7/stm32h747.ld
@@ -44,15 +44,12 @@ _micropy_hw_internal_flash_storage_ram_cache_end = ORIGIN(DTCM) + LENGTH(DTCM);
 _micropy_hw_internal_flash_storage_start = ORIGIN(FLASH_FS);
 _micropy_hw_internal_flash_storage_end = ORIGIN(FLASH_FS) + LENGTH(FLASH_FS);
 
+REGION_ALIAS("FLASH_COMMON", FLASH_TEXT);
+
 /* define output sections */
 SECTIONS
 {
-    .isr_vector :
-    {
-        . = ALIGN(4);
-        KEEP(*(.isr_vector))
-        . = ALIGN(4);
-    } >FLASH_TEXT
+    INCLUDE common_isr.ld
 
     .text :
     {
@@ -65,6 +62,6 @@ SECTIONS
         _etext = .;
     } >FLASH_TEXT
 
-    INCLUDE common_extratext_data_in_flash_text.ld
+    INCLUDE common_extratext_data_in_flash.ld
     INCLUDE common_bss_heap_stack.ld
 }
diff --git a/ports/stm32/boards/PYBD_SF2/f722_qspi.ld b/ports/stm32/boards/PYBD_SF2/f722_qspi.ld
index c9199b341bfd4..85145b22a326d 100644
--- a/ports/stm32/boards/PYBD_SF2/f722_qspi.ld
+++ b/ports/stm32/boards/PYBD_SF2/f722_qspi.ld
@@ -42,6 +42,8 @@ _heap_end = _sstack;
 
 ENTRY(Reset_Handler)
 
+REGION_ALIAS("FLASH_COMMON", FLASH_APP);
+
 /* Define output sections */
 SECTIONS
 {
@@ -56,22 +58,8 @@ SECTIONS
         . = ALIGN(4);
     } >FLASH_EXT
 
-    .isr_vector :
-    {
-        . = ALIGN(4);
-        KEEP(*(.isr_vector))
-        . = ALIGN(4);
-    } >FLASH_APP
-
-    .text :
-    {
-        . = ALIGN(4);
-        *(.text*)
-        *(.rodata*)
-        . = ALIGN(4);
-        _etext = .;
-    } >FLASH_APP
-
-    INCLUDE common_extratext_data_in_flash_app.ld
+    INCLUDE common_isr.ld
+    INCLUDE common_text.ld
+    INCLUDE common_extratext_data_in_flash.ld
     INCLUDE common_bss_heap_stack.ld
 }
diff --git a/ports/stm32/boards/PYBD_SF6/f767.ld b/ports/stm32/boards/PYBD_SF6/f767.ld
index 5866f0b5cc2d5..cbe74696e8830 100644
--- a/ports/stm32/boards/PYBD_SF6/f767.ld
+++ b/ports/stm32/boards/PYBD_SF6/f767.ld
@@ -41,15 +41,12 @@ _heap_end = _sstack;
 
 ENTRY(Reset_Handler)
 
+REGION_ALIAS("FLASH_COMMON", FLASH_APP);
+
 /* Define output sections */
 SECTIONS
 {
-    .isr_vector :
-    {
-        . = ALIGN(4);
-        KEEP(*(.isr_vector))
-        . = ALIGN(4);
-    } >FLASH_APP
+    INCLUDE common_isr.ld
 
     .text :
     {
@@ -62,6 +59,6 @@ SECTIONS
         _etext = .;
     } >FLASH_APP
 
-    INCLUDE common_extratext_data_in_flash_app.ld
+    INCLUDE common_extratext_data_in_flash.ld
     INCLUDE common_bss_heap_stack.ld
 }
diff --git a/ports/stm32/boards/STM32F769DISC/f769_qspi.ld b/ports/stm32/boards/STM32F769DISC/f769_qspi.ld
index b6957a321332c..b6515b066691c 100644
--- a/ports/stm32/boards/STM32F769DISC/f769_qspi.ld
+++ b/ports/stm32/boards/STM32F769DISC/f769_qspi.ld
@@ -40,6 +40,8 @@ _heap_end = _sstack;
 
 ENTRY(Reset_Handler)
 
+REGION_ALIAS("FLASH_COMMON", FLASH_APP);
+
 SECTIONS
 {
     /* Define the code that goes in QSPI flash */
@@ -50,24 +52,8 @@ SECTIONS
         . = ALIGN(4);
     } >FLASH_QSPI
 
-    /* The startup code goes first into main flash */
-    .isr_vector :
-    {
-        . = ALIGN(4);
-        KEEP(*(.isr_vector))
-        . = ALIGN(4);
-    } >FLASH_APP
-
-    /* The program code and other data goes into flash */
-    .text :
-    {
-        . = ALIGN(4);
-        *(.text*)
-        *(.rodata*)
-        . = ALIGN(4);
-        _etext = .;
-    } >FLASH_APP
-
-    INCLUDE common_extratext_data_in_flash_app.ld
+    INCLUDE common_isr.ld
+    INCLUDE common_text.ld
+    INCLUDE common_extratext_data_in_flash.ld
     INCLUDE common_bss_heap_stack.ld
 }
diff --git a/ports/stm32/boards/common_basic.ld b/ports/stm32/boards/common_basic.ld
index dbda1b8b68ba4..9916a4c2545d9 100644
--- a/ports/stm32/boards/common_basic.ld
+++ b/ports/stm32/boards/common_basic.ld
@@ -12,31 +12,13 @@
 
 ENTRY(Reset_Handler)
 
+REGION_ALIAS("FLASH_COMMON", FLASH);
+
 /* define output sections */
 SECTIONS
 {
-    /* The startup code goes first into FLASH */
-    .isr_vector :
-    {
-        . = ALIGN(4);
-        KEEP(*(.isr_vector)) /* Startup code */
-
-        . = ALIGN(4);
-    } >FLASH
-
-    /* The program code and other data goes into FLASH */
-    .text :
-    {
-        . = ALIGN(4);
-        *(.text*)          /* .text* sections (code) */
-        *(.rodata*)        /* .rodata* sections (constants, strings, etc.) */
-    /*  *(.glue_7)   */    /* glue arm to thumb code */
-    /*  *(.glue_7t)  */    /* glue thumb to arm code */
-
-        . = ALIGN(4);
-        _etext = .;        /* define a global symbol at end of code */
-    } >FLASH
-
+    INCLUDE common_isr.ld
+    INCLUDE common_text.ld
     INCLUDE common_extratext_data_in_flash.ld
     INCLUDE common_bss_heap_stack.ld
 }
diff --git a/ports/stm32/boards/common_bl.ld b/ports/stm32/boards/common_bl.ld
index 21d809a3d2339..b17fe98743139 100644
--- a/ports/stm32/boards/common_bl.ld
+++ b/ports/stm32/boards/common_bl.ld
@@ -12,31 +12,13 @@
 
 ENTRY(Reset_Handler)
 
+REGION_ALIAS("FLASH_COMMON", FLASH_APP);
+
 /* define output sections */
 SECTIONS
 {
-    /* The startup code goes first into FLASH */
-    .isr_vector :
-    {
-        . = ALIGN(4);
-        KEEP(*(.isr_vector)) /* Startup code */
-
-        . = ALIGN(4);
-    } >FLASH_APP
-
-    /* The program code and other data goes into FLASH */
-    .text :
-    {
-        . = ALIGN(4);
-        *(.text*)          /* .text* sections (code) */
-        *(.rodata*)        /* .rodata* sections (constants, strings, etc.) */
-    /*  *(.glue_7)   */    /* glue arm to thumb code */
-    /*  *(.glue_7t)  */    /* glue thumb to arm code */
-
-        . = ALIGN(4);
-        _etext = .;        /* define a global symbol at end of code */
-    } >FLASH_APP
-
-    INCLUDE common_extratext_data_in_flash_app.ld
+    INCLUDE common_isr.ld
+    INCLUDE common_text.ld
+    INCLUDE common_extratext_data_in_flash.ld
     INCLUDE common_bss_heap_stack.ld
 }
diff --git a/ports/stm32/boards/common_blifs.ld b/ports/stm32/boards/common_blifs.ld
index 5517a2d09c69c..51969e1f9067c 100644
--- a/ports/stm32/boards/common_blifs.ld
+++ b/ports/stm32/boards/common_blifs.ld
@@ -12,31 +12,13 @@
 
 ENTRY(Reset_Handler)
 
+REGION_ALIAS("FLASH_COMMON", FLASH_TEXT);
+
 /* define output sections */
 SECTIONS
 {
-    /* The startup code goes first into FLASH */
-    .isr_vector :
-    {
-        . = ALIGN(4);
-        KEEP(*(.isr_vector)) /* Startup code */
-
-        . = ALIGN(4);
-    } >FLASH_TEXT
-
-    /* The program code and other data goes into FLASH */
-    .text :
-    {
-        . = ALIGN(4);
-        *(.text*)          /* .text* sections (code) */
-        *(.rodata*)        /* .rodata* sections (constants, strings, etc.) */
-    /*  *(.glue_7)   */    /* glue arm to thumb code */
-    /*  *(.glue_7t)  */    /* glue thumb to arm code */
-
-        . = ALIGN(4);
-        _etext = .;        /* define a global symbol at end of code */
-    } >FLASH_TEXT
-
-    INCLUDE common_extratext_data_in_flash_text.ld
+    INCLUDE common_isr.ld
+    INCLUDE common_text.ld
+    INCLUDE common_extratext_data_in_flash.ld
     INCLUDE common_bss_heap_stack.ld
 }
diff --git a/ports/stm32/boards/common_extratext_data_in_flash.ld b/ports/stm32/boards/common_extratext_data_in_flash.ld
index eb9b86f49d8e0..db4306641b717 100644
--- a/ports/stm32/boards/common_extratext_data_in_flash.ld
+++ b/ports/stm32/boards/common_extratext_data_in_flash.ld
@@ -6,7 +6,7 @@
     __exidx_start = .;
     *(.ARM.exidx*)
     __exidx_end = .;
-} >FLASH
+} >FLASH_COMMON
 
 /* Used by the start-up code to initialise data */
 _sidata = LOADADDR(.data);
@@ -19,4 +19,4 @@ _sidata = LOADADDR(.data);
     *(.data*)
     . = ALIGN(4);
     _edata = .;
-} >RAM AT> FLASH
+} >RAM AT> FLASH_COMMON
diff --git a/ports/stm32/boards/common_extratext_data_in_flash_app.ld b/ports/stm32/boards/common_extratext_data_in_flash_app.ld
deleted file mode 100644
index aba6bf57c88af..0000000000000
--- a/ports/stm32/boards/common_extratext_data_in_flash_app.ld
+++ /dev/null
@@ -1,22 +0,0 @@
-/* This linker script fragment is intended to be included in SECTIONS. */
-
-/* For C++ exception handling */
-.ARM :
-{
-    __exidx_start = .;
-    *(.ARM.exidx*)
-    __exidx_end = .;
-} >FLASH_APP
-
-/* Used by the start-up code to initialise data */
-_sidata = LOADADDR(.data);
-
-/* Initialised data section, start-up code will copy it from flash to RAM */
-.data :
-{
-    . = ALIGN(4);
-    _sdata = .;
-    *(.data*)
-    . = ALIGN(4);
-    _edata = .;
-} >RAM AT> FLASH_APP
diff --git a/ports/stm32/boards/common_extratext_data_in_flash_text.ld b/ports/stm32/boards/common_extratext_data_in_flash_text.ld
deleted file mode 100644
index 5a29e47307a6b..0000000000000
--- a/ports/stm32/boards/common_extratext_data_in_flash_text.ld
+++ /dev/null
@@ -1,22 +0,0 @@
-/* This linker script fragment is intended to be included in SECTIONS. */
-
-/* For C++ exception handling */
-.ARM :
-{
-    __exidx_start = .;
-    *(.ARM.exidx*)
-    __exidx_end = .;
-} >FLASH_TEXT
-
-/* Used by the start-up code to initialise data */
-_sidata = LOADADDR(.data);
-
-/* Initialised data section, start-up code will copy it from flash to RAM */
-.data :
-{
-    . = ALIGN(4);
-    _sdata = .;
-    *(.data*)
-    . = ALIGN(4);
-    _edata = .;
-} >RAM AT> FLASH_TEXT
diff --git a/ports/stm32/boards/common_ifs.ld b/ports/stm32/boards/common_ifs.ld
index 733ca12f675bf..1876e4156140b 100644
--- a/ports/stm32/boards/common_ifs.ld
+++ b/ports/stm32/boards/common_ifs.ld
@@ -13,6 +13,8 @@
 
 ENTRY(Reset_Handler)
 
+REGION_ALIAS("FLASH_COMMON", FLASH_TEXT);
+
 /* define output sections */
 SECTIONS
 {
@@ -41,19 +43,7 @@ SECTIONS
         . = ALIGN(4);
     } >FLASH_ISR
 
-    /* The program code and other data goes into FLASH */
-    .text :
-    {
-        . = ALIGN(4);
-        *(.text*)          /* .text* sections (code) */
-        *(.rodata*)        /* .rodata* sections (constants, strings, etc.) */
-    /*  *(.glue_7)   */    /* glue arm to thumb code */
-    /*  *(.glue_7t)  */    /* glue thumb to arm code */
-
-        . = ALIGN(4);
-        _etext = .;        /* define a global symbol at end of code */
-    } >FLASH_TEXT
-
-    INCLUDE common_extratext_data_in_flash_text.ld
+    INCLUDE common_text.ld
+    INCLUDE common_extratext_data_in_flash.ld
     INCLUDE common_bss_heap_stack.ld
 }
diff --git a/ports/stm32/boards/common_isr.ld b/ports/stm32/boards/common_isr.ld
new file mode 100644
index 0000000000000..0f9b8bcaaddfa
--- /dev/null
+++ b/ports/stm32/boards/common_isr.ld
@@ -0,0 +1,9 @@
+/* This linker script fragment is intended to be included in SECTIONS. */
+
+/* The startup code goes first into FLASH */
+.isr_vector :
+{
+    . = ALIGN(4);
+    KEEP(*(.isr_vector)) /* Startup code */
+    . = ALIGN(4);
+} >FLASH_COMMON
diff --git a/ports/stm32/boards/common_text.ld b/ports/stm32/boards/common_text.ld
new file mode 100644
index 0000000000000..16eea43bae2c1
--- /dev/null
+++ b/ports/stm32/boards/common_text.ld
@@ -0,0 +1,14 @@
+/* This linker script fragment is intended to be included in SECTIONS. */
+
+/* The program code and other data goes into FLASH */
+.text :
+{
+    . = ALIGN(4);
+    *(.text*)          /* .text* sections (code) */
+    *(.rodata*)        /* .rodata* sections (constants, strings, etc.) */
+/*  *(.glue_7)   */    /* glue arm to thumb code */
+/*  *(.glue_7t)  */    /* glue thumb to arm code */
+
+    . = ALIGN(4);
+    _etext = .;        /* define a global symbol at end of code */
+} >FLASH_COMMON

From 77002a92bfcef58e01f20428df25793d43231b15 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Thu, 22 Dec 2022 21:35:28 +1100
Subject: [PATCH 2992/3533] tools/pyboard.py: Fix Python 2 compatibility.

In Python 2, serial.read()[0] a string, not int. Use struct.unpack to do
this instead.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 tools/pyboard.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/tools/pyboard.py b/tools/pyboard.py
index 55c00fbca1944..73250a7c28dfb 100755
--- a/tools/pyboard.py
+++ b/tools/pyboard.py
@@ -67,10 +67,11 @@
 
 """
 
+import ast
+import os
+import struct
 import sys
 import time
-import os
-import ast
 
 try:
     stdout = sys.stdout.buffer
@@ -379,7 +380,7 @@ def follow(self, timeout, data_consumer=None):
     def raw_paste_write(self, command_bytes):
         # Read initial header, with window size.
         data = self.serial.read(2)
-        window_size = data[0] | data[1] << 8
+        window_size = struct.unpack("<H", data)[0]
         window_remain = window_size
 
         # Write out the command_bytes data.

From 6013d27dd59dd111041f72106a5a5eddfb02a792 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Wed, 21 Dec 2022 11:43:35 +1100
Subject: [PATCH 2993/3533] tools/pyboard.py: Add parse kwarg to eval.

This is useful when using pyboard.py as a library rather than at the
command line.

    pyb.eval("1+1") --> b"2"
    pyb.eval("{'a': '\x00'}") --> b"{'a': '\\x00'}"

Now you can also do

    pyb.eval("1+1", parse=True) --> 2
    pyb.eval("{'a': '\x00'}", parse=True) --> {'a': '\x00'}

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 tools/pyboard.py | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/tools/pyboard.py b/tools/pyboard.py
index 73250a7c28dfb..b45cc19196d6f 100755
--- a/tools/pyboard.py
+++ b/tools/pyboard.py
@@ -457,10 +457,15 @@ def exec_raw(self, command, timeout=10, data_consumer=None):
         self.exec_raw_no_follow(command)
         return self.follow(timeout, data_consumer)
 
-    def eval(self, expression):
-        ret = self.exec_("print({})".format(expression))
-        ret = ret.strip()
-        return ret
+    def eval(self, expression, parse=False):
+        if parse:
+            ret = self.exec_("print(repr({}))".format(expression))
+            ret = ret.strip()
+            return ast.literal_eval(ret.decode())
+        else:
+            ret = self.exec_("print({})".format(expression))
+            ret = ret.strip()
+            return ret
 
     def exec_(self, command, data_consumer=None):
         ret, ret_err = self.exec_raw(command, data_consumer=data_consumer)

From aa64280666d40208ade0183503fe683fbb32c2ab Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Wed, 21 Dec 2022 11:36:18 +1100
Subject: [PATCH 2994/3533] tools/pyboard.py: Add
 fs_{listdir,readfile,writefile,stat}.

These are for working with the filesystem when using pyboard.py as a
library, rather than at the command line.

- fs_listdir returns a list of tuples, in the same format as os.ilistdir().
- fs_readfile returns the contents of a file as a bytes object.
- fs_writefile allows writing a bytes object to a file.
- fs_stat returns an os.statresult.

All raise FileNotFoundError (or OSError(ENOENT) on Python 2) if the file is
not found (or PyboardError on other errors).

Updated fs_cp and fs_get to use fs_stat to compute file size.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 tools/pyboard.py | 69 +++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 66 insertions(+), 3 deletions(-)

diff --git a/tools/pyboard.py b/tools/pyboard.py
index b45cc19196d6f..d1abd2b781044 100755
--- a/tools/pyboard.py
+++ b/tools/pyboard.py
@@ -73,6 +73,8 @@
 import sys
 import time
 
+from collections import namedtuple
+
 try:
     stdout = sys.stdout.buffer
 except AttributeError:
@@ -87,7 +89,15 @@ def stdout_write_bytes(b):
 
 
 class PyboardError(Exception):
-    pass
+    def convert(self, info):
+        if len(self.args) >= 3:
+            if b"OSError" in self.args[2] and b"ENOENT" in self.args[2]:
+                return OSError(errno.ENOENT, info)
+
+        return self
+
+
+listdir_result = namedtuple("dir_result", ["name", "st_mode", "st_ino", "st_size"])
 
 
 class TelnetToSerial:
@@ -467,6 +477,7 @@ def eval(self, expression, parse=False):
             ret = ret.strip()
             return ret
 
+    # In Python3, call as pyboard.exec(), see the setattr call below.
     def exec_(self, command, data_consumer=None):
         ret, ret_err = self.exec_raw(command, data_consumer=data_consumer)
         if ret_err:
@@ -497,6 +508,34 @@ def fs_ls(self, src):
         )
         self.exec_(cmd, data_consumer=stdout_write_bytes)
 
+    def fs_listdir(self, src=""):
+        buf = bytearray()
+
+        def repr_consumer(b):
+            buf.extend(b.replace(b"\x04", b""))
+
+        cmd = "import uos\nfor f in uos.ilistdir(%s):\n" " print(repr(f), end=',')" % (
+            ("'%s'" % src) if src else ""
+        )
+        try:
+            buf.extend(b"[")
+            self.exec_(cmd, data_consumer=repr_consumer)
+            buf.extend(b"]")
+        except PyboardError as e:
+            raise e.convert(src)
+
+        return [
+            listdir_result(*f) if len(f) == 4 else listdir_result(*(f + (0,)))
+            for f in ast.literal_eval(buf.decode())
+        ]
+
+    def fs_stat(self, src):
+        try:
+            self.exec_("import uos")
+            return os.stat_result(self.eval("uos.stat(%s)" % (("'%s'" % src)), parse=True))
+        except PyboardError as e:
+            raise e.convert(src)
+
     def fs_cat(self, src, chunk_size=256):
         cmd = (
             "with open('%s') as f:\n while 1:\n"
@@ -504,9 +543,33 @@ def fs_cat(self, src, chunk_size=256):
         )
         self.exec_(cmd, data_consumer=stdout_write_bytes)
 
+    def fs_readfile(self, src, chunk_size=256):
+        buf = bytearray()
+
+        def repr_consumer(b):
+            buf.extend(b.replace(b"\x04", b""))
+
+        cmd = (
+            "with open('%s', 'rb') as f:\n while 1:\n"
+            "  b=f.read(%u)\n  if not b:break\n  print(b,end='')" % (src, chunk_size)
+        )
+        try:
+            self.exec_(cmd, data_consumer=repr_consumer)
+        except PyboardError as e:
+            raise e.convert(src)
+        return ast.literal_eval(buf.decode())
+
+    def fs_writefile(self, dest, data, chunk_size=256):
+        self.exec_("f=open('%s','wb')\nw=f.write" % dest)
+        while data:
+            chunk = data[:chunk_size]
+            self.exec_("w(" + repr(chunk) + ")")
+            data = data[len(chunk) :]
+        self.exec_("f.close()")
+
     def fs_cp(self, src, dest, chunk_size=256, progress_callback=None):
         if progress_callback:
-            src_size = int(self.exec_("import os\nprint(os.stat('%s')[6])" % src))
+            src_size = self.fs_stat(src).st_size
             written = 0
         self.exec_("fr=open('%s','rb')\nr=fr.read\nfw=open('%s','wb')\nw=fw.write" % (src, dest))
         while True:
@@ -520,7 +583,7 @@ def fs_cp(self, src, dest, chunk_size=256, progress_callback=None):
 
     def fs_get(self, src, dest, chunk_size=256, progress_callback=None):
         if progress_callback:
-            src_size = int(self.exec_("import os\nprint(os.stat('%s')[6])" % src))
+            src_size = self.fs_stat(src).st_size
             written = 0
         self.exec_("f=open('%s','rb')\nr=f.read" % src)
         with open(dest, "wb") as f:

From d263438a6e365d3199494498a9b734cda29dde52 Mon Sep 17 00:00:00 2001
From: Jos Verlinde <Jos.Verlinde@Microsoft.com>
Date: Tue, 27 Dec 2022 13:56:58 +0100
Subject: [PATCH 2995/3533] tools/pyboard.py: Set DTR on Windows to avoid ESPxx
 hard reset.

Fixes issue #9659.

Signed-off-by: Jos Verlinde <Jos.Verlinde@Microsoft.com>
---
 tools/pyboard.py | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/tools/pyboard.py b/tools/pyboard.py
index d1abd2b781044..d0e67d1f31cc1 100755
--- a/tools/pyboard.py
+++ b/tools/pyboard.py
@@ -286,7 +286,15 @@ def __init__(
             delayed = False
             for attempt in range(wait + 1):
                 try:
-                    self.serial = serial.Serial(device, **serial_kwargs)
+                    if os.name == "nt":
+                        # Windows does not set DTR or RTS by default
+                        self.serial = serial.Serial(**serial_kwargs)
+                        self.serial.dtr = True
+                        self.serial.rts = False
+                        self.serial.port = device
+                        self.serial.open()
+                    else:
+                        self.serial = serial.Serial(device, **serial_kwargs)
                     break
                 except (OSError, IOError):  # Py2 and Py3 have different errors
                     if wait == 0:

From f4811b0b42f10aa12fc2f94c0459344d84c89eb8 Mon Sep 17 00:00:00 2001
From: Dorukyum <53639936+Dorukyum@users.noreply.github.com>
Date: Sun, 25 Dec 2022 19:49:15 +0300
Subject: [PATCH 2996/3533] docs/library/socket: Use correct sockaddr variable
 name.

Signed-off-by: Dorukyum <doruk.ak@hotmail.com>
---
 docs/library/socket.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/library/socket.rst b/docs/library/socket.rst
index 1d1c23abd1976..944e7e631ac76 100644
--- a/docs/library/socket.rst
+++ b/docs/library/socket.rst
@@ -29,7 +29,7 @@ returned by `getaddrinfo` function, which must be used to resolve textual addres
     # You must use getaddrinfo() even for numeric addresses
     sockaddr = socket.getaddrinfo('127.0.0.1', 80)[0][-1]
     # Now you can use that address
-    sock.connect(addr)
+    sock.connect(sockaddr)
 
 Using `getaddrinfo` is the most efficient (both in terms of memory and processing
 power) and portable way to work with addresses.

From 66e0cfc3b96b60e8be7e69e004ded525cedc3391 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Tue, 25 Oct 2022 18:43:38 +0200
Subject: [PATCH 2997/3533] rp2/machine_pin: Refactor the machine.Pin class for
 external GPIO.

Handle externally controlled GPIO pins more generically, by removing all
CYW43-specific code from `machine_pin.c`, and adding hooks to initialise,
configure, read and write external pins.  This allows any driver for an
on-board module which controls GPIO pins (such as CYW43 or NINA), to
provide its own implementation of those hooks and work seamlessly with
`machine_pin.c`.
---
 ports/rp2/CMakeLists.txt                |   4 +
 ports/rp2/boards/PICO_W/mpconfigboard.h |   6 +-
 ports/rp2/machine_pin.c                 | 330 ++++++++----------------
 ports/rp2/machine_pin.h                 |  55 ++++
 ports/rp2/machine_pin_cyw43.c           |  93 +++++++
 5 files changed, 269 insertions(+), 219 deletions(-)
 create mode 100644 ports/rp2/machine_pin.h
 create mode 100644 ports/rp2/machine_pin_cyw43.c

diff --git a/ports/rp2/CMakeLists.txt b/ports/rp2/CMakeLists.txt
index 15264bf8ad614..1bedc58101c94 100644
--- a/ports/rp2/CMakeLists.txt
+++ b/ports/rp2/CMakeLists.txt
@@ -261,6 +261,10 @@ if (MICROPY_PY_NETWORK_CYW43)
         ${MICROPY_DIR}/extmod/network_cyw43.c
     )
 
+    list(APPEND MICROPY_SOURCE_PORT
+        machine_pin_cyw43.c
+    )
+
     target_link_libraries(${MICROPY_TARGET}
         cyw43_driver_picow
         cmsis_core
diff --git a/ports/rp2/boards/PICO_W/mpconfigboard.h b/ports/rp2/boards/PICO_W/mpconfigboard.h
index 43a9fbafa7d36..b3653aaeb0ada 100644
--- a/ports/rp2/boards/PICO_W/mpconfigboard.h
+++ b/ports/rp2/boards/PICO_W/mpconfigboard.h
@@ -17,9 +17,11 @@
 // Debug level (0-4) 1=warning, 2=info, 3=debug, 4=verbose
 // #define MODUSSL_MBEDTLS_DEBUG_LEVEL 1
 
-#define MICROPY_HW_PIN_CYW43_COUNT CYW43_WL_GPIO_COUNT
+#define MICROPY_HW_PIN_EXT_PREFIX   "WL_GPIO"
+#define MICROPY_HW_PIN_EXT_COUNT    CYW43_WL_GPIO_COUNT
+
 #ifdef CYW43_WL_GPIO_LED_PIN
-#define MICROPY_HW_PIN_CYW43_LED_PIN_NUM CYW43_WL_GPIO_LED_PIN
+#define MICROPY_HW_PIN_EXT_LED_PIN_NUM CYW43_WL_GPIO_LED_PIN
 #endif
 
 #define MICROPY_HW_PIN_RESERVED(i) ((i) == CYW43_PIN_WL_HOST_WAKE || (i) == CYW43_PIN_WL_REG_ON)
diff --git a/ports/rp2/machine_pin.c b/ports/rp2/machine_pin.c
index 9abcf064e74eb..4bce0353f1ef0 100644
--- a/ports/rp2/machine_pin.c
+++ b/ports/rp2/machine_pin.c
@@ -31,6 +31,7 @@
 #include "py/mphal.h"
 #include "shared/runtime/mpirq.h"
 #include "modmachine.h"
+#include "machine_pin.h"
 #include "extmod/virtpin.h"
 
 #include "hardware/irq.h"
@@ -38,11 +39,6 @@
 #include "hardware/structs/iobank0.h"
 #include "hardware/structs/padsbank0.h"
 
-#define GPIO_MODE_IN (0)
-#define GPIO_MODE_OUT (1)
-#define GPIO_MODE_OPEN_DRAIN (2)
-#define GPIO_MODE_ALT (3)
-
 // These can be or'd together.
 #define GPIO_PULL_UP (1)
 #define GPIO_PULL_DOWN (2)
@@ -62,16 +58,6 @@
 #define MICROPY_HW_PIN_RESERVED(i) (0)
 #endif
 
-typedef struct _machine_pin_obj_t {
-    mp_obj_base_t base;
-    uint8_t id;
-    #if MICROPY_HW_PIN_CYW43_COUNT
-    bool is_cyw43;
-    bool is_output;
-    bool last_output_value;
-    #endif
-} machine_pin_obj_t;
-
 typedef struct _machine_pin_irq_obj_t {
     mp_irq_obj_t base;
     uint32_t flags;
@@ -113,23 +99,21 @@ STATIC const machine_pin_obj_t machine_pin_obj[NUM_BANK0_GPIOS] = {
     {{&machine_pin_type}, 29},
 };
 
-#if MICROPY_HW_PIN_CYW43_COUNT
-#include "lib/cyw43-driver/src/cyw43.h"
-#define CYW43_PIN_NAME_PREFIX "WL_GPIO"
-STATIC machine_pin_obj_t cyw43_pin_obj[MICROPY_HW_PIN_CYW43_COUNT];
-#endif
-
 #define LED_PIN_NAME "LED"
 
 #ifndef MICROPY_HW_PIN_ENABLE_LED_PIN
-#if defined(MICROPY_HW_PIN_CYW43_LED_PIN_NUM) || defined(PICO_DEFAULT_LED_PIN)
+#if defined(MICROPY_HW_PIN_EXT_LED_PIN_NUM) || defined(PICO_DEFAULT_LED_PIN)
 #define MICROPY_HW_PIN_ENABLE_LED_PIN 1
 #endif
 #endif
 
+#if MICROPY_HW_PIN_EXT_COUNT
+extern machine_pin_obj_t ext_pin_obj[MICROPY_HW_PIN_EXT_COUNT];
+#endif
+
 #ifdef MICROPY_HW_PIN_ENABLE_LED_PIN
-#ifdef MICROPY_HW_PIN_CYW43_LED_PIN_NUM
-STATIC machine_pin_obj_t *led_pin_obj = &cyw43_pin_obj[MICROPY_HW_PIN_CYW43_LED_PIN_NUM];
+#ifdef MICROPY_HW_PIN_EXT_LED_PIN_NUM
+STATIC machine_pin_obj_t *led_pin_obj = &ext_pin_obj[MICROPY_HW_PIN_EXT_LED_PIN_NUM];
 #elif defined(MICROPY_HW_PIN_LED_PIN_NUM)
 STATIC machine_pin_obj_t *led_pin_obj = &machine_pin_obj[MICROPY_HW_PIN_LED_PIN_NUM];
 #elif defined(PICO_DEFAULT_LED_PIN)
@@ -142,29 +126,12 @@ STATIC const machine_pin_obj_t *led_pin_obj = &machine_pin_obj[PICO_DEFAULT_LED_
 // Mask with "1" indicating that the corresponding pin is in simulated open-drain mode.
 uint32_t machine_pin_open_drain_mask;
 
-#if MICROPY_HW_PIN_CYW43_COUNT
-STATIC inline bool is_cyw43_pin(__unused const machine_pin_obj_t *self) {
-    return self->is_cyw43;
+#if MICROPY_HW_PIN_EXT_COUNT
+STATIC inline bool is_ext_pin(__unused const machine_pin_obj_t *self) {
+    return self->is_ext;
 }
 #else
-#define is_cyw43_pin(x) false
-#endif
-
-#if MICROPY_HW_PIN_CYW43_COUNT
-STATIC inline void update_cyw43_value(__unused machine_pin_obj_t *self, bool value) {
-    if (value != self->last_output_value || !self->is_output) {
-        cyw43_gpio_set(&cyw43_state, self->id, value);
-    }
-    self->last_output_value = value;
-}
-#endif
-
-#if MICROPY_HW_PIN_CYW43_COUNT
-STATIC inline bool get_cyw43_value(__unused machine_pin_obj_t *self) {
-    bool value = false;
-    cyw43_gpio_get(&cyw43_state, self->id, &value);
-    return value;
-}
+#define is_ext_pin(x) false
 #endif
 
 STATIC void gpio_irq(void) {
@@ -191,12 +158,8 @@ void machine_pin_init(void) {
     memset(MP_STATE_PORT(machine_pin_irq_obj), 0, sizeof(MP_STATE_PORT(machine_pin_irq_obj)));
     irq_add_shared_handler(IO_IRQ_BANK0, gpio_irq, PICO_SHARED_IRQ_HANDLER_DEFAULT_ORDER_PRIORITY);
     irq_set_enabled(IO_IRQ_BANK0, true);
-    #if MICROPY_HW_PIN_CYW43_COUNT
-    for (uint i = 0; i < count_of(cyw43_pin_obj); i++) {
-        cyw43_pin_obj[i].id = i;
-        cyw43_pin_obj[i].base.type = &machine_pin_type;
-        cyw43_pin_obj[i].is_cyw43 = true;
-    }
+    #if MICROPY_HW_PIN_EXT_COUNT
+    machine_pin_ext_init();
     #endif
 }
 
@@ -214,7 +177,7 @@ STATIC void machine_pin_print(const mp_print_t *print, mp_obj_t self_in, mp_prin
     machine_pin_obj_t *self = self_in;
     uint funcsel = GPIO_GET_FUNCSEL(self->id);
     qstr mode_qst;
-    if (!is_cyw43_pin(self)) {
+    if (!is_ext_pin(self)) {
         if (funcsel == GPIO_FUNC_SIO) {
             if (GPIO_IS_OPEN_DRAIN(self->id)) {
                 mode_qst = MP_QSTR_OPEN_DRAIN;
@@ -243,9 +206,9 @@ STATIC void machine_pin_print(const mp_print_t *print, mp_obj_t self_in, mp_prin
             mp_printf(print, ", alt=%u", funcsel);
         }
     } else {
-        #if MICROPY_HW_PIN_CYW43_COUNT
+        #if MICROPY_HW_PIN_EXT_COUNT
         mode_qst = self->is_output ? MP_QSTR_OUT : MP_QSTR_IN;
-        mp_printf(print, "Pin(%s%u, mode=%q", CYW43_PIN_NAME_PREFIX,  self->id, mode_qst);
+        mp_printf(print, "Pin(%s%u, mode=%q", MICROPY_HW_PIN_EXT_PREFIX,  self->id, mode_qst);
         #endif
     }
     mp_printf(print, ")");
@@ -261,97 +224,59 @@ static const mp_arg_t allowed_args[] = {
     {MP_QSTR_alt,   MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = GPIO_FUNC_SIO}},
 };
 
-#if MICROPY_HW_PIN_CYW43_COUNT
-// pin.init(mode, pull=None, *, value=None, alt=FUNC_SIO)
-STATIC mp_obj_t machine_pin_cyw43_obj_init_helper(machine_pin_obj_t *self, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+STATIC mp_obj_t machine_pin_obj_init_helper(const machine_pin_obj_t *self, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+
+    // parse args
     mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
     mp_arg_parse_all(n_args, pos_args, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
 
-    if (args[ARG_pull].u_obj != mp_const_none) {
-        int pull = mp_obj_get_int(args[ARG_pull].u_obj);
-        if (pull) {
-            mp_raise_ValueError("Pulls are not supported for this pin");
-        }
+    if (is_ext_pin(self) && args[ARG_pull].u_obj != mp_const_none) {
+        mp_raise_ValueError("Pulls are not supported for external pins.");
     }
 
-    if (args[ARG_alt].u_int != GPIO_FUNC_SIO) {
-        mp_raise_ValueError("Alternate functions are not supported for this pin");
+    if (is_ext_pin(self) && args[ARG_alt].u_int != GPIO_FUNC_SIO) {
+        mp_raise_ValueError("Alternate functions are not supported for external pins.");
     }
 
     int value = -1;
     if (args[ARG_value].u_obj != mp_const_none) {
         value = mp_obj_is_true(args[ARG_value].u_obj);
-    }
-
-    if (args[ARG_mode].u_obj != mp_const_none) {
-        mp_int_t mode = mp_obj_get_int(args[ARG_mode].u_obj);
-        if (mode == GPIO_MODE_IN) {
-            if (self->is_output) {
-                // todo need to disable output
-            }
-            self->is_output = false;
-        } else if (mode == GPIO_MODE_OUT) {
-            if (!self->is_output) {
-                // todo need to enable output
-                // for now we just set the value
-                if (value == -1) {
-                    value = self->last_output_value;
-                }
-                self->last_output_value = !self->last_output_value; // defeat shortcircuit
-                update_cyw43_value(self, value);
-                self->is_output = true;
-            }
-        } else {
-            mp_raise_ValueError("only Pin.OUT and Pin.IN are supported for this pin");
-        }
-    }
-
-    if (value != -1) {
-        if (self->is_output) {
-            update_cyw43_value(self, value);
-        } else {
-            // figure if you pass a value to IN it should still remember it (this is what regular GPIO does)
-            self->last_output_value = value;
+        // set initial value (do this before configuring mode/pull)
+        if (!is_ext_pin(self)) {
+            gpio_put(self->id, value);
         }
     }
 
-    return mp_const_none;
-}
-#endif
-
-STATIC mp_obj_t machine_pin_obj_init_helper(const machine_pin_obj_t *self, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
-
-    // parse args
-    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
-    mp_arg_parse_all(n_args, pos_args, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
-
-    // set initial value (do this before configuring mode/pull)
-    if (args[ARG_value].u_obj != mp_const_none) {
-        gpio_put(self->id, mp_obj_is_true(args[ARG_value].u_obj));
-    }
-
     // configure mode
     if (args[ARG_mode].u_obj != mp_const_none) {
         mp_int_t mode = mp_obj_get_int(args[ARG_mode].u_obj);
-        if (mode == GPIO_MODE_IN) {
+        if (is_ext_pin(self)) {
+            #if MICROPY_HW_PIN_EXT_COUNT
+            // The regular Pins are const, but the external pins are mutable.
+            machine_pin_obj_t *mutable_self = (machine_pin_obj_t *)self;
+            machine_pin_ext_config(mutable_self, mode, value);
+            #endif
+        } else if (mode == MACHINE_PIN_MODE_IN) {
             mp_hal_pin_input(self->id);
-        } else if (mode == GPIO_MODE_OUT) {
+        } else if (mode == MACHINE_PIN_MODE_OUT) {
             mp_hal_pin_output(self->id);
-        } else if (mode == GPIO_MODE_OPEN_DRAIN) {
+        } else if (mode == MACHINE_PIN_MODE_OPEN_DRAIN) {
             mp_hal_pin_open_drain(self->id);
         } else {
-            // Alternate function.
+            // Configure alternate function.
             gpio_set_function(self->id, args[ARG_alt].u_int);
             machine_pin_open_drain_mask &= ~(1 << self->id);
         }
     }
 
-    // configure pull (unconditionally because None means no-pull)
-    uint32_t pull = 0;
-    if (args[ARG_pull].u_obj != mp_const_none) {
-        pull = mp_obj_get_int(args[ARG_pull].u_obj);
+    if (!is_ext_pin(self)) {
+        // Configure pull (unconditionally because None means no-pull).
+        uint32_t pull = 0;
+        if (args[ARG_pull].u_obj != mp_const_none) {
+            pull = mp_obj_get_int(args[ARG_pull].u_obj);
+        }
+        gpio_set_pulls(self->id, pull & GPIO_PULL_UP, pull & GPIO_PULL_DOWN);
     }
-    gpio_set_pulls(self->id, pull & GPIO_PULL_UP, pull & GPIO_PULL_DOWN);
     return mp_const_none;
 }
 
@@ -359,7 +284,6 @@ STATIC mp_obj_t machine_pin_obj_init_helper(const machine_pin_obj_t *self, size_
 mp_obj_t mp_pin_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
     mp_arg_check_num(n_args, n_kw, 1, MP_OBJ_FUN_ARGS_MAX, true);
 
-
     const machine_pin_obj_t *self = NULL;
     if (mp_obj_is_str(args[0])) {
         const char *name = mp_obj_str_get_str(args[0]);
@@ -368,12 +292,12 @@ mp_obj_t mp_pin_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw,
             self = led_pin_obj;
         }
         #endif
-        #if MICROPY_HW_PIN_CYW43_COUNT
-        static_assert(MICROPY_HW_PIN_CYW43_COUNT < 10, ""); // makes parsing name easy!
-        if (!self && !strncmp(name, CYW43_PIN_NAME_PREFIX, strlen(CYW43_PIN_NAME_PREFIX)) && strlen(name) == strlen(CYW43_PIN_NAME_PREFIX) + 1) {
-            int num = name[strlen(CYW43_PIN_NAME_PREFIX)] - '0';
-            if (num < MICROPY_HW_PIN_CYW43_COUNT) {
-                self = &cyw43_pin_obj[num];
+        #if MICROPY_HW_PIN_EXT_COUNT
+        static_assert(MICROPY_HW_PIN_EXT_COUNT < 10, ""); // makes parsing name easy!
+        if (!self && !strncmp(name, MICROPY_HW_PIN_EXT_PREFIX, strlen(MICROPY_HW_PIN_EXT_PREFIX)) && strlen(name) == strlen(MICROPY_HW_PIN_EXT_PREFIX) + 1) {
+            int num = name[strlen(MICROPY_HW_PIN_EXT_PREFIX)] - '0';
+            if (num < MICROPY_HW_PIN_EXT_COUNT) {
+                self = &ext_pin_obj[num];
             }
         }
         #endif
@@ -389,27 +313,14 @@ mp_obj_t mp_pin_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw,
         }
         self = &machine_pin_obj[wanted_pin];
     }
-    // note we have different init args based on the type of pin. so Pin("LED", Pin.OUT) may not always make sense
-    if (!is_cyw43_pin(self)) {
-        if (n_args > 1 || n_kw > 0) {
-            // pin mode given, so configure this GPIO
-            mp_map_t kw_args;
-            mp_map_init_fixed_table(&kw_args, n_kw, args + n_args);
-            machine_pin_obj_init_helper(self, n_args - 1, args + 1, &kw_args);
-        }
-        return MP_OBJ_FROM_PTR(self);
-    }
-    #if MICROPY_HW_PIN_CYW43_COUNT
+
     if (n_args > 1 || n_kw > 0) {
         // pin mode given, so configure this GPIO
         mp_map_t kw_args;
         mp_map_init_fixed_table(&kw_args, n_kw, args + n_args);
-        // The regular Pins are const, but the CYW43 pins are mutable.
-        machine_pin_obj_t *mutable_self = (machine_pin_obj_t *)self;
-        machine_pin_cyw43_obj_init_helper(mutable_self, n_args - 1, args + 1, &kw_args);
+        machine_pin_obj_init_helper(self, n_args - 1, args + 1, &kw_args);
     }
     return MP_OBJ_FROM_PTR(self);
-    #endif
 }
 
 // fast method for getting/setting pin value
@@ -418,39 +329,33 @@ STATIC mp_obj_t machine_pin_call(mp_obj_t self_in, size_t n_args, size_t n_kw, c
     machine_pin_obj_t *self = self_in;
     if (n_args == 0) {
         // get pin
-        if (!is_cyw43_pin(self)) {
+        if (is_ext_pin(self)) {
+            #if MICROPY_HW_PIN_EXT_COUNT
+            return MP_OBJ_NEW_SMALL_INT(machine_pin_ext_get(self));
+            #endif
+        } else {
             return MP_OBJ_NEW_SMALL_INT(gpio_get(self->id));
         }
-        #if MICROPY_HW_PIN_CYW43_COUNT
-        return MP_OBJ_NEW_SMALL_INT(get_cyw43_value(self));
-        #endif
     } else {
         // set pin
         bool value = mp_obj_is_true(args[0]);
-        if (!is_cyw43_pin(self)) {
-            if (GPIO_IS_OPEN_DRAIN(self->id)) {
-                MP_STATIC_ASSERT(GPIO_IN == 0 && GPIO_OUT == 1);
-                gpio_set_dir(self->id, 1 - value);
-            } else {
-                gpio_put(self->id, value);
-            }
-            return mp_const_none;
+        if (is_ext_pin(self)) {
+            #if MICROPY_HW_PIN_EXT_COUNT
+            machine_pin_ext_set(self, value);
+            #endif
+        } else if (GPIO_IS_OPEN_DRAIN(self->id)) {
+            MP_STATIC_ASSERT(GPIO_IN == 0 && GPIO_OUT == 1);
+            gpio_set_dir(self->id, 1 - value);
+        } else {
+            gpio_put(self->id, value);
         }
-        #if MICROPY_HW_PIN_CYW43_COUNT
-        update_cyw43_value(self, value);
-        #endif
     }
     return mp_const_none;
 }
 
 // pin.init(mode, pull)
 STATIC mp_obj_t machine_pin_obj_init(size_t n_args, const mp_obj_t *args, mp_map_t *kw_args) {
-    if (!is_cyw43_pin(args[0])) {
-        return machine_pin_obj_init_helper(args[0], n_args - 1, args + 1, kw_args);
-    }
-    #if MICROPY_HW_PIN_CYW43_COUNT
-    return machine_pin_cyw43_obj_init_helper(args[0], n_args - 1, args + 1, kw_args);
-    #endif
+    return machine_pin_obj_init_helper(args[0], n_args - 1, args + 1, kw_args);
 }
 MP_DEFINE_CONST_FUN_OBJ_KW(machine_pin_init_obj, 1, machine_pin_obj_init);
 
@@ -463,36 +368,32 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_pin_value_obj, 1, 2, machine_
 // pin.low()
 STATIC mp_obj_t machine_pin_low(mp_obj_t self_in) {
     machine_pin_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    if (!is_cyw43_pin(self)) {
-        if (GPIO_IS_OPEN_DRAIN(self->id)) {
-            gpio_set_dir(self->id, GPIO_OUT);
-        } else {
-            gpio_clr_mask(1u << self->id);
-        }
-        return mp_const_none;
+    if (is_ext_pin(self)) {
+        #if MICROPY_HW_PIN_EXT_COUNT
+        machine_pin_ext_set(self, 0);
+        #endif
+    } else if (GPIO_IS_OPEN_DRAIN(self->id)) {
+        gpio_set_dir(self->id, GPIO_OUT);
+    } else {
+        gpio_clr_mask(1u << self->id);
     }
-    #if MICROPY_HW_PIN_CYW43_COUNT
-    update_cyw43_value(self, 0);
     return mp_const_none;
-    #endif
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_pin_low_obj, machine_pin_low);
 
 // pin.high()
 STATIC mp_obj_t machine_pin_high(mp_obj_t self_in) {
     machine_pin_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    if (!is_cyw43_pin(self)) {
-        if (GPIO_IS_OPEN_DRAIN(self->id)) {
-            gpio_set_dir(self->id, GPIO_IN);
-        } else {
-            gpio_set_mask(1u << self->id);
-        }
-        return mp_const_none;
+    if (is_ext_pin(self)) {
+        #if MICROPY_HW_PIN_EXT_COUNT
+        machine_pin_ext_set(self, 1);
+        #endif
+    } else if (GPIO_IS_OPEN_DRAIN(self->id)) {
+        gpio_set_dir(self->id, GPIO_IN);
+    } else {
+        gpio_set_mask(1u << self->id);
     }
-    #if MICROPY_HW_PIN_CYW43_COUNT
-    update_cyw43_value(self, 1);
     return mp_const_none;
-    #endif
 }
 
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_pin_high_obj, machine_pin_high);
@@ -500,22 +401,20 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_pin_high_obj, machine_pin_high);
 // pin.toggle()
 STATIC mp_obj_t machine_pin_toggle(mp_obj_t self_in) {
     machine_pin_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    if (!is_cyw43_pin(self)) {
-        if (GPIO_IS_OPEN_DRAIN(self->id)) {
-            if (GPIO_IS_OUT(self->id)) {
-                gpio_set_dir(self->id, GPIO_IN);
-            } else {
-                gpio_set_dir(self->id, GPIO_OUT);
-            }
+    if (is_ext_pin(self)) {
+        #if MICROPY_HW_PIN_EXT_COUNT
+        machine_pin_ext_set(self, self->last_output_value ^ 1);
+        #endif
+    } else if (GPIO_IS_OPEN_DRAIN(self->id)) {
+        if (GPIO_IS_OUT(self->id)) {
+            gpio_set_dir(self->id, GPIO_IN);
         } else {
-            gpio_xor_mask(1u << self->id);
+            gpio_set_dir(self->id, GPIO_OUT);
         }
-        return mp_const_none;
+    } else {
+        gpio_xor_mask(1u << self->id);
     }
-    #if MICROPY_HW_PIN_CYW43_COUNT
-    update_cyw43_value(self, self->last_output_value ^ 1);
     return mp_const_none;
-    #endif
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_pin_toggle_obj, machine_pin_toggle);
 
@@ -563,7 +462,7 @@ STATIC mp_obj_t machine_pin_irq(size_t n_args, const mp_obj_t *pos_args, mp_map_
         { MP_QSTR_hard, MP_ARG_BOOL, {.u_bool = false} },
     };
     machine_pin_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]);
-    if (is_cyw43_pin(self)) {
+    if (is_ext_pin(self)) {
         mp_raise_ValueError(MP_ERROR_TEXT("expecting a regular GPIO Pin"));
     }
 
@@ -595,10 +494,10 @@ STATIC const mp_rom_map_elem_t machine_pin_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_irq), MP_ROM_PTR(&machine_pin_irq_obj) },
 
     // class constants
-    { MP_ROM_QSTR(MP_QSTR_IN), MP_ROM_INT(GPIO_MODE_IN) },
-    { MP_ROM_QSTR(MP_QSTR_OUT), MP_ROM_INT(GPIO_MODE_OUT) },
-    { MP_ROM_QSTR(MP_QSTR_OPEN_DRAIN), MP_ROM_INT(GPIO_MODE_OPEN_DRAIN) },
-    { MP_ROM_QSTR(MP_QSTR_ALT), MP_ROM_INT(GPIO_MODE_ALT) },
+    { MP_ROM_QSTR(MP_QSTR_IN), MP_ROM_INT(MACHINE_PIN_MODE_IN) },
+    { MP_ROM_QSTR(MP_QSTR_OUT), MP_ROM_INT(MACHINE_PIN_MODE_OUT) },
+    { MP_ROM_QSTR(MP_QSTR_OPEN_DRAIN), MP_ROM_INT(MACHINE_PIN_MODE_OPEN_DRAIN) },
+    { MP_ROM_QSTR(MP_QSTR_ALT), MP_ROM_INT(MACHINE_PIN_MODE_ALT) },
     { MP_ROM_QSTR(MP_QSTR_PULL_UP), MP_ROM_INT(GPIO_PULL_UP) },
     { MP_ROM_QSTR(MP_QSTR_PULL_DOWN), MP_ROM_INT(GPIO_PULL_DOWN) },
     { MP_ROM_QSTR(MP_QSTR_IRQ_RISING), MP_ROM_INT(GPIO_IRQ_EDGE_RISE) },
@@ -610,31 +509,28 @@ STATIC mp_uint_t pin_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_t arg, i
     (void)errcode;
     machine_pin_obj_t *self = self_in;
 
-    if (!is_cyw43_pin(self)) {
-        switch (request) {
-            case MP_PIN_READ: {
-                return gpio_get(self->id);
-            }
-            case MP_PIN_WRITE: {
-                gpio_put(self->id, arg);
-                return 0;
-            }
-        }
-        return -1;
-    }
-
-    #if MICROPY_HW_PIN_CYW43_COUNT
     switch (request) {
         case MP_PIN_READ: {
-            return get_cyw43_value(self);
+            if (is_ext_pin(self)) {
+                #if MICROPY_HW_PIN_EXT_COUNT
+                return machine_pin_ext_get(self);
+                #endif
+            } else {
+                return gpio_get(self->id);
+            }
         }
         case MP_PIN_WRITE: {
-            update_cyw43_value(self, arg);
+            if (is_ext_pin(self)) {
+                #if MICROPY_HW_PIN_EXT_COUNT
+                machine_pin_ext_set(self, arg);
+                #endif
+            } else {
+                gpio_put(self->id, arg);
+            }
             return 0;
         }
     }
     return -1;
-    #endif
 }
 
 STATIC const mp_pin_p_t pin_pin_p = {
@@ -683,7 +579,7 @@ mp_hal_pin_obj_t mp_hal_get_pin_obj(mp_obj_t obj) {
         mp_raise_ValueError(MP_ERROR_TEXT("expecting a Pin"));
     }
     machine_pin_obj_t *pin = MP_OBJ_TO_PTR(obj);
-    if (is_cyw43_pin(pin)) {
+    if (is_ext_pin(pin)) {
         mp_raise_ValueError(MP_ERROR_TEXT("expecting a regular GPIO Pin"));
     }
     return pin->id;
diff --git a/ports/rp2/machine_pin.h b/ports/rp2/machine_pin.h
new file mode 100644
index 0000000000000..83a81007c805a
--- /dev/null
+++ b/ports/rp2/machine_pin.h
@@ -0,0 +1,55 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2022 Ibrahim Abdelkader <iabdalkader@openmv.io>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+#ifndef MICROPY_INCLUDED_RP2_MACHINE_PIN_H
+#define MICROPY_INCLUDED_RP2_MACHINE_PIN_H
+
+#include <stdint.h>
+#include "py/obj.h"
+#include "py/mphal.h"
+
+enum {
+    MACHINE_PIN_MODE_IN = 0,
+    MACHINE_PIN_MODE_OUT = 1,
+    MACHINE_PIN_MODE_OPEN_DRAIN = 2,
+    MACHINE_PIN_MODE_ALT = 3
+};
+
+typedef struct _machine_pin_obj_t {
+    mp_obj_base_t base;
+    uint8_t id                  : 5;
+    #if MICROPY_HW_PIN_EXT_COUNT
+    uint8_t is_ext              : 1;
+    uint8_t is_output           : 1;
+    uint8_t last_output_value   : 1;
+    #endif
+} machine_pin_obj_t;
+
+void machine_pin_ext_init(void);
+void machine_pin_ext_set(machine_pin_obj_t *self, bool value);
+bool machine_pin_ext_get(machine_pin_obj_t *self);
+void machine_pin_ext_config(machine_pin_obj_t *self, int mode, int value);
+
+#endif // MICROPY_INCLUDED_RP2_MACHINE_PIN_H
diff --git a/ports/rp2/machine_pin_cyw43.c b/ports/rp2/machine_pin_cyw43.c
new file mode 100644
index 0000000000000..a41a2f3caabfa
--- /dev/null
+++ b/ports/rp2/machine_pin_cyw43.c
@@ -0,0 +1,93 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2016-2022 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include <stdio.h>
+#include <string.h>
+
+#include "py/runtime.h"
+#include "py/mphal.h"
+
+#if defined(MICROPY_PY_NETWORK_CYW43) && defined(MICROPY_HW_PIN_EXT_COUNT)
+
+#include "modmachine.h"
+#include "machine_pin.h"
+#include "lib/cyw43-driver/src/cyw43.h"
+
+machine_pin_obj_t ext_pin_obj[MICROPY_HW_PIN_EXT_COUNT];
+
+void machine_pin_ext_init(void) {
+    for (uint i = 0; i < count_of(ext_pin_obj); i++) {
+        ext_pin_obj[i].id = i;
+        ext_pin_obj[i].base.type = &machine_pin_type;
+        ext_pin_obj[i].is_ext = true;
+    }
+}
+
+void machine_pin_ext_set(machine_pin_obj_t *self, bool value) {
+    if (value != self->last_output_value || !self->is_output) {
+        cyw43_gpio_set(&cyw43_state, self->id, value);
+    }
+    self->last_output_value = value;
+}
+
+bool machine_pin_ext_get(machine_pin_obj_t *self) {
+    bool value = false;
+    cyw43_gpio_get(&cyw43_state, self->id, &value);
+    return value;
+}
+
+void machine_pin_ext_config(machine_pin_obj_t *self, int mode, int value) {
+    if (mode == MACHINE_PIN_MODE_IN) {
+        if (self->is_output) {
+            // TODO need to disable output
+        }
+        self->is_output = false;
+    } else if (mode == MACHINE_PIN_MODE_OUT) {
+        if (!self->is_output) {
+            // TODO need to enable output
+            // for now we just set the value
+            if (value == -1) {
+                value = self->last_output_value;
+            }
+            self->last_output_value = !self->last_output_value; // defeat shortcircuit
+            machine_pin_ext_set(self, value);
+            self->is_output = true;
+        }
+    } else {
+        mp_raise_ValueError("only Pin.OUT and Pin.IN are supported for this pin");
+    }
+
+    if (value != -1) {
+        if (self->is_output) {
+            machine_pin_ext_set(self, value);
+        } else {
+            // figure if you pass a value to IN it should still remember it (this is what regular GPIO does)
+            self->last_output_value = value;
+        }
+    }
+}
+
+#endif // defined(MICROPY_PY_NETWORK_CYW43) && defined(MICROPY_HW_PIN_EXT_COUNT)

From c214c9e6481749d90a7c487e24afddef061c0d8d Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Tue, 25 Oct 2022 20:45:00 +0200
Subject: [PATCH 2998/3533] rp2/machine_pin: Add support for named pins and
 alternate functions.

This commit adds support for generating named pin mappings for all pins
including CPU, board-defined, LED and externally controlled pins.  CPU pins
are mapped to `pin_GPIO<n>`, externally-controlled pins are mapped to
`pin_EXT_GPIO<n>`, and defined conditionally (up to 10 pins, and can be
expanded in the future), and they are non-const to allow `machine-pin.c` to
write the pin object fields.  Both CPU and externally controlled pins are
generated even if there's no board CSV file; if one exists it will just be
added to board pins.
---
 ports/rp2/CMakeLists.txt      |  44 +++-
 ports/rp2/boards/make-pins.py | 428 ++++++++++++++++++++++++++++++++++
 ports/rp2/boards/rp2_af.csv   |  31 +++
 ports/rp2/boards/rp2_prefix.c |  36 +++
 ports/rp2/machine_pin.c       | 181 +++++++-------
 ports/rp2/machine_pin.h       |  27 +++
 ports/rp2/machine_pin_cyw43.c |   7 -
 7 files changed, 658 insertions(+), 96 deletions(-)
 create mode 100755 ports/rp2/boards/make-pins.py
 create mode 100644 ports/rp2/boards/rp2_af.csv
 create mode 100644 ports/rp2/boards/rp2_prefix.c

diff --git a/ports/rp2/CMakeLists.txt b/ports/rp2/CMakeLists.txt
index 1bedc58101c94..88971a5c90135 100644
--- a/ports/rp2/CMakeLists.txt
+++ b/ports/rp2/CMakeLists.txt
@@ -131,6 +131,7 @@ set(MICROPY_SOURCE_PORT
     usbd.c
     msc_disk.c
     mbedtls/mbedtls_port.c
+    ${CMAKE_BINARY_DIR}/pins_${MICROPY_BOARD}.c
 )
 
 set(MICROPY_SOURCE_QSTR
@@ -153,6 +154,7 @@ set(MICROPY_SOURCE_QSTR
     ${PROJECT_SOURCE_DIR}/modutime.c
     ${PROJECT_SOURCE_DIR}/rp2_flash.c
     ${PROJECT_SOURCE_DIR}/rp2_pio.c
+    ${CMAKE_BINARY_DIR}/pins_${MICROPY_BOARD}.c
 )
 
 set(PICO_SDK_COMPONENTS
@@ -257,14 +259,14 @@ if (MICROPY_PY_NETWORK_CYW43)
     )
     endif()
 
-    list(APPEND MICROPY_SOURCE_EXTMOD
-        ${MICROPY_DIR}/extmod/network_cyw43.c
-    )
-
     list(APPEND MICROPY_SOURCE_PORT
         machine_pin_cyw43.c
     )
 
+    list(APPEND MICROPY_SOURCE_EXTMOD
+        ${MICROPY_DIR}/extmod/network_cyw43.c
+    )
+
     target_link_libraries(${MICROPY_TARGET}
         cyw43_driver_picow
         cmsis_core
@@ -439,3 +441,37 @@ endforeach()
 
 # Include the main MicroPython cmake rules.
 include(${MICROPY_DIR}/py/mkrules.cmake)
+
+set(MICROPY_BOARDS_DIR "${MICROPY_PORT_DIR}/boards")
+set(GEN_PINS_AF_CSV "${MICROPY_BOARDS_DIR}/rp2_af.csv")
+set(GEN_PINS_PREFIX "${MICROPY_BOARDS_DIR}/rp2_prefix.c")
+set(GEN_PINS_MKPINS "${MICROPY_BOARDS_DIR}/make-pins.py")
+set(GEN_PINS_SRC "${CMAKE_BINARY_DIR}/pins_${MICROPY_BOARD}.c")
+set(GEN_PINS_HDR "${MICROPY_GENHDR_DIR}/pins.h")
+set(GEN_PINS_QSTR "${CMAKE_BINARY_DIR}/pins_qstr.h")
+set(GEN_PINS_AF_CONST "${MICROPY_GENHDR_DIR}/pins_af_const.h")
+set(GEN_PINS_AF_PY "${CMAKE_BINARY_DIR}/pins_af.py")
+
+if(EXISTS "${MICROPY_BOARDS_DIR}/${MICROPY_BOARD}/pins.csv")
+    set(GEN_PINS_BOARD_CSV "${MICROPY_BOARDS_DIR}/${MICROPY_BOARD}/pins.csv")
+    set(GEN_PINS_CSV_ARG --board "${GEN_PINS_BOARD_CSV}")
+endif()
+
+target_sources(${MICROPY_TARGET} PRIVATE
+    ${GEN_PINS_HDR}
+)
+
+# Generate pins
+add_custom_command(
+    OUTPUT ${GEN_PINS_HDR} ${GEN_PINS_SRC} ${GEN_PINS_QSTR}
+    COMMAND ${Python3_EXECUTABLE} ${GEN_PINS_MKPINS} ${GEN_PINS_CSV_ARG} --af ${GEN_PINS_AF_CSV} --prefix ${GEN_PINS_PREFIX}
+    --hdr ${GEN_PINS_HDR} --qstr ${GEN_PINS_QSTR} --af-const ${GEN_PINS_AF_CONST} --af-py ${GEN_PINS_AF_PY} > ${GEN_PINS_SRC}
+    DEPENDS
+        ${GEN_PINS_AF_CSV}
+        ${GEN_PINS_BOARD_CSV}
+        ${GEN_PINS_MKPINS}
+        ${GEN_PINS_PREFIX}
+        ${MICROPY_MPVERSION}
+    VERBATIM
+    COMMAND_EXPAND_LISTS
+)
diff --git a/ports/rp2/boards/make-pins.py b/ports/rp2/boards/make-pins.py
new file mode 100755
index 0000000000000..55e7ebe01fe65
--- /dev/null
+++ b/ports/rp2/boards/make-pins.py
@@ -0,0 +1,428 @@
+#!/usr/bin/env python
+"""Creates the pin file for the RP2."""
+
+from __future__ import print_function
+
+import argparse
+import sys
+import csv
+import re
+
+SUPPORTED_FN = {
+    "SPI": ["TX", "RX", "SCK", "CS"],
+    "UART": ["TX", "RX", "CTS", "RTS"],
+    "I2C": ["SCL", "SDA"],
+    "PWM": ["A", "B"],
+    "SIO": [""],
+    "PIO0": [""],
+    "PIO1": [""],
+    "GPCK": ["GPIN0", "GPOUT0", "GPIN1", "GPOUT1", "GPOUT2", "GPOUT3"],
+    "USB": ["OVCUR_DET", "VBUS_DET", "VBUS_EN"],
+}
+
+
+def parse_pin(name_str):
+    """Parses a string and returns a pin number."""
+    if len(name_str) < 2:
+        raise ValueError("Expecting pin name to be at least 2 charcters.")
+    if not name_str.startswith("GPIO") and not name_str.startswith("EXT_GPIO"):
+        raise ValueError("Expecting pin name to start with EXT_/GPIO")
+    return int(re.findall(r"\d+$", name_str)[0])
+
+
+def split_name_num(name_num):
+    num = None
+    for num_idx in range(len(name_num) - 1, -1, -1):
+        if not name_num[num_idx].isdigit():
+            name = name_num[0 : num_idx + 1]
+            num_str = name_num[num_idx + 1 :]
+            if len(num_str) > 0:
+                num = int(num_str)
+            break
+    if name == "PIO":
+        name += str(num)
+    return name, num
+
+
+class AlternateFunction(object):
+    """Holds the information associated with a pins alternate function."""
+
+    def __init__(self, idx, af_str):
+        self.idx = idx
+        self.af_str = af_str
+
+        self.func = ""
+        self.fn_num = None
+        self.pin_type = ""
+        self.supported = False
+
+        af_words = af_str.split("_", 1)
+        self.func, self.fn_num = split_name_num(af_words[0])
+        if len(af_words) > 1:
+            self.pin_type = af_words[1]
+        if self.func in SUPPORTED_FN:
+            pin_types = SUPPORTED_FN[self.func]
+            if self.pin_type in pin_types:
+                self.supported = True
+
+    def is_supported(self):
+        return self.supported
+
+    def ptr(self):
+        """Returns the numbered function (i.e. USART6) for this AF."""
+        if self.fn_num is None:
+            return self.func
+        return "{:s}{:d}".format(self.func, self.fn_num)
+
+    def mux_name(self):
+        return "AF{:d}_{:s}".format(self.idx, self.ptr())
+
+    def print(self):
+        """Prints the C representation of this AF."""
+        if self.supported:
+            print("  AF", end="")
+        else:
+            print("  //", end="")
+        fn_num = self.fn_num
+        if fn_num is None:
+            fn_num = 0
+        print("({:d}, {:4s}, {:d}), // {:s}".format(self.idx, self.func, fn_num, self.af_str))
+
+    def qstr_list(self):
+        return [self.mux_name()]
+
+
+class Pin(object):
+    """Holds the information associated with a pin."""
+
+    def __init__(self, pin, is_ext=False):
+        self.pin = pin
+        self.alt_fn = []
+        self.alt_fn_count = 0
+        self.is_board = False
+        self.is_ext = is_ext
+
+    def cpu_pin_name(self):
+        return "{:s}GPIO{:d}".format("EXT_" if self.is_ext else "", self.pin)
+
+    def is_board_pin(self):
+        return self.is_board
+
+    def set_is_board_pin(self):
+        self.is_board = True
+
+    def parse_af(self, af_idx, af_strs_in):
+        if len(af_strs_in) == 0:
+            return
+        # If there is a slash, then the slash separates 2 aliases for the
+        # same alternate function.
+        af_strs = af_strs_in.split("/")
+        for af_str in af_strs:
+            alt_fn = AlternateFunction(af_idx, af_str)
+            self.alt_fn.append(alt_fn)
+            if alt_fn.is_supported():
+                self.alt_fn_count += 1
+
+    def alt_fn_name(self, null_if_0=False):
+        if null_if_0 and self.alt_fn_count == 0:
+            return "NULL"
+        return "pin_{:s}_af".format(self.cpu_pin_name())
+
+    def print(self):
+        if self.is_ext:
+            print("#if (MICROPY_HW_PIN_EXT_COUNT > {:d})".format(self.pin))
+
+        if self.alt_fn_count == 0:
+            print("// ", end="")
+        print("const machine_pin_af_obj_t {:s}[] = {{".format(self.alt_fn_name()))
+        for alt_fn in self.alt_fn:
+            alt_fn.print()
+        if self.alt_fn_count == 0:
+            print("// ", end="")
+        print("};")
+        print("")
+        print(
+            "{:s}machine_pin_obj_t pin_{:s} = PIN({:d}, {:s}, {:d}, {:d}, {:s});".format(
+                "" if self.is_ext else "const ",
+                self.cpu_pin_name(),
+                self.pin,
+                self.cpu_pin_name(),
+                self.is_ext,
+                self.alt_fn_count,
+                self.alt_fn_name(null_if_0=True),
+            )
+        )
+        if self.is_ext:
+            print("#endif")
+        print("")
+
+    def print_header(self, hdr_file):
+        n = self.cpu_pin_name()
+        hdr_file.write(
+            "extern{:s}machine_pin_obj_t pin_{:s};\n".format(" " if self.is_ext else " const ", n)
+        )
+        if self.alt_fn_count > 0:
+            hdr_file.write("extern const machine_pin_af_obj_t pin_{:s}_af[];\n".format(n))
+
+    def qstr_list(self):
+        result = []
+        for alt_fn in self.alt_fn:
+            if alt_fn.is_supported():
+                result += alt_fn.qstr_list()
+        return result
+
+
+class NamedPin(object):
+    def __init__(self, name, pin):
+        self._name = name
+        self._pin = pin
+
+    def pin(self):
+        return self._pin
+
+    def name(self):
+        return self._name
+
+
+class Pins(object):
+    def __init__(self):
+        self.cpu_pins = []  # list of NamedPin objects
+        self.board_pins = []  # list of NamedPin objects
+        self.ext_pins = []  # list of NamedPin objects
+        for i in range(0, 10):
+            self.ext_pins.append(NamedPin("EXT_GPIO{:d}".format(i), Pin(i, True)))
+
+    def find_pin(self, pin_name):
+        for pin in self.cpu_pins:
+            if pin.name() == pin_name:
+                return pin.pin()
+
+        for pin in self.ext_pins:
+            if pin.name() == pin_name:
+                return pin.pin()
+
+    def parse_af_file(self, filename, pinname_col, af_col):
+        with open(filename, "r") as csvfile:
+            rows = csv.reader(csvfile)
+            for row in rows:
+                try:
+                    pin_num = parse_pin(row[pinname_col])
+                except Exception as e:
+                    # import traceback; traceback.print_exc()
+                    continue
+                pin = Pin(pin_num)
+                for af_idx in range(af_col, len(row)):
+                    if af_idx >= af_col:
+                        pin.parse_af(af_idx, row[af_idx])
+                self.cpu_pins.append(NamedPin(pin.cpu_pin_name(), pin))
+
+    def parse_board_file(self, filename):
+        with open(filename, "r") as csvfile:
+            rows = csv.reader(csvfile)
+            for row in rows:
+                if len(row) == 0 or row[0].startswith("#"):
+                    # Skip empty lines, and lines starting with "#"
+                    continue
+                if len(row) != 2:
+                    raise ValueError("Expecting two entries in a row")
+
+                cpu_pin_name = row[1]
+                try:
+                    pin_num = parse_pin(cpu_pin_name)
+                except:
+                    # import traceback; traceback.print_exc()
+                    continue
+                pin = self.find_pin(cpu_pin_name)
+                if pin:
+                    pin.set_is_board_pin()
+                    if row[0]:  # Only add board pins that have a name
+                        self.board_pins.append(NamedPin(row[0], pin))
+
+    def print_table(self, label, named_pins):
+        print("")
+        print("const machine_pin_obj_t *machine_pin_{:s}_pins[] = {{".format(label))
+        for pin in named_pins:
+            if not pin.pin().is_ext:
+                print("    &pin_{},".format(pin.name()))
+        print("};")
+        print("")
+
+    def print_named(self, label, named_pins):
+        print("")
+        print(
+            "STATIC const mp_rom_map_elem_t pin_{:s}_pins_locals_dict_table[] = {{".format(label)
+        )
+        for named_pin in named_pins:
+            pin = named_pin.pin()
+            if pin.is_ext:
+                print("  #if (MICROPY_HW_PIN_EXT_COUNT > {:d})".format(pin.pin))
+            print(
+                "  {{ MP_ROM_QSTR(MP_QSTR_{:s}), MP_ROM_PTR(&pin_{:s}) }},".format(
+                    named_pin.name(), pin.cpu_pin_name()
+                )
+            )
+            if pin.is_ext:
+                print("  #endif")
+
+        print("};")
+        print(
+            "MP_DEFINE_CONST_DICT(pin_{:s}_pins_locals_dict, pin_{:s}_pins_locals_dict_table);".format(
+                label, label
+            )
+        )
+        print("")
+
+    def print(self):
+        for pin in self.cpu_pins:
+            pin.pin().print()
+
+        for pin in self.ext_pins:
+            if pin.pin().is_ext:
+                pin.pin().print()
+
+        self.print_table("cpu", self.cpu_pins)
+        self.print_named("cpu", self.cpu_pins + self.ext_pins)
+        self.print_named("board", self.board_pins)
+
+    def print_header(self, hdr_filename, obj_decls):
+        with open(hdr_filename, "wt") as hdr_file:
+            if obj_decls:
+                for named_pin in self.cpu_pins:
+                    pin = named_pin.pin()
+                    pin.print_header(hdr_file)
+                for named_pin in self.board_pins:
+                    pin = named_pin.pin()
+                    if pin.is_ext:
+                        pin.print_header(hdr_file)
+            # provide #define's mapping board to cpu name
+            for named_pin in self.board_pins:
+                if named_pin.pin().is_board_pin():
+                    hdr_file.write(
+                        "#define pin_{:s} pin_{:s}\n".format(
+                            named_pin.name(), named_pin.pin().cpu_pin_name()
+                        )
+                    )
+
+    def print_qstr(self, qstr_filename):
+        with open(qstr_filename, "wt") as qstr_file:
+            qstr_set = set([])
+            for named_pin in self.cpu_pins:
+                pin = named_pin.pin()
+                if pin.is_board_pin():
+                    qstr_set |= set(pin.qstr_list())
+                    qstr_set |= set([named_pin.name()])
+            for named_pin in self.board_pins:
+                qstr_set |= set([named_pin.name()])
+            for qstr in sorted(qstr_set):
+                print("Q({})".format(qstr), file=qstr_file)
+
+    def print_af_hdr(self, af_const_filename):
+        with open(af_const_filename, "wt") as af_const_file:
+            af_hdr_set = set([])
+            mux_name_width = 0
+            for named_pin in self.cpu_pins:
+                pin = named_pin.pin()
+                if pin.is_board_pin():
+                    for af in pin.alt_fn:
+                        if af.is_supported():
+                            mux_name = af.mux_name()
+                            af_hdr_set |= set([mux_name])
+                            if len(mux_name) > mux_name_width:
+                                mux_name_width = len(mux_name)
+            for mux_name in sorted(af_hdr_set):
+                key = "MP_OBJ_NEW_QSTR(MP_QSTR_{}),".format(mux_name)
+                val = "MP_OBJ_NEW_SMALL_INT(GPIO_{})".format(mux_name)
+                print("    { %-*s %s }," % (mux_name_width + 26, key, val), file=af_const_file)
+
+    def print_af_py(self, af_py_filename):
+        with open(af_py_filename, "wt") as af_py_file:
+            print("PINS_AF = (", file=af_py_file)
+            for named_pin in self.board_pins:
+                print("  ('%s', " % named_pin.name(), end="", file=af_py_file)
+                for af in named_pin.pin().alt_fn:
+                    if af.is_supported():
+                        print("(%d, '%s'), " % (af.idx, af.af_str), end="", file=af_py_file)
+                print("),", file=af_py_file)
+            print(")", file=af_py_file)
+
+
+def main():
+    parser = argparse.ArgumentParser(
+        prog="make-pins.py",
+        usage="%(prog)s [options] [command]",
+        description="Generate board specific pin file",
+    )
+    parser.add_argument(
+        "-a",
+        "--af",
+        dest="af_filename",
+        help="Specifies the alternate function file for the chip",
+        default="rp2_af.csv",
+    )
+    parser.add_argument(
+        "--af-const",
+        dest="af_const_filename",
+        help="Specifies header file for alternate function constants.",
+        default="build/pins_af_const.h",
+    )
+    parser.add_argument(
+        "--af-py",
+        dest="af_py_filename",
+        help="Specifies the filename for the python alternate function mappings.",
+        default="build/pins_af.py",
+    )
+    parser.add_argument(
+        "-b",
+        "--board",
+        dest="board_filename",
+        help="Specifies the board file",
+    )
+    parser.add_argument(
+        "-p",
+        "--prefix",
+        dest="prefix_filename",
+        help="Specifies beginning portion of generated pins file",
+        default="rp2_prefix.c",
+    )
+    parser.add_argument(
+        "-q",
+        "--qstr",
+        dest="qstr_filename",
+        help="Specifies name of generated qstr header file",
+        default="build/pins_qstr.h",
+    )
+    parser.add_argument(
+        "-r",
+        "--hdr",
+        dest="hdr_filename",
+        help="Specifies name of generated pin header file",
+        default="build/pins.h",
+    )
+    args = parser.parse_args(sys.argv[1:])
+
+    pins = Pins()
+
+    print("// This file was automatically generated by make-pins.py")
+    print("//")
+    if args.af_filename:
+        print("// --af {:s}".format(args.af_filename))
+        pins.parse_af_file(args.af_filename, 0, 1)
+
+    if args.board_filename:
+        print("// --board {:s}".format(args.board_filename))
+        pins.parse_board_file(args.board_filename)
+
+    if args.prefix_filename:
+        print("// --prefix {:s}".format(args.prefix_filename))
+        print("")
+        with open(args.prefix_filename, "r") as prefix_file:
+            print(prefix_file.read())
+    pins.print()
+    pins.print_header(args.hdr_filename, True)
+    pins.print_qstr(args.qstr_filename)
+    pins.print_af_hdr(args.af_const_filename)
+    pins.print_af_py(args.af_py_filename)
+
+
+if __name__ == "__main__":
+    main()
diff --git a/ports/rp2/boards/rp2_af.csv b/ports/rp2/boards/rp2_af.csv
new file mode 100644
index 0000000000000..454f7ed2d12ab
--- /dev/null
+++ b/ports/rp2/boards/rp2_af.csv
@@ -0,0 +1,31 @@
+Pin,AF1,AF2,AF3,AF4,AF5,AF6,AF7,AF8,AF9
+GPIO0,SPI0_RX,UART0_TX,I2C0_SDA,PWM0_A,SIO,PIO0,PIO1,,USB_OVCUR_DET
+GPIO1,SPI0_CS,UART0_RX,I2C0_SCL,PWM0_B,SIO,PIO0,PIO1,,USB_VBUS_DET
+GPIO2,SPI0_SCK,UART0_CTS,I2C1_SDA,PWM1_A,SIO,PIO0,PIO1,,USB_VBUS_EN
+GPIO3,SPI0_TX,UART0_RTS,I2C1_SCL,PWM1_B,SIO,PIO0,PIO1,,USB_OVCUR_DET
+GPIO4,SPI0_RX,UART1_TX,I2C0_SDA,PWM2_A,SIO,PIO0,PIO1,,USB_VBUS_DET
+GPIO5,SPI0_CS,UART1_RX,I2C0_SCL,PWM2_B,SIO,PIO0,PIO1,,USB_VBUS_EN
+GPIO6,SPI0_SCK,UART1_CTS,I2C1_SDA,PWM3_A,SIO,PIO0,PIO1,,USB_OVCUR_DET
+GPIO7,SPI0_TX,UART1_RTS,I2C1_SCL,PWM3_B,SIO,PIO0,PIO1,,USB_VBUS_DET
+GPIO8,SPI1_RX,UART1_TX,I2C0_SDA,PWM4_A,SIO,PIO0,PIO1,,USB_VBUS_EN
+GPIO9,SPI1_CS,UART1_RX,I2C0_SCL,PWM4_B,SIO,PIO0,PIO1,,USB_OVCUR_DET
+GPIO10,SPI1_SCK,UART1_CTS,I2C1_SDA,PWM5_A,SIO,PIO0,PIO1,,USB_VBUS_DET
+GPIO11,SPI1_TX,UART1_RTS,I2C1_SCL,PWM5_B,SIO,PIO0,PIO1,,USB_VBUS_EN
+GPIO12,SPI1_RX,UART0_TX,I2C0_SDA,PWM6_A,SIO,PIO0,PIO1,,USB_OVCUR_DET
+GPIO13,SPI1_CS,UART0_RX,I2C0_SCL,PWM6_B,SIO,PIO0,PIO1,,USB_VBUS_DET
+GPIO14,SPI1_SCK,UART0_CTS,I2C1_SDA,PWM7_A,SIO,PIO0,PIO1,,USB_VBUS_EN
+GPIO15,SPI1_TX,UART0_RTS,I2C1_SCL,PWM7_B,SIO,PIO0,PIO1,,USB_OVCUR_DET
+GPIO16,SPI0_RX,UART0_TX,I2C0_SDA,PWM0_A,SIO,PIO0,PIO1,,USB_VBUS_DET
+GPIO17,SPI0_CS,UART0_RX,I2C0_SCL,PWM0_B,SIO,PIO0,PIO1,,USB_VBUS_EN
+GPIO18,SPI0_SCK,UART0_CTS,I2C1_SDA,PWM1_A,SIO,PIO0,PIO1,,USB_OVCUR_DET
+GPIO19,SPI0_TX,UART0_RTS,I2C1_SCL,PWM1_B,SIO,PIO0,PIO1,,USB_VBUS_DET
+GPIO20,SPI0_RX,UART1_TX,I2C0_SDA,PWM2_A,SIO,PIO0,PIO1,GPCK_GPIN0,USB_VBUS_EN
+GPIO21,SPI0_CS,UART1_RX,I2C0_SCL,PWM2_B,SIO,PIO0,PIO1,GPCK_GPOUT0,USB_OVCUR_DET
+GPIO22,SPI0_SCK,UART1_CTS,I2C1_SDA,PWM3_A,SIO,PIO0,PIO1,GPCK_GPIN1,USB_VBUS_DET
+GPIO23,SPI0_TX,UART1_RTS,I2C1_SCL,PWM3_B,SIO,PIO0,PIO1,GPCK_GPOUT1,USB_VBUS_EN
+GPIO24,SPI1_RX,UART1_TX,I2C0_SDA,PWM4_A,SIO,PIO0,PIO1,GPCK_GPOUT2,USB_OVCUR_DET
+GPIO25,SPI1_CS,UART1_RX,I2C0_SCL,PWM4_B,SIO,PIO0,PIO1,GPCK_GPOUT3,USB_VBUS_DET
+GPIO26,SPI1_SCK,UART1_CTS,I2C1_SDA,PWM5_A,SIO,PIO0,PIO1,,USB_VBUS_EN
+GPIO27,SPI1_TX,UART1_RTS,I2C1_SCL,PWM5_B,SIO,PIO0,PIO1,,USB_OVCUR_DET
+GPIO28,SPI1_RX,UART0_TX,I2C0_SDA,PWM6_A,SIO,PIO0,PIO1,,USB_VBUS_DET
+GPIO29,SPI1_CS,UART0_RX,I2C0_SCL,PWM6_B,SIO,PIO0,PIO1,,USB_VBUS_EN
diff --git a/ports/rp2/boards/rp2_prefix.c b/ports/rp2/boards/rp2_prefix.c
new file mode 100644
index 0000000000000..50f2852a8ac98
--- /dev/null
+++ b/ports/rp2/boards/rp2_prefix.c
@@ -0,0 +1,36 @@
+#include <stdint.h>
+#include "py/obj.h"
+#include "py/mphal.h"
+#include "machine_pin.h"
+
+#define AF(af_idx, af_fn, af_unit)                      \
+    {                                                   \
+        .base = { &machine_pin_af_type },               \
+        .name = MP_QSTR_##af_fn,                        \
+        .idx = (af_idx),                                \
+        .fn = GPIO_FUNC_##af_fn,                        \
+        .unit = (af_unit),                              \
+    }
+
+#if MICROPY_HW_PIN_EXT_COUNT
+#define PIN(_id, _name, _is_ext, _af_num, _af_list)     \
+    {                                                   \
+        .base = { &machine_pin_type },                  \
+        .name = MP_QSTR_##_name,                        \
+        .id = (uint8_t)(_id),                           \
+        .is_ext = (_is_ext),                            \
+        .is_output = false,                             \
+        .last_output_value = 0,                         \
+        .af_num = (_af_num),                            \
+        .af = (_af_list),                               \
+    }
+#else
+#define PIN(_id, _name, _is_ext, _af_num, _af_list)     \
+    {                                                   \
+        .base = { &machine_pin_type },                  \
+        .name = MP_QSTR_##_name,                        \
+        .id = (uint8_t)(_id),                           \
+        .af_num = (_af_num),                            \
+        .af = (_af_list),                               \
+    }
+#endif
diff --git a/ports/rp2/machine_pin.c b/ports/rp2/machine_pin.c
index 4bce0353f1ef0..3de2eaaed8274 100644
--- a/ports/rp2/machine_pin.c
+++ b/ports/rp2/machine_pin.c
@@ -58,6 +58,26 @@
 #define MICROPY_HW_PIN_RESERVED(i) (0)
 #endif
 
+MP_DEFINE_CONST_OBJ_TYPE(
+    machine_pin_af_type,
+    MP_QSTR_PinAF,
+    MP_TYPE_FLAG_NONE
+    );
+
+MP_DEFINE_CONST_OBJ_TYPE(
+    pin_cpu_pins_obj_type,
+    MP_QSTR_cpu,
+    MP_TYPE_FLAG_NONE,
+    locals_dict, &pin_cpu_pins_locals_dict
+    );
+
+MP_DEFINE_CONST_OBJ_TYPE(
+    pin_board_pins_obj_type,
+    MP_QSTR_board,
+    MP_TYPE_FLAG_NONE,
+    locals_dict, &pin_board_pins_locals_dict
+    );
+
 typedef struct _machine_pin_irq_obj_t {
     mp_irq_obj_t base;
     uint32_t flags;
@@ -65,63 +85,7 @@ typedef struct _machine_pin_irq_obj_t {
 } machine_pin_irq_obj_t;
 
 STATIC const mp_irq_methods_t machine_pin_irq_methods;
-
-STATIC const machine_pin_obj_t machine_pin_obj[NUM_BANK0_GPIOS] = {
-    {{&machine_pin_type}, 0},
-    {{&machine_pin_type}, 1},
-    {{&machine_pin_type}, 2},
-    {{&machine_pin_type}, 3},
-    {{&machine_pin_type}, 4},
-    {{&machine_pin_type}, 5},
-    {{&machine_pin_type}, 6},
-    {{&machine_pin_type}, 7},
-    {{&machine_pin_type}, 8},
-    {{&machine_pin_type}, 9},
-    {{&machine_pin_type}, 10},
-    {{&machine_pin_type}, 11},
-    {{&machine_pin_type}, 12},
-    {{&machine_pin_type}, 13},
-    {{&machine_pin_type}, 14},
-    {{&machine_pin_type}, 15},
-    {{&machine_pin_type}, 16},
-    {{&machine_pin_type}, 17},
-    {{&machine_pin_type}, 18},
-    {{&machine_pin_type}, 19},
-    {{&machine_pin_type}, 20},
-    {{&machine_pin_type}, 21},
-    {{&machine_pin_type}, 22},
-    {{&machine_pin_type}, 23},
-    {{&machine_pin_type}, 24},
-    {{&machine_pin_type}, 25},
-    {{&machine_pin_type}, 26},
-    {{&machine_pin_type}, 27},
-    {{&machine_pin_type}, 28},
-    {{&machine_pin_type}, 29},
-};
-
-#define LED_PIN_NAME "LED"
-
-#ifndef MICROPY_HW_PIN_ENABLE_LED_PIN
-#if defined(MICROPY_HW_PIN_EXT_LED_PIN_NUM) || defined(PICO_DEFAULT_LED_PIN)
-#define MICROPY_HW_PIN_ENABLE_LED_PIN 1
-#endif
-#endif
-
-#if MICROPY_HW_PIN_EXT_COUNT
-extern machine_pin_obj_t ext_pin_obj[MICROPY_HW_PIN_EXT_COUNT];
-#endif
-
-#ifdef MICROPY_HW_PIN_ENABLE_LED_PIN
-#ifdef MICROPY_HW_PIN_EXT_LED_PIN_NUM
-STATIC machine_pin_obj_t *led_pin_obj = &ext_pin_obj[MICROPY_HW_PIN_EXT_LED_PIN_NUM];
-#elif defined(MICROPY_HW_PIN_LED_PIN_NUM)
-STATIC machine_pin_obj_t *led_pin_obj = &machine_pin_obj[MICROPY_HW_PIN_LED_PIN_NUM];
-#elif defined(PICO_DEFAULT_LED_PIN)
-STATIC const machine_pin_obj_t *led_pin_obj = &machine_pin_obj[PICO_DEFAULT_LED_PIN];
-#else
-#error MICROPY_HW_PIN_ENABLE_LED_PIN defined but there is no LED pin
-#endif
-#endif
+extern const machine_pin_obj_t *machine_pin_cpu_pins[NUM_BANK0_GPIOS];
 
 // Mask with "1" indicating that the corresponding pin is in simulated open-drain mode.
 uint32_t machine_pin_open_drain_mask;
@@ -173,6 +137,35 @@ void machine_pin_deinit(void) {
     irq_remove_handler(IO_IRQ_BANK0, gpio_irq);
 }
 
+const machine_pin_obj_t *machine_pin_find_named(const mp_obj_dict_t *named_pins, mp_obj_t name) {
+    const mp_map_t *named_map = &named_pins->map;
+    mp_map_elem_t *named_elem = mp_map_lookup((mp_map_t *)named_map, name, MP_MAP_LOOKUP);
+    if (named_elem != NULL && named_elem->value != NULL) {
+        return MP_OBJ_TO_PTR(named_elem->value);
+    }
+    return NULL;
+}
+
+const machine_pin_af_obj_t *machine_pin_find_alt(const machine_pin_obj_t *pin, uint8_t fn) {
+    const machine_pin_af_obj_t *af = pin->af;
+    for (mp_uint_t i = 0; i < pin->af_num; i++, af++) {
+        if (af->fn == fn) {
+            return af;
+        }
+    }
+    return NULL;
+}
+
+const machine_pin_af_obj_t *machine_pin_find_alt_by_index(const machine_pin_obj_t *pin, mp_uint_t af_idx) {
+    const machine_pin_af_obj_t *af = pin->af;
+    for (mp_uint_t i = 0; i < pin->af_num; i++, af++) {
+        if (af->idx == af_idx) {
+            return af;
+        }
+    }
+    return NULL;
+}
+
 STATIC void machine_pin_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     machine_pin_obj_t *self = self_in;
     uint funcsel = GPIO_GET_FUNCSEL(self->id);
@@ -189,7 +182,7 @@ STATIC void machine_pin_print(const mp_print_t *print, mp_obj_t self_in, mp_prin
         } else {
             mode_qst = MP_QSTR_ALT;
         }
-        mp_printf(print, "Pin(%u, mode=%q", self->id, mode_qst);
+        mp_printf(print, "Pin(%q, mode=%q", self->name, mode_qst);
         bool pull_up = false;
         if (GPIO_IS_PULL_UP(self->id)) {
             mp_printf(print, ", pull=%q", MP_QSTR_PULL_UP);
@@ -203,12 +196,17 @@ STATIC void machine_pin_print(const mp_print_t *print, mp_obj_t self_in, mp_prin
             }
         }
         if (funcsel != GPIO_FUNC_SIO) {
-            mp_printf(print, ", alt=%u", funcsel);
+            const machine_pin_af_obj_t *af = machine_pin_find_alt_by_index(self, funcsel);
+            if (af == NULL) {
+                mp_printf(print, ", alt=%u", funcsel);
+            } else {
+                mp_printf(print, ", alt=%q", af->name);
+            }
         }
     } else {
         #if MICROPY_HW_PIN_EXT_COUNT
-        mode_qst = self->is_output ? MP_QSTR_OUT : MP_QSTR_IN;
-        mp_printf(print, "Pin(%s%u, mode=%q", MICROPY_HW_PIN_EXT_PREFIX,  self->id, mode_qst);
+        mode_qst = (self->is_output) ? MP_QSTR_OUT : MP_QSTR_IN;
+        mp_printf(print, "Pin(%q, mode=%q", self->name, mode_qst);
         #endif
     }
     mp_printf(print, ")");
@@ -231,11 +229,11 @@ STATIC mp_obj_t machine_pin_obj_init_helper(const machine_pin_obj_t *self, size_
     mp_arg_parse_all(n_args, pos_args, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
 
     if (is_ext_pin(self) && args[ARG_pull].u_obj != mp_const_none) {
-        mp_raise_ValueError("Pulls are not supported for external pins.");
+        mp_raise_ValueError("pulls are not supported for external pins");
     }
 
     if (is_ext_pin(self) && args[ARG_alt].u_int != GPIO_FUNC_SIO) {
-        mp_raise_ValueError("Alternate functions are not supported for external pins.");
+        mp_raise_ValueError("alternate functions are not supported for external pins");
     }
 
     int value = -1;
@@ -264,7 +262,11 @@ STATIC mp_obj_t machine_pin_obj_init_helper(const machine_pin_obj_t *self, size_
             mp_hal_pin_open_drain(self->id);
         } else {
             // Configure alternate function.
-            gpio_set_function(self->id, args[ARG_alt].u_int);
+            mp_uint_t af = args[ARG_alt].u_int;
+            if (machine_pin_find_alt(self, af) == NULL) {
+                mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("invalid pin af: %d"), af);
+            }
+            gpio_set_function(self->id, af);
             machine_pin_open_drain_mask &= ~(1 << self->id);
         }
     }
@@ -283,35 +285,29 @@ STATIC mp_obj_t machine_pin_obj_init_helper(const machine_pin_obj_t *self, size_
 // constructor(id, ...)
 mp_obj_t mp_pin_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
     mp_arg_check_num(n_args, n_kw, 1, MP_OBJ_FUN_ARGS_MAX, true);
-
     const machine_pin_obj_t *self = NULL;
+
     if (mp_obj_is_str(args[0])) {
         const char *name = mp_obj_str_get_str(args[0]);
-        #if MICROPY_HW_PIN_ENABLE_LED_PIN
-        if (!strcmp(name, LED_PIN_NAME)) {
-            self = led_pin_obj;
-        }
-        #endif
-        #if MICROPY_HW_PIN_EXT_COUNT
-        static_assert(MICROPY_HW_PIN_EXT_COUNT < 10, ""); // makes parsing name easy!
-        if (!self && !strncmp(name, MICROPY_HW_PIN_EXT_PREFIX, strlen(MICROPY_HW_PIN_EXT_PREFIX)) && strlen(name) == strlen(MICROPY_HW_PIN_EXT_PREFIX) + 1) {
-            int num = name[strlen(MICROPY_HW_PIN_EXT_PREFIX)] - '0';
-            if (num < MICROPY_HW_PIN_EXT_COUNT) {
-                self = &ext_pin_obj[num];
-            }
+        // Try to find the pin in the board pins first.
+        self = machine_pin_find_named(&pin_board_pins_locals_dict, args[0]);
+        if (!self) {
+            // If not found, try to find the pin in the cpu pins which include
+            // CPU and and externally controlled pins (if any).
+            self = machine_pin_find_named(&pin_cpu_pins_locals_dict, args[0]);
         }
-        #endif
         if (!self) {
-            mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("Unknown named pin \"%s\""), name);
+            mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("unknown named pin \"%s\""), name);
         }
-    }
-    if (!self) {
+    } else if (mp_obj_is_int(args[0])) {
         // get the wanted pin object
         int wanted_pin = mp_obj_get_int(args[0]);
-        if (!(0 <= wanted_pin && wanted_pin < MP_ARRAY_SIZE(machine_pin_obj))) {
-            mp_raise_ValueError("invalid pin");
+        if (0 <= wanted_pin && wanted_pin < MP_ARRAY_SIZE(machine_pin_cpu_pins)) {
+            self = machine_pin_cpu_pins[wanted_pin];
         }
-        self = &machine_pin_obj[wanted_pin];
+    }
+    if (!self) {
+        mp_raise_ValueError("invalid pin");
     }
 
     if (n_args > 1 || n_kw > 0) {
@@ -427,7 +423,7 @@ STATIC machine_pin_irq_obj_t *machine_pin_get_irq(mp_hal_pin_obj_t pin) {
         irq = m_new_obj(machine_pin_irq_obj_t);
         irq->base.base.type = &mp_irq_type;
         irq->base.methods = (mp_irq_methods_t *)&machine_pin_irq_methods;
-        irq->base.parent = MP_OBJ_FROM_PTR(&machine_pin_obj[pin]);
+        irq->base.parent = MP_OBJ_FROM_PTR(&machine_pin_cpu_pins[pin]);
         irq->base.handler = mp_const_none;
         irq->base.ishard = false;
         MP_STATE_PORT(machine_pin_irq_obj[pin]) = irq;
@@ -493,6 +489,10 @@ STATIC const mp_rom_map_elem_t machine_pin_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_toggle), MP_ROM_PTR(&machine_pin_toggle_obj) },
     { MP_ROM_QSTR(MP_QSTR_irq), MP_ROM_PTR(&machine_pin_irq_obj) },
 
+    // class attributes
+    { MP_ROM_QSTR(MP_QSTR_board), MP_ROM_PTR(&pin_board_pins_obj_type) },
+    { MP_ROM_QSTR(MP_QSTR_cpu), MP_ROM_PTR(&pin_cpu_pins_obj_type) },
+
     // class constants
     { MP_ROM_QSTR(MP_QSTR_IN), MP_ROM_INT(MACHINE_PIN_MODE_IN) },
     { MP_ROM_QSTR(MP_QSTR_OUT), MP_ROM_INT(MACHINE_PIN_MODE_OUT) },
@@ -502,6 +502,17 @@ STATIC const mp_rom_map_elem_t machine_pin_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_PULL_DOWN), MP_ROM_INT(GPIO_PULL_DOWN) },
     { MP_ROM_QSTR(MP_QSTR_IRQ_RISING), MP_ROM_INT(GPIO_IRQ_EDGE_RISE) },
     { MP_ROM_QSTR(MP_QSTR_IRQ_FALLING), MP_ROM_INT(GPIO_IRQ_EDGE_FALL) },
+
+    // Pins alternate functions
+    { MP_ROM_QSTR(MP_QSTR_ALT_SPI), MP_ROM_INT(GPIO_FUNC_SPI) },
+    { MP_ROM_QSTR(MP_QSTR_ALT_UART), MP_ROM_INT(GPIO_FUNC_UART) },
+    { MP_ROM_QSTR(MP_QSTR_ALT_I2C), MP_ROM_INT(GPIO_FUNC_I2C) },
+    { MP_ROM_QSTR(MP_QSTR_ALT_PWM), MP_ROM_INT(GPIO_FUNC_PWM) },
+    { MP_ROM_QSTR(MP_QSTR_ALT_SIO), MP_ROM_INT(GPIO_FUNC_SIO) },
+    { MP_ROM_QSTR(MP_QSTR_ALT_PIO0), MP_ROM_INT(GPIO_FUNC_PIO0) },
+    { MP_ROM_QSTR(MP_QSTR_ALT_PIO1), MP_ROM_INT(GPIO_FUNC_PIO1) },
+    { MP_ROM_QSTR(MP_QSTR_ALT_GPCK), MP_ROM_INT(GPIO_FUNC_GPCK) },
+    { MP_ROM_QSTR(MP_QSTR_ALT_USB), MP_ROM_INT(GPIO_FUNC_USB) },
 };
 STATIC MP_DEFINE_CONST_DICT(machine_pin_locals_dict, machine_pin_locals_dict_table);
 
diff --git a/ports/rp2/machine_pin.h b/ports/rp2/machine_pin.h
index 83a81007c805a..c10dc4f9e82f1 100644
--- a/ports/rp2/machine_pin.h
+++ b/ports/rp2/machine_pin.h
@@ -37,19 +37,46 @@ enum {
     MACHINE_PIN_MODE_ALT = 3
 };
 
+typedef struct _machine_pin_af_obj_t {
+    mp_obj_base_t base;
+    qstr name;
+    uint8_t idx     : 4;
+    uint8_t fn      : 4;
+    uint8_t unit    : 8;
+} machine_pin_af_obj_t;
+
 typedef struct _machine_pin_obj_t {
     mp_obj_base_t base;
+    qstr name;
     uint8_t id                  : 5;
     #if MICROPY_HW_PIN_EXT_COUNT
     uint8_t is_ext              : 1;
     uint8_t is_output           : 1;
     uint8_t last_output_value   : 1;
     #endif
+    uint8_t af_num              : 4;
+    const machine_pin_af_obj_t *af;
 } machine_pin_obj_t;
 
+extern const mp_obj_type_t machine_pin_type;
+extern const mp_obj_type_t machine_pin_af_type;
+
+// Include all of the individual pin objects
+#include "genhdr/pins.h"
+
+extern const mp_obj_type_t pin_cpu_pins_obj_type;
+extern const mp_obj_dict_t pin_cpu_pins_locals_dict;
+
+extern const mp_obj_type_t pin_board_pins_obj_type;
+extern const mp_obj_dict_t pin_board_pins_locals_dict;
+
 void machine_pin_ext_init(void);
 void machine_pin_ext_set(machine_pin_obj_t *self, bool value);
 bool machine_pin_ext_get(machine_pin_obj_t *self);
 void machine_pin_ext_config(machine_pin_obj_t *self, int mode, int value);
 
+const machine_pin_obj_t *machine_pin_find_named(const mp_obj_dict_t *named_pins, mp_obj_t name);
+const machine_pin_af_obj_t *machine_pin_find_alt(const machine_pin_obj_t *pin, uint8_t fn);
+const machine_pin_af_obj_t *machine_pin_find_alt_by_index(const machine_pin_obj_t *pin, mp_uint_t af_idx);
+
 #endif // MICROPY_INCLUDED_RP2_MACHINE_PIN_H
diff --git a/ports/rp2/machine_pin_cyw43.c b/ports/rp2/machine_pin_cyw43.c
index a41a2f3caabfa..c09561461f18a 100644
--- a/ports/rp2/machine_pin_cyw43.c
+++ b/ports/rp2/machine_pin_cyw43.c
@@ -36,14 +36,7 @@
 #include "machine_pin.h"
 #include "lib/cyw43-driver/src/cyw43.h"
 
-machine_pin_obj_t ext_pin_obj[MICROPY_HW_PIN_EXT_COUNT];
-
 void machine_pin_ext_init(void) {
-    for (uint i = 0; i < count_of(ext_pin_obj); i++) {
-        ext_pin_obj[i].id = i;
-        ext_pin_obj[i].base.type = &machine_pin_type;
-        ext_pin_obj[i].is_ext = true;
-    }
 }
 
 void machine_pin_ext_set(machine_pin_obj_t *self, bool value) {

From 7d01f3817015ecfaaa15fbc28a84f4bb3f875098 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Tue, 25 Oct 2022 22:35:30 +0200
Subject: [PATCH 2999/3533] drivers/ninaw10: Implement machine.Pin external pin
 controls.

---
 drivers/ninaw10/machine_pin_nina.c            | 92 +++++++++++++++++++
 ports/rp2/CMakeLists.txt                      |  1 +
 .../mpconfigboard.h                           |  3 +
 3 files changed, 96 insertions(+)
 create mode 100644 drivers/ninaw10/machine_pin_nina.c

diff --git a/drivers/ninaw10/machine_pin_nina.c b/drivers/ninaw10/machine_pin_nina.c
new file mode 100644
index 0000000000000..23c547b81f097
--- /dev/null
+++ b/drivers/ninaw10/machine_pin_nina.c
@@ -0,0 +1,92 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2022 Ibrahim Abdelkader <iabdalkader@openmv.io>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include <stdio.h>
+#include <string.h>
+
+#include "py/runtime.h"
+#include "py/mphal.h"
+
+#if defined(MICROPY_PY_NETWORK_NINAW10) && defined(MICROPY_HW_PIN_EXT_COUNT)
+
+#include "modmachine.h"
+#include "machine_pin.h"
+#include "nina_wifi_drv.h"
+
+#define NINA_GPIO_INPUT         (0x00)
+#define NINA_GPIO_OUTPUT        (0x01)
+#define NINA_GPIO_INPUT_PULLUP  (0x02)
+
+#define NINA_GPIO_MODE          (0x50)
+#define NINA_GPIO_READ          (0x53)
+#define NINA_GPIO_WRITE         (0x51)
+
+static uint8_t pin_map[MICROPY_HW_PIN_EXT_COUNT] = {
+    27, // LEDR
+    25, // LEDG
+    26, // LEDB
+    36, // A6
+    35, // A7
+};
+
+void machine_pin_ext_init(void) {
+    nina_init();
+}
+
+void machine_pin_ext_set(machine_pin_obj_t *self, bool value) {
+    if (self->id >= 0 && self->id < MICROPY_HW_PIN_EXT_COUNT) {
+        uint8_t buf[] = {pin_map[self->id], value};
+        nina_ioctl(NINA_GPIO_WRITE, sizeof(buf), buf, 0);
+    }
+}
+
+bool machine_pin_ext_get(machine_pin_obj_t *self) {
+    bool value = false;
+    if (self->id >= 0 && self->id < MICROPY_HW_PIN_EXT_COUNT) {
+        uint8_t buf[] = {pin_map[self->id]};
+        nina_ioctl(NINA_GPIO_READ, sizeof(buf), buf, 0);
+    }
+    return value;
+}
+
+void machine_pin_ext_config(machine_pin_obj_t *self, int mode, int value) {
+    if (mode == MACHINE_PIN_MODE_IN) {
+        mode = NINA_GPIO_INPUT;
+        self->is_output = false;
+    } else if (mode == MACHINE_PIN_MODE_OUT) {
+        mode = NINA_GPIO_OUTPUT;
+        self->is_output = true;
+        machine_pin_ext_set(self, value);
+    } else {
+        mp_raise_ValueError("only Pin.OUT and Pin.IN are supported for this pin");
+    }
+    if (self->id >= 0 && self->id < MICROPY_HW_PIN_EXT_COUNT) {
+        uint8_t buf[] = {pin_map[self->id], mode};
+        nina_ioctl(NINA_GPIO_MODE, sizeof(buf), buf, 0);
+    }
+}
+
+#endif // defined(MICROPY_PY_NETWORK_NINAW10) && defined(MICROPY_HW_PIN_EXT_COUNT)
diff --git a/ports/rp2/CMakeLists.txt b/ports/rp2/CMakeLists.txt
index 88971a5c90135..485476355e5cd 100644
--- a/ports/rp2/CMakeLists.txt
+++ b/ports/rp2/CMakeLists.txt
@@ -287,6 +287,7 @@ if (MICROPY_PY_NETWORK_NINAW10)
         ${MICROPY_DIR}/drivers/ninaw10/nina_bt_hci.c
         ${MICROPY_DIR}/drivers/ninaw10/nina_wifi_drv.c
         ${MICROPY_DIR}/drivers/ninaw10/nina_wifi_bsp.c
+        ${MICROPY_DIR}/drivers/ninaw10/machine_pin_nina.c
     )
 
     list(APPEND MICROPY_SOURCE_EXTMOD
diff --git a/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/mpconfigboard.h b/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/mpconfigboard.h
index 1818b56a689fe..6498cbf560bdf 100644
--- a/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/mpconfigboard.h
+++ b/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/mpconfigboard.h
@@ -13,6 +13,9 @@
 // Disable internal error numbers.
 #define MICROPY_USE_INTERNAL_ERRNO      (0)
 
+// Enable externally controlled pins.
+#define MICROPY_HW_PIN_EXT_COUNT        (5)
+
 // Enable USB Mass Storage with FatFS filesystem.
 #define MICROPY_HW_USB_MSC              (1)
 #define MICROPY_HW_USB_VID              (0x2341)

From d02f089058b9623ea976fbeead9b8acbf4d44bc6 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Tue, 25 Oct 2022 22:42:56 +0200
Subject: [PATCH 3000/3533] rp2/boards: Add pin CSV files to board definitions.

Pin defines are:
- For Pico define board pins and the default LED pin (WL_GPIO25).
- For Pico-W define board pins, external pins and the default
  LED pin (WL_GPIO0).
- For the Nano-RP2040, define board pins, external pins and
  the default LED pin (GPIO25)
- For all other boards, the pins.csv defines the LED pin (if any)
  for backwards compatibility with code that assumes there's always
  an LED pin.
---
 .../boards/ADAFRUIT_FEATHER_RP2040/pins.csv   |  1 +
 .../boards/ADAFRUIT_ITSYBITSY_RP2040/pins.csv |  1 +
 .../ARDUINO_NANO_RP2040_CONNECT/pins.csv      | 26 ++++++++++++++++
 .../GARATRONIC_PYBSTICK26_RP2040/pins.csv     |  1 +
 ports/rp2/boards/PICO/pins.csv                | 28 +++++++++++++++++
 ports/rp2/boards/PICO_W/mpconfigboard.h       |  5 ----
 ports/rp2/boards/PICO_W/pins.csv              | 30 +++++++++++++++++++
 .../boards/PIMORONI_PICOLIPO_16MB/pins.csv    |  1 +
 .../rp2/boards/PIMORONI_PICOLIPO_4MB/pins.csv |  1 +
 ports/rp2/boards/PIMORONI_TINY2040/pins.csv   |  1 +
 ports/rp2/boards/SPARKFUN_THINGPLUS/pins.csv  |  1 +
 ports/rp2/boards/W5100S_EVB_PICO/pins.csv     |  1 +
 ports/rp2/boards/W5500_EVB_PICO/pins.csv      |  1 +
 ports/rp2/boards/WEACTSTUDIO/pins.csv         |  1 +
 14 files changed, 94 insertions(+), 5 deletions(-)
 create mode 100644 ports/rp2/boards/ADAFRUIT_FEATHER_RP2040/pins.csv
 create mode 100644 ports/rp2/boards/ADAFRUIT_ITSYBITSY_RP2040/pins.csv
 create mode 100644 ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/pins.csv
 create mode 100644 ports/rp2/boards/GARATRONIC_PYBSTICK26_RP2040/pins.csv
 create mode 100644 ports/rp2/boards/PICO/pins.csv
 create mode 100644 ports/rp2/boards/PICO_W/pins.csv
 create mode 100644 ports/rp2/boards/PIMORONI_PICOLIPO_16MB/pins.csv
 create mode 100644 ports/rp2/boards/PIMORONI_PICOLIPO_4MB/pins.csv
 create mode 100644 ports/rp2/boards/PIMORONI_TINY2040/pins.csv
 create mode 100644 ports/rp2/boards/SPARKFUN_THINGPLUS/pins.csv
 create mode 100644 ports/rp2/boards/W5100S_EVB_PICO/pins.csv
 create mode 100644 ports/rp2/boards/W5500_EVB_PICO/pins.csv
 create mode 100644 ports/rp2/boards/WEACTSTUDIO/pins.csv

diff --git a/ports/rp2/boards/ADAFRUIT_FEATHER_RP2040/pins.csv b/ports/rp2/boards/ADAFRUIT_FEATHER_RP2040/pins.csv
new file mode 100644
index 0000000000000..ee6fd99feefd8
--- /dev/null
+++ b/ports/rp2/boards/ADAFRUIT_FEATHER_RP2040/pins.csv
@@ -0,0 +1 @@
+LED,GPIO13
diff --git a/ports/rp2/boards/ADAFRUIT_ITSYBITSY_RP2040/pins.csv b/ports/rp2/boards/ADAFRUIT_ITSYBITSY_RP2040/pins.csv
new file mode 100644
index 0000000000000..1b7e7c3c73eda
--- /dev/null
+++ b/ports/rp2/boards/ADAFRUIT_ITSYBITSY_RP2040/pins.csv
@@ -0,0 +1 @@
+LED,GPIO11
diff --git a/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/pins.csv b/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/pins.csv
new file mode 100644
index 0000000000000..b398c8ec948b8
--- /dev/null
+++ b/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/pins.csv
@@ -0,0 +1,26 @@
+TX,GPIO0
+RX,GPIO1
+D2,GPIO25
+D3,GPIO15
+D4,GPIO16
+D5,GPIO17
+D6,GPIO18
+D7,GPIO19
+D8,GPIO20
+D9,GPIO21
+D10,GPIO5
+D11,GPIO7
+D12,GPIO4
+D13,GPIO6
+LED,GPIO6
+A0,GPIO26
+A1,GPIO27
+A2,GPIO28
+A3,GPIO29
+A4,GPIO12
+A5,GPIO13
+LEDR,EXT_GPIO0
+LEDG,EXT_GPIO1
+LEDB,EXT_GPIO2
+A6,EXT_GPIO3
+A7,EXT_GPIO4
diff --git a/ports/rp2/boards/GARATRONIC_PYBSTICK26_RP2040/pins.csv b/ports/rp2/boards/GARATRONIC_PYBSTICK26_RP2040/pins.csv
new file mode 100644
index 0000000000000..6b3bedc0e138d
--- /dev/null
+++ b/ports/rp2/boards/GARATRONIC_PYBSTICK26_RP2040/pins.csv
@@ -0,0 +1 @@
+LED,GPIO23
diff --git a/ports/rp2/boards/PICO/pins.csv b/ports/rp2/boards/PICO/pins.csv
new file mode 100644
index 0000000000000..16e334026424f
--- /dev/null
+++ b/ports/rp2/boards/PICO/pins.csv
@@ -0,0 +1,28 @@
+GP0,GPIO0
+GP1,GPIO1
+GP2,GPIO2
+GP3,GPIO3
+GP4,GPIO4
+GP5,GPIO5
+GP6,GPIO6
+GP7,GPIO7
+GP8,GPIO8
+GP9,GPIO9
+GP10,GPIO10
+GP11,GPIO11
+GP12,GPIO12
+GP13,GPIO13
+GP14,GPIO14
+GP15,GPIO15
+GP16,GPIO16
+GP17,GPIO17
+GP18,GPIO18
+GP19,GPIO19
+GP20,GPIO20
+GP21,GPIO21
+GP22,GPIO22
+GP25,GPIO25
+GP26,GPIO26
+GP27,GPIO27
+GP28,GPIO28
+LED,GPIO25
diff --git a/ports/rp2/boards/PICO_W/mpconfigboard.h b/ports/rp2/boards/PICO_W/mpconfigboard.h
index b3653aaeb0ada..227e7e3ff4c06 100644
--- a/ports/rp2/boards/PICO_W/mpconfigboard.h
+++ b/ports/rp2/boards/PICO_W/mpconfigboard.h
@@ -17,11 +17,6 @@
 // Debug level (0-4) 1=warning, 2=info, 3=debug, 4=verbose
 // #define MODUSSL_MBEDTLS_DEBUG_LEVEL 1
 
-#define MICROPY_HW_PIN_EXT_PREFIX   "WL_GPIO"
 #define MICROPY_HW_PIN_EXT_COUNT    CYW43_WL_GPIO_COUNT
 
-#ifdef CYW43_WL_GPIO_LED_PIN
-#define MICROPY_HW_PIN_EXT_LED_PIN_NUM CYW43_WL_GPIO_LED_PIN
-#endif
-
 #define MICROPY_HW_PIN_RESERVED(i) ((i) == CYW43_PIN_WL_HOST_WAKE || (i) == CYW43_PIN_WL_REG_ON)
diff --git a/ports/rp2/boards/PICO_W/pins.csv b/ports/rp2/boards/PICO_W/pins.csv
new file mode 100644
index 0000000000000..8debb6326e070
--- /dev/null
+++ b/ports/rp2/boards/PICO_W/pins.csv
@@ -0,0 +1,30 @@
+GP0,GPIO0
+GP1,GPIO1
+GP2,GPIO2
+GP3,GPIO3
+GP4,GPIO4
+GP5,GPIO5
+GP6,GPIO6
+GP7,GPIO7
+GP8,GPIO8
+GP9,GPIO9
+GP10,GPIO10
+GP11,GPIO11
+GP12,GPIO12
+GP13,GPIO13
+GP14,GPIO14
+GP15,GPIO15
+GP16,GPIO16
+GP17,GPIO17
+GP18,GPIO18
+GP19,GPIO19
+GP20,GPIO20
+GP21,GPIO21
+GP22,GPIO22
+GP26,GPIO26
+GP27,GPIO27
+GP28,GPIO28
+WL_GPIO0,EXT_GPIO0
+WL_GPIO1,EXT_GPIO1
+WL_GPIO2,EXT_GPIO2
+LED,EXT_GPIO0
diff --git a/ports/rp2/boards/PIMORONI_PICOLIPO_16MB/pins.csv b/ports/rp2/boards/PIMORONI_PICOLIPO_16MB/pins.csv
new file mode 100644
index 0000000000000..e75354485d94a
--- /dev/null
+++ b/ports/rp2/boards/PIMORONI_PICOLIPO_16MB/pins.csv
@@ -0,0 +1 @@
+LED,GPIO25
diff --git a/ports/rp2/boards/PIMORONI_PICOLIPO_4MB/pins.csv b/ports/rp2/boards/PIMORONI_PICOLIPO_4MB/pins.csv
new file mode 100644
index 0000000000000..e75354485d94a
--- /dev/null
+++ b/ports/rp2/boards/PIMORONI_PICOLIPO_4MB/pins.csv
@@ -0,0 +1 @@
+LED,GPIO25
diff --git a/ports/rp2/boards/PIMORONI_TINY2040/pins.csv b/ports/rp2/boards/PIMORONI_TINY2040/pins.csv
new file mode 100644
index 0000000000000..e4add1b0be897
--- /dev/null
+++ b/ports/rp2/boards/PIMORONI_TINY2040/pins.csv
@@ -0,0 +1 @@
+LED,GPIO19
diff --git a/ports/rp2/boards/SPARKFUN_THINGPLUS/pins.csv b/ports/rp2/boards/SPARKFUN_THINGPLUS/pins.csv
new file mode 100644
index 0000000000000..e75354485d94a
--- /dev/null
+++ b/ports/rp2/boards/SPARKFUN_THINGPLUS/pins.csv
@@ -0,0 +1 @@
+LED,GPIO25
diff --git a/ports/rp2/boards/W5100S_EVB_PICO/pins.csv b/ports/rp2/boards/W5100S_EVB_PICO/pins.csv
new file mode 100644
index 0000000000000..e75354485d94a
--- /dev/null
+++ b/ports/rp2/boards/W5100S_EVB_PICO/pins.csv
@@ -0,0 +1 @@
+LED,GPIO25
diff --git a/ports/rp2/boards/W5500_EVB_PICO/pins.csv b/ports/rp2/boards/W5500_EVB_PICO/pins.csv
new file mode 100644
index 0000000000000..e75354485d94a
--- /dev/null
+++ b/ports/rp2/boards/W5500_EVB_PICO/pins.csv
@@ -0,0 +1 @@
+LED,GPIO25
diff --git a/ports/rp2/boards/WEACTSTUDIO/pins.csv b/ports/rp2/boards/WEACTSTUDIO/pins.csv
new file mode 100644
index 0000000000000..e75354485d94a
--- /dev/null
+++ b/ports/rp2/boards/WEACTSTUDIO/pins.csv
@@ -0,0 +1 @@
+LED,GPIO25

From 4eefe78e8ed409641f30ad6c0edca8ca07a8e934 Mon Sep 17 00:00:00 2001
From: David Lechner <david@pybricks.com>
Date: Fri, 13 Jan 2023 11:07:47 -0600
Subject: [PATCH 3001/3533] github/workflows/code_size: Print code size change.

The intention of using `tee` is to both print the code size change in
the CI logs and save them to a file. Using redirection to a file
caused it to not print the changes.

Signed-off-by: David Lechner <david@pybricks.com>
---
 .github/workflows/code_size.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/code_size.yml b/.github/workflows/code_size.yml
index de75bfe08fa2b..5d955703b666a 100644
--- a/.github/workflows/code_size.yml
+++ b/.github/workflows/code_size.yml
@@ -28,7 +28,7 @@ jobs:
     - name: Build
       run: source tools/ci.sh && ci_code_size_build
     - name: Compute code size difference
-      run: tools/metrics.py diff ~/size0 ~/size1 | tee > diff
+      run: tools/metrics.py diff ~/size0 ~/size1 | tee diff
     - name: Save PR number
       if: github.event_name == 'pull_request'
       env:

From e78e0b7418477af78284478c3e678db7bf2298cd Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Thu, 12 Jan 2023 10:39:27 +0100
Subject: [PATCH 3002/3533] py/gc: Increase the address length in
 gc_dump_alloc_table().

Showing 8 digits instead of 5, supporting devices with more than 1 MByte of
RAM (which is common these days).  The masking was never needed, and the
related commented-out line can go.
---
 py/gc.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/py/gc.c b/py/gc.c
index 22cfdae9985f7..f11c34aefe511 100644
--- a/py/gc.c
+++ b/py/gc.c
@@ -1058,8 +1058,7 @@ void gc_dump_alloc_table(void) {
                 }
                 // print header for new line of blocks
                 // (the cast to uint32_t is for 16-bit ports)
-                // mp_printf(&mp_plat_print, "\n%05x: ", (uint)(PTR_FROM_BLOCK(area, bl) & (uint32_t)0xfffff));
-                mp_printf(&mp_plat_print, "\n%05x: ", (uint)((bl * BYTES_PER_BLOCK) & (uint32_t)0xfffff));
+                mp_printf(&mp_plat_print, "\n%08x: ", (uint)(bl * BYTES_PER_BLOCK));
             }
             int c = ' ';
             switch (ATB_GET_KIND(area, bl)) {

From 1583c1f6701a2545f0de042e886ee9afc26dfb74 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Thu, 12 Jan 2023 22:02:26 +0100
Subject: [PATCH 3003/3533] mimxrt: Set MICROPY_GC_STACK_ENTRY_TYPE to uint32_t
 for large RAM.

It was uint16_t. The change sets it to uint32_t for devices with SDRAM.

Fixes issue #10366.
---
 ports/mimxrt/mpconfigport.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ports/mimxrt/mpconfigport.h b/ports/mimxrt/mpconfigport.h
index 911fd41b46206..224714b071b55 100644
--- a/ports/mimxrt/mpconfigport.h
+++ b/ports/mimxrt/mpconfigport.h
@@ -37,7 +37,11 @@ uint32_t trng_random_u32(void);
 #define MICROPY_CONFIG_ROM_LEVEL (MICROPY_CONFIG_ROM_LEVEL_FULL_FEATURES)
 
 // Memory allocation policies
+#if MICROPY_HW_SDRAM_AVAIL
+#define MICROPY_GC_STACK_ENTRY_TYPE         uint32_t
+#else
 #define MICROPY_GC_STACK_ENTRY_TYPE         uint16_t
+#endif
 #define MICROPY_ALLOC_PARSE_CHUNK_INIT      (32)
 #define MICROPY_ALLOC_PATH_MAX              (256)
 

From bd86ce5f8213398a196019ad517df42e27fc173d Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 17 Jan 2023 17:32:53 +1100
Subject: [PATCH 3004/3533] lib/re1.5: Reduce code size when checking for named
 class char.

Signed-off-by: Damien George <damien@micropython.org>
---
 lib/re1.5/compilecode.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/re1.5/compilecode.c b/lib/re1.5/compilecode.c
index add4f6ac20859..d4fc2a2895e90 100644
--- a/lib/re1.5/compilecode.c
+++ b/lib/re1.5/compilecode.c
@@ -4,6 +4,9 @@
 
 #include "re1.5.h"
 
+// Matches: DSWdsw
+#define MATCH_NAMED_CLASS_CHAR(c) (((c) | 0x20) == 'd' || ((c) | 0x24) == 'w')
+
 #define INSERT_CODE(at, num, pc) \
     ((code ? memmove(code + at + num, code + at, pc - at) : 0), pc += num)
 #define REL(at, to) (to - at - 2)
@@ -31,7 +34,7 @@ static const char *_compilecode(const char *re, ByteProg *prog, int sizecode)
         case '\\':
             re++;
             if (!*re) return NULL; // Trailing backslash
-            if ((*re | 0x20) == 'd' || (*re | 0x20) == 's' || (*re | 0x20) == 'w') {
+            if (MATCH_NAMED_CLASS_CHAR(*re)) {
                 term = PC;
                 EMIT(PC++, NamedClass);
                 EMIT(PC++, *re);

From 64193c7de9f53e01dca447a4a902398fe85b9c06 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 22 Oct 2021 22:23:47 +1100
Subject: [PATCH 3005/3533] lib/re1.5: Add support for named classes in class
 sets.

Total code size change of this and previous commit:

   bare-arm:    +0 +0.000%
minimal x86:    +0 +0.000%
   unix x64:   +32 +0.004% standard
      stm32:   +24 +0.006% PYBV10
     cc3200:   +16 +0.009%
    esp8266:   +20 +0.003% GENERIC
      esp32:   +44 +0.003% GENERIC[incl +8(data)]
     mimxrt:   +32 +0.009% TEENSY40
 renesas-ra:   +24 +0.004% RA6M2_EK
        nrf:    +0 +0.000% pca10040
        rp2:   +24 +0.005% PICO
       samd:   +32 +0.012% ADAFRUIT_ITSYBITSY_M4_EXPRESS

Addresses issue #7920.

Signed-off-by: Damien George <damien@micropython.org>
---
 lib/re1.5/charclass.c   | 10 +++++++++-
 lib/re1.5/compilecode.c | 13 ++++++++++---
 lib/re1.5/re1.5.h       |  1 +
 3 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/lib/re1.5/charclass.c b/lib/re1.5/charclass.c
index 7f6388c93d299..2553b40530c90 100644
--- a/lib/re1.5/charclass.c
+++ b/lib/re1.5/charclass.c
@@ -6,7 +6,15 @@ int _re1_5_classmatch(const char *pc, const char *sp)
     int is_positive = (pc[-1] == Class);
     int cnt = *pc++;
     while (cnt--) {
-        if (*sp >= *pc && *sp <= pc[1]) return is_positive;
+        if (*pc == RE15_CLASS_NAMED_CLASS_INDICATOR) {
+            if (_re1_5_namedclassmatch(pc + 1, sp)) {
+                return is_positive;
+            }
+        } else {
+            if (*sp >= *pc && *sp <= pc[1]) {
+                return is_positive;
+            }
+        }
         pc += 2;
     }
     return !is_positive;
diff --git a/lib/re1.5/compilecode.c b/lib/re1.5/compilecode.c
index d4fc2a2895e90..513a155970ac5 100644
--- a/lib/re1.5/compilecode.c
+++ b/lib/re1.5/compilecode.c
@@ -66,14 +66,21 @@ static const char *_compilecode(const char *re, ByteProg *prog, int sizecode)
             PC++; // Skip # of pair byte
             prog->len++;
             for (cnt = 0; *re != ']'; re++, cnt++) {
-                if (*re == '\\') {
+                char c = *re;
+                if (c == '\\') {
                     ++re;
+                    c = *re;
+                    if (MATCH_NAMED_CLASS_CHAR(c)) {
+                        c = RE15_CLASS_NAMED_CLASS_INDICATOR;
+                        goto emit_char_pair;
+                    }
                 }
-                if (!*re) return NULL;
-                EMIT(PC++, *re);
+                if (!c) return NULL;
                 if (re[1] == '-' && re[2] != ']') {
                     re += 2;
                 }
+            emit_char_pair:
+                EMIT(PC++, c);
                 EMIT(PC++, *re);
             }
             EMIT_CHECKED(term + 1, cnt);
diff --git a/lib/re1.5/re1.5.h b/lib/re1.5/re1.5.h
index 81f43ed7f5fda..b1ec01cbc5860 100644
--- a/lib/re1.5/re1.5.h
+++ b/lib/re1.5/re1.5.h
@@ -138,6 +138,7 @@ struct Subject {
 
 #define NON_ANCHORED_PREFIX 5
 #define HANDLE_ANCHORED(bytecode, is_anchored) ((is_anchored) ? (bytecode) + NON_ANCHORED_PREFIX : (bytecode))
+#define RE15_CLASS_NAMED_CLASS_INDICATOR 0
 
 int re1_5_backtrack(ByteProg*, Subject*, const char**, int, int);
 int re1_5_pikevm(ByteProg*, Subject*, const char**, int, int);

From fc745d85febd3f8d407f38a5002ae39fba39cd07 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 18 Jan 2023 09:13:35 +1100
Subject: [PATCH 3006/3533] tests/extmod/ure_namedclass: Add tests for named
 classes in class sets.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/extmod/ure_namedclass.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/tests/extmod/ure_namedclass.py b/tests/extmod/ure_namedclass.py
index 00d58ad98adb0..4afc09dc0abe1 100644
--- a/tests/extmod/ure_namedclass.py
+++ b/tests/extmod/ure_namedclass.py
@@ -15,7 +15,7 @@ def print_groups(match):
     try:
         i = 0
         while True:
-            print(m.group(i))
+            print(match.group(i))
             i += 1
     except IndexError:
         pass
@@ -32,3 +32,8 @@ def print_groups(match):
 
 m = re.match(r"(([0-9]*)([a-z]*)\d*)", "1234hello567")
 print_groups(m)
+
+# named class within a class set
+print_groups(re.match("([^\s]+)\s*([^\s]+)", "1 23"))
+print_groups(re.match("([\s\d]+)([\W]+)", "1  2-+="))
+print_groups(re.match("([\W]+)([^\W]+)([^\S]+)([^\D]+)", " a_1 23"))

From efb4bd35551ef1de393c088ce6d75ced7e810b64 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sat, 24 Dec 2022 09:37:02 +0100
Subject: [PATCH 3007/3533] esp32/network_lan: Add support for LAN8710 PHY.

LAN8710 uses the same drivers as LAN8720, so this commit just adds the
names.  Alternatively, both could be summarised under LAN87xx, like the
esp-idf does.
---
 ports/esp32/modnetwork.c  | 1 +
 ports/esp32/modnetwork.h  | 2 +-
 ports/esp32/network_lan.c | 4 +++-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/ports/esp32/modnetwork.c b/ports/esp32/modnetwork.c
index 7429274c1571d..cc066f361f69d 100644
--- a/ports/esp32/modnetwork.c
+++ b/ports/esp32/modnetwork.c
@@ -261,6 +261,7 @@ STATIC const mp_rom_map_elem_t mp_module_network_globals_table[] = {
     #endif
 
     #if (ESP_IDF_VERSION_MAJOR == 4) && (ESP_IDF_VERSION_MINOR >= 1) && (CONFIG_IDF_TARGET_ESP32)
+    { MP_ROM_QSTR(MP_QSTR_PHY_LAN8710), MP_ROM_INT(PHY_LAN8710) },
     { MP_ROM_QSTR(MP_QSTR_PHY_LAN8720), MP_ROM_INT(PHY_LAN8720) },
     { MP_ROM_QSTR(MP_QSTR_PHY_IP101), MP_ROM_INT(PHY_IP101) },
     { MP_ROM_QSTR(MP_QSTR_PHY_RTL8201), MP_ROM_INT(PHY_RTL8201) },
diff --git a/ports/esp32/modnetwork.h b/ports/esp32/modnetwork.h
index 7bcfa0e6fcdb4..5d1c3aaf7cc9c 100644
--- a/ports/esp32/modnetwork.h
+++ b/ports/esp32/modnetwork.h
@@ -28,7 +28,7 @@
 
 #include "esp_event.h"
 
-enum { PHY_LAN8720, PHY_IP101, PHY_RTL8201, PHY_DP83848, PHY_KSZ8041 };
+enum { PHY_LAN8710, PHY_LAN8720, PHY_IP101, PHY_RTL8201, PHY_DP83848, PHY_KSZ8041 };
 enum { ETH_INITIALIZED, ETH_STARTED, ETH_STOPPED, ETH_CONNECTED, ETH_DISCONNECTED, ETH_GOT_IP };
 
 // Cases similar to ESP8266 user_interface.h
diff --git a/ports/esp32/network_lan.c b/ports/esp32/network_lan.c
index c57d7815d7cab..3cd1efc0430b2 100644
--- a/ports/esp32/network_lan.c
+++ b/ports/esp32/network_lan.c
@@ -125,7 +125,8 @@ STATIC mp_obj_t get_lan(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_ar
     }
     self->phy_addr = args[ARG_phy_addr].u_int;
 
-    if (args[ARG_phy_type].u_int != PHY_LAN8720 &&
+    if (args[ARG_phy_type].u_int != PHY_LAN8710 &&
+        args[ARG_phy_type].u_int != PHY_LAN8720 &&
         args[ARG_phy_type].u_int != PHY_IP101 &&
         args[ARG_phy_type].u_int != PHY_RTL8201 &&
         #if ESP_IDF_VERSION_MINOR >= 3      // KSZ8041 is new in ESP-IDF v4.3
@@ -146,6 +147,7 @@ STATIC mp_obj_t get_lan(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_ar
     self->phy = NULL;
 
     switch (args[ARG_phy_type].u_int) {
+        case PHY_LAN8710:
         case PHY_LAN8720:
             self->phy = esp_eth_phy_new_lan8720(&phy_config);
             break;

From 4b52003fb822c04651009b109ba403a23965cb0d Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sat, 24 Dec 2022 16:52:55 +0100
Subject: [PATCH 3008/3533] esp32/network_lan: Support configuration of ETH
 ref_clk pin.

Both the direction and the Pin used for ref_clk can now be configured.  It
Requires at least idf v4.4.  The new keyword arguments to the constructor
are:

- ref_clk_mode=mode: with mode being Pin.IN or Pin.OUT.  If it is not set,
  then the default configuration is used, which may be configured by
  kconfig settings.

- ref_clk=pin_obj: which defines the Pin used for ref_clk.  This is either
  Pin(0), Pin(16) or Pin(17).  No check is done for the pin number.  If it
  is the wrong one, it simply will not work.  Besides that, no harm.
---
 ports/esp32/network_lan.c | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/ports/esp32/network_lan.c b/ports/esp32/network_lan.c
index 3cd1efc0430b2..471e31d627d14 100644
--- a/ports/esp32/network_lan.c
+++ b/ports/esp32/network_lan.c
@@ -97,7 +97,8 @@ STATIC mp_obj_t get_lan(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_ar
         return MP_OBJ_FROM_PTR(&lan_obj);
     }
 
-    enum { ARG_id, ARG_mdc, ARG_mdio, ARG_power, ARG_phy_addr, ARG_phy_type };
+    enum { ARG_id, ARG_mdc, ARG_mdio, ARG_power, ARG_phy_addr, ARG_phy_type,
+           ARG_ref_clk_mode, ARG_ref_clk };
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_id,           MP_ARG_OBJ, {.u_obj = mp_const_none} },
         { MP_QSTR_mdc,          MP_ARG_KW_ONLY | MP_ARG_REQUIRED | MP_ARG_OBJ },
@@ -105,6 +106,11 @@ STATIC mp_obj_t get_lan(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_ar
         { MP_QSTR_power,        MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = mp_const_none} },
         { MP_QSTR_phy_addr,     MP_ARG_KW_ONLY | MP_ARG_REQUIRED | MP_ARG_INT },
         { MP_QSTR_phy_type,     MP_ARG_KW_ONLY | MP_ARG_REQUIRED | MP_ARG_INT },
+        // Dynamic ref_clk configuration available at v4.4
+        #if ESP_IDF_VERSION_MINOR >= 4
+        { MP_QSTR_ref_clk_mode, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} },
+        { MP_QSTR_ref_clk,      MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = mp_const_none} },
+        #endif
     };
 
     mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
@@ -139,6 +145,17 @@ STATIC mp_obj_t get_lan(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_ar
     eth_mac_config_t mac_config = ETH_MAC_DEFAULT_CONFIG();
     mac_config.smi_mdc_gpio_num = self->mdc_pin;
     mac_config.smi_mdio_gpio_num = self->mdio_pin;
+    // Dynamic ref_clk configuration available at v4.4
+    #if ESP_IDF_VERSION_MINOR >= 4
+    if (args[ARG_ref_clk_mode].u_int != -1) {
+        // Map the GPIO_MODE constants to EMAC_CLK constants.
+        mac_config.clock_config.rmii.clock_mode =
+            args[ARG_ref_clk_mode].u_int == GPIO_MODE_INPUT ? EMAC_CLK_EXT_IN : EMAC_CLK_OUT;
+    }
+    if (args[ARG_ref_clk].u_obj != mp_const_none) {
+        mac_config.clock_config.rmii.clock_gpio = machine_pin_get_id(args[ARG_ref_clk].u_obj);
+    }
+    #endif
     esp_eth_mac_t *mac = esp_eth_mac_new_esp32(&mac_config);
 
     eth_phy_config_t phy_config = ETH_PHY_DEFAULT_CONFIG();

From 30bac47b1256154b8fd10508404068daeda19e71 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sun, 25 Dec 2022 11:27:24 +0100
Subject: [PATCH 3009/3533] docs/esp32/quickref: Add docs for the LAN interface
 constructor.

Incorporating PR #7356.
---
 docs/esp32/quickref.rst | 64 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 64 insertions(+)

diff --git a/docs/esp32/quickref.rst b/docs/esp32/quickref.rst
index 03ca97c7a7df0..f74926c374602 100644
--- a/docs/esp32/quickref.rst
+++ b/docs/esp32/quickref.rst
@@ -68,6 +68,9 @@ by reading the temperature sensor immediately after waking up from sleep.
 Networking
 ----------
 
+WLAN
+^^^^
+
 The :mod:`network` module::
 
     import network
@@ -110,6 +113,67 @@ calling ``wlan.config(reconnects=n)``, where n are the number of desired reconne
 attempts (0 means it won't retry, -1 will restore the default behaviour of trying
 to reconnect forever).
 
+LAN
+^^^
+
+To use the wired interfaces one has to specify the pins and mode ::
+
+    import network
+
+    lan = network.LAN(mdc=PIN_MDC, ...)   # Set the pin and mode configuration
+    lan.active(True)                      # activate the interface
+    lan.ifconfig()                        # get the interface's IP/netmask/gw/DNS addresses
+
+
+The keyword arguments for the constructor defining the PHY type and interface are:
+
+- mdc=pin-object    # set the mdc and mdio pins.
+- mdio=pin-object
+- power=pin-object  # set the pin which switches the power of the PHY device.
+- phy_type=<type>   # Select the PHY device type. Supported devices are PHY_LAN8710,
+  PHY_LAN8720, PH_IP101, PHY_RTL8201, PHY_DP83848 and PHY_KSZ8041
+- phy_addr=number   # The address number of the PHY device.
+- ref_clk_mode=mode # Defines, whether the ref_clk at the ESP32 is an input
+  or output. Suitable values are Pin.IN and Pin.OUT.
+- ref_clk=pin-object  # defines the Pin used for ref_clk.
+
+The options ref_clk_mode and ref_clk require at least esp-idf version 4.4. For
+earlier esp-idf versions, these parameters must be defined by kconfig board options.
+
+These are working configurations for LAN interfaces of popular boards::
+
+    # Olimex ESP32-GATEWAY: power controlled by Pin(5)
+    # Olimex ESP32 PoE and ESP32-PoE ISO: power controlled by Pin(12)
+
+    lan = network.LAN(mdc=machine.Pin(23), mdio=machine.Pin(18), power=machine.Pin(5),
+                      phy_type=network.PHY_LAN8720, phy_addr=0)
+
+    # or with dynamic ref_clk pin configuration
+
+    lan = network.LAN(mdc=machine.Pin(23), mdio=machine.Pin(18), power=machine.Pin(5), 
+                      phy_type=network.PHY_LAN8720, phy_addr=0,
+                      ref_clk=machine.Pin(17), ref_clk_mode=machine.Pin.OUT)
+
+    # Wireless-Tag's WT32-ETH01
+
+    lan = network.LAN(mdc=machine.Pin(23), mdio=machine.Pin(18),
+                      phy_type=network.PHY_LAN8720, phy_addr=1, power=None)
+
+    # Espressif ESP32-Ethernet-Kit_A_V1.2
+
+    lan = network.LAN(id=0, mdc=Pin(23), mdio=Pin(18), power=Pin(5),
+                      phy_type=network.PHY_IP101, phy_addr=1)
+
+A suitable definition of the PHY interface in a sdkconfig.board file is::
+
+    CONFIG_ETH_PHY_INTERFACE_RMII=y
+    CONFIG_ETH_RMII_CLK_OUTPUT=y
+    CONFIG_ETH_RMII_CLK_OUT_GPIO=17
+    CONFIG_LWIP_LOCAL_HOSTNAME="ESP32_POE"
+
+The value assigned to CONFIG_ETH_RMII_CLK_OUT_GPIO may vary depending on the
+board's wiring.
+
 Delay and timing
 ----------------
 

From e982c1d8de27145579b8ece24af81d8c7d07a99d Mon Sep 17 00:00:00 2001
From: Damien Tournoud <damien@platform.sh>
Date: Thu, 12 Jan 2023 21:04:07 -0800
Subject: [PATCH 3010/3533] esp32/network_lan: Add support for SPI-based
 ethernet chips.

Add support for various SPI-based ethernet chips (W5500, KSZ8851SNL,
DM9051) to the ESP32 port.  This leverages the existing support in ESP-IDF
for these chips -- which configures these chips in "MAC raw" mode -- and
the existing support for network.LAN in the ESP32 port.  In particular,
this doesn't leverage the wiznet5k support that is used on the rp2 and
stm32 ports (because that's for native use of lwIP).

Tested on the POE Featherwing (with the SJIRQ solder jumper bridged) and a
ESP32-S3 feather.

A note about the interrupt pin: The W5500 implementation within ESP-IDF
relies on hardware interrupt, and requires the interrupt pin from the W5500
to be wired to a GPIO.  This is not the case by default on the Adafruit
Ethernet FeatherWing, which makes it not directly compatible with this
implementation.
---
 ports/esp32/machine_hw_spi.c |   8 +++
 ports/esp32/modnetwork.c     |  14 +++-
 ports/esp32/modnetwork.h     |   3 +-
 ports/esp32/mpconfigport.h   |  18 +++++
 ports/esp32/mphalport.h      |   4 ++
 ports/esp32/network_lan.c    | 128 ++++++++++++++++++++++++++++++-----
 6 files changed, 155 insertions(+), 20 deletions(-)

diff --git a/ports/esp32/machine_hw_spi.c b/ports/esp32/machine_hw_spi.c
index 35ecc397b339b..36f8d3f06956a 100644
--- a/ports/esp32/machine_hw_spi.c
+++ b/ports/esp32/machine_hw_spi.c
@@ -533,6 +533,14 @@ mp_obj_t machine_hw_spi_make_new(const mp_obj_type_t *type, size_t n_args, size_
     return MP_OBJ_FROM_PTR(self);
 }
 
+spi_host_device_t machine_hw_spi_get_host(mp_obj_t in) {
+    if (mp_obj_get_type(in) != &machine_spi_type) {
+        mp_raise_ValueError(MP_ERROR_TEXT("expecting a SPI object"));
+    }
+    machine_hw_spi_obj_t *self = (machine_hw_spi_obj_t *)in;
+    return self->host;
+}
+
 STATIC const mp_machine_spi_p_t machine_hw_spi_p = {
     .init = machine_hw_spi_init,
     .deinit = machine_hw_spi_deinit,
diff --git a/ports/esp32/modnetwork.c b/ports/esp32/modnetwork.c
index cc066f361f69d..3ebba2ade982d 100644
--- a/ports/esp32/modnetwork.c
+++ b/ports/esp32/modnetwork.c
@@ -229,7 +229,7 @@ STATIC const mp_rom_map_elem_t mp_module_network_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_WLAN), MP_ROM_PTR(&get_wlan_obj) },
     #endif
 
-    #if (ESP_IDF_VERSION_MAJOR == 4) && (ESP_IDF_VERSION_MINOR >= 1) && (CONFIG_IDF_TARGET_ESP32)
+    #if MICROPY_PY_NETWORK_LAN
     { MP_ROM_QSTR(MP_QSTR_LAN), MP_ROM_PTR(&get_lan_obj) },
     #endif
     { MP_ROM_QSTR(MP_QSTR_PPP), MP_ROM_PTR(&ppp_make_new_obj) },
@@ -260,7 +260,7 @@ STATIC const mp_rom_map_elem_t mp_module_network_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_AUTH_MAX), MP_ROM_INT(WIFI_AUTH_MAX) },
     #endif
 
-    #if (ESP_IDF_VERSION_MAJOR == 4) && (ESP_IDF_VERSION_MINOR >= 1) && (CONFIG_IDF_TARGET_ESP32)
+    #if MICROPY_PY_NETWORK_LAN
     { MP_ROM_QSTR(MP_QSTR_PHY_LAN8710), MP_ROM_INT(PHY_LAN8710) },
     { MP_ROM_QSTR(MP_QSTR_PHY_LAN8720), MP_ROM_INT(PHY_LAN8720) },
     { MP_ROM_QSTR(MP_QSTR_PHY_IP101), MP_ROM_INT(PHY_IP101) },
@@ -271,6 +271,16 @@ STATIC const mp_rom_map_elem_t mp_module_network_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_PHY_KSZ8041), MP_ROM_INT(PHY_KSZ8041) },
     #endif
 
+    #if CONFIG_ETH_SPI_ETHERNET_KSZ8851SNL
+    { MP_ROM_QSTR(MP_QSTR_PHY_KSZ8851SNL), MP_ROM_INT(PHY_KSZ8851SNL) },
+    #endif
+    #if CONFIG_ETH_SPI_ETHERNET_DM9051
+    { MP_ROM_QSTR(MP_QSTR_PHY_DM9051), MP_ROM_INT(PHY_DM9051) },
+    #endif
+    #if CONFIG_ETH_SPI_ETHERNET_W5500
+    { MP_ROM_QSTR(MP_QSTR_PHY_W5500), MP_ROM_INT(PHY_W5500) },
+    #endif
+
     { MP_ROM_QSTR(MP_QSTR_ETH_INITIALIZED), MP_ROM_INT(ETH_INITIALIZED)},
     { MP_ROM_QSTR(MP_QSTR_ETH_STARTED), MP_ROM_INT(ETH_STARTED)},
     { MP_ROM_QSTR(MP_QSTR_ETH_STOPPED), MP_ROM_INT(ETH_STOPPED)},
diff --git a/ports/esp32/modnetwork.h b/ports/esp32/modnetwork.h
index 5d1c3aaf7cc9c..49bbd9c4960ec 100644
--- a/ports/esp32/modnetwork.h
+++ b/ports/esp32/modnetwork.h
@@ -28,7 +28,8 @@
 
 #include "esp_event.h"
 
-enum { PHY_LAN8710, PHY_LAN8720, PHY_IP101, PHY_RTL8201, PHY_DP83848, PHY_KSZ8041 };
+enum { PHY_LAN8710, PHY_LAN8720, PHY_IP101, PHY_RTL8201, PHY_DP83848, PHY_KSZ8041, PHY_KSZ8851SNL = 100, PHY_DM9051, PHY_W5500 };
+#define IS_SPI_PHY(NUM) (NUM >= 100)
 enum { ETH_INITIALIZED, ETH_STARTED, ETH_STOPPED, ETH_CONNECTED, ETH_DISCONNECTED, ETH_GOT_IP };
 
 // Cases similar to ESP8266 user_interface.h
diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h
index d8822980b7de8..38468cf9cfbb3 100644
--- a/ports/esp32/mpconfigport.h
+++ b/ports/esp32/mpconfigport.h
@@ -217,3 +217,21 @@ typedef long mp_off_t;
 #endif
 
 void boardctrl_startup(void);
+
+#ifndef MICROPY_PY_NETWORK_LAN
+#if (ESP_IDF_VERSION_MAJOR == 4) && (ESP_IDF_VERSION_MINOR >= 1) && (CONFIG_IDF_TARGET_ESP32 || (CONFIG_ETH_USE_SPI_ETHERNET && (CONFIG_ETH_SPI_ETHERNET_KSZ8851SNL || CONFIG_ETH_SPI_ETHERNET_DM9051 || CONFIG_ETH_SPI_ETHERNET_W5500)))
+#define MICROPY_PY_NETWORK_LAN              (1)
+#else
+#define MICROPY_PY_NETWORK_LAN              (0)
+#endif
+#endif
+
+#if MICROPY_PY_NETWORK_LAN && CONFIG_ETH_USE_SPI_ETHERNET
+#ifndef MICROPY_PY_NETWORK_LAN_SPI_CLOCK_SPEED_MZ
+#if CONFIG_IDF_TARGET_ESP32 || CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C2
+#define MICROPY_PY_NETWORK_LAN_SPI_CLOCK_SPEED_MZ       (12)
+#else
+#define MICROPY_PY_NETWORK_LAN_SPI_CLOCK_SPEED_MZ       (36)
+#endif
+#endif
+#endif
diff --git a/ports/esp32/mphalport.h b/ports/esp32/mphalport.h
index c838bd228420d..7f14b6e188132 100644
--- a/ports/esp32/mphalport.h
+++ b/ports/esp32/mphalport.h
@@ -35,6 +35,8 @@
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"
 
+#include "driver/spi_master.h"
+
 #define MICROPY_PLATFORM_VERSION "IDF" IDF_VER
 
 // The core that the MicroPython task(s) are pinned to.
@@ -111,4 +113,6 @@ static inline void mp_hal_pin_write(mp_hal_pin_obj_t pin, int v) {
     gpio_set_level(pin, v);
 }
 
+spi_host_device_t machine_hw_spi_get_host(mp_obj_t in);
+
 #endif // INCLUDED_MPHALPORT_H
diff --git a/ports/esp32/network_lan.c b/ports/esp32/network_lan.c
index 471e31d627d14..f63c7ef8eb083 100644
--- a/ports/esp32/network_lan.c
+++ b/ports/esp32/network_lan.c
@@ -33,13 +33,16 @@
 #include "esp_idf_version.h"
 
 // LAN only for ESP32 (not ESP32S2) and only for ESP-IDF v4.1 and higher
-#if (ESP_IDF_VERSION_MAJOR == 4) && (ESP_IDF_VERSION_MINOR >= 1) && (CONFIG_IDF_TARGET_ESP32)
+#if MICROPY_PY_NETWORK_LAN
 
 #include "esp_eth.h"
 #include "esp_eth_mac.h"
 #include "esp_event.h"
 #include "esp_log.h"
 #include "esp_netif.h"
+#if CONFIG_ETH_USE_SPI_ETHERNET
+#include "driver/spi_master.h"
+#endif
 
 #include "modnetwork.h"
 
@@ -48,9 +51,11 @@ typedef struct _lan_if_obj_t {
     int if_id; // MUST BE FIRST to match wlan_if_obj_t
     bool initialized;
     bool active;
-    uint8_t mdc_pin;
-    uint8_t mdio_pin;
+    int8_t mdc_pin;
+    int8_t mdio_pin;
     int8_t phy_power_pin;
+    int8_t phy_cs_pin;
+    int8_t phy_int_pin;
     uint8_t phy_addr;
     uint8_t phy_type;
     esp_eth_phy_t *phy;
@@ -98,19 +103,22 @@ STATIC mp_obj_t get_lan(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_ar
     }
 
     enum { ARG_id, ARG_mdc, ARG_mdio, ARG_power, ARG_phy_addr, ARG_phy_type,
-           ARG_ref_clk_mode, ARG_ref_clk };
+           ARG_ref_clk_mode, ARG_ref_clk, ARG_spi, ARG_cs, ARG_int };
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_id,           MP_ARG_OBJ, {.u_obj = mp_const_none} },
-        { MP_QSTR_mdc,          MP_ARG_KW_ONLY | MP_ARG_REQUIRED | MP_ARG_OBJ },
-        { MP_QSTR_mdio,         MP_ARG_KW_ONLY | MP_ARG_REQUIRED | MP_ARG_OBJ },
+        { MP_QSTR_mdc,          MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = mp_const_none} },
+        { MP_QSTR_mdio,         MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = mp_const_none} },
         { MP_QSTR_power,        MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = mp_const_none} },
         { MP_QSTR_phy_addr,     MP_ARG_KW_ONLY | MP_ARG_REQUIRED | MP_ARG_INT },
         { MP_QSTR_phy_type,     MP_ARG_KW_ONLY | MP_ARG_REQUIRED | MP_ARG_INT },
-        // Dynamic ref_clk configuration available at v4.4
         #if ESP_IDF_VERSION_MINOR >= 4
+        // Dynamic ref_clk configuration available at v4.4
         { MP_QSTR_ref_clk_mode, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} },
         { MP_QSTR_ref_clk,      MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = mp_const_none} },
         #endif
+        { MP_QSTR_spi,          MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = mp_const_none} },
+        { MP_QSTR_cs,           MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = mp_const_none} },
+        { MP_QSTR_int,          MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = mp_const_none} },
     };
 
     mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
@@ -122,9 +130,13 @@ STATIC mp_obj_t get_lan(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_ar
         }
     }
 
-    self->mdc_pin = machine_pin_get_id(args[ARG_mdc].u_obj);
-    self->mdio_pin = machine_pin_get_id(args[ARG_mdio].u_obj);
-    self->phy_power_pin = args[ARG_power].u_obj == mp_const_none ? -1 : machine_pin_get_id(args[ARG_power].u_obj);
+    #define GET_PIN(XXX) args[XXX].u_obj == mp_const_none ? -1 : machine_pin_get_id(args[XXX].u_obj);
+
+    self->mdc_pin = GET_PIN(ARG_mdc);
+    self->mdio_pin = GET_PIN(ARG_mdio);
+    self->phy_power_pin = GET_PIN(ARG_power);
+    self->phy_cs_pin = GET_PIN(ARG_cs);
+    self->phy_int_pin = GET_PIN(ARG_int);
 
     if (args[ARG_phy_addr].u_int < 0x00 || args[ARG_phy_addr].u_int > 0x1f) {
         mp_raise_ValueError(MP_ERROR_TEXT("invalid phy address"));
@@ -138,13 +150,24 @@ STATIC mp_obj_t get_lan(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_ar
         #if ESP_IDF_VERSION_MINOR >= 3      // KSZ8041 is new in ESP-IDF v4.3
         args[ARG_phy_type].u_int != PHY_KSZ8041 &&
         #endif
+        #if CONFIG_ETH_USE_SPI_ETHERNET
+        #if CONFIG_ETH_SPI_ETHERNET_KSZ8851SNL
+        args[ARG_phy_type].u_int != PHY_KSZ8851SNL &&
+        #endif
+        #if CONFIG_ETH_SPI_ETHERNET_DM9051
+        args[ARG_phy_type].u_int != PHY_DM9051 &&
+        #endif
+        #if CONFIG_ETH_SPI_ETHERNET_W5500
+        args[ARG_phy_type].u_int != PHY_W5500 &&
+        #endif
+        #endif
         args[ARG_phy_type].u_int != PHY_DP83848) {
         mp_raise_ValueError(MP_ERROR_TEXT("invalid phy type"));
     }
 
     eth_mac_config_t mac_config = ETH_MAC_DEFAULT_CONFIG();
-    mac_config.smi_mdc_gpio_num = self->mdc_pin;
-    mac_config.smi_mdio_gpio_num = self->mdio_pin;
+    esp_eth_mac_t *mac = NULL;
+
     // Dynamic ref_clk configuration available at v4.4
     #if ESP_IDF_VERSION_MINOR >= 4
     if (args[ARG_ref_clk_mode].u_int != -1) {
@@ -156,14 +179,46 @@ STATIC mp_obj_t get_lan(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_ar
         mac_config.clock_config.rmii.clock_gpio = machine_pin_get_id(args[ARG_ref_clk].u_obj);
     }
     #endif
-    esp_eth_mac_t *mac = esp_eth_mac_new_esp32(&mac_config);
 
     eth_phy_config_t phy_config = ETH_PHY_DEFAULT_CONFIG();
     phy_config.phy_addr = self->phy_addr;
     phy_config.reset_gpio_num = self->phy_power_pin;
     self->phy = NULL;
 
+    #if CONFIG_ETH_USE_SPI_ETHERNET
+    spi_device_handle_t spi_handle = NULL;
+    if (IS_SPI_PHY(args[ARG_phy_type].u_int)) {
+        spi_device_interface_config_t devcfg = {
+            .mode = 0,
+            .clock_speed_hz = MICROPY_PY_NETWORK_LAN_SPI_CLOCK_SPEED_MZ * 1000 * 1000,
+            .queue_size = 20,
+            .spics_io_num = self->phy_cs_pin,
+        };
+        switch (args[ARG_phy_type].u_int) {
+            #if CONFIG_ETH_SPI_ETHERNET_DM9051
+            case PHY_DM9051: {
+                devcfg.command_bits = 1;
+                devcfg.address_bits = 7;
+                break;
+            }
+            #endif
+            #if CONFIG_ETH_SPI_ETHERNET_W5500
+            case PHY_W5500: {
+                devcfg.command_bits = 16;
+                devcfg.address_bits = 8;
+                break;
+            }
+            #endif
+        }
+        spi_host_device_t host = machine_hw_spi_get_host(args[ARG_spi].u_obj);
+        if (spi_bus_add_device(host, &devcfg, &spi_handle) != ESP_OK) {
+            mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("spi_bus_add_device failed"));
+        }
+    }
+    #endif
+
     switch (args[ARG_phy_type].u_int) {
+        #if CONFIG_IDF_TARGET_ESP32
         case PHY_LAN8710:
         case PHY_LAN8720:
             self->phy = esp_eth_phy_new_lan8720(&phy_config);
@@ -177,15 +232,54 @@ STATIC mp_obj_t get_lan(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_ar
         case PHY_DP83848:
             self->phy = esp_eth_phy_new_dp83848(&phy_config);
             break;
+        #if ESP_IDF_VERSION_MINOR >= 3 // KSZ8041 is new in ESP-IDF v4.3
         case PHY_KSZ8041:
-            #if ESP_IDF_VERSION_MINOR >= 3      // KSZ8041 is new in ESP-IDF v4.3
             self->phy = esp_eth_phy_new_ksz8041(&phy_config);
             break;
-            #endif
-        default:
-            mp_raise_ValueError(MP_ERROR_TEXT("unknown phy"));
+        #endif
+        #endif
+        #if CONFIG_ETH_USE_SPI_ETHERNET
+        #if CONFIG_ETH_SPI_ETHERNET_KSZ8851SNL
+        case PHY_KSZ8851SNL: {
+            eth_ksz8851snl_config_t chip_config = ETH_KSZ8851SNL_DEFAULT_CONFIG(spi_handle);
+            chip_config.int_gpio_num = self->phy_int_pin;
+            mac = esp_eth_mac_new_ksz8851snl(&chip_config, &mac_config);
+            self->phy = esp_eth_phy_new_ksz8851snl(&phy_config);
+            break;
+        }
+        #endif
+        #if CONFIG_ETH_SPI_ETHERNET_DM9051
+        case PHY_DM9051: {
+            eth_dm9051_config_t chip_config = ETH_DM9051_DEFAULT_CONFIG(spi_handle);
+            chip_config.int_gpio_num = self->phy_int_pin;
+            mac = esp_eth_mac_new_dm9051(&chip_config, &mac_config);
+            self->phy = esp_eth_phy_new_dm9051(&phy_config);
+            break;
+        }
+        #endif
+        #if CONFIG_ETH_SPI_ETHERNET_W5500
+        case PHY_W5500: {
+            eth_w5500_config_t chip_config = ETH_W5500_DEFAULT_CONFIG(spi_handle);
+            chip_config.int_gpio_num = self->phy_int_pin;
+            mac = esp_eth_mac_new_w5500(&chip_config, &mac_config);
+            self->phy = esp_eth_phy_new_w5500(&phy_config);
+            break;
+        }
+        #endif
+        #endif
     }
 
+    #if CONFIG_IDF_TARGET_ESP32
+    if (!IS_SPI_PHY(args[ARG_phy_type].u_int)) {
+        if (self->mdc_pin == -1 || self->mdio_pin == -1) {
+            mp_raise_ValueError(MP_ERROR_TEXT("mdc and mdio must be specified"));
+        }
+        mac_config.smi_mdc_gpio_num = self->mdc_pin;
+        mac_config.smi_mdio_gpio_num = self->mdio_pin;
+        mac = esp_eth_mac_new_esp32(&mac_config);
+    }
+    #endif
+
     if (esp_netif_init() != ESP_OK) {
         mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("esp_netif_init failed"));
     }

From c7301b8d03d4681247c892d260696b0bfa4139d9 Mon Sep 17 00:00:00 2001
From: Damien Tournoud <damien@platform.sh>
Date: Thu, 12 Jan 2023 21:04:07 -0800
Subject: [PATCH 3011/3533] esp32/network_lan: Fix setting MAC address of
 ethernet devices.

`esp_eth_ioctl(ETH_CMD_S_MAC_ADDR)` sets the MAC address of the hardware
device, but we also need to notify the upper layers of the change so that
e.g. DHCP work properly.
---
 ports/esp32/network_lan.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/ports/esp32/network_lan.c b/ports/esp32/network_lan.c
index f63c7ef8eb083..13d0bbd16fb44 100644
--- a/ports/esp32/network_lan.c
+++ b/ports/esp32/network_lan.c
@@ -374,7 +374,12 @@ STATIC mp_obj_t lan_config(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs
                         if (bufinfo.len != 6) {
                             mp_raise_ValueError(MP_ERROR_TEXT("invalid buffer length"));
                         }
-                        esp_eth_ioctl(self->eth_handle, ETH_CMD_S_MAC_ADDR, bufinfo.buf);
+                        if (
+                            (esp_eth_ioctl(self->eth_handle, ETH_CMD_S_MAC_ADDR, bufinfo.buf) != ESP_OK) ||
+                            (esp_netif_set_mac(self->eth_netif, bufinfo.buf) != ESP_OK)
+                            ) {
+                            mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("failed setting MAC address"));
+                        }
                         break;
                     }
                     default:

From 67097d8c2b3887f7b177564c230d0bf34d23bb43 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 18 Jan 2023 13:47:10 +1100
Subject: [PATCH 3012/3533] esp32/network_lan: Fix compilation on IDF lower
 than v4.4.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/network_lan.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ports/esp32/network_lan.c b/ports/esp32/network_lan.c
index 13d0bbd16fb44..d482f950649ad 100644
--- a/ports/esp32/network_lan.c
+++ b/ports/esp32/network_lan.c
@@ -103,7 +103,7 @@ STATIC mp_obj_t get_lan(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_ar
     }
 
     enum { ARG_id, ARG_mdc, ARG_mdio, ARG_power, ARG_phy_addr, ARG_phy_type,
-           ARG_ref_clk_mode, ARG_ref_clk, ARG_spi, ARG_cs, ARG_int };
+           ARG_spi, ARG_cs, ARG_int, ARG_ref_clk_mode, ARG_ref_clk };
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_id,           MP_ARG_OBJ, {.u_obj = mp_const_none} },
         { MP_QSTR_mdc,          MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = mp_const_none} },
@@ -111,14 +111,14 @@ STATIC mp_obj_t get_lan(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_ar
         { MP_QSTR_power,        MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = mp_const_none} },
         { MP_QSTR_phy_addr,     MP_ARG_KW_ONLY | MP_ARG_REQUIRED | MP_ARG_INT },
         { MP_QSTR_phy_type,     MP_ARG_KW_ONLY | MP_ARG_REQUIRED | MP_ARG_INT },
+        { MP_QSTR_spi,          MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = mp_const_none} },
+        { MP_QSTR_cs,           MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = mp_const_none} },
+        { MP_QSTR_int,          MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = mp_const_none} },
         #if ESP_IDF_VERSION_MINOR >= 4
         // Dynamic ref_clk configuration available at v4.4
         { MP_QSTR_ref_clk_mode, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} },
         { MP_QSTR_ref_clk,      MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = mp_const_none} },
         #endif
-        { MP_QSTR_spi,          MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = mp_const_none} },
-        { MP_QSTR_cs,           MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = mp_const_none} },
-        { MP_QSTR_int,          MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = mp_const_none} },
     };
 
     mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];

From fb0dd86b39950f78de0b360a436b99fccc80c9a9 Mon Sep 17 00:00:00 2001
From: Maripo GODA <avenafatua@gmail.com>
Date: Fri, 13 Jan 2023 15:24:15 +0900
Subject: [PATCH 3013/3533] esp32/machine_sdcard: Change dma_channel to
 SPI_DMA_CH_AUTO for ESP32S3.

Specifying DMA channel 2 causes an "invalid dma channel" error.  In
ESP-IDF, the only available channel for ESP32S3 is SPI_DMA_CH_AUTO=3.
---
 ports/esp32/machine_sdcard.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/esp32/machine_sdcard.c b/ports/esp32/machine_sdcard.c
index 801a26f378db9..5b495f8494e77 100644
--- a/ports/esp32/machine_sdcard.c
+++ b/ports/esp32/machine_sdcard.c
@@ -211,7 +211,7 @@ STATIC mp_obj_t machine_sdcard_make_new(const mp_obj_type_t *type, size_t n_args
                 .gpio_cs = GPIO_NUM_34,
                 .gpio_cd = SDSPI_SLOT_NO_CD,
                 .gpio_wp = SDSPI_SLOT_NO_WP,
-                .dma_channel = 2
+                .dma_channel = SPI_DMA_CH_AUTO
             },
             SDSPI_SLOT_CONFIG_DEFAULT()
         };

From e30e543a7559f1235637a54ef2b0b4feb196c44d Mon Sep 17 00:00:00 2001
From: Antonello Margottini <antonello.margottini@gmail.com>
Date: Wed, 4 Jan 2023 11:36:54 +0100
Subject: [PATCH 3014/3533] esp8266/modnetwork: Add ability to set tx power for
 WLAN interface.

---
 ports/esp8266/modnetwork.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/ports/esp8266/modnetwork.c b/ports/esp8266/modnetwork.c
index ec62528a08344..29bdd3a1b7eac 100644
--- a/ports/esp8266/modnetwork.c
+++ b/ports/esp8266/modnetwork.c
@@ -410,6 +410,11 @@ STATIC mp_obj_t esp_config(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs
                         wifi_set_phy_mode(mp_obj_get_int(kwargs->table[i].value));
                         break;
                     }
+                    case MP_QSTR_txpower: {
+                        int8_t power = mp_obj_get_float(kwargs->table[i].value) * 4;
+                        system_phy_set_max_tpw(power);
+                        break;
+                    }
                     default:
                         goto unknown;
                 }

From 4eb7063608c93418f4c4b24df6c029e6314256a0 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 19 Jan 2023 14:59:18 +1100
Subject: [PATCH 3015/3533] esp8266/README: Remove notice about port being
 "experimental".

It has been around for a long time and the API is mature enough.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp8266/README.md | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/ports/esp8266/README.md b/ports/esp8266/README.md
index b54d8958d77d8..1e0cae213937b 100644
--- a/ports/esp8266/README.md
+++ b/ports/esp8266/README.md
@@ -1,10 +1,9 @@
 MicroPython port to ESP8266
 ===========================
 
-This is an experimental port of MicroPython for the WiFi modules based
-on Espressif ESP8266 chip.
-
-WARNING: The port is experimental and many APIs are subject to change.
+This is a port of MicroPython to the Espressif ESP8266 WiFi microcontroller.
+MicroPython runs on this chip without any underlying operating system, using
+the ESP8266 NONOS SDK.
 
 Supported features include:
 - REPL (Python prompt) over UART0.

From 720f2cfba9532879625d5418b04ae21424cb3639 Mon Sep 17 00:00:00 2001
From: Juan Francisco Cantero Hurtado <iam@juanfra.info>
Date: Sun, 1 Jan 2023 00:29:35 +0100
Subject: [PATCH 3016/3533] unix/Makefile: Disable building the shared library
 of libffi.

MicroPython doesn't need the shared library and disabling it in the
configure could ease the build of a static version of MicroPython.
---
 ports/unix/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/unix/Makefile b/ports/unix/Makefile
index cd18a6ed1e570..8e9094b40cd63 100644
--- a/ports/unix/Makefile
+++ b/ports/unix/Makefile
@@ -294,7 +294,7 @@ $(TOP)/lib/libffi/configure: $(TOP)/lib/libffi/autogen.sh
 # docs and depending on makeinfo
 $(BUILD)/lib/libffi/include/ffi.h: $(TOP)/lib/libffi/configure
 	mkdir -p $(BUILD)/lib/libffi; cd $(BUILD)/lib/libffi; \
-	$(abspath $(TOP))/lib/libffi/configure $(CROSS_COMPILE_HOST) --prefix=$$PWD/out --disable-structs CC="$(CC)" CXX="$(CXX)" LD="$(LD)" CFLAGS="-Os -fomit-frame-pointer -fstrict-aliasing -ffast-math -fno-exceptions"; \
+	$(abspath $(TOP))/lib/libffi/configure $(CROSS_COMPILE_HOST) --prefix=$$PWD/out --disable-shared --disable-structs CC="$(CC)" CXX="$(CXX)" LD="$(LD)" CFLAGS="-Os -fomit-frame-pointer -fstrict-aliasing -ffast-math -fno-exceptions"; \
 	$(MAKE) install-exec-recursive; $(MAKE) -C include install-data-am
 
 PREFIX = /usr/local

From 7f6345a9734f5772b2b579d2ac915cdeb1fcbed1 Mon Sep 17 00:00:00 2001
From: LiaoJingyi_winY7kp <924765359@qq.com>
Date: Sun, 23 Oct 2022 20:47:14 +0300
Subject: [PATCH 3017/3533] docs/library/machine.Timer: Add freq argument to
 machine.Timer.

Based on and tested on the rp2 port.

Signed-off-by: Liao Jingyi <liaojingyi2@gmail>
Signed-off-by: Damien George <damien@micropython.org>
---
 docs/library/machine.Timer.rst | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/docs/library/machine.Timer.rst b/docs/library/machine.Timer.rst
index 424a49bcba488..48c023a11c342 100644
--- a/docs/library/machine.Timer.rst
+++ b/docs/library/machine.Timer.rst
@@ -38,13 +38,16 @@ Constructors
 Methods
 -------
 
-.. method:: Timer.init(*, mode=Timer.PERIODIC, period=-1, callback=None)
+.. method:: Timer.init(*, mode=Timer.PERIODIC, freq=-1, period=-1, callback=None)
 
    Initialise the timer. Example::
 
        def mycallback(t):
            pass
 
+       # periodic at 1kHz
+       tim.init(mode=Timer.PERIODIC, freq=1000, callback=mycallback)
+
        # periodic with 100ms period
        tim.init(period=100, callback=mycallback)
 
@@ -60,6 +63,11 @@ Methods
        - ``Timer.PERIODIC`` - The timer runs periodically at the configured
          frequency of the channel.
 
+     - ``freq`` - The timer frequency, in units of Hz.  The upper bound of
+       the frequency is dependent on the port.  When both the ``freq`` and
+       ``period`` arguments are given, ``freq`` has a higher priority and
+       ``period`` is ignored.
+
      - ``period`` - The timer period, in milliseconds.
 
      - ``callback`` - The callable to call upon expiration of the timer period.

From 23ef29706e3be7515d07161234208b889cebae15 Mon Sep 17 00:00:00 2001
From: Chris Overgaauw <14801878+chrisovergaauw@users.noreply.github.com>
Date: Mon, 19 Dec 2022 11:18:19 +0100
Subject: [PATCH 3018/3533] docs/reference/constrained: Add missing heap-dump
 symbols to mem_info().

---
 docs/reference/constrained.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/reference/constrained.rst b/docs/reference/constrained.rst
index 8b64fd98fc447..2bcf9f7fb7930 100644
--- a/docs/reference/constrained.rst
+++ b/docs/reference/constrained.rst
@@ -392,6 +392,8 @@ Symbol Meaning
    F   float
    B   byte code
    M   module
+   S   string or bytes
+   A   bytearray
 ====== =================
 
 Each letter represents a single block of memory, a block being 16 bytes. So each

From 5c10727b68cd22d3f280acf00ea6c3ac062bec8a Mon Sep 17 00:00:00 2001
From: enriquezgarc <enriquezgarcia.external@infineon.com>
Date: Tue, 30 Aug 2022 17:06:25 +0200
Subject: [PATCH 3019/3533] docs/zephyr/quickref: Fix zsensor module usage
 examples.

Signed-off-by: enriquezgarc <enriquezgarcia.external@infineon.com>
---
 docs/zephyr/quickref.rst | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/zephyr/quickref.rst b/docs/zephyr/quickref.rst
index 783621316c703..329a9c41c0cc8 100644
--- a/docs/zephyr/quickref.rst
+++ b/docs/zephyr/quickref.rst
@@ -151,7 +151,7 @@ Use the :ref:`zsensor.Sensor <zsensor.Sensor>` class to access sensor data::
     accel.measure()               # obtain a measurement reading from the accelerometer
 
     # each of these prints the value taken by measure()
-    accel.float(zsensor.ACCEL_X)  # print measurement value for accelerometer X-axis sensor channel as float
-    accel.millis(zsensor.ACCEL_Y) # print measurement value for accelerometer Y-axis sensor channel in millionths
-    accel.micro(zsensor.ACCEL_Z)  # print measurement value for accelerometer Z-axis sensor channel in thousandths
-    accel.int(zsensor.ACCEL_X)    # print measurement integer value only for accelerometer X-axis sensor channel
+    accel.get_float(zsensor.ACCEL_X)  # print measurement value for accelerometer X-axis sensor channel as float
+    accel.get_millis(zsensor.ACCEL_Y) # print measurement value for accelerometer Y-axis sensor channel in millionths
+    accel.get_micro(zsensor.ACCEL_Z)  # print measurement value for accelerometer Z-axis sensor channel in thousandths
+    accel.get_int(zsensor.ACCEL_X)    # print measurement integer value only for accelerometer X-axis sensor channel

From 36347817ec7715f74c76a44eb92533821502f4d5 Mon Sep 17 00:00:00 2001
From: Angus Gratton <angus@redyak.com.au>
Date: Wed, 16 Nov 2022 09:05:29 +1100
Subject: [PATCH 3020/3533] CODECONVENTIONS: Explain uncrustify dependency for
 pre-commit setup.

pre-commit manages its own dependencies otherwise (including Black), but
this one is a C/C++ binary so needs to be installed independently.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
---
 CODECONVENTIONS.md | 55 +++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 47 insertions(+), 8 deletions(-)

diff --git a/CODECONVENTIONS.md b/CODECONVENTIONS.md
index 53b202ea371ef..0bd7a7327a729 100644
--- a/CODECONVENTIONS.md
+++ b/CODECONVENTIONS.md
@@ -65,16 +65,52 @@ changes to the correct style.  Without arguments this tool will reformat all
 source code (and may take some time to run).  Otherwise pass as arguments to
 the tool the files that changed and it will only reformat those.
 
-**Important**: Use only [uncrustify](https://github.com/uncrustify/uncrustify)
-v0.71 or v0.72 for MicroPython. Different uncrustify versions produce slightly
-different formatting, and the configuration file formats are often incompatible.
+uncrustify
+==========
+
+Only [uncrustify](https://github.com/uncrustify/uncrustify) v0.71 or v0.72 can
+be used for MicroPython. Different uncrustify versions produce slightly
+different formatting, and the configuration file formats are often
+incompatible. v0.73 or newer *will not work*.
+
+Depending on your operating system version, it may be possible to install a pre-compiled
+uncrustify version:
+
+Ubuntu, Debian
+--------------
+
+Ubuntu versions 21.10 or 22.04LTS, and Debian versions bullseye or bookworm all
+include v0.72 so can be installed directly:
+
+```
+$ apt install uncrustify
+```
+
+Arch Linux
+----------
+
+The current Arch uncrustify version is too new. There is an [old Arch package
+for v0.72](https://archive.archlinux.org/packages/u/uncrustify/) that can be
+installed from the Arch Linux archive ([more
+information](https://wiki.archlinux.org/title/Downgrading_packages#Arch_Linux_Archive)). Use
+the [IgnorePkg feature](https://wiki.archlinux.org/title/Pacman#Skip_package_from_being_upgraded)
+to prevent it re-updating.
+
+Brew
+----
+
+This command may work, please raise a new Issue if it doesn't:
+
+```
+brew install https://github.com/Homebrew/homebrew-core/raw/2b07d8192623365078a8b855a164ebcdf81494a6/Formula/uncrustify.rb
+```
 
 Automatic Pre-Commit Hooks
 ==========================
 
 To have code formatting and commit message conventions automatically checked,
-a configuration file is provided for the [pre-commit]
-(https://pre-commit.com/) tool.
+a configuration file is provided for the [pre-commit](https://pre-commit.com/)
+tool.
 
 First install `pre-commit`, either from your system package manager or via
 `pip`. When installing `pre-commit` via pip, it is recommended to use a
@@ -82,13 +118,17 @@ virtual environment. Other sources, such as Brew are also available, see
 [the docs](https://pre-commit.com/index.html#install) for details.
 
 ```
-$ apt install pre-commit       # Ubuntu
+$ apt install pre-commit       # Ubuntu, Debian
 $ pacman -Sy python-precommit  # Arch Linux
 $ brew install pre-commit      # Brew
 $ pip install pre-commit       # PyPI
 ```
 
-Then inside the MicroPython repository, register the git hooks for pre-commit
+Next, install [uncrustify (see above)](#uncrustify). Other dependencies are managed by
+pre-commit automatically, but uncrustify needs to be installed and available on
+the PATH.
+
+Then, inside the MicroPython repository, register the git hooks for pre-commit
 by running:
 
 ```
@@ -115,7 +155,6 @@ Tips:
 * To ignore the pre-commit message format check temporarily, start the commit
   message subject line with "WIP" (for "Work In Progress").
 
-
 Python code conventions
 =======================
 

From 3b5cafc7163724a50b3d077baf83c4d8c7b6de4a Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Wed, 12 Oct 2022 20:54:15 +0200
Subject: [PATCH 3021/3533] stm32/Makefile: Leave DFU mode after download when
 using dfu-util.

Not all DFU bootloaders exit after download, this modifier is required for
some boards to reset, otherwise they sit idle in DFU mode.
---
 ports/stm32/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/stm32/Makefile b/ports/stm32/Makefile
index 418562f7cbdea..19643cac5675d 100644
--- a/ports/stm32/Makefile
+++ b/ports/stm32/Makefile
@@ -546,7 +546,7 @@ define RUN_DFU
 	$(ECHO) "Writing $(1) to the board"
 	$(if $(filter $(USE_PYDFU),1),\
 	$(Q)$(PYTHON) $(PYDFU) --vid $(BOOTLOADER_DFU_USB_VID) --pid $(BOOTLOADER_DFU_USB_PID) -u $(1),
-	$(Q)$(DFU_UTIL) -a 0 -d $(BOOTLOADER_DFU_USB_VID):$(BOOTLOADER_DFU_USB_PID) -D $(1))
+	$(Q)$(DFU_UTIL) -a 0 -d $(BOOTLOADER_DFU_USB_VID):$(BOOTLOADER_DFU_USB_PID) -D $(1) -s :leave)
 endef
 
 define RUN_STLINK

From 32a858e254b3c6f53dc4969f62b830fbb51cf8ee Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sun, 25 Dec 2022 14:34:33 +0100
Subject: [PATCH 3022/3533] esp32/boards: Add board definition for Olimex ESP32
 PoE boards.

The major setting is about the PHY interface configuration.  The
configuration matches the Olimex ESP32 Gateway as well.

Tested with esp-idf v4.2.4 and Olimex ESP32 POE boards.
---
 .../esp32/boards/OLIMEX_ESP32_POE/board.json  | 24 +++++++++++++++++++
 ports/esp32/boards/OLIMEX_ESP32_POE/board.md  |  4 ++++
 .../OLIMEX_ESP32_POE/mpconfigboard.cmake      |  5 ++++
 .../boards/OLIMEX_ESP32_POE/mpconfigboard.h   |  2 ++
 .../boards/OLIMEX_ESP32_POE/sdkconfig.board   |  4 ++++
 5 files changed, 39 insertions(+)
 create mode 100644 ports/esp32/boards/OLIMEX_ESP32_POE/board.json
 create mode 100644 ports/esp32/boards/OLIMEX_ESP32_POE/board.md
 create mode 100644 ports/esp32/boards/OLIMEX_ESP32_POE/mpconfigboard.cmake
 create mode 100644 ports/esp32/boards/OLIMEX_ESP32_POE/mpconfigboard.h
 create mode 100644 ports/esp32/boards/OLIMEX_ESP32_POE/sdkconfig.board

diff --git a/ports/esp32/boards/OLIMEX_ESP32_POE/board.json b/ports/esp32/boards/OLIMEX_ESP32_POE/board.json
new file mode 100644
index 0000000000000..f3b1402bb13cf
--- /dev/null
+++ b/ports/esp32/boards/OLIMEX_ESP32_POE/board.json
@@ -0,0 +1,24 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [
+        "BLE",
+        "WiFi",
+        "MicroSD",
+        "Battery Charging",
+        "Ethernet",
+        "PoE",
+        "Breadboard friendly"
+    ],
+    "id": "esp32",
+    "images": [
+        "ESP32-POE-ISO-1.jpg"
+    ],
+    "mcu": "esp32",
+    "product": "ESP32",
+    "thumbnail": "",
+    "url": "https://www.olimex.com/",
+    "vendor": "Olimex"
+}
diff --git a/ports/esp32/boards/OLIMEX_ESP32_POE/board.md b/ports/esp32/boards/OLIMEX_ESP32_POE/board.md
new file mode 100644
index 0000000000000..1e2dbb744a0e3
--- /dev/null
+++ b/ports/esp32/boards/OLIMEX_ESP32_POE/board.md
@@ -0,0 +1,4 @@
+The following files are daily firmware for Olimex ESP32 boards with Ethernet.
+They match the boards ESP32 ETH-PoE, ESP32 ETH-PoE-ISO and ESP32 Gateway.
+
+This firmware is compiled using ESP-IDF v4.x.
diff --git a/ports/esp32/boards/OLIMEX_ESP32_POE/mpconfigboard.cmake b/ports/esp32/boards/OLIMEX_ESP32_POE/mpconfigboard.cmake
new file mode 100644
index 0000000000000..c460b07d5efac
--- /dev/null
+++ b/ports/esp32/boards/OLIMEX_ESP32_POE/mpconfigboard.cmake
@@ -0,0 +1,5 @@
+set(SDKCONFIG_DEFAULTS
+    boards/sdkconfig.base
+    boards/sdkconfig.ble
+    boards/OLIMEX_ESP32_POE/sdkconfig.board
+)
diff --git a/ports/esp32/boards/OLIMEX_ESP32_POE/mpconfigboard.h b/ports/esp32/boards/OLIMEX_ESP32_POE/mpconfigboard.h
new file mode 100644
index 0000000000000..c8458e35fa0d7
--- /dev/null
+++ b/ports/esp32/boards/OLIMEX_ESP32_POE/mpconfigboard.h
@@ -0,0 +1,2 @@
+#define MICROPY_HW_BOARD_NAME "Olimex ESP32 ETH"
+#define MICROPY_HW_MCU_NAME "ESP32"
diff --git a/ports/esp32/boards/OLIMEX_ESP32_POE/sdkconfig.board b/ports/esp32/boards/OLIMEX_ESP32_POE/sdkconfig.board
new file mode 100644
index 0000000000000..15ffbf3a67b94
--- /dev/null
+++ b/ports/esp32/boards/OLIMEX_ESP32_POE/sdkconfig.board
@@ -0,0 +1,4 @@
+CONFIG_ETH_PHY_INTERFACE_RMII=y
+CONFIG_ETH_RMII_CLK_OUTPUT=y
+CONFIG_ETH_RMII_CLK_OUT_GPIO=17
+CONFIG_LWIP_LOCAL_HOSTNAME="ESP32_POE"

From 54e85fe212b15390b60246846e5f2087d566aeda Mon Sep 17 00:00:00 2001
From: Clayton Cronk <awesomecronk@gmail.com>
Date: Mon, 21 Feb 2022 09:13:42 -0600
Subject: [PATCH 3023/3533] esp32/boards/GENERIC_UNICORE: Add board definition
 for unicore chips.

Tested to work on an ESP32-MINI-1, which is a single core ESP32-U4DWH.

Signed-off-by: Clayton Cronk <awesomecronk@gmail.com>
---
 ports/esp32/boards/GENERIC_UNICORE/board.json | 19 +++++++++++++++++++
 ports/esp32/boards/GENERIC_UNICORE/board.md   |  1 +
 .../GENERIC_UNICORE/mpconfigboard.cmake       |  5 +++++
 .../boards/GENERIC_UNICORE/mpconfigboard.h    |  2 ++
 .../boards/GENERIC_UNICORE/sdkconfig.board    |  1 +
 ports/esp32/mphalport.h                       |  4 +++-
 6 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 ports/esp32/boards/GENERIC_UNICORE/board.json
 create mode 100644 ports/esp32/boards/GENERIC_UNICORE/board.md
 create mode 100644 ports/esp32/boards/GENERIC_UNICORE/mpconfigboard.cmake
 create mode 100644 ports/esp32/boards/GENERIC_UNICORE/mpconfigboard.h
 create mode 100644 ports/esp32/boards/GENERIC_UNICORE/sdkconfig.board

diff --git a/ports/esp32/boards/GENERIC_UNICORE/board.json b/ports/esp32/boards/GENERIC_UNICORE/board.json
new file mode 100644
index 0000000000000..8fed71a018aa5
--- /dev/null
+++ b/ports/esp32/boards/GENERIC_UNICORE/board.json
@@ -0,0 +1,19 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [
+        "BLE",
+        "WiFi"
+    ],
+    "id": "esp32-unicore",
+    "images": [
+        "generic_unicore.jpg"
+    ],
+    "mcu": "esp32",
+    "product": "ESP32 Unicore",
+    "thumbnail": "",
+    "url": "https://www.espressif.com/en/products/modules",
+    "vendor": "Espressif"
+}
diff --git a/ports/esp32/boards/GENERIC_UNICORE/board.md b/ports/esp32/boards/GENERIC_UNICORE/board.md
new file mode 100644
index 0000000000000..b41c167498c73
--- /dev/null
+++ b/ports/esp32/boards/GENERIC_UNICORE/board.md
@@ -0,0 +1 @@
+The following files are daily firmware for single-core ESP32-based boards without external SPIRAM.
diff --git a/ports/esp32/boards/GENERIC_UNICORE/mpconfigboard.cmake b/ports/esp32/boards/GENERIC_UNICORE/mpconfigboard.cmake
new file mode 100644
index 0000000000000..2f34688c8c474
--- /dev/null
+++ b/ports/esp32/boards/GENERIC_UNICORE/mpconfigboard.cmake
@@ -0,0 +1,5 @@
+set(SDKCONFIG_DEFAULTS
+    boards/sdkconfig.base
+    boards/sdkconfig.ble
+    boards/GENERIC_UNICORE/sdkconfig.board
+)
diff --git a/ports/esp32/boards/GENERIC_UNICORE/mpconfigboard.h b/ports/esp32/boards/GENERIC_UNICORE/mpconfigboard.h
new file mode 100644
index 0000000000000..5d0624b9c3f91
--- /dev/null
+++ b/ports/esp32/boards/GENERIC_UNICORE/mpconfigboard.h
@@ -0,0 +1,2 @@
+#define MICROPY_HW_BOARD_NAME "ESP32 Unicore module"
+#define MICROPY_HW_MCU_NAME "ESP32-UNICORE"
diff --git a/ports/esp32/boards/GENERIC_UNICORE/sdkconfig.board b/ports/esp32/boards/GENERIC_UNICORE/sdkconfig.board
new file mode 100644
index 0000000000000..f0b0b5e03dd48
--- /dev/null
+++ b/ports/esp32/boards/GENERIC_UNICORE/sdkconfig.board
@@ -0,0 +1 @@
+CONFIG_FREERTOS_UNICORE=y
diff --git a/ports/esp32/mphalport.h b/ports/esp32/mphalport.h
index 7f14b6e188132..672fa306f5dca 100644
--- a/ports/esp32/mphalport.h
+++ b/ports/esp32/mphalport.h
@@ -44,7 +44,9 @@
 // and avoid the Wifi/BLE timing problems on the same core.
 // Best effort here to remain backwards compatible in rare version edge cases...
 // See https://github.com/micropython/micropython/issues/5489 for history
-#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(4, 2, 0)
+#if CONFIG_FREERTOS_UNICORE
+#define MP_TASK_COREID (0)
+#elif ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(4, 2, 0)
 #define MP_TASK_COREID (1)
 #else
 #define MP_TASK_COREID (0)

From 30db33d1e024c9c16140ed8f44283728b1428fac Mon Sep 17 00:00:00 2001
From: ma-lalonde <marc@connaxio.com>
Date: Mon, 30 May 2022 01:16:51 -0400
Subject: [PATCH 3024/3533] esp32/network_lan: Add support for Ethernet PHY
 KSZ8081.

This is available since ESP-IDF v4.4.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp32/modnetwork.c  | 4 ++++
 ports/esp32/modnetwork.h  | 2 +-
 ports/esp32/network_lan.c | 8 ++++++++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/ports/esp32/modnetwork.c b/ports/esp32/modnetwork.c
index 3ebba2ade982d..3f56fcfae2639 100644
--- a/ports/esp32/modnetwork.c
+++ b/ports/esp32/modnetwork.c
@@ -270,6 +270,10 @@ STATIC const mp_rom_map_elem_t mp_module_network_globals_table[] = {
     // PHY_KSZ8041 is new in ESP-IDF v4.3
     { MP_ROM_QSTR(MP_QSTR_PHY_KSZ8041), MP_ROM_INT(PHY_KSZ8041) },
     #endif
+    #if ESP_IDF_VERSION_MINOR >= 4
+    // PHY_KSZ8081 is new in ESP-IDF v4.4
+    { MP_ROM_QSTR(MP_QSTR_PHY_KSZ8081), MP_ROM_INT(PHY_KSZ8081) },
+    #endif
 
     #if CONFIG_ETH_SPI_ETHERNET_KSZ8851SNL
     { MP_ROM_QSTR(MP_QSTR_PHY_KSZ8851SNL), MP_ROM_INT(PHY_KSZ8851SNL) },
diff --git a/ports/esp32/modnetwork.h b/ports/esp32/modnetwork.h
index 49bbd9c4960ec..d90679fa8a4e3 100644
--- a/ports/esp32/modnetwork.h
+++ b/ports/esp32/modnetwork.h
@@ -28,7 +28,7 @@
 
 #include "esp_event.h"
 
-enum { PHY_LAN8710, PHY_LAN8720, PHY_IP101, PHY_RTL8201, PHY_DP83848, PHY_KSZ8041, PHY_KSZ8851SNL = 100, PHY_DM9051, PHY_W5500 };
+enum { PHY_LAN8710, PHY_LAN8720, PHY_IP101, PHY_RTL8201, PHY_DP83848, PHY_KSZ8041, PHY_KSZ8081, PHY_KSZ8851SNL = 100, PHY_DM9051, PHY_W5500 };
 #define IS_SPI_PHY(NUM) (NUM >= 100)
 enum { ETH_INITIALIZED, ETH_STARTED, ETH_STOPPED, ETH_CONNECTED, ETH_DISCONNECTED, ETH_GOT_IP };
 
diff --git a/ports/esp32/network_lan.c b/ports/esp32/network_lan.c
index d482f950649ad..d4d630e345697 100644
--- a/ports/esp32/network_lan.c
+++ b/ports/esp32/network_lan.c
@@ -150,6 +150,9 @@ STATIC mp_obj_t get_lan(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_ar
         #if ESP_IDF_VERSION_MINOR >= 3      // KSZ8041 is new in ESP-IDF v4.3
         args[ARG_phy_type].u_int != PHY_KSZ8041 &&
         #endif
+        #if ESP_IDF_VERSION_MINOR >= 4      // KSZ8081 is new in ESP-IDF v4.4
+        args[ARG_phy_type].u_int != PHY_KSZ8081 &&
+        #endif
         #if CONFIG_ETH_USE_SPI_ETHERNET
         #if CONFIG_ETH_SPI_ETHERNET_KSZ8851SNL
         args[ARG_phy_type].u_int != PHY_KSZ8851SNL &&
@@ -237,6 +240,11 @@ STATIC mp_obj_t get_lan(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_ar
             self->phy = esp_eth_phy_new_ksz8041(&phy_config);
             break;
         #endif
+        #if ESP_IDF_VERSION_MINOR >= 4 // KSZ8081 is new in ESP-IDF v4.4
+        case PHY_KSZ8081:
+            self->phy = esp_eth_phy_new_ksz8081(&phy_config);
+            break;
+        #endif
         #endif
         #if CONFIG_ETH_USE_SPI_ETHERNET
         #if CONFIG_ETH_SPI_ETHERNET_KSZ8851SNL

From d6bc34a13aa734d8b32e5768c021377ac4815029 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Thu, 19 Jan 2023 12:42:09 +0100
Subject: [PATCH 3025/3533] esp32: Add a small delay before leaving
 wlan.active().

The delay is 1 ms. It avoids the crashes reported by the
issues #8289, #8792 and #9236 with esp-idf versions >= 4.2, but does
not solve an underlying problem in the esp-idf.
---
 ports/esp32/network_wlan.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/ports/esp32/network_wlan.c b/ports/esp32/network_wlan.c
index f0b458e6ddfe7..e4b34b2204fab 100644
--- a/ports/esp32/network_wlan.c
+++ b/ports/esp32/network_wlan.c
@@ -35,6 +35,7 @@
 
 #include "py/objlist.h"
 #include "py/runtime.h"
+#include "py/mphal.h"
 #include "modnetwork.h"
 
 #include "esp_wifi.h"
@@ -210,6 +211,12 @@ STATIC mp_obj_t network_wlan_active(size_t n_args, const mp_obj_t *args) {
                 wifi_started = true;
             }
         }
+        // This delay is a band-aid patch for issues #8289, #8792 and #9236,
+        // allowing the esp data structures to settle. It looks like some
+        // kind of race condition, which is not yet found. But at least
+        // this small delay seems not hurt much, since wlan.active() is
+        // usually not called in a time critical part of the code.
+        mp_hal_delay_ms(1);
     }
 
     return (mode & bit) ? mp_const_true : mp_const_false;

From 5c4153ea379550bf595bf0bfa0e3711afea17aa0 Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Sun, 7 Aug 2022 16:24:37 +1000
Subject: [PATCH 3026/3533] py/objarray: Raise error on out-of-bound memoryview
 slice start.

32-bit platforms only support a slice offset start of 24 bit max due to the
limited size of the mp_obj_array_t.free member.  Similarly on 64-bit
platforms the limit is 56 bits.

This commit adds an OverflowError if the user attempts to slice a
memoryview beyond this limit.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/objarray.c                             |  4 ++++
 py/objarray.h                             |  5 ++++-
 tests/basics/memoryview_slice_size.py     | 27 +++++++++++++++++++++++
 tests/basics/memoryview_slice_size.py.exp |  2 ++
 4 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 tests/basics/memoryview_slice_size.py
 create mode 100644 tests/basics/memoryview_slice_size.py.exp

diff --git a/py/objarray.c b/py/objarray.c
index c660705389d41..0d9411d7c4e1d 100644
--- a/py/objarray.c
+++ b/py/objarray.c
@@ -53,6 +53,7 @@
 #if MICROPY_PY_BUILTINS_MEMORYVIEW
 #define TYPECODE_MASK (0x7f)
 #define memview_offset free
+#define memview_offset_max ((1LL << MP_OBJ_ARRAY_FREE_SIZE_BITS) - 1)
 #else
 // make (& TYPECODE_MASK) a null operation if memorview not enabled
 #define TYPECODE_MASK (~(size_t)0)
@@ -522,6 +523,9 @@ STATIC mp_obj_t array_subscr(mp_obj_t self_in, mp_obj_t index_in, mp_obj_t value
             assert(sz > 0);
             #if MICROPY_PY_BUILTINS_MEMORYVIEW
             if (o->base.type == &mp_type_memoryview) {
+                if (slice.start > memview_offset_max) {
+                    mp_raise_msg(&mp_type_OverflowError, MP_ERROR_TEXT("memoryview offset too large"));
+                }
                 res = m_new_obj(mp_obj_array_t);
                 *res = *o;
                 res->memview_offset += slice.start;
diff --git a/py/objarray.h b/py/objarray.h
index 48a26c3fb301e..4a0e8a983fe77 100644
--- a/py/objarray.h
+++ b/py/objarray.h
@@ -32,6 +32,9 @@
 // Used only for memoryview types, set in "typecode" to indicate a writable memoryview
 #define MP_OBJ_ARRAY_TYPECODE_FLAG_RW (0x80)
 
+// Bit size used for mp_obj_array_t.free member.
+#define MP_OBJ_ARRAY_FREE_SIZE_BITS (8 * sizeof(size_t) - 8)
+
 // This structure is used for all of bytearray, array.array, memoryview
 // objects.  Note that memoryview has different meaning for some fields,
 // see comment at the beginning of objarray.c.
@@ -44,7 +47,7 @@ typedef struct _mp_obj_array_t {
     // parent object. (Union is not used to not go into a complication of
     // union-of-bitfields with different toolchains). See comments in
     // objarray.c.
-    size_t free : (8 * sizeof(size_t) - 8);
+    size_t free : MP_OBJ_ARRAY_FREE_SIZE_BITS;
     size_t len; // in elements
     void *items;
 } mp_obj_array_t;
diff --git a/tests/basics/memoryview_slice_size.py b/tests/basics/memoryview_slice_size.py
new file mode 100644
index 0000000000000..c56514d21f7ec
--- /dev/null
+++ b/tests/basics/memoryview_slice_size.py
@@ -0,0 +1,27 @@
+# test memoryview slicing beyond the limit of what memoryview can internally index
+
+try:
+    from sys import maxsize
+    from uctypes import bytearray_at
+
+    memoryview
+except:
+    print("SKIP")
+    raise SystemExit
+
+if maxsize <= 0xFFFF_FFFF:
+    slice_max = 0xFF_FFFF
+else:
+    slice_max = 0xFF_FFFF_FFFF_FFFF
+
+buf = bytearray_at(0, slice_max + 2)
+mv = memoryview(buf)
+
+# this should work
+print(mv[slice_max : slice_max + 1])
+
+# this should overflow the internal index for memoryview slicing
+try:
+    print(mv[slice_max + 1 : slice_max + 2])
+except OverflowError:
+    print("OverflowError")
diff --git a/tests/basics/memoryview_slice_size.py.exp b/tests/basics/memoryview_slice_size.py.exp
new file mode 100644
index 0000000000000..34baadd35e15d
--- /dev/null
+++ b/tests/basics/memoryview_slice_size.py.exp
@@ -0,0 +1,2 @@
+<memoryview>
+OverflowError

From fb8792c095802a9fcc8b38c1d8cbc3f641918433 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Wed, 19 Oct 2022 11:30:28 +1100
Subject: [PATCH 3027/3533] py/lexer: Wrap in parenthesis all f-string
 arguments passed to format.

This is important for literal tuples, e.g.

    f"{a,b,}, {c}" --> "{}".format((a,b), (c),)

which would otherwise result in either a syntax error or the wrong result.

Fixes issue #9635.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 py/lexer.c                               | 7 ++++++-
 tests/basics/string_fstring.py           | 5 +++++
 tests/basics/string_fstring_debug.py     | 4 ++++
 tests/basics/string_fstring_debug.py.exp | 3 +++
 4 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/py/lexer.c b/py/lexer.c
index 39e9662f63e65..e7d0e81440fc2 100644
--- a/py/lexer.c
+++ b/py/lexer.c
@@ -356,6 +356,9 @@ STATIC void parse_string_literal(mp_lexer_t *lex, bool is_raw, bool is_fstring)
                     vstr_add_byte(&lex->vstr, '{');
                     next_char(lex);
                 } else {
+                    // wrap each argument in (), e.g.
+                    // f"{a,b,}, {c}" --> "{}".format((a,b), (c),)
+                    vstr_add_byte(&lex->fstring_args, '(');
                     // remember the start of this argument (if we need it for f'{a=}').
                     size_t i = lex->fstring_args.len;
                     // extract characters inside the { until we reach the
@@ -382,7 +385,9 @@ STATIC void parse_string_literal(mp_lexer_t *lex, bool is_raw, bool is_fstring)
                         // remove the trailing '='
                         lex->fstring_args.len--;
                     }
-                    // comma-separate args
+                    // close the paren-wrapped arg to .format().
+                    vstr_add_byte(&lex->fstring_args, ')');
+                    // comma-separate args to .format().
                     vstr_add_byte(&lex->fstring_args, ',');
                 }
                 vstr_add_byte(&lex->vstr, '{');
diff --git a/tests/basics/string_fstring.py b/tests/basics/string_fstring.py
index 7e8a97fd3048e..8907a5c47846c 100644
--- a/tests/basics/string_fstring.py
+++ b/tests/basics/string_fstring.py
@@ -56,3 +56,8 @@ def foo(a, b):
 except (ValueError, SyntaxError):
     # MicroPython incorrectly raises ValueError here.
     print('SyntaxError')
+
+# Allow literal tuples
+print(f"a {1,} b")
+print(f"a {x,y,} b")
+print(f"a {x,1} b")
diff --git a/tests/basics/string_fstring_debug.py b/tests/basics/string_fstring_debug.py
index 76a448ca069a3..95abd4d6d06f1 100644
--- a/tests/basics/string_fstring_debug.py
+++ b/tests/basics/string_fstring_debug.py
@@ -21,3 +21,7 @@ def h():
 
 print(f'a {f() + g("foo") + h()=} b')
 print(f'a {f() + g("foo") + h()=:08x} b')
+
+print(f"a {1,=} b")
+print(f"a {x,y,=} b")
+print(f"a {x,1=} b")
diff --git a/tests/basics/string_fstring_debug.py.exp b/tests/basics/string_fstring_debug.py.exp
index 563030f400f07..f0309e1c98aa9 100644
--- a/tests/basics/string_fstring_debug.py.exp
+++ b/tests/basics/string_fstring_debug.py.exp
@@ -4,3 +4,6 @@ a x=1 b 2 c
 a x=00000001 b 2 c
 a f() + g("foo") + h()=15 b
 a f() + g("foo") + h()=0000000f b
+a 1,=(1,) b
+a x,y,=(1, 2) b
+a x,1=(1, 1) b

From 94ee1b629a18429a92fc0475e7318c6a48dabd2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E6=9D=83=E4=B8=80=E5=8F=A5=E4=B8=A4=E5=8F=A5?=
 <xqyjlj@126.com>
Date: Sat, 22 Oct 2022 14:05:25 +0800
Subject: [PATCH 3028/3533] unix/main: Free pathbuf when there's an error
 opening a file.

---
 ports/unix/main.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/unix/main.c b/ports/unix/main.c
index 7920db02f29ae..d6ae1e611bc17 100644
--- a/ports/unix/main.c
+++ b/ports/unix/main.c
@@ -699,6 +699,7 @@ MP_NOINLINE int main_(int argc, char **argv) {
             char *basedir = realpath(argv[a], pathbuf);
             if (basedir == NULL) {
                 mp_printf(&mp_stderr_print, "%s: can't open file '%s': [Errno %d] %s\n", argv[0], argv[a], errno, strerror(errno));
+                free(pathbuf);
                 // CPython exits with 2 in such case
                 ret = 2;
                 break;

From abaa4abd2d5d43eb812301ab7f0fcaa9c93c18c2 Mon Sep 17 00:00:00 2001
From: Alex Riesen <alexander.riesen@cetitec.com>
Date: Thu, 19 Jan 2023 12:09:39 +0100
Subject: [PATCH 3029/3533] py: Add parenthesis to default impl of
 MP_OBJ_TO_PTR, MP_OBJ_FROM_PTR.

Unless MICROPY_OBJ_REPR == MICROPY_OBJ_REPR_D, these macros only work with
values and "->"/"." expressions as their sole argument.  In other words,
the macros are broken with expressions which contain operations of lower
precedence than the cast operator.

Depending on situation, the old code either results in compiler error:

 MP_OBJ_TO_PTR(flag ? o1 : o2) expands into "(void *)flag ? o1 : o2",
 which some compiler configurations will reject (e.g. GCC -Wint-conversion
 -Wint-to-pointer-cast -Werror)

Or in an incorrect address calculation:

 For ptr declared as "uint8_t *" the MP_OBJ_FROM_PTR(ptr + off)
 expands into ((mp_obj_t)ptr) + off, resulting in an obviously
 wrong address.

Signed-off-by: Alex Riesen <alexander.riesen@cetitec.com>
---
 py/obj.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/py/obj.h b/py/obj.h
index cb9a6cc4593a1..8a0a256708f24 100644
--- a/py/obj.h
+++ b/py/obj.h
@@ -313,12 +313,12 @@ typedef union _mp_rom_obj_t {
 
 // Cast mp_obj_t to object pointer
 #ifndef MP_OBJ_TO_PTR
-#define MP_OBJ_TO_PTR(o) ((void *)o)
+#define MP_OBJ_TO_PTR(o) ((void *)(o))
 #endif
 
 // Cast object pointer to mp_obj_t
 #ifndef MP_OBJ_FROM_PTR
-#define MP_OBJ_FROM_PTR(p) ((mp_obj_t)p)
+#define MP_OBJ_FROM_PTR(p) ((mp_obj_t)(p))
 #endif
 
 // Macros to create objects that are stored in ROM.

From a8a1ad13916aa74fca30ad23061a5552935bf097 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 6 Oct 2022 11:14:13 +1100
Subject: [PATCH 3030/3533] embed: Add new "embed" port which builds a simple C
 package.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/embed/README.md                  |  18 +++++
 ports/embed/embed.mk                   |  65 +++++++++++++++
 ports/embed/port/embed_util.c          | 106 +++++++++++++++++++++++++
 ports/embed/port/micropython_embed.h   |  41 ++++++++++
 ports/embed/port/mpconfigport_common.h |  38 +++++++++
 ports/embed/port/mphalport.c           |  33 ++++++++
 ports/embed/port/mphalport.h           |   2 +
 7 files changed, 303 insertions(+)
 create mode 100644 ports/embed/README.md
 create mode 100644 ports/embed/embed.mk
 create mode 100644 ports/embed/port/embed_util.c
 create mode 100644 ports/embed/port/micropython_embed.h
 create mode 100644 ports/embed/port/mpconfigport_common.h
 create mode 100644 ports/embed/port/mphalport.c
 create mode 100644 ports/embed/port/mphalport.h

diff --git a/ports/embed/README.md b/ports/embed/README.md
new file mode 100644
index 0000000000000..556cfc749d371
--- /dev/null
+++ b/ports/embed/README.md
@@ -0,0 +1,18 @@
+MicroPython embed port
+======================
+
+This is a port of MicroPython that outputs a set of .c and .h files for embedding
+into a wider project.  This port essentially targets the C language, instead of a
+particular hardware architecture or platform.
+
+To use this port in a project there are three main steps:
+
+1. Provide configuration for the project via an `mpconfigport.h` file.
+
+2. Build this embed port against that configuration, using the provided `embed.mk`.
+   The output is a set of self-contained source files for building MicroPython.
+   These files can be placed outside this repository.
+
+3. Build the project.  This requires compiling all .c files from the above step.
+
+See `examples/embedding` for an example.
diff --git a/ports/embed/embed.mk b/ports/embed/embed.mk
new file mode 100644
index 0000000000000..7fb344d704922
--- /dev/null
+++ b/ports/embed/embed.mk
@@ -0,0 +1,65 @@
+# This file is part of the MicroPython project, http://micropython.org/
+# The MIT License (MIT)
+# Copyright (c) 2022-2023 Damien P. George
+# 
+# This file is intended to be included by a Makefile in a custom project.
+
+# Set the build output directory for the generated files.
+BUILD = build-embed
+
+# Include the core environment definitions; this will set $(TOP).
+include $(MICROPYTHON_TOP)/py/mkenv.mk
+
+# Include py core make definitions.
+include $(TOP)/py/py.mk
+
+# Set the location of the MicroPython embed port.
+MICROPYTHON_EMBED_PORT = $(MICROPYTHON_TOP)/ports/embed
+
+# Set default makefile-level MicroPython feature configurations.
+MICROPY_ROM_TEXT_COMPRESSION ?= 0
+
+# Set CFLAGS for the MicroPython build.
+CFLAGS += -I. -I$(TOP) -I$(BUILD) -I$(MICROPYTHON_EMBED_PORT)
+CFLAGS += -Wall -Werror -std=c99
+
+# Define the required generated header files.
+GENHDR_OUTPUT = $(addprefix $(BUILD)/genhdr/, \
+	moduledefs.h \
+	mpversion.h \
+	qstrdefs.generated.h \
+	root_pointers.h \
+	)
+
+# Define the top-level target, the generated output files.
+.PHONY: all
+all: micropython-embed-package
+
+clean: clean-micropython-embed-package
+
+.PHONY: clean-micropython-embed-package
+clean-micropython-embed-package:
+	$(RM) -rf $(PACKAGE_DIR)
+
+PACKAGE_DIR ?= micropython_embed
+PACKAGE_DIR_LIST = $(addprefix $(PACKAGE_DIR)/,py extmod shared/runtime genhdr port)
+
+.PHONY: micropython-embed-package
+micropython-embed-package: $(GENHDR_OUTPUT)
+	$(ECHO) "Generate micropython_embed output:"
+	$(Q)$(RM) -rf $(PACKAGE_DIR_LIST)
+	$(Q)$(MKDIR) -p $(PACKAGE_DIR_LIST)
+	$(ECHO) "- py"
+	$(Q)$(CP) $(TOP)/py/*.[ch] $(PACKAGE_DIR)/py
+	$(ECHO) "- extmod"
+	$(Q)$(CP) $(TOP)/extmod/moduplatform.h $(PACKAGE_DIR)/extmod
+	$(ECHO) "- shared"
+	$(Q)$(CP) $(TOP)/shared/runtime/gchelper.h $(PACKAGE_DIR)/shared/runtime
+	$(Q)$(CP) $(TOP)/shared/runtime/gchelper_generic.c $(PACKAGE_DIR)/shared/runtime
+	$(ECHO) "- genhdr"
+	$(Q)$(CP) $(GENHDR_OUTPUT) $(PACKAGE_DIR)/genhdr
+	$(ECHO) "- port"
+	$(Q)$(CP) $(MICROPYTHON_EMBED_PORT)/port/*.[ch] $(PACKAGE_DIR)/port
+
+# Include remaining core make rules.
+include $(TOP)/py/mkrules.mk
diff --git a/ports/embed/port/embed_util.c b/ports/embed/port/embed_util.c
new file mode 100644
index 0000000000000..a3850f3c0fed7
--- /dev/null
+++ b/ports/embed/port/embed_util.c
@@ -0,0 +1,106 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2022-2023 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include <string.h>
+#include "py/compile.h"
+#include "py/gc.h"
+#include "py/persistentcode.h"
+#include "py/runtime.h"
+#include "py/stackctrl.h"
+#include "shared/runtime/gchelper.h"
+#include "port/micropython_embed.h"
+
+// Initialise the runtime.
+void mp_embed_init(void *gc_heap, size_t gc_heap_size) {
+    mp_stack_ctrl_init();
+    gc_init(gc_heap, (uint8_t *)gc_heap + gc_heap_size);
+    mp_init();
+}
+
+#if MICROPY_ENABLE_COMPILER
+// Compile and execute the given source script (Python text).
+void mp_embed_exec_str(const char *src) {
+    nlr_buf_t nlr;
+    if (nlr_push(&nlr) == 0) {
+        // Compile, parse and execute the given string.
+        mp_lexer_t *lex = mp_lexer_new_from_str_len(MP_QSTR__lt_stdin_gt_, src, strlen(src), 0);
+        qstr source_name = lex->source_name;
+        mp_parse_tree_t parse_tree = mp_parse(lex, MP_PARSE_FILE_INPUT);
+        mp_obj_t module_fun = mp_compile(&parse_tree, source_name, true);
+        mp_call_function_0(module_fun);
+        nlr_pop();
+    } else {
+        // Uncaught exception: print it out.
+        mp_obj_print_exception(&mp_plat_print, (mp_obj_t)nlr.ret_val);
+    }
+}
+#endif
+
+#if MICROPY_PERSISTENT_CODE_LOAD
+void mp_embed_exec_mpy(const uint8_t *mpy, size_t len) {
+    nlr_buf_t nlr;
+    if (nlr_push(&nlr) == 0) {
+        // Execute the given .mpy data.
+        mp_module_context_t *ctx = m_new_obj(mp_module_context_t);
+        ctx->module.globals = mp_globals_get();
+        mp_compiled_module_t cm = mp_raw_code_load_mem(mpy, len, ctx);
+        mp_obj_t f = mp_make_function_from_raw_code(cm.rc, ctx, MP_OBJ_NULL);
+        mp_call_function_0(f);
+        nlr_pop();
+    } else {
+        // Uncaught exception: print it out.
+        mp_obj_print_exception(&mp_plat_print, (mp_obj_t)nlr.ret_val);
+    }
+}
+#endif
+
+// Deinitialise the runtime.
+void mp_embed_deinit(void) {
+    mp_deinit();
+}
+
+#if MICROPY_ENABLE_GC
+// Run a garbage collection cycle.
+void gc_collect(void) {
+    gc_collect_start();
+    gc_helper_collect_regs_and_stack();
+    gc_collect_end();
+}
+#endif
+
+// Called if an exception is raised outside all C exception-catching handlers.
+void nlr_jump_fail(void *val) {
+    for (;;) {
+    }
+}
+
+#ifndef NDEBUG
+// Used when debugging is enabled.
+void __assert_func(const char *file, int line, const char *func, const char *expr) {
+    for (;;) {
+    }
+}
+#endif
diff --git a/ports/embed/port/micropython_embed.h b/ports/embed/port/micropython_embed.h
new file mode 100644
index 0000000000000..bf55d9b2b4454
--- /dev/null
+++ b/ports/embed/port/micropython_embed.h
@@ -0,0 +1,41 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2022-2023 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+#ifndef MICROPY_INCLUDED_MICROPYTHON_EMBED_H
+#define MICROPY_INCLUDED_MICROPYTHON_EMBED_H
+
+#include <stddef.h>
+#include <stdint.h>
+
+void mp_embed_init(void *gc_heap, size_t gc_heap_size);
+void mp_embed_deinit(void);
+
+// Only available if MICROPY_ENABLE_COMPILER is enabled.
+void mp_embed_exec_str(const char *src);
+
+// Only available if MICROPY_PERSISTENT_CODE_LOAD is enabled.
+void mp_embed_exec_mpy(const uint8_t *mpy, size_t len);
+
+#endif // MICROPY_INCLUDED_MICROPYTHON_EMBED_H
diff --git a/ports/embed/port/mpconfigport_common.h b/ports/embed/port/mpconfigport_common.h
new file mode 100644
index 0000000000000..69216a7582681
--- /dev/null
+++ b/ports/embed/port/mpconfigport_common.h
@@ -0,0 +1,38 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2022-2023 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include <stdint.h>
+
+// Type definitions for the specific machine
+
+typedef intptr_t mp_int_t; // must be pointer size
+typedef uintptr_t mp_uint_t; // must be pointer size
+typedef long mp_off_t;
+
+// Need to provide a declaration/definition of alloca()
+#include <alloca.h>
+
+#define MICROPY_MPHALPORT_H "port/mphalport.h"
diff --git a/ports/embed/port/mphalport.c b/ports/embed/port/mphalport.c
new file mode 100644
index 0000000000000..8e76a8e22e1b0
--- /dev/null
+++ b/ports/embed/port/mphalport.c
@@ -0,0 +1,33 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2022-2023 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include <stdio.h>
+#include "py/mphal.h"
+
+// Send string of given length to stdout, converting \n to \r\n.
+void mp_hal_stdout_tx_strn_cooked(const char *str, size_t len) {
+    printf("%.*s", (int)len, str);
+}
diff --git a/ports/embed/port/mphalport.h b/ports/embed/port/mphalport.h
new file mode 100644
index 0000000000000..49928e154da36
--- /dev/null
+++ b/ports/embed/port/mphalport.h
@@ -0,0 +1,2 @@
+// Define so there's no dependency on extmod/virtpin.h
+#define mp_hal_pin_obj_t

From 4f3780a156e1ba3f6981ab3a90be655a718f88f5 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 6 Oct 2022 11:14:58 +1100
Subject: [PATCH 3031/3533] examples/embedding: Rework example to use
 ports/embed.

Signed-off-by: Damien George <damien@micropython.org>
---
 .github/workflows/examples.yml            |   4 +-
 examples/embedding/Makefile               |  29 +++-
 examples/embedding/Makefile.upylib        | 184 ----------------------
 examples/embedding/README.md              |  66 +++-----
 examples/embedding/hello-embed.c          |  76 ---------
 examples/embedding/main.c                 |  44 ++++++
 examples/embedding/micropython_embed.mk   |   9 ++
 examples/embedding/mpconfigport.h         |  16 +-
 examples/embedding/mpconfigport_minimal.h | 122 --------------
 9 files changed, 111 insertions(+), 439 deletions(-)
 delete mode 100644 examples/embedding/Makefile.upylib
 delete mode 100644 examples/embedding/hello-embed.c
 create mode 100644 examples/embedding/main.c
 create mode 100644 examples/embedding/micropython_embed.mk
 delete mode 100644 examples/embedding/mpconfigport_minimal.h

diff --git a/.github/workflows/examples.yml b/.github/workflows/examples.yml
index e4105e8d43227..450805a6bde41 100644
--- a/.github/workflows/examples.yml
+++ b/.github/workflows/examples.yml
@@ -20,6 +20,6 @@ jobs:
     steps:
     - uses: actions/checkout@v3
     - name: Build
-      run: make -C examples/embedding
+      run: make -C examples/embedding -f micropython_embed.mk && make -C examples/embedding
     - name: Run
-      run: test "$(./examples/embedding/hello-embed)" = "Hello world of easy embedding!"
+      run: ./examples/embedding/embed | grep "hello world"
diff --git a/examples/embedding/Makefile b/examples/embedding/Makefile
index edaa577f57341..13bfdf12395d8 100644
--- a/examples/embedding/Makefile
+++ b/examples/embedding/Makefile
@@ -1,8 +1,25 @@
-MPTOP = ../..
-CFLAGS += -std=c99 -I. -I$(MPTOP) -DNO_QSTR
-LDFLAGS += -L./build
+# This file is part of the MicroPython project, http://micropython.org/
+# The MIT License (MIT)
+# Copyright (c) 2022-2023 Damien P. George
+#
+# This is a very simple makefile that demonstrates how to build the embed port.
+# All it needs to do is build all *.c files in the micropython_embed directory.
+# This makefile would be replaced with your custom build system.
 
-hello-embed: hello-embed.o -lmicropython
+EMBED_DIR = micropython_embed
+PROG = embed
 
--lmicropython:
-	$(MAKE) -f $(MPTOP)/examples/embedding/Makefile.upylib MPTOP=$(MPTOP)
+CFLAGS += -I.
+CFLAGS += -I$(EMBED_DIR)
+CFLAGS += -I$(EMBED_DIR)/port
+CFLAGS += -Wall -Og
+
+SRC += main.c
+SRC += $(wildcard $(EMBED_DIR)/*/*.c) $(wildcard $(EMBED_DIR)/*/*/*.c)
+OBJ += $(SRC:.c=.o)
+
+$(PROG): $(OBJ)
+	$(CC) -o $@ $^
+
+clean:
+	/bin/rm -f $(OBJ) $(PROG)
diff --git a/examples/embedding/Makefile.upylib b/examples/embedding/Makefile.upylib
deleted file mode 100644
index 99ce94b7add00..0000000000000
--- a/examples/embedding/Makefile.upylib
+++ /dev/null
@@ -1,184 +0,0 @@
-MPTOP = ../..
--include mpconfigport.mk
-include $(MPTOP)/py/mkenv.mk
-
-all: lib
-
-# OS name, for simple autoconfig
-UNAME_S := $(shell uname -s)
-
-# include py core make definitions
-include $(MPTOP)/py/py.mk
-include $(MPTOP)/extmod/extmod.mk
-
-INC +=  -I.
-INC +=  -I..
-INC +=  -I$(MPTOP)
-INC +=  -I$(MPTOP)/ports/unix
-INC += -I$(BUILD)
-
-# compiler settings
-CWARN = -Wall -Werror
-CWARN += -Wpointer-arith -Wuninitialized
-CFLAGS += $(INC) $(CWARN) -std=gnu99 -DUNIX $(CFLAGS_MOD) $(COPT) $(CFLAGS_EXTRA)
-
-# Some systems (eg MacOS) need -fno-common so that mp_state_ctx is placed in the BSS.
-CFLAGS += -fno-common
-
-# Debugging/Optimization
-ifdef DEBUG
-CFLAGS += -g
-COPT = -O0
-else
-COPT = -Os #-DNDEBUG
-# _FORTIFY_SOURCE is a feature in gcc/glibc which is intended to provide extra
-# security for detecting buffer overflows. Some distros (Ubuntu at the very least)
-# have it enabled by default.
-#
-# gcc already optimizes some printf calls to call puts and/or putchar. When
-# _FORTIFY_SOURCE is enabled and compiling with -O1 or greater, then some
-# printf calls will also be optimized to call __printf_chk (in glibc). Any
-# printfs which get redirected to __printf_chk are then no longer synchronized
-# with printfs that go through mp_printf.
-#
-# In MicroPython, we don't want to use the runtime library's printf but rather
-# go through mp_printf, so that stdout is properly tied into streams, etc.
-# This means that we either need to turn off _FORTIFY_SOURCE or provide our
-# own implementation of __printf_chk. We've chosen to turn off _FORTIFY_SOURCE.
-# It should also be noted that the use of printf in MicroPython is typically
-# quite limited anyways (primarily for debug and some error reporting, etc
-# in the unix version).
-#
-# Information about _FORTIFY_SOURCE seems to be rather scarce. The best I could
-# find was this: https://securityblog.redhat.com/2014/03/26/fortify-and-you/
-# Original patchset was introduced by
-# https://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html .
-#
-# Turning off _FORTIFY_SOURCE is only required when compiling with -O1 or greater
-CFLAGS += -U _FORTIFY_SOURCE
-endif
-
-# On OSX, 'gcc' is a symlink to clang unless a real gcc is installed.
-# The unix port of MicroPython on OSX must be compiled with clang,
-# while cross-compile ports require gcc, so we test here for OSX and
-# if necessary override the value of 'CC' set in py/mkenv.mk
-ifeq ($(UNAME_S),Darwin)
-CC = clang
-# Use clang syntax for map file
-LDFLAGS_ARCH = -Wl,-map,$@.map
-else
-# Use gcc syntax for map file
-LDFLAGS_ARCH = -Wl,-Map=$@.map,--cref
-endif
-LDFLAGS += $(LDFLAGS_MOD) $(LDFLAGS_ARCH) -lm $(LDFLAGS_EXTRA)
-
-ifeq ($(MICROPY_FORCE_32BIT),1)
-# Note: you may need to install i386 versions of dependency packages,
-# starting with linux-libc-dev:i386
-ifeq ($(MICROPY_PY_FFI),1)
-ifeq ($(UNAME_S),Linux)
-CFLAGS_MOD += -I/usr/include/i686-linux-gnu
-endif
-endif
-endif
-
-ifeq ($(MICROPY_USE_READLINE),1)
-INC += -I$(MPTOP)/shared/readline
-CFLAGS_MOD += -DMICROPY_USE_READLINE=1
-SHARED_SRC_C_EXTRA += readline/readline.c
-endif
-ifeq ($(MICROPY_USE_READLINE),2)
-CFLAGS_MOD += -DMICROPY_USE_READLINE=2
-LDFLAGS_MOD += -lreadline
-# the following is needed for BSD
-#LDFLAGS_MOD += -ltermcap
-endif
-ifeq ($(MICROPY_PY_TIME),1)
-CFLAGS_MOD += -DMICROPY_PY_TIME=1
-SRC_MOD += modtime.c
-endif
-ifeq ($(MICROPY_PY_TERMIOS),1)
-CFLAGS_MOD += -DMICROPY_PY_TERMIOS=1
-SRC_MOD += modtermios.c
-endif
-ifeq ($(MICROPY_PY_SOCKET),1)
-CFLAGS_MOD += -DMICROPY_PY_SOCKET=1
-SRC_MOD += modsocket.c
-endif
-
-ifeq ($(MICROPY_PY_FFI),1)
-
-ifeq ($(MICROPY_STANDALONE),1)
-LIBFFI_CFLAGS_MOD := -I$(shell ls -1d $(MPTOP)/lib/libffi/build_dir/out/lib/libffi-*/include)
- ifeq ($(MICROPY_FORCE_32BIT),1)
-  LIBFFI_LDFLAGS_MOD = $(MPTOP)/lib/libffi/build_dir/out/lib32/libffi.a
- else
-  LIBFFI_LDFLAGS_MOD = $(MPTOP)/lib/libffi/build_dir/out/lib/libffi.a
- endif
-else
-LIBFFI_CFLAGS_MOD := $(shell pkg-config --cflags libffi)
-LIBFFI_LDFLAGS_MOD := $(shell pkg-config --libs libffi)
-endif
-
-ifeq ($(UNAME_S),Linux)
-LIBFFI_LDFLAGS_MOD += -ldl
-endif
-
-CFLAGS_MOD += $(LIBFFI_CFLAGS_MOD) -DMICROPY_PY_FFI=1
-LDFLAGS_MOD += $(LIBFFI_LDFLAGS_MOD)
-SRC_MOD += modffi.c
-endif
-
-MAIN_C = main.c
-
-# source files
-SRC_C = $(addprefix ports/unix/,\
-	$(MAIN_C) \
-	gccollect.c \
-	unix_mphal.c \
-	input.c \
-	modmachine.c \
-	moduselect.c \
-	alloc.c \
-	coverage.c \
-	fatfs_port.c \
-	$(SRC_MOD) \
-	)
-
-SHARED_SRC_C = $(addprefix shared/,\
-	libc/printf.c \
-	runtime/gchelper_generic.c \
-	timeutils/timeutils.c \
-	$(SHARED_SRC_C_EXTRA) \
-	)
-
-OBJ = $(PY_O)
-OBJ += $(addprefix $(BUILD)/, $(SRC_C:.c=.o))
-OBJ += $(addprefix $(BUILD)/, $(SHARED_SRC_C:.c=.o))
-
-# List of sources for qstr extraction
-SRC_QSTR += $(SRC_C) $(SHARED_SRC_C)
-# Append any auto-generated sources that are needed by sources listed in
-# SRC_QSTR
-SRC_QSTR_AUTO_DEPS +=
-
-include $(MPTOP)/py/mkrules.mk
-
-# Value of configure's --host= option (required for cross-compilation).
-# Deduce it from CROSS_COMPILE by default, but can be overridden.
-ifneq ($(CROSS_COMPILE),)
-CROSS_COMPILE_HOST = --host=$(patsubst %-,%,$(CROSS_COMPILE))
-else
-CROSS_COMPILE_HOST =
-endif
-
-deplibs: libffi
-
-# install-exec-recursive & install-data-am targets are used to avoid building
-# docs and depending on makeinfo
-libffi:
-	cd $(MPTOP)/lib/libffi; git clean -d -x -f
-	cd $(MPTOP)/lib/libffi; ./autogen.sh
-	mkdir -p $(MPTOP)/lib/libffi/build_dir; cd $(MPTOP)/lib/libffi/build_dir; \
-	../configure $(CROSS_COMPILE_HOST) --prefix=$$PWD/out CC="$(CC)" CXX="$(CXX)" LD="$(LD)"; \
-	make install-exec-recursive; make -C include install-data-am
diff --git a/examples/embedding/README.md b/examples/embedding/README.md
index 0dfc52e1dcad3..e3683acdc22ab 100644
--- a/examples/embedding/README.md
+++ b/examples/embedding/README.md
@@ -1,67 +1,37 @@
 Example of embedding MicroPython in a standalone C application
 ==============================================================
 
-This directory contains a (very simple!) example of how to embed a MicroPython
-in an existing C application.
-
-A C application is represented by the file `hello-embed.c`. It executes a simple
-Python statement which prints to the standard output.
+This directory contains a simple example of how to embed MicroPython in an
+existing C application.
 
+A C application is represented here by the file `main.c`.  It executes two
+simple Python scripts which print things to the standard output.
 
 Building the example
 --------------------
 
-Building the example is as simple as running:
-
-    make
-
-It's worth to trace what's happening behind the scenes though:
-
-1. As a first step, a MicroPython library is built. This is handled by a
-separate makefile, `Makefile.upylib`. It is more or less complex, but the
-good news is that you won't need to change anything in it, just use it
-as is, the main `Makefile` shows how. What may require editing though is
-a MicroPython configuration file. MicroPython is highly configurable, so
-you would need to build a library suiting your application well, while
-not bloating its size. Check the options in the file `mpconfigport.h`.
-Included is a copy of the "minimal" Unix port, which should be a good start
-for minimal embedding. For the list of all available options, see
-`py/mpconfig.h`.
+First build the embed port using:
 
-2. Once the MicroPython library is built, your application is compiled
-and linked it. The main Makefile is very simple and shows that the changes
-you would need to do to your application's `Makefile` (or other build
-configuration) are also simple:
+    $ make -f micropython_embed.mk
 
-a) You would need to use C99 standard (you're using this 15+ years old
-standard already, not a 25+ years old one, right?).
+This will generate the `micropython_embed` directory which is a self-contained
+copy of MicroPython suitable for embedding.  The .c files in this directory need
+to be compiled into your project, in whatever way your project can do that.  The
+example here uses make and a provided `Makefile`.
 
-b) You need to provide a path to MicroPython's top-level dir, for includes.
+To build the example project, based on `main.c`, use:
 
-c) You need to include `-DNO_QSTR` compile-time flag.
+    $ make
 
-d) Otherwise, just link with the MicroPython library produced in step 1.
+That will create an exacutable called `embed` which you can run:
 
+    $ ./embed
 
 Out of tree build
 -----------------
 
 This example is set up to work out of the box, being part of the MicroPython
-tree. Your application of course will be outside of its tree, but the
-only thing you need to do is to pass `MPTOP` variable pointing to
-MicroPython directory to both Makefiles (in this example, the main Makefile
-automatically passes it to `Makefile.upylib`; in your own Makefile, don't forget
-to use a suitable value).
-
-A practical way to embed MicroPython in your application is to include it
-as a git submodule. Suppose you included it as `libs/micropython`. Then in
-your main Makefile you would have something like:
-
-~~~
-MPTOP = libs/micropython
-
-my_app: $(MY_OBJS) -lmicropython
-
--lmicropython:
-	$(MAKE) -f $(MPTOP)/examples/embedding/Makefile.upylib MPTOP=$(MPTOP)
-~~~
+tree.  Your application will be outside of this tree, but the only thing you
+need to do for that is to change `MICROPYTHON_TOP` (found in `micropython_embed.mk`)
+to point to the location of the MicroPython repository.  The MicroPython
+repository may, for example, be a git submodule in your project.
diff --git a/examples/embedding/hello-embed.c b/examples/embedding/hello-embed.c
deleted file mode 100644
index 0b778986b3a5d..0000000000000
--- a/examples/embedding/hello-embed.c
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2016 Paul Sokolovsky
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-#include "py/builtin.h"
-#include "py/compile.h"
-#include "py/runtime.h"
-#include "py/gc.h"
-#include "py/stackctrl.h"
-
-static char heap[16384];
-
-mp_obj_t execute_from_str(const char *str) {
-    nlr_buf_t nlr;
-    if (nlr_push(&nlr) == 0) {
-        qstr src_name = 1/*MP_QSTR_*/;
-        mp_lexer_t *lex = mp_lexer_new_from_str_len(src_name, str, strlen(str), false);
-        mp_parse_tree_t pt = mp_parse(lex, MP_PARSE_FILE_INPUT);
-        mp_obj_t module_fun = mp_compile(&pt, src_name, false);
-        mp_call_function_0(module_fun);
-        nlr_pop();
-        return 0;
-    } else {
-        // uncaught exception
-        return (mp_obj_t)nlr.ret_val;
-    }
-}
-
-int main() {
-    // Initialized stack limit
-    mp_stack_set_limit(40000 * (sizeof(void *) / 4));
-    // Initialize heap
-    gc_init(heap, heap + sizeof(heap));
-    // Initialize interpreter
-    mp_init();
-
-    const char str[] = "print('Hello world of easy embedding!')";
-    if (execute_from_str(str)) {
-        printf("Error\n");
-    }
-}
-
-uint mp_import_stat(const char *path) {
-    return MP_IMPORT_STAT_NO_EXIST;
-}
-
-void nlr_jump_fail(void *val) {
-    printf("FATAL: uncaught NLR %p\n", val);
-    exit(1);
-}
diff --git a/examples/embedding/main.c b/examples/embedding/main.c
new file mode 100644
index 0000000000000..ee673fc93a687
--- /dev/null
+++ b/examples/embedding/main.c
@@ -0,0 +1,44 @@
+/* This file is part of the MicroPython project, http://micropython.org/
+ * The MIT License (MIT)
+ * Copyright (c) 2022-2023 Damien P. George
+ */
+
+#include "port/micropython_embed.h"
+
+// This is example 1 script, which will be compiled and executed.
+static const char *example_1 =
+    "print('hello world!', list(x + 1 for x in range(10)), end='eol\\n')";
+
+// This is example 2 script, which will be compiled and executed.
+static const char *example_2 =
+    "for i in range(10):\n"
+    "    print('iter {:08}'.format(i))\n"
+    "\n"
+    "try:\n"
+    "    1//0\n"
+    "except Exception as er:\n"
+    "    print('caught exception', repr(er))\n"
+    "\n"
+    "import gc\n"
+    "print('run GC collect')\n"
+    "gc.collect()\n"
+    "\n"
+    "print('finish')\n"
+    ;
+
+// This array is the MicroPython GC heap.
+static char heap[8 * 1024];
+
+int main() {
+    // Initialise MicroPython.
+    mp_embed_init(&heap[0], sizeof(heap));
+
+    // Run the example scripts (they will be compiled first).
+    mp_embed_exec_str(example_1);
+    mp_embed_exec_str(example_2);
+
+    // Deinitialise MicroPython.
+    mp_embed_deinit();
+
+    return 0;
+}
diff --git a/examples/embedding/micropython_embed.mk b/examples/embedding/micropython_embed.mk
new file mode 100644
index 0000000000000..5db541592750c
--- /dev/null
+++ b/examples/embedding/micropython_embed.mk
@@ -0,0 +1,9 @@
+# This file is part of the MicroPython project, http://micropython.org/
+# The MIT License (MIT)
+# Copyright (c) 2022-2023 Damien P. George
+
+# Set the location of the top of the MicroPython repository.
+MICROPYTHON_TOP = ../..
+
+# Include the main makefile fragment to build the MicroPython component.
+include $(MICROPYTHON_TOP)/ports/embed/embed.mk
diff --git a/examples/embedding/mpconfigport.h b/examples/embedding/mpconfigport.h
index 89c180b2a8153..ed34a5d766aeb 100644
--- a/examples/embedding/mpconfigport.h
+++ b/examples/embedding/mpconfigport.h
@@ -1 +1,15 @@
-#include "mpconfigport_minimal.h"
+/* This file is part of the MicroPython project, http://micropython.org/
+ * The MIT License (MIT)
+ * Copyright (c) 2022-2023 Damien P. George
+ */
+
+// Include common MicroPython embed configuration.
+#include <port/mpconfigport_common.h>
+
+// Use the minimal starting configuration (disables all optional features).
+#define MICROPY_CONFIG_ROM_LEVEL                (MICROPY_CONFIG_ROM_LEVEL_MINIMUM)
+
+// MicroPython configuration.
+#define MICROPY_ENABLE_COMPILER                 (1)
+#define MICROPY_ENABLE_GC                       (1)
+#define MICROPY_PY_GC                           (1)
diff --git a/examples/embedding/mpconfigport_minimal.h b/examples/embedding/mpconfigport_minimal.h
deleted file mode 100644
index 02089c1a62135..0000000000000
--- a/examples/embedding/mpconfigport_minimal.h
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2015 Damien P. George
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-// options to control how MicroPython is built
-
-#define MICROPY_ALLOC_PATH_MAX      (PATH_MAX)
-#define MICROPY_ENABLE_GC           (1)
-#define MICROPY_ENABLE_FINALISER    (0)
-#define MICROPY_STACK_CHECK         (0)
-#define MICROPY_COMP_CONST          (0)
-#define MICROPY_MEM_STATS           (0)
-#define MICROPY_DEBUG_PRINTERS      (0)
-#define MICROPY_READER_POSIX        (1)
-#define MICROPY_KBD_EXCEPTION       (1)
-#define MICROPY_HELPER_REPL         (1)
-#define MICROPY_HELPER_LEXER_UNIX   (1)
-#define MICROPY_ENABLE_SOURCE_LINE  (0)
-#define MICROPY_ERROR_REPORTING     (MICROPY_ERROR_REPORTING_TERSE)
-#define MICROPY_WARNINGS            (0)
-#define MICROPY_ENABLE_EMERGENCY_EXCEPTION_BUF   (0)
-#define MICROPY_FLOAT_IMPL          (MICROPY_FLOAT_IMPL_NONE)
-#define MICROPY_LONGINT_IMPL        (MICROPY_LONGINT_IMPL_NONE)
-#define MICROPY_STREAMS_NON_BLOCK   (0)
-#define MICROPY_OPT_COMPUTED_GOTO   (0)
-#define MICROPY_CAN_OVERRIDE_BUILTINS (0)
-#define MICROPY_BUILTIN_METHOD_CHECK_SELF_ARG (0)
-#define MICROPY_CPYTHON_COMPAT      (0)
-#define MICROPY_PY_BUILTINS_BYTEARRAY (0)
-#define MICROPY_PY_BUILTINS_MEMORYVIEW (0)
-#define MICROPY_PY_BUILTINS_COMPILE (0)
-#define MICROPY_PY_BUILTINS_ENUMERATE (0)
-#define MICROPY_PY_BUILTINS_FILTER  (0)
-#define MICROPY_PY_BUILTINS_FROZENSET (0)
-#define MICROPY_PY_BUILTINS_REVERSED (0)
-#define MICROPY_PY_BUILTINS_SET     (0)
-#define MICROPY_PY_BUILTINS_SLICE   (0)
-#define MICROPY_PY_BUILTINS_STR_UNICODE (0)
-#define MICROPY_PY_BUILTINS_PROPERTY (0)
-#define MICROPY_PY_BUILTINS_MIN_MAX (0)
-#define MICROPY_PY___FILE__         (0)
-#define MICROPY_PY_MICROPYTHON_MEM_INFO (0)
-#define MICROPY_PY_GC               (0)
-#define MICROPY_PY_GC_COLLECT_RETVAL (0)
-#define MICROPY_PY_ARRAY            (0)
-#define MICROPY_PY_COLLECTIONS      (0)
-#define MICROPY_PY_MATH             (0)
-#define MICROPY_PY_CMATH            (0)
-#define MICROPY_PY_IO               (0)
-#define MICROPY_PY_STRUCT           (0)
-#define MICROPY_PY_SYS              (1)
-#define MICROPY_PY_SYS_EXIT         (0)
-#define MICROPY_PY_SYS_PLATFORM     "linux"
-#define MICROPY_PY_SYS_MAXSIZE      (0)
-#define MICROPY_PY_SYS_PATH_DEFAULT ".frozen"
-#define MICROPY_PY_SYS_STDFILES     (0)
-#define MICROPY_PY_CMATH            (0)
-#define MICROPY_PY_UCTYPES          (0)
-#define MICROPY_PY_UZLIB            (0)
-#define MICROPY_PY_UJSON            (0)
-#define MICROPY_PY_UOS              (1)
-#define MICROPY_PY_URE              (0)
-#define MICROPY_PY_UHEAPQ           (0)
-#define MICROPY_PY_UHASHLIB         (0)
-#define MICROPY_PY_UBINASCII        (0)
-
-//////////////////////////////////////////
-// Do not change anything beyond this line
-//////////////////////////////////////////
-
-#if !(defined(MICROPY_GCREGS_SETJMP) || defined(__x86_64__) || defined(__i386__) || defined(__thumb2__) || defined(__thumb__) || defined(__arm__))
-// Fall back to setjmp() implementation for discovery of GC pointers in registers.
-#define MICROPY_GCREGS_SETJMP (1)
-#endif
-
-// type definitions for the specific machine
-
-#ifdef __LP64__
-typedef long mp_int_t; // must be pointer size
-typedef unsigned long mp_uint_t; // must be pointer size
-#else
-// These are definitions for machines where sizeof(int) == sizeof(void*),
-// regardless for actual size.
-typedef int mp_int_t; // must be pointer size
-typedef unsigned int mp_uint_t; // must be pointer size
-#endif
-
-// Cannot include <sys/types.h>, as it may lead to symbol name clashes
-#if _FILE_OFFSET_BITS == 64 && !defined(__LP64__)
-typedef long long mp_off_t;
-#else
-typedef long mp_off_t;
-#endif
-
-// We need to provide a declaration/definition of alloca()
-#ifdef __FreeBSD__
-#include <stdlib.h>
-#else
-#include <alloca.h>
-#endif

From d4a4cde42e80dc2c25c018af200e641b03999e19 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sun, 22 Jan 2023 17:49:10 +0100
Subject: [PATCH 3032/3533] rp2: Fix crash in a pin.irq handler.

When accessing the argument of the irq function.
---
 ports/rp2/machine_pin.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/rp2/machine_pin.c b/ports/rp2/machine_pin.c
index 3de2eaaed8274..3c7cd86eeaa22 100644
--- a/ports/rp2/machine_pin.c
+++ b/ports/rp2/machine_pin.c
@@ -423,7 +423,7 @@ STATIC machine_pin_irq_obj_t *machine_pin_get_irq(mp_hal_pin_obj_t pin) {
         irq = m_new_obj(machine_pin_irq_obj_t);
         irq->base.base.type = &mp_irq_type;
         irq->base.methods = (mp_irq_methods_t *)&machine_pin_irq_methods;
-        irq->base.parent = MP_OBJ_FROM_PTR(&machine_pin_cpu_pins[pin]);
+        irq->base.parent = MP_OBJ_FROM_PTR(machine_pin_cpu_pins[pin]);
         irq->base.handler = mp_const_none;
         irq->base.ishard = false;
         MP_STATE_PORT(machine_pin_irq_obj[pin]) = irq;

From d387ae3444751a3ba1032bd16243cb2dc741e333 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 23 Jan 2023 12:24:39 +1100
Subject: [PATCH 3033/3533] py/objint_mpz: Catch and reject @ and @= operating
 on big integers.

This will also catch / and /= when float support is disabled.

Fixes issue #10544.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/objint_mpz.c               |  6 ++++--
 tests/basics/int_big_error.py | 10 ++++++++++
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/py/objint_mpz.c b/py/objint_mpz.c
index 2811bcf2aab21..e9545149f8b28 100644
--- a/py/objint_mpz.c
+++ b/py/objint_mpz.c
@@ -296,8 +296,7 @@ mp_obj_t mp_obj_int_binary_op(mp_binary_op_t op, mp_obj_t lhs_in, mp_obj_t rhs_i
                 mpz_pow_inpl(&res->mpz, zlhs, zrhs);
                 break;
 
-            default: {
-                assert(op == MP_BINARY_OP_DIVMOD);
+            case MP_BINARY_OP_DIVMOD: {
                 if (mpz_is_zero(zrhs)) {
                     goto zero_division_error;
                 }
@@ -306,6 +305,9 @@ mp_obj_t mp_obj_int_binary_op(mp_binary_op_t op, mp_obj_t lhs_in, mp_obj_t rhs_i
                 mp_obj_t tuple[2] = {MP_OBJ_FROM_PTR(quo), MP_OBJ_FROM_PTR(res)};
                 return mp_obj_new_tuple(2, tuple);
             }
+
+            default:
+                return MP_OBJ_NULL; // op not supported
         }
 
         return MP_OBJ_FROM_PTR(res);
diff --git a/tests/basics/int_big_error.py b/tests/basics/int_big_error.py
index 79809aef1104c..1793cf3253d13 100644
--- a/tests/basics/int_big_error.py
+++ b/tests/basics/int_big_error.py
@@ -7,6 +7,16 @@
 except ValueError:
     print("ValueError")
 
+try:
+    i @ 0
+except TypeError:
+    print("TypeError")
+
+try:
+    i @= 0
+except TypeError:
+    print("TypeError")
+
 try:
     len(i)
 except TypeError:

From 31139b437a05a9cf05608df11843aba3790184b9 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 24 Jan 2023 16:55:23 +1100
Subject: [PATCH 3034/3533] py/mkrules: Support mpy-tool-flags in cmake frozen
 code generation.

Signed-off-by: Damien George <damien@micropython.org>
---
 py/mkrules.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/py/mkrules.cmake b/py/mkrules.cmake
index b29986585a798..38bad80fdb9aa 100644
--- a/py/mkrules.cmake
+++ b/py/mkrules.cmake
@@ -205,7 +205,7 @@ if(MICROPY_FROZEN_MANIFEST)
 
     add_custom_command(
         OUTPUT ${MICROPY_FROZEN_CONTENT}
-        COMMAND ${Python3_EXECUTABLE} ${MICROPY_DIR}/tools/makemanifest.py -o ${MICROPY_FROZEN_CONTENT} -v "MPY_DIR=${MICROPY_DIR}" -v "MPY_LIB_DIR=${MICROPY_LIB_DIR}" -v "PORT_DIR=${MICROPY_PORT_DIR}" -v "BOARD_DIR=${MICROPY_BOARD_DIR}" -b "${CMAKE_BINARY_DIR}" -f${MICROPY_CROSS_FLAGS} ${MICROPY_FROZEN_MANIFEST}
+        COMMAND ${Python3_EXECUTABLE} ${MICROPY_DIR}/tools/makemanifest.py -o ${MICROPY_FROZEN_CONTENT} -v "MPY_DIR=${MICROPY_DIR}" -v "MPY_LIB_DIR=${MICROPY_LIB_DIR}" -v "PORT_DIR=${MICROPY_PORT_DIR}" -v "BOARD_DIR=${MICROPY_BOARD_DIR}" -b "${CMAKE_BINARY_DIR}" -f${MICROPY_CROSS_FLAGS} --mpy-tool-flags=${MICROPY_MPY_TOOL_FLAGS} ${MICROPY_FROZEN_MANIFEST}
         DEPENDS MICROPY_FORCE_BUILD
             ${MICROPY_QSTRDEFS_GENERATED}
             ${MICROPY_ROOT_POINTERS}

From 1978b838b7b75d2e525771f95f3532cc623419ef Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 24 Jan 2023 16:57:26 +1100
Subject: [PATCH 3035/3533] shared/runtime: Use mp_printf consistently, instead
 of printf.

Signed-off-by: Damien George <damien@micropython.org>
---
 shared/runtime/mpirq.c  | 4 ++--
 shared/runtime/pyexec.c | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/shared/runtime/mpirq.c b/shared/runtime/mpirq.c
index f9a85ebbd61bc..acd727403b558 100644
--- a/shared/runtime/mpirq.c
+++ b/shared/runtime/mpirq.c
@@ -81,8 +81,8 @@ void mp_irq_handler(mp_irq_obj_t *self) {
                 // Uncaught exception; disable the callback so that it doesn't run again
                 self->methods->trigger(self->parent, 0);
                 self->handler = mp_const_none;
-                printf("Uncaught exception in IRQ callback handler\n");
-                mp_obj_print_exception(&mp_plat_print, MP_OBJ_FROM_PTR(nlr.ret_val));
+                mp_printf(MICROPY_ERROR_PRINTER, "Uncaught exception in IRQ callback handler\n");
+                mp_obj_print_exception(MICROPY_ERROR_PRINTER, MP_OBJ_FROM_PTR(nlr.ret_val));
             }
             gc_unlock();
             mp_sched_unlock();
diff --git a/shared/runtime/pyexec.c b/shared/runtime/pyexec.c
index 2c9f1e80ff649..b6e7d8fe68e92 100644
--- a/shared/runtime/pyexec.c
+++ b/shared/runtime/pyexec.c
@@ -154,12 +154,12 @@ STATIC int parse_compile_execute(const void *source, mp_parse_input_kind_t input
     // display debugging info if wanted
     if ((exec_flags & EXEC_FLAG_ALLOW_DEBUGGING) && repl_display_debugging_info) {
         mp_uint_t ticks = mp_hal_ticks_ms() - start; // TODO implement a function that does this properly
-        printf("took " UINT_FMT " ms\n", ticks);
+        mp_printf(&mp_plat_print, "took " UINT_FMT " ms\n", ticks);
         // qstr info
         {
             size_t n_pool, n_qstr, n_str_data_bytes, n_total_bytes;
             qstr_pool_info(&n_pool, &n_qstr, &n_str_data_bytes, &n_total_bytes);
-            printf("qstr:\n  n_pool=%u\n  n_qstr=%u\n  "
+            mp_printf(&mp_plat_print, "qstr:\n  n_pool=%u\n  n_qstr=%u\n  "
                 "n_str_data_bytes=%u\n  n_total_bytes=%u\n",
                 (unsigned)n_pool, (unsigned)n_qstr, (unsigned)n_str_data_bytes, (unsigned)n_total_bytes);
         }
@@ -713,7 +713,7 @@ int pyexec_frozen_module(const char *name) {
         #endif
 
         default:
-            printf("could not find module '%s'\n", name);
+            mp_printf(MICROPY_ERROR_PRINTER, "could not find module '%s'\n", name);
             return false;
     }
 }

From 8a0353525f913f464b9b8a6f610661a0e8fb4fd1 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 24 Jan 2023 16:58:29 +1100
Subject: [PATCH 3036/3533] rp2/main: Use mp_printf in nlr_jump_fail.

The mp_plat_print output is already being used by the subsequent call to
mp_obj_print_exception().  And this eliminates all references to printf for
this port (at least in non-debug builds).

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/rp2/main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/rp2/main.c b/ports/rp2/main.c
index fdcdd90d4c303..c5b50374912c3 100644
--- a/ports/rp2/main.c
+++ b/ports/rp2/main.c
@@ -234,7 +234,7 @@ void gc_collect(void) {
 }
 
 void nlr_jump_fail(void *val) {
-    printf("FATAL: uncaught exception %p\n", val);
+    mp_printf(&mp_plat_print, "FATAL: uncaught exception %p\n", val);
     mp_obj_print_exception(&mp_plat_print, MP_OBJ_FROM_PTR(val));
     for (;;) {
         __breakpoint();

From 67fac4ebc53db6337008ba06df7932faec80f57c Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 24 Jan 2023 17:29:45 +1100
Subject: [PATCH 3037/3533] rp2/machine_pin: Fix configuring OPEN_DRAIN with
 initial value.

Prior to this commit, Pin(Pin.OPEN_DRAIN, value=0) would not set the
initial value of the open-drain pin to low, instead it would be high.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/rp2/machine_pin.c | 11 ++++++-----
 ports/rp2/mphalport.h   | 15 ++++++++++++---
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/ports/rp2/machine_pin.c b/ports/rp2/machine_pin.c
index 3c7cd86eeaa22..71eda316da1dd 100644
--- a/ports/rp2/machine_pin.c
+++ b/ports/rp2/machine_pin.c
@@ -236,13 +236,10 @@ STATIC mp_obj_t machine_pin_obj_init_helper(const machine_pin_obj_t *self, size_
         mp_raise_ValueError("alternate functions are not supported for external pins");
     }
 
+    // get initial value of pin (only valid for OUT and OPEN_DRAIN modes)
     int value = -1;
     if (args[ARG_value].u_obj != mp_const_none) {
         value = mp_obj_is_true(args[ARG_value].u_obj);
-        // set initial value (do this before configuring mode/pull)
-        if (!is_ext_pin(self)) {
-            gpio_put(self->id, value);
-        }
     }
 
     // configure mode
@@ -257,9 +254,13 @@ STATIC mp_obj_t machine_pin_obj_init_helper(const machine_pin_obj_t *self, size_
         } else if (mode == MACHINE_PIN_MODE_IN) {
             mp_hal_pin_input(self->id);
         } else if (mode == MACHINE_PIN_MODE_OUT) {
+            if (value != -1) {
+                // set initial output value before configuring mode
+                gpio_put(self->id, value);
+            }
             mp_hal_pin_output(self->id);
         } else if (mode == MACHINE_PIN_MODE_OPEN_DRAIN) {
-            mp_hal_pin_open_drain(self->id);
+            mp_hal_pin_open_drain_with_value(self->id, value == -1 ? 1 : value);
         } else {
             // Configure alternate function.
             mp_uint_t af = args[ARG_alt].u_int;
diff --git a/ports/rp2/mphalport.h b/ports/rp2/mphalport.h
index 2cb9121fa2ade..8b4a5b609377b 100644
--- a/ports/rp2/mphalport.h
+++ b/ports/rp2/mphalport.h
@@ -102,13 +102,22 @@ static inline void mp_hal_pin_output(mp_hal_pin_obj_t pin) {
     gpio_set_function(pin, GPIO_FUNC_SIO);
 }
 
-static inline void mp_hal_pin_open_drain(mp_hal_pin_obj_t pin) {
-    gpio_set_dir(pin, GPIO_IN);
-    gpio_put(pin, 0);
+static inline void mp_hal_pin_open_drain_with_value(mp_hal_pin_obj_t pin, int v) {
+    if (v) {
+        gpio_set_dir(pin, GPIO_IN);
+        gpio_put(pin, 0);
+    } else {
+        gpio_put(pin, 0);
+        gpio_set_dir(pin, GPIO_OUT);
+    }
     machine_pin_open_drain_mask |= 1 << pin;
     gpio_set_function(pin, GPIO_FUNC_SIO);
 }
 
+static inline void mp_hal_pin_open_drain(mp_hal_pin_obj_t pin) {
+    mp_hal_pin_open_drain_with_value(pin, 1);
+}
+
 static inline void mp_hal_pin_config(mp_hal_pin_obj_t pin, uint32_t mode, uint32_t pull, uint32_t alt) {
     assert((mode == MP_HAL_PIN_MODE_INPUT || mode == MP_HAL_PIN_MODE_OUTPUT) && alt == 0);
     gpio_set_dir(pin, mode);

From be420bf9bbf8f8c9d73e2a3694a319c6b4e779ea Mon Sep 17 00:00:00 2001
From: Jay Greco <jayv.greco@gmail.com>
Date: Tue, 20 Dec 2022 06:41:19 +0000
Subject: [PATCH 3038/3533] rp2/boards/NULLBITS_BIT_C_PRO: Add Bit-C PRO board.

---
 ports/rp2/boards/NULLBITS_BIT_C_PRO/README.md | 17 ++++
 .../rp2/boards/NULLBITS_BIT_C_PRO/board.json  | 20 ++++
 ports/rp2/boards/NULLBITS_BIT_C_PRO/board.py  |  7 ++
 .../rp2/boards/NULLBITS_BIT_C_PRO/manifest.py |  2 +
 .../NULLBITS_BIT_C_PRO/mpconfigboard.cmake    | 10 ++
 .../boards/NULLBITS_BIT_C_PRO/mpconfigboard.h |  9 ++
 .../NULLBITS_BIT_C_PRO/nullbits_bit_c_pro.h   | 96 +++++++++++++++++++
 ports/rp2/boards/NULLBITS_BIT_C_PRO/pins.csv  |  4 +
 8 files changed, 165 insertions(+)
 create mode 100644 ports/rp2/boards/NULLBITS_BIT_C_PRO/README.md
 create mode 100644 ports/rp2/boards/NULLBITS_BIT_C_PRO/board.json
 create mode 100644 ports/rp2/boards/NULLBITS_BIT_C_PRO/board.py
 create mode 100644 ports/rp2/boards/NULLBITS_BIT_C_PRO/manifest.py
 create mode 100644 ports/rp2/boards/NULLBITS_BIT_C_PRO/mpconfigboard.cmake
 create mode 100644 ports/rp2/boards/NULLBITS_BIT_C_PRO/mpconfigboard.h
 create mode 100644 ports/rp2/boards/NULLBITS_BIT_C_PRO/nullbits_bit_c_pro.h
 create mode 100644 ports/rp2/boards/NULLBITS_BIT_C_PRO/pins.csv

diff --git a/ports/rp2/boards/NULLBITS_BIT_C_PRO/README.md b/ports/rp2/boards/NULLBITS_BIT_C_PRO/README.md
new file mode 100644
index 0000000000000..0849108413214
--- /dev/null
+++ b/ports/rp2/boards/NULLBITS_BIT_C_PRO/README.md
@@ -0,0 +1,17 @@
+# nullbits Bit-C PRO
+
+The nullbits Bit-C PRO Board is based on the Raspberry Pi RP2040, and comes in the Arduino Pro Micro footprint.
+
+
+## Board-specific modules
+
+The `board` module contains definitions for the onboard RGB LED.
+
+Example:
+
+```python
+>>> import board
+>>> board.led_red.on()
+>>> board.led_green.on()
+>>> board.led_blue.on()
+```
diff --git a/ports/rp2/boards/NULLBITS_BIT_C_PRO/board.json b/ports/rp2/boards/NULLBITS_BIT_C_PRO/board.json
new file mode 100644
index 0000000000000..2aff0580d879a
--- /dev/null
+++ b/ports/rp2/boards/NULLBITS_BIT_C_PRO/board.json
@@ -0,0 +1,20 @@
+{
+    "deploy": [
+        "../deploy.md"
+    ],
+    "docs": "",
+    "features": [
+        "Breadboard Friendly",
+        "RGB LED",
+        "USB-C",
+        "SPI Flash"
+    ],
+    "images": [
+        "nullbits_bit_c_pro.jpg"
+    ],
+    "mcu": "rp2040",
+    "product": "Bit-C PRO",
+    "thumbnail": "",
+    "url": "https://nullbits.co/bit-c-pro",
+    "vendor": "nullbits"
+}
diff --git a/ports/rp2/boards/NULLBITS_BIT_C_PRO/board.py b/ports/rp2/boards/NULLBITS_BIT_C_PRO/board.py
new file mode 100644
index 0000000000000..9ee8cc806faaf
--- /dev/null
+++ b/ports/rp2/boards/NULLBITS_BIT_C_PRO/board.py
@@ -0,0 +1,7 @@
+from machine import Pin, Signal
+
+led_red = Signal("LED_RED", Pin.OUT, invert=True, value=0)
+led_green = Signal("LED_GREEN", Pin.OUT, invert=True, value=0)
+led_blue = Signal("LED_BLUE", Pin.OUT, invert=True, value=0)
+
+del Pin
diff --git a/ports/rp2/boards/NULLBITS_BIT_C_PRO/manifest.py b/ports/rp2/boards/NULLBITS_BIT_C_PRO/manifest.py
new file mode 100644
index 0000000000000..3a6af47a16b12
--- /dev/null
+++ b/ports/rp2/boards/NULLBITS_BIT_C_PRO/manifest.py
@@ -0,0 +1,2 @@
+include("$(PORT_DIR)/boards/manifest.py")
+module("board.py")
diff --git a/ports/rp2/boards/NULLBITS_BIT_C_PRO/mpconfigboard.cmake b/ports/rp2/boards/NULLBITS_BIT_C_PRO/mpconfigboard.cmake
new file mode 100644
index 0000000000000..050ca347be48a
--- /dev/null
+++ b/ports/rp2/boards/NULLBITS_BIT_C_PRO/mpconfigboard.cmake
@@ -0,0 +1,10 @@
+# cmake file for nullbits Bit-C PRO
+
+# The Bit-C PRO is not yet in upstream pico-sdk, so define it here
+# See also: https://github.com/raspberrypi/pico-sdk/tree/master/src/boards/include/boards
+list(APPEND PICO_BOARD_HEADER_DIRS ${MICROPY_BOARD_DIR})
+
+set(PICO_BOARD "nullbits_bit_c_pro")
+
+# Freeze board.py
+set(MICROPY_FROZEN_MANIFEST ${MICROPY_BOARD_DIR}/manifest.py)
diff --git a/ports/rp2/boards/NULLBITS_BIT_C_PRO/mpconfigboard.h b/ports/rp2/boards/NULLBITS_BIT_C_PRO/mpconfigboard.h
new file mode 100644
index 0000000000000..e28c379fa70ea
--- /dev/null
+++ b/ports/rp2/boards/NULLBITS_BIT_C_PRO/mpconfigboard.h
@@ -0,0 +1,9 @@
+// https://nullbits.co/bit-c-pro
+
+#define MICROPY_HW_BOARD_NAME       "nullbits Bit-C PRO"
+#define MICROPY_HW_FLASH_STORAGE_BYTES (PICO_FLASH_SIZE_BYTES - (1 * 512 * 1024)) // 512K reserved
+
+// RGB LED, active low
+// Red LED   16
+// Green LED 17
+// Blue LED  18
diff --git a/ports/rp2/boards/NULLBITS_BIT_C_PRO/nullbits_bit_c_pro.h b/ports/rp2/boards/NULLBITS_BIT_C_PRO/nullbits_bit_c_pro.h
new file mode 100644
index 0000000000000..2e8b03a430374
--- /dev/null
+++ b/ports/rp2/boards/NULLBITS_BIT_C_PRO/nullbits_bit_c_pro.h
@@ -0,0 +1,96 @@
+// Board definition for the nullbits Bit-C PRO
+
+#ifndef _BOARDS_NULLBITS_BIT_C_PRO_H
+#define _BOARDS_NULLBITS_BIT_C_PRO_H
+
+// For board detection
+#define NULLBITS_BIT_C_PRO
+
+// On some samples, the xosc can take longer to stabilize than is usual
+#ifndef PICO_XOSC_STARTUP_DELAY_MULTIPLIER
+#define PICO_XOSC_STARTUP_DELAY_MULTIPLIER 64
+#endif
+
+// --- BOARD SPECIFIC ---
+#define BIT_C_PRO_LED_R_PIN 16
+#define BIT_C_PRO_LED_G_PIN 17
+#define BIT_C_PRO_LED_B_PIN 18
+
+// ------------- UART -------------//
+#ifndef PICO_DEFAULT_UART
+#define PICO_DEFAULT_UART 0
+#endif
+
+#ifndef PICO_DEFAULT_UART_TX_PIN
+#define PICO_DEFAULT_UART_TX_PIN 0
+#endif
+
+#ifndef PICO_DEFAULT_UART_RX_PIN
+#define PICO_DEFAULT_UART_RX_PIN 1
+#endif
+
+// --- LED ---
+// Set the default LED to the Bit-C PRO's B led
+#ifndef PICO_DEFAULT_LED_PIN
+#define PICO_DEFAULT_LED_PIN BIT_C_PRO_LED_B_PIN
+#endif
+
+#ifndef PICO_DEFAULT_LED_PIN_INVERTED
+#define PICO_DEFAULT_LED_PIN_INVERTED 1
+#endif
+// no PICO_DEFAULT_WS2812_PIN
+
+// ------------- I2C -------------//
+#ifndef PICO_DEFAULT_I2C
+#define PICO_DEFAULT_I2C 0
+#endif
+
+#ifndef PICO_DEFAULT_I2C_SDA_PIN
+#define PICO_DEFAULT_I2C_SDA_PIN 2
+#endif
+
+#ifndef PICO_DEFAULT_I2C_SCL_PIN
+#define PICO_DEFAULT_I2C_SCL_PIN 3
+#endif
+
+// ------------- SPI -------------//
+#ifndef PICO_DEFAULT_SPI
+#define PICO_DEFAULT_SPI 0
+#endif
+
+#ifndef PICO_DEFAULT_SPI_TX_PIN
+#define PICO_DEFAULT_SPI_TX_PIN 23
+#endif
+
+#ifndef PICO_DEFAULT_SPI_RX_PIN
+#define PICO_DEFAULT_SPI_RX_PIN 20
+#endif
+
+#ifndef PICO_DEFAULT_SPI_SCK_PIN
+#define PICO_DEFAULT_SPI_SCK_PIN 22
+#endif
+
+#ifndef PICO_DEFAULT_SPI_CSN_PIN
+#define PICO_DEFAULT_SPI_CSN_PIN 21
+#endif
+
+// ------------- FLASH -------------//
+
+// Best performance/compatibility with selected flash
+#define PICO_BOOT_STAGE2_CHOOSE_W25X10CL 1
+
+#ifndef PICO_FLASH_SPI_CLKDIV
+#define PICO_FLASH_SPI_CLKDIV 2
+#endif
+
+// Bit-C PRO has 4MB SPI flash
+#ifndef PICO_FLASH_SIZE_BYTES
+#define PICO_FLASH_SIZE_BYTES (4 * 1024 * 1024)
+#endif
+
+// All boards have B1+ RP2040
+#ifndef PICO_RP2040_B0_SUPPORTED
+#define PICO_RP2040_B0_SUPPORTED 0
+#endif
+
+#endif
diff --git a/ports/rp2/boards/NULLBITS_BIT_C_PRO/pins.csv b/ports/rp2/boards/NULLBITS_BIT_C_PRO/pins.csv
new file mode 100644
index 0000000000000..1274effaef83a
--- /dev/null
+++ b/ports/rp2/boards/NULLBITS_BIT_C_PRO/pins.csv
@@ -0,0 +1,4 @@
+LED,GPIO16
+LED_RED,GPIO16
+LED_GREEN,GPIO17
+LED_BLUE,GPIO18

From 0baf6c80d971b8d5c6b1d7b0648c0cb01cedc81d Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Mon, 23 Jan 2023 12:09:05 +0100
Subject: [PATCH 3039/3533] nrf/mpconfigport: Enable seeding of the PRNG by the
 hardware RNG.

A suitable function already existed, so just the declaration was needed.
---
 ports/nrf/mpconfigport.h | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/ports/nrf/mpconfigport.h b/ports/nrf/mpconfigport.h
index 27dbd3b584dcf..629ba5e94652d 100644
--- a/ports/nrf/mpconfigport.h
+++ b/ports/nrf/mpconfigport.h
@@ -277,6 +277,11 @@ typedef int mp_int_t; // must be pointer size
 typedef unsigned int mp_uint_t; // must be pointer size
 typedef long mp_off_t;
 
+#if MICROPY_HW_ENABLE_RNG
+#define MICROPY_PY_URANDOM_SEED_INIT_FUNC (rng_generate_random_word())
+long unsigned int rng_generate_random_word(void);
+#endif
+
 #if BOARD_SPECIFIC_MODULES
 #include "boardmodules.h"
 #endif // BOARD_SPECIFIC_MODULES

From c2ab1b51859109738b01ecbddb0809bf538f18f6 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Tue, 24 Jan 2023 13:12:16 +0100
Subject: [PATCH 3040/3533] esp32/boards/OLIMEX_ESP32_POE: Remove id from and
 update board.json.

---
 ports/esp32/boards/OLIMEX_ESP32_POE/board.json | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/ports/esp32/boards/OLIMEX_ESP32_POE/board.json b/ports/esp32/boards/OLIMEX_ESP32_POE/board.json
index f3b1402bb13cf..84b6680d591b4 100644
--- a/ports/esp32/boards/OLIMEX_ESP32_POE/board.json
+++ b/ports/esp32/boards/OLIMEX_ESP32_POE/board.json
@@ -12,13 +12,12 @@
         "PoE",
         "Breadboard friendly"
     ],
-    "id": "esp32",
     "images": [
         "ESP32-POE-ISO-1.jpg"
     ],
     "mcu": "esp32",
-    "product": "ESP32",
+    "product": "Olimex ESP32 POE",
     "thumbnail": "",
     "url": "https://www.olimex.com/",
-    "vendor": "Olimex"
+    "vendor": "OLIMEX"
 }

From 3446d440f661cf3c052c08e5c6879b1e59a478bb Mon Sep 17 00:00:00 2001
From: David Lechner <david@pybricks.com>
Date: Mon, 23 Jan 2023 14:53:39 -0600
Subject: [PATCH 3041/3533] shared/runtime/gchelper: Drop cpu directive from
 ARM asm helpers.

This drops the `.cpu` directive from the ARM gchelper_*.s files.  Having
this directive breaks the linker when targeting older CPUs (e.g. `-mthumb
-mthumb-interwork` for `-mcpu=arm7tdmi`).  The actual target CPU should be
determined by the compiler options.

The exact CPU doesn't actually matter, but rather the supported assembly
instruction set.  So the files are renamed to *_thumb1.s and *thumb2.s to
indicate the instruction set support instead of the CPU support.

Signed-off-by: David Lechner <david@pybricks.com>
---
 ports/cc3200/application.mk                         | 2 +-
 ports/mimxrt/Makefile                               | 2 +-
 ports/qemu-arm/Makefile                             | 6 +++---
 ports/renesas-ra/Makefile                           | 2 +-
 ports/rp2/CMakeLists.txt                            | 2 +-
 ports/samd/mcu/samd21/mpconfigmcu.mk                | 2 +-
 ports/samd/mcu/samd51/mpconfigmcu.mk                | 2 +-
 ports/stm32/Makefile                                | 6 +++---
 ports/teensy/Makefile                               | 2 +-
 shared/runtime/gchelper_generic.c                   | 2 +-
 shared/runtime/{gchelper_m0.s => gchelper_thumb1.s} | 4 +++-
 shared/runtime/{gchelper_m3.s => gchelper_thumb2.s} | 3 ++-
 12 files changed, 19 insertions(+), 16 deletions(-)
 rename shared/runtime/{gchelper_m0.s => gchelper_thumb1.s} (94%)
 rename shared/runtime/{gchelper_m3.s => gchelper_thumb2.s} (96%)

diff --git a/ports/cc3200/application.mk b/ports/cc3200/application.mk
index 428367d66adf6..97e113b040aa3 100644
--- a/ports/cc3200/application.mk
+++ b/ports/cc3200/application.mk
@@ -162,7 +162,7 @@ APP_STM_SRC_C = $(addprefix ports/stm32/,\
 OBJ = $(PY_O) $(addprefix $(BUILD)/, $(APP_FATFS_SRC_C:.c=.o) $(APP_RTOS_SRC_C:.c=.o) $(APP_FTP_SRC_C:.c=.o) $(APP_HAL_SRC_C:.c=.o) $(APP_MISC_SRC_C:.c=.o))
 OBJ += $(addprefix $(BUILD)/, $(APP_MODS_SRC_C:.c=.o) $(APP_CC3100_SRC_C:.c=.o) $(APP_SL_SRC_C:.c=.o) $(APP_TELNET_SRC_C:.c=.o) $(APP_UTIL_SRC_C:.c=.o) $(APP_UTIL_SRC_S:.s=.o))
 OBJ += $(addprefix $(BUILD)/, $(APP_MAIN_SRC_C:.c=.o) $(APP_SHARED_SRC_C:.c=.o) $(APP_LIB_SRC_C:.c=.o) $(APP_STM_SRC_C:.c=.o))
-OBJ += $(BUILD)/shared/runtime/gchelper_m3.o
+OBJ += $(BUILD)/shared/runtime/gchelper_thumb2.o
 OBJ += $(BUILD)/pins.o
 
 # List of sources for qstr extraction
diff --git a/ports/mimxrt/Makefile b/ports/mimxrt/Makefile
index e08f2ad6025a4..18e91639efdf3 100644
--- a/ports/mimxrt/Makefile
+++ b/ports/mimxrt/Makefile
@@ -262,7 +262,7 @@ SRC_SS = \
 	$(MCU_DIR)/gcc/startup_$(MCU_SERIES)$(MCU_CORE).S \
 	hal/resethandler_MIMXRT10xx.S
 
-SRC_S += shared/runtime/gchelper_m3.s \
+SRC_S += shared/runtime/gchelper_thumb2.s \
 
 # =============================================================================
 # QSTR Sources
diff --git a/ports/qemu-arm/Makefile b/ports/qemu-arm/Makefile
index 7ae7955cf4749..40b3062ae4c49 100644
--- a/ports/qemu-arm/Makefile
+++ b/ports/qemu-arm/Makefile
@@ -17,7 +17,7 @@ ifeq ($(BOARD),netduino2)
 CFLAGS += -mthumb -mcpu=cortex-m3 -mfloat-abi=soft
 CFLAGS += -DQEMU_SOC_STM32
 LDSCRIPT = stm32.ld
-SRC_BOARD_O = shared/runtime/gchelper_native.o shared/runtime/gchelper_m3.o
+SRC_BOARD_O = shared/runtime/gchelper_native.o shared/runtime/gchelper_thumb2.o
 MPY_CROSS_FLAGS += -march=armv7m
 endif
 
@@ -26,7 +26,7 @@ CFLAGS += -mthumb -mcpu=cortex-m0 -mfloat-abi=soft
 CFLAGS += -DQEMU_SOC_NRF51
 LDSCRIPT = nrf51.ld
 QEMU_EXTRA = -global nrf51-soc.flash-size=1048576 -global nrf51-soc.sram-size=262144
-SRC_BOARD_O = shared/runtime/gchelper_native.o shared/runtime/gchelper_m0.o
+SRC_BOARD_O = shared/runtime/gchelper_native.o shared/runtime/gchelper_thumb1.o
 MPY_CROSS_FLAGS += -march=armv7m
 endif
 
@@ -34,7 +34,7 @@ ifeq ($(BOARD),mps2-an385)
 CFLAGS += -mthumb -mcpu=cortex-m3 -mfloat-abi=soft
 CFLAGS += -DQEMU_SOC_MPS2
 LDSCRIPT = mps2.ld
-SRC_BOARD_O = shared/runtime/gchelper_native.o shared/runtime/gchelper_m3.o
+SRC_BOARD_O = shared/runtime/gchelper_native.o shared/runtime/gchelper_thumb2.o
 MPY_CROSS_FLAGS += -march=armv7m
 endif
 
diff --git a/ports/renesas-ra/Makefile b/ports/renesas-ra/Makefile
index b02379b47236b..17ec58ae0b6be 100644
--- a/ports/renesas-ra/Makefile
+++ b/ports/renesas-ra/Makefile
@@ -335,7 +335,7 @@ SRC_O += \
 	$(SYSTEM_FILE)
 
 SRC_O += \
-	shared/runtime/gchelper_m3.o
+	shared/runtime/gchelper_thumb2.o
 
 HAL_SRC_C += $(addprefix $(HAL_DIR)/ra/board/$(BOARD_LOW)/,\
 	board_init.c \
diff --git a/ports/rp2/CMakeLists.txt b/ports/rp2/CMakeLists.txt
index 485476355e5cd..357125e734c3a 100644
--- a/ports/rp2/CMakeLists.txt
+++ b/ports/rp2/CMakeLists.txt
@@ -87,7 +87,7 @@ set(MICROPY_SOURCE_LIB
     ${MICROPY_DIR}/shared/netutils/netutils.c
     ${MICROPY_DIR}/shared/netutils/trace.c
     ${MICROPY_DIR}/shared/readline/readline.c
-    ${MICROPY_DIR}/shared/runtime/gchelper_m0.s
+    ${MICROPY_DIR}/shared/runtime/gchelper_thumb1.s
     ${MICROPY_DIR}/shared/runtime/gchelper_native.c
     ${MICROPY_DIR}/shared/runtime/interrupt_char.c
     ${MICROPY_DIR}/shared/runtime/mpirq.c
diff --git a/ports/samd/mcu/samd21/mpconfigmcu.mk b/ports/samd/mcu/samd21/mpconfigmcu.mk
index 90112759b9129..ddd3e8b410113 100644
--- a/ports/samd/mcu/samd21/mpconfigmcu.mk
+++ b/ports/samd/mcu/samd21/mpconfigmcu.mk
@@ -2,7 +2,7 @@ CFLAGS_MCU += -mtune=cortex-m0plus -mcpu=cortex-m0plus -msoft-float
 
 MPY_CROSS_MCU_ARCH = armv6m
 
-SRC_S += shared/runtime/gchelper_m0.s
+SRC_S += shared/runtime/gchelper_thumb1.s
 
 LIBM_SRC_C +=  $(addprefix lib/libm/,\
 	acoshf.c \
diff --git a/ports/samd/mcu/samd51/mpconfigmcu.mk b/ports/samd/mcu/samd51/mpconfigmcu.mk
index e79dbc3aa63f0..8596f59821114 100644
--- a/ports/samd/mcu/samd51/mpconfigmcu.mk
+++ b/ports/samd/mcu/samd51/mpconfigmcu.mk
@@ -6,7 +6,7 @@ MICROPY_VFS_LFS2 ?= 1
 MICROPY_VFS_FAT ?= 1
 FROZEN_MANIFEST ?= mcu/$(MCU_SERIES_LOWER)/manifest.py
 
-SRC_S += shared/runtime/gchelper_m3.s
+SRC_S += shared/runtime/gchelper_thumb2.s
 
 SRC_C += \
 	fatfs_port.c \
diff --git a/ports/stm32/Makefile b/ports/stm32/Makefile
index 19643cac5675d..d57e72a6c5c2c 100644
--- a/ports/stm32/Makefile
+++ b/ports/stm32/Makefile
@@ -362,18 +362,18 @@ ifeq ($(MCU_SERIES),$(filter $(MCU_SERIES),f0 g0 l0))
 CSUPEROPT = -Os # save some code space
 SRC_O += \
 	resethandler_m0.o \
-	shared/runtime/gchelper_m0.o
+	shared/runtime/gchelper_thumb1.o
 else
 ifeq ($(MCU_SERIES),l1)
 CFLAGS += -DUSE_HAL_DRIVER
 SRC_O += \
 	resethandler_m3.o \
-	shared/runtime/gchelper_m3.o
+	shared/runtime/gchelper_thumb2.o
 else
 SRC_O += \
 	system_stm32.o \
 	resethandler.o \
-	shared/runtime/gchelper_m3.o
+	shared/runtime/gchelper_thumb2.o
 endif
 endif
 
diff --git a/ports/teensy/Makefile b/ports/teensy/Makefile
index 89e5cbce9dcca..70331c5dc7040 100644
--- a/ports/teensy/Makefile
+++ b/ports/teensy/Makefile
@@ -169,7 +169,7 @@ OBJ += $(addprefix $(BUILD)/, $(SRC_C:.c=.o))
 OBJ += $(addprefix $(BUILD)/, $(STM_SRC_C:.c=.o))
 OBJ += $(addprefix $(BUILD)/, $(SRC_TEENSY:.c=.o))
 OBJ += $(addprefix $(BUILD)/, $(SHARED_SRC_C:.c=.o))
-OBJ += $(BUILD)/shared/runtime/gchelper_m3.o
+OBJ += $(BUILD)/shared/runtime/gchelper_thumb2.o
 OBJ += $(GEN_PINS_SRC:.c=.o)
 
 all: hex
diff --git a/shared/runtime/gchelper_generic.c b/shared/runtime/gchelper_generic.c
index dcd35f9c7e494..272e37056aaa8 100644
--- a/shared/runtime/gchelper_generic.c
+++ b/shared/runtime/gchelper_generic.c
@@ -98,7 +98,7 @@ STATIC void gc_helper_get_regs(gc_helper_regs_t arr) {
 
 #elif defined(__thumb2__) || defined(__thumb__) || defined(__arm__)
 
-// Fallback implementation, prefer gchelper_m0.s or gchelper_m3.s
+// Fallback implementation, prefer gchelper_thumb1.s or gchelper_thumb2.s
 
 STATIC void gc_helper_get_regs(gc_helper_regs_t arr) {
     register long r4 asm ("r4");
diff --git a/shared/runtime/gchelper_m0.s b/shared/runtime/gchelper_thumb1.s
similarity index 94%
rename from shared/runtime/gchelper_m0.s
rename to shared/runtime/gchelper_thumb1.s
index db0d9738d160d..a316c4fb366eb 100644
--- a/shared/runtime/gchelper_m0.s
+++ b/shared/runtime/gchelper_thumb1.s
@@ -25,7 +25,6 @@
  */
 
     .syntax unified
-    .cpu cortex-m0
     .thumb
 
     .section .text
@@ -34,6 +33,9 @@
     .global gc_helper_get_regs_and_sp
     .type gc_helper_get_regs_and_sp, %function
 
+@ This function will compile on processors like Cortex M0 that don't support
+@ newer Thumb-2 instructions.
+
 @ uint gc_helper_get_regs_and_sp(r0=uint regs[10])
 gc_helper_get_regs_and_sp:
     @ store registers into given array
diff --git a/shared/runtime/gchelper_m3.s b/shared/runtime/gchelper_thumb2.s
similarity index 96%
rename from shared/runtime/gchelper_m3.s
rename to shared/runtime/gchelper_thumb2.s
index 5220fa088360a..bbc98459ec4bd 100644
--- a/shared/runtime/gchelper_m3.s
+++ b/shared/runtime/gchelper_thumb2.s
@@ -25,7 +25,6 @@
  */
 
     .syntax unified
-    .cpu cortex-m3
     .thumb
 
     .section .text
@@ -34,6 +33,8 @@
     .global gc_helper_get_regs_and_sp
     .type gc_helper_get_regs_and_sp, %function
 
+@ This function requires Thumb-2 instruction support, e.g. Cortex M3/M4.
+
 @ uint gc_helper_get_regs_and_sp(r0=uint regs[10])
 gc_helper_get_regs_and_sp:
     @ store registers into given array

From c9baf498c88349081442c8588b5ec3d01187a5c1 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 1 Feb 2023 11:31:06 +1100
Subject: [PATCH 3042/3533] lib/micropython-lib: Update submodule to latest.

This brings in the bundle-networking package.

Signed-off-by: Damien George <damien@micropython.org>
---
 lib/micropython-lib | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/micropython-lib b/lib/micropython-lib
index 038b4ac6572d0..c1526d2d1eb68 160000
--- a/lib/micropython-lib
+++ b/lib/micropython-lib
@@ -1 +1 @@
-Subproject commit 038b4ac6572d0d5b4c18148dc7d7fdc026369fa4
+Subproject commit c1526d2d1eb68c4c3b0ff8940b012c98a80301f1

From 6250337c9cf725238df19104f7bf801e91b56e1a Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Fri, 27 Jan 2023 14:17:19 +1100
Subject: [PATCH 3043/3533] ports: Make all network-capable boards use
 bundle-networking.

This will ensure that any board with networking support gets:
 - webrepl
 - mip
 - urequests
 - ntptime

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/esp32/boards/manifest.py                           | 7 +++----
 ports/esp8266/boards/manifest.py                         | 4 +---
 ports/mimxrt/boards/MIMXRT1020_EVK/manifest.py           | 3 +++
 ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.mk      | 2 ++
 ports/mimxrt/boards/MIMXRT1050_EVK/manifest.py           | 3 +++
 ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.mk      | 2 ++
 ports/mimxrt/boards/MIMXRT1060_EVK/manifest.py           | 3 +++
 ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.mk      | 2 ++
 ports/mimxrt/boards/MIMXRT1064_EVK/manifest.py           | 3 +++
 ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.mk      | 2 ++
 ports/mimxrt/boards/MIMXRT1170_EVK/manifest.py           | 3 +++
 ports/mimxrt/boards/MIMXRT1170_EVK/mpconfigboard.mk      | 2 ++
 ports/mimxrt/boards/SEEED_ARCH_MIX/manifest.py           | 3 +++
 ports/mimxrt/boards/SEEED_ARCH_MIX/mpconfigboard.mk      | 4 +++-
 ports/mimxrt/boards/TEENSY41/manifest.py                 | 3 +++
 ports/mimxrt/boards/TEENSY41/mpconfigboard.mk            | 2 ++
 ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/manifest.py | 4 +---
 ports/rp2/boards/PICO_W/manifest.py                      | 6 ++----
 ports/rp2/boards/PICO_W/mpconfigboard.cmake              | 2 +-
 ports/rp2/boards/W5100S_EVB_PICO/manifest.py             | 3 +++
 ports/rp2/boards/W5100S_EVB_PICO/mpconfigboard.cmake     | 1 +
 ports/rp2/boards/W5500_EVB_PICO/manifest.py              | 3 +++
 ports/rp2/boards/W5500_EVB_PICO/mpconfigboard.cmake      | 1 +
 ports/stm32/boards/ARDUINO_PORTENTA_H7/manifest.py       | 4 +---
 ports/stm32/boards/NUCLEO_F429ZI/manifest.py             | 2 ++
 ports/stm32/boards/NUCLEO_F429ZI/mpconfigboard.mk        | 2 ++
 ports/stm32/boards/NUCLEO_F439ZI/manifest.py             | 2 ++
 ports/stm32/boards/NUCLEO_F439ZI/mpconfigboard.mk        | 2 ++
 ports/stm32/boards/NUCLEO_F746ZG/manifest.py             | 2 ++
 ports/stm32/boards/NUCLEO_F746ZG/mpconfigboard.mk        | 2 ++
 ports/stm32/boards/NUCLEO_F756ZG/manifest.py             | 2 ++
 ports/stm32/boards/NUCLEO_F756ZG/mpconfigboard.mk        | 2 ++
 ports/stm32/boards/NUCLEO_F767ZI/manifest.py             | 2 ++
 ports/stm32/boards/NUCLEO_F767ZI/mpconfigboard.mk        | 2 ++
 ports/stm32/boards/NUCLEO_H743ZI/manifest.py             | 2 ++
 ports/stm32/boards/NUCLEO_H743ZI/mpconfigboard.mk        | 2 ++
 ports/stm32/boards/OLIMEX_E407/manifest.py               | 2 ++
 ports/stm32/boards/PYBD_SF2/manifest.py                  | 2 +-
 ports/stm32/boards/STM32F769DISC/manifest.py             | 2 ++
 ports/stm32/boards/STM32F769DISC/mpconfigboard.mk        | 2 ++
 ports/stm32/boards/STM32F7DISC/manifest.py               | 2 ++
 ports/stm32/boards/STM32F7DISC/mpconfigboard.mk          | 2 ++
 ports/stm32/boards/VCC_GND_F407ZG/manifest.py            | 2 ++
 ports/stm32/boards/VCC_GND_F407ZG/mpconfigboard.mk       | 2 ++
 44 files changed, 92 insertions(+), 20 deletions(-)
 create mode 100644 ports/mimxrt/boards/MIMXRT1020_EVK/manifest.py
 create mode 100644 ports/mimxrt/boards/MIMXRT1050_EVK/manifest.py
 create mode 100644 ports/mimxrt/boards/MIMXRT1060_EVK/manifest.py
 create mode 100644 ports/mimxrt/boards/MIMXRT1064_EVK/manifest.py
 create mode 100644 ports/mimxrt/boards/MIMXRT1170_EVK/manifest.py
 create mode 100644 ports/mimxrt/boards/SEEED_ARCH_MIX/manifest.py
 create mode 100644 ports/mimxrt/boards/TEENSY41/manifest.py
 create mode 100644 ports/rp2/boards/W5100S_EVB_PICO/manifest.py
 create mode 100644 ports/rp2/boards/W5500_EVB_PICO/manifest.py
 create mode 100644 ports/stm32/boards/NUCLEO_F429ZI/manifest.py
 create mode 100644 ports/stm32/boards/NUCLEO_F439ZI/manifest.py
 create mode 100644 ports/stm32/boards/NUCLEO_F746ZG/manifest.py
 create mode 100644 ports/stm32/boards/NUCLEO_F756ZG/manifest.py
 create mode 100644 ports/stm32/boards/NUCLEO_F767ZI/manifest.py
 create mode 100644 ports/stm32/boards/NUCLEO_H743ZI/manifest.py
 create mode 100644 ports/stm32/boards/OLIMEX_E407/manifest.py
 create mode 100644 ports/stm32/boards/STM32F769DISC/manifest.py
 create mode 100644 ports/stm32/boards/STM32F7DISC/manifest.py
 create mode 100644 ports/stm32/boards/VCC_GND_F407ZG/manifest.py

diff --git a/ports/esp32/boards/manifest.py b/ports/esp32/boards/manifest.py
index 3f6c8cfde5a90..a6df79f0a3d90 100644
--- a/ports/esp32/boards/manifest.py
+++ b/ports/esp32/boards/manifest.py
@@ -1,15 +1,14 @@
 freeze("$(PORT_DIR)/modules")
 include("$(MPY_DIR)/extmod/uasyncio")
 
+# Useful networking-related packages.
+require("bundle-networking")
+
 # Require some micropython-lib modules.
 require("dht")
 require("ds18x20")
-require("mip")
 require("neopixel")
-require("ntptime")
 require("onewire")
 require("umqtt.robust")
 require("umqtt.simple")
 require("upysh")
-require("urequests")
-require("webrepl")
diff --git a/ports/esp8266/boards/manifest.py b/ports/esp8266/boards/manifest.py
index 53975f6a6baf8..10fa6da2796ed 100644
--- a/ports/esp8266/boards/manifest.py
+++ b/ports/esp8266/boards/manifest.py
@@ -1,8 +1,6 @@
 freeze("$(PORT_DIR)/modules")
+require("bundle-networking")
 require("dht")
 require("ds18x20")
-require("mip")
 require("neopixel")
-require("ntptime")
 require("onewire")
-require("webrepl")
diff --git a/ports/mimxrt/boards/MIMXRT1020_EVK/manifest.py b/ports/mimxrt/boards/MIMXRT1020_EVK/manifest.py
new file mode 100644
index 0000000000000..107181c31ca7c
--- /dev/null
+++ b/ports/mimxrt/boards/MIMXRT1020_EVK/manifest.py
@@ -0,0 +1,3 @@
+include("../manifest.py")
+
+require("bundle-networking")
diff --git a/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.mk b/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.mk
index e8922e4b7abfb..85bc1f71b6065 100644
--- a/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.mk
+++ b/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.mk
@@ -13,6 +13,8 @@ MICROPY_PY_LWIP = 1
 MICROPY_PY_USSL = 1
 MICROPY_SSL_MBEDTLS = 1
 
+FROZEN_MANIFEST ?= $(BOARD_DIR)/manifest.py
+
 JLINK_PATH ?= /media/RT1020-EVK/
 JLINK_COMMANDER_SCRIPT = $(BUILD)/script.jlink
 
diff --git a/ports/mimxrt/boards/MIMXRT1050_EVK/manifest.py b/ports/mimxrt/boards/MIMXRT1050_EVK/manifest.py
new file mode 100644
index 0000000000000..107181c31ca7c
--- /dev/null
+++ b/ports/mimxrt/boards/MIMXRT1050_EVK/manifest.py
@@ -0,0 +1,3 @@
+include("../manifest.py")
+
+require("bundle-networking")
diff --git a/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.mk b/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.mk
index 00843350494a7..8e4213569a4fa 100644
--- a/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.mk
+++ b/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.mk
@@ -12,3 +12,5 @@ MICROPY_HW_SDRAM_SIZE  = 0x2000000  # 32MB
 MICROPY_PY_LWIP = 1
 MICROPY_PY_USSL = 1
 MICROPY_SSL_MBEDTLS = 1
+
+FROZEN_MANIFEST ?= $(BOARD_DIR)/manifest.py
diff --git a/ports/mimxrt/boards/MIMXRT1060_EVK/manifest.py b/ports/mimxrt/boards/MIMXRT1060_EVK/manifest.py
new file mode 100644
index 0000000000000..107181c31ca7c
--- /dev/null
+++ b/ports/mimxrt/boards/MIMXRT1060_EVK/manifest.py
@@ -0,0 +1,3 @@
+include("../manifest.py")
+
+require("bundle-networking")
diff --git a/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.mk b/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.mk
index 96afe276f706d..22cd5356d93a6 100644
--- a/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.mk
+++ b/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.mk
@@ -13,6 +13,8 @@ MICROPY_PY_LWIP = 1
 MICROPY_PY_USSL = 1
 MICROPY_SSL_MBEDTLS = 1
 
+FROZEN_MANIFEST ?= $(BOARD_DIR)/manifest.py
+
 JLINK_PATH ?= /media/RT1060-EVK/
 JLINK_COMMANDER_SCRIPT = $(BUILD)/script.jlink
 
diff --git a/ports/mimxrt/boards/MIMXRT1064_EVK/manifest.py b/ports/mimxrt/boards/MIMXRT1064_EVK/manifest.py
new file mode 100644
index 0000000000000..107181c31ca7c
--- /dev/null
+++ b/ports/mimxrt/boards/MIMXRT1064_EVK/manifest.py
@@ -0,0 +1,3 @@
+include("../manifest.py")
+
+require("bundle-networking")
diff --git a/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.mk b/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.mk
index ceb1e9796e01b..08696d72ff44f 100644
--- a/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.mk
+++ b/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.mk
@@ -13,6 +13,8 @@ MICROPY_PY_LWIP = 1
 MICROPY_PY_USSL = 1
 MICROPY_SSL_MBEDTLS = 1
 
+FROZEN_MANIFEST ?= $(BOARD_DIR)/manifest.py
+
 JLINK_PATH ?= /media/RT1064-EVK/
 
 deploy: $(BUILD)/firmware.bin
diff --git a/ports/mimxrt/boards/MIMXRT1170_EVK/manifest.py b/ports/mimxrt/boards/MIMXRT1170_EVK/manifest.py
new file mode 100644
index 0000000000000..107181c31ca7c
--- /dev/null
+++ b/ports/mimxrt/boards/MIMXRT1170_EVK/manifest.py
@@ -0,0 +1,3 @@
+include("../manifest.py")
+
+require("bundle-networking")
diff --git a/ports/mimxrt/boards/MIMXRT1170_EVK/mpconfigboard.mk b/ports/mimxrt/boards/MIMXRT1170_EVK/mpconfigboard.mk
index ea72008d51415..dc44b93bd073f 100644
--- a/ports/mimxrt/boards/MIMXRT1170_EVK/mpconfigboard.mk
+++ b/ports/mimxrt/boards/MIMXRT1170_EVK/mpconfigboard.mk
@@ -15,6 +15,8 @@ MICROPY_PY_LWIP = 1
 MICROPY_PY_USSL = 1
 MICROPY_SSL_MBEDTLS = 1
 
+FROZEN_MANIFEST ?= $(BOARD_DIR)/manifest.py
+
 CFLAGS += -DCPU_MIMXRT1176DVMAA_cm7 \
 		-DMIMXRT117x_SERIES \
 		-DENET_ENHANCEDBUFFERDESCRIPTOR_MODE=1 \
diff --git a/ports/mimxrt/boards/SEEED_ARCH_MIX/manifest.py b/ports/mimxrt/boards/SEEED_ARCH_MIX/manifest.py
new file mode 100644
index 0000000000000..107181c31ca7c
--- /dev/null
+++ b/ports/mimxrt/boards/SEEED_ARCH_MIX/manifest.py
@@ -0,0 +1,3 @@
+include("../manifest.py")
+
+require("bundle-networking")
diff --git a/ports/mimxrt/boards/SEEED_ARCH_MIX/mpconfigboard.mk b/ports/mimxrt/boards/SEEED_ARCH_MIX/mpconfigboard.mk
index 82a95c493c95b..8e530ac55892c 100644
--- a/ports/mimxrt/boards/SEEED_ARCH_MIX/mpconfigboard.mk
+++ b/ports/mimxrt/boards/SEEED_ARCH_MIX/mpconfigboard.mk
@@ -13,4 +13,6 @@ MICROPY_PY_LWIP = 1
 MICROPY_PY_USSL = 1
 MICROPY_SSL_MBEDTLS = 1
 
-CFLAGS += -DSPI_RETRY_TIMES=1000000
\ No newline at end of file
+FROZEN_MANIFEST ?= $(BOARD_DIR)/manifest.py
+
+CFLAGS += -DSPI_RETRY_TIMES=1000000
diff --git a/ports/mimxrt/boards/TEENSY41/manifest.py b/ports/mimxrt/boards/TEENSY41/manifest.py
new file mode 100644
index 0000000000000..107181c31ca7c
--- /dev/null
+++ b/ports/mimxrt/boards/TEENSY41/manifest.py
@@ -0,0 +1,3 @@
+include("../manifest.py")
+
+require("bundle-networking")
diff --git a/ports/mimxrt/boards/TEENSY41/mpconfigboard.mk b/ports/mimxrt/boards/TEENSY41/mpconfigboard.mk
index 601a2cfe8606c..ca7e10b5e4c38 100755
--- a/ports/mimxrt/boards/TEENSY41/mpconfigboard.mk
+++ b/ports/mimxrt/boards/TEENSY41/mpconfigboard.mk
@@ -11,5 +11,7 @@ MICROPY_PY_LWIP = 1
 MICROPY_PY_USSL = 1
 MICROPY_SSL_MBEDTLS = 1
 
+FROZEN_MANIFEST ?= $(BOARD_DIR)/manifest.py
+
 deploy: $(BUILD)/firmware.hex
 	teensy_loader_cli --mcu=imxrt1062 -v -w $<
diff --git a/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/manifest.py b/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/manifest.py
index 5061e2cf0516a..2fed2b1921c81 100644
--- a/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/manifest.py
+++ b/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/manifest.py
@@ -1,9 +1,7 @@
 include("$(PORT_DIR)/boards/manifest.py")
 
 # Networking
-require("webrepl")
-require("urequests")
-require("ntptime")
+require("bundle-networking")
 
 # Drivers
 require("lsm6dsox")
diff --git a/ports/rp2/boards/PICO_W/manifest.py b/ports/rp2/boards/PICO_W/manifest.py
index 8a74006c64f7e..02d1874b52b9a 100644
--- a/ports/rp2/boards/PICO_W/manifest.py
+++ b/ports/rp2/boards/PICO_W/manifest.py
@@ -1,5 +1,3 @@
-include("../manifest.py")
+include("$(PORT_DIR)/boards/manifest.py")
 
-require("mip")
-require("ntptime")
-require("urequests")
+require("bundle-networking")
diff --git a/ports/rp2/boards/PICO_W/mpconfigboard.cmake b/ports/rp2/boards/PICO_W/mpconfigboard.cmake
index 681e0dec44ffd..df9d70c016eaa 100644
--- a/ports/rp2/boards/PICO_W/mpconfigboard.cmake
+++ b/ports/rp2/boards/PICO_W/mpconfigboard.cmake
@@ -3,4 +3,4 @@ set(MICROPY_PY_LWIP ON)
 set(MICROPY_PY_NETWORK_CYW43 ON)
 
 # Board specific version of the frozen manifest
-set(MICROPY_FROZEN_MANIFEST ${CMAKE_SOURCE_DIR}/boards/PICO_W/manifest.py)
+set(MICROPY_FROZEN_MANIFEST ${MICROPY_BOARD_DIR}/manifest.py)
diff --git a/ports/rp2/boards/W5100S_EVB_PICO/manifest.py b/ports/rp2/boards/W5100S_EVB_PICO/manifest.py
new file mode 100644
index 0000000000000..02d1874b52b9a
--- /dev/null
+++ b/ports/rp2/boards/W5100S_EVB_PICO/manifest.py
@@ -0,0 +1,3 @@
+include("$(PORT_DIR)/boards/manifest.py")
+
+require("bundle-networking")
diff --git a/ports/rp2/boards/W5100S_EVB_PICO/mpconfigboard.cmake b/ports/rp2/boards/W5100S_EVB_PICO/mpconfigboard.cmake
index 4746c6e267a19..5de986fabc4ef 100644
--- a/ports/rp2/boards/W5100S_EVB_PICO/mpconfigboard.cmake
+++ b/ports/rp2/boards/W5100S_EVB_PICO/mpconfigboard.cmake
@@ -2,3 +2,4 @@
 set(PICO_BOARD wiznet_w5100s_evb_pico)
 set(MICROPY_PY_NETWORK_WIZNET5K W5100S)
 set(MICROPY_PY_LWIP 1)
+set(MICROPY_FROZEN_MANIFEST ${MICROPY_BOARD_DIR}/manifest.py)
diff --git a/ports/rp2/boards/W5500_EVB_PICO/manifest.py b/ports/rp2/boards/W5500_EVB_PICO/manifest.py
new file mode 100644
index 0000000000000..02d1874b52b9a
--- /dev/null
+++ b/ports/rp2/boards/W5500_EVB_PICO/manifest.py
@@ -0,0 +1,3 @@
+include("$(PORT_DIR)/boards/manifest.py")
+
+require("bundle-networking")
diff --git a/ports/rp2/boards/W5500_EVB_PICO/mpconfigboard.cmake b/ports/rp2/boards/W5500_EVB_PICO/mpconfigboard.cmake
index f7f2650bfa0ed..dda5ba4e325b6 100644
--- a/ports/rp2/boards/W5500_EVB_PICO/mpconfigboard.cmake
+++ b/ports/rp2/boards/W5500_EVB_PICO/mpconfigboard.cmake
@@ -2,3 +2,4 @@
 set(PICO_BOARD wiznet_w5100s_evb_pico)
 set(MICROPY_PY_NETWORK_WIZNET5K W5500)
 set(MICROPY_PY_LWIP 1)
+set(MICROPY_FROZEN_MANIFEST ${MICROPY_BOARD_DIR}/manifest.py)
diff --git a/ports/stm32/boards/ARDUINO_PORTENTA_H7/manifest.py b/ports/stm32/boards/ARDUINO_PORTENTA_H7/manifest.py
index 3041e77fdb048..6cb17197417f4 100644
--- a/ports/stm32/boards/ARDUINO_PORTENTA_H7/manifest.py
+++ b/ports/stm32/boards/ARDUINO_PORTENTA_H7/manifest.py
@@ -1,9 +1,7 @@
 include("$(PORT_DIR)/boards/manifest.py")
 
 # Networking
-require("webrepl")
-require("urequests")
-require("ntptime")
+require("bundle-networking")
 
 # Utils
 require("logging")
diff --git a/ports/stm32/boards/NUCLEO_F429ZI/manifest.py b/ports/stm32/boards/NUCLEO_F429ZI/manifest.py
new file mode 100644
index 0000000000000..ebfecd4844ade
--- /dev/null
+++ b/ports/stm32/boards/NUCLEO_F429ZI/manifest.py
@@ -0,0 +1,2 @@
+include("$(PORT_DIR)/boards/manifest.py")
+require("bundle-networking")
diff --git a/ports/stm32/boards/NUCLEO_F429ZI/mpconfigboard.mk b/ports/stm32/boards/NUCLEO_F429ZI/mpconfigboard.mk
index 47b4432893c89..9e82be1dc7355 100644
--- a/ports/stm32/boards/NUCLEO_F429ZI/mpconfigboard.mk
+++ b/ports/stm32/boards/NUCLEO_F429ZI/mpconfigboard.mk
@@ -9,3 +9,5 @@ TEXT1_ADDR = 0x08020000
 MICROPY_PY_LWIP = 1
 MICROPY_PY_USSL = 1
 MICROPY_SSL_MBEDTLS = 1
+
+FROZEN_MANIFEST = $(BOARD_DIR)/manifest.py
diff --git a/ports/stm32/boards/NUCLEO_F439ZI/manifest.py b/ports/stm32/boards/NUCLEO_F439ZI/manifest.py
new file mode 100644
index 0000000000000..ebfecd4844ade
--- /dev/null
+++ b/ports/stm32/boards/NUCLEO_F439ZI/manifest.py
@@ -0,0 +1,2 @@
+include("$(PORT_DIR)/boards/manifest.py")
+require("bundle-networking")
diff --git a/ports/stm32/boards/NUCLEO_F439ZI/mpconfigboard.mk b/ports/stm32/boards/NUCLEO_F439ZI/mpconfigboard.mk
index 52702b5112c89..69b0f80a2d2f9 100644
--- a/ports/stm32/boards/NUCLEO_F439ZI/mpconfigboard.mk
+++ b/ports/stm32/boards/NUCLEO_F439ZI/mpconfigboard.mk
@@ -9,3 +9,5 @@ TEXT1_ADDR = 0x08020000
 MICROPY_PY_LWIP = 1
 MICROPY_PY_USSL = 1
 MICROPY_SSL_MBEDTLS = 1
+
+FROZEN_MANIFEST = $(BOARD_DIR)/manifest.py
diff --git a/ports/stm32/boards/NUCLEO_F746ZG/manifest.py b/ports/stm32/boards/NUCLEO_F746ZG/manifest.py
new file mode 100644
index 0000000000000..ebfecd4844ade
--- /dev/null
+++ b/ports/stm32/boards/NUCLEO_F746ZG/manifest.py
@@ -0,0 +1,2 @@
+include("$(PORT_DIR)/boards/manifest.py")
+require("bundle-networking")
diff --git a/ports/stm32/boards/NUCLEO_F746ZG/mpconfigboard.mk b/ports/stm32/boards/NUCLEO_F746ZG/mpconfigboard.mk
index 8b54dc84e113e..9506b6759555d 100644
--- a/ports/stm32/boards/NUCLEO_F746ZG/mpconfigboard.mk
+++ b/ports/stm32/boards/NUCLEO_F746ZG/mpconfigboard.mk
@@ -9,3 +9,5 @@ TEXT1_ADDR = 0x08020000
 MICROPY_PY_LWIP = 1
 MICROPY_PY_USSL = 1
 MICROPY_SSL_MBEDTLS = 1
+
+FROZEN_MANIFEST = $(BOARD_DIR)/manifest.py
diff --git a/ports/stm32/boards/NUCLEO_F756ZG/manifest.py b/ports/stm32/boards/NUCLEO_F756ZG/manifest.py
new file mode 100644
index 0000000000000..ebfecd4844ade
--- /dev/null
+++ b/ports/stm32/boards/NUCLEO_F756ZG/manifest.py
@@ -0,0 +1,2 @@
+include("$(PORT_DIR)/boards/manifest.py")
+require("bundle-networking")
diff --git a/ports/stm32/boards/NUCLEO_F756ZG/mpconfigboard.mk b/ports/stm32/boards/NUCLEO_F756ZG/mpconfigboard.mk
index f656ed0e5841b..90fc242f9ac62 100644
--- a/ports/stm32/boards/NUCLEO_F756ZG/mpconfigboard.mk
+++ b/ports/stm32/boards/NUCLEO_F756ZG/mpconfigboard.mk
@@ -9,3 +9,5 @@ TEXT1_ADDR = 0x08020000
 MICROPY_PY_LWIP = 1
 MICROPY_PY_USSL = 1
 MICROPY_SSL_MBEDTLS = 1
+
+FROZEN_MANIFEST = $(BOARD_DIR)/manifest.py
diff --git a/ports/stm32/boards/NUCLEO_F767ZI/manifest.py b/ports/stm32/boards/NUCLEO_F767ZI/manifest.py
new file mode 100644
index 0000000000000..ebfecd4844ade
--- /dev/null
+++ b/ports/stm32/boards/NUCLEO_F767ZI/manifest.py
@@ -0,0 +1,2 @@
+include("$(PORT_DIR)/boards/manifest.py")
+require("bundle-networking")
diff --git a/ports/stm32/boards/NUCLEO_F767ZI/mpconfigboard.mk b/ports/stm32/boards/NUCLEO_F767ZI/mpconfigboard.mk
index 0fdc1a6dcd17f..6ef9d42f9d375 100644
--- a/ports/stm32/boards/NUCLEO_F767ZI/mpconfigboard.mk
+++ b/ports/stm32/boards/NUCLEO_F767ZI/mpconfigboard.mk
@@ -10,3 +10,5 @@ TEXT1_ADDR = 0x08020000
 MICROPY_PY_LWIP = 1
 MICROPY_PY_USSL = 1
 MICROPY_SSL_MBEDTLS = 1
+
+FROZEN_MANIFEST = $(BOARD_DIR)/manifest.py
diff --git a/ports/stm32/boards/NUCLEO_H743ZI/manifest.py b/ports/stm32/boards/NUCLEO_H743ZI/manifest.py
new file mode 100644
index 0000000000000..ebfecd4844ade
--- /dev/null
+++ b/ports/stm32/boards/NUCLEO_H743ZI/manifest.py
@@ -0,0 +1,2 @@
+include("$(PORT_DIR)/boards/manifest.py")
+require("bundle-networking")
diff --git a/ports/stm32/boards/NUCLEO_H743ZI/mpconfigboard.mk b/ports/stm32/boards/NUCLEO_H743ZI/mpconfigboard.mk
index 8a16c2f01032e..8212725943a55 100644
--- a/ports/stm32/boards/NUCLEO_H743ZI/mpconfigboard.mk
+++ b/ports/stm32/boards/NUCLEO_H743ZI/mpconfigboard.mk
@@ -21,3 +21,5 @@ MICROPY_PY_LWIP = 1
 MICROPY_PY_USSL = 1
 MICROPY_SSL_MBEDTLS = 1
 MICROPY_VFS_LFS2 = 1
+
+FROZEN_MANIFEST = $(BOARD_DIR)/manifest.py
diff --git a/ports/stm32/boards/OLIMEX_E407/manifest.py b/ports/stm32/boards/OLIMEX_E407/manifest.py
new file mode 100644
index 0000000000000..ebfecd4844ade
--- /dev/null
+++ b/ports/stm32/boards/OLIMEX_E407/manifest.py
@@ -0,0 +1,2 @@
+include("$(PORT_DIR)/boards/manifest.py")
+require("bundle-networking")
diff --git a/ports/stm32/boards/PYBD_SF2/manifest.py b/ports/stm32/boards/PYBD_SF2/manifest.py
index 0ee11baf4b8e3..f096d1ad052ee 100644
--- a/ports/stm32/boards/PYBD_SF2/manifest.py
+++ b/ports/stm32/boards/PYBD_SF2/manifest.py
@@ -1,3 +1,3 @@
 include("$(PORT_DIR)/boards/manifest.py")
 include("$(PORT_DIR)/boards/manifest_pyboard.py")
-require("webrepl")
+require("bundle-networking")
diff --git a/ports/stm32/boards/STM32F769DISC/manifest.py b/ports/stm32/boards/STM32F769DISC/manifest.py
new file mode 100644
index 0000000000000..ebfecd4844ade
--- /dev/null
+++ b/ports/stm32/boards/STM32F769DISC/manifest.py
@@ -0,0 +1,2 @@
+include("$(PORT_DIR)/boards/manifest.py")
+require("bundle-networking")
diff --git a/ports/stm32/boards/STM32F769DISC/mpconfigboard.mk b/ports/stm32/boards/STM32F769DISC/mpconfigboard.mk
index dfee1a7ac79e9..6457fc6046bd4 100644
--- a/ports/stm32/boards/STM32F769DISC/mpconfigboard.mk
+++ b/ports/stm32/boards/STM32F769DISC/mpconfigboard.mk
@@ -44,3 +44,5 @@ endif
 MICROPY_PY_LWIP = 1
 MICROPY_PY_USSL = 1
 MICROPY_SSL_MBEDTLS = 1
+
+FROZEN_MANIFEST = $(BOARD_DIR)/manifest.py
diff --git a/ports/stm32/boards/STM32F7DISC/manifest.py b/ports/stm32/boards/STM32F7DISC/manifest.py
new file mode 100644
index 0000000000000..ebfecd4844ade
--- /dev/null
+++ b/ports/stm32/boards/STM32F7DISC/manifest.py
@@ -0,0 +1,2 @@
+include("$(PORT_DIR)/boards/manifest.py")
+require("bundle-networking")
diff --git a/ports/stm32/boards/STM32F7DISC/mpconfigboard.mk b/ports/stm32/boards/STM32F7DISC/mpconfigboard.mk
index 8b54dc84e113e..9506b6759555d 100644
--- a/ports/stm32/boards/STM32F7DISC/mpconfigboard.mk
+++ b/ports/stm32/boards/STM32F7DISC/mpconfigboard.mk
@@ -9,3 +9,5 @@ TEXT1_ADDR = 0x08020000
 MICROPY_PY_LWIP = 1
 MICROPY_PY_USSL = 1
 MICROPY_SSL_MBEDTLS = 1
+
+FROZEN_MANIFEST = $(BOARD_DIR)/manifest.py
diff --git a/ports/stm32/boards/VCC_GND_F407ZG/manifest.py b/ports/stm32/boards/VCC_GND_F407ZG/manifest.py
new file mode 100644
index 0000000000000..ebfecd4844ade
--- /dev/null
+++ b/ports/stm32/boards/VCC_GND_F407ZG/manifest.py
@@ -0,0 +1,2 @@
+include("$(PORT_DIR)/boards/manifest.py")
+require("bundle-networking")
diff --git a/ports/stm32/boards/VCC_GND_F407ZG/mpconfigboard.mk b/ports/stm32/boards/VCC_GND_F407ZG/mpconfigboard.mk
index c67807867ef17..a30a6137d3b38 100644
--- a/ports/stm32/boards/VCC_GND_F407ZG/mpconfigboard.mk
+++ b/ports/stm32/boards/VCC_GND_F407ZG/mpconfigboard.mk
@@ -8,3 +8,5 @@ TEXT1_ADDR = 0x08020000
 MICROPY_PY_LWIP = 1
 MICROPY_PY_USSL = 1
 MICROPY_SSL_MBEDTLS = 1
+
+FROZEN_MANIFEST = $(BOARD_DIR)/manifest.py

From 55a76f4edd894ee7c5709c66fcc6f1c3a8905723 Mon Sep 17 00:00:00 2001
From: stijn <stijn@ignitron.net>
Date: Mon, 23 Jan 2023 11:33:27 +0100
Subject: [PATCH 3044/3533] windows/msvc: Remove variant suffix from executable
 filename.

This is in line with the change made for other ports in d53c3b6a: since
the default output directory already includes the variant name in it
there's no need to add it to the executable as well.
---
 ports/windows/msvc/common.props                       | 1 +
 ports/windows/variants/dev/mpconfigvariant.props      | 3 ---
 ports/windows/variants/standard/mpconfigvariant.props | 3 ---
 3 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/ports/windows/msvc/common.props b/ports/windows/msvc/common.props
index 7700d9f0945b3..d949e3df4526b 100644
--- a/ports/windows/msvc/common.props
+++ b/ports/windows/msvc/common.props
@@ -6,6 +6,7 @@
   <PropertyGroup>
     <PyVariant Condition="'$(PyVariant)' == ''">standard</PyVariant>
     <PyBuild Condition="'$(PyBuild)' == ''">build-$(PyVariant)</PyBuild>
+    <PyProg Condition="'$(PyProg)' == ''">micropython</PyProg>
   </PropertyGroup>
   <ImportGroup Label="PropertySheets">
     <Import Project="paths.props" Condition="'$(PyPathsIncluded)' != 'True'"/>
diff --git a/ports/windows/variants/dev/mpconfigvariant.props b/ports/windows/variants/dev/mpconfigvariant.props
index 0f7abf7815609..14ce01a81613f 100644
--- a/ports/windows/variants/dev/mpconfigvariant.props
+++ b/ports/windows/variants/dev/mpconfigvariant.props
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="14.0">
-  <PropertyGroup>
-    <PyProg>micropython-dev</PyProg>
-  </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);MICROPY_ROM_TEXT_COMPRESSION=1</PreprocessorDefinitions>
diff --git a/ports/windows/variants/standard/mpconfigvariant.props b/ports/windows/variants/standard/mpconfigvariant.props
index 3cbb1821f497e..9296da44bc263 100644
--- a/ports/windows/variants/standard/mpconfigvariant.props
+++ b/ports/windows/variants/standard/mpconfigvariant.props
@@ -1,6 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="14.0">
-  <PropertyGroup>
-    <PyProg>micropython</PyProg>
-  </PropertyGroup>
 </Project>

From 65941ea0e5c7cc68951b6db606ae81ae983379f7 Mon Sep 17 00:00:00 2001
From: stijn <stijn@ignitron.net>
Date: Tue, 24 Jan 2023 10:56:26 +0100
Subject: [PATCH 3045/3533] windows/msvc: Make mpy-cross independent of
 micropython variant.

The variant.props may have incompatible build options which break
the mpy-cross build and in any case mpy-cross has nothing to do
with variant support.
---
 ports/windows/msvc/common.props | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/windows/msvc/common.props b/ports/windows/msvc/common.props
index d949e3df4526b..55c9c934f22ea 100644
--- a/ports/windows/msvc/common.props
+++ b/ports/windows/msvc/common.props
@@ -3,14 +3,14 @@
   <!-- Variant support. For compatibility with how it works for the other ports, this gets imported
        early so variants cannot override build options like the ones specified in the rest of this file.
        Use CustomPropsFile (see the .vcxproj file) for that. -->
-  <PropertyGroup>
+  <PropertyGroup Condition="'$(PyBuildingMpyCross)' != 'True'">
     <PyVariant Condition="'$(PyVariant)' == ''">standard</PyVariant>
     <PyBuild Condition="'$(PyBuild)' == ''">build-$(PyVariant)</PyBuild>
     <PyProg Condition="'$(PyProg)' == ''">micropython</PyProg>
   </PropertyGroup>
   <ImportGroup Label="PropertySheets">
     <Import Project="paths.props" Condition="'$(PyPathsIncluded)' != 'True'"/>
-    <Import Project="$(PyVariantDir)mpconfigvariant.props"/>
+    <Import Condition="'$(PyBuildingMpyCross)' != 'True'" Project="$(PyVariantDir)mpconfigvariant.props"/>
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>

From e145318a814c65658aaad80a2f9792077638c0a6 Mon Sep 17 00:00:00 2001
From: stijn <stijn@ignitron.net>
Date: Tue, 24 Jan 2023 11:03:59 +0100
Subject: [PATCH 3046/3533] windows/msvc: Fix qstr generation dependency.

The mpversion.h file must exist before py/ source can be preprocessed,
but this went unnoticed because micropython.vcxproj always calls
MakeVersionHdr before MakeQstrDefs.
---
 ports/windows/msvc/genhdr.targets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/windows/msvc/genhdr.targets b/ports/windows/msvc/genhdr.targets
index 308a6a1f5fe25..7d60e08a09197 100644
--- a/ports/windows/msvc/genhdr.targets
+++ b/ports/windows/msvc/genhdr.targets
@@ -62,7 +62,7 @@ using(var outFile = System.IO.File.CreateText(OutputFile)) {
   </ItemGroup>
 
   <!-- Preprocess changed files, concatenate and feed into makeqstrdefs.py split/cat-->
-  <Target Name="MakeQstrDefs" DependsOnTargets="MakeDestDir" Inputs="@(ClCompile);@(QstrDependencies)" Outputs="$(QstrDefsCollected)">
+  <Target Name="MakeQstrDefs" DependsOnTargets="MakeDestDir;MakeVersionHdr" Inputs="@(ClCompile);@(QstrDependencies)" Outputs="$(QstrDefsCollected)">
     <ItemGroup>
       <PyIncDirs Include="$(PyIncDirs)"/>
       <PreProcDefs Include="%(ClCompile.PreProcessorDefinitions);NO_QSTR"/>

From 7e9a15966acf80ff50fdf5c52553dd56de164bb3 Mon Sep 17 00:00:00 2001
From: stijn <stijn@ignitron.net>
Date: Mon, 30 Jan 2023 15:38:16 +0100
Subject: [PATCH 3047/3533] mpy-cross: Force forward slashes in paths.

Code in tools/mpy-tool.py and py/frozenmod.c relies on the source file
path encoded in a .mpy file to have forward slashes (e.g. by searching
for '/__init__.py').  Enforce that when creating these files, thereby
fixing import of .mpy files and frozen modules not working before
because they could have backslashes when built with the windows port.
---
 mpy-cross/main.c | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/mpy-cross/main.c b/mpy-cross/main.c
index 4a21d75846e0b..13bb17b13dbac 100644
--- a/mpy-cross/main.c
+++ b/mpy-cross/main.c
@@ -182,6 +182,15 @@ STATIC void pre_process_options(int argc, char **argv) {
     }
 }
 
+STATIC char *backslash_to_forwardslash(char *path) {
+    for (char *p = path; p != NULL && *p != '\0'; ++p) {
+        if (*p == '\\') {
+            *p = '/';
+        }
+    }
+    return path;
+}
+
 MP_NOINLINE int main_(int argc, char **argv) {
     mp_stack_set_limit(40000 * (sizeof(void *) / 4));
 
@@ -242,7 +251,7 @@ MP_NOINLINE int main_(int argc, char **argv) {
                     exit(usage(argv));
                 }
                 a += 1;
-                source_file = argv[a];
+                source_file = backslash_to_forwardslash(argv[a]);
             } else if (strncmp(argv[a], "-msmall-int-bits=", sizeof("-msmall-int-bits=") - 1) == 0) {
                 char *end;
                 mp_dynamic_compiler.small_int_bits =
@@ -308,7 +317,7 @@ MP_NOINLINE int main_(int argc, char **argv) {
                 mp_printf(&mp_stderr_print, "multiple input files\n");
                 exit(1);
             }
-            input_file = argv[a];
+            input_file = backslash_to_forwardslash(argv[a]);
         }
     }
 

From 6abf03b5d0b73e17260256580fa6f4881de18deb Mon Sep 17 00:00:00 2001
From: stijn <stijn@ignitron.net>
Date: Tue, 24 Jan 2023 11:48:20 +0100
Subject: [PATCH 3048/3533] windows/msvc: Fix module freezing.

Make this more generally useful and in line with what the mingw
and unix ports do: 16bit dig size to work on 32bit ports, a
self-contained qstrdefs.preprocessed.h because makemanifest.py
uses that, and a dev variant which effectively puts this to use:
previously the uasyncio module wasn't frozen but instead tests
ran by importing it from the extmod/ directory.
---
 ports/windows/.appveyor.yml                      | 2 +-
 ports/windows/msvc/genhdr.targets                | 6 ++++--
 ports/windows/variants/dev/mpconfigvariant.props | 3 +++
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/ports/windows/.appveyor.yml b/ports/windows/.appveyor.yml
index 41b554b2d964c..c1a114a0f8978 100644
--- a/ports/windows/.appveyor.yml
+++ b/ports/windows/.appveyor.yml
@@ -34,7 +34,7 @@ before_build:
     <?xml version="1.0" encoding="utf-8"?>
     <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
       <Target Name="Build">
-        <MsBuild BuildInParallel="True" Projects="mpy-cross\mpy-cross.vcxproj;ports\windows\micropython.vcxproj"/>
+        <MsBuild Projects="mpy-cross\mpy-cross.vcxproj;ports\windows\micropython.vcxproj"/>
       </Target>
     </Project>
     "@ | Set-Content build.proj
diff --git a/ports/windows/msvc/genhdr.targets b/ports/windows/msvc/genhdr.targets
index 7d60e08a09197..7bd8364a9ed08 100644
--- a/ports/windows/msvc/genhdr.targets
+++ b/ports/windows/msvc/genhdr.targets
@@ -150,7 +150,9 @@ using(var outFile = System.IO.File.CreateText(OutputFile)) {
       <TmpFile>$(QstrGen).tmp</TmpFile>
     </PropertyGroup>
     <Exec Command="$(PyClTool) /nologo /I@(PyIncDirs, ' /I') /D@(PreProcDefs, ' /D') /E $(PyQstrDefs) $(QstrDefs) > $(DestDir)qstrdefs.preprocessed.h"/>
-    <Exec Command="$(PyPython) $(PySrcDir)makeqstrdata.py $(DestDir)qstrdefs.preprocessed.h $(QstrDefsCollected) > $(TmpFile)"/>
+    <!--Because makemanifest.py relies on this file to have all Q() and QCFG() entries.-->
+    <Exec Command="type $(QstrDefsCollected) >> $(DestDir)qstrdefs.preprocessed.h"/>
+    <Exec Command="$(PyPython) $(PySrcDir)makeqstrdata.py $(DestDir)qstrdefs.preprocessed.h > $(TmpFile)"/>
     <MSBuild Projects="$(MSBuildThisFileFullPath)" Targets="CopyFileIfDifferent" Properties="SourceFile=$(TmpFile);DestFile=$(QstrGen)"/>
   </Target>
 
@@ -167,7 +169,7 @@ using(var outFile = System.IO.File.CreateText(OutputFile)) {
     <ItemGroup>
       <ClCompile Include="$(PyBuildDir)frozen_content.c"/>
       <ClCompile>
-        <PreprocessorDefinitions>MICROPY_MODULE_FROZEN_MPY=1;MICROPY_QSTR_EXTRA_POOL=mp_qstr_frozen_const_pool;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+        <PreprocessorDefinitions>MICROPY_MODULE_FROZEN_MPY=1;MICROPY_QSTR_EXTRA_POOL=mp_qstr_frozen_const_pool;MPZ_DIG_SIZE=16;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       </ClCompile>
     </ItemGroup>
     <Exec Command="$(PyPython) $(PyBaseDir)tools\makemanifest.py -v MPY_DIR=$(PyBaseDir) -v MPY_LIB_DIR=$(PyBaseDir)/lib/micropython-lib -v PORT_DIR=$(PyWinDir) -o $(PyBuildDir)frozen_content.c -b $(PyBuildDir) $(FrozenManifest)"/>
diff --git a/ports/windows/variants/dev/mpconfigvariant.props b/ports/windows/variants/dev/mpconfigvariant.props
index 14ce01a81613f..be1f1ae51e5d2 100644
--- a/ports/windows/variants/dev/mpconfigvariant.props
+++ b/ports/windows/variants/dev/mpconfigvariant.props
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="14.0">
+  <PropertyGroup>
+    <FrozenManifest>$(PyVariantDir)manifest.py</FrozenManifest>
+  </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);MICROPY_ROM_TEXT_COMPRESSION=1</PreprocessorDefinitions>

From 850f09b109ebdaafe3dc7cf94b99278342227b81 Mon Sep 17 00:00:00 2001
From: Martin Milata <martin@martinmilata.cz>
Date: Thu, 26 Jan 2023 14:10:18 +0100
Subject: [PATCH 3049/3533] tools/mpy-tool.py: Initialize line_info_top.

Without it the line number mapping doesn't work.

Signed-off-by: Martin Milata <martin@martinmilata.cz>
---
 tools/mpy-tool.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tools/mpy-tool.py b/tools/mpy-tool.py
index 0b8a0403ca286..fe83305d7132d 100755
--- a/tools/mpy-tool.py
+++ b/tools/mpy-tool.py
@@ -936,6 +936,10 @@ def freeze_raw_code(self, prelude_ptr=None, type_sig=0):
                 "        .line_info = fun_data_%s + %u,"
                 % (self.escaped_name, self.offset_line_info)
             )
+            print(
+                "        .line_info_top = fun_data_%s + %u,"
+                % (self.escaped_name, self.offset_closure_info)
+            )
             print(
                 "        .opcodes = fun_data_%s + %u," % (self.escaped_name, self.offset_opcodes)
             )

From fe2a8332ff9c7cc7b66ed6da04f5a4a825309818 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 1 Feb 2023 23:22:18 +1100
Subject: [PATCH 3050/3533] stm32/boards/NUCLEO_H743ZI2: Refer to NUCLEO_H743ZI
 for frozen manifest.

Fixes build issue introduced by 6250337c9cf725238df19104f7bf801e91b56e1a

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/boards/NUCLEO_H743ZI/mpconfigboard.mk  | 2 +-
 ports/stm32/boards/NUCLEO_H743ZI2/mpconfigboard.mk | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/ports/stm32/boards/NUCLEO_H743ZI/mpconfigboard.mk b/ports/stm32/boards/NUCLEO_H743ZI/mpconfigboard.mk
index 8212725943a55..ea95fd00743c9 100644
--- a/ports/stm32/boards/NUCLEO_H743ZI/mpconfigboard.mk
+++ b/ports/stm32/boards/NUCLEO_H743ZI/mpconfigboard.mk
@@ -22,4 +22,4 @@ MICROPY_PY_USSL = 1
 MICROPY_SSL_MBEDTLS = 1
 MICROPY_VFS_LFS2 = 1
 
-FROZEN_MANIFEST = $(BOARD_DIR)/manifest.py
+FROZEN_MANIFEST ?= $(BOARD_DIR)/manifest.py
diff --git a/ports/stm32/boards/NUCLEO_H743ZI2/mpconfigboard.mk b/ports/stm32/boards/NUCLEO_H743ZI2/mpconfigboard.mk
index e49a4d0d61580..50df6ac62943f 100644
--- a/ports/stm32/boards/NUCLEO_H743ZI2/mpconfigboard.mk
+++ b/ports/stm32/boards/NUCLEO_H743ZI2/mpconfigboard.mk
@@ -1 +1,3 @@
+FROZEN_MANIFEST ?= boards/NUCLEO_H743ZI/manifest.py
+
 include boards/NUCLEO_H743ZI/mpconfigboard.mk

From 8b2748269244304854b3462cb8902952b4dcb892 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Thu, 2 Feb 2023 11:51:48 +1100
Subject: [PATCH 3051/3533] top: Update Python formatting to black "2023 stable
 style".

See https://black.readthedocs.io/en/stable/the_black_code_style/index.html

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 examples/SDdatalogger/datalogger.py           |   1 -
 examples/asmsum.py                            |   2 -
 examples/bluetooth/ble_uart_repl.py           |   1 +
 examples/conwaylife.py                        |   1 +
 examples/rp2/pio_exec.py                      |   1 +
 examples/rp2/pio_uart_tx.py                   |   1 +
 extmod/uasyncio/__init__.py                   |   1 +
 extmod/uasyncio/core.py                       |   2 +
 extmod/uasyncio/event.py                      |   1 +
 extmod/uasyncio/lock.py                       |   1 +
 .../boards/UM_FEATHERS2/modules/feathers2.py  |   1 +
 .../UM_FEATHERS2NEO/modules/feathers2neo.py   |   1 +
 .../boards/UM_FEATHERS3/modules/feathers3.py  |   1 +
 ports/esp32/boards/UM_PROS3/modules/pros3.py  |   1 +
 .../boards/UM_TINYPICO/modules/tinypico.py    |   1 +
 .../esp32/boards/UM_TINYS3/modules/tinys3.py  |   1 +
 ports/esp8266/makeimg.py                      |   1 -
 ports/esp8266/modules/port_diag.py            |   1 -
 ports/mimxrt/boards/make-flexram-config.py    |   1 +
 ports/nrf/examples/powerup.py                 |   1 -
 .../boards/NUCLEO_WB55/rfcore_makefirmware.py |   1 -
 ports/stm32/boards/make-pins.py               |   1 -
 ports/stm32/make-stmconst.py                  |   1 +
 py/makeqstrdata.py                            |   1 +
 tests/esp32/esp32_idf_heap_info.py            |   1 +
 tests/extmod/framebuf_subclass.py             |   1 +
 tests/extmod/uasyncio_exception.py            |   3 +
 tests/extmod/vfs_fat_fileio1.py               |   1 -
 tests/extmod/vfs_fat_fileio2.py               |   1 -
 tests/extmod/vfs_fat_more.py                  |   1 -
 tests/extmod/vfs_fat_oldproto.py              |   1 -
 tests/extmod/vfs_fat_ramdisk.py               |   1 -
 tests/extmod/vfs_fat_ramdisklarge.py          |   1 -
 tests/extmod/websocket_basic.py               |   1 +
 tests/import/module_getattr.py                |   1 +
 tests/inlineasm/asmsum.py                     |   2 -
 tests/micropython/const2.py                   |   4 +
 tests/micropython/heapalloc_yield_from.py     |   2 +
 tests/micropython/native_closure.py           |   3 +
 tests/micropython/native_gen.py               |   2 +
 tests/micropython/native_misc.py              |   4 +
 tests/micropython/native_try.py               |   3 +
 tests/micropython/native_try_deep.py          |   1 +
 tests/micropython/native_with.py              |   1 +
 tests/micropython/viper_args.py               |   1 +
 tests/micropython/viper_cond.py               |   3 +
 tests/micropython/viper_misc.py               |  17 ++
 tests/micropython/viper_misc2.py              |   1 +
 tests/micropython/viper_misc_intbig.py        |   1 +
 tests/micropython/viper_try.py                |   3 +
 tests/micropython/viper_types.py              |   3 +
 tests/micropython/viper_with.py               |   1 +
 tests/misc/non_compliant.py                   |   3 +
 tests/misc/print_exception.py                 |   2 +
 tests/misc/sys_settrace_generator.py          |   2 -
 tests/misc/sys_settrace_generator.py.exp      | 206 +++++++++---------
 .../sys_settrace_generic.py                   |   1 +
 tests/multi_net/ssl_cert_rsa.py               |   1 +
 tests/multi_net/ssl_data.py                   |   1 +
 tests/multi_net/tcp_data.py                   |   1 +
 tests/perf_bench/bm_nqueens.py                |   1 +
 tests/perf_bench/misc_aes.py                  |   2 +
 tests/pyb/rtc.py                              |   1 +
 tests/pyb/timer_callback.py                   |   1 +
 tests/run-internalbench.py                    |   1 -
 tests/stress/qstr_limit.py                    |   2 +
 tests/stress/recursive_gen.py                 |   2 +
 tests/thread/mutate_bytearray.py              |   1 +
 tests/thread/mutate_dict.py                   |   1 +
 tests/thread/mutate_instance.py               |   2 +
 tests/thread/mutate_list.py                   |   1 +
 tests/thread/mutate_set.py                    |   1 +
 tests/thread/stress_aes.py                    |   2 +
 tests/thread/thread_qstr1.py                  |   1 +
 tests/unicode/unicode_id.py                   |   2 +
 75 files changed, 207 insertions(+), 122 deletions(-)

diff --git a/examples/SDdatalogger/datalogger.py b/examples/SDdatalogger/datalogger.py
index 3d6f98b389272..1d1195700cbb4 100644
--- a/examples/SDdatalogger/datalogger.py
+++ b/examples/SDdatalogger/datalogger.py
@@ -10,7 +10,6 @@
 
 # loop
 while True:
-
     # wait for interrupt
     # this reduces power consumption while waiting for switch press
     pyb.wfi()
diff --git a/examples/asmsum.py b/examples/asmsum.py
index f465b25afda75..f2c7f285badc7 100644
--- a/examples/asmsum.py
+++ b/examples/asmsum.py
@@ -1,6 +1,5 @@
 @micropython.asm_thumb
 def asm_sum_words(r0, r1):
-
     # r0 = len
     # r1 = ptr
     # r2 = sum
@@ -25,7 +24,6 @@ def asm_sum_words(r0, r1):
 
 @micropython.asm_thumb
 def asm_sum_bytes(r0, r1):
-
     # r0 = len
     # r1 = ptr
     # r2 = sum
diff --git a/examples/bluetooth/ble_uart_repl.py b/examples/bluetooth/ble_uart_repl.py
index 9e8a38ff4b5e8..7d92c1f31829a 100644
--- a/examples/bluetooth/ble_uart_repl.py
+++ b/examples/bluetooth/ble_uart_repl.py
@@ -20,6 +20,7 @@
 else:
     _timer = None
 
+
 # Batch writes into 50ms intervals.
 def schedule_in(handler, delay_ms):
     def _wrap(_arg):
diff --git a/examples/conwaylife.py b/examples/conwaylife.py
index 44c1a507be8a3..00cbd9cfccaae 100644
--- a/examples/conwaylife.py
+++ b/examples/conwaylife.py
@@ -4,6 +4,7 @@
 lcd = pyb.LCD("x")
 lcd.light(1)
 
+
 # do 1 iteration of Conway's Game of Life
 def conway_step():
     for x in range(128):  # loop over x coordinates
diff --git a/examples/rp2/pio_exec.py b/examples/rp2/pio_exec.py
index d8cbc33ef015a..86018a93a8074 100644
--- a/examples/rp2/pio_exec.py
+++ b/examples/rp2/pio_exec.py
@@ -8,6 +8,7 @@
 from machine import Pin
 import rp2
 
+
 # Define an empty program that uses a single set pin.
 @rp2.asm_pio(set_init=rp2.PIO.OUT_LOW)
 def prog():
diff --git a/examples/rp2/pio_uart_tx.py b/examples/rp2/pio_uart_tx.py
index 0f8c1260bd7da..5e4af8f6ccfdc 100644
--- a/examples/rp2/pio_uart_tx.py
+++ b/examples/rp2/pio_uart_tx.py
@@ -33,6 +33,7 @@ def uart_tx():
     sm.active(1)
     uarts.append(sm)
 
+
 # We can print characters from each UART by pushing them to the TX FIFO
 def pio_uart_print(sm, s):
     for c in s:
diff --git a/extmod/uasyncio/__init__.py b/extmod/uasyncio/__init__.py
index fa64438f6b2a0..373de52af4642 100644
--- a/extmod/uasyncio/__init__.py
+++ b/extmod/uasyncio/__init__.py
@@ -18,6 +18,7 @@
     "StreamWriter": "stream",
 }
 
+
 # Lazy loader, effectively does:
 #   global attr
 #   from .mod import attr
diff --git a/extmod/uasyncio/core.py b/extmod/uasyncio/core.py
index 10a310809c0e6..f191d202e2361 100644
--- a/extmod/uasyncio/core.py
+++ b/extmod/uasyncio/core.py
@@ -30,6 +30,7 @@ class TimeoutError(Exception):
 ################################################################################
 # Sleep functions
 
+
 # "Yield" once, then raise StopIteration
 class SingletonGenerator:
     def __init__(self):
@@ -132,6 +133,7 @@ def wait_io_event(self, dt):
 ################################################################################
 # Main run loop
 
+
 # Ensure the awaitable is a task
 def _promote_to_task(aw):
     return aw if isinstance(aw, Task) else create_task(aw)
diff --git a/extmod/uasyncio/event.py b/extmod/uasyncio/event.py
index 1525bcf3a97d5..43d47eb5f06f6 100644
--- a/extmod/uasyncio/event.py
+++ b/extmod/uasyncio/event.py
@@ -3,6 +3,7 @@
 
 from . import core
 
+
 # Event class for primitive events that can be waited on, set, and cleared
 class Event:
     def __init__(self):
diff --git a/extmod/uasyncio/lock.py b/extmod/uasyncio/lock.py
index 4dae36bc2b6f1..85a9437b4fe8b 100644
--- a/extmod/uasyncio/lock.py
+++ b/extmod/uasyncio/lock.py
@@ -3,6 +3,7 @@
 
 from . import core
 
+
 # Lock class for primitive mutex capability
 class Lock:
     def __init__(self):
diff --git a/ports/esp32/boards/UM_FEATHERS2/modules/feathers2.py b/ports/esp32/boards/UM_FEATHERS2/modules/feathers2.py
index 95e1f52681606..df3ac4d299e61 100644
--- a/ports/esp32/boards/UM_FEATHERS2/modules/feathers2.py
+++ b/ports/esp32/boards/UM_FEATHERS2/modules/feathers2.py
@@ -39,6 +39,7 @@
 
 # Helper functions
 
+
 # LED & Ambient Light Sensor control
 def set_led(state):
     l = Pin(LED, Pin.OUT)
diff --git a/ports/esp32/boards/UM_FEATHERS2NEO/modules/feathers2neo.py b/ports/esp32/boards/UM_FEATHERS2NEO/modules/feathers2neo.py
index 857c7559d1ac8..d0b99e2f9fe15 100644
--- a/ports/esp32/boards/UM_FEATHERS2NEO/modules/feathers2neo.py
+++ b/ports/esp32/boards/UM_FEATHERS2NEO/modules/feathers2neo.py
@@ -38,6 +38,7 @@
 DAC1 = const(17)
 DAC2 = const(18)
 
+
 # Helper functions
 def set_pixel_power(state):
     """Enable or Disable power to the onboard NeoPixel to either show colour, or to reduce power for deep sleep."""
diff --git a/ports/esp32/boards/UM_FEATHERS3/modules/feathers3.py b/ports/esp32/boards/UM_FEATHERS3/modules/feathers3.py
index 801f9cbf46fbf..1ba919ceaeeb5 100644
--- a/ports/esp32/boards/UM_FEATHERS3/modules/feathers3.py
+++ b/ports/esp32/boards/UM_FEATHERS3/modules/feathers3.py
@@ -32,6 +32,7 @@
 
 # Helper functions
 
+
 # LED & Ambient Light Sensor control
 def led_set(state):
     """Set the state of the BLUE LED on IO13"""
diff --git a/ports/esp32/boards/UM_PROS3/modules/pros3.py b/ports/esp32/boards/UM_PROS3/modules/pros3.py
index 2edf3e42ea58c..7f95902936189 100644
--- a/ports/esp32/boards/UM_PROS3/modules/pros3.py
+++ b/ports/esp32/boards/UM_PROS3/modules/pros3.py
@@ -28,6 +28,7 @@
 I2C_SDA = const(8)
 I2C_SCL = const(9)
 
+
 # Helper functions
 def set_ldo2_power(state):
     """Enable or Disable power to the second LDO"""
diff --git a/ports/esp32/boards/UM_TINYPICO/modules/tinypico.py b/ports/esp32/boards/UM_TINYPICO/modules/tinypico.py
index 95450788426ad..f6bedfb383cb9 100644
--- a/ports/esp32/boards/UM_TINYPICO/modules/tinypico.py
+++ b/ports/esp32/boards/UM_TINYPICO/modules/tinypico.py
@@ -39,6 +39,7 @@
 
 # Helper functions
 
+
 # Get a *rough* estimate of the current battery voltage
 # If the battery is not present, the charge IC will still report it's trying to charge at X voltage
 # so it will still show a voltage.
diff --git a/ports/esp32/boards/UM_TINYS3/modules/tinys3.py b/ports/esp32/boards/UM_TINYS3/modules/tinys3.py
index 4efcfe4b52995..06bbb5ff827c6 100644
--- a/ports/esp32/boards/UM_TINYS3/modules/tinys3.py
+++ b/ports/esp32/boards/UM_TINYS3/modules/tinys3.py
@@ -28,6 +28,7 @@
 I2C_SDA = const(8)
 I2C_SCL = const(9)
 
+
 # Helper functions
 def set_pixel_power(state):
     """Enable or Disable power to the onboard NeoPixel to either show colour, or to reduce power for deep sleep."""
diff --git a/ports/esp8266/makeimg.py b/ports/esp8266/makeimg.py
index 4d31cc0799604..662e6f83204a3 100644
--- a/ports/esp8266/makeimg.py
+++ b/ports/esp8266/makeimg.py
@@ -14,7 +14,6 @@
 md5 = hashlib.md5()
 
 with open(sys.argv[3], "wb") as fout:
-
     with open(sys.argv[1], "rb") as f:
         data_flash = f.read()
         fout.write(data_flash)
diff --git a/ports/esp8266/modules/port_diag.py b/ports/esp8266/modules/port_diag.py
index f2c69ecacd96b..4eea6a6d90d36 100644
--- a/ports/esp8266/modules/port_diag.py
+++ b/ports/esp8266/modules/port_diag.py
@@ -5,7 +5,6 @@
 
 
 def main():
-
     ROM = uctypes.bytearray_at(0x40200000, 16)
     fid = esp.flash_id()
 
diff --git a/ports/mimxrt/boards/make-flexram-config.py b/ports/mimxrt/boards/make-flexram-config.py
index 1afa7f798519b..4a80fb1d24762 100644
--- a/ports/mimxrt/boards/make-flexram-config.py
+++ b/ports/mimxrt/boards/make-flexram-config.py
@@ -53,6 +53,7 @@
 """
 ocram_min_size = 0x00010000  # 64 KB
 
+
 # Value parser
 def mimxrt_default_parser(defines_file, features_file, ld_script):
     with open(ld_script, "r") as input_file:
diff --git a/ports/nrf/examples/powerup.py b/ports/nrf/examples/powerup.py
index 2ecc63971c408..bbb1e20b67ec6 100644
--- a/ports/nrf/examples/powerup.py
+++ b/ports/nrf/examples/powerup.py
@@ -187,7 +187,6 @@ def loop(self):
         self.old_speed = 0
 
         while True:
-
             time.sleep_ms(100)
 
             # read out new angle
diff --git a/ports/stm32/boards/NUCLEO_WB55/rfcore_makefirmware.py b/ports/stm32/boards/NUCLEO_WB55/rfcore_makefirmware.py
index 6b2fb60892a9b..ebab7f5766213 100755
--- a/ports/stm32/boards/NUCLEO_WB55/rfcore_makefirmware.py
+++ b/ports/stm32/boards/NUCLEO_WB55/rfcore_makefirmware.py
@@ -65,7 +65,6 @@ def get_details(release_notes, filename):
 
 
 def main(src_path, dest_path):
-
     # Load the release note to parse for important details
     with open(os.path.join(src_path, _RELEASE_NOTES), "rb") as f:
         release_notes = f.read()
diff --git a/ports/stm32/boards/make-pins.py b/ports/stm32/boards/make-pins.py
index 4e895f8f60407..002a6f75f261b 100755
--- a/ports/stm32/boards/make-pins.py
+++ b/ports/stm32/boards/make-pins.py
@@ -506,7 +506,6 @@ def print_af_hdr(self, af_const_filename):
 
     def print_af_defs(self, af_defs_filename, cmp_strings):
         with open(af_defs_filename, "wt") as af_defs_file:
-
             STATIC_AF_TOKENS = {}
             for named_pin in self.cpu_pins:
                 for af in named_pin.pin().alt_fn:
diff --git a/ports/stm32/make-stmconst.py b/ports/stm32/make-stmconst.py
index aab4038e61dfe..44da3f07eb25e 100644
--- a/ports/stm32/make-stmconst.py
+++ b/ports/stm32/make-stmconst.py
@@ -29,6 +29,7 @@ def convert_bytes_to_str(b):
 
 # end compatibility code
 
+
 # given a list of (name,regex) pairs, find the first one that matches the given line
 def re_match_first(regexs, line):
     for name, regex in regexs:
diff --git a/py/makeqstrdata.py b/py/makeqstrdata.py
index e332ab94ed565..71f529fb62900 100644
--- a/py/makeqstrdata.py
+++ b/py/makeqstrdata.py
@@ -222,6 +222,7 @@
     "zip",
 ]
 
+
 # this must match the equivalent function in qstr.c
 def compute_hash(qstr, bytes_hash):
     hash = 5381
diff --git a/tests/esp32/esp32_idf_heap_info.py b/tests/esp32/esp32_idf_heap_info.py
index f141ae07b530e..fdd89161f4310 100644
--- a/tests/esp32/esp32_idf_heap_info.py
+++ b/tests/esp32/esp32_idf_heap_info.py
@@ -5,6 +5,7 @@
     print("SKIP")
     raise SystemExit
 
+
 # region tuple is: (size, free, largest free, min free)
 # we check that each region's size is > 0 and that the free amounts are smaller than the size
 def chk_heap(kind, regions):
diff --git a/tests/extmod/framebuf_subclass.py b/tests/extmod/framebuf_subclass.py
index a9e3c5efc7912..4cd9ea4eb5fa3 100644
--- a/tests/extmod/framebuf_subclass.py
+++ b/tests/extmod/framebuf_subclass.py
@@ -34,6 +34,7 @@ def foo(self):
 fb2.blit(fb, 0, 0)
 print(bytes(fb2))
 
+
 # Test that blitting something that isn't a subclass fails with TypeError.
 class NotAFrameBuf:
     pass
diff --git a/tests/extmod/uasyncio_exception.py b/tests/extmod/uasyncio_exception.py
index aae55d63207a2..4e4f978dc2092 100644
--- a/tests/extmod/uasyncio_exception.py
+++ b/tests/extmod/uasyncio_exception.py
@@ -9,6 +9,7 @@
         print("SKIP")
         raise SystemExit
 
+
 # main task raising an exception
 async def main():
     print("main start")
@@ -21,6 +22,7 @@ async def main():
 except ValueError as er:
     print("ValueError", er.args[0])
 
+
 # sub-task raising an exception
 async def task():
     print("task start")
@@ -40,6 +42,7 @@ async def main():
 except ValueError as er:
     print("ValueError", er.args[0])
 
+
 # main task raising an exception with sub-task not yet scheduled
 # TODO not currently working, task is never scheduled
 async def task():
diff --git a/tests/extmod/vfs_fat_fileio1.py b/tests/extmod/vfs_fat_fileio1.py
index 7da08b80cf332..c7ff9e0b98021 100644
--- a/tests/extmod/vfs_fat_fileio1.py
+++ b/tests/extmod/vfs_fat_fileio1.py
@@ -13,7 +13,6 @@
 
 
 class RAMFS:
-
     SEC_SIZE = 512
 
     def __init__(self, blocks):
diff --git a/tests/extmod/vfs_fat_fileio2.py b/tests/extmod/vfs_fat_fileio2.py
index 13978a0af693c..c7bdceb3dfa9f 100644
--- a/tests/extmod/vfs_fat_fileio2.py
+++ b/tests/extmod/vfs_fat_fileio2.py
@@ -13,7 +13,6 @@
 
 
 class RAMFS:
-
     SEC_SIZE = 512
 
     def __init__(self, blocks):
diff --git a/tests/extmod/vfs_fat_more.py b/tests/extmod/vfs_fat_more.py
index f9b54fda00ff8..981c2524a6ee0 100644
--- a/tests/extmod/vfs_fat_more.py
+++ b/tests/extmod/vfs_fat_more.py
@@ -12,7 +12,6 @@
 
 
 class RAMFS:
-
     SEC_SIZE = 512
 
     def __init__(self, blocks):
diff --git a/tests/extmod/vfs_fat_oldproto.py b/tests/extmod/vfs_fat_oldproto.py
index 93d00f9ce41ca..b1556ba2c0e7d 100644
--- a/tests/extmod/vfs_fat_oldproto.py
+++ b/tests/extmod/vfs_fat_oldproto.py
@@ -13,7 +13,6 @@
 
 
 class RAMFS_OLD:
-
     SEC_SIZE = 512
 
     def __init__(self, blocks):
diff --git a/tests/extmod/vfs_fat_ramdisk.py b/tests/extmod/vfs_fat_ramdisk.py
index 4decb5557dd77..0d58cec15332a 100644
--- a/tests/extmod/vfs_fat_ramdisk.py
+++ b/tests/extmod/vfs_fat_ramdisk.py
@@ -13,7 +13,6 @@
 
 
 class RAMFS:
-
     SEC_SIZE = 512
 
     def __init__(self, blocks):
diff --git a/tests/extmod/vfs_fat_ramdisklarge.py b/tests/extmod/vfs_fat_ramdisklarge.py
index 69d4a8cbbda15..649a53db14705 100644
--- a/tests/extmod/vfs_fat_ramdisklarge.py
+++ b/tests/extmod/vfs_fat_ramdisklarge.py
@@ -14,7 +14,6 @@
 
 
 class RAMBDevSparse:
-
     SEC_SIZE = 512
 
     def __init__(self, blocks):
diff --git a/tests/extmod/websocket_basic.py b/tests/extmod/websocket_basic.py
index a07542f965662..dabdb76be1e31 100644
--- a/tests/extmod/websocket_basic.py
+++ b/tests/extmod/websocket_basic.py
@@ -6,6 +6,7 @@
     print("SKIP")
     raise SystemExit
 
+
 # put raw data in the stream and do a websocket read
 def ws_read(msg, sz):
     ws = uwebsocket.websocket(uio.BytesIO(msg))
diff --git a/tests/import/module_getattr.py b/tests/import/module_getattr.py
index df7a6218156c5..9ca0d184559b0 100644
--- a/tests/import/module_getattr.py
+++ b/tests/import/module_getattr.py
@@ -8,6 +8,7 @@
 except AttributeError:
     pass
 
+
 # define __getattr__
 def __getattr__(attr):
     if attr == "does_not_exist":
diff --git a/tests/inlineasm/asmsum.py b/tests/inlineasm/asmsum.py
index 6535a495d4e0e..208709a25f74a 100644
--- a/tests/inlineasm/asmsum.py
+++ b/tests/inlineasm/asmsum.py
@@ -1,6 +1,5 @@
 @micropython.asm_thumb
 def asm_sum_words(r0, r1):
-
     # r0 = len
     # r1 = ptr
     # r2 = sum
@@ -25,7 +24,6 @@ def asm_sum_words(r0, r1):
 
 @micropython.asm_thumb
 def asm_sum_bytes(r0, r1):
-
     # r0 = len
     # r1 = ptr
     # r2 = sum
diff --git a/tests/micropython/const2.py b/tests/micropython/const2.py
index ed4720122ed39..d8b68c25f36ae 100644
--- a/tests/micropython/const2.py
+++ b/tests/micropython/const2.py
@@ -11,6 +11,7 @@
 
 print(globals()["X"])
 
+
 # function name that matches a constant
 def X():
     print("function X", X)
@@ -18,6 +19,7 @@ def X():
 
 globals()["X"]()
 
+
 # arguments that match a constant
 def f(X, *Y, **Z):
     pass
@@ -25,6 +27,7 @@ def f(X, *Y, **Z):
 
 f(1)
 
+
 # class name that matches a constant
 class X:
     def f(self):
@@ -33,6 +36,7 @@ def f(self):
 
 globals()["X"]().f()
 
+
 # constant within a class
 class A:
     C1 = const(4)
diff --git a/tests/micropython/heapalloc_yield_from.py b/tests/micropython/heapalloc_yield_from.py
index 58788b1dbcf6c..950717189087d 100644
--- a/tests/micropython/heapalloc_yield_from.py
+++ b/tests/micropython/heapalloc_yield_from.py
@@ -2,6 +2,7 @@
 
 import micropython
 
+
 # Yielding from a function generator
 def sub_gen(a):
     for i in range(a):
@@ -18,6 +19,7 @@ def gen(g):
 print(next(g))
 micropython.heap_unlock()
 
+
 # Yielding from a user iterator
 class G:
     def __init__(self):
diff --git a/tests/micropython/native_closure.py b/tests/micropython/native_closure.py
index 07014e90dac2d..8182cfea70ec1 100644
--- a/tests/micropython/native_closure.py
+++ b/tests/micropython/native_closure.py
@@ -1,5 +1,6 @@
 # test native emitter can handle closures correctly
 
+
 # basic closure
 @micropython.native
 def f():
@@ -15,6 +16,7 @@ def g():
 
 print(f()())
 
+
 # closing over an argument
 @micropython.native
 def f(x):
@@ -28,6 +30,7 @@ def g():
 
 print(f(2)())
 
+
 # closing over an argument and a normal local
 @micropython.native
 def f(x):
diff --git a/tests/micropython/native_gen.py b/tests/micropython/native_gen.py
index 62c324634d372..7e1ee25bcf452 100644
--- a/tests/micropython/native_gen.py
+++ b/tests/micropython/native_gen.py
@@ -1,5 +1,6 @@
 # test for native generators
 
+
 # simple generator with yield and return
 @micropython.native
 def gen1(x):
@@ -16,6 +17,7 @@ def gen1(x):
 except StopIteration as e:
     print(e.args[0])
 
+
 # using yield from
 @micropython.native
 def gen2(x):
diff --git a/tests/micropython/native_misc.py b/tests/micropython/native_misc.py
index f5ef807fe13f0..f40fcb2407086 100644
--- a/tests/micropython/native_misc.py
+++ b/tests/micropython/native_misc.py
@@ -1,5 +1,6 @@
 # tests for natively compiled functions
 
+
 # basic test
 @micropython.native
 def native_test(x):
@@ -14,6 +15,7 @@ def native_test(x):
 gc.collect()
 native_test(3)
 
+
 # native with 2 args
 @micropython.native
 def f(a, b):
@@ -22,6 +24,7 @@ def f(a, b):
 
 f(1, 2)
 
+
 # native with 3 args
 @micropython.native
 def f(a, b, c):
@@ -30,6 +33,7 @@ def f(a, b, c):
 
 f(1, 2, 3)
 
+
 # check not operator
 @micropython.native
 def f(a):
diff --git a/tests/micropython/native_try.py b/tests/micropython/native_try.py
index 492b59085c778..6a2152b28c71e 100644
--- a/tests/micropython/native_try.py
+++ b/tests/micropython/native_try.py
@@ -1,5 +1,6 @@
 # test native try handling
 
+
 # basic try-finally
 @micropython.native
 def f():
@@ -14,6 +15,7 @@ def f():
 except NameError:
     print("NameError")
 
+
 # nested try-except with try-finally
 @micropython.native
 def f():
@@ -28,6 +30,7 @@ def f():
 
 f()
 
+
 # check that locals written to in try blocks keep their values
 @micropython.native
 def f():
diff --git a/tests/micropython/native_try_deep.py b/tests/micropython/native_try_deep.py
index 3d31248df0fe6..26b9243e03d41 100644
--- a/tests/micropython/native_try_deep.py
+++ b/tests/micropython/native_try_deep.py
@@ -1,5 +1,6 @@
 # test native try handling
 
+
 # deeply nested try (9 deep)
 @micropython.native
 def f():
diff --git a/tests/micropython/native_with.py b/tests/micropython/native_with.py
index 4e20b23856791..9c0b98af9038e 100644
--- a/tests/micropython/native_with.py
+++ b/tests/micropython/native_with.py
@@ -21,6 +21,7 @@ def f():
 
 f()
 
+
 # nested with and try-except
 @micropython.native
 def f():
diff --git a/tests/micropython/viper_args.py b/tests/micropython/viper_args.py
index 8e3225331a429..27c73fa795816 100644
--- a/tests/micropython/viper_args.py
+++ b/tests/micropython/viper_args.py
@@ -56,6 +56,7 @@ def f6(x1: int, x2: int, x3: int, x4: int, x5: int, x6: int):
 
 f6(1, 2, 3, 4, 5, 6)
 
+
 # test compiling *x, **x, * args (currently unsupported at runtime)
 @micropython.viper
 def f(*x, **y):
diff --git a/tests/micropython/viper_cond.py b/tests/micropython/viper_cond.py
index d5ebf837bdde6..752261ff5093c 100644
--- a/tests/micropython/viper_cond.py
+++ b/tests/micropython/viper_cond.py
@@ -10,6 +10,7 @@ def f():
 
 f()
 
+
 # using True as a conditional
 @micropython.viper
 def f():
@@ -20,6 +21,7 @@ def f():
 
 f()
 
+
 # using an int as a conditional
 @micropython.viper
 def g():
@@ -30,6 +32,7 @@ def g():
 
 g()
 
+
 # using an int as a conditional that has the lower 16-bits clear
 @micropython.viper
 def h():
diff --git a/tests/micropython/viper_misc.py b/tests/micropython/viper_misc.py
index 41389c751d392..f9267f65cab8c 100644
--- a/tests/micropython/viper_misc.py
+++ b/tests/micropython/viper_misc.py
@@ -1,5 +1,6 @@
 import micropython
 
+
 # viper function taking and returning ints
 @micropython.viper
 def viper_int(x: int, y: int) -> int:
@@ -8,6 +9,7 @@ def viper_int(x: int, y: int) -> int:
 
 print(viper_int(1, 2))
 
+
 # viper function taking and returning objects
 @micropython.viper
 def viper_object(x: object, y: object) -> object:
@@ -16,6 +18,7 @@ def viper_object(x: object, y: object) -> object:
 
 print(viper_object(1, 2))
 
+
 # return None as non-object (should return 0)
 @micropython.viper
 def viper_ret_none() -> int:
@@ -24,6 +27,7 @@ def viper_ret_none() -> int:
 
 print(viper_ret_none())
 
+
 # return Ellipsis as object
 @micropython.viper
 def viper_ret_ellipsis() -> object:
@@ -32,6 +36,7 @@ def viper_ret_ellipsis() -> object:
 
 print(viper_ret_ellipsis())
 
+
 # 3 args
 @micropython.viper
 def viper_3args(a: int, b: int, c: int) -> int:
@@ -40,6 +45,7 @@ def viper_3args(a: int, b: int, c: int) -> int:
 
 print(viper_3args(1, 2, 3))
 
+
 # 4 args
 @micropython.viper
 def viper_4args(a: int, b: int, c: int, d: int) -> int:
@@ -49,6 +55,7 @@ def viper_4args(a: int, b: int, c: int, d: int) -> int:
 # viper call with 4 args not yet supported
 # print(viper_4args(1, 2, 3, 4))
 
+
 # a local (should have automatic type int)
 @micropython.viper
 def viper_local(x: int) -> int:
@@ -58,6 +65,7 @@ def viper_local(x: int) -> int:
 
 print(viper_local(3))
 
+
 # without type annotation, types should default to object
 @micropython.viper
 def viper_no_annotation(x, y):
@@ -66,6 +74,7 @@ def viper_no_annotation(x, y):
 
 print(viper_no_annotation(4, 5))
 
+
 # a for loop
 @micropython.viper
 def viper_for(a: int, b: int) -> int:
@@ -77,6 +86,7 @@ def viper_for(a: int, b: int) -> int:
 
 print(viper_for(10, 10000))
 
+
 # accessing a global
 @micropython.viper
 def viper_access_global():
@@ -87,6 +97,7 @@ def viper_access_global():
 
 print(viper_access_global(), gl)
 
+
 # calling print with object and int types
 @micropython.viper
 def viper_print(x, y: int):
@@ -95,6 +106,7 @@ def viper_print(x, y: int):
 
 viper_print(1, 2)
 
+
 # convert constants to objects in tuple
 @micropython.viper
 def viper_tuple_consts(x):
@@ -103,6 +115,7 @@ def viper_tuple_consts(x):
 
 print(viper_tuple_consts(0))
 
+
 # making a tuple from an object and an int
 @micropython.viper
 def viper_tuple(x, y: int):
@@ -111,6 +124,7 @@ def viper_tuple(x, y: int):
 
 print(viper_tuple(1, 2))
 
+
 # making a list from an object and an int
 @micropython.viper
 def viper_list(x, y: int):
@@ -119,6 +133,7 @@ def viper_list(x, y: int):
 
 print(viper_list(1, 2))
 
+
 # making a set from an object and an int
 @micropython.viper
 def viper_set(x, y: int):
@@ -127,6 +142,7 @@ def viper_set(x, y: int):
 
 print(sorted(list(viper_set(1, 2))))
 
+
 # raising an exception
 @micropython.viper
 def viper_raise(x: int):
@@ -138,6 +154,7 @@ def viper_raise(x: int):
 except OSError as e:
     print(repr(e))
 
+
 # calling GC after defining the function
 @micropython.viper
 def viper_gc() -> int:
diff --git a/tests/micropython/viper_misc2.py b/tests/micropython/viper_misc2.py
index 8f0be487d626d..cc77134bd48c0 100644
--- a/tests/micropython/viper_misc2.py
+++ b/tests/micropython/viper_misc2.py
@@ -1,5 +1,6 @@
 # Miscellaneous viper tests
 
+
 # Test correct use of registers in load and store
 @micropython.viper
 def expand(dest: ptr8, source: ptr8, length: int):
diff --git a/tests/micropython/viper_misc_intbig.py b/tests/micropython/viper_misc_intbig.py
index eda873ca63dee..ac09f578572f0 100644
--- a/tests/micropython/viper_misc_intbig.py
+++ b/tests/micropython/viper_misc_intbig.py
@@ -1,5 +1,6 @@
 import micropython
 
+
 # unsigned ints
 @micropython.viper
 def viper_uint() -> uint:
diff --git a/tests/micropython/viper_try.py b/tests/micropython/viper_try.py
index 61335af221c7b..f5822a66820f4 100644
--- a/tests/micropython/viper_try.py
+++ b/tests/micropython/viper_try.py
@@ -1,5 +1,6 @@
 # test try handling within a viper function
 
+
 # basic try-finally
 @micropython.viper
 def f():
@@ -14,6 +15,7 @@ def f():
 except NameError:
     print("NameError")
 
+
 # nested try-except with try-finally
 @micropython.viper
 def f():
@@ -28,6 +30,7 @@ def f():
 
 f()
 
+
 # check that locals written to in try blocks keep their values
 @micropython.viper
 def f():
diff --git a/tests/micropython/viper_types.py b/tests/micropython/viper_types.py
index 3af148171e298..3e0a4f6640469 100644
--- a/tests/micropython/viper_types.py
+++ b/tests/micropython/viper_types.py
@@ -2,6 +2,7 @@
 
 import micropython
 
+
 # converting incoming arg to bool
 @micropython.viper
 def f1(x: bool):
@@ -13,6 +14,7 @@ def f1(x: bool):
 f1([])
 f1([1])
 
+
 # taking and returning a bool
 @micropython.viper
 def f2(x: bool) -> bool:
@@ -22,6 +24,7 @@ def f2(x: bool) -> bool:
 print(f2([]))
 print(f2([1]))
 
+
 # converting to bool within function
 @micropython.viper
 def f3(x) -> bool:
diff --git a/tests/micropython/viper_with.py b/tests/micropython/viper_with.py
index d640c8ae0f5de..40fbf6fb31541 100644
--- a/tests/micropython/viper_with.py
+++ b/tests/micropython/viper_with.py
@@ -21,6 +21,7 @@ def f():
 
 f()
 
+
 # nested with and try-except
 @micropython.viper
 def f():
diff --git a/tests/misc/non_compliant.py b/tests/misc/non_compliant.py
index ebba9b16aa91b..0839274462b42 100644
--- a/tests/misc/non_compliant.py
+++ b/tests/misc/non_compliant.py
@@ -117,6 +117,7 @@
 except NotImplementedError:
     print("NotImplementedError")
 
+
 # can't assign attributes to a function
 def f():
     pass
@@ -133,6 +134,7 @@ def f():
 except TypeError:
     print("TypeError")
 
+
 # test when object explicitly listed at not-last position in parent tuple
 # this is not compliant with CPython because of illegal MRO
 class A:
@@ -146,6 +148,7 @@ class B(object, A):
 
 B().foo()
 
+
 # can't assign property (or other special accessors) to already-subclassed class
 class A:
     pass
diff --git a/tests/misc/print_exception.py b/tests/misc/print_exception.py
index 9b3467b0a0f84..06f4023349a19 100644
--- a/tests/misc/print_exception.py
+++ b/tests/misc/print_exception.py
@@ -40,6 +40,7 @@ def print_exc(e):
     print("caught")
     print_exc(e)
 
+
 # exception message with more than 1 source-code line
 def f():
     g()
@@ -77,6 +78,7 @@ def g():
     print("caught")
     print_exc(e)
 
+
 # Here we have a function with lots of bytecode generated for a single source-line, and
 # there is an error right at the end of the bytecode.  It should report the correct line.
 def f():
diff --git a/tests/misc/sys_settrace_generator.py b/tests/misc/sys_settrace_generator.py
index 43065df4ae9be..1199f1f4eb13e 100644
--- a/tests/misc/sys_settrace_generator.py
+++ b/tests/misc/sys_settrace_generator.py
@@ -48,11 +48,9 @@ def make_gen():
     gen = make_gen()
     r = 0
     try:
-
         r += gen.send(None)
 
         while True:
-
             r += gen.send(None)
 
     except StopIteration as e:
diff --git a/tests/misc/sys_settrace_generator.py.exp b/tests/misc/sys_settrace_generator.py.exp
index a83450afe380c..c1d13aac86e85 100644
--- a/tests/misc/sys_settrace_generator.py.exp
+++ b/tests/misc/sys_settrace_generator.py.exp
@@ -1,195 +1,195 @@
 ### trace_handler::main event: call
  0:   @__main__:test_generator => sys_settrace_generator.py:41
- 1:   @__main__:<module> => sys_settrace_generator.py:69
+ 1:   @__main__:<module> => sys_settrace_generator.py:67
 ### trace_handler::main event: line
  0:   @__main__:test_generator => sys_settrace_generator.py:42
- 1:   @__main__:<module> => sys_settrace_generator.py:69
+ 1:   @__main__:<module> => sys_settrace_generator.py:67
 ### trace_handler::main event: line
  0:   @__main__:test_generator => sys_settrace_generator.py:48
- 1:   @__main__:<module> => sys_settrace_generator.py:69
+ 1:   @__main__:<module> => sys_settrace_generator.py:67
 ### trace_handler::main event: line
  0:   @__main__:test_generator => sys_settrace_generator.py:49
- 1:   @__main__:<module> => sys_settrace_generator.py:69
+ 1:   @__main__:<module> => sys_settrace_generator.py:67
 ### trace_handler::main event: line
  0:   @__main__:test_generator => sys_settrace_generator.py:50
- 1:   @__main__:<module> => sys_settrace_generator.py:69
+ 1:   @__main__:<module> => sys_settrace_generator.py:67
 ### trace_handler::main event: line
- 0:   @__main__:test_generator => sys_settrace_generator.py:52
- 1:   @__main__:<module> => sys_settrace_generator.py:69
+ 0:   @__main__:test_generator => sys_settrace_generator.py:51
+ 1:   @__main__:<module> => sys_settrace_generator.py:67
 ### trace_handler::main event: call
  0:   @__main__:make_gen => sys_settrace_generator.py:42
- 1:   @__main__:test_generator => sys_settrace_generator.py:52
- 2:   @__main__:<module> => sys_settrace_generator.py:69
+ 1:   @__main__:test_generator => sys_settrace_generator.py:51
+ 2:   @__main__:<module> => sys_settrace_generator.py:67
 ### trace_handler::main event: line
  0:   @__main__:make_gen => sys_settrace_generator.py:43
- 1:   @__main__:test_generator => sys_settrace_generator.py:52
- 2:   @__main__:<module> => sys_settrace_generator.py:69
+ 1:   @__main__:test_generator => sys_settrace_generator.py:51
+ 2:   @__main__:<module> => sys_settrace_generator.py:67
 ### trace_handler::main event: return
  0:   @__main__:make_gen => sys_settrace_generator.py:43
- 1:   @__main__:test_generator => sys_settrace_generator.py:52
- 2:   @__main__:<module> => sys_settrace_generator.py:69
+ 1:   @__main__:test_generator => sys_settrace_generator.py:51
+ 2:   @__main__:<module> => sys_settrace_generator.py:67
 ### trace_handler::main event: line
- 0:   @__main__:test_generator => sys_settrace_generator.py:56
- 1:   @__main__:<module> => sys_settrace_generator.py:69
+ 0:   @__main__:test_generator => sys_settrace_generator.py:54
+ 1:   @__main__:<module> => sys_settrace_generator.py:67
 ### trace_handler::main event: call
  0:   @__main__:make_gen => sys_settrace_generator.py:43
- 1:   @__main__:test_generator => sys_settrace_generator.py:56
- 2:   @__main__:<module> => sys_settrace_generator.py:69
+ 1:   @__main__:test_generator => sys_settrace_generator.py:54
+ 2:   @__main__:<module> => sys_settrace_generator.py:67
 ### trace_handler::main event: line
  0:   @__main__:make_gen => sys_settrace_generator.py:43
- 1:   @__main__:test_generator => sys_settrace_generator.py:56
- 2:   @__main__:<module> => sys_settrace_generator.py:69
+ 1:   @__main__:test_generator => sys_settrace_generator.py:54
+ 2:   @__main__:<module> => sys_settrace_generator.py:67
 ### trace_handler::main event: line
  0:   @__main__:make_gen => sys_settrace_generator.py:44
- 1:   @__main__:test_generator => sys_settrace_generator.py:56
- 2:   @__main__:<module> => sys_settrace_generator.py:69
+ 1:   @__main__:test_generator => sys_settrace_generator.py:54
+ 2:   @__main__:<module> => sys_settrace_generator.py:67
 ### trace_handler::main event: return
  0:   @__main__:make_gen => sys_settrace_generator.py:44
- 1:   @__main__:test_generator => sys_settrace_generator.py:56
- 2:   @__main__:<module> => sys_settrace_generator.py:69
+ 1:   @__main__:test_generator => sys_settrace_generator.py:54
+ 2:   @__main__:<module> => sys_settrace_generator.py:67
 ### trace_handler::main event: call
  0:   @__main__:make_gen => sys_settrace_generator.py:44
- 1:   @__main__:test_generator => sys_settrace_generator.py:56
- 2:   @__main__:<module> => sys_settrace_generator.py:69
+ 1:   @__main__:test_generator => sys_settrace_generator.py:54
+ 2:   @__main__:<module> => sys_settrace_generator.py:67
 ### trace_handler::main event: line
  0:   @__main__:make_gen => sys_settrace_generator.py:44
- 1:   @__main__:test_generator => sys_settrace_generator.py:56
- 2:   @__main__:<module> => sys_settrace_generator.py:69
+ 1:   @__main__:test_generator => sys_settrace_generator.py:54
+ 2:   @__main__:<module> => sys_settrace_generator.py:67
 ### trace_handler::main event: line
  0:   @__main__:make_gen => sys_settrace_generator.py:45
- 1:   @__main__:test_generator => sys_settrace_generator.py:56
- 2:   @__main__:<module> => sys_settrace_generator.py:69
+ 1:   @__main__:test_generator => sys_settrace_generator.py:54
+ 2:   @__main__:<module> => sys_settrace_generator.py:67
 ### trace_handler::main event: return
  0:   @__main__:make_gen => sys_settrace_generator.py:45
- 1:   @__main__:test_generator => sys_settrace_generator.py:56
- 2:   @__main__:<module> => sys_settrace_generator.py:69
+ 1:   @__main__:test_generator => sys_settrace_generator.py:54
+ 2:   @__main__:<module> => sys_settrace_generator.py:67
 ### trace_handler::main event: call
  0:   @__main__:make_gen => sys_settrace_generator.py:45
- 1:   @__main__:test_generator => sys_settrace_generator.py:56
- 2:   @__main__:<module> => sys_settrace_generator.py:69
+ 1:   @__main__:test_generator => sys_settrace_generator.py:54
+ 2:   @__main__:<module> => sys_settrace_generator.py:67
 ### trace_handler::main event: line
  0:   @__main__:make_gen => sys_settrace_generator.py:45
- 1:   @__main__:test_generator => sys_settrace_generator.py:56
- 2:   @__main__:<module> => sys_settrace_generator.py:69
+ 1:   @__main__:test_generator => sys_settrace_generator.py:54
+ 2:   @__main__:<module> => sys_settrace_generator.py:67
 ### trace_handler::main event: line
  0:   @__main__:make_gen => sys_settrace_generator.py:46
- 1:   @__main__:test_generator => sys_settrace_generator.py:56
- 2:   @__main__:<module> => sys_settrace_generator.py:69
+ 1:   @__main__:test_generator => sys_settrace_generator.py:54
+ 2:   @__main__:<module> => sys_settrace_generator.py:67
 ### trace_handler::main event: return
  0:   @__main__:make_gen => sys_settrace_generator.py:46
- 1:   @__main__:test_generator => sys_settrace_generator.py:56
- 2:   @__main__:<module> => sys_settrace_generator.py:69
+ 1:   @__main__:test_generator => sys_settrace_generator.py:54
+ 2:   @__main__:<module> => sys_settrace_generator.py:67
 ### trace_handler::main event: exception
- 0:   @__main__:test_generator => sys_settrace_generator.py:56
- 1:   @__main__:<module> => sys_settrace_generator.py:69
+ 0:   @__main__:test_generator => sys_settrace_generator.py:54
+ 1:   @__main__:<module> => sys_settrace_generator.py:67
 ### trace_handler::main event: line
- 0:   @__main__:test_generator => sys_settrace_generator.py:58
- 1:   @__main__:<module> => sys_settrace_generator.py:69
+ 0:   @__main__:test_generator => sys_settrace_generator.py:56
+ 1:   @__main__:<module> => sys_settrace_generator.py:67
 ### trace_handler::main event: line
- 0:   @__main__:test_generator => sys_settrace_generator.py:59
- 1:   @__main__:<module> => sys_settrace_generator.py:69
+ 0:   @__main__:test_generator => sys_settrace_generator.py:57
+ 1:   @__main__:<module> => sys_settrace_generator.py:67
 test_generator 7 8
 ### trace_handler::main event: line
- 0:   @__main__:test_generator => sys_settrace_generator.py:61
- 1:   @__main__:<module> => sys_settrace_generator.py:69
+ 0:   @__main__:test_generator => sys_settrace_generator.py:59
+ 1:   @__main__:<module> => sys_settrace_generator.py:67
 ### trace_handler::main event: line
- 0:   @__main__:test_generator => sys_settrace_generator.py:62
- 1:   @__main__:<module> => sys_settrace_generator.py:69
+ 0:   @__main__:test_generator => sys_settrace_generator.py:60
+ 1:   @__main__:<module> => sys_settrace_generator.py:67
 ### trace_handler::main event: line
- 0:   @__main__:test_generator => sys_settrace_generator.py:63
- 1:   @__main__:<module> => sys_settrace_generator.py:69
+ 0:   @__main__:test_generator => sys_settrace_generator.py:61
+ 1:   @__main__:<module> => sys_settrace_generator.py:67
 ### trace_handler::main event: call
  0:   @__main__:make_gen => sys_settrace_generator.py:42
- 1:   @__main__:test_generator => sys_settrace_generator.py:63
- 2:   @__main__:<module> => sys_settrace_generator.py:69
+ 1:   @__main__:test_generator => sys_settrace_generator.py:61
+ 2:   @__main__:<module> => sys_settrace_generator.py:67
 ### trace_handler::main event: line
  0:   @__main__:make_gen => sys_settrace_generator.py:43
- 1:   @__main__:test_generator => sys_settrace_generator.py:63
- 2:   @__main__:<module> => sys_settrace_generator.py:69
+ 1:   @__main__:test_generator => sys_settrace_generator.py:61
+ 2:   @__main__:<module> => sys_settrace_generator.py:67
 ### trace_handler::main event: return
  0:   @__main__:make_gen => sys_settrace_generator.py:43
- 1:   @__main__:test_generator => sys_settrace_generator.py:63
- 2:   @__main__:<module> => sys_settrace_generator.py:69
+ 1:   @__main__:test_generator => sys_settrace_generator.py:61
+ 2:   @__main__:<module> => sys_settrace_generator.py:67
 ### trace_handler::main event: line
- 0:   @__main__:test_generator => sys_settrace_generator.py:63
- 1:   @__main__:<module> => sys_settrace_generator.py:69
+ 0:   @__main__:test_generator => sys_settrace_generator.py:61
+ 1:   @__main__:<module> => sys_settrace_generator.py:67
 ### trace_handler::main event: line
- 0:   @__main__:test_generator => sys_settrace_generator.py:64
- 1:   @__main__:<module> => sys_settrace_generator.py:69
+ 0:   @__main__:test_generator => sys_settrace_generator.py:62
+ 1:   @__main__:<module> => sys_settrace_generator.py:67
 ### trace_handler::main event: line
- 0:   @__main__:test_generator => sys_settrace_generator.py:63
- 1:   @__main__:<module> => sys_settrace_generator.py:69
+ 0:   @__main__:test_generator => sys_settrace_generator.py:61
+ 1:   @__main__:<module> => sys_settrace_generator.py:67
 ### trace_handler::main event: call
  0:   @__main__:make_gen => sys_settrace_generator.py:43
- 1:   @__main__:test_generator => sys_settrace_generator.py:63
- 2:   @__main__:<module> => sys_settrace_generator.py:69
+ 1:   @__main__:test_generator => sys_settrace_generator.py:61
+ 2:   @__main__:<module> => sys_settrace_generator.py:67
 ### trace_handler::main event: line
  0:   @__main__:make_gen => sys_settrace_generator.py:43
- 1:   @__main__:test_generator => sys_settrace_generator.py:63
- 2:   @__main__:<module> => sys_settrace_generator.py:69
+ 1:   @__main__:test_generator => sys_settrace_generator.py:61
+ 2:   @__main__:<module> => sys_settrace_generator.py:67
 ### trace_handler::main event: line
  0:   @__main__:make_gen => sys_settrace_generator.py:44
- 1:   @__main__:test_generator => sys_settrace_generator.py:63
- 2:   @__main__:<module> => sys_settrace_generator.py:69
+ 1:   @__main__:test_generator => sys_settrace_generator.py:61
+ 2:   @__main__:<module> => sys_settrace_generator.py:67
 ### trace_handler::main event: return
  0:   @__main__:make_gen => sys_settrace_generator.py:44
- 1:   @__main__:test_generator => sys_settrace_generator.py:63
- 2:   @__main__:<module> => sys_settrace_generator.py:69
+ 1:   @__main__:test_generator => sys_settrace_generator.py:61
+ 2:   @__main__:<module> => sys_settrace_generator.py:67
 ### trace_handler::main event: line
- 0:   @__main__:test_generator => sys_settrace_generator.py:63
- 1:   @__main__:<module> => sys_settrace_generator.py:69
+ 0:   @__main__:test_generator => sys_settrace_generator.py:61
+ 1:   @__main__:<module> => sys_settrace_generator.py:67
 ### trace_handler::main event: line
- 0:   @__main__:test_generator => sys_settrace_generator.py:64
- 1:   @__main__:<module> => sys_settrace_generator.py:69
+ 0:   @__main__:test_generator => sys_settrace_generator.py:62
+ 1:   @__main__:<module> => sys_settrace_generator.py:67
 ### trace_handler::main event: line
- 0:   @__main__:test_generator => sys_settrace_generator.py:63
- 1:   @__main__:<module> => sys_settrace_generator.py:69
+ 0:   @__main__:test_generator => sys_settrace_generator.py:61
+ 1:   @__main__:<module> => sys_settrace_generator.py:67
 ### trace_handler::main event: call
  0:   @__main__:make_gen => sys_settrace_generator.py:44
- 1:   @__main__:test_generator => sys_settrace_generator.py:63
- 2:   @__main__:<module> => sys_settrace_generator.py:69
+ 1:   @__main__:test_generator => sys_settrace_generator.py:61
+ 2:   @__main__:<module> => sys_settrace_generator.py:67
 ### trace_handler::main event: line
  0:   @__main__:make_gen => sys_settrace_generator.py:44
- 1:   @__main__:test_generator => sys_settrace_generator.py:63
- 2:   @__main__:<module> => sys_settrace_generator.py:69
+ 1:   @__main__:test_generator => sys_settrace_generator.py:61
+ 2:   @__main__:<module> => sys_settrace_generator.py:67
 ### trace_handler::main event: line
  0:   @__main__:make_gen => sys_settrace_generator.py:45
- 1:   @__main__:test_generator => sys_settrace_generator.py:63
- 2:   @__main__:<module> => sys_settrace_generator.py:69
+ 1:   @__main__:test_generator => sys_settrace_generator.py:61
+ 2:   @__main__:<module> => sys_settrace_generator.py:67
 ### trace_handler::main event: return
  0:   @__main__:make_gen => sys_settrace_generator.py:45
- 1:   @__main__:test_generator => sys_settrace_generator.py:63
- 2:   @__main__:<module> => sys_settrace_generator.py:69
+ 1:   @__main__:test_generator => sys_settrace_generator.py:61
+ 2:   @__main__:<module> => sys_settrace_generator.py:67
 ### trace_handler::main event: line
- 0:   @__main__:test_generator => sys_settrace_generator.py:63
- 1:   @__main__:<module> => sys_settrace_generator.py:69
+ 0:   @__main__:test_generator => sys_settrace_generator.py:61
+ 1:   @__main__:<module> => sys_settrace_generator.py:67
 ### trace_handler::main event: line
- 0:   @__main__:test_generator => sys_settrace_generator.py:64
- 1:   @__main__:<module> => sys_settrace_generator.py:69
+ 0:   @__main__:test_generator => sys_settrace_generator.py:62
+ 1:   @__main__:<module> => sys_settrace_generator.py:67
 ### trace_handler::main event: line
- 0:   @__main__:test_generator => sys_settrace_generator.py:63
- 1:   @__main__:<module> => sys_settrace_generator.py:69
+ 0:   @__main__:test_generator => sys_settrace_generator.py:61
+ 1:   @__main__:<module> => sys_settrace_generator.py:67
 ### trace_handler::main event: call
  0:   @__main__:make_gen => sys_settrace_generator.py:45
- 1:   @__main__:test_generator => sys_settrace_generator.py:63
- 2:   @__main__:<module> => sys_settrace_generator.py:69
+ 1:   @__main__:test_generator => sys_settrace_generator.py:61
+ 2:   @__main__:<module> => sys_settrace_generator.py:67
 ### trace_handler::main event: line
  0:   @__main__:make_gen => sys_settrace_generator.py:45
- 1:   @__main__:test_generator => sys_settrace_generator.py:63
- 2:   @__main__:<module> => sys_settrace_generator.py:69
+ 1:   @__main__:test_generator => sys_settrace_generator.py:61
+ 2:   @__main__:<module> => sys_settrace_generator.py:67
 ### trace_handler::main event: line
  0:   @__main__:make_gen => sys_settrace_generator.py:46
- 1:   @__main__:test_generator => sys_settrace_generator.py:63
- 2:   @__main__:<module> => sys_settrace_generator.py:69
+ 1:   @__main__:test_generator => sys_settrace_generator.py:61
+ 2:   @__main__:<module> => sys_settrace_generator.py:67
 ### trace_handler::main event: return
  0:   @__main__:make_gen => sys_settrace_generator.py:46
- 1:   @__main__:test_generator => sys_settrace_generator.py:63
- 2:   @__main__:<module> => sys_settrace_generator.py:69
+ 1:   @__main__:test_generator => sys_settrace_generator.py:61
+ 2:   @__main__:<module> => sys_settrace_generator.py:67
 ### trace_handler::main event: line
- 0:   @__main__:test_generator => sys_settrace_generator.py:65
- 1:   @__main__:<module> => sys_settrace_generator.py:69
+ 0:   @__main__:test_generator => sys_settrace_generator.py:63
+ 1:   @__main__:<module> => sys_settrace_generator.py:67
 7
 ### trace_handler::main event: return
- 0:   @__main__:test_generator => sys_settrace_generator.py:65
- 1:   @__main__:<module> => sys_settrace_generator.py:69
+ 0:   @__main__:test_generator => sys_settrace_generator.py:63
+ 1:   @__main__:<module> => sys_settrace_generator.py:67
 Total traces executed:  54
diff --git a/tests/misc/sys_settrace_subdir/sys_settrace_generic.py b/tests/misc/sys_settrace_subdir/sys_settrace_generic.py
index a60ca955d7c7c..fcf034af25458 100644
--- a/tests/misc/sys_settrace_subdir/sys_settrace_generic.py
+++ b/tests/misc/sys_settrace_subdir/sys_settrace_generic.py
@@ -1,5 +1,6 @@
 print("Now comes the language constructions tests.")
 
+
 # function
 def test_func():
     def test_sub_func():
diff --git a/tests/multi_net/ssl_cert_rsa.py b/tests/multi_net/ssl_cert_rsa.py
index f0f3a554e86a5..7c718ee40a512 100644
--- a/tests/multi_net/ssl_cert_rsa.py
+++ b/tests/multi_net/ssl_cert_rsa.py
@@ -125,6 +125,7 @@
     b"8b17a330a306a6fbcf51ba83563aed85a4f886fff1a22423748d83798c"
 )
 
+
 # Server
 def instance0():
     multitest.globals(IP=multitest.get_network_ip())
diff --git a/tests/multi_net/ssl_data.py b/tests/multi_net/ssl_data.py
index 036d7738226bb..aef85b83ab3af 100644
--- a/tests/multi_net/ssl_data.py
+++ b/tests/multi_net/ssl_data.py
@@ -39,6 +39,7 @@
     b"979b57f0b3"
 )
 
+
 # Server
 def instance0():
     multitest.globals(IP=multitest.get_network_ip())
diff --git a/tests/multi_net/tcp_data.py b/tests/multi_net/tcp_data.py
index b73dac636a2ea..9646725b3208d 100644
--- a/tests/multi_net/tcp_data.py
+++ b/tests/multi_net/tcp_data.py
@@ -4,6 +4,7 @@
 
 PORT = 8000
 
+
 # Server
 def instance0():
     multitest.globals(IP=multitest.get_network_ip())
diff --git a/tests/perf_bench/bm_nqueens.py b/tests/perf_bench/bm_nqueens.py
index c5a91bf30494d..7c6ddd59e1ef7 100644
--- a/tests/perf_bench/bm_nqueens.py
+++ b/tests/perf_bench/bm_nqueens.py
@@ -5,6 +5,7 @@
 # author: collinwinter@google.com (Collin Winter)
 # n_queens function: Copyright 2009 Raymond Hettinger
 
+
 # Pure-Python implementation of itertools.permutations().
 def permutations(iterable, r=None):
     """permutations(range(3), 2) --> (0,1) (0,2) (1,0) (1,2) (2,0) (2,1)"""
diff --git a/tests/perf_bench/misc_aes.py b/tests/perf_bench/misc_aes.py
index 0743737cb7232..8a9c58bb380b2 100644
--- a/tests/perf_bench/misc_aes.py
+++ b/tests/perf_bench/misc_aes.py
@@ -33,6 +33,7 @@
 ))
 # fmt: on
 
+
 # multiplication of polynomials modulo x^8 + x^4 + x^3 + x + 1 = 0x11b
 def aes_gf8_mul_2(x):
     if x & 0x80:
@@ -64,6 +65,7 @@ def aes_r_con(a):
 ##################################################################
 # basic AES algorithm; see FIPS-197
 
+
 # all inputs must be size 16
 def aes_add_round_key(state, w):
     for i in range(16):
diff --git a/tests/pyb/rtc.py b/tests/pyb/rtc.py
index 41b52f260d887..013b2f33142f0 100644
--- a/tests/pyb/rtc.py
+++ b/tests/pyb/rtc.py
@@ -55,6 +55,7 @@ def set_and_print_calib(cal):
 # restore existing calibration value
 rtc.calibration(cal_tmp)
 
+
 # Check register settings for wakeup
 def set_and_print_wakeup(ms):
     try:
diff --git a/tests/pyb/timer_callback.py b/tests/pyb/timer_callback.py
index 51242fba4bab0..5f170ccde1137 100644
--- a/tests/pyb/timer_callback.py
+++ b/tests/pyb/timer_callback.py
@@ -3,6 +3,7 @@
 import pyb
 from pyb import Timer
 
+
 # callback function that disables the callback when called
 def cb1(t):
     print("cb1")
diff --git a/tests/run-internalbench.py b/tests/run-internalbench.py
index b71b38cab8538..2cf7f3443bbca 100755
--- a/tests/run-internalbench.py
+++ b/tests/run-internalbench.py
@@ -28,7 +28,6 @@ def run_tests(pyb, test_dict):
     for base_test, tests in sorted(test_dict.items()):
         print(base_test + ":")
         for test_file in tests:
-
             # run MicroPython
             if pyb is None:
                 # run on PC
diff --git a/tests/stress/qstr_limit.py b/tests/stress/qstr_limit.py
index d8ce0cf7cd15f..08b10a039f509 100644
--- a/tests/stress/qstr_limit.py
+++ b/tests/stress/qstr_limit.py
@@ -17,6 +17,7 @@ def make_id(n, base="a"):
         continue
     print(var in g)
 
+
 # calling a function with kwarg
 def f(**k):
     print(k)
@@ -36,6 +37,7 @@ def f(**k):
     except RuntimeError:
         print("RuntimeError", l)
 
+
 # hasattr, setattr, getattr
 class A:
     pass
diff --git a/tests/stress/recursive_gen.py b/tests/stress/recursive_gen.py
index 8c2139765847d..e051abb84d0f5 100644
--- a/tests/stress/recursive_gen.py
+++ b/tests/stress/recursive_gen.py
@@ -1,5 +1,6 @@
 # test deeply recursive generators
 
+
 # simple "yield from" recursion
 def gen():
     yield from gen()
@@ -10,6 +11,7 @@ def gen():
 except RuntimeError:
     print("RuntimeError")
 
+
 # recursion via an iterator over a generator
 def gen2():
     for x in gen2():
diff --git a/tests/thread/mutate_bytearray.py b/tests/thread/mutate_bytearray.py
index 67c01d91cf79f..b4664781a1522 100644
--- a/tests/thread/mutate_bytearray.py
+++ b/tests/thread/mutate_bytearray.py
@@ -7,6 +7,7 @@
 # the shared bytearray
 ba = bytearray()
 
+
 # main thread function
 def th(n, lo, hi):
     for repeat in range(n):
diff --git a/tests/thread/mutate_dict.py b/tests/thread/mutate_dict.py
index 89c93f4eee54a..3777af66248c6 100644
--- a/tests/thread/mutate_dict.py
+++ b/tests/thread/mutate_dict.py
@@ -7,6 +7,7 @@
 # the shared dict
 di = {"a": "A", "b": "B", "c": "C", "d": "D"}
 
+
 # main thread function
 def th(n, lo, hi):
     for repeat in range(n):
diff --git a/tests/thread/mutate_instance.py b/tests/thread/mutate_instance.py
index 939a0b8acd2a4..306ad91c95cfa 100644
--- a/tests/thread/mutate_instance.py
+++ b/tests/thread/mutate_instance.py
@@ -4,6 +4,7 @@
 
 import _thread
 
+
 # the shared user class and instance
 class User:
     def __init__(self):
@@ -14,6 +15,7 @@ def __init__(self):
 
 user = User()
 
+
 # main thread function
 def th(n, lo, hi):
     for repeat in range(n):
diff --git a/tests/thread/mutate_list.py b/tests/thread/mutate_list.py
index c1849e6729b95..6f1e8812541a0 100644
--- a/tests/thread/mutate_list.py
+++ b/tests/thread/mutate_list.py
@@ -7,6 +7,7 @@
 # the shared list
 li = list()
 
+
 # main thread function
 def th(n, lo, hi):
     for repeat in range(n):
diff --git a/tests/thread/mutate_set.py b/tests/thread/mutate_set.py
index 924124611bd7b..2d9a3e0ce9efd 100644
--- a/tests/thread/mutate_set.py
+++ b/tests/thread/mutate_set.py
@@ -7,6 +7,7 @@
 # the shared set
 se = set([-1, -2, -3, -4])
 
+
 # main thread function
 def th(n, lo, hi):
     for repeat in range(n):
diff --git a/tests/thread/stress_aes.py b/tests/thread/stress_aes.py
index ebc84d79b3a87..aaf9f576dd5a5 100644
--- a/tests/thread/stress_aes.py
+++ b/tests/thread/stress_aes.py
@@ -38,6 +38,7 @@
 ))
 # fmt: on
 
+
 # multiplication of polynomials modulo x^8 + x^4 + x^3 + x + 1 = 0x11b
 def aes_gf8_mul_2(x):
     if x & 0x80:
@@ -80,6 +81,7 @@ def aes_r_con(a):
 # using OCB, where the sequence is xored against the plaintext.
 # Care must be taken to (almost) always choose a different IV.
 
+
 # all inputs must be size 16
 def aes_add_round_key(state, w):
     for i in range(16):
diff --git a/tests/thread/thread_qstr1.py b/tests/thread/thread_qstr1.py
index 40ee2910cb624..14f5b6be6649d 100644
--- a/tests/thread/thread_qstr1.py
+++ b/tests/thread/thread_qstr1.py
@@ -8,6 +8,7 @@
     import time
 import _thread
 
+
 # function to check the interned string
 def check(s, val):
     assert type(s) == str
diff --git a/tests/unicode/unicode_id.py b/tests/unicode/unicode_id.py
index 3a58e3f72b5e7..32817287e9d9a 100644
--- a/tests/unicode/unicode_id.py
+++ b/tests/unicode/unicode_id.py
@@ -10,6 +10,7 @@
 βb = 4
 print(α, αβγ, bβ, βb)
 
+
 # function, argument, local identifiers
 def α(β, γ):
     δ = β + γ
@@ -18,6 +19,7 @@ def α(β, γ):
 
 α(1, 2)
 
+
 # class, method identifiers
 class φ:
     def __init__(self):

From 9ea64a36acefd593012eedaa8e52bcd2afc0c736 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 3 Feb 2023 17:09:19 +1100
Subject: [PATCH 3052/3533] top: Update .git-blame-ignore-revs for latest
 formatting commit.

Signed-off-by: Damien George <damien@micropython.org>
---
 .git-blame-ignore-revs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index 0ffa4fcfd952a..7b63f7549d46d 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -1,4 +1,7 @@
-#all: Reformat remaining C code that doesn't have a space after a comma.
+# top: Update Python formatting to black "2023 stable style".
+8b2748269244304854b3462cb8902952b4dcb892
+
+# all: Reformat remaining C code that doesn't have a space after a comma.
 5b700b0af90591d6b1a2c087bb8de6b7f1bfdd2d
 
 # ports: Reformat more C and Python source code.

From 0afe60b876e20684cc0313922a34ee65e7db898a Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 3 Feb 2023 18:04:56 +1100
Subject: [PATCH 3053/3533] rp2/rp2_pio: Track use of PIO resources and free
 them on soft reset.

Prior to this commit, on Pico W (where the CYW43 driver is enabled) the PIO
instruction memory was not released on soft reset, so using PIO after a
soft reset would eventually (after a few soft resets) lead to ENOMEM when
allocating a PIO program.

This commit fixes that by tracking the use of PIO memory by this module and
freeing it on soft reset.

Similarly, use of the state machines themselves are tracked and released on
soft reset.

Fixes issue #9003.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/rp2/rp2_pio.c | 102 ++++++++++++++++++++++++++++++++++++--------
 1 file changed, 85 insertions(+), 17 deletions(-)

diff --git a/ports/rp2/rp2_pio.c b/ports/rp2/rp2_pio.c
index 87deaf7e5f8b2..3ece26bd41c75 100644
--- a/ports/rp2/rp2_pio.c
+++ b/ports/rp2/rp2_pio.c
@@ -68,6 +68,11 @@ typedef struct _rp2_state_machine_irq_obj_t {
 STATIC const rp2_state_machine_obj_t rp2_state_machine_obj[8];
 STATIC uint8_t rp2_state_machine_initial_pc[8];
 
+// These masks keep track of PIO instruction memory used by this module.
+STATIC uint32_t rp2_pio_instruction_memory_usage_mask[2];
+
+STATIC const rp2_state_machine_obj_t *rp2_state_machine_get_object(mp_int_t sm_id);
+STATIC void rp2_state_machine_reset_all(void);
 STATIC mp_obj_t rp2_state_machine_init_helper(const rp2_state_machine_obj_t *self, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args);
 
 STATIC void pio_irq0(PIO pio) {
@@ -101,16 +106,42 @@ STATIC void pio1_irq0(void) {
     pio_irq0(pio1);
 }
 
-void rp2_pio_init(void) {
-    // Reset all PIO instruction memory.
-    #if MICROPY_PY_NETWORK_CYW43
-    // TODO: cannot reset PIO memory when CYW43 driver is enabled and active
-    // because it uses a PIO for the bus interface.
-    #else
-    pio_clear_instruction_memory(pio0);
-    pio_clear_instruction_memory(pio1);
-    #endif
+// Calls pio_add_program() and keeps track of used instruction memory.
+STATIC uint rp2_pio_add_managed_program(PIO pio, struct pio_program *pio_program) {
+    uint offset = pio_add_program(pio, pio_program);
+    uint32_t mask = ((1 << pio_program->length) - 1) << offset;
+    rp2_pio_instruction_memory_usage_mask[pio_get_index(pio)] |= mask;
+    return offset;
+}
+
+// Calls pio_remove_program() and keeps track of used instruction memory.
+STATIC void rp2_pio_remove_managed_program(PIO pio, struct pio_program *pio_program, uint offset) {
+    pio_remove_program(pio, pio_program, offset);
+    uint32_t mask = ((1 << pio_program->length) - 1) << offset;
+    rp2_pio_instruction_memory_usage_mask[pio_get_index(pio)] &= ~mask;
+}
+
+// Calls pio_remove_program() for all programs registered with rp2_pio_add_managed_program(),
+// that weren't already removed via rp2_pio_remove_managed_program().
+STATIC void rp2_pio_remove_all_managed_programs(PIO pio) {
+    uint32_t mask = rp2_pio_instruction_memory_usage_mask[pio_get_index(pio)];
+    for (size_t i = 0; i < 32; ++i) {
+        if (mask & (1 << i)) {
+            size_t j;
+            for (j = i + 1; j < 32; ++j) {
+                if (!(mask & (1 << j))) {
+                    break;
+                }
+            }
+            struct pio_program pio_program = { NULL, j - i, -1 };
+            pio_remove_program(pio, &pio_program, i);
+            i = j; // i indexes an unused bit, or is 32
+        }
+    }
+    rp2_pio_instruction_memory_usage_mask[pio_get_index(pio)] = 0;
+}
 
+void rp2_pio_init(void) {
     // Set up interrupts.
     memset(MP_STATE_PORT(rp2_pio_irq_obj), 0, sizeof(MP_STATE_PORT(rp2_pio_irq_obj)));
     memset(MP_STATE_PORT(rp2_state_machine_irq_obj), 0, sizeof(MP_STATE_PORT(rp2_state_machine_irq_obj)));
@@ -123,6 +154,14 @@ void rp2_pio_deinit(void) {
     irq_set_mask_enabled((1u << PIO0_IRQ_0) | (1u << PIO0_IRQ_1), false);
     irq_remove_handler(PIO0_IRQ_0, pio0_irq0);
     irq_remove_handler(PIO1_IRQ_0, pio1_irq0);
+
+    rp2_state_machine_reset_all();
+
+    // Reset all PIO instruction memory allocated by this module.
+    // Note: other subsystems (eg the CYW43 driver) may use the PIO,
+    // and their PIO programs should remain intact.
+    rp2_pio_remove_all_managed_programs(pio0);
+    rp2_pio_remove_all_managed_programs(pio1);
 }
 
 /******************************************************************************/
@@ -238,7 +277,7 @@ STATIC mp_obj_t rp2_pio_add_program(mp_obj_t self_in, mp_obj_t prog_in) {
     if (!pio_can_add_program(self->pio, &pio_program)) {
         mp_raise_OSError(MP_ENOMEM);
     }
-    uint offset = pio_add_program(self->pio, &pio_program);
+    uint offset = rp2_pio_add_managed_program(self->pio, &pio_program);
 
     // Store the program offset in the program object.
     prog[PROG_OFFSET_PIO0 + PIO_NUM(self->pio)] = MP_OBJ_NEW_SMALL_INT(offset);
@@ -272,7 +311,7 @@ STATIC mp_obj_t rp2_pio_remove_program(size_t n_args, const mp_obj_t *args) {
 
     // Remove the program from the instruction memory.
     struct pio_program pio_program = { NULL, length, -1 };
-    pio_remove_program(self->pio, &pio_program, offset);
+    rp2_pio_remove_managed_program(self->pio, &pio_program, offset);
 
     return mp_const_none;
 }
@@ -285,11 +324,11 @@ STATIC mp_obj_t rp2_pio_state_machine(size_t n_args, const mp_obj_t *pos_args, m
     // Get and verify the state machine id.
     mp_int_t sm_id = mp_obj_get_int(pos_args[1]);
     if (!(0 <= sm_id && sm_id < 4)) {
-        mp_raise_ValueError("invalide state machine");
+        mp_raise_ValueError("invalid StateMachine");
     }
 
     // Return the correct StateMachine object.
-    const rp2_state_machine_obj_t *sm = &rp2_state_machine_obj[(self->pio == pio0 ? 0 : 4) + sm_id];
+    const rp2_state_machine_obj_t *sm = rp2_state_machine_get_object((self->pio == pio0 ? 0 : 4) + sm_id);
 
     if (n_args > 2 || kw_args->used > 0) {
         // Configuration arguments given so init this StateMachine.
@@ -414,6 +453,9 @@ STATIC const mp_irq_methods_t rp2_pio_irq_methods = {
 /******************************************************************************/
 // StateMachine object
 
+// This mask keeps track of state machines claimed by this module.
+STATIC uint32_t rp2_state_machine_claimed_mask;
+
 STATIC const mp_irq_methods_t rp2_state_machine_irq_methods;
 
 STATIC const rp2_state_machine_obj_t rp2_state_machine_obj[] = {
@@ -427,6 +469,35 @@ STATIC const rp2_state_machine_obj_t rp2_state_machine_obj[] = {
     { { &rp2_state_machine_type }, pio1, PIO1_IRQ_0, 3, 7 },
 };
 
+STATIC const rp2_state_machine_obj_t *rp2_state_machine_get_object(mp_int_t sm_id) {
+    if (!(0 <= sm_id && sm_id < MP_ARRAY_SIZE(rp2_state_machine_obj))) {
+        mp_raise_ValueError("invalid StateMachine");
+    }
+
+    const rp2_state_machine_obj_t *sm_obj = &rp2_state_machine_obj[sm_id];
+
+    if (!(rp2_state_machine_claimed_mask & (1 << sm_id))) {
+        if (pio_sm_is_claimed(sm_obj->pio, sm_obj->sm)) {
+            mp_raise_ValueError("StateMachine claimed by external resource");
+        }
+        pio_sm_claim(sm_obj->pio, sm_obj->sm);
+        rp2_state_machine_claimed_mask |= 1 << sm_id;
+    }
+
+    return sm_obj;
+}
+
+STATIC void rp2_state_machine_reset_all(void) {
+    for (size_t i = 0; i < MP_ARRAY_SIZE(rp2_state_machine_obj); ++i) {
+        if (rp2_state_machine_claimed_mask & (1 << i)) {
+            const rp2_state_machine_obj_t *sm_obj = &rp2_state_machine_obj[i];
+            pio_sm_unclaim(sm_obj->pio, sm_obj->sm);
+            pio_sm_set_enabled(sm_obj->pio, sm_obj->sm, false);
+        }
+    }
+    rp2_state_machine_claimed_mask = 0;
+}
+
 STATIC void rp2_state_machine_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     rp2_state_machine_obj_t *self = MP_OBJ_TO_PTR(self_in);
     mp_printf(print, "StateMachine(%u)", self->id);
@@ -573,10 +644,7 @@ STATIC mp_obj_t rp2_state_machine_make_new(const mp_obj_type_t *type, size_t n_a
 
     // Get the StateMachine object.
     mp_int_t sm_id = mp_obj_get_int(args[0]);
-    if (!(0 <= sm_id && sm_id < MP_ARRAY_SIZE(rp2_state_machine_obj))) {
-        mp_raise_ValueError("invalid StateMachine");
-    }
-    const rp2_state_machine_obj_t *self = &rp2_state_machine_obj[sm_id];
+    const rp2_state_machine_obj_t *self = rp2_state_machine_get_object(sm_id);
 
     if (n_args > 1 || n_kw > 0) {
         // Configuration arguments given so init this StateMachine.

From 35524a6fda1e44692ad599a39c802c168c897de9 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 7 Feb 2023 15:03:14 +1100
Subject: [PATCH 3054/3533] examples/rp2: Add comment that examples using IO25
 don't work on Pico W.

Signed-off-by: Damien George <damien@micropython.org>
---
 examples/rp2/pio_1hz.py  | 1 +
 examples/rp2/pio_exec.py | 1 +
 examples/rp2/pwm_fade.py | 1 +
 3 files changed, 3 insertions(+)

diff --git a/examples/rp2/pio_1hz.py b/examples/rp2/pio_1hz.py
index 4b6fe95bbdcf3..84d761fa1434e 100644
--- a/examples/rp2/pio_1hz.py
+++ b/examples/rp2/pio_1hz.py
@@ -1,4 +1,5 @@
 # Example using PIO to blink an LED and raise an IRQ at 1Hz.
+# Note: this does not work on Pico W because it uses Pin(25) for LED output.
 
 import time
 from machine import Pin
diff --git a/examples/rp2/pio_exec.py b/examples/rp2/pio_exec.py
index 86018a93a8074..ce39f2df84306 100644
--- a/examples/rp2/pio_exec.py
+++ b/examples/rp2/pio_exec.py
@@ -1,4 +1,5 @@
 # Example using PIO to turn on an LED via an explicit exec.
+# Note: this does not work on Pico W because it uses Pin(25) for LED output.
 #
 # Demonstrates:
 #   - using set_init and set_base
diff --git a/examples/rp2/pwm_fade.py b/examples/rp2/pwm_fade.py
index 7264edaa293a1..5b7089c6b1add 100644
--- a/examples/rp2/pwm_fade.py
+++ b/examples/rp2/pwm_fade.py
@@ -1,4 +1,5 @@
 # Example using PWM to fade an LED.
+# Note: this does not work on Pico W because it uses Pin(25) for LED output.
 
 import time
 from machine import Pin, PWM

From 9848b0685f3f24ec9fa7f179a1575b8a76565073 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Wed, 8 Feb 2023 12:24:12 +1100
Subject: [PATCH 3055/3533] py/mkrules.cmake: Force build mpversion.h and
 frozen_content.c.

This ensures that all builds unconditionally run makeversionhdr.py and
makemanifest.py to generate mpversion.h and frozen_content.c respectively.
This now matches the Makefile behavior, and in particular this fixes the
issue on ESP32 builds that changes in code-to-be-frozen will cause the
build to update. Both these already tools know not to touch their output
if there is no change.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 py/mkrules.cmake | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/py/mkrules.cmake b/py/mkrules.cmake
index 38bad80fdb9aa..7eb5fcf01837c 100644
--- a/py/mkrules.cmake
+++ b/py/mkrules.cmake
@@ -54,19 +54,13 @@ target_sources(${MICROPY_TARGET} PRIVATE
 
 # Command to force the build of another command
 
-add_custom_command(
-    OUTPUT MICROPY_FORCE_BUILD
-    COMMENT ""
-    COMMAND echo -n
-)
-
 # Generate mpversion.h
 
-add_custom_command(
-    OUTPUT ${MICROPY_MPVERSION}
+add_custom_target(
+    BUILD_VERSION_HEADER ALL
+    BYPRODUCTS ${MICROPY_MPVERSION}
     COMMAND ${CMAKE_COMMAND} -E make_directory ${MICROPY_GENHDR_DIR}
     COMMAND ${Python3_EXECUTABLE} ${MICROPY_DIR}/py/makeversionhdr.py ${MICROPY_MPVERSION}
-    DEPENDS MICROPY_FORCE_BUILD
 )
 
 # Generate qstrs
@@ -203,10 +197,11 @@ if(MICROPY_FROZEN_MANIFEST)
         )
     endif()
 
-    add_custom_command(
-        OUTPUT ${MICROPY_FROZEN_CONTENT}
+    add_custom_target(
+        BUILD_FROZEN_CONTENT ALL
+        BYPRODUCTS ${MICROPY_FROZEN_CONTENT}
         COMMAND ${Python3_EXECUTABLE} ${MICROPY_DIR}/tools/makemanifest.py -o ${MICROPY_FROZEN_CONTENT} -v "MPY_DIR=${MICROPY_DIR}" -v "MPY_LIB_DIR=${MICROPY_LIB_DIR}" -v "PORT_DIR=${MICROPY_PORT_DIR}" -v "BOARD_DIR=${MICROPY_BOARD_DIR}" -b "${CMAKE_BINARY_DIR}" -f${MICROPY_CROSS_FLAGS} --mpy-tool-flags=${MICROPY_MPY_TOOL_FLAGS} ${MICROPY_FROZEN_MANIFEST}
-        DEPENDS MICROPY_FORCE_BUILD
+        DEPENDS
             ${MICROPY_QSTRDEFS_GENERATED}
             ${MICROPY_ROOT_POINTERS}
             ${MICROPY_MPYCROSS_DEPENDENCY}

From 5c3c1c737e3f6b31f2a7fdaef219a5cd32e52f6d Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 9 Feb 2023 15:19:32 +1100
Subject: [PATCH 3056/3533] tests/float: Skip new complex tests if complex
 unavailable.

These complex tests were recently added.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/float/cmath_dunder.py | 2 +-
 tests/run-tests.py          | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/float/cmath_dunder.py b/tests/float/cmath_dunder.py
index 3526341510e91..909894d9f8504 100644
--- a/tests/float/cmath_dunder.py
+++ b/tests/float/cmath_dunder.py
@@ -14,7 +14,7 @@ def __float__(self):
 
 class TestComplex:
     def __complex__(self):
-        return 1j + 10
+        return complex(10, 1)
 
 
 for clas in TestFloat, TestComplex:
diff --git a/tests/run-tests.py b/tests/run-tests.py
index e548059b1cea0..03269a9f1ce3c 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -532,6 +532,7 @@ def run_tests(pyb, tests, args, result_dir, num_threads=1):
     if not has_complex:
         skip_tests.add("float/complex1.py")
         skip_tests.add("float/complex1_intbig.py")
+        skip_tests.add("float/complex_reverse_op.py")
         skip_tests.add("float/complex_special_methods.py")
         skip_tests.add("float/int_big_float.py")
         skip_tests.add("float/true_value.py")

From b1123a54c1021ac40c1a809dc41681aa7b307bc9 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 9 Feb 2023 15:20:25 +1100
Subject: [PATCH 3057/3533] tests/extmod: Get DecompIO test running on
 low-memory targets.

By changing the zlib header so that it uses a small (256 byte) window.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/extmod/uzlib_decompio.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/extmod/uzlib_decompio.py b/tests/extmod/uzlib_decompio.py
index 6a0aae8bcdf63..fae901aad0a48 100644
--- a/tests/extmod/uzlib_decompio.py
+++ b/tests/extmod/uzlib_decompio.py
@@ -20,13 +20,13 @@
 print(buf.seek(0, 1))
 
 
-# zlib bitstream
-inp = zlib.DecompIO(io.BytesIO(b"x\x9c30\xa0=\x00\x00\xb3q\x12\xc1"))
+# zlib bitstream (with 256 byte window size)
+inp = zlib.DecompIO(io.BytesIO(b"\x08\x9930\xa0=\x00\x00\xb3q\x12\xc1"))
 print(inp.read(10))
 print(inp.read())
 
 # zlib bitstream, wrong checksum
-inp = zlib.DecompIO(io.BytesIO(b"x\x9c30\xa0=\x00\x00\xb3q\x12\xc0"))
+inp = zlib.DecompIO(io.BytesIO(b"\x08\x9930\xa0=\x00\x00\xb3q\x12\xc0"))
 try:
     print(inp.read())
 except OSError as e:

From d99ebb310c1d6cdc87f3fa9a913149d1cd9c474a Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 9 Feb 2023 15:21:57 +1100
Subject: [PATCH 3058/3533] tests/extmod: Skip vfs tests if target doesn't have
 enough memory.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/extmod/vfs_fat_fileio1.py      | 2 +-
 tests/extmod/vfs_fat_fileio2.py      | 2 +-
 tests/extmod/vfs_fat_ilistdir_del.py | 7 ++++++-
 tests/extmod/vfs_fat_ramdisk.py      | 3 +--
 tests/extmod/vfs_lfs_mtime.py        | 7 ++++++-
 5 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/tests/extmod/vfs_fat_fileio1.py b/tests/extmod/vfs_fat_fileio1.py
index c7ff9e0b98021..55f399ff2ea85 100644
--- a/tests/extmod/vfs_fat_fileio1.py
+++ b/tests/extmod/vfs_fat_fileio1.py
@@ -38,11 +38,11 @@ def ioctl(self, op, arg):
 
 try:
     bdev = RAMFS(50)
+    uos.VfsFat.mkfs(bdev)
 except MemoryError:
     print("SKIP")
     raise SystemExit
 
-uos.VfsFat.mkfs(bdev)
 vfs = uos.VfsFat(bdev)
 uos.mount(vfs, "/ramdisk")
 uos.chdir("/ramdisk")
diff --git a/tests/extmod/vfs_fat_fileio2.py b/tests/extmod/vfs_fat_fileio2.py
index c7bdceb3dfa9f..9429f115f626c 100644
--- a/tests/extmod/vfs_fat_fileio2.py
+++ b/tests/extmod/vfs_fat_fileio2.py
@@ -38,11 +38,11 @@ def ioctl(self, op, arg):
 
 try:
     bdev = RAMFS(50)
+    uos.VfsFat.mkfs(bdev)
 except MemoryError:
     print("SKIP")
     raise SystemExit
 
-uos.VfsFat.mkfs(bdev)
 vfs = uos.VfsFat(bdev)
 uos.mount(vfs, "/ramdisk")
 uos.chdir("/ramdisk")
diff --git a/tests/extmod/vfs_fat_ilistdir_del.py b/tests/extmod/vfs_fat_ilistdir_del.py
index a833e9ac128c5..4389f822bb6fa 100644
--- a/tests/extmod/vfs_fat_ilistdir_del.py
+++ b/tests/extmod/vfs_fat_ilistdir_del.py
@@ -71,5 +71,10 @@ def test(bdev, vfs_class):
         vfs.open("/test", "w").close()
 
 
-bdev = RAMBlockDevice(30)
+try:
+    bdev = RAMBlockDevice(30)
+except MemoryError:
+    print("SKIP")
+    raise SystemExit
+
 test(bdev, uos.VfsFat)
diff --git a/tests/extmod/vfs_fat_ramdisk.py b/tests/extmod/vfs_fat_ramdisk.py
index 0d58cec15332a..01235bc26647f 100644
--- a/tests/extmod/vfs_fat_ramdisk.py
+++ b/tests/extmod/vfs_fat_ramdisk.py
@@ -38,12 +38,11 @@ def ioctl(self, op, arg):
 
 try:
     bdev = RAMFS(50)
+    uos.VfsFat.mkfs(bdev)
 except MemoryError:
     print("SKIP")
     raise SystemExit
 
-uos.VfsFat.mkfs(bdev)
-
 print(b"FOO_FILETXT" not in bdev.data)
 print(b"hello!" not in bdev.data)
 
diff --git a/tests/extmod/vfs_lfs_mtime.py b/tests/extmod/vfs_lfs_mtime.py
index bacdd2246c6d6..a67e48dd80dde 100644
--- a/tests/extmod/vfs_lfs_mtime.py
+++ b/tests/extmod/vfs_lfs_mtime.py
@@ -101,5 +101,10 @@ def test(bdev, vfs_class):
     vfs.umount()
 
 
-bdev = RAMBlockDevice(30)
+try:
+    bdev = RAMBlockDevice(30)
+except MemoryError:
+    print("SKIP")
+    raise SystemExit
+
 test(bdev, uos.VfsLfs2)

From 41ed01f1394ea608bf9d055120d671e2765cd9b7 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 9 Feb 2023 15:32:15 +1100
Subject: [PATCH 3059/3533] tests/micropython: Split viper_misc test into two
 files.

So it can run on targets with low memory, eg esp8266.

Also enable the viper_4args() sub-test, which is now supported.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/micropython/viper_misc.py      | 98 +---------------------------
 tests/micropython/viper_misc.py.exp  | 11 +---
 tests/micropython/viper_misc3.py     | 96 +++++++++++++++++++++++++++
 tests/micropython/viper_misc3.py.exp | 10 +++
 4 files changed, 110 insertions(+), 105 deletions(-)
 create mode 100644 tests/micropython/viper_misc3.py
 create mode 100644 tests/micropython/viper_misc3.py.exp

diff --git a/tests/micropython/viper_misc.py b/tests/micropython/viper_misc.py
index f9267f65cab8c..2659032df6679 100644
--- a/tests/micropython/viper_misc.py
+++ b/tests/micropython/viper_misc.py
@@ -1,3 +1,5 @@
+# Miscellaneous viper tests.
+
 import micropython
 
 
@@ -52,8 +54,7 @@ def viper_4args(a: int, b: int, c: int, d: int) -> int:
     return a + b + c + d
 
 
-# viper call with 4 args not yet supported
-# print(viper_4args(1, 2, 3, 4))
+print(viper_4args(1, 2, 3, 4))
 
 
 # a local (should have automatic type int)
@@ -73,96 +74,3 @@ def viper_no_annotation(x, y):
 
 
 print(viper_no_annotation(4, 5))
-
-
-# a for loop
-@micropython.viper
-def viper_for(a: int, b: int) -> int:
-    total = 0
-    for x in range(a, b):
-        total += x
-    return total
-
-
-print(viper_for(10, 10000))
-
-
-# accessing a global
-@micropython.viper
-def viper_access_global():
-    global gl
-    gl = 1
-    return gl
-
-
-print(viper_access_global(), gl)
-
-
-# calling print with object and int types
-@micropython.viper
-def viper_print(x, y: int):
-    print(x, y + 1)
-
-
-viper_print(1, 2)
-
-
-# convert constants to objects in tuple
-@micropython.viper
-def viper_tuple_consts(x):
-    return (x, 1, False, True)
-
-
-print(viper_tuple_consts(0))
-
-
-# making a tuple from an object and an int
-@micropython.viper
-def viper_tuple(x, y: int):
-    return (x, y + 1)
-
-
-print(viper_tuple(1, 2))
-
-
-# making a list from an object and an int
-@micropython.viper
-def viper_list(x, y: int):
-    return [x, y + 1]
-
-
-print(viper_list(1, 2))
-
-
-# making a set from an object and an int
-@micropython.viper
-def viper_set(x, y: int):
-    return {x, y + 1}
-
-
-print(sorted(list(viper_set(1, 2))))
-
-
-# raising an exception
-@micropython.viper
-def viper_raise(x: int):
-    raise OSError(x)
-
-
-try:
-    viper_raise(1)
-except OSError as e:
-    print(repr(e))
-
-
-# calling GC after defining the function
-@micropython.viper
-def viper_gc() -> int:
-    return 1
-
-
-print(viper_gc())
-import gc
-
-gc.collect()
-print(viper_gc())
diff --git a/tests/micropython/viper_misc.py.exp b/tests/micropython/viper_misc.py.exp
index e4462771b457b..922ceb9fef9b4 100644
--- a/tests/micropython/viper_misc.py.exp
+++ b/tests/micropython/viper_misc.py.exp
@@ -3,15 +3,6 @@
 0
 Ellipsis
 6
+10
 7
 20
-49994955
-1 1
-1 3
-(0, 1, False, True)
-(1, 3)
-[1, 3]
-[1, 3]
-OSError(1,)
-1
-1
diff --git a/tests/micropython/viper_misc3.py b/tests/micropython/viper_misc3.py
new file mode 100644
index 0000000000000..7b211e5dd8c7d
--- /dev/null
+++ b/tests/micropython/viper_misc3.py
@@ -0,0 +1,96 @@
+# Miscellaneous viper tests.
+
+import micropython
+
+
+# a for loop
+@micropython.viper
+def viper_for(a: int, b: int) -> int:
+    total = 0
+    for x in range(a, b):
+        total += x
+    return total
+
+
+print(viper_for(10, 10000))
+
+
+# accessing a global
+@micropython.viper
+def viper_access_global():
+    global gl
+    gl = 1
+    return gl
+
+
+print(viper_access_global(), gl)
+
+
+# calling print with object and int types
+@micropython.viper
+def viper_print(x, y: int):
+    print(x, y + 1)
+
+
+viper_print(1, 2)
+
+
+# convert constants to objects in tuple
+@micropython.viper
+def viper_tuple_consts(x):
+    return (x, 1, False, True)
+
+
+print(viper_tuple_consts(0))
+
+
+# making a tuple from an object and an int
+@micropython.viper
+def viper_tuple(x, y: int):
+    return (x, y + 1)
+
+
+print(viper_tuple(1, 2))
+
+
+# making a list from an object and an int
+@micropython.viper
+def viper_list(x, y: int):
+    return [x, y + 1]
+
+
+print(viper_list(1, 2))
+
+
+# making a set from an object and an int
+@micropython.viper
+def viper_set(x, y: int):
+    return {x, y + 1}
+
+
+print(sorted(list(viper_set(1, 2))))
+
+
+# raising an exception
+@micropython.viper
+def viper_raise(x: int):
+    raise OSError(x)
+
+
+try:
+    viper_raise(1)
+except OSError as e:
+    print(repr(e))
+
+
+# calling GC after defining the function
+@micropython.viper
+def viper_gc() -> int:
+    return 1
+
+
+print(viper_gc())
+import gc
+
+gc.collect()
+print(viper_gc())
diff --git a/tests/micropython/viper_misc3.py.exp b/tests/micropython/viper_misc3.py.exp
new file mode 100644
index 0000000000000..b12807b2f3217
--- /dev/null
+++ b/tests/micropython/viper_misc3.py.exp
@@ -0,0 +1,10 @@
+49994955
+1 1
+1 3
+(0, 1, False, True)
+(1, 3)
+[1, 3]
+[1, 3]
+OSError(1,)
+1
+1

From e1f211c6b503a0ad8246b289447e9985e629601c Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 15 Feb 2023 14:14:49 +1100
Subject: [PATCH 3060/3533] examples/bluetooth: Fix check for _conn_handle
 being None.

Fixes issue #10755.

Signed-off-by: Damien George <damien@micropython.org>
---
 examples/bluetooth/ble_simple_central.py      | 2 +-
 examples/bluetooth/ble_temperature_central.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/examples/bluetooth/ble_simple_central.py b/examples/bluetooth/ble_simple_central.py
index a6bbdc6ee0795..3c0cf2a0d49ea 100644
--- a/examples/bluetooth/ble_simple_central.py
+++ b/examples/bluetooth/ble_simple_central.py
@@ -179,7 +179,7 @@ def connect(self, addr_type=None, addr=None, callback=None):
 
     # Disconnect from current device.
     def disconnect(self):
-        if not self._conn_handle:
+        if self._conn_handle is None:
             return
         self._ble.gap_disconnect(self._conn_handle)
         self._reset()
diff --git a/examples/bluetooth/ble_temperature_central.py b/examples/bluetooth/ble_temperature_central.py
index 96c4aad1445a1..80e3c3fb30857 100644
--- a/examples/bluetooth/ble_temperature_central.py
+++ b/examples/bluetooth/ble_temperature_central.py
@@ -196,7 +196,7 @@ def connect(self, addr_type=None, addr=None, callback=None):
 
     # Disconnect from current device.
     def disconnect(self):
-        if not self._conn_handle:
+        if self._conn_handle is None:
             return
         self._ble.gap_disconnect(self._conn_handle)
         self._reset()

From fe330c74f430a006cb54fff250ed22d7038fb6d0 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Wed, 15 Feb 2023 14:16:31 +1100
Subject: [PATCH 3061/3533] extmod/utime_mphal: Fix comment re delta range
 check in time_ticks_add.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/utime_mphal.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extmod/utime_mphal.c b/extmod/utime_mphal.c
index cd91c95530cba..9cd5d938d0f9a 100644
--- a/extmod/utime_mphal.c
+++ b/extmod/utime_mphal.c
@@ -103,7 +103,7 @@ STATIC mp_obj_t time_ticks_add(mp_obj_t ticks_in, mp_obj_t delta_in) {
     // The latter requires excluding delta=-TICKS_PERIOD/2.
     //
     // This unsigned comparison is equivalent to a signed comparison of:
-    //   delta <= TICKS_PERIOD/2 || delta >= TICKS_PERIOD/2
+    //   delta <= -TICKS_PERIOD/2 || delta >= TICKS_PERIOD/2
     if (delta + MICROPY_PY_UTIME_TICKS_PERIOD / 2 - 1 >= MICROPY_PY_UTIME_TICKS_PERIOD - 1) {
         mp_raise_msg(&mp_type_OverflowError, MP_ERROR_TEXT("ticks interval overflow"));
     }

From 799d88818232a1c73095e848c116170d7db1852e Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 16 Feb 2023 10:26:33 +1100
Subject: [PATCH 3062/3533] tests/float: Add domain checks for log and also
 -inf.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/float/math_domain.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tests/float/math_domain.py b/tests/float/math_domain.py
index 0c25dc08b6649..d4c45fa3b7b1e 100644
--- a/tests/float/math_domain.py
+++ b/tests/float/math_domain.py
@@ -17,6 +17,7 @@
     ("trunc", math.trunc, ()),
     ("sqrt", math.sqrt, (-1, 0)),
     ("exp", math.exp, ()),
+    ("log", math.log, ()),
     ("sin", math.sin, ()),
     ("cos", math.cos, ()),
     ("tan", math.tan, ()),
@@ -27,7 +28,7 @@
     ("radians", math.radians, ()),
     ("degrees", math.degrees, ()),
 ):
-    for x in args + (inf, nan):
+    for x in args + (inf, -inf, nan):
         try:
             ans = f(x)
             print("%.4f" % ans)
@@ -39,6 +40,7 @@
 # double argument functions
 for name, f, args in (
     ("pow", math.pow, ((0, 2), (-1, 2), (0, -1), (-1, 2.3), (nan, 0), (1, nan))),
+    ("log", math.log, ()),
     ("fmod", math.fmod, ((1.2, inf), (1.2, -inf), (1.2, 0), (inf, 1.2))),
     ("atan2", math.atan2, ((0, 0), (-inf, inf), (-inf, -inf), (inf, -inf))),
     ("copysign", math.copysign, ()),

From 177ae2f346b840f6e10dffc41e9cd1e47c9c9c1b Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 16 Feb 2023 10:27:10 +1100
Subject: [PATCH 3063/3533] tests/float: Make output of math function tests
 more readable.

By explicitly naming the function, its arguments, and result.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/float/math_domain.py         | 14 +++++++-------
 tests/float/math_domain_special.py |  8 ++++----
 tests/float/math_fun.py            | 15 +++++++--------
 tests/float/math_fun_special.py    |  6 +++---
 4 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/tests/float/math_domain.py b/tests/float/math_domain.py
index d4c45fa3b7b1e..063d509b5935d 100644
--- a/tests/float/math_domain.py
+++ b/tests/float/math_domain.py
@@ -30,12 +30,12 @@
 ):
     for x in args + (inf, -inf, nan):
         try:
-            ans = f(x)
-            print("%.4f" % ans)
+            ans = "%.4f" % f(x)
         except ValueError:
-            print(name, "ValueError")
+            ans = "ValueError"
         except OverflowError:
-            print(name, "OverflowError")
+            ans = "OverflowError"
+        print("%s(%.4f) = %s" % (name, x, ans))
 
 # double argument functions
 for name, f, args in (
@@ -47,7 +47,7 @@
 ):
     for x in args + ((0, inf), (inf, 0), (inf, inf), (inf, nan), (nan, inf), (nan, nan)):
         try:
-            ans = f(*x)
-            print("%.4f" % ans)
+            ans = "%.4f" % f(*x)
         except ValueError:
-            print(name, "ValueError")
+            ans = "ValueError"
+        print("%s(%.4f, %.4f) = %s" % (name, x[0], x[1], ans))
diff --git a/tests/float/math_domain_special.py b/tests/float/math_domain_special.py
index 880594dce28ed..ddabf178a344e 100644
--- a/tests/float/math_domain_special.py
+++ b/tests/float/math_domain_special.py
@@ -29,9 +29,9 @@
 ):
     for x in args + (inf, -inf, nan):
         try:
-            ans = f(x)
-            print("%.4f" % ans)
+            ans = "%.4f" % f(x)
         except ValueError:
-            print(name, "ValueError")
+            ans = "ValueError"
         except OverflowError:
-            print(name, "OverflowError")
+            ans = "OverflowError"
+        print("%s(%.4f) = %s" % (name, x, ans))
diff --git a/tests/float/math_fun.py b/tests/float/math_fun.py
index 0d443a4754521..789158c0e2b66 100644
--- a/tests/float/math_fun.py
+++ b/tests/float/math_fun.py
@@ -38,12 +38,12 @@
 ]
 
 for function_name, function, test_vals in functions:
-    print(function_name)
     for value in test_vals:
         try:
-            print("{:.5g}".format(function(value)))
+            ans = "{:.5g}".format(function(value))
         except ValueError as e:
-            print(str(e))
+            ans = str(e)
+        print("{}({:.5g}) = {}".format(function_name, value, ans))
 
 tuple_functions = [
     ("frexp", frexp, test_values),
@@ -51,10 +51,9 @@
 ]
 
 for function_name, function, test_vals in tuple_functions:
-    print(function_name)
     for value in test_vals:
         x, y = function(value)
-        print("{:.5g} {:.5g}".format(x, y))
+        print("{}({:.5g}) = ({:.5g}, {:.5g})".format(function_name, value, x, y))
 
 binary_functions = [
     (
@@ -83,9 +82,9 @@
 ]
 
 for function_name, function, test_vals in binary_functions:
-    print(function_name)
     for value1, value2 in test_vals:
         try:
-            print("{:.5g}".format(function(value1, value2)))
+            ans = "{:.5g}".format(function(value1, value2))
         except (ValueError, ZeroDivisionError) as e:
-            print(type(e))
+            ans = type(e)
+        print("{}({:.5g}, {:.5g}) = {}".format(function_name, value1, value2, ans))
diff --git a/tests/float/math_fun_special.py b/tests/float/math_fun_special.py
index 614470c0f15dd..e674ec8dfd0df 100644
--- a/tests/float/math_fun_special.py
+++ b/tests/float/math_fun_special.py
@@ -44,9 +44,9 @@
 ]
 
 for function_name, function, test_vals in functions:
-    print(function_name)
     for value in test_vals:
         try:
-            print("{:.4g}".format(function(value)))
+            ans = "{:.4g}".format(function(value))
         except ValueError as e:
-            print(str(e))
+            ans = str(e)
+        print("{}({:.4g}) = {}".format(function_name, value, ans))

From 75e7e7d034cff8e73070faa2d7b5df88d3367ae1 Mon Sep 17 00:00:00 2001
From: Andrew Leech <andrew.leech@planetinnovation.com.au>
Date: Fri, 19 Aug 2022 13:49:03 +1000
Subject: [PATCH 3064/3533] stm32/boards/STM32F769DISC: Fix building with
 USE_QSPI_XIP=1.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/boards/STM32F769DISC/board_init.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ports/stm32/boards/STM32F769DISC/board_init.c b/ports/stm32/boards/STM32F769DISC/board_init.c
index 6bb3dfb1f6178..e89d187fece7a 100644
--- a/ports/stm32/boards/STM32F769DISC/board_init.c
+++ b/ports/stm32/boards/STM32F769DISC/board_init.c
@@ -3,13 +3,17 @@
 
 // This configuration is needed for mboot to be able to write to the external QSPI flash
 
+#if MICROPY_HW_SPIFLASH_ENABLE_CACHE
 STATIC mp_spiflash_cache_t spi_bdev_cache;
+#endif
 
 const mp_spiflash_config_t spiflash_config = {
     .bus_kind = MP_SPIFLASH_BUS_QSPI,
     .bus.u_qspi.data = NULL,
     .bus.u_qspi.proto = &qspi_proto,
+    #if MICROPY_HW_SPIFLASH_ENABLE_CACHE
     .cache = &spi_bdev_cache,
+    #endif
 };
 
 spi_bdev_t spi_bdev;

From e140c7d26ae1fbd0878012efd4f48c7b638296e2 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Tue, 14 Feb 2023 10:31:26 +0100
Subject: [PATCH 3065/3533] stm32/boards/ARDUINO_PORTENTA_H7: Fix macro value
 check for QSPI.

QSPI deepsleep should be enabled only when the internal flash storage is
not used.
---
 ports/stm32/boards/ARDUINO_PORTENTA_H7/board_init.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/stm32/boards/ARDUINO_PORTENTA_H7/board_init.c b/ports/stm32/boards/ARDUINO_PORTENTA_H7/board_init.c
index 30b9e487601d8..39f7828773130 100644
--- a/ports/stm32/boards/ARDUINO_PORTENTA_H7/board_init.c
+++ b/ports/stm32/boards/ARDUINO_PORTENTA_H7/board_init.c
@@ -162,7 +162,7 @@ void PORTENTA_board_low_power(int mode) {
             break;
     }
 
-    #if MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE
+    #if !MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE
     // Enable QSPI deepsleep for modes 1 and 2
     mp_spiflash_deepsleep(&spi_bdev.spiflash, (mode != 0));
     #endif

From 5812611ab2adbe14af94d0c316879698cf3b4d8b Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Thu, 16 Feb 2023 11:04:18 +1100
Subject: [PATCH 3066/3533] rp2/boards/ARDUINO_NANO_RP2040_CONNECT: Use default
 aioble.

The default now includes all sub-components (security, l2cap, etc)
and using the kwarg options is no longer supported.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/manifest.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/manifest.py b/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/manifest.py
index 2fed2b1921c81..e0a8bc88326de 100644
--- a/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/manifest.py
+++ b/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/manifest.py
@@ -11,4 +11,4 @@
 require("logging")
 
 # Bluetooth
-require("aioble", client=True, central=True, l2cap=True, security=True)
+require("aioble")

From 4eb72b34dfb25160ff93415cc0ae1779d3bb5a76 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Thu, 16 Feb 2023 11:04:33 +1100
Subject: [PATCH 3067/3533] stm32/boards/ARDUINO_PORTENTA_H7: Use default
 aioble.

The default now includes all sub-components (security, l2cap, etc)
and using the kwarg options is no longer supported.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/stm32/boards/ARDUINO_PORTENTA_H7/manifest.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/stm32/boards/ARDUINO_PORTENTA_H7/manifest.py b/ports/stm32/boards/ARDUINO_PORTENTA_H7/manifest.py
index 6cb17197417f4..2a6885818617a 100644
--- a/ports/stm32/boards/ARDUINO_PORTENTA_H7/manifest.py
+++ b/ports/stm32/boards/ARDUINO_PORTENTA_H7/manifest.py
@@ -7,4 +7,4 @@
 require("logging")
 
 # Bluetooth
-require("aioble", client=True, central=True, l2cap=True, security=True)
+require("aioble")

From 68d049ea5eedf5caf0362c920d91229eea479bf1 Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Mon, 13 Feb 2023 16:08:29 +0100
Subject: [PATCH 3068/3533] nrf/Makefile: Add support for BOSSAC flasher.

Used by Arduino boards.
---
 ports/nrf/Makefile | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/ports/nrf/Makefile b/ports/nrf/Makefile
index 78a17e09e9c19..5cb2fc0311633 100644
--- a/ports/nrf/Makefile
+++ b/ports/nrf/Makefile
@@ -509,6 +509,15 @@ nrfutil_dfu_deploy: $(BUILD)/$(OUTPUT_FILENAME).hex
 	$(Q)nrfutil dfu usb-serial -pkg $(BUILD)/$(OUTPUT_FILENAME)_dfu.zip -p $(NRFUTIL_PORT) -t 0
 
 deploy: nrfutil_dfu_deploy
+
+else ifeq ($(FLASHER), bossac)
+
+BOSSAC_PORT ?= /dev/ttyACM0
+BOSSAC_OFFSET ?= 0x16000
+
+deploy: $(BUILD)/$(OUTPUT_FILENAME).bin
+	$(Q)bossac -e -w --offset=$(BOSSAC_OFFSET) --port=$(BOSSAC_PORT) -i -d -U -R $<
+
 endif
 
 flash: deploy

From de1f1dd164958273c4ab62a46fdfe8a2f40ab1cf Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sun, 12 Feb 2023 14:15:08 +0100
Subject: [PATCH 3069/3533] shared/runtime/softtimer: Use consistently the same
 clock source.

Before, both uwTick and mp_hal_ticks_ms() were used as clock source.  That
assumes, that these two are synchronous and start with the same value,
which may be not the case for all ports.  If the lag between uwTick and
mp_hal_ticks_ms() is larger than the timer interval, the timer would either
rush up until the times are synchronous, or not start until uwTick wraps
over.

As suggested by @dpgeorge, MICROPY_SOFT_TIMER_TICKS_MS is now used in
softtimer.c, which has to be defined in a port's mpconfigport.h with
the variable that holds the SysTick counter.

Note that it's not possible to switch everything in softtimer.c to use
mp_hal_ticks_ms() because the logic in SysTick_Handler that schedules
soft_timer_handler() uses (eg on mimxrt) the uwTick variable directly
(named systick_ms there), and mp_hal_ticks_ms() uses a different source
timer.  Thus it is made fully configurable.
---
 ports/mimxrt/mpconfigport.h     |  1 +
 ports/renesas-ra/mpconfigport.h |  1 +
 ports/samd/mpconfigport.h       |  1 +
 ports/samd/mphalport.h          |  4 ----
 ports/stm32/mpconfigport.h      |  1 +
 shared/runtime/softtimer.c      | 10 +++++-----
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/ports/mimxrt/mpconfigport.h b/ports/mimxrt/mpconfigport.h
index 224714b071b55..2e955fd06aae4 100644
--- a/ports/mimxrt/mpconfigport.h
+++ b/ports/mimxrt/mpconfigport.h
@@ -92,6 +92,7 @@ uint32_t trng_random_u32(void);
 #define MICROPY_PY_MACHINE_SPI              (1)
 #define MICROPY_PY_MACHINE_SOFTSPI          (1)
 #define MICROPY_PY_MACHINE_TIMER            (1)
+#define MICROPY_SOFT_TIMER_TICKS_MS         systick_ms
 #define MICROPY_PY_ONEWIRE                  (1)
 #define MICROPY_PY_UPLATFORM                (1)
 
diff --git a/ports/renesas-ra/mpconfigport.h b/ports/renesas-ra/mpconfigport.h
index 9336ec4add75e..6d40ac8fac48b 100644
--- a/ports/renesas-ra/mpconfigport.h
+++ b/ports/renesas-ra/mpconfigport.h
@@ -120,6 +120,7 @@
 #define MICROPY_PY_MACHINE_SPI_LSB  (SPI_FIRSTBIT_LSB)
 #define MICROPY_PY_MACHINE_SOFTSPI  (1)
 #define MICROPY_PY_MACHINE_TIMER    (1)
+#define MICROPY_SOFT_TIMER_TICKS_MS uwTick
 #endif
 #define MICROPY_HW_SOFTSPI_MIN_DELAY (0)
 #define MICROPY_HW_SOFTSPI_MAX_BAUDRATE (48000000 / 48)
diff --git a/ports/samd/mpconfigport.h b/ports/samd/mpconfigport.h
index b3ca67caec618..8e51720fd5dd9 100644
--- a/ports/samd/mpconfigport.h
+++ b/ports/samd/mpconfigport.h
@@ -98,6 +98,7 @@
 #define MICROPY_HW_SOFTSPI_MIN_DELAY        (1)
 #define MICROPY_HW_SOFTSPI_MAX_BAUDRATE     (1000000)
 #define MICROPY_PY_MACHINE_TIMER            (1)
+#define MICROPY_SOFT_TIMER_TICKS_MS         systick_ms
 #define MICROPY_PY_OS_DUPTERM               (3)
 #define MICROPY_PY_MACHINE_BITSTREAM        (1)
 #define MICROPY_PY_MACHINE_PULSE            (1)
diff --git a/ports/samd/mphalport.h b/ports/samd/mphalport.h
index 4799c575c985e..d5fc935343d34 100644
--- a/ports/samd/mphalport.h
+++ b/ports/samd/mphalport.h
@@ -43,10 +43,6 @@ uint64_t mp_hal_ticks_us_64(void);
 
 void mp_hal_set_interrupt_char(int c);
 
-// Define an alias fo systick_ms, because the shared softtimer.c uses
-// the symbol uwTick for the systick ms counter.
-#define uwTick systick_ms
-
 #define mp_hal_delay_us_fast  mp_hal_delay_us
 
 static inline uint64_t mp_hal_ticks_ms_64(void) {
diff --git a/ports/stm32/mpconfigport.h b/ports/stm32/mpconfigport.h
index 2898b01a3845b..18521ef1d8cdf 100644
--- a/ports/stm32/mpconfigport.h
+++ b/ports/stm32/mpconfigport.h
@@ -127,6 +127,7 @@
 #define MICROPY_PY_MACHINE_SPI_LSB  (SPI_FIRSTBIT_LSB)
 #define MICROPY_PY_MACHINE_SOFTSPI  (1)
 #define MICROPY_PY_MACHINE_TIMER    (1)
+#define MICROPY_SOFT_TIMER_TICKS_MS uwTick
 #endif
 #define MICROPY_HW_SOFTSPI_MIN_DELAY (0)
 #define MICROPY_HW_SOFTSPI_MAX_BAUDRATE (HAL_RCC_GetSysClockFreq() / 48)
diff --git a/shared/runtime/softtimer.c b/shared/runtime/softtimer.c
index 8bc9621b3d048..4d96301eac3ee 100644
--- a/shared/runtime/softtimer.c
+++ b/shared/runtime/softtimer.c
@@ -33,7 +33,7 @@
 #define TICKS_PERIOD 0x80000000
 #define TICKS_DIFF(t1, t0) ((int32_t)(((t1 - t0 + TICKS_PERIOD / 2) & (TICKS_PERIOD - 1)) - TICKS_PERIOD / 2))
 
-extern __IO uint32_t uwTick;
+extern __IO uint32_t MICROPY_SOFT_TIMER_TICKS_MS;
 
 volatile uint32_t soft_timer_next;
 
@@ -50,7 +50,7 @@ STATIC int soft_timer_lt(mp_pairheap_t *n1, mp_pairheap_t *n2) {
 
 STATIC void soft_timer_schedule_systick(uint32_t ticks_ms) {
     uint32_t irq_state = disable_irq();
-    uint32_t uw_tick = uwTick;
+    uint32_t uw_tick = MICROPY_SOFT_TIMER_TICKS_MS;
     if (TICKS_DIFF(ticks_ms, uw_tick) <= 0) {
         soft_timer_next = uw_tick + 1;
     } else {
@@ -77,7 +77,7 @@ void soft_timer_deinit(void) {
 
 // Must be executed at IRQ_PRI_PENDSV
 void soft_timer_handler(void) {
-    uint32_t ticks_ms = uwTick;
+    uint32_t ticks_ms = MICROPY_SOFT_TIMER_TICKS_MS;
     soft_timer_entry_t *heap = soft_timer_heap;
     while (heap != NULL && TICKS_DIFF(heap->expiry_ms, ticks_ms) <= 0) {
         soft_timer_entry_t *entry = heap;
@@ -95,7 +95,7 @@ void soft_timer_handler(void) {
     soft_timer_heap = heap;
     if (heap == NULL) {
         // No more timers left, set largest delay possible
-        soft_timer_next = uwTick;
+        soft_timer_next = MICROPY_SOFT_TIMER_TICKS_MS;
     } else {
         // Set soft_timer_next so SysTick calls us back at the correct time
         soft_timer_schedule_systick(heap->expiry_ms);
@@ -130,7 +130,7 @@ void soft_timer_static_init(soft_timer_entry_t *entry, uint16_t mode, uint32_t d
 
 void soft_timer_insert(soft_timer_entry_t *entry, uint32_t initial_delta_ms) {
     mp_pairheap_init_node(soft_timer_lt, &entry->pairheap);
-    entry->expiry_ms = mp_hal_ticks_ms() + initial_delta_ms;
+    entry->expiry_ms = MICROPY_SOFT_TIMER_TICKS_MS + initial_delta_ms;
     uint32_t irq_state = raise_irq_pri(IRQ_PRI_PENDSV);
     soft_timer_heap = (soft_timer_entry_t *)mp_pairheap_push(soft_timer_lt, &soft_timer_heap->pairheap, &entry->pairheap);
     if (entry == soft_timer_heap) {

From b1cdb205ec42181434b2b3699dabd72dc8834e3c Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Wed, 15 Feb 2023 14:31:49 +1100
Subject: [PATCH 3070/3533] shared/runtime/softtimer: Fix ticks range when
 computing ticks diff.

The previous computation incorrectly assumed that the uint32_t ticks
counter MICROPY_SOFT_TIMER_TICKS_MS was in the range [0,0x80000000) where
its actually [0,0xffffffff].  This means the diff calculation can be
simplified compared to the original implementation copied from
utime_mphal.c, which has to deal with a ticks range constrained by the
small int range.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 shared/runtime/softtimer.c | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/shared/runtime/softtimer.c b/shared/runtime/softtimer.c
index 4d96301eac3ee..68173ac3377bd 100644
--- a/shared/runtime/softtimer.c
+++ b/shared/runtime/softtimer.c
@@ -30,9 +30,6 @@
 #include "py/runtime.h"
 #include "softtimer.h"
 
-#define TICKS_PERIOD 0x80000000
-#define TICKS_DIFF(t1, t0) ((int32_t)(((t1 - t0 + TICKS_PERIOD / 2) & (TICKS_PERIOD - 1)) - TICKS_PERIOD / 2))
-
 extern __IO uint32_t MICROPY_SOFT_TIMER_TICKS_MS;
 
 volatile uint32_t soft_timer_next;
@@ -42,16 +39,23 @@ volatile uint32_t soft_timer_next;
 // and is explicitly GC traced by soft_timer_gc_mark_all().
 STATIC soft_timer_entry_t *soft_timer_heap;
 
+static inline int32_t ticks_diff(uint32_t t1, uint32_t t0) {
+    // t1 is after t0 (i.e. positive result) if there exists a uint32_t X <= INT_MAX
+    // such that t0 + X = t1. Otherwise t1 is interepreted to be earlier than
+    // t0 (negative result).
+    return t1 - t0;
+}
+
 STATIC int soft_timer_lt(mp_pairheap_t *n1, mp_pairheap_t *n2) {
     soft_timer_entry_t *e1 = (soft_timer_entry_t *)n1;
     soft_timer_entry_t *e2 = (soft_timer_entry_t *)n2;
-    return TICKS_DIFF(e1->expiry_ms, e2->expiry_ms) < 0;
+    return ticks_diff(e1->expiry_ms, e2->expiry_ms) < 0;
 }
 
 STATIC void soft_timer_schedule_systick(uint32_t ticks_ms) {
     uint32_t irq_state = disable_irq();
     uint32_t uw_tick = MICROPY_SOFT_TIMER_TICKS_MS;
-    if (TICKS_DIFF(ticks_ms, uw_tick) <= 0) {
+    if (ticks_diff(ticks_ms, uw_tick) <= 0) {
         soft_timer_next = uw_tick + 1;
     } else {
         soft_timer_next = ticks_ms;
@@ -79,7 +83,7 @@ void soft_timer_deinit(void) {
 void soft_timer_handler(void) {
     uint32_t ticks_ms = MICROPY_SOFT_TIMER_TICKS_MS;
     soft_timer_entry_t *heap = soft_timer_heap;
-    while (heap != NULL && TICKS_DIFF(heap->expiry_ms, ticks_ms) <= 0) {
+    while (heap != NULL && ticks_diff(heap->expiry_ms, ticks_ms) <= 0) {
         soft_timer_entry_t *entry = heap;
         heap = (soft_timer_entry_t *)mp_pairheap_pop(soft_timer_lt, &heap->pairheap);
         if (entry->flags & SOFT_TIMER_FLAG_PY_CALLBACK) {

From c7391a2d80d1927d702e3f6e304f185af81d45a4 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 17 Feb 2023 12:33:13 +1100
Subject: [PATCH 3071/3533] github/workflows: Add "shared/**" to list of paths
 that trigger CI.

All ports use code from shared/ so should rebuild when it changes.

Signed-off-by: Damien George <damien@micropython.org>
---
 .github/workflows/ports_cc3200.yml      | 1 +
 .github/workflows/ports_esp32.yml       | 1 +
 .github/workflows/ports_esp8266.yml     | 1 +
 .github/workflows/ports_mimxrt.yml      | 1 +
 .github/workflows/ports_nrf.yml         | 1 +
 .github/workflows/ports_powerpc.yml     | 1 +
 .github/workflows/ports_qemu-arm.yml    | 1 +
 .github/workflows/ports_renesas-ra.yml  | 1 +
 .github/workflows/ports_rp2.yml         | 1 +
 .github/workflows/ports_samd.yml        | 1 +
 .github/workflows/ports_stm32.yml       | 1 +
 .github/workflows/ports_teensy.yml      | 1 +
 .github/workflows/ports_unix.yml        | 1 +
 .github/workflows/ports_webassembly.yml | 1 +
 .github/workflows/ports_windows.yml     | 1 +
 .github/workflows/ports_zephyr.yml      | 1 +
 16 files changed, 16 insertions(+)

diff --git a/.github/workflows/ports_cc3200.yml b/.github/workflows/ports_cc3200.yml
index 52adc7dbcea60..b58bc24b58b0a 100644
--- a/.github/workflows/ports_cc3200.yml
+++ b/.github/workflows/ports_cc3200.yml
@@ -8,6 +8,7 @@ on:
       - 'tools/**'
       - 'py/**'
       - 'extmod/**'
+      - 'shared/**'
       - 'lib/**'
       - 'drivers/**'
       - 'ports/cc3200/**'
diff --git a/.github/workflows/ports_esp32.yml b/.github/workflows/ports_esp32.yml
index 9a583e3f998ff..6fc009d4fee83 100644
--- a/.github/workflows/ports_esp32.yml
+++ b/.github/workflows/ports_esp32.yml
@@ -8,6 +8,7 @@ on:
       - 'tools/**'
       - 'py/**'
       - 'extmod/**'
+      - 'shared/**'
       - 'lib/**'
       - 'drivers/**'
       - 'ports/esp32/**'
diff --git a/.github/workflows/ports_esp8266.yml b/.github/workflows/ports_esp8266.yml
index ae66fb95d944d..ba89d5e9529eb 100644
--- a/.github/workflows/ports_esp8266.yml
+++ b/.github/workflows/ports_esp8266.yml
@@ -8,6 +8,7 @@ on:
       - 'tools/**'
       - 'py/**'
       - 'extmod/**'
+      - 'shared/**'
       - 'lib/**'
       - 'drivers/**'
       - 'ports/esp8266/**'
diff --git a/.github/workflows/ports_mimxrt.yml b/.github/workflows/ports_mimxrt.yml
index ae3ac086370e2..d91562534188a 100644
--- a/.github/workflows/ports_mimxrt.yml
+++ b/.github/workflows/ports_mimxrt.yml
@@ -8,6 +8,7 @@ on:
       - 'tools/**'
       - 'py/**'
       - 'extmod/**'
+      - 'shared/**'
       - 'lib/**'
       - 'drivers/**'
       - 'ports/mimxrt/**'
diff --git a/.github/workflows/ports_nrf.yml b/.github/workflows/ports_nrf.yml
index 0ca994c382045..89211217800b0 100644
--- a/.github/workflows/ports_nrf.yml
+++ b/.github/workflows/ports_nrf.yml
@@ -8,6 +8,7 @@ on:
       - 'tools/**'
       - 'py/**'
       - 'extmod/**'
+      - 'shared/**'
       - 'lib/**'
       - 'drivers/**'
       - 'ports/nrf/**'
diff --git a/.github/workflows/ports_powerpc.yml b/.github/workflows/ports_powerpc.yml
index 7895e772acde5..a15c4da97fa6a 100644
--- a/.github/workflows/ports_powerpc.yml
+++ b/.github/workflows/ports_powerpc.yml
@@ -8,6 +8,7 @@ on:
       - 'tools/**'
       - 'py/**'
       - 'extmod/**'
+      - 'shared/**'
       - 'lib/**'
       - 'drivers/**'
       - 'ports/powerpc/**'
diff --git a/.github/workflows/ports_qemu-arm.yml b/.github/workflows/ports_qemu-arm.yml
index 509ef0bf0780f..93ec4da76700e 100644
--- a/.github/workflows/ports_qemu-arm.yml
+++ b/.github/workflows/ports_qemu-arm.yml
@@ -8,6 +8,7 @@ on:
       - 'tools/**'
       - 'py/**'
       - 'extmod/**'
+      - 'shared/**'
       - 'lib/**'
       - 'drivers/**'
       - 'ports/qemu-arm/**'
diff --git a/.github/workflows/ports_renesas-ra.yml b/.github/workflows/ports_renesas-ra.yml
index 79600949f2e87..33e17a385a1e3 100644
--- a/.github/workflows/ports_renesas-ra.yml
+++ b/.github/workflows/ports_renesas-ra.yml
@@ -8,6 +8,7 @@ on:
       - 'tools/**'
       - 'py/**'
       - 'extmod/**'
+      - 'shared/**'
       - 'lib/**'
       - 'drivers/**'
       - 'ports/renesas-ra/**'
diff --git a/.github/workflows/ports_rp2.yml b/.github/workflows/ports_rp2.yml
index 96b52ea36b703..f042ff1151ab1 100644
--- a/.github/workflows/ports_rp2.yml
+++ b/.github/workflows/ports_rp2.yml
@@ -8,6 +8,7 @@ on:
       - 'tools/**'
       - 'py/**'
       - 'extmod/**'
+      - 'shared/**'
       - 'lib/**'
       - 'drivers/**'
       - 'ports/rp2/**'
diff --git a/.github/workflows/ports_samd.yml b/.github/workflows/ports_samd.yml
index 8a82632c6baec..9833a2fae2ef9 100644
--- a/.github/workflows/ports_samd.yml
+++ b/.github/workflows/ports_samd.yml
@@ -8,6 +8,7 @@ on:
       - 'tools/**'
       - 'py/**'
       - 'extmod/**'
+      - 'shared/**'
       - 'lib/**'
       - 'drivers/**'
       - 'ports/samd/**'
diff --git a/.github/workflows/ports_stm32.yml b/.github/workflows/ports_stm32.yml
index 482f49df2a654..b278ea862ce61 100644
--- a/.github/workflows/ports_stm32.yml
+++ b/.github/workflows/ports_stm32.yml
@@ -8,6 +8,7 @@ on:
       - 'tools/**'
       - 'py/**'
       - 'extmod/**'
+      - 'shared/**'
       - 'lib/**'
       - 'drivers/**'
       - 'ports/stm32/**'
diff --git a/.github/workflows/ports_teensy.yml b/.github/workflows/ports_teensy.yml
index b53d20a70cbfc..f1299603259a6 100644
--- a/.github/workflows/ports_teensy.yml
+++ b/.github/workflows/ports_teensy.yml
@@ -8,6 +8,7 @@ on:
       - 'tools/**'
       - 'py/**'
       - 'extmod/**'
+      - 'shared/**'
       - 'lib/**'
       - 'drivers/**'
       - 'ports/teensy/**'
diff --git a/.github/workflows/ports_unix.yml b/.github/workflows/ports_unix.yml
index f19833202fd53..fe25deb4ad51d 100644
--- a/.github/workflows/ports_unix.yml
+++ b/.github/workflows/ports_unix.yml
@@ -8,6 +8,7 @@ on:
       - 'tools/**'
       - 'py/**'
       - 'extmod/**'
+      - 'shared/**'
       - 'lib/**'
       - 'examples/**'
       - 'mpy-cross/**'
diff --git a/.github/workflows/ports_webassembly.yml b/.github/workflows/ports_webassembly.yml
index cc9d65f960f9c..2e0865662f061 100644
--- a/.github/workflows/ports_webassembly.yml
+++ b/.github/workflows/ports_webassembly.yml
@@ -8,6 +8,7 @@ on:
       - 'tools/**'
       - 'py/**'
       - 'extmod/**'
+      - 'shared/**'
       - 'lib/**'
       - 'ports/webassembly/**'
 
diff --git a/.github/workflows/ports_windows.yml b/.github/workflows/ports_windows.yml
index 301332ab43138..b31718c591402 100644
--- a/.github/workflows/ports_windows.yml
+++ b/.github/workflows/ports_windows.yml
@@ -8,6 +8,7 @@ on:
       - 'tools/**'
       - 'py/**'
       - 'extmod/**'
+      - 'shared/**'
       - 'lib/**'
       - 'ports/unix/**'
       - 'ports/windows/**'
diff --git a/.github/workflows/ports_zephyr.yml b/.github/workflows/ports_zephyr.yml
index 966e08483fc8a..f64401b316a5b 100644
--- a/.github/workflows/ports_zephyr.yml
+++ b/.github/workflows/ports_zephyr.yml
@@ -8,6 +8,7 @@ on:
       - 'tools/**'
       - 'py/**'
       - 'extmod/**'
+      - 'shared/**'
       - 'lib/**'
       - 'ports/zephyr/**'
 

From 4bd4b6a47edb519122990cc0274af4b68f988a67 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 17 Feb 2023 12:44:07 +1100
Subject: [PATCH 3072/3533] tools/ci.sh: Install pkg-config for macos builds.

Signed-off-by: Damien George <damien@micropython.org>
---
 tools/ci.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tools/ci.sh b/tools/ci.sh
index 0522702049a17..193ab04e4d78b 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -594,6 +594,9 @@ function ci_unix_settrace_stackless_run_tests {
 }
 
 function ci_unix_macos_build {
+    # Install pkg-config to configure libffi paths.
+    brew install pkg-config
+
     make ${MAKEOPTS} -C mpy-cross
     make ${MAKEOPTS} -C ports/unix submodules
     #make ${MAKEOPTS} -C ports/unix deplibs

From c6140ad0d4add2742a9a7645e74a7d2a3affabe7 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 17 Feb 2023 13:43:03 +1100
Subject: [PATCH 3073/3533] rp2/mpconfigport: Enable os.dupterm and
 hashlib.sha1 on all boards.

This further aligns the features available on Pico and Pico W boards.

os.dupterm is generally useful, but can still be disabled by a board if
needed.  hashlib.sha1 requires mbedtls for the implementation, but that's
always available (due to ucryptolib's requirements).  The entire hashlib
module can still be disabled by an individual board if needed.

Fixes issue #7881.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/rp2/mpconfigport.h | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/ports/rp2/mpconfigport.h b/ports/rp2/mpconfigport.h
index a21c141e4b445..35bc22e55a305 100644
--- a/ports/rp2/mpconfigport.h
+++ b/ports/rp2/mpconfigport.h
@@ -92,10 +92,14 @@
 // Extended modules
 #define MICROPY_EPOCH_IS_1970                   (1)
 #define MICROPY_PY_UOS_INCLUDEFILE              "ports/rp2/moduos.c"
+#ifndef MICROPY_PY_OS_DUPTERM
+#define MICROPY_PY_OS_DUPTERM                   (1)
+#endif
 #define MICROPY_PY_UOS_UNAME                    (1)
 #define MICROPY_PY_UOS_URANDOM                  (1)
 #define MICROPY_PY_URE_MATCH_GROUPS             (1)
 #define MICROPY_PY_URE_MATCH_SPAN_START_END     (1)
+#define MICROPY_PY_UHASHLIB_SHA1                (1)
 #define MICROPY_PY_UCRYPTOLIB                   (1)
 #define MICROPY_PY_UTIME_MP_HAL                 (1)
 #define MICROPY_PY_URANDOM_SEED_INIT_FUNC       (rosc_random_u32())
@@ -146,15 +150,9 @@
 #ifndef MICROPY_PY_UWEBSOCKET
 #define MICROPY_PY_UWEBSOCKET           (1)
 #endif
-#ifndef MICROPY_PY_UHASHLIB_SHA1
-#define MICROPY_PY_UHASHLIB_SHA1        (1)
-#endif
 #ifndef MICROPY_PY_WEBREPL
 #define MICROPY_PY_WEBREPL              (1)
 #endif
-#ifndef MICROPY_PY_OS_DUPTERM
-#define MICROPY_PY_OS_DUPTERM           (1)
-#endif
 #endif
 
 #if MICROPY_PY_NETWORK_CYW43

From fa8b2cb26d502f09370291d67fb112ae36ee7e9f Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 16 Feb 2023 11:06:55 +1100
Subject: [PATCH 3074/3533] lib/cyw43-driver: Update driver to latest version.

Changes since the previous version:
- add an API to get the BSSID
- support auto channel selection when using BSSID for join
- improve performance for the Murata 1DX module and SDIO
- return EINVAL for invalid auth type
- add support for Bluetooth over SPI
- convert 4343WA1-7.45.98.50.combined to C header files
---
 lib/cyw43-driver | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/cyw43-driver b/lib/cyw43-driver
index 2cf328d9e4160..38238aefb6f59 160000
--- a/lib/cyw43-driver
+++ b/lib/cyw43-driver
@@ -1 +1 @@
-Subproject commit 2cf328d9e41603405a037a29e081a7d30dd519e6
+Subproject commit 38238aefb6f59ce92681d83aa47d3a48d77b2f6e

From 198579ad6ae1b9a7c4ceb492a95981bff23e7834 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 16 Feb 2023 11:09:51 +1100
Subject: [PATCH 3075/3533] lib/pico-sdk: Update to version 1.5.0.

Signed-off-by: Damien George <damien@micropython.org>
---
 lib/pico-sdk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/pico-sdk b/lib/pico-sdk
index 2e6142b15b8a7..f396d05f8252d 160000
--- a/lib/pico-sdk
+++ b/lib/pico-sdk
@@ -1 +1 @@
-Subproject commit 2e6142b15b8a75c1227dd3edbe839193b2bf9041
+Subproject commit f396d05f8252d4670d4ea05c8b7ac938ef0cd381

From b257c0152bd0e12629e3bd65f83cb3a21bbce33a Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 16 Feb 2023 11:10:09 +1100
Subject: [PATCH 3076/3533] rp2/cyw43_configport: Specify the chipset firmware
 include file.

Required by the latest version of cyw43-driver.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/rp2/cyw43_configport.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/rp2/cyw43_configport.h b/ports/rp2/cyw43_configport.h
index b5a22e6354741..c17b7a5c523c1 100644
--- a/ports/rp2/cyw43_configport.h
+++ b/ports/rp2/cyw43_configport.h
@@ -32,6 +32,7 @@
 #include "py/mphal.h"
 #include "pendsv.h"
 
+#define CYW43_CHIPSET_FIRMWARE_INCLUDE_FILE "w43439A0_7_95_49_00_combined.h"
 #define CYW43_WIFI_NVRAM_INCLUDE_FILE   "wifi_nvram_43439.h"
 #define CYW43_IOCTL_TIMEOUT_US          (1000000)
 #define CYW43_SLEEP_MAX                 (10)

From 7198c251753f3b1c9547c8ef92465733daf33cdf Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Thu, 2 Feb 2023 08:26:17 +0100
Subject: [PATCH 3077/3533] mimxrt/Makefile: Move the FROZEN_MANIFEST setting
 after board config.

Such that a respective statement in mpconfigboard.mk is executed first.
---
 ports/mimxrt/Makefile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ports/mimxrt/Makefile b/ports/mimxrt/Makefile
index 18e91639efdf3..bcddeb2d8b4ce 100644
--- a/ports/mimxrt/Makefile
+++ b/ports/mimxrt/Makefile
@@ -10,7 +10,6 @@ CROSS_COMPILE ?= arm-none-eabi-
 GIT_SUBMODULES += lib/tinyusb lib/nxp_driver
 
 # MicroPython feature configurations
-FROZEN_MANIFEST ?= boards/manifest.py
 MICROPY_VFS_LFS2 ?= 1
 MICROPY_VFS_FAT ?= 1
 
@@ -31,6 +30,9 @@ ifeq ($(wildcard $(BOARD_DIR)/.),)
 endif
 include $(BOARD_DIR)/mpconfigboard.mk
 
+# File containing description of content to be frozen into firmware.
+FROZEN_MANIFEST ?= boards/manifest.py
+
 # Include py core make definitions
 include $(TOP)/py/py.mk
 include $(TOP)/extmod/extmod.mk

From 4598b89ce9bd171dde92480e86050f6ceb3cfc83 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Fri, 3 Feb 2023 17:03:31 +0100
Subject: [PATCH 3078/3533] samd: Add Pin.board and Pin.cpu classes to Pin.

For compatibility with other ports.  Code increase up to ~1250 bytes for
SAMD21.  The feature is configurable via MICROPY_PY_MACHINE_PIN_BOARD_CPU
in case flash memory is tight.
---
 ports/samd/boards/SEEED_WIO_TERMINAL/pins.csv |  2 +-
 ports/samd/boards/make-pin-table.py           | 81 ++++++++++++++++---
 ports/samd/machine_pin.c                      | 23 ++++++
 ports/samd/mcu/samd21/mpconfigmcu.h           |  4 +
 ports/samd/mcu/samd51/mpconfigmcu.h           |  4 +
 ports/samd/modsamd.c                          |  7 +-
 ports/samd/pin_af.c                           | 65 +++++++++------
 ports/samd/pin_af.h                           |  9 ++-
 8 files changed, 149 insertions(+), 46 deletions(-)

diff --git a/ports/samd/boards/SEEED_WIO_TERMINAL/pins.csv b/ports/samd/boards/SEEED_WIO_TERMINAL/pins.csv
index 4a3d9e21aee0a..4db71cc4c1ece 100644
--- a/ports/samd/boards/SEEED_WIO_TERMINAL/pins.csv
+++ b/ports/samd/boards/SEEED_WIO_TERMINAL/pins.csv
@@ -51,7 +51,7 @@ PIN_PB19,LCD_MOSI
 PIN_PB20,LCD_SCK
 PIN_PB21,LCD_CS
 PIN_PC05,LCD_BACKLIGHT
-PIN_PC06,LCD_D/C
+PIN_PC06,LCD_D_C
 PIN_PC07,LCD_RESET
 PIN_PC10,LCD_XL
 PIN_PC11,LCD_YU
diff --git a/ports/samd/boards/make-pin-table.py b/ports/samd/boards/make-pin-table.py
index 40bcd166dd08f..a187f2a711aaa 100644
--- a/ports/samd/boards/make-pin-table.py
+++ b/ports/samd/boards/make-pin-table.py
@@ -10,6 +10,8 @@
 table_header = """// This file was automatically generated by make-pin-cap.py
 //
 
+// The Pin objects which are available on a board
+
 """
 
 
@@ -45,20 +47,23 @@ def parse_pin_file(self, filename):
     def print_table(self, table_filename, mcu_name):
         with open(table_filename, "wt") as table_file:
             table_file.write(table_header)
-            table_file.write("const machine_pin_obj_t pin_af_table[] = {\n")
+
+            # Create the Pin objects
+
             if mcu_name == "SAMD21":
                 for row in self.board_pins:
                     pin = "PIN_" + row[0].upper()
-                    table_file.write("    #ifdef " + pin + "\n")
+                    table_file.write("#ifdef " + pin + "\n")
+                    table_file.write("static const machine_pin_obj_t %s_obj = " % pin)
                     eic = row[1] if row[1] else "0xff"
                     adc = row[2] if row[2] else "0xff"
                     if pin in self.pin_names:
-                        name = '"%s"' % self.pin_names[pin][0]
+                        name = "MP_QSTR_%s" % self.pin_names[pin][0]
                         type = self.pin_names[pin][1]
                     else:
-                        name = '"-"'
+                        name = "MP_QSTR_"
                         type = "{&machine_pin_type}"
-                    table_file.write("    {%s, %s, %s, %s, %s" % (type, pin, name, eic, adc))
+                    table_file.write("{%s, %s, %s, %s, %s" % (type, pin, name, eic, adc))
                     for cell in row[3:]:
                         if cell:
                             table_file.write(
@@ -66,23 +71,24 @@ def print_table(self, table_filename, mcu_name):
                             )
                         else:
                             table_file.write(", 0xff")
-                    table_file.write("},\n")
-                    table_file.write("    #endif\n")
+                    table_file.write("};\n")
+                    table_file.write("#endif\n")
             else:
                 for row in self.board_pins:
                     pin = "PIN_" + row[0].upper()
-                    table_file.write("    #ifdef " + pin + "\n")
+                    table_file.write("#ifdef " + pin + "\n")
+                    table_file.write("const machine_pin_obj_t %s_obj = " % pin)
                     eic = row[1] if row[1] else "0xff"
                     adc0 = row[2] if row[2] else "0xff"
                     adc1 = row[3] if row[3] else "0xff"
                     if pin in self.pin_names:
-                        name = '"%s"' % self.pin_names[pin][0]
+                        name = "MP_QSTR_%s" % self.pin_names[pin][0]
                         type = self.pin_names[pin][1]
                     else:
-                        name = '"-"'
+                        name = "MP_QSTR_"
                         type = "{&machine_pin_type}"
                     table_file.write(
-                        "    {%s, %s, %s, %s, %s, %s" % (type, pin, name, eic, adc0, adc1)
+                        "{%s, %s, %s, %s, %s, %s" % (type, pin, name, eic, adc0, adc1)
                     )
                     for cell in row[4:]:
                         if cell:
@@ -91,9 +97,60 @@ def print_table(self, table_filename, mcu_name):
                             )
                         else:
                             table_file.write(", 0xff")
-                    table_file.write("},\n")
+                    table_file.write("};\n")
+                    table_file.write("#endif\n")
+
+            # Create the Pin table
+
+            table_file.write("\n// The table of references to the pin objects.\n\n")
+            table_file.write("static const machine_pin_obj_t *pin_af_table[] = {\n")
+            for row in self.board_pins:
+                pin = "PIN_" + row[0].upper()
+                table_file.write("    #ifdef " + pin + "\n")
+                table_file.write("    &%s_obj,\n" % pin)
+                table_file.write("    #endif\n")
+            table_file.write("};\n")
+
+            # Create the CPU pins dictionary table
+
+            table_file.write("\n#if MICROPY_PY_MACHINE_PIN_BOARD_CPU\n")
+            table_file.write("\n// The cpu pins dictionary\n\n")
+            table_file.write(
+                "STATIC const mp_rom_map_elem_t pin_cpu_pins_locals_dict_table[] = {\n"
+            )
+            for row in self.board_pins:
+                pin = "PIN_" + row[0].upper()
+                table_file.write("    #ifdef " + pin + "\n")
+                table_file.write(
+                    "    { MP_ROM_QSTR(MP_QSTR_%s), MP_ROM_PTR(&%s_obj) },\n"
+                    % (row[0].upper(), pin)
+                )
+                table_file.write("    #endif\n")
+            table_file.write("};\n")
+            table_file.write(
+                "MP_DEFINE_CONST_DICT(machine_pin_cpu_pins_locals_dict, pin_cpu_pins_locals_dict_table);\n"
+            )
+
+            # Create the board pins dictionary table
+
+            table_file.write("\n// The board pins dictionary\n\n")
+            table_file.write(
+                "STATIC const mp_rom_map_elem_t pin_board_pins_locals_dict_table[] = {\n"
+            )
+            for row in self.board_pins:
+                pin = "PIN_" + row[0].upper()
+                if pin in self.pin_names:
+                    table_file.write("    #ifdef " + pin + "\n")
+                    table_file.write(
+                        "    { MP_ROM_QSTR(MP_QSTR_%s), MP_ROM_PTR(&%s_obj) },\n"
+                        % (self.pin_names[pin][0], pin)
+                    )
                     table_file.write("    #endif\n")
             table_file.write("};\n")
+            table_file.write(
+                "MP_DEFINE_CONST_DICT(machine_pin_board_pins_locals_dict, pin_board_pins_locals_dict_table);\n"
+            )
+            table_file.write("#endif\n")
 
 
 def main():
diff --git a/ports/samd/machine_pin.c b/ports/samd/machine_pin.c
index 87684858325fb..f8e1b962804c0 100644
--- a/ports/samd/machine_pin.c
+++ b/ports/samd/machine_pin.c
@@ -54,6 +54,23 @@ typedef struct _machine_pin_irq_obj_t {
     uint8_t pin_id;
 } machine_pin_irq_obj_t;
 
+#if MICROPY_PY_MACHINE_PIN_BOARD_CPU
+// Pin mapping dictionaries
+MP_DEFINE_CONST_OBJ_TYPE(
+    machine_pin_cpu_pins_obj_type,
+    MP_QSTR_cpu,
+    MP_TYPE_FLAG_NONE,
+    locals_dict, &machine_pin_cpu_pins_locals_dict
+    );
+
+MP_DEFINE_CONST_OBJ_TYPE(
+    machine_pin_board_pins_obj_type,
+    MP_QSTR_board,
+    MP_TYPE_FLAG_NONE,
+    locals_dict, &machine_pin_board_pins_locals_dict
+    );
+#endif // MICROPY_PY_MACHINE_PIN_BOARD_CPU
+
 STATIC const mp_irq_methods_t machine_pin_irq_methods;
 
 bool EIC_occured;
@@ -411,6 +428,12 @@ STATIC const mp_rom_map_elem_t machine_pin_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_drive), MP_ROM_PTR(&machine_pin_drive_obj) },
     { MP_ROM_QSTR(MP_QSTR_irq), MP_ROM_PTR(&machine_pin_irq_obj) },
 
+    #if MICROPY_PY_MACHINE_PIN_BOARD_CPU
+    // class attributes
+    { MP_ROM_QSTR(MP_QSTR_board),   MP_ROM_PTR(&machine_pin_board_pins_obj_type) },
+    { MP_ROM_QSTR(MP_QSTR_cpu),     MP_ROM_PTR(&machine_pin_cpu_pins_obj_type) },
+    #endif // MICROPY_PY_MACHINE_PIN_BOARD_CPU
+
     // class constants
     { MP_ROM_QSTR(MP_QSTR_IN), MP_ROM_INT(GPIO_MODE_IN) },
     { MP_ROM_QSTR(MP_QSTR_OUT), MP_ROM_INT(GPIO_MODE_OUT) },
diff --git a/ports/samd/mcu/samd21/mpconfigmcu.h b/ports/samd/mcu/samd21/mpconfigmcu.h
index 331df8e2130a0..fd6f524d7f903 100644
--- a/ports/samd/mcu/samd21/mpconfigmcu.h
+++ b/ports/samd/mcu/samd21/mpconfigmcu.h
@@ -34,6 +34,10 @@
 #endif
 #endif
 
+#ifndef MICROPY_PY_MACHINE_PIN_BOARD_CPU
+#define MICROPY_PY_MACHINE_PIN_BOARD_CPU (1)
+#endif
+
 #define CPU_FREQ                        (48000000)
 #define DFLL48M_FREQ                    (48000000)
 #define MAX_CPU_FREQ                    (48000000)
diff --git a/ports/samd/mcu/samd51/mpconfigmcu.h b/ports/samd/mcu/samd51/mpconfigmcu.h
index 16b2c101f02b9..64261951bafcc 100644
--- a/ports/samd/mcu/samd51/mpconfigmcu.h
+++ b/ports/samd/mcu/samd51/mpconfigmcu.h
@@ -34,6 +34,10 @@ unsigned long trng_random_u32(void);
 #endif
 #endif
 
+#ifndef MICROPY_PY_MACHINE_PIN_BOARD_CPU
+#define MICROPY_PY_MACHINE_PIN_BOARD_CPU (1)
+#endif
+
 // fatfs configuration used in ffconf.h
 #define MICROPY_FATFS_ENABLE_LFN            (1)
 #define MICROPY_FATFS_RPATH                 (2)
diff --git a/ports/samd/modsamd.c b/ports/samd/modsamd.c
index 5a2cf4616d1d1..7593a7bb0da38 100644
--- a/ports/samd/modsamd.c
+++ b/ports/samd/modsamd.c
@@ -36,12 +36,9 @@ extern const mp_obj_type_t samd_flash_type;
 
 STATIC mp_obj_t samd_pininfo(mp_obj_t pin_obj) {
     const machine_pin_obj_t *pin_af = pin_find(pin_obj);
-    // Get the name, now that it is not in the pin object
-    const char *name = pin_af->name;
-
     #if defined(MCU_SAMD21)
     mp_obj_t tuple[7] = {
-        tuple[0] = mp_obj_new_str(name, strlen(name)),
+        tuple[0] = MP_OBJ_NEW_QSTR(pin_af->name),
         tuple[1] = mp_obj_new_int(pin_af->eic),
         tuple[2] = mp_obj_new_int(pin_af->adc0),
         tuple[3] = mp_obj_new_int(pin_af->sercom1),
@@ -52,7 +49,7 @@ STATIC mp_obj_t samd_pininfo(mp_obj_t pin_obj) {
     return mp_obj_new_tuple(7, tuple);
     #elif defined(MCU_SAMD51)
     mp_obj_t tuple[9] = {
-        tuple[0] = mp_obj_new_str(name, strlen(name)),
+        tuple[0] = MP_OBJ_NEW_QSTR(pin_af->name),
         tuple[1] = mp_obj_new_int(pin_af->eic),
         tuple[2] = mp_obj_new_int(pin_af->adc0),
         tuple[3] = mp_obj_new_int(pin_af->adc1),
diff --git a/ports/samd/pin_af.c b/ports/samd/pin_af.c
index a7a72ac96abe3..d92a62b700249 100644
--- a/ports/samd/pin_af.c
+++ b/ports/samd/pin_af.c
@@ -47,23 +47,48 @@ extern const uint8_t tcc_channel_count[];
 
 const machine_pin_obj_t *get_pin_obj_ptr(int pin_id) {
     for (int i = 0; i < MP_ARRAY_SIZE(pin_af_table); i++) {
-        if (pin_af_table[i].pin_id == pin_id) { // Pin match
-            return &pin_af_table[i];
+        if (pin_af_table[i]->pin_id == pin_id) { // Pin match
+            return pin_af_table[i];
         }
     }
     mp_raise_ValueError(MP_ERROR_TEXT("not a Pin"));
 }
 
+#if MICROPY_PY_MACHINE_PIN_BOARD_CPU
+STATIC const machine_pin_obj_t *pin_find_named_pin(const mp_obj_dict_t *named_pins, mp_obj_t name) {
+    mp_map_t *named_map = mp_obj_dict_get_map((mp_obj_t)named_pins);
+    mp_map_elem_t *named_elem = mp_map_lookup(named_map, name, MP_MAP_LOOKUP);
+    if (named_elem != NULL && named_elem->value != NULL) {
+        return named_elem->value;
+    }
+    return NULL;
+}
+#endif
+
 const machine_pin_obj_t *pin_find(mp_obj_t pin) {
-    const machine_pin_obj_t *self = NULL;
     // Is already a object of the proper type
     if (mp_obj_is_type(pin, &machine_pin_type)) {
         return pin;
     }
     if (mp_obj_is_small_int(pin)) {
         // Pin defined by pin number for PAnn, PBnn, etc.
-        self = get_pin_obj_ptr(mp_obj_get_int(pin));
-    } else if (mp_obj_is_str(pin)) {
+        return get_pin_obj_ptr(mp_obj_get_int(pin));
+    }
+
+    #if MICROPY_PY_MACHINE_PIN_BOARD_CPU
+    const machine_pin_obj_t *self = NULL;
+    // See if the pin name matches a board pin
+    self = pin_find_named_pin(&machine_pin_board_pins_locals_dict, pin);
+    if (self != NULL) {
+        return self;
+    }
+    // See if the pin name matches a cpu pin
+    self = pin_find_named_pin(&machine_pin_cpu_pins_locals_dict, pin);
+    if (self != NULL) {
+        return self;
+    }
+    #else
+    if (mp_obj_is_str(pin)) {
         // Search by name
         size_t slen;
         const char *s = mp_obj_str_get_data(pin, &slen);
@@ -71,36 +96,26 @@ const machine_pin_obj_t *pin_find(mp_obj_t pin) {
         if (slen == 4 && s[0] == 'P' && strchr("ABCD", s[1]) != NULL &&
             strchr("0123456789", s[2]) != NULL && strchr("0123456789", s[2]) != NULL) {
             int num = (s[1] - 'A') * 32 + (s[2] - '0') * 10 + (s[3] - '0');
-            self = get_pin_obj_ptr(num);
+            return get_pin_obj_ptr(num);
         } else {
             for (int i = 0; i < MP_ARRAY_SIZE(pin_af_table); i++) {
-                if (slen == strlen(pin_af_table[i].name) &&
-                    strncmp(s, pin_af_table[i].name, slen) == 0) {
-                    self = &pin_af_table[i];
+                size_t len;
+                const char *name = (char *)qstr_data(pin_af_table[i]->name, &len);
+                if (slen == len && strncmp(s, name, slen) == 0) {
+                    return pin_af_table[i];
                 }
             }
         }
     }
-    if (self != NULL) {
-        return self;
-    } else {
-        mp_raise_ValueError(MP_ERROR_TEXT("not a Pin"));
-    }
+    #endif // MICROPY_PY_MACHINE_PIN_BOARD_CPU
+
+    mp_raise_ValueError(MP_ERROR_TEXT("not a Pin"));
 }
 
 const char *pin_name(int id) {
-    static char board_name[5] = "Pxnn";
     for (int i = 0; i < sizeof(pin_af_table); i++) {
-        if (pin_af_table[i].pin_id == id) {
-            if (pin_af_table[i].name[0] != '-') {
-                return pin_af_table[i].name;
-            } else {
-                board_name[1] = "ABCD"[id / 32];
-                id %= 32;
-                board_name[2] = '0' + id / 10;
-                board_name[3] = '0' + id % 10;
-                return board_name;
-            }
+        if (pin_af_table[i]->pin_id == id) {
+            return qstr_str(pin_af_table[i]->name);
         }
     }
     return "-";
diff --git a/ports/samd/pin_af.h b/ports/samd/pin_af.h
index 4b0c80250cd56..edab72aaed6a4 100644
--- a/ports/samd/pin_af.h
+++ b/ports/samd/pin_af.h
@@ -33,7 +33,7 @@
 typedef struct _machine_pin_obj_t {
     mp_obj_base_t base;
     uint8_t pin_id;
-    char *name;
+    qstr name;
     uint8_t eic;
     uint8_t adc0;
     uint8_t sercom1;
@@ -51,7 +51,7 @@ typedef struct _machine_pin_obj_t {
 typedef struct _machine_pin_obj_t {
     mp_obj_base_t base;
     uint8_t pin_id;
-    char *name;
+    qstr name;
     uint8_t eic;
     uint8_t adc0;
     uint8_t adc1;
@@ -89,7 +89,10 @@ typedef struct _pwm_config_t {
 #define ALT_FCT_SERCOM1   2
 #define ALT_FCT_SERCOM2   3
 
-extern const machine_pin_obj_t pin_af_table[];
+#if MICROPY_PY_MACHINE_PIN_BOARD_CPU
+extern const mp_obj_dict_t machine_pin_cpu_pins_locals_dict;
+extern const mp_obj_dict_t machine_pin_board_pins_locals_dict;
+#endif
 
 sercom_pad_config_t get_sercom_config(int pin_id, uint8_t sercom);
 adc_config_t get_adc_config(int pin_id, int32_t flag);

From 294098d28e2bad0ac0aad0d72595d11a82798096 Mon Sep 17 00:00:00 2001
From: manobendro <manob7@hotmail.com>
Date: Thu, 2 Feb 2023 21:47:40 +0600
Subject: [PATCH 3079/3533] minimal: Increase heap size for Linux builds.

Otherwise use of the REPL is quite limited.

Fixes issue #10644.
---
 ports/minimal/main.c         | 2 +-
 ports/minimal/mpconfigport.h | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/ports/minimal/main.c b/ports/minimal/main.c
index 2893276586269..881a6d2364eff 100644
--- a/ports/minimal/main.c
+++ b/ports/minimal/main.c
@@ -29,7 +29,7 @@ void do_str(const char *src, mp_parse_input_kind_t input_kind) {
 
 static char *stack_top;
 #if MICROPY_ENABLE_GC
-static char heap[2048];
+static char heap[MICROPY_HEAP_SIZE];
 #endif
 
 int main(int argc, char **argv) {
diff --git a/ports/minimal/mpconfigport.h b/ports/minimal/mpconfigport.h
index 02312e2e400e8..0f50f8d389cd9 100644
--- a/ports/minimal/mpconfigport.h
+++ b/ports/minimal/mpconfigport.h
@@ -33,11 +33,13 @@ typedef long mp_off_t;
 
 #ifdef __linux__
 #define MICROPY_MIN_USE_STDOUT (1)
+#define MICROPY_HEAP_SIZE      (25600) // heap size 25 kilobytes
 #endif
 
 #ifdef __thumb__
 #define MICROPY_MIN_USE_CORTEX_CPU (1)
 #define MICROPY_MIN_USE_STM32_MCU (1)
+#define MICROPY_HEAP_SIZE      (2048) // heap size 2 kilobytes
 #endif
 
 #define MP_STATE_PORT MP_STATE_VM

From e0d11272465964a27871f8ba4848f905c0bf9034 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Fri, 17 Feb 2023 17:44:05 +1100
Subject: [PATCH 3080/3533] tools/ci.sh: Add unix, stm32 and rp2 ports to code
 size check.

Now that the code-size-check CI action gives a nice report (as a comment)
on the code size difference, it's possible to have a few more ports
reported there.  In this commit, unix, stm32 and rp2 are added.  Unix
represents non-MCU builds, and stm32 and rp2 represent ARM-based builds,
for ports that have lots of features enabled.

Signed-off-by: Damien George <damien@micropython.org>
---
 tools/ci.sh | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/tools/ci.sh b/tools/ci.sh
index 193ab04e4d78b..9146291505eb1 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -49,6 +49,10 @@ function ci_code_size_setup {
 }
 
 function ci_code_size_build {
+    # check the following ports for the change in their code size
+    PORTS_TO_CHECK=bmusp
+    SUBMODULES="lib/berkeley-db-1.xx lib/mbedtls lib/micropython-lib lib/pico-sdk lib/stm32lib lib/tinyusb"
+
     # starts off at either the ref/pull/N/merge FETCH_HEAD, or the current branch HEAD
     git checkout -b pull_request # save the current location
     git remote add upstream https://github.com/micropython/micropython.git
@@ -56,14 +60,16 @@ function ci_code_size_build {
     # build reference, save to size0
     # ignore any errors with this build, in case master is failing
     git checkout `git merge-base --fork-point upstream/master pull_request`
+    git submodule update --init $SUBMODULES
     git show -s
-    tools/metrics.py clean bm
-    tools/metrics.py build bm | tee ~/size0 || true
+    tools/metrics.py clean $PORTS_TO_CHECK
+    tools/metrics.py build $PORTS_TO_CHECK | tee ~/size0 || true
     # build PR/branch, save to size1
     git checkout pull_request
+    git submodule update --init $SUBMODULES
     git log upstream/master..HEAD
-    tools/metrics.py clean bm
-    tools/metrics.py build bm | tee ~/size1
+    tools/metrics.py clean $PORTS_TO_CHECK
+    tools/metrics.py build $PORTS_TO_CHECK | tee ~/size1
 }
 
 ########################################################################################

From 95082693c3cae9a7f2b9cac9a2473ead4146c3c8 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 21 Feb 2023 15:31:52 +1100
Subject: [PATCH 3081/3533] extmod/modbtree: Move system includes within
 MICROPY_PY_BTREE guard.

Since commit d6d87225585a9494093d791c807bce652e4c82d8, modbtree.c is
included unconditionally in the build (if SRC_EXTMOD_C is used).  So guard
the includes of system headers files in case a target doesn't have them.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/modbtree.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/extmod/modbtree.c b/extmod/modbtree.c
index 2da65a2c7affc..e9c760a389717 100644
--- a/extmod/modbtree.c
+++ b/extmod/modbtree.c
@@ -24,16 +24,14 @@
  * THE SOFTWARE.
  */
 
-#include <stdio.h>
-#include <string.h>
-#include <errno.h> // for declaration of global errno variable
-#include <fcntl.h>
-
 #include "py/runtime.h"
 #include "py/stream.h"
 
 #if MICROPY_PY_BTREE
 
+#include <stdio.h>
+#include <errno.h> // for declaration of global errno variable
+#include <fcntl.h>
 #include <db.h>
 #include <../../btree/btree.h>
 

From c3afafd1ecc3ecd29e47c37a4760741faa81dfb8 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Sun, 1 Jan 2023 16:48:00 +0100
Subject: [PATCH 3082/3533] samd/boards: Clean up comments and some pins in
 pins.csv files.

Remove two SPARKFUN_SAMD51_THINGS_PLUS pin definitions.  There were
definitions of TXD and RXD, but these pins do not exist on the board.  They
were only shown in the schematics.

Also remove any reference to LED_.  This is just a text change, no
functional change.
---
 ports/samd/boards/ADAFRUIT_FEATHER_M0_EXPRESS/pins.csv   | 2 --
 ports/samd/boards/ADAFRUIT_FEATHER_M4_EXPRESS/pins.csv   | 4 +---
 ports/samd/boards/ADAFRUIT_ITSYBITSY_M0_EXPRESS/pins.csv | 4 +---
 ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/pins.csv | 4 +---
 ports/samd/boards/ADAFRUIT_TRINKET_M0/pins.csv           | 4 +---
 ports/samd/boards/MINISAM_M4/pins.csv                    | 4 +---
 ports/samd/boards/SAMD21_XPLAINED_PRO/pins.csv           | 4 +---
 ports/samd/boards/SEEED_WIO_TERMINAL/pins.csv            | 4 +---
 ports/samd/boards/SEEED_XIAO_SAMD21/pins.csv             | 4 +---
 ports/samd/boards/SPARKFUN_SAMD51_THING_PLUS/pins.csv    | 6 +-----
 10 files changed, 9 insertions(+), 31 deletions(-)

diff --git a/ports/samd/boards/ADAFRUIT_FEATHER_M0_EXPRESS/pins.csv b/ports/samd/boards/ADAFRUIT_FEATHER_M0_EXPRESS/pins.csv
index 45b05c2694f5b..35b6d1fd4e076 100644
--- a/ports/samd/boards/ADAFRUIT_FEATHER_M0_EXPRESS/pins.csv
+++ b/ports/samd/boards/ADAFRUIT_FEATHER_M0_EXPRESS/pins.csv
@@ -1,8 +1,6 @@
 # Pin rows contain Pin number and pin name.
 # Pin rows start with PIN_
-# LED rows start with LED_
 # If the pin name is omitted, the pin number is added as name.
-# Rows for empty entries have to start with '-'
 # Empty lines and lines starting with # are ignored
 
 PIN_PA27,LED_TX
diff --git a/ports/samd/boards/ADAFRUIT_FEATHER_M4_EXPRESS/pins.csv b/ports/samd/boards/ADAFRUIT_FEATHER_M4_EXPRESS/pins.csv
index ca58a4be79f6b..ad8449ac9ec78 100644
--- a/ports/samd/boards/ADAFRUIT_FEATHER_M4_EXPRESS/pins.csv
+++ b/ports/samd/boards/ADAFRUIT_FEATHER_M4_EXPRESS/pins.csv
@@ -1,9 +1,7 @@
 # Pin rows contain Pin number and pin name.
 # Pin rows start with PIN_
-# LED rows start with LED_
 # If the pin name is omitted, the pin number is added as name.
-# Rows for empty entries have to start with '-'
-# Empty lines and lines starting with PIN_ or LED_ are ignored
+# Empty lines and lines not starting with PIN_ are ignored
 
 PIN_PB17,D0
 PIN_PB16,D1
diff --git a/ports/samd/boards/ADAFRUIT_ITSYBITSY_M0_EXPRESS/pins.csv b/ports/samd/boards/ADAFRUIT_ITSYBITSY_M0_EXPRESS/pins.csv
index e93e00ab9c944..04b1a717bd2cd 100644
--- a/ports/samd/boards/ADAFRUIT_ITSYBITSY_M0_EXPRESS/pins.csv
+++ b/ports/samd/boards/ADAFRUIT_ITSYBITSY_M0_EXPRESS/pins.csv
@@ -1,9 +1,7 @@
 # Pin rows contain Pin number and pin name.
 # Pin rows start with PIN_
-# LED rows start with LED_
 # If the pin name is omitted, the pin number is added as name.
-# Rows for empty entries have to start with '-'
-# Empty lines and lines not starting with PIN_ or LED_ are ignored
+# Empty lines and lines not starting with PIN_ are ignored
 
 PIN_PA11,D0
 PIN_PA10,D1
diff --git a/ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/pins.csv b/ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/pins.csv
index 3dee9bf4c35d9..43c8e9a64a971 100644
--- a/ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/pins.csv
+++ b/ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/pins.csv
@@ -1,9 +1,7 @@
 # Pin rows contain Pin number and pin name.
 # Pin rows start with PIN_
-# LED rows start with LED_
 # If the pin name is omitted, the pin number is added as name.
-# Rows for empty entries have to start with '-'
-# Empty lines and lines starting with # are ignored
+# Empty lines and lines not starting with PIN_ are ignored
 
 PIN_PA16,D0
 PIN_PA17,D1
diff --git a/ports/samd/boards/ADAFRUIT_TRINKET_M0/pins.csv b/ports/samd/boards/ADAFRUIT_TRINKET_M0/pins.csv
index 95f76815f9808..b5f1c9801b154 100644
--- a/ports/samd/boards/ADAFRUIT_TRINKET_M0/pins.csv
+++ b/ports/samd/boards/ADAFRUIT_TRINKET_M0/pins.csv
@@ -1,9 +1,7 @@
 # Pin rows contain Pin number and pin name.
 # Pin rows start with PIN_
-# LED rows start with LED_
 # If the pin name is omitted, the pin number is added as name.
-# Rows for empty entries have to start with '-'
-# Empty lines and lines starting with # are ignored
+# Empty lines and lines not starting with PIN_ are ignored
 
 PIN_PA08,D0
 PIN_PA02,D1
diff --git a/ports/samd/boards/MINISAM_M4/pins.csv b/ports/samd/boards/MINISAM_M4/pins.csv
index f6d0ab657fefb..f676c290a05f6 100644
--- a/ports/samd/boards/MINISAM_M4/pins.csv
+++ b/ports/samd/boards/MINISAM_M4/pins.csv
@@ -1,9 +1,7 @@
 # Pin rows contain Pin number and pin name.
 # Pin rows start with PIN_
-# LED rows start with LED_
 # If the pin name is omitted, the pin number is added as name.
-# Rows for empty entries have to start with '-'
-# Empty lines and lines starting with # are ignored
+# Empty lines and lines not starting with PIN_ are ignored
 
 PIN_PA02,A0_D9
 PIN_PB08,A1_D10
diff --git a/ports/samd/boards/SAMD21_XPLAINED_PRO/pins.csv b/ports/samd/boards/SAMD21_XPLAINED_PRO/pins.csv
index bd0757d5647c0..5990c373bf934 100644
--- a/ports/samd/boards/SAMD21_XPLAINED_PRO/pins.csv
+++ b/ports/samd/boards/SAMD21_XPLAINED_PRO/pins.csv
@@ -1,9 +1,7 @@
 # Pin rows contain Pin number and pin name.
 # Pin rows start with PIN_
-# LED rows start with LED_
 # If the pin name is omitted, the pin number is added as name.
-# Rows for empty entries have to start with '-'
-# Empty lines and lines starting with # are ignored
+# Empty lines and lines not starting with PIN_ are ignored
 
 # EXT1
 PIN_PB00,EXT1_PIN3
diff --git a/ports/samd/boards/SEEED_WIO_TERMINAL/pins.csv b/ports/samd/boards/SEEED_WIO_TERMINAL/pins.csv
index 4db71cc4c1ece..622de4c6c5bb2 100644
--- a/ports/samd/boards/SEEED_WIO_TERMINAL/pins.csv
+++ b/ports/samd/boards/SEEED_WIO_TERMINAL/pins.csv
@@ -1,9 +1,7 @@
 # Pin rows contain Pin number and pin name.
 # Pin rows start with PIN_
-# LED rows start with LED_
 # If the pin name is omitted, the pin number is added as name.
-# Rows for empty entries have to start with '-'
-# Empty lines and lines starting with # are ignored
+# Empty lines and lines not starting with PIN_ are ignored
 
 PIN_PB08,A0_D0
 PIN_PB09,A1_D1
diff --git a/ports/samd/boards/SEEED_XIAO_SAMD21/pins.csv b/ports/samd/boards/SEEED_XIAO_SAMD21/pins.csv
index a06d3ac6ac606..2f1c180e8ac6a 100644
--- a/ports/samd/boards/SEEED_XIAO_SAMD21/pins.csv
+++ b/ports/samd/boards/SEEED_XIAO_SAMD21/pins.csv
@@ -1,9 +1,7 @@
 # Pin rows contain Pin number and pin name.
 # Pin rows start with PIN_
-# LED rows start with LED_
 # If the pin name is omitted, the pin number is added as name.
-# Rows for empty entries have to start with '-'
-# Empty lines and lines starting with # are ignored
+# Empty lines and lines not starting with PIN_ are ignored
 
 PIN_PA02,A0_D0
 PIN_PA04,A1_D1
diff --git a/ports/samd/boards/SPARKFUN_SAMD51_THING_PLUS/pins.csv b/ports/samd/boards/SPARKFUN_SAMD51_THING_PLUS/pins.csv
index dfd6641333fa3..d807b505a7044 100644
--- a/ports/samd/boards/SPARKFUN_SAMD51_THING_PLUS/pins.csv
+++ b/ports/samd/boards/SPARKFUN_SAMD51_THING_PLUS/pins.csv
@@ -1,14 +1,10 @@
 # Pin rows contain Pin number and pin name.
 # Pin rows start with PIN_
-# LED rows start with LED_
 # If the pin name is omitted, the pin number is added as name.
-# Rows for empty entries have to start with '-'
-# Empty lines and lines not starting with PIN_ or LED_ are ignored
+# Empty lines and lines not starting with PIN_ are ignored
 
 PIN_PA13,D0
 PIN_PA12,D1
-PIN_PB23,RXD
-PIN_PB22,TXD
 PIN_PA06,D4
 PIN_PA15,D5
 PIN_PA20,D6

From 60ab5563850587967bc93e5a368e81382ac79de1 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Tue, 24 Jan 2023 11:23:47 +0100
Subject: [PATCH 3083/3533] samd/mcu: Rework the comments in clock_config.c.

For more clarity. clock_config.c is not overly readable, so comments are
important.
---
 ports/samd/mcu/samd21/clock_config.c | 25 +++++++++++++++----------
 ports/samd/mcu/samd51/clock_config.c | 16 ++++++++++------
 2 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/ports/samd/mcu/samd21/clock_config.c b/ports/samd/mcu/samd21/clock_config.c
index 00f743cc49d15..ae8441b7caf08 100644
--- a/ports/samd/mcu/samd21/clock_config.c
+++ b/ports/samd/mcu/samd21/clock_config.c
@@ -135,13 +135,18 @@ void init_clocks(uint32_t cpu_freq) {
     dfll48m_calibration = 0; // please the compiler
 
     // SAMD21 Clock settings
-    // GCLK0: 48MHz from DFLL open loop mode or closed loop mode from 32k Crystal
-    // GCLK1: 32768 Hz from 32K ULP or DFLL48M
-    // GCLK2: 48MHz from DFLL for Peripherals
-    // GCLK3: 1Mhz for the us-counter (TC4/TC5)
-    // GCLK4: 32kHz from crystal, if present
-    // GCLK5: 48MHz from DFLL for USB
-    // GCLK8: 1kHz clock for WDT and RTC
+    //
+    // GCLK0: 48MHz, source: DFLL48M, usage: CPU
+    // GCLK1: 32kHz, source: XOSC32K or OSCULP32K or DFLL48M, usage: FDPLL96M reference
+    // GCLK2: 1-48MHz, source: DFLL48M, usage: Peripherals
+    // GCLK3: 1Mhz,  source: DFLL48M, usage: us-counter (TC4/TC5)
+    // GCLK4: 32kHz, source: XOSC32K, if crystal present, usage: DFLL48M reference
+    // GCLK5: 48MHz, source: DFLL48M, usage: USB
+    // GCLK8: 1kHz,  source: XOSC32K or OSCULP32K, usage: WDT and RTC
+    // DFLL48M: Reference sources:
+    //          - in closed loop mode: eiter XOSC32K or OSCULP32K or USB clock
+    //          - in open loop mode: None
+    // FDPLL96M: Not used (yet). Option to use it for the CPU clock.
 
     NVMCTRL->CTRLB.bit.MANW = 1; // errata "Spurious Writes"
     NVMCTRL->CTRLB.bit.RWS = 1; // 1 read wait state for 48MHz
@@ -169,14 +174,14 @@ void init_clocks(uint32_t cpu_freq) {
     while (GCLK->STATUS.bit.SYNCBUSY) {
     }
 
-    // Connect the GCLK4 to OSC32K via GCLK1 to the DFLL input and for further use.
+    // Connect the GCLK4 to OSC32K
     GCLK->GENDIV.reg = GCLK_GENDIV_ID(4) | GCLK_GENDIV_DIV(1);
     GCLK->GENCTRL.reg = GCLK_GENCTRL_GENEN | GCLK_GENCTRL_SRC_XOSC32K | GCLK_GENCTRL_ID(4);
+    // Connect GCLK4 to the DFLL input.
+    GCLK->CLKCTRL.reg = GCLK_CLKCTRL_GEN_GCLK4 | GCLK_CLKCTRL_ID_DFLL48 | GCLK_CLKCTRL_CLKEN;
     while (GCLK->STATUS.bit.SYNCBUSY) {
     }
 
-    // Connect GCLK4 to the DFLL input and for further use.
-    GCLK->CLKCTRL.reg = GCLK_CLKCTRL_ID_DFLL48 | GCLK_CLKCTRL_GEN_GCLK4 | GCLK_CLKCTRL_CLKEN;
     // Enable access to the DFLLCTRL reg acc. to Errata 1.2.1
     SYSCTRL->DFLLCTRL.reg = SYSCTRL_DFLLCTRL_ENABLE;
     while (SYSCTRL->PCLKSR.bit.DFLLRDY == 0) {
diff --git a/ports/samd/mcu/samd51/clock_config.c b/ports/samd/mcu/samd51/clock_config.c
index b55419d24b67b..5cf543252ec63 100644
--- a/ports/samd/mcu/samd51/clock_config.c
+++ b/ports/samd/mcu/samd51/clock_config.c
@@ -187,12 +187,16 @@ void init_clocks(uint32_t cpu_freq) {
     dfll48m_calibration = 0; // please the compiler
 
     // SAMD51 clock settings
-    // GCLK0: 48MHz from DFLL48M or 48 - 200 MHz from DPLL0 (SAMD51)
-    // GCLK1: 32768 Hz from 32KULP or DFLL48M
-    // GCLK2: 8-48MHz from DFLL48M for Peripheral devices
-    // GCLK3: 16Mhz for the us-counter (TC0/TC1)
-    // GCLK4: 32kHz from crystal, if present
-    // GCLK5: 48MHz from DFLL48M for USB
+    //
+    // GCLK0: 48MHz, source: 48 - 200 MHz from DPLL0, usage: CPU
+    // GCLK1: 32kHz, source: OSCULP32K or DFLL48M, usage: ref_clk DPLL0
+    // GCLK2: 1-48MHz, source:DFLL48M, usage: Peripheral devices
+    // GCLK3: 16Mhz, source: DLLL48M, usage: us-counter (TC0/TC1)
+    // GCLK4: 32kHz, source: XOSC32K, if crystal present, usage: DFLL48M reference
+    // GCLK5: 48MHz, source: DFLL48M, usage: USB
+    // DFLL48M: Reference sources:
+    //          - in closed loop mode: eiter XOSC32K or OSCULP32K or USB clock
+    //          - in open loop mode: None
     // DPLL0: 48 - 200 MHz
 
     // Steps to set up clocks:

From 7e0b1bc95dffad4056ab6a1d6bc54f51cb6a6002 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Tue, 24 Jan 2023 18:37:27 +0100
Subject: [PATCH 3084/3533] samd/mcu: Use the FDPLL96M clock for the SAMD21
 CPU.

Allowing to increase the clock a little bit to 54Mhz.  Not much of a gain,
but useful for generating a RNG entropy source from the jitter between
DFLL48M and FDPLL96M.
---
 ports/samd/mcu/samd21/clock_config.c | 48 ++++++++++++++++++++++------
 ports/samd/mcu/samd21/mpconfigmcu.h  |  3 +-
 2 files changed, 40 insertions(+), 11 deletions(-)

diff --git a/ports/samd/mcu/samd21/clock_config.c b/ports/samd/mcu/samd21/clock_config.c
index ae8441b7caf08..4473be5afc5f1 100644
--- a/ports/samd/mcu/samd21/clock_config.c
+++ b/ports/samd/mcu/samd21/clock_config.c
@@ -55,10 +55,10 @@ void set_cpu_freq(uint32_t cpu_freq_arg) {
     // Set 1 waitstate to be safe
     NVMCTRL->CTRLB.reg = NVMCTRL_CTRLB_MANW | NVMCTRL_CTRLB_RWS(1);
 
-    int div = DFLL48M_FREQ / cpu_freq_arg;
-    peripheral_freq = cpu_freq = DFLL48M_FREQ / div;
+    int div = MAX(DFLL48M_FREQ / cpu_freq_arg, 1);
+    peripheral_freq = DFLL48M_FREQ / div;
 
-    // Enable GCLK output: 48M on both CCLK0 and GCLK2
+    // Enable GCLK output: 48MHz from DFLL48M on both CCLK0 and GCLK2
     GCLK->GENDIV.reg = GCLK_GENDIV_ID(0) | GCLK_GENDIV_DIV(div);
     GCLK->GENCTRL.reg = GCLK_GENCTRL_GENEN | GCLK_GENCTRL_SRC_DFLL48M | GCLK_GENCTRL_ID(0);
     while (GCLK->STATUS.bit.SYNCBUSY) {
@@ -67,6 +67,32 @@ void set_cpu_freq(uint32_t cpu_freq_arg) {
     GCLK->GENCTRL.reg = GCLK_GENCTRL_GENEN | GCLK_GENCTRL_SRC_DFLL48M | GCLK_GENCTRL_ID(2);
     while (GCLK->STATUS.bit.SYNCBUSY) {
     }
+    // The comparison is >=, such that for 48MHz still the FDPLL96 is used for the CPU clock.
+    if (cpu_freq_arg >= 48000000) {
+        cpu_freq = cpu_freq_arg;
+        // Connect GCLK1 to the FDPLL96 input.
+        GCLK->CLKCTRL.reg = GCLK_CLKCTRL_GEN_GCLK1 | GCLK_CLKCTRL_ID_FDPLL | GCLK_CLKCTRL_CLKEN;
+        while (GCLK->STATUS.bit.SYNCBUSY) {
+        }
+        // configure the FDPLL96
+        // CtrlB: Set the ref ource to GCLK, set the Wakup-Fast Flag.
+        SYSCTRL->DPLLCTRLB.reg = SYSCTRL_DPLLCTRLB_REFCLK_GCLK | SYSCTRL_DPLLCTRLB_WUF;
+        // Set the FDPLL ratio and enable the DPLL.
+        int ldr = cpu_freq_arg / FDPLL_REF_FREQ - 1;
+        SYSCTRL->DPLLRATIO.reg = SYSCTRL_DPLLRATIO_LDR(ldr);
+        SYSCTRL->DPLLCTRLA.reg = SYSCTRL_DPLLCTRLA_ENABLE;
+        // Wait for the DPLL lock.
+        while (!SYSCTRL->DPLLSTATUS.bit.LOCK) {
+        }
+        // Finally switch GCLK0 to FDPLL96M.
+        GCLK->GENCTRL.reg = GCLK_GENCTRL_GENEN | GCLK_GENCTRL_SRC_DPLL96M | GCLK_GENCTRL_ID(0);
+        while (GCLK->STATUS.bit.SYNCBUSY) {
+        }
+    } else {
+        cpu_freq = peripheral_freq;
+        // Disable the FDPLL96M in case it was enabled.
+        SYSCTRL->DPLLCTRLA.reg = 0;
+    }
     if (cpu_freq >= 8000000) {
         // Enable GCLK output: 48MHz on GCLK5 for USB
         GCLK->GENDIV.reg = GCLK_GENDIV_ID(5) | GCLK_GENDIV_DIV(1);
@@ -136,8 +162,8 @@ void init_clocks(uint32_t cpu_freq) {
 
     // SAMD21 Clock settings
     //
-    // GCLK0: 48MHz, source: DFLL48M, usage: CPU
-    // GCLK1: 32kHz, source: XOSC32K or OSCULP32K or DFLL48M, usage: FDPLL96M reference
+    // GCLK0: 48MHz, source: DFLL48M or FDPLL96M, usage: CPU
+    // GCLK1: 32kHz, source: XOSC32K or OSCULP32K, usage: FDPLL96M reference
     // GCLK2: 1-48MHz, source: DFLL48M, usage: Peripherals
     // GCLK3: 1Mhz,  source: DFLL48M, usage: us-counter (TC4/TC5)
     // GCLK4: 32kHz, source: XOSC32K, if crystal present, usage: DFLL48M reference
@@ -145,8 +171,10 @@ void init_clocks(uint32_t cpu_freq) {
     // GCLK8: 1kHz,  source: XOSC32K or OSCULP32K, usage: WDT and RTC
     // DFLL48M: Reference sources:
     //          - in closed loop mode: eiter XOSC32K or OSCULP32K or USB clock
+    //            from GCLK4.
     //          - in open loop mode: None
-    // FDPLL96M: Not used (yet). Option to use it for the CPU clock.
+    // FDPLL96M: Reference source GCLK1
+    //           Used for the CPU clock for freq >= 48Mhz
 
     NVMCTRL->CTRLB.bit.MANW = 1; // errata "Spurious Writes"
     NVMCTRL->CTRLB.bit.RWS = 1; // 1 read wait state for 48MHz
@@ -166,7 +194,7 @@ void init_clocks(uint32_t cpu_freq) {
     GCLK->GENDIV.reg = GCLK_GENDIV_ID(1) | GCLK_GENDIV_DIV(1);
     GCLK->GENCTRL.reg = GCLK_GENCTRL_GENEN | GCLK_GENCTRL_SRC_OSCULP32K | GCLK_GENCTRL_ID(1);
     #else
-    // Connect the GCLK1 to OSC32K via GCLK1 to the DFLL input and for further use.
+    // Connect the GCLK1 to OSC32K
     GCLK->GENDIV.reg = GCLK_GENDIV_ID(1) | GCLK_GENDIV_DIV(1);
     GCLK->GENCTRL.reg = GCLK_GENCTRL_GENEN | GCLK_GENCTRL_SRC_XOSC32K | GCLK_GENCTRL_ID(1);
     #endif
@@ -247,9 +275,9 @@ void init_clocks(uint32_t cpu_freq) {
     while (!SYSCTRL->PCLKSR.bit.DFLLRDY) {
     }
 
-    // Enable 32768 Hz on GCLK1 for consistency
-    GCLK->GENDIV.reg = GCLK_GENDIV_ID(1) | GCLK_GENDIV_DIV(48016384 / 32768);
-    GCLK->GENCTRL.reg = GCLK_GENCTRL_GENEN | GCLK_GENCTRL_SRC_DFLL48M | GCLK_GENCTRL_ID(1);
+    // Connect the GCLK1 to the XOSC32KULP
+    GCLK->GENDIV.reg = GCLK_GENDIV_ID(1) | GCLK_GENDIV_DIV(1);
+    GCLK->GENCTRL.reg = GCLK_GENCTRL_GENEN | GCLK_GENCTRL_SRC_OSCULP32K | GCLK_GENCTRL_ID(1);
     while (GCLK->STATUS.bit.SYNCBUSY) {
     }
     // Set GCLK8 to 1 kHz.
diff --git a/ports/samd/mcu/samd21/mpconfigmcu.h b/ports/samd/mcu/samd21/mpconfigmcu.h
index fd6f524d7f903..7d787cacfe497 100644
--- a/ports/samd/mcu/samd21/mpconfigmcu.h
+++ b/ports/samd/mcu/samd21/mpconfigmcu.h
@@ -40,7 +40,8 @@
 
 #define CPU_FREQ                        (48000000)
 #define DFLL48M_FREQ                    (48000000)
-#define MAX_CPU_FREQ                    (48000000)
+#define MAX_CPU_FREQ                    (54000000)
+#define FDPLL_REF_FREQ                  (32768)
 
 #define IRQ_PRI_PENDSV                  ((1 << __NVIC_PRIO_BITS) - 1)
 

From 76cf98c35b81dded1dc623d07f25e28713a16b63 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Tue, 24 Jan 2023 20:36:19 +0100
Subject: [PATCH 3085/3533] samd/mcu: Implement a hardware seed for the SAMD21
 random module.

By using the phase jitter between the DFLL48M clock and the FDPLL96M clock.
Even if both use the same reference source, they have a different jitter.
SysTick is driven by FDPLL96M, the us counter by DFLL48M.  As a random
source, the us counter is read out on every SysTick and the value is used
to accumulate a simple multiply, add and xor register.  According to tests
it creates about 30 bit random bit-flips per second.  That mechanism will
pass quite a few RNG tests, has a suitable frequency distribution and
serves better than just the time after boot to seed the PRNG.
---
 docs/samd/quickref.rst               |  6 ++++--
 ports/samd/mcu/samd21/clock_config.c |  5 +++--
 ports/samd/mcu/samd21/mpconfigmcu.h  |  3 +++
 ports/samd/samd_isr.c                | 16 ++++++++++++++++
 4 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/docs/samd/quickref.rst b/docs/samd/quickref.rst
index aa3d563f7c8ed..cdfb0a4750724 100644
--- a/docs/samd/quickref.rst
+++ b/docs/samd/quickref.rst
@@ -42,8 +42,10 @@ The :mod:`machine` module::
     machine.freq(96_000_000)  # set the CPU frequency to 96 MHz
 
 The range accepted by the function call is 1_000_000 to 200_000_000 (1 MHz to 200 MHz)
-for SAMD51 and 1_000_000 to 48_000_000 (1 MHz to 48 MHz) for SAMD21. The safe
-range for SAMD51 according to the data sheet is 96 MHz to 120 MHz.
+for SAMD51 and 1_000_000 to 54_000_000 (1 MHz to 54 MHz) for SAMD21. The safe
+range for SAMD51 according to the data sheet is up to 120 MHz, for the SAMD21 up to 48Mhz.
+Frequencies below 48Mhz are set by dividing 48Mhz by an integer, limiting the number of
+discrete frequencies to 24Mhz, 16Mhz, 12MHz, and so on.
 At frequencies below 8 MHz USB will be disabled. Changing the frequency below 48 MHz
 impacts the baud rates of UART, I2C and SPI. These have to be set again after
 changing the CPU frequency. The ms and µs timers are not affected by the frequency
diff --git a/ports/samd/mcu/samd21/clock_config.c b/ports/samd/mcu/samd21/clock_config.c
index 4473be5afc5f1..630b5c0a4a0fb 100644
--- a/ports/samd/mcu/samd21/clock_config.c
+++ b/ports/samd/mcu/samd21/clock_config.c
@@ -78,8 +78,9 @@ void set_cpu_freq(uint32_t cpu_freq_arg) {
         // CtrlB: Set the ref ource to GCLK, set the Wakup-Fast Flag.
         SYSCTRL->DPLLCTRLB.reg = SYSCTRL_DPLLCTRLB_REFCLK_GCLK | SYSCTRL_DPLLCTRLB_WUF;
         // Set the FDPLL ratio and enable the DPLL.
-        int ldr = cpu_freq_arg / FDPLL_REF_FREQ - 1;
-        SYSCTRL->DPLLRATIO.reg = SYSCTRL_DPLLRATIO_LDR(ldr);
+        int ldr = cpu_freq / FDPLL_REF_FREQ;
+        int frac = ((cpu_freq - ldr * FDPLL_REF_FREQ) / (FDPLL_REF_FREQ / 16)) & 0x0f;
+        SYSCTRL->DPLLRATIO.reg = SYSCTRL_DPLLRATIO_LDR((frac << 16 | ldr) - 1);
         SYSCTRL->DPLLCTRLA.reg = SYSCTRL_DPLLCTRLA_ENABLE;
         // Wait for the DPLL lock.
         while (!SYSCTRL->DPLLSTATUS.bit.LOCK) {
diff --git a/ports/samd/mcu/samd21/mpconfigmcu.h b/ports/samd/mcu/samd21/mpconfigmcu.h
index 7d787cacfe497..150a378a3ea13 100644
--- a/ports/samd/mcu/samd21/mpconfigmcu.h
+++ b/ports/samd/mcu/samd21/mpconfigmcu.h
@@ -22,6 +22,9 @@
 #define MICROPY_PY_CMATH                (0)
 #endif
 
+#define MICROPY_PY_URANDOM_SEED_INIT_FUNC (trng_random_u32())
+unsigned long trng_random_u32(void);
+
 #define VFS_BLOCK_SIZE_BYTES            (1536) // 24x 64B flash pages;
 
 #ifndef MICROPY_HW_UART_TXBUF
diff --git a/ports/samd/samd_isr.c b/ports/samd/samd_isr.c
index 1d6febaaa226b..838800bdbb193 100644
--- a/ports/samd/samd_isr.c
+++ b/ports/samd/samd_isr.c
@@ -42,6 +42,9 @@ extern void EIC_Handler(void);
 const ISR isr_vector[];
 volatile uint32_t systick_ms;
 volatile uint32_t ticks_us64_upper;
+#if defined(MCU_SAMD21)
+volatile uint32_t rng_state;
+#endif
 
 void Reset_Handler(void) __attribute__((naked));
 void Reset_Handler(void) {
@@ -91,6 +94,12 @@ void Default_Handler(void) {
 }
 
 void SysTick_Handler(void) {
+    #if defined(MCU_SAMD21)
+    // Use the phase jitter between the clocks to get some entropy
+    // and accumulate the random number register.
+    rng_state = (rng_state * 32310901 + 1) ^ (REG_TC4_COUNT32_COUNT >> 1);
+    #endif
+
     uint32_t next_tick = systick_ms + 1;
     systick_ms = next_tick;
 
@@ -99,6 +108,13 @@ void SysTick_Handler(void) {
     }
 }
 
+#if defined(MCU_SAMD21)
+uint32_t trng_random_u32(void) {
+    mp_hal_delay_ms(320); // wait for ten cycles of the rng_seed register
+    return rng_state;
+}
+#endif
+
 void us_timer_IRQ(void) {
     #if defined(MCU_SAMD21)
     if (TC4->COUNT32.INTFLAG.reg & TC_INTFLAG_OVF) {

From 4160ec087b265cfef320140e99449271a7757374 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Wed, 25 Jan 2023 18:05:40 +0100
Subject: [PATCH 3086/3533] samd/mcu: Set the SAMD21 us-counter to 2 MHz for
 better resolution.

It turned out that the result of calling ticks_us() was always either odd
or even, depending on some internal state during boot.  So the us-counter
was set to a 2 MHz input and the result shifted by 1.  The counting period
is still long enough, since internally a (now) 63 bit value is used for us.
---
 ports/samd/mcu/samd21/clock_config.c | 6 +++---
 ports/samd/mphalport.c               | 2 +-
 ports/samd/mphalport.h               | 4 ----
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/ports/samd/mcu/samd21/clock_config.c b/ports/samd/mcu/samd21/clock_config.c
index 630b5c0a4a0fb..d3c8c719953de 100644
--- a/ports/samd/mcu/samd21/clock_config.c
+++ b/ports/samd/mcu/samd21/clock_config.c
@@ -166,7 +166,7 @@ void init_clocks(uint32_t cpu_freq) {
     // GCLK0: 48MHz, source: DFLL48M or FDPLL96M, usage: CPU
     // GCLK1: 32kHz, source: XOSC32K or OSCULP32K, usage: FDPLL96M reference
     // GCLK2: 1-48MHz, source: DFLL48M, usage: Peripherals
-    // GCLK3: 1Mhz,  source: DFLL48M, usage: us-counter (TC4/TC5)
+    // GCLK3: 2Mhz,  source: DFLL48M, usage: us-counter (TC4/TC5)
     // GCLK4: 32kHz, source: XOSC32K, if crystal present, usage: DFLL48M reference
     // GCLK5: 48MHz, source: DFLL48M, usage: USB
     // GCLK8: 1kHz,  source: XOSC32K or OSCULP32K, usage: WDT and RTC
@@ -291,8 +291,8 @@ void init_clocks(uint32_t cpu_freq) {
 
     set_cpu_freq(cpu_freq);
 
-    // Enable GCLK output: 1MHz on GCLK3 for TC4
-    GCLK->GENDIV.reg = GCLK_GENDIV_ID(3) | GCLK_GENDIV_DIV(48);
+    // Enable GCLK output: 2MHz on GCLK3 for TC4
+    GCLK->GENDIV.reg = GCLK_GENDIV_ID(3) | GCLK_GENDIV_DIV(24);
     GCLK->GENCTRL.reg = GCLK_GENCTRL_GENEN | GCLK_GENCTRL_SRC_DFLL48M | GCLK_GENCTRL_ID(3);
     while (GCLK->STATUS.bit.SYNCBUSY) {
     }
diff --git a/ports/samd/mphalport.c b/ports/samd/mphalport.c
index 44d1470fc544c..d7511e61fbf58 100644
--- a/ports/samd/mphalport.c
+++ b/ports/samd/mphalport.c
@@ -147,7 +147,7 @@ uint64_t mp_hal_ticks_us_64(void) {
         us64_upper++;
     }
     #if defined(MCU_SAMD21)
-    return ((uint64_t)us64_upper << 32) | us64_lower;
+    return ((uint64_t)us64_upper << 31) | (us64_lower >> 1);
     #elif defined(MCU_SAMD51)
     return ((uint64_t)us64_upper << 28) | (us64_lower >> 4);
     #endif
diff --git a/ports/samd/mphalport.h b/ports/samd/mphalport.h
index d5fc935343d34..83ccf44222d3e 100644
--- a/ports/samd/mphalport.h
+++ b/ports/samd/mphalport.h
@@ -54,11 +54,7 @@ static inline mp_uint_t mp_hal_ticks_ms(void) {
 }
 
 static inline mp_uint_t mp_hal_ticks_us(void) {
-    #if defined(MCU_SAMD21)
-    return REG_TC4_COUNT32_COUNT;
-    #else
     return (mp_uint_t)mp_hal_ticks_us_64();
-    #endif
 }
 
 #if defined(MCU_SAMD21)

From b11026689724830fcfcb5060df2c5a17cb4dbc65 Mon Sep 17 00:00:00 2001
From: robert-hh <robert@hammelrath.com>
Date: Tue, 14 Feb 2023 10:02:22 +0100
Subject: [PATCH 3087/3533] samd/moduos: Add uos.urandom() using the
 phase-jitter rng.

This RNG passes many of the Diehard tests and also the AIS31 test suite.
The RNG is quite slow, delivering 200bytes/s.

Tested on boards with and without a crystal.
---
 ports/samd/mcu/samd21/mpconfigmcu.h |  5 +++--
 ports/samd/moduos.c                 | 20 ++++++++++++++++++--
 ports/samd/samd_isr.c               |  9 +--------
 3 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/ports/samd/mcu/samd21/mpconfigmcu.h b/ports/samd/mcu/samd21/mpconfigmcu.h
index 150a378a3ea13..db4e58753c5f9 100644
--- a/ports/samd/mcu/samd21/mpconfigmcu.h
+++ b/ports/samd/mcu/samd21/mpconfigmcu.h
@@ -22,8 +22,8 @@
 #define MICROPY_PY_CMATH                (0)
 #endif
 
-#define MICROPY_PY_URANDOM_SEED_INIT_FUNC (trng_random_u32())
-unsigned long trng_random_u32(void);
+#define MICROPY_PY_URANDOM_SEED_INIT_FUNC (trng_random_u32(300))
+unsigned long trng_random_u32(int delay);
 
 #define VFS_BLOCK_SIZE_BYTES            (1536) // 24x 64B flash pages;
 
@@ -36,6 +36,7 @@ unsigned long trng_random_u32(void);
 #define MICROPY_PY_MACHINE_RTC          (1)
 #endif
 #endif
+#define MICROPY_PY_UOS_URANDOM          (1)
 
 #ifndef MICROPY_PY_MACHINE_PIN_BOARD_CPU
 #define MICROPY_PY_MACHINE_PIN_BOARD_CPU (1)
diff --git a/ports/samd/moduos.c b/ports/samd/moduos.c
index e0237fd88f0c8..3404919d24b59 100644
--- a/ports/samd/moduos.c
+++ b/ports/samd/moduos.c
@@ -52,6 +52,23 @@ uint32_t trng_random_u32(void) {
     return REG_TRNG_DATA;
 }
 
+#define TRNG_RANDOM_U32 trng_random_u32()
+#endif // defined(MCU_SAMD51)
+
+#if defined(MCU_SAMD21)
+extern volatile uint32_t rng_state;
+
+uint32_t trng_random_u32(int delay) {
+    mp_hal_delay_ms(delay); // wait a few cycles
+    uint32_t upper = rng_state;
+    mp_hal_delay_ms(delay); // wait again a few cycles
+    return (upper & 0xffff0000) | (rng_state >> 16);
+}
+
+#define trng_start()
+#define TRNG_RANDOM_U32 trng_random_u32(10)
+#endif
+
 #if MICROPY_PY_UOS_URANDOM
 STATIC mp_obj_t mp_uos_urandom(mp_obj_t num) {
     mp_int_t n = mp_obj_get_int(num);
@@ -62,7 +79,7 @@ STATIC mp_obj_t mp_uos_urandom(mp_obj_t num) {
     trng_start();
     for (int i = 0; i < n; i++) {
         if ((i % 4) == 0) {
-            rngval = trng_random_u32();
+            rngval = TRNG_RANDOM_U32;
         }
         vstr.buf[i] = rngval & 0xff;
         rngval >>= 8;
@@ -72,7 +89,6 @@ STATIC mp_obj_t mp_uos_urandom(mp_obj_t num) {
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_uos_urandom_obj, mp_uos_urandom);
 
 #endif // MICROPY_PY_UOS_URANDOM
-#endif // defined(MCU_SAMD51)
 
 #if MICROPY_PY_UOS_DUPTERM_BUILTIN_STREAM
 bool mp_uos_dupterm_is_builtin_stream(mp_const_obj_t stream) {
diff --git a/ports/samd/samd_isr.c b/ports/samd/samd_isr.c
index 838800bdbb193..a12140313b24c 100644
--- a/ports/samd/samd_isr.c
+++ b/ports/samd/samd_isr.c
@@ -96,7 +96,7 @@ void Default_Handler(void) {
 void SysTick_Handler(void) {
     #if defined(MCU_SAMD21)
     // Use the phase jitter between the clocks to get some entropy
-    // and accumulate the random number register.
+    // and accumulate the random number register with a "spiced" LCG.
     rng_state = (rng_state * 32310901 + 1) ^ (REG_TC4_COUNT32_COUNT >> 1);
     #endif
 
@@ -108,13 +108,6 @@ void SysTick_Handler(void) {
     }
 }
 
-#if defined(MCU_SAMD21)
-uint32_t trng_random_u32(void) {
-    mp_hal_delay_ms(320); // wait for ten cycles of the rng_seed register
-    return rng_state;
-}
-#endif
-
 void us_timer_IRQ(void) {
     #if defined(MCU_SAMD21)
     if (TC4->COUNT32.INTFLAG.reg & TC_INTFLAG_OVF) {

From 69b93527d555c45185e7bd933ed0725f4b7230c9 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Tue, 21 Feb 2023 16:01:58 +1100
Subject: [PATCH 3088/3533] ports: Make BOARD default from BOARD_DIR in
 Makefile's.

This allows:

    $ make BOARD_DIR=path/to/board

to infer BOARD=board, rather than the previous behavior that required
additionally setting BOARD explicitly.

Also makes the same change for VARIANT_DIR -> VARIANT on Unix.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
Signed-off-by: Damien George <damien@micropython.org>
---
 ports/esp8266/Makefile     | 18 ++++++++++++------
 ports/mimxrt/Makefile      | 16 +++++++++++++---
 ports/nrf/Makefile         | 14 ++++++++++----
 ports/renesas-ra/Makefile  | 18 ++++++++++++------
 ports/samd/Makefile        | 17 +++++++++++++----
 ports/stm32/Makefile       | 18 ++++++++++++------
 ports/stm32/mboot/Makefile | 14 +++++++++-----
 ports/unix/Makefile        | 17 ++++++++++++-----
 ports/windows/Makefile     | 17 ++++++++++++-----
 9 files changed, 105 insertions(+), 44 deletions(-)

diff --git a/ports/esp8266/Makefile b/ports/esp8266/Makefile
index 168d1d9f6ab66..c5eb63fad6ff6 100644
--- a/ports/esp8266/Makefile
+++ b/ports/esp8266/Makefile
@@ -1,15 +1,21 @@
-# Select the board to build for: if not given on the command line,
-# then default to GENERIC.
+# Select the board to build for:
+ifdef BOARD_DIR
+# Custom board path - remove trailing slash and get the final component of
+# the path as the board name.
+BOARD ?= $(notdir $(BOARD_DIR:/=))
+else
+# If not given on the command line, then default to GENERIC.
 BOARD ?= GENERIC
-
-# If the build directory is not given, make it reflect the board name.
-BUILD ?= build-$(BOARD)
-
 BOARD_DIR ?= boards/$(BOARD)
+endif
+
 ifeq ($(wildcard $(BOARD_DIR)/.),)
 $(error Invalid BOARD specified: $(BOARD_DIR))
 endif
 
+# If the build directory is not given, make it reflect the board name.
+BUILD ?= build-$(BOARD)
+
 include ../../py/mkenv.mk
 
 # Optional
diff --git a/ports/mimxrt/Makefile b/ports/mimxrt/Makefile
index bcddeb2d8b4ce..e5a14d010c61a 100644
--- a/ports/mimxrt/Makefile
+++ b/ports/mimxrt/Makefile
@@ -2,8 +2,21 @@
 # Parameter Configuration
 # =============================================================================
 
+# Select the board to build for:
+ifdef BOARD_DIR
+# Custom board path - remove trailing slash and get the final component of
+# the path as the board name.
+BOARD ?= $(notdir $(BOARD_DIR:/=))
+else
+# If not given on the command line, then default to TEENSY40.
 BOARD ?= TEENSY40
 BOARD_DIR ?= boards/$(BOARD)
+endif
+
+ifeq ($(wildcard $(BOARD_DIR)/.),)
+    $(error Invalid BOARD specified: $(BOARD_DIR))
+endif
+
 BUILD ?= build-$(BOARD)
 PORT ?= /dev/ttyACM0
 CROSS_COMPILE ?= arm-none-eabi-
@@ -25,9 +38,6 @@ MAKE_FLEXRAM_LD = boards/make-flexram-config.py
 include ../../py/mkenv.mk
 
 # Include micropython configuration board makefile
-ifeq ($(wildcard $(BOARD_DIR)/.),)
-    $(error Invalid BOARD specified: $(BOARD_DIR))
-endif
 include $(BOARD_DIR)/mpconfigboard.mk
 
 # File containing description of content to be frozen into firmware.
diff --git a/ports/nrf/Makefile b/ports/nrf/Makefile
index 5cb2fc0311633..9ba62675773a5 100644
--- a/ports/nrf/Makefile
+++ b/ports/nrf/Makefile
@@ -1,12 +1,18 @@
-# Select the board to build for: if not given on the command line,
-# then default to pca10040.
+# Select the board to build for:
+ifdef BOARD_DIR
+# Custom board path - remove trailing slash and get the final component of
+# the path as the board name.
+BOARD ?= $(notdir $(BOARD_DIR:/=))
+else
+# If not given on the command line, then default to pca10040.
 BOARD ?= pca10040
+BOARD_DIR ?= boards/$(BOARD)
+endif
+
 ifeq ($(wildcard boards/$(BOARD)/.),)
 $(error Invalid BOARD specified)
 endif
 
-BOARD_DIR ?= boards/$(BOARD)
-
 # If SoftDevice is selected, try to use that one.
 SD ?=
 SD_LOWER = $(shell echo $(SD) | tr '[:upper:]' '[:lower:]')
diff --git a/ports/renesas-ra/Makefile b/ports/renesas-ra/Makefile
index 17ec58ae0b6be..dc4b158483499 100644
--- a/ports/renesas-ra/Makefile
+++ b/ports/renesas-ra/Makefile
@@ -1,15 +1,21 @@
-# Select the board to build for: if not given on the command line,
-# then default to RA6M2_EK.
+# Select the board to build for:
+ifdef BOARD_DIR
+# Custom board path - remove trailing slash and get the final component of
+# the path as the board name.
+BOARD ?= $(notdir $(BOARD_DIR:/=))
+else
+# If not given on the command line, then default to RA6M2_EK.
 BOARD ?= RA6M2_EK
-
-# If the build directory is not given, make it reflect the board name.
-BUILD ?= build-$(BOARD)
-
 BOARD_DIR ?= boards/$(BOARD)
+endif
+
 ifeq ($(wildcard $(BOARD_DIR)/.),)
 $(error Invalid BOARD specified: $(BOARD_DIR))
 endif
 
+# If the build directory is not given, make it reflect the board name.
+BUILD ?= build-$(BOARD)
+
 ifeq ($(BOARD),RA4M1_CLICKER)
 BOARD_LOW = ra4m1_ek
 CMSIS_MCU_LOW = ra4m1
diff --git a/ports/samd/Makefile b/ports/samd/Makefile
index fc5fa9e4375de..465a70a6171ac 100644
--- a/ports/samd/Makefile
+++ b/ports/samd/Makefile
@@ -1,14 +1,23 @@
+# Select the board to build for:
+ifdef BOARD_DIR
+# Custom board path - remove trailing slash and get the final component of
+# the path as the board name.
+BOARD ?= $(notdir $(BOARD_DIR:/=))
+else
+# If not given on the command line, then default to ADAFRUIT_ITSYBITSY_M4_EXPRESS.
 BOARD ?= ADAFRUIT_ITSYBITSY_M4_EXPRESS
 BOARD_DIR ?= boards/$(BOARD)
-BUILD ?= build-$(BOARD)
-
-CROSS_COMPILE ?= arm-none-eabi-
-UF2CONV ?= $(TOP)/tools/uf2conv.py
+endif
 
 ifeq ($(wildcard $(BOARD_DIR)/.),)
 $(error Invalid BOARD specified: $(BOARD_DIR))
 endif
 
+BUILD ?= build-$(BOARD)
+
+CROSS_COMPILE ?= arm-none-eabi-
+UF2CONV ?= $(TOP)/tools/uf2conv.py
+
 MCU_SERIES_LOWER = $(shell echo $(MCU_SERIES) | tr '[:upper:]' '[:lower:]')
 
 include ../../py/mkenv.mk
diff --git a/ports/stm32/Makefile b/ports/stm32/Makefile
index d57e72a6c5c2c..5774f9de5b14c 100644
--- a/ports/stm32/Makefile
+++ b/ports/stm32/Makefile
@@ -1,15 +1,21 @@
-# Select the board to build for: if not given on the command line,
-# then default to PYBV10.
+# Select the board to build for:
+ifdef BOARD_DIR
+# Custom board path - remove trailing slash and get the final component of
+# the path as the board name.
+BOARD ?= $(notdir $(BOARD_DIR:/=))
+else
+# If not given on the command line, then default to PYBV10.
 BOARD ?= PYBV10
-
-# If the build directory is not given, make it reflect the board name.
-BUILD ?= build-$(BOARD)
-
 BOARD_DIR ?= boards/$(BOARD)
+endif
+
 ifeq ($(wildcard $(BOARD_DIR)/.),)
 $(error Invalid BOARD specified: $(BOARD_DIR))
 endif
 
+# If the build directory is not given, make it reflect the board name.
+BUILD ?= build-$(BOARD)
+
 include ../../py/mkenv.mk
 -include mpconfigport.mk
 include $(BOARD_DIR)/mpconfigboard.mk
diff --git a/ports/stm32/mboot/Makefile b/ports/stm32/mboot/Makefile
index 12ffdbc7e4682..053b317e17c35 100755
--- a/ports/stm32/mboot/Makefile
+++ b/ports/stm32/mboot/Makefile
@@ -1,13 +1,17 @@
-# Select the board to build for: if not given on the command line,
-# then default to PYBV10.
+# Select the board to build for:
+ifdef BOARD_DIR
+# Custom board path - remove trailing slash and get the final component of
+# the path as the board name.
+BOARD ?= $(notdir $(BOARD_DIR:/=))
+else
+# If not given on the command line, then default to PYBV10.
 BOARD ?= PYBV10
+BOARD_DIR ?= $(abspath ../boards/$(BOARD))
+endif
 
 # If the build directory is not given, make it reflect the board name.
 BUILD ?= build-$(BOARD)
 
-# Allow the directory containing the board configuration to be specified
-BOARD_DIR ?= $(abspath ../boards/$(BOARD))
-
 # Set USE_MBOOT to 1 so that TEXT0_ADDR gets set properly for those boards
 # that can be built with or without mboot.
 USE_MBOOT ?= 1
diff --git a/ports/unix/Makefile b/ports/unix/Makefile
index 8e9094b40cd63..403405dcc2b8d 100644
--- a/ports/unix/Makefile
+++ b/ports/unix/Makefile
@@ -1,14 +1,21 @@
-# Select the variant to build for.
+# Select the variant to build for:
+ifdef VARIANT_DIR
+# Custom variant path - remove trailing slash and get the final component of
+# the path as the variant name.
+VARIANT ?= $(notdir $(VARIANT_DIR:/=))
+else
+# If not given on the command line, then default to standard.
 VARIANT ?= standard
-
-# If the build directory is not given, make it reflect the variant name.
-BUILD ?= build-$(VARIANT)
-
 VARIANT_DIR ?= variants/$(VARIANT)
+endif
+
 ifeq ($(wildcard $(VARIANT_DIR)/.),)
 $(error Invalid VARIANT specified: $(VARIANT_DIR))
 endif
 
+# If the build directory is not given, make it reflect the variant name.
+BUILD ?= build-$(VARIANT)
+
 include ../../py/mkenv.mk
 -include mpconfigport.mk
 include $(VARIANT_DIR)/mpconfigvariant.mk
diff --git a/ports/windows/Makefile b/ports/windows/Makefile
index e7f0f2ff618b3..b366e03bf9b4a 100644
--- a/ports/windows/Makefile
+++ b/ports/windows/Makefile
@@ -1,14 +1,21 @@
-# Select the variant to build for.
+# Select the variant to build for:
+ifdef VARIANT_DIR
+# Custom variant path - remove trailing slash and get the final component of
+# the path as the variant name.
+VARIANT ?= $(notdir $(VARIANT_DIR:/=))
+else
+# If not given on the command line, then default to standard.
 VARIANT ?= standard
-
-# If the build directory is not given, make it reflect the variant name.
-BUILD ?= build-$(VARIANT)
-
 VARIANT_DIR ?= variants/$(VARIANT)
+endif
+
 ifeq ($(wildcard $(VARIANT_DIR)/.),)
 $(error Invalid VARIANT specified: $(VARIANT_DIR))
 endif
 
+# If the build directory is not given, make it reflect the variant name.
+BUILD ?= build-$(VARIANT)
+
 include ../../py/mkenv.mk
 -include mpconfigport.mk
 include $(VARIANT_DIR)/mpconfigvariant.mk

From 742037ec3836c56baf51289288ba954d901e728a Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Tue, 21 Feb 2023 16:23:17 +1100
Subject: [PATCH 3089/3533] esp32/Makefile: Allow specifying BOARD_DIR on make
 command line.

This matches the behavior of the makefile ports but implemented for CMake,
making it easy to specify custom board definitions.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/esp32/Makefile | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/ports/esp32/Makefile b/ports/esp32/Makefile
index e43cad751b216..0b33fa6e5a735 100644
--- a/ports/esp32/Makefile
+++ b/ports/esp32/Makefile
@@ -2,8 +2,20 @@
 #
 # This is a simple, convenience wrapper around idf.py (which uses cmake).
 
-# Select the board to build for, defaulting to GENERIC.
+# Select the board to build for:
+ifdef BOARD_DIR
+# Custom board path - remove trailing slash and get the final component of
+# the path as the board name.
+BOARD ?= $(notdir $(BOARD_DIR:/=))
+else
+# If not given on the command line, then default to GENERIC.
 BOARD ?= GENERIC
+BOARD_DIR ?= boards/$(BOARD)
+endif
+
+ifeq ($(wildcard $(BOARD_DIR)/.),)
+$(error Invalid BOARD specified: $(BOARD_DIR))
+endif
 
 # If the build directory is not given, make it reflect the board name.
 BUILD ?= build-$(BOARD)
@@ -28,7 +40,7 @@ ifdef USER_C_MODULES
 	CMAKE_ARGS += -DUSER_C_MODULES=${USER_C_MODULES}
 endif
 
-IDFPY_FLAGS += -D MICROPY_BOARD=$(BOARD) -B $(BUILD) $(CMAKE_ARGS)
+IDFPY_FLAGS += -D MICROPY_BOARD=$(BOARD) -D MICROPY_BOARD_DIR=$(abspath $(BOARD_DIR)) -B $(BUILD) $(CMAKE_ARGS)
 
 ifdef FROZEN_MANIFEST
        IDFPY_FLAGS += -D MICROPY_FROZEN_MANIFEST=$(FROZEN_MANIFEST)

From 8e430a7d43ea6e32fa4c16cb45bc533704a8b996 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Tue, 21 Feb 2023 16:24:17 +1100
Subject: [PATCH 3090/3533] rp2/Makefile: Allow specifying BOARD_DIR on make
 command line.

This matches the behavior of the makefile ports but implemented for CMake,
making it easy to specify custom board definitions.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 ports/rp2/Makefile | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/ports/rp2/Makefile b/ports/rp2/Makefile
index 7057021bfccbe..4f5b4728ecbc0 100644
--- a/ports/rp2/Makefile
+++ b/ports/rp2/Makefile
@@ -2,13 +2,26 @@
 #
 # This is a simple wrapper around cmake
 
+# Select the board to build for:
+ifdef BOARD_DIR
+# Custom board path - remove trailing slash and get the final component of
+# the path as the board name.
+BOARD ?= $(notdir $(BOARD_DIR:/=))
+else
+# If not given on the command line, then default to PICO.
 BOARD ?= PICO
+BOARD_DIR ?= boards/$(BOARD)
+endif
+
+ifeq ($(wildcard $(BOARD_DIR)/.),)
+$(error Invalid BOARD specified: $(BOARD_DIR))
+endif
  
 BUILD ?= build-$(BOARD)
 
 $(VERBOSE)MAKESILENT = -s
 
-CMAKE_ARGS = -DMICROPY_BOARD=$(BOARD)
+CMAKE_ARGS = -DMICROPY_BOARD=$(BOARD) -DMICROPY_BOARD_DIR=$(abspath $(BOARD_DIR))
 
 ifdef USER_C_MODULES
 CMAKE_ARGS += -DUSER_C_MODULES=${USER_C_MODULES}

From 8d9a7fd22836de6aa16c9d208212092805fc5641 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 23 Feb 2023 10:14:04 +1100
Subject: [PATCH 3091/3533] stm32/Makefile: Clean up nested if-else to chained
 if-else-if.

Makefile's support "else ifdef", so use it to make the logic clearer.

Also dedent some associated lines for consistency.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/Makefile | 22 +++++++---------------
 1 file changed, 7 insertions(+), 15 deletions(-)

diff --git a/ports/stm32/Makefile b/ports/stm32/Makefile
index 5774f9de5b14c..1fd2757c4ada1 100644
--- a/ports/stm32/Makefile
+++ b/ports/stm32/Makefile
@@ -121,14 +121,12 @@ endif
 # Configure floating point support
 ifeq ($(MICROPY_FLOAT_IMPL),double)
 CFLAGS += -DMICROPY_FLOAT_IMPL=MICROPY_FLOAT_IMPL_DOUBLE
-else
-ifeq ($(MICROPY_FLOAT_IMPL),none)
+else ifeq ($(MICROPY_FLOAT_IMPL),none)
 CFLAGS += -DMICROPY_FLOAT_IMPL=MICROPY_FLOAT_IMPL_NONE
 else
 CFLAGS += -DMICROPY_FLOAT_IMPL=MICROPY_FLOAT_IMPL_FLOAT
 CFLAGS += -fsingle-precision-constant
 endif
-endif
 
 LDFLAGS += -nostdlib -L $(LD_DIR) $(addprefix -T,$(LD_FILES)) -Wl,-Map=$(@:.elf=.map) -Wl,--cref
 LDFLAGS += -Wl,--defsym=_estack_reserve=8
@@ -369,8 +367,7 @@ CSUPEROPT = -Os # save some code space
 SRC_O += \
 	resethandler_m0.o \
 	shared/runtime/gchelper_thumb1.o
-else
-ifeq ($(MCU_SERIES),l1)
+else ifeq ($(MCU_SERIES),l1)
 CFLAGS += -DUSE_HAL_DRIVER
 SRC_O += \
 	resethandler_m3.o \
@@ -381,7 +378,6 @@ SRC_O += \
 	resethandler.o \
 	shared/runtime/gchelper_thumb2.o
 endif
-endif
 
 HAL_SRC_C += $(addprefix $(STM32LIB_HAL_BASE)/Src/stm32$(MCU_SERIES)xx_,\
 	hal.c \
@@ -442,21 +438,17 @@ HAL_SRC_C += $(addprefix $(STM32LIB_HAL_BASE)/Src/stm32$(MCU_SERIES)xx_,\
 endif
 
 ifeq ($(MCU_SERIES),$(filter $(MCU_SERIES),g0 g4))
-    HAL_SRC_C += $(addprefix $(STM32LIB_HAL_BASE)/Src/stm32$(MCU_SERIES)xx_, hal_fdcan.c)
+HAL_SRC_C += $(addprefix $(STM32LIB_HAL_BASE)/Src/stm32$(MCU_SERIES)xx_, hal_fdcan.c)
 endif
 
 ifeq ($(CMSIS_MCU),$(filter $(CMSIS_MCU),STM32H743xx STM32H747xx STM32H750xx STM32H7A3xx STM32H7A3xxQ STM32H7B3xx STM32H7B3xxQ))
-    HAL_SRC_C += $(addprefix $(STM32LIB_HAL_BASE)/Src/stm32$(MCU_SERIES)xx_, hal_fdcan.c)
-else
-ifeq ($(MCU_SERIES),$(filter $(MCU_SERIES),f0 f4 f7 h7))
-    HAL_SRC_C += $(addprefix $(STM32LIB_HAL_BASE)/Src/stm32$(MCU_SERIES)xx_, hal_can.c)
-else
-ifeq ($(MCU_SERIES),$(filter $(MCU_SERIES),l4))
+HAL_SRC_C += $(addprefix $(STM32LIB_HAL_BASE)/Src/stm32$(MCU_SERIES)xx_, hal_fdcan.c)
+else ifeq ($(MCU_SERIES),$(filter $(MCU_SERIES),f0 f4 f7 h7))
+HAL_SRC_C += $(addprefix $(STM32LIB_HAL_BASE)/Src/stm32$(MCU_SERIES)xx_, hal_can.c)
+else ifeq ($(MCU_SERIES),$(filter $(MCU_SERIES),l4))
 HAL_SRC_C += $(addprefix $(STM32LIB_HAL_BASE)/Src/Legacy/stm32$(MCU_SERIES)xx_, hal_can.c)
 $(BUILD)/$(STM32LIB_HAL_BASE)/Src/Legacy/stm32$(MCU_SERIES)xx_hal_can.o: CFLAGS += -Wno-error=cpp
 endif
-endif
-endif
 
 ifeq ($(MCU_SERIES),$(filter $(MCU_SERIES),f0 f4 f7 g0 l0))
 HAL_SRC_C += $(addprefix $(STM32LIB_HAL_BASE)/Src/stm32$(MCU_SERIES)xx_,\

From ce9f7cd00ab683e6b9a56d519525ba9d0fab63d0 Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Fri, 3 Feb 2023 00:04:48 +1100
Subject: [PATCH 3092/3533] tools/mpremote: Use hatch to build mpremote
 package.

This allows the entire configuration to be defined in a single file,
including the logic for including pyboard.py and automatically versioning
based on the git tag.

Building the package works both via `python -m build` as well as
`hatch build`.  `python -m build ` has the advantage of automatically
fetching all dependencies, you don't need to manually install any hatch
packages.

In order to make the versioning work, and also keep things simpler for end
users, mpremote releases will now be the same as MicroPython releases and
use the same tag.  The version strings for mpremote will look like:
- X.Y.Z -- clean build at the tag
- X.Y.Z.postN+gHASH -- clean build, N revisions from the most recent tag
- X.Y.Z.postN+gHASH.dYYYYMMDD -- dirty build, N revisions from out

This commit extends on the idea from #8404.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 tools/mpremote/.gitignore           |  1 +
 tools/mpremote/mpremote/__init__.py | 13 ++++++-
 tools/mpremote/pyproject.toml       | 54 +++++++++++++++++++++++++++--
 tools/mpremote/requirements.txt     |  2 ++
 tools/mpremote/setup.cfg            | 25 -------------
 5 files changed, 66 insertions(+), 29 deletions(-)
 create mode 100644 tools/mpremote/.gitignore
 create mode 100644 tools/mpremote/requirements.txt
 delete mode 100644 tools/mpremote/setup.cfg

diff --git a/tools/mpremote/.gitignore b/tools/mpremote/.gitignore
new file mode 100644
index 0000000000000..849ddff3b7ec9
--- /dev/null
+++ b/tools/mpremote/.gitignore
@@ -0,0 +1 @@
+dist/
diff --git a/tools/mpremote/mpremote/__init__.py b/tools/mpremote/mpremote/__init__.py
index 6a9beea82f651..d1416230b6570 100644
--- a/tools/mpremote/mpremote/__init__.py
+++ b/tools/mpremote/mpremote/__init__.py
@@ -1 +1,12 @@
-__version__ = "0.4.0"
+try:
+    from importlib.metadata import version, PackageNotFoundError
+
+    try:
+        __version__ = version("mpremote")
+    except PackageNotFoundError:
+        # Error loading package version (e.g. running from source).
+        __version__ = "0.0.0-local"
+except ImportError:
+    # importlib.metadata not available (e.g. CPython <3.8 without
+    # importlib_metadata compatibility package installed).
+    __version__ = "0.0.0-unknown"
diff --git a/tools/mpremote/pyproject.toml b/tools/mpremote/pyproject.toml
index 374b58cbf4636..1b6c2173d261d 100644
--- a/tools/mpremote/pyproject.toml
+++ b/tools/mpremote/pyproject.toml
@@ -1,6 +1,54 @@
 [build-system]
 requires = [
-    "setuptools>=42",
-    "wheel"
+    "hatchling",
+    "hatch-requirements-txt",
+    "hatch-vcs",
 ]
-build-backend = "setuptools.build_meta"
+build-backend = "hatchling.build"
+
+[project]
+name = "mpremote"
+description = "Tool for interacting remotely with MicroPython devices"
+readme = "README.md"
+authors = [
+    {name = "Damien George", email = "damien@micropython.org"},
+]
+urls = {Homepage = "https://github.com/micropython/micropython"}
+keywords = [
+    "hardware",
+    "micropython",
+]
+license = {text = "MIT"}
+classifiers = [
+    "Intended Audience :: Developers",
+    "License :: OSI Approved :: MIT License",
+    "Operating System :: OS Independent",
+    "Programming Language :: Python :: 3",
+    "Topic :: Software Development :: Embedded Systems",
+    "Topic :: System :: Hardware",
+]
+requires-python = ">=3.4"
+dynamic = ["dependencies", "version"]
+
+[project.scripts]
+mpremote = "mpremote.main:main"
+
+[tool.hatch.metadata.hooks.requirements_txt]
+files = ["requirements.txt"]
+
+[tool.hatch.version]
+source = "vcs"
+tag-pattern = "(?P<version>v(\\d+).(\\d+).(\\d+))"
+raw-options = { root = "../..", version_scheme = "post-release" }
+
+[tool.hatch.build]
+packages = ["mpremote"]
+
+# Also grab pyboard.py from /tools and add it to the package for both wheel and sdist.
+[tool.hatch.build.force-include]
+"../pyboard.py" = "mpremote/pyboard.py"
+
+# Workaround to allow `python -m build` to work.
+[tool.hatch.build.targets.sdist.force-include]
+"../pyboard.py" = "mpremote/pyboard.py"
+"requirements.txt" = "requirements.txt"
diff --git a/tools/mpremote/requirements.txt b/tools/mpremote/requirements.txt
new file mode 100644
index 0000000000000..e4ca98fcaa233
--- /dev/null
+++ b/tools/mpremote/requirements.txt
@@ -0,0 +1,2 @@
+pyserial >= 3.3
+importlib_metadata >= 1.4
diff --git a/tools/mpremote/setup.cfg b/tools/mpremote/setup.cfg
deleted file mode 100644
index 7fae3cbcb3906..0000000000000
--- a/tools/mpremote/setup.cfg
+++ /dev/null
@@ -1,25 +0,0 @@
-[metadata]
-name = mpremote
-version = 0.4.0
-author = Damien George
-author_email = damien@micropython.org
-description = Tool for interacting remotely with MicroPython
-long_description = file: README.md
-long_description_content_type = text/markdown
-url = https://github.com/micropython/micropython
-project_urls =
-    Bug Tracker = https://github.com/micropython/micropython/issues
-classifiers =
-    Programming Language :: Python :: 3
-    License :: OSI Approved :: MIT License
-    Operating System :: OS Independent
-
-[options]
-packages = mpremote
-python_requires = >= 3.4
-install_requires =
-    pyserial >= 3.3
-
-[options.entry_points]
-console_scripts =
-  mpremote = mpremote.main:main

From 7c6a9856ea9755fc27f6e46656154a8d38f4596d Mon Sep 17 00:00:00 2001
From: Jim Mussared <jim.mussared@gmail.com>
Date: Fri, 3 Feb 2023 00:44:57 +1100
Subject: [PATCH 3093/3533] github/workflows: Add workflow to build mpremote
 wheel.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
---
 .github/workflows/mpremote.yml | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 .github/workflows/mpremote.yml

diff --git a/.github/workflows/mpremote.yml b/.github/workflows/mpremote.yml
new file mode 100644
index 0000000000000..e5fd47350f598
--- /dev/null
+++ b/.github/workflows/mpremote.yml
@@ -0,0 +1,31 @@
+name: Package mpremote
+
+on:
+  push:
+  pull_request:
+    paths:
+      - '.github/workflows/*.yml'
+      - 'tools/**'
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        # Version is determined from git,
+        # should be deep enough to get to latest tag
+        fetch-depth: '1000'
+    - run: |
+        git fetch --prune --unshallow --tags
+    - uses: actions/setup-python@v1
+    - name: Install build tools
+      run: pip install build
+    - name: Build mpremote wheel
+      run: cd tools/mpremote && python -m build --wheel
+    - name: Archive mpremote wheel
+      uses: actions/upload-artifact@v2
+      with:
+        name: mpremote
+        path: |
+          tools/mpremote/dist/mpremote*.whl

From e9335e4deaf9b7756115d58b51acaf871ef87abf Mon Sep 17 00:00:00 2001
From: iabdalkader <i.abdalkader@gmail.com>
Date: Thu, 23 Feb 2023 18:08:35 +0100
Subject: [PATCH 3094/3533] drivers/cyw43: Use board-defined BLE UART secondary
 baudrate.

The secondary baudrate was defined by boards but never used in this driver.
---
 drivers/cyw43/cywbt.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/cyw43/cywbt.c b/drivers/cyw43/cywbt.c
index 64aeb871c38bb..e394e02b33f9e 100644
--- a/drivers/cyw43/cywbt.c
+++ b/drivers/cyw43/cywbt.c
@@ -159,8 +159,8 @@ STATIC int cywbt_download_firmware(const uint8_t *firmware) {
     #endif
 
     mp_bluetooth_hci_uart_set_baudrate(115200);
-    cywbt_set_baudrate(3000000);
-    mp_bluetooth_hci_uart_set_baudrate(3000000);
+    cywbt_set_baudrate(MICROPY_HW_BLE_UART_BAUDRATE_SECONDARY);
+    mp_bluetooth_hci_uart_set_baudrate(MICROPY_HW_BLE_UART_BAUDRATE_SECONDARY);
 
     return 0;
 }
@@ -192,8 +192,8 @@ int mp_bluetooth_hci_controller_init(void) {
     cywbt_hci_cmd(0x03, 0x0003, 0, NULL);
 
     // Change baudrate
-    cywbt_set_baudrate(3000000);
-    mp_bluetooth_hci_uart_set_baudrate(3000000);
+    cywbt_set_baudrate(MICROPY_HW_BLE_UART_BAUDRATE_SECONDARY);
+    mp_bluetooth_hci_uart_set_baudrate(MICROPY_HW_BLE_UART_BAUDRATE_SECONDARY);
 
     cywbt_download_firmware((const uint8_t*)CYWBT_FW_ADDR);
 

From 5327cd1021dc92cad428ff44cb114c4a94c0bc45 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 23 Feb 2023 17:32:04 +1100
Subject: [PATCH 3095/3533] tools/pyboard.py: Use '/' exclusively when dealing
 with paths.

Currently, certain mpremote filesystem operations can fail on Windows due
to a mixing of '/' and '\' for path separators.  Eg if filesystem_command()
is called with a destination that ends in / then dest.endswith(os.path.sep)
will return False, which gives the wrong behaviour (it does end in a path
separator).

For similar reasons to 7e9a15966acf80ff50fdf5c52553dd56de164bb3, it's best
to use '/' everywhere in pyboard.py and mpremote, because the target device
understands only '/'.  mpremote already does this, so the remaining place
to fix it is in pyboard.y, to convert all incoming paths to use '/' instead
of '\'.

This effectively reverts 57fd66b80f8352e4859e6b71536b6083f9d7279c which
tried to fix the problem in a different way.

See also related 1f84440538a017e463aaad9686831ce9527122b5.

Signed-off-by: Damien George <damien@micropython.org>
---
 tools/pyboard.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/tools/pyboard.py b/tools/pyboard.py
index d0e67d1f31cc1..9e0b0f18ebd5d 100755
--- a/tools/pyboard.py
+++ b/tools/pyboard.py
@@ -663,15 +663,16 @@ def filesystem_command(pyb, args, progress_callback=None, verbose=False):
     def fname_remote(src):
         if src.startswith(":"):
             src = src[1:]
-        return src
+        # Convert all path separators to "/", because that's what a remote device uses.
+        return src.replace(os.path.sep, "/")
 
     def fname_cp_dest(src, dest):
         _, src = os.path.split(src)
         if dest is None or dest == "":
             dest = src
         elif dest == ".":
-            dest = os.path.join(".", src)
-        elif dest.endswith(os.path.sep):
+            dest = "/".join(".", src)
+        elif dest.endswith("/"):
             dest += src
         return dest
 

From 2e4dda3c2072c4de15ac8d51ddb471b9c3833db7 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Thu, 23 Feb 2023 10:53:39 +1100
Subject: [PATCH 3096/3533] py/modmath: Fix two-argument math function domain
 check.

Prior to this fix, pow(1.5, inf) and pow(0.5, -inf) (among other things)
would incorrectly raise a ValueError, because the result is inf with the
first argument being finite.  This commit fixes this by allowing the result
to be infinite if the first or second (or both) argument is infinite.

This fix doesn't affect the other three math functions that have two
arguments:
- atan2 never returns inf, so always fails isinf(ans)
- copysign returns inf only if the first argument x is inf, so will never
  reach the isinf(y) check
- fmod never returns inf, so always fails isinf(ans)

Signed-off-by: Damien George <damien@micropython.org>
---
 py/modmath.c               |  2 +-
 tests/float/math_domain.py | 21 ++++++++++++++++++++-
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/py/modmath.c b/py/modmath.c
index 72b5dde517591..861a23b48b3e6 100644
--- a/py/modmath.c
+++ b/py/modmath.c
@@ -54,7 +54,7 @@ STATIC mp_obj_t math_generic_2(mp_obj_t x_obj, mp_obj_t y_obj, mp_float_t (*f)(m
     mp_float_t x = mp_obj_get_float(x_obj);
     mp_float_t y = mp_obj_get_float(y_obj);
     mp_float_t ans = f(x, y);
-    if ((isnan(ans) && !isnan(x) && !isnan(y)) || (isinf(ans) && !isinf(x))) {
+    if ((isnan(ans) && !isnan(x) && !isnan(y)) || (isinf(ans) && !isinf(x) && !isinf(y))) {
         math_error();
     }
     return mp_obj_new_float(ans);
diff --git a/tests/float/math_domain.py b/tests/float/math_domain.py
index 063d509b5935d..606a655284c1a 100644
--- a/tests/float/math_domain.py
+++ b/tests/float/math_domain.py
@@ -39,7 +39,26 @@
 
 # double argument functions
 for name, f, args in (
-    ("pow", math.pow, ((0, 2), (-1, 2), (0, -1), (-1, 2.3), (nan, 0), (1, nan))),
+    (
+        "pow",
+        math.pow,
+        (
+            (0, 2),
+            (-1, 2),
+            (0, -1),
+            (-1, 2.3),
+            (0.5, inf),
+            (-0.5, inf),
+            (0.5, -inf),
+            (-0.5, -inf),
+            (1.5, inf),
+            (-1.5, inf),
+            (1.5, -inf),
+            (-1.5, -inf),
+            (nan, 0),
+            (1, nan),
+        ),
+    ),
     ("log", math.log, ()),
     ("fmod", math.fmod, ((1.2, inf), (1.2, -inf), (1.2, 0), (inf, 1.2))),
     ("atan2", math.atan2, ((0, 0), (-inf, inf), (-inf, -inf), (inf, -inf))),

From 641b60d4bdf0716880bdc2407ad0419673cf2e6f Mon Sep 17 00:00:00 2001
From: Neucrack <CZD666666@gmail.com>
Date: Wed, 29 Aug 2018 17:25:05 +0800
Subject: [PATCH 3097/3533] add gprs csdk submodule

---
 .gitmodules              | 3 +++
 ports/gprs_a9/GPRS_C_SDK | 1 +
 2 files changed, 4 insertions(+)
 create mode 160000 ports/gprs_a9/GPRS_C_SDK

diff --git a/.gitmodules b/.gitmodules
index 992fec3d1836f..af841e03a403e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -56,3 +56,6 @@
 [submodule "lib/micropython-lib"]
 	path = lib/micropython-lib
 	url = https://github.com/micropython/micropython-lib.git
+[submodule "ports/gprs_a9/GPRS_C_SDK"]
+	path = ports/gprs_a9/GPRS_C_SDK
+	url = https://github.com/Ai-Thinker-Open/GPRS_C_SDK
diff --git a/ports/gprs_a9/GPRS_C_SDK b/ports/gprs_a9/GPRS_C_SDK
new file mode 160000
index 0000000000000..707b7380f39e9
--- /dev/null
+++ b/ports/gprs_a9/GPRS_C_SDK
@@ -0,0 +1 @@
+Subproject commit 707b7380f39e9dddc036e02a409c49c078c58ad0

From a652f9382994d6c73cab86c2e4194f9d14d34a04 Mon Sep 17 00:00:00 2001
From: Neucrack <CZD666666@gmail.com>
Date: Wed, 29 Aug 2018 18:07:40 +0800
Subject: [PATCH 3098/3533] compile ok

---
 ports/gprs_a9/.gitignore     |   3 +
 ports/gprs_a9/GPRS_C_SDK     |   2 +-
 ports/gprs_a9/Makefile       | 165 +++++++++++++++++++++++++++++++++++
 ports/gprs_a9/build.sh       |   4 +
 ports/gprs_a9/mpconfigport.h | 102 ++++++++++++++++++++++
 ports/gprs_a9/mphalport.h    |   2 +
 ports/gprs_a9/qstrdefsport.h |   1 +
 ports/gprs_a9/test.c         |  83 ++++++++++++++++++
 ports/gprs_a9/unistd.h       |   9 ++
 9 files changed, 370 insertions(+), 1 deletion(-)
 create mode 100644 ports/gprs_a9/.gitignore
 create mode 100644 ports/gprs_a9/Makefile
 create mode 100644 ports/gprs_a9/build.sh
 create mode 100644 ports/gprs_a9/mpconfigport.h
 create mode 100644 ports/gprs_a9/mphalport.h
 create mode 100644 ports/gprs_a9/qstrdefsport.h
 create mode 100644 ports/gprs_a9/test.c
 create mode 100644 ports/gprs_a9/unistd.h

diff --git a/ports/gprs_a9/.gitignore b/ports/gprs_a9/.gitignore
new file mode 100644
index 0000000000000..baef948259352
--- /dev/null
+++ b/ports/gprs_a9/.gitignore
@@ -0,0 +1,3 @@
+build
+*.lod
+hex
diff --git a/ports/gprs_a9/GPRS_C_SDK b/ports/gprs_a9/GPRS_C_SDK
index 707b7380f39e9..605262ba65d92 160000
--- a/ports/gprs_a9/GPRS_C_SDK
+++ b/ports/gprs_a9/GPRS_C_SDK
@@ -1 +1 @@
-Subproject commit 707b7380f39e9dddc036e02a409c49c078c58ad0
+Subproject commit 605262ba65d92086715e03369f670ff353a9c3b2
diff --git a/ports/gprs_a9/Makefile b/ports/gprs_a9/Makefile
new file mode 100644
index 0000000000000..b33e3d8c5da5e
--- /dev/null
+++ b/ports/gprs_a9/Makefile
@@ -0,0 +1,165 @@
+mkfile_path := $(abspath $(lastword $(MAKEFILE_LIST)))  #获�当�正在执行的makefile的�对路径
+PATH_CURR := $(strip $(patsubst %/, %, $(dir ${mkfile_path})))
+include ../../py/mkenv.mk
+
+include ${PATH_CURR}/GPRS_C_SDK/platform/csdk/memd.def
+include ${PATH_CURR}/GPRS_C_SDK/platform/chip/defs/8955_base.def
+include ${PATH_CURR}/GPRS_C_SDK/init/target.def
+
+
+CT_RELEASE = debug
+
+
+# qstr definitions (must come before including py.mk)
+QSTR_DEFS = qstrdefsport.h
+
+# include py core make definitions
+include $(TOP)/py/py.mk
+
+CROSS_COMPILE = mips-elf-
+#############################################
+MAKE = make
+LD  := $(CROSS_COMPILE)ld
+LDPP := $(CROSS_COMPILE)cpp -C -P -undef
+STDOUT_NULL := 1>/dev/null
+
+BUILD_PATH := build
+BUILD_PATH_ABS := ${PATH_CURR}/${BUILD_PATH}
+CSDK_PATH := ${PATH_CURR}/GPRS_C_SDK
+BIN := $(BUILD_PATH_ABS)/firmware.elf
+HEX := $(BUILD_PATH_ABS)/firmware.srec
+BIN_PATH := ${PATH_CURR}/hex
+LODBASE   := $(BIN_PATH)/firmware_
+LOD_FILE := ${LODBASE}flash.lod
+WITH_PLT_LOD_FILE := ${BIN_PATH}/firmware_full.lod
+WITH_PLT_OTA_FILE := ${BIN_PATH}/firmware_ota.lod
+STRIP_SYMBOL_FILE := ${PATH_CURR}/GPRS_C_SDK/platform/compilation/platform_symbols_to_strip
+PLATFORM_ELF_FOLDER_PATH := ${PATH_CURR}/GPRS_C_SDK/platform/csdk/debug
+PLATFORM_ELF_PATH := ${wildcard ${PLATFORM_ELF_FOLDER_PATH}/*.elf}
+PLATFORM_ELF_NAME := ${notdir ${PLATFORM_ELF_PATH}}
+PLATFORM_LOD_PATH := ${CSDK_PATH}/platform/csdk/${strip ${CT_RELEASE}}
+PLATFORM_LOD_FILE := ${wildcard ${PLATFORM_LOD_PATH}/*.lod}
+ELFCOMBINE_TOOL := ${PATH_CURR}/GPRS_C_SDK/platform/compilation/elfCombine.pl
+TARGET_FILE := ${BUILD_PATH_ABS}/targetgen
+MAP_CFG_FILE := ${CSDK_PATH}/platform/compilation/8955_map_cfg
+LODCOMBINE_TOOL := ${CSDK_PATH}/platform/compilation/lodCombine.pl
+
+
+LIBGCC_PATH := ${PATH_CURR}/GPRS_C_SDK/platform/lib/gcc/mips-elf/4.4.2
+MAP := ${BUILD_PATH_ABS}/firmware.map
+FULL_LIBRARY_PATH := -L${PATH_CURR}/GPRS_C_SDK/build/csdk/lib
+MYLIBFILES := 
+FULL_LIBRARY_EXT := -lcsdk_debug 
+
+
+LDPPFLAGS += \
+        -DUSER_ROM_BASE=${FLASH_BASE}+${USER_ROM_BASE} \
+        -DUSER_ROM_SIZE=${USER_ROM_SIZE} \
+        -DUSER_RAM_BASE=${EXT_RAM_BASE}+${USER_RAM_BASE} \
+        -DUSER_RAM_SIZE=${USER_RAM_SIZE} \
+        -DDUSE_BINUTILS_2_19=1
+LD_SRC := ${PATH_CURR}/GPRS_C_SDK/platform/compilation/cust.ld
+LD_FILE := ${BUILD_PATH_ABS}/cust.ld
+OFORMAT := --oformat=elf32-littlemips
+SREC	:= --input-target=elf32-littlemips --output-target=srec
+LDFLAG_USED_ELF_FILES := -just-symbols ${PATH_CURR}/GPRS_C_SDK/platform/chip/rom/8955/lib/mem_bridge_rom_CHIP.elf
+LDFLAGS += --gc-sections
+LDFLAGS += ${FULL_LIBRARY_PATH} --start-group ${MYLIBFILES} ${FULL_LIBRARY_EXT} --end-group
+LDFLAGS	+= -L${LIBGCC_PATH} -lgcc 
+LDFLAGS += --warn-common  --error-unresolved-symbols 
+FULL_SRC_OBJECTS := 
+LD_OPTIONAL_OBJECTS := 
+########################################3###
+INC += -I.
+INC += -I$(TOP)
+INC += -I$(BUILD_PATH_ABS)
+INC += -I${PATH_CURR}/GPRS_C_SDK/include \
+       -I${PATH_CURR}/GPRS_C_SDK/include/std_inc \
+	   -I${PATH_CURR}/GPRS_C_SDK/include/api_inc 
+
+# DFU = $(TOP)/tools/dfu.py
+# PYDFU = $(TOP)/tools/pydfu.py
+# CFLAGS_CORTEX_M4 = -mthumb -mtune=cortex-m4 -mabi=aapcs-linux -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -fsingle-precision-constant -Wdouble-promotion
+# CFLAGS = $(INC) -Wall -Werror -std=c99 -nostdlib $(CFLAGS_CORTEX_M4) $(COPT)
+CFLAGS = $(INC) -Wshadow \
+		  -std=gnu99 \
+          -Os -g -fno-inline-small-functions -fno-inline-functions -fno-align-functions -fno-align-jumps -fno-align-loops -fno-align-labels \
+          -msoft-float \
+          -Wunused-function \
+          -Wuninitialized \
+          -minterlink-mips16 -fno-strict-aliasing \
+          -ffunction-sections -fdata-sections \
+          -fno-builtin-iswspace \
+          -ffixed-t3 -ffixed-t4 -ffixed-t5 -ffixed-t6 -ffixed-t7 -ffixed-s2 -ffixed-s3 -ffixed-s4 -ffixed-s5 -ffixed-s6 -ffixed-s7 -ffixed-fp \
+          -G0 -Wall -march=xcpu -mtune=xcpu -Wa,-march=xcpu,-mtune=xcpu -EL -mexplicit-relocs -fweb -frename-registers -mmemcpy -mmips-tfile -nostartfiles -nostdlib -nostdinc -nodefaultlibs -c -pipe \
+          -fwide-exec-charset=UTF-16LE -fshort-wchar \
+		  -mips16 
+
+LIBS =
+
+SRC_C = \
+	test.c 
+
+
+
+
+all: lod
+
+
+lod: ${HEX}
+	$(MAKE) targetgen
+	srecmap -c ${MAP_CFG_FILE} -m ${FLSH_MODEL} -b ${TARGET_FILE} ${HEX} ${LODBASE} ${STDOUT_NULL}
+	$(LODCOMBINE_TOOL) openat -l  $(PLATFORM_LOD_FILE) -i $(LOD_FILE) -o $(WITH_PLT_LOD_FILE) -u $(WITH_PLT_OTA_FILE);
+
+OBJ = $(PY_CORE_O) $(addprefix $(BUILD_PATH)/, $(SRC_C:.c=.o))
+
+${BIN}: $(OBJ)
+	$(ECHO) "LINK $@"
+	test -f ${LD_FILE} && chmod +w ${LD_FILE} || echo ""
+	${LDPP} ${LDPPFLAGS} ${LD_SRC} > ${LD_FILE}
+	${LD} -nostdlib -o ${BIN} ${OFORMAT} $^ ${FULL_SRC_OBJECTS} ${LD_OPTIONAL_OBJECTS} \
+	${LDFLAG_USED_ELF_FILES}	\
+	--script ${LD_FILE} \
+	$(LDFLAGS) \
+	-Map ${MAP}
+
+bin: ${BIN}
+	${MKDIR} -p ${BIN_PATH}
+	${CP} -f ${BIN} ${BIN_PATH}
+	${CP} -f ${PLATFORM_ELF_PATH} ${BIN_PATH}
+	${OBJCOPY} --strip-symbols=${STRIP_SYMBOL_FILE} ${BIN_PATH}/firmware.elf ${BIN_PATH}/firmware.elf
+	${ELFCOMBINE_TOOL} -e1 ${BIN_PATH}/firmware.elf -e2 ${BIN_PATH}/${PLATFORM_ELF_NAME} -o ${BIN_PATH}/firmware_final.elf
+	${RM} -f ${BIN_PATH}/firmware.elf
+	${RM} -f ${BIN_PATH}/${PLATFORM_ELF_NAME}
+
+${HEX}:bin
+	${MAKE} ${BIN}
+	$(OBJCOPY) ${SREC} ${BIN} ${HEX}
+
+.PHONY: targetgen
+TARGET_FILE := ${BUILD_PATH_ABS}/targetgen
+targetgen:
+	@${ECHO} "#############################################"     > $(TARGET_FILE)
+	@${ECHO} "# Target component definitions"                   >> $(TARGET_FILE)
+	@${ECHO} "#############################################"    >> $(TARGET_FILE)
+	@${ECHO} "FLSH_MODEL:=           $(FLSH_MODEL)"             >> $(TARGET_FILE)
+	@${ECHO} "#############################################"    >> $(TARGET_FILE)
+	@${ECHO} "# Flash Mapping"                                  >> $(TARGET_FILE)
+	@${ECHO} "#############################################"    >> $(TARGET_FILE)
+	@${ECHO} "FLASH_SIZE:=           $(FLASH_SIZE)"             >> $(TARGET_FILE)
+	@${ECHO} "RAM_SIZE:=             $(RAM_SIZE)"               >> $(TARGET_FILE)
+	@${ECHO} "RAM_PHY_SIZE:=         $(RAM_PHY_SIZE)"           >> $(TARGET_FILE)
+	@${ECHO} "CALIB_BASE:=           $(CALIB_BASE)"             >> $(TARGET_FILE)
+	@${ECHO} "FACT_SETTINGS_BASE:=   $(FACT_SETTINGS_BASE)"     >> $(TARGET_FILE)
+	@${ECHO} "CODE_BASE:=            $(CODE_BASE)"              >> $(TARGET_FILE)
+	@${ECHO} "USER_DATA_BASE:=       $(USER_DATA_BASE)"         >> $(TARGET_FILE)
+	@${ECHO} "USER_DATA_SIZE:=       $(USER_DATA_SIZE)"         >> $(TARGET_FILE)
+	@${ECHO} "ROMU_FLASH_LAYOUT:=    $(ROMU_FLASH_LAYOUT)"      >> $(TARGET_FILE)
+	@${ECHO} "USER_BASE:=            $(USER_ROM_BASE)"     		>> $(TARGET_FILE)
+	@${ECHO} "USER_SIZE:=            $(USER_ROM_SIZE)"     		>> $(TARGET_FILE)
+	@${ECHO} ""                                                 >> $(TARGET_FILE)
+	@${ECHO} "#############################################"    >> $(TARGET_FILE)
+	@${ECHO} "# others"                                  	    >> $(TARGET_FILE)
+	@${ECHO} "#############################################"    >> $(TARGET_FILE)
+
+include $(TOP)/py/mkrules.mk
diff --git a/ports/gprs_a9/build.sh b/ports/gprs_a9/build.sh
new file mode 100644
index 0000000000000..4ec116ab8e9cf
--- /dev/null
+++ b/ports/gprs_a9/build.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+cd GPRS_C_SDK/platform/tools/genlib
+./genlib.sh
diff --git a/ports/gprs_a9/mpconfigport.h b/ports/gprs_a9/mpconfigport.h
new file mode 100644
index 0000000000000..34feaff1d5566
--- /dev/null
+++ b/ports/gprs_a9/mpconfigport.h
@@ -0,0 +1,102 @@
+#include <stdint.h>
+
+// options to control how MicroPython is built
+
+// You can disable the built-in MicroPython compiler by setting the following
+// config option to 0.  If you do this then you won't get a REPL prompt, but you
+// will still be able to execute pre-compiled scripts, compiled with mpy-cross.
+#define MICROPY_ENABLE_COMPILER     (1)
+
+#define MICROPY_QSTR_BYTES_IN_HASH  (1)
+#define MICROPY_QSTR_EXTRA_POOL     mp_qstr_frozen_const_pool
+#define MICROPY_ALLOC_PATH_MAX      (256)
+#define MICROPY_ALLOC_PARSE_CHUNK_INIT (16)
+#define MICROPY_EMIT_X64            (0)
+#define MICROPY_EMIT_THUMB          (0)
+#define MICROPY_EMIT_INLINE_THUMB   (0)
+#define MICROPY_COMP_MODULE_CONST   (0)
+#define MICROPY_COMP_CONST          (0)
+#define MICROPY_COMP_DOUBLE_TUPLE_ASSIGN (0)
+#define MICROPY_COMP_TRIPLE_TUPLE_ASSIGN (0)
+#define MICROPY_MEM_STATS           (0)
+#define MICROPY_DEBUG_PRINTERS      (0)
+#define MICROPY_ENABLE_GC           (0)
+#define MICROPY_GC_ALLOC_THRESHOLD  (0)
+#define MICROPY_REPL_EVENT_DRIVEN   (0)
+#define MICROPY_HELPER_REPL         (1)
+#define MICROPY_HELPER_LEXER_UNIX   (0)
+#define MICROPY_ENABLE_SOURCE_LINE  (0)
+#define MICROPY_ENABLE_DOC_STRING   (0)
+#define MICROPY_ERROR_REPORTING     (MICROPY_ERROR_REPORTING_TERSE)
+#define MICROPY_BUILTIN_METHOD_CHECK_SELF_ARG (0)
+#define MICROPY_PY_ASYNC_AWAIT      (0)
+#define MICROPY_PY_BUILTINS_BYTEARRAY (0)
+#define MICROPY_PY_BUILTINS_MEMORYVIEW (0)
+#define MICROPY_PY_BUILTINS_ENUMERATE (0)
+#define MICROPY_PY_BUILTINS_FILTER  (0)
+#define MICROPY_PY_BUILTINS_FROZENSET (0)
+#define MICROPY_PY_BUILTINS_REVERSED (0)
+#define MICROPY_PY_BUILTINS_SET     (0)
+#define MICROPY_PY_BUILTINS_SLICE   (0)
+#define MICROPY_PY_BUILTINS_PROPERTY (0)
+#define MICROPY_PY_BUILTINS_MIN_MAX (0)
+#define MICROPY_PY___FILE__         (0)
+#define MICROPY_PY_GC               (0)
+#define MICROPY_PY_ARRAY            (0)
+#define MICROPY_PY_ATTRTUPLE        (0)
+#define MICROPY_PY_COLLECTIONS      (0)
+#define MICROPY_PY_MATH             (0)
+#define MICROPY_PY_CMATH            (0)
+#define MICROPY_PY_IO               (0)
+#define MICROPY_PY_STRUCT           (0)
+#define MICROPY_PY_SYS              (0)
+#define MICROPY_MODULE_FROZEN_MPY   (1)
+#define MICROPY_CPYTHON_COMPAT      (0)
+#define MICROPY_LONGINT_IMPL        (MICROPY_LONGINT_IMPL_NONE)
+#define MICROPY_FLOAT_IMPL          (MICROPY_FLOAT_IMPL_NONE)
+#define MICROPY_NO_ALLOCA           (1)
+#define MP_ENDIANNESS_LITTLE        (1)
+#define MICROPY_PY_OS_DUPTERM       (1)
+#define MICROPY_NLR_SETJMP          (1)
+#define MICROPY_PY_LWIP_SLIP        (0)
+
+// type definitions for the specific machine
+
+#define MICROPY_MAKE_POINTER_CALLABLE(p) ((void*)((mp_uint_t)(p) | 1))
+
+// This port is intended to be 32-bit, but unfortunately, int32_t for
+// different targets may be defined in different ways - either as int
+// or as long. This requires different printf formatting specifiers
+// to print such value. So, we avoid int32_t and use int directly.
+#define UINT_FMT "%u"
+#define INT_FMT "%d"
+typedef int mp_int_t; // must be pointer size
+typedef unsigned mp_uint_t; // must be pointer size
+
+typedef long mp_off_t;
+
+#define MP_PLAT_PRINT_STRN(str, len) mp_hal_stdout_tx_strn_cooked(str, len)
+
+// extra built in names to add to the global namespace
+#define MICROPY_PORT_BUILTINS \
+    { MP_ROM_QSTR(MP_QSTR_open), MP_ROM_PTR(&mp_builtin_open_obj) },
+
+// We need to provide a declaration/definition of alloca()
+#include <stdlib.h>
+
+#define MICROPY_HW_BOARD_NAME "gprs_a9"
+#define MICROPY_HW_MCU_NAME "GPRS_A9"
+
+#ifdef __linux__
+#define MICROPY_MIN_USE_STDOUT (1)
+#endif
+
+#ifdef __thumb__
+#define MICROPY_MIN_USE_CORTEX_CPU (1)
+#define MICROPY_MIN_USE_STM32_MCU (1)
+#endif
+
+#define MP_STATE_PORT MP_STATE_VM
+
+#define MICROPY_PORT_ROOT_POINTERS \
+    const char *readline_hist[8];
diff --git a/ports/gprs_a9/mphalport.h b/ports/gprs_a9/mphalport.h
new file mode 100644
index 0000000000000..60d68bd2d6d50
--- /dev/null
+++ b/ports/gprs_a9/mphalport.h
@@ -0,0 +1,2 @@
+static inline mp_uint_t mp_hal_ticks_ms(void) { return 0; }
+static inline void mp_hal_set_interrupt_char(char c) {}
diff --git a/ports/gprs_a9/qstrdefsport.h b/ports/gprs_a9/qstrdefsport.h
new file mode 100644
index 0000000000000..3ba897069bf73
--- /dev/null
+++ b/ports/gprs_a9/qstrdefsport.h
@@ -0,0 +1 @@
+// qstrs specific to this port
diff --git a/ports/gprs_a9/test.c b/ports/gprs_a9/test.c
new file mode 100644
index 0000000000000..645b50617e6d3
--- /dev/null
+++ b/ports/gprs_a9/test.c
@@ -0,0 +1,83 @@
+/*
+ * @File  app_main.c
+ * @Brief An example of SDK's mini system
+ * 
+ * @Author: Neucrack 
+ * @Date: 2017-11-11 16:45:17 
+ * @Last Modified by: Neucrack
+ * @Last Modified time: 2017-11-11 18:24:56
+ */
+
+
+#include "stdint.h"
+#include "stdbool.h"
+#include "api_os.h"
+#include "api_event.h"
+#include "api_debug.h"
+#include "api_hal_pm.h"
+
+#define AppMain_TASK_STACK_SIZE    (2048 * 2)
+#define AppMain_TASK_PRIORITY      0
+#define OTHERE_TASK_STACK_SIZE     (2048 * 2)
+#define OTHERE_TASK_PRIORITY       1
+HANDLE mainTaskHandle  = NULL;
+HANDLE otherTaskHandle = NULL;
+
+
+void LoopTask(VOID *pData)
+{
+    int count = 0;
+    //wait for trace initilize complete
+    OS_Sleep(3000);
+    while(1)
+    {
+        Trace(1, "Test Test 000 %d",++count);
+
+        //Use event drive or sleep some time here
+        OS_Sleep(2000);
+    }
+}
+void EventDispatch(API_Event_t* pEvent)
+{
+    switch(pEvent->id)
+    {
+        case API_EVENT_ID_POWER_ON:
+            break;
+        case API_EVENT_ID_NO_SIMCARD:
+            break;
+        case API_EVENT_ID_NETWORK_REGISTERED_HOME:
+        case API_EVENT_ID_NETWORK_REGISTERED_ROAMING:
+            break;
+        default:
+            break;
+    }
+}
+
+
+void AppMainTask(VOID *pData)
+{
+    API_Event_t* event=NULL;
+
+    otherTaskHandle = OS_CreateTask(LoopTask,
+                                    NULL, NULL, OTHERE_TASK_STACK_SIZE, OTHERE_TASK_PRIORITY, 0, 0, "ohter Task");
+    while(1)
+    {
+        if(OS_WaitEvent(mainTaskHandle, (void**)&event, OS_TIME_OUT_WAIT_FOREVER))
+        {
+            PM_SetSysMinFreq(PM_SYS_FREQ_178M);//set back system min frequency to 178M or higher(/lower) value
+            EventDispatch(event);
+            OS_Free(event->pParam1);
+            OS_Free(event->pParam2);
+            OS_Free(event);
+            PM_SetSysMinFreq(PM_SYS_FREQ_32K);//release system freq to enter sleep mode to save power,
+                                              //system remain runable but slower, and close eripheral not using
+        }
+    }
+}
+int _Main(void)
+{
+    mainTaskHandle = OS_CreateTask(AppMainTask ,
+                                   NULL, NULL, OTHERE_TASK_PRIORITY, AppMain_TASK_PRIORITY, 0, 0, "init Task");
+    OS_SetUserMainHandle(&mainTaskHandle);
+    return 0;
+}
diff --git a/ports/gprs_a9/unistd.h b/ports/gprs_a9/unistd.h
new file mode 100644
index 0000000000000..fa56248a49de2
--- /dev/null
+++ b/ports/gprs_a9/unistd.h
@@ -0,0 +1,9 @@
+#ifndef MICROPY_INCLUDED_GPRS_A9_UNISTD_H
+#define MICROPY_INCLUDED_GPRS_A9_UNISTD_H
+
+#include "cs_types.h"
+
+#define SEEK_SET 0
+#define SEEK_CUR 1
+
+#endif // MICROPY_INCLUDED_GPRS_A9_UNISTD_H
\ No newline at end of file

From 8454b2d600c9c124f973c850bef5a1cad18dd101 Mon Sep 17 00:00:00 2001
From: Neucrack <CZD666666@gmail.com>
Date: Wed, 29 Aug 2018 20:24:32 +0800
Subject: [PATCH 3099/3533] build pass

---
 ports/gprs_a9/Makefile       |  55 +++++---
 ports/gprs_a9/frozentest.mpy | Bin 0 -> 255 bytes
 ports/gprs_a9/frozentest.py  |   7 +
 ports/gprs_a9/main.c         | 245 +++++++++++++++++++++++++++++++++++
 ports/gprs_a9/mpconfigport.h |   7 +-
 5 files changed, 289 insertions(+), 25 deletions(-)
 create mode 100644 ports/gprs_a9/frozentest.mpy
 create mode 100644 ports/gprs_a9/frozentest.py
 create mode 100644 ports/gprs_a9/main.c

diff --git a/ports/gprs_a9/Makefile b/ports/gprs_a9/Makefile
index b33e3d8c5da5e..7a665fe569577 100644
--- a/ports/gprs_a9/Makefile
+++ b/ports/gprs_a9/Makefile
@@ -75,7 +75,8 @@ INC += -I$(TOP)
 INC += -I$(BUILD_PATH_ABS)
 INC += -I${PATH_CURR}/GPRS_C_SDK/include \
        -I${PATH_CURR}/GPRS_C_SDK/include/std_inc \
-	   -I${PATH_CURR}/GPRS_C_SDK/include/api_inc 
+	   -I${PATH_CURR}/GPRS_C_SDK/include/api_inc \
+	   -I${PATH_CURR}/GPRS_C_SDK/libs/utils/include
 
 # DFU = $(TOP)/tools/dfu.py
 # PYDFU = $(TOP)/tools/pydfu.py
@@ -98,43 +99,54 @@ CFLAGS = $(INC) -Wshadow \
 LIBS =
 
 SRC_C = \
-	test.c 
-
-
+	main.c \
+	$(BUILD)/_frozen_mpy.c
 
+LIB_SRC_C = $(addprefix lib/,\
+	utils/stdout_helpers.c \
+	utils/pyexec.c \
+	mp-readline/readline.c \
+	)
 
 all: lod
 
 
 lod: ${HEX}
-	$(MAKE) targetgen
-	srecmap -c ${MAP_CFG_FILE} -m ${FLSH_MODEL} -b ${TARGET_FILE} ${HEX} ${LODBASE} ${STDOUT_NULL}
-	$(LODCOMBINE_TOOL) openat -l  $(PLATFORM_LOD_FILE) -i $(LOD_FILE) -o $(WITH_PLT_LOD_FILE) -u $(WITH_PLT_OTA_FILE);
+	$(Q)$(MAKE) targetgen
+	$(Q)srecmap -c ${MAP_CFG_FILE} -m ${FLSH_MODEL} -b ${TARGET_FILE} ${HEX} ${LODBASE} ${STDOUT_NULL}
+	$(Q)$(LODCOMBINE_TOOL) openat -l  $(PLATFORM_LOD_FILE) -i $(LOD_FILE) -o $(WITH_PLT_LOD_FILE) -u $(WITH_PLT_OTA_FILE);
+	$(ECHO) "BUILD OK"
 
 OBJ = $(PY_CORE_O) $(addprefix $(BUILD_PATH)/, $(SRC_C:.c=.o))
+OBJ += $(addprefix $(BUILD_PATH)/, $(LIB_SRC_C:.c=.o))
+
+$(BUILD)/_frozen_mpy.c: frozentest.mpy $(BUILD)/genhdr/qstrdefs.generated.h
+	$(ECHO) "MISC freezing bytecode"
+	$(Q)$(TOP)/tools/mpy-tool.py -f -q $(BUILD)/genhdr/qstrdefs.preprocessed.h -mlongint-impl=none $< > $@
+
 
 ${BIN}: $(OBJ)
 	$(ECHO) "LINK $@"
-	test -f ${LD_FILE} && chmod +w ${LD_FILE} || echo ""
-	${LDPP} ${LDPPFLAGS} ${LD_SRC} > ${LD_FILE}
-	${LD} -nostdlib -o ${BIN} ${OFORMAT} $^ ${FULL_SRC_OBJECTS} ${LD_OPTIONAL_OBJECTS} \
+	$(Q)test -f ${LD_FILE} && chmod +w ${LD_FILE} || echo ""
+	$(Q)${LDPP} ${LDPPFLAGS} ${LD_SRC} > ${LD_FILE}
+	$(Q)${LD} -nostdlib -o ${BIN} ${OFORMAT} $^ ${FULL_SRC_OBJECTS} ${LD_OPTIONAL_OBJECTS} \
 	${LDFLAG_USED_ELF_FILES}	\
 	--script ${LD_FILE} \
 	$(LDFLAGS) \
 	-Map ${MAP}
 
 bin: ${BIN}
-	${MKDIR} -p ${BIN_PATH}
-	${CP} -f ${BIN} ${BIN_PATH}
-	${CP} -f ${PLATFORM_ELF_PATH} ${BIN_PATH}
-	${OBJCOPY} --strip-symbols=${STRIP_SYMBOL_FILE} ${BIN_PATH}/firmware.elf ${BIN_PATH}/firmware.elf
-	${ELFCOMBINE_TOOL} -e1 ${BIN_PATH}/firmware.elf -e2 ${BIN_PATH}/${PLATFORM_ELF_NAME} -o ${BIN_PATH}/firmware_final.elf
-	${RM} -f ${BIN_PATH}/firmware.elf
-	${RM} -f ${BIN_PATH}/${PLATFORM_ELF_NAME}
+	$(Q)${MKDIR} -p ${BIN_PATH}
+	$(Q)${CP} -f ${BIN} ${BIN_PATH}
+	$(Q)${CP} -f ${PLATFORM_ELF_PATH} ${BIN_PATH}
+	$(Q)${OBJCOPY} --strip-symbols=${STRIP_SYMBOL_FILE} ${BIN_PATH}/firmware.elf ${BIN_PATH}/firmware.elf
+	$(Q)${ELFCOMBINE_TOOL} -e1 ${BIN_PATH}/firmware.elf -e2 ${BIN_PATH}/${PLATFORM_ELF_NAME} -o ${BIN_PATH}/firmware_final.elf
+	$(Q)${RM} -f ${BIN_PATH}/firmware.elf
+	$(Q)${RM} -f ${BIN_PATH}/${PLATFORM_ELF_NAME}
 
 ${HEX}:bin
-	${MAKE} ${BIN}
-	$(OBJCOPY) ${SREC} ${BIN} ${HEX}
+	$(Q)${MAKE} ${BIN}
+	$(Q)$(OBJCOPY) ${SREC} ${BIN} ${HEX}
 
 .PHONY: targetgen
 TARGET_FILE := ${BUILD_PATH_ABS}/targetgen
@@ -162,4 +174,9 @@ targetgen:
 	@${ECHO} "# others"                                  	    >> $(TARGET_FILE)
 	@${ECHO} "#############################################"    >> $(TARGET_FILE)
 
+
+
+
+
+
 include $(TOP)/py/mkrules.mk
diff --git a/ports/gprs_a9/frozentest.mpy b/ports/gprs_a9/frozentest.mpy
new file mode 100644
index 0000000000000000000000000000000000000000..7c6809bf6522f90339ec72ae0dcd16560ac5aafc
GIT binary patch
literal 255
zcmeZeW|EI#W&i<RE{2Z`S{fP}+8PWD|D_Kyh<##6VKf3V#9=fel+OgAMRvWPB?@FV
znDRFmsC;GsDwX~WQrq~{pyj&R>v|)>Xbzj){FKt1R6E|ZqWr4Vypq)761{>-)`FtU
zyb|Wp04NK>M<y9FAw0%RW`<&=M1`FEymW=)5}>wpg_4ZK5{1lSg}i(q1vIiKFEyoD
tEfGaJBe7VaG%qtbKP6S++{Sa8&TUpm&PXgOPU23g1Uf>&(8$<?5dh6rQZN7j

literal 0
HcmV?d00001

diff --git a/ports/gprs_a9/frozentest.py b/ports/gprs_a9/frozentest.py
new file mode 100644
index 0000000000000..0f99b74297fbb
--- /dev/null
+++ b/ports/gprs_a9/frozentest.py
@@ -0,0 +1,7 @@
+print('uPy')
+print('a long string that is not interned')
+print('a string that has unicode αβγ chars')
+print(b'bytes 1234\x01')
+print(123456789)
+for i in range(4):
+    print(i)
diff --git a/ports/gprs_a9/main.c b/ports/gprs_a9/main.c
new file mode 100644
index 0000000000000..ea6ce684dc237
--- /dev/null
+++ b/ports/gprs_a9/main.c
@@ -0,0 +1,245 @@
+#include <stdint.h>
+#include <stdio.h>
+#include <string.h>
+
+#include "py/compile.h"
+#include "py/runtime.h"
+#include "py/repl.h"
+#include "py/gc.h"
+#include "py/mperrno.h"
+#include "lib/utils/pyexec.h"
+
+#include "stdbool.h"
+#include "api_os.h"
+#include "api_event.h"
+#include "api_debug.h"
+#include "api_hal_pm.h"
+#include "api_hal_uart.h"
+#include "buffer.h"
+
+
+
+#define AppMain_TASK_STACK_SIZE    (2048 * 2)
+#define AppMain_TASK_PRIORITY      0
+#define MICROPYTHON_TASK_STACK_SIZE     (2048 * 2)
+#define MICROPYTHON_TASK_PRIORITY       1
+#define UART_CIRCLE_FIFO_BUFFER_MAX_LENGTH 2048
+
+HANDLE mainTaskHandle  = NULL;
+HANDLE microPyTaskHandle = NULL;
+Buffer_t fifoBuffer;
+uint8_t  fifoBufferData[UART_CIRCLE_FIFO_BUFFER_MAX_LENGTH];
+
+typedef enum
+{
+    MICROPY_EVENT_ID_UART_RECEIVED = 1, //param1: length, param2:data(uint8_t*)
+    MICROPY_EVENT_ID_UART_MAX
+}MicroPy_Event_ID_t;
+
+typedef struct
+{
+    MicroPy_Event_ID_t id;
+    uint32_t param1;
+    uint8_t* pParam1;
+}MicroPy_Event_t;
+
+
+
+
+
+
+
+#if MICROPY_ENABLE_COMPILER
+void do_str(const char *src, mp_parse_input_kind_t input_kind) {
+    nlr_buf_t nlr;
+    if (nlr_push(&nlr) == 0) {
+        mp_lexer_t *lex = mp_lexer_new_from_str_len(MP_QSTR__lt_stdin_gt_, src, strlen(src), 0);
+        qstr source_name = lex->source_name;
+        mp_parse_tree_t parse_tree = mp_parse(lex, input_kind);
+        mp_obj_t module_fun = mp_compile(&parse_tree, source_name, MP_EMIT_OPT_NONE, true);
+        mp_call_function_0(module_fun);
+        nlr_pop();
+    } else {
+        // uncaught exception
+        mp_obj_print_exception(&mp_plat_print, (mp_obj_t)nlr.ret_val);
+    }
+}
+#endif
+
+static char *stack_top;
+
+
+void gc_collect(void) {
+    // WARNING: This gc_collect implementation doesn't try to get root
+    // pointers from CPU registers, and thus may function incorrectly.
+    void *dummy;
+    gc_collect_start();
+    gc_collect_root(&dummy, ((mp_uint_t)stack_top - (mp_uint_t)&dummy) / sizeof(mp_uint_t));
+    gc_collect_end();
+    gc_dump_info();
+}
+
+mp_lexer_t *mp_lexer_new_from_file(const char *filename) {
+    mp_raise_OSError(MP_ENOENT);
+}
+
+mp_import_stat_t mp_import_stat(const char *path) {
+    return MP_IMPORT_STAT_NO_EXIST;
+}
+
+mp_obj_t mp_builtin_open(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs) {
+    return mp_const_none;
+}
+MP_DEFINE_CONST_FUN_OBJ_KW(mp_builtin_open_obj, 1, mp_builtin_open);
+
+void nlr_jump_fail(void *val) {
+    assert("nlr_jump_fail");
+}
+
+void NORETURN __fatal_error(const char *msg) {
+    assert(msg);
+}
+
+#ifndef NDEBUG
+void MP_WEAK __assert_func(const char *file, int line, const char *func, const char *expr) {
+    printf("Assertion '%s' failed, at file %s:%d\n", expr, file, line);
+    __fatal_error("Assertion failed");
+}
+#endif
+
+
+
+
+bool mp_Init()
+{
+    int stack_dummy;
+    stack_top = (char*)&stack_dummy;
+
+    mp_init();
+    pyexec_event_repl_init();
+    return true;
+}
+
+bool UartInit()
+{
+    UART_Config_t config = {
+        .baudRate = UART_BAUD_RATE_115200,
+        .dataBits = UART_DATA_BITS_8,
+        .stopBits = UART_STOP_BITS_1,
+        .parity   = UART_PARITY_NONE,
+        .rxCallback = NULL,
+        .useEvent = true,
+    };
+    UART_Init(UART1,config);
+    Buffer_Init(&fifoBuffer,fifoBufferData,sizeof(fifoBufferData));
+}
+
+void MicroPyEventDispatch(MicroPy_Event_t* pEvent)
+{
+    switch(pEvent->id)
+    {
+        case MICROPY_EVENT_ID_UART_RECEIVED:
+        {
+            uint8_t c;
+            bool ret;
+
+            for (;;) {
+                if(!Buffer_Gets(&fifoBuffer,&c,1))
+                    break;
+                if (pyexec_event_repl_process_char((int)c)) {
+                    break;
+                }
+            }
+            break;
+        }
+        default:
+            break;
+    }
+}
+
+
+void MicroPyTask(VOID *pData)
+{
+    MicroPy_Event_t* event;
+
+    UartInit();
+    mp_Init();
+
+    while(1)
+    {
+        if(OS_WaitEvent(mainTaskHandle, (void**)&event, OS_TIME_OUT_WAIT_FOREVER))
+        {
+            // PM_SetSysMinFreq(PM_SYS_FREQ_178M);//set back system min frequency to 178M or higher(/lower) value
+            MicroPyEventDispatch(event);
+            OS_Free(event->pParam1);
+            // PM_SetSysMinFreq(PM_SYS_FREQ_32K);//release system freq to enter sleep mode to save power,
+                                              //system remain runable but slower, and close eripheral not using
+        }
+    }
+}
+void EventDispatch(API_Event_t* pEvent)
+{
+    switch(pEvent->id)
+    {
+        case API_EVENT_ID_POWER_ON:
+            break;
+        case API_EVENT_ID_NO_SIMCARD:
+            break;
+        case API_EVENT_ID_NETWORK_REGISTERED_HOME:
+        case API_EVENT_ID_NETWORK_REGISTERED_ROAMING:
+            break;
+        case API_EVENT_ID_UART_RECEIVED:
+            Trace(1,"UART%d received:%d,%s",pEvent->param1,pEvent->param2,pEvent->pParam1);
+            if(pEvent->param1 == UART1)
+            {
+                MicroPy_Event_t event;
+
+                Buffer_Puts(&fifoBuffer,pEvent->pParam1,pEvent->param2);
+                memset((void*)&event,0,sizeof(MicroPy_Event_t));
+                event.id = MICROPY_EVENT_ID_UART_RECEIVED;
+                event.param1 = (uint32_t)(pEvent->param2);
+                OS_SendEvent(microPyTaskHandle,&event,OS_TIME_OUT_WAIT_FOREVER,0);
+            }
+            break;
+        default:
+            break;
+    }
+}
+
+
+void AppMainTask(VOID *pData)
+{
+    API_Event_t* event=NULL;
+
+    microPyTaskHandle = OS_CreateTask(MicroPyTask,
+                                    NULL, NULL, MICROPYTHON_TASK_STACK_SIZE, MICROPYTHON_TASK_PRIORITY, 0, 0, "ohter Task");
+    while(1)
+    {
+        if(OS_WaitEvent(mainTaskHandle, (void**)&event, OS_TIME_OUT_WAIT_FOREVER))
+        {
+            // PM_SetSysMinFreq(PM_SYS_FREQ_178M);//set back system min frequency to 178M or higher(/lower) value
+            EventDispatch(event);
+            OS_Free(event->pParam1);
+            OS_Free(event->pParam2);
+            OS_Free(event);
+            // PM_SetSysMinFreq(PM_SYS_FREQ_32K);//release system freq to enter sleep mode to save power,
+                                              //system remain runable but slower, and close eripheral not using
+        }
+    }
+}
+int _Main(void)
+{
+    mainTaskHandle = OS_CreateTask(AppMainTask ,
+                                   NULL, NULL, MICROPYTHON_TASK_PRIORITY, AppMain_TASK_PRIORITY, 0, 0, "init Task");
+    OS_SetUserMainHandle(&mainTaskHandle);
+    return 0;
+}
+
+// Send string of given length
+void mp_hal_stdout_tx_strn(const char *str, mp_uint_t len) {
+    UART_Write(UART1,str,len);
+}
+
+// void mp_hal_stdout_tx_str(const char *str) {
+//     mp_hal_stdout_tx_strn(str, strlen(str));
+// }
diff --git a/ports/gprs_a9/mpconfigport.h b/ports/gprs_a9/mpconfigport.h
index 34feaff1d5566..2981607543372 100644
--- a/ports/gprs_a9/mpconfigport.h
+++ b/ports/gprs_a9/mpconfigport.h
@@ -22,7 +22,7 @@
 #define MICROPY_DEBUG_PRINTERS      (0)
 #define MICROPY_ENABLE_GC           (0)
 #define MICROPY_GC_ALLOC_THRESHOLD  (0)
-#define MICROPY_REPL_EVENT_DRIVEN   (0)
+#define MICROPY_REPL_EVENT_DRIVEN   (1)
 #define MICROPY_HELPER_REPL         (1)
 #define MICROPY_HELPER_LEXER_UNIX   (0)
 #define MICROPY_ENABLE_SOURCE_LINE  (0)
@@ -91,11 +91,6 @@ typedef long mp_off_t;
 #define MICROPY_MIN_USE_STDOUT (1)
 #endif
 
-#ifdef __thumb__
-#define MICROPY_MIN_USE_CORTEX_CPU (1)
-#define MICROPY_MIN_USE_STM32_MCU (1)
-#endif
-
 #define MP_STATE_PORT MP_STATE_VM
 
 #define MICROPY_PORT_ROOT_POINTERS \

From 51c160073201a1f2667050ce3cb9f617bc52287a Mon Sep 17 00:00:00 2001
From: Neucrack <CZD666666@gmail.com>
Date: Wed, 29 Aug 2018 20:30:21 +0800
Subject: [PATCH 3100/3533] update lib

---
 ports/gprs_a9/GPRS_C_SDK | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/gprs_a9/GPRS_C_SDK b/ports/gprs_a9/GPRS_C_SDK
index 605262ba65d92..75ea8c0d4f3f0 160000
--- a/ports/gprs_a9/GPRS_C_SDK
+++ b/ports/gprs_a9/GPRS_C_SDK
@@ -1 +1 @@
-Subproject commit 605262ba65d92086715e03369f670ff353a9c3b2
+Subproject commit 75ea8c0d4f3f0f120d7b9e1e43e91505e93abe41

From 938efe8d072179efb0357d82eb6a067ad639566f Mon Sep 17 00:00:00 2001
From: Neucrack <CZD666666@gmail.com>
Date: Thu, 30 Aug 2018 10:00:59 +0800
Subject: [PATCH 3101/3533] make some debug, now minimal micropy system runable

---
 ports/gprs_a9/GPRS_C_SDK |  2 +-
 ports/gprs_a9/main.c     | 26 ++++++++++++++++----------
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/ports/gprs_a9/GPRS_C_SDK b/ports/gprs_a9/GPRS_C_SDK
index 75ea8c0d4f3f0..e8403a39c66ea 160000
--- a/ports/gprs_a9/GPRS_C_SDK
+++ b/ports/gprs_a9/GPRS_C_SDK
@@ -1 +1 @@
-Subproject commit 75ea8c0d4f3f0f120d7b9e1e43e91505e93abe41
+Subproject commit e8403a39c66ea3642863d260db189883010d5437
diff --git a/ports/gprs_a9/main.c b/ports/gprs_a9/main.c
index ea6ce684dc237..aa1144ccc73cb 100644
--- a/ports/gprs_a9/main.c
+++ b/ports/gprs_a9/main.c
@@ -27,7 +27,7 @@
 
 HANDLE mainTaskHandle  = NULL;
 HANDLE microPyTaskHandle = NULL;
-Buffer_t fifoBuffer;
+Buffer_t fifoBuffer;   //ringbuf
 uint8_t  fifoBufferData[UART_CIRCLE_FIFO_BUFFER_MAX_LENGTH];
 
 typedef enum
@@ -142,7 +142,7 @@ void MicroPyEventDispatch(MicroPy_Event_t* pEvent)
         {
             uint8_t c;
             bool ret;
-
+            printf("micropy task received data:%d,%s",pEvent->param1,pEvent->pParam1);
             for (;;) {
                 if(!Buffer_Gets(&fifoBuffer,&c,1))
                     break;
@@ -167,11 +167,13 @@ void MicroPyTask(VOID *pData)
 
     while(1)
     {
-        if(OS_WaitEvent(mainTaskHandle, (void**)&event, OS_TIME_OUT_WAIT_FOREVER))
+        if(OS_WaitEvent(microPyTaskHandle, (void**)&event, OS_TIME_OUT_WAIT_FOREVER))
         {
+            printf("microPy task received event:%d",event->id);
             // PM_SetSysMinFreq(PM_SYS_FREQ_178M);//set back system min frequency to 178M or higher(/lower) value
             MicroPyEventDispatch(event);
             OS_Free(event->pParam1);
+            OS_Free(event);
             // PM_SetSysMinFreq(PM_SYS_FREQ_32K);//release system freq to enter sleep mode to save power,
                                               //system remain runable but slower, and close eripheral not using
         }
@@ -189,16 +191,20 @@ void EventDispatch(API_Event_t* pEvent)
         case API_EVENT_ID_NETWORK_REGISTERED_ROAMING:
             break;
         case API_EVENT_ID_UART_RECEIVED:
-            Trace(1,"UART%d received:%d,%s",pEvent->param1,pEvent->param2,pEvent->pParam1);
+            printf("UART%d received:%d,%s",pEvent->param1,pEvent->param2,pEvent->pParam1);
             if(pEvent->param1 == UART1)
             {
-                MicroPy_Event_t event;
-
+                MicroPy_Event_t* event = (MicroPy_Event_t*)malloc(sizeof(MicroPy_Event_t));
+                if(!event)
+                {
+                    printf("malloc fail");
+                    break;
+                }
                 Buffer_Puts(&fifoBuffer,pEvent->pParam1,pEvent->param2);
-                memset((void*)&event,0,sizeof(MicroPy_Event_t));
-                event.id = MICROPY_EVENT_ID_UART_RECEIVED;
-                event.param1 = (uint32_t)(pEvent->param2);
-                OS_SendEvent(microPyTaskHandle,&event,OS_TIME_OUT_WAIT_FOREVER,0);
+                memset((void*)event,0,sizeof(MicroPy_Event_t));
+                event->id = MICROPY_EVENT_ID_UART_RECEIVED;
+                event->param1 = (uint32_t)(pEvent->param2);
+                OS_SendEvent(microPyTaskHandle,(void*)event,OS_TIME_OUT_WAIT_FOREVER,0);
             }
             break;
         default:

From c746cf080cc50cdae4e89351e21785e605952e4f Mon Sep 17 00:00:00 2001
From: Neucrack <CZD666666@gmail.com>
Date: Thu, 30 Aug 2018 10:08:04 +0800
Subject: [PATCH 3102/3533] remove test file

---
 ports/gprs_a9/test.c | 83 --------------------------------------------
 1 file changed, 83 deletions(-)
 delete mode 100644 ports/gprs_a9/test.c

diff --git a/ports/gprs_a9/test.c b/ports/gprs_a9/test.c
deleted file mode 100644
index 645b50617e6d3..0000000000000
--- a/ports/gprs_a9/test.c
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * @File  app_main.c
- * @Brief An example of SDK's mini system
- * 
- * @Author: Neucrack 
- * @Date: 2017-11-11 16:45:17 
- * @Last Modified by: Neucrack
- * @Last Modified time: 2017-11-11 18:24:56
- */
-
-
-#include "stdint.h"
-#include "stdbool.h"
-#include "api_os.h"
-#include "api_event.h"
-#include "api_debug.h"
-#include "api_hal_pm.h"
-
-#define AppMain_TASK_STACK_SIZE    (2048 * 2)
-#define AppMain_TASK_PRIORITY      0
-#define OTHERE_TASK_STACK_SIZE     (2048 * 2)
-#define OTHERE_TASK_PRIORITY       1
-HANDLE mainTaskHandle  = NULL;
-HANDLE otherTaskHandle = NULL;
-
-
-void LoopTask(VOID *pData)
-{
-    int count = 0;
-    //wait for trace initilize complete
-    OS_Sleep(3000);
-    while(1)
-    {
-        Trace(1, "Test Test 000 %d",++count);
-
-        //Use event drive or sleep some time here
-        OS_Sleep(2000);
-    }
-}
-void EventDispatch(API_Event_t* pEvent)
-{
-    switch(pEvent->id)
-    {
-        case API_EVENT_ID_POWER_ON:
-            break;
-        case API_EVENT_ID_NO_SIMCARD:
-            break;
-        case API_EVENT_ID_NETWORK_REGISTERED_HOME:
-        case API_EVENT_ID_NETWORK_REGISTERED_ROAMING:
-            break;
-        default:
-            break;
-    }
-}
-
-
-void AppMainTask(VOID *pData)
-{
-    API_Event_t* event=NULL;
-
-    otherTaskHandle = OS_CreateTask(LoopTask,
-                                    NULL, NULL, OTHERE_TASK_STACK_SIZE, OTHERE_TASK_PRIORITY, 0, 0, "ohter Task");
-    while(1)
-    {
-        if(OS_WaitEvent(mainTaskHandle, (void**)&event, OS_TIME_OUT_WAIT_FOREVER))
-        {
-            PM_SetSysMinFreq(PM_SYS_FREQ_178M);//set back system min frequency to 178M or higher(/lower) value
-            EventDispatch(event);
-            OS_Free(event->pParam1);
-            OS_Free(event->pParam2);
-            OS_Free(event);
-            PM_SetSysMinFreq(PM_SYS_FREQ_32K);//release system freq to enter sleep mode to save power,
-                                              //system remain runable but slower, and close eripheral not using
-        }
-    }
-}
-int _Main(void)
-{
-    mainTaskHandle = OS_CreateTask(AppMainTask ,
-                                   NULL, NULL, OTHERE_TASK_PRIORITY, AppMain_TASK_PRIORITY, 0, 0, "init Task");
-    OS_SetUserMainHandle(&mainTaskHandle);
-    return 0;
-}

From 423f61326676c3fe7cf28f1e990950562e8057f6 Mon Sep 17 00:00:00 2001
From: Neucrack <CZD666666@gmail.com>
Date: Thu, 30 Aug 2018 14:18:35 +0800
Subject: [PATCH 3103/3533] delete GPRS CSDK

---
 ports/gprs_a9/GPRS_C_SDK | 1 -
 1 file changed, 1 deletion(-)
 delete mode 160000 ports/gprs_a9/GPRS_C_SDK

diff --git a/ports/gprs_a9/GPRS_C_SDK b/ports/gprs_a9/GPRS_C_SDK
deleted file mode 160000
index e8403a39c66ea..0000000000000
--- a/ports/gprs_a9/GPRS_C_SDK
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit e8403a39c66ea3642863d260db189883010d5437

From 1483b0dc1323514bd6a8d3ba7c5b865e9760f181 Mon Sep 17 00:00:00 2001
From: Neucrack <CZD666666@gmail.com>
Date: Thu, 30 Aug 2018 14:23:38 +0800
Subject: [PATCH 3104/3533] add GPRS CSDK

---
 lib/GPRS_C_SDK | 1 +
 1 file changed, 1 insertion(+)
 create mode 160000 lib/GPRS_C_SDK

diff --git a/lib/GPRS_C_SDK b/lib/GPRS_C_SDK
new file mode 160000
index 0000000000000..e8403a39c66ea
--- /dev/null
+++ b/lib/GPRS_C_SDK
@@ -0,0 +1 @@
+Subproject commit e8403a39c66ea3642863d260db189883010d5437

From a85a13b8de8071088bd79bacbeff6e82c304a53e Mon Sep 17 00:00:00 2001
From: Neucrack <CZD666666@gmail.com>
Date: Thu, 30 Aug 2018 16:53:15 +0800
Subject: [PATCH 3105/3533] update build script

---
 lib/GPRS_C_SDK         |   2 +-
 ports/gprs_a9/Makefile |  60 +++++++++-------
 ports/gprs_a9/build.sh | 157 ++++++++++++++++++++++++++++++++++++++++-
 3 files changed, 190 insertions(+), 29 deletions(-)

diff --git a/lib/GPRS_C_SDK b/lib/GPRS_C_SDK
index e8403a39c66ea..0f114dbd6e157 160000
--- a/lib/GPRS_C_SDK
+++ b/lib/GPRS_C_SDK
@@ -1 +1 @@
-Subproject commit e8403a39c66ea3642863d260db189883010d5437
+Subproject commit 0f114dbd6e15762b3adb47fbdaf04e209c939310
diff --git a/ports/gprs_a9/Makefile b/ports/gprs_a9/Makefile
index 7a665fe569577..95273b4673a78 100644
--- a/ports/gprs_a9/Makefile
+++ b/ports/gprs_a9/Makefile
@@ -1,14 +1,22 @@
 mkfile_path := $(abspath $(lastword $(MAKEFILE_LIST)))  #获�当�正在执行的makefile的�对路径
 PATH_CURR := $(strip $(patsubst %/, %, $(dir ${mkfile_path})))
+PATH_MICROPY := $(strip $(patsubst %/ports/, %, $(dir ${PATH_CURR})))
+CSDK_PATH := ${PATH_MICROPY}/lib/GPRS_C_SDK
 include ../../py/mkenv.mk
 
-include ${PATH_CURR}/GPRS_C_SDK/platform/csdk/memd.def
-include ${PATH_CURR}/GPRS_C_SDK/platform/chip/defs/8955_base.def
-include ${PATH_CURR}/GPRS_C_SDK/init/target.def
+include ${CSDK_PATH}/platform/csdk/memd.def
+include ${CSDK_PATH}/platform/chip/defs/8955_base.def
+include ${CSDK_PATH}/init/target.def
 
+RELEASE = 0
 
-CT_RELEASE = debug
+ifeq ($(strip $(RELEASE)),1)
+	CFG_RELEASE = release
+else
+	CFG_RELEASE = debug
+endif
 
+$(info Compile Version:$(CFG_RELEASE))
 
 # qstr definitions (must come before including py.mk)
 QSTR_DEFS = qstrdefsport.h
@@ -25,29 +33,29 @@ STDOUT_NULL := 1>/dev/null
 
 BUILD_PATH := build
 BUILD_PATH_ABS := ${PATH_CURR}/${BUILD_PATH}
-CSDK_PATH := ${PATH_CURR}/GPRS_C_SDK
-BIN := $(BUILD_PATH_ABS)/firmware.elf
-HEX := $(BUILD_PATH_ABS)/firmware.srec
+FIRMWARE_NAME := firmware_${CFG_RELEASE}
+BIN := $(BUILD_PATH_ABS)/${FIRMWARE_NAME}.elf
+HEX := $(BUILD_PATH_ABS)/${FIRMWARE_NAME}.srec
 BIN_PATH := ${PATH_CURR}/hex
-LODBASE   := $(BIN_PATH)/firmware_
+LODBASE   := $(BIN_PATH)/${FIRMWARE_NAME}_
 LOD_FILE := ${LODBASE}flash.lod
-WITH_PLT_LOD_FILE := ${BIN_PATH}/firmware_full.lod
-WITH_PLT_OTA_FILE := ${BIN_PATH}/firmware_ota.lod
-STRIP_SYMBOL_FILE := ${PATH_CURR}/GPRS_C_SDK/platform/compilation/platform_symbols_to_strip
-PLATFORM_ELF_FOLDER_PATH := ${PATH_CURR}/GPRS_C_SDK/platform/csdk/debug
+WITH_PLT_LOD_FILE := ${BIN_PATH}/${FIRMWARE_NAME}_full.lod
+WITH_PLT_OTA_FILE := ${BIN_PATH}/${FIRMWARE_NAME}_ota.lod
+STRIP_SYMBOL_FILE := ${CSDK_PATH}/platform/compilation/platform_symbols_to_strip
+PLATFORM_ELF_FOLDER_PATH := ${CSDK_PATH}/platform/csdk/debug
 PLATFORM_ELF_PATH := ${wildcard ${PLATFORM_ELF_FOLDER_PATH}/*.elf}
 PLATFORM_ELF_NAME := ${notdir ${PLATFORM_ELF_PATH}}
-PLATFORM_LOD_PATH := ${CSDK_PATH}/platform/csdk/${strip ${CT_RELEASE}}
+PLATFORM_LOD_PATH := ${CSDK_PATH}/platform/csdk/${strip ${CFG_RELEASE}}
 PLATFORM_LOD_FILE := ${wildcard ${PLATFORM_LOD_PATH}/*.lod}
-ELFCOMBINE_TOOL := ${PATH_CURR}/GPRS_C_SDK/platform/compilation/elfCombine.pl
+ELFCOMBINE_TOOL := ${CSDK_PATH}/platform/compilation/elfCombine.pl
 TARGET_FILE := ${BUILD_PATH_ABS}/targetgen
 MAP_CFG_FILE := ${CSDK_PATH}/platform/compilation/8955_map_cfg
 LODCOMBINE_TOOL := ${CSDK_PATH}/platform/compilation/lodCombine.pl
 
 
-LIBGCC_PATH := ${PATH_CURR}/GPRS_C_SDK/platform/lib/gcc/mips-elf/4.4.2
-MAP := ${BUILD_PATH_ABS}/firmware.map
-FULL_LIBRARY_PATH := -L${PATH_CURR}/GPRS_C_SDK/build/csdk/lib
+LIBGCC_PATH := ${CSDK_PATH}/platform/lib/gcc/mips-elf/4.4.2
+MAP := ${BUILD_PATH_ABS}/${FIRMWARE_NAME}.map
+FULL_LIBRARY_PATH := -L${CSDK_PATH}/hex/libcsdk
 MYLIBFILES := 
 FULL_LIBRARY_EXT := -lcsdk_debug 
 
@@ -58,11 +66,11 @@ LDPPFLAGS += \
         -DUSER_RAM_BASE=${EXT_RAM_BASE}+${USER_RAM_BASE} \
         -DUSER_RAM_SIZE=${USER_RAM_SIZE} \
         -DDUSE_BINUTILS_2_19=1
-LD_SRC := ${PATH_CURR}/GPRS_C_SDK/platform/compilation/cust.ld
+LD_SRC := ${CSDK_PATH}/platform/compilation/cust.ld
 LD_FILE := ${BUILD_PATH_ABS}/cust.ld
 OFORMAT := --oformat=elf32-littlemips
 SREC	:= --input-target=elf32-littlemips --output-target=srec
-LDFLAG_USED_ELF_FILES := -just-symbols ${PATH_CURR}/GPRS_C_SDK/platform/chip/rom/8955/lib/mem_bridge_rom_CHIP.elf
+LDFLAG_USED_ELF_FILES := -just-symbols ${CSDK_PATH}/platform/chip/rom/8955/lib/mem_bridge_rom_CHIP.elf
 LDFLAGS += --gc-sections
 LDFLAGS += ${FULL_LIBRARY_PATH} --start-group ${MYLIBFILES} ${FULL_LIBRARY_EXT} --end-group
 LDFLAGS	+= -L${LIBGCC_PATH} -lgcc 
@@ -73,10 +81,10 @@ LD_OPTIONAL_OBJECTS :=
 INC += -I.
 INC += -I$(TOP)
 INC += -I$(BUILD_PATH_ABS)
-INC += -I${PATH_CURR}/GPRS_C_SDK/include \
-       -I${PATH_CURR}/GPRS_C_SDK/include/std_inc \
-	   -I${PATH_CURR}/GPRS_C_SDK/include/api_inc \
-	   -I${PATH_CURR}/GPRS_C_SDK/libs/utils/include
+INC += -I${CSDK_PATH}/include \
+       -I${CSDK_PATH}/include/std_inc \
+	   -I${CSDK_PATH}/include/api_inc \
+	   -I${CSDK_PATH}/libs/utils/include
 
 # DFU = $(TOP)/tools/dfu.py
 # PYDFU = $(TOP)/tools/pydfu.py
@@ -139,9 +147,9 @@ bin: ${BIN}
 	$(Q)${MKDIR} -p ${BIN_PATH}
 	$(Q)${CP} -f ${BIN} ${BIN_PATH}
 	$(Q)${CP} -f ${PLATFORM_ELF_PATH} ${BIN_PATH}
-	$(Q)${OBJCOPY} --strip-symbols=${STRIP_SYMBOL_FILE} ${BIN_PATH}/firmware.elf ${BIN_PATH}/firmware.elf
-	$(Q)${ELFCOMBINE_TOOL} -e1 ${BIN_PATH}/firmware.elf -e2 ${BIN_PATH}/${PLATFORM_ELF_NAME} -o ${BIN_PATH}/firmware_final.elf
-	$(Q)${RM} -f ${BIN_PATH}/firmware.elf
+	$(Q)${OBJCOPY} --strip-symbols=${STRIP_SYMBOL_FILE} ${BIN_PATH}/${FIRMWARE_NAME}.elf ${BIN_PATH}/${FIRMWARE_NAME}.elf
+	$(Q)${ELFCOMBINE_TOOL} -e1 ${BIN_PATH}/${FIRMWARE_NAME}.elf -e2 ${BIN_PATH}/${PLATFORM_ELF_NAME} -o ${BIN_PATH}/${FIRMWARE_NAME}_final.elf
+	$(Q)${RM} -f ${BIN_PATH}/${FIRMWARE_NAME}.elf
 	$(Q)${RM} -f ${BIN_PATH}/${PLATFORM_ELF_NAME}
 
 ${HEX}:bin
diff --git a/ports/gprs_a9/build.sh b/ports/gprs_a9/build.sh
index 4ec116ab8e9cf..c759f8ae7b567 100644
--- a/ports/gprs_a9/build.sh
+++ b/ports/gprs_a9/build.sh
@@ -1,4 +1,157 @@
 #!/bin/bash
 
-cd GPRS_C_SDK/platform/tools/genlib
-./genlib.sh
+
+######################## 1 ################################
+# check path
+curr_path_abs=$(cd `dirname $0`; pwd)
+curr_folder_name="${curr_path_abs##*/}"
+echo $curr_path_abs
+if [[ "${curr_folder_name}" != "gprs_a9" ]]; then
+    echo "Plese exec build.sh in gprs_a9 folder"
+    exit 1
+fi
+###########################################################
+
+function clean_CSDK_lib()
+{
+    echo ">> Clean CSDK lib now"
+    cd ../../  #root path of micropython project
+    cd lib/GPRS_C_SDK/platform/tools/genlib
+    ./genlib.sh clean
+    cd ${curr_path_abs}
+}
+
+######################### 2 ###############################
+# check parameters
+CFG_RELEASE=debug
+if [[ "$1xx" == "releasexx" ]]; then
+    CFG_RELEASE=release
+elif [[ "$1xx" == "cleanxx" ]]; then
+    echo ">> Clean build & hex"
+    rm -rf build
+    rm -rf hex
+    clean_CSDK_lib
+    echo ">> Clean complete"
+    exit 0
+fi
+
+# variable
+FIRMWARE_NAME=firmware_${CFG_RELEASE}
+MAP_FILE_PATH=./build/${FIRMWARE_NAME}.map
+MEMD_DEF_PATH=../../lib/GPRS_C_SDK/platform/csdk/memd.def
+start_time=`date +%s`
+###########################################################
+
+
+#check gprs sdk files
+function check_CSDK()
+{
+    echo ">> Check GPRS CSDK lib files"
+    cd ../../ # root of micropython project
+    if [ "`ls -A lib/GPRS_C_SDK`xx" == "xx" ]; then
+        echo "-- No CSDK, now pull"
+        git submodule update --init lib/GPRS_C_SDK
+        cd lib/GPRS_C_SDK
+        git submodule update --init
+        cd ../../
+        echo "-- Pull CSDK complete"
+    else
+        echo "-- GPRS CSDK exist"
+    fi
+    if [ "`ls -A lib/GPRS_C_SDK/platform/csdk`xx" == "xx" ]; then
+        echo "-- No CSDK lib, now pull"
+        cd lib/GPRS_C_SDK
+        proxy git submodule update --init
+        cd ../../
+        echo "-- Pull CSDK lib complete"
+    else
+        echo "-- GPRS CSDK submodule exist"
+    fi
+    cd ${curr_path_abs}
+    echo ">> Check GPRS CSDK lib files end"
+}
+
+function generate_CSDK_lib()
+{
+    echo ">> Generate CSDK lib now"
+    cd ../../  #root path of micropython project
+    cd lib/GPRS_C_SDK/platform/tools/genlib
+    ./genlib.sh ${CFG_RELEASE}
+    cd ../../../../../
+    if [[ -f "lib/GPRS_C_SDK/hex/libcsdk/libcsdk_${CFG_RELEASE}.a" ]]; then
+        echo ">> Geneate CSDK lib compelte"
+    else
+        echo ">> Generate CSDK lib fail, please check error"
+        exit 1
+    fi
+    cd ${curr_path_abs}
+}
+
+function show_time()
+{
+    end_time=`date +%s`
+    time_distance=`expr ${end_time} - ${start_time}`
+    date_time_now=$(date +%F\ \ %H:%M:%S)
+    echo "=================================="
+    echo "       Build Time: ${time_distance}s "
+    echo "       ${date_time_now} "
+    echo "=================================="
+}
+
+function show_mem_info()
+{
+    ram_total=$(grep  -n  "USER_RAM_SIZE" $MEMD_DEF_PATH | awk  '{print $3}')
+    rom_total=$(grep  -n  "USER_ROM_SIZE" $MEMD_DEF_PATH | awk  '{print $3}')
+
+    rom_start=$(grep  -n  "__rom_start = ." $MAP_FILE_PATH | awk  '{print $2}')
+    rom_rw_start=$(grep  -n  "__user_rw_lma = ." $MAP_FILE_PATH | awk  '{print $2}')
+
+    ram_start=$(grep  -n  "__user_rw_start = ." $MAP_FILE_PATH | awk  '{print $2}')
+    ram_rw_data_end=$(grep  -n  "__user_rw_end = ." $MAP_FILE_PATH | awk  '{print $2}')
+    ram_end=$(grep  -n  "__user_bss_end = ." $MAP_FILE_PATH | awk  '{print $2}')
+
+    # echo $ram_start $ram_end
+    ram_used=$(($ram_end-$ram_start))
+    ram_used_percent=$(awk 'BEGIN{printf "%.2f%%\n",('$ram_used'/'$((${ram_total}))')*100}')
+
+    rw_data_size=$(($ram_rw_data_end-$ram_start))
+    rom_used=$(($rom_rw_start-$rom_start+$rw_data_size))
+    rom_used_percent=$(awk 'BEGIN{printf "%.2f%%\n",('$rom_used'/'$(($rom_total))')*100}')
+
+    echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+    echo ROM total: ${rom_total}\($((${rom_total}))\) Bytes, used: $rom_used Bytes \($rom_used_percent\)
+    echo RAM total: ${ram_total}\($((${ram_total}))\) Bytes, used: $ram_used Bytes \($ram_used_percent\)
+    echo "__________________________________________________________________"
+}
+
+function build_micropy()
+{
+    echo ">> Build micropython"
+    echo "-- Remove old firmware"
+    rm -f hex/*
+    MAKE_J_NUMBER=`cat /proc/cpuinfo | grep vendor_id | wc -l`
+    echo "-- Core number:$MAKE_J_NUMBER"
+    make -j${MAKE_J_NUMBER} CFG_RELEASE=${CFG_RELEASE}
+    if [[ -f "hex/${FIRMWARE_NAME}_full.lod" ]]; then
+        echo "----------------------------------"
+        echo "          BUILD SUCCESS           "
+        echo "----------------------------------"
+        show_time
+        show_mem_info
+    else
+        echo "----------------------------------"
+        echo "         !!BUILD FAIL!!           "
+        echo "----------------------------------"
+        show_time
+        exit 1
+    fi
+}
+
+########################## 3 ##############################
+# Check GPRS_C_SDK files
+check_CSDK
+# Generate a lib from GPRS_C_SDK
+generate_CSDK_lib
+# Build MicroPython application
+build_micropy
+###########################################################

From d19d8d89b8a9fd44afbfcf099ef90babdd9bb928 Mon Sep 17 00:00:00 2001
From: Neucrack <CZD666666@gmail.com>
Date: Thu, 30 Aug 2018 17:09:04 +0800
Subject: [PATCH 3106/3533] update csdk lib

---
 lib/GPRS_C_SDK | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/GPRS_C_SDK b/lib/GPRS_C_SDK
index 0f114dbd6e157..2e03b1cc3c0ca 160000
--- a/lib/GPRS_C_SDK
+++ b/lib/GPRS_C_SDK
@@ -1 +1 @@
-Subproject commit 0f114dbd6e15762b3adb47fbdaf04e209c939310
+Subproject commit 2e03b1cc3c0ca2c72d3bd683b3a857c655a3834a

From 3797a70b57884a76ce8b15382189f171f193357f Mon Sep 17 00:00:00 2001
From: Neucrack <CZD666666@gmail.com>
Date: Thu, 30 Aug 2018 17:27:46 +0800
Subject: [PATCH 3107/3533] optimize script and add readme

---
 ports/gprs_a9/README.md | 13 +++++++++++++
 ports/gprs_a9/build.sh  |  2 ++
 2 files changed, 15 insertions(+)
 create mode 100644 ports/gprs_a9/README.md

diff --git a/ports/gprs_a9/README.md b/ports/gprs_a9/README.md
new file mode 100644
index 0000000000000..99cf98fe34d8b
--- /dev/null
+++ b/ports/gprs_a9/README.md
@@ -0,0 +1,13 @@
+
+## install GPRS_C_SDK toolchain
+
+* [installation doc](https://ai-thinker-open.github.io/GPRS_C_SDK_DOC/en/c-sdk/installation_linux.html)
+* Or [docker](https://github.com/Neutree/gprs_build)
+
+
+```
+git clone git@github.com:Neutree/micropython.git
+cd micropython/ports/gprs_a9
+chmod +x build.sh
+./build.sh
+```
\ No newline at end of file
diff --git a/ports/gprs_a9/build.sh b/ports/gprs_a9/build.sh
index c759f8ae7b567..3dfbf37c0aba8 100644
--- a/ports/gprs_a9/build.sh
+++ b/ports/gprs_a9/build.sh
@@ -17,6 +17,7 @@ function clean_CSDK_lib()
     echo ">> Clean CSDK lib now"
     cd ../../  #root path of micropython project
     cd lib/GPRS_C_SDK/platform/tools/genlib
+    chmod +x genlib.sh
     ./genlib.sh clean
     cd ${curr_path_abs}
 }
@@ -76,6 +77,7 @@ function generate_CSDK_lib()
     echo ">> Generate CSDK lib now"
     cd ../../  #root path of micropython project
     cd lib/GPRS_C_SDK/platform/tools/genlib
+    chmod +x genlib.sh
     ./genlib.sh ${CFG_RELEASE}
     cd ../../../../../
     if [[ -f "lib/GPRS_C_SDK/hex/libcsdk/libcsdk_${CFG_RELEASE}.a" ]]; then

From 325f1837de2928f731308d0f228ecefdbb87209b Mon Sep 17 00:00:00 2001
From: Neucrack <CZD666666@gmail.com>
Date: Mon, 3 Sep 2018 15:59:05 +0800
Subject: [PATCH 3108/3533] add math lib & compile pass

---
 lib/GPRS_C_SDK                 |   2 +-
 ports/gprs_a9/Makefile         |  35 +++++----
 ports/gprs_a9/README.md        |   1 +
 ports/gprs_a9/csdk_config.h    |  16 ++++
 ports/gprs_a9/frozentest.mpy   | Bin 255 -> 0 bytes
 ports/gprs_a9/frozentest.py    |   7 --
 ports/gprs_a9/help.c           |  65 ++++++++++++++++
 ports/gprs_a9/main.c           |  32 +++++---
 ports/gprs_a9/modules/blink.py |   5 ++
 ports/gprs_a9/mpconfigport.h   | 132 ++++++++++++++++++++++++---------
 10 files changed, 231 insertions(+), 64 deletions(-)
 create mode 100644 ports/gprs_a9/csdk_config.h
 delete mode 100644 ports/gprs_a9/frozentest.mpy
 delete mode 100644 ports/gprs_a9/frozentest.py
 create mode 100644 ports/gprs_a9/help.c
 create mode 100644 ports/gprs_a9/modules/blink.py

diff --git a/lib/GPRS_C_SDK b/lib/GPRS_C_SDK
index 2e03b1cc3c0ca..b1192271da456 160000
--- a/lib/GPRS_C_SDK
+++ b/lib/GPRS_C_SDK
@@ -1 +1 @@
-Subproject commit 2e03b1cc3c0ca2c72d3bd683b3a857c655a3834a
+Subproject commit b1192271da45619195bf7923c84784d2230dd921
diff --git a/ports/gprs_a9/Makefile b/ports/gprs_a9/Makefile
index 95273b4673a78..250b342639334 100644
--- a/ports/gprs_a9/Makefile
+++ b/ports/gprs_a9/Makefile
@@ -21,11 +21,15 @@ $(info Compile Version:$(CFG_RELEASE))
 # qstr definitions (must come before including py.mk)
 QSTR_DEFS = qstrdefsport.h
 
-# include py core make definitions
-include $(TOP)/py/py.mk
 
-CROSS_COMPILE = mips-elf-
+
+#############################################
+
+
+FROZEN_MPY_DIR ?= modules
+
 #############################################
+CROSS_COMPILE = mips-elf-
 MAKE = make
 LD  := $(CROSS_COMPILE)ld
 LDPP := $(CROSS_COMPILE)cpp -C -P -undef
@@ -86,10 +90,6 @@ INC += -I${CSDK_PATH}/include \
 	   -I${CSDK_PATH}/include/api_inc \
 	   -I${CSDK_PATH}/libs/utils/include
 
-# DFU = $(TOP)/tools/dfu.py
-# PYDFU = $(TOP)/tools/pydfu.py
-# CFLAGS_CORTEX_M4 = -mthumb -mtune=cortex-m4 -mabi=aapcs-linux -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard -fsingle-precision-constant -Wdouble-promotion
-# CFLAGS = $(INC) -Wall -Werror -std=c99 -nostdlib $(CFLAGS_CORTEX_M4) $(COPT)
 CFLAGS = $(INC) -Wshadow \
 		  -std=gnu99 \
           -Os -g -fno-inline-small-functions -fno-inline-functions -fno-align-functions -fno-align-jumps -fno-align-loops -fno-align-labels \
@@ -108,7 +108,7 @@ LIBS =
 
 SRC_C = \
 	main.c \
-	$(BUILD)/_frozen_mpy.c
+	help.c 
 
 LIB_SRC_C = $(addprefix lib/,\
 	utils/stdout_helpers.c \
@@ -116,6 +116,19 @@ LIB_SRC_C = $(addprefix lib/,\
 	mp-readline/readline.c \
 	)
 
+
+# include py core make definitions
+include $(TOP)/py/py.mk
+
+OBJ_MP =
+OBJ_MP += $(PY_O)
+OBJ_MP += $(addprefix $(BUILD)/, $(SRC_C:.c=.o))
+
+OBJ = $(OBJ_MP) $(PY_CORE_O)
+OBJ += $(addprefix $(BUILD_PATH)/, $(LIB_SRC_C:.c=.o))
+
+
+
 all: lod
 
 
@@ -125,12 +138,8 @@ lod: ${HEX}
 	$(Q)$(LODCOMBINE_TOOL) openat -l  $(PLATFORM_LOD_FILE) -i $(LOD_FILE) -o $(WITH_PLT_LOD_FILE) -u $(WITH_PLT_OTA_FILE);
 	$(ECHO) "BUILD OK"
 
-OBJ = $(PY_CORE_O) $(addprefix $(BUILD_PATH)/, $(SRC_C:.c=.o))
-OBJ += $(addprefix $(BUILD_PATH)/, $(LIB_SRC_C:.c=.o))
 
-$(BUILD)/_frozen_mpy.c: frozentest.mpy $(BUILD)/genhdr/qstrdefs.generated.h
-	$(ECHO) "MISC freezing bytecode"
-	$(Q)$(TOP)/tools/mpy-tool.py -f -q $(BUILD)/genhdr/qstrdefs.preprocessed.h -mlongint-impl=none $< > $@
+
 
 
 ${BIN}: $(OBJ)
diff --git a/ports/gprs_a9/README.md b/ports/gprs_a9/README.md
index 99cf98fe34d8b..11719135fe67a 100644
--- a/ports/gprs_a9/README.md
+++ b/ports/gprs_a9/README.md
@@ -7,6 +7,7 @@
 
 ```
 git clone git@github.com:Neutree/micropython.git
+make -C mpy-cross
 cd micropython/ports/gprs_a9
 chmod +x build.sh
 ./build.sh
diff --git a/ports/gprs_a9/csdk_config.h b/ports/gprs_a9/csdk_config.h
new file mode 100644
index 0000000000000..80e4bb97647f0
--- /dev/null
+++ b/ports/gprs_a9/csdk_config.h
@@ -0,0 +1,16 @@
+#ifndef __CSDK_CONFIG_H
+#define __CSDK_CONFIG_H
+
+#include "math.h"
+
+// #undef floor
+// #define floor(x)  CSDK_FUNC(floor)(x)
+
+// #undef exp
+// // #define exp(x)  CSDK_FUNC(exp)(x)
+// inline double exp(double x){return CSDK_FUNC(exp)(x);}
+
+#endif
+
+
+
diff --git a/ports/gprs_a9/frozentest.mpy b/ports/gprs_a9/frozentest.mpy
deleted file mode 100644
index 7c6809bf6522f90339ec72ae0dcd16560ac5aafc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 255
zcmeZeW|EI#W&i<RE{2Z`S{fP}+8PWD|D_Kyh<##6VKf3V#9=fel+OgAMRvWPB?@FV
znDRFmsC;GsDwX~WQrq~{pyj&R>v|)>Xbzj){FKt1R6E|ZqWr4Vypq)761{>-)`FtU
zyb|Wp04NK>M<y9FAw0%RW`<&=M1`FEymW=)5}>wpg_4ZK5{1lSg}i(q1vIiKFEyoD
tEfGaJBe7VaG%qtbKP6S++{Sa8&TUpm&PXgOPU23g1Uf>&(8$<?5dh6rQZN7j

diff --git a/ports/gprs_a9/frozentest.py b/ports/gprs_a9/frozentest.py
deleted file mode 100644
index 0f99b74297fbb..0000000000000
--- a/ports/gprs_a9/frozentest.py
+++ /dev/null
@@ -1,7 +0,0 @@
-print('uPy')
-print('a long string that is not interned')
-print('a string that has unicode αβγ chars')
-print(b'bytes 1234\x01')
-print(123456789)
-for i in range(4):
-    print(i)
diff --git a/ports/gprs_a9/help.c b/ports/gprs_a9/help.c
new file mode 100644
index 0000000000000..6bc9c73318f8c
--- /dev/null
+++ b/ports/gprs_a9/help.c
@@ -0,0 +1,65 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * Development of the code in this file was sponsored by Microbric Pty Ltd
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013-2016 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "py/builtin.h"
+
+const char gprs_a9_help_text[] =
+"Welcome to MicroPython on the GPRS A9/A9G!\n"
+"\n"
+"For generic online docs please visit http://docs.micropython.org/\n"
+"\n"
+"For access to the hardware use the 'machine' module:\n"
+"\n"
+"import machine\n"
+"pin12 = machine.Pin(12, machine.Pin.OUT)\n"
+"pin12.value(1)\n"
+"pin13 = machine.Pin(13, machine.Pin.IN, machine.Pin.PULL_UP)\n"
+"print(pin13.value())\n"
+"i2c = machine.I2C(scl=machine.Pin(21), sda=machine.Pin(22))\n"
+"i2c.scan()\n"
+"i2c.writeto(addr, b'1234')\n"
+"i2c.readfrom(addr, 4)\n"
+"\n"
+"Basic WiFi configuration:\n"
+"\n"
+"import network\n"
+"sta_if = network.WLAN(network.STA_IF); sta_if.active(True)\n"
+"sta_if.scan()                             # Scan for available access points\n"
+"sta_if.connect(\"<AP_name>\", \"<password>\") # Connect to an AP\n"
+"sta_if.isconnected()                      # Check for successful connection\n"
+"\n"
+"Control commands:\n"
+"  CTRL-A        -- on a blank line, enter raw REPL mode\n"
+"  CTRL-B        -- on a blank line, enter normal REPL mode\n"
+"  CTRL-C        -- interrupt a running program\n"
+"  CTRL-D        -- on a blank line, do a soft reset of the board\n"
+"  CTRL-E        -- on a blank line, enter paste mode\n"
+"\n"
+"For further help on a specific object, type help(obj)\n"
+"For a list of available modules, type help('modules')\n"
+;
diff --git a/ports/gprs_a9/main.c b/ports/gprs_a9/main.c
index aa1144ccc73cb..d90ddfcee7f6a 100644
--- a/ports/gprs_a9/main.c
+++ b/ports/gprs_a9/main.c
@@ -93,11 +93,13 @@ mp_obj_t mp_builtin_open(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs)
 MP_DEFINE_CONST_FUN_OBJ_KW(mp_builtin_open_obj, 1, mp_builtin_open);
 
 void nlr_jump_fail(void *val) {
-    assert("nlr_jump_fail");
+    __assert("nlr_jump_fail");
+    while (1);//never reach here actully
 }
 
 void NORETURN __fatal_error(const char *msg) {
-    assert(msg);
+    __assert(msg);
+    while (1);//never reach here actully
 }
 
 #ifndef NDEBUG
@@ -131,7 +133,7 @@ bool UartInit()
         .useEvent = true,
     };
     UART_Init(UART1,config);
-    Buffer_Init(&fifoBuffer,fifoBufferData,sizeof(fifoBufferData));
+    return true;
 }
 
 void MicroPyEventDispatch(MicroPy_Event_t* pEvent)
@@ -141,7 +143,6 @@ void MicroPyEventDispatch(MicroPy_Event_t* pEvent)
         case MICROPY_EVENT_ID_UART_RECEIVED:
         {
             uint8_t c;
-            bool ret;
             printf("micropy task received data:%d,%s",pEvent->param1,pEvent->pParam1);
             for (;;) {
                 if(!Buffer_Gets(&fifoBuffer,&c,1))
@@ -162,6 +163,7 @@ void MicroPyTask(VOID *pData)
 {
     MicroPy_Event_t* event;
 
+    Buffer_Init(&fifoBuffer,fifoBufferData,sizeof(fifoBufferData));
     UartInit();
     mp_Init();
 
@@ -218,7 +220,7 @@ void AppMainTask(VOID *pData)
     API_Event_t* event=NULL;
 
     microPyTaskHandle = OS_CreateTask(MicroPyTask,
-                                    NULL, NULL, MICROPYTHON_TASK_STACK_SIZE, MICROPYTHON_TASK_PRIORITY, 0, 0, "ohter Task");
+                                    NULL, NULL, MICROPYTHON_TASK_STACK_SIZE, MICROPYTHON_TASK_PRIORITY, 0, 0, (PCSTR)"ohter Task");
     while(1)
     {
         if(OS_WaitEvent(mainTaskHandle, (void**)&event, OS_TIME_OUT_WAIT_FOREVER))
@@ -233,19 +235,31 @@ void AppMainTask(VOID *pData)
         }
     }
 }
-int _Main(void)
+void _Main(void)
 {
     mainTaskHandle = OS_CreateTask(AppMainTask ,
-                                   NULL, NULL, MICROPYTHON_TASK_PRIORITY, AppMain_TASK_PRIORITY, 0, 0, "init Task");
+                                   NULL, NULL, MICROPYTHON_TASK_PRIORITY, AppMain_TASK_PRIORITY, 0, 0, (PCSTR)"init Task");
     OS_SetUserMainHandle(&mainTaskHandle);
-    return 0;
 }
 
 // Send string of given length
 void mp_hal_stdout_tx_strn(const char *str, mp_uint_t len) {
-    UART_Write(UART1,str,len);
+    UART_Write(UART1,(uint8_t*)str,len);
 }
 
 // void mp_hal_stdout_tx_str(const char *str) {
 //     mp_hal_stdout_tx_strn(str, strlen(str));
 // }
+
+
+
+int mp_hal_stdin_rx_chr(void) {
+    uint8_t c;
+    for (;;) {
+        if(Buffer_Gets(&fifoBuffer,&c,1))
+            return c;
+        MICROPY_EVENT_POLL_HOOK
+        OS_Sleep(1);
+    }
+}
+
diff --git a/ports/gprs_a9/modules/blink.py b/ports/gprs_a9/modules/blink.py
new file mode 100644
index 0000000000000..5b64b416825c6
--- /dev/null
+++ b/ports/gprs_a9/modules/blink.py
@@ -0,0 +1,5 @@
+
+
+
+print("blink")
+
diff --git a/ports/gprs_a9/mpconfigport.h b/ports/gprs_a9/mpconfigport.h
index 2981607543372..76d023ac9fff6 100644
--- a/ports/gprs_a9/mpconfigport.h
+++ b/ports/gprs_a9/mpconfigport.h
@@ -2,10 +2,17 @@
 
 // options to control how MicroPython is built
 
-// You can disable the built-in MicroPython compiler by setting the following
-// config option to 0.  If you do this then you won't get a REPL prompt, but you
-// will still be able to execute pre-compiled scripts, compiled with mpy-cross.
+
+#define MICROPY_OBJ_REPR            (MICROPY_OBJ_REPR_A)
+#define MICROPY_NLR_SETJMP          (1)
+
+// Python internal features
 #define MICROPY_ENABLE_COMPILER     (1)
+#define MICROPY_REPL_EVENT_DRIVEN   (1)
+#define MICROPY_ENABLE_GC           (0)
+#define MICROPY_LONGINT_IMPL        (MICROPY_LONGINT_IMPL_MPZ)
+#define MICROPY_FLOAT_IMPL          (MICROPY_FLOAT_IMPL_DOUBLE)
+#define MICROPY_MODULE_FROZEN_MPY   (1)
 
 #define MICROPY_QSTR_BYTES_IN_HASH  (1)
 #define MICROPY_QSTR_EXTRA_POOL     mp_qstr_frozen_const_pool
@@ -20,9 +27,7 @@
 #define MICROPY_COMP_TRIPLE_TUPLE_ASSIGN (0)
 #define MICROPY_MEM_STATS           (0)
 #define MICROPY_DEBUG_PRINTERS      (0)
-#define MICROPY_ENABLE_GC           (0)
 #define MICROPY_GC_ALLOC_THRESHOLD  (0)
-#define MICROPY_REPL_EVENT_DRIVEN   (1)
 #define MICROPY_HELPER_REPL         (1)
 #define MICROPY_HELPER_LEXER_UNIX   (0)
 #define MICROPY_ENABLE_SOURCE_LINE  (0)
@@ -30,36 +35,76 @@
 #define MICROPY_ERROR_REPORTING     (MICROPY_ERROR_REPORTING_TERSE)
 #define MICROPY_BUILTIN_METHOD_CHECK_SELF_ARG (0)
 #define MICROPY_PY_ASYNC_AWAIT      (0)
-#define MICROPY_PY_BUILTINS_BYTEARRAY (0)
-#define MICROPY_PY_BUILTINS_MEMORYVIEW (0)
-#define MICROPY_PY_BUILTINS_ENUMERATE (0)
-#define MICROPY_PY_BUILTINS_FILTER  (0)
-#define MICROPY_PY_BUILTINS_FROZENSET (0)
-#define MICROPY_PY_BUILTINS_REVERSED (0)
-#define MICROPY_PY_BUILTINS_SET     (0)
-#define MICROPY_PY_BUILTINS_SLICE   (0)
-#define MICROPY_PY_BUILTINS_PROPERTY (0)
-#define MICROPY_PY_BUILTINS_MIN_MAX (0)
-#define MICROPY_PY___FILE__         (0)
-#define MICROPY_PY_GC               (0)
-#define MICROPY_PY_ARRAY            (0)
-#define MICROPY_PY_ATTRTUPLE        (0)
-#define MICROPY_PY_COLLECTIONS      (0)
-#define MICROPY_PY_MATH             (0)
-#define MICROPY_PY_CMATH            (0)
-#define MICROPY_PY_IO               (0)
-#define MICROPY_PY_STRUCT           (0)
-#define MICROPY_PY_SYS              (0)
-#define MICROPY_MODULE_FROZEN_MPY   (1)
 #define MICROPY_CPYTHON_COMPAT      (0)
-#define MICROPY_LONGINT_IMPL        (MICROPY_LONGINT_IMPL_NONE)
-#define MICROPY_FLOAT_IMPL          (MICROPY_FLOAT_IMPL_NONE)
 #define MICROPY_NO_ALLOCA           (1)
 #define MP_ENDIANNESS_LITTLE        (1)
 #define MICROPY_PY_OS_DUPTERM       (1)
-#define MICROPY_NLR_SETJMP          (1)
 #define MICROPY_PY_LWIP_SLIP        (0)
 
+
+
+// control over Python builtins
+#define MICROPY_PY_FUNCTION_ATTRS           (1)
+#define MICROPY_PY_DESCRIPTORS              (1)
+#define MICROPY_PY_STR_BYTES_CMP_WARN       (1)
+#define MICROPY_PY_BUILTINS_STR_UNICODE     (1)
+#define MICROPY_PY_BUILTINS_STR_CENTER      (1)
+#define MICROPY_PY_BUILTINS_STR_PARTITION   (1)
+#define MICROPY_PY_BUILTINS_STR_SPLITLINES  (1)
+#define MICROPY_PY_BUILTINS_BYTEARRAY       (1)
+#define MICROPY_PY_BUILTINS_MEMORYVIEW      (1)
+#define MICROPY_PY_BUILTINS_SET             (1)
+#define MICROPY_PY_BUILTINS_SLICE           (1)
+#define MICROPY_PY_BUILTINS_SLICE_ATTRS     (1)
+#define MICROPY_PY_BUILTINS_FROZENSET       (1)
+#define MICROPY_PY_BUILTINS_PROPERTY        (1)
+#define MICROPY_PY_BUILTINS_RANGE_ATTRS     (1)
+#define MICROPY_PY_BUILTINS_ROUND_INT       (1)
+#define MICROPY_PY_BUILTINS_TIMEOUTERROR    (1)
+#define MICROPY_PY_ALL_SPECIAL_METHODS      (1)
+#define MICROPY_PY_BUILTINS_COMPILE         (1)
+#define MICROPY_PY_BUILTINS_ENUMERATE       (1)
+#define MICROPY_PY_BUILTINS_EXECFILE        (1)
+#define MICROPY_PY_BUILTINS_FILTER          (1)
+#define MICROPY_PY_BUILTINS_REVERSED        (1)
+#define MICROPY_PY_BUILTINS_NOTIMPLEMENTED  (1)
+#define MICROPY_PY_BUILTINS_INPUT           (1)
+#define MICROPY_PY_BUILTINS_MIN_MAX         (1)
+#define MICROPY_PY_BUILTINS_POW3            (1)
+#define MICROPY_PY_BUILTINS_HELP            (1)
+#define MICROPY_PY_BUILTINS_HELP_TEXT       gprs_a9_help_text
+#define MICROPY_PY_BUILTINS_HELP_MODULES    (1)
+#define MICROPY_PY___FILE__                 (1)
+#define MICROPY_PY_MICROPYTHON_MEM_INFO     (1)
+#define MICROPY_PY_ARRAY                    (1)
+#define MICROPY_PY_ARRAY_SLICE_ASSIGN       (1)
+#define MICROPY_PY_ATTRTUPLE                (1)
+#define MICROPY_PY_COLLECTIONS              (1)
+#define MICROPY_PY_COLLECTIONS_DEQUE        (1)
+#define MICROPY_PY_COLLECTIONS_ORDEREDDICT  (1)
+#define MICROPY_PY_MATH                     (1)
+#define MICROPY_PY_MATH_SPECIAL_FUNCTIONS   (1)
+#define MICROPY_PY_CMATH                    (1)
+#define MICROPY_PY_GC                       (0)
+#define MICROPY_PY_IO                       (1)
+#define MICROPY_PY_IO_IOBASE                (1)
+#define MICROPY_PY_IO_FILEIO                (0)
+#define MICROPY_PY_IO_BYTESIO               (1)
+#define MICROPY_PY_IO_BUFFEREDWRITER        (1)
+#define MICROPY_PY_STRUCT                   (1)
+#define MICROPY_PY_SYS                      (1)
+#define MICROPY_PY_SYS_MAXSIZE              (1)
+#define MICROPY_PY_SYS_MODULES              (1)
+#define MICROPY_PY_SYS_EXIT                 (1)
+#define MICROPY_PY_SYS_STDFILES             (0)
+#define MICROPY_PY_SYS_STDIO_BUFFER         (0)
+#define MICROPY_PY_UERRNO                   (1)
+#define MICROPY_PY_USELECT                  (1)
+#define MICROPY_PY_UTIME_MP_HAL             (1)
+#define MICROPY_PY_THREAD                   (0)
+#define MICROPY_PY_THREAD_GIL               (0)
+#define MICROPY_PY_THREAD_GIL_VM_DIVISOR    (32)
+
 // type definitions for the specific machine
 
 #define MICROPY_MAKE_POINTER_CALLABLE(p) ((void*)((mp_uint_t)(p) | 1))
@@ -84,14 +129,33 @@ typedef long mp_off_t;
 // We need to provide a declaration/definition of alloca()
 #include <stdlib.h>
 
-#define MICROPY_HW_BOARD_NAME "gprs_a9"
-#define MICROPY_HW_MCU_NAME "GPRS_A9"
+#define MICROPY_HW_BOARD_NAME   "GPRS_A9_A9G"
+#define MICROPY_HW_MCU_NAME     "GPRS_A9_RDA8955"
+#define MICROPY_PY_SYS_PLATFORM "gprs_a9"
 
-#ifdef __linux__
-#define MICROPY_MIN_USE_STDOUT (1)
-#endif
 
 #define MP_STATE_PORT MP_STATE_VM
 
 #define MICROPY_PORT_ROOT_POINTERS \
     const char *readline_hist[8];
+
+#include "csdk_config.h"
+
+#if MICROPY_PY_THREAD
+#define MICROPY_EVENT_POLL_HOOK \
+    do { \
+        extern void mp_handle_pending(void); \
+        mp_handle_pending(); \
+        MICROPY_PY_USOCKET_EVENTS_HANDLER \
+        MP_THREAD_GIL_EXIT(); \
+        MP_THREAD_GIL_ENTER(); \
+    } while (0);
+#else
+#define MICROPY_EVENT_POLL_HOOK \
+    do { \
+        extern void mp_handle_pending(void); \
+        mp_handle_pending(); \
+    } while (0);
+#endif
+
+

From da771920e2cde97cf9d9af09109e3b41b01ba807 Mon Sep 17 00:00:00 2001
From: Neucrack <CZD666666@gmail.com>
Date: Mon, 3 Sep 2018 19:28:54 +0800
Subject: [PATCH 3109/3533] add gpio but not interrupt

---
 ports/gprs_a9/Makefile       |  10 +-
 ports/gprs_a9/machine_pin.c  | 390 +++++++++++++++++++++++++++++++++++
 ports/gprs_a9/modmachine.c   |  22 ++
 ports/gprs_a9/modmachine.h   |  12 ++
 ports/gprs_a9/mpconfigport.h |  17 +-
 ports/gprs_a9/mphalport.c    |  15 ++
 ports/gprs_a9/mphalport.h    |   5 +-
 7 files changed, 465 insertions(+), 6 deletions(-)
 create mode 100644 ports/gprs_a9/machine_pin.c
 create mode 100644 ports/gprs_a9/modmachine.c
 create mode 100644 ports/gprs_a9/modmachine.h
 create mode 100644 ports/gprs_a9/mphalport.c

diff --git a/ports/gprs_a9/Makefile b/ports/gprs_a9/Makefile
index 250b342639334..914013b9ff4e8 100644
--- a/ports/gprs_a9/Makefile
+++ b/ports/gprs_a9/Makefile
@@ -108,7 +108,10 @@ LIBS =
 
 SRC_C = \
 	main.c \
-	help.c 
+	help.c \
+	modmachine.c \
+	machine_pin.c \
+	mphalport.c 
 
 LIB_SRC_C = $(addprefix lib/,\
 	utils/stdout_helpers.c \
@@ -127,6 +130,11 @@ OBJ_MP += $(addprefix $(BUILD)/, $(SRC_C:.c=.o))
 OBJ = $(OBJ_MP) $(PY_CORE_O)
 OBJ += $(addprefix $(BUILD_PATH)/, $(LIB_SRC_C:.c=.o))
 
+# List of sources for qstr extraction
+SRC_QSTR += $(SRC_C)  $(LIB_SRC_C) 
+# Append any auto-generated sources that are needed by sources listed in SRC_QSTR
+SRC_QSTR_AUTO_DEPS +=
+
 
 
 all: lod
diff --git a/ports/gprs_a9/machine_pin.c b/ports/gprs_a9/machine_pin.c
new file mode 100644
index 0000000000000..9f96cf35b495e
--- /dev/null
+++ b/ports/gprs_a9/machine_pin.c
@@ -0,0 +1,390 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * Development of the code in this file was sponsored by Microbric Pty Ltd
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2016 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include <stdio.h>
+#include <string.h>
+
+
+#include "py/runtime.h"
+#include "py/mphal.h"
+#include "mphalport.h"
+#include "modmachine.h"
+#include "extmod/virtpin.h"
+
+#include "api_hal_pm.h"
+#include "api_hal_gpio.h"
+
+typedef struct _machine_pin_obj_t {
+    mp_obj_base_t base;
+    GPIO_PIN id;
+} machine_pin_obj_t;
+
+typedef struct _machine_pin_irq_obj_t {
+    mp_obj_base_t base;
+    GPIO_PIN id;
+} machine_pin_irq_obj_t;
+
+STATIC const machine_pin_obj_t machine_pin_obj[] = {
+    {{&machine_pin_type}, GPIO_PIN0},
+    {{&machine_pin_type}, GPIO_PIN1},
+    {{&machine_pin_type}, GPIO_PIN2},
+    {{&machine_pin_type}, GPIO_PIN3},
+    {{&machine_pin_type}, GPIO_PIN4},
+    {{&machine_pin_type}, GPIO_PIN5},
+    {{&machine_pin_type}, GPIO_PIN6},
+    {{&machine_pin_type}, GPIO_PIN7},
+    {{&machine_pin_type}, GPIO_PIN8},
+    {{&machine_pin_type}, GPIO_PIN9},
+    {{&machine_pin_type}, GPIO_PIN10},
+    {{&machine_pin_type}, GPIO_PIN11},
+    {{&machine_pin_type}, GPIO_PIN12},
+    {{&machine_pin_type}, GPIO_PIN13},
+    {{&machine_pin_type}, GPIO_PIN14},
+    {{&machine_pin_type}, GPIO_PIN15},
+    {{&machine_pin_type}, GPIO_PIN16},
+    {{&machine_pin_type}, GPIO_PIN17},
+    {{&machine_pin_type}, GPIO_PIN18},
+    {{&machine_pin_type}, GPIO_PIN19},
+    {{&machine_pin_type}, GPIO_PIN20},
+    {{&machine_pin_type}, GPIO_PIN21},
+    {{&machine_pin_type}, GPIO_PIN22},
+    {{&machine_pin_type}, GPIO_PIN23},
+    {{&machine_pin_type}, GPIO_PIN24},
+    {{&machine_pin_type}, GPIO_PIN25},
+    {{&machine_pin_type}, GPIO_PIN26},
+    {{&machine_pin_type}, GPIO_PIN27},
+    {{&machine_pin_type}, GPIO_PIN28},
+    {{&machine_pin_type}, GPIO_PIN29},
+    {{&machine_pin_type}, GPIO_PIN30},
+    {{&machine_pin_type}, GPIO_PIN31},
+    {{&machine_pin_type}, GPIO_PIN32},
+    {{&machine_pin_type}, GPIO_PIN33},
+    {{&machine_pin_type}, GPIO_PIN34},
+};
+
+// forward declaration
+// STATIC const machine_pin_irq_obj_t machine_pin_irq_object[];
+
+// void machine_pins_init(void) {
+//     static bool did_install = false;
+//     if (!did_install) {
+//         gpio_install_isr_service(0);
+//         did_install = true;
+//     }
+//     memset(&MP_STATE_PORT(machine_pin_irq_handler[0]), 0, sizeof(MP_STATE_PORT(machine_pin_irq_handler)));
+// }
+
+// void machine_pins_deinit(void) {
+//     for (int i = 0; i < MP_ARRAY_SIZE(machine_pin_obj); ++i) {
+//         if (machine_pin_obj[i].id != (GPIO_PINt)-1) {
+//             gpio_isr_handler_remove(machine_pin_obj[i].id);
+//         }
+//     }
+// }
+
+// STATIC void IRAM_ATTR machine_pin_isr_handler(void *arg) {
+//     machine_pin_obj_t *self = arg;
+//     mp_obj_t handler = MP_STATE_PORT(machine_pin_irq_handler)[self->id];
+//     mp_sched_schedule(handler, MP_OBJ_FROM_PTR(self));
+//     mp_hal_wake_main_task_from_isr();
+// }
+
+GPIO_PIN machine_pin_get_id(mp_obj_t pin_in) {
+    if (mp_obj_get_type(pin_in) != &machine_pin_type) {
+        mp_raise_ValueError("expecting a pin");
+    }
+    machine_pin_obj_t *self = pin_in;
+    return self->id;
+}
+
+STATIC void machine_pin_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+    machine_pin_obj_t *self = self_in;
+    mp_printf(print, "Pin(%u)", self->id);
+}
+
+// pin.init(mode, pull=None, *, value)
+STATIC mp_obj_t machine_pin_obj_init_helper(const machine_pin_obj_t *self, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    enum { ARG_mode, ARG_pull, ARG_value };
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_mode, MP_ARG_OBJ, {.u_obj = mp_const_none}},
+        { MP_QSTR_pull, MP_ARG_OBJ, {.u_obj = mp_const_none}},
+        { MP_QSTR_value, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL}},
+    };
+    GPIO_config_t gpioObj;
+
+    // parse args
+    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
+    mp_arg_parse_all(n_args, pos_args, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
+
+    // configure the pin for gpio
+    if( (self->id >= 8) && self->id <=13 )
+        PM_PowerEnable(POWER_TYPE_MMC,true);
+    else if( (self->id >= 14) && self->id <=18 )
+        PM_PowerEnable(POWER_TYPE_LCD,true);
+    else if( (self->id >= 19) && self->id <=24 )
+        PM_PowerEnable(POWER_TYPE_CAM,true);
+
+    // set initial value (do this before configuring mode/pull)
+    if (args[ARG_value].u_obj != MP_OBJ_NULL) {
+        gpioObj.defaultLevel = mp_obj_is_true(args[ARG_value].u_obj);
+    }
+
+    // configure mode
+    if (args[ARG_mode].u_obj != mp_const_none) {
+        mp_int_t pin_io_mode = mp_obj_get_int(args[ARG_mode].u_obj);
+        if(pin_io_mode & GPIO_MODE_INPUT)
+            gpioObj.mode = GPIO_MODE_INPUT;
+        else
+            gpioObj.mode = GPIO_MODE_OUTPUT;
+    }
+
+    // configure pull
+    if (args[ARG_pull].u_obj != mp_const_none) {
+        gpioObj.defaultLevel = mp_obj_get_int(args[ARG_pull].u_obj);
+    }
+    gpioObj.pin = self->id;
+    GPIO_Init(gpioObj);
+    return mp_const_none;
+}
+
+// constructor(id, ...)
+mp_obj_t mp_pin_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
+    mp_arg_check_num(n_args, n_kw, 1, MP_OBJ_FUN_ARGS_MAX, true);
+
+    // get the wanted pin object
+    int wanted_pin = mp_obj_get_int(args[0]);
+    const machine_pin_obj_t *self = NULL;
+    if (0 <= wanted_pin && wanted_pin < MP_ARRAY_SIZE(machine_pin_obj)) {
+        self = (machine_pin_obj_t*)&machine_pin_obj[wanted_pin];
+    }
+    if (self == NULL || self->base.type == NULL) {
+        mp_raise_ValueError("invalid pin");
+    }
+
+    if (n_args > 1 || n_kw > 0) {
+        // pin mode given, so configure this GPIO
+        mp_map_t kw_args;
+        mp_map_init_fixed_table(&kw_args, n_kw, args + n_args);
+        machine_pin_obj_init_helper(self, n_args - 1, args + 1, &kw_args);
+    }
+
+    return MP_OBJ_FROM_PTR(self);
+}
+
+// fast method for getting/setting pin value
+STATIC mp_obj_t machine_pin_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
+    mp_arg_check_num(n_args, n_kw, 0, 1, false);
+    machine_pin_obj_t *self = self_in;
+    GPIO_LEVEL level;
+
+    if (n_args == 0) {
+        // get pin
+        GPIO_Get(self->id,&level);
+        return MP_OBJ_NEW_SMALL_INT(level);
+    } else {
+        // set pin
+        GPIO_Set(self->id,mp_obj_is_true(args[0]));
+        return mp_const_none;
+    }
+}
+
+// pin.init(mode, pull)
+STATIC mp_obj_t machine_pin_obj_init(size_t n_args, const mp_obj_t *args, mp_map_t *kw_args) {
+    return machine_pin_obj_init_helper(args[0], n_args - 1, args + 1, kw_args);
+}
+MP_DEFINE_CONST_FUN_OBJ_KW(machine_pin_init_obj, 1, machine_pin_obj_init);
+
+// pin.value([value])
+STATIC mp_obj_t machine_pin_value(size_t n_args, const mp_obj_t *args) {
+    return machine_pin_call(args[0], n_args - 1, 0, args + 1);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_pin_value_obj, 1, 2, machine_pin_value);
+
+// pin.irq(handler=None, trigger=IRQ_FALLING|IRQ_RISING)
+// STATIC mp_obj_t machine_pin_irq(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+//     enum { ARG_handler, ARG_trigger, ARG_wake };
+//     static const mp_arg_t allowed_args[] = {
+//         { MP_QSTR_handler, MP_ARG_OBJ, {.u_obj = mp_const_none} },
+//         { MP_QSTR_trigger, MP_ARG_INT, {.u_int = GPIO_PIN_INTR_POSEDGE | GPIO_PIN_INTR_NEGEDGE} },
+//         { MP_QSTR_wake, MP_ARG_OBJ, {.u_obj = mp_const_none} },
+//     };
+//     machine_pin_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]);
+//     mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
+//     mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
+
+//     if (n_args > 1 || kw_args->used != 0) {
+//         // configure irq
+//         mp_obj_t handler = args[ARG_handler].u_obj;
+//         uint32_t trigger = args[ARG_trigger].u_int;
+//         mp_obj_t wake_obj = args[ARG_wake].u_obj;
+
+//         if ((trigger == GPIO_PIN_INTR_LOLEVEL || trigger == GPIO_PIN_INTR_HILEVEL) && wake_obj != mp_const_none) {
+//             mp_int_t wake;
+//             if (mp_obj_get_int_maybe(wake_obj, &wake)) {
+//                 if (wake < 2 || wake > 7) {
+//                     mp_raise_ValueError("bad wake value");
+//                 }
+//             } else {
+//                 mp_raise_ValueError("bad wake value");
+//             }
+
+//             if (machine_rtc_config.wake_on_touch) { // not compatible
+//                 mp_raise_ValueError("no resources");
+//             }
+
+//             if (!RTC_IS_VALID_EXT_PIN(self->id)) {
+//                 mp_raise_ValueError("invalid pin for wake");
+//             }
+
+//             if (machine_rtc_config.ext0_pin == -1) {
+//                 machine_rtc_config.ext0_pin = self->id;
+//             } else if (machine_rtc_config.ext0_pin != self->id) {
+//                 mp_raise_ValueError("no resources");
+//             }
+
+//             machine_rtc_config.ext0_level = trigger == GPIO_PIN_INTR_LOLEVEL ? 0 : 1;
+//             machine_rtc_config.ext0_wake_types = wake;
+//         } else {
+//             if (machine_rtc_config.ext0_pin == self->id) {
+//                 machine_rtc_config.ext0_pin = -1;
+//             }
+
+//             if (handler == mp_const_none) {
+//                 handler = MP_OBJ_NULL;
+//                 trigger = 0;
+//             }
+//             gpio_isr_handler_remove(self->id);
+//             MP_STATE_PORT(machine_pin_irq_handler)[self->id] = handler;
+//             gpio_set_intr_type(self->id, trigger);
+//             gpio_isr_handler_add(self->id, machine_pin_isr_handler, (void*)self);
+//         }
+//     }
+
+//     // return the irq object
+//     return MP_OBJ_FROM_PTR(&machine_pin_irq_object[self->id]);
+// }
+// STATIC MP_DEFINE_CONST_FUN_OBJ_KW(machine_pin_irq_obj, 1, machine_pin_irq);
+
+STATIC const mp_rom_map_elem_t machine_pin_locals_dict_table[] = {
+    // instance methods
+    { MP_ROM_QSTR(MP_QSTR_init), MP_ROM_PTR(&machine_pin_init_obj) },
+    { MP_ROM_QSTR(MP_QSTR_value), MP_ROM_PTR(&machine_pin_value_obj) },
+    // { MP_ROM_QSTR(MP_QSTR_irq), MP_ROM_PTR(&machine_pin_irq_obj) },
+
+    // class constants
+    { MP_ROM_QSTR(MP_QSTR_IN), MP_ROM_INT(GPIO_MODE_INPUT) },
+    { MP_ROM_QSTR(MP_QSTR_OUT), MP_ROM_INT(GPIO_MODE_OUTPUT) },
+    // { MP_ROM_QSTR(MP_QSTR_OPEN_DRAIN), MP_ROM_INT(GPIO_MODE_INPUT_OUTPUT_OD) },
+    // { MP_ROM_QSTR(MP_QSTR_PULL_UP), MP_ROM_INT(GPIO_PULLUP_ONLY) },
+    // { MP_ROM_QSTR(MP_QSTR_PULL_DOWN), MP_ROM_INT(GPIO_PULLDOWN_ONLY) },
+    // { MP_ROM_QSTR(MP_QSTR_IRQ_RISING), MP_ROM_INT(GPIO_PIN_INTR_POSEDGE) },
+    // { MP_ROM_QSTR(MP_QSTR_IRQ_FALLING), MP_ROM_INT(GPIO_PIN_INTR_NEGEDGE) },
+    // { MP_ROM_QSTR(MP_QSTR_WAKE_LOW), MP_ROM_INT(GPIO_PIN_INTR_LOLEVEL) },
+    // { MP_ROM_QSTR(MP_QSTR_WAKE_HIGH), MP_ROM_INT(GPIO_PIN_INTR_HILEVEL) },
+};
+
+STATIC mp_uint_t pin_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_t arg, int *errcode) {
+    (void)errcode;
+    machine_pin_obj_t *self = self_in;
+    GPIO_LEVEL level;
+
+    switch (request) {
+        case MP_PIN_READ: {
+            GPIO_Get(self->id,&level);
+            return level;
+        }
+        case MP_PIN_WRITE: {
+            GPIO_Set(self->id,arg);
+            return 0;
+        }
+    }
+    return -1;
+}
+
+STATIC MP_DEFINE_CONST_DICT(machine_pin_locals_dict, machine_pin_locals_dict_table);
+
+STATIC const mp_pin_p_t pin_pin_p = {
+  .ioctl = pin_ioctl,
+};
+
+const mp_obj_type_t machine_pin_type = {
+    { &mp_type_type },
+    .name = MP_QSTR_Pin,
+    .print = machine_pin_print,
+    .make_new = mp_pin_make_new,
+    .call = machine_pin_call,
+    .protocol = &pin_pin_p,
+    .locals_dict = (mp_obj_t)&machine_pin_locals_dict,
+};
+
+/******************************************************************************/
+// Pin IRQ object
+
+STATIC const mp_obj_type_t machine_pin_irq_type;
+
+STATIC const machine_pin_irq_obj_t machine_pin_irq_object[] = {
+    {{&machine_pin_irq_type}, GPIO_PIN0},
+    {{&machine_pin_irq_type}, GPIO_PIN1},
+    {{&machine_pin_irq_type}, GPIO_PIN2},
+    {{&machine_pin_irq_type}, GPIO_PIN3},
+    {{&machine_pin_irq_type}, GPIO_PIN4},
+    {{&machine_pin_irq_type}, GPIO_PIN5},
+    {{&machine_pin_irq_type}, GPIO_PIN6},
+    {{&machine_pin_irq_type}, GPIO_PIN7},
+};
+
+// STATIC mp_obj_t machine_pin_irq_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
+//     machine_pin_irq_obj_t *self = self_in;
+//     mp_arg_check_num(n_args, n_kw, 0, 0, false);
+//     machine_pin_isr_handler((void*)&machine_pin_obj[self->id]);
+//     return mp_const_none;
+// }
+
+// STATIC mp_obj_t machine_pin_irq_trigger(size_t n_args, const mp_obj_t *args) {
+//     machine_pin_irq_obj_t *self = args[0];
+//     uint32_t orig_trig = GPIO.pin[self->id].int_type;
+//     if (n_args == 2) {
+//         // set trigger
+//         gpio_set_intr_type(self->id, mp_obj_get_int(args[1]));
+//     }
+//     // return original trigger value
+//     return MP_OBJ_NEW_SMALL_INT(orig_trig);
+// }
+// STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_pin_irq_trigger_obj, 1, 2, machine_pin_irq_trigger);
+
+// STATIC const mp_rom_map_elem_t machine_pin_irq_locals_dict_table[] = {
+//     { MP_ROM_QSTR(MP_QSTR_trigger), MP_ROM_PTR(&machine_pin_irq_trigger_obj) },
+// };
+// STATIC MP_DEFINE_CONST_DICT(machine_pin_irq_locals_dict, machine_pin_irq_locals_dict_table);
+
+// STATIC const mp_obj_type_t machine_pin_irq_type = {
+//     { &mp_type_type },
+//     .name = MP_QSTR_IRQ,
+//     .call = machine_pin_irq_call,
+//     .locals_dict = (mp_obj_dict_t*)&machine_pin_irq_locals_dict,
+// };
diff --git a/ports/gprs_a9/modmachine.c b/ports/gprs_a9/modmachine.c
new file mode 100644
index 0000000000000..a7b5052a01dc0
--- /dev/null
+++ b/ports/gprs_a9/modmachine.c
@@ -0,0 +1,22 @@
+
+#include "mpconfigport.h"
+#include "stdint.h"
+#include "py/mpconfig.h"
+#include "py/obj.h"
+#include "py/runtime.h"
+#include "modmachine.h"
+
+
+STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
+    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_umachine) },
+    { MP_ROM_QSTR(MP_QSTR_Pin), MP_ROM_PTR(&machine_pin_type) },
+};
+
+STATIC MP_DEFINE_CONST_DICT(machine_module_globals, machine_module_globals_table);
+
+const mp_obj_module_t mp_module_machine = {
+    .base = { &mp_type_module },
+    .globals = (mp_obj_dict_t*)&machine_module_globals,
+};
+
+
diff --git a/ports/gprs_a9/modmachine.h b/ports/gprs_a9/modmachine.h
new file mode 100644
index 0000000000000..979ab0e12b3ee
--- /dev/null
+++ b/ports/gprs_a9/modmachine.h
@@ -0,0 +1,12 @@
+
+#ifndef MICROPY_INCLUDED_GPRS_A9_MODMACHINE_H
+#define MICROPY_INCLUDED_GPRS_A9_MODMACHINE_H
+
+#include "py/obj.h"
+
+
+extern const mp_obj_type_t machine_pin_type;
+
+
+#endif
+
diff --git a/ports/gprs_a9/mpconfigport.h b/ports/gprs_a9/mpconfigport.h
index 76d023ac9fff6..8fd81c3dfb35b 100644
--- a/ports/gprs_a9/mpconfigport.h
+++ b/ports/gprs_a9/mpconfigport.h
@@ -1,3 +1,6 @@
+#ifndef __MPCONFIGPORT_H
+#define __MPCONFIGPORT_H
+
 #include <stdint.h>
 
 // options to control how MicroPython is built
@@ -105,6 +108,14 @@
 #define MICROPY_PY_THREAD_GIL               (0)
 #define MICROPY_PY_THREAD_GIL_VM_DIVISOR    (32)
 
+// extra built in modules to add to the list of known ones
+extern const struct _mp_obj_module_t mp_module_machine;
+
+#define MICROPY_PORT_BUILTIN_MODULES \
+    { MP_OBJ_NEW_QSTR(MP_QSTR_machine), (mp_obj_t)&mp_module_machine }, \
+
+
+
 // type definitions for the specific machine
 
 #define MICROPY_MAKE_POINTER_CALLABLE(p) ((void*)((mp_uint_t)(p) | 1))
@@ -115,8 +126,8 @@
 // to print such value. So, we avoid int32_t and use int directly.
 #define UINT_FMT "%u"
 #define INT_FMT "%d"
-typedef int mp_int_t; // must be pointer size
-typedef unsigned mp_uint_t; // must be pointer size
+typedef int32_t  mp_int_t; // must be pointer size
+typedef uint32_t mp_uint_t; // must be pointer size
 
 typedef long mp_off_t;
 
@@ -158,4 +169,4 @@ typedef long mp_off_t;
     } while (0);
 #endif
 
-
+#endif
diff --git a/ports/gprs_a9/mphalport.c b/ports/gprs_a9/mphalport.c
new file mode 100644
index 0000000000000..e1a3fc46f52f5
--- /dev/null
+++ b/ports/gprs_a9/mphalport.c
@@ -0,0 +1,15 @@
+
+#include "mpconfigport.h"
+
+#include "time.h"
+
+mp_uint_t mp_hal_ticks_ms(void)
+{
+    return (int)(clock()/CLOCKS_PER_MSEC);
+}
+
+void mp_hal_set_interrupt_char(int c) 
+{
+
+
+}
diff --git a/ports/gprs_a9/mphalport.h b/ports/gprs_a9/mphalport.h
index 60d68bd2d6d50..0f802f405a5f7 100644
--- a/ports/gprs_a9/mphalport.h
+++ b/ports/gprs_a9/mphalport.h
@@ -1,2 +1,3 @@
-static inline mp_uint_t mp_hal_ticks_ms(void) { return 0; }
-static inline void mp_hal_set_interrupt_char(char c) {}
+
+void mp_hal_set_interrupt_char(int c);
+

From 1cede819141d317fbdad8d8e034eda9981b58005 Mon Sep 17 00:00:00 2001
From: Neucrack <CZD666666@gmail.com>
Date: Fri, 7 Sep 2018 11:28:52 +0800
Subject: [PATCH 3110/3533] update upy lib support

---
 ports/gprs_a9/Makefile         |  17 +++-
 ports/gprs_a9/fatfs_port.c     |  41 ++++++++
 ports/gprs_a9/help.c           |  19 ++--
 ports/gprs_a9/machine_pin.c    |   4 +-
 ports/gprs_a9/main.c           | 109 ++++++++++----------
 ports/gprs_a9/modules/blink.py |  13 ++-
 ports/gprs_a9/moduos.c         | 135 +++++++++++++++++++++++++
 ports/gprs_a9/mpconfigport.h   | 177 +++++++++++++++++++++++++--------
 ports/gprs_a9/mphalport.c      |  54 +++++++++-
 ports/gprs_a9/mphalport.h      |   4 +
 ports/gprs_a9/rng.c            |  28 ++++++
 ports/gprs_a9/rng.h            |   8 ++
 ports/gprs_a9/unistd.h         |   5 +-
 13 files changed, 503 insertions(+), 111 deletions(-)
 create mode 100644 ports/gprs_a9/fatfs_port.c
 create mode 100644 ports/gprs_a9/moduos.c
 create mode 100644 ports/gprs_a9/rng.c
 create mode 100644 ports/gprs_a9/rng.h

diff --git a/ports/gprs_a9/Makefile b/ports/gprs_a9/Makefile
index 914013b9ff4e8..7974ac2663e9a 100644
--- a/ports/gprs_a9/Makefile
+++ b/ports/gprs_a9/Makefile
@@ -103,6 +103,8 @@ CFLAGS = $(INC) -Wshadow \
           -G0 -Wall -march=xcpu -mtune=xcpu -Wa,-march=xcpu,-mtune=xcpu -EL -mexplicit-relocs -fweb -frename-registers -mmemcpy -mmips-tfile -nostartfiles -nostdlib -nostdinc -nodefaultlibs -c -pipe \
           -fwide-exec-charset=UTF-16LE -fshort-wchar \
 		  -mips16 
+CFLAGS += $(CFLAGS_MOD)
+
 
 LIBS =
 
@@ -111,14 +113,23 @@ SRC_C = \
 	help.c \
 	modmachine.c \
 	machine_pin.c \
-	mphalport.c 
+	mphalport.c \
+	moduos.c \
+	rng.c \
+	fatfs_port.c 
 
 LIB_SRC_C = $(addprefix lib/,\
-	utils/stdout_helpers.c \
-	utils/pyexec.c \
 	mp-readline/readline.c \
+	utils/pyexec.c \
+	utils/interrupt_char.c \
+	utils/sys_stdio_mphal.c \
+	timeutils/timeutils.c \
 	)
 
+LIB_SRC_C += \
+	lib/oofatfs/ff.c \
+	lib/oofatfs/option/unicode.c
+
 
 # include py core make definitions
 include $(TOP)/py/py.mk
diff --git a/ports/gprs_a9/fatfs_port.c b/ports/gprs_a9/fatfs_port.c
new file mode 100644
index 0000000000000..a2d340a0353d1
--- /dev/null
+++ b/ports/gprs_a9/fatfs_port.c
@@ -0,0 +1,41 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * Development of the code in this file was sponsored by Microbric Pty Ltd
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013, 2014, 2016 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "time.h"
+#include "lib/oofatfs/ff.h"
+#include "lib/timeutils/timeutils.h"
+
+DWORD get_fattime(void) {
+    struct timeval tv;
+    gettimeofday(&tv, NULL);
+    timeutils_struct_time_t tm;
+    timeutils_seconds_since_2000_to_struct_time(tv.tv_sec, &tm);
+
+    return (((DWORD)(tm.tm_year - 1980) << 25) | ((DWORD)tm.tm_mon << 21) | ((DWORD)tm.tm_mday << 16) |
+           ((DWORD)tm.tm_hour << 11) | ((DWORD)tm.tm_min << 5) | ((DWORD)tm.tm_sec >> 1));
+}
diff --git a/ports/gprs_a9/help.c b/ports/gprs_a9/help.c
index 6bc9c73318f8c..7da2ea7c7c045 100644
--- a/ports/gprs_a9/help.c
+++ b/ports/gprs_a9/help.c
@@ -36,22 +36,21 @@ const char gprs_a9_help_text[] =
 "For access to the hardware use the 'machine' module:\n"
 "\n"
 "import machine\n"
-"pin12 = machine.Pin(12, machine.Pin.OUT)\n"
-"pin12.value(1)\n"
-"pin13 = machine.Pin(13, machine.Pin.IN, machine.Pin.PULL_UP)\n"
-"print(pin13.value())\n"
-"i2c = machine.I2C(scl=machine.Pin(21), sda=machine.Pin(22))\n"
+"led = machine.Pin(27, machine.Pin.OUT,0)\n"
+"led.value(1)\n"
+"pin25 = machine.Pin(25, machine.Pin.IN, machine.Pin.PULL_UP)\n"
+"print(pin25.value())\n"
+"i2c = machine.I2C(id=2,freq=400000)\n"
 "i2c.scan()\n"
 "i2c.writeto(addr, b'1234')\n"
 "i2c.readfrom(addr, 4)\n"
 "\n"
-"Basic WiFi configuration:\n"
+"Basic GPRS configuration:\n"
 "\n"
 "import network\n"
-"sta_if = network.WLAN(network.STA_IF); sta_if.active(True)\n"
-"sta_if.scan()                             # Scan for available access points\n"
-"sta_if.connect(\"<AP_name>\", \"<password>\") # Connect to an AP\n"
-"sta_if.isconnected()                      # Check for successful connection\n"
+"gprs = network.GPRS();\n"
+"gprs.attach()\n"
+"gprs.activate(\"cmnet\",\"\",\"\")\n"
 "\n"
 "Control commands:\n"
 "  CTRL-A        -- on a blank line, enter raw REPL mode\n"
diff --git a/ports/gprs_a9/machine_pin.c b/ports/gprs_a9/machine_pin.c
index 9f96cf35b495e..24d6cbe43189b 100644
--- a/ports/gprs_a9/machine_pin.c
+++ b/ports/gprs_a9/machine_pin.c
@@ -300,8 +300,8 @@ STATIC const mp_rom_map_elem_t machine_pin_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_IN), MP_ROM_INT(GPIO_MODE_INPUT) },
     { MP_ROM_QSTR(MP_QSTR_OUT), MP_ROM_INT(GPIO_MODE_OUTPUT) },
     // { MP_ROM_QSTR(MP_QSTR_OPEN_DRAIN), MP_ROM_INT(GPIO_MODE_INPUT_OUTPUT_OD) },
-    // { MP_ROM_QSTR(MP_QSTR_PULL_UP), MP_ROM_INT(GPIO_PULLUP_ONLY) },
-    // { MP_ROM_QSTR(MP_QSTR_PULL_DOWN), MP_ROM_INT(GPIO_PULLDOWN_ONLY) },
+    { MP_ROM_QSTR(MP_QSTR_PULL_UP), MP_ROM_INT(GPIO_LEVEL_HIGH) },
+    { MP_ROM_QSTR(MP_QSTR_PULL_DOWN), MP_ROM_INT(GPIO_LEVEL_LOW) },
     // { MP_ROM_QSTR(MP_QSTR_IRQ_RISING), MP_ROM_INT(GPIO_PIN_INTR_POSEDGE) },
     // { MP_ROM_QSTR(MP_QSTR_IRQ_FALLING), MP_ROM_INT(GPIO_PIN_INTR_NEGEDGE) },
     // { MP_ROM_QSTR(MP_QSTR_WAKE_LOW), MP_ROM_INT(GPIO_PIN_INTR_LOLEVEL) },
diff --git a/ports/gprs_a9/main.c b/ports/gprs_a9/main.c
index d90ddfcee7f6a..fb8faec08e999 100644
--- a/ports/gprs_a9/main.c
+++ b/ports/gprs_a9/main.c
@@ -17,6 +17,9 @@
 #include "api_hal_uart.h"
 #include "buffer.h"
 
+#include "mphalport.h"
+#include "mpconfigport.h"
+
 
 
 #define AppMain_TASK_STACK_SIZE    (2048 * 2)
@@ -43,12 +46,6 @@ typedef struct
     uint8_t* pParam1;
 }MicroPy_Event_t;
 
-
-
-
-
-
-
 #if MICROPY_ENABLE_COMPILER
 void do_str(const char *src, mp_parse_input_kind_t input_kind) {
     nlr_buf_t nlr;
@@ -79,36 +76,41 @@ void gc_collect(void) {
     gc_dump_info();
 }
 
-mp_lexer_t *mp_lexer_new_from_file(const char *filename) {
-    mp_raise_OSError(MP_ENOENT);
-}
+// mp_lexer_t *mp_lexer_new_from_file(const char *filename) {
+//     mp_raise_OSError(MP_ENOENT);
+// }
 
-mp_import_stat_t mp_import_stat(const char *path) {
-    return MP_IMPORT_STAT_NO_EXIST;
-}
+// mp_import_stat_t mp_import_stat(const char *path) {
+//     return MP_IMPORT_STAT_NO_EXIST;
+// }
 
-mp_obj_t mp_builtin_open(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs) {
-    return mp_const_none;
-}
-MP_DEFINE_CONST_FUN_OBJ_KW(mp_builtin_open_obj, 1, mp_builtin_open);
+// mp_obj_t mp_builtin_open(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs) {
+//     return mp_const_none;
+// }
+// MP_DEFINE_CONST_FUN_OBJ_KW(mp_builtin_open_obj, 1, mp_builtin_open);
 
 void nlr_jump_fail(void *val) {
-    __assert("nlr_jump_fail");
+    Assert(false,"nlr_jump_fail");
     while (1);//never reach here actully
 }
 
 void NORETURN __fatal_error(const char *msg) {
-    __assert(msg);
+    Assert(false,msg);
     while (1);//never reach here actully
 }
 
 #ifndef NDEBUG
 void MP_WEAK __assert_func(const char *file, int line, const char *func, const char *expr) {
-    printf("Assertion '%s' failed, at file %s:%d\n", expr, file, line);
+    Trace(1,"Assertion '%s' failed, at file %s:%d\n", expr, file, line);
     __fatal_error("Assertion failed");
 }
 #endif
 
+typedef struct{
+    uint32_t size;
+    uint32_t used;
+    uint32_t top;
+}Stack_Info_t;
 
 
 
@@ -122,19 +124,6 @@ bool mp_Init()
     return true;
 }
 
-bool UartInit()
-{
-    UART_Config_t config = {
-        .baudRate = UART_BAUD_RATE_115200,
-        .dataBits = UART_DATA_BITS_8,
-        .stopBits = UART_STOP_BITS_1,
-        .parity   = UART_PARITY_NONE,
-        .rxCallback = NULL,
-        .useEvent = true,
-    };
-    UART_Init(UART1,config);
-    return true;
-}
 
 void MicroPyEventDispatch(MicroPy_Event_t* pEvent)
 {
@@ -143,7 +132,10 @@ void MicroPyEventDispatch(MicroPy_Event_t* pEvent)
         case MICROPY_EVENT_ID_UART_RECEIVED:
         {
             uint8_t c;
-            printf("micropy task received data:%d,%s",pEvent->param1,pEvent->pParam1);
+            Trace(1,"micropy task received data length:%d",pEvent->param1);
+            Stack_Info_t info;
+            GetStackInfo(&info);
+            printf("stack info, %d/%d, top:0x%x",info.used,info.size,info.top);
             for (;;) {
                 if(!Buffer_Gets(&fifoBuffer,&c,1))
                     break;
@@ -151,6 +143,7 @@ void MicroPyEventDispatch(MicroPy_Event_t* pEvent)
                     break;
                 }
             }
+            Trace(1,"REPL complete");
             break;
         }
         default:
@@ -159,7 +152,7 @@ void MicroPyEventDispatch(MicroPy_Event_t* pEvent)
 }
 
 
-void MicroPyTask(VOID *pData)
+void MicroPyTask(void *pData)
 {
     MicroPy_Event_t* event;
 
@@ -171,7 +164,7 @@ void MicroPyTask(VOID *pData)
     {
         if(OS_WaitEvent(microPyTaskHandle, (void**)&event, OS_TIME_OUT_WAIT_FOREVER))
         {
-            printf("microPy task received event:%d",event->id);
+            Trace(1,"microPy task received event:%d",event->id);
             // PM_SetSysMinFreq(PM_SYS_FREQ_178M);//set back system min frequency to 178M or higher(/lower) value
             MicroPyEventDispatch(event);
             OS_Free(event->pParam1);
@@ -193,13 +186,13 @@ void EventDispatch(API_Event_t* pEvent)
         case API_EVENT_ID_NETWORK_REGISTERED_ROAMING:
             break;
         case API_EVENT_ID_UART_RECEIVED:
-            printf("UART%d received:%d,%s",pEvent->param1,pEvent->param2,pEvent->pParam1);
+            Trace(1,"UART%d received:%d,%s",pEvent->param1,pEvent->param2,pEvent->pParam1);
             if(pEvent->param1 == UART1)
             {
                 MicroPy_Event_t* event = (MicroPy_Event_t*)malloc(sizeof(MicroPy_Event_t));
                 if(!event)
                 {
-                    printf("malloc fail");
+                    Trace(1,"malloc fail");
                     break;
                 }
                 Buffer_Puts(&fifoBuffer,pEvent->pParam1,pEvent->param2);
@@ -215,12 +208,12 @@ void EventDispatch(API_Event_t* pEvent)
 }
 
 
-void AppMainTask(VOID *pData)
+void AppMainTask(void *pData)
 {
     API_Event_t* event=NULL;
 
     microPyTaskHandle = OS_CreateTask(MicroPyTask,
-                                    NULL, NULL, MICROPYTHON_TASK_STACK_SIZE, MICROPYTHON_TASK_PRIORITY, 0, 0, (PCSTR)"ohter Task");
+                                    NULL, NULL, MICROPYTHON_TASK_STACK_SIZE, MICROPYTHON_TASK_PRIORITY, 0, 0, "ohter Task");
     while(1)
     {
         if(OS_WaitEvent(mainTaskHandle, (void**)&event, OS_TIME_OUT_WAIT_FOREVER))
@@ -238,20 +231,10 @@ void AppMainTask(VOID *pData)
 void _Main(void)
 {
     mainTaskHandle = OS_CreateTask(AppMainTask ,
-                                   NULL, NULL, MICROPYTHON_TASK_PRIORITY, AppMain_TASK_PRIORITY, 0, 0, (PCSTR)"init Task");
+                                   NULL, NULL, MICROPYTHON_TASK_PRIORITY, AppMain_TASK_PRIORITY, 0, 0, "init Task");
     OS_SetUserMainHandle(&mainTaskHandle);
 }
 
-// Send string of given length
-void mp_hal_stdout_tx_strn(const char *str, mp_uint_t len) {
-    UART_Write(UART1,(uint8_t*)str,len);
-}
-
-// void mp_hal_stdout_tx_str(const char *str) {
-//     mp_hal_stdout_tx_strn(str, strlen(str));
-// }
-
-
 
 int mp_hal_stdin_rx_chr(void) {
     uint8_t c;
@@ -263,3 +246,29 @@ int mp_hal_stdin_rx_chr(void) {
     }
 }
 
+
+#if MICROPY_DEBUG_VERBOSE
+int DEBUG_printf(const char *fmt, ...) {
+    va_list ap;
+    va_start(ap, fmt);
+    int ret = mp_vprintf(MICROPY_DEBUG_PRINTER, fmt, ap);
+    va_end(ap);
+    return ret;
+}
+
+STATIC void debug_print_strn(void *env, const char *str, size_t len) {
+    (void)env;
+    char p[len+1];
+    // char* p =  (char*)OS_Malloc(len+1);
+    // if(!p)
+    //     return;
+    memcpy(p,str,len);
+    p[len] = 0;
+    Trace(2,p);
+}
+
+const mp_print_t mp_debug_print = {NULL, debug_print_strn};
+
+#endif
+
+
diff --git a/ports/gprs_a9/modules/blink.py b/ports/gprs_a9/modules/blink.py
index 5b64b416825c6..6052d172f5307 100644
--- a/ports/gprs_a9/modules/blink.py
+++ b/ports/gprs_a9/modules/blink.py
@@ -1,5 +1,12 @@
 
-
-
-print("blink")
+import machine
+
+def blink(interval):
+    print("blink")
+    led = machine.Pin(27,machine.Pin.OUT)
+    value = 1
+    while(1):
+        led.value(value)
+        # time.sleep(1)
+        # value = (value==1)?0:1
 
diff --git a/ports/gprs_a9/moduos.c b/ports/gprs_a9/moduos.c
new file mode 100644
index 0000000000000..56def2ed60bf8
--- /dev/null
+++ b/ports/gprs_a9/moduos.c
@@ -0,0 +1,135 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * Development of the code in this file was sponsored by Microbric Pty Ltd
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2015 Josef Gajdusek
+ * Copyright (c) 2016 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include <string.h>
+
+
+#include "py/objstr.h"
+#include "py/runtime.h"
+#include "py/mperrno.h"
+#include "py/mphal.h"
+#include "extmod/misc.h"
+#include "extmod/vfs.h"
+#include "extmod/vfs_fat.h"
+#include "genhdr/mpversion.h"
+
+#include "rng.h"
+
+extern const mp_obj_type_t mp_fat_vfs_type;
+
+STATIC const qstr os_uname_info_fields[] = {
+    MP_QSTR_sysname, MP_QSTR_nodename,
+    MP_QSTR_release, MP_QSTR_version, MP_QSTR_machine
+};
+STATIC const MP_DEFINE_STR_OBJ(os_uname_info_sysname_obj, MICROPY_PY_SYS_PLATFORM);
+STATIC const MP_DEFINE_STR_OBJ(os_uname_info_nodename_obj, MICROPY_PY_SYS_PLATFORM);
+STATIC const MP_DEFINE_STR_OBJ(os_uname_info_release_obj, MICROPY_VERSION_STRING);
+STATIC const MP_DEFINE_STR_OBJ(os_uname_info_version_obj, MICROPY_GIT_TAG " on " MICROPY_BUILD_DATE);
+STATIC const MP_DEFINE_STR_OBJ(os_uname_info_machine_obj, MICROPY_HW_BOARD_NAME " with " MICROPY_HW_MCU_NAME);
+
+STATIC MP_DEFINE_ATTRTUPLE(
+    os_uname_info_obj,
+    os_uname_info_fields,
+    5,
+    (mp_obj_t)&os_uname_info_sysname_obj,
+    (mp_obj_t)&os_uname_info_nodename_obj,
+    (mp_obj_t)&os_uname_info_release_obj,
+    (mp_obj_t)&os_uname_info_version_obj,
+    (mp_obj_t)&os_uname_info_machine_obj
+);
+
+STATIC mp_obj_t os_uname(void) {
+    return (mp_obj_t)&os_uname_info_obj;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(os_uname_obj, os_uname);
+
+STATIC mp_obj_t os_urandom(mp_obj_t num) {
+    mp_int_t n = mp_obj_get_int(num);
+    vstr_t vstr;
+    vstr_init_len(&vstr, n);
+    uint32_t r = 0;
+    for (int i = 0; i < n; i++) {
+        if ((i & 3) == 0) {
+            r = rng_get(); // no hardware rng, soft impl
+        }
+        vstr.buf[i] = r;
+        r >>= 8;
+    }
+    return mp_obj_new_str_from_vstr(&mp_type_bytes, &vstr);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(os_urandom_obj, os_urandom);
+
+#if MICROPY_PY_OS_DUPTERM
+STATIC mp_obj_t os_dupterm_notify(mp_obj_t obj_in) {
+    (void)obj_in;
+    for (;;) {
+        int c = mp_uos_dupterm_rx_chr();
+        if (c < 0) {
+            break;
+        }
+        ringbuf_put(&stdin_ringbuf, c);
+    }
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(os_dupterm_notify_obj, os_dupterm_notify);
+#endif
+
+STATIC const mp_rom_map_elem_t os_module_globals_table[] = {
+    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_uos) },
+    { MP_ROM_QSTR(MP_QSTR_uname), MP_ROM_PTR(&os_uname_obj) },
+    { MP_ROM_QSTR(MP_QSTR_urandom), MP_ROM_PTR(&os_urandom_obj) },
+    #if MICROPY_PY_OS_DUPTERM
+    { MP_ROM_QSTR(MP_QSTR_dupterm), MP_ROM_PTR(&mp_uos_dupterm_obj) },
+    { MP_ROM_QSTR(MP_QSTR_dupterm_notify), MP_ROM_PTR(&os_dupterm_notify_obj) },
+    #endif
+    #if MICROPY_VFS
+    { MP_ROM_QSTR(MP_QSTR_ilistdir), MP_ROM_PTR(&mp_vfs_ilistdir_obj) },
+    { MP_ROM_QSTR(MP_QSTR_listdir), MP_ROM_PTR(&mp_vfs_listdir_obj) },
+    { MP_ROM_QSTR(MP_QSTR_mkdir), MP_ROM_PTR(&mp_vfs_mkdir_obj) },
+    { MP_ROM_QSTR(MP_QSTR_rmdir), MP_ROM_PTR(&mp_vfs_rmdir_obj) },
+    { MP_ROM_QSTR(MP_QSTR_chdir), MP_ROM_PTR(&mp_vfs_chdir_obj) },
+    { MP_ROM_QSTR(MP_QSTR_getcwd), MP_ROM_PTR(&mp_vfs_getcwd_obj) },
+    { MP_ROM_QSTR(MP_QSTR_remove), MP_ROM_PTR(&mp_vfs_remove_obj) },
+    { MP_ROM_QSTR(MP_QSTR_rename), MP_ROM_PTR(&mp_vfs_rename_obj) },
+    { MP_ROM_QSTR(MP_QSTR_stat), MP_ROM_PTR(&mp_vfs_stat_obj) },
+    { MP_ROM_QSTR(MP_QSTR_statvfs), MP_ROM_PTR(&mp_vfs_statvfs_obj) },
+    { MP_ROM_QSTR(MP_QSTR_mount), MP_ROM_PTR(&mp_vfs_mount_obj) },
+    { MP_ROM_QSTR(MP_QSTR_umount), MP_ROM_PTR(&mp_vfs_umount_obj) },
+    #if MICROPY_VFS_FAT
+    { MP_ROM_QSTR(MP_QSTR_VfsFat), MP_ROM_PTR(&mp_fat_vfs_type) },
+    #endif
+    #endif
+};
+
+STATIC MP_DEFINE_CONST_DICT(os_module_globals, os_module_globals_table);
+
+const mp_obj_module_t uos_module = {
+    .base = { &mp_type_module },
+    .globals = (mp_obj_dict_t*)&os_module_globals,
+};
diff --git a/ports/gprs_a9/mpconfigport.h b/ports/gprs_a9/mpconfigport.h
index 8fd81c3dfb35b..c48b9da19f1a7 100644
--- a/ports/gprs_a9/mpconfigport.h
+++ b/ports/gprs_a9/mpconfigport.h
@@ -1,49 +1,73 @@
 #ifndef __MPCONFIGPORT_H
 #define __MPCONFIGPORT_H
 
+#include <stdbool.h>
 #include <stdint.h>
+#include <unistd.h>
 
 // options to control how MicroPython is built
 
 
+#define MICROPY_DEBUG_VERBOSE       (1)
+#define MICROPY_DEBUG_PRINTER       (&mp_debug_print)
+
+
 #define MICROPY_OBJ_REPR            (MICROPY_OBJ_REPR_A)
 #define MICROPY_NLR_SETJMP          (1)
 
-// Python internal features
-#define MICROPY_ENABLE_COMPILER     (1)
-#define MICROPY_REPL_EVENT_DRIVEN   (1)
-#define MICROPY_ENABLE_GC           (0)
-#define MICROPY_LONGINT_IMPL        (MICROPY_LONGINT_IMPL_MPZ)
-#define MICROPY_FLOAT_IMPL          (MICROPY_FLOAT_IMPL_DOUBLE)
-#define MICROPY_MODULE_FROZEN_MPY   (1)
-
-#define MICROPY_QSTR_BYTES_IN_HASH  (1)
-#define MICROPY_QSTR_EXTRA_POOL     mp_qstr_frozen_const_pool
+// memory allocation policies
 #define MICROPY_ALLOC_PATH_MAX      (256)
-#define MICROPY_ALLOC_PARSE_CHUNK_INIT (16)
-#define MICROPY_EMIT_X64            (0)
-#define MICROPY_EMIT_THUMB          (0)
-#define MICROPY_EMIT_INLINE_THUMB   (0)
-#define MICROPY_COMP_MODULE_CONST   (0)
-#define MICROPY_COMP_CONST          (0)
-#define MICROPY_COMP_DOUBLE_TUPLE_ASSIGN (0)
-#define MICROPY_COMP_TRIPLE_TUPLE_ASSIGN (0)
-#define MICROPY_MEM_STATS           (0)
-#define MICROPY_DEBUG_PRINTERS      (0)
-#define MICROPY_GC_ALLOC_THRESHOLD  (0)
-#define MICROPY_HELPER_REPL         (1)
-#define MICROPY_HELPER_LEXER_UNIX   (0)
-#define MICROPY_ENABLE_SOURCE_LINE  (0)
-#define MICROPY_ENABLE_DOC_STRING   (0)
-#define MICROPY_ERROR_REPORTING     (MICROPY_ERROR_REPORTING_TERSE)
-#define MICROPY_BUILTIN_METHOD_CHECK_SELF_ARG (0)
-#define MICROPY_PY_ASYNC_AWAIT      (0)
-#define MICROPY_CPYTHON_COMPAT      (0)
-#define MICROPY_NO_ALLOCA           (1)
-#define MP_ENDIANNESS_LITTLE        (1)
-#define MICROPY_PY_OS_DUPTERM       (1)
-#define MICROPY_PY_LWIP_SLIP        (0)
 
+// emitters
+#define MICROPY_PERSISTENT_CODE_LOAD        (1)
+
+// compiler configuration
+#define MICROPY_COMP_MODULE_CONST           (1)
+#define MICROPY_COMP_DOUBLE_TUPLE_ASSIGN    (1) //a, b = c, d
+#define MICROPY_COMP_TRIPLE_TUPLE_ASSIGN    (1) //a, b, c = c, d, c
+#define MICROPY_COMP_RETURN_IF_EXPR         (1)
+
+// optimisations
+#define MICROPY_OPT_COMPUTED_GOTO           (1)
+#define MICROPY_OPT_MPZ_BITWISE             (1)
+
+// Python internal features
+#define MICROPY_ENABLE_COMPILER             (1)
+#define MICROPY_REPL_EVENT_DRIVEN           (1)
+// #define MICROPY_ENABLE_GC                   (1)
+#define MICROPY_LONGINT_IMPL                (MICROPY_LONGINT_IMPL_MPZ)
+#define MICROPY_FLOAT_IMPL                  (MICROPY_FLOAT_IMPL_DOUBLE)
+#define MICROPY_MODULE_FROZEN_MPY           (1)
+#define MICROPY_READER_VFS                  (1)
+// #define MICROPY_ENABLE_FINALISER            (1)
+// #define MICROPY_STACK_CHECK                 (1)
+#define MICROPY_ENABLE_EMERGENCY_EXCEPTION_BUF (1)
+#define MICROPY_KBD_EXCEPTION               (1)
+#define MICROPY_HELPER_REPL                 (1)
+#define MICROPY_REPL_EMACS_KEYS             (1)
+#define MICROPY_REPL_AUTO_INDENT            (1)
+#define MICROPY_ENABLE_SOURCE_LINE          (1)
+#define MICROPY_ERROR_REPORTING             (MICROPY_ERROR_REPORTING_NORMAL)
+#define MICROPY_WARNINGS                    (1)
+#define MICROPY_CPYTHON_COMPAT              (1)
+#define MICROPY_STREAMS_NON_BLOCK           (1)
+#define MICROPY_STREAMS_POSIX_API           (1)
+#define MICROPY_MODULE_BUILTIN_INIT         (1)
+#define MICROPY_MODULE_WEAK_LINKS           (1)
+#define MICROPY_MODULE_FROZEN_STR           (0)
+#define MICROPY_QSTR_EXTRA_POOL             mp_qstr_frozen_const_pool
+#define MICROPY_CAN_OVERRIDE_BUILTINS       (1)
+#define MICROPY_USE_INTERNAL_ERRNO          (1)
+#define MICROPY_USE_INTERNAL_PRINTF         (0)
+#define MICROPY_ENABLE_SCHEDULER            (1)
+#define MICROPY_SCHEDULER_DEPTH             (8)
+#define MICROPY_VFS                         (1)
+#define MICROPY_VFS_FAT                     (1)
+#define MICROPY_COMP_CONST                  (1)
+
+// MCU definition
+#define MP_ENDIANNESS_LITTLE                (1)
+#define MICROPY_NO_ALLOCA                   (1)
 
 
 // control over Python builtins
@@ -99,8 +123,8 @@
 #define MICROPY_PY_SYS_MAXSIZE              (1)
 #define MICROPY_PY_SYS_MODULES              (1)
 #define MICROPY_PY_SYS_EXIT                 (1)
-#define MICROPY_PY_SYS_STDFILES             (0)
-#define MICROPY_PY_SYS_STDIO_BUFFER         (0)
+#define MICROPY_PY_SYS_STDFILES             (1)
+#define MICROPY_PY_SYS_STDIO_BUFFER         (1)
 #define MICROPY_PY_UERRNO                   (1)
 #define MICROPY_PY_USELECT                  (1)
 #define MICROPY_PY_UTIME_MP_HAL             (1)
@@ -108,13 +132,82 @@
 #define MICROPY_PY_THREAD_GIL               (0)
 #define MICROPY_PY_THREAD_GIL_VM_DIVISOR    (32)
 
+
+// extended modules
+#define MICROPY_PY_UCTYPES                  (1)
+#define MICROPY_PY_UZLIB                    (1)
+#define MICROPY_PY_UJSON                    (1)
+#define MICROPY_PY_URE                      (1)
+#define MICROPY_PY_URE_SUB                  (1)
+#define MICROPY_PY_UHEAPQ                   (1)
+#define MICROPY_PY_UTIMEQ                   (1)
+// #define MICROPY_PY_UHASHLIB                 (1)
+// #define MICROPY_PY_UHASHLIB_SHA1            (1)
+// #define MICROPY_PY_UHASHLIB_SHA256          (1)
+// #define MICROPY_PY_UCRYPTOLIB               (1)
+#define MICROPY_PY_UBINASCII                (1)
+#define MICROPY_PY_UBINASCII_CRC32          (1)
+#define MICROPY_PY_URANDOM                  (1)
+#define MICROPY_PY_URANDOM_EXTRA_FUNCS      (1)
+#define MICROPY_PY_OS_DUPTERM               (0)
+#define MICROPY_PY_MACHINE                  (1)
+#define MICROPY_PY_MACHINE_PIN_MAKE_NEW     mp_pin_make_new
+// #define MICROPY_PY_MACHINE_PULSE            (1)
+// #define MICROPY_PY_MACHINE_I2C              (1)
+// #define MICROPY_PY_MACHINE_SPI              (1)
+// #define MICROPY_PY_MACHINE_SPI_MSB          (1)
+// #define MICROPY_PY_MACHINE_SPI_LSB          (1)
+// #define MICROPY_PY_MACHINE_SPI_MAKE_NEW     machine_hw_spi_make_new
+// #define MICROPY_HW_SOFTSPI_MIN_DELAY        (0)
+// #define MICROPY_HW_SOFTSPI_MAX_BAUDRATE     (ets_get_cpu_frequency() * 1000000 / 200) // roughly
+// #define MICROPY_PY_USSL                     (1)
+// #define MICROPY_SSL_MBEDTLS                 (1)
+// #define MICROPY_PY_USSL_FINALISER           (1)
+// #define MICROPY_PY_WEBSOCKET                (1)
+// #define MICROPY_PY_WEBREPL                  (1)
+#define MICROPY_PY_FRAMEBUF                 (1)
+// #define MICROPY_PY_USOCKET_EVENTS           (MICROPY_PY_WEBREPL)
+
+
+// fatfs configuration
+#define MICROPY_FATFS_ENABLE_LFN            (1)
+#define MICROPY_FATFS_RPATH                 (2)
+#define MICROPY_FATFS_MAX_SS                (4096)
+#define MICROPY_FATFS_LFN_CODE_PAGE         (437) /* 1=SFN/ANSI 437=LFN/U.S.(OEM) */
+#define mp_type_fileio                      mp_type_vfs_fat_fileio
+#define mp_type_textio                      mp_type_vfs_fat_textio
+
+// use vfs's functions for import stat and builtin open
+#define mp_import_stat mp_vfs_import_stat
+#define mp_builtin_open mp_vfs_open
+#define mp_builtin_open_obj mp_vfs_open_obj
+
+// extra built in names to add to the global namespace
+#define MICROPY_PORT_BUILTINS \
+    { MP_OBJ_NEW_QSTR(MP_QSTR_input), (mp_obj_t)&mp_builtin_input_obj }, \
+    { MP_OBJ_NEW_QSTR(MP_QSTR_open), (mp_obj_t)&mp_builtin_open_obj },
+
 // extra built in modules to add to the list of known ones
 extern const struct _mp_obj_module_t mp_module_machine;
+extern const struct _mp_obj_module_t uos_module;
 
 #define MICROPY_PORT_BUILTIN_MODULES \
     { MP_OBJ_NEW_QSTR(MP_QSTR_machine), (mp_obj_t)&mp_module_machine }, \
+    { MP_OBJ_NEW_QSTR(MP_QSTR_uos), (mp_obj_t)&uos_module }, \
 
 
+#define MICROPY_PORT_BUILTIN_MODULE_WEAK_LINKS \
+    { MP_OBJ_NEW_QSTR(MP_QSTR_binascii), (mp_obj_t)&mp_module_ubinascii }, \
+    { MP_OBJ_NEW_QSTR(MP_QSTR_collections), (mp_obj_t)&mp_module_collections }, \
+    { MP_OBJ_NEW_QSTR(MP_QSTR_errno), (mp_obj_t)&mp_module_uerrno }, \
+    { MP_OBJ_NEW_QSTR(MP_QSTR_heapq), (mp_obj_t)&mp_module_uheapq }, \
+    { MP_OBJ_NEW_QSTR(MP_QSTR_io), (mp_obj_t)&mp_module_io }, \
+    { MP_OBJ_NEW_QSTR(MP_QSTR_json), (mp_obj_t)&mp_module_ujson }, \
+    { MP_OBJ_NEW_QSTR(MP_QSTR_os), (mp_obj_t)&uos_module }, \
+    { MP_OBJ_NEW_QSTR(MP_QSTR_random), (mp_obj_t)&mp_module_urandom }, \
+    { MP_OBJ_NEW_QSTR(MP_QSTR_re), (mp_obj_t)&mp_module_ure }, \
+    { MP_OBJ_NEW_QSTR(MP_QSTR_struct), (mp_obj_t)&mp_module_ustruct }, \
+    { MP_OBJ_NEW_QSTR(MP_QSTR_zlib), (mp_obj_t)&mp_module_uzlib }, \
 
 // type definitions for the specific machine
 
@@ -133,15 +226,11 @@ typedef long mp_off_t;
 
 #define MP_PLAT_PRINT_STRN(str, len) mp_hal_stdout_tx_strn_cooked(str, len)
 
-// extra built in names to add to the global namespace
-#define MICROPY_PORT_BUILTINS \
-    { MP_ROM_QSTR(MP_QSTR_open), MP_ROM_PTR(&mp_builtin_open_obj) },
-
 // We need to provide a declaration/definition of alloca()
 #include <stdlib.h>
 
-#define MICROPY_HW_BOARD_NAME   "GPRS_A9_A9G"
-#define MICROPY_HW_MCU_NAME     "GPRS_A9_RDA8955"
+#define MICROPY_HW_BOARD_NAME   "A9/A9G module"
+#define MICROPY_HW_MCU_NAME     "RDA8955"
 #define MICROPY_PY_SYS_PLATFORM "gprs_a9"
 
 
@@ -170,3 +259,9 @@ typedef long mp_off_t;
 #endif
 
 #endif
+
+#if MICROPY_DEBUG_VERBOSE
+// printer for debugging output
+extern const struct _mp_print_t mp_debug_print;
+#endif
+
diff --git a/ports/gprs_a9/mphalport.c b/ports/gprs_a9/mphalport.c
index e1a3fc46f52f5..dd115cffda8c7 100644
--- a/ports/gprs_a9/mphalport.c
+++ b/ports/gprs_a9/mphalport.c
@@ -2,14 +2,66 @@
 #include "mpconfigport.h"
 
 #include "time.h"
+#include "stdbool.h"
+#include "api_os.h"
+#include "api_event.h"
+#include "api_debug.h"
+#include "api_hal_pm.h"
+#include "api_hal_uart.h"
+#include "buffer.h"
+
 
 mp_uint_t mp_hal_ticks_ms(void)
 {
     return (int)(clock()/CLOCKS_PER_MSEC);
 }
 
-void mp_hal_set_interrupt_char(int c) 
+
+
+
+bool UartInit()
 {
+    UART_Config_t config = {
+        .baudRate = UART_BAUD_RATE_115200,
+        .dataBits = UART_DATA_BITS_8,
+        .stopBits = UART_STOP_BITS_1,
+        .parity   = UART_PARITY_NONE,
+        .rxCallback = NULL,
+        .useEvent = true,
+    };
+    UART_Init(UART1,config);
+    return true;
+}
+
 
 
+// Send string of given length
+void mp_hal_stdout_tx_strn(const char *str, mp_uint_t len) {
+    UART_Write(UART1,(uint8_t*)str,len);
 }
+
+// Send zero-terminated string
+void mp_hal_stdout_tx_str(const char *str) {
+    mp_hal_stdout_tx_strn(str, strlen(str));
+}
+
+// Efficiently convert "\n" to "\r\n"
+void mp_hal_stdout_tx_strn_cooked(const char *str, size_t len) {
+    const char *last = str;
+    while (len--) {
+        if (*str == '\n') {
+            if (str > last) {
+                mp_hal_stdout_tx_strn(last, str - last);
+            }
+            mp_hal_stdout_tx_strn("\r\n", 2);
+            ++str;
+            last = str;
+        } else {
+            ++str;
+        }
+    }
+    if (str > last) {
+        mp_hal_stdout_tx_strn(last, str - last);
+    }
+}
+
diff --git a/ports/gprs_a9/mphalport.h b/ports/gprs_a9/mphalport.h
index 0f802f405a5f7..cbea6f9b694a0 100644
--- a/ports/gprs_a9/mphalport.h
+++ b/ports/gprs_a9/mphalport.h
@@ -1,3 +1,7 @@
+#include "stdint.h"
+#include "stdbool.h"
 
 void mp_hal_set_interrupt_char(int c);
 
+bool UartInit();
+
diff --git a/ports/gprs_a9/rng.c b/ports/gprs_a9/rng.c
new file mode 100644
index 0000000000000..64bdf2dde7bdf
--- /dev/null
+++ b/ports/gprs_a9/rng.c
@@ -0,0 +1,28 @@
+
+#include "rng.h"
+
+
+// For MCUs that don't have an RNG we still need to provide a rng_get() function,
+// eg for lwIP.  A pseudo-RNG is not really ideal but we go with it for now.  We
+// don't want to use urandom's pRNG because then the user won't see a reproducible
+// random stream.
+
+// Yasmarang random number generator by Ilya Levin
+// http://www.literatecode.com/yasmarang
+static uint32_t pyb_rng_yasmarang(void) {
+    static uint32_t pad = 0xeda4baba, n = 69, d = 233;
+    static uint8_t dat = 0;
+
+    pad += dat + d * n;
+    pad = (pad << 3) + (pad >> 29);
+    n = pad | 2;
+    d ^= (pad << 31) + (pad >> 1);
+    dat ^= (char)pad ^ (d >> 8) ^ 1;
+
+    return pad ^ (d << 5) ^ (pad >> 18) ^ (dat << 1);
+}
+
+uint32_t rng_get(void) {
+    return pyb_rng_yasmarang();
+}
+
diff --git a/ports/gprs_a9/rng.h b/ports/gprs_a9/rng.h
new file mode 100644
index 0000000000000..5f3460ae51c95
--- /dev/null
+++ b/ports/gprs_a9/rng.h
@@ -0,0 +1,8 @@
+#ifndef __RNG_H
+#define __RNG_H
+
+#include "stdint.h"
+
+uint32_t rng_get(void);
+
+#endif
diff --git a/ports/gprs_a9/unistd.h b/ports/gprs_a9/unistd.h
index fa56248a49de2..73ee35068e732 100644
--- a/ports/gprs_a9/unistd.h
+++ b/ports/gprs_a9/unistd.h
@@ -1,9 +1,12 @@
 #ifndef MICROPY_INCLUDED_GPRS_A9_UNISTD_H
 #define MICROPY_INCLUDED_GPRS_A9_UNISTD_H
 
-#include "cs_types.h"
+// #include "cs_types.h"
 
 #define SEEK_SET 0
 #define SEEK_CUR 1
+#define SEEK_END 2
+
+typedef long off_t;
 
 #endif // MICROPY_INCLUDED_GPRS_A9_UNISTD_H
\ No newline at end of file

From 537ef7d276b8345dcb3dfdf8c6f5456376146ea6 Mon Sep 17 00:00:00 2001
From: Neucrack <CZD666666@gmail.com>
Date: Thu, 11 Oct 2018 19:22:20 +0800
Subject: [PATCH 3111/3533] add stack check

---
 ports/gprs_a9/main.c         | 49 ++++++++++++++++++++++++++++--------
 ports/gprs_a9/mpconfigport.h |  4 +--
 2 files changed, 41 insertions(+), 12 deletions(-)

diff --git a/ports/gprs_a9/main.c b/ports/gprs_a9/main.c
index fb8faec08e999..f50ee0ecaccb0 100644
--- a/ports/gprs_a9/main.c
+++ b/ports/gprs_a9/main.c
@@ -20,11 +20,11 @@
 #include "mphalport.h"
 #include "mpconfigport.h"
 
-
+#include "mpstate.h"
 
 #define AppMain_TASK_STACK_SIZE    (2048 * 2)
 #define AppMain_TASK_PRIORITY      0
-#define MICROPYTHON_TASK_STACK_SIZE     (2048 * 2)
+#define MICROPYTHON_TASK_STACK_SIZE     (2048 * 4)
 #define MICROPYTHON_TASK_PRIORITY       1
 #define UART_CIRCLE_FIFO_BUFFER_MAX_LENGTH 2048
 
@@ -112,14 +112,45 @@ typedef struct{
     uint32_t top;
 }Stack_Info_t;
 
+void StackUsage()
+{
+    OS_Task_Info_t info;
+    OS_GetTaskInfo(microPyTaskHandle,&info);
+    volatile int stack_dummy;
+    uint32_t last = info.stackTop - (uint32_t)&stack_dummy;
+    Trace(1,"0x%x <-- 0x%x",info.stackTop,(uint32_t)&stack_dummy);
+    Trace(1,"stack zone last:%d",last);
+    last = (uint32_t)&stack_dummy - info.stackTop;
+    Trace(1,"stack zone last:%d",last);
+}
 
 
-bool mp_Init()
+void ShowStackInfo()
 {
-    int stack_dummy;
-    stack_top = (char*)&stack_dummy;
+    OS_Task_Info_t info;
+    OS_GetTaskInfo(microPyTaskHandle,&info);
+    volatile uint32_t j = 0;
+    uint32_t last_bytes = (uint32_t)&j - info.stackTop;
+    uint32_t all_bytes  = info.stackSize*4;
+    printf("stack usage:%d/%d", all_bytes-last_bytes,all_bytes);
+}
 
+bool mp_Init()
+{   
+    OS_Sleep(5000);
+    //stack check info
+    OS_Task_Info_t info;
+    OS_GetTaskInfo(microPyTaskHandle,&info);
+    mp_stack_ctrl_init();
+    mp_stack_set_top((void *)(info.stackTop+info.stackSize*4));
+    mp_stack_set_limit(MICROPYTHON_TASK_STACK_SIZE*4 - 512);
+    printf("mmp stack used:%d",mp_stack_usage());
+
+    printf("aaaaaaaaaa");
+    OS_Sleep(5000);
+    //mp init
     mp_init();
+    //repl init
     pyexec_event_repl_init();
     return true;
 }
@@ -133,9 +164,6 @@ void MicroPyEventDispatch(MicroPy_Event_t* pEvent)
         {
             uint8_t c;
             Trace(1,"micropy task received data length:%d",pEvent->param1);
-            Stack_Info_t info;
-            GetStackInfo(&info);
-            printf("stack info, %d/%d, top:0x%x",info.used,info.size,info.top);
             for (;;) {
                 if(!Buffer_Gets(&fifoBuffer,&c,1))
                     break;
@@ -174,6 +202,7 @@ void MicroPyTask(void *pData)
         }
     }
 }
+
 void EventDispatch(API_Event_t* pEvent)
 {
     switch(pEvent->id)
@@ -213,7 +242,7 @@ void AppMainTask(void *pData)
     API_Event_t* event=NULL;
 
     microPyTaskHandle = OS_CreateTask(MicroPyTask,
-                                    NULL, NULL, MICROPYTHON_TASK_STACK_SIZE, MICROPYTHON_TASK_PRIORITY, 0, 0, "ohter Task");
+                                    NULL, NULL, MICROPYTHON_TASK_STACK_SIZE, MICROPYTHON_TASK_PRIORITY, 0, 0, "mpy Task");
     while(1)
     {
         if(OS_WaitEvent(mainTaskHandle, (void**)&event, OS_TIME_OUT_WAIT_FOREVER))
@@ -231,7 +260,7 @@ void AppMainTask(void *pData)
 void _Main(void)
 {
     mainTaskHandle = OS_CreateTask(AppMainTask ,
-                                   NULL, NULL, MICROPYTHON_TASK_PRIORITY, AppMain_TASK_PRIORITY, 0, 0, "init Task");
+                                   NULL, NULL, AppMain_TASK_STACK_SIZE, AppMain_TASK_PRIORITY, 0, 0, "main Task");
     OS_SetUserMainHandle(&mainTaskHandle);
 }
 
diff --git a/ports/gprs_a9/mpconfigport.h b/ports/gprs_a9/mpconfigport.h
index c48b9da19f1a7..73a0e330ae7b1 100644
--- a/ports/gprs_a9/mpconfigport.h
+++ b/ports/gprs_a9/mpconfigport.h
@@ -8,7 +8,7 @@
 // options to control how MicroPython is built
 
 
-#define MICROPY_DEBUG_VERBOSE       (1)
+#define MICROPY_DEBUG_VERBOSE       (0)
 #define MICROPY_DEBUG_PRINTER       (&mp_debug_print)
 
 
@@ -40,7 +40,7 @@
 #define MICROPY_MODULE_FROZEN_MPY           (1)
 #define MICROPY_READER_VFS                  (1)
 // #define MICROPY_ENABLE_FINALISER            (1)
-// #define MICROPY_STACK_CHECK                 (1)
+#define MICROPY_STACK_CHECK                 (1)
 #define MICROPY_ENABLE_EMERGENCY_EXCEPTION_BUF (1)
 #define MICROPY_KBD_EXCEPTION               (1)
 #define MICROPY_HELPER_REPL                 (1)

From 71ddc986e673442fc0d7cbf95ad9b7047d150b46 Mon Sep 17 00:00:00 2001
From: Neucrack <CZD666666@gmail.com>
Date: Thu, 11 Oct 2018 19:23:10 +0800
Subject: [PATCH 3112/3533] update stack check

---
 ports/gprs_a9/main.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ports/gprs_a9/main.c b/ports/gprs_a9/main.c
index f50ee0ecaccb0..e93c49e4cc83c 100644
--- a/ports/gprs_a9/main.c
+++ b/ports/gprs_a9/main.c
@@ -143,10 +143,10 @@ bool mp_Init()
     OS_GetTaskInfo(microPyTaskHandle,&info);
     mp_stack_ctrl_init();
     mp_stack_set_top((void *)(info.stackTop+info.stackSize*4));
-    mp_stack_set_limit(MICROPYTHON_TASK_STACK_SIZE*4 - 512);
-    printf("mmp stack used:%d",mp_stack_usage());
+    mp_stack_set_limit(MICROPYTHON_TASK_STACK_SIZE*4 - 1024);
+    printf("mp stack used:%d",mp_stack_usage());
 
-    printf("aaaaaaaaaa");
+    
     OS_Sleep(5000);
     //mp init
     mp_init();

From 35b2e0ba1db95d64e42fbf36b3e187f8d2a26018 Mon Sep 17 00:00:00 2001
From: Neucrack <CZD666666@gmail.com>
Date: Thu, 11 Oct 2018 19:23:25 +0800
Subject: [PATCH 3113/3533] update compile script

---
 ports/gprs_a9/Makefile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ports/gprs_a9/Makefile b/ports/gprs_a9/Makefile
index 7974ac2663e9a..1bbaa8ff75dfe 100644
--- a/ports/gprs_a9/Makefile
+++ b/ports/gprs_a9/Makefile
@@ -54,7 +54,7 @@ PLATFORM_LOD_FILE := ${wildcard ${PLATFORM_LOD_PATH}/*.lod}
 ELFCOMBINE_TOOL := ${CSDK_PATH}/platform/compilation/elfCombine.pl
 TARGET_FILE := ${BUILD_PATH_ABS}/targetgen
 MAP_CFG_FILE := ${CSDK_PATH}/platform/compilation/8955_map_cfg
-LODCOMBINE_TOOL := ${CSDK_PATH}/platform/compilation/lodCombine.pl
+LODCOMBINE_TOOL := ${CSDK_PATH}/platform/compilation/lodtool.py
 
 
 LIBGCC_PATH := ${CSDK_PATH}/platform/lib/gcc/mips-elf/4.4.2
@@ -83,12 +83,12 @@ FULL_SRC_OBJECTS :=
 LD_OPTIONAL_OBJECTS := 
 ########################################3###
 INC += -I.
-INC += -I$(TOP)
+INC += -I$(TOP) -I$(TOP)/py
 INC += -I$(BUILD_PATH_ABS)
 INC += -I${CSDK_PATH}/include \
        -I${CSDK_PATH}/include/std_inc \
 	   -I${CSDK_PATH}/include/api_inc \
-	   -I${CSDK_PATH}/libs/utils/include
+	   -I${CSDK_PATH}/libs/utils/include 
 
 CFLAGS = $(INC) -Wshadow \
 		  -std=gnu99 \
@@ -154,7 +154,7 @@ all: lod
 lod: ${HEX}
 	$(Q)$(MAKE) targetgen
 	$(Q)srecmap -c ${MAP_CFG_FILE} -m ${FLSH_MODEL} -b ${TARGET_FILE} ${HEX} ${LODBASE} ${STDOUT_NULL}
-	$(Q)$(LODCOMBINE_TOOL) openat -l  $(PLATFORM_LOD_FILE) -i $(LOD_FILE) -o $(WITH_PLT_LOD_FILE) -u $(WITH_PLT_OTA_FILE);
+	$(Q)python $(LODCOMBINE_TOOL) merge --platform $(PLATFORM_LOD_FILE) --app $(LOD_FILE) --out $(WITH_PLT_LOD_FILE)
 	$(ECHO) "BUILD OK"
 
 

From 2899f1cac10f894c3cd1ddf438484356274de5db Mon Sep 17 00:00:00 2001
From: Neucrack <CZD666666@gmail.com>
Date: Thu, 11 Oct 2018 19:28:28 +0800
Subject: [PATCH 3114/3533] update lib

---
 lib/GPRS_C_SDK | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/GPRS_C_SDK b/lib/GPRS_C_SDK
index b1192271da456..302b7caab7f91 160000
--- a/lib/GPRS_C_SDK
+++ b/lib/GPRS_C_SDK
@@ -1 +1 @@
-Subproject commit b1192271da45619195bf7923c84784d2230dd921
+Subproject commit 302b7caab7f9118382b109b802051e74153325af

From b05ce55338ae848f61f6acaebd00cd811713b2f0 Mon Sep 17 00:00:00 2001
From: Neucrack <CZD666666@gmail.com>
Date: Fri, 12 Oct 2018 11:55:13 +0800
Subject: [PATCH 3115/3533] add keyboard interrupt

---
 ports/gprs_a9/Makefile    |  2 +-
 ports/gprs_a9/main.c      | 48 +++++++++++++++++++--------------------
 ports/gprs_a9/mphalport.h |  1 +
 3 files changed, 25 insertions(+), 26 deletions(-)

diff --git a/ports/gprs_a9/Makefile b/ports/gprs_a9/Makefile
index 1bbaa8ff75dfe..9f127ea83f833 100644
--- a/ports/gprs_a9/Makefile
+++ b/ports/gprs_a9/Makefile
@@ -83,7 +83,7 @@ FULL_SRC_OBJECTS :=
 LD_OPTIONAL_OBJECTS := 
 ########################################3###
 INC += -I.
-INC += -I$(TOP) -I$(TOP)/py
+INC += -I$(TOP)
 INC += -I$(BUILD_PATH_ABS)
 INC += -I${CSDK_PATH}/include \
        -I${CSDK_PATH}/include/std_inc \
diff --git a/ports/gprs_a9/main.c b/ports/gprs_a9/main.c
index e93c49e4cc83c..2a94b452fe8b0 100644
--- a/ports/gprs_a9/main.c
+++ b/ports/gprs_a9/main.c
@@ -8,6 +8,9 @@
 #include "py/gc.h"
 #include "py/mperrno.h"
 #include "lib/utils/pyexec.h"
+#include "py/stackctrl.h"
+#include "py/mpstate.h"
+#include "py/mphal.h"
 
 #include "stdbool.h"
 #include "api_os.h"
@@ -20,7 +23,7 @@
 #include "mphalport.h"
 #include "mpconfigport.h"
 
-#include "mpstate.h"
+
 
 #define AppMain_TASK_STACK_SIZE    (2048 * 2)
 #define AppMain_TASK_PRIORITY      0
@@ -106,25 +109,6 @@ void MP_WEAK __assert_func(const char *file, int line, const char *func, const c
 }
 #endif
 
-typedef struct{
-    uint32_t size;
-    uint32_t used;
-    uint32_t top;
-}Stack_Info_t;
-
-void StackUsage()
-{
-    OS_Task_Info_t info;
-    OS_GetTaskInfo(microPyTaskHandle,&info);
-    volatile int stack_dummy;
-    uint32_t last = info.stackTop - (uint32_t)&stack_dummy;
-    Trace(1,"0x%x <-- 0x%x",info.stackTop,(uint32_t)&stack_dummy);
-    Trace(1,"stack zone last:%d",last);
-    last = (uint32_t)&stack_dummy - info.stackTop;
-    Trace(1,"stack zone last:%d",last);
-}
-
-
 void ShowStackInfo()
 {
     OS_Task_Info_t info;
@@ -137,7 +121,6 @@ void ShowStackInfo()
 
 bool mp_Init()
 {   
-    OS_Sleep(5000);
     //stack check info
     OS_Task_Info_t info;
     OS_GetTaskInfo(microPyTaskHandle,&info);
@@ -146,8 +129,6 @@ bool mp_Init()
     mp_stack_set_limit(MICROPYTHON_TASK_STACK_SIZE*4 - 1024);
     printf("mp stack used:%d",mp_stack_usage());
 
-    
-    OS_Sleep(5000);
     //mp init
     mp_init();
     //repl init
@@ -205,6 +186,7 @@ void MicroPyTask(void *pData)
 
 void EventDispatch(API_Event_t* pEvent)
 {
+    uint32_t len = 0;
     switch(pEvent->id)
     {
         case API_EVENT_ID_POWER_ON:
@@ -224,10 +206,26 @@ void EventDispatch(API_Event_t* pEvent)
                     Trace(1,"malloc fail");
                     break;
                 }
-                Buffer_Puts(&fifoBuffer,pEvent->pParam1,pEvent->param2);
+                for(uint16_t i=0; i<pEvent->param2; ++i)
+                {
+                   if (pEvent->pParam1[i] == mp_interrupt_char) {
+                        // inline version of mp_keyboard_interrupt();
+                        MP_STATE_VM(mp_pending_exception) = MP_OBJ_FROM_PTR(&MP_STATE_VM(mp_kbd_exception));
+                        #if MICROPY_ENABLE_SCHEDULER
+                        if (MP_STATE_VM(sched_state) == MP_SCHED_IDLE) {
+                            MP_STATE_VM(sched_state) = MP_SCHED_PENDING;
+                        }
+                        #endif
+                   }
+                   else
+                   {
+                       Buffer_Puts(&fifoBuffer,pEvent->pParam1+i,1);
+                       len++;
+                   }
+                }
                 memset((void*)event,0,sizeof(MicroPy_Event_t));
                 event->id = MICROPY_EVENT_ID_UART_RECEIVED;
-                event->param1 = (uint32_t)(pEvent->param2);
+                event->param1 = len;
                 OS_SendEvent(microPyTaskHandle,(void*)event,OS_TIME_OUT_WAIT_FOREVER,0);
             }
             break;
diff --git a/ports/gprs_a9/mphalport.h b/ports/gprs_a9/mphalport.h
index cbea6f9b694a0..95a82c710614a 100644
--- a/ports/gprs_a9/mphalport.h
+++ b/ports/gprs_a9/mphalport.h
@@ -1,5 +1,6 @@
 #include "stdint.h"
 #include "stdbool.h"
+#include "lib/utils/interrupt_char.h"
 
 void mp_hal_set_interrupt_char(int c);
 

From 4068a571815517ed009d9f4a50165242643cae3a Mon Sep 17 00:00:00 2001
From: Neucrack <CZD666666@gmail.com>
Date: Fri, 12 Oct 2018 16:47:19 +0800
Subject: [PATCH 3116/3533] add time module

---
 ports/gprs_a9/.gitignore       |   1 +
 ports/gprs_a9/Makefile         |   1 +
 ports/gprs_a9/README.md        |   5 +-
 ports/gprs_a9/main.c           |  34 ++++++++++-
 ports/gprs_a9/modules/blink.py |   8 ++-
 ports/gprs_a9/modutime.c       | 102 +++++++++++++++++++++++++++++++++
 ports/gprs_a9/mpconfigport.h   |   3 +
 ports/gprs_a9/mphalport.c      |  35 +++++++++--
 ports/gprs_a9/mphalport.h      |  16 ++++++
 9 files changed, 195 insertions(+), 10 deletions(-)
 create mode 100644 ports/gprs_a9/modutime.c

diff --git a/ports/gprs_a9/.gitignore b/ports/gprs_a9/.gitignore
index baef948259352..19217b38fa5e8 100644
--- a/ports/gprs_a9/.gitignore
+++ b/ports/gprs_a9/.gitignore
@@ -1,3 +1,4 @@
 build
 *.lod
 hex
+.vscode
diff --git a/ports/gprs_a9/Makefile b/ports/gprs_a9/Makefile
index 9f127ea83f833..08a1d7ec387a6 100644
--- a/ports/gprs_a9/Makefile
+++ b/ports/gprs_a9/Makefile
@@ -115,6 +115,7 @@ SRC_C = \
 	machine_pin.c \
 	mphalport.c \
 	moduos.c \
+	modutime.c \
 	rng.c \
 	fatfs_port.c 
 
diff --git a/ports/gprs_a9/README.md b/ports/gprs_a9/README.md
index 11719135fe67a..27a4cbfacb774 100644
--- a/ports/gprs_a9/README.md
+++ b/ports/gprs_a9/README.md
@@ -11,4 +11,7 @@ make -C mpy-cross
 cd micropython/ports/gprs_a9
 chmod +x build.sh
 ./build.sh
-```
\ No newline at end of file
+```
+
+and the  final lod file in the `hex` folder
+
diff --git a/ports/gprs_a9/main.c b/ports/gprs_a9/main.c
index 2a94b452fe8b0..cd1324774da47 100644
--- a/ports/gprs_a9/main.c
+++ b/ports/gprs_a9/main.c
@@ -19,6 +19,8 @@
 #include "api_hal_pm.h"
 #include "api_hal_uart.h"
 #include "buffer.h"
+#include "api_network.h"
+#include "time.h"
 
 #include "mphalport.h"
 #include "mpconfigport.h"
@@ -195,6 +197,34 @@ void EventDispatch(API_Event_t* pEvent)
             break;
         case API_EVENT_ID_NETWORK_REGISTERED_HOME:
         case API_EVENT_ID_NETWORK_REGISTERED_ROAMING:
+        {
+            uint8_t status;
+            Trace(1,"network register success");
+            bool ret = Network_GetAttachStatus(&status);
+            if(!ret)
+                Trace(1,"get attach staus fail");
+            Trace(1,"attach status:%d",status);
+            if(status == 0)
+            {
+                ret = Network_StartAttach();
+                if(!ret)
+                {
+                    Trace(1,"network attach fail");
+                }
+            }
+            else
+            {
+            }
+        }
+            break;
+        case API_EVENT_ID_NETWORK_DETACHED:
+            Trace(2,"network detached");
+            break;
+        case API_EVENT_ID_NETWORK_ATTACH_FAILED:
+            Trace(2,"network attach failed");
+            break;
+        case API_EVENT_ID_NETWORK_GOT_TIME:
+            Trace(2,"network got time");
             break;
         case API_EVENT_ID_UART_RECEIVED:
             Trace(1,"UART%d received:%d,%s",pEvent->param1,pEvent->param2,pEvent->pParam1);
@@ -238,9 +268,11 @@ void EventDispatch(API_Event_t* pEvent)
 void AppMainTask(void *pData)
 {
     API_Event_t* event=NULL;
+    
+    TIME_SetIsAutoUpdateRtcTime(true);
 
     microPyTaskHandle = OS_CreateTask(MicroPyTask,
-                                    NULL, NULL, MICROPYTHON_TASK_STACK_SIZE, MICROPYTHON_TASK_PRIORITY, 0, 0, "mpy Task");
+                                    NULL, NULL, MICROPYTHON_TASK_STACK_SIZE, MICROPYTHON_TASK_PRIORITY, 0, 0, "mpy Task");                                    
     while(1)
     {
         if(OS_WaitEvent(mainTaskHandle, (void**)&event, OS_TIME_OUT_WAIT_FOREVER))
diff --git a/ports/gprs_a9/modules/blink.py b/ports/gprs_a9/modules/blink.py
index 6052d172f5307..0b5224a526a19 100644
--- a/ports/gprs_a9/modules/blink.py
+++ b/ports/gprs_a9/modules/blink.py
@@ -1,12 +1,14 @@
 
 import machine
+import time
 
 def blink(interval):
     print("blink")
-    led = machine.Pin(27,machine.Pin.OUT)
+    led = machine.Pin(27,machine.Pin.OUT,0)
     value = 1
     while(1):
         led.value(value)
-        # time.sleep(1)
-        # value = (value==1)?0:1
+        time.sleep(interval)
+        value = 0 if (value==1) else 1
+
 
diff --git a/ports/gprs_a9/modutime.c b/ports/gprs_a9/modutime.c
new file mode 100644
index 0000000000000..0ebc0466a4527
--- /dev/null
+++ b/ports/gprs_a9/modutime.c
@@ -0,0 +1,102 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * Development of the code in this file was sponsored by Microbric Pty Ltd
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2016 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include <stdio.h>
+#include <string.h>
+#include "time.h"
+
+#include "py/runtime.h"
+#include "lib/timeutils/timeutils.h"
+#include "extmod/utime_mphal.h"
+
+STATIC mp_obj_t time_localtime(size_t n_args, const mp_obj_t *args) {
+    timeutils_struct_time_t tm;
+    mp_int_t seconds;
+    if (n_args == 0 || args[0] == mp_const_none) {
+        seconds = TIME_GetTime();
+    } else {
+        seconds = mp_obj_get_int(args[0]);
+    }
+    timeutils_seconds_since_2000_to_struct_time(seconds, &tm);
+    mp_obj_t tuple[8] = {
+        tuple[0] = mp_obj_new_int(tm.tm_year),
+        tuple[1] = mp_obj_new_int(tm.tm_mon),
+        tuple[2] = mp_obj_new_int(tm.tm_mday),
+        tuple[3] = mp_obj_new_int(tm.tm_hour),
+        tuple[4] = mp_obj_new_int(tm.tm_min),
+        tuple[5] = mp_obj_new_int(tm.tm_sec),
+        tuple[6] = mp_obj_new_int(tm.tm_wday),
+        tuple[7] = mp_obj_new_int(tm.tm_yday),
+    };
+    return mp_obj_new_tuple(8, tuple);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(time_localtime_obj, 0, 1, time_localtime);
+
+STATIC mp_obj_t time_mktime(mp_obj_t tuple) {
+    size_t len;
+    mp_obj_t *elem;
+    mp_obj_get_array(tuple, &len, &elem);
+
+    // localtime generates a tuple of len 8. CPython uses 9, so we accept both.
+    if (len < 8 || len > 9) {
+        nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_TypeError, "mktime needs a tuple of length 8 or 9 (%d given)", len));
+    }
+
+    return mp_obj_new_int_from_uint(timeutils_mktime(mp_obj_get_int(elem[0]),
+            mp_obj_get_int(elem[1]), mp_obj_get_int(elem[2]), mp_obj_get_int(elem[3]),
+            mp_obj_get_int(elem[4]), mp_obj_get_int(elem[5])));
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(time_mktime_obj, time_mktime);
+
+STATIC mp_obj_t time_time(void) {
+    return mp_obj_new_int(time(NULL));
+}
+MP_DEFINE_CONST_FUN_OBJ_0(time_time_obj, time_time);
+
+STATIC const mp_rom_map_elem_t time_module_globals_table[] = {
+    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_utime) },
+
+    { MP_ROM_QSTR(MP_QSTR_localtime), MP_ROM_PTR(&time_localtime_obj) },
+    { MP_ROM_QSTR(MP_QSTR_mktime), MP_ROM_PTR(&time_mktime_obj) },
+    { MP_ROM_QSTR(MP_QSTR_time), MP_ROM_PTR(&time_time_obj) },
+    { MP_ROM_QSTR(MP_QSTR_sleep), MP_ROM_PTR(&mp_utime_sleep_obj) },
+    { MP_ROM_QSTR(MP_QSTR_sleep_ms), MP_ROM_PTR(&mp_utime_sleep_ms_obj) },
+    { MP_ROM_QSTR(MP_QSTR_sleep_us), MP_ROM_PTR(&mp_utime_sleep_us_obj) },
+    { MP_ROM_QSTR(MP_QSTR_ticks_ms), MP_ROM_PTR(&mp_utime_ticks_ms_obj) },
+    { MP_ROM_QSTR(MP_QSTR_ticks_us), MP_ROM_PTR(&mp_utime_ticks_us_obj) },
+    { MP_ROM_QSTR(MP_QSTR_ticks_cpu), MP_ROM_PTR(&mp_utime_ticks_cpu_obj) },
+    { MP_ROM_QSTR(MP_QSTR_ticks_add), MP_ROM_PTR(&mp_utime_ticks_add_obj) },
+    { MP_ROM_QSTR(MP_QSTR_ticks_diff), MP_ROM_PTR(&mp_utime_ticks_diff_obj) },
+};
+
+STATIC MP_DEFINE_CONST_DICT(time_module_globals, time_module_globals_table);
+
+const mp_obj_module_t utime_module = {
+    .base = { &mp_type_module },
+    .globals = (mp_obj_dict_t*)&time_module_globals,
+};
diff --git a/ports/gprs_a9/mpconfigport.h b/ports/gprs_a9/mpconfigport.h
index 73a0e330ae7b1..189877bb8f9c5 100644
--- a/ports/gprs_a9/mpconfigport.h
+++ b/ports/gprs_a9/mpconfigport.h
@@ -190,10 +190,12 @@
 // extra built in modules to add to the list of known ones
 extern const struct _mp_obj_module_t mp_module_machine;
 extern const struct _mp_obj_module_t uos_module;
+extern const struct _mp_obj_module_t utime_module;
 
 #define MICROPY_PORT_BUILTIN_MODULES \
     { MP_OBJ_NEW_QSTR(MP_QSTR_machine), (mp_obj_t)&mp_module_machine }, \
     { MP_OBJ_NEW_QSTR(MP_QSTR_uos), (mp_obj_t)&uos_module }, \
+    { MP_OBJ_NEW_QSTR(MP_QSTR_utime), (mp_obj_t)&utime_module }, \
 
 
 #define MICROPY_PORT_BUILTIN_MODULE_WEAK_LINKS \
@@ -204,6 +206,7 @@ extern const struct _mp_obj_module_t uos_module;
     { MP_OBJ_NEW_QSTR(MP_QSTR_io), (mp_obj_t)&mp_module_io }, \
     { MP_OBJ_NEW_QSTR(MP_QSTR_json), (mp_obj_t)&mp_module_ujson }, \
     { MP_OBJ_NEW_QSTR(MP_QSTR_os), (mp_obj_t)&uos_module }, \
+    { MP_OBJ_NEW_QSTR(MP_QSTR_time), (mp_obj_t)&utime_module }, \
     { MP_OBJ_NEW_QSTR(MP_QSTR_random), (mp_obj_t)&mp_module_urandom }, \
     { MP_OBJ_NEW_QSTR(MP_QSTR_re), (mp_obj_t)&mp_module_ure }, \
     { MP_OBJ_NEW_QSTR(MP_QSTR_struct), (mp_obj_t)&mp_module_ustruct }, \
diff --git a/ports/gprs_a9/mphalport.c b/ports/gprs_a9/mphalport.c
index dd115cffda8c7..b313dadb965ae 100644
--- a/ports/gprs_a9/mphalport.c
+++ b/ports/gprs_a9/mphalport.c
@@ -9,13 +9,9 @@
 #include "api_hal_pm.h"
 #include "api_hal_uart.h"
 #include "buffer.h"
+#include "time.h"
 
 
-mp_uint_t mp_hal_ticks_ms(void)
-{
-    return (int)(clock()/CLOCKS_PER_MSEC);
-}
-
 
 
 
@@ -65,3 +61,32 @@ void mp_hal_stdout_tx_strn_cooked(const char *str, size_t len) {
     }
 }
 
+/////////////////////////////////////////////////////////////////////////////
+/////hal time////////////////////////////////////////////////////////////////
+
+
+uint32_t mp_hal_ticks_ms(void) {
+    return (uint32_t)(clock()/CLOCKS_PER_MSEC);
+}
+
+uint32_t mp_hal_ticks_us(void) {
+    return (uint32_t)(clock()/CLOCKS_PER_MSEC*1000);
+}
+
+void mp_hal_delay_ms(uint32_t ms) {
+    OS_Sleep(ms);
+}
+
+void mp_hal_delay_us(uint32_t us) {
+    OS_SleepUs(us);
+}
+
+// this function could do with improvements (eg use ets_delay_us)
+void mp_hal_delay_us_fast(uint32_t us) {
+    OS_SleepUs(us);
+}
+
+
+/////////////////////////////////////////////////////////////////////////////
+
+
diff --git a/ports/gprs_a9/mphalport.h b/ports/gprs_a9/mphalport.h
index 95a82c710614a..d63703b179935 100644
--- a/ports/gprs_a9/mphalport.h
+++ b/ports/gprs_a9/mphalport.h
@@ -1,8 +1,24 @@
+#ifndef __MPHALPORT_H
+#define __MPHALPORT_H
+
 #include "stdint.h"
 #include "stdbool.h"
 #include "lib/utils/interrupt_char.h"
+#include "time.h"
 
 void mp_hal_set_interrupt_char(int c);
 
 bool UartInit();
 
+
+uint32_t mp_hal_ticks_ms(void);
+uint32_t mp_hal_ticks_us(void);
+void mp_hal_delay_ms(uint32_t ms);
+void mp_hal_delay_us(uint32_t us);
+__attribute__((always_inline)) static inline uint32_t mp_hal_ticks_cpu(void) {
+  return clock();
+}
+
+
+#endif
+

From 4580fd20206a0bcb4520790fb10d15b5efd42e1c Mon Sep 17 00:00:00 2001
From: Neucrack <CZD666666@gmail.com>
Date: Sat, 13 Oct 2018 15:15:06 +0800
Subject: [PATCH 3117/3533] update os file op

---
 ports/gprs_a9/Makefile       |   4 +-
 ports/gprs_a9/modchip.c      | 107 ++++++++++++++++++++++
 ports/gprs_a9/moduos.c       | 168 +++++++++++++++++++++++++++++++++++
 ports/gprs_a9/mpconfigport.h |  14 ++-
 4 files changed, 288 insertions(+), 5 deletions(-)
 create mode 100644 ports/gprs_a9/modchip.c

diff --git a/ports/gprs_a9/Makefile b/ports/gprs_a9/Makefile
index 08a1d7ec387a6..77585456d0ab8 100644
--- a/ports/gprs_a9/Makefile
+++ b/ports/gprs_a9/Makefile
@@ -117,7 +117,9 @@ SRC_C = \
 	moduos.c \
 	modutime.c \
 	rng.c \
-	fatfs_port.c 
+	fatfs_port.c \
+	modchip.c 
+
 
 LIB_SRC_C = $(addprefix lib/,\
 	mp-readline/readline.c \
diff --git a/ports/gprs_a9/modchip.c b/ports/gprs_a9/modchip.c
new file mode 100644
index 0000000000000..b09078988e7fa
--- /dev/null
+++ b/ports/gprs_a9/modchip.c
@@ -0,0 +1,107 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * Development of the code in this file was sponsored by Microbric Pty Ltd
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2015 Paul Sokolovsky
+ * Copyright (c) 2016 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include <stdio.h>
+
+
+#include "py/runtime.h"
+#include "py/mperrno.h"
+#include "py/mphal.h"
+
+#include "api_hal_flash.h"
+
+
+STATIC mp_obj_t chip_flash_read(mp_obj_t offset_in, mp_obj_t buf_in) {
+    mp_int_t offset = mp_obj_get_int(offset_in);
+    mp_buffer_info_t bufinfo;
+    mp_get_buffer_raise(buf_in, &bufinfo, MP_BUFFER_WRITE);
+    bool ret;
+    Trace(1,"flash read offset:%d,0x%x",offset,offset);
+    uint32_t addr = (uint32_t)HAL_SPI_FLASH_UNCACHE_ADDRESS(offset);
+    Trace(1,"flash read:0x%x",addr);
+    memcpy(bufinfo.buf, (void *)addr, bufinfo.len);
+    ret = true;
+    if (!ret) {
+        mp_raise_OSError(MP_EIO);
+    }
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(chip_flash_read_obj, chip_flash_read);
+
+STATIC mp_obj_t chip_flash_write(mp_obj_t offset_in, mp_obj_t buf_in) {
+    mp_int_t offset = mp_obj_get_int(offset_in);
+    mp_buffer_info_t bufinfo;
+    mp_get_buffer_raise(buf_in, &bufinfo, MP_BUFFER_READ);
+    bool ret = hal_SpiFlashWrite(offset,bufinfo.buf, bufinfo.len);
+    Trace(1,"flash write:%d",ret);
+    if (!ret) {
+        mp_raise_OSError(MP_EIO);
+    }
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(chip_flash_write_obj, chip_flash_write);
+
+STATIC mp_obj_t chip_flash_erase(mp_obj_t sector_in) {
+    mp_int_t sector = mp_obj_get_int(sector_in);
+    bool ret = hal_SpiFlashErase(sector*4096,4096);
+    Trace(1,"flash erase 0x%x, ret:%d",sector*4096,ret);
+    if (!ret) {
+        mp_raise_OSError(MP_EIO);
+    }
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(chip_flash_erase_obj, chip_flash_erase);
+
+STATIC mp_obj_t chip_flash_size(void) {
+    return mp_obj_new_int_from_uint(hal_SpiFlashGetSize());
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(chip_flash_size_obj, chip_flash_size);
+
+STATIC mp_obj_t chip_flash_user_start(void) {
+    return MP_OBJ_NEW_SMALL_INT(0x390000);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(chip_flash_user_start_obj, chip_flash_user_start);
+
+STATIC const mp_rom_map_elem_t chip_module_globals_table[] = {
+    { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_chip) },
+
+    { MP_ROM_QSTR(MP_QSTR_flash_read), MP_ROM_PTR(&chip_flash_read_obj) },
+    { MP_ROM_QSTR(MP_QSTR_flash_write), MP_ROM_PTR(&chip_flash_write_obj) },
+    { MP_ROM_QSTR(MP_QSTR_flash_erase), MP_ROM_PTR(&chip_flash_erase_obj) },
+    { MP_ROM_QSTR(MP_QSTR_flash_size), MP_ROM_PTR(&chip_flash_size_obj) },
+    { MP_ROM_QSTR(MP_QSTR_flash_user_start), MP_ROM_PTR(&chip_flash_user_start_obj) },
+};
+
+STATIC MP_DEFINE_CONST_DICT(chip_module_globals, chip_module_globals_table);
+
+const mp_obj_module_t chip_module = {
+    .base = { &mp_type_module },
+    .globals = (mp_obj_dict_t*)&chip_module_globals,
+};
+
diff --git a/ports/gprs_a9/moduos.c b/ports/gprs_a9/moduos.c
index 56def2ed60bf8..e3ab726808932 100644
--- a/ports/gprs_a9/moduos.c
+++ b/ports/gprs_a9/moduos.c
@@ -40,6 +40,7 @@
 #include "genhdr/mpversion.h"
 
 #include "rng.h"
+#include "api_fs.h"
 
 extern const mp_obj_type_t mp_fat_vfs_type;
 
@@ -85,6 +86,163 @@ STATIC mp_obj_t os_urandom(mp_obj_t num) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(os_urandom_obj, os_urandom);
 
+//////////////// fs ////////////////////////////////////////////////////
+
+#if !MICROPY_VFS
+mp_lexer_t *mp_lexer_new_from_file(const char *filename) {
+    mp_raise_OSError(MP_ENOENT);
+}
+
+mp_import_stat_t mp_import_stat(const char *path) {
+    (void)path;
+    return MP_IMPORT_STAT_NO_EXIST;
+}
+
+mp_obj_t mp_builtin_open(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs) {
+    return mp_const_none;
+}
+MP_DEFINE_CONST_FUN_OBJ_KW(mp_builtin_open_obj, 1, mp_builtin_open);
+#include "api_debug.h"
+mp_obj_t mp_vfs_listdir(size_t n_args, const mp_obj_t *args) {
+    mp_obj_t dir_list = mp_obj_new_list(0, NULL);
+    char* tmp = (char*)malloc(200);
+    if(!tmp)
+        mp_raise_OSError(MP_ENOMEM);
+    memset(tmp,0,200);
+    uint32_t ret =API_FS_GetCurDir(200,tmp);
+    if(ret != 0)
+    {
+        free(tmp);
+        mp_raise_OSError(MP_EIO);
+    }
+    char* dirToList = "/";
+    if(n_args != 0 )
+        dirToList = mp_obj_str_get_str(args[0]);
+    else
+    {
+        dirToList = tmp;
+    }
+    Dir_t* dir = API_FS_OpenDir((const char*)dirToList);
+    Dirent_t* dirent = NULL;
+    while(dirent = API_FS_ReadDir(dir))
+    {
+        // Trace(1,"dir name:%s",dirent->d_name);
+        mp_obj_t dirStr = mp_obj_new_str(dirent->d_name,strlen(dirent->d_name));
+        mp_obj_list_append(dir_list, dirStr);
+    }
+    API_FS_CloseDir(dir);
+    API_FS_OpenDir(tmp);
+    free(tmp);
+    return dir_list;
+}
+MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_vfs_listdir_obj, 0, 1, mp_vfs_listdir);
+
+
+mp_obj_t mp_vfs_mkdir(mp_obj_t path_in) {
+    const char* path = mp_obj_str_get_str(path_in);
+    if(strcmp(path,"/")==0 || strcmp(path,"/t")==0)
+    {
+        mp_raise_OSError(MP_EEXIST);
+    }
+    int32_t ret = API_FS_Mkdir(path,0);
+    if(ret != 0)
+        mp_raise_OSError(MP_EIO);
+    return mp_const_none;
+}
+MP_DEFINE_CONST_FUN_OBJ_1(mp_vfs_mkdir_obj, mp_vfs_mkdir);
+
+mp_obj_t mp_vfs_remove(mp_obj_t path_in) {
+    const char* path = mp_obj_str_get_str(path_in);
+    if(strcmp(path,"/")==0 || strcmp(path,"/t")==0)
+    {
+        mp_raise_OSError(MP_EINVAL);
+    }
+    int32_t ret = API_FS_Delete(path);
+    if(ret != 0)
+        mp_raise_OSError(MP_EIO);
+    return mp_const_none;
+}
+MP_DEFINE_CONST_FUN_OBJ_1(mp_vfs_remove_obj, mp_vfs_remove);
+
+mp_obj_t mp_vfs_rename(mp_obj_t old_path_in, mp_obj_t new_path_in) {
+    const char* path_old = mp_obj_str_get_str(old_path_in);
+    const char* path_new = mp_obj_str_get_str(new_path_in);
+    int32_t ret = API_FS_Rename(path_old,path_new);
+    if(ret != 0)
+        mp_raise_OSError(MP_EIO);
+    return mp_const_none;
+}
+MP_DEFINE_CONST_FUN_OBJ_2(mp_vfs_rename_obj, mp_vfs_rename);
+
+mp_obj_t mp_vfs_rmdir(mp_obj_t path_in) {
+    const char* path = mp_obj_str_get_str(path_in);
+    if(strcmp(path,"/")==0 || strcmp(path,"/t")==0)
+    {
+        mp_raise_OSError(MP_EINVAL);
+    }
+    int32_t ret = API_FS_Rmdir(path);
+    if(ret != 0)
+        mp_raise_OSError(MP_EIO);
+    return mp_const_none;
+}
+MP_DEFINE_CONST_FUN_OBJ_1(mp_vfs_rmdir_obj, mp_vfs_rmdir);
+
+
+mp_obj_t mp_vfs_chdir(mp_obj_t path_in) {
+    const char* path = mp_obj_str_get_str(path_in);
+    int32_t ret = API_FS_ChangeDir(path);
+    if(ret != 0)
+        mp_raise_OSError(MP_EIO);
+    return mp_const_none;
+}
+MP_DEFINE_CONST_FUN_OBJ_1(mp_vfs_chdir_obj, mp_vfs_chdir);
+
+mp_obj_t mp_vfs_getcwd(void) {
+    char* tmp = (char*)malloc(200);
+    if(!tmp)
+        mp_raise_OSError(MP_ENOMEM);
+    memset(tmp,0,200);
+    uint32_t ret =API_FS_GetCurDir(200,tmp);
+    if(ret != 0)
+    {
+        free(tmp);
+        mp_raise_OSError(MP_EIO);
+    }
+    mp_obj_t retVal = mp_obj_new_str(tmp,strlen(tmp));
+    free(tmp);
+    return retVal;
+}
+MP_DEFINE_CONST_FUN_OBJ_0(mp_vfs_getcwd_obj, mp_vfs_getcwd);
+
+mp_obj_t mp_vfs_stat(mp_obj_t path_in) {
+    const char* path = mp_obj_str_get_str(path_in);
+    API_FS_INFO info;
+    int32_t ret = API_FS_GetFSInfo(path,&info);
+    if(ret != 0)
+        mp_raise_OSError(MP_EIO);
+    mp_obj_tuple_t *t = MP_OBJ_TO_PTR(mp_obj_new_tuple(10, NULL));
+    t->items[0] = mp_obj_new_int(info.totalSize);
+    t->items[1] = mp_obj_new_int(info.usedSize);
+    return MP_OBJ_FROM_PTR(t);
+}
+MP_DEFINE_CONST_FUN_OBJ_1(mp_vfs_stat_obj, mp_vfs_stat);
+
+mp_obj_t mp_vfs_statvfs(mp_obj_t path_in) {
+    const char* path = mp_obj_str_get_str(path_in);
+    API_FS_INFO info;
+    int32_t ret = API_FS_GetFSInfo(path,&info);
+    if(ret != 0)
+        mp_raise_OSError(MP_EIO);
+    mp_obj_tuple_t *t = MP_OBJ_TO_PTR(mp_obj_new_tuple(10, NULL));
+    t->items[0] = mp_obj_new_int(info.totalSize);
+    t->items[1] = mp_obj_new_int(info.usedSize);
+    return MP_OBJ_FROM_PTR(t);
+}
+MP_DEFINE_CONST_FUN_OBJ_1(mp_vfs_statvfs_obj, mp_vfs_statvfs);
+
+#endif //#if !MICROPY_VFS
+///////////////////////////////////////////////////////////////////
+
 #if MICROPY_PY_OS_DUPTERM
 STATIC mp_obj_t os_dupterm_notify(mp_obj_t obj_in) {
     (void)obj_in;
@@ -124,6 +282,16 @@ STATIC const mp_rom_map_elem_t os_module_globals_table[] = {
     #if MICROPY_VFS_FAT
     { MP_ROM_QSTR(MP_QSTR_VfsFat), MP_ROM_PTR(&mp_fat_vfs_type) },
     #endif
+    #else
+    { MP_ROM_QSTR(MP_QSTR_listdir), MP_ROM_PTR(&mp_vfs_listdir_obj) },
+    { MP_ROM_QSTR(MP_QSTR_mkdir), MP_ROM_PTR(&mp_vfs_mkdir_obj) },
+    { MP_ROM_QSTR(MP_QSTR_rmdir), MP_ROM_PTR(&mp_vfs_rmdir_obj) },
+    { MP_ROM_QSTR(MP_QSTR_chdir), MP_ROM_PTR(&mp_vfs_chdir_obj) },
+    { MP_ROM_QSTR(MP_QSTR_getcwd), MP_ROM_PTR(&mp_vfs_getcwd_obj) },
+    { MP_ROM_QSTR(MP_QSTR_remove), MP_ROM_PTR(&mp_vfs_remove_obj) },
+    { MP_ROM_QSTR(MP_QSTR_rename), MP_ROM_PTR(&mp_vfs_rename_obj) },
+    { MP_ROM_QSTR(MP_QSTR_stat), MP_ROM_PTR(&mp_vfs_stat_obj) },
+    { MP_ROM_QSTR(MP_QSTR_statvfs), MP_ROM_PTR(&mp_vfs_statvfs_obj) },
     #endif
 };
 
diff --git a/ports/gprs_a9/mpconfigport.h b/ports/gprs_a9/mpconfigport.h
index 189877bb8f9c5..26ff1bcad9cdd 100644
--- a/ports/gprs_a9/mpconfigport.h
+++ b/ports/gprs_a9/mpconfigport.h
@@ -19,7 +19,7 @@
 #define MICROPY_ALLOC_PATH_MAX      (256)
 
 // emitters
-#define MICROPY_PERSISTENT_CODE_LOAD        (1)
+// #define MICROPY_PERSISTENT_CODE_LOAD        (1)
 
 // compiler configuration
 #define MICROPY_COMP_MODULE_CONST           (1)
@@ -38,7 +38,6 @@
 #define MICROPY_LONGINT_IMPL                (MICROPY_LONGINT_IMPL_MPZ)
 #define MICROPY_FLOAT_IMPL                  (MICROPY_FLOAT_IMPL_DOUBLE)
 #define MICROPY_MODULE_FROZEN_MPY           (1)
-#define MICROPY_READER_VFS                  (1)
 // #define MICROPY_ENABLE_FINALISER            (1)
 #define MICROPY_STACK_CHECK                 (1)
 #define MICROPY_ENABLE_EMERGENCY_EXCEPTION_BUF (1)
@@ -61,8 +60,6 @@
 #define MICROPY_USE_INTERNAL_PRINTF         (0)
 #define MICROPY_ENABLE_SCHEDULER            (1)
 #define MICROPY_SCHEDULER_DEPTH             (8)
-#define MICROPY_VFS                         (1)
-#define MICROPY_VFS_FAT                     (1)
 #define MICROPY_COMP_CONST                  (1)
 
 // MCU definition
@@ -177,10 +174,17 @@
 #define mp_type_fileio                      mp_type_vfs_fat_fileio
 #define mp_type_textio                      mp_type_vfs_fat_textio
 
+
+// #define MICROPY_VFS                         (1)
+// #define MICROPY_VFS_FAT                     (1)
+// #define MICROPY_READER_VFS                  (1)
+
 // use vfs's functions for import stat and builtin open
+#ifdef MICROPY_VFS
 #define mp_import_stat mp_vfs_import_stat
 #define mp_builtin_open mp_vfs_open
 #define mp_builtin_open_obj mp_vfs_open_obj
+#endif
 
 // extra built in names to add to the global namespace
 #define MICROPY_PORT_BUILTINS \
@@ -191,11 +195,13 @@
 extern const struct _mp_obj_module_t mp_module_machine;
 extern const struct _mp_obj_module_t uos_module;
 extern const struct _mp_obj_module_t utime_module;
+extern const struct _mp_obj_module_t chip_module;
 
 #define MICROPY_PORT_BUILTIN_MODULES \
     { MP_OBJ_NEW_QSTR(MP_QSTR_machine), (mp_obj_t)&mp_module_machine }, \
     { MP_OBJ_NEW_QSTR(MP_QSTR_uos), (mp_obj_t)&uos_module }, \
     { MP_OBJ_NEW_QSTR(MP_QSTR_utime), (mp_obj_t)&utime_module }, \
+    { MP_OBJ_NEW_QSTR(MP_QSTR_chip), (mp_obj_t)&chip_module }, \
 
 
 #define MICROPY_PORT_BUILTIN_MODULE_WEAK_LINKS \

From 30da1b428139a35bb87c6327bb90b5191a18e8c5 Mon Sep 17 00:00:00 2001
From: Neucrack <CZD666666@gmail.com>
Date: Sat, 13 Oct 2018 18:56:22 +0800
Subject: [PATCH 3118/3533] add fs and py persistent code load support

---
 ports/gprs_a9/Makefile         |   3 +-
 ports/gprs_a9/file_io.c        | 301 +++++++++++++++++++++++++++++++++
 ports/gprs_a9/main.c           |  31 ++--
 ports/gprs_a9/modules/_boot.py |   1 +
 ports/gprs_a9/moduos.c         |  17 +-
 ports/gprs_a9/mpconfigport.h   |   9 +-
 6 files changed, 332 insertions(+), 30 deletions(-)
 create mode 100644 ports/gprs_a9/file_io.c
 create mode 100644 ports/gprs_a9/modules/_boot.py

diff --git a/ports/gprs_a9/Makefile b/ports/gprs_a9/Makefile
index 77585456d0ab8..de2b12b8085d3 100644
--- a/ports/gprs_a9/Makefile
+++ b/ports/gprs_a9/Makefile
@@ -118,7 +118,8 @@ SRC_C = \
 	modutime.c \
 	rng.c \
 	fatfs_port.c \
-	modchip.c 
+	modchip.c \
+	file_io.c 
 
 
 LIB_SRC_C = $(addprefix lib/,\
diff --git a/ports/gprs_a9/file_io.c b/ports/gprs_a9/file_io.c
new file mode 100644
index 0000000000000..10d8657989148
--- /dev/null
+++ b/ports/gprs_a9/file_io.c
@@ -0,0 +1,301 @@
+
+
+
+#include <string.h>
+
+
+#include "py/objstr.h"
+#include "py/runtime.h"
+#include "py/mperrno.h"
+#include "py/mphal.h"
+#include "extmod/misc.h"
+#include "extmod/vfs.h"
+#include "extmod/vfs_fat.h"
+#include "genhdr/mpversion.h"
+#include "py/stream.h"
+
+#include "api_fs.h"
+#if !MICROPY_VFS
+
+
+
+typedef struct _pyb_file_obj_t {
+    mp_obj_base_t base;
+    int fd;
+} pyb_file_obj_t;
+
+STATIC void file_obj_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+    (void)kind;
+    mp_printf(print, "<io.%s %p>", mp_obj_get_type_str(self_in), MP_OBJ_TO_PTR(self_in));
+}
+
+
+STATIC mp_uint_t file_obj_read(mp_obj_t self_in, void *buf, mp_uint_t size, int *errcode) {
+    pyb_file_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    int32_t ret = API_FS_Read(self->fd,buf, size);
+    if(ret < 0)
+    {
+        *errcode = MP_EIO;
+        return MP_STREAM_ERROR;
+    }
+    return (mp_uint_t)ret;
+}
+STATIC mp_uint_t file_obj_write(mp_obj_t self_in, const void *buf, mp_uint_t size, int *errcode) {
+    pyb_file_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    int32_t ret = API_FS_Write(self->fd, (uint8_t*)buf, size);
+    if(ret < 0)
+    {
+        *errcode = MP_EIO;
+        return MP_STREAM_ERROR;
+    }
+    if (ret != size) {
+        // The FatFS documentation says that this means disk full.
+        *errcode = MP_ENOSPC;
+        return MP_STREAM_ERROR;
+    }
+    return (mp_uint_t)ret;
+}
+
+STATIC mp_uint_t file_obj_ioctl(mp_obj_t o_in, mp_uint_t request, uintptr_t arg, int *errcode) {
+    pyb_file_obj_t *self = MP_OBJ_TO_PTR(o_in);
+    
+
+    if (request == MP_STREAM_SEEK) {
+        struct mp_stream_seek_t *s = (struct mp_stream_seek_t*)(uintptr_t)arg;
+        int64_t ret = 0;
+
+        switch (s->whence) {
+            case 0: // SEEK_SET
+                ret = API_FS_Seek(self->fd,s->offset,FS_SEEK_SET);
+                break;
+
+            case 1: // SEEK_CUR
+                ret = API_FS_Seek(self->fd,s->offset,FS_SEEK_CUR);
+                break;
+
+            case 2: // SEEK_END
+                ret = API_FS_Seek(self->fd,s->offset,FS_SEEK_END);
+                break;
+        }
+
+        s->offset = ret;
+        return 0;
+
+    } else if (request == MP_STREAM_FLUSH) {
+        uint32_t ret = API_FS_Flush(self->fd);
+        if (ret != 0) {
+            *errcode = MP_EIO;
+            return MP_STREAM_ERROR;
+        }
+        return 0;
+
+    } else if (request == MP_STREAM_CLOSE) {
+        // if fs==NULL then the file is closed and in that case this method is a no-op
+        if (self->fd > 0) {
+            int32_t ret = API_FS_Close(self->fd);
+            if (ret != 0) {
+                *errcode = MP_EIO;
+                return MP_STREAM_ERROR;
+            }
+        }
+        return 0;
+
+    } else {
+        *errcode = MP_EINVAL;
+        return MP_STREAM_ERROR;
+    }
+    return MP_STREAM_ERROR;
+}
+
+
+// Note: encoding is ignored for now; it's also not a valid kwarg for CPython's FileIO,
+// but by adding it here we can use one single mp_arg_t array for open() and FileIO's constructor
+STATIC const mp_arg_t file_open_args[] = {
+    { MP_QSTR_file, MP_ARG_OBJ | MP_ARG_REQUIRED, {.u_rom_obj = MP_ROM_PTR(&mp_const_none_obj)} },
+    { MP_QSTR_mode, MP_ARG_OBJ, {.u_obj = MP_OBJ_NEW_QSTR(MP_QSTR_r)} },
+    { MP_QSTR_encoding, MP_ARG_OBJ | MP_ARG_KW_ONLY, {.u_rom_obj = MP_ROM_PTR(&mp_const_none_obj)} },
+};
+#define FILE_OPEN_NUM_ARGS MP_ARRAY_SIZE(file_open_args)
+
+STATIC mp_obj_t file_open(const char* file_name, const mp_obj_type_t *type, mp_arg_val_t *args) {
+    const char *mode_s = mp_obj_str_get_str(args[1].u_obj);
+    uint32_t mode = 0;
+    // TODO make sure only one of r, w, x, a, and b, t are specified
+    while (*mode_s) {
+        switch (*mode_s++) {
+            case 'r':
+                mode |= FS_O_RDONLY;
+                break;
+            case 'w':
+                mode |= FS_O_RDWR | FS_O_CREAT;
+                break;
+            case 'x':
+                mode |= FS_O_RDWR | FS_O_CREAT | FS_O_TRUNC;
+                break;
+            case 'a':
+                mode |= FS_O_RDWR | FS_O_APPEND;
+                break;
+            case '+':
+                mode |= FS_O_RDWR;
+                break;
+            #if MICROPY_PY_IO_FILEIO
+            case 'b':
+                type = &mp_type_vfs_fat_fileio;
+                break;
+            #endif
+            case 't':
+                type = &mp_type_vfs_fat_textio;
+                break;
+        }
+    }
+    pyb_file_obj_t *o = m_new_obj_with_finaliser(pyb_file_obj_t);
+    o->base.type = type;
+
+    int32_t fd = API_FS_Open(file_name,mode,0);
+    if(fd <= 0)
+        mp_raise_OSError(MP_EIO);
+    o->fd = fd;
+    
+    return MP_OBJ_FROM_PTR(o);
+}
+
+STATIC mp_obj_t file_obj_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
+    mp_arg_val_t arg_vals[FILE_OPEN_NUM_ARGS];
+    mp_arg_parse_all_kw_array(n_args, n_kw, args, FILE_OPEN_NUM_ARGS, file_open_args, arg_vals);
+    return file_open(NULL, type, arg_vals);
+}
+
+STATIC const mp_rom_map_elem_t rawfile_locals_dict_table[] = {
+    { MP_ROM_QSTR(MP_QSTR_read), MP_ROM_PTR(&mp_stream_read_obj) },
+    // { MP_ROM_QSTR(MP_QSTR_readinto), MP_ROM_PTR(&mp_stream_readinto_obj) },
+    // { MP_ROM_QSTR(MP_QSTR_readline), MP_ROM_PTR(&mp_stream_unbuffered_readline_obj) },
+    // { MP_ROM_QSTR(MP_QSTR_readlines), MP_ROM_PTR(&mp_stream_unbuffered_readlines_obj) },
+    { MP_ROM_QSTR(MP_QSTR_write), MP_ROM_PTR(&mp_stream_write_obj) },
+    { MP_ROM_QSTR(MP_QSTR_flush), MP_ROM_PTR(&mp_stream_flush_obj) },
+    { MP_ROM_QSTR(MP_QSTR_close), MP_ROM_PTR(&mp_stream_close_obj) },
+    { MP_ROM_QSTR(MP_QSTR_seek), MP_ROM_PTR(&mp_stream_seek_obj) },
+    // { MP_ROM_QSTR(MP_QSTR_tell), MP_ROM_PTR(&mp_stream_tell_obj) },
+    // { MP_ROM_QSTR(MP_QSTR___del__), MP_ROM_PTR(&mp_stream_close_obj) },
+    // { MP_ROM_QSTR(MP_QSTR___enter__), MP_ROM_PTR(&mp_identity_obj) },
+    // { MP_ROM_QSTR(MP_QSTR___exit__), MP_ROM_PTR(&file_obj___exit___obj) },
+};
+STATIC MP_DEFINE_CONST_DICT(rawfile_locals_dict, rawfile_locals_dict_table);
+
+STATIC const mp_stream_p_t fileio_stream_p = {
+    .read = file_obj_read,
+    .write = file_obj_write,
+    .ioctl = file_obj_ioctl,
+};
+
+const mp_obj_type_t mp_type_vfs_fat_fileio = {
+    { &mp_type_type },
+    .name = MP_QSTR_FileIO,
+    .print = file_obj_print,
+    .make_new = file_obj_make_new,
+    .getiter = mp_identity_getiter,
+    .iternext = mp_stream_unbuffered_iter,
+    .protocol = &fileio_stream_p,
+    .locals_dict = (mp_obj_dict_t*)&rawfile_locals_dict,
+};
+
+STATIC const mp_stream_p_t textio_stream_p = {
+    .read = file_obj_read,
+    .write = file_obj_write,
+    .ioctl = file_obj_ioctl,
+    .is_text = true,
+};
+
+const mp_obj_type_t mp_type_vfs_fat_textio = {
+    { &mp_type_type },
+    .name = MP_QSTR_TextIOWrapper,
+    .print = file_obj_print,
+    .make_new = file_obj_make_new,
+    .getiter = mp_identity_getiter,
+    .iternext = mp_stream_unbuffered_iter,
+    .protocol = &textio_stream_p,
+    .locals_dict = (mp_obj_dict_t*)&rawfile_locals_dict,
+};
+
+// Note: buffering and encoding args are currently ignored
+mp_obj_t mp_builtin_open(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    enum { ARG_file, ARG_mode, ARG_encoding };
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_file, MP_ARG_OBJ | MP_ARG_REQUIRED, {.u_rom_obj = MP_ROM_PTR(&mp_const_none_obj)} },
+        { MP_QSTR_mode, MP_ARG_OBJ, {.u_rom_obj = MP_ROM_QSTR(MP_QSTR_r)} },
+        { MP_QSTR_buffering, MP_ARG_INT, {.u_int = -1} },
+        { MP_QSTR_encoding, MP_ARG_OBJ, {.u_rom_obj = MP_ROM_PTR(&mp_const_none_obj)} },
+    };
+
+    // parse args
+    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
+    mp_arg_parse_all(n_args, pos_args, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
+    const char* fileName = mp_obj_str_get_str(args[ARG_file].u_obj);    
+    const mp_obj_type_t*  type = &mp_type_vfs_fat_textio;
+    return file_open(fileName,type,args);
+}
+
+MP_DEFINE_CONST_FUN_OBJ_KW(mp_builtin_open_obj, 1, mp_builtin_open);
+
+
+typedef struct _mp_reader_vfs_t {
+    mp_obj_t file;
+    uint16_t len;
+    uint16_t pos;
+    byte buf[24];
+} mp_reader_vfs_t;
+
+STATIC mp_uint_t mp_reader_vfs_readbyte(void *data) {
+    mp_reader_vfs_t *reader = (mp_reader_vfs_t*)data;
+    if (reader->pos >= reader->len) {
+        if (reader->len < sizeof(reader->buf)) {
+            return MP_READER_EOF;
+        } else {
+            int errcode;
+            reader->len = mp_stream_rw(reader->file, reader->buf, sizeof(reader->buf),
+                &errcode, MP_STREAM_RW_READ | MP_STREAM_RW_ONCE);
+            if (errcode != 0) {
+                // TODO handle errors properly
+                return MP_READER_EOF;
+            }
+            if (reader->len == 0) {
+                return MP_READER_EOF;
+            }
+            reader->pos = 0;
+        }
+    }
+    return reader->buf[reader->pos++];
+}
+
+STATIC void mp_reader_vfs_close(void *data) {
+    mp_reader_vfs_t *reader = (mp_reader_vfs_t*)data;
+    mp_stream_close(reader->file);
+    m_del_obj(mp_reader_vfs_t, reader);
+}
+
+void mp_reader_new_file(mp_reader_t *reader, const char *filename) {
+    mp_reader_vfs_t *rf = m_new_obj(mp_reader_vfs_t);
+    mp_obj_t arg = mp_obj_new_str(filename, strlen(filename));
+    rf->file = mp_builtin_open(1, &arg, (mp_map_t*)&mp_const_empty_map);
+    int errcode;
+    rf->len = mp_stream_rw(rf->file, rf->buf, sizeof(rf->buf), &errcode, MP_STREAM_RW_READ | MP_STREAM_RW_ONCE);
+    if (errcode != 0) {
+        mp_raise_OSError(errcode);
+    }
+    rf->pos = 0;
+    reader->data = rf;
+    reader->readbyte = mp_reader_vfs_readbyte;
+    reader->close = mp_reader_vfs_close;
+}
+
+mp_lexer_t *mp_lexer_new_from_file(const char *filename) {
+    mp_reader_t reader;
+    mp_reader_new_file(&reader, filename);
+    return mp_lexer_new(qstr_from_str(filename), reader);
+}
+
+mp_import_stat_t mp_import_stat(const char *path) {
+    (void)path;
+    return MP_IMPORT_STAT_NO_EXIST;
+}
+
+#endif //#if !MICROPY_VFS
diff --git a/ports/gprs_a9/main.c b/ports/gprs_a9/main.c
index cd1324774da47..37710aea44faf 100644
--- a/ports/gprs_a9/main.c
+++ b/ports/gprs_a9/main.c
@@ -21,6 +21,7 @@
 #include "buffer.h"
 #include "api_network.h"
 #include "time.h"
+#include "api_fs.h"
 
 #include "mphalport.h"
 #include "mpconfigport.h"
@@ -81,18 +82,6 @@ void gc_collect(void) {
     gc_dump_info();
 }
 
-// mp_lexer_t *mp_lexer_new_from_file(const char *filename) {
-//     mp_raise_OSError(MP_ENOENT);
-// }
-
-// mp_import_stat_t mp_import_stat(const char *path) {
-//     return MP_IMPORT_STAT_NO_EXIST;
-// }
-
-// mp_obj_t mp_builtin_open(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs) {
-//     return mp_const_none;
-// }
-// MP_DEFINE_CONST_FUN_OBJ_KW(mp_builtin_open_obj, 1, mp_builtin_open);
 
 void nlr_jump_fail(void *val) {
     Assert(false,"nlr_jump_fail");
@@ -171,6 +160,24 @@ void MicroPyTask(void *pData)
     UartInit();
     mp_Init();
 
+    pyexec_frozen_module("_boot.py");
+    int fd = API_FS_Open("/boot.py",FS_O_RDONLY,0);
+    if(fd > 0)
+    {
+        API_FS_Close(fd);
+        pyexec_file("/boot.py");
+    }
+    else
+    {
+        fd = API_FS_Open("/t/boot.py",FS_O_RDONLY,0);
+        if(fd > 0)
+        {
+            API_FS_Close(fd);
+            pyexec_file("/t/boot.py");
+        }
+    }
+    
+
     while(1)
     {
         if(OS_WaitEvent(microPyTaskHandle, (void**)&event, OS_TIME_OUT_WAIT_FOREVER))
diff --git a/ports/gprs_a9/modules/_boot.py b/ports/gprs_a9/modules/_boot.py
new file mode 100644
index 0000000000000..8b137891791fe
--- /dev/null
+++ b/ports/gprs_a9/modules/_boot.py
@@ -0,0 +1 @@
+
diff --git a/ports/gprs_a9/moduos.c b/ports/gprs_a9/moduos.c
index e3ab726808932..9df451dfc3966 100644
--- a/ports/gprs_a9/moduos.c
+++ b/ports/gprs_a9/moduos.c
@@ -89,20 +89,9 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(os_urandom_obj, os_urandom);
 //////////////// fs ////////////////////////////////////////////////////
 
 #if !MICROPY_VFS
-mp_lexer_t *mp_lexer_new_from_file(const char *filename) {
-    mp_raise_OSError(MP_ENOENT);
-}
 
-mp_import_stat_t mp_import_stat(const char *path) {
-    (void)path;
-    return MP_IMPORT_STAT_NO_EXIST;
-}
 
-mp_obj_t mp_builtin_open(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs) {
-    return mp_const_none;
-}
-MP_DEFINE_CONST_FUN_OBJ_KW(mp_builtin_open_obj, 1, mp_builtin_open);
-#include "api_debug.h"
+
 mp_obj_t mp_vfs_listdir(size_t n_args, const mp_obj_t *args) {
     mp_obj_t dir_list = mp_obj_new_list(0, NULL);
     char* tmp = (char*)malloc(200);
@@ -117,14 +106,14 @@ mp_obj_t mp_vfs_listdir(size_t n_args, const mp_obj_t *args) {
     }
     char* dirToList = "/";
     if(n_args != 0 )
-        dirToList = mp_obj_str_get_str(args[0]);
+        dirToList = (char*)mp_obj_str_get_str(args[0]);
     else
     {
         dirToList = tmp;
     }
     Dir_t* dir = API_FS_OpenDir((const char*)dirToList);
     Dirent_t* dirent = NULL;
-    while(dirent = API_FS_ReadDir(dir))
+    while( (dirent = API_FS_ReadDir(dir)) )
     {
         // Trace(1,"dir name:%s",dirent->d_name);
         mp_obj_t dirStr = mp_obj_new_str(dirent->d_name,strlen(dirent->d_name));
diff --git a/ports/gprs_a9/mpconfigport.h b/ports/gprs_a9/mpconfigport.h
index 26ff1bcad9cdd..64bb045a240dd 100644
--- a/ports/gprs_a9/mpconfigport.h
+++ b/ports/gprs_a9/mpconfigport.h
@@ -18,8 +18,6 @@
 // memory allocation policies
 #define MICROPY_ALLOC_PATH_MAX      (256)
 
-// emitters
-// #define MICROPY_PERSISTENT_CODE_LOAD        (1)
 
 // compiler configuration
 #define MICROPY_COMP_MODULE_CONST           (1)
@@ -112,7 +110,7 @@
 #define MICROPY_PY_GC                       (0)
 #define MICROPY_PY_IO                       (1)
 #define MICROPY_PY_IO_IOBASE                (1)
-#define MICROPY_PY_IO_FILEIO                (0)
+#define MICROPY_PY_IO_FILEIO                (1)
 #define MICROPY_PY_IO_BYTESIO               (1)
 #define MICROPY_PY_IO_BUFFEREDWRITER        (1)
 #define MICROPY_PY_STRUCT                   (1)
@@ -186,6 +184,11 @@
 #define mp_builtin_open_obj mp_vfs_open_obj
 #endif
 
+// emitters
+#define MICROPY_PERSISTENT_CODE_LOAD        (1)
+
+
+
 // extra built in names to add to the global namespace
 #define MICROPY_PORT_BUILTINS \
     { MP_OBJ_NEW_QSTR(MP_QSTR_input), (mp_obj_t)&mp_builtin_input_obj }, \

From 996d7be980d50ca2f1c2b67d0482d2242d720011 Mon Sep 17 00:00:00 2001
From: Neucrack <CZD666666@gmail.com>
Date: Sat, 13 Oct 2018 19:00:31 +0800
Subject: [PATCH 3119/3533] update lib

---
 lib/GPRS_C_SDK | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/GPRS_C_SDK b/lib/GPRS_C_SDK
index 302b7caab7f91..429ad804592bf 160000
--- a/lib/GPRS_C_SDK
+++ b/lib/GPRS_C_SDK
@@ -1 +1 @@
-Subproject commit 302b7caab7f9118382b109b802051e74153325af
+Subproject commit 429ad804592bf2c5f86f622119bc3f06059d22e2

From dd250320dea45970c1b7c06d692179be6e832fe7 Mon Sep 17 00:00:00 2001
From: Neucrack <CZD666666@gmail.com>
Date: Tue, 16 Oct 2018 14:38:22 +0800
Subject: [PATCH 3120/3533] add py file import support

---
 ports/gprs_a9/file_io.c | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/ports/gprs_a9/file_io.c b/ports/gprs_a9/file_io.c
index 10d8657989148..52adbca0a047b 100644
--- a/ports/gprs_a9/file_io.c
+++ b/ports/gprs_a9/file_io.c
@@ -294,7 +294,21 @@ mp_lexer_t *mp_lexer_new_from_file(const char *filename) {
 }
 
 mp_import_stat_t mp_import_stat(const char *path) {
-    (void)path;
+    uint8_t flag = 0;
+    char* path0 = (char*)malloc(200);
+    memset(path0,0,sizeof(path0));
+    API_FS_RealPath(path,path0);
+    int32_t fd = API_FS_Open(path0,FS_O_RDONLY,0);
+    if(fd>0)
+    {
+        API_FS_Close(fd);
+        return MP_IMPORT_STAT_FILE;
+    }
+    Dir_t* dir = API_FS_OpenDir(path0);
+    if(dir != NULL)
+    {
+        return MP_IMPORT_STAT_DIR;
+    }
     return MP_IMPORT_STAT_NO_EXIST;
 }
 

From b0b8cb19ba63f3e2d7b810f406c204b15e832132 Mon Sep 17 00:00:00 2001
From: Neucrack <CZD666666@gmail.com>
Date: Thu, 18 Oct 2018 10:45:26 +0800
Subject: [PATCH 3121/3533] optimize fs api

---
 ports/gprs_a9/file_io.c |  6 ++++--
 ports/gprs_a9/moduos.c  | 12 +++++++++++-
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/ports/gprs_a9/file_io.c b/ports/gprs_a9/file_io.c
index 52adbca0a047b..08632b5d4da53 100644
--- a/ports/gprs_a9/file_io.c
+++ b/ports/gprs_a9/file_io.c
@@ -295,16 +295,18 @@ mp_lexer_t *mp_lexer_new_from_file(const char *filename) {
 
 mp_import_stat_t mp_import_stat(const char *path) {
     uint8_t flag = 0;
-    char* path0 = (char*)malloc(200);
-    memset(path0,0,sizeof(path0));
+    char* path0 = (char*)malloc(160);
+    memset(path0,0,160);
     API_FS_RealPath(path,path0);
     int32_t fd = API_FS_Open(path0,FS_O_RDONLY,0);
     if(fd>0)
     {
         API_FS_Close(fd);
+        free(path0);
         return MP_IMPORT_STAT_FILE;
     }
     Dir_t* dir = API_FS_OpenDir(path0);
+    free(path0);
     if(dir != NULL)
     {
         return MP_IMPORT_STAT_DIR;
diff --git a/ports/gprs_a9/moduos.c b/ports/gprs_a9/moduos.c
index 9df451dfc3966..56d2c1d7bde6b 100644
--- a/ports/gprs_a9/moduos.c
+++ b/ports/gprs_a9/moduos.c
@@ -169,7 +169,11 @@ mp_obj_t mp_vfs_rmdir(mp_obj_t path_in) {
     {
         mp_raise_OSError(MP_EINVAL);
     }
-    int32_t ret = API_FS_Rmdir(path);
+    char* path0 = (char*)malloc(160);
+    memset(path0,0,160);
+    API_FS_RealPath(path,path0);
+    int32_t ret = API_FS_Rmdir(path0);
+    free(path0);
     if(ret != 0)
         mp_raise_OSError(MP_EIO);
     return mp_const_none;
@@ -179,6 +183,12 @@ MP_DEFINE_CONST_FUN_OBJ_1(mp_vfs_rmdir_obj, mp_vfs_rmdir);
 
 mp_obj_t mp_vfs_chdir(mp_obj_t path_in) {
     const char* path = mp_obj_str_get_str(path_in);
+    Dir_t* dir = API_FS_OpenDir(path);
+    if(dir == NULL)
+    {
+        mp_raise_OSError(MP_EIO);
+    }
+    API_FS_CloseDir(dir);
     int32_t ret = API_FS_ChangeDir(path);
     if(ret != 0)
         mp_raise_OSError(MP_EIO);

From b643743e7cd7914af9805c573a989804e72ba79e Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sat, 26 Jan 2019 21:15:09 +0100
Subject: [PATCH 3122/3533] Added execution bit

---
 ports/gprs_a9/build.sh | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 ports/gprs_a9/build.sh

diff --git a/ports/gprs_a9/build.sh b/ports/gprs_a9/build.sh
old mode 100644
new mode 100755

From 4a9798600e0483cd5abb0f14651145f2255b3192 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sun, 27 Jan 2019 22:26:21 +0100
Subject: [PATCH 3123/3533] Implement: gps on and off, gps firmware, imei

---
 ports/gprs_a9/Makefile       |  8 +++--
 ports/gprs_a9/main.c         |  5 +++
 ports/gprs_a9/modcellular.c  | 27 ++++++++++++++++
 ports/gprs_a9/modgps.c       | 61 ++++++++++++++++++++++++++++++++++++
 ports/gprs_a9/modgps.h       |  2 ++
 ports/gprs_a9/mpconfigport.h |  5 ++-
 ports/gprs_a9/qstrdefsport.h |  1 +
 7 files changed, 106 insertions(+), 3 deletions(-)
 create mode 100644 ports/gprs_a9/modcellular.c
 create mode 100644 ports/gprs_a9/modgps.c
 create mode 100644 ports/gprs_a9/modgps.h

diff --git a/ports/gprs_a9/Makefile b/ports/gprs_a9/Makefile
index de2b12b8085d3..7bde7e2b422b6 100644
--- a/ports/gprs_a9/Makefile
+++ b/ports/gprs_a9/Makefile
@@ -88,7 +88,9 @@ INC += -I$(BUILD_PATH_ABS)
 INC += -I${CSDK_PATH}/include \
        -I${CSDK_PATH}/include/std_inc \
 	   -I${CSDK_PATH}/include/api_inc \
-	   -I${CSDK_PATH}/libs/utils/include 
+	   -I${CSDK_PATH}/libs/utils/include \
+	   -I${CSDK_PATH}/libs/gps/include \
+	   -I${CSDK_PATH}/libs/gps/minmea/src 
 
 CFLAGS = $(INC) -Wshadow \
 		  -std=gnu99 \
@@ -119,7 +121,9 @@ SRC_C = \
 	rng.c \
 	fatfs_port.c \
 	modchip.c \
-	file_io.c 
+	file_io.c \
+	modcellular.c \
+	modgps.c
 
 
 LIB_SRC_C = $(addprefix lib/,\
diff --git a/ports/gprs_a9/main.c b/ports/gprs_a9/main.c
index 37710aea44faf..18a24101c4c1b 100644
--- a/ports/gprs_a9/main.c
+++ b/ports/gprs_a9/main.c
@@ -22,6 +22,7 @@
 #include "api_network.h"
 #include "time.h"
 #include "api_fs.h"
+#include "api_gps.h"
 
 #include "mphalport.h"
 #include "mpconfigport.h"
@@ -266,6 +267,10 @@ void EventDispatch(API_Event_t* pEvent)
                 OS_SendEvent(microPyTaskHandle,(void*)event,OS_TIME_OUT_WAIT_FOREVER,0);
             }
             break;
+        case API_EVENT_ID_GPS_UART_RECEIVED:
+            Trace(2, "received GPS data, length: %d, data:%s", pEvent->param1, pEvent->pParam1);
+            GPS_Update(pEvent->pParam1,pEvent->param1);
+            break;
         default:
             break;
     }
diff --git a/ports/gprs_a9/modcellular.c b/ports/gprs_a9/modcellular.c
new file mode 100644
index 0000000000000..e9464b80e41f8
--- /dev/null
+++ b/ports/gprs_a9/modcellular.c
@@ -0,0 +1,27 @@
+#include "py/nlr.h"
+#include "py/obj.h"
+#include "py/runtime.h"
+#include "py/binary.h"
+
+#include "api_info.h"
+
+STATIC mp_obj_t get_imei(void) {
+    uint8_t imei[16];
+    memset(imei,0,sizeof(imei));
+    INFO_GetIMEI(imei);
+    return mp_obj_new_str(imei, strlen(imei));
+}
+
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(get_imei_obj, get_imei);
+
+STATIC const mp_map_elem_t mp_module_cellular_globals_table[] = {
+    { MP_OBJ_NEW_QSTR(MP_QSTR___name__), MP_OBJ_NEW_QSTR(MP_QSTR_cellular) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_get_imei), (mp_obj_t)&get_imei_obj },
+};
+
+STATIC MP_DEFINE_CONST_DICT(mp_module_cellular_globals, mp_module_cellular_globals_table);
+
+const mp_obj_module_t cellular_module = {
+    .base = { &mp_type_module },
+    .globals = (mp_obj_dict_t*)&mp_module_cellular_globals,
+};
diff --git a/ports/gprs_a9/modgps.c b/ports/gprs_a9/modgps.c
new file mode 100644
index 0000000000000..1fd7522cea192
--- /dev/null
+++ b/ports/gprs_a9/modgps.c
@@ -0,0 +1,61 @@
+#include "py/nlr.h"
+#include "py/obj.h"
+#include "py/runtime.h"
+#include "py/binary.h"
+
+#include "api_gps.h"
+#include "api_os.h"
+#include "gps_parse.h"
+
+#include "modgps.h"
+#include "gps.h"
+
+STATIC mp_obj_t on(void) {
+    GPS_Init();
+    GPS_Open(NULL);
+    GPS_Info_t* gpsInfo = Gps_GetInfo();
+    uint8_t attempts = 0;
+    while (gpsInfo->rmc.latitude.value == 0) {
+        attempts ++;
+        if (attempts == MAX_GPS_POLL_ATTEMPTS) {
+            mp_raise_ValueError("Failed to start GPS");
+            return mp_const_none;
+        }
+        OS_Sleep(1000);
+    }
+    return mp_const_none;
+}
+
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(on_obj, on);
+
+STATIC mp_obj_t off(void) {
+    GPS_Close();
+    return mp_const_none;
+}
+
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(off_obj, off);
+
+STATIC mp_obj_t get_firmware_version(void) {
+    char buffer[300];
+    if (!GPS_GetVersion(buffer,150)) {
+        mp_raise_ValueError("Failed to get the firmware version: did you run gps.on()?");
+        return mp_const_none;
+    }
+    return mp_obj_new_str(buffer, strlen(buffer));
+}
+
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(get_firmware_version_obj, get_firmware_version);
+
+STATIC const mp_map_elem_t mp_module_gps_globals_table[] = {
+    { MP_OBJ_NEW_QSTR(MP_QSTR___name__), MP_OBJ_NEW_QSTR(MP_QSTR_gps) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_on), (mp_obj_t)&on_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_off), (mp_obj_t)&off_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_get_firmware_version), (mp_obj_t)&get_firmware_version_obj },
+};
+
+STATIC MP_DEFINE_CONST_DICT(mp_module_gps_globals, mp_module_gps_globals_table);
+
+const mp_obj_module_t gps_module = {
+    .base = { &mp_type_module },
+    .globals = (mp_obj_dict_t*)&mp_module_gps_globals,
+};
diff --git a/ports/gprs_a9/modgps.h b/ports/gprs_a9/modgps.h
new file mode 100644
index 0000000000000..146a0dfa1611f
--- /dev/null
+++ b/ports/gprs_a9/modgps.h
@@ -0,0 +1,2 @@
+#define MAX_GPS_POLL_ATTEMPTS 10
+
diff --git a/ports/gprs_a9/mpconfigport.h b/ports/gprs_a9/mpconfigport.h
index 64bb045a240dd..a203087400111 100644
--- a/ports/gprs_a9/mpconfigport.h
+++ b/ports/gprs_a9/mpconfigport.h
@@ -199,13 +199,16 @@ extern const struct _mp_obj_module_t mp_module_machine;
 extern const struct _mp_obj_module_t uos_module;
 extern const struct _mp_obj_module_t utime_module;
 extern const struct _mp_obj_module_t chip_module;
+extern const struct _mp_obj_module_t cellular_module;
+extern const struct _mp_obj_module_t gps_module;
 
 #define MICROPY_PORT_BUILTIN_MODULES \
     { MP_OBJ_NEW_QSTR(MP_QSTR_machine), (mp_obj_t)&mp_module_machine }, \
     { MP_OBJ_NEW_QSTR(MP_QSTR_uos), (mp_obj_t)&uos_module }, \
     { MP_OBJ_NEW_QSTR(MP_QSTR_utime), (mp_obj_t)&utime_module }, \
     { MP_OBJ_NEW_QSTR(MP_QSTR_chip), (mp_obj_t)&chip_module }, \
-
+    { MP_OBJ_NEW_QSTR(MP_QSTR_cellular), (mp_obj_t)&cellular_module }, \
+    { MP_OBJ_NEW_QSTR(MP_QSTR_gps), (mp_obj_t)&gps_module }, \
 
 #define MICROPY_PORT_BUILTIN_MODULE_WEAK_LINKS \
     { MP_OBJ_NEW_QSTR(MP_QSTR_binascii), (mp_obj_t)&mp_module_ubinascii }, \
diff --git a/ports/gprs_a9/qstrdefsport.h b/ports/gprs_a9/qstrdefsport.h
index 3ba897069bf73..9c35a4f964ee0 100644
--- a/ports/gprs_a9/qstrdefsport.h
+++ b/ports/gprs_a9/qstrdefsport.h
@@ -1 +1,2 @@
 // qstrs specific to this port
+Q(hello)

From f94f007d42336a346850d6440486c0a2b58889d5 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Mon, 28 Jan 2019 19:52:23 +0100
Subject: [PATCH 3124/3533] Add some API reference

---
 ports/gprs_a9/README.md     | 34 +++++++++++++++++++++++++++++++++-
 ports/gprs_a9/modcellular.c |  5 +++++
 ports/gprs_a9/modgps.c      | 16 ++++++++++++++++
 3 files changed, 54 insertions(+), 1 deletion(-)

diff --git a/ports/gprs_a9/README.md b/ports/gprs_a9/README.md
index 27a4cbfacb774..03bb28ba62510 100644
--- a/ports/gprs_a9/README.md
+++ b/ports/gprs_a9/README.md
@@ -13,5 +13,37 @@ chmod +x build.sh
 ./build.sh
 ```
 
-and the  final lod file in the `hex` folder
+and burn the final lod file in the `hex` folder.
+
+## Platform-specific modules
+
+### `cellular`
+
+Provides cellular functionality.
+
+* `get_imei()`
+
+Retrieves IMEI number.
+
+*Returns*: a string with IMEI number.
+
+### `gps`
+
+Provides GPS functionality
+
+* `on()`
+
+Turns GPS on. Blocks until the GPS module responds.
+
+*Raises*: `ValueError` if the GPS module does not respond within 10 seconds.
+
+* `off()`
+
+Turns GPS off.
+
+* `get_firmware_version()`
+
+Retrieves the firmware version.
+
+*Raises*: `ValueError` if the GPS module fails to respond.
 
diff --git a/ports/gprs_a9/modcellular.c b/ports/gprs_a9/modcellular.c
index e9464b80e41f8..1550fa08d2c59 100644
--- a/ports/gprs_a9/modcellular.c
+++ b/ports/gprs_a9/modcellular.c
@@ -6,6 +6,11 @@
 #include "api_info.h"
 
 STATIC mp_obj_t get_imei(void) {
+    // ========================================
+    // Retrieves IMEI number.
+    // Returns:
+    //     IMEI number as a string.
+    // ========================================
     uint8_t imei[16];
     memset(imei,0,sizeof(imei));
     INFO_GetIMEI(imei);
diff --git a/ports/gprs_a9/modgps.c b/ports/gprs_a9/modgps.c
index 1fd7522cea192..736707971b650 100644
--- a/ports/gprs_a9/modgps.c
+++ b/ports/gprs_a9/modgps.c
@@ -10,7 +10,13 @@
 #include "modgps.h"
 #include "gps.h"
 
+
 STATIC mp_obj_t on(void) {
+    // ========================================
+    // Turns GPS on.
+    // Raises:
+    //     ValueError if failed to turn GPS on.
+    // ========================================
     GPS_Init();
     GPS_Open(NULL);
     GPS_Info_t* gpsInfo = Gps_GetInfo();
@@ -29,6 +35,9 @@ STATIC mp_obj_t on(void) {
 STATIC MP_DEFINE_CONST_FUN_OBJ_0(on_obj, on);
 
 STATIC mp_obj_t off(void) {
+    // ========================================
+    // Turns GPS off.
+    // ========================================
     GPS_Close();
     return mp_const_none;
 }
@@ -36,6 +45,13 @@ STATIC mp_obj_t off(void) {
 STATIC MP_DEFINE_CONST_FUN_OBJ_0(off_obj, off);
 
 STATIC mp_obj_t get_firmware_version(void) {
+    // ========================================
+    // Retrieves firmware version.
+    // Returns:
+    //     The firmware version as a string.
+    // Raises:
+    //     ValueError if GPS was off.
+    // ========================================
     char buffer[300];
     if (!GPS_GetVersion(buffer,150)) {
         mp_raise_ValueError("Failed to get the firmware version: did you run gps.on()?");

From 1547b634ba19f03f0f49d7aebc5f3b3b0d5dae8d Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Mon, 28 Jan 2019 19:55:29 +0100
Subject: [PATCH 3125/3533] Adjust API description

---
 ports/gprs_a9/README.md | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/ports/gprs_a9/README.md b/ports/gprs_a9/README.md
index 03bb28ba62510..781793e8082e3 100644
--- a/ports/gprs_a9/README.md
+++ b/ports/gprs_a9/README.md
@@ -22,28 +22,22 @@ and burn the final lod file in the `hex` folder.
 Provides cellular functionality.
 
 * `get_imei()`
-
 Retrieves IMEI number.
-
-*Returns*: a string with IMEI number.
+**Returns**: a string with IMEI number.
 
 ### `gps`
 
-Provides GPS functionality
+Provides the GPS functionality
 
 * `on()`
-
-Turns GPS on. Blocks until the GPS module responds.
-
-*Raises*: `ValueError` if the GPS module does not respond within 10 seconds.
+Turns the GPS on. Blocks until the GPS module responds.
+**Raises**: `ValueError` if the GPS module does not respond within 10 seconds.
 
 * `off()`
-
-Turns GPS off.
+Turns the GPS off.
 
 * `get_firmware_version()`
-
 Retrieves the firmware version.
-
-*Raises*: `ValueError` if the GPS module fails to respond.
+**Returns**: the firmware version as a string.
+**Raises**: `ValueError` if the GPS module fails to respond.
 

From 22208e2cd2edc0c940a7b72141b0c94f2af06a2a Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Mon, 28 Jan 2019 21:04:19 +0100
Subject: [PATCH 3126/3533] Add location function

---
 ports/gprs_a9/README.md |  3 +++
 ports/gprs_a9/modgps.c  | 26 +++++++++++++++++++++++++-
 ports/gprs_a9/modgps.h  |  2 ++
 3 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/ports/gprs_a9/README.md b/ports/gprs_a9/README.md
index 781793e8082e3..e123818a95c4d 100644
--- a/ports/gprs_a9/README.md
+++ b/ports/gprs_a9/README.md
@@ -41,3 +41,6 @@ Retrieves the firmware version.
 **Returns**: the firmware version as a string.
 **Raises**: `ValueError` if the GPS module fails to respond.
 
+* `get_location()`
+Retrieves the current GPS location.
+**Returns**: latitude and longitude in degrees.
diff --git a/ports/gprs_a9/modgps.c b/ports/gprs_a9/modgps.c
index 736707971b650..d337654ee0b77 100644
--- a/ports/gprs_a9/modgps.c
+++ b/ports/gprs_a9/modgps.c
@@ -11,6 +11,8 @@
 #include "gps.h"
 
 
+GPS_Info_t* gpsInfo = NULL;
+
 STATIC mp_obj_t on(void) {
     // ========================================
     // Turns GPS on.
@@ -19,7 +21,7 @@ STATIC mp_obj_t on(void) {
     // ========================================
     GPS_Init();
     GPS_Open(NULL);
-    GPS_Info_t* gpsInfo = Gps_GetInfo();
+    gpsInfo = Gps_GetInfo();
     uint8_t attempts = 0;
     while (gpsInfo->rmc.latitude.value == 0) {
         attempts ++;
@@ -62,11 +64,33 @@ STATIC mp_obj_t get_firmware_version(void) {
 
 STATIC MP_DEFINE_CONST_FUN_OBJ_0(get_firmware_version_obj, get_firmware_version);
 
+STATIC mp_obj_t get_location(void) {
+    // ========================================
+    // Retrieves GPS location.
+    // Returns:
+    //     Location reported by GPS: latitude and longitude (degrees).
+    // ========================================
+    REQUIRES_VALID_GPS_INFO(gpsInfo)
+
+    int temp = (int)(gpsInfo->rmc.latitude.value/gpsInfo->rmc.latitude.scale/100);
+    double latitude = temp+(double)(gpsInfo->rmc.latitude.value - temp*gpsInfo->rmc.latitude.scale*100)/gpsInfo->rmc.latitude.scale/60.0;
+    temp = (int)(gpsInfo->rmc.longitude.value/gpsInfo->rmc.longitude.scale/100);
+    double longitude = temp+(double)(gpsInfo->rmc.longitude.value - temp*gpsInfo->rmc.longitude.scale*100)/gpsInfo->rmc.longitude.scale/60.0;
+    mp_obj_t tuple[2] = {
+        mp_obj_new_float(latitude),
+        mp_obj_new_float(longitude),
+    };
+    return mp_obj_new_tuple(2, tuple);
+}
+
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(get_location_obj, get_location);
+
 STATIC const mp_map_elem_t mp_module_gps_globals_table[] = {
     { MP_OBJ_NEW_QSTR(MP_QSTR___name__), MP_OBJ_NEW_QSTR(MP_QSTR_gps) },
     { MP_OBJ_NEW_QSTR(MP_QSTR_on), (mp_obj_t)&on_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_off), (mp_obj_t)&off_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_get_firmware_version), (mp_obj_t)&get_firmware_version_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_get_location), (mp_obj_t)&get_location_obj },
 };
 
 STATIC MP_DEFINE_CONST_DICT(mp_module_gps_globals, mp_module_gps_globals_table);
diff --git a/ports/gprs_a9/modgps.h b/ports/gprs_a9/modgps.h
index 146a0dfa1611f..db600c109337c 100644
--- a/ports/gprs_a9/modgps.h
+++ b/ports/gprs_a9/modgps.h
@@ -1,2 +1,4 @@
 #define MAX_GPS_POLL_ATTEMPTS 10
 
+#define REQUIRES_VALID_GPS_INFO(info) if (!(info)) {mp_raise_ValueError("No GPS data available: did you run gps.on()?"); return mp_const_none;}
+

From f38685c51eb99aa62a482eca98c7ab3f96acbe1a Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sun, 3 Feb 2019 16:44:46 +0100
Subject: [PATCH 3127/3533] Fix Ctrl-D reset to work with ampy and other UART
 tools

---
 ports/gprs_a9/main.c | 108 +++++++++++++++++++++----------------------
 1 file changed, 52 insertions(+), 56 deletions(-)

diff --git a/ports/gprs_a9/main.c b/ports/gprs_a9/main.c
index 18a24101c4c1b..57225d609349a 100644
--- a/ports/gprs_a9/main.c
+++ b/ports/gprs_a9/main.c
@@ -108,48 +108,44 @@ void ShowStackInfo()
     volatile uint32_t j = 0;
     uint32_t last_bytes = (uint32_t)&j - info.stackTop;
     uint32_t all_bytes  = info.stackSize*4;
-    printf("stack usage:%d/%d", all_bytes-last_bytes,all_bytes);
+    char msg[32];
+    sprintf(msg, "Stack used: %d/%d\r\n", all_bytes - last_bytes, all_bytes);
+    mp_hal_stdout_tx_str(msg);
 }
 
 bool mp_Init()
 {   
     //stack check info
     OS_Task_Info_t info;
-    OS_GetTaskInfo(microPyTaskHandle,&info);
+    OS_GetTaskInfo(microPyTaskHandle, &info);
     mp_stack_ctrl_init();
     mp_stack_set_top((void *)(info.stackTop+info.stackSize*4));
     mp_stack_set_limit(MICROPYTHON_TASK_STACK_SIZE*4 - 1024);
-    printf("mp stack used:%d",mp_stack_usage());
+    ShowStackInfo();
 
-    //mp init
     mp_init();
-    //repl init
+
+    // Startup scripts
+    int file_descriptor;
+    pyexec_frozen_module("_boot.py");
+    if ((file_descriptor = API_FS_Open("boot.py", FS_O_RDONLY, 0)) > 0) {
+        API_FS_Close(file_descriptor);
+        pyexec_file("boot.py");
+    }
+    if (pyexec_mode_kind == PYEXEC_MODE_FRIENDLY_REPL && (file_descriptor = API_FS_Open("main.py", FS_O_RDONLY, 0)) > 0) {
+        API_FS_Close(file_descriptor);
+        pyexec_file("main.py");
+    }
+
     pyexec_event_repl_init();
     return true;
 }
 
 
-void MicroPyEventDispatch(MicroPy_Event_t* pEvent)
-{
-    switch(pEvent->id)
-    {
-        case MICROPY_EVENT_ID_UART_RECEIVED:
-        {
-            uint8_t c;
-            Trace(1,"micropy task received data length:%d",pEvent->param1);
-            for (;;) {
-                if(!Buffer_Gets(&fifoBuffer,&c,1))
-                    break;
-                if (pyexec_event_repl_process_char((int)c)) {
-                    break;
-                }
-            }
-            Trace(1,"REPL complete");
-            break;
-        }
-        default:
-            break;
-    }
+void soft_reset(void) {
+    mp_hal_stdout_tx_str("PYB: soft reboot\r\n");
+    mp_hal_delay_us(10000); // allow UART to flush output
+    mp_Init();
 }
 
 
@@ -157,41 +153,41 @@ void MicroPyTask(void *pData)
 {
     MicroPy_Event_t* event;
 
-    Buffer_Init(&fifoBuffer,fifoBufferData,sizeof(fifoBufferData));
+    Buffer_Init(&fifoBuffer, fifoBufferData, sizeof(fifoBufferData));
     UartInit();
     mp_Init();
-
-    pyexec_frozen_module("_boot.py");
-    int fd = API_FS_Open("/boot.py",FS_O_RDONLY,0);
-    if(fd > 0)
-    {
-        API_FS_Close(fd);
-        pyexec_file("/boot.py");
-    }
-    else
-    {
-        fd = API_FS_Open("/t/boot.py",FS_O_RDONLY,0);
-        if(fd > 0)
-        {
-            API_FS_Close(fd);
-            pyexec_file("/t/boot.py");
-        }
-    }
     
-
-    while(1)
-    {
-        if(OS_WaitEvent(microPyTaskHandle, (void**)&event, OS_TIME_OUT_WAIT_FOREVER))
-        {
-            Trace(1,"microPy task received event:%d",event->id);
-            // PM_SetSysMinFreq(PM_SYS_FREQ_178M);//set back system min frequency to 178M or higher(/lower) value
-            MicroPyEventDispatch(event);
-            OS_Free(event->pParam1);
-            OS_Free(event);
-            // PM_SetSysMinFreq(PM_SYS_FREQ_32K);//release system freq to enter sleep mode to save power,
-                                              //system remain runable but slower, and close eripheral not using
+    uint8_t reset;
+soft_reset:
+    reset = 0;
+    while (1) if (OS_WaitEvent(microPyTaskHandle, (void**)&event, OS_TIME_OUT_WAIT_FOREVER)) {
+
+        Trace(1,"microPy task received event:%d",event->id);
+        // PM_SetSysMinFreq(PM_SYS_FREQ_178M);
+
+        switch(event->id) {
+            case MICROPY_EVENT_ID_UART_RECEIVED: {
+                uint8_t c;
+                Trace(1, "micropy task received data length: %d", event->param1);
+                while (Buffer_Gets(&fifoBuffer, &c, 1))
+                    if (pyexec_event_repl_process_char((int)c)) {
+                        reset = 1;
+                        break;
+                    }
+                Trace(1, "REPL complete");
+                break;
+            }
+            default:
+                break;
         }
+
+        OS_Free(event->pParam1);
+        OS_Free(event);
+        if (reset) break;
+        // PM_SetSysMinFreq(PM_SYS_FREQ_32K);
     }
+    soft_reset();
+    goto soft_reset;
 }
 
 void EventDispatch(API_Event_t* pEvent)

From 40fd03d86b8f0fabe928f90cf02d44ffed9d49a0 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sun, 3 Feb 2019 16:45:07 +0100
Subject: [PATCH 3128/3533] Add get_satellites function

---
 ports/gprs_a9/README.md |  7 +++++++
 ports/gprs_a9/modgps.c  | 18 ++++++++++++++++++
 2 files changed, 25 insertions(+)

diff --git a/ports/gprs_a9/README.md b/ports/gprs_a9/README.md
index e123818a95c4d..c4b044c708e5b 100644
--- a/ports/gprs_a9/README.md
+++ b/ports/gprs_a9/README.md
@@ -44,3 +44,10 @@ Retrieves the firmware version.
 * `get_location()`
 Retrieves the current GPS location.
 **Returns**: latitude and longitude in degrees.
+**Raises**: `ValueError` if the GPS module never responded.
+
+* `get_satellites()`
+Retrieves the number of satellites visible.
+**Returns**: the number of satellites tracked and the number of visible satellites.
+**Raises**: `ValueError` if the GPS module never responded.
+
diff --git a/ports/gprs_a9/modgps.c b/ports/gprs_a9/modgps.c
index d337654ee0b77..7159f9181ed83 100644
--- a/ports/gprs_a9/modgps.c
+++ b/ports/gprs_a9/modgps.c
@@ -85,12 +85,30 @@ STATIC mp_obj_t get_location(void) {
 
 STATIC MP_DEFINE_CONST_FUN_OBJ_0(get_location_obj, get_location);
 
+STATIC mp_obj_t get_satellites(void) {
+    // ========================================
+    // Retrieves the number of visible GPS satellites.
+    // Returns:
+    //     The number of visible GPS satellites.
+    // ========================================
+    REQUIRES_VALID_GPS_INFO(gpsInfo)
+
+    mp_obj_t tuple[2] = {
+        mp_obj_new_int(gpsInfo->gga.satellites_tracked),
+        mp_obj_new_int(gpsInfo->gsv[0].total_sats),
+    };
+    return mp_obj_new_tuple(2, tuple);
+}
+
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(get_satellites_obj, get_satellites);
+
 STATIC const mp_map_elem_t mp_module_gps_globals_table[] = {
     { MP_OBJ_NEW_QSTR(MP_QSTR___name__), MP_OBJ_NEW_QSTR(MP_QSTR_gps) },
     { MP_OBJ_NEW_QSTR(MP_QSTR_on), (mp_obj_t)&on_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_off), (mp_obj_t)&off_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_get_firmware_version), (mp_obj_t)&get_firmware_version_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_get_location), (mp_obj_t)&get_location_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_get_satellites), (mp_obj_t)&get_satellites_obj },
 };
 
 STATIC MP_DEFINE_CONST_DICT(mp_module_gps_globals, mp_module_gps_globals_table);

From 18fedeceb85f6b4741691cac047085348f081c24 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Tue, 5 Feb 2019 00:25:04 +0100
Subject: [PATCH 3129/3533] Add SIM present / ICCID functions

---
 ports/gprs_a9/README.md     |  8 ++++++++
 ports/gprs_a9/modcellular.c | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 41 insertions(+)

diff --git a/ports/gprs_a9/README.md b/ports/gprs_a9/README.md
index c4b044c708e5b..1d48e6d8cb268 100644
--- a/ports/gprs_a9/README.md
+++ b/ports/gprs_a9/README.md
@@ -25,6 +25,14 @@ Provides cellular functionality.
 Retrieves IMEI number.
 **Returns**: a string with IMEI number.
 
+* `is_sim_present()`
+Checks whether the SIM card is present and ICCID can be retrieved.
+**Returns**: True if SIM card is present.
+
+* `get_iccid()`
+Retrieves ICCID number of the inserted SIM card.
+**Returns**: a string with ICCID number or `None` if no SIM card present.
+
 ### `gps`
 
 Provides the GPS functionality
diff --git a/ports/gprs_a9/modcellular.c b/ports/gprs_a9/modcellular.c
index 1550fa08d2c59..499f0bd44a83b 100644
--- a/ports/gprs_a9/modcellular.c
+++ b/ports/gprs_a9/modcellular.c
@@ -4,6 +4,7 @@
 #include "py/binary.h"
 
 #include "api_info.h"
+#include "api_sim.h"
 
 STATIC mp_obj_t get_imei(void) {
     // ========================================
@@ -19,9 +20,41 @@ STATIC mp_obj_t get_imei(void) {
 
 STATIC MP_DEFINE_CONST_FUN_OBJ_0(get_imei_obj, get_imei);
 
+STATIC mp_obj_t is_sim_present(void) {
+    // ========================================
+    // Checks whether the SIM card is inserted and ICCID can be retrieved.
+    // Returns:
+    //     True if SIM present.
+    // ========================================
+    uint8_t iccid[21];
+    memset(iccid, 0, sizeof(iccid));
+    return mp_obj_new_bool(SIM_GetICCID(iccid));
+}
+
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(is_sim_present_obj, is_sim_present);
+
+STATIC mp_obj_t get_iccid(void) {
+    // ========================================
+    // Retrieves ICCID number.
+    // Returns:
+    //     ICCID number as a string.
+    // ========================================
+    uint8_t iccid[21];
+    memset(iccid, 0, sizeof(iccid));
+    if (SIM_GetICCID(iccid))
+        return mp_obj_new_str(iccid, strlen(iccid));
+    else {
+        return mp_const_none;
+    }
+}
+
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(get_iccid_obj, get_iccid);
+
 STATIC const mp_map_elem_t mp_module_cellular_globals_table[] = {
     { MP_OBJ_NEW_QSTR(MP_QSTR___name__), MP_OBJ_NEW_QSTR(MP_QSTR_cellular) },
     { MP_OBJ_NEW_QSTR(MP_QSTR_get_imei), (mp_obj_t)&get_imei_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_is_sim_present), (mp_obj_t)&is_sim_present_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_get_iccid), (mp_obj_t)&get_iccid_obj },
 };
 
 STATIC MP_DEFINE_CONST_DICT(mp_module_cellular_globals, mp_module_cellular_globals_table);

From d6d3d3c535942ddd332193b49a51f4fbb97a38d5 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Tue, 5 Feb 2019 01:11:04 +0100
Subject: [PATCH 3130/3533] Get rid of cast warnings

---
 ports/gprs_a9/modcellular.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/ports/gprs_a9/modcellular.c b/ports/gprs_a9/modcellular.c
index 499f0bd44a83b..d51584f7851fe 100644
--- a/ports/gprs_a9/modcellular.c
+++ b/ports/gprs_a9/modcellular.c
@@ -12,9 +12,9 @@ STATIC mp_obj_t get_imei(void) {
     // Returns:
     //     IMEI number as a string.
     // ========================================
-    uint8_t imei[16];
+    char imei[16];
     memset(imei,0,sizeof(imei));
-    INFO_GetIMEI(imei);
+    INFO_GetIMEI((uint8_t*)imei);
     return mp_obj_new_str(imei, strlen(imei));
 }
 
@@ -26,9 +26,9 @@ STATIC mp_obj_t is_sim_present(void) {
     // Returns:
     //     True if SIM present.
     // ========================================
-    uint8_t iccid[21];
+    char iccid[21];
     memset(iccid, 0, sizeof(iccid));
-    return mp_obj_new_bool(SIM_GetICCID(iccid));
+    return mp_obj_new_bool(SIM_GetICCID((uint8_t*)iccid));
 }
 
 STATIC MP_DEFINE_CONST_FUN_OBJ_0(is_sim_present_obj, is_sim_present);
@@ -39,9 +39,9 @@ STATIC mp_obj_t get_iccid(void) {
     // Returns:
     //     ICCID number as a string.
     // ========================================
-    uint8_t iccid[21];
+    char iccid[21];
     memset(iccid, 0, sizeof(iccid));
-    if (SIM_GetICCID(iccid))
+    if (SIM_GetICCID((uint8_t*)iccid))
         return mp_obj_new_str(iccid, strlen(iccid));
     else {
         return mp_const_none;

From 33668fb0782a824bd63e4b926d4ca10b11276d1d Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Tue, 5 Feb 2019 01:11:19 +0100
Subject: [PATCH 3131/3533] Implement sending SMS message

---
 ports/gprs_a9/modcellular.c | 54 +++++++++++++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)

diff --git a/ports/gprs_a9/modcellular.c b/ports/gprs_a9/modcellular.c
index d51584f7851fe..902535044a2cd 100644
--- a/ports/gprs_a9/modcellular.c
+++ b/ports/gprs_a9/modcellular.c
@@ -5,6 +5,8 @@
 
 #include "api_info.h"
 #include "api_sim.h"
+#include "api_sms.h"
+#include "api_os.h"
 
 STATIC mp_obj_t get_imei(void) {
     // ========================================
@@ -50,11 +52,63 @@ STATIC mp_obj_t get_iccid(void) {
 
 STATIC MP_DEFINE_CONST_FUN_OBJ_0(get_iccid_obj, get_iccid);
 
+STATIC mp_obj_t sms_send(mp_obj_t destination, mp_obj_t message) {
+    // ========================================
+    // Sends an SMS messsage.
+    // Args:
+    //     destination (str): telephone number;
+    //     message (str): message contents;
+    // ========================================
+    const char* destination_c = mp_obj_str_get_str(destination);
+    const char* message_c = mp_obj_str_get_str(message);
+
+    if (!SMS_SetFormat(SMS_FORMAT_TEXT, SIM0)) {
+        mp_raise_ValueError("Failed to set SMS format: is SIM card present?");
+        return mp_const_none;
+    }
+
+    SMS_Parameter_t smsParam = {
+        .fo = 17 , // stadard values
+        .vp = 167,
+        .pid= 0  ,
+        .dcs= 8  , // 0:English 7bit, 4:English 8 bit, 8:Unicode 2 Bytes
+    };
+    if (!SMS_SetParameter(&smsParam,SIM0)) {
+        mp_raise_ValueError("Failed to set SMS parameters");
+        return mp_const_none;
+    }
+
+    if (!SMS_SetNewMessageStorage(SMS_STORAGE_SIM_CARD)) {
+        mp_raise_ValueError("Failed to set SMS storage in the SIM card");
+        return mp_const_none;
+    }
+
+    uint8_t* unicode = NULL;
+    uint32_t unicodeLen;
+
+    if (!SMS_LocalLanguage2Unicode((uint8_t*)message_c, strlen(message_c), CHARSET_UTF_8, &unicode, &unicodeLen)) {
+        mp_raise_ValueError("Failed to convert to Unicode before sending SMS");
+        return mp_const_none;
+    }
+
+    if (!SMS_SendMessage(destination_c, unicode, unicodeLen, SIM0)) {
+        OS_Free(unicode);
+        mp_raise_ValueError("Failed to send SMS message");
+        return mp_const_none;
+    }
+    OS_Free(unicode);
+
+    return mp_const_none;
+}
+
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(sms_send_obj, sms_send);
+
 STATIC const mp_map_elem_t mp_module_cellular_globals_table[] = {
     { MP_OBJ_NEW_QSTR(MP_QSTR___name__), MP_OBJ_NEW_QSTR(MP_QSTR_cellular) },
     { MP_OBJ_NEW_QSTR(MP_QSTR_get_imei), (mp_obj_t)&get_imei_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_is_sim_present), (mp_obj_t)&is_sim_present_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_get_iccid), (mp_obj_t)&get_iccid_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_sms_send), (mp_obj_t)&sms_send_obj },
 };
 
 STATIC MP_DEFINE_CONST_DICT(mp_module_cellular_globals, mp_module_cellular_globals_table);

From c9264215d51afba228d3ea3fa667c7022f35320f Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Tue, 5 Feb 2019 01:14:38 +0100
Subject: [PATCH 3132/3533] Update doc with sms_send

---
 ports/gprs_a9/README.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/ports/gprs_a9/README.md b/ports/gprs_a9/README.md
index 1d48e6d8cb268..f5613a2384d40 100644
--- a/ports/gprs_a9/README.md
+++ b/ports/gprs_a9/README.md
@@ -33,6 +33,13 @@ Checks whether the SIM card is present and ICCID can be retrieved.
 Retrieves ICCID number of the inserted SIM card.
 **Returns**: a string with ICCID number or `None` if no SIM card present.
 
+* `sms_send(destination, message)`
+Sends SMS.
+**Args**:
+    * destination (str): telephone number;
+    * message (str): message contents;
+**Raises**: `ValueError` if failed to set up/send SMS.
+
 ### `gps`
 
 Provides the GPS functionality

From 57e109307317e01f2b4c4e24a0403dba93c4742c Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Tue, 5 Feb 2019 01:16:18 +0100
Subject: [PATCH 3133/3533] Add newlines to reformat API reference

---
 ports/gprs_a9/README.md | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/ports/gprs_a9/README.md b/ports/gprs_a9/README.md
index f5613a2384d40..56c717e9e33b9 100644
--- a/ports/gprs_a9/README.md
+++ b/ports/gprs_a9/README.md
@@ -23,21 +23,26 @@ Provides cellular functionality.
 
 * `get_imei()`
 Retrieves IMEI number.
+
 **Returns**: a string with IMEI number.
 
 * `is_sim_present()`
 Checks whether the SIM card is present and ICCID can be retrieved.
+
 **Returns**: True if SIM card is present.
 
 * `get_iccid()`
 Retrieves ICCID number of the inserted SIM card.
+
 **Returns**: a string with ICCID number or `None` if no SIM card present.
 
 * `sms_send(destination, message)`
 Sends SMS.
+
 **Args**:
     * destination (str): telephone number;
     * message (str): message contents;
+
 **Raises**: `ValueError` if failed to set up/send SMS.
 
 ### `gps`
@@ -46,6 +51,7 @@ Provides the GPS functionality
 
 * `on()`
 Turns the GPS on. Blocks until the GPS module responds.
+
 **Raises**: `ValueError` if the GPS module does not respond within 10 seconds.
 
 * `off()`
@@ -53,16 +59,22 @@ Turns the GPS off.
 
 * `get_firmware_version()`
 Retrieves the firmware version.
+
 **Returns**: the firmware version as a string.
+
 **Raises**: `ValueError` if the GPS module fails to respond.
 
 * `get_location()`
 Retrieves the current GPS location.
+
 **Returns**: latitude and longitude in degrees.
+
 **Raises**: `ValueError` if the GPS module never responded.
 
 * `get_satellites()`
 Retrieves the number of satellites visible.
+
 **Returns**: the number of satellites tracked and the number of visible satellites.
+
 **Raises**: `ValueError` if the GPS module never responded.
 

From ad2e6420c68192b9e3173dccb559af9a88cb28c0 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Tue, 5 Feb 2019 01:17:25 +0100
Subject: [PATCH 3134/3533] Fix list (attempt 1)

---
 ports/gprs_a9/README.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/ports/gprs_a9/README.md b/ports/gprs_a9/README.md
index 56c717e9e33b9..fcfb070f39012 100644
--- a/ports/gprs_a9/README.md
+++ b/ports/gprs_a9/README.md
@@ -40,8 +40,9 @@ Retrieves ICCID number of the inserted SIM card.
 Sends SMS.
 
 **Args**:
-    * destination (str): telephone number;
-    * message (str): message contents;
+
+  - destination (str): telephone number;
+  - message (str): message contents;
 
 **Raises**: `ValueError` if failed to set up/send SMS.
 

From e8bd265ef35c736972e3a7a497d2532d30f50a24 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Tue, 5 Feb 2019 01:18:57 +0100
Subject: [PATCH 3135/3533] Fix list (attempt 2)

---
 ports/gprs_a9/README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/gprs_a9/README.md b/ports/gprs_a9/README.md
index fcfb070f39012..b461936f398f3 100644
--- a/ports/gprs_a9/README.md
+++ b/ports/gprs_a9/README.md
@@ -41,8 +41,8 @@ Sends SMS.
 
 **Args**:
 
-  - destination (str): telephone number;
-  - message (str): message contents;
+    * destination (str): telephone number;
+    * message (str): message contents;
 
 **Raises**: `ValueError` if failed to set up/send SMS.
 

From bd80d1f0d11af187cac0a9d02b98b315d40e250c Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Thu, 7 Feb 2019 01:46:41 +0100
Subject: [PATCH 3136/3533] Reorganize gps code

---
 ports/gprs_a9/main.c   |  5 ++---
 ports/gprs_a9/modgps.c | 28 ++++++++++++++++++----------
 ports/gprs_a9/modgps.h | 10 ++++++++--
 3 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/ports/gprs_a9/main.c b/ports/gprs_a9/main.c
index 57225d609349a..76bb8f6fb2852 100644
--- a/ports/gprs_a9/main.c
+++ b/ports/gprs_a9/main.c
@@ -22,10 +22,10 @@
 #include "api_network.h"
 #include "time.h"
 #include "api_fs.h"
-#include "api_gps.h"
 
 #include "mphalport.h"
 #include "mpconfigport.h"
+#include "modgps.h"
 
 
 
@@ -264,8 +264,7 @@ void EventDispatch(API_Event_t* pEvent)
             }
             break;
         case API_EVENT_ID_GPS_UART_RECEIVED:
-            Trace(2, "received GPS data, length: %d, data:%s", pEvent->param1, pEvent->pParam1);
-            GPS_Update(pEvent->pParam1,pEvent->param1);
+            notify_gps_update(pEvent);
             break;
         default:
             break;
diff --git a/ports/gprs_a9/modgps.c b/ports/gprs_a9/modgps.c
index 7159f9181ed83..990cd55286a70 100644
--- a/ports/gprs_a9/modgps.c
+++ b/ports/gprs_a9/modgps.c
@@ -1,3 +1,5 @@
+#include "modgps.h"
+
 #include "py/nlr.h"
 #include "py/obj.h"
 #include "py/runtime.h"
@@ -5,15 +7,25 @@
 
 #include "api_gps.h"
 #include "api_os.h"
+#include "api_event.h"
 #include "gps_parse.h"
-
-#include "modgps.h"
 #include "gps.h"
 
+// ------
+// Notify
+// ------
 
 GPS_Info_t* gpsInfo = NULL;
 
-STATIC mp_obj_t on(void) {
+void notify_gps_update(API_Event_t* event) {
+    GPS_Update(event->pParam1,event->param1);
+}
+
+// -------
+// Methods
+// -------
+
+STATIC void on(void) {
     // ========================================
     // Turns GPS on.
     // Raises:
@@ -27,21 +39,18 @@ STATIC mp_obj_t on(void) {
         attempts ++;
         if (attempts == MAX_GPS_POLL_ATTEMPTS) {
             mp_raise_ValueError("Failed to start GPS");
-            return mp_const_none;
         }
         OS_Sleep(1000);
     }
-    return mp_const_none;
 }
 
 STATIC MP_DEFINE_CONST_FUN_OBJ_0(on_obj, on);
 
-STATIC mp_obj_t off(void) {
+STATIC void off(void) {
     // ========================================
     // Turns GPS off.
     // ========================================
     GPS_Close();
-    return mp_const_none;
 }
 
 STATIC MP_DEFINE_CONST_FUN_OBJ_0(off_obj, off);
@@ -57,7 +66,6 @@ STATIC mp_obj_t get_firmware_version(void) {
     char buffer[300];
     if (!GPS_GetVersion(buffer,150)) {
         mp_raise_ValueError("Failed to get the firmware version: did you run gps.on()?");
-        return mp_const_none;
     }
     return mp_obj_new_str(buffer, strlen(buffer));
 }
@@ -70,7 +78,7 @@ STATIC mp_obj_t get_location(void) {
     // Returns:
     //     Location reported by GPS: latitude and longitude (degrees).
     // ========================================
-    REQUIRES_VALID_GPS_INFO(gpsInfo)
+    REQUIRES_VALID_GPS_INFO
 
     int temp = (int)(gpsInfo->rmc.latitude.value/gpsInfo->rmc.latitude.scale/100);
     double latitude = temp+(double)(gpsInfo->rmc.latitude.value - temp*gpsInfo->rmc.latitude.scale*100)/gpsInfo->rmc.latitude.scale/60.0;
@@ -91,7 +99,7 @@ STATIC mp_obj_t get_satellites(void) {
     // Returns:
     //     The number of visible GPS satellites.
     // ========================================
-    REQUIRES_VALID_GPS_INFO(gpsInfo)
+    REQUIRES_VALID_GPS_INFO
 
     mp_obj_t tuple[2] = {
         mp_obj_new_int(gpsInfo->gga.satellites_tracked),
diff --git a/ports/gprs_a9/modgps.h b/ports/gprs_a9/modgps.h
index db600c109337c..2f3e50d42dd60 100644
--- a/ports/gprs_a9/modgps.h
+++ b/ports/gprs_a9/modgps.h
@@ -1,4 +1,10 @@
-#define MAX_GPS_POLL_ATTEMPTS 10
+#include "api_event.h"
+#include "gps_parse.h"
+
+extern GPS_Info_t* gpsInfo;
 
-#define REQUIRES_VALID_GPS_INFO(info) if (!(info)) {mp_raise_ValueError("No GPS data available: did you run gps.on()?"); return mp_const_none;}
+void notify_gps_update(API_Event_t* event);
+
+#define MAX_GPS_POLL_ATTEMPTS 10
+#define REQUIRES_VALID_GPS_INFO if (!gpsInfo) {mp_raise_ValueError("No GPS data available: did you run gps.on()?"); return mp_const_none;}
 

From 7ddc77fb51d9779ef39b361b6fcc7c79c8546abb Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Thu, 7 Feb 2019 01:54:16 +0100
Subject: [PATCH 3137/3533] Revert returns in gps

---
 ports/gprs_a9/modgps.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/ports/gprs_a9/modgps.c b/ports/gprs_a9/modgps.c
index 990cd55286a70..b5782ce7a5138 100644
--- a/ports/gprs_a9/modgps.c
+++ b/ports/gprs_a9/modgps.c
@@ -25,7 +25,7 @@ void notify_gps_update(API_Event_t* event) {
 // Methods
 // -------
 
-STATIC void on(void) {
+STATIC mp_obj_t on(void) {
     // ========================================
     // Turns GPS on.
     // Raises:
@@ -42,15 +42,17 @@ STATIC void on(void) {
         }
         OS_Sleep(1000);
     }
+    return mp_const_none;
 }
 
 STATIC MP_DEFINE_CONST_FUN_OBJ_0(on_obj, on);
 
-STATIC void off(void) {
+STATIC mp_obj_t off(void) {
     // ========================================
     // Turns GPS off.
     // ========================================
     GPS_Close();
+    return mp_const_none;
 }
 
 STATIC MP_DEFINE_CONST_FUN_OBJ_0(off_obj, off);
@@ -66,6 +68,7 @@ STATIC mp_obj_t get_firmware_version(void) {
     char buffer[300];
     if (!GPS_GetVersion(buffer,150)) {
         mp_raise_ValueError("Failed to get the firmware version: did you run gps.on()?");
+        return mp_const_none;
     }
     return mp_obj_new_str(buffer, strlen(buffer));
 }

From c20a7fca6a13729ed9199f571e208972a38993a8 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Thu, 7 Feb 2019 01:54:57 +0100
Subject: [PATCH 3138/3533] Add tracking of network registration

---
 ports/gprs_a9/main.c        | 30 ++++++++++--------------------
 ports/gprs_a9/modcellular.c | 29 +++++++++++++++++++++++++++++
 ports/gprs_a9/modcellular.h | 10 ++++++++++
 3 files changed, 49 insertions(+), 20 deletions(-)
 create mode 100644 ports/gprs_a9/modcellular.h

diff --git a/ports/gprs_a9/main.c b/ports/gprs_a9/main.c
index 76bb8f6fb2852..be49f30b0ab8e 100644
--- a/ports/gprs_a9/main.c
+++ b/ports/gprs_a9/main.c
@@ -25,10 +25,9 @@
 
 #include "mphalport.h"
 #include "mpconfigport.h"
+#include "modcellular.h"
 #include "modgps.h"
 
-
-
 #define AppMain_TASK_STACK_SIZE    (2048 * 2)
 #define AppMain_TASK_PRIORITY      0
 #define MICROPYTHON_TASK_STACK_SIZE     (2048 * 4)
@@ -198,29 +197,20 @@ void EventDispatch(API_Event_t* pEvent)
         case API_EVENT_ID_POWER_ON:
             break;
         case API_EVENT_ID_NO_SIMCARD:
+        {
+            notify_no_sim(pEvent);
             break;
+        }
         case API_EVENT_ID_NETWORK_REGISTERED_HOME:
-        case API_EVENT_ID_NETWORK_REGISTERED_ROAMING:
         {
-            uint8_t status;
-            Trace(1,"network register success");
-            bool ret = Network_GetAttachStatus(&status);
-            if(!ret)
-                Trace(1,"get attach staus fail");
-            Trace(1,"attach status:%d",status);
-            if(status == 0)
-            {
-                ret = Network_StartAttach();
-                if(!ret)
-                {
-                    Trace(1,"network attach fail");
-                }
-            }
-            else
-            {
-            }
+            notify_registered_home(pEvent);
+            break;
         }
+        case API_EVENT_ID_NETWORK_REGISTERED_ROAMING:
+        {
+            notify_registered_roaming(pEvent);
             break;
+        }
         case API_EVENT_ID_NETWORK_DETACHED:
             Trace(2,"network detached");
             break;
diff --git a/ports/gprs_a9/modcellular.c b/ports/gprs_a9/modcellular.c
index 902535044a2cd..8b21b6819c381 100644
--- a/ports/gprs_a9/modcellular.c
+++ b/ports/gprs_a9/modcellular.c
@@ -1,3 +1,5 @@
+#include "modcellular.h"
+
 #include "py/nlr.h"
 #include "py/obj.h"
 #include "py/runtime.h"
@@ -8,6 +10,31 @@
 #include "api_sms.h"
 #include "api_os.h"
 
+#define NTW_REG_BIT 0x01
+#define NTW_ROAM_BIT 0x02
+
+// ------
+// Notify
+// ------
+
+int sim_status = 0;
+
+void notify_no_sim(API_Event_t* event) {
+    sim_status = 0;
+}
+
+void notify_registered_home(API_Event_t* event) {
+    sim_status = NTW_REG_BIT;
+}
+
+void notify_registered_roaming(API_Event_t* event) {
+    sim_status = NTW_REG_BIT | NTW_ROAM_BIT;
+}
+
+// -------
+// Methods
+// -------
+
 STATIC mp_obj_t get_imei(void) {
     // ========================================
     // Retrieves IMEI number.
@@ -59,6 +86,8 @@ STATIC mp_obj_t sms_send(mp_obj_t destination, mp_obj_t message) {
     //     destination (str): telephone number;
     //     message (str): message contents;
     // ========================================
+    REQUIRES_NETWORK_REGISTRATION
+
     const char* destination_c = mp_obj_str_get_str(destination);
     const char* message_c = mp_obj_str_get_str(message);
 
diff --git a/ports/gprs_a9/modcellular.h b/ports/gprs_a9/modcellular.h
new file mode 100644
index 0000000000000..659d09be72311
--- /dev/null
+++ b/ports/gprs_a9/modcellular.h
@@ -0,0 +1,10 @@
+#include "api_event.h"
+
+extern int sim_status;
+
+void notify_no_sim(API_Event_t* event);
+void notify_registered_home(API_Event_t* event);
+void notify_registered_roaming(API_Event_t* event);
+
+#define REQUIRES_NETWORK_REGISTRATION if (!sim_status) {mp_raise_ValueError("Network is not available: is SIM card inserted?"); return mp_const_none;}
+

From eeb6a288a7a28826ec8b06145210648c117460e5 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Thu, 7 Feb 2019 01:55:20 +0100
Subject: [PATCH 3139/3533] Add welcome message with additional info

---
 ports/gprs_a9/main.c | 40 ++++++++++++++++++++++++++++++++++++----
 1 file changed, 36 insertions(+), 4 deletions(-)

diff --git a/ports/gprs_a9/main.c b/ports/gprs_a9/main.c
index be49f30b0ab8e..afbcca9a03313 100644
--- a/ports/gprs_a9/main.c
+++ b/ports/gprs_a9/main.c
@@ -36,21 +36,21 @@
 
 HANDLE mainTaskHandle  = NULL;
 HANDLE microPyTaskHandle = NULL;
-Buffer_t fifoBuffer;   //ringbuf
+Buffer_t fifoBuffer; // ringbuf
 uint8_t  fifoBufferData[UART_CIRCLE_FIFO_BUFFER_MAX_LENGTH];
 
 typedef enum
 {
     MICROPY_EVENT_ID_UART_RECEIVED = 1, //param1: length, param2:data(uint8_t*)
     MICROPY_EVENT_ID_UART_MAX
-}MicroPy_Event_ID_t;
+} MicroPy_Event_ID_t;
 
 typedef struct
 {
     MicroPy_Event_ID_t id;
     uint32_t param1;
     uint8_t* pParam1;
-}MicroPy_Event_t;
+} MicroPy_Event_t;
 
 #if MICROPY_ENABLE_COMPILER
 void do_str(const char *src, mp_parse_input_kind_t input_kind) {
@@ -108,8 +108,40 @@ void ShowStackInfo()
     uint32_t last_bytes = (uint32_t)&j - info.stackTop;
     uint32_t all_bytes  = info.stackSize*4;
     char msg[32];
-    sprintf(msg, "Stack used: %d/%d\r\n", all_bytes - last_bytes, all_bytes);
+    snprintf(msg, sizeof(msg), "Stack used: %d/%d\r\n", all_bytes - last_bytes, all_bytes);
     mp_hal_stdout_tx_str(msg);
+
+    API_FS_INFO fsInfo;
+    if (API_FS_GetFSInfo(FS_DEVICE_NAME_FLASH, &fsInfo) != 0) {
+        mp_hal_stdout_tx_str("No flash info!\r\n");
+    } else {
+        snprintf(msg, sizeof(msg), "Flash used: %d/%d\r\n", (int)fsInfo.usedSize, (int)fsInfo.totalSize);
+        mp_hal_stdout_tx_str(msg);
+        
+        mp_hal_stdout_tx_str("Files:\r\n");
+        Dir_t* dir = API_FS_OpenDir("/");
+        Dirent_t* dirent;
+        while ((dirent = API_FS_ReadDir(dir))) {
+
+            snprintf(msg, sizeof(msg), "/%s", dirent->d_name);
+
+            mp_hal_stdout_tx_str(" ");
+            mp_hal_stdout_tx_str(msg);
+            mp_hal_stdout_tx_str(" ");
+
+            int32_t fd;
+
+            if ((fd = API_FS_Open(msg, FS_O_RDONLY, 0)) < 0) {
+                snprintf(msg, sizeof(msg), "[FAIL: %d]\r\n", fd);
+                mp_hal_stdout_tx_str(msg);
+            } else {
+                snprintf(msg, sizeof(msg), "%d\r\n", (int)API_FS_GetFileSize(fd));
+                API_FS_Close(fd);
+                mp_hal_stdout_tx_str(msg);
+            }
+        }
+        API_FS_CloseDir(dir);
+    }
 }
 
 bool mp_Init()

From dffc284a34c97faba3b02d93b227fee9d4021548 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Thu, 7 Feb 2019 01:59:16 +0100
Subject: [PATCH 3140/3533] Add exception for ICCID

---
 ports/gprs_a9/modcellular.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/gprs_a9/modcellular.c b/ports/gprs_a9/modcellular.c
index 8b21b6819c381..51582ef868dfd 100644
--- a/ports/gprs_a9/modcellular.c
+++ b/ports/gprs_a9/modcellular.c
@@ -73,6 +73,7 @@ STATIC mp_obj_t get_iccid(void) {
     if (SIM_GetICCID((uint8_t*)iccid))
         return mp_obj_new_str(iccid, strlen(iccid));
     else {
+        mp_raise_ValueError("No ICCID data: is SIM card inserted?");
         return mp_const_none;
     }
 }

From b5feedf67b3a65e4162a7239fb7bea7422e28cc8 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Thu, 7 Feb 2019 02:06:06 +0100
Subject: [PATCH 3141/3533] Add network registration status functions

---
 ports/gprs_a9/modcellular.c | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/ports/gprs_a9/modcellular.c b/ports/gprs_a9/modcellular.c
index 51582ef868dfd..f559997946ff1 100644
--- a/ports/gprs_a9/modcellular.c
+++ b/ports/gprs_a9/modcellular.c
@@ -62,6 +62,30 @@ STATIC mp_obj_t is_sim_present(void) {
 
 STATIC MP_DEFINE_CONST_FUN_OBJ_0(is_sim_present_obj, is_sim_present);
 
+STATIC mp_obj_t is_network_registered(void) {
+    // ========================================
+    // Checks whether registered on the cellular network.
+    // Returns:
+    //     True if registered.
+    // ========================================
+    return mp_obj_new_bool(sim_status & NTW_REG_BIT);
+}
+
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(is_network_registered_obj, is_network_registered);
+
+STATIC mp_obj_t is_roaming(void) {
+    // ========================================
+    // Checks whether registered on the roaming network.
+    // Returns:
+    //     True if roaming.
+    // ========================================
+    REQUIRES_NETWORK_REGISTRATION
+
+    return mp_obj_new_bool(sim_status & NTW_ROAM_BIT);
+}
+
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(is_roaming_obj, is_roaming);
+
 STATIC mp_obj_t get_iccid(void) {
     // ========================================
     // Retrieves ICCID number.
@@ -137,6 +161,8 @@ STATIC const mp_map_elem_t mp_module_cellular_globals_table[] = {
     { MP_OBJ_NEW_QSTR(MP_QSTR___name__), MP_OBJ_NEW_QSTR(MP_QSTR_cellular) },
     { MP_OBJ_NEW_QSTR(MP_QSTR_get_imei), (mp_obj_t)&get_imei_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_is_sim_present), (mp_obj_t)&is_sim_present_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_is_network_registered), (mp_obj_t)&is_network_registered_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_is_roaming), (mp_obj_t)&is_roaming_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_get_iccid), (mp_obj_t)&get_iccid_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_sms_send), (mp_obj_t)&sms_send_obj },
 };

From 130f62321f8f368e1ebf4831621d6326fbee5cce Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Thu, 7 Feb 2019 02:09:08 +0100
Subject: [PATCH 3142/3533] Update API reference with cellular status functions

---
 ports/gprs_a9/README.md | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/ports/gprs_a9/README.md b/ports/gprs_a9/README.md
index b461936f398f3..ece2e10d8ae78 100644
--- a/ports/gprs_a9/README.md
+++ b/ports/gprs_a9/README.md
@@ -31,6 +31,18 @@ Checks whether the SIM card is present and ICCID can be retrieved.
 
 **Returns**: True if SIM card is present.
 
+* `is_network_registered()`
+Checks whether registered on the cellular network.
+
+**Returns**: True if registered.
+
+* `is_roaming()`
+Checks whether registered on the roaming network.
+
+**Returns**: True if roaming.
+
+**Raises** `ValueError` if not registered ar all.
+
 * `get_iccid()`
 Retrieves ICCID number of the inserted SIM card.
 

From 219f37570ce588628e002d51337d2e240cc6150d Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Thu, 7 Feb 2019 02:11:01 +0100
Subject: [PATCH 3143/3533] Update API doc with the new behavior.

---
 ports/gprs_a9/README.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ports/gprs_a9/README.md b/ports/gprs_a9/README.md
index ece2e10d8ae78..620a5334b1c70 100644
--- a/ports/gprs_a9/README.md
+++ b/ports/gprs_a9/README.md
@@ -46,7 +46,9 @@ Checks whether registered on the roaming network.
 * `get_iccid()`
 Retrieves ICCID number of the inserted SIM card.
 
-**Returns**: a string with ICCID number or `None` if no SIM card present.
+**Returns**: a string with ICCID number.
+
+**Raises**: `ValueError` if no ICCID number can be retrieved.
 
 * `sms_send(destination, message)`
 Sends SMS.

From 17723f219e1feac532dce3795c557e4ed15e0912 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Fri, 8 Feb 2019 00:53:32 +0100
Subject: [PATCH 3144/3533] Add power-related functions

---
 ports/gprs_a9/main.c       |   2 +
 ports/gprs_a9/modmachine.c | 115 ++++++++++++++++++++++++++++++++++++-
 ports/gprs_a9/modmachine.h |   4 +-
 3 files changed, 119 insertions(+), 2 deletions(-)

diff --git a/ports/gprs_a9/main.c b/ports/gprs_a9/main.c
index afbcca9a03313..f37bc1053933f 100644
--- a/ports/gprs_a9/main.c
+++ b/ports/gprs_a9/main.c
@@ -27,6 +27,7 @@
 #include "mpconfigport.h"
 #include "modcellular.h"
 #include "modgps.h"
+#include "modmachine.h"
 
 #define AppMain_TASK_STACK_SIZE    (2048 * 2)
 #define AppMain_TASK_PRIORITY      0
@@ -227,6 +228,7 @@ void EventDispatch(API_Event_t* pEvent)
     switch(pEvent->id)
     {
         case API_EVENT_ID_POWER_ON:
+            notify_power_on(pEvent);
             break;
         case API_EVENT_ID_NO_SIMCARD:
         {
diff --git a/ports/gprs_a9/modmachine.c b/ports/gprs_a9/modmachine.c
index a7b5052a01dc0..54099e9e9bc4e 100644
--- a/ports/gprs_a9/modmachine.c
+++ b/ports/gprs_a9/modmachine.c
@@ -1,15 +1,128 @@
+#include "modmachine.h"
 
 #include "mpconfigport.h"
 #include "stdint.h"
 #include "py/mpconfig.h"
 #include "py/obj.h"
 #include "py/runtime.h"
-#include "modmachine.h"
+
+#include "api_event.h"
+#include "api_hal_pm.h"
+
+// ------
+// Notify
+// ------
+
+Power_On_Cause_t powerOnCause = POWER_ON_CAUSE_MAX;
+
+void notify_power_on(API_Event_t* event) {
+    powerOnCause = event->param1;
+}
+
+// -------
+// Methods
+// -------
+
+STATIC mp_obj_t reset(void) {
+    // ========================================
+    // Resets the module.
+    // ========================================
+    PM_Restart();
+    return mp_const_none;
+}
+
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(reset_obj, reset);
+
+STATIC mp_obj_t idle(void) {
+    // ========================================
+    // Puts the module into low-power mode.
+    // The execution continues.
+    // ========================================
+    PM_SleepMode(true);
+    return mp_const_none;
+}
+
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(idle_obj, idle);
+
+STATIC mp_obj_t power_on_cause(void) {
+    // ========================================
+    // Retrieves the last reason for the power on.
+    // Returns:
+    //     An integer with the reason encoded.
+    // ========================================
+    switch (powerOnCause) {
+        case POWER_ON_CAUSE_KEY:
+            return MP_OBJ_NEW_SMALL_INT(POWER_ON_CAUSE_KEY);
+            break;
+        case POWER_ON_CAUSE_CHARGE:
+            return MP_OBJ_NEW_SMALL_INT(POWER_ON_CAUSE_CHARGE);
+            break;
+        case POWER_ON_CAUSE_ALARM:
+            return MP_OBJ_NEW_SMALL_INT(POWER_ON_CAUSE_ALARM);
+            break;
+        case POWER_ON_CAUSE_EXCEPTION:
+            return MP_OBJ_NEW_SMALL_INT(POWER_ON_CAUSE_EXCEPTION);
+            break;
+        case POWER_ON_CAUSE_RESET:
+            return MP_OBJ_NEW_SMALL_INT(POWER_ON_CAUSE_RESET);
+            break;
+        case POWER_ON_CAUSE_MAX:
+            return MP_OBJ_NEW_SMALL_INT(POWER_ON_CAUSE_MAX);
+            break;
+        default:
+            return mp_obj_new_int(powerOnCause);
+            break;
+    }
+}
+
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(power_on_cause_obj, power_on_cause);
+
+STATIC mp_obj_t off(void) {
+    // ========================================
+    // Turns off the module.
+    // ========================================
+    PM_ShutDown();
+    return mp_const_none;
+}
+
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(off_obj, off);
+
+STATIC mp_obj_t get_input_voltage(void) {
+    // ========================================
+    // Retrieves the input voltage and the
+    // estimated battery capacity in percents.
+    // Returns:
+    //     Two integers: the voltage value in mV
+    //     as well as the estimated battery capacity in percents.
+    // ========================================
+    uint8_t percentage;
+    uint16_t voltage = PM_Voltage(&percentage);
+    mp_obj_t tuple[2] = {
+        mp_obj_new_int(voltage),
+        mp_obj_new_int(percentage),
+    };
+    return mp_obj_new_tuple(2, tuple);
+}
+
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(get_input_voltage_obj, get_input_voltage);
 
 
 STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_umachine) },
     { MP_ROM_QSTR(MP_QSTR_Pin), MP_ROM_PTR(&machine_pin_type) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_reset), (mp_obj_t)&reset_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_idle), (mp_obj_t)&idle_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_power_on_cause), (mp_obj_t)&power_on_cause_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_off), (mp_obj_t)&off_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_get_input_voltage), (mp_obj_t)&get_input_voltage_obj },
+
+    // Reset reasons
+    { MP_ROM_QSTR(MP_QSTR_POWER_ON_CAUSE_KEY),       MP_ROM_INT(POWER_ON_CAUSE_KEY) },
+    { MP_ROM_QSTR(MP_QSTR_POWER_ON_CAUSE_CHARGE),    MP_ROM_INT(POWER_ON_CAUSE_CHARGE) },
+    { MP_ROM_QSTR(MP_QSTR_POWER_ON_CAUSE_ALARM),     MP_ROM_INT(POWER_ON_CAUSE_ALARM) },
+    { MP_ROM_QSTR(MP_QSTR_POWER_ON_CAUSE_EXCEPTION), MP_ROM_INT(POWER_ON_CAUSE_EXCEPTION) },
+    { MP_ROM_QSTR(MP_QSTR_POWER_ON_CAUSE_RESET),     MP_ROM_INT(POWER_ON_CAUSE_RESET) },
+    { MP_ROM_QSTR(MP_QSTR_POWER_ON_CAUSE_MAX),       MP_ROM_INT(POWER_ON_CAUSE_MAX) },
 };
 
 STATIC MP_DEFINE_CONST_DICT(machine_module_globals, machine_module_globals_table);
diff --git a/ports/gprs_a9/modmachine.h b/ports/gprs_a9/modmachine.h
index 979ab0e12b3ee..d98d8c033988b 100644
--- a/ports/gprs_a9/modmachine.h
+++ b/ports/gprs_a9/modmachine.h
@@ -3,10 +3,12 @@
 #define MICROPY_INCLUDED_GPRS_A9_MODMACHINE_H
 
 #include "py/obj.h"
-
+#include "api_event.h"
 
 extern const mp_obj_type_t machine_pin_type;
+extern Power_On_Cause_t powerOnCause;
 
+void notify_power_on(API_Event_t* event);
 
 #endif
 

From b022597c61a92a84ce4e1d83e28bcebe27f3a051 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Fri, 8 Feb 2019 01:06:00 +0100
Subject: [PATCH 3145/3533] Add new functions to the API list

---
 ports/gprs_a9/README.md | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/ports/gprs_a9/README.md b/ports/gprs_a9/README.md
index 620a5334b1c70..4dd5d8b3c83eb 100644
--- a/ports/gprs_a9/README.md
+++ b/ports/gprs_a9/README.md
@@ -93,3 +93,29 @@ Retrieves the number of satellites visible.
 
 **Raises**: `ValueError` if the GPS module never responded.
 
+### `machine`
+
+Provides power-related functions.
+
+* `reset()`
+Hard-resets the module.
+
+* `off()`
+Powers the module down.
+**Note**: By fact, hard-resets the module, at least when USB-powered.
+
+* `idle()`
+Reduces clock rates of the module keeping functionality.
+
+* `get_input_voltage()`
+Retrieves the input voltage and the battery percentage.
+
+**Returns**: two numbers: the voltage in `mV` and the estimated percentage (Lithium battery discharge controller).
+**Note**: also works when USB-powered (the second number returned is irrelevant).
+
+* `power_on_cause()`
+Retrieves the reason for powering the module on.
+
+**Returns**: one of `POWER_ON_CAUSE_ALARM`, `POWER_ON_CAUSE_CHARGE`, `POWER_ON_CAUSE_EXCEPTION`, `POWER_ON_CAUSE_KEY`, `POWER_ON_CAUSE_MAX`, `POWER_ON_CAUSE_RESET`.
+**Note**: never saw anything except `POWER_ON_CAUSE_CHARGE` returned (needs further investigation).
+

From af94b411d0547b46c3f95830d689ba6fc0994194 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Fri, 8 Feb 2019 21:26:13 +0100
Subject: [PATCH 3146/3533] One more formatting attempts

---
 ports/gprs_a9/README.md | 90 ++++++++++++++++++++++++-----------------
 1 file changed, 53 insertions(+), 37 deletions(-)

diff --git a/ports/gprs_a9/README.md b/ports/gprs_a9/README.md
index 4dd5d8b3c83eb..12f172a7b2619 100644
--- a/ports/gprs_a9/README.md
+++ b/ports/gprs_a9/README.md
@@ -22,100 +22,116 @@ and burn the final lod file in the `hex` folder.
 Provides cellular functionality.
 
 * `get_imei()`
-Retrieves IMEI number.
 
-**Returns**: a string with IMEI number.
+  Retrieves IMEI number.
+
+  **Returns**: a string with IMEI number.
 
 * `is_sim_present()`
-Checks whether the SIM card is present and ICCID can be retrieved.
 
-**Returns**: True if SIM card is present.
+  Checks whether the SIM card is present and ICCID can be retrieved.
+
+  **Returns**: True if SIM card is present.
 
 * `is_network_registered()`
-Checks whether registered on the cellular network.
 
-**Returns**: True if registered.
+  Checks whether registered on the cellular network.
+
+  **Returns**: True if registered.
 
 * `is_roaming()`
-Checks whether registered on the roaming network.
 
-**Returns**: True if roaming.
+  Checks whether registered on the roaming network.
+
+  **Returns**: True if roaming.
 
-**Raises** `ValueError` if not registered ar all.
+  **Raises** `ValueError` if not registered ar all.
 
 * `get_iccid()`
-Retrieves ICCID number of the inserted SIM card.
 
-**Returns**: a string with ICCID number.
+  Retrieves ICCID number of the inserted SIM card.
 
-**Raises**: `ValueError` if no ICCID number can be retrieved.
+  **Returns**: a string with ICCID number.
+
+  **Raises**: `ValueError` if no ICCID number can be retrieved.
 
 * `sms_send(destination, message)`
-Sends SMS.
 
-**Args**:
+  Sends SMS.
+
+  **Args**:
 
     * destination (str): telephone number;
     * message (str): message contents;
 
-**Raises**: `ValueError` if failed to set up/send SMS.
+  **Raises**: `ValueError` if failed to set up/send SMS.
 
 ### `gps`
 
 Provides the GPS functionality
 
 * `on()`
-Turns the GPS on. Blocks until the GPS module responds.
 
-**Raises**: `ValueError` if the GPS module does not respond within 10 seconds.
+  Turns the GPS on. Blocks until the GPS module responds.
+
+  **Raises**: `ValueError` if the GPS module does not respond within 10 seconds.
 
 * `off()`
-Turns the GPS off.
+
+  Turns the GPS off.
 
 * `get_firmware_version()`
-Retrieves the firmware version.
 
-**Returns**: the firmware version as a string.
+  Retrieves the firmware version.
 
-**Raises**: `ValueError` if the GPS module fails to respond.
+  **Returns**: the firmware version as a string.
+
+  **Raises**: `ValueError` if the GPS module fails to respond.
 
 * `get_location()`
-Retrieves the current GPS location.
 
-**Returns**: latitude and longitude in degrees.
+  Retrieves the current GPS location.
+
+  **Returns**: latitude and longitude in degrees.
 
-**Raises**: `ValueError` if the GPS module never responded.
+  **Raises**: `ValueError` if the GPS module never responded.
 
 * `get_satellites()`
-Retrieves the number of satellites visible.
 
-**Returns**: the number of satellites tracked and the number of visible satellites.
+  Retrieves the number of satellites visible.
 
-**Raises**: `ValueError` if the GPS module never responded.
+  **Returns**: the number of satellites tracked and the number of visible satellites.
+
+  **Raises**: `ValueError` if the GPS module never responded.
 
 ### `machine`
 
 Provides power-related functions.
 
 * `reset()`
-Hard-resets the module.
+
+  Hard-resets the module.
 
 * `off()`
-Powers the module down.
-**Note**: By fact, hard-resets the module, at least when USB-powered.
+
+  Powers the module down.
+  **Note**: By fact, hard-resets the module, at least when USB-powered.
 
 * `idle()`
-Reduces clock rates of the module keeping functionality.
+
+  Reduces clock rates of the module keeping functionality.
 
 * `get_input_voltage()`
-Retrieves the input voltage and the battery percentage.
 
-**Returns**: two numbers: the voltage in `mV` and the estimated percentage (Lithium battery discharge controller).
-**Note**: also works when USB-powered (the second number returned is irrelevant).
+  Retrieves the input voltage and the battery percentage.
+
+  **Returns**: two numbers: the voltage in `mV` and the estimated percentage (Lithium battery discharge controller).
+  **Note**: also works when USB-powered (the second number returned is irrelevant).
 
 * `power_on_cause()`
-Retrieves the reason for powering the module on.
 
-**Returns**: one of `POWER_ON_CAUSE_ALARM`, `POWER_ON_CAUSE_CHARGE`, `POWER_ON_CAUSE_EXCEPTION`, `POWER_ON_CAUSE_KEY`, `POWER_ON_CAUSE_MAX`, `POWER_ON_CAUSE_RESET`.
-**Note**: never saw anything except `POWER_ON_CAUSE_CHARGE` returned (needs further investigation).
+  Retrieves the reason for powering the module on.
+
+  **Returns**: one of `POWER_ON_CAUSE_ALARM`, `POWER_ON_CAUSE_CHARGE`, `POWER_ON_CAUSE_EXCEPTION`, `POWER_ON_CAUSE_KEY`, `POWER_ON_CAUSE_MAX`, `POWER_ON_CAUSE_RESET`.
+  **Note**: never saw anything except `POWER_ON_CAUSE_CHARGE` returned (needs further investigation).
 

From f3eba9ee149371da8c17ed7930b4a0adba367c08 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Fri, 8 Feb 2019 22:05:25 +0100
Subject: [PATCH 3147/3533] Add the IMSI getter

---
 ports/gprs_a9/README.md     | 26 +++++++++++++++++---------
 ports/gprs_a9/modcellular.c | 19 +++++++++++++++++++
 2 files changed, 36 insertions(+), 9 deletions(-)

diff --git a/ports/gprs_a9/README.md b/ports/gprs_a9/README.md
index 12f172a7b2619..9c6315f38a7c2 100644
--- a/ports/gprs_a9/README.md
+++ b/ports/gprs_a9/README.md
@@ -23,10 +23,26 @@ Provides cellular functionality.
 
 * `get_imei()`
 
-  Retrieves IMEI number.
+  Retrieves the International Mobile Equipment Identity (IMEI) number.
 
   **Returns**: a string with IMEI number.
 
+* `get_iccid()`
+
+  Retrieves the Integrated Circuit Card ID (ICCID) number of the inserted SIM card.
+
+  **Returns**: a string with ICCID number.
+
+  **Raises**: `ValueError` if no ICCID number can be retrieved.
+
+* `get_imsi()`
+
+  Retrieves the International Mobile Subscriber Identity (IMSI) number of the inserted SIM card.
+
+  **Returns**: a string with IMSI number.
+
+  **Raises**: `ValueError` if no IMSI number can be retrieved.
+
 * `is_sim_present()`
 
   Checks whether the SIM card is present and ICCID can be retrieved.
@@ -47,14 +63,6 @@ Provides cellular functionality.
 
   **Raises** `ValueError` if not registered ar all.
 
-* `get_iccid()`
-
-  Retrieves ICCID number of the inserted SIM card.
-
-  **Returns**: a string with ICCID number.
-
-  **Raises**: `ValueError` if no ICCID number can be retrieved.
-
 * `sms_send(destination, message)`
 
   Sends SMS.
diff --git a/ports/gprs_a9/modcellular.c b/ports/gprs_a9/modcellular.c
index f559997946ff1..b78f4e6dd5549 100644
--- a/ports/gprs_a9/modcellular.c
+++ b/ports/gprs_a9/modcellular.c
@@ -104,6 +104,24 @@ STATIC mp_obj_t get_iccid(void) {
 
 STATIC MP_DEFINE_CONST_FUN_OBJ_0(get_iccid_obj, get_iccid);
 
+STATIC mp_obj_t get_imsi(void) {
+    // ========================================
+    // Retrieves IMSI number.
+    // Returns:
+    //     IMSI number as a string.
+    // ========================================
+    char imsi[21];
+    memset(imsi, 0, sizeof(imsi));
+    if (SIM_GetIMSI((uint8_t*)imsi))
+        return mp_obj_new_str(imsi, strlen(imsi));
+    else {
+        mp_raise_ValueError("No IMSI data: is SIM card inserted?");
+        return mp_const_none;
+    }
+}
+
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(get_imsi_obj, get_imsi);
+
 STATIC mp_obj_t sms_send(mp_obj_t destination, mp_obj_t message) {
     // ========================================
     // Sends an SMS messsage.
@@ -164,6 +182,7 @@ STATIC const mp_map_elem_t mp_module_cellular_globals_table[] = {
     { MP_OBJ_NEW_QSTR(MP_QSTR_is_network_registered), (mp_obj_t)&is_network_registered_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_is_roaming), (mp_obj_t)&is_roaming_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_get_iccid), (mp_obj_t)&get_iccid_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_get_imsi), (mp_obj_t)&get_imsi_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_sms_send), (mp_obj_t)&sms_send_obj },
 };
 

From 22ab5f3c832bde5b116cf9e02777101871004018 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sat, 9 Feb 2019 01:26:54 +0100
Subject: [PATCH 3148/3533] Add hardware watchdog functions

---
 ports/gprs_a9/README.md    | 16 ++++++++++++++++
 ports/gprs_a9/modmachine.c | 39 ++++++++++++++++++++++++++++++++++++--
 2 files changed, 53 insertions(+), 2 deletions(-)

diff --git a/ports/gprs_a9/README.md b/ports/gprs_a9/README.md
index 9c6315f38a7c2..edcf6fa946a37 100644
--- a/ports/gprs_a9/README.md
+++ b/ports/gprs_a9/README.md
@@ -143,3 +143,19 @@ Provides power-related functions.
   **Returns**: one of `POWER_ON_CAUSE_ALARM`, `POWER_ON_CAUSE_CHARGE`, `POWER_ON_CAUSE_EXCEPTION`, `POWER_ON_CAUSE_KEY`, `POWER_ON_CAUSE_MAX`, `POWER_ON_CAUSE_RESET`.
   **Note**: never saw anything except `POWER_ON_CAUSE_CHARGE` returned (needs further investigation).
 
+* `watchdog_on(timeout)`
+
+  Arms the hardware watchdog.
+
+  **Args**:
+
+    * timeout (int): timeout in seconds;
+
+* `watchdog_off()`
+
+  Disarms the hardware watchdog.
+
+* `watchdog_reset()`
+
+  Resets the timer on the hardware watchdog.
+
diff --git a/ports/gprs_a9/modmachine.c b/ports/gprs_a9/modmachine.c
index 54099e9e9bc4e..7e250f44f7146 100644
--- a/ports/gprs_a9/modmachine.c
+++ b/ports/gprs_a9/modmachine.c
@@ -8,6 +8,7 @@
 
 #include "api_event.h"
 #include "api_hal_pm.h"
+#include "api_hal_watchdog.h"
 
 // ------
 // Notify
@@ -15,8 +16,8 @@
 
 Power_On_Cause_t powerOnCause = POWER_ON_CAUSE_MAX;
 
-void notify_power_on(API_Event_t* event) {
-    powerOnCause = event->param1;
+    void notify_power_on(API_Event_t* event) {
+        powerOnCause = event->param1;
 }
 
 // -------
@@ -106,6 +107,37 @@ STATIC mp_obj_t get_input_voltage(void) {
 
 STATIC MP_DEFINE_CONST_FUN_OBJ_0(get_input_voltage_obj, get_input_voltage);
 
+STATIC mp_obj_t watchdog_on(mp_obj_t timeout) {
+    // ========================================
+    // Arms the hardware watchdog.
+    // Args:
+    //     timeout (int): timeout in seconds.
+    // ========================================
+    WatchDog_Open(WATCHDOG_SECOND_TO_TICK(mp_obj_get_int(timeout)));
+    return mp_const_none;
+}
+
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(watchdog_on_obj, watchdog_on);
+
+STATIC mp_obj_t watchdog_off(void) {
+    // ========================================
+    // Disarms the hardware watchdog.
+    // ========================================
+    WatchDog_Close();
+    return mp_const_none;
+}
+
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(watchdog_off_obj, watchdog_off);
+
+STATIC mp_obj_t watchdog_reset(void) {
+    // ========================================
+    // Resets the watchdog timeout.
+    // ========================================
+    WatchDog_KeepAlive();
+    return mp_const_none;
+}
+
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(watchdog_reset_obj, watchdog_reset);
 
 STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_umachine) },
@@ -115,6 +147,9 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     { MP_OBJ_NEW_QSTR(MP_QSTR_power_on_cause), (mp_obj_t)&power_on_cause_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_off), (mp_obj_t)&off_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_get_input_voltage), (mp_obj_t)&get_input_voltage_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_watchdog_on), (mp_obj_t)&watchdog_on_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_watchdog_off), (mp_obj_t)&watchdog_off_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_watchdog_reset), (mp_obj_t)&watchdog_reset_obj },
 
     // Reset reasons
     { MP_ROM_QSTR(MP_QSTR_POWER_ON_CAUSE_KEY),       MP_ROM_INT(POWER_ON_CAUSE_KEY) },

From 28e0a1ec35d32f231f9e2a0a34cad5022b359f71 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sat, 9 Feb 2019 19:46:38 +0100
Subject: [PATCH 3149/3533] Add GPS current/last location

---
 ports/gprs_a9/README.md |  8 ++++++++
 ports/gprs_a9/modgps.c  | 22 ++++++++++++++++++----
 ports/gprs_a9/modgps.h  |  4 ++--
 3 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/ports/gprs_a9/README.md b/ports/gprs_a9/README.md
index edcf6fa946a37..9c2add7819428 100644
--- a/ports/gprs_a9/README.md
+++ b/ports/gprs_a9/README.md
@@ -102,6 +102,14 @@ Provides the GPS functionality
 
   **Returns**: latitude and longitude in degrees.
 
+  **Raises**: `ValueError` if the GPS module never responded or is off.
+
+* `get_last_location()`
+
+  Retrieves the last GPS location.
+
+  **Returns**: latitude and longitude in degrees.
+
   **Raises**: `ValueError` if the GPS module never responded.
 
 * `get_satellites()`
diff --git a/ports/gprs_a9/modgps.c b/ports/gprs_a9/modgps.c
index b5782ce7a5138..38ee2f0ff71a9 100644
--- a/ports/gprs_a9/modgps.c
+++ b/ports/gprs_a9/modgps.c
@@ -75,13 +75,13 @@ STATIC mp_obj_t get_firmware_version(void) {
 
 STATIC MP_DEFINE_CONST_FUN_OBJ_0(get_firmware_version_obj, get_firmware_version);
 
-STATIC mp_obj_t get_location(void) {
+STATIC mp_obj_t get_last_location(void) {
     // ========================================
-    // Retrieves GPS location.
+    // Retrieves the last GPS location.
     // Returns:
     //     Location reported by GPS: latitude and longitude (degrees).
     // ========================================
-    REQUIRES_VALID_GPS_INFO
+    REQUIRES_VALID_GPS_INFO;
 
     int temp = (int)(gpsInfo->rmc.latitude.value/gpsInfo->rmc.latitude.scale/100);
     double latitude = temp+(double)(gpsInfo->rmc.latitude.value - temp*gpsInfo->rmc.latitude.scale*100)/gpsInfo->rmc.latitude.scale/60.0;
@@ -94,6 +94,19 @@ STATIC mp_obj_t get_location(void) {
     return mp_obj_new_tuple(2, tuple);
 }
 
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(get_last_location_obj, get_last_location);
+
+STATIC mp_obj_t get_location(void) {
+    // ========================================
+    // Retrieves the current GPS location.
+    // Returns:
+    //     Location reported by GPS: latitude and longitude (degrees).
+    // ========================================
+    REQUIRES_GPS_ON;
+
+    return get_last_location();
+}
+
 STATIC MP_DEFINE_CONST_FUN_OBJ_0(get_location_obj, get_location);
 
 STATIC mp_obj_t get_satellites(void) {
@@ -102,7 +115,7 @@ STATIC mp_obj_t get_satellites(void) {
     // Returns:
     //     The number of visible GPS satellites.
     // ========================================
-    REQUIRES_VALID_GPS_INFO
+    REQUIRES_VALID_GPS_INFO;
 
     mp_obj_t tuple[2] = {
         mp_obj_new_int(gpsInfo->gga.satellites_tracked),
@@ -119,6 +132,7 @@ STATIC const mp_map_elem_t mp_module_gps_globals_table[] = {
     { MP_OBJ_NEW_QSTR(MP_QSTR_off), (mp_obj_t)&off_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_get_firmware_version), (mp_obj_t)&get_firmware_version_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_get_location), (mp_obj_t)&get_location_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_get_last_location), (mp_obj_t)&get_last_location_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_get_satellites), (mp_obj_t)&get_satellites_obj },
 };
 
diff --git a/ports/gprs_a9/modgps.h b/ports/gprs_a9/modgps.h
index 2f3e50d42dd60..2794a2cfc17ba 100644
--- a/ports/gprs_a9/modgps.h
+++ b/ports/gprs_a9/modgps.h
@@ -6,5 +6,5 @@ extern GPS_Info_t* gpsInfo;
 void notify_gps_update(API_Event_t* event);
 
 #define MAX_GPS_POLL_ATTEMPTS 10
-#define REQUIRES_VALID_GPS_INFO if (!gpsInfo) {mp_raise_ValueError("No GPS data available: did you run gps.on()?"); return mp_const_none;}
-
+#define REQUIRES_VALID_GPS_INFO do { if (!gpsInfo) {mp_raise_ValueError("No GPS data available: did you run gps.on()?"); return mp_const_none;}} while(0)
+#define REQUIRES_GPS_ON do { if (!GPS_IsOpen()) {mp_raise_ValueError("GPS is off"); return mp_const_none;}} while(0)

From f05d2884171d058c1c1c44e418126438abb8ebee Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sun, 10 Feb 2019 23:24:25 +0100
Subject: [PATCH 3150/3533] Add SMS list getter

---
 ports/gprs_a9/main.c        |   3 +
 ports/gprs_a9/modcellular.c | 247 +++++++++++++++++++++++++++++++++++-
 ports/gprs_a9/modcellular.h |   6 +-
 3 files changed, 252 insertions(+), 4 deletions(-)

diff --git a/ports/gprs_a9/main.c b/ports/gprs_a9/main.c
index f37bc1053933f..e822d1bab0856 100644
--- a/ports/gprs_a9/main.c
+++ b/ports/gprs_a9/main.c
@@ -290,6 +290,9 @@ void EventDispatch(API_Event_t* pEvent)
         case API_EVENT_ID_GPS_UART_RECEIVED:
             notify_gps_update(pEvent);
             break;
+        case API_EVENT_ID_SMS_LIST_MESSAGE:
+            notify_sms_list(pEvent);
+            break;
         default:
             break;
     }
diff --git a/ports/gprs_a9/modcellular.c b/ports/gprs_a9/modcellular.c
index b78f4e6dd5549..3938f19764d1f 100644
--- a/ports/gprs_a9/modcellular.c
+++ b/ports/gprs_a9/modcellular.c
@@ -9,6 +9,7 @@
 #include "api_sim.h"
 #include "api_sms.h"
 #include "api_os.h"
+#include "buffer.h"
 
 #define NTW_REG_BIT 0x01
 #define NTW_ROAM_BIT 0x02
@@ -17,8 +18,13 @@
 // Notify
 // ------
 
+// Tracks SIM status on the network
 int sim_status = 0;
 
+// A buffer used for listing messages
+mp_obj_list_t* sms_list_buffer = NULL;
+uint8_t sms_list_buffer_count = 0;
+
 void notify_no_sim(API_Event_t* event) {
     sim_status = 0;
 }
@@ -31,6 +37,203 @@ void notify_registered_roaming(API_Event_t* event) {
     sim_status = NTW_REG_BIT | NTW_ROAM_BIT;
 }
 
+STATIC mp_obj_t sms_from_record(SMS_Message_Info_t* record);
+
+void notify_sms_list(API_Event_t* event) {
+    SMS_Message_Info_t* messageInfo = (SMS_Message_Info_t*)event->pParam1;
+
+    if (sms_list_buffer && (sms_list_buffer->len > sms_list_buffer_count)) {
+        sms_list_buffer->items[sms_list_buffer_count] = sms_from_record(messageInfo);
+        sms_list_buffer_count ++;
+    }
+    OS_Free(messageInfo->data);
+}
+
+// -------
+// Classes
+// -------
+
+typedef struct _sms_obj_t {
+    mp_obj_base_t base;
+    uint8_t index;
+    uint8_t status;
+    uint8_t phone_number_type;
+    mp_obj_t phone_number;
+    mp_obj_t message;
+} sms_obj_t;
+
+//mp_obj_t sms_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
+
+    //enum { ARG_phone_number, ARG_message };
+    //static const mp_arg_t allowed_args[] = {
+        //{ MP_QSTR_phone_number, MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
+        //{ MP_QSTR_message, MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
+    //};
+
+    //mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
+    //mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
+
+    //sms_obj_t *self = m_new_obj(sms_obj_t);
+    //self->base.type = type;
+    
+    //const char* phone_number = mp_obj_str_get_str(args[ARG_phone_number].u_obj);
+    //uint16_t phone_number_len = strlen(phone_number);
+    //if (phone_number_len > SMS_PHONE_NUMBER_MAX_LEN - 1) {
+        //char msg[64];
+        //snprintf(msg, sizeof(msg), "The length of the phone number %d exceeds the maximal value %d", phone_number_len, SMS_PHONE_NUMBER_MAX_LEN - 1);
+        //mp_raise_ValueError(msg);
+        //return mp_const_none;
+    //}
+    //memcpy(self->phone_number, phone_number, phone_number_len + 1);
+
+    //const char* message = mp_obj_str_get_str(args[ARG_message].u_obj);
+    //self->message_len = strlen(message) + 1;
+    //self->message = OS_Malloc(self->message_len);
+    //memcpy(self->message, message, self->message_len);
+    
+    //return MP_OBJ_FROM_PTR(self);
+//}
+
+uint8_t bitsum(uint32_t i) {
+     i = i - ((i >> 1) & 0x55555555);
+     i = (i & 0x33333333) + ((i >> 2) & 0x33333333);
+     return (((i + (i >> 4)) & 0x0F0F0F0F) * 0x01010101) >> 24;
+}
+
+STATIC mp_obj_t sms___status__(mp_obj_t self_in) {
+    // ========================================
+    // SMS status.
+    // Returns:
+    //     Status as int.
+    // ========================================
+    sms_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    return mp_obj_new_int(self->status);
+}
+
+MP_DEFINE_CONST_FUN_OBJ_1(sms___status___obj, sms___status__);
+
+STATIC mp_obj_t sms_inbox(mp_obj_t self_in) {
+    // ========================================
+    // Determines if SMS is inbox or outbox.
+    // Returns:
+    //     True if inbox.
+    // ========================================
+    sms_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    uint8_t s = self->status;
+    REQUIRES_VALID_SMS_STATUS(s);
+    return mp_obj_new_bool(s & (SMS_STATUS_READ | SMS_STATUS_UNREAD));
+}
+
+MP_DEFINE_CONST_FUN_OBJ_1(sms_inbox_obj, sms_inbox);
+
+STATIC mp_obj_t sms_unread(mp_obj_t self_in) {
+    // ========================================
+    // Determines if SMS is unread.
+    // Returns:
+    //     True if unread.
+    // ========================================
+    sms_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    uint8_t s = self->status;
+    REQUIRES_VALID_SMS_STATUS(s);
+    return mp_obj_new_bool(s & SMS_STATUS_UNREAD);
+}
+
+MP_DEFINE_CONST_FUN_OBJ_1(sms_unread_obj, sms_unread);
+
+STATIC mp_obj_t sms_sent(mp_obj_t self_in) {
+    // ========================================
+    // Determines if SMS was sent.
+    // Returns:
+    //     True if it was sent.
+    // ========================================
+    sms_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    uint8_t s = self->status;
+    REQUIRES_VALID_SMS_STATUS(s);
+    return mp_obj_new_bool(!(s | SMS_STATUS_UNSENT));
+}
+
+MP_DEFINE_CONST_FUN_OBJ_1(sms_sent_obj, sms_sent);
+
+STATIC void sms_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+    // ========================================
+    // SMS.__str__()
+    // ========================================
+    sms_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    mp_hal_stdout_tx_str("SMS(\"");
+    mp_hal_stdout_tx_str(mp_obj_str_get_str(self->phone_number));
+    mp_hal_stdout_tx_str("\"(");
+    switch (self->phone_number_type) {
+        case SMS_NUMBER_TYPE_UNKNOWN:
+            mp_hal_stdout_tx_str("unk");
+            break;
+        case SMS_NUMBER_TYPE_INTERNATIONAL:
+            mp_hal_stdout_tx_str("int");
+            break;
+        case SMS_NUMBER_TYPE_NATIONAL:
+            mp_hal_stdout_tx_str("loc");
+            break;
+        default: {
+            char msg[8];
+            snprintf(msg, sizeof(msg), "%d", self->phone_number_type);
+            mp_hal_stdout_tx_str(msg);
+            break;
+        }
+    }
+    mp_hal_stdout_tx_str("), \"");
+    mp_hal_stdout_tx_str(mp_obj_str_get_str(self->message));
+    mp_hal_stdout_tx_str("\", unread: ");
+    if (sms_unread(self_in)) {
+        mp_hal_stdout_tx_str("True");
+    } else {
+        mp_hal_stdout_tx_str("False");
+    }
+    mp_hal_stdout_tx_str(", sent: ");
+    if (sms_sent(self_in)) {
+        mp_hal_stdout_tx_str("True");
+    } else {
+        mp_hal_stdout_tx_str("False");
+    }
+    mp_hal_stdout_tx_str(")");
+}
+
+STATIC const mp_rom_map_elem_t sms_locals_dict_table[] = {
+    { MP_ROM_QSTR(MP_QSTR___status__), MP_ROM_PTR(&sms___status___obj) },
+    { MP_ROM_QSTR(MP_QSTR_is_inbox), MP_ROM_PTR(&sms_inbox_obj) },
+    { MP_ROM_QSTR(MP_QSTR_is_unread), MP_ROM_PTR(&sms_unread_obj) },
+    { MP_ROM_QSTR(MP_QSTR_is_sent), MP_ROM_PTR(&sms_sent_obj) },
+};
+
+STATIC MP_DEFINE_CONST_DICT(sms_locals_dict, sms_locals_dict_table);
+
+const mp_obj_type_t sms_type = {
+    { &mp_type_type },
+    .name = MP_QSTR_SMS,
+    // .make_new = sms_make_new,
+    .print = sms_print,
+    .locals_dict = (mp_obj_dict_t*)&sms_locals_dict,
+};
+
+// -------
+// Private
+// -------
+
+STATIC mp_obj_t sms_from_record(SMS_Message_Info_t* record) {
+    // ========================================
+    // Prepares an SMS object from the record.
+    // Returns:
+    //     A new SMS object.
+    // ========================================
+    sms_obj_t *self = m_new_obj_with_finaliser(sms_obj_t);
+    self->base.type = &sms_type;
+    self->index = record->index;
+    self->status = (uint8_t)record->status;
+    self->phone_number_type = (uint8_t)record->phoneNumberType;
+    // Is this an SDK bug?
+    self->phone_number = mp_obj_new_str(record->phoneNumber + 1, SMS_PHONE_NUMBER_MAX_LEN - 1);
+    self->message = mp_obj_new_str(record->data, record->dataLen);
+    return MP_OBJ_FROM_PTR(self);
+}
+
 // -------
 // Methods
 // -------
@@ -79,7 +282,7 @@ STATIC mp_obj_t is_roaming(void) {
     // Returns:
     //     True if roaming.
     // ========================================
-    REQUIRES_NETWORK_REGISTRATION
+    REQUIRES_NETWORK_REGISTRATION;
 
     return mp_obj_new_bool(sim_status & NTW_ROAM_BIT);
 }
@@ -122,6 +325,42 @@ STATIC mp_obj_t get_imsi(void) {
 
 STATIC MP_DEFINE_CONST_FUN_OBJ_0(get_imsi_obj, get_imsi);
 
+STATIC mp_obj_t sms_list(void) {
+    // ========================================
+    // Lists SMS messages.
+    // Returns:
+    //     A list of SMS messages.
+    // ========================================
+    REQUIRES_NETWORK_REGISTRATION;
+
+    SMS_Storage_Info_t storage;
+    SMS_GetStorageInfo(&storage, SMS_STORAGE_SIM_CARD);
+    
+    sms_list_buffer = mp_obj_new_list(storage.used, NULL);
+    sms_list_buffer_count = 0;
+
+    SMS_ListMessageRequst(SMS_STATUS_ALL, SMS_STORAGE_SIM_CARD);
+    
+    uint8_t attempts = 0;
+    for (attempts = 0; attempts < MAX_SMS_LIST_ATTEMPTS; attempts++) {
+        OS_Sleep(100);
+        if (sms_list_buffer_count == storage.used) break;
+    }
+    
+    mp_obj_list_t *result = sms_list_buffer;
+    sms_list_buffer = NULL;
+    
+    uint16_t i;
+    for (i = sms_list_buffer_count; i < result->len; i++) {
+        result->items[i] = mp_const_none;
+    }
+    sms_list_buffer_count = 0;
+
+    return (mp_obj_t)result;
+}
+
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(sms_list_obj, sms_list);
+
 STATIC mp_obj_t sms_send(mp_obj_t destination, mp_obj_t message) {
     // ========================================
     // Sends an SMS messsage.
@@ -129,7 +368,7 @@ STATIC mp_obj_t sms_send(mp_obj_t destination, mp_obj_t message) {
     //     destination (str): telephone number;
     //     message (str): message contents;
     // ========================================
-    REQUIRES_NETWORK_REGISTRATION
+    REQUIRES_NETWORK_REGISTRATION;
 
     const char* destination_c = mp_obj_str_get_str(destination);
     const char* message_c = mp_obj_str_get_str(message);
@@ -177,12 +416,16 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(sms_send_obj, sms_send);
 
 STATIC const mp_map_elem_t mp_module_cellular_globals_table[] = {
     { MP_OBJ_NEW_QSTR(MP_QSTR___name__), MP_OBJ_NEW_QSTR(MP_QSTR_cellular) },
+
+    { MP_ROM_QSTR(MP_QSTR_SMS), MP_ROM_PTR(&sms_type) },
+
     { MP_OBJ_NEW_QSTR(MP_QSTR_get_imei), (mp_obj_t)&get_imei_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_is_sim_present), (mp_obj_t)&is_sim_present_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_is_network_registered), (mp_obj_t)&is_network_registered_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_is_roaming), (mp_obj_t)&is_roaming_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_get_iccid), (mp_obj_t)&get_iccid_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_get_imsi), (mp_obj_t)&get_imsi_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_sms_list), (mp_obj_t)&sms_list_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_sms_send), (mp_obj_t)&sms_send_obj },
 };
 
diff --git a/ports/gprs_a9/modcellular.h b/ports/gprs_a9/modcellular.h
index 659d09be72311..1631569d72607 100644
--- a/ports/gprs_a9/modcellular.h
+++ b/ports/gprs_a9/modcellular.h
@@ -5,6 +5,8 @@ extern int sim_status;
 void notify_no_sim(API_Event_t* event);
 void notify_registered_home(API_Event_t* event);
 void notify_registered_roaming(API_Event_t* event);
+void notify_sms_list(API_Event_t* event);
 
-#define REQUIRES_NETWORK_REGISTRATION if (!sim_status) {mp_raise_ValueError("Network is not available: is SIM card inserted?"); return mp_const_none;}
-
+#define MAX_SMS_LIST_ATTEMPTS 10
+#define REQUIRES_NETWORK_REGISTRATION do {if (!sim_status) {mp_raise_ValueError("Network is not available: is SIM card inserted?"); return mp_const_none;}} while(0)
+#define REQUIRES_VALID_SMS_STATUS(bits) do {if (bitsum(bits) != 1) {mp_raise_ValueError("Invalid SMS bits"); return mp_const_none;}} while(0)

From 19096c4b023d5ad7818a4bbe84aab4d806af693a Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sun, 10 Feb 2019 23:26:19 +0100
Subject: [PATCH 3151/3533] Add sms_list reference in README

---
 ports/gprs_a9/README.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/ports/gprs_a9/README.md b/ports/gprs_a9/README.md
index 9c2add7819428..2d9dbd35d077f 100644
--- a/ports/gprs_a9/README.md
+++ b/ports/gprs_a9/README.md
@@ -63,6 +63,12 @@ Provides cellular functionality.
 
   **Raises** `ValueError` if not registered ar all.
 
+* `sms_list()`
+
+  Retrieves SMS from the SIM card.
+  
+  **Returns**: a list of SMS messages.
+
 * `sms_send(destination, message)`
 
   Sends SMS.

From 35ac7b6f851da73cc58a88a07c5ce0f034fd4fcf Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Tue, 12 Feb 2019 01:14:05 +0100
Subject: [PATCH 3152/3533] Rework SMS object

---
 ports/gprs_a9/README.md     |  19 ++-
 ports/gprs_a9/modcellular.c | 262 ++++++++++++++++--------------------
 ports/gprs_a9/modcellular.h |   2 +-
 3 files changed, 131 insertions(+), 152 deletions(-)

diff --git a/ports/gprs_a9/README.md b/ports/gprs_a9/README.md
index 2d9dbd35d077f..3c0e6ed8a3c79 100644
--- a/ports/gprs_a9/README.md
+++ b/ports/gprs_a9/README.md
@@ -69,16 +69,23 @@ Provides cellular functionality.
   
   **Returns**: a list of SMS messages.
 
-* `sms_send(destination, message)`
+* `SMS(phone_number, message)`
 
-  Sends SMS.
+  A class for handling SMS.
 
-  **Args**:
+  **Attrs**:
 
-    * destination (str): telephone number;
+    * phone_number (str): phone number (sender or desstination);
     * message (str): message contents;
-
-  **Raises**: `ValueError` if failed to set up/send SMS.
+    * status (int): an integer with status bits;
+    * inbox (bool): incoming message if `True`, outgoing message if `False` or unknown status if `None`;
+    * unread (bool): unread message if `True`, previously read message if `False` ir unknown status if `None`;
+    * sent (bool): sent message if `True`, not sent message if `False` or unknown status if `None`;
+    * `send()`
+    
+      Sends the message.
+
+      **Raises**: `ValueError` if failed to set up/send SMS.
 
 ### `gps`
 
diff --git a/ports/gprs_a9/modcellular.c b/ports/gprs_a9/modcellular.c
index 3938f19764d1f..33c5f8875d5c8 100644
--- a/ports/gprs_a9/modcellular.c
+++ b/ports/gprs_a9/modcellular.c
@@ -62,37 +62,27 @@ typedef struct _sms_obj_t {
     mp_obj_t message;
 } sms_obj_t;
 
-//mp_obj_t sms_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
+mp_obj_t sms_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
 
-    //enum { ARG_phone_number, ARG_message };
-    //static const mp_arg_t allowed_args[] = {
-        //{ MP_QSTR_phone_number, MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
-        //{ MP_QSTR_message, MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
-    //};
-
-    //mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
-    //mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
+    enum { ARG_phone_number, ARG_message };
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_phone_number, MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
+        { MP_QSTR_message, MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
+    };
 
-    //sms_obj_t *self = m_new_obj(sms_obj_t);
-    //self->base.type = type;
-    
-    //const char* phone_number = mp_obj_str_get_str(args[ARG_phone_number].u_obj);
-    //uint16_t phone_number_len = strlen(phone_number);
-    //if (phone_number_len > SMS_PHONE_NUMBER_MAX_LEN - 1) {
-        //char msg[64];
-        //snprintf(msg, sizeof(msg), "The length of the phone number %d exceeds the maximal value %d", phone_number_len, SMS_PHONE_NUMBER_MAX_LEN - 1);
-        //mp_raise_ValueError(msg);
-        //return mp_const_none;
-    //}
-    //memcpy(self->phone_number, phone_number, phone_number_len + 1);
-
-    //const char* message = mp_obj_str_get_str(args[ARG_message].u_obj);
-    //self->message_len = strlen(message) + 1;
-    //self->message = OS_Malloc(self->message_len);
-    //memcpy(self->message, message, self->message_len);
-    
-    //return MP_OBJ_FROM_PTR(self);
-//}
+    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
+    mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
+
+    sms_obj_t *self = m_new_obj(sms_obj_t);
+    self->base.type = type;
+    self->index = 0;
+    self->status = 0;
+    // TODO: fix the following
+    self->phone_number_type = 0;
+    self->phone_number = args[ARG_phone_number].u_obj;
+    self->message = args[ARG_message].u_obj;
+    return MP_OBJ_FROM_PTR(self);
+}
 
 uint8_t bitsum(uint32_t i) {
      i = i - ((i >> 1) & 0x55555555);
@@ -100,18 +90,6 @@ uint8_t bitsum(uint32_t i) {
      return (((i + (i >> 4)) & 0x0F0F0F0F) * 0x01010101) >> 24;
 }
 
-STATIC mp_obj_t sms___status__(mp_obj_t self_in) {
-    // ========================================
-    // SMS status.
-    // Returns:
-    //     Status as int.
-    // ========================================
-    sms_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    return mp_obj_new_int(self->status);
-}
-
-MP_DEFINE_CONST_FUN_OBJ_1(sms___status___obj, sms___status__);
-
 STATIC mp_obj_t sms_inbox(mp_obj_t self_in) {
     // ========================================
     // Determines if SMS is inbox or outbox.
@@ -124,8 +102,6 @@ STATIC mp_obj_t sms_inbox(mp_obj_t self_in) {
     return mp_obj_new_bool(s & (SMS_STATUS_READ | SMS_STATUS_UNREAD));
 }
 
-MP_DEFINE_CONST_FUN_OBJ_1(sms_inbox_obj, sms_inbox);
-
 STATIC mp_obj_t sms_unread(mp_obj_t self_in) {
     // ========================================
     // Determines if SMS is unread.
@@ -138,8 +114,6 @@ STATIC mp_obj_t sms_unread(mp_obj_t self_in) {
     return mp_obj_new_bool(s & SMS_STATUS_UNREAD);
 }
 
-MP_DEFINE_CONST_FUN_OBJ_1(sms_unread_obj, sms_unread);
-
 STATIC mp_obj_t sms_sent(mp_obj_t self_in) {
     // ========================================
     // Determines if SMS was sent.
@@ -152,65 +126,117 @@ STATIC mp_obj_t sms_sent(mp_obj_t self_in) {
     return mp_obj_new_bool(!(s | SMS_STATUS_UNSENT));
 }
 
-MP_DEFINE_CONST_FUN_OBJ_1(sms_sent_obj, sms_sent);
-
-STATIC void sms_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+STATIC mp_obj_t sms_send(mp_obj_t self_in) {
     // ========================================
-    // SMS.__str__()
+    // Sends an SMS messsage.
     // ========================================
+    REQUIRES_NETWORK_REGISTRATION;
+
     sms_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    mp_hal_stdout_tx_str("SMS(\"");
-    mp_hal_stdout_tx_str(mp_obj_str_get_str(self->phone_number));
-    mp_hal_stdout_tx_str("\"(");
-    switch (self->phone_number_type) {
-        case SMS_NUMBER_TYPE_UNKNOWN:
-            mp_hal_stdout_tx_str("unk");
-            break;
-        case SMS_NUMBER_TYPE_INTERNATIONAL:
-            mp_hal_stdout_tx_str("int");
-            break;
-        case SMS_NUMBER_TYPE_NATIONAL:
-            mp_hal_stdout_tx_str("loc");
-            break;
-        default: {
-            char msg[8];
-            snprintf(msg, sizeof(msg), "%d", self->phone_number_type);
-            mp_hal_stdout_tx_str(msg);
-            break;
-        }
+
+    if (self->status != 0) {
+        mp_raise_ValueError("A message with non-zero status cannot be sent");
+        return mp_const_none;
     }
-    mp_hal_stdout_tx_str("), \"");
-    mp_hal_stdout_tx_str(mp_obj_str_get_str(self->message));
-    mp_hal_stdout_tx_str("\", unread: ");
-    if (sms_unread(self_in)) {
-        mp_hal_stdout_tx_str("True");
-    } else {
-        mp_hal_stdout_tx_str("False");
+
+    const char* destination_c = mp_obj_str_get_str(self->phone_number);
+    const char* message_c = mp_obj_str_get_str(self->message);
+
+    if (!SMS_SetFormat(SMS_FORMAT_TEXT, SIM0)) {
+        mp_raise_ValueError("Failed to set SMS format: is SIM card present?");
+        return mp_const_none;
     }
-    mp_hal_stdout_tx_str(", sent: ");
-    if (sms_sent(self_in)) {
-        mp_hal_stdout_tx_str("True");
-    } else {
-        mp_hal_stdout_tx_str("False");
+
+    SMS_Parameter_t smsParam = {
+        .fo = 17 , // stadard values
+        .vp = 167,
+        .pid= 0  ,
+        .dcs= 8  , // 0:English 7bit, 4:English 8 bit, 8:Unicode 2 Bytes
+    };
+
+    if (!SMS_SetParameter(&smsParam,SIM0)) {
+        mp_raise_ValueError("Failed to set SMS parameters");
+        return mp_const_none;
+    }
+
+    if (!SMS_SetNewMessageStorage(SMS_STORAGE_SIM_CARD)) {
+        mp_raise_ValueError("Failed to set SMS storage in the SIM card");
+        return mp_const_none;
     }
-    mp_hal_stdout_tx_str(")");
+
+    uint8_t* unicode = NULL;
+    uint32_t unicodeLen;
+
+    if (!SMS_LocalLanguage2Unicode((uint8_t*)message_c, strlen(message_c), CHARSET_UTF_8, &unicode, &unicodeLen)) {
+        mp_raise_ValueError("Failed to convert to Unicode before sending SMS");
+        return mp_const_none;
+    }
+
+    if (!SMS_SendMessage(destination_c, unicode, unicodeLen, SIM0)) {
+        OS_Free(unicode);
+        mp_raise_ValueError("Failed to send SMS message");
+        return mp_const_none;
+    }
+    OS_Free(unicode);
+
+    return mp_const_none;
 }
 
-STATIC const mp_rom_map_elem_t sms_locals_dict_table[] = {
-    { MP_ROM_QSTR(MP_QSTR___status__), MP_ROM_PTR(&sms___status___obj) },
-    { MP_ROM_QSTR(MP_QSTR_is_inbox), MP_ROM_PTR(&sms_inbox_obj) },
-    { MP_ROM_QSTR(MP_QSTR_is_unread), MP_ROM_PTR(&sms_unread_obj) },
-    { MP_ROM_QSTR(MP_QSTR_is_sent), MP_ROM_PTR(&sms_sent_obj) },
-};
+MP_DEFINE_CONST_FUN_OBJ_1(sms_send_obj, &sms_send);
+
+STATIC void sms_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
+    // ========================================
+    // SMS.[attr]
+    // ========================================
+    if (dest[0] != MP_OBJ_NULL) {
+    } else {
+        sms_obj_t *self = MP_OBJ_TO_PTR(self_in);
+        // .telephone_number
+        if (attr == MP_QSTR_phone_number) {
+            dest[0] = self->phone_number;
+        // .message
+        } else if (attr == MP_QSTR_message) {
+            dest[0] = self->message;
+        // .status
+        } else if (attr == MP_QSTR_status) {
+            dest[0] = mp_obj_new_int(self->status);
+        // .inbox
+        } else if (attr == MP_QSTR_inbox) {
+            dest[0] = sms_inbox(self_in);
+        // .unread
+        } else if (attr == MP_QSTR_unread) {
+            dest[0] = sms_unread(self_in);
+        // .sent
+        } else if (attr == MP_QSTR_sent) {
+            dest[0] = sms_sent(self_in);
+        // .send
+        } else if (attr == MP_QSTR_send) {
+            mp_convert_member_lookup(self_in, mp_obj_get_type(self_in), MP_ROM_PTR(&sms_send_obj), dest);
+        }
+    }
+}
 
-STATIC MP_DEFINE_CONST_DICT(sms_locals_dict, sms_locals_dict_table);
+STATIC void sms_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+    // ========================================
+    // SMS.__str__()
+    // ========================================
+    sms_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    mp_printf(print, "SMS(\"%s\"(%s), \"%s\", 0x%02x)",
+            mp_obj_str_get_str(self->phone_number),
+            self->phone_number_type == SMS_NUMBER_TYPE_UNKNOWN ? "unk" :
+            self->phone_number_type == SMS_NUMBER_TYPE_INTERNATIONAL ? "int" :
+            self->phone_number_type == SMS_NUMBER_TYPE_NATIONAL ? "loc" : "???",
+            mp_obj_str_get_str(self->message),
+            self->status
+    );
+}
 
 const mp_obj_type_t sms_type = {
     { &mp_type_type },
     .name = MP_QSTR_SMS,
-    // .make_new = sms_make_new,
+    .make_new = sms_make_new,
     .print = sms_print,
-    .locals_dict = (mp_obj_dict_t*)&sms_locals_dict,
+    .attr = sms_attr,
 };
 
 // -------
@@ -229,7 +255,7 @@ STATIC mp_obj_t sms_from_record(SMS_Message_Info_t* record) {
     self->status = (uint8_t)record->status;
     self->phone_number_type = (uint8_t)record->phoneNumberType;
     // Is this an SDK bug?
-    self->phone_number = mp_obj_new_str(record->phoneNumber + 1, SMS_PHONE_NUMBER_MAX_LEN - 1);
+    self->phone_number = mp_obj_new_str(record->phoneNumber + 1, strlen(record->phoneNumber + 1));
     self->message = mp_obj_new_str(record->data, record->dataLen);
     return MP_OBJ_FROM_PTR(self);
 }
@@ -361,59 +387,6 @@ STATIC mp_obj_t sms_list(void) {
 
 STATIC MP_DEFINE_CONST_FUN_OBJ_0(sms_list_obj, sms_list);
 
-STATIC mp_obj_t sms_send(mp_obj_t destination, mp_obj_t message) {
-    // ========================================
-    // Sends an SMS messsage.
-    // Args:
-    //     destination (str): telephone number;
-    //     message (str): message contents;
-    // ========================================
-    REQUIRES_NETWORK_REGISTRATION;
-
-    const char* destination_c = mp_obj_str_get_str(destination);
-    const char* message_c = mp_obj_str_get_str(message);
-
-    if (!SMS_SetFormat(SMS_FORMAT_TEXT, SIM0)) {
-        mp_raise_ValueError("Failed to set SMS format: is SIM card present?");
-        return mp_const_none;
-    }
-
-    SMS_Parameter_t smsParam = {
-        .fo = 17 , // stadard values
-        .vp = 167,
-        .pid= 0  ,
-        .dcs= 8  , // 0:English 7bit, 4:English 8 bit, 8:Unicode 2 Bytes
-    };
-    if (!SMS_SetParameter(&smsParam,SIM0)) {
-        mp_raise_ValueError("Failed to set SMS parameters");
-        return mp_const_none;
-    }
-
-    if (!SMS_SetNewMessageStorage(SMS_STORAGE_SIM_CARD)) {
-        mp_raise_ValueError("Failed to set SMS storage in the SIM card");
-        return mp_const_none;
-    }
-
-    uint8_t* unicode = NULL;
-    uint32_t unicodeLen;
-
-    if (!SMS_LocalLanguage2Unicode((uint8_t*)message_c, strlen(message_c), CHARSET_UTF_8, &unicode, &unicodeLen)) {
-        mp_raise_ValueError("Failed to convert to Unicode before sending SMS");
-        return mp_const_none;
-    }
-
-    if (!SMS_SendMessage(destination_c, unicode, unicodeLen, SIM0)) {
-        OS_Free(unicode);
-        mp_raise_ValueError("Failed to send SMS message");
-        return mp_const_none;
-    }
-    OS_Free(unicode);
-
-    return mp_const_none;
-}
-
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(sms_send_obj, sms_send);
-
 STATIC const mp_map_elem_t mp_module_cellular_globals_table[] = {
     { MP_OBJ_NEW_QSTR(MP_QSTR___name__), MP_OBJ_NEW_QSTR(MP_QSTR_cellular) },
 
@@ -426,7 +399,6 @@ STATIC const mp_map_elem_t mp_module_cellular_globals_table[] = {
     { MP_OBJ_NEW_QSTR(MP_QSTR_get_iccid), (mp_obj_t)&get_iccid_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_get_imsi), (mp_obj_t)&get_imsi_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_sms_list), (mp_obj_t)&sms_list_obj },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_sms_send), (mp_obj_t)&sms_send_obj },
 };
 
 STATIC MP_DEFINE_CONST_DICT(mp_module_cellular_globals, mp_module_cellular_globals_table);
diff --git a/ports/gprs_a9/modcellular.h b/ports/gprs_a9/modcellular.h
index 1631569d72607..78a88282ed96a 100644
--- a/ports/gprs_a9/modcellular.h
+++ b/ports/gprs_a9/modcellular.h
@@ -9,4 +9,4 @@ void notify_sms_list(API_Event_t* event);
 
 #define MAX_SMS_LIST_ATTEMPTS 10
 #define REQUIRES_NETWORK_REGISTRATION do {if (!sim_status) {mp_raise_ValueError("Network is not available: is SIM card inserted?"); return mp_const_none;}} while(0)
-#define REQUIRES_VALID_SMS_STATUS(bits) do {if (bitsum(bits) != 1) {mp_raise_ValueError("Invalid SMS bits"); return mp_const_none;}} while(0)
+#define REQUIRES_VALID_SMS_STATUS(bits) do {if (bitsum(bits) != 1) {return mp_const_none;}} while(0)

From 81d6f82528a66c817f401bb3a0bc5cb5f44de663 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Wed, 13 Feb 2019 21:52:25 +0100
Subject: [PATCH 3153/3533] Rework timeouts and a minor print change

---
 ports/gprs_a9/modcellular.c | 12 +++++++-----
 ports/gprs_a9/modcellular.h |  2 +-
 ports/gprs_a9/modgps.c      | 17 ++++++++++-------
 ports/gprs_a9/modgps.h      |  2 +-
 4 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/ports/gprs_a9/modcellular.c b/ports/gprs_a9/modcellular.c
index 33c5f8875d5c8..57d590042cbc6 100644
--- a/ports/gprs_a9/modcellular.c
+++ b/ports/gprs_a9/modcellular.c
@@ -10,6 +10,7 @@
 #include "api_sms.h"
 #include "api_os.h"
 #include "buffer.h"
+#include "time.h"
 
 #define NTW_REG_BIT 0x01
 #define NTW_ROAM_BIT 0x02
@@ -154,7 +155,7 @@ STATIC mp_obj_t sms_send(mp_obj_t self_in) {
         .dcs= 8  , // 0:English 7bit, 4:English 8 bit, 8:Unicode 2 Bytes
     };
 
-    if (!SMS_SetParameter(&smsParam,SIM0)) {
+    if (!SMS_SetParameter(&smsParam, SIM0)) {
         mp_raise_ValueError("Failed to set SMS parameters");
         return mp_const_none;
     }
@@ -221,13 +222,14 @@ STATIC void sms_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t
     // SMS.__str__()
     // ========================================
     sms_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    mp_printf(print, "SMS(\"%s\"(%s), \"%s\", 0x%02x)",
+    mp_printf(print, "SMS(\"%s\"(%s), \"%s\", 0x%02x, #%d)",
             mp_obj_str_get_str(self->phone_number),
             self->phone_number_type == SMS_NUMBER_TYPE_UNKNOWN ? "unk" :
             self->phone_number_type == SMS_NUMBER_TYPE_INTERNATIONAL ? "int" :
             self->phone_number_type == SMS_NUMBER_TYPE_NATIONAL ? "loc" : "???",
             mp_obj_str_get_str(self->message),
-            self->status
+            self->status,
+            self->index
     );
 }
 
@@ -367,8 +369,8 @@ STATIC mp_obj_t sms_list(void) {
 
     SMS_ListMessageRequst(SMS_STATUS_ALL, SMS_STORAGE_SIM_CARD);
     
-    uint8_t attempts = 0;
-    for (attempts = 0; attempts < MAX_SMS_LIST_ATTEMPTS; attempts++) {
+    clock_t time = clock();
+    while (clock() - time < MAX_SMS_LIST_TIMEOUT * CLOCKS_PER_MSEC) {
         OS_Sleep(100);
         if (sms_list_buffer_count == storage.used) break;
     }
diff --git a/ports/gprs_a9/modcellular.h b/ports/gprs_a9/modcellular.h
index 78a88282ed96a..d676c8448039c 100644
--- a/ports/gprs_a9/modcellular.h
+++ b/ports/gprs_a9/modcellular.h
@@ -7,6 +7,6 @@ void notify_registered_home(API_Event_t* event);
 void notify_registered_roaming(API_Event_t* event);
 void notify_sms_list(API_Event_t* event);
 
-#define MAX_SMS_LIST_ATTEMPTS 10
+#define MAX_SMS_LIST_TIMEOUT 1000
 #define REQUIRES_NETWORK_REGISTRATION do {if (!sim_status) {mp_raise_ValueError("Network is not available: is SIM card inserted?"); return mp_const_none;}} while(0)
 #define REQUIRES_VALID_SMS_STATUS(bits) do {if (bitsum(bits) != 1) {return mp_const_none;}} while(0)
diff --git a/ports/gprs_a9/modgps.c b/ports/gprs_a9/modgps.c
index 38ee2f0ff71a9..9ac56fa28cf38 100644
--- a/ports/gprs_a9/modgps.c
+++ b/ports/gprs_a9/modgps.c
@@ -10,6 +10,7 @@
 #include "api_event.h"
 #include "gps_parse.h"
 #include "gps.h"
+#include "time.h"
 
 // ------
 // Notify
@@ -34,13 +35,15 @@ STATIC mp_obj_t on(void) {
     GPS_Init();
     GPS_Open(NULL);
     gpsInfo = Gps_GetInfo();
-    uint8_t attempts = 0;
-    while (gpsInfo->rmc.latitude.value == 0) {
-        attempts ++;
-        if (attempts == MAX_GPS_POLL_ATTEMPTS) {
-            mp_raise_ValueError("Failed to start GPS");
+    clock_t time = clock();
+    while (clock() - time < MAX_GPS_TIMEOUT * CLOCKS_PER_MSEC) {
+        if (gpsInfo->rmc.latitude.value != 0) {
+            break;
         }
-        OS_Sleep(1000);
+        OS_Sleep(100);
+    }
+    if (gpsInfo->rmc.latitude.value == 0) {
+        mp_raise_ValueError("Failed to start GPS");
     }
     return mp_const_none;
 }
@@ -66,7 +69,7 @@ STATIC mp_obj_t get_firmware_version(void) {
     //     ValueError if GPS was off.
     // ========================================
     char buffer[300];
-    if (!GPS_GetVersion(buffer,150)) {
+    if (!GPS_GetVersion(buffer, 150)) {
         mp_raise_ValueError("Failed to get the firmware version: did you run gps.on()?");
         return mp_const_none;
     }
diff --git a/ports/gprs_a9/modgps.h b/ports/gprs_a9/modgps.h
index 2794a2cfc17ba..71f8f95ad54d9 100644
--- a/ports/gprs_a9/modgps.h
+++ b/ports/gprs_a9/modgps.h
@@ -5,6 +5,6 @@ extern GPS_Info_t* gpsInfo;
 
 void notify_gps_update(API_Event_t* event);
 
-#define MAX_GPS_POLL_ATTEMPTS 10
+#define MAX_GPS_TIMEOUT 5000
 #define REQUIRES_VALID_GPS_INFO do { if (!gpsInfo) {mp_raise_ValueError("No GPS data available: did you run gps.on()?"); return mp_const_none;}} while(0)
 #define REQUIRES_GPS_ON do { if (!GPS_IsOpen()) {mp_raise_ValueError("GPS is off"); return mp_const_none;}} while(0)

From 345be17aa07a24eb7e836e828ef086693c55bc59 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Wed, 13 Feb 2019 22:59:26 +0100
Subject: [PATCH 3154/3533] Rework timeouts, add debug messages, fix warnings

---
 ports/gprs_a9/main.c        | 18 ++++++++++++------
 ports/gprs_a9/modcellular.c | 25 +++++++++++++++++++------
 ports/gprs_a9/modcellular.h |  3 +++
 3 files changed, 34 insertions(+), 12 deletions(-)

diff --git a/ports/gprs_a9/main.c b/ports/gprs_a9/main.c
index e822d1bab0856..040a95d8c19a2 100644
--- a/ports/gprs_a9/main.c
+++ b/ports/gprs_a9/main.c
@@ -230,21 +230,27 @@ void EventDispatch(API_Event_t* pEvent)
         case API_EVENT_ID_POWER_ON:
             notify_power_on(pEvent);
             break;
+
         case API_EVENT_ID_NO_SIMCARD:
-        {
             notify_no_sim(pEvent);
             break;
-        }
+
         case API_EVENT_ID_NETWORK_REGISTERED_HOME:
-        {
             notify_registered_home(pEvent);
             break;
-        }
+
         case API_EVENT_ID_NETWORK_REGISTERED_ROAMING:
-        {
             notify_registered_roaming(pEvent);
             break;
-        }
+
+        case API_EVENT_ID_SMS_SENT:
+            notify_sms_sent(pEvent);
+            break;
+
+        case API_EVENT_ID_SMS_ERROR:
+            notify_sms_error(pEvent);
+            break;
+
         case API_EVENT_ID_NETWORK_DETACHED:
             Trace(2,"network detached");
             break;
diff --git a/ports/gprs_a9/modcellular.c b/ports/gprs_a9/modcellular.c
index 57d590042cbc6..d56c6bec4cbec 100644
--- a/ports/gprs_a9/modcellular.c
+++ b/ports/gprs_a9/modcellular.c
@@ -50,6 +50,14 @@ void notify_sms_list(API_Event_t* event) {
     OS_Free(messageInfo->data);
 }
 
+void notify_sms_sent(API_Event_t* event) {
+    // mp_printf(&mp_plat_print, "SMS has been sent");
+}
+
+void notify_sms_error(API_Event_t* event) {
+    mp_printf(&mp_plat_print, "SMS Error %d", event->param1);
+}
+
 // -------
 // Classes
 // -------
@@ -146,7 +154,7 @@ STATIC mp_obj_t sms_send(mp_obj_t self_in) {
     if (!SMS_SetFormat(SMS_FORMAT_TEXT, SIM0)) {
         mp_raise_ValueError("Failed to set SMS format: is SIM card present?");
         return mp_const_none;
-    }
+    } 
 
     SMS_Parameter_t smsParam = {
         .fo = 17 , // stadard values
@@ -175,7 +183,7 @@ STATIC mp_obj_t sms_send(mp_obj_t self_in) {
 
     if (!SMS_SendMessage(destination_c, unicode, unicodeLen, SIM0)) {
         OS_Free(unicode);
-        mp_raise_ValueError("Failed to send SMS message");
+        mp_raise_ValueError("Failed to submit SMS message");
         return mp_const_none;
     }
     OS_Free(unicode);
@@ -212,7 +220,7 @@ STATIC void sms_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
             dest[0] = sms_sent(self_in);
         // .send
         } else if (attr == MP_QSTR_send) {
-            mp_convert_member_lookup(self_in, mp_obj_get_type(self_in), MP_ROM_PTR(&sms_send_obj), dest);
+            mp_convert_member_lookup(self_in, mp_obj_get_type(self_in), (mp_obj_t)MP_ROM_PTR(&sms_send_obj), dest);
         }
     }
 }
@@ -233,7 +241,7 @@ STATIC void sms_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t
     );
 }
 
-const mp_obj_type_t sms_type = {
+STATIC const mp_obj_type_t sms_type = {
     { &mp_type_type },
     .name = MP_QSTR_SMS,
     .make_new = sms_make_new,
@@ -257,8 +265,8 @@ STATIC mp_obj_t sms_from_record(SMS_Message_Info_t* record) {
     self->status = (uint8_t)record->status;
     self->phone_number_type = (uint8_t)record->phoneNumberType;
     // Is this an SDK bug?
-    self->phone_number = mp_obj_new_str(record->phoneNumber + 1, strlen(record->phoneNumber + 1));
-    self->message = mp_obj_new_str(record->data, record->dataLen);
+    self->phone_number = mp_obj_new_str((char*)record->phoneNumber + 1, strlen(record->phoneNumber + 1));
+    self->message = mp_obj_new_str((char*)record->data, record->dataLen);
     return MP_OBJ_FROM_PTR(self);
 }
 
@@ -370,9 +378,14 @@ STATIC mp_obj_t sms_list(void) {
     SMS_ListMessageRequst(SMS_STATUS_ALL, SMS_STORAGE_SIM_CARD);
     
     clock_t time = clock();
+    uint8_t prev_count = 0;
     while (clock() - time < MAX_SMS_LIST_TIMEOUT * CLOCKS_PER_MSEC) {
         OS_Sleep(100);
         if (sms_list_buffer_count == storage.used) break;
+        if (prev_count != sms_list_buffer_count) {
+            prev_count = sms_list_buffer_count;
+            time = clock();
+        }
     }
     
     mp_obj_list_t *result = sms_list_buffer;
diff --git a/ports/gprs_a9/modcellular.h b/ports/gprs_a9/modcellular.h
index d676c8448039c..7c3c8ec8192fe 100644
--- a/ports/gprs_a9/modcellular.h
+++ b/ports/gprs_a9/modcellular.h
@@ -6,7 +6,10 @@ void notify_no_sim(API_Event_t* event);
 void notify_registered_home(API_Event_t* event);
 void notify_registered_roaming(API_Event_t* event);
 void notify_sms_list(API_Event_t* event);
+void notify_sms_sent(API_Event_t* event);
+void notify_sms_error(API_Event_t* event);
 
 #define MAX_SMS_LIST_TIMEOUT 1000
+#define MAX_SMS_SEND_TIMEOUT 10000
 #define REQUIRES_NETWORK_REGISTRATION do {if (!sim_status) {mp_raise_ValueError("Network is not available: is SIM card inserted?"); return mp_const_none;}} while(0)
 #define REQUIRES_VALID_SMS_STATUS(bits) do {if (bitsum(bits) != 1) {return mp_const_none;}} while(0)

From 54706435ee4d5cebcd732c203bf6d7fadd2641aa Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Wed, 13 Feb 2019 23:08:04 +0100
Subject: [PATCH 3155/3533] Add SMS warnings

---
 ports/gprs_a9/modcellular.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ports/gprs_a9/modcellular.c b/ports/gprs_a9/modcellular.c
index d56c6bec4cbec..e983db09ff9cd 100644
--- a/ports/gprs_a9/modcellular.c
+++ b/ports/gprs_a9/modcellular.c
@@ -46,6 +46,8 @@ void notify_sms_list(API_Event_t* event) {
     if (sms_list_buffer && (sms_list_buffer->len > sms_list_buffer_count)) {
         sms_list_buffer->items[sms_list_buffer_count] = sms_from_record(messageInfo);
         sms_list_buffer_count ++;
+    } else {
+        mp_printf(&mp_plat_print, "WARN: SMS list element discarded");
     }
     OS_Free(messageInfo->data);
 }
@@ -55,7 +57,7 @@ void notify_sms_sent(API_Event_t* event) {
 }
 
 void notify_sms_error(API_Event_t* event) {
-    mp_printf(&mp_plat_print, "SMS Error %d", event->param1);
+    mp_printf(&mp_plat_print, "WARN: SMS Error %d", event->param1);
 }
 
 // -------

From 00ffa31efc7b1e60692f78a0e45c72a40ea3a0ee Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Wed, 13 Feb 2019 23:20:30 +0100
Subject: [PATCH 3156/3533] Add SMS withdraw

---
 ports/gprs_a9/README.md     |  6 ++++++
 ports/gprs_a9/modcellular.c | 27 +++++++++++++++++++++++++++
 2 files changed, 33 insertions(+)

diff --git a/ports/gprs_a9/README.md b/ports/gprs_a9/README.md
index 3c0e6ed8a3c79..a924b22612ca2 100644
--- a/ports/gprs_a9/README.md
+++ b/ports/gprs_a9/README.md
@@ -87,6 +87,12 @@ Provides cellular functionality.
 
       **Raises**: `ValueError` if failed to set up/send SMS.
 
+    * `withdraw()`
+
+      Withdraws SMS from SIM storage. Resets status and index of this object to zero.
+
+      **Raises**: `ValueError` if failed to withdraw.
+
 ### `gps`
 
 Provides the GPS functionality
diff --git a/ports/gprs_a9/modcellular.c b/ports/gprs_a9/modcellular.c
index e983db09ff9cd..e39296acbc16a 100644
--- a/ports/gprs_a9/modcellular.c
+++ b/ports/gprs_a9/modcellular.c
@@ -195,6 +195,30 @@ STATIC mp_obj_t sms_send(mp_obj_t self_in) {
 
 MP_DEFINE_CONST_FUN_OBJ_1(sms_send_obj, &sms_send);
 
+STATIC mp_obj_t sms_withdraw(mp_obj_t self_in) {
+    // ========================================
+    // Withdraws an SMS message from the SIM card.
+    // ========================================
+
+    sms_obj_t *self = MP_OBJ_TO_PTR(self_in);
+
+    if (self->index == 0 || self->status == 0) {
+        mp_raise_ValueError("Cannot withdraw SMS with zero index/status");
+        return mp_const_none;
+    }
+
+    if (!SMS_DeleteMessage(self->index, SMS_STATUS_ALL, SMS_STORAGE_SIM_CARD)) {
+        mp_raise_ValueError("Failed to withdraw SMS");
+        return mp_const_none;
+    }
+
+    self->status = 0;
+    self->index = 0;
+    return mp_const_none;
+}
+
+MP_DEFINE_CONST_FUN_OBJ_1(sms_withdraw_obj, &sms_withdraw);
+
 STATIC void sms_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
     // ========================================
     // SMS.[attr]
@@ -223,6 +247,9 @@ STATIC void sms_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
         // .send
         } else if (attr == MP_QSTR_send) {
             mp_convert_member_lookup(self_in, mp_obj_get_type(self_in), (mp_obj_t)MP_ROM_PTR(&sms_send_obj), dest);
+        // .withdraw
+        } else if (attr == MP_QSTR_withdraw) {
+            mp_convert_member_lookup(self_in, mp_obj_get_type(self_in), (mp_obj_t)MP_ROM_PTR(&sms_withdraw_obj), dest);
         }
     }
 }

From 7cf873144a623cfa338807a7a5770e8c3caa75ea Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Tue, 12 Mar 2019 23:57:47 +0100
Subject: [PATCH 3157/3533] Refactoring; stub for several notifications

---
 ports/gprs_a9/main.c        | 36 +++++++++++----------
 ports/gprs_a9/modcellular.c | 62 +++++++++++++++++++++++++++++++++----
 ports/gprs_a9/modcellular.h |  6 ++++
 3 files changed, 81 insertions(+), 23 deletions(-)

diff --git a/ports/gprs_a9/main.c b/ports/gprs_a9/main.c
index 040a95d8c19a2..631f39fb47ef2 100644
--- a/ports/gprs_a9/main.c
+++ b/ports/gprs_a9/main.c
@@ -85,7 +85,7 @@ void gc_collect(void) {
 
 
 void nlr_jump_fail(void *val) {
-    Assert(false,"nlr_jump_fail");
+    Assert(false, "nlr_jump_fail");
     while (1);//never reach here actully
 }
 
@@ -178,6 +178,7 @@ void soft_reset(void) {
     mp_hal_stdout_tx_str("PYB: soft reboot\r\n");
     mp_hal_delay_us(10000); // allow UART to flush output
     mp_Init();
+    cellular_init0();
 }
 
 
@@ -188,6 +189,7 @@ void MicroPyTask(void *pData)
     Buffer_Init(&fifoBuffer, fifoBufferData, sizeof(fifoBufferData));
     UartInit();
     mp_Init();
+    cellular_init0();
     
     uint8_t reset;
 soft_reset:
@@ -251,15 +253,16 @@ void EventDispatch(API_Event_t* pEvent)
             notify_sms_error(pEvent);
             break;
 
-        case API_EVENT_ID_NETWORK_DETACHED:
-            Trace(2,"network detached");
-            break;
-        case API_EVENT_ID_NETWORK_ATTACH_FAILED:
-            Trace(2,"network attach failed");
+        case API_EVENT_ID_SMS_LIST_MESSAGE:
+            notify_sms_list(pEvent);
             break;
-        case API_EVENT_ID_NETWORK_GOT_TIME:
-            Trace(2,"network got time");
+
+        case API_EVENT_ID_SMS_RECEIVED:
+            notify_sms_receipt(pEvent);
             break;
+
+        // UART
+        // ====
         case API_EVENT_ID_UART_RECEIVED:
             Trace(1,"UART%d received:%d,%s",pEvent->param1,pEvent->param2,pEvent->pParam1);
             if(pEvent->param1 == UART1)
@@ -290,15 +293,16 @@ void EventDispatch(API_Event_t* pEvent)
                 memset((void*)event,0,sizeof(MicroPy_Event_t));
                 event->id = MICROPY_EVENT_ID_UART_RECEIVED;
                 event->param1 = len;
-                OS_SendEvent(microPyTaskHandle,(void*)event,OS_TIME_OUT_WAIT_FOREVER,0);
+                OS_SendEvent(microPyTaskHandle, (void*)event, OS_TIME_OUT_WAIT_FOREVER, 0);
             }
             break;
+
+        // GPS
+        // ===
         case API_EVENT_ID_GPS_UART_RECEIVED:
             notify_gps_update(pEvent);
             break;
-        case API_EVENT_ID_SMS_LIST_MESSAGE:
-            notify_sms_list(pEvent);
-            break;
+
         default:
             break;
     }
@@ -311,8 +315,7 @@ void AppMainTask(void *pData)
     
     TIME_SetIsAutoUpdateRtcTime(true);
 
-    microPyTaskHandle = OS_CreateTask(MicroPyTask,
-                                    NULL, NULL, MICROPYTHON_TASK_STACK_SIZE, MICROPYTHON_TASK_PRIORITY, 0, 0, "mpy Task");                                    
+    microPyTaskHandle = OS_CreateTask(MicroPyTask, NULL, NULL, MICROPYTHON_TASK_STACK_SIZE, MICROPYTHON_TASK_PRIORITY, 0, 0, "mpy Task");                                    
     while(1)
     {
         if(OS_WaitEvent(mainTaskHandle, (void**)&event, OS_TIME_OUT_WAIT_FOREVER))
@@ -329,8 +332,7 @@ void AppMainTask(void *pData)
 }
 void _Main(void)
 {
-    mainTaskHandle = OS_CreateTask(AppMainTask ,
-                                   NULL, NULL, AppMain_TASK_STACK_SIZE, AppMain_TASK_PRIORITY, 0, 0, "main Task");
+    mainTaskHandle = OS_CreateTask(AppMainTask, NULL, NULL, AppMain_TASK_STACK_SIZE, AppMain_TASK_PRIORITY, 0, 0, "main Task");
     OS_SetUserMainHandle(&mainTaskHandle);
 }
 
@@ -338,7 +340,7 @@ void _Main(void)
 int mp_hal_stdin_rx_chr(void) {
     uint8_t c;
     for (;;) {
-        if(Buffer_Gets(&fifoBuffer,&c,1))
+        if (Buffer_Gets(&fifoBuffer, &c, 1))
             return c;
         MICROPY_EVENT_POLL_HOOK
         OS_Sleep(1);
diff --git a/ports/gprs_a9/modcellular.c b/ports/gprs_a9/modcellular.c
index e39296acbc16a..c9a28eed37a1a 100644
--- a/ports/gprs_a9/modcellular.c
+++ b/ports/gprs_a9/modcellular.c
@@ -15,6 +15,10 @@
 #define NTW_REG_BIT 0x01
 #define NTW_ROAM_BIT 0x02
 
+void cellular_init0(void) {
+    // TODO: Implement
+}
+
 // ------
 // Notify
 // ------
@@ -26,6 +30,13 @@ int sim_status = 0;
 mp_obj_list_t* sms_list_buffer = NULL;
 uint8_t sms_list_buffer_count = 0;
 
+// Count SMS recieved
+uint8_t sms_recieved_count = 0;
+
+// SMS parsing
+STATIC mp_obj_t sms_from_record(SMS_Message_Info_t* record);
+STATIC mp_obj_t sms_from_raw(uint8_t* header, uint32_t header_length, uint8_t* content, uint32_t content_length);
+
 void notify_no_sim(API_Event_t* event) {
     sim_status = 0;
 }
@@ -38,7 +49,6 @@ void notify_registered_roaming(API_Event_t* event) {
     sim_status = NTW_REG_BIT | NTW_ROAM_BIT;
 }
 
-STATIC mp_obj_t sms_from_record(SMS_Message_Info_t* record);
 
 void notify_sms_list(API_Event_t* event) {
     SMS_Message_Info_t* messageInfo = (SMS_Message_Info_t*)event->pParam1;
@@ -47,17 +57,25 @@ void notify_sms_list(API_Event_t* event) {
         sms_list_buffer->items[sms_list_buffer_count] = sms_from_record(messageInfo);
         sms_list_buffer_count ++;
     } else {
-        mp_printf(&mp_plat_print, "WARN: SMS list element discarded");
+        mp_warning("SMS list element discarded");
     }
     OS_Free(messageInfo->data);
 }
 
 void notify_sms_sent(API_Event_t* event) {
-    // mp_printf(&mp_plat_print, "SMS has been sent");
+    mp_printf(&mp_plat_print, "SMS has been sent");
 }
 
 void notify_sms_error(API_Event_t* event) {
-    mp_printf(&mp_plat_print, "WARN: SMS Error %d", event->param1);
+    mp_warning("SMS Error %d", event->param1);
+}
+
+void notify_sms_receipt(API_Event_t* event) {
+    // TODO: Implement
+}
+
+void notify_signal(API_Event_t* event) {
+    // TODO: Implement
 }
 
 // -------
@@ -293,12 +311,44 @@ STATIC mp_obj_t sms_from_record(SMS_Message_Info_t* record) {
     self->index = record->index;
     self->status = (uint8_t)record->status;
     self->phone_number_type = (uint8_t)record->phoneNumberType;
-    // Is this an SDK bug?
-    self->phone_number = mp_obj_new_str((char*)record->phoneNumber + 1, strlen(record->phoneNumber + 1));
+    self->phone_number = mp_obj_new_str((char*)record->phoneNumber + 1, SMS_PHONE_NUMBER_MAX_LEN - 1);
     self->message = mp_obj_new_str((char*)record->data, record->dataLen);
     return MP_OBJ_FROM_PTR(self);
 }
 
+STATIC mp_obj_t sms_from_raw(uint8_t* header, uint32_t header_length, uint8_t* content, uint32_t content_length) {
+    // ========================================
+    // Prepares an SMS object from raw header and contents.
+    // Returns:
+    //     A new SMS object.
+    // ========================================
+
+    // TODO: This function is not tested / not used. Consider removing it.
+    if (header[0] != '"') {
+        return mp_const_none;
+    }
+
+    uint32_t i;
+    for (i=1; i<header_length; i++) {
+        if (header[i] == '"') {
+            break;
+        }
+    }
+
+    if (header[i] != '"') {
+        return mp_const_none;
+    }
+
+    sms_obj_t *self = m_new_obj_with_finaliser(sms_obj_t);
+    self->base.type = &sms_type;
+    self->index = 0;
+    self->status = 0;
+    self->phone_number_type = 0;
+    self->phone_number = mp_obj_new_str((char*)header + 1, i - 1);
+    self->message = mp_obj_new_str((char*)content, content_length);
+    return MP_OBJ_FROM_PTR(self);
+}
+
 // -------
 // Methods
 // -------
diff --git a/ports/gprs_a9/modcellular.h b/ports/gprs_a9/modcellular.h
index 7c3c8ec8192fe..dffd66f0f202b 100644
--- a/ports/gprs_a9/modcellular.h
+++ b/ports/gprs_a9/modcellular.h
@@ -1,13 +1,19 @@
 #include "api_event.h"
 
 extern int sim_status;
+extern uint8_t sms_recieved_count;
+
+void cellular_init0(void);
 
 void notify_no_sim(API_Event_t* event);
 void notify_registered_home(API_Event_t* event);
 void notify_registered_roaming(API_Event_t* event);
+
 void notify_sms_list(API_Event_t* event);
 void notify_sms_sent(API_Event_t* event);
 void notify_sms_error(API_Event_t* event);
+void notify_sms_receipt(API_Event_t* event);
+void notify_signal(API_Event_t* event);
 
 #define MAX_SMS_LIST_TIMEOUT 1000
 #define MAX_SMS_SEND_TIMEOUT 10000

From 946ec16a2305fb23f038eff3618862c3359bf5f2 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Wed, 13 Mar 2019 00:10:23 +0100
Subject: [PATCH 3158/3533] Implement  signal and SIM status updates

---
 ports/gprs_a9/modcellular.c | 36 ++++++++++++++++++++++++------------
 ports/gprs_a9/modcellular.h |  3 ---
 2 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/ports/gprs_a9/modcellular.c b/ports/gprs_a9/modcellular.c
index c9a28eed37a1a..2f54e5522d244 100644
--- a/ports/gprs_a9/modcellular.c
+++ b/ports/gprs_a9/modcellular.c
@@ -15,41 +15,53 @@
 #define NTW_REG_BIT 0x01
 #define NTW_ROAM_BIT 0x02
 
-void cellular_init0(void) {
-    // TODO: Implement
-}
-
-// ------
-// Notify
-// ------
+// --------------
+// Vars: statuses
+// --------------
 
 // Tracks SIM status on the network
 int sim_status = 0;
+uint8_t sim_status_updated = 0;
+
+// Count SMS recieved
+uint8_t sms_recieved_count = 0;
+
+// -------------------
+// Vars: SMS retrieval
+// -------------------
 
 // A buffer used for listing messages
 mp_obj_list_t* sms_list_buffer = NULL;
 uint8_t sms_list_buffer_count = 0;
 
-// Count SMS recieved
-uint8_t sms_recieved_count = 0;
-
 // SMS parsing
 STATIC mp_obj_t sms_from_record(SMS_Message_Info_t* record);
 STATIC mp_obj_t sms_from_raw(uint8_t* header, uint32_t header_length, uint8_t* content, uint32_t content_length);
 
+void cellular_init0(void) {
+    sim_status_updated = 0;
+    sms_recieved_count = 0;
+}
+
+// ------
+// Notify
+// ------
+
 void notify_no_sim(API_Event_t* event) {
     sim_status = 0;
+    sim_status_updated = 1;
 }
 
 void notify_registered_home(API_Event_t* event) {
     sim_status = NTW_REG_BIT;
+    sim_status_updated = 1;
 }
 
 void notify_registered_roaming(API_Event_t* event) {
     sim_status = NTW_REG_BIT | NTW_ROAM_BIT;
+    sim_status_updated = 1;
 }
 
-
 void notify_sms_list(API_Event_t* event) {
     SMS_Message_Info_t* messageInfo = (SMS_Message_Info_t*)event->pParam1;
 
@@ -71,7 +83,7 @@ void notify_sms_error(API_Event_t* event) {
 }
 
 void notify_sms_receipt(API_Event_t* event) {
-    // TODO: Implement
+    sms_recieved_count ++;
 }
 
 void notify_signal(API_Event_t* event) {
diff --git a/ports/gprs_a9/modcellular.h b/ports/gprs_a9/modcellular.h
index dffd66f0f202b..a4ce7c5173684 100644
--- a/ports/gprs_a9/modcellular.h
+++ b/ports/gprs_a9/modcellular.h
@@ -1,8 +1,5 @@
 #include "api_event.h"
 
-extern int sim_status;
-extern uint8_t sms_recieved_count;
-
 void cellular_init0(void);
 
 void notify_no_sim(API_Event_t* event);

From 21f56c21aaf8ff90c7c7144cd71ae6f71c1468d5 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Wed, 13 Mar 2019 00:34:02 +0100
Subject: [PATCH 3159/3533] Add network status queries

---
 ports/gprs_a9/README.md     | 14 +++++++++++
 ports/gprs_a9/modcellular.c | 50 ++++++++++++++++++++++++++++---------
 ports/gprs_a9/modcellular.h |  2 +-
 3 files changed, 53 insertions(+), 13 deletions(-)

diff --git a/ports/gprs_a9/README.md b/ports/gprs_a9/README.md
index a924b22612ca2..b7f0274fba571 100644
--- a/ports/gprs_a9/README.md
+++ b/ports/gprs_a9/README.md
@@ -43,6 +43,20 @@ Provides cellular functionality.
 
   **Raises**: `ValueError` if no IMSI number can be retrieved.
 
+* `network_status_changed()`
+
+  Checks whether the netwrok status was changed since the last check.
+
+  **Returns**: `True` if it was changed.
+
+* `get_network_status()`
+
+  Retrieves the network status as an integer.
+
+  **Returns**: `int` representing cellular network status.
+
+  **TODO**: Provide bit-wise specs.
+
 * `is_sim_present()`
 
   Checks whether the SIM card is present and ICCID can be retrieved.
diff --git a/ports/gprs_a9/modcellular.c b/ports/gprs_a9/modcellular.c
index 2f54e5522d244..cc7253831950b 100644
--- a/ports/gprs_a9/modcellular.c
+++ b/ports/gprs_a9/modcellular.c
@@ -19,9 +19,9 @@
 // Vars: statuses
 // --------------
 
-// Tracks SIM status on the network
-int sim_status = 0;
-uint8_t sim_status_updated = 0;
+// Tracks the status on the network
+int network_status = 0;
+uint8_t network_status_updated = 0;
 
 // Count SMS recieved
 uint8_t sms_recieved_count = 0;
@@ -39,7 +39,7 @@ STATIC mp_obj_t sms_from_record(SMS_Message_Info_t* record);
 STATIC mp_obj_t sms_from_raw(uint8_t* header, uint32_t header_length, uint8_t* content, uint32_t content_length);
 
 void cellular_init0(void) {
-    sim_status_updated = 0;
+    network_status_updated = 0;
     sms_recieved_count = 0;
 }
 
@@ -48,18 +48,18 @@ void cellular_init0(void) {
 // ------
 
 void notify_no_sim(API_Event_t* event) {
-    sim_status = 0;
-    sim_status_updated = 1;
+    network_status = 0;
+    network_status_updated = 1;
 }
 
 void notify_registered_home(API_Event_t* event) {
-    sim_status = NTW_REG_BIT;
-    sim_status_updated = 1;
+    network_status = NTW_REG_BIT;
+    network_status_updated = 1;
 }
 
 void notify_registered_roaming(API_Event_t* event) {
-    sim_status = NTW_REG_BIT | NTW_ROAM_BIT;
-    sim_status_updated = 1;
+    network_status = NTW_REG_BIT | NTW_ROAM_BIT;
+    network_status_updated = 1;
 }
 
 void notify_sms_list(API_Event_t* event) {
@@ -392,13 +392,37 @@ STATIC mp_obj_t is_sim_present(void) {
 
 STATIC MP_DEFINE_CONST_FUN_OBJ_0(is_sim_present_obj, is_sim_present);
 
+STATIC mp_obj_t network_status_changed(void) {
+    // ========================================
+    // Checks whether the network status was updated.
+    // Returns:
+    //     True if it was updated since the last check.
+    // ========================================
+    uint8_t result = network_status_updated;
+    network_status_updated = 0;
+    return mp_obj_new_bool(result);
+}
+
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(network_status_changed_obj, network_status_changed);
+
+STATIC mp_obj_t get_network_status(void) {
+    // ========================================
+    // Retrieves the network status.
+    // Returns:
+    //     Network status as an integer.
+    // ========================================
+    return mp_obj_new_int(network_status);
+}
+
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(get_network_status_obj, get_network_status);
+
 STATIC mp_obj_t is_network_registered(void) {
     // ========================================
     // Checks whether registered on the cellular network.
     // Returns:
     //     True if registered.
     // ========================================
-    return mp_obj_new_bool(sim_status & NTW_REG_BIT);
+    return mp_obj_new_bool(network_status & NTW_REG_BIT);
 }
 
 STATIC MP_DEFINE_CONST_FUN_OBJ_0(is_network_registered_obj, is_network_registered);
@@ -411,7 +435,7 @@ STATIC mp_obj_t is_roaming(void) {
     // ========================================
     REQUIRES_NETWORK_REGISTRATION;
 
-    return mp_obj_new_bool(sim_status & NTW_ROAM_BIT);
+    return mp_obj_new_bool(network_status & NTW_ROAM_BIT);
 }
 
 STATIC MP_DEFINE_CONST_FUN_OBJ_0(is_roaming_obj, is_roaming);
@@ -499,6 +523,8 @@ STATIC const mp_map_elem_t mp_module_cellular_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_SMS), MP_ROM_PTR(&sms_type) },
 
     { MP_OBJ_NEW_QSTR(MP_QSTR_get_imei), (mp_obj_t)&get_imei_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_network_status_changed), (mp_obj_t)&network_status_changed_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_get_network_status), (mp_obj_t)&get_network_status_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_is_sim_present), (mp_obj_t)&is_sim_present_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_is_network_registered), (mp_obj_t)&is_network_registered_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_is_roaming), (mp_obj_t)&is_roaming_obj },
diff --git a/ports/gprs_a9/modcellular.h b/ports/gprs_a9/modcellular.h
index a4ce7c5173684..04074b8736b5e 100644
--- a/ports/gprs_a9/modcellular.h
+++ b/ports/gprs_a9/modcellular.h
@@ -14,5 +14,5 @@ void notify_signal(API_Event_t* event);
 
 #define MAX_SMS_LIST_TIMEOUT 1000
 #define MAX_SMS_SEND_TIMEOUT 10000
-#define REQUIRES_NETWORK_REGISTRATION do {if (!sim_status) {mp_raise_ValueError("Network is not available: is SIM card inserted?"); return mp_const_none;}} while(0)
+#define REQUIRES_NETWORK_REGISTRATION do {if (!network_status) {mp_raise_ValueError("Network is not available: is SIM card inserted?"); return mp_const_none;}} while(0)
 #define REQUIRES_VALID_SMS_STATUS(bits) do {if (bitsum(bits) != 1) {return mp_const_none;}} while(0)

From 17ff4df0dd567bc69ada11659751d55fdf95ebe9 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Wed, 13 Mar 2019 14:43:05 +0100
Subject: [PATCH 3160/3533] Extended README

---
 ports/gprs_a9/README.md | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/ports/gprs_a9/README.md b/ports/gprs_a9/README.md
index b7f0274fba571..af629c90a96da 100644
--- a/ports/gprs_a9/README.md
+++ b/ports/gprs_a9/README.md
@@ -20,6 +20,8 @@ and burn the final lod file in the `hex` folder.
 ### `cellular`
 
 Provides cellular functionality.
+As usual, the original API does not give access to radio-level and low-level functionality such as controlling the registration on the cellular network: these are performed in the background automatically.
+The purpose of this module is to have an access to high-level networking (SMS, GPRS, calls) as well as to read the status of various components of cellular networking.
 
 * `get_imei()`
 
@@ -45,7 +47,7 @@ Provides cellular functionality.
 
 * `network_status_changed()`
 
-  Checks whether the netwrok status was changed since the last check.
+  Checks whether the network status was changed since the last check.
 
   **Returns**: `True` if it was changed.
 
@@ -75,7 +77,7 @@ Provides cellular functionality.
 
   **Returns**: True if roaming.
 
-  **Raises** `ValueError` if not registered ar all.
+  **Raises** `ValueError` if not registered at all.
 
 * `sms_list()`
 
@@ -89,11 +91,11 @@ Provides cellular functionality.
 
   **Attrs**:
 
-    * phone_number (str): phone number (sender or desstination);
+    * phone_number (str): phone number (sender or destination);
     * message (str): message contents;
     * status (int): an integer with status bits;
     * inbox (bool): incoming message if `True`, outgoing message if `False` or unknown status if `None`;
-    * unread (bool): unread message if `True`, previously read message if `False` ir unknown status if `None`;
+    * unread (bool): unread message if `True`, previously read message if `False` or unknown status if `None`;
     * sent (bool): sent message if `True`, not sent message if `False` or unknown status if `None`;
     * `send()`
     
@@ -109,7 +111,8 @@ Provides cellular functionality.
 
 ### `gps`
 
-Provides the GPS functionality
+Provides the GPS functionality.
+This is only available in the A9G module where GPS is a separate chip connected via UART2.
 
 * `on()`
 
@@ -155,7 +158,7 @@ Provides the GPS functionality
 
 ### `machine`
 
-Provides power-related functions.
+Provides power-related functions: power, watchdogs.
 
 * `reset()`
 

From a5f5c14f2ece65632f831f9dbc827becd69151c4 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Wed, 13 Mar 2019 22:03:00 +0100
Subject: [PATCH 3161/3533] Correct doc markup

---
 ports/gprs_a9/README.md | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/ports/gprs_a9/README.md b/ports/gprs_a9/README.md
index af629c90a96da..2cb178d7a69db 100644
--- a/ports/gprs_a9/README.md
+++ b/ports/gprs_a9/README.md
@@ -1,11 +1,10 @@
-
-## install GPRS_C_SDK toolchain
+## Install GPRS_C_SDK toolchain
 
 * [installation doc](https://ai-thinker-open.github.io/GPRS_C_SDK_DOC/en/c-sdk/installation_linux.html)
 * Or [docker](https://github.com/Neutree/gprs_build)
 
 
-```
+```bash
 git clone git@github.com:Neutree/micropython.git
 make -C mpy-cross
 cd micropython/ports/gprs_a9
@@ -13,7 +12,7 @@ chmod +x build.sh
 ./build.sh
 ```
 
-and burn the final lod file in the `hex` folder.
+and burn the final `.lod` file in the `hex` folder.
 
 ## Platform-specific modules
 

From 59e95e091377db1852cdc761ccb2c9b6ad41ae34 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Thu, 14 Mar 2019 00:18:25 +0100
Subject: [PATCH 3162/3533] Rename notify routines and add network exception
 tracking

---
 ports/gprs_a9/README.md     |  6 ++++
 ports/gprs_a9/main.c        | 30 +++++++++++++-----
 ports/gprs_a9/modcellular.c | 61 +++++++++++++++++++++++++++++++------
 ports/gprs_a9/modcellular.h | 19 +++++++-----
 4 files changed, 92 insertions(+), 24 deletions(-)

diff --git a/ports/gprs_a9/README.md b/ports/gprs_a9/README.md
index 2cb178d7a69db..eb793e915d1f1 100644
--- a/ports/gprs_a9/README.md
+++ b/ports/gprs_a9/README.md
@@ -58,6 +58,12 @@ The purpose of this module is to have an access to high-level networking (SMS, G
 
   **TODO**: Provide bit-wise specs.
 
+* `get_network_exception()`
+
+  Retrieves the network exception.
+
+  **Returns**: `int` representing the last network exception. Returns zero if no exception occurred since the last check.
+
 * `is_sim_present()`
 
   Checks whether the SIM card is present and ICCID can be retrieved.
diff --git a/ports/gprs_a9/main.c b/ports/gprs_a9/main.c
index 631f39fb47ef2..75cbdd1968d0e 100644
--- a/ports/gprs_a9/main.c
+++ b/ports/gprs_a9/main.c
@@ -234,31 +234,47 @@ void EventDispatch(API_Event_t* pEvent)
             break;
 
         case API_EVENT_ID_NO_SIMCARD:
-            notify_no_sim(pEvent);
+            modcellular_notify_no_sim(pEvent);
             break;
 
         case API_EVENT_ID_NETWORK_REGISTERED_HOME:
-            notify_registered_home(pEvent);
+            modcellular_notify_reg_home(pEvent);
             break;
 
         case API_EVENT_ID_NETWORK_REGISTERED_ROAMING:
-            notify_registered_roaming(pEvent);
+            modcellular_notify_reg_roaming(pEvent);
+            break;
+
+        case API_EVENT_ID_NETWORK_REGISTER_SEARCHING:
+            modcellular_notify_reg_searching(pEvent);
+            break;
+
+        case API_EVENT_ID_NETWORK_REGISTER_DENIED:
+            modcellular_notify_reg_denied(pEvent);
+            break;
+
+        case API_EVENT_ID_NETWORK_REGISTER_NO:
+            // TODO: WTF is this?
+            break;
+
+        case API_EVENT_ID_NETWORK_DEREGISTER:
+            modcellular_notify_dereg(pEvent);
             break;
 
         case API_EVENT_ID_SMS_SENT:
-            notify_sms_sent(pEvent);
+            modcellular_notify_sms_sent(pEvent);
             break;
 
         case API_EVENT_ID_SMS_ERROR:
-            notify_sms_error(pEvent);
+            modcellular_notify_sms_error(pEvent);
             break;
 
         case API_EVENT_ID_SMS_LIST_MESSAGE:
-            notify_sms_list(pEvent);
+            modcellular_notify_sms_list(pEvent);
             break;
 
         case API_EVENT_ID_SMS_RECEIVED:
-            notify_sms_receipt(pEvent);
+            modcellular_notify_sms_receipt(pEvent);
             break;
 
         // UART
diff --git a/ports/gprs_a9/modcellular.c b/ports/gprs_a9/modcellular.c
index cc7253831950b..c5575e6acf4b3 100644
--- a/ports/gprs_a9/modcellular.c
+++ b/ports/gprs_a9/modcellular.c
@@ -14,13 +14,18 @@
 
 #define NTW_REG_BIT 0x01
 #define NTW_ROAM_BIT 0x02
+#define NTW_REG_PROGRESS_BIT 0x04
+
+#define NTW_EXC_NOSIM 0x01
+#define NTW_EXC_REG_DENIED 0x02
 
 // --------------
 // Vars: statuses
 // --------------
 
 // Tracks the status on the network
-int network_status = 0;
+uint8_t network_status = 0;
+uint8_t network_exception = 0;
 uint8_t network_status_updated = 0;
 
 // Count SMS recieved
@@ -40,6 +45,7 @@ STATIC mp_obj_t sms_from_raw(uint8_t* header, uint32_t header_length, uint8_t* c
 
 void cellular_init0(void) {
     network_status_updated = 0;
+    network_exception = 0;
     sms_recieved_count = 0;
 }
 
@@ -47,22 +53,45 @@ void cellular_init0(void) {
 // Notify
 // ------
 
-void notify_no_sim(API_Event_t* event) {
+void modcellular_notify_no_sim(API_Event_t* event) {
     network_status = 0;
     network_status_updated = 1;
+
+    network_exception = NTW_EXC_NOSIM;
 }
 
-void notify_registered_home(API_Event_t* event) {
+// Register
+
+void modcellular_notify_reg_home(API_Event_t* event) {
     network_status = NTW_REG_BIT;
     network_status_updated = 1;
 }
 
-void notify_registered_roaming(API_Event_t* event) {
+void modcellular_notify_reg_roaming(API_Event_t* event) {
     network_status = NTW_REG_BIT | NTW_ROAM_BIT;
     network_status_updated = 1;
 }
 
-void notify_sms_list(API_Event_t* event) {
+void modcellular_notify_reg_searching(API_Event_t* event) {
+    network_status = NTW_REG_PROGRESS_BIT;
+    network_status_updated = 1;
+}
+
+void modcellular_notify_reg_denied(API_Event_t* event) {
+    network_status = 0;
+    network_status_updated = 1;
+
+    network_exception = NTW_EXC_REG_DENIED;
+}
+
+void modcellular_notify_dereg(API_Event_t* event) {
+    network_status = 0;
+    network_status_updated = 1;
+}
+
+// SMS
+
+void modcellular_notify_sms_list(API_Event_t* event) {
     SMS_Message_Info_t* messageInfo = (SMS_Message_Info_t*)event->pParam1;
 
     if (sms_list_buffer && (sms_list_buffer->len > sms_list_buffer_count)) {
@@ -74,19 +103,19 @@ void notify_sms_list(API_Event_t* event) {
     OS_Free(messageInfo->data);
 }
 
-void notify_sms_sent(API_Event_t* event) {
+void modcellular_notify_sms_sent(API_Event_t* event) {
     mp_printf(&mp_plat_print, "SMS has been sent");
 }
 
-void notify_sms_error(API_Event_t* event) {
+void modcellular_notify_sms_error(API_Event_t* event) {
     mp_warning("SMS Error %d", event->param1);
 }
 
-void notify_sms_receipt(API_Event_t* event) {
+void modcellular_notify_sms_receipt(API_Event_t* event) {
     sms_recieved_count ++;
 }
 
-void notify_signal(API_Event_t* event) {
+void modcellular_notify_signal(API_Event_t* event) {
     // TODO: Implement
 }
 
@@ -405,6 +434,19 @@ STATIC mp_obj_t network_status_changed(void) {
 
 STATIC MP_DEFINE_CONST_FUN_OBJ_0(network_status_changed_obj, network_status_changed);
 
+STATIC mp_obj_t get_network_exception(void) {
+    // ========================================
+    // Checks whether network exception occurred since the last check.
+    // Returns:
+    //    An integer representing network exception.
+    // ========================================
+    uint8_t result = network_exception;
+    network_exception = 0;
+    return mp_obj_new_bool(result);
+}
+
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(get_network_exception_obj, get_network_exception);
+
 STATIC mp_obj_t get_network_status(void) {
     // ========================================
     // Retrieves the network status.
@@ -524,6 +566,7 @@ STATIC const mp_map_elem_t mp_module_cellular_globals_table[] = {
 
     { MP_OBJ_NEW_QSTR(MP_QSTR_get_imei), (mp_obj_t)&get_imei_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_network_status_changed), (mp_obj_t)&network_status_changed_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_get_network_exception), (mp_obj_t)&get_network_exception_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_get_network_status), (mp_obj_t)&get_network_status_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_is_sim_present), (mp_obj_t)&is_sim_present_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_is_network_registered), (mp_obj_t)&is_network_registered_obj },
diff --git a/ports/gprs_a9/modcellular.h b/ports/gprs_a9/modcellular.h
index 04074b8736b5e..08de36e195862 100644
--- a/ports/gprs_a9/modcellular.h
+++ b/ports/gprs_a9/modcellular.h
@@ -2,15 +2,18 @@
 
 void cellular_init0(void);
 
-void notify_no_sim(API_Event_t* event);
-void notify_registered_home(API_Event_t* event);
-void notify_registered_roaming(API_Event_t* event);
+void modcellular_notify_no_sim(API_Event_t* event);
+void modcellular_notify_reg_home(API_Event_t* event);
+void modcellular_notify_reg_roaming(API_Event_t* event);
+void modcellular_notify_reg_searching(API_Event_t* event);
+void modcellular_notify_reg_denied(API_Event_t* event);
+void modcellular_notify_dereg(API_Event_t* event);
 
-void notify_sms_list(API_Event_t* event);
-void notify_sms_sent(API_Event_t* event);
-void notify_sms_error(API_Event_t* event);
-void notify_sms_receipt(API_Event_t* event);
-void notify_signal(API_Event_t* event);
+void modcellular_notify_sms_list(API_Event_t* event);
+void modcellular_notify_sms_sent(API_Event_t* event);
+void modcellular_notify_sms_error(API_Event_t* event);
+void modcellular_notify_sms_receipt(API_Event_t* event);
+void modcellular_notify_signal(API_Event_t* event);
 
 #define MAX_SMS_LIST_TIMEOUT 1000
 #define MAX_SMS_SEND_TIMEOUT 10000

From 22386546d28a425b512aecbb1ac7624f41db0c11 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Thu, 14 Mar 2019 00:53:42 +0100
Subject: [PATCH 3163/3533] Add signal quality tracking.

---
 ports/gprs_a9/README.md     |  7 +++++++
 ports/gprs_a9/main.c        |  7 +++++++
 ports/gprs_a9/modcellular.c | 21 ++++++++++++++++++++-
 3 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/ports/gprs_a9/README.md b/ports/gprs_a9/README.md
index eb793e915d1f1..03a5118d2ad77 100644
--- a/ports/gprs_a9/README.md
+++ b/ports/gprs_a9/README.md
@@ -84,6 +84,13 @@ The purpose of this module is to have an access to high-level networking (SMS, G
 
   **Raises** `ValueError` if not registered at all.
 
+* `get_signal_quality()`
+
+  Retrieves signal quality.
+
+  **Returns**: Two integers, the signal quality (0-31) and RXQUAL. These are replaced by `None` if no signal quality information is available.
+  **Note**: The RXQUAL output is always `None`. Its meaning is unknown.
+
 * `sms_list()`
 
   Retrieves SMS from the SIM card.
diff --git a/ports/gprs_a9/main.c b/ports/gprs_a9/main.c
index 75cbdd1968d0e..249078813b151 100644
--- a/ports/gprs_a9/main.c
+++ b/ports/gprs_a9/main.c
@@ -233,6 +233,9 @@ void EventDispatch(API_Event_t* pEvent)
             notify_power_on(pEvent);
             break;
 
+        // Network
+        // =======
+
         case API_EVENT_ID_NO_SIMCARD:
             modcellular_notify_no_sim(pEvent);
             break;
@@ -277,6 +280,10 @@ void EventDispatch(API_Event_t* pEvent)
             modcellular_notify_sms_receipt(pEvent);
             break;
 
+        case API_EVENT_ID_SIGNAL_QUALITY:
+            modcellular_notify_signal(pEvent);
+            break;
+
         // UART
         // ====
         case API_EVENT_ID_UART_RECEIVED:
diff --git a/ports/gprs_a9/modcellular.c b/ports/gprs_a9/modcellular.c
index c5575e6acf4b3..4db8d04acb636 100644
--- a/ports/gprs_a9/modcellular.c
+++ b/ports/gprs_a9/modcellular.c
@@ -27,6 +27,8 @@
 uint8_t network_status = 0;
 uint8_t network_exception = 0;
 uint8_t network_status_updated = 0;
+uint8_t network_signal_quality = 0;
+uint8_t network_signal_rx_level = 0;
 
 // Count SMS recieved
 uint8_t sms_recieved_count = 0;
@@ -116,7 +118,8 @@ void modcellular_notify_sms_receipt(API_Event_t* event) {
 }
 
 void modcellular_notify_signal(API_Event_t* event) {
-    // TODO: Implement
+    network_signal_quality = event->param1;
+    network_signal_rx_level = event->param2;
 }
 
 // -------
@@ -394,6 +397,21 @@ STATIC mp_obj_t sms_from_raw(uint8_t* header, uint32_t header_length, uint8_t* c
 // Methods
 // -------
 
+STATIC mp_obj_t get_signal_quality(void) {
+    // ========================================
+    // Retrieves the network signal quality.
+    // Returns:
+    //     Two integers: quality
+    // ========================================
+    mp_obj_t tuple[2] = {
+        network_signal_quality == 99 ? mp_const_none : mp_obj_new_int(network_signal_quality),
+        network_signal_rx_level == 99 ? mp_const_none : mp_obj_new_int(network_signal_rx_level),
+    };
+    return mp_obj_new_tuple(2, tuple);
+}
+
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(get_signal_quality_obj, get_signal_quality);
+
 STATIC mp_obj_t get_imei(void) {
     // ========================================
     // Retrieves IMEI number.
@@ -565,6 +583,7 @@ STATIC const mp_map_elem_t mp_module_cellular_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_SMS), MP_ROM_PTR(&sms_type) },
 
     { MP_OBJ_NEW_QSTR(MP_QSTR_get_imei), (mp_obj_t)&get_imei_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_get_signal_quality), (mp_obj_t)&get_signal_quality_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_network_status_changed), (mp_obj_t)&network_status_changed_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_get_network_exception), (mp_obj_t)&get_network_exception_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_get_network_status), (mp_obj_t)&get_network_status_obj },

From d8cf8665780fdefd0dbc38416ade2c4c774f685f Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Fri, 15 Mar 2019 00:17:37 +0100
Subject: [PATCH 3164/3533] Add SMS sending exception

---
 ports/gprs_a9/modcellular.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ports/gprs_a9/modcellular.c b/ports/gprs_a9/modcellular.c
index 4db8d04acb636..f09f56254e53f 100644
--- a/ports/gprs_a9/modcellular.c
+++ b/ports/gprs_a9/modcellular.c
@@ -18,6 +18,7 @@
 
 #define NTW_EXC_NOSIM 0x01
 #define NTW_EXC_REG_DENIED 0x02
+#define NTW_EXC_SMS_SEND 0x03
 
 // --------------
 // Vars: statuses
@@ -110,7 +111,7 @@ void modcellular_notify_sms_sent(API_Event_t* event) {
 }
 
 void modcellular_notify_sms_error(API_Event_t* event) {
-    mp_warning("SMS Error %d", event->param1);
+    network_exception = NTW_EXC_SMS_SEND;
 }
 
 void modcellular_notify_sms_receipt(API_Event_t* event) {

From 2a86062524c3fa2183e75100da73e2cd16e5a099 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Fri, 15 Mar 2019 00:55:10 +0100
Subject: [PATCH 3165/3533] Declare a separate exception class for cellular
 module

---
 ports/gprs_a9/modcellular.c | 33 +++++++++++++++++++++++----------
 ports/gprs_a9/modcellular.h |  4 ++++
 2 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/ports/gprs_a9/modcellular.c b/ports/gprs_a9/modcellular.c
index f09f56254e53f..5c9e4316fc44a 100644
--- a/ports/gprs_a9/modcellular.c
+++ b/ports/gprs_a9/modcellular.c
@@ -4,6 +4,7 @@
 #include "py/obj.h"
 #include "py/runtime.h"
 #include "py/binary.h"
+#include "py/objexcept.h"
 
 #include "api_info.h"
 #include "api_sim.h"
@@ -52,6 +53,16 @@ void cellular_init0(void) {
     sms_recieved_count = 0;
 }
 
+// ----------
+// Exceptions
+// ----------
+
+MP_DEFINE_EXCEPTION(CellularError, OSError)
+
+NORETURN void mp_raise_CellularError(const char *msg) {
+    mp_raise_msg(&mp_type_CellularError, msg);
+}
+
 // ------
 // Notify
 // ------
@@ -209,7 +220,7 @@ STATIC mp_obj_t sms_send(mp_obj_t self_in) {
     sms_obj_t *self = MP_OBJ_TO_PTR(self_in);
 
     if (self->status != 0) {
-        mp_raise_ValueError("A message with non-zero status cannot be sent");
+        mp_raise_CellularError("A message with non-zero status cannot be sent");
         return mp_const_none;
     }
 
@@ -217,7 +228,7 @@ STATIC mp_obj_t sms_send(mp_obj_t self_in) {
     const char* message_c = mp_obj_str_get_str(self->message);
 
     if (!SMS_SetFormat(SMS_FORMAT_TEXT, SIM0)) {
-        mp_raise_ValueError("Failed to set SMS format: is SIM card present?");
+        mp_raise_CellularError("Failed to set SMS format: is SIM card present?");
         return mp_const_none;
     } 
 
@@ -229,12 +240,12 @@ STATIC mp_obj_t sms_send(mp_obj_t self_in) {
     };
 
     if (!SMS_SetParameter(&smsParam, SIM0)) {
-        mp_raise_ValueError("Failed to set SMS parameters");
+        mp_raise_CellularError("Failed to set SMS parameters");
         return mp_const_none;
     }
 
     if (!SMS_SetNewMessageStorage(SMS_STORAGE_SIM_CARD)) {
-        mp_raise_ValueError("Failed to set SMS storage in the SIM card");
+        mp_raise_CellularError("Failed to set SMS storage in the SIM card");
         return mp_const_none;
     }
 
@@ -242,13 +253,13 @@ STATIC mp_obj_t sms_send(mp_obj_t self_in) {
     uint32_t unicodeLen;
 
     if (!SMS_LocalLanguage2Unicode((uint8_t*)message_c, strlen(message_c), CHARSET_UTF_8, &unicode, &unicodeLen)) {
-        mp_raise_ValueError("Failed to convert to Unicode before sending SMS");
+        mp_raise_CellularError("Failed to convert to Unicode before sending SMS");
         return mp_const_none;
     }
 
     if (!SMS_SendMessage(destination_c, unicode, unicodeLen, SIM0)) {
         OS_Free(unicode);
-        mp_raise_ValueError("Failed to submit SMS message");
+        mp_raise_CellularError("Failed to submit SMS message for sending");
         return mp_const_none;
     }
     OS_Free(unicode);
@@ -266,12 +277,12 @@ STATIC mp_obj_t sms_withdraw(mp_obj_t self_in) {
     sms_obj_t *self = MP_OBJ_TO_PTR(self_in);
 
     if (self->index == 0 || self->status == 0) {
-        mp_raise_ValueError("Cannot withdraw SMS with zero index/status");
+        mp_raise_CellularError("Cannot withdraw SMS with zero index/status");
         return mp_const_none;
     }
 
     if (!SMS_DeleteMessage(self->index, SMS_STATUS_ALL, SMS_STORAGE_SIM_CARD)) {
-        mp_raise_ValueError("Failed to withdraw SMS");
+        mp_raise_CellularError("Failed to withdraw SMS");
         return mp_const_none;
     }
 
@@ -512,7 +523,7 @@ STATIC mp_obj_t get_iccid(void) {
     if (SIM_GetICCID((uint8_t*)iccid))
         return mp_obj_new_str(iccid, strlen(iccid));
     else {
-        mp_raise_ValueError("No ICCID data: is SIM card inserted?");
+        mp_raise_CellularError("No ICCID data: is SIM card inserted?");
         return mp_const_none;
     }
 }
@@ -530,7 +541,7 @@ STATIC mp_obj_t get_imsi(void) {
     if (SIM_GetIMSI((uint8_t*)imsi))
         return mp_obj_new_str(imsi, strlen(imsi));
     else {
-        mp_raise_ValueError("No IMSI data: is SIM card inserted?");
+        mp_raise_CellularError("No IMSI data: is SIM card inserted?");
         return mp_const_none;
     }
 }
@@ -581,6 +592,8 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_0(sms_list_obj, sms_list);
 STATIC const mp_map_elem_t mp_module_cellular_globals_table[] = {
     { MP_OBJ_NEW_QSTR(MP_QSTR___name__), MP_OBJ_NEW_QSTR(MP_QSTR_cellular) },
 
+    { MP_ROM_QSTR(MP_QSTR_CellularError), MP_ROM_PTR(&mp_type_CellularError) },
+
     { MP_ROM_QSTR(MP_QSTR_SMS), MP_ROM_PTR(&sms_type) },
 
     { MP_OBJ_NEW_QSTR(MP_QSTR_get_imei), (mp_obj_t)&get_imei_obj },
diff --git a/ports/gprs_a9/modcellular.h b/ports/gprs_a9/modcellular.h
index 08de36e195862..b1e9ec7d0aefd 100644
--- a/ports/gprs_a9/modcellular.h
+++ b/ports/gprs_a9/modcellular.h
@@ -1,4 +1,7 @@
 #include "api_event.h"
+#include "py/obj.h"
+
+extern const mp_obj_type_t mp_type_CellularError;
 
 void cellular_init0(void);
 
@@ -19,3 +22,4 @@ void modcellular_notify_signal(API_Event_t* event);
 #define MAX_SMS_SEND_TIMEOUT 10000
 #define REQUIRES_NETWORK_REGISTRATION do {if (!network_status) {mp_raise_ValueError("Network is not available: is SIM card inserted?"); return mp_const_none;}} while(0)
 #define REQUIRES_VALID_SMS_STATUS(bits) do {if (bitsum(bits) != 1) {return mp_const_none;}} while(0)
+

From 9f35b1157a689c40f3a3a3d32e57930ab3cb2d40 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Fri, 15 Mar 2019 01:09:44 +0100
Subject: [PATCH 3166/3533] Adjust doc to reflect the new CellularException.
 Additional sections

---
 ports/gprs_a9/README.md     | 66 ++++++++++++++++++++++---------------
 ports/gprs_a9/modcellular.h |  2 +-
 2 files changed, 41 insertions(+), 27 deletions(-)

diff --git a/ports/gprs_a9/README.md b/ports/gprs_a9/README.md
index 03a5118d2ad77..df14004694905 100644
--- a/ports/gprs_a9/README.md
+++ b/ports/gprs_a9/README.md
@@ -22,6 +22,38 @@ Provides cellular functionality.
 As usual, the original API does not give access to radio-level and low-level functionality such as controlling the registration on the cellular network: these are performed in the background automatically.
 The purpose of this module is to have an access to high-level networking (SMS, GPRS, calls) as well as to read the status of various components of cellular networking.
 
+#### Classes ####
+
+* `SMS(phone_number, message)`
+
+  A class for handling SMS.
+
+  **Attrs**:
+
+    * phone_number (str): phone number (sender or destination);
+    * message (str): message contents;
+    * status (int): an integer with status bits;
+    * inbox (bool): incoming message if `True`, outgoing message if `False` or unknown status if `None`;
+    * unread (bool): unread message if `True`, previously read message if `False` or unknown status if `None`;
+    * sent (bool): sent message if `True`, not sent message if `False` or unknown status if `None`;
+    * `send()`
+    
+      Sends the message.
+
+      **Raises**: `CelularError` if not registered on the network or failed to set up/send SMS.
+
+    * `withdraw()`
+
+      Withdraws SMS from SIM storage. Resets status and index of this object to zero.
+
+      **Raises**: `CellularError` if failed to withdraw.
+
+#### Exception classes ####
+
+* `CellularError(message)`
+
+#### Methods ####
+
 * `get_imei()`
 
   Retrieves the International Mobile Equipment Identity (IMEI) number.
@@ -34,7 +66,7 @@ The purpose of this module is to have an access to high-level networking (SMS, G
 
   **Returns**: a string with ICCID number.
 
-  **Raises**: `ValueError` if no ICCID number can be retrieved.
+  **Raises**: `CellularError` if no ICCID number can be retrieved.
 
 * `get_imsi()`
 
@@ -42,7 +74,7 @@ The purpose of this module is to have an access to high-level networking (SMS, G
 
   **Returns**: a string with IMSI number.
 
-  **Raises**: `ValueError` if no IMSI number can be retrieved.
+  **Raises**: `CellularError` if no IMSI number can be retrieved.
 
 * `network_status_changed()`
 
@@ -82,7 +114,7 @@ The purpose of this module is to have an access to high-level networking (SMS, G
 
   **Returns**: True if roaming.
 
-  **Raises** `ValueError` if not registered at all.
+  **Raises** `CellularError` if not registered on the network.
 
 * `get_signal_quality()`
 
@@ -97,35 +129,15 @@ The purpose of this module is to have an access to high-level networking (SMS, G
   
   **Returns**: a list of SMS messages.
 
-* `SMS(phone_number, message)`
-
-  A class for handling SMS.
-
-  **Attrs**:
-
-    * phone_number (str): phone number (sender or destination);
-    * message (str): message contents;
-    * status (int): an integer with status bits;
-    * inbox (bool): incoming message if `True`, outgoing message if `False` or unknown status if `None`;
-    * unread (bool): unread message if `True`, previously read message if `False` or unknown status if `None`;
-    * sent (bool): sent message if `True`, not sent message if `False` or unknown status if `None`;
-    * `send()`
-    
-      Sends the message.
-
-      **Raises**: `ValueError` if failed to set up/send SMS.
-
-    * `withdraw()`
-
-      Withdraws SMS from SIM storage. Resets status and index of this object to zero.
-
-      **Raises**: `ValueError` if failed to withdraw.
+  **Raises**: `CellularError` if not registered on the network. This is because network registration process interfers with most other SIM-related operations.
 
 ### `gps`
 
 Provides the GPS functionality.
 This is only available in the A9G module where GPS is a separate chip connected via UART2.
 
+#### Methods ####
+
 * `on()`
 
   Turns the GPS on. Blocks until the GPS module responds.
@@ -172,6 +184,8 @@ This is only available in the A9G module where GPS is a separate chip connected
 
 Provides power-related functions: power, watchdogs.
 
+#### Methods ####
+
 * `reset()`
 
   Hard-resets the module.
diff --git a/ports/gprs_a9/modcellular.h b/ports/gprs_a9/modcellular.h
index b1e9ec7d0aefd..e72ba84dbbe07 100644
--- a/ports/gprs_a9/modcellular.h
+++ b/ports/gprs_a9/modcellular.h
@@ -20,6 +20,6 @@ void modcellular_notify_signal(API_Event_t* event);
 
 #define MAX_SMS_LIST_TIMEOUT 1000
 #define MAX_SMS_SEND_TIMEOUT 10000
-#define REQUIRES_NETWORK_REGISTRATION do {if (!network_status) {mp_raise_ValueError("Network is not available: is SIM card inserted?"); return mp_const_none;}} while(0)
+#define REQUIRES_NETWORK_REGISTRATION do {if (!network_status) {mp_raise_CellularError("Network is not available: is SIM card inserted?"); return mp_const_none;}} while(0)
 #define REQUIRES_VALID_SMS_STATUS(bits) do {if (bitsum(bits) != 1) {return mp_const_none;}} while(0)
 

From ec7c43234ce8062062d8e57410eb7beaa5e66209 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Fri, 15 Mar 2019 01:12:20 +0100
Subject: [PATCH 3167/3533] Add TODOs

---
 ports/gprs_a9/README.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ports/gprs_a9/README.md b/ports/gprs_a9/README.md
index df14004694905..7d5a5c2c9bff1 100644
--- a/ports/gprs_a9/README.md
+++ b/ports/gprs_a9/README.md
@@ -194,6 +194,7 @@ Provides power-related functions: power, watchdogs.
 
   Powers the module down.
   **Note**: By fact, hard-resets the module, at least when USB-powered.
+  **TODO**: Needs further investigation.
 
 * `idle()`
 
@@ -211,7 +212,8 @@ Provides power-related functions: power, watchdogs.
   Retrieves the reason for powering the module on.
 
   **Returns**: one of `POWER_ON_CAUSE_ALARM`, `POWER_ON_CAUSE_CHARGE`, `POWER_ON_CAUSE_EXCEPTION`, `POWER_ON_CAUSE_KEY`, `POWER_ON_CAUSE_MAX`, `POWER_ON_CAUSE_RESET`.
-  **Note**: never saw anything except `POWER_ON_CAUSE_CHARGE` returned (needs further investigation).
+  **Note**: never saw anything except `POWER_ON_CAUSE_CHARGE` returned.
+  **TODO**: needs further investigation.
 
 * `watchdog_on(timeout)`
 

From c8d526b7c6d311de59fb1ab6ab468b9e2be03394 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Fri, 15 Mar 2019 22:21:03 +0100
Subject: [PATCH 3168/3533] Additional exception types in the cellular class

---
 ports/gprs_a9/README.md     | 15 +++++++++------
 ports/gprs_a9/modcellular.c | 35 +++++++++++++++++++++++++----------
 ports/gprs_a9/modcellular.h |  5 ++++-
 3 files changed, 38 insertions(+), 17 deletions(-)

diff --git a/ports/gprs_a9/README.md b/ports/gprs_a9/README.md
index 7d5a5c2c9bff1..86b6f382e97a1 100644
--- a/ports/gprs_a9/README.md
+++ b/ports/gprs_a9/README.md
@@ -40,17 +40,20 @@ The purpose of this module is to have an access to high-level networking (SMS, G
     
       Sends the message.
 
-      **Raises**: `CelularError` if not registered on the network or failed to set up/send SMS.
+      **Raises**: `CelularRegistrationError` if not registered on the network or `SMSError` if failed to set up/send SMS.
 
     * `withdraw()`
 
       Withdraws SMS from SIM storage. Resets status and index of this object to zero.
 
-      **Raises**: `CellularError` if failed to withdraw.
+      **Raises**: `SMSError` if failed to withdraw.
 
 #### Exception classes ####
 
 * `CellularError(message)`
+* `CellularRegistrationError(message)`
+* `SMSError(message)`
+* `NoSIMError(message)`
 
 #### Methods ####
 
@@ -66,7 +69,7 @@ The purpose of this module is to have an access to high-level networking (SMS, G
 
   **Returns**: a string with ICCID number.
 
-  **Raises**: `CellularError` if no ICCID number can be retrieved.
+  **Raises**: `NoSIMError` if no ICCID number can be retrieved.
 
 * `get_imsi()`
 
@@ -74,7 +77,7 @@ The purpose of this module is to have an access to high-level networking (SMS, G
 
   **Returns**: a string with IMSI number.
 
-  **Raises**: `CellularError` if no IMSI number can be retrieved.
+  **Raises**: `NoSIMError` if no IMSI number can be retrieved.
 
 * `network_status_changed()`
 
@@ -114,7 +117,7 @@ The purpose of this module is to have an access to high-level networking (SMS, G
 
   **Returns**: True if roaming.
 
-  **Raises** `CellularError` if not registered on the network.
+  **Raises** `CellularRegistrationError` if not registered on the network.
 
 * `get_signal_quality()`
 
@@ -129,7 +132,7 @@ The purpose of this module is to have an access to high-level networking (SMS, G
   
   **Returns**: a list of SMS messages.
 
-  **Raises**: `CellularError` if not registered on the network. This is because network registration process interfers with most other SIM-related operations.
+  **Raises**: `CellularRegistrationError` if not registered on the network. This is because network registration process interfers with most other SIM-related operations.
 
 ### `gps`
 
diff --git a/ports/gprs_a9/modcellular.c b/ports/gprs_a9/modcellular.c
index 5c9e4316fc44a..d2662acdadbf0 100644
--- a/ports/gprs_a9/modcellular.c
+++ b/ports/gprs_a9/modcellular.c
@@ -58,11 +58,26 @@ void cellular_init0(void) {
 // ----------
 
 MP_DEFINE_EXCEPTION(CellularError, OSError)
+MP_DEFINE_EXCEPTION(CellularRegistrationError, CellularError)
+MP_DEFINE_EXCEPTION(SMSError, CellularError)
+MP_DEFINE_EXCEPTION(NoSIMError, CellularError)
 
 NORETURN void mp_raise_CellularError(const char *msg) {
     mp_raise_msg(&mp_type_CellularError, msg);
 }
 
+NORETURN void mp_raise_CellularRegistrationError(const char *msg) {
+    mp_raise_msg(&mp_type_CellularRegistrationError, msg);
+}
+
+NORETURN void mp_raise_SMSError(const char *msg) {
+    mp_raise_msg(&mp_type_SMSError, msg);
+}
+
+NORETURN void mp_raise_NoSIMError(const char *msg) {
+    mp_raise_msg(&mp_type_NoSIMError, msg);
+}
+
 // ------
 // Notify
 // ------
@@ -220,7 +235,7 @@ STATIC mp_obj_t sms_send(mp_obj_t self_in) {
     sms_obj_t *self = MP_OBJ_TO_PTR(self_in);
 
     if (self->status != 0) {
-        mp_raise_CellularError("A message with non-zero status cannot be sent");
+        mp_raise_SMSError("A message with non-zero status cannot be sent");
         return mp_const_none;
     }
 
@@ -228,7 +243,7 @@ STATIC mp_obj_t sms_send(mp_obj_t self_in) {
     const char* message_c = mp_obj_str_get_str(self->message);
 
     if (!SMS_SetFormat(SMS_FORMAT_TEXT, SIM0)) {
-        mp_raise_CellularError("Failed to set SMS format: is SIM card present?");
+        mp_raise_SMSError("Failed to set SMS format");
         return mp_const_none;
     } 
 
@@ -240,12 +255,12 @@ STATIC mp_obj_t sms_send(mp_obj_t self_in) {
     };
 
     if (!SMS_SetParameter(&smsParam, SIM0)) {
-        mp_raise_CellularError("Failed to set SMS parameters");
+        mp_raise_SMSError("Failed to set SMS parameters");
         return mp_const_none;
     }
 
     if (!SMS_SetNewMessageStorage(SMS_STORAGE_SIM_CARD)) {
-        mp_raise_CellularError("Failed to set SMS storage in the SIM card");
+        mp_raise_SMSError("Failed to set SMS storage in the SIM card");
         return mp_const_none;
     }
 
@@ -253,13 +268,13 @@ STATIC mp_obj_t sms_send(mp_obj_t self_in) {
     uint32_t unicodeLen;
 
     if (!SMS_LocalLanguage2Unicode((uint8_t*)message_c, strlen(message_c), CHARSET_UTF_8, &unicode, &unicodeLen)) {
-        mp_raise_CellularError("Failed to convert to Unicode before sending SMS");
+        mp_raise_SMSError("Failed to convert to Unicode before sending SMS");
         return mp_const_none;
     }
 
     if (!SMS_SendMessage(destination_c, unicode, unicodeLen, SIM0)) {
         OS_Free(unicode);
-        mp_raise_CellularError("Failed to submit SMS message for sending");
+        mp_raise_SMSError("Failed to submit SMS message for sending");
         return mp_const_none;
     }
     OS_Free(unicode);
@@ -277,12 +292,12 @@ STATIC mp_obj_t sms_withdraw(mp_obj_t self_in) {
     sms_obj_t *self = MP_OBJ_TO_PTR(self_in);
 
     if (self->index == 0 || self->status == 0) {
-        mp_raise_CellularError("Cannot withdraw SMS with zero index/status");
+        mp_raise_SMSError("Cannot withdraw SMS with zero index/status");
         return mp_const_none;
     }
 
     if (!SMS_DeleteMessage(self->index, SMS_STATUS_ALL, SMS_STORAGE_SIM_CARD)) {
-        mp_raise_CellularError("Failed to withdraw SMS");
+        mp_raise_SMSError("Failed to withdraw SMS");
         return mp_const_none;
     }
 
@@ -523,7 +538,7 @@ STATIC mp_obj_t get_iccid(void) {
     if (SIM_GetICCID((uint8_t*)iccid))
         return mp_obj_new_str(iccid, strlen(iccid));
     else {
-        mp_raise_CellularError("No ICCID data: is SIM card inserted?");
+        mp_raise_NoSIMError("No ICCID data available");
         return mp_const_none;
     }
 }
@@ -541,7 +556,7 @@ STATIC mp_obj_t get_imsi(void) {
     if (SIM_GetIMSI((uint8_t*)imsi))
         return mp_obj_new_str(imsi, strlen(imsi));
     else {
-        mp_raise_CellularError("No IMSI data: is SIM card inserted?");
+        mp_raise_NoSIMError("No IMSI data available");
         return mp_const_none;
     }
 }
diff --git a/ports/gprs_a9/modcellular.h b/ports/gprs_a9/modcellular.h
index e72ba84dbbe07..e80c286172a02 100644
--- a/ports/gprs_a9/modcellular.h
+++ b/ports/gprs_a9/modcellular.h
@@ -2,6 +2,9 @@
 #include "py/obj.h"
 
 extern const mp_obj_type_t mp_type_CellularError;
+extern const mp_obj_type_t mp_type_CellularRegistrationError;
+extern const mp_obj_type_t mp_type_SMSError;
+extern const mp_obj_type_t mp_type_NoSIMError;
 
 void cellular_init0(void);
 
@@ -20,6 +23,6 @@ void modcellular_notify_signal(API_Event_t* event);
 
 #define MAX_SMS_LIST_TIMEOUT 1000
 #define MAX_SMS_SEND_TIMEOUT 10000
-#define REQUIRES_NETWORK_REGISTRATION do {if (!network_status) {mp_raise_CellularError("Network is not available: is SIM card inserted?"); return mp_const_none;}} while(0)
+#define REQUIRES_NETWORK_REGISTRATION do {if (!network_status) {mp_raise_CellularRegistrationError("Network is not available: is SIM card inserted?"); return mp_const_none;}} while(0)
 #define REQUIRES_VALID_SMS_STATUS(bits) do {if (bitsum(bits) != 1) {return mp_const_none;}} while(0)
 

From b687d8d3668b609bde790de2f40ee481056bfb2c Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Fri, 15 Mar 2019 22:22:57 +0100
Subject: [PATCH 3169/3533] Add new exceptions to the module attributes

---
 ports/gprs_a9/modcellular.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ports/gprs_a9/modcellular.c b/ports/gprs_a9/modcellular.c
index d2662acdadbf0..499c533be8639 100644
--- a/ports/gprs_a9/modcellular.c
+++ b/ports/gprs_a9/modcellular.c
@@ -608,6 +608,9 @@ STATIC const mp_map_elem_t mp_module_cellular_globals_table[] = {
     { MP_OBJ_NEW_QSTR(MP_QSTR___name__), MP_OBJ_NEW_QSTR(MP_QSTR_cellular) },
 
     { MP_ROM_QSTR(MP_QSTR_CellularError), MP_ROM_PTR(&mp_type_CellularError) },
+    { MP_ROM_QSTR(MP_QSTR_CellularRegistrationError), MP_ROM_PTR(&mp_type_CellularRegistrationError) },
+    { MP_ROM_QSTR(MP_QSTR_SMSError), MP_ROM_PTR(&mp_type_SMSError) },
+    { MP_ROM_QSTR(MP_QSTR_NoSIMError), MP_ROM_PTR(&mp_type_NoSIMError) },
 
     { MP_ROM_QSTR(MP_QSTR_SMS), MP_ROM_PTR(&sms_type) },
 

From 5ea426c64e58c9d8fdd11173e26769e6dda56e1f Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Fri, 15 Mar 2019 22:37:18 +0100
Subject: [PATCH 3170/3533] Replace method polling background exceptions on the
 network

---
 ports/gprs_a9/README.md     |  6 +++---
 ports/gprs_a9/modcellular.c | 23 ++++++++++++++++++-----
 2 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/ports/gprs_a9/README.md b/ports/gprs_a9/README.md
index 86b6f382e97a1..0b0442c26c3a4 100644
--- a/ports/gprs_a9/README.md
+++ b/ports/gprs_a9/README.md
@@ -93,11 +93,11 @@ The purpose of this module is to have an access to high-level networking (SMS, G
 
   **TODO**: Provide bit-wise specs.
 
-* `get_network_exception()`
+* `poll_network_exception()`
 
-  Retrieves the network exception.
+  Retrieves the network exception and raises it, if any.
 
-  **Returns**: `int` representing the last network exception. Returns zero if no exception occurred since the last check.
+  **Raises**: One of `CellularError`s occurred during the operation in the background.
 
 * `is_sim_present()`
 
diff --git a/ports/gprs_a9/modcellular.c b/ports/gprs_a9/modcellular.c
index 499c533be8639..2123eb1e6e54d 100644
--- a/ports/gprs_a9/modcellular.c
+++ b/ports/gprs_a9/modcellular.c
@@ -479,18 +479,31 @@ STATIC mp_obj_t network_status_changed(void) {
 
 STATIC MP_DEFINE_CONST_FUN_OBJ_0(network_status_changed_obj, network_status_changed);
 
-STATIC mp_obj_t get_network_exception(void) {
+STATIC mp_obj_t poll_network_exception(void) {
     // ========================================
     // Checks whether network exception occurred since the last check.
     // Returns:
     //    An integer representing network exception.
     // ========================================
-    uint8_t result = network_exception;
+    switch (network_exception) {
+
+        case NTW_EXC_NOSIM:
+            mp_raise_NoSIMError("No SIM card inserted");
+            break;
+
+        case NTW_EXC_REG_DENIED:
+            mp_raise_CellularRegistrationError("Failed to register on the cellular network");
+            break;
+
+        case NTW_EXC_SMS_SEND:
+            mp_raise_SMSError("SMS was not sent");
+            break;
+    }
     network_exception = 0;
-    return mp_obj_new_bool(result);
+    return mp_const_none;
 }
 
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(get_network_exception_obj, get_network_exception);
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(poll_network_exception_obj, poll_network_exception);
 
 STATIC mp_obj_t get_network_status(void) {
     // ========================================
@@ -617,7 +630,7 @@ STATIC const mp_map_elem_t mp_module_cellular_globals_table[] = {
     { MP_OBJ_NEW_QSTR(MP_QSTR_get_imei), (mp_obj_t)&get_imei_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_get_signal_quality), (mp_obj_t)&get_signal_quality_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_network_status_changed), (mp_obj_t)&network_status_changed_obj },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_get_network_exception), (mp_obj_t)&get_network_exception_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_poll_network_exception), (mp_obj_t)&poll_network_exception_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_get_network_status), (mp_obj_t)&get_network_status_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_is_sim_present), (mp_obj_t)&is_sim_present_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_is_network_registered), (mp_obj_t)&is_network_registered_obj },

From b54eccf9502d6b14e13bfd31ace0f1dff4a69df9 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Fri, 15 Mar 2019 22:57:49 +0100
Subject: [PATCH 3171/3533] Replace ValueError by GPSException

---
 ports/gprs_a9/README.md | 14 +++++++++-----
 ports/gprs_a9/main.c    |  2 +-
 ports/gprs_a9/modgps.c  | 24 +++++++++++++++++++-----
 ports/gprs_a9/modgps.h  |  9 +++++----
 4 files changed, 34 insertions(+), 15 deletions(-)

diff --git a/ports/gprs_a9/README.md b/ports/gprs_a9/README.md
index 0b0442c26c3a4..933c99bd0c315 100644
--- a/ports/gprs_a9/README.md
+++ b/ports/gprs_a9/README.md
@@ -139,13 +139,17 @@ The purpose of this module is to have an access to high-level networking (SMS, G
 Provides the GPS functionality.
 This is only available in the A9G module where GPS is a separate chip connected via UART2.
 
+#### Exception classes ####
+
+* `GPSError(message)`
+
 #### Methods ####
 
 * `on()`
 
   Turns the GPS on. Blocks until the GPS module responds.
 
-  **Raises**: `ValueError` if the GPS module does not respond within 10 seconds.
+  **Raises**: `GPSError` if the GPS module does not respond within 10 seconds.
 
 * `off()`
 
@@ -157,7 +161,7 @@ This is only available in the A9G module where GPS is a separate chip connected
 
   **Returns**: the firmware version as a string.
 
-  **Raises**: `ValueError` if the GPS module fails to respond.
+  **Raises**: `GPSError` if the GPS module fails to respond.
 
 * `get_location()`
 
@@ -165,7 +169,7 @@ This is only available in the A9G module where GPS is a separate chip connected
 
   **Returns**: latitude and longitude in degrees.
 
-  **Raises**: `ValueError` if the GPS module never responded or is off.
+  **Raises**: `GPSError` if the GPS module never responded or is off.
 
 * `get_last_location()`
 
@@ -173,7 +177,7 @@ This is only available in the A9G module where GPS is a separate chip connected
 
   **Returns**: latitude and longitude in degrees.
 
-  **Raises**: `ValueError` if the GPS module never responded.
+  **Raises**: `GPSError` if the GPS module never responded.
 
 * `get_satellites()`
 
@@ -181,7 +185,7 @@ This is only available in the A9G module where GPS is a separate chip connected
 
   **Returns**: the number of satellites tracked and the number of visible satellites.
 
-  **Raises**: `ValueError` if the GPS module never responded.
+  **Raises**: `GPSError` if the GPS module is off.
 
 ### `machine`
 
diff --git a/ports/gprs_a9/main.c b/ports/gprs_a9/main.c
index 249078813b151..3c3c8e3c095d7 100644
--- a/ports/gprs_a9/main.c
+++ b/ports/gprs_a9/main.c
@@ -323,7 +323,7 @@ void EventDispatch(API_Event_t* pEvent)
         // GPS
         // ===
         case API_EVENT_ID_GPS_UART_RECEIVED:
-            notify_gps_update(pEvent);
+            modgps_notify_gps_update(pEvent);
             break;
 
         default:
diff --git a/ports/gprs_a9/modgps.c b/ports/gprs_a9/modgps.c
index 9ac56fa28cf38..ed0fa1705776e 100644
--- a/ports/gprs_a9/modgps.c
+++ b/ports/gprs_a9/modgps.c
@@ -4,6 +4,7 @@
 #include "py/obj.h"
 #include "py/runtime.h"
 #include "py/binary.h"
+#include "py/objexcept.h"
 
 #include "api_gps.h"
 #include "api_os.h"
@@ -18,10 +19,20 @@
 
 GPS_Info_t* gpsInfo = NULL;
 
-void notify_gps_update(API_Event_t* event) {
+void modgps_notify_gps_update(API_Event_t* event) {
     GPS_Update(event->pParam1,event->param1);
 }
 
+// ----------
+// Exceptions
+// ----------
+
+MP_DEFINE_EXCEPTION(GPSError, OSError)
+
+NORETURN void mp_raise_GPSError(const char *msg) {
+    mp_raise_msg(&mp_type_GPSError, msg);
+}
+
 // -------
 // Methods
 // -------
@@ -43,7 +54,7 @@ STATIC mp_obj_t on(void) {
         OS_Sleep(100);
     }
     if (gpsInfo->rmc.latitude.value == 0) {
-        mp_raise_ValueError("Failed to start GPS");
+        mp_raise_GPSError("Failed to start GPS");
     }
     return mp_const_none;
 }
@@ -70,7 +81,7 @@ STATIC mp_obj_t get_firmware_version(void) {
     // ========================================
     char buffer[300];
     if (!GPS_GetVersion(buffer, 150)) {
-        mp_raise_ValueError("Failed to get the firmware version: did you run gps.on()?");
+        mp_raise_GPSError("Failed to get the firmware version: did you run gps.on()?");
         return mp_const_none;
     }
     return mp_obj_new_str(buffer, strlen(buffer));
@@ -118,7 +129,7 @@ STATIC mp_obj_t get_satellites(void) {
     // Returns:
     //     The number of visible GPS satellites.
     // ========================================
-    REQUIRES_VALID_GPS_INFO;
+    REQUIRES_GPS_ON;
 
     mp_obj_t tuple[2] = {
         mp_obj_new_int(gpsInfo->gga.satellites_tracked),
@@ -130,7 +141,10 @@ STATIC mp_obj_t get_satellites(void) {
 STATIC MP_DEFINE_CONST_FUN_OBJ_0(get_satellites_obj, get_satellites);
 
 STATIC const mp_map_elem_t mp_module_gps_globals_table[] = {
-    { MP_OBJ_NEW_QSTR(MP_QSTR___name__), MP_OBJ_NEW_QSTR(MP_QSTR_gps) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR___name__i), MP_OBJ_NEW_QSTR(MP_QSTR_gps) },
+
+    { MP_ROM_QSTR(MP_QSTR_GPSError), MP_ROM_PTR(&mp_type_GPSError) },
+
     { MP_OBJ_NEW_QSTR(MP_QSTR_on), (mp_obj_t)&on_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_off), (mp_obj_t)&off_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_get_firmware_version), (mp_obj_t)&get_firmware_version_obj },
diff --git a/ports/gprs_a9/modgps.h b/ports/gprs_a9/modgps.h
index 71f8f95ad54d9..1bf8975ae526e 100644
--- a/ports/gprs_a9/modgps.h
+++ b/ports/gprs_a9/modgps.h
@@ -1,10 +1,11 @@
 #include "api_event.h"
 #include "gps_parse.h"
+#include "py/obj.h"
 
-extern GPS_Info_t* gpsInfo;
+extern const mp_obj_type_t mp_type_CellularError;
 
-void notify_gps_update(API_Event_t* event);
+void modgps_notify_gps_update(API_Event_t* event);
 
 #define MAX_GPS_TIMEOUT 5000
-#define REQUIRES_VALID_GPS_INFO do { if (!gpsInfo) {mp_raise_ValueError("No GPS data available: did you run gps.on()?"); return mp_const_none;}} while(0)
-#define REQUIRES_GPS_ON do { if (!GPS_IsOpen()) {mp_raise_ValueError("GPS is off"); return mp_const_none;}} while(0)
+#define REQUIRES_VALID_GPS_INFO do { if (!gpsInfo) {mp_raise_GPSError("No GPS data available: did you run gps.on()?"); return mp_const_none;}} while(0)
+#define REQUIRES_GPS_ON do { if (!GPS_IsOpen()) {mp_raise_GPSError("GPS is off"); return mp_const_none;}} while(0)

From d3cef99acbdf2e8cf4b1eb165497e27dc7af33ba Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Fri, 15 Mar 2019 23:33:44 +0100
Subject: [PATCH 3172/3533] Add SIM drop event handling

---
 ports/gprs_a9/main.c        |  4 ++++
 ports/gprs_a9/modcellular.c | 22 ++++++++++++++++------
 ports/gprs_a9/modcellular.h |  1 +
 3 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/ports/gprs_a9/main.c b/ports/gprs_a9/main.c
index 3c3c8e3c095d7..cd441619ac667 100644
--- a/ports/gprs_a9/main.c
+++ b/ports/gprs_a9/main.c
@@ -240,6 +240,10 @@ void EventDispatch(API_Event_t* pEvent)
             modcellular_notify_no_sim(pEvent);
             break;
 
+        case API_EVENT_ID_SIMCARD_DROP:
+            modcellular_notify_sim_drop(pEvent);
+            break;
+
         case API_EVENT_ID_NETWORK_REGISTERED_HOME:
             modcellular_notify_reg_home(pEvent);
             break;
diff --git a/ports/gprs_a9/modcellular.c b/ports/gprs_a9/modcellular.c
index 2123eb1e6e54d..97bbb0a71c672 100644
--- a/ports/gprs_a9/modcellular.c
+++ b/ports/gprs_a9/modcellular.c
@@ -20,6 +20,7 @@
 #define NTW_EXC_NOSIM 0x01
 #define NTW_EXC_REG_DENIED 0x02
 #define NTW_EXC_SMS_SEND 0x03
+#define NTW_EXC_SIM_DROP 0x04
 
 // --------------
 // Vars: statuses
@@ -85,10 +86,15 @@ NORETURN void mp_raise_NoSIMError(const char *msg) {
 void modcellular_notify_no_sim(API_Event_t* event) {
     network_status = 0;
     network_status_updated = 1;
-
     network_exception = NTW_EXC_NOSIM;
 }
 
+void modcellular_notify_sim_drop(API_Event_t* event) {
+    network_status = 0;
+    network_status_updated = 1;
+    network_exception = NTW_EXC_SIM_DROP;
+}
+
 // Register
 
 void modcellular_notify_reg_home(API_Event_t* event) {
@@ -498,6 +504,10 @@ STATIC mp_obj_t poll_network_exception(void) {
         case NTW_EXC_SMS_SEND:
             mp_raise_SMSError("SMS was not sent");
             break;
+
+        case NTW_EXC_SIM_DROP:
+            mp_raise_NoSIMError("SIM card dropped");
+            break;
     }
     network_exception = 0;
     return mp_const_none;
@@ -620,12 +630,12 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_0(sms_list_obj, sms_list);
 STATIC const mp_map_elem_t mp_module_cellular_globals_table[] = {
     { MP_OBJ_NEW_QSTR(MP_QSTR___name__), MP_OBJ_NEW_QSTR(MP_QSTR_cellular) },
 
-    { MP_ROM_QSTR(MP_QSTR_CellularError), MP_ROM_PTR(&mp_type_CellularError) },
-    { MP_ROM_QSTR(MP_QSTR_CellularRegistrationError), MP_ROM_PTR(&mp_type_CellularRegistrationError) },
-    { MP_ROM_QSTR(MP_QSTR_SMSError), MP_ROM_PTR(&mp_type_SMSError) },
-    { MP_ROM_QSTR(MP_QSTR_NoSIMError), MP_ROM_PTR(&mp_type_NoSIMError) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_CellularError), (mp_obj_t)MP_ROM_PTR(&mp_type_CellularError) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_CellularRegistrationError), (mp_obj_t)MP_ROM_PTR(&mp_type_CellularRegistrationError) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_SMSError), (mp_obj_t)MP_ROM_PTR(&mp_type_SMSError) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_NoSIMError), (mp_obj_t)MP_ROM_PTR(&mp_type_NoSIMError) },
 
-    { MP_ROM_QSTR(MP_QSTR_SMS), MP_ROM_PTR(&sms_type) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_SMS), (mp_obj_t)MP_ROM_PTR(&sms_type) },
 
     { MP_OBJ_NEW_QSTR(MP_QSTR_get_imei), (mp_obj_t)&get_imei_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_get_signal_quality), (mp_obj_t)&get_signal_quality_obj },
diff --git a/ports/gprs_a9/modcellular.h b/ports/gprs_a9/modcellular.h
index e80c286172a02..8a01a0bcc8efa 100644
--- a/ports/gprs_a9/modcellular.h
+++ b/ports/gprs_a9/modcellular.h
@@ -9,6 +9,7 @@ extern const mp_obj_type_t mp_type_NoSIMError;
 void cellular_init0(void);
 
 void modcellular_notify_no_sim(API_Event_t* event);
+void modcellular_notify_sim_drop(API_Event_t* event);
 void modcellular_notify_reg_home(API_Event_t* event);
 void modcellular_notify_reg_roaming(API_Event_t* event);
 void modcellular_notify_reg_searching(API_Event_t* event);

From 43bde81751844d48b81ae686b132e6a596f6d424 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sat, 16 Mar 2019 20:05:33 +0100
Subject: [PATCH 3173/3533] Add GPRS activation, track more events and
 exceptions, blocking SMS send

---
 ports/gprs_a9/README.md     |  38 ++++++
 ports/gprs_a9/main.c        |  31 +++++
 ports/gprs_a9/modcellular.c | 260 +++++++++++++++++++++++++++++++++++-
 ports/gprs_a9/modcellular.h |  12 ++
 4 files changed, 339 insertions(+), 2 deletions(-)

diff --git a/ports/gprs_a9/README.md b/ports/gprs_a9/README.md
index 933c99bd0c315..280d2e1f9399f 100644
--- a/ports/gprs_a9/README.md
+++ b/ports/gprs_a9/README.md
@@ -134,6 +134,44 @@ The purpose of this module is to have an access to high-level networking (SMS, G
 
   **Raises**: `CellularRegistrationError` if not registered on the network. This is because network registration process interfers with most other SIM-related operations.
 
+* `gprs_attach()`
+
+  Attaches to the network. This is required for activating the GPRS context. If already attached, does nothing.
+
+  **Raises**: `CellularRegistrationError` if not registered on the network or `CellularAttachmentError` if the attachment process failed at any stage.
+
+  **Note**: There may be no need to run this as, after a hard reset, the module attempts to attach automatically.
+
+  **TODO**: Consider getting rid of this function.
+
+* `gprs_detach()`
+
+  Detaches from the network. Does nothing if already detached.
+
+  **Raises**: `CellularRegistrationError` if not registered on the network or `CellularAttachmentError` if the detachment process failed at any stage.
+
+  **TODO**: Consider getting rid of this function.
+
+* `gprs_activate(apn, user, name)`
+
+  Activates the GPRS context. Does nothing if already activated even if different credentials were provided previously.
+
+  **Args**:
+
+    * apn (str): access point name (APN);
+    * user (str): username;
+    * pass (str): password;
+
+  **Raises**: `CellularRegistrationError` if not registered on the network or `CellularActivationError` if the activation process failed at any stage.
+
+  **Note**: there is no way to check whether the credentials supplied are valid.
+
+* `gprs_deactivate()`
+
+  Deactivates the GPRS context. Does nothing if already deactivated.
+
+  **Raises**: `CellularRegistrationError` if not registered on the network or `CellularActivationError` if the deactivation process failed at any stage.
+
 ### `gps`
 
 Provides the GPS functionality.
diff --git a/ports/gprs_a9/main.c b/ports/gprs_a9/main.c
index cd441619ac667..033e16c1a8dd9 100644
--- a/ports/gprs_a9/main.c
+++ b/ports/gprs_a9/main.c
@@ -262,12 +262,40 @@ void EventDispatch(API_Event_t* pEvent)
 
         case API_EVENT_ID_NETWORK_REGISTER_NO:
             // TODO: WTF is this?
+            modcellular_notify_reg_denied(pEvent);
             break;
 
         case API_EVENT_ID_NETWORK_DEREGISTER:
             modcellular_notify_dereg(pEvent);
             break;
 
+        case API_EVENT_ID_NETWORK_DETACHED:
+            modcellular_notify_det(pEvent);
+            break;
+
+        case API_EVENT_ID_NETWORK_ATTACH_FAILED:
+            modcellular_notify_att_failed(pEvent);
+            break;
+
+        case API_EVENT_ID_NETWORK_ATTACHED:
+            modcellular_notify_att(pEvent);
+            break;
+
+        case API_EVENT_ID_NETWORK_DEACTIVED:
+            modcellular_notify_deact(pEvent);
+            break;
+
+        case API_EVENT_ID_NETWORK_ACTIVATE_FAILED:
+            modcellular_notify_act_failed(pEvent);
+            break;
+
+        case API_EVENT_ID_NETWORK_ACTIVATED:
+            modcellular_notify_act(pEvent);
+            break;
+
+        // SMS
+        // ===
+
         case API_EVENT_ID_SMS_SENT:
             modcellular_notify_sms_sent(pEvent);
             break;
@@ -284,6 +312,9 @@ void EventDispatch(API_Event_t* pEvent)
             modcellular_notify_sms_receipt(pEvent);
             break;
 
+        // Signal
+        // ======
+
         case API_EVENT_ID_SIGNAL_QUALITY:
             modcellular_notify_signal(pEvent);
             break;
diff --git a/ports/gprs_a9/modcellular.c b/ports/gprs_a9/modcellular.c
index 97bbb0a71c672..ba95136b34ca9 100644
--- a/ports/gprs_a9/modcellular.c
+++ b/ports/gprs_a9/modcellular.c
@@ -10,17 +10,24 @@
 #include "api_sim.h"
 #include "api_sms.h"
 #include "api_os.h"
+#include "api_network.h"
 #include "buffer.h"
 #include "time.h"
 
 #define NTW_REG_BIT 0x01
 #define NTW_ROAM_BIT 0x02
 #define NTW_REG_PROGRESS_BIT 0x04
+#define NTW_ATT_BIT 0x08
+#define NTW_ACT_BIT 0x10
 
+#define NTW_NO_EXC 0
 #define NTW_EXC_NOSIM 0x01
 #define NTW_EXC_REG_DENIED 0x02
 #define NTW_EXC_SMS_SEND 0x03
 #define NTW_EXC_SIM_DROP 0x04
+#define NTW_EXC_ATT_FAILED 0x05
+#define NTW_EXC_ACT_FAILED 0x06
+#define NTW_EXC_SMS_DROP 0x07
 
 // --------------
 // Vars: statuses
@@ -36,6 +43,9 @@ uint8_t network_signal_rx_level = 0;
 // Count SMS recieved
 uint8_t sms_recieved_count = 0;
 
+// SMS send flag
+uint8_t sms_send_flag = 0;
+
 // -------------------
 // Vars: SMS retrieval
 // -------------------
@@ -62,6 +72,8 @@ MP_DEFINE_EXCEPTION(CellularError, OSError)
 MP_DEFINE_EXCEPTION(CellularRegistrationError, CellularError)
 MP_DEFINE_EXCEPTION(SMSError, CellularError)
 MP_DEFINE_EXCEPTION(NoSIMError, CellularError)
+MP_DEFINE_EXCEPTION(CellularAttachmentError, CellularError)
+MP_DEFINE_EXCEPTION(CellularActivationError, CellularError)
 
 NORETURN void mp_raise_CellularError(const char *msg) {
     mp_raise_msg(&mp_type_CellularError, msg);
@@ -79,6 +91,14 @@ NORETURN void mp_raise_NoSIMError(const char *msg) {
     mp_raise_msg(&mp_type_NoSIMError, msg);
 }
 
+NORETURN void mp_raise_CellularAttachmentError(const char *msg) {
+    mp_raise_msg(&mp_type_CellularAttachmentError, msg);
+}
+
+NORETURN void mp_raise_CellularActivationError(const char *msg) {
+    mp_raise_msg(&mp_type_CellularActivationError, msg);
+}
+
 // ------
 // Notify
 // ------
@@ -124,6 +144,44 @@ void modcellular_notify_dereg(API_Event_t* event) {
     network_status_updated = 1;
 }
 
+// Attach
+
+void modcellular_notify_det(API_Event_t* event) {
+    network_status &= ~NTW_ATT_BIT;
+    network_status_updated = 1;
+}
+
+void modcellular_notify_att_failed(API_Event_t* event) {
+    network_status &= ~NTW_ATT_BIT;
+    network_status_updated = 1;
+
+    network_exception = NTW_EXC_ATT_FAILED;
+}
+
+void modcellular_notify_att(API_Event_t* event) {
+    network_status |= NTW_ATT_BIT;
+    network_status_updated = 1;
+}
+
+// Activate
+
+void modcellular_notify_deact(API_Event_t* event) {
+    network_status &= ~NTW_ACT_BIT;
+    network_status_updated = 1;
+}
+
+void modcellular_notify_act_failed(API_Event_t* event) {
+    network_status &= ~NTW_ACT_BIT;
+    network_status_updated = 1;
+
+    network_exception = NTW_EXC_ACT_FAILED;
+}
+
+void modcellular_notify_act(API_Event_t* event) {
+    network_status |= NTW_ACT_BIT;
+    network_status_updated = 1;
+}
+
 // SMS
 
 void modcellular_notify_sms_list(API_Event_t* event) {
@@ -133,13 +191,13 @@ void modcellular_notify_sms_list(API_Event_t* event) {
         sms_list_buffer->items[sms_list_buffer_count] = sms_from_record(messageInfo);
         sms_list_buffer_count ++;
     } else {
-        mp_warning("SMS list element discarded");
+        network_exception = NTW_EXC_SMS_DROP;
     }
     OS_Free(messageInfo->data);
 }
 
 void modcellular_notify_sms_sent(API_Event_t* event) {
-    mp_printf(&mp_plat_print, "SMS has been sent");
+    sms_send_flag = 1;
 }
 
 void modcellular_notify_sms_error(API_Event_t* event) {
@@ -278,6 +336,7 @@ STATIC mp_obj_t sms_send(mp_obj_t self_in) {
         return mp_const_none;
     }
 
+    sms_send_flag = 0;
     if (!SMS_SendMessage(destination_c, unicode, unicodeLen, SIM0)) {
         OS_Free(unicode);
         mp_raise_SMSError("Failed to submit SMS message for sending");
@@ -285,6 +344,18 @@ STATIC mp_obj_t sms_send(mp_obj_t self_in) {
     }
     OS_Free(unicode);
 
+    clock_t time = clock();
+    while (clock() - time < MAX_SMS_SEND_TIMEOUT * CLOCKS_PER_MSEC && !sms_send_flag) {
+        OS_Sleep(100);
+    }
+
+    if (!sms_send_flag) {
+        mp_raise_SMSError("SMS send timeout. The module will still attempt to send SMS but this may interfer with other cellular activities");
+        return mp_const_none;
+    }
+
+    sms_send_flag = 0;
+
     return mp_const_none;
 }
 
@@ -508,6 +579,26 @@ STATIC mp_obj_t poll_network_exception(void) {
         case NTW_EXC_SIM_DROP:
             mp_raise_NoSIMError("SIM card dropped");
             break;
+
+        case NTW_EXC_ATT_FAILED:
+            mp_raise_CellularAttachmentError("Failed to attach to the cellular network");
+            break;
+
+        case NTW_EXC_ACT_FAILED:
+            mp_raise_CellularActivationError("Failed to activate the cellular network");
+            break;
+
+        case NTW_EXC_SMS_DROP:
+            mp_raise_SMSError("SMS message was discarded due to a timeout or a wrong SMS storage information");
+            break;
+
+        case NTW_NO_EXC:
+            break;
+
+        default:
+            mp_raise_msg(&mp_type_RuntimeError, "Unknown network exception occurred");
+            break;
+
     }
     network_exception = 0;
     return mp_const_none;
@@ -627,6 +718,167 @@ STATIC mp_obj_t sms_list(void) {
 
 STATIC MP_DEFINE_CONST_FUN_OBJ_0(sms_list_obj, sms_list);
 
+STATIC mp_obj_t gprs_attach() {
+    // ========================================
+    // Attaches to the GPRS network.
+    // ========================================
+    REQUIRES_NETWORK_REGISTRATION;
+
+    uint8_t status;
+
+    // Attach
+    if (!Network_GetAttachStatus(&status)) {
+        mp_raise_CellularAttachmentError("Cannot retrieve attach status");
+        return mp_const_none;
+    }
+
+    if (!status) {
+
+        if (!Network_StartAttach()) {
+            mp_raise_CellularAttachmentError("Cannot initiate attachment");
+            return mp_const_none;
+        }
+
+        clock_t time = clock();
+        while (clock() - time < MAX_ATT_TIMEOUT * CLOCKS_PER_MSEC && !(network_status & NTW_ATT_BIT)) {
+            OS_Sleep(100);
+        }
+
+        if (!(network_status & NTW_ATT_BIT)) {
+            mp_raise_CellularAttachmentError("Network attachment timeout");
+            return mp_const_none;
+        }
+    }
+
+    return mp_const_none;
+}
+
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(gprs_attach_obj, gprs_attach);
+
+STATIC mp_obj_t gprs_detach() {
+    // ========================================
+    // Detaches from the GPRS network.
+    // ========================================
+    REQUIRES_NETWORK_REGISTRATION;
+
+    uint8_t status;
+
+    // Attach
+    if (!Network_GetAttachStatus(&status)) {
+        mp_raise_CellularAttachmentError("Cannot retrieve attach status");
+        return mp_const_none;
+    }
+
+    if (status) {
+
+        if (!Network_StartDetach()) {
+            mp_raise_CellularAttachmentError("Cannot initiate detachment");
+            return mp_const_none;
+        }
+
+        clock_t time = clock();
+        while (clock() - time < MAX_ATT_TIMEOUT * CLOCKS_PER_MSEC && (network_status & NTW_ATT_BIT)) {
+            OS_Sleep(100);
+        }
+
+        if (network_status & NTW_ATT_BIT) {
+            mp_raise_CellularAttachmentError("Network detach timeout");
+            return mp_const_none;
+        }
+    }
+
+    return mp_const_none;
+}
+
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(gprs_detach_obj, gprs_detach);
+
+STATIC mp_obj_t gprs_activate(mp_obj_t apn, mp_obj_t user, mp_obj_t pass) {
+    // ========================================
+    // Activates the GPRS network.
+    // Args:
+    //     apn (str): access point name (APN);
+    //     user (str): username;
+    //     pass (str): password;
+    // ========================================
+    REQUIRES_NETWORK_REGISTRATION;
+
+    const char* c_apn = mp_obj_str_get_str(apn);
+    const char* c_user = mp_obj_str_get_str(user);
+    const char* c_pass = mp_obj_str_get_str(pass);
+
+    uint8_t status;
+
+    // Attach
+    if (!Network_GetActiveStatus(&status)) {
+        mp_raise_CellularActivationError("Cannot retrieve context activation status");
+        return mp_const_none;
+    }
+
+    if (!status) {
+
+        Network_PDP_Context_t context;
+        memcpy(context.apn, c_apn, MIN(strlen(c_apn) + 1, sizeof(context.apn)));
+        memcpy(context.userName, c_user, MIN(strlen(c_user) + 1, sizeof(context.userName)));
+        memcpy(context.userPasswd, c_pass, MIN(strlen(c_pass) + 1, sizeof(context.userPasswd)));
+
+        if (!Network_StartActive(context)) {
+            mp_raise_CellularActivationError("Cannot initiate context activation");
+            return mp_const_none;
+        }
+
+        clock_t time = clock();
+        while (clock() - time < MAX_ACT_TIMEOUT * CLOCKS_PER_MSEC && !(network_status & NTW_ACT_BIT)) {
+            OS_Sleep(100);
+        }
+
+        if (!(network_status & NTW_ACT_BIT)) {
+            mp_raise_CellularActivationError("Network context activation timeout");
+            return mp_const_none;
+        }
+    }
+
+    return mp_const_none;
+}
+
+STATIC MP_DEFINE_CONST_FUN_OBJ_3(gprs_activate_obj, gprs_activate);
+
+STATIC mp_obj_t gprs_deactivate() {
+    // ========================================
+    // Deactivates the GPRS network.
+    // ========================================
+    REQUIRES_NETWORK_REGISTRATION;
+
+    uint8_t status;
+
+    // Attach
+    if (!Network_GetActiveStatus(&status)) {
+        mp_raise_CellularActivationError("Cannot retrieve context activation status");
+        return mp_const_none;
+    }
+
+    if (status) {
+
+        if (!Network_StartDeactive(1)) {
+            mp_raise_CellularActivationError("Cannot initiate context deactivation");
+            return mp_const_none;
+        }
+
+        clock_t time = clock();
+        while (clock() - time < MAX_ACT_TIMEOUT * CLOCKS_PER_MSEC && (network_status & NTW_ACT_BIT)) {
+            OS_Sleep(100);
+        }
+
+        if (network_status & NTW_ACT_BIT) {
+            mp_raise_CellularActivationError("Network context deactivation timeout");
+            return mp_const_none;
+        }
+    }
+
+    return mp_const_none;
+}
+
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(gprs_deactivate_obj, gprs_deactivate);
+
 STATIC const mp_map_elem_t mp_module_cellular_globals_table[] = {
     { MP_OBJ_NEW_QSTR(MP_QSTR___name__), MP_OBJ_NEW_QSTR(MP_QSTR_cellular) },
 
@@ -648,6 +900,10 @@ STATIC const mp_map_elem_t mp_module_cellular_globals_table[] = {
     { MP_OBJ_NEW_QSTR(MP_QSTR_get_iccid), (mp_obj_t)&get_iccid_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_get_imsi), (mp_obj_t)&get_imsi_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_sms_list), (mp_obj_t)&sms_list_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_gprs_attach), (mp_obj_t)&gprs_attach_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_gprs_detach), (mp_obj_t)&gprs_detach_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_gprs_activate), (mp_obj_t)&gprs_activate_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_gprs_deactivate), (mp_obj_t)&gprs_deactivate_obj },
 };
 
 STATIC MP_DEFINE_CONST_DICT(mp_module_cellular_globals, mp_module_cellular_globals_table);
diff --git a/ports/gprs_a9/modcellular.h b/ports/gprs_a9/modcellular.h
index 8a01a0bcc8efa..79bd76ecae72a 100644
--- a/ports/gprs_a9/modcellular.h
+++ b/ports/gprs_a9/modcellular.h
@@ -10,12 +10,21 @@ void cellular_init0(void);
 
 void modcellular_notify_no_sim(API_Event_t* event);
 void modcellular_notify_sim_drop(API_Event_t* event);
+
 void modcellular_notify_reg_home(API_Event_t* event);
 void modcellular_notify_reg_roaming(API_Event_t* event);
 void modcellular_notify_reg_searching(API_Event_t* event);
 void modcellular_notify_reg_denied(API_Event_t* event);
 void modcellular_notify_dereg(API_Event_t* event);
 
+void modcellular_notify_det(API_Event_t* event);
+void modcellular_notify_att_failed(API_Event_t* event);
+void modcellular_notify_att(API_Event_t* event);
+
+void modcellular_notify_deact(API_Event_t* event);
+void modcellular_notify_act_failed(API_Event_t* event);
+void modcellular_notify_act(API_Event_t* event);
+
 void modcellular_notify_sms_list(API_Event_t* event);
 void modcellular_notify_sms_sent(API_Event_t* event);
 void modcellular_notify_sms_error(API_Event_t* event);
@@ -24,6 +33,9 @@ void modcellular_notify_signal(API_Event_t* event);
 
 #define MAX_SMS_LIST_TIMEOUT 1000
 #define MAX_SMS_SEND_TIMEOUT 10000
+#define MAX_ATT_TIMEOUT 10000
+#define MAX_ACT_TIMEOUT 10000
+
 #define REQUIRES_NETWORK_REGISTRATION do {if (!network_status) {mp_raise_CellularRegistrationError("Network is not available: is SIM card inserted?"); return mp_const_none;}} while(0)
 #define REQUIRES_VALID_SMS_STATUS(bits) do {if (bitsum(bits) != 1) {return mp_const_none;}} while(0)
 

From 773b8742edac95ff81d0378a19ab660b5948f495 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sat, 16 Mar 2019 21:03:43 +0100
Subject: [PATCH 3174/3533] Initial DNS implementaiton

---
 ports/gprs_a9/README.md     | 11 +++++++++++
 ports/gprs_a9/modcellular.c | 34 ++++++++++++++++++++++++++++++++++
 ports/gprs_a9/modcellular.h |  3 +++
 3 files changed, 48 insertions(+)

diff --git a/ports/gprs_a9/README.md b/ports/gprs_a9/README.md
index 280d2e1f9399f..463829226877b 100644
--- a/ports/gprs_a9/README.md
+++ b/ports/gprs_a9/README.md
@@ -54,6 +54,9 @@ The purpose of this module is to have an access to high-level networking (SMS, G
 * `CellularRegistrationError(message)`
 * `SMSError(message)`
 * `NoSIMError(message)`
+* `CellularAttachmentError(message)`
+* `CellularActivationError(message)`
+* `NetworkError(message)`
 
 #### Methods ####
 
@@ -172,6 +175,14 @@ The purpose of this module is to have an access to high-level networking (SMS, G
 
   **Raises**: `CellularRegistrationError` if not registered on the network or `CellularActivationError` if the deactivation process failed at any stage.
 
+* `dns_resolve(name)`
+
+  Resolves the domain name.
+
+  **Returns**: IP address the domain name belongs to.
+
+  **Raises**: `NetworkError` if failed to resolve.
+
 ### `gps`
 
 Provides the GPS functionality.
diff --git a/ports/gprs_a9/modcellular.c b/ports/gprs_a9/modcellular.c
index ba95136b34ca9..3de42e3b3dd42 100644
--- a/ports/gprs_a9/modcellular.c
+++ b/ports/gprs_a9/modcellular.c
@@ -11,8 +11,11 @@
 #include "api_sms.h"
 #include "api_os.h"
 #include "api_network.h"
+#include "api_socket.h"
+
 #include "buffer.h"
 #include "time.h"
+#include "stdio.h"
 
 #define NTW_REG_BIT 0x01
 #define NTW_ROAM_BIT 0x02
@@ -75,6 +78,8 @@ MP_DEFINE_EXCEPTION(NoSIMError, CellularError)
 MP_DEFINE_EXCEPTION(CellularAttachmentError, CellularError)
 MP_DEFINE_EXCEPTION(CellularActivationError, CellularError)
 
+MP_DEFINE_EXCEPTION(NetworkError, OSError)
+
 NORETURN void mp_raise_CellularError(const char *msg) {
     mp_raise_msg(&mp_type_CellularError, msg);
 }
@@ -99,6 +104,10 @@ NORETURN void mp_raise_CellularActivationError(const char *msg) {
     mp_raise_msg(&mp_type_CellularActivationError, msg);
 }
 
+NORETURN void mp_raise_NetworkError(const char *msg) {
+    mp_raise_msg(&mp_type_NetworkError, msg);
+}
+
 // ------
 // Notify
 // ------
@@ -879,6 +888,30 @@ STATIC mp_obj_t gprs_deactivate() {
 
 STATIC MP_DEFINE_CONST_FUN_OBJ_0(gprs_deactivate_obj, gprs_deactivate);
 
+STATIC mp_obj_t dns_resolve(mp_obj_t name) {
+    // ========================================
+    // Resolve a domain name.
+    // Args:
+    //     name (str): the domain name;
+    // Returns:
+    //     A string with an IP address the name belongs to.
+    // ========================================
+    const char* c_name = mp_obj_str_get_str(name);
+    char ip[16];
+    uint8_t status;
+
+    if ((status = DNS_GetHostByName2((uint8_t*)c_name, (uint8_t*)ip)) != 0) {
+        char msg[64];
+        snprintf(msg, sizeof(msg), "Failed to resolve domain name: error=%d", status);
+        mp_raise_NetworkError(msg);
+        return mp_const_none;
+    }
+
+    return mp_obj_new_str(ip, strlen(ip));
+}
+
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(dns_resolve_obj, dns_resolve);
+
 STATIC const mp_map_elem_t mp_module_cellular_globals_table[] = {
     { MP_OBJ_NEW_QSTR(MP_QSTR___name__), MP_OBJ_NEW_QSTR(MP_QSTR_cellular) },
 
@@ -904,6 +937,7 @@ STATIC const mp_map_elem_t mp_module_cellular_globals_table[] = {
     { MP_OBJ_NEW_QSTR(MP_QSTR_gprs_detach), (mp_obj_t)&gprs_detach_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_gprs_activate), (mp_obj_t)&gprs_activate_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_gprs_deactivate), (mp_obj_t)&gprs_deactivate_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_dns_resolve), (mp_obj_t)&dns_resolve_obj },
 };
 
 STATIC MP_DEFINE_CONST_DICT(mp_module_cellular_globals, mp_module_cellular_globals_table);
diff --git a/ports/gprs_a9/modcellular.h b/ports/gprs_a9/modcellular.h
index 79bd76ecae72a..35eecf32aefab 100644
--- a/ports/gprs_a9/modcellular.h
+++ b/ports/gprs_a9/modcellular.h
@@ -5,6 +5,9 @@ extern const mp_obj_type_t mp_type_CellularError;
 extern const mp_obj_type_t mp_type_CellularRegistrationError;
 extern const mp_obj_type_t mp_type_SMSError;
 extern const mp_obj_type_t mp_type_NoSIMError;
+extern const mp_obj_type_t mp_type_CellularAttachmentError;
+extern const mp_obj_type_t mp_type_CellularActivationError;
+extern const mp_obj_type_t mp_type_NetworkError;
 
 void cellular_init0(void);
 

From 3fc073345d7c25e7623ebdf7a039806f8c1dbc95 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sat, 16 Mar 2019 21:19:54 +0100
Subject: [PATCH 3175/3533] Add a local IP address method

---
 ports/gprs_a9/README.md     |  8 ++++++++
 ports/gprs_a9/modcellular.c | 17 +++++++++++++++++
 2 files changed, 25 insertions(+)

diff --git a/ports/gprs_a9/README.md b/ports/gprs_a9/README.md
index 463829226877b..b34cc097033c9 100644
--- a/ports/gprs_a9/README.md
+++ b/ports/gprs_a9/README.md
@@ -175,6 +175,14 @@ The purpose of this module is to have an access to high-level networking (SMS, G
 
   **Raises**: `CellularRegistrationError` if not registered on the network or `CellularActivationError` if the deactivation process failed at any stage.
 
+* `get_local_ip()`
+
+  Retrieves the local IP address.
+
+  **Returns**: The local IP address as a string.
+
+  **Raises**: `NetworkError` if no address was assigned.
+
 * `dns_resolve(name)`
 
   Resolves the domain name.
diff --git a/ports/gprs_a9/modcellular.c b/ports/gprs_a9/modcellular.c
index 3de42e3b3dd42..db242cd1459a5 100644
--- a/ports/gprs_a9/modcellular.c
+++ b/ports/gprs_a9/modcellular.c
@@ -888,6 +888,22 @@ STATIC mp_obj_t gprs_deactivate() {
 
 STATIC MP_DEFINE_CONST_FUN_OBJ_0(gprs_deactivate_obj, gprs_deactivate);
 
+STATIC mp_obj_t get_local_ip(void) {
+    // ========================================
+    // Retrieves the local IP address.
+    // Returns:
+    //     A string with the assigned IP address.
+    // ========================================
+    char ip[16];
+    if (!Network_GetIp(ip, sizeof(ip))) {
+        mp_raise_NetworkError("Failed to retrieve the local IP address");
+        return mp_const_none;
+    }
+    return mp_obj_new_str(ip, strlen(ip));
+}
+
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(get_local_ip_obj, get_local_ip);
+
 STATIC mp_obj_t dns_resolve(mp_obj_t name) {
     // ========================================
     // Resolve a domain name.
@@ -937,6 +953,7 @@ STATIC const mp_map_elem_t mp_module_cellular_globals_table[] = {
     { MP_OBJ_NEW_QSTR(MP_QSTR_gprs_detach), (mp_obj_t)&gprs_detach_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_gprs_activate), (mp_obj_t)&gprs_activate_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_gprs_deactivate), (mp_obj_t)&gprs_deactivate_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_get_local_ip), (mp_obj_t)&get_local_ip_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_dns_resolve), (mp_obj_t)&dns_resolve_obj },
 };
 

From b772ea0863a118356a1b1965d6737192d38ee079 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sat, 16 Mar 2019 21:20:46 +0100
Subject: [PATCH 3176/3533] Fix docstring

---
 ports/gprs_a9/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/gprs_a9/README.md b/ports/gprs_a9/README.md
index b34cc097033c9..31ebb297ba631 100644
--- a/ports/gprs_a9/README.md
+++ b/ports/gprs_a9/README.md
@@ -187,7 +187,7 @@ The purpose of this module is to have an access to high-level networking (SMS, G
 
   Resolves the domain name.
 
-  **Returns**: IP address the domain name belongs to.
+  **Returns**: The IP address the domain name belongs to as a string.
 
   **Raises**: `NetworkError` if failed to resolve.
 

From 9808addadd66f5e77601b27ea8e8b77cfdaf1b65 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sun, 17 Mar 2019 00:18:34 +0100
Subject: [PATCH 3177/3533] Add doc sections

---
 ports/gprs_a9/README.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/ports/gprs_a9/README.md b/ports/gprs_a9/README.md
index 31ebb297ba631..17431de46bc1b 100644
--- a/ports/gprs_a9/README.md
+++ b/ports/gprs_a9/README.md
@@ -60,6 +60,8 @@ The purpose of this module is to have an access to high-level networking (SMS, G
 
 #### Methods ####
 
+##### Status and information #####
+
 * `get_imei()`
 
   Retrieves the International Mobile Equipment Identity (IMEI) number.
@@ -129,6 +131,8 @@ The purpose of this module is to have an access to high-level networking (SMS, G
   **Returns**: Two integers, the signal quality (0-31) and RXQUAL. These are replaced by `None` if no signal quality information is available.
   **Note**: The RXQUAL output is always `None`. Its meaning is unknown.
 
+##### SMS #####
+
 * `sms_list()`
 
   Retrieves SMS from the SIM card.
@@ -137,6 +141,8 @@ The purpose of this module is to have an access to high-level networking (SMS, G
 
   **Raises**: `CellularRegistrationError` if not registered on the network. This is because network registration process interfers with most other SIM-related operations.
 
+##### GPRS #####
+
 * `gprs_attach()`
 
   Attaches to the network. This is required for activating the GPRS context. If already attached, does nothing.

From d8f37a334870bd4108276db1d3819acef6f63243 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sat, 23 Mar 2019 01:22:12 +0100
Subject: [PATCH 3178/3533] Sockets initial implementation

---
 ports/gprs_a9/Makefile       |   3 +-
 ports/gprs_a9/README.md      |  16 ++
 ports/gprs_a9/errno.h        | 165 ++++++++++++++++
 ports/gprs_a9/modcellular.c  |  50 -----
 ports/gprs_a9/modcellular.h  |   1 -
 ports/gprs_a9/modgps.c       |   2 +-
 ports/gprs_a9/modusocket.c   | 365 +++++++++++++++++++++++++++++++++++
 ports/gprs_a9/mpconfigport.h |   2 +
 8 files changed, 551 insertions(+), 53 deletions(-)
 create mode 100644 ports/gprs_a9/errno.h
 create mode 100644 ports/gprs_a9/modusocket.c

diff --git a/ports/gprs_a9/Makefile b/ports/gprs_a9/Makefile
index 7bde7e2b422b6..d3c8167268b7d 100644
--- a/ports/gprs_a9/Makefile
+++ b/ports/gprs_a9/Makefile
@@ -123,7 +123,8 @@ SRC_C = \
 	modchip.c \
 	file_io.c \
 	modcellular.c \
-	modgps.c
+	modgps.c \
+	modusocket.c
 
 
 LIB_SRC_C = $(addprefix lib/,\
diff --git a/ports/gprs_a9/README.md b/ports/gprs_a9/README.md
index 17431de46bc1b..dd439edbb3d72 100644
--- a/ports/gprs_a9/README.md
+++ b/ports/gprs_a9/README.md
@@ -181,6 +181,22 @@ The purpose of this module is to have an access to high-level networking (SMS, G
 
   **Raises**: `CellularRegistrationError` if not registered on the network or `CellularActivationError` if the deactivation process failed at any stage.
 
+### `usocket` ###
+
+TCP/IP stack based on lwIP.
+See [micropython docs](https://docs.micropython.org/en/latest/library/usocket.html) for details.
+
+#### Classes ####
+
+* `socket(af, type, proto)`
+
+    * `close()`
+    * `connect(address)`
+    * `send(bytes)`
+    * `recv(bufsize)`
+
+#### Methods ####
+
 * `get_local_ip()`
 
   Retrieves the local IP address.
diff --git a/ports/gprs_a9/errno.h b/ports/gprs_a9/errno.h
new file mode 100644
index 0000000000000..1fc0916f27293
--- /dev/null
+++ b/ports/gprs_a9/errno.h
@@ -0,0 +1,165 @@
+/**
+ * @file
+ * Posix Errno defines
+ */
+
+/*
+ * Copyright (c) 2001-2004 Swedish Institute of Computer Science.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+ * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ *
+ * This file is part of the lwIP TCP/IP stack.
+ *
+ * Author: Adam Dunkels <adam@sics.se>
+ *
+ */
+#define  EPERM            1  /* Operation not permitted */
+#define  ENOENT           2  /* No such file or directory */
+#define  ESRCH            3  /* No such process */
+#define  EINTR            4  /* Interrupted system call */
+#define  EIO              5  /* I/O error */
+#define  ENXIO            6  /* No such device or address */
+#define  E2BIG            7  /* Arg list too long */
+#define  ENOEXEC          8  /* Exec format error */
+#define  EBADF            9  /* Bad file number */
+#define  ECHILD          10  /* No child processes */
+#define  EAGAIN          11  /* Try again */
+#define  ENOMEM          12  /* Out of memory */
+#define  EACCES          13  /* Permission denied */
+#define  EFAULT          14  /* Bad address */
+#define  ENOTBLK         15  /* Block device required */
+#define  EBUSY           16  /* Device or resource busy */
+#define  EEXIST          17  /* File exists */
+#define  EXDEV           18  /* Cross-device link */
+#define  ENODEV          19  /* No such device */
+#define  ENOTDIR         20  /* Not a directory */
+#define  EISDIR          21  /* Is a directory */
+#define  EINVAL          22  /* Invalid argument */
+#define  ENFILE          23  /* File table overflow */
+#define  EMFILE          24  /* Too many open files */
+#define  ENOTTY          25  /* Not a typewriter */
+#define  ETXTBSY         26  /* Text file busy */
+#define  EFBIG           27  /* File too large */
+#define  ENOSPC          28  /* No space left on device */
+#define  ESPIPE          29  /* Illegal seek */
+#define  EROFS           30  /* Read-only file system */
+#define  EMLINK          31  /* Too many links */
+#define  EPIPE           32  /* Broken pipe */
+#define  EDOM            33  /* Math argument out of domain of func */
+#define  ERANGE          34  /* Math result not representable */
+#define  EDEADLK         35  /* Resource deadlock would occur */
+#define  ENAMETOOLONG    36  /* File name too long */
+#define  ENOLCK          37  /* No record locks available */
+#define  ENOSYS          38  /* Function not implemented */
+#define  ENOTEMPTY       39  /* Directory not empty */
+#define  ELOOP           40  /* Too many symbolic links encountered */
+#define  EWOULDBLOCK     EAGAIN  /* Operation would block */
+#define  ENOMSG          42  /* No message of desired type */
+#define  EIDRM           43  /* Identifier removed */
+#define  ECHRNG          44  /* Channel number out of range */
+#define  EL2NSYNC        45  /* Level 2 not synchronized */
+#define  EL3HLT          46  /* Level 3 halted */
+#define  EL3RST          47  /* Level 3 reset */
+#define  ELNRNG          48  /* Link number out of range */
+#define  EUNATCH         49  /* Protocol driver not attached */
+#define  ENOCSI          50  /* No CSI structure available */
+#define  EL2HLT          51  /* Level 2 halted */
+#define  EBADE           52  /* Invalid exchange */
+#define  EBADR           53  /* Invalid request descriptor */
+#define  EXFULL          54  /* Exchange full */
+#define  ENOANO          55  /* No anode */
+#define  EBADRQC         56  /* Invalid request code */
+#define  EBADSLT         57  /* Invalid slot */
+
+#define  EDEADLOCK       EDEADLK
+
+#define  EBFONT          59  /* Bad font file format */
+#define  ENOSTR          60  /* Device not a stream */
+#define  ENODATA         61  /* No data available */
+#define  ETIME           62  /* Timer expired */
+#define  ENOSR           63  /* Out of streams resources */
+#define  ENONET          64  /* Machine is not on the network */
+#define  ENOPKG          65  /* Package not installed */
+#define  EREMOTE         66  /* Object is remote */
+#define  ENOLINK         67  /* Link has been severed */
+#define  EADV            68  /* Advertise error */
+#define  ESRMNT          69  /* Srmount error */
+#define  ECOMM           70  /* Communication error on send */
+#define  EPROTO          71  /* Protocol error */
+#define  EMULTIHOP       72  /* Multihop attempted */
+#define  EDOTDOT         73  /* RFS specific error */
+#define  EBADMSG         74  /* Not a data message */
+#define  EOVERFLOW       75  /* Value too large for defined data type */
+#define  ENOTUNIQ        76  /* Name not unique on network */
+#define  EBADFD          77  /* File descriptor in bad state */
+#define  EREMCHG         78  /* Remote address changed */
+#define  ELIBACC         79  /* Can not access a needed shared library */
+#define  ELIBBAD         80  /* Accessing a corrupted shared library */
+#define  ELIBSCN         81  /* .lib section in a.out corrupted */
+#define  ELIBMAX         82  /* Attempting to link in too many shared libraries */
+#define  ELIBEXEC        83  /* Cannot exec a shared library directly */
+#define  EILSEQ          84  /* Illegal byte sequence */
+#define  ERESTART        85  /* Interrupted system call should be restarted */
+#define  ESTRPIPE        86  /* Streams pipe error */
+#define  EUSERS          87  /* Too many users */
+#define  ENOTSOCK        88  /* Socket operation on non-socket */
+#define  EDESTADDRREQ    89  /* Destination address required */
+#define  EMSGSIZE        90  /* Message too long */
+#define  EPROTOTYPE      91  /* Protocol wrong type for socket */
+#define  ENOPROTOOPT     92  /* Protocol not available */
+#define  EPROTONOSUPPORT 93  /* Protocol not supported */
+#define  ESOCKTNOSUPPORT 94  /* Socket type not supported */
+#define  EOPNOTSUPP      95  /* Operation not supported on transport endpoint */
+#define  EPFNOSUPPORT    96  /* Protocol family not supported */
+#define  EAFNOSUPPORT    97  /* Address family not supported by protocol */
+#define  EADDRINUSE      98  /* Address already in use */
+#define  EADDRNOTAVAIL   99  /* Cannot assign requested address */
+#define  ENETDOWN       100  /* Network is down */
+#define  ENETUNREACH    101  /* Network is unreachable */
+#define  ENETRESET      102  /* Network dropped connection because of reset */
+#define  ECONNABORTED   103  /* Software caused connection abort */
+#define  ECONNRESET     104  /* Connection reset by peer */
+#define  ENOBUFS        105  /* No buffer space available */
+#define  EISCONN        106  /* Transport endpoint is already connected */
+#define  ENOTCONN       107  /* Transport endpoint is not connected */
+#define  ESHUTDOWN      108  /* Cannot send after transport endpoint shutdown */
+#define  ETOOMANYREFS   109  /* Too many references: cannot splice */
+#define  ETIMEDOUT      110  /* Connection timed out */
+#define  ECONNREFUSED   111  /* Connection refused */
+#define  EHOSTDOWN      112  /* Host is down */
+#define  EHOSTUNREACH   113  /* No route to host */
+#define  EALREADY       114  /* Operation already in progress */
+#define  EINPROGRESS    115  /* Operation now in progress */
+#define  ESTALE         116  /* Stale NFS file handle */
+#define  EUCLEAN        117  /* Structure needs cleaning */
+#define  ENOTNAM        118  /* Not a XENIX named type file */
+#define  ENAVAIL        119  /* No XENIX semaphores available */
+#define  EISNAM         120  /* Is a named type file */
+#define  EREMOTEIO      121  /* Remote I/O error */
+#define  EDQUOT         122  /* Quota exceeded */
+
+#define  ENOMEDIUM      123  /* No medium found */
+#define  EMEDIUMTYPE    124  /* Wrong medium type */
+
+
diff --git a/ports/gprs_a9/modcellular.c b/ports/gprs_a9/modcellular.c
index db242cd1459a5..d13d4b7163680 100644
--- a/ports/gprs_a9/modcellular.c
+++ b/ports/gprs_a9/modcellular.c
@@ -11,11 +11,9 @@
 #include "api_sms.h"
 #include "api_os.h"
 #include "api_network.h"
-#include "api_socket.h"
 
 #include "buffer.h"
 #include "time.h"
-#include "stdio.h"
 
 #define NTW_REG_BIT 0x01
 #define NTW_ROAM_BIT 0x02
@@ -78,8 +76,6 @@ MP_DEFINE_EXCEPTION(NoSIMError, CellularError)
 MP_DEFINE_EXCEPTION(CellularAttachmentError, CellularError)
 MP_DEFINE_EXCEPTION(CellularActivationError, CellularError)
 
-MP_DEFINE_EXCEPTION(NetworkError, OSError)
-
 NORETURN void mp_raise_CellularError(const char *msg) {
     mp_raise_msg(&mp_type_CellularError, msg);
 }
@@ -104,10 +100,6 @@ NORETURN void mp_raise_CellularActivationError(const char *msg) {
     mp_raise_msg(&mp_type_CellularActivationError, msg);
 }
 
-NORETURN void mp_raise_NetworkError(const char *msg) {
-    mp_raise_msg(&mp_type_NetworkError, msg);
-}
-
 // ------
 // Notify
 // ------
@@ -888,46 +880,6 @@ STATIC mp_obj_t gprs_deactivate() {
 
 STATIC MP_DEFINE_CONST_FUN_OBJ_0(gprs_deactivate_obj, gprs_deactivate);
 
-STATIC mp_obj_t get_local_ip(void) {
-    // ========================================
-    // Retrieves the local IP address.
-    // Returns:
-    //     A string with the assigned IP address.
-    // ========================================
-    char ip[16];
-    if (!Network_GetIp(ip, sizeof(ip))) {
-        mp_raise_NetworkError("Failed to retrieve the local IP address");
-        return mp_const_none;
-    }
-    return mp_obj_new_str(ip, strlen(ip));
-}
-
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(get_local_ip_obj, get_local_ip);
-
-STATIC mp_obj_t dns_resolve(mp_obj_t name) {
-    // ========================================
-    // Resolve a domain name.
-    // Args:
-    //     name (str): the domain name;
-    // Returns:
-    //     A string with an IP address the name belongs to.
-    // ========================================
-    const char* c_name = mp_obj_str_get_str(name);
-    char ip[16];
-    uint8_t status;
-
-    if ((status = DNS_GetHostByName2((uint8_t*)c_name, (uint8_t*)ip)) != 0) {
-        char msg[64];
-        snprintf(msg, sizeof(msg), "Failed to resolve domain name: error=%d", status);
-        mp_raise_NetworkError(msg);
-        return mp_const_none;
-    }
-
-    return mp_obj_new_str(ip, strlen(ip));
-}
-
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(dns_resolve_obj, dns_resolve);
-
 STATIC const mp_map_elem_t mp_module_cellular_globals_table[] = {
     { MP_OBJ_NEW_QSTR(MP_QSTR___name__), MP_OBJ_NEW_QSTR(MP_QSTR_cellular) },
 
@@ -953,8 +905,6 @@ STATIC const mp_map_elem_t mp_module_cellular_globals_table[] = {
     { MP_OBJ_NEW_QSTR(MP_QSTR_gprs_detach), (mp_obj_t)&gprs_detach_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_gprs_activate), (mp_obj_t)&gprs_activate_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_gprs_deactivate), (mp_obj_t)&gprs_deactivate_obj },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_get_local_ip), (mp_obj_t)&get_local_ip_obj },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_dns_resolve), (mp_obj_t)&dns_resolve_obj },
 };
 
 STATIC MP_DEFINE_CONST_DICT(mp_module_cellular_globals, mp_module_cellular_globals_table);
diff --git a/ports/gprs_a9/modcellular.h b/ports/gprs_a9/modcellular.h
index 35eecf32aefab..aaeac47f454e4 100644
--- a/ports/gprs_a9/modcellular.h
+++ b/ports/gprs_a9/modcellular.h
@@ -7,7 +7,6 @@ extern const mp_obj_type_t mp_type_SMSError;
 extern const mp_obj_type_t mp_type_NoSIMError;
 extern const mp_obj_type_t mp_type_CellularAttachmentError;
 extern const mp_obj_type_t mp_type_CellularActivationError;
-extern const mp_obj_type_t mp_type_NetworkError;
 
 void cellular_init0(void);
 
diff --git a/ports/gprs_a9/modgps.c b/ports/gprs_a9/modgps.c
index ed0fa1705776e..11dafa93f41d4 100644
--- a/ports/gprs_a9/modgps.c
+++ b/ports/gprs_a9/modgps.c
@@ -143,7 +143,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_0(get_satellites_obj, get_satellites);
 STATIC const mp_map_elem_t mp_module_gps_globals_table[] = {
     { MP_OBJ_NEW_QSTR(MP_QSTR___name__i), MP_OBJ_NEW_QSTR(MP_QSTR_gps) },
 
-    { MP_ROM_QSTR(MP_QSTR_GPSError), MP_ROM_PTR(&mp_type_GPSError) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_GPSError), (mp_obj_t)MP_ROM_PTR(&mp_type_GPSError) },
 
     { MP_OBJ_NEW_QSTR(MP_QSTR_on), (mp_obj_t)&on_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_off), (mp_obj_t)&off_obj },
diff --git a/ports/gprs_a9/modusocket.c b/ports/gprs_a9/modusocket.c
new file mode 100644
index 0000000000000..a7be71c715b81
--- /dev/null
+++ b/ports/gprs_a9/modusocket.c
@@ -0,0 +1,365 @@
+#include "modcellular.h"
+#include "errno.h"
+
+#include "py/nlr.h"
+#include "py/obj.h"
+#include "py/runtime.h"
+#include "py/binary.h"
+#include "py/objarray.h"
+#include "py/objexcept.h"
+#include "py/mperrno.h"
+#include "py/stream.h"
+
+#include "api_network.h"
+#include "api_socket.h"
+#include "sdk_init.h"
+
+#include "stdio.h"
+
+#define SOCKET_POLL_US (100000)
+#define ERRNO (g_InterfaceVtbl->Socket_GetLastError())
+
+// -------
+// Classes
+// -------
+
+NORETURN static void exception_from_errno(int _errno) {
+    // Here we need to convert from lwip errno values to MicroPython's standard ones
+    if (_errno == EINPROGRESS) {
+        _errno = MP_EINPROGRESS;
+    }
+    mp_raise_OSError(_errno);
+}
+
+typedef struct _socket_obj_t {
+    mp_obj_base_t base;
+    int fd;
+    uint8_t domain;
+    uint8_t type;
+    uint8_t proto;
+    bool peer_closed;
+    unsigned int retries;
+} socket_obj_t;
+
+void _socket_settimeout(socket_obj_t *sock, uint64_t timeout_ms) {
+    // Rather than waiting for the entire timeout specified, we wait sock->retries times
+    // for SOCKET_POLL_US each, checking for a MicroPython interrupt between timeouts.
+    // with SOCKET_POLL_MS == 100ms, sock->retries allows for timeouts up to 13 years.
+    // if timeout_ms == UINT64_MAX, wait forever.
+    sock->retries = (timeout_ms == UINT64_MAX) ? UINT_MAX : timeout_ms * 1000 / SOCKET_POLL_US;
+
+    struct timeval timeout = {
+        .tv_sec = 0,
+        .tv_usec = timeout_ms ? SOCKET_POLL_US : 0
+    };
+    setsockopt(sock->fd, SOL_SOCKET, SO_SNDTIMEO, (const void *)&timeout, sizeof(timeout));
+    setsockopt(sock->fd, SOL_SOCKET, SO_RCVTIMEO, (const void *)&timeout, sizeof(timeout));
+    fcntl(sock->fd, F_SETFL, timeout_ms ? 0 : O_NONBLOCK);
+}
+
+static int _socket_getaddrinfo2(const mp_obj_t host, const mp_obj_t port, struct sockaddr_in *resp) {
+
+    const char *host_str = mp_obj_str_get_str(host);
+    const int port_int = mp_obj_get_int(port);
+
+    if (host_str[0] == '\0') {
+        // a host of "" is equivalent to the default/all-local IP address
+        host_str = "0.0.0.0";
+    }
+
+    char address[16];
+    if (DNS_GetHostByName2((uint8_t*)host_str, (uint8_t*)address) != 0) {
+        return -1;
+    }
+
+    memset(resp, 0, sizeof(*resp));
+    resp->sin_family = AF_INET;
+    resp->sin_port = htons(port_int);
+
+    MP_THREAD_GIL_EXIT();
+    int res = inet_pton(AF_INET, address, &resp->sin_addr);
+    MP_THREAD_GIL_ENTER();
+
+    return res;
+}
+
+int _socket_getaddrinfo(const mp_obj_t addrtuple, struct sockaddr_in *resp) {
+    mp_uint_t len = 0;
+    mp_obj_t *elem;
+    mp_obj_get_array(addrtuple, &len, &elem);
+    if (len != 2) return -1;
+    return _socket_getaddrinfo2(elem[0], elem[1], resp);
+}
+
+mp_obj_t socket_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
+
+    enum { ARG_af, ARG_type, ARG_proto };
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_af, MP_ARG_INT, {.u_int = AF_INET} },
+        { MP_QSTR_type, MP_ARG_INT, {.u_int = SOCK_STREAM} },
+        { MP_QSTR_proto, MP_ARG_INT, {.u_int = IPPROTO_TCP} },
+    };
+
+    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
+    mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
+
+    socket_obj_t *self = m_new_obj_with_finaliser(socket_obj_t);
+    self->base.type = type;
+    self->peer_closed = false;
+
+    switch (args[ARG_af].u_int) {
+        case AF_INET:
+            self->domain = AF_INET;
+            break;
+        case AF_INET6:
+            self->domain = AF_INET6;
+            break;
+        default:
+            mp_raise_ValueError("Unknown 'af' argument value");
+            break;
+    }
+
+    switch (args[ARG_type].u_int) {
+        case SOCK_STREAM:
+            self->type = SOCK_STREAM;
+            break;
+        case SOCK_DGRAM:
+            self->type = SOCK_DGRAM;
+            break;
+        default:
+            mp_raise_ValueError("Unknown 'type' argument");
+            break;
+    }
+
+    switch (args[ARG_proto].u_int) {
+        case IPPROTO_TCP:
+            self->proto = IPPROTO_TCP;
+            break;
+        case IPPROTO_UDP:
+            self->proto = IPPROTO_UDP;
+            break;
+        default:
+            mp_raise_ValueError("Unknown protocol");
+            return mp_const_none;
+    }
+
+    self->fd = socket(self->domain, self->type, self->proto);
+    if (self->fd < 0) {
+        mp_raise_NotImplementedError("Failed to create the socket but the error is unknown");
+    }
+    _socket_settimeout(self, UINT64_MAX);
+
+    return MP_OBJ_FROM_PTR(self);
+}
+
+STATIC mp_obj_t socket_close(mp_obj_t self_in) {
+    // ========================================
+    // Closes the socket.
+    // ========================================
+    socket_obj_t *self = MP_OBJ_TO_PTR(self_in);
+
+    int r = close(self->fd);
+
+    if (r < 0) {
+        exception_from_errno(ERRNO);
+    }
+
+    return mp_const_none;
+}
+
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(socket_close_obj, &socket_close);
+
+STATIC mp_obj_t socket_connect(mp_obj_t self_in, mp_obj_t ipv4) {
+    // ========================================
+    // Connects.
+    // Args:
+    //     ipv4 (tuple): a tuple of (address, port);
+    // ========================================
+    socket_obj_t *self = MP_OBJ_TO_PTR(self_in);
+
+    struct sockaddr_in res;
+    _socket_getaddrinfo(ipv4, &res);
+
+    MP_THREAD_GIL_EXIT();
+    int r = connect(self->fd, (struct sockaddr*)&res, sizeof(struct sockaddr_in));
+    MP_THREAD_GIL_ENTER();
+
+    if (r < 0) {
+        exception_from_errno(ERRNO);
+    }
+
+    return mp_const_none;
+}
+
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(socket_connect_obj, &socket_connect);
+
+int _socket_send(socket_obj_t *sock, const char *data, size_t datalen) {
+    int sentlen = 0;
+    for (int i=0; i<=sock->retries && sentlen < datalen; i++) {
+
+        MP_THREAD_GIL_EXIT();
+        int r = write(sock->fd, data + sentlen, datalen - sentlen);
+        MP_THREAD_GIL_ENTER();
+
+        if (r < 0 && ERRNO != EWOULDBLOCK) exception_from_errno(ERRNO);
+        if (r > 0) sentlen += r;
+        // check_for_exceptions();
+    }
+    if (sentlen == 0) mp_raise_OSError(MP_ETIMEDOUT);
+    return sentlen;
+}
+
+STATIC mp_obj_t socket_send(mp_obj_t self_in, mp_obj_t bytes) {
+    // ========================================
+    // Sends bytes.
+    // Args:
+    //     bytes (str, bytearray): bytes to send;
+    // ========================================
+    socket_obj_t *self = MP_OBJ_TO_PTR(self_in);
+
+    mp_uint_t data_len;
+    const char* data = mp_obj_str_get_data(bytes, &data_len);
+    int r = _socket_send(self, data, data_len);
+
+    return mp_obj_new_int(r);
+}
+
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(socket_send_obj, &socket_send);
+
+// XXX this can end up waiting a very long time if the content is dribbled in one character
+// at a time, as the timeout resets each time a recvfrom succeeds ... this is probably not
+// good behaviour.
+STATIC mp_uint_t _socket_read_data(mp_obj_t self_in, void *buf, size_t size,
+    struct sockaddr *from, socklen_t *from_len, int *errcode) {
+    socket_obj_t *sock = MP_OBJ_TO_PTR(self_in);
+
+    // If the peer closed the connection then the lwIP socket API will only return "0" once
+    // from lwip_recvfrom_r and then block on subsequent calls.  To emulate POSIX behaviour,
+    // which continues to return "0" for each call on a closed socket, we set a flag when
+    // the peer closed the socket.
+    if (sock->peer_closed) {
+        return 0;
+    }
+
+    // XXX Would be nicer to use RTC to handle timeouts
+    for (int i = 0; i <= sock->retries; ++i) {
+
+        MP_THREAD_GIL_EXIT();
+        int r = recvfrom(sock->fd, buf, size, 0, from, from_len);
+        MP_THREAD_GIL_ENTER();
+
+        if (r == 0) sock->peer_closed = true;
+        if (r >= 0) return r;
+        if (ERRNO != EWOULDBLOCK) {
+            *errcode = ERRNO;
+            return MP_STREAM_ERROR;
+        }
+        // check_for_exceptions();
+    }
+
+    *errcode = sock->retries == 0 ? MP_EWOULDBLOCK : MP_ETIMEDOUT;
+    return MP_STREAM_ERROR;
+}
+
+mp_obj_t _socket_recvfrom(mp_obj_t self_in, mp_obj_t len_in,
+        struct sockaddr *from, socklen_t *from_len) {
+    size_t len = mp_obj_get_int(len_in);
+    vstr_t vstr;
+    vstr_init_len(&vstr, len);
+
+    int errcode;
+    mp_uint_t r = _socket_read_data(self_in, vstr.buf, len, from, from_len, &errcode);
+    if (r == MP_STREAM_ERROR) {
+        exception_from_errno(errcode);
+    }
+
+    vstr.len = r;
+    return mp_obj_new_str_from_vstr(&mp_type_bytes, &vstr);
+}
+
+STATIC mp_obj_t socket_recv(mp_obj_t self_in, mp_obj_t bufsize) {
+    // ========================================
+    // Sends bytes.
+    // Args:
+    //     bufsize (int): output array size;
+    // ========================================
+    return _socket_recvfrom(self_in, bufsize, NULL, NULL);
+}
+
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(socket_recv_obj, &socket_recv);
+
+STATIC const mp_rom_map_elem_t socket_locals_dict_table[] = {
+    { MP_ROM_QSTR(MP_QSTR_close), MP_ROM_PTR(&socket_close_obj) },
+    { MP_ROM_QSTR(MP_QSTR_connect), MP_ROM_PTR(&socket_connect_obj) },
+    { MP_ROM_QSTR(MP_QSTR_send), MP_ROM_PTR(&socket_send_obj) },
+    { MP_ROM_QSTR(MP_QSTR_recv), MP_ROM_PTR(&socket_recv_obj) },
+};
+
+STATIC MP_DEFINE_CONST_DICT(socket_locals_dict, socket_locals_dict_table);
+
+STATIC const mp_obj_type_t socket_type = {
+    { &mp_type_type },
+    .name = MP_QSTR_socket,
+    .make_new = socket_make_new,
+    .locals_dict = (mp_obj_dict_t*)&socket_locals_dict,
+};
+
+// -------
+// Methods
+// -------
+
+STATIC mp_obj_t get_local_ip(void) {
+    // ========================================
+    // Retrieves the local IP address.
+    // Returns:
+    //     A string with the assigned IP address.
+    // ========================================
+    char ip[16];
+    if (!Network_GetIp(ip, sizeof(ip))) {
+        mp_raise_ValueError("Failed to retrieve the local IP address");
+        return mp_const_none;
+    }
+    return mp_obj_new_str(ip, strlen(ip));
+}
+
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(get_local_ip_obj, get_local_ip);
+
+STATIC mp_obj_t dns_resolve(mp_obj_t name) {
+    // ========================================
+    // Resolve a domain name.
+    // Args:
+    //     name (str): the domain name;
+    // Returns:
+    //     A string with an IP address the name belongs to.
+    // ========================================
+    const char* c_name = mp_obj_str_get_str(name);
+    char ip[16];
+    uint8_t status;
+
+    if ((status = DNS_GetHostByName2((uint8_t*)c_name, (uint8_t*)ip)) != 0) {
+        char msg[64];
+        snprintf(msg, sizeof(msg), "Failed to resolve domain name: error=%d", status);
+        mp_raise_ValueError(msg);
+        return mp_const_none;
+    }
+
+    return mp_obj_new_str(ip, strlen(ip));
+}
+
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(dns_resolve_obj, dns_resolve);
+
+STATIC const mp_map_elem_t mp_module_usocket_globals_table[] = {
+    { MP_OBJ_NEW_QSTR(MP_QSTR___name__), MP_OBJ_NEW_QSTR(MP_QSTR_usocket) },
+
+    { MP_OBJ_NEW_QSTR(MP_QSTR_socket), (mp_obj_t)MP_ROM_PTR(&socket_type) },
+
+    { MP_OBJ_NEW_QSTR(MP_QSTR_get_local_ip), (mp_obj_t)&get_local_ip_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_dns_resolve), (mp_obj_t)&dns_resolve_obj },
+};
+
+STATIC MP_DEFINE_CONST_DICT(mp_module_usocket_globals, mp_module_usocket_globals_table);
+
+const mp_obj_module_t usocket_module = {
+    .base = { &mp_type_module },
+    .globals = (mp_obj_dict_t*)&mp_module_usocket_globals,
+};
diff --git a/ports/gprs_a9/mpconfigport.h b/ports/gprs_a9/mpconfigport.h
index a203087400111..257332b8cffd8 100644
--- a/ports/gprs_a9/mpconfigport.h
+++ b/ports/gprs_a9/mpconfigport.h
@@ -201,6 +201,7 @@ extern const struct _mp_obj_module_t utime_module;
 extern const struct _mp_obj_module_t chip_module;
 extern const struct _mp_obj_module_t cellular_module;
 extern const struct _mp_obj_module_t gps_module;
+extern const struct _mp_obj_module_t usocket_module;
 
 #define MICROPY_PORT_BUILTIN_MODULES \
     { MP_OBJ_NEW_QSTR(MP_QSTR_machine), (mp_obj_t)&mp_module_machine }, \
@@ -209,6 +210,7 @@ extern const struct _mp_obj_module_t gps_module;
     { MP_OBJ_NEW_QSTR(MP_QSTR_chip), (mp_obj_t)&chip_module }, \
     { MP_OBJ_NEW_QSTR(MP_QSTR_cellular), (mp_obj_t)&cellular_module }, \
     { MP_OBJ_NEW_QSTR(MP_QSTR_gps), (mp_obj_t)&gps_module }, \
+    { MP_OBJ_NEW_QSTR(MP_QSTR_usocket), (mp_obj_t)&usocket_module }, \
 
 #define MICROPY_PORT_BUILTIN_MODULE_WEAK_LINKS \
     { MP_OBJ_NEW_QSTR(MP_QSTR_binascii), (mp_obj_t)&mp_module_ubinascii }, \

From 4d02950c448ece91079a9b655517ccfdb8d11aa8 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sun, 7 Apr 2019 00:37:24 +0200
Subject: [PATCH 3179/3533] Rename several functions to include module name;
 add timeout arg to gps.on

---
 ports/gprs_a9/modgps.c | 53 +++++++++++++++++++++++++-----------------
 ports/gprs_a9/modgps.h |  2 +-
 2 files changed, 33 insertions(+), 22 deletions(-)

diff --git a/ports/gprs_a9/modgps.c b/ports/gprs_a9/modgps.c
index 11dafa93f41d4..96dcb61411666 100644
--- a/ports/gprs_a9/modgps.c
+++ b/ports/gprs_a9/modgps.c
@@ -37,17 +37,28 @@ NORETURN void mp_raise_GPSError(const char *msg) {
 // Methods
 // -------
 
-STATIC mp_obj_t on(void) {
+STATIC mp_obj_t modgps_on(size_t n_args, const mp_obj_t *arg) {
     // ========================================
     // Turns GPS on.
+    // Args:
+    //     timeout (int): timeout in seconds;
     // Raises:
     //     ValueError if failed to turn GPS on.
     // ========================================
+    uint32_t timeout = 0;
+    if (n_args == 0) {
+        timeout = DEFAULT_GPS_TIMEOUT;
+    } else {
+        timeout = mp_obj_get_int(arg[0]);
+    }
+    timeout *= 1000 * CLOCKS_PER_MSEC;
+    gpsInfo = Gps_GetInfo();
+    gpsInfo->rmc.latitude.value = 0;
+    gpsInfo->rmc.longitude.value = 0;
     GPS_Init();
     GPS_Open(NULL);
-    gpsInfo = Gps_GetInfo();
     clock_t time = clock();
-    while (clock() - time < MAX_GPS_TIMEOUT * CLOCKS_PER_MSEC) {
+    while (clock() - time < timeout) {
         if (gpsInfo->rmc.latitude.value != 0) {
             break;
         }
@@ -59,9 +70,9 @@ STATIC mp_obj_t on(void) {
     return mp_const_none;
 }
 
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(on_obj, on);
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(modgps_on_obj, 0, 1, modgps_on);
 
-STATIC mp_obj_t off(void) {
+STATIC mp_obj_t modgps_off(void) {
     // ========================================
     // Turns GPS off.
     // ========================================
@@ -69,9 +80,9 @@ STATIC mp_obj_t off(void) {
     return mp_const_none;
 }
 
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(off_obj, off);
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(modgps_off_obj, modgps_off);
 
-STATIC mp_obj_t get_firmware_version(void) {
+STATIC mp_obj_t modgps_get_firmware_version(void) {
     // ========================================
     // Retrieves firmware version.
     // Returns:
@@ -87,9 +98,9 @@ STATIC mp_obj_t get_firmware_version(void) {
     return mp_obj_new_str(buffer, strlen(buffer));
 }
 
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(get_firmware_version_obj, get_firmware_version);
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(modgps_get_firmware_version_obj, modgps_get_firmware_version);
 
-STATIC mp_obj_t get_last_location(void) {
+STATIC mp_obj_t modgps_get_last_location(void) {
     // ========================================
     // Retrieves the last GPS location.
     // Returns:
@@ -108,9 +119,9 @@ STATIC mp_obj_t get_last_location(void) {
     return mp_obj_new_tuple(2, tuple);
 }
 
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(get_last_location_obj, get_last_location);
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(modgps_get_last_location_obj, modgps_get_last_location);
 
-STATIC mp_obj_t get_location(void) {
+STATIC mp_obj_t modgps_get_location(void) {
     // ========================================
     // Retrieves the current GPS location.
     // Returns:
@@ -118,12 +129,12 @@ STATIC mp_obj_t get_location(void) {
     // ========================================
     REQUIRES_GPS_ON;
 
-    return get_last_location();
+    return modgps_get_last_location();
 }
 
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(get_location_obj, get_location);
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(modgps_get_location_obj, modgps_get_location);
 
-STATIC mp_obj_t get_satellites(void) {
+STATIC mp_obj_t modgps_get_satellites(void) {
     // ========================================
     // Retrieves the number of visible GPS satellites.
     // Returns:
@@ -138,19 +149,19 @@ STATIC mp_obj_t get_satellites(void) {
     return mp_obj_new_tuple(2, tuple);
 }
 
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(get_satellites_obj, get_satellites);
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(modgps_get_satellites_obj, modgps_get_satellites);
 
 STATIC const mp_map_elem_t mp_module_gps_globals_table[] = {
     { MP_OBJ_NEW_QSTR(MP_QSTR___name__i), MP_OBJ_NEW_QSTR(MP_QSTR_gps) },
 
     { MP_OBJ_NEW_QSTR(MP_QSTR_GPSError), (mp_obj_t)MP_ROM_PTR(&mp_type_GPSError) },
 
-    { MP_OBJ_NEW_QSTR(MP_QSTR_on), (mp_obj_t)&on_obj },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_off), (mp_obj_t)&off_obj },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_get_firmware_version), (mp_obj_t)&get_firmware_version_obj },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_get_location), (mp_obj_t)&get_location_obj },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_get_last_location), (mp_obj_t)&get_last_location_obj },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_get_satellites), (mp_obj_t)&get_satellites_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_on), (mp_obj_t)&modgps_on_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_off), (mp_obj_t)&modgps_off_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_get_firmware_version), (mp_obj_t)&modgps_get_firmware_version_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_get_location), (mp_obj_t)&modgps_get_location_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_get_last_location), (mp_obj_t)&modgps_get_last_location_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_get_satellites), (mp_obj_t)&modgps_get_satellites_obj },
 };
 
 STATIC MP_DEFINE_CONST_DICT(mp_module_gps_globals, mp_module_gps_globals_table);
diff --git a/ports/gprs_a9/modgps.h b/ports/gprs_a9/modgps.h
index 1bf8975ae526e..478a1eccb2ef8 100644
--- a/ports/gprs_a9/modgps.h
+++ b/ports/gprs_a9/modgps.h
@@ -6,6 +6,6 @@ extern const mp_obj_type_t mp_type_CellularError;
 
 void modgps_notify_gps_update(API_Event_t* event);
 
-#define MAX_GPS_TIMEOUT 5000
+#define DEFAULT_GPS_TIMEOUT 5
 #define REQUIRES_VALID_GPS_INFO do { if (!gpsInfo) {mp_raise_GPSError("No GPS data available: did you run gps.on()?"); return mp_const_none;}} while(0)
 #define REQUIRES_GPS_ON do { if (!GPS_IsOpen()) {mp_raise_GPSError("GPS is off"); return mp_const_none;}} while(0)

From e28638c4ab488078667aab3893d0c6dcbdd0a3ad Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sun, 7 Apr 2019 00:37:40 +0200
Subject: [PATCH 3180/3533] Add test script

---
 ports/gprs_a9/frozentest.py | 154 ++++++++++++++++++++++++++++++++++++
 1 file changed, 154 insertions(+)
 create mode 100644 ports/gprs_a9/frozentest.py

diff --git a/ports/gprs_a9/frozentest.py b/ports/gprs_a9/frozentest.py
new file mode 100644
index 0000000000000..ce2c514d97cc3
--- /dev/null
+++ b/ports/gprs_a9/frozentest.py
@@ -0,0 +1,154 @@
+print("================")
+print("std")
+print("================")
+
+print('a long string that is not interned')
+print('a string that has unicode αβγ chars')
+print(b'bytes 1234\x01')
+print(123456789)
+for i in range(4):
+    print(i)
+
+print("================")
+print("GPS")
+print("================")
+
+import gps
+gps.on()
+
+fw = gps.get_firmware_version()
+print("GPS firmware:", fw)
+assert len(fw) > 3
+
+vis, tracked = gps.get_satellites()
+print("GPS sats:", vis, tracked)
+assert vis == int(vis)
+assert tracked == int(tracked)
+assert 0 <= tracked <= vis
+
+lat, lng = gps.get_location()
+print("GPS location:", lat, lng)
+assert -90 <= lat <= 90
+assert -180 <= lng <= 180
+
+gps.off()
+_lat, _lng = gps.get_last_location()
+print("GPS last location:", lat, lng)
+assert lat == _lat
+assert lng == _lng
+
+try:
+    gps.on(0)
+except gps.GPSError as e:
+    print("GPS error OK:", e)
+gps.off()
+del gps
+
+print("================")
+print("Network status")
+print("================")
+
+import cellular as cel
+import time
+sim_present = cel.is_sim_present()
+print("SIM present:", sim_present)
+
+if sim_present:
+
+    print("----------------")
+    print("Network")
+    print("----------------")
+
+    reg = cel.is_network_registered()
+    print("Ntw registered:", reg)
+    assert reg
+
+    roam = cel.is_roaming()
+    print("Roaming:", roam)
+    assert not roam
+
+    qual, rxq = cel.get_signal_quality()
+    print("Signal:", qual, rxq)
+    assert 0 < qual < 32
+    assert rxq is None
+
+    status = cel.get_network_status()
+    print("Ntw status:", status)
+    # TODO: check here after implementing constants
+    assert status != 0
+
+    cb = cel.network_status_changed()
+    print("Status changed:", cb)
+    assert cb
+
+    imei = cel.get_imei()
+    print("IMEI:", imei)
+    assert len(imei) == 15
+
+    iccid = cel.get_iccid()
+    print("ICCID:", iccid)
+    assert len(iccid) == 19
+
+    imsi = cel.get_imsi()
+    print("IMSI:", imsi)
+    assert len(imsi) <= 15
+
+    cel.poll_network_exception()
+
+    print("----------------")
+    print("SMS")
+    print("----------------")
+
+    sms_list = cel.sms_list()
+    print("SMS:", sms_list)
+    assert len(sms_list) > 0
+    for i in sms_list:
+        assert isinstance(i, cel.SMS)
+
+    # A free LEBARA number to send SMS to
+    sms = cel.SMS("8800", "hello")
+    sms.send()
+    cel.poll_network_exception()
+
+    print("----------------")
+    print("GPRS")
+    print("----------------")
+
+    cel.gprs_attach()
+    # LEBARA NL credentials
+    cel.gprs_activate("internet", "", "")
+    import usocket as sock
+    loc_ip = sock.get_local_ip()
+    print("Local IP:", loc_ip)
+    assert len(loc_ip.split(".")) == 4
+
+    host = "httpstat.us"
+    host_ip = sock.dns_resolve(host)
+    print("Resolved:", host, "->", host_ip)
+    assert len(host_ip.split(".")) == 4
+
+    s = sock.socket()
+    s.connect((host, 80))
+    message = "GET /200 HTTP/1.1\r\nHost: {}\r\nConnection: close\r\n\r\n"
+    response_expected = b"HTTP/1.1 200 OK"
+    message_f = message.format(host)
+    bytes_sent = s.send(message_f)
+    print("Socket(name) sent:", bytes_sent)
+    assert bytes_sent == len(message_f)
+
+    response = s.recv(len(response_expected))
+    print("Socket(name) rcvd:", response)
+    assert response == response_expected
+    s.close()
+
+    s = sock.socket()
+    s.connect((host_ip, 80))
+    bytes_sent = s.send(message_f)
+    print("Socket(ip) sent:", bytes_sent)
+    assert bytes_sent == len(message_f)
+
+    response = s.recv(len(response_expected))
+    print("Socket(ip) rcvd:", response)
+    assert response == response_expected
+    s.close()
+

From 647e6b55fb1103c4d0881c66d9817ef4a634d8a9 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sun, 7 Apr 2019 17:48:41 +0200
Subject: [PATCH 3181/3533] Rework network status test

---
 ports/gprs_a9/frozentest.py | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/ports/gprs_a9/frozentest.py b/ports/gprs_a9/frozentest.py
index ce2c514d97cc3..eefbacc5240fd 100644
--- a/ports/gprs_a9/frozentest.py
+++ b/ports/gprs_a9/frozentest.py
@@ -77,10 +77,6 @@
     # TODO: check here after implementing constants
     assert status != 0
 
-    cb = cel.network_status_changed()
-    print("Status changed:", cb)
-    assert cb
-
     imei = cel.get_imei()
     print("IMEI:", imei)
     assert len(imei) == 15
@@ -114,9 +110,18 @@
     print("GPRS")
     print("----------------")
 
+    cel.gprs_deactivate()
+    cel.gprs_detach()
+    cel.network_status_changed()
+
     cel.gprs_attach()
     # LEBARA NL credentials
     cel.gprs_activate("internet", "", "")
+
+    cb = cel.network_status_changed()
+    print("Status changed:", cb, "->", cel.get_network_status())
+    assert cb
+
     import usocket as sock
     loc_ip = sock.get_local_ip()
     print("Local IP:", loc_ip)
@@ -152,3 +157,6 @@
     assert response == response_expected
     s.close()
 
+    cel.gprs_deactivate()
+    cel.gprs_detach()
+

From 97231d0db206581999bfc3280434abf0e46ad98f Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sun, 7 Apr 2019 17:52:16 +0200
Subject: [PATCH 3182/3533] Add the number of SMS received method

---
 ports/gprs_a9/README.md     |  6 ++++++
 ports/gprs_a9/frozentest.py |  3 +++
 ports/gprs_a9/modcellular.c | 14 ++++++++++++++
 3 files changed, 23 insertions(+)

diff --git a/ports/gprs_a9/README.md b/ports/gprs_a9/README.md
index dd439edbb3d72..17c21379b441f 100644
--- a/ports/gprs_a9/README.md
+++ b/ports/gprs_a9/README.md
@@ -133,6 +133,12 @@ The purpose of this module is to have an access to high-level networking (SMS, G
 
 ##### SMS #####
 
+* `sms_recieved()`
+
+  Retrieves the number of SMS recieved since the last check.
+
+  **Returns**: the number of SMS recieved.
+
 * `sms_list()`
 
   Retrieves SMS from the SIM card.
diff --git a/ports/gprs_a9/frozentest.py b/ports/gprs_a9/frozentest.py
index eefbacc5240fd..7e8b52709ef3d 100644
--- a/ports/gprs_a9/frozentest.py
+++ b/ports/gprs_a9/frozentest.py
@@ -95,6 +95,9 @@
     print("SMS")
     print("----------------")
 
+    sms_recieved = cel.sms_recieved()
+    print("SMS recieved count:", sms_recieved)
+
     sms_list = cel.sms_list()
     print("SMS:", sms_list)
     assert len(sms_list) > 0
diff --git a/ports/gprs_a9/modcellular.c b/ports/gprs_a9/modcellular.c
index d13d4b7163680..33c1e25d82c7a 100644
--- a/ports/gprs_a9/modcellular.c
+++ b/ports/gprs_a9/modcellular.c
@@ -678,6 +678,19 @@ STATIC mp_obj_t get_imsi(void) {
 
 STATIC MP_DEFINE_CONST_FUN_OBJ_0(get_imsi_obj, get_imsi);
 
+STATIC mp_obj_t sms_recieved(void) {
+    // ========================================
+    // Retrieves the number of SMS recieved since last poll.
+    // Returns:
+    //     The number of SMS recieved.
+    // ========================================
+    mp_obj_t result = mp_obj_new_int(sms_recieved_count);
+    sms_recieved_count = 0;
+    return result;
+}
+
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(sms_recieved_obj, sms_recieved);
+
 STATIC mp_obj_t sms_list(void) {
     // ========================================
     // Lists SMS messages.
@@ -900,6 +913,7 @@ STATIC const mp_map_elem_t mp_module_cellular_globals_table[] = {
     { MP_OBJ_NEW_QSTR(MP_QSTR_is_roaming), (mp_obj_t)&is_roaming_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_get_iccid), (mp_obj_t)&get_iccid_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_get_imsi), (mp_obj_t)&get_imsi_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_sms_recieved), (mp_obj_t)&sms_recieved_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_sms_list), (mp_obj_t)&sms_list_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_gprs_attach), (mp_obj_t)&gprs_attach_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_gprs_detach), (mp_obj_t)&gprs_detach_obj },

From 53e973d49f85c5e5614700118e9c88cf1b2e1695 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sun, 7 Apr 2019 18:05:49 +0200
Subject: [PATCH 3183/3533] Fix typo and add delay in test

---
 ports/gprs_a9/frozentest.py |  5 +++--
 ports/gprs_a9/modcellular.c | 22 +++++++++++-----------
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/ports/gprs_a9/frozentest.py b/ports/gprs_a9/frozentest.py
index 7e8b52709ef3d..b9b2876750556 100644
--- a/ports/gprs_a9/frozentest.py
+++ b/ports/gprs_a9/frozentest.py
@@ -95,8 +95,8 @@
     print("SMS")
     print("----------------")
 
-    sms_recieved = cel.sms_recieved()
-    print("SMS recieved count:", sms_recieved)
+    sms_received = cel.sms_received()
+    print("SMS received count:", sms_received)
 
     sms_list = cel.sms_list()
     print("SMS:", sms_list)
@@ -116,6 +116,7 @@
     cel.gprs_deactivate()
     cel.gprs_detach()
     cel.network_status_changed()
+    time.sleep(2)
 
     cel.gprs_attach()
     # LEBARA NL credentials
diff --git a/ports/gprs_a9/modcellular.c b/ports/gprs_a9/modcellular.c
index 33c1e25d82c7a..380bbe9ced9b3 100644
--- a/ports/gprs_a9/modcellular.c
+++ b/ports/gprs_a9/modcellular.c
@@ -41,8 +41,8 @@ uint8_t network_status_updated = 0;
 uint8_t network_signal_quality = 0;
 uint8_t network_signal_rx_level = 0;
 
-// Count SMS recieved
-uint8_t sms_recieved_count = 0;
+// Count SMS received
+uint8_t sms_received_count = 0;
 
 // SMS send flag
 uint8_t sms_send_flag = 0;
@@ -62,7 +62,7 @@ STATIC mp_obj_t sms_from_raw(uint8_t* header, uint32_t header_length, uint8_t* c
 void cellular_init0(void) {
     network_status_updated = 0;
     network_exception = 0;
-    sms_recieved_count = 0;
+    sms_received_count = 0;
 }
 
 // ----------
@@ -206,7 +206,7 @@ void modcellular_notify_sms_error(API_Event_t* event) {
 }
 
 void modcellular_notify_sms_receipt(API_Event_t* event) {
-    sms_recieved_count ++;
+    sms_received_count ++;
 }
 
 void modcellular_notify_signal(API_Event_t* event) {
@@ -678,18 +678,18 @@ STATIC mp_obj_t get_imsi(void) {
 
 STATIC MP_DEFINE_CONST_FUN_OBJ_0(get_imsi_obj, get_imsi);
 
-STATIC mp_obj_t sms_recieved(void) {
+STATIC mp_obj_t sms_received(void) {
     // ========================================
-    // Retrieves the number of SMS recieved since last poll.
+    // Retrieves the number of SMS received since last poll.
     // Returns:
-    //     The number of SMS recieved.
+    //     The number of SMS received.
     // ========================================
-    mp_obj_t result = mp_obj_new_int(sms_recieved_count);
-    sms_recieved_count = 0;
+    mp_obj_t result = mp_obj_new_int(sms_received_count);
+    sms_received_count = 0;
     return result;
 }
 
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(sms_recieved_obj, sms_recieved);
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(sms_received_obj, sms_received);
 
 STATIC mp_obj_t sms_list(void) {
     // ========================================
@@ -913,7 +913,7 @@ STATIC const mp_map_elem_t mp_module_cellular_globals_table[] = {
     { MP_OBJ_NEW_QSTR(MP_QSTR_is_roaming), (mp_obj_t)&is_roaming_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_get_iccid), (mp_obj_t)&get_iccid_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_get_imsi), (mp_obj_t)&get_imsi_obj },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_sms_recieved), (mp_obj_t)&sms_recieved_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_sms_received), (mp_obj_t)&sms_received_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_sms_list), (mp_obj_t)&sms_list_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_gprs_attach), (mp_obj_t)&gprs_attach_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_gprs_detach), (mp_obj_t)&gprs_detach_obj },

From 02cc1ae55aa115e8438eebd3940d2c795352f84d Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sun, 7 Apr 2019 18:18:59 +0200
Subject: [PATCH 3184/3533] Rename modcellular methods to include module name

---
 ports/gprs_a9/main.c        |   4 +-
 ports/gprs_a9/modcellular.c | 154 ++++++++++++++++++------------------
 ports/gprs_a9/modcellular.h |   2 +-
 3 files changed, 80 insertions(+), 80 deletions(-)

diff --git a/ports/gprs_a9/main.c b/ports/gprs_a9/main.c
index 033e16c1a8dd9..2e58d79cb8e70 100644
--- a/ports/gprs_a9/main.c
+++ b/ports/gprs_a9/main.c
@@ -178,7 +178,7 @@ void soft_reset(void) {
     mp_hal_stdout_tx_str("PYB: soft reboot\r\n");
     mp_hal_delay_us(10000); // allow UART to flush output
     mp_Init();
-    cellular_init0();
+    modcellular_init0();
 }
 
 
@@ -189,7 +189,7 @@ void MicroPyTask(void *pData)
     Buffer_Init(&fifoBuffer, fifoBufferData, sizeof(fifoBufferData));
     UartInit();
     mp_Init();
-    cellular_init0();
+    modcellular_init0();
     
     uint8_t reset;
 soft_reset:
diff --git a/ports/gprs_a9/modcellular.c b/ports/gprs_a9/modcellular.c
index 380bbe9ced9b3..1821765f28c98 100644
--- a/ports/gprs_a9/modcellular.c
+++ b/ports/gprs_a9/modcellular.c
@@ -56,10 +56,10 @@ mp_obj_list_t* sms_list_buffer = NULL;
 uint8_t sms_list_buffer_count = 0;
 
 // SMS parsing
-STATIC mp_obj_t sms_from_record(SMS_Message_Info_t* record);
-STATIC mp_obj_t sms_from_raw(uint8_t* header, uint32_t header_length, uint8_t* content, uint32_t content_length);
+STATIC mp_obj_t modcellular_sms_from_record(SMS_Message_Info_t* record);
+STATIC mp_obj_t modcellular_sms_from_raw(uint8_t* header, uint32_t header_length, uint8_t* content, uint32_t content_length);
 
-void cellular_init0(void) {
+void modcellular_init0(void) {
     network_status_updated = 0;
     network_exception = 0;
     sms_received_count = 0;
@@ -189,7 +189,7 @@ void modcellular_notify_sms_list(API_Event_t* event) {
     SMS_Message_Info_t* messageInfo = (SMS_Message_Info_t*)event->pParam1;
 
     if (sms_list_buffer && (sms_list_buffer->len > sms_list_buffer_count)) {
-        sms_list_buffer->items[sms_list_buffer_count] = sms_from_record(messageInfo);
+        sms_list_buffer->items[sms_list_buffer_count] = modcellular_sms_from_record(messageInfo);
         sms_list_buffer_count ++;
     } else {
         network_exception = NTW_EXC_SMS_DROP;
@@ -227,7 +227,7 @@ typedef struct _sms_obj_t {
     mp_obj_t message;
 } sms_obj_t;
 
-mp_obj_t sms_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
+mp_obj_t modcellular_sms_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
 
     enum { ARG_phone_number, ARG_message };
     static const mp_arg_t allowed_args[] = {
@@ -255,7 +255,7 @@ uint8_t bitsum(uint32_t i) {
      return (((i + (i >> 4)) & 0x0F0F0F0F) * 0x01010101) >> 24;
 }
 
-STATIC mp_obj_t sms_inbox(mp_obj_t self_in) {
+STATIC mp_obj_t modcellular_sms_inbox(mp_obj_t self_in) {
     // ========================================
     // Determines if SMS is inbox or outbox.
     // Returns:
@@ -267,7 +267,7 @@ STATIC mp_obj_t sms_inbox(mp_obj_t self_in) {
     return mp_obj_new_bool(s & (SMS_STATUS_READ | SMS_STATUS_UNREAD));
 }
 
-STATIC mp_obj_t sms_unread(mp_obj_t self_in) {
+STATIC mp_obj_t modcellular_sms_unread(mp_obj_t self_in) {
     // ========================================
     // Determines if SMS is unread.
     // Returns:
@@ -279,7 +279,7 @@ STATIC mp_obj_t sms_unread(mp_obj_t self_in) {
     return mp_obj_new_bool(s & SMS_STATUS_UNREAD);
 }
 
-STATIC mp_obj_t sms_sent(mp_obj_t self_in) {
+STATIC mp_obj_t modcellular_sms_sent(mp_obj_t self_in) {
     // ========================================
     // Determines if SMS was sent.
     // Returns:
@@ -291,7 +291,7 @@ STATIC mp_obj_t sms_sent(mp_obj_t self_in) {
     return mp_obj_new_bool(!(s | SMS_STATUS_UNSENT));
 }
 
-STATIC mp_obj_t sms_send(mp_obj_t self_in) {
+STATIC mp_obj_t modcellular_sms_send(mp_obj_t self_in) {
     // ========================================
     // Sends an SMS messsage.
     // ========================================
@@ -360,9 +360,9 @@ STATIC mp_obj_t sms_send(mp_obj_t self_in) {
     return mp_const_none;
 }
 
-MP_DEFINE_CONST_FUN_OBJ_1(sms_send_obj, &sms_send);
+MP_DEFINE_CONST_FUN_OBJ_1(modcellular_sms_send_obj, &modcellular_sms_send);
 
-STATIC mp_obj_t sms_withdraw(mp_obj_t self_in) {
+STATIC mp_obj_t modcellular_sms_withdraw(mp_obj_t self_in) {
     // ========================================
     // Withdraws an SMS message from the SIM card.
     // ========================================
@@ -384,9 +384,9 @@ STATIC mp_obj_t sms_withdraw(mp_obj_t self_in) {
     return mp_const_none;
 }
 
-MP_DEFINE_CONST_FUN_OBJ_1(sms_withdraw_obj, &sms_withdraw);
+MP_DEFINE_CONST_FUN_OBJ_1(modcellular_sms_withdraw_obj, &modcellular_sms_withdraw);
 
-STATIC void sms_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
+STATIC void modcellular_sms_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
     // ========================================
     // SMS.[attr]
     // ========================================
@@ -404,24 +404,24 @@ STATIC void sms_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
             dest[0] = mp_obj_new_int(self->status);
         // .inbox
         } else if (attr == MP_QSTR_inbox) {
-            dest[0] = sms_inbox(self_in);
+            dest[0] = modcellular_sms_inbox(self_in);
         // .unread
         } else if (attr == MP_QSTR_unread) {
-            dest[0] = sms_unread(self_in);
+            dest[0] = modcellular_sms_unread(self_in);
         // .sent
         } else if (attr == MP_QSTR_sent) {
-            dest[0] = sms_sent(self_in);
+            dest[0] = modcellular_sms_sent(self_in);
         // .send
         } else if (attr == MP_QSTR_send) {
-            mp_convert_member_lookup(self_in, mp_obj_get_type(self_in), (mp_obj_t)MP_ROM_PTR(&sms_send_obj), dest);
+            mp_convert_member_lookup(self_in, mp_obj_get_type(self_in), (mp_obj_t)MP_ROM_PTR(&modcellular_sms_send_obj), dest);
         // .withdraw
         } else if (attr == MP_QSTR_withdraw) {
-            mp_convert_member_lookup(self_in, mp_obj_get_type(self_in), (mp_obj_t)MP_ROM_PTR(&sms_withdraw_obj), dest);
+            mp_convert_member_lookup(self_in, mp_obj_get_type(self_in), (mp_obj_t)MP_ROM_PTR(&modcellular_sms_withdraw_obj), dest);
         }
     }
 }
 
-STATIC void sms_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+STATIC void modcellular_sms_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     // ========================================
     // SMS.__str__()
     // ========================================
@@ -437,26 +437,26 @@ STATIC void sms_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t
     );
 }
 
-STATIC const mp_obj_type_t sms_type = {
+STATIC const mp_obj_type_t modcellular_sms_type = {
     { &mp_type_type },
     .name = MP_QSTR_SMS,
-    .make_new = sms_make_new,
-    .print = sms_print,
-    .attr = sms_attr,
+    .make_new = modcellular_sms_make_new,
+    .print = modcellular_sms_print,
+    .attr = modcellular_sms_attr,
 };
 
 // -------
 // Private
 // -------
 
-STATIC mp_obj_t sms_from_record(SMS_Message_Info_t* record) {
+STATIC mp_obj_t modcellular_sms_from_record(SMS_Message_Info_t* record) {
     // ========================================
     // Prepares an SMS object from the record.
     // Returns:
     //     A new SMS object.
     // ========================================
     sms_obj_t *self = m_new_obj_with_finaliser(sms_obj_t);
-    self->base.type = &sms_type;
+    self->base.type = &modcellular_sms_type;
     self->index = record->index;
     self->status = (uint8_t)record->status;
     self->phone_number_type = (uint8_t)record->phoneNumberType;
@@ -465,7 +465,7 @@ STATIC mp_obj_t sms_from_record(SMS_Message_Info_t* record) {
     return MP_OBJ_FROM_PTR(self);
 }
 
-STATIC mp_obj_t sms_from_raw(uint8_t* header, uint32_t header_length, uint8_t* content, uint32_t content_length) {
+STATIC mp_obj_t modcellular_sms_from_raw(uint8_t* header, uint32_t header_length, uint8_t* content, uint32_t content_length) {
     // ========================================
     // Prepares an SMS object from raw header and contents.
     // Returns:
@@ -489,7 +489,7 @@ STATIC mp_obj_t sms_from_raw(uint8_t* header, uint32_t header_length, uint8_t* c
     }
 
     sms_obj_t *self = m_new_obj_with_finaliser(sms_obj_t);
-    self->base.type = &sms_type;
+    self->base.type = &modcellular_sms_type;
     self->index = 0;
     self->status = 0;
     self->phone_number_type = 0;
@@ -502,7 +502,7 @@ STATIC mp_obj_t sms_from_raw(uint8_t* header, uint32_t header_length, uint8_t* c
 // Methods
 // -------
 
-STATIC mp_obj_t get_signal_quality(void) {
+STATIC mp_obj_t modcellular_get_signal_quality(void) {
     // ========================================
     // Retrieves the network signal quality.
     // Returns:
@@ -515,9 +515,9 @@ STATIC mp_obj_t get_signal_quality(void) {
     return mp_obj_new_tuple(2, tuple);
 }
 
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(get_signal_quality_obj, get_signal_quality);
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(modcellular_get_signal_quality_obj, modcellular_get_signal_quality);
 
-STATIC mp_obj_t get_imei(void) {
+STATIC mp_obj_t modcellular_get_imei(void) {
     // ========================================
     // Retrieves IMEI number.
     // Returns:
@@ -529,9 +529,9 @@ STATIC mp_obj_t get_imei(void) {
     return mp_obj_new_str(imei, strlen(imei));
 }
 
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(get_imei_obj, get_imei);
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(modcellular_get_imei_obj, modcellular_get_imei);
 
-STATIC mp_obj_t is_sim_present(void) {
+STATIC mp_obj_t modcellular_is_sim_present(void) {
     // ========================================
     // Checks whether the SIM card is inserted and ICCID can be retrieved.
     // Returns:
@@ -542,9 +542,9 @@ STATIC mp_obj_t is_sim_present(void) {
     return mp_obj_new_bool(SIM_GetICCID((uint8_t*)iccid));
 }
 
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(is_sim_present_obj, is_sim_present);
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(modcellular_is_sim_present_obj, modcellular_is_sim_present);
 
-STATIC mp_obj_t network_status_changed(void) {
+STATIC mp_obj_t modcellular_network_status_changed(void) {
     // ========================================
     // Checks whether the network status was updated.
     // Returns:
@@ -555,9 +555,9 @@ STATIC mp_obj_t network_status_changed(void) {
     return mp_obj_new_bool(result);
 }
 
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(network_status_changed_obj, network_status_changed);
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(modcellular_network_status_changed_obj, modcellular_network_status_changed);
 
-STATIC mp_obj_t poll_network_exception(void) {
+STATIC mp_obj_t modcellular_poll_network_exception(void) {
     // ========================================
     // Checks whether network exception occurred since the last check.
     // Returns:
@@ -605,9 +605,9 @@ STATIC mp_obj_t poll_network_exception(void) {
     return mp_const_none;
 }
 
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(poll_network_exception_obj, poll_network_exception);
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(modcellular_poll_network_exception_obj, modcellular_poll_network_exception);
 
-STATIC mp_obj_t get_network_status(void) {
+STATIC mp_obj_t modcellular_get_network_status(void) {
     // ========================================
     // Retrieves the network status.
     // Returns:
@@ -616,9 +616,9 @@ STATIC mp_obj_t get_network_status(void) {
     return mp_obj_new_int(network_status);
 }
 
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(get_network_status_obj, get_network_status);
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(modcellular_get_network_status_obj, modcellular_get_network_status);
 
-STATIC mp_obj_t is_network_registered(void) {
+STATIC mp_obj_t modcellular_is_network_registered(void) {
     // ========================================
     // Checks whether registered on the cellular network.
     // Returns:
@@ -627,9 +627,9 @@ STATIC mp_obj_t is_network_registered(void) {
     return mp_obj_new_bool(network_status & NTW_REG_BIT);
 }
 
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(is_network_registered_obj, is_network_registered);
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(modcellular_is_network_registered_obj, modcellular_is_network_registered);
 
-STATIC mp_obj_t is_roaming(void) {
+STATIC mp_obj_t modcellular_is_roaming(void) {
     // ========================================
     // Checks whether registered on the roaming network.
     // Returns:
@@ -640,9 +640,9 @@ STATIC mp_obj_t is_roaming(void) {
     return mp_obj_new_bool(network_status & NTW_ROAM_BIT);
 }
 
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(is_roaming_obj, is_roaming);
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(modcellular_is_roaming_obj, modcellular_is_roaming);
 
-STATIC mp_obj_t get_iccid(void) {
+STATIC mp_obj_t modcellular_get_iccid(void) {
     // ========================================
     // Retrieves ICCID number.
     // Returns:
@@ -658,9 +658,9 @@ STATIC mp_obj_t get_iccid(void) {
     }
 }
 
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(get_iccid_obj, get_iccid);
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(modcellular_get_iccid_obj, modcellular_get_iccid);
 
-STATIC mp_obj_t get_imsi(void) {
+STATIC mp_obj_t modcellular_get_imsi(void) {
     // ========================================
     // Retrieves IMSI number.
     // Returns:
@@ -676,9 +676,9 @@ STATIC mp_obj_t get_imsi(void) {
     }
 }
 
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(get_imsi_obj, get_imsi);
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(modcellular_get_imsi_obj, modcellular_get_imsi);
 
-STATIC mp_obj_t sms_received(void) {
+STATIC mp_obj_t modcellular_sms_received(void) {
     // ========================================
     // Retrieves the number of SMS received since last poll.
     // Returns:
@@ -689,9 +689,9 @@ STATIC mp_obj_t sms_received(void) {
     return result;
 }
 
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(sms_received_obj, sms_received);
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(modcellular_sms_received_obj, modcellular_sms_received);
 
-STATIC mp_obj_t sms_list(void) {
+STATIC mp_obj_t modcellular_sms_list(void) {
     // ========================================
     // Lists SMS messages.
     // Returns:
@@ -730,9 +730,9 @@ STATIC mp_obj_t sms_list(void) {
     return (mp_obj_t)result;
 }
 
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(sms_list_obj, sms_list);
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(modcellular_sms_list_obj, modcellular_sms_list);
 
-STATIC mp_obj_t gprs_attach() {
+STATIC mp_obj_t modcellular_gprs_attach() {
     // ========================================
     // Attaches to the GPRS network.
     // ========================================
@@ -767,9 +767,9 @@ STATIC mp_obj_t gprs_attach() {
     return mp_const_none;
 }
 
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(gprs_attach_obj, gprs_attach);
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(modcellular_gprs_attach_obj, modcellular_gprs_attach);
 
-STATIC mp_obj_t gprs_detach() {
+STATIC mp_obj_t modcellular_gprs_detach() {
     // ========================================
     // Detaches from the GPRS network.
     // ========================================
@@ -804,9 +804,9 @@ STATIC mp_obj_t gprs_detach() {
     return mp_const_none;
 }
 
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(gprs_detach_obj, gprs_detach);
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(modcellular_gprs_detach_obj, modcellular_gprs_detach);
 
-STATIC mp_obj_t gprs_activate(mp_obj_t apn, mp_obj_t user, mp_obj_t pass) {
+STATIC mp_obj_t modcellular_gprs_activate(mp_obj_t apn, mp_obj_t user, mp_obj_t pass) {
     // ========================================
     // Activates the GPRS network.
     // Args:
@@ -854,9 +854,9 @@ STATIC mp_obj_t gprs_activate(mp_obj_t apn, mp_obj_t user, mp_obj_t pass) {
     return mp_const_none;
 }
 
-STATIC MP_DEFINE_CONST_FUN_OBJ_3(gprs_activate_obj, gprs_activate);
+STATIC MP_DEFINE_CONST_FUN_OBJ_3(modcellular_gprs_activate_obj, modcellular_gprs_activate);
 
-STATIC mp_obj_t gprs_deactivate() {
+STATIC mp_obj_t modcellular_gprs_deactivate() {
     // ========================================
     // Deactivates the GPRS network.
     // ========================================
@@ -891,7 +891,7 @@ STATIC mp_obj_t gprs_deactivate() {
     return mp_const_none;
 }
 
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(gprs_deactivate_obj, gprs_deactivate);
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(modcellular_gprs_deactivate_obj, modcellular_gprs_deactivate);
 
 STATIC const mp_map_elem_t mp_module_cellular_globals_table[] = {
     { MP_OBJ_NEW_QSTR(MP_QSTR___name__), MP_OBJ_NEW_QSTR(MP_QSTR_cellular) },
@@ -901,24 +901,24 @@ STATIC const mp_map_elem_t mp_module_cellular_globals_table[] = {
     { MP_OBJ_NEW_QSTR(MP_QSTR_SMSError), (mp_obj_t)MP_ROM_PTR(&mp_type_SMSError) },
     { MP_OBJ_NEW_QSTR(MP_QSTR_NoSIMError), (mp_obj_t)MP_ROM_PTR(&mp_type_NoSIMError) },
 
-    { MP_OBJ_NEW_QSTR(MP_QSTR_SMS), (mp_obj_t)MP_ROM_PTR(&sms_type) },
-
-    { MP_OBJ_NEW_QSTR(MP_QSTR_get_imei), (mp_obj_t)&get_imei_obj },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_get_signal_quality), (mp_obj_t)&get_signal_quality_obj },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_network_status_changed), (mp_obj_t)&network_status_changed_obj },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_poll_network_exception), (mp_obj_t)&poll_network_exception_obj },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_get_network_status), (mp_obj_t)&get_network_status_obj },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_is_sim_present), (mp_obj_t)&is_sim_present_obj },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_is_network_registered), (mp_obj_t)&is_network_registered_obj },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_is_roaming), (mp_obj_t)&is_roaming_obj },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_get_iccid), (mp_obj_t)&get_iccid_obj },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_get_imsi), (mp_obj_t)&get_imsi_obj },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_sms_received), (mp_obj_t)&sms_received_obj },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_sms_list), (mp_obj_t)&sms_list_obj },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_gprs_attach), (mp_obj_t)&gprs_attach_obj },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_gprs_detach), (mp_obj_t)&gprs_detach_obj },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_gprs_activate), (mp_obj_t)&gprs_activate_obj },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_gprs_deactivate), (mp_obj_t)&gprs_deactivate_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_SMS), (mp_obj_t)MP_ROM_PTR(&modcellular_sms_type) },
+
+    { MP_OBJ_NEW_QSTR(MP_QSTR_get_imei), (mp_obj_t)&modcellular_get_imei_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_get_signal_quality), (mp_obj_t)&modcellular_get_signal_quality_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_network_status_changed), (mp_obj_t)&modcellular_network_status_changed_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_poll_network_exception), (mp_obj_t)&modcellular_poll_network_exception_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_get_network_status), (mp_obj_t)&modcellular_get_network_status_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_is_sim_present), (mp_obj_t)&modcellular_is_sim_present_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_is_network_registered), (mp_obj_t)&modcellular_is_network_registered_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_is_roaming), (mp_obj_t)&modcellular_is_roaming_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_get_iccid), (mp_obj_t)&modcellular_get_iccid_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_get_imsi), (mp_obj_t)&modcellular_get_imsi_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_sms_received), (mp_obj_t)&modcellular_sms_received_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_sms_list), (mp_obj_t)&modcellular_sms_list_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_gprs_attach), (mp_obj_t)&modcellular_gprs_attach_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_gprs_detach), (mp_obj_t)&modcellular_gprs_detach_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_gprs_activate), (mp_obj_t)&modcellular_gprs_activate_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_gprs_deactivate), (mp_obj_t)&modcellular_gprs_deactivate_obj },
 };
 
 STATIC MP_DEFINE_CONST_DICT(mp_module_cellular_globals, mp_module_cellular_globals_table);
diff --git a/ports/gprs_a9/modcellular.h b/ports/gprs_a9/modcellular.h
index aaeac47f454e4..30873e7af6792 100644
--- a/ports/gprs_a9/modcellular.h
+++ b/ports/gprs_a9/modcellular.h
@@ -8,7 +8,7 @@ extern const mp_obj_type_t mp_type_NoSIMError;
 extern const mp_obj_type_t mp_type_CellularAttachmentError;
 extern const mp_obj_type_t mp_type_CellularActivationError;
 
-void cellular_init0(void);
+void modcellular_init0(void);
 
 void modcellular_notify_no_sim(API_Event_t* event);
 void modcellular_notify_sim_drop(API_Event_t* event);

From 833313cb405bfef62b2b06f13e2631b26011472e Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sun, 7 Apr 2019 18:20:42 +0200
Subject: [PATCH 3185/3533] Fix typo

---
 ports/gprs_a9/README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ports/gprs_a9/README.md b/ports/gprs_a9/README.md
index 17c21379b441f..74df74a662638 100644
--- a/ports/gprs_a9/README.md
+++ b/ports/gprs_a9/README.md
@@ -133,11 +133,11 @@ The purpose of this module is to have an access to high-level networking (SMS, G
 
 ##### SMS #####
 
-* `sms_recieved()`
+* `sms_received()`
 
-  Retrieves the number of SMS recieved since the last check.
+  Retrieves the number of SMS received since the last check.
 
-  **Returns**: the number of SMS recieved.
+  **Returns**: the number of SMS received.
 
 * `sms_list()`
 

From 9d5d4e294f9312f940ac64ab057373fe55daa524 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sun, 7 Apr 2019 21:41:35 +0200
Subject: [PATCH 3186/3533] Fix file IO into convention

---
 ports/gprs_a9/file_io.c | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/ports/gprs_a9/file_io.c b/ports/gprs_a9/file_io.c
index 08632b5d4da53..a33abf4ba9b06 100644
--- a/ports/gprs_a9/file_io.c
+++ b/ports/gprs_a9/file_io.c
@@ -120,20 +120,17 @@ STATIC const mp_arg_t file_open_args[] = {
 STATIC mp_obj_t file_open(const char* file_name, const mp_obj_type_t *type, mp_arg_val_t *args) {
     const char *mode_s = mp_obj_str_get_str(args[1].u_obj);
     uint32_t mode = 0;
-    // TODO make sure only one of r, w, x, a, and b, t are specified
+    // TODO make sure only one of r, w, a, and b, t are specified
     while (*mode_s) {
         switch (*mode_s++) {
             case 'r':
                 mode |= FS_O_RDONLY;
                 break;
             case 'w':
-                mode |= FS_O_RDWR | FS_O_CREAT;
-                break;
-            case 'x':
-                mode |= FS_O_RDWR | FS_O_CREAT | FS_O_TRUNC;
+                mode |= FS_O_WRONLY | FS_O_CREAT | FS_O_TRUNC;
                 break;
             case 'a':
-                mode |= FS_O_RDWR | FS_O_APPEND;
+                mode |= FS_O_WRONLY | FS_O_CREAT | FS_O_APPEND;
                 break;
             case '+':
                 mode |= FS_O_RDWR;
@@ -142,10 +139,10 @@ STATIC mp_obj_t file_open(const char* file_name, const mp_obj_type_t *type, mp_a
             case 'b':
                 type = &mp_type_vfs_fat_fileio;
                 break;
-            #endif
             case 't':
                 type = &mp_type_vfs_fat_textio;
                 break;
+            #endif
         }
     }
     pyb_file_obj_t *o = m_new_obj_with_finaliser(pyb_file_obj_t);

From 593e6b2a01afe669f73041a44366246450e9c302 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sun, 7 Apr 2019 22:18:40 +0200
Subject: [PATCH 3187/3533] Add license preamble for port files

---
 ports/gprs_a9/csdk_config.h | 31 +++++++++++++++++++++++++++++--
 ports/gprs_a9/file_io.c     | 31 ++++++++++++++++++++++++++++---
 ports/gprs_a9/main.c        | 29 +++++++++++++++++++++++++++++
 ports/gprs_a9/modcellular.c | 29 +++++++++++++++++++++++++++++
 ports/gprs_a9/modcellular.h | 29 +++++++++++++++++++++++++++++
 ports/gprs_a9/modgps.c      | 29 +++++++++++++++++++++++++++++
 ports/gprs_a9/modgps.h      | 29 +++++++++++++++++++++++++++++
 ports/gprs_a9/modmachine.c  | 29 +++++++++++++++++++++++++++++
 ports/gprs_a9/modmachine.h  | 28 ++++++++++++++++++++++++++++
 ports/gprs_a9/modusocket.c  | 29 +++++++++++++++++++++++++++++
 ports/gprs_a9/mphalport.c   | 32 ++++++++++++++++++++++++++++----
 ports/gprs_a9/mphalport.h   | 29 +++++++++++++++++++++++++++++
 ports/gprs_a9/rng.c         | 29 ++++++++++++++++++++++++++++-
 ports/gprs_a9/rng.h         | 29 +++++++++++++++++++++++++++++
 ports/gprs_a9/unistd.h      | 31 ++++++++++++++++++++++++++++++-
 15 files changed, 432 insertions(+), 11 deletions(-)

diff --git a/ports/gprs_a9/csdk_config.h b/ports/gprs_a9/csdk_config.h
index 80e4bb97647f0..7754e1b46c2f9 100644
--- a/ports/gprs_a9/csdk_config.h
+++ b/ports/gprs_a9/csdk_config.h
@@ -1,3 +1,32 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * Development of the code in this file was sponsored by Microbric Pty Ltd
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2015 Paul Sokolovsky
+ * Copyright (c) 2016 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
 #ifndef __CSDK_CONFIG_H
 #define __CSDK_CONFIG_H
 
@@ -12,5 +41,3 @@
 
 #endif
 
-
-
diff --git a/ports/gprs_a9/file_io.c b/ports/gprs_a9/file_io.c
index a33abf4ba9b06..fe66c3bc760aa 100644
--- a/ports/gprs_a9/file_io.c
+++ b/ports/gprs_a9/file_io.c
@@ -1,9 +1,34 @@
-
-
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * Development of the code in this file was sponsored by Microbric Pty Ltd
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2015 Paul Sokolovsky
+ * Copyright (c) 2016 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
 
 #include <string.h>
 
-
 #include "py/objstr.h"
 #include "py/runtime.h"
 #include "py/mperrno.h"
diff --git a/ports/gprs_a9/main.c b/ports/gprs_a9/main.c
index 2e58d79cb8e70..fca2f091d9416 100644
--- a/ports/gprs_a9/main.c
+++ b/ports/gprs_a9/main.c
@@ -1,3 +1,32 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * Development of the code in this file was sponsored by Microbric Pty Ltd
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2015 Paul Sokolovsky
+ * Copyright (c) 2016 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
 #include <stdint.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/ports/gprs_a9/modcellular.c b/ports/gprs_a9/modcellular.c
index 1821765f28c98..814c54effc725 100644
--- a/ports/gprs_a9/modcellular.c
+++ b/ports/gprs_a9/modcellular.c
@@ -1,3 +1,32 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * Development of the code in this file was sponsored by Microbric Pty Ltd
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2015 Paul Sokolovsky
+ * Copyright (c) 2016 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
 #include "modcellular.h"
 
 #include "py/nlr.h"
diff --git a/ports/gprs_a9/modcellular.h b/ports/gprs_a9/modcellular.h
index 30873e7af6792..7f780702dc093 100644
--- a/ports/gprs_a9/modcellular.h
+++ b/ports/gprs_a9/modcellular.h
@@ -1,3 +1,32 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * Development of the code in this file was sponsored by Microbric Pty Ltd
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2015 Paul Sokolovsky
+ * Copyright (c) 2016 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
 #include "api_event.h"
 #include "py/obj.h"
 
diff --git a/ports/gprs_a9/modgps.c b/ports/gprs_a9/modgps.c
index 96dcb61411666..bee80cb1de446 100644
--- a/ports/gprs_a9/modgps.c
+++ b/ports/gprs_a9/modgps.c
@@ -1,3 +1,32 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * Development of the code in this file was sponsored by Microbric Pty Ltd
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2015 Paul Sokolovsky
+ * Copyright (c) 2016 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
 #include "modgps.h"
 
 #include "py/nlr.h"
diff --git a/ports/gprs_a9/modgps.h b/ports/gprs_a9/modgps.h
index 478a1eccb2ef8..7fd84ce317f48 100644
--- a/ports/gprs_a9/modgps.h
+++ b/ports/gprs_a9/modgps.h
@@ -1,3 +1,32 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * Development of the code in this file was sponsored by Microbric Pty Ltd
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2015 Paul Sokolovsky
+ * Copyright (c) 2016 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
 #include "api_event.h"
 #include "gps_parse.h"
 #include "py/obj.h"
diff --git a/ports/gprs_a9/modmachine.c b/ports/gprs_a9/modmachine.c
index 7e250f44f7146..a07108b12a4ef 100644
--- a/ports/gprs_a9/modmachine.c
+++ b/ports/gprs_a9/modmachine.c
@@ -1,3 +1,32 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * Development of the code in this file was sponsored by Microbric Pty Ltd
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2015 Paul Sokolovsky
+ * Copyright (c) 2016 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
 #include "modmachine.h"
 
 #include "mpconfigport.h"
diff --git a/ports/gprs_a9/modmachine.h b/ports/gprs_a9/modmachine.h
index d98d8c033988b..2347587a796f8 100644
--- a/ports/gprs_a9/modmachine.h
+++ b/ports/gprs_a9/modmachine.h
@@ -1,3 +1,31 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * Development of the code in this file was sponsored by Microbric Pty Ltd
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2015 Paul Sokolovsky
+ * Copyright (c) 2016 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
 
 #ifndef MICROPY_INCLUDED_GPRS_A9_MODMACHINE_H
 #define MICROPY_INCLUDED_GPRS_A9_MODMACHINE_H
diff --git a/ports/gprs_a9/modusocket.c b/ports/gprs_a9/modusocket.c
index a7be71c715b81..fbfcd5753db4c 100644
--- a/ports/gprs_a9/modusocket.c
+++ b/ports/gprs_a9/modusocket.c
@@ -1,3 +1,32 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * Development of the code in this file was sponsored by Microbric Pty Ltd
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2015 Paul Sokolovsky
+ * Copyright (c) 2016 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
 #include "modcellular.h"
 #include "errno.h"
 
diff --git a/ports/gprs_a9/mphalport.c b/ports/gprs_a9/mphalport.c
index b313dadb965ae..e229087055934 100644
--- a/ports/gprs_a9/mphalport.c
+++ b/ports/gprs_a9/mphalport.c
@@ -1,3 +1,31 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * Development of the code in this file was sponsored by Microbric Pty Ltd
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2015 Paul Sokolovsky
+ * Copyright (c) 2016 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
 
 #include "mpconfigport.h"
 
@@ -11,10 +39,6 @@
 #include "buffer.h"
 #include "time.h"
 
-
-
-
-
 bool UartInit()
 {
     UART_Config_t config = {
diff --git a/ports/gprs_a9/mphalport.h b/ports/gprs_a9/mphalport.h
index d63703b179935..7488d3d8db895 100644
--- a/ports/gprs_a9/mphalport.h
+++ b/ports/gprs_a9/mphalport.h
@@ -1,3 +1,32 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * Development of the code in this file was sponsored by Microbric Pty Ltd
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2015 Paul Sokolovsky
+ * Copyright (c) 2016 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
 #ifndef __MPHALPORT_H
 #define __MPHALPORT_H
 
diff --git a/ports/gprs_a9/rng.c b/ports/gprs_a9/rng.c
index 64bdf2dde7bdf..bbb273cc800d5 100644
--- a/ports/gprs_a9/rng.c
+++ b/ports/gprs_a9/rng.c
@@ -1,7 +1,34 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * Development of the code in this file was sponsored by Microbric Pty Ltd
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2015 Paul Sokolovsky
+ * Copyright (c) 2016 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
 
 #include "rng.h"
 
-
 // For MCUs that don't have an RNG we still need to provide a rng_get() function,
 // eg for lwIP.  A pseudo-RNG is not really ideal but we go with it for now.  We
 // don't want to use urandom's pRNG because then the user won't see a reproducible
diff --git a/ports/gprs_a9/rng.h b/ports/gprs_a9/rng.h
index 5f3460ae51c95..3ca3a1906c711 100644
--- a/ports/gprs_a9/rng.h
+++ b/ports/gprs_a9/rng.h
@@ -1,3 +1,32 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * Development of the code in this file was sponsored by Microbric Pty Ltd
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2015 Paul Sokolovsky
+ * Copyright (c) 2016 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
 #ifndef __RNG_H
 #define __RNG_H
 
diff --git a/ports/gprs_a9/unistd.h b/ports/gprs_a9/unistd.h
index 73ee35068e732..cf94b8c340c0c 100644
--- a/ports/gprs_a9/unistd.h
+++ b/ports/gprs_a9/unistd.h
@@ -1,3 +1,32 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * Development of the code in this file was sponsored by Microbric Pty Ltd
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2015 Paul Sokolovsky
+ * Copyright (c) 2016 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
 #ifndef MICROPY_INCLUDED_GPRS_A9_UNISTD_H
 #define MICROPY_INCLUDED_GPRS_A9_UNISTD_H
 
@@ -9,4 +38,4 @@
 
 typedef long off_t;
 
-#endif // MICROPY_INCLUDED_GPRS_A9_UNISTD_H
\ No newline at end of file
+#endif // MICROPY_INCLUDED_GPRS_A9_UNISTD_H

From 3b727747d9ce9f1bb7f852debfdf85a30c13971f Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sun, 7 Apr 2019 22:20:34 +0200
Subject: [PATCH 3188/3533] Fix null pointers

---
 ports/gprs_a9/moduos.c | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/ports/gprs_a9/moduos.c b/ports/gprs_a9/moduos.c
index 56d2c1d7bde6b..30518dbfd29ee 100644
--- a/ports/gprs_a9/moduos.c
+++ b/ports/gprs_a9/moduos.c
@@ -219,10 +219,11 @@ mp_obj_t mp_vfs_stat(mp_obj_t path_in) {
     int32_t ret = API_FS_GetFSInfo(path,&info);
     if(ret != 0)
         mp_raise_OSError(MP_EIO);
-    mp_obj_tuple_t *t = MP_OBJ_TO_PTR(mp_obj_new_tuple(10, NULL));
-    t->items[0] = mp_obj_new_int(info.totalSize);
-    t->items[1] = mp_obj_new_int(info.usedSize);
-    return MP_OBJ_FROM_PTR(t);
+    mp_obj_t tuple[2] = {
+        mp_obj_new_int(info.totalSize),
+        mp_obj_new_int(info.usedSize),
+    };
+    return mp_obj_new_tuple(2, tuple);
 }
 MP_DEFINE_CONST_FUN_OBJ_1(mp_vfs_stat_obj, mp_vfs_stat);
 
@@ -232,10 +233,11 @@ mp_obj_t mp_vfs_statvfs(mp_obj_t path_in) {
     int32_t ret = API_FS_GetFSInfo(path,&info);
     if(ret != 0)
         mp_raise_OSError(MP_EIO);
-    mp_obj_tuple_t *t = MP_OBJ_TO_PTR(mp_obj_new_tuple(10, NULL));
-    t->items[0] = mp_obj_new_int(info.totalSize);
-    t->items[1] = mp_obj_new_int(info.usedSize);
-    return MP_OBJ_FROM_PTR(t);
+    mp_obj_t tuple[2] = {
+        mp_obj_new_int(info.totalSize),
+        mp_obj_new_int(info.usedSize),
+    };
+    return mp_obj_new_tuple(2, tuple);
 }
 MP_DEFINE_CONST_FUN_OBJ_1(mp_vfs_statvfs_obj, mp_vfs_statvfs);
 

From b0260dfc515eb549bed3d360901c8a717cc8e380 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sun, 7 Apr 2019 22:21:04 +0200
Subject: [PATCH 3189/3533] Reset working dir on soft reset

---
 ports/gprs_a9/main.c   |  3 +++
 ports/gprs_a9/moduos.c |  7 ++++++-
 ports/gprs_a9/moduos.h | 31 +++++++++++++++++++++++++++++++
 3 files changed, 40 insertions(+), 1 deletion(-)
 create mode 100644 ports/gprs_a9/moduos.h

diff --git a/ports/gprs_a9/main.c b/ports/gprs_a9/main.c
index fca2f091d9416..9ea828bb6d1b6 100644
--- a/ports/gprs_a9/main.c
+++ b/ports/gprs_a9/main.c
@@ -52,6 +52,7 @@
 #include "time.h"
 #include "api_fs.h"
 
+#include "moduos.h"
 #include "mphalport.h"
 #include "mpconfigport.h"
 #include "modcellular.h"
@@ -207,6 +208,7 @@ void soft_reset(void) {
     mp_hal_stdout_tx_str("PYB: soft reboot\r\n");
     mp_hal_delay_us(10000); // allow UART to flush output
     mp_Init();
+    moduos_init0();
     modcellular_init0();
 }
 
@@ -218,6 +220,7 @@ void MicroPyTask(void *pData)
     Buffer_Init(&fifoBuffer, fifoBufferData, sizeof(fifoBufferData));
     UartInit();
     mp_Init();
+    moduos_init0();
     modcellular_init0();
     
     uint8_t reset;
diff --git a/ports/gprs_a9/moduos.c b/ports/gprs_a9/moduos.c
index 30518dbfd29ee..665c39b1a15d8 100644
--- a/ports/gprs_a9/moduos.c
+++ b/ports/gprs_a9/moduos.c
@@ -27,8 +27,9 @@
  * THE SOFTWARE.
  */
 
-#include <string.h>
+#include "moduos.h"
 
+#include <string.h>
 
 #include "py/objstr.h"
 #include "py/runtime.h"
@@ -44,6 +45,10 @@
 
 extern const mp_obj_type_t mp_fat_vfs_type;
 
+void moduos_init0() {
+    API_FS_ChangeDir("/");
+}
+
 STATIC const qstr os_uname_info_fields[] = {
     MP_QSTR_sysname, MP_QSTR_nodename,
     MP_QSTR_release, MP_QSTR_version, MP_QSTR_machine
diff --git a/ports/gprs_a9/moduos.h b/ports/gprs_a9/moduos.h
new file mode 100644
index 0000000000000..3f5e1d9c2d3a2
--- /dev/null
+++ b/ports/gprs_a9/moduos.h
@@ -0,0 +1,31 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * Development of the code in this file was sponsored by Microbric Pty Ltd
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2015 Paul Sokolovsky
+ * Copyright (c) 2016 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+void moduos_init0(void);
+

From 80032e70e8dd089ab734a9b704940afcfe153b4b Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sun, 7 Apr 2019 22:22:17 +0200
Subject: [PATCH 3190/3533] Rename modchip methods to include module name

---
 ports/gprs_a9/modchip.c | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/ports/gprs_a9/modchip.c b/ports/gprs_a9/modchip.c
index b09078988e7fa..8686007e306b8 100644
--- a/ports/gprs_a9/modchip.c
+++ b/ports/gprs_a9/modchip.c
@@ -37,7 +37,7 @@
 #include "api_hal_flash.h"
 
 
-STATIC mp_obj_t chip_flash_read(mp_obj_t offset_in, mp_obj_t buf_in) {
+STATIC mp_obj_t modchip_chip_flash_read(mp_obj_t offset_in, mp_obj_t buf_in) {
     mp_int_t offset = mp_obj_get_int(offset_in);
     mp_buffer_info_t bufinfo;
     mp_get_buffer_raise(buf_in, &bufinfo, MP_BUFFER_WRITE);
@@ -52,9 +52,9 @@ STATIC mp_obj_t chip_flash_read(mp_obj_t offset_in, mp_obj_t buf_in) {
     }
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(chip_flash_read_obj, chip_flash_read);
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(modchip_chip_flash_read_obj, modchip_chip_flash_read);
 
-STATIC mp_obj_t chip_flash_write(mp_obj_t offset_in, mp_obj_t buf_in) {
+STATIC mp_obj_t modchip_chip_flash_write(mp_obj_t offset_in, mp_obj_t buf_in) {
     mp_int_t offset = mp_obj_get_int(offset_in);
     mp_buffer_info_t bufinfo;
     mp_get_buffer_raise(buf_in, &bufinfo, MP_BUFFER_READ);
@@ -65,9 +65,9 @@ STATIC mp_obj_t chip_flash_write(mp_obj_t offset_in, mp_obj_t buf_in) {
     }
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(chip_flash_write_obj, chip_flash_write);
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(modchip_chip_flash_write_obj, modchip_chip_flash_write);
 
-STATIC mp_obj_t chip_flash_erase(mp_obj_t sector_in) {
+STATIC mp_obj_t modchip_chip_flash_erase(mp_obj_t sector_in) {
     mp_int_t sector = mp_obj_get_int(sector_in);
     bool ret = hal_SpiFlashErase(sector*4096,4096);
     Trace(1,"flash erase 0x%x, ret:%d",sector*4096,ret);
@@ -76,26 +76,26 @@ STATIC mp_obj_t chip_flash_erase(mp_obj_t sector_in) {
     }
     return mp_const_none;
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(chip_flash_erase_obj, chip_flash_erase);
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(modchip_chip_flash_erase_obj, modchip_chip_flash_erase);
 
-STATIC mp_obj_t chip_flash_size(void) {
+STATIC mp_obj_t modchip_chip_flash_size(void) {
     return mp_obj_new_int_from_uint(hal_SpiFlashGetSize());
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(chip_flash_size_obj, chip_flash_size);
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(modchip_chip_flash_size_obj, modchip_chip_flash_size);
 
-STATIC mp_obj_t chip_flash_user_start(void) {
+STATIC mp_obj_t modchip_chip_flash_user_start(void) {
     return MP_OBJ_NEW_SMALL_INT(0x390000);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(chip_flash_user_start_obj, chip_flash_user_start);
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(modchip_chip_flash_user_start_obj, modchip_chip_flash_user_start);
 
 STATIC const mp_rom_map_elem_t chip_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_chip) },
 
-    { MP_ROM_QSTR(MP_QSTR_flash_read), MP_ROM_PTR(&chip_flash_read_obj) },
-    { MP_ROM_QSTR(MP_QSTR_flash_write), MP_ROM_PTR(&chip_flash_write_obj) },
-    { MP_ROM_QSTR(MP_QSTR_flash_erase), MP_ROM_PTR(&chip_flash_erase_obj) },
-    { MP_ROM_QSTR(MP_QSTR_flash_size), MP_ROM_PTR(&chip_flash_size_obj) },
-    { MP_ROM_QSTR(MP_QSTR_flash_user_start), MP_ROM_PTR(&chip_flash_user_start_obj) },
+    { MP_ROM_QSTR(MP_QSTR_flash_read), MP_ROM_PTR(&modchip_chip_flash_read_obj) },
+    { MP_ROM_QSTR(MP_QSTR_flash_write), MP_ROM_PTR(&modchip_chip_flash_write_obj) },
+    { MP_ROM_QSTR(MP_QSTR_flash_erase), MP_ROM_PTR(&modchip_chip_flash_erase_obj) },
+    { MP_ROM_QSTR(MP_QSTR_flash_size), MP_ROM_PTR(&modchip_chip_flash_size_obj) },
+    { MP_ROM_QSTR(MP_QSTR_flash_user_start), MP_ROM_PTR(&modchip_chip_flash_user_start_obj) },
 };
 
 STATIC MP_DEFINE_CONST_DICT(chip_module_globals, chip_module_globals_table);

From 6ffbef3e0b8b026e19179ed0eb718b0859569fd3 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sun, 7 Apr 2019 22:22:33 +0200
Subject: [PATCH 3191/3533] Fix formatting

---
 ports/gprs_a9/modmachine.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/gprs_a9/modmachine.c b/ports/gprs_a9/modmachine.c
index a07108b12a4ef..33c3697fb714e 100644
--- a/ports/gprs_a9/modmachine.c
+++ b/ports/gprs_a9/modmachine.c
@@ -45,8 +45,8 @@
 
 Power_On_Cause_t powerOnCause = POWER_ON_CAUSE_MAX;
 
-    void notify_power_on(API_Event_t* event) {
-        powerOnCause = event->param1;
+void notify_power_on(API_Event_t* event) {
+    powerOnCause = event->param1;
 }
 
 // -------

From 1999175b5227f504bb44bd2b0b43d8e0b3b27f34 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sun, 7 Apr 2019 22:27:27 +0200
Subject: [PATCH 3192/3533] Add options to test

---
 ports/gprs_a9/frozentest.py | 118 ++++++++++++++++++++++++++++++++++--
 1 file changed, 114 insertions(+), 4 deletions(-)

diff --git a/ports/gprs_a9/frozentest.py b/ports/gprs_a9/frozentest.py
index b9b2876750556..f0d989dad9a0b 100644
--- a/ports/gprs_a9/frozentest.py
+++ b/ports/gprs_a9/frozentest.py
@@ -1,3 +1,11 @@
+# Tests sending SMS
+test_send_sms = None
+# test_send_sms = "8800"
+
+# Tests filesystem manipulations
+test_fs = False
+# test_fs = True
+
 print("================")
 print("std")
 print("================")
@@ -9,6 +17,109 @@
 for i in range(4):
     print(i)
 
+if test_fs:
+    print("================")
+    print("filesystem")
+    print("================")
+
+    import os
+
+    os.chdir("/")
+    cwd = os.getcwd()
+    print("CWD:", cwd)
+    assert cwd == "/"
+    nfiles = len(os.listdir())
+    print("Files:", nfiles)
+
+    test_file = "__test_file__"
+    test_contents = "abcDEF"
+    f = open(test_file, 'w')
+    f.write(test_contents)
+    f.close()
+    f = open(test_file, 'r')
+    data = f.read()
+    f.close()
+    print("Contents:", data)
+    assert data == test_contents
+
+    f = open(test_file, 'w')
+    f.write(test_contents[:-1])
+    f.close()
+    f = open(test_file, 'r')
+    data = f.read()
+    f.close()
+    print("Contents:", data)
+    assert data == test_contents[:-1]
+
+    os.remove(test_file)
+    _nfiles = len(os.listdir())
+    print("Files:", _nfiles)
+    assert nfiles == _nfiles
+
+    test_dir1 = "__temp_test_dir__"
+    os.mkdir(test_dir1)
+    os.chdir(test_dir1)
+    cwd = os.getcwd()
+    print("CWD:", cwd)
+    assert cwd == "/"+test_dir1
+
+    test_dir2 = "__temp_test_dir2__"
+    os.mkdir(test_dir2)
+    os.chdir(test_dir2)
+    cwd = os.getcwd()
+    print("CWD:", cwd)
+    assert cwd == "/"+test_dir1+"/"+test_dir2
+
+    ls = os.listdir()
+    print("Files:", ls)
+    assert len(ls) == 0
+
+    test_file = "__test_file__"
+    test_contents = "abcDEF"
+    f = open(test_file, 'w')
+    f.write(test_contents)
+    f.close()
+    ls = os.listdir()
+    print("Files:", ls)
+    assert len(ls) == 1
+    assert ls[0] == test_file
+
+    f = open(test_file, 'r')
+    data = f.read()
+    f.close()
+    print("Contents:", data)
+    assert data == test_contents
+
+    os.chdir("/")
+
+    f = open("/" + test_dir1 + "/" + test_dir2 + "/" + test_file, 'r')
+    data = f.read()
+    f.close()
+    print("Contents:", data)
+    assert data == test_contents
+
+    ls = os.listdir("/" + test_dir1)
+    print("Files:", ls)
+    assert len(ls) == 1
+    assert ls[0] == test_dir2
+
+    ls = os.listdir("/" + test_dir1 + "/" + test_dir2)
+    print("Files:", ls)
+    assert len(ls) == 1
+    assert ls[0] == test_file
+
+    os.remove("/" + test_dir1 + "/" + test_dir2 + "/" + test_file)
+    ls = os.listdir("/" + test_dir1 + "/" + test_dir2)
+    print("Files:", ls)
+    assert len(ls) == 0
+
+    os.rmdir("/" + test_dir1 + "/" + test_dir2)
+    ls = os.listdir("/" + test_dir1)
+    print("Files:", ls)
+    assert len(ls) == 0
+
+    os.rmdir("/" + test_dir1)
+
 print("================")
 print("GPS")
 print("================")
@@ -104,10 +215,9 @@
     for i in sms_list:
         assert isinstance(i, cel.SMS)
 
-    # A free LEBARA number to send SMS to
-    sms = cel.SMS("8800", "hello")
-    sms.send()
-    cel.poll_network_exception()
+    if test_send_sms is not None:
+        sms = cel.SMS(test_send_sms, "hello")
+        sms.send()
 
     print("----------------")
     print("GPRS")

From 05ca6d93a5881731ad6ec191f298c3c429cb69f4 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sun, 7 Apr 2019 22:36:20 +0200
Subject: [PATCH 3193/3533] Rename modmachine methods to include module name

---
 ports/gprs_a9/main.c       |  2 +-
 ports/gprs_a9/modmachine.c | 50 +++++++++++++++++++-------------------
 ports/gprs_a9/modmachine.h |  2 +-
 3 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/ports/gprs_a9/main.c b/ports/gprs_a9/main.c
index 9ea828bb6d1b6..d56f55194ad71 100644
--- a/ports/gprs_a9/main.c
+++ b/ports/gprs_a9/main.c
@@ -262,7 +262,7 @@ void EventDispatch(API_Event_t* pEvent)
     switch(pEvent->id)
     {
         case API_EVENT_ID_POWER_ON:
-            notify_power_on(pEvent);
+            modmachine_notify_power_on(pEvent);
             break;
 
         // Network
diff --git a/ports/gprs_a9/modmachine.c b/ports/gprs_a9/modmachine.c
index 33c3697fb714e..a038a1d008c27 100644
--- a/ports/gprs_a9/modmachine.c
+++ b/ports/gprs_a9/modmachine.c
@@ -45,7 +45,7 @@
 
 Power_On_Cause_t powerOnCause = POWER_ON_CAUSE_MAX;
 
-void notify_power_on(API_Event_t* event) {
+void modmachine_notify_power_on(API_Event_t* event) {
     powerOnCause = event->param1;
 }
 
@@ -53,7 +53,7 @@ void notify_power_on(API_Event_t* event) {
 // Methods
 // -------
 
-STATIC mp_obj_t reset(void) {
+STATIC mp_obj_t modmachine_reset(void) {
     // ========================================
     // Resets the module.
     // ========================================
@@ -61,9 +61,9 @@ STATIC mp_obj_t reset(void) {
     return mp_const_none;
 }
 
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(reset_obj, reset);
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(modmachine_reset_obj, modmachine_reset);
 
-STATIC mp_obj_t idle(void) {
+STATIC mp_obj_t modmachine_idle(void) {
     // ========================================
     // Puts the module into low-power mode.
     // The execution continues.
@@ -72,9 +72,9 @@ STATIC mp_obj_t idle(void) {
     return mp_const_none;
 }
 
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(idle_obj, idle);
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(modmachine_idle_obj, modmachine_idle);
 
-STATIC mp_obj_t power_on_cause(void) {
+STATIC mp_obj_t modmachine_power_on_cause(void) {
     // ========================================
     // Retrieves the last reason for the power on.
     // Returns:
@@ -105,9 +105,9 @@ STATIC mp_obj_t power_on_cause(void) {
     }
 }
 
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(power_on_cause_obj, power_on_cause);
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(modmachine_power_on_cause_obj, modmachine_power_on_cause);
 
-STATIC mp_obj_t off(void) {
+STATIC mp_obj_t modmachine_off(void) {
     // ========================================
     // Turns off the module.
     // ========================================
@@ -115,9 +115,9 @@ STATIC mp_obj_t off(void) {
     return mp_const_none;
 }
 
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(off_obj, off);
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(modmachine_off_obj, modmachine_off);
 
-STATIC mp_obj_t get_input_voltage(void) {
+STATIC mp_obj_t modmachine_get_input_voltage(void) {
     // ========================================
     // Retrieves the input voltage and the
     // estimated battery capacity in percents.
@@ -134,9 +134,9 @@ STATIC mp_obj_t get_input_voltage(void) {
     return mp_obj_new_tuple(2, tuple);
 }
 
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(get_input_voltage_obj, get_input_voltage);
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(modmachine_get_input_voltage_obj, modmachine_get_input_voltage);
 
-STATIC mp_obj_t watchdog_on(mp_obj_t timeout) {
+STATIC mp_obj_t modmachine_watchdog_on(mp_obj_t timeout) {
     // ========================================
     // Arms the hardware watchdog.
     // Args:
@@ -146,9 +146,9 @@ STATIC mp_obj_t watchdog_on(mp_obj_t timeout) {
     return mp_const_none;
 }
 
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(watchdog_on_obj, watchdog_on);
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(modmachine_watchdog_on_obj, modmachine_watchdog_on);
 
-STATIC mp_obj_t watchdog_off(void) {
+STATIC mp_obj_t modmachine_watchdog_off(void) {
     // ========================================
     // Disarms the hardware watchdog.
     // ========================================
@@ -156,9 +156,9 @@ STATIC mp_obj_t watchdog_off(void) {
     return mp_const_none;
 }
 
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(watchdog_off_obj, watchdog_off);
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(modmachine_watchdog_off_obj, modmachine_watchdog_off);
 
-STATIC mp_obj_t watchdog_reset(void) {
+STATIC mp_obj_t modmachine_watchdog_reset(void) {
     // ========================================
     // Resets the watchdog timeout.
     // ========================================
@@ -166,19 +166,19 @@ STATIC mp_obj_t watchdog_reset(void) {
     return mp_const_none;
 }
 
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(watchdog_reset_obj, watchdog_reset);
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(modmachine_watchdog_reset_obj, modmachine_watchdog_reset);
 
 STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_umachine) },
     { MP_ROM_QSTR(MP_QSTR_Pin), MP_ROM_PTR(&machine_pin_type) },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_reset), (mp_obj_t)&reset_obj },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_idle), (mp_obj_t)&idle_obj },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_power_on_cause), (mp_obj_t)&power_on_cause_obj },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_off), (mp_obj_t)&off_obj },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_get_input_voltage), (mp_obj_t)&get_input_voltage_obj },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_watchdog_on), (mp_obj_t)&watchdog_on_obj },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_watchdog_off), (mp_obj_t)&watchdog_off_obj },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_watchdog_reset), (mp_obj_t)&watchdog_reset_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_reset), (mp_obj_t)&modmachine_reset_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_idle), (mp_obj_t)&modmachine_idle_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_power_on_cause), (mp_obj_t)&modmachine_power_on_cause_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_off), (mp_obj_t)&modmachine_off_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_get_input_voltage), (mp_obj_t)&modmachine_get_input_voltage_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_watchdog_on), (mp_obj_t)&modmachine_watchdog_on_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_watchdog_off), (mp_obj_t)&modmachine_watchdog_off_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_watchdog_reset), (mp_obj_t)&modmachine_watchdog_reset_obj },
 
     // Reset reasons
     { MP_ROM_QSTR(MP_QSTR_POWER_ON_CAUSE_KEY),       MP_ROM_INT(POWER_ON_CAUSE_KEY) },
diff --git a/ports/gprs_a9/modmachine.h b/ports/gprs_a9/modmachine.h
index 2347587a796f8..76cf4088b143e 100644
--- a/ports/gprs_a9/modmachine.h
+++ b/ports/gprs_a9/modmachine.h
@@ -36,7 +36,7 @@
 extern const mp_obj_type_t machine_pin_type;
 extern Power_On_Cause_t powerOnCause;
 
-void notify_power_on(API_Event_t* event);
+void modmachine_notify_power_on(API_Event_t* event);
 
 #endif
 

From 4621b3d75c9b71fb94b6fd58cc83b2354e022766 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Mon, 8 Apr 2019 22:13:58 +0200
Subject: [PATCH 3194/3533] Add machine test

---
 ports/gprs_a9/frozentest.py | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/ports/gprs_a9/frozentest.py b/ports/gprs_a9/frozentest.py
index f0d989dad9a0b..0c3c729115aa7 100644
--- a/ports/gprs_a9/frozentest.py
+++ b/ports/gprs_a9/frozentest.py
@@ -274,3 +274,23 @@
     cel.gprs_deactivate()
     cel.gprs_detach()
 
+print("================")
+print("machine")
+print("================")
+
+import machine
+
+machine.idle()
+
+cause = machine.power_on_cause()
+print("Power on cause:", cause)
+
+v, percent = machine.get_input_voltage()
+print("Voltage:", 1e-3 * v, percent, "%")
+assert 3 < 1e-3 * v < 5
+assert 10 < percent < 100
+
+print("Resetting ...")
+machine.reset()
+raise RuntimeError("Failed to reset the module")
+

From b00089fd063426653e6fd4503b80931c8cc0aa71 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Wed, 10 Apr 2019 22:45:01 +0200
Subject: [PATCH 3195/3533] Rework startup and reset

---
 ports/gprs_a9/main.c | 102 ++++++++++---------------------------------
 1 file changed, 24 insertions(+), 78 deletions(-)

diff --git a/ports/gprs_a9/main.c b/ports/gprs_a9/main.c
index d56f55194ad71..8e48d22eb1edc 100644
--- a/ports/gprs_a9/main.c
+++ b/ports/gprs_a9/main.c
@@ -131,65 +131,27 @@ void MP_WEAK __assert_func(const char *file, int line, const char *func, const c
 }
 #endif
 
-void ShowStackInfo()
-{
-    OS_Task_Info_t info;
-    OS_GetTaskInfo(microPyTaskHandle,&info);
-    volatile uint32_t j = 0;
-    uint32_t last_bytes = (uint32_t)&j - info.stackTop;
-    uint32_t all_bytes  = info.stackSize*4;
-    char msg[32];
-    snprintf(msg, sizeof(msg), "Stack used: %d/%d\r\n", all_bytes - last_bytes, all_bytes);
-    mp_hal_stdout_tx_str(msg);
-
-    API_FS_INFO fsInfo;
-    if (API_FS_GetFSInfo(FS_DEVICE_NAME_FLASH, &fsInfo) != 0) {
-        mp_hal_stdout_tx_str("No flash info!\r\n");
-    } else {
-        snprintf(msg, sizeof(msg), "Flash used: %d/%d\r\n", (int)fsInfo.usedSize, (int)fsInfo.totalSize);
-        mp_hal_stdout_tx_str(msg);
-        
-        mp_hal_stdout_tx_str("Files:\r\n");
-        Dir_t* dir = API_FS_OpenDir("/");
-        Dirent_t* dirent;
-        while ((dirent = API_FS_ReadDir(dir))) {
-
-            snprintf(msg, sizeof(msg), "/%s", dirent->d_name);
-
-            mp_hal_stdout_tx_str(" ");
-            mp_hal_stdout_tx_str(msg);
-            mp_hal_stdout_tx_str(" ");
-
-            int32_t fd;
-
-            if ((fd = API_FS_Open(msg, FS_O_RDONLY, 0)) < 0) {
-                snprintf(msg, sizeof(msg), "[FAIL: %d]\r\n", fd);
-                mp_hal_stdout_tx_str(msg);
-            } else {
-                snprintf(msg, sizeof(msg), "%d\r\n", (int)API_FS_GetFileSize(fd));
-                API_FS_Close(fd);
-                mp_hal_stdout_tx_str(msg);
-            }
-        }
-        API_FS_CloseDir(dir);
-    }
-}
+void MicroPyTask(void *pData) {
+    // The primary event-driven UART loop
 
-bool mp_Init()
-{   
-    //stack check info
     OS_Task_Info_t info;
     OS_GetTaskInfo(microPyTaskHandle, &info);
-    mp_stack_ctrl_init();
-    mp_stack_set_top((void *)(info.stackTop+info.stackSize*4));
-    mp_stack_set_limit(MICROPYTHON_TASK_STACK_SIZE*4 - 1024);
-    ShowStackInfo();
+    MicroPy_Event_t* event;
+    Buffer_Init(&fifoBuffer, fifoBufferData, sizeof(fifoBufferData));
+    UartInit();
 
+soft_reset:
+    mp_stack_ctrl_init();
+    mp_stack_set_top((void *)(info.stackTop + info.stackSize * 4));
+    mp_stack_set_limit(MICROPYTHON_TASK_STACK_SIZE * 4 - 1024);
+    // TODO: gc_init(?, ?);
     mp_init();
+    moduos_init0();
+    modcellular_init0();
 
     // Startup scripts
-    int file_descriptor;
     pyexec_frozen_module("_boot.py");
+    int file_descriptor;
     if ((file_descriptor = API_FS_Open("boot.py", FS_O_RDONLY, 0)) > 0) {
         API_FS_Close(file_descriptor);
         pyexec_file("boot.py");
@@ -198,34 +160,13 @@ bool mp_Init()
         API_FS_Close(file_descriptor);
         pyexec_file("main.py");
     }
-
+    // pyexec_file("boot.py");
+    // if (pyexec_mode_kind == PYEXEC_MODE_FRIENDLY_REPL) {
+    //     pyexec_file("main.py");
+    // }
     pyexec_event_repl_init();
-    return true;
-}
-
-
-void soft_reset(void) {
-    mp_hal_stdout_tx_str("PYB: soft reboot\r\n");
-    mp_hal_delay_us(10000); // allow UART to flush output
-    mp_Init();
-    moduos_init0();
-    modcellular_init0();
-}
-
-
-void MicroPyTask(void *pData)
-{
-    MicroPy_Event_t* event;
-
-    Buffer_Init(&fifoBuffer, fifoBufferData, sizeof(fifoBufferData));
-    UartInit();
-    mp_Init();
-    moduos_init0();
-    modcellular_init0();
     
-    uint8_t reset;
-soft_reset:
-    reset = 0;
+    uint8_t reset = 0;
     while (1) if (OS_WaitEvent(microPyTaskHandle, (void**)&event, OS_TIME_OUT_WAIT_FOREVER)) {
 
         Trace(1,"microPy task received event:%d",event->id);
@@ -252,7 +193,12 @@ void MicroPyTask(void *pData)
         if (reset) break;
         // PM_SetSysMinFreq(PM_SYS_FREQ_32K);
     }
-    soft_reset();
+
+    // TODO: gc_sweep_all();
+    mp_deinit();
+    mp_hal_stdout_tx_str("PYB: soft reboot\r\n");
+    mp_hal_delay_us(10000); // allow UART to flush output
+
     goto soft_reset;
 }
 

From 884ce59e0f52a48d8f0dd42d53fd03cdc838f42b Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Wed, 10 Apr 2019 22:53:17 +0200
Subject: [PATCH 3196/3533] Adjust help message

---
 ports/gprs_a9/help.c | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/ports/gprs_a9/help.c b/ports/gprs_a9/help.c
index 7da2ea7c7c045..101e311f4946e 100644
--- a/ports/gprs_a9/help.c
+++ b/ports/gprs_a9/help.c
@@ -36,7 +36,7 @@ const char gprs_a9_help_text[] =
 "For access to the hardware use the 'machine' module:\n"
 "\n"
 "import machine\n"
-"led = machine.Pin(27, machine.Pin.OUT,0)\n"
+"led = machine.Pin(27, machine.Pin.OUT, 0)\n"
 "led.value(1)\n"
 "pin25 = machine.Pin(25, machine.Pin.IN, machine.Pin.PULL_UP)\n"
 "print(pin25.value())\n"
@@ -47,10 +47,16 @@ const char gprs_a9_help_text[] =
 "\n"
 "Basic GPRS configuration:\n"
 "\n"
-"import network\n"
-"gprs = network.GPRS();\n"
-"gprs.attach()\n"
-"gprs.activate(\"cmnet\",\"\",\"\")\n"
+"import cellular\n"
+"cellular.attach()\n"
+"cellular.activate(\"access_point\",\"user\",\"password\")\n"
+"\n"
+"Sockets:\n"
+"import usocket\n"
+"s = usocket.socket()\n"
+"s.connect((\"httpstat.us\", 80))\n"
+"s.send(\"GET / HTTP/1.1\\r\\nHost: httpstat.us\\r\\nConnection: close\\r\\n\\r\\n\")\n"
+"print(s.recv(16))\n"
 "\n"
 "Control commands:\n"
 "  CTRL-A        -- on a blank line, enter raw REPL mode\n"

From b8a7aae583875d2800d0a5b25a23c92ca649d296 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Wed, 10 Apr 2019 23:51:24 +0200
Subject: [PATCH 3197/3533] Add a stub with all methods to implement

---
 ports/gprs_a9/README.md    |  14 +++
 ports/gprs_a9/modusocket.c | 239 ++++++++++++++++++++++++++++++++++++-
 2 files changed, 252 insertions(+), 1 deletion(-)

diff --git a/ports/gprs_a9/README.md b/ports/gprs_a9/README.md
index 74df74a662638..6544a277dc85b 100644
--- a/ports/gprs_a9/README.md
+++ b/ports/gprs_a9/README.md
@@ -197,9 +197,23 @@ See [micropython docs](https://docs.micropython.org/en/latest/library/usocket.ht
 * `socket(af, type, proto)`
 
     * `close()`
+    * `bind(address)` *not implemented*
+    * `listen([backlog])` *not implemented*
+    * `accept()` *not implemented*
     * `connect(address)`
     * `send(bytes)`
+    * `sendall(bytes)` *not implemented*
     * `recv(bufsize)`
+    * `sendto(bytes, address)` *not implemented*
+    * `recvfrom(bufsize)` *not implemented*
+    * `setsockopt(level, optname, value)` *not implemented*
+    * `settimeout(value)` *not implemented*
+    * `setblocking(flag)` *not implemented*
+    * `makefile(mode, buffering)` *not implemented*
+    * `read([size])` *not implemented*
+    * `readinto(buf[, nbytes])` *not implemented*
+    * `readline()` *not implemented*
+    * `write(buf)` *not implemented*
 
 #### Methods ####
 
diff --git a/ports/gprs_a9/modusocket.c b/ports/gprs_a9/modusocket.c
index fbfcd5753db4c..e510b0df2d105 100644
--- a/ports/gprs_a9/modusocket.c
+++ b/ports/gprs_a9/modusocket.c
@@ -198,6 +198,41 @@ STATIC mp_obj_t socket_close(mp_obj_t self_in) {
 
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(socket_close_obj, &socket_close);
 
+STATIC mp_obj_t socket_bind(mp_obj_t self_in, mp_obj_t address) {
+    // ========================================
+    // Binds the socket.
+    // Args:
+    //     address (tuple): address to bind to;
+    // ========================================
+    mp_raise_NotImplementedError("Server capabilities are not implemented yet");
+    return mp_const_none;
+}
+
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(socket_bind_obj, &socket_bind);
+
+STATIC mp_obj_t socket_listen(size_t n_args, const mp_obj_t *args) {
+    // ========================================
+    // Sets the socket to listen for incoming connections.
+    // Args:
+    //     backlog (int): the number of unaccepted connections
+    //     that the system will allow before refusing new connections.
+    // ========================================
+    mp_raise_NotImplementedError("Server capabilities are not implemented yet");
+    return mp_const_none;
+}
+
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(socket_listen_obj, 1, 2, &socket_listen);
+
+STATIC mp_obj_t socket_accept(mp_obj_t self_in) {
+    // ========================================
+    // Accepts the connection.
+    // ========================================
+    mp_raise_NotImplementedError("Server capabilities are not implemented yet");
+    return mp_const_none;
+}
+
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(socket_accept_obj, &socket_accept);
+
 STATIC mp_obj_t socket_connect(mp_obj_t self_in, mp_obj_t ipv4) {
     // ========================================
     // Connects.
@@ -255,6 +290,18 @@ STATIC mp_obj_t socket_send(mp_obj_t self_in, mp_obj_t bytes) {
 
 STATIC MP_DEFINE_CONST_FUN_OBJ_2(socket_send_obj, &socket_send);
 
+STATIC mp_obj_t socket_sendall(mp_obj_t self_in, mp_obj_t bytes) {
+    // ========================================
+    // Sends all bytes chunk by chunk.
+    // Args:
+    //     bytes (str, bytearray): bytes to send;
+    // ========================================
+    mp_raise_NotImplementedError("Not implemented yet");
+    return mp_const_none;
+}
+
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(socket_sendall_obj, &socket_sendall);
+
 // XXX this can end up waiting a very long time if the content is dribbled in one character
 // at a time, as the timeout resets each time a recvfrom succeeds ... this is probably not
 // good behaviour.
@@ -308,7 +355,7 @@ mp_obj_t _socket_recvfrom(mp_obj_t self_in, mp_obj_t len_in,
 
 STATIC mp_obj_t socket_recv(mp_obj_t self_in, mp_obj_t bufsize) {
     // ========================================
-    // Sends bytes.
+    // Receives bytes.
     // Args:
     //     bufsize (int): output array size;
     // ========================================
@@ -317,11 +364,149 @@ STATIC mp_obj_t socket_recv(mp_obj_t self_in, mp_obj_t bufsize) {
 
 STATIC MP_DEFINE_CONST_FUN_OBJ_2(socket_recv_obj, &socket_recv);
 
+STATIC mp_obj_t socket_sendto(mp_obj_t self_in, mp_obj_t bytes, mp_obj_t address) {
+    // ========================================
+    // Connects and sends bytes.
+    // Args:
+    //     bytes (str, byterray): bytes to send;
+    //     address (tuple): destination address;
+    // ========================================
+    mp_raise_NotImplementedError("Not implemented yet");
+    return mp_const_none;
+}
+
+STATIC MP_DEFINE_CONST_FUN_OBJ_3(socket_sendto_obj, &socket_sendto);
+
+STATIC mp_obj_t socket_recvfrom(mp_obj_t self_in, mp_obj_t bufsize) {
+    // ========================================
+    // Receives bytes.
+    // Args:
+    //     bufsize (int): output array size;
+    // ========================================
+    mp_raise_NotImplementedError("Not implemented yet");
+    return mp_const_none;
+}
+
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(socket_recvfrom_obj, &socket_recvfrom);
+
+STATIC mp_obj_t socket_setsockopt(size_t n_args, const mp_obj_t *args) {
+    // ========================================
+    // Sets socket options.
+    // Args:
+    //     level (int): option level;
+    //     optname (int): option to set;
+    //     value (int): value to set;
+    // ========================================
+    mp_raise_NotImplementedError("Not implemented yet");
+    return mp_const_none;
+}
+
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(socket_setsockopt_obj, 4, 4, &socket_setsockopt);
+
+STATIC mp_obj_t socket_settimeout(mp_obj_t self_in, mp_obj_t value) {
+    // ========================================
+    // Sets the timeout for socket operations.
+    // Args:
+    //     timeout (int): timeout in seconds;
+    // ========================================
+    mp_raise_NotImplementedError("Not implemented yet");
+    return mp_const_none;
+}
+
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(socket_settimeout_obj, &socket_settimeout);
+
+STATIC mp_obj_t socket_setblocking(mp_obj_t self_in, mp_obj_t flag) {
+    // ========================================
+    // Sets blocking or non-blocking socket mode.
+    // Args:
+    //     flag (bool): blocking or non-blocking mode;
+    // ========================================
+    mp_raise_NotImplementedError("Not implemented yet");
+    return mp_const_none;
+}
+
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(socket_setblocking_obj, &socket_setblocking);
+
+STATIC mp_obj_t socket_makefile(size_t n_args, const mp_obj_t *args) {
+    // ========================================
+    // Returns a file object associated with the socket.
+    // Args:
+    //     mode (str): file mode;
+    //     buffering (int): buffer size (not supported);
+    // ========================================
+    mp_raise_NotImplementedError("Not implemented yet");
+    return mp_const_none;
+}
+
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(socket_makefile_obj, 1, 3, socket_makefile);
+
+STATIC mp_obj_t socket_read(size_t n_args, const mp_obj_t *args) {
+    // ========================================
+    // Reads data from the socket up to `size` or until EOF.
+    // Args:
+    //     size (int): the size of the data to read;
+    // ========================================
+    mp_raise_NotImplementedError("Not implemented yet");
+    return mp_const_none;
+}
+
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(socket_read_obj, 1, 2, socket_read);
+
+STATIC mp_obj_t socket_readinto(size_t n_args, const mp_obj_t *args) {
+    // ========================================
+    // Reads data from the socket into the buffer up to `size` or until EOF.
+    // Args:
+    //     buf (bytearray): the buffer to write into;
+    //     size (int): the size of the data to read;
+    // ========================================
+    mp_raise_NotImplementedError("Not implemented yet");
+    return mp_const_none;
+}
+
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(socket_readinto_obj, 2, 3, socket_readinto);
+
+STATIC mp_obj_t socket_readline(mp_obj_t self_in) {
+    // ========================================
+    // Reads a line of text.
+    // ========================================
+    mp_raise_NotImplementedError("Not implemented yet");
+    return mp_const_none;
+}
+
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(socket_readline_obj, &socket_readline);
+
+STATIC mp_obj_t socket_write(mp_obj_t self_in, mp_obj_t buf) {
+    // ========================================
+    // Writes all data into the socket.
+    // Args:
+    //     buf (bytearray, str): data to write;
+    // ========================================
+    mp_raise_NotImplementedError("Not implemented yet");
+    return mp_const_none;
+}
+
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(socket_write_obj, &socket_write);
+
 STATIC const mp_rom_map_elem_t socket_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_close), MP_ROM_PTR(&socket_close_obj) },
+    { MP_ROM_QSTR(MP_QSTR_bind), MP_ROM_PTR(&socket_bind_obj) },
+    { MP_ROM_QSTR(MP_QSTR_listen), MP_ROM_PTR(&socket_listen_obj) },
+    { MP_ROM_QSTR(MP_QSTR_accept), MP_ROM_PTR(&socket_accept_obj) },
     { MP_ROM_QSTR(MP_QSTR_connect), MP_ROM_PTR(&socket_connect_obj) },
     { MP_ROM_QSTR(MP_QSTR_send), MP_ROM_PTR(&socket_send_obj) },
+    { MP_ROM_QSTR(MP_QSTR_sendall), MP_ROM_PTR(&socket_sendall_obj) },
     { MP_ROM_QSTR(MP_QSTR_recv), MP_ROM_PTR(&socket_recv_obj) },
+    { MP_ROM_QSTR(MP_QSTR_sendto), MP_ROM_PTR(&socket_sendto_obj) },
+    { MP_ROM_QSTR(MP_QSTR_recvfrom), MP_ROM_PTR(&socket_recvfrom_obj) },
+    { MP_ROM_QSTR(MP_QSTR_setsockopt), MP_ROM_PTR(&socket_setsockopt_obj) },
+    { MP_ROM_QSTR(MP_QSTR_settimeout), MP_ROM_PTR(&socket_settimeout_obj) },
+    { MP_ROM_QSTR(MP_QSTR_setblocking), MP_ROM_PTR(&socket_setblocking_obj) },
+    { MP_ROM_QSTR(MP_QSTR_makefile), MP_ROM_PTR(&socket_makefile_obj) },
+
+    { MP_ROM_QSTR(MP_QSTR_read), MP_ROM_PTR(&socket_read_obj) },
+    { MP_ROM_QSTR(MP_QSTR_readinto), MP_ROM_PTR(&socket_readinto_obj) },
+    { MP_ROM_QSTR(MP_QSTR_readline), MP_ROM_PTR(&socket_readline_obj) },
+    { MP_ROM_QSTR(MP_QSTR_write), MP_ROM_PTR(&socket_write_obj) },
 };
 
 STATIC MP_DEFINE_CONST_DICT(socket_locals_dict, socket_locals_dict_table);
@@ -377,6 +562,55 @@ STATIC mp_obj_t dns_resolve(mp_obj_t name) {
 
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(dns_resolve_obj, dns_resolve);
 
+STATIC mp_obj_t getaddrinfo(size_t n_args, const mp_obj_t *args) {
+    // ========================================
+    // Translates host/port into arguments to socket constructor.
+    // Args:
+    //     host (str): the host name;
+    //     port (int): port number;
+    //     af (int): address family: AF_INET or AF_INET6;
+    //     type: (int): future socket type: SOCK_STREAM or SOCK_DGRAM;
+    //     proto (int): future protocol: IPPROTO_TCP or IPPROTO_UDP;
+    //     flag (int): additional socket flags;
+    // Returns:
+    //     A 5-tuple with arguments to `usocket.socket`.
+    // ========================================
+    mp_raise_NotImplementedError("Not implemented yet");
+    return mp_const_none;
+}
+
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(getaddrinfo_obj, 2, 6, getaddrinfo);
+
+STATIC mp_obj_t modusocket_inet_ntop(mp_obj_t af, mp_obj_t bin_addr) {
+    // ========================================
+    // Converts a binary address into textual representation.
+    // Args:
+    //     af (int): address family: AF_INET or AF_INET6;
+    //     bin_addr (bytearray): binary address;
+    // Returns:
+    //     A string with the address.
+    // ========================================
+    mp_raise_NotImplementedError("Not implemented yet");
+    return mp_const_none;
+}
+
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(modusocket_inet_ntop_obj, modusocket_inet_ntop);
+
+STATIC mp_obj_t modusocket_inet_pton(mp_obj_t af, mp_obj_t txt_addr) {
+    // ========================================
+    // Converts a text address into binary representation.
+    // Args:
+    //     af (int): address family: AF_INET or AF_INET6;
+    //     txt_addr (str): address as text;
+    // Returns:
+    //     A bytearray address.
+    // ========================================
+    mp_raise_NotImplementedError("Not implemented yet");
+    return mp_const_none;
+}
+
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(modusocket_inet_pton_obj, modusocket_inet_pton);
+
 STATIC const mp_map_elem_t mp_module_usocket_globals_table[] = {
     { MP_OBJ_NEW_QSTR(MP_QSTR___name__), MP_OBJ_NEW_QSTR(MP_QSTR_usocket) },
 
@@ -384,6 +618,9 @@ STATIC const mp_map_elem_t mp_module_usocket_globals_table[] = {
 
     { MP_OBJ_NEW_QSTR(MP_QSTR_get_local_ip), (mp_obj_t)&get_local_ip_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_dns_resolve), (mp_obj_t)&dns_resolve_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_getaddrinfo), (mp_obj_t)&getaddrinfo_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_inet_ntop), (mp_obj_t)&modusocket_inet_ntop },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_inet_pton), (mp_obj_t)&modusocket_inet_pton },
 };
 
 STATIC MP_DEFINE_CONST_DICT(mp_module_usocket_globals, mp_module_usocket_globals_table);

From 873a74678689fc5ec3823093c4e553f57047c7cf Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sat, 20 Apr 2019 23:06:13 +0200
Subject: [PATCH 3198/3533] Remove DNS resolve

---
 ports/gprs_a9/modusocket.c | 25 -------------------------
 1 file changed, 25 deletions(-)

diff --git a/ports/gprs_a9/modusocket.c b/ports/gprs_a9/modusocket.c
index e510b0df2d105..4ff82306d8b0d 100644
--- a/ports/gprs_a9/modusocket.c
+++ b/ports/gprs_a9/modusocket.c
@@ -538,30 +538,6 @@ STATIC mp_obj_t get_local_ip(void) {
 
 STATIC MP_DEFINE_CONST_FUN_OBJ_0(get_local_ip_obj, get_local_ip);
 
-STATIC mp_obj_t dns_resolve(mp_obj_t name) {
-    // ========================================
-    // Resolve a domain name.
-    // Args:
-    //     name (str): the domain name;
-    // Returns:
-    //     A string with an IP address the name belongs to.
-    // ========================================
-    const char* c_name = mp_obj_str_get_str(name);
-    char ip[16];
-    uint8_t status;
-
-    if ((status = DNS_GetHostByName2((uint8_t*)c_name, (uint8_t*)ip)) != 0) {
-        char msg[64];
-        snprintf(msg, sizeof(msg), "Failed to resolve domain name: error=%d", status);
-        mp_raise_ValueError(msg);
-        return mp_const_none;
-    }
-
-    return mp_obj_new_str(ip, strlen(ip));
-}
-
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(dns_resolve_obj, dns_resolve);
-
 STATIC mp_obj_t getaddrinfo(size_t n_args, const mp_obj_t *args) {
     // ========================================
     // Translates host/port into arguments to socket constructor.
@@ -617,7 +593,6 @@ STATIC const mp_map_elem_t mp_module_usocket_globals_table[] = {
     { MP_OBJ_NEW_QSTR(MP_QSTR_socket), (mp_obj_t)MP_ROM_PTR(&socket_type) },
 
     { MP_OBJ_NEW_QSTR(MP_QSTR_get_local_ip), (mp_obj_t)&get_local_ip_obj },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_dns_resolve), (mp_obj_t)&dns_resolve_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_getaddrinfo), (mp_obj_t)&getaddrinfo_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_inet_ntop), (mp_obj_t)&modusocket_inet_ntop },
     { MP_OBJ_NEW_QSTR(MP_QSTR_inet_pton), (mp_obj_t)&modusocket_inet_pton },

From 241f94b646dfbeaac5ddf34f45ba1d4a93ec3c81 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sun, 21 Apr 2019 00:57:46 +0200
Subject: [PATCH 3199/3533] Implement socket file IO

---
 ports/gprs_a9/README.md     |  57 +++++++++--
 ports/gprs_a9/frozentest.py |  40 ++++----
 ports/gprs_a9/modusocket.c  | 183 +++++++++++++++++++++---------------
 ports/gprs_a9/modusocket.h  |  68 ++++++++++++++
 4 files changed, 246 insertions(+), 102 deletions(-)
 create mode 100644 ports/gprs_a9/modusocket.h

diff --git a/ports/gprs_a9/README.md b/ports/gprs_a9/README.md
index 6544a277dc85b..f5ab614680933 100644
--- a/ports/gprs_a9/README.md
+++ b/ports/gprs_a9/README.md
@@ -210,10 +210,10 @@ See [micropython docs](https://docs.micropython.org/en/latest/library/usocket.ht
     * `settimeout(value)` *not implemented*
     * `setblocking(flag)` *not implemented*
     * `makefile(mode, buffering)` *not implemented*
-    * `read([size])` *not implemented*
-    * `readinto(buf[, nbytes])` *not implemented*
-    * `readline()` *not implemented*
-    * `write(buf)` *not implemented*
+    * `read([size])`
+    * `readinto(buf[, nbytes])`
+    * `readline()`
+    * `write(buf)`
 
 #### Methods ####
 
@@ -225,13 +225,54 @@ See [micropython docs](https://docs.micropython.org/en/latest/library/usocket.ht
 
   **Raises**: `NetworkError` if no address was assigned.
 
-* `dns_resolve(name)`
+* `getaddrinfo(host, port, af=0, type=0, proto=0, flags=0)`
 
-  Resolves the domain name.
+  *Not implemented*
 
-  **Returns**: The IP address the domain name belongs to as a string.
+  Translates host/port into arguments to socket constructor.
 
-  **Raises**: `NetworkError` if failed to resolve.
+  **Args**:
+
+    * host (str): host name;
+    * port (int): port number;
+    * af (int): address family: `AF_INET` or `AF_INET6`;
+    * type: (int): future socket type: `SOCK_STREAM` or `SOCK_DGRAM`;
+    * proto (int): future protocol: `IPPROTO_TCP` or `IPPROTO_UDP`;
+    * flag (int): additional socket flags;
+
+  **Returns**: a tuple with arguments.
+
+* `inet_ntop(af, bin_addr)`
+
+  *Not implemented*
+
+  Converts a binary address into textual representation.
+
+  **Args**:
+  
+    * af (int): address family: `AF_INET` or `AF_INET6`;
+    * bin_addr (bytearray): binary address;
+
+  **Returns**: a string with the address.
+
+* `inet_pton(af, txt_addr)`
+
+  *Not implemented*
+
+  Converts a text address into binary representation.
+
+  **Args**:
+
+    * af (int): address family: `AF_INET` or `AF_INET6`;
+    * txt_addr (str): address as text;
+
+  **Returns**: a bytearray address.
+
+* `get_num_open()`
+
+  Retrieves the number of open sockets.
+
+  **Returns**: The number of open sockets.
 
 ### `gps`
 
diff --git a/ports/gprs_a9/frozentest.py b/ports/gprs_a9/frozentest.py
index 0c3c729115aa7..f23f023d75675 100644
--- a/ports/gprs_a9/frozentest.py
+++ b/ports/gprs_a9/frozentest.py
@@ -156,7 +156,7 @@
 del gps
 
 print("================")
-print("Network status")
+print("Network")
 print("================")
 
 import cellular as cel
@@ -241,35 +241,39 @@
     print("Local IP:", loc_ip)
     assert len(loc_ip.split(".")) == 4
 
+    assert sock.get_num_open() == 0
+
     host = "httpstat.us"
-    host_ip = sock.dns_resolve(host)
-    print("Resolved:", host, "->", host_ip)
-    assert len(host_ip.split(".")) == 4
 
     s = sock.socket()
     s.connect((host, 80))
+    assert sock.get_num_open() == 1
+
     message = "GET /200 HTTP/1.1\r\nHost: {}\r\nConnection: close\r\n\r\n"
-    response_expected = b"HTTP/1.1 200 OK"
+    response_expected = b"HTTP/1.1 200 OK\r\n"
     message_f = message.format(host)
-    bytes_sent = s.send(message_f)
-    print("Socket(name) sent:", bytes_sent)
+    bytes_sent = s.send(message_f[:10])
+    bytes_sent += s.write(message_f[10:])
+    print("Socket sent:", bytes_sent)
     assert bytes_sent == len(message_f)
 
-    response = s.recv(len(response_expected))
-    print("Socket(name) rcvd:", response)
+    # Chunk 1: recv
+    response = s.recv(3)
+    # Chunk 2: read
+    response += s.read(3)
+    # Chunk 3: readinto
+    chunk3 = bytearray(len(response_expected) - 6)
+    s.readinto(chunk3)
+    response += chunk3
+    print("Socket rcvd:", response)
     assert response == response_expected
-    s.close()
 
-    s = sock.socket()
-    s.connect((host_ip, 80))
-    bytes_sent = s.send(message_f)
-    print("Socket(ip) sent:", bytes_sent)
-    assert bytes_sent == len(message_f)
+    line = s.readline()
+    print("... rcvd:", line)
+    assert len(line) > 0
 
-    response = s.recv(len(response_expected))
-    print("Socket(ip) rcvd:", response)
-    assert response == response_expected
     s.close()
+    assert sock.get_num_open() == 0
 
     cel.gprs_deactivate()
     cel.gprs_detach()
diff --git a/ports/gprs_a9/modusocket.c b/ports/gprs_a9/modusocket.c
index 4ff82306d8b0d..12d899aa0143f 100644
--- a/ports/gprs_a9/modusocket.c
+++ b/ports/gprs_a9/modusocket.c
@@ -27,6 +27,7 @@
  * THE SOFTWARE.
  */
 
+#include "modusocket.h"
 #include "modcellular.h"
 #include "errno.h"
 
@@ -40,13 +41,12 @@
 #include "py/stream.h"
 
 #include "api_network.h"
-#include "api_socket.h"
-#include "sdk_init.h"
 
 #include "stdio.h"
 
 #define SOCKET_POLL_US (100000)
-#define ERRNO (g_InterfaceVtbl->Socket_GetLastError())
+
+uint8_t num_sockets_open = 0;
 
 // -------
 // Classes
@@ -60,6 +60,10 @@ NORETURN static void exception_from_errno(int _errno) {
     mp_raise_OSError(_errno);
 }
 
+static inline void check_for_exceptions(void) {
+    mp_handle_pending();
+}
+
 typedef struct _socket_obj_t {
     mp_obj_base_t base;
     int fd;
@@ -81,9 +85,9 @@ void _socket_settimeout(socket_obj_t *sock, uint64_t timeout_ms) {
         .tv_sec = 0,
         .tv_usec = timeout_ms ? SOCKET_POLL_US : 0
     };
-    setsockopt(sock->fd, SOL_SOCKET, SO_SNDTIMEO, (const void *)&timeout, sizeof(timeout));
-    setsockopt(sock->fd, SOL_SOCKET, SO_RCVTIMEO, (const void *)&timeout, sizeof(timeout));
-    fcntl(sock->fd, F_SETFL, timeout_ms ? 0 : O_NONBLOCK);
+    LWIP_SETSOCKOPT(sock->fd, SOL_SOCKET, SO_SNDTIMEO, (const void *)&timeout, sizeof(timeout));
+    LWIP_SETSOCKOPT(sock->fd, SOL_SOCKET, SO_RCVTIMEO, (const void *)&timeout, sizeof(timeout));
+    LWIP_FCNTL(sock->fd, F_SETFL, timeout_ms ? 0 : O_NONBLOCK);
 }
 
 static int _socket_getaddrinfo2(const mp_obj_t host, const mp_obj_t port, struct sockaddr_in *resp) {
@@ -103,10 +107,10 @@ static int _socket_getaddrinfo2(const mp_obj_t host, const mp_obj_t port, struct
 
     memset(resp, 0, sizeof(*resp));
     resp->sin_family = AF_INET;
-    resp->sin_port = htons(port_int);
+    resp->sin_port = LWIP_HTONS(port_int);
 
     MP_THREAD_GIL_EXIT();
-    int res = inet_pton(AF_INET, address, &resp->sin_addr);
+    int res = LWIP_IP4ADDR_ATON(address, (ip4_addr_t*)&resp->sin_addr);
     MP_THREAD_GIL_ENTER();
 
     return res;
@@ -172,32 +176,16 @@ mp_obj_t socket_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw,
             return mp_const_none;
     }
 
-    self->fd = socket(self->domain, self->type, self->proto);
+    self->fd = LWIP_SOCKET(self->domain, self->type, self->proto);
     if (self->fd < 0) {
         mp_raise_NotImplementedError("Failed to create the socket but the error is unknown");
     }
+    num_sockets_open ++;
     _socket_settimeout(self, UINT64_MAX);
 
     return MP_OBJ_FROM_PTR(self);
 }
 
-STATIC mp_obj_t socket_close(mp_obj_t self_in) {
-    // ========================================
-    // Closes the socket.
-    // ========================================
-    socket_obj_t *self = MP_OBJ_TO_PTR(self_in);
-
-    int r = close(self->fd);
-
-    if (r < 0) {
-        exception_from_errno(ERRNO);
-    }
-
-    return mp_const_none;
-}
-
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(socket_close_obj, &socket_close);
-
 STATIC mp_obj_t socket_bind(mp_obj_t self_in, mp_obj_t address) {
     // ========================================
     // Binds the socket.
@@ -245,11 +233,11 @@ STATIC mp_obj_t socket_connect(mp_obj_t self_in, mp_obj_t ipv4) {
     _socket_getaddrinfo(ipv4, &res);
 
     MP_THREAD_GIL_EXIT();
-    int r = connect(self->fd, (struct sockaddr*)&res, sizeof(struct sockaddr_in));
+    int r = LWIP_CONNECT(self->fd, (struct sockaddr*)&res, sizeof(struct sockaddr_in));
     MP_THREAD_GIL_ENTER();
 
     if (r < 0) {
-        exception_from_errno(ERRNO);
+        exception_from_errno(LWIP_ERRNO());
     }
 
     return mp_const_none;
@@ -262,12 +250,13 @@ int _socket_send(socket_obj_t *sock, const char *data, size_t datalen) {
     for (int i=0; i<=sock->retries && sentlen < datalen; i++) {
 
         MP_THREAD_GIL_EXIT();
-        int r = write(sock->fd, data + sentlen, datalen - sentlen);
+        int r = LWIP_WRITE(sock->fd, data + sentlen, datalen - sentlen);
         MP_THREAD_GIL_ENTER();
 
-        if (r < 0 && ERRNO != EWOULDBLOCK) exception_from_errno(ERRNO);
+        int errno = LWIP_ERRNO();
+        if (r < 0 && errno != EWOULDBLOCK) exception_from_errno(errno);
         if (r > 0) sentlen += r;
-        // check_for_exceptions();
+        check_for_exceptions();
     }
     if (sentlen == 0) mp_raise_OSError(MP_ETIMEDOUT);
     return sentlen;
@@ -321,16 +310,17 @@ STATIC mp_uint_t _socket_read_data(mp_obj_t self_in, void *buf, size_t size,
     for (int i = 0; i <= sock->retries; ++i) {
 
         MP_THREAD_GIL_EXIT();
-        int r = recvfrom(sock->fd, buf, size, 0, from, from_len);
+        int r = LWIP_RECVFROM(sock->fd, buf, size, 0, from, from_len);
         MP_THREAD_GIL_ENTER();
 
         if (r == 0) sock->peer_closed = true;
         if (r >= 0) return r;
-        if (ERRNO != EWOULDBLOCK) {
-            *errcode = ERRNO;
+        int errno = LWIP_ERRNO();
+        if (errno != EWOULDBLOCK) {
+            *errcode = errno;
             return MP_STREAM_ERROR;
         }
-        // check_for_exceptions();
+        check_for_exceptions();
     }
 
     *errcode = sock->retries == 0 ? MP_EWOULDBLOCK : MP_ETIMEDOUT;
@@ -440,55 +430,76 @@ STATIC mp_obj_t socket_makefile(size_t n_args, const mp_obj_t *args) {
 
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(socket_makefile_obj, 1, 3, socket_makefile);
 
-STATIC mp_obj_t socket_read(size_t n_args, const mp_obj_t *args) {
+STATIC mp_uint_t socket_stream_read(mp_obj_t self_in, void *buf, mp_uint_t size, int *errcode) {
     // ========================================
-    // Reads data from the socket up to `size` or until EOF.
-    // Args:
-    //     size (int): the size of the data to read;
+    // Stream: read.
     // ========================================
-    mp_raise_NotImplementedError("Not implemented yet");
-    return mp_const_none;
+    return _socket_read_data(self_in, buf, size, NULL, NULL, errcode); 
 }
 
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(socket_read_obj, 1, 2, socket_read);
-
-STATIC mp_obj_t socket_readinto(size_t n_args, const mp_obj_t *args) {
+STATIC mp_uint_t socket_stream_write(mp_obj_t self_in, const void *buf, mp_uint_t size, int *errcode) {
     // ========================================
-    // Reads data from the socket into the buffer up to `size` or until EOF.
-    // Args:
-    //     buf (bytearray): the buffer to write into;
-    //     size (int): the size of the data to read;
+    // Stream: write.
     // ========================================
-    mp_raise_NotImplementedError("Not implemented yet");
-    return mp_const_none;
+    socket_obj_t *sock = self_in;
+    for (int i=0; i<=sock->retries; i++) {
+        MP_THREAD_GIL_EXIT();
+        int r = LWIP_WRITE(sock->fd, buf, size);
+        MP_THREAD_GIL_ENTER();
+        if (r > 0) return r;
+        int errno = LWIP_ERRNO();
+        if (r < 0 && errno != EWOULDBLOCK) { *errcode = errno; return MP_STREAM_ERROR; }
+        check_for_exceptions();
+    }
+    *errcode = sock->retries == 0 ? MP_EWOULDBLOCK : MP_ETIMEDOUT;
+    return MP_STREAM_ERROR;
 }
 
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(socket_readinto_obj, 2, 3, socket_readinto);
-
-STATIC mp_obj_t socket_readline(mp_obj_t self_in) {
+STATIC mp_uint_t socket_stream_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_t arg, int *errcode) {
     // ========================================
-    // Reads a line of text.
+    // Stream: IO control.
     // ========================================
-    mp_raise_NotImplementedError("Not implemented yet");
-    return mp_const_none;
-}
+    socket_obj_t * socket = self_in;
+    if (request == MP_STREAM_POLL) {
+        fd_set rfds; FD_ZERO(&rfds);
+        fd_set wfds; FD_ZERO(&wfds);
+        fd_set efds; FD_ZERO(&efds);
+        struct timeval timeout = { .tv_sec = 0, .tv_usec = 0 };
+        if (arg & MP_STREAM_POLL_RD) FD_SET(socket->fd, &rfds);
+        if (arg & MP_STREAM_POLL_WR) FD_SET(socket->fd, &wfds);
+        if (arg & MP_STREAM_POLL_HUP) FD_SET(socket->fd, &efds);
 
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(socket_readline_obj, &socket_readline);
+        int r = LWIP_SELECT((socket->fd)+1, &rfds, &wfds, &efds, &timeout);
+        if (r < 0) {
+            *errcode = MP_EIO;
+            return MP_STREAM_ERROR;
+        }
 
-STATIC mp_obj_t socket_write(mp_obj_t self_in, mp_obj_t buf) {
-    // ========================================
-    // Writes all data into the socket.
-    // Args:
-    //     buf (bytearray, str): data to write;
-    // ========================================
-    mp_raise_NotImplementedError("Not implemented yet");
-    return mp_const_none;
+        mp_uint_t ret = 0;
+        if (FD_ISSET(socket->fd, &rfds)) ret |= MP_STREAM_POLL_RD;
+        if (FD_ISSET(socket->fd, &wfds)) ret |= MP_STREAM_POLL_WR;
+        if (FD_ISSET(socket->fd, &efds)) ret |= MP_STREAM_POLL_HUP;
+        return ret;
+    } else if (request == MP_STREAM_CLOSE) {
+        if (socket->fd >= 0) {
+            int ret = LWIP_CLOSE(socket->fd);
+            mp_warning("Close: %d", ret);
+            if (ret != 0) {
+                *errcode = LWIP_ERRNO();
+                return MP_STREAM_ERROR;
+            }
+            socket->fd = -1;
+            num_sockets_open --;
+        }
+        return 0;
+    }
+    *errcode = MP_EINVAL;
+    return MP_STREAM_ERROR;
 }
 
-STATIC MP_DEFINE_CONST_FUN_OBJ_2(socket_write_obj, &socket_write);
-
 STATIC const mp_rom_map_elem_t socket_locals_dict_table[] = {
-    { MP_ROM_QSTR(MP_QSTR_close), MP_ROM_PTR(&socket_close_obj) },
+    { MP_ROM_QSTR(MP_QSTR___del__), MP_ROM_PTR(&mp_stream_close_obj) },
+    { MP_ROM_QSTR(MP_QSTR_close), MP_ROM_PTR(&mp_stream_close_obj) },
     { MP_ROM_QSTR(MP_QSTR_bind), MP_ROM_PTR(&socket_bind_obj) },
     { MP_ROM_QSTR(MP_QSTR_listen), MP_ROM_PTR(&socket_listen_obj) },
     { MP_ROM_QSTR(MP_QSTR_accept), MP_ROM_PTR(&socket_accept_obj) },
@@ -503,18 +514,25 @@ STATIC const mp_rom_map_elem_t socket_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_setblocking), MP_ROM_PTR(&socket_setblocking_obj) },
     { MP_ROM_QSTR(MP_QSTR_makefile), MP_ROM_PTR(&socket_makefile_obj) },
 
-    { MP_ROM_QSTR(MP_QSTR_read), MP_ROM_PTR(&socket_read_obj) },
-    { MP_ROM_QSTR(MP_QSTR_readinto), MP_ROM_PTR(&socket_readinto_obj) },
-    { MP_ROM_QSTR(MP_QSTR_readline), MP_ROM_PTR(&socket_readline_obj) },
-    { MP_ROM_QSTR(MP_QSTR_write), MP_ROM_PTR(&socket_write_obj) },
+    { MP_ROM_QSTR(MP_QSTR_read), MP_ROM_PTR(&mp_stream_read_obj) },
+    { MP_ROM_QSTR(MP_QSTR_readinto), MP_ROM_PTR(&mp_stream_readinto_obj) },
+    { MP_ROM_QSTR(MP_QSTR_readline), MP_ROM_PTR(&mp_stream_unbuffered_readline_obj) },
+    { MP_ROM_QSTR(MP_QSTR_write), MP_ROM_PTR(&mp_stream_write_obj) },
 };
 
 STATIC MP_DEFINE_CONST_DICT(socket_locals_dict, socket_locals_dict_table);
 
+STATIC const mp_stream_p_t socket_stream_p = {
+    .read = socket_stream_read,
+    .write = socket_stream_write,
+    .ioctl = socket_stream_ioctl,
+};
+
 STATIC const mp_obj_type_t socket_type = {
     { &mp_type_type },
     .name = MP_QSTR_socket,
     .make_new = socket_make_new,
+    .protocol = &socket_stream_p,
     .locals_dict = (mp_obj_dict_t*)&socket_locals_dict,
 };
 
@@ -542,7 +560,7 @@ STATIC mp_obj_t getaddrinfo(size_t n_args, const mp_obj_t *args) {
     // ========================================
     // Translates host/port into arguments to socket constructor.
     // Args:
-    //     host (str): the host name;
+    //     host (str): host name;
     //     port (int): port number;
     //     af (int): address family: AF_INET or AF_INET6;
     //     type: (int): future socket type: SOCK_STREAM or SOCK_DGRAM;
@@ -587,6 +605,17 @@ STATIC mp_obj_t modusocket_inet_pton(mp_obj_t af, mp_obj_t txt_addr) {
 
 STATIC MP_DEFINE_CONST_FUN_OBJ_2(modusocket_inet_pton_obj, modusocket_inet_pton);
 
+STATIC mp_obj_t modusocket_get_num_open(void) {
+    // ========================================
+    // Retrieves the number of open sockets.
+    // Returns:
+    //     The number of sockets open.
+    // ========================================
+    return mp_obj_new_int(num_sockets_open);
+}
+
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(modusocket_get_num_open_obj, modusocket_get_num_open);
+
 STATIC const mp_map_elem_t mp_module_usocket_globals_table[] = {
     { MP_OBJ_NEW_QSTR(MP_QSTR___name__), MP_OBJ_NEW_QSTR(MP_QSTR_usocket) },
 
@@ -594,8 +623,10 @@ STATIC const mp_map_elem_t mp_module_usocket_globals_table[] = {
 
     { MP_OBJ_NEW_QSTR(MP_QSTR_get_local_ip), (mp_obj_t)&get_local_ip_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_getaddrinfo), (mp_obj_t)&getaddrinfo_obj },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_inet_ntop), (mp_obj_t)&modusocket_inet_ntop },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_inet_pton), (mp_obj_t)&modusocket_inet_pton },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_inet_ntop), (mp_obj_t)&modusocket_inet_ntop_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_inet_pton), (mp_obj_t)&modusocket_inet_pton_obj },
+
+    { MP_OBJ_NEW_QSTR(MP_QSTR_get_num_open), (mp_obj_t)&modusocket_get_num_open_obj },
 };
 
 STATIC MP_DEFINE_CONST_DICT(mp_module_usocket_globals, mp_module_usocket_globals_table);
diff --git a/ports/gprs_a9/modusocket.h b/ports/gprs_a9/modusocket.h
new file mode 100644
index 0000000000000..119cffa1215c1
--- /dev/null
+++ b/ports/gprs_a9/modusocket.h
@@ -0,0 +1,68 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * Development of the code in this file was sponsored by Microbric Pty Ltd
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2015 Paul Sokolovsky
+ * Copyright (c) 2016 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+// This file re-binds CSDK names to proper uppercases
+#include "sdk_init.h"
+
+#define LWIP_ACCEPT               CSDK_FUNC(lwip_accept)
+#define LWIP_BIND                 CSDK_FUNC(lwip_bind)
+#define LWIP_SHUTDOWN             CSDK_FUNC(lwip_shutdown)
+#define LWIP_GETPEERNAME          CSDK_FUNC(lwip_getpeername)
+#define LWIP_GETSOCKNAME          CSDK_FUNC(lwip_getsockname)
+#define LWIP_GETSOCKOPT           CSDK_FUNC(lwip_getsockopt)
+#define LWIP_SETSOCKOPT           CSDK_FUNC(lwip_setsockopt)
+#define LWIP_CLOSE                CSDK_FUNC(lwip_close)
+#define LWIP_CONNECT              CSDK_FUNC(lwip_connect)
+#define LWIP_LISTEN               CSDK_FUNC(lwip_listen)
+#define LWIP_RECV                 CSDK_FUNC(lwip_recv)
+#define LWIP_READ                 CSDK_FUNC(lwip_read)
+#define LWIP_RECVFROM             CSDK_FUNC(lwip_recvfrom)
+#define LWIP_RECVMSG              CSDK_FUNC(lwip_recvmsg)
+#define LWIP_SEND                 CSDK_FUNC(lwip_send)
+#define LWIP_SENDMSG              CSDK_FUNC(lwip_sendmsg)
+#define LWIP_SENDTO               CSDK_FUNC(lwip_sendto)
+#define LWIP_SOCKET               CSDK_FUNC(lwip_socket)
+#define LWIP_WRITE                CSDK_FUNC(lwip_write)
+#define LWIP_WRITEV               CSDK_FUNC(lwip_writev)
+#define LWIP_SELECT               CSDK_FUNC(lwip_select)
+#define LWIP_IOCTL                CSDK_FUNC(lwip_ioctl)
+#define LWIP_FCNTL                CSDK_FUNC(lwip_fcntl)
+#define LWIP_IP6ADDR_NTOA_R       CSDK_FUNC(ip6addr_ntoa_r)
+#define LWIP_IP4ADDR_NTOA_R       CSDK_FUNC(ip4addr_ntoa_r)
+#define LWIP_IP6ADDR_NTOA         CSDK_FUNC(ip6addr_ntoa_r)
+#define LWIP_IP4ADDR_NTOA         CSDK_FUNC(ip4addr_ntoa_r)
+#define LWIP_IP6ADDR_ATON         CSDK_FUNC(ip6addr_aton)
+#define LWIP_IP4ADDR_ATON         CSDK_FUNC(ip4addr_aton)
+#define LWIP_HTONS                CSDK_FUNC(lwip_htons)
+#define LWIP_HTONL                CSDK_FUNC(lwip_htonl)
+#define LWIP_STRERR               CSDK_FUNC(lwip_strerr)
+#define LWIP_ERR_TO_ERRNO         CSDK_FUNC(err_to_errno)
+#define LWIP_ERRNO                CSDK_FUNC(Socket_GetLastError)
+
+#define DNS_GetHostByName2        CSDK_FUNC(DNS_GetHostByName2)

From a65ea7d42f6e41a778e215d1f69bc19516a71474 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Mon, 22 Apr 2019 01:29:17 +0200
Subject: [PATCH 3200/3533] Implement socket methods

---
 ports/gprs_a9/README.md     |  4 ++--
 ports/gprs_a9/frozentest.py |  6 ++++--
 ports/gprs_a9/modusocket.c  | 17 +++++++++++------
 3 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/ports/gprs_a9/README.md b/ports/gprs_a9/README.md
index f5ab614680933..a58e802376a73 100644
--- a/ports/gprs_a9/README.md
+++ b/ports/gprs_a9/README.md
@@ -202,14 +202,14 @@ See [micropython docs](https://docs.micropython.org/en/latest/library/usocket.ht
     * `accept()` *not implemented*
     * `connect(address)`
     * `send(bytes)`
-    * `sendall(bytes)` *not implemented*
+    * `sendall(bytes)`
     * `recv(bufsize)`
     * `sendto(bytes, address)` *not implemented*
     * `recvfrom(bufsize)` *not implemented*
     * `setsockopt(level, optname, value)` *not implemented*
     * `settimeout(value)` *not implemented*
     * `setblocking(flag)` *not implemented*
-    * `makefile(mode, buffering)` *not implemented*
+    * `makefile(mode, buffering)`
     * `read([size])`
     * `readinto(buf[, nbytes])`
     * `readline()`
diff --git a/ports/gprs_a9/frozentest.py b/ports/gprs_a9/frozentest.py
index f23f023d75675..27034ea83e4c3 100644
--- a/ports/gprs_a9/frozentest.py
+++ b/ports/gprs_a9/frozentest.py
@@ -248,14 +248,16 @@
     s = sock.socket()
     s.connect((host, 80))
     assert sock.get_num_open() == 1
+    assert s.makefile() == s
 
     message = "GET /200 HTTP/1.1\r\nHost: {}\r\nConnection: close\r\n\r\n"
     response_expected = b"HTTP/1.1 200 OK\r\n"
     message_f = message.format(host)
     bytes_sent = s.send(message_f[:10])
-    bytes_sent += s.write(message_f[10:])
+    bytes_sent += s.write(message_f[10:-5])
     print("Socket sent:", bytes_sent)
-    assert bytes_sent == len(message_f)
+    assert bytes_sent == len(message_f) - 5
+    s.sendall(message_f[-5:])
 
     # Chunk 1: recv
     response = s.recv(3)
diff --git a/ports/gprs_a9/modusocket.c b/ports/gprs_a9/modusocket.c
index 12d899aa0143f..0ee358ed77ca9 100644
--- a/ports/gprs_a9/modusocket.c
+++ b/ports/gprs_a9/modusocket.c
@@ -270,9 +270,9 @@ STATIC mp_obj_t socket_send(mp_obj_t self_in, mp_obj_t bytes) {
     // ========================================
     socket_obj_t *self = MP_OBJ_TO_PTR(self_in);
 
-    mp_uint_t data_len;
-    const char* data = mp_obj_str_get_data(bytes, &data_len);
-    int r = _socket_send(self, data, data_len);
+    mp_buffer_info_t bufinfo;
+    mp_get_buffer_raise(bytes, &bufinfo, MP_BUFFER_READ);
+    int r = _socket_send(self, bufinfo.buf, bufinfo.len);
 
     return mp_obj_new_int(r);
 }
@@ -285,7 +285,12 @@ STATIC mp_obj_t socket_sendall(mp_obj_t self_in, mp_obj_t bytes) {
     // Args:
     //     bytes (str, bytearray): bytes to send;
     // ========================================
-    mp_raise_NotImplementedError("Not implemented yet");
+    socket_obj_t *self = MP_OBJ_TO_PTR(self_in);
+
+    mp_buffer_info_t bufinfo;
+    mp_get_buffer_raise(bytes, &bufinfo, MP_BUFFER_READ);
+    int r = _socket_send(self, bufinfo.buf, bufinfo.len);
+    if (r < bufinfo.len) mp_raise_OSError(MP_ETIMEDOUT);
     return mp_const_none;
 }
 
@@ -424,8 +429,8 @@ STATIC mp_obj_t socket_makefile(size_t n_args, const mp_obj_t *args) {
     //     mode (str): file mode;
     //     buffering (int): buffer size (not supported);
     // ========================================
-    mp_raise_NotImplementedError("Not implemented yet");
-    return mp_const_none;
+    (void)n_args;
+    return args[0];
 }
 
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(socket_makefile_obj, 1, 3, socket_makefile);

From 7b449c4c18c9a05b0df49aea5aa6177d8dc38174 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sat, 27 Apr 2019 20:31:30 +0200
Subject: [PATCH 3201/3533] Add information on installing / running

---
 ports/gprs_a9/README.md | 40 +++++++++++++++++++++++++++++++---------
 1 file changed, 31 insertions(+), 9 deletions(-)

diff --git a/ports/gprs_a9/README.md b/ports/gprs_a9/README.md
index a58e802376a73..b61560045fa4c 100644
--- a/ports/gprs_a9/README.md
+++ b/ports/gprs_a9/README.md
@@ -1,18 +1,40 @@
-## Install GPRS_C_SDK toolchain
+## Build
+
+1. Install vendor tools: [documentation](https://ai-thinker-open.github.io/GPRS_C_SDK_DOC/en/c-sdk/installation_linux.html), [docker](https://github.com/Neutree/gprs_build)
+2. Clone this
+   ```bash
+   git clone git@github.com:Neutree/micropython.git
+   ```
+3. Make
+   ```bash
+   make -C mpy-cross
+   cd micropython/ports/gprs_a9
+   chmod +x build.sh
+   ./build.sh
+   ```
+4. Burn `micropython/ports/gprs_a9/hex/*` using `cooltools`
+
+## Connect
+
+Use [pyserial](https://github.com/pyserial) or any other terminal.
 
-* [installation doc](https://ai-thinker-open.github.io/GPRS_C_SDK_DOC/en/c-sdk/installation_linux.html)
-* Or [docker](https://github.com/Neutree/gprs_build)
+```bash
+# miniterm.py /dev/ttyUSB1 115200 --raw
+```
+
+## Upload scipts
 
+Use [ampy](https://github.com/pycampers/ampy).
 
 ```bash
-git clone git@github.com:Neutree/micropython.git
-make -C mpy-cross
-cd micropython/ports/gprs_a9
-chmod +x build.sh
-./build.sh
+# ampy --port /dev/ttyUSB1 put frozentest.py 
 ```
 
-and burn the final `.lod` file in the `hex` folder.
+## Run scipts
+
+```python
+>>> import frozentest
+```
 
 ## Platform-specific modules
 

From 1efd20d92f238b51423a13d1b7fe1b8a82c9e3c3 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sat, 27 Apr 2019 20:36:05 +0200
Subject: [PATCH 3202/3533] Fix guiding inputs in docs

---
 ports/gprs_a9/README.md | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/ports/gprs_a9/README.md b/ports/gprs_a9/README.md
index b61560045fa4c..fdc7b310a256b 100644
--- a/ports/gprs_a9/README.md
+++ b/ports/gprs_a9/README.md
@@ -3,14 +3,14 @@
 1. Install vendor tools: [documentation](https://ai-thinker-open.github.io/GPRS_C_SDK_DOC/en/c-sdk/installation_linux.html), [docker](https://github.com/Neutree/gprs_build)
 2. Clone this
    ```bash
-   git clone git@github.com:Neutree/micropython.git
+   ~ git clone git@github.com:Neutree/micropython.git
    ```
 3. Make
    ```bash
-   make -C mpy-cross
-   cd micropython/ports/gprs_a9
-   chmod +x build.sh
-   ./build.sh
+   ~ make -C mpy-cross
+   ~ cd micropython/ports/gprs_a9
+   ~ chmod +x build.sh
+   ~ ./build.sh
    ```
 4. Burn `micropython/ports/gprs_a9/hex/*` using `cooltools`
 
@@ -19,7 +19,7 @@
 Use [pyserial](https://github.com/pyserial) or any other terminal.
 
 ```bash
-# miniterm.py /dev/ttyUSB1 115200 --raw
+~ miniterm.py /dev/ttyUSB1 115200 --raw
 ```
 
 ## Upload scipts
@@ -27,7 +27,7 @@ Use [pyserial](https://github.com/pyserial) or any other terminal.
 Use [ampy](https://github.com/pycampers/ampy).
 
 ```bash
-# ampy --port /dev/ttyUSB1 put frozentest.py 
+~ ampy --port /dev/ttyUSB1 put frozentest.py 
 ```
 
 ## Run scipts

From 61d0a504c0279ba027cfdde0bcee0f15c3ddc6be Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sat, 27 Apr 2019 23:07:06 +0200
Subject: [PATCH 3203/3533] Remove debug message

---
 ports/gprs_a9/modusocket.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ports/gprs_a9/modusocket.c b/ports/gprs_a9/modusocket.c
index 0ee358ed77ca9..a163601b2426e 100644
--- a/ports/gprs_a9/modusocket.c
+++ b/ports/gprs_a9/modusocket.c
@@ -488,7 +488,6 @@ STATIC mp_uint_t socket_stream_ioctl(mp_obj_t self_in, mp_uint_t request, uintpt
     } else if (request == MP_STREAM_CLOSE) {
         if (socket->fd >= 0) {
             int ret = LWIP_CLOSE(socket->fd);
-            mp_warning("Close: %d", ret);
             if (ret != 0) {
                 *errcode = LWIP_ERRNO();
                 return MP_STREAM_ERROR;

From fdfb24a4694d1e7c34afe33d29f13224e0f1635f Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sat, 27 Apr 2019 23:07:28 +0200
Subject: [PATCH 3204/3533] Readme typo fixes

---
 ports/gprs_a9/README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ports/gprs_a9/README.md b/ports/gprs_a9/README.md
index fdc7b310a256b..1f446b2cd8ab2 100644
--- a/ports/gprs_a9/README.md
+++ b/ports/gprs_a9/README.md
@@ -33,6 +33,7 @@ Use [ampy](https://github.com/pycampers/ampy).
 ## Run scipts
 
 ```python
+>>> help()
 >>> import frozentest
 ```
 
@@ -211,7 +212,7 @@ The purpose of this module is to have an access to high-level networking (SMS, G
 
 ### `usocket` ###
 
-TCP/IP stack based on lwIP.
+TCP/IP stack over GPRS based on lwIP.
 See [micropython docs](https://docs.micropython.org/en/latest/library/usocket.html) for details.
 
 #### Classes ####

From d32ebd11a68f3207ffeacd28a8abf41acea2bdf1 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sat, 27 Apr 2019 23:08:08 +0200
Subject: [PATCH 3205/3533] Implement socket sendto

---
 ports/gprs_a9/README.md     | 2 +-
 ports/gprs_a9/frozentest.py | 7 +++++++
 ports/gprs_a9/modusocket.c  | 4 ++--
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/ports/gprs_a9/README.md b/ports/gprs_a9/README.md
index 1f446b2cd8ab2..db85d39022030 100644
--- a/ports/gprs_a9/README.md
+++ b/ports/gprs_a9/README.md
@@ -227,7 +227,7 @@ See [micropython docs](https://docs.micropython.org/en/latest/library/usocket.ht
     * `send(bytes)`
     * `sendall(bytes)`
     * `recv(bufsize)`
-    * `sendto(bytes, address)` *not implemented*
+    * `sendto(bytes, address)`
     * `recvfrom(bufsize)` *not implemented*
     * `setsockopt(level, optname, value)` *not implemented*
     * `settimeout(value)` *not implemented*
diff --git a/ports/gprs_a9/frozentest.py b/ports/gprs_a9/frozentest.py
index 27034ea83e4c3..89df911653c20 100644
--- a/ports/gprs_a9/frozentest.py
+++ b/ports/gprs_a9/frozentest.py
@@ -273,8 +273,15 @@
     line = s.readline()
     print("... rcvd:", line)
     assert len(line) > 0
+    s.close()
 
+    s = sock.socket()
+    s.sendto(message_f, (host, 80))
+    response = s.read(len(response_expected))
+    print("Socket (2) rcvd:", response)
+    assert response == response_expected
     s.close()
+
     assert sock.get_num_open() == 0
 
     cel.gprs_deactivate()
diff --git a/ports/gprs_a9/modusocket.c b/ports/gprs_a9/modusocket.c
index a163601b2426e..07a2c2ba18ffd 100644
--- a/ports/gprs_a9/modusocket.c
+++ b/ports/gprs_a9/modusocket.c
@@ -366,8 +366,8 @@ STATIC mp_obj_t socket_sendto(mp_obj_t self_in, mp_obj_t bytes, mp_obj_t address
     //     bytes (str, byterray): bytes to send;
     //     address (tuple): destination address;
     // ========================================
-    mp_raise_NotImplementedError("Not implemented yet");
-    return mp_const_none;
+    socket_connect(self_in, address);
+    return socket_sendall(self_in, bytes);
 }
 
 STATIC MP_DEFINE_CONST_FUN_OBJ_3(socket_sendto_obj, &socket_sendto);

From 11894851e9acdee1a318b03e1062a96aac1496c8 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sun, 28 Apr 2019 14:04:38 +0200
Subject: [PATCH 3206/3533] Implement recv_from, getaddrinfo and add constants

---
 ports/gprs_a9/Makefile      |   2 +
 ports/gprs_a9/README.md     |  10 +--
 ports/gprs_a9/frozentest.py |  32 ++++++---
 ports/gprs_a9/modusocket.c  | 132 +++++++++++++++++++++++++++++++++---
 ports/gprs_a9/modusocket.h  |  10 ++-
 5 files changed, 161 insertions(+), 25 deletions(-)

diff --git a/ports/gprs_a9/Makefile b/ports/gprs_a9/Makefile
index d3c8167268b7d..af97dea2e54eb 100644
--- a/ports/gprs_a9/Makefile
+++ b/ports/gprs_a9/Makefile
@@ -84,6 +84,7 @@ LD_OPTIONAL_OBJECTS :=
 ########################################3###
 INC += -I.
 INC += -I$(TOP)
+INC += -I$(TOP)/lib/netutils
 INC += -I$(BUILD_PATH_ABS)
 INC += -I${CSDK_PATH}/include \
        -I${CSDK_PATH}/include/std_inc \
@@ -133,6 +134,7 @@ LIB_SRC_C = $(addprefix lib/,\
 	utils/interrupt_char.c \
 	utils/sys_stdio_mphal.c \
 	timeutils/timeutils.c \
+	netutils/netutils.c \
 	)
 
 LIB_SRC_C += \
diff --git a/ports/gprs_a9/README.md b/ports/gprs_a9/README.md
index db85d39022030..54ce541f49875 100644
--- a/ports/gprs_a9/README.md
+++ b/ports/gprs_a9/README.md
@@ -215,6 +215,10 @@ The purpose of this module is to have an access to high-level networking (SMS, G
 TCP/IP stack over GPRS based on lwIP.
 See [micropython docs](https://docs.micropython.org/en/latest/library/usocket.html) for details.
 
+#### Constants ####
+
+`AF_INET`, `AF_INET6`, `SOCK_STREAM`, `SOCK_DGRAM`, `SOCK_RAW`, `IPPROTO_TCP`, `IPPROTO_UDP`, `IPPROTO_IP`
+
 #### Classes ####
 
 * `socket(af, type, proto)`
@@ -228,7 +232,7 @@ See [micropython docs](https://docs.micropython.org/en/latest/library/usocket.ht
     * `sendall(bytes)`
     * `recv(bufsize)`
     * `sendto(bytes, address)`
-    * `recvfrom(bufsize)` *not implemented*
+    * `recvfrom(bufsize)
     * `setsockopt(level, optname, value)` *not implemented*
     * `settimeout(value)` *not implemented*
     * `setblocking(flag)` *not implemented*
@@ -248,9 +252,7 @@ See [micropython docs](https://docs.micropython.org/en/latest/library/usocket.ht
 
   **Raises**: `NetworkError` if no address was assigned.
 
-* `getaddrinfo(host, port, af=0, type=0, proto=0, flags=0)`
-
-  *Not implemented*
+* `getaddrinfo(host, port, af=AF_INET, type=SOCK_STREAM, proto=IPPROTO_TCP, flags=0)`
 
   Translates host/port into arguments to socket constructor.
 
diff --git a/ports/gprs_a9/frozentest.py b/ports/gprs_a9/frozentest.py
index 89df911653c20..a48126969fba5 100644
--- a/ports/gprs_a9/frozentest.py
+++ b/ports/gprs_a9/frozentest.py
@@ -150,6 +150,7 @@
 
 try:
     gps.on(0)
+    raise ValueError("No GPS exception was raised")
 except gps.GPSError as e:
     print("GPS error OK:", e)
 gps.off()
@@ -244,9 +245,16 @@
     assert sock.get_num_open() == 0
 
     host = "httpstat.us"
+    port = 80
+    host_ai = sock.getaddrinfo(host, port)
+    print("Addrinfo:", host_ai)
+    assert host_ai[:3] == (sock.AF_INET, sock.SOCK_STREAM, sock.IPPROTO_TCP)
+    assert host_ai[3] == host
+    assert len(host_ai[4][0].split(".")) == 4
+    assert host_ai[4][1] == 80
 
     s = sock.socket()
-    s.connect((host, 80))
+    s.connect((host, port))
     assert sock.get_num_open() == 1
     assert s.makefile() == s
 
@@ -254,10 +262,11 @@
     response_expected = b"HTTP/1.1 200 OK\r\n"
     message_f = message.format(host)
     bytes_sent = s.send(message_f[:10])
-    bytes_sent += s.write(message_f[10:-5])
+    bytes_sent += s.write(message_f[10:20])
+    bytes_sent += s.sendto(message_f[20:30], ("23.99.0.12", 80))
     print("Socket sent:", bytes_sent)
-    assert bytes_sent == len(message_f) - 5
-    s.sendall(message_f[-5:])
+    assert bytes_sent == 30
+    s.sendall(message_f[30:])
 
     # Chunk 1: recv
     response = s.recv(3)
@@ -267,19 +276,24 @@
     chunk3 = bytearray(len(response_expected) - 6)
     s.readinto(chunk3)
     response += chunk3
-    print("Socket rcvd:", response)
+    print("Socket recvd:", response)
     assert response == response_expected
 
     line = s.readline()
-    print("... rcvd:", line)
+    print("... recvd:", line)
     assert len(line) > 0
     s.close()
 
     s = sock.socket()
-    s.sendto(message_f, (host, 80))
-    response = s.read(len(response_expected))
-    print("Socket (2) rcvd:", response)
+    s.connect((host, port))
+    bytes_sent = s.sendto(message_f, ("127.0.0.1", 80))
+    print("Socket sent (2):", bytes_sent)
+    assert bytes_sent == len(message_f)
+
+    response, fr = s.recvfrom(len(response_expected))
+    print("Socket recvd (2):", response, fr)
     assert response == response_expected
+    assert fr == host_ai[4]
     s.close()
 
     assert sock.get_num_open() == 0
diff --git a/ports/gprs_a9/modusocket.c b/ports/gprs_a9/modusocket.c
index 07a2c2ba18ffd..9f2f99f42c2b5 100644
--- a/ports/gprs_a9/modusocket.c
+++ b/ports/gprs_a9/modusocket.c
@@ -39,6 +39,7 @@
 #include "py/objexcept.h"
 #include "py/mperrno.h"
 #include "py/stream.h"
+#include "lib/netutils/netutils.h"
 
 #include "api_network.h"
 
@@ -299,8 +300,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(socket_sendall_obj, &socket_sendall);
 // XXX this can end up waiting a very long time if the content is dribbled in one character
 // at a time, as the timeout resets each time a recvfrom succeeds ... this is probably not
 // good behaviour.
-STATIC mp_uint_t _socket_read_data(mp_obj_t self_in, void *buf, size_t size,
-    struct sockaddr *from, socklen_t *from_len, int *errcode) {
+STATIC mp_uint_t _socket_read_data(mp_obj_t self_in, void *buf, size_t size, struct sockaddr *from, socklen_t *from_len, int *errcode) {
     socket_obj_t *sock = MP_OBJ_TO_PTR(self_in);
 
     // If the peer closed the connection then the lwIP socket API will only return "0" once
@@ -332,8 +332,7 @@ STATIC mp_uint_t _socket_read_data(mp_obj_t self_in, void *buf, size_t size,
     return MP_STREAM_ERROR;
 }
 
-mp_obj_t _socket_recvfrom(mp_obj_t self_in, mp_obj_t len_in,
-        struct sockaddr *from, socklen_t *from_len) {
+mp_obj_t _socket_recvfrom(mp_obj_t self_in, mp_obj_t len_in, struct sockaddr *from, socklen_t *from_len) {
     size_t len = mp_obj_get_int(len_in);
     vstr_t vstr;
     vstr_init_len(&vstr, len);
@@ -366,8 +365,32 @@ STATIC mp_obj_t socket_sendto(mp_obj_t self_in, mp_obj_t bytes, mp_obj_t address
     //     bytes (str, byterray): bytes to send;
     //     address (tuple): destination address;
     // ========================================
-    socket_connect(self_in, address);
-    return socket_sendall(self_in, bytes);
+    socket_obj_t *self = MP_OBJ_TO_PTR(self_in);
+
+    // get the buffer to send
+    mp_buffer_info_t bufinfo;
+    mp_get_buffer_raise(bytes, &bufinfo, MP_BUFFER_READ);
+
+    // create the destination address
+    struct sockaddr_in to;
+    to.sin_len = sizeof(to);
+    to.sin_family = AF_INET;
+    to.sin_port = LWIP_HTONS(netutils_parse_inet_addr(address, (uint8_t*)&to.sin_addr, NETUTILS_BIG));
+
+    // send the data
+    for (int i=0; i<=self->retries; i++) {
+        MP_THREAD_GIL_EXIT();
+        int ret = LWIP_SENDTO(self->fd, bufinfo.buf, bufinfo.len, 0, (struct sockaddr*)&to, sizeof(to));
+        MP_THREAD_GIL_ENTER();
+        if (ret > 0) return mp_obj_new_int_from_uint(ret);
+        int errno = LWIP_ERRNO();
+        if (ret == -1 && errno != EWOULDBLOCK) {
+            exception_from_errno(errno);
+        }
+        check_for_exceptions();
+    }
+    mp_raise_OSError(MP_ETIMEDOUT); 
+    return mp_const_none;
 }
 
 STATIC MP_DEFINE_CONST_FUN_OBJ_3(socket_sendto_obj, &socket_sendto);
@@ -378,8 +401,17 @@ STATIC mp_obj_t socket_recvfrom(mp_obj_t self_in, mp_obj_t bufsize) {
     // Args:
     //     bufsize (int): output array size;
     // ========================================
-    mp_raise_NotImplementedError("Not implemented yet");
-    return mp_const_none;
+    struct sockaddr from;
+    socklen_t fromlen = sizeof(from);
+
+    mp_obj_t tuple[2];
+    tuple[0] = _socket_recvfrom(self_in, bufsize, &from, &fromlen);
+
+    uint8_t *ip = (uint8_t*)&((struct sockaddr_in*)&from)->sin_addr;
+    mp_uint_t port = LWIP_NTOHS(((struct sockaddr_in*)&from)->sin_port);
+    tuple[1] = netutils_format_inet_addr(ip, port, NETUTILS_BIG);
+
+    return mp_obj_new_tuple(2, tuple);
 }
 
 STATIC MP_DEFINE_CONST_FUN_OBJ_2(socket_recvfrom_obj, &socket_recvfrom);
@@ -573,8 +605,79 @@ STATIC mp_obj_t getaddrinfo(size_t n_args, const mp_obj_t *args) {
     // Returns:
     //     A 5-tuple with arguments to `usocket.socket`.
     // ========================================
-    mp_raise_NotImplementedError("Not implemented yet");
-    return mp_const_none;
+    
+    mp_obj_t host = args[0];
+    mp_obj_t port = args[1];
+
+    int af = AF_INET;
+    if (n_args > 2) {
+        if (mp_obj_get_int(args[2]) != AF_INET) {
+            mp_raise_ValueError("Argument #3: only af=AF_INET supported");
+            return mp_const_none;
+        }
+    }
+
+    int type = SOCK_STREAM;
+    if (n_args > 3) {
+        switch (mp_obj_get_int(args[3])) {
+            case SOCK_STREAM:
+                type = SOCK_STREAM;
+                break;
+            case SOCK_DGRAM:
+                type = SOCK_DGRAM;
+                break;
+            default:
+                mp_raise_ValueError("Argument #4: 'type' should be one of SOCK_STREAM, SOCK_DGRAM");
+                return mp_const_none;
+        }
+    }
+
+    int proto = IPPROTO_TCP;
+    if (n_args > 4) {
+        switch (mp_obj_get_int(args[4])) {
+            case IPPROTO_TCP:
+                proto = IPPROTO_TCP;
+                break;
+            case IPPROTO_UDP:
+                proto = IPPROTO_UDP;
+                break;
+            default:
+                mp_raise_ValueError("Argument #5: 'proto' should be one of IPPROTO_TCP, IPPROTO_UDP");
+                return mp_const_none;
+        }
+    }
+
+    int flag = 0;
+    if (n_args > 5) {
+        flag = mp_obj_get_int(args[5]);
+    }
+
+    struct sockaddr_in res;
+    if (_socket_getaddrinfo2(args[0], args[1], &res) < 0) {
+        int errno = LWIP_ERRNO();
+        exception_from_errno(errno);
+    }
+
+    mp_obj_t addrinfo_objs[5] = {
+        mp_obj_new_int(res.sin_family),
+        mp_obj_new_int(type),
+        mp_obj_new_int(proto),
+        host,
+        mp_const_none,
+    };
+
+    // AF_INET
+    // This looks odd, but it's really just a u32_t
+    ip4_addr_t ip4_addr = { .addr = res.sin_addr.s_addr };
+    char buf[16];
+    LWIP_IP4ADDR_NTOA_R(&ip4_addr, buf, sizeof(buf));
+    mp_obj_t inaddr_objs[2] = {
+        mp_obj_new_str(buf, strlen(buf)),
+        mp_obj_new_int(LWIP_NTOHS(res.sin_port))
+    };
+    addrinfo_objs[4] = mp_obj_new_tuple(2, inaddr_objs);
+
+    return mp_obj_new_tuple(5, addrinfo_objs);
 }
 
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(getaddrinfo_obj, 2, 6, getaddrinfo);
@@ -631,6 +734,15 @@ STATIC const mp_map_elem_t mp_module_usocket_globals_table[] = {
     { MP_OBJ_NEW_QSTR(MP_QSTR_inet_pton), (mp_obj_t)&modusocket_inet_pton_obj },
 
     { MP_OBJ_NEW_QSTR(MP_QSTR_get_num_open), (mp_obj_t)&modusocket_get_num_open_obj },
+
+    { MP_ROM_QSTR(MP_QSTR_AF_INET), MP_ROM_INT(AF_INET) },
+    { MP_ROM_QSTR(MP_QSTR_AF_INET6), MP_ROM_INT(AF_INET6) },
+    { MP_ROM_QSTR(MP_QSTR_SOCK_STREAM), MP_ROM_INT(SOCK_STREAM) },
+    { MP_ROM_QSTR(MP_QSTR_SOCK_DGRAM), MP_ROM_INT(SOCK_DGRAM) },
+    { MP_ROM_QSTR(MP_QSTR_SOCK_RAW), MP_ROM_INT(SOCK_RAW) },
+    { MP_ROM_QSTR(MP_QSTR_IPPROTO_TCP), MP_ROM_INT(IPPROTO_TCP) },
+    { MP_ROM_QSTR(MP_QSTR_IPPROTO_UDP), MP_ROM_INT(IPPROTO_UDP) },
+    { MP_ROM_QSTR(MP_QSTR_IPPROTO_IP), MP_ROM_INT(IPPROTO_IP) },
 };
 
 STATIC MP_DEFINE_CONST_DICT(mp_module_usocket_globals, mp_module_usocket_globals_table);
diff --git a/ports/gprs_a9/modusocket.h b/ports/gprs_a9/modusocket.h
index 119cffa1215c1..e97632dc8b7ba 100644
--- a/ports/gprs_a9/modusocket.h
+++ b/ports/gprs_a9/modusocket.h
@@ -29,6 +29,7 @@
 
 // This file re-binds CSDK names to proper uppercases
 #include "sdk_init.h"
+#include "api_inc_socket.h"
 
 #define LWIP_ACCEPT               CSDK_FUNC(lwip_accept)
 #define LWIP_BIND                 CSDK_FUNC(lwip_bind)
@@ -59,10 +60,15 @@
 #define LWIP_IP4ADDR_NTOA         CSDK_FUNC(ip4addr_ntoa_r)
 #define LWIP_IP6ADDR_ATON         CSDK_FUNC(ip6addr_aton)
 #define LWIP_IP4ADDR_ATON         CSDK_FUNC(ip4addr_aton)
-#define LWIP_HTONS                CSDK_FUNC(lwip_htons)
-#define LWIP_HTONL                CSDK_FUNC(lwip_htonl)
 #define LWIP_STRERR               CSDK_FUNC(lwip_strerr)
 #define LWIP_ERR_TO_ERRNO         CSDK_FUNC(err_to_errno)
 #define LWIP_ERRNO                CSDK_FUNC(Socket_GetLastError)
 
 #define DNS_GetHostByName2        CSDK_FUNC(DNS_GetHostByName2)
+
+// Presumably, the transformation is symmetric
+#define LWIP_HTONS(x) PP_HTONS(x)
+#define LWIP_HTONL(x) PP_HTONL(x)
+#define LWIP_NTOHS(x) PP_NTOHS(x)
+#define LWIP_NTOHL(x) PP_NTOHL(x)
+

From 97462422cf69e7d38592ec7954d5c5ce49fb7211 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sun, 28 Apr 2019 14:41:49 +0200
Subject: [PATCH 3207/3533] Switch to a canonical keyword argument
 implementation

---
 ports/gprs_a9/README.md    |  2 +-
 ports/gprs_a9/modusocket.c | 90 +++++++++++++++++++++-----------------
 2 files changed, 51 insertions(+), 41 deletions(-)

diff --git a/ports/gprs_a9/README.md b/ports/gprs_a9/README.md
index 54ce541f49875..1bdbba82994a7 100644
--- a/ports/gprs_a9/README.md
+++ b/ports/gprs_a9/README.md
@@ -232,7 +232,7 @@ See [micropython docs](https://docs.micropython.org/en/latest/library/usocket.ht
     * `sendall(bytes)`
     * `recv(bufsize)`
     * `sendto(bytes, address)`
-    * `recvfrom(bufsize)
+    * `recvfrom(bufsize)`
     * `setsockopt(level, optname, value)` *not implemented*
     * `settimeout(value)` *not implemented*
     * `setblocking(flag)` *not implemented*
diff --git a/ports/gprs_a9/modusocket.c b/ports/gprs_a9/modusocket.c
index 9f2f99f42c2b5..945c09ee9219b 100644
--- a/ports/gprs_a9/modusocket.c
+++ b/ports/gprs_a9/modusocket.c
@@ -592,7 +592,7 @@ STATIC mp_obj_t get_local_ip(void) {
 
 STATIC MP_DEFINE_CONST_FUN_OBJ_0(get_local_ip_obj, get_local_ip);
 
-STATIC mp_obj_t getaddrinfo(size_t n_args, const mp_obj_t *args) {
+STATIC mp_obj_t getaddrinfo(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     // ========================================
     // Translates host/port into arguments to socket constructor.
     // Args:
@@ -605,55 +605,65 @@ STATIC mp_obj_t getaddrinfo(size_t n_args, const mp_obj_t *args) {
     // Returns:
     //     A 5-tuple with arguments to `usocket.socket`.
     // ========================================
+    enum { ARG_host, ARG_port, ARG_af, ARG_type, ARG_proto, ARG_flag };
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_host, MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
+        { MP_QSTR_port, MP_ARG_REQUIRED | MP_ARG_INT, {.u_int = 0} },
+        { MP_QSTR_af, MP_ARG_INT, {.u_int = AF_INET} },
+        { MP_QSTR_type, MP_ARG_INT, {.u_int = SOCK_STREAM} },
+        { MP_QSTR_proto, MP_ARG_INT, {.u_int = IPPROTO_TCP} },
+        { MP_QSTR_flag, MP_ARG_INT, {.u_int = 0} },
+    };
+
+    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
+    mp_arg_parse_all(n_args, pos_args, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
     
-    mp_obj_t host = args[0];
-    mp_obj_t port = args[1];
+    mp_obj_t host = args[ARG_host].u_obj;
+    mp_obj_t port = mp_obj_new_int(args[ARG_port].u_int);
 
-    int af = AF_INET;
-    if (n_args > 2) {
-        if (mp_obj_get_int(args[2]) != AF_INET) {
-            mp_raise_ValueError("Argument #3: only af=AF_INET supported");
+    int af;
+    switch (args[ARG_af].u_int) {
+        case AF_INET:
+            af = AF_INET;
+            break;
+        case AF_INET6:
+            mp_raise_ValueError("argument #3: af=AF_INET6 is not implemented");
+            break;
+        default:
+            mp_raise_ValueError("argument #3: 'af' should be one of AF_INET, AF_INET6");
             return mp_const_none;
-        }
     }
 
-    int type = SOCK_STREAM;
-    if (n_args > 3) {
-        switch (mp_obj_get_int(args[3])) {
-            case SOCK_STREAM:
-                type = SOCK_STREAM;
-                break;
-            case SOCK_DGRAM:
-                type = SOCK_DGRAM;
-                break;
-            default:
-                mp_raise_ValueError("Argument #4: 'type' should be one of SOCK_STREAM, SOCK_DGRAM");
-                return mp_const_none;
-        }
+    int type;
+    switch (args[ARG_type].u_int) {
+        case SOCK_STREAM:
+            type = SOCK_STREAM;
+            break;
+        case SOCK_DGRAM:
+            type = SOCK_DGRAM;
+            break;
+        default:
+            mp_raise_ValueError("Argument #4: 'type' should be one of SOCK_STREAM, SOCK_DGRAM");
+            return mp_const_none;
     }
 
-    int proto = IPPROTO_TCP;
-    if (n_args > 4) {
-        switch (mp_obj_get_int(args[4])) {
-            case IPPROTO_TCP:
-                proto = IPPROTO_TCP;
-                break;
-            case IPPROTO_UDP:
-                proto = IPPROTO_UDP;
-                break;
-            default:
-                mp_raise_ValueError("Argument #5: 'proto' should be one of IPPROTO_TCP, IPPROTO_UDP");
-                return mp_const_none;
-        }
+    int proto;
+    switch (args[ARG_proto].u_int) {
+        case IPPROTO_TCP:
+            proto = IPPROTO_TCP;
+            break;
+        case IPPROTO_UDP:
+            proto = IPPROTO_UDP;
+            break;
+        default:
+            mp_raise_ValueError("Argument #5: 'proto' should be one of IPPROTO_TCP, IPPROTO_UDP");
+            return mp_const_none;
     }
 
-    int flag = 0;
-    if (n_args > 5) {
-        flag = mp_obj_get_int(args[5]);
-    }
+    int flag = args[ARG_flag].u_int;
 
     struct sockaddr_in res;
-    if (_socket_getaddrinfo2(args[0], args[1], &res) < 0) {
+    if (_socket_getaddrinfo2(host, port, &res) < 0) {
         int errno = LWIP_ERRNO();
         exception_from_errno(errno);
     }
@@ -680,7 +690,7 @@ STATIC mp_obj_t getaddrinfo(size_t n_args, const mp_obj_t *args) {
     return mp_obj_new_tuple(5, addrinfo_objs);
 }
 
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(getaddrinfo_obj, 2, 6, getaddrinfo);
+STATIC MP_DEFINE_CONST_FUN_OBJ_KW(getaddrinfo_obj, 2, getaddrinfo);
 
 STATIC mp_obj_t modusocket_inet_ntop(mp_obj_t af, mp_obj_t bin_addr) {
     // ========================================

From 2771f4eb82ac4cfb10eb47fa2cfa34fe9e27e38e Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sun, 28 Apr 2019 15:09:45 +0200
Subject: [PATCH 3208/3533] Socket module alias

---
 ports/gprs_a9/mpconfigport.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/gprs_a9/mpconfigport.h b/ports/gprs_a9/mpconfigport.h
index 257332b8cffd8..1177f870444bd 100644
--- a/ports/gprs_a9/mpconfigport.h
+++ b/ports/gprs_a9/mpconfigport.h
@@ -220,6 +220,7 @@ extern const struct _mp_obj_module_t usocket_module;
     { MP_OBJ_NEW_QSTR(MP_QSTR_io), (mp_obj_t)&mp_module_io }, \
     { MP_OBJ_NEW_QSTR(MP_QSTR_json), (mp_obj_t)&mp_module_ujson }, \
     { MP_OBJ_NEW_QSTR(MP_QSTR_os), (mp_obj_t)&uos_module }, \
+    { MP_OBJ_NEW_QSTR(MP_QSTR_socket), (mp_obj_t)&usocket_module }, \
     { MP_OBJ_NEW_QSTR(MP_QSTR_time), (mp_obj_t)&utime_module }, \
     { MP_OBJ_NEW_QSTR(MP_QSTR_random), (mp_obj_t)&mp_module_urandom }, \
     { MP_OBJ_NEW_QSTR(MP_QSTR_re), (mp_obj_t)&mp_module_ure }, \

From 698321fd1d735e87dc29d5a379ff3f86252702f9 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sun, 28 Apr 2019 15:29:07 +0200
Subject: [PATCH 3209/3533] Add plans for ssl to docs

---
 ports/gprs_a9/README.md | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/ports/gprs_a9/README.md b/ports/gprs_a9/README.md
index 1bdbba82994a7..96dda08f7b02a 100644
--- a/ports/gprs_a9/README.md
+++ b/ports/gprs_a9/README.md
@@ -212,6 +212,8 @@ The purpose of this module is to have an access to high-level networking (SMS, G
 
 ### `usocket` ###
 
+*Alias: `socket`*
+
 TCP/IP stack over GPRS based on lwIP.
 See [micropython docs](https://docs.micropython.org/en/latest/library/usocket.html) for details.
 
@@ -299,6 +301,40 @@ See [micropython docs](https://docs.micropython.org/en/latest/library/usocket.ht
 
   **Returns**: The number of open sockets.
 
+### `ussl` ###
+
+*Not implemented*
+
+*Alias: `ssl`*
+
+Provides SSL over GPRS sockets.
+
+#### Classes ####
+
+* `ssl_socket(af, type, proto)`
+
+  *Not implemented*
+
+    * `close()` *Not implemented*
+    * `read([size])` *Not implemented*
+    * `readinto(buf[, nbytes])` *Not implemented*
+    * `readline()` *Not implemented*
+    * `write(buf)` *Not implemented*
+
+#### Methods ####
+
+* `wrap_socket(sock, server_side=False, keyfile=None, certfile=None, cert_reqs=CERT_NONE, ca_certs=None)`
+
+  *Not implemented*
+
+  Takes a stream socket and returns an `SSLSocket`.
+
+  **Args**:
+
+    * sock (`usocket.socket`): the socket to wrap;
+
+  **Returns**: a wrapped SSL socket.
+
 ### `gps`
 
 Provides the GPS functionality.

From 3b3a5746bcd1553d2da431ebedecec12e92abbe7 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sun, 28 Apr 2019 16:28:17 +0200
Subject: [PATCH 3210/3533] Ad an error message for panic reset

---
 ports/gprs_a9/main.c | 27 ++++++++++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

diff --git a/ports/gprs_a9/main.c b/ports/gprs_a9/main.c
index 8e48d22eb1edc..42f69714d8b51 100644
--- a/ports/gprs_a9/main.c
+++ b/ports/gprs_a9/main.c
@@ -114,11 +114,31 @@ void gc_collect(void) {
 }
 
 
-void nlr_jump_fail(void *val) {
-    Assert(false, "nlr_jump_fail");
-    while (1);//never reach here actully
+void NORETURN nlr_jump_fail(void *val) {
+    static const char msg[] =
+        "\r\n==============================="
+        "\r\nMicropython experienced a fatal"
+        "\r\nerror and will be rebooted."
+        "\r\n"
+        "\r\n  reason: nlr_jump_fail"
+        "\r\n  ptr: ";
+    UART_Write(UART1, (uint8_t*)msg, sizeof(msg));
+
+    char msg2[16];
+    snprintf(msg2, sizeof(msg2), "%p", val);
+    UART_Write(UART1, (uint8_t*)msg2, strlen(msg2));
+
+    static const char msg3[] =
+        "\r\n=============================="
+        "\r\n";
+    UART_Write(UART1, (uint8_t*)msg3, sizeof(msg3));
+
+    OS_Sleep(5000);
+    PM_Restart();
+    while (1);
 }
 
+/*
 void NORETURN __fatal_error(const char *msg) {
     Assert(false,msg);
     while (1);//never reach here actully
@@ -130,6 +150,7 @@ void MP_WEAK __assert_func(const char *file, int line, const char *func, const c
     __fatal_error("Assertion failed");
 }
 #endif
+*/
 
 void MicroPyTask(void *pData) {
     // The primary event-driven UART loop

From a0433cc31da3236ae05fc3b3504492dfaab50dfd Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sun, 28 Apr 2019 20:25:33 +0200
Subject: [PATCH 3211/3533] Claim copyright

---
 ports/gprs_a9/csdk_config.h |  3 +--
 ports/gprs_a9/file_io.c     |  3 +--
 ports/gprs_a9/help.c        |  1 +
 ports/gprs_a9/main.c        |  3 +--
 ports/gprs_a9/modcellular.c |  3 +--
 ports/gprs_a9/modcellular.h |  3 +--
 ports/gprs_a9/modgps.c      |  3 +--
 ports/gprs_a9/modgps.h      |  3 +--
 ports/gprs_a9/modmachine.c  |  3 +--
 ports/gprs_a9/modmachine.h  |  3 +--
 ports/gprs_a9/modusocket.c  | 11 +++++------
 ports/gprs_a9/modusocket.h  |  3 +--
 ports/gprs_a9/mphalport.c   |  3 +--
 ports/gprs_a9/mphalport.h   |  3 +--
 ports/gprs_a9/rng.c         |  3 +--
 ports/gprs_a9/rng.h         |  3 +--
 ports/gprs_a9/unistd.h      |  3 +--
 17 files changed, 21 insertions(+), 36 deletions(-)

diff --git a/ports/gprs_a9/csdk_config.h b/ports/gprs_a9/csdk_config.h
index 7754e1b46c2f9..9f080eeedad01 100644
--- a/ports/gprs_a9/csdk_config.h
+++ b/ports/gprs_a9/csdk_config.h
@@ -5,8 +5,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2015 Paul Sokolovsky
- * Copyright (c) 2016 Damien P. George
+ * Copyright (c) 2019 pulkin
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/ports/gprs_a9/file_io.c b/ports/gprs_a9/file_io.c
index fe66c3bc760aa..3df64542d95c5 100644
--- a/ports/gprs_a9/file_io.c
+++ b/ports/gprs_a9/file_io.c
@@ -5,8 +5,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2015 Paul Sokolovsky
- * Copyright (c) 2016 Damien P. George
+ * Copyright (c) 2019 pulkin
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/ports/gprs_a9/help.c b/ports/gprs_a9/help.c
index 101e311f4946e..d7d646c5400cb 100644
--- a/ports/gprs_a9/help.c
+++ b/ports/gprs_a9/help.c
@@ -6,6 +6,7 @@
  * The MIT License (MIT)
  *
  * Copyright (c) 2013-2016 Damien P. George
+ * Copyright (c) 2019 pulkin
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/ports/gprs_a9/main.c b/ports/gprs_a9/main.c
index 42f69714d8b51..dcc3c44c00509 100644
--- a/ports/gprs_a9/main.c
+++ b/ports/gprs_a9/main.c
@@ -5,8 +5,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2015 Paul Sokolovsky
- * Copyright (c) 2016 Damien P. George
+ * Copyright (c) 2019 pulkin
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/ports/gprs_a9/modcellular.c b/ports/gprs_a9/modcellular.c
index 814c54effc725..d2c8fedc43840 100644
--- a/ports/gprs_a9/modcellular.c
+++ b/ports/gprs_a9/modcellular.c
@@ -5,8 +5,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2015 Paul Sokolovsky
- * Copyright (c) 2016 Damien P. George
+ * Copyright (c) 2019 pulkin
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/ports/gprs_a9/modcellular.h b/ports/gprs_a9/modcellular.h
index 7f780702dc093..0720ee0c1da75 100644
--- a/ports/gprs_a9/modcellular.h
+++ b/ports/gprs_a9/modcellular.h
@@ -5,8 +5,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2015 Paul Sokolovsky
- * Copyright (c) 2016 Damien P. George
+ * Copyright (c) 2019 pulkin
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/ports/gprs_a9/modgps.c b/ports/gprs_a9/modgps.c
index bee80cb1de446..cfa9afd16105a 100644
--- a/ports/gprs_a9/modgps.c
+++ b/ports/gprs_a9/modgps.c
@@ -5,8 +5,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2015 Paul Sokolovsky
- * Copyright (c) 2016 Damien P. George
+ * Copyright (c) 2019 pulkin
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/ports/gprs_a9/modgps.h b/ports/gprs_a9/modgps.h
index 7fd84ce317f48..b22d36ef9d9dd 100644
--- a/ports/gprs_a9/modgps.h
+++ b/ports/gprs_a9/modgps.h
@@ -5,8 +5,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2015 Paul Sokolovsky
- * Copyright (c) 2016 Damien P. George
+ * Copyright (c) 2019 pulkin
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/ports/gprs_a9/modmachine.c b/ports/gprs_a9/modmachine.c
index a038a1d008c27..4780bea81f756 100644
--- a/ports/gprs_a9/modmachine.c
+++ b/ports/gprs_a9/modmachine.c
@@ -5,8 +5,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2015 Paul Sokolovsky
- * Copyright (c) 2016 Damien P. George
+ * Copyright (c) 2019 pulkin
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/ports/gprs_a9/modmachine.h b/ports/gprs_a9/modmachine.h
index 76cf4088b143e..b74f8b4d34b78 100644
--- a/ports/gprs_a9/modmachine.h
+++ b/ports/gprs_a9/modmachine.h
@@ -5,8 +5,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2015 Paul Sokolovsky
- * Copyright (c) 2016 Damien P. George
+ * Copyright (c) 2019 pulkin
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/ports/gprs_a9/modusocket.c b/ports/gprs_a9/modusocket.c
index 945c09ee9219b..f6b33c97fe490 100644
--- a/ports/gprs_a9/modusocket.c
+++ b/ports/gprs_a9/modusocket.c
@@ -5,8 +5,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2015 Paul Sokolovsky
- * Copyright (c) 2016 Damien P. George
+ * Copyright (c) 2019 pulkin
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -49,10 +48,6 @@
 
 uint8_t num_sockets_open = 0;
 
-// -------
-// Classes
-// -------
-
 NORETURN static void exception_from_errno(int _errno) {
     // Here we need to convert from lwip errno values to MicroPython's standard ones
     if (_errno == EINPROGRESS) {
@@ -65,6 +60,10 @@ static inline void check_for_exceptions(void) {
     mp_handle_pending();
 }
 
+// -------
+// Classes
+// -------
+
 typedef struct _socket_obj_t {
     mp_obj_base_t base;
     int fd;
diff --git a/ports/gprs_a9/modusocket.h b/ports/gprs_a9/modusocket.h
index e97632dc8b7ba..de288d112e213 100644
--- a/ports/gprs_a9/modusocket.h
+++ b/ports/gprs_a9/modusocket.h
@@ -5,8 +5,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2015 Paul Sokolovsky
- * Copyright (c) 2016 Damien P. George
+ * Copyright (c) 2019 pulkin
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/ports/gprs_a9/mphalport.c b/ports/gprs_a9/mphalport.c
index e229087055934..3d1bea4f00611 100644
--- a/ports/gprs_a9/mphalport.c
+++ b/ports/gprs_a9/mphalport.c
@@ -5,8 +5,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2015 Paul Sokolovsky
- * Copyright (c) 2016 Damien P. George
+ * Copyright (c) 2019 pulkin
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/ports/gprs_a9/mphalport.h b/ports/gprs_a9/mphalport.h
index 7488d3d8db895..31de410a878a2 100644
--- a/ports/gprs_a9/mphalport.h
+++ b/ports/gprs_a9/mphalport.h
@@ -5,8 +5,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2015 Paul Sokolovsky
- * Copyright (c) 2016 Damien P. George
+ * Copyright (c) 2019 pulkin
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/ports/gprs_a9/rng.c b/ports/gprs_a9/rng.c
index bbb273cc800d5..aa328bad04e10 100644
--- a/ports/gprs_a9/rng.c
+++ b/ports/gprs_a9/rng.c
@@ -5,8 +5,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2015 Paul Sokolovsky
- * Copyright (c) 2016 Damien P. George
+ * Copyright (c) 2019 pulkin
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/ports/gprs_a9/rng.h b/ports/gprs_a9/rng.h
index 3ca3a1906c711..a149ed76b7575 100644
--- a/ports/gprs_a9/rng.h
+++ b/ports/gprs_a9/rng.h
@@ -5,8 +5,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2015 Paul Sokolovsky
- * Copyright (c) 2016 Damien P. George
+ * Copyright (c) 2019 pulkin
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/ports/gprs_a9/unistd.h b/ports/gprs_a9/unistd.h
index cf94b8c340c0c..6bdb52e534c8f 100644
--- a/ports/gprs_a9/unistd.h
+++ b/ports/gprs_a9/unistd.h
@@ -5,8 +5,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2015 Paul Sokolovsky
- * Copyright (c) 2016 Damien P. George
+ * Copyright (c) 2019 pulkin
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

From 7f2db6edc4e9c7deefec1f850a2d84f11d6abe5f Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Wed, 8 May 2019 21:30:48 +0200
Subject: [PATCH 3212/3533] Switch to optional reboot on fatal

---
 ports/gprs_a9/README.md |  4 ++++
 ports/gprs_a9/main.c    | 12 +++++++++---
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/ports/gprs_a9/README.md b/ports/gprs_a9/README.md
index 96dda08f7b02a..574576887e928 100644
--- a/ports/gprs_a9/README.md
+++ b/ports/gprs_a9/README.md
@@ -439,3 +439,7 @@ Provides power-related functions: power, watchdogs.
 
   Resets the timer on the hardware watchdog.
 
+## Misc ##
+
+* The module halts on fatal errors; create an empty file `.reboot_on_fatal` if a reboot is desired
+
diff --git a/ports/gprs_a9/main.c b/ports/gprs_a9/main.c
index dcc3c44c00509..b00d582734c78 100644
--- a/ports/gprs_a9/main.c
+++ b/ports/gprs_a9/main.c
@@ -117,7 +117,7 @@ void NORETURN nlr_jump_fail(void *val) {
     static const char msg[] =
         "\r\n==============================="
         "\r\nMicropython experienced a fatal"
-        "\r\nerror and will be rebooted."
+        "\r\nerror and will be halted."
         "\r\n"
         "\r\n  reason: nlr_jump_fail"
         "\r\n  ptr: ";
@@ -132,8 +132,14 @@ void NORETURN nlr_jump_fail(void *val) {
         "\r\n";
     UART_Write(UART1, (uint8_t*)msg3, sizeof(msg3));
 
-    OS_Sleep(5000);
-    PM_Restart();
+    int fd = API_FS_Open(".reboot_on_fatal", FS_O_RDONLY, 0);
+    if (fd < 0) {
+        Assert(false, "nlr_jump_fail");
+    } else {
+        API_FS_Close(fd);
+        OS_Sleep(5000);
+        PM_Restart();
+    }
     while (1);
 }
 

From 5467477d5abcc39bbb97c6124b7b51482d256b17 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sun, 12 May 2019 21:09:11 +0200
Subject: [PATCH 3213/3533] Preliminary gc implementation

---
 ports/gprs_a9/main.c         | 22 +++++++++++++++++++---
 ports/gprs_a9/mpconfigport.h |  6 +++---
 2 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/ports/gprs_a9/main.c b/ports/gprs_a9/main.c
index b00d582734c78..66224677f64d5 100644
--- a/ports/gprs_a9/main.c
+++ b/ports/gprs_a9/main.c
@@ -64,6 +64,8 @@
 #define MICROPYTHON_TASK_PRIORITY       1
 #define UART_CIRCLE_FIFO_BUFFER_MAX_LENGTH 2048
 
+STATIC char* heap;
+
 HANDLE mainTaskHandle  = NULL;
 HANDLE microPyTaskHandle = NULL;
 Buffer_t fifoBuffer; // ringbuf
@@ -143,6 +145,16 @@ void NORETURN nlr_jump_fail(void *val) {
     while (1);
 }
 
+char* mp_allocate_heap(uint16_t* size) {
+    uint16_t h_size = 4 * 1024;
+    uint8_t* heap = OS_Malloc(h_size);
+    if (!heap) {
+        mp_fatal_error(NULL);
+    }
+    size[0] = h_size;
+    return (char*)heap;
+}
+
 /*
 void NORETURN __fatal_error(const char *msg) {
     Assert(false,msg);
@@ -168,9 +180,12 @@ void MicroPyTask(void *pData) {
 
 soft_reset:
     mp_stack_ctrl_init();
-    mp_stack_set_top((void *)(info.stackTop + info.stackSize * 4));
+    stack_top = info.stackTop + info.stackSize * 4;
+    mp_stack_set_top((void *)stack_top);
     mp_stack_set_limit(MICROPYTHON_TASK_STACK_SIZE * 4 - 1024);
-    // TODO: gc_init(?, ?);
+    uint16_t heap_size;
+    heap = mp_allocate_heap(&heap_size);
+    gc_init(heap, heap + heap_size);
     mp_init();
     moduos_init0();
     modcellular_init0();
@@ -220,8 +235,9 @@ void MicroPyTask(void *pData) {
         // PM_SetSysMinFreq(PM_SYS_FREQ_32K);
     }
 
-    // TODO: gc_sweep_all();
+    gc_sweep_all();
     mp_deinit();
+    OS_Free(heap);
     mp_hal_stdout_tx_str("PYB: soft reboot\r\n");
     mp_hal_delay_us(10000); // allow UART to flush output
 
diff --git a/ports/gprs_a9/mpconfigport.h b/ports/gprs_a9/mpconfigport.h
index 1177f870444bd..0c90ce80e4c90 100644
--- a/ports/gprs_a9/mpconfigport.h
+++ b/ports/gprs_a9/mpconfigport.h
@@ -32,11 +32,11 @@
 // Python internal features
 #define MICROPY_ENABLE_COMPILER             (1)
 #define MICROPY_REPL_EVENT_DRIVEN           (1)
-// #define MICROPY_ENABLE_GC                   (1)
+#define MICROPY_ENABLE_GC                   (1)
 #define MICROPY_LONGINT_IMPL                (MICROPY_LONGINT_IMPL_MPZ)
 #define MICROPY_FLOAT_IMPL                  (MICROPY_FLOAT_IMPL_DOUBLE)
 #define MICROPY_MODULE_FROZEN_MPY           (1)
-// #define MICROPY_ENABLE_FINALISER            (1)
+#define MICROPY_ENABLE_FINALISER            (1)
 #define MICROPY_STACK_CHECK                 (1)
 #define MICROPY_ENABLE_EMERGENCY_EXCEPTION_BUF (1)
 #define MICROPY_KBD_EXCEPTION               (1)
@@ -107,7 +107,7 @@
 #define MICROPY_PY_MATH                     (1)
 #define MICROPY_PY_MATH_SPECIAL_FUNCTIONS   (1)
 #define MICROPY_PY_CMATH                    (1)
-#define MICROPY_PY_GC                       (0)
+#define MICROPY_PY_GC                       (1)
 #define MICROPY_PY_IO                       (1)
 #define MICROPY_PY_IO_IOBASE                (1)
 #define MICROPY_PY_IO_FILEIO                (1)

From 46f18eb378452a429c15d64dfc2be19c65220a1b Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sun, 12 May 2019 21:09:33 +0200
Subject: [PATCH 3214/3533] Preliminary fatal error message

---
 ports/gprs_a9/main.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/ports/gprs_a9/main.c b/ports/gprs_a9/main.c
index 66224677f64d5..81f79ec29463d 100644
--- a/ports/gprs_a9/main.c
+++ b/ports/gprs_a9/main.c
@@ -114,19 +114,18 @@ void gc_collect(void) {
     gc_dump_info();
 }
 
-
-void NORETURN nlr_jump_fail(void *val) {
+void NORETURN mp_fatal_error(void* ptr1) {
     static const char msg[] =
         "\r\n==============================="
         "\r\nMicropython experienced a fatal"
         "\r\nerror and will be halted."
         "\r\n"
         "\r\n  reason: nlr_jump_fail"
-        "\r\n  ptr: ";
+        "\r\n  ptr1: ";
     UART_Write(UART1, (uint8_t*)msg, sizeof(msg));
 
     char msg2[16];
-    snprintf(msg2, sizeof(msg2), "%p", val);
+    snprintf(msg2, sizeof(msg2), "%p", ptr1);
     UART_Write(UART1, (uint8_t*)msg2, strlen(msg2));
 
     static const char msg3[] =
@@ -145,6 +144,10 @@ void NORETURN nlr_jump_fail(void *val) {
     while (1);
 }
 
+void NORETURN nlr_jump_fail(void *val) {
+    mp_fatal_error(val);
+}
+
 char* mp_allocate_heap(uint16_t* size) {
     uint16_t h_size = 4 * 1024;
     uint8_t* heap = OS_Malloc(h_size);

From f21aabc75ef30174f1676038966d228657deb649 Mon Sep 17 00:00:00 2001
From: nk2IsHere <nikkoz893@gmail.com>
Date: Wed, 15 May 2019 15:30:08 -0700
Subject: [PATCH 3215/3533] add i2c module

---
 ports/gprs_a9/Makefile       |   5 +-
 ports/gprs_a9/modi2c.c       | 218 +++++++++++++++++++++++++++++++++++
 ports/gprs_a9/mpconfigport.h |   9 +-
 3 files changed, 225 insertions(+), 7 deletions(-)
 create mode 100644 ports/gprs_a9/modi2c.c

diff --git a/ports/gprs_a9/Makefile b/ports/gprs_a9/Makefile
index af97dea2e54eb..9613ce8c77326 100644
--- a/ports/gprs_a9/Makefile
+++ b/ports/gprs_a9/Makefile
@@ -84,7 +84,6 @@ LD_OPTIONAL_OBJECTS :=
 ########################################3###
 INC += -I.
 INC += -I$(TOP)
-INC += -I$(TOP)/lib/netutils
 INC += -I$(BUILD_PATH_ABS)
 INC += -I${CSDK_PATH}/include \
        -I${CSDK_PATH}/include/std_inc \
@@ -125,7 +124,8 @@ SRC_C = \
 	file_io.c \
 	modcellular.c \
 	modgps.c \
-	modusocket.c
+	modusocket.c \
+	modi2c.c
 
 
 LIB_SRC_C = $(addprefix lib/,\
@@ -134,7 +134,6 @@ LIB_SRC_C = $(addprefix lib/,\
 	utils/interrupt_char.c \
 	utils/sys_stdio_mphal.c \
 	timeutils/timeutils.c \
-	netutils/netutils.c \
 	)
 
 LIB_SRC_C += \
diff --git a/ports/gprs_a9/modi2c.c b/ports/gprs_a9/modi2c.c
new file mode 100644
index 0000000000000..58d3ea81f0e9d
--- /dev/null
+++ b/ports/gprs_a9/modi2c.c
@@ -0,0 +1,218 @@
+#include "py/nlr.h"
+#include "py/obj.h"
+#include "py/runtime.h"
+#include "py/binary.h"
+
+#include "api_hal_i2c.h"
+
+// ----------
+// Exceptions
+// ----------
+
+MP_DEFINE_EXCEPTION(I2CError, OSError)
+
+NORETURN void mp_raise_I2CError(const char *msg) {
+    mp_raise_msg(&mp_type_I2CError, msg);
+}
+
+I2C_ID_t modi2c_private_get_I2C_ID(uint8_t _id) {
+    I2C_ID_t id;
+    switch(_id) {
+        case 2:
+            id = I2C2;
+            break;
+        case 3:
+            id = I2C3;
+            break;  
+        default:
+            id = I2C1;
+    }
+    return id;
+}
+
+I2C_FREQ_t modi2c_private_get_I2C_FREQ(uint8_t _frequency) {
+    I2C_FREQ_t frequency;
+    switch(_frequency) {
+        case 400:
+            frequency = I2C_FREQ_400K;
+            break;
+        default:
+            frequency = I2C_FREQ_100K;
+    }
+    return frequency;
+}
+
+void modi2c_private_throw_I2C_Error(I2C_Error_t error) {
+    switch(error) {
+        case I2C_ERROR_RESOURCE_RESET:
+            mp_raise_I2CError("A resource reset is required");
+            break;
+        case I2C_ERROR_RESOURCE_BUSY:
+            mp_raise_I2CError("An attempt to access a busy resource failed");
+            break;
+        case I2C_ERROR_RESOURCE_TIMEOUT:
+            mp_raise_I2CError("Timeout while trying to access the resource");
+            break;
+        case I2C_ERROR_RESOURCE_NOT_ENABLED:
+            mp_raise_I2CError("An attempt to access a resource that is not enabled");
+            break;
+        case I2C_ERROR_BAD_PARAMETER:
+            mp_raise_I2CError("Invalid parameter");
+            break;
+        case I2C_ERROR_COMMUNICATION_FAILED:
+            mp_raise_I2CError("Communication failure");
+            break;
+    }
+}
+
+// ---------
+// Methods
+// ---------
+
+STATIC mp_obj_t modi2c_init(size_t n_args, const mp_obj_t *arg) {
+    if (n_args != 2) {
+        mp_raise_I2CError("I2C id and I2C frequency are required");
+    } else {
+        I2C_ID_t id = modi2c_private_get_I2C_ID(mp_obj_get_int(arg[0]));
+        I2C_FREQ_t frequency = modi2c_private_get_I2C_FREQ(mp_obj_get_int(arg[1]));
+        I2C_Config_t config;
+
+        config.freq = frequency;
+        if(!I2C_Init(id, config)) {
+            mp_raise_I2CError("I2C init failure");
+        }
+    }
+    return mp_const_none;
+}
+
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(modi2c_init_obj, 0, 2, modi2c_init);
+
+STATIC mp_obj_t modi2c_close(size_t n_args, const mp_obj_t *arg) {
+    if (n_args != 1) {
+        mp_raise_I2CError("I2C id is required");
+    } else {
+        I2C_ID_t id = modi2c_private_get_I2C_ID(mp_obj_get_int(arg[0]));
+        if(!I2C_Close(id)) {
+            mp_raise_I2CError("I2C close failure");
+        }
+    }
+    return mp_const_none;
+}
+
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(modi2c_close_obj, 0, 1, modi2c_close);
+
+STATIC mp_obj_t modi2c_receive(size_t n_args, const mp_obj_t *arg) {
+    if (n_args < 3) {
+        mp_raise_I2CError("I2C id, slave address, data length, [timeout] are required");
+    } else {
+        I2C_ID_t id = modi2c_private_get_I2C_ID(mp_obj_get_int(arg[0]));
+        uint16_t slave_address = mp_obj_get_int(arg[1]);
+        uint16_t length = mp_obj_get_int(arg[2]);
+        uint16_t timeout = I2C_DEFAULT_TIME_OUT;
+        if(n_args == 4)
+            timeout = mp_obj_get_int(arg[3]);
+
+        vstr_t vstr;
+        vstr_init_len(&vstr, length);
+
+        I2C_Error_t error = I2C_Receive(id, slave_address, (uint8_t*)vstr.buf, vstr.len, timeout);
+        modi2c_private_throw_I2C_Error(error);
+
+        return mp_obj_new_str_from_vstr(&mp_type_bytes, &vstr);
+    }
+}
+
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(modi2c_receive_obj, 0, 4, modi2c_receive);
+
+STATIC mp_obj_t modi2c_transmit(size_t n_args, const mp_obj_t *arg) {
+    if (n_args < 3) {
+        mp_raise_I2CError("I2C id, slave address, data, [timeout] are required");
+    } else {
+        I2C_ID_t id = modi2c_private_get_I2C_ID(mp_obj_get_int(arg[0]));
+        uint16_t slave_address = mp_obj_get_int(arg[1]);
+        mp_buffer_info_t data_buffer;
+        mp_get_buffer_raise(arg[2], &data_buffer, MP_BUFFER_READ);
+        uint16_t timeout = I2C_DEFAULT_TIME_OUT;
+        if(n_args == 4)
+            timeout = mp_obj_get_int(arg[3]);
+
+        I2C_Error_t error = I2C_Transmit(id, slave_address, (uint8_t*)data_buffer.buf, data_buffer.len, timeout);
+        modi2c_private_throw_I2C_Error(error);
+
+        return mp_const_none;
+    }
+}
+
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(modi2c_transmit_obj, 0, 4, modi2c_transmit);
+
+STATIC mp_obj_t modi2c_mem_receive(size_t n_args, const mp_obj_t *arg) {
+    if (n_args < 5) {
+        mp_raise_I2CError("I2C id, slave address, memory address, memory size, memory length, [timeout] are required");
+    } else {
+        I2C_ID_t id = modi2c_private_get_I2C_ID(mp_obj_get_int(arg[0]));
+        uint16_t slave_address = mp_obj_get_int(arg[1]);
+        uint32_t memory_address = mp_obj_get_int(arg[2]);
+        uint8_t memory_size = mp_obj_get_int(arg[3]);
+        uint16_t length = mp_obj_get_int(arg[4]);
+        uint16_t timeout = I2C_DEFAULT_TIME_OUT;
+        if(n_args == 6)
+            timeout = mp_obj_get_int(arg[5]);
+
+        vstr_t vstr;
+        vstr_init_len(&vstr, length);
+
+        I2C_Error_t error = I2C_ReadMem(id, slave_address, memory_address, memory_size, (uint8_t*)vstr.buf, vstr.len, timeout);
+        modi2c_private_throw_I2C_Error(error);
+
+        return mp_obj_new_str_from_vstr(&mp_type_bytes, &vstr);
+    }
+}
+
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(modi2c_mem_receive_obj, 0, 6, modi2c_mem_receive);
+
+STATIC mp_obj_t modi2c_mem_transmit(size_t n_args, const mp_obj_t *arg) {
+    if (n_args < 6) {
+        mp_raise_I2CError("I2C id, slave address, memory address, memory size, data, [timeout] are required");
+    } else {
+        I2C_ID_t id = modi2c_private_get_I2C_ID(mp_obj_get_int(arg[0]));
+        uint16_t slave_address = mp_obj_get_int(arg[1]);
+        uint32_t memory_address = mp_obj_get_int(arg[2]);
+        uint8_t memory_size = mp_obj_get_int(arg[3]);
+        mp_buffer_info_t data_buffer;
+        mp_get_buffer_raise(arg[4], &data_buffer, MP_BUFFER_READ);
+        uint16_t timeout = I2C_DEFAULT_TIME_OUT;
+        if(n_args == 6)
+            timeout = mp_obj_get_int(arg[5]);
+
+        I2C_Error_t error = I2C_WriteMem(id, slave_address, memory_address, memory_size, (uint8_t*)data_buffer.buf, data_buffer.len, timeout);
+        modi2c_private_throw_I2C_Error(error);
+
+        return mp_const_none;
+    }
+}
+
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(modi2c_mem_transmit_obj, 0, 6, modi2c_mem_transmit);
+
+// -------
+// Modules
+// -------
+
+STATIC const mp_map_elem_t i2c_globals_table[] = {
+    { MP_OBJ_NEW_QSTR(MP_QSTR___name__), MP_OBJ_NEW_QSTR(MP_QSTR_i2c) },
+
+    { MP_OBJ_NEW_QSTR(MP_QSTR_I2CError), (mp_obj_t)MP_ROM_PTR(&mp_type_I2CError) },
+
+    { MP_OBJ_NEW_QSTR(MP_QSTR_init), (mp_obj_t)&modi2c_init_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_close), (mp_obj_t)&modi2c_close_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_receive), (mp_obj_t)&modi2c_receive_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_transmit), (mp_obj_t)&modi2c_transmit_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_mem_receive), (mp_obj_t)&modi2c_mem_receive_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_mem_transmit), (mp_obj_t)&modi2c_mem_transmit_obj },
+};
+
+STATIC MP_DEFINE_CONST_DICT (mp_module_i2c_globals, i2c_globals_table);
+
+const mp_obj_module_t i2c_module = {
+    .base = { &mp_type_module },
+    .globals = (mp_obj_dict_t*)&mp_module_i2c_globals,
+};
\ No newline at end of file
diff --git a/ports/gprs_a9/mpconfigport.h b/ports/gprs_a9/mpconfigport.h
index 0c90ce80e4c90..653d4a4a6f52e 100644
--- a/ports/gprs_a9/mpconfigport.h
+++ b/ports/gprs_a9/mpconfigport.h
@@ -32,11 +32,11 @@
 // Python internal features
 #define MICROPY_ENABLE_COMPILER             (1)
 #define MICROPY_REPL_EVENT_DRIVEN           (1)
-#define MICROPY_ENABLE_GC                   (1)
+// #define MICROPY_ENABLE_GC                   (1)
 #define MICROPY_LONGINT_IMPL                (MICROPY_LONGINT_IMPL_MPZ)
 #define MICROPY_FLOAT_IMPL                  (MICROPY_FLOAT_IMPL_DOUBLE)
 #define MICROPY_MODULE_FROZEN_MPY           (1)
-#define MICROPY_ENABLE_FINALISER            (1)
+// #define MICROPY_ENABLE_FINALISER            (1)
 #define MICROPY_STACK_CHECK                 (1)
 #define MICROPY_ENABLE_EMERGENCY_EXCEPTION_BUF (1)
 #define MICROPY_KBD_EXCEPTION               (1)
@@ -107,7 +107,7 @@
 #define MICROPY_PY_MATH                     (1)
 #define MICROPY_PY_MATH_SPECIAL_FUNCTIONS   (1)
 #define MICROPY_PY_CMATH                    (1)
-#define MICROPY_PY_GC                       (1)
+#define MICROPY_PY_GC                       (0)
 #define MICROPY_PY_IO                       (1)
 #define MICROPY_PY_IO_IOBASE                (1)
 #define MICROPY_PY_IO_FILEIO                (1)
@@ -202,6 +202,7 @@ extern const struct _mp_obj_module_t chip_module;
 extern const struct _mp_obj_module_t cellular_module;
 extern const struct _mp_obj_module_t gps_module;
 extern const struct _mp_obj_module_t usocket_module;
+extern const struct _mp_obj_module_t i2c_module;
 
 #define MICROPY_PORT_BUILTIN_MODULES \
     { MP_OBJ_NEW_QSTR(MP_QSTR_machine), (mp_obj_t)&mp_module_machine }, \
@@ -211,6 +212,7 @@ extern const struct _mp_obj_module_t usocket_module;
     { MP_OBJ_NEW_QSTR(MP_QSTR_cellular), (mp_obj_t)&cellular_module }, \
     { MP_OBJ_NEW_QSTR(MP_QSTR_gps), (mp_obj_t)&gps_module }, \
     { MP_OBJ_NEW_QSTR(MP_QSTR_usocket), (mp_obj_t)&usocket_module }, \
+    { MP_OBJ_NEW_QSTR(MP_QSTR_i2c), (mp_obj_t)&i2c_module }, \
 
 #define MICROPY_PORT_BUILTIN_MODULE_WEAK_LINKS \
     { MP_OBJ_NEW_QSTR(MP_QSTR_binascii), (mp_obj_t)&mp_module_ubinascii }, \
@@ -220,7 +222,6 @@ extern const struct _mp_obj_module_t usocket_module;
     { MP_OBJ_NEW_QSTR(MP_QSTR_io), (mp_obj_t)&mp_module_io }, \
     { MP_OBJ_NEW_QSTR(MP_QSTR_json), (mp_obj_t)&mp_module_ujson }, \
     { MP_OBJ_NEW_QSTR(MP_QSTR_os), (mp_obj_t)&uos_module }, \
-    { MP_OBJ_NEW_QSTR(MP_QSTR_socket), (mp_obj_t)&usocket_module }, \
     { MP_OBJ_NEW_QSTR(MP_QSTR_time), (mp_obj_t)&utime_module }, \
     { MP_OBJ_NEW_QSTR(MP_QSTR_random), (mp_obj_t)&mp_module_urandom }, \
     { MP_OBJ_NEW_QSTR(MP_QSTR_re), (mp_obj_t)&mp_module_ure }, \

From bbe0eb1fe66bc4ba544b2448ee6f88b6add4d3d8 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Thu, 16 May 2019 12:18:01 +0200
Subject: [PATCH 3216/3533] Fix latest changes: gc

---
 ports/gprs_a9/modi2c.c       | 30 +++++++++++++++++++++++++++++-
 ports/gprs_a9/mpconfigport.h |  7 ++++---
 2 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/ports/gprs_a9/modi2c.c b/ports/gprs_a9/modi2c.c
index 58d3ea81f0e9d..a6c21c1d74120 100644
--- a/ports/gprs_a9/modi2c.c
+++ b/ports/gprs_a9/modi2c.c
@@ -1,3 +1,31 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * Development of the code in this file was sponsored by Microbric Pty Ltd
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2019 nk2IsHere
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
 #include "py/nlr.h"
 #include "py/obj.h"
 #include "py/runtime.h"
@@ -215,4 +243,4 @@ STATIC MP_DEFINE_CONST_DICT (mp_module_i2c_globals, i2c_globals_table);
 const mp_obj_module_t i2c_module = {
     .base = { &mp_type_module },
     .globals = (mp_obj_dict_t*)&mp_module_i2c_globals,
-};
\ No newline at end of file
+};
diff --git a/ports/gprs_a9/mpconfigport.h b/ports/gprs_a9/mpconfigport.h
index 653d4a4a6f52e..c13fa14c62c95 100644
--- a/ports/gprs_a9/mpconfigport.h
+++ b/ports/gprs_a9/mpconfigport.h
@@ -32,11 +32,11 @@
 // Python internal features
 #define MICROPY_ENABLE_COMPILER             (1)
 #define MICROPY_REPL_EVENT_DRIVEN           (1)
-// #define MICROPY_ENABLE_GC                   (1)
+#define MICROPY_ENABLE_GC                   (1)
 #define MICROPY_LONGINT_IMPL                (MICROPY_LONGINT_IMPL_MPZ)
 #define MICROPY_FLOAT_IMPL                  (MICROPY_FLOAT_IMPL_DOUBLE)
 #define MICROPY_MODULE_FROZEN_MPY           (1)
-// #define MICROPY_ENABLE_FINALISER            (1)
+#define MICROPY_ENABLE_FINALISER            (1)
 #define MICROPY_STACK_CHECK                 (1)
 #define MICROPY_ENABLE_EMERGENCY_EXCEPTION_BUF (1)
 #define MICROPY_KBD_EXCEPTION               (1)
@@ -107,7 +107,7 @@
 #define MICROPY_PY_MATH                     (1)
 #define MICROPY_PY_MATH_SPECIAL_FUNCTIONS   (1)
 #define MICROPY_PY_CMATH                    (1)
-#define MICROPY_PY_GC                       (0)
+#define MICROPY_PY_GC                       (1)
 #define MICROPY_PY_IO                       (1)
 #define MICROPY_PY_IO_IOBASE                (1)
 #define MICROPY_PY_IO_FILEIO                (1)
@@ -222,6 +222,7 @@ extern const struct _mp_obj_module_t i2c_module;
     { MP_OBJ_NEW_QSTR(MP_QSTR_io), (mp_obj_t)&mp_module_io }, \
     { MP_OBJ_NEW_QSTR(MP_QSTR_json), (mp_obj_t)&mp_module_ujson }, \
     { MP_OBJ_NEW_QSTR(MP_QSTR_os), (mp_obj_t)&uos_module }, \
+    { MP_OBJ_NEW_QSTR(MP_QSTR_socket), (mp_obj_t)&usocket_module }, \
     { MP_OBJ_NEW_QSTR(MP_QSTR_time), (mp_obj_t)&utime_module }, \
     { MP_OBJ_NEW_QSTR(MP_QSTR_random), (mp_obj_t)&mp_module_urandom }, \
     { MP_OBJ_NEW_QSTR(MP_QSTR_re), (mp_obj_t)&mp_module_ure }, \

From 1c28ab048d1657bf6e1ece9ed50ca607ec86f016 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Thu, 16 May 2019 12:26:35 +0200
Subject: [PATCH 3217/3533] Fix missing libraries

---
 ports/gprs_a9/Makefile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ports/gprs_a9/Makefile b/ports/gprs_a9/Makefile
index 9613ce8c77326..e4cdd2ea24122 100644
--- a/ports/gprs_a9/Makefile
+++ b/ports/gprs_a9/Makefile
@@ -84,6 +84,7 @@ LD_OPTIONAL_OBJECTS :=
 ########################################3###
 INC += -I.
 INC += -I$(TOP)
+INC += -I$(TOP)/lib/netutils
 INC += -I$(BUILD_PATH_ABS)
 INC += -I${CSDK_PATH}/include \
        -I${CSDK_PATH}/include/std_inc \
@@ -134,6 +135,7 @@ LIB_SRC_C = $(addprefix lib/,\
 	utils/interrupt_char.c \
 	utils/sys_stdio_mphal.c \
 	timeutils/timeutils.c \
+	netutils/netutils.c \
 	)
 
 LIB_SRC_C += \

From d7d72a4f087c8eab1a168b8986489fd267df3c43 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sun, 19 May 2019 18:20:55 +0200
Subject: [PATCH 3218/3533] Fixed heap allocation; added gc test; reorganized
 fatal error

---
 ports/gprs_a9/Makefile      |  1 +
 ports/gprs_a9/fatal.c       | 97 +++++++++++++++++++++++++++++++++++++
 ports/gprs_a9/fatal.h       | 36 ++++++++++++++
 ports/gprs_a9/frozentest.py | 18 +++++++
 ports/gprs_a9/main.c        | 62 +++++++++---------------
 5 files changed, 176 insertions(+), 38 deletions(-)
 create mode 100644 ports/gprs_a9/fatal.c
 create mode 100644 ports/gprs_a9/fatal.h

diff --git a/ports/gprs_a9/Makefile b/ports/gprs_a9/Makefile
index e4cdd2ea24122..e5290630b2d55 100644
--- a/ports/gprs_a9/Makefile
+++ b/ports/gprs_a9/Makefile
@@ -113,6 +113,7 @@ LIBS =
 
 SRC_C = \
 	main.c \
+	fatal.c \
 	help.c \
 	modmachine.c \
 	machine_pin.c \
diff --git a/ports/gprs_a9/fatal.c b/ports/gprs_a9/fatal.c
new file mode 100644
index 0000000000000..9dc72d1005c90
--- /dev/null
+++ b/ports/gprs_a9/fatal.c
@@ -0,0 +1,97 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * Development of the code in this file was sponsored by Microbric Pty Ltd
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2019 pulkin
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include <stdio.h>
+#include <string.h>
+
+#include "api_os.h"
+#include "api_fs.h"
+#include "api_hal_pm.h"
+#include "api_hal_uart.h"
+
+#include "mpconfigport.h"
+#include "fatal.h"
+
+static const char msg1[] =
+    "\r\n==============================="
+    "\r\nMicropython experienced a fatal"
+    "\r\n   error and will be halted."
+    "\r\n"
+    "\r\n  reason: ";
+static const char msg2[] =
+    "\r\n  ptr1: ";
+static const char msg3[] =
+    "\r\n=============================="
+    "\r\n";
+
+static const char msg_nlr_jump_fail[] = "nlr jump fail";
+static const char msg_heap_init[] = "heap init fail";
+static const char msg_unknown[] = "unknown";
+
+char var[16];
+
+void NORETURN mp_fatal_error(uint8_t reason, void* ptr1) {
+    // ========================================
+    // A fatal error. Avoid using stack.
+    // ========================================
+    UART_Write(UART1, (uint8_t*)msg1, sizeof(msg1));
+    switch (reason) {
+        case MP_FATAL_REASON_NLR_JUMP_FAIL:
+            UART_Write(UART1, (uint8_t*)msg_nlr_jump_fail, sizeof(msg_nlr_jump_fail));
+            break;
+        case MP_FATAL_REASON_HEAP_INIT:
+            UART_Write(UART1, (uint8_t*)msg_heap_init, sizeof(msg_heap_init));
+            break;
+        default:
+            UART_Write(UART1, (uint8_t*)msg_unknown, sizeof(msg_unknown));
+    }
+    UART_Write(UART1, (uint8_t*)msg2, sizeof(msg2));
+    snprintf(var, sizeof(var), "%p", ptr1);
+    UART_Write(UART1, (uint8_t*)var, strlen(var)+1);
+    UART_Write(UART1, (uint8_t*)msg3, sizeof(msg3));
+
+    int fd = API_FS_Open(".reboot_on_fatal", FS_O_RDONLY, 0);
+    if (fd < 0) {
+        switch (reason) {
+            case MP_FATAL_REASON_NLR_JUMP_FAIL:
+                Assert(false, msg_nlr_jump_fail);
+                break;
+            case MP_FATAL_REASON_HEAP_INIT:
+                Assert(false, msg_heap_init);
+                break;
+            default:
+                Assert(false, msg_unknown);
+        }
+    } else {
+        API_FS_Close(fd);
+        OS_Sleep(5000);
+        PM_Restart();
+    }
+    while (1);
+}
+
diff --git a/ports/gprs_a9/fatal.h b/ports/gprs_a9/fatal.h
new file mode 100644
index 0000000000000..7e18f99317302
--- /dev/null
+++ b/ports/gprs_a9/fatal.h
@@ -0,0 +1,36 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * Development of the code in this file was sponsored by Microbric Pty Ltd
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2019 pulkin
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#define MP_FATAL_REASON_NLR_JUMP_FAIL 1
+#define MP_FATAL_REASON_HEAP_INIT 2
+
+#ifndef NORETURN
+#define NORETURN __attribute__((noreturn))
+#endif
+
+void NORETURN mp_fatal_error(uint8_t reason, void* ptr1);
diff --git a/ports/gprs_a9/frozentest.py b/ports/gprs_a9/frozentest.py
index a48126969fba5..559b80e75e7a4 100644
--- a/ports/gprs_a9/frozentest.py
+++ b/ports/gprs_a9/frozentest.py
@@ -17,6 +17,24 @@
 for i in range(4):
     print(i)
 
+print("================")
+print("gc")
+print("================")
+print("Testing loop ...")
+long_string = "-" * 2 * 2048
+for i in range(512):
+    x = str(i) + long_string
+del long_string
+del x
+
+import gc
+gc.collect()
+mem_free = gc.mem_free()
+mem_alloc = gc.mem_alloc()
+mem_tot = mem_free + mem_alloc
+print("Free:", mem_free, "alloc:", mem_alloc, "total:", mem_tot)
+assert mem_tot > 512e3
+
 if test_fs:
     print("================")
     print("filesystem")
diff --git a/ports/gprs_a9/main.c b/ports/gprs_a9/main.c
index 81f79ec29463d..70527282a3d8a 100644
--- a/ports/gprs_a9/main.c
+++ b/ports/gprs_a9/main.c
@@ -50,6 +50,7 @@
 #include "api_network.h"
 #include "time.h"
 #include "api_fs.h"
+#include "fatal.h"
 
 #include "moduos.h"
 #include "mphalport.h"
@@ -64,6 +65,9 @@
 #define MICROPYTHON_TASK_PRIORITY       1
 #define UART_CIRCLE_FIFO_BUFFER_MAX_LENGTH 2048
 
+#define MICROPYTHON_HEAP_MAX_SIZE (1024 * 2048)
+#define MICROPYTHON_HEAP_MIN_SIZE (2048)
+
 STATIC char* heap;
 
 HANDLE mainTaskHandle  = NULL;
@@ -111,52 +115,30 @@ void gc_collect(void) {
     gc_collect_start();
     gc_collect_root(&dummy, ((mp_uint_t)stack_top - (mp_uint_t)&dummy) / sizeof(mp_uint_t));
     gc_collect_end();
-    gc_dump_info();
-}
-
-void NORETURN mp_fatal_error(void* ptr1) {
-    static const char msg[] =
-        "\r\n==============================="
-        "\r\nMicropython experienced a fatal"
-        "\r\nerror and will be halted."
-        "\r\n"
-        "\r\n  reason: nlr_jump_fail"
-        "\r\n  ptr1: ";
-    UART_Write(UART1, (uint8_t*)msg, sizeof(msg));
-
-    char msg2[16];
-    snprintf(msg2, sizeof(msg2), "%p", ptr1);
-    UART_Write(UART1, (uint8_t*)msg2, strlen(msg2));
-
-    static const char msg3[] =
-        "\r\n=============================="
-        "\r\n";
-    UART_Write(UART1, (uint8_t*)msg3, sizeof(msg3));
-
-    int fd = API_FS_Open(".reboot_on_fatal", FS_O_RDONLY, 0);
-    if (fd < 0) {
-        Assert(false, "nlr_jump_fail");
-    } else {
-        API_FS_Close(fd);
-        OS_Sleep(5000);
-        PM_Restart();
-    }
-    while (1);
+    // gc_dump_info();
 }
 
 void NORETURN nlr_jump_fail(void *val) {
-    mp_fatal_error(val);
+    mp_fatal_error(MP_FATAL_REASON_NLR_JUMP_FAIL, val);
 }
 
-char* mp_allocate_heap(uint16_t* size) {
-    uint16_t h_size = 4 * 1024;
-    uint8_t* heap = OS_Malloc(h_size);
-    if (!heap) {
-        mp_fatal_error(NULL);
+#if MICROPY_ENABLE_GC
+char* mp_allocate_heap(uint32_t* size) {
+    uint32_t h_size = MICROPYTHON_HEAP_MAX_SIZE;
+    uint8_t* heap = NULL;
+    while (!heap) {
+        if (h_size < MICROPYTHON_HEAP_MIN_SIZE) {
+            mp_fatal_error(MP_FATAL_REASON_HEAP_INIT, NULL);
+        }
+        heap = OS_Malloc(h_size);
+        if (!heap) {
+            h_size = h_size >> 1;
+        }
     }
     size[0] = h_size;
     return (char*)heap;
 }
+#endif
 
 /*
 void NORETURN __fatal_error(const char *msg) {
@@ -186,9 +168,11 @@ void MicroPyTask(void *pData) {
     stack_top = info.stackTop + info.stackSize * 4;
     mp_stack_set_top((void *)stack_top);
     mp_stack_set_limit(MICROPYTHON_TASK_STACK_SIZE * 4 - 1024);
-    uint16_t heap_size;
+#if MICROPY_ENABLE_GC
+    uint32_t heap_size;
     heap = mp_allocate_heap(&heap_size);
     gc_init(heap, heap + heap_size);
+#endif
     mp_init();
     moduos_init0();
     modcellular_init0();
@@ -238,7 +222,9 @@ void MicroPyTask(void *pData) {
         // PM_SetSysMinFreq(PM_SYS_FREQ_32K);
     }
 
+#if MICROPY_ENABLE_GC
     gc_sweep_all();
+#endif
     mp_deinit();
     OS_Free(heap);
     mp_hal_stdout_tx_str("PYB: soft reboot\r\n");

From b08c6b85b944cafa696e11e97a02896adca38cef Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sun, 19 May 2019 18:28:33 +0200
Subject: [PATCH 3219/3533] Add socket finalizer test

---
 ports/gprs_a9/frozentest.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ports/gprs_a9/frozentest.py b/ports/gprs_a9/frozentest.py
index 559b80e75e7a4..806154bef512e 100644
--- a/ports/gprs_a9/frozentest.py
+++ b/ports/gprs_a9/frozentest.py
@@ -312,7 +312,8 @@
     print("Socket recvd (2):", response, fr)
     assert response == response_expected
     assert fr == host_ai[4]
-    s.close()
+    del s
+    gc.collect()
 
     assert sock.get_num_open() == 0
 

From a96381b3c75a6051ca04654acf817e50322680b0 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sun, 19 May 2019 18:37:26 +0200
Subject: [PATCH 3220/3533] Add a contiguous block allocation test and some
 info into README

---
 ports/gprs_a9/README.md     | 1 +
 ports/gprs_a9/frozentest.py | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/ports/gprs_a9/README.md b/ports/gprs_a9/README.md
index 574576887e928..62df2b77c8b73 100644
--- a/ports/gprs_a9/README.md
+++ b/ports/gprs_a9/README.md
@@ -442,4 +442,5 @@ Provides power-related functions: power, watchdogs.
 ## Misc ##
 
 * The module halts on fatal errors; create an empty file `.reboot_on_fatal` if a reboot is desired
+* The size of micropython heap is roughly 512 Kb.
 
diff --git a/ports/gprs_a9/frozentest.py b/ports/gprs_a9/frozentest.py
index 806154bef512e..4863e1c949328 100644
--- a/ports/gprs_a9/frozentest.py
+++ b/ports/gprs_a9/frozentest.py
@@ -34,6 +34,9 @@
 mem_tot = mem_free + mem_alloc
 print("Free:", mem_free, "alloc:", mem_alloc, "total:", mem_tot)
 assert mem_tot > 512e3
+print("400k allocation ...")
+x = bytearray(400000)
+del x
 
 if test_fs:
     print("================")

From f75f8a3590eb9b4c16427f2bf3120e00a5845078 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sun, 19 May 2019 18:45:21 +0200
Subject: [PATCH 3221/3533] Adjusted a test and README

---
 ports/gprs_a9/README.md     | 2 +-
 ports/gprs_a9/frozentest.py | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/ports/gprs_a9/README.md b/ports/gprs_a9/README.md
index 62df2b77c8b73..d049fa79db5c1 100644
--- a/ports/gprs_a9/README.md
+++ b/ports/gprs_a9/README.md
@@ -442,5 +442,5 @@ Provides power-related functions: power, watchdogs.
 ## Misc ##
 
 * The module halts on fatal errors; create an empty file `.reboot_on_fatal` if a reboot is desired
-* The size of micropython heap is roughly 512 Kb.
+* The size of micropython heap is roughly 512 Kb. 400k can be realistically allocated right after hard reset.
 
diff --git a/ports/gprs_a9/frozentest.py b/ports/gprs_a9/frozentest.py
index 4863e1c949328..236502e431715 100644
--- a/ports/gprs_a9/frozentest.py
+++ b/ports/gprs_a9/frozentest.py
@@ -20,6 +20,8 @@
 print("================")
 print("gc")
 print("================")
+print("400k allocation ...")
+x = bytearray(400000)
 print("Testing loop ...")
 long_string = "-" * 2 * 2048
 for i in range(512):
@@ -34,9 +36,6 @@
 mem_tot = mem_free + mem_alloc
 print("Free:", mem_free, "alloc:", mem_alloc, "total:", mem_tot)
 assert mem_tot > 512e3
-print("400k allocation ...")
-x = bytearray(400000)
-del x
 
 if test_fs:
     print("================")

From 3149644e78ea310d975d43234a2a7238c5d07205 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Tue, 21 May 2019 23:40:36 +0200
Subject: [PATCH 3222/3533] After-merge update for the new fatfs

---
 ports/gprs_a9/Makefile       | 2 +-
 ports/gprs_a9/mpconfigport.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/gprs_a9/Makefile b/ports/gprs_a9/Makefile
index e5290630b2d55..7b16b07f91407 100644
--- a/ports/gprs_a9/Makefile
+++ b/ports/gprs_a9/Makefile
@@ -141,7 +141,7 @@ LIB_SRC_C = $(addprefix lib/,\
 
 LIB_SRC_C += \
 	lib/oofatfs/ff.c \
-	lib/oofatfs/option/unicode.c
+	lib/oofatfs/ffunicode.c
 
 
 # include py core make definitions
diff --git a/ports/gprs_a9/mpconfigport.h b/ports/gprs_a9/mpconfigport.h
index c13fa14c62c95..6e9390f53c7bd 100644
--- a/ports/gprs_a9/mpconfigport.h
+++ b/ports/gprs_a9/mpconfigport.h
@@ -168,7 +168,7 @@
 #define MICROPY_FATFS_ENABLE_LFN            (1)
 #define MICROPY_FATFS_RPATH                 (2)
 #define MICROPY_FATFS_MAX_SS                (4096)
-#define MICROPY_FATFS_LFN_CODE_PAGE         (437) /* 1=SFN/ANSI 437=LFN/U.S.(OEM) */
+#define MICROPY_FATFS_LFN_CODE_PAGE         437 /* 1=SFN/ANSI 437=LFN/U.S.(OEM) */
 #define mp_type_fileio                      mp_type_vfs_fat_fileio
 #define mp_type_textio                      mp_type_vfs_fat_textio
 

From 4a3bda1e31750b9742132fb1ea79b66a03fd1797 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Tue, 21 May 2019 23:44:48 +0200
Subject: [PATCH 3223/3533] Adjust README setup instructions

---
 ports/gprs_a9/README.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/ports/gprs_a9/README.md b/ports/gprs_a9/README.md
index d049fa79db5c1..a926b5f839635 100644
--- a/ports/gprs_a9/README.md
+++ b/ports/gprs_a9/README.md
@@ -3,14 +3,14 @@
 1. Install vendor tools: [documentation](https://ai-thinker-open.github.io/GPRS_C_SDK_DOC/en/c-sdk/installation_linux.html), [docker](https://github.com/Neutree/gprs_build)
 2. Clone this
    ```bash
-   ~ git clone git@github.com:Neutree/micropython.git
+   # git clone git@github.com:Neutree/micropython.git
    ```
 3. Make
    ```bash
-   ~ make -C mpy-cross
-   ~ cd micropython/ports/gprs_a9
-   ~ chmod +x build.sh
-   ~ ./build.sh
+   # cd micropython
+   # make -C mpy-cross
+   # cd ports/gprs_a9
+   # ./build.sh
    ```
 4. Burn `micropython/ports/gprs_a9/hex/*` using `cooltools`
 

From 6300fdc10201d860b4c1f43d612e74b4d8cc0809 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Tue, 21 May 2019 23:46:04 +0200
Subject: [PATCH 3224/3533] Adjust setup instructions: remove comment symbols

---
 ports/gprs_a9/README.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/ports/gprs_a9/README.md b/ports/gprs_a9/README.md
index a926b5f839635..1a8e6c7d0a9c8 100644
--- a/ports/gprs_a9/README.md
+++ b/ports/gprs_a9/README.md
@@ -3,14 +3,14 @@
 1. Install vendor tools: [documentation](https://ai-thinker-open.github.io/GPRS_C_SDK_DOC/en/c-sdk/installation_linux.html), [docker](https://github.com/Neutree/gprs_build)
 2. Clone this
    ```bash
-   # git clone git@github.com:Neutree/micropython.git
+   git clone git@github.com:Neutree/micropython.git
    ```
 3. Make
    ```bash
-   # cd micropython
-   # make -C mpy-cross
-   # cd ports/gprs_a9
-   # ./build.sh
+   cd micropython
+   make -C mpy-cross
+   cd ports/gprs_a9
+   ./build.sh
    ```
 4. Burn `micropython/ports/gprs_a9/hex/*` using `cooltools`
 

From 10f8bcc30fae034a7ae3166f515cbb1d038c78a5 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Tue, 21 May 2019 23:46:51 +0200
Subject: [PATCH 3225/3533] Remove the rest of the comments

---
 ports/gprs_a9/README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/gprs_a9/README.md b/ports/gprs_a9/README.md
index 1a8e6c7d0a9c8..52ac47bd87fc8 100644
--- a/ports/gprs_a9/README.md
+++ b/ports/gprs_a9/README.md
@@ -19,7 +19,7 @@
 Use [pyserial](https://github.com/pyserial) or any other terminal.
 
 ```bash
-~ miniterm.py /dev/ttyUSB1 115200 --raw
+miniterm.py /dev/ttyUSB1 115200 --raw
 ```
 
 ## Upload scipts
@@ -27,7 +27,7 @@ Use [pyserial](https://github.com/pyserial) or any other terminal.
 Use [ampy](https://github.com/pycampers/ampy).
 
 ```bash
-~ ampy --port /dev/ttyUSB1 put frozentest.py 
+ampy --port /dev/ttyUSB1 put frozentest.py 
 ```
 
 ## Run scipts

From 01d618baf2f39d4aa1b5bb7acf6aedc227401c37 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sat, 25 May 2019 00:14:57 +0200
Subject: [PATCH 3226/3533] py: add ASFLAGS assembly makefile flags

---
 py/mkrules.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/py/mkrules.mk b/py/mkrules.mk
index a58bd2ee0e4d6..1f03152b40a69 100644
--- a/py/mkrules.mk
+++ b/py/mkrules.mk
@@ -52,7 +52,7 @@ $(BUILD)/%.o: %.S
 vpath %.s . $(TOP) $(USER_C_MODULES)
 $(BUILD)/%.o: %.s
 	$(ECHO) "AS $<"
-	$(Q)$(AS) -o $@ $<
+	$(Q)$(AS) $(ASFLAGS) -o $@ $<
 
 define compile_c
 $(ECHO) "CC $<"

From 8477a61ad140c7d15ea6e7edfb660fbce15cdc25 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sat, 25 May 2019 20:26:06 +0200
Subject: [PATCH 3227/3533] ports/gprs_a9: add root ptrs from registers

---
 ports/gprs_a9/Makefile   |  7 +++++--
 ports/gprs_a9/gchelper.s | 21 +++++++++++++++++++++
 ports/gprs_a9/main.c     | 12 ++++++------
 3 files changed, 32 insertions(+), 8 deletions(-)
 create mode 100644 ports/gprs_a9/gchelper.s

diff --git a/ports/gprs_a9/Makefile b/ports/gprs_a9/Makefile
index 7b16b07f91407..de84f38303126 100644
--- a/ports/gprs_a9/Makefile
+++ b/ports/gprs_a9/Makefile
@@ -108,6 +108,7 @@ CFLAGS = $(INC) -Wshadow \
 		  -mips16 
 CFLAGS += $(CFLAGS_MOD)
 
+ASFLAGS = --warn -EL -march=xcpu -mtune=xcpu
 
 LIBS =
 
@@ -144,6 +145,9 @@ LIB_SRC_C += \
 	lib/oofatfs/ffunicode.c
 
 
+SRC_S = \
+	gchelper.s
+
 # include py core make definitions
 include $(TOP)/py/py.mk
 
@@ -153,14 +157,13 @@ OBJ_MP += $(addprefix $(BUILD)/, $(SRC_C:.c=.o))
 
 OBJ = $(OBJ_MP) $(PY_CORE_O)
 OBJ += $(addprefix $(BUILD_PATH)/, $(LIB_SRC_C:.c=.o))
+OBJ += $(addprefix $(BUILD_PATH)/, $(SRC_S:.s=.o))
 
 # List of sources for qstr extraction
 SRC_QSTR += $(SRC_C)  $(LIB_SRC_C) 
 # Append any auto-generated sources that are needed by sources listed in SRC_QSTR
 SRC_QSTR_AUTO_DEPS +=
 
-
-
 all: lod
 
 
diff --git a/ports/gprs_a9/gchelper.s b/ports/gprs_a9/gchelper.s
new file mode 100644
index 0000000000000..276db264d9b0b
--- /dev/null
+++ b/ports/gprs_a9/gchelper.s
@@ -0,0 +1,21 @@
+    .file   "gchelper.s"
+    .text
+
+    .align  4
+    .global gc_helper_get_regs_and_sp
+    .type   gc_helper_get_regs_and_sp, @function
+gc_helper_get_regs_and_sp:
+
+    sw   $s0, 0($a0)
+    sw   $s1, 4($a0)
+    sw   $s2, 8($a0)
+    sw   $s3, 12($a0)
+    sw   $s4, 16($a0)
+    sw   $s5, 20($a0)
+    sw   $s6, 24($a0)
+    sw   $s7, 28($a0)
+
+    move $v0, $sp
+    jr   $ra 
+
+    .size   gc_helper_get_regs_and_sp, .-gc_helper_get_regs_and_sp
diff --git a/ports/gprs_a9/main.c b/ports/gprs_a9/main.c
index 70527282a3d8a..645e7b04f28ad 100644
--- a/ports/gprs_a9/main.c
+++ b/ports/gprs_a9/main.c
@@ -88,6 +88,8 @@ typedef struct
     uint8_t* pParam1;
 } MicroPy_Event_t;
 
+extern mp_uint_t gc_helper_get_regs_and_sp(mp_uint_t*);
+
 #if MICROPY_ENABLE_COMPILER
 void do_str(const char *src, mp_parse_input_kind_t input_kind) {
     nlr_buf_t nlr;
@@ -107,15 +109,13 @@ void do_str(const char *src, mp_parse_input_kind_t input_kind) {
 
 static char *stack_top;
 
-
 void gc_collect(void) {
-    // WARNING: This gc_collect implementation doesn't try to get root
-    // pointers from CPU registers, and thus may function incorrectly.
-    void *dummy;
+    //ESP8266-style
     gc_collect_start();
-    gc_collect_root(&dummy, ((mp_uint_t)stack_top - (mp_uint_t)&dummy) / sizeof(mp_uint_t));
+    mp_uint_t regs[8];
+    mp_uint_t sp = gc_helper_get_regs_and_sp(regs);
+    gc_collect_root((void**)sp, (mp_uint_t)(stack_top - sp) / sizeof(mp_uint_t));
     gc_collect_end();
-    // gc_dump_info();
 }
 
 void NORETURN nlr_jump_fail(void *val) {

From e12eb89a44790ee76b78b65719a9ba63c3a3a22d Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sun, 28 Jul 2019 15:48:56 +0200
Subject: [PATCH 3228/3533] Replace malloc with SDK one

---
 ports/gprs_a9/main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/gprs_a9/main.c b/ports/gprs_a9/main.c
index 645e7b04f28ad..ee6a27b61ffe3 100644
--- a/ports/gprs_a9/main.c
+++ b/ports/gprs_a9/main.c
@@ -334,7 +334,7 @@ void EventDispatch(API_Event_t* pEvent)
             Trace(1,"UART%d received:%d,%s",pEvent->param1,pEvent->param2,pEvent->pParam1);
             if(pEvent->param1 == UART1)
             {
-                MicroPy_Event_t* event = (MicroPy_Event_t*)malloc(sizeof(MicroPy_Event_t));
+                MicroPy_Event_t* event = (MicroPy_Event_t*)OS_Malloc(sizeof(MicroPy_Event_t));
                 if(!event)
                 {
                     Trace(1,"malloc fail");

From 746b5f885eb3d47b543dc5f3028d90658c2bc493 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sun, 28 Jul 2019 15:50:18 +0200
Subject: [PATCH 3229/3533] Replace rng temporarily

---
 ports/gprs_a9/rng.c | 43 +++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 41 insertions(+), 2 deletions(-)

diff --git a/ports/gprs_a9/rng.c b/ports/gprs_a9/rng.c
index aa328bad04e10..26de1694b72c7 100644
--- a/ports/gprs_a9/rng.c
+++ b/ports/gprs_a9/rng.c
@@ -33,11 +33,41 @@
 // don't want to use urandom's pRNG because then the user won't see a reproducible
 // random stream.
 
+static uint32_t glob_seed = 42;
+
+int rand_r(uint32_t *seed) {
+  uint32_t next = *seed;
+  uint32_t result;
+
+  next *= 1103515245;
+  next += 12345;
+  result = (unsigned int) (next / 65536) % 2048;
+
+  next *= 1103515245;
+  next += 12345;
+  result <<= 10;
+  result ^= (unsigned int) (next / 65536) % 1024;
+
+  next *= 1103515245;
+  next += 12345;
+  result <<= 10;
+  result ^= (unsigned int) (next / 65536) % 1024;
+
+  *seed = next;
+
+  return result;
+}
+
+uint32_t rng_get(void) {
+    return rand_r(&glob_seed);
+}
+
 // Yasmarang random number generator by Ilya Levin
 // http://www.literatecode.com/yasmarang
+/* static uint32_t pad = 0xeda4baba, n = 69, d = 233;
+static uint8_t dat = 0;
+
 static uint32_t pyb_rng_yasmarang(void) {
-    static uint32_t pad = 0xeda4baba, n = 69, d = 233;
-    static uint8_t dat = 0;
 
     pad += dat + d * n;
     pad = (pad << 3) + (pad >> 29);
@@ -50,5 +80,14 @@ static uint32_t pyb_rng_yasmarang(void) {
 
 uint32_t rng_get(void) {
     return pyb_rng_yasmarang();
+} */
+
+/* #undef rand
+uint32_t rand(void) {
+    return pyb_rng_yasmarang();
 }
 
+uint32_t rand_r(uint32_t *seed_p) {
+    return srand(*seed_p);
+}*/
+

From 0704e5905f8efc873f870413be8de50b68536a04 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sun, 28 Jul 2019 15:50:59 +0200
Subject: [PATCH 3230/3533] Initial implementation of SSL

---
 ports/gprs_a9/Makefile        | 26 ++++++++++++++-------
 ports/gprs_a9/arpa/inet.h     |  0
 ports/gprs_a9/mpconfigport.h  |  2 ++
 ports/gprs_a9/posix_helpers.c | 44 +++++++++++++++++++++++++++++++++++
 ports/gprs_a9/sys/time.h      |  0
 ports/gprs_a9/sys/types.h     |  0
 6 files changed, 64 insertions(+), 8 deletions(-)
 create mode 100644 ports/gprs_a9/arpa/inet.h
 create mode 100644 ports/gprs_a9/posix_helpers.c
 create mode 100644 ports/gprs_a9/sys/time.h
 create mode 100644 ports/gprs_a9/sys/types.h

diff --git a/ports/gprs_a9/Makefile b/ports/gprs_a9/Makefile
index de84f38303126..b0ab2ea028900 100644
--- a/ports/gprs_a9/Makefile
+++ b/ports/gprs_a9/Makefile
@@ -84,7 +84,11 @@ LD_OPTIONAL_OBJECTS :=
 ########################################3###
 INC += -I.
 INC += -I$(TOP)
-INC += -I$(TOP)/lib/netutils
+# INC += -I$(TOP)/lib/axtls/crypto
+# INC += -I$(TOP)/lib/axtls/ssl
+# INC += -I$(TOP)/extmod/axtls-include
+# INC += -I$(TOP)/extmod/crypto-algorithms
+# INC += -I$(TOP)/lib/netutils
 INC += -I$(BUILD_PATH_ABS)
 INC += -I${CSDK_PATH}/include \
        -I${CSDK_PATH}/include/std_inc \
@@ -114,6 +118,7 @@ LIBS =
 
 SRC_C = \
 	main.c \
+	posix_helpers.c \
 	fatal.c \
 	help.c \
 	modmachine.c \
@@ -144,10 +149,16 @@ LIB_SRC_C += \
 	lib/oofatfs/ff.c \
 	lib/oofatfs/ffunicode.c
 
-
 SRC_S = \
 	gchelper.s
 
+MICROPY_PY_USSL = 1
+MICROPY_SSL_AXTLS = 1
+MICROPY_PY_UHASHLIB = 1
+MICROPY_PY_UHASHLIB_SHA1 = 1
+MICROPY_PY_UHASHLIB_SHA256 = 1
+MICROPY_PY_UCRYPTOLIB = 1
+AXTLS_DEFS_EXTRA = -Dabort=abort_ -include time.h -DRT_MAX_PLAIN_LENGTH=1024 -DRT_EXTRA=4096
 # include py core make definitions
 include $(TOP)/py/py.mk
 
@@ -158,6 +169,10 @@ OBJ_MP += $(addprefix $(BUILD)/, $(SRC_C:.c=.o))
 OBJ = $(OBJ_MP) $(PY_CORE_O)
 OBJ += $(addprefix $(BUILD_PATH)/, $(LIB_SRC_C:.c=.o))
 OBJ += $(addprefix $(BUILD_PATH)/, $(SRC_S:.s=.o))
+OBJ += $(addprefix $(BUILD_PATH)/, $(SRC_MOD:.c=.o))
+OBJ += $(addprefix $(BUILD_PATH)/, $(EXTMOD_SRC_C:.c=.o))
+OBJ += $(addprefix $(BUILD_PATH)/, $(DRIVERS_SRC_C:.c=.o))
+OBJ += ../../extmod/crypto-algorithms/sha256.o
 
 # List of sources for qstr extraction
 SRC_QSTR += $(SRC_C)  $(LIB_SRC_C) 
@@ -166,17 +181,12 @@ SRC_QSTR_AUTO_DEPS +=
 
 all: lod
 
-
 lod: ${HEX}
 	$(Q)$(MAKE) targetgen
 	$(Q)srecmap -c ${MAP_CFG_FILE} -m ${FLSH_MODEL} -b ${TARGET_FILE} ${HEX} ${LODBASE} ${STDOUT_NULL}
 	$(Q)python $(LODCOMBINE_TOOL) merge --platform $(PLATFORM_LOD_FILE) --app $(LOD_FILE) --out $(WITH_PLT_LOD_FILE)
 	$(ECHO) "BUILD OK"
 
-
-
-
-
 ${BIN}: $(OBJ)
 	$(ECHO) "LINK $@"
 	$(Q)test -f ${LD_FILE} && chmod +w ${LD_FILE} || echo ""
@@ -191,7 +201,7 @@ bin: ${BIN}
 	$(Q)${MKDIR} -p ${BIN_PATH}
 	$(Q)${CP} -f ${BIN} ${BIN_PATH}
 	$(Q)${CP} -f ${PLATFORM_ELF_PATH} ${BIN_PATH}
-	$(Q)${OBJCOPY} --strip-symbols=${STRIP_SYMBOL_FILE} ${BIN_PATH}/${FIRMWARE_NAME}.elf ${BIN_PATH}/${FIRMWARE_NAME}.elf
+	$(Q)${OBJCOPY} --strip-symbols=${STRIP_SYMBOL_FILE} -N send_packet -N calloc ${BIN_PATH}/${FIRMWARE_NAME}.elf ${BIN_PATH}/${FIRMWARE_NAME}.elf
 	$(Q)${ELFCOMBINE_TOOL} -e1 ${BIN_PATH}/${FIRMWARE_NAME}.elf -e2 ${BIN_PATH}/${PLATFORM_ELF_NAME} -o ${BIN_PATH}/${FIRMWARE_NAME}_final.elf
 	$(Q)${RM} -f ${BIN_PATH}/${FIRMWARE_NAME}.elf
 	$(Q)${RM} -f ${BIN_PATH}/${PLATFORM_ELF_NAME}
diff --git a/ports/gprs_a9/arpa/inet.h b/ports/gprs_a9/arpa/inet.h
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/ports/gprs_a9/mpconfigport.h b/ports/gprs_a9/mpconfigport.h
index 6e9390f53c7bd..0653d89ff8754 100644
--- a/ports/gprs_a9/mpconfigport.h
+++ b/ports/gprs_a9/mpconfigport.h
@@ -156,6 +156,7 @@
 // #define MICROPY_HW_SOFTSPI_MIN_DELAY        (0)
 // #define MICROPY_HW_SOFTSPI_MAX_BAUDRATE     (ets_get_cpu_frequency() * 1000000 / 200) // roughly
 // #define MICROPY_PY_USSL                     (1)
+// #define MICROPY_SSL_AXTLS                   (1)
 // #define MICROPY_SSL_MBEDTLS                 (1)
 // #define MICROPY_PY_USSL_FINALISER           (1)
 // #define MICROPY_PY_WEBSOCKET                (1)
@@ -223,6 +224,7 @@ extern const struct _mp_obj_module_t i2c_module;
     { MP_OBJ_NEW_QSTR(MP_QSTR_json), (mp_obj_t)&mp_module_ujson }, \
     { MP_OBJ_NEW_QSTR(MP_QSTR_os), (mp_obj_t)&uos_module }, \
     { MP_OBJ_NEW_QSTR(MP_QSTR_socket), (mp_obj_t)&usocket_module }, \
+    { MP_OBJ_NEW_QSTR(MP_QSTR_ssl), (mp_obj_t)&mp_module_ussl }, \
     { MP_OBJ_NEW_QSTR(MP_QSTR_time), (mp_obj_t)&utime_module }, \
     { MP_OBJ_NEW_QSTR(MP_QSTR_random), (mp_obj_t)&mp_module_urandom }, \
     { MP_OBJ_NEW_QSTR(MP_QSTR_re), (mp_obj_t)&mp_module_ure }, \
diff --git a/ports/gprs_a9/posix_helpers.c b/ports/gprs_a9/posix_helpers.c
new file mode 100644
index 0000000000000..284966e86f393
--- /dev/null
+++ b/ports/gprs_a9/posix_helpers.c
@@ -0,0 +1,44 @@
+#include <stdint.h>
+#include <stdio.h>
+#include <errno.h>
+#include <sys/time.h>
+#include "py/mphal.h"
+#include "py/gc.h"
+#include <sdk_init.h>
+
+void *malloc(size_t size) {
+    void *p = gc_alloc(size, false);
+    if (p == NULL) {
+        // POSIX requires ENOMEM to be set in case of error
+        // errno = ENOMEM;
+    }
+    return p;
+}
+void free(void *ptr) {
+    gc_free(ptr);
+}
+void *calloc(size_t nmemb, size_t size) {
+    return malloc(nmemb * size);
+}
+void *realloc(void *ptr, size_t size) {
+    void *p = gc_realloc(ptr, size, true);
+    if (p == NULL) {
+        // POSIX requires ENOMEM to be set in case of error
+        // errno = ENOMEM;
+    }
+    return p;
+}
+
+#undef htonl
+#undef ntohl
+uint32_t ntohl(uint32_t netlong) {
+    return MP_BE32TOH(netlong);
+}
+uint32_t htonl(uint32_t netlong) {
+    return MP_HTOBE32(netlong);
+}
+
+/* #undef gettimeofday
+int gettimeofday(struct timeval *tv, struct timezone *tz) {
+    return CSDK_FUNC(gettimeofday)(tv, tz);
+} */
diff --git a/ports/gprs_a9/sys/time.h b/ports/gprs_a9/sys/time.h
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/ports/gprs_a9/sys/types.h b/ports/gprs_a9/sys/types.h
new file mode 100644
index 0000000000000..e69de29bb2d1d

From 14aace892986c523d58709e6ce14bec5a4f14320 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sun, 28 Jul 2019 15:53:23 +0200
Subject: [PATCH 3231/3533] Update README for ssl

---
 ports/gprs_a9/README.md | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/ports/gprs_a9/README.md b/ports/gprs_a9/README.md
index 52ac47bd87fc8..c3c6daca22535 100644
--- a/ports/gprs_a9/README.md
+++ b/ports/gprs_a9/README.md
@@ -303,8 +303,6 @@ See [micropython docs](https://docs.micropython.org/en/latest/library/usocket.ht
 
 ### `ussl` ###
 
-*Not implemented*
-
 *Alias: `ssl`*
 
 Provides SSL over GPRS sockets.
@@ -313,8 +311,6 @@ Provides SSL over GPRS sockets.
 
 * `ssl_socket(af, type, proto)`
 
-  *Not implemented*
-
     * `close()` *Not implemented*
     * `read([size])` *Not implemented*
     * `readinto(buf[, nbytes])` *Not implemented*
@@ -325,8 +321,6 @@ Provides SSL over GPRS sockets.
 
 * `wrap_socket(sock, server_side=False, keyfile=None, certfile=None, cert_reqs=CERT_NONE, ca_certs=None)`
 
-  *Not implemented*
-
   Takes a stream socket and returns an `SSLSocket`.
 
   **Args**:

From fa353dc31771f489f69b59196dd4eabf8f7d3c98 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sun, 28 Jul 2019 16:09:48 +0200
Subject: [PATCH 3232/3533] Add SSL test

---
 ports/gprs_a9/frozentest.py | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/ports/gprs_a9/frozentest.py b/ports/gprs_a9/frozentest.py
index 236502e431715..0799de6a1af61 100644
--- a/ports/gprs_a9/frozentest.py
+++ b/ports/gprs_a9/frozentest.py
@@ -257,7 +257,7 @@
     print("Status changed:", cb, "->", cel.get_network_status())
     assert cb
 
-    import usocket as sock
+    import socket as sock
     loc_ip = sock.get_local_ip()
     print("Local IP:", loc_ip)
     assert len(loc_ip.split(".")) == 4
@@ -317,6 +317,17 @@
     del s
     gc.collect()
 
+    import ssl
+    port = 443
+    s = sock.socket()
+    s.connect((host, port))
+    s = ssl.wrap_socket(s)
+    s.write(message_f)
+    response = s.read(len(response_expected))
+    print("SSL socket recvd:", response)
+    assert response == response_expected
+    s.close()
+
     assert sock.get_num_open() == 0
 
     cel.gprs_deactivate()

From ad65d5db3f3507fb08d76e1bf0a796072dfe74d3 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sun, 28 Jul 2019 16:38:09 +0200
Subject: [PATCH 3233/3533] Donate button

---
 ports/gprs_a9/README.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ports/gprs_a9/README.md b/ports/gprs_a9/README.md
index c3c6daca22535..1083b716f6299 100644
--- a/ports/gprs_a9/README.md
+++ b/ports/gprs_a9/README.md
@@ -1,3 +1,7 @@
+Your support is important for this port: please consider donation.
+
+[![paypal](https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=2RZCNXCUCP4YG&source=url)
+
 ## Build
 
 1. Install vendor tools: [documentation](https://ai-thinker-open.github.io/GPRS_C_SDK_DOC/en/c-sdk/installation_linux.html), [docker](https://github.com/Neutree/gprs_build)

From e8d824895f62da75bd50c845f91b533694fcdc4a Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sun, 28 Jul 2019 16:44:55 +0200
Subject: [PATCH 3234/3533] Reference the port on the index page

---
 README.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/README.md b/README.md
index 6482899b251d9..6c5f5dcd552fd 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,11 @@
 [![CI badge](https://github.com/micropython/micropython/workflows/unix%20port/badge.svg)](https://github.com/micropython/micropython/actions?query=branch%3Amaster+event%3Apush) [![codecov](https://codecov.io/gh/micropython/micropython/branch/master/graph/badge.svg?token=I92PfD05sD)](https://codecov.io/gh/micropython/micropython)
+Important
+---------
+
+This repo is only for porting micropython to the GPS+GSM modules A9 and A9G.
+[Go to the port page](https://github.com/pulkin/micropython/tree/master/ports/gprs_a9) or [visit the MicroPython project page.](https://micropython.org/)
+
+[![Build Status](https://travis-ci.org/micropython/micropython.png?branch=master)](https://travis-ci.org/micropython/micropython) [![Coverage Status](https://coveralls.io/repos/micropython/micropython/badge.png?branch=master)](https://coveralls.io/r/micropython/micropython?branch=master)
 
 The MicroPython project
 =======================

From 7534fbc988f2c57ee8bc0dd4c54bf1d71f7d922f Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sun, 28 Jul 2019 16:52:54 +0200
Subject: [PATCH 3235/3533] Add ToC

---
 ports/gprs_a9/README.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/ports/gprs_a9/README.md b/ports/gprs_a9/README.md
index 1083b716f6299..71052a46ca708 100644
--- a/ports/gprs_a9/README.md
+++ b/ports/gprs_a9/README.md
@@ -43,6 +43,13 @@ ampy --port /dev/ttyUSB1 put frozentest.py
 
 ## Platform-specific modules
 
+1. [`cellular`](#`cellular`): SMS, calls, connectivity
+2. [`usocket`](#`usocket`): sockets over GPRS
+3. [`ssl`](#`ssl`): SSL over sockets
+4. [`gps`](#`gps`): everything related to GPS and assisted positioning
+5. [`machine`](#`machine`): hardware and power control
+6. [Notes](#Misc)
+
 ### `cellular`
 
 Provides cellular functionality.
@@ -441,4 +448,5 @@ Provides power-related functions: power, watchdogs.
 
 * The module halts on fatal errors; create an empty file `.reboot_on_fatal` if a reboot is desired
 * The size of micropython heap is roughly 512 Kb. 400k can be realistically allocated right after hard reset.
+* SSL is currently unstable and needs further debugging.
 

From c35c96c5448f5f1ddd379169c7c45b4146ee18eb Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sun, 28 Jul 2019 16:54:19 +0200
Subject: [PATCH 3236/3533] Fix links

---
 ports/gprs_a9/README.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/ports/gprs_a9/README.md b/ports/gprs_a9/README.md
index 71052a46ca708..e8d25ec77e7b0 100644
--- a/ports/gprs_a9/README.md
+++ b/ports/gprs_a9/README.md
@@ -43,11 +43,11 @@ ampy --port /dev/ttyUSB1 put frozentest.py
 
 ## Platform-specific modules
 
-1. [`cellular`](#`cellular`): SMS, calls, connectivity
-2. [`usocket`](#`usocket`): sockets over GPRS
-3. [`ssl`](#`ssl`): SSL over sockets
-4. [`gps`](#`gps`): everything related to GPS and assisted positioning
-5. [`machine`](#`machine`): hardware and power control
+1. [`cellular`](#cellular): SMS, calls, connectivity
+2. [`usocket`](#usocket): sockets over GPRS
+3. [`ssl`](#ssl): SSL over sockets
+4. [`gps`](#gps): everything related to GPS and assisted positioning
+5. [`machine`](#machine): hardware and power control
 6. [Notes](#Misc)
 
 ### `cellular`

From 7b62b273cbcbaac77d96ede48f06b710f31baedb Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sun, 28 Jul 2019 16:55:07 +0200
Subject: [PATCH 3237/3533] Fix SSL link

---
 ports/gprs_a9/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/gprs_a9/README.md b/ports/gprs_a9/README.md
index e8d25ec77e7b0..bf86f9da4c9c0 100644
--- a/ports/gprs_a9/README.md
+++ b/ports/gprs_a9/README.md
@@ -45,7 +45,7 @@ ampy --port /dev/ttyUSB1 put frozentest.py
 
 1. [`cellular`](#cellular): SMS, calls, connectivity
 2. [`usocket`](#usocket): sockets over GPRS
-3. [`ssl`](#ssl): SSL over sockets
+3. [`ssl`](#ussl): SSL over sockets
 4. [`gps`](#gps): everything related to GPS and assisted positioning
 5. [`machine`](#machine): hardware and power control
 6. [Notes](#Misc)

From bed1008e9f36fae14034a9520f25fe36742e7696 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sun, 28 Jul 2019 16:56:43 +0200
Subject: [PATCH 3238/3533] Fix SSL entries in README

---
 ports/gprs_a9/README.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/ports/gprs_a9/README.md b/ports/gprs_a9/README.md
index bf86f9da4c9c0..06f2c3d65356a 100644
--- a/ports/gprs_a9/README.md
+++ b/ports/gprs_a9/README.md
@@ -316,17 +316,17 @@ See [micropython docs](https://docs.micropython.org/en/latest/library/usocket.ht
 
 *Alias: `ssl`*
 
-Provides SSL over GPRS sockets.
+Provides SSL over GPRS sockets (axtls).
 
 #### Classes ####
 
 * `ssl_socket(af, type, proto)`
 
-    * `close()` *Not implemented*
-    * `read([size])` *Not implemented*
-    * `readinto(buf[, nbytes])` *Not implemented*
-    * `readline()` *Not implemented*
-    * `write(buf)` *Not implemented*
+    * `close()`
+    * `read([size])`
+    * `readinto(buf[, nbytes])`
+    * `readline()`
+    * `write(buf)`
 
 #### Methods ####
 

From 6f28215c220a3463b1294ff901033910ec0a7cfd Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sun, 28 Jul 2019 18:08:21 +0200
Subject: [PATCH 3239/3533] Typo fix

---
 ports/gprs_a9/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/gprs_a9/README.md b/ports/gprs_a9/README.md
index 06f2c3d65356a..d185c9ab924de 100644
--- a/ports/gprs_a9/README.md
+++ b/ports/gprs_a9/README.md
@@ -1,4 +1,4 @@
-Your support is important for this port: please consider donation.
+Your support is important for this port: please consider donating.
 
 [![paypal](https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=2RZCNXCUCP4YG&source=url)
 

From 660c56c9920de9ed280b1521d41c7311ceec7a14 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sat, 24 Aug 2019 20:31:39 +0200
Subject: [PATCH 3240/3533] Build a9: first attempt

---
 lib/GPRS_C_SDK          |     2 +-
 lib/asf4                |     2 +-
 lib/axtls               |     2 +-
 lib/btstack             |     2 +-
 lib/csdtk42-linux       |     1 +
 lib/lwip                |     2 +-
 lib/mbedtls             |     2 +-
 lib/mynewt-nimble       |     2 +-
 lib/nrfx                |     2 +-
 lib/nxp_driver          |     2 +-
 lib/stm32lib            |     2 +-
 lib/tinyusb             |     2 +-
 mpy-cross/mpy-cross     |   Bin 0 -> 313715 bytes
 mpy-cross/mpy-cross.map | 15530 ++++++++++++++++++++++++++++++++++++++
 14 files changed, 15542 insertions(+), 11 deletions(-)
 create mode 160000 lib/csdtk42-linux
 create mode 100755 mpy-cross/mpy-cross
 create mode 100644 mpy-cross/mpy-cross.map

diff --git a/lib/GPRS_C_SDK b/lib/GPRS_C_SDK
index 429ad804592bf..630532961fe93 160000
--- a/lib/GPRS_C_SDK
+++ b/lib/GPRS_C_SDK
@@ -1 +1 @@
-Subproject commit 429ad804592bf2c5f86f622119bc3f06059d22e2
+Subproject commit 630532961fe93234d07cc06f7fb877d7577f0439
diff --git a/lib/asf4 b/lib/asf4
index 84f56af13292d..d270f79aa16dd 160000
--- a/lib/asf4
+++ b/lib/asf4
@@ -1 +1 @@
-Subproject commit 84f56af13292d8f32c40acbd949bde698ddd4507
+Subproject commit d270f79aa16dd8fd4ae3b6c14544283dcb992e9c
diff --git a/lib/axtls b/lib/axtls
index 531cab9c278c9..43a6e6bd3bbc0 160000
--- a/lib/axtls
+++ b/lib/axtls
@@ -1 +1 @@
-Subproject commit 531cab9c278c947d268bd4c94ecab9153a961b43
+Subproject commit 43a6e6bd3bbc03dc501e16b89fba0ef042ed3ea0
diff --git a/lib/btstack b/lib/btstack
index 1635e36d06821..c8b9823f68c6a 160000
--- a/lib/btstack
+++ b/lib/btstack
@@ -1 +1 @@
-Subproject commit 1635e36d06821af8b61302509e91bfcc1ade84c4
+Subproject commit c8b9823f68c6af0fa52e2c4e009aba4dbf257232
diff --git a/lib/csdtk42-linux b/lib/csdtk42-linux
new file mode 160000
index 0000000000000..0501320d7c776
--- /dev/null
+++ b/lib/csdtk42-linux
@@ -0,0 +1 @@
+Subproject commit 0501320d7c77646c35b4ca61718a39168c25443f
diff --git a/lib/lwip b/lib/lwip
index 6ca936f6b588c..159e31b689577 160000
--- a/lib/lwip
+++ b/lib/lwip
@@ -1 +1 @@
-Subproject commit 6ca936f6b588cee702c638eee75c2436e6cf75de
+Subproject commit 159e31b689577dbf69cf0683bbaffbd71fa5ee10
diff --git a/lib/mbedtls b/lib/mbedtls
index 1bc2c9cb8b8fe..3f8d78411a26e 160000
--- a/lib/mbedtls
+++ b/lib/mbedtls
@@ -1 +1 @@
-Subproject commit 1bc2c9cb8b8fe4659bd94b8ebba5a4c02029b7fa
+Subproject commit 3f8d78411a26e833db18d9fbde0e2f0baeda87f0
diff --git a/lib/mynewt-nimble b/lib/mynewt-nimble
index 42849560ba790..97ce3eacaaa79 160000
--- a/lib/mynewt-nimble
+++ b/lib/mynewt-nimble
@@ -1 +1 @@
-Subproject commit 42849560ba7906f023f61e5f7ff3709ba2c1dfca
+Subproject commit 97ce3eacaaa79e8ed6cf71717149ced4f5328ee7
diff --git a/lib/nrfx b/lib/nrfx
index 7a4c9d946cf18..7513fc9d5c10d 160000
--- a/lib/nrfx
+++ b/lib/nrfx
@@ -1 +1 @@
-Subproject commit 7a4c9d946cf1801771fc180acdbf7b878f270093
+Subproject commit 7513fc9d5c10dc28b25bf2bb6ff0ba66cb2a3c3d
diff --git a/lib/nxp_driver b/lib/nxp_driver
index fa5a554c7944d..b618cb1d521cc 160000
--- a/lib/nxp_driver
+++ b/lib/nxp_driver
@@ -1 +1 @@
-Subproject commit fa5a554c7944d2a196626f8d3631e44943f9abcc
+Subproject commit b618cb1d521cc9e133bdcd0fca154dee2d925dfe
diff --git a/lib/stm32lib b/lib/stm32lib
index a9f8fee7bb0cb..668d7a9e54aea 160000
--- a/lib/stm32lib
+++ b/lib/stm32lib
@@ -1 +1 @@
-Subproject commit a9f8fee7bb0cb4ac1b4ff719b6b5b285f613f352
+Subproject commit 668d7a9e54aea98f8fe8a858eac1d3daa80fa824
diff --git a/lib/tinyusb b/lib/tinyusb
index 868f2bcda092b..393492823ce03 160000
--- a/lib/tinyusb
+++ b/lib/tinyusb
@@ -1 +1 @@
-Subproject commit 868f2bcda092b0b8d5f7ac55ffaef2c81316d35e
+Subproject commit 393492823ce037a2e46d367d61fad1235859af2e
diff --git a/mpy-cross/mpy-cross b/mpy-cross/mpy-cross
new file mode 100755
index 0000000000000000000000000000000000000000..7a411131c2add2745573ba9f8c8d514ef1e7cfa8
GIT binary patch
literal 313715
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

literal 0
HcmV?d00001

diff --git a/mpy-cross/mpy-cross.map b/mpy-cross/mpy-cross.map
new file mode 100644
index 0000000000000..75228359d3437
--- /dev/null
+++ b/mpy-cross/mpy-cross.map
@@ -0,0 +1,15530 @@
+Дл� удовлетворени� ��ылок на файл (�имвол) включён член архива
+
+/usr/lib/x86_64-linux-gnu/libc_nonshared.a(elf-init.oS)
+                              /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o (__libc_csu_init)
+
+Дл� удовлетворени� ��ылок на файл (�имвол) включена библиотека по необходимо�ти
+
+libm.so.6                     build/py/objcomplex.o (exp@@GLIBC_2.29)
+libc.so.6                     build/main.o (exit@@GLIBC_2.2.5)
+
+Отброшенные входные разделы
+
+ .rodata.cst4   0x0000000000000000        0x4 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .data          0x0000000000000000        0x4 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .bss           0x0000000000000000        0x0 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .note.GNU-stack
+                0x0000000000000000        0x0 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .text          0x0000000000000000        0x0 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/crti.o
+ .data          0x0000000000000000        0x0 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/crti.o
+ .bss           0x0000000000000000        0x0 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/crti.o
+ .note.GNU-stack
+                0x0000000000000000        0x0 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/crti.o
+ .data          0x0000000000000000        0x0 /usr/lib/gcc/x86_64-linux-gnu/10/crtbeginS.o
+ .note.GNU-stack
+                0x0000000000000000        0x0 /usr/lib/gcc/x86_64-linux-gnu/10/crtbeginS.o
+ .text          0x0000000000000000        0x0 build/py/mpstate.o
+ .data          0x0000000000000000        0x0 build/py/mpstate.o
+ .bss           0x0000000000000000        0x0 build/py/mpstate.o
+ .note.GNU-stack
+                0x0000000000000000        0x0 build/py/mpstate.o
+ .text          0x0000000000000000        0x0 build/py/nlr.o
+ .data          0x0000000000000000        0x0 build/py/nlr.o
+ .bss           0x0000000000000000        0x0 build/py/nlr.o
+ .note.GNU-stack
+                0x0000000000000000        0x0 build/py/nlr.o
+ .text          0x0000000000000000        0x0 build/py/nlrx86.o
+ .data          0x0000000000000000        0x0 build/py/nlrx86.o
+ .bss           0x0000000000000000        0x0 build/py/nlrx86.o
+ .comment       0x0000000000000000       0x28 build/py/nlrx86.o
+ .note.GNU-stack
+                0x0000000000000000        0x0 build/py/nlrx86.o
+ .text          0x0000000000000000        0x0 build/py/nlrx64.o
+ .data          0x0000000000000000        0x0 build/py/nlrx64.o
+ .bss           0x0000000000000000        0x0 build/py/nlrx64.o
+ .note.GNU-stack
+                0x0000000000000000        0x0 build/py/nlrx64.o
+ .text          0x0000000000000000        0x0 build/py/nlrthumb.o
+ .data          0x0000000000000000        0x0 build/py/nlrthumb.o
+ .bss           0x0000000000000000        0x0 build/py/nlrthumb.o
+ .comment       0x0000000000000000       0x28 build/py/nlrthumb.o
+ .note.GNU-stack
+                0x0000000000000000        0x0 build/py/nlrthumb.o
+ .text          0x0000000000000000        0x0 build/py/nlrpowerpc.o
+ .data          0x0000000000000000        0x0 build/py/nlrpowerpc.o
+ .bss           0x0000000000000000        0x0 build/py/nlrpowerpc.o
+ .comment       0x0000000000000000       0x28 build/py/nlrpowerpc.o
+ .note.GNU-stack
+                0x0000000000000000        0x0 build/py/nlrpowerpc.o
+ .text          0x0000000000000000        0x0 build/py/nlrxtensa.o
+ .data          0x0000000000000000        0x0 build/py/nlrxtensa.o
+ .bss           0x0000000000000000        0x0 build/py/nlrxtensa.o
+ .comment       0x0000000000000000       0x28 build/py/nlrxtensa.o
+ .note.GNU-stack
+                0x0000000000000000        0x0 build/py/nlrxtensa.o
+ .text          0x0000000000000000        0x0 build/py/nlrsetjmp.o
+ .data          0x0000000000000000        0x0 build/py/nlrsetjmp.o
+ .bss           0x0000000000000000        0x0 build/py/nlrsetjmp.o
+ .comment       0x0000000000000000       0x28 build/py/nlrsetjmp.o
+ .note.GNU-stack
+                0x0000000000000000        0x0 build/py/nlrsetjmp.o
+ .text          0x0000000000000000        0x0 build/py/malloc.o
+ .data          0x0000000000000000        0x0 build/py/malloc.o
+ .bss           0x0000000000000000        0x0 build/py/malloc.o
+ .note.GNU-stack
+                0x0000000000000000        0x0 build/py/malloc.o
+ .text          0x0000000000000000        0x0 build/py/gc.o
+ .data          0x0000000000000000        0x0 build/py/gc.o
+ .bss           0x0000000000000000        0x0 build/py/gc.o
+ .text.gc_lock  0x0000000000000000        0x9 build/py/gc.o
+ .text.gc_unlock
+                0x0000000000000000        0x9 build/py/gc.o
+ .text.gc_sweep_all
+                0x0000000000000000       0x17 build/py/gc.o
+ .text.gc_info  0x0000000000000000      0x1e4 build/py/gc.o
+ .text.gc_nbytes
+                0x0000000000000000       0x8a build/py/gc.o
+ .rodata.gc_dump_info.str1.8
+                0x0000000000000000       0x6d build/py/gc.o
+ .text.gc_dump_info
+                0x0000000000000000       0x59 build/py/gc.o
+ .rodata.gc_dump_alloc_table.str1.1
+                0x0000000000000000       0x44 build/py/gc.o
+ .text.gc_dump_alloc_table
+                0x0000000000000000      0x262 build/py/gc.o
+ .note.GNU-stack
+                0x0000000000000000        0x0 build/py/gc.o
+ .text          0x0000000000000000        0x0 build/py/pystack.o
+ .data          0x0000000000000000        0x0 build/py/pystack.o
+ .bss           0x0000000000000000        0x0 build/py/pystack.o
+ .comment       0x0000000000000000       0x28 build/py/pystack.o
+ .note.GNU-stack
+                0x0000000000000000        0x0 build/py/pystack.o
+ .text          0x0000000000000000        0x0 build/py/qstr.o
+ .data          0x0000000000000000        0x0 build/py/qstr.o
+ .bss           0x0000000000000000        0x0 build/py/qstr.o
+ .text.qstr_pool_info
+                0x0000000000000000       0xa2 build/py/qstr.o
+ .note.GNU-stack
+                0x0000000000000000        0x0 build/py/qstr.o
+ .text          0x0000000000000000        0x0 build/py/vstr.o
+ .data          0x0000000000000000        0x0 build/py/vstr.o
+ .bss           0x0000000000000000        0x0 build/py/vstr.o
+ .text.vstr_ins_blank_bytes.constprop.0
+                0x0000000000000000       0x47 build/py/vstr.o
+ .text.vstr_init_fixed_buf
+                0x0000000000000000       0x14 build/py/vstr.o
+ .text.vstr_new
+                0x0000000000000000       0x2d build/py/vstr.o
+ .text.vstr_free
+                0x0000000000000000       0x22 build/py/vstr.o
+ .text.vstr_hint_size
+                0x0000000000000000        0x5 build/py/vstr.o
+ .text.vstr_ins_byte
+                0x0000000000000000        0xc build/py/vstr.o
+ .text.vstr_ins_char
+                0x0000000000000000        0xc build/py/vstr.o
+ .text.vstr_cut_out_bytes
+                0x0000000000000000       0x3f build/py/vstr.o
+ .text.vstr_cut_head_bytes
+                0x0000000000000000        0xa build/py/vstr.o
+ .text.vstr_vprintf
+                0x0000000000000000       0x21 build/py/vstr.o
+ .text.vstr_printf
+                0x0000000000000000       0x8f build/py/vstr.o
+ .note.GNU-stack
+                0x0000000000000000        0x0 build/py/vstr.o
+ .text          0x0000000000000000        0x0 build/py/mpprint.o
+ .data          0x0000000000000000        0x0 build/py/mpprint.o
+ .bss           0x0000000000000000        0x0 build/py/mpprint.o
+ .text.plat_print_strn
+                0x0000000000000000        0x1 build/py/mpprint.o
+ .data.rel.ro.local.mp_plat_print
+                0x0000000000000000       0x10 build/py/mpprint.o
+ .note.GNU-stack
+                0x0000000000000000        0x0 build/py/mpprint.o
+ .text          0x0000000000000000        0x0 build/py/unicode.o
+ .data          0x0000000000000000        0x0 build/py/unicode.o
+ .bss           0x0000000000000000        0x0 build/py/unicode.o
+ .text.unichar_isident
+                0x0000000000000000       0x26 build/py/unicode.o
+ .text.unichar_isalnum
+                0x0000000000000000       0x1e build/py/unicode.o
+ .note.GNU-stack
+                0x0000000000000000        0x0 build/py/unicode.o
+ .text          0x0000000000000000        0x0 build/py/mpz.o
+ .data          0x0000000000000000        0x0 build/py/mpz.o
+ .bss           0x0000000000000000        0x0 build/py/mpz.o
+ .text.mpz_pow3_inpl
+                0x0000000000000000      0x11a build/py/mpz.o
+ .text.mpz_as_uint_checked
+                0x0000000000000000       0x3d build/py/mpz.o
+ .note.GNU-stack
+                0x0000000000000000        0x0 build/py/mpz.o
+ .text          0x0000000000000000        0x0 build/py/reader.o
+ .data          0x0000000000000000        0x0 build/py/reader.o
+ .bss           0x0000000000000000        0x0 build/py/reader.o
+ .text.mp_reader_mem_readbyte
+                0x0000000000000000       0x1e build/py/reader.o
+ .text.mp_reader_mem_close
+                0x0000000000000000       0x1c build/py/reader.o
+ .text.mp_reader_new_mem
+                0x0000000000000000       0x51 build/py/reader.o
+ .note.GNU-stack
+                0x0000000000000000        0x0 build/py/reader.o
+ .text          0x0000000000000000        0x0 build/py/lexer.o
+ .data          0x0000000000000000        0x0 build/py/lexer.o
+ .bss           0x0000000000000000        0x0 build/py/lexer.o
+ .text.mp_lexer_new_from_str_len
+                0x0000000000000000       0x2d build/py/lexer.o
+ .text.mp_lexer_new_from_fd
+                0x0000000000000000       0x30 build/py/lexer.o
+ .note.GNU-stack
+                0x0000000000000000        0x0 build/py/lexer.o
+ .text          0x0000000000000000        0x0 build/py/parse.o
+ .data          0x0000000000000000        0x0 build/py/parse.o
+ .bss           0x0000000000000000        0x0 build/py/parse.o
+ .note.GNU-stack
+                0x0000000000000000        0x0 build/py/parse.o
+ .text          0x0000000000000000        0x0 build/py/scope.o
+ .data          0x0000000000000000        0x0 build/py/scope.o
+ .bss           0x0000000000000000        0x0 build/py/scope.o
+ .note.GNU-stack
+                0x0000000000000000        0x0 build/py/scope.o
+ .text          0x0000000000000000        0x0 build/py/compile.o
+ .data          0x0000000000000000        0x0 build/py/compile.o
+ .bss           0x0000000000000000        0x0 build/py/compile.o
+ .text.mp_compile
+                0x0000000000000000       0x16 build/py/compile.o
+ .note.GNU-stack
+                0x0000000000000000        0x0 build/py/compile.o
+ .text          0x0000000000000000        0x0 build/py/emitcommon.o
+ .data          0x0000000000000000        0x0 build/py/emitcommon.o
+ .bss           0x0000000000000000        0x0 build/py/emitcommon.o
+ .note.GNU-stack
+                0x0000000000000000        0x0 build/py/emitcommon.o
+ .text          0x0000000000000000        0x0 build/py/emitbc.o
+ .data          0x0000000000000000        0x0 build/py/emitbc.o
+ .bss           0x0000000000000000        0x0 build/py/emitbc.o
+ .note.GNU-stack
+                0x0000000000000000        0x0 build/py/emitbc.o
+ .text          0x0000000000000000        0x0 build/py/asmbase.o
+ .data          0x0000000000000000        0x0 build/py/asmbase.o
+ .bss           0x0000000000000000        0x0 build/py/asmbase.o
+ .note.GNU-stack
+                0x0000000000000000        0x0 build/py/asmbase.o
+ .text          0x0000000000000000        0x0 build/py/asmx64.o
+ .data          0x0000000000000000        0x0 build/py/asmx64.o
+ .bss           0x0000000000000000        0x0 build/py/asmx64.o
+ .text.asm_x64_nop
+                0x0000000000000000        0xa build/py/asmx64.o
+ .text.asm_x64_push_r64
+                0x0000000000000000       0x23 build/py/asmx64.o
+ .text.asm_x64_pop_r64
+                0x0000000000000000       0x23 build/py/asmx64.o
+ .note.GNU-stack
+                0x0000000000000000        0x0 build/py/asmx64.o
+ .text          0x0000000000000000        0x0 build/py/emitnx64.o
+ .data          0x0000000000000000        0x0 build/py/emitnx64.o
+ .bss           0x0000000000000000        0x0 build/py/emitnx64.o
+ .note.GNU-stack
+                0x0000000000000000        0x0 build/py/emitnx64.o
+ .text          0x0000000000000000        0x0 build/py/asmx86.o
+ .data          0x0000000000000000        0x0 build/py/asmx86.o
+ .bss           0x0000000000000000        0x0 build/py/asmx86.o
+ .note.GNU-stack
+                0x0000000000000000        0x0 build/py/asmx86.o
+ .text          0x0000000000000000        0x0 build/py/emitnx86.o
+ .data          0x0000000000000000        0x0 build/py/emitnx86.o
+ .bss           0x0000000000000000        0x0 build/py/emitnx86.o
+ .note.GNU-stack
+                0x0000000000000000        0x0 build/py/emitnx86.o
+ .text          0x0000000000000000        0x0 build/py/asmthumb.o
+ .data          0x0000000000000000        0x0 build/py/asmthumb.o
+ .bss           0x0000000000000000        0x0 build/py/asmthumb.o
+ .note.GNU-stack
+                0x0000000000000000        0x0 build/py/asmthumb.o
+ .text          0x0000000000000000        0x0 build/py/emitnthumb.o
+ .data          0x0000000000000000        0x0 build/py/emitnthumb.o
+ .bss           0x0000000000000000        0x0 build/py/emitnthumb.o
+ .note.GNU-stack
+                0x0000000000000000        0x0 build/py/emitnthumb.o
+ .text          0x0000000000000000        0x0 build/py/emitinlinethumb.o
+ .data          0x0000000000000000        0x0 build/py/emitinlinethumb.o
+ .bss           0x0000000000000000        0x0 build/py/emitinlinethumb.o
+ .note.GNU-stack
+                0x0000000000000000        0x0 build/py/emitinlinethumb.o
+ .text          0x0000000000000000        0x0 build/py/asmarm.o
+ .data          0x0000000000000000        0x0 build/py/asmarm.o
+ .bss           0x0000000000000000        0x0 build/py/asmarm.o
+ .text.asm_arm_bkpt
+                0x0000000000000000        0xa build/py/asmarm.o
+ .text.asm_arm_push
+                0x0000000000000000        0xe build/py/asmarm.o
+ .text.asm_arm_pop
+                0x0000000000000000        0xe build/py/asmarm.o
+ .note.GNU-stack
+                0x0000000000000000        0x0 build/py/asmarm.o
+ .text          0x0000000000000000        0x0 build/py/emitnarm.o
+ .data          0x0000000000000000        0x0 build/py/emitnarm.o
+ .bss           0x0000000000000000        0x0 build/py/emitnarm.o
+ .note.GNU-stack
+                0x0000000000000000        0x0 build/py/emitnarm.o
+ .text          0x0000000000000000        0x0 build/py/asmxtensa.o
+ .data          0x0000000000000000        0x0 build/py/asmxtensa.o
+ .bss           0x0000000000000000        0x0 build/py/asmxtensa.o
+ .note.GNU-stack
+                0x0000000000000000        0x0 build/py/asmxtensa.o
+ .text          0x0000000000000000        0x0 build/py/emitnxtensa.o
+ .data          0x0000000000000000        0x0 build/py/emitnxtensa.o
+ .bss           0x0000000000000000        0x0 build/py/emitnxtensa.o
+ .note.GNU-stack
+                0x0000000000000000        0x0 build/py/emitnxtensa.o
+ .text          0x0000000000000000        0x0 build/py/emitinlinextensa.o
+ .data          0x0000000000000000        0x0 build/py/emitinlinextensa.o
+ .bss           0x0000000000000000        0x0 build/py/emitinlinextensa.o
+ .note.GNU-stack
+                0x0000000000000000        0x0 build/py/emitinlinextensa.o
+ .text          0x0000000000000000        0x0 build/py/emitnxtensawin.o
+ .data          0x0000000000000000        0x0 build/py/emitnxtensawin.o
+ .bss           0x0000000000000000        0x0 build/py/emitnxtensawin.o
+ .note.GNU-stack
+                0x0000000000000000        0x0 build/py/emitnxtensawin.o
+ .text          0x0000000000000000        0x0 build/py/formatfloat.o
+ .data          0x0000000000000000        0x0 build/py/formatfloat.o
+ .bss           0x0000000000000000        0x0 build/py/formatfloat.o
+ .note.GNU-stack
+                0x0000000000000000        0x0 build/py/formatfloat.o
+ .text          0x0000000000000000        0x0 build/py/parsenumbase.o
+ .data          0x0000000000000000        0x0 build/py/parsenumbase.o
+ .bss           0x0000000000000000        0x0 build/py/parsenumbase.o
+ .note.GNU-stack
+                0x0000000000000000        0x0 build/py/parsenumbase.o
+ .text          0x0000000000000000        0x0 build/py/parsenum.o
+ .data          0x0000000000000000        0x0 build/py/parsenum.o
+ .bss           0x0000000000000000        0x0 build/py/parsenum.o
+ .note.GNU-stack
+                0x0000000000000000        0x0 build/py/parsenum.o
+ .text          0x0000000000000000        0x0 build/py/emitglue.o
+ .data          0x0000000000000000        0x0 build/py/emitglue.o
+ .bss           0x0000000000000000        0x0 build/py/emitglue.o
+ .rodata.mp_make_function_from_raw_code.str1.1
+                0x0000000000000000       0xb5 build/py/emitglue.o
+ .text.mp_make_function_from_raw_code
+                0x0000000000000000      0x124 build/py/emitglue.o
+ .text.mp_make_closure_from_raw_code
+                0x0000000000000000       0x3d build/py/emitglue.o
+ .rodata.__PRETTY_FUNCTION__.0
+                0x0000000000000000       0x1f build/py/emitglue.o
+ .note.GNU-stack
+                0x0000000000000000        0x0 build/py/emitglue.o
+ .text          0x0000000000000000        0x0 build/py/persistentcode.o
+ .data          0x0000000000000000        0x0 build/py/persistentcode.o
+ .bss           0x0000000000000000        0x0 build/py/persistentcode.o
+ .note.GNU-stack
+                0x0000000000000000        0x0 build/py/persistentcode.o
+ .text          0x0000000000000000        0x0 build/py/runtime.o
+ .data          0x0000000000000000        0x0 build/py/runtime.o
+ .bss           0x0000000000000000        0x0 build/py/runtime.o
+ .rodata.mp_map_slot_is_filled.str1.1
+                0x0000000000000000       0x1d build/py/runtime.o
+ .text.mp_map_slot_is_filled
+                0x0000000000000000       0x41 build/py/runtime.o
+ .text.mp_load_build_class
+                0x0000000000000000        0x8 build/py/runtime.o
+ .text.mp_store_name
+                0x0000000000000000       0x17 build/py/runtime.o
+ .text.mp_delete_name
+                0x0000000000000000       0x14 build/py/runtime.o
+ .text.mp_store_global
+                0x0000000000000000       0x17 build/py/runtime.o
+ .text.mp_delete_global
+                0x0000000000000000       0x14 build/py/runtime.o
+ .text.mp_load_method_protected
+                0x0000000000000000       0x67 build/py/runtime.o
+ .text.mp_import_name
+                0x0000000000000000       0x41 build/py/runtime.o
+ .text.mp_import_all
+                0x0000000000000000       0x6a build/py/runtime.o
+ .rodata.mp_load_global.str1.1
+                0x0000000000000000       0x18 build/py/runtime.o
+ .text.mp_load_global
+                0x0000000000000000       0x5e build/py/runtime.o
+ .text.mp_load_name
+                0x0000000000000000       0x3b build/py/runtime.o
+ .text.mp_call_function_0
+                0x0000000000000000        0xb build/py/runtime.o
+ .text.mp_parse_compile_execute
+                0x0000000000000000       0xc4 build/py/runtime.o
+ .text.mp_call_function_2
+                0x0000000000000000       0x21 build/py/runtime.o
+ .rodata.mp_make_raise_obj.str1.1
+                0x0000000000000000       0x2a build/py/runtime.o
+ .text.mp_make_raise_obj
+                0x0000000000000000       0x45 build/py/runtime.o
+ .rodata.mp_load_method.str1.1
+                0x0000000000000000       0x49 build/py/runtime.o
+ .text.mp_load_method
+                0x0000000000000000       0x78 build/py/runtime.o
+ .text.mp_load_attr
+                0x0000000000000000       0x29 build/py/runtime.o
+ .rodata.mp_resume.str1.1
+                0x0000000000000000       0x75 build/py/runtime.o
+ .text.mp_resume
+                0x0000000000000000      0x1d8 build/py/runtime.o
+ .text.mp_store_attr
+                0x0000000000000000       0x6a build/py/runtime.o
+ .rodata.mp_call_method_n_kw_var.str1.1
+                0x0000000000000000       0x29 build/py/runtime.o
+ .text.mp_call_method_n_kw_var
+                0x0000000000000000      0x424 build/py/runtime.o
+ .rodata.mp_unpack_sequence.str1.1
+                0x0000000000000000       0x4b build/py/runtime.o
+ .text.mp_unpack_sequence
+                0x0000000000000000       0xef build/py/runtime.o
+ .text.mp_unpack_ex
+                0x0000000000000000      0x1b1 build/py/runtime.o
+ .rodata.mp_import_from.str1.1
+                0x0000000000000000       0x15 build/py/runtime.o
+ .text.mp_import_from
+                0x0000000000000000      0x103 build/py/runtime.o
+ .rodata.__PRETTY_FUNCTION__.0
+                0x0000000000000000        0xa build/py/runtime.o
+ .rodata.__PRETTY_FUNCTION__.3
+                0x0000000000000000       0x16 build/py/runtime.o
+ .rodata.__PRETTY_FUNCTION__.4
+                0x0000000000000000       0x1e build/py/runtime.o
+ .data.rel.ro.mp_module___main__
+                0x0000000000000000       0x10 build/py/runtime.o
+ .note.GNU-stack
+                0x0000000000000000        0x0 build/py/runtime.o
+ .text          0x0000000000000000        0x0 build/py/runtime_utils.o
+ .data          0x0000000000000000        0x0 build/py/runtime_utils.o
+ .bss           0x0000000000000000        0x0 build/py/runtime_utils.o
+ .text.mp_call_function_1_protected
+                0x0000000000000000       0x54 build/py/runtime_utils.o
+ .text.mp_call_function_2_protected
+                0x0000000000000000       0x5a build/py/runtime_utils.o
+ .comment       0x0000000000000000       0x28 build/py/runtime_utils.o
+ .note.GNU-stack
+                0x0000000000000000        0x0 build/py/runtime_utils.o
+ .text          0x0000000000000000        0x0 build/py/scheduler.o
+ .data          0x0000000000000000        0x0 build/py/scheduler.o
+ .bss           0x0000000000000000        0x0 build/py/scheduler.o
+ .text.mp_handle_pending
+                0x0000000000000000       0x2d build/py/scheduler.o
+ .comment       0x0000000000000000       0x28 build/py/scheduler.o
+ .note.GNU-stack
+                0x0000000000000000        0x0 build/py/scheduler.o
+ .text          0x0000000000000000        0x0 build/py/nativeglue.o
+ .data          0x0000000000000000        0x0 build/py/nativeglue.o
+ .bss           0x0000000000000000        0x0 build/py/nativeglue.o
+ .text.mp_native_from_obj
+                0x0000000000000000       0x6b build/py/nativeglue.o
+ .text.mp_native_to_obj
+                0x0000000000000000       0x32 build/py/nativeglue.o
+ .note.GNU-stack
+                0x0000000000000000        0x0 build/py/nativeglue.o
+ .text          0x0000000000000000        0x0 build/py/pairheap.o
+ .data          0x0000000000000000        0x0 build/py/pairheap.o
+ .bss           0x0000000000000000        0x0 build/py/pairheap.o
+ .text.mp_pairheap_meld
+                0x0000000000000000       0x7a build/py/pairheap.o
+ .text.mp_pairheap_pairing
+                0x0000000000000000       0x73 build/py/pairheap.o
+ .text.mp_pairheap_delete
+                0x0000000000000000       0xd0 build/py/pairheap.o
+ .comment       0x0000000000000000       0x28 build/py/pairheap.o
+ .note.GNU-stack
+                0x0000000000000000        0x0 build/py/pairheap.o
+ .text          0x0000000000000000        0x0 build/py/ringbuf.o
+ .data          0x0000000000000000        0x0 build/py/ringbuf.o
+ .bss           0x0000000000000000        0x0 build/py/ringbuf.o
+ .text.ringbuf_peek16
+                0x0000000000000000       0x3f build/py/ringbuf.o
+ .text.ringbuf_get16
+                0x0000000000000000       0x2a build/py/ringbuf.o
+ .text.ringbuf_put16
+                0x0000000000000000       0x59 build/py/ringbuf.o
+ .comment       0x0000000000000000       0x28 build/py/ringbuf.o
+ .note.GNU-stack
+                0x0000000000000000        0x0 build/py/ringbuf.o
+ .text          0x0000000000000000        0x0 build/py/stackctrl.o
+ .data          0x0000000000000000        0x0 build/py/stackctrl.o
+ .bss           0x0000000000000000        0x0 build/py/stackctrl.o
+ .text.mp_stack_set_top
+                0x0000000000000000        0x8 build/py/stackctrl.o
+ .text.mp_stack_usage
+                0x0000000000000000       0x10 build/py/stackctrl.o
+ .note.GNU-stack
+                0x0000000000000000        0x0 build/py/stackctrl.o
+ .text          0x0000000000000000        0x0 build/py/argcheck.o
+ .data          0x0000000000000000        0x0 build/py/argcheck.o
+ .bss           0x0000000000000000        0x0 build/py/argcheck.o
+ .rodata.mp_arg_error_terse_mismatch.str1.1
+                0x0000000000000000       0x1c build/py/argcheck.o
+ .text.mp_arg_error_terse_mismatch
+                0x0000000000000000        0xd build/py/argcheck.o
+ .note.GNU-stack
+                0x0000000000000000        0x0 build/py/argcheck.o
+ .text          0x0000000000000000        0x0 build/py/warning.o
+ .data          0x0000000000000000        0x0 build/py/warning.o
+ .bss           0x0000000000000000        0x0 build/py/warning.o
+ .rodata.mp_warning.str1.1
+                0x0000000000000000        0xd build/py/warning.o
+ .text.mp_warning
+                0x0000000000000000       0xe2 build/py/warning.o
+ .text.mp_emitter_warning
+                0x0000000000000000        0xf build/py/warning.o
+ .comment       0x0000000000000000       0x28 build/py/warning.o
+ .note.GNU-stack
+                0x0000000000000000        0x0 build/py/warning.o
+ .text          0x0000000000000000        0x0 build/py/profile.o
+ .data          0x0000000000000000        0x0 build/py/profile.o
+ .bss           0x0000000000000000        0x0 build/py/profile.o
+ .comment       0x0000000000000000       0x28 build/py/profile.o
+ .note.GNU-stack
+                0x0000000000000000        0x0 build/py/profile.o
+ .text          0x0000000000000000        0x0 build/py/map.o
+ .data          0x0000000000000000        0x0 build/py/map.o
+ .bss           0x0000000000000000        0x0 build/py/map.o
+ .text.mp_set_init
+                0x0000000000000000       0x22 build/py/map.o
+ .text.mp_set_lookup
+                0x0000000000000000      0x13b build/py/map.o
+ .text.mp_set_rehash
+                0x0000000000000000       0x70 build/py/map.o
+ .text.mp_set_remove_first
+                0x0000000000000000       0x4c build/py/map.o
+ .text.mp_set_clear
+                0x0000000000000000       0x26 build/py/map.o
+ .rodata.mp_const_empty_map
+                0x0000000000000000       0x18 build/py/map.o
+ .note.GNU-stack
+                0x0000000000000000        0x0 build/py/map.o
+ .text          0x0000000000000000        0x0 build/py/obj.o
+ .data          0x0000000000000000        0x0 build/py/obj.o
+ .bss           0x0000000000000000        0x0 build/py/obj.o
+ .text.mp_identity
+                0x0000000000000000        0x4 build/py/obj.o
+ .text.mp_obj_print
+                0x0000000000000000       0x11 build/py/obj.o
+ .text.mp_obj_is_callable
+                0x0000000000000000       0x34 build/py/obj.o
+ .rodata.mp_obj_get_array_fixed_n.str1.1
+                0x0000000000000000       0x2d build/py/obj.o
+ .text.mp_obj_get_array_fixed_n
+                0x0000000000000000       0x39 build/py/obj.o
+ .text.mp_obj_id
+                0x0000000000000000       0x1e build/py/obj.o
+ .rodata.mp_obj_len.str1.1
+                0x0000000000000000       0x21 build/py/obj.o
+ .text.mp_obj_len
+                0x0000000000000000       0x3a build/py/obj.o
+ .data.rel.ro.mp_identity_obj
+                0x0000000000000000       0x10 build/py/obj.o
+ .note.GNU-stack
+                0x0000000000000000        0x0 build/py/obj.o
+ .text          0x0000000000000000        0x0 build/py/objarray.o
+ .data          0x0000000000000000        0x0 build/py/objarray.o
+ .bss           0x0000000000000000        0x0 build/py/objarray.o
+ .text.array_unary_op
+                0x0000000000000000       0x2a build/py/objarray.o
+ .text.array_iterator_new
+                0x0000000000000000       0x22 build/py/objarray.o
+ .text.array_get_buffer
+                0x0000000000000000       0x37 build/py/objarray.o
+ .rodata.array_extend.str1.1
+                0x0000000000000000       0xa1 build/py/objarray.o
+ .text.array_extend
+                0x0000000000000000       0xdc build/py/objarray.o
+ .text.array_append
+                0x0000000000000000       0xcc build/py/objarray.o
+ .text.array_it_iternext
+                0x0000000000000000       0x2a build/py/objarray.o
+ .text.array_new
+                0x0000000000000000       0x62 build/py/objarray.o
+ .rodata.array_subscr.str1.1
+                0x0000000000000000       0x38 build/py/objarray.o
+ .text.array_subscr
+                0x0000000000000000      0x110 build/py/objarray.o
+ .text.array_binary_op
+                0x0000000000000000      0x1c3 build/py/objarray.o
+ .rodata.array_print.str1.1
+                0x0000000000000000       0x22 build/py/objarray.o
+ .text.array_print
+                0x0000000000000000       0xc7 build/py/objarray.o
+ .text.bytearray_make_new
+                0x0000000000000000      0x165 build/py/objarray.o
+ .text.mp_obj_new_bytearray
+                0x0000000000000000       0x28 build/py/objarray.o
+ .text.mp_obj_new_bytearray_by_ref
+                0x0000000000000000       0x31 build/py/objarray.o
+ .rodata.__PRETTY_FUNCTION__.0
+                0x0000000000000000        0xd build/py/objarray.o
+ .rodata.__PRETTY_FUNCTION__.1
+                0x0000000000000000        0xd build/py/objarray.o
+ .rodata.__PRETTY_FUNCTION__.2
+                0x0000000000000000        0xd build/py/objarray.o
+ .data.rel.ro.array_it_type
+                0x0000000000000000       0x78 build/py/objarray.o
+ .data.rel.ro.mp_type_bytearray
+                0x0000000000000000       0x78 build/py/objarray.o
+ .data.rel.ro.array_locals_dict
+                0x0000000000000000       0x20 build/py/objarray.o
+ .data.rel.ro.array_locals_dict_table
+                0x0000000000000000       0x30 build/py/objarray.o
+ .data.rel.ro.array_extend_obj
+                0x0000000000000000       0x10 build/py/objarray.o
+ .data.rel.ro.array_append_obj
+                0x0000000000000000       0x10 build/py/objarray.o
+ .comment       0x0000000000000000       0x28 build/py/objarray.o
+ .note.GNU-stack
+                0x0000000000000000        0x0 build/py/objarray.o
+ .text          0x0000000000000000        0x0 build/py/objattrtuple.o
+ .data          0x0000000000000000        0x0 build/py/objattrtuple.o
+ .bss           0x0000000000000000        0x0 build/py/objattrtuple.o
+ .comment       0x0000000000000000       0x28 build/py/objattrtuple.o
+ .note.GNU-stack
+                0x0000000000000000        0x0 build/py/objattrtuple.o
+ .text          0x0000000000000000        0x0 build/py/objbool.o
+ .data          0x0000000000000000        0x0 build/py/objbool.o
+ .bss           0x0000000000000000        0x0 build/py/objbool.o
+ .note.GNU-stack
+                0x0000000000000000        0x0 build/py/objbool.o
+ .text          0x0000000000000000        0x0 build/py/objboundmeth.o
+ .data          0x0000000000000000        0x0 build/py/objboundmeth.o
+ .bss           0x0000000000000000        0x0 build/py/objboundmeth.o
+ .rodata.bound_meth_print.str1.1
+                0x0000000000000000       0x16 build/py/objboundmeth.o
+ .text.bound_meth_print
+                0x0000000000000000       0x5d build/py/objboundmeth.o
+ .text.bound_meth_call
+                0x0000000000000000       0x19 build/py/objboundmeth.o
+ .text.mp_obj_new_bound_meth
+                0x0000000000000000       0x29 build/py/objboundmeth.o
+ .data.rel.ro.mp_type_bound_meth
+                0x0000000000000000       0x78 build/py/objboundmeth.o
+ .note.GNU-stack
+                0x0000000000000000        0x0 build/py/objboundmeth.o
+ .text          0x0000000000000000        0x0 build/py/objcell.o
+ .data          0x0000000000000000        0x0 build/py/objcell.o
+ .bss           0x0000000000000000        0x0 build/py/objcell.o
+ .rodata.cell_print.str1.1
+                0x0000000000000000       0x12 build/py/objcell.o
+ .text.cell_print
+                0x0000000000000000       0x54 build/py/objcell.o
+ .text.mp_obj_cell_get
+                0x0000000000000000        0x5 build/py/objcell.o
+ .text.mp_obj_cell_set
+                0x0000000000000000        0x5 build/py/objcell.o
+ .text.mp_obj_new_cell
+                0x0000000000000000       0x1e build/py/objcell.o
+ .data.rel.ro.mp_type_cell
+                0x0000000000000000       0x78 build/py/objcell.o
+ .comment       0x0000000000000000       0x28 build/py/objcell.o
+ .note.GNU-stack
+                0x0000000000000000        0x0 build/py/objcell.o
+ .text          0x0000000000000000        0x0 build/py/objclosure.o
+ .data          0x0000000000000000        0x0 build/py/objclosure.o
+ .bss           0x0000000000000000        0x0 build/py/objclosure.o
+ .text.closure_call
+                0x0000000000000000       0xcf build/py/objclosure.o
+ .rodata.closure_print.str1.1
+                0x0000000000000000       0x29 build/py/objclosure.o
+ .text.closure_print
+                0x0000000000000000       0x9f build/py/objclosure.o
+ .text.mp_obj_new_closure
+                0x0000000000000000       0x4a build/py/objclosure.o
+ .data.rel.ro.closure_type
+                0x0000000000000000       0x78 build/py/objclosure.o
+ .comment       0x0000000000000000       0x28 build/py/objclosure.o
+ .note.GNU-stack
+                0x0000000000000000        0x0 build/py/objclosure.o
+ .text          0x0000000000000000        0x0 build/py/objcomplex.o
+ .data          0x0000000000000000        0x0 build/py/objcomplex.o
+ .bss           0x0000000000000000        0x0 build/py/objcomplex.o
+ .note.GNU-stack
+                0x0000000000000000        0x0 build/py/objcomplex.o
+ .text          0x0000000000000000        0x0 build/py/objdeque.o
+ .data          0x0000000000000000        0x0 build/py/objdeque.o
+ .bss           0x0000000000000000        0x0 build/py/objdeque.o
+ .comment       0x0000000000000000       0x28 build/py/objdeque.o
+ .note.GNU-stack
+                0x0000000000000000        0x0 build/py/objdeque.o
+ .text          0x0000000000000000        0x0 build/py/objdict.o
+ .data          0x0000000000000000        0x0 build/py/objdict.o
+ .bss           0x0000000000000000        0x0 build/py/objdict.o
+ .text.mp_obj_dict_len
+                0x0000000000000000        0x9 build/py/objdict.o
+ .note.GNU-stack
+                0x0000000000000000        0x0 build/py/objdict.o
+ .text          0x0000000000000000        0x0 build/py/objenumerate.o
+ .data          0x0000000000000000        0x0 build/py/objenumerate.o
+ .bss           0x0000000000000000        0x0 build/py/objenumerate.o
+ .rodata.enumerate_iternext.str1.1
+                0x0000000000000000       0x41 build/py/objenumerate.o
+ .text.enumerate_iternext
+                0x0000000000000000       0x76 build/py/objenumerate.o
+ .text.enumerate_make_new
+                0x0000000000000000       0x5c build/py/objenumerate.o
+ .rodata.allowed_args.0
+                0x0000000000000000       0x20 build/py/objenumerate.o
+ .rodata.__PRETTY_FUNCTION__.1
+                0x0000000000000000       0x13 build/py/objenumerate.o
+ .data.rel.ro.mp_type_enumerate
+                0x0000000000000000       0x78 build/py/objenumerate.o
+ .comment       0x0000000000000000       0x28 build/py/objenumerate.o
+ .note.GNU-stack
+                0x0000000000000000        0x0 build/py/objenumerate.o
+ .text          0x0000000000000000        0x0 build/py/objexcept.o
+ .data          0x0000000000000000        0x0 build/py/objexcept.o
+ .bss           0x0000000000000000        0x0 build/py/objexcept.o
+ .text.mp_obj_new_exception_args
+                0x0000000000000000       0x37 build/py/objexcept.o
+ .text.mp_obj_exception_clear_traceback
+                0x0000000000000000       0x52 build/py/objexcept.o
+ .rodata.__PRETTY_FUNCTION__.2
+                0x0000000000000000       0x21 build/py/objexcept.o
+ .rodata.__PRETTY_FUNCTION__.5
+                0x0000000000000000       0x1a build/py/objexcept.o
+ .data.rel.ro.mp_type_NameError
+                0x0000000000000000       0x78 build/py/objexcept.o
+ .data.rel.ro.mp_type_ImportError
+                0x0000000000000000       0x78 build/py/objexcept.o
+ .data.rel.ro.mp_type_EOFError
+                0x0000000000000000       0x78 build/py/objexcept.o
+ .data.rel.ro.mp_type_AssertionError
+                0x0000000000000000       0x78 build/py/objexcept.o
+ .data.rel.ro.mp_type_StopAsyncIteration
+                0x0000000000000000       0x78 build/py/objexcept.o
+ .data.rel.ro.mp_type_GeneratorExit
+                0x0000000000000000       0x78 build/py/objexcept.o
+ .data.rel.ro.mp_type_KeyboardInterrupt
+                0x0000000000000000       0x78 build/py/objexcept.o
+ .data.rel.ro.mp_type_SystemExit
+                0x0000000000000000       0x78 build/py/objexcept.o
+ .note.GNU-stack
+                0x0000000000000000        0x0 build/py/objexcept.o
+ .text          0x0000000000000000        0x0 build/py/objfilter.o
+ .data          0x0000000000000000        0x0 build/py/objfilter.o
+ .bss           0x0000000000000000        0x0 build/py/objfilter.o
+ .text.filter_iternext
+                0x0000000000000000       0x52 build/py/objfilter.o
+ .text.filter_make_new
+                0x0000000000000000       0x4a build/py/objfilter.o
+ .data.rel.ro.mp_type_filter
+                0x0000000000000000       0x78 build/py/objfilter.o
+ .comment       0x0000000000000000       0x28 build/py/objfilter.o
+ .note.GNU-stack
+                0x0000000000000000        0x0 build/py/objfilter.o
+ .text          0x0000000000000000        0x0 build/py/objfloat.o
+ .data          0x0000000000000000        0x0 build/py/objfloat.o
+ .bss           0x0000000000000000        0x0 build/py/objfloat.o
+ .data.rel.ro.local.mp_const_float_pi_obj
+                0x0000000000000000       0x10 build/py/objfloat.o
+ .data.rel.ro.local.mp_const_float_e_obj
+                0x0000000000000000       0x10 build/py/objfloat.o
+ .note.GNU-stack
+                0x0000000000000000        0x0 build/py/objfloat.o
+ .text          0x0000000000000000        0x0 build/py/objfun.o
+ .data          0x0000000000000000        0x0 build/py/objfun.o
+ .bss           0x0000000000000000        0x0 build/py/objfun.o
+ .text.fun_native_call
+                0x0000000000000000       0x39 build/py/objfun.o
+ .rodata.fun_bc_call.str1.1
+                0x0000000000000000       0x29 build/py/objfun.o
+ .text.fun_bc_call
+                0x0000000000000000      0x17c build/py/objfun.o
+ .text.convert_obj_for_inline_asm
+                0x0000000000000000       0xfe build/py/objfun.o
+ .rodata.fun_asm_call.str1.1
+                0x0000000000000000        0xc build/py/objfun.o
+ .text.fun_asm_call
+                0x0000000000000000      0x12e build/py/objfun.o
+ .text.mp_obj_code_get_name
+                0x0000000000000000        0xd build/py/objfun.o
+ .text.mp_obj_fun_get_name
+                0x0000000000000000       0x3c build/py/objfun.o
+ .rodata.fun_bc_print.str1.1
+                0x0000000000000000       0x16 build/py/objfun.o
+ .text.fun_bc_print
+                0x0000000000000000       0x25 build/py/objfun.o
+ .rodata.mp_obj_new_fun_bc.str1.1
+                0x0000000000000000       0x2c build/py/objfun.o
+ .text.mp_obj_new_fun_bc
+                0x0000000000000000       0xb1 build/py/objfun.o
+ .text.mp_obj_new_fun_native
+                0x0000000000000000       0x12 build/py/objfun.o
+ .text.mp_obj_new_fun_asm
+                0x0000000000000000       0x32 build/py/objfun.o
+ .rodata.__PRETTY_FUNCTION__.0
+                0x0000000000000000        0xd build/py/objfun.o
+ .rodata.__PRETTY_FUNCTION__.1
+                0x0000000000000000       0x12 build/py/objfun.o
+ .rodata.__PRETTY_FUNCTION__.2
+                0x0000000000000000        0xc build/py/objfun.o
+ .data.rel.ro.mp_type_fun_asm
+                0x0000000000000000       0x78 build/py/objfun.o
+ .data.rel.ro.mp_type_fun_bc
+                0x0000000000000000       0x78 build/py/objfun.o
+ .data.rel.ro.mp_type_fun_native
+                0x0000000000000000       0x78 build/py/objfun.o
+ .note.GNU-stack
+                0x0000000000000000        0x0 build/py/objfun.o
+ .text          0x0000000000000000        0x0 build/py/objgenerator.o
+ .data          0x0000000000000000        0x0 build/py/objgenerator.o
+ .bss           0x0000000000000000        0x0 build/py/objgenerator.o
+ .text.gen_wrap_call
+                0x0000000000000000       0xc7 build/py/objgenerator.o
+ .text.native_gen_wrap_call
+                0x0000000000000000       0xd3 build/py/objgenerator.o
+ .rodata.gen_instance_pend_throw.str1.1
+                0x0000000000000000       0x1c build/py/objgenerator.o
+ .text.gen_instance_pend_throw
+                0x0000000000000000       0x1b build/py/objgenerator.o
+ .rodata.gen_instance_print.str1.1
+                0x0000000000000000       0x1e build/py/objgenerator.o
+ .text.gen_instance_print
+                0x0000000000000000       0x2f build/py/objgenerator.o
+ .rodata.mp_obj_gen_resume.str1.1
+                0x0000000000000000       0x55 build/py/objgenerator.o
+ .text.mp_obj_gen_resume
+                0x0000000000000000      0x142 build/py/objgenerator.o
+ .text.gen_resume_and_raise
+                0x0000000000000000       0x4d build/py/objgenerator.o
+ .text.gen_instance_throw
+                0x0000000000000000       0x3c build/py/objgenerator.o
+ .text.gen_instance_send
+                0x0000000000000000       0x1d build/py/objgenerator.o
+ .text.gen_instance_iternext
+                0x0000000000000000        0xc build/py/objgenerator.o
+ .rodata.gen_instance_close.str1.1
+                0x0000000000000000       0x20 build/py/objgenerator.o
+ .text.gen_instance_close
+                0x0000000000000000       0x6a build/py/objgenerator.o
+ .data.rel.ro.mp_type_gen_instance
+                0x0000000000000000       0x78 build/py/objgenerator.o
+ .data.rel.ro.gen_instance_locals_dict
+                0x0000000000000000       0x20 build/py/objgenerator.o
+ .data.rel.ro.local.gen_instance_locals_dict_table
+                0x0000000000000000       0x40 build/py/objgenerator.o
+ .data.rel.ro.gen_instance_pend_throw_obj
+                0x0000000000000000       0x10 build/py/objgenerator.o
+ .data.rel.ro.gen_instance_close_obj
+                0x0000000000000000       0x10 build/py/objgenerator.o
+ .data.rel.ro.gen_instance_throw_obj
+                0x0000000000000000       0x18 build/py/objgenerator.o
+ .data.rel.ro.gen_instance_send_obj
+                0x0000000000000000       0x10 build/py/objgenerator.o
+ .data.rel.ro.mp_type_native_gen_wrap
+                0x0000000000000000       0x78 build/py/objgenerator.o
+ .data.rel.ro.mp_type_gen_wrap
+                0x0000000000000000       0x78 build/py/objgenerator.o
+ .data.rel.ro.mp_const_GeneratorExit_obj
+                0x0000000000000000       0x20 build/py/objgenerator.o
+ .comment       0x0000000000000000       0x28 build/py/objgenerator.o
+ .note.GNU-stack
+                0x0000000000000000        0x0 build/py/objgenerator.o
+ .text          0x0000000000000000        0x0 build/py/objgetitemiter.o
+ .data          0x0000000000000000        0x0 build/py/objgetitemiter.o
+ .bss           0x0000000000000000        0x0 build/py/objgetitemiter.o
+ .note.GNU-stack
+                0x0000000000000000        0x0 build/py/objgetitemiter.o
+ .text          0x0000000000000000        0x0 build/py/objint.o
+ .data          0x0000000000000000        0x0 build/py/objint.o
+ .bss           0x0000000000000000        0x0 build/py/objint.o
+ .note.GNU-stack
+                0x0000000000000000        0x0 build/py/objint.o
+ .text          0x0000000000000000        0x0 build/py/objint_longlong.o
+ .data          0x0000000000000000        0x0 build/py/objint_longlong.o
+ .bss           0x0000000000000000        0x0 build/py/objint_longlong.o
+ .comment       0x0000000000000000       0x28 build/py/objint_longlong.o
+ .note.GNU-stack
+                0x0000000000000000        0x0 build/py/objint_longlong.o
+ .text          0x0000000000000000        0x0 build/py/objint_mpz.o
+ .data          0x0000000000000000        0x0 build/py/objint_mpz.o
+ .bss           0x0000000000000000        0x0 build/py/objint_mpz.o
+ .text.mp_obj_int_get_uint_checked
+                0x0000000000000000       0x45 build/py/objint_mpz.o
+ .note.GNU-stack
+                0x0000000000000000        0x0 build/py/objint_mpz.o
+ .text          0x0000000000000000        0x0 build/py/objlist.o
+ .data          0x0000000000000000        0x0 build/py/objlist.o
+ .bss           0x0000000000000000        0x0 build/py/objlist.o
+ .text.mp_obj_list_set_len
+                0x0000000000000000        0x5 build/py/objlist.o
+ .note.GNU-stack
+                0x0000000000000000        0x0 build/py/objlist.o
+ .text          0x0000000000000000        0x0 build/py/objmap.o
+ .data          0x0000000000000000        0x0 build/py/objmap.o
+ .bss           0x0000000000000000        0x0 build/py/objmap.o
+ .text.map_iternext
+                0x0000000000000000       0x5f build/py/objmap.o
+ .text.map_make_new
+                0x0000000000000000       0x6c build/py/objmap.o
+ .data.rel.ro.mp_type_map
+                0x0000000000000000       0x78 build/py/objmap.o
+ .comment       0x0000000000000000       0x28 build/py/objmap.o
+ .note.GNU-stack
+                0x0000000000000000        0x0 build/py/objmap.o
+ .text          0x0000000000000000        0x0 build/py/objmodule.o
+ .data          0x0000000000000000        0x0 build/py/objmodule.o
+ .bss           0x0000000000000000        0x0 build/py/objmodule.o
+ .text.module_attr
+                0x0000000000000000       0x9f build/py/objmodule.o
+ .rodata.module_print.str1.1
+                0x0000000000000000        0xf build/py/objmodule.o
+ .text.module_print
+                0x0000000000000000       0x42 build/py/objmodule.o
+ .text.mp_obj_new_module
+                0x0000000000000000       0x71 build/py/objmodule.o
+ .text.mp_module_get
+                0x0000000000000000       0x3b build/py/objmodule.o
+ .text.mp_module_register
+                0x0000000000000000       0x23 build/py/objmodule.o
+ .data.rel.ro.local.mp_builtin_module_map
+                0x0000000000000000       0x18 build/py/objmodule.o
+ .data.rel.ro.mp_builtin_module_table
+                0x0000000000000000       0x40 build/py/objmodule.o
+ .data.rel.ro.mp_type_module
+                0x0000000000000000       0x78 build/py/objmodule.o
+ .comment       0x0000000000000000       0x28 build/py/objmodule.o
+ .note.GNU-stack
+                0x0000000000000000        0x0 build/py/objmodule.o
+ .text          0x0000000000000000        0x0 build/py/objobject.o
+ .data          0x0000000000000000        0x0 build/py/objobject.o
+ .bss           0x0000000000000000        0x0 build/py/objobject.o
+ .note.GNU-stack
+                0x0000000000000000        0x0 build/py/objobject.o
+ .text          0x0000000000000000        0x0 build/py/objpolyiter.o
+ .data          0x0000000000000000        0x0 build/py/objpolyiter.o
+ .bss           0x0000000000000000        0x0 build/py/objpolyiter.o
+ .note.GNU-stack
+                0x0000000000000000        0x0 build/py/objpolyiter.o
+ .text          0x0000000000000000        0x0 build/py/objproperty.o
+ .data          0x0000000000000000        0x0 build/py/objproperty.o
+ .bss           0x0000000000000000        0x0 build/py/objproperty.o
+ .note.GNU-stack
+                0x0000000000000000        0x0 build/py/objproperty.o
+ .text          0x0000000000000000        0x0 build/py/objnone.o
+ .data          0x0000000000000000        0x0 build/py/objnone.o
+ .bss           0x0000000000000000        0x0 build/py/objnone.o
+ .note.GNU-stack
+                0x0000000000000000        0x0 build/py/objnone.o
+ .text          0x0000000000000000        0x0 build/py/objnamedtuple.o
+ .data          0x0000000000000000        0x0 build/py/objnamedtuple.o
+ .bss           0x0000000000000000        0x0 build/py/objnamedtuple.o
+ .comment       0x0000000000000000       0x28 build/py/objnamedtuple.o
+ .note.GNU-stack
+                0x0000000000000000        0x0 build/py/objnamedtuple.o
+ .text          0x0000000000000000        0x0 build/py/objrange.o
+ .data          0x0000000000000000        0x0 build/py/objrange.o
+ .bss           0x0000000000000000        0x0 build/py/objrange.o
+ .text.range_it_iternext
+                0x0000000000000000       0x3b build/py/objrange.o
+ .text.range_unary_op
+                0x0000000000000000       0x54 build/py/objrange.o
+ .text.range_getiter
+                0x0000000000000000       0x26 build/py/objrange.o
+ .rodata.range_make_new.str1.1
+                0x0000000000000000        0xa build/py/objrange.o
+ .text.range_make_new
+                0x0000000000000000       0x9e build/py/objrange.o
+ .rodata.range_print.str1.1
+                0x0000000000000000       0x18 build/py/objrange.o
+ .text.range_print
+                0x0000000000000000       0x56 build/py/objrange.o
+ .text.range_attr
+                0x0000000000000000       0x40 build/py/objrange.o
+ .text.range_subscr
+                0x0000000000000000       0xda build/py/objrange.o
+ .data.rel.ro.mp_type_range
+                0x0000000000000000       0x78 build/py/objrange.o
+ .data.rel.ro.range_it_type
+                0x0000000000000000       0x78 build/py/objrange.o
+ .comment       0x0000000000000000       0x28 build/py/objrange.o
+ .note.GNU-stack
+                0x0000000000000000        0x0 build/py/objrange.o
+ .text          0x0000000000000000        0x0 build/py/objreversed.o
+ .data          0x0000000000000000        0x0 build/py/objreversed.o
+ .bss           0x0000000000000000        0x0 build/py/objreversed.o
+ .text.reversed_iternext
+                0x0000000000000000       0x28 build/py/objreversed.o
+ .text.reversed_make_new
+                0x0000000000000000       0x7e build/py/objreversed.o
+ .data.rel.ro.mp_type_reversed
+                0x0000000000000000       0x78 build/py/objreversed.o
+ .comment       0x0000000000000000       0x28 build/py/objreversed.o
+ .note.GNU-stack
+                0x0000000000000000        0x0 build/py/objreversed.o
+ .text          0x0000000000000000        0x0 build/py/objset.o
+ .data          0x0000000000000000        0x0 build/py/objset.o
+ .bss           0x0000000000000000        0x0 build/py/objset.o
+ .text.is_set_or_frozenset
+                0x0000000000000000       0x1c build/py/objset.o
+ .text.set_getiter
+                0x0000000000000000       0x25 build/py/objset.o
+ .text.set_unary_op
+                0x0000000000000000       0x2a build/py/objset.o
+ .text.set_add  0x0000000000000000       0x16 build/py/objset.o
+ .text.set_discard
+                0x0000000000000000       0x16 build/py/objset.o
+ .text.set_update_int
+                0x0000000000000000       0x3a build/py/objset.o
+ .text.set_update
+                0x0000000000000000       0x31 build/py/objset.o
+ .text.set_symmetric_difference_update
+                0x0000000000000000       0x3f build/py/objset.o
+ .text.set_isdisjoint
+                0x0000000000000000       0x4d build/py/objset.o
+ .text.set_copy
+                0x0000000000000000       0x4f build/py/objset.o
+ .text.set_union
+                0x0000000000000000       0x2a build/py/objset.o
+ .text.set_symmetric_difference
+                0x0000000000000000       0x2a build/py/objset.o
+ .text.set_clear
+                0x0000000000000000       0x11 build/py/objset.o
+ .text.set_diff_int
+                0x0000000000000000       0x83 build/py/objset.o
+ .text.set_diff_update
+                0x0000000000000000       0x12 build/py/objset.o
+ .text.set_diff
+                0x0000000000000000        0x7 build/py/objset.o
+ .text.set_remove
+                0x0000000000000000       0x3f build/py/objset.o
+ .rodata.set_pop.str1.1
+                0x0000000000000000       0x16 build/py/objset.o
+ .text.set_pop  0x0000000000000000       0x24 build/py/objset.o
+ .rodata.set_print.str1.1
+                0x0000000000000000        0xd build/py/objset.o
+ .text.set_print
+                0x0000000000000000       0x94 build/py/objset.o
+ .text.set_it_iternext
+                0x0000000000000000       0x34 build/py/objset.o
+ .text.mp_obj_new_set
+                0x0000000000000000       0x60 build/py/objset.o
+ .text.set_intersect_int
+                0x0000000000000000       0xc0 build/py/objset.o
+ .text.set_intersect_update
+                0x0000000000000000        0xa build/py/objset.o
+ .text.set_intersect
+                0x0000000000000000        0x7 build/py/objset.o
+ .text.mp_obj_set_store
+                0x0000000000000000        0xe build/py/objset.o
+ .text.set_make_new
+                0x0000000000000000       0x6c build/py/objset.o
+ .text.set_issubset_internal
+                0x0000000000000000      0x10e build/py/objset.o
+ .text.set_issuperset
+                0x0000000000000000       0x10 build/py/objset.o
+ .text.set_issubset
+                0x0000000000000000        0x7 build/py/objset.o
+ .text.set_binary_op
+                0x0000000000000000      0x13c build/py/objset.o
+ .rodata.set_binary_op
+                0x0000000000000000       0x74 build/py/objset.o
+ .data.rel.ro.mp_type_set
+                0x0000000000000000       0x78 build/py/objset.o
+ .data.rel.ro.set_locals_dict
+                0x0000000000000000       0x20 build/py/objset.o
+ .data.rel.ro.set_locals_dict_table
+                0x0000000000000000      0x120 build/py/objset.o
+ .data.rel.ro.set_union_obj
+                0x0000000000000000       0x10 build/py/objset.o
+ .data.rel.ro.set_update_obj
+                0x0000000000000000       0x18 build/py/objset.o
+ .data.rel.ro.set_symmetric_difference_obj
+                0x0000000000000000       0x10 build/py/objset.o
+ .data.rel.ro.set_symmetric_difference_update_obj
+                0x0000000000000000       0x10 build/py/objset.o
+ .data.rel.ro.set_remove_obj
+                0x0000000000000000       0x10 build/py/objset.o
+ .data.rel.ro.set_pop_obj
+                0x0000000000000000       0x10 build/py/objset.o
+ .data.rel.ro.set_issuperset_obj
+                0x0000000000000000       0x10 build/py/objset.o
+ .data.rel.ro.set_issubset_obj
+                0x0000000000000000       0x10 build/py/objset.o
+ .data.rel.ro.set_isdisjoint_obj
+                0x0000000000000000       0x10 build/py/objset.o
+ .data.rel.ro.set_intersect_update_obj
+                0x0000000000000000       0x10 build/py/objset.o
+ .data.rel.ro.set_intersect_obj
+                0x0000000000000000       0x10 build/py/objset.o
+ .data.rel.ro.set_diff_update_obj
+                0x0000000000000000       0x18 build/py/objset.o
+ .data.rel.ro.set_diff_obj
+                0x0000000000000000       0x18 build/py/objset.o
+ .data.rel.ro.set_discard_obj
+                0x0000000000000000       0x10 build/py/objset.o
+ .data.rel.ro.set_copy_obj
+                0x0000000000000000       0x10 build/py/objset.o
+ .data.rel.ro.set_clear_obj
+                0x0000000000000000       0x10 build/py/objset.o
+ .data.rel.ro.set_add_obj
+                0x0000000000000000       0x10 build/py/objset.o
+ .comment       0x0000000000000000       0x28 build/py/objset.o
+ .note.GNU-stack
+                0x0000000000000000        0x0 build/py/objset.o
+ .text          0x0000000000000000        0x0 build/py/objsingleton.o
+ .data          0x0000000000000000        0x0 build/py/objsingleton.o
+ .bss           0x0000000000000000        0x0 build/py/objsingleton.o
+ .note.GNU-stack
+                0x0000000000000000        0x0 build/py/objsingleton.o
+ .text          0x0000000000000000        0x0 build/py/objslice.o
+ .data          0x0000000000000000        0x0 build/py/objslice.o
+ .bss           0x0000000000000000        0x0 build/py/objslice.o
+ .text.mp_obj_new_slice
+                0x0000000000000000       0x32 build/py/objslice.o
+ .note.GNU-stack
+                0x0000000000000000        0x0 build/py/objslice.o
+ .text          0x0000000000000000        0x0 build/py/objstr.o
+ .data          0x0000000000000000        0x0 build/py/objstr.o
+ .bss           0x0000000000000000        0x0 build/py/objstr.o
+ .text.mp_obj_str_intern
+                0x0000000000000000       0x3f build/py/objstr.o
+ .text.mp_obj_str_get_str
+                0x0000000000000000       0x46 build/py/objstr.o
+ .text.mp_obj_str_intern_checked
+                0x0000000000000000       0x20 build/py/objstr.o
+ .note.GNU-stack
+                0x0000000000000000        0x0 build/py/objstr.o
+ .text          0x0000000000000000        0x0 build/py/objstrunicode.o
+ .data          0x0000000000000000        0x0 build/py/objstrunicode.o
+ .bss           0x0000000000000000        0x0 build/py/objstrunicode.o
+ .note.GNU-stack
+                0x0000000000000000        0x0 build/py/objstrunicode.o
+ .text          0x0000000000000000        0x0 build/py/objstringio.o
+ .data          0x0000000000000000        0x0 build/py/objstringio.o
+ .bss           0x0000000000000000        0x0 build/py/objstringio.o
+ .comment       0x0000000000000000       0x28 build/py/objstringio.o
+ .note.GNU-stack
+                0x0000000000000000        0x0 build/py/objstringio.o
+ .text          0x0000000000000000        0x0 build/py/objtuple.o
+ .data          0x0000000000000000        0x0 build/py/objtuple.o
+ .bss           0x0000000000000000        0x0 build/py/objtuple.o
+ .rodata.mp_obj_tuple_del.str1.1
+                0x0000000000000000       0x28 build/py/objtuple.o
+ .text.mp_obj_tuple_del
+                0x0000000000000000       0x37 build/py/objtuple.o
+ .rodata.__PRETTY_FUNCTION__.0
+                0x0000000000000000       0x11 build/py/objtuple.o
+ .note.GNU-stack
+                0x0000000000000000        0x0 build/py/objtuple.o
+ .text          0x0000000000000000        0x0 build/py/objtype.o
+ .data          0x0000000000000000        0x0 build/py/objtype.o
+ .bss           0x0000000000000000        0x0 build/py/objtype.o
+ .text.super_make_new
+                0x0000000000000000       0x54 build/py/objtype.o
+ .rodata.super_print.str1.1
+                0x0000000000000000        0xe build/py/objtype.o
+ .text.super_print
+                0x0000000000000000       0x52 build/py/objtype.o
+ .rodata.super_attr.str1.1
+                0x0000000000000000       0x7a build/py/objtype.o
+ .text.super_attr
+                0x0000000000000000      0x197 build/py/objtype.o
+ .text.mp_obj_instance_is_callable
+                0x0000000000000000       0x5a build/py/objtype.o
+ .text.mp_load_super_method
+                0x0000000000000000       0x3a build/py/objtype.o
+ .rodata.mp_obj_is_subclass.str1.1
+                0x0000000000000000       0x39 build/py/objtype.o
+ .text.mp_obj_is_subclass
+                0x0000000000000000       0xa6 build/py/objtype.o
+ .rodata.mp_builtin_issubclass.str1.1
+                0x0000000000000000       0x23 build/py/objtype.o
+ .text.mp_builtin_issubclass
+                0x0000000000000000       0x24 build/py/objtype.o
+ .text.mp_builtin_isinstance
+                0x0000000000000000       0x1f build/py/objtype.o
+ .rodata.__PRETTY_FUNCTION__.0
+                0x0000000000000000        0xb build/py/objtype.o
+ .data.rel.ro.mp_builtin_isinstance_obj
+                0x0000000000000000       0x10 build/py/objtype.o
+ .data.rel.ro.mp_builtin_issubclass_obj
+                0x0000000000000000       0x10 build/py/objtype.o
+ .data.rel.ro.local.mp_type_super
+                0x0000000000000000       0x78 build/py/objtype.o
+ .note.GNU-stack
+                0x0000000000000000        0x0 build/py/objtype.o
+ .text          0x0000000000000000        0x0 build/py/objzip.o
+ .data          0x0000000000000000        0x0 build/py/objzip.o
+ .bss           0x0000000000000000        0x0 build/py/objzip.o
+ .text.zip_iternext
+                0x0000000000000000       0x53 build/py/objzip.o
+ .text.zip_make_new
+                0x0000000000000000       0x60 build/py/objzip.o
+ .data.rel.ro.mp_type_zip
+                0x0000000000000000       0x78 build/py/objzip.o
+ .comment       0x0000000000000000       0x28 build/py/objzip.o
+ .note.GNU-stack
+                0x0000000000000000        0x0 build/py/objzip.o
+ .text          0x0000000000000000        0x0 build/py/opmethods.o
+ .data          0x0000000000000000        0x0 build/py/opmethods.o
+ .bss           0x0000000000000000        0x0 build/py/opmethods.o
+ .text.op_contains
+                0x0000000000000000       0x24 build/py/opmethods.o
+ .data.rel.ro.mp_op_contains_obj
+                0x0000000000000000       0x10 build/py/opmethods.o
+ .note.GNU-stack
+                0x0000000000000000        0x0 build/py/opmethods.o
+ .text          0x0000000000000000        0x0 build/py/sequence.o
+ .data          0x0000000000000000        0x0 build/py/sequence.o
+ .bss           0x0000000000000000        0x0 build/py/sequence.o
+ .note.GNU-stack
+                0x0000000000000000        0x0 build/py/sequence.o
+ .text          0x0000000000000000        0x0 build/py/stream.o
+ .data          0x0000000000000000        0x0 build/py/stream.o
+ .bss           0x0000000000000000        0x0 build/py/stream.o
+ .text.mp_stream_close
+                0x0000000000000000       0x32 build/py/stream.o
+ .text.stream_flush
+                0x0000000000000000       0x32 build/py/stream.o
+ .text.stream_unbuffered_readline
+                0x0000000000000000       0xe6 build/py/stream.o
+ .text.stream_unbuffered_readlines
+                0x0000000000000000       0x53 build/py/stream.o
+ .text.stream_seek
+                0x0000000000000000       0x83 build/py/stream.o
+ .text.stream_tell
+                0x0000000000000000       0x2f build/py/stream.o
+ .text.stream_ioctl
+                0x0000000000000000       0x85 build/py/stream.o
+ .text.mp_stream_rw
+                0x0000000000000000       0x89 build/py/stream.o
+ .text.stream_read_generic
+                0x0000000000000000      0x23e build/py/stream.o
+ .text.stream_read
+                0x0000000000000000        0x7 build/py/stream.o
+ .text.stream_read1
+                0x0000000000000000        0xa build/py/stream.o
+ .text.stream_readinto
+                0x0000000000000000       0x73 build/py/stream.o
+ .rodata.mp_get_stream_raise.str1.1
+                0x0000000000000000       0x1f build/py/stream.o
+ .text.mp_get_stream_raise
+                0x0000000000000000       0x49 build/py/stream.o
+ .text.mp_stream_write
+                0x0000000000000000       0x2e build/py/stream.o
+ .text.stream_write_method
+                0x0000000000000000       0x91 build/py/stream.o
+ .text.stream_write1_method
+                0x0000000000000000       0x37 build/py/stream.o
+ .text.mp_stream_write_adaptor
+                0x0000000000000000        0xa build/py/stream.o
+ .text.mp_stream_unbuffered_iter
+                0x0000000000000000       0x3a build/py/stream.o
+ .data.rel.ro.mp_stream_ioctl_obj
+                0x0000000000000000       0x18 build/py/stream.o
+ .data.rel.ro.mp_stream_flush_obj
+                0x0000000000000000       0x10 build/py/stream.o
+ .data.rel.ro.mp_stream_tell_obj
+                0x0000000000000000       0x10 build/py/stream.o
+ .data.rel.ro.mp_stream_seek_obj
+                0x0000000000000000       0x18 build/py/stream.o
+ .data.rel.ro.mp_stream_close_obj
+                0x0000000000000000       0x10 build/py/stream.o
+ .data.rel.ro.mp_stream_unbuffered_readlines_obj
+                0x0000000000000000       0x10 build/py/stream.o
+ .data.rel.ro.mp_stream_unbuffered_readline_obj
+                0x0000000000000000       0x18 build/py/stream.o
+ .data.rel.ro.mp_stream_readinto_obj
+                0x0000000000000000       0x18 build/py/stream.o
+ .data.rel.ro.mp_stream_write1_obj
+                0x0000000000000000       0x10 build/py/stream.o
+ .data.rel.ro.mp_stream_write_obj
+                0x0000000000000000       0x18 build/py/stream.o
+ .data.rel.ro.mp_stream_read1_obj
+                0x0000000000000000       0x18 build/py/stream.o
+ .data.rel.ro.mp_stream_read_obj
+                0x0000000000000000       0x18 build/py/stream.o
+ .comment       0x0000000000000000       0x28 build/py/stream.o
+ .note.GNU-stack
+                0x0000000000000000        0x0 build/py/stream.o
+ .text          0x0000000000000000        0x0 build/py/binary.o
+ .data          0x0000000000000000        0x0 build/py/binary.o
+ .bss           0x0000000000000000        0x0 build/py/binary.o
+ .rodata.mp_binary_get_size.str1.1
+                0x0000000000000000        0xd build/py/binary.o
+ .text.mp_binary_get_size
+                0x0000000000000000      0x119 build/py/binary.o
+ .rodata.mp_binary_get_size
+                0x0000000000000000      0x110 build/py/binary.o
+ .text.mp_binary_get_val_array
+                0x0000000000000000       0xbd build/py/binary.o
+ .rodata.mp_binary_get_val_array
+                0x0000000000000000       0x80 build/py/binary.o
+ .text.mp_binary_get_int
+                0x0000000000000000       0x42 build/py/binary.o
+ .text.mp_binary_get_val
+                0x0000000000000000      0x10b build/py/binary.o
+ .text.mp_binary_set_val
+                0x0000000000000000      0x104 build/py/binary.o
+ .text.mp_binary_set_val_array_from_int
+                0x0000000000000000       0x75 build/py/binary.o
+ .rodata.mp_binary_set_val_array_from_int
+                0x0000000000000000       0x80 build/py/binary.o
+ .text.mp_binary_set_val_array
+                0x0000000000000000       0xc2 build/py/binary.o
+ .note.GNU-stack
+                0x0000000000000000        0x0 build/py/binary.o
+ .text          0x0000000000000000        0x0 build/py/builtinimport.o
+ .data          0x0000000000000000        0x0 build/py/builtinimport.o
+ .bss           0x0000000000000000        0x0 build/py/builtinimport.o
+ .text.do_load  0x0000000000000000       0x29 build/py/builtinimport.o
+ .rodata.stat_dir_or_file.str1.1
+                0x0000000000000000        0x4 build/py/builtinimport.o
+ .text.stat_dir_or_file
+                0x0000000000000000       0x3e build/py/builtinimport.o
+ .rodata.mp_builtin___import__.str1.1
+                0x0000000000000000       0x70 build/py/builtinimport.o
+ .text.mp_builtin___import__
+                0x0000000000000000      0x47e build/py/builtinimport.o
+ .text.mp_obj_is_package
+                0x0000000000000000       0x1e build/py/builtinimport.o
+ .rodata.__PRETTY_FUNCTION__.0
+                0x0000000000000000       0x16 build/py/builtinimport.o
+ .data.rel.ro.mp_builtin___import___obj
+                0x0000000000000000       0x18 build/py/builtinimport.o
+ .comment       0x0000000000000000       0x28 build/py/builtinimport.o
+ .note.GNU-stack
+                0x0000000000000000        0x0 build/py/builtinimport.o
+ .text          0x0000000000000000        0x0 build/py/builtinevex.o
+ .data          0x0000000000000000        0x0 build/py/builtinevex.o
+ .bss           0x0000000000000000        0x0 build/py/builtinevex.o
+ .text.eval_exec_helper
+                0x0000000000000000       0xa5 build/py/builtinevex.o
+ .text.mp_builtin_eval
+                0x0000000000000000        0xa build/py/builtinevex.o
+ .text.mp_builtin_exec
+                0x0000000000000000        0xa build/py/builtinevex.o
+ .data.rel.ro.mp_builtin_exec_obj
+                0x0000000000000000       0x18 build/py/builtinevex.o
+ .data.rel.ro.mp_builtin_eval_obj
+                0x0000000000000000       0x18 build/py/builtinevex.o
+ .comment       0x0000000000000000       0x28 build/py/builtinevex.o
+ .note.GNU-stack
+                0x0000000000000000        0x0 build/py/builtinevex.o
+ .text          0x0000000000000000        0x0 build/py/builtinhelp.o
+ .data          0x0000000000000000        0x0 build/py/builtinhelp.o
+ .bss           0x0000000000000000        0x0 build/py/builtinhelp.o
+ .comment       0x0000000000000000       0x28 build/py/builtinhelp.o
+ .note.GNU-stack
+                0x0000000000000000        0x0 build/py/builtinhelp.o
+ .text          0x0000000000000000        0x0 build/py/modarray.o
+ .data          0x0000000000000000        0x0 build/py/modarray.o
+ .bss           0x0000000000000000        0x0 build/py/modarray.o
+ .comment       0x0000000000000000       0x28 build/py/modarray.o
+ .note.GNU-stack
+                0x0000000000000000        0x0 build/py/modarray.o
+ .text          0x0000000000000000        0x0 build/py/modbuiltins.o
+ .data          0x0000000000000000        0x0 build/py/modbuiltins.o
+ .bss           0x0000000000000000        0x0 build/py/modbuiltins.o
+ .text.mp_builtin_globals
+                0x0000000000000000        0x8 build/py/modbuiltins.o
+ .text.mp_builtin_locals
+                0x0000000000000000        0x8 build/py/modbuiltins.o
+ .rodata.mp_builtin___build_class__.str1.1
+                0x0000000000000000       0x20 build/py/modbuiltins.o
+ .text.mp_builtin___build_class__
+                0x0000000000000000       0xd6 build/py/modbuiltins.o
+ .text.mp_builtin_abs
+                0x0000000000000000        0xd build/py/modbuiltins.o
+ .text.mp_builtin_hash
+                0x0000000000000000        0xd build/py/modbuiltins.o
+ .text.mp_builtin_iter
+                0x0000000000000000        0x7 build/py/modbuiltins.o
+ .text.mp_builtin_all
+                0x0000000000000000       0x3b build/py/modbuiltins.o
+ .text.mp_builtin_any
+                0x0000000000000000       0x3b build/py/modbuiltins.o
+ .text.mp_builtin_bin
+                0x0000000000000000       0x25 build/py/modbuiltins.o
+ .text.mp_builtin_callable
+                0x0000000000000000       0x15 build/py/modbuiltins.o
+ .rodata.mp_builtin_chr.str1.1
+                0x0000000000000000       0x21 build/py/modbuiltins.o
+ .text.mp_builtin_chr
+                0x0000000000000000       0xe3 build/py/modbuiltins.o
+ .text.mp_builtin_dir
+                0x0000000000000000       0xaf build/py/modbuiltins.o
+ .text.mp_builtin_divmod
+                0x0000000000000000       0x10 build/py/modbuiltins.o
+ .text.mp_builtin_hex
+                0x0000000000000000       0x12 build/py/modbuiltins.o
+ .text.mp_builtin_oct
+                0x0000000000000000       0x12 build/py/modbuiltins.o
+ .text.mp_builtin_sum
+                0x0000000000000000       0x54 build/py/modbuiltins.o
+ .rodata.mp_builtin_min_max.str1.1
+                0x0000000000000000       0x19 build/py/modbuiltins.o
+ .text.mp_builtin_min_max
+                0x0000000000000000      0x133 build/py/modbuiltins.o
+ .text.mp_builtin_max
+                0x0000000000000000        0xa build/py/modbuiltins.o
+ .text.mp_builtin_min
+                0x0000000000000000        0x7 build/py/modbuiltins.o
+ .rodata.mp_builtin_ord.str1.1
+                0x0000000000000000       0x3a build/py/modbuiltins.o
+ .text.mp_builtin_ord
+                0x0000000000000000       0x90 build/py/modbuiltins.o
+ .rodata.mp_builtin_pow.str1.1
+                0x0000000000000000       0x1a build/py/modbuiltins.o
+ .text.mp_builtin_pow
+                0x0000000000000000       0x24 build/py/modbuiltins.o
+ .text.mp_builtin_print
+                0x0000000000000000       0xc0 build/py/modbuiltins.o
+ .text.mp_builtin_repr
+                0x0000000000000000       0x4d build/py/modbuiltins.o
+ .text.mp_builtin_round
+                0x0000000000000000       0xa3 build/py/modbuiltins.o
+ .rodata.mp_builtin_sorted.str1.1
+                0x0000000000000000       0x2b build/py/modbuiltins.o
+ .text.mp_builtin_sorted
+                0x0000000000000000       0x55 build/py/modbuiltins.o
+ .text.mp_builtin_hasattr
+                0x0000000000000000       0x36 build/py/modbuiltins.o
+ .text.mp_builtin_getattr
+                0x0000000000000000       0x6c build/py/modbuiltins.o
+ .text.mp_builtin_setattr
+                0x0000000000000000       0x30 build/py/modbuiltins.o
+ .text.mp_builtin_delattr
+                0x0000000000000000        0x7 build/py/modbuiltins.o
+ .rodata.mp_builtin___repl_print__.str1.1
+                0x0000000000000000        0x2 build/py/modbuiltins.o
+ .text.mp_builtin___repl_print__
+                0x0000000000000000       0x3b build/py/modbuiltins.o
+ .rodata.allowed_args.0
+                0x0000000000000000       0x20 build/py/modbuiltins.o
+ .rodata.__PRETTY_FUNCTION__.2
+                0x0000000000000000       0x1b build/py/modbuiltins.o
+ .data.rel.ro.mp_module_builtins
+                0x0000000000000000       0x10 build/py/modbuiltins.o
+ .data.rel.ro.mp_module_builtins_globals
+                0x0000000000000000       0x20 build/py/modbuiltins.o
+ .data.rel.ro.mp_module_builtins_globals_table
+                0x0000000000000000      0x5b0 build/py/modbuiltins.o
+ .data.rel.ro.mp_builtin_len_obj
+                0x0000000000000000       0x10 build/py/modbuiltins.o
+ .data.rel.ro.mp_builtin_id_obj
+                0x0000000000000000       0x10 build/py/modbuiltins.o
+ .data.rel.ro.mp_builtin_locals_obj
+                0x0000000000000000       0x10 build/py/modbuiltins.o
+ .data.rel.ro.mp_builtin_globals_obj
+                0x0000000000000000       0x10 build/py/modbuiltins.o
+ .data.rel.ro.mp_builtin_hasattr_obj
+                0x0000000000000000       0x10 build/py/modbuiltins.o
+ .data.rel.ro.mp_builtin_delattr_obj
+                0x0000000000000000       0x10 build/py/modbuiltins.o
+ .data.rel.ro.mp_builtin_setattr_obj
+                0x0000000000000000       0x10 build/py/modbuiltins.o
+ .data.rel.ro.mp_builtin_getattr_obj
+                0x0000000000000000       0x18 build/py/modbuiltins.o
+ .data.rel.ro.mp_builtin_sorted_obj
+                0x0000000000000000       0x18 build/py/modbuiltins.o
+ .data.rel.ro.mp_builtin_sum_obj
+                0x0000000000000000       0x18 build/py/modbuiltins.o
+ .data.rel.ro.mp_builtin_round_obj
+                0x0000000000000000       0x18 build/py/modbuiltins.o
+ .data.rel.ro.mp_builtin_repr_obj
+                0x0000000000000000       0x10 build/py/modbuiltins.o
+ .data.rel.ro.mp_builtin___repl_print___obj
+                0x0000000000000000       0x10 build/py/modbuiltins.o
+ .data.rel.ro.mp_builtin_print_obj
+                0x0000000000000000       0x18 build/py/modbuiltins.o
+ .data.rel.ro.mp_builtin_pow_obj
+                0x0000000000000000       0x18 build/py/modbuiltins.o
+ .data.rel.ro.mp_builtin_ord_obj
+                0x0000000000000000       0x10 build/py/modbuiltins.o
+ .data.rel.ro.mp_builtin_oct_obj
+                0x0000000000000000       0x10 build/py/modbuiltins.o
+ .data.rel.ro.mp_builtin_min_obj
+                0x0000000000000000       0x18 build/py/modbuiltins.o
+ .data.rel.ro.mp_builtin_max_obj
+                0x0000000000000000       0x18 build/py/modbuiltins.o
+ .data.rel.ro.mp_builtin_iter_obj
+                0x0000000000000000       0x10 build/py/modbuiltins.o
+ .data.rel.ro.mp_builtin_hex_obj
+                0x0000000000000000       0x10 build/py/modbuiltins.o
+ .data.rel.ro.mp_builtin_hash_obj
+                0x0000000000000000       0x10 build/py/modbuiltins.o
+ .data.rel.ro.mp_builtin_divmod_obj
+                0x0000000000000000       0x10 build/py/modbuiltins.o
+ .data.rel.ro.mp_builtin_dir_obj
+                0x0000000000000000       0x18 build/py/modbuiltins.o
+ .data.rel.ro.mp_builtin_chr_obj
+                0x0000000000000000       0x10 build/py/modbuiltins.o
+ .data.rel.ro.mp_builtin_callable_obj
+                0x0000000000000000       0x10 build/py/modbuiltins.o
+ .data.rel.ro.mp_builtin_bin_obj
+                0x0000000000000000       0x10 build/py/modbuiltins.o
+ .data.rel.ro.mp_builtin_any_obj
+                0x0000000000000000       0x10 build/py/modbuiltins.o
+ .data.rel.ro.mp_builtin_all_obj
+                0x0000000000000000       0x10 build/py/modbuiltins.o
+ .data.rel.ro.mp_builtin_abs_obj
+                0x0000000000000000       0x10 build/py/modbuiltins.o
+ .data.rel.ro.mp_builtin___build_class___obj
+                0x0000000000000000       0x18 build/py/modbuiltins.o
+ .rodata.cst8   0x0000000000000000        0x8 build/py/modbuiltins.o
+ .note.GNU-stack
+                0x0000000000000000        0x0 build/py/modbuiltins.o
+ .text          0x0000000000000000        0x0 build/py/modcollections.o
+ .data          0x0000000000000000        0x0 build/py/modcollections.o
+ .bss           0x0000000000000000        0x0 build/py/modcollections.o
+ .comment       0x0000000000000000       0x28 build/py/modcollections.o
+ .note.GNU-stack
+                0x0000000000000000        0x0 build/py/modcollections.o
+ .text          0x0000000000000000        0x0 build/py/modgc.o
+ .data          0x0000000000000000        0x0 build/py/modgc.o
+ .bss           0x0000000000000000        0x0 build/py/modgc.o
+ .comment       0x0000000000000000       0x28 build/py/modgc.o
+ .note.GNU-stack
+                0x0000000000000000        0x0 build/py/modgc.o
+ .text          0x0000000000000000        0x0 build/py/modio.o
+ .data          0x0000000000000000        0x0 build/py/modio.o
+ .bss           0x0000000000000000        0x0 build/py/modio.o
+ .comment       0x0000000000000000       0x28 build/py/modio.o
+ .note.GNU-stack
+                0x0000000000000000        0x0 build/py/modio.o
+ .text          0x0000000000000000        0x0 build/py/modmath.o
+ .data          0x0000000000000000        0x0 build/py/modmath.o
+ .bss           0x0000000000000000        0x0 build/py/modmath.o
+ .comment       0x0000000000000000       0x28 build/py/modmath.o
+ .note.GNU-stack
+                0x0000000000000000        0x0 build/py/modmath.o
+ .text          0x0000000000000000        0x0 build/py/modcmath.o
+ .data          0x0000000000000000        0x0 build/py/modcmath.o
+ .bss           0x0000000000000000        0x0 build/py/modcmath.o
+ .comment       0x0000000000000000       0x28 build/py/modcmath.o
+ .note.GNU-stack
+                0x0000000000000000        0x0 build/py/modcmath.o
+ .text          0x0000000000000000        0x0 build/py/modmicropython.o
+ .data          0x0000000000000000        0x0 build/py/modmicropython.o
+ .bss           0x0000000000000000        0x0 build/py/modmicropython.o
+ .text.mp_micropython_heap_unlock
+                0x0000000000000000       0x16 build/py/modmicropython.o
+ .text.mp_micropython_heap_lock
+                0x0000000000000000        0xd build/py/modmicropython.o
+ .text.mp_micropython_opt_level
+                0x0000000000000000       0x2b build/py/modmicropython.o
+ .data.rel.ro.mp_module_micropython
+                0x0000000000000000       0x10 build/py/modmicropython.o
+ .data.rel.ro.mp_module_micropython_globals
+                0x0000000000000000       0x20 build/py/modmicropython.o
+ .data.rel.ro.mp_module_micropython_globals_table
+                0x0000000000000000       0x50 build/py/modmicropython.o
+ .data.rel.ro.mp_micropython_heap_unlock_obj
+                0x0000000000000000       0x10 build/py/modmicropython.o
+ .data.rel.ro.mp_micropython_heap_lock_obj
+                0x0000000000000000       0x10 build/py/modmicropython.o
+ .data.rel.ro.mp_micropython_opt_level_obj
+                0x0000000000000000       0x18 build/py/modmicropython.o
+ .comment       0x0000000000000000       0x28 build/py/modmicropython.o
+ .note.GNU-stack
+                0x0000000000000000        0x0 build/py/modmicropython.o
+ .text          0x0000000000000000        0x0 build/py/modstruct.o
+ .data          0x0000000000000000        0x0 build/py/modstruct.o
+ .bss           0x0000000000000000        0x0 build/py/modstruct.o
+ .text.get_fmt_type
+                0x0000000000000000       0x23 build/py/modstruct.o
+ .text.get_fmt_num
+                0x0000000000000000       0x4b build/py/modstruct.o
+ .text.calc_size_items
+                0x0000000000000000       0xb5 build/py/modstruct.o
+ .text.struct_calcsize
+                0x0000000000000000       0x27 build/py/modstruct.o
+ .rodata.struct_unpack_from.str1.1
+                0x0000000000000000       0x11 build/py/modstruct.o
+ .text.struct_unpack_from
+                0x0000000000000000      0x152 build/py/modstruct.o
+ .text.struct_pack_into_internal
+                0x0000000000000000      0x11c build/py/modstruct.o
+ .text.struct_pack
+                0x0000000000000000       0x65 build/py/modstruct.o
+ .text.struct_pack_into
+                0x0000000000000000       0x89 build/py/modstruct.o
+ .data.rel.ro.mp_module_ustruct
+                0x0000000000000000       0x10 build/py/modstruct.o
+ .data.rel.ro.mp_module_struct_globals
+                0x0000000000000000       0x20 build/py/modstruct.o
+ .data.rel.ro.local.mp_module_struct_globals_table
+                0x0000000000000000       0x60 build/py/modstruct.o
+ .data.rel.ro.struct_pack_into_obj
+                0x0000000000000000       0x18 build/py/modstruct.o
+ .data.rel.ro.struct_pack_obj
+                0x0000000000000000       0x18 build/py/modstruct.o
+ .data.rel.ro.struct_unpack_from_obj
+                0x0000000000000000       0x18 build/py/modstruct.o
+ .data.rel.ro.struct_calcsize_obj
+                0x0000000000000000       0x10 build/py/modstruct.o
+ .comment       0x0000000000000000       0x28 build/py/modstruct.o
+ .note.GNU-stack
+                0x0000000000000000        0x0 build/py/modstruct.o
+ .text          0x0000000000000000        0x0 build/py/modsys.o
+ .data          0x0000000000000000        0x0 build/py/modsys.o
+ .bss           0x0000000000000000        0x0 build/py/modsys.o
+ .comment       0x0000000000000000       0x28 build/py/modsys.o
+ .note.GNU-stack
+                0x0000000000000000        0x0 build/py/modsys.o
+ .text          0x0000000000000000        0x0 build/py/moduerrno.o
+ .data          0x0000000000000000        0x0 build/py/moduerrno.o
+ .bss           0x0000000000000000        0x0 build/py/moduerrno.o
+ .comment       0x0000000000000000       0x28 build/py/moduerrno.o
+ .note.GNU-stack
+                0x0000000000000000        0x0 build/py/moduerrno.o
+ .text          0x0000000000000000        0x0 build/py/modthread.o
+ .data          0x0000000000000000        0x0 build/py/modthread.o
+ .bss           0x0000000000000000        0x0 build/py/modthread.o
+ .comment       0x0000000000000000       0x28 build/py/modthread.o
+ .note.GNU-stack
+                0x0000000000000000        0x0 build/py/modthread.o
+ .text          0x0000000000000000        0x0 build/py/vm.o
+ .data          0x0000000000000000        0x0 build/py/vm.o
+ .bss           0x0000000000000000        0x0 build/py/vm.o
+ .rodata.mp_execute_bytecode.str1.8
+                0x0000000000000000      0x177 build/py/vm.o
+ .rodata.mp_execute_bytecode.str1.1
+                0x0000000000000000       0x3e build/py/vm.o
+ .text.mp_execute_bytecode
+                0x0000000000000000     0x1859 build/py/vm.o
+ .rodata.mp_execute_bytecode
+                0x0000000000000000      0x168 build/py/vm.o
+ .rodata.__PRETTY_FUNCTION__.0
+                0x0000000000000000       0x14 build/py/vm.o
+ .rodata.cst16  0x0000000000000000       0x10 build/py/vm.o
+ .comment       0x0000000000000000       0x28 build/py/vm.o
+ .note.GNU-stack
+                0x0000000000000000        0x0 build/py/vm.o
+ .text          0x0000000000000000        0x0 build/py/bc.o
+ .data          0x0000000000000000        0x0 build/py/bc.o
+ .bss           0x0000000000000000        0x0 build/py/bc.o
+ .rodata.mp_setup_code_state.str1.1
+                0x0000000000000000      0x10e build/py/bc.o
+ .text.mp_setup_code_state
+                0x0000000000000000      0x485 build/py/bc.o
+ .note.GNU-stack
+                0x0000000000000000        0x0 build/py/bc.o
+ .text          0x0000000000000000        0x0 build/py/showbc.o
+ .data          0x0000000000000000        0x0 build/py/showbc.o
+ .bss           0x0000000000000000        0x0 build/py/showbc.o
+ .comment       0x0000000000000000       0x28 build/py/showbc.o
+ .note.GNU-stack
+                0x0000000000000000        0x0 build/py/showbc.o
+ .text          0x0000000000000000        0x0 build/py/repl.o
+ .data          0x0000000000000000        0x0 build/py/repl.o
+ .bss           0x0000000000000000        0x0 build/py/repl.o
+ .comment       0x0000000000000000       0x28 build/py/repl.o
+ .note.GNU-stack
+                0x0000000000000000        0x0 build/py/repl.o
+ .text          0x0000000000000000        0x0 build/py/smallint.o
+ .data          0x0000000000000000        0x0 build/py/smallint.o
+ .bss           0x0000000000000000        0x0 build/py/smallint.o
+ .note.GNU-stack
+                0x0000000000000000        0x0 build/py/smallint.o
+ .text          0x0000000000000000        0x0 build/py/frozenmod.o
+ .data          0x0000000000000000        0x0 build/py/frozenmod.o
+ .bss           0x0000000000000000        0x0 build/py/frozenmod.o
+ .comment       0x0000000000000000       0x28 build/py/frozenmod.o
+ .note.GNU-stack
+                0x0000000000000000        0x0 build/py/frozenmod.o
+ .text          0x0000000000000000        0x0 build/main.o
+ .data          0x0000000000000000        0x0 build/main.o
+ .bss           0x0000000000000000        0x0 build/main.o
+ .text.mp_import_stat
+                0x0000000000000000        0x3 build/main.o
+ .note.GNU-stack
+                0x0000000000000000        0x0 build/main.o
+ .text          0x0000000000000000        0x0 build/gccollect.o
+ .data          0x0000000000000000        0x0 build/gccollect.o
+ .bss           0x0000000000000000        0x0 build/gccollect.o
+ .note.GNU-stack
+                0x0000000000000000        0x0 build/gccollect.o
+ .text          0x0000000000000000        0x0 build/lib/utils/gchelper_generic.o
+ .data          0x0000000000000000        0x0 build/lib/utils/gchelper_generic.o
+ .bss           0x0000000000000000        0x0 build/lib/utils/gchelper_generic.o
+ .note.GNU-stack
+                0x0000000000000000        0x0 build/lib/utils/gchelper_generic.o
+ .data          0x0000000000000000        0x0 /usr/lib/x86_64-linux-gnu/libc_nonshared.a(elf-init.oS)
+ .bss           0x0000000000000000        0x0 /usr/lib/x86_64-linux-gnu/libc_nonshared.a(elf-init.oS)
+ .note.GNU-stack
+                0x0000000000000000        0x0 /usr/lib/x86_64-linux-gnu/libc_nonshared.a(elf-init.oS)
+ .text          0x0000000000000000        0x0 /usr/lib/gcc/x86_64-linux-gnu/10/crtendS.o
+ .data          0x0000000000000000        0x0 /usr/lib/gcc/x86_64-linux-gnu/10/crtendS.o
+ .bss           0x0000000000000000        0x0 /usr/lib/gcc/x86_64-linux-gnu/10/crtendS.o
+ .note.GNU-stack
+                0x0000000000000000        0x0 /usr/lib/gcc/x86_64-linux-gnu/10/crtendS.o
+ .text          0x0000000000000000        0x0 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/crtn.o
+ .data          0x0000000000000000        0x0 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/crtn.o
+ .bss           0x0000000000000000        0x0 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/crtn.o
+ .note.GNU-stack
+                0x0000000000000000        0x0 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/crtn.o
+
+�а�тройки пам�ти
+
+Им�           Прои�хождение Длина         �трибуты
+*default*        0x0000000000000000 0xffffffffffffffff
+
+Сценарий компоновщика и карта пам�ти
+
+LOAD /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+LOAD /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/crti.o
+LOAD /usr/lib/gcc/x86_64-linux-gnu/10/crtbeginS.o
+LOAD build/py/mpstate.o
+LOAD build/py/nlr.o
+LOAD build/py/nlrx86.o
+LOAD build/py/nlrx64.o
+LOAD build/py/nlrthumb.o
+LOAD build/py/nlrpowerpc.o
+LOAD build/py/nlrxtensa.o
+LOAD build/py/nlrsetjmp.o
+LOAD build/py/malloc.o
+LOAD build/py/gc.o
+LOAD build/py/pystack.o
+LOAD build/py/qstr.o
+LOAD build/py/vstr.o
+LOAD build/py/mpprint.o
+LOAD build/py/unicode.o
+LOAD build/py/mpz.o
+LOAD build/py/reader.o
+LOAD build/py/lexer.o
+LOAD build/py/parse.o
+LOAD build/py/scope.o
+LOAD build/py/compile.o
+LOAD build/py/emitcommon.o
+LOAD build/py/emitbc.o
+LOAD build/py/asmbase.o
+LOAD build/py/asmx64.o
+LOAD build/py/emitnx64.o
+LOAD build/py/asmx86.o
+LOAD build/py/emitnx86.o
+LOAD build/py/asmthumb.o
+LOAD build/py/emitnthumb.o
+LOAD build/py/emitinlinethumb.o
+LOAD build/py/asmarm.o
+LOAD build/py/emitnarm.o
+LOAD build/py/asmxtensa.o
+LOAD build/py/emitnxtensa.o
+LOAD build/py/emitinlinextensa.o
+LOAD build/py/emitnxtensawin.o
+LOAD build/py/formatfloat.o
+LOAD build/py/parsenumbase.o
+LOAD build/py/parsenum.o
+LOAD build/py/emitglue.o
+LOAD build/py/persistentcode.o
+LOAD build/py/runtime.o
+LOAD build/py/runtime_utils.o
+LOAD build/py/scheduler.o
+LOAD build/py/nativeglue.o
+LOAD build/py/pairheap.o
+LOAD build/py/ringbuf.o
+LOAD build/py/stackctrl.o
+LOAD build/py/argcheck.o
+LOAD build/py/warning.o
+LOAD build/py/profile.o
+LOAD build/py/map.o
+LOAD build/py/obj.o
+LOAD build/py/objarray.o
+LOAD build/py/objattrtuple.o
+LOAD build/py/objbool.o
+LOAD build/py/objboundmeth.o
+LOAD build/py/objcell.o
+LOAD build/py/objclosure.o
+LOAD build/py/objcomplex.o
+LOAD build/py/objdeque.o
+LOAD build/py/objdict.o
+LOAD build/py/objenumerate.o
+LOAD build/py/objexcept.o
+LOAD build/py/objfilter.o
+LOAD build/py/objfloat.o
+LOAD build/py/objfun.o
+LOAD build/py/objgenerator.o
+LOAD build/py/objgetitemiter.o
+LOAD build/py/objint.o
+LOAD build/py/objint_longlong.o
+LOAD build/py/objint_mpz.o
+LOAD build/py/objlist.o
+LOAD build/py/objmap.o
+LOAD build/py/objmodule.o
+LOAD build/py/objobject.o
+LOAD build/py/objpolyiter.o
+LOAD build/py/objproperty.o
+LOAD build/py/objnone.o
+LOAD build/py/objnamedtuple.o
+LOAD build/py/objrange.o
+LOAD build/py/objreversed.o
+LOAD build/py/objset.o
+LOAD build/py/objsingleton.o
+LOAD build/py/objslice.o
+LOAD build/py/objstr.o
+LOAD build/py/objstrunicode.o
+LOAD build/py/objstringio.o
+LOAD build/py/objtuple.o
+LOAD build/py/objtype.o
+LOAD build/py/objzip.o
+LOAD build/py/opmethods.o
+LOAD build/py/sequence.o
+LOAD build/py/stream.o
+LOAD build/py/binary.o
+LOAD build/py/builtinimport.o
+LOAD build/py/builtinevex.o
+LOAD build/py/builtinhelp.o
+LOAD build/py/modarray.o
+LOAD build/py/modbuiltins.o
+LOAD build/py/modcollections.o
+LOAD build/py/modgc.o
+LOAD build/py/modio.o
+LOAD build/py/modmath.o
+LOAD build/py/modcmath.o
+LOAD build/py/modmicropython.o
+LOAD build/py/modstruct.o
+LOAD build/py/modsys.o
+LOAD build/py/moduerrno.o
+LOAD build/py/modthread.o
+LOAD build/py/vm.o
+LOAD build/py/bc.o
+LOAD build/py/showbc.o
+LOAD build/py/repl.o
+LOAD build/py/smallint.o
+LOAD build/py/frozenmod.o
+LOAD build/main.o
+LOAD build/gccollect.o
+LOAD build/lib/utils/gchelper_generic.o
+LOAD /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/libm.so
+START GROUP
+LOAD /lib/x86_64-linux-gnu/libm.so.6
+LOAD /lib/x86_64-linux-gnu/libmvec.so.1
+END GROUP
+LOAD /usr/lib/gcc/x86_64-linux-gnu/10/libgcc.a
+LOAD /usr/lib/gcc/x86_64-linux-gnu/10/libgcc_s.so
+START GROUP
+LOAD /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/libgcc_s.so.1
+LOAD /usr/lib/gcc/x86_64-linux-gnu/10/libgcc.a
+END GROUP
+LOAD /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/libc.so
+START GROUP
+LOAD /lib/x86_64-linux-gnu/libc.so.6
+LOAD /usr/lib/x86_64-linux-gnu/libc_nonshared.a
+LOAD /lib64/ld-linux-x86-64.so.2
+END GROUP
+LOAD /usr/lib/gcc/x86_64-linux-gnu/10/libgcc.a
+LOAD /usr/lib/gcc/x86_64-linux-gnu/10/libgcc_s.so
+START GROUP
+LOAD /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/libgcc_s.so.1
+LOAD /usr/lib/gcc/x86_64-linux-gnu/10/libgcc.a
+END GROUP
+LOAD /usr/lib/gcc/x86_64-linux-gnu/10/crtendS.o
+LOAD /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/crtn.o
+                [!provide]                        PROVIDE (__executable_start = SEGMENT_START ("text-segment", 0x0))
+                0x00000000000002a8                . = (SEGMENT_START ("text-segment", 0x0) + SIZEOF_HEADERS)
+
+.interp         0x00000000000002a8       0x1c
+ *(.interp)
+ .interp        0x00000000000002a8       0x1c /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+
+.note.gnu.build-id
+                0x00000000000002c4       0x24
+ *(.note.gnu.build-id)
+ .note.gnu.build-id
+                0x00000000000002c4       0x24 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+
+.note.ABI-tag   0x00000000000002e8       0x20
+ .note.ABI-tag  0x00000000000002e8       0x20 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+
+.hash
+ *(.hash)
+
+.gnu.hash       0x0000000000000308       0x28
+ *(.gnu.hash)
+ .gnu.hash      0x0000000000000308       0x28 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+
+.dynsym         0x0000000000000330      0x348
+ *(.dynsym)
+ .dynsym        0x0000000000000330      0x348 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+
+.dynstr         0x0000000000000678      0x15c
+ *(.dynstr)
+ .dynstr        0x0000000000000678      0x15c /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+
+.gnu.version    0x00000000000007d4       0x46
+ *(.gnu.version)
+ .gnu.version   0x00000000000007d4       0x46 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+
+.gnu.version_d  0x0000000000000820        0x0
+ *(.gnu.version_d)
+ .gnu.version_d
+                0x0000000000000820        0x0 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+
+.gnu.version_r  0x0000000000000820       0x60
+ *(.gnu.version_r)
+ .gnu.version_r
+                0x0000000000000820       0x60 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+
+.rela.dyn       0x0000000000000880     0x7c50
+ *(.rela.init)
+ *(.rela.text .rela.text.* .rela.gnu.linkonce.t.*)
+ .rela.text.nlr_jump_fail
+                0x0000000000000880        0x0 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.text     0x0000000000000880        0x0 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ *(.rela.fini)
+ *(.rela.rodata .rela.rodata.* .rela.gnu.linkonce.r.*)
+ *(.rela.data .rela.data.* .rela.gnu.linkonce.d.*)
+ .rela.data.rel.ro
+                0x0000000000000880        0x0 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.local
+                0x0000000000000880       0x18 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.local.mp_qstr_const_pool
+                0x0000000000000898     0x1fc8 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.local.tok_kw
+                0x0000000000002860      0x360 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.local.mp_constants_map
+                0x0000000000002bc0       0x18 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.local.compile_function
+                0x0000000000002bd8      0x570 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.emit_asm_table
+                0x0000000000003148       0xa8 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.emit_native_table
+                0x00000000000031f0       0xf0 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.local.emit_bc_method_table
+                0x00000000000032e0      0x510 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.local.emit_native_x64_method_table
+                0x00000000000037f0      0x540 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.local.emit_native_x86_method_table
+                0x0000000000003d30      0x540 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.local.emit_native_thumb_method_table
+                0x0000000000004270      0x540 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.local.emit_inline_thumb_method_table
+                0x00000000000047b0       0xa8 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.local.emit_native_arm_method_table
+                0x0000000000004858      0x540 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.local.emit_native_xtensa_method_table
+                0x0000000000004d98      0x540 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.local.emit_inline_xtensa_method_table
+                0x00000000000052d8       0xa8 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.local.emit_native_xtensawin_method_table
+                0x0000000000005380      0x540 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.mp_type_checked_fun
+                0x00000000000058c0       0x30 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.types.1
+                0x00000000000058f0      0x120 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.mp_type_bool
+                0x0000000000005a10       0x78 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.mp_type_complex
+                0x0000000000005a88       0x90 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.mp_type_dict
+                0x0000000000005b18       0xc0 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.local.dict_locals_dict
+                0x0000000000005bd8       0x30 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.dict_locals_dict_table
+                0x0000000000005c08      0x150 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.dict_values_obj
+                0x0000000000005d58       0x30 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.dict_keys_obj
+                0x0000000000005d88       0x30 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.dict_items_obj
+                0x0000000000005db8       0x30 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.local.mp_dict_view_names
+                0x0000000000005de8       0x48 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.dict_view_it_type
+                0x0000000000005e30       0x48 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.dict_view_type
+                0x0000000000005e78       0x60 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.dict_update_obj
+                0x0000000000005ed8       0x30 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.dict_popitem_obj
+                0x0000000000005f08       0x30 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.dict_setdefault_obj
+                0x0000000000005f38       0x30 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.dict_pop_obj
+                0x0000000000005f68       0x30 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.dict_get_obj
+                0x0000000000005f98       0x30 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.dict_fromkeys_obj
+                0x0000000000005fc8       0x30 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.dict_fromkeys_fun_obj
+                0x0000000000005ff8       0x30 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.dict_copy_obj
+                0x0000000000006028       0x30 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.dict_clear_obj
+                0x0000000000006058       0x30 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.mp_type_UnicodeError
+                0x0000000000006088       0x78 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.mp_type_ValueError
+                0x0000000000006100       0x78 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.mp_type_ViperTypeError
+                0x0000000000006178       0x78 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.mp_type_TypeError
+                0x00000000000061f0       0x78 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.mp_type_IndentationError
+                0x0000000000006268       0x78 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.mp_type_SyntaxError
+                0x00000000000062e0       0x78 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.mp_type_NotImplementedError
+                0x0000000000006358       0x78 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.mp_type_RuntimeError
+                0x00000000000063d0       0x78 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.mp_type_OSError
+                0x0000000000006448       0x78 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.mp_type_MemoryError
+                0x00000000000064c0       0x78 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.mp_type_KeyError
+                0x0000000000006538       0x78 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.mp_type_IndexError
+                0x00000000000065b0       0x78 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.mp_type_LookupError
+                0x0000000000006628       0x78 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.mp_type_AttributeError
+                0x00000000000066a0       0x78 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.mp_type_ZeroDivisionError
+                0x0000000000006718       0x78 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.mp_type_OverflowError
+                0x0000000000006790       0x78 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.mp_type_ArithmeticError
+                0x0000000000006808       0x78 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.mp_type_StopIteration
+                0x0000000000006880       0x78 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.mp_type_Exception
+                0x00000000000068f8       0x78 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.mp_type_BaseException
+                0x0000000000006970       0x60 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.mp_type_float
+                0x00000000000069d0       0x78 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.mp_type_fun_builtin_var
+                0x0000000000006a48       0x48 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.mp_type_fun_builtin_3
+                0x0000000000006a90       0x48 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.mp_type_fun_builtin_2
+                0x0000000000006ad8       0x48 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.mp_type_fun_builtin_1
+                0x0000000000006b20       0x48 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.mp_type_fun_builtin_0
+                0x0000000000006b68       0x48 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.it_type
+                0x0000000000006bb0       0x48 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.mp_type_int
+                0x0000000000006bf8       0x90 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.int_locals_dict
+                0x0000000000006c88       0x30 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.local.int_locals_dict_table
+                0x0000000000006cb8       0x30 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.int_to_bytes_obj
+                0x0000000000006ce8       0x30 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.int_from_bytes_obj
+                0x0000000000006d18       0x30 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.int_from_bytes_fun_obj
+                0x0000000000006d48       0x30 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.mp_type_list
+                0x0000000000006d78       0xc0 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.list_locals_dict
+                0x0000000000006e38       0x30 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.local.list_locals_dict_table
+                0x0000000000006e68      0x108 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.list_sort_obj
+                0x0000000000006f70       0x30 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.list_reverse_obj
+                0x0000000000006fa0       0x30 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.list_remove_obj
+                0x0000000000006fd0       0x30 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.list_pop_obj
+                0x0000000000007000       0x30 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.list_insert_obj
+                0x0000000000007030       0x30 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.list_index_obj
+                0x0000000000007060       0x30 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.list_count_obj
+                0x0000000000007090       0x30 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.list_copy_obj
+                0x00000000000070c0       0x30 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.list_clear_obj
+                0x00000000000070f0       0x30 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.list_extend_obj
+                0x0000000000007120       0x30 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.list_append_obj
+                0x0000000000007150       0x30 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.mp_type_object
+                0x0000000000007180       0x48 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.object_locals_dict
+                0x00000000000071c8       0x30 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.local.object_locals_dict_table
+                0x00000000000071f8       0x30 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.object___new___obj
+                0x0000000000007228       0x30 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.object___new___fun_obj
+                0x0000000000007258       0x30 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.object___init___obj
+                0x0000000000007288       0x30 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.mp_type_polymorph_iter
+                0x00000000000072b8       0x48 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.mp_type_property
+                0x0000000000007300       0x48 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.property_locals_dict
+                0x0000000000007348       0x30 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.local.property_locals_dict_table
+                0x0000000000007378       0x48 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.property_deleter_obj
+                0x00000000000073c0       0x30 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.property_setter_obj
+                0x00000000000073f0       0x30 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.property_getter_obj
+                0x0000000000007420       0x30 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.mp_type_NoneType
+                0x0000000000007450       0x48 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.local.mp_const_ellipsis_obj
+                0x0000000000007498       0x18 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.mp_type_singleton
+                0x00000000000074b0       0x48 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.mp_type_slice
+                0x00000000000074f8       0x30 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.local.mp_const_empty_bytes_obj
+                0x0000000000007528       0x30 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.mp_type_bytes
+                0x0000000000007558       0xc0 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.str8_locals_dict
+                0x0000000000007618       0x30 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.local.str8_locals_dict_table
+                0x0000000000007648      0x228 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.str_encode_obj
+                0x0000000000007870       0x30 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.bytes_decode_obj
+                0x00000000000078a0       0x30 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.str_islower_obj
+                0x00000000000078d0       0x30 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.str_isupper_obj
+                0x0000000000007900       0x30 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.str_isdigit_obj
+                0x0000000000007930       0x30 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.str_isalpha_obj
+                0x0000000000007960       0x30 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.str_isspace_obj
+                0x0000000000007990       0x30 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.str_upper_obj
+                0x00000000000079c0       0x30 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.str_lower_obj
+                0x00000000000079f0       0x30 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.str_count_obj
+                0x0000000000007a20       0x30 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.str_replace_obj
+                0x0000000000007a50       0x30 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.str_format_obj
+                0x0000000000007a80       0x30 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.str_rstrip_obj
+                0x0000000000007ab0       0x30 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.str_lstrip_obj
+                0x0000000000007ae0       0x30 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.str_strip_obj
+                0x0000000000007b10       0x30 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.str_endswith_obj
+                0x0000000000007b40       0x30 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.str_startswith_obj
+                0x0000000000007b70       0x30 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.str_rindex_obj
+                0x0000000000007ba0       0x30 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.str_index_obj
+                0x0000000000007bd0       0x30 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.str_rfind_obj
+                0x0000000000007c00       0x30 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.str_find_obj
+                0x0000000000007c30       0x30 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.str_rsplit_obj
+                0x0000000000007c60       0x30 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.str_split_obj
+                0x0000000000007c90       0x30 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.str_join_obj
+                0x0000000000007cc0       0x30 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.mp_type_str
+                0x0000000000007cf0       0xd8 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.struni_locals_dict
+                0x0000000000007dc8       0x30 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.struni_locals_dict_table
+                0x0000000000007df8      0x228 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.local.mp_const_empty_tuple_obj
+                0x0000000000008020       0x18 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.mp_type_tuple
+                0x0000000000008038       0xc0 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.tuple_locals_dict
+                0x00000000000080f8       0x30 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.local.tuple_locals_dict_table
+                0x0000000000008128       0x30 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.tuple_index_obj
+                0x0000000000008158       0x30 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.tuple_count_obj
+                0x0000000000008188       0x30 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.local.mp_type_classmethod
+                0x00000000000081b8       0x30 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.local.mp_type_staticmethod
+                0x00000000000081e8       0x30 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.mp_type_type
+                0x0000000000008218       0x90 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.native_base_init_wrapper_obj
+                0x00000000000082a8       0x30 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.mp_op_delitem_obj
+                0x00000000000082d8       0x30 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.mp_op_setitem_obj
+                0x0000000000008308       0x30 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.mp_op_getitem_obj
+                0x0000000000008338       0x30 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.mp_builtin_next_obj
+                0x0000000000008368       0x30 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.data.rel.ro.local.mp_stderr_print
+                0x0000000000008398       0x18 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ *(.rela.tdata .rela.tdata.* .rela.gnu.linkonce.td.*)
+ *(.rela.tbss .rela.tbss.* .rela.gnu.linkonce.tb.*)
+ *(.rela.ctors)
+ *(.rela.dtors)
+ *(.rela.got)
+ .rela.got      0x00000000000083b0       0xd8 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ *(.rela.bss .rela.bss.* .rela.gnu.linkonce.b.*)
+ .rela.bss      0x0000000000008488       0x18 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ *(.rela.ldata .rela.ldata.* .rela.gnu.linkonce.l.*)
+ *(.rela.lbss .rela.lbss.* .rela.gnu.linkonce.lb.*)
+ *(.rela.lrodata .rela.lrodata.* .rela.gnu.linkonce.lr.*)
+ *(.rela.ifunc)
+ .rela.ifunc    0x00000000000084a0        0x0 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.fini_array
+                0x00000000000084a0       0x18 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .rela.init_array
+                0x00000000000084b8       0x18 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+
+.rela.plt       0x00000000000084d0      0x2a0
+ *(.rela.plt)
+ .rela.plt      0x00000000000084d0      0x2a0 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ *(.rela.iplt)
+                0x0000000000009000                . = ALIGN (CONSTANT (MAXPAGESIZE))
+
+.init           0x0000000000009000       0x17
+ *(SORT_NONE(.init))
+ .init          0x0000000000009000       0x12 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/crti.o
+                0x0000000000009000                _init
+ .init          0x0000000000009012        0x5 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/crtn.o
+
+.plt            0x0000000000009020      0x1d0
+ *(.plt)
+ .plt           0x0000000000009020      0x1d0 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+                0x0000000000009030                __errno_location@@GLIBC_2.2.5
+                0x0000000000009040                strncmp@@GLIBC_2.2.5
+                0x0000000000009050                puts@@GLIBC_2.2.5
+                0x0000000000009060                write@@GLIBC_2.2.5
+                0x0000000000009070                pow@@GLIBC_2.29
+                0x0000000000009080                strlen@@GLIBC_2.2.5
+                0x0000000000009090                strchr@@GLIBC_2.2.5
+                0x00000000000090a0                printf@@GLIBC_2.2.5
+                0x00000000000090b0                __assert_fail@@GLIBC_2.2.5
+                0x00000000000090c0                memset@@GLIBC_2.2.5
+                0x00000000000090d0                sincos@@GLIBC_2.2.5
+                0x00000000000090e0                close@@GLIBC_2.2.5
+                0x00000000000090f0                log@@GLIBC_2.29
+                0x0000000000009100                fmod@@GLIBC_2.2.5
+                0x0000000000009110                read@@GLIBC_2.2.5
+                0x0000000000009120                memcmp@@GLIBC_2.2.5
+                0x0000000000009130                strcmp@@GLIBC_2.2.5
+                0x0000000000009140                fprintf@@GLIBC_2.2.5
+                0x0000000000009150                strtol@@GLIBC_2.2.5
+                0x0000000000009160                memcpy@@GLIBC_2.14
+                0x0000000000009170                malloc@@GLIBC_2.2.5
+                0x0000000000009180                atan2@@GLIBC_2.2.5
+                0x0000000000009190                memmove@@GLIBC_2.2.5
+                0x00000000000091a0                open@@GLIBC_2.2.5
+                0x00000000000091b0                floor@@GLIBC_2.2.5
+                0x00000000000091c0                exit@@GLIBC_2.2.5
+                0x00000000000091d0                sqrt@@GLIBC_2.2.5
+                0x00000000000091e0                exp@@GLIBC_2.29
+ *(.iplt)
+
+.plt.got        0x00000000000091f0        0x8
+ *(.plt.got)
+ .plt.got       0x00000000000091f0        0x8 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+                0x00000000000091f0                __cxa_finalize@@GLIBC_2.2.5
+
+.plt.sec
+ *(.plt.sec)
+
+.text           0x0000000000009200    0x36161
+ *(.text.unlikely .text.*_unlikely .text.unlikely.*)
+ *(.text.exit .text.exit.*)
+ *(.text.startup .text.startup.*)
+ .text.startup.main
+                0x0000000000009200       0x22 build/main.o
+                0x0000000000009200                main
+ *(.text.hot .text.hot.*)
+ *(SORT_BY_NAME(.text.sorted.*))
+ *(.text .stub .text.* .gnu.linkonce.t.*)
+ *fill*         0x0000000000009222        0xe 
+ .text          0x0000000000009230       0x2b /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+                0x0000000000009230                _start
+ *fill*         0x000000000000925b        0x5 
+ .text          0x0000000000009260       0xb5 /usr/lib/gcc/x86_64-linux-gnu/10/crtbeginS.o
+ .text.nlr_push_tail
+                0x0000000000009315       0x14 build/py/nlr.o
+                0x0000000000009315                nlr_push_tail
+ .text.nlr_pop  0x0000000000009329       0x12 build/py/nlr.o
+                0x0000000000009329                nlr_pop
+ .text.nlr_push
+                0x000000000000933b       0x2c build/py/nlrx64.o
+                0x000000000000933b                nlr_push
+ .text.nlr_jump
+                0x0000000000009367       0x4d build/py/nlrx64.o
+                0x0000000000009367                nlr_jump
+ .text.m_malloc
+                0x00000000000093b4       0x29 build/py/malloc.o
+                0x00000000000093b4                m_malloc
+ .text.m_malloc_maybe
+                0x00000000000093dd        0x7 build/py/malloc.o
+                0x00000000000093dd                m_malloc_maybe
+ .text.m_malloc0
+                0x00000000000093e4        0x5 build/py/malloc.o
+                0x00000000000093e4                m_malloc0
+ .text.m_realloc
+                0x00000000000093e9       0x22 build/py/malloc.o
+                0x00000000000093e9                m_realloc
+ .text.m_realloc_maybe
+                0x000000000000940b        0x8 build/py/malloc.o
+                0x000000000000940b                m_realloc_maybe
+ .text.m_free   0x0000000000009413        0x5 build/py/malloc.o
+                0x0000000000009413                m_free
+ *fill*         0x0000000000009418        0x8 
+ .text.gc_mark_subtree
+                0x0000000000009420      0x102 build/py/gc.o
+ *fill*         0x0000000000009522        0xe 
+ .text.gc_free.part.0
+                0x0000000000009530      0x113 build/py/gc.o
+ *fill*         0x0000000000009643        0xd 
+ .text.gc_init  0x0000000000009650       0x7b build/py/gc.o
+                0x0000000000009650                gc_init
+ *fill*         0x00000000000096cb        0x5 
+ .text.gc_is_locked
+                0x00000000000096d0        0xc build/py/gc.o
+                0x00000000000096d0                gc_is_locked
+ *fill*         0x00000000000096dc        0x4 
+ .text.gc_collect_start
+                0x00000000000096e0       0xa1 build/py/gc.o
+                0x00000000000096e0                gc_collect_start
+ *fill*         0x0000000000009781        0xf 
+ .text.gc_collect_root
+                0x0000000000009790       0x99 build/py/gc.o
+                0x0000000000009790                gc_collect_root
+ *fill*         0x0000000000009829        0x7 
+ .text.gc_collect_end
+                0x0000000000009830      0x18d build/py/gc.o
+                0x0000000000009830                gc_collect_end
+ *fill*         0x00000000000099bd        0x3 
+ .text.gc_alloc
+                0x00000000000099c0      0x215 build/py/gc.o
+                0x00000000000099c0                gc_alloc
+ *fill*         0x0000000000009bd5        0xb 
+ .text.gc_free  0x0000000000009be0       0x19 build/py/gc.o
+                0x0000000000009be0                gc_free
+ *fill*         0x0000000000009bf9        0x7 
+ .text.gc_realloc
+                0x0000000000009c00      0x310 build/py/gc.o
+                0x0000000000009c00                gc_realloc
+ .text.find_qstr
+                0x0000000000009f10       0x1e build/py/qstr.o
+ .text.qstr_compute_hash
+                0x0000000000009f2e       0x2b build/py/qstr.o
+                0x0000000000009f2e                qstr_compute_hash
+ .text.qstr_init
+                0x0000000000009f59       0x1a build/py/qstr.o
+                0x0000000000009f59                qstr_init
+ .text.qstr_find_strn
+                0x0000000000009f73       0x94 build/py/qstr.o
+                0x0000000000009f73                qstr_find_strn
+ .text.qstr_from_strn
+                0x000000000000a007      0x1b3 build/py/qstr.o
+                0x000000000000a007                qstr_from_strn
+ .text.qstr_from_str
+                0x000000000000a1ba       0x1f build/py/qstr.o
+                0x000000000000a1ba                qstr_from_str
+ .text.qstr_hash
+                0x000000000000a1d9        0x9 build/py/qstr.o
+                0x000000000000a1d9                qstr_hash
+ .text.qstr_len
+                0x000000000000a1e2        0xa build/py/qstr.o
+                0x000000000000a1e2                qstr_len
+ .text.qstr_str
+                0x000000000000a1ec        0xa build/py/qstr.o
+                0x000000000000a1ec                qstr_str
+ .text.qstr_data
+                0x000000000000a1f6       0x11 build/py/qstr.o
+                0x000000000000a1f6                qstr_data
+ .text.vstr_ensure_extra
+                0x000000000000a207       0x47 build/py/vstr.o
+ .text.vstr_add_strn
+                0x000000000000a24e       0x31 build/py/vstr.o
+                0x000000000000a24e                vstr_add_strn
+ .text.vstr_init
+                0x000000000000a27f       0x2a build/py/vstr.o
+                0x000000000000a27f                vstr_init
+ .text.vstr_init_len
+                0x000000000000a2a9       0x1a build/py/vstr.o
+                0x000000000000a2a9                vstr_init_len
+ .text.vstr_init_print
+                0x000000000000a2c3       0x20 build/py/vstr.o
+                0x000000000000a2c3                vstr_init_print
+ .text.vstr_clear
+                0x000000000000a2e3       0x1d build/py/vstr.o
+                0x000000000000a2e3                vstr_clear
+ .text.vstr_extend
+                0x000000000000a300       0x40 build/py/vstr.o
+                0x000000000000a300                vstr_extend
+ .text.vstr_add_len
+                0x000000000000a340       0x24 build/py/vstr.o
+                0x000000000000a340                vstr_add_len
+ .text.vstr_null_terminated_str
+                0x000000000000a364       0x29 build/py/vstr.o
+                0x000000000000a364                vstr_null_terminated_str
+ .text.vstr_add_byte
+                0x000000000000a38d       0x11 build/py/vstr.o
+                0x000000000000a38d                vstr_add_byte
+ .text.vstr_add_char
+                0x000000000000a39e       0xda build/py/vstr.o
+                0x000000000000a39e                vstr_add_char
+ .text.vstr_add_str
+                0x000000000000a478       0x2c build/py/vstr.o
+                0x000000000000a478                vstr_add_str
+ .text.vstr_cut_tail_bytes
+                0x000000000000a4a4       0x16 build/py/vstr.o
+                0x000000000000a4a4                vstr_cut_tail_bytes
+ .text.mp_print_str
+                0x000000000000a4ba       0x36 build/py/mpprint.o
+                0x000000000000a4ba                mp_print_str
+ .text.mp_print_strn
+                0x000000000000a4f0      0x10d build/py/mpprint.o
+                0x000000000000a4f0                mp_print_strn
+ .text.mp_print_int
+                0x000000000000a5fd      0x114 build/py/mpprint.o
+ .text.mp_print_mp_int
+                0x000000000000a711      0x34f build/py/mpprint.o
+                0x000000000000a711                mp_print_mp_int
+ .text.mp_print_float
+                0x000000000000aa60       0xc8 build/py/mpprint.o
+                0x000000000000aa60                mp_print_float
+ .text.mp_vprintf
+                0x000000000000ab28      0x4b9 build/py/mpprint.o
+                0x000000000000ab28                mp_vprintf
+ .text.mp_printf
+                0x000000000000afe1       0x8f build/py/mpprint.o
+                0x000000000000afe1                mp_printf
+ .text.utf8_get_char
+                0x000000000000b070       0x3a build/py/unicode.o
+                0x000000000000b070                utf8_get_char
+ .text.utf8_next_char
+                0x000000000000b0aa       0x14 build/py/unicode.o
+                0x000000000000b0aa                utf8_next_char
+ .text.utf8_ptr_to_index
+                0x000000000000b0be       0x1b build/py/unicode.o
+                0x000000000000b0be                utf8_ptr_to_index
+ .text.utf8_charlen
+                0x000000000000b0d9       0x1d build/py/unicode.o
+                0x000000000000b0d9                utf8_charlen
+ .text.unichar_isspace
+                0x000000000000b0f6       0x1c build/py/unicode.o
+                0x000000000000b0f6                unichar_isspace
+ .text.unichar_isalpha
+                0x000000000000b112       0x1d build/py/unicode.o
+                0x000000000000b112                unichar_isalpha
+ .text.unichar_isdigit
+                0x000000000000b12f       0x1d build/py/unicode.o
+                0x000000000000b12f                unichar_isdigit
+ .text.unichar_isxdigit
+                0x000000000000b14c       0x1d build/py/unicode.o
+                0x000000000000b14c                unichar_isxdigit
+ .text.unichar_isupper
+                0x000000000000b169       0x1d build/py/unicode.o
+                0x000000000000b169                unichar_isupper
+ .text.unichar_islower
+                0x000000000000b186       0x1d build/py/unicode.o
+                0x000000000000b186                unichar_islower
+ .text.unichar_tolower
+                0x000000000000b1a3       0x14 build/py/unicode.o
+                0x000000000000b1a3                unichar_tolower
+ .text.unichar_toupper
+                0x000000000000b1b7       0x14 build/py/unicode.o
+                0x000000000000b1b7                unichar_toupper
+ .text.unichar_xdigit_value
+                0x000000000000b1cb       0x12 build/py/unicode.o
+                0x000000000000b1cb                unichar_xdigit_value
+ .text.utf8_check
+                0x000000000000b1dd       0x4c build/py/unicode.o
+                0x000000000000b1dd                utf8_check
+ .text.mpn_remove_trailing_zeros
+                0x000000000000b229       0x1a build/py/mpz.o
+ .text.mpn_shr  0x000000000000b243       0x49 build/py/mpz.o
+ .text.mpn_add  0x000000000000b28c       0x6c build/py/mpz.o
+ .text.mpn_sub  0x000000000000b2f8       0x5b build/py/mpz.o
+ .text.mpz_clone
+                0x000000000000b353       0x7a build/py/mpz.o
+ .text.mpn_cmp  0x000000000000b3cd       0x4c build/py/mpz.o
+ .text.mpz_free
+                0x000000000000b419       0x1c build/py/mpz.o
+ .text.mpz_need_dig
+                0x000000000000b435       0x73 build/py/mpz.o
+ .text.mpz_set_from_int.part.0
+                0x000000000000b4a8       0x53 build/py/mpz.o
+ .text.mpz_init_zero
+                0x000000000000b4fb       0x18 build/py/mpz.o
+                0x000000000000b4fb                mpz_init_zero
+ .text.mpz_deinit
+                0x000000000000b513       0x14 build/py/mpz.o
+                0x000000000000b513                mpz_deinit
+ .text.mpz_set  0x000000000000b527       0x43 build/py/mpz.o
+                0x000000000000b527                mpz_set
+ .text.mpz_set_from_int
+                0x000000000000b56a       0x13 build/py/mpz.o
+                0x000000000000b56a                mpz_set_from_int
+ .text.mpz_init_from_int
+                0x000000000000b57d        0xc build/py/mpz.o
+                0x000000000000b57d                mpz_init_from_int
+ .text.mpz_init_fixed_from_int
+                0x000000000000b589       0x22 build/py/mpz.o
+                0x000000000000b589                mpz_init_fixed_from_int
+ .text.mpz_set_from_ll
+                0x000000000000b5ab       0x61 build/py/mpz.o
+                0x000000000000b5ab                mpz_set_from_ll
+ .text.mpz_set_from_float
+                0x000000000000b60c      0x13e build/py/mpz.o
+                0x000000000000b60c                mpz_set_from_float
+ .text.mpz_set_from_str
+                0x000000000000b74a       0xf5 build/py/mpz.o
+                0x000000000000b74a                mpz_set_from_str
+ .text.mpz_set_from_bytes
+                0x000000000000b83f       0xa0 build/py/mpz.o
+                0x000000000000b83f                mpz_set_from_bytes
+ .text.mpz_cmp  0x000000000000b8df       0x43 build/py/mpz.o
+                0x000000000000b8df                mpz_cmp
+ .text.mpz_abs_inpl
+                0x000000000000b922       0x13 build/py/mpz.o
+                0x000000000000b922                mpz_abs_inpl
+ .text.mpz_neg_inpl
+                0x000000000000b935       0x20 build/py/mpz.o
+                0x000000000000b935                mpz_neg_inpl
+ .text.mpz_not_inpl
+                0x000000000000b955       0xad build/py/mpz.o
+                0x000000000000b955                mpz_not_inpl
+ .text.mpz_shl_inpl
+                0x000000000000ba02       0xf0 build/py/mpz.o
+                0x000000000000ba02                mpz_shl_inpl
+ .text.mpz_shr_inpl
+                0x000000000000baf2      0x11b build/py/mpz.o
+                0x000000000000baf2                mpz_shr_inpl
+ .text.mpz_add_inpl
+                0x000000000000bc0d       0x9d build/py/mpz.o
+                0x000000000000bc0d                mpz_add_inpl
+ .text.mpz_sub_inpl
+                0x000000000000bcaa       0xb8 build/py/mpz.o
+                0x000000000000bcaa                mpz_sub_inpl
+ .text.mpz_and_inpl
+                0x000000000000bd62      0x13b build/py/mpz.o
+                0x000000000000bd62                mpz_and_inpl
+ .text.mpz_or_inpl
+                0x000000000000be9d      0x155 build/py/mpz.o
+                0x000000000000be9d                mpz_or_inpl
+ .text.mpz_xor_inpl
+                0x000000000000bff2      0x130 build/py/mpz.o
+                0x000000000000bff2                mpz_xor_inpl
+ .text.mpz_mul_inpl
+                0x000000000000c122      0x13a build/py/mpz.o
+                0x000000000000c122                mpz_mul_inpl
+ .text.mpz_pow_inpl
+                0x000000000000c25c       0xbf build/py/mpz.o
+                0x000000000000c25c                mpz_pow_inpl
+ .text.mpz_divmod_inpl
+                0x000000000000c31b      0x3ac build/py/mpz.o
+                0x000000000000c31b                mpz_divmod_inpl
+ .text.mpz_hash
+                0x000000000000c6c7       0x2c build/py/mpz.o
+                0x000000000000c6c7                mpz_hash
+ .text.mpz_as_int_checked
+                0x000000000000c6f3       0x3f build/py/mpz.o
+                0x000000000000c6f3                mpz_as_int_checked
+ .text.mpz_as_bytes
+                0x000000000000c732       0x94 build/py/mpz.o
+                0x000000000000c732                mpz_as_bytes
+ .text.mpz_as_float
+                0x000000000000c7c6       0x3f build/py/mpz.o
+                0x000000000000c7c6                mpz_as_float
+ .text.mpz_as_str_inpl
+                0x000000000000c805      0x1cd build/py/mpz.o
+                0x000000000000c805                mpz_as_str_inpl
+ .text.mp_reader_posix_readbyte
+                0x000000000000c9d2       0x5b build/py/reader.o
+ .text.mp_reader_posix_close
+                0x000000000000ca2d       0x1a build/py/reader.o
+ .text.mp_reader_new_file_from_fd
+                0x000000000000ca47       0x83 build/py/reader.o
+                0x000000000000ca47                mp_reader_new_file_from_fd
+ .text.mp_reader_new_file
+                0x000000000000caca       0x35 build/py/reader.o
+                0x000000000000caca                mp_reader_new_file
+ .text.next_char
+                0x000000000000caff       0x85 build/py/lexer.o
+ .text.skip_whitespace
+                0x000000000000cb84       0x7f build/py/lexer.o
+ .text.is_string_or_bytes
+                0x000000000000cc03       0x63 build/py/lexer.o
+ .text.mp_lexer_to_next
+                0x000000000000cc66      0x7a4 build/py/lexer.o
+                0x000000000000cc66                mp_lexer_to_next
+ .text.mp_lexer_new
+                0x000000000000d40a       0xd6 build/py/lexer.o
+                0x000000000000d40a                mp_lexer_new
+ .text.mp_lexer_new_from_file
+                0x000000000000d4e0       0x38 build/py/lexer.o
+                0x000000000000d4e0                mp_lexer_new_from_file
+ .text.mp_lexer_free
+                0x000000000000d518       0x2f build/py/lexer.o
+                0x000000000000d518                mp_lexer_free
+ .text.parser_alloc
+                0x000000000000d547       0xaa build/py/parse.o
+ .text.push_result_node
+                0x000000000000d5f1       0x45 build/py/parse.o
+ .text.push_rule
+                0x000000000000d636       0x79 build/py/parse.o
+ .text.peek_result
+                0x000000000000d6af       0x38 build/py/parse.o
+ .text.pop_result
+                0x000000000000d6e7       0x39 build/py/parse.o
+ .text.push_rule_from_arg
+                0x000000000000d720       0x43 build/py/parse.o
+ .text.push_result_token
+                0x000000000000d763      0x182 build/py/parse.o
+ .text.mp_parse_node_is_const_false
+                0x000000000000d8e5       0x22 build/py/parse.o
+                0x000000000000d8e5                mp_parse_node_is_const_false
+ .text.mp_parse_node_is_const_true
+                0x000000000000d907       0x22 build/py/parse.o
+                0x000000000000d907                mp_parse_node_is_const_true
+ .text.mp_parse_node_get_int_maybe
+                0x000000000000d929       0x4f build/py/parse.o
+                0x000000000000d929                mp_parse_node_get_int_maybe
+ .text.push_result_rule
+                0x000000000000d978      0x649 build/py/parse.o
+ .text.mp_parse_node_extract_list
+                0x000000000000dfc1       0x36 build/py/parse.o
+                0x000000000000dfc1                mp_parse_node_extract_list
+ .text.mp_parse
+                0x000000000000dff7      0x6a7 build/py/parse.o
+                0x000000000000dff7                mp_parse
+ .text.mp_parse_tree_clear
+                0x000000000000e69e       0x1e build/py/parse.o
+                0x000000000000e69e                mp_parse_tree_clear
+ .text.scope_new
+                0x000000000000e6bc       0xad build/py/scope.o
+                0x000000000000e6bc                scope_new
+ .text.scope_free
+                0x000000000000e769       0x16 build/py/scope.o
+                0x000000000000e769                scope_free
+ .text.scope_find
+                0x000000000000e77f       0x24 build/py/scope.o
+                0x000000000000e77f                scope_find
+ .text.scope_find_or_add_id
+                0x000000000000e7a3       0x6b build/py/scope.o
+                0x000000000000e7a3                scope_find_or_add_id
+ .text.scope_find_global
+                0x000000000000e80e       0x14 build/py/scope.o
+                0x000000000000e80e                scope_find_global
+ .text.scope_check_to_close_over
+                0x000000000000e822       0xb9 build/py/scope.o
+                0x000000000000e822                scope_check_to_close_over
+ .text.reserve_labels_for_native
+                0x000000000000e8db        0xf build/py/compile.o
+ .text.compile_increase_except_level
+                0x000000000000e8ea       0x2d build/py/compile.o
+ .text.apply_to_single_or_list
+                0x000000000000e917       0x67 build/py/compile.o
+ .text.compile_del_stmt
+                0x000000000000e97e       0x15 build/py/compile.o
+ .text.compile_import_name
+                0x000000000000e993       0x15 build/py/compile.o
+ .text.compile_yield_from
+                0x000000000000e9a8       0x45 build/py/compile.o
+ .text.compile_await_object_method
+                0x000000000000e9ed       0x31 build/py/compile.o
+ .text.compile_trailer_period
+                0x000000000000ea1e       0x1e build/py/compile.o
+ .text.compile_const_object
+                0x000000000000ea3c       0x18 build/py/compile.o
+ .text.scope_new_and_link
+                0x000000000000ea54       0x44 build/py/compile.o
+ .text.close_over_variables_etc
+                0x000000000000ea98      0x111 build/py/compile.o
+ .text.compile_funcdef_lambdef
+                0x000000000000eba9       0x8d build/py/compile.o
+ .text.compile_lambdef
+                0x000000000000ec36       0x48 build/py/compile.o
+ .text.compile_funcdef_helper
+                0x000000000000ec7e       0x50 build/py/compile.o
+ .text.do_import_name
+                0x000000000000ecce      0x1d4 build/py/compile.o
+ .text.compile_error_set_line
+                0x000000000000eea2       0x18 build/py/compile.o
+ .text.compile_decrease_except_level
+                0x000000000000eeba       0x4d build/py/compile.o
+ .text.compile_syntax_error
+                0x000000000000ef07       0x34 build/py/compile.o
+ .text.compile_scope_inline_asm
+                0x000000000000ef3b      0x468 build/py/compile.o
+ .text.compile_star_expr
+                0x000000000000f3a3        0xc build/py/compile.o
+ .text.compile_break_cont_stmt
+                0x000000000000f3af       0x6e build/py/compile.o
+ .text.compile_viper_type_annotation
+                0x000000000000f41d       0x68 build/py/compile.o
+ .text.compile_scope_func_lambda_param
+                0x000000000000f485      0x1d3 build/py/compile.o
+ .text.compile_scope_lambda_param
+                0x000000000000f658       0x15 build/py/compile.o
+ .text.compile_scope_func_param
+                0x000000000000f66d       0x15 build/py/compile.o
+ .text.compile_load_id
+                0x000000000000f682       0x2e build/py/compile.o
+ .text.compile_store_id
+                0x000000000000f6b0       0x26 build/py/compile.o
+ .text.compile_funcdef
+                0x000000000000f6d6       0x27 build/py/compile.o
+ .text.compile_import_from
+                0x000000000000f6fd      0x270 build/py/compile.o
+ .text.compile_dotted_as_name
+                0x000000000000f96d       0x52 build/py/compile.o
+ .text.compile_delete_id
+                0x000000000000f9bf       0x26 build/py/compile.o
+ .text.compile_node
+                0x000000000000f9e5      0x19f build/py/compile.o
+ .text.c_assign
+                0x000000000000fb84      0x360 build/py/compile.o
+ .text.c_assign_tuple
+                0x000000000000fee4      0x13e build/py/compile.o
+ .text.compile_yield_expr
+                0x0000000000010022       0x83 build/py/compile.o
+ .text.compile_comprehension
+                0x00000000000100a5       0xd2 build/py/compile.o
+ .text.compile_trailer_paren_helper
+                0x0000000000010177      0x1e3 build/py/compile.o
+ .text.compile_classdef_helper
+                0x000000000001035a       0x8b build/py/compile.o
+ .text.compile_classdef
+                0x00000000000103e5       0x27 build/py/compile.o
+ .text.compile_trailer_paren
+                0x000000000001040c        0xd build/py/compile.o
+ .text.compile_dictorsetmaker_item
+                0x0000000000010419       0x29 build/py/compile.o
+ .text.compile_subscript
+                0x0000000000010442      0x171 build/py/compile.o
+ .text.compile_trailer_bracket
+                0x00000000000105b3       0x21 build/py/compile.o
+ .text.c_tuple  0x00000000000105d4       0x68 build/py/compile.o
+ .text.compile_atom_paren
+                0x000000000001063c       0xcc build/py/compile.o
+ .text.compile_generic_tuple
+                0x0000000000010708        0xa build/py/compile.o
+ .text.compile_atom_expr_normal
+                0x0000000000010712      0x1c8 build/py/compile.o
+ .text.compile_term
+                0x00000000000108da       0x63 build/py/compile.o
+ .text.compile_binary_op
+                0x000000000001093d       0x5c build/py/compile.o
+ .text.compile_comparison
+                0x0000000000010999      0x1d3 build/py/compile.o
+ .text.compile_not_test_2
+                0x0000000000010b6c       0x24 build/py/compile.o
+ .text.compile_or_and_test
+                0x0000000000010b90       0x94 build/py/compile.o
+ .text.compile_funcdef_lambdef_param
+                0x0000000000010c24      0x161 build/py/compile.o
+ .text.compile_with_stmt_helper
+                0x0000000000010d85       0xd9 build/py/compile.o
+ .text.compile_try_except
+                0x0000000000010e5e      0x2d1 build/py/compile.o
+ .text.compile_try_finally
+                0x000000000001112f       0xe1 build/py/compile.o
+ .text.compile_try_stmt
+                0x0000000000011210       0xce build/py/compile.o
+ .text.compile_for_stmt
+                0x00000000000112de      0x4ae build/py/compile.o
+ .text.compile_async_with_stmt_helper
+                0x000000000001178c      0x39a build/py/compile.o
+ .text.compile_async_stmt
+                0x0000000000011b26      0x2e6 build/py/compile.o
+ .text.compile_raise_stmt
+                0x0000000000011e0c       0x7d build/py/compile.o
+ .text.compile_yield_stmt
+                0x0000000000011e89       0x1f build/py/compile.o
+ .text.c_del_stmt
+                0x0000000000011ea8      0x25b build/py/compile.o
+ .text.compile_expr_stmt
+                0x0000000000012103      0x2d3 build/py/compile.o
+ .text.compile_decorated
+                0x00000000000123d6      0x2d9 build/py/compile.o
+ .text.compile_generic_all_nodes
+                0x00000000000126af       0x5f build/py/compile.o
+ .text.compile_power
+                0x000000000001270e       0x20 build/py/compile.o
+ .text.compile_atom_bracket
+                0x000000000001272e      0x144 build/py/compile.o
+ .text.c_if_cond
+                0x0000000000012872      0x1c9 build/py/compile.o
+ .text.compile_scope_comp_iter
+                0x0000000000012a3b      0x17b build/py/compile.o
+ .text.compile_scope
+                0x0000000000012bb6      0x4f1 build/py/compile.o
+ .text.compile_test_if_expr
+                0x00000000000130a7       0xbc build/py/compile.o
+ .text.compile_while_stmt
+                0x0000000000013163       0xe9 build/py/compile.o
+ .text.compile_if_stmt
+                0x000000000001324c      0x1a9 build/py/compile.o
+ .text.compile_atom_expr_await
+                0x00000000000133f5       0x38 build/py/compile.o
+ .text.compile_factor_2
+                0x000000000001342d       0x5f build/py/compile.o
+ .text.compile_with_stmt
+                0x000000000001348c       0x5e build/py/compile.o
+ .text.compile_assert_stmt
+                0x00000000000134ea       0x97 build/py/compile.o
+ .text.compile_return_stmt
+                0x0000000000013581       0xbc build/py/compile.o
+ .text.compile_global_nonlocal_stmt
+                0x000000000001363d      0x111 build/py/compile.o
+ .text.compile_atom_brace
+                0x000000000001374e      0x27c build/py/compile.o
+ .text.mp_compile_to_raw_code
+                0x00000000000139ca      0x4e0 build/py/compile.o
+                0x00000000000139ca                mp_compile_to_raw_code
+ .text.mp_emit_common_get_id_for_modification
+                0x0000000000013eaa       0x1d build/py/emitcommon.o
+                0x0000000000013eaa                mp_emit_common_get_id_for_modification
+ .text.mp_emit_common_id_op
+                0x0000000000013ec7       0xb8 build/py/emitcommon.o
+                0x0000000000013ec7                mp_emit_common_id_op
+ .text.mp_emit_bc_last_emit_was_return_value
+                0x0000000000013f7f        0x8 build/py/emitbc.o
+                0x0000000000013f7f                mp_emit_bc_last_emit_was_return_value
+ .text.emit_get_cur_to_write_code_info
+                0x0000000000013f87       0x47 build/py/emitbc.o
+ .text.emit_write_code_info_byte
+                0x0000000000013fce       0x11 build/py/emitbc.o
+ .text.emit_write_code_info_qstr
+                0x0000000000013fdf       0x13 build/py/emitbc.o
+ .text.mp_emit_bc_start_pass
+                0x0000000000013ff2      0x26c build/py/emitbc.o
+                0x0000000000013ff2                mp_emit_bc_start_pass
+ .text.mp_emit_bc_adjust_stack_size
+                0x000000000001425e       0x4f build/py/emitbc.o
+                0x000000000001425e                mp_emit_bc_adjust_stack_size
+ .text.mp_emit_bc_for_iter_end
+                0x00000000000142ad        0xc build/py/emitbc.o
+                0x00000000000142ad                mp_emit_bc_for_iter_end
+ .text.mp_emit_bc_start_except_handler
+                0x00000000000142b9        0xa build/py/emitbc.o
+                0x00000000000142b9                mp_emit_bc_start_except_handler
+ .text.mp_emit_bc_end_except_handler
+                0x00000000000142c3        0xc build/py/emitbc.o
+                0x00000000000142c3                mp_emit_bc_end_except_handler
+ .text.mp_emit_bc_label_assign
+                0x00000000000142cf       0x9b build/py/emitbc.o
+                0x00000000000142cf                mp_emit_bc_label_assign
+ .text.mp_emit_bc_set_source_line
+                0x000000000001436a       0xec build/py/emitbc.o
+                0x000000000001436a                mp_emit_bc_set_source_line
+ .text.emit_get_cur_to_write_bytecode
+                0x0000000000014456       0x4b build/py/emitbc.o
+ .text.emit_write_bytecode_byte
+                0x00000000000144a1       0x2b build/py/emitbc.o
+ .text.mp_emit_bc_load_null
+                0x00000000000144cc        0xf build/py/emitbc.o
+                0x00000000000144cc                mp_emit_bc_load_null
+ .text.mp_emit_bc_load_build_class
+                0x00000000000144db        0xf build/py/emitbc.o
+                0x00000000000144db                mp_emit_bc_load_build_class
+ .text.mp_emit_bc_dup_top
+                0x00000000000144ea        0xf build/py/emitbc.o
+                0x00000000000144ea                mp_emit_bc_dup_top
+ .text.mp_emit_bc_dup_top_two
+                0x00000000000144f9        0xf build/py/emitbc.o
+                0x00000000000144f9                mp_emit_bc_dup_top_two
+ .text.mp_emit_bc_pop_top
+                0x0000000000014508        0xd build/py/emitbc.o
+                0x0000000000014508                mp_emit_bc_pop_top
+ .text.mp_emit_bc_rot_two
+                0x0000000000014515        0xc build/py/emitbc.o
+                0x0000000000014515                mp_emit_bc_rot_two
+ .text.mp_emit_bc_rot_three
+                0x0000000000014521        0xc build/py/emitbc.o
+                0x0000000000014521                mp_emit_bc_rot_three
+ .text.mp_emit_bc_end_finally
+                0x000000000001452d        0xd build/py/emitbc.o
+                0x000000000001452d                mp_emit_bc_end_finally
+ .text.mp_emit_bc_get_iter
+                0x000000000001453a       0x19 build/py/emitbc.o
+                0x000000000001453a                mp_emit_bc_get_iter
+ .text.mp_emit_bc_unary_op
+                0x0000000000014553        0xd build/py/emitbc.o
+                0x0000000000014553                mp_emit_bc_unary_op
+ .text.mp_emit_bc_store_map
+                0x0000000000014560        0xf build/py/emitbc.o
+                0x0000000000014560                mp_emit_bc_store_map
+ .text.mp_emit_bc_return_value
+                0x000000000001456f       0x17 build/py/emitbc.o
+                0x000000000001456f                mp_emit_bc_return_value
+ .text.mp_emit_bc_yield
+                0x0000000000014586       0x1c build/py/emitbc.o
+                0x0000000000014586                mp_emit_bc_yield
+ .text.emit_write_bytecode_raw_byte
+                0x00000000000145a2       0x11 build/py/emitbc.o
+ .text.emit_write_bytecode_byte_signed_label
+                0x00000000000145b3       0x54 build/py/emitbc.o
+ .text.mp_emit_bc_jump
+                0x0000000000014607        0xf build/py/emitbc.o
+                0x0000000000014607                mp_emit_bc_jump
+ .text.emit_write_bytecode_byte_unsigned_label
+                0x0000000000014616       0x57 build/py/emitbc.o
+ .text.mp_emit_bc_setup_block
+                0x000000000001466d       0x16 build/py/emitbc.o
+                0x000000000001466d                mp_emit_bc_setup_block
+ .text.mp_emit_bc_for_iter
+                0x0000000000014683       0x12 build/py/emitbc.o
+                0x0000000000014683                mp_emit_bc_for_iter
+ .text.mp_emit_bc_pop_except_jump
+                0x0000000000014695        0xf build/py/emitbc.o
+                0x0000000000014695                mp_emit_bc_pop_except_jump
+ .text.mp_emit_bc_subscr
+                0x00000000000146a4       0x37 build/py/emitbc.o
+                0x00000000000146a4                mp_emit_bc_subscr
+ .text.mp_emit_bc_binary_op
+                0x00000000000146db       0x55 build/py/emitbc.o
+                0x00000000000146db                mp_emit_bc_binary_op
+ .text.mp_emit_bc_pop_jump_if
+                0x0000000000014730       0x1a build/py/emitbc.o
+                0x0000000000014730                mp_emit_bc_pop_jump_if
+ .text.mp_emit_bc_jump_if_or_pop
+                0x000000000001474a       0x1a build/py/emitbc.o
+                0x000000000001474a                mp_emit_bc_jump_if_or_pop
+ .text.mp_emit_bc_unwind_jump
+                0x0000000000014764       0xa1 build/py/emitbc.o
+                0x0000000000014764                mp_emit_bc_unwind_jump
+ .text.emit_write_bytecode_byte_qstr
+                0x0000000000014805       0x60 build/py/emitbc.o
+ .text.mp_emit_bc_import
+                0x0000000000014865       0x2f build/py/emitbc.o
+                0x0000000000014865                mp_emit_bc_import
+ .text.mp_emit_bc_load_const_str
+                0x0000000000014894       0x12 build/py/emitbc.o
+                0x0000000000014894                mp_emit_bc_load_const_str
+ .text.mp_emit_bc_load_global
+                0x00000000000148a6       0x3a build/py/emitbc.o
+                0x00000000000148a6                mp_emit_bc_load_global
+ .text.mp_emit_bc_load_method
+                0x00000000000148e0       0x1c build/py/emitbc.o
+                0x00000000000148e0                mp_emit_bc_load_method
+ .text.mp_emit_bc_attr
+                0x00000000000148fc       0x64 build/py/emitbc.o
+                0x00000000000148fc                mp_emit_bc_attr
+ .text.mp_emit_bc_store_global
+                0x0000000000014960       0x11 build/py/emitbc.o
+                0x0000000000014960                mp_emit_bc_store_global
+ .text.mp_emit_bc_delete_global
+                0x0000000000014971       0x10 build/py/emitbc.o
+                0x0000000000014971                mp_emit_bc_delete_global
+ .text.mp_emit_bc_raise_varargs
+                0x0000000000014981       0x33 build/py/emitbc.o
+                0x0000000000014981                mp_emit_bc_raise_varargs
+ .text.mp_emit_bc_end_pass
+                0x00000000000149b4      0x162 build/py/emitbc.o
+                0x00000000000149b4                mp_emit_bc_end_pass
+ .text.mp_emit_bc_load_const_small_int
+                0x0000000000014b16       0xc5 build/py/emitbc.o
+                0x0000000000014b16                mp_emit_bc_load_const_small_int
+ .text.emit_write_bytecode_byte_uint
+                0x0000000000014bdb       0x6f build/py/emitbc.o
+ .text.emit_write_bytecode_byte_raw_code
+                0x0000000000014c4a       0x43 build/py/emitbc.o
+ .text.mp_emit_bc_make_closure
+                0x0000000000014c8d       0x70 build/py/emitbc.o
+                0x0000000000014c8d                mp_emit_bc_make_closure
+ .text.mp_emit_bc_delete_local
+                0x0000000000014cfd       0x13 build/py/emitbc.o
+                0x0000000000014cfd                mp_emit_bc_delete_local
+ .text.mp_emit_bc_build
+                0x0000000000014d10       0x1a build/py/emitbc.o
+                0x0000000000014d10                mp_emit_bc_build
+ .text.mp_emit_bc_store_comp
+                0x0000000000014d2a       0x39 build/py/emitbc.o
+                0x0000000000014d2a                mp_emit_bc_store_comp
+ .text.mp_emit_bc_unpack_sequence
+                0x0000000000014d63       0x10 build/py/emitbc.o
+                0x0000000000014d63                mp_emit_bc_unpack_sequence
+ .text.mp_emit_bc_unpack_ex
+                0x0000000000014d73       0x16 build/py/emitbc.o
+                0x0000000000014d73                mp_emit_bc_unpack_ex
+ .text.emit_bc_call_function_method_helper
+                0x0000000000014d89       0x1f build/py/emitbc.o
+ .text.mp_emit_bc_call_function
+                0x0000000000014da8       0x15 build/py/emitbc.o
+                0x0000000000014da8                mp_emit_bc_call_function
+ .text.mp_emit_bc_call_method
+                0x0000000000014dbd       0x16 build/py/emitbc.o
+                0x0000000000014dbd                mp_emit_bc_call_method
+ .text.mp_emit_bc_load_local
+                0x0000000000014dd3       0x30 build/py/emitbc.o
+                0x0000000000014dd3                mp_emit_bc_load_local
+ .text.mp_emit_bc_store_local
+                0x0000000000014e03       0x2c build/py/emitbc.o
+                0x0000000000014e03                mp_emit_bc_store_local
+ .text.mp_emit_bc_make_function
+                0x0000000000014e2f       0x25 build/py/emitbc.o
+                0x0000000000014e2f                mp_emit_bc_make_function
+ .text.mp_emit_bc_load_const_obj
+                0x0000000000014e54       0x3d build/py/emitbc.o
+                0x0000000000014e54                mp_emit_bc_load_const_obj
+ .text.mp_emit_bc_load_const_tok
+                0x0000000000014e91       0x5a build/py/emitbc.o
+                0x0000000000014e91                mp_emit_bc_load_const_tok
+ .text.mp_emit_bc_with_cleanup
+                0x0000000000014eeb       0x44 build/py/emitbc.o
+                0x0000000000014eeb                mp_emit_bc_with_cleanup
+ .text.emit_bc_new
+                0x0000000000014f2f        0xa build/py/emitbc.o
+                0x0000000000014f2f                emit_bc_new
+ .text.emit_bc_set_max_num_labels
+                0x0000000000014f39       0x1b build/py/emitbc.o
+                0x0000000000014f39                emit_bc_set_max_num_labels
+ .text.emit_bc_free
+                0x0000000000014f54       0x16 build/py/emitbc.o
+                0x0000000000014f54                emit_bc_free
+ .text.mp_asm_base_init
+                0x0000000000014f6a       0x1b build/py/asmbase.o
+                0x0000000000014f6a                mp_asm_base_init
+ .text.mp_asm_base_deinit
+                0x0000000000014f85       0x1c build/py/asmbase.o
+                0x0000000000014f85                mp_asm_base_deinit
+ .text.mp_asm_base_start_pass
+                0x0000000000014fa1       0x69 build/py/asmbase.o
+                0x0000000000014fa1                mp_asm_base_start_pass
+ .text.mp_asm_base_get_cur_to_write_bytes
+                0x000000000001500a       0x3f build/py/asmbase.o
+                0x000000000001500a                mp_asm_base_get_cur_to_write_bytes
+ .text.mp_asm_base_label_assign
+                0x0000000000015049       0x84 build/py/asmbase.o
+                0x0000000000015049                mp_asm_base_label_assign
+ .text.mp_asm_base_align
+                0x00000000000150cd       0x15 build/py/asmbase.o
+                0x00000000000150cd                mp_asm_base_align
+ .text.mp_asm_base_data
+                0x00000000000150e2       0x2e build/py/asmbase.o
+                0x00000000000150e2                mp_asm_base_data
+ .text.asm_x64_write_byte_1
+                0x0000000000015110       0x16 build/py/asmx64.o
+ .text.asm_x64_write_byte_2
+                0x0000000000015126       0x20 build/py/asmx64.o
+ .text.asm_x64_write_byte_3
+                0x0000000000015146       0x29 build/py/asmx64.o
+ .text.asm_x64_generic_r64_r64
+                0x000000000001516f       0x38 build/py/asmx64.o
+ .text.asm_x64_write_word32
+                0x00000000000151a7       0x16 build/py/asmx64.o
+ .text.asm_x64_write_r64_disp
+                0x00000000000151bd       0x99 build/py/asmx64.o
+ .text.get_label_dest
+                0x0000000000015256       0x2f build/py/asmx64.o
+ .text.asm_x64_sub_r64_i32.constprop.0
+                0x0000000000015285       0x59 build/py/asmx64.o
+ .text.asm_x64_mov_r64_r64
+                0x00000000000152de        0xa build/py/asmx64.o
+                0x00000000000152de                asm_x64_mov_r64_r64
+ .text.asm_x64_mov_r8_to_mem8
+                0x00000000000152e8       0x68 build/py/asmx64.o
+                0x00000000000152e8                asm_x64_mov_r8_to_mem8
+ .text.asm_x64_mov_r16_to_mem16
+                0x0000000000015350       0x71 build/py/asmx64.o
+                0x0000000000015350                asm_x64_mov_r16_to_mem16
+ .text.asm_x64_mov_r32_to_mem32
+                0x00000000000153c1       0x68 build/py/asmx64.o
+                0x00000000000153c1                asm_x64_mov_r32_to_mem32
+ .text.asm_x64_mov_r64_to_mem64
+                0x0000000000015429       0x51 build/py/asmx64.o
+                0x0000000000015429                asm_x64_mov_r64_to_mem64
+ .text.asm_x64_mov_mem8_to_r64zx
+                0x000000000001547a       0x7c build/py/asmx64.o
+                0x000000000001547a                asm_x64_mov_mem8_to_r64zx
+ .text.asm_x64_mov_mem16_to_r64zx
+                0x00000000000154f6       0x7c build/py/asmx64.o
+                0x00000000000154f6                asm_x64_mov_mem16_to_r64zx
+ .text.asm_x64_mov_mem32_to_r64zx
+                0x0000000000015572       0x72 build/py/asmx64.o
+                0x0000000000015572                asm_x64_mov_mem32_to_r64zx
+ .text.asm_x64_mov_mem64_to_r64
+                0x00000000000155e4       0x58 build/py/asmx64.o
+                0x00000000000155e4                asm_x64_mov_mem64_to_r64
+ .text.asm_x64_mov_i32_to_r64
+                0x000000000001563c       0x44 build/py/asmx64.o
+                0x000000000001563c                asm_x64_mov_i32_to_r64
+ .text.asm_x64_mov_i64_to_r64
+                0x0000000000015680       0x49 build/py/asmx64.o
+                0x0000000000015680                asm_x64_mov_i64_to_r64
+ .text.asm_x64_mov_i64_to_r64_optimised
+                0x00000000000156c9       0x18 build/py/asmx64.o
+                0x00000000000156c9                asm_x64_mov_i64_to_r64_optimised
+ .text.asm_x64_and_r64_r64
+                0x00000000000156e1        0xa build/py/asmx64.o
+                0x00000000000156e1                asm_x64_and_r64_r64
+ .text.asm_x64_or_r64_r64
+                0x00000000000156eb        0xa build/py/asmx64.o
+                0x00000000000156eb                asm_x64_or_r64_r64
+ .text.asm_x64_xor_r64_r64
+                0x00000000000156f5        0xa build/py/asmx64.o
+                0x00000000000156f5                asm_x64_xor_r64_r64
+ .text.asm_x64_shl_r64_cl
+                0x00000000000156ff        0xf build/py/asmx64.o
+                0x00000000000156ff                asm_x64_shl_r64_cl
+ .text.asm_x64_sar_r64_cl
+                0x000000000001570e        0xf build/py/asmx64.o
+                0x000000000001570e                asm_x64_sar_r64_cl
+ .text.asm_x64_add_r64_r64
+                0x000000000001571d        0xa build/py/asmx64.o
+                0x000000000001571d                asm_x64_add_r64_r64
+ .text.asm_x64_sub_r64_r64
+                0x0000000000015727        0xa build/py/asmx64.o
+                0x0000000000015727                asm_x64_sub_r64_r64
+ .text.asm_x64_mul_r64_r64
+                0x0000000000015731       0x5e build/py/asmx64.o
+                0x0000000000015731                asm_x64_mul_r64_r64
+ .text.asm_x64_cmp_r64_with_r64
+                0x000000000001578f       0x12 build/py/asmx64.o
+                0x000000000001578f                asm_x64_cmp_r64_with_r64
+ .text.asm_x64_test_r8_with_r8
+                0x00000000000157a1       0x68 build/py/asmx64.o
+                0x00000000000157a1                asm_x64_test_r8_with_r8
+ .text.asm_x64_test_r64_with_r64
+                0x0000000000015809       0x12 build/py/asmx64.o
+                0x0000000000015809                asm_x64_test_r64_with_r64
+ .text.asm_x64_setcc_r8
+                0x000000000001581b       0x3e build/py/asmx64.o
+                0x000000000001581b                asm_x64_setcc_r8
+ .text.asm_x64_jmp_reg
+                0x0000000000015859       0x37 build/py/asmx64.o
+                0x0000000000015859                asm_x64_jmp_reg
+ .text.asm_x64_jmp_label
+                0x0000000000015890       0x62 build/py/asmx64.o
+                0x0000000000015890                asm_x64_jmp_label
+ .text.asm_x64_jcc_label
+                0x00000000000158f2       0x72 build/py/asmx64.o
+                0x00000000000158f2                asm_x64_jcc_label
+ .text.asm_x64_entry
+                0x0000000000015964       0x7f build/py/asmx64.o
+                0x0000000000015964                asm_x64_entry
+ .text.asm_x64_exit
+                0x00000000000159e3       0x59 build/py/asmx64.o
+                0x00000000000159e3                asm_x64_exit
+ .text.asm_x64_mov_local_to_r64
+                0x0000000000015a3c       0x13 build/py/asmx64.o
+                0x0000000000015a3c                asm_x64_mov_local_to_r64
+ .text.asm_x64_mov_r64_to_local
+                0x0000000000015a4f       0x11 build/py/asmx64.o
+                0x0000000000015a4f                asm_x64_mov_r64_to_local
+ .text.asm_x64_mov_local_addr_to_r64
+                0x0000000000015a60       0x77 build/py/asmx64.o
+                0x0000000000015a60                asm_x64_mov_local_addr_to_r64
+ .text.asm_x64_mov_reg_pcrel
+                0x0000000000015ad7       0x4c build/py/asmx64.o
+                0x0000000000015ad7                asm_x64_mov_reg_pcrel
+ .text.asm_x64_call_ind
+                0x0000000000015b23       0x5f build/py/asmx64.o
+                0x0000000000015b23                asm_x64_call_ind
+ .text.vtype_to_qstr
+                0x0000000000015b82       0x18 build/py/emitnx64.o
+ .text.emit_native_last_emit_was_return_value
+                0x0000000000015b9a        0x7 build/py/emitnx64.o
+ .text.emit_native_set_source_line
+                0x0000000000015ba1        0x1 build/py/emitnx64.o
+ .text.emit_native_x64_new
+                0x0000000000015ba2       0x7b build/py/emitnx64.o
+                0x0000000000015ba2                emit_native_x64_new
+ .text.emit_native_x64_free
+                0x0000000000015c1d       0x42 build/py/emitnx64.o
+                0x0000000000015c1d                emit_native_x64_free
+ .text.adjust_stack
+                0x0000000000015c5f       0x71 build/py/emitnx64.o
+ .text.emit_native_end_except_handler
+                0x0000000000015cd0        0x9 build/py/emitnx64.o
+ .text.emit_pre_pop_discard
+                0x0000000000015cd9       0x10 build/py/emitnx64.o
+ .text.emit_native_pop_top
+                0x0000000000015ce9        0x5 build/py/emitnx64.o
+ .text.emit_native_for_iter_end
+                0x0000000000015cee       0x13 build/py/emitnx64.o
+ .text.emit_native_leave_exc_stack
+                0x0000000000015d01       0x8c build/py/emitnx64.o
+ .text.ensure_extra_stack
+                0x0000000000015d8d       0x37 build/py/emitnx64.o
+ .text.emit_post_push_reg
+                0x0000000000015dc4       0x4a build/py/emitnx64.o
+ .text.emit_native_start_except_handler
+                0x0000000000015e0e       0x2e build/py/emitnx64.o
+ .text.emit_post_push_imm
+                0x0000000000015e3c       0x4c build/py/emitnx64.o
+ .text.emit_native_load_null
+                0x0000000000015e88       0x10 build/py/emitnx64.o
+ .text.emit_native_load_const_small_int
+                0x0000000000015e98       0x14 build/py/emitnx64.o
+ .text.emit_native_adjust_stack_size
+                0x0000000000015eac       0x5b build/py/emitnx64.o
+ .text.emit_native_push_exc_stack
+                0x0000000000015f07       0x90 build/py/emitnx64.o
+ .text.peek_vtype
+                0x0000000000015f97       0x1d build/py/emitnx64.o
+ .text.emit_native_mov_reg_state_addr
+                0x0000000000015fb4       0x53 build/py/emitnx64.o
+ .text.emit_native_mov_state_reg
+                0x0000000000016007       0x39 build/py/emitnx64.o
+ .text.need_reg_single
+                0x0000000000016040       0x5e build/py/emitnx64.o
+ .text.emit_native_load_const_str
+                0x000000000001609e       0x6d build/py/emitnx64.o
+ .text.need_reg_all
+                0x000000000001610b       0x45 build/py/emitnx64.o
+ .text.emit_call_with_imm_arg
+                0x0000000000016150       0x40 build/py/emitnx64.o
+ .text.emit_call
+                0x0000000000016190       0x20 build/py/emitnx64.o
+ .text.emit_native_load_build_class
+                0x00000000000161b0       0x2c build/py/emitnx64.o
+ .text.emit_get_stack_pointer_to_reg_for_push
+                0x00000000000161dc       0x6a build/py/emitnx64.o
+ .text.emit_call_with_qstr_arg
+                0x0000000000016246       0x72 build/py/emitnx64.o
+ .text.emit_native_delete_global
+                0x00000000000162b8       0x1a build/py/emitnx64.o
+ .text.emit_native_load_global
+                0x00000000000162d2       0x60 build/py/emitnx64.o
+ .text.emit_call_with_2_imm_args.constprop.0
+                0x0000000000016332       0x56 build/py/emitnx64.o
+ .text.emit_native_mov_reg_state
+                0x0000000000016388       0x36 build/py/emitnx64.o
+ .text.emit_load_reg_with_ptr
+                0x00000000000163be       0x79 build/py/emitnx64.o
+ .text.emit_native_load_const_obj
+                0x0000000000016437       0x52 build/py/emitnx64.o
+ .text.emit_native_load_const_tok
+                0x0000000000016489       0x38 build/py/emitnx64.o
+ .text.emit_native_load_fast
+                0x00000000000164c1       0x9d build/py/emitnx64.o
+ .text.emit_fold_stack_top.constprop.0
+                0x000000000001655e       0x5e build/py/emitnx64.o
+ .text.load_reg_stack_imm
+                0x00000000000165bc       0xc5 build/py/emitnx64.o
+ .text.need_stack_settled
+                0x0000000000016681       0x99 build/py/emitnx64.o
+ .text.emit_native_jump
+                0x000000000001671a       0x2f build/py/emitnx64.o
+ .text.emit_native_pop_except_jump
+                0x0000000000016749       0x49 build/py/emitnx64.o
+ .text.emit_native_unwind_jump
+                0x0000000000016792      0x126 build/py/emitnx64.o
+ .text.emit_access_stack
+                0x00000000000168b8       0x86 build/py/emitnx64.o
+ .text.emit_pre_pop_reg
+                0x000000000001693e       0x31 build/py/emitnx64.o
+ .text.emit_pre_pop_reg_reg
+                0x000000000001696f       0x30 build/py/emitnx64.o
+ .text.emit_native_rot_two
+                0x000000000001699f       0x4c build/py/emitnx64.o
+ .text.emit_native_dup_top_two
+                0x00000000000169eb       0x71 build/py/emitnx64.o
+ .text.emit_pre_pop_reg_reg_reg
+                0x0000000000016a5c       0x44 build/py/emitnx64.o
+ .text.emit_native_rot_three
+                0x0000000000016aa0       0x6d build/py/emitnx64.o
+ .text.emit_native_store_map
+                0x0000000000016b0d       0xb6 build/py/emitnx64.o
+ .text.emit_native_label_assign
+                0x0000000000016bc3       0x93 build/py/emitnx64.o
+ .text.emit_native_end_finally
+                0x0000000000016c56      0x10f build/py/emitnx64.o
+ .text.emit_native_global_exc_entry
+                0x0000000000016d65      0x343 build/py/emitnx64.o
+ .text.emit_native_start_pass
+                0x00000000000170a8      0x718 build/py/emitnx64.o
+ .text.emit_native_unpack_ex
+                0x00000000000177c0       0x7d build/py/emitnx64.o
+ .text.emit_native_unpack_sequence
+                0x000000000001783d       0x6f build/py/emitnx64.o
+ .text.emit_native_get_iter
+                0x00000000000178ac       0x98 build/py/emitnx64.o
+ .text.emit_native_raise_varargs
+                0x0000000000017944       0x73 build/py/emitnx64.o
+ .text.emit_native_unary_op
+                0x00000000000179b7       0x84 build/py/emitnx64.o
+ .text.emit_native_store_fast
+                0x0000000000017a3b       0xb9 build/py/emitnx64.o
+ .text.emit_native_delete_local
+                0x0000000000017af4       0x43 build/py/emitnx64.o
+ .text.emit_native_jump_helper
+                0x0000000000017b37      0x128 build/py/emitnx64.o
+ .text.emit_native_jump_if_or_pop
+                0x0000000000017c5f        0xb build/py/emitnx64.o
+ .text.emit_native_pop_jump_if
+                0x0000000000017c6a        0xe build/py/emitnx64.o
+ .text.emit_native_attr
+                0x0000000000017c78      0x111 build/py/emitnx64.o
+ .text.emit_native_store_global
+                0x0000000000017d89       0xbb build/py/emitnx64.o
+ .text.emit_native_store_comp
+                0x0000000000017e44      0x131 build/py/emitnx64.o
+ .text.emit_native_import
+                0x0000000000017f75      0x12b build/py/emitnx64.o
+ .text.emit_get_stack_pointer_to_reg_for_pop
+                0x00000000000180a0      0x12f build/py/emitnx64.o
+ .text.emit_native_yield
+                0x00000000000181cf      0x232 build/py/emitnx64.o
+ .text.emit_native_call_method
+                0x0000000000018401       0x76 build/py/emitnx64.o
+ .text.emit_native_make_closure
+                0x0000000000018477       0xa7 build/py/emitnx64.o
+ .text.emit_native_return_value
+                0x000000000001851e      0x17c build/py/emitnx64.o
+ .text.emit_native_for_iter
+                0x000000000001869a       0x6e build/py/emitnx64.o
+ .text.emit_native_with_cleanup
+                0x0000000000018708      0x200 build/py/emitnx64.o
+ .text.emit_native_load_method
+                0x0000000000018908       0xb2 build/py/emitnx64.o
+ .text.emit_native_build
+                0x00000000000189ba      0x18b build/py/emitnx64.o
+ .text.emit_native_end_pass
+                0x0000000000018b45      0x42b build/py/emitnx64.o
+ .text.emit_native_make_function
+                0x0000000000018f70       0xfa build/py/emitnx64.o
+ .text.emit_native_call_function
+                0x000000000001906a      0x1a1 build/py/emitnx64.o
+ .text.emit_pre_pop_reg_flexible
+                0x000000000001920b       0x64 build/py/emitnx64.o
+ .text.emit_native_dup_top
+                0x000000000001926f       0x5a build/py/emitnx64.o
+ .text.emit_native_setup_block
+                0x00000000000192c9      0x178 build/py/emitnx64.o
+ .text.emit_native_store_local
+                0x0000000000019441       0xb0 build/py/emitnx64.o
+ .text.emit_native_load_local
+                0x00000000000194f1       0x89 build/py/emitnx64.o
+ .text.emit_native_binary_op
+                0x000000000001957a      0x31b build/py/emitnx64.o
+ .text.emit_native_subscr
+                0x0000000000019895      0x81a build/py/emitnx64.o
+ .text.asm_x86_write_byte_2
+                0x000000000001a0af       0x20 build/py/asmx86.o
+ .text.asm_x86_generic_r32_r32
+                0x000000000001a0cf       0x16 build/py/asmx86.o
+ .text.asm_x86_write_byte_1
+                0x000000000001a0e5       0x16 build/py/asmx86.o
+ .text.asm_x86_write_word32
+                0x000000000001a0fb       0x16 build/py/asmx86.o
+ .text.asm_x86_write_r32_disp
+                0x000000000001a111       0x88 build/py/asmx86.o
+ .text.get_label_dest
+                0x000000000001a199       0x2f build/py/asmx86.o
+ .text.asm_x86_sub_r32_i32.constprop.0
+                0x000000000001a1c8       0x4f build/py/asmx86.o
+ .text.asm_x86_mov_r32_r32
+                0x000000000001a217        0xa build/py/asmx86.o
+                0x000000000001a217                asm_x86_mov_r32_r32
+ .text.asm_x86_mov_r8_to_mem8
+                0x000000000001a221       0x39 build/py/asmx86.o
+                0x000000000001a221                asm_x86_mov_r8_to_mem8
+ .text.asm_x86_mov_r16_to_mem16
+                0x000000000001a25a       0x40 build/py/asmx86.o
+                0x000000000001a25a                asm_x86_mov_r16_to_mem16
+ .text.asm_x86_mov_r32_to_mem32
+                0x000000000001a29a       0x39 build/py/asmx86.o
+                0x000000000001a29a                asm_x86_mov_r32_to_mem32
+ .text.asm_x86_mov_mem8_to_r32zx
+                0x000000000001a2d3       0x44 build/py/asmx86.o
+                0x000000000001a2d3                asm_x86_mov_mem8_to_r32zx
+ .text.asm_x86_mov_mem16_to_r32zx
+                0x000000000001a317       0x44 build/py/asmx86.o
+                0x000000000001a317                asm_x86_mov_mem16_to_r32zx
+ .text.asm_x86_mov_mem32_to_r32
+                0x000000000001a35b       0x3f build/py/asmx86.o
+                0x000000000001a35b                asm_x86_mov_mem32_to_r32
+ .text.asm_x86_mov_i32_to_r32
+                0x000000000001a39a       0x38 build/py/asmx86.o
+                0x000000000001a39a                asm_x86_mov_i32_to_r32
+ .text.asm_x86_and_r32_r32
+                0x000000000001a3d2        0xa build/py/asmx86.o
+                0x000000000001a3d2                asm_x86_and_r32_r32
+ .text.asm_x86_or_r32_r32
+                0x000000000001a3dc        0xa build/py/asmx86.o
+                0x000000000001a3dc                asm_x86_or_r32_r32
+ .text.asm_x86_xor_r32_r32
+                0x000000000001a3e6        0xa build/py/asmx86.o
+                0x000000000001a3e6                asm_x86_xor_r32_r32
+ .text.asm_x86_shl_r32_cl
+                0x000000000001a3f0       0x11 build/py/asmx86.o
+                0x000000000001a3f0                asm_x86_shl_r32_cl
+ .text.asm_x86_sar_r32_cl
+                0x000000000001a401       0x11 build/py/asmx86.o
+                0x000000000001a401                asm_x86_sar_r32_cl
+ .text.asm_x86_add_r32_r32
+                0x000000000001a412        0xa build/py/asmx86.o
+                0x000000000001a412                asm_x86_add_r32_r32
+ .text.asm_x86_sub_r32_r32
+                0x000000000001a41c        0xa build/py/asmx86.o
+                0x000000000001a41c                asm_x86_sub_r32_r32
+ .text.asm_x86_mul_r32_r32
+                0x000000000001a426       0x2a build/py/asmx86.o
+                0x000000000001a426                asm_x86_mul_r32_r32
+ .text.asm_x86_cmp_r32_with_r32
+                0x000000000001a450       0x12 build/py/asmx86.o
+                0x000000000001a450                asm_x86_cmp_r32_with_r32
+ .text.asm_x86_test_r8_with_r8
+                0x000000000001a462       0x16 build/py/asmx86.o
+                0x000000000001a462                asm_x86_test_r8_with_r8
+ .text.asm_x86_test_r32_with_r32
+                0x000000000001a478       0x12 build/py/asmx86.o
+                0x000000000001a478                asm_x86_test_r32_with_r32
+ .text.asm_x86_setcc_r8
+                0x000000000001a48a       0x2b build/py/asmx86.o
+                0x000000000001a48a                asm_x86_setcc_r8
+ .text.asm_x86_jmp_reg
+                0x000000000001a4b5       0x11 build/py/asmx86.o
+                0x000000000001a4b5                asm_x86_jmp_reg
+ .text.asm_x86_jmp_label
+                0x000000000001a4c6       0x62 build/py/asmx86.o
+                0x000000000001a4c6                asm_x86_jmp_label
+ .text.asm_x86_jcc_label
+                0x000000000001a528       0x73 build/py/asmx86.o
+                0x000000000001a528                asm_x86_jcc_label
+ .text.asm_x86_entry
+                0x000000000001a59b       0x75 build/py/asmx86.o
+                0x000000000001a59b                asm_x86_entry
+ .text.asm_x86_exit
+                0x000000000001a610       0x4f build/py/asmx86.o
+                0x000000000001a610                asm_x86_exit
+ .text.asm_x86_mov_arg_to_r32
+                0x000000000001a65f       0x16 build/py/asmx86.o
+                0x000000000001a65f                asm_x86_mov_arg_to_r32
+ .text.asm_x86_mov_local_to_r32
+                0x000000000001a675       0x13 build/py/asmx86.o
+                0x000000000001a675                asm_x86_mov_local_to_r32
+ .text.asm_x86_mov_r32_to_local
+                0x000000000001a688       0x11 build/py/asmx86.o
+                0x000000000001a688                asm_x86_mov_r32_to_local
+ .text.asm_x86_mov_local_addr_to_r32
+                0x000000000001a699       0x4e build/py/asmx86.o
+                0x000000000001a699                asm_x86_mov_local_addr_to_r32
+ .text.asm_x86_mov_reg_pcrel
+                0x000000000001a6e7       0x65 build/py/asmx86.o
+                0x000000000001a6e7                asm_x86_mov_reg_pcrel
+ .text.asm_x86_call_ind
+                0x000000000001a74c      0x13b build/py/asmx86.o
+                0x000000000001a74c                asm_x86_call_ind
+ .text.vtype_to_qstr
+                0x000000000001a887       0x18 build/py/emitnx86.o
+ .text.emit_native_last_emit_was_return_value
+                0x000000000001a89f        0x7 build/py/emitnx86.o
+ .text.emit_native_set_source_line
+                0x000000000001a8a6        0x1 build/py/emitnx86.o
+ .text.emit_native_x86_new
+                0x000000000001a8a7       0x7b build/py/emitnx86.o
+                0x000000000001a8a7                emit_native_x86_new
+ .text.emit_native_x86_free
+                0x000000000001a922       0x42 build/py/emitnx86.o
+                0x000000000001a922                emit_native_x86_free
+ .text.adjust_stack
+                0x000000000001a964       0x71 build/py/emitnx86.o
+ .text.emit_native_end_except_handler
+                0x000000000001a9d5        0x9 build/py/emitnx86.o
+ .text.emit_pre_pop_discard
+                0x000000000001a9de       0x10 build/py/emitnx86.o
+ .text.emit_native_pop_top
+                0x000000000001a9ee        0x5 build/py/emitnx86.o
+ .text.emit_native_for_iter_end
+                0x000000000001a9f3       0x13 build/py/emitnx86.o
+ .text.emit_native_leave_exc_stack
+                0x000000000001aa06       0x8c build/py/emitnx86.o
+ .text.ensure_extra_stack
+                0x000000000001aa92       0x37 build/py/emitnx86.o
+ .text.emit_post_push_reg
+                0x000000000001aac9       0x4a build/py/emitnx86.o
+ .text.emit_native_start_except_handler
+                0x000000000001ab13       0x2e build/py/emitnx86.o
+ .text.emit_post_push_imm
+                0x000000000001ab41       0x4c build/py/emitnx86.o
+ .text.emit_native_load_null
+                0x000000000001ab8d       0x10 build/py/emitnx86.o
+ .text.emit_native_load_const_small_int
+                0x000000000001ab9d       0x14 build/py/emitnx86.o
+ .text.emit_native_adjust_stack_size
+                0x000000000001abb1       0x5b build/py/emitnx86.o
+ .text.emit_native_push_exc_stack
+                0x000000000001ac0c       0x90 build/py/emitnx86.o
+ .text.peek_vtype
+                0x000000000001ac9c       0x1d build/py/emitnx86.o
+ .text.emit_native_mov_reg_state_addr
+                0x000000000001acb9       0x50 build/py/emitnx86.o
+ .text.emit_native_mov_state_reg
+                0x000000000001ad09       0x39 build/py/emitnx86.o
+ .text.need_reg_single
+                0x000000000001ad42       0x5e build/py/emitnx86.o
+ .text.emit_native_load_const_str
+                0x000000000001ada0       0x6d build/py/emitnx86.o
+ .text.need_reg_all
+                0x000000000001ae0d       0x45 build/py/emitnx86.o
+ .text.emit_call_with_imm_arg
+                0x000000000001ae52       0x4c build/py/emitnx86.o
+ .text.emit_call
+                0x000000000001ae9e       0x2c build/py/emitnx86.o
+ .text.emit_native_load_build_class
+                0x000000000001aeca       0x2c build/py/emitnx86.o
+ .text.emit_call_with_qstr_arg
+                0x000000000001aef6       0x7d build/py/emitnx86.o
+ .text.emit_native_delete_global
+                0x000000000001af73       0x17 build/py/emitnx86.o
+ .text.emit_native_load_global
+                0x000000000001af8a       0x5d build/py/emitnx86.o
+ .text.emit_get_stack_pointer_to_reg_for_push
+                0x000000000001afe7       0x6a build/py/emitnx86.o
+ .text.emit_call_with_2_imm_args.constprop.0
+                0x000000000001b051       0x5f build/py/emitnx86.o
+ .text.emit_native_mov_reg_state
+                0x000000000001b0b0       0x36 build/py/emitnx86.o
+ .text.emit_native_load_fast
+                0x000000000001b0e6       0x9d build/py/emitnx86.o
+ .text.emit_load_reg_with_ptr.constprop.0
+                0x000000000001b183       0x73 build/py/emitnx86.o
+ .text.emit_native_load_const_obj
+                0x000000000001b1f6       0x50 build/py/emitnx86.o
+ .text.emit_native_load_const_tok
+                0x000000000001b246       0x38 build/py/emitnx86.o
+ .text.emit_fold_stack_top.constprop.0
+                0x000000000001b27e       0x55 build/py/emitnx86.o
+ .text.load_reg_stack_imm
+                0x000000000001b2d3       0xc0 build/py/emitnx86.o
+ .text.need_stack_settled
+                0x000000000001b393       0x99 build/py/emitnx86.o
+ .text.emit_native_jump
+                0x000000000001b42c       0x2f build/py/emitnx86.o
+ .text.emit_native_pop_except_jump
+                0x000000000001b45b       0x49 build/py/emitnx86.o
+ .text.emit_native_unwind_jump
+                0x000000000001b4a4      0x126 build/py/emitnx86.o
+ .text.emit_access_stack
+                0x000000000001b5ca       0x86 build/py/emitnx86.o
+ .text.emit_pre_pop_reg
+                0x000000000001b650       0x31 build/py/emitnx86.o
+ .text.emit_pre_pop_reg_reg
+                0x000000000001b681       0x30 build/py/emitnx86.o
+ .text.emit_native_rot_two
+                0x000000000001b6b1       0x4c build/py/emitnx86.o
+ .text.emit_native_dup_top_two
+                0x000000000001b6fd       0x71 build/py/emitnx86.o
+ .text.emit_pre_pop_reg_reg_reg
+                0x000000000001b76e       0x44 build/py/emitnx86.o
+ .text.emit_native_rot_three
+                0x000000000001b7b2       0x6d build/py/emitnx86.o
+ .text.emit_native_store_map
+                0x000000000001b81f       0xb6 build/py/emitnx86.o
+ .text.emit_native_label_assign
+                0x000000000001b8d5       0x93 build/py/emitnx86.o
+ .text.emit_native_end_finally
+                0x000000000001b968      0x10c build/py/emitnx86.o
+ .text.emit_native_global_exc_entry
+                0x000000000001ba74      0x32b build/py/emitnx86.o
+ .text.emit_native_start_pass
+                0x000000000001bd9f      0x76c build/py/emitnx86.o
+ .text.emit_native_attr
+                0x000000000001c50b      0x106 build/py/emitnx86.o
+ .text.emit_native_store_global
+                0x000000000001c611       0xb5 build/py/emitnx86.o
+ .text.emit_native_unpack_ex
+                0x000000000001c6c6       0x7a build/py/emitnx86.o
+ .text.emit_native_unpack_sequence
+                0x000000000001c740       0x6c build/py/emitnx86.o
+ .text.emit_native_get_iter
+                0x000000000001c7ac       0x95 build/py/emitnx86.o
+ .text.emit_native_raise_varargs
+                0x000000000001c841       0x70 build/py/emitnx86.o
+ .text.emit_native_unary_op
+                0x000000000001c8b1       0x81 build/py/emitnx86.o
+ .text.emit_native_store_fast
+                0x000000000001c932       0xb9 build/py/emitnx86.o
+ .text.emit_native_delete_local
+                0x000000000001c9eb       0x43 build/py/emitnx86.o
+ .text.emit_native_jump_helper
+                0x000000000001ca2e      0x123 build/py/emitnx86.o
+ .text.emit_native_jump_if_or_pop
+                0x000000000001cb51        0xb build/py/emitnx86.o
+ .text.emit_native_pop_jump_if
+                0x000000000001cb5c        0xe build/py/emitnx86.o
+ .text.emit_native_store_comp
+                0x000000000001cb6a      0x12e build/py/emitnx86.o
+ .text.emit_native_import
+                0x000000000001cc98      0x122 build/py/emitnx86.o
+ .text.emit_get_stack_pointer_to_reg_for_pop
+                0x000000000001cdba      0x12c build/py/emitnx86.o
+ .text.emit_native_yield
+                0x000000000001cee6      0x22c build/py/emitnx86.o
+ .text.emit_native_call_method
+                0x000000000001d112       0x76 build/py/emitnx86.o
+ .text.emit_native_make_closure
+                0x000000000001d188       0xa5 build/py/emitnx86.o
+ .text.emit_native_load_method
+                0x000000000001d22d       0xac build/py/emitnx86.o
+ .text.emit_native_return_value
+                0x000000000001d2d9      0x170 build/py/emitnx86.o
+ .text.emit_native_for_iter
+                0x000000000001d449       0x6b build/py/emitnx86.o
+ .text.emit_native_with_cleanup
+                0x000000000001d4b4      0x1de build/py/emitnx86.o
+ .text.emit_native_build
+                0x000000000001d692      0x185 build/py/emitnx86.o
+ .text.emit_native_end_pass
+                0x000000000001d817      0x422 build/py/emitnx86.o
+ .text.emit_native_make_function
+                0x000000000001dc39       0xfa build/py/emitnx86.o
+ .text.emit_native_call_function
+                0x000000000001dd33      0x19b build/py/emitnx86.o
+ .text.emit_pre_pop_reg_flexible
+                0x000000000001dece       0x64 build/py/emitnx86.o
+ .text.emit_native_dup_top
+                0x000000000001df32       0x5a build/py/emitnx86.o
+ .text.emit_native_setup_block
+                0x000000000001df8c      0x172 build/py/emitnx86.o
+ .text.emit_native_store_local
+                0x000000000001e0fe       0xb0 build/py/emitnx86.o
+ .text.emit_native_load_local
+                0x000000000001e1ae       0x89 build/py/emitnx86.o
+ .text.emit_native_binary_op
+                0x000000000001e237      0x30e build/py/emitnx86.o
+ .text.emit_native_subscr
+                0x000000000001e545      0x78b build/py/emitnx86.o
+ .text.get_label_dest
+                0x000000000001ecd0       0x31 build/py/asmthumb.o
+ .text.asm_thumb_end_pass
+                0x000000000001ed01        0x1 build/py/asmthumb.o
+                0x000000000001ed01                asm_thumb_end_pass
+ .text.asm_thumb_op16
+                0x000000000001ed02       0x17 build/py/asmthumb.o
+                0x000000000001ed02                asm_thumb_op16
+ .text.asm_thumb_op32
+                0x000000000001ed19       0x21 build/py/asmthumb.o
+                0x000000000001ed19                asm_thumb_op32
+ .text.asm_thumb_entry
+                0x000000000001ed3a      0x10c build/py/asmthumb.o
+                0x000000000001ed3a                asm_thumb_entry
+ .text.asm_thumb_exit
+                0x000000000001ee46       0x53 build/py/asmthumb.o
+                0x000000000001ee46                asm_thumb_exit
+ .text.asm_thumb_format_4
+                0x000000000001ee99       0x5a build/py/asmthumb.o
+                0x000000000001ee99                asm_thumb_format_4
+ .text.asm_thumb_mov_reg_reg
+                0x000000000001eef3       0x31 build/py/asmthumb.o
+                0x000000000001eef3                asm_thumb_mov_reg_reg
+ .text.asm_thumb_mov_reg_i16
+                0x000000000001ef24       0x66 build/py/asmthumb.o
+                0x000000000001ef24                asm_thumb_mov_reg_i16
+ .text.asm_thumb_b_n_label
+                0x000000000001ef8a       0x5b build/py/asmthumb.o
+                0x000000000001ef8a                asm_thumb_b_n_label
+ .text.asm_thumb_bcc_nw_label
+                0x000000000001efe5       0xbe build/py/asmthumb.o
+                0x000000000001efe5                asm_thumb_bcc_nw_label
+ .text.asm_thumb_bl_label
+                0x000000000001f0a3       0x68 build/py/asmthumb.o
+                0x000000000001f0a3                asm_thumb_bl_label
+ .text.asm_thumb_mov_reg_i32
+                0x000000000001f10b       0x4c build/py/asmthumb.o
+                0x000000000001f10b                asm_thumb_mov_reg_i32
+ .text.asm_thumb_mov_reg_i32_optimised
+                0x000000000001f157       0x3b build/py/asmthumb.o
+                0x000000000001f157                asm_thumb_mov_reg_i32_optimised
+ .text.asm_thumb_mov_local_reg
+                0x000000000001f192       0x62 build/py/asmthumb.o
+                0x000000000001f192                asm_thumb_mov_local_reg
+ .text.asm_thumb_mov_reg_local
+                0x000000000001f1f4       0x5e build/py/asmthumb.o
+                0x000000000001f1f4                asm_thumb_mov_reg_local
+ .text.asm_thumb_mov_reg_local_addr
+                0x000000000001f252       0x5e build/py/asmthumb.o
+                0x000000000001f252                asm_thumb_mov_reg_local_addr
+ .text.asm_thumb_mov_reg_pcrel
+                0x000000000001f2b0       0x4e build/py/asmthumb.o
+                0x000000000001f2b0                asm_thumb_mov_reg_pcrel
+ .text.asm_thumb_ldr_reg_reg_i12_optimised
+                0x000000000001f2fe       0x51 build/py/asmthumb.o
+                0x000000000001f2fe                asm_thumb_ldr_reg_reg_i12_optimised
+ .text.asm_thumb_b_label
+                0x000000000001f34f       0x74 build/py/asmthumb.o
+                0x000000000001f34f                asm_thumb_b_label
+ .text.asm_thumb_bcc_label
+                0x000000000001f3c3       0x9c build/py/asmthumb.o
+                0x000000000001f3c3                asm_thumb_bcc_label
+ .text.asm_thumb_bl_ind
+                0x000000000001f45f       0x36 build/py/asmthumb.o
+                0x000000000001f45f                asm_thumb_bl_ind
+ .text.vtype_to_qstr
+                0x000000000001f495       0x18 build/py/emitnthumb.o
+ .text.emit_native_last_emit_was_return_value
+                0x000000000001f4ad        0x7 build/py/emitnthumb.o
+ .text.emit_native_set_source_line
+                0x000000000001f4b4        0x1 build/py/emitnthumb.o
+ .text.emit_native_thumb_new
+                0x000000000001f4b5       0x7b build/py/emitnthumb.o
+                0x000000000001f4b5                emit_native_thumb_new
+ .text.emit_native_thumb_free
+                0x000000000001f530       0x42 build/py/emitnthumb.o
+                0x000000000001f530                emit_native_thumb_free
+ .text.adjust_stack
+                0x000000000001f572       0x71 build/py/emitnthumb.o
+ .text.emit_native_end_except_handler
+                0x000000000001f5e3        0x9 build/py/emitnthumb.o
+ .text.emit_pre_pop_discard
+                0x000000000001f5ec       0x10 build/py/emitnthumb.o
+ .text.emit_native_pop_top
+                0x000000000001f5fc        0x5 build/py/emitnthumb.o
+ .text.emit_native_for_iter_end
+                0x000000000001f601       0x13 build/py/emitnthumb.o
+ .text.emit_native_leave_exc_stack
+                0x000000000001f614       0x91 build/py/emitnthumb.o
+ .text.ensure_extra_stack
+                0x000000000001f6a5       0x37 build/py/emitnthumb.o
+ .text.emit_post_push_reg
+                0x000000000001f6dc       0x4a build/py/emitnthumb.o
+ .text.emit_native_start_except_handler
+                0x000000000001f726       0x2e build/py/emitnthumb.o
+ .text.emit_post_push_imm
+                0x000000000001f754       0x4c build/py/emitnthumb.o
+ .text.emit_native_load_null
+                0x000000000001f7a0       0x10 build/py/emitnthumb.o
+ .text.emit_native_load_const_small_int
+                0x000000000001f7b0       0x14 build/py/emitnthumb.o
+ .text.emit_native_adjust_stack_size
+                0x000000000001f7c4       0x5b build/py/emitnthumb.o
+ .text.emit_native_push_exc_stack
+                0x000000000001f81f       0x90 build/py/emitnthumb.o
+ .text.peek_vtype
+                0x000000000001f8af       0x1d build/py/emitnthumb.o
+ .text.asm_thumb_add_rlo_rlo_rlo
+                0x000000000001f8cc       0x63 build/py/emitnthumb.o
+ .text.emit_native_mov_reg_state_addr
+                0x000000000001f92f       0x4e build/py/emitnthumb.o
+ .text.emit_native_mov_reg_state
+                0x000000000001f97d       0x2b build/py/emitnthumb.o
+ .text.emit_load_reg_with_ptr.constprop.0
+                0x000000000001f9a8       0x6e build/py/emitnthumb.o
+ .text.emit_fold_stack_top.constprop.0
+                0x000000000001fa16       0x55 build/py/emitnthumb.o
+ .text.load_reg_stack_imm
+                0x000000000001fa6b       0xa7 build/py/emitnthumb.o
+ .text.emit_native_mov_state_reg
+                0x000000000001fb12       0x35 build/py/emitnthumb.o
+ .text.need_stack_settled
+                0x000000000001fb47       0x99 build/py/emitnthumb.o
+ .text.emit_native_jump
+                0x000000000001fbe0       0x26 build/py/emitnthumb.o
+ .text.emit_native_pop_except_jump
+                0x000000000001fc06       0x49 build/py/emitnthumb.o
+ .text.emit_native_unwind_jump
+                0x000000000001fc4f      0x12a build/py/emitnthumb.o
+ .text.need_reg_single
+                0x000000000001fd79       0x5e build/py/emitnthumb.o
+ .text.emit_native_load_const_obj
+                0x000000000001fdd7       0x50 build/py/emitnthumb.o
+ .text.emit_native_load_const_tok
+                0x000000000001fe27       0x38 build/py/emitnthumb.o
+ .text.emit_access_stack
+                0x000000000001fe5f       0x86 build/py/emitnthumb.o
+ .text.emit_pre_pop_reg
+                0x000000000001fee5       0x31 build/py/emitnthumb.o
+ .text.emit_pre_pop_reg_reg
+                0x000000000001ff16       0x30 build/py/emitnthumb.o
+ .text.emit_native_rot_two
+                0x000000000001ff46       0x4c build/py/emitnthumb.o
+ .text.emit_native_dup_top_two
+                0x000000000001ff92       0x71 build/py/emitnthumb.o
+ .text.emit_pre_pop_reg_reg_reg
+                0x0000000000020003       0x44 build/py/emitnthumb.o
+ .text.emit_native_rot_three
+                0x0000000000020047       0x6d build/py/emitnthumb.o
+ .text.emit_native_label_assign
+                0x00000000000200b4       0x93 build/py/emitnthumb.o
+ .text.emit_pre_pop_reg_flexible
+                0x0000000000020147       0x64 build/py/emitnthumb.o
+ .text.emit_native_dup_top
+                0x00000000000201ab       0x5a build/py/emitnthumb.o
+ .text.emit_native_load_fast
+                0x0000000000020205       0x9d build/py/emitnthumb.o
+ .text.emit_native_load_local
+                0x00000000000202a2       0x89 build/py/emitnthumb.o
+ .text.emit_native_load_const_str
+                0x000000000002032b       0x6e build/py/emitnthumb.o
+ .text.need_reg_all
+                0x0000000000020399       0x45 build/py/emitnthumb.o
+ .text.emit_call_with_imm_arg
+                0x00000000000203de       0x43 build/py/emitnthumb.o
+ .text.emit_native_unary_op
+                0x0000000000020421       0x81 build/py/emitnthumb.o
+ .text.emit_call
+                0x00000000000204a2       0x2b build/py/emitnthumb.o
+ .text.emit_native_store_comp
+                0x00000000000204cd      0x12e build/py/emitnthumb.o
+ .text.emit_native_store_map
+                0x00000000000205fb       0xb6 build/py/emitnthumb.o
+ .text.emit_native_end_finally
+                0x00000000000206b1      0x10d build/py/emitnthumb.o
+ .text.emit_native_load_build_class
+                0x00000000000207be       0x2c build/py/emitnthumb.o
+ .text.emit_native_raise_varargs
+                0x00000000000207ea       0x70 build/py/emitnthumb.o
+ .text.emit_native_binary_op
+                0x000000000002085a      0x33c build/py/emitnthumb.o
+ .text.emit_native_jump_helper
+                0x0000000000020b96      0x105 build/py/emitnthumb.o
+ .text.emit_native_jump_if_or_pop
+                0x0000000000020c9b        0xb build/py/emitnthumb.o
+ .text.emit_native_pop_jump_if
+                0x0000000000020ca6        0xe build/py/emitnthumb.o
+ .text.emit_native_end_pass
+                0x0000000000020cb4      0x42c build/py/emitnthumb.o
+ .text.emit_native_make_function
+                0x00000000000210e0       0xf8 build/py/emitnthumb.o
+ .text.emit_get_stack_pointer_to_reg_for_push
+                0x00000000000211d8       0x6a build/py/emitnthumb.o
+ .text.emit_native_unpack_ex
+                0x0000000000021242       0x7a build/py/emitnthumb.o
+ .text.emit_native_unpack_sequence
+                0x00000000000212bc       0x6c build/py/emitnthumb.o
+ .text.emit_native_get_iter
+                0x0000000000021328       0x95 build/py/emitnthumb.o
+ .text.emit_call_with_qstr_arg
+                0x00000000000213bd       0x7a build/py/emitnthumb.o
+ .text.emit_native_attr
+                0x0000000000021437      0x10b build/py/emitnthumb.o
+ .text.emit_native_import
+                0x0000000000021542      0x122 build/py/emitnthumb.o
+ .text.emit_native_delete_global
+                0x0000000000021664       0x17 build/py/emitnthumb.o
+ .text.emit_native_store_global
+                0x000000000002167b       0xb5 build/py/emitnthumb.o
+ .text.emit_native_load_global
+                0x0000000000021730       0x5d build/py/emitnthumb.o
+ .text.emit_call_with_2_imm_args.constprop.0
+                0x000000000002178d       0x56 build/py/emitnthumb.o
+ .text.emit_get_stack_pointer_to_reg_for_pop
+                0x00000000000217e3      0x12c build/py/emitnthumb.o
+ .text.emit_native_call_method
+                0x000000000002190f       0x76 build/py/emitnthumb.o
+ .text.emit_native_call_function
+                0x0000000000021985      0x19b build/py/emitnthumb.o
+ .text.emit_native_make_closure
+                0x0000000000021b20       0x9b build/py/emitnthumb.o
+ .text.emit_native_build
+                0x0000000000021bbb      0x185 build/py/emitnthumb.o
+ .text.emit_native_for_iter
+                0x0000000000021d40       0x66 build/py/emitnthumb.o
+ .text.emit_native_with_cleanup
+                0x0000000000021da6      0x1d9 build/py/emitnthumb.o
+ .text.emit_native_setup_block
+                0x0000000000021f7f      0x172 build/py/emitnthumb.o
+ .text.emit_native_load_method
+                0x00000000000220f1       0xac build/py/emitnthumb.o
+ .text.emit_native_yield
+                0x000000000002219d      0x22c build/py/emitnthumb.o
+ .text.emit_native_return_value
+                0x00000000000223c9      0x170 build/py/emitnthumb.o
+ .text.emit_native_store_fast
+                0x0000000000022539       0xb9 build/py/emitnthumb.o
+ .text.emit_native_delete_local
+                0x00000000000225f2       0x43 build/py/emitnthumb.o
+ .text.emit_native_store_local
+                0x0000000000022635       0xb8 build/py/emitnthumb.o
+ .text.emit_native_global_exc_entry
+                0x00000000000226ed      0x329 build/py/emitnthumb.o
+ .text.emit_native_start_pass
+                0x0000000000022a16      0x6df build/py/emitnthumb.o
+ .text.emit_native_subscr
+                0x00000000000230f5      0x8d0 build/py/emitnthumb.o
+ .text.emit_inline_thumb_new
+                0x00000000000239c5       0x4a build/py/emitinlinethumb.o
+                0x00000000000239c5                emit_inline_thumb_new
+ .text.emit_inline_thumb_free
+                0x0000000000023a0f       0x20 build/py/emitinlinethumb.o
+                0x0000000000023a0f                emit_inline_thumb_free
+ .text.get_arg_addr
+                0x0000000000023a2f       0x6c build/py/emitinlinethumb.o
+ .text.get_arg_i
+                0x0000000000023a9b       0x7e build/py/emitinlinethumb.o
+ .text.emit_inline_thumb_label
+                0x0000000000023b19       0x59 build/py/emitinlinethumb.o
+ .text.emit_inline_thumb_end_pass
+                0x0000000000023b72       0x1c build/py/emitinlinethumb.o
+ .text.emit_inline_thumb_start_pass
+                0x0000000000023b8e       0x46 build/py/emitinlinethumb.o
+ .text.get_arg_label
+                0x0000000000023bd4       0x8f build/py/emitinlinethumb.o
+ .text.get_arg_str
+                0x0000000000023c63       0x1d build/py/emitinlinethumb.o
+ .text.get_arg_vfpreg
+                0x0000000000023c80       0x95 build/py/emitinlinethumb.o
+ .text.get_arg_reg
+                0x0000000000023d15       0xb6 build/py/emitinlinethumb.o
+ .text.get_arg_reglist
+                0x0000000000023dcb      0x172 build/py/emitinlinethumb.o
+ .text.emit_inline_thumb_error_msg.isra.0
+                0x0000000000023f3d       0x15 build/py/emitinlinethumb.o
+ .text.emit_inline_thumb_count_params
+                0x0000000000023f52       0x9b build/py/emitinlinethumb.o
+ .text.emit_inline_thumb_op
+                0x0000000000023fed      0xed0 build/py/emitinlinethumb.o
+ .text.emit     0x0000000000024ebd       0x16 build/py/asmarm.o
+ .text.emit_al  0x0000000000024ed3        0xb build/py/asmarm.o
+ .text.asm_arm_end_pass
+                0x0000000000024ede        0x1 build/py/asmarm.o
+                0x0000000000024ede                asm_arm_end_pass
+ .text.asm_arm_entry
+                0x0000000000024edf       0x7b build/py/asmarm.o
+                0x0000000000024edf                asm_arm_entry
+ .text.asm_arm_exit
+                0x0000000000024f5a       0x43 build/py/asmarm.o
+                0x0000000000024f5a                asm_arm_exit
+ .text.asm_arm_mov_reg_reg
+                0x0000000000024f9d       0x10 build/py/asmarm.o
+                0x0000000000024f9d                asm_arm_mov_reg_reg
+ .text.asm_arm_mov_reg_i32
+                0x0000000000024fad       0x3e build/py/asmarm.o
+                0x0000000000024fad                asm_arm_mov_reg_i32
+ .text.asm_arm_mov_reg_i32_optimised
+                0x0000000000024feb       0x39 build/py/asmarm.o
+                0x0000000000024feb                asm_arm_mov_reg_i32_optimised
+ .text.asm_arm_mov_local_reg
+                0x0000000000025024       0x15 build/py/asmarm.o
+                0x0000000000025024                asm_arm_mov_local_reg
+ .text.asm_arm_mov_reg_local
+                0x0000000000025039       0x13 build/py/asmarm.o
+                0x0000000000025039                asm_arm_mov_reg_local
+ .text.asm_arm_cmp_reg_i8
+                0x000000000002504c       0x13 build/py/asmarm.o
+                0x000000000002504c                asm_arm_cmp_reg_i8
+ .text.asm_arm_cmp_reg_reg
+                0x000000000002505f       0x10 build/py/asmarm.o
+                0x000000000002505f                asm_arm_cmp_reg_reg
+ .text.asm_arm_setcc_reg
+                0x000000000002506f       0x46 build/py/asmarm.o
+                0x000000000002506f                asm_arm_setcc_reg
+ .text.asm_arm_add_reg_reg_reg
+                0x00000000000250b5       0x15 build/py/asmarm.o
+                0x00000000000250b5                asm_arm_add_reg_reg_reg
+ .text.asm_arm_sub_reg_reg_reg
+                0x00000000000250ca       0x15 build/py/asmarm.o
+                0x00000000000250ca                asm_arm_sub_reg_reg_reg
+ .text.asm_arm_mul_reg_reg_reg
+                0x00000000000250df       0x3b build/py/asmarm.o
+                0x00000000000250df                asm_arm_mul_reg_reg_reg
+ .text.asm_arm_and_reg_reg_reg
+                0x000000000002511a        0xf build/py/asmarm.o
+                0x000000000002511a                asm_arm_and_reg_reg_reg
+ .text.asm_arm_eor_reg_reg_reg
+                0x0000000000025129       0x15 build/py/asmarm.o
+                0x0000000000025129                asm_arm_eor_reg_reg_reg
+ .text.asm_arm_orr_reg_reg_reg
+                0x000000000002513e       0x15 build/py/asmarm.o
+                0x000000000002513e                asm_arm_orr_reg_reg_reg
+ .text.asm_arm_mov_reg_local_addr
+                0x0000000000025153       0x20 build/py/asmarm.o
+                0x0000000000025153                asm_arm_mov_reg_local_addr
+ .text.asm_arm_mov_reg_pcrel
+                0x0000000000025173       0x7b build/py/asmarm.o
+                0x0000000000025173                asm_arm_mov_reg_pcrel
+ .text.asm_arm_lsl_reg_reg
+                0x00000000000251ee       0x19 build/py/asmarm.o
+                0x00000000000251ee                asm_arm_lsl_reg_reg
+ .text.asm_arm_asr_reg_reg
+                0x0000000000025207       0x19 build/py/asmarm.o
+                0x0000000000025207                asm_arm_asr_reg_reg
+ .text.asm_arm_ldr_reg_reg
+                0x0000000000025220       0x17 build/py/asmarm.o
+                0x0000000000025220                asm_arm_ldr_reg_reg
+ .text.asm_arm_ldrh_reg_reg
+                0x0000000000025237       0x15 build/py/asmarm.o
+                0x0000000000025237                asm_arm_ldrh_reg_reg
+ .text.asm_arm_ldrb_reg_reg
+                0x000000000002524c       0x15 build/py/asmarm.o
+                0x000000000002524c                asm_arm_ldrb_reg_reg
+ .text.asm_arm_str_reg_reg
+                0x0000000000025261       0x17 build/py/asmarm.o
+                0x0000000000025261                asm_arm_str_reg_reg
+ .text.asm_arm_strh_reg_reg
+                0x0000000000025278       0x15 build/py/asmarm.o
+                0x0000000000025278                asm_arm_strh_reg_reg
+ .text.asm_arm_strb_reg_reg
+                0x000000000002528d       0x15 build/py/asmarm.o
+                0x000000000002528d                asm_arm_strb_reg_reg
+ .text.asm_arm_str_reg_reg_reg
+                0x00000000000252a2       0x17 build/py/asmarm.o
+                0x00000000000252a2                asm_arm_str_reg_reg_reg
+ .text.asm_arm_strh_reg_reg_reg
+                0x00000000000252b9       0x3c build/py/asmarm.o
+                0x00000000000252b9                asm_arm_strh_reg_reg_reg
+ .text.asm_arm_strb_reg_reg_reg
+                0x00000000000252f5       0x17 build/py/asmarm.o
+                0x00000000000252f5                asm_arm_strb_reg_reg_reg
+ .text.asm_arm_bcc_label
+                0x000000000002530c       0x7b build/py/asmarm.o
+                0x000000000002530c                asm_arm_bcc_label
+ .text.asm_arm_b_label
+                0x0000000000025387        0xc build/py/asmarm.o
+                0x0000000000025387                asm_arm_b_label
+ .text.asm_arm_bl_ind
+                0x0000000000025393       0x59 build/py/asmarm.o
+                0x0000000000025393                asm_arm_bl_ind
+ .text.asm_arm_bx_reg
+                0x00000000000253ec        0xb build/py/asmarm.o
+                0x00000000000253ec                asm_arm_bx_reg
+ .text.vtype_to_qstr
+                0x00000000000253f7       0x18 build/py/emitnarm.o
+ .text.emit_native_last_emit_was_return_value
+                0x000000000002540f        0x7 build/py/emitnarm.o
+ .text.emit_native_set_source_line
+                0x0000000000025416        0x1 build/py/emitnarm.o
+ .text.emit_native_arm_new
+                0x0000000000025417       0x7b build/py/emitnarm.o
+                0x0000000000025417                emit_native_arm_new
+ .text.emit_native_arm_free
+                0x0000000000025492       0x42 build/py/emitnarm.o
+                0x0000000000025492                emit_native_arm_free
+ .text.adjust_stack
+                0x00000000000254d4       0x71 build/py/emitnarm.o
+ .text.emit_native_end_except_handler
+                0x0000000000025545        0x9 build/py/emitnarm.o
+ .text.emit_pre_pop_discard
+                0x000000000002554e       0x10 build/py/emitnarm.o
+ .text.emit_native_pop_top
+                0x000000000002555e        0x5 build/py/emitnarm.o
+ .text.emit_native_for_iter_end
+                0x0000000000025563       0x13 build/py/emitnarm.o
+ .text.emit_native_leave_exc_stack
+                0x0000000000025576       0x8e build/py/emitnarm.o
+ .text.ensure_extra_stack
+                0x0000000000025604       0x37 build/py/emitnarm.o
+ .text.emit_post_push_reg
+                0x000000000002563b       0x4a build/py/emitnarm.o
+ .text.emit_native_start_except_handler
+                0x0000000000025685       0x2e build/py/emitnarm.o
+ .text.emit_post_push_imm
+                0x00000000000256b3       0x4c build/py/emitnarm.o
+ .text.emit_native_load_null
+                0x00000000000256ff       0x10 build/py/emitnarm.o
+ .text.emit_native_load_const_small_int
+                0x000000000002570f       0x14 build/py/emitnarm.o
+ .text.emit_native_adjust_stack_size
+                0x0000000000025723       0x5b build/py/emitnarm.o
+ .text.emit_native_push_exc_stack
+                0x000000000002577e       0x90 build/py/emitnarm.o
+ .text.peek_vtype
+                0x000000000002580e       0x1d build/py/emitnarm.o
+ .text.emit_native_mov_reg_state_addr
+                0x000000000002582b       0x4e build/py/emitnarm.o
+ .text.emit_native_mov_state_reg
+                0x0000000000025879       0x36 build/py/emitnarm.o
+ .text.need_reg_single
+                0x00000000000258af       0x5e build/py/emitnarm.o
+ .text.emit_native_load_const_str
+                0x000000000002590d       0x6d build/py/emitnarm.o
+ .text.need_reg_all
+                0x000000000002597a       0x45 build/py/emitnarm.o
+ .text.emit_call_with_imm_arg
+                0x00000000000259bf       0x43 build/py/emitnarm.o
+ .text.emit_call
+                0x0000000000025a02       0x2b build/py/emitnarm.o
+ .text.emit_native_load_build_class
+                0x0000000000025a2d       0x2c build/py/emitnarm.o
+ .text.emit_get_stack_pointer_to_reg_for_push
+                0x0000000000025a59       0x6a build/py/emitnarm.o
+ .text.emit_call_with_qstr_arg
+                0x0000000000025ac3       0x75 build/py/emitnarm.o
+ .text.emit_native_delete_global
+                0x0000000000025b38       0x17 build/py/emitnarm.o
+ .text.emit_native_load_global
+                0x0000000000025b4f       0x5d build/py/emitnarm.o
+ .text.emit_call_with_2_imm_args.constprop.0
+                0x0000000000025bac       0x56 build/py/emitnarm.o
+ .text.emit_native_mov_reg_state
+                0x0000000000025c02       0x30 build/py/emitnarm.o
+ .text.emit_native_load_fast
+                0x0000000000025c32       0x9d build/py/emitnarm.o
+ .text.emit_load_reg_with_ptr.constprop.0
+                0x0000000000025ccf       0x73 build/py/emitnarm.o
+ .text.emit_native_load_const_obj
+                0x0000000000025d42       0x50 build/py/emitnarm.o
+ .text.emit_native_load_const_tok
+                0x0000000000025d92       0x38 build/py/emitnarm.o
+ .text.emit_fold_stack_top.constprop.0
+                0x0000000000025dca       0x55 build/py/emitnarm.o
+ .text.load_reg_stack_imm
+                0x0000000000025e1f       0xac build/py/emitnarm.o
+ .text.need_stack_settled
+                0x0000000000025ecb       0x99 build/py/emitnarm.o
+ .text.emit_native_jump
+                0x0000000000025f64       0x26 build/py/emitnarm.o
+ .text.emit_native_pop_except_jump
+                0x0000000000025f8a       0x49 build/py/emitnarm.o
+ .text.emit_native_unwind_jump
+                0x0000000000025fd3      0x127 build/py/emitnarm.o
+ .text.emit_access_stack
+                0x00000000000260fa       0x86 build/py/emitnarm.o
+ .text.emit_pre_pop_reg
+                0x0000000000026180       0x31 build/py/emitnarm.o
+ .text.emit_pre_pop_reg_reg
+                0x00000000000261b1       0x30 build/py/emitnarm.o
+ .text.emit_native_rot_two
+                0x00000000000261e1       0x4c build/py/emitnarm.o
+ .text.emit_native_dup_top_two
+                0x000000000002622d       0x71 build/py/emitnarm.o
+ .text.emit_pre_pop_reg_reg_reg
+                0x000000000002629e       0x44 build/py/emitnarm.o
+ .text.emit_native_rot_three
+                0x00000000000262e2       0x6d build/py/emitnarm.o
+ .text.emit_native_store_map
+                0x000000000002634f       0xb6 build/py/emitnarm.o
+ .text.emit_native_label_assign
+                0x0000000000026405       0x93 build/py/emitnarm.o
+ .text.emit_native_end_finally
+                0x0000000000026498      0x109 build/py/emitnarm.o
+ .text.emit_native_global_exc_entry
+                0x00000000000265a1      0x326 build/py/emitnarm.o
+ .text.emit_native_start_pass
+                0x00000000000268c7      0x6ea build/py/emitnarm.o
+ .text.emit_native_unpack_ex
+                0x0000000000026fb1       0x7a build/py/emitnarm.o
+ .text.emit_native_unpack_sequence
+                0x000000000002702b       0x6c build/py/emitnarm.o
+ .text.emit_native_get_iter
+                0x0000000000027097       0x95 build/py/emitnarm.o
+ .text.emit_native_raise_varargs
+                0x000000000002712c       0x70 build/py/emitnarm.o
+ .text.emit_native_unary_op
+                0x000000000002719c       0x81 build/py/emitnarm.o
+ .text.emit_native_jump_helper
+                0x000000000002721d      0x104 build/py/emitnarm.o
+ .text.emit_native_jump_if_or_pop
+                0x0000000000027321        0xb build/py/emitnarm.o
+ .text.emit_native_pop_jump_if
+                0x000000000002732c        0xe build/py/emitnarm.o
+ .text.emit_native_store_fast
+                0x000000000002733a       0xb9 build/py/emitnarm.o
+ .text.emit_native_delete_local
+                0x00000000000273f3       0x43 build/py/emitnarm.o
+ .text.emit_native_attr
+                0x0000000000027436      0x10b build/py/emitnarm.o
+ .text.emit_native_store_global
+                0x0000000000027541       0xb5 build/py/emitnarm.o
+ .text.emit_native_store_comp
+                0x00000000000275f6      0x12e build/py/emitnarm.o
+ .text.emit_native_import
+                0x0000000000027724      0x122 build/py/emitnarm.o
+ .text.emit_get_stack_pointer_to_reg_for_pop
+                0x0000000000027846      0x12c build/py/emitnarm.o
+ .text.emit_native_yield
+                0x0000000000027972      0x22b build/py/emitnarm.o
+ .text.emit_native_call_method
+                0x0000000000027b9d       0x76 build/py/emitnarm.o
+ .text.emit_native_make_closure
+                0x0000000000027c13       0x9b build/py/emitnarm.o
+ .text.emit_native_for_iter
+                0x0000000000027cae       0x65 build/py/emitnarm.o
+ .text.emit_native_with_cleanup
+                0x0000000000027d13      0x1d7 build/py/emitnarm.o
+ .text.emit_native_return_value
+                0x0000000000027eea      0x170 build/py/emitnarm.o
+ .text.emit_native_load_method
+                0x000000000002805a       0xac build/py/emitnarm.o
+ .text.emit_native_build
+                0x0000000000028106      0x185 build/py/emitnarm.o
+ .text.emit_native_end_pass
+                0x000000000002828b      0x42b build/py/emitnarm.o
+ .text.emit_native_make_function
+                0x00000000000286b6       0xf8 build/py/emitnarm.o
+ .text.emit_native_call_function
+                0x00000000000287ae      0x19b build/py/emitnarm.o
+ .text.emit_pre_pop_reg_flexible
+                0x0000000000028949       0x64 build/py/emitnarm.o
+ .text.emit_native_dup_top
+                0x00000000000289ad       0x5a build/py/emitnarm.o
+ .text.emit_native_setup_block
+                0x0000000000028a07      0x172 build/py/emitnarm.o
+ .text.emit_native_store_local
+                0x0000000000028b79       0xb0 build/py/emitnarm.o
+ .text.emit_native_load_local
+                0x0000000000028c29       0x89 build/py/emitnarm.o
+ .text.emit_native_binary_op
+                0x0000000000028cb2      0x30f build/py/emitnarm.o
+ .text.emit_native_subscr
+                0x0000000000028fc1      0x73e build/py/emitnarm.o
+ .text.get_label_dest
+                0x00000000000296ff       0x31 build/py/asmxtensa.o
+ .text.asm_xtensa_end_pass
+                0x0000000000029730        0xe build/py/asmxtensa.o
+                0x0000000000029730                asm_xtensa_end_pass
+ .text.asm_xtensa_op16
+                0x000000000002973e       0x17 build/py/asmxtensa.o
+                0x000000000002973e                asm_xtensa_op16
+ .text.asm_xtensa_exit_win
+                0x0000000000029755       0x26 build/py/asmxtensa.o
+                0x0000000000029755                asm_xtensa_exit_win
+ .text.asm_xtensa_op24
+                0x000000000002977b       0x1d build/py/asmxtensa.o
+                0x000000000002977b                asm_xtensa_op24
+ .text.asm_xtensa_op_movi
+                0x0000000000029798       0x28 build/py/asmxtensa.o
+ .text.asm_xtensa_exit
+                0x00000000000297c0       0x94 build/py/asmxtensa.o
+                0x00000000000297c0                asm_xtensa_exit
+ .text.asm_xtensa_entry
+                0x0000000000029854       0xcb build/py/asmxtensa.o
+                0x0000000000029854                asm_xtensa_entry
+ .text.asm_xtensa_entry_win
+                0x000000000002991f       0x7f build/py/asmxtensa.o
+                0x000000000002991f                asm_xtensa_entry_win
+ .text.asm_xtensa_j_label
+                0x000000000002999e       0x2e build/py/asmxtensa.o
+                0x000000000002999e                asm_xtensa_j_label
+ .text.asm_xtensa_bccz_reg_label
+                0x00000000000299cc       0x6b build/py/asmxtensa.o
+                0x00000000000299cc                asm_xtensa_bccz_reg_label
+ .text.asm_xtensa_bcc_reg_reg_label
+                0x0000000000029a37       0x73 build/py/asmxtensa.o
+                0x0000000000029a37                asm_xtensa_bcc_reg_reg_label
+ .text.asm_xtensa_setcc_reg_reg_reg
+                0x0000000000029aaa       0x5e build/py/asmxtensa.o
+                0x0000000000029aaa                asm_xtensa_setcc_reg_reg_reg
+ .text.asm_xtensa_mov_reg_i32
+                0x0000000000029b08       0x5b build/py/asmxtensa.o
+                0x0000000000029b08                asm_xtensa_mov_reg_i32
+ .text.asm_xtensa_mov_reg_i32_optimised
+                0x0000000000029b63       0x1a build/py/asmxtensa.o
+                0x0000000000029b63                asm_xtensa_mov_reg_i32_optimised
+ .text.asm_xtensa_mov_local_reg
+                0x0000000000029b7d       0x19 build/py/asmxtensa.o
+                0x0000000000029b7d                asm_xtensa_mov_local_reg
+ .text.asm_xtensa_mov_reg_local
+                0x0000000000029b96       0x19 build/py/asmxtensa.o
+                0x0000000000029b96                asm_xtensa_mov_reg_local
+ .text.asm_xtensa_mov_reg_local_addr
+                0x0000000000029baf       0x5f build/py/asmxtensa.o
+                0x0000000000029baf                asm_xtensa_mov_reg_local_addr
+ .text.asm_xtensa_mov_reg_pcrel
+                0x0000000000029c0e       0x6a build/py/asmxtensa.o
+                0x0000000000029c0e                asm_xtensa_mov_reg_pcrel
+ .text.asm_xtensa_call_ind
+                0x0000000000029c78       0x3d build/py/asmxtensa.o
+                0x0000000000029c78                asm_xtensa_call_ind
+ .text.asm_xtensa_call_ind_win
+                0x0000000000029cb5       0x3d build/py/asmxtensa.o
+                0x0000000000029cb5                asm_xtensa_call_ind_win
+ .text.vtype_to_qstr
+                0x0000000000029cf2       0x18 build/py/emitnxtensa.o
+ .text.emit_native_last_emit_was_return_value
+                0x0000000000029d0a        0x7 build/py/emitnxtensa.o
+ .text.emit_native_set_source_line
+                0x0000000000029d11        0x1 build/py/emitnxtensa.o
+ .text.emit_native_xtensa_new
+                0x0000000000029d12       0x7b build/py/emitnxtensa.o
+                0x0000000000029d12                emit_native_xtensa_new
+ .text.emit_native_xtensa_free
+                0x0000000000029d8d       0x42 build/py/emitnxtensa.o
+                0x0000000000029d8d                emit_native_xtensa_free
+ .text.adjust_stack
+                0x0000000000029dcf       0x71 build/py/emitnxtensa.o
+ .text.emit_native_end_except_handler
+                0x0000000000029e40        0x9 build/py/emitnxtensa.o
+ .text.emit_pre_pop_discard
+                0x0000000000029e49       0x10 build/py/emitnxtensa.o
+ .text.emit_native_pop_top
+                0x0000000000029e59        0x5 build/py/emitnxtensa.o
+ .text.emit_native_for_iter_end
+                0x0000000000029e5e       0x13 build/py/emitnxtensa.o
+ .text.emit_native_leave_exc_stack
+                0x0000000000029e71       0x93 build/py/emitnxtensa.o
+ .text.ensure_extra_stack
+                0x0000000000029f04       0x37 build/py/emitnxtensa.o
+ .text.emit_post_push_reg
+                0x0000000000029f3b       0x4a build/py/emitnxtensa.o
+ .text.emit_native_start_except_handler
+                0x0000000000029f85       0x34 build/py/emitnxtensa.o
+ .text.emit_post_push_imm
+                0x0000000000029fb9       0x4c build/py/emitnxtensa.o
+ .text.emit_native_load_null
+                0x000000000002a005       0x10 build/py/emitnxtensa.o
+ .text.emit_native_load_const_small_int
+                0x000000000002a015       0x14 build/py/emitnxtensa.o
+ .text.emit_native_adjust_stack_size
+                0x000000000002a029       0x5b build/py/emitnxtensa.o
+ .text.emit_native_push_exc_stack
+                0x000000000002a084       0x96 build/py/emitnxtensa.o
+ .text.asm_xtensa_op_l32i_n
+                0x000000000002a11a       0x18 build/py/emitnxtensa.o
+ .text.asm_xtensa_op_add_n
+                0x000000000002a132       0x18 build/py/emitnxtensa.o
+ .text.peek_vtype
+                0x000000000002a14a       0x1d build/py/emitnxtensa.o
+ .text.emit_native_mov_reg_state_addr
+                0x000000000002a167       0x51 build/py/emitnxtensa.o
+ .text.emit_native_mov_reg_state
+                0x000000000002a1b8       0x2e build/py/emitnxtensa.o
+ .text.emit_load_reg_with_ptr.constprop.0
+                0x000000000002a1e6       0x73 build/py/emitnxtensa.o
+ .text.emit_fold_stack_top.constprop.0
+                0x000000000002a259       0x5e build/py/emitnxtensa.o
+ .text.load_reg_stack_imm
+                0x000000000002a2b7       0xa7 build/py/emitnxtensa.o
+ .text.emit_native_mov_state_reg
+                0x000000000002a35e       0x37 build/py/emitnxtensa.o
+ .text.need_stack_settled
+                0x000000000002a395       0x9f build/py/emitnxtensa.o
+ .text.emit_native_jump
+                0x000000000002a434       0x26 build/py/emitnxtensa.o
+ .text.emit_native_pop_except_jump
+                0x000000000002a45a       0x4f build/py/emitnxtensa.o
+ .text.emit_native_unwind_jump
+                0x000000000002a4a9      0x138 build/py/emitnxtensa.o
+ .text.need_reg_single
+                0x000000000002a5e1       0x5e build/py/emitnxtensa.o
+ .text.emit_native_load_const_obj
+                0x000000000002a63f       0x56 build/py/emitnxtensa.o
+ .text.emit_native_load_const_tok
+                0x000000000002a695       0x38 build/py/emitnxtensa.o
+ .text.emit_access_stack
+                0x000000000002a6cd       0x9f build/py/emitnxtensa.o
+ .text.emit_pre_pop_reg
+                0x000000000002a76c       0x31 build/py/emitnxtensa.o
+ .text.emit_pre_pop_reg_reg
+                0x000000000002a79d       0x30 build/py/emitnxtensa.o
+ .text.emit_native_rot_two
+                0x000000000002a7cd       0x52 build/py/emitnxtensa.o
+ .text.emit_native_dup_top_two
+                0x000000000002a81f       0x7a build/py/emitnxtensa.o
+ .text.emit_pre_pop_reg_reg_reg
+                0x000000000002a899       0x44 build/py/emitnxtensa.o
+ .text.emit_native_rot_three
+                0x000000000002a8dd       0x73 build/py/emitnxtensa.o
+ .text.emit_native_label_assign
+                0x000000000002a950       0x99 build/py/emitnxtensa.o
+ .text.emit_pre_pop_reg_flexible
+                0x000000000002a9e9       0x64 build/py/emitnxtensa.o
+ .text.emit_native_dup_top
+                0x000000000002aa4d       0x5a build/py/emitnxtensa.o
+ .text.emit_native_load_fast
+                0x000000000002aaa7       0xa6 build/py/emitnxtensa.o
+ .text.emit_native_load_local
+                0x000000000002ab4d       0x92 build/py/emitnxtensa.o
+ .text.emit_native_load_const_str
+                0x000000000002abdf       0x76 build/py/emitnxtensa.o
+ .text.need_reg_all
+                0x000000000002ac55       0x45 build/py/emitnxtensa.o
+ .text.emit_call_with_imm_arg
+                0x000000000002ac9a       0x3e build/py/emitnxtensa.o
+ .text.emit_native_unary_op
+                0x000000000002acd8       0x87 build/py/emitnxtensa.o
+ .text.emit_call
+                0x000000000002ad5f       0x26 build/py/emitnxtensa.o
+ .text.emit_native_store_comp
+                0x000000000002ad85      0x131 build/py/emitnxtensa.o
+ .text.emit_native_store_map
+                0x000000000002aeb6       0xb9 build/py/emitnxtensa.o
+ .text.emit_native_end_finally
+                0x000000000002af6f      0x107 build/py/emitnxtensa.o
+ .text.emit_native_load_build_class
+                0x000000000002b076       0x2f build/py/emitnxtensa.o
+ .text.emit_native_raise_varargs
+                0x000000000002b0a5       0x73 build/py/emitnxtensa.o
+ .text.emit_native_jump_helper
+                0x000000000002b118       0xeb build/py/emitnxtensa.o
+ .text.emit_native_jump_if_or_pop
+                0x000000000002b203        0xb build/py/emitnxtensa.o
+ .text.emit_native_pop_jump_if
+                0x000000000002b20e        0xe build/py/emitnxtensa.o
+ .text.emit_native_binary_op
+                0x000000000002b21c      0x31f build/py/emitnxtensa.o
+ .text.emit_native_end_pass
+                0x000000000002b53b      0x426 build/py/emitnxtensa.o
+ .text.emit_native_make_function
+                0x000000000002b961       0xf6 build/py/emitnxtensa.o
+ .text.emit_get_stack_pointer_to_reg_for_push
+                0x000000000002ba57       0x6a build/py/emitnxtensa.o
+ .text.emit_native_unpack_ex
+                0x000000000002bac1       0x7d build/py/emitnxtensa.o
+ .text.emit_native_unpack_sequence
+                0x000000000002bb3e       0x6f build/py/emitnxtensa.o
+ .text.emit_native_get_iter
+                0x000000000002bbad       0x9b build/py/emitnxtensa.o
+ .text.emit_call_with_qstr_arg
+                0x000000000002bc48       0x70 build/py/emitnxtensa.o
+ .text.emit_native_attr
+                0x000000000002bcb8      0x10f build/py/emitnxtensa.o
+ .text.emit_native_import
+                0x000000000002bdc7      0x12e build/py/emitnxtensa.o
+ .text.emit_native_delete_global
+                0x000000000002bef5       0x1a build/py/emitnxtensa.o
+ .text.emit_native_store_global
+                0x000000000002bf0f       0xb9 build/py/emitnxtensa.o
+ .text.emit_native_load_global
+                0x000000000002bfc8       0x63 build/py/emitnxtensa.o
+ .text.emit_call_with_2_imm_args.constprop.0
+                0x000000000002c02b       0x54 build/py/emitnxtensa.o
+ .text.emit_get_stack_pointer_to_reg_for_pop
+                0x000000000002c07f      0x132 build/py/emitnxtensa.o
+ .text.emit_native_call_method
+                0x000000000002c1b1       0x79 build/py/emitnxtensa.o
+ .text.emit_native_call_function
+                0x000000000002c22a      0x1a7 build/py/emitnxtensa.o
+ .text.emit_native_make_closure
+                0x000000000002c3d1       0x99 build/py/emitnxtensa.o
+ .text.emit_native_build
+                0x000000000002c46a      0x18e build/py/emitnxtensa.o
+ .text.emit_native_for_iter
+                0x000000000002c5f8       0x60 build/py/emitnxtensa.o
+ .text.emit_native_with_cleanup
+                0x000000000002c658      0x1c9 build/py/emitnxtensa.o
+ .text.emit_native_setup_block
+                0x000000000002c821      0x17b build/py/emitnxtensa.o
+ .text.emit_native_load_method
+                0x000000000002c99c       0xb2 build/py/emitnxtensa.o
+ .text.emit_native_yield
+                0x000000000002ca4e      0x23e build/py/emitnxtensa.o
+ .text.emit_native_return_value
+                0x000000000002cc8c      0x188 build/py/emitnxtensa.o
+ .text.emit_native_store_fast
+                0x000000000002ce14       0xbf build/py/emitnxtensa.o
+ .text.emit_native_delete_local
+                0x000000000002ced3       0x43 build/py/emitnxtensa.o
+ .text.emit_native_global_exc_entry
+                0x000000000002cf16      0x317 build/py/emitnxtensa.o
+ .text.emit_native_start_pass
+                0x000000000002d22d      0x6cc build/py/emitnxtensa.o
+ .text.emit_native_store_local
+                0x000000000002d8f9       0xbe build/py/emitnxtensa.o
+ .text.emit_native_subscr
+                0x000000000002d9b7      0x875 build/py/emitnxtensa.o
+ .text.emit_inline_xtensa_new
+                0x000000000002e22c       0x4a build/py/emitinlinextensa.o
+                0x000000000002e22c                emit_inline_xtensa_new
+ .text.emit_inline_xtensa_free
+                0x000000000002e276       0x20 build/py/emitinlinextensa.o
+                0x000000000002e276                emit_inline_xtensa_free
+ .text.get_arg_reg
+                0x000000000002e296       0xa5 build/py/emitinlinextensa.o
+ .text.get_arg_i
+                0x000000000002e33b       0x8d build/py/emitinlinextensa.o
+ .text.emit_inline_xtensa_label
+                0x000000000002e3c8       0x59 build/py/emitinlinextensa.o
+ .text.emit_inline_xtensa_end_pass
+                0x000000000002e421       0x1c build/py/emitinlinextensa.o
+ .text.emit_inline_xtensa_start_pass
+                0x000000000002e43d       0x46 build/py/emitinlinextensa.o
+ .text.get_arg_label
+                0x000000000002e483       0x8f build/py/emitinlinextensa.o
+ .text.emit_inline_xtensa_op
+                0x000000000002e512      0x303 build/py/emitinlinextensa.o
+ .text.emit_inline_xtensa_count_params
+                0x000000000002e815       0xa5 build/py/emitinlinextensa.o
+ .text.vtype_to_qstr
+                0x000000000002e8ba       0x18 build/py/emitnxtensawin.o
+ .text.emit_native_last_emit_was_return_value
+                0x000000000002e8d2        0x7 build/py/emitnxtensawin.o
+ .text.emit_native_set_source_line
+                0x000000000002e8d9        0x1 build/py/emitnxtensawin.o
+ .text.emit_native_xtensawin_new
+                0x000000000002e8da       0x7b build/py/emitnxtensawin.o
+                0x000000000002e8da                emit_native_xtensawin_new
+ .text.emit_native_xtensawin_free
+                0x000000000002e955       0x42 build/py/emitnxtensawin.o
+                0x000000000002e955                emit_native_xtensawin_free
+ .text.adjust_stack
+                0x000000000002e997       0x71 build/py/emitnxtensawin.o
+ .text.emit_native_end_except_handler
+                0x000000000002ea08        0x9 build/py/emitnxtensawin.o
+ .text.emit_pre_pop_discard
+                0x000000000002ea11       0x10 build/py/emitnxtensawin.o
+ .text.emit_native_pop_top
+                0x000000000002ea21        0x5 build/py/emitnxtensawin.o
+ .text.emit_native_for_iter_end
+                0x000000000002ea26       0x13 build/py/emitnxtensawin.o
+ .text.emit_native_leave_exc_stack
+                0x000000000002ea39       0x93 build/py/emitnxtensawin.o
+ .text.ensure_extra_stack
+                0x000000000002eacc       0x37 build/py/emitnxtensawin.o
+ .text.emit_post_push_reg
+                0x000000000002eb03       0x4a build/py/emitnxtensawin.o
+ .text.emit_native_start_except_handler
+                0x000000000002eb4d       0x34 build/py/emitnxtensawin.o
+ .text.emit_post_push_imm
+                0x000000000002eb81       0x4c build/py/emitnxtensawin.o
+ .text.emit_native_load_null
+                0x000000000002ebcd       0x10 build/py/emitnxtensawin.o
+ .text.emit_native_load_const_small_int
+                0x000000000002ebdd       0x14 build/py/emitnxtensawin.o
+ .text.emit_native_adjust_stack_size
+                0x000000000002ebf1       0x5b build/py/emitnxtensawin.o
+ .text.emit_native_push_exc_stack
+                0x000000000002ec4c       0x96 build/py/emitnxtensawin.o
+ .text.asm_xtensa_op_l32i_n
+                0x000000000002ece2       0x18 build/py/emitnxtensawin.o
+ .text.asm_xtensa_op_add_n
+                0x000000000002ecfa       0x18 build/py/emitnxtensawin.o
+ .text.peek_vtype
+                0x000000000002ed12       0x1d build/py/emitnxtensawin.o
+ .text.emit_native_mov_reg_state_addr
+                0x000000000002ed2f       0x50 build/py/emitnxtensawin.o
+ .text.emit_native_mov_reg_state
+                0x000000000002ed7f       0x2e build/py/emitnxtensawin.o
+ .text.emit_load_reg_with_ptr.constprop.0
+                0x000000000002edad       0x73 build/py/emitnxtensawin.o
+ .text.emit_fold_stack_top.constprop.0
+                0x000000000002ee20       0x5e build/py/emitnxtensawin.o
+ .text.load_reg_stack_imm
+                0x000000000002ee7e       0xa7 build/py/emitnxtensawin.o
+ .text.emit_native_mov_state_reg
+                0x000000000002ef25       0x36 build/py/emitnxtensawin.o
+ .text.need_stack_settled
+                0x000000000002ef5b       0x9f build/py/emitnxtensawin.o
+ .text.emit_native_jump
+                0x000000000002effa       0x26 build/py/emitnxtensawin.o
+ .text.emit_native_pop_except_jump
+                0x000000000002f020       0x4f build/py/emitnxtensawin.o
+ .text.emit_native_unwind_jump
+                0x000000000002f06f      0x138 build/py/emitnxtensawin.o
+ .text.need_reg_single
+                0x000000000002f1a7       0x5e build/py/emitnxtensawin.o
+ .text.emit_native_load_const_obj
+                0x000000000002f205       0x56 build/py/emitnxtensawin.o
+ .text.emit_native_load_const_tok
+                0x000000000002f25b       0x38 build/py/emitnxtensawin.o
+ .text.emit_access_stack
+                0x000000000002f293       0x9f build/py/emitnxtensawin.o
+ .text.emit_pre_pop_reg
+                0x000000000002f332       0x31 build/py/emitnxtensawin.o
+ .text.emit_pre_pop_reg_reg
+                0x000000000002f363       0x30 build/py/emitnxtensawin.o
+ .text.emit_native_rot_two
+                0x000000000002f393       0x52 build/py/emitnxtensawin.o
+ .text.emit_native_dup_top_two
+                0x000000000002f3e5       0x7a build/py/emitnxtensawin.o
+ .text.emit_pre_pop_reg_reg_reg
+                0x000000000002f45f       0x44 build/py/emitnxtensawin.o
+ .text.emit_native_rot_three
+                0x000000000002f4a3       0x73 build/py/emitnxtensawin.o
+ .text.emit_native_label_assign
+                0x000000000002f516       0x99 build/py/emitnxtensawin.o
+ .text.emit_pre_pop_reg_flexible
+                0x000000000002f5af       0x64 build/py/emitnxtensawin.o
+ .text.emit_native_dup_top
+                0x000000000002f613       0x5a build/py/emitnxtensawin.o
+ .text.emit_native_load_fast
+                0x000000000002f66d       0xa6 build/py/emitnxtensawin.o
+ .text.emit_native_load_local
+                0x000000000002f713       0x92 build/py/emitnxtensawin.o
+ .text.emit_native_load_const_str
+                0x000000000002f7a5       0x76 build/py/emitnxtensawin.o
+ .text.need_reg_all
+                0x000000000002f81b       0x45 build/py/emitnxtensawin.o
+ .text.emit_call_with_imm_arg
+                0x000000000002f860       0x3e build/py/emitnxtensawin.o
+ .text.emit_native_unary_op
+                0x000000000002f89e       0x87 build/py/emitnxtensawin.o
+ .text.emit_call
+                0x000000000002f925       0x26 build/py/emitnxtensawin.o
+ .text.emit_native_store_comp
+                0x000000000002f94b      0x131 build/py/emitnxtensawin.o
+ .text.emit_native_store_map
+                0x000000000002fa7c       0xb9 build/py/emitnxtensawin.o
+ .text.emit_native_end_finally
+                0x000000000002fb35      0x107 build/py/emitnxtensawin.o
+ .text.emit_native_load_build_class
+                0x000000000002fc3c       0x2f build/py/emitnxtensawin.o
+ .text.emit_native_raise_varargs
+                0x000000000002fc6b       0x73 build/py/emitnxtensawin.o
+ .text.emit_native_jump_helper
+                0x000000000002fcde       0xeb build/py/emitnxtensawin.o
+ .text.emit_native_jump_if_or_pop
+                0x000000000002fdc9        0xb build/py/emitnxtensawin.o
+ .text.emit_native_pop_jump_if
+                0x000000000002fdd4        0xe build/py/emitnxtensawin.o
+ .text.emit_native_binary_op
+                0x000000000002fde2      0x31f build/py/emitnxtensawin.o
+ .text.emit_native_end_pass
+                0x0000000000030101      0x45f build/py/emitnxtensawin.o
+ .text.emit_native_make_function
+                0x0000000000030560       0xf6 build/py/emitnxtensawin.o
+ .text.emit_get_stack_pointer_to_reg_for_push
+                0x0000000000030656       0x6a build/py/emitnxtensawin.o
+ .text.emit_native_unpack_ex
+                0x00000000000306c0       0x7d build/py/emitnxtensawin.o
+ .text.emit_native_unpack_sequence
+                0x000000000003073d       0x6f build/py/emitnxtensawin.o
+ .text.emit_native_get_iter
+                0x00000000000307ac       0x9b build/py/emitnxtensawin.o
+ .text.emit_call_with_qstr_arg
+                0x0000000000030847       0x70 build/py/emitnxtensawin.o
+ .text.emit_native_attr
+                0x00000000000308b7      0x10f build/py/emitnxtensawin.o
+ .text.emit_native_import
+                0x00000000000309c6      0x12e build/py/emitnxtensawin.o
+ .text.emit_native_delete_global
+                0x0000000000030af4       0x1a build/py/emitnxtensawin.o
+ .text.emit_native_store_global
+                0x0000000000030b0e       0xb9 build/py/emitnxtensawin.o
+ .text.emit_native_load_global
+                0x0000000000030bc7       0x63 build/py/emitnxtensawin.o
+ .text.emit_call_with_2_imm_args.constprop.0
+                0x0000000000030c2a       0x54 build/py/emitnxtensawin.o
+ .text.emit_get_stack_pointer_to_reg_for_pop
+                0x0000000000030c7e      0x132 build/py/emitnxtensawin.o
+ .text.emit_native_call_method
+                0x0000000000030db0       0x79 build/py/emitnxtensawin.o
+ .text.emit_native_call_function
+                0x0000000000030e29      0x1a7 build/py/emitnxtensawin.o
+ .text.emit_native_make_closure
+                0x0000000000030fd0       0x99 build/py/emitnxtensawin.o
+ .text.emit_native_build
+                0x0000000000031069      0x18e build/py/emitnxtensawin.o
+ .text.emit_native_for_iter
+                0x00000000000311f7       0x60 build/py/emitnxtensawin.o
+ .text.emit_native_with_cleanup
+                0x0000000000031257      0x1c9 build/py/emitnxtensawin.o
+ .text.emit_native_setup_block
+                0x0000000000031420      0x17b build/py/emitnxtensawin.o
+ .text.emit_native_load_method
+                0x000000000003159b       0xb2 build/py/emitnxtensawin.o
+ .text.emit_native_yield
+                0x000000000003164d      0x23e build/py/emitnxtensawin.o
+ .text.emit_native_return_value
+                0x000000000003188b      0x1ac build/py/emitnxtensawin.o
+ .text.emit_native_store_fast
+                0x0000000000031a37       0xbf build/py/emitnxtensawin.o
+ .text.emit_native_delete_local
+                0x0000000000031af6       0x43 build/py/emitnxtensawin.o
+ .text.emit_native_global_exc_entry
+                0x0000000000031b39      0x3a6 build/py/emitnxtensawin.o
+ .text.emit_native_start_pass
+                0x0000000000031edf      0x750 build/py/emitnxtensawin.o
+ .text.emit_native_store_local
+                0x000000000003262f       0xbe build/py/emitnxtensawin.o
+ .text.emit_native_subscr
+                0x00000000000326ed      0x87b build/py/emitnxtensawin.o
+ .text.mp_format_float
+                0x0000000000032f68      0x553 build/py/formatfloat.o
+                0x0000000000032f68                mp_format_float
+ .text.mp_parse_num_base
+                0x00000000000334bb       0x9a build/py/parsenumbase.o
+                0x00000000000334bb                mp_parse_num_base
+ .text.raise_exc
+                0x0000000000033555       0x30 build/py/parsenum.o
+ .text.mp_parse_num_integer
+                0x0000000000033585      0x1d2 build/py/parsenum.o
+                0x0000000000033585                mp_parse_num_integer
+ .text.mp_parse_num_decimal
+                0x0000000000033757      0x381 build/py/parsenum.o
+                0x0000000000033757                mp_parse_num_decimal
+ .text.mp_emit_glue_new_raw_code
+                0x0000000000033ad8       0x17 build/py/emitglue.o
+                0x0000000000033ad8                mp_emit_glue_new_raw_code
+ .text.mp_emit_glue_assign_bytecode
+                0x0000000000033aef       0x35 build/py/emitglue.o
+                0x0000000000033aef                mp_emit_glue_assign_bytecode
+ .text.mp_emit_glue_assign_native
+                0x0000000000033b24       0x9f build/py/emitglue.o
+                0x0000000000033b24                mp_emit_glue_assign_native
+ .text.extract_prelude
+                0x0000000000033bc3      0x122 build/py/persistentcode.o
+ .text.mp_print_bytes
+                0x0000000000033ce5        0x9 build/py/persistentcode.o
+ .text.mp_print_uint
+                0x0000000000033cee       0x45 build/py/persistentcode.o
+ .text.mp_raw_code_has_native
+                0x0000000000033d33       0x75 build/py/persistentcode.o
+ .text.fd_print_strn
+                0x0000000000033da8        0x5 build/py/persistentcode.o
+ .text.save_qstr
+                0x0000000000033dad      0x121 build/py/persistentcode.o
+ .text.save_prelude_qstrs
+                0x0000000000033ece       0x30 build/py/persistentcode.o
+ .text.save_raw_code
+                0x0000000000033efe      0x437 build/py/persistentcode.o
+ .text.mp_raw_code_save
+                0x0000000000034335       0x97 build/py/persistentcode.o
+                0x0000000000034335                mp_raw_code_save
+ .text.mp_raw_code_save_file
+                0x00000000000343cc       0x4c build/py/persistentcode.o
+                0x00000000000343cc                mp_raw_code_save_file
+ .text.mp_init  0x0000000000034418       0x72 build/py/runtime.o
+                0x0000000000034418                mp_init
+ .text.mp_deinit
+                0x000000000003448a        0x1 build/py/runtime.o
+                0x000000000003448a                mp_deinit
+ .text.mp_convert_member_lookup
+                0x000000000003448b      0x105 build/py/runtime.o
+                0x000000000003448b                mp_convert_member_lookup
+ .text.mp_load_method_maybe
+                0x0000000000034590       0xf0 build/py/runtime.o
+                0x0000000000034590                mp_load_method_maybe
+ .text.mp_raise_msg
+                0x0000000000034680       0x1a build/py/runtime.o
+                0x0000000000034680                mp_raise_msg
+ .text.mp_raise_msg_varg
+                0x000000000003469a       0x8f build/py/runtime.o
+                0x000000000003469a                mp_raise_msg_varg
+ .text.mp_unary_op
+                0x0000000000034729      0x1b0 build/py/runtime.o
+                0x0000000000034729                mp_unary_op
+ .text.mp_call_function_n_kw
+                0x00000000000348d9       0x5b build/py/runtime.o
+                0x00000000000348d9                mp_call_function_n_kw
+ .text.mp_call_function_1
+                0x0000000000034934       0x1f build/py/runtime.o
+                0x0000000000034934                mp_call_function_1
+ .text.mp_call_method_n_kw
+                0x0000000000034953       0x2b build/py/runtime.o
+                0x0000000000034953                mp_call_method_n_kw
+ .text.checked_fun_call
+                0x000000000003497e       0x65 build/py/runtime.o
+ .text.mp_getiter
+                0x00000000000349e3       0xe2 build/py/runtime.o
+                0x00000000000349e3                mp_getiter
+ .text.mp_iternext_allow_raise
+                0x0000000000034ac5       0x72 build/py/runtime.o
+                0x0000000000034ac5                mp_iternext_allow_raise
+ .text.mp_iternext
+                0x0000000000034b37       0xba build/py/runtime.o
+                0x0000000000034b37                mp_iternext
+ .text.m_malloc_fail
+                0x0000000000034bf1       0x37 build/py/runtime.o
+                0x0000000000034bf1                m_malloc_fail
+ .text.mp_raise_ValueError
+                0x0000000000034c28       0x10 build/py/runtime.o
+                0x0000000000034c28                mp_raise_ValueError
+ .text.mp_binary_op
+                0x0000000000034c38      0x47a build/py/runtime.o
+                0x0000000000034c38                mp_binary_op
+ .text.mp_raise_TypeError
+                0x00000000000350b2       0x10 build/py/runtime.o
+                0x00000000000350b2                mp_raise_TypeError
+ .text.mp_raise_OSError
+                0x00000000000350c2       0x20 build/py/runtime.o
+                0x00000000000350c2                mp_raise_OSError
+ .text.mp_raise_NotImplementedError
+                0x00000000000350e2       0x10 build/py/runtime.o
+                0x00000000000350e2                mp_raise_NotImplementedError
+ .text.mp_raise_recursion_depth
+                0x00000000000350f2       0x1a build/py/runtime.o
+                0x00000000000350f2                mp_raise_recursion_depth
+ .text.mp_native_type_from_qstr
+                0x000000000003510c       0x74 build/py/nativeglue.o
+                0x000000000003510c                mp_native_type_from_qstr
+ .text.mp_stack_ctrl_init
+                0x0000000000035180        0xd build/py/stackctrl.o
+                0x0000000000035180                mp_stack_ctrl_init
+ .text.mp_stack_set_limit
+                0x000000000003518d        0x8 build/py/stackctrl.o
+                0x000000000003518d                mp_stack_set_limit
+ .text.mp_stack_check
+                0x0000000000035195       0x26 build/py/stackctrl.o
+                0x0000000000035195                mp_stack_check
+ .text.mp_arg_check_num_sig
+                0x00000000000351bb       0x77 build/py/argcheck.o
+                0x00000000000351bb                mp_arg_check_num_sig
+ .text.mp_arg_parse_all
+                0x0000000000035232      0x134 build/py/argcheck.o
+                0x0000000000035232                mp_arg_parse_all
+ .text.mp_arg_parse_all_kw_array
+                0x0000000000035366       0x56 build/py/argcheck.o
+                0x0000000000035366                mp_arg_parse_all_kw_array
+ .text.mp_arg_error_unimpl_kw
+                0x00000000000353bc        0xd build/py/argcheck.o
+                0x00000000000353bc                mp_arg_error_unimpl_kw
+ .text.get_hash_alloc_greater_or_equal_to
+                0x00000000000353c9       0x29 build/py/map.o
+ .text.mp_map_init
+                0x00000000000353f2       0x38 build/py/map.o
+                0x00000000000353f2                mp_map_init
+ .text.mp_map_init_fixed_table
+                0x000000000003542a       0x14 build/py/map.o
+                0x000000000003542a                mp_map_init_fixed_table
+ .text.mp_map_deinit
+                0x000000000003543e       0x20 build/py/map.o
+                0x000000000003543e                mp_map_deinit
+ .text.mp_map_clear
+                0x000000000003545e       0x31 build/py/map.o
+                0x000000000003545e                mp_map_clear
+ .text.mp_map_lookup
+                0x000000000003548f      0x230 build/py/map.o
+                0x000000000003548f                mp_map_lookup
+ .text.mp_map_rehash
+                0x00000000000356bf       0x8b build/py/map.o
+ .text.mp_obj_get_type
+                0x000000000003574a       0x19 build/py/obj.o
+                0x000000000003574a                mp_obj_get_type
+ .text.mp_obj_get_type_str
+                0x0000000000035763       0x10 build/py/obj.o
+                0x0000000000035763                mp_obj_get_type_str
+ .text.mp_obj_print_helper
+                0x0000000000035773       0x67 build/py/obj.o
+                0x0000000000035773                mp_obj_print_helper
+ .text.mp_obj_print_exception
+                0x00000000000357da      0x117 build/py/obj.o
+                0x00000000000357da                mp_obj_print_exception
+ .text.mp_obj_get_int
+                0x00000000000358f1       0x4b build/py/obj.o
+                0x00000000000358f1                mp_obj_get_int
+ .text.mp_obj_get_int_truncated
+                0x000000000003593c       0x22 build/py/obj.o
+                0x000000000003593c                mp_obj_get_int_truncated
+ .text.mp_obj_get_int_maybe
+                0x000000000003595e       0x4e build/py/obj.o
+                0x000000000003595e                mp_obj_get_int_maybe
+ .text.mp_obj_get_float_maybe
+                0x00000000000359ac       0x64 build/py/obj.o
+                0x00000000000359ac                mp_obj_get_float_maybe
+ .text.mp_obj_get_float
+                0x0000000000035a10       0x44 build/py/obj.o
+                0x0000000000035a10                mp_obj_get_float
+ .text.mp_obj_get_complex
+                0x0000000000035a54       0xb0 build/py/obj.o
+                0x0000000000035a54                mp_obj_get_complex
+ .text.mp_obj_get_array
+                0x0000000000035b04       0x49 build/py/obj.o
+                0x0000000000035b04                mp_obj_get_array
+ .text.mp_get_index
+                0x0000000000035b4d       0xc9 build/py/obj.o
+                0x0000000000035b4d                mp_get_index
+ .text.mp_obj_len_maybe
+                0x0000000000035c16       0x5a build/py/obj.o
+                0x0000000000035c16                mp_obj_len_maybe
+ .text.mp_obj_is_true
+                0x0000000000035c70       0x65 build/py/obj.o
+                0x0000000000035c70                mp_obj_is_true
+ .text.mp_obj_equal_not_equal
+                0x0000000000035cd5      0x165 build/py/obj.o
+                0x0000000000035cd5                mp_obj_equal_not_equal
+ .text.mp_obj_equal
+                0x0000000000035e3a       0x1a build/py/obj.o
+                0x0000000000035e3a                mp_obj_equal
+ .text.mp_obj_subscr
+                0x0000000000035e54       0x7c build/py/obj.o
+                0x0000000000035e54                mp_obj_subscr
+ .text.mp_identity_getiter
+                0x0000000000035ed0        0x4 build/py/obj.o
+                0x0000000000035ed0                mp_identity_getiter
+ .text.mp_get_buffer
+                0x0000000000035ed4       0x2a build/py/obj.o
+                0x0000000000035ed4                mp_get_buffer
+ .text.mp_get_buffer_raise
+                0x0000000000035efe       0x18 build/py/obj.o
+                0x0000000000035efe                mp_get_buffer_raise
+ .text.mp_generic_unary_op
+                0x0000000000035f16       0x10 build/py/obj.o
+                0x0000000000035f16                mp_generic_unary_op
+ .text.bool_binary_op
+                0x0000000000035f26       0x18 build/py/objbool.o
+ .text.bool_unary_op
+                0x0000000000035f3e       0x20 build/py/objbool.o
+ .text.bool_print
+                0x0000000000035f5e       0x1b build/py/objbool.o
+ .text.bool_make_new
+                0x0000000000035f79       0x3d build/py/objbool.o
+ .text.mp_call_method_self_n_kw
+                0x0000000000035fb6       0xb8 build/py/objboundmeth.o
+                0x0000000000035fb6                mp_call_method_self_n_kw
+ .text.complex_print
+                0x000000000003606e       0xd9 build/py/objcomplex.o
+ .text.complex_attr
+                0x0000000000036147       0x33 build/py/objcomplex.o
+ .text.mp_obj_new_complex
+                0x000000000003617a       0x3d build/py/objcomplex.o
+                0x000000000003617a                mp_obj_new_complex
+ .text.complex_unary_op
+                0x00000000000361b7       0x9e build/py/objcomplex.o
+ .text.mp_obj_complex_get
+                0x0000000000036255       0x45 build/py/objcomplex.o
+                0x0000000000036255                mp_obj_complex_get
+ .text.complex_make_new
+                0x000000000003629a      0x143 build/py/objcomplex.o
+ .text.mp_obj_complex_binary_op
+                0x00000000000363dd      0x2bc build/py/objcomplex.o
+                0x00000000000363dd                mp_obj_complex_binary_op
+ .text.complex_binary_op
+                0x0000000000036699       0x15 build/py/objcomplex.o
+ .text.dict_view_getiter
+                0x00000000000366ae       0x24 build/py/objdict.o
+ .text.dict_getiter
+                0x00000000000366d2       0x21 build/py/objdict.o
+ .text.dict_values
+                0x00000000000366f3       0x25 build/py/objdict.o
+ .text.mp_ensure_not_fixed
+                0x0000000000036718        0xf build/py/objdict.o
+ .text.dict_get_helper
+                0x0000000000036727       0x8a build/py/objdict.o
+ .text.dict_setdefault
+                0x00000000000367b1        0xa build/py/objdict.o
+ .text.dict_pop
+                0x00000000000367bb        0xa build/py/objdict.o
+ .text.dict_get
+                0x00000000000367c5        0x7 build/py/objdict.o
+ .text.dict_clear
+                0x00000000000367cc       0x19 build/py/objdict.o
+ .text.dict_unary_op
+                0x00000000000367e5       0x35 build/py/objdict.o
+ .text.mp_map_slot_is_filled
+                0x000000000003681a       0x41 build/py/objdict.o
+ .text.dict_iter_next
+                0x000000000003685b       0x84 build/py/objdict.o
+ .text.dict_view_it_iternext
+                0x00000000000368df       0x54 build/py/objdict.o
+ .text.dict_view_print
+                0x0000000000036933       0xac build/py/objdict.o
+ .text.dict_print
+                0x00000000000369df       0xa7 build/py/objdict.o
+ .text.dict_popitem
+                0x0000000000036a86       0x9e build/py/objdict.o
+ .text.dict_update
+                0x0000000000036b24      0x179 build/py/objdict.o
+ .text.dict_binary_op
+                0x0000000000036c9d       0xbe build/py/objdict.o
+ .text.dict_view_binary_op
+                0x0000000000036d5b       0x17 build/py/objdict.o
+ .text.dict_items
+                0x0000000000036d72       0x25 build/py/objdict.o
+ .text.dict_keys
+                0x0000000000036d97       0x25 build/py/objdict.o
+ .text.mp_obj_dict_get
+                0x0000000000036dbc       0x3b build/py/objdict.o
+                0x0000000000036dbc                mp_obj_dict_get
+ .text.mp_obj_dict_init
+                0x0000000000036df7       0x14 build/py/objdict.o
+                0x0000000000036df7                mp_obj_dict_init
+ .text.mp_obj_new_dict
+                0x0000000000036e0b       0x2d build/py/objdict.o
+                0x0000000000036e0b                mp_obj_new_dict
+ .text.dict_fromkeys
+                0x0000000000036e38       0x7c build/py/objdict.o
+ .text.dict_copy
+                0x0000000000036eb4       0x58 build/py/objdict.o
+ .text.dict_make_new
+                0x0000000000036f0c       0x71 build/py/objdict.o
+ .text.mp_obj_dict_store
+                0x0000000000036f7d       0x3a build/py/objdict.o
+                0x0000000000036f7d                mp_obj_dict_store
+ .text.mp_obj_dict_delete
+                0x0000000000036fb7       0x2e build/py/objdict.o
+                0x0000000000036fb7                mp_obj_dict_delete
+ .text.dict_subscr
+                0x0000000000036fe5       0x59 build/py/objdict.o
+ .text.mp_obj_exception_print
+                0x000000000003703e       0xba build/py/objexcept.o
+                0x000000000003703e                mp_obj_exception_print
+ .text.mp_obj_exception_make_new
+                0x00000000000370f8       0x98 build/py/objexcept.o
+                0x00000000000370f8                mp_obj_exception_make_new
+ .text.exc_add_strn
+                0x0000000000037190       0x82 build/py/objexcept.o
+ .text.mp_obj_exception_get_value
+                0x0000000000037212       0x15 build/py/objexcept.o
+                0x0000000000037212                mp_obj_exception_get_value
+ .text.mp_obj_exception_attr
+                0x0000000000037227       0x52 build/py/objexcept.o
+                0x0000000000037227                mp_obj_exception_attr
+ .text.mp_obj_new_exception
+                0x0000000000037279       0x38 build/py/objexcept.o
+                0x0000000000037279                mp_obj_new_exception
+ .text.mp_obj_new_exception_arg1
+                0x00000000000372b1       0x4b build/py/objexcept.o
+                0x00000000000372b1                mp_obj_new_exception_arg1
+ .text.mp_obj_new_exception_msg
+                0x00000000000372fc       0xad build/py/objexcept.o
+                0x00000000000372fc                mp_obj_new_exception_msg
+ .text.mp_obj_new_exception_msg_vlist
+                0x00000000000373a9      0x161 build/py/objexcept.o
+                0x00000000000373a9                mp_obj_new_exception_msg_vlist
+ .text.mp_obj_new_exception_msg_varg
+                0x000000000003750a       0x8f build/py/objexcept.o
+                0x000000000003750a                mp_obj_new_exception_msg_varg
+ .text.mp_obj_is_exception_type
+                0x0000000000037599       0x2e build/py/objexcept.o
+                0x0000000000037599                mp_obj_is_exception_type
+ .text.mp_obj_is_exception_instance
+                0x00000000000375c7        0xf build/py/objexcept.o
+                0x00000000000375c7                mp_obj_is_exception_instance
+ .text.mp_obj_exception_match
+                0x00000000000375d6       0x30 build/py/objexcept.o
+                0x00000000000375d6                mp_obj_exception_match
+ .text.mp_obj_exception_add_traceback
+                0x0000000000037606       0xd0 build/py/objexcept.o
+                0x0000000000037606                mp_obj_exception_add_traceback
+ .text.mp_obj_exception_get_traceback
+                0x00000000000376d6       0x7c build/py/objexcept.o
+                0x00000000000376d6                mp_obj_exception_get_traceback
+ .text.mp_obj_float_divmod
+                0x0000000000037752       0xc4 build/py/objfloat.o
+ .text.mp_obj_new_float
+                0x0000000000037816       0x2e build/py/objfloat.o
+                0x0000000000037816                mp_obj_new_float
+ .text.float_make_new
+                0x0000000000037844       0x84 build/py/objfloat.o
+ .text.mp_obj_float_get
+                0x00000000000378c8       0x38 build/py/objfloat.o
+                0x00000000000378c8                mp_obj_float_get
+ .text.float_unary_op
+                0x0000000000037900       0x77 build/py/objfloat.o
+ .text.float_print
+                0x0000000000037977       0x87 build/py/objfloat.o
+ .text.mp_obj_float_binary_op
+                0x00000000000379fe      0x28f build/py/objfloat.o
+                0x00000000000379fe                mp_obj_float_binary_op
+ .text.float_binary_op
+                0x0000000000037c8d       0x46 build/py/objfloat.o
+ .text.fun_builtin_var_call
+                0x0000000000037cd3       0xa2 build/py/objfun.o
+ .text.fun_builtin_0_call
+                0x0000000000037d75       0x49 build/py/objfun.o
+ .text.fun_builtin_1_call
+                0x0000000000037dbe       0x58 build/py/objfun.o
+ .text.fun_builtin_2_call
+                0x0000000000037e16       0x5c build/py/objfun.o
+ .text.fun_builtin_3_call
+                0x0000000000037e72       0x5f build/py/objfun.o
+ .text.it_iternext
+                0x0000000000037ed1       0x77 build/py/objgetitemiter.o
+ .text.mp_obj_new_getitem_iter
+                0x0000000000037f48       0x25 build/py/objgetitemiter.o
+                0x0000000000037f48                mp_obj_new_getitem_iter
+ .text.int_to_bytes
+                0x0000000000037f6d       0xb3 build/py/objint.o
+ .text.int_from_bytes
+                0x0000000000038020       0x93 build/py/objint.o
+ .text.mp_obj_new_int_from_float
+                0x00000000000380b3       0xb6 build/py/objint.o
+                0x00000000000380b3                mp_obj_new_int_from_float
+ .text.mp_obj_int_make_new
+                0x0000000000038169       0xfa build/py/objint.o
+ .text.mp_int_format_size
+                0x0000000000038263       0x78 build/py/objint.o
+                0x0000000000038263                mp_int_format_size
+ .text.mp_obj_int_formatted
+                0x00000000000382db      0x1fa build/py/objint.o
+                0x00000000000382db                mp_obj_int_formatted
+ .text.mp_obj_int_print
+                0x00000000000384d5       0x63 build/py/objint.o
+                0x00000000000384d5                mp_obj_int_print
+ .text.mp_obj_int_binary_op_extra_cases
+                0x0000000000038538       0x70 build/py/objint.o
+                0x0000000000038538                mp_obj_int_binary_op_extra_cases
+ .text.mp_obj_int_new_mpz
+                0x00000000000385a8       0x30 build/py/objint_mpz.o
+                0x00000000000385a8                mp_obj_int_new_mpz
+ .text.mp_obj_int_formatted_impl
+                0x00000000000385d8       0xd5 build/py/objint_mpz.o
+                0x00000000000385d8                mp_obj_int_formatted_impl
+ .text.mp_obj_int_from_bytes_impl
+                0x00000000000386ad       0x3c build/py/objint_mpz.o
+                0x00000000000386ad                mp_obj_int_from_bytes_impl
+ .text.mp_obj_int_to_bytes_impl
+                0x00000000000386e9       0x52 build/py/objint_mpz.o
+                0x00000000000386e9                mp_obj_int_to_bytes_impl
+ .text.mp_obj_int_sign
+                0x000000000003873b       0x2e build/py/objint_mpz.o
+                0x000000000003873b                mp_obj_int_sign
+ .text.mp_obj_int_unary_op
+                0x0000000000038769       0xa1 build/py/objint_mpz.o
+                0x0000000000038769                mp_obj_int_unary_op
+ .text.mp_obj_new_int_from_ll
+                0x000000000003880a       0x2e build/py/objint_mpz.o
+                0x000000000003880a                mp_obj_new_int_from_ll
+ .text.mp_obj_new_int
+                0x0000000000038838       0x16 build/py/objint_mpz.o
+                0x0000000000038838                mp_obj_new_int
+ .text.mp_obj_new_int_from_ull
+                0x000000000003884e       0x2b build/py/objint_mpz.o
+                0x000000000003884e                mp_obj_new_int_from_ull
+ .text.mp_obj_new_int_from_uint
+                0x0000000000038879       0x1c build/py/objint_mpz.o
+                0x0000000000038879                mp_obj_new_int_from_uint
+ .text.mp_obj_new_int_from_str_len
+                0x0000000000038895       0x47 build/py/objint_mpz.o
+                0x0000000000038895                mp_obj_new_int_from_str_len
+ .text.mp_obj_int_get_truncated
+                0x00000000000388dc       0x16 build/py/objint_mpz.o
+                0x00000000000388dc                mp_obj_int_get_truncated
+ .text.mp_obj_int_get_checked
+                0x00000000000388f2       0x40 build/py/objint_mpz.o
+                0x00000000000388f2                mp_obj_int_get_checked
+ .text.mp_obj_int_binary_op
+                0x0000000000038932      0x3dc build/py/objint_mpz.o
+                0x0000000000038932                mp_obj_int_binary_op
+ .text.mp_obj_int_as_float_impl
+                0x0000000000038d0e       0x3b build/py/objint_mpz.o
+                0x0000000000038d0e                mp_obj_int_as_float_impl
+ .text.list_unary_op
+                0x0000000000038d49       0x2a build/py/objlist.o
+ .text.list_getiter
+                0x0000000000038d73       0x25 build/py/objlist.o
+ .text.list_reverse
+                0x0000000000038d98       0x49 build/py/objlist.o
+ .text.list_it_iternext
+                0x0000000000038de1       0x24 build/py/objlist.o
+ .text.mp_obj_list_append
+                0x0000000000038e05       0x6a build/py/objlist.o
+                0x0000000000038e05                mp_obj_list_append
+ .text.list_insert
+                0x0000000000038e6f       0x5f build/py/objlist.o
+ .text.list_clear
+                0x0000000000038ece       0x3c build/py/objlist.o
+ .text.mp_quicksort
+                0x0000000000038f0a      0x13d build/py/objlist.o
+ .text.mp_obj_list_sort
+                0x0000000000039047       0x64 build/py/objlist.o
+                0x0000000000039047                mp_obj_list_sort
+ .text.list_index
+                0x00000000000390ab       0x16 build/py/objlist.o
+ .text.list_pop
+                0x00000000000390c1       0xb9 build/py/objlist.o
+ .text.mp_obj_list_remove
+                0x000000000003917a       0x3b build/py/objlist.o
+                0x000000000003917a                mp_obj_list_remove
+ .text.list_extend_from_iter
+                0x00000000000391b5       0x36 build/py/objlist.o
+ .text.list_count
+                0x00000000000391eb       0x10 build/py/objlist.o
+ .text.list_print
+                0x00000000000391fb       0x6a build/py/objlist.o
+ .text.list_extend
+                0x0000000000039265       0xa1 build/py/objlist.o
+ .text.mp_obj_list_init
+                0x0000000000039306       0x4f build/py/objlist.o
+                0x0000000000039306                mp_obj_list_init
+ .text.list_new
+                0x0000000000039355       0x2d build/py/objlist.o
+ .text.list_binary_op
+                0x0000000000039382      0x14f build/py/objlist.o
+ .text.list_make_new
+                0x00000000000394d1       0x3c build/py/objlist.o
+ .text.mp_obj_new_list
+                0x000000000003950d       0x36 build/py/objlist.o
+                0x000000000003950d                mp_obj_new_list
+ .text.list_copy
+                0x0000000000039543        0xd build/py/objlist.o
+ .text.mp_obj_list_get
+                0x0000000000039550        0xf build/py/objlist.o
+                0x0000000000039550                mp_obj_list_get
+ .text.mp_obj_list_store
+                0x000000000003955f       0x2c build/py/objlist.o
+                0x000000000003955f                mp_obj_list_store
+ .text.list_subscr
+                0x000000000003958b      0x29b build/py/objlist.o
+ .text.object___init__
+                0x0000000000039826        0x6 build/py/objobject.o
+ .text.object___new__
+                0x000000000003982c       0x3e build/py/objobject.o
+ .text.object_make_new
+                0x000000000003986a       0x20 build/py/objobject.o
+ .text.polymorph_it_iternext
+                0x000000000003988a        0x3 build/py/objpolyiter.o
+ .text.property_deleter
+                0x000000000003988d       0x29 build/py/objproperty.o
+ .text.property_setter
+                0x00000000000398b6       0x29 build/py/objproperty.o
+ .text.property_getter
+                0x00000000000398df       0x29 build/py/objproperty.o
+ .text.property_make_new
+                0x0000000000039908       0x52 build/py/objproperty.o
+ .text.mp_obj_property_get
+                0x000000000003995a        0x5 build/py/objproperty.o
+                0x000000000003995a                mp_obj_property_get
+ .text.none_print
+                0x000000000003995f        0xc build/py/objnone.o
+ .text.singleton_print
+                0x000000000003996b       0x12 build/py/objsingleton.o
+ .text.slice_print
+                0x000000000003997d       0x78 build/py/objslice.o
+ .text.mp_obj_slice_indices
+                0x00000000000399f5      0x11a build/py/objslice.o
+                0x00000000000399f5                mp_obj_slice_indices
+ .text.arg_looks_integer
+                0x0000000000039b0f       0x33 build/py/objstr.o
+ .text.arg_looks_numeric
+                0x0000000000039b42       0x2e build/py/objstr.o
+ .text.mp_obj_new_bytes_iterator
+                0x0000000000039b70       0x25 build/py/objstr.o
+ .text.bytes_it_iternext
+                0x0000000000039b95       0x5d build/py/objstr.o
+ .text.bad_implicit_conversion
+                0x0000000000039bf2       0x33 build/py/objstr.o
+ .text.str_count
+                0x0000000000039c25      0x15e build/py/objstr.o
+ .text.str_uni_istype
+                0x0000000000039d83       0xbb build/py/objstr.o
+ .text.str_isspace
+                0x0000000000039e3e        0xf build/py/objstr.o
+ .text.str_isalpha
+                0x0000000000039e4d        0xf build/py/objstr.o
+ .text.str_isdigit
+                0x0000000000039e5c        0xf build/py/objstr.o
+ .text.str_isupper
+                0x0000000000039e6b        0xf build/py/objstr.o
+ .text.str_islower
+                0x0000000000039e7a        0xf build/py/objstr.o
+ .text.str_to_int
+                0x0000000000039e89       0x39 build/py/objstr.o
+ .text.mp_obj_str_get_buffer
+                0x0000000000039ec2       0x57 build/py/objstr.o
+                0x0000000000039ec2                mp_obj_str_get_buffer
+ .text.mp_str_print_quoted
+                0x0000000000039f19      0x117 build/py/objstr.o
+                0x0000000000039f19                mp_str_print_quoted
+ .text.str_print
+                0x000000000003a030       0x8c build/py/objstr.o
+ .text.find_subbytes
+                0x000000000003a0bc       0x78 build/py/objstr.o
+                0x000000000003a0bc                find_subbytes
+ .text.str_finder
+                0x000000000003a134      0x17c build/py/objstr.o
+ .text.str_find
+                0x000000000003a2b0        0xc build/py/objstr.o
+ .text.str_rfind
+                0x000000000003a2bc        0xa build/py/objstr.o
+ .text.str_index
+                0x000000000003a2c6        0xf build/py/objstr.o
+ .text.str_rindex
+                0x000000000003a2d5        0xd build/py/objstr.o
+ .text.mp_obj_new_str_copy
+                0x000000000003a2e2       0x61 build/py/objstr.o
+                0x000000000003a2e2                mp_obj_new_str_copy
+ .text.mp_obj_new_str_via_qstr
+                0x000000000003a343       0x10 build/py/objstr.o
+                0x000000000003a343                mp_obj_new_str_via_qstr
+ .text.mp_obj_new_str_from_vstr
+                0x000000000003a353       0xb1 build/py/objstr.o
+                0x000000000003a353                mp_obj_new_str_from_vstr
+ .text.str_join
+                0x000000000003a404      0x1a8 build/py/objstr.o
+ .text.str_replace
+                0x000000000003a5ac      0x27c build/py/objstr.o
+ .text.str_caseconv
+                0x000000000003a828       0x96 build/py/objstr.o
+ .text.str_lower
+                0x000000000003a8be        0xf build/py/objstr.o
+ .text.str_upper
+                0x000000000003a8cd        0xf build/py/objstr.o
+ .text.mp_obj_new_str
+                0x000000000003a8dc       0x38 build/py/objstr.o
+                0x000000000003a8dc                mp_obj_new_str
+ .text.mp_obj_str_make_new
+                0x000000000003a914      0x185 build/py/objstr.o
+                0x000000000003a914                mp_obj_str_make_new
+ .text.bytes_decode
+                0x000000000003aa99       0x3f build/py/objstr.o
+ .text.mp_obj_new_bytes
+                0x000000000003aad8       0x12 build/py/objstr.o
+                0x000000000003aad8                mp_obj_new_bytes
+ .text.bytes_make_new.part.0
+                0x000000000003aaea      0x1c9 build/py/objstr.o
+ .text.bytes_make_new
+                0x000000000003acb3       0x23 build/py/objstr.o
+ .text.str_encode
+                0x000000000003acd6       0x3a build/py/objstr.o
+ .text.mp_obj_new_str_of_type
+                0x000000000003ad10       0x1f build/py/objstr.o
+                0x000000000003ad10                mp_obj_new_str_of_type
+ .text.str_uni_strip
+                0x000000000003ad2f      0x1ee build/py/objstr.o
+ .text.str_strip
+                0x000000000003af1d       0x10 build/py/objstr.o
+ .text.str_lstrip
+                0x000000000003af2d        0xd build/py/objstr.o
+ .text.str_rstrip
+                0x000000000003af3a       0x10 build/py/objstr.o
+ .text.bytes_subscr
+                0x000000000003af4a       0xc5 build/py/objstr.o
+ .text.mp_obj_str_equal
+                0x000000000003b00f       0xeb build/py/objstr.o
+                0x000000000003b00f                mp_obj_str_equal
+ .text.mp_obj_str_get_qstr
+                0x000000000003b0fa       0x39 build/py/objstr.o
+                0x000000000003b0fa                mp_obj_str_get_qstr
+ .text.mp_obj_str_get_data
+                0x000000000003b133       0x5c build/py/objstr.o
+                0x000000000003b133                mp_obj_str_get_data
+ .text.mp_obj_str_binary_op
+                0x000000000003b18f      0x881 build/py/objstr.o
+                0x000000000003b18f                mp_obj_str_binary_op
+ .text.mp_obj_str_split
+                0x000000000003ba10      0x201 build/py/objstr.o
+                0x000000000003ba10                mp_obj_str_split
+ .text.str_rsplit
+                0x000000000003bc11      0x1d3 build/py/objstr.o
+ .text.str_startswith
+                0x000000000003bde4       0xbe build/py/objstr.o
+ .text.str_endswith
+                0x000000000003bea2       0x91 build/py/objstr.o
+ .text.mp_obj_str_format_helper
+                0x000000000003bf33      0x8cd build/py/objstr.o
+ .text.mp_obj_str_format
+                0x000000000003c800       0x8d build/py/objstr.o
+                0x000000000003c800                mp_obj_str_format
+ .text.mp_obj_new_str_iterator
+                0x000000000003c88d       0x25 build/py/objstrunicode.o
+ .text.str_it_iternext
+                0x000000000003c8b2       0x75 build/py/objstrunicode.o
+ .text.uni_unary_op
+                0x000000000003c927       0x6d build/py/objstrunicode.o
+ .text.uni_print
+                0x000000000003c994      0x199 build/py/objstrunicode.o
+ .text.str_index_to_ptr
+                0x000000000003cb2d      0x116 build/py/objstrunicode.o
+                0x000000000003cb2d                str_index_to_ptr
+ .text.str_subscr
+                0x000000000003cc43      0x184 build/py/objstrunicode.o
+ .text.tuple_it_iternext
+                0x000000000003cdc7       0x21 build/py/objtuple.o
+ .text.mp_obj_tuple_getiter
+                0x000000000003cde8       0x25 build/py/objtuple.o
+                0x000000000003cde8                mp_obj_tuple_getiter
+ .text.mp_obj_tuple_print
+                0x000000000003ce0d       0x7d build/py/objtuple.o
+                0x000000000003ce0d                mp_obj_tuple_print
+ .text.tuple_index
+                0x000000000003ce8a       0x16 build/py/objtuple.o
+ .text.tuple_count
+                0x000000000003cea0       0x10 build/py/objtuple.o
+ .text.mp_obj_tuple_unary_op
+                0x000000000003ceb0       0x6a build/py/objtuple.o
+                0x000000000003ceb0                mp_obj_tuple_unary_op
+ .text.mp_obj_new_tuple
+                0x000000000003cf1a       0x4e build/py/objtuple.o
+                0x000000000003cf1a                mp_obj_new_tuple
+ .text.mp_obj_tuple_binary_op
+                0x000000000003cf68      0x164 build/py/objtuple.o
+                0x000000000003cf68                mp_obj_tuple_binary_op
+ .text.mp_obj_tuple_subscr
+                0x000000000003d0cc       0x8c build/py/objtuple.o
+                0x000000000003d0cc                mp_obj_tuple_subscr
+ .text.mp_obj_tuple_make_new
+                0x000000000003d158       0xbc build/py/objtuple.o
+ .text.mp_obj_tuple_get
+                0x000000000003d214       0x56 build/py/objtuple.o
+                0x000000000003d214                mp_obj_tuple_get
+ .text.instance_count_native_bases
+                0x000000000003d26a       0xad build/py/objtype.o
+ .text.native_base_init_wrapper
+                0x000000000003d317       0x50 build/py/objtype.o
+ .text.type_print
+                0x000000000003d367       0x12 build/py/objtype.o
+ .text.mp_map_slot_is_filled
+                0x000000000003d379       0x41 build/py/objtype.o
+ .text.type_call
+                0x000000000003d3ba       0x23 build/py/objtype.o
+ .text.mp_obj_class_lookup
+                0x000000000003d3dd      0x241 build/py/objtype.o
+ .text.mp_obj_instance_getiter
+                0x000000000003d61e       0x9a build/py/objtype.o
+                0x000000000003d61e                mp_obj_instance_getiter
+ .text.instance_subscr
+                0x000000000003d6b8       0xe4 build/py/objtype.o
+ .text.mp_obj_instance_attr
+                0x000000000003d79c      0x299 build/py/objtype.o
+ .text.instance_binary_op
+                0x000000000003da35       0xad build/py/objtype.o
+ .text.instance_unary_op
+                0x000000000003dae2       0xfb build/py/objtype.o
+ .text.instance_print
+                0x000000000003dbdd      0x123 build/py/objtype.o
+ .text.instance_get_buffer
+                0x000000000003dd00       0x78 build/py/objtype.o
+ .text.static_class_method_make_new
+                0x000000000003dd78       0x6a build/py/objtype.o
+ .text.type_attr
+                0x000000000003dde2      0x1a1 build/py/objtype.o
+ .text.mp_obj_instance_call
+                0x000000000003df83       0xbe build/py/objtype.o
+                0x000000000003df83                mp_obj_instance_call
+ .text.mp_obj_new_instance
+                0x000000000003e041       0x72 build/py/objtype.o
+                0x000000000003e041                mp_obj_new_instance
+ .text.mp_obj_instance_make_new
+                0x000000000003e0b3      0x25c build/py/objtype.o
+                0x000000000003e0b3                mp_obj_instance_make_new
+ .text.mp_obj_new_type
+                0x000000000003e30f      0x247 build/py/objtype.o
+                0x000000000003e30f                mp_obj_new_type
+ .text.type_make_new
+                0x000000000003e556       0x60 build/py/objtype.o
+ .text.mp_obj_is_subclass_fast
+                0x000000000003e5b6       0x6c build/py/objtype.o
+                0x000000000003e5b6                mp_obj_is_subclass_fast
+ .text.mp_obj_cast_to_native_base
+                0x000000000003e622       0x3d build/py/objtype.o
+                0x000000000003e622                mp_obj_cast_to_native_base
+ .text.op_getitem
+                0x000000000003e65f       0x2a build/py/opmethods.o
+ .text.op_setitem
+                0x000000000003e689       0x31 build/py/opmethods.o
+ .text.op_delitem
+                0x000000000003e6ba       0x27 build/py/opmethods.o
+ .text.mp_seq_multiply
+                0x000000000003e6e1       0x26 build/py/sequence.o
+                0x000000000003e6e1                mp_seq_multiply
+ .text.mp_seq_get_fast_slice_indexes
+                0x000000000003e707       0x4b build/py/sequence.o
+                0x000000000003e707                mp_seq_get_fast_slice_indexes
+ .text.mp_seq_extract_slice
+                0x000000000003e752       0x61 build/py/sequence.o
+                0x000000000003e752                mp_seq_extract_slice
+ .text.mp_seq_cmp_bytes
+                0x000000000003e7b3       0x93 build/py/sequence.o
+                0x000000000003e7b3                mp_seq_cmp_bytes
+ .text.mp_seq_cmp_objs
+                0x000000000003e846       0xd9 build/py/sequence.o
+                0x000000000003e846                mp_seq_cmp_objs
+ .text.mp_seq_index_obj
+                0x000000000003e91f       0xa9 build/py/sequence.o
+                0x000000000003e91f                mp_seq_index_obj
+ .text.mp_seq_count_obj
+                0x000000000003e9c8       0x43 build/py/sequence.o
+                0x000000000003e9c8                mp_seq_count_obj
+ .text.mp_binary_set_int
+                0x000000000003ea0b       0x3c build/py/binary.o
+                0x000000000003ea0b                mp_binary_set_int
+ .text.mp_builtin_next
+                0x000000000003ea47       0x1b build/py/modbuiltins.o
+ .text.mp_opcode_format
+                0x000000000003ea62       0x7f build/py/bc.o
+                0x000000000003ea62                mp_opcode_format
+ .text.mp_small_int_mul_overflow
+                0x000000000003eae1       0x60 build/py/smallint.o
+                0x000000000003eae1                mp_small_int_mul_overflow
+ .text.mp_small_int_modulo
+                0x000000000003eb41       0x24 build/py/smallint.o
+                0x000000000003eb41                mp_small_int_modulo
+ .text.mp_small_int_floor_divide
+                0x000000000003eb65       0x29 build/py/smallint.o
+                0x000000000003eb65                mp_small_int_floor_divide
+ .text.stderr_print_strn
+                0x000000000003eb8e        0xa build/main.o
+ .text.usage.isra.0
+                0x000000000003eb98       0x3a build/main.o
+ .text.main_    0x000000000003ebd2      0x6a2 build/main.o
+                0x000000000003ebd2                main_
+ .text.nlr_jump_fail
+                0x000000000003f274       0x23 build/main.o
+                0x000000000003f274                nlr_jump_fail
+ .text.gc_collect
+                0x000000000003f297       0x11 build/gccollect.o
+                0x000000000003f297                gc_collect
+ .text.gc_helper_collect_regs_and_stack
+                0x000000000003f2a8       0x50 build/lib/utils/gchelper_generic.o
+                0x000000000003f2a8                gc_helper_collect_regs_and_stack
+ *fill*         0x000000000003f2f8        0x8 
+ .text          0x000000000003f300       0x61 /usr/lib/x86_64-linux-gnu/libc_nonshared.a(elf-init.oS)
+                0x000000000003f300                __libc_csu_init
+                0x000000000003f360                __libc_csu_fini
+ *(.gnu.warning)
+
+.fini           0x000000000003f364        0x9
+ *(SORT_NONE(.fini))
+ .fini          0x000000000003f364        0x4 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/crti.o
+                0x000000000003f364                _fini
+ .fini          0x000000000003f368        0x5 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/crtn.o
+                [!provide]                        PROVIDE (__etext = .)
+                [!provide]                        PROVIDE (_etext = .)
+                [!provide]                        PROVIDE (etext = .)
+                0x0000000000040000                . = ALIGN (CONSTANT (MAXPAGESIZE))
+                0x0000000000040000                . = SEGMENT_START ("rodata-segment", (ALIGN (CONSTANT (MAXPAGESIZE)) + (. & (CONSTANT (MAXPAGESIZE) - 0x1))))
+
+.rodata         0x0000000000040000     0x772c
+ *(.rodata .rodata.* .gnu.linkonce.r.*)
+ .rodata.gc_free.part.0.str1.1
+                0x0000000000040000       0x1b build/py/gc.o
+ *fill*         0x000000000004001b        0x5 
+ .rodata.gc_free.part.0.str1.8
+                0x0000000000040020       0x1f build/py/gc.o
+ .rodata.gc_realloc.str1.1
+                0x000000000004003f       0x1c build/py/gc.o
+ *fill*         0x000000000004005b        0x5 
+ .rodata.__PRETTY_FUNCTION__.0
+                0x0000000000040060        0xb build/py/gc.o
+ *fill*         0x000000000004006b        0x5 
+ .rodata.__PRETTY_FUNCTION__.1
+                0x0000000000040070        0x8 build/py/gc.o
+ *fill*         0x0000000000040078        0x8 
+ .rodata.cst16  0x0000000000040080       0x10 build/py/gc.o
+ .rodata.qstr_from_strn.str1.1
+                0x0000000000040090        0xe build/py/qstr.o
+ .rodata        0x000000000004009e       0x48 build/py/qstr.o
+ .rodata.str1.1
+                0x00000000000400e6      0xdc3 build/py/qstr.o
+ .rodata.vstr_add_char.str1.1
+                0x0000000000040ea9       0x1a build/py/vstr.o
+ *fill*         0x0000000000040ec3        0x5 
+ .rodata.__PRETTY_FUNCTION__.0
+                0x0000000000040ec8        0xe build/py/vstr.o
+ .rodata.mp_print_mp_int.str1.1
+                0x0000000000040ed6       0x43 build/py/mpprint.o
+                                         0x44 (размер перед о�лаблением)
+ .rodata.mp_vprintf.str1.1
+                0x0000000000040f19       0x33 build/py/mpprint.o
+                                         0x39 (размер перед о�лаблением)
+ .rodata.mp_vprintf
+                0x0000000000040f4c       0x84 build/py/mpprint.o
+ .rodata.__PRETTY_FUNCTION__.0
+                0x0000000000040fd0        0xb build/py/mpprint.o
+ *fill*         0x0000000000040fdb        0x5 
+ .rodata.__PRETTY_FUNCTION__.1
+                0x0000000000040fe0       0x10 build/py/mpprint.o
+ .rodata.pad_zeroes
+                0x0000000000040ff0       0x11 build/py/mpprint.o
+ *fill*         0x0000000000041001        0xf 
+ .rodata.pad_spaces
+                0x0000000000041010       0x11 build/py/mpprint.o
+ *fill*         0x0000000000041021       0x1f 
+ .rodata.attr   0x0000000000041040       0x80 build/py/unicode.o
+ .rodata.mpz_clone.str1.1
+                0x00000000000410c0       0x1c build/py/mpz.o
+ .rodata.mpz_need_dig.str1.1
+                0x00000000000410dc        0xe build/py/mpz.o
+ .rodata.mpz_set_from_str.str1.1
+                0x00000000000410ea        0xb build/py/mpz.o
+ .rodata.mpz_or_inpl.str1.1
+                0x00000000000410f5        0xc build/py/mpz.o
+ .rodata.mpz_divmod_inpl.str1.1
+                0x0000000000041101       0x12 build/py/mpz.o
+ .rodata.mpz_as_str_inpl.str1.1
+                0x0000000000041113       0x24 build/py/mpz.o
+ *fill*         0x0000000000041137        0x9 
+ .rodata.__PRETTY_FUNCTION__.0
+                0x0000000000041140       0x10 build/py/mpz.o
+ .rodata.__PRETTY_FUNCTION__.1
+                0x0000000000041150       0x10 build/py/mpz.o
+ .rodata.__PRETTY_FUNCTION__.2
+                0x0000000000041160        0xa build/py/mpz.o
+ *fill*         0x000000000004116a        0x6 
+ .rodata.__PRETTY_FUNCTION__.3
+                0x0000000000041170        0xb build/py/mpz.o
+ *fill*         0x000000000004117b        0x5 
+ .rodata.__PRETTY_FUNCTION__.4
+                0x0000000000041180       0x11 build/py/mpz.o
+ *fill*         0x0000000000041191        0x7 
+ .rodata.__PRETTY_FUNCTION__.5
+                0x0000000000041198        0xd build/py/mpz.o
+ *fill*         0x00000000000411a5        0x3 
+ .rodata.cst8   0x00000000000411a8        0x8 build/py/mpz.o
+ .rodata.cst16  0x00000000000411b0       0x10 build/py/mpz.o
+ .rodata.mp_lexer_to_next.str1.1
+                0x00000000000411c0       0x58 build/py/lexer.o
+ .rodata.mp_lexer_to_next
+                0x0000000000041218       0x74 build/py/lexer.o
+ .rodata.str1.1
+                0x000000000004128c       0x89 build/py/lexer.o
+                                         0xc8 (размер перед о�лаблением)
+ *fill*         0x0000000000041315        0xb 
+ .rodata.tok_enc_kind
+                0x0000000000041320       0x2b build/py/lexer.o
+ .rodata.peek_result.str1.1
+                0x000000000004134b       0x2d build/py/parse.o
+ .rodata.pop_result.str1.1
+                0x0000000000041378       0x1d build/py/parse.o
+ .rodata.push_rule_from_arg.str1.1
+                0x0000000000041395       0x5f build/py/parse.o
+ .rodata.push_result_rule.str1.1
+                0x00000000000413f4       0x8f build/py/parse.o
+ .rodata.mp_parse.str1.1
+                0x0000000000041483       0xf3 build/py/parse.o
+ *fill*         0x0000000000041576        0x2 
+ .rodata.__PRETTY_FUNCTION__.0
+                0x0000000000041578        0xf build/py/parse.o
+ *fill*         0x0000000000041587        0x9 
+ .rodata.__PRETTY_FUNCTION__.1
+                0x0000000000041590       0x13 build/py/parse.o
+ *fill*         0x00000000000415a3        0x5 
+ .rodata.__PRETTY_FUNCTION__.2
+                0x00000000000415a8        0xb build/py/parse.o
+ *fill*         0x00000000000415b3        0x5 
+ .rodata.__PRETTY_FUNCTION__.3
+                0x00000000000415b8        0xc build/py/parse.o
+ *fill*         0x00000000000415c4        0x4 
+ .rodata.__PRETTY_FUNCTION__.4
+                0x00000000000415c8        0x9 build/py/parse.o
+ *fill*         0x00000000000415d1        0xf 
+ .rodata.mp_constants_table
+                0x00000000000415e0        0x0 build/py/parse.o
+ .rodata.rule_arg_offset_table
+                0x00000000000415e0       0xaf build/py/parse.o
+ *fill*         0x000000000004168f       0x11 
+ .rodata.rule_arg_combined_table
+                0x00000000000416a0      0x37e build/py/parse.o
+ *fill*         0x0000000000041a1e        0x2 
+ .rodata.rule_act_table
+                0x0000000000041a20       0xaf build/py/parse.o
+ .rodata.scope_new.str1.1
+                0x0000000000041acf       0x2a build/py/scope.o
+ .rodata.scope_check_to_close_over.str1.1
+                0x0000000000041af9       0x51 build/py/scope.o
+ *fill*         0x0000000000041b4a        0x6 
+ .rodata.__PRETTY_FUNCTION__.0
+                0x0000000000041b50       0x1c build/py/scope.o
+ *fill*         0x0000000000041b6c        0x4 
+ .rodata.__PRETTY_FUNCTION__.1
+                0x0000000000041b70        0xa build/py/scope.o
+ .rodata.scope_simple_name_table
+                0x0000000000041b7a        0x7 build/py/scope.o
+ .rodata.do_import_name.str1.1
+                0x0000000000041b81       0x41 build/py/compile.o
+ .rodata.compile_decrease_except_level.str1.1
+                0x0000000000041bc2       0x1b build/py/compile.o
+ .rodata.compile_scope_inline_asm.str1.1
+                0x0000000000041bdd      0x1a5 build/py/compile.o
+ .rodata.compile_star_expr.str1.1
+                0x0000000000041d82       0x1d build/py/compile.o
+ .rodata.compile_break_cont_stmt.str1.1
+                0x0000000000041d9f       0x5c build/py/compile.o
+ .rodata.compile_viper_type_annotation.str1.1
+                0x0000000000041dfb       0x12 build/py/compile.o
+                                         0x33 (размер перед о�лаблением)
+ .rodata.compile_scope_func_lambda_param.str1.1
+                0x0000000000041e0d       0x7a build/py/compile.o
+                                         0xa5 (размер перед о�лаблением)
+ .rodata.compile_import_from.str1.1
+                0x0000000000041e87       0x83 build/py/compile.o
+ .rodata.compile_node.str1.1
+                0x0000000000041f0a       0x32 build/py/compile.o
+ .rodata.c_assign.str1.1
+                0x0000000000041f3c       0xc6 build/py/compile.o
+                                         0xea (размер перед о�лаблением)
+ .rodata.c_assign_tuple.str1.1
+                0x0000000000042002       0x1a build/py/compile.o
+ .rodata.compile_yield_expr.str1.1
+                0x000000000004201c       0x19 build/py/compile.o
+ .rodata.compile_comprehension.str1.1
+                0x0000000000042035       0x62 build/py/compile.o
+ .rodata.compile_trailer_paren_helper.str1.1
+                0x0000000000042097       0x8d build/py/compile.o
+ .rodata.compile_subscript.str1.1
+                0x0000000000042124       0x85 build/py/compile.o
+ .rodata.compile_atom_paren.str1.1
+                0x00000000000421a9       0x26 build/py/compile.o
+ .rodata.compile_atom_expr_normal.str1.1
+                0x00000000000421cf       0x18 build/py/compile.o
+ .rodata.compile_comparison.str1.1
+                0x00000000000421e7       0x3d build/py/compile.o
+ .rodata.compile_funcdef_lambdef_param.str1.1
+                0x0000000000042224       0x4d build/py/compile.o
+ .rodata.compile_try_except.str1.1
+                0x0000000000042271       0x5e build/py/compile.o
+ .rodata.compile_try_finally.str1.1
+                0x00000000000422cf       0x1f build/py/compile.o
+ .rodata.compile_for_stmt.str1.1
+                0x00000000000422ee       0x24 build/py/compile.o
+ .rodata.compile_async_stmt.str1.1
+                0x0000000000042312       0x5d build/py/compile.o
+ .rodata.c_del_stmt.str1.1
+                0x000000000004236f       0x71 build/py/compile.o
+ .rodata.compile_expr_stmt.str1.1
+                0x00000000000423e0       0x27 build/py/compile.o
+ .rodata.compile_decorated.str1.1
+                0x0000000000042407       0xe2 build/py/compile.o
+ .rodata.compile_atom_bracket.str1.1
+                0x00000000000424e9       0x26 build/py/compile.o
+ .rodata.compile_scope_comp_iter.str1.1
+                0x000000000004250f       0x4c build/py/compile.o
+ .rodata.compile_scope.str1.1
+                0x000000000004255b       0xb5 build/py/compile.o
+ .rodata.compile_test_if_expr.str1.1
+                0x0000000000042610       0x3d build/py/compile.o
+ .rodata.compile_if_stmt.str1.1
+                0x000000000004264d       0x3a build/py/compile.o
+ .rodata.compile_atom_expr_await.str1.1
+                0x0000000000042687       0x19 build/py/compile.o
+ .rodata.compile_factor_2.str1.1
+                0x00000000000426a0       0x34 build/py/compile.o
+ .rodata.compile_return_stmt.str1.1
+                0x00000000000426a0       0x1a build/py/compile.o
+ .rodata.compile_global_nonlocal_stmt.str1.1
+                0x00000000000426ba       0x83 build/py/compile.o
+ .rodata.compile_atom_brace.str1.1
+                0x000000000004273d       0x6b build/py/compile.o
+ .rodata.mp_compile_to_raw_code.str1.1
+                0x00000000000427a8       0x21 build/py/compile.o
+ *fill*         0x00000000000427c9        0x7 
+ .rodata.__PRETTY_FUNCTION__.0
+                0x00000000000427d0       0x12 build/py/compile.o
+ *fill*         0x00000000000427e2        0xe 
+ .rodata.__PRETTY_FUNCTION__.1
+                0x00000000000427f0       0x12 build/py/compile.o
+ *fill*         0x0000000000042802        0x6 
+ .rodata.__PRETTY_FUNCTION__.2
+                0x0000000000042808        0xb build/py/compile.o
+ *fill*         0x0000000000042813        0xd 
+ .rodata.__PRETTY_FUNCTION__.3
+                0x0000000000042820       0x18 build/py/compile.o
+ .rodata.__PRETTY_FUNCTION__.4
+                0x0000000000042838        0xf build/py/compile.o
+ *fill*         0x0000000000042847        0x9 
+ .rodata.__PRETTY_FUNCTION__.5
+                0x0000000000042850       0x14 build/py/compile.o
+ *fill*         0x0000000000042864        0xc 
+ .rodata.__PRETTY_FUNCTION__.6
+                0x0000000000042870       0x18 build/py/compile.o
+ *fill*         0x0000000000042888        0x8 
+ .rodata.__PRETTY_FUNCTION__.7
+                0x0000000000042890       0x13 build/py/compile.o
+ *fill*         0x00000000000428a3        0xd 
+ .rodata.__PRETTY_FUNCTION__.8
+                0x00000000000428b0       0x10 build/py/compile.o
+ .rodata.__PRETTY_FUNCTION__.9
+                0x00000000000428c0       0x21 build/py/compile.o
+ *fill*         0x00000000000428e1        0xf 
+ .rodata.__PRETTY_FUNCTION__.10
+                0x00000000000428f0       0x13 build/py/compile.o
+ *fill*         0x0000000000042903        0xd 
+ .rodata.__PRETTY_FUNCTION__.11
+                0x0000000000042910       0x14 build/py/compile.o
+ *fill*         0x0000000000042924        0xc 
+ .rodata.__PRETTY_FUNCTION__.12
+                0x0000000000042930       0x11 build/py/compile.o
+ *fill*         0x0000000000042941        0xf 
+ .rodata.__PRETTY_FUNCTION__.13
+                0x0000000000042950       0x1e build/py/compile.o
+ *fill*         0x000000000004296e        0x2 
+ .rodata.__PRETTY_FUNCTION__.14
+                0x0000000000042970       0x12 build/py/compile.o
+ *fill*         0x0000000000042982        0xe 
+ .rodata.__PRETTY_FUNCTION__.15
+                0x0000000000042990       0x15 build/py/compile.o
+ *fill*         0x00000000000429a5        0xb 
+ .rodata.__PRETTY_FUNCTION__.16
+                0x00000000000429b0       0x1e build/py/compile.o
+ *fill*         0x00000000000429ce        0x2 
+ .rodata.__PRETTY_FUNCTION__.17
+                0x00000000000429d0       0x13 build/py/compile.o
+ *fill*         0x00000000000429e3        0xd 
+ .rodata.__PRETTY_FUNCTION__.18
+                0x00000000000429f0       0x11 build/py/compile.o
+ *fill*         0x0000000000042a01        0xf 
+ .rodata.__PRETTY_FUNCTION__.19
+                0x0000000000042a10       0x13 build/py/compile.o
+ *fill*         0x0000000000042a23        0xd 
+ .rodata.__PRETTY_FUNCTION__.20
+                0x0000000000042a30       0x15 build/py/compile.o
+ *fill*         0x0000000000042a45        0xb 
+ .rodata.__PRETTY_FUNCTION__.21
+                0x0000000000042a50       0x1a build/py/compile.o
+ *fill*         0x0000000000042a6a        0x6 
+ .rodata.__PRETTY_FUNCTION__.22
+                0x0000000000042a70       0x12 build/py/compile.o
+ *fill*         0x0000000000042a82        0xe 
+ .rodata.__PRETTY_FUNCTION__.23
+                0x0000000000042a90       0x16 build/py/compile.o
+ *fill*         0x0000000000042aa6        0x2 
+ .rodata.__PRETTY_FUNCTION__.25
+                0x0000000000042aa8        0xd build/py/compile.o
+ *fill*         0x0000000000042ab5        0x3 
+ .rodata.__PRETTY_FUNCTION__.26
+                0x0000000000042ab8        0xa build/py/compile.o
+ *fill*         0x0000000000042ac2        0xe 
+ .rodata.__PRETTY_FUNCTION__.27
+                0x0000000000042ad0       0x13 build/py/compile.o
+ *fill*         0x0000000000042ae3        0x5 
+ .rodata.__PRETTY_FUNCTION__.28
+                0x0000000000042ae8        0x9 build/py/compile.o
+ *fill*         0x0000000000042af1        0xf 
+ .rodata.__PRETTY_FUNCTION__.29
+                0x0000000000042b00       0x18 build/py/compile.o
+ *fill*         0x0000000000042b18        0x8 
+ .rodata.__PRETTY_FUNCTION__.30
+                0x0000000000042b20       0x20 build/py/compile.o
+ .rodata.__PRETTY_FUNCTION__.31
+                0x0000000000042b40        0xe build/py/compile.o
+ *fill*         0x0000000000042b4e        0x2 
+ .rodata.__PRETTY_FUNCTION__.32
+                0x0000000000042b50       0x19 build/py/compile.o
+ *fill*         0x0000000000042b69        0x7 
+ .rodata.__PRETTY_FUNCTION__.33
+                0x0000000000042b70       0x15 build/py/compile.o
+ .rodata.mp_emit_common_id_op.str1.1
+                0x0000000000042b85       0x52 build/py/emitcommon.o
+                                         0x5d (размер перед о�лаблением)
+ *fill*         0x0000000000042bd7        0x9 
+ .rodata.__PRETTY_FUNCTION__.0
+                0x0000000000042be0       0x15 build/py/emitcommon.o
+ .rodata.emit_get_cur_to_write_code_info.str1.1
+                0x0000000000042bf5       0x53 build/py/emitbc.o
+ .rodata.mp_emit_bc_adjust_stack_size.str1.1
+                0x0000000000042c48       0x28 build/py/emitbc.o
+ .rodata.mp_emit_bc_label_assign.str1.1
+                0x0000000000042c70       0x71 build/py/emitbc.o
+ .rodata.emit_get_cur_to_write_bytecode.str1.1
+                0x0000000000042ce1       0x42 build/py/emitbc.o
+ .rodata.emit_write_bytecode_byte_qstr.str1.1
+                0x0000000000042d23       0x11 build/py/emitbc.o
+ .rodata.mp_emit_bc_raise_varargs.str1.1
+                0x0000000000042d34        0xc build/py/emitbc.o
+ .rodata.mp_emit_bc_end_pass.str1.1
+                0x0000000000042d40       0x76 build/py/emitbc.o
+ .rodata.mp_emit_bc_make_closure.str1.1
+                0x0000000000042db6       0x15 build/py/emitbc.o
+ *fill*         0x0000000000042dcb        0x5 
+ .rodata.__PRETTY_FUNCTION__.0
+                0x0000000000042dd0       0x19 build/py/emitbc.o
+ *fill*         0x0000000000042de9        0x7 
+ .rodata.__PRETTY_FUNCTION__.1
+                0x0000000000042df0       0x18 build/py/emitbc.o
+ *fill*         0x0000000000042e08        0x8 
+ .rodata.__PRETTY_FUNCTION__.2
+                0x0000000000042e10       0x1e build/py/emitbc.o
+ *fill*         0x0000000000042e2e        0x2 
+ .rodata.__PRETTY_FUNCTION__.3
+                0x0000000000042e30       0x1f build/py/emitbc.o
+ *fill*         0x0000000000042e4f        0x1 
+ .rodata.__PRETTY_FUNCTION__.4
+                0x0000000000042e50       0x18 build/py/emitbc.o
+ *fill*         0x0000000000042e68        0x8 
+ .rodata.__PRETTY_FUNCTION__.6
+                0x0000000000042e70       0x1d build/py/emitbc.o
+ *fill*         0x0000000000042e8d        0x3 
+ .rodata.__PRETTY_FUNCTION__.7
+                0x0000000000042e90       0x14 build/py/emitbc.o
+ *fill*         0x0000000000042ea4       0x1c 
+ .rodata.__PRETTY_FUNCTION__.9
+                0x0000000000042ec0       0x20 build/py/emitbc.o
+ .rodata.mp_asm_base_start_pass.str1.1
+                0x0000000000042ee0       0x26 build/py/asmbase.o
+ .rodata.mp_asm_base_get_cur_to_write_bytes.str1.1
+                0x0000000000042f06       0x36 build/py/asmbase.o
+ .rodata.mp_asm_base_label_assign.str1.1
+                0x0000000000042f3c       0x6e build/py/asmbase.o
+ *fill*         0x0000000000042faa        0x6 
+ .rodata.__PRETTY_FUNCTION__.0
+                0x0000000000042fb0       0x19 build/py/asmbase.o
+ *fill*         0x0000000000042fc9       0x17 
+ .rodata.__PRETTY_FUNCTION__.1
+                0x0000000000042fe0       0x23 build/py/asmbase.o
+ *fill*         0x0000000000043003        0xd 
+ .rodata.__PRETTY_FUNCTION__.2
+                0x0000000000043010       0x17 build/py/asmbase.o
+ .rodata.get_label_dest.str1.1
+                0x0000000000043027       0x2f build/py/asmx64.o
+ .rodata.asm_x64_mov_mem8_to_r64zx.str1.1
+                0x0000000000043056        0xc build/py/asmx64.o
+ .rodata.asm_x64_test_r8_with_r8.str1.1
+                0x0000000000043062       0x1c build/py/asmx64.o
+ .rodata.asm_x64_setcc_r8.str1.1
+                0x000000000004307e        0xc build/py/asmx64.o
+ .rodata.asm_x64_entry.str1.1
+                0x000000000004308a       0x10 build/py/asmx64.o
+ .rodata.asm_x64_mov_local_addr_to_r64.str1.1
+                0x000000000004309a        0xd build/py/asmx64.o
+ .rodata.asm_x64_call_ind.str1.1
+                0x00000000000430a7        0xd build/py/asmx64.o
+ *fill*         0x00000000000430b4        0xc 
+ .rodata.__PRETTY_FUNCTION__.0
+                0x00000000000430c0       0x11 build/py/asmx64.o
+ *fill*         0x00000000000430d1        0xf 
+ .rodata.__PRETTY_FUNCTION__.1
+                0x00000000000430e0       0x18 build/py/asmx64.o
+ .rodata.__PRETTY_FUNCTION__.3
+                0x00000000000430f8        0xe build/py/asmx64.o
+ *fill*         0x0000000000043106        0x2 
+ .rodata.__PRETTY_FUNCTION__.4
+                0x0000000000043108        0xf build/py/asmx64.o
+ *fill*         0x0000000000043117        0x9 
+ .rodata.__PRETTY_FUNCTION__.5
+                0x0000000000043120       0x10 build/py/asmx64.o
+ .rodata.__PRETTY_FUNCTION__.6
+                0x0000000000043130       0x11 build/py/asmx64.o
+ *fill*         0x0000000000043141        0xf 
+ .rodata.__PRETTY_FUNCTION__.7
+                0x0000000000043150       0x18 build/py/asmx64.o
+ *fill*         0x0000000000043168        0x8 
+ .rodata.__PRETTY_FUNCTION__.8
+                0x0000000000043170       0x1b build/py/asmx64.o
+ *fill*         0x000000000004318b        0x5 
+ .rodata.__PRETTY_FUNCTION__.9
+                0x0000000000043190       0x1b build/py/asmx64.o
+ *fill*         0x00000000000431ab        0x5 
+ .rodata.__PRETTY_FUNCTION__.10
+                0x00000000000431b0       0x1a build/py/asmx64.o
+ .rodata.adjust_stack.str1.1
+                0x00000000000431ca       0x98 build/py/emitnx64.o
+ .rodata.emit_native_leave_exc_stack.str1.1
+                0x0000000000043262       0x19 build/py/emitnx64.o
+ .rodata.emit_native_load_fast.str1.1
+                0x000000000004327b       0x22 build/py/emitnx64.o
+ .rodata.load_reg_stack_imm.str1.1
+                0x000000000004329d       0x15 build/py/emitnx64.o
+ .rodata.emit_native_store_map.str1.1
+                0x00000000000432b2       0x4d build/py/emitnx64.o
+ .rodata.emit_native_end_finally.str1.1
+                0x00000000000432ff       0x16 build/py/emitnx64.o
+ .rodata.emit_native_start_pass.str1.1
+                0x0000000000043315       0x28 build/py/emitnx64.o
+ .rodata.emit_native_unpack_ex.str1.1
+                0x000000000004333d       0x1a build/py/emitnx64.o
+ .rodata.emit_native_get_iter.str1.1
+                0x0000000000043357       0x15 build/py/emitnx64.o
+ .rodata.emit_native_raise_varargs.str1.1
+                0x000000000004336c       0x21 build/py/emitnx64.o
+ .rodata.emit_native_unary_op.str1.1
+                0x000000000004338d       0x1c build/py/emitnx64.o
+ .rodata.emit_native_store_fast.str1.1
+                0x00000000000433a9       0x2c build/py/emitnx64.o
+ .rodata.emit_native_jump_helper.str1.1
+                0x00000000000433d5       0x28 build/py/emitnx64.o
+ .rodata.emit_native_attr.str1.1
+                0x00000000000433fd       0x19 build/py/emitnx64.o
+ .rodata.emit_native_store_comp.str1.1
+                0x0000000000043416       0x3a build/py/emitnx64.o
+ .rodata.emit_native_import.str1.1
+                0x0000000000043450       0x55 build/py/emitnx64.o
+ .rodata.emit_get_stack_pointer_to_reg_for_pop.str1.1
+                0x00000000000434a5       0x18 build/py/emitnx64.o
+ .rodata.emit_native_yield.str1.1
+                0x00000000000434bd        0xd build/py/emitnx64.o
+ .rodata.emit_native_return_value.str1.1
+                0x00000000000434ca       0x22 build/py/emitnx64.o
+ .rodata.emit_native_build.str1.1
+                0x00000000000434ec       0x5b build/py/emitnx64.o
+ .rodata.emit_native_end_pass.str1.1
+                0x0000000000043547       0x77 build/py/emitnx64.o
+                                         0xa2 (размер перед о�лаблением)
+ .rodata.emit_native_make_function.str1.1
+                0x00000000000435be       0x3d build/py/emitnx64.o
+ .rodata.emit_native_call_function.str1.1
+                0x00000000000435fb       0x51 build/py/emitnx64.o
+ .rodata.emit_native_binary_op.str1.1
+                0x000000000004364c       0x46 build/py/emitnx64.o
+ .rodata.emit_native_subscr.str1.1
+                0x0000000000043692       0x8c build/py/emitnx64.o
+ *fill*         0x000000000004371e        0x2 
+ .rodata.CSWTCH.160
+                0x0000000000043720       0x10 build/py/emitnx64.o
+ .rodata.__PRETTY_FUNCTION__.0
+                0x0000000000043730       0x17 build/py/emitnx64.o
+ *fill*         0x0000000000043747        0x9 
+ .rodata.__PRETTY_FUNCTION__.1
+                0x0000000000043750       0x15 build/py/emitnx64.o
+ *fill*         0x0000000000043765        0xb 
+ .rodata.__PRETTY_FUNCTION__.2
+                0x0000000000043770       0x19 build/py/emitnx64.o
+ *fill*         0x0000000000043789        0x7 
+ .rodata.__PRETTY_FUNCTION__.3
+                0x0000000000043790       0x18 build/py/emitnx64.o
+ *fill*         0x00000000000437a8        0x8 
+ .rodata.__PRETTY_FUNCTION__.4
+                0x00000000000437b0       0x18 build/py/emitnx64.o
+ *fill*         0x00000000000437c8        0x8 
+ .rodata.__PRETTY_FUNCTION__.5
+                0x00000000000437d0       0x18 build/py/emitnx64.o
+ *fill*         0x00000000000437e8        0x8 
+ .rodata.__PRETTY_FUNCTION__.6
+                0x00000000000437f0       0x18 build/py/emitnx64.o
+ *fill*         0x0000000000043808        0x8 
+ .rodata.__PRETTY_FUNCTION__.7
+                0x0000000000043810       0x1a build/py/emitnx64.o
+ *fill*         0x000000000004382a        0x6 
+ .rodata.__PRETTY_FUNCTION__.8
+                0x0000000000043830       0x18 build/py/emitnx64.o
+ *fill*         0x0000000000043848        0x8 
+ .rodata.__PRETTY_FUNCTION__.9
+                0x0000000000043850       0x17 build/py/emitnx64.o
+ *fill*         0x0000000000043867        0x9 
+ .rodata.__PRETTY_FUNCTION__.10
+                0x0000000000043870       0x16 build/py/emitnx64.o
+ *fill*         0x0000000000043886        0xa 
+ .rodata.__PRETTY_FUNCTION__.11
+                0x0000000000043890       0x17 build/py/emitnx64.o
+ *fill*         0x00000000000438a7        0x9 
+ .rodata.__PRETTY_FUNCTION__.12
+                0x00000000000438b0       0x1a build/py/emitnx64.o
+ *fill*         0x00000000000438ca        0x6 
+ .rodata.__PRETTY_FUNCTION__.13
+                0x00000000000438d0       0x15 build/py/emitnx64.o
+ .rodata.ops.14
+                0x00000000000438e5        0x6 build/py/emitnx64.o
+ *fill*         0x00000000000438eb        0x5 
+ .rodata.__PRETTY_FUNCTION__.15
+                0x00000000000438f0       0x18 build/py/emitnx64.o
+ *fill*         0x0000000000043908        0x8 
+ .rodata.__PRETTY_FUNCTION__.16
+                0x0000000000043910       0x16 build/py/emitnx64.o
+ *fill*         0x0000000000043926        0xa 
+ .rodata.__PRETTY_FUNCTION__.17
+                0x0000000000043930       0x17 build/py/emitnx64.o
+ *fill*         0x0000000000043947        0x9 
+ .rodata.__PRETTY_FUNCTION__.18
+                0x0000000000043950       0x1c build/py/emitnx64.o
+ *fill*         0x000000000004396c        0x4 
+ .rodata.__PRETTY_FUNCTION__.19
+                0x0000000000043970       0x16 build/py/emitnx64.o
+ *fill*         0x0000000000043986        0xa 
+ .rodata.__PRETTY_FUNCTION__.20
+                0x0000000000043990       0x1a build/py/emitnx64.o
+ *fill*         0x00000000000439aa        0x6 
+ .rodata.__PRETTY_FUNCTION__.21
+                0x00000000000439b0       0x1a build/py/emitnx64.o
+ *fill*         0x00000000000439ca        0x6 
+ .rodata.__PRETTY_FUNCTION__.22
+                0x00000000000439d0       0x19 build/py/emitnx64.o
+ *fill*         0x00000000000439e9        0x7 
+ .rodata.__PRETTY_FUNCTION__.23
+                0x00000000000439f0       0x1a build/py/emitnx64.o
+ *fill*         0x0000000000043a0a       0x16 
+ .rodata.__PRETTY_FUNCTION__.24
+                0x0000000000043a20       0x26 build/py/emitnx64.o
+ *fill*         0x0000000000043a46        0xa 
+ .rodata.__PRETTY_FUNCTION__.25
+                0x0000000000043a50       0x1c build/py/emitnx64.o
+ *fill*         0x0000000000043a6c        0x4 
+ .rodata.__PRETTY_FUNCTION__.26
+                0x0000000000043a70        0xd build/py/emitnx64.o
+ .rodata.reg_local_table
+                0x0000000000043a7d        0x3 build/py/emitnx64.o
+ .rodata.get_label_dest.str1.1
+                0x0000000000043a80        0xf build/py/asmx86.o
+                                         0x2f (размер перед о�лаблением)
+ .rodata.asm_x86_entry.str1.1
+                0x0000000000043a8f       0x10 build/py/asmx86.o
+ .rodata.asm_x86_call_ind.str1.1
+                0x0000000000043a8f        0xc build/py/asmx86.o
+ *fill*         0x0000000000043a9b        0x5 
+ .rodata.__PRETTY_FUNCTION__.0
+                0x0000000000043aa0       0x11 build/py/asmx86.o
+ *fill*         0x0000000000043ab1        0x7 
+ .rodata.__PRETTY_FUNCTION__.1
+                0x0000000000043ab8        0xe build/py/asmx86.o
+ *fill*         0x0000000000043ac6        0x2 
+ .rodata.__PRETTY_FUNCTION__.2
+                0x0000000000043ac8        0xf build/py/asmx86.o
+ .rodata.adjust_stack.str1.1
+                0x0000000000043ad7       0x98 build/py/emitnx86.o
+ .rodata.emit_native_leave_exc_stack.str1.1
+                0x0000000000043ad7       0x19 build/py/emitnx86.o
+ .rodata.emit_native_load_fast.str1.1
+                0x0000000000043ad7       0x22 build/py/emitnx86.o
+ .rodata.load_reg_stack_imm.str1.1
+                0x0000000000043ad7       0x15 build/py/emitnx86.o
+ .rodata.emit_native_store_map.str1.1
+                0x0000000000043ad7       0x4d build/py/emitnx86.o
+ .rodata.emit_native_end_finally.str1.1
+                0x0000000000043ad7       0x16 build/py/emitnx86.o
+ .rodata.emit_native_start_pass.str1.1
+                0x0000000000043ad7       0x28 build/py/emitnx86.o
+ .rodata.emit_native_attr.str1.1
+                0x0000000000043ad7       0x33 build/py/emitnx86.o
+ .rodata.emit_native_store_global.str1.1
+                0x0000000000043ad7       0x15 build/py/emitnx86.o
+ .rodata.emit_native_raise_varargs.str1.1
+                0x0000000000043ad7       0x21 build/py/emitnx86.o
+ .rodata.emit_native_unary_op.str1.1
+                0x0000000000043ad7       0x1c build/py/emitnx86.o
+ .rodata.emit_native_store_fast.str1.1
+                0x0000000000043ad7       0x2c build/py/emitnx86.o
+ .rodata.emit_native_jump_helper.str1.1
+                0x0000000000043ad7       0x28 build/py/emitnx86.o
+ .rodata.emit_native_store_comp.str1.1
+                0x0000000000043ad7       0x3a build/py/emitnx86.o
+ .rodata.emit_native_import.str1.1
+                0x0000000000043ad7       0x55 build/py/emitnx86.o
+ .rodata.emit_get_stack_pointer_to_reg_for_pop.str1.1
+                0x0000000000043ad7       0x18 build/py/emitnx86.o
+ .rodata.emit_native_yield.str1.1
+                0x0000000000043ad7        0xd build/py/emitnx86.o
+ .rodata.emit_native_return_value.str1.1
+                0x0000000000043ad7       0x22 build/py/emitnx86.o
+ .rodata.emit_native_build.str1.1
+                0x0000000000043ad7       0x5b build/py/emitnx86.o
+ .rodata.emit_native_end_pass.str1.1
+                0x0000000000043ad7       0xa2 build/py/emitnx86.o
+ .rodata.emit_native_make_function.str1.1
+                0x0000000000043ad7       0x3d build/py/emitnx86.o
+ .rodata.emit_native_call_function.str1.1
+                0x0000000000043ad7       0x51 build/py/emitnx86.o
+ .rodata.emit_native_binary_op.str1.1
+                0x0000000000043ad7       0x46 build/py/emitnx86.o
+ .rodata.emit_native_subscr.str1.1
+                0x0000000000043ad7       0x8c build/py/emitnx86.o
+ *fill*         0x0000000000043ad7        0x9 
+ .rodata.CSWTCH.148
+                0x0000000000043ae0       0x10 build/py/emitnx86.o
+ .rodata.__PRETTY_FUNCTION__.0
+                0x0000000000043af0       0x17 build/py/emitnx86.o
+ *fill*         0x0000000000043b07        0x9 
+ .rodata.__PRETTY_FUNCTION__.1
+                0x0000000000043b10       0x15 build/py/emitnx86.o
+ *fill*         0x0000000000043b25        0xb 
+ .rodata.__PRETTY_FUNCTION__.2
+                0x0000000000043b30       0x19 build/py/emitnx86.o
+ *fill*         0x0000000000043b49        0x7 
+ .rodata.__PRETTY_FUNCTION__.3
+                0x0000000000043b50       0x18 build/py/emitnx86.o
+ *fill*         0x0000000000043b68        0x8 
+ .rodata.__PRETTY_FUNCTION__.4
+                0x0000000000043b70       0x18 build/py/emitnx86.o
+ *fill*         0x0000000000043b88        0x8 
+ .rodata.__PRETTY_FUNCTION__.5
+                0x0000000000043b90       0x18 build/py/emitnx86.o
+ *fill*         0x0000000000043ba8        0x8 
+ .rodata.__PRETTY_FUNCTION__.6
+                0x0000000000043bb0       0x18 build/py/emitnx86.o
+ *fill*         0x0000000000043bc8        0x8 
+ .rodata.__PRETTY_FUNCTION__.7
+                0x0000000000043bd0       0x1a build/py/emitnx86.o
+ *fill*         0x0000000000043bea        0x6 
+ .rodata.__PRETTY_FUNCTION__.8
+                0x0000000000043bf0       0x18 build/py/emitnx86.o
+ *fill*         0x0000000000043c08        0x8 
+ .rodata.__PRETTY_FUNCTION__.9
+                0x0000000000043c10       0x17 build/py/emitnx86.o
+ *fill*         0x0000000000043c27        0x9 
+ .rodata.__PRETTY_FUNCTION__.10
+                0x0000000000043c30       0x16 build/py/emitnx86.o
+ *fill*         0x0000000000043c46        0xa 
+ .rodata.__PRETTY_FUNCTION__.11
+                0x0000000000043c50       0x17 build/py/emitnx86.o
+ *fill*         0x0000000000043c67        0x9 
+ .rodata.__PRETTY_FUNCTION__.12
+                0x0000000000043c70       0x1a build/py/emitnx86.o
+ *fill*         0x0000000000043c8a        0x6 
+ .rodata.__PRETTY_FUNCTION__.13
+                0x0000000000043c90       0x15 build/py/emitnx86.o
+ .rodata.ops.14
+                0x0000000000043ca5        0x6 build/py/emitnx86.o
+ *fill*         0x0000000000043cab        0x5 
+ .rodata.__PRETTY_FUNCTION__.15
+                0x0000000000043cb0       0x18 build/py/emitnx86.o
+ *fill*         0x0000000000043cc8        0x8 
+ .rodata.__PRETTY_FUNCTION__.16
+                0x0000000000043cd0       0x16 build/py/emitnx86.o
+ *fill*         0x0000000000043ce6        0xa 
+ .rodata.__PRETTY_FUNCTION__.17
+                0x0000000000043cf0       0x17 build/py/emitnx86.o
+ *fill*         0x0000000000043d07        0x9 
+ .rodata.__PRETTY_FUNCTION__.18
+                0x0000000000043d10       0x1c build/py/emitnx86.o
+ *fill*         0x0000000000043d2c        0x4 
+ .rodata.__PRETTY_FUNCTION__.19
+                0x0000000000043d30       0x16 build/py/emitnx86.o
+ *fill*         0x0000000000043d46        0xa 
+ .rodata.__PRETTY_FUNCTION__.20
+                0x0000000000043d50       0x1a build/py/emitnx86.o
+ *fill*         0x0000000000043d6a        0x6 
+ .rodata.__PRETTY_FUNCTION__.21
+                0x0000000000043d70       0x1a build/py/emitnx86.o
+ *fill*         0x0000000000043d8a        0x6 
+ .rodata.__PRETTY_FUNCTION__.22
+                0x0000000000043d90       0x19 build/py/emitnx86.o
+ *fill*         0x0000000000043da9        0x7 
+ .rodata.__PRETTY_FUNCTION__.23
+                0x0000000000043db0       0x1a build/py/emitnx86.o
+ *fill*         0x0000000000043dca       0x16 
+ .rodata.__PRETTY_FUNCTION__.24
+                0x0000000000043de0       0x26 build/py/emitnx86.o
+ *fill*         0x0000000000043e06        0xa 
+ .rodata.__PRETTY_FUNCTION__.25
+                0x0000000000043e10       0x1c build/py/emitnx86.o
+ *fill*         0x0000000000043e2c        0x4 
+ .rodata.__PRETTY_FUNCTION__.26
+                0x0000000000043e30        0xd build/py/emitnx86.o
+ .rodata.reg_local_table
+                0x0000000000043e3d        0x3 build/py/emitnx86.o
+ .rodata.mp_f_n_args
+                0x0000000000043e40       0x32 build/py/emitnx86.o
+ .rodata.get_label_dest.str1.1
+                0x0000000000043e72       0x11 build/py/asmthumb.o
+                                         0x31 (размер перед о�лаблением)
+ .rodata.asm_thumb_entry.str1.1
+                0x0000000000043e83       0x10 build/py/asmthumb.o
+ .rodata.asm_thumb_format_4.str1.1
+                0x0000000000043e83       0x37 build/py/asmthumb.o
+ .rodata.asm_thumb_mov_reg_i16.str1.1
+                0x0000000000043eba       0x1d build/py/asmthumb.o
+ .rodata.asm_thumb_mov_local_reg.str1.1
+                0x0000000000043ed7       0x35 build/py/asmthumb.o
+ .rodata.CSWTCH.23
+                0x0000000000043f0c        0x4 build/py/asmthumb.o
+ .rodata.__PRETTY_FUNCTION__.0
+                0x0000000000043f10       0x1d build/py/asmthumb.o
+ *fill*         0x0000000000043f2d        0x3 
+ .rodata.__PRETTY_FUNCTION__.1
+                0x0000000000043f30       0x18 build/py/asmthumb.o
+ *fill*         0x0000000000043f48        0x8 
+ .rodata.__PRETTY_FUNCTION__.2
+                0x0000000000043f50       0x18 build/py/asmthumb.o
+ .rodata.__PRETTY_FUNCTION__.4
+                0x0000000000043f68        0xf build/py/asmthumb.o
+ *fill*         0x0000000000043f77        0x9 
+ .rodata.__PRETTY_FUNCTION__.5
+                0x0000000000043f80       0x16 build/py/asmthumb.o
+ *fill*         0x0000000000043f96        0xa 
+ .rodata.__PRETTY_FUNCTION__.6
+                0x0000000000043fa0       0x13 build/py/asmthumb.o
+ *fill*         0x0000000000043fb3        0xd 
+ .rodata.__PRETTY_FUNCTION__.7
+                0x0000000000043fc0       0x10 build/py/asmthumb.o
+ .rodata.adjust_stack.str1.1
+                0x0000000000043fd0       0x98 build/py/emitnthumb.o
+ .rodata.emit_native_leave_exc_stack.str1.1
+                0x0000000000043fd0       0x19 build/py/emitnthumb.o
+ .rodata.asm_thumb_add_rlo_rlo_rlo.str1.1
+                0x0000000000043fd0       0x11 build/py/emitnthumb.o
+                                         0x48 (размер перед о�лаблением)
+ .rodata.load_reg_stack_imm.str1.1
+                0x0000000000043fe1       0x15 build/py/emitnthumb.o
+ .rodata.emit_native_load_fast.str1.1
+                0x0000000000043fe1       0x22 build/py/emitnthumb.o
+ .rodata.emit_native_unary_op.str1.1
+                0x0000000000043fe1       0x1c build/py/emitnthumb.o
+ .rodata.emit_native_store_comp.str1.1
+                0x0000000000043fe1       0x6e build/py/emitnthumb.o
+ .rodata.emit_native_store_map.str1.1
+                0x0000000000043fe1       0x19 build/py/emitnthumb.o
+ .rodata.emit_native_end_finally.str1.1
+                0x0000000000043fe1       0x16 build/py/emitnthumb.o
+ .rodata.emit_native_raise_varargs.str1.1
+                0x0000000000043fe1       0x21 build/py/emitnthumb.o
+ .rodata.emit_native_binary_op.str1.1
+                0x0000000000043fe1       0x46 build/py/emitnthumb.o
+ .rodata.emit_native_jump_helper.str1.1
+                0x0000000000043fe1       0x28 build/py/emitnthumb.o
+ .rodata.emit_native_end_pass.str1.1
+                0x0000000000043fe1       0xa2 build/py/emitnthumb.o
+ .rodata.emit_native_make_function.str1.1
+                0x0000000000043fe1       0x3d build/py/emitnthumb.o
+ .rodata.emit_native_unpack_ex.str1.1
+                0x0000000000043fe1       0x1a build/py/emitnthumb.o
+ .rodata.emit_native_get_iter.str1.1
+                0x0000000000043fe1       0x15 build/py/emitnthumb.o
+ .rodata.emit_native_attr.str1.1
+                0x0000000000043fe1       0x19 build/py/emitnthumb.o
+ .rodata.emit_native_import.str1.1
+                0x0000000000043fe1       0x55 build/py/emitnthumb.o
+ .rodata.emit_get_stack_pointer_to_reg_for_pop.str1.1
+                0x0000000000043fe1       0x18 build/py/emitnthumb.o
+ .rodata.emit_native_call_function.str1.1
+                0x0000000000043fe1       0x51 build/py/emitnthumb.o
+ .rodata.emit_native_build.str1.1
+                0x0000000000043fe1       0x5b build/py/emitnthumb.o
+ .rodata.emit_native_yield.str1.1
+                0x0000000000043fe1        0xd build/py/emitnthumb.o
+ .rodata.emit_native_return_value.str1.1
+                0x0000000000043fe1       0x22 build/py/emitnthumb.o
+ .rodata.emit_native_store_fast.str1.1
+                0x0000000000043fe1       0x2c build/py/emitnthumb.o
+ .rodata.emit_native_start_pass.str1.1
+                0x0000000000043fe1       0x28 build/py/emitnthumb.o
+ .rodata.emit_native_subscr.str1.1
+                0x0000000000043fe1       0x8c build/py/emitnthumb.o
+ *fill*         0x0000000000043fe1        0xf 
+ .rodata.CSWTCH.270
+                0x0000000000043ff0       0x10 build/py/emitnthumb.o
+ .rodata.__PRETTY_FUNCTION__.0
+                0x0000000000044000       0x17 build/py/emitnthumb.o
+ *fill*         0x0000000000044017        0x9 
+ .rodata.__PRETTY_FUNCTION__.1
+                0x0000000000044020       0x15 build/py/emitnthumb.o
+ *fill*         0x0000000000044035        0xb 
+ .rodata.__PRETTY_FUNCTION__.2
+                0x0000000000044040       0x19 build/py/emitnthumb.o
+ *fill*         0x0000000000044059        0x7 
+ .rodata.__PRETTY_FUNCTION__.3
+                0x0000000000044060       0x18 build/py/emitnthumb.o
+ *fill*         0x0000000000044078        0x8 
+ .rodata.__PRETTY_FUNCTION__.4
+                0x0000000000044080       0x18 build/py/emitnthumb.o
+ *fill*         0x0000000000044098        0x8 
+ .rodata.__PRETTY_FUNCTION__.5
+                0x00000000000440a0       0x18 build/py/emitnthumb.o
+ *fill*         0x00000000000440b8        0x8 
+ .rodata.__PRETTY_FUNCTION__.6
+                0x00000000000440c0       0x18 build/py/emitnthumb.o
+ *fill*         0x00000000000440d8        0x8 
+ .rodata.__PRETTY_FUNCTION__.7
+                0x00000000000440e0       0x1a build/py/emitnthumb.o
+ *fill*         0x00000000000440fa        0x6 
+ .rodata.__PRETTY_FUNCTION__.8
+                0x0000000000044100       0x18 build/py/emitnthumb.o
+ *fill*         0x0000000000044118        0x8 
+ .rodata.__PRETTY_FUNCTION__.9
+                0x0000000000044120       0x17 build/py/emitnthumb.o
+ *fill*         0x0000000000044137        0x9 
+ .rodata.__PRETTY_FUNCTION__.10
+                0x0000000000044140       0x16 build/py/emitnthumb.o
+ *fill*         0x0000000000044156        0xa 
+ .rodata.__PRETTY_FUNCTION__.11
+                0x0000000000044160       0x17 build/py/emitnthumb.o
+ *fill*         0x0000000000044177        0x9 
+ .rodata.__PRETTY_FUNCTION__.12
+                0x0000000000044180       0x1a build/py/emitnthumb.o
+ *fill*         0x000000000004419a        0x6 
+ .rodata.__PRETTY_FUNCTION__.13
+                0x00000000000441a0       0x15 build/py/emitnthumb.o
+ .rodata.ret.14
+                0x00000000000441b5        0x6 build/py/emitnthumb.o
+ *fill*         0x00000000000441bb        0x5 
+ .rodata.ops.15
+                0x00000000000441c0        0xc build/py/emitnthumb.o
+ *fill*         0x00000000000441cc        0x4 
+ .rodata.__PRETTY_FUNCTION__.16
+                0x00000000000441d0       0x18 build/py/emitnthumb.o
+ *fill*         0x00000000000441e8        0x8 
+ .rodata.__PRETTY_FUNCTION__.17
+                0x00000000000441f0       0x16 build/py/emitnthumb.o
+ *fill*         0x0000000000044206        0xa 
+ .rodata.__PRETTY_FUNCTION__.18
+                0x0000000000044210       0x17 build/py/emitnthumb.o
+ *fill*         0x0000000000044227        0x9 
+ .rodata.__PRETTY_FUNCTION__.19
+                0x0000000000044230       0x1c build/py/emitnthumb.o
+ *fill*         0x000000000004424c        0x4 
+ .rodata.__PRETTY_FUNCTION__.20
+                0x0000000000044250       0x16 build/py/emitnthumb.o
+ *fill*         0x0000000000044266        0xa 
+ .rodata.__PRETTY_FUNCTION__.21
+                0x0000000000044270       0x1a build/py/emitnthumb.o
+ *fill*         0x000000000004428a        0x6 
+ .rodata.__PRETTY_FUNCTION__.22
+                0x0000000000044290       0x1a build/py/emitnthumb.o
+ *fill*         0x00000000000442aa        0x6 
+ .rodata.__PRETTY_FUNCTION__.23
+                0x00000000000442b0       0x19 build/py/emitnthumb.o
+ *fill*         0x00000000000442c9        0x7 
+ .rodata.__PRETTY_FUNCTION__.24
+                0x00000000000442d0       0x1a build/py/emitnthumb.o
+ *fill*         0x00000000000442ea        0x6 
+ .rodata.__PRETTY_FUNCTION__.26
+                0x00000000000442f0       0x13 build/py/emitnthumb.o
+ *fill*         0x0000000000044303       0x1d 
+ .rodata.__PRETTY_FUNCTION__.27
+                0x0000000000044320       0x26 build/py/emitnthumb.o
+ *fill*         0x0000000000044346        0xa 
+ .rodata.__PRETTY_FUNCTION__.28
+                0x0000000000044350       0x1c build/py/emitnthumb.o
+ *fill*         0x000000000004436c        0x4 
+ .rodata.__PRETTY_FUNCTION__.29
+                0x0000000000044370        0xd build/py/emitnthumb.o
+ .rodata.reg_local_table
+                0x000000000004437d        0x3 build/py/emitnthumb.o
+ .rodata.get_arg_addr.str1.1
+                0x0000000000044380       0x2b build/py/emitinlinethumb.o
+ .rodata.get_arg_i.str1.1
+                0x00000000000443ab       0x43 build/py/emitinlinethumb.o
+ .rodata.emit_inline_thumb_label.str1.1
+                0x00000000000443ee       0x39 build/py/emitinlinethumb.o
+ .rodata.get_arg_label.str1.1
+                0x0000000000044427       0x2c build/py/emitinlinethumb.o
+ .rodata.get_arg_str.str1.1
+                0x0000000000044453        0x1 build/py/emitinlinethumb.o
+ .rodata.get_arg_vfpreg.str1.1
+                0x0000000000044453       0x36 build/py/emitinlinethumb.o
+ .rodata.get_arg_reg.str1.1
+                0x0000000000044489       0x18 build/py/emitinlinethumb.o
+ .rodata.get_arg_reglist.str1.1
+                0x00000000000444a1       0x44 build/py/emitinlinethumb.o
+                                         0x6b (размер перед о�лаблением)
+ .rodata.emit_inline_thumb_count_params.str1.1
+                0x00000000000444e5       0x65 build/py/emitinlinethumb.o
+ .rodata.emit_inline_thumb_op.str1.1
+                0x000000000004454a       0x90 build/py/emitinlinethumb.o
+                                         0xd8 (размер перед о�лаблением)
+ *fill*         0x00000000000445da        0x6 
+ .rodata.__PRETTY_FUNCTION__.0
+                0x00000000000445e0       0x18 build/py/emitinlinethumb.o
+ *fill*         0x00000000000445f8        0x8 
+ .rodata.__PRETTY_FUNCTION__.1
+                0x0000000000044600       0x13 build/py/emitinlinethumb.o
+ *fill*         0x0000000000044613        0xd 
+ .rodata.__PRETTY_FUNCTION__.2
+                0x0000000000044620       0x13 build/py/emitinlinethumb.o
+ *fill*         0x0000000000044633        0xd 
+ .rodata.__PRETTY_FUNCTION__.3
+                0x0000000000044640       0x13 build/py/emitinlinethumb.o
+ *fill*         0x0000000000044653        0xd 
+ .rodata.__PRETTY_FUNCTION__.4
+                0x0000000000044660       0x10 build/py/emitinlinethumb.o
+ .rodata.format_vfp_op_table
+                0x0000000000044670       0x10 build/py/emitinlinethumb.o
+ .rodata.format_9_10_op_table
+                0x0000000000044680       0x18 build/py/emitinlinethumb.o
+ *fill*         0x0000000000044698        0x8 
+ .rodata.format_4_op_table
+                0x00000000000446a0       0x3c build/py/emitinlinethumb.o
+ *fill*         0x00000000000446dc        0x4 
+ .rodata.cc_name_table
+                0x00000000000446e0       0x2a build/py/emitinlinethumb.o
+ *fill*         0x000000000004470a        0x6 
+ .rodata.special_reg_name_table
+                0x0000000000044710       0x12 build/py/emitinlinethumb.o
+ *fill*         0x0000000000044722       0x1e 
+ .rodata.reg_name_table
+                0x0000000000044740       0x54 build/py/emitinlinethumb.o
+ .rodata.asm_arm_entry.str1.1
+                0x0000000000044794        0xf build/py/asmarm.o
+                                         0x1f (размер перед о�лаблением)
+ .rodata.asm_arm_mul_reg_reg_reg.str1.1
+                0x00000000000447a3        0x9 build/py/asmarm.o
+ .rodata.asm_arm_mov_reg_pcrel.str1.1
+                0x00000000000447ac       0x20 build/py/asmarm.o
+ .rodata.asm_arm_bcc_label.str1.1
+                0x00000000000447ac       0x2c build/py/asmarm.o
+ .rodata.asm_arm_bl_ind.str1.1
+                0x00000000000447d8       0x16 build/py/asmarm.o
+ *fill*         0x00000000000447ee        0x2 
+ .rodata.__PRETTY_FUNCTION__.0
+                0x00000000000447f0        0xf build/py/asmarm.o
+ *fill*         0x00000000000447ff        0x1 
+ .rodata.__PRETTY_FUNCTION__.1
+                0x0000000000044800       0x12 build/py/asmarm.o
+ *fill*         0x0000000000044812        0xe 
+ .rodata.__PRETTY_FUNCTION__.2
+                0x0000000000044820       0x16 build/py/asmarm.o
+ *fill*         0x0000000000044836        0xa 
+ .rodata.__PRETTY_FUNCTION__.3
+                0x0000000000044840       0x13 build/py/asmarm.o
+ *fill*         0x0000000000044853        0x5 
+ .rodata.__PRETTY_FUNCTION__.4
+                0x0000000000044858        0xe build/py/asmarm.o
+ .rodata.adjust_stack.str1.1
+                0x0000000000044866       0x98 build/py/emitnarm.o
+ .rodata.emit_native_leave_exc_stack.str1.1
+                0x0000000000044866       0x19 build/py/emitnarm.o
+ .rodata.emit_native_load_fast.str1.1
+                0x0000000000044866       0x22 build/py/emitnarm.o
+ .rodata.load_reg_stack_imm.str1.1
+                0x0000000000044866       0x15 build/py/emitnarm.o
+ .rodata.emit_native_store_map.str1.1
+                0x0000000000044866       0x4d build/py/emitnarm.o
+ .rodata.emit_native_end_finally.str1.1
+                0x0000000000044866       0x16 build/py/emitnarm.o
+ .rodata.emit_native_start_pass.str1.1
+                0x0000000000044866       0x28 build/py/emitnarm.o
+ .rodata.emit_native_unpack_ex.str1.1
+                0x0000000000044866       0x1a build/py/emitnarm.o
+ .rodata.emit_native_get_iter.str1.1
+                0x0000000000044866       0x15 build/py/emitnarm.o
+ .rodata.emit_native_raise_varargs.str1.1
+                0x0000000000044866       0x21 build/py/emitnarm.o
+ .rodata.emit_native_unary_op.str1.1
+                0x0000000000044866       0x1c build/py/emitnarm.o
+ .rodata.emit_native_jump_helper.str1.1
+                0x0000000000044866       0x28 build/py/emitnarm.o
+ .rodata.emit_native_store_fast.str1.1
+                0x0000000000044866       0x2c build/py/emitnarm.o
+ .rodata.emit_native_attr.str1.1
+                0x0000000000044866       0x19 build/py/emitnarm.o
+ .rodata.emit_native_store_comp.str1.1
+                0x0000000000044866       0x3a build/py/emitnarm.o
+ .rodata.emit_native_import.str1.1
+                0x0000000000044866       0x55 build/py/emitnarm.o
+ .rodata.emit_get_stack_pointer_to_reg_for_pop.str1.1
+                0x0000000000044866       0x18 build/py/emitnarm.o
+ .rodata.emit_native_yield.str1.1
+                0x0000000000044866        0xd build/py/emitnarm.o
+ .rodata.emit_native_return_value.str1.1
+                0x0000000000044866       0x22 build/py/emitnarm.o
+ .rodata.emit_native_build.str1.1
+                0x0000000000044866       0x5b build/py/emitnarm.o
+ .rodata.emit_native_end_pass.str1.1
+                0x0000000000044866       0xa2 build/py/emitnarm.o
+ .rodata.emit_native_make_function.str1.1
+                0x0000000000044866       0x3d build/py/emitnarm.o
+ .rodata.emit_native_call_function.str1.1
+                0x0000000000044866       0x51 build/py/emitnarm.o
+ .rodata.emit_native_binary_op.str1.1
+                0x0000000000044866       0x46 build/py/emitnarm.o
+ .rodata.emit_native_subscr.str1.1
+                0x0000000000044866       0x8c build/py/emitnarm.o
+ *fill*         0x0000000000044866        0xa 
+ .rodata.CSWTCH.262
+                0x0000000000044870       0x10 build/py/emitnarm.o
+ .rodata.__PRETTY_FUNCTION__.0
+                0x0000000000044880       0x17 build/py/emitnarm.o
+ *fill*         0x0000000000044897        0x9 
+ .rodata.__PRETTY_FUNCTION__.1
+                0x00000000000448a0       0x15 build/py/emitnarm.o
+ *fill*         0x00000000000448b5        0xb 
+ .rodata.__PRETTY_FUNCTION__.2
+                0x00000000000448c0       0x19 build/py/emitnarm.o
+ *fill*         0x00000000000448d9        0x7 
+ .rodata.__PRETTY_FUNCTION__.3
+                0x00000000000448e0       0x18 build/py/emitnarm.o
+ *fill*         0x00000000000448f8        0x8 
+ .rodata.__PRETTY_FUNCTION__.4
+                0x0000000000044900       0x18 build/py/emitnarm.o
+ *fill*         0x0000000000044918        0x8 
+ .rodata.__PRETTY_FUNCTION__.5
+                0x0000000000044920       0x18 build/py/emitnarm.o
+ *fill*         0x0000000000044938        0x8 
+ .rodata.__PRETTY_FUNCTION__.6
+                0x0000000000044940       0x18 build/py/emitnarm.o
+ *fill*         0x0000000000044958        0x8 
+ .rodata.__PRETTY_FUNCTION__.7
+                0x0000000000044960       0x1a build/py/emitnarm.o
+ *fill*         0x000000000004497a        0x6 
+ .rodata.__PRETTY_FUNCTION__.8
+                0x0000000000044980       0x18 build/py/emitnarm.o
+ *fill*         0x0000000000044998        0x8 
+ .rodata.__PRETTY_FUNCTION__.9
+                0x00000000000449a0       0x17 build/py/emitnarm.o
+ *fill*         0x00000000000449b7        0x9 
+ .rodata.__PRETTY_FUNCTION__.10
+                0x00000000000449c0       0x16 build/py/emitnarm.o
+ *fill*         0x00000000000449d6        0xa 
+ .rodata.__PRETTY_FUNCTION__.11
+                0x00000000000449e0       0x17 build/py/emitnarm.o
+ *fill*         0x00000000000449f7        0x9 
+ .rodata.__PRETTY_FUNCTION__.12
+                0x0000000000044a00       0x1a build/py/emitnarm.o
+ *fill*         0x0000000000044a1a        0x6 
+ .rodata.__PRETTY_FUNCTION__.13
+                0x0000000000044a20       0x15 build/py/emitnarm.o
+ *fill*         0x0000000000044a35        0xb 
+ .rodata.ccs.14
+                0x0000000000044a40       0x18 build/py/emitnarm.o
+ *fill*         0x0000000000044a58        0x8 
+ .rodata.__PRETTY_FUNCTION__.15
+                0x0000000000044a60       0x18 build/py/emitnarm.o
+ *fill*         0x0000000000044a78        0x8 
+ .rodata.__PRETTY_FUNCTION__.16
+                0x0000000000044a80       0x16 build/py/emitnarm.o
+ *fill*         0x0000000000044a96        0xa 
+ .rodata.__PRETTY_FUNCTION__.17
+                0x0000000000044aa0       0x17 build/py/emitnarm.o
+ *fill*         0x0000000000044ab7        0x9 
+ .rodata.__PRETTY_FUNCTION__.18
+                0x0000000000044ac0       0x1c build/py/emitnarm.o
+ *fill*         0x0000000000044adc        0x4 
+ .rodata.__PRETTY_FUNCTION__.19
+                0x0000000000044ae0       0x16 build/py/emitnarm.o
+ *fill*         0x0000000000044af6        0xa 
+ .rodata.__PRETTY_FUNCTION__.20
+                0x0000000000044b00       0x1a build/py/emitnarm.o
+ *fill*         0x0000000000044b1a        0x6 
+ .rodata.__PRETTY_FUNCTION__.21
+                0x0000000000044b20       0x1a build/py/emitnarm.o
+ *fill*         0x0000000000044b3a        0x6 
+ .rodata.__PRETTY_FUNCTION__.22
+                0x0000000000044b40       0x19 build/py/emitnarm.o
+ *fill*         0x0000000000044b59        0x7 
+ .rodata.__PRETTY_FUNCTION__.23
+                0x0000000000044b60       0x1a build/py/emitnarm.o
+ *fill*         0x0000000000044b7a        0x6 
+ .rodata.__PRETTY_FUNCTION__.24
+                0x0000000000044b80       0x26 build/py/emitnarm.o
+ *fill*         0x0000000000044ba6        0xa 
+ .rodata.__PRETTY_FUNCTION__.25
+                0x0000000000044bb0       0x1c build/py/emitnarm.o
+ *fill*         0x0000000000044bcc        0x4 
+ .rodata.__PRETTY_FUNCTION__.26
+                0x0000000000044bd0        0xd build/py/emitnarm.o
+ .rodata.reg_local_table
+                0x0000000000044bdd        0x3 build/py/emitnarm.o
+ .rodata.get_label_dest.str1.1
+                0x0000000000044be0       0x12 build/py/asmxtensa.o
+                                         0x32 (размер перед о�лаблением)
+ .rodata.asm_xtensa_bccz_reg_label.str1.1
+                0x0000000000044bf2       0x20 build/py/asmxtensa.o
+ .rodata.asm_xtensa_bcc_reg_reg_label.str1.1
+                0x0000000000044c12       0x1f build/py/asmxtensa.o
+ *fill*         0x0000000000044c31        0x7 
+ .rodata.__PRETTY_FUNCTION__.0
+                0x0000000000044c38        0xf build/py/asmxtensa.o
+ .rodata.adjust_stack.str1.1
+                0x0000000000044c47       0x98 build/py/emitnxtensa.o
+ .rodata.emit_native_leave_exc_stack.str1.1
+                0x0000000000044c47       0x19 build/py/emitnxtensa.o
+ .rodata.load_reg_stack_imm.str1.1
+                0x0000000000044c47       0x15 build/py/emitnxtensa.o
+ .rodata.emit_native_load_fast.str1.1
+                0x0000000000044c47       0x22 build/py/emitnxtensa.o
+ .rodata.emit_native_unary_op.str1.1
+                0x0000000000044c47       0x1c build/py/emitnxtensa.o
+ .rodata.emit_native_store_comp.str1.1
+                0x0000000000044c47       0x6e build/py/emitnxtensa.o
+ .rodata.emit_native_store_map.str1.1
+                0x0000000000044c47       0x19 build/py/emitnxtensa.o
+ .rodata.emit_native_end_finally.str1.1
+                0x0000000000044c47       0x16 build/py/emitnxtensa.o
+ .rodata.emit_native_raise_varargs.str1.1
+                0x0000000000044c47       0x21 build/py/emitnxtensa.o
+ .rodata.emit_native_jump_helper.str1.1
+                0x0000000000044c47       0x28 build/py/emitnxtensa.o
+ .rodata.emit_native_binary_op.str1.1
+                0x0000000000044c47       0x46 build/py/emitnxtensa.o
+ .rodata.emit_native_end_pass.str1.1
+                0x0000000000044c47       0xa2 build/py/emitnxtensa.o
+ .rodata.emit_native_make_function.str1.1
+                0x0000000000044c47       0x3d build/py/emitnxtensa.o
+ .rodata.emit_native_unpack_ex.str1.1
+                0x0000000000044c47       0x1a build/py/emitnxtensa.o
+ .rodata.emit_native_get_iter.str1.1
+                0x0000000000044c47       0x15 build/py/emitnxtensa.o
+ .rodata.emit_native_attr.str1.1
+                0x0000000000044c47       0x19 build/py/emitnxtensa.o
+ .rodata.emit_native_import.str1.1
+                0x0000000000044c47       0x55 build/py/emitnxtensa.o
+ .rodata.emit_get_stack_pointer_to_reg_for_pop.str1.1
+                0x0000000000044c47       0x18 build/py/emitnxtensa.o
+ .rodata.emit_native_call_function.str1.1
+                0x0000000000044c47       0x51 build/py/emitnxtensa.o
+ .rodata.emit_native_build.str1.1
+                0x0000000000044c47       0x5b build/py/emitnxtensa.o
+ .rodata.emit_native_yield.str1.1
+                0x0000000000044c47        0xd build/py/emitnxtensa.o
+ .rodata.emit_native_return_value.str1.1
+                0x0000000000044c47       0x22 build/py/emitnxtensa.o
+ .rodata.emit_native_store_fast.str1.1
+                0x0000000000044c47       0x2c build/py/emitnxtensa.o
+ .rodata.emit_native_start_pass.str1.1
+                0x0000000000044c47       0x28 build/py/emitnxtensa.o
+ .rodata.emit_native_subscr.str1.1
+                0x0000000000044c47       0x8c build/py/emitnxtensa.o
+ *fill*         0x0000000000044c47        0x9 
+ .rodata.CSWTCH.246
+                0x0000000000044c50       0x10 build/py/emitnxtensa.o
+ .rodata.__PRETTY_FUNCTION__.0
+                0x0000000000044c60       0x17 build/py/emitnxtensa.o
+ *fill*         0x0000000000044c77        0x9 
+ .rodata.__PRETTY_FUNCTION__.1
+                0x0000000000044c80       0x15 build/py/emitnxtensa.o
+ *fill*         0x0000000000044c95        0xb 
+ .rodata.__PRETTY_FUNCTION__.2
+                0x0000000000044ca0       0x19 build/py/emitnxtensa.o
+ *fill*         0x0000000000044cb9        0x7 
+ .rodata.__PRETTY_FUNCTION__.3
+                0x0000000000044cc0       0x18 build/py/emitnxtensa.o
+ *fill*         0x0000000000044cd8        0x8 
+ .rodata.__PRETTY_FUNCTION__.4
+                0x0000000000044ce0       0x18 build/py/emitnxtensa.o
+ *fill*         0x0000000000044cf8        0x8 
+ .rodata.__PRETTY_FUNCTION__.5
+                0x0000000000044d00       0x18 build/py/emitnxtensa.o
+ *fill*         0x0000000000044d18        0x8 
+ .rodata.__PRETTY_FUNCTION__.6
+                0x0000000000044d20       0x18 build/py/emitnxtensa.o
+ *fill*         0x0000000000044d38        0x8 
+ .rodata.__PRETTY_FUNCTION__.7
+                0x0000000000044d40       0x1a build/py/emitnxtensa.o
+ *fill*         0x0000000000044d5a        0x6 
+ .rodata.__PRETTY_FUNCTION__.8
+                0x0000000000044d60       0x18 build/py/emitnxtensa.o
+ *fill*         0x0000000000044d78        0x8 
+ .rodata.__PRETTY_FUNCTION__.9
+                0x0000000000044d80       0x17 build/py/emitnxtensa.o
+ *fill*         0x0000000000044d97        0x9 
+ .rodata.__PRETTY_FUNCTION__.10
+                0x0000000000044da0       0x16 build/py/emitnxtensa.o
+ *fill*         0x0000000000044db6        0xa 
+ .rodata.__PRETTY_FUNCTION__.11
+                0x0000000000044dc0       0x17 build/py/emitnxtensa.o
+ *fill*         0x0000000000044dd7        0x9 
+ .rodata.__PRETTY_FUNCTION__.12
+                0x0000000000044de0       0x1a build/py/emitnxtensa.o
+ *fill*         0x0000000000044dfa        0x6 
+ .rodata.__PRETTY_FUNCTION__.13
+                0x0000000000044e00       0x15 build/py/emitnxtensa.o
+ .rodata.ccs.14
+                0x0000000000044e15        0x6 build/py/emitnxtensa.o
+ *fill*         0x0000000000044e1b        0x5 
+ .rodata.__PRETTY_FUNCTION__.15
+                0x0000000000044e20       0x18 build/py/emitnxtensa.o
+ *fill*         0x0000000000044e38        0x8 
+ .rodata.__PRETTY_FUNCTION__.16
+                0x0000000000044e40       0x16 build/py/emitnxtensa.o
+ *fill*         0x0000000000044e56        0xa 
+ .rodata.__PRETTY_FUNCTION__.17
+                0x0000000000044e60       0x17 build/py/emitnxtensa.o
+ *fill*         0x0000000000044e77        0x9 
+ .rodata.__PRETTY_FUNCTION__.18
+                0x0000000000044e80       0x1c build/py/emitnxtensa.o
+ *fill*         0x0000000000044e9c        0x4 
+ .rodata.__PRETTY_FUNCTION__.19
+                0x0000000000044ea0       0x16 build/py/emitnxtensa.o
+ *fill*         0x0000000000044eb6        0xa 
+ .rodata.__PRETTY_FUNCTION__.20
+                0x0000000000044ec0       0x1a build/py/emitnxtensa.o
+ *fill*         0x0000000000044eda        0x6 
+ .rodata.__PRETTY_FUNCTION__.21
+                0x0000000000044ee0       0x1a build/py/emitnxtensa.o
+ *fill*         0x0000000000044efa        0x6 
+ .rodata.__PRETTY_FUNCTION__.22
+                0x0000000000044f00       0x19 build/py/emitnxtensa.o
+ *fill*         0x0000000000044f19        0x7 
+ .rodata.__PRETTY_FUNCTION__.23
+                0x0000000000044f20       0x1a build/py/emitnxtensa.o
+ *fill*         0x0000000000044f3a        0x6 
+ .rodata.__PRETTY_FUNCTION__.24
+                0x0000000000044f40       0x26 build/py/emitnxtensa.o
+ *fill*         0x0000000000044f66        0xa 
+ .rodata.__PRETTY_FUNCTION__.25
+                0x0000000000044f70       0x1c build/py/emitnxtensa.o
+ *fill*         0x0000000000044f8c        0x4 
+ .rodata.__PRETTY_FUNCTION__.26
+                0x0000000000044f90        0xd build/py/emitnxtensa.o
+ .rodata.reg_local_table
+                0x0000000000044f9d        0x3 build/py/emitnxtensa.o
+ .rodata.get_arg_reg.str1.1
+                0x0000000000044fa0       0x19 build/py/emitinlinextensa.o
+ .rodata.get_arg_i.str1.1
+                0x0000000000044fa0       0x2a build/py/emitinlinextensa.o
+                                         0x42 (размер перед о�лаблением)
+ .rodata.emit_inline_xtensa_label.str1.1
+                0x0000000000044fca       0x19 build/py/emitinlinextensa.o
+                                         0x3a (размер перед о�лаблением)
+ .rodata.get_arg_label.str1.1
+                0x0000000000044fe3       0x2c build/py/emitinlinextensa.o
+ .rodata.emit_inline_xtensa_op.str1.1
+                0x0000000000044fe3       0x36 build/py/emitinlinextensa.o
+ .rodata.emit_inline_xtensa_count_params.str1.1
+                0x0000000000045019       0x66 build/py/emitinlinextensa.o
+ *fill*         0x000000000004507f        0x1 
+ .rodata.__PRETTY_FUNCTION__.0
+                0x0000000000045080       0x19 build/py/emitinlinextensa.o
+ *fill*         0x0000000000045099        0x7 
+ .rodata.opcode_table_3arg
+                0x00000000000450a0       0x64 build/py/emitinlinextensa.o
+ *fill*         0x0000000000045104       0x1c 
+ .rodata.reg_name_table
+                0x0000000000045120       0x40 build/py/emitinlinextensa.o
+ .rodata.adjust_stack.str1.1
+                0x0000000000045160       0x98 build/py/emitnxtensawin.o
+ .rodata.emit_native_leave_exc_stack.str1.1
+                0x0000000000045160       0x19 build/py/emitnxtensawin.o
+ .rodata.load_reg_stack_imm.str1.1
+                0x0000000000045160       0x15 build/py/emitnxtensawin.o
+ .rodata.emit_native_load_fast.str1.1
+                0x0000000000045160       0x22 build/py/emitnxtensawin.o
+ .rodata.emit_native_unary_op.str1.1
+                0x0000000000045160       0x1c build/py/emitnxtensawin.o
+ .rodata.emit_native_store_comp.str1.1
+                0x0000000000045160       0x6e build/py/emitnxtensawin.o
+ .rodata.emit_native_store_map.str1.1
+                0x0000000000045160       0x19 build/py/emitnxtensawin.o
+ .rodata.emit_native_end_finally.str1.1
+                0x0000000000045160       0x16 build/py/emitnxtensawin.o
+ .rodata.emit_native_raise_varargs.str1.1
+                0x0000000000045160       0x21 build/py/emitnxtensawin.o
+ .rodata.emit_native_jump_helper.str1.1
+                0x0000000000045160       0x28 build/py/emitnxtensawin.o
+ .rodata.emit_native_binary_op.str1.1
+                0x0000000000045160       0x46 build/py/emitnxtensawin.o
+ .rodata.emit_native_end_pass.str1.1
+                0x0000000000045160       0xa2 build/py/emitnxtensawin.o
+ .rodata.emit_native_make_function.str1.1
+                0x0000000000045160       0x3d build/py/emitnxtensawin.o
+ .rodata.emit_native_unpack_ex.str1.1
+                0x0000000000045160       0x1a build/py/emitnxtensawin.o
+ .rodata.emit_native_get_iter.str1.1
+                0x0000000000045160       0x15 build/py/emitnxtensawin.o
+ .rodata.emit_native_attr.str1.1
+                0x0000000000045160       0x19 build/py/emitnxtensawin.o
+ .rodata.emit_native_import.str1.1
+                0x0000000000045160       0x55 build/py/emitnxtensawin.o
+ .rodata.emit_get_stack_pointer_to_reg_for_pop.str1.1
+                0x0000000000045160       0x18 build/py/emitnxtensawin.o
+ .rodata.emit_native_call_function.str1.1
+                0x0000000000045160       0x51 build/py/emitnxtensawin.o
+ .rodata.emit_native_build.str1.1
+                0x0000000000045160       0x5b build/py/emitnxtensawin.o
+ .rodata.emit_native_yield.str1.1
+                0x0000000000045160        0xd build/py/emitnxtensawin.o
+ .rodata.emit_native_return_value.str1.1
+                0x0000000000045160       0x22 build/py/emitnxtensawin.o
+ .rodata.emit_native_store_fast.str1.1
+                0x0000000000045160       0x2c build/py/emitnxtensawin.o
+ .rodata.emit_native_start_pass.str1.1
+                0x0000000000045160       0x28 build/py/emitnxtensawin.o
+ .rodata.emit_native_subscr.str1.1
+                0x0000000000045160       0x8c build/py/emitnxtensawin.o
+ .rodata.CSWTCH.247
+                0x0000000000045160       0x10 build/py/emitnxtensawin.o
+ .rodata.__PRETTY_FUNCTION__.0
+                0x0000000000045170       0x17 build/py/emitnxtensawin.o
+ *fill*         0x0000000000045187        0x9 
+ .rodata.__PRETTY_FUNCTION__.1
+                0x0000000000045190       0x15 build/py/emitnxtensawin.o
+ *fill*         0x00000000000451a5        0xb 
+ .rodata.__PRETTY_FUNCTION__.2
+                0x00000000000451b0       0x19 build/py/emitnxtensawin.o
+ *fill*         0x00000000000451c9        0x7 
+ .rodata.__PRETTY_FUNCTION__.3
+                0x00000000000451d0       0x18 build/py/emitnxtensawin.o
+ *fill*         0x00000000000451e8        0x8 
+ .rodata.__PRETTY_FUNCTION__.4
+                0x00000000000451f0       0x18 build/py/emitnxtensawin.o
+ *fill*         0x0000000000045208        0x8 
+ .rodata.__PRETTY_FUNCTION__.5
+                0x0000000000045210       0x18 build/py/emitnxtensawin.o
+ *fill*         0x0000000000045228        0x8 
+ .rodata.__PRETTY_FUNCTION__.6
+                0x0000000000045230       0x18 build/py/emitnxtensawin.o
+ *fill*         0x0000000000045248        0x8 
+ .rodata.__PRETTY_FUNCTION__.7
+                0x0000000000045250       0x1a build/py/emitnxtensawin.o
+ *fill*         0x000000000004526a        0x6 
+ .rodata.__PRETTY_FUNCTION__.8
+                0x0000000000045270       0x18 build/py/emitnxtensawin.o
+ *fill*         0x0000000000045288        0x8 
+ .rodata.__PRETTY_FUNCTION__.9
+                0x0000000000045290       0x17 build/py/emitnxtensawin.o
+ *fill*         0x00000000000452a7        0x9 
+ .rodata.__PRETTY_FUNCTION__.10
+                0x00000000000452b0       0x16 build/py/emitnxtensawin.o
+ *fill*         0x00000000000452c6        0xa 
+ .rodata.__PRETTY_FUNCTION__.11
+                0x00000000000452d0       0x17 build/py/emitnxtensawin.o
+ *fill*         0x00000000000452e7        0x9 
+ .rodata.__PRETTY_FUNCTION__.12
+                0x00000000000452f0       0x1a build/py/emitnxtensawin.o
+ *fill*         0x000000000004530a        0x6 
+ .rodata.__PRETTY_FUNCTION__.13
+                0x0000000000045310       0x15 build/py/emitnxtensawin.o
+ .rodata.ccs.14
+                0x0000000000045325        0x6 build/py/emitnxtensawin.o
+ *fill*         0x000000000004532b        0x5 
+ .rodata.__PRETTY_FUNCTION__.15
+                0x0000000000045330       0x18 build/py/emitnxtensawin.o
+ *fill*         0x0000000000045348        0x8 
+ .rodata.__PRETTY_FUNCTION__.16
+                0x0000000000045350       0x16 build/py/emitnxtensawin.o
+ *fill*         0x0000000000045366        0xa 
+ .rodata.__PRETTY_FUNCTION__.17
+                0x0000000000045370       0x17 build/py/emitnxtensawin.o
+ *fill*         0x0000000000045387        0x9 
+ .rodata.__PRETTY_FUNCTION__.18
+                0x0000000000045390       0x1c build/py/emitnxtensawin.o
+ *fill*         0x00000000000453ac        0x4 
+ .rodata.__PRETTY_FUNCTION__.19
+                0x00000000000453b0       0x16 build/py/emitnxtensawin.o
+ *fill*         0x00000000000453c6        0xa 
+ .rodata.__PRETTY_FUNCTION__.20
+                0x00000000000453d0       0x1a build/py/emitnxtensawin.o
+ *fill*         0x00000000000453ea        0x6 
+ .rodata.__PRETTY_FUNCTION__.21
+                0x00000000000453f0       0x1a build/py/emitnxtensawin.o
+ *fill*         0x000000000004540a        0x6 
+ .rodata.__PRETTY_FUNCTION__.22
+                0x0000000000045410       0x19 build/py/emitnxtensawin.o
+ *fill*         0x0000000000045429        0x7 
+ .rodata.__PRETTY_FUNCTION__.23
+                0x0000000000045430       0x1a build/py/emitnxtensawin.o
+ *fill*         0x000000000004544a       0x16 
+ .rodata.__PRETTY_FUNCTION__.24
+                0x0000000000045460       0x26 build/py/emitnxtensawin.o
+ *fill*         0x0000000000045486        0xa 
+ .rodata.__PRETTY_FUNCTION__.25
+                0x0000000000045490       0x1c build/py/emitnxtensawin.o
+ *fill*         0x00000000000454ac        0x4 
+ .rodata.__PRETTY_FUNCTION__.26
+                0x00000000000454b0        0xd build/py/emitnxtensawin.o
+ .rodata.reg_local_table
+                0x00000000000454bd        0x3 build/py/emitnxtensawin.o
+ .rodata.mp_format_float.str1.1
+                0x00000000000454c0       0x36 build/py/formatfloat.o
+ *fill*         0x00000000000454f6        0xa 
+ .rodata.__PRETTY_FUNCTION__.0
+                0x0000000000045500       0x10 build/py/formatfloat.o
+ *fill*         0x0000000000045510       0x10 
+ .rodata.g_neg_pow
+                0x0000000000045520       0x48 build/py/formatfloat.o
+ *fill*         0x0000000000045568       0x18 
+ .rodata.g_pos_pow
+                0x0000000000045580       0x48 build/py/formatfloat.o
+ .rodata.cst8   0x00000000000455c8       0x30 build/py/formatfloat.o
+ *fill*         0x00000000000455f8        0x8 
+ .rodata.cst16  0x0000000000045600       0x10 build/py/formatfloat.o
+                                         0x20 (размер перед о�лаблением)
+ .rodata.mp_parse_num_integer.str1.1
+                0x0000000000045610       0x4d build/py/parsenum.o
+ .rodata.mp_parse_num_decimal.str1.1
+                0x000000000004565d       0x1a build/py/parsenum.o
+ *fill*         0x0000000000045677        0x1 
+ .rodata.cst8   0x0000000000045678       0x20 build/py/parsenum.o
+                                         0x28 (размер перед о�лаблением)
+ .rodata.cst16  0x0000000000045698       0x10 build/py/parsenum.o
+ .rodata.mp_emit_glue_assign_native.str1.1
+                0x0000000000045698       0x69 build/py/emitglue.o
+ *fill*         0x0000000000045701        0xf 
+ .rodata.__PRETTY_FUNCTION__.1
+                0x0000000000045710       0x1b build/py/emitglue.o
+ .rodata.save_raw_code.str1.1
+                0x000000000004572b       0x2a build/py/persistentcode.o
+ *fill*         0x0000000000045755        0x3 
+ .rodata.__PRETTY_FUNCTION__.0
+                0x0000000000045758        0x9 build/py/persistentcode.o
+ .rodata.mp_load_method_maybe.str1.1
+                0x0000000000045761       0x3e build/py/runtime.o
+ .rodata.mp_unary_op.str1.1
+                0x000000000004579f       0x4f build/py/runtime.o
+ *fill*         0x00000000000457ee        0x2 
+ .rodata.mp_unary_op
+                0x00000000000457f0       0x24 build/py/runtime.o
+ .rodata.mp_call_function_n_kw.str1.1
+                0x0000000000045814       0x1b build/py/runtime.o
+ .rodata.checked_fun_call.str1.1
+                0x000000000004582f       0x25 build/py/runtime.o
+ .rodata.mp_getiter.str1.1
+                0x0000000000045854       0x20 build/py/runtime.o
+ .rodata.mp_iternext_allow_raise.str1.1
+                0x0000000000045874       0x1e build/py/runtime.o
+ .rodata.m_malloc_fail.str1.1
+                0x0000000000045892       0x57 build/py/runtime.o
+ .rodata.mp_binary_op.str1.1
+                0x00000000000458e9       0x3a build/py/runtime.o
+                                         0x49 (размер перед о�лаблением)
+ *fill*         0x0000000000045923        0x1 
+ .rodata.mp_binary_op
+                0x0000000000045924       0x90 build/py/runtime.o
+ *fill*         0x00000000000459b4        0x4 
+ .rodata.__PRETTY_FUNCTION__.1
+                0x00000000000459b8        0xb build/py/runtime.o
+ *fill*         0x00000000000459c3        0xd 
+ .rodata.__PRETTY_FUNCTION__.2
+                0x00000000000459d0       0x15 build/py/runtime.o
+ *fill*         0x00000000000459e5        0x3 
+ .rodata.__PRETTY_FUNCTION__.5
+                0x00000000000459e8        0xc build/py/runtime.o
+ .rodata.mp_arg_check_num_sig.str1.1
+                0x00000000000459f4       0xc2 build/py/argcheck.o
+ .rodata.mp_arg_parse_all.str1.1
+                0x0000000000045ab6       0x9b build/py/argcheck.o
+ .rodata.mp_arg_error_unimpl_kw.str1.1
+                0x0000000000045b51       0x42 build/py/argcheck.o
+ *fill*         0x0000000000045b93        0xd 
+ .rodata.__PRETTY_FUNCTION__.0
+                0x0000000000045ba0       0x11 build/py/argcheck.o
+ .rodata.mp_map_lookup.str1.1
+                0x0000000000045bb1       0x3b build/py/map.o
+ *fill*         0x0000000000045bec        0x4 
+ .rodata.__PRETTY_FUNCTION__.0
+                0x0000000000045bf0        0xe build/py/map.o
+ *fill*         0x0000000000045bfe        0x2 
+ .rodata.hash_allocation_sizes
+                0x0000000000045c00       0x44 build/py/map.o
+ .rodata.mp_obj_print_helper.str1.1
+                0x0000000000045c44        0xb build/py/obj.o
+ .rodata.mp_obj_print_exception.str1.1
+                0x0000000000045c4f       0x59 build/py/obj.o
+                                         0x5b (размер перед о�лаблением)
+ .rodata.mp_obj_get_float.str1.1
+                0x0000000000045ca8       0x1a build/py/obj.o
+ .rodata.mp_obj_get_complex.str1.1
+                0x0000000000045cc2       0x1c build/py/obj.o
+ .rodata.mp_obj_get_array.str1.1
+                0x0000000000045cde       0x22 build/py/obj.o
+ .rodata.mp_get_index.str1.1
+                0x0000000000045d00       0x3a build/py/obj.o
+ .rodata.mp_obj_subscr.str1.1
+                0x0000000000045d3a       0x76 build/py/obj.o
+ .rodata.mp_get_buffer_raise.str1.1
+                0x0000000000045db0       0x25 build/py/obj.o
+ *fill*         0x0000000000045dd5        0xb 
+ .rodata.__PRETTY_FUNCTION__.0
+                0x0000000000045de0       0x17 build/py/obj.o
+ .rodata.cst8   0x0000000000045df7        0x8 build/py/obj.o
+ .rodata.bool_print.str1.1
+                0x0000000000045df7        0xb build/py/objbool.o
+ .rodata.complex_print.str1.1
+                0x0000000000045df7        0xf build/py/objcomplex.o
+ *fill*         0x0000000000045e06        0x2 
+ .rodata.complex_unary_op
+                0x0000000000045e08       0x20 build/py/objcomplex.o
+ .rodata.mp_obj_complex_get.str1.1
+                0x0000000000045e28       0x3d build/py/objcomplex.o
+ .rodata.mp_obj_complex_binary_op.str1.1
+                0x0000000000045e65       0x55 build/py/objcomplex.o
+ *fill*         0x0000000000045eba        0x2 
+ .rodata.mp_obj_complex_binary_op
+                0x0000000000045ebc       0x84 build/py/objcomplex.o
+ .rodata.__PRETTY_FUNCTION__.0
+                0x0000000000045f40       0x13 build/py/objcomplex.o
+ .rodata.cst16  0x0000000000045f53       0x10 build/py/objcomplex.o
+ .rodata.cst8   0x0000000000045f53        0x8 build/py/objcomplex.o
+ .rodata.mp_map_slot_is_filled.str1.1
+                0x0000000000045f53       0x1d build/py/objdict.o
+ .rodata.dict_iter_next.str1.1
+                0x0000000000045f70       0x2b build/py/objdict.o
+ .rodata.dict_view_print.str1.1
+                0x0000000000045f9b        0x6 build/py/objdict.o
+                                          0x9 (размер перед о�лаблением)
+ .rodata.dict_print.str1.1
+                0x0000000000045fa1        0x2 build/py/objdict.o
+                                          0x7 (размер перед о�лаблением)
+ .rodata.dict_popitem.str1.1
+                0x0000000000045fa3       0x1f build/py/objdict.o
+                                         0x24 (размер перед о�лаблением)
+ .rodata.dict_update.str1.1
+                0x0000000000045fc2       0x26 build/py/objdict.o
+ .rodata.__PRETTY_FUNCTION__.0
+                0x0000000000045fe8        0xd build/py/objdict.o
+ *fill*         0x0000000000045ff5        0xb 
+ .rodata.__PRETTY_FUNCTION__.1
+                0x0000000000046000       0x16 build/py/objdict.o
+ *fill*         0x0000000000046016        0x2 
+ .rodata.__PRETTY_FUNCTION__.2
+                0x0000000000046018        0xf build/py/objdict.o
+ .rodata.str1.1
+                0x0000000000046027       0x21 build/py/objdict.o
+ .rodata.mp_obj_exception_print.str1.1
+                0x0000000000046048        0x4 build/py/objexcept.o
+ .rodata.mp_obj_new_exception.str1.1
+                0x0000000000046048       0x42 build/py/objexcept.o
+ .rodata.mp_obj_new_exception_msg_vlist.str1.1
+                0x000000000004608a        0xc build/py/objexcept.o
+ .rodata.mp_obj_exception_clear_traceback.str1.1
+                0x0000000000046096       0x26 build/py/objexcept.o
+ *fill*         0x00000000000460bc        0x4 
+ .rodata.__PRETTY_FUNCTION__.0
+                0x00000000000460c0       0x1f build/py/objexcept.o
+ *fill*         0x00000000000460df        0x1 
+ .rodata.__PRETTY_FUNCTION__.1
+                0x00000000000460e0       0x1f build/py/objexcept.o
+ *fill*         0x00000000000460ff        0x1 
+ .rodata.__PRETTY_FUNCTION__.3
+                0x0000000000046100       0x1f build/py/objexcept.o
+ *fill*         0x000000000004611f        0x1 
+ .rodata.__PRETTY_FUNCTION__.4
+                0x0000000000046120       0x19 build/py/objexcept.o
+ *fill*         0x0000000000046139        0x7 
+ .rodata.__PRETTY_FUNCTION__.6
+                0x0000000000046140       0x1a build/py/objexcept.o
+ *fill*         0x000000000004615a        0x6 
+ .rodata.__PRETTY_FUNCTION__.7
+                0x0000000000046160       0x15 build/py/objexcept.o
+ .rodata.mp_obj_float_get.str1.1
+                0x0000000000046175       0x2a build/py/objfloat.o
+ *fill*         0x000000000004619f        0x1 
+ .rodata.float_unary_op
+                0x00000000000461a0       0x20 build/py/objfloat.o
+ .rodata.float_print.str1.1
+                0x00000000000461c0        0x3 build/py/objfloat.o
+ .rodata.mp_obj_float_binary_op.str1.1
+                0x00000000000461c3        0xf build/py/objfloat.o
+ *fill*         0x00000000000461c3        0x1 
+ .rodata.mp_obj_float_binary_op
+                0x00000000000461c4       0x90 build/py/objfloat.o
+ *fill*         0x0000000000046254        0xc 
+ .rodata.__PRETTY_FUNCTION__.0
+                0x0000000000046260       0x11 build/py/objfloat.o
+ .rodata.cst16  0x0000000000046271       0x20 build/py/objfloat.o
+ *fill*         0x0000000000046271        0x7 
+ .rodata.cst8   0x0000000000046278        0x8 build/py/objfloat.o
+                                         0x18 (размер перед о�лаблением)
+ .rodata.fun_builtin_var_call.str1.1
+                0x0000000000046280       0x41 build/py/objfun.o
+ .rodata.fun_builtin_0_call.str1.1
+                0x00000000000462c1       0x30 build/py/objfun.o
+ .rodata.fun_builtin_1_call.str1.1
+                0x00000000000462f1       0x30 build/py/objfun.o
+ .rodata.fun_builtin_2_call.str1.1
+                0x0000000000046321       0x30 build/py/objfun.o
+ .rodata.fun_builtin_3_call.str1.1
+                0x0000000000046351       0x30 build/py/objfun.o
+ *fill*         0x0000000000046381        0xf 
+ .rodata.__PRETTY_FUNCTION__.3
+                0x0000000000046390       0x15 build/py/objfun.o
+ *fill*         0x00000000000463a5        0xb 
+ .rodata.__PRETTY_FUNCTION__.4
+                0x00000000000463b0       0x13 build/py/objfun.o
+ *fill*         0x00000000000463c3        0xd 
+ .rodata.__PRETTY_FUNCTION__.5
+                0x00000000000463d0       0x13 build/py/objfun.o
+ *fill*         0x00000000000463e3        0xd 
+ .rodata.__PRETTY_FUNCTION__.6
+                0x00000000000463f0       0x13 build/py/objfun.o
+ *fill*         0x0000000000046403        0xd 
+ .rodata.__PRETTY_FUNCTION__.7
+                0x0000000000046410       0x13 build/py/objfun.o
+ .rodata.mp_obj_new_int_from_float.str1.1
+                0x0000000000046423       0x32 build/py/objint.o
+ .rodata.mp_int_format_size.str1.1
+                0x0000000000046455       0x27 build/py/objint.o
+ .rodata.mp_obj_int_formatted.str1.1
+                0x000000000004647c       0x26 build/py/objint.o
+ *fill*         0x00000000000464a2        0xe 
+ .rodata.__PRETTY_FUNCTION__.0
+                0x00000000000464b0       0x15 build/py/objint.o
+ *fill*         0x00000000000464c5        0xb 
+ .rodata.__PRETTY_FUNCTION__.1
+                0x00000000000464d0       0x13 build/py/objint.o
+ *fill*         0x00000000000464e3        0xd 
+ .rodata.log_base2_floor
+                0x00000000000464f0       0x10 build/py/objint.o
+ .rodata.mp_obj_int_formatted_impl.str1.1
+                0x0000000000046500       0x13 build/py/objint_mpz.o
+                                         0x39 (размер перед о�лаблением)
+ *fill*         0x0000000000046513        0x1 
+ .rodata.mp_obj_int_unary_op
+                0x0000000000046514       0x20 build/py/objint_mpz.o
+ .rodata.mp_obj_int_get_checked.str1.1
+                0x0000000000046534       0x2d build/py/objint_mpz.o
+ .rodata.mp_obj_int_binary_op.str1.1
+                0x0000000000046561       0x3f build/py/objint_mpz.o
+                                         0x63 (размер перед о�лаблением)
+ .rodata.mp_obj_int_binary_op
+                0x00000000000465a0       0x7c build/py/objint_mpz.o
+ *fill*         0x000000000004661c        0x4 
+ .rodata.__PRETTY_FUNCTION__.0
+                0x0000000000046620       0x19 build/py/objint_mpz.o
+ *fill*         0x0000000000046639        0x7 
+ .rodata.__PRETTY_FUNCTION__.1
+                0x0000000000046640       0x15 build/py/objint_mpz.o
+ *fill*         0x0000000000046655        0xb 
+ .rodata.__PRETTY_FUNCTION__.2
+                0x0000000000046660       0x19 build/py/objint_mpz.o
+ *fill*         0x0000000000046679        0x7 
+ .rodata.__PRETTY_FUNCTION__.3
+                0x0000000000046680       0x1a build/py/objint_mpz.o
+ .rodata.list_pop.str1.1
+                0x000000000004669a       0x14 build/py/objlist.o
+ .rodata.list_print.str1.1
+                0x00000000000466ae       0x14 build/py/objlist.o
+                                          0x7 (размер перед о�лаблением)
+ .rodata.list_subscr.str1.1
+                0x00000000000466ae       0x1d build/py/objlist.o
+ *fill*         0x00000000000466cb        0x5 
+ .rodata.__PRETTY_FUNCTION__.0
+                0x00000000000466d0        0xc build/py/objlist.o
+ *fill*         0x00000000000466dc        0x4 
+ .rodata.allowed_args.1
+                0x00000000000466e0       0x20 build/py/objlist.o
+ .rodata.object___new__.str1.1
+                0x0000000000046700       0x16 build/py/objobject.o
+ *fill*         0x0000000000046716        0xa 
+ .rodata.allowed_args.0
+                0x0000000000046720       0x40 build/py/objproperty.o
+ .rodata.none_print.str1.1
+                0x0000000000046760        0x5 build/py/objnone.o
+ .rodata.singleton_print.str1.1
+                0x0000000000046760        0x3 build/py/objsingleton.o
+ .rodata.slice_print.str1.1
+                0x0000000000046763        0x7 build/py/objslice.o
+                                          0xc (размер перед о�лаблением)
+ .rodata.mp_obj_slice_indices.str1.1
+                0x000000000004676a       0x19 build/py/objslice.o
+ .rodata.bad_implicit_conversion.str1.1
+                0x0000000000046783       0x2b build/py/objstr.o
+ .rodata.mp_str_print_quoted.str1.1
+                0x00000000000467ae       0x17 build/py/objstr.o
+                                         0x1a (размер перед о�лаблением)
+ .rodata.str_print.str1.1
+                0x00000000000467c5        0x5 build/py/objstr.o
+                                          0x7 (размер перед о�лаблением)
+ .rodata.str_finder.str1.1
+                0x00000000000467ca       0x14 build/py/objstr.o
+ .rodata.str_join.str1.1
+                0x00000000000467de       0x45 build/py/objstr.o
+ .rodata.str_replace.str1.1
+                0x0000000000046823       0x1c build/py/objstr.o
+ .rodata.bytes_make_new.part.0.str1.1
+                0x000000000004683f       0x33 build/py/objstr.o
+ .rodata.str_uni_strip.str1.1
+                0x0000000000046872       0x43 build/py/objstr.o
+ .rodata.bytes_subscr.str1.1
+                0x00000000000468b5       0x31 build/py/objstr.o
+ .rodata.mp_obj_str_binary_op.str1.1
+                0x00000000000468e6       0xe3 build/py/objstr.o
+ *fill*         0x00000000000469c9        0x3 
+ .rodata.mp_obj_str_binary_op
+                0x00000000000469cc       0x84 build/py/objstr.o
+ .rodata.mp_obj_str_split.str1.1
+                0x0000000000046a50       0x10 build/py/objstr.o
+ .rodata.str_rsplit.str1.1
+                0x0000000000046a60        0xf build/py/objstr.o
+ .rodata.str_endswith.str1.1
+                0x0000000000046a6f       0x12 build/py/objstr.o
+ .rodata.mp_obj_str_format_helper.str1.1
+                0x0000000000046a81      0x288 build/py/objstr.o
+ *fill*         0x0000000000046d09        0x3 
+ .rodata.mp_obj_str_format_helper
+                0x0000000000046d0c       0x5c build/py/objstr.o
+ .rodata.__PRETTY_FUNCTION__.0
+                0x0000000000046d68        0xc build/py/objstr.o
+ *fill*         0x0000000000046d74        0xc 
+ .rodata.__PRETTY_FUNCTION__.1
+                0x0000000000046d80       0x19 build/py/objstr.o
+ *fill*         0x0000000000046d99        0x7 
+ .rodata.__PRETTY_FUNCTION__.2
+                0x0000000000046da0        0xe build/py/objstr.o
+ .rodata.whitespace.3
+                0x0000000000046dae        0x7 build/py/objstr.o
+ .rodata.str1.1
+                0x0000000000046db5        0x1 build/py/objstr.o
+ *fill*         0x0000000000046db5        0x3 
+ .rodata.cst8   0x0000000000046db8        0x8 build/py/objstr.o
+ .rodata.uni_print.str1.1
+                0x0000000000046dc0        0xe build/py/objstrunicode.o
+                                         0x2d (размер перед о�лаблением)
+ .rodata.str_index_to_ptr.str1.1
+                0x0000000000046dce       0x42 build/py/objstrunicode.o
+ .rodata.str_subscr.str1.1
+                0x0000000000046e10       0x2b build/py/objstrunicode.o
+                                         0x5c (размер перед о�лаблением)
+ *fill*         0x0000000000046e3b        0x5 
+ .rodata.__PRETTY_FUNCTION__.0
+                0x0000000000046e40        0xb build/py/objstrunicode.o
+ .rodata.mp_obj_tuple_print.str1.1
+                0x0000000000046e4b        0x2 build/py/objtuple.o
+                                          0x9 (размер перед о�лаблением)
+ .rodata.mp_obj_tuple_subscr.str1.1
+                0x0000000000046e4d       0x31 build/py/objtuple.o
+ .rodata.mp_obj_tuple_get.str1.1
+                0x0000000000046e4d       0x35 build/py/objtuple.o
+ *fill*         0x0000000000046e82        0xe 
+ .rodata.__PRETTY_FUNCTION__.1
+                0x0000000000046e90       0x11 build/py/objtuple.o
+ .rodata.instance_count_native_bases.str1.1
+                0x0000000000046ea1       0x35 build/py/objtype.o
+ .rodata.type_print.str1.1
+                0x0000000000046ed6        0xd build/py/objtype.o
+ .rodata.mp_map_slot_is_filled.str1.1
+                0x0000000000046ee3       0x1d build/py/objtype.o
+ .rodata.type_call.str1.1
+                0x0000000000046ee3       0x1c build/py/objtype.o
+ .rodata.mp_obj_class_lookup.str1.1
+                0x0000000000046eff       0x3e build/py/objtype.o
+                                         0x6c (размер перед о�лаблением)
+ .rodata.mp_obj_instance_attr.str1.1
+                0x0000000000046f3d       0x47 build/py/objtype.o
+ .rodata.instance_print.str1.1
+                0x0000000000046f84       0x12 build/py/objtype.o
+ .rodata.static_class_method_make_new.str1.1
+                0x0000000000046f96       0x3e build/py/objtype.o
+ .rodata.type_attr.str1.1
+                0x0000000000046fd4       0x8a build/py/objtype.o
+ .rodata.mp_obj_instance_call.str1.1
+                0x000000000004705e       0x1b build/py/objtype.o
+ .rodata.mp_obj_new_instance.str1.1
+                0x000000000004705e       0x15 build/py/objtype.o
+ .rodata.mp_obj_instance_make_new.str1.1
+                0x0000000000047073       0x46 build/py/objtype.o
+ .rodata.mp_obj_new_type.str1.1
+                0x00000000000470b9       0x56 build/py/objtype.o
+ .rodata.type_make_new.str1.1
+                0x000000000004710f       0x1c build/py/objtype.o
+ *fill*         0x000000000004712b        0x5 
+ .rodata.__PRETTY_FUNCTION__.1
+                0x0000000000047130       0x1d build/py/objtype.o
+ *fill*         0x000000000004714d        0x3 
+ .rodata.__PRETTY_FUNCTION__.2
+                0x0000000000047150       0x16 build/py/objtype.o
+ *fill*         0x0000000000047166        0xa 
+ .rodata.__PRETTY_FUNCTION__.3
+                0x0000000000047170       0x1a build/py/objtype.o
+ *fill*         0x000000000004718a        0x6 
+ .rodata.__PRETTY_FUNCTION__.4
+                0x0000000000047190        0xa build/py/objtype.o
+ *fill*         0x000000000004719a        0x6 
+ .rodata.__PRETTY_FUNCTION__.5
+                0x00000000000471a0       0x14 build/py/objtype.o
+ *fill*         0x00000000000471b4        0xc 
+ .rodata.__PRETTY_FUNCTION__.6
+                0x00000000000471c0       0x19 build/py/objtype.o
+ *fill*         0x00000000000471d9        0x7 
+ .rodata.__PRETTY_FUNCTION__.7
+                0x00000000000471e0       0x1c build/py/objtype.o
+ *fill*         0x00000000000471fc        0x4 
+ .rodata.__PRETTY_FUNCTION__.8
+                0x0000000000047200       0x14 build/py/objtype.o
+ *fill*         0x0000000000047214        0xc 
+ .rodata.mp_binary_op_method_name
+                0x0000000000047220       0x25 build/py/objtype.o
+                0x0000000000047220                mp_binary_op_method_name
+ *fill*         0x0000000000047245        0x3 
+ .rodata.mp_unary_op_method_name
+                0x0000000000047248        0xa build/py/objtype.o
+                0x0000000000047248                mp_unary_op_method_name
+ .rodata.mp_seq_index_obj.str1.1
+                0x0000000000047252       0x17 build/py/sequence.o
+ .rodata.usage.isra.0.str1.1
+                0x0000000000047269      0x35b build/main.o
+ .rodata.main_.str1.1
+                0x00000000000475c4      0x150 build/main.o
+                                        0x157 (размер перед о�лаблением)
+ .rodata.nlr_jump_fail.str1.1
+                0x0000000000047714       0x18 build/main.o
+
+.rodata1
+ *(.rodata1)
+
+.eh_frame_hdr   0x000000000004772c       0x34
+ *(.eh_frame_hdr)
+ .eh_frame_hdr  0x000000000004772c       0x34 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+                0x000000000004772c                __GNU_EH_FRAME_HDR
+ *(.eh_frame_entry .eh_frame_entry.*)
+
+.eh_frame       0x0000000000047760       0xe8
+ *(.eh_frame)
+ .eh_frame      0x0000000000047760       0x30 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+                                         0x2c (размер перед о�лаблением)
+ *fill*         0x0000000000047790        0x0 
+ .eh_frame      0x0000000000047790       0x40 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ .eh_frame      0x00000000000477d0       0x18 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+                                         0x30 (размер перед о�лаблением)
+ .eh_frame      0x00000000000477e8       0x5c /usr/lib/x86_64-linux-gnu/libc_nonshared.a(elf-init.oS)
+                                         0x78 (размер перед о�лаблением)
+ .eh_frame      0x0000000000047844        0x4 /usr/lib/gcc/x86_64-linux-gnu/10/crtendS.o
+ *(.eh_frame.*)
+
+.gcc_except_table
+ *(.gcc_except_table .gcc_except_table.*)
+
+.gnu_extab
+ *(.gnu_extab*)
+
+.exception_ranges
+ *(.exception_ranges*)
+                0x0000000000048db0                . = DATA_SEGMENT_ALIGN (CONSTANT (MAXPAGESIZE), CONSTANT (COMMONPAGESIZE))
+
+.eh_frame
+ *(.eh_frame)
+ *(.eh_frame.*)
+
+.gnu_extab
+ *(.gnu_extab)
+
+.gcc_except_table
+ *(.gcc_except_table .gcc_except_table.*)
+
+.exception_ranges
+ *(.exception_ranges*)
+
+.tdata          0x0000000000048db0        0x0
+                [!provide]                        PROVIDE (__tdata_start = .)
+ *(.tdata .tdata.* .gnu.linkonce.td.*)
+
+.tbss
+ *(.tbss .tbss.* .gnu.linkonce.tb.*)
+ *(.tcommon)
+
+.preinit_array  0x0000000000048db0        0x0
+                [!provide]                        PROVIDE (__preinit_array_start = .)
+ *(.preinit_array)
+                [!provide]                        PROVIDE (__preinit_array_end = .)
+
+.init_array     0x0000000000048db0        0x8
+                0x0000000000048db0                PROVIDE (__init_array_start = .)
+ *(SORT_BY_INIT_PRIORITY(.init_array.*) SORT_BY_INIT_PRIORITY(.ctors.*))
+ *(.init_array EXCLUDE_FILE(*crtend?.o *crtend.o *crtbegin?.o *crtbegin.o) .ctors)
+ .init_array    0x0000000000048db0        0x8 /usr/lib/gcc/x86_64-linux-gnu/10/crtbeginS.o
+                0x0000000000048db8                PROVIDE (__init_array_end = .)
+
+.fini_array     0x0000000000048db8        0x8
+                [!provide]                        PROVIDE (__fini_array_start = .)
+ *(SORT_BY_INIT_PRIORITY(.fini_array.*) SORT_BY_INIT_PRIORITY(.dtors.*))
+ *(.fini_array EXCLUDE_FILE(*crtend?.o *crtend.o *crtbegin?.o *crtbegin.o) .dtors)
+ .fini_array    0x0000000000048db8        0x8 /usr/lib/gcc/x86_64-linux-gnu/10/crtbeginS.o
+                [!provide]                        PROVIDE (__fini_array_end = .)
+
+.ctors
+ *crtbegin.o(.ctors)
+ *crtbegin?.o(.ctors)
+ *(EXCLUDE_FILE(*crtend?.o *crtend.o) .ctors)
+ *(SORT_BY_NAME(.ctors.*))
+ *(.ctors)
+
+.dtors
+ *crtbegin.o(.dtors)
+ *crtbegin?.o(.dtors)
+ *(EXCLUDE_FILE(*crtend?.o *crtend.o) .dtors)
+ *(SORT_BY_NAME(.dtors.*))
+ *(.dtors)
+
+.jcr
+ *(.jcr)
+
+.data.rel.ro    0x0000000000048dc0     0x4000
+ *(.data.rel.ro.local* .gnu.linkonce.d.rel.ro.local.*)
+ .data.rel.ro.local.mp_qstr_const_pool
+                0x0000000000048dc0      0xab8 build/py/qstr.o
+                0x0000000000048dc0                mp_qstr_const_pool
+ *fill*         0x0000000000049878        0x8 
+ .data.rel.ro.local.tok_kw
+                0x0000000000049880      0x120 build/py/lexer.o
+ .data.rel.ro.local.mp_constants_map
+                0x00000000000499a0       0x18 build/py/parse.o
+ *fill*         0x00000000000499b8        0x8 
+ .data.rel.ro.local.compile_function
+                0x00000000000499c0      0x1d0 build/py/compile.o
+ *fill*         0x0000000000049b90       0x10 
+ .data.rel.ro.local.emit_bc_method_table
+                0x0000000000049ba0      0x1c0 build/py/emitbc.o
+                0x0000000000049ba0                emit_bc_method_table
+ .data.rel.ro.local.emit_native_x64_method_table
+                0x0000000000049d60      0x1c0 build/py/emitnx64.o
+                0x0000000000049d60                emit_native_x64_method_table
+ .data.rel.ro.local.emit_native_x86_method_table
+                0x0000000000049f20      0x1c0 build/py/emitnx86.o
+                0x0000000000049f20                emit_native_x86_method_table
+ .data.rel.ro.local.emit_native_thumb_method_table
+                0x000000000004a0e0      0x1c0 build/py/emitnthumb.o
+                0x000000000004a0e0                emit_native_thumb_method_table
+ .data.rel.ro.local.emit_inline_thumb_method_table
+                0x000000000004a2a0       0x38 build/py/emitinlinethumb.o
+                0x000000000004a2a0                emit_inline_thumb_method_table
+ *fill*         0x000000000004a2d8        0x8 
+ .data.rel.ro.local.emit_native_arm_method_table
+                0x000000000004a2e0      0x1c0 build/py/emitnarm.o
+                0x000000000004a2e0                emit_native_arm_method_table
+ .data.rel.ro.local.emit_native_xtensa_method_table
+                0x000000000004a4a0      0x1c0 build/py/emitnxtensa.o
+                0x000000000004a4a0                emit_native_xtensa_method_table
+ .data.rel.ro.local.emit_inline_xtensa_method_table
+                0x000000000004a660       0x38 build/py/emitinlinextensa.o
+                0x000000000004a660                emit_inline_xtensa_method_table
+ *fill*         0x000000000004a698        0x8 
+ .data.rel.ro.local.emit_native_xtensawin_method_table
+                0x000000000004a6a0      0x1c0 build/py/emitnxtensawin.o
+                0x000000000004a6a0                emit_native_xtensawin_method_table
+ .data.rel.ro.local.dict_locals_dict
+                0x000000000004a860       0x20 build/py/objdict.o
+ .data.rel.ro.local.mp_dict_view_names
+                0x000000000004a880       0x18 build/py/objdict.o
+ *fill*         0x000000000004a898        0x8 
+ .data.rel.ro.local.int_locals_dict_table
+                0x000000000004a8a0       0x20 build/py/objint.o
+ .data.rel.ro.local.list_locals_dict_table
+                0x000000000004a8c0       0xb0 build/py/objlist.o
+ *fill*         0x000000000004a970       0x10 
+ .data.rel.ro.local.object_locals_dict_table
+                0x000000000004a980       0x20 build/py/objobject.o
+ .data.rel.ro.local.property_locals_dict_table
+                0x000000000004a9a0       0x30 build/py/objproperty.o
+ .data.rel.ro.local.mp_const_ellipsis_obj
+                0x000000000004a9d0       0x10 build/py/objsingleton.o
+                0x000000000004a9d0                mp_const_ellipsis_obj
+ .data.rel.ro.local.mp_const_empty_bytes_obj
+                0x000000000004a9e0       0x20 build/py/objstr.o
+                0x000000000004a9e0                mp_const_empty_bytes_obj
+ .data.rel.ro.local.str8_locals_dict_table
+                0x000000000004aa00      0x170 build/py/objstr.o
+ .data.rel.ro.local.mp_const_empty_tuple_obj
+                0x000000000004ab70       0x10 build/py/objtuple.o
+                0x000000000004ab70                mp_const_empty_tuple_obj
+ .data.rel.ro.local.tuple_locals_dict_table
+                0x000000000004ab80       0x20 build/py/objtuple.o
+ .data.rel.ro.local.mp_type_classmethod
+                0x000000000004aba0       0x78 build/py/objtype.o
+                0x000000000004aba0                mp_type_classmethod
+ *fill*         0x000000000004ac18        0x8 
+ .data.rel.ro.local.mp_type_staticmethod
+                0x000000000004ac20       0x78 build/py/objtype.o
+                0x000000000004ac20                mp_type_staticmethod
+ *fill*         0x000000000004ac98        0x8 
+ .data.rel.ro.local.mp_stderr_print
+                0x000000000004aca0       0x10 build/main.o
+ *(.data.rel.ro .data.rel.ro.* .gnu.linkonce.d.rel.ro.*)
+ .data.rel.ro   0x000000000004acb0        0x0 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ *fill*         0x000000000004acb0       0x10 
+ .data.rel.ro.emit_asm_table
+                0x000000000004acc0       0x58 build/py/compile.o
+ *fill*         0x000000000004ad18        0x8 
+ .data.rel.ro.emit_native_table
+                0x000000000004ad20       0x58 build/py/compile.o
+ *fill*         0x000000000004ad78        0x8 
+ .data.rel.ro.mp_type_checked_fun
+                0x000000000004ad80       0x78 build/py/runtime.o
+ *fill*         0x000000000004adf8        0x8 
+ .data.rel.ro.types.1
+                0x000000000004ae00       0x80 build/py/obj.o
+ .data.rel.ro.mp_type_bool
+                0x000000000004ae80       0x78 build/py/objbool.o
+                0x000000000004ae80                mp_type_bool
+ *fill*         0x000000000004aef8        0x8 
+ .data.rel.ro.mp_type_complex
+                0x000000000004af00       0x78 build/py/objcomplex.o
+                0x000000000004af00                mp_type_complex
+ *fill*         0x000000000004af78        0x8 
+ .data.rel.ro.mp_type_dict
+                0x000000000004af80       0x78 build/py/objdict.o
+                0x000000000004af80                mp_type_dict
+ *fill*         0x000000000004aff8        0x8 
+ .data.rel.ro.dict_locals_dict_table
+                0x000000000004b000       0xe0 build/py/objdict.o
+ .data.rel.ro.dict_values_obj
+                0x000000000004b0e0       0x10 build/py/objdict.o
+ .data.rel.ro.dict_keys_obj
+                0x000000000004b0f0       0x10 build/py/objdict.o
+ .data.rel.ro.dict_items_obj
+                0x000000000004b100       0x10 build/py/objdict.o
+ *fill*         0x000000000004b110       0x10 
+ .data.rel.ro.dict_view_it_type
+                0x000000000004b120       0x78 build/py/objdict.o
+ *fill*         0x000000000004b198        0x8 
+ .data.rel.ro.dict_view_type
+                0x000000000004b1a0       0x78 build/py/objdict.o
+ *fill*         0x000000000004b218        0x8 
+ .data.rel.ro.dict_update_obj
+                0x000000000004b220       0x18 build/py/objdict.o
+ *fill*         0x000000000004b238        0x8 
+ .data.rel.ro.dict_popitem_obj
+                0x000000000004b240       0x10 build/py/objdict.o
+ .data.rel.ro.dict_setdefault_obj
+                0x000000000004b250       0x18 build/py/objdict.o
+ *fill*         0x000000000004b268        0x8 
+ .data.rel.ro.dict_pop_obj
+                0x000000000004b270       0x18 build/py/objdict.o
+ *fill*         0x000000000004b288        0x8 
+ .data.rel.ro.dict_get_obj
+                0x000000000004b290       0x18 build/py/objdict.o
+ *fill*         0x000000000004b2a8        0x8 
+ .data.rel.ro.dict_fromkeys_obj
+                0x000000000004b2b0       0x10 build/py/objdict.o
+ .data.rel.ro.dict_fromkeys_fun_obj
+                0x000000000004b2c0       0x18 build/py/objdict.o
+ *fill*         0x000000000004b2d8        0x8 
+ .data.rel.ro.dict_copy_obj
+                0x000000000004b2e0       0x10 build/py/objdict.o
+ .data.rel.ro.dict_clear_obj
+                0x000000000004b2f0       0x10 build/py/objdict.o
+ .data.rel.ro.mp_type_UnicodeError
+                0x000000000004b300       0x78 build/py/objexcept.o
+                0x000000000004b300                mp_type_UnicodeError
+ *fill*         0x000000000004b378        0x8 
+ .data.rel.ro.mp_type_ValueError
+                0x000000000004b380       0x78 build/py/objexcept.o
+                0x000000000004b380                mp_type_ValueError
+ *fill*         0x000000000004b3f8        0x8 
+ .data.rel.ro.mp_type_ViperTypeError
+                0x000000000004b400       0x78 build/py/objexcept.o
+                0x000000000004b400                mp_type_ViperTypeError
+ *fill*         0x000000000004b478        0x8 
+ .data.rel.ro.mp_type_TypeError
+                0x000000000004b480       0x78 build/py/objexcept.o
+                0x000000000004b480                mp_type_TypeError
+ *fill*         0x000000000004b4f8        0x8 
+ .data.rel.ro.mp_type_IndentationError
+                0x000000000004b500       0x78 build/py/objexcept.o
+                0x000000000004b500                mp_type_IndentationError
+ *fill*         0x000000000004b578        0x8 
+ .data.rel.ro.mp_type_SyntaxError
+                0x000000000004b580       0x78 build/py/objexcept.o
+                0x000000000004b580                mp_type_SyntaxError
+ *fill*         0x000000000004b5f8        0x8 
+ .data.rel.ro.mp_type_NotImplementedError
+                0x000000000004b600       0x78 build/py/objexcept.o
+                0x000000000004b600                mp_type_NotImplementedError
+ *fill*         0x000000000004b678        0x8 
+ .data.rel.ro.mp_type_RuntimeError
+                0x000000000004b680       0x78 build/py/objexcept.o
+                0x000000000004b680                mp_type_RuntimeError
+ *fill*         0x000000000004b6f8        0x8 
+ .data.rel.ro.mp_type_OSError
+                0x000000000004b700       0x78 build/py/objexcept.o
+                0x000000000004b700                mp_type_OSError
+ *fill*         0x000000000004b778        0x8 
+ .data.rel.ro.mp_type_MemoryError
+                0x000000000004b780       0x78 build/py/objexcept.o
+                0x000000000004b780                mp_type_MemoryError
+ *fill*         0x000000000004b7f8        0x8 
+ .data.rel.ro.mp_type_KeyError
+                0x000000000004b800       0x78 build/py/objexcept.o
+                0x000000000004b800                mp_type_KeyError
+ *fill*         0x000000000004b878        0x8 
+ .data.rel.ro.mp_type_IndexError
+                0x000000000004b880       0x78 build/py/objexcept.o
+                0x000000000004b880                mp_type_IndexError
+ *fill*         0x000000000004b8f8        0x8 
+ .data.rel.ro.mp_type_LookupError
+                0x000000000004b900       0x78 build/py/objexcept.o
+                0x000000000004b900                mp_type_LookupError
+ *fill*         0x000000000004b978        0x8 
+ .data.rel.ro.mp_type_AttributeError
+                0x000000000004b980       0x78 build/py/objexcept.o
+                0x000000000004b980                mp_type_AttributeError
+ *fill*         0x000000000004b9f8        0x8 
+ .data.rel.ro.mp_type_ZeroDivisionError
+                0x000000000004ba00       0x78 build/py/objexcept.o
+                0x000000000004ba00                mp_type_ZeroDivisionError
+ *fill*         0x000000000004ba78        0x8 
+ .data.rel.ro.mp_type_OverflowError
+                0x000000000004ba80       0x78 build/py/objexcept.o
+                0x000000000004ba80                mp_type_OverflowError
+ *fill*         0x000000000004baf8        0x8 
+ .data.rel.ro.mp_type_ArithmeticError
+                0x000000000004bb00       0x78 build/py/objexcept.o
+                0x000000000004bb00                mp_type_ArithmeticError
+ *fill*         0x000000000004bb78        0x8 
+ .data.rel.ro.mp_type_StopIteration
+                0x000000000004bb80       0x78 build/py/objexcept.o
+                0x000000000004bb80                mp_type_StopIteration
+ *fill*         0x000000000004bbf8        0x8 
+ .data.rel.ro.mp_type_Exception
+                0x000000000004bc00       0x78 build/py/objexcept.o
+                0x000000000004bc00                mp_type_Exception
+ *fill*         0x000000000004bc78        0x8 
+ .data.rel.ro.mp_type_BaseException
+                0x000000000004bc80       0x78 build/py/objexcept.o
+                0x000000000004bc80                mp_type_BaseException
+ *fill*         0x000000000004bcf8        0x8 
+ .data.rel.ro.mp_type_float
+                0x000000000004bd00       0x78 build/py/objfloat.o
+                0x000000000004bd00                mp_type_float
+ *fill*         0x000000000004bd78        0x8 
+ .data.rel.ro.mp_type_fun_builtin_var
+                0x000000000004bd80       0x78 build/py/objfun.o
+                0x000000000004bd80                mp_type_fun_builtin_var
+ *fill*         0x000000000004bdf8        0x8 
+ .data.rel.ro.mp_type_fun_builtin_3
+                0x000000000004be00       0x78 build/py/objfun.o
+                0x000000000004be00                mp_type_fun_builtin_3
+ *fill*         0x000000000004be78        0x8 
+ .data.rel.ro.mp_type_fun_builtin_2
+                0x000000000004be80       0x78 build/py/objfun.o
+                0x000000000004be80                mp_type_fun_builtin_2
+ *fill*         0x000000000004bef8        0x8 
+ .data.rel.ro.mp_type_fun_builtin_1
+                0x000000000004bf00       0x78 build/py/objfun.o
+                0x000000000004bf00                mp_type_fun_builtin_1
+ *fill*         0x000000000004bf78        0x8 
+ .data.rel.ro.mp_type_fun_builtin_0
+                0x000000000004bf80       0x78 build/py/objfun.o
+                0x000000000004bf80                mp_type_fun_builtin_0
+ *fill*         0x000000000004bff8        0x8 
+ .data.rel.ro.it_type
+                0x000000000004c000       0x78 build/py/objgetitemiter.o
+ *fill*         0x000000000004c078        0x8 
+ .data.rel.ro.mp_type_int
+                0x000000000004c080       0x78 build/py/objint.o
+                0x000000000004c080                mp_type_int
+ *fill*         0x000000000004c0f8        0x8 
+ .data.rel.ro.int_locals_dict
+                0x000000000004c100       0x20 build/py/objint.o
+ .data.rel.ro.int_to_bytes_obj
+                0x000000000004c120       0x18 build/py/objint.o
+ *fill*         0x000000000004c138        0x8 
+ .data.rel.ro.int_from_bytes_obj
+                0x000000000004c140       0x10 build/py/objint.o
+ .data.rel.ro.int_from_bytes_fun_obj
+                0x000000000004c150       0x18 build/py/objint.o
+ *fill*         0x000000000004c168       0x18 
+ .data.rel.ro.mp_type_list
+                0x000000000004c180       0x78 build/py/objlist.o
+                0x000000000004c180                mp_type_list
+ *fill*         0x000000000004c1f8        0x8 
+ .data.rel.ro.list_locals_dict
+                0x000000000004c200       0x20 build/py/objlist.o
+ .data.rel.ro.list_sort_obj
+                0x000000000004c220       0x18 build/py/objlist.o
+ *fill*         0x000000000004c238        0x8 
+ .data.rel.ro.list_reverse_obj
+                0x000000000004c240       0x10 build/py/objlist.o
+ .data.rel.ro.list_remove_obj
+                0x000000000004c250       0x10 build/py/objlist.o
+ .data.rel.ro.list_pop_obj
+                0x000000000004c260       0x18 build/py/objlist.o
+ *fill*         0x000000000004c278        0x8 
+ .data.rel.ro.list_insert_obj
+                0x000000000004c280       0x10 build/py/objlist.o
+ .data.rel.ro.list_index_obj
+                0x000000000004c290       0x18 build/py/objlist.o
+ *fill*         0x000000000004c2a8        0x8 
+ .data.rel.ro.list_count_obj
+                0x000000000004c2b0       0x10 build/py/objlist.o
+ .data.rel.ro.list_copy_obj
+                0x000000000004c2c0       0x10 build/py/objlist.o
+ .data.rel.ro.list_clear_obj
+                0x000000000004c2d0       0x10 build/py/objlist.o
+ .data.rel.ro.list_extend_obj
+                0x000000000004c2e0       0x10 build/py/objlist.o
+ .data.rel.ro.list_append_obj
+                0x000000000004c2f0       0x10 build/py/objlist.o
+ .data.rel.ro.mp_type_object
+                0x000000000004c300       0x78 build/py/objobject.o
+                0x000000000004c300                mp_type_object
+ *fill*         0x000000000004c378        0x8 
+ .data.rel.ro.object_locals_dict
+                0x000000000004c380       0x20 build/py/objobject.o
+ .data.rel.ro.object___new___obj
+                0x000000000004c3a0       0x10 build/py/objobject.o
+ .data.rel.ro.object___new___fun_obj
+                0x000000000004c3b0       0x10 build/py/objobject.o
+ .data.rel.ro.object___init___obj
+                0x000000000004c3c0       0x10 build/py/objobject.o
+ *fill*         0x000000000004c3d0       0x10 
+ .data.rel.ro.mp_type_polymorph_iter
+                0x000000000004c3e0       0x78 build/py/objpolyiter.o
+                0x000000000004c3e0                mp_type_polymorph_iter
+ *fill*         0x000000000004c458        0x8 
+ .data.rel.ro.mp_type_property
+                0x000000000004c460       0x78 build/py/objproperty.o
+                0x000000000004c460                mp_type_property
+ *fill*         0x000000000004c4d8        0x8 
+ .data.rel.ro.property_locals_dict
+                0x000000000004c4e0       0x20 build/py/objproperty.o
+ .data.rel.ro.property_deleter_obj
+                0x000000000004c500       0x10 build/py/objproperty.o
+ .data.rel.ro.property_setter_obj
+                0x000000000004c510       0x10 build/py/objproperty.o
+ .data.rel.ro.property_getter_obj
+                0x000000000004c520       0x10 build/py/objproperty.o
+ *fill*         0x000000000004c530       0x10 
+ .data.rel.ro.mp_type_NoneType
+                0x000000000004c540       0x78 build/py/objnone.o
+                0x000000000004c540                mp_type_NoneType
+ *fill*         0x000000000004c5b8        0x8 
+ .data.rel.ro.mp_type_singleton
+                0x000000000004c5c0       0x78 build/py/objsingleton.o
+                0x000000000004c5c0                mp_type_singleton
+ *fill*         0x000000000004c638        0x8 
+ .data.rel.ro.mp_type_slice
+                0x000000000004c640       0x78 build/py/objslice.o
+                0x000000000004c640                mp_type_slice
+ *fill*         0x000000000004c6b8        0x8 
+ .data.rel.ro.mp_type_bytes
+                0x000000000004c6c0       0x78 build/py/objstr.o
+                0x000000000004c6c0                mp_type_bytes
+ *fill*         0x000000000004c738        0x8 
+ .data.rel.ro.str8_locals_dict
+                0x000000000004c740       0x20 build/py/objstr.o
+ .data.rel.ro.str_encode_obj
+                0x000000000004c760       0x18 build/py/objstr.o
+                0x000000000004c760                str_encode_obj
+ *fill*         0x000000000004c778        0x8 
+ .data.rel.ro.bytes_decode_obj
+                0x000000000004c780       0x18 build/py/objstr.o
+                0x000000000004c780                bytes_decode_obj
+ *fill*         0x000000000004c798        0x8 
+ .data.rel.ro.str_islower_obj
+                0x000000000004c7a0       0x10 build/py/objstr.o
+                0x000000000004c7a0                str_islower_obj
+ .data.rel.ro.str_isupper_obj
+                0x000000000004c7b0       0x10 build/py/objstr.o
+                0x000000000004c7b0                str_isupper_obj
+ .data.rel.ro.str_isdigit_obj
+                0x000000000004c7c0       0x10 build/py/objstr.o
+                0x000000000004c7c0                str_isdigit_obj
+ .data.rel.ro.str_isalpha_obj
+                0x000000000004c7d0       0x10 build/py/objstr.o
+                0x000000000004c7d0                str_isalpha_obj
+ .data.rel.ro.str_isspace_obj
+                0x000000000004c7e0       0x10 build/py/objstr.o
+                0x000000000004c7e0                str_isspace_obj
+ .data.rel.ro.str_upper_obj
+                0x000000000004c7f0       0x10 build/py/objstr.o
+                0x000000000004c7f0                str_upper_obj
+ .data.rel.ro.str_lower_obj
+                0x000000000004c800       0x10 build/py/objstr.o
+                0x000000000004c800                str_lower_obj
+ .data.rel.ro.str_count_obj
+                0x000000000004c810       0x18 build/py/objstr.o
+                0x000000000004c810                str_count_obj
+ *fill*         0x000000000004c828        0x8 
+ .data.rel.ro.str_replace_obj
+                0x000000000004c830       0x18 build/py/objstr.o
+                0x000000000004c830                str_replace_obj
+ *fill*         0x000000000004c848        0x8 
+ .data.rel.ro.str_format_obj
+                0x000000000004c850       0x18 build/py/objstr.o
+                0x000000000004c850                str_format_obj
+ *fill*         0x000000000004c868        0x8 
+ .data.rel.ro.str_rstrip_obj
+                0x000000000004c870       0x18 build/py/objstr.o
+                0x000000000004c870                str_rstrip_obj
+ *fill*         0x000000000004c888        0x8 
+ .data.rel.ro.str_lstrip_obj
+                0x000000000004c890       0x18 build/py/objstr.o
+                0x000000000004c890                str_lstrip_obj
+ *fill*         0x000000000004c8a8        0x8 
+ .data.rel.ro.str_strip_obj
+                0x000000000004c8b0       0x18 build/py/objstr.o
+                0x000000000004c8b0                str_strip_obj
+ *fill*         0x000000000004c8c8        0x8 
+ .data.rel.ro.str_endswith_obj
+                0x000000000004c8d0       0x18 build/py/objstr.o
+                0x000000000004c8d0                str_endswith_obj
+ *fill*         0x000000000004c8e8        0x8 
+ .data.rel.ro.str_startswith_obj
+                0x000000000004c8f0       0x18 build/py/objstr.o
+                0x000000000004c8f0                str_startswith_obj
+ *fill*         0x000000000004c908        0x8 
+ .data.rel.ro.str_rindex_obj
+                0x000000000004c910       0x18 build/py/objstr.o
+                0x000000000004c910                str_rindex_obj
+ *fill*         0x000000000004c928        0x8 
+ .data.rel.ro.str_index_obj
+                0x000000000004c930       0x18 build/py/objstr.o
+                0x000000000004c930                str_index_obj
+ *fill*         0x000000000004c948        0x8 
+ .data.rel.ro.str_rfind_obj
+                0x000000000004c950       0x18 build/py/objstr.o
+                0x000000000004c950                str_rfind_obj
+ *fill*         0x000000000004c968        0x8 
+ .data.rel.ro.str_find_obj
+                0x000000000004c970       0x18 build/py/objstr.o
+                0x000000000004c970                str_find_obj
+ *fill*         0x000000000004c988        0x8 
+ .data.rel.ro.str_rsplit_obj
+                0x000000000004c990       0x18 build/py/objstr.o
+                0x000000000004c990                str_rsplit_obj
+ *fill*         0x000000000004c9a8        0x8 
+ .data.rel.ro.str_split_obj
+                0x000000000004c9b0       0x18 build/py/objstr.o
+                0x000000000004c9b0                str_split_obj
+ *fill*         0x000000000004c9c8        0x8 
+ .data.rel.ro.str_join_obj
+                0x000000000004c9d0       0x10 build/py/objstr.o
+                0x000000000004c9d0                str_join_obj
+ .data.rel.ro.mp_type_str
+                0x000000000004c9e0       0x78 build/py/objstrunicode.o
+                0x000000000004c9e0                mp_type_str
+ *fill*         0x000000000004ca58        0x8 
+ .data.rel.ro.struni_locals_dict
+                0x000000000004ca60       0x20 build/py/objstrunicode.o
+ .data.rel.ro.struni_locals_dict_table
+                0x000000000004ca80      0x170 build/py/objstrunicode.o
+ *fill*         0x000000000004cbf0       0x10 
+ .data.rel.ro.mp_type_tuple
+                0x000000000004cc00       0x78 build/py/objtuple.o
+                0x000000000004cc00                mp_type_tuple
+ *fill*         0x000000000004cc78        0x8 
+ .data.rel.ro.tuple_locals_dict
+                0x000000000004cc80       0x20 build/py/objtuple.o
+ .data.rel.ro.tuple_index_obj
+                0x000000000004cca0       0x18 build/py/objtuple.o
+ *fill*         0x000000000004ccb8        0x8 
+ .data.rel.ro.tuple_count_obj
+                0x000000000004ccc0       0x10 build/py/objtuple.o
+ *fill*         0x000000000004ccd0       0x10 
+ .data.rel.ro.mp_type_type
+                0x000000000004cce0       0x78 build/py/objtype.o
+                0x000000000004cce0                mp_type_type
+ *fill*         0x000000000004cd58        0x8 
+ .data.rel.ro.native_base_init_wrapper_obj
+                0x000000000004cd60       0x18 build/py/objtype.o
+ *fill*         0x000000000004cd78        0x8 
+ .data.rel.ro.mp_op_delitem_obj
+                0x000000000004cd80       0x10 build/py/opmethods.o
+                0x000000000004cd80                mp_op_delitem_obj
+ .data.rel.ro.mp_op_setitem_obj
+                0x000000000004cd90       0x10 build/py/opmethods.o
+                0x000000000004cd90                mp_op_setitem_obj
+ .data.rel.ro.mp_op_getitem_obj
+                0x000000000004cda0       0x10 build/py/opmethods.o
+                0x000000000004cda0                mp_op_getitem_obj
+ .data.rel.ro.mp_builtin_next_obj
+                0x000000000004cdb0       0x10 build/py/modbuiltins.o
+                0x000000000004cdb0                mp_builtin_next_obj
+
+.dynamic        0x000000000004cdc0      0x1f0
+ *(.dynamic)
+ .dynamic       0x000000000004cdc0      0x1f0 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+                0x000000000004cdc0                _DYNAMIC
+
+.got            0x000000000004cfb0       0x48
+ *(.got)
+ .got           0x000000000004cfb0       0x48 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+ *(.igot)
+                0x000000000004dfe8                . = DATA_SEGMENT_RELRO_END (., (SIZEOF (.got.plt) >= 0x18)?0x18:0x0)
+
+.got.plt        0x000000000004d000       0xf8
+ *(.got.plt)
+ .got.plt       0x000000000004d000       0xf8 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+                0x000000000004d000                _GLOBAL_OFFSET_TABLE_
+ *(.igot.plt)
+
+.data           0x000000000004d0f8       0x10
+ *(.data .data.* .gnu.linkonce.d.*)
+ .data.rel.local
+                0x000000000004d0f8        0x8 /usr/lib/gcc/x86_64-linux-gnu/10/crtbeginS.o
+                0x000000000004d0f8                __dso_handle
+ .data.heap_size
+                0x000000000004d100        0x8 build/main.o
+                0x000000000004d100                heap_size
+
+.tm_clone_table
+                0x000000000004d108        0x0
+ .tm_clone_table
+                0x000000000004d108        0x0 /usr/lib/gcc/x86_64-linux-gnu/10/crtbeginS.o
+ .tm_clone_table
+                0x000000000004d108        0x0 /usr/lib/gcc/x86_64-linux-gnu/10/crtendS.o
+
+.data1
+ *(.data1)
+                0x000000000004d108                _edata = .
+                [!provide]                        PROVIDE (edata = .)
+                0x000000000004d108                . = .
+                0x000000000004d108                __bss_start = .
+
+.bss            0x000000000004d120      0x380
+ *(.dynbss)
+ .dynbss        0x000000000004d120        0x8 /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+                0x000000000004d120                stderr@@GLIBC_2.2.5
+ *(.bss .bss.* .gnu.linkonce.b.*)
+ .bss           0x000000000004d128        0x1 /usr/lib/gcc/x86_64-linux-gnu/10/crtbeginS.o
+ *fill*         0x000000000004d129       0x17 
+ .bss.mp_state_ctx
+                0x000000000004d140      0x348 build/py/mpstate.o
+                0x000000000004d140                mp_state_ctx
+ .bss.mp_dynamic_compiler
+                0x000000000004d488        0x5 build/py/mpstate.o
+                0x000000000004d488                mp_dynamic_compiler
+ *fill*         0x000000000004d48d        0x3 
+ .bss.mp_verbose_flag
+                0x000000000004d490        0x8 build/main.o
+                0x000000000004d490                mp_verbose_flag
+ .bss.emit_opt  0x000000000004d498        0x4 build/main.o
+ *(COMMON)
+                0x000000000004d4a0                . = ALIGN ((. != 0x0)?0x8:0x1)
+ *fill*         0x000000000004d49c        0x4 
+
+.lbss
+ *(.dynlbss)
+ *(.lbss .lbss.* .gnu.linkonce.lb.*)
+ *(LARGE_COMMON)
+                0x000000000004d4a0                . = ALIGN (0x8)
+                0x000000000004d4a0                . = SEGMENT_START ("ldata-segment", .)
+
+.lrodata
+ *(.lrodata .lrodata.* .gnu.linkonce.lr.*)
+
+.ldata          0x000000000004f4a0        0x0
+ *(.ldata .ldata.* .gnu.linkonce.l.*)
+                0x000000000004f4a0                . = ALIGN ((. != 0x0)?0x8:0x1)
+                0x000000000004f4a0                . = ALIGN (0x8)
+                0x000000000004d4a0                _end = .
+                [!provide]                        PROVIDE (end = .)
+                0x000000000004f4a0                . = DATA_SEGMENT_END (.)
+
+.stab
+ *(.stab)
+
+.stabstr
+ *(.stabstr)
+
+.stab.excl
+ *(.stab.excl)
+
+.stab.exclstr
+ *(.stab.exclstr)
+
+.stab.index
+ *(.stab.index)
+
+.stab.indexstr
+ *(.stab.indexstr)
+
+.comment        0x0000000000000000       0x27
+ *(.comment)
+ .comment       0x0000000000000000       0x27 /usr/lib/gcc/x86_64-linux-gnu/10/crtbeginS.o
+                                         0x28 (размер перед о�лаблением)
+ .comment       0x0000000000000027       0x28 build/py/mpstate.o
+ .comment       0x0000000000000027       0x28 build/py/nlr.o
+ .comment       0x0000000000000027       0x28 build/py/nlrx64.o
+ .comment       0x0000000000000027       0x28 build/py/malloc.o
+ .comment       0x0000000000000027       0x28 build/py/gc.o
+ .comment       0x0000000000000027       0x28 build/py/qstr.o
+ .comment       0x0000000000000027       0x28 build/py/vstr.o
+ .comment       0x0000000000000027       0x28 build/py/mpprint.o
+ .comment       0x0000000000000027       0x28 build/py/unicode.o
+ .comment       0x0000000000000027       0x28 build/py/mpz.o
+ .comment       0x0000000000000027       0x28 build/py/reader.o
+ .comment       0x0000000000000027       0x28 build/py/lexer.o
+ .comment       0x0000000000000027       0x28 build/py/parse.o
+ .comment       0x0000000000000027       0x28 build/py/scope.o
+ .comment       0x0000000000000027       0x28 build/py/compile.o
+ .comment       0x0000000000000027       0x28 build/py/emitcommon.o
+ .comment       0x0000000000000027       0x28 build/py/emitbc.o
+ .comment       0x0000000000000027       0x28 build/py/asmbase.o
+ .comment       0x0000000000000027       0x28 build/py/asmx64.o
+ .comment       0x0000000000000027       0x28 build/py/emitnx64.o
+ .comment       0x0000000000000027       0x28 build/py/asmx86.o
+ .comment       0x0000000000000027       0x28 build/py/emitnx86.o
+ .comment       0x0000000000000027       0x28 build/py/asmthumb.o
+ .comment       0x0000000000000027       0x28 build/py/emitnthumb.o
+ .comment       0x0000000000000027       0x28 build/py/emitinlinethumb.o
+ .comment       0x0000000000000027       0x28 build/py/asmarm.o
+ .comment       0x0000000000000027       0x28 build/py/emitnarm.o
+ .comment       0x0000000000000027       0x28 build/py/asmxtensa.o
+ .comment       0x0000000000000027       0x28 build/py/emitnxtensa.o
+ .comment       0x0000000000000027       0x28 build/py/emitinlinextensa.o
+ .comment       0x0000000000000027       0x28 build/py/emitnxtensawin.o
+ .comment       0x0000000000000027       0x28 build/py/formatfloat.o
+ .comment       0x0000000000000027       0x28 build/py/parsenumbase.o
+ .comment       0x0000000000000027       0x28 build/py/parsenum.o
+ .comment       0x0000000000000027       0x28 build/py/emitglue.o
+ .comment       0x0000000000000027       0x28 build/py/persistentcode.o
+ .comment       0x0000000000000027       0x28 build/py/runtime.o
+ .comment       0x0000000000000027       0x28 build/py/nativeglue.o
+ .comment       0x0000000000000027       0x28 build/py/stackctrl.o
+ .comment       0x0000000000000027       0x28 build/py/argcheck.o
+ .comment       0x0000000000000027       0x28 build/py/map.o
+ .comment       0x0000000000000027       0x28 build/py/obj.o
+ .comment       0x0000000000000027       0x28 build/py/objbool.o
+ .comment       0x0000000000000027       0x28 build/py/objboundmeth.o
+ .comment       0x0000000000000027       0x28 build/py/objcomplex.o
+ .comment       0x0000000000000027       0x28 build/py/objdict.o
+ .comment       0x0000000000000027       0x28 build/py/objexcept.o
+ .comment       0x0000000000000027       0x28 build/py/objfloat.o
+ .comment       0x0000000000000027       0x28 build/py/objfun.o
+ .comment       0x0000000000000027       0x28 build/py/objgetitemiter.o
+ .comment       0x0000000000000027       0x28 build/py/objint.o
+ .comment       0x0000000000000027       0x28 build/py/objint_mpz.o
+ .comment       0x0000000000000027       0x28 build/py/objlist.o
+ .comment       0x0000000000000027       0x28 build/py/objobject.o
+ .comment       0x0000000000000027       0x28 build/py/objpolyiter.o
+ .comment       0x0000000000000027       0x28 build/py/objproperty.o
+ .comment       0x0000000000000027       0x28 build/py/objnone.o
+ .comment       0x0000000000000027       0x28 build/py/objsingleton.o
+ .comment       0x0000000000000027       0x28 build/py/objslice.o
+ .comment       0x0000000000000027       0x28 build/py/objstr.o
+ .comment       0x0000000000000027       0x28 build/py/objstrunicode.o
+ .comment       0x0000000000000027       0x28 build/py/objtuple.o
+ .comment       0x0000000000000027       0x28 build/py/objtype.o
+ .comment       0x0000000000000027       0x28 build/py/opmethods.o
+ .comment       0x0000000000000027       0x28 build/py/sequence.o
+ .comment       0x0000000000000027       0x28 build/py/binary.o
+ .comment       0x0000000000000027       0x28 build/py/modbuiltins.o
+ .comment       0x0000000000000027       0x28 build/py/bc.o
+ .comment       0x0000000000000027       0x28 build/py/smallint.o
+ .comment       0x0000000000000027       0x28 build/main.o
+ .comment       0x0000000000000027       0x28 build/gccollect.o
+ .comment       0x0000000000000027       0x28 build/lib/utils/gchelper_generic.o
+ .comment       0x0000000000000027       0x28 /usr/lib/gcc/x86_64-linux-gnu/10/crtendS.o
+
+.gnu.build.attributes
+ *(.gnu.build.attributes .gnu.build.attributes.*)
+
+.debug
+ *(.debug)
+
+.line
+ *(.line)
+
+.debug_srcinfo
+ *(.debug_srcinfo)
+
+.debug_sfnames
+ *(.debug_sfnames)
+
+.debug_aranges
+ *(.debug_aranges)
+
+.debug_pubnames
+ *(.debug_pubnames)
+
+.debug_info
+ *(.debug_info .gnu.linkonce.wi.*)
+
+.debug_abbrev
+ *(.debug_abbrev)
+
+.debug_line
+ *(.debug_line .debug_line.* .debug_line_end)
+
+.debug_frame
+ *(.debug_frame)
+
+.debug_str
+ *(.debug_str)
+
+.debug_loc
+ *(.debug_loc)
+
+.debug_macinfo
+ *(.debug_macinfo)
+
+.debug_weaknames
+ *(.debug_weaknames)
+
+.debug_funcnames
+ *(.debug_funcnames)
+
+.debug_typenames
+ *(.debug_typenames)
+
+.debug_varnames
+ *(.debug_varnames)
+
+.debug_pubtypes
+ *(.debug_pubtypes)
+
+.debug_ranges
+ *(.debug_ranges)
+
+.debug_macro
+ *(.debug_macro)
+
+.debug_addr
+ *(.debug_addr)
+
+.gnu.attributes
+ *(.gnu.attributes)
+
+/DISCARD/
+ *(.note.GNU-stack)
+ *(.gnu_debuglink)
+ *(.gnu.lto_*)
+OUTPUT(mpy-cross elf64-x86-64)
+
+Таблица перекрё�тных ��ылок
+
+Символ                                      Файл
+GLIBC_2.10                                        /lib/x86_64-linux-gnu/libc.so.6
+GLIBC_2.11                                        /lib/x86_64-linux-gnu/libc.so.6
+GLIBC_2.12                                        /lib/x86_64-linux-gnu/libc.so.6
+GLIBC_2.13                                        /lib/x86_64-linux-gnu/libc.so.6
+GLIBC_2.14                                        /lib/x86_64-linux-gnu/libc.so.6
+GLIBC_2.15                                        /lib/x86_64-linux-gnu/libm.so.6
+                                                  /lib/x86_64-linux-gnu/libc.so.6
+GLIBC_2.16                                        /lib/x86_64-linux-gnu/libc.so.6
+GLIBC_2.17                                        /lib/x86_64-linux-gnu/libc.so.6
+GLIBC_2.18                                        /lib/x86_64-linux-gnu/libm.so.6
+                                                  /lib/x86_64-linux-gnu/libc.so.6
+GLIBC_2.2.5                                       /lib/x86_64-linux-gnu/libm.so.6
+                                                  /lib64/ld-linux-x86-64.so.2
+                                                  /lib/x86_64-linux-gnu/libc.so.6
+GLIBC_2.2.6                                       /lib/x86_64-linux-gnu/libc.so.6
+GLIBC_2.22                                        /lib/x86_64-linux-gnu/libc.so.6
+GLIBC_2.23                                        /lib/x86_64-linux-gnu/libm.so.6
+                                                  /lib/x86_64-linux-gnu/libc.so.6
+GLIBC_2.24                                        /lib/x86_64-linux-gnu/libm.so.6
+                                                  /lib/x86_64-linux-gnu/libc.so.6
+GLIBC_2.25                                        /lib/x86_64-linux-gnu/libm.so.6
+                                                  /lib/x86_64-linux-gnu/libc.so.6
+GLIBC_2.26                                        /lib/x86_64-linux-gnu/libm.so.6
+                                                  /lib/x86_64-linux-gnu/libc.so.6
+GLIBC_2.27                                        /lib/x86_64-linux-gnu/libm.so.6
+                                                  /lib/x86_64-linux-gnu/libc.so.6
+GLIBC_2.28                                        /lib/x86_64-linux-gnu/libm.so.6
+                                                  /lib/x86_64-linux-gnu/libc.so.6
+GLIBC_2.29                                        /lib/x86_64-linux-gnu/libm.so.6
+                                                  /lib/x86_64-linux-gnu/libc.so.6
+GLIBC_2.3                                         /lib/x86_64-linux-gnu/libc.so.6
+                                                  /lib64/ld-linux-x86-64.so.2
+GLIBC_2.3.2                                       /lib/x86_64-linux-gnu/libc.so.6
+GLIBC_2.3.3                                       /lib/x86_64-linux-gnu/libc.so.6
+GLIBC_2.3.4                                       /lib/x86_64-linux-gnu/libc.so.6
+GLIBC_2.30                                        /lib/x86_64-linux-gnu/libc.so.6
+GLIBC_2.31                                        /lib/x86_64-linux-gnu/libm.so.6
+GLIBC_2.4                                         /lib/x86_64-linux-gnu/libm.so.6
+                                                  /lib64/ld-linux-x86-64.so.2
+                                                  /lib/x86_64-linux-gnu/libc.so.6
+GLIBC_2.5                                         /lib/x86_64-linux-gnu/libc.so.6
+GLIBC_2.6                                         /lib/x86_64-linux-gnu/libc.so.6
+GLIBC_2.7                                         /lib/x86_64-linux-gnu/libc.so.6
+GLIBC_2.8                                         /lib/x86_64-linux-gnu/libc.so.6
+GLIBC_2.9                                         /lib/x86_64-linux-gnu/libc.so.6
+GLIBC_PRIVATE                                     /lib/x86_64-linux-gnu/libc.so.6
+                                                  /lib64/ld-linux-x86-64.so.2
+_DYNAMIC                                          /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+_Exit                                             /lib/x86_64-linux-gnu/libc.so.6
+_Exit@@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libc.so.6
+_Exit@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libc.so.6
+_GLOBAL_OFFSET_TABLE_                             /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+                                                  /usr/lib/x86_64-linux-gnu/libc_nonshared.a(elf-init.oS)
+                                                  build/lib/utils/gchelper_generic.o
+                                                  build/gccollect.o
+                                                  build/main.o
+                                                  build/py/bc.o
+                                                  build/py/vm.o
+                                                  build/py/modstruct.o
+                                                  build/py/modmicropython.o
+                                                  build/py/modbuiltins.o
+                                                  build/py/builtinevex.o
+                                                  build/py/builtinimport.o
+                                                  build/py/binary.o
+                                                  build/py/stream.o
+                                                  build/py/sequence.o
+                                                  build/py/opmethods.o
+                                                  build/py/objzip.o
+                                                  build/py/objtype.o
+                                                  build/py/objtuple.o
+                                                  build/py/objstrunicode.o
+                                                  build/py/objstr.o
+                                                  build/py/objslice.o
+                                                  build/py/objsingleton.o
+                                                  build/py/objset.o
+                                                  build/py/objreversed.o
+                                                  build/py/objrange.o
+                                                  build/py/objnone.o
+                                                  build/py/objproperty.o
+                                                  build/py/objobject.o
+                                                  build/py/objmodule.o
+                                                  build/py/objmap.o
+                                                  build/py/objlist.o
+                                                  build/py/objint_mpz.o
+                                                  build/py/objint.o
+                                                  build/py/objgetitemiter.o
+                                                  build/py/objgenerator.o
+                                                  build/py/objfun.o
+                                                  build/py/objfloat.o
+                                                  build/py/objfilter.o
+                                                  build/py/objexcept.o
+                                                  build/py/objenumerate.o
+                                                  build/py/objdict.o
+                                                  build/py/objcomplex.o
+                                                  build/py/objclosure.o
+                                                  build/py/objcell.o
+                                                  build/py/objboundmeth.o
+                                                  build/py/objbool.o
+                                                  build/py/objarray.o
+                                                  build/py/obj.o
+                                                  build/py/map.o
+                                                  build/py/warning.o
+                                                  build/py/argcheck.o
+                                                  build/py/stackctrl.o
+                                                  build/py/nativeglue.o
+                                                  build/py/scheduler.o
+                                                  build/py/runtime_utils.o
+                                                  build/py/runtime.o
+                                                  build/py/persistentcode.o
+                                                  build/py/emitglue.o
+                                                  build/py/parsenum.o
+                                                  build/py/formatfloat.o
+                                                  build/py/emitnxtensawin.o
+                                                  build/py/emitinlinextensa.o
+                                                  build/py/emitnxtensa.o
+                                                  build/py/asmxtensa.o
+                                                  build/py/emitnarm.o
+                                                  build/py/asmarm.o
+                                                  build/py/emitinlinethumb.o
+                                                  build/py/emitnthumb.o
+                                                  build/py/asmthumb.o
+                                                  build/py/emitnx86.o
+                                                  build/py/asmx86.o
+                                                  build/py/emitnx64.o
+                                                  build/py/asmx64.o
+                                                  build/py/asmbase.o
+                                                  build/py/emitbc.o
+                                                  build/py/emitcommon.o
+                                                  build/py/compile.o
+                                                  build/py/scope.o
+                                                  build/py/parse.o
+                                                  build/py/lexer.o
+                                                  build/py/reader.o
+                                                  build/py/mpz.o
+                                                  build/py/mpprint.o
+                                                  build/py/vstr.o
+                                                  build/py/qstr.o
+                                                  build/py/gc.o
+                                                  build/py/malloc.o
+                                                  build/py/nlrx64.o
+                                                  /usr/lib/gcc/x86_64-linux-gnu/10/crtbeginS.o
+                                                  /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/crti.o
+_IO_fprintf                                       /lib/x86_64-linux-gnu/libc.so.6
+_IO_fprintf@@GLIBC_2.2.5                          /lib/x86_64-linux-gnu/libc.so.6
+_IO_fprintf@GLIBC_2.2.5                           /lib/x86_64-linux-gnu/libc.so.6
+_IO_stdin_used                                    /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+_ITM_deregisterTMCloneTable                       /lib/x86_64-linux-gnu/libm.so.6
+                                                  /usr/lib/gcc/x86_64-linux-gnu/10/crtbeginS.o
+_ITM_registerTMCloneTable                         /lib/x86_64-linux-gnu/libm.so.6
+                                                  /usr/lib/gcc/x86_64-linux-gnu/10/crtbeginS.o
+__GNU_EH_FRAME_HDR                                mpy-cross
+__TMC_END__                                       /usr/lib/gcc/x86_64-linux-gnu/10/crtendS.o
+                                                  /usr/lib/gcc/x86_64-linux-gnu/10/crtbeginS.o
+__after_morecore_hook                             /lib/x86_64-linux-gnu/libc.so.6
+__after_morecore_hook@@GLIBC_2.2.5                /lib/x86_64-linux-gnu/libc.so.6
+__after_morecore_hook@GLIBC_2.2.5                 /lib/x86_64-linux-gnu/libc.so.6
+__assert_fail                                     /lib/x86_64-linux-gnu/libc.so.6
+                                                  build/py/vm.o
+                                                  build/py/modbuiltins.o
+                                                  build/py/builtinimport.o
+                                                  build/py/objtype.o
+                                                  build/py/objtuple.o
+                                                  build/py/objstrunicode.o
+                                                  build/py/objstr.o
+                                                  build/py/objlist.o
+                                                  build/py/objint_mpz.o
+                                                  build/py/objint.o
+                                                  build/py/objfun.o
+                                                  build/py/objfloat.o
+                                                  build/py/objexcept.o
+                                                  build/py/objenumerate.o
+                                                  build/py/objdict.o
+                                                  build/py/objcomplex.o
+                                                  build/py/objarray.o
+                                                  build/py/obj.o
+                                                  build/py/map.o
+                                                  build/py/argcheck.o
+                                                  build/py/runtime.o
+                                                  build/py/persistentcode.o
+                                                  build/py/emitglue.o
+                                                  build/py/formatfloat.o
+                                                  build/py/emitnxtensawin.o
+                                                  build/py/emitinlinextensa.o
+                                                  build/py/emitnxtensa.o
+                                                  build/py/asmxtensa.o
+                                                  build/py/emitnarm.o
+                                                  build/py/asmarm.o
+                                                  build/py/emitinlinethumb.o
+                                                  build/py/emitnthumb.o
+                                                  build/py/asmthumb.o
+                                                  build/py/emitnx86.o
+                                                  build/py/asmx86.o
+                                                  build/py/emitnx64.o
+                                                  build/py/asmx64.o
+                                                  build/py/asmbase.o
+                                                  build/py/emitbc.o
+                                                  build/py/emitcommon.o
+                                                  build/py/compile.o
+                                                  build/py/scope.o
+                                                  build/py/parse.o
+                                                  build/py/mpz.o
+                                                  build/py/mpprint.o
+                                                  build/py/vstr.o
+                                                  build/py/gc.o
+__assert_fail@@GLIBC_2.2.5                        /lib/x86_64-linux-gnu/libc.so.6
+__assert_fail@GLIBC_2.2.5                         /lib/x86_64-linux-gnu/libc.so.6
+                                                  /lib/x86_64-linux-gnu/libm.so.6
+__compat_bdflush                                  /lib/x86_64-linux-gnu/libc.so.6
+__connect                                         /lib/x86_64-linux-gnu/libc.so.6
+__connect@@GLIBC_2.2.5                            /lib/x86_64-linux-gnu/libc.so.6
+__connect@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+__ctype_get_mb_cur_max                            /lib/x86_64-linux-gnu/libc.so.6
+__ctype_get_mb_cur_max@@GLIBC_2.2.5               /lib/x86_64-linux-gnu/libc.so.6
+__ctype_get_mb_cur_max@GLIBC_2.2.5                /lib/x86_64-linux-gnu/libc.so.6
+__cxa_finalize                                    /lib/x86_64-linux-gnu/libc.so.6
+                                                  /usr/lib/gcc/x86_64-linux-gnu/10/crtbeginS.o
+__cxa_finalize@@GLIBC_2.2.5                       /lib/x86_64-linux-gnu/libc.so.6
+__cxa_finalize@GLIBC_2.2.5                        /lib/x86_64-linux-gnu/libc.so.6
+                                                  /lib/x86_64-linux-gnu/libm.so.6
+__data_start                                      /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+__dso_handle                                      /usr/lib/gcc/x86_64-linux-gnu/10/crtbeginS.o
+__errno_location                                  /lib/x86_64-linux-gnu/libc.so.6
+                                                  build/py/reader.o
+__errno_location@@GLIBC_2.2.5                     /lib/x86_64-linux-gnu/libc.so.6
+__errno_location@GLIBC_2.2.5                      /lib/x86_64-linux-gnu/libc.so.6
+__fcntl                                           /lib/x86_64-linux-gnu/libc.so.6
+__fcntl@@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+__fcntl@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+__free_hook                                       /lib/x86_64-linux-gnu/libc.so.6
+__free_hook@@GLIBC_2.2.5                          /lib/x86_64-linux-gnu/libc.so.6
+__free_hook@GLIBC_2.2.5                           /lib/x86_64-linux-gnu/libc.so.6
+__getdelim                                        /lib/x86_64-linux-gnu/libc.so.6
+__getdelim@@GLIBC_2.2.5                           /lib/x86_64-linux-gnu/libc.so.6
+__getdelim@GLIBC_2.2.5                            /lib/x86_64-linux-gnu/libc.so.6
+__gmon_start__                                    /lib/x86_64-linux-gnu/libm.so.6
+                                                  /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/crti.o
+__init_array_end                                  /usr/lib/x86_64-linux-gnu/libc_nonshared.a(elf-init.oS)
+__init_array_start                                /usr/lib/x86_64-linux-gnu/libc_nonshared.a(elf-init.oS)
+__isascii_l                                       /lib/x86_64-linux-gnu/libc.so.6
+__isascii_l@@GLIBC_2.2.5                          /lib/x86_64-linux-gnu/libc.so.6
+__isascii_l@GLIBC_2.2.5                           /lib/x86_64-linux-gnu/libc.so.6
+__libc_csu_fini                                   /usr/lib/x86_64-linux-gnu/libc_nonshared.a(elf-init.oS)
+                                                  /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+__libc_csu_init                                   /usr/lib/x86_64-linux-gnu/libc_nonshared.a(elf-init.oS)
+                                                  /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+__libc_secure_getenv                              /lib/x86_64-linux-gnu/libc.so.6
+__libc_secure_getenv@@GLIBC_PRIVATE               /lib/x86_64-linux-gnu/libc.so.6
+__libc_secure_getenv@GLIBC_PRIVATE                /lib/x86_64-linux-gnu/libc.so.6
+__libdl_freeres                                   /lib/x86_64-linux-gnu/libc.so.6
+__libpthread_freeres                              /lib/x86_64-linux-gnu/libc.so.6
+__malloc_hook                                     /lib/x86_64-linux-gnu/libc.so.6
+__malloc_hook@@GLIBC_2.2.5                        /lib/x86_64-linux-gnu/libc.so.6
+__malloc_hook@GLIBC_2.2.5                         /lib/x86_64-linux-gnu/libc.so.6
+__malloc_initialize_hook@GLIBC_2.2.5              /lib/x86_64-linux-gnu/libc.so.6
+__memalign_hook                                   /lib/x86_64-linux-gnu/libc.so.6
+__memalign_hook@@GLIBC_2.2.5                      /lib/x86_64-linux-gnu/libc.so.6
+__memalign_hook@GLIBC_2.2.5                       /lib/x86_64-linux-gnu/libc.so.6
+__open                                            /lib/x86_64-linux-gnu/libc.so.6
+__open64                                          /lib/x86_64-linux-gnu/libc.so.6
+__open64@@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+__open64@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+__open@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+__open@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libc.so.6
+__pread64                                         /lib/x86_64-linux-gnu/libc.so.6
+__pread64@@GLIBC_2.2.5                            /lib/x86_64-linux-gnu/libc.so.6
+__pread64@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+__pwrite64                                        /lib/x86_64-linux-gnu/libc.so.6
+__pwrite64@@GLIBC_2.2.5                           /lib/x86_64-linux-gnu/libc.so.6
+__pwrite64@GLIBC_2.2.5                            /lib/x86_64-linux-gnu/libc.so.6
+__realloc_hook                                    /lib/x86_64-linux-gnu/libc.so.6
+__realloc_hook@@GLIBC_2.2.5                       /lib/x86_64-linux-gnu/libc.so.6
+__realloc_hook@GLIBC_2.2.5                        /lib/x86_64-linux-gnu/libc.so.6
+__recv                                            /lib/x86_64-linux-gnu/libc.so.6
+__recv@@GLIBC_PRIVATE                             /lib/x86_64-linux-gnu/libc.so.6
+__recv@GLIBC_PRIVATE                              /lib/x86_64-linux-gnu/libc.so.6
+__secure_getenv@GLIBC_2.2.5                       /lib/x86_64-linux-gnu/libc.so.6
+__sigaction                                       /lib/x86_64-linux-gnu/libc.so.6
+__sigaction@@GLIBC_2.2.5                          /lib/x86_64-linux-gnu/libc.so.6
+__sigaction@GLIBC_2.2.5                           /lib/x86_64-linux-gnu/libc.so.6
+__strtoll_l                                       /lib/x86_64-linux-gnu/libc.so.6
+__strtoll_l@@GLIBC_2.2.5                          /lib/x86_64-linux-gnu/libc.so.6
+__strtoll_l@GLIBC_2.2.5                           /lib/x86_64-linux-gnu/libc.so.6
+__strtoull_l                                      /lib/x86_64-linux-gnu/libc.so.6
+__strtoull_l@@GLIBC_2.2.5                         /lib/x86_64-linux-gnu/libc.so.6
+__strtoull_l@GLIBC_2.2.5                          /lib/x86_64-linux-gnu/libc.so.6
+__toascii_l                                       /lib/x86_64-linux-gnu/libc.so.6
+__toascii_l@@GLIBC_2.2.5                          /lib/x86_64-linux-gnu/libc.so.6
+__toascii_l@GLIBC_2.2.5                           /lib/x86_64-linux-gnu/libc.so.6
+__vsnprintf                                       /lib/x86_64-linux-gnu/libc.so.6
+__vsnprintf@@GLIBC_2.2.5                          /lib/x86_64-linux-gnu/libc.so.6
+__vsnprintf@GLIBC_2.2.5                           /lib/x86_64-linux-gnu/libc.so.6
+__vsscanf                                         /lib/x86_64-linux-gnu/libc.so.6
+__vsscanf@@GLIBC_2.2.5                            /lib/x86_64-linux-gnu/libc.so.6
+__vsscanf@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+__wcstoll_l                                       /lib/x86_64-linux-gnu/libc.so.6
+__wcstoll_l@@GLIBC_2.2.5                          /lib/x86_64-linux-gnu/libc.so.6
+__wcstoll_l@GLIBC_2.2.5                           /lib/x86_64-linux-gnu/libc.so.6
+__wcstoull_l                                      /lib/x86_64-linux-gnu/libc.so.6
+__wcstoull_l@@GLIBC_2.2.5                         /lib/x86_64-linux-gnu/libc.so.6
+__wcstoull_l@GLIBC_2.2.5                          /lib/x86_64-linux-gnu/libc.so.6
+__write                                           /lib/x86_64-linux-gnu/libc.so.6
+__write@@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+__write@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+__xpg_sigpause                                    /lib/x86_64-linux-gnu/libc.so.6
+__xpg_sigpause@@GLIBC_2.2.5                       /lib/x86_64-linux-gnu/libc.so.6
+__xpg_sigpause@GLIBC_2.2.5                        /lib/x86_64-linux-gnu/libc.so.6
+_dl_starting_up                                   /lib/x86_64-linux-gnu/libc.so.6
+_environ                                          /lib/x86_64-linux-gnu/libc.so.6
+_environ@@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+_environ@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+_fini                                             /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/crti.o
+_flushlbf                                         /lib/x86_64-linux-gnu/libc.so.6
+_flushlbf@@GLIBC_2.2.5                            /lib/x86_64-linux-gnu/libc.so.6
+_flushlbf@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+_init                                             /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/crti.o
+                                                  /usr/lib/x86_64-linux-gnu/libc_nonshared.a(elf-init.oS)
+_longjmp                                          /lib/x86_64-linux-gnu/libc.so.6
+_longjmp@@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+_longjmp@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+_start                                            /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+access                                            /lib/x86_64-linux-gnu/libc.so.6
+access@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+access@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libc.so.6
+acos                                              /lib/x86_64-linux-gnu/libm.so.6
+acos@@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libm.so.6
+acos@GLIBC_2.2.5                                  /lib/x86_64-linux-gnu/libm.so.6
+acosf                                             /lib/x86_64-linux-gnu/libm.so.6
+acosf128                                          /lib/x86_64-linux-gnu/libm.so.6
+acosf128@@GLIBC_2.26                              /lib/x86_64-linux-gnu/libm.so.6
+acosf128@GLIBC_2.26                               /lib/x86_64-linux-gnu/libm.so.6
+acosf32                                           /lib/x86_64-linux-gnu/libm.so.6
+acosf32@@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+acosf32@GLIBC_2.27                                /lib/x86_64-linux-gnu/libm.so.6
+acosf32x                                          /lib/x86_64-linux-gnu/libm.so.6
+acosf32x@@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+acosf32x@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+acosf64                                           /lib/x86_64-linux-gnu/libm.so.6
+acosf64@@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+acosf64@GLIBC_2.27                                /lib/x86_64-linux-gnu/libm.so.6
+acosf64x                                          /lib/x86_64-linux-gnu/libm.so.6
+acosf64x@@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+acosf64x@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+acosf@@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+acosf@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libm.so.6
+acosh                                             /lib/x86_64-linux-gnu/libm.so.6
+acosh@@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+acosh@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libm.so.6
+acoshf                                            /lib/x86_64-linux-gnu/libm.so.6
+acoshf128                                         /lib/x86_64-linux-gnu/libm.so.6
+acoshf128@@GLIBC_2.26                             /lib/x86_64-linux-gnu/libm.so.6
+acoshf128@GLIBC_2.26                              /lib/x86_64-linux-gnu/libm.so.6
+acoshf32                                          /lib/x86_64-linux-gnu/libm.so.6
+acoshf32@@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+acoshf32@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+acoshf32x                                         /lib/x86_64-linux-gnu/libm.so.6
+acoshf32x@@GLIBC_2.27                             /lib/x86_64-linux-gnu/libm.so.6
+acoshf32x@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+acoshf64                                          /lib/x86_64-linux-gnu/libm.so.6
+acoshf64@@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+acoshf64@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+acoshf64x                                         /lib/x86_64-linux-gnu/libm.so.6
+acoshf64x@@GLIBC_2.27                             /lib/x86_64-linux-gnu/libm.so.6
+acoshf64x@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+acoshf@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libm.so.6
+acoshf@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+acoshl                                            /lib/x86_64-linux-gnu/libm.so.6
+acoshl@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libm.so.6
+acoshl@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+acosl                                             /lib/x86_64-linux-gnu/libm.so.6
+acosl@@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+acosl@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libm.so.6
+addmntent                                         /lib/x86_64-linux-gnu/libc.so.6
+addmntent@@GLIBC_2.2.5                            /lib/x86_64-linux-gnu/libc.so.6
+addmntent@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+addseverity                                       /lib/x86_64-linux-gnu/libc.so.6
+addseverity@@GLIBC_2.2.5                          /lib/x86_64-linux-gnu/libc.so.6
+addseverity@GLIBC_2.2.5                           /lib/x86_64-linux-gnu/libc.so.6
+adjtime                                           /lib/x86_64-linux-gnu/libc.so.6
+adjtime@@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+adjtime@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+adjtimex                                          /lib/x86_64-linux-gnu/libc.so.6
+adjtimex@@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+adjtimex@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+advance@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+aligned_alloc                                     /lib/x86_64-linux-gnu/libc.so.6
+aligned_alloc@@GLIBC_2.16                         /lib/x86_64-linux-gnu/libc.so.6
+aligned_alloc@GLIBC_2.16                          /lib/x86_64-linux-gnu/libc.so.6
+alphasort                                         /lib/x86_64-linux-gnu/libc.so.6
+alphasort64                                       /lib/x86_64-linux-gnu/libc.so.6
+alphasort64@@GLIBC_2.2.5                          /lib/x86_64-linux-gnu/libc.so.6
+alphasort64@GLIBC_2.2.5                           /lib/x86_64-linux-gnu/libc.so.6
+alphasort@@GLIBC_2.2.5                            /lib/x86_64-linux-gnu/libc.so.6
+alphasort@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+arch_prctl                                        /lib/x86_64-linux-gnu/libc.so.6
+arch_prctl@@GLIBC_2.2.5                           /lib/x86_64-linux-gnu/libc.so.6
+arch_prctl@GLIBC_2.2.5                            /lib/x86_64-linux-gnu/libc.so.6
+argp_error                                        /lib/x86_64-linux-gnu/libc.so.6
+argp_error@@GLIBC_2.2.5                           /lib/x86_64-linux-gnu/libc.so.6
+argp_error@GLIBC_2.2.5                            /lib/x86_64-linux-gnu/libc.so.6
+argp_failure                                      /lib/x86_64-linux-gnu/libc.so.6
+argp_failure@@GLIBC_2.2.5                         /lib/x86_64-linux-gnu/libc.so.6
+argp_failure@GLIBC_2.2.5                          /lib/x86_64-linux-gnu/libc.so.6
+argp_help                                         /lib/x86_64-linux-gnu/libc.so.6
+argp_help@@GLIBC_2.2.5                            /lib/x86_64-linux-gnu/libc.so.6
+argp_help@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+argp_parse                                        /lib/x86_64-linux-gnu/libc.so.6
+argp_parse@@GLIBC_2.2.5                           /lib/x86_64-linux-gnu/libc.so.6
+argp_parse@GLIBC_2.2.5                            /lib/x86_64-linux-gnu/libc.so.6
+argp_state_help                                   /lib/x86_64-linux-gnu/libc.so.6
+argp_state_help@@GLIBC_2.2.5                      /lib/x86_64-linux-gnu/libc.so.6
+argp_state_help@GLIBC_2.2.5                       /lib/x86_64-linux-gnu/libc.so.6
+argp_usage                                        /lib/x86_64-linux-gnu/libc.so.6
+argp_usage@@GLIBC_2.2.5                           /lib/x86_64-linux-gnu/libc.so.6
+argp_usage@GLIBC_2.2.5                            /lib/x86_64-linux-gnu/libc.so.6
+argz_add                                          /lib/x86_64-linux-gnu/libc.so.6
+argz_add@@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+argz_add@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+argz_add_sep                                      /lib/x86_64-linux-gnu/libc.so.6
+argz_add_sep@@GLIBC_2.2.5                         /lib/x86_64-linux-gnu/libc.so.6
+argz_add_sep@GLIBC_2.2.5                          /lib/x86_64-linux-gnu/libc.so.6
+argz_append                                       /lib/x86_64-linux-gnu/libc.so.6
+argz_append@@GLIBC_2.2.5                          /lib/x86_64-linux-gnu/libc.so.6
+argz_append@GLIBC_2.2.5                           /lib/x86_64-linux-gnu/libc.so.6
+argz_count                                        /lib/x86_64-linux-gnu/libc.so.6
+argz_count@@GLIBC_2.2.5                           /lib/x86_64-linux-gnu/libc.so.6
+argz_count@GLIBC_2.2.5                            /lib/x86_64-linux-gnu/libc.so.6
+argz_create                                       /lib/x86_64-linux-gnu/libc.so.6
+argz_create@@GLIBC_2.2.5                          /lib/x86_64-linux-gnu/libc.so.6
+argz_create@GLIBC_2.2.5                           /lib/x86_64-linux-gnu/libc.so.6
+argz_create_sep                                   /lib/x86_64-linux-gnu/libc.so.6
+argz_create_sep@@GLIBC_2.2.5                      /lib/x86_64-linux-gnu/libc.so.6
+argz_create_sep@GLIBC_2.2.5                       /lib/x86_64-linux-gnu/libc.so.6
+argz_extract                                      /lib/x86_64-linux-gnu/libc.so.6
+argz_extract@@GLIBC_2.2.5                         /lib/x86_64-linux-gnu/libc.so.6
+argz_extract@GLIBC_2.2.5                          /lib/x86_64-linux-gnu/libc.so.6
+argz_insert                                       /lib/x86_64-linux-gnu/libc.so.6
+argz_insert@@GLIBC_2.2.5                          /lib/x86_64-linux-gnu/libc.so.6
+argz_insert@GLIBC_2.2.5                           /lib/x86_64-linux-gnu/libc.so.6
+argz_next                                         /lib/x86_64-linux-gnu/libc.so.6
+argz_next@@GLIBC_2.2.5                            /lib/x86_64-linux-gnu/libc.so.6
+argz_next@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+argz_replace                                      /lib/x86_64-linux-gnu/libc.so.6
+argz_replace@@GLIBC_2.2.5                         /lib/x86_64-linux-gnu/libc.so.6
+argz_replace@GLIBC_2.2.5                          /lib/x86_64-linux-gnu/libc.so.6
+argz_stringify                                    /lib/x86_64-linux-gnu/libc.so.6
+argz_stringify@@GLIBC_2.2.5                       /lib/x86_64-linux-gnu/libc.so.6
+argz_stringify@GLIBC_2.2.5                        /lib/x86_64-linux-gnu/libc.so.6
+asctime_r                                         /lib/x86_64-linux-gnu/libc.so.6
+asctime_r@@GLIBC_2.2.5                            /lib/x86_64-linux-gnu/libc.so.6
+asctime_r@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+asin                                              /lib/x86_64-linux-gnu/libm.so.6
+asin@@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libm.so.6
+asin@GLIBC_2.2.5                                  /lib/x86_64-linux-gnu/libm.so.6
+asinf                                             /lib/x86_64-linux-gnu/libm.so.6
+asinf128                                          /lib/x86_64-linux-gnu/libm.so.6
+asinf128@@GLIBC_2.26                              /lib/x86_64-linux-gnu/libm.so.6
+asinf128@GLIBC_2.26                               /lib/x86_64-linux-gnu/libm.so.6
+asinf32                                           /lib/x86_64-linux-gnu/libm.so.6
+asinf32@@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+asinf32@GLIBC_2.27                                /lib/x86_64-linux-gnu/libm.so.6
+asinf32x                                          /lib/x86_64-linux-gnu/libm.so.6
+asinf32x@@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+asinf32x@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+asinf64                                           /lib/x86_64-linux-gnu/libm.so.6
+asinf64@@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+asinf64@GLIBC_2.27                                /lib/x86_64-linux-gnu/libm.so.6
+asinf64x                                          /lib/x86_64-linux-gnu/libm.so.6
+asinf64x@@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+asinf64x@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+asinf@@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+asinf@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libm.so.6
+asinh                                             /lib/x86_64-linux-gnu/libm.so.6
+asinh@@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+asinh@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libm.so.6
+asinhf                                            /lib/x86_64-linux-gnu/libm.so.6
+asinhf128                                         /lib/x86_64-linux-gnu/libm.so.6
+asinhf128@@GLIBC_2.26                             /lib/x86_64-linux-gnu/libm.so.6
+asinhf128@GLIBC_2.26                              /lib/x86_64-linux-gnu/libm.so.6
+asinhf32                                          /lib/x86_64-linux-gnu/libm.so.6
+asinhf32@@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+asinhf32@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+asinhf32x                                         /lib/x86_64-linux-gnu/libm.so.6
+asinhf32x@@GLIBC_2.27                             /lib/x86_64-linux-gnu/libm.so.6
+asinhf32x@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+asinhf64                                          /lib/x86_64-linux-gnu/libm.so.6
+asinhf64@@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+asinhf64@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+asinhf64x                                         /lib/x86_64-linux-gnu/libm.so.6
+asinhf64x@@GLIBC_2.27                             /lib/x86_64-linux-gnu/libm.so.6
+asinhf64x@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+asinhf@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libm.so.6
+asinhf@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+asinhl                                            /lib/x86_64-linux-gnu/libm.so.6
+asinhl@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libm.so.6
+asinhl@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+asinl                                             /lib/x86_64-linux-gnu/libm.so.6
+asinl@@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+asinl@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libm.so.6
+asm_arm_add_reg_reg_reg                           build/py/asmarm.o
+                                                  build/py/emitnarm.o
+asm_arm_and_reg_reg_reg                           build/py/asmarm.o
+                                                  build/py/emitnarm.o
+asm_arm_asr_reg_reg                               build/py/asmarm.o
+                                                  build/py/emitnarm.o
+asm_arm_b_label                                   build/py/asmarm.o
+                                                  build/py/emitnarm.o
+asm_arm_bcc_label                                 build/py/asmarm.o
+                                                  build/py/emitnarm.o
+asm_arm_bkpt                                      build/py/asmarm.o
+asm_arm_bl_ind                                    build/py/asmarm.o
+                                                  build/py/emitnarm.o
+asm_arm_bx_reg                                    build/py/asmarm.o
+                                                  build/py/emitnarm.o
+asm_arm_cmp_reg_i8                                build/py/asmarm.o
+                                                  build/py/emitnarm.o
+asm_arm_cmp_reg_reg                               build/py/asmarm.o
+                                                  build/py/emitnarm.o
+asm_arm_end_pass                                  build/py/asmarm.o
+                                                  build/py/emitnarm.o
+asm_arm_entry                                     build/py/asmarm.o
+                                                  build/py/emitnarm.o
+asm_arm_eor_reg_reg_reg                           build/py/asmarm.o
+                                                  build/py/emitnarm.o
+asm_arm_exit                                      build/py/asmarm.o
+                                                  build/py/emitnarm.o
+asm_arm_ldr_reg_reg                               build/py/asmarm.o
+                                                  build/py/emitnarm.o
+asm_arm_ldrb_reg_reg                              build/py/asmarm.o
+                                                  build/py/emitnarm.o
+asm_arm_ldrh_reg_reg                              build/py/asmarm.o
+                                                  build/py/emitnarm.o
+asm_arm_lsl_reg_reg                               build/py/asmarm.o
+                                                  build/py/emitnarm.o
+asm_arm_mov_local_reg                             build/py/asmarm.o
+                                                  build/py/emitnarm.o
+asm_arm_mov_reg_i32                               build/py/asmarm.o
+                                                  build/py/emitnarm.o
+asm_arm_mov_reg_i32_optimised                     build/py/asmarm.o
+                                                  build/py/emitnarm.o
+asm_arm_mov_reg_local                             build/py/asmarm.o
+                                                  build/py/emitnarm.o
+asm_arm_mov_reg_local_addr                        build/py/asmarm.o
+                                                  build/py/emitnarm.o
+asm_arm_mov_reg_pcrel                             build/py/asmarm.o
+                                                  build/py/emitnarm.o
+asm_arm_mov_reg_reg                               build/py/asmarm.o
+                                                  build/py/emitnarm.o
+asm_arm_mul_reg_reg_reg                           build/py/asmarm.o
+                                                  build/py/emitnarm.o
+asm_arm_orr_reg_reg_reg                           build/py/asmarm.o
+                                                  build/py/emitnarm.o
+asm_arm_pop                                       build/py/asmarm.o
+asm_arm_push                                      build/py/asmarm.o
+asm_arm_setcc_reg                                 build/py/asmarm.o
+                                                  build/py/emitnarm.o
+asm_arm_str_reg_reg                               build/py/asmarm.o
+                                                  build/py/emitnarm.o
+asm_arm_str_reg_reg_reg                           build/py/asmarm.o
+                                                  build/py/emitnarm.o
+asm_arm_strb_reg_reg                              build/py/asmarm.o
+                                                  build/py/emitnarm.o
+asm_arm_strb_reg_reg_reg                          build/py/asmarm.o
+                                                  build/py/emitnarm.o
+asm_arm_strh_reg_reg                              build/py/asmarm.o
+                                                  build/py/emitnarm.o
+asm_arm_strh_reg_reg_reg                          build/py/asmarm.o
+                                                  build/py/emitnarm.o
+asm_arm_sub_reg_reg_reg                           build/py/asmarm.o
+                                                  build/py/emitnarm.o
+asm_thumb_b_label                                 build/py/asmthumb.o
+                                                  build/py/emitnthumb.o
+asm_thumb_b_n_label                               build/py/asmthumb.o
+                                                  build/py/emitinlinethumb.o
+asm_thumb_bcc_label                               build/py/asmthumb.o
+                                                  build/py/emitnthumb.o
+asm_thumb_bcc_nw_label                            build/py/asmthumb.o
+                                                  build/py/emitinlinethumb.o
+asm_thumb_bl_ind                                  build/py/asmthumb.o
+                                                  build/py/emitnthumb.o
+asm_thumb_bl_label                                build/py/asmthumb.o
+                                                  build/py/emitinlinethumb.o
+asm_thumb_end_pass                                build/py/asmthumb.o
+                                                  build/py/emitinlinethumb.o
+                                                  build/py/emitnthumb.o
+asm_thumb_entry                                   build/py/asmthumb.o
+                                                  build/py/emitinlinethumb.o
+                                                  build/py/emitnthumb.o
+asm_thumb_exit                                    build/py/asmthumb.o
+                                                  build/py/emitinlinethumb.o
+                                                  build/py/emitnthumb.o
+asm_thumb_format_4                                build/py/asmthumb.o
+                                                  build/py/emitinlinethumb.o
+                                                  build/py/emitnthumb.o
+asm_thumb_ldr_reg_reg_i12_optimised               build/py/asmthumb.o
+                                                  build/py/emitnthumb.o
+asm_thumb_mov_local_reg                           build/py/asmthumb.o
+                                                  build/py/emitnthumb.o
+asm_thumb_mov_reg_i16                             build/py/asmthumb.o
+                                                  build/py/emitinlinethumb.o
+                                                  build/py/emitnthumb.o
+asm_thumb_mov_reg_i32                             build/py/asmthumb.o
+                                                  build/py/emitnthumb.o
+asm_thumb_mov_reg_i32_optimised                   build/py/asmthumb.o
+                                                  build/py/emitnthumb.o
+asm_thumb_mov_reg_local                           build/py/asmthumb.o
+                                                  build/py/emitnthumb.o
+asm_thumb_mov_reg_local_addr                      build/py/asmthumb.o
+                                                  build/py/emitnthumb.o
+asm_thumb_mov_reg_pcrel                           build/py/asmthumb.o
+                                                  build/py/emitnthumb.o
+asm_thumb_mov_reg_reg                             build/py/asmthumb.o
+                                                  build/py/emitinlinethumb.o
+                                                  build/py/emitnthumb.o
+asm_thumb_op16                                    build/py/asmthumb.o
+                                                  build/py/emitinlinethumb.o
+                                                  build/py/emitnthumb.o
+asm_thumb_op32                                    build/py/asmthumb.o
+                                                  build/py/emitinlinethumb.o
+asm_x64_add_r64_r64                               build/py/asmx64.o
+                                                  build/py/emitnx64.o
+asm_x64_and_r64_r64                               build/py/asmx64.o
+                                                  build/py/emitnx64.o
+asm_x64_call_ind                                  build/py/asmx64.o
+                                                  build/py/emitnx64.o
+asm_x64_cmp_r64_with_r64                          build/py/asmx64.o
+                                                  build/py/emitnx64.o
+asm_x64_entry                                     build/py/asmx64.o
+                                                  build/py/emitnx64.o
+asm_x64_exit                                      build/py/asmx64.o
+                                                  build/py/emitnx64.o
+asm_x64_jcc_label                                 build/py/asmx64.o
+                                                  build/py/emitnx64.o
+asm_x64_jmp_label                                 build/py/asmx64.o
+                                                  build/py/emitnx64.o
+asm_x64_jmp_reg                                   build/py/asmx64.o
+                                                  build/py/emitnx64.o
+asm_x64_mov_i32_to_r64                            build/py/asmx64.o
+                                                  build/py/emitnx64.o
+asm_x64_mov_i64_to_r64                            build/py/asmx64.o
+asm_x64_mov_i64_to_r64_optimised                  build/py/asmx64.o
+                                                  build/py/emitnx64.o
+asm_x64_mov_local_addr_to_r64                     build/py/asmx64.o
+                                                  build/py/emitnx64.o
+asm_x64_mov_local_to_r64                          build/py/asmx64.o
+                                                  build/py/emitnx64.o
+asm_x64_mov_mem16_to_r64zx                        build/py/asmx64.o
+                                                  build/py/emitnx64.o
+asm_x64_mov_mem32_to_r64zx                        build/py/asmx64.o
+                                                  build/py/emitnx64.o
+asm_x64_mov_mem64_to_r64                          build/py/asmx64.o
+                                                  build/py/emitnx64.o
+asm_x64_mov_mem8_to_r64zx                         build/py/asmx64.o
+                                                  build/py/emitnx64.o
+asm_x64_mov_r16_to_mem16                          build/py/asmx64.o
+                                                  build/py/emitnx64.o
+asm_x64_mov_r32_to_mem32                          build/py/asmx64.o
+                                                  build/py/emitnx64.o
+asm_x64_mov_r64_r64                               build/py/asmx64.o
+                                                  build/py/emitnx64.o
+asm_x64_mov_r64_to_local                          build/py/asmx64.o
+                                                  build/py/emitnx64.o
+asm_x64_mov_r64_to_mem64                          build/py/asmx64.o
+                                                  build/py/emitnx64.o
+asm_x64_mov_r8_to_mem8                            build/py/asmx64.o
+                                                  build/py/emitnx64.o
+asm_x64_mov_reg_pcrel                             build/py/asmx64.o
+                                                  build/py/emitnx64.o
+asm_x64_mul_r64_r64                               build/py/asmx64.o
+                                                  build/py/emitnx64.o
+asm_x64_nop                                       build/py/asmx64.o
+asm_x64_or_r64_r64                                build/py/asmx64.o
+                                                  build/py/emitnx64.o
+asm_x64_pop_r64                                   build/py/asmx64.o
+asm_x64_push_r64                                  build/py/asmx64.o
+asm_x64_sar_r64_cl                                build/py/asmx64.o
+                                                  build/py/emitnx64.o
+asm_x64_setcc_r8                                  build/py/asmx64.o
+                                                  build/py/emitnx64.o
+asm_x64_shl_r64_cl                                build/py/asmx64.o
+                                                  build/py/emitnx64.o
+asm_x64_sub_r64_r64                               build/py/asmx64.o
+                                                  build/py/emitnx64.o
+asm_x64_test_r64_with_r64                         build/py/asmx64.o
+                                                  build/py/emitnx64.o
+asm_x64_test_r8_with_r8                           build/py/asmx64.o
+                                                  build/py/emitnx64.o
+asm_x64_xor_r64_r64                               build/py/asmx64.o
+                                                  build/py/emitnx64.o
+asm_x86_add_r32_r32                               build/py/asmx86.o
+                                                  build/py/emitnx86.o
+asm_x86_and_r32_r32                               build/py/asmx86.o
+                                                  build/py/emitnx86.o
+asm_x86_call_ind                                  build/py/asmx86.o
+                                                  build/py/emitnx86.o
+asm_x86_cmp_r32_with_r32                          build/py/asmx86.o
+                                                  build/py/emitnx86.o
+asm_x86_entry                                     build/py/asmx86.o
+                                                  build/py/emitnx86.o
+asm_x86_exit                                      build/py/asmx86.o
+                                                  build/py/emitnx86.o
+asm_x86_jcc_label                                 build/py/asmx86.o
+                                                  build/py/emitnx86.o
+asm_x86_jmp_label                                 build/py/asmx86.o
+                                                  build/py/emitnx86.o
+asm_x86_jmp_reg                                   build/py/asmx86.o
+                                                  build/py/emitnx86.o
+asm_x86_mov_arg_to_r32                            build/py/asmx86.o
+                                                  build/py/emitnx86.o
+asm_x86_mov_i32_to_r32                            build/py/asmx86.o
+                                                  build/py/emitnx86.o
+asm_x86_mov_local_addr_to_r32                     build/py/asmx86.o
+                                                  build/py/emitnx86.o
+asm_x86_mov_local_to_r32                          build/py/asmx86.o
+                                                  build/py/emitnx86.o
+asm_x86_mov_mem16_to_r32zx                        build/py/asmx86.o
+                                                  build/py/emitnx86.o
+asm_x86_mov_mem32_to_r32                          build/py/asmx86.o
+                                                  build/py/emitnx86.o
+asm_x86_mov_mem8_to_r32zx                         build/py/asmx86.o
+                                                  build/py/emitnx86.o
+asm_x86_mov_r16_to_mem16                          build/py/asmx86.o
+                                                  build/py/emitnx86.o
+asm_x86_mov_r32_r32                               build/py/asmx86.o
+                                                  build/py/emitnx86.o
+asm_x86_mov_r32_to_local                          build/py/asmx86.o
+                                                  build/py/emitnx86.o
+asm_x86_mov_r32_to_mem32                          build/py/asmx86.o
+                                                  build/py/emitnx86.o
+asm_x86_mov_r8_to_mem8                            build/py/asmx86.o
+                                                  build/py/emitnx86.o
+asm_x86_mov_reg_pcrel                             build/py/asmx86.o
+                                                  build/py/emitnx86.o
+asm_x86_mul_r32_r32                               build/py/asmx86.o
+                                                  build/py/emitnx86.o
+asm_x86_or_r32_r32                                build/py/asmx86.o
+                                                  build/py/emitnx86.o
+asm_x86_sar_r32_cl                                build/py/asmx86.o
+                                                  build/py/emitnx86.o
+asm_x86_setcc_r8                                  build/py/asmx86.o
+                                                  build/py/emitnx86.o
+asm_x86_shl_r32_cl                                build/py/asmx86.o
+                                                  build/py/emitnx86.o
+asm_x86_sub_r32_r32                               build/py/asmx86.o
+                                                  build/py/emitnx86.o
+asm_x86_test_r32_with_r32                         build/py/asmx86.o
+                                                  build/py/emitnx86.o
+asm_x86_test_r8_with_r8                           build/py/asmx86.o
+                                                  build/py/emitnx86.o
+asm_x86_xor_r32_r32                               build/py/asmx86.o
+                                                  build/py/emitnx86.o
+asm_xtensa_bcc_reg_reg_label                      build/py/asmxtensa.o
+                                                  build/py/emitnxtensawin.o
+                                                  build/py/emitinlinextensa.o
+                                                  build/py/emitnxtensa.o
+asm_xtensa_bccz_reg_label                         build/py/asmxtensa.o
+                                                  build/py/emitnxtensawin.o
+                                                  build/py/emitinlinextensa.o
+                                                  build/py/emitnxtensa.o
+asm_xtensa_call_ind                               build/py/asmxtensa.o
+                                                  build/py/emitnxtensa.o
+asm_xtensa_call_ind_win                           build/py/asmxtensa.o
+                                                  build/py/emitnxtensawin.o
+asm_xtensa_end_pass                               build/py/asmxtensa.o
+                                                  build/py/emitnxtensawin.o
+                                                  build/py/emitinlinextensa.o
+                                                  build/py/emitnxtensa.o
+asm_xtensa_entry                                  build/py/asmxtensa.o
+                                                  build/py/emitinlinextensa.o
+                                                  build/py/emitnxtensa.o
+asm_xtensa_entry_win                              build/py/asmxtensa.o
+                                                  build/py/emitnxtensawin.o
+asm_xtensa_exit                                   build/py/asmxtensa.o
+                                                  build/py/emitinlinextensa.o
+                                                  build/py/emitnxtensa.o
+asm_xtensa_exit_win                               build/py/asmxtensa.o
+                                                  build/py/emitnxtensawin.o
+asm_xtensa_j_label                                build/py/asmxtensa.o
+                                                  build/py/emitnxtensawin.o
+                                                  build/py/emitinlinextensa.o
+                                                  build/py/emitnxtensa.o
+asm_xtensa_mov_local_reg                          build/py/asmxtensa.o
+                                                  build/py/emitnxtensawin.o
+                                                  build/py/emitnxtensa.o
+asm_xtensa_mov_reg_i32                            build/py/asmxtensa.o
+                                                  build/py/emitnxtensawin.o
+                                                  build/py/emitinlinextensa.o
+                                                  build/py/emitnxtensa.o
+asm_xtensa_mov_reg_i32_optimised                  build/py/asmxtensa.o
+                                                  build/py/emitnxtensawin.o
+                                                  build/py/emitnxtensa.o
+asm_xtensa_mov_reg_local                          build/py/asmxtensa.o
+                                                  build/py/emitnxtensawin.o
+                                                  build/py/emitnxtensa.o
+asm_xtensa_mov_reg_local_addr                     build/py/asmxtensa.o
+                                                  build/py/emitnxtensawin.o
+                                                  build/py/emitnxtensa.o
+asm_xtensa_mov_reg_pcrel                          build/py/asmxtensa.o
+                                                  build/py/emitnxtensawin.o
+                                                  build/py/emitnxtensa.o
+asm_xtensa_op16                                   build/py/asmxtensa.o
+                                                  build/py/emitnxtensawin.o
+                                                  build/py/emitinlinextensa.o
+                                                  build/py/emitnxtensa.o
+asm_xtensa_op24                                   build/py/asmxtensa.o
+                                                  build/py/emitnxtensawin.o
+                                                  build/py/emitinlinextensa.o
+                                                  build/py/emitnxtensa.o
+asm_xtensa_setcc_reg_reg_reg                      build/py/asmxtensa.o
+                                                  build/py/emitnxtensawin.o
+                                                  build/py/emitnxtensa.o
+asprintf                                          /lib/x86_64-linux-gnu/libc.so.6
+asprintf@@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+asprintf@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+atan                                              /lib/x86_64-linux-gnu/libm.so.6
+atan2                                             /lib/x86_64-linux-gnu/libm.so.6
+                                                  build/py/objcomplex.o
+atan2@@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+atan2@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libm.so.6
+atan2f                                            /lib/x86_64-linux-gnu/libm.so.6
+atan2f128                                         /lib/x86_64-linux-gnu/libm.so.6
+atan2f128@@GLIBC_2.26                             /lib/x86_64-linux-gnu/libm.so.6
+atan2f128@GLIBC_2.26                              /lib/x86_64-linux-gnu/libm.so.6
+atan2f32                                          /lib/x86_64-linux-gnu/libm.so.6
+atan2f32@@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+atan2f32@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+atan2f32x                                         /lib/x86_64-linux-gnu/libm.so.6
+atan2f32x@@GLIBC_2.27                             /lib/x86_64-linux-gnu/libm.so.6
+atan2f32x@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+atan2f64                                          /lib/x86_64-linux-gnu/libm.so.6
+atan2f64@@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+atan2f64@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+atan2f64x                                         /lib/x86_64-linux-gnu/libm.so.6
+atan2f64x@@GLIBC_2.27                             /lib/x86_64-linux-gnu/libm.so.6
+atan2f64x@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+atan2f@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libm.so.6
+atan2f@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+atan2l                                            /lib/x86_64-linux-gnu/libm.so.6
+atan2l@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libm.so.6
+atan2l@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+atan@@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libm.so.6
+atan@GLIBC_2.2.5                                  /lib/x86_64-linux-gnu/libm.so.6
+atanf                                             /lib/x86_64-linux-gnu/libm.so.6
+atanf128                                          /lib/x86_64-linux-gnu/libm.so.6
+atanf128@@GLIBC_2.26                              /lib/x86_64-linux-gnu/libm.so.6
+atanf128@GLIBC_2.26                               /lib/x86_64-linux-gnu/libm.so.6
+atanf32                                           /lib/x86_64-linux-gnu/libm.so.6
+atanf32@@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+atanf32@GLIBC_2.27                                /lib/x86_64-linux-gnu/libm.so.6
+atanf32x                                          /lib/x86_64-linux-gnu/libm.so.6
+atanf32x@@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+atanf32x@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+atanf64                                           /lib/x86_64-linux-gnu/libm.so.6
+atanf64@@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+atanf64@GLIBC_2.27                                /lib/x86_64-linux-gnu/libm.so.6
+atanf64x                                          /lib/x86_64-linux-gnu/libm.so.6
+atanf64x@@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+atanf64x@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+atanf@@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+atanf@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libm.so.6
+atanh                                             /lib/x86_64-linux-gnu/libm.so.6
+atanh@@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+atanh@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libm.so.6
+atanhf                                            /lib/x86_64-linux-gnu/libm.so.6
+atanhf128                                         /lib/x86_64-linux-gnu/libm.so.6
+atanhf128@@GLIBC_2.26                             /lib/x86_64-linux-gnu/libm.so.6
+atanhf128@GLIBC_2.26                              /lib/x86_64-linux-gnu/libm.so.6
+atanhf32                                          /lib/x86_64-linux-gnu/libm.so.6
+atanhf32@@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+atanhf32@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+atanhf32x                                         /lib/x86_64-linux-gnu/libm.so.6
+atanhf32x@@GLIBC_2.27                             /lib/x86_64-linux-gnu/libm.so.6
+atanhf32x@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+atanhf64                                          /lib/x86_64-linux-gnu/libm.so.6
+atanhf64@@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+atanhf64@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+atanhf64x                                         /lib/x86_64-linux-gnu/libm.so.6
+atanhf64x@@GLIBC_2.27                             /lib/x86_64-linux-gnu/libm.so.6
+atanhf64x@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+atanhf@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libm.so.6
+atanhf@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+atanhl                                            /lib/x86_64-linux-gnu/libm.so.6
+atanhl@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libm.so.6
+atanhl@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+atanl                                             /lib/x86_64-linux-gnu/libm.so.6
+atanl@@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+atanl@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libm.so.6
+backtrace                                         /lib/x86_64-linux-gnu/libc.so.6
+backtrace@@GLIBC_2.2.5                            /lib/x86_64-linux-gnu/libc.so.6
+backtrace@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+backtrace_symbols                                 /lib/x86_64-linux-gnu/libc.so.6
+backtrace_symbols@@GLIBC_2.2.5                    /lib/x86_64-linux-gnu/libc.so.6
+backtrace_symbols@GLIBC_2.2.5                     /lib/x86_64-linux-gnu/libc.so.6
+backtrace_symbols_fd                              /lib/x86_64-linux-gnu/libc.so.6
+backtrace_symbols_fd@@GLIBC_2.2.5                 /lib/x86_64-linux-gnu/libc.so.6
+backtrace_symbols_fd@GLIBC_2.2.5                  /lib/x86_64-linux-gnu/libc.so.6
+basename                                          /lib/x86_64-linux-gnu/libc.so.6
+basename@@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+basename@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+bcmp                                              /lib/x86_64-linux-gnu/libc.so.6
+bcmp@@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libc.so.6
+bcmp@GLIBC_2.2.5                                  /lib/x86_64-linux-gnu/libc.so.6
+bind                                              /lib/x86_64-linux-gnu/libc.so.6
+bind@@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libc.so.6
+bind@GLIBC_2.2.5                                  /lib/x86_64-linux-gnu/libc.so.6
+bind_textdomain_codeset                           /lib/x86_64-linux-gnu/libc.so.6
+bind_textdomain_codeset@@GLIBC_2.2.5              /lib/x86_64-linux-gnu/libc.so.6
+bind_textdomain_codeset@GLIBC_2.2.5               /lib/x86_64-linux-gnu/libc.so.6
+bindtextdomain                                    /lib/x86_64-linux-gnu/libc.so.6
+bindtextdomain@@GLIBC_2.2.5                       /lib/x86_64-linux-gnu/libc.so.6
+bindtextdomain@GLIBC_2.2.5                        /lib/x86_64-linux-gnu/libc.so.6
+brk                                               /lib/x86_64-linux-gnu/libc.so.6
+brk@@GLIBC_2.2.5                                  /lib/x86_64-linux-gnu/libc.so.6
+brk@GLIBC_2.2.5                                   /lib/x86_64-linux-gnu/libc.so.6
+bsd_signal                                        /lib/x86_64-linux-gnu/libc.so.6
+bsd_signal@@GLIBC_2.2.5                           /lib/x86_64-linux-gnu/libc.so.6
+bsd_signal@GLIBC_2.2.5                            /lib/x86_64-linux-gnu/libc.so.6
+btowc                                             /lib/x86_64-linux-gnu/libc.so.6
+btowc@@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libc.so.6
+btowc@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libc.so.6
+bytes_decode_obj                                  build/py/objstr.o
+                                                  build/py/objarray.o
+bzero                                             /lib/x86_64-linux-gnu/libc.so.6
+bzero@@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libc.so.6
+bzero@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libc.so.6
+cabs                                              /lib/x86_64-linux-gnu/libm.so.6
+cabs@@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libm.so.6
+cabs@GLIBC_2.2.5                                  /lib/x86_64-linux-gnu/libm.so.6
+cabsf                                             /lib/x86_64-linux-gnu/libm.so.6
+cabsf128                                          /lib/x86_64-linux-gnu/libm.so.6
+cabsf128@@GLIBC_2.26                              /lib/x86_64-linux-gnu/libm.so.6
+cabsf128@GLIBC_2.26                               /lib/x86_64-linux-gnu/libm.so.6
+cabsf32                                           /lib/x86_64-linux-gnu/libm.so.6
+cabsf32@@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+cabsf32@GLIBC_2.27                                /lib/x86_64-linux-gnu/libm.so.6
+cabsf32x                                          /lib/x86_64-linux-gnu/libm.so.6
+cabsf32x@@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+cabsf32x@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+cabsf64                                           /lib/x86_64-linux-gnu/libm.so.6
+cabsf64@@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+cabsf64@GLIBC_2.27                                /lib/x86_64-linux-gnu/libm.so.6
+cabsf64x                                          /lib/x86_64-linux-gnu/libm.so.6
+cabsf64x@@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+cabsf64x@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+cabsf@@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+cabsf@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libm.so.6
+cabsl                                             /lib/x86_64-linux-gnu/libm.so.6
+cabsl@@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+cabsl@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libm.so.6
+cacos                                             /lib/x86_64-linux-gnu/libm.so.6
+cacos@@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+cacos@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libm.so.6
+cacosf                                            /lib/x86_64-linux-gnu/libm.so.6
+cacosf128                                         /lib/x86_64-linux-gnu/libm.so.6
+cacosf128@@GLIBC_2.26                             /lib/x86_64-linux-gnu/libm.so.6
+cacosf128@GLIBC_2.26                              /lib/x86_64-linux-gnu/libm.so.6
+cacosf32                                          /lib/x86_64-linux-gnu/libm.so.6
+cacosf32@@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+cacosf32@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+cacosf32x                                         /lib/x86_64-linux-gnu/libm.so.6
+cacosf32x@@GLIBC_2.27                             /lib/x86_64-linux-gnu/libm.so.6
+cacosf32x@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+cacosf64                                          /lib/x86_64-linux-gnu/libm.so.6
+cacosf64@@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+cacosf64@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+cacosf64x                                         /lib/x86_64-linux-gnu/libm.so.6
+cacosf64x@@GLIBC_2.27                             /lib/x86_64-linux-gnu/libm.so.6
+cacosf64x@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+cacosf@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libm.so.6
+cacosf@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+cacosh                                            /lib/x86_64-linux-gnu/libm.so.6
+cacosh@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libm.so.6
+cacosh@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+cacoshf                                           /lib/x86_64-linux-gnu/libm.so.6
+cacoshf128                                        /lib/x86_64-linux-gnu/libm.so.6
+cacoshf128@@GLIBC_2.26                            /lib/x86_64-linux-gnu/libm.so.6
+cacoshf128@GLIBC_2.26                             /lib/x86_64-linux-gnu/libm.so.6
+cacoshf32                                         /lib/x86_64-linux-gnu/libm.so.6
+cacoshf32@@GLIBC_2.27                             /lib/x86_64-linux-gnu/libm.so.6
+cacoshf32@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+cacoshf32x                                        /lib/x86_64-linux-gnu/libm.so.6
+cacoshf32x@@GLIBC_2.27                            /lib/x86_64-linux-gnu/libm.so.6
+cacoshf32x@GLIBC_2.27                             /lib/x86_64-linux-gnu/libm.so.6
+cacoshf64                                         /lib/x86_64-linux-gnu/libm.so.6
+cacoshf64@@GLIBC_2.27                             /lib/x86_64-linux-gnu/libm.so.6
+cacoshf64@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+cacoshf64x                                        /lib/x86_64-linux-gnu/libm.so.6
+cacoshf64x@@GLIBC_2.27                            /lib/x86_64-linux-gnu/libm.so.6
+cacoshf64x@GLIBC_2.27                             /lib/x86_64-linux-gnu/libm.so.6
+cacoshf@@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libm.so.6
+cacoshf@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libm.so.6
+cacoshl                                           /lib/x86_64-linux-gnu/libm.so.6
+cacoshl@@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libm.so.6
+cacoshl@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libm.so.6
+cacosl                                            /lib/x86_64-linux-gnu/libm.so.6
+cacosl@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libm.so.6
+cacosl@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+calloc                                            /lib/x86_64-linux-gnu/libc.so.6
+calloc@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+                                                  /lib64/ld-linux-x86-64.so.2
+calloc@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libc.so.6
+canonicalize                                      /lib/x86_64-linux-gnu/libm.so.6
+canonicalize@@GLIBC_2.25                          /lib/x86_64-linux-gnu/libm.so.6
+canonicalize@GLIBC_2.25                           /lib/x86_64-linux-gnu/libm.so.6
+canonicalize_file_name                            /lib/x86_64-linux-gnu/libc.so.6
+canonicalize_file_name@@GLIBC_2.2.5               /lib/x86_64-linux-gnu/libc.so.6
+canonicalize_file_name@GLIBC_2.2.5                /lib/x86_64-linux-gnu/libc.so.6
+canonicalizef                                     /lib/x86_64-linux-gnu/libm.so.6
+canonicalizef128                                  /lib/x86_64-linux-gnu/libm.so.6
+canonicalizef128@@GLIBC_2.26                      /lib/x86_64-linux-gnu/libm.so.6
+canonicalizef128@GLIBC_2.26                       /lib/x86_64-linux-gnu/libm.so.6
+canonicalizef32                                   /lib/x86_64-linux-gnu/libm.so.6
+canonicalizef32@@GLIBC_2.27                       /lib/x86_64-linux-gnu/libm.so.6
+canonicalizef32@GLIBC_2.27                        /lib/x86_64-linux-gnu/libm.so.6
+canonicalizef32x                                  /lib/x86_64-linux-gnu/libm.so.6
+canonicalizef32x@@GLIBC_2.27                      /lib/x86_64-linux-gnu/libm.so.6
+canonicalizef32x@GLIBC_2.27                       /lib/x86_64-linux-gnu/libm.so.6
+canonicalizef64                                   /lib/x86_64-linux-gnu/libm.so.6
+canonicalizef64@@GLIBC_2.27                       /lib/x86_64-linux-gnu/libm.so.6
+canonicalizef64@GLIBC_2.27                        /lib/x86_64-linux-gnu/libm.so.6
+canonicalizef64x                                  /lib/x86_64-linux-gnu/libm.so.6
+canonicalizef64x@@GLIBC_2.27                      /lib/x86_64-linux-gnu/libm.so.6
+canonicalizef64x@GLIBC_2.27                       /lib/x86_64-linux-gnu/libm.so.6
+canonicalizef@@GLIBC_2.25                         /lib/x86_64-linux-gnu/libm.so.6
+canonicalizef@GLIBC_2.25                          /lib/x86_64-linux-gnu/libm.so.6
+canonicalizel                                     /lib/x86_64-linux-gnu/libm.so.6
+canonicalizel@@GLIBC_2.25                         /lib/x86_64-linux-gnu/libm.so.6
+canonicalizel@GLIBC_2.25                          /lib/x86_64-linux-gnu/libm.so.6
+carg                                              /lib/x86_64-linux-gnu/libm.so.6
+carg@@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libm.so.6
+carg@GLIBC_2.2.5                                  /lib/x86_64-linux-gnu/libm.so.6
+cargf                                             /lib/x86_64-linux-gnu/libm.so.6
+cargf128                                          /lib/x86_64-linux-gnu/libm.so.6
+cargf128@@GLIBC_2.26                              /lib/x86_64-linux-gnu/libm.so.6
+cargf128@GLIBC_2.26                               /lib/x86_64-linux-gnu/libm.so.6
+cargf32                                           /lib/x86_64-linux-gnu/libm.so.6
+cargf32@@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+cargf32@GLIBC_2.27                                /lib/x86_64-linux-gnu/libm.so.6
+cargf32x                                          /lib/x86_64-linux-gnu/libm.so.6
+cargf32x@@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+cargf32x@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+cargf64                                           /lib/x86_64-linux-gnu/libm.so.6
+cargf64@@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+cargf64@GLIBC_2.27                                /lib/x86_64-linux-gnu/libm.so.6
+cargf64x                                          /lib/x86_64-linux-gnu/libm.so.6
+cargf64x@@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+cargf64x@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+cargf@@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+cargf@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libm.so.6
+cargl                                             /lib/x86_64-linux-gnu/libm.so.6
+cargl@@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+cargl@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libm.so.6
+casin                                             /lib/x86_64-linux-gnu/libm.so.6
+casin@@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+casin@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libm.so.6
+casinf                                            /lib/x86_64-linux-gnu/libm.so.6
+casinf128                                         /lib/x86_64-linux-gnu/libm.so.6
+casinf128@@GLIBC_2.26                             /lib/x86_64-linux-gnu/libm.so.6
+casinf128@GLIBC_2.26                              /lib/x86_64-linux-gnu/libm.so.6
+casinf32                                          /lib/x86_64-linux-gnu/libm.so.6
+casinf32@@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+casinf32@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+casinf32x                                         /lib/x86_64-linux-gnu/libm.so.6
+casinf32x@@GLIBC_2.27                             /lib/x86_64-linux-gnu/libm.so.6
+casinf32x@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+casinf64                                          /lib/x86_64-linux-gnu/libm.so.6
+casinf64@@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+casinf64@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+casinf64x                                         /lib/x86_64-linux-gnu/libm.so.6
+casinf64x@@GLIBC_2.27                             /lib/x86_64-linux-gnu/libm.so.6
+casinf64x@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+casinf@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libm.so.6
+casinf@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+casinh                                            /lib/x86_64-linux-gnu/libm.so.6
+casinh@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libm.so.6
+casinh@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+casinhf                                           /lib/x86_64-linux-gnu/libm.so.6
+casinhf128                                        /lib/x86_64-linux-gnu/libm.so.6
+casinhf128@@GLIBC_2.26                            /lib/x86_64-linux-gnu/libm.so.6
+casinhf128@GLIBC_2.26                             /lib/x86_64-linux-gnu/libm.so.6
+casinhf32                                         /lib/x86_64-linux-gnu/libm.so.6
+casinhf32@@GLIBC_2.27                             /lib/x86_64-linux-gnu/libm.so.6
+casinhf32@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+casinhf32x                                        /lib/x86_64-linux-gnu/libm.so.6
+casinhf32x@@GLIBC_2.27                            /lib/x86_64-linux-gnu/libm.so.6
+casinhf32x@GLIBC_2.27                             /lib/x86_64-linux-gnu/libm.so.6
+casinhf64                                         /lib/x86_64-linux-gnu/libm.so.6
+casinhf64@@GLIBC_2.27                             /lib/x86_64-linux-gnu/libm.so.6
+casinhf64@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+casinhf64x                                        /lib/x86_64-linux-gnu/libm.so.6
+casinhf64x@@GLIBC_2.27                            /lib/x86_64-linux-gnu/libm.so.6
+casinhf64x@GLIBC_2.27                             /lib/x86_64-linux-gnu/libm.so.6
+casinhf@@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libm.so.6
+casinhf@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libm.so.6
+casinhl                                           /lib/x86_64-linux-gnu/libm.so.6
+casinhl@@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libm.so.6
+casinhl@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libm.so.6
+casinl                                            /lib/x86_64-linux-gnu/libm.so.6
+casinl@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libm.so.6
+casinl@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+catan                                             /lib/x86_64-linux-gnu/libm.so.6
+catan@@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+catan@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libm.so.6
+catanf                                            /lib/x86_64-linux-gnu/libm.so.6
+catanf128                                         /lib/x86_64-linux-gnu/libm.so.6
+catanf128@@GLIBC_2.26                             /lib/x86_64-linux-gnu/libm.so.6
+catanf128@GLIBC_2.26                              /lib/x86_64-linux-gnu/libm.so.6
+catanf32                                          /lib/x86_64-linux-gnu/libm.so.6
+catanf32@@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+catanf32@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+catanf32x                                         /lib/x86_64-linux-gnu/libm.so.6
+catanf32x@@GLIBC_2.27                             /lib/x86_64-linux-gnu/libm.so.6
+catanf32x@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+catanf64                                          /lib/x86_64-linux-gnu/libm.so.6
+catanf64@@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+catanf64@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+catanf64x                                         /lib/x86_64-linux-gnu/libm.so.6
+catanf64x@@GLIBC_2.27                             /lib/x86_64-linux-gnu/libm.so.6
+catanf64x@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+catanf@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libm.so.6
+catanf@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+catanh                                            /lib/x86_64-linux-gnu/libm.so.6
+catanh@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libm.so.6
+catanh@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+catanhf                                           /lib/x86_64-linux-gnu/libm.so.6
+catanhf128                                        /lib/x86_64-linux-gnu/libm.so.6
+catanhf128@@GLIBC_2.26                            /lib/x86_64-linux-gnu/libm.so.6
+catanhf128@GLIBC_2.26                             /lib/x86_64-linux-gnu/libm.so.6
+catanhf32                                         /lib/x86_64-linux-gnu/libm.so.6
+catanhf32@@GLIBC_2.27                             /lib/x86_64-linux-gnu/libm.so.6
+catanhf32@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+catanhf32x                                        /lib/x86_64-linux-gnu/libm.so.6
+catanhf32x@@GLIBC_2.27                            /lib/x86_64-linux-gnu/libm.so.6
+catanhf32x@GLIBC_2.27                             /lib/x86_64-linux-gnu/libm.so.6
+catanhf64                                         /lib/x86_64-linux-gnu/libm.so.6
+catanhf64@@GLIBC_2.27                             /lib/x86_64-linux-gnu/libm.so.6
+catanhf64@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+catanhf64x                                        /lib/x86_64-linux-gnu/libm.so.6
+catanhf64x@@GLIBC_2.27                            /lib/x86_64-linux-gnu/libm.so.6
+catanhf64x@GLIBC_2.27                             /lib/x86_64-linux-gnu/libm.so.6
+catanhf@@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libm.so.6
+catanhf@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libm.so.6
+catanhl                                           /lib/x86_64-linux-gnu/libm.so.6
+catanhl@@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libm.so.6
+catanhl@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libm.so.6
+catanl                                            /lib/x86_64-linux-gnu/libm.so.6
+catanl@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libm.so.6
+catanl@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+cbrt                                              /lib/x86_64-linux-gnu/libm.so.6
+cbrt@@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libm.so.6
+cbrt@GLIBC_2.2.5                                  /lib/x86_64-linux-gnu/libm.so.6
+cbrtf                                             /lib/x86_64-linux-gnu/libm.so.6
+cbrtf128                                          /lib/x86_64-linux-gnu/libm.so.6
+cbrtf128@@GLIBC_2.26                              /lib/x86_64-linux-gnu/libm.so.6
+cbrtf128@GLIBC_2.26                               /lib/x86_64-linux-gnu/libm.so.6
+cbrtf32                                           /lib/x86_64-linux-gnu/libm.so.6
+cbrtf32@@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+cbrtf32@GLIBC_2.27                                /lib/x86_64-linux-gnu/libm.so.6
+cbrtf32x                                          /lib/x86_64-linux-gnu/libm.so.6
+cbrtf32x@@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+cbrtf32x@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+cbrtf64                                           /lib/x86_64-linux-gnu/libm.so.6
+cbrtf64@@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+cbrtf64@GLIBC_2.27                                /lib/x86_64-linux-gnu/libm.so.6
+cbrtf64x                                          /lib/x86_64-linux-gnu/libm.so.6
+cbrtf64x@@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+cbrtf64x@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+cbrtf@@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+cbrtf@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libm.so.6
+cbrtl                                             /lib/x86_64-linux-gnu/libm.so.6
+cbrtl@@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+cbrtl@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libm.so.6
+ccos                                              /lib/x86_64-linux-gnu/libm.so.6
+ccos@@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libm.so.6
+ccos@GLIBC_2.2.5                                  /lib/x86_64-linux-gnu/libm.so.6
+ccosf                                             /lib/x86_64-linux-gnu/libm.so.6
+ccosf128                                          /lib/x86_64-linux-gnu/libm.so.6
+ccosf128@@GLIBC_2.26                              /lib/x86_64-linux-gnu/libm.so.6
+ccosf128@GLIBC_2.26                               /lib/x86_64-linux-gnu/libm.so.6
+ccosf32                                           /lib/x86_64-linux-gnu/libm.so.6
+ccosf32@@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+ccosf32@GLIBC_2.27                                /lib/x86_64-linux-gnu/libm.so.6
+ccosf32x                                          /lib/x86_64-linux-gnu/libm.so.6
+ccosf32x@@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+ccosf32x@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+ccosf64                                           /lib/x86_64-linux-gnu/libm.so.6
+ccosf64@@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+ccosf64@GLIBC_2.27                                /lib/x86_64-linux-gnu/libm.so.6
+ccosf64x                                          /lib/x86_64-linux-gnu/libm.so.6
+ccosf64x@@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+ccosf64x@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+ccosf@@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+ccosf@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libm.so.6
+ccosh                                             /lib/x86_64-linux-gnu/libm.so.6
+ccosh@@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+ccosh@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libm.so.6
+ccoshf                                            /lib/x86_64-linux-gnu/libm.so.6
+ccoshf128                                         /lib/x86_64-linux-gnu/libm.so.6
+ccoshf128@@GLIBC_2.26                             /lib/x86_64-linux-gnu/libm.so.6
+ccoshf128@GLIBC_2.26                              /lib/x86_64-linux-gnu/libm.so.6
+ccoshf32                                          /lib/x86_64-linux-gnu/libm.so.6
+ccoshf32@@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+ccoshf32@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+ccoshf32x                                         /lib/x86_64-linux-gnu/libm.so.6
+ccoshf32x@@GLIBC_2.27                             /lib/x86_64-linux-gnu/libm.so.6
+ccoshf32x@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+ccoshf64                                          /lib/x86_64-linux-gnu/libm.so.6
+ccoshf64@@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+ccoshf64@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+ccoshf64x                                         /lib/x86_64-linux-gnu/libm.so.6
+ccoshf64x@@GLIBC_2.27                             /lib/x86_64-linux-gnu/libm.so.6
+ccoshf64x@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+ccoshf@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libm.so.6
+ccoshf@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+ccoshl                                            /lib/x86_64-linux-gnu/libm.so.6
+ccoshl@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libm.so.6
+ccoshl@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+ccosl                                             /lib/x86_64-linux-gnu/libm.so.6
+ccosl@@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+ccosl@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libm.so.6
+ceil                                              /lib/x86_64-linux-gnu/libm.so.6
+ceil@@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libm.so.6
+ceil@GLIBC_2.2.5                                  /lib/x86_64-linux-gnu/libm.so.6
+ceilf                                             /lib/x86_64-linux-gnu/libm.so.6
+ceilf128                                          /lib/x86_64-linux-gnu/libm.so.6
+ceilf128@@GLIBC_2.26                              /lib/x86_64-linux-gnu/libm.so.6
+ceilf128@GLIBC_2.26                               /lib/x86_64-linux-gnu/libm.so.6
+ceilf32                                           /lib/x86_64-linux-gnu/libm.so.6
+ceilf32@@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+ceilf32@GLIBC_2.27                                /lib/x86_64-linux-gnu/libm.so.6
+ceilf32x                                          /lib/x86_64-linux-gnu/libm.so.6
+ceilf32x@@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+ceilf32x@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+ceilf64                                           /lib/x86_64-linux-gnu/libm.so.6
+ceilf64@@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+ceilf64@GLIBC_2.27                                /lib/x86_64-linux-gnu/libm.so.6
+ceilf64x                                          /lib/x86_64-linux-gnu/libm.so.6
+ceilf64x@@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+ceilf64x@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+ceilf@@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+ceilf@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libm.so.6
+ceill                                             /lib/x86_64-linux-gnu/libm.so.6
+ceill@@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+ceill@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libm.so.6
+cexp                                              /lib/x86_64-linux-gnu/libm.so.6
+cexp@@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libm.so.6
+cexp@GLIBC_2.2.5                                  /lib/x86_64-linux-gnu/libm.so.6
+cexpf                                             /lib/x86_64-linux-gnu/libm.so.6
+cexpf128                                          /lib/x86_64-linux-gnu/libm.so.6
+cexpf128@@GLIBC_2.26                              /lib/x86_64-linux-gnu/libm.so.6
+cexpf128@GLIBC_2.26                               /lib/x86_64-linux-gnu/libm.so.6
+cexpf32                                           /lib/x86_64-linux-gnu/libm.so.6
+cexpf32@@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+cexpf32@GLIBC_2.27                                /lib/x86_64-linux-gnu/libm.so.6
+cexpf32x                                          /lib/x86_64-linux-gnu/libm.so.6
+cexpf32x@@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+cexpf32x@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+cexpf64                                           /lib/x86_64-linux-gnu/libm.so.6
+cexpf64@@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+cexpf64@GLIBC_2.27                                /lib/x86_64-linux-gnu/libm.so.6
+cexpf64x                                          /lib/x86_64-linux-gnu/libm.so.6
+cexpf64x@@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+cexpf64x@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+cexpf@@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+cexpf@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libm.so.6
+cexpl                                             /lib/x86_64-linux-gnu/libm.so.6
+cexpl@@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+cexpl@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libm.so.6
+chdir                                             /lib/x86_64-linux-gnu/libc.so.6
+chdir@@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libc.so.6
+chdir@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libc.so.6
+chmod                                             /lib/x86_64-linux-gnu/libc.so.6
+chmod@@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libc.so.6
+chmod@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libc.so.6
+chown                                             /lib/x86_64-linux-gnu/libc.so.6
+chown@@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libc.so.6
+chown@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libc.so.6
+cimag                                             /lib/x86_64-linux-gnu/libm.so.6
+cimag@@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+cimag@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libm.so.6
+cimagf                                            /lib/x86_64-linux-gnu/libm.so.6
+cimagf128                                         /lib/x86_64-linux-gnu/libm.so.6
+cimagf128@@GLIBC_2.26                             /lib/x86_64-linux-gnu/libm.so.6
+cimagf128@GLIBC_2.26                              /lib/x86_64-linux-gnu/libm.so.6
+cimagf32                                          /lib/x86_64-linux-gnu/libm.so.6
+cimagf32@@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+cimagf32@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+cimagf32x                                         /lib/x86_64-linux-gnu/libm.so.6
+cimagf32x@@GLIBC_2.27                             /lib/x86_64-linux-gnu/libm.so.6
+cimagf32x@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+cimagf64                                          /lib/x86_64-linux-gnu/libm.so.6
+cimagf64@@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+cimagf64@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+cimagf64x                                         /lib/x86_64-linux-gnu/libm.so.6
+cimagf64x@@GLIBC_2.27                             /lib/x86_64-linux-gnu/libm.so.6
+cimagf64x@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+cimagf@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libm.so.6
+cimagf@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+cimagl                                            /lib/x86_64-linux-gnu/libm.so.6
+cimagl@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libm.so.6
+cimagl@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+clearenv                                          /lib/x86_64-linux-gnu/libc.so.6
+clearenv@@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+clearenv@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+clock_adjtime                                     /lib/x86_64-linux-gnu/libc.so.6
+clock_adjtime@@GLIBC_2.14                         /lib/x86_64-linux-gnu/libc.so.6
+clock_adjtime@GLIBC_2.14                          /lib/x86_64-linux-gnu/libc.so.6
+clog                                              /lib/x86_64-linux-gnu/libm.so.6
+clog10                                            /lib/x86_64-linux-gnu/libm.so.6
+clog10@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libm.so.6
+clog10@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+clog10f                                           /lib/x86_64-linux-gnu/libm.so.6
+clog10f128                                        /lib/x86_64-linux-gnu/libm.so.6
+clog10f128@@GLIBC_2.26                            /lib/x86_64-linux-gnu/libm.so.6
+clog10f128@GLIBC_2.26                             /lib/x86_64-linux-gnu/libm.so.6
+clog10f32                                         /lib/x86_64-linux-gnu/libm.so.6
+clog10f32@@GLIBC_2.27                             /lib/x86_64-linux-gnu/libm.so.6
+clog10f32@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+clog10f32x                                        /lib/x86_64-linux-gnu/libm.so.6
+clog10f32x@@GLIBC_2.27                            /lib/x86_64-linux-gnu/libm.so.6
+clog10f32x@GLIBC_2.27                             /lib/x86_64-linux-gnu/libm.so.6
+clog10f64                                         /lib/x86_64-linux-gnu/libm.so.6
+clog10f64@@GLIBC_2.27                             /lib/x86_64-linux-gnu/libm.so.6
+clog10f64@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+clog10f64x                                        /lib/x86_64-linux-gnu/libm.so.6
+clog10f64x@@GLIBC_2.27                            /lib/x86_64-linux-gnu/libm.so.6
+clog10f64x@GLIBC_2.27                             /lib/x86_64-linux-gnu/libm.so.6
+clog10f@@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libm.so.6
+clog10f@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libm.so.6
+clog10l                                           /lib/x86_64-linux-gnu/libm.so.6
+clog10l@@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libm.so.6
+clog10l@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libm.so.6
+clog@@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libm.so.6
+clog@GLIBC_2.2.5                                  /lib/x86_64-linux-gnu/libm.so.6
+clogf                                             /lib/x86_64-linux-gnu/libm.so.6
+clogf128                                          /lib/x86_64-linux-gnu/libm.so.6
+clogf128@@GLIBC_2.26                              /lib/x86_64-linux-gnu/libm.so.6
+clogf128@GLIBC_2.26                               /lib/x86_64-linux-gnu/libm.so.6
+clogf32                                           /lib/x86_64-linux-gnu/libm.so.6
+clogf32@@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+clogf32@GLIBC_2.27                                /lib/x86_64-linux-gnu/libm.so.6
+clogf32x                                          /lib/x86_64-linux-gnu/libm.so.6
+clogf32x@@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+clogf32x@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+clogf64                                           /lib/x86_64-linux-gnu/libm.so.6
+clogf64@@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+clogf64@GLIBC_2.27                                /lib/x86_64-linux-gnu/libm.so.6
+clogf64x                                          /lib/x86_64-linux-gnu/libm.so.6
+clogf64x@@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+clogf64x@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+clogf@@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+clogf@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libm.so.6
+clogl                                             /lib/x86_64-linux-gnu/libm.so.6
+clogl@@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+clogl@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libm.so.6
+clone                                             /lib/x86_64-linux-gnu/libc.so.6
+clone@@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libc.so.6
+clone@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libc.so.6
+close                                             /lib/x86_64-linux-gnu/libc.so.6
+                                                  build/py/persistentcode.o
+                                                  build/py/reader.o
+close@@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libc.so.6
+close@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libc.so.6
+closedir                                          /lib/x86_64-linux-gnu/libc.so.6
+closedir@@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+closedir@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+closure_type                                      build/py/objclosure.o
+conj                                              /lib/x86_64-linux-gnu/libm.so.6
+conj@@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libm.so.6
+conj@GLIBC_2.2.5                                  /lib/x86_64-linux-gnu/libm.so.6
+conjf                                             /lib/x86_64-linux-gnu/libm.so.6
+conjf128                                          /lib/x86_64-linux-gnu/libm.so.6
+conjf128@@GLIBC_2.26                              /lib/x86_64-linux-gnu/libm.so.6
+conjf128@GLIBC_2.26                               /lib/x86_64-linux-gnu/libm.so.6
+conjf32                                           /lib/x86_64-linux-gnu/libm.so.6
+conjf32@@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+conjf32@GLIBC_2.27                                /lib/x86_64-linux-gnu/libm.so.6
+conjf32x                                          /lib/x86_64-linux-gnu/libm.so.6
+conjf32x@@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+conjf32x@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+conjf64                                           /lib/x86_64-linux-gnu/libm.so.6
+conjf64@@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+conjf64@GLIBC_2.27                                /lib/x86_64-linux-gnu/libm.so.6
+conjf64x                                          /lib/x86_64-linux-gnu/libm.so.6
+conjf64x@@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+conjf64x@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+conjf@@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+conjf@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libm.so.6
+conjl                                             /lib/x86_64-linux-gnu/libm.so.6
+conjl@@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+conjl@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libm.so.6
+connect                                           /lib/x86_64-linux-gnu/libc.so.6
+connect@@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+connect@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+copysign                                          /lib/x86_64-linux-gnu/libm.so.6
+copysign@@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libm.so.6
+                                                  /lib/x86_64-linux-gnu/libc.so.6
+copysign@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libm.so.6
+copysignf                                         /lib/x86_64-linux-gnu/libm.so.6
+copysignf128                                      /lib/x86_64-linux-gnu/libm.so.6
+copysignf128@@GLIBC_2.26                          /lib/x86_64-linux-gnu/libm.so.6
+copysignf128@GLIBC_2.26                           /lib/x86_64-linux-gnu/libm.so.6
+copysignf32                                       /lib/x86_64-linux-gnu/libm.so.6
+copysignf32@@GLIBC_2.27                           /lib/x86_64-linux-gnu/libm.so.6
+copysignf32@GLIBC_2.27                            /lib/x86_64-linux-gnu/libm.so.6
+copysignf32x                                      /lib/x86_64-linux-gnu/libm.so.6
+copysignf32x@@GLIBC_2.27                          /lib/x86_64-linux-gnu/libm.so.6
+copysignf32x@GLIBC_2.27                           /lib/x86_64-linux-gnu/libm.so.6
+copysignf64                                       /lib/x86_64-linux-gnu/libm.so.6
+copysignf64@@GLIBC_2.27                           /lib/x86_64-linux-gnu/libm.so.6
+copysignf64@GLIBC_2.27                            /lib/x86_64-linux-gnu/libm.so.6
+copysignf64x                                      /lib/x86_64-linux-gnu/libm.so.6
+copysignf64x@@GLIBC_2.27                          /lib/x86_64-linux-gnu/libm.so.6
+copysignf64x@GLIBC_2.27                           /lib/x86_64-linux-gnu/libm.so.6
+copysignf@@GLIBC_2.2.5                            /lib/x86_64-linux-gnu/libm.so.6
+                                                  /lib/x86_64-linux-gnu/libc.so.6
+copysignf@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libm.so.6
+copysignl                                         /lib/x86_64-linux-gnu/libm.so.6
+copysignl@@GLIBC_2.2.5                            /lib/x86_64-linux-gnu/libm.so.6
+                                                  /lib/x86_64-linux-gnu/libc.so.6
+copysignl@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libm.so.6
+cos                                               /lib/x86_64-linux-gnu/libm.so.6
+cos@@GLIBC_2.2.5                                  /lib/x86_64-linux-gnu/libm.so.6
+cos@GLIBC_2.2.5                                   /lib/x86_64-linux-gnu/libm.so.6
+cosf                                              /lib/x86_64-linux-gnu/libm.so.6
+cosf128                                           /lib/x86_64-linux-gnu/libm.so.6
+cosf128@@GLIBC_2.26                               /lib/x86_64-linux-gnu/libm.so.6
+cosf128@GLIBC_2.26                                /lib/x86_64-linux-gnu/libm.so.6
+cosf32                                            /lib/x86_64-linux-gnu/libm.so.6
+cosf32@@GLIBC_2.27                                /lib/x86_64-linux-gnu/libm.so.6
+cosf32@GLIBC_2.27                                 /lib/x86_64-linux-gnu/libm.so.6
+cosf32x                                           /lib/x86_64-linux-gnu/libm.so.6
+cosf32x@@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+cosf32x@GLIBC_2.27                                /lib/x86_64-linux-gnu/libm.so.6
+cosf64                                            /lib/x86_64-linux-gnu/libm.so.6
+cosf64@@GLIBC_2.27                                /lib/x86_64-linux-gnu/libm.so.6
+cosf64@GLIBC_2.27                                 /lib/x86_64-linux-gnu/libm.so.6
+cosf64x                                           /lib/x86_64-linux-gnu/libm.so.6
+cosf64x@@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+cosf64x@GLIBC_2.27                                /lib/x86_64-linux-gnu/libm.so.6
+cosf@@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libm.so.6
+cosf@GLIBC_2.2.5                                  /lib/x86_64-linux-gnu/libm.so.6
+cosh                                              /lib/x86_64-linux-gnu/libm.so.6
+cosh@@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libm.so.6
+cosh@GLIBC_2.2.5                                  /lib/x86_64-linux-gnu/libm.so.6
+coshf                                             /lib/x86_64-linux-gnu/libm.so.6
+coshf128                                          /lib/x86_64-linux-gnu/libm.so.6
+coshf128@@GLIBC_2.26                              /lib/x86_64-linux-gnu/libm.so.6
+coshf128@GLIBC_2.26                               /lib/x86_64-linux-gnu/libm.so.6
+coshf32                                           /lib/x86_64-linux-gnu/libm.so.6
+coshf32@@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+coshf32@GLIBC_2.27                                /lib/x86_64-linux-gnu/libm.so.6
+coshf32x                                          /lib/x86_64-linux-gnu/libm.so.6
+coshf32x@@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+coshf32x@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+coshf64                                           /lib/x86_64-linux-gnu/libm.so.6
+coshf64@@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+coshf64@GLIBC_2.27                                /lib/x86_64-linux-gnu/libm.so.6
+coshf64x                                          /lib/x86_64-linux-gnu/libm.so.6
+coshf64x@@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+coshf64x@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+coshf@@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+coshf@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libm.so.6
+coshl                                             /lib/x86_64-linux-gnu/libm.so.6
+coshl@@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+coshl@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libm.so.6
+cosl                                              /lib/x86_64-linux-gnu/libm.so.6
+cosl@@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libm.so.6
+cosl@GLIBC_2.2.5                                  /lib/x86_64-linux-gnu/libm.so.6
+cpow                                              /lib/x86_64-linux-gnu/libm.so.6
+cpow@@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libm.so.6
+cpow@GLIBC_2.2.5                                  /lib/x86_64-linux-gnu/libm.so.6
+cpowf                                             /lib/x86_64-linux-gnu/libm.so.6
+cpowf128                                          /lib/x86_64-linux-gnu/libm.so.6
+cpowf128@@GLIBC_2.26                              /lib/x86_64-linux-gnu/libm.so.6
+cpowf128@GLIBC_2.26                               /lib/x86_64-linux-gnu/libm.so.6
+cpowf32                                           /lib/x86_64-linux-gnu/libm.so.6
+cpowf32@@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+cpowf32@GLIBC_2.27                                /lib/x86_64-linux-gnu/libm.so.6
+cpowf32x                                          /lib/x86_64-linux-gnu/libm.so.6
+cpowf32x@@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+cpowf32x@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+cpowf64                                           /lib/x86_64-linux-gnu/libm.so.6
+cpowf64@@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+cpowf64@GLIBC_2.27                                /lib/x86_64-linux-gnu/libm.so.6
+cpowf64x                                          /lib/x86_64-linux-gnu/libm.so.6
+cpowf64x@@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+cpowf64x@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+cpowf@@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+cpowf@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libm.so.6
+cpowl                                             /lib/x86_64-linux-gnu/libm.so.6
+cpowl@@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+cpowl@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libm.so.6
+cproj                                             /lib/x86_64-linux-gnu/libm.so.6
+cproj@@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+cproj@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libm.so.6
+cprojf                                            /lib/x86_64-linux-gnu/libm.so.6
+cprojf128                                         /lib/x86_64-linux-gnu/libm.so.6
+cprojf128@@GLIBC_2.26                             /lib/x86_64-linux-gnu/libm.so.6
+cprojf128@GLIBC_2.26                              /lib/x86_64-linux-gnu/libm.so.6
+cprojf32                                          /lib/x86_64-linux-gnu/libm.so.6
+cprojf32@@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+cprojf32@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+cprojf32x                                         /lib/x86_64-linux-gnu/libm.so.6
+cprojf32x@@GLIBC_2.27                             /lib/x86_64-linux-gnu/libm.so.6
+cprojf32x@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+cprojf64                                          /lib/x86_64-linux-gnu/libm.so.6
+cprojf64@@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+cprojf64@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+cprojf64x                                         /lib/x86_64-linux-gnu/libm.so.6
+cprojf64x@@GLIBC_2.27                             /lib/x86_64-linux-gnu/libm.so.6
+cprojf64x@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+cprojf@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libm.so.6
+cprojf@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+cprojl                                            /lib/x86_64-linux-gnu/libm.so.6
+cprojl@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libm.so.6
+cprojl@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+creal                                             /lib/x86_64-linux-gnu/libm.so.6
+creal@@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+creal@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libm.so.6
+crealf                                            /lib/x86_64-linux-gnu/libm.so.6
+crealf128                                         /lib/x86_64-linux-gnu/libm.so.6
+crealf128@@GLIBC_2.26                             /lib/x86_64-linux-gnu/libm.so.6
+crealf128@GLIBC_2.26                              /lib/x86_64-linux-gnu/libm.so.6
+crealf32                                          /lib/x86_64-linux-gnu/libm.so.6
+crealf32@@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+crealf32@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+crealf32x                                         /lib/x86_64-linux-gnu/libm.so.6
+crealf32x@@GLIBC_2.27                             /lib/x86_64-linux-gnu/libm.so.6
+crealf32x@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+crealf64                                          /lib/x86_64-linux-gnu/libm.so.6
+crealf64@@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+crealf64@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+crealf64x                                         /lib/x86_64-linux-gnu/libm.so.6
+crealf64x@@GLIBC_2.27                             /lib/x86_64-linux-gnu/libm.so.6
+crealf64x@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+crealf@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libm.so.6
+crealf@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+creall                                            /lib/x86_64-linux-gnu/libm.so.6
+creall@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libm.so.6
+creall@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+creat                                             /lib/x86_64-linux-gnu/libc.so.6
+creat64                                           /lib/x86_64-linux-gnu/libc.so.6
+creat64@@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+creat64@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+creat@@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libc.so.6
+creat@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libc.so.6
+csin                                              /lib/x86_64-linux-gnu/libm.so.6
+csin@@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libm.so.6
+csin@GLIBC_2.2.5                                  /lib/x86_64-linux-gnu/libm.so.6
+csinf                                             /lib/x86_64-linux-gnu/libm.so.6
+csinf128                                          /lib/x86_64-linux-gnu/libm.so.6
+csinf128@@GLIBC_2.26                              /lib/x86_64-linux-gnu/libm.so.6
+csinf128@GLIBC_2.26                               /lib/x86_64-linux-gnu/libm.so.6
+csinf32                                           /lib/x86_64-linux-gnu/libm.so.6
+csinf32@@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+csinf32@GLIBC_2.27                                /lib/x86_64-linux-gnu/libm.so.6
+csinf32x                                          /lib/x86_64-linux-gnu/libm.so.6
+csinf32x@@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+csinf32x@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+csinf64                                           /lib/x86_64-linux-gnu/libm.so.6
+csinf64@@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+csinf64@GLIBC_2.27                                /lib/x86_64-linux-gnu/libm.so.6
+csinf64x                                          /lib/x86_64-linux-gnu/libm.so.6
+csinf64x@@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+csinf64x@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+csinf@@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+csinf@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libm.so.6
+csinh                                             /lib/x86_64-linux-gnu/libm.so.6
+csinh@@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+csinh@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libm.so.6
+csinhf                                            /lib/x86_64-linux-gnu/libm.so.6
+csinhf128                                         /lib/x86_64-linux-gnu/libm.so.6
+csinhf128@@GLIBC_2.26                             /lib/x86_64-linux-gnu/libm.so.6
+csinhf128@GLIBC_2.26                              /lib/x86_64-linux-gnu/libm.so.6
+csinhf32                                          /lib/x86_64-linux-gnu/libm.so.6
+csinhf32@@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+csinhf32@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+csinhf32x                                         /lib/x86_64-linux-gnu/libm.so.6
+csinhf32x@@GLIBC_2.27                             /lib/x86_64-linux-gnu/libm.so.6
+csinhf32x@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+csinhf64                                          /lib/x86_64-linux-gnu/libm.so.6
+csinhf64@@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+csinhf64@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+csinhf64x                                         /lib/x86_64-linux-gnu/libm.so.6
+csinhf64x@@GLIBC_2.27                             /lib/x86_64-linux-gnu/libm.so.6
+csinhf64x@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+csinhf@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libm.so.6
+csinhf@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+csinhl                                            /lib/x86_64-linux-gnu/libm.so.6
+csinhl@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libm.so.6
+csinhl@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+csinl                                             /lib/x86_64-linux-gnu/libm.so.6
+csinl@@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+csinl@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libm.so.6
+csqrt                                             /lib/x86_64-linux-gnu/libm.so.6
+csqrt@@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+csqrt@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libm.so.6
+csqrtf                                            /lib/x86_64-linux-gnu/libm.so.6
+csqrtf128                                         /lib/x86_64-linux-gnu/libm.so.6
+csqrtf128@@GLIBC_2.26                             /lib/x86_64-linux-gnu/libm.so.6
+csqrtf128@GLIBC_2.26                              /lib/x86_64-linux-gnu/libm.so.6
+csqrtf32                                          /lib/x86_64-linux-gnu/libm.so.6
+csqrtf32@@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+csqrtf32@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+csqrtf32x                                         /lib/x86_64-linux-gnu/libm.so.6
+csqrtf32x@@GLIBC_2.27                             /lib/x86_64-linux-gnu/libm.so.6
+csqrtf32x@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+csqrtf64                                          /lib/x86_64-linux-gnu/libm.so.6
+csqrtf64@@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+csqrtf64@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+csqrtf64x                                         /lib/x86_64-linux-gnu/libm.so.6
+csqrtf64x@@GLIBC_2.27                             /lib/x86_64-linux-gnu/libm.so.6
+csqrtf64x@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+csqrtf@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libm.so.6
+csqrtf@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+csqrtl                                            /lib/x86_64-linux-gnu/libm.so.6
+csqrtl@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libm.so.6
+csqrtl@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+ctan                                              /lib/x86_64-linux-gnu/libm.so.6
+ctan@@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libm.so.6
+ctan@GLIBC_2.2.5                                  /lib/x86_64-linux-gnu/libm.so.6
+ctanf                                             /lib/x86_64-linux-gnu/libm.so.6
+ctanf128                                          /lib/x86_64-linux-gnu/libm.so.6
+ctanf128@@GLIBC_2.26                              /lib/x86_64-linux-gnu/libm.so.6
+ctanf128@GLIBC_2.26                               /lib/x86_64-linux-gnu/libm.so.6
+ctanf32                                           /lib/x86_64-linux-gnu/libm.so.6
+ctanf32@@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+ctanf32@GLIBC_2.27                                /lib/x86_64-linux-gnu/libm.so.6
+ctanf32x                                          /lib/x86_64-linux-gnu/libm.so.6
+ctanf32x@@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+ctanf32x@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+ctanf64                                           /lib/x86_64-linux-gnu/libm.so.6
+ctanf64@@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+ctanf64@GLIBC_2.27                                /lib/x86_64-linux-gnu/libm.so.6
+ctanf64x                                          /lib/x86_64-linux-gnu/libm.so.6
+ctanf64x@@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+ctanf64x@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+ctanf@@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+ctanf@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libm.so.6
+ctanh                                             /lib/x86_64-linux-gnu/libm.so.6
+ctanh@@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+ctanh@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libm.so.6
+ctanhf                                            /lib/x86_64-linux-gnu/libm.so.6
+ctanhf128                                         /lib/x86_64-linux-gnu/libm.so.6
+ctanhf128@@GLIBC_2.26                             /lib/x86_64-linux-gnu/libm.so.6
+ctanhf128@GLIBC_2.26                              /lib/x86_64-linux-gnu/libm.so.6
+ctanhf32                                          /lib/x86_64-linux-gnu/libm.so.6
+ctanhf32@@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+ctanhf32@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+ctanhf32x                                         /lib/x86_64-linux-gnu/libm.so.6
+ctanhf32x@@GLIBC_2.27                             /lib/x86_64-linux-gnu/libm.so.6
+ctanhf32x@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+ctanhf64                                          /lib/x86_64-linux-gnu/libm.so.6
+ctanhf64@@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+ctanhf64@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+ctanhf64x                                         /lib/x86_64-linux-gnu/libm.so.6
+ctanhf64x@@GLIBC_2.27                             /lib/x86_64-linux-gnu/libm.so.6
+ctanhf64x@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+ctanhf@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libm.so.6
+ctanhf@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+ctanhl                                            /lib/x86_64-linux-gnu/libm.so.6
+ctanhl@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libm.so.6
+ctanhl@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+ctanl                                             /lib/x86_64-linux-gnu/libm.so.6
+ctanl@@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+ctanl@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libm.so.6
+daddl                                             /lib/x86_64-linux-gnu/libm.so.6
+daddl@@GLIBC_2.28                                 /lib/x86_64-linux-gnu/libm.so.6
+daddl@GLIBC_2.28                                  /lib/x86_64-linux-gnu/libm.so.6
+data_start                                        /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+daylight                                          /lib/x86_64-linux-gnu/libc.so.6
+daylight@@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+daylight@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+dcgettext                                         /lib/x86_64-linux-gnu/libc.so.6
+dcgettext@@GLIBC_2.2.5                            /lib/x86_64-linux-gnu/libc.so.6
+dcgettext@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+dcngettext                                        /lib/x86_64-linux-gnu/libc.so.6
+dcngettext@@GLIBC_2.2.5                           /lib/x86_64-linux-gnu/libc.so.6
+dcngettext@GLIBC_2.2.5                            /lib/x86_64-linux-gnu/libc.so.6
+ddivl                                             /lib/x86_64-linux-gnu/libm.so.6
+ddivl@@GLIBC_2.28                                 /lib/x86_64-linux-gnu/libm.so.6
+ddivl@GLIBC_2.28                                  /lib/x86_64-linux-gnu/libm.so.6
+dgettext                                          /lib/x86_64-linux-gnu/libc.so.6
+dgettext@@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+dgettext@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+dl_iterate_phdr                                   /lib/x86_64-linux-gnu/libc.so.6
+dl_iterate_phdr@@GLIBC_2.2.5                      /lib/x86_64-linux-gnu/libc.so.6
+dl_iterate_phdr@GLIBC_2.2.5                       /lib/x86_64-linux-gnu/libc.so.6
+dmull                                             /lib/x86_64-linux-gnu/libm.so.6
+dmull@@GLIBC_2.28                                 /lib/x86_64-linux-gnu/libm.so.6
+dmull@GLIBC_2.28                                  /lib/x86_64-linux-gnu/libm.so.6
+dngettext                                         /lib/x86_64-linux-gnu/libc.so.6
+dngettext@@GLIBC_2.2.5                            /lib/x86_64-linux-gnu/libc.so.6
+dngettext@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+drem                                              /lib/x86_64-linux-gnu/libm.so.6
+drem@@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libm.so.6
+drem@GLIBC_2.2.5                                  /lib/x86_64-linux-gnu/libm.so.6
+dremf                                             /lib/x86_64-linux-gnu/libm.so.6
+dremf@@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+dremf@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libm.so.6
+dreml                                             /lib/x86_64-linux-gnu/libm.so.6
+dreml@@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+dreml@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libm.so.6
+dsubl                                             /lib/x86_64-linux-gnu/libm.so.6
+dsubl@@GLIBC_2.28                                 /lib/x86_64-linux-gnu/libm.so.6
+dsubl@GLIBC_2.28                                  /lib/x86_64-linux-gnu/libm.so.6
+dup                                               /lib/x86_64-linux-gnu/libc.so.6
+dup2                                              /lib/x86_64-linux-gnu/libc.so.6
+dup2@@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libc.so.6
+dup2@GLIBC_2.2.5                                  /lib/x86_64-linux-gnu/libc.so.6
+dup3                                              /lib/x86_64-linux-gnu/libc.so.6
+dup3@@GLIBC_2.9                                   /lib/x86_64-linux-gnu/libc.so.6
+dup3@GLIBC_2.9                                    /lib/x86_64-linux-gnu/libc.so.6
+dup@@GLIBC_2.2.5                                  /lib/x86_64-linux-gnu/libc.so.6
+dup@GLIBC_2.2.5                                   /lib/x86_64-linux-gnu/libc.so.6
+duplocale                                         /lib/x86_64-linux-gnu/libc.so.6
+duplocale@@GLIBC_2.3                              /lib/x86_64-linux-gnu/libc.so.6
+duplocale@GLIBC_2.3                               /lib/x86_64-linux-gnu/libc.so.6
+eaccess                                           /lib/x86_64-linux-gnu/libc.so.6
+eaccess@@GLIBC_2.4                                /lib/x86_64-linux-gnu/libc.so.6
+eaccess@GLIBC_2.4                                 /lib/x86_64-linux-gnu/libc.so.6
+ecvt_r                                            /lib/x86_64-linux-gnu/libc.so.6
+ecvt_r@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+ecvt_r@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libc.so.6
+emit_bc_free                                      build/py/emitbc.o
+                                                  build/py/compile.o
+emit_bc_method_table                              build/py/emitbc.o
+                                                  build/py/compile.o
+emit_bc_new                                       build/py/emitbc.o
+                                                  build/py/compile.o
+emit_bc_set_max_num_labels                        build/py/emitbc.o
+                                                  build/py/compile.o
+emit_inline_thumb_free                            build/py/emitinlinethumb.o
+emit_inline_thumb_method_table                    build/py/emitinlinethumb.o
+                                                  build/py/compile.o
+emit_inline_thumb_new                             build/py/emitinlinethumb.o
+emit_inline_xtensa_free                           build/py/emitinlinextensa.o
+emit_inline_xtensa_method_table                   build/py/emitinlinextensa.o
+                                                  build/py/compile.o
+emit_inline_xtensa_new                            build/py/emitinlinextensa.o
+emit_native_arm_free                              build/py/emitnarm.o
+emit_native_arm_method_table                      build/py/emitnarm.o
+                                                  build/py/compile.o
+emit_native_arm_new                               build/py/emitnarm.o
+emit_native_thumb_free                            build/py/emitnthumb.o
+emit_native_thumb_method_table                    build/py/emitnthumb.o
+                                                  build/py/compile.o
+emit_native_thumb_new                             build/py/emitnthumb.o
+emit_native_x64_free                              build/py/emitnx64.o
+emit_native_x64_method_table                      build/py/emitnx64.o
+                                                  build/py/compile.o
+emit_native_x64_new                               build/py/emitnx64.o
+emit_native_x86_free                              build/py/emitnx86.o
+emit_native_x86_method_table                      build/py/emitnx86.o
+                                                  build/py/compile.o
+emit_native_x86_new                               build/py/emitnx86.o
+emit_native_xtensa_free                           build/py/emitnxtensa.o
+emit_native_xtensa_method_table                   build/py/emitnxtensa.o
+                                                  build/py/compile.o
+emit_native_xtensa_new                            build/py/emitnxtensa.o
+emit_native_xtensawin_free                        build/py/emitnxtensawin.o
+emit_native_xtensawin_method_table                build/py/emitnxtensawin.o
+                                                  build/py/compile.o
+emit_native_xtensawin_new                         build/py/emitnxtensawin.o
+endmntent                                         /lib/x86_64-linux-gnu/libc.so.6
+endmntent@@GLIBC_2.2.5                            /lib/x86_64-linux-gnu/libc.so.6
+endmntent@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+endttyent                                         /lib/x86_64-linux-gnu/libc.so.6
+endttyent@@GLIBC_2.2.5                            /lib/x86_64-linux-gnu/libc.so.6
+endttyent@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+endutent                                          /lib/x86_64-linux-gnu/libc.so.6
+endutent@@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+endutent@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+environ                                           /lib/x86_64-linux-gnu/libc.so.6
+environ@@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+environ@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+erand48_r                                         /lib/x86_64-linux-gnu/libc.so.6
+erand48_r@@GLIBC_2.2.5                            /lib/x86_64-linux-gnu/libc.so.6
+erand48_r@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+erf                                               /lib/x86_64-linux-gnu/libm.so.6
+erf@@GLIBC_2.2.5                                  /lib/x86_64-linux-gnu/libm.so.6
+erf@GLIBC_2.2.5                                   /lib/x86_64-linux-gnu/libm.so.6
+erfc                                              /lib/x86_64-linux-gnu/libm.so.6
+erfc@@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libm.so.6
+erfc@GLIBC_2.2.5                                  /lib/x86_64-linux-gnu/libm.so.6
+erfcf                                             /lib/x86_64-linux-gnu/libm.so.6
+erfcf128                                          /lib/x86_64-linux-gnu/libm.so.6
+erfcf128@@GLIBC_2.26                              /lib/x86_64-linux-gnu/libm.so.6
+erfcf128@GLIBC_2.26                               /lib/x86_64-linux-gnu/libm.so.6
+erfcf32                                           /lib/x86_64-linux-gnu/libm.so.6
+erfcf32@@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+erfcf32@GLIBC_2.27                                /lib/x86_64-linux-gnu/libm.so.6
+erfcf32x                                          /lib/x86_64-linux-gnu/libm.so.6
+erfcf32x@@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+erfcf32x@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+erfcf64                                           /lib/x86_64-linux-gnu/libm.so.6
+erfcf64@@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+erfcf64@GLIBC_2.27                                /lib/x86_64-linux-gnu/libm.so.6
+erfcf64x                                          /lib/x86_64-linux-gnu/libm.so.6
+erfcf64x@@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+erfcf64x@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+erfcf@@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+erfcf@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libm.so.6
+erfcl                                             /lib/x86_64-linux-gnu/libm.so.6
+erfcl@@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+erfcl@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libm.so.6
+erff                                              /lib/x86_64-linux-gnu/libm.so.6
+erff128                                           /lib/x86_64-linux-gnu/libm.so.6
+erff128@@GLIBC_2.26                               /lib/x86_64-linux-gnu/libm.so.6
+erff128@GLIBC_2.26                                /lib/x86_64-linux-gnu/libm.so.6
+erff32                                            /lib/x86_64-linux-gnu/libm.so.6
+erff32@@GLIBC_2.27                                /lib/x86_64-linux-gnu/libm.so.6
+erff32@GLIBC_2.27                                 /lib/x86_64-linux-gnu/libm.so.6
+erff32x                                           /lib/x86_64-linux-gnu/libm.so.6
+erff32x@@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+erff32x@GLIBC_2.27                                /lib/x86_64-linux-gnu/libm.so.6
+erff64                                            /lib/x86_64-linux-gnu/libm.so.6
+erff64@@GLIBC_2.27                                /lib/x86_64-linux-gnu/libm.so.6
+erff64@GLIBC_2.27                                 /lib/x86_64-linux-gnu/libm.so.6
+erff64x                                           /lib/x86_64-linux-gnu/libm.so.6
+erff64x@@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+erff64x@GLIBC_2.27                                /lib/x86_64-linux-gnu/libm.so.6
+erff@@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libm.so.6
+erff@GLIBC_2.2.5                                  /lib/x86_64-linux-gnu/libm.so.6
+erfl                                              /lib/x86_64-linux-gnu/libm.so.6
+erfl@@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libm.so.6
+erfl@GLIBC_2.2.5                                  /lib/x86_64-linux-gnu/libm.so.6
+error                                             /lib/x86_64-linux-gnu/libc.so.6
+error@@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libc.so.6
+error@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libc.so.6
+error_at_line                                     /lib/x86_64-linux-gnu/libc.so.6
+error_at_line@@GLIBC_2.2.5                        /lib/x86_64-linux-gnu/libc.so.6
+error_at_line@GLIBC_2.2.5                         /lib/x86_64-linux-gnu/libc.so.6
+euidaccess                                        /lib/x86_64-linux-gnu/libc.so.6
+euidaccess@@GLIBC_2.2.5                           /lib/x86_64-linux-gnu/libc.so.6
+euidaccess@GLIBC_2.2.5                            /lib/x86_64-linux-gnu/libc.so.6
+execve                                            /lib/x86_64-linux-gnu/libc.so.6
+execve@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+execve@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libc.so.6
+execvpe                                           /lib/x86_64-linux-gnu/libc.so.6
+execvpe@@GLIBC_2.11                               /lib/x86_64-linux-gnu/libc.so.6
+execvpe@GLIBC_2.11                                /lib/x86_64-linux-gnu/libc.so.6
+exit                                              /lib/x86_64-linux-gnu/libc.so.6
+                                                  build/main.o
+exit@@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libc.so.6
+exit@GLIBC_2.2.5                                  /lib/x86_64-linux-gnu/libc.so.6
+exp                                               /lib/x86_64-linux-gnu/libm.so.6
+                                                  build/py/objcomplex.o
+exp10                                             /lib/x86_64-linux-gnu/libm.so.6
+exp10@@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+exp10@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libm.so.6
+exp10f                                            /lib/x86_64-linux-gnu/libm.so.6
+exp10f128                                         /lib/x86_64-linux-gnu/libm.so.6
+exp10f128@@GLIBC_2.26                             /lib/x86_64-linux-gnu/libm.so.6
+exp10f128@GLIBC_2.26                              /lib/x86_64-linux-gnu/libm.so.6
+exp10f32                                          /lib/x86_64-linux-gnu/libm.so.6
+exp10f32@@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+exp10f32@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+exp10f32x                                         /lib/x86_64-linux-gnu/libm.so.6
+exp10f32x@@GLIBC_2.27                             /lib/x86_64-linux-gnu/libm.so.6
+exp10f32x@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+exp10f64                                          /lib/x86_64-linux-gnu/libm.so.6
+exp10f64@@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+exp10f64@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+exp10f64x                                         /lib/x86_64-linux-gnu/libm.so.6
+exp10f64x@@GLIBC_2.27                             /lib/x86_64-linux-gnu/libm.so.6
+exp10f64x@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+exp10f@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libm.so.6
+exp10f@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+exp10l                                            /lib/x86_64-linux-gnu/libm.so.6
+exp10l@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libm.so.6
+exp10l@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+exp2f128                                          /lib/x86_64-linux-gnu/libm.so.6
+exp2f128@@GLIBC_2.26                              /lib/x86_64-linux-gnu/libm.so.6
+exp2f128@GLIBC_2.26                               /lib/x86_64-linux-gnu/libm.so.6
+exp2f32                                           /lib/x86_64-linux-gnu/libm.so.6
+exp2f32@@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+exp2f32@GLIBC_2.27                                /lib/x86_64-linux-gnu/libm.so.6
+exp2f32x                                          /lib/x86_64-linux-gnu/libm.so.6
+exp2f32x@@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+exp2f32x@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+exp2f64                                           /lib/x86_64-linux-gnu/libm.so.6
+exp2f64@@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+exp2f64@GLIBC_2.27                                /lib/x86_64-linux-gnu/libm.so.6
+exp2f64x                                          /lib/x86_64-linux-gnu/libm.so.6
+exp2f64x@@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+exp2f64x@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+exp2l                                             /lib/x86_64-linux-gnu/libm.so.6
+exp2l@@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+exp2l@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libm.so.6
+exp@@GLIBC_2.29                                   /lib/x86_64-linux-gnu/libm.so.6
+exp@GLIBC_2.29                                    /lib/x86_64-linux-gnu/libm.so.6
+expf128                                           /lib/x86_64-linux-gnu/libm.so.6
+expf128@@GLIBC_2.26                               /lib/x86_64-linux-gnu/libm.so.6
+expf128@GLIBC_2.26                                /lib/x86_64-linux-gnu/libm.so.6
+expf32                                            /lib/x86_64-linux-gnu/libm.so.6
+expf32@@GLIBC_2.27                                /lib/x86_64-linux-gnu/libm.so.6
+expf32@GLIBC_2.27                                 /lib/x86_64-linux-gnu/libm.so.6
+expf32x                                           /lib/x86_64-linux-gnu/libm.so.6
+expf32x@@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+expf32x@GLIBC_2.27                                /lib/x86_64-linux-gnu/libm.so.6
+expf64                                            /lib/x86_64-linux-gnu/libm.so.6
+expf64@@GLIBC_2.27                                /lib/x86_64-linux-gnu/libm.so.6
+expf64@GLIBC_2.27                                 /lib/x86_64-linux-gnu/libm.so.6
+expf64x                                           /lib/x86_64-linux-gnu/libm.so.6
+expf64x@@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+expf64x@GLIBC_2.27                                /lib/x86_64-linux-gnu/libm.so.6
+expl                                              /lib/x86_64-linux-gnu/libm.so.6
+expl@@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libm.so.6
+expl@GLIBC_2.2.5                                  /lib/x86_64-linux-gnu/libm.so.6
+expm1                                             /lib/x86_64-linux-gnu/libm.so.6
+expm1@@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+expm1@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libm.so.6
+expm1f                                            /lib/x86_64-linux-gnu/libm.so.6
+expm1f128                                         /lib/x86_64-linux-gnu/libm.so.6
+expm1f128@@GLIBC_2.26                             /lib/x86_64-linux-gnu/libm.so.6
+expm1f128@GLIBC_2.26                              /lib/x86_64-linux-gnu/libm.so.6
+expm1f32                                          /lib/x86_64-linux-gnu/libm.so.6
+expm1f32@@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+expm1f32@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+expm1f32x                                         /lib/x86_64-linux-gnu/libm.so.6
+expm1f32x@@GLIBC_2.27                             /lib/x86_64-linux-gnu/libm.so.6
+expm1f32x@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+expm1f64                                          /lib/x86_64-linux-gnu/libm.so.6
+expm1f64@@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+expm1f64@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+expm1f64x                                         /lib/x86_64-linux-gnu/libm.so.6
+expm1f64x@@GLIBC_2.27                             /lib/x86_64-linux-gnu/libm.so.6
+expm1f64x@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+expm1f@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libm.so.6
+expm1f@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+expm1l                                            /lib/x86_64-linux-gnu/libm.so.6
+expm1l@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libm.so.6
+expm1l@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+f32addf128                                        /lib/x86_64-linux-gnu/libm.so.6
+f32addf128@@GLIBC_2.28                            /lib/x86_64-linux-gnu/libm.so.6
+f32addf128@GLIBC_2.28                             /lib/x86_64-linux-gnu/libm.so.6
+f32addf32x                                        /lib/x86_64-linux-gnu/libm.so.6
+f32addf32x@@GLIBC_2.28                            /lib/x86_64-linux-gnu/libm.so.6
+f32addf32x@GLIBC_2.28                             /lib/x86_64-linux-gnu/libm.so.6
+f32addf64                                         /lib/x86_64-linux-gnu/libm.so.6
+f32addf64@@GLIBC_2.28                             /lib/x86_64-linux-gnu/libm.so.6
+f32addf64@GLIBC_2.28                              /lib/x86_64-linux-gnu/libm.so.6
+f32addf64x                                        /lib/x86_64-linux-gnu/libm.so.6
+f32addf64x@@GLIBC_2.28                            /lib/x86_64-linux-gnu/libm.so.6
+f32addf64x@GLIBC_2.28                             /lib/x86_64-linux-gnu/libm.so.6
+f32divf128                                        /lib/x86_64-linux-gnu/libm.so.6
+f32divf128@@GLIBC_2.28                            /lib/x86_64-linux-gnu/libm.so.6
+f32divf128@GLIBC_2.28                             /lib/x86_64-linux-gnu/libm.so.6
+f32divf32x                                        /lib/x86_64-linux-gnu/libm.so.6
+f32divf32x@@GLIBC_2.28                            /lib/x86_64-linux-gnu/libm.so.6
+f32divf32x@GLIBC_2.28                             /lib/x86_64-linux-gnu/libm.so.6
+f32divf64                                         /lib/x86_64-linux-gnu/libm.so.6
+f32divf64@@GLIBC_2.28                             /lib/x86_64-linux-gnu/libm.so.6
+f32divf64@GLIBC_2.28                              /lib/x86_64-linux-gnu/libm.so.6
+f32divf64x                                        /lib/x86_64-linux-gnu/libm.so.6
+f32divf64x@@GLIBC_2.28                            /lib/x86_64-linux-gnu/libm.so.6
+f32divf64x@GLIBC_2.28                             /lib/x86_64-linux-gnu/libm.so.6
+f32mulf128                                        /lib/x86_64-linux-gnu/libm.so.6
+f32mulf128@@GLIBC_2.28                            /lib/x86_64-linux-gnu/libm.so.6
+f32mulf128@GLIBC_2.28                             /lib/x86_64-linux-gnu/libm.so.6
+f32mulf32x                                        /lib/x86_64-linux-gnu/libm.so.6
+f32mulf32x@@GLIBC_2.28                            /lib/x86_64-linux-gnu/libm.so.6
+f32mulf32x@GLIBC_2.28                             /lib/x86_64-linux-gnu/libm.so.6
+f32mulf64                                         /lib/x86_64-linux-gnu/libm.so.6
+f32mulf64@@GLIBC_2.28                             /lib/x86_64-linux-gnu/libm.so.6
+f32mulf64@GLIBC_2.28                              /lib/x86_64-linux-gnu/libm.so.6
+f32mulf64x                                        /lib/x86_64-linux-gnu/libm.so.6
+f32mulf64x@@GLIBC_2.28                            /lib/x86_64-linux-gnu/libm.so.6
+f32mulf64x@GLIBC_2.28                             /lib/x86_64-linux-gnu/libm.so.6
+f32subf128                                        /lib/x86_64-linux-gnu/libm.so.6
+f32subf128@@GLIBC_2.28                            /lib/x86_64-linux-gnu/libm.so.6
+f32subf128@GLIBC_2.28                             /lib/x86_64-linux-gnu/libm.so.6
+f32subf32x                                        /lib/x86_64-linux-gnu/libm.so.6
+f32subf32x@@GLIBC_2.28                            /lib/x86_64-linux-gnu/libm.so.6
+f32subf32x@GLIBC_2.28                             /lib/x86_64-linux-gnu/libm.so.6
+f32subf64                                         /lib/x86_64-linux-gnu/libm.so.6
+f32subf64@@GLIBC_2.28                             /lib/x86_64-linux-gnu/libm.so.6
+f32subf64@GLIBC_2.28                              /lib/x86_64-linux-gnu/libm.so.6
+f32subf64x                                        /lib/x86_64-linux-gnu/libm.so.6
+f32subf64x@@GLIBC_2.28                            /lib/x86_64-linux-gnu/libm.so.6
+f32subf64x@GLIBC_2.28                             /lib/x86_64-linux-gnu/libm.so.6
+f32xaddf128                                       /lib/x86_64-linux-gnu/libm.so.6
+f32xaddf128@@GLIBC_2.28                           /lib/x86_64-linux-gnu/libm.so.6
+f32xaddf128@GLIBC_2.28                            /lib/x86_64-linux-gnu/libm.so.6
+f32xaddf64                                        /lib/x86_64-linux-gnu/libm.so.6
+f32xaddf64@@GLIBC_2.28                            /lib/x86_64-linux-gnu/libm.so.6
+f32xaddf64@GLIBC_2.28                             /lib/x86_64-linux-gnu/libm.so.6
+f32xaddf64x                                       /lib/x86_64-linux-gnu/libm.so.6
+f32xaddf64x@@GLIBC_2.28                           /lib/x86_64-linux-gnu/libm.so.6
+f32xaddf64x@GLIBC_2.28                            /lib/x86_64-linux-gnu/libm.so.6
+f32xdivf128                                       /lib/x86_64-linux-gnu/libm.so.6
+f32xdivf128@@GLIBC_2.28                           /lib/x86_64-linux-gnu/libm.so.6
+f32xdivf128@GLIBC_2.28                            /lib/x86_64-linux-gnu/libm.so.6
+f32xdivf64                                        /lib/x86_64-linux-gnu/libm.so.6
+f32xdivf64@@GLIBC_2.28                            /lib/x86_64-linux-gnu/libm.so.6
+f32xdivf64@GLIBC_2.28                             /lib/x86_64-linux-gnu/libm.so.6
+f32xdivf64x                                       /lib/x86_64-linux-gnu/libm.so.6
+f32xdivf64x@@GLIBC_2.28                           /lib/x86_64-linux-gnu/libm.so.6
+f32xdivf64x@GLIBC_2.28                            /lib/x86_64-linux-gnu/libm.so.6
+f32xmulf128                                       /lib/x86_64-linux-gnu/libm.so.6
+f32xmulf128@@GLIBC_2.28                           /lib/x86_64-linux-gnu/libm.so.6
+f32xmulf128@GLIBC_2.28                            /lib/x86_64-linux-gnu/libm.so.6
+f32xmulf64                                        /lib/x86_64-linux-gnu/libm.so.6
+f32xmulf64@@GLIBC_2.28                            /lib/x86_64-linux-gnu/libm.so.6
+f32xmulf64@GLIBC_2.28                             /lib/x86_64-linux-gnu/libm.so.6
+f32xmulf64x                                       /lib/x86_64-linux-gnu/libm.so.6
+f32xmulf64x@@GLIBC_2.28                           /lib/x86_64-linux-gnu/libm.so.6
+f32xmulf64x@GLIBC_2.28                            /lib/x86_64-linux-gnu/libm.so.6
+f32xsubf128                                       /lib/x86_64-linux-gnu/libm.so.6
+f32xsubf128@@GLIBC_2.28                           /lib/x86_64-linux-gnu/libm.so.6
+f32xsubf128@GLIBC_2.28                            /lib/x86_64-linux-gnu/libm.so.6
+f32xsubf64                                        /lib/x86_64-linux-gnu/libm.so.6
+f32xsubf64@@GLIBC_2.28                            /lib/x86_64-linux-gnu/libm.so.6
+f32xsubf64@GLIBC_2.28                             /lib/x86_64-linux-gnu/libm.so.6
+f32xsubf64x                                       /lib/x86_64-linux-gnu/libm.so.6
+f32xsubf64x@@GLIBC_2.28                           /lib/x86_64-linux-gnu/libm.so.6
+f32xsubf64x@GLIBC_2.28                            /lib/x86_64-linux-gnu/libm.so.6
+f64addf128                                        /lib/x86_64-linux-gnu/libm.so.6
+f64addf128@@GLIBC_2.28                            /lib/x86_64-linux-gnu/libm.so.6
+f64addf128@GLIBC_2.28                             /lib/x86_64-linux-gnu/libm.so.6
+f64addf64x                                        /lib/x86_64-linux-gnu/libm.so.6
+f64addf64x@@GLIBC_2.28                            /lib/x86_64-linux-gnu/libm.so.6
+f64addf64x@GLIBC_2.28                             /lib/x86_64-linux-gnu/libm.so.6
+f64divf128                                        /lib/x86_64-linux-gnu/libm.so.6
+f64divf128@@GLIBC_2.28                            /lib/x86_64-linux-gnu/libm.so.6
+f64divf128@GLIBC_2.28                             /lib/x86_64-linux-gnu/libm.so.6
+f64divf64x                                        /lib/x86_64-linux-gnu/libm.so.6
+f64divf64x@@GLIBC_2.28                            /lib/x86_64-linux-gnu/libm.so.6
+f64divf64x@GLIBC_2.28                             /lib/x86_64-linux-gnu/libm.so.6
+f64mulf128                                        /lib/x86_64-linux-gnu/libm.so.6
+f64mulf128@@GLIBC_2.28                            /lib/x86_64-linux-gnu/libm.so.6
+f64mulf128@GLIBC_2.28                             /lib/x86_64-linux-gnu/libm.so.6
+f64mulf64x                                        /lib/x86_64-linux-gnu/libm.so.6
+f64mulf64x@@GLIBC_2.28                            /lib/x86_64-linux-gnu/libm.so.6
+f64mulf64x@GLIBC_2.28                             /lib/x86_64-linux-gnu/libm.so.6
+f64subf128                                        /lib/x86_64-linux-gnu/libm.so.6
+f64subf128@@GLIBC_2.28                            /lib/x86_64-linux-gnu/libm.so.6
+f64subf128@GLIBC_2.28                             /lib/x86_64-linux-gnu/libm.so.6
+f64subf64x                                        /lib/x86_64-linux-gnu/libm.so.6
+f64subf64x@@GLIBC_2.28                            /lib/x86_64-linux-gnu/libm.so.6
+f64subf64x@GLIBC_2.28                             /lib/x86_64-linux-gnu/libm.so.6
+f64xaddf128                                       /lib/x86_64-linux-gnu/libm.so.6
+f64xaddf128@@GLIBC_2.28                           /lib/x86_64-linux-gnu/libm.so.6
+f64xaddf128@GLIBC_2.28                            /lib/x86_64-linux-gnu/libm.so.6
+f64xdivf128                                       /lib/x86_64-linux-gnu/libm.so.6
+f64xdivf128@@GLIBC_2.28                           /lib/x86_64-linux-gnu/libm.so.6
+f64xdivf128@GLIBC_2.28                            /lib/x86_64-linux-gnu/libm.so.6
+f64xmulf128                                       /lib/x86_64-linux-gnu/libm.so.6
+f64xmulf128@@GLIBC_2.28                           /lib/x86_64-linux-gnu/libm.so.6
+f64xmulf128@GLIBC_2.28                            /lib/x86_64-linux-gnu/libm.so.6
+f64xsubf128                                       /lib/x86_64-linux-gnu/libm.so.6
+f64xsubf128@@GLIBC_2.28                           /lib/x86_64-linux-gnu/libm.so.6
+f64xsubf128@GLIBC_2.28                            /lib/x86_64-linux-gnu/libm.so.6
+fabs                                              /lib/x86_64-linux-gnu/libm.so.6
+fabs@@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libm.so.6
+fabs@GLIBC_2.2.5                                  /lib/x86_64-linux-gnu/libm.so.6
+fabsf                                             /lib/x86_64-linux-gnu/libm.so.6
+fabsf128                                          /lib/x86_64-linux-gnu/libm.so.6
+fabsf128@@GLIBC_2.26                              /lib/x86_64-linux-gnu/libm.so.6
+fabsf128@GLIBC_2.26                               /lib/x86_64-linux-gnu/libm.so.6
+fabsf32                                           /lib/x86_64-linux-gnu/libm.so.6
+fabsf32@@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+fabsf32@GLIBC_2.27                                /lib/x86_64-linux-gnu/libm.so.6
+fabsf32x                                          /lib/x86_64-linux-gnu/libm.so.6
+fabsf32x@@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+fabsf32x@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+fabsf64                                           /lib/x86_64-linux-gnu/libm.so.6
+fabsf64@@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+fabsf64@GLIBC_2.27                                /lib/x86_64-linux-gnu/libm.so.6
+fabsf64x                                          /lib/x86_64-linux-gnu/libm.so.6
+fabsf64x@@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+fabsf64x@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+fabsf@@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+fabsf@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libm.so.6
+fabsl                                             /lib/x86_64-linux-gnu/libm.so.6
+fabsl@@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+fabsl@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libm.so.6
+fadd                                              /lib/x86_64-linux-gnu/libm.so.6
+fadd@@GLIBC_2.28                                  /lib/x86_64-linux-gnu/libm.so.6
+fadd@GLIBC_2.28                                   /lib/x86_64-linux-gnu/libm.so.6
+faddl                                             /lib/x86_64-linux-gnu/libm.so.6
+faddl@@GLIBC_2.28                                 /lib/x86_64-linux-gnu/libm.so.6
+faddl@GLIBC_2.28                                  /lib/x86_64-linux-gnu/libm.so.6
+fallocate                                         /lib/x86_64-linux-gnu/libc.so.6
+fallocate@@GLIBC_2.10                             /lib/x86_64-linux-gnu/libc.so.6
+fallocate@GLIBC_2.10                              /lib/x86_64-linux-gnu/libc.so.6
+fchdir                                            /lib/x86_64-linux-gnu/libc.so.6
+fchdir@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+fchdir@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libc.so.6
+fchmod                                            /lib/x86_64-linux-gnu/libc.so.6
+fchmod@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+fchmod@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libc.so.6
+fchown                                            /lib/x86_64-linux-gnu/libc.so.6
+fchown@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+fchown@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libc.so.6
+fcloseall                                         /lib/x86_64-linux-gnu/libc.so.6
+fcloseall@@GLIBC_2.2.5                            /lib/x86_64-linux-gnu/libc.so.6
+fcloseall@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+fcntl                                             /lib/x86_64-linux-gnu/libc.so.6
+fcntl64                                           /lib/x86_64-linux-gnu/libc.so.6
+fcntl64@@GLIBC_2.28                               /lib/x86_64-linux-gnu/libc.so.6
+fcntl64@GLIBC_2.28                                /lib/x86_64-linux-gnu/libc.so.6
+fcntl@@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libc.so.6
+fcntl@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libc.so.6
+fcvt_r                                            /lib/x86_64-linux-gnu/libc.so.6
+fcvt_r@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+fcvt_r@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libc.so.6
+fdim                                              /lib/x86_64-linux-gnu/libm.so.6
+fdim@@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libm.so.6
+fdim@GLIBC_2.2.5                                  /lib/x86_64-linux-gnu/libm.so.6
+fdimf                                             /lib/x86_64-linux-gnu/libm.so.6
+fdimf128                                          /lib/x86_64-linux-gnu/libm.so.6
+fdimf128@@GLIBC_2.26                              /lib/x86_64-linux-gnu/libm.so.6
+fdimf128@GLIBC_2.26                               /lib/x86_64-linux-gnu/libm.so.6
+fdimf32                                           /lib/x86_64-linux-gnu/libm.so.6
+fdimf32@@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+fdimf32@GLIBC_2.27                                /lib/x86_64-linux-gnu/libm.so.6
+fdimf32x                                          /lib/x86_64-linux-gnu/libm.so.6
+fdimf32x@@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+fdimf32x@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+fdimf64                                           /lib/x86_64-linux-gnu/libm.so.6
+fdimf64@@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+fdimf64@GLIBC_2.27                                /lib/x86_64-linux-gnu/libm.so.6
+fdimf64x                                          /lib/x86_64-linux-gnu/libm.so.6
+fdimf64x@@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+fdimf64x@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+fdimf@@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+fdimf@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libm.so.6
+fdiml                                             /lib/x86_64-linux-gnu/libm.so.6
+fdiml@@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+fdiml@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libm.so.6
+fdiv                                              /lib/x86_64-linux-gnu/libm.so.6
+fdiv@@GLIBC_2.28                                  /lib/x86_64-linux-gnu/libm.so.6
+fdiv@GLIBC_2.28                                   /lib/x86_64-linux-gnu/libm.so.6
+fdivl                                             /lib/x86_64-linux-gnu/libm.so.6
+fdivl@@GLIBC_2.28                                 /lib/x86_64-linux-gnu/libm.so.6
+fdivl@GLIBC_2.28                                  /lib/x86_64-linux-gnu/libm.so.6
+fdopendir                                         /lib/x86_64-linux-gnu/libc.so.6
+fdopendir@@GLIBC_2.4                              /lib/x86_64-linux-gnu/libc.so.6
+fdopendir@GLIBC_2.4                               /lib/x86_64-linux-gnu/libc.so.6
+fegetenv                                          /lib/x86_64-linux-gnu/libm.so.6
+fegetenv@@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libm.so.6
+fegetenv@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libm.so.6
+fegetround                                        /lib/x86_64-linux-gnu/libm.so.6
+fegetround@@GLIBC_2.2.5                           /lib/x86_64-linux-gnu/libm.so.6
+fegetround@GLIBC_2.2.5                            /lib/x86_64-linux-gnu/libm.so.6
+feholdexcept                                      /lib/x86_64-linux-gnu/libm.so.6
+feholdexcept@@GLIBC_2.2.5                         /lib/x86_64-linux-gnu/libm.so.6
+feholdexcept@GLIBC_2.2.5                          /lib/x86_64-linux-gnu/libm.so.6
+feof                                              /lib/x86_64-linux-gnu/libc.so.6
+feof@@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libc.so.6
+feof@GLIBC_2.2.5                                  /lib/x86_64-linux-gnu/libc.so.6
+feof_unlocked                                     /lib/x86_64-linux-gnu/libc.so.6
+feof_unlocked@@GLIBC_2.2.5                        /lib/x86_64-linux-gnu/libc.so.6
+feof_unlocked@GLIBC_2.2.5                         /lib/x86_64-linux-gnu/libc.so.6
+feraiseexcept                                     /lib/x86_64-linux-gnu/libm.so.6
+feraiseexcept@@GLIBC_2.2.5                        /lib/x86_64-linux-gnu/libm.so.6
+feraiseexcept@GLIBC_2.2.5                         /lib/x86_64-linux-gnu/libm.so.6
+ferror                                            /lib/x86_64-linux-gnu/libc.so.6
+ferror@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+ferror@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libc.so.6
+ferror_unlocked                                   /lib/x86_64-linux-gnu/libc.so.6
+ferror_unlocked@@GLIBC_2.2.5                      /lib/x86_64-linux-gnu/libc.so.6
+ferror_unlocked@GLIBC_2.2.5                       /lib/x86_64-linux-gnu/libc.so.6
+fesetenv                                          /lib/x86_64-linux-gnu/libm.so.6
+fesetenv@@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libm.so.6
+fesetenv@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libm.so.6
+fesetround                                        /lib/x86_64-linux-gnu/libm.so.6
+fesetround@@GLIBC_2.2.5                           /lib/x86_64-linux-gnu/libm.so.6
+fesetround@GLIBC_2.2.5                            /lib/x86_64-linux-gnu/libm.so.6
+fflush                                            /lib/x86_64-linux-gnu/libc.so.6
+fflush@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+fflush@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libc.so.6
+fflush_unlocked                                   /lib/x86_64-linux-gnu/libc.so.6
+fflush_unlocked@@GLIBC_2.2.5                      /lib/x86_64-linux-gnu/libc.so.6
+fflush_unlocked@GLIBC_2.2.5                       /lib/x86_64-linux-gnu/libc.so.6
+ffsl                                              /lib/x86_64-linux-gnu/libc.so.6
+ffsl@@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libc.so.6
+ffsl@GLIBC_2.2.5                                  /lib/x86_64-linux-gnu/libc.so.6
+fgetc                                             /lib/x86_64-linux-gnu/libc.so.6
+fgetc@@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libc.so.6
+fgetc@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libc.so.6
+fgetc_unlocked                                    /lib/x86_64-linux-gnu/libc.so.6
+fgetc_unlocked@@GLIBC_2.2.5                       /lib/x86_64-linux-gnu/libc.so.6
+fgetc_unlocked@GLIBC_2.2.5                        /lib/x86_64-linux-gnu/libc.so.6
+fgetgrent_r                                       /lib/x86_64-linux-gnu/libc.so.6
+fgetgrent_r@@GLIBC_2.2.5                          /lib/x86_64-linux-gnu/libc.so.6
+fgetgrent_r@GLIBC_2.2.5                           /lib/x86_64-linux-gnu/libc.so.6
+fgetpwent_r                                       /lib/x86_64-linux-gnu/libc.so.6
+fgetpwent_r@@GLIBC_2.2.5                          /lib/x86_64-linux-gnu/libc.so.6
+fgetpwent_r@GLIBC_2.2.5                           /lib/x86_64-linux-gnu/libc.so.6
+fgets                                             /lib/x86_64-linux-gnu/libc.so.6
+fgets@@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libc.so.6
+fgets@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libc.so.6
+fgets_unlocked                                    /lib/x86_64-linux-gnu/libc.so.6
+fgets_unlocked@@GLIBC_2.2.5                       /lib/x86_64-linux-gnu/libc.so.6
+fgets_unlocked@GLIBC_2.2.5                        /lib/x86_64-linux-gnu/libc.so.6
+fgetsgent_r                                       /lib/x86_64-linux-gnu/libc.so.6
+fgetsgent_r@@GLIBC_2.10                           /lib/x86_64-linux-gnu/libc.so.6
+fgetsgent_r@GLIBC_2.10                            /lib/x86_64-linux-gnu/libc.so.6
+fgetspent_r                                       /lib/x86_64-linux-gnu/libc.so.6
+fgetspent_r@@GLIBC_2.2.5                          /lib/x86_64-linux-gnu/libc.so.6
+fgetspent_r@GLIBC_2.2.5                           /lib/x86_64-linux-gnu/libc.so.6
+fgetwc                                            /lib/x86_64-linux-gnu/libc.so.6
+fgetwc@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+fgetwc@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libc.so.6
+fgetwc_unlocked                                   /lib/x86_64-linux-gnu/libc.so.6
+fgetwc_unlocked@@GLIBC_2.2.5                      /lib/x86_64-linux-gnu/libc.so.6
+fgetwc_unlocked@GLIBC_2.2.5                       /lib/x86_64-linux-gnu/libc.so.6
+fileno                                            /lib/x86_64-linux-gnu/libc.so.6
+fileno@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+fileno@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libc.so.6
+fileno_unlocked                                   /lib/x86_64-linux-gnu/libc.so.6
+fileno_unlocked@@GLIBC_2.2.5                      /lib/x86_64-linux-gnu/libc.so.6
+fileno_unlocked@GLIBC_2.2.5                       /lib/x86_64-linux-gnu/libc.so.6
+find_subbytes                                     build/py/objstr.o
+                                                  build/py/objarray.o
+finite                                            /lib/x86_64-linux-gnu/libm.so.6
+finite@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libm.so.6
+                                                  /lib/x86_64-linux-gnu/libc.so.6
+finite@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+finitef                                           /lib/x86_64-linux-gnu/libm.so.6
+finitef@@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libm.so.6
+                                                  /lib/x86_64-linux-gnu/libc.so.6
+finitef@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libm.so.6
+finitel                                           /lib/x86_64-linux-gnu/libm.so.6
+finitel@@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libm.so.6
+                                                  /lib/x86_64-linux-gnu/libc.so.6
+finitel@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libm.so.6
+flock                                             /lib/x86_64-linux-gnu/libc.so.6
+flock@@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libc.so.6
+flock@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libc.so.6
+flockfile                                         /lib/x86_64-linux-gnu/libc.so.6
+flockfile@@GLIBC_2.2.5                            /lib/x86_64-linux-gnu/libc.so.6
+flockfile@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+floor                                             /lib/x86_64-linux-gnu/libm.so.6
+                                                  build/py/objfloat.o
+floor@@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+floor@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libm.so.6
+floorf                                            /lib/x86_64-linux-gnu/libm.so.6
+floorf128                                         /lib/x86_64-linux-gnu/libm.so.6
+floorf128@@GLIBC_2.26                             /lib/x86_64-linux-gnu/libm.so.6
+floorf128@GLIBC_2.26                              /lib/x86_64-linux-gnu/libm.so.6
+floorf32                                          /lib/x86_64-linux-gnu/libm.so.6
+floorf32@@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+floorf32@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+floorf32x                                         /lib/x86_64-linux-gnu/libm.so.6
+floorf32x@@GLIBC_2.27                             /lib/x86_64-linux-gnu/libm.so.6
+floorf32x@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+floorf64                                          /lib/x86_64-linux-gnu/libm.so.6
+floorf64@@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+floorf64@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+floorf64x                                         /lib/x86_64-linux-gnu/libm.so.6
+floorf64x@@GLIBC_2.27                             /lib/x86_64-linux-gnu/libm.so.6
+floorf64x@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+floorf@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libm.so.6
+floorf@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+floorl                                            /lib/x86_64-linux-gnu/libm.so.6
+floorl@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libm.so.6
+floorl@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+fma                                               /lib/x86_64-linux-gnu/libm.so.6
+fma@@GLIBC_2.2.5                                  /lib/x86_64-linux-gnu/libm.so.6
+fma@GLIBC_2.2.5                                   /lib/x86_64-linux-gnu/libm.so.6
+fmaf                                              /lib/x86_64-linux-gnu/libm.so.6
+fmaf128                                           /lib/x86_64-linux-gnu/libm.so.6
+fmaf128@@GLIBC_2.26                               /lib/x86_64-linux-gnu/libm.so.6
+fmaf128@GLIBC_2.26                                /lib/x86_64-linux-gnu/libm.so.6
+fmaf32                                            /lib/x86_64-linux-gnu/libm.so.6
+fmaf32@@GLIBC_2.27                                /lib/x86_64-linux-gnu/libm.so.6
+fmaf32@GLIBC_2.27                                 /lib/x86_64-linux-gnu/libm.so.6
+fmaf32x                                           /lib/x86_64-linux-gnu/libm.so.6
+fmaf32x@@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+fmaf32x@GLIBC_2.27                                /lib/x86_64-linux-gnu/libm.so.6
+fmaf64                                            /lib/x86_64-linux-gnu/libm.so.6
+fmaf64@@GLIBC_2.27                                /lib/x86_64-linux-gnu/libm.so.6
+fmaf64@GLIBC_2.27                                 /lib/x86_64-linux-gnu/libm.so.6
+fmaf64x                                           /lib/x86_64-linux-gnu/libm.so.6
+fmaf64x@@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+fmaf64x@GLIBC_2.27                                /lib/x86_64-linux-gnu/libm.so.6
+fmaf@@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libm.so.6
+fmaf@GLIBC_2.2.5                                  /lib/x86_64-linux-gnu/libm.so.6
+fmal                                              /lib/x86_64-linux-gnu/libm.so.6
+fmal@@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libm.so.6
+fmal@GLIBC_2.2.5                                  /lib/x86_64-linux-gnu/libm.so.6
+fmax                                              /lib/x86_64-linux-gnu/libm.so.6
+fmax@@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libm.so.6
+fmax@GLIBC_2.2.5                                  /lib/x86_64-linux-gnu/libm.so.6
+fmaxf                                             /lib/x86_64-linux-gnu/libm.so.6
+fmaxf128                                          /lib/x86_64-linux-gnu/libm.so.6
+fmaxf128@@GLIBC_2.26                              /lib/x86_64-linux-gnu/libm.so.6
+fmaxf128@GLIBC_2.26                               /lib/x86_64-linux-gnu/libm.so.6
+fmaxf32                                           /lib/x86_64-linux-gnu/libm.so.6
+fmaxf32@@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+fmaxf32@GLIBC_2.27                                /lib/x86_64-linux-gnu/libm.so.6
+fmaxf32x                                          /lib/x86_64-linux-gnu/libm.so.6
+fmaxf32x@@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+fmaxf32x@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+fmaxf64                                           /lib/x86_64-linux-gnu/libm.so.6
+fmaxf64@@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+fmaxf64@GLIBC_2.27                                /lib/x86_64-linux-gnu/libm.so.6
+fmaxf64x                                          /lib/x86_64-linux-gnu/libm.so.6
+fmaxf64x@@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+fmaxf64x@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+fmaxf@@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+fmaxf@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libm.so.6
+fmaxl                                             /lib/x86_64-linux-gnu/libm.so.6
+fmaxl@@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+fmaxl@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libm.so.6
+fmaxmag                                           /lib/x86_64-linux-gnu/libm.so.6
+fmaxmag@@GLIBC_2.25                               /lib/x86_64-linux-gnu/libm.so.6
+fmaxmag@GLIBC_2.25                                /lib/x86_64-linux-gnu/libm.so.6
+fmaxmagf                                          /lib/x86_64-linux-gnu/libm.so.6
+fmaxmagf128                                       /lib/x86_64-linux-gnu/libm.so.6
+fmaxmagf128@@GLIBC_2.26                           /lib/x86_64-linux-gnu/libm.so.6
+fmaxmagf128@GLIBC_2.26                            /lib/x86_64-linux-gnu/libm.so.6
+fmaxmagf32                                        /lib/x86_64-linux-gnu/libm.so.6
+fmaxmagf32@@GLIBC_2.27                            /lib/x86_64-linux-gnu/libm.so.6
+fmaxmagf32@GLIBC_2.27                             /lib/x86_64-linux-gnu/libm.so.6
+fmaxmagf32x                                       /lib/x86_64-linux-gnu/libm.so.6
+fmaxmagf32x@@GLIBC_2.27                           /lib/x86_64-linux-gnu/libm.so.6
+fmaxmagf32x@GLIBC_2.27                            /lib/x86_64-linux-gnu/libm.so.6
+fmaxmagf64                                        /lib/x86_64-linux-gnu/libm.so.6
+fmaxmagf64@@GLIBC_2.27                            /lib/x86_64-linux-gnu/libm.so.6
+fmaxmagf64@GLIBC_2.27                             /lib/x86_64-linux-gnu/libm.so.6
+fmaxmagf64x                                       /lib/x86_64-linux-gnu/libm.so.6
+fmaxmagf64x@@GLIBC_2.27                           /lib/x86_64-linux-gnu/libm.so.6
+fmaxmagf64x@GLIBC_2.27                            /lib/x86_64-linux-gnu/libm.so.6
+fmaxmagf@@GLIBC_2.25                              /lib/x86_64-linux-gnu/libm.so.6
+fmaxmagf@GLIBC_2.25                               /lib/x86_64-linux-gnu/libm.so.6
+fmaxmagl                                          /lib/x86_64-linux-gnu/libm.so.6
+fmaxmagl@@GLIBC_2.25                              /lib/x86_64-linux-gnu/libm.so.6
+fmaxmagl@GLIBC_2.25                               /lib/x86_64-linux-gnu/libm.so.6
+fmin                                              /lib/x86_64-linux-gnu/libm.so.6
+fmin@@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libm.so.6
+fmin@GLIBC_2.2.5                                  /lib/x86_64-linux-gnu/libm.so.6
+fminf                                             /lib/x86_64-linux-gnu/libm.so.6
+fminf128                                          /lib/x86_64-linux-gnu/libm.so.6
+fminf128@@GLIBC_2.26                              /lib/x86_64-linux-gnu/libm.so.6
+fminf128@GLIBC_2.26                               /lib/x86_64-linux-gnu/libm.so.6
+fminf32                                           /lib/x86_64-linux-gnu/libm.so.6
+fminf32@@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+fminf32@GLIBC_2.27                                /lib/x86_64-linux-gnu/libm.so.6
+fminf32x                                          /lib/x86_64-linux-gnu/libm.so.6
+fminf32x@@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+fminf32x@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+fminf64                                           /lib/x86_64-linux-gnu/libm.so.6
+fminf64@@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+fminf64@GLIBC_2.27                                /lib/x86_64-linux-gnu/libm.so.6
+fminf64x                                          /lib/x86_64-linux-gnu/libm.so.6
+fminf64x@@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+fminf64x@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+fminf@@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+fminf@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libm.so.6
+fminl                                             /lib/x86_64-linux-gnu/libm.so.6
+fminl@@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+fminl@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libm.so.6
+fminmag                                           /lib/x86_64-linux-gnu/libm.so.6
+fminmag@@GLIBC_2.25                               /lib/x86_64-linux-gnu/libm.so.6
+fminmag@GLIBC_2.25                                /lib/x86_64-linux-gnu/libm.so.6
+fminmagf                                          /lib/x86_64-linux-gnu/libm.so.6
+fminmagf128                                       /lib/x86_64-linux-gnu/libm.so.6
+fminmagf128@@GLIBC_2.26                           /lib/x86_64-linux-gnu/libm.so.6
+fminmagf128@GLIBC_2.26                            /lib/x86_64-linux-gnu/libm.so.6
+fminmagf32                                        /lib/x86_64-linux-gnu/libm.so.6
+fminmagf32@@GLIBC_2.27                            /lib/x86_64-linux-gnu/libm.so.6
+fminmagf32@GLIBC_2.27                             /lib/x86_64-linux-gnu/libm.so.6
+fminmagf32x                                       /lib/x86_64-linux-gnu/libm.so.6
+fminmagf32x@@GLIBC_2.27                           /lib/x86_64-linux-gnu/libm.so.6
+fminmagf32x@GLIBC_2.27                            /lib/x86_64-linux-gnu/libm.so.6
+fminmagf64                                        /lib/x86_64-linux-gnu/libm.so.6
+fminmagf64@@GLIBC_2.27                            /lib/x86_64-linux-gnu/libm.so.6
+fminmagf64@GLIBC_2.27                             /lib/x86_64-linux-gnu/libm.so.6
+fminmagf64x                                       /lib/x86_64-linux-gnu/libm.so.6
+fminmagf64x@@GLIBC_2.27                           /lib/x86_64-linux-gnu/libm.so.6
+fminmagf64x@GLIBC_2.27                            /lib/x86_64-linux-gnu/libm.so.6
+fminmagf@@GLIBC_2.25                              /lib/x86_64-linux-gnu/libm.so.6
+fminmagf@GLIBC_2.25                               /lib/x86_64-linux-gnu/libm.so.6
+fminmagl                                          /lib/x86_64-linux-gnu/libm.so.6
+fminmagl@@GLIBC_2.25                              /lib/x86_64-linux-gnu/libm.so.6
+fminmagl@GLIBC_2.25                               /lib/x86_64-linux-gnu/libm.so.6
+fmod                                              /lib/x86_64-linux-gnu/libm.so.6
+                                                  build/py/objfloat.o
+fmod@@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libm.so.6
+fmod@GLIBC_2.2.5                                  /lib/x86_64-linux-gnu/libm.so.6
+fmodf                                             /lib/x86_64-linux-gnu/libm.so.6
+fmodf128                                          /lib/x86_64-linux-gnu/libm.so.6
+fmodf128@@GLIBC_2.26                              /lib/x86_64-linux-gnu/libm.so.6
+fmodf128@GLIBC_2.26                               /lib/x86_64-linux-gnu/libm.so.6
+fmodf32                                           /lib/x86_64-linux-gnu/libm.so.6
+fmodf32@@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+fmodf32@GLIBC_2.27                                /lib/x86_64-linux-gnu/libm.so.6
+fmodf32x                                          /lib/x86_64-linux-gnu/libm.so.6
+fmodf32x@@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+fmodf32x@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+fmodf64                                           /lib/x86_64-linux-gnu/libm.so.6
+fmodf64@@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+fmodf64@GLIBC_2.27                                /lib/x86_64-linux-gnu/libm.so.6
+fmodf64x                                          /lib/x86_64-linux-gnu/libm.so.6
+fmodf64x@@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+fmodf64x@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+fmodf@@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+fmodf@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libm.so.6
+fmodl                                             /lib/x86_64-linux-gnu/libm.so.6
+fmodl@@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+fmodl@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libm.so.6
+fmul                                              /lib/x86_64-linux-gnu/libm.so.6
+fmul@@GLIBC_2.28                                  /lib/x86_64-linux-gnu/libm.so.6
+fmul@GLIBC_2.28                                   /lib/x86_64-linux-gnu/libm.so.6
+fmull                                             /lib/x86_64-linux-gnu/libm.so.6
+fmull@@GLIBC_2.28                                 /lib/x86_64-linux-gnu/libm.so.6
+fmull@GLIBC_2.28                                  /lib/x86_64-linux-gnu/libm.so.6
+fopen64                                           /lib/x86_64-linux-gnu/libc.so.6
+fopen64@@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+fopen64@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+fork                                              /lib/x86_64-linux-gnu/libc.so.6
+fork@@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libc.so.6
+fork@GLIBC_2.2.5                                  /lib/x86_64-linux-gnu/libc.so.6
+fpathconf                                         /lib/x86_64-linux-gnu/libc.so.6
+fpathconf@@GLIBC_2.2.5                            /lib/x86_64-linux-gnu/libc.so.6
+fpathconf@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+fprintf                                           /lib/x86_64-linux-gnu/libc.so.6
+                                                  build/main.o
+fprintf@@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+fprintf@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+fputs                                             /lib/x86_64-linux-gnu/libc.so.6
+fputs@@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libc.so.6
+fputs@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libc.so.6
+                                                  /lib/x86_64-linux-gnu/libm.so.6
+fputs_unlocked                                    /lib/x86_64-linux-gnu/libc.so.6
+fputs_unlocked@@GLIBC_2.2.5                       /lib/x86_64-linux-gnu/libc.so.6
+fputs_unlocked@GLIBC_2.2.5                        /lib/x86_64-linux-gnu/libc.so.6
+fread                                             /lib/x86_64-linux-gnu/libc.so.6
+fread@@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libc.so.6
+fread@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libc.so.6
+fread_unlocked                                    /lib/x86_64-linux-gnu/libc.so.6
+fread_unlocked@@GLIBC_2.2.5                       /lib/x86_64-linux-gnu/libc.so.6
+fread_unlocked@GLIBC_2.2.5                        /lib/x86_64-linux-gnu/libc.so.6
+freeifaddrs                                       /lib/x86_64-linux-gnu/libc.so.6
+freeifaddrs@@GLIBC_2.3                            /lib/x86_64-linux-gnu/libc.so.6
+freeifaddrs@GLIBC_2.3                             /lib/x86_64-linux-gnu/libc.so.6
+freelocale                                        /lib/x86_64-linux-gnu/libc.so.6
+freelocale@@GLIBC_2.3                             /lib/x86_64-linux-gnu/libc.so.6
+freelocale@GLIBC_2.3                              /lib/x86_64-linux-gnu/libc.so.6
+frexp                                             /lib/x86_64-linux-gnu/libm.so.6
+frexp@@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+                                                  /lib/x86_64-linux-gnu/libc.so.6
+frexp@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libm.so.6
+frexpf                                            /lib/x86_64-linux-gnu/libm.so.6
+frexpf128                                         /lib/x86_64-linux-gnu/libm.so.6
+frexpf128@@GLIBC_2.26                             /lib/x86_64-linux-gnu/libm.so.6
+frexpf128@GLIBC_2.26                              /lib/x86_64-linux-gnu/libm.so.6
+frexpf32                                          /lib/x86_64-linux-gnu/libm.so.6
+frexpf32@@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+frexpf32@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+frexpf32x                                         /lib/x86_64-linux-gnu/libm.so.6
+frexpf32x@@GLIBC_2.27                             /lib/x86_64-linux-gnu/libm.so.6
+frexpf32x@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+frexpf64                                          /lib/x86_64-linux-gnu/libm.so.6
+frexpf64@@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+frexpf64@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+frexpf64x                                         /lib/x86_64-linux-gnu/libm.so.6
+frexpf64x@@GLIBC_2.27                             /lib/x86_64-linux-gnu/libm.so.6
+frexpf64x@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+frexpf@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libm.so.6
+                                                  /lib/x86_64-linux-gnu/libc.so.6
+frexpf@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+frexpl                                            /lib/x86_64-linux-gnu/libm.so.6
+frexpl@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libm.so.6
+                                                  /lib/x86_64-linux-gnu/libc.so.6
+frexpl@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+fromfp                                            /lib/x86_64-linux-gnu/libm.so.6
+fromfp@@GLIBC_2.25                                /lib/x86_64-linux-gnu/libm.so.6
+fromfp@GLIBC_2.25                                 /lib/x86_64-linux-gnu/libm.so.6
+fromfpf                                           /lib/x86_64-linux-gnu/libm.so.6
+fromfpf128                                        /lib/x86_64-linux-gnu/libm.so.6
+fromfpf128@@GLIBC_2.26                            /lib/x86_64-linux-gnu/libm.so.6
+fromfpf128@GLIBC_2.26                             /lib/x86_64-linux-gnu/libm.so.6
+fromfpf32                                         /lib/x86_64-linux-gnu/libm.so.6
+fromfpf32@@GLIBC_2.27                             /lib/x86_64-linux-gnu/libm.so.6
+fromfpf32@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+fromfpf32x                                        /lib/x86_64-linux-gnu/libm.so.6
+fromfpf32x@@GLIBC_2.27                            /lib/x86_64-linux-gnu/libm.so.6
+fromfpf32x@GLIBC_2.27                             /lib/x86_64-linux-gnu/libm.so.6
+fromfpf64                                         /lib/x86_64-linux-gnu/libm.so.6
+fromfpf64@@GLIBC_2.27                             /lib/x86_64-linux-gnu/libm.so.6
+fromfpf64@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+fromfpf64x                                        /lib/x86_64-linux-gnu/libm.so.6
+fromfpf64x@@GLIBC_2.27                            /lib/x86_64-linux-gnu/libm.so.6
+fromfpf64x@GLIBC_2.27                             /lib/x86_64-linux-gnu/libm.so.6
+fromfpf@@GLIBC_2.25                               /lib/x86_64-linux-gnu/libm.so.6
+fromfpf@GLIBC_2.25                                /lib/x86_64-linux-gnu/libm.so.6
+fromfpl                                           /lib/x86_64-linux-gnu/libm.so.6
+fromfpl@@GLIBC_2.25                               /lib/x86_64-linux-gnu/libm.so.6
+fromfpl@GLIBC_2.25                                /lib/x86_64-linux-gnu/libm.so.6
+fromfpx                                           /lib/x86_64-linux-gnu/libm.so.6
+fromfpx@@GLIBC_2.25                               /lib/x86_64-linux-gnu/libm.so.6
+fromfpx@GLIBC_2.25                                /lib/x86_64-linux-gnu/libm.so.6
+fromfpxf                                          /lib/x86_64-linux-gnu/libm.so.6
+fromfpxf128                                       /lib/x86_64-linux-gnu/libm.so.6
+fromfpxf128@@GLIBC_2.26                           /lib/x86_64-linux-gnu/libm.so.6
+fromfpxf128@GLIBC_2.26                            /lib/x86_64-linux-gnu/libm.so.6
+fromfpxf32                                        /lib/x86_64-linux-gnu/libm.so.6
+fromfpxf32@@GLIBC_2.27                            /lib/x86_64-linux-gnu/libm.so.6
+fromfpxf32@GLIBC_2.27                             /lib/x86_64-linux-gnu/libm.so.6
+fromfpxf32x                                       /lib/x86_64-linux-gnu/libm.so.6
+fromfpxf32x@@GLIBC_2.27                           /lib/x86_64-linux-gnu/libm.so.6
+fromfpxf32x@GLIBC_2.27                            /lib/x86_64-linux-gnu/libm.so.6
+fromfpxf64                                        /lib/x86_64-linux-gnu/libm.so.6
+fromfpxf64@@GLIBC_2.27                            /lib/x86_64-linux-gnu/libm.so.6
+fromfpxf64@GLIBC_2.27                             /lib/x86_64-linux-gnu/libm.so.6
+fromfpxf64x                                       /lib/x86_64-linux-gnu/libm.so.6
+fromfpxf64x@@GLIBC_2.27                           /lib/x86_64-linux-gnu/libm.so.6
+fromfpxf64x@GLIBC_2.27                            /lib/x86_64-linux-gnu/libm.so.6
+fromfpxf@@GLIBC_2.25                              /lib/x86_64-linux-gnu/libm.so.6
+fromfpxf@GLIBC_2.25                               /lib/x86_64-linux-gnu/libm.so.6
+fromfpxl                                          /lib/x86_64-linux-gnu/libm.so.6
+fromfpxl@@GLIBC_2.25                              /lib/x86_64-linux-gnu/libm.so.6
+fromfpxl@GLIBC_2.25                               /lib/x86_64-linux-gnu/libm.so.6
+fseeko                                            /lib/x86_64-linux-gnu/libc.so.6
+fseeko64                                          /lib/x86_64-linux-gnu/libc.so.6
+fseeko64@@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+fseeko64@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+fseeko@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+fseeko@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libc.so.6
+fstatfs                                           /lib/x86_64-linux-gnu/libc.so.6
+fstatfs64                                         /lib/x86_64-linux-gnu/libc.so.6
+fstatfs64@@GLIBC_2.2.5                            /lib/x86_64-linux-gnu/libc.so.6
+fstatfs64@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+fstatfs@@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+fstatfs@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+fstatvfs                                          /lib/x86_64-linux-gnu/libc.so.6
+fstatvfs64                                        /lib/x86_64-linux-gnu/libc.so.6
+fstatvfs64@@GLIBC_2.2.5                           /lib/x86_64-linux-gnu/libc.so.6
+fstatvfs64@GLIBC_2.2.5                            /lib/x86_64-linux-gnu/libc.so.6
+fstatvfs@@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+fstatvfs@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+fsub                                              /lib/x86_64-linux-gnu/libm.so.6
+fsub@@GLIBC_2.28                                  /lib/x86_64-linux-gnu/libm.so.6
+fsub@GLIBC_2.28                                   /lib/x86_64-linux-gnu/libm.so.6
+fsubl                                             /lib/x86_64-linux-gnu/libm.so.6
+fsubl@@GLIBC_2.28                                 /lib/x86_64-linux-gnu/libm.so.6
+fsubl@GLIBC_2.28                                  /lib/x86_64-linux-gnu/libm.so.6
+ftell                                             /lib/x86_64-linux-gnu/libc.so.6
+ftell@@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libc.so.6
+ftell@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libc.so.6
+ftello                                            /lib/x86_64-linux-gnu/libc.so.6
+ftello64                                          /lib/x86_64-linux-gnu/libc.so.6
+ftello64@@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+ftello64@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+ftello@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+ftello@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libc.so.6
+ftruncate                                         /lib/x86_64-linux-gnu/libc.so.6
+ftruncate64                                       /lib/x86_64-linux-gnu/libc.so.6
+ftruncate64@@GLIBC_2.2.5                          /lib/x86_64-linux-gnu/libc.so.6
+ftruncate64@GLIBC_2.2.5                           /lib/x86_64-linux-gnu/libc.so.6
+ftruncate@@GLIBC_2.2.5                            /lib/x86_64-linux-gnu/libc.so.6
+ftruncate@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+ftrylockfile                                      /lib/x86_64-linux-gnu/libc.so.6
+ftrylockfile@@GLIBC_2.2.5                         /lib/x86_64-linux-gnu/libc.so.6
+ftrylockfile@GLIBC_2.2.5                          /lib/x86_64-linux-gnu/libc.so.6
+fts64_children                                    /lib/x86_64-linux-gnu/libc.so.6
+fts64_children@@GLIBC_2.23                        /lib/x86_64-linux-gnu/libc.so.6
+fts64_children@GLIBC_2.23                         /lib/x86_64-linux-gnu/libc.so.6
+fts64_close                                       /lib/x86_64-linux-gnu/libc.so.6
+fts64_close@@GLIBC_2.23                           /lib/x86_64-linux-gnu/libc.so.6
+fts64_close@GLIBC_2.23                            /lib/x86_64-linux-gnu/libc.so.6
+fts64_open                                        /lib/x86_64-linux-gnu/libc.so.6
+fts64_open@@GLIBC_2.23                            /lib/x86_64-linux-gnu/libc.so.6
+fts64_open@GLIBC_2.23                             /lib/x86_64-linux-gnu/libc.so.6
+fts64_read                                        /lib/x86_64-linux-gnu/libc.so.6
+fts64_read@@GLIBC_2.23                            /lib/x86_64-linux-gnu/libc.so.6
+fts64_read@GLIBC_2.23                             /lib/x86_64-linux-gnu/libc.so.6
+fts64_set                                         /lib/x86_64-linux-gnu/libc.so.6
+fts64_set@@GLIBC_2.23                             /lib/x86_64-linux-gnu/libc.so.6
+fts64_set@GLIBC_2.23                              /lib/x86_64-linux-gnu/libc.so.6
+ftw64                                             /lib/x86_64-linux-gnu/libc.so.6
+ftw64@@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libc.so.6
+ftw64@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libc.so.6
+funlockfile                                       /lib/x86_64-linux-gnu/libc.so.6
+funlockfile@@GLIBC_2.2.5                          /lib/x86_64-linux-gnu/libc.so.6
+funlockfile@GLIBC_2.2.5                           /lib/x86_64-linux-gnu/libc.so.6
+futimens                                          /lib/x86_64-linux-gnu/libc.so.6
+futimens@@GLIBC_2.6                               /lib/x86_64-linux-gnu/libc.so.6
+futimens@GLIBC_2.6                                /lib/x86_64-linux-gnu/libc.so.6
+futimes                                           /lib/x86_64-linux-gnu/libc.so.6
+futimes@@GLIBC_2.3                                /lib/x86_64-linux-gnu/libc.so.6
+futimes@GLIBC_2.3                                 /lib/x86_64-linux-gnu/libc.so.6
+fwprintf                                          /lib/x86_64-linux-gnu/libc.so.6
+fwprintf@@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+fwprintf@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+fwrite                                            /lib/x86_64-linux-gnu/libc.so.6
+fwrite@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+fwrite@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libc.so.6
+                                                  /lib/x86_64-linux-gnu/libm.so.6
+gamma                                             /lib/x86_64-linux-gnu/libm.so.6
+gamma@@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+gamma@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libm.so.6
+gammaf                                            /lib/x86_64-linux-gnu/libm.so.6
+gammaf@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libm.so.6
+gammaf@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+gammal                                            /lib/x86_64-linux-gnu/libm.so.6
+gammal@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libm.so.6
+gammal@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+gc_alloc                                          build/py/gc.o
+                                                  build/py/malloc.o
+gc_collect                                        build/gccollect.o
+                                                  build/py/gc.o
+gc_collect_end                                    build/py/gc.o
+                                                  build/gccollect.o
+gc_collect_root                                   build/py/gc.o
+                                                  build/lib/utils/gchelper_generic.o
+gc_collect_start                                  build/py/gc.o
+                                                  build/gccollect.o
+gc_dump_alloc_table                               build/py/gc.o
+gc_dump_info                                      build/py/gc.o
+gc_free                                           build/py/gc.o
+                                                  build/py/malloc.o
+gc_helper_collect_regs_and_stack                  build/lib/utils/gchelper_generic.o
+                                                  build/gccollect.o
+gc_info                                           build/py/gc.o
+gc_init                                           build/py/gc.o
+                                                  build/main.o
+gc_is_locked                                      build/py/gc.o
+                                                  build/py/runtime.o
+gc_lock                                           build/py/gc.o
+                                                  build/py/modmicropython.o
+gc_nbytes                                         build/py/gc.o
+                                                  build/py/qstr.o
+gc_realloc                                        build/py/gc.o
+                                                  build/py/malloc.o
+gc_sweep_all                                      build/py/gc.o
+gc_unlock                                         build/py/gc.o
+                                                  build/py/modmicropython.o
+get_avphys_pages                                  /lib/x86_64-linux-gnu/libc.so.6
+get_avphys_pages@@GLIBC_2.2.5                     /lib/x86_64-linux-gnu/libc.so.6
+get_avphys_pages@GLIBC_2.2.5                      /lib/x86_64-linux-gnu/libc.so.6
+get_nprocs                                        /lib/x86_64-linux-gnu/libc.so.6
+get_nprocs@@GLIBC_2.2.5                           /lib/x86_64-linux-gnu/libc.so.6
+get_nprocs@GLIBC_2.2.5                            /lib/x86_64-linux-gnu/libc.so.6
+get_nprocs_conf                                   /lib/x86_64-linux-gnu/libc.so.6
+get_nprocs_conf@@GLIBC_2.2.5                      /lib/x86_64-linux-gnu/libc.so.6
+get_nprocs_conf@GLIBC_2.2.5                       /lib/x86_64-linux-gnu/libc.so.6
+get_phys_pages                                    /lib/x86_64-linux-gnu/libc.so.6
+get_phys_pages@@GLIBC_2.2.5                       /lib/x86_64-linux-gnu/libc.so.6
+get_phys_pages@GLIBC_2.2.5                        /lib/x86_64-linux-gnu/libc.so.6
+getauxval                                         /lib/x86_64-linux-gnu/libc.so.6
+getauxval@@GLIBC_2.16                             /lib/x86_64-linux-gnu/libc.so.6
+getauxval@GLIBC_2.16                              /lib/x86_64-linux-gnu/libc.so.6
+getc                                              /lib/x86_64-linux-gnu/libc.so.6
+getc@@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libc.so.6
+getc@GLIBC_2.2.5                                  /lib/x86_64-linux-gnu/libc.so.6
+getc_unlocked                                     /lib/x86_64-linux-gnu/libc.so.6
+getc_unlocked@@GLIBC_2.2.5                        /lib/x86_64-linux-gnu/libc.so.6
+getc_unlocked@GLIBC_2.2.5                         /lib/x86_64-linux-gnu/libc.so.6
+getcontext                                        /lib/x86_64-linux-gnu/libc.so.6
+getcontext@@GLIBC_2.2.5                           /lib/x86_64-linux-gnu/libc.so.6
+getcontext@GLIBC_2.2.5                            /lib/x86_64-linux-gnu/libc.so.6
+getcpu                                            /lib/x86_64-linux-gnu/libc.so.6
+getcpu@@GLIBC_2.29                                /lib/x86_64-linux-gnu/libc.so.6
+getcpu@GLIBC_2.29                                 /lib/x86_64-linux-gnu/libc.so.6
+getcwd                                            /lib/x86_64-linux-gnu/libc.so.6
+getcwd@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+getcwd@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libc.so.6
+getdate_r                                         /lib/x86_64-linux-gnu/libc.so.6
+getdate_r@@GLIBC_2.2.5                            /lib/x86_64-linux-gnu/libc.so.6
+getdate_r@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+getdelim                                          /lib/x86_64-linux-gnu/libc.so.6
+getdelim@@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+getdelim@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+getdents64                                        /lib/x86_64-linux-gnu/libc.so.6
+getdents64@@GLIBC_2.30                            /lib/x86_64-linux-gnu/libc.so.6
+getdents64@GLIBC_2.30                             /lib/x86_64-linux-gnu/libc.so.6
+getdirentries                                     /lib/x86_64-linux-gnu/libc.so.6
+getdirentries@@GLIBC_2.2.5                        /lib/x86_64-linux-gnu/libc.so.6
+getdirentries@GLIBC_2.2.5                         /lib/x86_64-linux-gnu/libc.so.6
+getdtablesize                                     /lib/x86_64-linux-gnu/libc.so.6
+getdtablesize@@GLIBC_2.2.5                        /lib/x86_64-linux-gnu/libc.so.6
+getdtablesize@GLIBC_2.2.5                         /lib/x86_64-linux-gnu/libc.so.6
+getegid                                           /lib/x86_64-linux-gnu/libc.so.6
+getegid@@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+getegid@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+geteuid                                           /lib/x86_64-linux-gnu/libc.so.6
+geteuid@@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+geteuid@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+getgid                                            /lib/x86_64-linux-gnu/libc.so.6
+getgid@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+getgid@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libc.so.6
+getgroups                                         /lib/x86_64-linux-gnu/libc.so.6
+getgroups@@GLIBC_2.2.5                            /lib/x86_64-linux-gnu/libc.so.6
+getgroups@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+gethostname                                       /lib/x86_64-linux-gnu/libc.so.6
+gethostname@@GLIBC_2.2.5                          /lib/x86_64-linux-gnu/libc.so.6
+gethostname@GLIBC_2.2.5                           /lib/x86_64-linux-gnu/libc.so.6
+getifaddrs                                        /lib/x86_64-linux-gnu/libc.so.6
+getifaddrs@@GLIBC_2.3                             /lib/x86_64-linux-gnu/libc.so.6
+getifaddrs@GLIBC_2.3                              /lib/x86_64-linux-gnu/libc.so.6
+getitimer                                         /lib/x86_64-linux-gnu/libc.so.6
+getitimer@@GLIBC_2.2.5                            /lib/x86_64-linux-gnu/libc.so.6
+getitimer@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+getline                                           /lib/x86_64-linux-gnu/libc.so.6
+getline@@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+getline@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+getlogin_r                                        /lib/x86_64-linux-gnu/libc.so.6
+getlogin_r@@GLIBC_2.2.5                           /lib/x86_64-linux-gnu/libc.so.6
+getlogin_r@GLIBC_2.2.5                            /lib/x86_64-linux-gnu/libc.so.6
+getmntent_r                                       /lib/x86_64-linux-gnu/libc.so.6
+getmntent_r@@GLIBC_2.2.5                          /lib/x86_64-linux-gnu/libc.so.6
+getmntent_r@GLIBC_2.2.5                           /lib/x86_64-linux-gnu/libc.so.6
+getnetgrent_r                                     /lib/x86_64-linux-gnu/libc.so.6
+getnetgrent_r@@GLIBC_2.2.5                        /lib/x86_64-linux-gnu/libc.so.6
+getnetgrent_r@GLIBC_2.2.5                         /lib/x86_64-linux-gnu/libc.so.6
+getpagesize                                       /lib/x86_64-linux-gnu/libc.so.6
+getpagesize@@GLIBC_2.2.5                          /lib/x86_64-linux-gnu/libc.so.6
+getpagesize@GLIBC_2.2.5                           /lib/x86_64-linux-gnu/libc.so.6
+getpayload                                        /lib/x86_64-linux-gnu/libm.so.6
+getpayload@@GLIBC_2.25                            /lib/x86_64-linux-gnu/libm.so.6
+getpayload@GLIBC_2.25                             /lib/x86_64-linux-gnu/libm.so.6
+getpayloadf                                       /lib/x86_64-linux-gnu/libm.so.6
+getpayloadf128                                    /lib/x86_64-linux-gnu/libm.so.6
+getpayloadf128@@GLIBC_2.26                        /lib/x86_64-linux-gnu/libm.so.6
+getpayloadf128@GLIBC_2.26                         /lib/x86_64-linux-gnu/libm.so.6
+getpayloadf32                                     /lib/x86_64-linux-gnu/libm.so.6
+getpayloadf32@@GLIBC_2.27                         /lib/x86_64-linux-gnu/libm.so.6
+getpayloadf32@GLIBC_2.27                          /lib/x86_64-linux-gnu/libm.so.6
+getpayloadf32x                                    /lib/x86_64-linux-gnu/libm.so.6
+getpayloadf32x@@GLIBC_2.27                        /lib/x86_64-linux-gnu/libm.so.6
+getpayloadf32x@GLIBC_2.27                         /lib/x86_64-linux-gnu/libm.so.6
+getpayloadf64                                     /lib/x86_64-linux-gnu/libm.so.6
+getpayloadf64@@GLIBC_2.27                         /lib/x86_64-linux-gnu/libm.so.6
+getpayloadf64@GLIBC_2.27                          /lib/x86_64-linux-gnu/libm.so.6
+getpayloadf64x                                    /lib/x86_64-linux-gnu/libm.so.6
+getpayloadf64x@@GLIBC_2.27                        /lib/x86_64-linux-gnu/libm.so.6
+getpayloadf64x@GLIBC_2.27                         /lib/x86_64-linux-gnu/libm.so.6
+getpayloadf@@GLIBC_2.25                           /lib/x86_64-linux-gnu/libm.so.6
+getpayloadf@GLIBC_2.25                            /lib/x86_64-linux-gnu/libm.so.6
+getpayloadl                                       /lib/x86_64-linux-gnu/libm.so.6
+getpayloadl@@GLIBC_2.25                           /lib/x86_64-linux-gnu/libm.so.6
+getpayloadl@GLIBC_2.25                            /lib/x86_64-linux-gnu/libm.so.6
+getpeername                                       /lib/x86_64-linux-gnu/libc.so.6
+getpeername@@GLIBC_2.2.5                          /lib/x86_64-linux-gnu/libc.so.6
+getpeername@GLIBC_2.2.5                           /lib/x86_64-linux-gnu/libc.so.6
+getpgid                                           /lib/x86_64-linux-gnu/libc.so.6
+getpgid@@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+getpgid@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+getpid                                            /lib/x86_64-linux-gnu/libc.so.6
+getpid@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+getpid@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libc.so.6
+getppid                                           /lib/x86_64-linux-gnu/libc.so.6
+getppid@@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+getppid@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+getpriority                                       /lib/x86_64-linux-gnu/libc.so.6
+getpriority@@GLIBC_2.2.5                          /lib/x86_64-linux-gnu/libc.so.6
+getpriority@GLIBC_2.2.5                           /lib/x86_64-linux-gnu/libc.so.6
+getpt                                             /lib/x86_64-linux-gnu/libc.so.6
+getpt@@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libc.so.6
+getpt@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libc.so.6
+getpw                                             /lib/x86_64-linux-gnu/libc.so.6
+getpw@@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libc.so.6
+getpw@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libc.so.6
+getrandom                                         /lib/x86_64-linux-gnu/libc.so.6
+getrandom@@GLIBC_2.25                             /lib/x86_64-linux-gnu/libc.so.6
+getrandom@GLIBC_2.25                              /lib/x86_64-linux-gnu/libc.so.6
+getrlimit                                         /lib/x86_64-linux-gnu/libc.so.6
+getrlimit64                                       /lib/x86_64-linux-gnu/libc.so.6
+getrlimit64@@GLIBC_2.2.5                          /lib/x86_64-linux-gnu/libc.so.6
+getrlimit64@GLIBC_2.2.5                           /lib/x86_64-linux-gnu/libc.so.6
+getrlimit@@GLIBC_2.2.5                            /lib/x86_64-linux-gnu/libc.so.6
+getrlimit@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+getrusage                                         /lib/x86_64-linux-gnu/libc.so.6
+getrusage@@GLIBC_2.2.5                            /lib/x86_64-linux-gnu/libc.so.6
+getrusage@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+gets                                              /lib/x86_64-linux-gnu/libc.so.6
+gets@@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libc.so.6
+gets@GLIBC_2.2.5                                  /lib/x86_64-linux-gnu/libc.so.6
+getsockname                                       /lib/x86_64-linux-gnu/libc.so.6
+getsockname@@GLIBC_2.2.5                          /lib/x86_64-linux-gnu/libc.so.6
+getsockname@GLIBC_2.2.5                           /lib/x86_64-linux-gnu/libc.so.6
+getsockopt                                        /lib/x86_64-linux-gnu/libc.so.6
+getsockopt@@GLIBC_2.2.5                           /lib/x86_64-linux-gnu/libc.so.6
+getsockopt@GLIBC_2.2.5                            /lib/x86_64-linux-gnu/libc.so.6
+gettext                                           /lib/x86_64-linux-gnu/libc.so.6
+gettext@@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+gettext@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+gettid                                            /lib/x86_64-linux-gnu/libc.so.6
+gettid@@GLIBC_2.30                                /lib/x86_64-linux-gnu/libc.so.6
+gettid@GLIBC_2.30                                 /lib/x86_64-linux-gnu/libc.so.6
+gettimeofday                                      /lib/x86_64-linux-gnu/libc.so.6
+gettimeofday@@GLIBC_2.2.5                         /lib/x86_64-linux-gnu/libc.so.6
+gettimeofday@GLIBC_2.2.5                          /lib/x86_64-linux-gnu/libc.so.6
+getttyent                                         /lib/x86_64-linux-gnu/libc.so.6
+getttyent@@GLIBC_2.2.5                            /lib/x86_64-linux-gnu/libc.so.6
+getttyent@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+getttynam                                         /lib/x86_64-linux-gnu/libc.so.6
+getttynam@@GLIBC_2.2.5                            /lib/x86_64-linux-gnu/libc.so.6
+getttynam@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+getuid                                            /lib/x86_64-linux-gnu/libc.so.6
+getuid@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+getuid@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libc.so.6
+getutent                                          /lib/x86_64-linux-gnu/libc.so.6
+getutent@@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+getutent@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+getutent_r                                        /lib/x86_64-linux-gnu/libc.so.6
+getutent_r@@GLIBC_2.2.5                           /lib/x86_64-linux-gnu/libc.so.6
+getutent_r@GLIBC_2.2.5                            /lib/x86_64-linux-gnu/libc.so.6
+getutid                                           /lib/x86_64-linux-gnu/libc.so.6
+getutid@@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+getutid@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+getutid_r                                         /lib/x86_64-linux-gnu/libc.so.6
+getutid_r@@GLIBC_2.2.5                            /lib/x86_64-linux-gnu/libc.so.6
+getutid_r@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+getutline                                         /lib/x86_64-linux-gnu/libc.so.6
+getutline@@GLIBC_2.2.5                            /lib/x86_64-linux-gnu/libc.so.6
+getutline@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+getutline_r                                       /lib/x86_64-linux-gnu/libc.so.6
+getutline_r@@GLIBC_2.2.5                          /lib/x86_64-linux-gnu/libc.so.6
+getutline_r@GLIBC_2.2.5                           /lib/x86_64-linux-gnu/libc.so.6
+getwc                                             /lib/x86_64-linux-gnu/libc.so.6
+getwc@@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libc.so.6
+getwc@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libc.so.6
+getwc_unlocked                                    /lib/x86_64-linux-gnu/libc.so.6
+getwc_unlocked@@GLIBC_2.2.5                       /lib/x86_64-linux-gnu/libc.so.6
+getwc_unlocked@GLIBC_2.2.5                        /lib/x86_64-linux-gnu/libc.so.6
+glob_pattern_p                                    /lib/x86_64-linux-gnu/libc.so.6
+glob_pattern_p@@GLIBC_2.2.5                       /lib/x86_64-linux-gnu/libc.so.6
+glob_pattern_p@GLIBC_2.2.5                        /lib/x86_64-linux-gnu/libc.so.6
+globfree64                                        /lib/x86_64-linux-gnu/libc.so.6
+globfree64@@GLIBC_2.2.5                           /lib/x86_64-linux-gnu/libc.so.6
+globfree64@GLIBC_2.2.5                            /lib/x86_64-linux-gnu/libc.so.6
+gmtime_r                                          /lib/x86_64-linux-gnu/libc.so.6
+gmtime_r@@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+gmtime_r@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+gnu_dev_major                                     /lib/x86_64-linux-gnu/libc.so.6
+gnu_dev_major@@GLIBC_2.3.3                        /lib/x86_64-linux-gnu/libc.so.6
+gnu_dev_major@GLIBC_2.3.3                         /lib/x86_64-linux-gnu/libc.so.6
+gnu_dev_makedev                                   /lib/x86_64-linux-gnu/libc.so.6
+gnu_dev_makedev@@GLIBC_2.3.3                      /lib/x86_64-linux-gnu/libc.so.6
+gnu_dev_makedev@GLIBC_2.3.3                       /lib/x86_64-linux-gnu/libc.so.6
+gnu_dev_minor                                     /lib/x86_64-linux-gnu/libc.so.6
+gnu_dev_minor@@GLIBC_2.3.3                        /lib/x86_64-linux-gnu/libc.so.6
+gnu_dev_minor@GLIBC_2.3.3                         /lib/x86_64-linux-gnu/libc.so.6
+gnu_get_libc_release                              /lib/x86_64-linux-gnu/libc.so.6
+gnu_get_libc_release@@GLIBC_2.2.5                 /lib/x86_64-linux-gnu/libc.so.6
+gnu_get_libc_release@GLIBC_2.2.5                  /lib/x86_64-linux-gnu/libc.so.6
+gnu_get_libc_version                              /lib/x86_64-linux-gnu/libc.so.6
+gnu_get_libc_version@@GLIBC_2.2.5                 /lib/x86_64-linux-gnu/libc.so.6
+gnu_get_libc_version@GLIBC_2.2.5                  /lib/x86_64-linux-gnu/libc.so.6
+group_member                                      /lib/x86_64-linux-gnu/libc.so.6
+group_member@@GLIBC_2.2.5                         /lib/x86_64-linux-gnu/libc.so.6
+group_member@GLIBC_2.2.5                          /lib/x86_64-linux-gnu/libc.so.6
+gsignal                                           /lib/x86_64-linux-gnu/libc.so.6
+gsignal@@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+gsignal@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+hasmntopt                                         /lib/x86_64-linux-gnu/libc.so.6
+hasmntopt@@GLIBC_2.2.5                            /lib/x86_64-linux-gnu/libc.so.6
+hasmntopt@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+hcreate_r                                         /lib/x86_64-linux-gnu/libc.so.6
+hcreate_r@@GLIBC_2.2.5                            /lib/x86_64-linux-gnu/libc.so.6
+hcreate_r@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+hdestroy                                          /lib/x86_64-linux-gnu/libc.so.6
+hdestroy@@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+hdestroy@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+hdestroy_r                                        /lib/x86_64-linux-gnu/libc.so.6
+hdestroy_r@@GLIBC_2.2.5                           /lib/x86_64-linux-gnu/libc.so.6
+hdestroy_r@GLIBC_2.2.5                            /lib/x86_64-linux-gnu/libc.so.6
+heap_size                                         build/main.o
+hsearch_r                                         /lib/x86_64-linux-gnu/libc.so.6
+hsearch_r@@GLIBC_2.2.5                            /lib/x86_64-linux-gnu/libc.so.6
+hsearch_r@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+hypot                                             /lib/x86_64-linux-gnu/libm.so.6
+hypot@@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+hypot@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libm.so.6
+hypotf                                            /lib/x86_64-linux-gnu/libm.so.6
+hypotf128                                         /lib/x86_64-linux-gnu/libm.so.6
+hypotf128@@GLIBC_2.26                             /lib/x86_64-linux-gnu/libm.so.6
+hypotf128@GLIBC_2.26                              /lib/x86_64-linux-gnu/libm.so.6
+hypotf32                                          /lib/x86_64-linux-gnu/libm.so.6
+hypotf32@@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+hypotf32@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+hypotf32x                                         /lib/x86_64-linux-gnu/libm.so.6
+hypotf32x@@GLIBC_2.27                             /lib/x86_64-linux-gnu/libm.so.6
+hypotf32x@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+hypotf64                                          /lib/x86_64-linux-gnu/libm.so.6
+hypotf64@@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+hypotf64@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+hypotf64x                                         /lib/x86_64-linux-gnu/libm.so.6
+hypotf64x@@GLIBC_2.27                             /lib/x86_64-linux-gnu/libm.so.6
+hypotf64x@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+hypotf@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libm.so.6
+hypotf@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+hypotl                                            /lib/x86_64-linux-gnu/libm.so.6
+hypotl@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libm.so.6
+hypotl@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+if_freenameindex                                  /lib/x86_64-linux-gnu/libc.so.6
+if_freenameindex@@GLIBC_2.2.5                     /lib/x86_64-linux-gnu/libc.so.6
+if_freenameindex@GLIBC_2.2.5                      /lib/x86_64-linux-gnu/libc.so.6
+if_indextoname                                    /lib/x86_64-linux-gnu/libc.so.6
+if_indextoname@@GLIBC_2.2.5                       /lib/x86_64-linux-gnu/libc.so.6
+if_indextoname@GLIBC_2.2.5                        /lib/x86_64-linux-gnu/libc.so.6
+if_nameindex                                      /lib/x86_64-linux-gnu/libc.so.6
+if_nameindex@@GLIBC_2.2.5                         /lib/x86_64-linux-gnu/libc.so.6
+if_nameindex@GLIBC_2.2.5                          /lib/x86_64-linux-gnu/libc.so.6
+if_nametoindex                                    /lib/x86_64-linux-gnu/libc.so.6
+if_nametoindex@@GLIBC_2.2.5                       /lib/x86_64-linux-gnu/libc.so.6
+if_nametoindex@GLIBC_2.2.5                        /lib/x86_64-linux-gnu/libc.so.6
+ilogb                                             /lib/x86_64-linux-gnu/libm.so.6
+ilogb@@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+ilogb@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libm.so.6
+ilogbf                                            /lib/x86_64-linux-gnu/libm.so.6
+ilogbf128                                         /lib/x86_64-linux-gnu/libm.so.6
+ilogbf128@@GLIBC_2.26                             /lib/x86_64-linux-gnu/libm.so.6
+ilogbf128@GLIBC_2.26                              /lib/x86_64-linux-gnu/libm.so.6
+ilogbf32                                          /lib/x86_64-linux-gnu/libm.so.6
+ilogbf32@@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+ilogbf32@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+ilogbf32x                                         /lib/x86_64-linux-gnu/libm.so.6
+ilogbf32x@@GLIBC_2.27                             /lib/x86_64-linux-gnu/libm.so.6
+ilogbf32x@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+ilogbf64                                          /lib/x86_64-linux-gnu/libm.so.6
+ilogbf64@@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+ilogbf64@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+ilogbf64x                                         /lib/x86_64-linux-gnu/libm.so.6
+ilogbf64x@@GLIBC_2.27                             /lib/x86_64-linux-gnu/libm.so.6
+ilogbf64x@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+ilogbf@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libm.so.6
+ilogbf@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+ilogbl                                            /lib/x86_64-linux-gnu/libm.so.6
+ilogbl@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libm.so.6
+ilogbl@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+imaxabs                                           /lib/x86_64-linux-gnu/libc.so.6
+imaxabs@@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+imaxabs@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+imaxdiv                                           /lib/x86_64-linux-gnu/libc.so.6
+imaxdiv@@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+imaxdiv@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+in6addr_any                                       /lib/x86_64-linux-gnu/libc.so.6
+in6addr_any@@GLIBC_2.2.5                          /lib/x86_64-linux-gnu/libc.so.6
+in6addr_any@GLIBC_2.2.5                           /lib/x86_64-linux-gnu/libc.so.6
+in6addr_loopback                                  /lib/x86_64-linux-gnu/libc.so.6
+in6addr_loopback@@GLIBC_2.2.5                     /lib/x86_64-linux-gnu/libc.so.6
+in6addr_loopback@GLIBC_2.2.5                      /lib/x86_64-linux-gnu/libc.so.6
+index                                             /lib/x86_64-linux-gnu/libc.so.6
+index@@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libc.so.6
+index@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libc.so.6
+inet_addr                                         /lib/x86_64-linux-gnu/libc.so.6
+inet_addr@@GLIBC_2.2.5                            /lib/x86_64-linux-gnu/libc.so.6
+inet_addr@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+inet_aton                                         /lib/x86_64-linux-gnu/libc.so.6
+inet_aton@@GLIBC_2.2.5                            /lib/x86_64-linux-gnu/libc.so.6
+inet_aton@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+inet_makeaddr                                     /lib/x86_64-linux-gnu/libc.so.6
+inet_makeaddr@@GLIBC_2.2.5                        /lib/x86_64-linux-gnu/libc.so.6
+inet_makeaddr@GLIBC_2.2.5                         /lib/x86_64-linux-gnu/libc.so.6
+inet_pton                                         /lib/x86_64-linux-gnu/libc.so.6
+inet_pton@@GLIBC_2.2.5                            /lib/x86_64-linux-gnu/libc.so.6
+inet_pton@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+initstate                                         /lib/x86_64-linux-gnu/libc.so.6
+initstate@@GLIBC_2.2.5                            /lib/x86_64-linux-gnu/libc.so.6
+initstate@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+initstate_r                                       /lib/x86_64-linux-gnu/libc.so.6
+initstate_r@@GLIBC_2.2.5                          /lib/x86_64-linux-gnu/libc.so.6
+initstate_r@GLIBC_2.2.5                           /lib/x86_64-linux-gnu/libc.so.6
+ioctl                                             /lib/x86_64-linux-gnu/libc.so.6
+ioctl@@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libc.so.6
+ioctl@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libc.so.6
+isalnum_l                                         /lib/x86_64-linux-gnu/libc.so.6
+isalnum_l@@GLIBC_2.3                              /lib/x86_64-linux-gnu/libc.so.6
+isalnum_l@GLIBC_2.3                               /lib/x86_64-linux-gnu/libc.so.6
+isalpha_l                                         /lib/x86_64-linux-gnu/libc.so.6
+isalpha_l@@GLIBC_2.3                              /lib/x86_64-linux-gnu/libc.so.6
+isalpha_l@GLIBC_2.3                               /lib/x86_64-linux-gnu/libc.so.6
+isatty                                            /lib/x86_64-linux-gnu/libc.so.6
+isatty@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+isatty@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libc.so.6
+isblank_l                                         /lib/x86_64-linux-gnu/libc.so.6
+isblank_l@@GLIBC_2.3                              /lib/x86_64-linux-gnu/libc.so.6
+isblank_l@GLIBC_2.3                               /lib/x86_64-linux-gnu/libc.so.6
+iscntrl_l                                         /lib/x86_64-linux-gnu/libc.so.6
+iscntrl_l@@GLIBC_2.3                              /lib/x86_64-linux-gnu/libc.so.6
+iscntrl_l@GLIBC_2.3                               /lib/x86_64-linux-gnu/libc.so.6
+isctype                                           /lib/x86_64-linux-gnu/libc.so.6
+isctype@@GLIBC_2.3                                /lib/x86_64-linux-gnu/libc.so.6
+isctype@GLIBC_2.3                                 /lib/x86_64-linux-gnu/libc.so.6
+isdigit_l                                         /lib/x86_64-linux-gnu/libc.so.6
+isdigit_l@@GLIBC_2.3                              /lib/x86_64-linux-gnu/libc.so.6
+isdigit_l@GLIBC_2.3                               /lib/x86_64-linux-gnu/libc.so.6
+isgraph_l                                         /lib/x86_64-linux-gnu/libc.so.6
+isgraph_l@@GLIBC_2.3                              /lib/x86_64-linux-gnu/libc.so.6
+isgraph_l@GLIBC_2.3                               /lib/x86_64-linux-gnu/libc.so.6
+isinf                                             /lib/x86_64-linux-gnu/libc.so.6
+isinf@@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libc.so.6
+isinf@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libc.so.6
+isinff                                            /lib/x86_64-linux-gnu/libc.so.6
+isinff@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+isinff@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libc.so.6
+isinfl                                            /lib/x86_64-linux-gnu/libc.so.6
+isinfl@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+isinfl@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libc.so.6
+islower_l                                         /lib/x86_64-linux-gnu/libc.so.6
+islower_l@@GLIBC_2.3                              /lib/x86_64-linux-gnu/libc.so.6
+islower_l@GLIBC_2.3                               /lib/x86_64-linux-gnu/libc.so.6
+isnan                                             /lib/x86_64-linux-gnu/libc.so.6
+isnan@@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libc.so.6
+isnan@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libc.so.6
+isnanf                                            /lib/x86_64-linux-gnu/libc.so.6
+isnanf@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+isnanf@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libc.so.6
+isnanl                                            /lib/x86_64-linux-gnu/libc.so.6
+isnanl@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+isnanl@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libc.so.6
+isprint_l                                         /lib/x86_64-linux-gnu/libc.so.6
+isprint_l@@GLIBC_2.3                              /lib/x86_64-linux-gnu/libc.so.6
+isprint_l@GLIBC_2.3                               /lib/x86_64-linux-gnu/libc.so.6
+ispunct_l                                         /lib/x86_64-linux-gnu/libc.so.6
+ispunct_l@@GLIBC_2.3                              /lib/x86_64-linux-gnu/libc.so.6
+ispunct_l@GLIBC_2.3                               /lib/x86_64-linux-gnu/libc.so.6
+isspace_l                                         /lib/x86_64-linux-gnu/libc.so.6
+isspace_l@@GLIBC_2.3                              /lib/x86_64-linux-gnu/libc.so.6
+isspace_l@GLIBC_2.3                               /lib/x86_64-linux-gnu/libc.so.6
+isupper_l                                         /lib/x86_64-linux-gnu/libc.so.6
+isupper_l@@GLIBC_2.3                              /lib/x86_64-linux-gnu/libc.so.6
+isupper_l@GLIBC_2.3                               /lib/x86_64-linux-gnu/libc.so.6
+iswalnum                                          /lib/x86_64-linux-gnu/libc.so.6
+iswalnum@@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+iswalnum@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+iswalnum_l                                        /lib/x86_64-linux-gnu/libc.so.6
+iswalnum_l@@GLIBC_2.3                             /lib/x86_64-linux-gnu/libc.so.6
+iswalnum_l@GLIBC_2.3                              /lib/x86_64-linux-gnu/libc.so.6
+iswalpha                                          /lib/x86_64-linux-gnu/libc.so.6
+iswalpha@@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+iswalpha@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+iswalpha_l                                        /lib/x86_64-linux-gnu/libc.so.6
+iswalpha_l@@GLIBC_2.3                             /lib/x86_64-linux-gnu/libc.so.6
+iswalpha_l@GLIBC_2.3                              /lib/x86_64-linux-gnu/libc.so.6
+iswblank                                          /lib/x86_64-linux-gnu/libc.so.6
+iswblank@@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+iswblank@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+iswblank_l                                        /lib/x86_64-linux-gnu/libc.so.6
+iswblank_l@@GLIBC_2.3                             /lib/x86_64-linux-gnu/libc.so.6
+iswblank_l@GLIBC_2.3                              /lib/x86_64-linux-gnu/libc.so.6
+iswcntrl                                          /lib/x86_64-linux-gnu/libc.so.6
+iswcntrl@@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+iswcntrl@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+iswcntrl_l                                        /lib/x86_64-linux-gnu/libc.so.6
+iswcntrl_l@@GLIBC_2.3                             /lib/x86_64-linux-gnu/libc.so.6
+iswcntrl_l@GLIBC_2.3                              /lib/x86_64-linux-gnu/libc.so.6
+iswctype                                          /lib/x86_64-linux-gnu/libc.so.6
+iswctype@@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+iswctype@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+iswctype_l                                        /lib/x86_64-linux-gnu/libc.so.6
+iswctype_l@@GLIBC_2.3                             /lib/x86_64-linux-gnu/libc.so.6
+iswctype_l@GLIBC_2.3                              /lib/x86_64-linux-gnu/libc.so.6
+iswdigit                                          /lib/x86_64-linux-gnu/libc.so.6
+iswdigit@@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+iswdigit@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+iswdigit_l                                        /lib/x86_64-linux-gnu/libc.so.6
+iswdigit_l@@GLIBC_2.3                             /lib/x86_64-linux-gnu/libc.so.6
+iswdigit_l@GLIBC_2.3                              /lib/x86_64-linux-gnu/libc.so.6
+iswgraph                                          /lib/x86_64-linux-gnu/libc.so.6
+iswgraph@@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+iswgraph@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+iswgraph_l                                        /lib/x86_64-linux-gnu/libc.so.6
+iswgraph_l@@GLIBC_2.3                             /lib/x86_64-linux-gnu/libc.so.6
+iswgraph_l@GLIBC_2.3                              /lib/x86_64-linux-gnu/libc.so.6
+iswlower                                          /lib/x86_64-linux-gnu/libc.so.6
+iswlower@@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+iswlower@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+iswlower_l                                        /lib/x86_64-linux-gnu/libc.so.6
+iswlower_l@@GLIBC_2.3                             /lib/x86_64-linux-gnu/libc.so.6
+iswlower_l@GLIBC_2.3                              /lib/x86_64-linux-gnu/libc.so.6
+iswprint                                          /lib/x86_64-linux-gnu/libc.so.6
+iswprint@@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+iswprint@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+iswprint_l                                        /lib/x86_64-linux-gnu/libc.so.6
+iswprint_l@@GLIBC_2.3                             /lib/x86_64-linux-gnu/libc.so.6
+iswprint_l@GLIBC_2.3                              /lib/x86_64-linux-gnu/libc.so.6
+iswpunct                                          /lib/x86_64-linux-gnu/libc.so.6
+iswpunct@@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+iswpunct@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+iswpunct_l                                        /lib/x86_64-linux-gnu/libc.so.6
+iswpunct_l@@GLIBC_2.3                             /lib/x86_64-linux-gnu/libc.so.6
+iswpunct_l@GLIBC_2.3                              /lib/x86_64-linux-gnu/libc.so.6
+iswspace                                          /lib/x86_64-linux-gnu/libc.so.6
+iswspace@@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+iswspace@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+iswspace_l                                        /lib/x86_64-linux-gnu/libc.so.6
+iswspace_l@@GLIBC_2.3                             /lib/x86_64-linux-gnu/libc.so.6
+iswspace_l@GLIBC_2.3                              /lib/x86_64-linux-gnu/libc.so.6
+iswupper                                          /lib/x86_64-linux-gnu/libc.so.6
+iswupper@@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+iswupper@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+iswupper_l                                        /lib/x86_64-linux-gnu/libc.so.6
+iswupper_l@@GLIBC_2.3                             /lib/x86_64-linux-gnu/libc.so.6
+iswupper_l@GLIBC_2.3                              /lib/x86_64-linux-gnu/libc.so.6
+iswxdigit                                         /lib/x86_64-linux-gnu/libc.so.6
+iswxdigit@@GLIBC_2.2.5                            /lib/x86_64-linux-gnu/libc.so.6
+iswxdigit@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+iswxdigit_l                                       /lib/x86_64-linux-gnu/libc.so.6
+iswxdigit_l@@GLIBC_2.3                            /lib/x86_64-linux-gnu/libc.so.6
+iswxdigit_l@GLIBC_2.3                             /lib/x86_64-linux-gnu/libc.so.6
+isxdigit_l                                        /lib/x86_64-linux-gnu/libc.so.6
+isxdigit_l@@GLIBC_2.3                             /lib/x86_64-linux-gnu/libc.so.6
+isxdigit_l@GLIBC_2.3                              /lib/x86_64-linux-gnu/libc.so.6
+j0                                                /lib/x86_64-linux-gnu/libm.so.6
+j0@@GLIBC_2.2.5                                   /lib/x86_64-linux-gnu/libm.so.6
+j0@GLIBC_2.2.5                                    /lib/x86_64-linux-gnu/libm.so.6
+j0f                                               /lib/x86_64-linux-gnu/libm.so.6
+j0f128                                            /lib/x86_64-linux-gnu/libm.so.6
+j0f128@@GLIBC_2.26                                /lib/x86_64-linux-gnu/libm.so.6
+j0f128@GLIBC_2.26                                 /lib/x86_64-linux-gnu/libm.so.6
+j0f32                                             /lib/x86_64-linux-gnu/libm.so.6
+j0f32@@GLIBC_2.27                                 /lib/x86_64-linux-gnu/libm.so.6
+j0f32@GLIBC_2.27                                  /lib/x86_64-linux-gnu/libm.so.6
+j0f32x                                            /lib/x86_64-linux-gnu/libm.so.6
+j0f32x@@GLIBC_2.27                                /lib/x86_64-linux-gnu/libm.so.6
+j0f32x@GLIBC_2.27                                 /lib/x86_64-linux-gnu/libm.so.6
+j0f64                                             /lib/x86_64-linux-gnu/libm.so.6
+j0f64@@GLIBC_2.27                                 /lib/x86_64-linux-gnu/libm.so.6
+j0f64@GLIBC_2.27                                  /lib/x86_64-linux-gnu/libm.so.6
+j0f64x                                            /lib/x86_64-linux-gnu/libm.so.6
+j0f64x@@GLIBC_2.27                                /lib/x86_64-linux-gnu/libm.so.6
+j0f64x@GLIBC_2.27                                 /lib/x86_64-linux-gnu/libm.so.6
+j0f@@GLIBC_2.2.5                                  /lib/x86_64-linux-gnu/libm.so.6
+j0f@GLIBC_2.2.5                                   /lib/x86_64-linux-gnu/libm.so.6
+j0l                                               /lib/x86_64-linux-gnu/libm.so.6
+j0l@@GLIBC_2.2.5                                  /lib/x86_64-linux-gnu/libm.so.6
+j0l@GLIBC_2.2.5                                   /lib/x86_64-linux-gnu/libm.so.6
+j1                                                /lib/x86_64-linux-gnu/libm.so.6
+j1@@GLIBC_2.2.5                                   /lib/x86_64-linux-gnu/libm.so.6
+j1@GLIBC_2.2.5                                    /lib/x86_64-linux-gnu/libm.so.6
+j1f                                               /lib/x86_64-linux-gnu/libm.so.6
+j1f128                                            /lib/x86_64-linux-gnu/libm.so.6
+j1f128@@GLIBC_2.26                                /lib/x86_64-linux-gnu/libm.so.6
+j1f128@GLIBC_2.26                                 /lib/x86_64-linux-gnu/libm.so.6
+j1f32                                             /lib/x86_64-linux-gnu/libm.so.6
+j1f32@@GLIBC_2.27                                 /lib/x86_64-linux-gnu/libm.so.6
+j1f32@GLIBC_2.27                                  /lib/x86_64-linux-gnu/libm.so.6
+j1f32x                                            /lib/x86_64-linux-gnu/libm.so.6
+j1f32x@@GLIBC_2.27                                /lib/x86_64-linux-gnu/libm.so.6
+j1f32x@GLIBC_2.27                                 /lib/x86_64-linux-gnu/libm.so.6
+j1f64                                             /lib/x86_64-linux-gnu/libm.so.6
+j1f64@@GLIBC_2.27                                 /lib/x86_64-linux-gnu/libm.so.6
+j1f64@GLIBC_2.27                                  /lib/x86_64-linux-gnu/libm.so.6
+j1f64x                                            /lib/x86_64-linux-gnu/libm.so.6
+j1f64x@@GLIBC_2.27                                /lib/x86_64-linux-gnu/libm.so.6
+j1f64x@GLIBC_2.27                                 /lib/x86_64-linux-gnu/libm.so.6
+j1f@@GLIBC_2.2.5                                  /lib/x86_64-linux-gnu/libm.so.6
+j1f@GLIBC_2.2.5                                   /lib/x86_64-linux-gnu/libm.so.6
+j1l                                               /lib/x86_64-linux-gnu/libm.so.6
+j1l@@GLIBC_2.2.5                                  /lib/x86_64-linux-gnu/libm.so.6
+j1l@GLIBC_2.2.5                                   /lib/x86_64-linux-gnu/libm.so.6
+jn                                                /lib/x86_64-linux-gnu/libm.so.6
+jn@@GLIBC_2.2.5                                   /lib/x86_64-linux-gnu/libm.so.6
+jn@GLIBC_2.2.5                                    /lib/x86_64-linux-gnu/libm.so.6
+jnf                                               /lib/x86_64-linux-gnu/libm.so.6
+jnf128                                            /lib/x86_64-linux-gnu/libm.so.6
+jnf128@@GLIBC_2.26                                /lib/x86_64-linux-gnu/libm.so.6
+jnf128@GLIBC_2.26                                 /lib/x86_64-linux-gnu/libm.so.6
+jnf32                                             /lib/x86_64-linux-gnu/libm.so.6
+jnf32@@GLIBC_2.27                                 /lib/x86_64-linux-gnu/libm.so.6
+jnf32@GLIBC_2.27                                  /lib/x86_64-linux-gnu/libm.so.6
+jnf32x                                            /lib/x86_64-linux-gnu/libm.so.6
+jnf32x@@GLIBC_2.27                                /lib/x86_64-linux-gnu/libm.so.6
+jnf32x@GLIBC_2.27                                 /lib/x86_64-linux-gnu/libm.so.6
+jnf64                                             /lib/x86_64-linux-gnu/libm.so.6
+jnf64@@GLIBC_2.27                                 /lib/x86_64-linux-gnu/libm.so.6
+jnf64@GLIBC_2.27                                  /lib/x86_64-linux-gnu/libm.so.6
+jnf64x                                            /lib/x86_64-linux-gnu/libm.so.6
+jnf64x@@GLIBC_2.27                                /lib/x86_64-linux-gnu/libm.so.6
+jnf64x@GLIBC_2.27                                 /lib/x86_64-linux-gnu/libm.so.6
+jnf@@GLIBC_2.2.5                                  /lib/x86_64-linux-gnu/libm.so.6
+jnf@GLIBC_2.2.5                                   /lib/x86_64-linux-gnu/libm.so.6
+jnl                                               /lib/x86_64-linux-gnu/libm.so.6
+jnl@@GLIBC_2.2.5                                  /lib/x86_64-linux-gnu/libm.so.6
+jnl@GLIBC_2.2.5                                   /lib/x86_64-linux-gnu/libm.so.6
+jrand48_r                                         /lib/x86_64-linux-gnu/libc.so.6
+jrand48_r@@GLIBC_2.2.5                            /lib/x86_64-linux-gnu/libc.so.6
+jrand48_r@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+kill                                              /lib/x86_64-linux-gnu/libc.so.6
+kill@@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libc.so.6
+kill@GLIBC_2.2.5                                  /lib/x86_64-linux-gnu/libc.so.6
+lchown                                            /lib/x86_64-linux-gnu/libc.so.6
+lchown@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+lchown@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libc.so.6
+lckpwdf                                           /lib/x86_64-linux-gnu/libc.so.6
+lckpwdf@@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+lckpwdf@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+lcong48_r                                         /lib/x86_64-linux-gnu/libc.so.6
+lcong48_r@@GLIBC_2.2.5                            /lib/x86_64-linux-gnu/libc.so.6
+lcong48_r@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+ldexp                                             /lib/x86_64-linux-gnu/libm.so.6
+ldexp@@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+                                                  /lib/x86_64-linux-gnu/libc.so.6
+ldexp@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libm.so.6
+ldexpf                                            /lib/x86_64-linux-gnu/libm.so.6
+ldexpf128                                         /lib/x86_64-linux-gnu/libm.so.6
+ldexpf128@@GLIBC_2.26                             /lib/x86_64-linux-gnu/libm.so.6
+ldexpf128@GLIBC_2.26                              /lib/x86_64-linux-gnu/libm.so.6
+ldexpf32                                          /lib/x86_64-linux-gnu/libm.so.6
+ldexpf32@@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+ldexpf32@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+ldexpf32x                                         /lib/x86_64-linux-gnu/libm.so.6
+ldexpf32x@@GLIBC_2.27                             /lib/x86_64-linux-gnu/libm.so.6
+ldexpf32x@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+ldexpf64                                          /lib/x86_64-linux-gnu/libm.so.6
+ldexpf64@@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+ldexpf64@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+ldexpf64x                                         /lib/x86_64-linux-gnu/libm.so.6
+ldexpf64x@@GLIBC_2.27                             /lib/x86_64-linux-gnu/libm.so.6
+ldexpf64x@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+ldexpf@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libm.so.6
+                                                  /lib/x86_64-linux-gnu/libc.so.6
+ldexpf@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+ldexpl                                            /lib/x86_64-linux-gnu/libm.so.6
+ldexpl@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libm.so.6
+                                                  /lib/x86_64-linux-gnu/libc.so.6
+ldexpl@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+lgamma_r                                          /lib/x86_64-linux-gnu/libm.so.6
+lgamma_r@@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libm.so.6
+lgamma_r@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libm.so.6
+lgammaf128                                        /lib/x86_64-linux-gnu/libm.so.6
+lgammaf128@@GLIBC_2.26                            /lib/x86_64-linux-gnu/libm.so.6
+lgammaf128@GLIBC_2.26                             /lib/x86_64-linux-gnu/libm.so.6
+lgammaf128_r                                      /lib/x86_64-linux-gnu/libm.so.6
+lgammaf128_r@@GLIBC_2.26                          /lib/x86_64-linux-gnu/libm.so.6
+lgammaf128_r@GLIBC_2.26                           /lib/x86_64-linux-gnu/libm.so.6
+lgammaf32                                         /lib/x86_64-linux-gnu/libm.so.6
+lgammaf32@@GLIBC_2.27                             /lib/x86_64-linux-gnu/libm.so.6
+lgammaf32@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+lgammaf32_r                                       /lib/x86_64-linux-gnu/libm.so.6
+lgammaf32_r@@GLIBC_2.27                           /lib/x86_64-linux-gnu/libm.so.6
+lgammaf32_r@GLIBC_2.27                            /lib/x86_64-linux-gnu/libm.so.6
+lgammaf32x                                        /lib/x86_64-linux-gnu/libm.so.6
+lgammaf32x@@GLIBC_2.27                            /lib/x86_64-linux-gnu/libm.so.6
+lgammaf32x@GLIBC_2.27                             /lib/x86_64-linux-gnu/libm.so.6
+lgammaf32x_r                                      /lib/x86_64-linux-gnu/libm.so.6
+lgammaf32x_r@@GLIBC_2.27                          /lib/x86_64-linux-gnu/libm.so.6
+lgammaf32x_r@GLIBC_2.27                           /lib/x86_64-linux-gnu/libm.so.6
+lgammaf64                                         /lib/x86_64-linux-gnu/libm.so.6
+lgammaf64@@GLIBC_2.27                             /lib/x86_64-linux-gnu/libm.so.6
+lgammaf64@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+lgammaf64_r                                       /lib/x86_64-linux-gnu/libm.so.6
+lgammaf64_r@@GLIBC_2.27                           /lib/x86_64-linux-gnu/libm.so.6
+lgammaf64_r@GLIBC_2.27                            /lib/x86_64-linux-gnu/libm.so.6
+lgammaf64x                                        /lib/x86_64-linux-gnu/libm.so.6
+lgammaf64x@@GLIBC_2.27                            /lib/x86_64-linux-gnu/libm.so.6
+lgammaf64x@GLIBC_2.27                             /lib/x86_64-linux-gnu/libm.so.6
+lgammaf64x_r                                      /lib/x86_64-linux-gnu/libm.so.6
+lgammaf64x_r@@GLIBC_2.27                          /lib/x86_64-linux-gnu/libm.so.6
+lgammaf64x_r@GLIBC_2.27                           /lib/x86_64-linux-gnu/libm.so.6
+lgammaf_r                                         /lib/x86_64-linux-gnu/libm.so.6
+lgammaf_r@@GLIBC_2.2.5                            /lib/x86_64-linux-gnu/libm.so.6
+lgammaf_r@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libm.so.6
+lgammal_r                                         /lib/x86_64-linux-gnu/libm.so.6
+lgammal_r@@GLIBC_2.2.5                            /lib/x86_64-linux-gnu/libm.so.6
+lgammal_r@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libm.so.6
+link                                              /lib/x86_64-linux-gnu/libc.so.6
+link@@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libc.so.6
+link@GLIBC_2.2.5                                  /lib/x86_64-linux-gnu/libc.so.6
+listen                                            /lib/x86_64-linux-gnu/libc.so.6
+listen@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+listen@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libc.so.6
+llogb                                             /lib/x86_64-linux-gnu/libm.so.6
+llogb@@GLIBC_2.25                                 /lib/x86_64-linux-gnu/libm.so.6
+llogb@GLIBC_2.25                                  /lib/x86_64-linux-gnu/libm.so.6
+llogbf                                            /lib/x86_64-linux-gnu/libm.so.6
+llogbf128                                         /lib/x86_64-linux-gnu/libm.so.6
+llogbf128@@GLIBC_2.26                             /lib/x86_64-linux-gnu/libm.so.6
+llogbf128@GLIBC_2.26                              /lib/x86_64-linux-gnu/libm.so.6
+llogbf32                                          /lib/x86_64-linux-gnu/libm.so.6
+llogbf32@@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+llogbf32@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+llogbf32x                                         /lib/x86_64-linux-gnu/libm.so.6
+llogbf32x@@GLIBC_2.27                             /lib/x86_64-linux-gnu/libm.so.6
+llogbf32x@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+llogbf64                                          /lib/x86_64-linux-gnu/libm.so.6
+llogbf64@@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+llogbf64@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+llogbf64x                                         /lib/x86_64-linux-gnu/libm.so.6
+llogbf64x@@GLIBC_2.27                             /lib/x86_64-linux-gnu/libm.so.6
+llogbf64x@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+llogbf@@GLIBC_2.25                                /lib/x86_64-linux-gnu/libm.so.6
+llogbf@GLIBC_2.25                                 /lib/x86_64-linux-gnu/libm.so.6
+llogbl                                            /lib/x86_64-linux-gnu/libm.so.6
+llogbl@@GLIBC_2.25                                /lib/x86_64-linux-gnu/libm.so.6
+llogbl@GLIBC_2.25                                 /lib/x86_64-linux-gnu/libm.so.6
+llrint                                            /lib/x86_64-linux-gnu/libm.so.6
+llrint@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libm.so.6
+llrint@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+llrintf                                           /lib/x86_64-linux-gnu/libm.so.6
+llrintf128                                        /lib/x86_64-linux-gnu/libm.so.6
+llrintf128@@GLIBC_2.26                            /lib/x86_64-linux-gnu/libm.so.6
+llrintf128@GLIBC_2.26                             /lib/x86_64-linux-gnu/libm.so.6
+llrintf32                                         /lib/x86_64-linux-gnu/libm.so.6
+llrintf32@@GLIBC_2.27                             /lib/x86_64-linux-gnu/libm.so.6
+llrintf32@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+llrintf32x                                        /lib/x86_64-linux-gnu/libm.so.6
+llrintf32x@@GLIBC_2.27                            /lib/x86_64-linux-gnu/libm.so.6
+llrintf32x@GLIBC_2.27                             /lib/x86_64-linux-gnu/libm.so.6
+llrintf64                                         /lib/x86_64-linux-gnu/libm.so.6
+llrintf64@@GLIBC_2.27                             /lib/x86_64-linux-gnu/libm.so.6
+llrintf64@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+llrintf64x                                        /lib/x86_64-linux-gnu/libm.so.6
+llrintf64x@@GLIBC_2.27                            /lib/x86_64-linux-gnu/libm.so.6
+llrintf64x@GLIBC_2.27                             /lib/x86_64-linux-gnu/libm.so.6
+llrintf@@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libm.so.6
+llrintf@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libm.so.6
+llrintl                                           /lib/x86_64-linux-gnu/libm.so.6
+llrintl@@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libm.so.6
+llrintl@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libm.so.6
+llround                                           /lib/x86_64-linux-gnu/libm.so.6
+llround@@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libm.so.6
+llround@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libm.so.6
+llroundf                                          /lib/x86_64-linux-gnu/libm.so.6
+llroundf128                                       /lib/x86_64-linux-gnu/libm.so.6
+llroundf128@@GLIBC_2.26                           /lib/x86_64-linux-gnu/libm.so.6
+llroundf128@GLIBC_2.26                            /lib/x86_64-linux-gnu/libm.so.6
+llroundf32                                        /lib/x86_64-linux-gnu/libm.so.6
+llroundf32@@GLIBC_2.27                            /lib/x86_64-linux-gnu/libm.so.6
+llroundf32@GLIBC_2.27                             /lib/x86_64-linux-gnu/libm.so.6
+llroundf32x                                       /lib/x86_64-linux-gnu/libm.so.6
+llroundf32x@@GLIBC_2.27                           /lib/x86_64-linux-gnu/libm.so.6
+llroundf32x@GLIBC_2.27                            /lib/x86_64-linux-gnu/libm.so.6
+llroundf64                                        /lib/x86_64-linux-gnu/libm.so.6
+llroundf64@@GLIBC_2.27                            /lib/x86_64-linux-gnu/libm.so.6
+llroundf64@GLIBC_2.27                             /lib/x86_64-linux-gnu/libm.so.6
+llroundf64x                                       /lib/x86_64-linux-gnu/libm.so.6
+llroundf64x@@GLIBC_2.27                           /lib/x86_64-linux-gnu/libm.so.6
+llroundf64x@GLIBC_2.27                            /lib/x86_64-linux-gnu/libm.so.6
+llroundf@@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libm.so.6
+llroundf@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libm.so.6
+llroundl                                          /lib/x86_64-linux-gnu/libm.so.6
+llroundl@@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libm.so.6
+llroundl@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libm.so.6
+localtime_r                                       /lib/x86_64-linux-gnu/libc.so.6
+localtime_r@@GLIBC_2.2.5                          /lib/x86_64-linux-gnu/libc.so.6
+localtime_r@GLIBC_2.2.5                           /lib/x86_64-linux-gnu/libc.so.6
+lockf64                                           /lib/x86_64-linux-gnu/libc.so.6
+lockf64@@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+lockf64@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+log                                               /lib/x86_64-linux-gnu/libm.so.6
+                                                  build/py/objcomplex.o
+log10                                             /lib/x86_64-linux-gnu/libm.so.6
+log10@@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+log10@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libm.so.6
+log10f                                            /lib/x86_64-linux-gnu/libm.so.6
+log10f128                                         /lib/x86_64-linux-gnu/libm.so.6
+log10f128@@GLIBC_2.26                             /lib/x86_64-linux-gnu/libm.so.6
+log10f128@GLIBC_2.26                              /lib/x86_64-linux-gnu/libm.so.6
+log10f32                                          /lib/x86_64-linux-gnu/libm.so.6
+log10f32@@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+log10f32@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+log10f32x                                         /lib/x86_64-linux-gnu/libm.so.6
+log10f32x@@GLIBC_2.27                             /lib/x86_64-linux-gnu/libm.so.6
+log10f32x@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+log10f64                                          /lib/x86_64-linux-gnu/libm.so.6
+log10f64@@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+log10f64@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+log10f64x                                         /lib/x86_64-linux-gnu/libm.so.6
+log10f64x@@GLIBC_2.27                             /lib/x86_64-linux-gnu/libm.so.6
+log10f64x@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+log10f@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libm.so.6
+log10f@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+log10l                                            /lib/x86_64-linux-gnu/libm.so.6
+log10l@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libm.so.6
+log10l@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+log1p                                             /lib/x86_64-linux-gnu/libm.so.6
+log1p@@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+log1p@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libm.so.6
+log1pf                                            /lib/x86_64-linux-gnu/libm.so.6
+log1pf128                                         /lib/x86_64-linux-gnu/libm.so.6
+log1pf128@@GLIBC_2.26                             /lib/x86_64-linux-gnu/libm.so.6
+log1pf128@GLIBC_2.26                              /lib/x86_64-linux-gnu/libm.so.6
+log1pf32                                          /lib/x86_64-linux-gnu/libm.so.6
+log1pf32@@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+log1pf32@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+log1pf32x                                         /lib/x86_64-linux-gnu/libm.so.6
+log1pf32x@@GLIBC_2.27                             /lib/x86_64-linux-gnu/libm.so.6
+log1pf32x@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+log1pf64                                          /lib/x86_64-linux-gnu/libm.so.6
+log1pf64@@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+log1pf64@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+log1pf64x                                         /lib/x86_64-linux-gnu/libm.so.6
+log1pf64x@@GLIBC_2.27                             /lib/x86_64-linux-gnu/libm.so.6
+log1pf64x@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+log1pf@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libm.so.6
+log1pf@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+log1pl                                            /lib/x86_64-linux-gnu/libm.so.6
+log1pl@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libm.so.6
+log1pl@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+log2f128                                          /lib/x86_64-linux-gnu/libm.so.6
+log2f128@@GLIBC_2.26                              /lib/x86_64-linux-gnu/libm.so.6
+log2f128@GLIBC_2.26                               /lib/x86_64-linux-gnu/libm.so.6
+log2f32                                           /lib/x86_64-linux-gnu/libm.so.6
+log2f32@@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+log2f32@GLIBC_2.27                                /lib/x86_64-linux-gnu/libm.so.6
+log2f32x                                          /lib/x86_64-linux-gnu/libm.so.6
+log2f32x@@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+log2f32x@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+log2f64                                           /lib/x86_64-linux-gnu/libm.so.6
+log2f64@@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+log2f64@GLIBC_2.27                                /lib/x86_64-linux-gnu/libm.so.6
+log2f64x                                          /lib/x86_64-linux-gnu/libm.so.6
+log2f64x@@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+log2f64x@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+log2l                                             /lib/x86_64-linux-gnu/libm.so.6
+log2l@@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+log2l@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libm.so.6
+log@@GLIBC_2.29                                   /lib/x86_64-linux-gnu/libm.so.6
+log@GLIBC_2.29                                    /lib/x86_64-linux-gnu/libm.so.6
+logb                                              /lib/x86_64-linux-gnu/libm.so.6
+logb@@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libm.so.6
+logb@GLIBC_2.2.5                                  /lib/x86_64-linux-gnu/libm.so.6
+logbf                                             /lib/x86_64-linux-gnu/libm.so.6
+logbf128                                          /lib/x86_64-linux-gnu/libm.so.6
+logbf128@@GLIBC_2.26                              /lib/x86_64-linux-gnu/libm.so.6
+logbf128@GLIBC_2.26                               /lib/x86_64-linux-gnu/libm.so.6
+logbf32                                           /lib/x86_64-linux-gnu/libm.so.6
+logbf32@@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+logbf32@GLIBC_2.27                                /lib/x86_64-linux-gnu/libm.so.6
+logbf32x                                          /lib/x86_64-linux-gnu/libm.so.6
+logbf32x@@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+logbf32x@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+logbf64                                           /lib/x86_64-linux-gnu/libm.so.6
+logbf64@@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+logbf64@GLIBC_2.27                                /lib/x86_64-linux-gnu/libm.so.6
+logbf64x                                          /lib/x86_64-linux-gnu/libm.so.6
+logbf64x@@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+logbf64x@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+logbf@@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+logbf@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libm.so.6
+logbl                                             /lib/x86_64-linux-gnu/libm.so.6
+logbl@@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+logbl@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libm.so.6
+logf128                                           /lib/x86_64-linux-gnu/libm.so.6
+logf128@@GLIBC_2.26                               /lib/x86_64-linux-gnu/libm.so.6
+logf128@GLIBC_2.26                                /lib/x86_64-linux-gnu/libm.so.6
+logf32                                            /lib/x86_64-linux-gnu/libm.so.6
+logf32@@GLIBC_2.27                                /lib/x86_64-linux-gnu/libm.so.6
+logf32@GLIBC_2.27                                 /lib/x86_64-linux-gnu/libm.so.6
+logf32x                                           /lib/x86_64-linux-gnu/libm.so.6
+logf32x@@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+logf32x@GLIBC_2.27                                /lib/x86_64-linux-gnu/libm.so.6
+logf64                                            /lib/x86_64-linux-gnu/libm.so.6
+logf64@@GLIBC_2.27                                /lib/x86_64-linux-gnu/libm.so.6
+logf64@GLIBC_2.27                                 /lib/x86_64-linux-gnu/libm.so.6
+logf64x                                           /lib/x86_64-linux-gnu/libm.so.6
+logf64x@@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+logf64x@GLIBC_2.27                                /lib/x86_64-linux-gnu/libm.so.6
+logl                                              /lib/x86_64-linux-gnu/libm.so.6
+logl@@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libm.so.6
+logl@GLIBC_2.2.5                                  /lib/x86_64-linux-gnu/libm.so.6
+longjmp                                           /lib/x86_64-linux-gnu/libc.so.6
+longjmp@@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+longjmp@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+lrint                                             /lib/x86_64-linux-gnu/libm.so.6
+lrint@@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+lrint@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libm.so.6
+lrintf                                            /lib/x86_64-linux-gnu/libm.so.6
+lrintf128                                         /lib/x86_64-linux-gnu/libm.so.6
+lrintf128@@GLIBC_2.26                             /lib/x86_64-linux-gnu/libm.so.6
+lrintf128@GLIBC_2.26                              /lib/x86_64-linux-gnu/libm.so.6
+lrintf32                                          /lib/x86_64-linux-gnu/libm.so.6
+lrintf32@@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+lrintf32@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+lrintf32x                                         /lib/x86_64-linux-gnu/libm.so.6
+lrintf32x@@GLIBC_2.27                             /lib/x86_64-linux-gnu/libm.so.6
+lrintf32x@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+lrintf64                                          /lib/x86_64-linux-gnu/libm.so.6
+lrintf64@@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+lrintf64@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+lrintf64x                                         /lib/x86_64-linux-gnu/libm.so.6
+lrintf64x@@GLIBC_2.27                             /lib/x86_64-linux-gnu/libm.so.6
+lrintf64x@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+lrintf@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libm.so.6
+lrintf@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+lrintl                                            /lib/x86_64-linux-gnu/libm.so.6
+lrintl@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libm.so.6
+lrintl@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+lround                                            /lib/x86_64-linux-gnu/libm.so.6
+lround@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libm.so.6
+lround@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+lroundf                                           /lib/x86_64-linux-gnu/libm.so.6
+lroundf128                                        /lib/x86_64-linux-gnu/libm.so.6
+lroundf128@@GLIBC_2.26                            /lib/x86_64-linux-gnu/libm.so.6
+lroundf128@GLIBC_2.26                             /lib/x86_64-linux-gnu/libm.so.6
+lroundf32                                         /lib/x86_64-linux-gnu/libm.so.6
+lroundf32@@GLIBC_2.27                             /lib/x86_64-linux-gnu/libm.so.6
+lroundf32@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+lroundf32x                                        /lib/x86_64-linux-gnu/libm.so.6
+lroundf32x@@GLIBC_2.27                            /lib/x86_64-linux-gnu/libm.so.6
+lroundf32x@GLIBC_2.27                             /lib/x86_64-linux-gnu/libm.so.6
+lroundf64                                         /lib/x86_64-linux-gnu/libm.so.6
+lroundf64@@GLIBC_2.27                             /lib/x86_64-linux-gnu/libm.so.6
+lroundf64@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+lroundf64x                                        /lib/x86_64-linux-gnu/libm.so.6
+lroundf64x@@GLIBC_2.27                            /lib/x86_64-linux-gnu/libm.so.6
+lroundf64x@GLIBC_2.27                             /lib/x86_64-linux-gnu/libm.so.6
+lroundf@@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libm.so.6
+lroundf@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libm.so.6
+lroundl                                           /lib/x86_64-linux-gnu/libm.so.6
+lroundl@@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libm.so.6
+lroundl@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libm.so.6
+lseek                                             /lib/x86_64-linux-gnu/libc.so.6
+lseek64                                           /lib/x86_64-linux-gnu/libc.so.6
+lseek64@@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+lseek64@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+lseek@@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libc.so.6
+lseek@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libc.so.6
+m_free                                            build/py/malloc.o
+                                                  build/py/objtype.o
+                                                  build/py/objtuple.o
+                                                  build/py/objset.o
+                                                  build/py/objmap.o
+                                                  build/py/objint.o
+                                                  build/py/objfun.o
+                                                  build/py/objclosure.o
+                                                  build/py/objboundmeth.o
+                                                  build/py/map.o
+                                                  build/py/runtime.o
+                                                  build/py/emitnxtensawin.o
+                                                  build/py/emitinlinextensa.o
+                                                  build/py/emitnxtensa.o
+                                                  build/py/emitnarm.o
+                                                  build/py/emitinlinethumb.o
+                                                  build/py/emitnthumb.o
+                                                  build/py/emitnx86.o
+                                                  build/py/emitnx64.o
+                                                  build/py/asmbase.o
+                                                  build/py/emitbc.o
+                                                  build/py/scope.o
+                                                  build/py/parse.o
+                                                  build/py/lexer.o
+                                                  build/py/reader.o
+                                                  build/py/mpz.o
+                                                  build/py/mpprint.o
+                                                  build/py/vstr.o
+m_malloc                                          build/py/malloc.o
+                                                  build/py/objzip.o
+                                                  build/py/objtype.o
+                                                  build/py/objtuple.o
+                                                  build/py/objstr.o
+                                                  build/py/objslice.o
+                                                  build/py/objset.o
+                                                  build/py/objreversed.o
+                                                  build/py/objrange.o
+                                                  build/py/objproperty.o
+                                                  build/py/objobject.o
+                                                  build/py/objmodule.o
+                                                  build/py/objmap.o
+                                                  build/py/objlist.o
+                                                  build/py/objint_mpz.o
+                                                  build/py/objint.o
+                                                  build/py/objgenerator.o
+                                                  build/py/objfun.o
+                                                  build/py/objfloat.o
+                                                  build/py/objfilter.o
+                                                  build/py/objenumerate.o
+                                                  build/py/objdict.o
+                                                  build/py/objcomplex.o
+                                                  build/py/objclosure.o
+                                                  build/py/objcell.o
+                                                  build/py/objboundmeth.o
+                                                  build/py/objarray.o
+                                                  build/py/runtime.o
+                                                  build/py/emitnxtensawin.o
+                                                  build/py/emitinlinextensa.o
+                                                  build/py/emitnxtensa.o
+                                                  build/py/emitnarm.o
+                                                  build/py/emitinlinethumb.o
+                                                  build/py/emitnthumb.o
+                                                  build/py/emitnx86.o
+                                                  build/py/emitnx64.o
+                                                  build/py/asmbase.o
+                                                  build/py/emitbc.o
+                                                  build/py/scope.o
+                                                  build/py/parse.o
+                                                  build/py/lexer.o
+                                                  build/py/reader.o
+                                                  build/py/mpz.o
+                                                  build/py/vstr.o
+m_malloc0                                         build/py/malloc.o
+                                                  build/py/objtype.o
+                                                  build/py/map.o
+                                                  build/py/emitglue.o
+                                                  build/py/emitnxtensawin.o
+                                                  build/py/emitnxtensa.o
+                                                  build/py/emitnarm.o
+                                                  build/py/emitnthumb.o
+                                                  build/py/emitnx86.o
+                                                  build/py/emitnx64.o
+                                                  build/py/emitbc.o
+                                                  build/py/scope.o
+m_malloc_fail                                     build/py/runtime.o
+                                                  build/py/qstr.o
+                                                  build/py/malloc.o
+m_malloc_maybe                                    build/py/malloc.o
+                                                  build/py/objfun.o
+                                                  build/py/objexcept.o
+                                                  build/py/objboundmeth.o
+                                                  build/py/qstr.o
+m_realloc                                         build/py/malloc.o
+                                                  build/py/objtuple.o
+                                                  build/py/objstr.o
+                                                  build/py/objlist.o
+                                                  build/py/objarray.o
+                                                  build/py/runtime.o
+                                                  build/py/emitnxtensawin.o
+                                                  build/py/emitnxtensa.o
+                                                  build/py/emitnarm.o
+                                                  build/py/emitnthumb.o
+                                                  build/py/emitnx86.o
+                                                  build/py/emitnx64.o
+                                                  build/py/scope.o
+                                                  build/py/parse.o
+                                                  build/py/lexer.o
+                                                  build/py/mpz.o
+                                                  build/py/vstr.o
+m_realloc_maybe                                   build/py/malloc.o
+                                                  build/py/objexcept.o
+                                                  build/py/parse.o
+                                                  build/py/qstr.o
+madvise                                           /lib/x86_64-linux-gnu/libc.so.6
+madvise@@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+madvise@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+main                                              build/main.o
+                                                  /usr/lib/gcc/x86_64-linux-gnu/10/../../../x86_64-linux-gnu/Scrt1.o
+main_                                             build/main.o
+makecontext                                       /lib/x86_64-linux-gnu/libc.so.6
+makecontext@@GLIBC_2.2.5                          /lib/x86_64-linux-gnu/libc.so.6
+makecontext@GLIBC_2.2.5                           /lib/x86_64-linux-gnu/libc.so.6
+mallinfo                                          /lib/x86_64-linux-gnu/libc.so.6
+mallinfo@@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+mallinfo@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+malloc                                            /lib/x86_64-linux-gnu/libc.so.6
+                                                  build/main.o
+malloc@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+                                                  /lib64/ld-linux-x86-64.so.2
+malloc@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libc.so.6
+malloc_info                                       /lib/x86_64-linux-gnu/libc.so.6
+malloc_info@@GLIBC_2.10                           /lib/x86_64-linux-gnu/libc.so.6
+malloc_info@GLIBC_2.10                            /lib/x86_64-linux-gnu/libc.so.6
+malloc_stats                                      /lib/x86_64-linux-gnu/libc.so.6
+malloc_stats@@GLIBC_2.2.5                         /lib/x86_64-linux-gnu/libc.so.6
+malloc_stats@GLIBC_2.2.5                          /lib/x86_64-linux-gnu/libc.so.6
+malloc_trim                                       /lib/x86_64-linux-gnu/libc.so.6
+malloc_trim@@GLIBC_2.2.5                          /lib/x86_64-linux-gnu/libc.so.6
+malloc_trim@GLIBC_2.2.5                           /lib/x86_64-linux-gnu/libc.so.6
+malloc_usable_size                                /lib/x86_64-linux-gnu/libc.so.6
+malloc_usable_size@@GLIBC_2.2.5                   /lib/x86_64-linux-gnu/libc.so.6
+malloc_usable_size@GLIBC_2.2.5                    /lib/x86_64-linux-gnu/libc.so.6
+mallopt                                           /lib/x86_64-linux-gnu/libc.so.6
+mallopt@@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+mallopt@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+matherr@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libm.so.6
+mbrlen                                            /lib/x86_64-linux-gnu/libc.so.6
+mbrlen@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+mbrlen@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libc.so.6
+mbrtowc                                           /lib/x86_64-linux-gnu/libc.so.6
+mbrtowc@@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+mbrtowc@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+mbsinit                                           /lib/x86_64-linux-gnu/libc.so.6
+mbsinit@@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+mbsinit@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+mbsnrtowcs                                        /lib/x86_64-linux-gnu/libc.so.6
+mbsnrtowcs@@GLIBC_2.2.5                           /lib/x86_64-linux-gnu/libc.so.6
+mbsnrtowcs@GLIBC_2.2.5                            /lib/x86_64-linux-gnu/libc.so.6
+mbsrtowcs                                         /lib/x86_64-linux-gnu/libc.so.6
+mbsrtowcs@@GLIBC_2.2.5                            /lib/x86_64-linux-gnu/libc.so.6
+mbsrtowcs@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+mcount                                            /lib/x86_64-linux-gnu/libc.so.6
+mcount@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+mcount@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libc.so.6
+memalign                                          /lib/x86_64-linux-gnu/libc.so.6
+memalign@@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+memalign@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+memccpy                                           /lib/x86_64-linux-gnu/libc.so.6
+memccpy@@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+memccpy@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+memcmp                                            /lib/x86_64-linux-gnu/libc.so.6
+                                                  build/py/sequence.o
+                                                  build/py/objstr.o
+                                                  build/py/qstr.o
+memcmp@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+memcmp@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libc.so.6
+memcpy                                            /lib/x86_64-linux-gnu/libc.so.6
+                                                  build/py/gc.o
+memcpy@@GLIBC_2.14                                /lib/x86_64-linux-gnu/libc.so.6
+memcpy@GLIBC_2.14                                 /lib/x86_64-linux-gnu/libc.so.6
+memmem                                            /lib/x86_64-linux-gnu/libc.so.6
+memmem@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+memmem@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libc.so.6
+memmove                                           /lib/x86_64-linux-gnu/libc.so.6
+                                                  build/py/objstr.o
+                                                  build/py/objlist.o
+                                                  build/py/persistentcode.o
+                                                  build/py/formatfloat.o
+                                                  build/py/vstr.o
+memmove@@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+memmove@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+                                                  /lib/x86_64-linux-gnu/libm.so.6
+mempcpy                                           /lib/x86_64-linux-gnu/libc.so.6
+mempcpy@@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+mempcpy@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+memrchr                                           /lib/x86_64-linux-gnu/libc.so.6
+memrchr@@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+memrchr@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+memset                                            /lib/x86_64-linux-gnu/libc.so.6
+                                                  build/py/gc.o
+memset@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+memset@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libc.so.6
+                                                  /lib/x86_64-linux-gnu/libm.so.6
+mkdir                                             /lib/x86_64-linux-gnu/libc.so.6
+mkdir@@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libc.so.6
+mkdir@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libc.so.6
+mkostemp64                                        /lib/x86_64-linux-gnu/libc.so.6
+mkostemp64@@GLIBC_2.7                             /lib/x86_64-linux-gnu/libc.so.6
+mkostemp64@GLIBC_2.7                              /lib/x86_64-linux-gnu/libc.so.6
+mkostemps64                                       /lib/x86_64-linux-gnu/libc.so.6
+mkostemps64@@GLIBC_2.11                           /lib/x86_64-linux-gnu/libc.so.6
+mkostemps64@GLIBC_2.11                            /lib/x86_64-linux-gnu/libc.so.6
+mkstemp64                                         /lib/x86_64-linux-gnu/libc.so.6
+mkstemp64@@GLIBC_2.2.5                            /lib/x86_64-linux-gnu/libc.so.6
+mkstemp64@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+mkstemps64                                        /lib/x86_64-linux-gnu/libc.so.6
+mkstemps64@@GLIBC_2.11                            /lib/x86_64-linux-gnu/libc.so.6
+mkstemps64@GLIBC_2.11                             /lib/x86_64-linux-gnu/libc.so.6
+mktemp                                            /lib/x86_64-linux-gnu/libc.so.6
+mktemp@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+mktemp@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libc.so.6
+mmap                                              /lib/x86_64-linux-gnu/libc.so.6
+mmap64                                            /lib/x86_64-linux-gnu/libc.so.6
+mmap64@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+mmap64@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libc.so.6
+mmap@@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libc.so.6
+mmap@GLIBC_2.2.5                                  /lib/x86_64-linux-gnu/libc.so.6
+modf                                              /lib/x86_64-linux-gnu/libm.so.6
+modf@@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libm.so.6
+                                                  /lib/x86_64-linux-gnu/libc.so.6
+modf@GLIBC_2.2.5                                  /lib/x86_64-linux-gnu/libm.so.6
+modff                                             /lib/x86_64-linux-gnu/libm.so.6
+modff128                                          /lib/x86_64-linux-gnu/libm.so.6
+modff128@@GLIBC_2.26                              /lib/x86_64-linux-gnu/libm.so.6
+modff128@GLIBC_2.26                               /lib/x86_64-linux-gnu/libm.so.6
+modff32                                           /lib/x86_64-linux-gnu/libm.so.6
+modff32@@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+modff32@GLIBC_2.27                                /lib/x86_64-linux-gnu/libm.so.6
+modff32x                                          /lib/x86_64-linux-gnu/libm.so.6
+modff32x@@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+modff32x@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+modff64                                           /lib/x86_64-linux-gnu/libm.so.6
+modff64@@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+modff64@GLIBC_2.27                                /lib/x86_64-linux-gnu/libm.so.6
+modff64x                                          /lib/x86_64-linux-gnu/libm.so.6
+modff64x@@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+modff64x@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+modff@@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+                                                  /lib/x86_64-linux-gnu/libc.so.6
+modff@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libm.so.6
+modfl                                             /lib/x86_64-linux-gnu/libm.so.6
+modfl@@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+                                                  /lib/x86_64-linux-gnu/libc.so.6
+modfl@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libm.so.6
+modify_ldt                                        /lib/x86_64-linux-gnu/libc.so.6
+modify_ldt@@GLIBC_2.2.5                           /lib/x86_64-linux-gnu/libc.so.6
+modify_ldt@GLIBC_2.2.5                            /lib/x86_64-linux-gnu/libc.so.6
+moncontrol                                        /lib/x86_64-linux-gnu/libc.so.6
+moncontrol@@GLIBC_2.2.5                           /lib/x86_64-linux-gnu/libc.so.6
+moncontrol@GLIBC_2.2.5                            /lib/x86_64-linux-gnu/libc.so.6
+monstartup                                        /lib/x86_64-linux-gnu/libc.so.6
+monstartup@@GLIBC_2.2.5                           /lib/x86_64-linux-gnu/libc.so.6
+monstartup@GLIBC_2.2.5                            /lib/x86_64-linux-gnu/libc.so.6
+mount                                             /lib/x86_64-linux-gnu/libc.so.6
+mount@@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libc.so.6
+mount@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libc.so.6
+mp_arg_check_num_sig                              build/py/argcheck.o
+                                                  build/py/objzip.o
+                                                  build/py/objtype.o
+                                                  build/py/objtuple.o
+                                                  build/py/objstr.o
+                                                  build/py/objset.o
+                                                  build/py/objreversed.o
+                                                  build/py/objrange.o
+                                                  build/py/objobject.o
+                                                  build/py/objmap.o
+                                                  build/py/objlist.o
+                                                  build/py/objint.o
+                                                  build/py/objfun.o
+                                                  build/py/objfloat.o
+                                                  build/py/objfilter.o
+                                                  build/py/objexcept.o
+                                                  build/py/objdict.o
+                                                  build/py/objcomplex.o
+                                                  build/py/objbool.o
+                                                  build/py/objarray.o
+mp_arg_error_terse_mismatch                       build/py/argcheck.o
+mp_arg_error_unimpl_kw                            build/py/argcheck.o
+                                                  build/py/objstr.o
+mp_arg_parse_all                                  build/py/argcheck.o
+                                                  build/py/modbuiltins.o
+                                                  build/py/objlist.o
+mp_arg_parse_all_kw_array                         build/py/argcheck.o
+                                                  build/py/objproperty.o
+                                                  build/py/objenumerate.o
+mp_asm_base_align                                 build/py/asmbase.o
+                                                  build/py/compile.o
+mp_asm_base_data                                  build/py/asmbase.o
+                                                  build/py/emitnxtensawin.o
+                                                  build/py/emitnxtensa.o
+                                                  build/py/emitnarm.o
+                                                  build/py/emitnthumb.o
+                                                  build/py/emitnx86.o
+                                                  build/py/emitnx64.o
+                                                  build/py/compile.o
+mp_asm_base_deinit                                build/py/asmbase.o
+                                                  build/py/emitnxtensawin.o
+                                                  build/py/emitinlinextensa.o
+                                                  build/py/emitnxtensa.o
+                                                  build/py/emitnarm.o
+                                                  build/py/emitinlinethumb.o
+                                                  build/py/emitnthumb.o
+                                                  build/py/emitnx86.o
+                                                  build/py/emitnx64.o
+mp_asm_base_get_cur_to_write_bytes                build/py/asmbase.o
+                                                  build/py/asmxtensa.o
+                                                  build/py/asmarm.o
+                                                  build/py/asmthumb.o
+                                                  build/py/asmx86.o
+                                                  build/py/asmx64.o
+mp_asm_base_init                                  build/py/asmbase.o
+                                                  build/py/emitnxtensawin.o
+                                                  build/py/emitinlinextensa.o
+                                                  build/py/emitnxtensa.o
+                                                  build/py/emitnarm.o
+                                                  build/py/emitinlinethumb.o
+                                                  build/py/emitnthumb.o
+                                                  build/py/emitnx86.o
+                                                  build/py/emitnx64.o
+mp_asm_base_label_assign                          build/py/asmbase.o
+                                                  build/py/emitnxtensawin.o
+                                                  build/py/emitinlinextensa.o
+                                                  build/py/emitnxtensa.o
+                                                  build/py/emitnarm.o
+                                                  build/py/emitinlinethumb.o
+                                                  build/py/emitnthumb.o
+                                                  build/py/emitnx86.o
+                                                  build/py/emitnx64.o
+mp_asm_base_start_pass                            build/py/asmbase.o
+                                                  build/py/emitnxtensawin.o
+                                                  build/py/emitinlinextensa.o
+                                                  build/py/emitnxtensa.o
+                                                  build/py/emitnarm.o
+                                                  build/py/emitinlinethumb.o
+                                                  build/py/emitnthumb.o
+                                                  build/py/emitnx86.o
+                                                  build/py/emitnx64.o
+mp_binary_get_int                                 build/py/binary.o
+mp_binary_get_size                                build/py/binary.o
+                                                  build/py/modstruct.o
+                                                  build/py/objarray.o
+mp_binary_get_val                                 build/py/binary.o
+                                                  build/py/modstruct.o
+mp_binary_get_val_array                           build/py/binary.o
+                                                  build/py/objarray.o
+mp_binary_op                                      build/py/runtime.o
+                                                  build/py/vm.o
+                                                  build/py/modbuiltins.o
+                                                  build/py/sequence.o
+                                                  build/py/objtype.o
+                                                  build/py/objlist.o
+                                                  build/py/objint.o
+                                                  build/py/objbool.o
+                                                  build/py/parse.o
+mp_binary_op_method_name                          build/py/objtype.o
+                                                  build/py/runtime.o
+                                                  build/py/emitnxtensawin.o
+                                                  build/py/emitnxtensa.o
+                                                  build/py/emitnarm.o
+                                                  build/py/emitnthumb.o
+                                                  build/py/emitnx86.o
+                                                  build/py/emitnx64.o
+mp_binary_set_int                                 build/py/binary.o
+                                                  build/py/objint.o
+mp_binary_set_val                                 build/py/binary.o
+                                                  build/py/modstruct.o
+mp_binary_set_val_array                           build/py/binary.o
+                                                  build/py/objarray.o
+mp_binary_set_val_array_from_int                  build/py/binary.o
+mp_builtin___build_class___obj                    build/py/modbuiltins.o
+                                                  build/py/runtime.o
+mp_builtin___import__                             build/py/builtinimport.o
+                                                  build/py/runtime.o
+mp_builtin___import___obj                         build/py/builtinimport.o
+                                                  build/py/modbuiltins.o
+mp_builtin___repl_print___obj                     build/py/modbuiltins.o
+mp_builtin_abs_obj                                build/py/modbuiltins.o
+mp_builtin_all_obj                                build/py/modbuiltins.o
+mp_builtin_any_obj                                build/py/modbuiltins.o
+mp_builtin_bin_obj                                build/py/modbuiltins.o
+mp_builtin_callable_obj                           build/py/modbuiltins.o
+mp_builtin_chr_obj                                build/py/modbuiltins.o
+mp_builtin_delattr_obj                            build/py/modbuiltins.o
+mp_builtin_dir_obj                                build/py/modbuiltins.o
+mp_builtin_divmod_obj                             build/py/modbuiltins.o
+mp_builtin_eval_obj                               build/py/builtinevex.o
+                                                  build/py/modbuiltins.o
+mp_builtin_exec_obj                               build/py/builtinevex.o
+                                                  build/py/modbuiltins.o
+mp_builtin_getattr_obj                            build/py/modbuiltins.o
+mp_builtin_globals_obj                            build/py/modbuiltins.o
+mp_builtin_hasattr_obj                            build/py/modbuiltins.o
+mp_builtin_hash_obj                               build/py/modbuiltins.o
+mp_builtin_hex_obj                                build/py/modbuiltins.o
+mp_builtin_id_obj                                 build/py/modbuiltins.o
+mp_builtin_isinstance_obj                         build/py/objtype.o
+                                                  build/py/modbuiltins.o
+mp_builtin_issubclass_obj                         build/py/objtype.o
+                                                  build/py/modbuiltins.o
+mp_builtin_iter_obj                               build/py/modbuiltins.o
+mp_builtin_len_obj                                build/py/modbuiltins.o
+mp_builtin_locals_obj                             build/py/modbuiltins.o
+mp_builtin_max_obj                                build/py/modbuiltins.o
+mp_builtin_min_obj                                build/py/modbuiltins.o
+mp_builtin_module_map                             build/py/objmodule.o
+mp_builtin_next_obj                               build/py/modbuiltins.o
+                                                  build/py/runtime.o
+mp_builtin_oct_obj                                build/py/modbuiltins.o
+mp_builtin_ord_obj                                build/py/modbuiltins.o
+mp_builtin_pow_obj                                build/py/modbuiltins.o
+mp_builtin_print_obj                              build/py/modbuiltins.o
+mp_builtin_repr_obj                               build/py/modbuiltins.o
+mp_builtin_round_obj                              build/py/modbuiltins.o
+mp_builtin_setattr_obj                            build/py/modbuiltins.o
+mp_builtin_sorted_obj                             build/py/modbuiltins.o
+mp_builtin_sum_obj                                build/py/modbuiltins.o
+mp_call_function_0                                build/py/runtime.o
+                                                  build/py/modbuiltins.o
+mp_call_function_1                                build/py/runtime.o
+                                                  build/py/modbuiltins.o
+                                                  build/py/objtype.o
+                                                  build/py/objmodule.o
+                                                  build/py/objlist.o
+                                                  build/py/runtime_utils.o
+mp_call_function_1_protected                      build/py/runtime_utils.o
+mp_call_function_2                                build/py/runtime.o
+                                                  build/py/runtime_utils.o
+mp_call_function_2_protected                      build/py/runtime_utils.o
+mp_call_function_n_kw                             build/py/runtime.o
+                                                  build/py/vm.o
+                                                  build/py/modbuiltins.o
+                                                  build/py/objtype.o
+                                                  build/py/objmap.o
+                                                  build/py/objfilter.o
+                                                  build/py/objclosure.o
+                                                  build/py/objboundmeth.o
+mp_call_method_n_kw                               build/py/runtime.o
+                                                  build/py/vm.o
+                                                  build/py/objtype.o
+                                                  build/py/objreversed.o
+                                                  build/py/objgetitemiter.o
+mp_call_method_n_kw_var                           build/py/runtime.o
+                                                  build/py/vm.o
+mp_call_method_self_n_kw                          build/py/objboundmeth.o
+                                                  build/py/objtype.o
+mp_compile                                        build/py/compile.o
+                                                  build/py/runtime.o
+mp_compile_to_raw_code                            build/py/compile.o
+                                                  build/main.o
+mp_const_GeneratorExit_obj                        build/py/objgenerator.o
+                                                  build/py/vm.o
+mp_const_ellipsis_obj                             build/py/objsingleton.o
+                                                  build/py/modbuiltins.o
+                                                  build/py/persistentcode.o
+                                                  build/py/emitnxtensawin.o
+                                                  build/py/emitnxtensa.o
+                                                  build/py/emitnarm.o
+                                                  build/py/emitnthumb.o
+                                                  build/py/emitnx86.o
+                                                  build/py/emitnx64.o
+                                                  build/py/emitbc.o
+mp_const_empty_bytes_obj                          build/py/objstr.o
+mp_const_empty_map                                build/py/map.o
+mp_const_empty_tuple_obj                          build/py/objtuple.o
+                                                  build/py/bc.o
+                                                  build/py/objtype.o
+                                                  build/py/objgenerator.o
+                                                  build/py/objexcept.o
+mp_const_float_e_obj                              build/py/objfloat.o
+mp_const_float_pi_obj                             build/py/objfloat.o
+mp_convert_member_lookup                          build/py/runtime.o
+                                                  build/py/objtype.o
+mp_deinit                                         build/py/runtime.o
+                                                  build/main.o
+mp_delete_global                                  build/py/runtime.o
+                                                  build/py/vm.o
+mp_delete_name                                    build/py/runtime.o
+                                                  build/py/vm.o
+mp_dynamic_compiler                               build/py/mpstate.o
+                                                  build/main.o
+                                                  build/py/bc.o
+                                                  build/py/persistentcode.o
+                                                  build/py/emitnxtensawin.o
+                                                  build/py/emitnxtensa.o
+                                                  build/py/emitnarm.o
+                                                  build/py/emitnthumb.o
+                                                  build/py/asmthumb.o
+                                                  build/py/emitnx86.o
+                                                  build/py/emitnx64.o
+                                                  build/py/emitbc.o
+                                                  build/py/compile.o
+                                                  build/py/lexer.o
+mp_emit_bc_adjust_stack_size                      build/py/emitbc.o
+mp_emit_bc_attr                                   build/py/emitbc.o
+mp_emit_bc_binary_op                              build/py/emitbc.o
+mp_emit_bc_build                                  build/py/emitbc.o
+mp_emit_bc_call_function                          build/py/emitbc.o
+mp_emit_bc_call_method                            build/py/emitbc.o
+mp_emit_bc_delete_global                          build/py/emitbc.o
+mp_emit_bc_delete_local                           build/py/emitbc.o
+mp_emit_bc_dup_top                                build/py/emitbc.o
+mp_emit_bc_dup_top_two                            build/py/emitbc.o
+mp_emit_bc_end_except_handler                     build/py/emitbc.o
+mp_emit_bc_end_finally                            build/py/emitbc.o
+mp_emit_bc_end_pass                               build/py/emitbc.o
+mp_emit_bc_for_iter                               build/py/emitbc.o
+mp_emit_bc_for_iter_end                           build/py/emitbc.o
+mp_emit_bc_get_iter                               build/py/emitbc.o
+mp_emit_bc_import                                 build/py/emitbc.o
+mp_emit_bc_jump                                   build/py/emitbc.o
+mp_emit_bc_jump_if_or_pop                         build/py/emitbc.o
+mp_emit_bc_label_assign                           build/py/emitbc.o
+mp_emit_bc_last_emit_was_return_value             build/py/emitbc.o
+mp_emit_bc_load_build_class                       build/py/emitbc.o
+mp_emit_bc_load_const_obj                         build/py/emitbc.o
+mp_emit_bc_load_const_small_int                   build/py/emitbc.o
+mp_emit_bc_load_const_str                         build/py/emitbc.o
+mp_emit_bc_load_const_tok                         build/py/emitbc.o
+mp_emit_bc_load_global                            build/py/emitbc.o
+mp_emit_bc_load_local                             build/py/emitbc.o
+mp_emit_bc_load_method                            build/py/emitbc.o
+mp_emit_bc_load_null                              build/py/emitbc.o
+mp_emit_bc_make_closure                           build/py/emitbc.o
+mp_emit_bc_make_function                          build/py/emitbc.o
+mp_emit_bc_pop_except_jump                        build/py/emitbc.o
+mp_emit_bc_pop_jump_if                            build/py/emitbc.o
+mp_emit_bc_pop_top                                build/py/emitbc.o
+mp_emit_bc_raise_varargs                          build/py/emitbc.o
+mp_emit_bc_return_value                           build/py/emitbc.o
+mp_emit_bc_rot_three                              build/py/emitbc.o
+mp_emit_bc_rot_two                                build/py/emitbc.o
+mp_emit_bc_set_source_line                        build/py/emitbc.o
+mp_emit_bc_setup_block                            build/py/emitbc.o
+mp_emit_bc_start_except_handler                   build/py/emitbc.o
+mp_emit_bc_start_pass                             build/py/emitbc.o
+mp_emit_bc_store_comp                             build/py/emitbc.o
+mp_emit_bc_store_global                           build/py/emitbc.o
+mp_emit_bc_store_local                            build/py/emitbc.o
+mp_emit_bc_store_map                              build/py/emitbc.o
+mp_emit_bc_subscr                                 build/py/emitbc.o
+mp_emit_bc_unary_op                               build/py/emitbc.o
+mp_emit_bc_unpack_ex                              build/py/emitbc.o
+mp_emit_bc_unpack_sequence                        build/py/emitbc.o
+mp_emit_bc_unwind_jump                            build/py/emitbc.o
+mp_emit_bc_with_cleanup                           build/py/emitbc.o
+mp_emit_bc_yield                                  build/py/emitbc.o
+mp_emit_common_get_id_for_modification            build/py/emitcommon.o
+                                                  build/py/compile.o
+mp_emit_common_id_op                              build/py/emitcommon.o
+                                                  build/py/compile.o
+mp_emit_glue_assign_bytecode                      build/py/emitglue.o
+                                                  build/py/emitbc.o
+mp_emit_glue_assign_native                        build/py/emitglue.o
+                                                  build/py/emitnxtensawin.o
+                                                  build/py/emitnxtensa.o
+                                                  build/py/emitnarm.o
+                                                  build/py/emitnthumb.o
+                                                  build/py/emitnx86.o
+                                                  build/py/emitnx64.o
+                                                  build/py/compile.o
+mp_emit_glue_new_raw_code                         build/py/emitglue.o
+                                                  build/py/scope.o
+mp_emitter_warning                                build/py/warning.o
+mp_execute_bytecode                               build/py/vm.o
+                                                  build/py/objgenerator.o
+                                                  build/py/objfun.o
+mp_format_float                                   build/py/formatfloat.o
+                                                  build/py/objfloat.o
+                                                  build/py/objcomplex.o
+                                                  build/py/mpprint.o
+mp_generic_unary_op                               build/py/obj.o
+                                                  build/py/objtype.o
+                                                  build/py/objsingleton.o
+                                                  build/py/objnone.o
+                                                  build/py/objgenerator.o
+                                                  build/py/objfun.o
+mp_get_buffer                                     build/py/obj.o
+                                                  build/py/stream.o
+                                                  build/py/objstr.o
+                                                  build/py/objfun.o
+                                                  build/py/objfloat.o
+                                                  build/py/objarray.o
+                                                  build/py/nativeglue.o
+mp_get_buffer_raise                               build/py/obj.o
+                                                  build/py/modstruct.o
+                                                  build/py/builtinevex.o
+                                                  build/py/stream.o
+                                                  build/py/objstr.o
+                                                  build/py/objint.o
+                                                  build/py/objarray.o
+mp_get_index                                      build/py/obj.o
+                                                  build/py/sequence.o
+                                                  build/py/objtuple.o
+                                                  build/py/objstrunicode.o
+                                                  build/py/objstr.o
+                                                  build/py/objrange.o
+                                                  build/py/objlist.o
+                                                  build/py/objarray.o
+mp_get_stream_raise                               build/py/stream.o
+mp_getiter                                        build/py/runtime.o
+                                                  build/py/vm.o
+                                                  build/py/modbuiltins.o
+                                                  build/py/objzip.o
+                                                  build/py/objtuple.o
+                                                  build/py/objstr.o
+                                                  build/py/objset.o
+                                                  build/py/objmap.o
+                                                  build/py/objlist.o
+                                                  build/py/objfilter.o
+                                                  build/py/objenumerate.o
+                                                  build/py/objdict.o
+                                                  build/py/objarray.o
+mp_handle_pending                                 build/py/scheduler.o
+mp_identity                                       build/py/obj.o
+mp_identity_getiter                               build/py/obj.o
+                                                  build/py/objzip.o
+                                                  build/py/objreversed.o
+                                                  build/py/objrange.o
+                                                  build/py/objpolyiter.o
+                                                  build/py/objmap.o
+                                                  build/py/objgetitemiter.o
+                                                  build/py/objgenerator.o
+                                                  build/py/objfilter.o
+                                                  build/py/objenumerate.o
+                                                  build/py/objdict.o
+                                                  build/py/objarray.o
+                                                  build/py/runtime.o
+mp_identity_obj                                   build/py/obj.o
+                                                  build/py/modmicropython.o
+mp_import_all                                     build/py/runtime.o
+                                                  build/py/vm.o
+mp_import_from                                    build/py/runtime.o
+                                                  build/py/vm.o
+mp_import_name                                    build/py/runtime.o
+                                                  build/py/vm.o
+mp_import_stat                                    build/main.o
+                                                  build/py/builtinimport.o
+mp_init                                           build/py/runtime.o
+                                                  build/main.o
+mp_int_format_size                                build/py/objint.o
+                                                  build/py/objint_mpz.o
+mp_iternext                                       build/py/runtime.o
+                                                  build/py/modbuiltins.o
+                                                  build/py/objzip.o
+                                                  build/py/objtuple.o
+                                                  build/py/objstr.o
+                                                  build/py/objset.o
+                                                  build/py/objmap.o
+                                                  build/py/objlist.o
+                                                  build/py/objfilter.o
+                                                  build/py/objenumerate.o
+                                                  build/py/objdict.o
+                                                  build/py/objarray.o
+mp_iternext_allow_raise                           build/py/runtime.o
+                                                  build/py/vm.o
+                                                  build/py/modbuiltins.o
+mp_lexer_free                                     build/py/lexer.o
+                                                  build/py/parse.o
+mp_lexer_new                                      build/py/lexer.o
+mp_lexer_new_from_fd                              build/py/lexer.o
+mp_lexer_new_from_file                            build/py/lexer.o
+                                                  build/main.o
+                                                  build/py/builtinimport.o
+mp_lexer_new_from_str_len                         build/py/lexer.o
+                                                  build/py/builtinevex.o
+mp_lexer_to_next                                  build/py/lexer.o
+                                                  build/py/parse.o
+mp_load_attr                                      build/py/runtime.o
+                                                  build/py/vm.o
+mp_load_build_class                               build/py/runtime.o
+                                                  build/py/vm.o
+mp_load_global                                    build/py/runtime.o
+                                                  build/py/vm.o
+mp_load_method                                    build/py/runtime.o
+                                                  build/py/vm.o
+                                                  build/py/modbuiltins.o
+                                                  build/py/objtype.o
+mp_load_method_maybe                              build/py/runtime.o
+                                                  build/py/modbuiltins.o
+                                                  build/py/builtinimport.o
+                                                  build/py/objtype.o
+                                                  build/py/objreversed.o
+                                                  build/py/parse.o
+mp_load_method_protected                          build/py/runtime.o
+                                                  build/py/modbuiltins.o
+mp_load_name                                      build/py/runtime.o
+                                                  build/py/vm.o
+mp_load_super_method                              build/py/objtype.o
+                                                  build/py/vm.o
+mp_make_closure_from_raw_code                     build/py/emitglue.o
+                                                  build/py/vm.o
+mp_make_function_from_raw_code                    build/py/emitglue.o
+                                                  build/py/vm.o
+                                                  build/py/compile.o
+mp_make_raise_obj                                 build/py/runtime.o
+                                                  build/py/vm.o
+mp_map_clear                                      build/py/map.o
+                                                  build/py/objdict.o
+mp_map_deinit                                     build/py/map.o
+                                                  build/py/parse.o
+mp_map_init                                       build/py/map.o
+                                                  build/py/objtype.o
+                                                  build/py/objdict.o
+                                                  build/py/parse.o
+mp_map_init_fixed_table                           build/py/map.o
+                                                  build/py/objfun.o
+                                                  build/py/objdict.o
+                                                  build/py/argcheck.o
+mp_map_lookup                                     build/py/map.o
+                                                  build/py/bc.o
+                                                  build/py/modbuiltins.o
+                                                  build/py/builtinimport.o
+                                                  build/py/objtype.o
+                                                  build/py/objstr.o
+                                                  build/py/objmodule.o
+                                                  build/py/objdict.o
+                                                  build/py/argcheck.o
+                                                  build/py/runtime.o
+                                                  build/py/parse.o
+mp_module___main__                                build/py/runtime.o
+                                                  build/py/objmodule.o
+mp_module_builtins                                build/py/modbuiltins.o
+                                                  build/py/objmodule.o
+mp_module_builtins_globals                        build/py/modbuiltins.o
+                                                  build/py/runtime.o
+mp_module_get                                     build/py/objmodule.o
+                                                  build/py/builtinimport.o
+mp_module_micropython                             build/py/modmicropython.o
+                                                  build/py/objmodule.o
+mp_module_register                                build/py/objmodule.o
+mp_module_ustruct                                 build/py/modstruct.o
+                                                  build/py/objmodule.o
+mp_native_from_obj                                build/py/nativeglue.o
+mp_native_to_obj                                  build/py/nativeglue.o
+                                                  build/py/objfun.o
+mp_native_type_from_qstr                          build/py/nativeglue.o
+                                                  build/py/emitnxtensawin.o
+                                                  build/py/emitnxtensa.o
+                                                  build/py/emitnarm.o
+                                                  build/py/emitnthumb.o
+                                                  build/py/emitnx86.o
+                                                  build/py/emitnx64.o
+                                                  build/py/compile.o
+mp_obj_cast_to_native_base                        build/py/objtype.o
+                                                  build/py/objtuple.o
+mp_obj_cell_get                                   build/py/objcell.o
+                                                  build/py/vm.o
+mp_obj_cell_set                                   build/py/objcell.o
+                                                  build/py/vm.o
+                                                  build/py/modbuiltins.o
+mp_obj_code_get_name                              build/py/objfun.o
+mp_obj_complex_binary_op                          build/py/objcomplex.o
+                                                  build/py/objint_mpz.o
+                                                  build/py/objfloat.o
+                                                  build/py/runtime.o
+mp_obj_complex_get                                build/py/objcomplex.o
+                                                  build/py/obj.o
+mp_obj_dict_delete                                build/py/objdict.o
+                                                  build/py/objmodule.o
+                                                  build/py/runtime.o
+mp_obj_dict_get                                   build/py/objdict.o
+                                                  build/py/builtinimport.o
+                                                  build/py/objstr.o
+mp_obj_dict_init                                  build/py/objdict.o
+                                                  build/py/runtime.o
+mp_obj_dict_len                                   build/py/objdict.o
+                                                  build/py/runtime.o
+mp_obj_dict_store                                 build/py/objdict.o
+                                                  build/py/bc.o
+                                                  build/py/vm.o
+                                                  build/py/builtinimport.o
+                                                  build/py/objtype.o
+                                                  build/py/objmodule.o
+                                                  build/py/runtime.o
+mp_obj_equal                                      build/py/obj.o
+                                                  build/py/sequence.o
+                                                  build/py/objdict.o
+                                                  build/py/map.o
+                                                  build/py/runtime.o
+mp_obj_equal_not_equal                            build/py/obj.o
+                                                  build/py/runtime.o
+mp_obj_exception_add_traceback                    build/py/objexcept.o
+                                                  build/py/vm.o
+                                                  build/py/parsenum.o
+                                                  build/py/compile.o
+                                                  build/py/parse.o
+mp_obj_exception_attr                             build/py/objexcept.o
+mp_obj_exception_clear_traceback                  build/py/objexcept.o
+mp_obj_exception_get_traceback                    build/py/objexcept.o
+                                                  build/py/obj.o
+mp_obj_exception_get_value                        build/py/objexcept.o
+                                                  build/py/vm.o
+mp_obj_exception_make_new                         build/py/objexcept.o
+                                                  build/py/objtype.o
+mp_obj_exception_match                            build/py/objexcept.o
+                                                  build/py/vm.o
+                                                  build/py/runtime.o
+mp_obj_exception_print                            build/py/objexcept.o
+mp_obj_float_binary_op                            build/py/objfloat.o
+                                                  build/py/objint_mpz.o
+                                                  build/py/runtime.o
+mp_obj_float_get                                  build/py/objfloat.o
+                                                  build/py/objstr.o
+                                                  build/py/objint.o
+                                                  build/py/objfun.o
+                                                  build/py/obj.o
+mp_obj_fun_get_name                               build/py/objfun.o
+                                                  build/py/bc.o
+                                                  build/py/objgenerator.o
+mp_obj_gen_resume                                 build/py/objgenerator.o
+                                                  build/py/runtime.o
+mp_obj_get_array                                  build/py/obj.o
+                                                  build/py/objstr.o
+                                                  build/py/objlist.o
+                                                  build/py/objfun.o
+                                                  build/py/runtime.o
+mp_obj_get_array_fixed_n                          build/py/obj.o
+mp_obj_get_complex                                build/py/obj.o
+                                                  build/py/objcomplex.o
+mp_obj_get_float                                  build/py/obj.o
+                                                  build/py/modbuiltins.o
+                                                  build/py/binary.o
+                                                  build/py/objstr.o
+                                                  build/py/objfloat.o
+                                                  build/py/objcomplex.o
+mp_obj_get_float_maybe                            build/py/obj.o
+                                                  build/py/objfloat.o
+mp_obj_get_int                                    build/py/obj.o
+                                                  build/py/modstruct.o
+                                                  build/py/modmicropython.o
+                                                  build/py/modbuiltins.o
+                                                  build/py/binary.o
+                                                  build/py/stream.o
+                                                  build/py/objstr.o
+                                                  build/py/objslice.o
+                                                  build/py/objreversed.o
+                                                  build/py/objrange.o
+                                                  build/py/objint.o
+                                                  build/py/objarray.o
+                                                  build/py/argcheck.o
+                                                  build/py/mpprint.o
+mp_obj_get_int_maybe                              build/py/obj.o
+                                                  build/py/objtuple.o
+                                                  build/py/objstrunicode.o
+                                                  build/py/objstr.o
+                                                  build/py/objlist.o
+mp_obj_get_int_truncated                          build/py/obj.o
+                                                  build/py/stream.o
+                                                  build/py/objtype.o
+                                                  build/py/nativeglue.o
+                                                  build/py/emitinlinextensa.o
+                                                  build/py/emitinlinethumb.o
+mp_obj_get_type                                   build/py/obj.o
+                                                  build/py/vm.o
+                                                  build/py/modbuiltins.o
+                                                  build/py/stream.o
+                                                  build/py/sequence.o
+                                                  build/py/opmethods.o
+                                                  build/py/objtype.o
+                                                  build/py/objtuple.o
+                                                  build/py/objstrunicode.o
+                                                  build/py/objstr.o
+                                                  build/py/objgenerator.o
+                                                  build/py/objfun.o
+                                                  build/py/objexcept.o
+                                                  build/py/runtime.o
+mp_obj_get_type_str                               build/py/obj.o
+                                                  build/py/objtype.o
+                                                  build/py/objstrunicode.o
+                                                  build/py/objstr.o
+                                                  build/py/runtime.o
+mp_obj_id                                         build/py/obj.o
+                                                  build/py/modbuiltins.o
+mp_obj_instance_call                              build/py/objtype.o
+                                                  build/py/obj.o
+mp_obj_instance_getiter                           build/py/objtype.o
+                                                  build/py/runtime.o
+mp_obj_instance_is_callable                       build/py/objtype.o
+                                                  build/py/obj.o
+mp_obj_instance_make_new                          build/py/objtype.o
+                                                  build/py/objobject.o
+mp_obj_int_as_float_impl                          build/py/objint_mpz.o
+                                                  build/py/obj.o
+mp_obj_int_binary_op                              build/py/objint_mpz.o
+                                                  build/py/objint.o
+mp_obj_int_binary_op_extra_cases                  build/py/objint.o
+                                                  build/py/objint_mpz.o
+mp_obj_int_formatted                              build/py/objint.o
+                                                  build/py/mpprint.o
+mp_obj_int_formatted_impl                         build/py/objint_mpz.o
+                                                  build/py/objint.o
+mp_obj_int_from_bytes_impl                        build/py/objint_mpz.o
+                                                  build/py/objint.o
+mp_obj_int_get_checked                            build/py/objint_mpz.o
+                                                  build/py/obj.o
+mp_obj_int_get_truncated                          build/py/objint_mpz.o
+                                                  build/py/objfun.o
+                                                  build/py/obj.o
+mp_obj_int_get_uint_checked                       build/py/objint_mpz.o
+mp_obj_int_new_mpz                                build/py/objint_mpz.o
+                                                  build/py/objint.o
+mp_obj_int_print                                  build/py/objint.o
+mp_obj_int_sign                                   build/py/objint_mpz.o
+                                                  build/py/parse.o
+                                                  build/py/mpprint.o
+mp_obj_int_to_bytes_impl                          build/py/objint_mpz.o
+                                                  build/py/binary.o
+                                                  build/py/objint.o
+mp_obj_int_unary_op                               build/py/objint_mpz.o
+                                                  build/py/objint.o
+mp_obj_is_callable                                build/py/obj.o
+                                                  build/py/modbuiltins.o
+mp_obj_is_exception_instance                      build/py/objexcept.o
+                                                  build/py/vm.o
+                                                  build/py/obj.o
+                                                  build/py/runtime.o
+mp_obj_is_exception_type                          build/py/objexcept.o
+                                                  build/py/runtime.o
+mp_obj_is_package                                 build/py/builtinimport.o
+                                                  build/py/runtime.o
+mp_obj_is_subclass_fast                           build/py/objtype.o
+                                                  build/py/vm.o
+                                                  build/py/objtuple.o
+                                                  build/py/objgenerator.o
+                                                  build/py/objexcept.o
+                                                  build/py/runtime.o
+mp_obj_is_true                                    build/py/obj.o
+                                                  build/py/vm.o
+                                                  build/py/modbuiltins.o
+                                                  build/py/stream.o
+                                                  build/py/objfilter.o
+                                                  build/py/objbool.o
+                                                  build/py/argcheck.o
+                                                  build/py/nativeglue.o
+                                                  build/py/runtime.o
+mp_obj_len                                        build/py/obj.o
+                                                  build/py/modbuiltins.o
+                                                  build/py/objreversed.o
+mp_obj_len_maybe                                  build/py/obj.o
+                                                  build/py/objstr.o
+                                                  build/py/objdict.o
+                                                  build/py/objarray.o
+mp_obj_list_append                                build/py/objlist.o
+                                                  build/py/vm.o
+                                                  build/py/modbuiltins.o
+                                                  build/py/stream.o
+                                                  build/py/sequence.o
+                                                  build/py/objstr.o
+                                                  build/py/runtime.o
+mp_obj_list_get                                   build/py/objlist.o
+                                                  build/py/obj.o
+mp_obj_list_init                                  build/py/objlist.o
+                                                  build/main.o
+mp_obj_list_remove                                build/py/objlist.o
+mp_obj_list_set_len                               build/py/objlist.o
+                                                  build/py/runtime.o
+mp_obj_list_sort                                  build/py/objlist.o
+                                                  build/py/modbuiltins.o
+mp_obj_list_store                                 build/py/objlist.o
+mp_obj_new_bound_meth                             build/py/objboundmeth.o
+                                                  build/py/modbuiltins.o
+                                                  build/py/runtime.o
+mp_obj_new_bytearray                              build/py/objarray.o
+mp_obj_new_bytearray_by_ref                       build/py/objarray.o
+mp_obj_new_bytes                                  build/py/objstr.o
+                                                  build/py/modstruct.o
+                                                  build/py/emitnxtensawin.o
+                                                  build/py/compile.o
+mp_obj_new_cell                                   build/py/objcell.o
+                                                  build/py/bc.o
+mp_obj_new_closure                                build/py/objclosure.o
+                                                  build/py/emitglue.o
+mp_obj_new_complex                                build/py/objcomplex.o
+                                                  build/py/parsenum.o
+mp_obj_new_dict                                   build/py/objdict.o
+                                                  build/py/bc.o
+                                                  build/py/vm.o
+                                                  build/py/modbuiltins.o
+                                                  build/py/objtype.o
+                                                  build/py/objmodule.o
+mp_obj_new_exception                              build/py/objexcept.o
+                                                  build/py/runtime.o
+mp_obj_new_exception_arg1                         build/py/objexcept.o
+                                                  build/py/objstr.o
+                                                  build/py/objset.o
+                                                  build/py/objgenerator.o
+                                                  build/py/objdict.o
+                                                  build/py/runtime.o
+                                                  build/py/parsenum.o
+mp_obj_new_exception_args                         build/py/objexcept.o
+mp_obj_new_exception_msg                          build/py/objexcept.o
+                                                  build/py/vm.o
+                                                  build/py/objgenerator.o
+                                                  build/py/runtime.o
+                                                  build/py/parsenum.o
+                                                  build/py/emitinlinextensa.o
+                                                  build/py/emitinlinethumb.o
+                                                  build/py/compile.o
+                                                  build/py/parse.o
+mp_obj_new_exception_msg_varg                     build/py/objexcept.o
+                                                  build/py/emitnxtensawin.o
+                                                  build/py/emitinlinextensa.o
+                                                  build/py/emitnxtensa.o
+                                                  build/py/emitnarm.o
+                                                  build/py/emitinlinethumb.o
+                                                  build/py/emitnthumb.o
+                                                  build/py/emitnx86.o
+                                                  build/py/emitnx64.o
+                                                  build/py/compile.o
+mp_obj_new_exception_msg_vlist                    build/py/objexcept.o
+                                                  build/py/runtime.o
+mp_obj_new_float                                  build/py/objfloat.o
+                                                  build/py/modbuiltins.o
+                                                  build/py/binary.o
+                                                  build/py/objint_mpz.o
+                                                  build/py/objcomplex.o
+                                                  build/py/runtime.o
+                                                  build/py/parsenum.o
+mp_obj_new_fun_asm                                build/py/objfun.o
+                                                  build/py/emitglue.o
+mp_obj_new_fun_bc                                 build/py/objfun.o
+                                                  build/py/emitglue.o
+mp_obj_new_fun_native                             build/py/objfun.o
+                                                  build/py/emitglue.o
+mp_obj_new_getitem_iter                           build/py/objgetitemiter.o
+                                                  build/py/runtime.o
+mp_obj_new_instance                               build/py/objtype.o
+                                                  build/py/objobject.o
+mp_obj_new_int                                    build/py/objint_mpz.o
+                                                  build/py/modbuiltins.o
+                                                  build/py/binary.o
+                                                  build/py/stream.o
+                                                  build/py/objrange.o
+                                                  build/py/obj.o
+                                                  build/py/nativeglue.o
+                                                  build/py/runtime.o
+mp_obj_new_int_from_float                         build/py/objint.o
+                                                  build/py/modbuiltins.o
+                                                  build/py/objstr.o
+mp_obj_new_int_from_ll                            build/py/objint_mpz.o
+                                                  build/py/binary.o
+                                                  build/py/runtime.o
+                                                  build/py/compile.o
+mp_obj_new_int_from_str_len                       build/py/objint_mpz.o
+                                                  build/py/parsenum.o
+mp_obj_new_int_from_uint                          build/py/objint_mpz.o
+                                                  build/py/binary.o
+                                                  build/py/stream.o
+                                                  build/py/objint.o
+                                                  build/py/obj.o
+                                                  build/py/nativeglue.o
+mp_obj_new_int_from_ull                           build/py/objint_mpz.o
+                                                  build/py/binary.o
+mp_obj_new_list                                   build/py/objlist.o
+                                                  build/py/vm.o
+                                                  build/py/modbuiltins.o
+                                                  build/py/stream.o
+                                                  build/py/sequence.o
+                                                  build/py/objstr.o
+                                                  build/py/runtime.o
+mp_obj_new_module                                 build/py/objmodule.o
+                                                  build/py/builtinimport.o
+mp_obj_new_set                                    build/py/objset.o
+                                                  build/py/vm.o
+mp_obj_new_slice                                  build/py/objslice.o
+                                                  build/py/vm.o
+mp_obj_new_str                                    build/py/objstr.o
+                                                  build/py/builtinimport.o
+                                                  build/py/binary.o
+mp_obj_new_str_copy                               build/py/objstr.o
+                                                  build/py/parse.o
+mp_obj_new_str_from_vstr                          build/py/objstr.o
+                                                  build/py/modstruct.o
+                                                  build/py/modbuiltins.o
+                                                  build/py/stream.o
+                                                  build/py/objint.o
+                                                  build/py/parsenum.o
+mp_obj_new_str_of_type                            build/py/objstr.o
+                                                  build/py/objstrunicode.o
+mp_obj_new_str_via_qstr                           build/py/objstr.o
+                                                  build/py/modbuiltins.o
+                                                  build/py/objstrunicode.o
+mp_obj_new_tuple                                  build/py/objtuple.o
+                                                  build/py/bc.o
+                                                  build/py/vm.o
+                                                  build/py/modstruct.o
+                                                  build/py/modbuiltins.o
+                                                  build/py/objzip.o
+                                                  build/py/objtype.o
+                                                  build/py/objint_mpz.o
+                                                  build/py/objfloat.o
+                                                  build/py/objenumerate.o
+                                                  build/py/objdict.o
+                                                  build/py/runtime.o
+mp_obj_new_type                                   build/py/objtype.o
+mp_obj_print                                      build/py/obj.o
+mp_obj_print_exception                            build/py/obj.o
+                                                  build/main.o
+                                                  build/py/runtime_utils.o
+mp_obj_print_helper                               build/py/obj.o
+                                                  build/py/modbuiltins.o
+                                                  build/py/objtype.o
+                                                  build/py/objtuple.o
+                                                  build/py/objstr.o
+                                                  build/py/objslice.o
+                                                  build/py/objset.o
+                                                  build/py/objlist.o
+                                                  build/py/objexcept.o
+                                                  build/py/objdict.o
+                                                  build/py/objclosure.o
+                                                  build/py/objcell.o
+                                                  build/py/objboundmeth.o
+                                                  build/py/objarray.o
+                                                  build/py/persistentcode.o
+mp_obj_property_get                               build/py/objproperty.o
+                                                  build/py/objtype.o
+mp_obj_set_store                                  build/py/objset.o
+                                                  build/py/vm.o
+mp_obj_slice_indices                              build/py/objslice.o
+                                                  build/py/sequence.o
+mp_obj_str_binary_op                              build/py/objstr.o
+                                                  build/py/objstrunicode.o
+                                                  build/py/objint.o
+                                                  build/py/runtime.o
+                                                  build/py/persistentcode.o
+mp_obj_str_equal                                  build/py/objstr.o
+                                                  build/py/obj.o
+mp_obj_str_format                                 build/py/objstr.o
+                                                  build/py/modbuiltins.o
+mp_obj_str_get_buffer                             build/py/objstr.o
+                                                  build/py/objstrunicode.o
+mp_obj_str_get_data                               build/py/objstr.o
+                                                  build/py/modbuiltins.o
+                                                  build/py/builtinimport.o
+                                                  build/py/objint.o
+                                                  build/py/objfun.o
+                                                  build/py/objcomplex.o
+                                                  build/py/runtime.o
+                                                  build/py/persistentcode.o
+mp_obj_str_get_qstr                               build/py/objstr.o
+                                                  build/py/modbuiltins.o
+                                                  build/py/builtinimport.o
+                                                  build/py/objtype.o
+                                                  build/py/runtime.o
+mp_obj_str_get_str                                build/py/objstr.o
+                                                  build/py/modstruct.o
+                                                  build/py/objmodule.o
+                                                  build/py/runtime.o
+mp_obj_str_intern                                 build/py/objstr.o
+mp_obj_str_intern_checked                         build/py/objstr.o
+                                                  build/py/runtime.o
+mp_obj_str_make_new                               build/py/objstr.o
+                                                  build/py/objstrunicode.o
+mp_obj_str_split                                  build/py/objstr.o
+mp_obj_subscr                                     build/py/obj.o
+                                                  build/py/vm.o
+                                                  build/py/objtype.o
+                                                  build/py/objreversed.o
+mp_obj_tuple_binary_op                            build/py/objtuple.o
+mp_obj_tuple_del                                  build/py/objtuple.o
+                                                  build/py/objzip.o
+mp_obj_tuple_get                                  build/py/objtuple.o
+                                                  build/py/objtype.o
+                                                  build/py/objstr.o
+                                                  build/py/obj.o
+mp_obj_tuple_getiter                              build/py/objtuple.o
+mp_obj_tuple_print                                build/py/objtuple.o
+                                                  build/py/objexcept.o
+mp_obj_tuple_subscr                               build/py/objtuple.o
+mp_obj_tuple_unary_op                             build/py/objtuple.o
+mp_op_contains_obj                                build/py/opmethods.o
+                                                  build/py/objset.o
+mp_op_delitem_obj                                 build/py/opmethods.o
+                                                  build/py/objdict.o
+mp_op_getitem_obj                                 build/py/opmethods.o
+                                                  build/py/objdict.o
+mp_op_setitem_obj                                 build/py/opmethods.o
+                                                  build/py/objdict.o
+mp_opcode_format                                  build/py/bc.o
+                                                  build/py/persistentcode.o
+mp_pairheap_delete                                build/py/pairheap.o
+mp_pairheap_meld                                  build/py/pairheap.o
+mp_pairheap_pairing                               build/py/pairheap.o
+mp_parse                                          build/py/parse.o
+                                                  build/main.o
+                                                  build/py/runtime.o
+mp_parse_compile_execute                          build/py/runtime.o
+                                                  build/py/builtinevex.o
+                                                  build/py/builtinimport.o
+mp_parse_node_extract_list                        build/py/parse.o
+                                                  build/py/emitinlinethumb.o
+                                                  build/py/compile.o
+mp_parse_node_get_int_maybe                       build/py/parse.o
+                                                  build/py/emitinlinextensa.o
+                                                  build/py/emitinlinethumb.o
+mp_parse_node_is_const_false                      build/py/parse.o
+                                                  build/py/compile.o
+mp_parse_node_is_const_true                       build/py/parse.o
+                                                  build/py/compile.o
+mp_parse_num_base                                 build/py/parsenumbase.o
+                                                  build/py/parsenum.o
+mp_parse_num_decimal                              build/py/parsenum.o
+                                                  build/py/objfloat.o
+                                                  build/py/objcomplex.o
+                                                  build/py/parse.o
+mp_parse_num_integer                              build/py/parsenum.o
+                                                  build/py/modstruct.o
+                                                  build/py/objint.o
+                                                  build/py/parse.o
+mp_parse_tree_clear                               build/py/parse.o
+                                                  build/py/compile.o
+mp_plat_print                                     build/py/mpprint.o
+                                                  build/py/modbuiltins.o
+                                                  build/py/obj.o
+                                                  build/py/warning.o
+                                                  build/py/runtime_utils.o
+                                                  build/py/gc.o
+mp_print_float                                    build/py/mpprint.o
+                                                  build/py/objstr.o
+mp_print_mp_int                                   build/py/mpprint.o
+                                                  build/py/objstr.o
+mp_print_str                                      build/py/mpprint.o
+                                                  build/py/modbuiltins.o
+                                                  build/py/objtype.o
+                                                  build/py/objtuple.o
+                                                  build/py/objstrunicode.o
+                                                  build/py/objstr.o
+                                                  build/py/objslice.o
+                                                  build/py/objset.o
+                                                  build/py/objrange.o
+                                                  build/py/objnone.o
+                                                  build/py/objlist.o
+                                                  build/py/objint.o
+                                                  build/py/objfloat.o
+                                                  build/py/objexcept.o
+                                                  build/py/objdict.o
+                                                  build/py/objcomplex.o
+                                                  build/py/objclosure.o
+                                                  build/py/objcell.o
+                                                  build/py/objboundmeth.o
+                                                  build/py/objbool.o
+                                                  build/py/objarray.o
+                                                  build/py/obj.o
+                                                  build/py/warning.o
+                                                  build/py/gc.o
+mp_print_strn                                     build/py/mpprint.o
+                                                  build/py/modbuiltins.o
+                                                  build/py/objstr.o
+mp_printf                                         build/py/mpprint.o
+                                                  build/main.o
+                                                  build/py/objtype.o
+                                                  build/py/objstrunicode.o
+                                                  build/py/objstr.o
+                                                  build/py/objsingleton.o
+                                                  build/py/objrange.o
+                                                  build/py/objmodule.o
+                                                  build/py/objgenerator.o
+                                                  build/py/objfun.o
+                                                  build/py/objcomplex.o
+                                                  build/py/objclosure.o
+                                                  build/py/objcell.o
+                                                  build/py/objboundmeth.o
+                                                  build/py/objarray.o
+                                                  build/py/obj.o
+                                                  build/py/parsenum.o
+                                                  build/py/gc.o
+mp_qstr_const_pool                                build/py/qstr.o
+mp_raise_NotImplementedError                      build/py/runtime.o
+                                                  build/py/modbuiltins.o
+                                                  build/py/objtuple.o
+                                                  build/py/objstrunicode.o
+                                                  build/py/objstr.o
+                                                  build/py/objlist.o
+                                                  build/py/objarray.o
+                                                  build/py/argcheck.o
+                                                  build/py/emitnxtensawin.o
+                                                  build/py/emitnxtensa.o
+                                                  build/py/emitnarm.o
+                                                  build/py/emitnthumb.o
+                                                  build/py/emitnx86.o
+                                                  build/py/emitnx64.o
+                                                  build/py/lexer.o
+mp_raise_OSError                                  build/py/runtime.o
+                                                  build/py/stream.o
+                                                  build/py/reader.o
+mp_raise_TypeError                                build/py/runtime.o
+                                                  build/py/bc.o
+                                                  build/py/modbuiltins.o
+                                                  build/py/builtinevex.o
+                                                  build/py/objtype.o
+                                                  build/py/objstr.o
+                                                  build/py/objobject.o
+                                                  build/py/objgenerator.o
+                                                  build/py/objdict.o
+                                                  build/py/objcomplex.o
+                                                  build/py/obj.o
+                                                  build/py/argcheck.o
+mp_raise_ValueError                               build/py/runtime.o
+                                                  build/py/modstruct.o
+                                                  build/py/modbuiltins.o
+                                                  build/py/builtinimport.o
+                                                  build/py/binary.o
+                                                  build/py/sequence.o
+                                                  build/py/objstr.o
+                                                  build/py/objslice.o
+                                                  build/py/objrange.o
+                                                  build/py/objint_mpz.o
+                                                  build/py/objint.o
+                                                  build/py/objgenerator.o
+                                                  build/py/objdict.o
+                                                  build/py/parsenum.o
+mp_raise_msg                                      build/py/runtime.o
+                                                  build/py/modbuiltins.o
+                                                  build/py/stream.o
+                                                  build/py/objtype.o
+                                                  build/py/objstrunicode.o
+                                                  build/py/objstr.o
+                                                  build/py/objset.o
+                                                  build/py/objlist.o
+                                                  build/py/objint_mpz.o
+                                                  build/py/objint.o
+                                                  build/py/objgenerator.o
+                                                  build/py/objfloat.o
+                                                  build/py/objdict.o
+                                                  build/py/objcomplex.o
+                                                  build/py/vstr.o
+                                                  build/py/qstr.o
+mp_raise_msg_varg                                 build/py/runtime.o
+                                                  build/py/bc.o
+                                                  build/py/modbuiltins.o
+                                                  build/py/builtinimport.o
+                                                  build/py/objtype.o
+                                                  build/py/objstrunicode.o
+                                                  build/py/objstr.o
+                                                  build/py/obj.o
+                                                  build/py/argcheck.o
+mp_raise_recursion_depth                          build/py/runtime.o
+                                                  build/py/stackctrl.o
+mp_raw_code_save                                  build/py/persistentcode.o
+mp_raw_code_save_file                             build/py/persistentcode.o
+                                                  build/main.o
+mp_reader_new_file                                build/py/reader.o
+                                                  build/py/lexer.o
+mp_reader_new_file_from_fd                        build/py/reader.o
+                                                  build/py/lexer.o
+mp_reader_new_mem                                 build/py/reader.o
+                                                  build/py/lexer.o
+mp_resume                                         build/py/runtime.o
+                                                  build/py/vm.o
+mp_seq_cmp_bytes                                  build/py/sequence.o
+                                                  build/py/objstr.o
+                                                  build/py/objarray.o
+mp_seq_cmp_objs                                   build/py/sequence.o
+                                                  build/py/objtuple.o
+                                                  build/py/objlist.o
+mp_seq_count_obj                                  build/py/sequence.o
+                                                  build/py/objtuple.o
+                                                  build/py/objlist.o
+mp_seq_extract_slice                              build/py/sequence.o
+                                                  build/py/objlist.o
+mp_seq_get_fast_slice_indexes                     build/py/sequence.o
+                                                  build/py/objtuple.o
+                                                  build/py/objstr.o
+                                                  build/py/objrange.o
+                                                  build/py/objlist.o
+                                                  build/py/objarray.o
+mp_seq_index_obj                                  build/py/sequence.o
+                                                  build/py/objtuple.o
+                                                  build/py/objlist.o
+mp_seq_multiply                                   build/py/sequence.o
+                                                  build/py/objtuple.o
+                                                  build/py/objstr.o
+                                                  build/py/objlist.o
+mp_set_clear                                      build/py/map.o
+                                                  build/py/objset.o
+mp_set_init                                       build/py/map.o
+                                                  build/py/objset.o
+mp_set_lookup                                     build/py/map.o
+                                                  build/py/objset.o
+mp_set_remove_first                               build/py/map.o
+                                                  build/py/objset.o
+mp_setup_code_state                               build/py/bc.o
+                                                  build/py/objgenerator.o
+                                                  build/py/objfun.o
+mp_small_int_floor_divide                         build/py/smallint.o
+                                                  build/py/runtime.o
+mp_small_int_modulo                               build/py/smallint.o
+                                                  build/py/runtime.o
+mp_small_int_mul_overflow                         build/py/smallint.o
+                                                  build/py/runtime.o
+                                                  build/py/parsenum.o
+mp_stack_check                                    build/py/stackctrl.o
+                                                  build/py/objstr.o
+                                                  build/py/objlist.o
+                                                  build/py/objgenerator.o
+                                                  build/py/objfun.o
+                                                  build/py/obj.o
+                                                  build/py/runtime.o
+mp_stack_ctrl_init                                build/py/stackctrl.o
+                                                  build/main.o
+mp_stack_set_limit                                build/py/stackctrl.o
+                                                  build/main.o
+mp_stack_set_top                                  build/py/stackctrl.o
+mp_stack_usage                                    build/py/stackctrl.o
+mp_state_ctx                                      build/py/mpstate.o
+                                                  build/lib/utils/gchelper_generic.o
+                                                  build/main.o
+                                                  build/py/vm.o
+                                                  build/py/modmicropython.o
+                                                  build/py/modbuiltins.o
+                                                  build/py/builtinevex.o
+                                                  build/py/builtinimport.o
+                                                  build/py/objmodule.o
+                                                  build/py/objgenerator.o
+                                                  build/py/objfun.o
+                                                  build/py/objexcept.o
+                                                  build/py/stackctrl.o
+                                                  build/py/scheduler.o
+                                                  build/py/runtime.o
+                                                  build/py/emitbc.o
+                                                  build/py/compile.o
+                                                  build/py/lexer.o
+                                                  build/py/qstr.o
+                                                  build/py/gc.o
+                                                  build/py/nlrx64.o
+                                                  build/py/nlr.o
+mp_store_attr                                     build/py/runtime.o
+                                                  build/py/vm.o
+                                                  build/py/modbuiltins.o
+                                                  build/py/builtinimport.o
+mp_store_global                                   build/py/runtime.o
+                                                  build/py/vm.o
+mp_store_name                                     build/py/runtime.o
+                                                  build/py/vm.o
+mp_str_print_quoted                               build/py/objstr.o
+                                                  build/py/objarray.o
+                                                  build/py/parsenum.o
+mp_stream_close                                   build/py/stream.o
+mp_stream_close_obj                               build/py/stream.o
+mp_stream_flush_obj                               build/py/stream.o
+mp_stream_ioctl_obj                               build/py/stream.o
+mp_stream_read1_obj                               build/py/stream.o
+mp_stream_read_obj                                build/py/stream.o
+mp_stream_readinto_obj                            build/py/stream.o
+mp_stream_rw                                      build/py/stream.o
+mp_stream_seek_obj                                build/py/stream.o
+mp_stream_tell_obj                                build/py/stream.o
+mp_stream_unbuffered_iter                         build/py/stream.o
+mp_stream_unbuffered_readline_obj                 build/py/stream.o
+mp_stream_unbuffered_readlines_obj                build/py/stream.o
+mp_stream_write                                   build/py/stream.o
+mp_stream_write1_obj                              build/py/stream.o
+mp_stream_write_adaptor                           build/py/stream.o
+mp_stream_write_obj                               build/py/stream.o
+mp_type_ArithmeticError                           build/py/objexcept.o
+                                                  build/py/modbuiltins.o
+mp_type_AssertionError                            build/py/objexcept.o
+                                                  build/py/modbuiltins.o
+mp_type_AttributeError                            build/py/objexcept.o
+                                                  build/py/modbuiltins.o
+                                                  build/py/objtype.o
+                                                  build/py/runtime.o
+mp_type_BaseException                             build/py/objexcept.o
+                                                  build/py/modbuiltins.o
+mp_type_EOFError                                  build/py/objexcept.o
+                                                  build/py/modbuiltins.o
+mp_type_Exception                                 build/py/objexcept.o
+                                                  build/py/modbuiltins.o
+mp_type_GeneratorExit                             build/py/objexcept.o
+                                                  build/py/vm.o
+                                                  build/py/modbuiltins.o
+                                                  build/py/objgenerator.o
+                                                  build/py/runtime.o
+mp_type_ImportError                               build/py/objexcept.o
+                                                  build/py/modbuiltins.o
+                                                  build/py/builtinimport.o
+                                                  build/py/runtime.o
+mp_type_IndentationError                          build/py/objexcept.o
+                                                  build/py/modbuiltins.o
+                                                  build/py/parse.o
+mp_type_IndexError                                build/py/objexcept.o
+                                                  build/py/modbuiltins.o
+                                                  build/py/objstrunicode.o
+                                                  build/py/objstr.o
+                                                  build/py/objlist.o
+                                                  build/py/objgetitemiter.o
+                                                  build/py/obj.o
+mp_type_KeyError                                  build/py/objexcept.o
+                                                  build/py/modbuiltins.o
+                                                  build/py/objstr.o
+                                                  build/py/objset.o
+                                                  build/py/objdict.o
+mp_type_KeyboardInterrupt                         build/py/objexcept.o
+                                                  build/py/modbuiltins.o
+mp_type_LookupError                               build/py/objexcept.o
+                                                  build/py/modbuiltins.o
+mp_type_MemoryError                               build/py/objexcept.o
+                                                  build/py/modbuiltins.o
+                                                  build/py/runtime.o
+mp_type_NameError                                 build/py/objexcept.o
+                                                  build/py/vm.o
+                                                  build/py/modbuiltins.o
+                                                  build/py/runtime.o
+mp_type_NoneType                                  build/py/objnone.o
+                                                  build/py/obj.o
+mp_type_NotImplementedError                       build/py/objexcept.o
+                                                  build/py/vm.o
+                                                  build/py/modbuiltins.o
+                                                  build/py/runtime.o
+mp_type_OSError                                   build/py/objexcept.o
+                                                  build/py/modbuiltins.o
+                                                  build/py/stream.o
+                                                  build/py/runtime.o
+mp_type_OverflowError                             build/py/objexcept.o
+                                                  build/py/modbuiltins.o
+                                                  build/py/objint_mpz.o
+                                                  build/py/objint.o
+mp_type_RuntimeError                              build/py/objexcept.o
+                                                  build/py/vm.o
+                                                  build/py/modbuiltins.o
+                                                  build/py/objgenerator.o
+                                                  build/py/runtime.o
+                                                  build/py/vstr.o
+                                                  build/py/qstr.o
+mp_type_StopAsyncIteration                        build/py/objexcept.o
+                                                  build/py/modbuiltins.o
+mp_type_StopIteration                             build/py/objexcept.o
+                                                  build/py/vm.o
+                                                  build/py/modbuiltins.o
+                                                  build/py/objgetitemiter.o
+                                                  build/py/objgenerator.o
+                                                  build/py/runtime.o
+mp_type_SyntaxError                               build/py/objexcept.o
+                                                  build/py/modbuiltins.o
+                                                  build/py/parsenum.o
+                                                  build/py/emitinlinextensa.o
+                                                  build/py/emitinlinethumb.o
+                                                  build/py/compile.o
+                                                  build/py/parse.o
+mp_type_SystemExit                                build/py/objexcept.o
+                                                  build/py/modbuiltins.o
+mp_type_TypeError                                 build/py/objexcept.o
+                                                  build/py/bc.o
+                                                  build/py/modbuiltins.o
+                                                  build/py/objtype.o
+                                                  build/py/objstrunicode.o
+                                                  build/py/objstr.o
+                                                  build/py/obj.o
+                                                  build/py/argcheck.o
+                                                  build/py/runtime.o
+mp_type_UnicodeError                              build/py/objexcept.o
+                                                  build/py/modbuiltins.o
+                                                  build/py/objstr.o
+mp_type_ValueError                                build/py/objexcept.o
+                                                  build/py/modbuiltins.o
+                                                  build/py/objstr.o
+                                                  build/py/obj.o
+                                                  build/py/runtime.o
+                                                  build/py/parsenum.o
+mp_type_ViperTypeError                            build/py/objexcept.o
+                                                  build/py/modbuiltins.o
+                                                  build/py/emitnxtensawin.o
+                                                  build/py/emitnxtensa.o
+                                                  build/py/emitnarm.o
+                                                  build/py/emitnthumb.o
+                                                  build/py/emitnx86.o
+                                                  build/py/emitnx64.o
+                                                  build/py/compile.o
+mp_type_ZeroDivisionError                         build/py/objexcept.o
+                                                  build/py/modbuiltins.o
+                                                  build/py/objint_mpz.o
+                                                  build/py/objfloat.o
+                                                  build/py/objcomplex.o
+                                                  build/py/runtime.o
+mp_type_bool                                      build/py/objbool.o
+                                                  build/py/modbuiltins.o
+                                                  build/py/obj.o
+mp_type_bytearray                                 build/py/objarray.o
+                                                  build/py/modbuiltins.o
+                                                  build/py/gc.o
+mp_type_bytes                                     build/py/objstr.o
+                                                  build/py/modstruct.o
+                                                  build/py/modbuiltins.o
+                                                  build/py/stream.o
+                                                  build/py/objstrunicode.o
+                                                  build/py/objint.o
+                                                  build/py/obj.o
+                                                  build/py/parse.o
+                                                  build/py/gc.o
+mp_type_classmethod                               build/py/objtype.o
+                                                  build/py/modbuiltins.o
+                                                  build/py/objint.o
+                                                  build/py/objdict.o
+                                                  build/py/runtime.o
+mp_type_complex                                   build/py/objcomplex.o
+                                                  build/py/modbuiltins.o
+                                                  build/py/objint_mpz.o
+                                                  build/py/objfloat.o
+                                                  build/py/obj.o
+                                                  build/py/runtime.o
+                                                  build/py/persistentcode.o
+mp_type_dict                                      build/py/objdict.o
+                                                  build/py/modstruct.o
+                                                  build/py/modmicropython.o
+                                                  build/py/modbuiltins.o
+                                                  build/py/builtinevex.o
+                                                  build/py/objtype.o
+                                                  build/py/objtuple.o
+                                                  build/py/objstrunicode.o
+                                                  build/py/objstr.o
+                                                  build/py/objset.o
+                                                  build/py/objproperty.o
+                                                  build/py/objobject.o
+                                                  build/py/objlist.o
+                                                  build/py/objint.o
+                                                  build/py/objgenerator.o
+                                                  build/py/objarray.o
+                                                  build/py/runtime.o
+                                                  build/py/emitglue.o
+                                                  build/py/gc.o
+mp_type_enumerate                                 build/py/objenumerate.o
+                                                  build/py/modbuiltins.o
+mp_type_filter                                    build/py/objfilter.o
+                                                  build/py/modbuiltins.o
+mp_type_float                                     build/py/objfloat.o
+                                                  build/py/modbuiltins.o
+                                                  build/py/objstr.o
+                                                  build/py/objint_mpz.o
+                                                  build/py/objint.o
+                                                  build/py/objfun.o
+                                                  build/py/objarray.o
+                                                  build/py/obj.o
+                                                  build/py/runtime.o
+                                                  build/py/persistentcode.o
+                                                  build/py/gc.o
+mp_type_fun_bc                                    build/py/objfun.o
+                                                  build/py/gc.o
+mp_type_fun_builtin_0                             build/py/objfun.o
+                                                  build/py/modmicropython.o
+                                                  build/py/modbuiltins.o
+                                                  build/py/runtime.o
+mp_type_fun_builtin_1                             build/py/objfun.o
+                                                  build/py/modstruct.o
+                                                  build/py/modbuiltins.o
+                                                  build/py/stream.o
+                                                  build/py/objstr.o
+                                                  build/py/objset.o
+                                                  build/py/objobject.o
+                                                  build/py/objlist.o
+                                                  build/py/objgenerator.o
+                                                  build/py/objdict.o
+                                                  build/py/obj.o
+                                                  build/py/runtime.o
+mp_type_fun_builtin_2                             build/py/objfun.o
+                                                  build/py/modbuiltins.o
+                                                  build/py/stream.o
+                                                  build/py/opmethods.o
+                                                  build/py/objtype.o
+                                                  build/py/objtuple.o
+                                                  build/py/objstr.o
+                                                  build/py/objset.o
+                                                  build/py/objproperty.o
+                                                  build/py/objlist.o
+                                                  build/py/objgenerator.o
+                                                  build/py/objarray.o
+                                                  build/py/runtime.o
+mp_type_fun_builtin_3                             build/py/objfun.o
+                                                  build/py/modbuiltins.o
+                                                  build/py/opmethods.o
+                                                  build/py/objlist.o
+                                                  build/py/runtime.o
+mp_type_fun_builtin_var                           build/py/objfun.o
+                                                  build/py/modstruct.o
+                                                  build/py/modmicropython.o
+                                                  build/py/modbuiltins.o
+                                                  build/py/builtinevex.o
+                                                  build/py/builtinimport.o
+                                                  build/py/stream.o
+                                                  build/py/objtype.o
+                                                  build/py/objtuple.o
+                                                  build/py/objstr.o
+                                                  build/py/objset.o
+                                                  build/py/objlist.o
+                                                  build/py/objint.o
+                                                  build/py/objgenerator.o
+                                                  build/py/objdict.o
+                                                  build/py/runtime.o
+mp_type_gen_instance                              build/py/objgenerator.o
+                                                  build/py/runtime.o
+mp_type_gen_wrap                                  build/py/objgenerator.o
+                                                  build/py/emitglue.o
+mp_type_int                                       build/py/objint.o
+                                                  build/py/modbuiltins.o
+                                                  build/py/binary.o
+                                                  build/py/objtype.o
+                                                  build/py/objstr.o
+                                                  build/py/objint_mpz.o
+                                                  build/py/objfun.o
+                                                  build/py/objarray.o
+                                                  build/py/obj.o
+                                                  build/py/persistentcode.o
+                                                  build/py/parse.o
+                                                  build/py/mpprint.o
+mp_type_list                                      build/py/objlist.o
+                                                  build/py/modbuiltins.o
+                                                  build/py/objstr.o
+                                                  build/py/objint.o
+                                                  build/py/objfun.o
+                                                  build/py/obj.o
+                                                  build/py/runtime.o
+                                                  build/py/gc.o
+mp_type_map                                       build/py/objmap.o
+                                                  build/py/modbuiltins.o
+mp_type_module                                    build/py/objmodule.o
+                                                  build/py/modstruct.o
+                                                  build/py/modmicropython.o
+                                                  build/py/modbuiltins.o
+                                                  build/py/runtime.o
+                                                  build/py/gc.o
+mp_type_native_gen_wrap                           build/py/objgenerator.o
+                                                  build/py/objfun.o
+                                                  build/py/emitglue.o
+mp_type_object                                    build/py/objobject.o
+                                                  build/py/modbuiltins.o
+                                                  build/py/objtype.o
+                                                  build/py/runtime.o
+mp_type_polymorph_iter                            build/py/objpolyiter.o
+                                                  build/py/objtuple.o
+                                                  build/py/objstrunicode.o
+                                                  build/py/objstr.o
+                                                  build/py/objset.o
+                                                  build/py/objlist.o
+mp_type_property                                  build/py/objproperty.o
+                                                  build/py/modbuiltins.o
+                                                  build/py/objtype.o
+mp_type_range                                     build/py/objrange.o
+                                                  build/py/modbuiltins.o
+mp_type_reversed                                  build/py/objreversed.o
+                                                  build/py/modbuiltins.o
+mp_type_set                                       build/py/objset.o
+                                                  build/py/modbuiltins.o
+mp_type_singleton                                 build/py/objsingleton.o
+mp_type_slice                                     build/py/objslice.o
+                                                  build/py/modbuiltins.o
+                                                  build/py/objtuple.o
+                                                  build/py/objstrunicode.o
+                                                  build/py/objstr.o
+                                                  build/py/objrange.o
+                                                  build/py/objlist.o
+                                                  build/py/objarray.o
+mp_type_staticmethod                              build/py/objtype.o
+                                                  build/py/modbuiltins.o
+                                                  build/py/objobject.o
+                                                  build/py/runtime.o
+mp_type_str                                       build/py/objstrunicode.o
+                                                  build/py/modbuiltins.o
+                                                  build/py/stream.o
+                                                  build/py/objstr.o
+                                                  build/py/objfun.o
+                                                  build/py/objexcept.o
+                                                  build/py/objcomplex.o
+                                                  build/py/obj.o
+                                                  build/py/map.o
+                                                  build/py/persistentcode.o
+                                                  build/py/parsenum.o
+                                                  build/py/parse.o
+                                                  build/py/gc.o
+mp_type_super                                     build/py/objtype.o
+                                                  build/py/modbuiltins.o
+mp_type_tuple                                     build/py/objtuple.o
+                                                  build/py/modbuiltins.o
+                                                  build/py/objtype.o
+                                                  build/py/objstr.o
+                                                  build/py/objint.o
+                                                  build/py/objfun.o
+                                                  build/py/objexcept.o
+                                                  build/py/obj.o
+                                                  build/py/runtime.o
+                                                  build/py/emitglue.o
+                                                  build/py/gc.o
+mp_type_type                                      build/py/objtype.o
+                                                  build/py/modbuiltins.o
+                                                  build/py/objzip.o
+                                                  build/py/objtuple.o
+                                                  build/py/objstrunicode.o
+                                                  build/py/objstr.o
+                                                  build/py/objslice.o
+                                                  build/py/objsingleton.o
+                                                  build/py/objset.o
+                                                  build/py/objreversed.o
+                                                  build/py/objrange.o
+                                                  build/py/objnone.o
+                                                  build/py/objproperty.o
+                                                  build/py/objpolyiter.o
+                                                  build/py/objobject.o
+                                                  build/py/objmodule.o
+                                                  build/py/objmap.o
+                                                  build/py/objlist.o
+                                                  build/py/objint.o
+                                                  build/py/objgetitemiter.o
+                                                  build/py/objgenerator.o
+                                                  build/py/objfun.o
+                                                  build/py/objfloat.o
+                                                  build/py/objfilter.o
+                                                  build/py/objexcept.o
+                                                  build/py/objenumerate.o
+                                                  build/py/objdict.o
+                                                  build/py/objcomplex.o
+                                                  build/py/objclosure.o
+                                                  build/py/objcell.o
+                                                  build/py/objboundmeth.o
+                                                  build/py/objbool.o
+                                                  build/py/objarray.o
+                                                  build/py/runtime.o
+mp_type_zip                                       build/py/objzip.o
+                                                  build/py/modbuiltins.o
+mp_unary_op                                       build/py/runtime.o
+                                                  build/py/vm.o
+                                                  build/py/modbuiltins.o
+                                                  build/py/objtype.o
+                                                  build/py/objtuple.o
+                                                  build/py/objint.o
+                                                  build/py/objbool.o
+                                                  build/py/obj.o
+                                                  build/py/map.o
+                                                  build/py/parse.o
+mp_unary_op_method_name                           build/py/objtype.o
+                                                  build/py/runtime.o
+                                                  build/py/emitnxtensawin.o
+                                                  build/py/emitnxtensa.o
+                                                  build/py/emitnarm.o
+                                                  build/py/emitnthumb.o
+                                                  build/py/emitnx86.o
+                                                  build/py/emitnx64.o
+mp_unpack_ex                                      build/py/runtime.o
+                                                  build/py/vm.o
+mp_unpack_sequence                                build/py/runtime.o
+                                                  build/py/vm.o
+mp_verbose_flag                                   build/main.o
+mp_vprintf                                        build/py/mpprint.o
+                                                  build/py/objexcept.o
+                                                  build/py/warning.o
+                                                  build/py/vstr.o
+mp_warning                                        build/py/warning.o
+                                                  build/py/vm.o
+mprotect                                          /lib/x86_64-linux-gnu/libc.so.6
+mprotect@@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+mprotect@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+mpz_abs_inpl                                      build/py/mpz.o
+                                                  build/py/objint_mpz.o
+mpz_add_inpl                                      build/py/mpz.o
+                                                  build/py/objint_mpz.o
+mpz_and_inpl                                      build/py/mpz.o
+                                                  build/py/objint_mpz.o
+mpz_as_bytes                                      build/py/mpz.o
+                                                  build/py/objint_mpz.o
+mpz_as_float                                      build/py/mpz.o
+                                                  build/py/objint_mpz.o
+mpz_as_int_checked                                build/py/mpz.o
+                                                  build/py/objint_mpz.o
+mpz_as_str_inpl                                   build/py/mpz.o
+                                                  build/py/objint_mpz.o
+mpz_as_uint_checked                               build/py/mpz.o
+                                                  build/py/objint_mpz.o
+mpz_cmp                                           build/py/mpz.o
+                                                  build/py/objint_mpz.o
+mpz_deinit                                        build/py/mpz.o
+                                                  build/py/objint_mpz.o
+mpz_divmod_inpl                                   build/py/mpz.o
+                                                  build/py/objint_mpz.o
+mpz_hash                                          build/py/mpz.o
+                                                  build/py/objint_mpz.o
+mpz_init_fixed_from_int                           build/py/mpz.o
+                                                  build/py/objint_mpz.o
+mpz_init_from_int                                 build/py/mpz.o
+mpz_init_zero                                     build/py/mpz.o
+                                                  build/py/objint_mpz.o
+mpz_mul_inpl                                      build/py/mpz.o
+                                                  build/py/objint_mpz.o
+mpz_neg_inpl                                      build/py/mpz.o
+                                                  build/py/objint_mpz.o
+mpz_not_inpl                                      build/py/mpz.o
+                                                  build/py/objint_mpz.o
+mpz_or_inpl                                       build/py/mpz.o
+                                                  build/py/objint_mpz.o
+mpz_pow3_inpl                                     build/py/mpz.o
+mpz_pow_inpl                                      build/py/mpz.o
+                                                  build/py/objint_mpz.o
+mpz_set                                           build/py/mpz.o
+mpz_set_from_bytes                                build/py/mpz.o
+                                                  build/py/objint_mpz.o
+mpz_set_from_float                                build/py/mpz.o
+                                                  build/py/objint.o
+mpz_set_from_int                                  build/py/mpz.o
+mpz_set_from_ll                                   build/py/mpz.o
+                                                  build/py/objint_mpz.o
+mpz_set_from_str                                  build/py/mpz.o
+                                                  build/py/objint_mpz.o
+mpz_shl_inpl                                      build/py/mpz.o
+                                                  build/py/objint_mpz.o
+mpz_shr_inpl                                      build/py/mpz.o
+                                                  build/py/objint_mpz.o
+mpz_sub_inpl                                      build/py/mpz.o
+                                                  build/py/objint_mpz.o
+mpz_xor_inpl                                      build/py/mpz.o
+                                                  build/py/objint_mpz.o
+mremap                                            /lib/x86_64-linux-gnu/libc.so.6
+mremap@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+mremap@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libc.so.6
+msgrcv                                            /lib/x86_64-linux-gnu/libc.so.6
+msgrcv@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+msgrcv@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libc.so.6
+msgsnd                                            /lib/x86_64-linux-gnu/libc.so.6
+msgsnd@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+msgsnd@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libc.so.6
+munmap                                            /lib/x86_64-linux-gnu/libc.so.6
+munmap@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+munmap@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libc.so.6
+nan                                               /lib/x86_64-linux-gnu/libm.so.6
+nan@@GLIBC_2.2.5                                  /lib/x86_64-linux-gnu/libm.so.6
+nan@GLIBC_2.2.5                                   /lib/x86_64-linux-gnu/libm.so.6
+nanf                                              /lib/x86_64-linux-gnu/libm.so.6
+nanf128                                           /lib/x86_64-linux-gnu/libm.so.6
+nanf128@@GLIBC_2.26                               /lib/x86_64-linux-gnu/libm.so.6
+nanf128@GLIBC_2.26                                /lib/x86_64-linux-gnu/libm.so.6
+nanf32                                            /lib/x86_64-linux-gnu/libm.so.6
+nanf32@@GLIBC_2.27                                /lib/x86_64-linux-gnu/libm.so.6
+nanf32@GLIBC_2.27                                 /lib/x86_64-linux-gnu/libm.so.6
+nanf32x                                           /lib/x86_64-linux-gnu/libm.so.6
+nanf32x@@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+nanf32x@GLIBC_2.27                                /lib/x86_64-linux-gnu/libm.so.6
+nanf64                                            /lib/x86_64-linux-gnu/libm.so.6
+nanf64@@GLIBC_2.27                                /lib/x86_64-linux-gnu/libm.so.6
+nanf64@GLIBC_2.27                                 /lib/x86_64-linux-gnu/libm.so.6
+nanf64x                                           /lib/x86_64-linux-gnu/libm.so.6
+nanf64x@@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+nanf64x@GLIBC_2.27                                /lib/x86_64-linux-gnu/libm.so.6
+nanf@@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libm.so.6
+nanf@GLIBC_2.2.5                                  /lib/x86_64-linux-gnu/libm.so.6
+nanl                                              /lib/x86_64-linux-gnu/libm.so.6
+nanl@@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libm.so.6
+nanl@GLIBC_2.2.5                                  /lib/x86_64-linux-gnu/libm.so.6
+nanosleep                                         /lib/x86_64-linux-gnu/libc.so.6
+nanosleep@@GLIBC_2.2.5                            /lib/x86_64-linux-gnu/libc.so.6
+nanosleep@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+nearbyint                                         /lib/x86_64-linux-gnu/libm.so.6
+                                                  build/py/modbuiltins.o
+nearbyint@@GLIBC_2.2.5                            /lib/x86_64-linux-gnu/libm.so.6
+nearbyint@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libm.so.6
+nearbyintf                                        /lib/x86_64-linux-gnu/libm.so.6
+nearbyintf128                                     /lib/x86_64-linux-gnu/libm.so.6
+nearbyintf128@@GLIBC_2.26                         /lib/x86_64-linux-gnu/libm.so.6
+nearbyintf128@GLIBC_2.26                          /lib/x86_64-linux-gnu/libm.so.6
+nearbyintf32                                      /lib/x86_64-linux-gnu/libm.so.6
+nearbyintf32@@GLIBC_2.27                          /lib/x86_64-linux-gnu/libm.so.6
+nearbyintf32@GLIBC_2.27                           /lib/x86_64-linux-gnu/libm.so.6
+nearbyintf32x                                     /lib/x86_64-linux-gnu/libm.so.6
+nearbyintf32x@@GLIBC_2.27                         /lib/x86_64-linux-gnu/libm.so.6
+nearbyintf32x@GLIBC_2.27                          /lib/x86_64-linux-gnu/libm.so.6
+nearbyintf64                                      /lib/x86_64-linux-gnu/libm.so.6
+nearbyintf64@@GLIBC_2.27                          /lib/x86_64-linux-gnu/libm.so.6
+nearbyintf64@GLIBC_2.27                           /lib/x86_64-linux-gnu/libm.so.6
+nearbyintf64x                                     /lib/x86_64-linux-gnu/libm.so.6
+nearbyintf64x@@GLIBC_2.27                         /lib/x86_64-linux-gnu/libm.so.6
+nearbyintf64x@GLIBC_2.27                          /lib/x86_64-linux-gnu/libm.so.6
+nearbyintf@@GLIBC_2.2.5                           /lib/x86_64-linux-gnu/libm.so.6
+nearbyintf@GLIBC_2.2.5                            /lib/x86_64-linux-gnu/libm.so.6
+nearbyintl                                        /lib/x86_64-linux-gnu/libm.so.6
+nearbyintl@@GLIBC_2.2.5                           /lib/x86_64-linux-gnu/libm.so.6
+nearbyintl@GLIBC_2.2.5                            /lib/x86_64-linux-gnu/libm.so.6
+newlocale                                         /lib/x86_64-linux-gnu/libc.so.6
+newlocale@@GLIBC_2.3                              /lib/x86_64-linux-gnu/libc.so.6
+newlocale@GLIBC_2.3                               /lib/x86_64-linux-gnu/libc.so.6
+nextafter                                         /lib/x86_64-linux-gnu/libm.so.6
+nextafter@@GLIBC_2.2.5                            /lib/x86_64-linux-gnu/libm.so.6
+nextafter@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libm.so.6
+nextafterf                                        /lib/x86_64-linux-gnu/libm.so.6
+nextafterf128                                     /lib/x86_64-linux-gnu/libm.so.6
+nextafterf128@@GLIBC_2.26                         /lib/x86_64-linux-gnu/libm.so.6
+nextafterf128@GLIBC_2.26                          /lib/x86_64-linux-gnu/libm.so.6
+nextafterf32                                      /lib/x86_64-linux-gnu/libm.so.6
+nextafterf32@@GLIBC_2.27                          /lib/x86_64-linux-gnu/libm.so.6
+nextafterf32@GLIBC_2.27                           /lib/x86_64-linux-gnu/libm.so.6
+nextafterf32x                                     /lib/x86_64-linux-gnu/libm.so.6
+nextafterf32x@@GLIBC_2.27                         /lib/x86_64-linux-gnu/libm.so.6
+nextafterf32x@GLIBC_2.27                          /lib/x86_64-linux-gnu/libm.so.6
+nextafterf64                                      /lib/x86_64-linux-gnu/libm.so.6
+nextafterf64@@GLIBC_2.27                          /lib/x86_64-linux-gnu/libm.so.6
+nextafterf64@GLIBC_2.27                           /lib/x86_64-linux-gnu/libm.so.6
+nextafterf64x                                     /lib/x86_64-linux-gnu/libm.so.6
+nextafterf64x@@GLIBC_2.27                         /lib/x86_64-linux-gnu/libm.so.6
+nextafterf64x@GLIBC_2.27                          /lib/x86_64-linux-gnu/libm.so.6
+nextafterf@@GLIBC_2.2.5                           /lib/x86_64-linux-gnu/libm.so.6
+nextafterf@GLIBC_2.2.5                            /lib/x86_64-linux-gnu/libm.so.6
+nextafterl                                        /lib/x86_64-linux-gnu/libm.so.6
+nextafterl@@GLIBC_2.2.5                           /lib/x86_64-linux-gnu/libm.so.6
+nextafterl@GLIBC_2.2.5                            /lib/x86_64-linux-gnu/libm.so.6
+nextdown                                          /lib/x86_64-linux-gnu/libm.so.6
+nextdown@@GLIBC_2.24                              /lib/x86_64-linux-gnu/libm.so.6
+nextdown@GLIBC_2.24                               /lib/x86_64-linux-gnu/libm.so.6
+nextdownf                                         /lib/x86_64-linux-gnu/libm.so.6
+nextdownf128                                      /lib/x86_64-linux-gnu/libm.so.6
+nextdownf128@@GLIBC_2.26                          /lib/x86_64-linux-gnu/libm.so.6
+nextdownf128@GLIBC_2.26                           /lib/x86_64-linux-gnu/libm.so.6
+nextdownf32                                       /lib/x86_64-linux-gnu/libm.so.6
+nextdownf32@@GLIBC_2.27                           /lib/x86_64-linux-gnu/libm.so.6
+nextdownf32@GLIBC_2.27                            /lib/x86_64-linux-gnu/libm.so.6
+nextdownf32x                                      /lib/x86_64-linux-gnu/libm.so.6
+nextdownf32x@@GLIBC_2.27                          /lib/x86_64-linux-gnu/libm.so.6
+nextdownf32x@GLIBC_2.27                           /lib/x86_64-linux-gnu/libm.so.6
+nextdownf64                                       /lib/x86_64-linux-gnu/libm.so.6
+nextdownf64@@GLIBC_2.27                           /lib/x86_64-linux-gnu/libm.so.6
+nextdownf64@GLIBC_2.27                            /lib/x86_64-linux-gnu/libm.so.6
+nextdownf64x                                      /lib/x86_64-linux-gnu/libm.so.6
+nextdownf64x@@GLIBC_2.27                          /lib/x86_64-linux-gnu/libm.so.6
+nextdownf64x@GLIBC_2.27                           /lib/x86_64-linux-gnu/libm.so.6
+nextdownf@@GLIBC_2.24                             /lib/x86_64-linux-gnu/libm.so.6
+nextdownf@GLIBC_2.24                              /lib/x86_64-linux-gnu/libm.so.6
+nextdownl                                         /lib/x86_64-linux-gnu/libm.so.6
+nextdownl@@GLIBC_2.24                             /lib/x86_64-linux-gnu/libm.so.6
+nextdownl@GLIBC_2.24                              /lib/x86_64-linux-gnu/libm.so.6
+nexttoward                                        /lib/x86_64-linux-gnu/libm.so.6
+nexttoward@@GLIBC_2.2.5                           /lib/x86_64-linux-gnu/libm.so.6
+nexttoward@GLIBC_2.2.5                            /lib/x86_64-linux-gnu/libm.so.6
+nexttowardf                                       /lib/x86_64-linux-gnu/libm.so.6
+nexttowardf@@GLIBC_2.2.5                          /lib/x86_64-linux-gnu/libm.so.6
+nexttowardf@GLIBC_2.2.5                           /lib/x86_64-linux-gnu/libm.so.6
+nexttowardl                                       /lib/x86_64-linux-gnu/libm.so.6
+nexttowardl@@GLIBC_2.2.5                          /lib/x86_64-linux-gnu/libm.so.6
+nexttowardl@GLIBC_2.2.5                           /lib/x86_64-linux-gnu/libm.so.6
+nextup                                            /lib/x86_64-linux-gnu/libm.so.6
+nextup@@GLIBC_2.24                                /lib/x86_64-linux-gnu/libm.so.6
+nextup@GLIBC_2.24                                 /lib/x86_64-linux-gnu/libm.so.6
+nextupf                                           /lib/x86_64-linux-gnu/libm.so.6
+nextupf128                                        /lib/x86_64-linux-gnu/libm.so.6
+nextupf128@@GLIBC_2.26                            /lib/x86_64-linux-gnu/libm.so.6
+nextupf128@GLIBC_2.26                             /lib/x86_64-linux-gnu/libm.so.6
+nextupf32                                         /lib/x86_64-linux-gnu/libm.so.6
+nextupf32@@GLIBC_2.27                             /lib/x86_64-linux-gnu/libm.so.6
+nextupf32@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+nextupf32x                                        /lib/x86_64-linux-gnu/libm.so.6
+nextupf32x@@GLIBC_2.27                            /lib/x86_64-linux-gnu/libm.so.6
+nextupf32x@GLIBC_2.27                             /lib/x86_64-linux-gnu/libm.so.6
+nextupf64                                         /lib/x86_64-linux-gnu/libm.so.6
+nextupf64@@GLIBC_2.27                             /lib/x86_64-linux-gnu/libm.so.6
+nextupf64@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+nextupf64x                                        /lib/x86_64-linux-gnu/libm.so.6
+nextupf64x@@GLIBC_2.27                            /lib/x86_64-linux-gnu/libm.so.6
+nextupf64x@GLIBC_2.27                             /lib/x86_64-linux-gnu/libm.so.6
+nextupf@@GLIBC_2.24                               /lib/x86_64-linux-gnu/libm.so.6
+nextupf@GLIBC_2.24                                /lib/x86_64-linux-gnu/libm.so.6
+nextupl                                           /lib/x86_64-linux-gnu/libm.so.6
+nextupl@@GLIBC_2.24                               /lib/x86_64-linux-gnu/libm.so.6
+nextupl@GLIBC_2.24                                /lib/x86_64-linux-gnu/libm.so.6
+ngettext                                          /lib/x86_64-linux-gnu/libc.so.6
+ngettext@@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+ngettext@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+nl_langinfo_l                                     /lib/x86_64-linux-gnu/libc.so.6
+nl_langinfo_l@@GLIBC_2.3                          /lib/x86_64-linux-gnu/libc.so.6
+nl_langinfo_l@GLIBC_2.3                           /lib/x86_64-linux-gnu/libc.so.6
+nlr_jump                                          build/py/nlrx64.o
+                                                  build/py/objstr.o
+                                                  build/py/objset.o
+                                                  build/py/objgetitemiter.o
+                                                  build/py/objgenerator.o
+                                                  build/py/objfun.o
+                                                  build/py/objdict.o
+                                                  build/py/scheduler.o
+                                                  build/py/runtime.o
+                                                  build/py/parsenum.o
+                                                  build/py/compile.o
+                                                  build/py/parse.o
+nlr_jump_fail                                     build/main.o
+                                                  build/py/nlrx64.o
+nlr_pop                                           build/py/nlr.o
+                                                  build/main.o
+                                                  build/py/vm.o
+                                                  build/py/objgetitemiter.o
+                                                  build/py/runtime_utils.o
+                                                  build/py/runtime.o
+nlr_push                                          build/py/nlrx64.o
+                                                  build/main.o
+                                                  build/py/vm.o
+                                                  build/py/objgetitemiter.o
+                                                  build/py/runtime_utils.o
+                                                  build/py/runtime.o
+nlr_push_tail                                     build/py/nlr.o
+                                                  build/py/nlrx64.o
+nrand48_r                                         /lib/x86_64-linux-gnu/libc.so.6
+nrand48_r@@GLIBC_2.2.5                            /lib/x86_64-linux-gnu/libc.so.6
+nrand48_r@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+ntohl                                             /lib/x86_64-linux-gnu/libc.so.6
+ntohl@@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libc.so.6
+ntohl@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libc.so.6
+ntohs                                             /lib/x86_64-linux-gnu/libc.so.6
+ntohs@@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libc.so.6
+ntohs@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libc.so.6
+ntp_adjtime                                       /lib/x86_64-linux-gnu/libc.so.6
+ntp_adjtime@@GLIBC_2.2.5                          /lib/x86_64-linux-gnu/libc.so.6
+ntp_adjtime@GLIBC_2.2.5                           /lib/x86_64-linux-gnu/libc.so.6
+obstack_printf                                    /lib/x86_64-linux-gnu/libc.so.6
+obstack_printf@@GLIBC_2.2.5                       /lib/x86_64-linux-gnu/libc.so.6
+obstack_printf@GLIBC_2.2.5                        /lib/x86_64-linux-gnu/libc.so.6
+obstack_vprintf                                   /lib/x86_64-linux-gnu/libc.so.6
+obstack_vprintf@@GLIBC_2.2.5                      /lib/x86_64-linux-gnu/libc.so.6
+obstack_vprintf@GLIBC_2.2.5                       /lib/x86_64-linux-gnu/libc.so.6
+on_exit                                           /lib/x86_64-linux-gnu/libc.so.6
+on_exit@@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+on_exit@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+open                                              /lib/x86_64-linux-gnu/libc.so.6
+                                                  build/py/persistentcode.o
+                                                  build/py/reader.o
+open64                                            /lib/x86_64-linux-gnu/libc.so.6
+open64@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+open64@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libc.so.6
+open@@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libc.so.6
+open@GLIBC_2.2.5                                  /lib/x86_64-linux-gnu/libc.so.6
+open_memstream                                    /lib/x86_64-linux-gnu/libc.so.6
+open_memstream@@GLIBC_2.2.5                       /lib/x86_64-linux-gnu/libc.so.6
+open_memstream@GLIBC_2.2.5                        /lib/x86_64-linux-gnu/libc.so.6
+openat                                            /lib/x86_64-linux-gnu/libc.so.6
+openat64                                          /lib/x86_64-linux-gnu/libc.so.6
+openat64@@GLIBC_2.4                               /lib/x86_64-linux-gnu/libc.so.6
+openat64@GLIBC_2.4                                /lib/x86_64-linux-gnu/libc.so.6
+openat@@GLIBC_2.4                                 /lib/x86_64-linux-gnu/libc.so.6
+openat@GLIBC_2.4                                  /lib/x86_64-linux-gnu/libc.so.6
+opendir                                           /lib/x86_64-linux-gnu/libc.so.6
+opendir@@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+opendir@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+pathconf                                          /lib/x86_64-linux-gnu/libc.so.6
+pathconf@@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+pathconf@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+pause                                             /lib/x86_64-linux-gnu/libc.so.6
+pause@@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libc.so.6
+pause@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libc.so.6
+personality                                       /lib/x86_64-linux-gnu/libc.so.6
+personality@@GLIBC_2.2.5                          /lib/x86_64-linux-gnu/libc.so.6
+personality@GLIBC_2.2.5                           /lib/x86_64-linux-gnu/libc.so.6
+pipe                                              /lib/x86_64-linux-gnu/libc.so.6
+pipe2                                             /lib/x86_64-linux-gnu/libc.so.6
+pipe2@@GLIBC_2.9                                  /lib/x86_64-linux-gnu/libc.so.6
+pipe2@GLIBC_2.9                                   /lib/x86_64-linux-gnu/libc.so.6
+pipe@@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libc.so.6
+pipe@GLIBC_2.2.5                                  /lib/x86_64-linux-gnu/libc.so.6
+poll                                              /lib/x86_64-linux-gnu/libc.so.6
+poll@@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libc.so.6
+poll@GLIBC_2.2.5                                  /lib/x86_64-linux-gnu/libc.so.6
+posix_fadvise64                                   /lib/x86_64-linux-gnu/libc.so.6
+posix_fadvise64@@GLIBC_2.2.5                      /lib/x86_64-linux-gnu/libc.so.6
+posix_fadvise64@GLIBC_2.2.5                       /lib/x86_64-linux-gnu/libc.so.6
+posix_memalign                                    /lib/x86_64-linux-gnu/libc.so.6
+posix_memalign@@GLIBC_2.2.5                       /lib/x86_64-linux-gnu/libc.so.6
+posix_memalign@GLIBC_2.2.5                        /lib/x86_64-linux-gnu/libc.so.6
+posix_openpt                                      /lib/x86_64-linux-gnu/libc.so.6
+posix_openpt@@GLIBC_2.2.5                         /lib/x86_64-linux-gnu/libc.so.6
+posix_openpt@GLIBC_2.2.5                          /lib/x86_64-linux-gnu/libc.so.6
+posix_spawn_file_actions_addclose                 /lib/x86_64-linux-gnu/libc.so.6
+posix_spawn_file_actions_addclose@@GLIBC_2.2.5    /lib/x86_64-linux-gnu/libc.so.6
+posix_spawn_file_actions_addclose@GLIBC_2.2.5     /lib/x86_64-linux-gnu/libc.so.6
+posix_spawn_file_actions_adddup2                  /lib/x86_64-linux-gnu/libc.so.6
+posix_spawn_file_actions_adddup2@@GLIBC_2.2.5     /lib/x86_64-linux-gnu/libc.so.6
+posix_spawn_file_actions_adddup2@GLIBC_2.2.5      /lib/x86_64-linux-gnu/libc.so.6
+posix_spawn_file_actions_addopen                  /lib/x86_64-linux-gnu/libc.so.6
+posix_spawn_file_actions_addopen@@GLIBC_2.2.5     /lib/x86_64-linux-gnu/libc.so.6
+posix_spawn_file_actions_addopen@GLIBC_2.2.5      /lib/x86_64-linux-gnu/libc.so.6
+posix_spawn_file_actions_destroy                  /lib/x86_64-linux-gnu/libc.so.6
+posix_spawn_file_actions_destroy@@GLIBC_2.2.5     /lib/x86_64-linux-gnu/libc.so.6
+posix_spawn_file_actions_destroy@GLIBC_2.2.5      /lib/x86_64-linux-gnu/libc.so.6
+posix_spawn_file_actions_init                     /lib/x86_64-linux-gnu/libc.so.6
+posix_spawn_file_actions_init@@GLIBC_2.2.5        /lib/x86_64-linux-gnu/libc.so.6
+posix_spawn_file_actions_init@GLIBC_2.2.5         /lib/x86_64-linux-gnu/libc.so.6
+posix_spawnattr_destroy                           /lib/x86_64-linux-gnu/libc.so.6
+posix_spawnattr_destroy@@GLIBC_2.2.5              /lib/x86_64-linux-gnu/libc.so.6
+posix_spawnattr_destroy@GLIBC_2.2.5               /lib/x86_64-linux-gnu/libc.so.6
+posix_spawnattr_init                              /lib/x86_64-linux-gnu/libc.so.6
+posix_spawnattr_init@@GLIBC_2.2.5                 /lib/x86_64-linux-gnu/libc.so.6
+posix_spawnattr_init@GLIBC_2.2.5                  /lib/x86_64-linux-gnu/libc.so.6
+posix_spawnattr_setflags                          /lib/x86_64-linux-gnu/libc.so.6
+posix_spawnattr_setflags@@GLIBC_2.2.5             /lib/x86_64-linux-gnu/libc.so.6
+posix_spawnattr_setflags@GLIBC_2.2.5              /lib/x86_64-linux-gnu/libc.so.6
+posix_spawnattr_setsigdefault                     /lib/x86_64-linux-gnu/libc.so.6
+posix_spawnattr_setsigdefault@@GLIBC_2.2.5        /lib/x86_64-linux-gnu/libc.so.6
+posix_spawnattr_setsigdefault@GLIBC_2.2.5         /lib/x86_64-linux-gnu/libc.so.6
+posix_spawnattr_setsigmask                        /lib/x86_64-linux-gnu/libc.so.6
+posix_spawnattr_setsigmask@@GLIBC_2.2.5           /lib/x86_64-linux-gnu/libc.so.6
+posix_spawnattr_setsigmask@GLIBC_2.2.5            /lib/x86_64-linux-gnu/libc.so.6
+pow                                               /lib/x86_64-linux-gnu/libm.so.6
+                                                  build/py/modbuiltins.o
+                                                  build/py/objfloat.o
+                                                  build/py/parsenum.o
+pow@@GLIBC_2.29                                   /lib/x86_64-linux-gnu/libm.so.6
+pow@GLIBC_2.29                                    /lib/x86_64-linux-gnu/libm.so.6
+powf128                                           /lib/x86_64-linux-gnu/libm.so.6
+powf128@@GLIBC_2.26                               /lib/x86_64-linux-gnu/libm.so.6
+powf128@GLIBC_2.26                                /lib/x86_64-linux-gnu/libm.so.6
+powf32                                            /lib/x86_64-linux-gnu/libm.so.6
+powf32@@GLIBC_2.27                                /lib/x86_64-linux-gnu/libm.so.6
+powf32@GLIBC_2.27                                 /lib/x86_64-linux-gnu/libm.so.6
+powf32x                                           /lib/x86_64-linux-gnu/libm.so.6
+powf32x@@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+powf32x@GLIBC_2.27                                /lib/x86_64-linux-gnu/libm.so.6
+powf64                                            /lib/x86_64-linux-gnu/libm.so.6
+powf64@@GLIBC_2.27                                /lib/x86_64-linux-gnu/libm.so.6
+powf64@GLIBC_2.27                                 /lib/x86_64-linux-gnu/libm.so.6
+powf64x                                           /lib/x86_64-linux-gnu/libm.so.6
+powf64x@@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+powf64x@GLIBC_2.27                                /lib/x86_64-linux-gnu/libm.so.6
+powl                                              /lib/x86_64-linux-gnu/libm.so.6
+powl@@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libm.so.6
+powl@GLIBC_2.2.5                                  /lib/x86_64-linux-gnu/libm.so.6
+prctl                                             /lib/x86_64-linux-gnu/libc.so.6
+prctl@@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libc.so.6
+prctl@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libc.so.6
+pread                                             /lib/x86_64-linux-gnu/libc.so.6
+pread64                                           /lib/x86_64-linux-gnu/libc.so.6
+pread64@@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+pread64@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+pread@@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libc.so.6
+pread@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libc.so.6
+printf                                            /lib/x86_64-linux-gnu/libc.so.6
+                                                  build/main.o
+printf@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+printf@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libc.so.6
+prlimit64                                         /lib/x86_64-linux-gnu/libc.so.6
+prlimit64@@GLIBC_2.13                             /lib/x86_64-linux-gnu/libc.so.6
+prlimit64@GLIBC_2.13                              /lib/x86_64-linux-gnu/libc.so.6
+profil                                            /lib/x86_64-linux-gnu/libc.so.6
+profil@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+profil@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libc.so.6
+program_invocation_name                           /lib/x86_64-linux-gnu/libc.so.6
+program_invocation_name@@GLIBC_2.2.5              /lib/x86_64-linux-gnu/libc.so.6
+program_invocation_name@GLIBC_2.2.5               /lib/x86_64-linux-gnu/libc.so.6
+program_invocation_short_name                     /lib/x86_64-linux-gnu/libc.so.6
+program_invocation_short_name@@GLIBC_2.2.5        /lib/x86_64-linux-gnu/libc.so.6
+program_invocation_short_name@GLIBC_2.2.5         /lib/x86_64-linux-gnu/libc.so.6
+pselect                                           /lib/x86_64-linux-gnu/libc.so.6
+pselect@@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+pselect@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+pthread_equal                                     /lib/x86_64-linux-gnu/libc.so.6
+pthread_equal@@GLIBC_2.2.5                        /lib/x86_64-linux-gnu/libc.so.6
+pthread_equal@GLIBC_2.2.5                         /lib/x86_64-linux-gnu/libc.so.6
+ptsname_r                                         /lib/x86_64-linux-gnu/libc.so.6
+ptsname_r@@GLIBC_2.2.5                            /lib/x86_64-linux-gnu/libc.so.6
+ptsname_r@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+putc                                              /lib/x86_64-linux-gnu/libc.so.6
+putc@@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libc.so.6
+putc@GLIBC_2.2.5                                  /lib/x86_64-linux-gnu/libc.so.6
+putc_unlocked                                     /lib/x86_64-linux-gnu/libc.so.6
+putc_unlocked@@GLIBC_2.2.5                        /lib/x86_64-linux-gnu/libc.so.6
+putc_unlocked@GLIBC_2.2.5                         /lib/x86_64-linux-gnu/libc.so.6
+puts                                              /lib/x86_64-linux-gnu/libc.so.6
+                                                  build/main.o
+                                                  build/py/asmxtensa.o
+                                                  build/py/asmarm.o
+puts@@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libc.so.6
+puts@GLIBC_2.2.5                                  /lib/x86_64-linux-gnu/libc.so.6
+pututline                                         /lib/x86_64-linux-gnu/libc.so.6
+pututline@@GLIBC_2.2.5                            /lib/x86_64-linux-gnu/libc.so.6
+pututline@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+pvalloc                                           /lib/x86_64-linux-gnu/libc.so.6
+pvalloc@@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+pvalloc@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+pwrite                                            /lib/x86_64-linux-gnu/libc.so.6
+pwrite64                                          /lib/x86_64-linux-gnu/libc.so.6
+pwrite64@@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+pwrite64@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+pwrite@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+pwrite@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libc.so.6
+qecvt_r                                           /lib/x86_64-linux-gnu/libc.so.6
+qecvt_r@@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+qecvt_r@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+qfcvt_r                                           /lib/x86_64-linux-gnu/libc.so.6
+qfcvt_r@@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+qfcvt_r@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+qsort_r                                           /lib/x86_64-linux-gnu/libc.so.6
+qsort_r@@GLIBC_2.8                                /lib/x86_64-linux-gnu/libc.so.6
+qsort_r@GLIBC_2.8                                 /lib/x86_64-linux-gnu/libc.so.6
+qstr_compute_hash                                 build/py/qstr.o
+                                                  build/py/objstr.o
+                                                  build/py/objexcept.o
+                                                  build/py/runtime.o
+qstr_data                                         build/py/qstr.o
+                                                  build/py/objstrunicode.o
+                                                  build/py/objstr.o
+                                                  build/py/runtime.o
+                                                  build/py/persistentcode.o
+                                                  build/py/emitinlinextensa.o
+                                                  build/py/emitinlinethumb.o
+                                                  build/py/compile.o
+                                                  build/py/mpprint.o
+qstr_find_strn                                    build/py/qstr.o
+                                                  build/py/objstr.o
+                                                  build/py/parse.o
+qstr_from_str                                     build/py/qstr.o
+                                                  build/main.o
+                                                  build/py/lexer.o
+qstr_from_strn                                    build/py/qstr.o
+                                                  build/py/builtinimport.o
+                                                  build/py/objstr.o
+                                                  build/py/runtime.o
+                                                  build/py/compile.o
+                                                  build/py/parse.o
+qstr_hash                                         build/py/qstr.o
+                                                  build/py/objstr.o
+                                                  build/py/map.o
+                                                  build/py/runtime.o
+qstr_init                                         build/py/qstr.o
+                                                  build/py/runtime.o
+qstr_len                                          build/py/qstr.o
+                                                  build/py/objstr.o
+                                                  build/py/obj.o
+                                                  build/py/runtime.o
+                                                  build/py/compile.o
+qstr_pool_info                                    build/py/qstr.o
+qstr_str                                          build/py/qstr.o
+                                                  build/py/builtinimport.o
+                                                  build/py/objtype.o
+                                                  build/py/objexcept.o
+                                                  build/py/obj.o
+                                                  build/py/runtime.o
+                                                  build/py/emitinlinextensa.o
+                                                  build/py/emitinlinethumb.o
+                                                  build/py/parse.o
+random                                            /lib/x86_64-linux-gnu/libc.so.6
+random@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+random@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libc.so.6
+random_r                                          /lib/x86_64-linux-gnu/libc.so.6
+random_r@@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+random_r@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+rawmemchr                                         /lib/x86_64-linux-gnu/libc.so.6
+rawmemchr@@GLIBC_2.2.5                            /lib/x86_64-linux-gnu/libc.so.6
+rawmemchr@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+re_comp                                           /lib/x86_64-linux-gnu/libc.so.6
+re_comp@@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+re_comp@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+re_compile_fastmap                                /lib/x86_64-linux-gnu/libc.so.6
+re_compile_fastmap@@GLIBC_2.2.5                   /lib/x86_64-linux-gnu/libc.so.6
+re_compile_fastmap@GLIBC_2.2.5                    /lib/x86_64-linux-gnu/libc.so.6
+re_compile_pattern                                /lib/x86_64-linux-gnu/libc.so.6
+re_compile_pattern@@GLIBC_2.2.5                   /lib/x86_64-linux-gnu/libc.so.6
+re_compile_pattern@GLIBC_2.2.5                    /lib/x86_64-linux-gnu/libc.so.6
+re_exec                                           /lib/x86_64-linux-gnu/libc.so.6
+re_exec@@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+re_exec@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+re_match                                          /lib/x86_64-linux-gnu/libc.so.6
+re_match@@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+re_match@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+re_match_2                                        /lib/x86_64-linux-gnu/libc.so.6
+re_match_2@@GLIBC_2.2.5                           /lib/x86_64-linux-gnu/libc.so.6
+re_match_2@GLIBC_2.2.5                            /lib/x86_64-linux-gnu/libc.so.6
+re_search                                         /lib/x86_64-linux-gnu/libc.so.6
+re_search@@GLIBC_2.2.5                            /lib/x86_64-linux-gnu/libc.so.6
+re_search@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+re_search_2                                       /lib/x86_64-linux-gnu/libc.so.6
+re_search_2@@GLIBC_2.2.5                          /lib/x86_64-linux-gnu/libc.so.6
+re_search_2@GLIBC_2.2.5                           /lib/x86_64-linux-gnu/libc.so.6
+re_set_registers                                  /lib/x86_64-linux-gnu/libc.so.6
+re_set_registers@@GLIBC_2.2.5                     /lib/x86_64-linux-gnu/libc.so.6
+re_set_registers@GLIBC_2.2.5                      /lib/x86_64-linux-gnu/libc.so.6
+re_set_syntax                                     /lib/x86_64-linux-gnu/libc.so.6
+re_set_syntax@@GLIBC_2.2.5                        /lib/x86_64-linux-gnu/libc.so.6
+re_set_syntax@GLIBC_2.2.5                         /lib/x86_64-linux-gnu/libc.so.6
+read                                              /lib/x86_64-linux-gnu/libc.so.6
+                                                  build/py/reader.o
+read@@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libc.so.6
+read@GLIBC_2.2.5                                  /lib/x86_64-linux-gnu/libc.so.6
+readahead                                         /lib/x86_64-linux-gnu/libc.so.6
+readahead@@GLIBC_2.3                              /lib/x86_64-linux-gnu/libc.so.6
+readahead@GLIBC_2.3                               /lib/x86_64-linux-gnu/libc.so.6
+readdir                                           /lib/x86_64-linux-gnu/libc.so.6
+readdir64                                         /lib/x86_64-linux-gnu/libc.so.6
+readdir64@@GLIBC_2.2.5                            /lib/x86_64-linux-gnu/libc.so.6
+readdir64@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+readdir64_r                                       /lib/x86_64-linux-gnu/libc.so.6
+readdir64_r@@GLIBC_2.2.5                          /lib/x86_64-linux-gnu/libc.so.6
+readdir64_r@GLIBC_2.2.5                           /lib/x86_64-linux-gnu/libc.so.6
+readdir@@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+readdir@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+readdir_r                                         /lib/x86_64-linux-gnu/libc.so.6
+readdir_r@@GLIBC_2.2.5                            /lib/x86_64-linux-gnu/libc.so.6
+readdir_r@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+readlink                                          /lib/x86_64-linux-gnu/libc.so.6
+readlink@@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+readlink@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+readv                                             /lib/x86_64-linux-gnu/libc.so.6
+readv@@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libc.so.6
+readv@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libc.so.6
+reallocarray                                      /lib/x86_64-linux-gnu/libc.so.6
+reallocarray@@GLIBC_2.26                          /lib/x86_64-linux-gnu/libc.so.6
+reallocarray@GLIBC_2.26                           /lib/x86_64-linux-gnu/libc.so.6
+recv                                              /lib/x86_64-linux-gnu/libc.so.6
+recv@@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libc.so.6
+recv@GLIBC_2.2.5                                  /lib/x86_64-linux-gnu/libc.so.6
+recvfrom                                          /lib/x86_64-linux-gnu/libc.so.6
+recvfrom@@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+recvfrom@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+recvmsg                                           /lib/x86_64-linux-gnu/libc.so.6
+recvmsg@@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+recvmsg@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+regcomp                                           /lib/x86_64-linux-gnu/libc.so.6
+regcomp@@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+regcomp@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+regerror                                          /lib/x86_64-linux-gnu/libc.so.6
+regerror@@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+regerror@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+regfree                                           /lib/x86_64-linux-gnu/libc.so.6
+regfree@@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+regfree@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+register_printf_function                          /lib/x86_64-linux-gnu/libc.so.6
+register_printf_function@@GLIBC_2.2.5             /lib/x86_64-linux-gnu/libc.so.6
+register_printf_function@GLIBC_2.2.5              /lib/x86_64-linux-gnu/libc.so.6
+register_printf_modifier                          /lib/x86_64-linux-gnu/libc.so.6
+register_printf_modifier@@GLIBC_2.10              /lib/x86_64-linux-gnu/libc.so.6
+register_printf_modifier@GLIBC_2.10               /lib/x86_64-linux-gnu/libc.so.6
+register_printf_specifier                         /lib/x86_64-linux-gnu/libc.so.6
+register_printf_specifier@@GLIBC_2.10             /lib/x86_64-linux-gnu/libc.so.6
+register_printf_specifier@GLIBC_2.10              /lib/x86_64-linux-gnu/libc.so.6
+register_printf_type                              /lib/x86_64-linux-gnu/libc.so.6
+register_printf_type@@GLIBC_2.10                  /lib/x86_64-linux-gnu/libc.so.6
+register_printf_type@GLIBC_2.10                   /lib/x86_64-linux-gnu/libc.so.6
+remainder                                         /lib/x86_64-linux-gnu/libm.so.6
+remainder@@GLIBC_2.2.5                            /lib/x86_64-linux-gnu/libm.so.6
+remainder@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libm.so.6
+remainderf                                        /lib/x86_64-linux-gnu/libm.so.6
+remainderf128                                     /lib/x86_64-linux-gnu/libm.so.6
+remainderf128@@GLIBC_2.26                         /lib/x86_64-linux-gnu/libm.so.6
+remainderf128@GLIBC_2.26                          /lib/x86_64-linux-gnu/libm.so.6
+remainderf32                                      /lib/x86_64-linux-gnu/libm.so.6
+remainderf32@@GLIBC_2.27                          /lib/x86_64-linux-gnu/libm.so.6
+remainderf32@GLIBC_2.27                           /lib/x86_64-linux-gnu/libm.so.6
+remainderf32x                                     /lib/x86_64-linux-gnu/libm.so.6
+remainderf32x@@GLIBC_2.27                         /lib/x86_64-linux-gnu/libm.so.6
+remainderf32x@GLIBC_2.27                          /lib/x86_64-linux-gnu/libm.so.6
+remainderf64                                      /lib/x86_64-linux-gnu/libm.so.6
+remainderf64@@GLIBC_2.27                          /lib/x86_64-linux-gnu/libm.so.6
+remainderf64@GLIBC_2.27                           /lib/x86_64-linux-gnu/libm.so.6
+remainderf64x                                     /lib/x86_64-linux-gnu/libm.so.6
+remainderf64x@@GLIBC_2.27                         /lib/x86_64-linux-gnu/libm.so.6
+remainderf64x@GLIBC_2.27                          /lib/x86_64-linux-gnu/libm.so.6
+remainderf@@GLIBC_2.2.5                           /lib/x86_64-linux-gnu/libm.so.6
+remainderf@GLIBC_2.2.5                            /lib/x86_64-linux-gnu/libm.so.6
+remainderl                                        /lib/x86_64-linux-gnu/libm.so.6
+remainderl@@GLIBC_2.2.5                           /lib/x86_64-linux-gnu/libm.so.6
+remainderl@GLIBC_2.2.5                            /lib/x86_64-linux-gnu/libm.so.6
+remap_file_pages                                  /lib/x86_64-linux-gnu/libc.so.6
+remap_file_pages@@GLIBC_2.3.3                     /lib/x86_64-linux-gnu/libc.so.6
+remap_file_pages@GLIBC_2.3.3                      /lib/x86_64-linux-gnu/libc.so.6
+remquo                                            /lib/x86_64-linux-gnu/libm.so.6
+remquo@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libm.so.6
+remquo@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+remquof                                           /lib/x86_64-linux-gnu/libm.so.6
+remquof128                                        /lib/x86_64-linux-gnu/libm.so.6
+remquof128@@GLIBC_2.26                            /lib/x86_64-linux-gnu/libm.so.6
+remquof128@GLIBC_2.26                             /lib/x86_64-linux-gnu/libm.so.6
+remquof32                                         /lib/x86_64-linux-gnu/libm.so.6
+remquof32@@GLIBC_2.27                             /lib/x86_64-linux-gnu/libm.so.6
+remquof32@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+remquof32x                                        /lib/x86_64-linux-gnu/libm.so.6
+remquof32x@@GLIBC_2.27                            /lib/x86_64-linux-gnu/libm.so.6
+remquof32x@GLIBC_2.27                             /lib/x86_64-linux-gnu/libm.so.6
+remquof64                                         /lib/x86_64-linux-gnu/libm.so.6
+remquof64@@GLIBC_2.27                             /lib/x86_64-linux-gnu/libm.so.6
+remquof64@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+remquof64x                                        /lib/x86_64-linux-gnu/libm.so.6
+remquof64x@@GLIBC_2.27                            /lib/x86_64-linux-gnu/libm.so.6
+remquof64x@GLIBC_2.27                             /lib/x86_64-linux-gnu/libm.so.6
+remquof@@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libm.so.6
+remquof@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libm.so.6
+remquol                                           /lib/x86_64-linux-gnu/libm.so.6
+remquol@@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libm.so.6
+remquol@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libm.so.6
+renameat                                          /lib/x86_64-linux-gnu/libc.so.6
+renameat2                                         /lib/x86_64-linux-gnu/libc.so.6
+renameat2@@GLIBC_2.28                             /lib/x86_64-linux-gnu/libc.so.6
+renameat2@GLIBC_2.28                              /lib/x86_64-linux-gnu/libc.so.6
+renameat@@GLIBC_2.4                               /lib/x86_64-linux-gnu/libc.so.6
+renameat@GLIBC_2.4                                /lib/x86_64-linux-gnu/libc.so.6
+revoke                                            /lib/x86_64-linux-gnu/libc.so.6
+revoke@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+revoke@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libc.so.6
+rewinddir                                         /lib/x86_64-linux-gnu/libc.so.6
+rewinddir@@GLIBC_2.2.5                            /lib/x86_64-linux-gnu/libc.so.6
+rewinddir@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+rindex                                            /lib/x86_64-linux-gnu/libc.so.6
+rindex@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+rindex@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libc.so.6
+ringbuf_get16                                     build/py/ringbuf.o
+ringbuf_peek16                                    build/py/ringbuf.o
+ringbuf_put16                                     build/py/ringbuf.o
+rint                                              /lib/x86_64-linux-gnu/libm.so.6
+rint@@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libm.so.6
+rint@GLIBC_2.2.5                                  /lib/x86_64-linux-gnu/libm.so.6
+rintf                                             /lib/x86_64-linux-gnu/libm.so.6
+rintf128                                          /lib/x86_64-linux-gnu/libm.so.6
+rintf128@@GLIBC_2.26                              /lib/x86_64-linux-gnu/libm.so.6
+rintf128@GLIBC_2.26                               /lib/x86_64-linux-gnu/libm.so.6
+rintf32                                           /lib/x86_64-linux-gnu/libm.so.6
+rintf32@@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+rintf32@GLIBC_2.27                                /lib/x86_64-linux-gnu/libm.so.6
+rintf32x                                          /lib/x86_64-linux-gnu/libm.so.6
+rintf32x@@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+rintf32x@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+rintf64                                           /lib/x86_64-linux-gnu/libm.so.6
+rintf64@@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+rintf64@GLIBC_2.27                                /lib/x86_64-linux-gnu/libm.so.6
+rintf64x                                          /lib/x86_64-linux-gnu/libm.so.6
+rintf64x@@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+rintf64x@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+rintf@@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+rintf@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libm.so.6
+rintl                                             /lib/x86_64-linux-gnu/libm.so.6
+rintl@@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+rintl@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libm.so.6
+rmdir                                             /lib/x86_64-linux-gnu/libc.so.6
+rmdir@@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libc.so.6
+rmdir@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libc.so.6
+round                                             /lib/x86_64-linux-gnu/libm.so.6
+round@@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+round@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libm.so.6
+roundeven                                         /lib/x86_64-linux-gnu/libm.so.6
+roundeven@@GLIBC_2.25                             /lib/x86_64-linux-gnu/libm.so.6
+roundeven@GLIBC_2.25                              /lib/x86_64-linux-gnu/libm.so.6
+roundevenf                                        /lib/x86_64-linux-gnu/libm.so.6
+roundevenf128                                     /lib/x86_64-linux-gnu/libm.so.6
+roundevenf128@@GLIBC_2.26                         /lib/x86_64-linux-gnu/libm.so.6
+roundevenf128@GLIBC_2.26                          /lib/x86_64-linux-gnu/libm.so.6
+roundevenf32                                      /lib/x86_64-linux-gnu/libm.so.6
+roundevenf32@@GLIBC_2.27                          /lib/x86_64-linux-gnu/libm.so.6
+roundevenf32@GLIBC_2.27                           /lib/x86_64-linux-gnu/libm.so.6
+roundevenf32x                                     /lib/x86_64-linux-gnu/libm.so.6
+roundevenf32x@@GLIBC_2.27                         /lib/x86_64-linux-gnu/libm.so.6
+roundevenf32x@GLIBC_2.27                          /lib/x86_64-linux-gnu/libm.so.6
+roundevenf64                                      /lib/x86_64-linux-gnu/libm.so.6
+roundevenf64@@GLIBC_2.27                          /lib/x86_64-linux-gnu/libm.so.6
+roundevenf64@GLIBC_2.27                           /lib/x86_64-linux-gnu/libm.so.6
+roundevenf64x                                     /lib/x86_64-linux-gnu/libm.so.6
+roundevenf64x@@GLIBC_2.27                         /lib/x86_64-linux-gnu/libm.so.6
+roundevenf64x@GLIBC_2.27                          /lib/x86_64-linux-gnu/libm.so.6
+roundevenf@@GLIBC_2.25                            /lib/x86_64-linux-gnu/libm.so.6
+roundevenf@GLIBC_2.25                             /lib/x86_64-linux-gnu/libm.so.6
+roundevenl                                        /lib/x86_64-linux-gnu/libm.so.6
+roundevenl@@GLIBC_2.25                            /lib/x86_64-linux-gnu/libm.so.6
+roundevenl@GLIBC_2.25                             /lib/x86_64-linux-gnu/libm.so.6
+roundf                                            /lib/x86_64-linux-gnu/libm.so.6
+roundf128                                         /lib/x86_64-linux-gnu/libm.so.6
+roundf128@@GLIBC_2.26                             /lib/x86_64-linux-gnu/libm.so.6
+roundf128@GLIBC_2.26                              /lib/x86_64-linux-gnu/libm.so.6
+roundf32                                          /lib/x86_64-linux-gnu/libm.so.6
+roundf32@@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+roundf32@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+roundf32x                                         /lib/x86_64-linux-gnu/libm.so.6
+roundf32x@@GLIBC_2.27                             /lib/x86_64-linux-gnu/libm.so.6
+roundf32x@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+roundf64                                          /lib/x86_64-linux-gnu/libm.so.6
+roundf64@@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+roundf64@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+roundf64x                                         /lib/x86_64-linux-gnu/libm.so.6
+roundf64x@@GLIBC_2.27                             /lib/x86_64-linux-gnu/libm.so.6
+roundf64x@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+roundf@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libm.so.6
+roundf@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+roundl                                            /lib/x86_64-linux-gnu/libm.so.6
+roundl@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libm.so.6
+roundl@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+sbrk                                              /lib/x86_64-linux-gnu/libc.so.6
+sbrk@@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libc.so.6
+sbrk@GLIBC_2.2.5                                  /lib/x86_64-linux-gnu/libc.so.6
+scalb                                             /lib/x86_64-linux-gnu/libm.so.6
+scalb@@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+scalb@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libm.so.6
+scalbf                                            /lib/x86_64-linux-gnu/libm.so.6
+scalbf@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libm.so.6
+scalbf@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+scalbl                                            /lib/x86_64-linux-gnu/libm.so.6
+scalbl@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libm.so.6
+scalbl@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+scalbln                                           /lib/x86_64-linux-gnu/libm.so.6
+scalbln@@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libm.so.6
+scalbln@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libm.so.6
+scalblnf                                          /lib/x86_64-linux-gnu/libm.so.6
+scalblnf128                                       /lib/x86_64-linux-gnu/libm.so.6
+scalblnf128@@GLIBC_2.26                           /lib/x86_64-linux-gnu/libm.so.6
+scalblnf128@GLIBC_2.26                            /lib/x86_64-linux-gnu/libm.so.6
+scalblnf32                                        /lib/x86_64-linux-gnu/libm.so.6
+scalblnf32@@GLIBC_2.27                            /lib/x86_64-linux-gnu/libm.so.6
+scalblnf32@GLIBC_2.27                             /lib/x86_64-linux-gnu/libm.so.6
+scalblnf32x                                       /lib/x86_64-linux-gnu/libm.so.6
+scalblnf32x@@GLIBC_2.27                           /lib/x86_64-linux-gnu/libm.so.6
+scalblnf32x@GLIBC_2.27                            /lib/x86_64-linux-gnu/libm.so.6
+scalblnf64                                        /lib/x86_64-linux-gnu/libm.so.6
+scalblnf64@@GLIBC_2.27                            /lib/x86_64-linux-gnu/libm.so.6
+scalblnf64@GLIBC_2.27                             /lib/x86_64-linux-gnu/libm.so.6
+scalblnf64x                                       /lib/x86_64-linux-gnu/libm.so.6
+scalblnf64x@@GLIBC_2.27                           /lib/x86_64-linux-gnu/libm.so.6
+scalblnf64x@GLIBC_2.27                            /lib/x86_64-linux-gnu/libm.so.6
+scalblnf@@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libm.so.6
+scalblnf@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libm.so.6
+scalblnl                                          /lib/x86_64-linux-gnu/libm.so.6
+scalblnl@@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libm.so.6
+scalblnl@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libm.so.6
+scalbn                                            /lib/x86_64-linux-gnu/libm.so.6
+scalbn@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libm.so.6
+                                                  /lib/x86_64-linux-gnu/libc.so.6
+scalbn@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+scalbnf                                           /lib/x86_64-linux-gnu/libm.so.6
+scalbnf128                                        /lib/x86_64-linux-gnu/libm.so.6
+scalbnf128@@GLIBC_2.26                            /lib/x86_64-linux-gnu/libm.so.6
+scalbnf128@GLIBC_2.26                             /lib/x86_64-linux-gnu/libm.so.6
+scalbnf32                                         /lib/x86_64-linux-gnu/libm.so.6
+scalbnf32@@GLIBC_2.27                             /lib/x86_64-linux-gnu/libm.so.6
+scalbnf32@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+scalbnf32x                                        /lib/x86_64-linux-gnu/libm.so.6
+scalbnf32x@@GLIBC_2.27                            /lib/x86_64-linux-gnu/libm.so.6
+scalbnf32x@GLIBC_2.27                             /lib/x86_64-linux-gnu/libm.so.6
+scalbnf64                                         /lib/x86_64-linux-gnu/libm.so.6
+scalbnf64@@GLIBC_2.27                             /lib/x86_64-linux-gnu/libm.so.6
+scalbnf64@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+scalbnf64x                                        /lib/x86_64-linux-gnu/libm.so.6
+scalbnf64x@@GLIBC_2.27                            /lib/x86_64-linux-gnu/libm.so.6
+scalbnf64x@GLIBC_2.27                             /lib/x86_64-linux-gnu/libm.so.6
+scalbnf@@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libm.so.6
+                                                  /lib/x86_64-linux-gnu/libc.so.6
+scalbnf@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libm.so.6
+scalbnl                                           /lib/x86_64-linux-gnu/libm.so.6
+scalbnl@@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libm.so.6
+                                                  /lib/x86_64-linux-gnu/libc.so.6
+scalbnl@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libm.so.6
+scandir                                           /lib/x86_64-linux-gnu/libc.so.6
+scandir64                                         /lib/x86_64-linux-gnu/libc.so.6
+scandir64@@GLIBC_2.2.5                            /lib/x86_64-linux-gnu/libc.so.6
+scandir64@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+scandir@@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+scandir@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+scandirat                                         /lib/x86_64-linux-gnu/libc.so.6
+scandirat@@GLIBC_2.15                             /lib/x86_64-linux-gnu/libc.so.6
+scandirat@GLIBC_2.15                              /lib/x86_64-linux-gnu/libc.so.6
+sched_get_priority_max                            /lib/x86_64-linux-gnu/libc.so.6
+sched_get_priority_max@@GLIBC_2.2.5               /lib/x86_64-linux-gnu/libc.so.6
+sched_get_priority_max@GLIBC_2.2.5                /lib/x86_64-linux-gnu/libc.so.6
+sched_get_priority_min                            /lib/x86_64-linux-gnu/libc.so.6
+sched_get_priority_min@@GLIBC_2.2.5               /lib/x86_64-linux-gnu/libc.so.6
+sched_get_priority_min@GLIBC_2.2.5                /lib/x86_64-linux-gnu/libc.so.6
+sched_getparam                                    /lib/x86_64-linux-gnu/libc.so.6
+sched_getparam@@GLIBC_2.2.5                       /lib/x86_64-linux-gnu/libc.so.6
+sched_getparam@GLIBC_2.2.5                        /lib/x86_64-linux-gnu/libc.so.6
+sched_getscheduler                                /lib/x86_64-linux-gnu/libc.so.6
+sched_getscheduler@@GLIBC_2.2.5                   /lib/x86_64-linux-gnu/libc.so.6
+sched_getscheduler@GLIBC_2.2.5                    /lib/x86_64-linux-gnu/libc.so.6
+sched_rr_get_interval                             /lib/x86_64-linux-gnu/libc.so.6
+sched_rr_get_interval@@GLIBC_2.2.5                /lib/x86_64-linux-gnu/libc.so.6
+sched_rr_get_interval@GLIBC_2.2.5                 /lib/x86_64-linux-gnu/libc.so.6
+sched_setparam                                    /lib/x86_64-linux-gnu/libc.so.6
+sched_setparam@@GLIBC_2.2.5                       /lib/x86_64-linux-gnu/libc.so.6
+sched_setparam@GLIBC_2.2.5                        /lib/x86_64-linux-gnu/libc.so.6
+sched_setscheduler                                /lib/x86_64-linux-gnu/libc.so.6
+sched_setscheduler@@GLIBC_2.2.5                   /lib/x86_64-linux-gnu/libc.so.6
+sched_setscheduler@GLIBC_2.2.5                    /lib/x86_64-linux-gnu/libc.so.6
+sched_yield                                       /lib/x86_64-linux-gnu/libc.so.6
+sched_yield@@GLIBC_2.2.5                          /lib/x86_64-linux-gnu/libc.so.6
+sched_yield@GLIBC_2.2.5                           /lib/x86_64-linux-gnu/libc.so.6
+scope_check_to_close_over                         build/py/scope.o
+                                                  build/py/compile.o
+scope_find                                        build/py/scope.o
+                                                  build/py/emitcommon.o
+                                                  build/py/compile.o
+scope_find_global                                 build/py/scope.o
+                                                  build/py/compile.o
+scope_find_or_add_id                              build/py/scope.o
+                                                  build/py/emitcommon.o
+                                                  build/py/compile.o
+scope_free                                        build/py/scope.o
+                                                  build/py/compile.o
+scope_new                                         build/py/scope.o
+                                                  build/py/compile.o
+secure_getenv                                     /lib/x86_64-linux-gnu/libc.so.6
+secure_getenv@@GLIBC_2.17                         /lib/x86_64-linux-gnu/libc.so.6
+secure_getenv@GLIBC_2.17                          /lib/x86_64-linux-gnu/libc.so.6
+seed48_r                                          /lib/x86_64-linux-gnu/libc.so.6
+seed48_r@@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+seed48_r@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+select                                            /lib/x86_64-linux-gnu/libc.so.6
+select@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+select@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libc.so.6
+semtimedop                                        /lib/x86_64-linux-gnu/libc.so.6
+semtimedop@@GLIBC_2.3.3                           /lib/x86_64-linux-gnu/libc.so.6
+semtimedop@GLIBC_2.3.3                            /lib/x86_64-linux-gnu/libc.so.6
+send                                              /lib/x86_64-linux-gnu/libc.so.6
+send@@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libc.so.6
+send@GLIBC_2.2.5                                  /lib/x86_64-linux-gnu/libc.so.6
+sendfile64                                        /lib/x86_64-linux-gnu/libc.so.6
+sendfile64@@GLIBC_2.3                             /lib/x86_64-linux-gnu/libc.so.6
+sendfile64@GLIBC_2.3                              /lib/x86_64-linux-gnu/libc.so.6
+sendmmsg                                          /lib/x86_64-linux-gnu/libc.so.6
+sendmmsg@@GLIBC_2.14                              /lib/x86_64-linux-gnu/libc.so.6
+sendmmsg@GLIBC_2.14                               /lib/x86_64-linux-gnu/libc.so.6
+sendmsg                                           /lib/x86_64-linux-gnu/libc.so.6
+sendmsg@@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+sendmsg@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+sendto                                            /lib/x86_64-linux-gnu/libc.so.6
+sendto@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+sendto@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libc.so.6
+setbuffer                                         /lib/x86_64-linux-gnu/libc.so.6
+setbuffer@@GLIBC_2.2.5                            /lib/x86_64-linux-gnu/libc.so.6
+setbuffer@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+setcontext                                        /lib/x86_64-linux-gnu/libc.so.6
+setcontext@@GLIBC_2.2.5                           /lib/x86_64-linux-gnu/libc.so.6
+setcontext@GLIBC_2.2.5                            /lib/x86_64-linux-gnu/libc.so.6
+setenv                                            /lib/x86_64-linux-gnu/libc.so.6
+setenv@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+setenv@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libc.so.6
+setgid                                            /lib/x86_64-linux-gnu/libc.so.6
+setgid@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+setgid@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libc.so.6
+setitimer                                         /lib/x86_64-linux-gnu/libc.so.6
+setitimer@@GLIBC_2.2.5                            /lib/x86_64-linux-gnu/libc.so.6
+setitimer@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+setmntent                                         /lib/x86_64-linux-gnu/libc.so.6
+setmntent@@GLIBC_2.2.5                            /lib/x86_64-linux-gnu/libc.so.6
+setmntent@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+setpayload                                        /lib/x86_64-linux-gnu/libm.so.6
+setpayload@@GLIBC_2.25                            /lib/x86_64-linux-gnu/libm.so.6
+setpayload@GLIBC_2.25                             /lib/x86_64-linux-gnu/libm.so.6
+setpayloadf                                       /lib/x86_64-linux-gnu/libm.so.6
+setpayloadf128                                    /lib/x86_64-linux-gnu/libm.so.6
+setpayloadf128@@GLIBC_2.26                        /lib/x86_64-linux-gnu/libm.so.6
+setpayloadf128@GLIBC_2.26                         /lib/x86_64-linux-gnu/libm.so.6
+setpayloadf32                                     /lib/x86_64-linux-gnu/libm.so.6
+setpayloadf32@@GLIBC_2.27                         /lib/x86_64-linux-gnu/libm.so.6
+setpayloadf32@GLIBC_2.27                          /lib/x86_64-linux-gnu/libm.so.6
+setpayloadf32x                                    /lib/x86_64-linux-gnu/libm.so.6
+setpayloadf32x@@GLIBC_2.27                        /lib/x86_64-linux-gnu/libm.so.6
+setpayloadf32x@GLIBC_2.27                         /lib/x86_64-linux-gnu/libm.so.6
+setpayloadf64                                     /lib/x86_64-linux-gnu/libm.so.6
+setpayloadf64@@GLIBC_2.27                         /lib/x86_64-linux-gnu/libm.so.6
+setpayloadf64@GLIBC_2.27                          /lib/x86_64-linux-gnu/libm.so.6
+setpayloadf64x                                    /lib/x86_64-linux-gnu/libm.so.6
+setpayloadf64x@@GLIBC_2.27                        /lib/x86_64-linux-gnu/libm.so.6
+setpayloadf64x@GLIBC_2.27                         /lib/x86_64-linux-gnu/libm.so.6
+setpayloadf@@GLIBC_2.25                           /lib/x86_64-linux-gnu/libm.so.6
+setpayloadf@GLIBC_2.25                            /lib/x86_64-linux-gnu/libm.so.6
+setpayloadl                                       /lib/x86_64-linux-gnu/libm.so.6
+setpayloadl@@GLIBC_2.25                           /lib/x86_64-linux-gnu/libm.so.6
+setpayloadl@GLIBC_2.25                            /lib/x86_64-linux-gnu/libm.so.6
+setpayloadsig                                     /lib/x86_64-linux-gnu/libm.so.6
+setpayloadsig@@GLIBC_2.25                         /lib/x86_64-linux-gnu/libm.so.6
+setpayloadsig@GLIBC_2.25                          /lib/x86_64-linux-gnu/libm.so.6
+setpayloadsigf                                    /lib/x86_64-linux-gnu/libm.so.6
+setpayloadsigf128                                 /lib/x86_64-linux-gnu/libm.so.6
+setpayloadsigf128@@GLIBC_2.26                     /lib/x86_64-linux-gnu/libm.so.6
+setpayloadsigf128@GLIBC_2.26                      /lib/x86_64-linux-gnu/libm.so.6
+setpayloadsigf32                                  /lib/x86_64-linux-gnu/libm.so.6
+setpayloadsigf32@@GLIBC_2.27                      /lib/x86_64-linux-gnu/libm.so.6
+setpayloadsigf32@GLIBC_2.27                       /lib/x86_64-linux-gnu/libm.so.6
+setpayloadsigf32x                                 /lib/x86_64-linux-gnu/libm.so.6
+setpayloadsigf32x@@GLIBC_2.27                     /lib/x86_64-linux-gnu/libm.so.6
+setpayloadsigf32x@GLIBC_2.27                      /lib/x86_64-linux-gnu/libm.so.6
+setpayloadsigf64                                  /lib/x86_64-linux-gnu/libm.so.6
+setpayloadsigf64@@GLIBC_2.27                      /lib/x86_64-linux-gnu/libm.so.6
+setpayloadsigf64@GLIBC_2.27                       /lib/x86_64-linux-gnu/libm.so.6
+setpayloadsigf64x                                 /lib/x86_64-linux-gnu/libm.so.6
+setpayloadsigf64x@@GLIBC_2.27                     /lib/x86_64-linux-gnu/libm.so.6
+setpayloadsigf64x@GLIBC_2.27                      /lib/x86_64-linux-gnu/libm.so.6
+setpayloadsigf@@GLIBC_2.25                        /lib/x86_64-linux-gnu/libm.so.6
+setpayloadsigf@GLIBC_2.25                         /lib/x86_64-linux-gnu/libm.so.6
+setpayloadsigl                                    /lib/x86_64-linux-gnu/libm.so.6
+setpayloadsigl@@GLIBC_2.25                        /lib/x86_64-linux-gnu/libm.so.6
+setpayloadsigl@GLIBC_2.25                         /lib/x86_64-linux-gnu/libm.so.6
+setpgid                                           /lib/x86_64-linux-gnu/libc.so.6
+setpgid@@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+setpgid@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+setpriority                                       /lib/x86_64-linux-gnu/libc.so.6
+setpriority@@GLIBC_2.2.5                          /lib/x86_64-linux-gnu/libc.so.6
+setpriority@GLIBC_2.2.5                           /lib/x86_64-linux-gnu/libc.so.6
+setregid                                          /lib/x86_64-linux-gnu/libc.so.6
+setregid@@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+setregid@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+setresgid                                         /lib/x86_64-linux-gnu/libc.so.6
+setresgid@@GLIBC_2.2.5                            /lib/x86_64-linux-gnu/libc.so.6
+setresgid@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+setresuid                                         /lib/x86_64-linux-gnu/libc.so.6
+setresuid@@GLIBC_2.2.5                            /lib/x86_64-linux-gnu/libc.so.6
+setresuid@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+setreuid                                          /lib/x86_64-linux-gnu/libc.so.6
+setreuid@@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+setreuid@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+setrlimit                                         /lib/x86_64-linux-gnu/libc.so.6
+setrlimit64                                       /lib/x86_64-linux-gnu/libc.so.6
+setrlimit64@@GLIBC_2.2.5                          /lib/x86_64-linux-gnu/libc.so.6
+setrlimit64@GLIBC_2.2.5                           /lib/x86_64-linux-gnu/libc.so.6
+setrlimit@@GLIBC_2.2.5                            /lib/x86_64-linux-gnu/libc.so.6
+setrlimit@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+setsid                                            /lib/x86_64-linux-gnu/libc.so.6
+setsid@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+setsid@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libc.so.6
+setsockopt                                        /lib/x86_64-linux-gnu/libc.so.6
+setsockopt@@GLIBC_2.2.5                           /lib/x86_64-linux-gnu/libc.so.6
+setsockopt@GLIBC_2.2.5                            /lib/x86_64-linux-gnu/libc.so.6
+setstate                                          /lib/x86_64-linux-gnu/libc.so.6
+setstate@@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+setstate@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+setstate_r                                        /lib/x86_64-linux-gnu/libc.so.6
+setstate_r@@GLIBC_2.2.5                           /lib/x86_64-linux-gnu/libc.so.6
+setstate_r@GLIBC_2.2.5                            /lib/x86_64-linux-gnu/libc.so.6
+settimeofday                                      /lib/x86_64-linux-gnu/libc.so.6
+settimeofday@@GLIBC_2.2.5                         /lib/x86_64-linux-gnu/libc.so.6
+settimeofday@GLIBC_2.2.5                          /lib/x86_64-linux-gnu/libc.so.6
+setttyent                                         /lib/x86_64-linux-gnu/libc.so.6
+setttyent@@GLIBC_2.2.5                            /lib/x86_64-linux-gnu/libc.so.6
+setttyent@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+setuid                                            /lib/x86_64-linux-gnu/libc.so.6
+setuid@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+setuid@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libc.so.6
+setutent                                          /lib/x86_64-linux-gnu/libc.so.6
+setutent@@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+setutent@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+setvbuf                                           /lib/x86_64-linux-gnu/libc.so.6
+setvbuf@@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+setvbuf@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+sgetsgent_r                                       /lib/x86_64-linux-gnu/libc.so.6
+sgetsgent_r@@GLIBC_2.10                           /lib/x86_64-linux-gnu/libc.so.6
+sgetsgent_r@GLIBC_2.10                            /lib/x86_64-linux-gnu/libc.so.6
+sgetspent_r                                       /lib/x86_64-linux-gnu/libc.so.6
+sgetspent_r@@GLIBC_2.2.5                          /lib/x86_64-linux-gnu/libc.so.6
+sgetspent_r@GLIBC_2.2.5                           /lib/x86_64-linux-gnu/libc.so.6
+shutdown                                          /lib/x86_64-linux-gnu/libc.so.6
+shutdown@@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+shutdown@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+sigaction                                         /lib/x86_64-linux-gnu/libc.so.6
+sigaction@@GLIBC_2.2.5                            /lib/x86_64-linux-gnu/libc.so.6
+sigaction@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+sigaltstack                                       /lib/x86_64-linux-gnu/libc.so.6
+sigaltstack@@GLIBC_2.2.5                          /lib/x86_64-linux-gnu/libc.so.6
+sigaltstack@GLIBC_2.2.5                           /lib/x86_64-linux-gnu/libc.so.6
+sigblock                                          /lib/x86_64-linux-gnu/libc.so.6
+sigblock@@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+sigblock@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+siglongjmp                                        /lib/x86_64-linux-gnu/libc.so.6
+siglongjmp@@GLIBC_2.2.5                           /lib/x86_64-linux-gnu/libc.so.6
+siglongjmp@GLIBC_2.2.5                            /lib/x86_64-linux-gnu/libc.so.6
+signal                                            /lib/x86_64-linux-gnu/libc.so.6
+signal@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+signal@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libc.so.6
+signgam                                           /lib/x86_64-linux-gnu/libm.so.6
+signgam@@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libm.so.6
+signgam@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libm.so.6
+significand                                       /lib/x86_64-linux-gnu/libm.so.6
+significand@@GLIBC_2.2.5                          /lib/x86_64-linux-gnu/libm.so.6
+significand@GLIBC_2.2.5                           /lib/x86_64-linux-gnu/libm.so.6
+significandf                                      /lib/x86_64-linux-gnu/libm.so.6
+significandf@@GLIBC_2.2.5                         /lib/x86_64-linux-gnu/libm.so.6
+significandf@GLIBC_2.2.5                          /lib/x86_64-linux-gnu/libm.so.6
+significandl                                      /lib/x86_64-linux-gnu/libm.so.6
+significandl@@GLIBC_2.2.5                         /lib/x86_64-linux-gnu/libm.so.6
+significandl@GLIBC_2.2.5                          /lib/x86_64-linux-gnu/libm.so.6
+sigpause                                          /lib/x86_64-linux-gnu/libc.so.6
+sigpause@@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+sigpause@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+sigprocmask                                       /lib/x86_64-linux-gnu/libc.so.6
+sigprocmask@@GLIBC_2.2.5                          /lib/x86_64-linux-gnu/libc.so.6
+sigprocmask@GLIBC_2.2.5                           /lib/x86_64-linux-gnu/libc.so.6
+sigqueue                                          /lib/x86_64-linux-gnu/libc.so.6
+sigqueue@@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+sigqueue@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+sigreturn                                         /lib/x86_64-linux-gnu/libc.so.6
+sigreturn@@GLIBC_2.2.5                            /lib/x86_64-linux-gnu/libc.so.6
+sigreturn@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+sigsetmask                                        /lib/x86_64-linux-gnu/libc.so.6
+sigsetmask@@GLIBC_2.2.5                           /lib/x86_64-linux-gnu/libc.so.6
+sigsetmask@GLIBC_2.2.5                            /lib/x86_64-linux-gnu/libc.so.6
+sigsuspend                                        /lib/x86_64-linux-gnu/libc.so.6
+sigsuspend@@GLIBC_2.2.5                           /lib/x86_64-linux-gnu/libc.so.6
+sigsuspend@GLIBC_2.2.5                            /lib/x86_64-linux-gnu/libc.so.6
+sigtimedwait                                      /lib/x86_64-linux-gnu/libc.so.6
+sigtimedwait@@GLIBC_2.2.5                         /lib/x86_64-linux-gnu/libc.so.6
+sigtimedwait@GLIBC_2.2.5                          /lib/x86_64-linux-gnu/libc.so.6
+sigwait                                           /lib/x86_64-linux-gnu/libc.so.6
+sigwait@@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+sigwait@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+sigwaitinfo                                       /lib/x86_64-linux-gnu/libc.so.6
+sigwaitinfo@@GLIBC_2.2.5                          /lib/x86_64-linux-gnu/libc.so.6
+sigwaitinfo@GLIBC_2.2.5                           /lib/x86_64-linux-gnu/libc.so.6
+sin                                               /lib/x86_64-linux-gnu/libm.so.6
+sin@@GLIBC_2.2.5                                  /lib/x86_64-linux-gnu/libm.so.6
+sin@GLIBC_2.2.5                                   /lib/x86_64-linux-gnu/libm.so.6
+sincos                                            /lib/x86_64-linux-gnu/libm.so.6
+                                                  build/py/objcomplex.o
+sincos@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libm.so.6
+sincos@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+sincosf                                           /lib/x86_64-linux-gnu/libm.so.6
+sincosf128                                        /lib/x86_64-linux-gnu/libm.so.6
+sincosf128@@GLIBC_2.26                            /lib/x86_64-linux-gnu/libm.so.6
+sincosf128@GLIBC_2.26                             /lib/x86_64-linux-gnu/libm.so.6
+sincosf32                                         /lib/x86_64-linux-gnu/libm.so.6
+sincosf32@@GLIBC_2.27                             /lib/x86_64-linux-gnu/libm.so.6
+sincosf32@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+sincosf32x                                        /lib/x86_64-linux-gnu/libm.so.6
+sincosf32x@@GLIBC_2.27                            /lib/x86_64-linux-gnu/libm.so.6
+sincosf32x@GLIBC_2.27                             /lib/x86_64-linux-gnu/libm.so.6
+sincosf64                                         /lib/x86_64-linux-gnu/libm.so.6
+sincosf64@@GLIBC_2.27                             /lib/x86_64-linux-gnu/libm.so.6
+sincosf64@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+sincosf64x                                        /lib/x86_64-linux-gnu/libm.so.6
+sincosf64x@@GLIBC_2.27                            /lib/x86_64-linux-gnu/libm.so.6
+sincosf64x@GLIBC_2.27                             /lib/x86_64-linux-gnu/libm.so.6
+sincosf@@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libm.so.6
+sincosf@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libm.so.6
+sincosl                                           /lib/x86_64-linux-gnu/libm.so.6
+sincosl@@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libm.so.6
+sincosl@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libm.so.6
+sinf                                              /lib/x86_64-linux-gnu/libm.so.6
+sinf128                                           /lib/x86_64-linux-gnu/libm.so.6
+sinf128@@GLIBC_2.26                               /lib/x86_64-linux-gnu/libm.so.6
+sinf128@GLIBC_2.26                                /lib/x86_64-linux-gnu/libm.so.6
+sinf32                                            /lib/x86_64-linux-gnu/libm.so.6
+sinf32@@GLIBC_2.27                                /lib/x86_64-linux-gnu/libm.so.6
+sinf32@GLIBC_2.27                                 /lib/x86_64-linux-gnu/libm.so.6
+sinf32x                                           /lib/x86_64-linux-gnu/libm.so.6
+sinf32x@@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+sinf32x@GLIBC_2.27                                /lib/x86_64-linux-gnu/libm.so.6
+sinf64                                            /lib/x86_64-linux-gnu/libm.so.6
+sinf64@@GLIBC_2.27                                /lib/x86_64-linux-gnu/libm.so.6
+sinf64@GLIBC_2.27                                 /lib/x86_64-linux-gnu/libm.so.6
+sinf64x                                           /lib/x86_64-linux-gnu/libm.so.6
+sinf64x@@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+sinf64x@GLIBC_2.27                                /lib/x86_64-linux-gnu/libm.so.6
+sinf@@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libm.so.6
+sinf@GLIBC_2.2.5                                  /lib/x86_64-linux-gnu/libm.so.6
+sinh                                              /lib/x86_64-linux-gnu/libm.so.6
+sinh@@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libm.so.6
+sinh@GLIBC_2.2.5                                  /lib/x86_64-linux-gnu/libm.so.6
+sinhf                                             /lib/x86_64-linux-gnu/libm.so.6
+sinhf128                                          /lib/x86_64-linux-gnu/libm.so.6
+sinhf128@@GLIBC_2.26                              /lib/x86_64-linux-gnu/libm.so.6
+sinhf128@GLIBC_2.26                               /lib/x86_64-linux-gnu/libm.so.6
+sinhf32                                           /lib/x86_64-linux-gnu/libm.so.6
+sinhf32@@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+sinhf32@GLIBC_2.27                                /lib/x86_64-linux-gnu/libm.so.6
+sinhf32x                                          /lib/x86_64-linux-gnu/libm.so.6
+sinhf32x@@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+sinhf32x@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+sinhf64                                           /lib/x86_64-linux-gnu/libm.so.6
+sinhf64@@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+sinhf64@GLIBC_2.27                                /lib/x86_64-linux-gnu/libm.so.6
+sinhf64x                                          /lib/x86_64-linux-gnu/libm.so.6
+sinhf64x@@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+sinhf64x@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+sinhf@@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+sinhf@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libm.so.6
+sinhl                                             /lib/x86_64-linux-gnu/libm.so.6
+sinhl@@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+sinhl@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libm.so.6
+sinl                                              /lib/x86_64-linux-gnu/libm.so.6
+sinl@@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libm.so.6
+sinl@GLIBC_2.2.5                                  /lib/x86_64-linux-gnu/libm.so.6
+sleep                                             /lib/x86_64-linux-gnu/libc.so.6
+sleep@@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libc.so.6
+sleep@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libc.so.6
+snprintf                                          /lib/x86_64-linux-gnu/libc.so.6
+snprintf@@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+snprintf@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+socket                                            /lib/x86_64-linux-gnu/libc.so.6
+socket@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+socket@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libc.so.6
+socketpair                                        /lib/x86_64-linux-gnu/libc.so.6
+socketpair@@GLIBC_2.2.5                           /lib/x86_64-linux-gnu/libc.so.6
+socketpair@GLIBC_2.2.5                            /lib/x86_64-linux-gnu/libc.so.6
+sprofil                                           /lib/x86_64-linux-gnu/libc.so.6
+sprofil@@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+sprofil@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+sqrt                                              /lib/x86_64-linux-gnu/libm.so.6
+                                                  build/py/objcomplex.o
+sqrt@@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libm.so.6
+sqrt@GLIBC_2.2.5                                  /lib/x86_64-linux-gnu/libm.so.6
+sqrtf                                             /lib/x86_64-linux-gnu/libm.so.6
+sqrtf128                                          /lib/x86_64-linux-gnu/libm.so.6
+sqrtf128@@GLIBC_2.26                              /lib/x86_64-linux-gnu/libm.so.6
+sqrtf128@GLIBC_2.26                               /lib/x86_64-linux-gnu/libm.so.6
+sqrtf32                                           /lib/x86_64-linux-gnu/libm.so.6
+sqrtf32@@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+sqrtf32@GLIBC_2.27                                /lib/x86_64-linux-gnu/libm.so.6
+sqrtf32x                                          /lib/x86_64-linux-gnu/libm.so.6
+sqrtf32x@@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+sqrtf32x@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+sqrtf64                                           /lib/x86_64-linux-gnu/libm.so.6
+sqrtf64@@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+sqrtf64@GLIBC_2.27                                /lib/x86_64-linux-gnu/libm.so.6
+sqrtf64x                                          /lib/x86_64-linux-gnu/libm.so.6
+sqrtf64x@@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+sqrtf64x@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+sqrtf@@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+sqrtf@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libm.so.6
+sqrtl                                             /lib/x86_64-linux-gnu/libm.so.6
+sqrtl@@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+sqrtl@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libm.so.6
+srand                                             /lib/x86_64-linux-gnu/libc.so.6
+srand48_r                                         /lib/x86_64-linux-gnu/libc.so.6
+srand48_r@@GLIBC_2.2.5                            /lib/x86_64-linux-gnu/libc.so.6
+srand48_r@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+srand@@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libc.so.6
+srand@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libc.so.6
+srandom                                           /lib/x86_64-linux-gnu/libc.so.6
+srandom@@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+srandom@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+srandom_r                                         /lib/x86_64-linux-gnu/libc.so.6
+srandom_r@@GLIBC_2.2.5                            /lib/x86_64-linux-gnu/libc.so.6
+srandom_r@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+ssignal                                           /lib/x86_64-linux-gnu/libc.so.6
+ssignal@@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+ssignal@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+statfs                                            /lib/x86_64-linux-gnu/libc.so.6
+statfs64                                          /lib/x86_64-linux-gnu/libc.so.6
+statfs64@@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+statfs64@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+statfs@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+statfs@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libc.so.6
+statvfs                                           /lib/x86_64-linux-gnu/libc.so.6
+statvfs64                                         /lib/x86_64-linux-gnu/libc.so.6
+statvfs64@@GLIBC_2.2.5                            /lib/x86_64-linux-gnu/libc.so.6
+statvfs64@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+statvfs@@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+statvfs@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+stderr                                            /lib/x86_64-linux-gnu/libc.so.6
+                                                  build/main.o
+stderr@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+stderr@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libc.so.6
+                                                  /lib/x86_64-linux-gnu/libm.so.6
+step@GLIBC_2.2.5                                  /lib/x86_64-linux-gnu/libc.so.6
+stpcpy                                            /lib/x86_64-linux-gnu/libc.so.6
+stpcpy@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+stpcpy@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libc.so.6
+stpncpy                                           /lib/x86_64-linux-gnu/libc.so.6
+stpncpy@@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+stpncpy@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+str_count_obj                                     build/py/objstr.o
+                                                  build/py/objstrunicode.o
+str_encode_obj                                    build/py/objstr.o
+                                                  build/py/objstrunicode.o
+str_endswith_obj                                  build/py/objstr.o
+                                                  build/py/objstrunicode.o
+str_find_obj                                      build/py/objstr.o
+                                                  build/py/objstrunicode.o
+str_format_obj                                    build/py/objstr.o
+                                                  build/py/objstrunicode.o
+str_index_obj                                     build/py/objstr.o
+                                                  build/py/objstrunicode.o
+str_index_to_ptr                                  build/py/objstrunicode.o
+                                                  build/py/objstr.o
+str_isalpha_obj                                   build/py/objstr.o
+                                                  build/py/objstrunicode.o
+str_isdigit_obj                                   build/py/objstr.o
+                                                  build/py/objstrunicode.o
+str_islower_obj                                   build/py/objstr.o
+                                                  build/py/objstrunicode.o
+str_isspace_obj                                   build/py/objstr.o
+                                                  build/py/objstrunicode.o
+str_isupper_obj                                   build/py/objstr.o
+                                                  build/py/objstrunicode.o
+str_join_obj                                      build/py/objstr.o
+                                                  build/py/objstrunicode.o
+str_lower_obj                                     build/py/objstr.o
+                                                  build/py/objstrunicode.o
+str_lstrip_obj                                    build/py/objstr.o
+                                                  build/py/objstrunicode.o
+str_replace_obj                                   build/py/objstr.o
+                                                  build/py/objstrunicode.o
+str_rfind_obj                                     build/py/objstr.o
+                                                  build/py/objstrunicode.o
+str_rindex_obj                                    build/py/objstr.o
+                                                  build/py/objstrunicode.o
+str_rsplit_obj                                    build/py/objstr.o
+                                                  build/py/objstrunicode.o
+str_rstrip_obj                                    build/py/objstr.o
+                                                  build/py/objstrunicode.o
+str_split_obj                                     build/py/objstr.o
+                                                  build/py/objstrunicode.o
+str_startswith_obj                                build/py/objstr.o
+                                                  build/py/objstrunicode.o
+str_strip_obj                                     build/py/objstr.o
+                                                  build/py/objstrunicode.o
+str_upper_obj                                     build/py/objstr.o
+                                                  build/py/objstrunicode.o
+strcasecmp                                        /lib/x86_64-linux-gnu/libc.so.6
+strcasecmp@@GLIBC_2.2.5                           /lib/x86_64-linux-gnu/libc.so.6
+strcasecmp@GLIBC_2.2.5                            /lib/x86_64-linux-gnu/libc.so.6
+strcasecmp_l                                      /lib/x86_64-linux-gnu/libc.so.6
+strcasecmp_l@@GLIBC_2.3                           /lib/x86_64-linux-gnu/libc.so.6
+strcasecmp_l@GLIBC_2.3                            /lib/x86_64-linux-gnu/libc.so.6
+strcasestr                                        /lib/x86_64-linux-gnu/libc.so.6
+strcasestr@@GLIBC_2.2.5                           /lib/x86_64-linux-gnu/libc.so.6
+strcasestr@GLIBC_2.2.5                            /lib/x86_64-linux-gnu/libc.so.6
+strchr                                            /lib/x86_64-linux-gnu/libc.so.6
+                                                  build/py/builtinimport.o
+                                                  build/py/objstr.o
+                                                  build/py/objfloat.o
+strchr@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+strchr@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libc.so.6
+strchrnul                                         /lib/x86_64-linux-gnu/libc.so.6
+strchrnul@@GLIBC_2.2.5                            /lib/x86_64-linux-gnu/libc.so.6
+strchrnul@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+strcmp                                            /lib/x86_64-linux-gnu/libc.so.6
+                                                  build/main.o
+                                                  build/py/emitinlinethumb.o
+                                                  build/py/lexer.o
+strcmp@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+strcmp@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libc.so.6
+strcoll_l                                         /lib/x86_64-linux-gnu/libc.so.6
+strcoll_l@@GLIBC_2.3                              /lib/x86_64-linux-gnu/libc.so.6
+strcoll_l@GLIBC_2.3                               /lib/x86_64-linux-gnu/libc.so.6
+strdup                                            /lib/x86_64-linux-gnu/libc.so.6
+strdup@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+strdup@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libc.so.6
+strerror_r                                        /lib/x86_64-linux-gnu/libc.so.6
+strerror_r@@GLIBC_2.2.5                           /lib/x86_64-linux-gnu/libc.so.6
+strerror_r@GLIBC_2.2.5                            /lib/x86_64-linux-gnu/libc.so.6
+strfmon_l                                         /lib/x86_64-linux-gnu/libc.so.6
+strfmon_l@@GLIBC_2.3                              /lib/x86_64-linux-gnu/libc.so.6
+strfmon_l@GLIBC_2.3                               /lib/x86_64-linux-gnu/libc.so.6
+strfromf32                                        /lib/x86_64-linux-gnu/libc.so.6
+strfromf32@@GLIBC_2.27                            /lib/x86_64-linux-gnu/libc.so.6
+strfromf32@GLIBC_2.27                             /lib/x86_64-linux-gnu/libc.so.6
+strfromf32x                                       /lib/x86_64-linux-gnu/libc.so.6
+strfromf32x@@GLIBC_2.27                           /lib/x86_64-linux-gnu/libc.so.6
+strfromf32x@GLIBC_2.27                            /lib/x86_64-linux-gnu/libc.so.6
+strfromf64                                        /lib/x86_64-linux-gnu/libc.so.6
+strfromf64@@GLIBC_2.27                            /lib/x86_64-linux-gnu/libc.so.6
+strfromf64@GLIBC_2.27                             /lib/x86_64-linux-gnu/libc.so.6
+strfromf64x                                       /lib/x86_64-linux-gnu/libc.so.6
+strfromf64x@@GLIBC_2.27                           /lib/x86_64-linux-gnu/libc.so.6
+strfromf64x@GLIBC_2.27                            /lib/x86_64-linux-gnu/libc.so.6
+strftime_l                                        /lib/x86_64-linux-gnu/libc.so.6
+strftime_l@@GLIBC_2.3                             /lib/x86_64-linux-gnu/libc.so.6
+strftime_l@GLIBC_2.3                              /lib/x86_64-linux-gnu/libc.so.6
+strlen                                            /lib/x86_64-linux-gnu/libc.so.6
+                                                  build/py/binary.o
+                                                  build/py/objint.o
+                                                  build/py/objexcept.o
+                                                  build/py/emitinlinextensa.o
+                                                  build/py/emitinlinethumb.o
+                                                  build/py/mpz.o
+                                                  build/py/mpprint.o
+                                                  build/py/vstr.o
+                                                  build/py/qstr.o
+strlen@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+strlen@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libc.so.6
+strncasecmp                                       /lib/x86_64-linux-gnu/libc.so.6
+strncasecmp@@GLIBC_2.2.5                          /lib/x86_64-linux-gnu/libc.so.6
+strncasecmp@GLIBC_2.2.5                           /lib/x86_64-linux-gnu/libc.so.6
+strncasecmp_l                                     /lib/x86_64-linux-gnu/libc.so.6
+strncasecmp_l@@GLIBC_2.3                          /lib/x86_64-linux-gnu/libc.so.6
+strncasecmp_l@GLIBC_2.3                           /lib/x86_64-linux-gnu/libc.so.6
+strncmp                                           /lib/x86_64-linux-gnu/libc.so.6
+                                                  build/main.o
+                                                  build/py/emitinlinethumb.o
+strncmp@@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+strncmp@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+strndup                                           /lib/x86_64-linux-gnu/libc.so.6
+strndup@@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+strndup@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+strnlen                                           /lib/x86_64-linux-gnu/libc.so.6
+strnlen@@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+strnlen@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+strptime_l                                        /lib/x86_64-linux-gnu/libc.so.6
+strptime_l@@GLIBC_2.3.2                           /lib/x86_64-linux-gnu/libc.so.6
+strptime_l@GLIBC_2.3.2                            /lib/x86_64-linux-gnu/libc.so.6
+strsep                                            /lib/x86_64-linux-gnu/libc.so.6
+strsep@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+strsep@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libc.so.6
+strtod_l                                          /lib/x86_64-linux-gnu/libc.so.6
+strtod_l@@GLIBC_2.3                               /lib/x86_64-linux-gnu/libc.so.6
+strtod_l@GLIBC_2.3                                /lib/x86_64-linux-gnu/libc.so.6
+strtof128_l                                       /lib/x86_64-linux-gnu/libc.so.6
+strtof128_l@@GLIBC_2.26                           /lib/x86_64-linux-gnu/libc.so.6
+strtof128_l@GLIBC_2.26                            /lib/x86_64-linux-gnu/libc.so.6
+strtof32                                          /lib/x86_64-linux-gnu/libc.so.6
+strtof32@@GLIBC_2.27                              /lib/x86_64-linux-gnu/libc.so.6
+strtof32@GLIBC_2.27                               /lib/x86_64-linux-gnu/libc.so.6
+strtof32_l                                        /lib/x86_64-linux-gnu/libc.so.6
+strtof32_l@@GLIBC_2.27                            /lib/x86_64-linux-gnu/libc.so.6
+strtof32_l@GLIBC_2.27                             /lib/x86_64-linux-gnu/libc.so.6
+strtof32x                                         /lib/x86_64-linux-gnu/libc.so.6
+strtof32x@@GLIBC_2.27                             /lib/x86_64-linux-gnu/libc.so.6
+strtof32x@GLIBC_2.27                              /lib/x86_64-linux-gnu/libc.so.6
+strtof32x_l                                       /lib/x86_64-linux-gnu/libc.so.6
+strtof32x_l@@GLIBC_2.27                           /lib/x86_64-linux-gnu/libc.so.6
+strtof32x_l@GLIBC_2.27                            /lib/x86_64-linux-gnu/libc.so.6
+strtof64                                          /lib/x86_64-linux-gnu/libc.so.6
+strtof64@@GLIBC_2.27                              /lib/x86_64-linux-gnu/libc.so.6
+strtof64@GLIBC_2.27                               /lib/x86_64-linux-gnu/libc.so.6
+strtof64_l                                        /lib/x86_64-linux-gnu/libc.so.6
+strtof64_l@@GLIBC_2.27                            /lib/x86_64-linux-gnu/libc.so.6
+strtof64_l@GLIBC_2.27                             /lib/x86_64-linux-gnu/libc.so.6
+strtof64x                                         /lib/x86_64-linux-gnu/libc.so.6
+strtof64x@@GLIBC_2.27                             /lib/x86_64-linux-gnu/libc.so.6
+strtof64x@GLIBC_2.27                              /lib/x86_64-linux-gnu/libc.so.6
+strtof64x_l                                       /lib/x86_64-linux-gnu/libc.so.6
+strtof64x_l@@GLIBC_2.27                           /lib/x86_64-linux-gnu/libc.so.6
+strtof64x_l@GLIBC_2.27                            /lib/x86_64-linux-gnu/libc.so.6
+strtof_l                                          /lib/x86_64-linux-gnu/libc.so.6
+strtof_l@@GLIBC_2.3                               /lib/x86_64-linux-gnu/libc.so.6
+strtof_l@GLIBC_2.3                                /lib/x86_64-linux-gnu/libc.so.6
+strtok_r                                          /lib/x86_64-linux-gnu/libc.so.6
+strtok_r@@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+strtok_r@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+strtol                                            /lib/x86_64-linux-gnu/libc.so.6
+                                                  build/main.o
+strtol@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+strtol@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libc.so.6
+strtol_l                                          /lib/x86_64-linux-gnu/libc.so.6
+strtol_l@@GLIBC_2.3                               /lib/x86_64-linux-gnu/libc.so.6
+strtol_l@GLIBC_2.3                                /lib/x86_64-linux-gnu/libc.so.6
+strtold_l                                         /lib/x86_64-linux-gnu/libc.so.6
+strtold_l@@GLIBC_2.3                              /lib/x86_64-linux-gnu/libc.so.6
+strtold_l@GLIBC_2.3                               /lib/x86_64-linux-gnu/libc.so.6
+strtoll                                           /lib/x86_64-linux-gnu/libc.so.6
+strtoll@@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+strtoll@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+strtoll_l                                         /lib/x86_64-linux-gnu/libc.so.6
+strtoll_l@@GLIBC_2.3.3                            /lib/x86_64-linux-gnu/libc.so.6
+strtoll_l@GLIBC_2.3.3                             /lib/x86_64-linux-gnu/libc.so.6
+strtoq                                            /lib/x86_64-linux-gnu/libc.so.6
+strtoq@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+strtoq@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libc.so.6
+strtoul                                           /lib/x86_64-linux-gnu/libc.so.6
+strtoul@@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+strtoul@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+strtoul_l                                         /lib/x86_64-linux-gnu/libc.so.6
+strtoul_l@@GLIBC_2.3                              /lib/x86_64-linux-gnu/libc.so.6
+strtoul_l@GLIBC_2.3                               /lib/x86_64-linux-gnu/libc.so.6
+strtoull                                          /lib/x86_64-linux-gnu/libc.so.6
+strtoull@@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+strtoull@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+strtoull_l                                        /lib/x86_64-linux-gnu/libc.so.6
+strtoull_l@@GLIBC_2.3.3                           /lib/x86_64-linux-gnu/libc.so.6
+strtoull_l@GLIBC_2.3.3                            /lib/x86_64-linux-gnu/libc.so.6
+strtouq                                           /lib/x86_64-linux-gnu/libc.so.6
+strtouq@@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+strtouq@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+struct_calcsize_obj                               build/py/modstruct.o
+struct_pack_into_obj                              build/py/modstruct.o
+struct_pack_obj                                   build/py/modstruct.o
+struct_unpack_from_obj                            build/py/modstruct.o
+strverscmp                                        /lib/x86_64-linux-gnu/libc.so.6
+strverscmp@@GLIBC_2.2.5                           /lib/x86_64-linux-gnu/libc.so.6
+strverscmp@GLIBC_2.2.5                            /lib/x86_64-linux-gnu/libc.so.6
+strxfrm_l                                         /lib/x86_64-linux-gnu/libc.so.6
+strxfrm_l@@GLIBC_2.3                              /lib/x86_64-linux-gnu/libc.so.6
+strxfrm_l@GLIBC_2.3                               /lib/x86_64-linux-gnu/libc.so.6
+swapcontext                                       /lib/x86_64-linux-gnu/libc.so.6
+swapcontext@@GLIBC_2.2.5                          /lib/x86_64-linux-gnu/libc.so.6
+swapcontext@GLIBC_2.2.5                           /lib/x86_64-linux-gnu/libc.so.6
+swapoff                                           /lib/x86_64-linux-gnu/libc.so.6
+swapoff@@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+swapoff@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+swapon                                            /lib/x86_64-linux-gnu/libc.so.6
+swapon@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+swapon@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libc.so.6
+symlink                                           /lib/x86_64-linux-gnu/libc.so.6
+symlink@@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+symlink@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+sysconf                                           /lib/x86_64-linux-gnu/libc.so.6
+sysconf@@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+sysconf@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+sysctl                                            /lib/x86_64-linux-gnu/libc.so.6
+sysctl@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+sysctl@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libc.so.6
+sysinfo                                           /lib/x86_64-linux-gnu/libc.so.6
+sysinfo@@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+sysinfo@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+system                                            /lib/x86_64-linux-gnu/libc.so.6
+system@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+system@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libc.so.6
+sysv_signal                                       /lib/x86_64-linux-gnu/libc.so.6
+sysv_signal@@GLIBC_2.2.5                          /lib/x86_64-linux-gnu/libc.so.6
+sysv_signal@GLIBC_2.2.5                           /lib/x86_64-linux-gnu/libc.so.6
+tan                                               /lib/x86_64-linux-gnu/libm.so.6
+tan@@GLIBC_2.2.5                                  /lib/x86_64-linux-gnu/libm.so.6
+tan@GLIBC_2.2.5                                   /lib/x86_64-linux-gnu/libm.so.6
+tanf                                              /lib/x86_64-linux-gnu/libm.so.6
+tanf128                                           /lib/x86_64-linux-gnu/libm.so.6
+tanf128@@GLIBC_2.26                               /lib/x86_64-linux-gnu/libm.so.6
+tanf128@GLIBC_2.26                                /lib/x86_64-linux-gnu/libm.so.6
+tanf32                                            /lib/x86_64-linux-gnu/libm.so.6
+tanf32@@GLIBC_2.27                                /lib/x86_64-linux-gnu/libm.so.6
+tanf32@GLIBC_2.27                                 /lib/x86_64-linux-gnu/libm.so.6
+tanf32x                                           /lib/x86_64-linux-gnu/libm.so.6
+tanf32x@@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+tanf32x@GLIBC_2.27                                /lib/x86_64-linux-gnu/libm.so.6
+tanf64                                            /lib/x86_64-linux-gnu/libm.so.6
+tanf64@@GLIBC_2.27                                /lib/x86_64-linux-gnu/libm.so.6
+tanf64@GLIBC_2.27                                 /lib/x86_64-linux-gnu/libm.so.6
+tanf64x                                           /lib/x86_64-linux-gnu/libm.so.6
+tanf64x@@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+tanf64x@GLIBC_2.27                                /lib/x86_64-linux-gnu/libm.so.6
+tanf@@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libm.so.6
+tanf@GLIBC_2.2.5                                  /lib/x86_64-linux-gnu/libm.so.6
+tanh                                              /lib/x86_64-linux-gnu/libm.so.6
+tanh@@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libm.so.6
+tanh@GLIBC_2.2.5                                  /lib/x86_64-linux-gnu/libm.so.6
+tanhf                                             /lib/x86_64-linux-gnu/libm.so.6
+tanhf128                                          /lib/x86_64-linux-gnu/libm.so.6
+tanhf128@@GLIBC_2.26                              /lib/x86_64-linux-gnu/libm.so.6
+tanhf128@GLIBC_2.26                               /lib/x86_64-linux-gnu/libm.so.6
+tanhf32                                           /lib/x86_64-linux-gnu/libm.so.6
+tanhf32@@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+tanhf32@GLIBC_2.27                                /lib/x86_64-linux-gnu/libm.so.6
+tanhf32x                                          /lib/x86_64-linux-gnu/libm.so.6
+tanhf32x@@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+tanhf32x@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+tanhf64                                           /lib/x86_64-linux-gnu/libm.so.6
+tanhf64@@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+tanhf64@GLIBC_2.27                                /lib/x86_64-linux-gnu/libm.so.6
+tanhf64x                                          /lib/x86_64-linux-gnu/libm.so.6
+tanhf64x@@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+tanhf64x@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+tanhf@@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+tanhf@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libm.so.6
+tanhl                                             /lib/x86_64-linux-gnu/libm.so.6
+tanhl@@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+tanhl@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libm.so.6
+tanl                                              /lib/x86_64-linux-gnu/libm.so.6
+tanl@@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libm.so.6
+tanl@GLIBC_2.2.5                                  /lib/x86_64-linux-gnu/libm.so.6
+tcdrain                                           /lib/x86_64-linux-gnu/libc.so.6
+tcdrain@@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+tcdrain@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+tcgetattr                                         /lib/x86_64-linux-gnu/libc.so.6
+tcgetattr@@GLIBC_2.2.5                            /lib/x86_64-linux-gnu/libc.so.6
+tcgetattr@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+tdelete                                           /lib/x86_64-linux-gnu/libc.so.6
+tdelete@@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+tdelete@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+tdestroy                                          /lib/x86_64-linux-gnu/libc.so.6
+tdestroy@@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+tdestroy@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+textdomain                                        /lib/x86_64-linux-gnu/libc.so.6
+textdomain@@GLIBC_2.2.5                           /lib/x86_64-linux-gnu/libc.so.6
+textdomain@GLIBC_2.2.5                            /lib/x86_64-linux-gnu/libc.so.6
+tfind                                             /lib/x86_64-linux-gnu/libc.so.6
+tfind@@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libc.so.6
+tfind@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libc.so.6
+tgamma                                            /lib/x86_64-linux-gnu/libm.so.6
+tgamma@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libm.so.6
+tgamma@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+tgammaf                                           /lib/x86_64-linux-gnu/libm.so.6
+tgammaf128                                        /lib/x86_64-linux-gnu/libm.so.6
+tgammaf128@@GLIBC_2.26                            /lib/x86_64-linux-gnu/libm.so.6
+tgammaf128@GLIBC_2.26                             /lib/x86_64-linux-gnu/libm.so.6
+tgammaf32                                         /lib/x86_64-linux-gnu/libm.so.6
+tgammaf32@@GLIBC_2.27                             /lib/x86_64-linux-gnu/libm.so.6
+tgammaf32@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+tgammaf32x                                        /lib/x86_64-linux-gnu/libm.so.6
+tgammaf32x@@GLIBC_2.27                            /lib/x86_64-linux-gnu/libm.so.6
+tgammaf32x@GLIBC_2.27                             /lib/x86_64-linux-gnu/libm.so.6
+tgammaf64                                         /lib/x86_64-linux-gnu/libm.so.6
+tgammaf64@@GLIBC_2.27                             /lib/x86_64-linux-gnu/libm.so.6
+tgammaf64@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+tgammaf64x                                        /lib/x86_64-linux-gnu/libm.so.6
+tgammaf64x@@GLIBC_2.27                            /lib/x86_64-linux-gnu/libm.so.6
+tgammaf64x@GLIBC_2.27                             /lib/x86_64-linux-gnu/libm.so.6
+tgammaf@@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libm.so.6
+tgammaf@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libm.so.6
+tgammal                                           /lib/x86_64-linux-gnu/libm.so.6
+tgammal@@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libm.so.6
+tgammal@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libm.so.6
+tgkill                                            /lib/x86_64-linux-gnu/libc.so.6
+tgkill@@GLIBC_2.30                                /lib/x86_64-linux-gnu/libc.so.6
+tgkill@GLIBC_2.30                                 /lib/x86_64-linux-gnu/libc.so.6
+timelocal                                         /lib/x86_64-linux-gnu/libc.so.6
+timelocal@@GLIBC_2.2.5                            /lib/x86_64-linux-gnu/libc.so.6
+timelocal@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+times                                             /lib/x86_64-linux-gnu/libc.so.6
+times@@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libc.so.6
+times@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libc.so.6
+timezone                                          /lib/x86_64-linux-gnu/libc.so.6
+timezone@@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+timezone@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+tmpfile64                                         /lib/x86_64-linux-gnu/libc.so.6
+tmpfile64@@GLIBC_2.2.5                            /lib/x86_64-linux-gnu/libc.so.6
+tmpfile64@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+tolower_l                                         /lib/x86_64-linux-gnu/libc.so.6
+tolower_l@@GLIBC_2.3                              /lib/x86_64-linux-gnu/libc.so.6
+tolower_l@GLIBC_2.3                               /lib/x86_64-linux-gnu/libc.so.6
+toupper_l                                         /lib/x86_64-linux-gnu/libc.so.6
+toupper_l@@GLIBC_2.3                              /lib/x86_64-linux-gnu/libc.so.6
+toupper_l@GLIBC_2.3                               /lib/x86_64-linux-gnu/libc.so.6
+towctrans                                         /lib/x86_64-linux-gnu/libc.so.6
+towctrans@@GLIBC_2.2.5                            /lib/x86_64-linux-gnu/libc.so.6
+towctrans@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+towctrans_l                                       /lib/x86_64-linux-gnu/libc.so.6
+towctrans_l@@GLIBC_2.3                            /lib/x86_64-linux-gnu/libc.so.6
+towctrans_l@GLIBC_2.3                             /lib/x86_64-linux-gnu/libc.so.6
+towlower                                          /lib/x86_64-linux-gnu/libc.so.6
+towlower@@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+towlower@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+towlower_l                                        /lib/x86_64-linux-gnu/libc.so.6
+towlower_l@@GLIBC_2.3                             /lib/x86_64-linux-gnu/libc.so.6
+towlower_l@GLIBC_2.3                              /lib/x86_64-linux-gnu/libc.so.6
+towupper                                          /lib/x86_64-linux-gnu/libc.so.6
+towupper@@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+towupper@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+towupper_l                                        /lib/x86_64-linux-gnu/libc.so.6
+towupper_l@@GLIBC_2.3                             /lib/x86_64-linux-gnu/libc.so.6
+towupper_l@GLIBC_2.3                              /lib/x86_64-linux-gnu/libc.so.6
+trunc                                             /lib/x86_64-linux-gnu/libm.so.6
+trunc@@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+trunc@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libm.so.6
+truncate                                          /lib/x86_64-linux-gnu/libc.so.6
+truncate64                                        /lib/x86_64-linux-gnu/libc.so.6
+truncate64@@GLIBC_2.2.5                           /lib/x86_64-linux-gnu/libc.so.6
+truncate64@GLIBC_2.2.5                            /lib/x86_64-linux-gnu/libc.so.6
+truncate@@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+truncate@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+truncf                                            /lib/x86_64-linux-gnu/libm.so.6
+truncf128                                         /lib/x86_64-linux-gnu/libm.so.6
+truncf128@@GLIBC_2.26                             /lib/x86_64-linux-gnu/libm.so.6
+truncf128@GLIBC_2.26                              /lib/x86_64-linux-gnu/libm.so.6
+truncf32                                          /lib/x86_64-linux-gnu/libm.so.6
+truncf32@@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+truncf32@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+truncf32x                                         /lib/x86_64-linux-gnu/libm.so.6
+truncf32x@@GLIBC_2.27                             /lib/x86_64-linux-gnu/libm.so.6
+truncf32x@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+truncf64                                          /lib/x86_64-linux-gnu/libm.so.6
+truncf64@@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+truncf64@GLIBC_2.27                               /lib/x86_64-linux-gnu/libm.so.6
+truncf64x                                         /lib/x86_64-linux-gnu/libm.so.6
+truncf64x@@GLIBC_2.27                             /lib/x86_64-linux-gnu/libm.so.6
+truncf64x@GLIBC_2.27                              /lib/x86_64-linux-gnu/libm.so.6
+truncf@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libm.so.6
+truncf@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+truncl                                            /lib/x86_64-linux-gnu/libm.so.6
+truncl@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libm.so.6
+truncl@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libm.so.6
+tsearch                                           /lib/x86_64-linux-gnu/libc.so.6
+tsearch@@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+tsearch@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+ttyname_r                                         /lib/x86_64-linux-gnu/libc.so.6
+ttyname_r@@GLIBC_2.2.5                            /lib/x86_64-linux-gnu/libc.so.6
+ttyname_r@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+twalk                                             /lib/x86_64-linux-gnu/libc.so.6
+twalk@@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libc.so.6
+twalk@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libc.so.6
+twalk_r                                           /lib/x86_64-linux-gnu/libc.so.6
+twalk_r@@GLIBC_2.30                               /lib/x86_64-linux-gnu/libc.so.6
+twalk_r@GLIBC_2.30                                /lib/x86_64-linux-gnu/libc.so.6
+tzname                                            /lib/x86_64-linux-gnu/libc.so.6
+tzname@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+tzname@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libc.so.6
+tzset                                             /lib/x86_64-linux-gnu/libc.so.6
+tzset@@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libc.so.6
+tzset@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libc.so.6
+ufromfp                                           /lib/x86_64-linux-gnu/libm.so.6
+ufromfp@@GLIBC_2.25                               /lib/x86_64-linux-gnu/libm.so.6
+ufromfp@GLIBC_2.25                                /lib/x86_64-linux-gnu/libm.so.6
+ufromfpf                                          /lib/x86_64-linux-gnu/libm.so.6
+ufromfpf128                                       /lib/x86_64-linux-gnu/libm.so.6
+ufromfpf128@@GLIBC_2.26                           /lib/x86_64-linux-gnu/libm.so.6
+ufromfpf128@GLIBC_2.26                            /lib/x86_64-linux-gnu/libm.so.6
+ufromfpf32                                        /lib/x86_64-linux-gnu/libm.so.6
+ufromfpf32@@GLIBC_2.27                            /lib/x86_64-linux-gnu/libm.so.6
+ufromfpf32@GLIBC_2.27                             /lib/x86_64-linux-gnu/libm.so.6
+ufromfpf32x                                       /lib/x86_64-linux-gnu/libm.so.6
+ufromfpf32x@@GLIBC_2.27                           /lib/x86_64-linux-gnu/libm.so.6
+ufromfpf32x@GLIBC_2.27                            /lib/x86_64-linux-gnu/libm.so.6
+ufromfpf64                                        /lib/x86_64-linux-gnu/libm.so.6
+ufromfpf64@@GLIBC_2.27                            /lib/x86_64-linux-gnu/libm.so.6
+ufromfpf64@GLIBC_2.27                             /lib/x86_64-linux-gnu/libm.so.6
+ufromfpf64x                                       /lib/x86_64-linux-gnu/libm.so.6
+ufromfpf64x@@GLIBC_2.27                           /lib/x86_64-linux-gnu/libm.so.6
+ufromfpf64x@GLIBC_2.27                            /lib/x86_64-linux-gnu/libm.so.6
+ufromfpf@@GLIBC_2.25                              /lib/x86_64-linux-gnu/libm.so.6
+ufromfpf@GLIBC_2.25                               /lib/x86_64-linux-gnu/libm.so.6
+ufromfpl                                          /lib/x86_64-linux-gnu/libm.so.6
+ufromfpl@@GLIBC_2.25                              /lib/x86_64-linux-gnu/libm.so.6
+ufromfpl@GLIBC_2.25                               /lib/x86_64-linux-gnu/libm.so.6
+ufromfpx                                          /lib/x86_64-linux-gnu/libm.so.6
+ufromfpx@@GLIBC_2.25                              /lib/x86_64-linux-gnu/libm.so.6
+ufromfpx@GLIBC_2.25                               /lib/x86_64-linux-gnu/libm.so.6
+ufromfpxf                                         /lib/x86_64-linux-gnu/libm.so.6
+ufromfpxf128                                      /lib/x86_64-linux-gnu/libm.so.6
+ufromfpxf128@@GLIBC_2.26                          /lib/x86_64-linux-gnu/libm.so.6
+ufromfpxf128@GLIBC_2.26                           /lib/x86_64-linux-gnu/libm.so.6
+ufromfpxf32                                       /lib/x86_64-linux-gnu/libm.so.6
+ufromfpxf32@@GLIBC_2.27                           /lib/x86_64-linux-gnu/libm.so.6
+ufromfpxf32@GLIBC_2.27                            /lib/x86_64-linux-gnu/libm.so.6
+ufromfpxf32x                                      /lib/x86_64-linux-gnu/libm.so.6
+ufromfpxf32x@@GLIBC_2.27                          /lib/x86_64-linux-gnu/libm.so.6
+ufromfpxf32x@GLIBC_2.27                           /lib/x86_64-linux-gnu/libm.so.6
+ufromfpxf64                                       /lib/x86_64-linux-gnu/libm.so.6
+ufromfpxf64@@GLIBC_2.27                           /lib/x86_64-linux-gnu/libm.so.6
+ufromfpxf64@GLIBC_2.27                            /lib/x86_64-linux-gnu/libm.so.6
+ufromfpxf64x                                      /lib/x86_64-linux-gnu/libm.so.6
+ufromfpxf64x@@GLIBC_2.27                          /lib/x86_64-linux-gnu/libm.so.6
+ufromfpxf64x@GLIBC_2.27                           /lib/x86_64-linux-gnu/libm.so.6
+ufromfpxf@@GLIBC_2.25                             /lib/x86_64-linux-gnu/libm.so.6
+ufromfpxf@GLIBC_2.25                              /lib/x86_64-linux-gnu/libm.so.6
+ufromfpxl                                         /lib/x86_64-linux-gnu/libm.so.6
+ufromfpxl@@GLIBC_2.25                             /lib/x86_64-linux-gnu/libm.so.6
+ufromfpxl@GLIBC_2.25                              /lib/x86_64-linux-gnu/libm.so.6
+ulckpwdf                                          /lib/x86_64-linux-gnu/libc.so.6
+ulckpwdf@@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+ulckpwdf@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+ulimit                                            /lib/x86_64-linux-gnu/libc.so.6
+ulimit@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+ulimit@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libc.so.6
+umask                                             /lib/x86_64-linux-gnu/libc.so.6
+umask@@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libc.so.6
+umask@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libc.so.6
+umount                                            /lib/x86_64-linux-gnu/libc.so.6
+umount2                                           /lib/x86_64-linux-gnu/libc.so.6
+umount2@@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+umount2@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+umount@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+umount@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libc.so.6
+uname                                             /lib/x86_64-linux-gnu/libc.so.6
+uname@@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libc.so.6
+uname@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libc.so.6
+ungetc                                            /lib/x86_64-linux-gnu/libc.so.6
+ungetc@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+ungetc@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libc.so.6
+unichar_isalnum                                   build/py/unicode.o
+unichar_isalpha                                   build/py/unicode.o
+                                                  build/py/objstr.o
+                                                  build/py/lexer.o
+unichar_isdigit                                   build/py/unicode.o
+                                                  build/main.o
+                                                  build/py/modstruct.o
+                                                  build/py/objstr.o
+                                                  build/py/lexer.o
+unichar_isident                                   build/py/unicode.o
+unichar_islower                                   build/py/unicode.o
+                                                  build/py/objstr.o
+unichar_isspace                                   build/py/unicode.o
+                                                  build/py/objstr.o
+                                                  build/py/parsenum.o
+                                                  build/py/lexer.o
+unichar_isupper                                   build/py/unicode.o
+                                                  build/py/objstr.o
+unichar_isxdigit                                  build/py/unicode.o
+                                                  build/py/lexer.o
+unichar_tolower                                   build/py/unicode.o
+                                                  build/py/objstr.o
+unichar_toupper                                   build/py/unicode.o
+                                                  build/py/objstr.o
+unichar_xdigit_value                              build/py/unicode.o
+                                                  build/py/lexer.o
+unlink                                            /lib/x86_64-linux-gnu/libc.so.6
+unlink@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+unlink@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libc.so.6
+unsetenv                                          /lib/x86_64-linux-gnu/libc.so.6
+unsetenv@@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+unsetenv@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+updwtmp                                           /lib/x86_64-linux-gnu/libc.so.6
+updwtmp@@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+updwtmp@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+uselocale                                         /lib/x86_64-linux-gnu/libc.so.6
+uselocale@@GLIBC_2.3                              /lib/x86_64-linux-gnu/libc.so.6
+uselocale@GLIBC_2.3                               /lib/x86_64-linux-gnu/libc.so.6
+utf8_charlen                                      build/py/unicode.o
+                                                  build/py/modbuiltins.o
+                                                  build/py/objstrunicode.o
+                                                  build/py/objstr.o
+utf8_check                                        build/py/unicode.o
+                                                  build/py/objstr.o
+utf8_get_char                                     build/py/unicode.o
+                                                  build/py/modbuiltins.o
+                                                  build/py/objstrunicode.o
+utf8_next_char                                    build/py/unicode.o
+                                                  build/py/objstrunicode.o
+                                                  build/py/objstr.o
+utf8_ptr_to_index                                 build/py/unicode.o
+                                                  build/py/objstr.o
+utimensat                                         /lib/x86_64-linux-gnu/libc.so.6
+utimensat@@GLIBC_2.6                              /lib/x86_64-linux-gnu/libc.so.6
+utimensat@GLIBC_2.6                               /lib/x86_64-linux-gnu/libc.so.6
+utimes                                            /lib/x86_64-linux-gnu/libc.so.6
+utimes@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+utimes@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libc.so.6
+utmpname                                          /lib/x86_64-linux-gnu/libc.so.6
+utmpname@@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+utmpname@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+valloc                                            /lib/x86_64-linux-gnu/libc.so.6
+valloc@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+valloc@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libc.so.6
+vasprintf                                         /lib/x86_64-linux-gnu/libc.so.6
+vasprintf@@GLIBC_2.2.5                            /lib/x86_64-linux-gnu/libc.so.6
+vasprintf@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+vdprintf                                          /lib/x86_64-linux-gnu/libc.so.6
+vdprintf@@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+vdprintf@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+versionsort                                       /lib/x86_64-linux-gnu/libc.so.6
+versionsort64                                     /lib/x86_64-linux-gnu/libc.so.6
+versionsort64@@GLIBC_2.2.5                        /lib/x86_64-linux-gnu/libc.so.6
+versionsort64@GLIBC_2.2.5                         /lib/x86_64-linux-gnu/libc.so.6
+versionsort@@GLIBC_2.2.5                          /lib/x86_64-linux-gnu/libc.so.6
+versionsort@GLIBC_2.2.5                           /lib/x86_64-linux-gnu/libc.so.6
+vfork                                             /lib/x86_64-linux-gnu/libc.so.6
+vfork@@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libc.so.6
+vfork@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libc.so.6
+vfscanf                                           /lib/x86_64-linux-gnu/libc.so.6
+vfscanf@@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+vfscanf@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+vfwprintf                                         /lib/x86_64-linux-gnu/libc.so.6
+vfwprintf@@GLIBC_2.2.5                            /lib/x86_64-linux-gnu/libc.so.6
+vfwprintf@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+vfwscanf                                          /lib/x86_64-linux-gnu/libc.so.6
+vfwscanf@@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+vfwscanf@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+vscanf                                            /lib/x86_64-linux-gnu/libc.so.6
+vscanf@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+vscanf@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libc.so.6
+vsnprintf                                         /lib/x86_64-linux-gnu/libc.so.6
+vsnprintf@@GLIBC_2.2.5                            /lib/x86_64-linux-gnu/libc.so.6
+vsnprintf@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+vsprintf                                          /lib/x86_64-linux-gnu/libc.so.6
+vsprintf@@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+vsprintf@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+vsscanf                                           /lib/x86_64-linux-gnu/libc.so.6
+vsscanf@@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+vsscanf@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+vstr_add_byte                                     build/py/vstr.o
+                                                  build/py/objstr.o
+                                                  build/py/lexer.o
+vstr_add_char                                     build/py/vstr.o
+                                                  build/py/builtinimport.o
+                                                  build/py/lexer.o
+vstr_add_len                                      build/py/vstr.o
+                                                  build/py/stream.o
+vstr_add_str                                      build/py/vstr.o
+                                                  build/main.o
+                                                  build/py/builtinimport.o
+vstr_add_strn                                     build/py/vstr.o
+                                                  build/py/builtinimport.o
+vstr_clear                                        build/py/vstr.o
+                                                  build/main.o
+                                                  build/py/stream.o
+                                                  build/py/objstr.o
+                                                  build/py/persistentcode.o
+                                                  build/py/lexer.o
+vstr_cut_head_bytes                               build/py/vstr.o
+vstr_cut_out_bytes                                build/py/vstr.o
+vstr_cut_tail_bytes                               build/py/vstr.o
+                                                  build/main.o
+                                                  build/py/stream.o
+                                                  build/py/lexer.o
+vstr_extend                                       build/py/vstr.o
+                                                  build/py/stream.o
+vstr_free                                         build/py/vstr.o
+vstr_hint_size                                    build/py/vstr.o
+vstr_init                                         build/py/vstr.o
+                                                  build/main.o
+                                                  build/py/stream.o
+                                                  build/py/objstr.o
+                                                  build/py/lexer.o
+vstr_init_fixed_buf                               build/py/vstr.o
+                                                  build/py/builtinimport.o
+vstr_init_len                                     build/py/vstr.o
+                                                  build/py/modstruct.o
+                                                  build/py/stream.o
+                                                  build/py/objstr.o
+                                                  build/py/objint.o
+vstr_init_print                                   build/py/vstr.o
+                                                  build/py/modbuiltins.o
+                                                  build/py/objstr.o
+                                                  build/py/persistentcode.o
+                                                  build/py/parsenum.o
+vstr_ins_byte                                     build/py/vstr.o
+vstr_ins_char                                     build/py/vstr.o
+vstr_new                                          build/py/vstr.o
+vstr_null_terminated_str                          build/py/vstr.o
+                                                  build/main.o
+                                                  build/py/builtinimport.o
+                                                  build/py/objstr.o
+                                                  build/py/lexer.o
+vstr_printf                                       build/py/vstr.o
+vstr_vprintf                                      build/py/vstr.o
+vswprintf                                         /lib/x86_64-linux-gnu/libc.so.6
+vswprintf@@GLIBC_2.2.5                            /lib/x86_64-linux-gnu/libc.so.6
+vswprintf@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+vswscanf                                          /lib/x86_64-linux-gnu/libc.so.6
+vswscanf@@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+vswscanf@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+vsyslog                                           /lib/x86_64-linux-gnu/libc.so.6
+vsyslog@@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+vsyslog@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+wait                                              /lib/x86_64-linux-gnu/libc.so.6
+wait3                                             /lib/x86_64-linux-gnu/libc.so.6
+wait3@@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libc.so.6
+wait3@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libc.so.6
+wait4                                             /lib/x86_64-linux-gnu/libc.so.6
+wait4@@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libc.so.6
+wait4@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libc.so.6
+wait@@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libc.so.6
+wait@GLIBC_2.2.5                                  /lib/x86_64-linux-gnu/libc.so.6
+waitid                                            /lib/x86_64-linux-gnu/libc.so.6
+waitid@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+waitid@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libc.so.6
+waitpid                                           /lib/x86_64-linux-gnu/libc.so.6
+waitpid@@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+waitpid@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+wcpcpy                                            /lib/x86_64-linux-gnu/libc.so.6
+wcpcpy@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+wcpcpy@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libc.so.6
+wcpncpy                                           /lib/x86_64-linux-gnu/libc.so.6
+wcpncpy@@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+wcpncpy@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+wcrtomb                                           /lib/x86_64-linux-gnu/libc.so.6
+wcrtomb@@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+wcrtomb@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+wcscasecmp                                        /lib/x86_64-linux-gnu/libc.so.6
+wcscasecmp@@GLIBC_2.2.5                           /lib/x86_64-linux-gnu/libc.so.6
+wcscasecmp@GLIBC_2.2.5                            /lib/x86_64-linux-gnu/libc.so.6
+wcscasecmp_l                                      /lib/x86_64-linux-gnu/libc.so.6
+wcscasecmp_l@@GLIBC_2.3                           /lib/x86_64-linux-gnu/libc.so.6
+wcscasecmp_l@GLIBC_2.3                            /lib/x86_64-linux-gnu/libc.so.6
+wcscat                                            /lib/x86_64-linux-gnu/libc.so.6
+wcscat@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+wcscat@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libc.so.6
+wcschr                                            /lib/x86_64-linux-gnu/libc.so.6
+wcschr@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+wcschr@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libc.so.6
+wcschrnul                                         /lib/x86_64-linux-gnu/libc.so.6
+wcschrnul@@GLIBC_2.2.5                            /lib/x86_64-linux-gnu/libc.so.6
+wcschrnul@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+wcscmp                                            /lib/x86_64-linux-gnu/libc.so.6
+wcscmp@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+wcscmp@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libc.so.6
+wcscoll                                           /lib/x86_64-linux-gnu/libc.so.6
+wcscoll@@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+wcscoll@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+wcscoll_l                                         /lib/x86_64-linux-gnu/libc.so.6
+wcscoll_l@@GLIBC_2.3                              /lib/x86_64-linux-gnu/libc.so.6
+wcscoll_l@GLIBC_2.3                               /lib/x86_64-linux-gnu/libc.so.6
+wcscpy                                            /lib/x86_64-linux-gnu/libc.so.6
+wcscpy@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+wcscpy@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libc.so.6
+wcsftime_l                                        /lib/x86_64-linux-gnu/libc.so.6
+wcsftime_l@@GLIBC_2.3                             /lib/x86_64-linux-gnu/libc.so.6
+wcsftime_l@GLIBC_2.3                              /lib/x86_64-linux-gnu/libc.so.6
+wcslen                                            /lib/x86_64-linux-gnu/libc.so.6
+wcslen@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+wcslen@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libc.so.6
+wcsncasecmp                                       /lib/x86_64-linux-gnu/libc.so.6
+wcsncasecmp@@GLIBC_2.2.5                          /lib/x86_64-linux-gnu/libc.so.6
+wcsncasecmp@GLIBC_2.2.5                           /lib/x86_64-linux-gnu/libc.so.6
+wcsncasecmp_l                                     /lib/x86_64-linux-gnu/libc.so.6
+wcsncasecmp_l@@GLIBC_2.3                          /lib/x86_64-linux-gnu/libc.so.6
+wcsncasecmp_l@GLIBC_2.3                           /lib/x86_64-linux-gnu/libc.so.6
+wcsncpy                                           /lib/x86_64-linux-gnu/libc.so.6
+wcsncpy@@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+wcsncpy@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+wcsnlen                                           /lib/x86_64-linux-gnu/libc.so.6
+wcsnlen@@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+wcsnlen@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+wcsnrtombs                                        /lib/x86_64-linux-gnu/libc.so.6
+wcsnrtombs@@GLIBC_2.2.5                           /lib/x86_64-linux-gnu/libc.so.6
+wcsnrtombs@GLIBC_2.2.5                            /lib/x86_64-linux-gnu/libc.so.6
+wcsrtombs                                         /lib/x86_64-linux-gnu/libc.so.6
+wcsrtombs@@GLIBC_2.2.5                            /lib/x86_64-linux-gnu/libc.so.6
+wcsrtombs@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+wcstod_l                                          /lib/x86_64-linux-gnu/libc.so.6
+wcstod_l@@GLIBC_2.3                               /lib/x86_64-linux-gnu/libc.so.6
+wcstod_l@GLIBC_2.3                                /lib/x86_64-linux-gnu/libc.so.6
+wcstof128_l                                       /lib/x86_64-linux-gnu/libc.so.6
+wcstof128_l@@GLIBC_2.26                           /lib/x86_64-linux-gnu/libc.so.6
+wcstof128_l@GLIBC_2.26                            /lib/x86_64-linux-gnu/libc.so.6
+wcstof32                                          /lib/x86_64-linux-gnu/libc.so.6
+wcstof32@@GLIBC_2.27                              /lib/x86_64-linux-gnu/libc.so.6
+wcstof32@GLIBC_2.27                               /lib/x86_64-linux-gnu/libc.so.6
+wcstof32_l                                        /lib/x86_64-linux-gnu/libc.so.6
+wcstof32_l@@GLIBC_2.27                            /lib/x86_64-linux-gnu/libc.so.6
+wcstof32_l@GLIBC_2.27                             /lib/x86_64-linux-gnu/libc.so.6
+wcstof32x                                         /lib/x86_64-linux-gnu/libc.so.6
+wcstof32x@@GLIBC_2.27                             /lib/x86_64-linux-gnu/libc.so.6
+wcstof32x@GLIBC_2.27                              /lib/x86_64-linux-gnu/libc.so.6
+wcstof32x_l                                       /lib/x86_64-linux-gnu/libc.so.6
+wcstof32x_l@@GLIBC_2.27                           /lib/x86_64-linux-gnu/libc.so.6
+wcstof32x_l@GLIBC_2.27                            /lib/x86_64-linux-gnu/libc.so.6
+wcstof64                                          /lib/x86_64-linux-gnu/libc.so.6
+wcstof64@@GLIBC_2.27                              /lib/x86_64-linux-gnu/libc.so.6
+wcstof64@GLIBC_2.27                               /lib/x86_64-linux-gnu/libc.so.6
+wcstof64_l                                        /lib/x86_64-linux-gnu/libc.so.6
+wcstof64_l@@GLIBC_2.27                            /lib/x86_64-linux-gnu/libc.so.6
+wcstof64_l@GLIBC_2.27                             /lib/x86_64-linux-gnu/libc.so.6
+wcstof64x                                         /lib/x86_64-linux-gnu/libc.so.6
+wcstof64x@@GLIBC_2.27                             /lib/x86_64-linux-gnu/libc.so.6
+wcstof64x@GLIBC_2.27                              /lib/x86_64-linux-gnu/libc.so.6
+wcstof64x_l                                       /lib/x86_64-linux-gnu/libc.so.6
+wcstof64x_l@@GLIBC_2.27                           /lib/x86_64-linux-gnu/libc.so.6
+wcstof64x_l@GLIBC_2.27                            /lib/x86_64-linux-gnu/libc.so.6
+wcstof_l                                          /lib/x86_64-linux-gnu/libc.so.6
+wcstof_l@@GLIBC_2.3                               /lib/x86_64-linux-gnu/libc.so.6
+wcstof_l@GLIBC_2.3                                /lib/x86_64-linux-gnu/libc.so.6
+wcstol                                            /lib/x86_64-linux-gnu/libc.so.6
+wcstol@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+wcstol@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libc.so.6
+wcstol_l                                          /lib/x86_64-linux-gnu/libc.so.6
+wcstol_l@@GLIBC_2.3                               /lib/x86_64-linux-gnu/libc.so.6
+wcstol_l@GLIBC_2.3                                /lib/x86_64-linux-gnu/libc.so.6
+wcstold_l                                         /lib/x86_64-linux-gnu/libc.so.6
+wcstold_l@@GLIBC_2.3                              /lib/x86_64-linux-gnu/libc.so.6
+wcstold_l@GLIBC_2.3                               /lib/x86_64-linux-gnu/libc.so.6
+wcstoll                                           /lib/x86_64-linux-gnu/libc.so.6
+wcstoll@@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+wcstoll@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+wcstoll_l                                         /lib/x86_64-linux-gnu/libc.so.6
+wcstoll_l@@GLIBC_2.3                              /lib/x86_64-linux-gnu/libc.so.6
+wcstoll_l@GLIBC_2.3                               /lib/x86_64-linux-gnu/libc.so.6
+wcstoq                                            /lib/x86_64-linux-gnu/libc.so.6
+wcstoq@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+wcstoq@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libc.so.6
+wcstoul                                           /lib/x86_64-linux-gnu/libc.so.6
+wcstoul@@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+wcstoul@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+wcstoul_l                                         /lib/x86_64-linux-gnu/libc.so.6
+wcstoul_l@@GLIBC_2.3                              /lib/x86_64-linux-gnu/libc.so.6
+wcstoul_l@GLIBC_2.3                               /lib/x86_64-linux-gnu/libc.so.6
+wcstoull                                          /lib/x86_64-linux-gnu/libc.so.6
+wcstoull@@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+wcstoull@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+wcstoull_l                                        /lib/x86_64-linux-gnu/libc.so.6
+wcstoull_l@@GLIBC_2.3                             /lib/x86_64-linux-gnu/libc.so.6
+wcstoull_l@GLIBC_2.3                              /lib/x86_64-linux-gnu/libc.so.6
+wcstouq                                           /lib/x86_64-linux-gnu/libc.so.6
+wcstouq@@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+wcstouq@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+wcswcs                                            /lib/x86_64-linux-gnu/libc.so.6
+wcswcs@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+wcswcs@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libc.so.6
+wcsxfrm_l                                         /lib/x86_64-linux-gnu/libc.so.6
+wcsxfrm_l@@GLIBC_2.3                              /lib/x86_64-linux-gnu/libc.so.6
+wcsxfrm_l@GLIBC_2.3                               /lib/x86_64-linux-gnu/libc.so.6
+wctrans                                           /lib/x86_64-linux-gnu/libc.so.6
+wctrans@@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+wctrans@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+wctrans_l                                         /lib/x86_64-linux-gnu/libc.so.6
+wctrans_l@@GLIBC_2.3                              /lib/x86_64-linux-gnu/libc.so.6
+wctrans_l@GLIBC_2.3                               /lib/x86_64-linux-gnu/libc.so.6
+wctype                                            /lib/x86_64-linux-gnu/libc.so.6
+wctype@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+wctype@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libc.so.6
+wctype_l                                          /lib/x86_64-linux-gnu/libc.so.6
+wctype_l@@GLIBC_2.3                               /lib/x86_64-linux-gnu/libc.so.6
+wctype_l@GLIBC_2.3                                /lib/x86_64-linux-gnu/libc.so.6
+wmemchr                                           /lib/x86_64-linux-gnu/libc.so.6
+wmemchr@@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+wmemchr@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+wmemcmp                                           /lib/x86_64-linux-gnu/libc.so.6
+wmemcmp@@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+wmemcmp@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+wmemcpy                                           /lib/x86_64-linux-gnu/libc.so.6
+wmemcpy@@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+wmemcpy@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+wmemmove                                          /lib/x86_64-linux-gnu/libc.so.6
+wmemmove@@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+wmemmove@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+wmempcpy                                          /lib/x86_64-linux-gnu/libc.so.6
+wmempcpy@@GLIBC_2.2.5                             /lib/x86_64-linux-gnu/libc.so.6
+wmempcpy@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+wmemset                                           /lib/x86_64-linux-gnu/libc.so.6
+wmemset@@GLIBC_2.2.5                              /lib/x86_64-linux-gnu/libc.so.6
+wmemset@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+write                                             /lib/x86_64-linux-gnu/libc.so.6
+                                                  build/main.o
+                                                  build/py/persistentcode.o
+write@@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libc.so.6
+write@GLIBC_2.2.5                                 /lib/x86_64-linux-gnu/libc.so.6
+writev                                            /lib/x86_64-linux-gnu/libc.so.6
+writev@@GLIBC_2.2.5                               /lib/x86_64-linux-gnu/libc.so.6
+writev@GLIBC_2.2.5                                /lib/x86_64-linux-gnu/libc.so.6
+y0                                                /lib/x86_64-linux-gnu/libm.so.6
+y0@@GLIBC_2.2.5                                   /lib/x86_64-linux-gnu/libm.so.6
+y0@GLIBC_2.2.5                                    /lib/x86_64-linux-gnu/libm.so.6
+y0f                                               /lib/x86_64-linux-gnu/libm.so.6
+y0f128                                            /lib/x86_64-linux-gnu/libm.so.6
+y0f128@@GLIBC_2.26                                /lib/x86_64-linux-gnu/libm.so.6
+y0f128@GLIBC_2.26                                 /lib/x86_64-linux-gnu/libm.so.6
+y0f32                                             /lib/x86_64-linux-gnu/libm.so.6
+y0f32@@GLIBC_2.27                                 /lib/x86_64-linux-gnu/libm.so.6
+y0f32@GLIBC_2.27                                  /lib/x86_64-linux-gnu/libm.so.6
+y0f32x                                            /lib/x86_64-linux-gnu/libm.so.6
+y0f32x@@GLIBC_2.27                                /lib/x86_64-linux-gnu/libm.so.6
+y0f32x@GLIBC_2.27                                 /lib/x86_64-linux-gnu/libm.so.6
+y0f64                                             /lib/x86_64-linux-gnu/libm.so.6
+y0f64@@GLIBC_2.27                                 /lib/x86_64-linux-gnu/libm.so.6
+y0f64@GLIBC_2.27                                  /lib/x86_64-linux-gnu/libm.so.6
+y0f64x                                            /lib/x86_64-linux-gnu/libm.so.6
+y0f64x@@GLIBC_2.27                                /lib/x86_64-linux-gnu/libm.so.6
+y0f64x@GLIBC_2.27                                 /lib/x86_64-linux-gnu/libm.so.6
+y0f@@GLIBC_2.2.5                                  /lib/x86_64-linux-gnu/libm.so.6
+y0f@GLIBC_2.2.5                                   /lib/x86_64-linux-gnu/libm.so.6
+y0l                                               /lib/x86_64-linux-gnu/libm.so.6
+y0l@@GLIBC_2.2.5                                  /lib/x86_64-linux-gnu/libm.so.6
+y0l@GLIBC_2.2.5                                   /lib/x86_64-linux-gnu/libm.so.6
+y1                                                /lib/x86_64-linux-gnu/libm.so.6
+y1@@GLIBC_2.2.5                                   /lib/x86_64-linux-gnu/libm.so.6
+y1@GLIBC_2.2.5                                    /lib/x86_64-linux-gnu/libm.so.6
+y1f                                               /lib/x86_64-linux-gnu/libm.so.6
+y1f128                                            /lib/x86_64-linux-gnu/libm.so.6
+y1f128@@GLIBC_2.26                                /lib/x86_64-linux-gnu/libm.so.6
+y1f128@GLIBC_2.26                                 /lib/x86_64-linux-gnu/libm.so.6
+y1f32                                             /lib/x86_64-linux-gnu/libm.so.6
+y1f32@@GLIBC_2.27                                 /lib/x86_64-linux-gnu/libm.so.6
+y1f32@GLIBC_2.27                                  /lib/x86_64-linux-gnu/libm.so.6
+y1f32x                                            /lib/x86_64-linux-gnu/libm.so.6
+y1f32x@@GLIBC_2.27                                /lib/x86_64-linux-gnu/libm.so.6
+y1f32x@GLIBC_2.27                                 /lib/x86_64-linux-gnu/libm.so.6
+y1f64                                             /lib/x86_64-linux-gnu/libm.so.6
+y1f64@@GLIBC_2.27                                 /lib/x86_64-linux-gnu/libm.so.6
+y1f64@GLIBC_2.27                                  /lib/x86_64-linux-gnu/libm.so.6
+y1f64x                                            /lib/x86_64-linux-gnu/libm.so.6
+y1f64x@@GLIBC_2.27                                /lib/x86_64-linux-gnu/libm.so.6
+y1f64x@GLIBC_2.27                                 /lib/x86_64-linux-gnu/libm.so.6
+y1f@@GLIBC_2.2.5                                  /lib/x86_64-linux-gnu/libm.so.6
+y1f@GLIBC_2.2.5                                   /lib/x86_64-linux-gnu/libm.so.6
+y1l                                               /lib/x86_64-linux-gnu/libm.so.6
+y1l@@GLIBC_2.2.5                                  /lib/x86_64-linux-gnu/libm.so.6
+y1l@GLIBC_2.2.5                                   /lib/x86_64-linux-gnu/libm.so.6
+yn                                                /lib/x86_64-linux-gnu/libm.so.6
+yn@@GLIBC_2.2.5                                   /lib/x86_64-linux-gnu/libm.so.6
+yn@GLIBC_2.2.5                                    /lib/x86_64-linux-gnu/libm.so.6
+ynf                                               /lib/x86_64-linux-gnu/libm.so.6
+ynf128                                            /lib/x86_64-linux-gnu/libm.so.6
+ynf128@@GLIBC_2.26                                /lib/x86_64-linux-gnu/libm.so.6
+ynf128@GLIBC_2.26                                 /lib/x86_64-linux-gnu/libm.so.6
+ynf32                                             /lib/x86_64-linux-gnu/libm.so.6
+ynf32@@GLIBC_2.27                                 /lib/x86_64-linux-gnu/libm.so.6
+ynf32@GLIBC_2.27                                  /lib/x86_64-linux-gnu/libm.so.6
+ynf32x                                            /lib/x86_64-linux-gnu/libm.so.6
+ynf32x@@GLIBC_2.27                                /lib/x86_64-linux-gnu/libm.so.6
+ynf32x@GLIBC_2.27                                 /lib/x86_64-linux-gnu/libm.so.6
+ynf64                                             /lib/x86_64-linux-gnu/libm.so.6
+ynf64@@GLIBC_2.27                                 /lib/x86_64-linux-gnu/libm.so.6
+ynf64@GLIBC_2.27                                  /lib/x86_64-linux-gnu/libm.so.6
+ynf64x                                            /lib/x86_64-linux-gnu/libm.so.6
+ynf64x@@GLIBC_2.27                                /lib/x86_64-linux-gnu/libm.so.6
+ynf64x@GLIBC_2.27                                 /lib/x86_64-linux-gnu/libm.so.6
+ynf@@GLIBC_2.2.5                                  /lib/x86_64-linux-gnu/libm.so.6
+ynf@GLIBC_2.2.5                                   /lib/x86_64-linux-gnu/libm.so.6
+ynl                                               /lib/x86_64-linux-gnu/libm.so.6
+ynl@@GLIBC_2.2.5                                  /lib/x86_64-linux-gnu/libm.so.6
+ynl@GLIBC_2.2.5                                   /lib/x86_64-linux-gnu/libm.so.6

From d7f5ae285efa6b81f9941328db2b0474fd3a7569 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sat, 24 Aug 2019 20:35:08 +0200
Subject: [PATCH 3241/3533] Fix README: repo location

---
 ports/gprs_a9/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/gprs_a9/README.md b/ports/gprs_a9/README.md
index d185c9ab924de..08b2e7f130680 100644
--- a/ports/gprs_a9/README.md
+++ b/ports/gprs_a9/README.md
@@ -7,7 +7,7 @@ Your support is important for this port: please consider donating.
 1. Install vendor tools: [documentation](https://ai-thinker-open.github.io/GPRS_C_SDK_DOC/en/c-sdk/installation_linux.html), [docker](https://github.com/Neutree/gprs_build)
 2. Clone this
    ```bash
-   git clone git@github.com:Neutree/micropython.git
+   git clone git@github.com:pulkin/micropython.git
    ```
 3. Make
    ```bash

From 33fe24d9b2f47d3317212f856d9416b36ac2f2e9 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sun, 8 Sep 2019 15:45:25 +0200
Subject: [PATCH 3242/3533] Switch to working submodule repo

---
 .gitmodules | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitmodules b/.gitmodules
index af841e03a403e..d6234a6d49183 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -59,3 +59,6 @@
 [submodule "ports/gprs_a9/GPRS_C_SDK"]
 	path = ports/gprs_a9/GPRS_C_SDK
 	url = https://github.com/Ai-Thinker-Open/GPRS_C_SDK
+[submodule "lib/GPRS_C_SDK"]
+	path = lib/GPRS_C_SDK
+	url = https://github.com/petrynchyn/GPRS_C_SDK

From 81c7127b11cb5ee1e37a1168b8269cf28b2f8a11 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sun, 8 Sep 2019 16:52:12 +0200
Subject: [PATCH 3243/3533] Re-added SDK submodule

---
 .gitmodules | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitmodules b/.gitmodules
index d6234a6d49183..4afab02c3118a 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -61,4 +61,4 @@
 	url = https://github.com/Ai-Thinker-Open/GPRS_C_SDK
 [submodule "lib/GPRS_C_SDK"]
 	path = lib/GPRS_C_SDK
-	url = https://github.com/petrynchyn/GPRS_C_SDK
+	url = https://github.com/petrynchyn/GPRS_C_SDK
\ No newline at end of file

From b39ec1d553c68a12ceacb89085b1696e9791347f Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sun, 8 Sep 2019 19:25:57 +0200
Subject: [PATCH 3244/3533] Incorporate toolchain as a submodule

---
 .gitmodules | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.gitmodules b/.gitmodules
index 4afab02c3118a..845ff57e0607f 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -61,4 +61,7 @@
 	url = https://github.com/Ai-Thinker-Open/GPRS_C_SDK
 [submodule "lib/GPRS_C_SDK"]
 	path = lib/GPRS_C_SDK
-	url = https://github.com/petrynchyn/GPRS_C_SDK
\ No newline at end of file
+    url = https://github.com/petrynchyn/GPRS_C_SDK.git
+[submodule "lib/csdtk42-linux"]
+    path = lib/csdtk42-linux
+    url = https://github.com/pulkin/csdtk42-linux.git

From 6bcd93a9201e7f03193086d1c465a893c2bd815d Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sun, 8 Sep 2019 19:28:23 +0200
Subject: [PATCH 3245/3533] Use the submodule toolchain in build

---
 ports/gprs_a9/Makefile | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/ports/gprs_a9/Makefile b/ports/gprs_a9/Makefile
index b0ab2ea028900..6eda1547588e8 100644
--- a/ports/gprs_a9/Makefile
+++ b/ports/gprs_a9/Makefile
@@ -1,3 +1,6 @@
+CSDTK_PATH = ../../lib/csdtk42-linux
+LD_LIBRARY_PATH=$(CSDTK_PATH)/lib:$(CSDTK_PATH)/mingw32/usr/lib
+
 mkfile_path := $(abspath $(lastword $(MAKEFILE_LIST)))  #获�当�正在执行的makefile的�对路径
 PATH_CURR := $(strip $(patsubst %/, %, $(dir ${mkfile_path})))
 PATH_MICROPY := $(strip $(patsubst %/ports/, %, $(dir ${PATH_CURR})))
@@ -29,7 +32,7 @@ QSTR_DEFS = qstrdefsport.h
 FROZEN_MPY_DIR ?= modules
 
 #############################################
-CROSS_COMPILE = mips-elf-
+CROSS_COMPILE = $(CSDTK_PATH)/bin/mips-elf-
 MAKE = make
 LD  := $(CROSS_COMPILE)ld
 LDPP := $(CROSS_COMPILE)cpp -C -P -undef
@@ -51,7 +54,8 @@ PLATFORM_ELF_PATH := ${wildcard ${PLATFORM_ELF_FOLDER_PATH}/*.elf}
 PLATFORM_ELF_NAME := ${notdir ${PLATFORM_ELF_PATH}}
 PLATFORM_LOD_PATH := ${CSDK_PATH}/platform/csdk/${strip ${CFG_RELEASE}}
 PLATFORM_LOD_FILE := ${wildcard ${PLATFORM_LOD_PATH}/*.lod}
-ELFCOMBINE_TOOL := ${CSDK_PATH}/platform/compilation/elfCombine.pl
+ELFCOMBINE_TOOL := PATH=$PATH:$(CSDTK_PATH)/bin ${CSDK_PATH}/platform/compilation/elfCombine.pl
+SRECMAP_TOOL := $(CSDTK_PATH)/bin/srecmap 
 TARGET_FILE := ${BUILD_PATH_ABS}/targetgen
 MAP_CFG_FILE := ${CSDK_PATH}/platform/compilation/8955_map_cfg
 LODCOMBINE_TOOL := ${CSDK_PATH}/platform/compilation/lodtool.py
@@ -183,7 +187,7 @@ all: lod
 
 lod: ${HEX}
 	$(Q)$(MAKE) targetgen
-	$(Q)srecmap -c ${MAP_CFG_FILE} -m ${FLSH_MODEL} -b ${TARGET_FILE} ${HEX} ${LODBASE} ${STDOUT_NULL}
+	$(Q)$(SRECMAP_TOOL) -c ${MAP_CFG_FILE} -m ${FLSH_MODEL} -b ${TARGET_FILE} ${HEX} ${LODBASE} ${STDOUT_NULL}
 	$(Q)python $(LODCOMBINE_TOOL) merge --platform $(PLATFORM_LOD_FILE) --app $(LOD_FILE) --out $(WITH_PLT_LOD_FILE)
 	$(ECHO) "BUILD OK"
 

From 18e83eb31e4230e6d017ad8adb4f9dcf917652c2 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sun, 8 Sep 2019 19:40:31 +0200
Subject: [PATCH 3246/3533] Remove the build script

---
 ports/gprs_a9/build.sh | 159 -----------------------------------------
 1 file changed, 159 deletions(-)
 delete mode 100755 ports/gprs_a9/build.sh

diff --git a/ports/gprs_a9/build.sh b/ports/gprs_a9/build.sh
deleted file mode 100755
index 3dfbf37c0aba8..0000000000000
--- a/ports/gprs_a9/build.sh
+++ /dev/null
@@ -1,159 +0,0 @@
-#!/bin/bash
-
-
-######################## 1 ################################
-# check path
-curr_path_abs=$(cd `dirname $0`; pwd)
-curr_folder_name="${curr_path_abs##*/}"
-echo $curr_path_abs
-if [[ "${curr_folder_name}" != "gprs_a9" ]]; then
-    echo "Plese exec build.sh in gprs_a9 folder"
-    exit 1
-fi
-###########################################################
-
-function clean_CSDK_lib()
-{
-    echo ">> Clean CSDK lib now"
-    cd ../../  #root path of micropython project
-    cd lib/GPRS_C_SDK/platform/tools/genlib
-    chmod +x genlib.sh
-    ./genlib.sh clean
-    cd ${curr_path_abs}
-}
-
-######################### 2 ###############################
-# check parameters
-CFG_RELEASE=debug
-if [[ "$1xx" == "releasexx" ]]; then
-    CFG_RELEASE=release
-elif [[ "$1xx" == "cleanxx" ]]; then
-    echo ">> Clean build & hex"
-    rm -rf build
-    rm -rf hex
-    clean_CSDK_lib
-    echo ">> Clean complete"
-    exit 0
-fi
-
-# variable
-FIRMWARE_NAME=firmware_${CFG_RELEASE}
-MAP_FILE_PATH=./build/${FIRMWARE_NAME}.map
-MEMD_DEF_PATH=../../lib/GPRS_C_SDK/platform/csdk/memd.def
-start_time=`date +%s`
-###########################################################
-
-
-#check gprs sdk files
-function check_CSDK()
-{
-    echo ">> Check GPRS CSDK lib files"
-    cd ../../ # root of micropython project
-    if [ "`ls -A lib/GPRS_C_SDK`xx" == "xx" ]; then
-        echo "-- No CSDK, now pull"
-        git submodule update --init lib/GPRS_C_SDK
-        cd lib/GPRS_C_SDK
-        git submodule update --init
-        cd ../../
-        echo "-- Pull CSDK complete"
-    else
-        echo "-- GPRS CSDK exist"
-    fi
-    if [ "`ls -A lib/GPRS_C_SDK/platform/csdk`xx" == "xx" ]; then
-        echo "-- No CSDK lib, now pull"
-        cd lib/GPRS_C_SDK
-        proxy git submodule update --init
-        cd ../../
-        echo "-- Pull CSDK lib complete"
-    else
-        echo "-- GPRS CSDK submodule exist"
-    fi
-    cd ${curr_path_abs}
-    echo ">> Check GPRS CSDK lib files end"
-}
-
-function generate_CSDK_lib()
-{
-    echo ">> Generate CSDK lib now"
-    cd ../../  #root path of micropython project
-    cd lib/GPRS_C_SDK/platform/tools/genlib
-    chmod +x genlib.sh
-    ./genlib.sh ${CFG_RELEASE}
-    cd ../../../../../
-    if [[ -f "lib/GPRS_C_SDK/hex/libcsdk/libcsdk_${CFG_RELEASE}.a" ]]; then
-        echo ">> Geneate CSDK lib compelte"
-    else
-        echo ">> Generate CSDK lib fail, please check error"
-        exit 1
-    fi
-    cd ${curr_path_abs}
-}
-
-function show_time()
-{
-    end_time=`date +%s`
-    time_distance=`expr ${end_time} - ${start_time}`
-    date_time_now=$(date +%F\ \ %H:%M:%S)
-    echo "=================================="
-    echo "       Build Time: ${time_distance}s "
-    echo "       ${date_time_now} "
-    echo "=================================="
-}
-
-function show_mem_info()
-{
-    ram_total=$(grep  -n  "USER_RAM_SIZE" $MEMD_DEF_PATH | awk  '{print $3}')
-    rom_total=$(grep  -n  "USER_ROM_SIZE" $MEMD_DEF_PATH | awk  '{print $3}')
-
-    rom_start=$(grep  -n  "__rom_start = ." $MAP_FILE_PATH | awk  '{print $2}')
-    rom_rw_start=$(grep  -n  "__user_rw_lma = ." $MAP_FILE_PATH | awk  '{print $2}')
-
-    ram_start=$(grep  -n  "__user_rw_start = ." $MAP_FILE_PATH | awk  '{print $2}')
-    ram_rw_data_end=$(grep  -n  "__user_rw_end = ." $MAP_FILE_PATH | awk  '{print $2}')
-    ram_end=$(grep  -n  "__user_bss_end = ." $MAP_FILE_PATH | awk  '{print $2}')
-
-    # echo $ram_start $ram_end
-    ram_used=$(($ram_end-$ram_start))
-    ram_used_percent=$(awk 'BEGIN{printf "%.2f%%\n",('$ram_used'/'$((${ram_total}))')*100}')
-
-    rw_data_size=$(($ram_rw_data_end-$ram_start))
-    rom_used=$(($rom_rw_start-$rom_start+$rw_data_size))
-    rom_used_percent=$(awk 'BEGIN{printf "%.2f%%\n",('$rom_used'/'$(($rom_total))')*100}')
-
-    echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
-    echo ROM total: ${rom_total}\($((${rom_total}))\) Bytes, used: $rom_used Bytes \($rom_used_percent\)
-    echo RAM total: ${ram_total}\($((${ram_total}))\) Bytes, used: $ram_used Bytes \($ram_used_percent\)
-    echo "__________________________________________________________________"
-}
-
-function build_micropy()
-{
-    echo ">> Build micropython"
-    echo "-- Remove old firmware"
-    rm -f hex/*
-    MAKE_J_NUMBER=`cat /proc/cpuinfo | grep vendor_id | wc -l`
-    echo "-- Core number:$MAKE_J_NUMBER"
-    make -j${MAKE_J_NUMBER} CFG_RELEASE=${CFG_RELEASE}
-    if [[ -f "hex/${FIRMWARE_NAME}_full.lod" ]]; then
-        echo "----------------------------------"
-        echo "          BUILD SUCCESS           "
-        echo "----------------------------------"
-        show_time
-        show_mem_info
-    else
-        echo "----------------------------------"
-        echo "         !!BUILD FAIL!!           "
-        echo "----------------------------------"
-        show_time
-        exit 1
-    fi
-}
-
-########################## 3 ##############################
-# Check GPRS_C_SDK files
-check_CSDK
-# Generate a lib from GPRS_C_SDK
-generate_CSDK_lib
-# Build MicroPython application
-build_micropy
-###########################################################

From 1ce77ac92c0e4c8299359e6eed5e3e62edd700ec Mon Sep 17 00:00:00 2001
From: pulkin <gpulkin@gmail.com>
Date: Tue, 10 Sep 2019 05:46:40 -0400
Subject: [PATCH 3247/3533] Set up CI with Azure Pipelines

[skip ci]
---
 azure-pipelines.yml | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 azure-pipelines.yml

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
new file mode 100644
index 0000000000000..5af008f2fbd9f
--- /dev/null
+++ b/azure-pipelines.yml
@@ -0,0 +1,19 @@
+# Starter pipeline
+# Start with a minimal pipeline that you can customize to build and deploy your code.
+# Add steps that build, run tests, deploy, and more:
+# https://aka.ms/yaml
+
+trigger:
+- azure-ci
+
+pool:
+  vmImage: 'ubuntu-latest'
+
+steps:
+- script: echo Hello, world!
+  displayName: 'Run a one-line script'
+
+- script: |
+    echo Add other tasks to build, test, and deploy your project.
+    echo See https://aka.ms/yaml
+  displayName: 'Run a multi-line script'

From 33888353ba445f2bae92aeb350c9c7508f545abf Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Tue, 10 Sep 2019 12:56:22 +0200
Subject: [PATCH 3248/3533] First attempt

---
 azure-pipelines.yml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 5af008f2fbd9f..8e6abd4f0654e 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -10,10 +10,11 @@ pool:
   vmImage: 'ubuntu-latest'
 
 steps:
-- script: echo Hello, world!
-  displayName: 'Run a one-line script'
+- script: sudo apt-get install build-essential gcc-multilib g++-multilib libzip-dev zlib1g lib32z1
+  displayName: 'Install dependencies'
 
 - script: |
-    echo Add other tasks to build, test, and deploy your project.
-    echo See https://aka.ms/yaml
-  displayName: 'Run a multi-line script'
+    cd ports/gprs_a9
+    make
+  displayName: 'Build a9g'
+

From 2de866f582bf5778c41ea3d5ed9ae5015a6bb060 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Tue, 10 Sep 2019 13:09:14 +0200
Subject: [PATCH 3249/3533] Add recursive checkout

---
 azure-pipelines.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 8e6abd4f0654e..967da57677f34 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -10,6 +10,9 @@ pool:
   vmImage: 'ubuntu-latest'
 
 steps:
+- checkout: self
+  submodules: recursive
+
 - script: sudo apt-get install build-essential gcc-multilib g++-multilib libzip-dev zlib1g lib32z1
   displayName: 'Install dependencies'
 

From cde380e663b1e7eb954bb500fee106f79a87a52c Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sun, 8 Sep 2019 22:17:26 +0200
Subject: [PATCH 3250/3533] Debug output - 3

---
 ports/gprs_a9/Makefile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ports/gprs_a9/Makefile b/ports/gprs_a9/Makefile
index 6eda1547588e8..2a1ed5c988382 100644
--- a/ports/gprs_a9/Makefile
+++ b/ports/gprs_a9/Makefile
@@ -54,7 +54,7 @@ PLATFORM_ELF_PATH := ${wildcard ${PLATFORM_ELF_FOLDER_PATH}/*.elf}
 PLATFORM_ELF_NAME := ${notdir ${PLATFORM_ELF_PATH}}
 PLATFORM_LOD_PATH := ${CSDK_PATH}/platform/csdk/${strip ${CFG_RELEASE}}
 PLATFORM_LOD_FILE := ${wildcard ${PLATFORM_LOD_PATH}/*.lod}
-ELFCOMBINE_TOOL := PATH=$PATH:$(CSDTK_PATH)/bin ${CSDK_PATH}/platform/compilation/elfCombine.pl
+ELFCOMBINE_TOOL := PATH=$$PATH:$(CSDTK_PATH)/bin ${CSDK_PATH}/platform/compilation/elfCombine.pl
 SRECMAP_TOOL := $(CSDTK_PATH)/bin/srecmap 
 TARGET_FILE := ${BUILD_PATH_ABS}/targetgen
 MAP_CFG_FILE := ${CSDK_PATH}/platform/compilation/8955_map_cfg
@@ -183,6 +183,8 @@ SRC_QSTR += $(SRC_C)  $(LIB_SRC_C)
 # Append any auto-generated sources that are needed by sources listed in SRC_QSTR
 SRC_QSTR_AUTO_DEPS +=
 
+$(info $$LD_LIBRARY_PATH is [${LD_LIBRARY_PATH}])
+
 all: lod
 
 lod: ${HEX}

From ae6080d5b974832c6d92fd87e57c31b41b907255 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Tue, 10 Sep 2019 14:57:38 +0200
Subject: [PATCH 3251/3533] Second attempt

---
 ports/gprs_a9/Makefile         |  8 ++++---
 ports/gprs_a9/build-libcsdk.sh | 42 ++++++++++++++++++++++++++++++++++
 2 files changed, 47 insertions(+), 3 deletions(-)
 create mode 100755 ports/gprs_a9/build-libcsdk.sh

diff --git a/ports/gprs_a9/Makefile b/ports/gprs_a9/Makefile
index 2a1ed5c988382..335a37829fdf1 100644
--- a/ports/gprs_a9/Makefile
+++ b/ports/gprs_a9/Makefile
@@ -1,5 +1,7 @@
-CSDTK_PATH = ../../lib/csdtk42-linux
-LD_LIBRARY_PATH=$(CSDTK_PATH)/lib:$(CSDTK_PATH)/mingw32/usr/lib
+CSDTK_PATH = $(abspath ../../lib/csdtk42-linux)
+export LD_LIBRARY_PATH=$(CSDTK_PATH)/lib:$(CSDTK_PATH)/mingw32/usr/lib
+# This should be integrated in the future
+$(shell ./build-libcsdk.sh)
 
 mkfile_path := $(abspath $(lastword $(MAKEFILE_LIST)))  #获�当�正在执行的makefile的�对路径
 PATH_CURR := $(strip $(patsubst %/, %, $(dir ${mkfile_path})))
@@ -183,7 +185,7 @@ SRC_QSTR += $(SRC_C)  $(LIB_SRC_C)
 # Append any auto-generated sources that are needed by sources listed in SRC_QSTR
 SRC_QSTR_AUTO_DEPS +=
 
-$(info $$LD_LIBRARY_PATH is [${LD_LIBRARY_PATH}])
+$(info ldconfig is [${shell ldconfig -p | grep csdtk}])
 
 all: lod
 
diff --git a/ports/gprs_a9/build-libcsdk.sh b/ports/gprs_a9/build-libcsdk.sh
new file mode 100755
index 0000000000000..92abe0ece0b46
--- /dev/null
+++ b/ports/gprs_a9/build-libcsdk.sh
@@ -0,0 +1,42 @@
+#!/bin/bash
+
+######################## 1 ################################
+# check path
+curr_path_abs=$(cd `dirname $0`; pwd)
+curr_folder_name="${curr_path_abs##*/}"
+echo $curr_path_abs
+if [[ "${curr_folder_name}" != "gprs_a9" ]]; then
+    echo "Plese exec build.sh in gprs_a9 folder"
+    exit 1
+fi
+
+######################### 2 ###############################
+# check parameters
+CFG_RELEASE=debug
+if [[ "$1xx" == "releasexx" ]]; then
+    CFG_RELEASE=release
+fi
+
+###########################################################
+
+function generate_CSDK_lib()
+{
+    echo ">> Generate CSDK lib now"
+    cd ../../  #root path of micropython project
+    cd lib/GPRS_C_SDK/platform/tools/genlib
+    chmod +x genlib.sh
+    PATH=$PATH:$curr_path_abs/../../lib/csdtk42-linux/bin
+    export LD_LIBRARY_PATH=$curr_path_abs/../../lib/csdtk42-linux/lib
+    ./genlib.sh ${CFG_RELEASE}
+    cd ../../../../../
+    if [[ -f "lib/GPRS_C_SDK/hex/libcsdk/libcsdk_${CFG_RELEASE}.a" ]]; then
+        echo ">> Geneate CSDK lib compelte"
+    else
+        echo ">> Generate CSDK lib fail, please check error"
+        exit 1
+    fi
+    cd ${curr_path_abs}
+}
+
+generate_CSDK_lib
+

From c5e7116f6a4bc896f030b23cde2da98feca136f9 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Tue, 10 Sep 2019 15:06:53 +0200
Subject: [PATCH 3252/3533] Cleanup debug outputs

---
 ports/gprs_a9/Makefile | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/ports/gprs_a9/Makefile b/ports/gprs_a9/Makefile
index 335a37829fdf1..059b62663fd5b 100644
--- a/ports/gprs_a9/Makefile
+++ b/ports/gprs_a9/Makefile
@@ -1,14 +1,15 @@
-CSDTK_PATH = $(abspath ../../lib/csdtk42-linux)
-export LD_LIBRARY_PATH=$(CSDTK_PATH)/lib:$(CSDTK_PATH)/mingw32/usr/lib
-# This should be integrated in the future
-$(shell ./build-libcsdk.sh)
-
 mkfile_path := $(abspath $(lastword $(MAKEFILE_LIST)))  #获�当�正在执行的makefile的�对路径
 PATH_CURR := $(strip $(patsubst %/, %, $(dir ${mkfile_path})))
 PATH_MICROPY := $(strip $(patsubst %/ports/, %, $(dir ${PATH_CURR})))
 CSDK_PATH := ${PATH_MICROPY}/lib/GPRS_C_SDK
 include ../../py/mkenv.mk
 
+CSDTK_PATH = ${PATH_MICROPY}/lib/csdtk42-linux
+# mips-elf-* compiler libraries
+export LD_LIBRARY_PATH=$(CSDTK_PATH)/lib:$(CSDTK_PATH)/mingw32/usr/lib
+# TODO: integrate this
+$(shell ./build-libcsdk.sh)
+
 include ${CSDK_PATH}/platform/csdk/memd.def
 include ${CSDK_PATH}/platform/chip/defs/8955_base.def
 include ${CSDK_PATH}/init/target.def
@@ -185,8 +186,6 @@ SRC_QSTR += $(SRC_C)  $(LIB_SRC_C)
 # Append any auto-generated sources that are needed by sources listed in SRC_QSTR
 SRC_QSTR_AUTO_DEPS +=
 
-$(info ldconfig is [${shell ldconfig -p | grep csdtk}])
-
 all: lod
 
 lod: ${HEX}

From 4808e64c389d9446c3849b1290c5ebc64113af05 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Tue, 10 Sep 2019 15:29:35 +0200
Subject: [PATCH 3253/3533] Update README

---
 ports/gprs_a9/README.md | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/ports/gprs_a9/README.md b/ports/gprs_a9/README.md
index 08b2e7f130680..0d5d76b9679dd 100644
--- a/ports/gprs_a9/README.md
+++ b/ports/gprs_a9/README.md
@@ -2,21 +2,30 @@ Your support is important for this port: please consider donating.
 
 [![paypal](https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=2RZCNXCUCP4YG&source=url)
 
+
 ## Build
 
-1. Install vendor tools: [documentation](https://ai-thinker-open.github.io/GPRS_C_SDK_DOC/en/c-sdk/installation_linux.html), [docker](https://github.com/Neutree/gprs_build)
-2. Clone this
+1. Install dependencies (Ubuntu example from `.travis.yml`):
+   ```bash
+   sudo apt-get install build-essential gcc-multilib g++-multilib libzip-dev zlib1g lib32z1
+   ```
+2. Clone this (install `sudo apt install git` if necessary)
+   **Warning**: large download size
    ```bash
-   git clone git@github.com:pulkin/micropython.git
+   git clone git@github.com:pulkin/micropython.git --recursive
    ```
 3. Make
    ```bash
    cd micropython
-   make -C mpy-cross
+   # make -C mpy-cross (not required for now)
    cd ports/gprs_a9
-   ./build.sh
+   make
    ```
-4. Burn `micropython/ports/gprs_a9/hex/*` using `cooltools`
+
+## Burn
+
+Follow vendor [documentation](https://ai-thinker-open.github.io/GPRS_C_SDK_DOC/en/c-sdk/installation_linux.html)
+(`cooltools` is available under `lib/csdtk42-linux/cooltools/`).
 
 ## Connect
 

From e7746d6e845b926420c5c606b31b0e04b663ba27 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Tue, 10 Sep 2019 15:36:04 +0200
Subject: [PATCH 3254/3533] Update docs

[ci skip]
---
 README.md               | 2 ++
 ports/gprs_a9/README.md | 1 +
 2 files changed, 3 insertions(+)

diff --git a/README.md b/README.md
index 6c5f5dcd552fd..3006aeb23a5a6 100644
--- a/README.md
+++ b/README.md
@@ -5,6 +5,8 @@ Important
 This repo is only for porting micropython to the GPS+GSM modules A9 and A9G.
 [Go to the port page](https://github.com/pulkin/micropython/tree/master/ports/gprs_a9) or [visit the MicroPython project page.](https://micropython.org/)
 
+The build status displays that of the original repo.
+
 [![Build Status](https://travis-ci.org/micropython/micropython.png?branch=master)](https://travis-ci.org/micropython/micropython) [![Coverage Status](https://coveralls.io/repos/micropython/micropython/badge.png?branch=master)](https://coveralls.io/r/micropython/micropython?branch=master)
 
 The MicroPython project
diff --git a/ports/gprs_a9/README.md b/ports/gprs_a9/README.md
index 0d5d76b9679dd..ad006881bbd04 100644
--- a/ports/gprs_a9/README.md
+++ b/ports/gprs_a9/README.md
@@ -2,6 +2,7 @@ Your support is important for this port: please consider donating.
 
 [![paypal](https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=2RZCNXCUCP4YG&source=url)
 
+[![Build Status](https://travis-ci.org/pulkin/micropython.svg?branch=master)](https://travis-ci.org/pulkin/micropython)
 
 ## Build
 

From 9943be922ac1539b1ee304c7ff2270008caf95b5 Mon Sep 17 00:00:00 2001
From: pulkin <gpulkin@gmail.com>
Date: Tue, 10 Sep 2019 10:44:42 -0400
Subject: [PATCH 3255/3533] Publish artifacts - first attempt

---
 azure-pipelines.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 967da57677f34..5dfed35aa7bff 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -1,8 +1,3 @@
-# Starter pipeline
-# Start with a minimal pipeline that you can customize to build and deploy your code.
-# Add steps that build, run tests, deploy, and more:
-# https://aka.ms/yaml
-
 trigger:
 - azure-ci
 
@@ -21,3 +16,8 @@ steps:
     make
   displayName: 'Build a9g'
 
+- task: PublishBuildArtifacts@1
+  inputs:
+    PathtoPublish: 'ports/gprs_a9/hex/*.lod'
+    ArtifactName: 'a9 lod'
+    publishLocation: 'Container'

From e56c37bcfec4a4b14b29e0427a67810625fee793 Mon Sep 17 00:00:00 2001
From: pulkin <gpulkin@gmail.com>
Date: Tue, 10 Sep 2019 10:52:25 -0400
Subject: [PATCH 3256/3533] Attempt 2: no wildcard

---
 azure-pipelines.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 5dfed35aa7bff..1babc74268481 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -18,6 +18,6 @@ steps:
 
 - task: PublishBuildArtifacts@1
   inputs:
-    PathtoPublish: 'ports/gprs_a9/hex/*.lod'
-    ArtifactName: 'a9 lod'
+    PathtoPublish: 'ports/gprs_a9/hex/firmware_debug_full.lod'
+    ArtifactName: 'a9g micropython image: firmware_debug_full.lod'
     publishLocation: 'Container'

From c9ac73cfdd22d9ec95c560081d704d8258cf6873 Mon Sep 17 00:00:00 2001
From: pulkin <gpulkin@gmail.com>
Date: Tue, 10 Sep 2019 10:58:52 -0400
Subject: [PATCH 3257/3533] Fix artifact name

---
 azure-pipelines.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 1babc74268481..dafc5ec46fe8d 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -19,5 +19,5 @@ steps:
 - task: PublishBuildArtifacts@1
   inputs:
     PathtoPublish: 'ports/gprs_a9/hex/firmware_debug_full.lod'
-    ArtifactName: 'a9g micropython image: firmware_debug_full.lod'
+    ArtifactName: 'gprs-a9-micropython-image'
     publishLocation: 'Container'

From 341c14b9fac0f38de47eb862e1aaca80fe40b1be Mon Sep 17 00:00:00 2001
From: pulkin <gpulkin@gmail.com>
Date: Tue, 10 Sep 2019 11:19:15 -0400
Subject: [PATCH 3258/3533] Pipelines: initial github release

---
 azure-pipelines.yml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index dafc5ec46fe8d..986d3840276c1 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -21,3 +21,15 @@ steps:
     PathtoPublish: 'ports/gprs_a9/hex/firmware_debug_full.lod'
     ArtifactName: 'gprs-a9-micropython-image'
     publishLocation: 'Container'
+
+- task: GitHubRelease@0
+  inputs:
+    gitHubConnection: 'github-pulkin'
+    repositoryName: 'pulkin/micropython'
+    action: 'edit'
+    target: '$(Build.SourceVersion)'
+    tag: 'a9-dev'
+    releaseNotesSource: 'input'
+    assetUploadMode: 'replace'
+    isDraft: true
+    compareWith: 'lastFullRelease'
\ No newline at end of file

From 707550d1db2f4a4f676a95912a932717a6fbfaae Mon Sep 17 00:00:00 2001
From: pulkin <gpulkin@gmail.com>
Date: Tue, 10 Sep 2019 11:50:14 -0400
Subject: [PATCH 3259/3533] Artifacts: build->pipeline

---
 azure-pipelines.yml | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 986d3840276c1..a4dbfd390208a 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -16,11 +16,10 @@ steps:
     make
   displayName: 'Build a9g'
 
-- task: PublishBuildArtifacts@1
+- task: PublishPipelineArtifact@1
   inputs:
-    PathtoPublish: 'ports/gprs_a9/hex/firmware_debug_full.lod'
-    ArtifactName: 'gprs-a9-micropython-image'
-    publishLocation: 'Container'
+    targetPath: '$(Pipeline.Workspace)/ports/gprs_a9/hex/firmware_debug_full.lod'
+    artifact: 'gprs-a9-micropython-image'
 
 - task: GitHubRelease@0
   inputs:
@@ -32,4 +31,4 @@ steps:
     releaseNotesSource: 'input'
     assetUploadMode: 'replace'
     isDraft: true
-    compareWith: 'lastFullRelease'
\ No newline at end of file
+    addChangeLog: false
\ No newline at end of file

From 6459b4590efa52254604687a6e869c6819800ec4 Mon Sep 17 00:00:00 2001
From: pulkin <gpulkin@gmail.com>
Date: Tue, 10 Sep 2019 11:59:20 -0400
Subject: [PATCH 3260/3533] Artifacts: attempt relative path

---
 azure-pipelines.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index a4dbfd390208a..142a04ebe83fb 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -18,7 +18,7 @@ steps:
 
 - task: PublishPipelineArtifact@1
   inputs:
-    targetPath: '$(Pipeline.Workspace)/ports/gprs_a9/hex/firmware_debug_full.lod'
+    targetPath: 'ports/gprs_a9/hex/firmware_debug_full.lod'
     artifact: 'gprs-a9-micropython-image'
 
 - task: GitHubRelease@0

From 6da699dad1dfa4a386a2aa5720542fc9d7fdfcc7 Mon Sep 17 00:00:00 2001
From: pulkin <gpulkin@gmail.com>
Date: Tue, 10 Sep 2019 12:09:52 -0400
Subject: [PATCH 3261/3533] Pipeline: direct path attempt

---
 azure-pipelines.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 142a04ebe83fb..9dc6a1c7aa851 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -29,6 +29,7 @@ steps:
     target: '$(Build.SourceVersion)'
     tag: 'a9-dev'
     releaseNotesSource: 'input'
+    assets: 'ports/gprs_a9/hex/firmware_debug_full.lod'
     assetUploadMode: 'replace'
     isDraft: true
     addChangeLog: false
\ No newline at end of file

From 1f6586dcc5af7c5e34a82738eb7c033fc2dc82e9 Mon Sep 17 00:00:00 2001
From: pulkin <gpulkin@gmail.com>
Date: Tue, 10 Sep 2019 12:49:53 -0400
Subject: [PATCH 3262/3533] Artifacts: restrict to master

---
 azure-pipelines.yml | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 9dc6a1c7aa851..de5110017a57b 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -1,6 +1,3 @@
-trigger:
-- azure-ci
-
 pool:
   vmImage: 'ubuntu-latest'
 
@@ -16,12 +13,8 @@ steps:
     make
   displayName: 'Build a9g'
 
-- task: PublishPipelineArtifact@1
-  inputs:
-    targetPath: 'ports/gprs_a9/hex/firmware_debug_full.lod'
-    artifact: 'gprs-a9-micropython-image'
-
 - task: GitHubRelease@0
+  condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/master'))
   inputs:
     gitHubConnection: 'github-pulkin'
     repositoryName: 'pulkin/micropython'
@@ -29,7 +22,8 @@ steps:
     target: '$(Build.SourceVersion)'
     tag: 'a9-dev'
     releaseNotesSource: 'input'
+    releaseNotes: 'Latest succesful build of `master`'
     assets: 'ports/gprs_a9/hex/firmware_debug_full.lod'
     assetUploadMode: 'replace'
-    isDraft: true
+    isPreRelease: true
     addChangeLog: false
\ No newline at end of file

From 552e7b87a7cf366d164ead66ac0091301eb3e6b6 Mon Sep 17 00:00:00 2001
From: pulkin <gpulkin@gmail.com>
Date: Tue, 10 Sep 2019 13:00:25 -0400
Subject: [PATCH 3263/3533] Release: try updating text

---
 azure-pipelines.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index de5110017a57b..0aadf9e93e8f9 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -21,6 +21,7 @@ steps:
     action: 'edit'
     target: '$(Build.SourceVersion)'
     tag: 'a9-dev'
+    title: '`master`'
     releaseNotesSource: 'input'
     releaseNotes: 'Latest succesful build of `master`'
     assets: 'ports/gprs_a9/hex/firmware_debug_full.lod'

From e78118bfdab9f98c97ebd9ed2bfe52042c746a89 Mon Sep 17 00:00:00 2001
From: pulkin <gpulkin@gmail.com>
Date: Tue, 10 Sep 2019 13:33:27 -0400
Subject: [PATCH 3264/3533] More explanatory github release

---
 azure-pipelines.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 0aadf9e93e8f9..05d5e4461ac83 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -20,10 +20,10 @@ steps:
     repositoryName: 'pulkin/micropython'
     action: 'edit'
     target: '$(Build.SourceVersion)'
-    tag: 'a9-dev'
-    title: '`master`'
+    tag: 'latest-build'
+    title: 'Latest master build'
     releaseNotesSource: 'input'
-    releaseNotes: 'Latest succesful build of `master`'
+    releaseNotes: 'This is an automatic build triggered on `master` changes'
     assets: 'ports/gprs_a9/hex/firmware_debug_full.lod'
     assetUploadMode: 'replace'
     isPreRelease: true

From a4fe25e636e43f0dfd40a59cfb9ff47ac44cdd8d Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Tue, 10 Sep 2019 21:01:38 +0200
Subject: [PATCH 3265/3533] Azure badge

[skip ci]
---
 ports/gprs_a9/README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/gprs_a9/README.md b/ports/gprs_a9/README.md
index ad006881bbd04..5cc883bfe8c04 100644
--- a/ports/gprs_a9/README.md
+++ b/ports/gprs_a9/README.md
@@ -3,6 +3,7 @@ Your support is important for this port: please consider donating.
 [![paypal](https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=2RZCNXCUCP4YG&source=url)
 
 [![Build Status](https://travis-ci.org/pulkin/micropython.svg?branch=master)](https://travis-ci.org/pulkin/micropython)
+[![Build Status](https://dev.azure.com/gpulkin/micropython/_apis/build/status/pulkin.micropython?branchName=master)](https://dev.azure.com/gpulkin/micropython/_build/latest?definitionId=1&branchName=master)
 
 ## Build
 

From ad62cd5405b5604b78a3e388da4574e704e091aa Mon Sep 17 00:00:00 2001
From: nk2 <30507227+nk2IsHere@users.noreply.github.com>
Date: Sun, 8 Sep 2019 18:55:51 +0200
Subject: [PATCH 3266/3533] add i2c module docs

---
 ports/gprs_a9/README.md | 131 +++++++++++++++++++++++++++++++++++++++-
 1 file changed, 130 insertions(+), 1 deletion(-)

diff --git a/ports/gprs_a9/README.md b/ports/gprs_a9/README.md
index 5cc883bfe8c04..c590d691c2aaa 100644
--- a/ports/gprs_a9/README.md
+++ b/ports/gprs_a9/README.md
@@ -59,7 +59,8 @@ ampy --port /dev/ttyUSB1 put frozentest.py
 3. [`ssl`](#ussl): SSL over sockets
 4. [`gps`](#gps): everything related to GPS and assisted positioning
 5. [`machine`](#machine): hardware and power control
-6. [Notes](#Misc)
+6. [`i2c`](#i2c): i2c implementation
+7. [Notes](#Misc)
 
 ### `cellular`
 
@@ -454,6 +455,134 @@ Provides power-related functions: power, watchdogs.
 * `watchdog_reset()`
 
   Resets the timer on the hardware watchdog.
+  
+### `i2c`
+
+Provides i2c functionality
+(see [sdk docs](https://ai-thinker-open.github.io/GPRS_C_SDK_DOC/en/c-sdk/function-api/iic.html))
+
+#### Exception classes ####
+
+* `I2CError(message)`
+
+#### Constants ####
+
+I2C_DEFAULT_TIME_OUT
+
+#### Enums ####
+
+* `id`
+
+  **Options**: `1`, `2`, `3`
+  
+  **Fallback**: `1`
+  
+  **Meaning**: I2C port ids (see devboard layout)
+  
+  
+* `freq`
+
+  **Options**: `100`, `400`
+  
+  **Fallback**: `100`
+  
+  **Meaning**: I2C SCL Frequency 100kHz, 400kHz respectively
+  
+
+#### Methods ####
+
+**Note**: parameters in square brackets are optional
+
+* `init(id, freq)`
+
+  Inintializes i2c on given port id and frequency
+    
+  **Args**:
+
+    * `id` (int): see enums;
+    * `freq` (int): see enums;
+  
+  **Returns**: `None` if everything ok.
+
+  **Raises** `I2CError` (see error message for more details)
+  
+  **Note**: Different ports can be initialized simultaneously
+
+* `close(id)`
+
+  Closes i2c on given port id
+  
+  **Args**:
+
+    * `id` (int): see enums;
+  
+  **Returns**: `None` if everything ok.
+
+  **Raises** `I2CError` (see error message for more details)
+  
+* `receive(id, slave_address, data_length, [timeout] = I2C_DEFAULT_TIME_OUT)`
+
+  Receive data given length from slave device
+  
+  **Args**:
+
+    * `id` (int): see enums;
+    * `slave_address` (int, hex): slave device communication address;
+    * `data_length` (int): data length needed to be received;
+    * `[timeout]` (int) = 10: timeout of receiving in ms
+  
+  **Returns**: bytes() of given length.
+
+  **Raises** `I2CError` (see error message for more details)
+  
+* `transmit(id, slave_address, data, [timeout] = I2C_DEFAULT_TIME_OUT)`
+
+  Transmit given data to slave device
+  
+  **Args**:
+
+    * `id` (int): see enums;
+    * `slave_address` (int, hex): slave device communication address;
+    * `data` (bytes): data needed to be transmitted;
+    * `[timeout]` (int) = 10: timeout of receiving in ms
+  
+  **Returns**: None if everything ok.
+
+  **Raises** `I2CError` (see error message for more details)
+  
+* `mem_receive(id, slave_address, memory_address, memory_size, data_length, [timeout] = I2C_DEFAULT_TIME_OUT)`
+
+  Read data given length from slave device's memory by its address
+  
+  **Args**:
+
+    * `id` (int): see enums;
+    * `slave_address` (int, hex): slave device communication address;
+    * `memory_address` (int, hex): slave device memory read address;
+    * `memory_size` (int, hex): slave device memory read size;
+    * `data_length` (int): data length needed to be read;
+    * `[timeout]` (int) = 10: timeout of reading in ms
+  
+  **Returns**: bytes() of given length.
+
+  **Raises** `I2CError` (see error message for more details)
+  
+* `mem_transmit(id, slave_address, memory_address, memory_size, data, [timeout] = I2C_DEFAULT_TIME_OUT)`
+
+  Write given data to slave device's memory by address
+  
+  **Args**:
+
+    * `id` (int): see enums;
+    * `slave_address` (int, hex): slave device communication address;
+    * `memory_address` (int, hex): slave device memory write address;
+    * `memory_size` (int, hex): slave device memory write size;
+    * `data` (bytes): data needed to be written;
+    * `[timeout]` (int) = 10: timeout of writing in ms
+  
+  **Returns**: None if everything ok.
+
+  **Raises** `I2CError` (see error message for more details)
 
 ## Misc ##
 

From 2432f3c950fbc9108e4c981706b7c316f3b42d17 Mon Sep 17 00:00:00 2001
From: nk2 <30507227+nk2IsHere@users.noreply.github.com>
Date: Sun, 8 Sep 2019 19:15:14 +0200
Subject: [PATCH 3267/3533] scipt -> script

---
 ports/gprs_a9/README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/gprs_a9/README.md b/ports/gprs_a9/README.md
index c590d691c2aaa..600e48ab22969 100644
--- a/ports/gprs_a9/README.md
+++ b/ports/gprs_a9/README.md
@@ -37,7 +37,7 @@ Use [pyserial](https://github.com/pyserial) or any other terminal.
 miniterm.py /dev/ttyUSB1 115200 --raw
 ```
 
-## Upload scipts
+## Upload scripts
 
 Use [ampy](https://github.com/pycampers/ampy).
 
@@ -45,7 +45,7 @@ Use [ampy](https://github.com/pycampers/ampy).
 ampy --port /dev/ttyUSB1 put frozentest.py 
 ```
 
-## Run scipts
+## Run scripts
 
 ```python
 >>> help()

From e5783798967b20e212b24803faa36acd4eb06624 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Wed, 11 Sep 2019 09:52:47 +0200
Subject: [PATCH 3268/3533] Mention automatic builds in README.

---
 ports/gprs_a9/README.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ports/gprs_a9/README.md b/ports/gprs_a9/README.md
index 600e48ab22969..b7e8df643325f 100644
--- a/ports/gprs_a9/README.md
+++ b/ports/gprs_a9/README.md
@@ -7,6 +7,9 @@ Your support is important for this port: please consider donating.
 
 ## Build
 
+The firmware image is automatically built by Azure pipelines: [download](https://github.com/pulkin/micropython/releases/tag/latest-build).
+Follow these steps to build from sources:
+
 1. Install dependencies (Ubuntu example from `.travis.yml`):
    ```bash
    sudo apt-get install build-essential gcc-multilib g++-multilib libzip-dev zlib1g lib32z1

From cf69083edbe00c7cda471550bf7ebd440bbc5d4e Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Wed, 11 Sep 2019 10:12:28 +0200
Subject: [PATCH 3269/3533] Azure STM32 build

---
 azure-pipelines.yml | 89 ++++++++++++++++++++++++++++++---------------
 1 file changed, 59 insertions(+), 30 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 05d5e4461ac83..b0c84cbd195ca 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -1,30 +1,59 @@
-pool:
-  vmImage: 'ubuntu-latest'
-
-steps:
-- checkout: self
-  submodules: recursive
-
-- script: sudo apt-get install build-essential gcc-multilib g++-multilib libzip-dev zlib1g lib32z1
-  displayName: 'Install dependencies'
-
-- script: |
-    cd ports/gprs_a9
-    make
-  displayName: 'Build a9g'
-
-- task: GitHubRelease@0
-  condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/master'))
-  inputs:
-    gitHubConnection: 'github-pulkin'
-    repositoryName: 'pulkin/micropython'
-    action: 'edit'
-    target: '$(Build.SourceVersion)'
-    tag: 'latest-build'
-    title: 'Latest master build'
-    releaseNotesSource: 'input'
-    releaseNotes: 'This is an automatic build triggered on `master` changes'
-    assets: 'ports/gprs_a9/hex/firmware_debug_full.lod'
-    assetUploadMode: 'replace'
-    isPreRelease: true
-    addChangeLog: false
\ No newline at end of file
+variables:
+  MAKEOPTS: "-j4"
+
+jobs:
+- job: stm32
+  pool:
+    vmImage: 'ubuntu-latest'
+
+  steps:
+  - checkout: self
+    submodules: recursive
+
+  - script: |
+      sudo add-apt-repository -y ppa:team-gcc-arm-embedded/ppa
+      sudo apt-get update -qq || true
+      sudo apt-get install gcc-arm-embedded
+      sudo apt-get install libnewlib-arm-none-eabi
+      arm-none-eabi-gcc --version
+    displayName: 'Install dependencies'
+
+  - script: |
+      make $(MAKEOPTS) -C mpy-cross
+      make $(MAKEOPTS) -C ports/stm32
+      make $(MAKEOPTS) -C ports/stm32 BOARD=PYBV11 MICROPY_PY_WIZNET5K=5200 MICROPY_PY_CC3K=1
+      make $(MAKEOPTS) -C ports/stm32 BOARD=STM32F769DISC
+      make $(MAKEOPTS) -C ports/stm32 BOARD=STM32L476DISC
+    displayName: 'Build'
+
+- job: gprs_a9
+  pool:
+    vmImage: 'ubuntu-latest'
+
+  steps:
+  - checkout: self
+    submodules: recursive
+
+  - script: sudo apt-get install build-essential gcc-multilib g++-multilib libzip-dev zlib1g lib32z1
+    displayName: 'Install dependencies'
+
+  - script: |
+      cd ports/gprs_a9
+      make
+    displayName: 'Build'
+
+  - task: GitHubRelease@0
+    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/master'))
+    inputs:
+      gitHubConnection: 'github-pulkin'
+      repositoryName: 'pulkin/micropython'
+      action: 'edit'
+      target: '$(Build.SourceVersion)'
+      tag: 'latest-build'
+      title: 'Latest master build'
+      releaseNotesSource: 'input'
+      releaseNotes: 'This is an automatic build triggered on `master` changes'
+      assets: 'ports/gprs_a9/hex/firmware_debug_full.lod'
+      assetUploadMode: 'replace'
+      isPreRelease: true
+      addChangeLog: false

From 4db4fb2464805cc81a55c9a1af42360fce15c26d Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Wed, 11 Sep 2019 10:28:50 +0200
Subject: [PATCH 3270/3533] Other builds (first half)

---
 azure-pipelines.yml | 117 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 117 insertions(+)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index b0c84cbd195ca..857a6f85e2aa5 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -26,6 +26,123 @@ jobs:
       make $(MAKEOPTS) -C ports/stm32 BOARD=STM32L476DISC
     displayName: 'Build'
 
+- job: 'qemu-arm port build and tests'
+  pool:
+    vmImage: 'ubuntu-latest'
+
+  steps:
+  - checkout: self
+    submodules: recursive
+
+  - script: |
+      sudo apt-get install gcc-arm-none-eabi
+      sudo apt-get install libnewlib-arm-none-eabi
+      sudo apt-get install qemu-system
+      arm-none-eabi-gcc --version
+      qemu-system-arm --version
+    displayName: 'Install dependencies'
+
+  - script: |
+      make $(MAKEOPTS) -C mpy-cross
+      make $(MAKEOPTS) -C ports/qemu-arm -f Makefile.test test
+    displayName: 'Build'
+
+- job: 'unix coverage build and tests'
+  pool:
+    vmImage: 'ubuntu-latest'
+
+  steps:
+  - checkout: self
+    submodules: recursive
+
+  - script: |
+      sudo pip install cpp-coveralls
+      gcc --version
+      python3 --version
+    displayName: 'Install dependencies'
+
+  - script: |
+      make $(MAKEOPTS) -C mpy-cross
+      make $(MAKEOPTS) -C ports/unix deplibs
+      make $(MAKEOPTS) -C ports/unix coverage
+      # run the main test suite
+      (cd tests && MICROPY_CPYTHON3=python3 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests)
+      (cd tests && MICROPY_CPYTHON3=python3 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests -d thread)
+      (cd tests && MICROPY_CPYTHON3=python3 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests --emit native)
+      (cd tests && MICROPY_CPYTHON3=python3 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests --via-mpy -d basics float micropython)
+      (cd tests && MICROPY_CPYTHON3=python3 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests --via-mpy --emit native -d basics float micropython)
+      # test when input script comes from stdin
+      cat tests/basics/0prelim.py | ports/unix/micropython_coverage | grep -q 'abc'
+      # run coveralls coverage analysis (try to, even if some builds/tests failed)
+      (cd ports/unix && coveralls --root ../.. --build-root . --gcov $(which gcov) --gcov-options '\-o build-coverage/' --include py --include extmod)
+    displayName: 'Test'
+
+- job: 'unix port build and tests'
+  pool:
+    vmImage: 'ubuntu-latest'
+
+  steps:
+  - checkout: self
+    submodules: recursive
+
+  - script: |
+      make $(MAKEOPTS) -C mpy-cross
+      make $(MAKEOPTS) -C ports/unix deplibs
+      make $(MAKEOPTS) -C ports/unix
+      make $(MAKEOPTS) -C ports/unix test
+    displayName: 'Build'
+
+- job: 'unix nanbox port build and tests'
+  pool:
+    vmImage: 'ubuntu-latest'
+
+  steps:
+  - checkout: self
+    submodules: recursive
+
+  - script: |
+      sudo apt-get install gcc-multilib libffi-dev:i386
+    displayName: 'Install dependencies'
+
+  - script: |
+      make $(MAKEOPTS) -C mpy-cross
+      make $(MAKEOPTS) -C ports/unix deplibs
+      make $(MAKEOPTS) -C ports/unix nanbox
+      (cd tests && MICROPY_CPYTHON3=python3 MICROPY_MICROPYTHON=../ports/unix/micropython_nanbox ./run-tests)
+    displayName: 'Build'
+
+- job: 'unix stackless port build and tests'
+  pool:
+    vmImage: 'ubuntu-latest'
+
+  steps:
+  - checkout: self
+    submodules: recursive
+
+  - script: |
+      make $(MAKEOPTS) -C mpy-cross
+      make $(MAKEOPTS) -C ports/unix deplibs
+      make $(MAKEOPTS) -C ports/unix CFLAGS_EXTRA="-DMICROPY_STACKLESS=1 -DMICROPY_STACKLESS_STRICT=1"
+      make $(MAKEOPTS) -C ports/unix test
+    displayName: 'Build'
+
+- job: 'windows port build via mingw'
+  pool:
+    vmImage: 'ubuntu-latest'
+
+  steps:
+  - checkout: self
+    submodules: recursive
+
+  - script: |
+      sudo apt-get install gcc-mingw-w64
+    displayName: 'Install dependencies'
+
+  - script: |
+      make $(MAKEOPTS) -C mpy-cross
+      make $(MAKEOPTS) -C ports/windows CROSS_COMPILE=i686-w64-mingw32-
+    displayName: 'Build'
+
 - job: gprs_a9
   pool:
     vmImage: 'ubuntu-latest'

From 5220a749246b136aa8db9db7cf87e0224b7aa0d9 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Wed, 11 Sep 2019 10:32:33 +0200
Subject: [PATCH 3271/3533] Fix names

---
 azure-pipelines.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 857a6f85e2aa5..0281ea0842f34 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -2,7 +2,7 @@ variables:
   MAKEOPTS: "-j4"
 
 jobs:
-- job: stm32
+- job: port_stm32
   pool:
     vmImage: 'ubuntu-latest'
 
@@ -26,7 +26,7 @@ jobs:
       make $(MAKEOPTS) -C ports/stm32 BOARD=STM32L476DISC
     displayName: 'Build'
 
-- job: 'qemu-arm port build and tests'
+- job: port_qemu_arm
   pool:
     vmImage: 'ubuntu-latest'
 
@@ -47,7 +47,7 @@ jobs:
       make $(MAKEOPTS) -C ports/qemu-arm -f Makefile.test test
     displayName: 'Build'
 
-- job: 'unix coverage build and tests'
+- job: test_unix
   pool:
     vmImage: 'ubuntu-latest'
 
@@ -77,7 +77,7 @@ jobs:
       (cd ports/unix && coveralls --root ../.. --build-root . --gcov $(which gcov) --gcov-options '\-o build-coverage/' --include py --include extmod)
     displayName: 'Test'
 
-- job: 'unix port build and tests'
+- job: port_unix
   pool:
     vmImage: 'ubuntu-latest'
 
@@ -111,7 +111,7 @@ jobs:
       (cd tests && MICROPY_CPYTHON3=python3 MICROPY_MICROPYTHON=../ports/unix/micropython_nanbox ./run-tests)
     displayName: 'Build'
 
-- job: 'unix stackless port build and tests'
+- job: port_unix_stackless
   pool:
     vmImage: 'ubuntu-latest'
 
@@ -126,7 +126,7 @@ jobs:
       make $(MAKEOPTS) -C ports/unix test
     displayName: 'Build'
 
-- job: 'windows port build via mingw'
+- job: port_mingw
   pool:
     vmImage: 'ubuntu-latest'
 
@@ -143,7 +143,7 @@ jobs:
       make $(MAKEOPTS) -C ports/windows CROSS_COMPILE=i686-w64-mingw32-
     displayName: 'Build'
 
-- job: gprs_a9
+- job: port_gprs_a9
   pool:
     vmImage: 'ubuntu-latest'
 

From 2d7c9137a0009031350dd93f9f53c7fc8c1641cc Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Wed, 11 Sep 2019 10:33:30 +0200
Subject: [PATCH 3272/3533] Fix another name

---
 azure-pipelines.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 0281ea0842f34..6772f222e4a55 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -92,7 +92,7 @@ jobs:
       make $(MAKEOPTS) -C ports/unix test
     displayName: 'Build'
 
-- job: 'unix nanbox port build and tests'
+- job: port_unix_nanbox
   pool:
     vmImage: 'ubuntu-latest'
 

From b7f21186221d344b79da48c2c1c0a180ce6a27f2 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Wed, 11 Sep 2019 11:06:30 +0200
Subject: [PATCH 3273/3533] Add readable names

---
 azure-pipelines.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 6772f222e4a55..5c55b3be3be45 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -3,6 +3,7 @@ variables:
 
 jobs:
 - job: port_stm32
+  displayName: 'stm32 port build'
   pool:
     vmImage: 'ubuntu-latest'
 
@@ -27,6 +28,7 @@ jobs:
     displayName: 'Build'
 
 - job: port_qemu_arm
+  displayName: 'qemu-arm port build and tests'
   pool:
     vmImage: 'ubuntu-latest'
 
@@ -48,6 +50,7 @@ jobs:
     displayName: 'Build'
 
 - job: test_unix
+  displayName: 'unix coverage build and tests'
   pool:
     vmImage: 'ubuntu-latest'
 
@@ -78,6 +81,7 @@ jobs:
     displayName: 'Test'
 
 - job: port_unix
+  displayName: 'unix port build and tests'
   pool:
     vmImage: 'ubuntu-latest'
 
@@ -93,6 +97,7 @@ jobs:
     displayName: 'Build'
 
 - job: port_unix_nanbox
+  displayName: 'unix nanbox port build and tests'
   pool:
     vmImage: 'ubuntu-latest'
 
@@ -112,6 +117,7 @@ jobs:
     displayName: 'Build'
 
 - job: port_unix_stackless
+  displayName: 'unix stackless port build and tests'
   pool:
     vmImage: 'ubuntu-latest'
 
@@ -127,6 +133,7 @@ jobs:
     displayName: 'Build'
 
 - job: port_mingw
+  displayName: 'windows port build via mingw'
   pool:
     vmImage: 'ubuntu-latest'
 
@@ -144,6 +151,7 @@ jobs:
     displayName: 'Build'
 
 - job: port_gprs_a9
+  displayName: 'gprs_a9 build'
   pool:
     vmImage: 'ubuntu-latest'
 

From 2f93fde05a0f6a172219961456e6b3c0adde569d Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Wed, 11 Sep 2019 11:12:55 +0200
Subject: [PATCH 3274/3533] Attempt fix missing libffi-dev

---
 azure-pipelines.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 5c55b3be3be45..55213470bcee3 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -106,6 +106,8 @@ jobs:
     submodules: recursive
 
   - script: |
+      sudo apt-get update
+      apt-cache policy libffi-dev
       sudo apt-get install gcc-multilib libffi-dev:i386
     displayName: 'Install dependencies'
 

From 8b63df8ff827a233194ff29962b096803d3c45c3 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Wed, 11 Sep 2019 11:24:50 +0200
Subject: [PATCH 3275/3533] Another half and an attempt to fix i386 nanbox
 build

---
 azure-pipelines.yml | 82 +++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 80 insertions(+), 2 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 55213470bcee3..1060756a2ae96 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -106,8 +106,8 @@ jobs:
     submodules: recursive
 
   - script: |
+      sudo dpkg --add-architecture i386
       sudo apt-get update
-      apt-cache policy libffi-dev
       sudo apt-get install gcc-multilib libffi-dev:i386
     displayName: 'Install dependencies'
 
@@ -152,6 +152,84 @@ jobs:
       make $(MAKEOPTS) -C ports/windows CROSS_COMPILE=i686-w64-mingw32-
     displayName: 'Build'
 
+- job: port_nrf
+  displayName: 'nrf port build'
+  pool:
+    vmImage: 'ubuntu-latest'
+
+  steps:
+  - checkout: self
+    submodules: recursive
+
+  - script: |
+      sudo apt-get install gcc-arm-none-eabi
+      sudo apt-get install libnewlib-arm-none-eabi
+      arm-none-eabi-gcc --version
+    displayName: 'Install dependencies'
+
+  - script: |
+      make ${MAKEOPTS} -C ports/nrf
+    displayName: 'Build'
+
+- job: port_bare_arm
+  displayName: 'bare-arm and minimal ports build'
+  pool:
+    vmImage: 'ubuntu-latest'
+
+  steps:
+  - checkout: self
+    submodules: recursive
+
+  - script: |
+      sudo apt-get install gcc-arm-none-eabi
+      sudo apt-get install libnewlib-arm-none-eabi
+      arm-none-eabi-gcc --version
+    displayName: 'Install dependencies'
+
+  - script: |
+      make ${MAKEOPTS} -C ports/bare-arm
+      make ${MAKEOPTS} -C ports/minimal CROSS=1 build/firmware.bin
+      ls -l ports/minimal/build/firmware.bin
+      tools/check_code_size.sh
+    displayName: 'Build'
+
+- job: port_cc3200
+  displayName: 'cc3200 port build'
+  pool:
+    vmImage: 'ubuntu-latest'
+
+  steps:
+  - checkout: self
+    submodules: recursive
+
+  - script: |
+      sudo apt-get install gcc-arm-none-eabi
+      sudo apt-get install libnewlib-arm-none-eabi
+    displayName: 'Install dependencies'
+
+  - script: |
+      make ${MAKEOPTS} -C ports/cc3200 BTARGET=application BTYPE=release
+      make ${MAKEOPTS} -C ports/cc3200 BTARGET=bootloader  BTYPE=release
+    displayName: 'Build'
+
+- job: port_teensy
+  displayName: 'teensy port build'
+  pool:
+    vmImage: 'ubuntu-latest'
+
+  steps:
+  - checkout: self
+    submodules: recursive
+
+  - script: |
+      sudo apt-get install gcc-arm-none-eabi
+      sudo apt-get install libnewlib-arm-none-eabi
+    displayName: 'Install dependencies'
+
+  - script: |
+      make ${MAKEOPTS} -C ports/teensy
+    displayName: 'Build'
+
 - job: port_gprs_a9
   displayName: 'gprs_a9 build'
   pool:
@@ -169,7 +247,7 @@ jobs:
       make
     displayName: 'Build'
 
-  - task: GitHubRelease@0
+  - task:
     condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/master'))
     inputs:
       gitHubConnection: 'github-pulkin'

From d17fa6fc002b6c24ac9503fe0f2a70d002c8d93f Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Wed, 11 Sep 2019 11:27:25 +0200
Subject: [PATCH 3276/3533] Fix task

---
 azure-pipelines.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 1060756a2ae96..d525afc3f5f20 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -247,7 +247,7 @@ jobs:
       make
     displayName: 'Build'
 
-  - task:
+  - task: GitHubRelease@1
     condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/master'))
     inputs:
       gitHubConnection: 'github-pulkin'

From 5d0f5a4a383fcb985b9ba8e025c82ff498e408e2 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Wed, 11 Sep 2019 11:34:42 +0200
Subject: [PATCH 3277/3533] Fix task once more

---
 azure-pipelines.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index d525afc3f5f20..ce5133edd107b 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -247,7 +247,7 @@ jobs:
       make
     displayName: 'Build'
 
-  - task: GitHubRelease@1
+  - task: GitHubRelease@0
     condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/master'))
     inputs:
       gitHubConnection: 'github-pulkin'

From 22568934808c7080638c7f0b870c7d1313d71650 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Wed, 11 Sep 2019 11:46:42 +0200
Subject: [PATCH 3278/3533] Skip uploading coverage

---
 azure-pipelines.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index ce5133edd107b..b8bc7ea00710e 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -77,7 +77,7 @@ jobs:
       # test when input script comes from stdin
       cat tests/basics/0prelim.py | ports/unix/micropython_coverage | grep -q 'abc'
       # run coveralls coverage analysis (try to, even if some builds/tests failed)
-      (cd ports/unix && coveralls --root ../.. --build-root . --gcov $(which gcov) --gcov-options '\-o build-coverage/' --include py --include extmod)
+      # (cd ports/unix && coveralls --root ../.. --build-root . --gcov $(which gcov) --gcov-options '\-o build-coverage/' --include py --include extmod)
     displayName: 'Test'
 
 - job: port_unix

From 707b004150a9e4c6563c402ec3e0a5210b11ca43 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Wed, 11 Sep 2019 12:48:00 +0200
Subject: [PATCH 3279/3533] Replace token connection name with a variable

---
 azure-pipelines.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index b8bc7ea00710e..9f3c1283e6861 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -250,7 +250,7 @@ jobs:
   - task: GitHubRelease@0
     condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/master'))
     inputs:
-      gitHubConnection: 'github-pulkin'
+      gitHubConnection: $(MICROPY_GITHUB_REPO)
       repositoryName: 'pulkin/micropython'
       action: 'edit'
       target: '$(Build.SourceVersion)'

From 6d5696b702a3dc89f21152a3630478d130eaef2d Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Wed, 11 Sep 2019 13:08:25 +0200
Subject: [PATCH 3280/3533] Replace other variables

---
 azure-pipelines.yml | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 9f3c1283e6861..f336998393e8d 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -1,4 +1,7 @@
 variables:
+  GITHUB_OAUTH_CONNECTION_NAME: 'github-pulkin'
+  GITHUB_MICROPY_REPO: 'pulkin/micropython'
+  GITHUB_RELEASE_TAG: 'latest-build'
   MAKEOPTS: "-j4"
 
 jobs:
@@ -250,11 +253,11 @@ jobs:
   - task: GitHubRelease@0
     condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/master'))
     inputs:
-      gitHubConnection: $(MICROPY_GITHUB_REPO)
-      repositoryName: 'pulkin/micropython'
+      gitHubConnection: $(GITHUB_OAUTH_CONNECTION_NAME)
+      repositoryName: $(GITHUB_MICROPY_REPO)
       action: 'edit'
       target: '$(Build.SourceVersion)'
-      tag: 'latest-build'
+      tag: $(GITHUB_RELEASE_TAG)
       title: 'Latest master build'
       releaseNotesSource: 'input'
       releaseNotes: 'This is an automatic build triggered on `master` changes'
@@ -262,3 +265,4 @@ jobs:
       assetUploadMode: 'replace'
       isPreRelease: true
       addChangeLog: false
+

From e8d87bab3d78c2ee815d3809a32f6afc50fb018b Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Wed, 11 Sep 2019 14:58:58 +0200
Subject: [PATCH 3281/3533] Update issue status

[skip ci]
---
 ports/gprs_a9/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/gprs_a9/README.md b/ports/gprs_a9/README.md
index b7e8df643325f..9a6f48586821c 100644
--- a/ports/gprs_a9/README.md
+++ b/ports/gprs_a9/README.md
@@ -591,5 +591,5 @@ I2C_DEFAULT_TIME_OUT
 
 * The module halts on fatal errors; create an empty file `.reboot_on_fatal` if a reboot is desired
 * The size of micropython heap is roughly 512 Kb. 400k can be realistically allocated right after hard reset.
-* SSL is currently unstable and needs further debugging.
+* ~~SSL~~ sockets are currently unstable and need further investigation (the module halts after around 10 consequitive connections).
 

From 7e34935ec41a548c174c480fc60ffd5956f4560d Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Wed, 11 Sep 2019 19:29:31 +0200
Subject: [PATCH 3282/3533] Extract release as a separate stage in azure

---
 azure-pipelines.yml | 538 +++++++++++++++++++++++---------------------
 1 file changed, 276 insertions(+), 262 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index f336998393e8d..eef4758e59496 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -4,265 +4,279 @@ variables:
   GITHUB_RELEASE_TAG: 'latest-build'
   MAKEOPTS: "-j4"
 
-jobs:
-- job: port_stm32
-  displayName: 'stm32 port build'
-  pool:
-    vmImage: 'ubuntu-latest'
-
-  steps:
-  - checkout: self
-    submodules: recursive
-
-  - script: |
-      sudo add-apt-repository -y ppa:team-gcc-arm-embedded/ppa
-      sudo apt-get update -qq || true
-      sudo apt-get install gcc-arm-embedded
-      sudo apt-get install libnewlib-arm-none-eabi
-      arm-none-eabi-gcc --version
-    displayName: 'Install dependencies'
-
-  - script: |
-      make $(MAKEOPTS) -C mpy-cross
-      make $(MAKEOPTS) -C ports/stm32
-      make $(MAKEOPTS) -C ports/stm32 BOARD=PYBV11 MICROPY_PY_WIZNET5K=5200 MICROPY_PY_CC3K=1
-      make $(MAKEOPTS) -C ports/stm32 BOARD=STM32F769DISC
-      make $(MAKEOPTS) -C ports/stm32 BOARD=STM32L476DISC
-    displayName: 'Build'
-
-- job: port_qemu_arm
-  displayName: 'qemu-arm port build and tests'
-  pool:
-    vmImage: 'ubuntu-latest'
-
-  steps:
-  - checkout: self
-    submodules: recursive
-
-  - script: |
-      sudo apt-get install gcc-arm-none-eabi
-      sudo apt-get install libnewlib-arm-none-eabi
-      sudo apt-get install qemu-system
-      arm-none-eabi-gcc --version
-      qemu-system-arm --version
-    displayName: 'Install dependencies'
-
-  - script: |
-      make $(MAKEOPTS) -C mpy-cross
-      make $(MAKEOPTS) -C ports/qemu-arm -f Makefile.test test
-    displayName: 'Build'
-
-- job: test_unix
-  displayName: 'unix coverage build and tests'
-  pool:
-    vmImage: 'ubuntu-latest'
-
-  steps:
-  - checkout: self
-    submodules: recursive
-
-  - script: |
-      sudo pip install cpp-coveralls
-      gcc --version
-      python3 --version
-    displayName: 'Install dependencies'
-
-  - script: |
-      make $(MAKEOPTS) -C mpy-cross
-      make $(MAKEOPTS) -C ports/unix deplibs
-      make $(MAKEOPTS) -C ports/unix coverage
-      # run the main test suite
-      (cd tests && MICROPY_CPYTHON3=python3 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests)
-      (cd tests && MICROPY_CPYTHON3=python3 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests -d thread)
-      (cd tests && MICROPY_CPYTHON3=python3 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests --emit native)
-      (cd tests && MICROPY_CPYTHON3=python3 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests --via-mpy -d basics float micropython)
-      (cd tests && MICROPY_CPYTHON3=python3 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests --via-mpy --emit native -d basics float micropython)
-      # test when input script comes from stdin
-      cat tests/basics/0prelim.py | ports/unix/micropython_coverage | grep -q 'abc'
-      # run coveralls coverage analysis (try to, even if some builds/tests failed)
-      # (cd ports/unix && coveralls --root ../.. --build-root . --gcov $(which gcov) --gcov-options '\-o build-coverage/' --include py --include extmod)
-    displayName: 'Test'
-
-- job: port_unix
-  displayName: 'unix port build and tests'
-  pool:
-    vmImage: 'ubuntu-latest'
-
-  steps:
-  - checkout: self
-    submodules: recursive
-
-  - script: |
-      make $(MAKEOPTS) -C mpy-cross
-      make $(MAKEOPTS) -C ports/unix deplibs
-      make $(MAKEOPTS) -C ports/unix
-      make $(MAKEOPTS) -C ports/unix test
-    displayName: 'Build'
-
-- job: port_unix_nanbox
-  displayName: 'unix nanbox port build and tests'
-  pool:
-    vmImage: 'ubuntu-latest'
-
-  steps:
-  - checkout: self
-    submodules: recursive
-
-  - script: |
-      sudo dpkg --add-architecture i386
-      sudo apt-get update
-      sudo apt-get install gcc-multilib libffi-dev:i386
-    displayName: 'Install dependencies'
-
-  - script: |
-      make $(MAKEOPTS) -C mpy-cross
-      make $(MAKEOPTS) -C ports/unix deplibs
-      make $(MAKEOPTS) -C ports/unix nanbox
-      (cd tests && MICROPY_CPYTHON3=python3 MICROPY_MICROPYTHON=../ports/unix/micropython_nanbox ./run-tests)
-    displayName: 'Build'
-
-- job: port_unix_stackless
-  displayName: 'unix stackless port build and tests'
-  pool:
-    vmImage: 'ubuntu-latest'
-
-  steps:
-  - checkout: self
-    submodules: recursive
-
-  - script: |
-      make $(MAKEOPTS) -C mpy-cross
-      make $(MAKEOPTS) -C ports/unix deplibs
-      make $(MAKEOPTS) -C ports/unix CFLAGS_EXTRA="-DMICROPY_STACKLESS=1 -DMICROPY_STACKLESS_STRICT=1"
-      make $(MAKEOPTS) -C ports/unix test
-    displayName: 'Build'
-
-- job: port_mingw
-  displayName: 'windows port build via mingw'
-  pool:
-    vmImage: 'ubuntu-latest'
-
-  steps:
-  - checkout: self
-    submodules: recursive
-
-  - script: |
-      sudo apt-get install gcc-mingw-w64
-    displayName: 'Install dependencies'
-
-  - script: |
-      make $(MAKEOPTS) -C mpy-cross
-      make $(MAKEOPTS) -C ports/windows CROSS_COMPILE=i686-w64-mingw32-
-    displayName: 'Build'
-
-- job: port_nrf
-  displayName: 'nrf port build'
-  pool:
-    vmImage: 'ubuntu-latest'
-
-  steps:
-  - checkout: self
-    submodules: recursive
-
-  - script: |
-      sudo apt-get install gcc-arm-none-eabi
-      sudo apt-get install libnewlib-arm-none-eabi
-      arm-none-eabi-gcc --version
-    displayName: 'Install dependencies'
-
-  - script: |
-      make ${MAKEOPTS} -C ports/nrf
-    displayName: 'Build'
-
-- job: port_bare_arm
-  displayName: 'bare-arm and minimal ports build'
-  pool:
-    vmImage: 'ubuntu-latest'
-
-  steps:
-  - checkout: self
-    submodules: recursive
-
-  - script: |
-      sudo apt-get install gcc-arm-none-eabi
-      sudo apt-get install libnewlib-arm-none-eabi
-      arm-none-eabi-gcc --version
-    displayName: 'Install dependencies'
-
-  - script: |
-      make ${MAKEOPTS} -C ports/bare-arm
-      make ${MAKEOPTS} -C ports/minimal CROSS=1 build/firmware.bin
-      ls -l ports/minimal/build/firmware.bin
-      tools/check_code_size.sh
-    displayName: 'Build'
-
-- job: port_cc3200
-  displayName: 'cc3200 port build'
-  pool:
-    vmImage: 'ubuntu-latest'
-
-  steps:
-  - checkout: self
-    submodules: recursive
-
-  - script: |
-      sudo apt-get install gcc-arm-none-eabi
-      sudo apt-get install libnewlib-arm-none-eabi
-    displayName: 'Install dependencies'
-
-  - script: |
-      make ${MAKEOPTS} -C ports/cc3200 BTARGET=application BTYPE=release
-      make ${MAKEOPTS} -C ports/cc3200 BTARGET=bootloader  BTYPE=release
-    displayName: 'Build'
-
-- job: port_teensy
-  displayName: 'teensy port build'
-  pool:
-    vmImage: 'ubuntu-latest'
-
-  steps:
-  - checkout: self
-    submodules: recursive
-
-  - script: |
-      sudo apt-get install gcc-arm-none-eabi
-      sudo apt-get install libnewlib-arm-none-eabi
-    displayName: 'Install dependencies'
-
-  - script: |
-      make ${MAKEOPTS} -C ports/teensy
-    displayName: 'Build'
-
-- job: port_gprs_a9
-  displayName: 'gprs_a9 build'
-  pool:
-    vmImage: 'ubuntu-latest'
-
-  steps:
-  - checkout: self
-    submodules: recursive
-
-  - script: sudo apt-get install build-essential gcc-multilib g++-multilib libzip-dev zlib1g lib32z1
-    displayName: 'Install dependencies'
-
-  - script: |
-      cd ports/gprs_a9
-      make
-    displayName: 'Build'
-
-  - task: GitHubRelease@0
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/master'))
-    inputs:
-      gitHubConnection: $(GITHUB_OAUTH_CONNECTION_NAME)
-      repositoryName: $(GITHUB_MICROPY_REPO)
-      action: 'edit'
-      target: '$(Build.SourceVersion)'
-      tag: $(GITHUB_RELEASE_TAG)
-      title: 'Latest master build'
-      releaseNotesSource: 'input'
-      releaseNotes: 'This is an automatic build triggered on `master` changes'
-      assets: 'ports/gprs_a9/hex/firmware_debug_full.lod'
-      assetUploadMode: 'replace'
-      isPreRelease: true
-      addChangeLog: false
-
+stages:
+- stage: build
+  displayName: 'Test and build'
+  jobs:
+  - job: port_stm32
+    displayName: 'stm32 port build'
+    pool:
+      vmImage: 'ubuntu-latest'
+  
+    steps:
+    - checkout: self
+      submodules: recursive
+  
+    - script: |
+        sudo add-apt-repository -y ppa:team-gcc-arm-embedded/ppa
+        sudo apt-get update -qq || true
+        sudo apt-get install gcc-arm-embedded
+        sudo apt-get install libnewlib-arm-none-eabi
+        arm-none-eabi-gcc --version
+      displayName: 'Install dependencies'
+  
+    - script: |
+        make $(MAKEOPTS) -C mpy-cross
+        make $(MAKEOPTS) -C ports/stm32
+        make $(MAKEOPTS) -C ports/stm32 BOARD=PYBV11 MICROPY_PY_WIZNET5K=5200 MICROPY_PY_CC3K=1
+        make $(MAKEOPTS) -C ports/stm32 BOARD=STM32F769DISC
+        make $(MAKEOPTS) -C ports/stm32 BOARD=STM32L476DISC
+      displayName: 'Build'
+  
+  - job: port_qemu_arm
+    displayName: 'qemu-arm port build and tests'
+    pool:
+      vmImage: 'ubuntu-latest'
+  
+    steps:
+    - checkout: self
+      submodules: recursive
+  
+    - script: |
+        sudo apt-get install gcc-arm-none-eabi
+        sudo apt-get install libnewlib-arm-none-eabi
+        sudo apt-get install qemu-system
+        arm-none-eabi-gcc --version
+        qemu-system-arm --version
+      displayName: 'Install dependencies'
+  
+    - script: |
+        make $(MAKEOPTS) -C mpy-cross
+        make $(MAKEOPTS) -C ports/qemu-arm -f Makefile.test test
+      displayName: 'Build'
+  
+  - job: test_unix
+    displayName: 'unix coverage build and tests'
+    pool:
+      vmImage: 'ubuntu-latest'
+  
+    steps:
+    - checkout: self
+      submodules: recursive
+  
+    - script: |
+        sudo pip install cpp-coveralls
+        gcc --version
+        python3 --version
+      displayName: 'Install dependencies'
+  
+    - script: |
+        make $(MAKEOPTS) -C mpy-cross
+        make $(MAKEOPTS) -C ports/unix deplibs
+        make $(MAKEOPTS) -C ports/unix coverage
+        # run the main test suite
+        (cd tests && MICROPY_CPYTHON3=python3 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests)
+        (cd tests && MICROPY_CPYTHON3=python3 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests -d thread)
+        (cd tests && MICROPY_CPYTHON3=python3 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests --emit native)
+        (cd tests && MICROPY_CPYTHON3=python3 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests --via-mpy -d basics float micropython)
+        (cd tests && MICROPY_CPYTHON3=python3 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests --via-mpy --emit native -d basics float micropython)
+        # test when input script comes from stdin
+        cat tests/basics/0prelim.py | ports/unix/micropython_coverage | grep -q 'abc'
+        # run coveralls coverage analysis (try to, even if some builds/tests failed)
+        # (cd ports/unix && coveralls --root ../.. --build-root . --gcov $(which gcov) --gcov-options '\-o build-coverage/' --include py --include extmod)
+      displayName: 'Test'
+  
+  - job: port_unix
+    displayName: 'unix port build and tests'
+    pool:
+      vmImage: 'ubuntu-latest'
+  
+    steps:
+    - checkout: self
+      submodules: recursive
+  
+    - script: |
+        make $(MAKEOPTS) -C mpy-cross
+        make $(MAKEOPTS) -C ports/unix deplibs
+        make $(MAKEOPTS) -C ports/unix
+        make $(MAKEOPTS) -C ports/unix test
+      displayName: 'Build'
+  
+  - job: port_unix_nanbox
+    displayName: 'unix nanbox port build and tests'
+    pool:
+      vmImage: 'ubuntu-latest'
+  
+    steps:
+    - checkout: self
+      submodules: recursive
+  
+    - script: |
+        sudo dpkg --add-architecture i386
+        sudo apt-get update
+        sudo apt-get install gcc-multilib libffi-dev:i386
+      displayName: 'Install dependencies'
+  
+    - script: |
+        make $(MAKEOPTS) -C mpy-cross
+        make $(MAKEOPTS) -C ports/unix deplibs
+        make $(MAKEOPTS) -C ports/unix nanbox
+        (cd tests && MICROPY_CPYTHON3=python3 MICROPY_MICROPYTHON=../ports/unix/micropython_nanbox ./run-tests)
+      displayName: 'Build'
+  
+  - job: port_unix_stackless
+    displayName: 'unix stackless port build and tests'
+    pool:
+      vmImage: 'ubuntu-latest'
+  
+    steps:
+    - checkout: self
+      submodules: recursive
+  
+    - script: |
+        make $(MAKEOPTS) -C mpy-cross
+        make $(MAKEOPTS) -C ports/unix deplibs
+        make $(MAKEOPTS) -C ports/unix CFLAGS_EXTRA="-DMICROPY_STACKLESS=1 -DMICROPY_STACKLESS_STRICT=1"
+        make $(MAKEOPTS) -C ports/unix test
+      displayName: 'Build'
+  
+  - job: port_mingw
+    displayName: 'windows port build via mingw'
+    pool:
+      vmImage: 'ubuntu-latest'
+  
+    steps:
+    - checkout: self
+      submodules: recursive
+  
+    - script: |
+        sudo apt-get install gcc-mingw-w64
+      displayName: 'Install dependencies'
+  
+    - script: |
+        make $(MAKEOPTS) -C mpy-cross
+        make $(MAKEOPTS) -C ports/windows CROSS_COMPILE=i686-w64-mingw32-
+      displayName: 'Build'
+  
+  - job: port_nrf
+    displayName: 'nrf port build'
+    pool:
+      vmImage: 'ubuntu-latest'
+  
+    steps:
+    - checkout: self
+      submodules: recursive
+  
+    - script: |
+        sudo apt-get install gcc-arm-none-eabi
+        sudo apt-get install libnewlib-arm-none-eabi
+        arm-none-eabi-gcc --version
+      displayName: 'Install dependencies'
+  
+    - script: |
+        make ${MAKEOPTS} -C ports/nrf
+      displayName: 'Build'
+  
+  - job: port_bare_arm
+    displayName: 'bare-arm and minimal ports build'
+    pool:
+      vmImage: 'ubuntu-latest'
+  
+    steps:
+    - checkout: self
+      submodules: recursive
+  
+    - script: |
+        sudo apt-get install gcc-arm-none-eabi
+        sudo apt-get install libnewlib-arm-none-eabi
+        arm-none-eabi-gcc --version
+      displayName: 'Install dependencies'
+  
+    - script: |
+        make ${MAKEOPTS} -C ports/bare-arm
+        make ${MAKEOPTS} -C ports/minimal CROSS=1 build/firmware.bin
+        ls -l ports/minimal/build/firmware.bin
+        tools/check_code_size.sh
+      displayName: 'Build'
+  
+  - job: port_cc3200
+    displayName: 'cc3200 port build'
+    pool:
+      vmImage: 'ubuntu-latest'
+  
+    steps:
+    - checkout: self
+      submodules: recursive
+  
+    - script: |
+        sudo apt-get install gcc-arm-none-eabi
+        sudo apt-get install libnewlib-arm-none-eabi
+      displayName: 'Install dependencies'
+  
+    - script: |
+        make ${MAKEOPTS} -C ports/cc3200 BTARGET=application BTYPE=release
+        make ${MAKEOPTS} -C ports/cc3200 BTARGET=bootloader  BTYPE=release
+      displayName: 'Build'
+  
+  - job: port_teensy
+    displayName: 'teensy port build'
+    pool:
+      vmImage: 'ubuntu-latest'
+  
+    steps:
+    - checkout: self
+      submodules: recursive
+  
+    - script: |
+        sudo apt-get install gcc-arm-none-eabi
+        sudo apt-get install libnewlib-arm-none-eabi
+      displayName: 'Install dependencies'
+  
+    - script: |
+        make ${MAKEOPTS} -C ports/teensy
+      displayName: 'Build'
+  
+  - job: port_gprs_a9
+    displayName: 'gprs_a9 build'
+    pool:
+      vmImage: 'ubuntu-latest'
+  
+    steps:
+    - checkout: self
+      submodules: recursive
+  
+    - script: sudo apt-get install build-essential gcc-multilib g++-multilib libzip-dev zlib1g lib32z1
+      displayName: 'Install dependencies'
+  
+    - script: |
+        cd ports/gprs_a9
+        make
+      displayName: 'Build'
+
+    - task: PublishPipelineArtifact@1
+      displayName: 'Collect the build'
+      inputs:
+        targetPath: '$(Pipeline.Workspace)/ports/gprs_a9/hex'
+        artifact: 'build_gprs_a9'
+
+- stage: publish
+  displayName: 'Publish builds'
+  dependsOn: build
+  jobs:
+  - job: github
+    displayName: 'Github release'
+    - task: GitHubRelease@0
+      condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/master'))
+      inputs:
+        gitHubConnection: $(GITHUB_OAUTH_CONNECTION_NAME)
+        repositoryName: $(GITHUB_MICROPY_REPO)
+        action: 'edit'
+        target: '$(Build.SourceVersion)'
+        tag: $(GITHUB_RELEASE_TAG)
+        title: 'Latest master build'
+        releaseNotesSource: 'input'
+        releaseNotes: 'This is an automatic build triggered on `master` changes'
+        assets: 'ports/gprs_a9/hex/firmware_debug_full.lod'
+        assetUploadMode: 'replace'
+        isPreRelease: true
+        addChangeLog: false

From f77cd22d6728ab102f46c48feda59e92345e0c29 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Wed, 11 Sep 2019 19:31:15 +0200
Subject: [PATCH 3283/3533] Fix steps

---
 azure-pipelines.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index eef4758e59496..e13c8c647e332 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -265,6 +265,7 @@ stages:
   jobs:
   - job: github
     displayName: 'Github release'
+    steps:
     - task: GitHubRelease@0
       condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/master'))
       inputs:

From e1fa14c88d5edc055fd6ae324b227df56f6176a0 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Thu, 12 Sep 2019 10:45:45 +0200
Subject: [PATCH 3284/3533] Debug output

---
 azure-pipelines.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index e13c8c647e332..7ce2b167a3034 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -253,6 +253,9 @@ stages:
         make
       displayName: 'Build'
 
+    - script: 'ls $(Pipeline.Workspace) && ls $(Pipeline.Workspace)/ports/gprs_a9/hex'
+      displayName: 'debug'
+
     - task: PublishPipelineArtifact@1
       displayName: 'Collect the build'
       inputs:

From 9f29a372cf4d61f53e6807d4dcda381bbb2d2cc6 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Thu, 12 Sep 2019 11:02:26 +0200
Subject: [PATCH 3285/3533] Swap folder

---
 azure-pipelines.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 7ce2b167a3034..8642223c6db04 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -253,13 +253,13 @@ stages:
         make
       displayName: 'Build'
 
-    - script: 'ls $(Pipeline.Workspace) && ls $(Pipeline.Workspace)/ports/gprs_a9/hex'
+    - script: 'ls $(Build.Repository.LocalPath) && ls $(Build.Repository.LocalPath)/ports/gprs_a9/hex'
       displayName: 'debug'
 
     - task: PublishPipelineArtifact@1
       displayName: 'Collect the build'
       inputs:
-        targetPath: '$(Pipeline.Workspace)/ports/gprs_a9/hex'
+        targetPath: '$(Build.Repository.LocalPath)/ports/gprs_a9/hex'
         artifact: 'build_gprs_a9'
 
 - stage: publish

From 1d9f94fee49919771eb655e5267cb37e34b6c96a Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Thu, 12 Sep 2019 11:47:08 +0200
Subject: [PATCH 3286/3533] Download attempt

---
 azure-pipelines.yml | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 8642223c6db04..f2e89ea2acebb 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -253,9 +253,6 @@ stages:
         make
       displayName: 'Build'
 
-    - script: 'ls $(Build.Repository.LocalPath) && ls $(Build.Repository.LocalPath)/ports/gprs_a9/hex'
-      displayName: 'debug'
-
     - task: PublishPipelineArtifact@1
       displayName: 'Collect the build'
       inputs:
@@ -266,6 +263,15 @@ stages:
   displayName: 'Publish builds'
   dependsOn: build
   jobs:
+  - task: DownloadPipelineArtifact@2
+    displayName: 'Download all builds'
+    inputs:
+      buildType: 'current'
+      targetPath: '$(Pipeline.Workspace)'
+
+  - script: 'ls $(Pipeline.Workspace)'
+    displayName: 'ls debug'
+
   - job: github
     displayName: 'Github release'
     steps:
@@ -280,7 +286,8 @@ stages:
         title: 'Latest master build'
         releaseNotesSource: 'input'
         releaseNotes: 'This is an automatic build triggered on `master` changes'
-        assets: 'ports/gprs_a9/hex/firmware_debug_full.lod'
+        assets: '$(Pipeline.Workspace)/firmware_debug_full.lod'
         assetUploadMode: 'replace'
         isPreRelease: true
         addChangeLog: false
+

From 1d7cbed8d5ab450ec826f3f62965ed4a4f5db8e1 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Thu, 12 Sep 2019 11:50:36 +0200
Subject: [PATCH 3287/3533] Fix the job

---
 azure-pipelines.yml | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index f2e89ea2acebb..a0ea9df0dd7fc 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -263,19 +263,20 @@ stages:
   displayName: 'Publish builds'
   dependsOn: build
   jobs:
-  - task: DownloadPipelineArtifact@2
-    displayName: 'Download all builds'
-    inputs:
-      buildType: 'current'
-      targetPath: '$(Pipeline.Workspace)'
+  - job: publish
+    displayName: 'Download and publish builds'
+    steps:
+    - task: DownloadPipelineArtifact@2
+      displayName: 'Download all builds'
+      inputs:
+        buildType: 'current'
+        targetPath: '$(Pipeline.Workspace)'
 
-  - script: 'ls $(Pipeline.Workspace)'
-    displayName: 'ls debug'
+    - script: 'ls $(Pipeline.Workspace)'
+      displayName: 'ls debug'
 
-  - job: github
-    displayName: 'Github release'
-    steps:
     - task: GitHubRelease@0
+      displayName: 'Publish on Github releases'
       condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/master'))
       inputs:
         gitHubConnection: $(GITHUB_OAUTH_CONNECTION_NAME)

From c86b98d7727b572d826adfc4a2b2744d88ffc97b Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Thu, 12 Sep 2019 12:26:20 +0200
Subject: [PATCH 3288/3533] Attempt release notes template

---
 .azure-templates/github-release.rst | 10 ++++++++++
 azure-pipelines.yml                 |  8 ++++----
 2 files changed, 14 insertions(+), 4 deletions(-)
 create mode 100644 .azure-templates/github-release.rst

diff --git a/.azure-templates/github-release.rst b/.azure-templates/github-release.rst
new file mode 100644
index 0000000000000..d5e206e24822a
--- /dev/null
+++ b/.azure-templates/github-release.rst
@@ -0,0 +1,10 @@
+The latest successful `master` build.
+
+gprs_a9
+-------
+
+Burn instructions: use [cooltools](https://ai-thinker-open.github.io/GPRS_C_SDK_DOC/en/c-sdk/burn-debug.html)
+
+Firmware files:
+ - https://github.com/$(GITHUB_MICROPY_REPO)/releases/download/$(GITHUB_RELEASE_TAG)/firmware_debug_full.lod
+
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index a0ea9df0dd7fc..11c0b4657fe9d 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -270,7 +270,7 @@ stages:
       displayName: 'Download all builds'
       inputs:
         buildType: 'current'
-        targetPath: '$(Pipeline.Workspace)'
+        targetPath: '$(Build.BinariesDirectory)'
 
     - script: 'ls $(Pipeline.Workspace)'
       displayName: 'ls debug'
@@ -285,9 +285,9 @@ stages:
         target: '$(Build.SourceVersion)'
         tag: $(GITHUB_RELEASE_TAG)
         title: 'Latest master build'
-        releaseNotesSource: 'input'
-        releaseNotes: 'This is an automatic build triggered on `master` changes'
-        assets: '$(Pipeline.Workspace)/firmware_debug_full.lod'
+        releaseNotesSource: 'file'
+        releaseNotesFile: '.azure-templates/github-release.rst'
+        assets: '$(Build.BinariesDirectory)/build_gprs_a9/firmware_debug_full.lod'
         assetUploadMode: 'replace'
         isPreRelease: true
         addChangeLog: false

From 864121997c70b7fd4aae8b0b9eb5568177f92ab1 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Thu, 12 Sep 2019 12:46:38 +0200
Subject: [PATCH 3289/3533] Attempt inline message

---
 azure-pipelines.yml | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 11c0b4657fe9d..0f5b8c8997827 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -285,8 +285,17 @@ stages:
         target: '$(Build.SourceVersion)'
         tag: $(GITHUB_RELEASE_TAG)
         title: 'Latest master build'
-        releaseNotesSource: 'file'
-        releaseNotesFile: '.azure-templates/github-release.rst'
+        releaseNotesSource: 'input'
+        releaseNotes: >
+          'The latest successful `master` build.'
+
+          'gprs_a9'
+          '-------'
+
+          'Burn instructions: use [cooltools](https://ai-thinker-open.github.io/GPRS_C_SDK_DOC/en/c-sdk/burn-debug.html)'
+
+          'Firmware files:'
+          '- https://github.com/$(GITHUB_MICROPY_REPO)/releases/download/$(GITHUB_RELEASE_TAG)/firmware_debug_full.lod'
         assets: '$(Build.BinariesDirectory)/build_gprs_a9/firmware_debug_full.lod'
         assetUploadMode: 'replace'
         isPreRelease: true

From 363844144e526000caf79690e7f2cb54a3e27ace Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Thu, 12 Sep 2019 13:09:44 +0200
Subject: [PATCH 3290/3533] Fix multiline text

---
 azure-pipelines.yml | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 0f5b8c8997827..c9057a7fa222d 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -286,16 +286,18 @@ stages:
         tag: $(GITHUB_RELEASE_TAG)
         title: 'Latest master build'
         releaseNotesSource: 'input'
-        releaseNotes: >
-          'The latest successful `master` build.'
+        releaseNotes: |
+          The latest successful `master` build.
 
-          'gprs_a9'
-          '-------'
+          Firmware files
+          --------------
 
-          'Burn instructions: use [cooltools](https://ai-thinker-open.github.io/GPRS_C_SDK_DOC/en/c-sdk/burn-debug.html)'
+          - gprs_a9
 
-          'Firmware files:'
-          '- https://github.com/$(GITHUB_MICROPY_REPO)/releases/download/$(GITHUB_RELEASE_TAG)/firmware_debug_full.lod'
+            Burn instructions: use [cooltools](https://ai-thinker-open.github.io/GPRS_C_SDK_DOC/en/c-sdk/burn-debug.html)
+
+            Firmware files:
+            - [firmware_debug_full.lod](https://github.com/$(GITHUB_MICROPY_REPO)/releases/download/$(GITHUB_RELEASE_TAG)/firmware_debug_full.lod)
         assets: '$(Build.BinariesDirectory)/build_gprs_a9/firmware_debug_full.lod'
         assetUploadMode: 'replace'
         isPreRelease: true

From 43f2735312e10dd9e184effa0d1cc13128062a44 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Thu, 12 Sep 2019 13:21:44 +0200
Subject: [PATCH 3291/3533] Remove debug outputs

---
 .azure-templates/github-release.rst | 10 ----------
 azure-pipelines.yml                 |  4 +---
 2 files changed, 1 insertion(+), 13 deletions(-)
 delete mode 100644 .azure-templates/github-release.rst

diff --git a/.azure-templates/github-release.rst b/.azure-templates/github-release.rst
deleted file mode 100644
index d5e206e24822a..0000000000000
--- a/.azure-templates/github-release.rst
+++ /dev/null
@@ -1,10 +0,0 @@
-The latest successful `master` build.
-
-gprs_a9
--------
-
-Burn instructions: use [cooltools](https://ai-thinker-open.github.io/GPRS_C_SDK_DOC/en/c-sdk/burn-debug.html)
-
-Firmware files:
- - https://github.com/$(GITHUB_MICROPY_REPO)/releases/download/$(GITHUB_RELEASE_TAG)/firmware_debug_full.lod
-
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index c9057a7fa222d..7f5dfe34702c5 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -272,9 +272,6 @@ stages:
         buildType: 'current'
         targetPath: '$(Build.BinariesDirectory)'
 
-    - script: 'ls $(Pipeline.Workspace)'
-      displayName: 'ls debug'
-
     - task: GitHubRelease@0
       displayName: 'Publish on Github releases'
       condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/master'))
@@ -298,6 +295,7 @@ stages:
 
             Firmware files:
             - [firmware_debug_full.lod](https://github.com/$(GITHUB_MICROPY_REPO)/releases/download/$(GITHUB_RELEASE_TAG)/firmware_debug_full.lod)
+            - [firmware_debug_flash.lod](https://github.com/$(GITHUB_MICROPY_REPO)/releases/download/$(GITHUB_RELEASE_TAG)/firmware_debug_flash.lod)
         assets: '$(Build.BinariesDirectory)/build_gprs_a9/firmware_debug_full.lod'
         assetUploadMode: 'replace'
         isPreRelease: true

From 9514d1f1afc5d77f7c54a18723726e27e0edb3b8 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Thu, 12 Sep 2019 13:30:15 +0200
Subject: [PATCH 3292/3533] Sort binaries before publishing

---
 azure-pipelines.yml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 7f5dfe34702c5..0e83355cdbc8f 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -272,6 +272,11 @@ stages:
         buildType: 'current'
         targetPath: '$(Build.BinariesDirectory)'
 
+    - script: |
+        mv $(Build.BinariesDirectory)/build_gprs_a9/*.lod $(Build.BinariesDirectory)
+        rm -rf $(Build.BinariesDirectory)/build_gprs_a9
+      displayName: 'Sort and filter binaries'
+
     - task: GitHubRelease@0
       displayName: 'Publish on Github releases'
       condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/master'))
@@ -296,7 +301,7 @@ stages:
             Firmware files:
             - [firmware_debug_full.lod](https://github.com/$(GITHUB_MICROPY_REPO)/releases/download/$(GITHUB_RELEASE_TAG)/firmware_debug_full.lod)
             - [firmware_debug_flash.lod](https://github.com/$(GITHUB_MICROPY_REPO)/releases/download/$(GITHUB_RELEASE_TAG)/firmware_debug_flash.lod)
-        assets: '$(Build.BinariesDirectory)/build_gprs_a9/firmware_debug_full.lod'
+        assets: '$(Build.BinariesDirectory)/*'
         assetUploadMode: 'replace'
         isPreRelease: true
         addChangeLog: false

From 9758a31898bf4399470c509fec0147eb809610c9 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sat, 14 Sep 2019 20:24:00 +0200
Subject: [PATCH 3293/3533] Update build scenario and checkout submodules
 separately

---
 azure-pipelines.yml | 132 ++++++++++++++++++++++++++++++++++++++------
 1 file changed, 115 insertions(+), 17 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 0e83355cdbc8f..85e2f8790e270 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -15,8 +15,10 @@ stages:
   
     steps:
     - checkout: self
-      submodules: recursive
-  
+
+    - script: git submodule update --init lib/lwip lib/mbedtls lib/stm32lib
+      displayName: 'Checkout submodules'
+
     - script: |
         sudo add-apt-repository -y ppa:team-gcc-arm-embedded/ppa
         sudo apt-get update -qq || true
@@ -29,8 +31,10 @@ stages:
         make $(MAKEOPTS) -C mpy-cross
         make $(MAKEOPTS) -C ports/stm32
         make $(MAKEOPTS) -C ports/stm32 BOARD=PYBV11 MICROPY_PY_WIZNET5K=5200 MICROPY_PY_CC3K=1
-        make $(MAKEOPTS) -C ports/stm32 BOARD=STM32F769DISC
+        make ${MAKEOPTS} -C ports/stm32 BOARD=PYBD_SF2
+        make ${MAKEOPTS} -C ports/stm32 BOARD=STM32F769DISC CFLAGS_EXTRA='-DMICROPY_PY_THREAD=1'
         make $(MAKEOPTS) -C ports/stm32 BOARD=STM32L476DISC
+        make ${MAKEOPTS} -C ports/stm32/mboot BOARD=PYBD_SF6
       displayName: 'Build'
   
   - job: port_qemu_arm
@@ -40,7 +44,6 @@ stages:
   
     steps:
     - checkout: self
-      submodules: recursive
   
     - script: |
         sudo apt-get install gcc-arm-none-eabi
@@ -63,6 +66,9 @@ stages:
     steps:
     - checkout: self
       submodules: recursive
+
+    - script: git submodule update --init lib/axtls lib/berkeley-db-1.xx lib/libffi
+      displayName: 'Checkout submodules'
   
     - script: |
         sudo pip install cpp-coveralls
@@ -93,13 +99,16 @@ stages:
   
     steps:
     - checkout: self
-      submodules: recursive
+
+    - script: git submodule update --init lib/axtls lib/berkeley-db-1.xx lib/libffi
+      displayName: 'Checkout submodules'
   
     - script: |
         make $(MAKEOPTS) -C mpy-cross
         make $(MAKEOPTS) -C ports/unix deplibs
         make $(MAKEOPTS) -C ports/unix
         make $(MAKEOPTS) -C ports/unix test
+        (cd tests && MICROPY_CPYTHON3=python3 MICROPY_MICROPYTHON=../ports/unix/micropython ./run-perfbench.py 1000 1000)
       displayName: 'Build'
   
   - job: port_unix_nanbox
@@ -109,7 +118,9 @@ stages:
   
     steps:
     - checkout: self
-      submodules: recursive
+
+    - script: git submodule update --init lib/axtls lib/berkeley-db-1.xx lib/libffi
+      displayName: 'Checkout submodules'
   
     - script: |
         sudo dpkg --add-architecture i386
@@ -125,19 +136,39 @@ stages:
       displayName: 'Build'
   
   - job: port_unix_stackless
-    displayName: 'unix stackless port build and tests'
+    displayName: 'unix stackless port build and tests with clang'
     pool:
       vmImage: 'ubuntu-latest'
   
     steps:
     - checkout: self
-      submodules: recursive
+
+    - script: git submodule update --init lib/axtls lib/berkeley-db-1.xx lib/libffi
+      displayName: 'Checkout submodules'
+
+    - script: |
+        sudo apt-get install clang
+      displayName: 'Install dependencies'
   
     - script: |
-        make $(MAKEOPTS) -C mpy-cross
-        make $(MAKEOPTS) -C ports/unix deplibs
-        make $(MAKEOPTS) -C ports/unix CFLAGS_EXTRA="-DMICROPY_STACKLESS=1 -DMICROPY_STACKLESS_STRICT=1"
-        make $(MAKEOPTS) -C ports/unix test
+        make ${MAKEOPTS} -C mpy-cross CC=clang
+        make ${MAKEOPTS} -C ports/unix CC=clang CFLAGS_EXTRA="-DMICROPY_STACKLESS=1 -DMICROPY_STACKLESS_STRICT=1"
+        make ${MAKEOPTS} -C ports/unix CC=clang test
+      displayName: 'Build'
+
+  - job: port_unix_systrace
+    displayName: 'unix port with sys.settrace build and tests'
+    pool:
+      vmImage: 'ubuntu-latest'
+  
+    steps:
+    - checkout: self
+  
+    - script: |
+        make ${MAKEOPTS} -C mpy-cross
+        make ${MAKEOPTS} -C ports/unix MICROPY_PY_BTREE=0 MICROPY_PY_FFI=0 MICROPY_PY_USSL=0 CFLAGS_EXTRA="-DMICROPY_PY_SYS_SETTRACE=1" test
+        make ${MAKEOPTS} -C ports/unix clean
+        make ${MAKEOPTS} -C ports/unix MICROPY_PY_BTREE=0 MICROPY_PY_FFI=0 MICROPY_PY_USSL=0 CFLAGS_EXTRA="-DMICROPY_STACKLESS=1 -DMICROPY_STACKLESS_STRICT=1 -DMICROPY_PY_SYS_SETTRACE=1" test
       displayName: 'Build'
   
   - job: port_mingw
@@ -147,7 +178,6 @@ stages:
   
     steps:
     - checkout: self
-      submodules: recursive
   
     - script: |
         sudo apt-get install gcc-mingw-w64
@@ -158,6 +188,55 @@ stages:
         make $(MAKEOPTS) -C ports/windows CROSS_COMPILE=i686-w64-mingw32-
       displayName: 'Build'
   
+  - job: port_esp32
+    displayName: 'esp32 port build'
+    pool:
+      vmImage: 'ubuntu-latest'
+  
+    steps:
+    - checkout: self
+
+    - script: git submodule update --init lib/berkeley-db-1.xx
+      displayName: 'Checkout submodules'
+  
+    - script: |
+        sudo apt-get install python3-pip
+        sudo pip3 install pyparsing
+        wget https://dl.espressif.com/dl/xtensa-esp32-elf-linux64-1.22.0-80-g6c4433a-5.2.0.tar.gz
+        zcat xtensa-esp32-elf-linux64-1.22.0-80-g6c4433a-5.2.0.tar.gz | tar x
+        export PATH=$(pwd)/xtensa-esp32-elf/bin:$PATH
+        git clone https://github.com/espressif/esp-idf.git
+        git -C esp-idf checkout $(grep "ESPIDF_SUPHASH :=" ports/esp32/Makefile | cut -d " " -f 3)
+        git -C esp-idf submodule update --init components/json/cJSON components/esp32/lib components/esptool_py/esptool components/expat/expat components/lwip/lwip components/mbedtls/mbedtls components/micro-ecc/micro-ecc components/nghttp/nghttp2
+      displayName: 'Install dependencies and toolchain'
+  
+    - script: |
+        make ${MAKEOPTS} -C mpy-cross
+        make ${MAKEOPTS} -C ports/esp32 ESPIDF=$(pwd)/esp-idf
+      displayName: 'Build'
+  
+  - job: port_esp8266
+    displayName: 'esp8266 port build'
+    pool:
+      vmImage: 'ubuntu-latest'
+  
+    steps:
+    - checkout: self
+
+    - script: git submodule update --init lib/axtls lib/berkeley-db-1.xx
+      displayName: 'Checkout submodules'
+  
+    - script: |
+        wget https://github.com/jepler/esp-open-sdk/releases/download/2018-06-10/xtensa-lx106-elf-standalone.tar.gz
+        zcat xtensa-lx106-elf-standalone.tar.gz | tar x
+        export PATH=$(pwd)/xtensa-lx106-elf/bin:$PATH
+      displayName: 'Install dependencies and toolchain'
+  
+    - script: |
+        make ${MAKEOPTS} -C mpy-cross
+        make ${MAKEOPTS} -C ports/esp8266
+      displayName: 'Build'
+  
   - job: port_nrf
     displayName: 'nrf port build'
     pool:
@@ -165,8 +244,10 @@ stages:
   
     steps:
     - checkout: self
-      submodules: recursive
   
+    - script: git submodule update --init lib/nrfx
+      displayName: 'Checkout submodules'
+
     - script: |
         sudo apt-get install gcc-arm-none-eabi
         sudo apt-get install libnewlib-arm-none-eabi
@@ -184,7 +265,6 @@ stages:
   
     steps:
     - checkout: self
-      submodules: recursive
   
     - script: |
         sudo apt-get install gcc-arm-none-eabi
@@ -206,7 +286,6 @@ stages:
   
     steps:
     - checkout: self
-      submodules: recursive
   
     - script: |
         sudo apt-get install gcc-arm-none-eabi
@@ -218,6 +297,26 @@ stages:
         make ${MAKEOPTS} -C ports/cc3200 BTARGET=bootloader  BTYPE=release
       displayName: 'Build'
   
+  - job: port_samd
+    displayName: 'samd port build'
+    pool:
+      vmImage: 'ubuntu-latest'
+  
+    steps:
+    - checkout: self
+
+    - script: git submodule update --init lib/asf4 lib/tinyusb
+      displayName: 'Checkout submodules'
+  
+    - script: |
+        sudo apt-get install gcc-arm-none-eabi
+        sudo apt-get install libnewlib-arm-none-eabi
+      displayName: 'Install dependencies'
+  
+    - script: |
+        make ${MAKEOPTS} -C ports/samd
+      displayName: 'Build'
+  
   - job: port_teensy
     displayName: 'teensy port build'
     pool:
@@ -225,7 +324,6 @@ stages:
   
     steps:
     - checkout: self
-      submodules: recursive
   
     - script: |
         sudo apt-get install gcc-arm-none-eabi

From 1d951c30f197fdbc28f251e87435e4ed545b2295 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sat, 14 Sep 2019 20:32:06 +0200
Subject: [PATCH 3294/3533] Debug outputs

---
 azure-pipelines.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 85e2f8790e270..8d7f4b602c22d 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -205,6 +205,8 @@ stages:
         wget https://dl.espressif.com/dl/xtensa-esp32-elf-linux64-1.22.0-80-g6c4433a-5.2.0.tar.gz
         zcat xtensa-esp32-elf-linux64-1.22.0-80-g6c4433a-5.2.0.tar.gz | tar x
         export PATH=$(pwd)/xtensa-esp32-elf/bin:$PATH
+        printenv PATH
+        ls -al xtensa-esp32-elf/bin
         git clone https://github.com/espressif/esp-idf.git
         git -C esp-idf checkout $(grep "ESPIDF_SUPHASH :=" ports/esp32/Makefile | cut -d " " -f 3)
         git -C esp-idf submodule update --init components/json/cJSON components/esp32/lib components/esptool_py/esptool components/expat/expat components/lwip/lwip components/mbedtls/mbedtls components/micro-ecc/micro-ecc components/nghttp/nghttp2
@@ -230,6 +232,8 @@ stages:
         wget https://github.com/jepler/esp-open-sdk/releases/download/2018-06-10/xtensa-lx106-elf-standalone.tar.gz
         zcat xtensa-lx106-elf-standalone.tar.gz | tar x
         export PATH=$(pwd)/xtensa-lx106-elf/bin:$PATH
+        printenv PATH
+        ls -al xtensa-esp32-elf/bin
       displayName: 'Install dependencies and toolchain'
   
     - script: |

From b7aeb8617a5c7c239e16c7620997c0a001c22ebd Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sat, 14 Sep 2019 21:17:25 +0200
Subject: [PATCH 3295/3533] Try i386 for ESP

---
 azure-pipelines.yml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 8d7f4b602c22d..70f45b1a0e624 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -199,6 +199,12 @@ stages:
     - script: git submodule update --init lib/berkeley-db-1.xx
       displayName: 'Checkout submodules'
   
+    - script: |
+        sudo dpkg --add-architecture i386
+        sudo apt-get update
+        sudo apt-get install libc6:i386 libncurses5:i386 libstdc++6:i386
+      displayName: 'Install i386 arch'
+  
     - script: |
         sudo apt-get install python3-pip
         sudo pip3 install pyparsing
@@ -207,6 +213,7 @@ stages:
         export PATH=$(pwd)/xtensa-esp32-elf/bin:$PATH
         printenv PATH
         ls -al xtensa-esp32-elf/bin
+        file /home/vsts/work/1/s/xtensa-esp32-elf/bin/xtensa-esp32-elf-gcc
         git clone https://github.com/espressif/esp-idf.git
         git -C esp-idf checkout $(grep "ESPIDF_SUPHASH :=" ports/esp32/Makefile | cut -d " " -f 3)
         git -C esp-idf submodule update --init components/json/cJSON components/esp32/lib components/esptool_py/esptool components/expat/expat components/lwip/lwip components/mbedtls/mbedtls components/micro-ecc/micro-ecc components/nghttp/nghttp2
@@ -228,12 +235,19 @@ stages:
     - script: git submodule update --init lib/axtls lib/berkeley-db-1.xx
       displayName: 'Checkout submodules'
   
+    - script: |
+        sudo dpkg --add-architecture i386
+        sudo apt-get update
+        sudo apt-get install libc6:i386 libncurses5:i386 libstdc++6:i386
+      displayName: 'Install i386 arch'
+  
     - script: |
         wget https://github.com/jepler/esp-open-sdk/releases/download/2018-06-10/xtensa-lx106-elf-standalone.tar.gz
         zcat xtensa-lx106-elf-standalone.tar.gz | tar x
         export PATH=$(pwd)/xtensa-lx106-elf/bin:$PATH
         printenv PATH
         ls -al xtensa-esp32-elf/bin
+        file /home/vsts/work/1/s/xtensa-esp32-elf/bin/xtensa-esp32-elf-gcc
       displayName: 'Install dependencies and toolchain'
   
     - script: |

From 3942c240f111cadb4bb74984d8c2441d195e5550 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sat, 14 Sep 2019 21:22:41 +0200
Subject: [PATCH 3296/3533] More debug output

---
 azure-pipelines.yml | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 70f45b1a0e624..4511e1f3fc891 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -199,12 +199,6 @@ stages:
     - script: git submodule update --init lib/berkeley-db-1.xx
       displayName: 'Checkout submodules'
   
-    - script: |
-        sudo dpkg --add-architecture i386
-        sudo apt-get update
-        sudo apt-get install libc6:i386 libncurses5:i386 libstdc++6:i386
-      displayName: 'Install i386 arch'
-  
     - script: |
         sudo apt-get install python3-pip
         sudo pip3 install pyparsing
@@ -214,6 +208,7 @@ stages:
         printenv PATH
         ls -al xtensa-esp32-elf/bin
         file /home/vsts/work/1/s/xtensa-esp32-elf/bin/xtensa-esp32-elf-gcc
+        /home/vsts/work/1/s/xtensa-esp32-elf/bin/xtensa-esp32-elf-gcc --version
         git clone https://github.com/espressif/esp-idf.git
         git -C esp-idf checkout $(grep "ESPIDF_SUPHASH :=" ports/esp32/Makefile | cut -d " " -f 3)
         git -C esp-idf submodule update --init components/json/cJSON components/esp32/lib components/esptool_py/esptool components/expat/expat components/lwip/lwip components/mbedtls/mbedtls components/micro-ecc/micro-ecc components/nghttp/nghttp2
@@ -235,12 +230,6 @@ stages:
     - script: git submodule update --init lib/axtls lib/berkeley-db-1.xx
       displayName: 'Checkout submodules'
   
-    - script: |
-        sudo dpkg --add-architecture i386
-        sudo apt-get update
-        sudo apt-get install libc6:i386 libncurses5:i386 libstdc++6:i386
-      displayName: 'Install i386 arch'
-  
     - script: |
         wget https://github.com/jepler/esp-open-sdk/releases/download/2018-06-10/xtensa-lx106-elf-standalone.tar.gz
         zcat xtensa-lx106-elf-standalone.tar.gz | tar x
@@ -248,6 +237,7 @@ stages:
         printenv PATH
         ls -al xtensa-esp32-elf/bin
         file /home/vsts/work/1/s/xtensa-esp32-elf/bin/xtensa-esp32-elf-gcc
+        /home/vsts/work/1/s/xtensa-esp32-elf/bin/xtensa-esp32-elf-gcc --version
       displayName: 'Install dependencies and toolchain'
   
     - script: |

From aa1b59b2aaec9d2dc0f22fbac0c77c17c5ae2451 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sat, 14 Sep 2019 22:09:29 +0200
Subject: [PATCH 3297/3533] Even more debug output

---
 azure-pipelines.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 4511e1f3fc891..13155f5e80f66 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -209,6 +209,7 @@ stages:
         ls -al xtensa-esp32-elf/bin
         file /home/vsts/work/1/s/xtensa-esp32-elf/bin/xtensa-esp32-elf-gcc
         /home/vsts/work/1/s/xtensa-esp32-elf/bin/xtensa-esp32-elf-gcc --version
+        xtensa-esp32-elf-gcc --version
         git clone https://github.com/espressif/esp-idf.git
         git -C esp-idf checkout $(grep "ESPIDF_SUPHASH :=" ports/esp32/Makefile | cut -d " " -f 3)
         git -C esp-idf submodule update --init components/json/cJSON components/esp32/lib components/esptool_py/esptool components/expat/expat components/lwip/lwip components/mbedtls/mbedtls components/micro-ecc/micro-ecc components/nghttp/nghttp2
@@ -238,6 +239,7 @@ stages:
         ls -al xtensa-esp32-elf/bin
         file /home/vsts/work/1/s/xtensa-esp32-elf/bin/xtensa-esp32-elf-gcc
         /home/vsts/work/1/s/xtensa-esp32-elf/bin/xtensa-esp32-elf-gcc --version
+        xtensa-esp32-elf-gcc --version
       displayName: 'Install dependencies and toolchain'
   
     - script: |

From 0e54e39a4bd2539c004c2056033dc5486320b8e7 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sat, 14 Sep 2019 22:17:51 +0200
Subject: [PATCH 3298/3533] Move PATH setup to the main task

---
 azure-pipelines.yml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 13155f5e80f66..dac8764026ca6 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -204,18 +204,18 @@ stages:
         sudo pip3 install pyparsing
         wget https://dl.espressif.com/dl/xtensa-esp32-elf-linux64-1.22.0-80-g6c4433a-5.2.0.tar.gz
         zcat xtensa-esp32-elf-linux64-1.22.0-80-g6c4433a-5.2.0.tar.gz | tar x
-        export PATH=$(pwd)/xtensa-esp32-elf/bin:$PATH
-        printenv PATH
-        ls -al xtensa-esp32-elf/bin
-        file /home/vsts/work/1/s/xtensa-esp32-elf/bin/xtensa-esp32-elf-gcc
-        /home/vsts/work/1/s/xtensa-esp32-elf/bin/xtensa-esp32-elf-gcc --version
-        xtensa-esp32-elf-gcc --version
         git clone https://github.com/espressif/esp-idf.git
         git -C esp-idf checkout $(grep "ESPIDF_SUPHASH :=" ports/esp32/Makefile | cut -d " " -f 3)
         git -C esp-idf submodule update --init components/json/cJSON components/esp32/lib components/esptool_py/esptool components/expat/expat components/lwip/lwip components/mbedtls/mbedtls components/micro-ecc/micro-ecc components/nghttp/nghttp2
       displayName: 'Install dependencies and toolchain'
   
     - script: |
+        export PATH=$(pwd)/xtensa-esp32-elf/bin:$PATH
+        printenv PATH
+        ls -al xtensa-esp32-elf/bin
+        file /home/vsts/work/1/s/xtensa-esp32-elf/bin/xtensa-esp32-elf-gcc
+        /home/vsts/work/1/s/xtensa-esp32-elf/bin/xtensa-esp32-elf-gcc --version
+        xtensa-esp32-elf-gcc --version
         make ${MAKEOPTS} -C mpy-cross
         make ${MAKEOPTS} -C ports/esp32 ESPIDF=$(pwd)/esp-idf
       displayName: 'Build'
@@ -234,15 +234,15 @@ stages:
     - script: |
         wget https://github.com/jepler/esp-open-sdk/releases/download/2018-06-10/xtensa-lx106-elf-standalone.tar.gz
         zcat xtensa-lx106-elf-standalone.tar.gz | tar x
+      displayName: 'Install dependencies and toolchain'
+  
+    - script: |
         export PATH=$(pwd)/xtensa-lx106-elf/bin:$PATH
         printenv PATH
         ls -al xtensa-esp32-elf/bin
         file /home/vsts/work/1/s/xtensa-esp32-elf/bin/xtensa-esp32-elf-gcc
         /home/vsts/work/1/s/xtensa-esp32-elf/bin/xtensa-esp32-elf-gcc --version
         xtensa-esp32-elf-gcc --version
-      displayName: 'Install dependencies and toolchain'
-  
-    - script: |
         make ${MAKEOPTS} -C mpy-cross
         make ${MAKEOPTS} -C ports/esp8266
       displayName: 'Build'

From a6da984bd4841c559ab169b9ea48c02742c7fdf9 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sat, 14 Sep 2019 22:25:35 +0200
Subject: [PATCH 3299/3533] Install pyserial in Azure

---
 azure-pipelines.yml | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index dac8764026ca6..7bb0cd319fb6d 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -201,7 +201,7 @@ stages:
   
     - script: |
         sudo apt-get install python3-pip
-        sudo pip3 install pyparsing
+        sudo pip3 install pyparsing pyserial
         wget https://dl.espressif.com/dl/xtensa-esp32-elf-linux64-1.22.0-80-g6c4433a-5.2.0.tar.gz
         zcat xtensa-esp32-elf-linux64-1.22.0-80-g6c4433a-5.2.0.tar.gz | tar x
         git clone https://github.com/espressif/esp-idf.git
@@ -211,11 +211,6 @@ stages:
   
     - script: |
         export PATH=$(pwd)/xtensa-esp32-elf/bin:$PATH
-        printenv PATH
-        ls -al xtensa-esp32-elf/bin
-        file /home/vsts/work/1/s/xtensa-esp32-elf/bin/xtensa-esp32-elf-gcc
-        /home/vsts/work/1/s/xtensa-esp32-elf/bin/xtensa-esp32-elf-gcc --version
-        xtensa-esp32-elf-gcc --version
         make ${MAKEOPTS} -C mpy-cross
         make ${MAKEOPTS} -C ports/esp32 ESPIDF=$(pwd)/esp-idf
       displayName: 'Build'
@@ -232,17 +227,14 @@ stages:
       displayName: 'Checkout submodules'
   
     - script: |
+        sudo apt-get install python3-pip
+        sudo pip3 install pyserial
         wget https://github.com/jepler/esp-open-sdk/releases/download/2018-06-10/xtensa-lx106-elf-standalone.tar.gz
         zcat xtensa-lx106-elf-standalone.tar.gz | tar x
       displayName: 'Install dependencies and toolchain'
   
     - script: |
         export PATH=$(pwd)/xtensa-lx106-elf/bin:$PATH
-        printenv PATH
-        ls -al xtensa-esp32-elf/bin
-        file /home/vsts/work/1/s/xtensa-esp32-elf/bin/xtensa-esp32-elf-gcc
-        /home/vsts/work/1/s/xtensa-esp32-elf/bin/xtensa-esp32-elf-gcc --version
-        xtensa-esp32-elf-gcc --version
         make ${MAKEOPTS} -C mpy-cross
         make ${MAKEOPTS} -C ports/esp8266
       displayName: 'Build'

From 93b46791124cfd5d1610b959ea407d3fb3347065 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sat, 14 Sep 2019 22:34:31 +0200
Subject: [PATCH 3300/3533] Try switching to python2 for esptool

---
 azure-pipelines.yml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 7bb0cd319fb6d..f21a34c95e0d2 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -200,8 +200,9 @@ stages:
       displayName: 'Checkout submodules'
   
     - script: |
-        sudo apt-get install python3-pip
-        sudo pip3 install pyparsing pyserial
+        sudo apt-get install python-pip python3-pip
+        sudo pip3 install pyparsing
+        sudo pip install pyserial
         wget https://dl.espressif.com/dl/xtensa-esp32-elf-linux64-1.22.0-80-g6c4433a-5.2.0.tar.gz
         zcat xtensa-esp32-elf-linux64-1.22.0-80-g6c4433a-5.2.0.tar.gz | tar x
         git clone https://github.com/espressif/esp-idf.git
@@ -227,8 +228,9 @@ stages:
       displayName: 'Checkout submodules'
   
     - script: |
-        sudo apt-get install python3-pip
-        sudo pip3 install pyserial
+        sudo apt-get install python-pip python3-pip
+        sudo pip3 install pyparsing
+        sudo pip install pyserial
         wget https://github.com/jepler/esp-open-sdk/releases/download/2018-06-10/xtensa-lx106-elf-standalone.tar.gz
         zcat xtensa-lx106-elf-standalone.tar.gz | tar x
       displayName: 'Install dependencies and toolchain'

From 4e561c125ac105096b90d0276990f7ee9c0ddd9e Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sat, 14 Sep 2019 22:53:09 +0200
Subject: [PATCH 3301/3533] Update build instructions to the latest mp

---
 azure-pipelines.yml          | 1 +
 ports/gprs_a9/main.c         | 2 +-
 ports/gprs_a9/mpconfigport.h | 2 ++
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index f21a34c95e0d2..fea7c2db1ac7f 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -351,6 +351,7 @@ stages:
       displayName: 'Install dependencies'
   
     - script: |
+        make ${MAKEOPTS} -C mpy-cross
         cd ports/gprs_a9
         make
       displayName: 'Build'
diff --git a/ports/gprs_a9/main.c b/ports/gprs_a9/main.c
index ee6a27b61ffe3..ef8c66aeaaf45 100644
--- a/ports/gprs_a9/main.c
+++ b/ports/gprs_a9/main.c
@@ -97,7 +97,7 @@ void do_str(const char *src, mp_parse_input_kind_t input_kind) {
         mp_lexer_t *lex = mp_lexer_new_from_str_len(MP_QSTR__lt_stdin_gt_, src, strlen(src), 0);
         qstr source_name = lex->source_name;
         mp_parse_tree_t parse_tree = mp_parse(lex, input_kind);
-        mp_obj_t module_fun = mp_compile(&parse_tree, source_name, MP_EMIT_OPT_NONE, true);
+        mp_obj_t module_fun = mp_compile(&parse_tree, source_name, true);
         mp_call_function_0(module_fun);
         nlr_pop();
     } else {
diff --git a/ports/gprs_a9/mpconfigport.h b/ports/gprs_a9/mpconfigport.h
index 0653d89ff8754..d22fd26e633cc 100644
--- a/ports/gprs_a9/mpconfigport.h
+++ b/ports/gprs_a9/mpconfigport.h
@@ -287,3 +287,5 @@ typedef long mp_off_t;
 extern const struct _mp_print_t mp_debug_print;
 #endif
 
+#define mp_hal_stdio_poll(poll_flags) (0) // not implemented
+

From 93252ab573ad5bd74f35cbcba0ae02a30b720fca Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sat, 14 Sep 2019 23:12:28 +0200
Subject: [PATCH 3302/3533] Custom submodule checkout

---
 azure-pipelines.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index fea7c2db1ac7f..bf6351bcb91ad 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -345,8 +345,10 @@ stages:
   
     steps:
     - checkout: self
-      submodules: recursive
   
+    - script: git submodule update --init lib/axtls lib/GPRS_C_SDK lib/csdtk42-linux
+      displayName: 'Checkout submodules'
+
     - script: sudo apt-get install build-essential gcc-multilib g++-multilib libzip-dev zlib1g lib32z1
       displayName: 'Install dependencies'
   

From 5700c03bf1e343c5603a06afda7c14397c6a291c Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Mon, 16 Sep 2019 21:51:45 +0200
Subject: [PATCH 3303/3533] Add recursive for gprs_a9

---
 azure-pipelines.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index bf6351bcb91ad..cbaead21140f8 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -346,7 +346,7 @@ stages:
     steps:
     - checkout: self
   
-    - script: git submodule update --init lib/axtls lib/GPRS_C_SDK lib/csdtk42-linux
+    - script: git submodule update --init --recursive lib/axtls lib/GPRS_C_SDK lib/csdtk42-linux
       displayName: 'Checkout submodules'
 
     - script: sudo apt-get install build-essential gcc-multilib g++-multilib libzip-dev zlib1g lib32z1

From 87c56026cb147eef08dc4a493c55119f3e7b8e11 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Mon, 16 Sep 2019 23:05:54 +0200
Subject: [PATCH 3304/3533] Update README

[skip ci]
---
 ports/gprs_a9/README.md | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/ports/gprs_a9/README.md b/ports/gprs_a9/README.md
index 9a6f48586821c..6105db49eeead 100644
--- a/ports/gprs_a9/README.md
+++ b/ports/gprs_a9/README.md
@@ -19,10 +19,15 @@ Follow these steps to build from sources:
    ```bash
    git clone git@github.com:pulkin/micropython.git --recursive
    ```
+   or (smaller download size):
+   ```bash
+   git clone git@github.com:pulkin/micropython.git
+   git submodule update --init --recursive lib/axtls lib/GPRS_C_SDK lib/csdtk42-linux
+   ```
 3. Make
    ```bash
    cd micropython
-   # make -C mpy-cross (not required for now)
+   make -C mpy-cross
    cd ports/gprs_a9
    make
    ```

From 87f326cee2bfa93605e64dd338ecd5022be54657 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Mon, 16 Sep 2019 23:21:46 +0200
Subject: [PATCH 3305/3533] Collect esp8266 build

---
 azure-pipelines.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index cbaead21140f8..458c00f77e64a 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -239,7 +239,14 @@ stages:
         export PATH=$(pwd)/xtensa-lx106-elf/bin:$PATH
         make ${MAKEOPTS} -C mpy-cross
         make ${MAKEOPTS} -C ports/esp8266
+        ls ports/esp8266
       displayName: 'Build'
+
+    - task: PublishPipelineArtifact@1
+      displayName: 'Collect the build'
+      inputs:
+        targetPath: '$(Build.Repository.LocalPath)/ports/esp8266/build'
+        artifact: 'build_esp8266'
   
   - job: port_nrf
     displayName: 'nrf port build'

From 3538da0ea745937f6f70a81a4ae485ab8e662e93 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Mon, 16 Sep 2019 23:29:27 +0200
Subject: [PATCH 3306/3533] Debug output

---
 azure-pipelines.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 458c00f77e64a..29896a3a7af56 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -239,7 +239,7 @@ stages:
         export PATH=$(pwd)/xtensa-lx106-elf/bin:$PATH
         make ${MAKEOPTS} -C mpy-cross
         make ${MAKEOPTS} -C ports/esp8266
-        ls ports/esp8266
+        ls ports/esp8266/build
       displayName: 'Build'
 
     - task: PublishPipelineArtifact@1

From dad96d39b42438339e8ae2fbff4a869c2d3d57ec Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Mon, 16 Sep 2019 23:42:58 +0200
Subject: [PATCH 3307/3533] Publish esp8266

---
 azure-pipelines.yml | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 29896a3a7af56..4b4f266f8f510 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -239,9 +239,14 @@ stages:
         export PATH=$(pwd)/xtensa-lx106-elf/bin:$PATH
         make ${MAKEOPTS} -C mpy-cross
         make ${MAKEOPTS} -C ports/esp8266
-        ls ports/esp8266/build
       displayName: 'Build'
 
+    - script: |
+        cd ports/esp8266/build
+        rm !(*.bin)
+        cd -
+      displayName: 'Cleanup build before publishing'
+
     - task: PublishPipelineArtifact@1
       displayName: 'Collect the build'
       inputs:
@@ -387,6 +392,8 @@ stages:
     - script: |
         mv $(Build.BinariesDirectory)/build_gprs_a9/*.lod $(Build.BinariesDirectory)
         rm -rf $(Build.BinariesDirectory)/build_gprs_a9
+        mv $(Build.BinariesDirectory)/build_esp8266/*.bin $(Build.BinariesDirectory)
+        rm -rf $(Build.BinariesDirectory)/build_esp8266
       displayName: 'Sort and filter binaries'
 
     - task: GitHubRelease@0
@@ -413,6 +420,13 @@ stages:
             Firmware files:
             - [firmware_debug_full.lod](https://github.com/$(GITHUB_MICROPY_REPO)/releases/download/$(GITHUB_RELEASE_TAG)/firmware_debug_full.lod)
             - [firmware_debug_flash.lod](https://github.com/$(GITHUB_MICROPY_REPO)/releases/download/$(GITHUB_RELEASE_TAG)/firmware_debug_flash.lod)
+
+          - esp8266
+
+            Burn instructions: use [esptool](https://github.com/espressif/esptool)
+
+            Firmware files:
+            - [firmware_combined.bin](https://github.com/$(GITHUB_MICROPY_REPO)/releases/download/$(GITHUB_RELEASE_TAG)/firmware_combined.bin)
         assets: '$(Build.BinariesDirectory)/*'
         assetUploadMode: 'replace'
         isPreRelease: true

From 485a62b3764297e0f2cfb5554f801d118c42921c Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Mon, 16 Sep 2019 23:49:20 +0200
Subject: [PATCH 3308/3533] Fix cleanup script

---
 azure-pipelines.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 4b4f266f8f510..f3fac94abaf72 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -243,7 +243,7 @@ stages:
 
     - script: |
         cd ports/esp8266/build
-        rm !(*.bin)
+        find . \! -name '*.bin' -delete
         cd -
       displayName: 'Cleanup build before publishing'
 

From 5449a673f71135baaf825ff32a9b748fbb832c98 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Tue, 17 Sep 2019 00:00:46 +0200
Subject: [PATCH 3309/3533] Fix firmware name

---
 azure-pipelines.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index f3fac94abaf72..bae591f345f2d 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -413,7 +413,7 @@ stages:
           Firmware files
           --------------
 
-          - gprs_a9
+          - **gprs_a9**
 
             Burn instructions: use [cooltools](https://ai-thinker-open.github.io/GPRS_C_SDK_DOC/en/c-sdk/burn-debug.html)
 
@@ -421,12 +421,12 @@ stages:
             - [firmware_debug_full.lod](https://github.com/$(GITHUB_MICROPY_REPO)/releases/download/$(GITHUB_RELEASE_TAG)/firmware_debug_full.lod)
             - [firmware_debug_flash.lod](https://github.com/$(GITHUB_MICROPY_REPO)/releases/download/$(GITHUB_RELEASE_TAG)/firmware_debug_flash.lod)
 
-          - esp8266
+          - **esp8266**
 
             Burn instructions: use [esptool](https://github.com/espressif/esptool)
 
             Firmware files:
-            - [firmware_combined.bin](https://github.com/$(GITHUB_MICROPY_REPO)/releases/download/$(GITHUB_RELEASE_TAG)/firmware_combined.bin)
+            - [firmware_combined.bin](https://github.com/$(GITHUB_MICROPY_REPO)/releases/download/$(GITHUB_RELEASE_TAG)/firmware-combined.bin)
         assets: '$(Build.BinariesDirectory)/*'
         assetUploadMode: 'replace'
         isPreRelease: true

From caeb4b7071d168e0731488e747d17e0d07e56992 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Thu, 19 Sep 2019 19:33:49 +0200
Subject: [PATCH 3310/3533] Propagate changes from travis to azure

---
 azure-pipelines.yml | 38 ++++++++++++++++++++++++++++++++++----
 1 file changed, 34 insertions(+), 4 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index bae591f345f2d..8f43ef43c6d77 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -188,8 +188,8 @@ stages:
         make $(MAKEOPTS) -C ports/windows CROSS_COMPILE=i686-w64-mingw32-
       displayName: 'Build'
   
-  - job: port_esp32
-    displayName: 'esp32 port build'
+  - job: port_esp32_idfv3
+    displayName: 'esp32 port build IDF v3'
     pool:
       vmImage: 'ubuntu-latest'
   
@@ -201,17 +201,47 @@ stages:
   
     - script: |
         sudo apt-get install python-pip python3-pip
-        sudo pip3 install pyparsing
+        sudo pip3 install 'pyparsing<2.4'
         sudo pip install pyserial
         wget https://dl.espressif.com/dl/xtensa-esp32-elf-linux64-1.22.0-80-g6c4433a-5.2.0.tar.gz
         zcat xtensa-esp32-elf-linux64-1.22.0-80-g6c4433a-5.2.0.tar.gz | tar x
         git clone https://github.com/espressif/esp-idf.git
-        git -C esp-idf checkout $(grep "ESPIDF_SUPHASH :=" ports/esp32/Makefile | cut -d " " -f 3)
+        git -C esp-idf checkout $(grep "ESPIDF_SUPHASH_V3 :=" ports/esp32/Makefile | cut -d " " -f 3)
         git -C esp-idf submodule update --init components/json/cJSON components/esp32/lib components/esptool_py/esptool components/expat/expat components/lwip/lwip components/mbedtls/mbedtls components/micro-ecc/micro-ecc components/nghttp/nghttp2
       displayName: 'Install dependencies and toolchain'
   
     - script: |
         export PATH=$(pwd)/xtensa-esp32-elf/bin:$PATH
+        export IDF_PATH=$(pwd)/esp-idf
+        make ${MAKEOPTS} -C mpy-cross
+        make ${MAKEOPTS} -C ports/esp32 ESPIDF=$(pwd)/esp-idf
+      displayName: 'Build'
+  
+  - job: port_esp32_idfv4
+    displayName: 'esp32 port build IDF v4'
+    pool:
+      vmImage: 'ubuntu-latest'
+  
+    steps:
+    - checkout: self
+
+    - script: git submodule update --init lib/berkeley-db-1.xx
+      displayName: 'Checkout submodules'
+  
+    - script: |
+        sudo apt-get install python-pip python3-pip
+        sudo pip3 install 'pyparsing<2.4'
+        sudo pip install pyserial
+        wget https://dl.espressif.com/dl/xtensa-esp32-elf-linux64-1.22.0-80-g6c4433a-5.2.0.tar.gz
+        zcat xtensa-esp32-elf-linux64-1.22.0-80-g6c4433a-5.2.0.tar.gz | tar x
+        git clone https://github.com/espressif/esp-idf.git
+        - git -C esp-idf checkout $(grep "ESPIDF_SUPHASH_V4 :=" ports/esp32/Makefile | cut -d " " -f 3)
+        - git -C esp-idf submodule update --init components/esp_wifi/lib_esp32 components/esptool_py/esptool components/lwip/lwip components/mbedtls/mbedtls
+      displayName: 'Install dependencies and toolchain'
+  
+    - script: |
+        export PATH=$(pwd)/xtensa-esp32-elf/bin:$PATH
+        export IDF_PATH=$(pwd)/esp-idf
         make ${MAKEOPTS} -C mpy-cross
         make ${MAKEOPTS} -C ports/esp32 ESPIDF=$(pwd)/esp-idf
       displayName: 'Build'

From c893c950307089323e9b72447403a196915d8589 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Thu, 19 Sep 2019 21:25:39 +0200
Subject: [PATCH 3311/3533] Fix typo in script

---
 azure-pipelines.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 8f43ef43c6d77..006999dec8e26 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -235,8 +235,8 @@ stages:
         wget https://dl.espressif.com/dl/xtensa-esp32-elf-linux64-1.22.0-80-g6c4433a-5.2.0.tar.gz
         zcat xtensa-esp32-elf-linux64-1.22.0-80-g6c4433a-5.2.0.tar.gz | tar x
         git clone https://github.com/espressif/esp-idf.git
-        - git -C esp-idf checkout $(grep "ESPIDF_SUPHASH_V4 :=" ports/esp32/Makefile | cut -d " " -f 3)
-        - git -C esp-idf submodule update --init components/esp_wifi/lib_esp32 components/esptool_py/esptool components/lwip/lwip components/mbedtls/mbedtls
+        git -C esp-idf checkout $(grep "ESPIDF_SUPHASH_V4 :=" ports/esp32/Makefile | cut -d " " -f 3)
+        git -C esp-idf submodule update --init components/esp_wifi/lib_esp32 components/esptool_py/esptool components/lwip/lwip components/mbedtls/mbedtls
       displayName: 'Install dependencies and toolchain'
   
     - script: |

From fdbcad8f4d9f854a3a984de593c978d5ad68585b Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sun, 27 Oct 2019 18:48:00 +0100
Subject: [PATCH 3312/3533] Use proper IOError in sockets

---
 ports/gprs_a9/modusocket.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/gprs_a9/modusocket.c b/ports/gprs_a9/modusocket.c
index f6b33c97fe490..b37b9d39860c4 100644
--- a/ports/gprs_a9/modusocket.c
+++ b/ports/gprs_a9/modusocket.c
@@ -178,7 +178,7 @@ mp_obj_t socket_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw,
 
     self->fd = LWIP_SOCKET(self->domain, self->type, self->proto);
     if (self->fd < 0) {
-        mp_raise_NotImplementedError("Failed to create the socket but the error is unknown");
+        mp_raise_OSError(EMFILE);
     }
     num_sockets_open ++;
     _socket_settimeout(self, UINT64_MAX);

From 5314ae4ab9f0c518244e650eb43eaf5a9603f53d Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sun, 27 Oct 2019 18:48:43 +0100
Subject: [PATCH 3313/3533] Fix sockets

---
 ports/gprs_a9/modusocket.c | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/ports/gprs_a9/modusocket.c b/ports/gprs_a9/modusocket.c
index b37b9d39860c4..6125d9e978374 100644
--- a/ports/gprs_a9/modusocket.c
+++ b/ports/gprs_a9/modusocket.c
@@ -310,12 +310,30 @@ STATIC mp_uint_t _socket_read_data(mp_obj_t self_in, void *buf, size_t size, str
         return 0;
     }
 
+    struct fd_set fds;
+    struct timeval timeout = {12, 0};
+    FD_ZERO(&fds);
+    FD_SET(sock->fd, &fds);
+
     // XXX Would be nicer to use RTC to handle timeouts
     for (int i = 0; i <= sock->retries; ++i) {
 
-        MP_THREAD_GIL_EXIT();
-        int r = LWIP_RECVFROM(sock->fd, buf, size, 0, from, from_len);
-        MP_THREAD_GIL_ENTER();
+        int r = -1;
+        switch (LWIP_SELECT(sock->fd + 1, &fds, NULL, NULL, &timeout)) {
+            case -1:
+                // An error is set already, proceed to raising it
+                break;
+            case 0:
+                continue;
+            default:
+                if (FD_ISSET(sock->fd, &fds)) {
+                    MP_THREAD_GIL_EXIT();
+                    r = LWIP_RECVFROM(sock->fd, buf, size, 0, from, from_len);
+                    MP_THREAD_GIL_ENTER();
+                } else {
+                    continue;
+                }
+        }
 
         if (r == 0) sock->peer_closed = true;
         if (r >= 0) return r;

From 68c544a69c8695a773b4dbffcb4ddcccee0390e8 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sun, 27 Oct 2019 19:53:55 +0100
Subject: [PATCH 3314/3533] Try previous azure image

---
 azure-pipelines.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 006999dec8e26..5dfd180d6c169 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -383,7 +383,7 @@ stages:
   - job: port_gprs_a9
     displayName: 'gprs_a9 build'
     pool:
-      vmImage: 'ubuntu-latest'
+      vmImage: 'ubuntu-16.04'
   
     steps:
     - checkout: self

From de8d33c64e93a0376b9112ecb9c42f048a740941 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sun, 27 Oct 2019 20:04:58 +0100
Subject: [PATCH 3315/3533] Try updating first

---
 azure-pipelines.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 5dfd180d6c169..b388cb1f6e1f9 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -391,7 +391,9 @@ stages:
     - script: git submodule update --init --recursive lib/axtls lib/GPRS_C_SDK lib/csdtk42-linux
       displayName: 'Checkout submodules'
 
-    - script: sudo apt-get install build-essential gcc-multilib g++-multilib libzip-dev zlib1g lib32z1
+    - script: |
+        sudo apt-get update
+        sudo apt-get install build-essential gcc-multilib g++-multilib libzip-dev zlib1g lib32z1
       displayName: 'Install dependencies'
   
     - script: |

From db141d4fb6d8162760b078b6ee4ea1b4d8b787a3 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sun, 27 Oct 2019 20:12:33 +0100
Subject: [PATCH 3316/3533] Revert to latest build

---
 azure-pipelines.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index b388cb1f6e1f9..fc52f975d0aac 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -383,7 +383,7 @@ stages:
   - job: port_gprs_a9
     displayName: 'gprs_a9 build'
     pool:
-      vmImage: 'ubuntu-16.04'
+      vmImage: 'ubuntu-latest'
   
     steps:
     - checkout: self

From a3065532667befb90a920f34409e59cc9fb1e50e Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sun, 27 Oct 2019 20:47:17 +0100
Subject: [PATCH 3317/3533] Update port status in README

---
 ports/gprs_a9/README.md | 30 +++++++++++++++++++++++++++---
 1 file changed, 27 insertions(+), 3 deletions(-)

diff --git a/ports/gprs_a9/README.md b/ports/gprs_a9/README.md
index 6105db49eeead..40a782358af32 100644
--- a/ports/gprs_a9/README.md
+++ b/ports/gprs_a9/README.md
@@ -68,7 +68,8 @@ ampy --port /dev/ttyUSB1 put frozentest.py
 4. [`gps`](#gps): everything related to GPS and assisted positioning
 5. [`machine`](#machine): hardware and power control
 6. [`i2c`](#i2c): i2c implementation
-7. [Notes](#Misc)
+7. [Port TODO](#TODO)
+8. [Notes](#Notes)
 
 ### `cellular`
 
@@ -592,9 +593,32 @@ I2C_DEFAULT_TIME_OUT
 
   **Raises** `I2CError` (see error message for more details)
 
-## Misc ##
+## TODO ##
+
+Port SDK:
+
+[x] GPIO: `machine.Pin`
+[ ] ADC: `machine.ADC`
+[ ] UART: `machine.UART` (software UART?)
+[x] Cellular misc (IMEI, ICCID, ...): `cellular`
+[x] GPS: `gps`
+[x] I2C: `i2c`
+[ ] SPI: `machine.SPI`
+[x] time: `utime`
+[x] File system
+[x] GPRS, DNS: `cellular`, `socket`, `ssl`
+[x] Power: `machine`
+[ ] Calls: `cellular`
+[x] SMS: `cellular.SMS`
+
+Misc:
+
+- move `i2c` to `machine`
+- move all SMS-related functions to `cellular.SMS`
+- add assisted location services to `gps`
+
+## Notes ##
 
 * The module halts on fatal errors; create an empty file `.reboot_on_fatal` if a reboot is desired
 * The size of micropython heap is roughly 512 Kb. 400k can be realistically allocated right after hard reset.
-* ~~SSL~~ sockets are currently unstable and need further investigation (the module halts after around 10 consequitive connections).
 

From dcfff5683edda77e7a3ab0e136afb254e6393ab1 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sun, 27 Oct 2019 20:49:22 +0100
Subject: [PATCH 3318/3533] Fix md list

[ci skip]
---
 ports/gprs_a9/README.md | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/ports/gprs_a9/README.md b/ports/gprs_a9/README.md
index 40a782358af32..44b3c0b9286d0 100644
--- a/ports/gprs_a9/README.md
+++ b/ports/gprs_a9/README.md
@@ -597,19 +597,19 @@ I2C_DEFAULT_TIME_OUT
 
 Port SDK:
 
-[x] GPIO: `machine.Pin`
-[ ] ADC: `machine.ADC`
-[ ] UART: `machine.UART` (software UART?)
-[x] Cellular misc (IMEI, ICCID, ...): `cellular`
-[x] GPS: `gps`
-[x] I2C: `i2c`
-[ ] SPI: `machine.SPI`
-[x] time: `utime`
-[x] File system
-[x] GPRS, DNS: `cellular`, `socket`, `ssl`
-[x] Power: `machine`
-[ ] Calls: `cellular`
-[x] SMS: `cellular.SMS`
+- [x] GPIO: `machine.Pin`
+- [ ] ADC: `machine.ADC`
+- [ ] UART: `machine.UART` (software UART?)
+- [x] Cellular misc (IMEI, ICCID, ...): `cellular`
+- [x] GPS: `gps`
+- [x] I2C: `i2c`
+- [ ] SPI: `machine.SPI`
+- [x] time: `utime`
+- [x] File system
+- [x] GPRS, DNS: `cellular`, `socket`, `ssl`
+- [x] Power: `machine`
+- [ ] Calls: `cellular`
+- [x] SMS: `cellular.SMS`
 
 Misc:
 

From 5107100da0a612562013e1150690dd9969993d01 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sun, 27 Oct 2019 22:27:38 +0100
Subject: [PATCH 3319/3533] Switch to conventional socket.getaddrinfo return
 value

---
 ports/gprs_a9/README.md     | 1 +
 ports/gprs_a9/frozentest.py | 2 +-
 ports/gprs_a9/modusocket.c  | 3 ++-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/ports/gprs_a9/README.md b/ports/gprs_a9/README.md
index 44b3c0b9286d0..20f2fda269e35 100644
--- a/ports/gprs_a9/README.md
+++ b/ports/gprs_a9/README.md
@@ -616,6 +616,7 @@ Misc:
 - move `i2c` to `machine`
 - move all SMS-related functions to `cellular.SMS`
 - add assisted location services to `gps`
+- get rid of workarounds in `socket.getaddrinfo`
 
 ## Notes ##
 
diff --git a/ports/gprs_a9/frozentest.py b/ports/gprs_a9/frozentest.py
index 0799de6a1af61..61f5ad7973f62 100644
--- a/ports/gprs_a9/frozentest.py
+++ b/ports/gprs_a9/frozentest.py
@@ -266,7 +266,7 @@
 
     host = "httpstat.us"
     port = 80
-    host_ai = sock.getaddrinfo(host, port)
+    host_ai = sock.getaddrinfo(host, port)[0]
     print("Addrinfo:", host_ai)
     assert host_ai[:3] == (sock.AF_INET, sock.SOCK_STREAM, sock.IPPROTO_TCP)
     assert host_ai[3] == host
diff --git a/ports/gprs_a9/modusocket.c b/ports/gprs_a9/modusocket.c
index 6125d9e978374..dc7e139aeb8e0 100644
--- a/ports/gprs_a9/modusocket.c
+++ b/ports/gprs_a9/modusocket.c
@@ -704,7 +704,8 @@ STATIC mp_obj_t getaddrinfo(size_t n_args, const mp_obj_t *pos_args, mp_map_t *k
     };
     addrinfo_objs[4] = mp_obj_new_tuple(2, inaddr_objs);
 
-    return mp_obj_new_tuple(5, addrinfo_objs);
+    mp_obj_t tuple = mp_obj_new_tuple(5, addrinfo_objs);
+    return mp_obj_new_list(1, &tuple);
 }
 
 STATIC MP_DEFINE_CONST_FUN_OBJ_KW(getaddrinfo_obj, 2, getaddrinfo);

From 0fbe8a79451f699ac8d33459b19479907a122d94 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sun, 27 Oct 2019 22:29:23 +0100
Subject: [PATCH 3320/3533] Update README TODO

[skip ci]
---
 ports/gprs_a9/README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/gprs_a9/README.md b/ports/gprs_a9/README.md
index 20f2fda269e35..9401fcafd0c0a 100644
--- a/ports/gprs_a9/README.md
+++ b/ports/gprs_a9/README.md
@@ -617,6 +617,7 @@ Misc:
 - move all SMS-related functions to `cellular.SMS`
 - add assisted location services to `gps`
 - get rid of workarounds in `socket.getaddrinfo`
+- allow interrupts during `time.sleep`
 
 ## Notes ##
 

From 10761a39c2c193f42d7b03dff5656a270740f36c Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sun, 27 Oct 2019 23:33:52 +0100
Subject: [PATCH 3321/3533] Update README TODO

[skip ci]
---
 ports/gprs_a9/README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/gprs_a9/README.md b/ports/gprs_a9/README.md
index 9401fcafd0c0a..4d3795765750f 100644
--- a/ports/gprs_a9/README.md
+++ b/ports/gprs_a9/README.md
@@ -599,6 +599,7 @@ Port SDK:
 
 - [x] GPIO: `machine.Pin`
 - [ ] ADC: `machine.ADC`
+- [ ] PWM: `machine.PWM`
 - [ ] UART: `machine.UART` (software UART?)
 - [x] Cellular misc (IMEI, ICCID, ...): `cellular`
 - [x] GPS: `gps`

From 2a842121100588db4188aae7b66e53cbf045295a Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Mon, 28 Oct 2019 23:23:00 +0100
Subject: [PATCH 3322/3533] Removed cellular exception classes for simplicity

---
 ports/gprs_a9/README.md     | 26 +++++------
 ports/gprs_a9/modcellular.c | 88 +++++++++++++------------------------
 ports/gprs_a9/modcellular.h |  7 +--
 3 files changed, 41 insertions(+), 80 deletions(-)

diff --git a/ports/gprs_a9/README.md b/ports/gprs_a9/README.md
index 4d3795765750f..02729a17bf07c 100644
--- a/ports/gprs_a9/README.md
+++ b/ports/gprs_a9/README.md
@@ -95,23 +95,17 @@ The purpose of this module is to have an access to high-level networking (SMS, G
     
       Sends the message.
 
-      **Raises**: `CelularRegistrationError` if not registered on the network or `SMSError` if failed to set up/send SMS.
+      **Raises**: `CelularError` if not registered on the network or failed to set up/send SMS.
 
     * `withdraw()`
 
       Withdraws SMS from SIM storage. Resets status and index of this object to zero.
 
-      **Raises**: `SMSError` if failed to withdraw.
+      **Raises**: `CellularError` if failed to withdraw.
 
 #### Exception classes ####
 
 * `CellularError(message)`
-* `CellularRegistrationError(message)`
-* `SMSError(message)`
-* `NoSIMError(message)`
-* `CellularAttachmentError(message)`
-* `CellularActivationError(message)`
-* `NetworkError(message)`
 
 #### Methods ####
 
@@ -129,7 +123,7 @@ The purpose of this module is to have an access to high-level networking (SMS, G
 
   **Returns**: a string with ICCID number.
 
-  **Raises**: `NoSIMError` if no ICCID number can be retrieved.
+  **Raises**: `CellularError` if no ICCID number can be retrieved.
 
 * `get_imsi()`
 
@@ -137,7 +131,7 @@ The purpose of this module is to have an access to high-level networking (SMS, G
 
   **Returns**: a string with IMSI number.
 
-  **Raises**: `NoSIMError` if no IMSI number can be retrieved.
+  **Raises**: `CellularError` if no IMSI number can be retrieved.
 
 * `network_status_changed()`
 
@@ -177,7 +171,7 @@ The purpose of this module is to have an access to high-level networking (SMS, G
 
   **Returns**: True if roaming.
 
-  **Raises** `CellularRegistrationError` if not registered on the network.
+  **Raises** `CellularError` if not registered on the network.
 
 * `get_signal_quality()`
 
@@ -200,7 +194,7 @@ The purpose of this module is to have an access to high-level networking (SMS, G
   
   **Returns**: a list of SMS messages.
 
-  **Raises**: `CellularRegistrationError` if not registered on the network. This is because network registration process interfers with most other SIM-related operations.
+  **Raises**: `CellularError` if not registered on the network. This is because network registration process interfers with most other SIM-related operations.
 
 ##### GPRS #####
 
@@ -208,7 +202,7 @@ The purpose of this module is to have an access to high-level networking (SMS, G
 
   Attaches to the network. This is required for activating the GPRS context. If already attached, does nothing.
 
-  **Raises**: `CellularRegistrationError` if not registered on the network or `CellularAttachmentError` if the attachment process failed at any stage.
+  **Raises**: `CellularError` if not registered on the network or attachment process failed at any stage.
 
   **Note**: There may be no need to run this as, after a hard reset, the module attempts to attach automatically.
 
@@ -218,7 +212,7 @@ The purpose of this module is to have an access to high-level networking (SMS, G
 
   Detaches from the network. Does nothing if already detached.
 
-  **Raises**: `CellularRegistrationError` if not registered on the network or `CellularAttachmentError` if the detachment process failed at any stage.
+  **Raises**: `CellularError` if not registered on the network or the detachment process failed at any stage.
 
   **TODO**: Consider getting rid of this function.
 
@@ -232,7 +226,7 @@ The purpose of this module is to have an access to high-level networking (SMS, G
     * user (str): username;
     * pass (str): password;
 
-  **Raises**: `CellularRegistrationError` if not registered on the network or `CellularActivationError` if the activation process failed at any stage.
+  **Raises**: `CellularError` if not registered on the network or the activation process failed at any stage.
 
   **Note**: there is no way to check whether the credentials supplied are valid.
 
@@ -240,7 +234,7 @@ The purpose of this module is to have an access to high-level networking (SMS, G
 
   Deactivates the GPRS context. Does nothing if already deactivated.
 
-  **Raises**: `CellularRegistrationError` if not registered on the network or `CellularActivationError` if the deactivation process failed at any stage.
+  **Raises**: `CellularError` if not registered on the network or the deactivation process failed at any stage.
 
 ### `usocket` ###
 
diff --git a/ports/gprs_a9/modcellular.c b/ports/gprs_a9/modcellular.c
index d2c8fedc43840..12a2a724c0042 100644
--- a/ports/gprs_a9/modcellular.c
+++ b/ports/gprs_a9/modcellular.c
@@ -98,36 +98,11 @@ void modcellular_init0(void) {
 // ----------
 
 MP_DEFINE_EXCEPTION(CellularError, OSError)
-MP_DEFINE_EXCEPTION(CellularRegistrationError, CellularError)
-MP_DEFINE_EXCEPTION(SMSError, CellularError)
-MP_DEFINE_EXCEPTION(NoSIMError, CellularError)
-MP_DEFINE_EXCEPTION(CellularAttachmentError, CellularError)
-MP_DEFINE_EXCEPTION(CellularActivationError, CellularError)
 
 NORETURN void mp_raise_CellularError(const char *msg) {
     mp_raise_msg(&mp_type_CellularError, msg);
 }
 
-NORETURN void mp_raise_CellularRegistrationError(const char *msg) {
-    mp_raise_msg(&mp_type_CellularRegistrationError, msg);
-}
-
-NORETURN void mp_raise_SMSError(const char *msg) {
-    mp_raise_msg(&mp_type_SMSError, msg);
-}
-
-NORETURN void mp_raise_NoSIMError(const char *msg) {
-    mp_raise_msg(&mp_type_NoSIMError, msg);
-}
-
-NORETURN void mp_raise_CellularAttachmentError(const char *msg) {
-    mp_raise_msg(&mp_type_CellularAttachmentError, msg);
-}
-
-NORETURN void mp_raise_CellularActivationError(const char *msg) {
-    mp_raise_msg(&mp_type_CellularActivationError, msg);
-}
-
 // ------
 // Notify
 // ------
@@ -328,7 +303,7 @@ STATIC mp_obj_t modcellular_sms_send(mp_obj_t self_in) {
     sms_obj_t *self = MP_OBJ_TO_PTR(self_in);
 
     if (self->status != 0) {
-        mp_raise_SMSError("A message with non-zero status cannot be sent");
+        mp_raise_CellularError("A message with non-zero status cannot be sent");
         return mp_const_none;
     }
 
@@ -336,7 +311,7 @@ STATIC mp_obj_t modcellular_sms_send(mp_obj_t self_in) {
     const char* message_c = mp_obj_str_get_str(self->message);
 
     if (!SMS_SetFormat(SMS_FORMAT_TEXT, SIM0)) {
-        mp_raise_SMSError("Failed to set SMS format");
+        mp_raise_CellularError("Failed to set SMS format");
         return mp_const_none;
     } 
 
@@ -348,12 +323,12 @@ STATIC mp_obj_t modcellular_sms_send(mp_obj_t self_in) {
     };
 
     if (!SMS_SetParameter(&smsParam, SIM0)) {
-        mp_raise_SMSError("Failed to set SMS parameters");
+        mp_raise_CellularError("Failed to set SMS parameters");
         return mp_const_none;
     }
 
     if (!SMS_SetNewMessageStorage(SMS_STORAGE_SIM_CARD)) {
-        mp_raise_SMSError("Failed to set SMS storage in the SIM card");
+        mp_raise_CellularError("Failed to set SMS storage in the SIM card");
         return mp_const_none;
     }
 
@@ -361,14 +336,14 @@ STATIC mp_obj_t modcellular_sms_send(mp_obj_t self_in) {
     uint32_t unicodeLen;
 
     if (!SMS_LocalLanguage2Unicode((uint8_t*)message_c, strlen(message_c), CHARSET_UTF_8, &unicode, &unicodeLen)) {
-        mp_raise_SMSError("Failed to convert to Unicode before sending SMS");
+        mp_raise_CellularError("Failed to convert to Unicode before sending SMS");
         return mp_const_none;
     }
 
     sms_send_flag = 0;
     if (!SMS_SendMessage(destination_c, unicode, unicodeLen, SIM0)) {
         OS_Free(unicode);
-        mp_raise_SMSError("Failed to submit SMS message for sending");
+        mp_raise_CellularError("Failed to submit SMS message for sending");
         return mp_const_none;
     }
     OS_Free(unicode);
@@ -379,7 +354,7 @@ STATIC mp_obj_t modcellular_sms_send(mp_obj_t self_in) {
     }
 
     if (!sms_send_flag) {
-        mp_raise_SMSError("SMS send timeout. The module will still attempt to send SMS but this may interfer with other cellular activities");
+        mp_raise_CellularError("SMS send timeout. The module will still attempt to send SMS but this may interfer with other cellular activities");
         return mp_const_none;
     }
 
@@ -398,12 +373,12 @@ STATIC mp_obj_t modcellular_sms_withdraw(mp_obj_t self_in) {
     sms_obj_t *self = MP_OBJ_TO_PTR(self_in);
 
     if (self->index == 0 || self->status == 0) {
-        mp_raise_SMSError("Cannot withdraw SMS with zero index/status");
+        mp_raise_CellularError("Cannot withdraw SMS with zero index/status");
         return mp_const_none;
     }
 
     if (!SMS_DeleteMessage(self->index, SMS_STATUS_ALL, SMS_STORAGE_SIM_CARD)) {
-        mp_raise_SMSError("Failed to withdraw SMS");
+        mp_raise_CellularError("Failed to withdraw SMS");
         return mp_const_none;
     }
 
@@ -594,31 +569,31 @@ STATIC mp_obj_t modcellular_poll_network_exception(void) {
     switch (network_exception) {
 
         case NTW_EXC_NOSIM:
-            mp_raise_NoSIMError("No SIM card inserted");
+            mp_raise_CellularError("No SIM card inserted");
             break;
 
         case NTW_EXC_REG_DENIED:
-            mp_raise_CellularRegistrationError("Failed to register on the cellular network");
+            mp_raise_CellularError("Failed to register on the cellular network");
             break;
 
         case NTW_EXC_SMS_SEND:
-            mp_raise_SMSError("SMS was not sent");
+            mp_raise_CellularError("SMS was not sent");
             break;
 
         case NTW_EXC_SIM_DROP:
-            mp_raise_NoSIMError("SIM card dropped");
+            mp_raise_CellularError("SIM card dropped");
             break;
 
         case NTW_EXC_ATT_FAILED:
-            mp_raise_CellularAttachmentError("Failed to attach to the cellular network");
+            mp_raise_CellularError("Failed to attach to the cellular network");
             break;
 
         case NTW_EXC_ACT_FAILED:
-            mp_raise_CellularActivationError("Failed to activate the cellular network");
+            mp_raise_CellularError("Failed to activate the cellular network");
             break;
 
         case NTW_EXC_SMS_DROP:
-            mp_raise_SMSError("SMS message was discarded due to a timeout or a wrong SMS storage information");
+            mp_raise_CellularError("SMS message was discarded due to a timeout or a wrong SMS storage information");
             break;
 
         case NTW_NO_EXC:
@@ -681,7 +656,7 @@ STATIC mp_obj_t modcellular_get_iccid(void) {
     if (SIM_GetICCID((uint8_t*)iccid))
         return mp_obj_new_str(iccid, strlen(iccid));
     else {
-        mp_raise_NoSIMError("No ICCID data available");
+        mp_raise_CellularError("No ICCID data available");
         return mp_const_none;
     }
 }
@@ -699,7 +674,7 @@ STATIC mp_obj_t modcellular_get_imsi(void) {
     if (SIM_GetIMSI((uint8_t*)imsi))
         return mp_obj_new_str(imsi, strlen(imsi));
     else {
-        mp_raise_NoSIMError("No IMSI data available");
+        mp_raise_CellularError("No IMSI data available");
         return mp_const_none;
     }
 }
@@ -770,14 +745,14 @@ STATIC mp_obj_t modcellular_gprs_attach() {
 
     // Attach
     if (!Network_GetAttachStatus(&status)) {
-        mp_raise_CellularAttachmentError("Cannot retrieve attach status");
+        mp_raise_CellularError("Cannot retrieve attach status");
         return mp_const_none;
     }
 
     if (!status) {
 
         if (!Network_StartAttach()) {
-            mp_raise_CellularAttachmentError("Cannot initiate attachment");
+            mp_raise_CellularError("Cannot initiate attachment");
             return mp_const_none;
         }
 
@@ -787,7 +762,7 @@ STATIC mp_obj_t modcellular_gprs_attach() {
         }
 
         if (!(network_status & NTW_ATT_BIT)) {
-            mp_raise_CellularAttachmentError("Network attachment timeout");
+            mp_raise_CellularError("Network attachment timeout");
             return mp_const_none;
         }
     }
@@ -807,14 +782,14 @@ STATIC mp_obj_t modcellular_gprs_detach() {
 
     // Attach
     if (!Network_GetAttachStatus(&status)) {
-        mp_raise_CellularAttachmentError("Cannot retrieve attach status");
+        mp_raise_CellularError("Cannot retrieve attach status");
         return mp_const_none;
     }
 
     if (status) {
 
         if (!Network_StartDetach()) {
-            mp_raise_CellularAttachmentError("Cannot initiate detachment");
+            mp_raise_CellularError("Cannot initiate detachment");
             return mp_const_none;
         }
 
@@ -824,7 +799,7 @@ STATIC mp_obj_t modcellular_gprs_detach() {
         }
 
         if (network_status & NTW_ATT_BIT) {
-            mp_raise_CellularAttachmentError("Network detach timeout");
+            mp_raise_CellularError("Network detach timeout");
             return mp_const_none;
         }
     }
@@ -852,7 +827,7 @@ STATIC mp_obj_t modcellular_gprs_activate(mp_obj_t apn, mp_obj_t user, mp_obj_t
 
     // Attach
     if (!Network_GetActiveStatus(&status)) {
-        mp_raise_CellularActivationError("Cannot retrieve context activation status");
+        mp_raise_CellularError("Cannot retrieve context activation status");
         return mp_const_none;
     }
 
@@ -864,7 +839,7 @@ STATIC mp_obj_t modcellular_gprs_activate(mp_obj_t apn, mp_obj_t user, mp_obj_t
         memcpy(context.userPasswd, c_pass, MIN(strlen(c_pass) + 1, sizeof(context.userPasswd)));
 
         if (!Network_StartActive(context)) {
-            mp_raise_CellularActivationError("Cannot initiate context activation");
+            mp_raise_CellularError("Cannot initiate context activation");
             return mp_const_none;
         }
 
@@ -874,7 +849,7 @@ STATIC mp_obj_t modcellular_gprs_activate(mp_obj_t apn, mp_obj_t user, mp_obj_t
         }
 
         if (!(network_status & NTW_ACT_BIT)) {
-            mp_raise_CellularActivationError("Network context activation timeout");
+            mp_raise_CellularError("Network context activation timeout");
             return mp_const_none;
         }
     }
@@ -894,14 +869,14 @@ STATIC mp_obj_t modcellular_gprs_deactivate() {
 
     // Attach
     if (!Network_GetActiveStatus(&status)) {
-        mp_raise_CellularActivationError("Cannot retrieve context activation status");
+        mp_raise_CellularError("Cannot retrieve context activation status");
         return mp_const_none;
     }
 
     if (status) {
 
         if (!Network_StartDeactive(1)) {
-            mp_raise_CellularActivationError("Cannot initiate context deactivation");
+            mp_raise_CellularError("Cannot initiate context deactivation");
             return mp_const_none;
         }
 
@@ -911,7 +886,7 @@ STATIC mp_obj_t modcellular_gprs_deactivate() {
         }
 
         if (network_status & NTW_ACT_BIT) {
-            mp_raise_CellularActivationError("Network context deactivation timeout");
+            mp_raise_CellularError("Network context deactivation timeout");
             return mp_const_none;
         }
     }
@@ -925,9 +900,6 @@ STATIC const mp_map_elem_t mp_module_cellular_globals_table[] = {
     { MP_OBJ_NEW_QSTR(MP_QSTR___name__), MP_OBJ_NEW_QSTR(MP_QSTR_cellular) },
 
     { MP_OBJ_NEW_QSTR(MP_QSTR_CellularError), (mp_obj_t)MP_ROM_PTR(&mp_type_CellularError) },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_CellularRegistrationError), (mp_obj_t)MP_ROM_PTR(&mp_type_CellularRegistrationError) },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_SMSError), (mp_obj_t)MP_ROM_PTR(&mp_type_SMSError) },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_NoSIMError), (mp_obj_t)MP_ROM_PTR(&mp_type_NoSIMError) },
 
     { MP_OBJ_NEW_QSTR(MP_QSTR_SMS), (mp_obj_t)MP_ROM_PTR(&modcellular_sms_type) },
 
diff --git a/ports/gprs_a9/modcellular.h b/ports/gprs_a9/modcellular.h
index 0720ee0c1da75..81dcecf5ba488 100644
--- a/ports/gprs_a9/modcellular.h
+++ b/ports/gprs_a9/modcellular.h
@@ -30,11 +30,6 @@
 #include "py/obj.h"
 
 extern const mp_obj_type_t mp_type_CellularError;
-extern const mp_obj_type_t mp_type_CellularRegistrationError;
-extern const mp_obj_type_t mp_type_SMSError;
-extern const mp_obj_type_t mp_type_NoSIMError;
-extern const mp_obj_type_t mp_type_CellularAttachmentError;
-extern const mp_obj_type_t mp_type_CellularActivationError;
 
 void modcellular_init0(void);
 
@@ -66,6 +61,6 @@ void modcellular_notify_signal(API_Event_t* event);
 #define MAX_ATT_TIMEOUT 10000
 #define MAX_ACT_TIMEOUT 10000
 
-#define REQUIRES_NETWORK_REGISTRATION do {if (!network_status) {mp_raise_CellularRegistrationError("Network is not available: is SIM card inserted?"); return mp_const_none;}} while(0)
+#define REQUIRES_NETWORK_REGISTRATION do {if (!network_status) {mp_raise_CellularError("Network is not available: is SIM card inserted?"); return mp_const_none;}} while(0)
 #define REQUIRES_VALID_SMS_STATUS(bits) do {if (bitsum(bits) != 1) {return mp_const_none;}} while(0)
 

From 4c044b7569b78c447694f48e6cc7d8272bd659e7 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Tue, 29 Oct 2019 01:23:25 +0100
Subject: [PATCH 3323/3533] Move SMS-related stuff to SMS class

---
 ports/gprs_a9/README.md     |  29 ++++----
 ports/gprs_a9/modcellular.c | 130 ++++++++++++++++++++----------------
 2 files changed, 87 insertions(+), 72 deletions(-)

diff --git a/ports/gprs_a9/README.md b/ports/gprs_a9/README.md
index 02729a17bf07c..a5ca7a9eafc93 100644
--- a/ports/gprs_a9/README.md
+++ b/ports/gprs_a9/README.md
@@ -103,6 +103,20 @@ The purpose of this module is to have an access to high-level networking (SMS, G
 
       **Raises**: `CellularError` if failed to withdraw.
 
+    * `poll()` [staticmethod]
+
+      Polls SMS.
+
+      **Returns**: the number of new SMS received.
+
+    * `list()` [staticmethod]
+
+      Retrieves SMS from the SIM card.
+      
+      **Returns**: a list of SMS messages.
+
+      **Raises**: `CellularError` if not registered on the network. This is because network registration process interfers with most other SIM-related operations.
+
 #### Exception classes ####
 
 * `CellularError(message)`
@@ -182,20 +196,6 @@ The purpose of this module is to have an access to high-level networking (SMS, G
 
 ##### SMS #####
 
-* `sms_received()`
-
-  Retrieves the number of SMS received since the last check.
-
-  **Returns**: the number of SMS received.
-
-* `sms_list()`
-
-  Retrieves SMS from the SIM card.
-  
-  **Returns**: a list of SMS messages.
-
-  **Raises**: `CellularError` if not registered on the network. This is because network registration process interfers with most other SIM-related operations.
-
 ##### GPRS #####
 
 * `gprs_attach()`
@@ -609,7 +609,6 @@ Port SDK:
 Misc:
 
 - move `i2c` to `machine`
-- move all SMS-related functions to `cellular.SMS`
 - add assisted location services to `gps`
 - get rid of workarounds in `socket.getaddrinfo`
 - allow interrupts during `time.sleep`
diff --git a/ports/gprs_a9/modcellular.c b/ports/gprs_a9/modcellular.c
index 12a2a724c0042..f5baed9a9fa3e 100644
--- a/ports/gprs_a9/modcellular.c
+++ b/ports/gprs_a9/modcellular.c
@@ -389,6 +389,62 @@ STATIC mp_obj_t modcellular_sms_withdraw(mp_obj_t self_in) {
 
 MP_DEFINE_CONST_FUN_OBJ_1(modcellular_sms_withdraw_obj, &modcellular_sms_withdraw);
 
+STATIC mp_obj_t modcellular_sms_list(void) {
+    // ========================================
+    // Lists SMS messages.
+    // Returns:
+    //     A list of SMS messages.
+    // ========================================
+    REQUIRES_NETWORK_REGISTRATION;
+
+    SMS_Storage_Info_t storage;
+    SMS_GetStorageInfo(&storage, SMS_STORAGE_SIM_CARD);
+    
+    sms_list_buffer = mp_obj_new_list(storage.used, NULL);
+    sms_list_buffer_count = 0;
+
+    SMS_ListMessageRequst(SMS_STATUS_ALL, SMS_STORAGE_SIM_CARD);
+    
+    clock_t time = clock();
+    uint8_t prev_count = 0;
+    while (clock() - time < MAX_SMS_LIST_TIMEOUT * CLOCKS_PER_MSEC) {
+        OS_Sleep(100);
+        if (sms_list_buffer_count == storage.used) break;
+        if (prev_count != sms_list_buffer_count) {
+            prev_count = sms_list_buffer_count;
+            time = clock();
+        }
+    }
+    
+    mp_obj_list_t *result = sms_list_buffer;
+    sms_list_buffer = NULL;
+    
+    uint16_t i;
+    for (i = sms_list_buffer_count; i < result->len; i++) {
+        result->items[i] = mp_const_none;
+    }
+    sms_list_buffer_count = 0;
+
+    return (mp_obj_t)result;
+}
+
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(modcellular_sms_list_obj, modcellular_sms_list);
+STATIC MP_DEFINE_CONST_STATICMETHOD_OBJ(modcellular_sms_list_static_class_obj, MP_ROM_PTR(&modcellular_sms_list_obj));
+
+STATIC mp_obj_t modcellular_sms_poll(void) {
+    // ========================================
+    // Polls new SMS.
+    // Returns:
+    //     The number of SMS received.
+    // ========================================
+    mp_obj_t result = mp_obj_new_int(sms_received_count);
+    sms_received_count = 0;
+    return result;
+}
+
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(modcellular_sms_poll_obj, modcellular_sms_poll);
+STATIC MP_DEFINE_CONST_STATICMETHOD_OBJ(modcellular_sms_poll_static_class_obj, MP_ROM_PTR(&modcellular_sms_poll_obj));
+
 STATIC void modcellular_sms_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
     // ========================================
     // SMS.[attr]
@@ -396,7 +452,7 @@ STATIC void modcellular_sms_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
     if (dest[0] != MP_OBJ_NULL) {
     } else {
         sms_obj_t *self = MP_OBJ_TO_PTR(self_in);
-        // .telephone_number
+        // .phone_number
         if (attr == MP_QSTR_phone_number) {
             dest[0] = self->phone_number;
         // .message
@@ -420,6 +476,12 @@ STATIC void modcellular_sms_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
         // .withdraw
         } else if (attr == MP_QSTR_withdraw) {
             mp_convert_member_lookup(self_in, mp_obj_get_type(self_in), (mp_obj_t)MP_ROM_PTR(&modcellular_sms_withdraw_obj), dest);
+        // .list[static]
+        } else if (attr == MP_QSTR_list) {
+            mp_convert_member_lookup(self_in, mp_obj_get_type(self_in), (mp_obj_t)MP_ROM_PTR(&modcellular_sms_list_static_class_obj), dest);
+        // .poll[static]
+        } else if (attr == MP_QSTR_poll) {
+            mp_convert_member_lookup(self_in, mp_obj_get_type(self_in), (mp_obj_t)MP_ROM_PTR(&modcellular_sms_poll_static_class_obj), dest);
         }
     }
 }
@@ -440,12 +502,22 @@ STATIC void modcellular_sms_print(const mp_print_t *print, mp_obj_t self_in, mp_
     );
 }
 
+STATIC const mp_rom_map_elem_t sms_locals_dict_table[] = {
+    { MP_ROM_QSTR(MP_QSTR_send), MP_ROM_PTR(&modcellular_sms_send_obj) },
+    { MP_ROM_QSTR(MP_QSTR_withdraw), MP_ROM_PTR(&modcellular_sms_withdraw_obj) },
+    { MP_ROM_QSTR(MP_QSTR_list), MP_ROM_PTR(&modcellular_sms_list_static_class_obj) },
+    { MP_ROM_QSTR(MP_QSTR_poll), MP_ROM_PTR(&modcellular_sms_poll_static_class_obj) },
+};
+
+STATIC MP_DEFINE_CONST_DICT(sms_locals_dict, sms_locals_dict_table);
+
 STATIC const mp_obj_type_t modcellular_sms_type = {
     { &mp_type_type },
     .name = MP_QSTR_SMS,
     .make_new = modcellular_sms_make_new,
     .print = modcellular_sms_print,
     .attr = modcellular_sms_attr,
+    .locals_dict = (mp_obj_dict_t*)&sms_locals_dict,
 };
 
 // -------
@@ -681,60 +753,6 @@ STATIC mp_obj_t modcellular_get_imsi(void) {
 
 STATIC MP_DEFINE_CONST_FUN_OBJ_0(modcellular_get_imsi_obj, modcellular_get_imsi);
 
-STATIC mp_obj_t modcellular_sms_received(void) {
-    // ========================================
-    // Retrieves the number of SMS received since last poll.
-    // Returns:
-    //     The number of SMS received.
-    // ========================================
-    mp_obj_t result = mp_obj_new_int(sms_received_count);
-    sms_received_count = 0;
-    return result;
-}
-
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(modcellular_sms_received_obj, modcellular_sms_received);
-
-STATIC mp_obj_t modcellular_sms_list(void) {
-    // ========================================
-    // Lists SMS messages.
-    // Returns:
-    //     A list of SMS messages.
-    // ========================================
-    REQUIRES_NETWORK_REGISTRATION;
-
-    SMS_Storage_Info_t storage;
-    SMS_GetStorageInfo(&storage, SMS_STORAGE_SIM_CARD);
-    
-    sms_list_buffer = mp_obj_new_list(storage.used, NULL);
-    sms_list_buffer_count = 0;
-
-    SMS_ListMessageRequst(SMS_STATUS_ALL, SMS_STORAGE_SIM_CARD);
-    
-    clock_t time = clock();
-    uint8_t prev_count = 0;
-    while (clock() - time < MAX_SMS_LIST_TIMEOUT * CLOCKS_PER_MSEC) {
-        OS_Sleep(100);
-        if (sms_list_buffer_count == storage.used) break;
-        if (prev_count != sms_list_buffer_count) {
-            prev_count = sms_list_buffer_count;
-            time = clock();
-        }
-    }
-    
-    mp_obj_list_t *result = sms_list_buffer;
-    sms_list_buffer = NULL;
-    
-    uint16_t i;
-    for (i = sms_list_buffer_count; i < result->len; i++) {
-        result->items[i] = mp_const_none;
-    }
-    sms_list_buffer_count = 0;
-
-    return (mp_obj_t)result;
-}
-
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(modcellular_sms_list_obj, modcellular_sms_list);
-
 STATIC mp_obj_t modcellular_gprs_attach() {
     // ========================================
     // Attaches to the GPRS network.
@@ -913,8 +931,6 @@ STATIC const mp_map_elem_t mp_module_cellular_globals_table[] = {
     { MP_OBJ_NEW_QSTR(MP_QSTR_is_roaming), (mp_obj_t)&modcellular_is_roaming_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_get_iccid), (mp_obj_t)&modcellular_get_iccid_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_get_imsi), (mp_obj_t)&modcellular_get_imsi_obj },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_sms_received), (mp_obj_t)&modcellular_sms_received_obj },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_sms_list), (mp_obj_t)&modcellular_sms_list_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_gprs_attach), (mp_obj_t)&modcellular_gprs_attach_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_gprs_detach), (mp_obj_t)&modcellular_gprs_detach_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_gprs_activate), (mp_obj_t)&modcellular_gprs_activate_obj },

From ee509f60aba0deb2d374dbbfe05616935466b832 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Tue, 29 Oct 2019 01:23:56 +0100
Subject: [PATCH 3324/3533] Update test script to the recent API

[ci skip]
---
 ports/gprs_a9/frozentest.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/gprs_a9/frozentest.py b/ports/gprs_a9/frozentest.py
index 61f5ad7973f62..86f248fbe0e7e 100644
--- a/ports/gprs_a9/frozentest.py
+++ b/ports/gprs_a9/frozentest.py
@@ -227,10 +227,10 @@
     print("SMS")
     print("----------------")
 
-    sms_received = cel.sms_received()
+    sms_received = cel.SMS.poll()
     print("SMS received count:", sms_received)
 
-    sms_list = cel.sms_list()
+    sms_list = cel.SMS.list()
     print("SMS:", sms_list)
     assert len(sms_list) > 0
     for i in sms_list:

From 871a9d277d489ea3c6ccadaee725a31d7fbd5ecd Mon Sep 17 00:00:00 2001
From: pulkin <gpulkin@gmail.com>
Date: Tue, 29 Oct 2019 00:25:29 +0100
Subject: [PATCH 3325/3533] Remove SMS section

[skip ci]
---
 ports/gprs_a9/README.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/ports/gprs_a9/README.md b/ports/gprs_a9/README.md
index a5ca7a9eafc93..c59cf3602a942 100644
--- a/ports/gprs_a9/README.md
+++ b/ports/gprs_a9/README.md
@@ -194,8 +194,6 @@ The purpose of this module is to have an access to high-level networking (SMS, G
   **Returns**: Two integers, the signal quality (0-31) and RXQUAL. These are replaced by `None` if no signal quality information is available.
   **Note**: The RXQUAL output is always `None`. Its meaning is unknown.
 
-##### SMS #####
-
 ##### GPRS #####
 
 * `gprs_attach()`

From 9e7fc6b5a1fa86b893ec647f525e25b2b661dbda Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Tue, 29 Oct 2019 22:26:32 +0100
Subject: [PATCH 3326/3533] Restructured README

---
 ports/gprs_a9/README.md | 46 ++++++++++++++++-------------------------
 1 file changed, 18 insertions(+), 28 deletions(-)

diff --git a/ports/gprs_a9/README.md b/ports/gprs_a9/README.md
index c59cf3602a942..6a1e0faca3554 100644
--- a/ports/gprs_a9/README.md
+++ b/ports/gprs_a9/README.md
@@ -60,7 +60,24 @@ ampy --port /dev/ttyUSB1 put frozentest.py
 >>> import frozentest
 ```
 
-## Platform-specific modules
+## Functionality
+
+- [x] GPIO: `machine.Pin`
+- [ ] ADC: `machine.ADC`
+- [ ] PWM: `machine.PWM`
+- [ ] UART: `machine.UART` (software UART?)
+- [x] Cellular misc (IMEI, ICCID, ...): `cellular`
+- [x] GPS: `gps`
+- [x] I2C: `i2c`
+- [ ] SPI: `machine.SPI`
+- [x] time: `utime`
+- [x] File system
+- [x] GPRS, DNS: `cellular`, `socket`, `ssl`
+- [x] Power: `machine`
+- [ ] Calls: `cellular`
+- [x] SMS: `cellular.SMS`
+
+## API
 
 1. [`cellular`](#cellular): SMS, calls, connectivity
 2. [`usocket`](#usocket): sockets over GPRS
@@ -68,7 +85,6 @@ ampy --port /dev/ttyUSB1 put frozentest.py
 4. [`gps`](#gps): everything related to GPS and assisted positioning
 5. [`machine`](#machine): hardware and power control
 6. [`i2c`](#i2c): i2c implementation
-7. [Port TODO](#TODO)
 8. [Notes](#Notes)
 
 ### `cellular`
@@ -585,32 +601,6 @@ I2C_DEFAULT_TIME_OUT
 
   **Raises** `I2CError` (see error message for more details)
 
-## TODO ##
-
-Port SDK:
-
-- [x] GPIO: `machine.Pin`
-- [ ] ADC: `machine.ADC`
-- [ ] PWM: `machine.PWM`
-- [ ] UART: `machine.UART` (software UART?)
-- [x] Cellular misc (IMEI, ICCID, ...): `cellular`
-- [x] GPS: `gps`
-- [x] I2C: `i2c`
-- [ ] SPI: `machine.SPI`
-- [x] time: `utime`
-- [x] File system
-- [x] GPRS, DNS: `cellular`, `socket`, `ssl`
-- [x] Power: `machine`
-- [ ] Calls: `cellular`
-- [x] SMS: `cellular.SMS`
-
-Misc:
-
-- move `i2c` to `machine`
-- add assisted location services to `gps`
-- get rid of workarounds in `socket.getaddrinfo`
-- allow interrupts during `time.sleep`
-
 ## Notes ##
 
 * The module halts on fatal errors; create an empty file `.reboot_on_fatal` if a reboot is desired

From dcbb086dbe3929df6b7f8f0dd07ebe2089f52265 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Tue, 29 Oct 2019 23:17:21 +0100
Subject: [PATCH 3327/3533] Closes #12

---
 ports/gprs_a9/mphalport.c | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/ports/gprs_a9/mphalport.c b/ports/gprs_a9/mphalport.c
index 3d1bea4f00611..ff5b6d1fbd1e3 100644
--- a/ports/gprs_a9/mphalport.c
+++ b/ports/gprs_a9/mphalport.c
@@ -84,32 +84,31 @@ void mp_hal_stdout_tx_strn_cooked(const char *str, size_t len) {
     }
 }
 
-/////////////////////////////////////////////////////////////////////////////
-/////hal time////////////////////////////////////////////////////////////////
-
-
 uint32_t mp_hal_ticks_ms(void) {
-    return (uint32_t)(clock()/CLOCKS_PER_MSEC);
+    return (uint32_t)(clock() / CLOCKS_PER_MSEC);
 }
 
 uint32_t mp_hal_ticks_us(void) {
-    return (uint32_t)(clock()/CLOCKS_PER_MSEC*1000);
+    return (uint32_t)(clock() / CLOCKS_PER_MSEC * 1000);
 }
 
 void mp_hal_delay_ms(uint32_t ms) {
-    OS_Sleep(ms);
+    uint32_t start = clock();
+    while (clock() - start < ms * CLOCKS_PER_MSEC) {
+        OS_Sleep(1);
+        mp_handle_pending();
+    }
 }
 
 void mp_hal_delay_us(uint32_t us) {
-    OS_SleepUs(us);
+    uint32_t start = clock();
+    while ((clock() - start) * 1000 < us * CLOCKS_PER_MSEC) {
+        OS_SleepUs(1);
+        mp_handle_pending();
+    }
 }
 
-// this function could do with improvements (eg use ets_delay_us)
 void mp_hal_delay_us_fast(uint32_t us) {
     OS_SleepUs(us);
 }
 
-
-/////////////////////////////////////////////////////////////////////////////
-
-

From 9eb67213e8a0a2c979e4a6144bf32867b19bf371 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Wed, 30 Oct 2019 00:10:12 +0100
Subject: [PATCH 3328/3533] Closes #14

---
 ports/gprs_a9/modmachine.c | 54 ++++++++++++++++++++++++++++++++++----
 1 file changed, 49 insertions(+), 5 deletions(-)

diff --git a/ports/gprs_a9/modmachine.c b/ports/gprs_a9/modmachine.c
index 4780bea81f756..029a57f3b3ef6 100644
--- a/ports/gprs_a9/modmachine.c
+++ b/ports/gprs_a9/modmachine.c
@@ -62,16 +62,41 @@ STATIC mp_obj_t modmachine_reset(void) {
 
 STATIC MP_DEFINE_CONST_FUN_OBJ_0(modmachine_reset_obj, modmachine_reset);
 
-STATIC mp_obj_t modmachine_idle(void) {
+STATIC mp_obj_t modmachine_set_idle(mp_obj_t flag) {
     // ========================================
-    // Puts the module into low-power mode.
+    // Puts the module into low-power mode by
+    // tuning down frequencies and powering
+    // down certain peripherials.
     // The execution continues.
+    // Args:
+    //     flag (bool): if True, triggers low-
+    //     power mode. If False, switches low-
+    //     power mode off.
+    // ========================================
+    PM_SleepMode(mp_obj_get_int(flag));
+    return mp_const_none;
+}
+
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(modmachine_set_idle_obj, modmachine_set_idle);
+
+STATIC mp_obj_t modmachine_set_min_freq(mp_obj_t freq) {
     // ========================================
-    PM_SleepMode(true);
+    // Sets the minimal CPU frequency.
+    // Args:
+    //     freq (int): a constant specifying
+    //     the frequency.
+    // ========================================
+    int i = mp_obj_get_int(freq);
+    if (i != PM_SYS_FREQ_32K && i != PM_SYS_FREQ_13M && i != PM_SYS_FREQ_26M && i != PM_SYS_FREQ_39M &&
+            i != PM_SYS_FREQ_52M && i != PM_SYS_FREQ_78M && i != PM_SYS_FREQ_89M && i != PM_SYS_FREQ_104M &&
+            i != PM_SYS_FREQ_113M && i != PM_SYS_FREQ_125M && i != PM_SYS_FREQ_139M && i != PM_SYS_FREQ_156M &&
+            i != PM_SYS_FREQ_178M && i != PM_SYS_FREQ_208M && i != PM_SYS_FREQ_250M && i != PM_SYS_FREQ_312M)
+        mp_raise_ValueError("Unknown frequency");
+    PM_SetSysMinFreq(i);
     return mp_const_none;
 }
 
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(modmachine_idle_obj, modmachine_idle);
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(modmachine_set_min_freq_obj, modmachine_set_min_freq);
 
 STATIC mp_obj_t modmachine_power_on_cause(void) {
     // ========================================
@@ -171,7 +196,8 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_umachine) },
     { MP_ROM_QSTR(MP_QSTR_Pin), MP_ROM_PTR(&machine_pin_type) },
     { MP_OBJ_NEW_QSTR(MP_QSTR_reset), (mp_obj_t)&modmachine_reset_obj },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_idle), (mp_obj_t)&modmachine_idle_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_set_idle), (mp_obj_t)&modmachine_set_idle_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_set_min_freq), (mp_obj_t)&modmachine_set_min_freq_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_power_on_cause), (mp_obj_t)&modmachine_power_on_cause_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_off), (mp_obj_t)&modmachine_off_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_get_input_voltage), (mp_obj_t)&modmachine_get_input_voltage_obj },
@@ -186,6 +212,24 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_POWER_ON_CAUSE_EXCEPTION), MP_ROM_INT(POWER_ON_CAUSE_EXCEPTION) },
     { MP_ROM_QSTR(MP_QSTR_POWER_ON_CAUSE_RESET),     MP_ROM_INT(POWER_ON_CAUSE_RESET) },
     { MP_ROM_QSTR(MP_QSTR_POWER_ON_CAUSE_MAX),       MP_ROM_INT(POWER_ON_CAUSE_MAX) },
+
+    // Frequencies
+    { MP_ROM_QSTR(MP_QSTR_PM_SYS_FREQ_32K),          MP_ROM_INT(PM_SYS_FREQ_32K) },
+    { MP_ROM_QSTR(MP_QSTR_PM_SYS_FREQ_13M),          MP_ROM_INT(PM_SYS_FREQ_13M) },
+    { MP_ROM_QSTR(MP_QSTR_PM_SYS_FREQ_26M),          MP_ROM_INT(PM_SYS_FREQ_26M) },
+    { MP_ROM_QSTR(MP_QSTR_PM_SYS_FREQ_39M),          MP_ROM_INT(PM_SYS_FREQ_39M) },
+    { MP_ROM_QSTR(MP_QSTR_PM_SYS_FREQ_52M),          MP_ROM_INT(PM_SYS_FREQ_52M) },
+    { MP_ROM_QSTR(MP_QSTR_PM_SYS_FREQ_78M),          MP_ROM_INT(PM_SYS_FREQ_78M) },
+    { MP_ROM_QSTR(MP_QSTR_PM_SYS_FREQ_89M),          MP_ROM_INT(PM_SYS_FREQ_89M) },
+    { MP_ROM_QSTR(MP_QSTR_PM_SYS_FREQ_104M),         MP_ROM_INT(PM_SYS_FREQ_104M) },
+    { MP_ROM_QSTR(MP_QSTR_PM_SYS_FREQ_113M),         MP_ROM_INT(PM_SYS_FREQ_113M) },
+    { MP_ROM_QSTR(MP_QSTR_PM_SYS_FREQ_125M),         MP_ROM_INT(PM_SYS_FREQ_125M) },
+    { MP_ROM_QSTR(MP_QSTR_PM_SYS_FREQ_139M),         MP_ROM_INT(PM_SYS_FREQ_139M) },
+    { MP_ROM_QSTR(MP_QSTR_PM_SYS_FREQ_156M),         MP_ROM_INT(PM_SYS_FREQ_156M) },
+    { MP_ROM_QSTR(MP_QSTR_PM_SYS_FREQ_178M),         MP_ROM_INT(PM_SYS_FREQ_178M) },
+    { MP_ROM_QSTR(MP_QSTR_PM_SYS_FREQ_208M),         MP_ROM_INT(PM_SYS_FREQ_208M) },
+    { MP_ROM_QSTR(MP_QSTR_PM_SYS_FREQ_250M),         MP_ROM_INT(PM_SYS_FREQ_250M) },
+    { MP_ROM_QSTR(MP_QSTR_PM_SYS_FREQ_312M),         MP_ROM_INT(PM_SYS_FREQ_312M) },
 };
 
 STATIC MP_DEFINE_CONST_DICT(machine_module_globals, machine_module_globals_table);

From 9ef939ef0925cdb60a76ba488bed6fa9a69985b9 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Wed, 30 Oct 2019 23:55:53 +0100
Subject: [PATCH 3329/3533] Simplify wait until logic, fix exception handling
 and add flight mode

---
 ports/gprs_a9/frozentest.py |  35 ++++++++++-
 ports/gprs_a9/modcellular.c | 113 ++++++++++++++----------------------
 ports/gprs_a9/modcellular.h |  11 ++--
 3 files changed, 82 insertions(+), 77 deletions(-)

diff --git a/ports/gprs_a9/frozentest.py b/ports/gprs_a9/frozentest.py
index 86f248fbe0e7e..93d1037028096 100644
--- a/ports/gprs_a9/frozentest.py
+++ b/ports/gprs_a9/frozentest.py
@@ -191,6 +191,29 @@
     print("Network")
     print("----------------")
 
+    fm = cel.flight_mode()
+    print("Flight mode:", fm)
+
+    print("Setting flight mode")
+    assert cel.flight_mode(True)  # Switch flight mode on
+    try:
+        cel.poll_network_exception()
+    except cel.CellularError as e:
+        print("Exception:", e)
+    else:
+        raise RuntimeError("Exception not raised")
+
+    reg = cel.is_network_registered()
+    print("Ntw registered:", reg)
+    assert not reg
+
+    print("Releasing flight mode")
+    assert not cel.flight_mode(False)  # Switch flight mode off
+    for i in range(10):
+        time.sleep(1)
+        if cel.is_network_registered():
+            break
+
     reg = cel.is_network_registered()
     print("Ntw registered:", reg)
     assert reg
@@ -339,7 +362,17 @@
 
 import machine
 
-machine.idle()
+def f():
+    t = time.ticks_ms()
+    for i in range(10000):
+        x = i * i
+    return time.ticks_ms() - t
+
+print("Default performance: ", f())
+machine.set_idle(True)
+print("Idle performance: ", f())
+machine.set_min_freq(machine.PM_SYS_FREQ_78M)
+print("78M performance: ", f())
 
 cause = machine.power_on_cause()
 print("Power on cause:", cause)
diff --git a/ports/gprs_a9/modcellular.c b/ports/gprs_a9/modcellular.c
index f5baed9a9fa3e..cb6561a1d789a 100644
--- a/ports/gprs_a9/modcellular.c
+++ b/ports/gprs_a9/modcellular.c
@@ -27,6 +27,7 @@
  */
 
 #include "modcellular.h"
+#include "mphalport.h"
 
 #include "py/nlr.h"
 #include "py/obj.h"
@@ -139,7 +140,6 @@ void modcellular_notify_reg_searching(API_Event_t* event) {
 void modcellular_notify_reg_denied(API_Event_t* event) {
     network_status = 0;
     network_status_updated = 1;
-
     network_exception = NTW_EXC_REG_DENIED;
 }
 
@@ -158,7 +158,6 @@ void modcellular_notify_det(API_Event_t* event) {
 void modcellular_notify_att_failed(API_Event_t* event) {
     network_status &= ~NTW_ATT_BIT;
     network_status_updated = 1;
-
     network_exception = NTW_EXC_ATT_FAILED;
 }
 
@@ -177,7 +176,6 @@ void modcellular_notify_deact(API_Event_t* event) {
 void modcellular_notify_act_failed(API_Event_t* event) {
     network_status &= ~NTW_ACT_BIT;
     network_status_updated = 1;
-
     network_exception = NTW_EXC_ACT_FAILED;
 }
 
@@ -347,19 +345,9 @@ STATIC mp_obj_t modcellular_sms_send(mp_obj_t self_in) {
         return mp_const_none;
     }
     OS_Free(unicode);
-
-    clock_t time = clock();
-    while (clock() - time < MAX_SMS_SEND_TIMEOUT * CLOCKS_PER_MSEC && !sms_send_flag) {
-        OS_Sleep(100);
-    }
-
-    if (!sms_send_flag) {
-        mp_raise_CellularError("SMS send timeout. The module will still attempt to send SMS but this may interfer with other cellular activities");
-        return mp_const_none;
-    }
+    WAIT_UNTIL(sms_send_flag, TIMEOUT_SMS_SEND, 100, mp_warning(NULL, "Failed to send SMS. The module will continue attempting sending it"));
 
     sms_send_flag = 0;
-
     return mp_const_none;
 }
 
@@ -404,18 +392,8 @@ STATIC mp_obj_t modcellular_sms_list(void) {
     sms_list_buffer_count = 0;
 
     SMS_ListMessageRequst(SMS_STATUS_ALL, SMS_STORAGE_SIM_CARD);
-    
-    clock_t time = clock();
-    uint8_t prev_count = 0;
-    while (clock() - time < MAX_SMS_LIST_TIMEOUT * CLOCKS_PER_MSEC) {
-        OS_Sleep(100);
-        if (sms_list_buffer_count == storage.used) break;
-        if (prev_count != sms_list_buffer_count) {
-            prev_count = sms_list_buffer_count;
-            time = clock();
-        }
-    }
-    
+    WAIT_UNTIL(sms_list_buffer_count == storage.used, TIMEOUT_SMS_LIST, 100, mp_warning(NULL, "Failed to poll all SMS: the list may be incomplete"));
+
     mp_obj_list_t *result = sms_list_buffer;
     sms_list_buffer = NULL;
     
@@ -638,7 +616,10 @@ STATIC mp_obj_t modcellular_poll_network_exception(void) {
     // Returns:
     //    An integer representing network exception.
     // ========================================
-    switch (network_exception) {
+    uint8_t e = network_exception;
+    network_exception = NTW_NO_EXC;
+
+    switch (e) {
 
         case NTW_EXC_NOSIM:
             mp_raise_CellularError("No SIM card inserted");
@@ -676,7 +657,6 @@ STATIC mp_obj_t modcellular_poll_network_exception(void) {
             break;
 
     }
-    network_exception = 0;
     return mp_const_none;
 }
 
@@ -768,21 +748,11 @@ STATIC mp_obj_t modcellular_gprs_attach() {
     }
 
     if (!status) {
-
         if (!Network_StartAttach()) {
             mp_raise_CellularError("Cannot initiate attachment");
             return mp_const_none;
         }
-
-        clock_t time = clock();
-        while (clock() - time < MAX_ATT_TIMEOUT * CLOCKS_PER_MSEC && !(network_status & NTW_ATT_BIT)) {
-            OS_Sleep(100);
-        }
-
-        if (!(network_status & NTW_ATT_BIT)) {
-            mp_raise_CellularError("Network attachment timeout");
-            return mp_const_none;
-        }
+        WAIT_UNTIL(network_status & NTW_ATT_BIT, TIMEOUT_GPRS_ATTACHMENT, 100, mp_raise_CellularError("Network attach timeout"));
     }
 
     return mp_const_none;
@@ -805,21 +775,11 @@ STATIC mp_obj_t modcellular_gprs_detach() {
     }
 
     if (status) {
-
         if (!Network_StartDetach()) {
             mp_raise_CellularError("Cannot initiate detachment");
             return mp_const_none;
         }
-
-        clock_t time = clock();
-        while (clock() - time < MAX_ATT_TIMEOUT * CLOCKS_PER_MSEC && (network_status & NTW_ATT_BIT)) {
-            OS_Sleep(100);
-        }
-
-        if (network_status & NTW_ATT_BIT) {
-            mp_raise_CellularError("Network detach timeout");
-            return mp_const_none;
-        }
+        WAIT_UNTIL(!(network_status & NTW_ATT_BIT), TIMEOUT_GPRS_ATTACHMENT, 100, mp_raise_CellularError("Network detach timeout"));
     }
 
     return mp_const_none;
@@ -860,16 +820,7 @@ STATIC mp_obj_t modcellular_gprs_activate(mp_obj_t apn, mp_obj_t user, mp_obj_t
             mp_raise_CellularError("Cannot initiate context activation");
             return mp_const_none;
         }
-
-        clock_t time = clock();
-        while (clock() - time < MAX_ACT_TIMEOUT * CLOCKS_PER_MSEC && !(network_status & NTW_ACT_BIT)) {
-            OS_Sleep(100);
-        }
-
-        if (!(network_status & NTW_ACT_BIT)) {
-            mp_raise_CellularError("Network context activation timeout");
-            return mp_const_none;
-        }
+        WAIT_UNTIL(network_status & NTW_ACT_BIT, TIMEOUT_GPRS_ACTIVATION, 100, mp_raise_CellularError("Network context activation timeout"));
     }
 
     return mp_const_none;
@@ -877,7 +828,7 @@ STATIC mp_obj_t modcellular_gprs_activate(mp_obj_t apn, mp_obj_t user, mp_obj_t
 
 STATIC MP_DEFINE_CONST_FUN_OBJ_3(modcellular_gprs_activate_obj, modcellular_gprs_activate);
 
-STATIC mp_obj_t modcellular_gprs_deactivate() {
+STATIC mp_obj_t modcellular_gprs_deactivate(void) {
     // ========================================
     // Deactivates the GPRS network.
     // ========================================
@@ -892,27 +843,46 @@ STATIC mp_obj_t modcellular_gprs_deactivate() {
     }
 
     if (status) {
-
         if (!Network_StartDeactive(1)) {
             mp_raise_CellularError("Cannot initiate context deactivation");
             return mp_const_none;
         }
+        WAIT_UNTIL(!(network_status & NTW_ACT_BIT), TIMEOUT_GPRS_ACTIVATION, 100, mp_raise_CellularError("Network context deactivation timeout"));
+    }
 
-        clock_t time = clock();
-        while (clock() - time < MAX_ACT_TIMEOUT * CLOCKS_PER_MSEC && (network_status & NTW_ACT_BIT)) {
-            OS_Sleep(100);
-        }
+    return mp_const_none;
+}
+
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(modcellular_gprs_deactivate_obj, modcellular_gprs_deactivate);
+
+bool get_flight_mode(void) {
+    // Polls flight mode
+    bool flag;
+    if (!Network_GetFlightMode(&flag)) {
+        mp_raise_CellularError("Failed to retrieve flight mode status");
+    }
+    return !flag;  // By fact, the meaning of the output is inverse
+}
 
-        if (network_status & NTW_ACT_BIT) {
-            mp_raise_CellularError("Network context deactivation timeout");
+STATIC mp_obj_t modcellular_flight_mode(size_t n_args, const mp_obj_t *args) {
+    // ========================================
+    // Retrieves and switches the flight mode
+    // status.
+    // Returns:
+    //     The new flight mode status.
+    // ========================================
+    if (n_args == 1) {
+        mp_int_t set_flag = mp_obj_get_int(args[0]);
+        if (!Network_SetFlightMode(set_flag)) {
+            mp_raise_CellularError("Failed to set flight mode status");
             return mp_const_none;
         }
+        WAIT_UNTIL(set_flag == get_flight_mode(), TIMEOUT_FLIGHT_MODE, 100, mp_raise_CellularError("Flight mode change timeout"));
     }
-
-    return mp_const_none;
+    return mp_obj_new_bool(get_flight_mode());
 }
 
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(modcellular_gprs_deactivate_obj, modcellular_gprs_deactivate);
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(modcellular_flight_mode_obj, 0, 1, modcellular_flight_mode);
 
 STATIC const mp_map_elem_t mp_module_cellular_globals_table[] = {
     { MP_OBJ_NEW_QSTR(MP_QSTR___name__), MP_OBJ_NEW_QSTR(MP_QSTR_cellular) },
@@ -935,6 +905,7 @@ STATIC const mp_map_elem_t mp_module_cellular_globals_table[] = {
     { MP_OBJ_NEW_QSTR(MP_QSTR_gprs_detach), (mp_obj_t)&modcellular_gprs_detach_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_gprs_activate), (mp_obj_t)&modcellular_gprs_activate_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_gprs_deactivate), (mp_obj_t)&modcellular_gprs_deactivate_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_flight_mode), (mp_obj_t)&modcellular_flight_mode_obj },
 };
 
 STATIC MP_DEFINE_CONST_DICT(mp_module_cellular_globals, mp_module_cellular_globals_table);
diff --git a/ports/gprs_a9/modcellular.h b/ports/gprs_a9/modcellular.h
index 81dcecf5ba488..fc350e2e38440 100644
--- a/ports/gprs_a9/modcellular.h
+++ b/ports/gprs_a9/modcellular.h
@@ -56,11 +56,12 @@ void modcellular_notify_sms_error(API_Event_t* event);
 void modcellular_notify_sms_receipt(API_Event_t* event);
 void modcellular_notify_signal(API_Event_t* event);
 
-#define MAX_SMS_LIST_TIMEOUT 1000
-#define MAX_SMS_SEND_TIMEOUT 10000
-#define MAX_ATT_TIMEOUT 10000
-#define MAX_ACT_TIMEOUT 10000
+#define TIMEOUT_SMS_LIST 10000
+#define TIMEOUT_SMS_SEND 10000
+#define TIMEOUT_GPRS_ATTACHMENT 10000
+#define TIMEOUT_GPRS_ACTIVATION 10000
+#define TIMEOUT_FLIGHT_MODE 5000
 
 #define REQUIRES_NETWORK_REGISTRATION do {if (!network_status) {mp_raise_CellularError("Network is not available: is SIM card inserted?"); return mp_const_none;}} while(0)
 #define REQUIRES_VALID_SMS_STATUS(bits) do {if (bitsum(bits) != 1) {return mp_const_none;}} while(0)
-
+#define WAIT_UNTIL(condition, timeout_ms, step_ms, raise) do {uint32_t __time = mp_hal_ticks_ms(); while (mp_hal_ticks_ms() - __time < (timeout_ms) && !(condition)) mp_hal_delay_ms(step_ms); if (!(condition)) {raise; return mp_const_none; }} while (0)

From 9a008cca9856c726111f879cf951edb78d21d952 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Thu, 31 Oct 2019 23:01:58 +0100
Subject: [PATCH 3330/3533] Close #17. Update API and tests.

---
 ports/gprs_a9/README.md     |  36 +++---
 ports/gprs_a9/frozentest.py |  15 +--
 ports/gprs_a9/modcellular.c | 211 ++++++++++++++++--------------------
 ports/gprs_a9/modcellular.h |   4 +
 4 files changed, 120 insertions(+), 146 deletions(-)

diff --git a/ports/gprs_a9/README.md b/ports/gprs_a9/README.md
index 6a1e0faca3554..2d0203ad56bc8 100644
--- a/ports/gprs_a9/README.md
+++ b/ports/gprs_a9/README.md
@@ -210,45 +210,39 @@ The purpose of this module is to have an access to high-level networking (SMS, G
   **Returns**: Two integers, the signal quality (0-31) and RXQUAL. These are replaced by `None` if no signal quality information is available.
   **Note**: The RXQUAL output is always `None`. Its meaning is unknown.
 
-##### GPRS #####
-
-* `gprs_attach()`
+* `flight_mode(flag)`
 
-  Attaches to the network. This is required for activating the GPRS context. If already attached, does nothing.
+  Turn the flight mode on or off. Retrieve the flight mode status.
 
-  **Raises**: `CellularError` if not registered on the network or attachment process failed at any stage.
+  **Args**:
 
-  **Note**: There may be no need to run this as, after a hard reset, the module attempts to attach automatically.
+    * flag (bool): set or unset the flight mode;
 
-  **TODO**: Consider getting rid of this function.
+  **Returns**: True if in flight mode.
 
-* `gprs_detach()`
+##### GPRS #####
 
-  Detaches from the network. Does nothing if already detached.
+* `gprs(apn, user=None, pass=None)`
 
-  **Raises**: `CellularError` if not registered on the network or the detachment process failed at any stage.
+  Activates, deactivates or retrieves the status of GPRS.
 
-  **TODO**: Consider getting rid of this function.
+  Activate: `cellular.gprs('apn', 'user', 'pass')`
 
-* `gprs_activate(apn, user, name)`
+  Deactivate: `cellular.gprs(False)`
 
-  Activates the GPRS context. Does nothing if already activated even if different credentials were provided previously.
+  Status: `cellular.gprs()`
 
   **Args**:
 
-    * apn (str): access point name (APN);
+    * apn (str, bool): access point name (APN);
     * user (str): username;
     * pass (str): password;
 
-  **Raises**: `CellularError` if not registered on the network or the activation process failed at any stage.
+  **Returns**: True if GPRS is operating.
 
-  **Note**: there is no way to check whether the credentials supplied are valid.
-
-* `gprs_deactivate()`
+  **Raises**: `CellularError` if not registered on the network or the (de)activation process failed at any stage.
 
-  Deactivates the GPRS context. Does nothing if already deactivated.
-
-  **Raises**: `CellularError` if not registered on the network or the deactivation process failed at any stage.
+  **Note**: there is no way to check whether the credentials supplied are valid.
 
 ### `usocket` ###
 
diff --git a/ports/gprs_a9/frozentest.py b/ports/gprs_a9/frozentest.py
index 93d1037028096..f485ac931bfdb 100644
--- a/ports/gprs_a9/frozentest.py
+++ b/ports/gprs_a9/frozentest.py
@@ -267,14 +267,8 @@
     print("GPRS")
     print("----------------")
 
-    cel.gprs_deactivate()
-    cel.gprs_detach()
-    cel.network_status_changed()
-    time.sleep(2)
-
-    cel.gprs_attach()
     # LEBARA NL credentials
-    cel.gprs_activate("internet", "", "")
+    assert cel.gprs("internet", "", "")
 
     cb = cel.network_status_changed()
     print("Status changed:", cb, "->", cel.get_network_status())
@@ -353,8 +347,8 @@
 
     assert sock.get_num_open() == 0
 
-    cel.gprs_deactivate()
-    cel.gprs_detach()
+    assert cel.gprs()
+    assert not cel.gprs(False)
 
 print("================")
 print("machine")
@@ -382,6 +376,9 @@ def f():
 assert 3 < 1e-3 * v < 5
 assert 10 < percent < 100
 
+print("========")
+print("Tests OK")
+print("========")
 print("Resetting ...")
 machine.reset()
 raise RuntimeError("Failed to reset the module")
diff --git a/ports/gprs_a9/modcellular.c b/ports/gprs_a9/modcellular.c
index cb6561a1d789a..9c587856d0e80 100644
--- a/ports/gprs_a9/modcellular.c
+++ b/ports/gprs_a9/modcellular.c
@@ -733,156 +733,138 @@ STATIC mp_obj_t modcellular_get_imsi(void) {
 
 STATIC MP_DEFINE_CONST_FUN_OBJ_0(modcellular_get_imsi_obj, modcellular_get_imsi);
 
-STATIC mp_obj_t modcellular_gprs_attach() {
-    // ========================================
-    // Attaches to the GPRS network.
-    // ========================================
-    REQUIRES_NETWORK_REGISTRATION;
-
-    uint8_t status;
-
-    // Attach
-    if (!Network_GetAttachStatus(&status)) {
-        mp_raise_CellularError("Cannot retrieve attach status");
-        return mp_const_none;
-    }
-
-    if (!status) {
-        if (!Network_StartAttach()) {
-            mp_raise_CellularError("Cannot initiate attachment");
-            return mp_const_none;
-        }
-        WAIT_UNTIL(network_status & NTW_ATT_BIT, TIMEOUT_GPRS_ATTACHMENT, 100, mp_raise_CellularError("Network attach timeout"));
+bool get_flight_mode(void) {
+    // Polls flight mode
+    bool flag;
+    if (!Network_GetFlightMode(&flag)) {
+        mp_raise_CellularError("Failed to retrieve flight mode status");
     }
-
-    return mp_const_none;
+    return !flag;  // By fact, the meaning of the output is inverse
 }
 
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(modcellular_gprs_attach_obj, modcellular_gprs_attach);
-
-STATIC mp_obj_t modcellular_gprs_detach() {
+STATIC mp_obj_t modcellular_flight_mode(size_t n_args, const mp_obj_t *args) {
     // ========================================
-    // Detaches from the GPRS network.
+    // Retrieves and switches the flight mode
+    // status.
+    // Returns:
+    //     The new flight mode status.
     // ========================================
-    REQUIRES_NETWORK_REGISTRATION;
-
-    uint8_t status;
-
-    // Attach
-    if (!Network_GetAttachStatus(&status)) {
-        mp_raise_CellularError("Cannot retrieve attach status");
-        return mp_const_none;
-    }
-
-    if (status) {
-        if (!Network_StartDetach()) {
-            mp_raise_CellularError("Cannot initiate detachment");
+    if (n_args == 1) {
+        mp_int_t set_flag = mp_obj_get_int(args[0]);
+        if (!Network_SetFlightMode(set_flag)) {
+            mp_raise_CellularError("Failed to set flight mode status");
             return mp_const_none;
         }
-        WAIT_UNTIL(!(network_status & NTW_ATT_BIT), TIMEOUT_GPRS_ATTACHMENT, 100, mp_raise_CellularError("Network detach timeout"));
+        WAIT_UNTIL(set_flag == get_flight_mode(), TIMEOUT_FLIGHT_MODE, 100, mp_raise_CellularError("Flight mode change timeout"));
     }
-
-    return mp_const_none;
+    return mp_obj_new_bool(get_flight_mode());
 }
 
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(modcellular_gprs_detach_obj, modcellular_gprs_detach);
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(modcellular_flight_mode_obj, 0, 1, modcellular_flight_mode);
 
-STATIC mp_obj_t modcellular_gprs_activate(mp_obj_t apn, mp_obj_t user, mp_obj_t pass) {
+STATIC mp_obj_t modcellular_gprs(size_t n_args, const mp_obj_t *args) {
     // ========================================
-    // Activates the GPRS network.
+    // Polls and switches GPRS status.
     // Args:
-    //     apn (str): access point name (APN);
+    //     apn (str, bool): access point name
+    //     or False if GPRS shutdown requested.
     //     user (str): username;
     //     pass (str): password;
+    // Returns:
+    //     True if GPRS is active, False
+    //     otherwise.
     // ========================================
     REQUIRES_NETWORK_REGISTRATION;
 
-    const char* c_apn = mp_obj_str_get_str(apn);
-    const char* c_user = mp_obj_str_get_str(user);
-    const char* c_pass = mp_obj_str_get_str(pass);
-
     uint8_t status;
 
-    // Attach
-    if (!Network_GetActiveStatus(&status)) {
-        mp_raise_CellularError("Cannot retrieve context activation status");
+    // Attach status
+    if (!Network_GetAttachStatus(&status)) {
+        mp_raise_CellularError("Cannot retrieve attach status");
         return mp_const_none;
     }
 
-    if (!status) {
-
-        Network_PDP_Context_t context;
-        memcpy(context.apn, c_apn, MIN(strlen(c_apn) + 1, sizeof(context.apn)));
-        memcpy(context.userName, c_user, MIN(strlen(c_user) + 1, sizeof(context.userName)));
-        memcpy(context.userPasswd, c_pass, MIN(strlen(c_pass) + 1, sizeof(context.userPasswd)));
-
-        if (!Network_StartActive(context)) {
-            mp_raise_CellularError("Cannot initiate context activation");
+    if (status) {
+        if (!Network_GetActiveStatus(&status)) {
+            mp_raise_CellularError("Cannot retrieve context activation status");
+            return mp_const_none;
+        }
+        if (status)
+            status = GPRS_STATUS_ON;
+        else
+            status = GPRS_STATUS_ATTACHED;
+    } else
+        status = GPRS_STATUS_OFF;
+
+    if (n_args == 0) {
+        return mp_obj_new_bool(status);
+
+    } else if (n_args == 1) {
+        mp_int_t flag = mp_obj_get_int(args[0]);
+        if (flag != 0) {
+            mp_raise_ValueError("Unkown integer argument supplied, zero (or False) expected");
             return mp_const_none;
         }
-        WAIT_UNTIL(network_status & NTW_ACT_BIT, TIMEOUT_GPRS_ACTIVATION, 100, mp_raise_CellularError("Network context activation timeout"));
-    }
-
-    return mp_const_none;
-}
-
-STATIC MP_DEFINE_CONST_FUN_OBJ_3(modcellular_gprs_activate_obj, modcellular_gprs_activate);
 
-STATIC mp_obj_t modcellular_gprs_deactivate(void) {
-    // ========================================
-    // Deactivates the GPRS network.
-    // ========================================
-    REQUIRES_NETWORK_REGISTRATION;
+        if (status == GPRS_STATUS_ON) {
+            if (!Network_StartDeactive(1)) {
+                mp_raise_CellularError("Cannot initiate context deactivation");
+                return mp_const_none;
+            }
+            WAIT_UNTIL(!(network_status & NTW_ACT_BIT), TIMEOUT_GPRS_ACTIVATION, 100, mp_raise_CellularError("Network context deactivation timeout"));
+            status = GPRS_STATUS_ATTACHED;
+        }
 
-    uint8_t status;
+        if (status == GPRS_STATUS_ATTACHED) {
+            if (!Network_StartDetach()) {
+                mp_raise_CellularError("Cannot initiate detachment");
+                return mp_const_none;
+            }
+            WAIT_UNTIL(!(network_status & NTW_ATT_BIT), TIMEOUT_GPRS_ATTACHMENT, 100, mp_raise_CellularError("Network detach timeout"));
+            status = GPRS_STATUS_OFF;
+        }
 
-    // Attach
-    if (!Network_GetActiveStatus(&status)) {
-        mp_raise_CellularError("Cannot retrieve context activation status");
-        return mp_const_none;
-    }
+    } else if (n_args == 3) {
+        const char* c_apn = mp_obj_str_get_str(args[0]);
+        const char* c_user = mp_obj_str_get_str(args[1]);
+        const char* c_pass = mp_obj_str_get_str(args[2]);
 
-    if (status) {
-        if (!Network_StartDeactive(1)) {
-            mp_raise_CellularError("Cannot initiate context deactivation");
+        if (status == GPRS_STATUS_ON) {
+            mp_raise_CellularError("GPRS is already on");
             return mp_const_none;
         }
-        WAIT_UNTIL(!(network_status & NTW_ACT_BIT), TIMEOUT_GPRS_ACTIVATION, 100, mp_raise_CellularError("Network context deactivation timeout"));
-    }
 
-    return mp_const_none;
-}
+        if (status == GPRS_STATUS_OFF) {
+            if (!Network_StartAttach()) {
+                mp_raise_CellularError("Cannot initiate attachment");
+                return mp_const_none;
+            }
+            WAIT_UNTIL(network_status & NTW_ATT_BIT, TIMEOUT_GPRS_ATTACHMENT, 100, mp_raise_CellularError("Network attach timeout"));
+            status = GPRS_STATUS_ATTACHED;
+        }
 
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(modcellular_gprs_deactivate_obj, modcellular_gprs_deactivate);
+        if (status == GPRS_STATUS_ATTACHED) {
+            Network_PDP_Context_t context;
+            memcpy(context.apn, c_apn, MIN(strlen(c_apn) + 1, sizeof(context.apn)));
+            memcpy(context.userName, c_user, MIN(strlen(c_user) + 1, sizeof(context.userName)));
+            memcpy(context.userPasswd, c_pass, MIN(strlen(c_pass) + 1, sizeof(context.userPasswd)));
+
+            if (!Network_StartActive(context)) {
+                mp_raise_CellularError("Cannot initiate context activation");
+                return mp_const_none;
+            }
+            WAIT_UNTIL(network_status & NTW_ACT_BIT, TIMEOUT_GPRS_ACTIVATION, 100, mp_raise_CellularError("Network context activation timeout"));
+            status = GPRS_STATUS_ON;
+        }
 
-bool get_flight_mode(void) {
-    // Polls flight mode
-    bool flag;
-    if (!Network_GetFlightMode(&flag)) {
-        mp_raise_CellularError("Failed to retrieve flight mode status");
+    } else {
+        mp_raise_ValueError("Unexpected number of argument: 0, 1 or 3 required");
     }
-    return !flag;  // By fact, the meaning of the output is inverse
-}
 
-STATIC mp_obj_t modcellular_flight_mode(size_t n_args, const mp_obj_t *args) {
-    // ========================================
-    // Retrieves and switches the flight mode
-    // status.
-    // Returns:
-    //     The new flight mode status.
-    // ========================================
-    if (n_args == 1) {
-        mp_int_t set_flag = mp_obj_get_int(args[0]);
-        if (!Network_SetFlightMode(set_flag)) {
-            mp_raise_CellularError("Failed to set flight mode status");
-            return mp_const_none;
-        }
-        WAIT_UNTIL(set_flag == get_flight_mode(), TIMEOUT_FLIGHT_MODE, 100, mp_raise_CellularError("Flight mode change timeout"));
-    }
-    return mp_obj_new_bool(get_flight_mode());
+    return mp_obj_new_bool(status == GPRS_STATUS_ON);
 }
 
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(modcellular_flight_mode_obj, 0, 1, modcellular_flight_mode);
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(modcellular_gprs_obj, 0, 3, modcellular_gprs);
 
 STATIC const mp_map_elem_t mp_module_cellular_globals_table[] = {
     { MP_OBJ_NEW_QSTR(MP_QSTR___name__), MP_OBJ_NEW_QSTR(MP_QSTR_cellular) },
@@ -901,11 +883,8 @@ STATIC const mp_map_elem_t mp_module_cellular_globals_table[] = {
     { MP_OBJ_NEW_QSTR(MP_QSTR_is_roaming), (mp_obj_t)&modcellular_is_roaming_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_get_iccid), (mp_obj_t)&modcellular_get_iccid_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_get_imsi), (mp_obj_t)&modcellular_get_imsi_obj },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_gprs_attach), (mp_obj_t)&modcellular_gprs_attach_obj },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_gprs_detach), (mp_obj_t)&modcellular_gprs_detach_obj },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_gprs_activate), (mp_obj_t)&modcellular_gprs_activate_obj },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_gprs_deactivate), (mp_obj_t)&modcellular_gprs_deactivate_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_flight_mode), (mp_obj_t)&modcellular_flight_mode_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_gprs), (mp_obj_t)&modcellular_gprs_obj },
 };
 
 STATIC MP_DEFINE_CONST_DICT(mp_module_cellular_globals, mp_module_cellular_globals_table);
diff --git a/ports/gprs_a9/modcellular.h b/ports/gprs_a9/modcellular.h
index fc350e2e38440..bf65cda574f37 100644
--- a/ports/gprs_a9/modcellular.h
+++ b/ports/gprs_a9/modcellular.h
@@ -62,6 +62,10 @@ void modcellular_notify_signal(API_Event_t* event);
 #define TIMEOUT_GPRS_ACTIVATION 10000
 #define TIMEOUT_FLIGHT_MODE 5000
 
+#define GPRS_STATUS_OFF 0
+#define GPRS_STATUS_ATTACHED 1
+#define GPRS_STATUS_ON 3
+
 #define REQUIRES_NETWORK_REGISTRATION do {if (!network_status) {mp_raise_CellularError("Network is not available: is SIM card inserted?"); return mp_const_none;}} while(0)
 #define REQUIRES_VALID_SMS_STATUS(bits) do {if (bitsum(bits) != 1) {return mp_const_none;}} while(0)
 #define WAIT_UNTIL(condition, timeout_ms, step_ms, raise) do {uint32_t __time = mp_hal_ticks_ms(); while (mp_hal_ticks_ms() - __time < (timeout_ms) && !(condition)) mp_hal_delay_ms(step_ms); if (!(condition)) {raise; return mp_const_none; }} while (0)

From 8f917c03470a15d0801344142aa711e4ba44edcb Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Fri, 1 Nov 2019 00:20:14 +0100
Subject: [PATCH 3331/3533] Add network bands and reset. Small adjustments

---
 ports/gprs_a9/README.md     |  6 +++++
 ports/gprs_a9/frozentest.py | 26 ++++++++++++++++++++
 ports/gprs_a9/modcellular.c | 47 ++++++++++++++++++++++++++++++++++++-
 ports/gprs_a9/modcellular.h |  2 +-
 4 files changed, 79 insertions(+), 2 deletions(-)

diff --git a/ports/gprs_a9/README.md b/ports/gprs_a9/README.md
index 2d0203ad56bc8..6f3642588135c 100644
--- a/ports/gprs_a9/README.md
+++ b/ports/gprs_a9/README.md
@@ -244,6 +244,12 @@ The purpose of this module is to have an access to high-level networking (SMS, G
 
   **Note**: there is no way to check whether the credentials supplied are valid.
 
+* `reset()`
+
+  Resets network settings to defaults. Disconnects GPRS.
+
+  **Raises**: `CellularError` if reset failed at any stage.
+
 ### `usocket` ###
 
 *Alias: `socket`*
diff --git a/ports/gprs_a9/frozentest.py b/ports/gprs_a9/frozentest.py
index f485ac931bfdb..20787b630edc7 100644
--- a/ports/gprs_a9/frozentest.py
+++ b/ports/gprs_a9/frozentest.py
@@ -190,6 +190,8 @@
     print("----------------")
     print("Network")
     print("----------------")
+    print("Resetting ...")
+    cel.set_bands()
 
     fm = cel.flight_mode()
     print("Flight mode:", fm)
@@ -218,6 +220,30 @@
     print("Ntw registered:", reg)
     assert reg
 
+    print("Setting a single wrong band")
+    cel.set_bands(cel.NETWORK_FREQ_BAND_PCS_1900)
+    cel.poll_network_exception()
+    for i in range(10):
+        time.sleep(1)
+        if not cel.is_network_registered():
+            break
+
+    reg = cel.is_network_registered()
+    print("Ntw registered:", reg)
+    assert not reg
+
+    print("Resetting bands")
+    cel.set_bands()
+    cel.poll_network_exception()
+    for i in range(10):
+        time.sleep(1)
+        if cel.is_network_registered():
+            break
+
+    reg = cel.is_network_registered()
+    print("Ntw registered:", reg)
+    assert reg
+
     roam = cel.is_roaming()
     print("Roaming:", roam)
     assert not roam
diff --git a/ports/gprs_a9/modcellular.c b/ports/gprs_a9/modcellular.c
index 9c587856d0e80..6e86dd9704e46 100644
--- a/ports/gprs_a9/modcellular.c
+++ b/ports/gprs_a9/modcellular.c
@@ -65,7 +65,7 @@
 
 // Tracks the status on the network
 uint8_t network_status = 0;
-uint8_t network_exception = 0;
+uint8_t network_exception = NTW_NO_EXC;
 uint8_t network_status_updated = 0;
 uint8_t network_signal_quality = 0;
 uint8_t network_signal_rx_level = 0;
@@ -762,6 +762,29 @@ STATIC mp_obj_t modcellular_flight_mode(size_t n_args, const mp_obj_t *args) {
 
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(modcellular_flight_mode_obj, 0, 1, modcellular_flight_mode);
 
+STATIC mp_obj_t modcellular_set_bands(size_t n_args, const mp_obj_t *args) {
+    // ========================================
+    // Sets 2G bands the module operates at.
+    // Args:
+    //     bands (int): a mask specifying
+    //     bands;
+    // ========================================
+    if (n_args == 0) {
+        if (!Network_SetFrequencyBand(NETWORK_FREQ_BAND_GSM_900P | NETWORK_FREQ_BAND_GSM_900E | NETWORK_FREQ_BAND_GSM_850 | NETWORK_FREQ_BAND_DCS_1800 | NETWORK_FREQ_BAND_PCS_1900)) {
+            mp_raise_CellularError("Failed to reset 2G GSM bands");
+            return mp_const_none;
+        }
+    } else if (n_args == 1) {
+        if (!Network_SetFrequencyBand(mp_obj_get_int(args[0]))) {
+            mp_raise_CellularError("Failed to set 2G GSM bands");
+            return mp_const_none;
+        }
+    }
+    return mp_const_none;
+}
+
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(modcellular_set_bands_obj, 0, 1, modcellular_set_bands);
+
 STATIC mp_obj_t modcellular_gprs(size_t n_args, const mp_obj_t *args) {
     // ========================================
     // Polls and switches GPRS status.
@@ -866,6 +889,20 @@ STATIC mp_obj_t modcellular_gprs(size_t n_args, const mp_obj_t *args) {
 
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(modcellular_gprs_obj, 0, 3, modcellular_gprs);
 
+STATIC mp_obj_t modcellular_reset(void) {
+    // ========================================
+    // Resets network settings to defaults.
+    // ========================================
+    mp_obj_t mp_false = mp_obj_new_int(0);
+    network_exception = NTW_NO_EXC;
+    modcellular_gprs(1, &mp_false);
+    modcellular_set_bands(0, NULL);
+    modcellular_flight_mode(1, mp_false);
+    return mp_const_none;
+}
+
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(modcellular_reset_obj, modcellular_reset);
+
 STATIC const mp_map_elem_t mp_module_cellular_globals_table[] = {
     { MP_OBJ_NEW_QSTR(MP_QSTR___name__), MP_OBJ_NEW_QSTR(MP_QSTR_cellular) },
 
@@ -884,7 +921,15 @@ STATIC const mp_map_elem_t mp_module_cellular_globals_table[] = {
     { MP_OBJ_NEW_QSTR(MP_QSTR_get_iccid), (mp_obj_t)&modcellular_get_iccid_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_get_imsi), (mp_obj_t)&modcellular_get_imsi_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_flight_mode), (mp_obj_t)&modcellular_flight_mode_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_set_bands), (mp_obj_t)&modcellular_set_bands_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_gprs), (mp_obj_t)&modcellular_gprs_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_reset), (mp_obj_t)&modcellular_reset_obj },
+
+    { MP_ROM_QSTR(MP_QSTR_NETWORK_FREQ_BAND_GSM_900P), MP_ROM_INT(NETWORK_FREQ_BAND_GSM_900P) },
+    { MP_ROM_QSTR(MP_QSTR_NETWORK_FREQ_BAND_GSM_900E), MP_ROM_INT(NETWORK_FREQ_BAND_GSM_900E) },
+    { MP_ROM_QSTR(MP_QSTR_NETWORK_FREQ_BAND_GSM_850),  MP_ROM_INT(NETWORK_FREQ_BAND_GSM_850)  },
+    { MP_ROM_QSTR(MP_QSTR_NETWORK_FREQ_BAND_DCS_1800), MP_ROM_INT(NETWORK_FREQ_BAND_DCS_1800) },
+    { MP_ROM_QSTR(MP_QSTR_NETWORK_FREQ_BAND_PCS_1900), MP_ROM_INT(NETWORK_FREQ_BAND_PCS_1900) },
 };
 
 STATIC MP_DEFINE_CONST_DICT(mp_module_cellular_globals, mp_module_cellular_globals_table);
diff --git a/ports/gprs_a9/modcellular.h b/ports/gprs_a9/modcellular.h
index bf65cda574f37..9576f754f7490 100644
--- a/ports/gprs_a9/modcellular.h
+++ b/ports/gprs_a9/modcellular.h
@@ -60,7 +60,7 @@ void modcellular_notify_signal(API_Event_t* event);
 #define TIMEOUT_SMS_SEND 10000
 #define TIMEOUT_GPRS_ATTACHMENT 10000
 #define TIMEOUT_GPRS_ACTIVATION 10000
-#define TIMEOUT_FLIGHT_MODE 5000
+#define TIMEOUT_FLIGHT_MODE 10000
 
 #define GPRS_STATUS_OFF 0
 #define GPRS_STATUS_ATTACHED 1

From 7a430001f06f23280d7d37b1fcbb961c886326cd Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Fri, 1 Nov 2019 00:22:34 +0100
Subject: [PATCH 3332/3533] Move API section

[skip ci]
---
 ports/gprs_a9/README.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/ports/gprs_a9/README.md b/ports/gprs_a9/README.md
index 6f3642588135c..d7918cd15ddea 100644
--- a/ports/gprs_a9/README.md
+++ b/ports/gprs_a9/README.md
@@ -220,6 +220,12 @@ The purpose of this module is to have an access to high-level networking (SMS, G
 
   **Returns**: True if in flight mode.
 
+* `reset()`
+
+  Resets network settings to defaults. Disconnects GPRS.
+
+  **Raises**: `CellularError` if reset failed at any stage.
+
 ##### GPRS #####
 
 * `gprs(apn, user=None, pass=None)`
@@ -244,12 +250,6 @@ The purpose of this module is to have an access to high-level networking (SMS, G
 
   **Note**: there is no way to check whether the credentials supplied are valid.
 
-* `reset()`
-
-  Resets network settings to defaults. Disconnects GPRS.
-
-  **Raises**: `CellularError` if reset failed at any stage.
-
 ### `usocket` ###
 
 *Alias: `socket`*

From 66af94a1c86af50741d8027931a63b968abc2094 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sat, 2 Nov 2019 01:41:20 +0100
Subject: [PATCH 3333/3533] Simplify GPRS setting and extend timeout

---
 ports/gprs_a9/modcellular.c | 43 +++++++------------------------------
 ports/gprs_a9/modcellular.h |  5 +----
 2 files changed, 9 insertions(+), 39 deletions(-)

diff --git a/ports/gprs_a9/modcellular.c b/ports/gprs_a9/modcellular.c
index 6e86dd9704e46..f8468254ffb4f 100644
--- a/ports/gprs_a9/modcellular.c
+++ b/ports/gprs_a9/modcellular.c
@@ -799,52 +799,27 @@ STATIC mp_obj_t modcellular_gprs(size_t n_args, const mp_obj_t *args) {
     // ========================================
     REQUIRES_NETWORK_REGISTRATION;
 
-    uint8_t status;
-
-    // Attach status
-    if (!Network_GetAttachStatus(&status)) {
-        mp_raise_CellularError("Cannot retrieve attach status");
-        return mp_const_none;
-    }
-
-    if (status) {
-        if (!Network_GetActiveStatus(&status)) {
-            mp_raise_CellularError("Cannot retrieve context activation status");
-            return mp_const_none;
-        }
-        if (status)
-            status = GPRS_STATUS_ON;
-        else
-            status = GPRS_STATUS_ATTACHED;
-    } else
-        status = GPRS_STATUS_OFF;
-
-    if (n_args == 0) {
-        return mp_obj_new_bool(status);
-
-    } else if (n_args == 1) {
+    if (n_args == 1) {
         mp_int_t flag = mp_obj_get_int(args[0]);
         if (flag != 0) {
             mp_raise_ValueError("Unkown integer argument supplied, zero (or False) expected");
             return mp_const_none;
         }
 
-        if (status == GPRS_STATUS_ON) {
+        if (network_status & NTW_ACT_BIT) {
             if (!Network_StartDeactive(1)) {
                 mp_raise_CellularError("Cannot initiate context deactivation");
                 return mp_const_none;
             }
             WAIT_UNTIL(!(network_status & NTW_ACT_BIT), TIMEOUT_GPRS_ACTIVATION, 100, mp_raise_CellularError("Network context deactivation timeout"));
-            status = GPRS_STATUS_ATTACHED;
         }
 
-        if (status == GPRS_STATUS_ATTACHED) {
+        if (network_status & NTW_ATT_BIT) {
             if (!Network_StartDetach()) {
                 mp_raise_CellularError("Cannot initiate detachment");
                 return mp_const_none;
             }
             WAIT_UNTIL(!(network_status & NTW_ATT_BIT), TIMEOUT_GPRS_ATTACHMENT, 100, mp_raise_CellularError("Network detach timeout"));
-            status = GPRS_STATUS_OFF;
         }
 
     } else if (n_args == 3) {
@@ -852,21 +827,20 @@ STATIC mp_obj_t modcellular_gprs(size_t n_args, const mp_obj_t *args) {
         const char* c_user = mp_obj_str_get_str(args[1]);
         const char* c_pass = mp_obj_str_get_str(args[2]);
 
-        if (status == GPRS_STATUS_ON) {
+        if (network_status & NTW_ACT_BIT) {
             mp_raise_CellularError("GPRS is already on");
             return mp_const_none;
         }
 
-        if (status == GPRS_STATUS_OFF) {
+        if (!(network_status & NTW_ATT_BIT)) {
             if (!Network_StartAttach()) {
                 mp_raise_CellularError("Cannot initiate attachment");
                 return mp_const_none;
             }
             WAIT_UNTIL(network_status & NTW_ATT_BIT, TIMEOUT_GPRS_ATTACHMENT, 100, mp_raise_CellularError("Network attach timeout"));
-            status = GPRS_STATUS_ATTACHED;
         }
 
-        if (status == GPRS_STATUS_ATTACHED) {
+        if (!(network_status & NTW_ACT_BIT)) {
             Network_PDP_Context_t context;
             memcpy(context.apn, c_apn, MIN(strlen(c_apn) + 1, sizeof(context.apn)));
             memcpy(context.userName, c_user, MIN(strlen(c_user) + 1, sizeof(context.userName)));
@@ -877,14 +851,13 @@ STATIC mp_obj_t modcellular_gprs(size_t n_args, const mp_obj_t *args) {
                 return mp_const_none;
             }
             WAIT_UNTIL(network_status & NTW_ACT_BIT, TIMEOUT_GPRS_ACTIVATION, 100, mp_raise_CellularError("Network context activation timeout"));
-            status = GPRS_STATUS_ON;
         }
 
-    } else {
+    } else if (n_args != 0) {
         mp_raise_ValueError("Unexpected number of argument: 0, 1 or 3 required");
     }
 
-    return mp_obj_new_bool(status == GPRS_STATUS_ON);
+    return mp_obj_new_bool(network_status & NTW_ACT_BIT);
 }
 
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(modcellular_gprs_obj, 0, 3, modcellular_gprs);
diff --git a/ports/gprs_a9/modcellular.h b/ports/gprs_a9/modcellular.h
index 9576f754f7490..26b69dca808a8 100644
--- a/ports/gprs_a9/modcellular.h
+++ b/ports/gprs_a9/modcellular.h
@@ -58,13 +58,10 @@ void modcellular_notify_signal(API_Event_t* event);
 
 #define TIMEOUT_SMS_LIST 10000
 #define TIMEOUT_SMS_SEND 10000
-#define TIMEOUT_GPRS_ATTACHMENT 10000
+#define TIMEOUT_GPRS_ATTACHMENT 15000
 #define TIMEOUT_GPRS_ACTIVATION 10000
 #define TIMEOUT_FLIGHT_MODE 10000
 
-#define GPRS_STATUS_OFF 0
-#define GPRS_STATUS_ATTACHED 1
-#define GPRS_STATUS_ON 3
 
 #define REQUIRES_NETWORK_REGISTRATION do {if (!network_status) {mp_raise_CellularError("Network is not available: is SIM card inserted?"); return mp_const_none;}} while(0)
 #define REQUIRES_VALID_SMS_STATUS(bits) do {if (bitsum(bits) != 1) {return mp_const_none;}} while(0)

From d8d13b78c9dfa3f429f86f4d420947751aa2f5e3 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sat, 2 Nov 2019 01:41:42 +0100
Subject: [PATCH 3334/3533] Fix typo

---
 ports/gprs_a9/modcellular.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/gprs_a9/modcellular.c b/ports/gprs_a9/modcellular.c
index f8468254ffb4f..9c51da14ebdb1 100644
--- a/ports/gprs_a9/modcellular.c
+++ b/ports/gprs_a9/modcellular.c
@@ -870,7 +870,7 @@ STATIC mp_obj_t modcellular_reset(void) {
     network_exception = NTW_NO_EXC;
     modcellular_gprs(1, &mp_false);
     modcellular_set_bands(0, NULL);
-    modcellular_flight_mode(1, mp_false);
+    modcellular_flight_mode(1, &mp_false);
     return mp_const_none;
 }
 

From 6452581dd13c8bfe6aa423fa6ac33968ba5dc94e Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sat, 2 Nov 2019 01:42:16 +0100
Subject: [PATCH 3335/3533] Add an option to list networks

---
 ports/gprs_a9/main.c        |  4 +++
 ports/gprs_a9/modcellular.c | 63 ++++++++++++++++++++++++++++++++++++-
 ports/gprs_a9/modcellular.h |  4 ++-
 3 files changed, 69 insertions(+), 2 deletions(-)

diff --git a/ports/gprs_a9/main.c b/ports/gprs_a9/main.c
index ef8c66aeaaf45..ff9f0a58a4c05 100644
--- a/ports/gprs_a9/main.c
+++ b/ports/gprs_a9/main.c
@@ -302,6 +302,10 @@ void EventDispatch(API_Event_t* pEvent)
             modcellular_notify_act(pEvent);
             break;
 
+        case API_EVENT_ID_NETWORK_AVAILABEL_OPERATOR:
+            modcellular_notify_ntwlist(pEvent);
+            break;
+
         // SMS
         // ===
 
diff --git a/ports/gprs_a9/modcellular.c b/ports/gprs_a9/modcellular.c
index 9c51da14ebdb1..950c911c6c839 100644
--- a/ports/gprs_a9/modcellular.c
+++ b/ports/gprs_a9/modcellular.c
@@ -81,9 +81,16 @@ uint8_t sms_send_flag = 0;
 // -------------------
 
 // A buffer used for listing messages
-mp_obj_list_t* sms_list_buffer = NULL;
+mp_obj_list_t *sms_list_buffer = NULL;
 uint8_t sms_list_buffer_count = 0;
 
+// ---------------------------
+// Vars: Network operator list
+// ---------------------------
+
+uint8_t network_list_buffer_len = 0;
+Network_Operator_Info_t *network_list_buffer = NULL;
+
 // SMS parsing
 STATIC mp_obj_t modcellular_sms_from_record(SMS_Message_Info_t* record);
 STATIC mp_obj_t modcellular_sms_from_raw(uint8_t* header, uint32_t header_length, uint8_t* content, uint32_t content_length);
@@ -184,6 +191,18 @@ void modcellular_notify_act(API_Event_t* event) {
     network_status_updated = 1;
 }
 
+// Networks
+
+void modcellular_notify_ntwlist(API_Event_t* event) {
+    network_list_buffer_len = event->param1;
+
+    if (network_list_buffer != NULL)
+        free(network_list_buffer);
+    network_list_buffer = malloc(sizeof(Network_Operator_Info_t) * (network_list_buffer_len + 1));  // One more item added for empty outputs
+    if (network_list_buffer != NULL)
+        memcpy(network_list_buffer, event->pParam1, sizeof(Network_Operator_Info_t) * network_list_buffer_len);
+}
+
 // SMS
 
 void modcellular_notify_sms_list(API_Event_t* event) {
@@ -862,6 +881,42 @@ STATIC mp_obj_t modcellular_gprs(size_t n_args, const mp_obj_t *args) {
 
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(modcellular_gprs_obj, 0, 3, modcellular_gprs);
 
+STATIC mp_obj_t modcellular_list_operators(void) {
+    // ========================================
+    // Lists network operators.
+    // ========================================
+    network_list_buffer = NULL;
+    if (!Network_GetAvailableOperatorReq()) {
+        mp_raise_CellularError("Failed to poll available operators");
+        return mp_const_none;
+    }
+    WAIT_UNTIL(network_list_buffer != NULL, TIMEOUT_LIST_OPERATORS, 100, mp_raise_CellularError("Network list timeout"));
+
+    mp_obj_t items[network_list_buffer_len];
+    for (int i=0; i < network_list_buffer_len; i++) {
+
+        // Name
+        uint8_t *op_name;
+        if (!Network_GetOperatorNameById(network_list_buffer[i].operatorId, &op_name)) {
+            mp_raise_CellularError("Failed to poll operator name");
+            return mp_const_none;
+        }
+
+        mp_obj_t tuple[3] = {
+            mp_obj_new_bytearray(sizeof(network_list_buffer[i].operatorId), network_list_buffer[i].operatorId),
+            mp_obj_new_int(network_list_buffer[i].status),
+            mp_obj_new_str((char*) op_name, strlen((char*) op_name)),
+        };
+        items[i] = mp_obj_new_tuple(sizeof(tuple) / sizeof(mp_obj_t), tuple);
+    }
+
+    free(network_list_buffer);
+
+    return mp_obj_new_list(sizeof(items) / sizeof(mp_obj_t), items);
+}
+
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(modcellular_list_operators_obj, modcellular_list_operators);
+
 STATIC mp_obj_t modcellular_reset(void) {
     // ========================================
     // Resets network settings to defaults.
@@ -896,6 +951,7 @@ STATIC const mp_map_elem_t mp_module_cellular_globals_table[] = {
     { MP_OBJ_NEW_QSTR(MP_QSTR_flight_mode), (mp_obj_t)&modcellular_flight_mode_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_set_bands), (mp_obj_t)&modcellular_set_bands_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_gprs), (mp_obj_t)&modcellular_gprs_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_list_operators), (mp_obj_t)&modcellular_list_operators_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_reset), (mp_obj_t)&modcellular_reset_obj },
 
     { MP_ROM_QSTR(MP_QSTR_NETWORK_FREQ_BAND_GSM_900P), MP_ROM_INT(NETWORK_FREQ_BAND_GSM_900P) },
@@ -903,6 +959,11 @@ STATIC const mp_map_elem_t mp_module_cellular_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_NETWORK_FREQ_BAND_GSM_850),  MP_ROM_INT(NETWORK_FREQ_BAND_GSM_850)  },
     { MP_ROM_QSTR(MP_QSTR_NETWORK_FREQ_BAND_DCS_1800), MP_ROM_INT(NETWORK_FREQ_BAND_DCS_1800) },
     { MP_ROM_QSTR(MP_QSTR_NETWORK_FREQ_BAND_PCS_1900), MP_ROM_INT(NETWORK_FREQ_BAND_PCS_1900) },
+
+    { MP_ROM_QSTR(MP_QSTR_OPERATOR_STATUS_UNKNOWN), MP_ROM_INT(0) },
+    { MP_ROM_QSTR(MP_QSTR_OPERATOR_STATUS_AVAILABLE), MP_ROM_INT(1) },
+    { MP_ROM_QSTR(MP_QSTR_OPERATOR_STATUS_CURRENT), MP_ROM_INT(2) },
+    { MP_ROM_QSTR(MP_QSTR_OPERATOR_STATUS_DISABLED), MP_ROM_INT(3) },
 };
 
 STATIC MP_DEFINE_CONST_DICT(mp_module_cellular_globals, mp_module_cellular_globals_table);
diff --git a/ports/gprs_a9/modcellular.h b/ports/gprs_a9/modcellular.h
index 26b69dca808a8..8bbbf3a10d7a3 100644
--- a/ports/gprs_a9/modcellular.h
+++ b/ports/gprs_a9/modcellular.h
@@ -50,6 +50,8 @@ void modcellular_notify_deact(API_Event_t* event);
 void modcellular_notify_act_failed(API_Event_t* event);
 void modcellular_notify_act(API_Event_t* event);
 
+void modcellular_notify_ntwlist(API_Event_t* event);
+
 void modcellular_notify_sms_list(API_Event_t* event);
 void modcellular_notify_sms_sent(API_Event_t* event);
 void modcellular_notify_sms_error(API_Event_t* event);
@@ -61,7 +63,7 @@ void modcellular_notify_signal(API_Event_t* event);
 #define TIMEOUT_GPRS_ATTACHMENT 15000
 #define TIMEOUT_GPRS_ACTIVATION 10000
 #define TIMEOUT_FLIGHT_MODE 10000
-
+#define TIMEOUT_LIST_OPERATORS 15000
 
 #define REQUIRES_NETWORK_REGISTRATION do {if (!network_status) {mp_raise_CellularError("Network is not available: is SIM card inserted?"); return mp_const_none;}} while(0)
 #define REQUIRES_VALID_SMS_STATUS(bits) do {if (bitsum(bits) != 1) {return mp_const_none;}} while(0)

From bfc5207f4d0f87b807f8133255241d5d952ae23a Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sat, 2 Nov 2019 01:47:13 +0100
Subject: [PATCH 3336/3533] Update tests

---
 ports/gprs_a9/frozentest.py | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/ports/gprs_a9/frozentest.py b/ports/gprs_a9/frozentest.py
index 20787b630edc7..a462bfc23e531 100644
--- a/ports/gprs_a9/frozentest.py
+++ b/ports/gprs_a9/frozentest.py
@@ -6,6 +6,9 @@
 test_fs = False
 # test_fs = True
 
+# Operator name expected
+opname_expected = "KPNNL"
+
 print("================")
 print("std")
 print("================")
@@ -191,7 +194,21 @@
     print("Network")
     print("----------------")
     print("Resetting ...")
-    cel.set_bands()
+    cel.reset()
+    print("Waiting 15 secs ...")
+    time.sleep(15)
+
+    print("Scanning ...")
+    ops = cel.list_operators()
+    print("Operators:", ops)
+    assert len(ops) > 0
+
+    for op_id, op_status, op_name in ops:
+        if op_name == opname_expected:
+            assert op_status == cel.OPERATOR_STATUS_CURRENT
+            break
+    else:
+        raise RuntimeError("Operator '{}' not found".format(opname_expected))
 
     fm = cel.flight_mode()
     print("Flight mode:", fm)

From c2a05a7f7f8f7d00da230e3a2be07144e1dc3edb Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sat, 2 Nov 2019 02:01:39 +0100
Subject: [PATCH 3337/3533] Fix defaults

---
 ports/gprs_a9/modusocket.c | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/ports/gprs_a9/modusocket.c b/ports/gprs_a9/modusocket.c
index dc7e139aeb8e0..d7c8a39846bbf 100644
--- a/ports/gprs_a9/modusocket.c
+++ b/ports/gprs_a9/modusocket.c
@@ -626,9 +626,9 @@ STATIC mp_obj_t getaddrinfo(size_t n_args, const mp_obj_t *pos_args, mp_map_t *k
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_host, MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
         { MP_QSTR_port, MP_ARG_REQUIRED | MP_ARG_INT, {.u_int = 0} },
-        { MP_QSTR_af, MP_ARG_INT, {.u_int = AF_INET} },
-        { MP_QSTR_type, MP_ARG_INT, {.u_int = SOCK_STREAM} },
-        { MP_QSTR_proto, MP_ARG_INT, {.u_int = IPPROTO_TCP} },
+        { MP_QSTR_af, MP_ARG_INT, {.u_int = 0} },
+        { MP_QSTR_type, MP_ARG_INT, {.u_int = 0} },
+        { MP_QSTR_proto, MP_ARG_INT, {.u_int = 0} },
         { MP_QSTR_flag, MP_ARG_INT, {.u_int = 0} },
     };
 
@@ -640,11 +640,14 @@ STATIC mp_obj_t getaddrinfo(size_t n_args, const mp_obj_t *pos_args, mp_map_t *k
 
     int af;
     switch (args[ARG_af].u_int) {
+        case 0:
+            af = AF_INET;
+            break;
         case AF_INET:
             af = AF_INET;
             break;
         case AF_INET6:
-            mp_raise_ValueError("argument #3: af=AF_INET6 is not implemented");
+            mp_raise_ValueError("TODO argument #3: af=AF_INET6 is not implemented");
             break;
         default:
             mp_raise_ValueError("argument #3: 'af' should be one of AF_INET, AF_INET6");
@@ -653,6 +656,9 @@ STATIC mp_obj_t getaddrinfo(size_t n_args, const mp_obj_t *pos_args, mp_map_t *k
 
     int type;
     switch (args[ARG_type].u_int) {
+        case 0:
+            type = SOCK_STREAM;
+            break;
         case SOCK_STREAM:
             type = SOCK_STREAM;
             break;
@@ -666,6 +672,9 @@ STATIC mp_obj_t getaddrinfo(size_t n_args, const mp_obj_t *pos_args, mp_map_t *k
 
     int proto;
     switch (args[ARG_proto].u_int) {
+        case 0:
+            proto = IPPROTO_TCP;
+            break;
         case IPPROTO_TCP:
             proto = IPPROTO_TCP;
             break;

From e982b2ec3563edf5dc9e2f71633e567b8b9ff2dc Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sat, 2 Nov 2019 23:51:49 +0100
Subject: [PATCH 3338/3533] Update docs

[skip ci]
---
 ports/gprs_a9/README.md | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/ports/gprs_a9/README.md b/ports/gprs_a9/README.md
index d7918cd15ddea..0a1a4c9f02d5e 100644
--- a/ports/gprs_a9/README.md
+++ b/ports/gprs_a9/README.md
@@ -93,6 +93,11 @@ Provides cellular functionality.
 As usual, the original API does not give access to radio-level and low-level functionality such as controlling the registration on the cellular network: these are performed in the background automatically.
 The purpose of this module is to have an access to high-level networking (SMS, GPRS, calls) as well as to read the status of various components of cellular networking.
 
+#### Constants ####
+
+Frequencies: `NETWORK_FREQ_BAND_GSM_900P`, `NETWORK_FREQ_BAND_GSM_900E`, `NETWORK_FREQ_BAND_GSM_850`, `NETWORK_FREQ_BAND_DCS_1800`, `NETWORK_FREQ_BAND_PCS_1900`.
+Operator status: `OPERATOR_STATUS_UNKNOWN`, `OPERATOR_STATUS_AVAILABLE`, `OPERATOR_STATUS_CURRENT`, `OPERATOR_STATUS_DISABLED`.
+
 #### Classes ####
 
 * `SMS(phone_number, message)`
@@ -220,6 +225,26 @@ The purpose of this module is to have an access to high-level networking (SMS, G
 
   **Returns**: True if in flight mode.
 
+* `set_bands(bands)`
+
+  Sets frequency bands.
+
+  **Args**:
+
+    * bands (int): a mask specifying frequencies, see constants above.
+      If no argument specified, sets all bands.
+
+* `list_operators()`
+
+  Lists available operators.
+
+  **Returns**: A list of tuples `(op_id, op_name, op_status)` with operator data.
+  The first element is a 6-byte operator ID.
+  The second element is operator name.
+  The third element is the status of the operator network with respect to this module, see one of the constants above.
+
+  **Note**: Ignores virtual operators.
+
 * `reset()`
 
   Resets network settings to defaults. Disconnects GPRS.

From bf8766331d847fd7d335aac9850e2cb9c24c62a6 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sun, 3 Nov 2019 01:39:19 +0100
Subject: [PATCH 3339/3533] Add register and rename the scan function

---
 ports/gprs_a9/README.md     | 16 +++++++-
 ports/gprs_a9/frozentest.py |  4 ++
 ports/gprs_a9/modcellular.c | 74 +++++++++++++++++++++++++++++++++++--
 ports/gprs_a9/modcellular.h |  1 +
 4 files changed, 91 insertions(+), 4 deletions(-)

diff --git a/ports/gprs_a9/README.md b/ports/gprs_a9/README.md
index 0a1a4c9f02d5e..5be2cf59dd6e3 100644
--- a/ports/gprs_a9/README.md
+++ b/ports/gprs_a9/README.md
@@ -97,6 +97,7 @@ The purpose of this module is to have an access to high-level networking (SMS, G
 
 Frequencies: `NETWORK_FREQ_BAND_GSM_900P`, `NETWORK_FREQ_BAND_GSM_900E`, `NETWORK_FREQ_BAND_GSM_850`, `NETWORK_FREQ_BAND_DCS_1800`, `NETWORK_FREQ_BAND_PCS_1900`.
 Operator status: `OPERATOR_STATUS_UNKNOWN`, `OPERATOR_STATUS_AVAILABLE`, `OPERATOR_STATUS_CURRENT`, `OPERATOR_STATUS_DISABLED`.
+Network modes: `NETWORK_MODE_MANUAL`, `NETWORK_MODE_AUTO`, `NETWORK_MODE_MANUAL_AUTO`.
 
 #### Classes ####
 
@@ -234,7 +235,7 @@ Operator status: `OPERATOR_STATUS_UNKNOWN`, `OPERATOR_STATUS_AVAILABLE`, `OPERAT
     * bands (int): a mask specifying frequencies, see constants above.
       If no argument specified, sets all bands.
 
-* `list_operators()`
+* `scan()`
 
   Lists available operators.
 
@@ -245,6 +246,19 @@ Operator status: `OPERATOR_STATUS_UNKNOWN`, `OPERATOR_STATUS_AVAILABLE`, `OPERAT
 
   **Note**: Ignores virtual operators.
 
+* `register(operator_id, register_mode)`
+
+  Registers on the network and retrieve the current network ID.
+
+  **Args**:
+
+    * `operator_id` (byterray, bool): a 6-byte operator ID of `False` if a de-registration requested;
+    * `register_mode` (int): registration mode, see one of the constants above;
+
+  **Returns**: Operator ID (6 bytes) and register mode (int).
+
+  **TODO**: Figure out how (and whether) registration works.
+
 * `reset()`
 
   Resets network settings to defaults. Disconnects GPRS.
diff --git a/ports/gprs_a9/frozentest.py b/ports/gprs_a9/frozentest.py
index a462bfc23e531..18643939afec1 100644
--- a/ports/gprs_a9/frozentest.py
+++ b/ports/gprs_a9/frozentest.py
@@ -198,6 +198,9 @@
     print("Waiting 15 secs ...")
     time.sleep(15)
 
+    op, status = cel.register()
+    print("Current operator:", op)
+
     print("Scanning ...")
     ops = cel.list_operators()
     print("Operators:", ops)
@@ -206,6 +209,7 @@
     for op_id, op_status, op_name in ops:
         if op_name == opname_expected:
             assert op_status == cel.OPERATOR_STATUS_CURRENT
+            assert op_id == op
             break
     else:
         raise RuntimeError("Operator '{}' not found".format(opname_expected))
diff --git a/ports/gprs_a9/modcellular.c b/ports/gprs_a9/modcellular.c
index 950c911c6c839..19ac7ee823499 100644
--- a/ports/gprs_a9/modcellular.c
+++ b/ports/gprs_a9/modcellular.c
@@ -34,6 +34,7 @@
 #include "py/runtime.h"
 #include "py/binary.h"
 #include "py/objexcept.h"
+#include "py/objarray.h"
 
 #include "api_info.h"
 #include "api_sim.h"
@@ -881,7 +882,7 @@ STATIC mp_obj_t modcellular_gprs(size_t n_args, const mp_obj_t *args) {
 
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(modcellular_gprs_obj, 0, 3, modcellular_gprs);
 
-STATIC mp_obj_t modcellular_list_operators(void) {
+STATIC mp_obj_t modcellular_scan(void) {
     // ========================================
     // Lists network operators.
     // ========================================
@@ -915,7 +916,68 @@ STATIC mp_obj_t modcellular_list_operators(void) {
     return mp_obj_new_list(sizeof(items) / sizeof(mp_obj_t), items);
 }
 
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(modcellular_list_operators_obj, modcellular_list_operators);
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(modcellular_scan_obj, modcellular_scan);
+
+STATIC mp_obj_t modcellular_register(size_t n_args, const mp_obj_t *args) {
+    // ========================================
+    // Lists network operators.
+    // ========================================
+    if (n_args == 1) {
+        mp_int_t flag = mp_obj_get_int(args[0]);
+        if (flag != 0) {
+            mp_raise_ValueError("Unkown integer argument supplied, zero (or False) expected");
+            return mp_const_none;
+        }
+
+        if (!Network_DeRegister()) {
+            mp_raise_CellularError("Failed to request deregistration");
+            return mp_const_none;
+        }
+        WAIT_UNTIL(!(network_status & NTW_REG_BIT), TIMEOUT_REG, 100, mp_raise_CellularError("De-registration timeout"));
+
+    } else if (n_args == 2) {
+        mp_obj_array_t *op_id = MP_OBJ_TO_PTR(args[0]);
+        mp_int_t op_mode = mp_obj_get_int(args[1]);
+
+        if (op_id->base.type != &mp_type_bytearray) {
+            mp_raise_ValueError("A bytearray expected");
+            return mp_const_none;
+        }
+
+        if (op_id->len != 6) {
+            mp_raise_ValueError("The length of the input bytearray should be 6");
+            return mp_const_none;
+        }
+
+        if (op_mode != NETWORK_REGISTER_MODE_MANUAL && op_mode != NETWORK_REGISTER_MODE_AUTO && op_mode != NETWORK_REGISTER_MODE_MANUAL_AUTO) {
+            mp_raise_ValueError("The mode should be one of NETWORK_REGISTER_MODE_*");
+            return mp_const_none;
+        }
+
+        if (!Network_Register((uint8_t*) op_id->items, (Network_Register_Mode_t) op_mode)) {
+            mp_raise_CellularError("Failed to request network registration");
+            return mp_const_none;
+        }
+        WAIT_UNTIL(network_status & NTW_REG_BIT, TIMEOUT_REG, 100, mp_raise_CellularError("Registration timeout"));
+    }
+
+    uint8_t op_id[6];
+    Network_Register_Mode_t op_mode;
+
+    if (!Network_GetCurrentOperator(op_id, &op_mode)) {
+        mp_raise_CellularError("Failed to poll current operator");
+        return mp_const_none;
+    }
+
+    mp_obj_t tuple[2] = {
+        mp_obj_new_bytearray(sizeof(op_id), op_id),
+        mp_obj_new_int((uint8_t) op_mode),
+    };
+
+    return mp_obj_new_tuple(sizeof(tuple) / sizeof(mp_obj_t), tuple);
+}
+
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(modcellular_register_obj, 0, 2, modcellular_register);
 
 STATIC mp_obj_t modcellular_reset(void) {
     // ========================================
@@ -951,7 +1013,8 @@ STATIC const mp_map_elem_t mp_module_cellular_globals_table[] = {
     { MP_OBJ_NEW_QSTR(MP_QSTR_flight_mode), (mp_obj_t)&modcellular_flight_mode_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_set_bands), (mp_obj_t)&modcellular_set_bands_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_gprs), (mp_obj_t)&modcellular_gprs_obj },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_list_operators), (mp_obj_t)&modcellular_list_operators_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_scan), (mp_obj_t)&modcellular_scan_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_register), (mp_obj_t)&modcellular_register_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_reset), (mp_obj_t)&modcellular_reset_obj },
 
     { MP_ROM_QSTR(MP_QSTR_NETWORK_FREQ_BAND_GSM_900P), MP_ROM_INT(NETWORK_FREQ_BAND_GSM_900P) },
@@ -964,6 +1027,11 @@ STATIC const mp_map_elem_t mp_module_cellular_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_OPERATOR_STATUS_AVAILABLE), MP_ROM_INT(1) },
     { MP_ROM_QSTR(MP_QSTR_OPERATOR_STATUS_CURRENT), MP_ROM_INT(2) },
     { MP_ROM_QSTR(MP_QSTR_OPERATOR_STATUS_DISABLED), MP_ROM_INT(3) },
+
+    { MP_ROM_QSTR(MP_QSTR_NETWORK_MODE_MANUAL),      MP_ROM_INT(NETWORK_REGISTER_MODE_MANUAL)      },
+    { MP_ROM_QSTR(MP_QSTR_NETWORK_MODE_AUTO),        MP_ROM_INT(NETWORK_REGISTER_MODE_AUTO)        },
+    { MP_ROM_QSTR(MP_QSTR_NETWORK_MODE_MANUAL_AUTO), MP_ROM_INT(NETWORK_REGISTER_MODE_MANUAL_AUTO) },
+    
 };
 
 STATIC MP_DEFINE_CONST_DICT(mp_module_cellular_globals, mp_module_cellular_globals_table);
diff --git a/ports/gprs_a9/modcellular.h b/ports/gprs_a9/modcellular.h
index 8bbbf3a10d7a3..aa30b60ee7f42 100644
--- a/ports/gprs_a9/modcellular.h
+++ b/ports/gprs_a9/modcellular.h
@@ -64,6 +64,7 @@ void modcellular_notify_signal(API_Event_t* event);
 #define TIMEOUT_GPRS_ACTIVATION 10000
 #define TIMEOUT_FLIGHT_MODE 10000
 #define TIMEOUT_LIST_OPERATORS 15000
+#define TIMEOUT_REG 10000
 
 #define REQUIRES_NETWORK_REGISTRATION do {if (!network_status) {mp_raise_CellularError("Network is not available: is SIM card inserted?"); return mp_const_none;}} while(0)
 #define REQUIRES_VALID_SMS_STATUS(bits) do {if (bitsum(bits) != 1) {return mp_const_none;}} while(0)

From 70b6449a3d20b2562f4e16925a29a31c412b2daa Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sun, 3 Nov 2019 14:25:46 +0100
Subject: [PATCH 3340/3533] A proper reset, remove context attachment, update
 test

---
 ports/gprs_a9/frozentest.py |  2 +-
 ports/gprs_a9/modcellular.c | 64 ++++++++++++++++++++++++-------------
 2 files changed, 43 insertions(+), 23 deletions(-)

diff --git a/ports/gprs_a9/frozentest.py b/ports/gprs_a9/frozentest.py
index 18643939afec1..e0bdd13fe3d93 100644
--- a/ports/gprs_a9/frozentest.py
+++ b/ports/gprs_a9/frozentest.py
@@ -202,7 +202,7 @@
     print("Current operator:", op)
 
     print("Scanning ...")
-    ops = cel.list_operators()
+    ops = cel.scan()
     print("Operators:", ops)
     assert len(ops) > 0
 
diff --git a/ports/gprs_a9/modcellular.c b/ports/gprs_a9/modcellular.c
index 19ac7ee823499..ede149fa3f5b6 100644
--- a/ports/gprs_a9/modcellular.c
+++ b/ports/gprs_a9/modcellular.c
@@ -97,9 +97,39 @@ STATIC mp_obj_t modcellular_sms_from_record(SMS_Message_Info_t* record);
 STATIC mp_obj_t modcellular_sms_from_raw(uint8_t* header, uint32_t header_length, uint8_t* content, uint32_t content_length);
 
 void modcellular_init0(void) {
+    // Reset statuses
     network_status_updated = 0;
-    network_exception = 0;
+    network_exception = NTW_NO_EXC;
     sms_received_count = 0;
+
+    uint8_t status;
+
+    // Deactivate
+    if (Network_GetActiveStatus(&status)) {
+        if (status)
+            network_status |= NTW_ACT_BIT;
+        else
+            network_status &= ~NTW_ACT_BIT;
+    }
+
+    if (network_status & NTW_ACT_BIT)
+        if (Network_StartDeactive(1))
+            WAIT_UNTIL(!(network_status & NTW_ACT_BIT), TIMEOUT_GPRS_ACTIVATION, 100, break);
+
+    // Poll attachment status
+    // TODO: attachment status does not really work
+    if (Network_GetAttachStatus(&status)) {
+        if (status)
+            network_status |= NTW_ATT_BIT;
+        else
+            network_status &= ~NTW_ATT_BIT;
+    }
+
+    // Set bands to default
+    Network_SetFrequencyBand(NETWORK_FREQ_BAND_GSM_900P | NETWORK_FREQ_BAND_GSM_900E | NETWORK_FREQ_BAND_GSM_850 | NETWORK_FREQ_BAND_DCS_1800 | NETWORK_FREQ_BAND_PCS_1900);
+
+    // Turn off flight mode
+    Network_SetFlightMode(0);
 }
 
 // ----------
@@ -805,6 +835,14 @@ STATIC mp_obj_t modcellular_set_bands(size_t n_args, const mp_obj_t *args) {
 
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(modcellular_set_bands_obj, 0, 1, modcellular_set_bands);
 
+bool __is_attached(void) {
+    uint8_t status;
+    if (Network_GetAttachStatus(&status)) {
+        return status;
+    }
+    return false;
+}
+
 STATIC mp_obj_t modcellular_gprs(size_t n_args, const mp_obj_t *args) {
     // ========================================
     // Polls and switches GPRS status.
@@ -834,14 +872,6 @@ STATIC mp_obj_t modcellular_gprs(size_t n_args, const mp_obj_t *args) {
             WAIT_UNTIL(!(network_status & NTW_ACT_BIT), TIMEOUT_GPRS_ACTIVATION, 100, mp_raise_CellularError("Network context deactivation timeout"));
         }
 
-        if (network_status & NTW_ATT_BIT) {
-            if (!Network_StartDetach()) {
-                mp_raise_CellularError("Cannot initiate detachment");
-                return mp_const_none;
-            }
-            WAIT_UNTIL(!(network_status & NTW_ATT_BIT), TIMEOUT_GPRS_ATTACHMENT, 100, mp_raise_CellularError("Network detach timeout"));
-        }
-
     } else if (n_args == 3) {
         const char* c_apn = mp_obj_str_get_str(args[0]);
         const char* c_user = mp_obj_str_get_str(args[1]);
@@ -851,14 +881,7 @@ STATIC mp_obj_t modcellular_gprs(size_t n_args, const mp_obj_t *args) {
             mp_raise_CellularError("GPRS is already on");
             return mp_const_none;
         }
-
-        if (!(network_status & NTW_ATT_BIT)) {
-            if (!Network_StartAttach()) {
-                mp_raise_CellularError("Cannot initiate attachment");
-                return mp_const_none;
-            }
-            WAIT_UNTIL(network_status & NTW_ATT_BIT, TIMEOUT_GPRS_ATTACHMENT, 100, mp_raise_CellularError("Network attach timeout"));
-        }
+        WAIT_UNTIL(__is_attached(), TIMEOUT_GPRS_ATTACHMENT, 100, mp_raise_CellularError("Network is not attached: try resetting"));
 
         if (!(network_status & NTW_ACT_BIT)) {
             Network_PDP_Context_t context;
@@ -866,6 +889,7 @@ STATIC mp_obj_t modcellular_gprs(size_t n_args, const mp_obj_t *args) {
             memcpy(context.userName, c_user, MIN(strlen(c_user) + 1, sizeof(context.userName)));
             memcpy(context.userPasswd, c_pass, MIN(strlen(c_pass) + 1, sizeof(context.userPasswd)));
 
+            
             if (!Network_StartActive(context)) {
                 mp_raise_CellularError("Cannot initiate context activation");
                 return mp_const_none;
@@ -983,11 +1007,7 @@ STATIC mp_obj_t modcellular_reset(void) {
     // ========================================
     // Resets network settings to defaults.
     // ========================================
-    mp_obj_t mp_false = mp_obj_new_int(0);
-    network_exception = NTW_NO_EXC;
-    modcellular_gprs(1, &mp_false);
-    modcellular_set_bands(0, NULL);
-    modcellular_flight_mode(1, &mp_false);
+    modcellular_init0();
     return mp_const_none;
 }
 

From b878c87d37eaacfa9817136c4c02c419005cb8e9 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sun, 3 Nov 2019 14:44:32 +0100
Subject: [PATCH 3341/3533] Add operator name and reorder the output in
 operator tuples

---
 ports/gprs_a9/frozentest.py |  9 +++++----
 ports/gprs_a9/modcellular.c | 11 +++++++++--
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/ports/gprs_a9/frozentest.py b/ports/gprs_a9/frozentest.py
index e0bdd13fe3d93..66eb43f465f16 100644
--- a/ports/gprs_a9/frozentest.py
+++ b/ports/gprs_a9/frozentest.py
@@ -198,18 +198,19 @@
     print("Waiting 15 secs ...")
     time.sleep(15)
 
-    op, status = cel.register()
-    print("Current operator:", op)
+    cop_id, cop_name, status = cel.register()
+    print("Current operator:", cop_id, cop_name)
+    assert cop_name == opname_expected
 
     print("Scanning ...")
     ops = cel.scan()
     print("Operators:", ops)
     assert len(ops) > 0
 
-    for op_id, op_status, op_name in ops:
+    for op_id, op_name, op_status in ops:
         if op_name == opname_expected:
             assert op_status == cel.OPERATOR_STATUS_CURRENT
-            assert op_id == op
+            assert op_id == cop_id
             break
     else:
         raise RuntimeError("Operator '{}' not found".format(opname_expected))
diff --git a/ports/gprs_a9/modcellular.c b/ports/gprs_a9/modcellular.c
index ede149fa3f5b6..1bf5de99b1bdc 100644
--- a/ports/gprs_a9/modcellular.c
+++ b/ports/gprs_a9/modcellular.c
@@ -929,8 +929,8 @@ STATIC mp_obj_t modcellular_scan(void) {
 
         mp_obj_t tuple[3] = {
             mp_obj_new_bytearray(sizeof(network_list_buffer[i].operatorId), network_list_buffer[i].operatorId),
-            mp_obj_new_int(network_list_buffer[i].status),
             mp_obj_new_str((char*) op_name, strlen((char*) op_name)),
+            mp_obj_new_int(network_list_buffer[i].status),
         };
         items[i] = mp_obj_new_tuple(sizeof(tuple) / sizeof(mp_obj_t), tuple);
     }
@@ -993,8 +993,15 @@ STATIC mp_obj_t modcellular_register(size_t n_args, const mp_obj_t *args) {
         return mp_const_none;
     }
 
-    mp_obj_t tuple[2] = {
+    uint8_t *op_name;
+    if (!Network_GetOperatorNameById(op_id, &op_name)) {
+        mp_raise_CellularError("Failed to poll operator name");
+        return mp_const_none;
+    }
+
+    mp_obj_t tuple[3] = {
         mp_obj_new_bytearray(sizeof(op_id), op_id),
+        mp_obj_new_str((char*) op_name, strlen((char*) op_name)),
         mp_obj_new_int((uint8_t) op_mode),
     };
 

From fc9d66496adbbb5559410bef08cf706a6e3204c4 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sun, 3 Nov 2019 14:45:55 +0100
Subject: [PATCH 3342/3533] Update docs

[skip ci]
---
 ports/gprs_a9/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/gprs_a9/README.md b/ports/gprs_a9/README.md
index 5be2cf59dd6e3..46f1b17845aa3 100644
--- a/ports/gprs_a9/README.md
+++ b/ports/gprs_a9/README.md
@@ -255,7 +255,7 @@ Network modes: `NETWORK_MODE_MANUAL`, `NETWORK_MODE_AUTO`, `NETWORK_MODE_MANUAL_
     * `operator_id` (byterray, bool): a 6-byte operator ID of `False` if a de-registration requested;
     * `register_mode` (int): registration mode, see one of the constants above;
 
-  **Returns**: Operator ID (6 bytes) and register mode (int).
+  **Returns**: Operator ID (6 bytes), operator name (str) and register mode (int).
 
   **TODO**: Figure out how (and whether) registration works.
 

From a5458a6e6447b4e9c56cbdd5ae04a87203d5da1f Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sun, 3 Nov 2019 14:51:50 +0100
Subject: [PATCH 3343/3533] Fix pipelines

---
 azure-pipelines.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index fc52f975d0aac..f3a3f8832dbb1 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -46,6 +46,7 @@ stages:
     - checkout: self
   
     - script: |
+        sudo apt-get update
         sudo apt-get install gcc-arm-none-eabi
         sudo apt-get install libnewlib-arm-none-eabi
         sudo apt-get install qemu-system

From 9dc62de9325fb61455b92783eadb339a3c0d7052 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sun, 3 Nov 2019 22:02:00 +0100
Subject: [PATCH 3344/3533] Add incoming and missing call numbers

---
 ports/gprs_a9/README.md     |  8 ++++++
 ports/gprs_a9/main.c        | 11 +++++++
 ports/gprs_a9/modcellular.c | 57 ++++++++++++++++++++++++++++++++++++-
 ports/gprs_a9/modcellular.h |  4 +++
 4 files changed, 79 insertions(+), 1 deletion(-)

diff --git a/ports/gprs_a9/README.md b/ports/gprs_a9/README.md
index 46f1b17845aa3..db3d61d787b9e 100644
--- a/ports/gprs_a9/README.md
+++ b/ports/gprs_a9/README.md
@@ -289,6 +289,14 @@ Network modes: `NETWORK_MODE_MANUAL`, `NETWORK_MODE_AUTO`, `NETWORK_MODE_MANUAL_
 
   **Note**: there is no way to check whether the credentials supplied are valid.
 
+##### Calls #####
+
+* `call()`
+
+  Calls and call status.
+
+  **Returns**: A list of calls missed and the incoming call number or `None` if no incoming calls at the moment.
+
 ### `usocket` ###
 
 *Alias: `socket`*
diff --git a/ports/gprs_a9/main.c b/ports/gprs_a9/main.c
index ff9f0a58a4c05..cb7cfae8511e2 100644
--- a/ports/gprs_a9/main.c
+++ b/ports/gprs_a9/main.c
@@ -332,6 +332,17 @@ void EventDispatch(API_Event_t* pEvent)
             modcellular_notify_signal(pEvent);
             break;
 
+        // Call
+        // ====
+
+        case API_EVENT_ID_CALL_INCOMING:
+            modcellular_notify_call_incoming(pEvent);
+            break;
+
+        case API_EVENT_ID_CALL_HANGUP:
+            modcellular_notify_call_hangup(pEvent);
+            break;
+
         // UART
         // ====
         case API_EVENT_ID_UART_RECEIVED:
diff --git a/ports/gprs_a9/modcellular.c b/ports/gprs_a9/modcellular.c
index 1bf5de99b1bdc..c8cbe90e2a6df 100644
--- a/ports/gprs_a9/modcellular.c
+++ b/ports/gprs_a9/modcellular.c
@@ -60,6 +60,9 @@
 #define NTW_EXC_ACT_FAILED 0x06
 #define NTW_EXC_SMS_DROP 0x07
 
+#define MAX_NUMBER_LEN 16
+#define MAX_CALLS_MISSED 15
+
 // --------------
 // Vars: statuses
 // --------------
@@ -72,7 +75,7 @@ uint8_t network_signal_quality = 0;
 uint8_t network_signal_rx_level = 0;
 
 // Count SMS received
-uint8_t sms_received_count = 0;
+uint16_t sms_received_count = 0;
 
 // SMS send flag
 uint8_t sms_send_flag = 0;
@@ -92,6 +95,15 @@ uint8_t sms_list_buffer_count = 0;
 uint8_t network_list_buffer_len = 0;
 Network_Operator_Info_t *network_list_buffer = NULL;
 
+// -----------
+// Vars: Calls
+// -----------
+
+Buffer_t calls_missed;
+uint8_t calls_missed_buffer[MAX_NUMBER_LEN * (MAX_CALLS_MISSED + 1)];
+uint8_t calls_incoming_now[MAX_NUMBER_LEN] = {0};
+uint8_t calls_incoming_now_flag = 0;
+
 // SMS parsing
 STATIC mp_obj_t modcellular_sms_from_record(SMS_Message_Info_t* record);
 STATIC mp_obj_t modcellular_sms_from_raw(uint8_t* header, uint32_t header_length, uint8_t* content, uint32_t content_length);
@@ -102,6 +114,9 @@ void modcellular_init0(void) {
     network_exception = NTW_NO_EXC;
     sms_received_count = 0;
 
+    // Incoming calls buffer
+    Buffer_Init(&calls_missed, calls_missed_buffer, sizeof(calls_missed_buffer));
+
     uint8_t status;
 
     // Deactivate
@@ -265,6 +280,22 @@ void modcellular_notify_signal(API_Event_t* event) {
     network_signal_rx_level = event->param2;
 }
 
+void modcellular_notify_call_incoming(API_Event_t* event) {
+    if (strlen((char*) event->pParam1) > MAX_NUMBER_LEN - 1) {
+        event->pParam1[MAX_NUMBER_LEN] = 0;
+    }
+    uint8_t l = strlen((char*) event->pParam1);
+    memcpy(calls_incoming_now, event->pParam1, l + 1);
+    calls_incoming_now_flag = true;
+}
+
+void modcellular_notify_call_hangup(API_Event_t* event) {
+    if (event->param1) {
+        Buffer_Puts(&calls_missed, calls_incoming_now, MAX_NUMBER_LEN);
+        calls_incoming_now_flag = false;
+    }
+}
+
 // -------
 // Classes
 // -------
@@ -1010,6 +1041,29 @@ STATIC mp_obj_t modcellular_register(size_t n_args, const mp_obj_t *args) {
 
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(modcellular_register_obj, 0, 2, modcellular_register);
 
+STATIC mp_obj_t modcellular_call(void) {
+    // ========================================
+    // Incoming call number.
+    // ========================================
+    mp_obj_t tuple[Buffer_Size(&calls_missed) / MAX_NUMBER_LEN];
+    char tel_n[MAX_NUMBER_LEN];
+
+    for (int i=0; i<sizeof(tuple) / sizeof(mp_obj_t); i++) {
+        Buffer_Gets(&calls_missed, (uint8_t*) tel_n, MAX_NUMBER_LEN);
+        tuple[i] = mp_obj_new_str(tel_n, strlen(tel_n));
+    }
+
+    mp_obj_t items[2] = {
+        mp_obj_new_list(sizeof(tuple) / sizeof(mp_obj_t), tuple),
+        mp_const_none,
+    };
+    if (calls_incoming_now_flag)
+        items[1] = mp_obj_new_str((char*) calls_incoming_now, strlen((char*) calls_incoming_now));
+    return mp_obj_new_tuple(sizeof(items) / sizeof(mp_obj_t), items);
+}
+
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(modcellular_call_obj, modcellular_call);
+
 STATIC mp_obj_t modcellular_reset(void) {
     // ========================================
     // Resets network settings to defaults.
@@ -1042,6 +1096,7 @@ STATIC const mp_map_elem_t mp_module_cellular_globals_table[] = {
     { MP_OBJ_NEW_QSTR(MP_QSTR_gprs), (mp_obj_t)&modcellular_gprs_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_scan), (mp_obj_t)&modcellular_scan_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_register), (mp_obj_t)&modcellular_register_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_call), (mp_obj_t)&modcellular_call_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_reset), (mp_obj_t)&modcellular_reset_obj },
 
     { MP_ROM_QSTR(MP_QSTR_NETWORK_FREQ_BAND_GSM_900P), MP_ROM_INT(NETWORK_FREQ_BAND_GSM_900P) },
diff --git a/ports/gprs_a9/modcellular.h b/ports/gprs_a9/modcellular.h
index aa30b60ee7f42..dd27cd10238b3 100644
--- a/ports/gprs_a9/modcellular.h
+++ b/ports/gprs_a9/modcellular.h
@@ -56,8 +56,12 @@ void modcellular_notify_sms_list(API_Event_t* event);
 void modcellular_notify_sms_sent(API_Event_t* event);
 void modcellular_notify_sms_error(API_Event_t* event);
 void modcellular_notify_sms_receipt(API_Event_t* event);
+
 void modcellular_notify_signal(API_Event_t* event);
 
+void modcellular_notify_call_incoming(API_Event_t* event);
+void modcellular_notify_call_hangup(API_Event_t* event);
+
 #define TIMEOUT_SMS_LIST 10000
 #define TIMEOUT_SMS_SEND 10000
 #define TIMEOUT_GPRS_ATTACHMENT 15000

From 35a5cb07e5f020bc9beae3cbe28026346659fb00 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Tue, 5 Nov 2019 00:17:19 +0100
Subject: [PATCH 3345/3533] Add a function to poll base stations

---
 ports/gprs_a9/README.md     | 14 +++++++++++
 ports/gprs_a9/main.c        |  4 ++++
 ports/gprs_a9/modcellular.c | 46 +++++++++++++++++++++++++++++++++++++
 ports/gprs_a9/modcellular.h |  2 ++
 4 files changed, 66 insertions(+)

diff --git a/ports/gprs_a9/README.md b/ports/gprs_a9/README.md
index db3d61d787b9e..d5330edf71637 100644
--- a/ports/gprs_a9/README.md
+++ b/ports/gprs_a9/README.md
@@ -259,6 +259,20 @@ Network modes: `NETWORK_MODE_MANUAL`, `NETWORK_MODE_AUTO`, `NETWORK_MODE_MANUAL_
 
   **TODO**: Figure out how (and whether) registration works.
 
+* `stations()`
+
+  Lists GSM base stations.
+
+  **Returns**: A tuple of tuples with the following data (all integers):
+    * `mcc`: mobile country code;
+    * `mnc`: mobile network code. These can be both 2-digit and 3-digit; 2-digit codes are multiplied by 10;
+    * `lac`: location area code;
+    * `cell_id`: cell id. The above 4 numbers identify the base station uniquely;
+    * `bsic`: unknown;
+    * `rx_full`: signal strength;
+    * `rx_sub`: signal strength;
+    * `arfcn`: absolute radio frequency channel number.
+
 * `reset()`
 
   Resets network settings to defaults. Disconnects GPRS.
diff --git a/ports/gprs_a9/main.c b/ports/gprs_a9/main.c
index cb7cfae8511e2..12436f37775e8 100644
--- a/ports/gprs_a9/main.c
+++ b/ports/gprs_a9/main.c
@@ -332,6 +332,10 @@ void EventDispatch(API_Event_t* pEvent)
             modcellular_notify_signal(pEvent);
             break;
 
+        case API_EVENT_ID_NETWORK_CELL_INFO:
+            modcellular_notify_cell_info(pEvent);
+            break;
+
         // Call
         // ====
 
diff --git a/ports/gprs_a9/modcellular.c b/ports/gprs_a9/modcellular.c
index c8cbe90e2a6df..6e96813751c2b 100644
--- a/ports/gprs_a9/modcellular.c
+++ b/ports/gprs_a9/modcellular.c
@@ -41,6 +41,7 @@
 #include "api_sms.h"
 #include "api_os.h"
 #include "api_network.h"
+#include "api_inc_network.h"
 
 #include "buffer.h"
 #include "time.h"
@@ -62,6 +63,7 @@
 
 #define MAX_NUMBER_LEN 16
 #define MAX_CALLS_MISSED 15
+#define MAX_CELLS 8
 
 // --------------
 // Vars: statuses
@@ -95,6 +97,13 @@ uint8_t sms_list_buffer_count = 0;
 uint8_t network_list_buffer_len = 0;
 Network_Operator_Info_t *network_list_buffer = NULL;
 
+// -------------------
+// Vars: base stations
+// -------------------
+
+Network_Location_t cells[MAX_CELLS];
+int8_t cells_n = 0;
+
 // -----------
 // Vars: Calls
 // -----------
@@ -113,6 +122,7 @@ void modcellular_init0(void) {
     network_status_updated = 0;
     network_exception = NTW_NO_EXC;
     sms_received_count = 0;
+    cells_n = 0;
 
     // Incoming calls buffer
     Buffer_Init(&calls_missed, calls_missed_buffer, sizeof(calls_missed_buffer));
@@ -296,6 +306,11 @@ void modcellular_notify_call_hangup(API_Event_t* event) {
     }
 }
 
+void modcellular_notify_cell_info(API_Event_t* event) {
+    cells_n = event->param1;
+    memcpy(cells, event->pParam1, MIN(cells_n * sizeof(Network_Location_t), sizeof(cells)));
+}
+
 // -------
 // Classes
 // -------
@@ -1064,6 +1079,36 @@ STATIC mp_obj_t modcellular_call(void) {
 
 STATIC MP_DEFINE_CONST_FUN_OBJ_0(modcellular_call_obj, modcellular_call);
 
+STATIC mp_obj_t modcellular_stations(void) {
+    // ========================================
+    // Polls base stations.
+    // ========================================
+    cells_n = -1;
+    if (!Network_GetCellInfoRequst()) {
+        mp_raise_CellularError("Failed to poll base stations");
+        return mp_const_none;
+    }
+    WAIT_UNTIL(cells_n >= 0, TIMEOUT_STATIONS, 100, mp_raise_CellularError("Station poll timeout"));
+
+    mp_obj_t stations[cells_n];
+    for (int i=0; i<cells_n; i++) {
+        mp_obj_t tuple[8] = {
+            mp_obj_new_int(cells[i].sMcc[0] * 100 + cells[i].sMcc[1] * 10 + cells[i].sMcc[2]),
+            mp_obj_new_int(cells[i].sMnc[0] * 100 + cells[i].sMnc[1] * 10 + cells[i].sMnc[2]),
+            mp_obj_new_int(cells[i].sLac),
+            mp_obj_new_int(cells[i].sCellID),
+            mp_obj_new_int(cells[i].iBsic),
+            mp_obj_new_int(cells[i].iRxLev),
+            mp_obj_new_int(cells[i].iRxLevSub),
+            mp_obj_new_int(cells[i].nArfcn),
+        };
+        stations[i] = mp_obj_new_tuple(sizeof(tuple) / sizeof(mp_obj_t), tuple);
+    }
+    return mp_obj_new_tuple(sizeof(stations) / sizeof(mp_obj_t), stations);
+}
+
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(modcellular_stations_obj, modcellular_stations);
+
 STATIC mp_obj_t modcellular_reset(void) {
     // ========================================
     // Resets network settings to defaults.
@@ -1097,6 +1142,7 @@ STATIC const mp_map_elem_t mp_module_cellular_globals_table[] = {
     { MP_OBJ_NEW_QSTR(MP_QSTR_scan), (mp_obj_t)&modcellular_scan_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_register), (mp_obj_t)&modcellular_register_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_call), (mp_obj_t)&modcellular_call_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_stations), (mp_obj_t)&modcellular_stations_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_reset), (mp_obj_t)&modcellular_reset_obj },
 
     { MP_ROM_QSTR(MP_QSTR_NETWORK_FREQ_BAND_GSM_900P), MP_ROM_INT(NETWORK_FREQ_BAND_GSM_900P) },
diff --git a/ports/gprs_a9/modcellular.h b/ports/gprs_a9/modcellular.h
index dd27cd10238b3..eb95ffaf7a505 100644
--- a/ports/gprs_a9/modcellular.h
+++ b/ports/gprs_a9/modcellular.h
@@ -58,6 +58,7 @@ void modcellular_notify_sms_error(API_Event_t* event);
 void modcellular_notify_sms_receipt(API_Event_t* event);
 
 void modcellular_notify_signal(API_Event_t* event);
+void modcellular_notify_cell_info(API_Event_t* event);
 
 void modcellular_notify_call_incoming(API_Event_t* event);
 void modcellular_notify_call_hangup(API_Event_t* event);
@@ -69,6 +70,7 @@ void modcellular_notify_call_hangup(API_Event_t* event);
 #define TIMEOUT_FLIGHT_MODE 10000
 #define TIMEOUT_LIST_OPERATORS 15000
 #define TIMEOUT_REG 10000
+#define TIMEOUT_STATIONS 2000
 
 #define REQUIRES_NETWORK_REGISTRATION do {if (!network_status) {mp_raise_CellularError("Network is not available: is SIM card inserted?"); return mp_const_none;}} while(0)
 #define REQUIRES_VALID_SMS_STATUS(bits) do {if (bitsum(bits) != 1) {return mp_const_none;}} while(0)

From ae2293bb0167cffd5b60562c6a7378423c721d85 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Tue, 5 Nov 2019 00:20:24 +0100
Subject: [PATCH 3346/3533] Remove "raises" from README

[skip ci]
---
 ports/gprs_a9/README.md | 42 -----------------------------------------
 1 file changed, 42 deletions(-)

diff --git a/ports/gprs_a9/README.md b/ports/gprs_a9/README.md
index d5330edf71637..3d2034c7a199e 100644
--- a/ports/gprs_a9/README.md
+++ b/ports/gprs_a9/README.md
@@ -117,14 +117,10 @@ Network modes: `NETWORK_MODE_MANUAL`, `NETWORK_MODE_AUTO`, `NETWORK_MODE_MANUAL_
     
       Sends the message.
 
-      **Raises**: `CelularError` if not registered on the network or failed to set up/send SMS.
-
     * `withdraw()`
 
       Withdraws SMS from SIM storage. Resets status and index of this object to zero.
 
-      **Raises**: `CellularError` if failed to withdraw.
-
     * `poll()` [staticmethod]
 
       Polls SMS.
@@ -137,8 +133,6 @@ Network modes: `NETWORK_MODE_MANUAL`, `NETWORK_MODE_AUTO`, `NETWORK_MODE_MANUAL_
       
       **Returns**: a list of SMS messages.
 
-      **Raises**: `CellularError` if not registered on the network. This is because network registration process interfers with most other SIM-related operations.
-
 #### Exception classes ####
 
 * `CellularError(message)`
@@ -159,16 +153,12 @@ Network modes: `NETWORK_MODE_MANUAL`, `NETWORK_MODE_AUTO`, `NETWORK_MODE_MANUAL_
 
   **Returns**: a string with ICCID number.
 
-  **Raises**: `CellularError` if no ICCID number can be retrieved.
-
 * `get_imsi()`
 
   Retrieves the International Mobile Subscriber Identity (IMSI) number of the inserted SIM card.
 
   **Returns**: a string with IMSI number.
 
-  **Raises**: `CellularError` if no IMSI number can be retrieved.
-
 * `network_status_changed()`
 
   Checks whether the network status was changed since the last check.
@@ -187,8 +177,6 @@ Network modes: `NETWORK_MODE_MANUAL`, `NETWORK_MODE_AUTO`, `NETWORK_MODE_MANUAL_
 
   Retrieves the network exception and raises it, if any.
 
-  **Raises**: One of `CellularError`s occurred during the operation in the background.
-
 * `is_sim_present()`
 
   Checks whether the SIM card is present and ICCID can be retrieved.
@@ -207,8 +195,6 @@ Network modes: `NETWORK_MODE_MANUAL`, `NETWORK_MODE_AUTO`, `NETWORK_MODE_MANUAL_
 
   **Returns**: True if roaming.
 
-  **Raises** `CellularError` if not registered on the network.
-
 * `get_signal_quality()`
 
   Retrieves signal quality.
@@ -277,8 +263,6 @@ Network modes: `NETWORK_MODE_MANUAL`, `NETWORK_MODE_AUTO`, `NETWORK_MODE_MANUAL_
 
   Resets network settings to defaults. Disconnects GPRS.
 
-  **Raises**: `CellularError` if reset failed at any stage.
-
 ##### GPRS #####
 
 * `gprs(apn, user=None, pass=None)`
@@ -299,8 +283,6 @@ Network modes: `NETWORK_MODE_MANUAL`, `NETWORK_MODE_AUTO`, `NETWORK_MODE_MANUAL_
 
   **Returns**: True if GPRS is operating.
 
-  **Raises**: `CellularError` if not registered on the network or the (de)activation process failed at any stage.
-
   **Note**: there is no way to check whether the credentials supplied are valid.
 
 ##### Calls #####
@@ -353,8 +335,6 @@ See [micropython docs](https://docs.micropython.org/en/latest/library/usocket.ht
 
   **Returns**: The local IP address as a string.
 
-  **Raises**: `NetworkError` if no address was assigned.
-
 * `getaddrinfo(host, port, af=AF_INET, type=SOCK_STREAM, proto=IPPROTO_TCP, flags=0)`
 
   Translates host/port into arguments to socket constructor.
@@ -445,8 +425,6 @@ This is only available in the A9G module where GPS is a separate chip connected
 
   Turns the GPS on. Blocks until the GPS module responds.
 
-  **Raises**: `GPSError` if the GPS module does not respond within 10 seconds.
-
 * `off()`
 
   Turns the GPS off.
@@ -457,32 +435,24 @@ This is only available in the A9G module where GPS is a separate chip connected
 
   **Returns**: the firmware version as a string.
 
-  **Raises**: `GPSError` if the GPS module fails to respond.
-
 * `get_location()`
 
   Retrieves the current GPS location.
 
   **Returns**: latitude and longitude in degrees.
 
-  **Raises**: `GPSError` if the GPS module never responded or is off.
-
 * `get_last_location()`
 
   Retrieves the last GPS location.
 
   **Returns**: latitude and longitude in degrees.
 
-  **Raises**: `GPSError` if the GPS module never responded.
-
 * `get_satellites()`
 
   Retrieves the number of satellites visible.
 
   **Returns**: the number of satellites tracked and the number of visible satellites.
 
-  **Raises**: `GPSError` if the GPS module is off.
-
 ### `machine`
 
 Provides power-related functions: power, watchdogs.
@@ -582,8 +552,6 @@ I2C_DEFAULT_TIME_OUT
   
   **Returns**: `None` if everything ok.
 
-  **Raises** `I2CError` (see error message for more details)
-  
   **Note**: Different ports can be initialized simultaneously
 
 * `close(id)`
@@ -596,8 +564,6 @@ I2C_DEFAULT_TIME_OUT
   
   **Returns**: `None` if everything ok.
 
-  **Raises** `I2CError` (see error message for more details)
-  
 * `receive(id, slave_address, data_length, [timeout] = I2C_DEFAULT_TIME_OUT)`
 
   Receive data given length from slave device
@@ -611,8 +577,6 @@ I2C_DEFAULT_TIME_OUT
   
   **Returns**: bytes() of given length.
 
-  **Raises** `I2CError` (see error message for more details)
-  
 * `transmit(id, slave_address, data, [timeout] = I2C_DEFAULT_TIME_OUT)`
 
   Transmit given data to slave device
@@ -626,8 +590,6 @@ I2C_DEFAULT_TIME_OUT
   
   **Returns**: None if everything ok.
 
-  **Raises** `I2CError` (see error message for more details)
-  
 * `mem_receive(id, slave_address, memory_address, memory_size, data_length, [timeout] = I2C_DEFAULT_TIME_OUT)`
 
   Read data given length from slave device's memory by its address
@@ -643,8 +605,6 @@ I2C_DEFAULT_TIME_OUT
   
   **Returns**: bytes() of given length.
 
-  **Raises** `I2CError` (see error message for more details)
-  
 * `mem_transmit(id, slave_address, memory_address, memory_size, data, [timeout] = I2C_DEFAULT_TIME_OUT)`
 
   Write given data to slave device's memory by address
@@ -660,8 +620,6 @@ I2C_DEFAULT_TIME_OUT
   
   **Returns**: None if everything ok.
 
-  **Raises** `I2CError` (see error message for more details)
-
 ## Notes ##
 
 * The module halts on fatal errors; create an empty file `.reboot_on_fatal` if a reboot is desired

From 731f5011d01c26b51c7e75bc2167db313d003453 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sat, 9 Nov 2019 23:54:30 +0100
Subject: [PATCH 3347/3533] Set GPIO defaults to output

---
 ports/gprs_a9/machine_pin.c | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/ports/gprs_a9/machine_pin.c b/ports/gprs_a9/machine_pin.c
index 24d6cbe43189b..0936e77de51cd 100644
--- a/ports/gprs_a9/machine_pin.c
+++ b/ports/gprs_a9/machine_pin.c
@@ -135,7 +135,11 @@ STATIC mp_obj_t machine_pin_obj_init_helper(const machine_pin_obj_t *self, size_
         { MP_QSTR_pull, MP_ARG_OBJ, {.u_obj = mp_const_none}},
         { MP_QSTR_value, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL}},
     };
-    GPIO_config_t gpioObj;
+    GPIO_config_t gpioObj = {
+        .mode=GPIO_MODE_OUTPUT,
+        .pin=GPIO_PIN27,
+        .defaultLevel=GPIO_LEVEL_LOW,
+    };
 
     // parse args
     mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
@@ -150,9 +154,8 @@ STATIC mp_obj_t machine_pin_obj_init_helper(const machine_pin_obj_t *self, size_
         PM_PowerEnable(POWER_TYPE_CAM,true);
 
     // set initial value (do this before configuring mode/pull)
-    if (args[ARG_value].u_obj != MP_OBJ_NULL) {
+    if (args[ARG_value].u_obj != MP_OBJ_NULL)
         gpioObj.defaultLevel = mp_obj_is_true(args[ARG_value].u_obj);
-    }
 
     // configure mode
     if (args[ARG_mode].u_obj != mp_const_none) {
@@ -164,9 +167,9 @@ STATIC mp_obj_t machine_pin_obj_init_helper(const machine_pin_obj_t *self, size_
     }
 
     // configure pull
-    if (args[ARG_pull].u_obj != mp_const_none) {
+    if (args[ARG_pull].u_obj != mp_const_none)
         gpioObj.defaultLevel = mp_obj_get_int(args[ARG_pull].u_obj);
-    }
+
     gpioObj.pin = self->id;
     GPIO_Init(gpioObj);
     return mp_const_none;
@@ -186,12 +189,9 @@ mp_obj_t mp_pin_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw,
         mp_raise_ValueError("invalid pin");
     }
 
-    if (n_args > 1 || n_kw > 0) {
-        // pin mode given, so configure this GPIO
-        mp_map_t kw_args;
-        mp_map_init_fixed_table(&kw_args, n_kw, args + n_args);
-        machine_pin_obj_init_helper(self, n_args - 1, args + 1, &kw_args);
-    }
+    mp_map_t kw_args;
+    mp_map_init_fixed_table(&kw_args, n_kw, args + n_args);
+    machine_pin_obj_init_helper(self, n_args - 1, args + 1, &kw_args);
 
     return MP_OBJ_FROM_PTR(self);
 }
@@ -204,11 +204,11 @@ STATIC mp_obj_t machine_pin_call(mp_obj_t self_in, size_t n_args, size_t n_kw, c
 
     if (n_args == 0) {
         // get pin
-        GPIO_Get(self->id,&level);
+        GPIO_Get(self->id, &level);
         return MP_OBJ_NEW_SMALL_INT(level);
     } else {
         // set pin
-        GPIO_Set(self->id,mp_obj_is_true(args[0]));
+        GPIO_Set(self->id, mp_obj_is_true(args[0]));
         return mp_const_none;
     }
 }
@@ -310,16 +310,16 @@ STATIC const mp_rom_map_elem_t machine_pin_locals_dict_table[] = {
 
 STATIC mp_uint_t pin_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_t arg, int *errcode) {
     (void)errcode;
-    machine_pin_obj_t *self = self_in;
+    machine_pin_obj_t *self = MP_OBJ_TO_PTR(self_in);
     GPIO_LEVEL level;
 
     switch (request) {
         case MP_PIN_READ: {
-            GPIO_Get(self->id,&level);
+            GPIO_Get(self->id, &level);
             return level;
         }
         case MP_PIN_WRITE: {
-            GPIO_Set(self->id,arg);
+            GPIO_Set(self->id, arg);
             return 0;
         }
     }

From a9509d17fef662f667d01ccd05794757680478d7 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sat, 9 Nov 2019 23:59:28 +0100
Subject: [PATCH 3348/3533] Add software SPI

---
 ports/gprs_a9/Makefile       |  4 ++++
 ports/gprs_a9/machine_pin.c  | 11 +++++++++++
 ports/gprs_a9/modmachine.c   |  4 ++++
 ports/gprs_a9/mpconfigport.h |  2 +-
 ports/gprs_a9/mphalport.h    |  2 ++
 5 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/ports/gprs_a9/Makefile b/ports/gprs_a9/Makefile
index 059b62663fd5b..519833e402eab 100644
--- a/ports/gprs_a9/Makefile
+++ b/ports/gprs_a9/Makefile
@@ -156,6 +156,10 @@ LIB_SRC_C += \
 	lib/oofatfs/ff.c \
 	lib/oofatfs/ffunicode.c
 
+DRIVERS_SRC_C = $(addprefix drivers/,\
+	bus/softspi.c \
+        )
+
 SRC_S = \
 	gchelper.s
 
diff --git a/ports/gprs_a9/machine_pin.c b/ports/gprs_a9/machine_pin.c
index 0936e77de51cd..72d0e691484d9 100644
--- a/ports/gprs_a9/machine_pin.c
+++ b/ports/gprs_a9/machine_pin.c
@@ -388,3 +388,14 @@ STATIC const machine_pin_irq_obj_t machine_pin_irq_object[] = {
 //     .call = machine_pin_irq_call,
 //     .locals_dict = (mp_obj_dict_t*)&machine_pin_irq_locals_dict,
 // };
+
+
+void mp_hal_pin_input(mp_hal_pin_obj_t pin_id) {
+    const machine_pin_obj_t *self = MP_OBJ_TO_PTR(pin_id); // &machine_pin_obj[pin_id];
+    GPIO_ChangeMode(self->id, GPIO_MODE_INPUT);
+}
+
+void mp_hal_pin_output(mp_hal_pin_obj_t pin_id) {
+    const machine_pin_obj_t *self = MP_OBJ_TO_PTR(pin_id); // &machine_pin_obj[pin_id];
+    GPIO_ChangeMode(self->id, GPIO_MODE_OUTPUT);
+}
diff --git a/ports/gprs_a9/modmachine.c b/ports/gprs_a9/modmachine.c
index 029a57f3b3ef6..5535bbc553c1a 100644
--- a/ports/gprs_a9/modmachine.c
+++ b/ports/gprs_a9/modmachine.c
@@ -27,6 +27,7 @@
  */
 
 #include "modmachine.h"
+#include "extmod/machine_spi.h"
 
 #include "mpconfigport.h"
 #include "stdint.h"
@@ -204,6 +205,9 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     { MP_OBJ_NEW_QSTR(MP_QSTR_watchdog_on), (mp_obj_t)&modmachine_watchdog_on_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_watchdog_off), (mp_obj_t)&modmachine_watchdog_off_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_watchdog_reset), (mp_obj_t)&modmachine_watchdog_reset_obj },
+    #if MICROPY_PY_MACHINE_SPI
+    { MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&mp_machine_soft_spi_type) },
+    #endif
 
     // Reset reasons
     { MP_ROM_QSTR(MP_QSTR_POWER_ON_CAUSE_KEY),       MP_ROM_INT(POWER_ON_CAUSE_KEY) },
diff --git a/ports/gprs_a9/mpconfigport.h b/ports/gprs_a9/mpconfigport.h
index d22fd26e633cc..b9ece5b67314a 100644
--- a/ports/gprs_a9/mpconfigport.h
+++ b/ports/gprs_a9/mpconfigport.h
@@ -149,7 +149,7 @@
 #define MICROPY_PY_MACHINE_PIN_MAKE_NEW     mp_pin_make_new
 // #define MICROPY_PY_MACHINE_PULSE            (1)
 // #define MICROPY_PY_MACHINE_I2C              (1)
-// #define MICROPY_PY_MACHINE_SPI              (1)
+#define MICROPY_PY_MACHINE_SPI              (1)
 // #define MICROPY_PY_MACHINE_SPI_MSB          (1)
 // #define MICROPY_PY_MACHINE_SPI_LSB          (1)
 // #define MICROPY_PY_MACHINE_SPI_MAKE_NEW     machine_hw_spi_make_new
diff --git a/ports/gprs_a9/mphalport.h b/ports/gprs_a9/mphalport.h
index 31de410a878a2..14c40dbcb876f 100644
--- a/ports/gprs_a9/mphalport.h
+++ b/ports/gprs_a9/mphalport.h
@@ -34,6 +34,8 @@
 #include "lib/utils/interrupt_char.h"
 #include "time.h"
 
+#define MP_HAL_PIN_FMT "%u"
+#define mp_hal_pin_name(p) (p)
 void mp_hal_set_interrupt_char(int c);
 
 bool UartInit();

From 7f1f471e4541d7f9f33a20d6c47a4ceab69061a3 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sun, 10 Nov 2019 00:00:34 +0100
Subject: [PATCH 3349/3533] Mention SPI in README

---
 ports/gprs_a9/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/gprs_a9/README.md b/ports/gprs_a9/README.md
index 3d2034c7a199e..bd233593bae5b 100644
--- a/ports/gprs_a9/README.md
+++ b/ports/gprs_a9/README.md
@@ -69,7 +69,7 @@ ampy --port /dev/ttyUSB1 put frozentest.py
 - [x] Cellular misc (IMEI, ICCID, ...): `cellular`
 - [x] GPS: `gps`
 - [x] I2C: `i2c`
-- [ ] SPI: `machine.SPI`
+- [x] SPI: `machine.SPI` (software only)
 - [x] time: `utime`
 - [x] File system
 - [x] GPRS, DNS: `cellular`, `socket`, `ssl`

From 7d8c4ee38a0e8734a5d7e30099a46fa2f06dd291 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sun, 10 Nov 2019 00:36:47 +0100
Subject: [PATCH 3350/3533] Shorten api ref

[ci skip]
---
 ports/gprs_a9/README.md | 232 ++++++----------------------------------
 1 file changed, 33 insertions(+), 199 deletions(-)

diff --git a/ports/gprs_a9/README.md b/ports/gprs_a9/README.md
index bd233593bae5b..065a2b6e96da4 100644
--- a/ports/gprs_a9/README.md
+++ b/ports/gprs_a9/README.md
@@ -93,205 +93,39 @@ Provides cellular functionality.
 As usual, the original API does not give access to radio-level and low-level functionality such as controlling the registration on the cellular network: these are performed in the background automatically.
 The purpose of this module is to have an access to high-level networking (SMS, GPRS, calls) as well as to read the status of various components of cellular networking.
 
-#### Constants ####
-
-Frequencies: `NETWORK_FREQ_BAND_GSM_900P`, `NETWORK_FREQ_BAND_GSM_900E`, `NETWORK_FREQ_BAND_GSM_850`, `NETWORK_FREQ_BAND_DCS_1800`, `NETWORK_FREQ_BAND_PCS_1900`.
-Operator status: `OPERATOR_STATUS_UNKNOWN`, `OPERATOR_STATUS_AVAILABLE`, `OPERATOR_STATUS_CURRENT`, `OPERATOR_STATUS_DISABLED`.
-Network modes: `NETWORK_MODE_MANUAL`, `NETWORK_MODE_AUTO`, `NETWORK_MODE_MANUAL_AUTO`.
-
-#### Classes ####
-
-* `SMS(phone_number, message)`
-
-  A class for handling SMS.
-
-  **Attrs**:
-
-    * phone_number (str): phone number (sender or destination);
-    * message (str): message contents;
-    * status (int): an integer with status bits;
-    * inbox (bool): incoming message if `True`, outgoing message if `False` or unknown status if `None`;
-    * unread (bool): unread message if `True`, previously read message if `False` or unknown status if `None`;
-    * sent (bool): sent message if `True`, not sent message if `False` or unknown status if `None`;
-    * `send()`
-    
-      Sends the message.
-
-    * `withdraw()`
-
-      Withdraws SMS from SIM storage. Resets status and index of this object to zero.
-
-    * `poll()` [staticmethod]
-
-      Polls SMS.
-
-      **Returns**: the number of new SMS received.
-
-    * `list()` [staticmethod]
-
-      Retrieves SMS from the SIM card.
-      
-      **Returns**: a list of SMS messages.
-
-#### Exception classes ####
-
-* `CellularError(message)`
-
-#### Methods ####
-
-##### Status and information #####
-
-* `get_imei()`
-
-  Retrieves the International Mobile Equipment Identity (IMEI) number.
-
-  **Returns**: a string with IMEI number.
-
-* `get_iccid()`
-
-  Retrieves the Integrated Circuit Card ID (ICCID) number of the inserted SIM card.
-
-  **Returns**: a string with ICCID number.
-
-* `get_imsi()`
-
-  Retrieves the International Mobile Subscriber Identity (IMSI) number of the inserted SIM card.
-
-  **Returns**: a string with IMSI number.
-
-* `network_status_changed()`
-
-  Checks whether the network status was changed since the last check.
-
-  **Returns**: `True` if it was changed.
-
-* `get_network_status()`
-
-  Retrieves the network status as an integer.
-
-  **Returns**: `int` representing cellular network status.
-
-  **TODO**: Provide bit-wise specs.
-
-* `poll_network_exception()`
-
-  Retrieves the network exception and raises it, if any.
-
-* `is_sim_present()`
-
-  Checks whether the SIM card is present and ICCID can be retrieved.
-
-  **Returns**: True if SIM card is present.
-
-* `is_network_registered()`
-
-  Checks whether registered on the cellular network.
-
-  **Returns**: True if registered.
-
-* `is_roaming()`
-
-  Checks whether registered on the roaming network.
-
-  **Returns**: True if roaming.
-
-* `get_signal_quality()`
-
-  Retrieves signal quality.
-
-  **Returns**: Two integers, the signal quality (0-31) and RXQUAL. These are replaced by `None` if no signal quality information is available.
-  **Note**: The RXQUAL output is always `None`. Its meaning is unknown.
-
-* `flight_mode(flag)`
-
-  Turn the flight mode on or off. Retrieve the flight mode status.
-
-  **Args**:
-
-    * flag (bool): set or unset the flight mode;
-
-  **Returns**: True if in flight mode.
-
-* `set_bands(bands)`
-
-  Sets frequency bands.
-
-  **Args**:
-
-    * bands (int): a mask specifying frequencies, see constants above.
-      If no argument specified, sets all bands.
-
-* `scan()`
-
-  Lists available operators.
-
-  **Returns**: A list of tuples `(op_id, op_name, op_status)` with operator data.
-  The first element is a 6-byte operator ID.
-  The second element is operator name.
-  The third element is the status of the operator network with respect to this module, see one of the constants above.
-
-  **Note**: Ignores virtual operators.
-
-* `register(operator_id, register_mode)`
-
-  Registers on the network and retrieve the current network ID.
-
-  **Args**:
-
-    * `operator_id` (byterray, bool): a 6-byte operator ID of `False` if a de-registration requested;
-    * `register_mode` (int): registration mode, see one of the constants above;
-
-  **Returns**: Operator ID (6 bytes), operator name (str) and register mode (int).
-
-  **TODO**: Figure out how (and whether) registration works.
-
-* `stations()`
-
-  Lists GSM base stations.
-
-  **Returns**: A tuple of tuples with the following data (all integers):
-    * `mcc`: mobile country code;
-    * `mnc`: mobile network code. These can be both 2-digit and 3-digit; 2-digit codes are multiplied by 10;
-    * `lac`: location area code;
-    * `cell_id`: cell id. The above 4 numbers identify the base station uniquely;
-    * `bsic`: unknown;
-    * `rx_full`: signal strength;
-    * `rx_sub`: signal strength;
-    * `arfcn`: absolute radio frequency channel number.
-
-* `reset()`
-
-  Resets network settings to defaults. Disconnects GPRS.
-
-##### GPRS #####
-
-* `gprs(apn, user=None, pass=None)`
-
-  Activates, deactivates or retrieves the status of GPRS.
-
-  Activate: `cellular.gprs('apn', 'user', 'pass')`
-
-  Deactivate: `cellular.gprs(False)`
-
-  Status: `cellular.gprs()`
-
-  **Args**:
-
-    * apn (str, bool): access point name (APN);
-    * user (str): username;
-    * pass (str): password;
-
-  **Returns**: True if GPRS is operating.
-
-  **Note**: there is no way to check whether the credentials supplied are valid.
-
-##### Calls #####
-
-* `call()`
-
-  Calls and call status.
-
-  **Returns**: A list of calls missed and the incoming call number or `None` if no incoming calls at the moment.
+* frequencies: `NETWORK_FREQ_BAND_GSM_900P`, `NETWORK_FREQ_BAND_GSM_900E`, `NETWORK_FREQ_BAND_GSM_850`, `NETWORK_FREQ_BAND_DCS_1800`, `NETWORK_FREQ_BAND_PCS_1900`;
+* operator status: `OPERATOR_STATUS_UNKNOWN`, `OPERATOR_STATUS_AVAILABLE`, `OPERATOR_STATUS_CURRENT`, `OPERATOR_STATUS_DISABLED`;
+* network modes: `NETWORK_MODE_MANUAL`, `NETWORK_MODE_AUTO`, `NETWORK_MODE_MANUAL_AUTO`;
+* `SMS(phone_number: str, message: str)`: handles SMS messages;
+  * `.phone_number` (str): phone number (sender or destination);
+  * `.message` (str): message contents;
+  * `.status` (int): integer with status bits;
+  * `.inbox` (bool): incoming message if `True`, outgoing message if `False` or unknown status if `None`;
+  * `.unread` (bool): unread message if `True`, previously read message if `False` or unknown status if `None`;
+  * `.sent` (bool): sent message if `True`, not sent message if `False` or unknown status if `None`;
+  * `.send()`: sends a message;
+  * `.withdraw()`: withdraws SMS from SIM storage;
+  * `.poll()` (int) [staticmethod]: the number of new SMS received;
+  * `.list()` (list) [staticmethod]: all SMS from the SIM card;
+* `CellularError(message: str)`
+* `get_imei()` (str): the International Mobile Equipment Identity (IMEI) number;
+* `get_iccid()` (str): the Integrated Circuit Card ID (ICCID) number of the inserted SIM card;
+* `get_imsi()` (str): the International Mobile Subscriber Identity (IMSI) number of the inserted SIM card;
+* `network_status_changed()` (bool): indicates whether the network status changed since the last check;
+* `get_network_status()` (int): cellular network status encoded in an integer. **TODO**: Provide bit-wise specs;
+* `poll_network_exception()`: polls the network exception and raises it, if any;
+* `is_sim_present()` (bool): checks whether a SIM card is present;
+* `is_network_registered()` (bool): checks whether registered on the cellular network;
+* `is_roaming()` (bool): checks whether registered on the roaming network;
+* `get_signal_quality()` (int, int): the signal quality (0-31) and RXQUAL. These are replaced by `None` if no signal quality information is available. **TODO**: The RXQUAL output is always `None`;
+* `flight_mode(flag: bool[optional])` (bool): the flight mode status. Turns in on or off if the argument is specified;
+* `set_bands(bands: int = NETWORK_FREQ_BAND_GSM_900P | NETWORK_FREQ_BAND_GSM_900E | NETWORK_FREQ_BAND_GSM_850 | NETWORK_FREQ_BAND_DCS_1800 | NETWORK_FREQ_BAND_PCS_1900)`: sets frequency bands;
+* `scan()` (list): lists available operators: returns `(op_id: bytearray[6], op_name: str, op_status: int)` for each;
+* `register(operator_id: bytearray[6][optional], register_mode: int[optional])` (op_id: bytearray[6], op_name: str, reg_status: int): registered network operator information. Registers on the network if arguments supplied. **TODO**: Figure out how (and whether) registration works;
+* `stations()` (list): a list of nearby stations: `(mcc, mnc, lac, cell_id, bsic, rx_full, rx_sub, arfcn)`: all ints;
+* `reset()`: resets network settings to defaults. Disconnects GPRS.
+* `gprs(apn: [str, bool][optional], user: str[optional], pass: str[optional])` (bool): activate (3 arguments), deactivate (`gprs(False)`) or obtain the status of GPRS if no arguments supplied;
+* `call()` (list[str], [str, None]): calls missed (1st output) and the incoming call number or `None` if no incoming calls at the moment (2nd output);
 
 ### `usocket` ###
 

From 321015871fe27d575796288fd7bf94200aedc413 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sun, 10 Nov 2019 14:39:48 +0100
Subject: [PATCH 3351/3533] Shorten API ref

[skip ci]
---
 ports/gprs_a9/README.md | 337 ++++++----------------------------------
 1 file changed, 49 insertions(+), 288 deletions(-)

diff --git a/ports/gprs_a9/README.md b/ports/gprs_a9/README.md
index 065a2b6e96da4..83a34229bfed4 100644
--- a/ports/gprs_a9/README.md
+++ b/ports/gprs_a9/README.md
@@ -93,9 +93,9 @@ Provides cellular functionality.
 As usual, the original API does not give access to radio-level and low-level functionality such as controlling the registration on the cellular network: these are performed in the background automatically.
 The purpose of this module is to have an access to high-level networking (SMS, GPRS, calls) as well as to read the status of various components of cellular networking.
 
-* frequencies: `NETWORK_FREQ_BAND_GSM_900P`, `NETWORK_FREQ_BAND_GSM_900E`, `NETWORK_FREQ_BAND_GSM_850`, `NETWORK_FREQ_BAND_DCS_1800`, `NETWORK_FREQ_BAND_PCS_1900`;
-* operator status: `OPERATOR_STATUS_UNKNOWN`, `OPERATOR_STATUS_AVAILABLE`, `OPERATOR_STATUS_CURRENT`, `OPERATOR_STATUS_DISABLED`;
-* network modes: `NETWORK_MODE_MANUAL`, `NETWORK_MODE_AUTO`, `NETWORK_MODE_MANUAL_AUTO`;
+* `NETWORK_FREQ_BAND_GSM_900P`, `NETWORK_FREQ_BAND_GSM_900E`, `NETWORK_FREQ_BAND_GSM_850`, `NETWORK_FREQ_BAND_DCS_1800`, `NETWORK_FREQ_BAND_PCS_1900`, `NETWORK_FREQ_BANDS_ALL`: frequencies;
+* `OPERATOR_STATUS_UNKNOWN`, `OPERATOR_STATUS_AVAILABLE`, `OPERATOR_STATUS_CURRENT`, `OPERATOR_STATUS_DISABLED`: operator statuses;
+* `NETWORK_MODE_MANUAL`, `NETWORK_MODE_AUTO`, `NETWORK_MODE_MANUAL_AUTO`: network registration modes;
 * `SMS(phone_number: str, message: str)`: handles SMS messages;
   * `.phone_number` (str): phone number (sender or destination);
   * `.message` (str): message contents;
@@ -118,13 +118,13 @@ The purpose of this module is to have an access to high-level networking (SMS, G
 * `is_network_registered()` (bool): checks whether registered on the cellular network;
 * `is_roaming()` (bool): checks whether registered on the roaming network;
 * `get_signal_quality()` (int, int): the signal quality (0-31) and RXQUAL. These are replaced by `None` if no signal quality information is available. **TODO**: The RXQUAL output is always `None`;
-* `flight_mode(flag: bool[optional])` (bool): the flight mode status. Turns in on or off if the argument is specified;
-* `set_bands(bands: int = NETWORK_FREQ_BAND_GSM_900P | NETWORK_FREQ_BAND_GSM_900E | NETWORK_FREQ_BAND_GSM_850 | NETWORK_FREQ_BAND_DCS_1800 | NETWORK_FREQ_BAND_PCS_1900)`: sets frequency bands;
+* `flight_mode([flag: bool])` (bool): the flight mode status. Turns in on or off if the argument is specified;
+* `set_bands(bands: int = NETWORK_FREQ_BANDS_ALL)`: sets frequency bands;
 * `scan()` (list): lists available operators: returns `(op_id: bytearray[6], op_name: str, op_status: int)` for each;
-* `register(operator_id: bytearray[6][optional], register_mode: int[optional])` (op_id: bytearray[6], op_name: str, reg_status: int): registered network operator information. Registers on the network if arguments supplied. **TODO**: Figure out how (and whether) registration works;
+* `register([operator_id: bytearray[6], register_mode: int])` (op_id: bytearray[6], op_name: str, reg_status: int): registered network operator information. Registers on the network if arguments supplied. **TODO**: Figure out how (and whether) registration works at all;
 * `stations()` (list): a list of nearby stations: `(mcc, mnc, lac, cell_id, bsic, rx_full, rx_sub, arfcn)`: all ints;
-* `reset()`: resets network settings to defaults. Disconnects GPRS.
-* `gprs(apn: [str, bool][optional], user: str[optional], pass: str[optional])` (bool): activate (3 arguments), deactivate (`gprs(False)`) or obtain the status of GPRS if no arguments supplied;
+* `reset()`: resets network settings to defaults. Disconnects GPRS;
+* `gprs([apn: {str, bool}[, user: str, pass: str]])` (bool): activate (3 arguments), deactivate (`gprs(False)`) or obtain the status of GPRS (on/off) if no arguments supplied;
 * `call()` (list[str], [str, None]): calls missed (1st output) and the incoming call number or `None` if no incoming calls at the moment (2nd output);
 
 ### `usocket` ###
@@ -134,87 +134,31 @@ The purpose of this module is to have an access to high-level networking (SMS, G
 TCP/IP stack over GPRS based on lwIP.
 See [micropython docs](https://docs.micropython.org/en/latest/library/usocket.html) for details.
 
-#### Constants ####
-
-`AF_INET`, `AF_INET6`, `SOCK_STREAM`, `SOCK_DGRAM`, `SOCK_RAW`, `IPPROTO_TCP`, `IPPROTO_UDP`, `IPPROTO_IP`
-
-#### Classes ####
-
-* `socket(af, type, proto)`
-
+* `AF_INET`, `AF_INET6`, `SOCK_STREAM`, `SOCK_DGRAM`, `SOCK_RAW`, `IPPROTO_TCP`, `IPPROTO_UDP`, `IPPROTO_IP`: lwIP constants;
+* `socket(af: int, type: int, proto: int)`: socket class;
     * `close()`
-    * `bind(address)` *not implemented*
-    * `listen([backlog])` *not implemented*
-    * `accept()` *not implemented*
+    * `bind(address)` [not implemented]
+    * `listen([backlog])` [not implemented]
+    * `accept()` [not implemented]
     * `connect(address)`
     * `send(bytes)`
     * `sendall(bytes)`
     * `recv(bufsize)`
     * `sendto(bytes, address)`
     * `recvfrom(bufsize)`
-    * `setsockopt(level, optname, value)` *not implemented*
-    * `settimeout(value)` *not implemented*
-    * `setblocking(flag)` *not implemented*
+    * `setsockopt(level, optname, value)` [not implemented]
+    * `settimeout(value)` [not implemented]
+    * `setblocking(flag)` [not implemented]
     * `makefile(mode, buffering)`
     * `read([size])`
     * `readinto(buf[, nbytes])`
     * `readline()`
     * `write(buf)`
-
-#### Methods ####
-
-* `get_local_ip()`
-
-  Retrieves the local IP address.
-
-  **Returns**: The local IP address as a string.
-
-* `getaddrinfo(host, port, af=AF_INET, type=SOCK_STREAM, proto=IPPROTO_TCP, flags=0)`
-
-  Translates host/port into arguments to socket constructor.
-
-  **Args**:
-
-    * host (str): host name;
-    * port (int): port number;
-    * af (int): address family: `AF_INET` or `AF_INET6`;
-    * type: (int): future socket type: `SOCK_STREAM` or `SOCK_DGRAM`;
-    * proto (int): future protocol: `IPPROTO_TCP` or `IPPROTO_UDP`;
-    * flag (int): additional socket flags;
-
-  **Returns**: a tuple with arguments.
-
-* `inet_ntop(af, bin_addr)`
-
-  *Not implemented*
-
-  Converts a binary address into textual representation.
-
-  **Args**:
-  
-    * af (int): address family: `AF_INET` or `AF_INET6`;
-    * bin_addr (bytearray): binary address;
-
-  **Returns**: a string with the address.
-
-* `inet_pton(af, txt_addr)`
-
-  *Not implemented*
-
-  Converts a text address into binary representation.
-
-  **Args**:
-
-    * af (int): address family: `AF_INET` or `AF_INET6`;
-    * txt_addr (str): address as text;
-
-  **Returns**: a bytearray address.
-
-* `get_num_open()`
-
-  Retrieves the number of open sockets.
-
-  **Returns**: The number of open sockets.
+* `get_local_ip()` (str): the local IP address;
+* `getaddrinfo(host (str), port (str), af (int) = AF_INET, type (int) = SOCK_STREAM, proto (int) = IPPROTO_TCP, flags (int) = 0)` (tuple): translates host/port into arguments to socket constructor;
+* `inet_ntop(af: int, bin_addr: bytearray)` (str) [not implemented]
+* `inet_pton(af: int, txt_addr: str)` (bytearray) [Not implemented]
+* `get_num_open()` (int): the number of open sockets (max 8);
 
 ### `ussl` ###
 
@@ -222,237 +166,54 @@ See [micropython docs](https://docs.micropython.org/en/latest/library/usocket.ht
 
 Provides SSL over GPRS sockets (axtls).
 
-#### Classes ####
-
-* `ssl_socket(af, type, proto)`
-
+* `ssl_socket(af, type, proto)`: ssl socket wrapper;
     * `close()`
-    * `read([size])`
-    * `readinto(buf[, nbytes])`
+    * `read([size: int])`
+    * `readinto(buf[, nbytes: int])`
     * `readline()`
     * `write(buf)`
+* `wrap_socket(sock: socket, server_side: bool = False, keyfile=None, certfile=None, cert_reqs=CERT_NONE, ca_certs=None)` (ssl_socket): wraps a stream socket into ssl. Keyword arguments have never been tested;
 
-#### Methods ####
-
-* `wrap_socket(sock, server_side=False, keyfile=None, certfile=None, cert_reqs=CERT_NONE, ca_certs=None)`
-
-  Takes a stream socket and returns an `SSLSocket`.
-
-  **Args**:
-
-    * sock (`usocket.socket`): the socket to wrap;
-
-  **Returns**: a wrapped SSL socket.
-
-### `gps`
+### `gps` ###
 
 Provides the GPS functionality.
 This is only available in the A9G module where GPS is a separate chip connected via UART2.
 
-#### Exception classes ####
-
-* `GPSError(message)`
-
-#### Methods ####
-
-* `on()`
-
-  Turns the GPS on. Blocks until the GPS module responds.
-
-* `off()`
-
-  Turns the GPS off.
-
-* `get_firmware_version()`
-
-  Retrieves the firmware version.
-
-  **Returns**: the firmware version as a string.
-
-* `get_location()`
-
-  Retrieves the current GPS location.
-
-  **Returns**: latitude and longitude in degrees.
-
-* `get_last_location()`
-
-  Retrieves the last GPS location.
-
-  **Returns**: latitude and longitude in degrees.
-
-* `get_satellites()`
-
-  Retrieves the number of satellites visible.
-
-  **Returns**: the number of satellites tracked and the number of visible satellites.
+* `GPSError(message: str)`
+* `on()`: turns the GPS on;
+* `off()`: turns the GPS off;
+* `get_firmware_version()` (str): retrieves the firmware version;
+* `get_location()` (latitude: float, longitude: float): retrieves the current GPS location;
+* `get_last_location()` (latitude: float, longitude: float): retrieves the last known GPS location without polling the GPS module;
+* `get_satellites()` (tracked: int, visible: int): the numbers of satellites in operation;
 
 ### `machine`
 
 Provides power-related functions: power, watchdogs.
 
-#### Methods ####
-
-* `reset()`
-
-  Hard-resets the module.
-
-* `off()`
-
-  Powers the module down.
-  **Note**: By fact, hard-resets the module, at least when USB-powered.
-  **TODO**: Needs further investigation.
-
-* `idle()`
-
-  Reduces clock rates of the module keeping functionality.
-
-* `get_input_voltage()`
-
-  Retrieves the input voltage and the battery percentage.
-
-  **Returns**: two numbers: the voltage in `mV` and the estimated percentage (Lithium battery discharge controller).
-  **Note**: also works when USB-powered (the second number returned is irrelevant).
-
-* `power_on_cause()`
-
-  Retrieves the reason for powering the module on.
-
-  **Returns**: one of `POWER_ON_CAUSE_ALARM`, `POWER_ON_CAUSE_CHARGE`, `POWER_ON_CAUSE_EXCEPTION`, `POWER_ON_CAUSE_KEY`, `POWER_ON_CAUSE_MAX`, `POWER_ON_CAUSE_RESET`.
-  **Note**: never saw anything except `POWER_ON_CAUSE_CHARGE` returned.
-  **TODO**: needs further investigation.
-
-* `watchdog_on(timeout)`
-
-  Arms the hardware watchdog.
-
-  **Args**:
-
-    * timeout (int): timeout in seconds;
-
-* `watchdog_off()`
-
-  Disarms the hardware watchdog.
-
-* `watchdog_reset()`
-
-  Resets the timer on the hardware watchdog.
+* `POWER_ON_CAUSE_ALARM`, `POWER_ON_CAUSE_CHARGE`, `POWER_ON_CAUSE_EXCEPTION`, `POWER_ON_CAUSE_KEY`, `POWER_ON_CAUSE_MAX`, `POWER_ON_CAUSE_RESET`: power-on flags;
+* `reset()`: hard-resets the module;
+* `off()`: powers the module down. **TODO**: By fact, hard-resets the module, at least when USB-powered. Figure out what's wrong;
+* `idle()`: tunes the clock rate down and turns off peripherials;
+* `get_input_voltage()` (float, float): the input voltage (mV) and the battery level (percents);
+* `power_on_cause()` (int): the power-on flag, one of `POWER_ON_CAUSE_*`.  **TODO**: never saw anything except `POWER_ON_CAUSE_CHARGE` returned, needs investigation;
+* `watchdog_on(timeout: int)`: arms the hardware watchdog with a timeout in seconds;
+* `watchdog_off()`: disarms the hardware watchdog;
+* `watchdog_reset()`: resets the timer on the hardware watchdog;
   
 ### `i2c`
 
 Provides i2c functionality
 (see [sdk docs](https://ai-thinker-open.github.io/GPRS_C_SDK_DOC/en/c-sdk/function-api/iic.html))
 
-#### Exception classes ####
-
+* `I2C_DEFAULT_TIME_OUT`
 * `I2CError(message)`
-
-#### Constants ####
-
-I2C_DEFAULT_TIME_OUT
-
-#### Enums ####
-
-* `id`
-
-  **Options**: `1`, `2`, `3`
-  
-  **Fallback**: `1`
-  
-  **Meaning**: I2C port ids (see devboard layout)
-  
-  
-* `freq`
-
-  **Options**: `100`, `400`
-  
-  **Fallback**: `100`
-  
-  **Meaning**: I2C SCL Frequency 100kHz, 400kHz respectively
-  
-
-#### Methods ####
-
-**Note**: parameters in square brackets are optional
-
-* `init(id, freq)`
-
-  Inintializes i2c on given port id and frequency
-    
-  **Args**:
-
-    * `id` (int): see enums;
-    * `freq` (int): see enums;
-  
-  **Returns**: `None` if everything ok.
-
-  **Note**: Different ports can be initialized simultaneously
-
-* `close(id)`
-
-  Closes i2c on given port id
-  
-  **Args**:
-
-    * `id` (int): see enums;
-  
-  **Returns**: `None` if everything ok.
-
-* `receive(id, slave_address, data_length, [timeout] = I2C_DEFAULT_TIME_OUT)`
-
-  Receive data given length from slave device
-  
-  **Args**:
-
-    * `id` (int): see enums;
-    * `slave_address` (int, hex): slave device communication address;
-    * `data_length` (int): data length needed to be received;
-    * `[timeout]` (int) = 10: timeout of receiving in ms
-  
-  **Returns**: bytes() of given length.
-
-* `transmit(id, slave_address, data, [timeout] = I2C_DEFAULT_TIME_OUT)`
-
-  Transmit given data to slave device
-  
-  **Args**:
-
-    * `id` (int): see enums;
-    * `slave_address` (int, hex): slave device communication address;
-    * `data` (bytes): data needed to be transmitted;
-    * `[timeout]` (int) = 10: timeout of receiving in ms
-  
-  **Returns**: None if everything ok.
-
-* `mem_receive(id, slave_address, memory_address, memory_size, data_length, [timeout] = I2C_DEFAULT_TIME_OUT)`
-
-  Read data given length from slave device's memory by its address
-  
-  **Args**:
-
-    * `id` (int): see enums;
-    * `slave_address` (int, hex): slave device communication address;
-    * `memory_address` (int, hex): slave device memory read address;
-    * `memory_size` (int, hex): slave device memory read size;
-    * `data_length` (int): data length needed to be read;
-    * `[timeout]` (int) = 10: timeout of reading in ms
-  
-  **Returns**: bytes() of given length.
-
-* `mem_transmit(id, slave_address, memory_address, memory_size, data, [timeout] = I2C_DEFAULT_TIME_OUT)`
-
-  Write given data to slave device's memory by address
-  
-  **Args**:
-
-    * `id` (int): see enums;
-    * `slave_address` (int, hex): slave device communication address;
-    * `memory_address` (int, hex): slave device memory write address;
-    * `memory_size` (int, hex): slave device memory write size;
-    * `data` (bytes): data needed to be written;
-    * `[timeout]` (int) = 10: timeout of writing in ms
-  
-  **Returns**: None if everything ok.
+* `init(id: int, freq: int)`: inintializes i2c on the given port id and frequency;
+* `close(id: int)`: closes i2c on the given port id;
+* `receive(id: int, slave_address: int, data_length: int, timeout: int = I2C_DEFAULT_TIME_OUT)` (bytes): receives data;
+* `transmit(id: int, slave_address: int, data: bytes, timeout: int = I2C_DEFAULT_TIME_OUT)`: transmits data;
+* `mem_receive(id: int, slave_address: int, memory_address: int, memory_size: int, data_length: int, timeout: int = I2C_DEFAULT_TIME_OUT)` (bytes): reads memory data;
+* `mem_transmit(id: int, slave_address: int, memory_address: int, memory_size: int, data: bytes, timeout: int = I2C_DEFAULT_TIME_OUT)` writes data to memory;
 
 ## Notes ##
 

From 5f5b2db9cefc7ce999299821a4a1538ee1397790 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sun, 10 Nov 2019 14:51:42 +0100
Subject: [PATCH 3352/3533] Add all-bands constant

---
 ports/gprs_a9/modcellular.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ports/gprs_a9/modcellular.c b/ports/gprs_a9/modcellular.c
index 6e96813751c2b..a8c5ae684b098 100644
--- a/ports/gprs_a9/modcellular.c
+++ b/ports/gprs_a9/modcellular.c
@@ -65,6 +65,8 @@
 #define MAX_CALLS_MISSED 15
 #define MAX_CELLS 8
 
+#define BANDS_ALL (NETWORK_FREQ_BAND_GSM_900P | NETWORK_FREQ_BAND_GSM_900E | NETWORK_FREQ_BAND_GSM_850 | NETWORK_FREQ_BAND_DCS_1800 | NETWORK_FREQ_BAND_PCS_1900)
+
 // --------------
 // Vars: statuses
 // --------------
@@ -866,7 +868,7 @@ STATIC mp_obj_t modcellular_set_bands(size_t n_args, const mp_obj_t *args) {
     //     bands;
     // ========================================
     if (n_args == 0) {
-        if (!Network_SetFrequencyBand(NETWORK_FREQ_BAND_GSM_900P | NETWORK_FREQ_BAND_GSM_900E | NETWORK_FREQ_BAND_GSM_850 | NETWORK_FREQ_BAND_DCS_1800 | NETWORK_FREQ_BAND_PCS_1900)) {
+        if (!Network_SetFrequencyBand(BANDS_ALL)) {
             mp_raise_CellularError("Failed to reset 2G GSM bands");
             return mp_const_none;
         }
@@ -1150,6 +1152,7 @@ STATIC const mp_map_elem_t mp_module_cellular_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_NETWORK_FREQ_BAND_GSM_850),  MP_ROM_INT(NETWORK_FREQ_BAND_GSM_850)  },
     { MP_ROM_QSTR(MP_QSTR_NETWORK_FREQ_BAND_DCS_1800), MP_ROM_INT(NETWORK_FREQ_BAND_DCS_1800) },
     { MP_ROM_QSTR(MP_QSTR_NETWORK_FREQ_BAND_PCS_1900), MP_ROM_INT(NETWORK_FREQ_BAND_PCS_1900) },
+    { MP_ROM_QSTR(MP_QSTR_NETWORK_FREQ_BANDS_ALL), MP_ROM_INT(BANDS_ALL) },
 
     { MP_ROM_QSTR(MP_QSTR_OPERATOR_STATUS_UNKNOWN), MP_ROM_INT(0) },
     { MP_ROM_QSTR(MP_QSTR_OPERATOR_STATUS_AVAILABLE), MP_ROM_INT(1) },

From 1f8e3b45fb7db32ee37512505a66084eb768267b Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sun, 10 Nov 2019 16:01:31 +0100
Subject: [PATCH 3353/3533] Add a docstring

[ci skip]
---
 ports/gprs_a9/modcellular.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/ports/gprs_a9/modcellular.c b/ports/gprs_a9/modcellular.c
index a8c5ae684b098..ca6c8e7b351ce 100644
--- a/ports/gprs_a9/modcellular.c
+++ b/ports/gprs_a9/modcellular.c
@@ -327,6 +327,12 @@ typedef struct _sms_obj_t {
 } sms_obj_t;
 
 mp_obj_t modcellular_sms_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
+    // ========================================
+    // SMS class.
+    // Args:
+    //     phone_number (str): the phone number, source or destination;
+    //     message (str): message contents;
+    // ========================================
 
     enum { ARG_phone_number, ARG_message };
     static const mp_arg_t allowed_args[] = {

From c8a6f667ae1a3b735a769e97b1f5ff8ef34ea172 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sun, 10 Nov 2019 16:02:25 +0100
Subject: [PATCH 3354/3533] Cleanup machine_pin.c

---
 ports/gprs_a9/machine_pin.c | 221 ++++++++----------------------------
 1 file changed, 46 insertions(+), 175 deletions(-)

diff --git a/ports/gprs_a9/machine_pin.c b/ports/gprs_a9/machine_pin.c
index 72d0e691484d9..f9d33c3d7a00f 100644
--- a/ports/gprs_a9/machine_pin.c
+++ b/ports/gprs_a9/machine_pin.c
@@ -39,16 +39,15 @@
 #include "api_hal_pm.h"
 #include "api_hal_gpio.h"
 
+// -------
+// Classes
+// -------
+
 typedef struct _machine_pin_obj_t {
     mp_obj_base_t base;
     GPIO_PIN id;
 } machine_pin_obj_t;
 
-typedef struct _machine_pin_irq_obj_t {
-    mp_obj_base_t base;
-    GPIO_PIN id;
-} machine_pin_irq_obj_t;
-
 STATIC const machine_pin_obj_t machine_pin_obj[] = {
     {{&machine_pin_type}, GPIO_PIN0},
     {{&machine_pin_type}, GPIO_PIN1},
@@ -87,48 +86,10 @@ STATIC const machine_pin_obj_t machine_pin_obj[] = {
     {{&machine_pin_type}, GPIO_PIN34},
 };
 
-// forward declaration
-// STATIC const machine_pin_irq_obj_t machine_pin_irq_object[];
-
-// void machine_pins_init(void) {
-//     static bool did_install = false;
-//     if (!did_install) {
-//         gpio_install_isr_service(0);
-//         did_install = true;
-//     }
-//     memset(&MP_STATE_PORT(machine_pin_irq_handler[0]), 0, sizeof(MP_STATE_PORT(machine_pin_irq_handler)));
-// }
-
-// void machine_pins_deinit(void) {
-//     for (int i = 0; i < MP_ARRAY_SIZE(machine_pin_obj); ++i) {
-//         if (machine_pin_obj[i].id != (GPIO_PINt)-1) {
-//             gpio_isr_handler_remove(machine_pin_obj[i].id);
-//         }
-//     }
-// }
-
-// STATIC void IRAM_ATTR machine_pin_isr_handler(void *arg) {
-//     machine_pin_obj_t *self = arg;
-//     mp_obj_t handler = MP_STATE_PORT(machine_pin_irq_handler)[self->id];
-//     mp_sched_schedule(handler, MP_OBJ_FROM_PTR(self));
-//     mp_hal_wake_main_task_from_isr();
-// }
-
-GPIO_PIN machine_pin_get_id(mp_obj_t pin_in) {
-    if (mp_obj_get_type(pin_in) != &machine_pin_type) {
-        mp_raise_ValueError("expecting a pin");
-    }
-    machine_pin_obj_t *self = pin_in;
-    return self->id;
-}
-
-STATIC void machine_pin_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
-    machine_pin_obj_t *self = self_in;
-    mp_printf(print, "Pin(%u)", self->id);
-}
-
-// pin.init(mode, pull=None, *, value)
-STATIC mp_obj_t machine_pin_obj_init_helper(const machine_pin_obj_t *self, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+void machine_pin_obj_init_helper(const machine_pin_obj_t *self, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    // ========================================
+    // Parses arguments and initializes pins.
+    // ========================================
     enum { ARG_mode, ARG_pull, ARG_value };
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_mode, MP_ARG_OBJ, {.u_obj = mp_const_none}},
@@ -172,11 +133,17 @@ STATIC mp_obj_t machine_pin_obj_init_helper(const machine_pin_obj_t *self, size_
 
     gpioObj.pin = self->id;
     GPIO_Init(gpioObj);
-    return mp_const_none;
 }
 
-// constructor(id, ...)
 mp_obj_t mp_pin_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
+    // ========================================
+    // GPIO pin class.
+    // Args:
+    //     pin (int): integer pointing to a particular pin;
+    //     mode (int): input (Pin.IN) or output (Pin.OUT);
+    //     value (int): sets the value for output pins;
+    //     pull (int): sets internal pull-up resistor for input pins;
+    // ========================================
     mp_arg_check_num(n_args, n_kw, 1, MP_OBJ_FUN_ARGS_MAX, true);
 
     // get the wanted pin object
@@ -186,7 +153,7 @@ mp_obj_t mp_pin_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw,
         self = (machine_pin_obj_t*)&machine_pin_obj[wanted_pin];
     }
     if (self == NULL || self->base.type == NULL) {
-        mp_raise_ValueError("invalid pin");
+        mp_raise_ValueError("Invalid pin");
     }
 
     mp_map_t kw_args;
@@ -198,6 +165,13 @@ mp_obj_t mp_pin_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw,
 
 // fast method for getting/setting pin value
 STATIC mp_obj_t machine_pin_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
+    // ========================================
+    // GPIO level setting.
+    // Args:
+    //     value (bool): GPIO level;
+    // Returns:
+    //    GPIO level. 
+    // ========================================
     mp_arg_check_num(n_args, n_kw, 0, 1, false);
     machine_pin_obj_t *self = self_in;
     GPIO_LEVEL level;
@@ -213,99 +187,44 @@ STATIC mp_obj_t machine_pin_call(mp_obj_t self_in, size_t n_args, size_t n_kw, c
     }
 }
 
-// pin.init(mode, pull)
 STATIC mp_obj_t machine_pin_obj_init(size_t n_args, const mp_obj_t *args, mp_map_t *kw_args) {
-    return machine_pin_obj_init_helper(args[0], n_args - 1, args + 1, kw_args);
+    // ========================================
+    // Initializes the pin.
+    // Args:
+    //     mode (int): input (Pin.IN) or output (Pin.OUT);
+    //     value (int): sets the value for output pins;
+    //     pull (int): sets internal pull-up resistor for input pins;
+    // ========================================
+    machine_pin_obj_init_helper(args[0], n_args - 1, args + 1, kw_args);
+    return mp_const_none;
 }
 MP_DEFINE_CONST_FUN_OBJ_KW(machine_pin_init_obj, 1, machine_pin_obj_init);
 
 // pin.value([value])
 STATIC mp_obj_t machine_pin_value(size_t n_args, const mp_obj_t *args) {
+    // ========================================
+    // Alias of machine_pin_call.
+    // ========================================
     return machine_pin_call(args[0], n_args - 1, 0, args + 1);
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_pin_value_obj, 1, 2, machine_pin_value);
 
-// pin.irq(handler=None, trigger=IRQ_FALLING|IRQ_RISING)
-// STATIC mp_obj_t machine_pin_irq(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
-//     enum { ARG_handler, ARG_trigger, ARG_wake };
-//     static const mp_arg_t allowed_args[] = {
-//         { MP_QSTR_handler, MP_ARG_OBJ, {.u_obj = mp_const_none} },
-//         { MP_QSTR_trigger, MP_ARG_INT, {.u_int = GPIO_PIN_INTR_POSEDGE | GPIO_PIN_INTR_NEGEDGE} },
-//         { MP_QSTR_wake, MP_ARG_OBJ, {.u_obj = mp_const_none} },
-//     };
-//     machine_pin_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]);
-//     mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
-//     mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
-
-//     if (n_args > 1 || kw_args->used != 0) {
-//         // configure irq
-//         mp_obj_t handler = args[ARG_handler].u_obj;
-//         uint32_t trigger = args[ARG_trigger].u_int;
-//         mp_obj_t wake_obj = args[ARG_wake].u_obj;
-
-//         if ((trigger == GPIO_PIN_INTR_LOLEVEL || trigger == GPIO_PIN_INTR_HILEVEL) && wake_obj != mp_const_none) {
-//             mp_int_t wake;
-//             if (mp_obj_get_int_maybe(wake_obj, &wake)) {
-//                 if (wake < 2 || wake > 7) {
-//                     mp_raise_ValueError("bad wake value");
-//                 }
-//             } else {
-//                 mp_raise_ValueError("bad wake value");
-//             }
-
-//             if (machine_rtc_config.wake_on_touch) { // not compatible
-//                 mp_raise_ValueError("no resources");
-//             }
-
-//             if (!RTC_IS_VALID_EXT_PIN(self->id)) {
-//                 mp_raise_ValueError("invalid pin for wake");
-//             }
-
-//             if (machine_rtc_config.ext0_pin == -1) {
-//                 machine_rtc_config.ext0_pin = self->id;
-//             } else if (machine_rtc_config.ext0_pin != self->id) {
-//                 mp_raise_ValueError("no resources");
-//             }
-
-//             machine_rtc_config.ext0_level = trigger == GPIO_PIN_INTR_LOLEVEL ? 0 : 1;
-//             machine_rtc_config.ext0_wake_types = wake;
-//         } else {
-//             if (machine_rtc_config.ext0_pin == self->id) {
-//                 machine_rtc_config.ext0_pin = -1;
-//             }
-
-//             if (handler == mp_const_none) {
-//                 handler = MP_OBJ_NULL;
-//                 trigger = 0;
-//             }
-//             gpio_isr_handler_remove(self->id);
-//             MP_STATE_PORT(machine_pin_irq_handler)[self->id] = handler;
-//             gpio_set_intr_type(self->id, trigger);
-//             gpio_isr_handler_add(self->id, machine_pin_isr_handler, (void*)self);
-//         }
-//     }
-
-//     // return the irq object
-//     return MP_OBJ_FROM_PTR(&machine_pin_irq_object[self->id]);
-// }
-// STATIC MP_DEFINE_CONST_FUN_OBJ_KW(machine_pin_irq_obj, 1, machine_pin_irq);
+STATIC void machine_pin_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+    // ========================================
+    // Pin.__str__
+    // ========================================
+    machine_pin_obj_t *self = self_in;
+    mp_printf(print, "Pin(%u)", self->id);
+}
 
 STATIC const mp_rom_map_elem_t machine_pin_locals_dict_table[] = {
-    // instance methods
     { MP_ROM_QSTR(MP_QSTR_init), MP_ROM_PTR(&machine_pin_init_obj) },
     { MP_ROM_QSTR(MP_QSTR_value), MP_ROM_PTR(&machine_pin_value_obj) },
-    // { MP_ROM_QSTR(MP_QSTR_irq), MP_ROM_PTR(&machine_pin_irq_obj) },
 
-    // class constants
-    { MP_ROM_QSTR(MP_QSTR_IN), MP_ROM_INT(GPIO_MODE_INPUT) },
-    { MP_ROM_QSTR(MP_QSTR_OUT), MP_ROM_INT(GPIO_MODE_OUTPUT) },
-    // { MP_ROM_QSTR(MP_QSTR_OPEN_DRAIN), MP_ROM_INT(GPIO_MODE_INPUT_OUTPUT_OD) },
-    { MP_ROM_QSTR(MP_QSTR_PULL_UP), MP_ROM_INT(GPIO_LEVEL_HIGH) },
+    { MP_ROM_QSTR(MP_QSTR_IN),        MP_ROM_INT(GPIO_MODE_INPUT) },
+    { MP_ROM_QSTR(MP_QSTR_OUT),       MP_ROM_INT(GPIO_MODE_OUTPUT) },
+    { MP_ROM_QSTR(MP_QSTR_PULL_UP),   MP_ROM_INT(GPIO_LEVEL_HIGH) },
     { MP_ROM_QSTR(MP_QSTR_PULL_DOWN), MP_ROM_INT(GPIO_LEVEL_LOW) },
-    // { MP_ROM_QSTR(MP_QSTR_IRQ_RISING), MP_ROM_INT(GPIO_PIN_INTR_POSEDGE) },
-    // { MP_ROM_QSTR(MP_QSTR_IRQ_FALLING), MP_ROM_INT(GPIO_PIN_INTR_NEGEDGE) },
-    // { MP_ROM_QSTR(MP_QSTR_WAKE_LOW), MP_ROM_INT(GPIO_PIN_INTR_LOLEVEL) },
-    // { MP_ROM_QSTR(MP_QSTR_WAKE_HIGH), MP_ROM_INT(GPIO_PIN_INTR_HILEVEL) },
 };
 
 STATIC mp_uint_t pin_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_t arg, int *errcode) {
@@ -342,54 +261,6 @@ const mp_obj_type_t machine_pin_type = {
     .locals_dict = (mp_obj_t)&machine_pin_locals_dict,
 };
 
-/******************************************************************************/
-// Pin IRQ object
-
-STATIC const mp_obj_type_t machine_pin_irq_type;
-
-STATIC const machine_pin_irq_obj_t machine_pin_irq_object[] = {
-    {{&machine_pin_irq_type}, GPIO_PIN0},
-    {{&machine_pin_irq_type}, GPIO_PIN1},
-    {{&machine_pin_irq_type}, GPIO_PIN2},
-    {{&machine_pin_irq_type}, GPIO_PIN3},
-    {{&machine_pin_irq_type}, GPIO_PIN4},
-    {{&machine_pin_irq_type}, GPIO_PIN5},
-    {{&machine_pin_irq_type}, GPIO_PIN6},
-    {{&machine_pin_irq_type}, GPIO_PIN7},
-};
-
-// STATIC mp_obj_t machine_pin_irq_call(mp_obj_t self_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
-//     machine_pin_irq_obj_t *self = self_in;
-//     mp_arg_check_num(n_args, n_kw, 0, 0, false);
-//     machine_pin_isr_handler((void*)&machine_pin_obj[self->id]);
-//     return mp_const_none;
-// }
-
-// STATIC mp_obj_t machine_pin_irq_trigger(size_t n_args, const mp_obj_t *args) {
-//     machine_pin_irq_obj_t *self = args[0];
-//     uint32_t orig_trig = GPIO.pin[self->id].int_type;
-//     if (n_args == 2) {
-//         // set trigger
-//         gpio_set_intr_type(self->id, mp_obj_get_int(args[1]));
-//     }
-//     // return original trigger value
-//     return MP_OBJ_NEW_SMALL_INT(orig_trig);
-// }
-// STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_pin_irq_trigger_obj, 1, 2, machine_pin_irq_trigger);
-
-// STATIC const mp_rom_map_elem_t machine_pin_irq_locals_dict_table[] = {
-//     { MP_ROM_QSTR(MP_QSTR_trigger), MP_ROM_PTR(&machine_pin_irq_trigger_obj) },
-// };
-// STATIC MP_DEFINE_CONST_DICT(machine_pin_irq_locals_dict, machine_pin_irq_locals_dict_table);
-
-// STATIC const mp_obj_type_t machine_pin_irq_type = {
-//     { &mp_type_type },
-//     .name = MP_QSTR_IRQ,
-//     .call = machine_pin_irq_call,
-//     .locals_dict = (mp_obj_dict_t*)&machine_pin_irq_locals_dict,
-// };
-
-
 void mp_hal_pin_input(mp_hal_pin_obj_t pin_id) {
     const machine_pin_obj_t *self = MP_OBJ_TO_PTR(pin_id); // &machine_pin_obj[pin_id];
     GPIO_ChangeMode(self->id, GPIO_MODE_INPUT);

From 1a1d72afb9194921b65c5b3f6a414273aa913067 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sun, 10 Nov 2019 16:38:47 +0100
Subject: [PATCH 3355/3533] Speed up gpio with an atomic pin type

---
 ports/gprs_a9/machine_pin.c | 98 +++++++++++++++++++++++--------------
 ports/gprs_a9/mphalport.h   |  4 +-
 2 files changed, 62 insertions(+), 40 deletions(-)

diff --git a/ports/gprs_a9/machine_pin.c b/ports/gprs_a9/machine_pin.c
index f9d33c3d7a00f..900429dcedb4c 100644
--- a/ports/gprs_a9/machine_pin.c
+++ b/ports/gprs_a9/machine_pin.c
@@ -45,45 +45,46 @@
 
 typedef struct _machine_pin_obj_t {
     mp_obj_base_t base;
+    uint32_t phys_port;
     GPIO_PIN id;
 } machine_pin_obj_t;
 
 STATIC const machine_pin_obj_t machine_pin_obj[] = {
-    {{&machine_pin_type}, GPIO_PIN0},
-    {{&machine_pin_type}, GPIO_PIN1},
-    {{&machine_pin_type}, GPIO_PIN2},
-    {{&machine_pin_type}, GPIO_PIN3},
-    {{&machine_pin_type}, GPIO_PIN4},
-    {{&machine_pin_type}, GPIO_PIN5},
-    {{&machine_pin_type}, GPIO_PIN6},
-    {{&machine_pin_type}, GPIO_PIN7},
-    {{&machine_pin_type}, GPIO_PIN8},
-    {{&machine_pin_type}, GPIO_PIN9},
-    {{&machine_pin_type}, GPIO_PIN10},
-    {{&machine_pin_type}, GPIO_PIN11},
-    {{&machine_pin_type}, GPIO_PIN12},
-    {{&machine_pin_type}, GPIO_PIN13},
-    {{&machine_pin_type}, GPIO_PIN14},
-    {{&machine_pin_type}, GPIO_PIN15},
-    {{&machine_pin_type}, GPIO_PIN16},
-    {{&machine_pin_type}, GPIO_PIN17},
-    {{&machine_pin_type}, GPIO_PIN18},
-    {{&machine_pin_type}, GPIO_PIN19},
-    {{&machine_pin_type}, GPIO_PIN20},
-    {{&machine_pin_type}, GPIO_PIN21},
-    {{&machine_pin_type}, GPIO_PIN22},
-    {{&machine_pin_type}, GPIO_PIN23},
-    {{&machine_pin_type}, GPIO_PIN24},
-    {{&machine_pin_type}, GPIO_PIN25},
-    {{&machine_pin_type}, GPIO_PIN26},
-    {{&machine_pin_type}, GPIO_PIN27},
-    {{&machine_pin_type}, GPIO_PIN28},
-    {{&machine_pin_type}, GPIO_PIN29},
-    {{&machine_pin_type}, GPIO_PIN30},
-    {{&machine_pin_type}, GPIO_PIN31},
-    {{&machine_pin_type}, GPIO_PIN32},
-    {{&machine_pin_type}, GPIO_PIN33},
-    {{&machine_pin_type}, GPIO_PIN34},
+    {{&machine_pin_type},  0, GPIO_PIN0},
+    {{&machine_pin_type},  1, GPIO_PIN1},
+    {{&machine_pin_type},  2, GPIO_PIN2},
+    {{&machine_pin_type},  3, GPIO_PIN3},
+    {{&machine_pin_type},  4, GPIO_PIN4},
+    {{&machine_pin_type},  5, GPIO_PIN5},
+    {{&machine_pin_type},  6, GPIO_PIN6},
+    {{&machine_pin_type},  7, GPIO_PIN7},
+    {{&machine_pin_type},  8, GPIO_PIN8},
+    {{&machine_pin_type},  9, GPIO_PIN9},
+    {{&machine_pin_type}, 10, GPIO_PIN10},
+    {{&machine_pin_type}, 11, GPIO_PIN11},
+    {{&machine_pin_type}, 12, GPIO_PIN12},
+    {{&machine_pin_type}, 13, GPIO_PIN13},
+    {{&machine_pin_type}, 14, GPIO_PIN14},
+    {{&machine_pin_type}, 15, GPIO_PIN15},
+    {{&machine_pin_type}, 16, GPIO_PIN16},
+    {{&machine_pin_type}, 17, GPIO_PIN17},
+    {{&machine_pin_type}, 18, GPIO_PIN18},
+    {{&machine_pin_type}, 19, GPIO_PIN19},
+    {{&machine_pin_type}, 20, GPIO_PIN20},
+    {{&machine_pin_type}, 21, GPIO_PIN21},
+    {{&machine_pin_type}, 22, GPIO_PIN22},
+    {{&machine_pin_type}, 23, GPIO_PIN23},
+    {{&machine_pin_type}, 24, GPIO_PIN24},
+    {{&machine_pin_type}, 25, GPIO_PIN25},
+    {{&machine_pin_type}, 26, GPIO_PIN26},
+    {{&machine_pin_type}, 27, GPIO_PIN27},
+    {{&machine_pin_type}, 28, GPIO_PIN28},
+    {{&machine_pin_type}, 29, GPIO_PIN29},
+    {{&machine_pin_type}, 30, GPIO_PIN30},
+    {{&machine_pin_type}, 31, GPIO_PIN31},
+    {{&machine_pin_type}, 32, GPIO_PIN32},
+    {{&machine_pin_type}, 33, GPIO_PIN33},
+    {{&machine_pin_type}, 34, GPIO_PIN34},
 };
 
 void machine_pin_obj_init_helper(const machine_pin_obj_t *self, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
@@ -214,7 +215,7 @@ STATIC void machine_pin_print(const mp_print_t *print, mp_obj_t self_in, mp_prin
     // Pin.__str__
     // ========================================
     machine_pin_obj_t *self = self_in;
-    mp_printf(print, "Pin(%u)", self->id);
+    mp_printf(print, "Pin(%u)", self->phys_port);
 }
 
 STATIC const mp_rom_map_elem_t machine_pin_locals_dict_table[] = {
@@ -262,11 +263,32 @@ const mp_obj_type_t machine_pin_type = {
 };
 
 void mp_hal_pin_input(mp_hal_pin_obj_t pin_id) {
-    const machine_pin_obj_t *self = MP_OBJ_TO_PTR(pin_id); // &machine_pin_obj[pin_id];
+    const machine_pin_obj_t *self = &machine_pin_obj[pin_id];
     GPIO_ChangeMode(self->id, GPIO_MODE_INPUT);
 }
 
 void mp_hal_pin_output(mp_hal_pin_obj_t pin_id) {
-    const machine_pin_obj_t *self = MP_OBJ_TO_PTR(pin_id); // &machine_pin_obj[pin_id];
+    const machine_pin_obj_t *self = &machine_pin_obj[pin_id];
     GPIO_ChangeMode(self->id, GPIO_MODE_OUTPUT);
 }
+
+int mp_hal_pin_read(mp_hal_pin_obj_t pin_id) {
+    const machine_pin_obj_t *self = &machine_pin_obj[pin_id];
+    GPIO_LEVEL level;
+    GPIO_Get(self->id, &level);
+    return (int) level;
+}
+
+void mp_hal_pin_write(mp_hal_pin_obj_t pin_id, int value) {
+    const machine_pin_obj_t *self = &machine_pin_obj[pin_id];
+    GPIO_Set(self->id, (GPIO_LEVEL) value);
+}
+
+mp_hal_pin_obj_t mp_hal_get_pin_obj(mp_obj_t pin_in) {
+    if (mp_obj_get_type(pin_in) != &machine_pin_type) {
+        mp_raise_ValueError("expecting a pin");
+    }
+    machine_pin_obj_t *self = MP_OBJ_TO_PTR(pin_in);
+    return self->phys_port;
+}
+
diff --git a/ports/gprs_a9/mphalport.h b/ports/gprs_a9/mphalport.h
index 14c40dbcb876f..f3d575fb86f3a 100644
--- a/ports/gprs_a9/mphalport.h
+++ b/ports/gprs_a9/mphalport.h
@@ -36,11 +36,11 @@
 
 #define MP_HAL_PIN_FMT "%u"
 #define mp_hal_pin_name(p) (p)
+#define mp_hal_pin_obj_t uint32_t
+
 void mp_hal_set_interrupt_char(int c);
 
 bool UartInit();
-
-
 uint32_t mp_hal_ticks_ms(void);
 uint32_t mp_hal_ticks_us(void);
 void mp_hal_delay_ms(uint32_t ms);

From 2ffc16004d25f31568822fd2c8a18af4203cca77 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sun, 10 Nov 2019 17:04:05 +0100
Subject: [PATCH 3356/3533] Add file.tell

---
 ports/gprs_a9/file_io.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/gprs_a9/file_io.c b/ports/gprs_a9/file_io.c
index 3df64542d95c5..7967314087258 100644
--- a/ports/gprs_a9/file_io.c
+++ b/ports/gprs_a9/file_io.c
@@ -195,7 +195,7 @@ STATIC const mp_rom_map_elem_t rawfile_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_flush), MP_ROM_PTR(&mp_stream_flush_obj) },
     { MP_ROM_QSTR(MP_QSTR_close), MP_ROM_PTR(&mp_stream_close_obj) },
     { MP_ROM_QSTR(MP_QSTR_seek), MP_ROM_PTR(&mp_stream_seek_obj) },
-    // { MP_ROM_QSTR(MP_QSTR_tell), MP_ROM_PTR(&mp_stream_tell_obj) },
+    { MP_ROM_QSTR(MP_QSTR_tell), MP_ROM_PTR(&mp_stream_tell_obj) },
     // { MP_ROM_QSTR(MP_QSTR___del__), MP_ROM_PTR(&mp_stream_close_obj) },
     // { MP_ROM_QSTR(MP_QSTR___enter__), MP_ROM_PTR(&mp_identity_obj) },
     // { MP_ROM_QSTR(MP_QSTR___exit__), MP_ROM_PTR(&file_obj___exit___obj) },

From a97a2b7eb3bef6c3457128631c3e6c164fe899d7 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Tue, 26 Nov 2019 22:00:21 +0100
Subject: [PATCH 3357/3533] Extract the header file from framebuffer

---
 extmod/modframebuf.h | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 extmod/modframebuf.h

diff --git a/extmod/modframebuf.h b/extmod/modframebuf.h
new file mode 100644
index 0000000000000..3a59cf48fcd42
--- /dev/null
+++ b/extmod/modframebuf.h
@@ -0,0 +1,34 @@
+#include "py/obj.h"
+
+#if MICROPY_PY_FRAMEBUF
+
+typedef struct _mp_obj_framebuf_t {
+    mp_obj_base_t base;
+    mp_obj_t buf_obj; // need to store this to prevent GC from reclaiming buf
+    void *buf;
+    uint16_t width, height, stride;
+    uint8_t format;
+} mp_obj_framebuf_t;
+
+typedef void (*setpixel_t)(const mp_obj_framebuf_t*, int, int, uint32_t);
+typedef uint32_t (*getpixel_t)(const mp_obj_framebuf_t*, int, int);
+typedef void (*fill_rect_t)(const mp_obj_framebuf_t *, int, int, int, int, uint32_t);
+
+typedef struct _mp_framebuf_p_t {
+    setpixel_t setpixel;
+    getpixel_t getpixel;
+    fill_rect_t fill_rect;
+} mp_framebuf_p_t;
+
+extern const mp_obj_type_t mp_type_framebuf;
+
+// constants for formats
+#define FRAMEBUF_MVLSB    (0)
+#define FRAMEBUF_RGB565   (1)
+#define FRAMEBUF_GS2_HMSB (5)
+#define FRAMEBUF_GS4_HMSB (2)
+#define FRAMEBUF_GS8      (6)
+#define FRAMEBUF_MHLSB    (3)
+#define FRAMEBUF_MHMSB    (4)
+
+#endif

From 620dec8de3a6855aad7bfc37b52ee8ca6017580d Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Tue, 26 Nov 2019 22:04:56 +0100
Subject: [PATCH 3358/3533] Extract pin initialization

---
 ports/gprs_a9/machine_pin.c | 65 ++++++++++++++++++-------------------
 1 file changed, 32 insertions(+), 33 deletions(-)

diff --git a/ports/gprs_a9/machine_pin.c b/ports/gprs_a9/machine_pin.c
index 900429dcedb4c..601a968a210d2 100644
--- a/ports/gprs_a9/machine_pin.c
+++ b/ports/gprs_a9/machine_pin.c
@@ -39,6 +39,9 @@
 #include "api_hal_pm.h"
 #include "api_hal_gpio.h"
 
+#define GPIO_LEVEL_UNSET 255
+// #define GPIO_Set(id, val) do {g_InterfaceVtbl->GPIO_Set((id), (val)); if ((id) == 17) {if ((val) == 0) mp_printf(&mp_plat_print, "comm"); else mp_printf(&mp_plat_print, "data");} else if ((id) == 15) {if ((val) == 0) mp_printf(&mp_plat_print, "("); else mp_printf(&mp_plat_print, ")\n");} else if ((id) == 16) {if ((val) == 0) mp_printf(&mp_plat_print, "-"); else mp_printf(&mp_plat_print, "+");} else if ((id) == 18) {if ((val) == 0) mp_printf(&mp_plat_print, "0"); else mp_printf(&mp_plat_print, "1");} else mp_printf(&mp_plat_print, "%d:%d ", (id), (val));} while(0)
+
 // -------
 // Classes
 // -------
@@ -87,53 +90,48 @@ STATIC const machine_pin_obj_t machine_pin_obj[] = {
     {{&machine_pin_type}, 34, GPIO_PIN34},
 };
 
+void pin_init(GPIO_PIN id, GPIO_MODE mode, GPIO_LEVEL default_level) {
+    GPIO_config_t config = {
+        .pin=id,
+        .mode=mode,
+        .defaultLevel=default_level,
+    };
+
+    // configure the pin for gpio
+    if ((id >= 8) && (id <= 13))
+        PM_PowerEnable(POWER_TYPE_MMC, true);
+    else if ((id >= 14) && (id <= 18))
+        PM_PowerEnable(POWER_TYPE_LCD, true);
+    else if ((id >= 19) && (id <= 24))
+        PM_PowerEnable(POWER_TYPE_CAM, true);
+    
+    GPIO_Init(config);
+}
+
 void machine_pin_obj_init_helper(const machine_pin_obj_t *self, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     // ========================================
     // Parses arguments and initializes pins.
     // ========================================
     enum { ARG_mode, ARG_pull, ARG_value };
     static const mp_arg_t allowed_args[] = {
-        { MP_QSTR_mode, MP_ARG_OBJ, {.u_obj = mp_const_none}},
-        { MP_QSTR_pull, MP_ARG_OBJ, {.u_obj = mp_const_none}},
-        { MP_QSTR_value, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL}},
-    };
-    GPIO_config_t gpioObj = {
-        .mode=GPIO_MODE_OUTPUT,
-        .pin=GPIO_PIN27,
-        .defaultLevel=GPIO_LEVEL_LOW,
+        { MP_QSTR_mode, MP_ARG_INT, {.u_int = GPIO_MODE_INPUT}},
+        { MP_QSTR_pull, MP_ARG_INT, {.u_int = GPIO_LEVEL_UNSET}},
+        { MP_QSTR_value, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = GPIO_LEVEL_UNSET}},
     };
 
     // parse args
     mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
     mp_arg_parse_all(n_args, pos_args, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
 
-    // configure the pin for gpio
-    if( (self->id >= 8) && self->id <=13 )
-        PM_PowerEnable(POWER_TYPE_MMC,true);
-    else if( (self->id >= 14) && self->id <=18 )
-        PM_PowerEnable(POWER_TYPE_LCD,true);
-    else if( (self->id >= 19) && self->id <=24 )
-        PM_PowerEnable(POWER_TYPE_CAM,true);
-
-    // set initial value (do this before configuring mode/pull)
-    if (args[ARG_value].u_obj != MP_OBJ_NULL)
-        gpioObj.defaultLevel = mp_obj_is_true(args[ARG_value].u_obj);
-
-    // configure mode
-    if (args[ARG_mode].u_obj != mp_const_none) {
-        mp_int_t pin_io_mode = mp_obj_get_int(args[ARG_mode].u_obj);
-        if(pin_io_mode & GPIO_MODE_INPUT)
-            gpioObj.mode = GPIO_MODE_INPUT;
-        else
-            gpioObj.mode = GPIO_MODE_OUTPUT;
-    }
+    GPIO_LEVEL default_level = GPIO_LEVEL_LOW;
+    
+    if (args[ARG_value].u_int != GPIO_LEVEL_UNSET)
+        default_level = args[ARG_value].u_int;
 
-    // configure pull
-    if (args[ARG_pull].u_obj != mp_const_none)
-        gpioObj.defaultLevel = mp_obj_get_int(args[ARG_pull].u_obj);
+    if (args[ARG_pull].u_int != GPIO_LEVEL_UNSET)
+        default_level = args[ARG_pull].u_int;
 
-    gpioObj.pin = self->id;
-    GPIO_Init(gpioObj);
+    pin_init(self->id, args[ARG_mode].u_int & GPIO_MODE_INPUT, default_level);
 }
 
 mp_obj_t mp_pin_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
@@ -270,6 +268,7 @@ void mp_hal_pin_input(mp_hal_pin_obj_t pin_id) {
 void mp_hal_pin_output(mp_hal_pin_obj_t pin_id) {
     const machine_pin_obj_t *self = &machine_pin_obj[pin_id];
     GPIO_ChangeMode(self->id, GPIO_MODE_OUTPUT);
+
 }
 
 int mp_hal_pin_read(mp_hal_pin_obj_t pin_id) {

From 75113943d513130766367c389cfce625ec520bc5 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Tue, 26 Nov 2019 22:08:10 +0100
Subject: [PATCH 3359/3533] Add ST7735 display driver

---
 ports/gprs_a9/Makefile            |   3 +-
 ports/gprs_a9/font_petme128_8x8.h | 128 +++++++
 ports/gprs_a9/modst7735.c         | 592 ++++++++++++++++++++++++++++++
 ports/gprs_a9/modst7735.h         |  22 ++
 ports/gprs_a9/mpconfigport.h      |   2 +
 5 files changed, 746 insertions(+), 1 deletion(-)
 create mode 100644 ports/gprs_a9/font_petme128_8x8.h
 create mode 100644 ports/gprs_a9/modst7735.c
 create mode 100644 ports/gprs_a9/modst7735.h

diff --git a/ports/gprs_a9/Makefile b/ports/gprs_a9/Makefile
index 519833e402eab..86e4af8f037d5 100644
--- a/ports/gprs_a9/Makefile
+++ b/ports/gprs_a9/Makefile
@@ -140,7 +140,8 @@ SRC_C = \
 	modcellular.c \
 	modgps.c \
 	modusocket.c \
-	modi2c.c
+	modi2c.c \
+	modst7735.c
 
 
 LIB_SRC_C = $(addprefix lib/,\
diff --git a/ports/gprs_a9/font_petme128_8x8.h b/ports/gprs_a9/font_petme128_8x8.h
new file mode 100644
index 0000000000000..9a6bf606d6b00
--- /dev/null
+++ b/ports/gprs_a9/font_petme128_8x8.h
@@ -0,0 +1,128 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013, 2014 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+#ifndef MICROPY_INCLUDED_STM32_FONT_PETME128_8X8_H
+#define MICROPY_INCLUDED_STM32_FONT_PETME128_8X8_H
+
+static const char font_petme128_8x8[] = {
+    0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, // 32= 
+    0x00,0x00,0x00,0x4f,0x4f,0x00,0x00,0x00, // 33=!
+    0x00,0x07,0x07,0x00,0x00,0x07,0x07,0x00, // 34="
+    0x14,0x7f,0x7f,0x14,0x14,0x7f,0x7f,0x14, // 35=#
+    0x00,0x24,0x2e,0x6b,0x6b,0x3a,0x12,0x00, // 36=$
+    0x00,0x63,0x33,0x18,0x0c,0x66,0x63,0x00, // 37=%
+    0x00,0x32,0x7f,0x4d,0x4d,0x77,0x72,0x50, // 38=&
+    0x00,0x00,0x00,0x04,0x06,0x03,0x01,0x00, // 39='
+    0x00,0x00,0x1c,0x3e,0x63,0x41,0x00,0x00, // 40=(
+    0x00,0x00,0x41,0x63,0x3e,0x1c,0x00,0x00, // 41=)
+    0x08,0x2a,0x3e,0x1c,0x1c,0x3e,0x2a,0x08, // 42=*
+    0x00,0x08,0x08,0x3e,0x3e,0x08,0x08,0x00, // 43=+
+    0x00,0x00,0x80,0xe0,0x60,0x00,0x00,0x00, // 44=,
+    0x00,0x08,0x08,0x08,0x08,0x08,0x08,0x00, // 45=-
+    0x00,0x00,0x00,0x60,0x60,0x00,0x00,0x00, // 46=.
+    0x00,0x40,0x60,0x30,0x18,0x0c,0x06,0x02, // 47=/
+    0x00,0x3e,0x7f,0x49,0x45,0x7f,0x3e,0x00, // 48=0
+    0x00,0x40,0x44,0x7f,0x7f,0x40,0x40,0x00, // 49=1
+    0x00,0x62,0x73,0x51,0x49,0x4f,0x46,0x00, // 50=2
+    0x00,0x22,0x63,0x49,0x49,0x7f,0x36,0x00, // 51=3
+    0x00,0x18,0x18,0x14,0x16,0x7f,0x7f,0x10, // 52=4
+    0x00,0x27,0x67,0x45,0x45,0x7d,0x39,0x00, // 53=5
+    0x00,0x3e,0x7f,0x49,0x49,0x7b,0x32,0x00, // 54=6
+    0x00,0x03,0x03,0x79,0x7d,0x07,0x03,0x00, // 55=7
+    0x00,0x36,0x7f,0x49,0x49,0x7f,0x36,0x00, // 56=8
+    0x00,0x26,0x6f,0x49,0x49,0x7f,0x3e,0x00, // 57=9
+    0x00,0x00,0x00,0x24,0x24,0x00,0x00,0x00, // 58=:
+    0x00,0x00,0x80,0xe4,0x64,0x00,0x00,0x00, // 59=;
+    0x00,0x08,0x1c,0x36,0x63,0x41,0x41,0x00, // 60=<
+    0x00,0x14,0x14,0x14,0x14,0x14,0x14,0x00, // 61==
+    0x00,0x41,0x41,0x63,0x36,0x1c,0x08,0x00, // 62=>
+    0x00,0x02,0x03,0x51,0x59,0x0f,0x06,0x00, // 63=?
+    0x00,0x3e,0x7f,0x41,0x4d,0x4f,0x2e,0x00, // 64=@
+    0x00,0x7c,0x7e,0x0b,0x0b,0x7e,0x7c,0x00, // 65=A
+    0x00,0x7f,0x7f,0x49,0x49,0x7f,0x36,0x00, // 66=B
+    0x00,0x3e,0x7f,0x41,0x41,0x63,0x22,0x00, // 67=C
+    0x00,0x7f,0x7f,0x41,0x63,0x3e,0x1c,0x00, // 68=D
+    0x00,0x7f,0x7f,0x49,0x49,0x41,0x41,0x00, // 69=E
+    0x00,0x7f,0x7f,0x09,0x09,0x01,0x01,0x00, // 70=F
+    0x00,0x3e,0x7f,0x41,0x49,0x7b,0x3a,0x00, // 71=G
+    0x00,0x7f,0x7f,0x08,0x08,0x7f,0x7f,0x00, // 72=H
+    0x00,0x00,0x41,0x7f,0x7f,0x41,0x00,0x00, // 73=I
+    0x00,0x20,0x60,0x41,0x7f,0x3f,0x01,0x00, // 74=J
+    0x00,0x7f,0x7f,0x1c,0x36,0x63,0x41,0x00, // 75=K
+    0x00,0x7f,0x7f,0x40,0x40,0x40,0x40,0x00, // 76=L
+    0x00,0x7f,0x7f,0x06,0x0c,0x06,0x7f,0x7f, // 77=M
+    0x00,0x7f,0x7f,0x0e,0x1c,0x7f,0x7f,0x00, // 78=N
+    0x00,0x3e,0x7f,0x41,0x41,0x7f,0x3e,0x00, // 79=O
+    0x00,0x7f,0x7f,0x09,0x09,0x0f,0x06,0x00, // 80=P
+    0x00,0x1e,0x3f,0x21,0x61,0x7f,0x5e,0x00, // 81=Q
+    0x00,0x7f,0x7f,0x19,0x39,0x6f,0x46,0x00, // 82=R
+    0x00,0x26,0x6f,0x49,0x49,0x7b,0x32,0x00, // 83=S
+    0x00,0x01,0x01,0x7f,0x7f,0x01,0x01,0x00, // 84=T
+    0x00,0x3f,0x7f,0x40,0x40,0x7f,0x3f,0x00, // 85=U
+    0x00,0x1f,0x3f,0x60,0x60,0x3f,0x1f,0x00, // 86=V
+    0x00,0x7f,0x7f,0x30,0x18,0x30,0x7f,0x7f, // 87=W
+    0x00,0x63,0x77,0x1c,0x1c,0x77,0x63,0x00, // 88=X
+    0x00,0x07,0x0f,0x78,0x78,0x0f,0x07,0x00, // 89=Y
+    0x00,0x61,0x71,0x59,0x4d,0x47,0x43,0x00, // 90=Z
+    0x00,0x00,0x7f,0x7f,0x41,0x41,0x00,0x00, // 91=[
+    0x00,0x02,0x06,0x0c,0x18,0x30,0x60,0x40, // 92='\'
+    0x00,0x00,0x41,0x41,0x7f,0x7f,0x00,0x00, // 93=]
+    0x00,0x08,0x0c,0x06,0x06,0x0c,0x08,0x00, // 94=^
+    0xc0,0xc0,0xc0,0xc0,0xc0,0xc0,0xc0,0xc0, // 95=_
+    0x00,0x00,0x01,0x03,0x06,0x04,0x00,0x00, // 96=`
+    0x00,0x20,0x74,0x54,0x54,0x7c,0x78,0x00, // 97=a
+    0x00,0x7f,0x7f,0x44,0x44,0x7c,0x38,0x00, // 98=b
+    0x00,0x38,0x7c,0x44,0x44,0x6c,0x28,0x00, // 99=c
+    0x00,0x38,0x7c,0x44,0x44,0x7f,0x7f,0x00, // 100=d
+    0x00,0x38,0x7c,0x54,0x54,0x5c,0x58,0x00, // 101=e
+    0x00,0x08,0x7e,0x7f,0x09,0x03,0x02,0x00, // 102=f
+    0x00,0x98,0xbc,0xa4,0xa4,0xfc,0x7c,0x00, // 103=g
+    0x00,0x7f,0x7f,0x04,0x04,0x7c,0x78,0x00, // 104=h
+    0x00,0x00,0x00,0x7d,0x7d,0x00,0x00,0x00, // 105=i
+    0x00,0x40,0xc0,0x80,0x80,0xfd,0x7d,0x00, // 106=j
+    0x00,0x7f,0x7f,0x30,0x38,0x6c,0x44,0x00, // 107=k
+    0x00,0x00,0x41,0x7f,0x7f,0x40,0x00,0x00, // 108=l
+    0x00,0x7c,0x7c,0x18,0x30,0x18,0x7c,0x7c, // 109=m
+    0x00,0x7c,0x7c,0x04,0x04,0x7c,0x78,0x00, // 110=n
+    0x00,0x38,0x7c,0x44,0x44,0x7c,0x38,0x00, // 111=o
+    0x00,0xfc,0xfc,0x24,0x24,0x3c,0x18,0x00, // 112=p
+    0x00,0x18,0x3c,0x24,0x24,0xfc,0xfc,0x00, // 113=q
+    0x00,0x7c,0x7c,0x04,0x04,0x0c,0x08,0x00, // 114=r
+    0x00,0x48,0x5c,0x54,0x54,0x74,0x20,0x00, // 115=s
+    0x04,0x04,0x3f,0x7f,0x44,0x64,0x20,0x00, // 116=t
+    0x00,0x3c,0x7c,0x40,0x40,0x7c,0x3c,0x00, // 117=u
+    0x00,0x1c,0x3c,0x60,0x60,0x3c,0x1c,0x00, // 118=v
+    0x00,0x1c,0x7c,0x30,0x18,0x30,0x7c,0x1c, // 119=w
+    0x00,0x44,0x6c,0x38,0x38,0x6c,0x44,0x00, // 120=x
+    0x00,0x9c,0xbc,0xa0,0xa0,0xfc,0x7c,0x00, // 121=y
+    0x00,0x44,0x64,0x74,0x5c,0x4c,0x44,0x00, // 122=z
+    0x00,0x08,0x08,0x3e,0x77,0x41,0x41,0x00, // 123={
+    0x00,0x00,0x00,0xff,0xff,0x00,0x00,0x00, // 124=|
+    0x00,0x41,0x41,0x77,0x3e,0x08,0x08,0x00, // 125=}
+    0x00,0x02,0x03,0x01,0x03,0x02,0x03,0x01, // 126=~
+    0xaa,0x55,0xaa,0x55,0xaa,0x55,0xaa,0x55, // 127
+};
+
+#endif // MICROPY_INCLUDED_STM32_FONT_PETME128_8X8_H
diff --git a/ports/gprs_a9/modst7735.c b/ports/gprs_a9/modst7735.c
new file mode 100644
index 0000000000000..bcc8d95fe61ea
--- /dev/null
+++ b/ports/gprs_a9/modst7735.c
@@ -0,0 +1,592 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * Development of the code in this file was sponsored by Microbric Pty Ltd
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2019 pulkin
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "modst7735.h"
+#include "font_petme128_8x8.h"
+
+#include "extmod/machine_spi.h"
+#include "extmod/modframebuf.h"
+
+#include "py/obj.h"
+#include "py/runtime.h"
+
+#define PIXEL_BUF_SMALL_SIZE 16
+
+typedef struct _st7735_display_obj_t {
+    mp_obj_base_t base;
+    mp_soft_spi_obj_t spi;
+    mp_hal_pin_obj_t dc;
+    mp_hal_pin_obj_t reset;
+    mp_hal_pin_obj_t cs;
+    uint16_t width;
+    uint16_t height;
+    uint16_t offset_x;
+    uint16_t offset_y;
+} st7735_display_obj_t;
+
+extern void mp_hal_pin_write(mp_hal_pin_obj_t pin_id, int value);
+extern mp_hal_pin_obj_t mp_hal_get_pin_obj(mp_obj_t pin_in);
+extern void mp_hal_delay_us_fast(uint32_t us);
+
+void _seq_reset(st7735_display_obj_t *self) {
+    mp_hal_pin_write(self->dc, GPIO_LEVEL_LOW);
+    mp_hal_pin_write(self->reset, GPIO_LEVEL_HIGH);
+    mp_hal_delay_us_fast(500);
+    mp_hal_pin_write(self->reset, GPIO_LEVEL_LOW);
+    mp_hal_delay_us_fast(500);
+    mp_hal_pin_write(self->reset, GPIO_LEVEL_HIGH);
+    mp_hal_delay_us_fast(500);
+}
+
+void _seq_comm(st7735_display_obj_t *self, uint8_t cmd) {
+    mp_hal_pin_write(self->dc, GPIO_LEVEL_LOW);
+    mp_hal_pin_write(self->cs, GPIO_LEVEL_LOW);
+    mp_soft_spi_transfer(&self->spi, 1, &cmd, NULL);
+    mp_hal_pin_write(self->cs, GPIO_LEVEL_HIGH);
+}
+
+void _seq_data_start(st7735_display_obj_t *self) {
+    mp_hal_pin_write(self->dc, GPIO_LEVEL_HIGH);
+    mp_hal_pin_write(self->cs, GPIO_LEVEL_LOW);
+}
+
+void _seq_data_continue(st7735_display_obj_t *self, uint8_t *data, uint32_t data_len) {
+    mp_soft_spi_transfer(&self->spi, data_len, data, NULL);
+}
+
+void _seq_data_end(st7735_display_obj_t *self) {
+    mp_hal_pin_write(self->cs, GPIO_LEVEL_HIGH);
+}
+
+void _seq_data(st7735_display_obj_t *self, uint8_t *data, uint32_t data_len) {
+    _seq_data_start(self);
+    _seq_data_continue(self, data, data_len);
+    _seq_data_end(self);
+}
+
+void _seq_call(st7735_display_obj_t *self, uint8_t cmd, uint8_t *data, uint32_t data_len, uint32_t delay) {
+    _seq_comm(self, cmd);
+    if (data != NULL)
+        _seq_data(self, data, data_len);
+    mp_hal_delay_us_fast(delay);
+}
+
+void _seq_madctl(st7735_display_obj_t *self, uint8_t rotation, uint8_t rgb) {
+    uint8_t arg;
+    if (rgb) arg = 0x00; else arg = 0x08;
+    switch (rotation) {
+        case 0:
+            arg = arg | 0;
+            break;
+        case 1:
+            arg = arg | 0x60;
+            break;
+        case 2:
+            arg = arg | 0xC0;
+            break;
+        case 3:
+            arg = arg | 0xA0;
+            break;
+    }
+    _seq_call(self, MADCTL, &arg, 1, 0);
+}
+
+void _seq_window(st7735_display_obj_t *self, uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1) {
+
+    uint8_t d[4];
+    x0 += self->offset_x * 0x0101;
+    y0 += self->offset_y * 0x0101;
+    x1 += self->offset_x * 0x0101;
+    y1 += self->offset_y * 0x0101;
+    d[0] = (x0 >> 8) & 0xFF; d[1] = x0 & 0xFF; d[2] = (x1 >> 8) & 0xFF; d[3] = x1 & 0xFF;
+    _seq_call(self, CASET, (uint8_t*) d, 4, 0);
+    d[0] = (y0 >> 8) & 0xFF; d[1] = y0 & 0xFF; d[2] = (y1 >> 8) & 0xFF; d[3] = y1 & 0xFF;
+    _seq_call(self, RASET, (uint8_t*) d, 4, 0);
+}
+
+void _seq_ppix(st7735_display_obj_t *self, uint16_t x, uint16_t y, uint16_t rgb) {
+    _seq_window(self, x, y, x, y);
+    _seq_call(self, RAMWR, (uint8_t*) &rgb, 2, 0);
+}
+
+uint8_t box_overlap(st7735_display_obj_t *self, mp_int_t *x, mp_int_t *y, mp_int_t *w, mp_int_t *h) {
+    mp_int_t x1 = *x;
+    mp_int_t y1 = *y;
+    mp_int_t x2 = *x + *w;
+    mp_int_t y2 = *y + *h;
+
+    mp_int_t t = MAX(x1, x2);
+    x1 = MIN(x1, x2);
+    x2 = t;
+
+    t = MAX(y1, y2);
+    y1 = MIN(y1, y2);
+    y2 = t;
+    
+    uint8_t result = 0;
+
+    if (x1>=0 && x1 < self->width) result += 1;
+    if (y1>=0 && y1 < self->height) result += 2;
+    if (x2>=0 && x2 < self->width) result += 4;
+    if (y2>=0 && y2 < self->height) result += 8;
+
+    x1 = MAX(x1, 0);
+    x2 = MIN(x2, self->width);
+
+    y1 = MAX(y1, 0);
+    y2 = MIN(y2, self->height);
+
+    *x = x1;
+    *y = y1;
+    *w = x2 - x1;
+    *h = y2 - y1;
+
+    if (*w < 0 || *h < 0) {
+        *w = 0;
+        *h = 0;
+    }
+
+    return result;
+}
+
+mp_obj_t modst7735_display_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
+    // ========================================
+    // ST7735 display class.
+    // Args:
+    //    spi (SPI)
+    //    dc (int)
+    //    reset (int)
+    //    cs (int)
+    //    width (int)
+    //    height (int)
+    // ========================================
+
+    enum { ARG_spi, ARG_dc, ARG_reset, ARG_cs, ARG_width, ARG_height, ARG_offset_x, ARG_offset_y };
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_spi,   MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
+        { MP_QSTR_dc,    MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
+        { MP_QSTR_reset, MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
+        { MP_QSTR_cs,    MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
+        { MP_QSTR_width, MP_ARG_INT, {.u_int = 128} },
+        { MP_QSTR_height, MP_ARG_INT, {.u_int = 128} },
+        { MP_QSTR_offset_x, MP_ARG_INT, {.u_int = 2} },
+        { MP_QSTR_offset_y, MP_ARG_INT, {.u_int = 1} },
+    };
+
+    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
+    mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
+
+    if (!mp_obj_is_type(args[ARG_spi].u_obj, &mp_machine_soft_spi_type)) {
+        mp_raise_ValueError("Soft SPI expected");
+        return mp_const_none;
+    }
+    mp_machine_soft_spi_obj_t *spi_obj = MP_OBJ_TO_PTR(args[ARG_spi].u_obj);
+
+    st7735_display_obj_t *self = m_new_obj(st7735_display_obj_t);
+    self->base.type = type;
+    
+    self->spi = spi_obj->spi;
+    self->dc = mp_hal_get_pin_obj(args[ARG_dc].u_obj);
+    self->reset = mp_hal_get_pin_obj(args[ARG_reset].u_obj);
+    self->cs = mp_hal_get_pin_obj(args[ARG_cs].u_obj);
+    self->width = args[ARG_width].u_int;
+    self->height = args[ARG_height].u_int;
+    self->offset_x = args[ARG_offset_x].u_int;
+    self->offset_y = args[ARG_offset_y].u_int;
+    return MP_OBJ_FROM_PTR(self);
+}
+
+static void modst7735_display_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+    // ========================================
+    // display.__str__()
+    // ========================================
+    st7735_display_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    mp_printf(print, "display(%d, %d, %d, %d, %d)",
+        self->spi.sck, self->spi.mosi, self->dc, self->reset, self->cs
+    );
+}
+
+STATIC mp_obj_t modst7735_display_mode(mp_obj_t self_in, mp_obj_t rotation_in, mp_obj_t rgb_in) {
+    // ========================================
+    // Display mode.
+    // Args:
+    //     rotation (int)
+    //     rgb (int)
+    // ========================================
+    st7735_display_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    mp_int_t rotation = mp_obj_get_int(rotation_in);
+    mp_int_t rgb = mp_obj_get_int(rgb_in);
+    _seq_madctl(self, rotation, rgb);
+    return mp_const_none;
+}
+
+MP_DEFINE_CONST_FUN_OBJ_3(modst7735_display_mode_obj, &modst7735_display_mode);
+
+STATIC mp_obj_t modst7735_display_init(mp_obj_t self_in) {
+    // ========================================
+    // Initialize the display.
+    // ========================================
+
+    st7735_display_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    uint8_t d[16];
+
+    //???
+    mp_hal_pin_write(self->spi.sck, GPIO_LEVEL_LOW);
+    mp_hal_pin_write(self->cs, GPIO_LEVEL_HIGH);
+
+    _seq_reset(self);
+    
+    _seq_call(self, SWRESET, NULL, 0, 150);  // Software reset.
+    _seq_call(self, SLPOUT, NULL, 0, 500);  // Out of sleep mode.
+
+    d[0] = 0x01; d[1] = 0x2C; d[2] = 0x2D;
+    _seq_call(self, FRMCTR1, d, 3, 0);  // Frame rate control.
+    _seq_call(self, FRMCTR2, d, 3, 0);  // Frame rate control.
+
+    d[3] = 0x01; d[4] = 0x2C; d[5] = 0x2D;
+    _seq_call(self, FRMCTR3, d, 6, 10);  // Frame rate control.
+
+    d[0] = 0x07;
+    _seq_call(self, INVCTR, d, 1, 0);  // Display inversion control
+
+    d[0] = 0xA2; d[1] = 0x02; d[2] = 0x84;
+    _seq_call(self, PWCTR1, d, 3, 0);  // Power control
+
+    d[0] = 0xC5;
+    _seq_call(self, PWCTR2, d, 1, 0);  // Power control
+
+    d[0] = 0x0A; d[1] = 0x00;
+    _seq_call(self, PWCTR3, d, 2, 0);  // Power control
+
+    d[0] = 0x8A; d[1] = 0x2A;
+    _seq_call(self, PWCTR4, d, 2, 0);  // Power control
+
+    d[0] = 0x8A; d[1] = 0xEE;
+    _seq_call(self, PWCTR5, d, 2, 0);  // Power control
+
+    d[0] = 0x0E;
+    _seq_call(self, VMCTR1, d, 1, 0);  // Power control
+
+    _seq_comm(self, INVOFF);
+
+    _seq_madctl(self, 0, 0);
+
+    d[0] = 0x05;
+    _seq_call(self, COLMOD, d, 1, 0);
+
+    _seq_window(self, 0, 0, self->width - 1, self->height - 1);
+
+    d[0] = 0x0F; d[1] = 0x1A; d[2] = 0x0F; d[3] = 0x18;
+    d[4] = 0x2F; d[5] = 0x28; d[6] = 0x20; d[7] = 0x22;
+    d[8] = 0x1F; d[9] = 0x1B; d[10] = 0x23; d[11] = 0x37;
+    d[12] = 0x00; d[13] = 0x07; d[14] = 0x02; d[15] = 0x10;
+    _seq_call(self, GMCTRP1, d, 16, 0);
+
+    d[0] = 0x0F; d[1] = 0x1B; d[2] = 0x0F; d[3] = 0x17;
+    d[4] = 0x33; d[5] = 0x2C; d[6] = 0x29; d[7] = 0x2E;
+    d[8] = 0x30; d[9] = 0x30; d[10] = 0x39; d[11] = 0x3F;
+    d[12] = 0x00; d[13] = 0x07; d[14] = 0x03; d[15] = 0x10;
+    _seq_call(self, GMCTRN1, d, 16, 10);
+
+    _seq_call(self, DISPON, NULL, 0, 100);
+
+    _seq_call(self, NORON, NULL, 0, 10); // Normal display on.
+
+    mp_hal_pin_write(self->cs, 1);
+
+    d[0] = 0x08;
+    _seq_call(self, MADCTL, d, 1, 0);
+
+    return mp_const_none;
+}
+
+MP_DEFINE_CONST_FUN_OBJ_1(modst7735_display_init_obj, &modst7735_display_init);
+
+STATIC mp_obj_t modst7735_display_blit(size_t n_args, const mp_obj_t *args) {
+    // ========================================
+    // Display framebuffer.
+    // Args:
+    //     data (FrameBuffer): a proper FrameBuffer in 565 format;
+    // ========================================
+    (void) n_args;
+
+    st7735_display_obj_t *self = MP_OBJ_TO_PTR(args[0]);
+    if (!mp_obj_is_type(args[1], &mp_type_framebuf)) {
+        mp_raise_ValueError("FrameBuffer expected");
+        return mp_const_none;
+    }
+    mp_obj_framebuf_t *fb = MP_OBJ_TO_PTR(args[1]);
+    mp_int_t x = mp_obj_get_int(args[2]);
+    mp_int_t y = mp_obj_get_int(args[3]);
+
+    if (x < 0 || x + fb->width > self->width || y < 0 || y + fb->height > self->height) {
+        mp_raise_ValueError("Framebuffer is outside of the display");
+        return mp_const_none;
+    }
+
+    if (fb->format != FRAMEBUF_RGB565) {
+        mp_raise_ValueError("RGB565 framebuffer expected");
+        return mp_const_none;
+    }
+
+    _seq_window(self, x, y, x + fb->width - 1, y + fb->height - 1);
+    _seq_comm(self, RAMWR);
+
+    uint16_t buf[PIXEL_BUF_SMALL_SIZE];
+    uint16_t* fbuf = (uint16_t*) fb->buf;
+
+    _seq_data_start(self);
+    for (int i=0; i<fb->width*fb->height; i+=PIXEL_BUF_SMALL_SIZE) {
+        for (int j=0; j<MIN(PIXEL_BUF_SMALL_SIZE, fb->width*fb->height-i); j++)
+            buf[j] = (fbuf[i+j] >> 8) | (fbuf[i+j] << 8);
+        _seq_data_continue(self, (uint8_t*) buf, 2*MIN(PIXEL_BUF_SMALL_SIZE, fb->width*fb->height-i));
+    }
+
+    _seq_data_end(self);
+    
+    return mp_const_none;
+}
+
+MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(modst7735_display_blit_obj, 4, 4, &modst7735_display_blit);
+
+STATIC mp_obj_t modst7735_display_fill_rect(size_t n_args, const mp_obj_t *args) {
+    // ========================================
+    // Uniform rectangle fill.
+    // Args:
+    //    x (int)
+    //    y (int)
+    //    width (int)
+    //    height (int)
+    //    color (int)
+    // ========================================
+    (void) n_args;
+
+    st7735_display_obj_t *self = MP_OBJ_TO_PTR(args[0]);
+    mp_int_t x = mp_obj_get_int(args[1]);
+    mp_int_t y = mp_obj_get_int(args[2]);
+    mp_int_t width = mp_obj_get_int(args[3]);
+    mp_int_t height = mp_obj_get_int(args[4]);
+    mp_int_t col = mp_obj_get_int(args[5]) & 0xFFFF;
+
+    box_overlap(self, &x, &y, &width, &height);
+
+    if (width == 0 || height == 0) return mp_const_none;
+
+    _seq_window(self, (uint16_t) x, (uint16_t) y, (uint16_t) x + width - 1, (uint16_t) y + height - 1);
+    _seq_comm(self, RAMWR);
+
+    uint16_t buf[PIXEL_BUF_SMALL_SIZE];
+    for (int i=0; i<PIXEL_BUF_SMALL_SIZE; i++)
+        buf[i] = (col >> 8) | (col << 8);
+
+    _seq_data_start(self);
+    for (int i=0; i<width*height; i+=PIXEL_BUF_SMALL_SIZE) {
+        _seq_data_continue(self, (uint8_t*) buf, 2*MIN(PIXEL_BUF_SMALL_SIZE, width*height-i));
+    }
+
+    _seq_data_end(self);
+
+    return mp_const_none;
+}
+
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(modst7735_display_fill_rect_obj, 6, 6, modst7735_display_fill_rect);
+
+STATIC mp_obj_t modst7735_display_rect(size_t n_args, const mp_obj_t *args) {
+    // ========================================
+    // Draw rectangle.
+    // Args:
+    //    x (int)
+    //    y (int)
+    //    width (int)
+    //    height (int)
+    //    color (int)
+    // ========================================
+    (void) n_args;
+
+    st7735_display_obj_t *self = MP_OBJ_TO_PTR(args[0]);
+    mp_int_t x = mp_obj_get_int(args[1]);
+    mp_int_t y = mp_obj_get_int(args[2]);
+    mp_int_t width = mp_obj_get_int(args[3]);
+    mp_int_t height = mp_obj_get_int(args[4]);
+    mp_int_t col = mp_obj_get_int(args[5]) & 0xFFFF;
+
+    uint8_t lines = box_overlap(self, &x, &y, &width, &height);
+
+    if (width == 0 || height == 0) return mp_const_none;
+
+    uint16_t buf[MAX(width, height)];
+    for (int i=0; i<sizeof(buf) / sizeof(uint16_t); i++)
+        buf[i] = (col >> 8) | (col << 8);
+
+    if (lines & 2) {
+        _seq_window(self, (uint16_t) x, (uint16_t) y, (uint16_t) x + width - 1, (uint16_t) y);
+        _seq_call(self, RAMWR, (uint8_t*) buf, 2 * width, 0);
+    }
+    if (lines & 8) {
+        _seq_window(self, (uint16_t) x, (uint16_t) y + height - 1, (uint16_t) x + width - 1, (uint16_t) y + height - 1);
+        _seq_call(self, RAMWR, (uint8_t*) buf, 2 * width, 0);
+    }
+    if (lines & 1) {
+        _seq_window(self, (uint16_t) x, (uint16_t) y, (uint16_t) x, (uint16_t) y + height - 1);
+        _seq_call(self, RAMWR, (uint8_t*) buf, 2 * height, 0);
+    }
+    if (lines & 4) {
+        _seq_window(self, (uint16_t) x + width - 1, (uint16_t) y, (uint16_t) x + width - 1, (uint16_t) y + height - 1);
+        _seq_call(self, RAMWR, (uint8_t*) buf, 2 * height, 0);
+    }
+
+    return mp_const_none;
+}
+
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(modst7735_display_rect_obj, 6, 6, modst7735_display_rect);
+
+STATIC mp_obj_t modst7735_display_fill(mp_obj_t self_in, mp_obj_t color_in) {
+    // ========================================
+    // Uniform fill.
+    // Args:
+    //     color (int)
+    // ========================================
+    st7735_display_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    mp_int_t col = mp_obj_get_int(color_in) & 0xFFFF;
+
+    _seq_window(self, 0, 0, self->width-1, self->height-1);
+    _seq_comm(self, RAMWR);
+
+    uint16_t buf[PIXEL_BUF_SMALL_SIZE];
+    for (int i=0; i<PIXEL_BUF_SMALL_SIZE; i++)
+        buf[i] = (col >> 8) | (col << 8);
+
+    _seq_data_start(self);
+    for (int i=0; i<self->width*self->height; i+=PIXEL_BUF_SMALL_SIZE) {
+        _seq_data_continue(self, (uint8_t*) buf, 2*MIN(PIXEL_BUF_SMALL_SIZE, self->width*self->height-i));
+    }
+    _seq_data_end(self);
+
+    return mp_const_none;
+}
+
+MP_DEFINE_CONST_FUN_OBJ_2(modst7735_display_fill_obj, &modst7735_display_fill);
+
+STATIC mp_obj_t modst7735_display_pixel(size_t n_args, const mp_obj_t *args) {
+    // ========================================
+    // Draw rectangle.
+    // Args:
+    //    x (int)
+    //    y (int)
+    //    color (int)
+    // ========================================
+    (void) n_args;
+
+    st7735_display_obj_t *self = MP_OBJ_TO_PTR(args[0]);
+    mp_int_t x = mp_obj_get_int(args[1]);
+    mp_int_t y = mp_obj_get_int(args[2]);
+    mp_int_t col = mp_obj_get_int(args[3]) & 0xFFFF;
+
+    if (x >= 0 && y >= 0 && x < self->width && y < self->height) {
+        col = (col >> 8) | (col << 8);
+        _seq_ppix(self, x, y, col);
+    }
+
+    return mp_const_none;
+}
+
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(modst7735_display_pixel_obj, 4, 4, modst7735_display_pixel);
+
+STATIC mp_obj_t modst7735_display_text(size_t n_args, const mp_obj_t *args) {
+    // extract arguments
+    st7735_display_obj_t *self = MP_OBJ_TO_PTR(args[0]);
+    const char *str = mp_obj_str_get_str(args[1]);
+    mp_int_t x0 = mp_obj_get_int(args[2]);
+    mp_int_t y0 = mp_obj_get_int(args[3]);
+    mp_int_t col = 0xFFFF;
+    if (n_args >= 5) {
+        col = mp_obj_get_int(args[4]);
+    }
+    col = col & 0xFFFF;
+
+    // loop over chars
+    for (; *str; ++str) {
+        // get char and make sure its in range of font
+        int chr = *(uint8_t*)str;
+        if (chr < 32 || chr > 127) {
+            chr = 127;
+        }
+        // get char data
+        const uint8_t *chr_data = &font_petme128_8x8[(chr - 32) * 8];
+        // loop over char data
+        for (int j = 0; j < 8; j++, x0++) {
+            if (0 <= x0 && x0 < self->width) { // clip x
+                uint vline_data = chr_data[j]; // each byte is a column of 8 pixels, LSB at top
+                for (int y = y0; vline_data; vline_data >>= 1, y++) { // scan over vertical column
+                    if (vline_data & 1) { // only draw if pixel set
+                        if (0 <= y && y < self->height) { // clip y
+                            _seq_ppix(self, x0, y, col);
+                        }
+                    }
+                }
+            }
+        }
+    }
+    return mp_const_none;
+}
+
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(modst7735_display_text_obj, 4, 5, modst7735_display_text);
+
+STATIC const mp_rom_map_elem_t modst7735_display_locals_dict_table[] = {
+    { MP_ROM_QSTR(MP_QSTR_mode), MP_ROM_PTR(&modst7735_display_mode_obj) },
+    { MP_ROM_QSTR(MP_QSTR_init), MP_ROM_PTR(&modst7735_display_init_obj) },
+    { MP_ROM_QSTR(MP_QSTR_rect), MP_ROM_PTR(&modst7735_display_rect_obj) },
+    { MP_ROM_QSTR(MP_QSTR_fill_rect), MP_ROM_PTR(&modst7735_display_fill_rect_obj) },
+    { MP_ROM_QSTR(MP_QSTR_fill), MP_ROM_PTR(&modst7735_display_fill_obj) },
+    { MP_ROM_QSTR(MP_QSTR_blit), MP_ROM_PTR(&modst7735_display_blit_obj) },
+    { MP_ROM_QSTR(MP_QSTR_pixel), MP_ROM_PTR(&modst7735_display_pixel_obj) },
+    { MP_ROM_QSTR(MP_QSTR_text), MP_ROM_PTR(&modst7735_display_text_obj) },
+};
+
+STATIC MP_DEFINE_CONST_DICT(modst7735_display_locals_dict, modst7735_display_locals_dict_table);
+
+STATIC const mp_obj_type_t modst7735_display_type = {
+    { &mp_type_type },
+    .name=MP_QSTR_Display,
+    .make_new=modst7735_display_make_new,
+    .print=modst7735_display_print,
+    .locals_dict=(mp_obj_dict_t*) &modst7735_display_locals_dict,
+};
+
+STATIC const mp_map_elem_t mp_modst7735_globals_table[] = {
+    { MP_OBJ_NEW_QSTR(MP_QSTR___name__), MP_OBJ_NEW_QSTR(MP_QSTR_st7735) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_Display), (mp_obj_t)MP_ROM_PTR(&modst7735_display_type) },
+};
+
+STATIC MP_DEFINE_CONST_DICT(mp_modst7735_globals, mp_modst7735_globals_table);
+
+const mp_obj_module_t st7735_module = {
+    .base = { &mp_type_module },
+    .globals = (mp_obj_dict_t*) &mp_modst7735_globals,
+};
+
diff --git a/ports/gprs_a9/modst7735.h b/ports/gprs_a9/modst7735.h
new file mode 100644
index 0000000000000..7ea8a756d1c48
--- /dev/null
+++ b/ports/gprs_a9/modst7735.h
@@ -0,0 +1,22 @@
+#define SWRESET 0x01
+#define SLPOUT  0x11
+#define NORON  0x13
+#define INVOFF 0x20
+#define DISPON 0x29
+#define CASET 0x2A
+#define RASET 0x2B
+#define RAMWR 0x2C
+#define MADCTL 0x36
+#define COLMOD 0x3A
+#define FRMCTR1 0xB1
+#define FRMCTR2 0xB2
+#define FRMCTR3 0xB3
+#define INVCTR 0xB4
+#define PWCTR1 0xC0
+#define PWCTR2 0xC1
+#define PWCTR3 0xC2
+#define PWCTR4 0xC3
+#define PWCTR5 0xC4
+#define VMCTR1 0xC5
+#define GMCTRP1 0xE0
+#define GMCTRN1 0xE1
diff --git a/ports/gprs_a9/mpconfigport.h b/ports/gprs_a9/mpconfigport.h
index b9ece5b67314a..5c310fc2fd21f 100644
--- a/ports/gprs_a9/mpconfigport.h
+++ b/ports/gprs_a9/mpconfigport.h
@@ -204,6 +204,7 @@ extern const struct _mp_obj_module_t cellular_module;
 extern const struct _mp_obj_module_t gps_module;
 extern const struct _mp_obj_module_t usocket_module;
 extern const struct _mp_obj_module_t i2c_module;
+extern const struct _mp_obj_module_t st7735_module;
 
 #define MICROPY_PORT_BUILTIN_MODULES \
     { MP_OBJ_NEW_QSTR(MP_QSTR_machine), (mp_obj_t)&mp_module_machine }, \
@@ -214,6 +215,7 @@ extern const struct _mp_obj_module_t i2c_module;
     { MP_OBJ_NEW_QSTR(MP_QSTR_gps), (mp_obj_t)&gps_module }, \
     { MP_OBJ_NEW_QSTR(MP_QSTR_usocket), (mp_obj_t)&usocket_module }, \
     { MP_OBJ_NEW_QSTR(MP_QSTR_i2c), (mp_obj_t)&i2c_module }, \
+    { MP_OBJ_NEW_QSTR(MP_QSTR_st7735), (mp_obj_t)&st7735_module }, \
 
 #define MICROPY_PORT_BUILTIN_MODULE_WEAK_LINKS \
     { MP_OBJ_NEW_QSTR(MP_QSTR_binascii), (mp_obj_t)&mp_module_ubinascii }, \

From 7b78c69b27a48f2a4873885ad81f79643b6f5b5b Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Tue, 26 Nov 2019 22:18:25 +0100
Subject: [PATCH 3360/3533] Add ST7735 display docs

---
 ports/gprs_a9/README.md | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/ports/gprs_a9/README.md b/ports/gprs_a9/README.md
index 83a34229bfed4..255db3cfe0e43 100644
--- a/ports/gprs_a9/README.md
+++ b/ports/gprs_a9/README.md
@@ -85,6 +85,7 @@ ampy --port /dev/ttyUSB1 put frozentest.py
 4. [`gps`](#gps): everything related to GPS and assisted positioning
 5. [`machine`](#machine): hardware and power control
 6. [`i2c`](#i2c): i2c implementation
+7. [`st7735`](#ST7735): ST7735 over software SPI display implementation
 8. [Notes](#Notes)
 
 ### `cellular`
@@ -215,6 +216,15 @@ Provides i2c functionality
 * `mem_receive(id: int, slave_address: int, memory_address: int, memory_size: int, data_length: int, timeout: int = I2C_DEFAULT_TIME_OUT)` (bytes): reads memory data;
 * `mem_transmit(id: int, slave_address: int, memory_address: int, memory_size: int, data: bytes, timeout: int = I2C_DEFAULT_TIME_OUT)` writes data to memory;
 
+### `st7735`
+
+ST7735 displays over software SPI.
+
+* `Display(spi: SPI, dc: Pin, reset: Pin, cs: Pin, width: int, height: int)`: a [framebuffer](https://docs.micropython.org/en/latest/library/framebuf.html) class for displays.
+  In addition to drawing routines (the 565 color format is used), implements this:
+  * `init()`: runs display initialization;
+  * `mode(rotation: int, rgb_bgr: bool)`: sets the display rotation and color order;
+
 ## Notes ##
 
 * The module halts on fatal errors; create an empty file `.reboot_on_fatal` if a reboot is desired

From 125e95a8e62c62d06a8dcfb9012f992fe5d0acc2 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Wed, 27 Nov 2019 22:05:34 +0100
Subject: [PATCH 3361/3533] Add agps providers

---
 ports/gprs_a9/py/agps.py | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 ports/gprs_a9/py/agps.py

diff --git a/ports/gprs_a9/py/agps.py b/ports/gprs_a9/py/agps.py
new file mode 100644
index 0000000000000..0ebeb720f0795
--- /dev/null
+++ b/ports/gprs_a9/py/agps.py
@@ -0,0 +1,33 @@
+import urequests
+import cellular
+
+def get_location_radiocells():
+    s = cellular.stations()
+    c = dict(cellTowers=list(dict(cellId=cell_id, locationAreaCode=lac, mobileCountryCode=mcc, mobileNetworkCode=mnc) for mcc, mnc, lac, cell_id, bsic, rx_full, rx_sub, arfcn in s))
+    r = urequests.post('https://backend.radiocells.org/', json=c)
+    json = r.json()
+    if "location" in json:
+        return json["location"]["lat"], json["location"]["lng"]
+
+def get_location_opencellid(api_key):
+    s = cellular.stations()
+    by_op = {}
+    best = None
+    best_count = 0
+    for mcc, mnc, lac, cell_id, bsic, rx_full, rx_sub, arfcn in s:
+        grp = mcc, mnc
+        if grp not in by_op:
+            by_op[grp] = []
+        by_op[grp].append(dict(cid=cell_id, lac=lac))
+        count = len(by_op[grp])
+        if best is None or count > best_count:
+            best_count = count
+            best = grp
+
+    {"token": "abb242767701a2", "radio": "gsm", "mcc": 204, "mnc": 80, "cells": [{"cid": 45160, "lac": 4471}]}
+    c = dict(token=api_key, radio="gsm", mcc=best[0], mnc=best[1], cells=by_op[best])
+    r = urequests.post('https://eu1.unwiredlabs.com/v2/process.php', json=c)
+    json = r.json()
+    if "status" in json and json["status"] == "ok":
+        return json["lat"], json["lon"]
+

From 8c8b008eaa8f21520d654d474183ef53558d92a2 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Wed, 27 Nov 2019 22:13:30 +0100
Subject: [PATCH 3362/3533] Add agps to README

---
 ports/gprs_a9/README.md | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/ports/gprs_a9/README.md b/ports/gprs_a9/README.md
index 255db3cfe0e43..3297e12488bc8 100644
--- a/ports/gprs_a9/README.md
+++ b/ports/gprs_a9/README.md
@@ -86,7 +86,8 @@ ampy --port /dev/ttyUSB1 put frozentest.py
 5. [`machine`](#machine): hardware and power control
 6. [`i2c`](#i2c): i2c implementation
 7. [`st7735`](#ST7735): ST7735 over software SPI display implementation
-8. [Notes](#Notes)
+8. [misc modules](#Misc)
+9. [Notes](#Notes)
 
 ### `cellular`
 
@@ -225,6 +226,14 @@ ST7735 displays over software SPI.
   * `init()`: runs display initialization;
   * `mode(rotation: int, rgb_bgr: bool)`: sets the display rotation and color order;
 
+## Misc ##
+
+Modules located in the `py` folder.
+
+* `agps`: Assisted GPS services.
+  * `get_location_radiocells()`: uses [radiocells.org](https://radiocells.org/)
+  * `get_location_opencellid(api_key: str)`: uses [opencellid.org](http://opencellid.org) (registration required)
+
 ## Notes ##
 
 * The module halts on fatal errors; create an empty file `.reboot_on_fatal` if a reboot is desired

From b5dd329726a47f94a5f5d71057d8ace01a6be8c0 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Fri, 29 Nov 2019 23:46:18 +0100
Subject: [PATCH 3363/3533] Closes #4

---
 ports/gprs_a9/Makefile      |   3 +-
 ports/gprs_a9/README.md     |   2 +-
 ports/gprs_a9/machine_adc.c | 111 ++++++++++++++++++++++++++++++++++++
 ports/gprs_a9/modmachine.c  |   1 +
 ports/gprs_a9/modmachine.h  |   1 +
 5 files changed, 116 insertions(+), 2 deletions(-)
 create mode 100644 ports/gprs_a9/machine_adc.c

diff --git a/ports/gprs_a9/Makefile b/ports/gprs_a9/Makefile
index 86e4af8f037d5..981c1f2c61e8a 100644
--- a/ports/gprs_a9/Makefile
+++ b/ports/gprs_a9/Makefile
@@ -141,7 +141,8 @@ SRC_C = \
 	modgps.c \
 	modusocket.c \
 	modi2c.c \
-	modst7735.c
+	modst7735.c \
+	machine_adc.c
 
 
 LIB_SRC_C = $(addprefix lib/,\
diff --git a/ports/gprs_a9/README.md b/ports/gprs_a9/README.md
index 3297e12488bc8..e91351fec5516 100644
--- a/ports/gprs_a9/README.md
+++ b/ports/gprs_a9/README.md
@@ -63,7 +63,7 @@ ampy --port /dev/ttyUSB1 put frozentest.py
 ## Functionality
 
 - [x] GPIO: `machine.Pin`
-- [ ] ADC: `machine.ADC`
+- [x] ADC: `machine.ADC`
 - [ ] PWM: `machine.PWM`
 - [ ] UART: `machine.UART` (software UART?)
 - [x] Cellular misc (IMEI, ICCID, ...): `cellular`
diff --git a/ports/gprs_a9/machine_adc.c b/ports/gprs_a9/machine_adc.c
new file mode 100644
index 0000000000000..6ce0d3248d23b
--- /dev/null
+++ b/ports/gprs_a9/machine_adc.c
@@ -0,0 +1,111 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * Development of the code in this file was sponsored by Microbric Pty Ltd
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2019 pulkin
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "py/runtime.h"
+#include "py/mphal.h"
+
+#include "api_hal_adc.h"
+
+typedef struct _machine_adc_obj_t {
+    mp_obj_base_t base;
+    ADC_Channel_t channel;
+} machine_adc_obj_t;
+
+extern const mp_obj_type_t machine_adc_type;
+
+STATIC machine_adc_obj_t machine_adc_0 = {{&machine_adc_type}, ADC_CHANNEL_0};
+STATIC machine_adc_obj_t machine_adc_1 = {{&machine_adc_type}, ADC_CHANNEL_1};
+
+void machine_adc_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+    machine_adc_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    mp_printf(print, "ADC(%d)", self->channel);
+}
+
+mp_obj_t machine_adc_make_new(const mp_obj_type_t *type_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
+    mp_arg_check_num(n_args, n_kw, 1, 2, false);
+
+    mp_int_t chn = mp_obj_get_int(args[0]);
+
+    machine_adc_obj_t *result;
+    switch (chn) {
+        case 0:
+            result = &machine_adc_0;
+            break;
+        case 1:
+            result = &machine_adc_1;
+            break;
+        default:
+            nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError, "ADC(%d) doesn't exist", chn));
+    }
+
+    mp_int_t sampling_period = ADC_SAMPLE_PERIOD_100MS;
+    if (n_args == 2) {
+        sampling_period = mp_obj_get_int(args[1]);
+    }
+
+    ADC_Config_t config = {result->channel, sampling_period};
+    ADC_Init(config);
+
+    return result;
+}
+
+STATIC mp_obj_t machine_adc___del__(mp_obj_t self_in) {
+    machine_adc_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    ADC_Close(self->channel);
+    return mp_const_none;
+}
+
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_adc___del___obj, machine_adc___del__);
+
+STATIC mp_obj_t machine_adc_read(mp_obj_t self_in) {
+    machine_adc_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    uint16_t value, value_mV;
+    if (!ADC_Read(self->channel, &value, &value_mV)) {
+        mp_raise_msg(&mp_type_RuntimeError, "Failed to read ADC");
+        return mp_const_none;
+    }
+    return MP_OBJ_NEW_SMALL_INT(value);
+}
+
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_adc_read_obj, machine_adc_read);
+
+STATIC const mp_rom_map_elem_t machine_adc_locals_dict_table[] = {
+    { MP_ROM_QSTR(MP_QSTR___del__), MP_ROM_PTR(&machine_adc___del___obj) },
+    { MP_ROM_QSTR(MP_QSTR_read), MP_ROM_PTR(&machine_adc_read_obj) },
+};
+
+STATIC MP_DEFINE_CONST_DICT(machine_adc_locals_dict, machine_adc_locals_dict_table);
+
+const mp_obj_type_t machine_adc_type = {
+    { &mp_type_type },
+    .name = MP_QSTR_ADC,
+    .print = machine_adc_print,
+    .make_new = machine_adc_make_new,
+    .locals_dict = (mp_obj_dict_t*)&machine_adc_locals_dict,
+};
+
diff --git a/ports/gprs_a9/modmachine.c b/ports/gprs_a9/modmachine.c
index 5535bbc553c1a..b29fd24c945c2 100644
--- a/ports/gprs_a9/modmachine.c
+++ b/ports/gprs_a9/modmachine.c
@@ -196,6 +196,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_0(modmachine_watchdog_reset_obj, modmachine_watch
 STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_umachine) },
     { MP_ROM_QSTR(MP_QSTR_Pin), MP_ROM_PTR(&machine_pin_type) },
+    { MP_ROM_QSTR(MP_QSTR_ADC), MP_ROM_PTR(&machine_adc_type) },
     { MP_OBJ_NEW_QSTR(MP_QSTR_reset), (mp_obj_t)&modmachine_reset_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_set_idle), (mp_obj_t)&modmachine_set_idle_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_set_min_freq), (mp_obj_t)&modmachine_set_min_freq_obj },
diff --git a/ports/gprs_a9/modmachine.h b/ports/gprs_a9/modmachine.h
index b74f8b4d34b78..0389c0485003c 100644
--- a/ports/gprs_a9/modmachine.h
+++ b/ports/gprs_a9/modmachine.h
@@ -33,6 +33,7 @@
 #include "api_event.h"
 
 extern const mp_obj_type_t machine_pin_type;
+extern const mp_obj_type_t machine_adc_type;
 extern Power_On_Cause_t powerOnCause;
 
 void modmachine_notify_power_on(API_Event_t* event);

From 83dc80c1fa3fae24697b6862314b8c430675a560 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Fri, 29 Nov 2019 23:59:02 +0100
Subject: [PATCH 3364/3533] Add module pinout to README

[skip ci]
---
 ports/gprs_a9/README.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ports/gprs_a9/README.md b/ports/gprs_a9/README.md
index e91351fec5516..46f2999348400 100644
--- a/ports/gprs_a9/README.md
+++ b/ports/gprs_a9/README.md
@@ -4,6 +4,9 @@ Your support is important for this port: please consider donating.
 
 [![Build Status](https://travis-ci.org/pulkin/micropython.svg?branch=master)](https://travis-ci.org/pulkin/micropython)
 [![Build Status](https://dev.azure.com/gpulkin/micropython/_apis/build/status/pulkin.micropython?branchName=master)](https://dev.azure.com/gpulkin/micropython/_build/latest?definitionId=1&branchName=master)
+## The module
+
+![A9G](https://raw.githubusercontent.com/Ai-Thinker-Open/GPRS_C_SDK/master/doc/assets/pudding_pin.png)
 
 ## Build
 

From 370cd1b60556c1fc94576f8a46e23d8c3e1db89a Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sat, 30 Nov 2019 00:09:11 +0100
Subject: [PATCH 3365/3533] Add poll period constants

---
 ports/gprs_a9/modmachine.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/ports/gprs_a9/modmachine.c b/ports/gprs_a9/modmachine.c
index b29fd24c945c2..1a09522c32c42 100644
--- a/ports/gprs_a9/modmachine.c
+++ b/ports/gprs_a9/modmachine.c
@@ -38,6 +38,7 @@
 #include "api_event.h"
 #include "api_hal_pm.h"
 #include "api_hal_watchdog.h"
+#include "api_hal_adc.h"
 
 // ------
 // Notify
@@ -235,6 +236,16 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_PM_SYS_FREQ_208M),         MP_ROM_INT(PM_SYS_FREQ_208M) },
     { MP_ROM_QSTR(MP_QSTR_PM_SYS_FREQ_250M),         MP_ROM_INT(PM_SYS_FREQ_250M) },
     { MP_ROM_QSTR(MP_QSTR_PM_SYS_FREQ_312M),         MP_ROM_INT(PM_SYS_FREQ_312M) },
+
+    // ADC poll period
+    { MP_ROM_QSTR(MP_QSTR_ADC_SAMPLE_PERIOD_122US),  MP_ROM_INT(ADC_SAMPLE_PERIOD_122US) },
+    { MP_ROM_QSTR(MP_QSTR_ADC_SAMPLE_PERIOD_1MS),    MP_ROM_INT(ADC_SAMPLE_PERIOD_1MS) },
+    { MP_ROM_QSTR(MP_QSTR_ADC_SAMPLE_PERIOD_10MS),   MP_ROM_INT(ADC_SAMPLE_PERIOD_10MS) },
+    { MP_ROM_QSTR(MP_QSTR_ADC_SAMPLE_PERIOD_100MS),  MP_ROM_INT(ADC_SAMPLE_PERIOD_100MS) },
+    { MP_ROM_QSTR(MP_QSTR_ADC_SAMPLE_PERIOD_250MS),  MP_ROM_INT(ADC_SAMPLE_PERIOD_250MS) },
+    { MP_ROM_QSTR(MP_QSTR_ADC_SAMPLE_PERIOD_500MS),  MP_ROM_INT(ADC_SAMPLE_PERIOD_500MS) },
+    { MP_ROM_QSTR(MP_QSTR_ADC_SAMPLE_PERIOD_1S),     MP_ROM_INT(ADC_SAMPLE_PERIOD_1S) },
+    { MP_ROM_QSTR(MP_QSTR_ADC_SAMPLE_PERIOD_2S),     MP_ROM_INT(ADC_SAMPLE_PERIOD_2S) },
 };
 
 STATIC MP_DEFINE_CONST_DICT(machine_module_globals, machine_module_globals_table);

From 6d02705aa21d4a640b8ac30aa6246fb2c6d14ee4 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Wed, 4 Dec 2019 00:17:04 +0100
Subject: [PATCH 3366/3533] Port dialing

---
 ports/gprs_a9/README.md     |  3 ++-
 ports/gprs_a9/modcellular.c | 30 ++++++++++++++++++++++++++++++
 2 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/ports/gprs_a9/README.md b/ports/gprs_a9/README.md
index 46f2999348400..f797ea51cf0c0 100644
--- a/ports/gprs_a9/README.md
+++ b/ports/gprs_a9/README.md
@@ -77,7 +77,7 @@ ampy --port /dev/ttyUSB1 put frozentest.py
 - [x] File system
 - [x] GPRS, DNS: `cellular`, `socket`, `ssl`
 - [x] Power: `machine`
-- [ ] Calls: `cellular`
+- [x] Calls: `cellular`
 - [x] SMS: `cellular.SMS`
 
 ## API
@@ -131,6 +131,7 @@ The purpose of this module is to have an access to high-level networking (SMS, G
 * `reset()`: resets network settings to defaults. Disconnects GPRS;
 * `gprs([apn: {str, bool}[, user: str, pass: str]])` (bool): activate (3 arguments), deactivate (`gprs(False)`) or obtain the status of GPRS (on/off) if no arguments supplied;
 * `call()` (list[str], [str, None]): calls missed (1st output) and the incoming call number or `None` if no incoming calls at the moment (2nd output);
+* `dial(tn: {str, bool})`: dial a telephone number if string is supplied or hang up a call if `False`;
 
 ### `usocket` ###
 
diff --git a/ports/gprs_a9/modcellular.c b/ports/gprs_a9/modcellular.c
index ca6c8e7b351ce..c3acb7df02ba4 100644
--- a/ports/gprs_a9/modcellular.c
+++ b/ports/gprs_a9/modcellular.c
@@ -39,6 +39,7 @@
 #include "api_info.h"
 #include "api_sim.h"
 #include "api_sms.h"
+#include "api_call.h"
 #include "api_os.h"
 #include "api_network.h"
 #include "api_inc_network.h"
@@ -1087,6 +1088,34 @@ STATIC mp_obj_t modcellular_call(void) {
 
 STATIC MP_DEFINE_CONST_FUN_OBJ_0(modcellular_call_obj, modcellular_call);
 
+STATIC mp_obj_t modcellular_dial(mp_obj_t tn_in) {
+    // ========================================
+    // Dial a number.
+    // Args:
+    //     tn (str, bool): the telephone number
+    //     or False if hangup requested;
+    // ========================================
+    if (mp_obj_is_str(tn_in)) {
+        const char* tn = mp_obj_str_get_str(tn_in);
+        mp_printf(&mp_plat_print, "calling %s\n", tn);
+        if (!CALL_Dial(tn)) {
+            mp_raise_CellularError("Failed to initiate an outgoing call");
+        }
+        return mp_const_none;
+    } else {
+        if (!mp_obj_is_true(tn_in)) {
+            if (!CALL_HangUp()) {
+                mp_raise_CellularError("Failed to hangup call");
+            }
+        } else {
+            mp_raise_ValueError("The argument must be a string or False");
+        }
+        return mp_const_none;
+    }
+}
+
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(modcellular_dial_obj, modcellular_dial);
+
 STATIC mp_obj_t modcellular_stations(void) {
     // ========================================
     // Polls base stations.
@@ -1150,6 +1179,7 @@ STATIC const mp_map_elem_t mp_module_cellular_globals_table[] = {
     { MP_OBJ_NEW_QSTR(MP_QSTR_scan), (mp_obj_t)&modcellular_scan_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_register), (mp_obj_t)&modcellular_register_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_call), (mp_obj_t)&modcellular_call_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_dial), (mp_obj_t)&modcellular_dial_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_stations), (mp_obj_t)&modcellular_stations_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_reset), (mp_obj_t)&modcellular_reset_obj },
 

From 02405acc84217fdfa6e8e4b917276ada6b8e9046 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Thu, 5 Dec 2019 22:59:48 +0100
Subject: [PATCH 3367/3533] Remove access token

---
 ports/gprs_a9/py/agps.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ports/gprs_a9/py/agps.py b/ports/gprs_a9/py/agps.py
index 0ebeb720f0795..91ad0b705bb6a 100644
--- a/ports/gprs_a9/py/agps.py
+++ b/ports/gprs_a9/py/agps.py
@@ -24,7 +24,6 @@ def get_location_opencellid(api_key):
             best_count = count
             best = grp
 
-    {"token": "abb242767701a2", "radio": "gsm", "mcc": 204, "mnc": 80, "cells": [{"cid": 45160, "lac": 4471}]}
     c = dict(token=api_key, radio="gsm", mcc=best[0], mnc=best[1], cells=by_op[best])
     r = urequests.post('https://eu1.unwiredlabs.com/v2/process.php', json=c)
     json = r.json()

From 00e3083a7dcd1dbd6efb2ea5c0b5bed838fccc03 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sun, 8 Dec 2019 21:07:16 +0100
Subject: [PATCH 3368/3533] Fix not being able to receive SMS right after the
 module starts

---
 ports/gprs_a9/modcellular.c | 42 ++++++++++++++++++-------------------
 1 file changed, 20 insertions(+), 22 deletions(-)

diff --git a/ports/gprs_a9/modcellular.c b/ports/gprs_a9/modcellular.c
index c3acb7df02ba4..9270561431c41 100644
--- a/ports/gprs_a9/modcellular.c
+++ b/ports/gprs_a9/modcellular.c
@@ -158,6 +158,26 @@ void modcellular_init0(void) {
 
     // Turn off flight mode
     Network_SetFlightMode(0);
+
+    // Set SMS storage
+    if (!SMS_SetFormat(SMS_FORMAT_TEXT, SIM0)) {
+        mp_raise_CellularError("Failed to set SMS format");
+    } 
+
+    SMS_Parameter_t smsParam = {
+        .fo = 17 , // stadard values
+        .vp = 167,
+        .pid= 0  ,
+        .dcs= 8  , // 0:English 7bit, 4:English 8 bit, 8:Unicode 2 Bytes
+    };
+
+    if (!SMS_SetParameter(&smsParam, SIM0)) {
+        mp_raise_CellularError("Failed to set SMS parameters");
+    }
+
+    if (!SMS_SetNewMessageStorage(SMS_STORAGE_SIM_CARD)) {
+        mp_raise_CellularError("Failed to set SMS storage in the SIM card");
+    }
 }
 
 // ----------
@@ -413,28 +433,6 @@ STATIC mp_obj_t modcellular_sms_send(mp_obj_t self_in) {
     const char* destination_c = mp_obj_str_get_str(self->phone_number);
     const char* message_c = mp_obj_str_get_str(self->message);
 
-    if (!SMS_SetFormat(SMS_FORMAT_TEXT, SIM0)) {
-        mp_raise_CellularError("Failed to set SMS format");
-        return mp_const_none;
-    } 
-
-    SMS_Parameter_t smsParam = {
-        .fo = 17 , // stadard values
-        .vp = 167,
-        .pid= 0  ,
-        .dcs= 8  , // 0:English 7bit, 4:English 8 bit, 8:Unicode 2 Bytes
-    };
-
-    if (!SMS_SetParameter(&smsParam, SIM0)) {
-        mp_raise_CellularError("Failed to set SMS parameters");
-        return mp_const_none;
-    }
-
-    if (!SMS_SetNewMessageStorage(SMS_STORAGE_SIM_CARD)) {
-        mp_raise_CellularError("Failed to set SMS storage in the SIM card");
-        return mp_const_none;
-    }
-
     uint8_t* unicode = NULL;
     uint32_t unicodeLen;
 

From 7aa42b6b6b3148781894188f956787c8cd27c4cf Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sat, 14 Dec 2019 20:44:24 +0100
Subject: [PATCH 3369/3533] Cleanup ptr cast warning

---
 ports/gprs_a9/main.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/ports/gprs_a9/main.c b/ports/gprs_a9/main.c
index 12436f37775e8..6a27da01e7fbd 100644
--- a/ports/gprs_a9/main.c
+++ b/ports/gprs_a9/main.c
@@ -68,7 +68,7 @@
 #define MICROPYTHON_HEAP_MAX_SIZE (1024 * 2048)
 #define MICROPYTHON_HEAP_MIN_SIZE (2048)
 
-STATIC char* heap;
+STATIC void* heap;
 
 HANDLE mainTaskHandle  = NULL;
 HANDLE microPyTaskHandle = NULL;
@@ -107,7 +107,7 @@ void do_str(const char *src, mp_parse_input_kind_t input_kind) {
 }
 #endif
 
-static char *stack_top;
+STATIC void *stack_top;
 
 void gc_collect(void) {
     //ESP8266-style
@@ -123,20 +123,20 @@ void NORETURN nlr_jump_fail(void *val) {
 }
 
 #if MICROPY_ENABLE_GC
-char* mp_allocate_heap(uint32_t* size) {
+void* mp_allocate_heap(uint32_t* size) {
     uint32_t h_size = MICROPYTHON_HEAP_MAX_SIZE;
-    uint8_t* heap = NULL;
-    while (!heap) {
+    void* ptr = NULL;
+    while (!ptr) {
         if (h_size < MICROPYTHON_HEAP_MIN_SIZE) {
             mp_fatal_error(MP_FATAL_REASON_HEAP_INIT, NULL);
         }
-        heap = OS_Malloc(h_size);
-        if (!heap) {
+        ptr = OS_Malloc(h_size);
+        if (!ptr) {
             h_size = h_size >> 1;
         }
     }
     size[0] = h_size;
-    return (char*)heap;
+    return ptr;
 }
 #endif
 
@@ -165,8 +165,8 @@ void MicroPyTask(void *pData) {
 
 soft_reset:
     mp_stack_ctrl_init();
-    stack_top = info.stackTop + info.stackSize * 4;
-    mp_stack_set_top((void *)stack_top);
+    stack_top = (void*) info.stackTop + info.stackSize * 4;
+    mp_stack_set_top((void *) stack_top);
     mp_stack_set_limit(MICROPYTHON_TASK_STACK_SIZE * 4 - 1024);
 #if MICROPY_ENABLE_GC
     uint32_t heap_size;

From 1c2bbd0bed853e72182fa9fc89420c4c8ce8d6cf Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sat, 14 Dec 2019 20:46:50 +0100
Subject: [PATCH 3370/3533] Fix missing header

---
 ports/gprs_a9/fatal.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/gprs_a9/fatal.c b/ports/gprs_a9/fatal.c
index 9dc72d1005c90..4ac7fc89a782e 100644
--- a/ports/gprs_a9/fatal.c
+++ b/ports/gprs_a9/fatal.c
@@ -33,6 +33,7 @@
 #include "api_fs.h"
 #include "api_hal_pm.h"
 #include "api_hal_uart.h"
+#include "assert.h"
 
 #include "mpconfigport.h"
 #include "fatal.h"

From bf2e785fdd9dbb992bb96cff046ca4a5a1494403 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sat, 14 Dec 2019 20:49:20 +0100
Subject: [PATCH 3371/3533] Fix another missing import

---
 ports/gprs_a9/mphalport.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ports/gprs_a9/mphalport.c b/ports/gprs_a9/mphalport.c
index ff5b6d1fbd1e3..db6ff55baa23e 100644
--- a/ports/gprs_a9/mphalport.c
+++ b/ports/gprs_a9/mphalport.c
@@ -38,6 +38,8 @@
 #include "buffer.h"
 #include "time.h"
 
+#include "py/runtime.h"
+
 bool UartInit()
 {
     UART_Config_t config = {

From c5bc5a3087637b065d47229d52a26c7bd0b531ab Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sat, 14 Dec 2019 20:54:12 +0100
Subject: [PATCH 3372/3533] Rename UartInit -> mp_hal_pyrepl_uart_init

---
 ports/gprs_a9/main.c      | 2 +-
 ports/gprs_a9/mphalport.c | 8 ++------
 ports/gprs_a9/mphalport.h | 2 +-
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/ports/gprs_a9/main.c b/ports/gprs_a9/main.c
index 6a27da01e7fbd..74b65290ac1f3 100644
--- a/ports/gprs_a9/main.c
+++ b/ports/gprs_a9/main.c
@@ -161,7 +161,7 @@ void MicroPyTask(void *pData) {
     OS_GetTaskInfo(microPyTaskHandle, &info);
     MicroPy_Event_t* event;
     Buffer_Init(&fifoBuffer, fifoBufferData, sizeof(fifoBufferData));
-    UartInit();
+    mp_hal_pyrepl_uart_init();
 
 soft_reset:
     mp_stack_ctrl_init();
diff --git a/ports/gprs_a9/mphalport.c b/ports/gprs_a9/mphalport.c
index db6ff55baa23e..1345572513aa0 100644
--- a/ports/gprs_a9/mphalport.c
+++ b/ports/gprs_a9/mphalport.c
@@ -40,8 +40,7 @@
 
 #include "py/runtime.h"
 
-bool UartInit()
-{
+void mp_hal_pyrepl_uart_init() {
     UART_Config_t config = {
         .baudRate = UART_BAUD_RATE_115200,
         .dataBits = UART_DATA_BITS_8,
@@ -50,12 +49,9 @@ bool UartInit()
         .rxCallback = NULL,
         .useEvent = true,
     };
-    UART_Init(UART1,config);
-    return true;
+    UART_Init(UART1, config);
 }
 
-
-
 // Send string of given length
 void mp_hal_stdout_tx_strn(const char *str, mp_uint_t len) {
     UART_Write(UART1,(uint8_t*)str,len);
diff --git a/ports/gprs_a9/mphalport.h b/ports/gprs_a9/mphalport.h
index f3d575fb86f3a..a5460167fc803 100644
--- a/ports/gprs_a9/mphalport.h
+++ b/ports/gprs_a9/mphalport.h
@@ -39,8 +39,8 @@
 #define mp_hal_pin_obj_t uint32_t
 
 void mp_hal_set_interrupt_char(int c);
+void mp_hal_pyrepl_uart_init();
 
-bool UartInit();
 uint32_t mp_hal_ticks_ms(void);
 uint32_t mp_hal_ticks_us(void);
 void mp_hal_delay_ms(uint32_t ms);

From 3b0b4c10ef14b9541ad7383ea54aa4324949f22f Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sat, 14 Dec 2019 20:55:54 +0100
Subject: [PATCH 3373/3533] Remove unused variable

---
 ports/gprs_a9/file_io.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ports/gprs_a9/file_io.c b/ports/gprs_a9/file_io.c
index 7967314087258..9fa781472f231 100644
--- a/ports/gprs_a9/file_io.c
+++ b/ports/gprs_a9/file_io.c
@@ -315,7 +315,6 @@ mp_lexer_t *mp_lexer_new_from_file(const char *filename) {
 }
 
 mp_import_stat_t mp_import_stat(const char *path) {
-    uint8_t flag = 0;
     char* path0 = (char*)malloc(160);
     memset(path0,0,160);
     API_FS_RealPath(path,path0);

From cdcc6608bd899bb78ce8cdae2c38e38951593fe3 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sat, 14 Dec 2019 21:00:06 +0100
Subject: [PATCH 3374/3533] Define mp_raise_CellularError before using it

---
 ports/gprs_a9/modcellular.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ports/gprs_a9/modcellular.c b/ports/gprs_a9/modcellular.c
index 9270561431c41..daea94b47d110 100644
--- a/ports/gprs_a9/modcellular.c
+++ b/ports/gprs_a9/modcellular.c
@@ -120,6 +120,8 @@ uint8_t calls_incoming_now_flag = 0;
 STATIC mp_obj_t modcellular_sms_from_record(SMS_Message_Info_t* record);
 STATIC mp_obj_t modcellular_sms_from_raw(uint8_t* header, uint32_t header_length, uint8_t* content, uint32_t content_length);
 
+NORETURN void mp_raise_CellularError(const char *msg);
+
 void modcellular_init0(void) {
     // Reset statuses
     network_status_updated = 0;

From 1ab4e6ded57c75d42ab8e7d0c62da7a30d90b307 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sat, 14 Dec 2019 21:10:10 +0100
Subject: [PATCH 3375/3533] Cleanup build warnings

---
 ports/gprs_a9/modcellular.h | 2 +-
 ports/gprs_a9/modi2c.c      | 4 +++-
 ports/gprs_a9/modst7735.c   | 2 +-
 ports/gprs_a9/modusocket.c  | 4 +++-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/ports/gprs_a9/modcellular.h b/ports/gprs_a9/modcellular.h
index eb95ffaf7a505..38c693dd23722 100644
--- a/ports/gprs_a9/modcellular.h
+++ b/ports/gprs_a9/modcellular.h
@@ -74,4 +74,4 @@ void modcellular_notify_call_hangup(API_Event_t* event);
 
 #define REQUIRES_NETWORK_REGISTRATION do {if (!network_status) {mp_raise_CellularError("Network is not available: is SIM card inserted?"); return mp_const_none;}} while(0)
 #define REQUIRES_VALID_SMS_STATUS(bits) do {if (bitsum(bits) != 1) {return mp_const_none;}} while(0)
-#define WAIT_UNTIL(condition, timeout_ms, step_ms, raise) do {uint32_t __time = mp_hal_ticks_ms(); while (mp_hal_ticks_ms() - __time < (timeout_ms) && !(condition)) mp_hal_delay_ms(step_ms); if (!(condition)) {raise; return mp_const_none; }} while (0)
+#define WAIT_UNTIL(condition, timeout_ms, step_ms, raise) do {uint32_t __time = mp_hal_ticks_ms(); while (mp_hal_ticks_ms() - __time < (timeout_ms) && !(condition)) mp_hal_delay_ms(step_ms); if (!(condition)) {raise;}} while (0)
diff --git a/ports/gprs_a9/modi2c.c b/ports/gprs_a9/modi2c.c
index a6c21c1d74120..a6af059378f3a 100644
--- a/ports/gprs_a9/modi2c.c
+++ b/ports/gprs_a9/modi2c.c
@@ -58,7 +58,7 @@ I2C_ID_t modi2c_private_get_I2C_ID(uint8_t _id) {
     return id;
 }
 
-I2C_FREQ_t modi2c_private_get_I2C_FREQ(uint8_t _frequency) {
+I2C_FREQ_t modi2c_private_get_I2C_FREQ(mp_int_t _frequency) {
     I2C_FREQ_t frequency;
     switch(_frequency) {
         case 400:
@@ -90,6 +90,8 @@ void modi2c_private_throw_I2C_Error(I2C_Error_t error) {
         case I2C_ERROR_COMMUNICATION_FAILED:
             mp_raise_I2CError("Communication failure");
             break;
+        default:
+            break;
     }
 }
 
diff --git a/ports/gprs_a9/modst7735.c b/ports/gprs_a9/modst7735.c
index bcc8d95fe61ea..523de15034046 100644
--- a/ports/gprs_a9/modst7735.c
+++ b/ports/gprs_a9/modst7735.c
@@ -537,7 +537,7 @@ STATIC mp_obj_t modst7735_display_text(size_t n_args, const mp_obj_t *args) {
             chr = 127;
         }
         // get char data
-        const uint8_t *chr_data = &font_petme128_8x8[(chr - 32) * 8];
+        const char* chr_data = &font_petme128_8x8[(chr - 32) * 8];
         // loop over char data
         for (int j = 0; j < 8; j++, x0++) {
             if (0 <= x0 && x0 < self->width) { // clip x
diff --git a/ports/gprs_a9/modusocket.c b/ports/gprs_a9/modusocket.c
index d7c8a39846bbf..4cdd9309640b9 100644
--- a/ports/gprs_a9/modusocket.c
+++ b/ports/gprs_a9/modusocket.c
@@ -686,7 +686,9 @@ STATIC mp_obj_t getaddrinfo(size_t n_args, const mp_obj_t *pos_args, mp_map_t *k
             return mp_const_none;
     }
 
-    int flag = args[ARG_flag].u_int;
+    mp_int_t flag = args[ARG_flag].u_int;
+    (void) flag;
+    // TODO: process flags
 
     struct sockaddr_in res;
     if (_socket_getaddrinfo2(host, port, &res) < 0) {

From ca91075ac809495af160fa63b9f5417076bbefec Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sat, 14 Dec 2019 22:08:46 +0100
Subject: [PATCH 3376/3533] Cleanup build warnings (2)

---
 ports/gprs_a9/mpconfigport.h | 1 +
 ports/gprs_a9/mphalport.h    | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/ports/gprs_a9/mpconfigport.h b/ports/gprs_a9/mpconfigport.h
index 5c310fc2fd21f..5ebb13a621d51 100644
--- a/ports/gprs_a9/mpconfigport.h
+++ b/ports/gprs_a9/mpconfigport.h
@@ -253,6 +253,7 @@ typedef long mp_off_t;
 // We need to provide a declaration/definition of alloca()
 #include <stdlib.h>
 
+#define MICROPY_MPHALPORT_H "mphalport.h"
 #define MICROPY_HW_BOARD_NAME   "A9/A9G module"
 #define MICROPY_HW_MCU_NAME     "RDA8955"
 #define MICROPY_PY_SYS_PLATFORM "gprs_a9"
diff --git a/ports/gprs_a9/mphalport.h b/ports/gprs_a9/mphalport.h
index a5460167fc803..ceebe004c0125 100644
--- a/ports/gprs_a9/mphalport.h
+++ b/ports/gprs_a9/mphalport.h
@@ -45,10 +45,15 @@ uint32_t mp_hal_ticks_ms(void);
 uint32_t mp_hal_ticks_us(void);
 void mp_hal_delay_ms(uint32_t ms);
 void mp_hal_delay_us(uint32_t us);
+void mp_hal_delay_us_fast(uint32_t us);
 __attribute__((always_inline)) static inline uint32_t mp_hal_ticks_cpu(void) {
   return clock();
 }
 
+void mp_hal_pin_input(mp_hal_pin_obj_t pin_id);
+void mp_hal_pin_output(mp_hal_pin_obj_t pin_id);
+int mp_hal_pin_read(mp_hal_pin_obj_t pin_id);
+void mp_hal_pin_write(mp_hal_pin_obj_t pin_id, int value);
 
 #endif
 

From 00eb11398eed1936796f90f79ae07b2aa8c331e9 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sat, 14 Dec 2019 22:46:00 +0100
Subject: [PATCH 3377/3533] Add a 5s delay in tests

---
 ports/gprs_a9/frozentest.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ports/gprs_a9/frozentest.py b/ports/gprs_a9/frozentest.py
index 66eb43f465f16..645c54deaacab 100644
--- a/ports/gprs_a9/frozentest.py
+++ b/ports/gprs_a9/frozentest.py
@@ -315,6 +315,9 @@
     print("GPRS")
     print("----------------")
 
+    print("Waiting 5 secs ...")
+    time.sleep(5)
+
     # LEBARA NL credentials
     assert cel.gprs("internet", "", "")
 

From 0792eb970611df54b2c01c5a2bd40597efba308e Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Tue, 17 Dec 2019 23:19:23 +0100
Subject: [PATCH 3378/3533] Fix issue when not being able to remove directories

---
 ports/gprs_a9/file_io.c | 86 ++++++++++++++++++++++++++---------------
 1 file changed, 55 insertions(+), 31 deletions(-)

diff --git a/ports/gprs_a9/file_io.c b/ports/gprs_a9/file_io.c
index 9fa781472f231..a005f6abd0038 100644
--- a/ports/gprs_a9/file_io.c
+++ b/ports/gprs_a9/file_io.c
@@ -39,9 +39,8 @@
 #include "py/stream.h"
 
 #include "api_fs.h"
-#if !MICROPY_VFS
-
 
+#if !MICROPY_VFS
 
 typedef struct _pyb_file_obj_t {
     mp_obj_base_t base;
@@ -49,26 +48,33 @@ typedef struct _pyb_file_obj_t {
 } pyb_file_obj_t;
 
 STATIC void file_obj_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+    // ========================================
+    // str(f)
+    // ========================================
     (void)kind;
     mp_printf(print, "<io.%s %p>", mp_obj_get_type_str(self_in), MP_OBJ_TO_PTR(self_in));
 }
 
-
 STATIC mp_uint_t file_obj_read(mp_obj_t self_in, void *buf, mp_uint_t size, int *errcode) {
+    // ========================================
+    // f.read()
+    // ========================================
     pyb_file_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    int32_t ret = API_FS_Read(self->fd,buf, size);
-    if(ret < 0)
-    {
+    int32_t ret = API_FS_Read(self->fd, buf, size);
+    if (ret < 0) {
         *errcode = MP_EIO;
         return MP_STREAM_ERROR;
     }
-    return (mp_uint_t)ret;
+    return (mp_uint_t) ret;
 }
+
 STATIC mp_uint_t file_obj_write(mp_obj_t self_in, const void *buf, mp_uint_t size, int *errcode) {
+    // ========================================
+    // f.write(s)
+    // ========================================
     pyb_file_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    int32_t ret = API_FS_Write(self->fd, (uint8_t*)buf, size);
-    if(ret < 0)
-    {
+    int32_t ret = API_FS_Write(self->fd, (uint8_t*) buf, size);
+    if (ret < 0) {
         *errcode = MP_EIO;
         return MP_STREAM_ERROR;
     }
@@ -77,28 +83,30 @@ STATIC mp_uint_t file_obj_write(mp_obj_t self_in, const void *buf, mp_uint_t siz
         *errcode = MP_ENOSPC;
         return MP_STREAM_ERROR;
     }
-    return (mp_uint_t)ret;
+    return (mp_uint_t) ret;
 }
 
 STATIC mp_uint_t file_obj_ioctl(mp_obj_t o_in, mp_uint_t request, uintptr_t arg, int *errcode) {
+    // ========================================
+    // IO stream control: f.seek(), f.flush(), f.close()
+    // ========================================
     pyb_file_obj_t *self = MP_OBJ_TO_PTR(o_in);
-    
 
     if (request == MP_STREAM_SEEK) {
-        struct mp_stream_seek_t *s = (struct mp_stream_seek_t*)(uintptr_t)arg;
+        struct mp_stream_seek_t *s = (struct mp_stream_seek_t*) arg;
         int64_t ret = 0;
 
         switch (s->whence) {
             case 0: // SEEK_SET
-                ret = API_FS_Seek(self->fd,s->offset,FS_SEEK_SET);
+                ret = API_FS_Seek(self->fd, s->offset, FS_SEEK_SET);
                 break;
 
             case 1: // SEEK_CUR
-                ret = API_FS_Seek(self->fd,s->offset,FS_SEEK_CUR);
+                ret = API_FS_Seek(self->fd, s->offset, FS_SEEK_CUR);
                 break;
 
             case 2: // SEEK_END
-                ret = API_FS_Seek(self->fd,s->offset,FS_SEEK_END);
+                ret = API_FS_Seek(self->fd, s->offset, FS_SEEK_END);
                 break;
         }
 
@@ -139,12 +147,15 @@ STATIC const mp_arg_t file_open_args[] = {
     { MP_QSTR_mode, MP_ARG_OBJ, {.u_obj = MP_OBJ_NEW_QSTR(MP_QSTR_r)} },
     { MP_QSTR_encoding, MP_ARG_OBJ | MP_ARG_KW_ONLY, {.u_rom_obj = MP_ROM_PTR(&mp_const_none_obj)} },
 };
+
 #define FILE_OPEN_NUM_ARGS MP_ARRAY_SIZE(file_open_args)
 
 STATIC mp_obj_t file_open(const char* file_name, const mp_obj_type_t *type, mp_arg_val_t *args) {
+    // ========================================
+    // open(...)
+    // ========================================
     const char *mode_s = mp_obj_str_get_str(args[1].u_obj);
     uint32_t mode = 0;
-    // TODO make sure only one of r, w, a, and b, t are specified
     while (*mode_s) {
         switch (*mode_s++) {
             case 'r':
@@ -167,16 +178,18 @@ STATIC mp_obj_t file_open(const char* file_name, const mp_obj_type_t *type, mp_a
                 type = &mp_type_vfs_fat_textio;
                 break;
             #endif
+            default:
+                mp_raise_ValueError("Mode must be one or more of 'rwabt+'");
         }
     }
     pyb_file_obj_t *o = m_new_obj_with_finaliser(pyb_file_obj_t);
     o->base.type = type;
 
-    int32_t fd = API_FS_Open(file_name,mode,0);
-    if(fd <= 0)
+    int32_t fd = API_FS_Open(file_name, mode, 0);
+    if (fd <= 0) {
         mp_raise_OSError(MP_EIO);
+    }
     o->fd = fd;
-    
     return MP_OBJ_FROM_PTR(o);
 }
 
@@ -200,6 +213,7 @@ STATIC const mp_rom_map_elem_t rawfile_locals_dict_table[] = {
     // { MP_ROM_QSTR(MP_QSTR___enter__), MP_ROM_PTR(&mp_identity_obj) },
     // { MP_ROM_QSTR(MP_QSTR___exit__), MP_ROM_PTR(&file_obj___exit___obj) },
 };
+
 STATIC MP_DEFINE_CONST_DICT(rawfile_locals_dict, rawfile_locals_dict_table);
 
 STATIC const mp_stream_p_t fileio_stream_p = {
@@ -239,6 +253,9 @@ const mp_obj_type_t mp_type_vfs_fat_textio = {
 
 // Note: buffering and encoding args are currently ignored
 mp_obj_t mp_builtin_open(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    // ========================================
+    // open(...) wrapper
+    // ========================================
     enum { ARG_file, ARG_mode, ARG_encoding };
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_file, MP_ARG_OBJ | MP_ARG_REQUIRED, {.u_rom_obj = MP_ROM_PTR(&mp_const_none_obj)} },
@@ -251,13 +268,12 @@ mp_obj_t mp_builtin_open(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_a
     mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
     mp_arg_parse_all(n_args, pos_args, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
     const char* fileName = mp_obj_str_get_str(args[ARG_file].u_obj);    
-    const mp_obj_type_t*  type = &mp_type_vfs_fat_textio;
-    return file_open(fileName,type,args);
+    const mp_obj_type_t* type = &mp_type_vfs_fat_textio;
+    return file_open(fileName, type, args);
 }
 
 MP_DEFINE_CONST_FUN_OBJ_KW(mp_builtin_open_obj, 1, mp_builtin_open);
 
-
 typedef struct _mp_reader_vfs_t {
     mp_obj_t file;
     uint16_t len;
@@ -266,6 +282,9 @@ typedef struct _mp_reader_vfs_t {
 } mp_reader_vfs_t;
 
 STATIC mp_uint_t mp_reader_vfs_readbyte(void *data) {
+    // ========================================
+    // Buffered reader.
+    // ========================================
     mp_reader_vfs_t *reader = (mp_reader_vfs_t*)data;
     if (reader->pos >= reader->len) {
         if (reader->len < sizeof(reader->buf)) {
@@ -294,6 +313,9 @@ STATIC void mp_reader_vfs_close(void *data) {
 }
 
 void mp_reader_new_file(mp_reader_t *reader, const char *filename) {
+    // ========================================
+    // open(...) wrapper
+    // ========================================
     mp_reader_vfs_t *rf = m_new_obj(mp_reader_vfs_t);
     mp_obj_t arg = mp_obj_new_str(filename, strlen(filename));
     rf->file = mp_builtin_open(1, &arg, (mp_map_t*)&mp_const_empty_map);
@@ -315,20 +337,22 @@ mp_lexer_t *mp_lexer_new_from_file(const char *filename) {
 }
 
 mp_import_stat_t mp_import_stat(const char *path) {
-    char* path0 = (char*)malloc(160);
-    memset(path0,0,160);
-    API_FS_RealPath(path,path0);
-    int32_t fd = API_FS_Open(path0,FS_O_RDONLY,0);
-    if(fd>0)
-    {
+    // ========================================
+    // Determines file/folder/does not exist.
+    // ========================================
+    char* path0 = (char*) malloc(160);
+    memset(path0, 0, 160);
+    API_FS_RealPath(path, path0);
+    int32_t fd = API_FS_Open(path0, FS_O_RDONLY, 0);
+    if (fd>0) {
         API_FS_Close(fd);
         free(path0);
         return MP_IMPORT_STAT_FILE;
     }
     Dir_t* dir = API_FS_OpenDir(path0);
     free(path0);
-    if(dir != NULL)
-    {
+    if(dir != NULL) {
+        API_FS_CloseDir(dir);
         return MP_IMPORT_STAT_DIR;
     }
     return MP_IMPORT_STAT_NO_EXIST;

From aa04bca473602f5ccd921f584eb7f6d190ad4d82 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Wed, 18 Dec 2019 23:31:35 +0100
Subject: [PATCH 3379/3533] Fixed filesystem bug and annotated functions

---
 ports/gprs_a9/file_io.c     |   5 +-
 ports/gprs_a9/frozentest.py |   3 +-
 ports/gprs_a9/moduos.c      | 147 +++++++++++++++++++++++-------------
 3 files changed, 99 insertions(+), 56 deletions(-)

diff --git a/ports/gprs_a9/file_io.c b/ports/gprs_a9/file_io.c
index a005f6abd0038..b78c79d4169c9 100644
--- a/ports/gprs_a9/file_io.c
+++ b/ports/gprs_a9/file_io.c
@@ -307,7 +307,10 @@ STATIC mp_uint_t mp_reader_vfs_readbyte(void *data) {
 }
 
 STATIC void mp_reader_vfs_close(void *data) {
-    mp_reader_vfs_t *reader = (mp_reader_vfs_t*)data;
+    // ========================================
+    // close() wrapper
+    // ========================================
+    mp_reader_vfs_t *reader = (mp_reader_vfs_t*) data;
     mp_stream_close(reader->file);
     m_del_obj(mp_reader_vfs_t, reader);
 }
diff --git a/ports/gprs_a9/frozentest.py b/ports/gprs_a9/frozentest.py
index 645c54deaacab..419922bfba74f 100644
--- a/ports/gprs_a9/frozentest.py
+++ b/ports/gprs_a9/frozentest.py
@@ -3,8 +3,7 @@
 # test_send_sms = "8800"
 
 # Tests filesystem manipulations
-test_fs = False
-# test_fs = True
+test_fs = True
 
 # Operator name expected
 opname_expected = "KPNNL"
diff --git a/ports/gprs_a9/moduos.c b/ports/gprs_a9/moduos.c
index 665c39b1a15d8..a78df9dd12fbd 100644
--- a/ports/gprs_a9/moduos.c
+++ b/ports/gprs_a9/moduos.c
@@ -7,6 +7,7 @@
  *
  * Copyright (c) 2015 Josef Gajdusek
  * Copyright (c) 2016 Damien P. George
+ * Copyright (c) 2019 pulkin
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -71,11 +72,20 @@ STATIC MP_DEFINE_ATTRTUPLE(
 );
 
 STATIC mp_obj_t os_uname(void) {
+    // ========================================
+    // Platform information.
+    // ========================================
     return (mp_obj_t)&os_uname_info_obj;
 }
+
 STATIC MP_DEFINE_CONST_FUN_OBJ_0(os_uname_obj, os_uname);
 
 STATIC mp_obj_t os_urandom(mp_obj_t num) {
+    // ========================================
+    // Random bytes.
+    // Args:
+    //     num (int): the number of bytes to generate;
+    // ========================================
     mp_int_t n = mp_obj_get_int(num);
     vstr_t vstr;
     vstr_init_len(&vstr, n);
@@ -89,140 +99,165 @@ STATIC mp_obj_t os_urandom(mp_obj_t num) {
     }
     return mp_obj_new_str_from_vstr(&mp_type_bytes, &vstr);
 }
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(os_urandom_obj, os_urandom);
 
-//////////////// fs ////////////////////////////////////////////////////
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(os_urandom_obj, os_urandom);
 
 #if !MICROPY_VFS
 
-
-
 mp_obj_t mp_vfs_listdir(size_t n_args, const mp_obj_t *args) {
+    // ========================================
+    // Lists a folder.
+    // Args:
+    //     name (str): folder to list;
+    // ========================================
     mp_obj_t dir_list = mp_obj_new_list(0, NULL);
-    char* tmp = (char*)malloc(200);
-    if(!tmp)
+    char* tmp = (char*) malloc(200);
+    if (!tmp)
         mp_raise_OSError(MP_ENOMEM);
-    memset(tmp,0,200);
-    uint32_t ret =API_FS_GetCurDir(200,tmp);
-    if(ret != 0)
-    {
+    memset(tmp, 0, 200);
+    uint32_t ret = API_FS_GetCurDir(200, tmp);
+    if (ret != 0) {
         free(tmp);
         mp_raise_OSError(MP_EIO);
     }
     char* dirToList = "/";
-    if(n_args != 0 )
+    if (n_args != 0)
         dirToList = (char*)mp_obj_str_get_str(args[0]);
     else
-    {
         dirToList = tmp;
-    }
-    Dir_t* dir = API_FS_OpenDir((const char*)dirToList);
+    Dir_t* dir = API_FS_OpenDir((const char*) dirToList);
     Dirent_t* dirent = NULL;
-    while( (dirent = API_FS_ReadDir(dir)) )
-    {
-        // Trace(1,"dir name:%s",dirent->d_name);
-        mp_obj_t dirStr = mp_obj_new_str(dirent->d_name,strlen(dirent->d_name));
+    while ((dirent = API_FS_ReadDir(dir))) {
+        mp_obj_t dirStr = mp_obj_new_str(dirent->d_name, strlen(dirent->d_name));
         mp_obj_list_append(dir_list, dirStr);
     }
     API_FS_CloseDir(dir);
-    API_FS_OpenDir(tmp);
+    API_FS_ChangeDir(tmp);
     free(tmp);
     return dir_list;
 }
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_vfs_listdir_obj, 0, 1, mp_vfs_listdir);
 
+MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_vfs_listdir_obj, 0, 1, mp_vfs_listdir);
 
 mp_obj_t mp_vfs_mkdir(mp_obj_t path_in) {
+    // ========================================
+    // Creates a folder.
+    // Args:
+    //     name (str): folder to create;
+    // ========================================
     const char* path = mp_obj_str_get_str(path_in);
-    if(strcmp(path,"/")==0 || strcmp(path,"/t")==0)
-    {
+    if (strcmp(path, "/") == 0 || strcmp(path, "/t") == 0)
         mp_raise_OSError(MP_EEXIST);
-    }
-    int32_t ret = API_FS_Mkdir(path,0);
-    if(ret != 0)
+    int32_t ret = API_FS_Mkdir(path, 0);
+    if (ret != 0)
         mp_raise_OSError(MP_EIO);
     return mp_const_none;
 }
+
 MP_DEFINE_CONST_FUN_OBJ_1(mp_vfs_mkdir_obj, mp_vfs_mkdir);
 
 mp_obj_t mp_vfs_remove(mp_obj_t path_in) {
+    // ========================================
+    // Removes a file.
+    // Args:
+    //     name (str): file to remove;
+    // ========================================
     const char* path = mp_obj_str_get_str(path_in);
-    if(strcmp(path,"/")==0 || strcmp(path,"/t")==0)
-    {
+    if (strcmp(path, "/") == 0 || strcmp(path, "/t") == 0)
         mp_raise_OSError(MP_EINVAL);
-    }
     int32_t ret = API_FS_Delete(path);
-    if(ret != 0)
+    if (ret != 0)
         mp_raise_OSError(MP_EIO);
     return mp_const_none;
 }
+
 MP_DEFINE_CONST_FUN_OBJ_1(mp_vfs_remove_obj, mp_vfs_remove);
 
 mp_obj_t mp_vfs_rename(mp_obj_t old_path_in, mp_obj_t new_path_in) {
+    // ========================================
+    // Renames a file.
+    // Args:
+    //     name (str): file to rename;
+    //     new (str): the new name;
+    // ========================================
     const char* path_old = mp_obj_str_get_str(old_path_in);
     const char* path_new = mp_obj_str_get_str(new_path_in);
     int32_t ret = API_FS_Rename(path_old,path_new);
-    if(ret != 0)
+    if (ret != 0)
         mp_raise_OSError(MP_EIO);
     return mp_const_none;
 }
+
 MP_DEFINE_CONST_FUN_OBJ_2(mp_vfs_rename_obj, mp_vfs_rename);
 
 mp_obj_t mp_vfs_rmdir(mp_obj_t path_in) {
+    // ========================================
+    // Removes a folder.
+    // Args:
+    //     name (str): folder to remove;
+    // ========================================
     const char* path = mp_obj_str_get_str(path_in);
-    if(strcmp(path,"/")==0 || strcmp(path,"/t")==0)
-    {
+    if (strcmp(path, "/") == 0 || strcmp(path, "/t") == 0)
         mp_raise_OSError(MP_EINVAL);
-    }
-    char* path0 = (char*)malloc(160);
-    memset(path0,0,160);
-    API_FS_RealPath(path,path0);
+    char* path0 = (char*) malloc(160);
+    memset(path0, 0, 160);
+    API_FS_RealPath(path, path0);
     int32_t ret = API_FS_Rmdir(path0);
     free(path0);
-    if(ret != 0)
+    if (ret != 0)
         mp_raise_OSError(MP_EIO);
     return mp_const_none;
 }
-MP_DEFINE_CONST_FUN_OBJ_1(mp_vfs_rmdir_obj, mp_vfs_rmdir);
 
+MP_DEFINE_CONST_FUN_OBJ_1(mp_vfs_rmdir_obj, mp_vfs_rmdir);
 
 mp_obj_t mp_vfs_chdir(mp_obj_t path_in) {
+    // ========================================
+    // Changes a folder.
+    // Args:
+    //     name (str): folder to change to;
+    // ========================================
     const char* path = mp_obj_str_get_str(path_in);
     Dir_t* dir = API_FS_OpenDir(path);
-    if(dir == NULL)
-    {
+    if (dir == NULL)
         mp_raise_OSError(MP_EIO);
-    }
     API_FS_CloseDir(dir);
     int32_t ret = API_FS_ChangeDir(path);
-    if(ret != 0)
+    if (ret != 0)
         mp_raise_OSError(MP_EIO);
     return mp_const_none;
 }
+
 MP_DEFINE_CONST_FUN_OBJ_1(mp_vfs_chdir_obj, mp_vfs_chdir);
 
 mp_obj_t mp_vfs_getcwd(void) {
-    char* tmp = (char*)malloc(200);
-    if(!tmp)
+    // ========================================
+    // Retrieves current folder.
+    // ========================================
+    char* tmp = (char*) malloc(200);
+    if (!tmp)
         mp_raise_OSError(MP_ENOMEM);
-    memset(tmp,0,200);
-    uint32_t ret =API_FS_GetCurDir(200,tmp);
-    if(ret != 0)
-    {
+    memset(tmp, 0, 200);
+    uint32_t ret = API_FS_GetCurDir(200, tmp);
+    if(ret != 0) {
         free(tmp);
         mp_raise_OSError(MP_EIO);
     }
-    mp_obj_t retVal = mp_obj_new_str(tmp,strlen(tmp));
+    mp_obj_t retVal = mp_obj_new_str(tmp, strlen(tmp));
     free(tmp);
     return retVal;
 }
+
 MP_DEFINE_CONST_FUN_OBJ_0(mp_vfs_getcwd_obj, mp_vfs_getcwd);
 
 mp_obj_t mp_vfs_stat(mp_obj_t path_in) {
+    // ========================================
+    // Stats the file system.
+    // ========================================
     const char* path = mp_obj_str_get_str(path_in);
     API_FS_INFO info;
-    int32_t ret = API_FS_GetFSInfo(path,&info);
-    if(ret != 0)
+    int32_t ret = API_FS_GetFSInfo(path, &info);
+    if (ret != 0)
         mp_raise_OSError(MP_EIO);
     mp_obj_t tuple[2] = {
         mp_obj_new_int(info.totalSize),
@@ -230,13 +265,17 @@ mp_obj_t mp_vfs_stat(mp_obj_t path_in) {
     };
     return mp_obj_new_tuple(2, tuple);
 }
+
 MP_DEFINE_CONST_FUN_OBJ_1(mp_vfs_stat_obj, mp_vfs_stat);
 
 mp_obj_t mp_vfs_statvfs(mp_obj_t path_in) {
+    // ========================================
+    // Stats the file system.
+    // ========================================
     const char* path = mp_obj_str_get_str(path_in);
     API_FS_INFO info;
-    int32_t ret = API_FS_GetFSInfo(path,&info);
-    if(ret != 0)
+    int32_t ret = API_FS_GetFSInfo(path, &info);
+    if (ret != 0)
         mp_raise_OSError(MP_EIO);
     mp_obj_t tuple[2] = {
         mp_obj_new_int(info.totalSize),
@@ -244,6 +283,7 @@ mp_obj_t mp_vfs_statvfs(mp_obj_t path_in) {
     };
     return mp_obj_new_tuple(2, tuple);
 }
+
 MP_DEFINE_CONST_FUN_OBJ_1(mp_vfs_statvfs_obj, mp_vfs_statvfs);
 
 #endif //#if !MICROPY_VFS
@@ -290,6 +330,7 @@ STATIC const mp_rom_map_elem_t os_module_globals_table[] = {
     #endif
     #else
     { MP_ROM_QSTR(MP_QSTR_listdir), MP_ROM_PTR(&mp_vfs_listdir_obj) },
+    { MP_ROM_QSTR(MP_QSTR_ilistdir), MP_ROM_PTR(&mp_vfs_listdir_obj) },
     { MP_ROM_QSTR(MP_QSTR_mkdir), MP_ROM_PTR(&mp_vfs_mkdir_obj) },
     { MP_ROM_QSTR(MP_QSTR_rmdir), MP_ROM_PTR(&mp_vfs_rmdir_obj) },
     { MP_ROM_QSTR(MP_QSTR_chdir), MP_ROM_PTR(&mp_vfs_chdir_obj) },

From e4c59d479e3f1fc3948cd4d43923aa0bc3c076d1 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sun, 22 Dec 2019 18:40:04 +0100
Subject: [PATCH 3380/3533] Add mounting and VFS support

---
 ports/gprs_a9/Makefile       |   2 +-
 ports/gprs_a9/moduos.c       | 215 +++++++++++++++++++++--------------
 ports/gprs_a9/mpconfigport.h |   6 +-
 3 files changed, 134 insertions(+), 89 deletions(-)

diff --git a/ports/gprs_a9/Makefile b/ports/gprs_a9/Makefile
index 981c1f2c61e8a..3b1cbed8a219f 100644
--- a/ports/gprs_a9/Makefile
+++ b/ports/gprs_a9/Makefile
@@ -214,7 +214,7 @@ bin: ${BIN}
 	$(Q)${MKDIR} -p ${BIN_PATH}
 	$(Q)${CP} -f ${BIN} ${BIN_PATH}
 	$(Q)${CP} -f ${PLATFORM_ELF_PATH} ${BIN_PATH}
-	$(Q)${OBJCOPY} --strip-symbols=${STRIP_SYMBOL_FILE} -N send_packet -N calloc ${BIN_PATH}/${FIRMWARE_NAME}.elf ${BIN_PATH}/${FIRMWARE_NAME}.elf
+	$(Q)${OBJCOPY} --strip-symbols=${STRIP_SYMBOL_FILE} -N send_packet -N calloc -N ff_oem2uni -N ff_uni2oem ${BIN_PATH}/${FIRMWARE_NAME}.elf ${BIN_PATH}/${FIRMWARE_NAME}.elf
 	$(Q)${ELFCOMBINE_TOOL} -e1 ${BIN_PATH}/${FIRMWARE_NAME}.elf -e2 ${BIN_PATH}/${PLATFORM_ELF_NAME} -o ${BIN_PATH}/${FIRMWARE_NAME}_final.elf
 	$(Q)${RM} -f ${BIN_PATH}/${FIRMWARE_NAME}.elf
 	$(Q)${RM} -f ${BIN_PATH}/${PLATFORM_ELF_NAME}
diff --git a/ports/gprs_a9/moduos.c b/ports/gprs_a9/moduos.c
index a78df9dd12fbd..203c3a9367edf 100644
--- a/ports/gprs_a9/moduos.c
+++ b/ports/gprs_a9/moduos.c
@@ -102,78 +102,122 @@ STATIC mp_obj_t os_urandom(mp_obj_t num) {
 
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(os_urandom_obj, os_urandom);
 
-#if !MICROPY_VFS
+// -------------
+// Native FS API
+// -------------
 
-mp_obj_t mp_vfs_listdir(size_t n_args, const mp_obj_t *args) {
+typedef struct _native_vfs_ilistdir_it_t {
+    mp_obj_base_t base;
+    mp_fun_1_t iternext;
+    Dir_t* folder;
+} native_vfs_ilistdir_it_t;
+
+mp_obj_t moduos_flashfs_mount(mp_obj_t arg1, mp_obj_t arg2) {
+    // ========================================
+    // Mounts the filesystem.
+    // ========================================
+    (void) arg1;
+    (void) arg2;
+    return mp_const_none;
+}
+
+MP_DEFINE_CONST_FUN_OBJ_2(moduos_flashfs_mount_obj, moduos_flashfs_mount);
+MP_DEFINE_CONST_STATICMETHOD_OBJ(moduos_flashfs_mount_static_class_obj, &moduos_flashfs_mount_obj);
+
+mp_obj_t moduos_flashfs_umount() {
+    // ========================================
+    // Unmounts the filesystem.
+    // ========================================
+    return mp_const_none;
+}
+
+MP_DEFINE_CONST_FUN_OBJ_0(moduos_flashfs_umount_obj, moduos_flashfs_umount);
+MP_DEFINE_CONST_STATICMETHOD_OBJ(moduos_flashfs_umount_static_class_obj, &moduos_flashfs_umount_obj);
+
+STATIC mp_obj_t flashfs_ilistdir_it_iternext(mp_obj_t self_in) {
+    // ========================================
+    // next(ilistdir)
     // ========================================
-    // Lists a folder.
+    native_vfs_ilistdir_it_t *self = MP_OBJ_TO_PTR(self_in);
+    if (self->folder == NULL)
+        // stopped iterating already
+        return MP_OBJ_STOP_ITERATION;
+
+    const Dirent_t* entry = NULL;
+    while ((entry = API_FS_ReadDir(self->folder))) {
+        // output the entry
+        mp_obj_t tuple[3] = {
+            mp_obj_new_str(entry->d_name, strlen(entry->d_name)),
+            mp_obj_new_int(entry->d_type << 12),
+            mp_obj_new_int(entry->d_ino),
+        };
+        return mp_obj_new_tuple(sizeof(tuple) / sizeof(mp_obj_t), tuple);
+    }
+
+    // finallize the iterator
+    API_FS_CloseDir(self->folder);
+    self->folder = NULL;
+    return MP_OBJ_STOP_ITERATION;
+}
+
+mp_obj_t moduos_flashfs_ilistdir(mp_obj_t path_in) {
+    // ========================================
+    // Iterates a folder.
     // Args:
     //     name (str): folder to list;
     // ========================================
-    mp_obj_t dir_list = mp_obj_new_list(0, NULL);
-    char* tmp = (char*) malloc(200);
-    if (!tmp)
-        mp_raise_OSError(MP_ENOMEM);
-    memset(tmp, 0, 200);
-    uint32_t ret = API_FS_GetCurDir(200, tmp);
-    if (ret != 0) {
-        free(tmp);
-        mp_raise_OSError(MP_EIO);
-    }
-    char* dirToList = "/";
-    if (n_args != 0)
-        dirToList = (char*)mp_obj_str_get_str(args[0]);
+    const char* path = mp_obj_str_get_str(path_in);
+    Dir_t* dir;
+    if (strlen(path))
+        dir = API_FS_OpenDir(path);
     else
-        dirToList = tmp;
-    Dir_t* dir = API_FS_OpenDir((const char*) dirToList);
-    Dirent_t* dirent = NULL;
-    while ((dirent = API_FS_ReadDir(dir))) {
-        mp_obj_t dirStr = mp_obj_new_str(dirent->d_name, strlen(dirent->d_name));
-        mp_obj_list_append(dir_list, dirStr);
-    }
-    API_FS_CloseDir(dir);
-    API_FS_ChangeDir(tmp);
-    free(tmp);
-    return dir_list;
+        dir = API_FS_OpenDir(".");
+    if (!dir)
+        mp_raise_OSError(MP_EIO);
+
+    native_vfs_ilistdir_it_t *iter = m_new_obj(native_vfs_ilistdir_it_t);
+    iter->base.type = &mp_type_polymorph_iter;
+    iter->iternext = flashfs_ilistdir_it_iternext;
+    iter->folder = dir;
+    return MP_OBJ_FROM_PTR(iter);
 }
 
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_vfs_listdir_obj, 0, 1, mp_vfs_listdir);
+MP_DEFINE_CONST_FUN_OBJ_1(moduos_flashfs_ilistdir_obj, moduos_flashfs_ilistdir);
+MP_DEFINE_CONST_STATICMETHOD_OBJ(moduos_flashfs_ilistdir_static_class_obj, &moduos_flashfs_ilistdir_obj);
 
-mp_obj_t mp_vfs_mkdir(mp_obj_t path_in) {
+mp_obj_t moduos_flashfs_mkdir(mp_obj_t path_in) {
     // ========================================
     // Creates a folder.
     // Args:
     //     name (str): folder to create;
     // ========================================
     const char* path = mp_obj_str_get_str(path_in);
-    if (strcmp(path, "/") == 0 || strcmp(path, "/t") == 0)
-        mp_raise_OSError(MP_EEXIST);
     int32_t ret = API_FS_Mkdir(path, 0);
     if (ret != 0)
         mp_raise_OSError(MP_EIO);
     return mp_const_none;
 }
 
-MP_DEFINE_CONST_FUN_OBJ_1(mp_vfs_mkdir_obj, mp_vfs_mkdir);
+MP_DEFINE_CONST_FUN_OBJ_1(moduos_flashfs_mkdir_obj, moduos_flashfs_mkdir);
+MP_DEFINE_CONST_STATICMETHOD_OBJ(moduos_flashfs_mkdir_static_class_obj, &moduos_flashfs_mkdir_obj);
 
-mp_obj_t mp_vfs_remove(mp_obj_t path_in) {
+mp_obj_t moduos_flashfs_remove(mp_obj_t path_in) {
     // ========================================
     // Removes a file.
     // Args:
     //     name (str): file to remove;
     // ========================================
     const char* path = mp_obj_str_get_str(path_in);
-    if (strcmp(path, "/") == 0 || strcmp(path, "/t") == 0)
-        mp_raise_OSError(MP_EINVAL);
     int32_t ret = API_FS_Delete(path);
     if (ret != 0)
         mp_raise_OSError(MP_EIO);
     return mp_const_none;
 }
 
-MP_DEFINE_CONST_FUN_OBJ_1(mp_vfs_remove_obj, mp_vfs_remove);
+MP_DEFINE_CONST_FUN_OBJ_1(moduos_flashfs_remove_obj, moduos_flashfs_remove);
+MP_DEFINE_CONST_STATICMETHOD_OBJ(moduos_flashfs_remove_static_class_obj, &moduos_flashfs_remove_obj);
 
-mp_obj_t mp_vfs_rename(mp_obj_t old_path_in, mp_obj_t new_path_in) {
+mp_obj_t moduos_flashfs_rename(mp_obj_t old_path_in, mp_obj_t new_path_in) {
     // ========================================
     // Renames a file.
     // Args:
@@ -182,75 +226,62 @@ mp_obj_t mp_vfs_rename(mp_obj_t old_path_in, mp_obj_t new_path_in) {
     // ========================================
     const char* path_old = mp_obj_str_get_str(old_path_in);
     const char* path_new = mp_obj_str_get_str(new_path_in);
-    int32_t ret = API_FS_Rename(path_old,path_new);
+    int32_t ret = API_FS_Rename(path_old, path_new);
     if (ret != 0)
         mp_raise_OSError(MP_EIO);
     return mp_const_none;
 }
 
-MP_DEFINE_CONST_FUN_OBJ_2(mp_vfs_rename_obj, mp_vfs_rename);
+MP_DEFINE_CONST_FUN_OBJ_2(moduos_flashfs_rename_obj, moduos_flashfs_rename);
+MP_DEFINE_CONST_STATICMETHOD_OBJ(moduos_flashfs_rename_static_class_obj, &moduos_flashfs_rename_obj);
 
-mp_obj_t mp_vfs_rmdir(mp_obj_t path_in) {
+mp_obj_t moduos_flashfs_rmdir(mp_obj_t path_in) {
     // ========================================
     // Removes a folder.
     // Args:
     //     name (str): folder to remove;
     // ========================================
     const char* path = mp_obj_str_get_str(path_in);
-    if (strcmp(path, "/") == 0 || strcmp(path, "/t") == 0)
-        mp_raise_OSError(MP_EINVAL);
-    char* path0 = (char*) malloc(160);
-    memset(path0, 0, 160);
-    API_FS_RealPath(path, path0);
-    int32_t ret = API_FS_Rmdir(path0);
-    free(path0);
+    int32_t ret = API_FS_Rmdir(path);
     if (ret != 0)
         mp_raise_OSError(MP_EIO);
     return mp_const_none;
 }
 
-MP_DEFINE_CONST_FUN_OBJ_1(mp_vfs_rmdir_obj, mp_vfs_rmdir);
+MP_DEFINE_CONST_FUN_OBJ_1(moduos_flashfs_rmdir_obj, moduos_flashfs_rmdir);
+MP_DEFINE_CONST_STATICMETHOD_OBJ(moduos_flashfs_rmdir_static_class_obj, &moduos_flashfs_rmdir_obj);
 
-mp_obj_t mp_vfs_chdir(mp_obj_t path_in) {
+mp_obj_t moduos_flashfs_chdir(mp_obj_t path_in) {
     // ========================================
     // Changes a folder.
     // Args:
     //     name (str): folder to change to;
     // ========================================
     const char* path = mp_obj_str_get_str(path_in);
-    Dir_t* dir = API_FS_OpenDir(path);
-    if (dir == NULL)
-        mp_raise_OSError(MP_EIO);
-    API_FS_CloseDir(dir);
     int32_t ret = API_FS_ChangeDir(path);
     if (ret != 0)
         mp_raise_OSError(MP_EIO);
     return mp_const_none;
 }
 
-MP_DEFINE_CONST_FUN_OBJ_1(mp_vfs_chdir_obj, mp_vfs_chdir);
+MP_DEFINE_CONST_FUN_OBJ_1(moduos_flashfs_chdir_obj, moduos_flashfs_chdir);
+MP_DEFINE_CONST_STATICMETHOD_OBJ(moduos_flashfs_chdir_static_class_obj, &moduos_flashfs_chdir_obj);
 
-mp_obj_t mp_vfs_getcwd(void) {
+mp_obj_t moduos_flashfs_getcwd(void) {
     // ========================================
     // Retrieves current folder.
     // ========================================
-    char* tmp = (char*) malloc(200);
-    if (!tmp)
-        mp_raise_OSError(MP_ENOMEM);
-    memset(tmp, 0, 200);
-    uint32_t ret = API_FS_GetCurDir(200, tmp);
-    if(ret != 0) {
-        free(tmp);
+    char dir[256];
+    uint32_t ret = API_FS_GetCurDir(sizeof(dir), dir);
+    if (ret != 0)
         mp_raise_OSError(MP_EIO);
-    }
-    mp_obj_t retVal = mp_obj_new_str(tmp, strlen(tmp));
-    free(tmp);
-    return retVal;
+    return mp_obj_new_str(dir, strlen(dir));
 }
 
-MP_DEFINE_CONST_FUN_OBJ_0(mp_vfs_getcwd_obj, mp_vfs_getcwd);
+MP_DEFINE_CONST_FUN_OBJ_0(moduos_flashfs_getcwd_obj, moduos_flashfs_getcwd);
+MP_DEFINE_CONST_STATICMETHOD_OBJ(moduos_flashfs_getcwd_static_class_obj, &moduos_flashfs_getcwd_obj);
 
-mp_obj_t mp_vfs_stat(mp_obj_t path_in) {
+mp_obj_t moduos_flashfs_stat(mp_obj_t path_in) {
     // ========================================
     // Stats the file system.
     // ========================================
@@ -266,9 +297,10 @@ mp_obj_t mp_vfs_stat(mp_obj_t path_in) {
     return mp_obj_new_tuple(2, tuple);
 }
 
-MP_DEFINE_CONST_FUN_OBJ_1(mp_vfs_stat_obj, mp_vfs_stat);
+MP_DEFINE_CONST_FUN_OBJ_1(moduos_flashfs_stat_obj, moduos_flashfs_stat);
+MP_DEFINE_CONST_STATICMETHOD_OBJ(moduos_flashfs_stat_static_class_obj, &moduos_flashfs_stat_obj);
 
-mp_obj_t mp_vfs_statvfs(mp_obj_t path_in) {
+mp_obj_t moduos_flashfs_statvfs(mp_obj_t path_in) {
     // ========================================
     // Stats the file system.
     // ========================================
@@ -284,14 +316,34 @@ mp_obj_t mp_vfs_statvfs(mp_obj_t path_in) {
     return mp_obj_new_tuple(2, tuple);
 }
 
-MP_DEFINE_CONST_FUN_OBJ_1(mp_vfs_statvfs_obj, mp_vfs_statvfs);
+MP_DEFINE_CONST_FUN_OBJ_1(moduos_flashfs_statvfs_obj, moduos_flashfs_statvfs);
+MP_DEFINE_CONST_STATICMETHOD_OBJ(moduos_flashfs_statvfs_static_class_obj, &moduos_flashfs_statvfs_obj);
+
+STATIC const mp_rom_map_elem_t flashfs_locals_dict_table[] = {
+    { MP_ROM_QSTR(MP_QSTR_mount), MP_ROM_PTR(&moduos_flashfs_mount_static_class_obj) },
+    { MP_ROM_QSTR(MP_QSTR_umount), MP_ROM_PTR(&moduos_flashfs_umount_static_class_obj) },
+    { MP_ROM_QSTR(MP_QSTR_ilistdir), MP_ROM_PTR(&moduos_flashfs_ilistdir_static_class_obj) },
+    { MP_ROM_QSTR(MP_QSTR_mkdir), MP_ROM_PTR(&moduos_flashfs_mkdir_static_class_obj) },
+    { MP_ROM_QSTR(MP_QSTR_remove), MP_ROM_PTR(&moduos_flashfs_remove_static_class_obj) },
+    { MP_ROM_QSTR(MP_QSTR_rename), MP_ROM_PTR(&moduos_flashfs_rename_static_class_obj) },
+    { MP_ROM_QSTR(MP_QSTR_rmdir), MP_ROM_PTR(&moduos_flashfs_rmdir_static_class_obj) },
+    { MP_ROM_QSTR(MP_QSTR_chdir), MP_ROM_PTR(&moduos_flashfs_chdir_static_class_obj) },
+    { MP_ROM_QSTR(MP_QSTR_getcwd), MP_ROM_PTR(&moduos_flashfs_getcwd_static_class_obj) },
+    { MP_ROM_QSTR(MP_QSTR_stat), MP_ROM_PTR(&moduos_flashfs_stat_static_class_obj) },
+    { MP_ROM_QSTR(MP_QSTR_statvfs), MP_ROM_PTR(&moduos_flashfs_statvfs_static_class_obj) },
+};
+
+STATIC MP_DEFINE_CONST_DICT(flashfs_locals_dict, flashfs_locals_dict_table);
 
-#endif //#if !MICROPY_VFS
-///////////////////////////////////////////////////////////////////
+STATIC const mp_obj_type_t moduos_flashfs_type = {
+    { &mp_type_type },
+    .name = MP_QSTR_flashfs,
+    .locals_dict = (mp_obj_dict_t*)&flashfs_locals_dict,
+};
 
 #if MICROPY_PY_OS_DUPTERM
 STATIC mp_obj_t os_dupterm_notify(mp_obj_t obj_in) {
-    (void)obj_in;
+    (void) obj_in;
     for (;;) {
         int c = mp_uos_dupterm_rx_chr();
         if (c < 0) {
@@ -301,11 +353,15 @@ STATIC mp_obj_t os_dupterm_notify(mp_obj_t obj_in) {
     }
     return mp_const_none;
 }
+
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(os_dupterm_notify_obj, os_dupterm_notify);
 #endif
 
 STATIC const mp_rom_map_elem_t os_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_uos) },
+
+    { MP_OBJ_NEW_QSTR(MP_QSTR_flashfs), (mp_obj_t)MP_ROM_PTR(&moduos_flashfs_type) },
+
     { MP_ROM_QSTR(MP_QSTR_uname), MP_ROM_PTR(&os_uname_obj) },
     { MP_ROM_QSTR(MP_QSTR_urandom), MP_ROM_PTR(&os_urandom_obj) },
     #if MICROPY_PY_OS_DUPTERM
@@ -328,17 +384,6 @@ STATIC const mp_rom_map_elem_t os_module_globals_table[] = {
     #if MICROPY_VFS_FAT
     { MP_ROM_QSTR(MP_QSTR_VfsFat), MP_ROM_PTR(&mp_fat_vfs_type) },
     #endif
-    #else
-    { MP_ROM_QSTR(MP_QSTR_listdir), MP_ROM_PTR(&mp_vfs_listdir_obj) },
-    { MP_ROM_QSTR(MP_QSTR_ilistdir), MP_ROM_PTR(&mp_vfs_listdir_obj) },
-    { MP_ROM_QSTR(MP_QSTR_mkdir), MP_ROM_PTR(&mp_vfs_mkdir_obj) },
-    { MP_ROM_QSTR(MP_QSTR_rmdir), MP_ROM_PTR(&mp_vfs_rmdir_obj) },
-    { MP_ROM_QSTR(MP_QSTR_chdir), MP_ROM_PTR(&mp_vfs_chdir_obj) },
-    { MP_ROM_QSTR(MP_QSTR_getcwd), MP_ROM_PTR(&mp_vfs_getcwd_obj) },
-    { MP_ROM_QSTR(MP_QSTR_remove), MP_ROM_PTR(&mp_vfs_remove_obj) },
-    { MP_ROM_QSTR(MP_QSTR_rename), MP_ROM_PTR(&mp_vfs_rename_obj) },
-    { MP_ROM_QSTR(MP_QSTR_stat), MP_ROM_PTR(&mp_vfs_stat_obj) },
-    { MP_ROM_QSTR(MP_QSTR_statvfs), MP_ROM_PTR(&mp_vfs_statvfs_obj) },
     #endif
 };
 
diff --git a/ports/gprs_a9/mpconfigport.h b/ports/gprs_a9/mpconfigport.h
index 5ebb13a621d51..d82149c45974f 100644
--- a/ports/gprs_a9/mpconfigport.h
+++ b/ports/gprs_a9/mpconfigport.h
@@ -174,9 +174,9 @@
 #define mp_type_textio                      mp_type_vfs_fat_textio
 
 
-// #define MICROPY_VFS                         (1)
-// #define MICROPY_VFS_FAT                     (1)
-// #define MICROPY_READER_VFS                  (1)
+#define MICROPY_VFS                         (1)
+#define MICROPY_VFS_FAT                     (1)
+#define MICROPY_READER_VFS                  (1)
 
 // use vfs's functions for import stat and builtin open
 #ifdef MICROPY_VFS

From fcb20d81af1b53b0a64d27bf7cc7f7cdbafcdaa1 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Wed, 25 Dec 2019 23:13:32 +0100
Subject: [PATCH 3381/3533] Revamp filesystem to support custom mount points,
 block devices, etc

---
 ports/gprs_a9/file_io.c        | 208 ++++++++++-----------------------
 ports/gprs_a9/modules/_boot.py |   2 +
 ports/gprs_a9/moduos.c         | 149 +++++++++++++----------
 ports/gprs_a9/moduos.h         |   6 +
 4 files changed, 156 insertions(+), 209 deletions(-)

diff --git a/ports/gprs_a9/file_io.c b/ports/gprs_a9/file_io.c
index b78c79d4169c9..2a36167db7e43 100644
--- a/ports/gprs_a9/file_io.c
+++ b/ports/gprs_a9/file_io.c
@@ -25,41 +25,35 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+#include "moduos.h"
 
 #include <string.h>
 
 #include "py/objstr.h"
 #include "py/runtime.h"
+#include "py/stream.h"
 #include "py/mperrno.h"
 #include "py/mphal.h"
 #include "extmod/misc.h"
-#include "extmod/vfs.h"
-#include "extmod/vfs_fat.h"
 #include "genhdr/mpversion.h"
-#include "py/stream.h"
 
 #include "api_fs.h"
 
-#if !MICROPY_VFS
-
-typedef struct _pyb_file_obj_t {
+typedef struct _internal_flash_file_obj_t {
     mp_obj_base_t base;
     int fd;
-} pyb_file_obj_t;
+} internal_flash_file_obj_t;
 
-STATIC void file_obj_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
-    // ========================================
-    // str(f)
-    // ========================================
+STATIC void internal_flash_file_obj_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     (void)kind;
     mp_printf(print, "<io.%s %p>", mp_obj_get_type_str(self_in), MP_OBJ_TO_PTR(self_in));
 }
 
-STATIC mp_uint_t file_obj_read(mp_obj_t self_in, void *buf, mp_uint_t size, int *errcode) {
+STATIC mp_uint_t internal_flash_file_obj_read(mp_obj_t self_in, void *buf, mp_uint_t size, int *errcode) {
     // ========================================
     // f.read()
     // ========================================
-    pyb_file_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    internal_flash_file_obj_t *self = MP_OBJ_TO_PTR(self_in);
     int32_t ret = API_FS_Read(self->fd, buf, size);
     if (ret < 0) {
         *errcode = MP_EIO;
@@ -68,29 +62,35 @@ STATIC mp_uint_t file_obj_read(mp_obj_t self_in, void *buf, mp_uint_t size, int
     return (mp_uint_t) ret;
 }
 
-STATIC mp_uint_t file_obj_write(mp_obj_t self_in, const void *buf, mp_uint_t size, int *errcode) {
+STATIC mp_uint_t internal_flash_file_obj_write(mp_obj_t self_in, const void *buf, mp_uint_t size, int *errcode) {
     // ========================================
     // f.write(s)
     // ========================================
-    pyb_file_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    internal_flash_file_obj_t *self = MP_OBJ_TO_PTR(self_in);
     int32_t ret = API_FS_Write(self->fd, (uint8_t*) buf, size);
     if (ret < 0) {
         *errcode = MP_EIO;
         return MP_STREAM_ERROR;
     }
     if (ret != size) {
-        // The FatFS documentation says that this means disk full.
         *errcode = MP_ENOSPC;
         return MP_STREAM_ERROR;
     }
     return (mp_uint_t) ret;
 }
 
-STATIC mp_uint_t file_obj_ioctl(mp_obj_t o_in, mp_uint_t request, uintptr_t arg, int *errcode) {
+STATIC mp_obj_t file_obj___exit__(size_t n_args, const mp_obj_t *args) {
+    (void)n_args;
+    return mp_stream_close(args[0]);
+}
+
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(file_obj___exit___obj, 4, 4, file_obj___exit__);
+
+STATIC mp_uint_t internal_flash_file_obj_ioctl(mp_obj_t o_in, mp_uint_t request, uintptr_t arg, int *errcode) {
     // ========================================
     // IO stream control: f.seek(), f.flush(), f.close()
     // ========================================
-    pyb_file_obj_t *self = MP_OBJ_TO_PTR(o_in);
+    internal_flash_file_obj_t *self = MP_OBJ_TO_PTR(o_in);
 
     if (request == MP_STREAM_SEEK) {
         struct mp_stream_seek_t *s = (struct mp_stream_seek_t*) arg;
@@ -128,7 +128,8 @@ STATIC mp_uint_t file_obj_ioctl(mp_obj_t o_in, mp_uint_t request, uintptr_t arg,
             if (ret != 0) {
                 *errcode = MP_EIO;
                 return MP_STREAM_ERROR;
-            }
+            } else
+                self->fd = 0;
         }
         return 0;
 
@@ -139,9 +140,6 @@ STATIC mp_uint_t file_obj_ioctl(mp_obj_t o_in, mp_uint_t request, uintptr_t arg,
     return MP_STREAM_ERROR;
 }
 
-
-// Note: encoding is ignored for now; it's also not a valid kwarg for CPython's FileIO,
-// but by adding it here we can use one single mp_arg_t array for open() and FileIO's constructor
 STATIC const mp_arg_t file_open_args[] = {
     { MP_QSTR_file, MP_ARG_OBJ | MP_ARG_REQUIRED, {.u_rom_obj = MP_ROM_PTR(&mp_const_none_obj)} },
     { MP_QSTR_mode, MP_ARG_OBJ, {.u_obj = MP_OBJ_NEW_QSTR(MP_QSTR_r)} },
@@ -150,7 +148,7 @@ STATIC const mp_arg_t file_open_args[] = {
 
 #define FILE_OPEN_NUM_ARGS MP_ARRAY_SIZE(file_open_args)
 
-STATIC mp_obj_t file_open(const char* file_name, const mp_obj_type_t *type, mp_arg_val_t *args) {
+STATIC mp_obj_t internal_flash_file_open(const char* file_name, const mp_obj_type_t *type, mp_arg_val_t *args) {
     // ========================================
     // open(...)
     // ========================================
@@ -172,17 +170,17 @@ STATIC mp_obj_t file_open(const char* file_name, const mp_obj_type_t *type, mp_a
                 break;
             #if MICROPY_PY_IO_FILEIO
             case 'b':
-                type = &mp_type_vfs_fat_fileio;
+                type = &mp_type_internal_flash_fileio;
                 break;
             case 't':
-                type = &mp_type_vfs_fat_textio;
+                type = &mp_type_internal_flash_textio;
                 break;
             #endif
             default:
                 mp_raise_ValueError("Mode must be one or more of 'rwabt+'");
         }
     }
-    pyb_file_obj_t *o = m_new_obj_with_finaliser(pyb_file_obj_t);
+    internal_flash_file_obj_t *o = m_new_obj_with_finaliser(internal_flash_file_obj_t);
     o->base.type = type;
 
     int32_t fd = API_FS_Open(file_name, mode, 0);
@@ -193,69 +191,71 @@ STATIC mp_obj_t file_open(const char* file_name, const mp_obj_type_t *type, mp_a
     return MP_OBJ_FROM_PTR(o);
 }
 
-STATIC mp_obj_t file_obj_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
+STATIC mp_obj_t internal_flash_file_obj_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
     mp_arg_val_t arg_vals[FILE_OPEN_NUM_ARGS];
     mp_arg_parse_all_kw_array(n_args, n_kw, args, FILE_OPEN_NUM_ARGS, file_open_args, arg_vals);
-    return file_open(NULL, type, arg_vals);
+    return internal_flash_file_open(NULL, type, arg_vals);
 }
 
-STATIC const mp_rom_map_elem_t rawfile_locals_dict_table[] = {
+STATIC const mp_rom_map_elem_t vfs_fat_rawfile_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_read), MP_ROM_PTR(&mp_stream_read_obj) },
-    // { MP_ROM_QSTR(MP_QSTR_readinto), MP_ROM_PTR(&mp_stream_readinto_obj) },
-    // { MP_ROM_QSTR(MP_QSTR_readline), MP_ROM_PTR(&mp_stream_unbuffered_readline_obj) },
-    // { MP_ROM_QSTR(MP_QSTR_readlines), MP_ROM_PTR(&mp_stream_unbuffered_readlines_obj) },
+    { MP_ROM_QSTR(MP_QSTR_readinto), MP_ROM_PTR(&mp_stream_readinto_obj) },
+    { MP_ROM_QSTR(MP_QSTR_readline), MP_ROM_PTR(&mp_stream_unbuffered_readline_obj) },
+    { MP_ROM_QSTR(MP_QSTR_readlines), MP_ROM_PTR(&mp_stream_unbuffered_readlines_obj) },
     { MP_ROM_QSTR(MP_QSTR_write), MP_ROM_PTR(&mp_stream_write_obj) },
     { MP_ROM_QSTR(MP_QSTR_flush), MP_ROM_PTR(&mp_stream_flush_obj) },
     { MP_ROM_QSTR(MP_QSTR_close), MP_ROM_PTR(&mp_stream_close_obj) },
     { MP_ROM_QSTR(MP_QSTR_seek), MP_ROM_PTR(&mp_stream_seek_obj) },
     { MP_ROM_QSTR(MP_QSTR_tell), MP_ROM_PTR(&mp_stream_tell_obj) },
-    // { MP_ROM_QSTR(MP_QSTR___del__), MP_ROM_PTR(&mp_stream_close_obj) },
-    // { MP_ROM_QSTR(MP_QSTR___enter__), MP_ROM_PTR(&mp_identity_obj) },
-    // { MP_ROM_QSTR(MP_QSTR___exit__), MP_ROM_PTR(&file_obj___exit___obj) },
+    { MP_ROM_QSTR(MP_QSTR___del__), MP_ROM_PTR(&mp_stream_close_obj) },
+    { MP_ROM_QSTR(MP_QSTR___enter__), MP_ROM_PTR(&mp_identity_obj) },
+    { MP_ROM_QSTR(MP_QSTR___exit__), MP_ROM_PTR(&file_obj___exit___obj) },
 };
 
-STATIC MP_DEFINE_CONST_DICT(rawfile_locals_dict, rawfile_locals_dict_table);
+STATIC MP_DEFINE_CONST_DICT(vfs_fat_rawfile_locals_dict, vfs_fat_rawfile_locals_dict_table);
 
-STATIC const mp_stream_p_t fileio_stream_p = {
-    .read = file_obj_read,
-    .write = file_obj_write,
-    .ioctl = file_obj_ioctl,
+#if MICROPY_PY_IO_FILEIO
+STATIC const mp_stream_p_t internal_flash_fileio_stream_p = {
+    .read = internal_flash_file_obj_read,
+    .write = internal_flash_file_obj_write,
+    .ioctl = internal_flash_file_obj_ioctl,
 };
 
-const mp_obj_type_t mp_type_vfs_fat_fileio = {
+const mp_obj_type_t mp_type_internal_flash_fileio = {
     { &mp_type_type },
     .name = MP_QSTR_FileIO,
-    .print = file_obj_print,
-    .make_new = file_obj_make_new,
+    .print = internal_flash_file_obj_print,
+    .make_new = internal_flash_file_obj_make_new,
     .getiter = mp_identity_getiter,
     .iternext = mp_stream_unbuffered_iter,
-    .protocol = &fileio_stream_p,
-    .locals_dict = (mp_obj_dict_t*)&rawfile_locals_dict,
+    .protocol = &internal_flash_fileio_stream_p,
+    .locals_dict = (mp_obj_dict_t*)&vfs_fat_rawfile_locals_dict,
 };
+#endif
 
-STATIC const mp_stream_p_t textio_stream_p = {
-    .read = file_obj_read,
-    .write = file_obj_write,
-    .ioctl = file_obj_ioctl,
+STATIC const mp_stream_p_t internal_flash_textio_stream_p = {
+    .read = internal_flash_file_obj_read,
+    .write = internal_flash_file_obj_write,
+    .ioctl = internal_flash_file_obj_ioctl,
     .is_text = true,
 };
 
-const mp_obj_type_t mp_type_vfs_fat_textio = {
+const mp_obj_type_t mp_type_internal_flash_textio = {
     { &mp_type_type },
     .name = MP_QSTR_TextIOWrapper,
-    .print = file_obj_print,
-    .make_new = file_obj_make_new,
+    .print = internal_flash_file_obj_print,
+    .make_new = internal_flash_file_obj_make_new,
     .getiter = mp_identity_getiter,
     .iternext = mp_stream_unbuffered_iter,
-    .protocol = &textio_stream_p,
-    .locals_dict = (mp_obj_dict_t*)&rawfile_locals_dict,
+    .protocol = &internal_flash_textio_stream_p,
+    .locals_dict = (mp_obj_dict_t*)&vfs_fat_rawfile_locals_dict,
 };
 
-// Note: buffering and encoding args are currently ignored
-mp_obj_t mp_builtin_open(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+mp_obj_t internal_flash_open(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     // ========================================
     // open(...) wrapper
     // ========================================
+    // TODO: binary mode
     enum { ARG_file, ARG_mode, ARG_encoding };
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_file, MP_ARG_OBJ | MP_ARG_REQUIRED, {.u_rom_obj = MP_ROM_PTR(&mp_const_none_obj)} },
@@ -267,98 +267,10 @@ mp_obj_t mp_builtin_open(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_a
     // parse args
     mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
     mp_arg_parse_all(n_args, pos_args, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
-    const char* fileName = mp_obj_str_get_str(args[ARG_file].u_obj);    
-    const mp_obj_type_t* type = &mp_type_vfs_fat_textio;
-    return file_open(fileName, type, args);
-}
-
-MP_DEFINE_CONST_FUN_OBJ_KW(mp_builtin_open_obj, 1, mp_builtin_open);
-
-typedef struct _mp_reader_vfs_t {
-    mp_obj_t file;
-    uint16_t len;
-    uint16_t pos;
-    byte buf[24];
-} mp_reader_vfs_t;
-
-STATIC mp_uint_t mp_reader_vfs_readbyte(void *data) {
-    // ========================================
-    // Buffered reader.
-    // ========================================
-    mp_reader_vfs_t *reader = (mp_reader_vfs_t*)data;
-    if (reader->pos >= reader->len) {
-        if (reader->len < sizeof(reader->buf)) {
-            return MP_READER_EOF;
-        } else {
-            int errcode;
-            reader->len = mp_stream_rw(reader->file, reader->buf, sizeof(reader->buf),
-                &errcode, MP_STREAM_RW_READ | MP_STREAM_RW_ONCE);
-            if (errcode != 0) {
-                // TODO handle errors properly
-                return MP_READER_EOF;
-            }
-            if (reader->len == 0) {
-                return MP_READER_EOF;
-            }
-            reader->pos = 0;
-        }
-    }
-    return reader->buf[reader->pos++];
+    const char* file_name = mp_obj_str_get_str(args[ARG_file].u_obj);    
+    const mp_obj_type_t* type = &mp_type_internal_flash_textio;
+    return internal_flash_file_open(file_name, type, args);
 }
 
-STATIC void mp_reader_vfs_close(void *data) {
-    // ========================================
-    // close() wrapper
-    // ========================================
-    mp_reader_vfs_t *reader = (mp_reader_vfs_t*) data;
-    mp_stream_close(reader->file);
-    m_del_obj(mp_reader_vfs_t, reader);
-}
-
-void mp_reader_new_file(mp_reader_t *reader, const char *filename) {
-    // ========================================
-    // open(...) wrapper
-    // ========================================
-    mp_reader_vfs_t *rf = m_new_obj(mp_reader_vfs_t);
-    mp_obj_t arg = mp_obj_new_str(filename, strlen(filename));
-    rf->file = mp_builtin_open(1, &arg, (mp_map_t*)&mp_const_empty_map);
-    int errcode;
-    rf->len = mp_stream_rw(rf->file, rf->buf, sizeof(rf->buf), &errcode, MP_STREAM_RW_READ | MP_STREAM_RW_ONCE);
-    if (errcode != 0) {
-        mp_raise_OSError(errcode);
-    }
-    rf->pos = 0;
-    reader->data = rf;
-    reader->readbyte = mp_reader_vfs_readbyte;
-    reader->close = mp_reader_vfs_close;
-}
-
-mp_lexer_t *mp_lexer_new_from_file(const char *filename) {
-    mp_reader_t reader;
-    mp_reader_new_file(&reader, filename);
-    return mp_lexer_new(qstr_from_str(filename), reader);
-}
-
-mp_import_stat_t mp_import_stat(const char *path) {
-    // ========================================
-    // Determines file/folder/does not exist.
-    // ========================================
-    char* path0 = (char*) malloc(160);
-    memset(path0, 0, 160);
-    API_FS_RealPath(path, path0);
-    int32_t fd = API_FS_Open(path0, FS_O_RDONLY, 0);
-    if (fd>0) {
-        API_FS_Close(fd);
-        free(path0);
-        return MP_IMPORT_STAT_FILE;
-    }
-    Dir_t* dir = API_FS_OpenDir(path0);
-    free(path0);
-    if(dir != NULL) {
-        API_FS_CloseDir(dir);
-        return MP_IMPORT_STAT_DIR;
-    }
-    return MP_IMPORT_STAT_NO_EXIST;
-}
+MP_DEFINE_CONST_FUN_OBJ_KW(internal_flash_open_obj, 1, internal_flash_open);
 
-#endif //#if !MICROPY_VFS
diff --git a/ports/gprs_a9/modules/_boot.py b/ports/gprs_a9/modules/_boot.py
index 8b137891791fe..669928eedc273 100644
--- a/ports/gprs_a9/modules/_boot.py
+++ b/ports/gprs_a9/modules/_boot.py
@@ -1 +1,3 @@
+import os
+os.mount(os.internal_flash, "/")
 
diff --git a/ports/gprs_a9/moduos.c b/ports/gprs_a9/moduos.c
index 203c3a9367edf..b0234b0d317b4 100644
--- a/ports/gprs_a9/moduos.c
+++ b/ports/gprs_a9/moduos.c
@@ -43,11 +43,13 @@
 
 #include "rng.h"
 #include "api_fs.h"
+#include "api_hal_spi.h"
 
 extern const mp_obj_type_t mp_fat_vfs_type;
 
 void moduos_init0() {
-    API_FS_ChangeDir("/");
+    if (API_FS_ChangeDir("/"))
+        mp_printf(&mp_plat_print, "Warning: moduos_init0 failed to chdir to /\n");
 }
 
 STATIC const qstr os_uname_info_fields[] = {
@@ -112,7 +114,7 @@ typedef struct _native_vfs_ilistdir_it_t {
     Dir_t* folder;
 } native_vfs_ilistdir_it_t;
 
-mp_obj_t moduos_flashfs_mount(mp_obj_t arg1, mp_obj_t arg2) {
+mp_obj_t moduos_internal_flash_mount(mp_obj_t arg1, mp_obj_t arg2) {
     // ========================================
     // Mounts the filesystem.
     // ========================================
@@ -121,20 +123,20 @@ mp_obj_t moduos_flashfs_mount(mp_obj_t arg1, mp_obj_t arg2) {
     return mp_const_none;
 }
 
-MP_DEFINE_CONST_FUN_OBJ_2(moduos_flashfs_mount_obj, moduos_flashfs_mount);
-MP_DEFINE_CONST_STATICMETHOD_OBJ(moduos_flashfs_mount_static_class_obj, &moduos_flashfs_mount_obj);
+MP_DEFINE_CONST_FUN_OBJ_2(moduos_internal_flash_mount_obj, moduos_internal_flash_mount);
+MP_DEFINE_CONST_STATICMETHOD_OBJ(moduos_internal_flash_mount_static_class_obj, &moduos_internal_flash_mount_obj);
 
-mp_obj_t moduos_flashfs_umount() {
+mp_obj_t moduos_internal_flash_umount() {
     // ========================================
     // Unmounts the filesystem.
     // ========================================
     return mp_const_none;
 }
 
-MP_DEFINE_CONST_FUN_OBJ_0(moduos_flashfs_umount_obj, moduos_flashfs_umount);
-MP_DEFINE_CONST_STATICMETHOD_OBJ(moduos_flashfs_umount_static_class_obj, &moduos_flashfs_umount_obj);
+MP_DEFINE_CONST_FUN_OBJ_0(moduos_internal_flash_umount_obj, moduos_internal_flash_umount);
+MP_DEFINE_CONST_STATICMETHOD_OBJ(moduos_internal_flash_umount_static_class_obj, &moduos_internal_flash_umount_obj);
 
-STATIC mp_obj_t flashfs_ilistdir_it_iternext(mp_obj_t self_in) {
+STATIC mp_obj_t internal_flash_ilistdir_it_iternext(mp_obj_t self_in) {
     // ========================================
     // next(ilistdir)
     // ========================================
@@ -160,7 +162,7 @@ STATIC mp_obj_t flashfs_ilistdir_it_iternext(mp_obj_t self_in) {
     return MP_OBJ_STOP_ITERATION;
 }
 
-mp_obj_t moduos_flashfs_ilistdir(mp_obj_t path_in) {
+mp_obj_t moduos_internal_flash_ilistdir(mp_obj_t path_in) {
     // ========================================
     // Iterates a folder.
     // Args:
@@ -177,15 +179,15 @@ mp_obj_t moduos_flashfs_ilistdir(mp_obj_t path_in) {
 
     native_vfs_ilistdir_it_t *iter = m_new_obj(native_vfs_ilistdir_it_t);
     iter->base.type = &mp_type_polymorph_iter;
-    iter->iternext = flashfs_ilistdir_it_iternext;
+    iter->iternext = internal_flash_ilistdir_it_iternext;
     iter->folder = dir;
     return MP_OBJ_FROM_PTR(iter);
 }
 
-MP_DEFINE_CONST_FUN_OBJ_1(moduos_flashfs_ilistdir_obj, moduos_flashfs_ilistdir);
-MP_DEFINE_CONST_STATICMETHOD_OBJ(moduos_flashfs_ilistdir_static_class_obj, &moduos_flashfs_ilistdir_obj);
+MP_DEFINE_CONST_FUN_OBJ_1(moduos_internal_flash_ilistdir_obj, moduos_internal_flash_ilistdir);
+MP_DEFINE_CONST_STATICMETHOD_OBJ(moduos_internal_flash_ilistdir_static_class_obj, &moduos_internal_flash_ilistdir_obj);
 
-mp_obj_t moduos_flashfs_mkdir(mp_obj_t path_in) {
+mp_obj_t moduos_internal_flash_mkdir(mp_obj_t path_in) {
     // ========================================
     // Creates a folder.
     // Args:
@@ -198,10 +200,10 @@ mp_obj_t moduos_flashfs_mkdir(mp_obj_t path_in) {
     return mp_const_none;
 }
 
-MP_DEFINE_CONST_FUN_OBJ_1(moduos_flashfs_mkdir_obj, moduos_flashfs_mkdir);
-MP_DEFINE_CONST_STATICMETHOD_OBJ(moduos_flashfs_mkdir_static_class_obj, &moduos_flashfs_mkdir_obj);
+MP_DEFINE_CONST_FUN_OBJ_1(moduos_internal_flash_mkdir_obj, moduos_internal_flash_mkdir);
+MP_DEFINE_CONST_STATICMETHOD_OBJ(moduos_internal_flash_mkdir_static_class_obj, &moduos_internal_flash_mkdir_obj);
 
-mp_obj_t moduos_flashfs_remove(mp_obj_t path_in) {
+mp_obj_t moduos_internal_flash_remove(mp_obj_t path_in) {
     // ========================================
     // Removes a file.
     // Args:
@@ -214,10 +216,10 @@ mp_obj_t moduos_flashfs_remove(mp_obj_t path_in) {
     return mp_const_none;
 }
 
-MP_DEFINE_CONST_FUN_OBJ_1(moduos_flashfs_remove_obj, moduos_flashfs_remove);
-MP_DEFINE_CONST_STATICMETHOD_OBJ(moduos_flashfs_remove_static_class_obj, &moduos_flashfs_remove_obj);
+MP_DEFINE_CONST_FUN_OBJ_1(moduos_internal_flash_remove_obj, moduos_internal_flash_remove);
+MP_DEFINE_CONST_STATICMETHOD_OBJ(moduos_internal_flash_remove_static_class_obj, &moduos_internal_flash_remove_obj);
 
-mp_obj_t moduos_flashfs_rename(mp_obj_t old_path_in, mp_obj_t new_path_in) {
+mp_obj_t moduos_internal_flash_rename(mp_obj_t old_path_in, mp_obj_t new_path_in) {
     // ========================================
     // Renames a file.
     // Args:
@@ -232,10 +234,10 @@ mp_obj_t moduos_flashfs_rename(mp_obj_t old_path_in, mp_obj_t new_path_in) {
     return mp_const_none;
 }
 
-MP_DEFINE_CONST_FUN_OBJ_2(moduos_flashfs_rename_obj, moduos_flashfs_rename);
-MP_DEFINE_CONST_STATICMETHOD_OBJ(moduos_flashfs_rename_static_class_obj, &moduos_flashfs_rename_obj);
+MP_DEFINE_CONST_FUN_OBJ_2(moduos_internal_flash_rename_obj, moduos_internal_flash_rename);
+MP_DEFINE_CONST_STATICMETHOD_OBJ(moduos_internal_flash_rename_static_class_obj, &moduos_internal_flash_rename_obj);
 
-mp_obj_t moduos_flashfs_rmdir(mp_obj_t path_in) {
+mp_obj_t moduos_internal_flash_rmdir(mp_obj_t path_in) {
     // ========================================
     // Removes a folder.
     // Args:
@@ -248,10 +250,10 @@ mp_obj_t moduos_flashfs_rmdir(mp_obj_t path_in) {
     return mp_const_none;
 }
 
-MP_DEFINE_CONST_FUN_OBJ_1(moduos_flashfs_rmdir_obj, moduos_flashfs_rmdir);
-MP_DEFINE_CONST_STATICMETHOD_OBJ(moduos_flashfs_rmdir_static_class_obj, &moduos_flashfs_rmdir_obj);
+MP_DEFINE_CONST_FUN_OBJ_1(moduos_internal_flash_rmdir_obj, moduos_internal_flash_rmdir);
+MP_DEFINE_CONST_STATICMETHOD_OBJ(moduos_internal_flash_rmdir_static_class_obj, &moduos_internal_flash_rmdir_obj);
 
-mp_obj_t moduos_flashfs_chdir(mp_obj_t path_in) {
+mp_obj_t moduos_internal_flash_chdir(mp_obj_t path_in) {
     // ========================================
     // Changes a folder.
     // Args:
@@ -264,10 +266,10 @@ mp_obj_t moduos_flashfs_chdir(mp_obj_t path_in) {
     return mp_const_none;
 }
 
-MP_DEFINE_CONST_FUN_OBJ_1(moduos_flashfs_chdir_obj, moduos_flashfs_chdir);
-MP_DEFINE_CONST_STATICMETHOD_OBJ(moduos_flashfs_chdir_static_class_obj, &moduos_flashfs_chdir_obj);
+MP_DEFINE_CONST_FUN_OBJ_1(moduos_internal_flash_chdir_obj, moduos_internal_flash_chdir);
+MP_DEFINE_CONST_STATICMETHOD_OBJ(moduos_internal_flash_chdir_static_class_obj, &moduos_internal_flash_chdir_obj);
 
-mp_obj_t moduos_flashfs_getcwd(void) {
+mp_obj_t moduos_internal_flash_getcwd(void) {
     // ========================================
     // Retrieves current folder.
     // ========================================
@@ -278,29 +280,51 @@ mp_obj_t moduos_flashfs_getcwd(void) {
     return mp_obj_new_str(dir, strlen(dir));
 }
 
-MP_DEFINE_CONST_FUN_OBJ_0(moduos_flashfs_getcwd_obj, moduos_flashfs_getcwd);
-MP_DEFINE_CONST_STATICMETHOD_OBJ(moduos_flashfs_getcwd_static_class_obj, &moduos_flashfs_getcwd_obj);
+MP_DEFINE_CONST_FUN_OBJ_0(moduos_internal_flash_getcwd_obj, moduos_internal_flash_getcwd);
+MP_DEFINE_CONST_STATICMETHOD_OBJ(moduos_internal_flash_getcwd_static_class_obj, &moduos_internal_flash_getcwd_obj);
 
-mp_obj_t moduos_flashfs_stat(mp_obj_t path_in) {
+mp_obj_t moduos_internal_flash_stat(mp_obj_t path_in) {
     // ========================================
     // Stats the file system.
     // ========================================
     const char* path = mp_obj_str_get_str(path_in);
-    API_FS_INFO info;
-    int32_t ret = API_FS_GetFSInfo(path, &info);
-    if (ret != 0)
+    // check if folder
+    int32_t size = 0;
+    Dir_t* folder = NULL;
+    mp_int_t mode = 0;
+    int32_t fd = NULL;
+
+    if ((folder = API_FS_OpenDir(path))) {
+        API_FS_CloseDir(folder);
+        mode = MP_S_IFDIR;
+
+    } else if ((fd = API_FS_Open(path, FS_O_RDONLY, 0)) >= 0) {
+        API_FS_Close(fd);
+        size = API_FS_GetFileSize(fd);
+        mode = MP_S_IFREG;
+
+    } else
         mp_raise_OSError(MP_EIO);
-    mp_obj_t tuple[2] = {
-        mp_obj_new_int(info.totalSize),
-        mp_obj_new_int(info.usedSize),
+
+    mp_obj_t tuple[10] = {
+        MP_OBJ_NEW_SMALL_INT(mode),
+        MP_OBJ_NEW_SMALL_INT(0),
+        MP_OBJ_NEW_SMALL_INT(0),
+        MP_OBJ_NEW_SMALL_INT(0),
+        MP_OBJ_NEW_SMALL_INT(0),
+        MP_OBJ_NEW_SMALL_INT(0),
+        mp_obj_new_int(size),
+        MP_OBJ_NEW_SMALL_INT(0x2821),
+        MP_OBJ_NEW_SMALL_INT(0x2821),
+        MP_OBJ_NEW_SMALL_INT(0x2821),
     };
-    return mp_obj_new_tuple(2, tuple);
+    return mp_obj_new_tuple(10, tuple);
 }
 
-MP_DEFINE_CONST_FUN_OBJ_1(moduos_flashfs_stat_obj, moduos_flashfs_stat);
-MP_DEFINE_CONST_STATICMETHOD_OBJ(moduos_flashfs_stat_static_class_obj, &moduos_flashfs_stat_obj);
+MP_DEFINE_CONST_FUN_OBJ_1(moduos_internal_flash_stat_obj, moduos_internal_flash_stat);
+MP_DEFINE_CONST_STATICMETHOD_OBJ(moduos_internal_flash_stat_static_class_obj, &moduos_internal_flash_stat_obj);
 
-mp_obj_t moduos_flashfs_statvfs(mp_obj_t path_in) {
+mp_obj_t moduos_internal_flash_statvfs(mp_obj_t path_in) {
     // ========================================
     // Stats the file system.
     // ========================================
@@ -316,29 +340,32 @@ mp_obj_t moduos_flashfs_statvfs(mp_obj_t path_in) {
     return mp_obj_new_tuple(2, tuple);
 }
 
-MP_DEFINE_CONST_FUN_OBJ_1(moduos_flashfs_statvfs_obj, moduos_flashfs_statvfs);
-MP_DEFINE_CONST_STATICMETHOD_OBJ(moduos_flashfs_statvfs_static_class_obj, &moduos_flashfs_statvfs_obj);
-
-STATIC const mp_rom_map_elem_t flashfs_locals_dict_table[] = {
-    { MP_ROM_QSTR(MP_QSTR_mount), MP_ROM_PTR(&moduos_flashfs_mount_static_class_obj) },
-    { MP_ROM_QSTR(MP_QSTR_umount), MP_ROM_PTR(&moduos_flashfs_umount_static_class_obj) },
-    { MP_ROM_QSTR(MP_QSTR_ilistdir), MP_ROM_PTR(&moduos_flashfs_ilistdir_static_class_obj) },
-    { MP_ROM_QSTR(MP_QSTR_mkdir), MP_ROM_PTR(&moduos_flashfs_mkdir_static_class_obj) },
-    { MP_ROM_QSTR(MP_QSTR_remove), MP_ROM_PTR(&moduos_flashfs_remove_static_class_obj) },
-    { MP_ROM_QSTR(MP_QSTR_rename), MP_ROM_PTR(&moduos_flashfs_rename_static_class_obj) },
-    { MP_ROM_QSTR(MP_QSTR_rmdir), MP_ROM_PTR(&moduos_flashfs_rmdir_static_class_obj) },
-    { MP_ROM_QSTR(MP_QSTR_chdir), MP_ROM_PTR(&moduos_flashfs_chdir_static_class_obj) },
-    { MP_ROM_QSTR(MP_QSTR_getcwd), MP_ROM_PTR(&moduos_flashfs_getcwd_static_class_obj) },
-    { MP_ROM_QSTR(MP_QSTR_stat), MP_ROM_PTR(&moduos_flashfs_stat_static_class_obj) },
-    { MP_ROM_QSTR(MP_QSTR_statvfs), MP_ROM_PTR(&moduos_flashfs_statvfs_static_class_obj) },
+MP_DEFINE_CONST_FUN_OBJ_1(moduos_internal_flash_statvfs_obj, moduos_internal_flash_statvfs);
+MP_DEFINE_CONST_STATICMETHOD_OBJ(moduos_internal_flash_statvfs_static_class_obj, &moduos_internal_flash_statvfs_obj);
+
+MP_DEFINE_CONST_STATICMETHOD_OBJ(moduos_internal_flash_open_static_class_obj, &internal_flash_open_obj);
+
+STATIC const mp_rom_map_elem_t internal_flash_locals_dict_table[] = {
+    { MP_ROM_QSTR(MP_QSTR_open), MP_ROM_PTR(&moduos_internal_flash_open_static_class_obj) },
+    { MP_ROM_QSTR(MP_QSTR_mount), MP_ROM_PTR(&moduos_internal_flash_mount_static_class_obj) },
+    { MP_ROM_QSTR(MP_QSTR_umount), MP_ROM_PTR(&moduos_internal_flash_umount_static_class_obj) },
+    { MP_ROM_QSTR(MP_QSTR_ilistdir), MP_ROM_PTR(&moduos_internal_flash_ilistdir_static_class_obj) },
+    { MP_ROM_QSTR(MP_QSTR_mkdir), MP_ROM_PTR(&moduos_internal_flash_mkdir_static_class_obj) },
+    { MP_ROM_QSTR(MP_QSTR_remove), MP_ROM_PTR(&moduos_internal_flash_remove_static_class_obj) },
+    { MP_ROM_QSTR(MP_QSTR_rename), MP_ROM_PTR(&moduos_internal_flash_rename_static_class_obj) },
+    { MP_ROM_QSTR(MP_QSTR_rmdir), MP_ROM_PTR(&moduos_internal_flash_rmdir_static_class_obj) },
+    { MP_ROM_QSTR(MP_QSTR_chdir), MP_ROM_PTR(&moduos_internal_flash_chdir_static_class_obj) },
+    { MP_ROM_QSTR(MP_QSTR_getcwd), MP_ROM_PTR(&moduos_internal_flash_getcwd_static_class_obj) },
+    { MP_ROM_QSTR(MP_QSTR_stat), MP_ROM_PTR(&moduos_internal_flash_stat_static_class_obj) },
+    { MP_ROM_QSTR(MP_QSTR_statvfs), MP_ROM_PTR(&moduos_internal_flash_statvfs_static_class_obj) },
 };
 
-STATIC MP_DEFINE_CONST_DICT(flashfs_locals_dict, flashfs_locals_dict_table);
+STATIC MP_DEFINE_CONST_DICT(internal_flash_locals_dict, internal_flash_locals_dict_table);
 
-STATIC const mp_obj_type_t moduos_flashfs_type = {
+STATIC const mp_obj_type_t moduos_internal_flash_type = {
     { &mp_type_type },
-    .name = MP_QSTR_flashfs,
-    .locals_dict = (mp_obj_dict_t*)&flashfs_locals_dict,
+    .name = MP_QSTR_internal_flash,
+    .locals_dict = (mp_obj_dict_t*)&internal_flash_locals_dict,
 };
 
 #if MICROPY_PY_OS_DUPTERM
@@ -360,7 +387,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(os_dupterm_notify_obj, os_dupterm_notify);
 STATIC const mp_rom_map_elem_t os_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_uos) },
 
-    { MP_OBJ_NEW_QSTR(MP_QSTR_flashfs), (mp_obj_t)MP_ROM_PTR(&moduos_flashfs_type) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_internal_flash), (mp_obj_t)MP_ROM_PTR(&moduos_internal_flash_type) },
 
     { MP_ROM_QSTR(MP_QSTR_uname), MP_ROM_PTR(&os_uname_obj) },
     { MP_ROM_QSTR(MP_QSTR_urandom), MP_ROM_PTR(&os_urandom_obj) },
diff --git a/ports/gprs_a9/moduos.h b/ports/gprs_a9/moduos.h
index 3f5e1d9c2d3a2..d0702da1b41f0 100644
--- a/ports/gprs_a9/moduos.h
+++ b/ports/gprs_a9/moduos.h
@@ -26,6 +26,12 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+#include "py/runtime.h"
 
 void moduos_init0(void);
 
+extern const mp_obj_type_t mp_type_internal_flash_fileio;
+extern const mp_obj_type_t mp_type_internal_flash_textio;
+
+MP_DECLARE_CONST_FUN_OBJ_KW(internal_flash_open_obj);
+

From 2a68bd7d5b154b13acc52ab12d11345de4c40e25 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Wed, 25 Dec 2019 23:14:57 +0100
Subject: [PATCH 3382/3533] Print warnings whenever init fails

---
 ports/gprs_a9/modcellular.c | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/ports/gprs_a9/modcellular.c b/ports/gprs_a9/modcellular.c
index daea94b47d110..816ca7a21c555 100644
--- a/ports/gprs_a9/modcellular.c
+++ b/ports/gprs_a9/modcellular.c
@@ -162,9 +162,8 @@ void modcellular_init0(void) {
     Network_SetFlightMode(0);
 
     // Set SMS storage
-    if (!SMS_SetFormat(SMS_FORMAT_TEXT, SIM0)) {
-        mp_raise_CellularError("Failed to set SMS format");
-    } 
+    if (!SMS_SetFormat(SMS_FORMAT_TEXT, SIM0))
+        mp_printf(&mp_plat_print, "Warning: modcellular_init0 failed to reset SMS format\n");
 
     SMS_Parameter_t smsParam = {
         .fo = 17 , // stadard values
@@ -173,13 +172,11 @@ void modcellular_init0(void) {
         .dcs= 8  , // 0:English 7bit, 4:English 8 bit, 8:Unicode 2 Bytes
     };
 
-    if (!SMS_SetParameter(&smsParam, SIM0)) {
-        mp_raise_CellularError("Failed to set SMS parameters");
-    }
+    if (!SMS_SetParameter(&smsParam, SIM0))
+        mp_printf(&mp_plat_print, "Warning: modcellular_init0 failed to reset SMS parameters\n");
 
-    if (!SMS_SetNewMessageStorage(SMS_STORAGE_SIM_CARD)) {
-        mp_raise_CellularError("Failed to set SMS storage in the SIM card");
-    }
+    if (!SMS_SetNewMessageStorage(SMS_STORAGE_SIM_CARD))
+        mp_printf(&mp_plat_print, "Warning: modcellular_init0 failed to reset SMS storage\n");
 }
 
 // ----------
@@ -1097,7 +1094,6 @@ STATIC mp_obj_t modcellular_dial(mp_obj_t tn_in) {
     // ========================================
     if (mp_obj_is_str(tn_in)) {
         const char* tn = mp_obj_str_get_str(tn_in);
-        mp_printf(&mp_plat_print, "calling %s\n", tn);
         if (!CALL_Dial(tn)) {
             mp_raise_CellularError("Failed to initiate an outgoing call");
         }

From 86efe8918e9c36597a49afc69685e7a9345928ba Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Wed, 25 Dec 2019 23:15:36 +0100
Subject: [PATCH 3383/3533] Small changes: tests, indents

---
 ports/gprs_a9/fatal.c       |   2 +-
 ports/gprs_a9/frozentest.py | 188 ++++++++++++++++++------------------
 2 files changed, 95 insertions(+), 95 deletions(-)

diff --git a/ports/gprs_a9/fatal.c b/ports/gprs_a9/fatal.c
index 4ac7fc89a782e..5c20d57dc8561 100644
--- a/ports/gprs_a9/fatal.c
+++ b/ports/gprs_a9/fatal.c
@@ -41,7 +41,7 @@
 static const char msg1[] =
     "\r\n==============================="
     "\r\nMicropython experienced a fatal"
-    "\r\n   error and will be halted."
+    "\r\nerror and will be halted."
     "\r\n"
     "\r\n  reason: ";
 static const char msg2[] =
diff --git a/ports/gprs_a9/frozentest.py b/ports/gprs_a9/frozentest.py
index 419922bfba74f..ebde647e1ae9c 100644
--- a/ports/gprs_a9/frozentest.py
+++ b/ports/gprs_a9/frozentest.py
@@ -1,9 +1,8 @@
-# Tests sending SMS
+# Settings
 test_send_sms = None
 # test_send_sms = "8800"
-
-# Tests filesystem manipulations
-test_fs = True
+test_filesystem = True
+test_gprs = False
 
 # Operator name expected
 opname_expected = "KPNNL"
@@ -39,7 +38,7 @@
 print("Free:", mem_free, "alloc:", mem_alloc, "total:", mem_tot)
 assert mem_tot > 512e3
 
-if test_fs:
+if test_filesystem:
     print("================")
     print("filesystem")
     print("================")
@@ -310,95 +309,96 @@
         sms = cel.SMS(test_send_sms, "hello")
         sms.send()
 
-    print("----------------")
-    print("GPRS")
-    print("----------------")
-
-    print("Waiting 5 secs ...")
-    time.sleep(5)
-
-    # LEBARA NL credentials
-    assert cel.gprs("internet", "", "")
-
-    cb = cel.network_status_changed()
-    print("Status changed:", cb, "->", cel.get_network_status())
-    assert cb
-
-    import socket as sock
-    loc_ip = sock.get_local_ip()
-    print("Local IP:", loc_ip)
-    assert len(loc_ip.split(".")) == 4
-
-    assert sock.get_num_open() == 0
-
-    host = "httpstat.us"
-    port = 80
-    host_ai = sock.getaddrinfo(host, port)[0]
-    print("Addrinfo:", host_ai)
-    assert host_ai[:3] == (sock.AF_INET, sock.SOCK_STREAM, sock.IPPROTO_TCP)
-    assert host_ai[3] == host
-    assert len(host_ai[4][0].split(".")) == 4
-    assert host_ai[4][1] == 80
-
-    s = sock.socket()
-    s.connect((host, port))
-    assert sock.get_num_open() == 1
-    assert s.makefile() == s
-
-    message = "GET /200 HTTP/1.1\r\nHost: {}\r\nConnection: close\r\n\r\n"
-    response_expected = b"HTTP/1.1 200 OK\r\n"
-    message_f = message.format(host)
-    bytes_sent = s.send(message_f[:10])
-    bytes_sent += s.write(message_f[10:20])
-    bytes_sent += s.sendto(message_f[20:30], ("23.99.0.12", 80))
-    print("Socket sent:", bytes_sent)
-    assert bytes_sent == 30
-    s.sendall(message_f[30:])
-
-    # Chunk 1: recv
-    response = s.recv(3)
-    # Chunk 2: read
-    response += s.read(3)
-    # Chunk 3: readinto
-    chunk3 = bytearray(len(response_expected) - 6)
-    s.readinto(chunk3)
-    response += chunk3
-    print("Socket recvd:", response)
-    assert response == response_expected
-
-    line = s.readline()
-    print("... recvd:", line)
-    assert len(line) > 0
-    s.close()
-
-    s = sock.socket()
-    s.connect((host, port))
-    bytes_sent = s.sendto(message_f, ("127.0.0.1", 80))
-    print("Socket sent (2):", bytes_sent)
-    assert bytes_sent == len(message_f)
-
-    response, fr = s.recvfrom(len(response_expected))
-    print("Socket recvd (2):", response, fr)
-    assert response == response_expected
-    assert fr == host_ai[4]
-    del s
-    gc.collect()
-
-    import ssl
-    port = 443
-    s = sock.socket()
-    s.connect((host, port))
-    s = ssl.wrap_socket(s)
-    s.write(message_f)
-    response = s.read(len(response_expected))
-    print("SSL socket recvd:", response)
-    assert response == response_expected
-    s.close()
-
-    assert sock.get_num_open() == 0
-
-    assert cel.gprs()
-    assert not cel.gprs(False)
+    if test_gprs:
+        print("----------------")
+        print("GPRS")
+        print("----------------")
+
+        print("Waiting 5 secs ...")
+        time.sleep(5)
+
+        # LEBARA NL credentials
+        assert cel.gprs("internet", "", "")
+
+        cb = cel.network_status_changed()
+        print("Status changed:", cb, "->", cel.get_network_status())
+        assert cb
+
+        import socket as sock
+        loc_ip = sock.get_local_ip()
+        print("Local IP:", loc_ip)
+        assert len(loc_ip.split(".")) == 4
+
+        assert sock.get_num_open() == 0
+
+        host = "httpstat.us"
+        port = 80
+        host_ai = sock.getaddrinfo(host, port)[0]
+        print("Addrinfo:", host_ai)
+        assert host_ai[:3] == (sock.AF_INET, sock.SOCK_STREAM, sock.IPPROTO_TCP)
+        assert host_ai[3] == host
+        assert len(host_ai[4][0].split(".")) == 4
+        assert host_ai[4][1] == 80
+
+        s = sock.socket()
+        s.connect((host, port))
+        assert sock.get_num_open() == 1
+        assert s.makefile() == s
+
+        message = "GET /200 HTTP/1.1\r\nHost: {}\r\nConnection: close\r\n\r\n"
+        response_expected = b"HTTP/1.1 200 OK\r\n"
+        message_f = message.format(host)
+        bytes_sent = s.send(message_f[:10])
+        bytes_sent += s.write(message_f[10:20])
+        bytes_sent += s.sendto(message_f[20:30], ("23.99.0.12", 80))
+        print("Socket sent:", bytes_sent)
+        assert bytes_sent == 30
+        s.sendall(message_f[30:])
+
+        # Chunk 1: recv
+        response = s.recv(3)
+        # Chunk 2: read
+        response += s.read(3)
+        # Chunk 3: readinto
+        chunk3 = bytearray(len(response_expected) - 6)
+        s.readinto(chunk3)
+        response += chunk3
+        print("Socket recvd:", response)
+        assert response == response_expected
+
+        line = s.readline()
+        print("... recvd:", line)
+        assert len(line) > 0
+        s.close()
+
+        s = sock.socket()
+        s.connect((host, port))
+        bytes_sent = s.sendto(message_f, ("127.0.0.1", 80))
+        print("Socket sent (2):", bytes_sent)
+        assert bytes_sent == len(message_f)
+
+        response, fr = s.recvfrom(len(response_expected))
+        print("Socket recvd (2):", response, fr)
+        assert response == response_expected
+        assert fr == host_ai[4]
+        del s
+        gc.collect()
+
+        import ssl
+        port = 443
+        s = sock.socket()
+        s.connect((host, port))
+        s = ssl.wrap_socket(s)
+        s.write(message_f)
+        response = s.read(len(response_expected))
+        print("SSL socket recvd:", response)
+        assert response == response_expected
+        s.close()
+
+        assert sock.get_num_open() == 0
+
+        assert cel.gprs()
+        assert not cel.gprs(False)
 
 print("================")
 print("machine")

From 422139b99d7d65887b1059e592122368f838babf Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Thu, 26 Dec 2019 23:06:00 +0100
Subject: [PATCH 3384/3533] Remove agps

[skip ci]
---
 ports/gprs_a9/README.md  |  4 +---
 ports/gprs_a9/py/agps.py | 32 --------------------------------
 2 files changed, 1 insertion(+), 35 deletions(-)
 delete mode 100644 ports/gprs_a9/py/agps.py

diff --git a/ports/gprs_a9/README.md b/ports/gprs_a9/README.md
index f797ea51cf0c0..4eb5e416e3dd3 100644
--- a/ports/gprs_a9/README.md
+++ b/ports/gprs_a9/README.md
@@ -234,9 +234,7 @@ ST7735 displays over software SPI.
 
 Modules located in the `py` folder.
 
-* `agps`: Assisted GPS services.
-  * `get_location_radiocells()`: uses [radiocells.org](https://radiocells.org/)
-  * `get_location_opencellid(api_key: str)`: uses [opencellid.org](http://opencellid.org) (registration required)
+* [`agps`](https://github.com/pulkin/mpy-agps): Assisted GPS services.
 
 ## Notes ##
 
diff --git a/ports/gprs_a9/py/agps.py b/ports/gprs_a9/py/agps.py
deleted file mode 100644
index 91ad0b705bb6a..0000000000000
--- a/ports/gprs_a9/py/agps.py
+++ /dev/null
@@ -1,32 +0,0 @@
-import urequests
-import cellular
-
-def get_location_radiocells():
-    s = cellular.stations()
-    c = dict(cellTowers=list(dict(cellId=cell_id, locationAreaCode=lac, mobileCountryCode=mcc, mobileNetworkCode=mnc) for mcc, mnc, lac, cell_id, bsic, rx_full, rx_sub, arfcn in s))
-    r = urequests.post('https://backend.radiocells.org/', json=c)
-    json = r.json()
-    if "location" in json:
-        return json["location"]["lat"], json["location"]["lng"]
-
-def get_location_opencellid(api_key):
-    s = cellular.stations()
-    by_op = {}
-    best = None
-    best_count = 0
-    for mcc, mnc, lac, cell_id, bsic, rx_full, rx_sub, arfcn in s:
-        grp = mcc, mnc
-        if grp not in by_op:
-            by_op[grp] = []
-        by_op[grp].append(dict(cid=cell_id, lac=lac))
-        count = len(by_op[grp])
-        if best is None or count > best_count:
-            best_count = count
-            best = grp
-
-    c = dict(token=api_key, radio="gsm", mcc=best[0], mnc=best[1], cells=by_op[best])
-    r = urequests.post('https://eu1.unwiredlabs.com/v2/process.php', json=c)
-    json = r.json()
-    if "status" in json and json["status"] == "ok":
-        return json["lat"], json["lon"]
-

From d044f0cbf8d578acbe8a8fcf6aebb7a659ae0395 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Thu, 26 Dec 2019 23:13:34 +0100
Subject: [PATCH 3385/3533] Add blink in the example

[skip ci]
---
 ports/gprs_a9/README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ports/gprs_a9/README.md b/ports/gprs_a9/README.md
index 4eb5e416e3dd3..f55b710762d66 100644
--- a/ports/gprs_a9/README.md
+++ b/ports/gprs_a9/README.md
@@ -61,6 +61,8 @@ ampy --port /dev/ttyUSB1 put frozentest.py
 ```python
 >>> help()
 >>> import frozentest
+>>> import blink
+blink.blink(1)
 ```
 
 ## Functionality

From 107593b086a582985b90a9a8d2c11b47358a99ad Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sat, 28 Dec 2019 19:25:07 +0100
Subject: [PATCH 3386/3533] Fix #21

---
 ports/gprs_a9/main.c         | 6 +++++-
 ports/gprs_a9/qstrdefsport.h | 3 ++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ports/gprs_a9/main.c b/ports/gprs_a9/main.c
index 74b65290ac1f3..afb8965674782 100644
--- a/ports/gprs_a9/main.c
+++ b/ports/gprs_a9/main.c
@@ -176,7 +176,11 @@ void MicroPyTask(void *pData) {
     mp_init();
     moduos_init0();
     modcellular_init0();
-
+    mp_obj_list_init(mp_sys_path, 0);
+    mp_obj_list_append(mp_sys_path, MP_OBJ_NEW_QSTR(MP_QSTR_)); // current dir (or base dir of the script)
+    mp_obj_list_append(mp_sys_path, MP_OBJ_NEW_QSTR(MP_QSTR__slash_lib));
+    mp_obj_list_append(mp_sys_path, MP_OBJ_NEW_QSTR(MP_QSTR__slash_));
+    mp_obj_list_init(mp_sys_argv, 0);
     // Startup scripts
     pyexec_frozen_module("_boot.py");
     int file_descriptor;
diff --git a/ports/gprs_a9/qstrdefsport.h b/ports/gprs_a9/qstrdefsport.h
index 9c35a4f964ee0..c97fc37146778 100644
--- a/ports/gprs_a9/qstrdefsport.h
+++ b/ports/gprs_a9/qstrdefsport.h
@@ -1,2 +1,3 @@
 // qstrs specific to this port
-Q(hello)
+Q(/lib)
+

From eaccc7d6692c6f786e40173e97359cd1a7ea2296 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sat, 28 Dec 2019 21:27:37 +0100
Subject: [PATCH 3387/3533] Add proper error codes for fs routines

---
 ports/gprs_a9/file_io.c |  24 +++--
 ports/gprs_a9/moduos.c  | 216 ++++++++++++++++++++++++++++++++++------
 ports/gprs_a9/moduos.h  |   2 +
 3 files changed, 199 insertions(+), 43 deletions(-)

diff --git a/ports/gprs_a9/file_io.c b/ports/gprs_a9/file_io.c
index 2a36167db7e43..caf14fb30a620 100644
--- a/ports/gprs_a9/file_io.c
+++ b/ports/gprs_a9/file_io.c
@@ -56,7 +56,7 @@ STATIC mp_uint_t internal_flash_file_obj_read(mp_obj_t self_in, void *buf, mp_ui
     internal_flash_file_obj_t *self = MP_OBJ_TO_PTR(self_in);
     int32_t ret = API_FS_Read(self->fd, buf, size);
     if (ret < 0) {
-        *errcode = MP_EIO;
+        *errcode = translate_io_errno(ret);
         return MP_STREAM_ERROR;
     }
     return (mp_uint_t) ret;
@@ -69,7 +69,7 @@ STATIC mp_uint_t internal_flash_file_obj_write(mp_obj_t self_in, const void *buf
     internal_flash_file_obj_t *self = MP_OBJ_TO_PTR(self_in);
     int32_t ret = API_FS_Write(self->fd, (uint8_t*) buf, size);
     if (ret < 0) {
-        *errcode = MP_EIO;
+        *errcode = translate_io_errno(ret);
         return MP_STREAM_ERROR;
     }
     if (ret != size) {
@@ -110,13 +110,18 @@ STATIC mp_uint_t internal_flash_file_obj_ioctl(mp_obj_t o_in, mp_uint_t request,
                 break;
         }
 
+        if (ret < 0) {
+            *errcode = translate_io_errno((int) ret);
+            return MP_STREAM_ERROR;
+        }
+
         s->offset = ret;
         return 0;
 
     } else if (request == MP_STREAM_FLUSH) {
         uint32_t ret = API_FS_Flush(self->fd);
-        if (ret != 0) {
-            *errcode = MP_EIO;
+        if (ret < 0) {
+            *errcode = translate_io_errno(ret);
             return MP_STREAM_ERROR;
         }
         return 0;
@@ -125,8 +130,8 @@ STATIC mp_uint_t internal_flash_file_obj_ioctl(mp_obj_t o_in, mp_uint_t request,
         // if fs==NULL then the file is closed and in that case this method is a no-op
         if (self->fd > 0) {
             int32_t ret = API_FS_Close(self->fd);
-            if (ret != 0) {
-                *errcode = MP_EIO;
+            if (ret < 0) {
+                *errcode = translate_io_errno(ret);
                 return MP_STREAM_ERROR;
             } else
                 self->fd = 0;
@@ -183,10 +188,9 @@ STATIC mp_obj_t internal_flash_file_open(const char* file_name, const mp_obj_typ
     internal_flash_file_obj_t *o = m_new_obj_with_finaliser(internal_flash_file_obj_t);
     o->base.type = type;
 
-    int32_t fd = API_FS_Open(file_name, mode, 0);
-    if (fd <= 0) {
-        mp_raise_OSError(MP_EIO);
-    }
+    int32_t fd = maybe_raise_FSError(API_FS_Open(file_name, mode, 0));
+    if (fd <= 0)
+        mp_raise_OSError(MP_ENOENT);
     o->fd = fd;
     return MP_OBJ_FROM_PTR(o);
 }
diff --git a/ports/gprs_a9/moduos.c b/ports/gprs_a9/moduos.c
index b0234b0d317b4..346a60de6391c 100644
--- a/ports/gprs_a9/moduos.c
+++ b/ports/gprs_a9/moduos.c
@@ -45,11 +45,176 @@
 #include "api_fs.h"
 #include "api_hal_spi.h"
 
+#define PATH_IS_FILE 1
+#define PATH_IS_DIR 2
+
 extern const mp_obj_type_t mp_fat_vfs_type;
 
+mp_int_t translate_io_errno(int err) {
+    switch (err) {
+        case ERR_FS_IS_DIRECTORY:
+            return MP_EISDIR;
+        case ERR_FS_NOT_DIRECTORY:
+            return MP_ENOTDIR;
+        case ERR_FS_NO_DIR_ENTRY:
+            return MP_ENOENT;
+        case ERR_FS_OPERATION_NOT_GRANTED:
+            return MP_EIO; // TODO: translate better?
+        case ERR_FS_DIR_NOT_EMPTY:
+            return MP_EBUSY; // TODO: translate better?
+        case ERR_FS_FDS_MAX:
+            return MP_EIO; // TODO: translate better?
+        case ERR_FS_PROCESS_FILE_MAX:
+            return MP_EMFILE;
+        case ERR_FS_FILE_EXIST:
+            return MP_EEXIST;
+        case ERR_FS_NO_BASENAME:
+            return MP_ENOENT;
+        case ERR_FS_BAD_FD:
+            return MP_EBADF;
+        case ERR_FS_NO_MORE_FILES:
+            return MP_ENOENT; // TODO: translate better?
+        case ERR_FS_HAS_MOUNTED:
+            return MP_EEXIST; // TODO: translate better?
+        case ERR_FS_MOUNTED_FS_MAX:
+            return MP_EMFILE;
+        case ERR_FS_UNKNOWN_FILESYSTEM:
+            return MP_EIO;
+        case ERR_FS_INVALID_DIR_ENTRY:
+            return MP_EPERM; // TODO: translate better?
+        case ERR_FS_INVALID_PARAMETER:
+            return MP_EINVAL;
+        case ERR_FS_NOT_SUPPORT:
+            return MP_EIO;
+        case ERR_FS_UNMOUNT_FAILED:
+            return MP_EBUSY;
+        case ERR_FS_NO_MORE_MEMORY:
+            return MP_ENOMEM;
+        case ERR_FS_DEVICE_NOT_REGISTER:
+            return MP_ENXIO;
+        case ERR_FS_DISK_FULL:
+            return MP_ENOSPC;
+        case ERR_FS_NOT_FORMAT:
+            return MP_EIO;
+        case ERR_FS_HAS_FORMATED:
+            return MP_EIO;
+        case ERR_FS_NOT_FIND_SB:
+            return MP_EIO;
+        case ERR_FS_DEVICE_BUSY:
+            return MP_EBUSY;
+        case ERR_FS_OPEN_DEV_FAILED:
+            return MP_EIO;
+        case ERR_FS_ROOT_FULL:
+            return MP_EIO; // TODO: wtf is this?
+        case ERR_FS_ACCESS_REG_FAILED:
+            return MP_EIO; // TODO: poor translation here.
+        case ERR_FS_PATHNAME_PARSE_FAILED:
+            return MP_EINVAL;
+        case ERR_FS_READ_DIR_FAILED:
+            return MP_EIO;
+        case ERR_FS_MOUNT_READ_ROOT_INODE_FAILED:
+            return MP_EIO;
+        case ERR_FS_INVALID_DEV_NUMBER:
+            return MP_ENODEV;
+        case ERR_FS_RENAME_DIFF_PATH:
+            return MP_EISDIR;
+        case ERR_FS_FORMAT_MOUNTING_DEVICE:
+            return MP_EBUSY;
+        case ERR_FS_DATA_DESTROY:
+            return MP_EIO;
+        case ERR_FS_READ_SECTOR_FAILED:
+            return MP_EIO;
+        case ERR_FS_WRITE_SECTOR_FAILED:
+            return MP_EIO;
+        case ERR_FS_READ_FILE_EXCEED:
+            return MP_EIO;
+        case ERR_FS_WRITE_FILE_EXCEED:
+            return MP_EIO;
+        case ERR_FS_FILE_TOO_MORE:
+            return MP_EINVAL;
+        case ERR_FS_FILE_NOT_EXIST:
+            return MP_ENOENT;
+        case ERR_FS_DEVICE_DIFF:
+            return MP_EACCES;
+        case ERR_FS_GET_DEV_INFO_FAILED:
+            return MP_EIO;
+        case ERR_FS_NO_MORE_SB_ITEM:
+            return MP_EIO;
+        case ERR_FS_NOT_MOUNT:
+            return MP_ENXIO;
+        case ERR_FS_NAME_BUFFER_TOO_SHORT:
+            return MP_EINVAL;
+        case ERR_FS_NOT_REGULAR:
+            return MP_EACCES;
+        case ERR_FS_VOLLAB_IS_NULL:
+            return MP_EACCES;
+        default:
+            return 0;
+    }
+}
+
+int maybe_raise_FSError(int errno) {
+    if (errno < -4200000)
+        mp_raise_OSError(translate_io_errno(errno));
+    if (errno < 0)
+        mp_raise_OSError(MP_EIO);
+    return errno;
+}
+
+char path_exists(const char* path) {
+    Dir_t* folder = NULL;
+    if ((folder = API_FS_OpenDir(path))) {
+        API_FS_CloseDir(folder);
+        return PATH_IS_DIR;
+    }
+    int32_t fd;
+    if ((fd = API_FS_Open(path, FS_O_RDONLY, 0)) >= 0) {
+        API_FS_Close(fd);
+        return PATH_IS_FILE;
+    }
+    return 0;
+}
+
+void ensure_not_a_directory(const char* path) {
+    if (path_exists(path) & PATH_IS_DIR)
+        mp_raise_OSError(MP_EISDIR);
+}
+
+void ensure_not_a_file(const char* path) {
+    if (path_exists(path) & PATH_IS_FILE)
+        mp_raise_OSError(MP_EEXIST);
+}
+
+void ensure_is_dir(const char* path) {
+    int x = path_exists(path);
+    if (!x)
+        mp_raise_OSError(MP_ENOENT);
+    if (!(x & PATH_IS_DIR))
+        mp_raise_OSError(MP_ENOTDIR);
+}
+
+void ensure_is_file(const char* path) {
+    int x = path_exists(path);
+    if (!x)
+        mp_raise_OSError(MP_ENOENT);
+    if (!(x & PATH_IS_FILE))
+        mp_raise_OSError(MP_EISDIR);
+}
+
+void ensure_not_exists(const char* path) {
+    if (path_exists(path))
+        mp_raise_OSError(MP_EEXIST);
+}
+
+void ensure_exists(const char* path) {
+    if (!path_exists(path))
+        mp_raise_OSError(MP_ENOENT);
+}
+
 void moduos_init0() {
-    if (API_FS_ChangeDir("/"))
-        mp_printf(&mp_plat_print, "Warning: moduos_init0 failed to chdir to /\n");
+    int errno;
+    if ((errno = API_FS_ChangeDir("/")))
+        mp_printf(&mp_plat_print, "Warning: moduos_init0 failed to chdir to /, error code: %d\n", translate_io_errno(errno));
 }
 
 STATIC const qstr os_uname_info_fields[] = {
@@ -157,7 +322,7 @@ STATIC mp_obj_t internal_flash_ilistdir_it_iternext(mp_obj_t self_in) {
     }
 
     // finallize the iterator
-    API_FS_CloseDir(self->folder);
+    maybe_raise_FSError(API_FS_CloseDir(self->folder));
     self->folder = NULL;
     return MP_OBJ_STOP_ITERATION;
 }
@@ -169,14 +334,8 @@ mp_obj_t moduos_internal_flash_ilistdir(mp_obj_t path_in) {
     //     name (str): folder to list;
     // ========================================
     const char* path = mp_obj_str_get_str(path_in);
-    Dir_t* dir;
-    if (strlen(path))
-        dir = API_FS_OpenDir(path);
-    else
-        dir = API_FS_OpenDir(".");
-    if (!dir)
-        mp_raise_OSError(MP_EIO);
-
+    ensure_is_dir(path);
+    Dir_t* dir = API_FS_OpenDir(path);
     native_vfs_ilistdir_it_t *iter = m_new_obj(native_vfs_ilistdir_it_t);
     iter->base.type = &mp_type_polymorph_iter;
     iter->iternext = internal_flash_ilistdir_it_iternext;
@@ -194,9 +353,8 @@ mp_obj_t moduos_internal_flash_mkdir(mp_obj_t path_in) {
     //     name (str): folder to create;
     // ========================================
     const char* path = mp_obj_str_get_str(path_in);
-    int32_t ret = API_FS_Mkdir(path, 0);
-    if (ret != 0)
-        mp_raise_OSError(MP_EIO);
+    ensure_not_exists(path);
+    maybe_raise_FSError(API_FS_Mkdir(path, 0));
     return mp_const_none;
 }
 
@@ -210,9 +368,8 @@ mp_obj_t moduos_internal_flash_remove(mp_obj_t path_in) {
     //     name (str): file to remove;
     // ========================================
     const char* path = mp_obj_str_get_str(path_in);
-    int32_t ret = API_FS_Delete(path);
-    if (ret != 0)
-        mp_raise_OSError(MP_EIO);
+    ensure_is_file(path);
+    maybe_raise_FSError(API_FS_Delete(path));
     return mp_const_none;
 }
 
@@ -228,9 +385,8 @@ mp_obj_t moduos_internal_flash_rename(mp_obj_t old_path_in, mp_obj_t new_path_in
     // ========================================
     const char* path_old = mp_obj_str_get_str(old_path_in);
     const char* path_new = mp_obj_str_get_str(new_path_in);
-    int32_t ret = API_FS_Rename(path_old, path_new);
-    if (ret != 0)
-        mp_raise_OSError(MP_EIO);
+    ensure_exists(path_old);
+    maybe_raise_FSError(API_FS_Rename(path_old, path_new));
     return mp_const_none;
 }
 
@@ -244,9 +400,8 @@ mp_obj_t moduos_internal_flash_rmdir(mp_obj_t path_in) {
     //     name (str): folder to remove;
     // ========================================
     const char* path = mp_obj_str_get_str(path_in);
-    int32_t ret = API_FS_Rmdir(path);
-    if (ret != 0)
-        mp_raise_OSError(MP_EIO);
+    ensure_is_dir(path);
+    maybe_raise_FSError(API_FS_Rmdir(path));
     return mp_const_none;
 }
 
@@ -260,9 +415,8 @@ mp_obj_t moduos_internal_flash_chdir(mp_obj_t path_in) {
     //     name (str): folder to change to;
     // ========================================
     const char* path = mp_obj_str_get_str(path_in);
-    int32_t ret = API_FS_ChangeDir(path);
-    if (ret != 0)
-        mp_raise_OSError(MP_EIO);
+    ensure_is_dir(path);
+    maybe_raise_FSError(API_FS_ChangeDir(path));
     return mp_const_none;
 }
 
@@ -274,9 +428,7 @@ mp_obj_t moduos_internal_flash_getcwd(void) {
     // Retrieves current folder.
     // ========================================
     char dir[256];
-    uint32_t ret = API_FS_GetCurDir(sizeof(dir), dir);
-    if (ret != 0)
-        mp_raise_OSError(MP_EIO);
+    maybe_raise_FSError(API_FS_GetCurDir(sizeof(dir), dir));
     return mp_obj_new_str(dir, strlen(dir));
 }
 
@@ -304,7 +456,7 @@ mp_obj_t moduos_internal_flash_stat(mp_obj_t path_in) {
         mode = MP_S_IFREG;
 
     } else
-        mp_raise_OSError(MP_EIO);
+        mp_raise_OSError(MP_ENOENT);
 
     mp_obj_t tuple[10] = {
         MP_OBJ_NEW_SMALL_INT(mode),
@@ -330,9 +482,7 @@ mp_obj_t moduos_internal_flash_statvfs(mp_obj_t path_in) {
     // ========================================
     const char* path = mp_obj_str_get_str(path_in);
     API_FS_INFO info;
-    int32_t ret = API_FS_GetFSInfo(path, &info);
-    if (ret != 0)
-        mp_raise_OSError(MP_EIO);
+    maybe_raise_FSError(API_FS_GetFSInfo(path, &info));
     mp_obj_t tuple[2] = {
         mp_obj_new_int(info.totalSize),
         mp_obj_new_int(info.usedSize),
diff --git a/ports/gprs_a9/moduos.h b/ports/gprs_a9/moduos.h
index d0702da1b41f0..f041736d58f86 100644
--- a/ports/gprs_a9/moduos.h
+++ b/ports/gprs_a9/moduos.h
@@ -34,4 +34,6 @@ extern const mp_obj_type_t mp_type_internal_flash_fileio;
 extern const mp_obj_type_t mp_type_internal_flash_textio;
 
 MP_DECLARE_CONST_FUN_OBJ_KW(internal_flash_open_obj);
+int maybe_raise_FSError(int errno);
+int translate_io_errno(int errno);
 

From 44b7c7be7cc069b2a36f5d9ec7acf6123939f3ad Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sat, 28 Dec 2019 21:27:52 +0100
Subject: [PATCH 3388/3533] Close #18

---
 ports/gprs_a9/modules/upip.py          | 1 +
 ports/gprs_a9/modules/upip_utarfile.py | 1 +
 2 files changed, 2 insertions(+)
 create mode 120000 ports/gprs_a9/modules/upip.py
 create mode 120000 ports/gprs_a9/modules/upip_utarfile.py

diff --git a/ports/gprs_a9/modules/upip.py b/ports/gprs_a9/modules/upip.py
new file mode 120000
index 0000000000000..130eb69016485
--- /dev/null
+++ b/ports/gprs_a9/modules/upip.py
@@ -0,0 +1 @@
+../../../tools/upip.py
\ No newline at end of file
diff --git a/ports/gprs_a9/modules/upip_utarfile.py b/ports/gprs_a9/modules/upip_utarfile.py
new file mode 120000
index 0000000000000..d9653d6a60808
--- /dev/null
+++ b/ports/gprs_a9/modules/upip_utarfile.py
@@ -0,0 +1 @@
+../../../tools/upip_utarfile.py
\ No newline at end of file

From c6403f3dadc42b80fa37ceeb5587520982fbc011 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sat, 28 Dec 2019 21:38:03 +0100
Subject: [PATCH 3389/3533] README update

[skip ci]
---
 ports/gprs_a9/README.md | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/ports/gprs_a9/README.md b/ports/gprs_a9/README.md
index f55b710762d66..34674282a7879 100644
--- a/ports/gprs_a9/README.md
+++ b/ports/gprs_a9/README.md
@@ -82,6 +82,8 @@ blink.blink(1)
 - [x] Calls: `cellular`
 - [x] SMS: `cellular.SMS`
 
+Additional libraries: install via [`upip`](https://docs.micropython.org/en/latest/reference/packages.html) (built into the module).
+
 ## API
 
 1. [`cellular`](#cellular): SMS, calls, connectivity
@@ -91,7 +93,7 @@ blink.blink(1)
 5. [`machine`](#machine): hardware and power control
 6. [`i2c`](#i2c): i2c implementation
 7. [`st7735`](#ST7735): ST7735 over software SPI display implementation
-8. [misc modules](#Misc)
+8. [Other modules](#Misc)
 9. [Notes](#Notes)
 
 ### `cellular`
@@ -234,9 +236,13 @@ ST7735 displays over software SPI.
 
 ## Misc ##
 
-Modules located in the `py` folder.
+Built into the firmware:
+
+* [`upip`](https://docs.micropython.org/en/latest/reference/packages.html): package manager over GPRS connection;
+
+Available platform-specific modules (not installed by default):
 
-* [`agps`](https://github.com/pulkin/mpy-agps): Assisted GPS services.
+* [`agps`](https://github.com/pulkin/mpy-agps): assisted GPS services.
 
 ## Notes ##
 

From c8a0f12d979be417a13b843d228fa0b968e0707f Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sun, 29 Dec 2019 23:34:21 +0100
Subject: [PATCH 3390/3533] Fix text rendering

---
 ports/gprs_a9/modst7735.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/gprs_a9/modst7735.c b/ports/gprs_a9/modst7735.c
index 523de15034046..907db95f18a7f 100644
--- a/ports/gprs_a9/modst7735.c
+++ b/ports/gprs_a9/modst7735.c
@@ -541,7 +541,7 @@ STATIC mp_obj_t modst7735_display_text(size_t n_args, const mp_obj_t *args) {
         // loop over char data
         for (int j = 0; j < 8; j++, x0++) {
             if (0 <= x0 && x0 < self->width) { // clip x
-                uint vline_data = chr_data[j]; // each byte is a column of 8 pixels, LSB at top
+                uint8_t vline_data = chr_data[j]; // each byte is a column of 8 pixels, LSB at top
                 for (int y = y0; vline_data; vline_data >>= 1, y++) { // scan over vertical column
                     if (vline_data & 1) { // only draw if pixel set
                         if (0 <= y && y < self->height) { // clip y

From 2369f7eac80fa12e3cd5fa6322a832e5f19a68c4 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sun, 29 Dec 2019 23:34:56 +0100
Subject: [PATCH 3391/3533] Add os.dupterm (temporary impl)

---
 ports/gprs_a9/moduos.c       | 6 +++---
 ports/gprs_a9/mpconfigport.h | 2 +-
 ports/gprs_a9/mphalport.c    | 2 ++
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/ports/gprs_a9/moduos.c b/ports/gprs_a9/moduos.c
index 346a60de6391c..ff4294bce11bf 100644
--- a/ports/gprs_a9/moduos.c
+++ b/ports/gprs_a9/moduos.c
@@ -519,7 +519,7 @@ STATIC const mp_obj_type_t moduos_internal_flash_type = {
 };
 
 #if MICROPY_PY_OS_DUPTERM
-STATIC mp_obj_t os_dupterm_notify(mp_obj_t obj_in) {
+/* STATIC mp_obj_t os_dupterm_notify(mp_obj_t obj_in) {
     (void) obj_in;
     for (;;) {
         int c = mp_uos_dupterm_rx_chr();
@@ -531,7 +531,7 @@ STATIC mp_obj_t os_dupterm_notify(mp_obj_t obj_in) {
     return mp_const_none;
 }
 
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(os_dupterm_notify_obj, os_dupterm_notify);
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(os_dupterm_notify_obj, os_dupterm_notify);*/
 #endif
 
 STATIC const mp_rom_map_elem_t os_module_globals_table[] = {
@@ -543,7 +543,7 @@ STATIC const mp_rom_map_elem_t os_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_urandom), MP_ROM_PTR(&os_urandom_obj) },
     #if MICROPY_PY_OS_DUPTERM
     { MP_ROM_QSTR(MP_QSTR_dupterm), MP_ROM_PTR(&mp_uos_dupterm_obj) },
-    { MP_ROM_QSTR(MP_QSTR_dupterm_notify), MP_ROM_PTR(&os_dupterm_notify_obj) },
+    // { MP_ROM_QSTR(MP_QSTR_dupterm_notify), MP_ROM_PTR(&mp_os_dupterm_notify_obj) },
     #endif
     #if MICROPY_VFS
     { MP_ROM_QSTR(MP_QSTR_ilistdir), MP_ROM_PTR(&mp_vfs_ilistdir_obj) },
diff --git a/ports/gprs_a9/mpconfigport.h b/ports/gprs_a9/mpconfigport.h
index d82149c45974f..c84e312521d24 100644
--- a/ports/gprs_a9/mpconfigport.h
+++ b/ports/gprs_a9/mpconfigport.h
@@ -144,7 +144,7 @@
 #define MICROPY_PY_UBINASCII_CRC32          (1)
 #define MICROPY_PY_URANDOM                  (1)
 #define MICROPY_PY_URANDOM_EXTRA_FUNCS      (1)
-#define MICROPY_PY_OS_DUPTERM               (0)
+#define MICROPY_PY_OS_DUPTERM               (1)
 #define MICROPY_PY_MACHINE                  (1)
 #define MICROPY_PY_MACHINE_PIN_MAKE_NEW     mp_pin_make_new
 // #define MICROPY_PY_MACHINE_PULSE            (1)
diff --git a/ports/gprs_a9/mphalport.c b/ports/gprs_a9/mphalport.c
index 1345572513aa0..2d1ee74ced75c 100644
--- a/ports/gprs_a9/mphalport.c
+++ b/ports/gprs_a9/mphalport.c
@@ -39,6 +39,7 @@
 #include "time.h"
 
 #include "py/runtime.h"
+#include "extmod/misc.h"
 
 void mp_hal_pyrepl_uart_init() {
     UART_Config_t config = {
@@ -54,6 +55,7 @@ void mp_hal_pyrepl_uart_init() {
 
 // Send string of given length
 void mp_hal_stdout_tx_strn(const char *str, mp_uint_t len) {
+    mp_uos_dupterm_tx_strn(str, len);
     UART_Write(UART1,(uint8_t*)str,len);
 }
 

From 384a3bd4be58a4a81d183a30844e2a97f1e4f7a4 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sun, 5 Jan 2020 18:47:15 +0100
Subject: [PATCH 3392/3533] Add gps shutdown on soft reset

---
 ports/gprs_a9/main.c   | 1 +
 ports/gprs_a9/modgps.c | 4 ++++
 ports/gprs_a9/modgps.h | 1 +
 3 files changed, 6 insertions(+)

diff --git a/ports/gprs_a9/main.c b/ports/gprs_a9/main.c
index afb8965674782..aebed026c968d 100644
--- a/ports/gprs_a9/main.c
+++ b/ports/gprs_a9/main.c
@@ -176,6 +176,7 @@ void MicroPyTask(void *pData) {
     mp_init();
     moduos_init0();
     modcellular_init0();
+    modgps_init0();
     mp_obj_list_init(mp_sys_path, 0);
     mp_obj_list_append(mp_sys_path, MP_OBJ_NEW_QSTR(MP_QSTR_)); // current dir (or base dir of the script)
     mp_obj_list_append(mp_sys_path, MP_OBJ_NEW_QSTR(MP_QSTR__slash_lib));
diff --git a/ports/gprs_a9/modgps.c b/ports/gprs_a9/modgps.c
index cfa9afd16105a..c9cbf341de368 100644
--- a/ports/gprs_a9/modgps.c
+++ b/ports/gprs_a9/modgps.c
@@ -41,6 +41,10 @@
 #include "gps.h"
 #include "time.h"
 
+void modgps_init0(void) {
+    GPS_Close();
+}
+
 // ------
 // Notify
 // ------
diff --git a/ports/gprs_a9/modgps.h b/ports/gprs_a9/modgps.h
index b22d36ef9d9dd..22bcf0cefe106 100644
--- a/ports/gprs_a9/modgps.h
+++ b/ports/gprs_a9/modgps.h
@@ -32,6 +32,7 @@
 
 extern const mp_obj_type_t mp_type_CellularError;
 
+void modgps_init0(void);
 void modgps_notify_gps_update(API_Event_t* event);
 
 #define DEFAULT_GPS_TIMEOUT 5

From 80670b76cfc071f8bee53301678f752704488798 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sun, 5 Jan 2020 18:53:17 +0100
Subject: [PATCH 3393/3533] Add pin shutdown on reset func

---
 ports/gprs_a9/machine_pin.c | 8 +++++++-
 ports/gprs_a9/modmachine.h  | 8 ++------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/ports/gprs_a9/machine_pin.c b/ports/gprs_a9/machine_pin.c
index 601a968a210d2..342195d7ab229 100644
--- a/ports/gprs_a9/machine_pin.c
+++ b/ports/gprs_a9/machine_pin.c
@@ -6,6 +6,7 @@
  * The MIT License (MIT)
  *
  * Copyright (c) 2016 Damien P. George
+ * Copyright (c) 2019 pulkin
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -29,7 +30,6 @@
 #include <stdio.h>
 #include <string.h>
 
-
 #include "py/runtime.h"
 #include "py/mphal.h"
 #include "mphalport.h"
@@ -42,6 +42,12 @@
 #define GPIO_LEVEL_UNSET 255
 // #define GPIO_Set(id, val) do {g_InterfaceVtbl->GPIO_Set((id), (val)); if ((id) == 17) {if ((val) == 0) mp_printf(&mp_plat_print, "comm"); else mp_printf(&mp_plat_print, "data");} else if ((id) == 15) {if ((val) == 0) mp_printf(&mp_plat_print, "("); else mp_printf(&mp_plat_print, ")\n");} else if ((id) == 16) {if ((val) == 0) mp_printf(&mp_plat_print, "-"); else mp_printf(&mp_plat_print, "+");} else if ((id) == 18) {if ((val) == 0) mp_printf(&mp_plat_print, "0"); else mp_printf(&mp_plat_print, "1");} else mp_printf(&mp_plat_print, "%d:%d ", (id), (val));} while(0)
 
+void modmachine_pin_init0(void) {
+    PM_PowerEnable(POWER_TYPE_MMC, false);
+    PM_PowerEnable(POWER_TYPE_LCD, false);
+    PM_PowerEnable(POWER_TYPE_CAM, false);
+}
+
 // -------
 // Classes
 // -------
diff --git a/ports/gprs_a9/modmachine.h b/ports/gprs_a9/modmachine.h
index 0389c0485003c..9de27bd2f7cc8 100644
--- a/ports/gprs_a9/modmachine.h
+++ b/ports/gprs_a9/modmachine.h
@@ -26,9 +26,6 @@
  * THE SOFTWARE.
  */
 
-#ifndef MICROPY_INCLUDED_GPRS_A9_MODMACHINE_H
-#define MICROPY_INCLUDED_GPRS_A9_MODMACHINE_H
-
 #include "py/obj.h"
 #include "api_event.h"
 
@@ -36,7 +33,6 @@ extern const mp_obj_type_t machine_pin_type;
 extern const mp_obj_type_t machine_adc_type;
 extern Power_On_Cause_t powerOnCause;
 
-void modmachine_notify_power_on(API_Event_t* event);
-
-#endif
+void modmachine_pin_init0(void);
 
+void modmachine_notify_power_on(API_Event_t* event);

From 638b7153f177437fc4f03276534337a35fb871d0 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sun, 5 Jan 2020 18:54:06 +0100
Subject: [PATCH 3394/3533] Add pin power shutdown on reset

---
 ports/gprs_a9/main.c       | 1 +
 ports/gprs_a9/modmachine.c | 4 ++++
 ports/gprs_a9/modmachine.h | 1 +
 3 files changed, 6 insertions(+)

diff --git a/ports/gprs_a9/main.c b/ports/gprs_a9/main.c
index aebed026c968d..ab0cfdde09d74 100644
--- a/ports/gprs_a9/main.c
+++ b/ports/gprs_a9/main.c
@@ -177,6 +177,7 @@ void MicroPyTask(void *pData) {
     moduos_init0();
     modcellular_init0();
     modgps_init0();
+    modmachine_init0();
     mp_obj_list_init(mp_sys_path, 0);
     mp_obj_list_append(mp_sys_path, MP_OBJ_NEW_QSTR(MP_QSTR_)); // current dir (or base dir of the script)
     mp_obj_list_append(mp_sys_path, MP_OBJ_NEW_QSTR(MP_QSTR__slash_lib));
diff --git a/ports/gprs_a9/modmachine.c b/ports/gprs_a9/modmachine.c
index 1a09522c32c42..045f28dc658fc 100644
--- a/ports/gprs_a9/modmachine.c
+++ b/ports/gprs_a9/modmachine.c
@@ -40,6 +40,10 @@
 #include "api_hal_watchdog.h"
 #include "api_hal_adc.h"
 
+void modmachine_init0(void) {
+    modmachine_pin_init0();
+}
+
 // ------
 // Notify
 // ------
diff --git a/ports/gprs_a9/modmachine.h b/ports/gprs_a9/modmachine.h
index 9de27bd2f7cc8..01ea563320cb0 100644
--- a/ports/gprs_a9/modmachine.h
+++ b/ports/gprs_a9/modmachine.h
@@ -34,5 +34,6 @@ extern const mp_obj_type_t machine_adc_type;
 extern Power_On_Cause_t powerOnCause;
 
 void modmachine_pin_init0(void);
+void modmachine_init0(void);
 
 void modmachine_notify_power_on(API_Event_t* event);

From c737fda058d5746f5bac8f5ada12b535b250043b Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sun, 5 Jan 2020 18:55:03 +0100
Subject: [PATCH 3395/3533] Initial UART implementation

---
 ports/gprs_a9/Makefile       |   4 +-
 ports/gprs_a9/machine_uart.c | 340 +++++++++++++++++++++++++++++++++++
 ports/gprs_a9/modmachine.c   |   2 +
 ports/gprs_a9/modmachine.h   |   2 +
 ports/gprs_a9/mpconfigport.h |   3 +-
 ports/gprs_a9/uart.c         | 219 ++++++++++++++++++++++
 ports/gprs_a9/uart.h         |  24 +++
 7 files changed, 592 insertions(+), 2 deletions(-)
 create mode 100644 ports/gprs_a9/machine_uart.c
 create mode 100644 ports/gprs_a9/uart.c
 create mode 100644 ports/gprs_a9/uart.h

diff --git a/ports/gprs_a9/Makefile b/ports/gprs_a9/Makefile
index 3b1cbed8a219f..969a88dfa8937 100644
--- a/ports/gprs_a9/Makefile
+++ b/ports/gprs_a9/Makefile
@@ -127,6 +127,7 @@ SRC_C = \
 	main.c \
 	posix_helpers.c \
 	fatal.c \
+	uart.c \
 	help.c \
 	modmachine.c \
 	machine_pin.c \
@@ -142,7 +143,8 @@ SRC_C = \
 	modusocket.c \
 	modi2c.c \
 	modst7735.c \
-	machine_adc.c
+	machine_adc.c \
+	machine_uart.c
 
 
 LIB_SRC_C = $(addprefix lib/,\
diff --git a/ports/gprs_a9/machine_uart.c b/ports/gprs_a9/machine_uart.c
new file mode 100644
index 0000000000000..6160cabc8a204
--- /dev/null
+++ b/ports/gprs_a9/machine_uart.c
@@ -0,0 +1,340 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2016 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include <stdio.h>
+#include <stdint.h>
+#include <string.h>
+
+#include "py/runtime.h"
+#include "py/stream.h"
+#include "py/mperrno.h"
+#include "py/mphal.h"
+
+#include "uart.h"
+#include "modmachine.h"
+
+typedef struct _pyb_uart_obj_t {
+    mp_obj_base_t base;
+    uint8_t uart_id;
+    uint8_t bits;
+    uint8_t parity;
+    uint8_t stop;
+    uint32_t baudrate;
+    uint16_t timeout;       // timeout waiting for first char (in ms)
+    uint16_t timeout_char;  // timeout waiting between chars (in ms)
+} pyb_uart_obj_t;
+
+STATIC const char *_parity_name[] = {"None", "1", "0"};
+
+void modmachine_uart_init0(void) {
+    UART_Close(UART2);
+}
+
+/******************************************************************************/
+// MicroPython bindings for UART
+
+STATIC void pyb_uart_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+    pyb_uart_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    mp_printf(print, "UART(%u, baudrate=%u, bits=%u, parity=%s, stop=%u, rxbuf=%u, timeout=%u, timeout_char=%u)",
+        self->uart_id, self->baudrate, self->bits, _parity_name[self->parity],
+        self->stop, uart_get_rxbuf_len(self->uart_id) - 1, self->timeout, self->timeout_char);
+}
+
+STATIC void pyb_uart_init_helper(pyb_uart_obj_t *self, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    enum { ARG_baudrate, ARG_bits, ARG_parity, ARG_stop, ARG_tx, ARG_rx, ARG_rxbuf, ARG_timeout, ARG_timeout_char };
+    static const mp_arg_t allowed_args[] = {
+        { MP_QSTR_baudrate, MP_ARG_INT, {.u_int = 0} },
+        { MP_QSTR_bits, MP_ARG_INT, {.u_int = 0} },
+        { MP_QSTR_parity, MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
+        { MP_QSTR_stop, MP_ARG_INT, {.u_int = 0} },
+        { MP_QSTR_tx, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
+        { MP_QSTR_rx, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
+        { MP_QSTR_rxbuf, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 0} },
+        { MP_QSTR_timeout, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 0} },
+        { MP_QSTR_timeout_char, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 0} },
+    };
+    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
+    mp_arg_parse_all(n_args, pos_args, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
+
+    // set tx/rx pins
+    if (args[ARG_tx].u_obj != MP_OBJ_NULL && args[ARG_rx].u_obj != MP_OBJ_NULL) {
+        mp_hal_pin_obj_t tx = mp_hal_get_pin_obj(args[ARG_tx].u_obj);
+        mp_hal_pin_obj_t rx = mp_hal_get_pin_obj(args[ARG_rx].u_obj);
+        if (tx == 1 && rx == 0) {
+            self->uart_id = 0;
+        } else if (tx == 4 && rx == 5) {
+            self->uart_id = 1;
+        } else {
+            mp_raise_ValueError("invalid tx/rx");
+        }
+    }
+
+    UART_Config_t *config = uart_dev + self->uart_id;
+
+    // set baudrate
+    if (args[ARG_baudrate].u_int > 0) {
+        switch (args[ARG_baudrate].u_int) {
+            case UART_BAUD_RATE_1200:
+            case UART_BAUD_RATE_2400:
+            case UART_BAUD_RATE_4800:
+            case UART_BAUD_RATE_9600:
+            case UART_BAUD_RATE_14400:
+            case UART_BAUD_RATE_19200:
+            case UART_BAUD_RATE_28800:
+            case UART_BAUD_RATE_33600:
+            case UART_BAUD_RATE_38400:
+            case UART_BAUD_RATE_57600:
+            case UART_BAUD_RATE_115200:
+            case UART_BAUD_RATE_230400:
+            case UART_BAUD_RATE_460800:
+            case UART_BAUD_RATE_921600:
+            case UART_BAUD_RATE_1300000:
+            case UART_BAUD_RATE_1625000:
+            case UART_BAUD_RATE_2166700:
+            case UART_BAUD_RATE_3250000:
+                config->baudRate = (UART_Baud_Rate_t) args[ARG_baudrate].u_int;
+            case 0:
+                break;
+            default:
+                mp_raise_ValueError("unsupported baud rate");
+                break;
+        }
+    }
+    self->baudrate = config->baudRate;
+
+    // set data bits
+    switch (args[ARG_bits].u_int) {
+        case 7:
+        case 8:
+            config->dataBits = (UART_Data_Bits_t) args[ARG_bits].u_int;
+        case 0:
+            break;
+        default:
+            mp_raise_ValueError("invalid data bits");
+            break;
+    }
+    self->bits = config->dataBits;
+
+    // set parity
+    if (args[ARG_parity].u_obj != MP_OBJ_NULL) {
+        if (args[ARG_parity].u_obj == mp_const_none) {
+            config->parity = UART_PARITY_NONE;
+        } else {
+            mp_int_t parity = mp_obj_get_int(args[ARG_parity].u_obj);
+            if (parity & 1) {
+                config->parity = UART_PARITY_ODD;
+            } else {
+                config->parity = UART_PARITY_EVEN;
+            }
+        }
+    }
+    self->parity = config->parity;
+
+    // set stop bits
+    switch (args[ARG_stop].u_int) {
+        case 1:
+            config->stopBits = UART_STOP_BITS_1;
+            break;
+        case 2:
+            config->stopBits = UART_STOP_BITS_2;
+            break;
+        case 0:
+            break;
+        default:
+            mp_raise_ValueError("invalid stop bits");
+            break;
+    }
+    self->stop = config->stopBits + 1;
+
+    // set rx ring buffer
+    if (args[ARG_rxbuf].u_int > 0) {
+        uint16_t len = args[ARG_rxbuf].u_int + 1; // account for usable items in ringbuf
+        uint8_t *buf;
+        if (len <= UART_STATIC_RXBUF_LEN) {
+            buf = uart_ringbuf_array[self->uart_id];
+            MP_STATE_PORT(uart_rxbuf[self->uart_id]) = NULL; // clear any old pointer
+        } else {
+            buf = m_new(uint8_t, len);
+            MP_STATE_PORT(uart_rxbuf[self->uart_id]) = buf; // retain root pointer
+        }
+        uart_set_rxbuf(self->uart_id, buf, len);
+    }
+
+    // set timeout
+    self->timeout = args[ARG_timeout].u_int;
+
+    // set timeout_char
+    // make sure it is at least as long as a whole character (13 bits to be safe)
+    self->timeout_char = args[ARG_timeout_char].u_int;
+    uint32_t min_timeout_char = 13000 / self->baudrate + 1;
+    if (self->timeout_char < min_timeout_char) {
+        self->timeout_char = min_timeout_char;
+    }
+
+    // setup
+    if (!uart_setup(self->uart_id))
+        mp_raise_ValueError("failed to setup uart");
+}
+
+STATIC mp_obj_t pyb_uart_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
+    mp_arg_check_num(n_args, n_kw, 1, MP_OBJ_FUN_ARGS_MAX, true);
+
+    // get uart id
+    mp_int_t uart_id = mp_obj_get_int(args[0]);
+    if (uart_id < 0 || uart_id >= UART_NPORTS) {
+        nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError, "UART(%d) does not exist", uart_id));
+    }
+
+    // create instance
+    pyb_uart_obj_t *self = m_new_obj(pyb_uart_obj_t);
+    self->base.type = &pyb_uart_type;
+    self->uart_id = uart_id;
+    self->baudrate = 115200;
+    self->bits = 8;
+    self->parity = 0;
+    self->stop = 1;
+    self->timeout = 0;
+    self->timeout_char = 0;
+
+    // init the peripheral
+    mp_map_t kw_args;
+    mp_map_init_fixed_table(&kw_args, n_kw, args + n_args);
+    pyb_uart_init_helper(self, n_args - 1, args + 1, &kw_args);
+
+    return MP_OBJ_FROM_PTR(self);
+}
+
+STATIC mp_obj_t pyb_uart_init(size_t n_args, const mp_obj_t *args, mp_map_t *kw_args) {
+    pyb_uart_init_helper(args[0], n_args - 1, args + 1, kw_args);
+    return mp_const_none;
+}
+MP_DEFINE_CONST_FUN_OBJ_KW(pyb_uart_init_obj, 1, pyb_uart_init);
+
+STATIC mp_obj_t pyb_uart_any(mp_obj_t self_in) {
+    pyb_uart_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    return MP_OBJ_NEW_SMALL_INT(uart_rx_any(self->uart_id));
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(pyb_uart_any_obj, pyb_uart_any);
+
+STATIC const mp_rom_map_elem_t pyb_uart_locals_dict_table[] = {
+    { MP_ROM_QSTR(MP_QSTR_init), MP_ROM_PTR(&pyb_uart_init_obj) },
+
+    { MP_ROM_QSTR(MP_QSTR_any), MP_ROM_PTR(&pyb_uart_any_obj) },
+    { MP_ROM_QSTR(MP_QSTR_read), MP_ROM_PTR(&mp_stream_read_obj) },
+    { MP_ROM_QSTR(MP_QSTR_readline), MP_ROM_PTR(&mp_stream_unbuffered_readline_obj) },
+    { MP_ROM_QSTR(MP_QSTR_readinto), MP_ROM_PTR(&mp_stream_readinto_obj) },
+    { MP_ROM_QSTR(MP_QSTR_write), MP_ROM_PTR(&mp_stream_write_obj) },
+    { MP_ROM_QSTR(MP_QSTR_close), MP_ROM_PTR(&mp_stream_close_obj) },
+    { MP_ROM_QSTR(MP_QSTR___del__), MP_ROM_PTR(&mp_stream_close_obj) },
+};
+
+STATIC MP_DEFINE_CONST_DICT(pyb_uart_locals_dict, pyb_uart_locals_dict_table);
+
+STATIC mp_uint_t pyb_uart_read(mp_obj_t self_in, void *buf_in, mp_uint_t size, int *errcode) {
+    pyb_uart_obj_t *self = MP_OBJ_TO_PTR(self_in);
+
+    // make sure we want at least 1 char
+    if (size == 0) {
+        return 0;
+    }
+
+    // wait for first char to become available
+    if (!uart_rx_wait(self->uart_id, self->timeout * 1000)) {
+        *errcode = MP_EAGAIN;
+        return MP_STREAM_ERROR;
+    }
+
+    // read the data
+    uint8_t *buf = buf_in;
+    for (;;) {
+        *buf++ = uart_rx_char(self->uart_id);
+        if (--size == 0 || !uart_rx_wait(self->uart_id, self->timeout_char * 1000)) {
+            // return number of bytes read
+            return buf - (uint8_t*)buf_in;
+        }
+    }
+}
+
+STATIC mp_uint_t pyb_uart_write(mp_obj_t self_in, const void *buf_in, mp_uint_t size, int *errcode) {
+    pyb_uart_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    const byte *buf = buf_in;
+
+    /* TODO implement non-blocking
+    // wait to be able to write the first character
+    if (!uart_tx_wait(self, timeout)) {
+        *errcode = EAGAIN;
+        return MP_STREAM_ERROR;
+    }
+    */
+
+    // write the data
+    for (size_t i = 0; i < size; ++i) {
+        uart_tx_one_char(self->uart_id, *buf++);
+    }
+
+    // return number of bytes written
+    return size;
+}
+
+STATIC mp_uint_t pyb_uart_ioctl(mp_obj_t self_in, mp_uint_t request, mp_uint_t arg, int *errcode) {
+    pyb_uart_obj_t *self = self_in;
+    mp_uint_t ret;
+    if (request == MP_STREAM_POLL) {
+        mp_uint_t flags = arg;
+        ret = 0;
+        if ((flags & MP_STREAM_POLL_RD) && uart_rx_any(self->uart_id)) {
+            ret |= MP_STREAM_POLL_RD;
+        }
+        if ((flags & MP_STREAM_POLL_WR) && uart_tx_any_room(self->uart_id)) {
+            ret |= MP_STREAM_POLL_WR;
+        }
+    } else if (request == MP_STREAM_CLOSE) {
+        uart_close(self->uart_id);
+        ret = 0;
+    } else {
+        *errcode = MP_EINVAL;
+        ret = MP_STREAM_ERROR;
+    }
+    return ret;
+}
+
+STATIC const mp_stream_p_t uart_stream_p = {
+    .read = pyb_uart_read,
+    .write = pyb_uart_write,
+    .ioctl = pyb_uart_ioctl,
+    .is_text = false,
+};
+
+const mp_obj_type_t pyb_uart_type = {
+    { &mp_type_type },
+    .name = MP_QSTR_UART,
+    .print = pyb_uart_print,
+    .make_new = pyb_uart_make_new,
+    .getiter = mp_identity_getiter,
+    .iternext = mp_stream_unbuffered_iter,
+    .protocol = &uart_stream_p,
+    .locals_dict = (mp_obj_dict_t*)&pyb_uart_locals_dict,
+};
diff --git a/ports/gprs_a9/modmachine.c b/ports/gprs_a9/modmachine.c
index 045f28dc658fc..40ee5408b1e0f 100644
--- a/ports/gprs_a9/modmachine.c
+++ b/ports/gprs_a9/modmachine.c
@@ -42,6 +42,7 @@
 
 void modmachine_init0(void) {
     modmachine_pin_init0();
+    modmachine_uart_init0();
 }
 
 // ------
@@ -202,6 +203,7 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_umachine) },
     { MP_ROM_QSTR(MP_QSTR_Pin), MP_ROM_PTR(&machine_pin_type) },
     { MP_ROM_QSTR(MP_QSTR_ADC), MP_ROM_PTR(&machine_adc_type) },
+    { MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&pyb_uart_type) },
     { MP_OBJ_NEW_QSTR(MP_QSTR_reset), (mp_obj_t)&modmachine_reset_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_set_idle), (mp_obj_t)&modmachine_set_idle_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_set_min_freq), (mp_obj_t)&modmachine_set_min_freq_obj },
diff --git a/ports/gprs_a9/modmachine.h b/ports/gprs_a9/modmachine.h
index 01ea563320cb0..55fbcfcd499d6 100644
--- a/ports/gprs_a9/modmachine.h
+++ b/ports/gprs_a9/modmachine.h
@@ -31,9 +31,11 @@
 
 extern const mp_obj_type_t machine_pin_type;
 extern const mp_obj_type_t machine_adc_type;
+extern const mp_obj_type_t pyb_uart_type;
 extern Power_On_Cause_t powerOnCause;
 
 void modmachine_pin_init0(void);
+void modmachine_uart_init0(void);
 void modmachine_init0(void);
 
 void modmachine_notify_power_on(API_Event_t* event);
diff --git a/ports/gprs_a9/mpconfigport.h b/ports/gprs_a9/mpconfigport.h
index c84e312521d24..cf835505e3d1d 100644
--- a/ports/gprs_a9/mpconfigport.h
+++ b/ports/gprs_a9/mpconfigport.h
@@ -262,7 +262,8 @@ typedef long mp_off_t;
 #define MP_STATE_PORT MP_STATE_VM
 
 #define MICROPY_PORT_ROOT_POINTERS \
-    const char *readline_hist[8];
+    const char *readline_hist[8]; \
+    byte *uart_rxbuf[2];
 
 #include "csdk_config.h"
 
diff --git a/ports/gprs_a9/uart.c b/ports/gprs_a9/uart.c
new file mode 100644
index 0000000000000..ea3f8926a1f7b
--- /dev/null
+++ b/ports/gprs_a9/uart.c
@@ -0,0 +1,219 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2019 pulkin
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "uart.h"
+#include "mphalport.h"
+
+#include <stdint.h>
+#include <stdio.h>
+#include <string.h>
+
+#include "py/ringbuf.h"
+
+#include "api_hal_uart.h"
+
+// ---------------------
+// UART static variables
+// ---------------------
+
+// The two ports
+static const UART_Port_t uart_port[] = {UART1, UART2};
+
+// REPL port
+static uint8_t uart_os = 0;
+
+// rx data buffers
+uint8_t uart1_ringbuf_array[UART_STATIC_RXBUF_LEN];
+uint8_t uart2_ringbuf_array[UART_STATIC_RXBUF_LEN];
+
+uint8_t *uart_ringbuf_array[] = {uart1_ringbuf_array, uart2_ringbuf_array};
+
+// rx ring buffers
+ringbuf_t uart_ringbuf[] = {
+    {uart1_ringbuf_array, sizeof(uart1_ringbuf_array), 0, 0},
+    {uart2_ringbuf_array, sizeof(uart2_ringbuf_array), 0, 0},
+};
+
+// UART rx interrupt handler
+static void uart_rx_intr_handler(UART_Callback_Param_t param);
+
+// UART configurations
+UART_Config_t uart_dev[] = {
+    {
+        .baudRate = UART_BAUD_RATE_115200,
+        .dataBits = UART_DATA_BITS_8,
+        .stopBits = UART_STOP_BITS_1,
+        .parity = UART_PARITY_NONE,
+        .rxCallback = uart_rx_intr_handler,
+        .useEvent = true,
+    },
+    {
+        .baudRate = UART_BAUD_RATE_115200,
+        .dataBits = UART_DATA_BITS_8,
+        .stopBits = UART_STOP_BITS_1,
+        .parity = UART_PARITY_NONE,
+        .rxCallback = uart_rx_intr_handler,
+        .useEvent = true,
+    }
+};
+
+void soft_reset(void);
+void mp_keyboard_interrupt(void);
+
+static bool uart_config(uint8_t uart) {
+    // Updates the configuration of UART port
+    return UART_Init(uart_port[uart], uart_dev[uart]);
+}
+
+uint32_t uart_tx_one_char(uint8_t uart, char c) {
+    // Transfers a single char
+    return UART_Write(uart_port[uart], (uint8_t*) &c, 1);
+}
+
+void uart_flush(uint8_t uart) {
+    // Flushes
+    (void) uart;
+}
+
+bool uart_close(uint8_t uart) {
+    return UART_Close(uart_port[uart]);
+}
+
+static uint32_t uart_os_write_char(char c) {
+    // python REPL
+    return uart_tx_one_char(uart_os, c);
+}
+
+void uart_os_config(uint8_t uart) {
+    // sets python REPL
+    uart_os = uart;
+}
+
+static void uart_rx_intr_handler(UART_Callback_Param_t param) {
+    // handles rx interrupts
+    ringbuf_t *ringbuf = uart_ringbuf + param.port - 1;
+    for (uint32_t i=0; i<param.length; i++)
+        ringbuf_put(ringbuf, param.buf[i]);
+}
+
+bool uart_rx_wait(uint8_t uart, uint32_t timeout_us) {
+    // waits for rx to become populated
+    uint32_t start = mp_hal_ticks_us();
+    ringbuf_t *ringbuf = uart_ringbuf + uart;
+    for (;;) {
+        if (ringbuf->iget != ringbuf->iput) {
+            return true; // have at least 1 char ready for reading
+        }
+        if (mp_hal_ticks_us() - start >= timeout_us) {
+            return false; // timeout
+        }
+    }
+}
+
+int uart_rx_any(uint8_t uart) {
+    // checks if rx is not empty
+    ringbuf_t *ringbuf = uart_ringbuf + uart;
+    if (ringbuf->iget != ringbuf->iput) {
+        return true;
+    }
+    return false;
+}
+
+int uart_tx_any_room(uint8_t uart) {
+    // checks if ready for tx
+    (void) uart;
+    return true;
+}
+
+int uart_rx_char(uint8_t uart) {
+    // receives a single byte
+    return ringbuf_get(uart_ringbuf + uart);
+}
+
+void uart_init(UART_Baud_Rate_t uart1_br, UART_Baud_Rate_t uart2_br) {
+    // just init with the baud rate
+    uart_dev[0].baudRate = uart1_br;
+    uart_config(0);
+    uart_dev[1].baudRate = uart2_br;
+    uart_config(1);
+    // install handler for "os" messages
+    // os_install_putc1((void *)uart_os_write_char);
+}
+
+bool uart_setup(uint8_t uart) {
+    return uart_config(uart);
+}
+
+int uart_get_rxbuf_len(uint8_t uart) {
+    return uart_ringbuf[uart].size;
+}
+
+void uart_set_rxbuf(uint8_t uart, uint8_t *buf, int len) {
+    uart_ringbuf[uart].buf = buf;
+    uart_ringbuf[uart].size = len;
+    uart_ringbuf[uart].iget = 0;
+    uart_ringbuf[uart].iput = 0;
+}
+
+// Task-based UART interface
+/*
+#include "py/obj.h"
+#include "lib/utils/pyexec.h"
+
+#if MICROPY_REPL_EVENT_DRIVEN
+void uart_task_handler(os_event_t *evt) {
+    if (pyexec_repl_active) {
+        // TODO: Just returning here isn't exactly right.
+        // What really should be done is something like
+        // enquing delayed event to itself, for another
+        // chance to feed data to REPL. Otherwise, there
+        // can be situation when buffer has bunch of data,
+        // and sits unprocessed, because we consumed all
+        // processing signals like this.
+        return;
+    }
+
+    int c, ret = 0;
+    while ((c = ringbuf_get(&stdin_ringbuf)) >= 0) {
+        if (c == mp_interrupt_char) {
+            mp_keyboard_interrupt();
+        }
+        ret = pyexec_event_repl_process_char(c);
+        if (ret & PYEXEC_FORCED_EXIT) {
+            break;
+        }
+    }
+
+    if (ret & PYEXEC_FORCED_EXIT) {
+        soft_reset();
+    }
+}
+
+void uart_task_init() {
+    system_os_task(uart_task_handler, UART_TASK_ID, uart_evt_queue, sizeof(uart_evt_queue) / sizeof(*uart_evt_queue));
+}
+#endif */
+
diff --git a/ports/gprs_a9/uart.h b/ports/gprs_a9/uart.h
new file mode 100644
index 0000000000000..731e256b07240
--- /dev/null
+++ b/ports/gprs_a9/uart.h
@@ -0,0 +1,24 @@
+#include <stdint.h>
+#include <stdio.h>
+
+#include "py/ringbuf.h"
+
+#include "api_hal_uart.h"
+
+#define UART_NPORTS (2)
+#define UART_STATIC_RXBUF_LEN (16)
+
+void uart_set_rxbuf(uint8_t uart, uint8_t *buf, int len);
+int uart_get_rxbuf_len(uint8_t uart);
+bool uart_rx_wait(uint8_t uart, uint32_t timeout_us);
+int uart_rx_char(uint8_t uart);
+uint32_t uart_tx_one_char(uint8_t uart, char c);
+int uart_rx_any(uint8_t uart);
+int uart_tx_any_room(uint8_t uart);
+bool uart_setup(uint8_t uart);
+bool uart_close(uint8_t uart);
+
+extern uint8_t *uart_ringbuf_array[2];
+extern UART_Config_t uart_dev[UART_NPORTS];
+extern ringbuf_t uart_ringbuf[UART_NPORTS];
+

From 4e56e54645ffd5ff0200a9865f8b5b10d5fd3a9f Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sun, 5 Jan 2020 18:55:25 +0100
Subject: [PATCH 3396/3533] Fix warning

---
 ports/gprs_a9/mphalport.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ports/gprs_a9/mphalport.h b/ports/gprs_a9/mphalport.h
index ceebe004c0125..06d9618b41f0f 100644
--- a/ports/gprs_a9/mphalport.h
+++ b/ports/gprs_a9/mphalport.h
@@ -33,6 +33,7 @@
 #include "stdbool.h"
 #include "lib/utils/interrupt_char.h"
 #include "time.h"
+#include "py/obj.h"
 
 #define MP_HAL_PIN_FMT "%u"
 #define mp_hal_pin_name(p) (p)
@@ -50,6 +51,7 @@ __attribute__((always_inline)) static inline uint32_t mp_hal_ticks_cpu(void) {
   return clock();
 }
 
+mp_hal_pin_obj_t mp_hal_get_pin_obj(mp_obj_t pin_in);
 void mp_hal_pin_input(mp_hal_pin_obj_t pin_id);
 void mp_hal_pin_output(mp_hal_pin_obj_t pin_id);
 int mp_hal_pin_read(mp_hal_pin_obj_t pin_id);

From a21f95d5c493cde0e7c8ce573df6f9e58950c4c3 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sun, 5 Jan 2020 18:58:48 +0100
Subject: [PATCH 3397/3533] Mention hardware UART in README

[skip ci]
---
 ports/gprs_a9/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/gprs_a9/README.md b/ports/gprs_a9/README.md
index 34674282a7879..e57f6f1f5fcf6 100644
--- a/ports/gprs_a9/README.md
+++ b/ports/gprs_a9/README.md
@@ -70,7 +70,7 @@ blink.blink(1)
 - [x] GPIO: `machine.Pin`
 - [x] ADC: `machine.ADC`
 - [ ] PWM: `machine.PWM`
-- [ ] UART: `machine.UART` (software UART?)
+- [x] UART: `machine.UART` (only hardware UART so far)
 - [x] Cellular misc (IMEI, ICCID, ...): `cellular`
 - [x] GPS: `gps`
 - [x] I2C: `i2c`

From 3cb3272807c660495ace6a69ba676e21de85fb1d Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sun, 5 Jan 2020 19:33:09 +0100
Subject: [PATCH 3398/3533] Small changes in README

[skip ci]
---
 ports/gprs_a9/README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ports/gprs_a9/README.md b/ports/gprs_a9/README.md
index e57f6f1f5fcf6..ff3b9629d0b98 100644
--- a/ports/gprs_a9/README.md
+++ b/ports/gprs_a9/README.md
@@ -70,11 +70,11 @@ blink.blink(1)
 - [x] GPIO: `machine.Pin`
 - [x] ADC: `machine.ADC`
 - [ ] PWM: `machine.PWM`
-- [x] UART: `machine.UART` (only hardware UART so far)
+- [x] UART: `machine.UART` (hw)
+- [x] SPI: `machine.SPI` (sw)
+- [x] I2C: `i2c` (hw)
 - [x] Cellular misc (IMEI, ICCID, ...): `cellular`
 - [x] GPS: `gps`
-- [x] I2C: `i2c`
-- [x] SPI: `machine.SPI` (software only)
 - [x] time: `utime`
 - [x] File system
 - [x] GPRS, DNS: `cellular`, `socket`, `ssl`

From 8d09ca0475d91fd573b2bc7874ef2e555616b64c Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sun, 5 Jan 2020 19:49:50 +0100
Subject: [PATCH 3399/3533] Fix empty path

---
 ports/gprs_a9/moduos.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ports/gprs_a9/moduos.c b/ports/gprs_a9/moduos.c
index ff4294bce11bf..d0521cdf55404 100644
--- a/ports/gprs_a9/moduos.c
+++ b/ports/gprs_a9/moduos.c
@@ -334,6 +334,8 @@ mp_obj_t moduos_internal_flash_ilistdir(mp_obj_t path_in) {
     //     name (str): folder to list;
     // ========================================
     const char* path = mp_obj_str_get_str(path_in);
+    if (strlen(path) == 0)
+        path = ".";
     ensure_is_dir(path);
     Dir_t* dir = API_FS_OpenDir(path);
     native_vfs_ilistdir_it_t *iter = m_new_obj(native_vfs_ilistdir_it_t);

From 3794fc5977251c96cf279273d0e6d95b41294c24 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sun, 12 Jan 2020 14:20:32 +0100
Subject: [PATCH 3400/3533] Fancy donate button

---
 ports/gprs_a9/README.md | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/ports/gprs_a9/README.md b/ports/gprs_a9/README.md
index ff3b9629d0b98..362ba8bbc5735 100644
--- a/ports/gprs_a9/README.md
+++ b/ports/gprs_a9/README.md
@@ -1,9 +1,7 @@
-Your support is important for this port: please consider donating.
-
-[![paypal](https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=2RZCNXCUCP4YG&source=url)
-
 [![Build Status](https://travis-ci.org/pulkin/micropython.svg?branch=master)](https://travis-ci.org/pulkin/micropython)
 [![Build Status](https://dev.azure.com/gpulkin/micropython/_apis/build/status/pulkin.micropython?branchName=master)](https://dev.azure.com/gpulkin/micropython/_build/latest?definitionId=1&branchName=master)
+[[![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)]](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=2RZCNXCUCP4YG&source=url)
+
 ## The module
 
 ![A9G](https://raw.githubusercontent.com/Ai-Thinker-Open/GPRS_C_SDK/master/doc/assets/pudding_pin.png)

From 249af9d578509f9549b13b2040f35a06d48277e1 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sun, 12 Jan 2020 14:21:39 +0100
Subject: [PATCH 3401/3533] Fix donate badge

---
 ports/gprs_a9/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/gprs_a9/README.md b/ports/gprs_a9/README.md
index 362ba8bbc5735..c007a861aa1b1 100644
--- a/ports/gprs_a9/README.md
+++ b/ports/gprs_a9/README.md
@@ -1,6 +1,6 @@
 [![Build Status](https://travis-ci.org/pulkin/micropython.svg?branch=master)](https://travis-ci.org/pulkin/micropython)
 [![Build Status](https://dev.azure.com/gpulkin/micropython/_apis/build/status/pulkin.micropython?branchName=master)](https://dev.azure.com/gpulkin/micropython/_build/latest?definitionId=1&branchName=master)
-[[![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)]](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=2RZCNXCUCP4YG&source=url)
+[![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=2RZCNXCUCP4YG&source=url)
 
 ## The module
 

From 8cfb8e0f8b697490c626650ab4c3780f385dff29 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sun, 12 Jan 2020 14:35:31 +0100
Subject: [PATCH 3402/3533] Shorten help message towards esp8266-style

---
 ports/gprs_a9/help.c | 27 ++++-----------------------
 1 file changed, 4 insertions(+), 23 deletions(-)

diff --git a/ports/gprs_a9/help.c b/ports/gprs_a9/help.c
index d7d646c5400cb..a952385a05b4e 100644
--- a/ports/gprs_a9/help.c
+++ b/ports/gprs_a9/help.c
@@ -30,34 +30,15 @@
 #include "py/builtin.h"
 
 const char gprs_a9_help_text[] =
-"Welcome to MicroPython on the GPRS A9/A9G!\n"
+"Welcome to MicroPython on GPRS A9/A9G!\n"
 "\n"
-"For generic online docs please visit http://docs.micropython.org/\n"
-"\n"
-"For access to the hardware use the 'machine' module:\n"
-"\n"
-"import machine\n"
-"led = machine.Pin(27, machine.Pin.OUT, 0)\n"
-"led.value(1)\n"
-"pin25 = machine.Pin(25, machine.Pin.IN, machine.Pin.PULL_UP)\n"
-"print(pin25.value())\n"
-"i2c = machine.I2C(id=2,freq=400000)\n"
-"i2c.scan()\n"
-"i2c.writeto(addr, b'1234')\n"
-"i2c.readfrom(addr, 4)\n"
+"For online docs please visit http://docs.micropython.org/\n"
+"Port-specific features are outlined at https://github.com/pulkin/micropython/tree/master/ports/gprs_a9#functionality\n"
 "\n"
 "Basic GPRS configuration:\n"
 "\n"
 "import cellular\n"
-"cellular.attach()\n"
-"cellular.activate(\"access_point\",\"user\",\"password\")\n"
-"\n"
-"Sockets:\n"
-"import usocket\n"
-"s = usocket.socket()\n"
-"s.connect((\"httpstat.us\", 80))\n"
-"s.send(\"GET / HTTP/1.1\\r\\nHost: httpstat.us\\r\\nConnection: close\\r\\n\\r\\n\")\n"
-"print(s.recv(16))\n"
+"cellular.gprs(\"access_point\",\"user\",\"password\")\n"
 "\n"
 "Control commands:\n"
 "  CTRL-A        -- on a blank line, enter raw REPL mode\n"

From 47557424a6b16d9f48c18051cc09873f1317e1d7 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sun, 12 Jan 2020 19:19:50 +0100
Subject: [PATCH 3403/3533] Switch to esp8266-like implementation for REPL
 dupterm. Close #23

---
 ports/gprs_a9/main.c         | 59 +++++++++++++++++++-----------------
 ports/gprs_a9/mpconfigport.h |  4 +--
 ports/gprs_a9/mphalport.c    | 41 +++++++++++--------------
 ports/gprs_a9/uart.c         | 13 --------
 ports/gprs_a9/uart.h         |  2 +-
 5 files changed, 52 insertions(+), 67 deletions(-)

diff --git a/ports/gprs_a9/main.c b/ports/gprs_a9/main.c
index ab0cfdde09d74..8e5e50b40775f 100644
--- a/ports/gprs_a9/main.c
+++ b/ports/gprs_a9/main.c
@@ -35,10 +35,11 @@
 #include "py/repl.h"
 #include "py/gc.h"
 #include "py/mperrno.h"
-#include "lib/utils/pyexec.h"
 #include "py/stackctrl.h"
 #include "py/mpstate.h"
 #include "py/mphal.h"
+#include "extmod/misc.h"
+#include "lib/utils/pyexec.h"
 
 #include "stdbool.h"
 #include "api_os.h"
@@ -155,13 +156,11 @@ void MP_WEAK __assert_func(const char *file, int line, const char *func, const c
 */
 
 void MicroPyTask(void *pData) {
-    // The primary event-driven UART loop
 
     OS_Task_Info_t info;
     OS_GetTaskInfo(microPyTaskHandle, &info);
     MicroPy_Event_t* event;
     Buffer_Init(&fifoBuffer, fifoBufferData, sizeof(fifoBufferData));
-    mp_hal_pyrepl_uart_init();
 
 soft_reset:
     mp_stack_ctrl_init();
@@ -198,15 +197,22 @@ void MicroPyTask(void *pData) {
     // if (pyexec_mode_kind == PYEXEC_MODE_FRIENDLY_REPL) {
     //     pyexec_file("main.py");
     // }
-    pyexec_event_repl_init();
+    {
+        mp_obj_t args[2];
+        args[0] = MP_OBJ_NEW_SMALL_INT(0);
+        args[1] = MP_OBJ_NEW_SMALL_INT(115200);
+        args[0] = pyb_uart_type.make_new(&pyb_uart_type, 2, 0, args);
+        args[1] = MP_OBJ_NEW_SMALL_INT(1);
+        // extern mp_obj_t mp_os_dupterm(size_t n_args, const mp_obj_t *args);
+        mp_uos_dupterm_obj.fun.var(2, args);
+    }
+    // pyexec_event_repl_init();
     
     uint8_t reset = 0;
-    while (1) if (OS_WaitEvent(microPyTaskHandle, (void**)&event, OS_TIME_OUT_WAIT_FOREVER)) {
-
-        Trace(1,"microPy task received event:%d",event->id);
-        // PM_SetSysMinFreq(PM_SYS_FREQ_178M);
+    // while (1) if (OS_WaitEvent(microPyTaskHandle, (void**)&event, OS_TIME_OUT_WAIT_FOREVER)) {
+    while (1) {
 
-        switch(event->id) {
+        /* switch(event->id) {
             case MICROPY_EVENT_ID_UART_RECEIVED: {
                 uint8_t c;
                 Trace(1, "micropy task received data length: %d", event->param1);
@@ -223,9 +229,19 @@ void MicroPyTask(void *pData) {
         }
 
         OS_Free(event->pParam1);
-        OS_Free(event);
-        if (reset) break;
-        // PM_SetSysMinFreq(PM_SYS_FREQ_32K);
+        OS_Free(event);*/
+
+        if (pyexec_mode_kind == PYEXEC_MODE_RAW_REPL) {
+            if (pyexec_raw_repl() != 0) {
+                break;
+            }
+        } else {
+            if (pyexec_friendly_repl() != 0) {
+                break;
+            }
+        }
+        MICROPY_EVENT_POLL_HOOK
+        OS_SleepUs(1);
     }
 
 #if MICROPY_ENABLE_GC
@@ -357,7 +373,7 @@ void EventDispatch(API_Event_t* pEvent)
         // ====
         case API_EVENT_ID_UART_RECEIVED:
             Trace(1,"UART%d received:%d,%s",pEvent->param1,pEvent->param2,pEvent->pParam1);
-            if(pEvent->param1 == UART1)
+            /*if(pEvent->param1 == UART1)
             {
                 MicroPy_Event_t* event = (MicroPy_Event_t*)OS_Malloc(sizeof(MicroPy_Event_t));
                 if(!event)
@@ -385,8 +401,8 @@ void EventDispatch(API_Event_t* pEvent)
                 memset((void*)event,0,sizeof(MicroPy_Event_t));
                 event->id = MICROPY_EVENT_ID_UART_RECEIVED;
                 event->param1 = len;
-                OS_SendEvent(microPyTaskHandle, (void*)event, OS_TIME_OUT_WAIT_FOREVER, 0);
-            }
+                OS_SendEvent(microPyTaskHandle, (void*) event, OS_TIME_OUT_WAIT_FOREVER, 0);
+            }*/
             break;
 
         // GPS
@@ -412,13 +428,10 @@ void AppMainTask(void *pData)
     {
         if(OS_WaitEvent(mainTaskHandle, (void**)&event, OS_TIME_OUT_WAIT_FOREVER))
         {
-            // PM_SetSysMinFreq(PM_SYS_FREQ_178M);//set back system min frequency to 178M or higher(/lower) value
             EventDispatch(event);
             OS_Free(event->pParam1);
             OS_Free(event->pParam2);
             OS_Free(event);
-            // PM_SetSysMinFreq(PM_SYS_FREQ_32K);//release system freq to enter sleep mode to save power,
-                                              //system remain runable but slower, and close eripheral not using
         }
     }
 }
@@ -429,16 +442,6 @@ void _Main(void)
 }
 
 
-int mp_hal_stdin_rx_chr(void) {
-    uint8_t c;
-    for (;;) {
-        if (Buffer_Gets(&fifoBuffer, &c, 1))
-            return c;
-        MICROPY_EVENT_POLL_HOOK
-        OS_Sleep(1);
-    }
-}
-
 
 #if MICROPY_DEBUG_VERBOSE
 int DEBUG_printf(const char *fmt, ...) {
diff --git a/ports/gprs_a9/mpconfigport.h b/ports/gprs_a9/mpconfigport.h
index cf835505e3d1d..38af3a76fcce3 100644
--- a/ports/gprs_a9/mpconfigport.h
+++ b/ports/gprs_a9/mpconfigport.h
@@ -31,7 +31,7 @@
 
 // Python internal features
 #define MICROPY_ENABLE_COMPILER             (1)
-#define MICROPY_REPL_EVENT_DRIVEN           (1)
+#define MICROPY_REPL_EVENT_DRIVEN           (0)
 #define MICROPY_ENABLE_GC                   (1)
 #define MICROPY_LONGINT_IMPL                (MICROPY_LONGINT_IMPL_MPZ)
 #define MICROPY_FLOAT_IMPL                  (MICROPY_FLOAT_IMPL_DOUBLE)
@@ -144,7 +144,7 @@
 #define MICROPY_PY_UBINASCII_CRC32          (1)
 #define MICROPY_PY_URANDOM                  (1)
 #define MICROPY_PY_URANDOM_EXTRA_FUNCS      (1)
-#define MICROPY_PY_OS_DUPTERM               (1)
+#define MICROPY_PY_OS_DUPTERM               (2)
 #define MICROPY_PY_MACHINE                  (1)
 #define MICROPY_PY_MACHINE_PIN_MAKE_NEW     mp_pin_make_new
 // #define MICROPY_PY_MACHINE_PULSE            (1)
diff --git a/ports/gprs_a9/mphalport.c b/ports/gprs_a9/mphalport.c
index 2d1ee74ced75c..44af42fa81b63 100644
--- a/ports/gprs_a9/mphalport.c
+++ b/ports/gprs_a9/mphalport.c
@@ -41,38 +41,33 @@
 #include "py/runtime.h"
 #include "extmod/misc.h"
 
-void mp_hal_pyrepl_uart_init() {
-    UART_Config_t config = {
-        .baudRate = UART_BAUD_RATE_115200,
-        .dataBits = UART_DATA_BITS_8,
-        .stopBits = UART_STOP_BITS_1,
-        .parity   = UART_PARITY_NONE,
-        .rxCallback = NULL,
-        .useEvent = true,
-    };
-    UART_Init(UART1, config);
+int mp_hal_stdin_rx_chr(void) {
+    // This should be blocking
+    for (;;) {
+        int c = mp_uos_dupterm_rx_chr();
+        if (c != -1) {
+            return c;
+        }
+        OS_SleepUs(1);
+    }
 }
 
-// Send string of given length
-void mp_hal_stdout_tx_strn(const char *str, mp_uint_t len) {
-    mp_uos_dupterm_tx_strn(str, len);
-    UART_Write(UART1,(uint8_t*)str,len);
+void mp_hal_stdout_tx_str(const char *str) {
+    mp_uos_dupterm_tx_strn(str, strlen(str));
 }
 
-// Send zero-terminated string
-void mp_hal_stdout_tx_str(const char *str) {
-    mp_hal_stdout_tx_strn(str, strlen(str));
+void mp_hal_stdout_tx_strn(const char *str, uint32_t len) {
+    mp_uos_dupterm_tx_strn(str, len);
 }
 
-// Efficiently convert "\n" to "\r\n"
-void mp_hal_stdout_tx_strn_cooked(const char *str, size_t len) {
+void mp_hal_stdout_tx_strn_cooked(const char *str, uint32_t len) {
     const char *last = str;
     while (len--) {
         if (*str == '\n') {
             if (str > last) {
-                mp_hal_stdout_tx_strn(last, str - last);
+                mp_uos_dupterm_tx_strn(last, str - last);
             }
-            mp_hal_stdout_tx_strn("\r\n", 2);
+            mp_uos_dupterm_tx_strn("\r\n", 2);
             ++str;
             last = str;
         } else {
@@ -80,7 +75,7 @@ void mp_hal_stdout_tx_strn_cooked(const char *str, size_t len) {
         }
     }
     if (str > last) {
-        mp_hal_stdout_tx_strn(last, str - last);
+        mp_uos_dupterm_tx_strn(last, str - last);
     }
 }
 
@@ -103,8 +98,8 @@ void mp_hal_delay_ms(uint32_t ms) {
 void mp_hal_delay_us(uint32_t us) {
     uint32_t start = clock();
     while ((clock() - start) * 1000 < us * CLOCKS_PER_MSEC) {
+        MICROPY_EVENT_POLL_HOOK
         OS_SleepUs(1);
-        mp_handle_pending();
     }
 }
 
diff --git a/ports/gprs_a9/uart.c b/ports/gprs_a9/uart.c
index ea3f8926a1f7b..790f9fafa03e6 100644
--- a/ports/gprs_a9/uart.c
+++ b/ports/gprs_a9/uart.c
@@ -42,9 +42,6 @@
 // The two ports
 static const UART_Port_t uart_port[] = {UART1, UART2};
 
-// REPL port
-static uint8_t uart_os = 0;
-
 // rx data buffers
 uint8_t uart1_ringbuf_array[UART_STATIC_RXBUF_LEN];
 uint8_t uart2_ringbuf_array[UART_STATIC_RXBUF_LEN];
@@ -102,16 +99,6 @@ bool uart_close(uint8_t uart) {
     return UART_Close(uart_port[uart]);
 }
 
-static uint32_t uart_os_write_char(char c) {
-    // python REPL
-    return uart_tx_one_char(uart_os, c);
-}
-
-void uart_os_config(uint8_t uart) {
-    // sets python REPL
-    uart_os = uart;
-}
-
 static void uart_rx_intr_handler(UART_Callback_Param_t param) {
     // handles rx interrupts
     ringbuf_t *ringbuf = uart_ringbuf + param.port - 1;
diff --git a/ports/gprs_a9/uart.h b/ports/gprs_a9/uart.h
index 731e256b07240..4a051f345e88a 100644
--- a/ports/gprs_a9/uart.h
+++ b/ports/gprs_a9/uart.h
@@ -6,7 +6,7 @@
 #include "api_hal_uart.h"
 
 #define UART_NPORTS (2)
-#define UART_STATIC_RXBUF_LEN (16)
+#define UART_STATIC_RXBUF_LEN (256)
 
 void uart_set_rxbuf(uint8_t uart, uint8_t *buf, int len);
 int uart_get_rxbuf_len(uint8_t uart);

From f72e4cdeaefdffbd35276880f0c7ab4c0bb1e209 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sun, 12 Jan 2020 19:24:41 +0100
Subject: [PATCH 3404/3533] Indicate that ST7735 will be removed

---
 ports/gprs_a9/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/gprs_a9/README.md b/ports/gprs_a9/README.md
index c007a861aa1b1..e86aff02e8aeb 100644
--- a/ports/gprs_a9/README.md
+++ b/ports/gprs_a9/README.md
@@ -90,7 +90,7 @@ Additional libraries: install via [`upip`](https://docs.micropython.org/en/lates
 4. [`gps`](#gps): everything related to GPS and assisted positioning
 5. [`machine`](#machine): hardware and power control
 6. [`i2c`](#i2c): i2c implementation
-7. [`st7735`](#ST7735): ST7735 over software SPI display implementation
+7. [`st7735`](#ST7735): ST7735 over software SPI display implementation **to be removed**
 8. [Other modules](#Misc)
 9. [Notes](#Notes)
 

From 1acf3406ba0f22340846f3226d6a686f74d06f50 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Tue, 14 Jan 2020 22:48:13 +0100
Subject: [PATCH 3405/3533] Transfer UART initialization to machine_uart.c

---
 ports/gprs_a9/machine_uart.c | 11 +++++++++++
 ports/gprs_a9/main.c         | 10 ----------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/ports/gprs_a9/machine_uart.c b/ports/gprs_a9/machine_uart.c
index 6160cabc8a204..20d6794b76102 100644
--- a/ports/gprs_a9/machine_uart.c
+++ b/ports/gprs_a9/machine_uart.c
@@ -32,6 +32,7 @@
 #include "py/stream.h"
 #include "py/mperrno.h"
 #include "py/mphal.h"
+#include "extmod/misc.h"
 
 #include "uart.h"
 #include "modmachine.h"
@@ -51,6 +52,16 @@ STATIC const char *_parity_name[] = {"None", "1", "0"};
 
 void modmachine_uart_init0(void) {
     UART_Close(UART2);
+    UART_Close(UART1);
+
+    // Attach UART to dupterm(1)
+    mp_obj_t args[2];
+    args[0] = MP_OBJ_NEW_SMALL_INT(0);
+    args[1] = MP_OBJ_NEW_SMALL_INT(115200);
+    args[0] = pyb_uart_type.make_new(&pyb_uart_type, 2, 0, args);
+    args[1] = MP_OBJ_NEW_SMALL_INT(1);
+    // extern mp_obj_t mp_os_dupterm(size_t n_args, const mp_obj_t *args);
+    mp_uos_dupterm_obj.fun.var(2, args);
 }
 
 /******************************************************************************/
diff --git a/ports/gprs_a9/main.c b/ports/gprs_a9/main.c
index 8e5e50b40775f..30a36b088ba08 100644
--- a/ports/gprs_a9/main.c
+++ b/ports/gprs_a9/main.c
@@ -38,7 +38,6 @@
 #include "py/stackctrl.h"
 #include "py/mpstate.h"
 #include "py/mphal.h"
-#include "extmod/misc.h"
 #include "lib/utils/pyexec.h"
 
 #include "stdbool.h"
@@ -197,15 +196,6 @@ void MicroPyTask(void *pData) {
     // if (pyexec_mode_kind == PYEXEC_MODE_FRIENDLY_REPL) {
     //     pyexec_file("main.py");
     // }
-    {
-        mp_obj_t args[2];
-        args[0] = MP_OBJ_NEW_SMALL_INT(0);
-        args[1] = MP_OBJ_NEW_SMALL_INT(115200);
-        args[0] = pyb_uart_type.make_new(&pyb_uart_type, 2, 0, args);
-        args[1] = MP_OBJ_NEW_SMALL_INT(1);
-        // extern mp_obj_t mp_os_dupterm(size_t n_args, const mp_obj_t *args);
-        mp_uos_dupterm_obj.fun.var(2, args);
-    }
     // pyexec_event_repl_init();
     
     uint8_t reset = 0;

From e3bdb20843b21556408006f177efbbaacc864f2f Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Tue, 14 Jan 2020 22:48:26 +0100
Subject: [PATCH 3406/3533] Remove unused variables

---
 ports/gprs_a9/main.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/ports/gprs_a9/main.c b/ports/gprs_a9/main.c
index 30a36b088ba08..8231870c9a589 100644
--- a/ports/gprs_a9/main.c
+++ b/ports/gprs_a9/main.c
@@ -198,7 +198,6 @@ void MicroPyTask(void *pData) {
     // }
     // pyexec_event_repl_init();
     
-    uint8_t reset = 0;
     // while (1) if (OS_WaitEvent(microPyTaskHandle, (void**)&event, OS_TIME_OUT_WAIT_FOREVER)) {
     while (1) {
 
@@ -247,7 +246,6 @@ void MicroPyTask(void *pData) {
 
 void EventDispatch(API_Event_t* pEvent)
 {
-    uint32_t len = 0;
     switch(pEvent->id)
     {
         case API_EVENT_ID_POWER_ON:

From 20bc4cfcdce8a4e76d2a32c79f54446442e43a99 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Tue, 14 Jan 2020 23:31:12 +0100
Subject: [PATCH 3407/3533] Fix UART ctrl-c interrupt with the new dupterm
 setup

---
 ports/gprs_a9/machine_uart.c | 20 ++++++-------------
 ports/gprs_a9/modmachine.h   | 11 +++++++++++
 ports/gprs_a9/moduos.c       | 37 +++++++++++++++++-------------------
 ports/gprs_a9/moduos.h       |  2 ++
 ports/gprs_a9/mphalport.c    |  3 +++
 ports/gprs_a9/mphalport.h    |  3 +++
 ports/gprs_a9/uart.c         | 11 +++++++++--
 7 files changed, 51 insertions(+), 36 deletions(-)

diff --git a/ports/gprs_a9/machine_uart.c b/ports/gprs_a9/machine_uart.c
index 20d6794b76102..9398543c4e99e 100644
--- a/ports/gprs_a9/machine_uart.c
+++ b/ports/gprs_a9/machine_uart.c
@@ -32,21 +32,10 @@
 #include "py/stream.h"
 #include "py/mperrno.h"
 #include "py/mphal.h"
-#include "extmod/misc.h"
 
-#include "uart.h"
+#include "mphalport.h"
 #include "modmachine.h"
-
-typedef struct _pyb_uart_obj_t {
-    mp_obj_base_t base;
-    uint8_t uart_id;
-    uint8_t bits;
-    uint8_t parity;
-    uint8_t stop;
-    uint32_t baudrate;
-    uint16_t timeout;       // timeout waiting for first char (in ms)
-    uint16_t timeout_char;  // timeout waiting between chars (in ms)
-} pyb_uart_obj_t;
+#include "moduos.h"
 
 STATIC const char *_parity_name[] = {"None", "1", "0"};
 
@@ -54,6 +43,9 @@ void modmachine_uart_init0(void) {
     UART_Close(UART2);
     UART_Close(UART1);
 
+    uart_attached_to_dupterm[0] = 0;
+    uart_attached_to_dupterm[1] = 0;
+
     // Attach UART to dupterm(1)
     mp_obj_t args[2];
     args[0] = MP_OBJ_NEW_SMALL_INT(0);
@@ -61,7 +53,7 @@ void modmachine_uart_init0(void) {
     args[0] = pyb_uart_type.make_new(&pyb_uart_type, 2, 0, args);
     args[1] = MP_OBJ_NEW_SMALL_INT(1);
     // extern mp_obj_t mp_os_dupterm(size_t n_args, const mp_obj_t *args);
-    mp_uos_dupterm_obj.fun.var(2, args);
+    os_dupterm(2, args);
 }
 
 /******************************************************************************/
diff --git a/ports/gprs_a9/modmachine.h b/ports/gprs_a9/modmachine.h
index 55fbcfcd499d6..b4fddcd87db71 100644
--- a/ports/gprs_a9/modmachine.h
+++ b/ports/gprs_a9/modmachine.h
@@ -29,6 +29,17 @@
 #include "py/obj.h"
 #include "api_event.h"
 
+typedef struct _pyb_uart_obj_t {
+    mp_obj_base_t base;
+    uint8_t uart_id;
+    uint8_t bits;
+    uint8_t parity;
+    uint8_t stop;
+    uint32_t baudrate;
+    uint16_t timeout;       // timeout waiting for first char (in ms)
+    uint16_t timeout_char;  // timeout waiting between chars (in ms)
+} pyb_uart_obj_t;
+
 extern const mp_obj_type_t machine_pin_type;
 extern const mp_obj_type_t machine_adc_type;
 extern const mp_obj_type_t pyb_uart_type;
diff --git a/ports/gprs_a9/moduos.c b/ports/gprs_a9/moduos.c
index d0521cdf55404..e4713b357cfb6 100644
--- a/ports/gprs_a9/moduos.c
+++ b/ports/gprs_a9/moduos.c
@@ -29,6 +29,7 @@
  */
 
 #include "moduos.h"
+#include "modmachine.h"
 
 #include <string.h>
 
@@ -520,21 +521,24 @@ STATIC const mp_obj_type_t moduos_internal_flash_type = {
     .locals_dict = (mp_obj_dict_t*)&internal_flash_locals_dict,
 };
 
-#if MICROPY_PY_OS_DUPTERM
-/* STATIC mp_obj_t os_dupterm_notify(mp_obj_t obj_in) {
-    (void) obj_in;
-    for (;;) {
-        int c = mp_uos_dupterm_rx_chr();
-        if (c < 0) {
-            break;
-        }
-        ringbuf_put(&stdin_ringbuf, c);
+mp_obj_t os_dupterm(size_t n_args, const mp_obj_t *args) {
+    // ========================================
+    // Wraps dupterm to track attachment of
+    // built-in UART.
+    // ========================================
+    mp_obj_t prev_obj = mp_uos_dupterm_obj.fun.var(n_args, args);
+    if (mp_obj_get_type(args[0]) == &pyb_uart_type) {
+        pyb_uart_obj_t *uart = MP_OBJ_TO_PTR(args[0]);
+        ++uart_attached_to_dupterm[uart->uart_id];
     }
-    return mp_const_none;
+    if (mp_obj_get_type(prev_obj) == &pyb_uart_type) {
+        pyb_uart_obj_t *uart = MP_OBJ_TO_PTR(prev_obj);
+        --uart_attached_to_dupterm[uart->uart_id];
+    }
+    return prev_obj;
 }
 
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(os_dupterm_notify_obj, os_dupterm_notify);*/
-#endif
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(os_dupterm_obj, 1, 2, os_dupterm);
 
 STATIC const mp_rom_map_elem_t os_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_uos) },
@@ -543,11 +547,7 @@ STATIC const mp_rom_map_elem_t os_module_globals_table[] = {
 
     { MP_ROM_QSTR(MP_QSTR_uname), MP_ROM_PTR(&os_uname_obj) },
     { MP_ROM_QSTR(MP_QSTR_urandom), MP_ROM_PTR(&os_urandom_obj) },
-    #if MICROPY_PY_OS_DUPTERM
-    { MP_ROM_QSTR(MP_QSTR_dupterm), MP_ROM_PTR(&mp_uos_dupterm_obj) },
-    // { MP_ROM_QSTR(MP_QSTR_dupterm_notify), MP_ROM_PTR(&mp_os_dupterm_notify_obj) },
-    #endif
-    #if MICROPY_VFS
+    { MP_ROM_QSTR(MP_QSTR_dupterm), MP_ROM_PTR(&os_dupterm_obj) },
     { MP_ROM_QSTR(MP_QSTR_ilistdir), MP_ROM_PTR(&mp_vfs_ilistdir_obj) },
     { MP_ROM_QSTR(MP_QSTR_listdir), MP_ROM_PTR(&mp_vfs_listdir_obj) },
     { MP_ROM_QSTR(MP_QSTR_mkdir), MP_ROM_PTR(&mp_vfs_mkdir_obj) },
@@ -560,10 +560,7 @@ STATIC const mp_rom_map_elem_t os_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_statvfs), MP_ROM_PTR(&mp_vfs_statvfs_obj) },
     { MP_ROM_QSTR(MP_QSTR_mount), MP_ROM_PTR(&mp_vfs_mount_obj) },
     { MP_ROM_QSTR(MP_QSTR_umount), MP_ROM_PTR(&mp_vfs_umount_obj) },
-    #if MICROPY_VFS_FAT
     { MP_ROM_QSTR(MP_QSTR_VfsFat), MP_ROM_PTR(&mp_fat_vfs_type) },
-    #endif
-    #endif
 };
 
 STATIC MP_DEFINE_CONST_DICT(os_module_globals, os_module_globals_table);
diff --git a/ports/gprs_a9/moduos.h b/ports/gprs_a9/moduos.h
index f041736d58f86..77e0b416bdd49 100644
--- a/ports/gprs_a9/moduos.h
+++ b/ports/gprs_a9/moduos.h
@@ -33,6 +33,8 @@ void moduos_init0(void);
 extern const mp_obj_type_t mp_type_internal_flash_fileio;
 extern const mp_obj_type_t mp_type_internal_flash_textio;
 
+mp_obj_t os_dupterm(size_t n_args, const mp_obj_t *args);
+
 MP_DECLARE_CONST_FUN_OBJ_KW(internal_flash_open_obj);
 int maybe_raise_FSError(int errno);
 int translate_io_errno(int errno);
diff --git a/ports/gprs_a9/mphalport.c b/ports/gprs_a9/mphalport.c
index 44af42fa81b63..f9e7b8dd3ef58 100644
--- a/ports/gprs_a9/mphalport.c
+++ b/ports/gprs_a9/mphalport.c
@@ -37,10 +37,13 @@
 #include "api_hal_uart.h"
 #include "buffer.h"
 #include "time.h"
+#include "uart.h"
 
 #include "py/runtime.h"
 #include "extmod/misc.h"
 
+int uart_attached_to_dupterm[UART_NPORTS];
+
 int mp_hal_stdin_rx_chr(void) {
     // This should be blocking
     for (;;) {
diff --git a/ports/gprs_a9/mphalport.h b/ports/gprs_a9/mphalport.h
index 06d9618b41f0f..88fa782291dbd 100644
--- a/ports/gprs_a9/mphalport.h
+++ b/ports/gprs_a9/mphalport.h
@@ -34,11 +34,14 @@
 #include "lib/utils/interrupt_char.h"
 #include "time.h"
 #include "py/obj.h"
+#include "uart.h"
 
 #define MP_HAL_PIN_FMT "%u"
 #define mp_hal_pin_name(p) (p)
 #define mp_hal_pin_obj_t uint32_t
 
+extern int uart_attached_to_dupterm[UART_NPORTS];
+
 void mp_hal_set_interrupt_char(int c);
 void mp_hal_pyrepl_uart_init();
 
diff --git a/ports/gprs_a9/uart.c b/ports/gprs_a9/uart.c
index 790f9fafa03e6..d6af02df15448 100644
--- a/ports/gprs_a9/uart.c
+++ b/ports/gprs_a9/uart.c
@@ -102,8 +102,15 @@ bool uart_close(uint8_t uart) {
 static void uart_rx_intr_handler(UART_Callback_Param_t param) {
     // handles rx interrupts
     ringbuf_t *ringbuf = uart_ringbuf + param.port - 1;
-    for (uint32_t i=0; i<param.length; i++)
-        ringbuf_put(ringbuf, param.buf[i]);
+    int* to_dupterm = uart_attached_to_dupterm + param.port - 1;
+    for (uint32_t i=0; i<param.length; i++) {
+        if (param.buf[i] == mp_interrupt_char) {
+            if (*to_dupterm)
+                mp_keyboard_interrupt();
+        }
+        else
+            ringbuf_put(ringbuf, param.buf[i]);
+    }
 }
 
 bool uart_rx_wait(uint8_t uart, uint32_t timeout_us) {

From fd08db107c4a056e8c01edefbd337a6b4c57c2ab Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Thu, 16 Jan 2020 23:43:20 +0100
Subject: [PATCH 3408/3533] Close #24

---
 ports/gprs_a9/frozentest.py | 142 ++++++++++++++++++------------------
 ports/gprs_a9/modusocket.c  |  36 ++++++++-
 2 files changed, 105 insertions(+), 73 deletions(-)

diff --git a/ports/gprs_a9/frozentest.py b/ports/gprs_a9/frozentest.py
index ebde647e1ae9c..b9dc631aa0042 100644
--- a/ports/gprs_a9/frozentest.py
+++ b/ports/gprs_a9/frozentest.py
@@ -1,8 +1,9 @@
 # Settings
 test_send_sms = None
 # test_send_sms = "8800"
-test_filesystem = True
-test_gprs = False
+test_networks = False
+test_filesystem = False
+test_gprs = True
 
 # Operator name expected
 opname_expected = "KPNNL"
@@ -188,77 +189,78 @@
 
 if sim_present:
 
-    print("----------------")
-    print("Network")
-    print("----------------")
-    print("Resetting ...")
-    cel.reset()
-    print("Waiting 15 secs ...")
-    time.sleep(15)
-
-    cop_id, cop_name, status = cel.register()
-    print("Current operator:", cop_id, cop_name)
-    assert cop_name == opname_expected
-
-    print("Scanning ...")
-    ops = cel.scan()
-    print("Operators:", ops)
-    assert len(ops) > 0
-
-    for op_id, op_name, op_status in ops:
-        if op_name == opname_expected:
-            assert op_status == cel.OPERATOR_STATUS_CURRENT
-            assert op_id == cop_id
-            break
-    else:
-        raise RuntimeError("Operator '{}' not found".format(opname_expected))
-
-    fm = cel.flight_mode()
-    print("Flight mode:", fm)
-
-    print("Setting flight mode")
-    assert cel.flight_mode(True)  # Switch flight mode on
-    try:
+    if test_networks:
+        print("----------------")
+        print("Network")
+        print("----------------")
+        print("Resetting ...")
+        cel.reset()
+        print("Waiting 15 secs ...")
+        time.sleep(15)
+
+        cop_id, cop_name, status = cel.register()
+        print("Current operator:", cop_id, cop_name)
+        assert cop_name == opname_expected
+
+        print("Scanning ...")
+        ops = cel.scan()
+        print("Operators:", ops)
+        assert len(ops) > 0
+
+        for op_id, op_name, op_status in ops:
+            if op_name == opname_expected:
+                assert op_status == cel.OPERATOR_STATUS_CURRENT
+                assert op_id == cop_id
+                break
+        else:
+            raise RuntimeError("Operator '{}' not found".format(opname_expected))
+
+        fm = cel.flight_mode()
+        print("Flight mode:", fm)
+
+        print("Setting flight mode")
+        assert cel.flight_mode(True)  # Switch flight mode on
+        try:
+            cel.poll_network_exception()
+        except cel.CellularError as e:
+            print("Exception:", e)
+        else:
+            raise RuntimeError("Exception not raised")
+
+        reg = cel.is_network_registered()
+        print("Ntw registered:", reg)
+        assert not reg
+
+        print("Releasing flight mode")
+        assert not cel.flight_mode(False)  # Switch flight mode off
+        for i in range(10):
+            time.sleep(1)
+            if cel.is_network_registered():
+                break
+
+        reg = cel.is_network_registered()
+        print("Ntw registered:", reg)
+        assert reg
+
+        print("Setting a single wrong band")
+        cel.set_bands(cel.NETWORK_FREQ_BAND_PCS_1900)
         cel.poll_network_exception()
-    except cel.CellularError as e:
-        print("Exception:", e)
-    else:
-        raise RuntimeError("Exception not raised")
-
-    reg = cel.is_network_registered()
-    print("Ntw registered:", reg)
-    assert not reg
-
-    print("Releasing flight mode")
-    assert not cel.flight_mode(False)  # Switch flight mode off
-    for i in range(10):
-        time.sleep(1)
-        if cel.is_network_registered():
-            break
-
-    reg = cel.is_network_registered()
-    print("Ntw registered:", reg)
-    assert reg
+        for i in range(10):
+            time.sleep(1)
+            if not cel.is_network_registered():
+                break
 
-    print("Setting a single wrong band")
-    cel.set_bands(cel.NETWORK_FREQ_BAND_PCS_1900)
-    cel.poll_network_exception()
-    for i in range(10):
-        time.sleep(1)
-        if not cel.is_network_registered():
-            break
+        reg = cel.is_network_registered()
+        print("Ntw registered:", reg)
+        assert not reg
 
-    reg = cel.is_network_registered()
-    print("Ntw registered:", reg)
-    assert not reg
-
-    print("Resetting bands")
-    cel.set_bands()
-    cel.poll_network_exception()
-    for i in range(10):
-        time.sleep(1)
-        if cel.is_network_registered():
-            break
+        print("Resetting bands")
+        cel.set_bands()
+        cel.poll_network_exception()
+        for i in range(10):
+            time.sleep(1)
+            if cel.is_network_registered():
+                break
 
     reg = cel.is_network_registered()
     print("Ntw registered:", reg)
diff --git a/ports/gprs_a9/modusocket.c b/ports/gprs_a9/modusocket.c
index 4cdd9309640b9..f212ac4f5d762 100644
--- a/ports/gprs_a9/modusocket.c
+++ b/ports/gprs_a9/modusocket.c
@@ -441,7 +441,27 @@ STATIC mp_obj_t socket_setsockopt(size_t n_args, const mp_obj_t *args) {
     //     optname (int): option to set;
     //     value (int): value to set;
     // ========================================
-    mp_raise_NotImplementedError("Not implemented yet");
+    (void)n_args; // always 4
+    socket_obj_t *self = MP_OBJ_TO_PTR(args[0]);
+
+    int opt = mp_obj_get_int(args[2]);
+
+    switch (opt) {
+        // level: SOL_SOCKET
+        case SO_REUSEADDR: {
+            int val = mp_obj_get_int(args[3]);
+            int ret = LWIP_SETSOCKOPT(self->fd, SOL_SOCKET, opt, &val, sizeof(int));
+            if (ret != 0) {
+                int errno = LWIP_ERRNO();
+                exception_from_errno(errno);
+            }
+            break;
+        }
+
+        default:
+            mp_printf(&mp_plat_print, "Warning: lwip.setsockopt() option not implemented\n");
+    }
+
     return mp_const_none;
 }
 
@@ -453,7 +473,15 @@ STATIC mp_obj_t socket_settimeout(mp_obj_t self_in, mp_obj_t value) {
     // Args:
     //     timeout (int): timeout in seconds;
     // ========================================
-    mp_raise_NotImplementedError("Not implemented yet");
+    socket_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    if (value == mp_const_none) _socket_settimeout(self, UINT64_MAX);
+    else {
+        #if MICROPY_PY_BUILTINS_FLOAT
+        _socket_settimeout(self, mp_obj_get_float(value) * 1000L);
+        #else
+        _socket_settimeout(self, mp_obj_get_int(value) * 1000);
+        #endif
+    }
     return mp_const_none;
 }
 
@@ -465,7 +493,9 @@ STATIC mp_obj_t socket_setblocking(mp_obj_t self_in, mp_obj_t flag) {
     // Args:
     //     flag (bool): blocking or non-blocking mode;
     // ========================================
-    mp_raise_NotImplementedError("Not implemented yet");
+    socket_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    if (mp_obj_is_true(flag)) _socket_settimeout(self, UINT64_MAX);
+    else _socket_settimeout(self, 0);
     return mp_const_none;
 }
 

From 0ab6459a79ba92c264ab1e915be31f591e979212 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sun, 19 Jan 2020 00:32:20 +0100
Subject: [PATCH 3409/3533] Add cellular.agps_station_data convenience function
 for use in agps

---
 ports/gprs_a9/README.md     |  1 +
 ports/gprs_a9/modcellular.c | 53 ++++++++++++++++++++++++++++++++++---
 2 files changed, 51 insertions(+), 3 deletions(-)

diff --git a/ports/gprs_a9/README.md b/ports/gprs_a9/README.md
index e86aff02e8aeb..b0cba51f4f5b3 100644
--- a/ports/gprs_a9/README.md
+++ b/ports/gprs_a9/README.md
@@ -130,6 +130,7 @@ The purpose of this module is to have an access to high-level networking (SMS, G
 * `scan()` (list): lists available operators: returns `(op_id: bytearray[6], op_name: str, op_status: int)` for each;
 * `register([operator_id: bytearray[6], register_mode: int])` (op_id: bytearray[6], op_name: str, reg_status: int): registered network operator information. Registers on the network if arguments supplied. **TODO**: Figure out how (and whether) registration works at all;
 * `stations()` (list): a list of nearby stations: `(mcc, mnc, lac, cell_id, bsic, rx_full, rx_sub, arfcn)`: all ints;
+* `agps_station_data()` (int, int, list): a convenience function returning `(mcc, mnc, [(lac, cell_id, signal_strength), ...])` for use in agps location: all ints;
 * `reset()`: resets network settings to defaults. Disconnects GPRS;
 * `gprs([apn: {str, bool}[, user: str, pass: str]])` (bool): activate (3 arguments), deactivate (`gprs(False)`) or obtain the status of GPRS (on/off) if no arguments supplied;
 * `call()` (list[str], [str, None]): calls missed (1st output) and the incoming call number or `None` if no incoming calls at the moment (2nd output);
diff --git a/ports/gprs_a9/modcellular.c b/ports/gprs_a9/modcellular.c
index 816ca7a21c555..6ae0288d052a3 100644
--- a/ports/gprs_a9/modcellular.c
+++ b/ports/gprs_a9/modcellular.c
@@ -68,6 +68,9 @@
 
 #define BANDS_ALL (NETWORK_FREQ_BAND_GSM_900P | NETWORK_FREQ_BAND_GSM_900E | NETWORK_FREQ_BAND_GSM_850 | NETWORK_FREQ_BAND_DCS_1800 | NETWORK_FREQ_BAND_PCS_1900)
 
+#define MCC(x) ((x)[0] * 100 + (x)[1] * 10 + (x)[2])
+#define MNC(x) ((x)[0] * 100 + (x)[1] * 10 + (x)[2])
+
 // --------------
 // Vars: statuses
 // --------------
@@ -627,7 +630,8 @@ STATIC mp_obj_t modcellular_sms_from_raw(uint8_t* header, uint32_t header_length
     //     A new SMS object.
     // ========================================
 
-    // TODO: This function is not tested / not used. Consider removing it.
+    // TODO: This function is not tested / not used. It parses
+    // raw event data and assembles a message.
     if (header[0] != '"') {
         return mp_const_none;
     }
@@ -1126,8 +1130,8 @@ STATIC mp_obj_t modcellular_stations(void) {
     mp_obj_t stations[cells_n];
     for (int i=0; i<cells_n; i++) {
         mp_obj_t tuple[8] = {
-            mp_obj_new_int(cells[i].sMcc[0] * 100 + cells[i].sMcc[1] * 10 + cells[i].sMcc[2]),
-            mp_obj_new_int(cells[i].sMnc[0] * 100 + cells[i].sMnc[1] * 10 + cells[i].sMnc[2]),
+            mp_obj_new_int(MCC(cells[i].sMcc)),
+            mp_obj_new_int(MNC(cells[i].sMnc)),
             mp_obj_new_int(cells[i].sLac),
             mp_obj_new_int(cells[i].sCellID),
             mp_obj_new_int(cells[i].iBsic),
@@ -1142,6 +1146,48 @@ STATIC mp_obj_t modcellular_stations(void) {
 
 STATIC MP_DEFINE_CONST_FUN_OBJ_0(modcellular_stations_obj, modcellular_stations);
 
+STATIC mp_obj_t modcellular_agps_station_data(void) {
+    // ========================================
+    // Polls base stations and returns mcc, mnc
+    // and a list of lac, cell_id, signal level
+    // for each base station.
+    // ========================================
+    cells_n = -1;
+    if (!Network_GetCellInfoRequst()) {
+        mp_raise_CellularError("Failed to poll base stations");
+        return mp_const_none;
+    }
+    WAIT_UNTIL(cells_n >= 0, TIMEOUT_STATIONS, 100, mp_raise_CellularError("Station poll timeout"));
+
+    if (cells_n == 0) {
+        mp_raise_CellularError("No station data available");
+        return mp_const_none;
+    }
+
+    // just return the first mcc/mnc in the list
+    int mcc = MCC(cells[0].sMcc);
+    int mnc = MNC(cells[0].sMnc);
+    mp_obj_t list = mp_obj_new_list(0, NULL);
+    for (int i=0; i<cells_n; i++) {
+        if (MCC(cells[i].sMcc) == mcc && MNC(cells[i].sMnc) == mnc) {
+            mp_obj_t tuple[3] = {
+                mp_obj_new_int(cells[i].sLac),
+                mp_obj_new_int(cells[i].sCellID),
+                mp_obj_new_int(cells[i].iRxLev),
+            };
+            mp_obj_list_append(list, mp_obj_new_tuple(sizeof(tuple) / sizeof(mp_obj_t), tuple));
+        }
+    }
+    mp_obj_t tuple[3] = {
+        mp_obj_new_int(mcc),
+        mp_obj_new_int(mnc),
+        list,
+    };
+    return mp_obj_new_tuple(3, tuple);
+}
+
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(modcellular_agps_station_data_obj, modcellular_agps_station_data);
+
 STATIC mp_obj_t modcellular_reset(void) {
     // ========================================
     // Resets network settings to defaults.
@@ -1177,6 +1223,7 @@ STATIC const mp_map_elem_t mp_module_cellular_globals_table[] = {
     { MP_OBJ_NEW_QSTR(MP_QSTR_call), (mp_obj_t)&modcellular_call_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_dial), (mp_obj_t)&modcellular_dial_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_stations), (mp_obj_t)&modcellular_stations_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_agps_station_data), (mp_obj_t)&modcellular_agps_station_data_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_reset), (mp_obj_t)&modcellular_reset_obj },
 
     { MP_ROM_QSTR(MP_QSTR_NETWORK_FREQ_BAND_GSM_900P), MP_ROM_INT(NETWORK_FREQ_BAND_GSM_900P) },

From 70236eb365f645e16315cf59b31114a3368ecf43 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Thu, 23 Jan 2020 22:09:09 +0100
Subject: [PATCH 3410/3533] Speed up soft SPI

---
 ports/gprs_a9/mpconfigport.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/gprs_a9/mpconfigport.h b/ports/gprs_a9/mpconfigport.h
index 38af3a76fcce3..3b0e9c972d08f 100644
--- a/ports/gprs_a9/mpconfigport.h
+++ b/ports/gprs_a9/mpconfigport.h
@@ -153,8 +153,8 @@
 // #define MICROPY_PY_MACHINE_SPI_MSB          (1)
 // #define MICROPY_PY_MACHINE_SPI_LSB          (1)
 // #define MICROPY_PY_MACHINE_SPI_MAKE_NEW     machine_hw_spi_make_new
-// #define MICROPY_HW_SOFTSPI_MIN_DELAY        (0)
-// #define MICROPY_HW_SOFTSPI_MAX_BAUDRATE     (ets_get_cpu_frequency() * 1000000 / 200) // roughly
+#define MICROPY_HW_SOFTSPI_MIN_DELAY        (0)
+#define MICROPY_HW_SOFTSPI_MAX_BAUDRATE     (500000)
 // #define MICROPY_PY_USSL                     (1)
 // #define MICROPY_SSL_AXTLS                   (1)
 // #define MICROPY_SSL_MBEDTLS                 (1)

From 50dba1b928f19f9e4f89029badc58e1758ed22b4 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Thu, 23 Jan 2020 22:09:27 +0100
Subject: [PATCH 3411/3533] Max out freq on reset

---
 ports/gprs_a9/modmachine.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/gprs_a9/modmachine.c b/ports/gprs_a9/modmachine.c
index 40ee5408b1e0f..98ff997c51ca0 100644
--- a/ports/gprs_a9/modmachine.c
+++ b/ports/gprs_a9/modmachine.c
@@ -41,6 +41,7 @@
 #include "api_hal_adc.h"
 
 void modmachine_init0(void) {
+    PM_SetSysMinFreq(PM_SYS_FREQ_312M);
     modmachine_pin_init0();
     modmachine_uart_init0();
 }

From 5ff8eee55582b83327e3270d299a212ca26c0096 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sat, 25 Jan 2020 17:34:57 +0100
Subject: [PATCH 3412/3533] Swap longitude and latitude

---
 ports/gprs_a9/README.md | 4 ++--
 ports/gprs_a9/modgps.c  | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ports/gprs_a9/README.md b/ports/gprs_a9/README.md
index b0cba51f4f5b3..b796a5ab92d4c 100644
--- a/ports/gprs_a9/README.md
+++ b/ports/gprs_a9/README.md
@@ -192,8 +192,8 @@ This is only available in the A9G module where GPS is a separate chip connected
 * `on()`: turns the GPS on;
 * `off()`: turns the GPS off;
 * `get_firmware_version()` (str): retrieves the firmware version;
-* `get_location()` (latitude: float, longitude: float): retrieves the current GPS location;
-* `get_last_location()` (latitude: float, longitude: float): retrieves the last known GPS location without polling the GPS module;
+* `get_location()` (longitude: float, latitude: float): retrieves the current GPS location;
+* `get_last_location()` (longitude: float, latitude: float): retrieves the last known GPS location without polling the GPS module;
 * `get_satellites()` (tracked: int, visible: int): the numbers of satellites in operation;
 
 ### `machine`
diff --git a/ports/gprs_a9/modgps.c b/ports/gprs_a9/modgps.c
index c9cbf341de368..d76d6d03c6a9b 100644
--- a/ports/gprs_a9/modgps.c
+++ b/ports/gprs_a9/modgps.c
@@ -136,7 +136,7 @@ STATIC mp_obj_t modgps_get_last_location(void) {
     // ========================================
     // Retrieves the last GPS location.
     // Returns:
-    //     Location reported by GPS: latitude and longitude (degrees).
+    //     Location reported by GPS: longitude and latitude (degrees).
     // ========================================
     REQUIRES_VALID_GPS_INFO;
 
@@ -145,8 +145,8 @@ STATIC mp_obj_t modgps_get_last_location(void) {
     temp = (int)(gpsInfo->rmc.longitude.value/gpsInfo->rmc.longitude.scale/100);
     double longitude = temp+(double)(gpsInfo->rmc.longitude.value - temp*gpsInfo->rmc.longitude.scale*100)/gpsInfo->rmc.longitude.scale/60.0;
     mp_obj_t tuple[2] = {
-        mp_obj_new_float(latitude),
         mp_obj_new_float(longitude),
+        mp_obj_new_float(latitude),
     };
     return mp_obj_new_tuple(2, tuple);
 }
@@ -157,7 +157,7 @@ STATIC mp_obj_t modgps_get_location(void) {
     // ========================================
     // Retrieves the current GPS location.
     // Returns:
-    //     Location reported by GPS: latitude and longitude (degrees).
+    //     Location reported by GPS: longitude and latitude (degrees).
     // ========================================
     REQUIRES_GPS_ON;
 

From cd7d102a377d13488f8b2ac4ecdd984e917a2c04 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sat, 25 Jan 2020 17:37:25 +0100
Subject: [PATCH 3413/3533] Add network module stub

---
 ports/gprs_a9/README.md          |  2 +-
 ports/gprs_a9/modules/network.py | 27 +++++++++++++++++++++++++++
 2 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 ports/gprs_a9/modules/network.py

diff --git a/ports/gprs_a9/README.md b/ports/gprs_a9/README.md
index b796a5ab92d4c..5aec61c38990e 100644
--- a/ports/gprs_a9/README.md
+++ b/ports/gprs_a9/README.md
@@ -84,7 +84,7 @@ Additional libraries: install via [`upip`](https://docs.micropython.org/en/lates
 
 ## API
 
-1. [`cellular`](#cellular): SMS, calls, connectivity
+1. [`cellular`](#cellular), `network`: SMS, calls, connectivity
 2. [`usocket`](#usocket): sockets over GPRS
 3. [`ssl`](#ussl): SSL over sockets
 4. [`gps`](#gps): everything related to GPS and assisted positioning
diff --git a/ports/gprs_a9/modules/network.py b/ports/gprs_a9/modules/network.py
new file mode 100644
index 0000000000000..ea89fe2b18a86
--- /dev/null
+++ b/ports/gprs_a9/modules/network.py
@@ -0,0 +1,27 @@
+import cellular
+import usocket
+
+class WWAN:
+    def __new__(cls):
+        return cls
+
+    @classmethod
+    def active(cls, is_active=None):
+        return True
+
+    @classmethod
+    def connect(cls, apn, user, password):
+        return cellular.gprs(apn, user, password)
+
+    @classmethod
+    def disconnect(cls):
+        return cellular.gprs(False)
+
+    @classmethod
+    def isconnected(cls):
+        return cellular.gprs()
+
+    @classmethod
+    def ifconfig(cls):
+        return usocket.get_local_ip(), None, None, None
+

From b242cfbdc0357b084048c3ab193c286427d6113c Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sat, 25 Jan 2020 17:40:26 +0100
Subject: [PATCH 3414/3533] Add the first example

[skip ci]
---
 ports/gprs_a9/README.md                   |  4 ++++
 ports/gprs_a9/examples/example_50_mqtt.py | 28 +++++++++++++++++++++++
 2 files changed, 32 insertions(+)
 create mode 100644 ports/gprs_a9/examples/example_50_mqtt.py

diff --git a/ports/gprs_a9/README.md b/ports/gprs_a9/README.md
index 5aec61c38990e..ed6da01156242 100644
--- a/ports/gprs_a9/README.md
+++ b/ports/gprs_a9/README.md
@@ -82,6 +82,10 @@ blink.blink(1)
 
 Additional libraries: install via [`upip`](https://docs.micropython.org/en/latest/reference/packages.html) (built into the module).
 
+## Examples
+
+See [examples](examples) folder.
+
 ## API
 
 1. [`cellular`](#cellular), `network`: SMS, calls, connectivity
diff --git a/ports/gprs_a9/examples/example_50_mqtt.py b/ports/gprs_a9/examples/example_50_mqtt.py
new file mode 100644
index 0000000000000..7f398ec3fa333
--- /dev/null
+++ b/ports/gprs_a9/examples/example_50_mqtt.py
@@ -0,0 +1,28 @@
+# Get online
+import cellular
+cellular.gprs("internet", "", "")
+
+# Import mqtt (download client if necessary)
+try:
+    from umqtt import simple
+except ImportError:
+    import upip
+    upip.install("micropython-umqtt.simple")
+    from umqtt import simple
+
+# Turn GPS on
+import gps
+gps.on()
+
+# Report location
+name = "a9g-micropython-board"
+server = "test.mosquitto.org"
+topic = "a9g-micropython-board-topic"
+print("To track messages run, for example\n  mosquitto_sub -h {server} -t \"{topic}\" -v".format(server=server, topic=topic))
+import json
+client = simple.MQTTClient(name, server)
+client.connect()
+data = json.dumps(gps.get_last_location())
+print("Publishing", data)
+client.publish(topic, data)
+

From e027b0fa40970f6e88a4d1b9283be99f04f8c4e0 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sat, 25 Jan 2020 17:49:32 +0100
Subject: [PATCH 3415/3533] Fix formatting for built-in blink

---
 ports/gprs_a9/modules/blink.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/ports/gprs_a9/modules/blink.py b/ports/gprs_a9/modules/blink.py
index 0b5224a526a19..9867110cc14de 100644
--- a/ports/gprs_a9/modules/blink.py
+++ b/ports/gprs_a9/modules/blink.py
@@ -1,14 +1,12 @@
-
 import machine
 import time
 
 def blink(interval):
     print("blink")
-    led = machine.Pin(27,machine.Pin.OUT,0)
+    led = machine.Pin(27, machine.Pin.OUT, 0)
     value = 1
-    while(1):
+    while True:
         led.value(value)
         time.sleep(interval)
         value = 0 if (value==1) else 1
 
-

From 31983bb52e017c41819c400b8e1cf2554beec412 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sat, 25 Jan 2020 17:49:45 +0100
Subject: [PATCH 3416/3533] Add blink example

---
 ports/gprs_a9/examples/example_01_blink.py | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 ports/gprs_a9/examples/example_01_blink.py

diff --git a/ports/gprs_a9/examples/example_01_blink.py b/ports/gprs_a9/examples/example_01_blink.py
new file mode 100644
index 0000000000000..9a3f0e341f54c
--- /dev/null
+++ b/ports/gprs_a9/examples/example_01_blink.py
@@ -0,0 +1,11 @@
+import machine
+import time
+
+# Built-in blue LED on the pudding board
+led = machine.Pin(27, machine.Pin.OUT, 0)
+value = 1
+for i in range(4):
+    led.value(value)
+    time.sleep(1)
+    value = 0 if (value==1) else 1
+

From 45a01956b994cc607ba495f6951d9795592de299 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sat, 25 Jan 2020 18:06:35 +0100
Subject: [PATCH 3417/3533] Examples: gps, network, ssl

[ci skip]
---
 ports/gprs_a9/examples/example_20_gps.py     |  6 ++++++
 ports/gprs_a9/examples/example_30_network.py | 14 ++++++++++++++
 ports/gprs_a9/examples/example_31_ssl.py     | 16 ++++++++++++++++
 3 files changed, 36 insertions(+)
 create mode 100644 ports/gprs_a9/examples/example_20_gps.py
 create mode 100644 ports/gprs_a9/examples/example_30_network.py
 create mode 100644 ports/gprs_a9/examples/example_31_ssl.py

diff --git a/ports/gprs_a9/examples/example_20_gps.py b/ports/gprs_a9/examples/example_20_gps.py
new file mode 100644
index 0000000000000..bb57ee8077187
--- /dev/null
+++ b/ports/gprs_a9/examples/example_20_gps.py
@@ -0,0 +1,6 @@
+import gps
+gps.on()
+print("Location", gps.get_location())
+print("Satellites (tracked, visible)", gps.get_satellites())
+gps.off()
+
diff --git a/ports/gprs_a9/examples/example_30_network.py b/ports/gprs_a9/examples/example_30_network.py
new file mode 100644
index 0000000000000..2f397fb8bf7d8
--- /dev/null
+++ b/ports/gprs_a9/examples/example_30_network.py
@@ -0,0 +1,14 @@
+import cellular
+import socket
+cellular.gprs("internet", "", "")
+print("IP", socket.get_local_ip())
+host = "httpstat.us"
+port = 80
+s = socket.socket()
+s.connect((host, port))
+message = "GET /200 HTTP/1.1\r\nHost: {}\r\nConnection: close\r\n\r\n"
+s.write(message.format(host))
+print(s.read(256))
+s.close()
+cellular.gprs(False)
+
diff --git a/ports/gprs_a9/examples/example_31_ssl.py b/ports/gprs_a9/examples/example_31_ssl.py
new file mode 100644
index 0000000000000..39555352c5c17
--- /dev/null
+++ b/ports/gprs_a9/examples/example_31_ssl.py
@@ -0,0 +1,16 @@
+import cellular
+import socket
+import ssl
+cellular.gprs("internet", "", "")
+print("IP", socket.get_local_ip())
+host = "httpstat.us"
+port = 443
+s = socket.socket()
+s.connect((host, port))
+s = ssl.wrap_socket(s)
+message = "GET /200 HTTP/1.1\r\nHost: {}\r\nConnection: close\r\n\r\n"
+s.write(message.format(host))
+print(s.read(256))
+s.close()
+cellular.gprs(False)
+

From 997aa3fcd101ee869b9ab93cd45e5ef0b4978296 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sat, 25 Jan 2020 18:22:33 +0100
Subject: [PATCH 3418/3533] Example: agps

---
 ports/gprs_a9/examples/example_21_agps.py | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 ports/gprs_a9/examples/example_21_agps.py

diff --git a/ports/gprs_a9/examples/example_21_agps.py b/ports/gprs_a9/examples/example_21_agps.py
new file mode 100644
index 0000000000000..7201ee97fea41
--- /dev/null
+++ b/ports/gprs_a9/examples/example_21_agps.py
@@ -0,0 +1,15 @@
+# Get online
+import cellular
+cellular.gprs("internet", "", "")
+
+# Import mqtt (download client if necessary)
+try:
+    import agps
+except ImportError:
+    import upip
+    upip.install("micropython-agps")
+    import agps
+
+token = "put-your-token-here"
+print("AGPS location", agps.get_location_opencellid(cellular.agps_station_data(), token))
+

From ca7811a1c7390bbbebd4a0f8eaaadc65f69ceeb6 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sat, 25 Jan 2020 18:29:53 +0100
Subject: [PATCH 3419/3533] Example: watchdog

[skip ci]
---
 ports/gprs_a9/examples/example_05_watchdog.py | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 ports/gprs_a9/examples/example_05_watchdog.py

diff --git a/ports/gprs_a9/examples/example_05_watchdog.py b/ports/gprs_a9/examples/example_05_watchdog.py
new file mode 100644
index 0000000000000..a4ac2546cb1b1
--- /dev/null
+++ b/ports/gprs_a9/examples/example_05_watchdog.py
@@ -0,0 +1,13 @@
+import machine
+import time
+
+machine.watchdog_on(1)
+# Once on, watchdog expects resetting every 1 second in this case
+time.sleep(.5)
+machine.watchdog_reset()
+time.sleep(.5)
+print("Still online")
+# Otherwise, it hard-resets
+time.sleep(2)
+print("This never prints")
+

From caf13b16d0a59dff937ddc718190ba33b6f73bfb Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sat, 25 Jan 2020 18:35:56 +0100
Subject: [PATCH 3420/3533] Add date to github releases page

---
 azure-pipelines.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index f3a3f8832dbb1..9a18be6bc21f5 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -443,6 +443,8 @@ stages:
         releaseNotes: |
           The latest successful `master` build.
 
+          Updated: $(Date:dd-MM-yyyy)
+
           Firmware files
           --------------
 

From 5d7f954a67986c894ffc64bafb0f323e7194ce88 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sat, 25 Jan 2020 22:41:34 +0100
Subject: [PATCH 3421/3533] Add headers to examples

[ci skip]
---
 ports/gprs_a9/examples/example_01_blink.py    | 4 ++++
 ports/gprs_a9/examples/example_05_watchdog.py | 4 ++++
 ports/gprs_a9/examples/example_20_gps.py      | 4 ++++
 ports/gprs_a9/examples/example_21_agps.py     | 8 +++++++-
 ports/gprs_a9/examples/example_30_network.py  | 4 ++++
 ports/gprs_a9/examples/example_31_ssl.py      | 4 ++++
 ports/gprs_a9/examples/example_50_mqtt.py     | 5 +++++
 7 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/ports/gprs_a9/examples/example_01_blink.py b/ports/gprs_a9/examples/example_01_blink.py
index 9a3f0e341f54c..3fa411176a98a 100644
--- a/ports/gprs_a9/examples/example_01_blink.py
+++ b/ports/gprs_a9/examples/example_01_blink.py
@@ -1,3 +1,7 @@
+# Micropython a9g example
+# Source: https://github.com/pulkin/micropython
+# Author: pulkin
+# Demonstrates how to blink the built-in LED on the pudding board
 import machine
 import time
 
diff --git a/ports/gprs_a9/examples/example_05_watchdog.py b/ports/gprs_a9/examples/example_05_watchdog.py
index a4ac2546cb1b1..8d260db664973 100644
--- a/ports/gprs_a9/examples/example_05_watchdog.py
+++ b/ports/gprs_a9/examples/example_05_watchdog.py
@@ -1,3 +1,7 @@
+# Micropython a9g example
+# Source: https://github.com/pulkin/micropython
+# Author: pulkin
+# Demonstrates how to use hardware watchdog
 import machine
 import time
 
diff --git a/ports/gprs_a9/examples/example_20_gps.py b/ports/gprs_a9/examples/example_20_gps.py
index bb57ee8077187..aea9068def8ab 100644
--- a/ports/gprs_a9/examples/example_20_gps.py
+++ b/ports/gprs_a9/examples/example_20_gps.py
@@ -1,3 +1,7 @@
+# Micropython a9g example
+# Source: https://github.com/pulkin/micropython
+# Author: pulkin
+# Demonstrates how to retrieve GPS coordinates from the built-in GPS module
 import gps
 gps.on()
 print("Location", gps.get_location())
diff --git a/ports/gprs_a9/examples/example_21_agps.py b/ports/gprs_a9/examples/example_21_agps.py
index 7201ee97fea41..98dba74c660d8 100644
--- a/ports/gprs_a9/examples/example_21_agps.py
+++ b/ports/gprs_a9/examples/example_21_agps.py
@@ -1,8 +1,13 @@
+# Micropython a9g example
+# Source: https://github.com/pulkin/micropython
+# Author: pulkin
+# Demonstrates how to retrieve location (latitude and longitude) from GSM base stations (AGPS)
+
 # Get online
 import cellular
 cellular.gprs("internet", "", "")
 
-# Import mqtt (download client if necessary)
+# Import agps (download client if necessary)
 try:
     import agps
 except ImportError:
@@ -10,6 +15,7 @@
     upip.install("micropython-agps")
     import agps
 
+# Get your token from https://unwiredlabs.com
 token = "put-your-token-here"
 print("AGPS location", agps.get_location_opencellid(cellular.agps_station_data(), token))
 
diff --git a/ports/gprs_a9/examples/example_30_network.py b/ports/gprs_a9/examples/example_30_network.py
index 2f397fb8bf7d8..6a9fa15925714 100644
--- a/ports/gprs_a9/examples/example_30_network.py
+++ b/ports/gprs_a9/examples/example_30_network.py
@@ -1,3 +1,7 @@
+# Micropython a9g example
+# Source: https://github.com/pulkin/micropython
+# Author: pulkin
+# Demonstrates how to use TCP sockets
 import cellular
 import socket
 cellular.gprs("internet", "", "")
diff --git a/ports/gprs_a9/examples/example_31_ssl.py b/ports/gprs_a9/examples/example_31_ssl.py
index 39555352c5c17..f724637d889f2 100644
--- a/ports/gprs_a9/examples/example_31_ssl.py
+++ b/ports/gprs_a9/examples/example_31_ssl.py
@@ -1,3 +1,7 @@
+# Micropython a9g example
+# Source: https://github.com/pulkin/micropython
+# Author: pulkin
+# Demonstrates how to wrap sockets into ssl tunnel
 import cellular
 import socket
 import ssl
diff --git a/ports/gprs_a9/examples/example_50_mqtt.py b/ports/gprs_a9/examples/example_50_mqtt.py
index 7f398ec3fa333..b88c774eb9df8 100644
--- a/ports/gprs_a9/examples/example_50_mqtt.py
+++ b/ports/gprs_a9/examples/example_50_mqtt.py
@@ -1,3 +1,8 @@
+# Micropython a9g example
+# Source: https://github.com/pulkin/micropython
+# Author: pulkin
+# Demonstrates how to use mqtt for publishing GPS location
+
 # Get online
 import cellular
 cellular.gprs("internet", "", "")

From 543a6b5cbfcb329a4ca42e4d5319a382a0b076c8 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sat, 25 Jan 2020 22:41:42 +0100
Subject: [PATCH 3422/3533] Example: http

---
 ports/gprs_a9/examples/example_32_http.py | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 ports/gprs_a9/examples/example_32_http.py

diff --git a/ports/gprs_a9/examples/example_32_http.py b/ports/gprs_a9/examples/example_32_http.py
new file mode 100644
index 0000000000000..634b902df4d22
--- /dev/null
+++ b/ports/gprs_a9/examples/example_32_http.py
@@ -0,0 +1,20 @@
+# Micropython a9g example
+# Source: https://github.com/pulkin/micropython
+# Author: pulkin
+# Demonstrates how to communicate via http using requests library
+
+# Get online
+import cellular
+cellular.gprs("internet", "", "")
+
+# Import mqtt (download client if necessary)
+try:
+    import urequests
+except ImportError:
+    import upip
+    upip.install("micropython-urequests")
+    import urequests
+
+r = urequests.get("http://httpstat.us/200")
+print(r.status_code, r.text)
+

From 46c04a205cb116550360c0021029a5fe13cf9daa Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sat, 25 Jan 2020 23:59:12 +0100
Subject: [PATCH 3423/3533] Cleanup

---
 ports/gprs_a9/machine_uart.c | 67 ++++++++++++++++++++++++++++++++++--
 ports/gprs_a9/modcellular.c  | 10 ++++++
 ports/gprs_a9/uart.c         | 15 ++++----
 3 files changed, 82 insertions(+), 10 deletions(-)

diff --git a/ports/gprs_a9/machine_uart.c b/ports/gprs_a9/machine_uart.c
index 9398543c4e99e..5413ab6ccd9b1 100644
--- a/ports/gprs_a9/machine_uart.c
+++ b/ports/gprs_a9/machine_uart.c
@@ -4,6 +4,7 @@
  * The MIT License (MIT)
  *
  * Copyright (c) 2016 Damien P. George
+ * Copyright (c) 2020 pulkin
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -39,6 +40,10 @@
 
 STATIC const char *_parity_name[] = {"None", "1", "0"};
 
+// ----
+// Init
+// ----
+
 void modmachine_uart_init0(void) {
     UART_Close(UART2);
     UART_Close(UART1);
@@ -56,10 +61,14 @@ void modmachine_uart_init0(void) {
     os_dupterm(2, args);
 }
 
-/******************************************************************************/
-// MicroPython bindings for UART
+// -------
+// Classes
+// -------
 
 STATIC void pyb_uart_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
+    // ========================================
+    // print(UART)
+    // ========================================
     pyb_uart_obj_t *self = MP_OBJ_TO_PTR(self_in);
     mp_printf(print, "UART(%u, baudrate=%u, bits=%u, parity=%s, stop=%u, rxbuf=%u, timeout=%u, timeout_char=%u)",
         self->uart_id, self->baudrate, self->bits, _parity_name[self->parity],
@@ -67,6 +76,19 @@ STATIC void pyb_uart_print(const mp_print_t *print, mp_obj_t self_in, mp_print_k
 }
 
 STATIC void pyb_uart_init_helper(pyb_uart_obj_t *self, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
+    // ========================================
+    // Prepares UART.
+    // Args:
+    //     baudrate (int): baud rate (communication speed) of UART;
+    //     bits (int)
+    //     parity (int)
+    //     stop (int)
+    //     tx (int): transmit pin;
+    //     rx (int): receive pin;
+    //     rxbuf (int, array): receive buffer or its size;
+    //     timeout (int): default timeout in us for transmission start;
+    //     timeout_char (int): default timeout in us between characters;
+    // ========================================
     enum { ARG_baudrate, ARG_bits, ARG_parity, ARG_stop, ARG_tx, ARG_rx, ARG_rxbuf, ARG_timeout, ARG_timeout_char };
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_baudrate, MP_ARG_INT, {.u_int = 0} },
@@ -203,6 +225,20 @@ STATIC void pyb_uart_init_helper(pyb_uart_obj_t *self, size_t n_args, const mp_o
 }
 
 STATIC mp_obj_t pyb_uart_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
+    // ========================================
+    // Prepares UART.
+    // Args:
+    //     uart_id (int): hardware UART id;
+    //     baudrate (int): baud rate (communication speed) of UART;
+    //     bits (int)
+    //     parity (int)
+    //     stop (int)
+    //     tx (int): transmit pin;
+    //     rx (int): receive pin;
+    //     rxbuf (int, array): receive buffer or its size;
+    //     timeout (int): default timeout in us for transmission start;
+    //     timeout_char (int): default timeout in us between characters;
+    // ========================================
     mp_arg_check_num(n_args, n_kw, 1, MP_OBJ_FUN_ARGS_MAX, true);
 
     // get uart id
@@ -231,12 +267,30 @@ STATIC mp_obj_t pyb_uart_make_new(const mp_obj_type_t *type, size_t n_args, size
 }
 
 STATIC mp_obj_t pyb_uart_init(size_t n_args, const mp_obj_t *args, mp_map_t *kw_args) {
+    // ========================================
+    // Initialize UART.
+    // Args:
+    //     baudrate (int): baud rate (communication speed) of UART;
+    //     bits (int)
+    //     parity (int)
+    //     stop (int)
+    //     tx (int): transmit pin;
+    //     rx (int): receive pin;
+    //     rxbuf (int, array): receive buffer or its size;
+    //     timeout (int): default timeout in us for transmission start;
+    //     timeout_char (int): default timeout in us between characters;
+    // ========================================
     pyb_uart_init_helper(args[0], n_args - 1, args + 1, kw_args);
     return mp_const_none;
 }
 MP_DEFINE_CONST_FUN_OBJ_KW(pyb_uart_init_obj, 1, pyb_uart_init);
 
 STATIC mp_obj_t pyb_uart_any(mp_obj_t self_in) {
+    // ========================================
+    // Checks if any data ready to be read.
+    // Returns:
+    //     True if any data available.
+    // ========================================
     pyb_uart_obj_t *self = MP_OBJ_TO_PTR(self_in);
     return MP_OBJ_NEW_SMALL_INT(uart_rx_any(self->uart_id));
 }
@@ -257,6 +311,9 @@ STATIC const mp_rom_map_elem_t pyb_uart_locals_dict_table[] = {
 STATIC MP_DEFINE_CONST_DICT(pyb_uart_locals_dict, pyb_uart_locals_dict_table);
 
 STATIC mp_uint_t pyb_uart_read(mp_obj_t self_in, void *buf_in, mp_uint_t size, int *errcode) {
+    // ========================================
+    // UART.read()
+    // ========================================
     pyb_uart_obj_t *self = MP_OBJ_TO_PTR(self_in);
 
     // make sure we want at least 1 char
@@ -282,6 +339,9 @@ STATIC mp_uint_t pyb_uart_read(mp_obj_t self_in, void *buf_in, mp_uint_t size, i
 }
 
 STATIC mp_uint_t pyb_uart_write(mp_obj_t self_in, const void *buf_in, mp_uint_t size, int *errcode) {
+    // ========================================
+    // UART.write()
+    // ========================================
     pyb_uart_obj_t *self = MP_OBJ_TO_PTR(self_in);
     const byte *buf = buf_in;
 
@@ -303,6 +363,9 @@ STATIC mp_uint_t pyb_uart_write(mp_obj_t self_in, const void *buf_in, mp_uint_t
 }
 
 STATIC mp_uint_t pyb_uart_ioctl(mp_obj_t self_in, mp_uint_t request, mp_uint_t arg, int *errcode) {
+    // ========================================
+    // UART io control (close, etc)
+    // ========================================
     pyb_uart_obj_t *self = self_in;
     mp_uint_t ret;
     if (request == MP_STREAM_POLL) {
diff --git a/ports/gprs_a9/modcellular.c b/ports/gprs_a9/modcellular.c
index 6ae0288d052a3..1ab95508118b8 100644
--- a/ports/gprs_a9/modcellular.c
+++ b/ports/gprs_a9/modcellular.c
@@ -125,6 +125,10 @@ STATIC mp_obj_t modcellular_sms_from_raw(uint8_t* header, uint32_t header_length
 
 NORETURN void mp_raise_CellularError(const char *msg);
 
+// ----
+// Init
+// ----
+
 void modcellular_init0(void) {
     // Reset statuses
     network_status_updated = 0;
@@ -310,11 +314,15 @@ void modcellular_notify_sms_receipt(API_Event_t* event) {
     sms_received_count ++;
 }
 
+// Signal level
+
 void modcellular_notify_signal(API_Event_t* event) {
     network_signal_quality = event->param1;
     network_signal_rx_level = event->param2;
 }
 
+// Calls
+
 void modcellular_notify_call_incoming(API_Event_t* event) {
     if (strlen((char*) event->pParam1) > MAX_NUMBER_LEN - 1) {
         event->pParam1[MAX_NUMBER_LEN] = 0;
@@ -331,6 +339,8 @@ void modcellular_notify_call_hangup(API_Event_t* event) {
     }
 }
 
+// Base stations
+
 void modcellular_notify_cell_info(API_Event_t* event) {
     cells_n = event->param1;
     memcpy(cells, event->pParam1, MIN(cells_n * sizeof(Network_Location_t), sizeof(cells)));
diff --git a/ports/gprs_a9/uart.c b/ports/gprs_a9/uart.c
index d6af02df15448..b8619a2256ccb 100644
--- a/ports/gprs_a9/uart.c
+++ b/ports/gprs_a9/uart.c
@@ -35,9 +35,9 @@
 
 #include "api_hal_uart.h"
 
-// ---------------------
-// UART static variables
-// ---------------------
+// ------------------------------
+// Hardware UART static variables
+// ------------------------------
 
 // The two ports
 static const UART_Port_t uart_port[] = {UART1, UART2};
@@ -77,6 +77,10 @@ UART_Config_t uart_dev[] = {
     }
 };
 
+// -----------------------
+// Hardware UART functions
+// -----------------------
+
 void soft_reset(void);
 void mp_keyboard_interrupt(void);
 
@@ -90,11 +94,6 @@ uint32_t uart_tx_one_char(uint8_t uart, char c) {
     return UART_Write(uart_port[uart], (uint8_t*) &c, 1);
 }
 
-void uart_flush(uint8_t uart) {
-    // Flushes
-    (void) uart;
-}
-
 bool uart_close(uint8_t uart) {
     return UART_Close(uart_port[uart]);
 }

From 242ead1176075ce9ff9594a4ae79c0106568ba94 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Mon, 27 Jan 2020 19:28:04 +0100
Subject: [PATCH 3424/3533] Close #25

---
 ports/gprs_a9/README.md |  1 +
 ports/gprs_a9/modgps.c  | 21 +++++++++++++++++++++
 2 files changed, 22 insertions(+)

diff --git a/ports/gprs_a9/README.md b/ports/gprs_a9/README.md
index ed6da01156242..68c21ec6ccf80 100644
--- a/ports/gprs_a9/README.md
+++ b/ports/gprs_a9/README.md
@@ -199,6 +199,7 @@ This is only available in the A9G module where GPS is a separate chip connected
 * `get_location()` (longitude: float, latitude: float): retrieves the current GPS location;
 * `get_last_location()` (longitude: float, latitude: float): retrieves the last known GPS location without polling the GPS module;
 * `get_satellites()` (tracked: int, visible: int): the numbers of satellites in operation;
+* `time()` (int): the number of seconds since the epoch (2000). Use `time.localtime` for converting it into date/time values (this conversion may result in `OverflowError` until the GPS module starts reading meaningful satellite data).
 
 ### `machine`
 
diff --git a/ports/gprs_a9/modgps.c b/ports/gprs_a9/modgps.c
index d76d6d03c6a9b..bb22740ba4df2 100644
--- a/ports/gprs_a9/modgps.c
+++ b/ports/gprs_a9/modgps.c
@@ -33,12 +33,14 @@
 #include "py/runtime.h"
 #include "py/binary.h"
 #include "py/objexcept.h"
+#include "lib/timeutils/timeutils.h"
 
 #include "api_gps.h"
 #include "api_os.h"
 #include "api_event.h"
 #include "gps_parse.h"
 #include "gps.h"
+#include "minmea.h"
 #include "time.h"
 
 void modgps_init0(void) {
@@ -183,6 +185,24 @@ STATIC mp_obj_t modgps_get_satellites(void) {
 
 STATIC MP_DEFINE_CONST_FUN_OBJ_0(modgps_get_satellites_obj, modgps_get_satellites);
 
+STATIC mp_obj_t modgps_time(void) {
+    // ========================================
+    // GPS time.
+    // Returns:
+    //     Seconds since 2000 as int.
+    // ========================================
+    REQUIRES_GPS_ON;
+
+    struct minmea_date date = gpsInfo->rmc.date;
+    struct minmea_time time = gpsInfo->rmc.time;
+
+    mp_uint_t result = timeutils_mktime(date.year + 2000, date.month, date.day, time.hours, time.minutes, time.seconds);
+    // Note: the module may report dates between 1980 and 2000 as well: they will be mapped onto the time frame 2080-2100
+    return mp_obj_new_int_from_uint(result);
+}
+
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(modgps_time_obj, modgps_time);
+
 STATIC const mp_map_elem_t mp_module_gps_globals_table[] = {
     { MP_OBJ_NEW_QSTR(MP_QSTR___name__i), MP_OBJ_NEW_QSTR(MP_QSTR_gps) },
 
@@ -194,6 +214,7 @@ STATIC const mp_map_elem_t mp_module_gps_globals_table[] = {
     { MP_OBJ_NEW_QSTR(MP_QSTR_get_location), (mp_obj_t)&modgps_get_location_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_get_last_location), (mp_obj_t)&modgps_get_last_location_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_get_satellites), (mp_obj_t)&modgps_get_satellites_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_time), (mp_obj_t)&modgps_time_obj },
 };
 
 STATIC MP_DEFINE_CONST_DICT(mp_module_gps_globals, mp_module_gps_globals_table);

From 4ba22dcd0451a64424ff95940e0acaf0546e6b03 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Mon, 27 Jan 2020 19:33:51 +0100
Subject: [PATCH 3425/3533] Attempt fixing azure build date/time

---
 azure-pipelines.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 9a18be6bc21f5..283d24b036ab3 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -443,7 +443,7 @@ stages:
         releaseNotes: |
           The latest successful `master` build.
 
-          Updated: $(Date:dd-MM-yyyy)
+        Updated: $(Year:yy)-$(Month)-$(DayOfMonth) $(Hours):$(Minutes):$(Seconds)
 
           Firmware files
           --------------

From 175187fd5ca51eb4a2a0f778621024bc0265fb1f Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Mon, 27 Jan 2020 19:37:44 +0100
Subject: [PATCH 3426/3533] Fix indent

---
 azure-pipelines.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 283d24b036ab3..bd59a4307d629 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -443,7 +443,7 @@ stages:
         releaseNotes: |
           The latest successful `master` build.
 
-        Updated: $(Year:yy)-$(Month)-$(DayOfMonth) $(Hours):$(Minutes):$(Seconds)
+          Updated: $(Year:yy)-$(Month)-$(DayOfMonth) $(Hours):$(Minutes):$(Seconds)
 
           Firmware files
           --------------

From 8a47409d31a07ebed90a6b558b5dc0b373ae0ef4 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Tue, 28 Jan 2020 23:34:44 +0100
Subject: [PATCH 3427/3533] Make startup scripts consistent with vfs

---
 ports/gprs_a9/main.c | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/ports/gprs_a9/main.c b/ports/gprs_a9/main.c
index 8231870c9a589..2c626c07cd8f9 100644
--- a/ports/gprs_a9/main.c
+++ b/ports/gprs_a9/main.c
@@ -183,19 +183,10 @@ void MicroPyTask(void *pData) {
     mp_obj_list_init(mp_sys_argv, 0);
     // Startup scripts
     pyexec_frozen_module("_boot.py");
-    int file_descriptor;
-    if ((file_descriptor = API_FS_Open("boot.py", FS_O_RDONLY, 0)) > 0) {
-        API_FS_Close(file_descriptor);
-        pyexec_file("boot.py");
+    pyexec_file_if_exists("boot.py");
+    if (pyexec_mode_kind == PYEXEC_MODE_FRIENDLY_REPL) {
+        pyexec_file_if_exists("main.py");
     }
-    if (pyexec_mode_kind == PYEXEC_MODE_FRIENDLY_REPL && (file_descriptor = API_FS_Open("main.py", FS_O_RDONLY, 0)) > 0) {
-        API_FS_Close(file_descriptor);
-        pyexec_file("main.py");
-    }
-    // pyexec_file("boot.py");
-    // if (pyexec_mode_kind == PYEXEC_MODE_FRIENDLY_REPL) {
-    //     pyexec_file("main.py");
-    // }
     // pyexec_event_repl_init();
     
     // while (1) if (OS_WaitEvent(microPyTaskHandle, (void**)&event, OS_TIME_OUT_WAIT_FOREVER)) {

From b408efbf7b75021d1a6e05cac21e4e11c63d2bf3 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Thu, 13 Feb 2020 16:16:14 +0100
Subject: [PATCH 3428/3533] Switch to custom CSDK repo

---
 .gitmodules | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitmodules b/.gitmodules
index 845ff57e0607f..097689b0a6215 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -61,7 +61,7 @@
 	url = https://github.com/Ai-Thinker-Open/GPRS_C_SDK
 [submodule "lib/GPRS_C_SDK"]
 	path = lib/GPRS_C_SDK
-    url = https://github.com/petrynchyn/GPRS_C_SDK.git
+	url = https://github.com/pulkin/GPRS_C_SDK.git
 [submodule "lib/csdtk42-linux"]
     path = lib/csdtk42-linux
     url = https://github.com/pulkin/csdtk42-linux.git

From 415bcdb8d6481de41df7eb8f538cdec2870e42b2 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Wed, 19 Feb 2020 19:28:35 +0100
Subject: [PATCH 3429/3533] Remove garbage from Makefile

---
 ports/gprs_a9/Makefile | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/ports/gprs_a9/Makefile b/ports/gprs_a9/Makefile
index 969a88dfa8937..445691057643e 100644
--- a/ports/gprs_a9/Makefile
+++ b/ports/gprs_a9/Makefile
@@ -169,10 +169,6 @@ SRC_S = \
 
 MICROPY_PY_USSL = 1
 MICROPY_SSL_AXTLS = 1
-MICROPY_PY_UHASHLIB = 1
-MICROPY_PY_UHASHLIB_SHA1 = 1
-MICROPY_PY_UHASHLIB_SHA256 = 1
-MICROPY_PY_UCRYPTOLIB = 1
 AXTLS_DEFS_EXTRA = -Dabort=abort_ -include time.h -DRT_MAX_PLAIN_LENGTH=1024 -DRT_EXTRA=4096
 # include py core make definitions
 include $(TOP)/py/py.mk

From c75f23006282139a00556f314cac19c749ab66c1 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Thu, 20 Feb 2020 18:23:08 +0100
Subject: [PATCH 3430/3533] uhashlib - initial

---
 ports/gprs_a9/Makefile       | 1 -
 ports/gprs_a9/mpconfigport.h | 3 ++-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/gprs_a9/Makefile b/ports/gprs_a9/Makefile
index 445691057643e..248e7a539349d 100644
--- a/ports/gprs_a9/Makefile
+++ b/ports/gprs_a9/Makefile
@@ -183,7 +183,6 @@ OBJ += $(addprefix $(BUILD_PATH)/, $(SRC_S:.s=.o))
 OBJ += $(addprefix $(BUILD_PATH)/, $(SRC_MOD:.c=.o))
 OBJ += $(addprefix $(BUILD_PATH)/, $(EXTMOD_SRC_C:.c=.o))
 OBJ += $(addprefix $(BUILD_PATH)/, $(DRIVERS_SRC_C:.c=.o))
-OBJ += ../../extmod/crypto-algorithms/sha256.o
 
 # List of sources for qstr extraction
 SRC_QSTR += $(SRC_C)  $(LIB_SRC_C) 
diff --git a/ports/gprs_a9/mpconfigport.h b/ports/gprs_a9/mpconfigport.h
index 3b0e9c972d08f..44b82a1f8d262 100644
--- a/ports/gprs_a9/mpconfigport.h
+++ b/ports/gprs_a9/mpconfigport.h
@@ -136,7 +136,7 @@
 #define MICROPY_PY_URE_SUB                  (1)
 #define MICROPY_PY_UHEAPQ                   (1)
 #define MICROPY_PY_UTIMEQ                   (1)
-// #define MICROPY_PY_UHASHLIB                 (1)
+#define MICROPY_PY_UHASHLIB                 (1)
 // #define MICROPY_PY_UHASHLIB_SHA1            (1)
 // #define MICROPY_PY_UHASHLIB_SHA256          (1)
 // #define MICROPY_PY_UCRYPTOLIB               (1)
@@ -221,6 +221,7 @@ extern const struct _mp_obj_module_t st7735_module;
     { MP_OBJ_NEW_QSTR(MP_QSTR_binascii), (mp_obj_t)&mp_module_ubinascii }, \
     { MP_OBJ_NEW_QSTR(MP_QSTR_collections), (mp_obj_t)&mp_module_collections }, \
     { MP_OBJ_NEW_QSTR(MP_QSTR_errno), (mp_obj_t)&mp_module_uerrno }, \
+    { MP_OBJ_NEW_QSTR(MP_QSTR_hashlib), (mp_obj_t)(&mp_module_uhashlib) }, \
     { MP_OBJ_NEW_QSTR(MP_QSTR_heapq), (mp_obj_t)&mp_module_uheapq }, \
     { MP_OBJ_NEW_QSTR(MP_QSTR_io), (mp_obj_t)&mp_module_io }, \
     { MP_OBJ_NEW_QSTR(MP_QSTR_json), (mp_obj_t)&mp_module_ujson }, \

From 3cdaed09b1c2473afdc20cb75437b01078b1e9b2 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Thu, 20 Feb 2020 18:28:51 +0100
Subject: [PATCH 3431/3533] uhashlib: add all optional libraries

---
 ports/gprs_a9/mpconfigport.h | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/ports/gprs_a9/mpconfigport.h b/ports/gprs_a9/mpconfigport.h
index 44b82a1f8d262..19a45e8ed7c37 100644
--- a/ports/gprs_a9/mpconfigport.h
+++ b/ports/gprs_a9/mpconfigport.h
@@ -137,9 +137,10 @@
 #define MICROPY_PY_UHEAPQ                   (1)
 #define MICROPY_PY_UTIMEQ                   (1)
 #define MICROPY_PY_UHASHLIB                 (1)
-// #define MICROPY_PY_UHASHLIB_SHA1            (1)
-// #define MICROPY_PY_UHASHLIB_SHA256          (1)
-// #define MICROPY_PY_UCRYPTOLIB               (1)
+#define MICROPY_PY_UHASHLIB_MD5             (MICROPY_PY_USSL)
+#define MICROPY_PY_UHASHLIB_SHA1            (MICROPY_PY_USSL)
+#define MICROPY_PY_UHASHLIB_SHA256          (1)
+#define MICROPY_PY_UCRYPTOLIB               (1)
 #define MICROPY_PY_UBINASCII                (1)
 #define MICROPY_PY_UBINASCII_CRC32          (1)
 #define MICROPY_PY_URANDOM                  (1)

From 8790233dc548c6f56ae39ff333eb960ed50dd744 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Thu, 20 Feb 2020 18:44:11 +0100
Subject: [PATCH 3432/3533] ussl, uhashlib, ucryptolib: more consistent
 definitions

---
 ports/gprs_a9/mpconfigport.h |   17 +-
 ports/gprs_a9/nm.txt         | 7852 ++++++++++++++++++++++++++++++++++
 2 files changed, 7864 insertions(+), 5 deletions(-)
 create mode 100644 ports/gprs_a9/nm.txt

diff --git a/ports/gprs_a9/mpconfigport.h b/ports/gprs_a9/mpconfigport.h
index 19a45e8ed7c37..5f8d7cb096c18 100644
--- a/ports/gprs_a9/mpconfigport.h
+++ b/ports/gprs_a9/mpconfigport.h
@@ -136,11 +136,11 @@
 #define MICROPY_PY_URE_SUB                  (1)
 #define MICROPY_PY_UHEAPQ                   (1)
 #define MICROPY_PY_UTIMEQ                   (1)
-#define MICROPY_PY_UHASHLIB                 (1)
+#define MICROPY_PY_UHASHLIB                 (MICROPY_PY_USSL)
 #define MICROPY_PY_UHASHLIB_MD5             (MICROPY_PY_USSL)
 #define MICROPY_PY_UHASHLIB_SHA1            (MICROPY_PY_USSL)
-#define MICROPY_PY_UHASHLIB_SHA256          (1)
-#define MICROPY_PY_UCRYPTOLIB               (1)
+#define MICROPY_PY_UHASHLIB_SHA256          (MICROPY_PY_USSL)
+#define MICROPY_PY_UCRYPTOLIB               (MICROPY_PY_USSL)
 #define MICROPY_PY_UBINASCII                (1)
 #define MICROPY_PY_UBINASCII_CRC32          (1)
 #define MICROPY_PY_URANDOM                  (1)
@@ -207,6 +207,14 @@ extern const struct _mp_obj_module_t usocket_module;
 extern const struct _mp_obj_module_t i2c_module;
 extern const struct _mp_obj_module_t st7735_module;
 
+#if MICROPY_PY_USSL
+#define SSL_BUILTIN_MODULE_WEAK_LINKS    { MP_OBJ_NEW_QSTR(MP_QSTR_ssl), (mp_obj_t)&mp_module_ussl }, \
+    { MP_OBJ_NEW_QSTR(MP_QSTR_hashlib), (mp_obj_t)(&mp_module_uhashlib) }, \
+    { MP_OBJ_NEW_QSTR(MP_QSTR_cryptolib), (mp_obj_t)(&mp_module_ucryptolib) },
+#else
+#define SSL_BUILTIN_MODULE_WEAK_LINKS
+#endif
+
 #define MICROPY_PORT_BUILTIN_MODULES \
     { MP_OBJ_NEW_QSTR(MP_QSTR_machine), (mp_obj_t)&mp_module_machine }, \
     { MP_OBJ_NEW_QSTR(MP_QSTR_uos), (mp_obj_t)&uos_module }, \
@@ -222,18 +230,17 @@ extern const struct _mp_obj_module_t st7735_module;
     { MP_OBJ_NEW_QSTR(MP_QSTR_binascii), (mp_obj_t)&mp_module_ubinascii }, \
     { MP_OBJ_NEW_QSTR(MP_QSTR_collections), (mp_obj_t)&mp_module_collections }, \
     { MP_OBJ_NEW_QSTR(MP_QSTR_errno), (mp_obj_t)&mp_module_uerrno }, \
-    { MP_OBJ_NEW_QSTR(MP_QSTR_hashlib), (mp_obj_t)(&mp_module_uhashlib) }, \
     { MP_OBJ_NEW_QSTR(MP_QSTR_heapq), (mp_obj_t)&mp_module_uheapq }, \
     { MP_OBJ_NEW_QSTR(MP_QSTR_io), (mp_obj_t)&mp_module_io }, \
     { MP_OBJ_NEW_QSTR(MP_QSTR_json), (mp_obj_t)&mp_module_ujson }, \
     { MP_OBJ_NEW_QSTR(MP_QSTR_os), (mp_obj_t)&uos_module }, \
     { MP_OBJ_NEW_QSTR(MP_QSTR_socket), (mp_obj_t)&usocket_module }, \
-    { MP_OBJ_NEW_QSTR(MP_QSTR_ssl), (mp_obj_t)&mp_module_ussl }, \
     { MP_OBJ_NEW_QSTR(MP_QSTR_time), (mp_obj_t)&utime_module }, \
     { MP_OBJ_NEW_QSTR(MP_QSTR_random), (mp_obj_t)&mp_module_urandom }, \
     { MP_OBJ_NEW_QSTR(MP_QSTR_re), (mp_obj_t)&mp_module_ure }, \
     { MP_OBJ_NEW_QSTR(MP_QSTR_struct), (mp_obj_t)&mp_module_ustruct }, \
     { MP_OBJ_NEW_QSTR(MP_QSTR_zlib), (mp_obj_t)&mp_module_uzlib }, \
+    SSL_BUILTIN_MODULE_WEAK_LINKS \
 
 // type definitions for the specific machine
 
diff --git a/ports/gprs_a9/nm.txt b/ports/gprs_a9/nm.txt
new file mode 100644
index 0000000000000..cfb908fbdd918
--- /dev/null
+++ b/ports/gprs_a9/nm.txt
@@ -0,0 +1,7852 @@
+
+build/py/mpstate.o:
+0000023c C mp_state_ctx
+
+build/py/nlr.o:
+         U mp_state_ctx
+00000000 T nlr_pop
+00000000 T nlr_push_tail
+
+build/py/nlrx86.o:
+
+build/py/nlrx64.o:
+
+build/py/nlrthumb.o:
+
+build/py/nlrxtensa.o:
+
+build/py/nlrsetjmp.o:
+00000002 t $LCFI0
+         U g_InterfaceVtbl
+         U mp_state_ctx
+00000000 T nlr_jump
+         U nlr_jump_fail
+
+build/py/malloc.o:
+00000002 t $LCFI0
+00000002 t $LCFI10
+00000002 t $LCFI12
+00000002 t $LCFI15
+00000004 t $LCFI2
+00000002 t $LCFI4
+00000002 t $LCFI7
+         U gc_alloc
+         U gc_free
+         U gc_realloc
+00000000 T m_free
+00000000 T m_malloc
+00000000 T m_malloc0
+         U m_malloc_fail
+00000000 T m_malloc_maybe
+00000000 T m_malloc_with_finaliser
+00000000 T m_realloc
+00000000 T m_realloc_maybe
+
+build/py/gc.o:
+000000da t $L150
+00000002 t $LCFI0
+00000002 t $LCFI10
+00000002 t $LCFI14
+00000002 t $LCFI16
+00000010 t $LCFI20
+00000004 t $LCFI24
+00000002 t $LCFI28
+00000002 t $LCFI3
+00000002 t $LCFI32
+00000008 t $LCFI36
+00000002 t $LCFI38
+00000002 t $LCFI7
+00000000 T gc_alloc
+         U gc_collect
+00000000 T gc_collect_end
+00000000 T gc_collect_root
+00000000 T gc_collect_start
+00000000 T gc_dump_alloc_table
+00000000 T gc_dump_info
+00000000 T gc_free
+00000000 T gc_info
+00000000 T gc_init
+00000000 T gc_is_locked
+00000000 T gc_lock
+00000000 t gc_mark_subtree
+00000000 T gc_nbytes
+00000000 T gc_realloc
+00000000 T gc_sweep_all
+00000000 T gc_unlock
+         U g_InterfaceVtbl
+         U memcpy
+         U memset
+         U mp_call_function_1_protected
+         U mp_load_method_maybe
+         U mp_plat_print
+         U mp_printf
+         U mp_print_str
+         U mp_sched_lock
+         U mp_sched_unlock
+         U mp_state_ctx
+         U mp_type_array
+         U mp_type_bytearray
+         U mp_type_bytes
+         U mp_type_dict
+         U mp_type_float
+         U mp_type_fun_bc
+         U mp_type_list
+         U mp_type_module
+         U mp_type_str
+         U mp_type_tuple
+
+build/py/pystack.o:
+
+build/py/qstr.o:
+00000002 t $LCFI0
+00000004 t $LCFI13
+00000002 t $LCFI17
+00000002 t $LCFI2
+00000002 t $LCFI21
+00000002 t $LCFI25
+00000002 t $LCFI4
+00000002 t $LCFI6
+00000002 t $LCFI9
+00000000 t find_qstr
+         U gc_nbytes
+         U g_InterfaceVtbl
+         U memcmp
+         U memcpy
+         U m_malloc_fail
+         U m_malloc_maybe
+         U mp_plat_print
+         U mp_printf
+00000000 R mp_qstr_const_pool
+         U mp_qstr_frozen_const_pool
+         U mp_state_ctx
+         U m_realloc_maybe
+00000000 T qstr_compute_hash
+00000000 T qstr_data
+00000000 T qstr_dump_data
+00000000 T qstr_find_strn
+00000000 T qstr_from_str
+00000000 T qstr_from_strn
+00000000 T qstr_hash
+00000000 T qstr_init
+00000000 T qstr_len
+00000000 T qstr_pool_info
+00000000 T qstr_str
+         U strlen
+
+build/py/vstr.o:
+00000002 t $LCFI0
+00000002 t $LCFI10
+00000002 t $LCFI14
+00000002 t $LCFI18
+00000002 t $LCFI2
+00000002 t $LCFI22
+00000002 t $LCFI26
+00000002 t $LCFI29
+00000002 t $LCFI31
+00000002 t $LCFI35
+00000002 t $LCFI38
+00000002 t $LCFI4
+00000002 t $LCFI41
+00000002 t $LCFI44
+00000002 t $LCFI47
+00000002 t $LCFI50
+00000002 t $LCFI54
+00000002 t $LCFI58
+00000002 t $LCFI61
+00000002 t $LCFI65
+00000002 t $LCFI68
+00000002 t $LCFI8
+         U g_InterfaceVtbl
+         U memmove
+         U m_free
+         U m_malloc
+         U mp_raise_msg
+         U mp_type_RuntimeError
+         U mp_vprintf
+         U m_realloc
+         U strlen
+00000000 t T.17
+00000000 T vstr_add_byte
+00000000 T vstr_add_char
+00000000 T vstr_add_len
+00000000 T vstr_add_str
+00000000 T vstr_add_strn
+00000000 T vstr_clear
+00000000 T vstr_cut_head_bytes
+00000000 T vstr_cut_out_bytes
+00000000 T vstr_cut_tail_bytes
+00000000 t vstr_ensure_extra
+00000000 T vstr_extend
+00000000 T vstr_free
+00000000 T vstr_hint_size
+00000000 T vstr_init
+00000000 T vstr_init_fixed_buf
+00000000 T vstr_init_len
+00000000 T vstr_init_print
+00000000 T vstr_ins_byte
+00000000 T vstr_ins_char
+00000000 T vstr_new
+00000000 T vstr_null_terminated_str
+00000000 T vstr_printf
+00000000 T vstr_vprintf
+
+build/py/mpprint.o:
+00000002 t $LCFI0
+00000002 t $LCFI10
+00000002 t $LCFI13
+00000002 t $LCFI17
+00000002 t $LCFI21
+00000002 t $LCFI23
+00000002 t $LCFI4
+00000002 t $LCFI8
+         U g_InterfaceVtbl
+         U m_free
+         U mp_format_float
+         U mp_hal_stdout_tx_strn_cooked
+         U mp_obj_get_int
+         U mp_obj_int_formatted
+         U mp_obj_int_sign
+00000000 R mp_plat_print
+00000000 T mp_printf
+00000000 T mp_print_float
+00000000 t mp_print_int
+00000000 T mp_print_mp_int
+00000000 T mp_print_str
+00000000 T mp_print_strn
+         U mp_type_int
+00000000 T mp_vprintf
+00000000 r pad_spaces
+00000000 r pad_zeroes
+00000000 t plat_print_strn
+         U qstr_data
+         U strlen
+
+build/py/unicode.o:
+00000002 t $LCFI0
+00000002 t $LCFI3
+00000000 r attr
+00000000 T unichar_isalpha
+00000000 T unichar_isdigit
+00000000 T unichar_isident
+00000000 T unichar_islower
+00000000 T unichar_isspace
+00000000 T unichar_isupper
+00000000 T unichar_isxdigit
+00000000 T unichar_tolower
+00000000 T unichar_toupper
+00000000 T unichar_xdigit_value
+00000000 T utf8_charlen
+00000000 T utf8_check
+00000000 T utf8_get_char
+00000000 T utf8_next_char
+00000000 T utf8_ptr_to_index
+
+build/py/mpz.o:
+00000002 t $LCFI0
+00000002 t $LCFI10
+00000002 t $LCFI102
+00000002 t $LCFI105
+00000002 t $LCFI109
+00000002 t $LCFI113
+00000002 t $LCFI117
+00000002 t $LCFI121
+00000002 t $LCFI14
+00000004 t $LCFI18
+00000002 t $LCFI21
+00000002 t $LCFI25
+00000002 t $LCFI29
+00000002 t $LCFI3
+00000002 t $LCFI32
+00000002 t $LCFI34
+00000002 t $LCFI38
+00000002 t $LCFI42
+00000002 t $LCFI46
+00000002 t $LCFI50
+00000002 t $LCFI54
+00000002 t $LCFI58
+00000002 t $LCFI6
+00000004 t $LCFI62
+00000002 t $LCFI66
+00000002 t $LCFI70
+00000002 t $LCFI74
+0000001e t $LCFI78
+00000002 t $LCFI80
+00000002 t $LCFI83
+00000002 t $LCFI87
+00000002 t $LCFI91
+00000002 t $LCFI95
+00000002 t $LCFI99
+         U __adddf3
+         U __ashldi3
+         U __floatsidf
+         U g_InterfaceVtbl
+         U __lshrdi3
+         U memcpy
+         U memset
+         U m_free
+         U m_malloc
+00000000 t mpn_add
+00000000 t mpn_cmp
+00000000 t mpn_remove_trailing_zeros
+00000000 t mpn_shr
+00000000 t mpn_sub
+00000000 t mpn_xor_neg
+00000000 T mpz_abs_inpl
+00000000 T mpz_add_inpl
+00000000 T mpz_and_inpl
+00000000 T mpz_as_bytes
+00000000 T mpz_as_float
+00000000 T mpz_as_int_checked
+00000000 T mpz_as_str_inpl
+00000000 T mpz_as_uint_checked
+00000000 t mpz_clone
+00000000 T mpz_cmp
+00000000 T mpz_deinit
+00000000 T mpz_divmod_inpl
+00000000 t mpz_free
+00000000 T mpz_hash
+00000000 T mpz_init_fixed_from_int
+00000000 T mpz_init_from_int
+00000000 T mpz_init_zero
+00000000 T mpz_mul_inpl
+00000000 t mpz_need_dig
+00000000 T mpz_neg_inpl
+00000000 T mpz_not_inpl
+00000000 T mpz_or_inpl
+00000000 T mpz_pow3_inpl
+00000000 T mpz_pow_inpl
+00000000 T mpz_set
+00000000 T mpz_set_from_bytes
+00000000 T mpz_set_from_float
+00000000 T mpz_set_from_int
+00000000 T mpz_set_from_ll
+00000000 T mpz_set_from_str
+00000000 T mpz_shl_inpl
+00000000 T mpz_shr_inpl
+00000000 T mpz_sub_inpl
+00000000 T mpz_xor_inpl
+         U m_realloc
+         U __muldf3
+         U strlen
+
+build/py/reader.o:
+00000002 t $LCFI0
+00000002 t $LCFI4
+         U m_free
+         U m_malloc
+00000000 t mp_reader_mem_close
+00000000 t mp_reader_mem_readbyte
+00000000 T mp_reader_new_mem
+
+build/py/lexer.o:
+00000002 t $LCFI0
+00000002 t $LCFI10
+00000002 t $LCFI12
+00000002 t $LCFI14
+00000002 t $LCFI17
+00000002 t $LCFI20
+00000002 t $LCFI24
+00000002 t $LCFI28
+00000002 t $LCFI3
+00000002 t $LCFI31
+00000002 t $LCFI6
+00000000 t indent_top
+00000000 t is_char
+00000000 t is_char_and
+00000000 t is_char_following
+00000000 t is_char_or
+00000000 t is_char_or3
+00000000 t is_digit
+00000000 t is_end
+00000000 t is_head_of_identifier
+00000000 t is_letter
+00000000 t is_physical_newline
+00000000 t is_string_or_bytes
+         U m_free
+         U m_malloc
+00000000 T mp_lexer_free
+00000000 T mp_lexer_new
+00000000 T mp_lexer_new_from_file
+00000000 T mp_lexer_new_from_str_len
+00000000 T mp_lexer_to_next
+         U mp_raise_NotImplementedError
+         U mp_reader_new_file
+         U mp_reader_new_mem
+         U mp_state_ctx
+         U m_realloc
+00000000 t next_char
+         U qstr_from_str
+00000000 t skip_whitespace
+         U strcmp
+00000000 r tok_enc_kind
+00000000 r tok_kw
+         U unichar_isalpha
+         U unichar_isdigit
+         U unichar_isspace
+         U unichar_isxdigit
+         U unichar_xdigit_value
+         U vstr_add_byte
+         U vstr_add_char
+         U vstr_clear
+         U vstr_cut_tail_bytes
+         U vstr_init
+         U vstr_null_terminated_str
+
+build/py/parse.o:
+00000412 t $L172
+000002e8 t $L194
+00000002 t $LCFI0
+00000002 t $LCFI10
+00000002 t $LCFI14
+00000002 t $LCFI18
+00000002 t $LCFI22
+00000008 t $LCFI26
+00000002 t $LCFI3
+00000002 t $LCFI30
+00000006 t $LCFI34
+00000002 t $LCFI38
+00000002 t $LCFI7
+00000000 r CSWTCH.98
+         U g_InterfaceVtbl
+00000000 t make_node_const_object
+         U m_free
+         U m_malloc
+         U mp_binary_op
+00000000 r mp_constants_map
+00000000 r mp_constants_table
+         U mp_lexer_free
+         U mp_lexer_to_next
+         U mp_load_method_maybe
+         U mp_map_deinit
+         U mp_map_init
+         U mp_map_lookup
+         U mp_module_uctypes
+         U mp_module_uerrno
+         U mp_obj_exception_add_traceback
+         U mp_obj_int_sign
+         U mp_obj_new_exception_msg
+         U mp_obj_new_str_copy
+00000000 T mp_parse
+00000000 T mp_parse_node_extract_list
+00000000 T mp_parse_node_get_int_maybe
+00000000 T mp_parse_node_is_const_false
+00000000 T mp_parse_node_is_const_true
+00000000 t mp_parse_node_new_small_int_checked
+         U mp_parse_num_decimal
+         U mp_parse_num_integer
+00000000 T mp_parse_tree_clear
+         U mp_type_bytes
+         U mp_type_IndentationError
+         U mp_type_int
+         U mp_type_str
+         U mp_type_SyntaxError
+         U mp_unary_op
+         U m_realloc
+         U m_realloc_maybe
+         U nlr_jump
+00000000 t parser_alloc
+00000000 t peek_result
+00000000 t pop_result
+00000000 t push_result_node
+00000000 t push_result_rule
+00000000 t push_result_token
+00000000 t push_rule
+00000000 t push_rule_from_arg
+         U qstr_find_strn
+         U qstr_from_strn
+         U qstr_str
+00000000 r rule_act_table
+00000000 r rule_arg_combined_table
+00000000 r rule_arg_offset_table
+00000000 r token_to_op.7570
+
+build/py/scope.o:
+00000002 t $LCFI0
+00000002 t $LCFI10
+00000002 t $LCFI13
+00000002 t $LCFI2
+00000002 t $LCFI6
+         U g_InterfaceVtbl
+         U m_free
+         U m_malloc
+         U m_malloc0
+         U mp_emit_glue_new_raw_code
+         U m_realloc
+00000000 T scope_check_to_close_over
+00000000 T scope_find
+00000000 T scope_find_global
+00000000 T scope_find_or_add_id
+00000000 T scope_free
+00000000 T scope_new
+00000000 r scope_simple_name_table
+
+build/py/compile.o:
+00000228 t $L107
+000001d6 t $L132
+00000216 t $L135
+0000004a t $L176
+0000003e t $L195
+00000172 t $L362
+00000166 t $L373
+00000100 t $L423
+0000007e t $L448
+00000082 t $L464
+000000d0 t $L474
+00000166 t $L536
+00000002 t $LCFI0
+00000002 t $LCFI101
+00000002 t $LCFI105
+00000002 t $LCFI109
+00000002 t $LCFI11
+00000002 t $LCFI113
+00000002 t $LCFI117
+00000002 t $LCFI121
+00000002 t $LCFI124
+00000002 t $LCFI128
+00000002 t $LCFI132
+00000002 t $LCFI136
+00000002 t $LCFI14
+00000002 t $LCFI140
+00000002 t $LCFI144
+00000002 t $LCFI148
+00000002 t $LCFI151
+00000002 t $LCFI153
+00000002 t $LCFI157
+00000002 t $LCFI16
+00000002 t $LCFI161
+00000006 t $LCFI163
+00000002 t $LCFI167
+00000002 t $LCFI171
+00000002 t $LCFI174
+00000002 t $LCFI177
+00000002 t $LCFI180
+00000002 t $LCFI184
+00000002 t $LCFI188
+00000002 t $LCFI192
+00000002 t $LCFI196
+00000002 t $LCFI199
+00000002 t $LCFI20
+00000002 t $LCFI203
+00000002 t $LCFI207
+00000002 t $LCFI211
+00000002 t $LCFI215
+00000002 t $LCFI218
+00000002 t $LCFI22
+00000002 t $LCFI221
+00000002 t $LCFI225
+00000002 t $LCFI229
+00000002 t $LCFI233
+00000002 t $LCFI237
+00000002 t $LCFI241
+00000002 t $LCFI245
+00000008 t $LCFI249
+00000002 t $LCFI253
+00000002 t $LCFI257
+00000002 t $LCFI26
+00000002 t $LCFI261
+00000002 t $LCFI265
+00000002 t $LCFI269
+00000002 t $LCFI273
+00000002 t $LCFI28
+00000002 t $LCFI30
+00000002 t $LCFI32
+00000002 t $LCFI34
+00000002 t $LCFI36
+00000002 t $LCFI38
+00000002 t $LCFI4
+00000002 t $LCFI42
+00000002 t $LCFI46
+00000002 t $LCFI50
+00000002 t $LCFI54
+00000002 t $LCFI58
+00000002 t $LCFI6
+00000002 t $LCFI62
+00000002 t $LCFI66
+00000002 t $LCFI69
+00000002 t $LCFI73
+00000002 t $LCFI77
+00000002 t $LCFI8
+00000002 t $LCFI80
+00000002 t $LCFI84
+00000002 t $LCFI86
+00000002 t $LCFI90
+00000002 t $LCFI93
+00000002 t $LCFI97
+00000000 t apply_to_single_or_list
+00000000 t c_assign
+00000000 t c_assign_tuple
+00000000 t c_del_stmt
+00000000 t check_for_doc_string
+00000000 t c_if_cond
+00000000 t close_over_variables_etc
+00000000 t compile_assert_stmt
+00000000 t compile_async_stmt
+00000000 t compile_async_with_stmt_helper
+00000000 t compile_atom_brace
+00000000 t compile_atom_brace_helper
+00000000 t compile_atom_bracket
+00000000 t compile_atom_expr_await
+00000000 t compile_atom_expr_normal
+00000000 t compile_atom_paren
+00000000 t compile_await_object_method
+00000000 t compile_binary_op
+00000000 t compile_break_cont_stmt
+00000000 t compile_classdef
+00000000 t compile_classdef_helper
+00000000 t compile_comparison
+00000000 t compile_comprehension
+00000000 t compile_const_object
+00000000 t compile_decorated
+00000000 t compile_decrease_except_level
+00000000 t compile_delete_id
+00000000 t compile_del_stmt
+00000000 t compile_dictorsetmaker_item
+00000000 t compile_dotted_as_name
+00000000 t compile_error_set_line
+00000000 t compile_expr_stmt
+00000000 t compile_factor_2
+00000000 t compile_for_stmt
+00000000 t compile_funcdef
+00000000 t compile_funcdef_helper
+00000000 t compile_funcdef_lambdef
+00000000 t compile_funcdef_lambdef_param
+00000000 r compile_function
+00000000 t compile_generic_all_nodes
+00000000 t compile_generic_tuple
+00000000 t compile_global_nonlocal_stmt
+00000000 t compile_if_stmt
+00000000 t compile_import_from
+00000000 t compile_import_name
+00000000 t compile_increase_except_level
+00000000 t compile_lambdef
+00000000 t compile_load_id
+00000000 t compile_node
+00000000 t compile_not_test_2
+00000000 t compile_or_and_test
+00000000 t compile_power
+00000000 t compile_raise_stmt
+00000000 t compile_return_stmt
+00000000 t compile_scope
+00000000 t compile_scope_comp_iter
+00000000 t compile_scope_func_lambda_param
+00000000 t compile_scope_func_param
+00000000 t compile_scope_lambda_param
+00000000 t compile_star_expr
+00000000 t compile_store_id
+00000000 t compile_subscript
+00000000 t compile_syntax_error
+00000000 t compile_term
+00000000 t compile_test_if_expr
+00000000 t compile_trailer_bracket
+00000000 t compile_trailer_paren
+00000000 t compile_trailer_paren_helper
+00000000 t compile_trailer_period
+00000000 t compile_try_except
+00000000 t compile_try_finally
+00000000 t compile_try_stmt
+00000000 t compile_while_stmt
+00000000 t compile_with_stmt
+00000000 t compile_with_stmt_helper
+00000000 t compile_yield_expr
+00000000 t compile_yield_from
+00000000 t compile_yield_stmt
+00000000 t comp_next_label
+00000000 r CSWTCH.238
+00000000 r CSWTCH.241
+00000000 t c_tuple
+00000000 t do_import_name
+         U emit_bc_free
+         U emit_bc_new
+         U emit_bc_set_max_num_labels
+         U g_InterfaceVtbl
+         U memcpy
+         U memset
+         U m_malloc
+00000000 T mp_compile
+         U mp_const_none_obj
+         U mp_emit_bc_adjust_stack_size
+         U mp_emit_bc_attr
+         U mp_emit_bc_binary_op
+         U mp_emit_bc_build
+         U mp_emit_bc_call_function
+         U mp_emit_bc_call_method
+         U mp_emit_bc_dup_top
+         U mp_emit_bc_dup_top_two
+         U mp_emit_bc_end_except_handler
+         U mp_emit_bc_end_finally
+         U mp_emit_bc_end_pass
+         U mp_emit_bc_for_iter
+         U mp_emit_bc_for_iter_end
+         U mp_emit_bc_get_iter
+         U mp_emit_bc_import
+         U mp_emit_bc_jump
+         U mp_emit_bc_jump_if_or_pop
+         U mp_emit_bc_label_assign
+         U mp_emit_bc_last_emit_was_return_value
+         U mp_emit_bc_load_build_class
+         U mp_emit_bc_load_const_obj
+         U mp_emit_bc_load_const_small_int
+         U mp_emit_bc_load_const_str
+         U mp_emit_bc_load_const_tok
+         U mp_emit_bc_load_global
+         U mp_emit_bc_load_local
+         U mp_emit_bc_load_method
+         U mp_emit_bc_load_null
+         U mp_emit_bc_make_closure
+         U mp_emit_bc_make_function
+         U mp_emit_bc_method_table_delete_id_ops
+         U mp_emit_bc_method_table_load_id_ops
+         U mp_emit_bc_method_table_store_id_ops
+         U mp_emit_bc_pop_except_jump
+         U mp_emit_bc_pop_jump_if
+         U mp_emit_bc_pop_top
+         U mp_emit_bc_raise_varargs
+         U mp_emit_bc_return_value
+         U mp_emit_bc_rot_three
+         U mp_emit_bc_rot_two
+         U mp_emit_bc_set_source_line
+         U mp_emit_bc_setup_block
+         U mp_emit_bc_start_except_handler
+         U mp_emit_bc_start_pass
+         U mp_emit_bc_store_comp
+         U mp_emit_bc_store_map
+         U mp_emit_bc_subscr
+         U mp_emit_bc_unary_op
+         U mp_emit_bc_unpack_ex
+         U mp_emit_bc_unpack_sequence
+         U mp_emit_bc_unwind_jump
+         U mp_emit_bc_with_cleanup
+         U mp_emit_bc_yield
+         U mp_emit_common_get_id_for_modification
+         U mp_emit_common_id_op
+         U mp_make_function_from_raw_code
+         U mp_obj_exception_add_traceback
+         U mp_obj_new_bytes
+         U mp_obj_new_exception_msg
+         U mp_parse_node_extract_list
+         U mp_parse_node_is_const_false
+         U mp_parse_node_is_const_true
+         U mp_parse_tree_clear
+         U mp_state_ctx
+         U mp_type_SyntaxError
+         U nlr_jump
+         U qstr_data
+         U qstr_from_strn
+         U qstr_len
+         U scope_check_to_close_over
+         U scope_find
+         U scope_find_global
+         U scope_find_or_add_id
+         U scope_free
+         U scope_new
+00000000 t scope_new_and_link
+
+build/py/emitcommon.o:
+00000002 t $LCFI0
+00000002 t $LCFI4
+         U g_InterfaceVtbl
+00000000 T mp_emit_common_get_id_for_modification
+00000000 T mp_emit_common_id_op
+         U scope_find
+         U scope_find_or_add_id
+
+build/py/emitbc.o:
+00000002 t $LCFI0
+00000002 t $LCFI100
+00000004 t $LCFI102
+00000004 t $LCFI104
+00000002 t $LCFI106
+00000002 t $LCFI11
+0000000c t $LCFI110
+00000004 t $LCFI112
+00000004 t $LCFI114
+00000002 t $LCFI116
+00000004 t $LCFI118
+00000002 t $LCFI120
+00000008 t $LCFI122
+00000002 t $LCFI124
+00000002 t $LCFI128
+00000004 t $LCFI13
+00000004 t $LCFI130
+00000002 t $LCFI132
+00000002 t $LCFI134
+00000006 t $LCFI136
+00000002 t $LCFI138
+00000002 t $LCFI140
+00000002 t $LCFI144
+00000002 t $LCFI147
+00000002 t $LCFI149
+00000004 t $LCFI151
+00000004 t $LCFI154
+00000002 t $LCFI157
+00000004 t $LCFI159
+00000002 t $LCFI161
+00000002 t $LCFI163
+00000002 t $LCFI166
+00000002 t $LCFI17
+00000002 t $LCFI170
+00000002 t $LCFI173
+00000002 t $LCFI176
+00000002 t $LCFI178
+00000002 t $LCFI180
+00000002 t $LCFI182
+00000002 t $LCFI186
+00000006 t $LCFI190
+00000002 t $LCFI21
+00000002 t $LCFI24
+00000002 t $LCFI28
+00000002 t $LCFI32
+00000004 t $LCFI36
+00000002 t $LCFI38
+00000002 t $LCFI4
+00000002 t $LCFI42
+00000002 t $LCFI46
+00000002 t $LCFI50
+00000002 t $LCFI54
+00000002 t $LCFI58
+00000002 t $LCFI62
+00000002 t $LCFI64
+00000002 t $LCFI66
+00000002 t $LCFI68
+00000006 t $LCFI70
+00000012 t $LCFI72
+00000002 t $LCFI74
+00000002 t $LCFI76
+0000000a t $LCFI78
+00000002 t $LCFI8
+0000000a t $LCFI80
+00000006 t $LCFI82
+00000002 t $LCFI84
+00000002 t $LCFI86
+00000004 t $LCFI88
+00000002 t $LCFI90
+00000002 t $LCFI92
+00000002 t $LCFI95
+00000002 t $LCFI97
+00000000 t emit_bc_call_function_method_helper
+00000000 T emit_bc_free
+00000000 T emit_bc_new
+00000000 T emit_bc_set_max_num_labels
+00000000 t emit_get_cur_to_write_bytecode
+00000000 t emit_get_cur_to_write_code_info
+00000000 t emit_write_bytecode_byte
+00000000 t emit_write_bytecode_byte_const
+00000000 t emit_write_bytecode_byte_qstr
+00000000 t emit_write_bytecode_byte_raw_code
+00000000 t emit_write_bytecode_byte_signed_label
+00000000 t emit_write_bytecode_byte_uint
+00000000 t emit_write_bytecode_byte_unsigned_label
+00000000 t emit_write_bytecode_raw_byte
+00000000 t emit_write_code_info_byte
+00000000 t emit_write_code_info_qstr
+00000000 t emit_write_code_info_uint
+00000000 t emit_write_uint
+         U g_InterfaceVtbl
+         U memset
+         U m_free
+         U m_malloc
+         U m_malloc0
+         U mp_const_ellipsis_obj
+00000000 T mp_emit_bc_adjust_stack_size
+00000000 T mp_emit_bc_attr
+00000000 T mp_emit_bc_binary_op
+00000000 T mp_emit_bc_build
+00000000 T mp_emit_bc_call_function
+00000000 T mp_emit_bc_call_method
+00000000 T mp_emit_bc_delete_global
+00000000 T mp_emit_bc_delete_local
+00000000 T mp_emit_bc_dup_top
+00000000 T mp_emit_bc_dup_top_two
+00000000 T mp_emit_bc_end_except_handler
+00000000 T mp_emit_bc_end_finally
+00000000 T mp_emit_bc_end_pass
+00000000 T mp_emit_bc_for_iter
+00000000 T mp_emit_bc_for_iter_end
+00000000 T mp_emit_bc_get_iter
+00000000 T mp_emit_bc_import
+00000000 T mp_emit_bc_jump
+00000000 T mp_emit_bc_jump_if_or_pop
+00000000 T mp_emit_bc_label_assign
+00000000 T mp_emit_bc_last_emit_was_return_value
+00000000 T mp_emit_bc_load_build_class
+00000000 T mp_emit_bc_load_const_obj
+00000000 T mp_emit_bc_load_const_small_int
+00000000 T mp_emit_bc_load_const_str
+00000000 T mp_emit_bc_load_const_tok
+00000000 T mp_emit_bc_load_global
+00000000 T mp_emit_bc_load_local
+00000000 T mp_emit_bc_load_method
+00000000 T mp_emit_bc_load_null
+00000000 T mp_emit_bc_make_closure
+00000000 T mp_emit_bc_make_function
+00000000 R mp_emit_bc_method_table_delete_id_ops
+00000000 R mp_emit_bc_method_table_load_id_ops
+00000000 R mp_emit_bc_method_table_store_id_ops
+00000000 T mp_emit_bc_pop_except_jump
+00000000 T mp_emit_bc_pop_jump_if
+00000000 T mp_emit_bc_pop_top
+00000000 T mp_emit_bc_raise_varargs
+00000000 T mp_emit_bc_return_value
+00000000 T mp_emit_bc_rot_three
+00000000 T mp_emit_bc_rot_two
+00000000 T mp_emit_bc_set_source_line
+00000000 T mp_emit_bc_setup_block
+00000000 T mp_emit_bc_start_except_handler
+00000000 T mp_emit_bc_start_pass
+00000000 T mp_emit_bc_store_comp
+00000000 T mp_emit_bc_store_global
+00000000 T mp_emit_bc_store_local
+00000000 T mp_emit_bc_store_map
+00000000 T mp_emit_bc_subscr
+00000000 T mp_emit_bc_unary_op
+00000000 T mp_emit_bc_unpack_ex
+00000000 T mp_emit_bc_unpack_sequence
+00000000 T mp_emit_bc_unwind_jump
+00000000 T mp_emit_bc_with_cleanup
+00000000 T mp_emit_bc_yield
+         U mp_emit_glue_assign_bytecode
+         U mp_state_ctx
+00000000 t T.56
+
+build/py/asmbase.o:
+
+build/py/asmx64.o:
+
+build/py/emitnx64.o:
+
+build/py/asmx86.o:
+
+build/py/emitnx86.o:
+
+build/py/asmthumb.o:
+
+build/py/emitnthumb.o:
+
+build/py/emitinlinethumb.o:
+
+build/py/asmarm.o:
+
+build/py/emitnarm.o:
+
+build/py/asmxtensa.o:
+
+build/py/emitnxtensa.o:
+
+build/py/emitinlinextensa.o:
+
+build/py/formatfloat.o:
+00000002 t $LCFI0
+         U __eqdf2
+         U __fixdfsi
+         U __floatsidf
+         U __gedf2
+         U g_InterfaceVtbl
+00000000 r g_neg_pow
+00000000 r g_pos_pow
+         U __gtdf2
+         U __ledf2
+         U __ltdf2
+00000000 T mp_format_float
+         U __muldf3
+         U __nedf2
+         U __subdf3
+
+build/py/parsenumbase.o:
+00000068 t $L2
+00000002 t $LCFI0
+00000000 T mp_parse_num_base
+
+build/py/parsenum.o:
+00000358 t $L32
+000000da t $L83
+000000ae t $L86
+00000002 t $LCFI0
+00000004 t $LCFI3
+00000002 t $LCFI7
+         U __adddf3
+         U __divdf3
+         U __extendsfdf2
+         U __floatsidf
+         U __floatunsidf
+         U __ltdf2
+         U mp_obj_exception_add_traceback
+         U mp_obj_new_complex
+         U mp_obj_new_exception_msg
+         U mp_obj_new_exception_msg_varg
+         U mp_obj_new_float
+         U mp_obj_new_int_from_str_len
+         U mp_parse_num_base
+00000000 T mp_parse_num_decimal
+00000000 T mp_parse_num_integer
+         U mp_raise_ValueError
+         U mp_small_int_mul_overflow
+         U mp_type_SyntaxError
+         U mp_type_ValueError
+         U __muldf3
+         U nlr_jump
+         U pow
+00000000 t raise_exc
+         U __truncdfsf2
+         U unichar_isspace
+
+build/py/emitglue.o:
+00000002 t $LCFI0
+00000006 t $LCFI4
+00000002 t $LCFI8
+         U g_InterfaceVtbl
+         U m_malloc0
+00000000 T mp_emit_glue_assign_bytecode
+00000000 T mp_emit_glue_new_raw_code
+00000000 T mp_make_closure_from_raw_code
+00000000 T mp_make_function_from_raw_code
+         U mp_obj_new_closure
+         U mp_obj_new_fun_bc
+         U mp_type_dict
+         U mp_type_gen_wrap
+         U mp_type_tuple
+
+build/py/persistentcode.o:
+00000002 t $LCFI0
+00000002 t $LCFI10
+00000002 t $LCFI14
+00000002 t $LCFI18
+00000002 t $LCFI2
+00000002 t $LCFI21
+00000002 t $LCFI24
+00000002 t $LCFI6
+         U g_InterfaceVtbl
+00000000 t load_qstr
+00000000 t load_raw_code
+         U memmove
+         U m_free
+         U m_malloc
+         U mp_const_ellipsis_obj
+         U mp_emit_glue_assign_bytecode
+         U mp_emit_glue_new_raw_code
+         U mp_obj_new_str_from_vstr
+         U mp_opcode_format
+         U mp_parse_num_decimal
+         U mp_parse_num_integer
+         U mp_raise_ValueError
+00000000 T mp_raw_code_load
+00000000 T mp_raw_code_load_file
+00000000 T mp_raw_code_load_mem
+         U mp_reader_new_file
+         U mp_reader_new_mem
+         U mp_type_bytes
+         U mp_type_str
+         U qstr_from_strn
+00000000 t read_byte
+00000000 t read_bytes
+00000000 t read_uint
+         U vstr_init_len
+
+build/py/runtime.o:
+00000016 t $L115
+0000030c t $L320
+0000037a t $L324
+00000232 t $L328
+00000002 t $LCFI0
+00000002 t $LCFI10
+00000002 t $LCFI102
+00000002 t $LCFI106
+0000000a t $LCFI110
+0000000a t $LCFI112
+0000000c t $LCFI114
+0000000c t $LCFI116
+00000002 t $LCFI118
+00000002 t $LCFI12
+00000002 t $LCFI122
+00000002 t $LCFI15
+00000002 t $LCFI17
+00000006 t $LCFI2
+00000002 t $LCFI21
+00000004 t $LCFI24
+00000002 t $LCFI28
+00000002 t $LCFI32
+00000002 t $LCFI36
+00000002 t $LCFI4
+00000002 t $LCFI40
+00000002 t $LCFI44
+00000002 t $LCFI47
+00000002 t $LCFI49
+00000002 t $LCFI53
+00000002 t $LCFI56
+00000002 t $LCFI59
+00000002 t $LCFI6
+00000002 t $LCFI62
+00000002 t $LCFI66
+00000002 t $LCFI68
+00000004 t $LCFI70
+00000002 t $LCFI72
+00000002 t $LCFI76
+00000002 t $LCFI8
+00000002 t $LCFI80
+00000002 t $LCFI84
+00000002 t $LCFI88
+00000004 t $LCFI90
+00000002 t $LCFI94
+00000002 t $LCFI98
+00000000 t checked_fun_call
+         U __divdf3
+         U __floatsidf
+         U gc_is_locked
+         U g_InterfaceVtbl
+         U memcpy
+         U m_free
+         U m_malloc
+00000000 T m_malloc_fail
+00000000 T mp_binary_op
+         U mp_binary_op_method_name
+         U mp_builtin___build_class___obj
+         U mp_builtin___import__
+         U mp_builtin_next_obj
+00000000 T mp_call_function_0
+00000000 T mp_call_function_1
+00000000 T mp_call_function_2
+00000000 T mp_call_function_n_kw
+00000000 T mp_call_method_n_kw
+00000000 T mp_call_method_n_kw_var
+         U mp_compile
+         U mp_const_empty_tuple_obj
+         U mp_const_false_obj
+         U mp_const_none_obj
+         U mp_const_true_obj
+00000000 T mp_convert_member_lookup
+00000000 T mp_deinit
+00000000 T mp_delete_global
+00000000 T mp_delete_name
+00000000 T mp_getiter
+         U mp_identity_getiter
+00000000 T mp_import_all
+00000000 T mp_import_from
+00000000 T mp_import_name
+00000000 T mp_init
+         U mp_init_emergency_exception_buf
+00000000 T mp_iternext
+00000000 T mp_iternext_allow_raise
+00000000 T mp_load_attr
+00000000 T mp_load_build_class
+00000000 T mp_load_global
+00000000 T mp_load_method
+00000000 T mp_load_method_maybe
+00000000 T mp_load_method_protected
+00000000 T mp_load_name
+00000000 T mp_make_raise_obj
+         U mp_map_lookup
+         U mp_module_builtins_globals
+00000000 R mp_module___main__
+         U mp_obj_complex_binary_op
+         U mp_obj_dict_delete
+         U mp_obj_dict_init
+         U mp_obj_dict_len
+         U mp_obj_dict_store
+         U mp_obj_equal
+         U mp_obj_exception_match
+         U mp_obj_float_binary_op
+         U mp_obj_gen_resume
+         U mp_obj_get_array
+         U mp_obj_get_type
+         U mp_obj_get_type_str
+         U mp_obj_is_exception_instance
+         U mp_obj_is_exception_type
+         U mp_obj_is_package
+         U mp_obj_is_subclass_fast
+         U mp_obj_is_true
+         U mp_obj_list_append
+         U mp_obj_list_set_len
+         U mp_obj_new_bound_meth
+         U mp_obj_new_exception
+         U mp_obj_new_exception_arg1
+         U mp_obj_new_exception_msg
+         U mp_obj_new_exception_msg_varg
+         U mp_obj_new_float
+         U mp_obj_new_getitem_iter
+         U mp_obj_new_int
+         U mp_obj_new_int_from_ll
+         U mp_obj_new_list
+         U mp_obj_new_tuple
+         U mp_obj_str_binary_op
+         U mp_obj_str_get_data
+         U mp_obj_str_get_qstr
+         U mp_obj_str_get_str
+         U mp_obj_str_intern_checked
+         U mp_parse
+00000000 T mp_parse_compile_execute
+00000000 T mp_raise_msg
+00000000 T mp_raise_NotImplementedError
+00000000 T mp_raise_OSError
+00000000 T mp_raise_recursion_depth
+00000000 T mp_raise_TypeError
+00000000 T mp_raise_ValueError
+00000000 T mp_resume
+         U mp_small_int_floor_divide
+         U mp_small_int_modulo
+         U mp_small_int_mul_overflow
+         U mp_stack_check
+         U mp_state_ctx
+00000000 T mp_store_attr
+00000000 T mp_store_global
+00000000 T mp_store_name
+         U mp_type_AttributeError
+00000000 r mp_type_checked_fun
+         U mp_type_classmethod
+         U mp_type_complex
+         U mp_type_dict
+         U mp_type_float
+         U mp_type_fun_builtin_0
+         U mp_type_fun_builtin_1
+         U mp_type_fun_builtin_2
+         U mp_type_fun_builtin_3
+         U mp_type_fun_builtin_var
+         U mp_type_GeneratorExit
+         U mp_type_gen_instance
+         U mp_type_ImportError
+         U mp_type_KeyboardInterrupt
+         U mp_type_list
+         U mp_type_MemoryError
+         U mp_type_module
+         U mp_type_NameError
+         U mp_type_NotImplementedError
+         U mp_type_OSError
+         U mp_type_RuntimeError
+         U mp_type_staticmethod
+         U mp_type_StopIteration
+         U mp_type_tuple
+         U mp_type_type
+         U mp_type_TypeError
+         U mp_type_ValueError
+         U mp_type_ZeroDivisionError
+00000000 T mp_unary_op
+         U mp_unary_op_method_name
+00000000 T mp_unpack_ex
+00000000 T mp_unpack_sequence
+         U m_realloc
+         U nlr_jump
+         U nlr_pop
+         U nlr_push_tail
+         U qstr_compute_hash
+         U qstr_data
+         U qstr_from_strn
+         U qstr_hash
+         U qstr_init
+         U qstr_len
+         U qstr_str
+
+build/py/runtime_utils.o:
+00000002 t $LCFI0
+00000002 t $LCFI3
+         U g_InterfaceVtbl
+         U mp_call_function_1
+00000000 T mp_call_function_1_protected
+         U mp_call_function_2
+00000000 T mp_call_function_2_protected
+         U mp_obj_print_exception
+         U mp_plat_print
+         U nlr_pop
+         U nlr_push_tail
+
+build/py/scheduler.o:
+00000002 t $LCFI0
+00000008 t $LCFI2
+         U mp_call_function_1_protected
+00000000 T mp_handle_pending
+00000000 T mp_handle_pending_tail
+00000000 T mp_sched_lock
+00000000 T mp_sched_schedule
+00000000 T mp_sched_unlock
+         U mp_state_ctx
+         U nlr_jump
+
+build/py/nativeglue.o:
+
+build/py/stackctrl.o:
+00000002 t $LCFI0
+00000004 t $LCFI1
+00000002 t $LCFI2
+         U mp_raise_recursion_depth
+00000000 T mp_stack_check
+00000000 T mp_stack_ctrl_init
+00000000 T mp_stack_set_limit
+00000000 T mp_stack_set_top
+00000000 T mp_stack_usage
+         U mp_state_ctx
+
+build/py/argcheck.o:
+00000002 t $LCFI0
+00000002 t $LCFI10
+00000002 t $LCFI2
+00000002 t $LCFI4
+00000002 t $LCFI6
+         U g_InterfaceVtbl
+00000000 T mp_arg_check_num_sig
+00000000 T mp_arg_error_terse_mismatch
+00000000 T mp_arg_error_unimpl_kw
+00000000 T mp_arg_parse_all
+00000000 T mp_arg_parse_all_kw_array
+         U mp_map_init_fixed_table
+         U mp_map_lookup
+         U mp_obj_get_int
+         U mp_obj_is_true
+         U mp_obj_new_exception_msg_varg
+         U mp_raise_NotImplementedError
+         U mp_raise_TypeError
+         U mp_type_TypeError
+         U nlr_jump
+
+build/py/warning.o:
+00000002 t $LCFI0
+00000002 t $LCFI3
+00000000 T mp_emitter_warning
+         U mp_plat_print
+         U mp_print_str
+         U mp_vprintf
+00000000 T mp_warning
+
+build/py/profile.o:
+
+build/py/map.o:
+00000002 t $LCFI0
+00000002 t $LCFI13
+00000002 t $LCFI17
+00000002 t $LCFI20
+00000002 t $LCFI23
+00000002 t $LCFI27
+00000002 t $LCFI3
+00000002 t $LCFI6
+00000002 t $LCFI9
+00000000 t get_hash_alloc_greater_or_equal_to
+         U g_InterfaceVtbl
+00000000 r hash_allocation_sizes
+         U memmove
+         U memset
+         U m_free
+         U m_malloc0
+00000000 R mp_const_empty_map
+00000000 T mp_map_clear
+00000000 T mp_map_deinit
+00000000 T mp_map_init
+00000000 T mp_map_init_fixed_table
+00000000 T mp_map_lookup
+00000000 t mp_map_rehash
+         U mp_obj_equal
+00000000 T mp_set_clear
+00000000 T mp_set_init
+00000000 T mp_set_lookup
+00000000 t mp_set_rehash
+00000000 T mp_set_remove_first
+         U mp_type_str
+         U mp_unary_op
+         U m_realloc
+         U qstr_hash
+
+build/py/obj.o:
+00000002 t $LCFI0
+00000004 t $LCFI12
+00000004 t $LCFI14
+00000004 t $LCFI17
+00000004 t $LCFI20
+00000004 t $LCFI22
+00000002 t $LCFI24
+00000002 t $LCFI28
+00000002 t $LCFI3
+00000002 t $LCFI31
+00000002 t $LCFI35
+00000004 t $LCFI39
+00000002 t $LCFI41
+00000002 t $LCFI43
+00000002 t $LCFI47
+00000004 t $LCFI5
+00000002 t $LCFI50
+00000004 t $LCFI54
+00000002 t $LCFI56
+00000004 t $LCFI59
+00000002 t $LCFI63
+00000004 t $LCFI8
+         U __floatsidf
+         U g_InterfaceVtbl
+         U mp_const_false_obj
+         U mp_const_none_obj
+         U mp_const_true_obj
+00000000 T mp_generic_unary_op
+00000000 T mp_get_buffer
+00000000 T mp_get_buffer_raise
+00000000 T mp_get_index
+00000000 T mp_identity
+00000000 T mp_identity_getiter
+00000000 R mp_identity_obj
+         U mp_obj_complex_get
+00000000 T mp_obj_equal
+         U mp_obj_exception_get_traceback
+         U mp_obj_float_get
+00000000 T mp_obj_get_array
+00000000 T mp_obj_get_array_fixed_n
+00000000 T mp_obj_get_complex
+00000000 T mp_obj_get_float
+00000000 T mp_obj_get_float_maybe
+00000000 T mp_obj_get_int
+00000000 T mp_obj_get_int_maybe
+00000000 T mp_obj_get_int_truncated
+00000000 T mp_obj_get_type
+00000000 T mp_obj_get_type_str
+00000000 T mp_obj_id
+         U mp_obj_instance_call
+         U mp_obj_instance_is_callable
+         U mp_obj_int_as_float_impl
+         U mp_obj_int_get_checked
+         U mp_obj_int_get_truncated
+00000000 T mp_obj_is_callable
+         U mp_obj_is_exception_instance
+00000000 T mp_obj_is_true
+00000000 T mp_obj_len
+00000000 T mp_obj_len_maybe
+         U mp_obj_list_get
+         U mp_obj_new_exception_msg_varg
+         U mp_obj_new_int
+         U mp_obj_new_int_from_uint
+00000000 T mp_obj_print
+00000000 T mp_obj_print_exception
+00000000 T mp_obj_print_helper
+         U mp_obj_str_equal
+00000000 T mp_obj_subscr
+         U mp_obj_tuple_get
+         U mp_printf
+         U mp_print_str
+         U mp_raise_TypeError
+         U mp_stack_check
+         U mp_sys_stdout_print
+         U mp_type_bytes
+         U mp_type_complex
+         U mp_type_float
+         U mp_type_fun_builtin_1
+         U mp_type_IndexError
+         U mp_type_int
+         U mp_type_list
+         U mp_type_str
+         U mp_type_tuple
+         U mp_type_TypeError
+         U mp_type_ValueError
+         U mp_unary_op
+         U mp_warning
+         U nlr_jump
+         U qstr_str
+
+build/py/objarray.o:
+0000006e t $L98
+00000002 t $LCFI0
+00000002 t $LCFI12
+00000002 t $LCFI16
+00000002 t $LCFI20
+00000002 t $LCFI24
+00000008 t $LCFI28
+00000002 t $LCFI32
+00000002 t $LCFI36
+00000004 t $LCFI4
+00000002 t $LCFI40
+00000002 t $LCFI42
+00000002 t $LCFI46
+00000002 t $LCFI50
+00000002 t $LCFI54
+00000004 t $LCFI8
+00000000 t array_append
+00000000 r array_append_obj
+00000000 t array_binary_op
+00000000 t array_construct
+00000000 t array_extend
+00000000 r array_extend_obj
+00000000 t array_get_buffer
+00000000 t array_iterator_new
+00000000 t array_it_iternext
+00000000 r array_it_type
+00000000 r array_locals_dict
+00000000 r array_locals_dict_table
+00000000 t array_make_new
+00000000 t array_new
+00000000 t array_print
+00000000 t array_subscr
+00000000 t array_unary_op
+00000000 t bytearray_make_new
+         U bytes_decode_obj
+         U find_subbytes
+         U g_InterfaceVtbl
+         U memcpy
+         U memmove
+00000000 t memoryview_make_new
+         U memset
+         U m_malloc
+         U mp_arg_check_num_sig
+         U mp_binary_get_size
+         U mp_binary_get_val_array
+         U mp_binary_set_val_array
+         U mp_const_false_obj
+         U mp_const_none_obj
+         U mp_const_true_obj
+         U mp_get_buffer
+         U mp_get_buffer_raise
+         U mp_get_index
+         U mp_getiter
+         U mp_identity_getiter
+         U mp_iternext
+         U mp_obj_get_int
+         U mp_obj_len_maybe
+00000000 T mp_obj_new_bytearray
+00000000 T mp_obj_new_bytearray_by_ref
+00000000 T mp_obj_new_memoryview
+         U mp_obj_print_helper
+         U mp_obj_str_get_str
+         U mp_printf
+         U mp_print_str
+         U mp_raise_NotImplementedError
+         U mp_raise_ValueError
+         U mp_seq_cmp_bytes
+         U mp_seq_get_fast_slice_indexes
+         U mp_str_print_quoted
+00000000 R mp_type_array
+00000000 R mp_type_bytearray
+         U mp_type_bytes
+         U mp_type_dict
+         U mp_type_float
+         U mp_type_fun_builtin_2
+         U mp_type_int
+00000000 R mp_type_memoryview
+         U mp_type_slice
+         U mp_type_type
+         U m_realloc
+
+build/py/objattrtuple.o:
+00000004 t $LCFI0
+00000002 t $LCFI10
+00000002 t $LCFI2
+00000002 t $LCFI6
+         U m_malloc
+00000000 t mp_obj_attrtuple_attr
+00000000 t mp_obj_attrtuple_print
+00000000 T mp_obj_attrtuple_print_helper
+00000000 T mp_obj_new_attrtuple
+         U mp_obj_print_helper
+         U mp_obj_tuple_binary_op
+         U mp_obj_tuple_getiter
+         U mp_obj_tuple_subscr
+         U mp_obj_tuple_unary_op
+         U mp_printf
+         U mp_print_str
+00000000 R mp_type_attrtuple
+         U mp_type_type
+
+build/py/objbool.o:
+00000002 t $LCFI0
+00000002 t $LCFI2
+00000002 t $LCFI4
+00000002 t $LCFI8
+00000000 t bool_binary_op
+00000000 t bool_make_new
+00000000 t bool_print
+00000000 t bool_unary_op
+         U mp_arg_check_num_sig
+         U mp_binary_op
+00000000 R mp_const_false_obj
+00000000 R mp_const_true_obj
+         U mp_obj_is_true
+         U mp_print_str
+00000000 R mp_type_bool
+         U mp_type_type
+         U mp_unary_op
+
+build/py/objboundmeth.o:
+00000002 t $LCFI0
+00000002 t $LCFI10
+00000004 t $LCFI4
+00000002 t $LCFI6
+00000000 t bound_meth_attr
+00000000 t bound_meth_call
+         U memcpy
+         U m_free
+         U m_malloc
+         U m_malloc_maybe
+         U mp_call_function_n_kw
+00000000 T mp_call_method_self_n_kw
+         U mp_load_method_maybe
+00000000 T mp_obj_new_bound_meth
+00000000 r mp_type_bound_meth
+         U mp_type_type
+
+build/py/objcell.o:
+00000002 t $LCFI0
+         U m_malloc
+00000000 T mp_obj_cell_get
+00000000 T mp_obj_cell_set
+00000000 T mp_obj_new_cell
+00000000 r mp_type_cell
+         U mp_type_type
+
+build/py/objclosure.o:
+00000002 t $LCFI0
+00000002 t $LCFI4
+00000000 t closure_call
+00000000 R closure_type
+         U memcpy
+         U m_free
+         U m_malloc
+         U mp_call_function_n_kw
+00000000 T mp_obj_new_closure
+         U mp_type_type
+
+build/py/objcomplex.o:
+000000b2 t $L74
+00000004 t $LCFI0
+00000002 t $LCFI11
+00000002 t $LCFI15
+00000002 t $LCFI19
+00000002 t $LCFI23
+00000002 t $LCFI27
+00000004 t $LCFI4
+00000002 t $LCFI7
+         U __adddf3
+         U atan2
+00000000 t complex_attr
+00000000 t complex_binary_op
+00000000 t complex_make_new
+00000000 t complex_print
+00000000 t complex_unary_op
+         U cos
+         U __divdf3
+         U __eqdf2
+         U exp
+         U __fixdfsi
+         U __gedf2
+         U g_InterfaceVtbl
+         U log
+         U m_malloc
+         U mp_arg_check_num_sig
+         U mp_const_false_obj
+         U mp_const_true_obj
+         U mp_format_float
+00000000 T mp_obj_complex_binary_op
+00000000 T mp_obj_complex_get
+         U mp_obj_get_complex
+         U mp_obj_get_float
+00000000 T mp_obj_new_complex
+         U mp_obj_new_float
+         U mp_obj_str_get_data
+         U mp_parse_num_decimal
+         U mp_printf
+         U mp_print_str
+         U mp_raise_msg
+         U mp_raise_TypeError
+00000000 R mp_type_complex
+         U mp_type_str
+         U mp_type_type
+         U mp_type_ZeroDivisionError
+         U __muldf3
+         U __nedf2
+         U sin
+         U sqrt
+         U __subdf3
+
+build/py/objdeque.o:
+00000002 t $LCFI0
+00000002 t $LCFI2
+00000002 t $LCFI4
+00000000 r deque_append_obj
+00000000 r deque_locals_dict
+00000000 r deque_locals_dict_table
+00000000 t deque_make_new
+00000000 t deque_popleft
+00000000 r deque_popleft_obj
+00000000 t deque_unary_op
+         U m_malloc
+         U m_malloc0
+         U mp_arg_check_num_sig
+         U mp_const_empty_tuple_obj
+         U mp_const_false_obj
+         U mp_const_none_obj
+         U mp_const_true_obj
+00000000 t mp_obj_deque_append
+         U mp_obj_get_int
+         U mp_raise_msg
+         U mp_raise_ValueError
+00000000 R mp_type_deque
+         U mp_type_dict
+         U mp_type_fun_builtin_1
+         U mp_type_fun_builtin_2
+         U mp_type_IndexError
+         U mp_type_type
+
+build/py/objdict.o:
+00000002 t $LCFI0
+00000002 t $LCFI10
+00000002 t $LCFI13
+00000002 t $LCFI17
+00000002 t $LCFI19
+00000002 t $LCFI23
+00000002 t $LCFI27
+00000002 t $LCFI31
+00000002 t $LCFI33
+00000002 t $LCFI35
+00000002 t $LCFI37
+00000002 t $LCFI4
+00000002 t $LCFI40
+00000002 t $LCFI43
+00000002 t $LCFI46
+00000002 t $LCFI50
+00000002 t $LCFI53
+00000002 t $LCFI57
+00000002 t $LCFI59
+00000002 t $LCFI6
+00000002 t $LCFI63
+00000002 t $LCFI65
+00000002 t $LCFI68
+00000002 t $LCFI72
+00000002 t $LCFI76
+00000002 t $LCFI8
+00000000 t dict_binary_op
+00000000 t dict_clear
+00000000 r dict_clear_obj
+00000000 t dict_copy
+00000000 r dict_copy_obj
+00000000 t dict_fromkeys
+00000000 r dict_fromkeys_fun_obj
+00000000 r dict_fromkeys_obj
+00000000 t dict_get
+00000000 t dict_get_helper
+00000000 t dict_getiter
+00000000 r dict_get_obj
+00000000 t dict_items
+00000000 r dict_items_obj
+00000000 t dict_iter_next
+00000000 t dict_keys
+00000000 r dict_keys_obj
+00000000 r dict_locals_dict
+00000000 r dict_locals_dict_table
+00000000 t dict_make_new
+00000000 t dict_pop
+00000000 t dict_popitem
+00000000 r dict_popitem_obj
+00000000 r dict_pop_obj
+00000000 t dict_print
+00000000 t dict_setdefault
+00000000 r dict_setdefault_obj
+00000000 t dict_subscr
+00000000 t dict_unary_op
+00000000 t dict_update
+00000000 r dict_update_obj
+00000000 t dict_values
+00000000 r dict_values_obj
+00000000 t dict_view
+00000000 t dict_view_binary_op
+00000000 t dict_view_getiter
+00000000 t dict_view_it_iternext
+00000000 r dict_view_it_type
+00000000 t dict_view_print
+00000000 r dict_view_type
+         U memcpy
+         U m_malloc
+         U mp_arg_check_num_sig
+         U mp_const_false_obj
+         U mp_const_none_obj
+         U mp_const_true_obj
+00000000 r mp_dict_view_names
+00000000 t mp_ensure_not_fixed
+         U mp_getiter
+         U mp_identity_getiter
+         U mp_iternext
+         U mp_map_clear
+         U mp_map_init
+         U mp_map_init_fixed_table
+         U mp_map_lookup
+00000000 T mp_obj_dict_delete
+00000000 T mp_obj_dict_get
+00000000 T mp_obj_dict_init
+00000000 T mp_obj_dict_len
+00000000 T mp_obj_dict_store
+         U mp_obj_equal
+         U mp_obj_len_maybe
+00000000 T mp_obj_new_dict
+         U mp_obj_new_exception_arg1
+         U mp_obj_new_tuple
+         U mp_obj_print_helper
+         U mp_obj_str_binary_op
+         U mp_op_delitem_obj
+         U mp_op_getitem_obj
+         U mp_op_setitem_obj
+         U mp_printf
+         U mp_print_str
+         U mp_raise_msg
+         U mp_raise_TypeError
+         U mp_raise_ValueError
+         U mp_type_classmethod
+00000000 R mp_type_dict
+         U mp_type_fun_builtin_1
+         U mp_type_fun_builtin_var
+         U mp_type_KeyError
+00000000 R mp_type_ordereddict
+         U mp_type_type
+         U nlr_jump
+
+build/py/objenumerate.o:
+00000004 t $LCFI0
+00000002 t $LCFI3
+00000000 r allowed_args.5941
+00000000 t enumerate_iternext
+00000000 t enumerate_make_new
+         U g_InterfaceVtbl
+         U m_malloc
+         U mp_arg_parse_all_kw_array
+         U mp_getiter
+         U mp_identity_getiter
+         U mp_iternext
+         U mp_obj_new_tuple
+00000000 R mp_type_enumerate
+         U mp_type_type
+
+build/py/objexcept.o:
+00000002 t $LCFI0
+00000004 t $LCFI11
+00000002 t $LCFI13
+00000002 t $LCFI15
+00000002 t $LCFI19
+00000002 t $LCFI23
+00000002 t $LCFI26
+00000002 t $LCFI3
+00000002 t $LCFI30
+00000002 t $LCFI34
+00000002 t $LCFI38
+00000002 t $LCFI42
+00000006 t $LCFI46
+00000002 t $LCFI50
+00000002 t $LCFI7
+00000004 t $LCFI9
+00000000 t exc_add_strn
+         U g_InterfaceVtbl
+         U memcpy
+         U m_free
+         U m_malloc
+         U m_malloc_maybe
+00000000 T mp_alloc_emergency_exception_buf
+         U mp_arg_check_num_sig
+         U mp_const_empty_tuple_obj
+         U mp_const_none_obj
+         U mp_errno_to_str
+00000000 T mp_init_emergency_exception_buf
+00000000 T mp_obj_exception_add_traceback
+00000000 T mp_obj_exception_attr
+00000000 T mp_obj_exception_clear_traceback
+00000000 T mp_obj_exception_get_traceback
+00000000 T mp_obj_exception_get_value
+00000000 T mp_obj_exception_make_new
+00000000 T mp_obj_exception_match
+00000000 T mp_obj_exception_print
+         U mp_obj_get_int
+         U mp_obj_get_type
+00000000 T mp_obj_is_exception_instance
+00000000 T mp_obj_is_exception_type
+         U mp_obj_is_subclass_fast
+00000000 T mp_obj_new_exception
+00000000 T mp_obj_new_exception_arg1
+00000000 T mp_obj_new_exception_args
+00000000 T mp_obj_new_exception_msg
+00000000 T mp_obj_new_exception_msg_varg
+         U mp_obj_print_helper
+         U mp_obj_tuple_print
+         U mp_printf
+         U mp_print_str
+         U mp_state_ctx
+00000000 R mp_type_ArithmeticError
+00000000 R mp_type_AssertionError
+00000000 R mp_type_AttributeError
+00000000 R mp_type_BaseException
+00000000 R mp_type_EOFError
+00000000 R mp_type_Exception
+00000000 R mp_type_GeneratorExit
+00000000 R mp_type_ImportError
+00000000 R mp_type_IndentationError
+00000000 R mp_type_IndexError
+00000000 R mp_type_KeyboardInterrupt
+00000000 R mp_type_KeyError
+00000000 R mp_type_LookupError
+00000000 R mp_type_MemoryError
+00000000 R mp_type_NameError
+00000000 R mp_type_NotImplementedError
+00000000 R mp_type_OSError
+00000000 R mp_type_OverflowError
+00000000 R mp_type_RuntimeError
+00000000 R mp_type_StopAsyncIteration
+00000000 R mp_type_StopIteration
+         U mp_type_str
+00000000 R mp_type_SyntaxError
+00000000 R mp_type_SystemExit
+00000000 R mp_type_TimeoutError
+         U mp_type_tuple
+         U mp_type_type
+00000000 R mp_type_TypeError
+00000000 R mp_type_UnicodeError
+00000000 R mp_type_ValueError
+00000000 R mp_type_ZeroDivisionError
+         U mp_vprintf
+         U m_realloc_maybe
+         U qstr_compute_hash
+         U qstr_str
+         U strlen
+
+build/py/objfilter.o:
+00000002 t $LCFI0
+00000002 t $LCFI3
+00000000 t filter_iternext
+00000000 t filter_make_new
+         U m_malloc
+         U mp_arg_check_num_sig
+         U mp_call_function_n_kw
+         U mp_const_none_obj
+         U mp_getiter
+         U mp_identity_getiter
+         U mp_iternext
+         U mp_obj_is_true
+00000000 R mp_type_filter
+         U mp_type_type
+
+build/py/objfloat.o:
+000000ac t $L85
+00000004 t $LCFI0
+00000002 t $LCFI11
+00000002 t $LCFI15
+00000002 t $LCFI19
+00000002 t $LCFI23
+00000002 t $LCFI27
+00000002 t $LCFI3
+00000002 t $LCFI7
+         U __adddf3
+         U __divdf3
+         U __eqdf2
+         U __fixdfsi
+00000000 t float_binary_op
+00000000 t float_make_new
+00000000 t float_print
+00000000 t float_unary_op
+         U floor
+         U fmod
+         U __gedf2
+         U g_InterfaceVtbl
+         U __gtdf2
+         U __ledf2
+         U __ltdf2
+         U m_malloc
+         U mp_arg_check_num_sig
+         U mp_const_false_obj
+00000000 R mp_const_float_e_obj
+00000000 R mp_const_float_pi_obj
+         U mp_const_true_obj
+         U mp_format_float
+         U mp_get_buffer
+         U mp_obj_complex_binary_op
+00000000 T mp_obj_float_binary_op
+00000000 t mp_obj_float_divmod
+00000000 T mp_obj_float_get
+         U mp_obj_get_float
+         U mp_obj_get_float_maybe
+00000000 T mp_obj_new_float
+         U mp_obj_new_tuple
+         U mp_parse_num_decimal
+         U mp_print_str
+         U mp_raise_msg
+         U mp_type_complex
+00000000 R mp_type_float
+         U mp_type_type
+         U mp_type_ZeroDivisionError
+         U __muldf3
+         U __nedf2
+         U pow
+         U strchr
+         U __subdf3
+
+build/py/objfun.o:
+00000002 t $LCFI0
+00000002 t $LCFI11
+00000004 t $LCFI15
+00000002 t $LCFI19
+00000002 t $LCFI2
+00000008 t $LCFI23
+00000004 t $LCFI25
+00000004 t $LCFI29
+00000004 t $LCFI33
+00000004 t $LCFI37
+00000004 t $LCFI4
+00000002 t $LCFI7
+00000000 t fun_bc_call
+00000000 t fun_bc_print
+00000000 t fun_builtin_0_call
+00000000 t fun_builtin_1_call
+00000000 t fun_builtin_2_call
+00000000 t fun_builtin_3_call
+00000000 t fun_builtin_var_call
+         U g_InterfaceVtbl
+         U memcpy
+         U m_free
+         U m_malloc
+         U m_malloc_maybe
+         U mp_arg_check_num_sig
+         U mp_decode_uint_skip
+         U mp_decode_uint_value
+         U mp_execute_bytecode
+         U mp_generic_unary_op
+         U mp_map_init_fixed_table
+00000000 T mp_obj_code_get_name
+00000000 T mp_obj_fun_bc_attr
+00000000 T mp_obj_fun_get_name
+00000000 T mp_obj_new_fun_bc
+         U mp_printf
+         U mp_setup_code_state
+         U mp_stack_check
+         U mp_state_ctx
+00000000 R mp_type_fun_bc
+00000000 R mp_type_fun_builtin_0
+00000000 R mp_type_fun_builtin_1
+00000000 R mp_type_fun_builtin_2
+00000000 R mp_type_fun_builtin_3
+00000000 R mp_type_fun_builtin_var
+         U mp_type_tuple
+         U mp_type_type
+         U nlr_jump
+00000000 t T.30
+
+build/py/objgenerator.o:
+00000002 t $LCFI0
+00000002 t $LCFI10
+00000002 t $LCFI14
+00000002 t $LCFI17
+00000002 t $LCFI19
+00000002 t $LCFI2
+00000002 t $LCFI21
+00000002 t $LCFI23
+00000002 t $LCFI6
+00000000 t gen_instance_close
+00000000 r gen_instance_close_obj
+00000000 t gen_instance_iternext
+00000000 r gen_instance_locals_dict
+00000000 r gen_instance_locals_dict_table
+00000000 t gen_instance_pend_throw
+00000000 r gen_instance_pend_throw_obj
+00000000 t gen_instance_print
+00000000 t gen_instance_send
+00000000 r gen_instance_send_obj
+00000000 t gen_instance_throw
+00000000 r gen_instance_throw_obj
+00000000 t gen_resume_and_raise
+00000000 t gen_wrap_call
+         U m_malloc
+         U mp_const_empty_tuple_obj
+00000000 R mp_const_GeneratorExit_obj
+         U mp_const_none_obj
+         U mp_decode_uint_skip
+         U mp_decode_uint_value
+         U mp_execute_bytecode
+         U mp_generic_unary_op
+         U mp_identity_getiter
+         U mp_obj_fun_bc_attr
+         U mp_obj_fun_get_name
+00000000 T mp_obj_gen_resume
+         U mp_obj_get_type
+         U mp_obj_is_subclass_fast
+         U mp_obj_new_exception
+         U mp_obj_new_exception_args
+         U mp_obj_new_exception_msg
+         U mp_printf
+         U mp_raise_msg
+         U mp_raise_TypeError
+         U mp_raise_ValueError
+         U mp_setup_code_state
+         U mp_stack_check
+         U mp_state_ctx
+         U mp_type_dict
+         U mp_type_fun_builtin_1
+         U mp_type_fun_builtin_2
+         U mp_type_fun_builtin_var
+         U mp_type_GeneratorExit
+00000000 R mp_type_gen_instance
+00000000 R mp_type_gen_wrap
+         U mp_type_RuntimeError
+         U mp_type_StopIteration
+         U mp_type_type
+         U nlr_jump
+
+build/py/objgetitemiter.o:
+00000002 t $LCFI0
+         U g_InterfaceVtbl
+00000000 t it_iternext
+00000000 r it_type
+         U mp_call_method_n_kw
+         U mp_identity_getiter
+00000000 T mp_obj_new_getitem_iter
+         U mp_type_IndexError
+         U mp_type_StopIteration
+         U mp_type_type
+         U nlr_jump
+         U nlr_pop
+         U nlr_push_tail
+
+build/py/objint.o:
+00000002 t $LCFI0
+00000004 t $LCFI10
+00000002 t $LCFI14
+00000002 t $LCFI18
+00000002 t $LCFI22
+00000002 t $LCFI26
+00000002 t $LCFI4
+00000008 t $LCFI8
+         U __fixdfsi
+         U __fpclassify
+         U g_InterfaceVtbl
+00000000 t int_from_bytes
+00000000 r int_from_bytes_fun_obj
+00000000 r int_from_bytes_obj
+00000000 r int_locals_dict
+00000000 r int_locals_dict_table
+00000000 t int_to_bytes
+00000000 r int_to_bytes_obj
+00000000 r log_base2_floor
+         U memset
+         U m_free
+         U m_malloc
+         U mp_arg_check_num_sig
+         U mp_binary_op
+         U mp_binary_set_int
+         U mp_const_false_obj
+         U mp_const_true_obj
+         U mp_get_buffer_raise
+00000000 T mp_int_format_size
+         U mp_obj_float_get
+         U mp_obj_get_int
+         U mp_obj_int_binary_op
+00000000 T mp_obj_int_binary_op_extra_cases
+00000000 T mp_obj_int_formatted
+         U mp_obj_int_formatted_impl
+         U mp_obj_int_from_bytes_impl
+00000000 t mp_obj_int_make_new
+         U mp_obj_int_new_mpz
+00000000 T mp_obj_int_print
+         U mp_obj_int_to_bytes_impl
+         U mp_obj_int_unary_op
+         U mp_obj_new_exception_msg
+00000000 T mp_obj_new_int_from_float
+         U mp_obj_new_int_from_uint
+         U mp_obj_new_str_from_vstr
+         U mp_obj_str_binary_op
+         U mp_obj_str_get_data
+         U mp_parse_num_integer
+         U mp_print_str
+         U mp_raise_ValueError
+         U mp_type_bytes
+         U mp_type_classmethod
+         U mp_type_dict
+         U mp_type_float
+         U mp_type_fun_builtin_var
+00000000 R mp_type_int
+         U mp_type_list
+         U mp_type_OverflowError
+         U mp_type_tuple
+         U mp_type_type
+         U mp_unary_op
+         U mpz_set_from_float
+         U nlr_jump
+         U strlen
+         U vstr_init_len
+
+build/py/objint_longlong.o:
+
+build/py/objint_mpz.o:
+00000174 t $L81
+00000004 t $LCFI0
+00000004 t $LCFI10
+00000002 t $LCFI14
+00000006 t $LCFI16
+00000002 t $LCFI20
+00000004 t $LCFI24
+00000004 t $LCFI26
+00000004 t $LCFI3
+00000002 t $LCFI30
+00000008 t $LCFI34
+00000004 t $LCFI36
+00000002 t $LCFI40
+00000002 t $LCFI44
+00000002 t $LCFI48
+00000004 t $LCFI5
+00000004 t $LCFI7
+         U __divdf3
+         U g_InterfaceVtbl
+00000000 r maxsize_dig
+         U memset
+         U m_malloc
+         U mp_const_false_obj
+         U mp_const_true_obj
+         U mp_int_format_size
+00000000 R mp_maxsize_obj
+00000000 t mp_mpz_for_int
+         U mp_obj_complex_binary_op
+         U mp_obj_float_binary_op
+00000000 T mp_obj_int_as_float_impl
+00000000 T mp_obj_int_binary_op
+         U mp_obj_int_binary_op_extra_cases
+00000000 T mp_obj_int_formatted_impl
+00000000 T mp_obj_int_from_bytes_impl
+00000000 T mp_obj_int_get_checked
+00000000 T mp_obj_int_get_truncated
+00000000 T mp_obj_int_new_mpz
+00000000 T mp_obj_int_pow3
+00000000 T mp_obj_int_sign
+00000000 T mp_obj_int_to_bytes_impl
+00000000 T mp_obj_int_unary_op
+         U mp_obj_new_float
+00000000 T mp_obj_new_int
+00000000 T mp_obj_new_int_from_ll
+00000000 T mp_obj_new_int_from_str_len
+00000000 T mp_obj_new_int_from_uint
+00000000 T mp_obj_new_int_from_ull
+         U mp_obj_new_tuple
+         U mp_raise_msg
+         U mp_raise_TypeError
+         U mp_raise_ValueError
+         U mp_type_complex
+         U mp_type_float
+         U mp_type_int
+         U mp_type_OverflowError
+         U mp_type_ZeroDivisionError
+         U mpz_abs_inpl
+         U mpz_add_inpl
+         U mpz_and_inpl
+         U mpz_as_bytes
+         U mpz_as_float
+         U mpz_as_int_checked
+         U mpz_as_str_inpl
+         U mpz_cmp
+         U mpz_deinit
+         U mpz_divmod_inpl
+         U mpz_hash
+         U mpz_init_fixed_from_int
+         U mpz_init_from_int
+         U mpz_init_zero
+         U mpz_mul_inpl
+         U mpz_neg_inpl
+         U mpz_not_inpl
+         U mpz_or_inpl
+         U mpz_pow3_inpl
+         U mpz_pow_inpl
+         U mpz_set_from_bytes
+         U mpz_set_from_ll
+         U mpz_set_from_str
+         U mpz_shl_inpl
+         U mpz_shr_inpl
+         U mpz_sub_inpl
+         U mpz_xor_inpl
+
+build/py/objlist.o:
+0000000c t $LCFI0
+00000002 t $LCFI10
+00000002 t $LCFI12
+00000002 t $LCFI15
+00000002 t $LCFI19
+00000002 t $LCFI2
+00000002 t $LCFI23
+00000002 t $LCFI27
+00000004 t $LCFI31
+00000002 t $LCFI35
+00000002 t $LCFI37
+00000002 t $LCFI41
+00000002 t $LCFI44
+00000002 t $LCFI48
+00000002 t $LCFI52
+00000002 t $LCFI54
+00000002 t $LCFI58
+00000002 t $LCFI6
+00000002 t $LCFI62
+00000002 t $LCFI66
+00000002 t $LCFI70
+00000000 r allowed_args.6360
+         U g_InterfaceVtbl
+00000000 r list_append_obj
+00000000 t list_binary_op
+00000000 t list_clear
+00000000 r list_clear_obj
+00000000 t list_copy
+00000000 r list_copy_obj
+00000000 t list_count
+00000000 r list_count_obj
+00000000 t list_extend
+00000000 t list_extend_from_iter
+00000000 r list_extend_obj
+00000000 t list_getiter
+00000000 t list_index
+00000000 r list_index_obj
+00000000 t list_insert
+00000000 r list_insert_obj
+00000000 t list_it_iternext
+00000000 r list_locals_dict
+00000000 r list_locals_dict_table
+00000000 t list_make_new
+00000000 t list_new
+00000000 t list_pop
+00000000 r list_pop_obj
+00000000 t list_print
+00000000 r list_remove_obj
+00000000 t list_reverse
+00000000 r list_reverse_obj
+00000000 r list_sort_obj
+00000000 t list_subscr
+00000000 t list_unary_op
+         U memcpy
+         U memmove
+         U memset
+         U m_malloc
+         U mp_arg_check_num_sig
+         U mp_arg_parse_all
+         U mp_binary_op
+         U mp_call_function_1
+         U mp_const_false_obj
+         U mp_const_none_obj
+         U mp_const_true_obj
+         U mp_get_index
+         U mp_getiter
+         U mp_iternext
+         U mp_obj_get_array
+         U mp_obj_get_int_maybe
+00000000 T mp_obj_list_append
+00000000 T mp_obj_list_get
+00000000 T mp_obj_list_init
+00000000 T mp_obj_list_remove
+00000000 T mp_obj_list_set_len
+00000000 T mp_obj_list_sort
+00000000 T mp_obj_list_store
+00000000 T mp_obj_new_list
+         U mp_obj_print_helper
+         U mp_print_str
+00000000 t mp_quicksort
+         U mp_raise_msg
+         U mp_raise_NotImplementedError
+         U mp_seq_cmp_objs
+         U mp_seq_count_obj
+         U mp_seq_extract_slice
+         U mp_seq_get_fast_slice_indexes
+         U mp_seq_index_obj
+         U mp_seq_multiply
+         U mp_stack_check
+         U mp_type_dict
+         U mp_type_fun_builtin_1
+         U mp_type_fun_builtin_2
+         U mp_type_fun_builtin_3
+         U mp_type_fun_builtin_var
+         U mp_type_IndexError
+00000000 R mp_type_list
+         U mp_type_polymorph_iter
+         U mp_type_slice
+         U mp_type_type
+         U m_realloc
+
+build/py/objmap.o:
+00000002 t $LCFI0
+00000002 t $LCFI4
+00000000 t map_iternext
+00000000 t map_make_new
+         U m_free
+         U m_malloc
+         U mp_arg_check_num_sig
+         U mp_call_function_n_kw
+         U mp_getiter
+         U mp_identity_getiter
+         U mp_iternext
+00000000 R mp_type_map
+         U mp_type_type
+
+build/py/objmodule.o:
+00000002 t $LCFI0
+00000002 t $LCFI11
+00000002 t $LCFI15
+00000002 t $LCFI19
+00000002 t $LCFI3
+00000002 t $LCFI7
+         U cellular_module
+         U chip_module
+         U gps_module
+         U i2c_module
+         U m_malloc
+00000000 t module_attr
+00000000 t module_print
+00000000 R mp_builtin_module_map
+00000000 r mp_builtin_module_table
+00000000 R mp_builtin_module_weak_links_map
+00000000 r mp_builtin_module_weak_links_table
+         U mp_call_method_n_kw
+         U mp_load_method_maybe
+         U mp_map_lookup
+         U mp_module_array
+         U mp_module_builtins
+         U mp_module_builtins_globals
+00000000 T mp_module_call_init
+         U mp_module_cmath
+         U mp_module_collections
+         U mp_module_framebuf
+         U mp_module_gc
+00000000 T mp_module_get
+         U mp_module_io
+         U mp_module_machine
+         U mp_module___main__
+         U mp_module_math
+         U mp_module_micropython
+00000000 T mp_module_register
+         U mp_module_sys
+         U mp_module_ubinascii
+         U mp_module_uctypes
+         U mp_module_uerrno
+         U mp_module_uhashlib
+         U mp_module_uheapq
+         U mp_module_ujson
+         U mp_module_urandom
+         U mp_module_ure
+         U mp_module_uselect
+         U mp_module_ussl
+         U mp_module_ustruct
+         U mp_module_utimeq
+         U mp_module_uzlib
+         U mp_obj_dict_delete
+         U mp_obj_dict_store
+         U mp_obj_new_dict
+00000000 T mp_obj_new_module
+         U mp_obj_str_get_str
+         U mp_printf
+         U mp_state_ctx
+00000000 R mp_type_module
+         U mp_type_type
+         U st7735_module
+         U uos_module
+         U usocket_module
+         U utime_module
+
+build/py/objobject.o:
+00000004 t $LCFI0
+00000002 t $LCFI2
+         U m_malloc
+         U mp_arg_check_num_sig
+         U mp_const_none_obj
+         U mp_obj_instance_make_new
+         U mp_obj_new_instance
+         U mp_raise_TypeError
+         U mp_type_dict
+         U mp_type_fun_builtin_1
+00000000 R mp_type_object
+         U mp_type_staticmethod
+         U mp_type_type
+00000000 t object___init__
+00000000 r object___init___obj
+00000000 r object_locals_dict
+00000000 r object_locals_dict_table
+00000000 t object_make_new
+00000000 t object___new__
+00000000 r object___new___fun_obj
+00000000 r object___new___obj
+
+build/py/objpolyiter.o:
+00000002 t $LCFI0
+         U mp_identity_getiter
+00000000 R mp_type_polymorph_iter
+         U mp_type_type
+00000000 t polymorph_it_iternext
+
+build/py/objproperty.o:
+00000002 t $LCFI0
+00000002 t $LCFI12
+00000002 t $LCFI4
+00000002 t $LCFI8
+00000000 r allowed_args.5943
+         U memcpy
+         U m_malloc
+         U mp_arg_parse_all_kw_array
+         U mp_const_none_obj
+00000000 T mp_obj_property_get
+         U mp_type_dict
+         U mp_type_fun_builtin_2
+00000000 R mp_type_property
+         U mp_type_type
+00000000 t property_deleter
+00000000 r property_deleter_obj
+00000000 t property_getter
+00000000 r property_getter_obj
+00000000 r property_locals_dict
+00000000 r property_locals_dict_table
+00000000 t property_make_new
+00000000 t property_setter
+00000000 r property_setter_obj
+
+build/py/objnone.o:
+00000002 t $LCFI0
+00000000 R mp_const_none_obj
+         U mp_generic_unary_op
+         U mp_print_str
+00000000 R mp_type_NoneType
+         U mp_type_type
+00000000 t none_print
+
+build/py/objnamedtuple.o:
+00000004 t $LCFI0
+00000002 t $LCFI12
+00000002 t $LCFI16
+00000002 t $LCFI4
+00000002 t $LCFI8
+         U memcpy
+         U memset
+         U m_malloc
+00000000 R mp_namedtuple_obj
+         U mp_obj_attrtuple_print_helper
+         U mp_obj_get_array
+00000000 T mp_obj_namedtuple_find_field
+         U mp_obj_new_exception_msg_varg
+00000000 T mp_obj_new_namedtuple_base
+         U mp_obj_new_tuple
+         U mp_obj_str_get_qstr
+         U mp_obj_str_split
+         U mp_obj_tuple_binary_op
+         U mp_obj_tuple_getiter
+         U mp_obj_tuple_subscr
+         U mp_obj_tuple_unary_op
+         U mp_printf
+         U mp_raise_msg
+         U mp_type_AttributeError
+         U mp_type_fun_builtin_2
+         U mp_type_str
+         U mp_type_tuple
+         U mp_type_type
+         U mp_type_TypeError
+00000000 t namedtuple_attr
+00000000 t namedtuple_make_new
+00000000 t namedtuple_print
+00000000 t new_namedtuple_type
+         U nlr_jump
+
+build/py/objrange.o:
+00000002 t $LCFI0
+00000002 t $LCFI10
+00000002 t $LCFI14
+00000002 t $LCFI3
+00000004 t $LCFI7
+         U m_malloc
+         U mp_arg_check_num_sig
+         U mp_const_false_obj
+         U mp_const_true_obj
+         U mp_get_index
+         U mp_identity_getiter
+         U mp_obj_get_int
+         U mp_obj_new_int
+         U mp_printf
+         U mp_print_str
+         U mp_raise_ValueError
+         U mp_seq_get_fast_slice_indexes
+00000000 R mp_type_range
+         U mp_type_slice
+         U mp_type_type
+00000000 t range_attr
+00000000 t range_getiter
+00000000 t range_it_iternext
+00000000 r range_it_type
+00000000 t range_len
+00000000 t range_make_new
+00000000 t range_print
+00000000 t range_subscr
+00000000 t range_unary_op
+
+build/py/objreversed.o:
+00000002 t $LCFI0
+00000002 t $LCFI2
+         U m_malloc
+         U mp_arg_check_num_sig
+         U mp_call_method_n_kw
+         U mp_identity_getiter
+         U mp_load_method_maybe
+         U mp_obj_get_int
+         U mp_obj_len
+         U mp_obj_subscr
+00000000 R mp_type_reversed
+         U mp_type_type
+00000000 t reversed_iternext
+00000000 t reversed_make_new
+
+build/py/objset.o:
+00000002 t $LCFI0
+00000002 t $LCFI10
+00000002 t $LCFI14
+00000002 t $LCFI18
+00000002 t $LCFI2
+00000002 t $LCFI22
+00000002 t $LCFI25
+00000002 t $LCFI27
+00000002 t $LCFI31
+00000002 t $LCFI35
+00000002 t $LCFI37
+00000002 t $LCFI4
+00000004 t $LCFI40
+00000002 t $LCFI44
+00000002 t $LCFI46
+00000002 t $LCFI48
+00000002 t $LCFI50
+00000002 t $LCFI54
+00000002 t $LCFI56
+00000002 t $LCFI58
+00000002 t $LCFI6
+00000002 t $LCFI62
+00000002 t $LCFI66
+00000004 t $LCFI70
+00000002 t $LCFI72
+00000002 t $LCFI74
+00000004 t $LCFI78
+00000000 r frozenset_locals_dict
+00000000 r frozenset_locals_dict_table
+00000000 t is_set_or_frozenset
+         U memcpy
+         U m_free
+         U m_malloc
+         U mp_arg_check_num_sig
+         U mp_const_false_obj
+         U mp_const_none_obj
+         U mp_const_true_obj
+         U mp_getiter
+         U mp_iternext
+         U mp_obj_new_exception_arg1
+00000000 T mp_obj_new_set
+         U mp_obj_print_helper
+00000000 T mp_obj_set_store
+         U mp_op_contains_obj
+         U mp_print_str
+         U mp_raise_msg
+         U mp_set_clear
+         U mp_set_init
+         U mp_set_lookup
+         U mp_set_remove_first
+         U mp_type_dict
+00000000 R mp_type_frozenset
+         U mp_type_fun_builtin_1
+         U mp_type_fun_builtin_2
+         U mp_type_fun_builtin_var
+         U mp_type_KeyError
+         U mp_type_polymorph_iter
+00000000 R mp_type_set
+         U mp_type_type
+         U mp_unary_op
+         U nlr_jump
+00000000 t set_add
+00000000 r set_add_obj
+00000000 t set_binary_op
+00000000 t set_clear
+00000000 r set_clear_obj
+00000000 t set_copy
+00000000 r set_copy_obj
+00000000 t set_diff
+00000000 t set_diff_int
+00000000 r set_diff_obj
+00000000 t set_diff_update
+00000000 r set_diff_update_obj
+00000000 t set_discard
+00000000 r set_discard_obj
+00000000 t set_getiter
+00000000 t set_intersect
+00000000 t set_intersect_int
+00000000 r set_intersect_obj
+00000000 t set_intersect_update
+00000000 r set_intersect_update_obj
+00000000 t set_isdisjoint
+00000000 r set_isdisjoint_obj
+00000000 t set_issubset
+00000000 t set_issubset_internal
+00000000 r set_issubset_obj
+00000000 t set_issuperset
+00000000 r set_issuperset_obj
+00000000 t set_it_iternext
+00000000 r set_locals_dict
+00000000 r set_locals_dict_table
+00000000 t set_make_new
+00000000 t set_pop
+00000000 r set_pop_obj
+00000000 t set_print
+00000000 t set_remove
+00000000 r set_remove_obj
+00000000 t set_symmetric_difference
+00000000 r set_symmetric_difference_obj
+00000000 t set_symmetric_difference_update
+00000000 r set_symmetric_difference_update_obj
+00000000 t set_unary_op
+00000000 t set_union
+00000000 r set_union_obj
+00000000 t set_update
+00000000 t set_update_int
+00000000 r set_update_obj
+
+build/py/objsingleton.o:
+00000002 t $LCFI0
+00000000 R mp_const_ellipsis_obj
+00000000 R mp_const_notimplemented_obj
+         U mp_printf
+00000000 R mp_type_singleton
+         U mp_type_type
+00000000 t singleton_print
+
+build/py/objslice.o:
+00000004 t $LCFI0
+00000002 t $LCFI4
+00000002 t $LCFI8
+         U g_InterfaceVtbl
+         U m_malloc
+00000000 T mp_obj_new_slice
+         U mp_obj_print_helper
+00000000 T mp_obj_slice_get
+         U mp_print_str
+00000000 R mp_type_slice
+         U mp_type_type
+00000000 t slice_attr
+00000000 t slice_print
+
+build/py/objstr.o:
+000000c6 t $L224
+0000010a t $L410
+000001ec t $L692
+00000002 t $LCFI0
+00000004 t $LCFI102
+00000002 t $LCFI104
+00000002 t $LCFI106
+00000004 t $LCFI110
+00000004 t $LCFI112
+00000004 t $LCFI114
+00000002 t $LCFI116
+00000002 t $LCFI120
+00000002 t $LCFI124
+00000002 t $LCFI128
+00000004 t $LCFI13
+00000002 t $LCFI132
+00000002 t $LCFI136
+00000006 t $LCFI138
+00000002 t $LCFI142
+00000002 t $LCFI144
+00000002 t $LCFI146
+00000006 t $LCFI150
+00000002 t $LCFI154
+00000002 t $LCFI158
+00000002 t $LCFI160
+00000002 t $LCFI164
+00000002 t $LCFI168
+00000006 t $LCFI17
+00000002 t $LCFI172
+00000002 t $LCFI176
+00000006 t $LCFI21
+00000002 t $LCFI25
+00000002 t $LCFI27
+00000002 t $LCFI29
+00000002 t $LCFI3
+00000002 t $LCFI31
+00000002 t $LCFI33
+00000002 t $LCFI35
+00000006 t $LCFI37
+00000006 t $LCFI40
+00000002 t $LCFI42
+00000002 t $LCFI46
+00000008 t $LCFI50
+00000002 t $LCFI54
+00000002 t $LCFI58
+00000002 t $LCFI6
+00000004 t $LCFI62
+00000004 t $LCFI66
+00000004 t $LCFI68
+00000004 t $LCFI70
+00000002 t $LCFI72
+00000008 t $LCFI74
+00000002 t $LCFI76
+00000002 t $LCFI78
+00000006 t $LCFI80
+00000002 t $LCFI82
+00000004 t $LCFI86
+00000002 t $LCFI88
+00000002 t $LCFI9
+00000008 t $LCFI92
+00000002 t $LCFI94
+00000002 t $LCFI98
+00000000 r allowed_args.6676
+00000000 t arg_looks_integer
+00000000 t arg_looks_numeric
+00000000 t bad_implicit_conversion
+00000000 t bytes_decode
+00000000 R bytes_decode_obj
+00000000 t bytes_it_iternext
+00000000 t bytes_make_new
+00000000 t bytes_subscr
+00000000 T find_subbytes
+         U g_InterfaceVtbl
+00000000 t isalignment
+         U memcmp
+         U memcpy
+         U memmove
+         U memset
+         U m_malloc
+         U mp_arg_check_num_sig
+         U mp_arg_error_unimpl_kw
+         U mp_arg_parse_all
+00000000 R mp_const_empty_bytes_obj
+         U mp_const_false_obj
+         U mp_const_none_obj
+         U mp_const_true_obj
+         U mp_get_buffer
+         U mp_get_buffer_raise
+         U mp_get_index
+         U mp_getiter
+         U mp_iternext
+         U mp_map_lookup
+         U mp_obj_dict_get
+         U mp_obj_float_get
+         U mp_obj_get_array
+         U mp_obj_get_float
+         U mp_obj_get_int
+         U mp_obj_get_int_maybe
+         U mp_obj_get_type
+         U mp_obj_get_type_str
+         U mp_obj_len_maybe
+         U mp_obj_list_append
+00000000 T mp_obj_new_bytes
+00000000 t mp_obj_new_bytes_iterator
+         U mp_obj_new_exception_arg1
+         U mp_obj_new_exception_msg_varg
+         U mp_obj_new_int_from_float
+         U mp_obj_new_list
+00000000 T mp_obj_new_str
+00000000 T mp_obj_new_str_copy
+00000000 T mp_obj_new_str_from_vstr
+00000000 T mp_obj_new_str_of_type
+00000000 T mp_obj_new_str_via_qstr
+         U mp_obj_new_tuple
+         U mp_obj_print_helper
+00000000 T mp_obj_str_binary_op
+00000000 T mp_obj_str_equal
+00000000 T mp_obj_str_format
+00000000 t mp_obj_str_format_helper
+00000000 T mp_obj_str_get_buffer
+00000000 T mp_obj_str_get_data
+00000000 T mp_obj_str_get_qstr
+00000000 T mp_obj_str_get_str
+00000000 T mp_obj_str_intern
+00000000 T mp_obj_str_intern_checked
+00000000 T mp_obj_str_make_new
+00000000 T mp_obj_str_split
+         U mp_obj_tuple_get
+         U mp_printf
+         U mp_print_float
+         U mp_print_mp_int
+         U mp_print_str
+         U mp_print_strn
+         U mp_raise_msg
+         U mp_raise_NotImplementedError
+         U mp_raise_TypeError
+         U mp_raise_ValueError
+         U mp_seq_cmp_bytes
+         U mp_seq_get_fast_slice_indexes
+         U mp_seq_multiply
+         U mp_stack_check
+00000000 T mp_str_print_json
+00000000 T mp_str_print_quoted
+         U mp_type_bool
+00000000 R mp_type_bytes
+         U mp_type_dict
+         U mp_type_float
+         U mp_type_fun_builtin_1
+         U mp_type_fun_builtin_2
+         U mp_type_fun_builtin_var
+         U mp_type_IndexError
+         U mp_type_int
+         U mp_type_KeyError
+         U mp_type_list
+         U mp_type_polymorph_iter
+         U mp_type_slice
+         U mp_type_str
+         U mp_type_tuple
+         U mp_type_type
+         U mp_type_TypeError
+         U mp_type_UnicodeError
+         U mp_type_ValueError
+         U m_realloc
+         U __muldf3
+         U nlr_jump
+         U qstr_compute_hash
+         U qstr_data
+         U qstr_find_strn
+         U qstr_from_strn
+         U qstr_hash
+         U qstr_len
+00000000 r str8_locals_dict
+00000000 r str8_locals_dict_table
+00000000 t str_caseconv
+00000000 t str_center
+00000000 R str_center_obj
+         U strchr
+00000000 t str_count
+00000000 R str_count_obj
+00000000 t str_encode
+00000000 R str_encode_obj
+00000000 t str_endswith
+00000000 R str_endswith_obj
+00000000 t str_find
+00000000 t str_finder
+00000000 R str_find_obj
+00000000 R str_format_obj
+00000000 t str_index
+00000000 R str_index_obj
+         U str_index_to_ptr
+00000000 t str_isalpha
+00000000 R str_isalpha_obj
+00000000 t str_isdigit
+00000000 R str_isdigit_obj
+00000000 t str_islower
+00000000 R str_islower_obj
+00000000 t str_isspace
+00000000 R str_isspace_obj
+00000000 t str_isupper
+00000000 R str_isupper_obj
+00000000 t str_join
+00000000 R str_join_obj
+00000000 t str_lower
+00000000 R str_lower_obj
+00000000 t str_lstrip
+00000000 R str_lstrip_obj
+00000000 t str_partition
+00000000 t str_partitioner
+00000000 R str_partition_obj
+00000000 t str_print
+00000000 t str_replace
+00000000 R str_replace_obj
+00000000 t str_rfind
+00000000 R str_rfind_obj
+00000000 t str_rindex
+00000000 R str_rindex_obj
+00000000 t str_rpartition
+00000000 R str_rpartition_obj
+00000000 t str_rsplit
+00000000 R str_rsplit_obj
+00000000 t str_rstrip
+00000000 R str_rstrip_obj
+00000000 t str_splitlines
+00000000 R str_splitlines_obj
+00000000 R str_split_obj
+00000000 t str_startswith
+00000000 R str_startswith_obj
+00000000 t str_strip
+00000000 R str_strip_obj
+00000000 t str_to_int
+00000000 t str_uni_istype
+00000000 t str_uni_strip
+00000000 t str_upper
+00000000 R str_upper_obj
+         U unichar_isalpha
+         U unichar_isdigit
+         U unichar_islower
+         U unichar_isspace
+         U unichar_isupper
+         U unichar_tolower
+         U unichar_toupper
+         U utf8_charlen
+         U utf8_check
+         U utf8_next_char
+         U utf8_ptr_to_index
+         U vstr_add_byte
+         U vstr_clear
+         U vstr_init
+         U vstr_init_len
+         U vstr_init_print
+         U vstr_null_terminated_str
+00000000 r whitespace.7009
+
+build/py/objstrunicode.o:
+00000002 t $LCFI0
+00000002 t $LCFI11
+00000002 t $LCFI15
+00000006 t $LCFI4
+00000006 t $LCFI7
+         U g_InterfaceVtbl
+         U mp_const_false_obj
+         U mp_const_none_obj
+         U mp_const_true_obj
+         U mp_get_index
+         U mp_obj_get_int_maybe
+         U mp_obj_get_type
+         U mp_obj_get_type_str
+         U mp_obj_new_exception_msg_varg
+00000000 t mp_obj_new_str_iterator
+         U mp_obj_new_str_of_type
+         U mp_obj_new_str_via_qstr
+         U mp_obj_slice_get
+         U mp_obj_str_binary_op
+         U mp_obj_str_get_buffer
+         U mp_obj_str_make_new
+         U mp_printf
+         U mp_print_str
+         U mp_raise_msg
+         U mp_raise_NotImplementedError
+         U mp_str_print_json
+         U mp_type_bytes
+         U mp_type_dict
+         U mp_type_IndexError
+         U mp_type_polymorph_iter
+         U mp_type_slice
+00000000 R mp_type_str
+         U mp_type_type
+         U mp_type_TypeError
+         U nlr_jump
+         U qstr_data
+         U str_center_obj
+         U str_count_obj
+         U str_encode_obj
+         U str_endswith_obj
+         U str_find_obj
+         U str_format_obj
+         U str_index_obj
+00000000 T str_index_to_ptr
+         U str_isalpha_obj
+         U str_isdigit_obj
+         U str_islower_obj
+         U str_isspace_obj
+         U str_isupper_obj
+00000000 t str_it_iternext
+         U str_join_obj
+         U str_lower_obj
+         U str_lstrip_obj
+         U str_partition_obj
+         U str_replace_obj
+         U str_rfind_obj
+         U str_rindex_obj
+         U str_rpartition_obj
+         U str_rsplit_obj
+         U str_rstrip_obj
+         U str_splitlines_obj
+         U str_split_obj
+         U str_startswith_obj
+         U str_strip_obj
+00000000 t str_subscr
+00000000 r struni_locals_dict
+00000000 r struni_locals_dict_table
+         U str_upper_obj
+00000000 t uni_print
+00000000 t uni_unary_op
+         U utf8_charlen
+         U utf8_get_char
+         U utf8_next_char
+
+build/py/objstringio.o:
+00000004 t $LCFI0
+00000002 t $LCFI11
+00000002 t $LCFI15
+00000002 t $LCFI19
+00000002 t $LCFI2
+00000002 t $LCFI23
+00000002 t $LCFI4
+00000002 t $LCFI7
+00000000 r bytesio_stream_p
+00000000 t check_stringio_is_open
+         U memcpy
+         U memset
+         U m_malloc
+         U mp_get_buffer_raise
+         U mp_identity_getiter
+         U mp_identity_obj
+         U mp_obj_get_int
+         U mp_obj_new_str_of_type
+         U mp_obj_str_binary_op
+         U mp_printf
+         U mp_raise_ValueError
+         U mp_stream_close
+         U mp_stream_close_obj
+         U mp_stream_flush_obj
+         U mp_stream_readinto_obj
+         U mp_stream_read_obj
+         U mp_stream_seek_obj
+         U mp_stream_unbuffered_iter
+         U mp_stream_unbuffered_readline_obj
+         U mp_stream_write_obj
+         U mp_type_bytes
+00000000 R mp_type_bytesio
+         U mp_type_dict
+         U mp_type_fun_builtin_1
+         U mp_type_fun_builtin_var
+         U mp_type_int
+         U mp_type_str
+00000000 R mp_type_stringio
+         U mp_type_type
+00000000 t stringio___exit__
+00000000 r stringio___exit___obj
+00000000 t stringio_getvalue
+00000000 r stringio_getvalue_obj
+00000000 t stringio_ioctl
+00000000 r stringio_locals_dict
+00000000 r stringio_locals_dict_table
+00000000 t stringio_make_new
+00000000 t stringio_print
+00000000 t stringio_read
+00000000 r stringio_stream_p
+00000000 t stringio_write
+         U vstr_add_len
+         U vstr_free
+         U vstr_init_fixed_buf
+         U vstr_new
+
+build/py/objtuple.o:
+00000002 t $LCFI0
+00000002 t $LCFI11
+00000002 t $LCFI15
+00000002 t $LCFI19
+00000002 t $LCFI2
+00000002 t $LCFI23
+00000002 t $LCFI27
+00000002 t $LCFI31
+00000002 t $LCFI4
+00000004 t $LCFI8
+         U g_InterfaceVtbl
+         U memcpy
+         U m_free
+         U m_malloc
+         U mp_arg_check_num_sig
+00000000 R mp_const_empty_tuple_obj
+         U mp_const_false_obj
+         U mp_const_true_obj
+         U mp_get_index
+         U mp_getiter
+         U mp_instance_cast_to_native_base
+         U mp_iternext
+         U mp_obj_get_int_maybe
+         U mp_obj_get_type
+         U mp_obj_is_subclass_fast
+00000000 T mp_obj_new_tuple
+         U mp_obj_print_helper
+00000000 T mp_obj_tuple_binary_op
+00000000 T mp_obj_tuple_del
+00000000 T mp_obj_tuple_get
+00000000 T mp_obj_tuple_getiter
+00000000 t mp_obj_tuple_make_new
+00000000 T mp_obj_tuple_print
+00000000 T mp_obj_tuple_subscr
+00000000 T mp_obj_tuple_unary_op
+         U mp_print_str
+         U mp_raise_NotImplementedError
+         U mp_seq_cmp_objs
+         U mp_seq_count_obj
+         U mp_seq_get_fast_slice_indexes
+         U mp_seq_index_obj
+         U mp_seq_multiply
+         U mp_type_dict
+         U mp_type_fun_builtin_2
+         U mp_type_fun_builtin_var
+         U mp_type_polymorph_iter
+         U mp_type_slice
+00000000 R mp_type_tuple
+         U mp_type_type
+         U mp_unary_op
+         U m_realloc
+00000000 t tuple_count
+00000000 r tuple_count_obj
+00000000 t tuple_index
+00000000 r tuple_index_obj
+00000000 t tuple_it_iternext
+00000000 r tuple_locals_dict
+00000000 r tuple_locals_dict_table
+
+build/py/objtype.o:
+000001ce t $L258
+0000000c t $L278
+00000002 t $LCFI0
+00000002 t $LCFI102
+00000002 t $LCFI106
+00000002 t $LCFI12
+00000002 t $LCFI16
+00000004 t $LCFI19
+00000002 t $LCFI23
+00000004 t $LCFI25
+00000002 t $LCFI27
+00000002 t $LCFI31
+00000002 t $LCFI35
+00000002 t $LCFI39
+00000002 t $LCFI4
+00000002 t $LCFI43
+00000002 t $LCFI46
+00000002 t $LCFI48
+00000004 t $LCFI52
+00000004 t $LCFI56
+00000002 t $LCFI60
+00000002 t $LCFI62
+00000002 t $LCFI64
+00000002 t $LCFI66
+00000002 t $LCFI70
+00000002 t $LCFI74
+00000002 t $LCFI78
+00000002 t $LCFI8
+00000002 t $LCFI82
+00000002 t $LCFI86
+00000006 t $LCFI90
+00000002 t $LCFI94
+00000002 t $LCFI98
+00000000 t check_for_special_accessors
+         U g_InterfaceVtbl
+00000000 t instance_binary_op
+00000000 t instance_count_native_bases
+00000000 t instance_get_buffer
+00000000 t instance_getiter
+00000000 t instance_print
+00000000 t instance_subscr
+00000000 t instance_unary_op
+         U memcpy
+         U m_free
+         U m_malloc
+         U m_malloc0
+         U mp_arg_check_num_sig
+         U mp_binary_op
+00000000 R mp_binary_op_method_name
+00000000 t mp_builtin_isinstance
+00000000 R mp_builtin_isinstance_obj
+00000000 t mp_builtin_issubclass
+00000000 R mp_builtin_issubclass_obj
+         U mp_call_function_1
+         U mp_call_function_n_kw
+         U mp_call_method_n_kw
+         U mp_call_method_self_n_kw
+         U mp_const_false_obj
+         U mp_const_none_obj
+         U mp_const_notimplemented_obj
+         U mp_const_true_obj
+         U mp_convert_member_lookup
+         U mp_generic_unary_op
+00000000 T mp_instance_cast_to_native_base
+         U mp_load_method
+         U mp_load_method_maybe
+         U mp_load_method_protected
+00000000 T mp_load_super_method
+         U mp_map_init
+         U mp_map_lookup
+00000000 t mp_obj_class_lookup
+         U mp_obj_dict_store
+         U mp_obj_exception_make_new
+         U mp_obj_get_int_truncated
+         U mp_obj_get_type
+         U mp_obj_get_type_str
+00000000 t mp_obj_instance_attr
+00000000 T mp_obj_instance_call
+00000000 t mp_obj_instance_get_call
+00000000 T mp_obj_instance_is_callable
+00000000 T mp_obj_instance_make_new
+00000000 t mp_obj_is_subclass
+00000000 T mp_obj_is_subclass_fast
+         U mp_obj_new_dict
+         U mp_obj_new_exception_msg_varg
+00000000 T mp_obj_new_instance
+00000000 T mp_obj_new_type
+         U mp_obj_print_helper
+         U mp_obj_property_get
+         U mp_obj_str_get_qstr
+         U mp_obj_subscr
+         U mp_obj_tuple_get
+         U mp_printf
+         U mp_print_str
+         U mp_raise_msg
+         U mp_raise_TypeError
+         U mp_type_AttributeError
+00000000 R mp_type_classmethod
+         U mp_type_dict
+         U mp_type_fun_builtin_2
+         U mp_type_fun_builtin_var
+         U mp_type_int
+         U mp_type_object
+         U mp_type_property
+00000000 R mp_type_staticmethod
+00000000 R mp_type_super
+         U mp_type_tuple
+00000000 R mp_type_type
+         U mp_type_TypeError
+         U mp_unary_op
+00000000 R mp_unary_op_method_name
+00000000 t native_base_init_wrapper
+00000000 r native_base_init_wrapper_obj
+         U nlr_jump
+         U qstr_str
+00000000 t static_class_method_make_new
+00000000 t super_attr
+00000000 t super_make_new
+00000000 t super_print
+00000000 r to_check.6592
+00000000 t type_attr
+00000000 t type_call
+00000000 t type_make_new
+00000000 t type_print
+
+build/py/objzip.o:
+00000002 t $LCFI0
+00000002 t $LCFI4
+         U m_malloc
+         U mp_arg_check_num_sig
+         U mp_getiter
+         U mp_identity_getiter
+         U mp_iternext
+         U mp_obj_new_tuple
+         U mp_obj_tuple_del
+         U mp_type_type
+00000000 R mp_type_zip
+00000000 t zip_iternext
+00000000 t zip_make_new
+
+build/py/opmethods.o:
+00000002 t $LCFI0
+00000002 t $LCFI10
+00000002 t $LCFI4
+00000002 t $LCFI7
+         U mp_obj_get_type
+00000000 R mp_op_contains_obj
+00000000 R mp_op_delitem_obj
+00000000 R mp_op_getitem_obj
+00000000 R mp_op_setitem_obj
+         U mp_type_fun_builtin_2
+         U mp_type_fun_builtin_3
+00000000 t op_contains
+00000000 t op_delitem
+00000000 t op_getitem
+00000000 t op_setitem
+
+build/py/sequence.o:
+00000002 t $LCFI0
+00000004 t $LCFI12
+00000002 t $LCFI16
+00000002 t $LCFI20
+00000004 t $LCFI24
+00000002 t $LCFI4
+00000002 t $LCFI8
+         U memcmp
+         U memcpy
+         U mp_binary_op
+         U mp_const_none_obj
+         U mp_const_true_obj
+         U mp_get_index
+         U mp_obj_equal
+         U mp_obj_get_int
+         U mp_obj_get_type
+         U mp_obj_list_append
+         U mp_obj_new_list
+         U mp_obj_slice_get
+         U mp_raise_ValueError
+00000000 T mp_seq_cmp_bytes
+00000000 T mp_seq_cmp_objs
+00000000 T mp_seq_count_obj
+00000000 T mp_seq_extract_slice
+00000000 T mp_seq_get_fast_slice_indexes
+00000000 T mp_seq_index_obj
+00000000 T mp_seq_multiply
+
+build/py/stream.o:
+00000074 t $L68
+00000002 t $LCFI0
+00000002 t $LCFI10
+00000002 t $LCFI12
+00000002 t $LCFI14
+00000002 t $LCFI16
+00000002 t $LCFI18
+00000002 t $LCFI20
+00000002 t $LCFI24
+00000002 t $LCFI28
+00000002 t $LCFI30
+00000002 t $LCFI34
+00000002 t $LCFI38
+00000002 t $LCFI4
+00000002 t $LCFI41
+00000002 t $LCFI45
+00000002 t $LCFI48
+00000002 t $LCFI52
+00000002 t $LCFI56
+00000002 t $LCFI58
+00000002 t $LCFI6
+00000002 t $LCFI60
+00000002 t $LCFI8
+         U mp_const_none_obj
+         U mp_get_buffer
+         U mp_get_buffer_raise
+00000000 T mp_get_stream_raise
+         U mp_obj_get_int
+         U mp_obj_get_int_truncated
+         U mp_obj_get_type
+         U mp_obj_is_true
+         U mp_obj_list_append
+         U mp_obj_new_int
+         U mp_obj_new_int_from_uint
+         U mp_obj_new_list
+         U mp_obj_new_str_from_vstr
+         U mp_raise_msg
+         U mp_raise_OSError
+00000000 T mp_stream_close
+00000000 R mp_stream_close_obj
+00000004 C mp_stream_errno
+00000000 R mp_stream_flush_obj
+00000000 R mp_stream_ioctl_obj
+00000000 T mp_stream_posix_fsync
+00000000 T mp_stream_posix_lseek
+00000000 T mp_stream_posix_read
+00000000 T mp_stream_posix_write
+00000000 R mp_stream_read1_obj
+00000000 R mp_stream_readinto_obj
+00000000 R mp_stream_read_obj
+00000000 T mp_stream_rw
+00000000 R mp_stream_seek_obj
+00000000 R mp_stream_tell_obj
+00000000 T mp_stream_unbuffered_iter
+00000000 R mp_stream_unbuffered_readline_obj
+00000000 R mp_stream_unbuffered_readlines_obj
+00000000 T mp_stream_write
+00000000 R mp_stream_write1_obj
+00000000 T mp_stream_write_adaptor
+00000000 R mp_stream_write_obj
+         U mp_type_bytes
+         U mp_type_fun_builtin_1
+         U mp_type_fun_builtin_2
+         U mp_type_fun_builtin_var
+         U mp_type_OSError
+         U mp_type_str
+00000000 t stream_flush
+00000000 t stream_ioctl
+00000000 t stream_read
+00000000 t stream_read1
+00000000 t stream_read_generic
+00000000 t stream_readinto
+00000000 t stream_seek
+00000000 t stream_tell
+00000000 t stream_unbuffered_readline
+00000000 t stream_unbuffered_readlines
+00000000 t stream_write1_method
+00000000 t stream_write_method
+         U vstr_add_len
+         U vstr_clear
+         U vstr_cut_tail_bytes
+         U vstr_extend
+         U vstr_init
+         U vstr_init_len
+
+build/py/binary.o:
+00000004 t $LCFI0
+0000000a t $LCFI10
+00000002 t $LCFI12
+00000002 t $LCFI16
+00000002 t $LCFI20
+0000000a t $LCFI3
+00000002 t $LCFI6
+0000000a t $LCFI8
+00000000 r CSWTCH.66
+00000000 r CSWTCH.67
+00000000 r CSWTCH.70
+00000000 r CSWTCH.71
+         U __extendsfdf2
+         U __floatsidf
+         U __floatsisf
+         U memcpy
+         U memset
+00000000 T mp_binary_get_int
+00000000 T mp_binary_get_size
+00000000 T mp_binary_get_val
+00000000 T mp_binary_get_val_array
+00000000 T mp_binary_set_int
+00000000 T mp_binary_set_val
+00000000 T mp_binary_set_val_array
+00000000 T mp_binary_set_val_array_from_int
+         U mp_obj_get_float
+         U mp_obj_get_int
+         U mp_obj_int_to_bytes_impl
+         U mp_obj_new_float
+         U mp_obj_new_int
+         U mp_obj_new_int_from_ll
+         U mp_obj_new_int_from_uint
+         U mp_obj_new_int_from_ull
+         U mp_obj_new_str
+         U mp_raise_ValueError
+         U mp_type_int
+         U strlen
+         U __truncdfsf2
+
+build/py/builtinimport.o:
+00000002 t $LCFI0
+00000002 t $LCFI13
+00000002 t $LCFI17
+00000002 t $LCFI21
+00000002 t $LCFI3
+00000002 t $LCFI6
+00000002 t $LCFI9
+00000000 t chop_component
+00000000 t do_execute_raw_code
+00000000 t do_load
+         U g_InterfaceVtbl
+         U memcpy
+         U m_malloc
+00000000 T mp_builtin___import__
+00000000 R mp_builtin___import___obj
+         U mp_builtin_module_weak_links_map
+         U mp_call_function_0
+         U mp_const_false_obj
+         U mp_const_none_obj
+         U mp_find_frozen_module
+         U mp_frozen_stat
+00000000 t mp_import_stat_any
+         U mp_lexer_new_from_file
+         U mp_load_method_maybe
+         U mp_make_function_from_raw_code
+         U mp_map_lookup
+         U mp_module_call_init
+         U mp_module_get
+         U mp_obj_dict_get
+         U mp_obj_dict_store
+00000000 T mp_obj_is_package
+         U mp_obj_list_get
+         U mp_obj_new_exception_msg_varg
+         U mp_obj_new_module
+         U mp_obj_new_str
+         U mp_obj_str_get_data
+         U mp_obj_str_get_qstr
+         U mp_parse_compile_execute
+         U mp_raise_ValueError
+         U mp_raw_code_load_file
+         U mp_state_ctx
+         U mp_store_attr
+         U mp_type_fun_builtin_var
+         U mp_type_ImportError
+         U mp_vfs_import_stat
+         U nlr_jump
+         U nlr_pop
+         U nlr_push_tail
+         U qstr_from_str
+         U qstr_from_strn
+         U qstr_str
+00000000 t stat_dir_or_file
+00000000 t stat_file_py_or_mpy
+         U strchr
+         U vstr_add_char
+         U vstr_add_str
+         U vstr_add_strn
+         U vstr_init_fixed_buf
+         U vstr_ins_byte
+         U vstr_null_terminated_str
+
+build/py/builtinevex.o:
+00000002 t $LCFI0
+00000002 t $LCFI10
+00000002 t $LCFI4
+00000002 t $LCFI6
+00000002 t $LCFI8
+00000000 t eval_exec_helper
+         U g_InterfaceVtbl
+         U m_malloc
+00000000 t mp_builtin_compile
+00000000 R mp_builtin_compile_obj
+00000000 t mp_builtin_eval
+00000000 R mp_builtin_eval_obj
+00000000 t mp_builtin_exec
+00000000 t mp_builtin_execfile
+00000000 R mp_builtin_execfile_obj
+00000000 R mp_builtin_exec_obj
+         U mp_call_function_0
+         U mp_const_none_obj
+         U mp_lexer_new_from_file
+         U mp_lexer_new_from_str_len
+         U mp_obj_str_get_data
+         U mp_obj_str_get_qstr
+         U mp_parse_compile_execute
+         U mp_raise_TypeError
+         U mp_raise_ValueError
+         U mp_state_ctx
+00000000 r mp_type_code
+         U mp_type_dict
+         U mp_type_fun_bc
+         U mp_type_fun_builtin_var
+         U mp_type_type
+         U nlr_jump
+         U nlr_pop
+         U nlr_push_tail
+
+build/py/builtinhelp.o:
+00000002 t $LCFI0
+00000002 t $LCFI4
+         U gprs_a9_help_text
+00000000 t mp_builtin_help
+00000000 R mp_builtin_help_obj
+         U mp_builtin_module_map
+         U mp_builtin_module_weak_links_map
+         U mp_const_empty_map
+         U mp_const_none_obj
+         U mp_frozen_mpy_names
+00000000 t mp_help_add_from_map
+00000000 R mp_help_default_text
+         U mp_obj_get_type
+         U mp_obj_list_append
+         U mp_obj_list_get
+         U mp_obj_list_sort
+         U mp_obj_new_list
+         U mp_obj_new_str
+         U mp_obj_print
+         U mp_obj_str_get_str
+         U mp_printf
+         U mp_print_str
+         U mp_sys_stdout_print
+         U mp_type_fun_builtin_var
+         U mp_type_module
+         U mp_type_type
+         U strlen
+
+build/py/modarray.o:
+00000000 R mp_module_array
+00000000 r mp_module_array_globals
+00000000 r mp_module_array_globals_table
+         U mp_type_array
+         U mp_type_dict
+         U mp_type_module
+
+build/py/modbuiltins.o:
+00000002 t $LCFI0
+00000002 t $LCFI12
+00000002 t $LCFI15
+00000002 t $LCFI17
+00000002 t $LCFI19
+00000004 t $LCFI21
+00000002 t $LCFI23
+00000002 t $LCFI27
+00000002 t $LCFI3
+00000002 t $LCFI30
+00000002 t $LCFI33
+00000002 t $LCFI37
+00000004 t $LCFI41
+00000002 t $LCFI44
+00000002 t $LCFI48
+00000002 t $LCFI50
+00000002 t $LCFI54
+00000002 t $LCFI56
+00000002 t $LCFI6
+00000002 t $LCFI60
+00000002 t $LCFI62
+00000002 t $LCFI64
+00000002 t $LCFI67
+00000002 t $LCFI69
+00000002 t $LCFI71
+00000002 t $LCFI75
+00000002 t $LCFI77
+00000002 t $LCFI79
+00000002 t $LCFI8
+00000002 t $LCFI81
+00000000 r allowed_args.6938
+         U __divdf3
+         U __floatsidf
+         U g_InterfaceVtbl
+         U mp_arg_parse_all
+         U mp_binary_op
+00000000 t mp_builtin_abs
+00000000 R mp_builtin_abs_obj
+00000000 t mp_builtin_all
+00000000 R mp_builtin_all_obj
+00000000 t mp_builtin_any
+00000000 R mp_builtin_any_obj
+00000000 t mp_builtin_bin
+00000000 R mp_builtin_bin_obj
+00000000 t mp_builtin___build_class__
+00000000 R mp_builtin___build_class___obj
+00000000 t mp_builtin_callable
+00000000 R mp_builtin_callable_obj
+00000000 t mp_builtin_chr
+00000000 R mp_builtin_chr_obj
+         U mp_builtin_compile_obj
+00000000 t mp_builtin_delattr
+00000000 R mp_builtin_delattr_obj
+00000000 t mp_builtin_dir
+00000000 R mp_builtin_dir_obj
+00000000 t mp_builtin_divmod
+00000000 R mp_builtin_divmod_obj
+         U mp_builtin_eval_obj
+         U mp_builtin_execfile_obj
+         U mp_builtin_exec_obj
+00000000 t mp_builtin_getattr
+00000000 R mp_builtin_getattr_obj
+00000000 t mp_builtin_globals
+00000000 R mp_builtin_globals_obj
+00000000 t mp_builtin_hasattr
+00000000 R mp_builtin_hasattr_obj
+00000000 t mp_builtin_hash
+00000000 R mp_builtin_hash_obj
+         U mp_builtin_help_obj
+00000000 t mp_builtin_hex
+00000000 R mp_builtin_hex_obj
+00000000 R mp_builtin_id_obj
+         U mp_builtin___import___obj
+00000000 t mp_builtin_input
+00000000 R mp_builtin_input_obj
+         U mp_builtin_isinstance_obj
+         U mp_builtin_issubclass_obj
+00000000 t mp_builtin_iter
+00000000 R mp_builtin_iter_obj
+00000000 R mp_builtin_len_obj
+00000000 t mp_builtin_locals
+00000000 R mp_builtin_locals_obj
+00000000 t mp_builtin_max
+00000000 R mp_builtin_max_obj
+00000000 t mp_builtin_min
+00000000 t mp_builtin_min_max
+00000000 R mp_builtin_min_obj
+00000000 t mp_builtin_next
+00000000 R mp_builtin_next_obj
+00000000 t mp_builtin_oct
+00000000 R mp_builtin_oct_obj
+00000000 t mp_builtin_ord
+00000000 R mp_builtin_ord_obj
+00000000 t mp_builtin_pow
+00000000 R mp_builtin_pow_obj
+00000000 t mp_builtin_print
+00000000 R mp_builtin_print_obj
+00000000 t mp_builtin___repl_print__
+00000000 R mp_builtin___repl_print___obj
+00000000 t mp_builtin_repr
+00000000 R mp_builtin_repr_obj
+00000000 t mp_builtin_round
+00000000 R mp_builtin_round_obj
+00000000 t mp_builtin_setattr
+00000000 R mp_builtin_setattr_obj
+00000000 t mp_builtin_sorted
+00000000 R mp_builtin_sorted_obj
+00000000 t mp_builtin_sum
+00000000 R mp_builtin_sum_obj
+         U mp_call_function_0
+         U mp_call_function_1
+         U mp_call_function_n_kw
+         U mp_call_method_n_kw
+         U mp_const_ellipsis_obj
+         U mp_const_false_obj
+         U mp_const_none_obj
+         U mp_const_notimplemented_obj
+         U mp_const_true_obj
+         U mp_getiter
+         U mp_get_stream_raise
+         U mp_iternext
+         U mp_iternext_allow_raise
+         U mp_load_method
+         U mp_load_method_maybe
+         U mp_load_method_protected
+         U mp_map_lookup
+00000000 R mp_module_builtins
+00000000 R mp_module_builtins_globals
+00000000 r mp_module_builtins_globals_table
+         U mp_obj_cell_set
+         U mp_obj_get_float
+         U mp_obj_get_int
+         U mp_obj_get_type
+         U mp_obj_id
+         U mp_obj_int_pow3
+         U mp_obj_is_callable
+         U mp_obj_is_true
+         U mp_obj_len
+         U mp_obj_list_append
+         U mp_obj_list_sort
+         U mp_obj_new_bound_meth
+         U mp_obj_new_dict
+         U mp_obj_new_exception
+         U mp_obj_new_exception_msg_varg
+         U mp_obj_new_float
+         U mp_obj_new_int
+         U mp_obj_new_int_from_float
+         U mp_obj_new_list
+         U mp_obj_new_str_from_vstr
+         U mp_obj_new_str_via_qstr
+         U mp_obj_new_tuple
+         U mp_obj_print
+         U mp_obj_print_helper
+         U mp_obj_str_format
+         U mp_obj_str_get_data
+         U mp_obj_str_get_qstr
+         U mp_print_str
+         U mp_raise_TypeError
+         U mp_raise_ValueError
+         U mp_state_ctx
+         U mp_store_attr
+         U mp_stream_write_adaptor
+         U mp_sys_stdout_obj
+         U mp_sys_stdout_print
+         U mp_type_ArithmeticError
+         U mp_type_AssertionError
+         U mp_type_AttributeError
+         U mp_type_BaseException
+         U mp_type_bool
+         U mp_type_bytearray
+         U mp_type_bytes
+         U mp_type_classmethod
+         U mp_type_complex
+         U mp_type_dict
+         U mp_type_enumerate
+         U mp_type_EOFError
+         U mp_type_Exception
+         U mp_type_filter
+         U mp_type_float
+         U mp_type_frozenset
+         U mp_type_fun_builtin_0
+         U mp_type_fun_builtin_1
+         U mp_type_fun_builtin_2
+         U mp_type_fun_builtin_3
+         U mp_type_fun_builtin_var
+         U mp_type_GeneratorExit
+         U mp_type_ImportError
+         U mp_type_IndentationError
+         U mp_type_IndexError
+         U mp_type_int
+         U mp_type_KeyboardInterrupt
+         U mp_type_KeyError
+         U mp_type_list
+         U mp_type_LookupError
+         U mp_type_map
+         U mp_type_MemoryError
+         U mp_type_memoryview
+         U mp_type_module
+         U mp_type_NameError
+         U mp_type_NotImplementedError
+         U mp_type_object
+         U mp_type_OSError
+         U mp_type_OverflowError
+         U mp_type_property
+         U mp_type_range
+         U mp_type_reversed
+         U mp_type_RuntimeError
+         U mp_type_set
+         U mp_type_slice
+         U mp_type_staticmethod
+         U mp_type_StopAsyncIteration
+         U mp_type_StopIteration
+         U mp_type_str
+         U mp_type_super
+         U mp_type_SyntaxError
+         U mp_type_SystemExit
+         U mp_type_tuple
+         U mp_type_type
+         U mp_type_TypeError
+         U mp_type_UnicodeError
+         U mp_type_ValueError
+         U mp_type_ZeroDivisionError
+         U mp_type_zip
+         U mp_unary_op
+         U mp_vfs_open_obj
+         U __muldf3
+         U nearbyint
+         U nlr_jump
+         U pow
+         U readline
+         U utf8_charlen
+         U utf8_get_char
+         U vstr_init
+         U vstr_init_print
+
+build/py/modcollections.o:
+00000000 R mp_module_collections
+00000000 r mp_module_collections_globals
+00000000 r mp_module_collections_globals_table
+         U mp_namedtuple_obj
+         U mp_type_deque
+         U mp_type_dict
+         U mp_type_module
+         U mp_type_ordereddict
+
+build/py/modgc.o:
+00000002 t $LCFI0
+00000002 t $LCFI2
+00000002 t $LCFI4
+00000002 t $LCFI6
+         U gc_collect
+00000000 R gc_collect_obj
+00000000 t gc_disable
+00000000 R gc_disable_obj
+00000000 t gc_enable
+00000000 R gc_enable_obj
+         U gc_info
+00000000 t gc_isenabled
+00000000 R gc_isenabled_obj
+00000000 t gc_mem_alloc
+00000000 R gc_mem_alloc_obj
+00000000 t gc_mem_free
+00000000 R gc_mem_free_obj
+00000000 t gc_threshold
+00000000 R gc_threshold_obj
+         U mp_const_false_obj
+         U mp_const_none_obj
+         U mp_const_true_obj
+00000000 R mp_module_gc
+00000000 r mp_module_gc_globals
+00000000 r mp_module_gc_globals_table
+         U mp_obj_get_int
+         U mp_obj_new_int
+         U mp_state_ctx
+         U mp_type_dict
+         U mp_type_fun_builtin_0
+         U mp_type_fun_builtin_var
+         U mp_type_module
+00000000 t py_gc_collect
+
+build/py/modio.o:
+00000002 t $LCFI0
+00000002 t $LCFI11
+00000002 t $LCFI15
+00000002 t $LCFI17
+00000002 t $LCFI19
+00000004 t $LCFI3
+00000002 t $LCFI7
+00000000 t bufwriter_flush
+00000000 r bufwriter_flush_obj
+00000000 r bufwriter_locals_dict
+00000000 r bufwriter_locals_dict_table
+00000000 t bufwriter_make_new
+00000000 r bufwriter_stream_p
+00000000 r bufwriter_type
+00000000 t bufwriter_write
+         U g_InterfaceVtbl
+00000000 t iobase_ioctl
+00000000 t iobase_make_new
+00000000 r iobase_p
+00000000 t iobase_read
+00000000 t iobase_read_write
+00000000 r iobase_singleton
+00000000 t iobase_write
+         U memcpy
+         U m_malloc
+         U mp_arg_check_num_sig
+         U mp_call_method_n_kw
+         U mp_const_none_obj
+         U mp_load_method
+00000000 R mp_module_io
+00000000 r mp_module_io_globals
+00000000 r mp_module_io_globals_table
+         U mp_obj_get_int
+         U mp_obj_new_int_from_uint
+         U mp_raise_OSError
+         U mp_stream_rw
+         U mp_stream_write_obj
+         U mp_type_bytearray
+         U mp_type_bytesio
+         U mp_type_dict
+         U mp_type_fun_builtin_1
+00000000 r mp_type_iobase
+         U mp_type_module
+         U mp_type_stringio
+         U mp_type_type
+         U mp_type_vfs_fat_fileio
+         U mp_type_vfs_fat_textio
+         U mp_vfs_open_obj
+
+build/py/modmath.o:
+00000002 t $LCFI0
+00000002 t $LCFI11
+00000002 t $LCFI13
+00000002 t $LCFI17
+00000002 t $LCFI19
+00000002 t $LCFI21
+00000002 t $LCFI23
+00000002 t $LCFI25
+00000002 t $LCFI27
+00000002 t $LCFI29
+00000002 t $LCFI3
+00000002 t $LCFI31
+00000002 t $LCFI33
+00000002 t $LCFI35
+00000002 t $LCFI37
+00000002 t $LCFI39
+00000002 t $LCFI41
+00000002 t $LCFI43
+00000002 t $LCFI45
+00000002 t $LCFI47
+00000002 t $LCFI49
+00000002 t $LCFI5
+00000002 t $LCFI51
+00000002 t $LCFI53
+00000002 t $LCFI55
+00000002 t $LCFI57
+00000002 t $LCFI59
+00000002 t $LCFI61
+00000002 t $LCFI65
+00000002 t $LCFI67
+00000002 t $LCFI69
+00000002 t $LCFI7
+00000002 t $LCFI71
+00000002 t $LCFI73
+00000006 t $LCFI75
+00000002 t $LCFI77
+00000002 t $LCFI80
+00000002 t $LCFI82
+00000002 t $LCFI84
+00000002 t $LCFI86
+00000002 t $LCFI9
+         U acos
+         U acosh
+         U asin
+         U asinh
+         U atan
+         U atan2
+         U atanh
+         U ceil
+00000000 t copysign_func
+         U cos
+         U cosh
+         U __divdf3
+         U __eqdf2
+         U erf
+         U erfc
+         U exp
+         U expm1
+00000000 t fabs_func
+         U floor
+         U fmod
+         U frexp
+         U ldexp
+         U __ledf2
+         U lgamma
+         U log
+         U log10
+         U log2
+00000000 t math_error
+00000000 t math_generic_1
+00000000 t math_generic_2
+         U modf
+         U mp_const_false_obj
+         U mp_const_float_e_obj
+         U mp_const_float_pi_obj
+         U mp_const_true_obj
+00000000 t mp_math_acos
+00000000 t mp_math_acosh
+00000000 r mp_math_acosh_obj
+00000000 r mp_math_acos_obj
+00000000 t mp_math_asin
+00000000 t mp_math_asinh
+00000000 r mp_math_asinh_obj
+00000000 r mp_math_asin_obj
+00000000 t mp_math_atan
+00000000 t mp_math_atan2
+00000000 r mp_math_atan2_obj
+00000000 t mp_math_atanh
+00000000 r mp_math_atanh_obj
+00000000 r mp_math_atan_obj
+00000000 t mp_math_ceil
+00000000 r mp_math_ceil_obj
+00000000 t mp_math_copysign
+00000000 r mp_math_copysign_obj
+00000000 t mp_math_cos
+00000000 t mp_math_cosh
+00000000 r mp_math_cosh_obj
+00000000 r mp_math_cos_obj
+00000000 t mp_math_degrees
+00000000 r mp_math_degrees_obj
+00000000 t mp_math_erf
+00000000 t mp_math_erfc
+00000000 r mp_math_erfc_obj
+00000000 r mp_math_erf_obj
+00000000 t mp_math_exp
+00000000 t mp_math_expm1
+00000000 r mp_math_expm1_obj
+00000000 r mp_math_exp_obj
+00000000 t mp_math_fabs
+00000000 r mp_math_fabs_obj
+00000000 t mp_math_floor
+00000000 r mp_math_floor_obj
+00000000 t mp_math_fmod
+00000000 r mp_math_fmod_obj
+00000000 t mp_math_frexp
+00000000 r mp_math_frexp_obj
+00000000 t mp_math_gamma
+00000000 r mp_math_gamma_obj
+00000000 t mp_math_isfinite
+00000000 r mp_math_isfinite_obj
+00000000 t mp_math_isinf
+00000000 r mp_math_isinf_obj
+00000000 t mp_math_isnan
+00000000 r mp_math_isnan_obj
+00000000 t mp_math_ldexp
+00000000 r mp_math_ldexp_obj
+00000000 t mp_math_lgamma
+00000000 r mp_math_lgamma_obj
+00000000 t mp_math_log
+00000000 t mp_math_log10
+00000000 r mp_math_log10_obj
+00000000 t mp_math_log2
+00000000 r mp_math_log2_obj
+00000000 r mp_math_log_obj
+00000000 t mp_math_modf
+00000000 r mp_math_modf_obj
+00000000 t mp_math_pow
+00000000 r mp_math_pow_obj
+00000000 t mp_math_radians
+00000000 r mp_math_radians_obj
+00000000 t mp_math_sin
+00000000 t mp_math_sinh
+00000000 r mp_math_sinh_obj
+00000000 r mp_math_sin_obj
+00000000 t mp_math_sqrt
+00000000 r mp_math_sqrt_obj
+00000000 t mp_math_tan
+00000000 t mp_math_tanh
+00000000 r mp_math_tanh_obj
+00000000 r mp_math_tan_obj
+00000000 t mp_math_trunc
+00000000 r mp_math_trunc_obj
+00000000 R mp_module_math
+00000000 r mp_module_math_globals
+00000000 r mp_module_math_globals_table
+         U mp_obj_get_float
+         U mp_obj_get_int
+         U mp_obj_new_float
+         U mp_obj_new_int
+         U mp_obj_new_int_from_float
+         U mp_obj_new_tuple
+         U mp_raise_msg
+         U mp_raise_ValueError
+         U mp_type_dict
+         U mp_type_fun_builtin_1
+         U mp_type_fun_builtin_2
+         U mp_type_fun_builtin_var
+         U mp_type_module
+         U mp_type_ZeroDivisionError
+         U __muldf3
+         U __nedf2
+         U pow
+         U sin
+         U sinh
+         U sqrt
+         U tan
+         U tanh
+         U tgamma
+         U trunc
+
+build/py/modcmath.o:
+00000002 t $LCFI0
+00000002 t $LCFI12
+00000002 t $LCFI16
+00000002 t $LCFI20
+00000002 t $LCFI24
+00000002 t $LCFI28
+00000002 t $LCFI30
+00000002 t $LCFI4
+00000002 t $LCFI8
+         U __adddf3
+         U atan2
+         U cos
+         U cosh
+         U exp
+         U log
+         U log10
+00000000 t mp_cmath_cos
+00000000 r mp_cmath_cos_obj
+00000000 t mp_cmath_exp
+00000000 r mp_cmath_exp_obj
+00000000 t mp_cmath_log
+00000000 t mp_cmath_log10
+00000000 r mp_cmath_log10_obj
+00000000 r mp_cmath_log_obj
+00000000 t mp_cmath_phase
+00000000 r mp_cmath_phase_obj
+00000000 t mp_cmath_polar
+00000000 r mp_cmath_polar_obj
+00000000 t mp_cmath_rect
+00000000 r mp_cmath_rect_obj
+00000000 t mp_cmath_sin
+00000000 r mp_cmath_sin_obj
+00000000 t mp_cmath_sqrt
+00000000 r mp_cmath_sqrt_obj
+         U mp_const_float_e_obj
+         U mp_const_float_pi_obj
+00000000 R mp_module_cmath
+00000000 r mp_module_cmath_globals
+00000000 r mp_module_cmath_globals_table
+         U mp_obj_get_complex
+         U mp_obj_get_float
+         U mp_obj_new_complex
+         U mp_obj_new_float
+         U mp_obj_new_tuple
+         U mp_type_dict
+         U mp_type_fun_builtin_1
+         U mp_type_fun_builtin_2
+         U mp_type_module
+         U __muldf3
+         U pow
+         U sin
+         U sinh
+         U sqrt
+
+build/py/modmicropython.o:
+00000002 t $LCFI0
+00000002 t $LCFI11
+00000002 t $LCFI13
+00000002 t $LCFI16
+00000002 t $LCFI2
+00000002 t $LCFI5
+00000002 t $LCFI7
+00000002 t $LCFI9
+         U gc_dump_alloc_table
+         U gc_dump_info
+         U gc_lock
+         U gc_unlock
+         U mp_alloc_emergency_exception_buf
+00000000 r mp_alloc_emergency_exception_buf_obj
+         U mp_const_none_obj
+         U mp_hal_set_interrupt_char
+         U mp_identity_obj
+00000000 t mp_micropython_heap_lock
+00000000 r mp_micropython_heap_lock_obj
+00000000 t mp_micropython_heap_unlock
+00000000 r mp_micropython_heap_unlock_obj
+00000000 t mp_micropython_kbd_intr
+00000000 r mp_micropython_kbd_intr_obj
+00000000 T mp_micropython_mem_info
+00000000 r mp_micropython_mem_info_obj
+00000000 t mp_micropython_opt_level
+00000000 r mp_micropython_opt_level_obj
+00000000 t mp_micropython_qstr_info
+00000000 r mp_micropython_qstr_info_obj
+00000000 t mp_micropython_schedule
+00000000 r mp_micropython_schedule_obj
+00000000 t mp_micropython_stack_use
+00000000 r mp_micropython_stack_use_obj
+00000000 R mp_module_micropython
+00000000 r mp_module_micropython_globals
+00000000 r mp_module_micropython_globals_table
+         U mp_obj_get_int
+         U mp_plat_print
+         U mp_printf
+         U mp_raise_msg
+         U mp_sched_schedule
+         U mp_stack_usage
+         U mp_state_ctx
+         U mp_type_dict
+         U mp_type_fun_builtin_0
+         U mp_type_fun_builtin_1
+         U mp_type_fun_builtin_2
+         U mp_type_fun_builtin_var
+         U mp_type_module
+         U mp_type_RuntimeError
+         U qstr_dump_data
+         U qstr_pool_info
+
+build/py/modstruct.o:
+00000002 t $LCFI0
+00000002 t $LCFI12
+00000002 t $LCFI16
+00000002 t $LCFI18
+00000002 t $LCFI22
+00000002 t $LCFI4
+00000002 t $LCFI8
+00000000 t calc_size_items
+00000000 t get_fmt_num
+00000000 t get_fmt_type
+         U memcpy
+         U memset
+         U mp_binary_get_size
+         U mp_binary_get_val
+         U mp_binary_set_val
+         U mp_const_none_obj
+         U mp_get_buffer_raise
+00000000 r mp_module_struct_globals
+00000000 r mp_module_struct_globals_table
+00000000 R mp_module_ustruct
+         U mp_obj_get_int
+         U mp_obj_new_bytes
+         U mp_obj_new_str_from_vstr
+         U mp_obj_new_tuple
+         U mp_obj_str_get_str
+         U mp_parse_num_integer
+         U mp_raise_ValueError
+         U mp_type_bytes
+         U mp_type_dict
+         U mp_type_fun_builtin_1
+         U mp_type_fun_builtin_var
+         U mp_type_module
+00000000 t struct_calcsize
+00000000 R struct_calcsize_obj
+00000000 t struct_pack
+00000000 t struct_pack_into
+00000000 t struct_pack_into_internal
+00000000 R struct_pack_into_obj
+00000000 R struct_pack_obj
+00000000 t struct_unpack_from
+00000000 R struct_unpack_from_obj
+         U unichar_isdigit
+         U vstr_init_len
+
+build/py/modsys.o:
+00000002 t $LCFI0
+00000002 t $LCFI3
+00000000 r impl_fields
+         U mp_const_none_obj
+         U mp_get_stream_raise
+         U mp_maxsize_obj
+00000000 R mp_module_sys
+00000000 r mp_module_sys_globals
+00000000 r mp_module_sys_globals_table
+         U mp_obj_new_exception
+         U mp_obj_new_exception_arg1
+         U mp_obj_print_exception
+         U mp_state_ctx
+         U mp_stream_write_adaptor
+00000000 t mp_sys_exit
+00000000 R mp_sys_exit_obj
+00000000 r mp_sys_implementation_obj
+00000000 r mp_sys_implementation_version_info_obj
+00000000 t mp_sys_print_exception
+00000000 R mp_sys_print_exception_obj
+         U mp_sys_stderr_obj
+         U mp_sys_stdin_obj
+         U mp_sys_stdout_obj
+00000000 R mp_sys_stdout_print
+00000000 r mp_sys_version_info_obj
+         U mp_type_attrtuple
+         U mp_type_dict
+         U mp_type_fun_builtin_var
+         U mp_type_module
+         U mp_type_str
+         U mp_type_SystemExit
+         U mp_type_tuple
+         U nlr_jump
+00000000 r platform_obj
+00000000 r version_obj
+
+build/py/moduerrno.o:
+00000002 t $LCFI0
+00000000 r errorcode_dict
+00000000 r errorcode_table
+00000000 T mp_errno_to_str
+         U mp_map_lookup
+00000000 R mp_module_uerrno
+00000000 r mp_module_uerrno_globals
+00000000 r mp_module_uerrno_globals_table
+         U mp_type_dict
+         U mp_type_module
+
+build/py/modthread.o:
+
+build/py/vm.o:
+00000b0a t $L100
+00000b40 t $L103
+00000b7a t $L108
+00000baa t $L110
+00000be2 t $L112
+00000c12 t $L114
+00000c42 t $L116
+00000c8c t $L118
+000004c0 t $L12
+00000cbe t $L120
+00000cfe t $L122
+00000d36 t $L124
+00000d72 t $L126
+0000007a t $L129
+000004e8 t $L13
+00000dae t $L133
+00000280 t $L141
+0000029c t $L143
+00000510 t $L15
+00000322 t $L154
+0000043c t $L155
+000003fc t $L156
+00000418 t $L157
+00000376 t $L158
+000003a2 t $L159
+0000051c t $L16
+000003bc t $L160
+000003e0 t $L161
+00000354 t $L162
+00000386 t $L18
+00000f54 t $L20
+00000538 t $L21
+00000558 t $L23
+00000570 t $L24
+00000592 t $L25
+000005a8 t $L26
+000005ca t $L27
+000005ec t $L28
+000005fc t $L29
+00000612 t $L30
+00000636 t $L32
+0000065e t $L34
+0000067e t $L35
+0000069e t $L36
+000006c4 t $L37
+000006de t $L38
+0000010e t $L4
+00000702 t $L40
+00000732 t $L42
+0000074a t $L43
+0000076c t $L44
+00000778 t $L45
+0000078e t $L46
+00000796 t $L47
+000007a6 t $L48
+000007c0 t $L49
+0000046a t $L5
+000007ce t $L50
+000007f0 t $L51
+00000818 t $L52
+00000840 t $L53
+0000085c t $L55
+00000878 t $L57
+000008d8 t $L58
+00000934 t $L64
+00000954 t $L65
+00000476 t $L7
+000000bc t $L70
+000000bc t $L71
+000009a4 t $L74
+00000484 t $L8
+000009ca t $L81
+000009da t $L82
+00000a04 t $L84
+00000a38 t $L89
+00000490 t $L9
+00000a56 t $L91
+00000a80 t $L93
+00000aaa t $L95
+00000ace t $L97
+00000ae0 t $L98
+00000002 t $LCFI0
+00000000 r entry_table.6100
+         U g_InterfaceVtbl
+         U mp_binary_op
+         U mp_call_function_n_kw
+         U mp_call_method_n_kw
+         U mp_call_method_n_kw_var
+         U mp_const_false_obj
+         U mp_const_GeneratorExit_obj
+         U mp_const_none_obj
+         U mp_const_true_obj
+         U mp_decode_uint_skip
+         U mp_decode_uint_value
+         U mp_delete_global
+         U mp_delete_name
+00000000 T mp_execute_bytecode
+         U mp_getiter
+         U mp_handle_pending_tail
+         U mp_import_all
+         U mp_import_from
+         U mp_import_name
+         U mp_iternext_allow_raise
+         U mp_load_attr
+         U mp_load_build_class
+         U mp_load_global
+         U mp_load_method
+         U mp_load_name
+         U mp_load_super_method
+         U mp_make_closure_from_raw_code
+         U mp_make_function_from_raw_code
+         U mp_make_raise_obj
+         U mp_obj_cell_get
+         U mp_obj_cell_set
+         U mp_obj_dict_store
+         U mp_obj_exception_add_traceback
+         U mp_obj_exception_get_value
+         U mp_obj_exception_match
+         U mp_obj_get_type
+         U mp_obj_is_exception_instance
+         U mp_obj_is_subclass_fast
+         U mp_obj_is_true
+         U mp_obj_list_append
+         U mp_obj_new_dict
+         U mp_obj_new_exception_msg
+         U mp_obj_new_list
+         U mp_obj_new_set
+         U mp_obj_new_slice
+         U mp_obj_new_tuple
+         U mp_obj_set_store
+         U mp_obj_subscr
+         U mp_resume
+         U mp_state_ctx
+         U mp_store_attr
+         U mp_store_global
+         U mp_store_name
+         U mp_type_GeneratorExit
+         U mp_type_NameError
+         U mp_type_NotImplementedError
+         U mp_type_RuntimeError
+         U mp_type_StopIteration
+         U mp_unary_op
+         U mp_unpack_ex
+         U mp_unpack_sequence
+         U mp_warning
+         U nlr_pop
+         U nlr_push_tail
+
+build/py/bc.o:
+000001c6 t $L42
+00000002 t $LCFI0
+00000002 t $LCFI2
+00000004 t $LCFI4
+00000002 t $LCFI6
+00000000 t fun_pos_args_mismatch
+         U memset
+         U mp_const_empty_tuple_obj
+00000000 T mp_decode_uint
+00000000 T mp_decode_uint_skip
+00000000 T mp_decode_uint_value
+         U mp_map_lookup
+         U mp_obj_dict_store
+         U mp_obj_new_cell
+         U mp_obj_new_dict
+         U mp_obj_new_exception_msg_varg
+         U mp_obj_new_tuple
+00000000 T mp_opcode_format
+         U mp_raise_TypeError
+00000000 T mp_setup_code_state
+         U mp_type_TypeError
+         U nlr_jump
+00000000 r opcode_format_table
+
+build/py/showbc.o:
+
+build/py/repl.o:
+00000002 t $LCFI0
+00000002 t $LCFI4
+00000002 t $LCFI6
+00000000 r import_str.6186
+         U memcmp
+         U mp_load_method_protected
+         U mp_module___main__
+         U mp_printf
+         U mp_print_str
+00000000 T mp_repl_autocomplete
+00000000 T mp_repl_continue_with_input
+         U mp_state_ctx
+         U qstr_data
+         U qstr_find_strn
+         U strncmp
+00000000 t str_startswith_word
+         U unichar_isalpha
+         U unichar_isdigit
+         U unichar_isident
+
+build/py/smallint.o:
+00000000 T mp_small_int_floor_divide
+00000000 T mp_small_int_modulo
+00000000 T mp_small_int_mul_overflow
+
+build/py/frozenmod.o:
+00000002 t $LCFI0
+00000002 t $LCFI4
+         U memcmp
+00000000 T mp_find_frozen_module
+         U mp_frozen_mpy_content
+         U mp_frozen_mpy_names
+00000000 T mp_frozen_stat
+         U strlen
+
+build/extmod/moductypes.o:
+00000002 t $LCFI0
+00000002 t $LCFI13
+00000006 t $LCFI16
+00000004 t $LCFI2
+00000002 t $LCFI20
+00000002 t $LCFI22
+00000002 t $LCFI24
+00000002 t $LCFI28
+00000002 t $LCFI32
+00000002 t $LCFI35
+00000002 t $LCFI39
+00000002 t $LCFI43
+00000002 t $LCFI45
+00000002 t $LCFI49
+00000002 t $LCFI6
+00000002 t $LCFI9
+00000000 r CSWTCH.87
+         U __extendsfdf2
+00000000 t get_aligned
+         U g_InterfaceVtbl
+         U m_malloc
+         U mp_arg_check_num_sig
+         U mp_binary_get_int
+         U mp_binary_get_val
+         U mp_binary_set_int
+         U mp_binary_set_val
+         U mp_get_buffer_raise
+00000000 R mp_module_uctypes
+00000000 r mp_module_uctypes_globals
+00000000 r mp_module_uctypes_globals_table
+         U mp_obj_dict_get
+         U mp_obj_get_float
+         U mp_obj_get_int
+         U mp_obj_get_int_truncated
+         U mp_obj_int_get_truncated
+         U mp_obj_len
+         U mp_obj_new_bytearray_by_ref
+         U mp_obj_new_bytes
+         U mp_obj_new_exception_msg
+         U mp_obj_new_float
+         U mp_obj_new_int
+         U mp_obj_new_int_from_ll
+         U mp_obj_new_int_from_uint
+         U mp_obj_new_int_from_ull
+         U mp_printf
+         U mp_raise_TypeError
+         U mp_type_bytearray
+         U mp_type_dict
+         U mp_type_fun_builtin_1
+         U mp_type_fun_builtin_2
+         U mp_type_fun_builtin_var
+         U mp_type_IndexError
+         U mp_type_module
+         U mp_type_ordereddict
+         U mp_type_tuple
+         U mp_type_type
+         U nlr_jump
+00000000 t set_aligned
+00000000 t syntax_error
+         U __truncdfsf2
+00000000 r type2char.6235
+00000000 r type2char.6254
+00000000 t uctypes_get_buffer
+00000000 t uctypes_struct_addressof
+00000000 R uctypes_struct_addressof_obj
+00000000 t uctypes_struct_agg_size
+00000000 t uctypes_struct_attr
+00000000 t uctypes_struct_attr_op
+00000000 t uctypes_struct_bytearray_at
+00000000 R uctypes_struct_bytearray_at_obj
+00000000 t uctypes_struct_bytes_at
+00000000 R uctypes_struct_bytes_at_obj
+00000000 t uctypes_struct_make_new
+00000000 t uctypes_struct_print
+00000000 t uctypes_struct_size
+00000000 t uctypes_struct_sizeof
+00000000 r uctypes_struct_sizeof_obj
+00000000 t uctypes_struct_subscr
+00000000 r uctypes_struct_type
+00000000 t uctypes_struct_unary_op
+
+build/extmod/modujson.o:
+000001d4 t $L34
+00000336 t $L9
+00000002 t $LCFI0
+00000002 t $LCFI13
+00000002 t $LCFI3
+00000002 t $LCFI7
+00000002 t $LCFI9
+00000000 t mod_ujson_dump
+00000000 r mod_ujson_dump_obj
+00000000 t mod_ujson_dumps
+00000000 r mod_ujson_dumps_obj
+00000000 t mod_ujson_load
+00000000 r mod_ujson_load_obj
+00000000 t mod_ujson_loads
+00000000 r mod_ujson_loads_obj
+         U mp_const_false_obj
+         U mp_const_none_obj
+         U mp_const_true_obj
+         U mp_get_buffer_raise
+         U mp_get_stream_raise
+00000000 R mp_module_ujson
+00000000 r mp_module_ujson_globals
+00000000 r mp_module_ujson_globals_table
+         U mp_obj_dict_store
+         U mp_obj_get_type
+         U mp_obj_list_append
+         U mp_obj_list_init
+         U mp_obj_new_dict
+         U mp_obj_new_list
+         U mp_obj_new_str
+         U mp_obj_new_str_from_vstr
+         U mp_obj_print_helper
+         U mp_parse_num_decimal
+         U mp_parse_num_integer
+         U mp_raise_OSError
+         U mp_raise_ValueError
+         U mp_stream_write_adaptor
+         U mp_type_dict
+         U mp_type_fun_builtin_1
+         U mp_type_fun_builtin_2
+         U mp_type_list
+         U mp_type_module
+         U mp_type_str
+         U mp_type_stringio
+00000000 t ujson_stream_next
+         U unichar_isdigit
+         U unichar_isspace
+         U vstr_add_byte
+         U vstr_add_char
+         U vstr_clear
+         U vstr_init
+         U vstr_init_print
+
+build/extmod/modure.o:
+00000032 t $L206
+00000002 t $LCFI0
+00000002 t $LCFI10
+00000002 t $LCFI14
+00000002 t $LCFI16
+00000002 t $LCFI2
+00000002 t $LCFI20
+00000002 t $LCFI22
+00000004 t $LCFI26
+00000004 t $LCFI28
+00000002 t $LCFI30
+00000002 t $LCFI34
+00000002 t $LCFI38
+00000002 t $LCFI4
+00000002 t $LCFI42
+00000002 t $LCFI44
+00000002 t $LCFI48
+00000002 t $LCFI52
+00000004 t $LCFI56
+00000004 t $LCFI58
+00000002 t $LCFI6
+00000000 t _compilecode
+         U g_InterfaceVtbl
+00000000 t match_group
+00000000 R match_group_obj
+00000000 r match_locals_dict
+00000000 r match_locals_dict_table
+00000000 t match_print
+00000000 r match_type
+         U memmove
+         U memset
+         U m_free
+         U m_malloc
+00000000 t mod_re_compile
+00000000 R mod_re_compile_obj
+00000000 t mod_re_exec
+00000000 t mod_re_match
+00000000 R mod_re_match_obj
+00000000 t mod_re_search
+00000000 R mod_re_search_obj
+00000000 t mod_re_sub
+00000000 R mod_re_sub_obj
+         U mp_call_function_1
+         U mp_const_none_obj
+00000000 r mp_module_re_globals
+00000000 r mp_module_re_globals_table
+00000000 R mp_module_ure
+         U mp_obj_get_int
+         U mp_obj_get_type
+         U mp_obj_is_callable
+         U mp_obj_list_append
+         U mp_obj_new_exception_arg1
+         U mp_obj_new_list
+         U mp_obj_new_str_from_vstr
+         U mp_obj_new_str_of_type
+         U mp_obj_str_get_data
+         U mp_obj_str_get_str
+         U mp_printf
+         U mp_raise_NotImplementedError
+         U mp_raise_ValueError
+         U mp_stack_check
+         U mp_type_dict
+         U mp_type_fun_builtin_2
+         U mp_type_fun_builtin_var
+         U mp_type_IndexError
+         U mp_type_module
+         U mp_type_type
+         U nlr_jump
+00000000 T _re1_5_classmatch
+00000000 T re1_5_compilecode
+00000000 T _re1_5_namedclassmatch
+00000000 T re1_5_recursiveloopprog
+00000000 T re1_5_sizecode
+00000000 t recursiveloop
+00000000 r re_locals_dict
+00000000 r re_locals_dict_table
+00000000 t re_match
+00000000 R re_match_obj
+00000000 t re_print
+00000000 t re_search
+00000000 R re_search_obj
+00000000 t re_split
+00000000 R re_split_obj
+00000000 t re_sub
+00000000 t re_sub_helper
+00000000 R re_sub_obj
+00000000 r re_type
+00000000 t ure_exec
+         U vstr_add_byte
+         U vstr_add_strn
+         U vstr_init
+
+build/extmod/moduzlib.o:
+00000082 t $L167
+000000de t $L184
+0000001a t $L67
+00000002 t $LCFI0
+00000002 t $LCFI13
+00000002 t $LCFI16
+00000002 t $LCFI2
+00000002 t $LCFI20
+00000002 t $LCFI24
+00000004 t $LCFI28
+00000002 t $LCFI32
+00000002 t $LCFI36
+00000002 t $LCFI40
+00000002 t $LCFI44
+00000006 t $LCFI48
+00000002 t $LCFI5
+00000002 t $LCFI51
+00000002 t $LCFI53
+00000002 t $LCFI57
+00000002 t $LCFI61
+00000002 t $LCFI65
+00000002 t $LCFI67
+00000002 t $LCFI9
+00000000 R clcidx
+00000000 r decompio_locals_dict
+00000000 r decompio_locals_dict_table
+00000000 t decompio_make_new
+00000000 t decompio_read
+00000000 r decompio_stream_p
+00000000 r decompio_type
+00000000 R dist_base
+00000000 R dist_bits
+00000000 R length_base
+00000000 R length_bits
+         U memset
+         U m_free
+         U m_malloc
+00000000 t mod_uzlib_decompress
+00000000 r mod_uzlib_decompress_obj
+         U mp_arg_check_num_sig
+         U mp_get_buffer_raise
+         U mp_get_stream_raise
+00000000 R mp_module_uzlib
+00000000 r mp_module_uzlib_globals
+00000000 r mp_module_uzlib_globals_table
+         U mp_obj_get_int
+         U mp_obj_new_bytearray_by_ref
+         U mp_obj_new_exception
+         U mp_obj_new_exception_arg1
+         U mp_raise_OSError
+         U mp_raise_ValueError
+         U mp_stream_readinto_obj
+         U mp_stream_read_obj
+         U mp_stream_unbuffered_readline_obj
+         U mp_type_dict
+         U mp_type_EOFError
+         U mp_type_fun_builtin_var
+         U mp_type_module
+         U mp_type_type
+         U mp_type_ValueError
+         U m_realloc
+         U nlr_jump
+00000000 t read_src_stream
+00000000 t tinf_build_tree
+00000000 r tinf_crc32tab
+00000000 t tinf_decode_symbol
+00000000 t tinf_decode_trees
+00000000 T tinf_get_be_uint32
+00000000 t tinf_getbit
+00000000 T tinf_get_le_uint32
+00000000 T tinf_get_uint16
+00000000 t tinf_read_bits
+00000000 T tinf_skip_bytes
+00000000 T uzlib_adler32
+00000000 T uzlib_crc32
+00000000 T uzlib_get_byte
+00000000 T uzlib_gzip_parse_header
+00000000 T uzlib_init
+00000000 T uzlib_uncompress
+00000000 T uzlib_uncompress_chksum
+00000000 T uzlib_uncompress_init
+00000000 T uzlib_zlib_parse_header
+
+build/extmod/moduheapq.o:
+00000004 t $LCFI0
+00000002 t $LCFI10
+00000002 t $LCFI14
+00000002 t $LCFI17
+00000002 t $LCFI2
+00000002 t $LCFI6
+00000000 t mod_uheapq_heapify
+00000000 r mod_uheapq_heapify_obj
+00000000 t mod_uheapq_heappop
+00000000 r mod_uheapq_heappop_obj
+00000000 t mod_uheapq_heappush
+00000000 r mod_uheapq_heappush_obj
+         U mp_binary_op
+         U mp_const_false_obj
+         U mp_const_none_obj
+         U mp_const_true_obj
+00000000 R mp_module_uheapq
+00000000 r mp_module_uheapq_globals
+00000000 r mp_module_uheapq_globals_table
+         U mp_obj_list_append
+         U mp_obj_new_exception_msg
+         U mp_raise_TypeError
+         U mp_type_dict
+         U mp_type_fun_builtin_1
+         U mp_type_fun_builtin_2
+         U mp_type_IndexError
+         U mp_type_list
+         U mp_type_module
+         U nlr_jump
+00000000 t uheapq_get_heap
+00000000 t uheapq_heap_siftdown
+00000000 t uheapq_heap_siftup
+
+build/extmod/modutimeq.o:
+00000002 t $LCFI0
+00000002 t $LCFI10
+00000002 t $LCFI14
+00000002 t $LCFI2
+00000002 t $LCFI6
+         U memcpy
+         U memset
+         U m_malloc
+00000000 t mod_utimeq_heappop
+00000000 r mod_utimeq_heappop_obj
+00000000 t mod_utimeq_heappush
+00000000 r mod_utimeq_heappush_obj
+00000000 t mod_utimeq_peektime
+00000000 r mod_utimeq_peektime_obj
+         U mp_arg_check_num_sig
+         U mp_const_false_obj
+         U mp_const_none_obj
+         U mp_const_true_obj
+00000000 R mp_module_utimeq
+00000000 r mp_module_utimeq_globals
+00000000 r mp_module_utimeq_globals_table
+         U mp_obj_get_int
+         U mp_obj_new_exception_msg
+         U mp_raise_msg
+         U mp_raise_TypeError
+         U mp_type_dict
+         U mp_type_fun_builtin_1
+         U mp_type_fun_builtin_2
+         U mp_type_fun_builtin_var
+         U mp_type_IndexError
+         U mp_type_list
+         U mp_type_module
+         U mp_type_type
+         U nlr_jump
+00000000 t T.28
+00000000 t time_less_than
+00000000 t utimeq_get_heap
+00000000 b utimeq_id
+00000000 r utimeq_locals_dict
+00000000 r utimeq_locals_dict_table
+00000000 t utimeq_make_new
+00000000 r utimeq_type
+00000000 t utimeq_unary_op
+
+build/extmod/moduhashlib.o:
+00000002 t $LCFI0
+00000002 t $LCFI10
+00000002 t $LCFI14
+00000002 t $LCFI18
+00000002 t $LCFI3
+00000002 t $LCFI7
+00000000 r k
+         U memset
+         U m_malloc
+         U mp_arg_check_num_sig
+         U mp_const_none_obj
+         U mp_get_buffer_raise
+00000000 R mp_module_uhashlib
+00000000 r mp_module_uhashlib_globals
+00000000 r mp_module_uhashlib_globals_table
+         U mp_obj_new_str_from_vstr
+         U mp_type_bytes
+         U mp_type_dict
+         U mp_type_fun_builtin_1
+         U mp_type_fun_builtin_2
+         U mp_type_module
+         U mp_type_type
+00000000 T sha256_final
+00000000 T sha256_init
+00000000 t sha256_transform
+00000000 T sha256_update
+00000000 t uhashlib_sha256_digest
+00000000 r uhashlib_sha256_digest_obj
+00000000 r uhashlib_sha256_locals_dict
+00000000 r uhashlib_sha256_locals_dict_table
+00000000 t uhashlib_sha256_make_new
+00000000 r uhashlib_sha256_type
+00000000 t uhashlib_sha256_update
+00000000 r uhashlib_sha256_update_obj
+         U vstr_init_len
+
+build/extmod/moducryptolib.o:
+
+build/extmod/modubinascii.o:
+00000002 t $LCFI0
+00000002 t $LCFI10
+00000002 t $LCFI14
+00000002 t $LCFI4
+00000002 t $LCFI6
+00000000 T mod_binascii_a2b_base64
+00000000 R mod_binascii_a2b_base64_obj
+00000000 T mod_binascii_b2a_base64
+00000000 R mod_binascii_b2a_base64_obj
+00000000 T mod_binascii_crc32
+00000000 R mod_binascii_crc32_obj
+00000000 T mod_binascii_hexlify
+00000000 R mod_binascii_hexlify_obj
+00000000 T mod_binascii_unhexlify
+00000000 R mod_binascii_unhexlify_obj
+         U mp_const_empty_bytes_obj
+         U mp_get_buffer_raise
+00000000 r mp_module_binascii_globals
+00000000 r mp_module_binascii_globals_table
+00000000 R mp_module_ubinascii
+         U mp_obj_get_int_truncated
+         U mp_obj_new_int_from_uint
+         U mp_obj_new_str_from_vstr
+         U mp_obj_str_get_str
+         U mp_raise_ValueError
+         U mp_type_bytes
+         U mp_type_dict
+         U mp_type_fun_builtin_1
+         U mp_type_fun_builtin_var
+         U mp_type_module
+         U unichar_isxdigit
+         U unichar_xdigit_value
+         U uzlib_crc32
+         U vstr_init
+         U vstr_init_len
+
+build/extmod/virtpin.o:
+00000002 t $LCFI0
+00000002 t $LCFI2
+00000000 T mp_virtual_pin_read
+00000000 T mp_virtual_pin_write
+
+build/extmod/machine_mem.o:
+00000002 t $LCFI0
+00000002 t $LCFI3
+00000002 t $LCFI7
+00000000 R machine_mem16_obj
+00000000 R machine_mem32_obj
+00000000 R machine_mem8_obj
+00000000 t machine_mem_get_addr
+00000000 t machine_mem_print
+00000000 t machine_mem_subscr
+00000000 R machine_mem_type
+         U mp_const_none_obj
+         U mp_obj_get_int_truncated
+         U mp_obj_int_get_truncated
+         U mp_obj_new_exception_msg_varg
+         U mp_obj_new_int
+         U mp_printf
+         U mp_type_type
+         U mp_type_ValueError
+         U nlr_jump
+
+build/extmod/machine_pinbase.o:
+00000002 t $LCFI0
+00000000 R machine_pinbase_type
+         U mp_call_method_n_kw
+         U mp_const_false_obj
+         U mp_const_true_obj
+         U mp_load_method
+         U mp_obj_get_int
+         U mp_type_type
+00000000 T pinbase_ioctl
+00000000 t pinbase_make_new
+00000000 r pinbase_pin_p
+00000000 r pinbase_singleton
+
+build/extmod/machine_signal.o:
+000000da t $L33
+00000002 t $LCFI0
+00000002 t $LCFI11
+00000002 t $LCFI13
+00000002 t $LCFI2
+00000002 t $LCFI4
+00000002 t $LCFI7
+00000000 R machine_signal_type
+         U memcpy
+         U m_malloc
+         U mp_arg_check_num_sig
+         U mp_const_none_obj
+         U mp_obj_is_true
+         U mp_pin_make_new
+         U mp_raise_TypeError
+         U mp_type_dict
+         U mp_type_fun_builtin_1
+         U mp_type_fun_builtin_var
+         U mp_type_type
+         U mp_virtual_pin_read
+         U mp_virtual_pin_write
+00000000 t signal_call
+00000000 t signal_ioctl
+00000000 r signal_locals_dict
+00000000 r signal_locals_dict_table
+00000000 t signal_make_new
+00000000 t signal_off
+00000000 r signal_off_obj
+00000000 t signal_on
+00000000 r signal_on_obj
+00000000 r signal_pin_p
+00000000 t signal_value
+00000000 r signal_value_obj
+
+build/extmod/machine_pulse.o:
+
+build/extmod/machine_i2c.o:
+
+build/extmod/machine_spi.o:
+00000002 t $LCFI0
+00000002 t $LCFI10
+00000002 t $LCFI13
+00000002 t $LCFI16
+00000002 t $LCFI2
+00000002 t $LCFI20
+00000002 t $LCFI24
+00000002 t $LCFI28
+00000002 t $LCFI4
+00000002 t $LCFI6
+00000002 t $LCFI8
+00000000 r allowed_args.6291
+00000000 r allowed_args.6334
+00000000 t baudrate_to_delay_half
+00000000 t machine_spi_deinit
+00000000 r machine_spi_deinit_obj
+00000000 t machine_spi_init
+00000000 r machine_spi_init_obj
+00000000 r machine_spi_locals_dict_table
+         U memset
+         U m_malloc
+         U mp_arg_parse_all
+         U mp_arg_parse_all_kw_array
+         U mp_const_none_obj
+         U mp_get_buffer_raise
+         U mp_hal_get_pin_obj
+00000000 t mp_machine_soft_spi_init
+00000000 R mp_machine_soft_spi_p
+00000000 t mp_machine_soft_spi_print
+00000000 t mp_machine_soft_spi_transfer
+00000000 R mp_machine_soft_spi_type
+00000000 R mp_machine_spi_locals_dict
+00000000 T mp_machine_spi_make_new
+00000000 t mp_machine_spi_read
+00000000 t mp_machine_spi_readinto
+00000000 R mp_machine_spi_readinto_obj
+00000000 R mp_machine_spi_read_obj
+00000000 t mp_machine_spi_transfer
+00000000 t mp_machine_spi_write
+00000000 R mp_machine_spi_write_obj
+00000000 t mp_machine_spi_write_readinto
+00000000 R mp_machine_spi_write_readinto_obj
+         U mp_obj_get_int
+         U mp_obj_new_str_from_vstr
+         U mp_printf
+         U mp_raise_ValueError
+         U mp_soft_spi_ioctl
+         U mp_soft_spi_transfer
+         U mp_type_bytes
+         U mp_type_dict
+         U mp_type_fun_builtin_1
+         U mp_type_fun_builtin_2
+         U mp_type_fun_builtin_3
+         U mp_type_fun_builtin_var
+         U mp_type_type
+         U vstr_init_len
+
+build/extmod/modussl_axtls.o:
+00000002 t $LCFI0
+00000002 t $LCFI12
+00000002 t $LCFI15
+00000002 t $LCFI19
+00000002 t $LCFI4
+00000002 t $LCFI8
+00000000 r allowed_args.6852
+         U g_InterfaceVtbl
+         U memcpy
+         U m_malloc
+00000000 t mod_ssl_wrap_socket
+00000000 r mod_ssl_wrap_socket_obj
+         U mp_arg_parse_all
+         U mp_call_method_n_kw
+         U mp_const_none_obj
+         U mp_load_method
+00000000 r mp_module_ssl_globals
+00000000 r mp_module_ssl_globals_table
+00000000 R mp_module_ussl
+         U mp_obj_is_true
+         U mp_obj_str_get_data
+         U mp_obj_str_get_str
+         U mp_printf
+         U mp_raise_OSError
+         U mp_raise_ValueError
+         U mp_stream_close_obj
+         U mp_stream_readinto_obj
+         U mp_stream_read_obj
+         U mp_stream_unbuffered_readline_obj
+         U mp_stream_write_obj
+         U mp_type_dict
+         U mp_type_fun_builtin_2
+         U mp_type_fun_builtin_var
+         U mp_type_module
+         U mp_type_type
+         U ssl_client_new
+         U ssl_ctx_free
+         U ssl_ctx_new
+         U ssl_display_error
+         U ssl_ext_new
+         U ssl_free
+         U ssl_handshake_status
+         U ssl_obj_memory_load
+         U ssl_read
+         U ssl_server_new
+         U ssl_write
+00000000 t ussl_socket_ioctl
+00000000 r ussl_socket_locals_dict
+00000000 r ussl_socket_locals_dict_table
+00000000 t ussl_socket_print
+00000000 t ussl_socket_read
+00000000 t ussl_socket_setblocking
+00000000 r ussl_socket_setblocking_obj
+00000000 r ussl_socket_stream_p
+00000000 r ussl_socket_type
+00000000 t ussl_socket_write
+
+build/extmod/modussl_mbedtls.o:
+
+build/extmod/modurandom.o:
+00000088 t $L32
+00000002 t $LCFI0
+00000002 t $LCFI10
+00000002 t $LCFI14
+00000002 t $LCFI16
+00000002 t $LCFI19
+00000002 t $LCFI23
+00000002 t $LCFI27
+00000002 t $LCFI29
+00000002 t $LCFI3
+00000002 t $LCFI7
+         U __adddf3
+00000000 t mod_urandom_choice
+00000000 r mod_urandom_choice_obj
+00000000 t mod_urandom_getrandbits
+00000000 r mod_urandom_getrandbits_obj
+00000000 t mod_urandom_randint
+00000000 r mod_urandom_randint_obj
+00000000 t mod_urandom_random
+00000000 r mod_urandom_random_obj
+00000000 t mod_urandom_randrange
+00000000 r mod_urandom_randrange_obj
+00000000 t mod_urandom_seed
+00000000 r mod_urandom_seed_obj
+00000000 t mod_urandom_uniform
+00000000 r mod_urandom_uniform_obj
+         U mp_const_none_obj
+00000000 R mp_module_urandom
+00000000 r mp_module_urandom_globals
+00000000 r mp_module_urandom_globals_table
+         U mp_obj_get_float
+         U mp_obj_get_int
+         U mp_obj_get_int_truncated
+         U mp_obj_len
+         U mp_obj_new_exception
+         U mp_obj_new_float
+         U mp_obj_new_int
+         U mp_obj_new_int_from_uint
+         U mp_obj_subscr
+         U mp_raise_ValueError
+         U mp_type_dict
+         U mp_type_fun_builtin_0
+         U mp_type_fun_builtin_1
+         U mp_type_fun_builtin_2
+         U mp_type_fun_builtin_var
+         U mp_type_IndexError
+         U mp_type_module
+         U __muldf3
+         U nlr_jump
+         U __subdf3
+00000000 t yasmarang
+00000000 d yasmarang_d
+00000000 b yasmarang_dat
+00000000 t yasmarang_float
+00000000 d yasmarang_n
+00000000 d yasmarang_pad
+00000000 t yasmarang_randbelow
+
+build/extmod/moduselect.o:
+00000002 t $LCFI0
+00000002 t $LCFI13
+00000002 t $LCFI17
+00000002 t $LCFI21
+00000002 t $LCFI25
+00000002 t $LCFI28
+00000002 t $LCFI3
+00000002 t $LCFI32
+00000002 t $LCFI36
+00000002 t $LCFI5
+00000002 t $LCFI9
+         U __fixunssfsi
+         U __gesf2
+         U g_InterfaceVtbl
+         U m_malloc
+         U mp_const_none_obj
+         U mp_get_stream_raise
+         U mp_hal_ticks_ms
+         U mp_handle_pending
+         U mp_identity_getiter
+         U mp_map_deinit
+         U mp_map_init
+         U mp_map_lookup
+00000000 r mp_module_select_globals
+00000000 r mp_module_select_globals_table
+00000000 R mp_module_uselect
+         U mp_obj_get_array
+         U mp_obj_get_float
+         U mp_obj_get_int
+         U mp_obj_id
+         U mp_obj_new_list
+         U mp_obj_new_tuple
+         U mp_raise_OSError
+00000000 R mp_select_poll_obj
+00000000 R mp_select_select_obj
+         U mp_type_dict
+         U mp_type_fun_builtin_0
+         U mp_type_fun_builtin_2
+         U mp_type_fun_builtin_3
+         U mp_type_fun_builtin_var
+         U mp_type_module
+00000000 r mp_type_poll
+         U mp_type_type
+         U __mulsf3
+00000000 t poll_ipoll
+00000000 R poll_ipoll_obj
+00000000 t poll_iternext
+00000000 r poll_locals_dict
+00000000 r poll_locals_dict_table
+00000000 t poll_map_add
+00000000 t poll_map_poll
+00000000 t poll_modify
+00000000 R poll_modify_obj
+00000000 t poll_poll
+00000000 t poll_poll_internal
+00000000 R poll_poll_obj
+00000000 t poll_register
+00000000 R poll_register_obj
+00000000 t poll_unregister
+00000000 R poll_unregister_obj
+00000000 t select_poll
+00000000 t select_select
+         U __truncdfsf2
+
+build/extmod/moduwebsocket.o:
+
+build/extmod/modwebrepl.o:
+
+build/extmod/modframebuf.o:
+00000002 t $LCFI0
+00000002 t $LCFI10
+0000000a t $LCFI14
+00000002 t $LCFI16
+00000004 t $LCFI2
+00000002 t $LCFI20
+00000002 t $LCFI24
+00000002 t $LCFI28
+00000002 t $LCFI32
+00000002 t $LCFI36
+00000002 t $LCFI40
+00000002 t $LCFI44
+00000002 t $LCFI48
+00000002 t $LCFI5
+00000002 t $LCFI52
+00000002 t $LCFI55
+00000002 t $LCFI59
+00000002 t $LCFI63
+00000002 t $LCFI67
+00000002 t $LCFI71
+00000004 t $LCFI8
+00000000 t fill_rect
+00000000 r font_petme128_8x8
+00000000 r formats
+00000000 t framebuf_blit
+00000000 r framebuf_blit_obj
+00000000 t framebuf_fill
+00000000 r framebuf_fill_obj
+00000000 t framebuf_fill_rect
+00000000 r framebuf_fill_rect_obj
+00000000 t framebuf_get_buffer
+00000000 t framebuf_hline
+00000000 r framebuf_hline_obj
+00000000 t framebuf_line
+00000000 r framebuf_line_obj
+00000000 r framebuf_locals_dict
+00000000 r framebuf_locals_dict_table
+00000000 t framebuf_make_new
+00000000 r framebuf_module_globals
+00000000 r framebuf_module_globals_table
+00000000 t framebuf_pixel
+00000000 r framebuf_pixel_obj
+00000000 t framebuf_rect
+00000000 r framebuf_rect_obj
+00000000 t framebuf_scroll
+00000000 r framebuf_scroll_obj
+00000000 t framebuf_text
+00000000 r framebuf_text_obj
+00000000 t framebuf_vline
+00000000 r framebuf_vline_obj
+00000000 t gs2_hmsb_fill_rect
+00000000 t gs2_hmsb_getpixel
+00000000 t gs2_hmsb_setpixel
+00000000 t gs4_hmsb_fill_rect
+00000000 t gs4_hmsb_getpixel
+00000000 t gs4_hmsb_setpixel
+00000000 t gs8_fill_rect
+00000000 t gs8_getpixel
+00000000 t gs8_setpixel
+00000000 t legacy_framebuffer1
+00000000 r legacy_framebuffer1_obj
+         U memset
+         U m_malloc
+00000000 t mono_horiz_fill_rect
+00000000 t mono_horiz_getpixel
+00000000 t mono_horiz_setpixel
+         U mp_arg_check_num_sig
+         U mp_const_none_obj
+         U mp_get_buffer_raise
+00000000 R mp_module_framebuf
+         U mp_obj_get_int
+         U mp_obj_str_get_str
+         U mp_raise_ValueError
+         U mp_type_dict
+00000000 R mp_type_framebuf
+         U mp_type_fun_builtin_2
+         U mp_type_fun_builtin_3
+         U mp_type_fun_builtin_var
+         U mp_type_module
+         U mp_type_type
+00000000 t mvlsb_fill_rect
+00000000 t mvlsb_getpixel
+00000000 t mvlsb_setpixel
+00000000 t rgb565_fill_rect
+00000000 t rgb565_getpixel
+00000000 t rgb565_setpixel
+00000000 t setpixel
+
+build/extmod/vfs.o:
+00000002 t $LCFI0
+00000006 t $LCFI12
+00000002 t $LCFI16
+00000002 t $LCFI20
+00000002 t $LCFI24
+00000002 t $LCFI26
+00000002 t $LCFI29
+00000002 t $LCFI32
+00000002 t $LCFI36
+00000002 t $LCFI39
+00000002 t $LCFI4
+00000002 t $LCFI42
+00000002 t $LCFI46
+00000002 t $LCFI50
+00000002 t $LCFI53
+00000002 t $LCFI56
+00000002 t $LCFI60
+00000002 t $LCFI8
+00000000 r allowed_args.6569
+00000000 r allowed_args.6659
+         U g_InterfaceVtbl
+00000000 t lookup_path
+         U memcmp
+         U memcpy
+         U m_malloc
+         U mp_arg_parse_all
+         U mp_call_method_n_kw
+         U mp_const_false_obj
+         U mp_const_none_obj
+         U mp_fat_vfs_type
+         U mp_iternext
+         U mp_load_method
+         U mp_load_method_maybe
+         U mp_obj_get_array_fixed_n
+         U mp_obj_get_int
+         U mp_obj_get_type
+         U mp_obj_list_append
+         U mp_obj_new_list
+         U mp_obj_new_str
+         U mp_obj_new_str_from_vstr
+         U mp_obj_new_str_of_type
+         U mp_obj_new_tuple
+         U mp_obj_str_get_data
+         U mp_obj_str_get_str
+         U mp_obj_subscr
+         U mp_raise_OSError
+         U mp_state_ctx
+         U mp_type_bytes
+         U mp_type_fun_builtin_0
+         U mp_type_fun_builtin_1
+         U mp_type_fun_builtin_2
+         U mp_type_fun_builtin_var
+         U mp_type_polymorph_iter
+         U mp_type_str
+00000000 T mp_vfs_chdir
+00000000 R mp_vfs_chdir_obj
+00000000 T mp_vfs_getcwd
+00000000 R mp_vfs_getcwd_obj
+00000000 T mp_vfs_ilistdir
+00000000 t mp_vfs_ilistdir_it_iternext
+00000000 R mp_vfs_ilistdir_obj
+00000000 T mp_vfs_import_stat
+00000000 T mp_vfs_listdir
+00000000 R mp_vfs_listdir_obj
+00000000 T mp_vfs_lookup_path
+00000000 T mp_vfs_mkdir
+00000000 R mp_vfs_mkdir_obj
+00000000 T mp_vfs_mount
+00000000 R mp_vfs_mount_obj
+00000000 T mp_vfs_open
+00000000 R mp_vfs_open_obj
+00000000 t mp_vfs_proxy_call
+00000000 T mp_vfs_remove
+00000000 R mp_vfs_remove_obj
+00000000 T mp_vfs_rename
+00000000 R mp_vfs_rename_obj
+00000000 T mp_vfs_rmdir
+00000000 R mp_vfs_rmdir_obj
+00000000 T mp_vfs_stat
+00000000 R mp_vfs_stat_obj
+00000000 T mp_vfs_statvfs
+00000000 R mp_vfs_statvfs_obj
+00000000 T mp_vfs_umount
+00000000 R mp_vfs_umount_obj
+         U nlr_pop
+         U nlr_push_tail
+         U strcmp
+         U strlen
+         U strncmp
+         U vstr_add_str
+         U vstr_add_strn
+         U vstr_init
+
+build/extmod/vfs_reader.o:
+00000002 t $LCFI0
+00000002 t $LCFI3
+00000002 t $LCFI7
+         U m_free
+         U m_malloc
+         U mp_const_empty_map
+         U mp_obj_new_str
+         U mp_raise_OSError
+00000000 T mp_reader_new_file
+00000000 t mp_reader_vfs_close
+00000000 t mp_reader_vfs_readbyte
+         U mp_stream_close
+         U mp_stream_rw
+         U mp_vfs_open
+         U strlen
+
+build/extmod/vfs_posix.o:
+
+build/extmod/vfs_posix_file.o:
+
+build/extmod/vfs_fat.o:
+00000002 t $LCFI0
+00000002 t $LCFI11
+00000002 t $LCFI15
+00000002 t $LCFI19
+00000002 t $LCFI23
+00000002 t $LCFI25
+00000002 t $LCFI27
+00000002 t $LCFI30
+00000002 t $LCFI33
+00000002 t $LCFI36
+0000000e t $LCFI4
+00000002 t $LCFI40
+00000002 t $LCFI44
+00000002 t $LCFI48
+00000002 t $LCFI5
+0000000c t $LCFI52
+00000002 t $LCFI8
+00000000 t fat_vfs_chdir
+00000000 r fat_vfs_chdir_obj
+00000000 t fat_vfs_getcwd
+00000000 r fat_vfs_getcwd_obj
+00000000 t fat_vfs_ilistdir_func
+00000000 r fat_vfs_ilistdir_obj
+00000000 t fat_vfs_import_stat
+00000000 r fat_vfs_locals_dict
+00000000 r fat_vfs_locals_dict_table
+00000000 t fat_vfs_make_new
+00000000 t fat_vfs_mkdir
+00000000 r fat_vfs_mkdir_obj
+00000000 t fat_vfs_mkfs
+00000000 r fat_vfs_mkfs_fun_obj
+00000000 r fat_vfs_mkfs_obj
+         U fat_vfs_open_obj
+00000000 r fat_vfs_proto
+00000000 t fat_vfs_remove
+00000000 t fat_vfs_remove_internal
+00000000 r fat_vfs_remove_obj
+00000000 t fat_vfs_rename
+00000000 r fat_vfs_rename_obj
+00000000 t fat_vfs_rmdir
+00000000 r fat_vfs_rmdir_obj
+00000000 t fat_vfs_stat
+00000000 r fat_vfs_stat_obj
+00000000 t fat_vfs_statvfs
+00000000 r fat_vfs_statvfs_obj
+00000000 r fat_vfs_umount_obj
+         U f_chdir
+         U f_closedir
+         U f_getcwd
+         U f_getfree
+         U f_mkdir
+         U f_mkfs
+         U f_mount
+         U f_opendir
+         U f_readdir
+         U f_rename
+         U fresult_to_errno_table
+         U f_stat
+         U f_unlink
+         U g_InterfaceVtbl
+         U m_malloc
+         U mp_arg_check_num_sig
+         U mp_const_none_obj
+00000000 R mp_fat_vfs_type
+         U mp_load_method
+         U mp_load_method_maybe
+         U mp_obj_get_type
+         U mp_obj_is_true
+         U mp_obj_new_bytes
+         U mp_obj_new_int_from_uint
+         U mp_obj_new_str
+         U mp_obj_new_tuple
+         U mp_obj_str_get_str
+         U mp_raise_OSError
+         U mp_type_bytes
+         U mp_type_dict
+         U mp_type_fun_builtin_1
+         U mp_type_fun_builtin_2
+         U mp_type_fun_builtin_3
+         U mp_type_fun_builtin_var
+         U mp_type_polymorph_iter
+         U mp_type_staticmethod
+         U mp_type_type
+00000000 t mp_vfs_fat_ilistdir_it_iternext
+         U strlen
+         U timeutils_seconds_since_2000
+00000000 t vfs_fat_mount
+00000000 r vfs_fat_mount_obj
+00000000 t vfs_fat_umount
+
+build/extmod/vfs_fat_diskio.o:
+00000002 t $LCFI0
+00000002 t $LCFI4
+00000002 t $LCFI8
+00000000 t disk_get_device
+00000000 T disk_ioctl
+00000000 T disk_read
+00000000 T disk_write
+         U mp_call_method_n_kw
+         U mp_const_none_obj
+         U mp_obj_get_int
+         U mp_type_bytearray
+00000000 r op_map.6650
+
+build/extmod/vfs_fat_file.o:
+00000004 t $LCFI0
+00000002 t $LCFI10
+00000002 t $LCFI13
+00000002 t $LCFI17
+00000002 t $LCFI19
+00000002 t $LCFI2
+00000002 t $LCFI23
+00000002 t $LCFI6
+00000000 t fatfs_builtin_open_self
+00000000 R fat_vfs_open_obj
+         U f_close
+00000000 t file_obj___exit__
+00000000 r file_obj___exit___obj
+00000000 t file_obj_ioctl
+00000000 t file_obj_make_new
+00000000 t file_obj_print
+00000000 t file_obj_read
+00000000 t file_obj_write
+00000000 t file_open
+00000000 r file_open_args
+         U f_lseek
+         U f_open
+         U f_read
+00000000 R fresult_to_errno_table
+         U f_sync
+         U f_write
+         U g_InterfaceVtbl
+         U m_free
+         U m_malloc_with_finaliser
+         U mp_arg_parse_all_kw_array
+         U mp_const_none_obj
+         U mp_identity_getiter
+         U mp_identity_obj
+         U mp_obj_get_type_str
+         U mp_obj_str_get_str
+         U mp_printf
+         U mp_raise_OSError
+         U mp_stream_close
+         U mp_stream_close_obj
+         U mp_stream_flush_obj
+         U mp_stream_readinto_obj
+         U mp_stream_read_obj
+         U mp_stream_seek_obj
+         U mp_stream_tell_obj
+         U mp_stream_unbuffered_iter
+         U mp_stream_unbuffered_readline_obj
+         U mp_stream_unbuffered_readlines_obj
+         U mp_stream_write_obj
+         U mp_type_dict
+         U mp_type_fun_builtin_3
+         U mp_type_fun_builtin_var
+         U mp_type_type
+00000000 R mp_type_vfs_fat_fileio
+00000000 R mp_type_vfs_fat_textio
+00000000 r vfs_fat_fileio_stream_p
+00000000 r vfs_fat_rawfile_locals_dict
+00000000 r vfs_fat_rawfile_locals_dict_table
+00000000 r vfs_fat_textio_stream_p
+
+build/extmod/utime_mphal.o:
+00000002 t $LCFI0
+00000002 t $LCFI11
+00000002 t $LCFI13
+00000002 t $LCFI2
+00000002 t $LCFI5
+00000002 t $LCFI7
+00000002 t $LCFI9
+         U __fixunsdfsi
+         U g_InterfaceVtbl
+         U mp_const_none_obj
+         U mp_hal_delay_ms
+         U mp_hal_delay_us
+         U mp_hal_ticks_ms
+         U mp_hal_ticks_us
+         U mp_obj_get_float
+         U mp_obj_get_int
+         U mp_type_fun_builtin_0
+         U mp_type_fun_builtin_1
+         U mp_type_fun_builtin_2
+00000000 R mp_utime_sleep_ms_obj
+00000000 R mp_utime_sleep_obj
+00000000 R mp_utime_sleep_us_obj
+00000000 R mp_utime_ticks_add_obj
+00000000 R mp_utime_ticks_cpu_obj
+00000000 R mp_utime_ticks_diff_obj
+00000000 R mp_utime_ticks_ms_obj
+00000000 R mp_utime_ticks_us_obj
+         U __muldf3
+00000000 t time_sleep
+00000000 t time_sleep_ms
+00000000 t time_sleep_us
+00000000 t time_ticks_add
+00000000 t time_ticks_cpu
+00000000 t time_ticks_diff
+00000000 t time_ticks_ms
+00000000 t time_ticks_us
+
+build/extmod/uos_dupterm.o:
+00000002 t $LCFI0
+00000002 t $LCFI12
+00000002 t $LCFI16
+00000002 t $LCFI4
+00000004 t $LCFI8
+         U g_InterfaceVtbl
+         U mp_const_none_obj
+         U mp_get_stream_raise
+         U mp_interrupt_char
+         U mp_keyboard_interrupt
+         U mp_obj_get_int
+         U mp_obj_print_exception
+         U mp_plat_print
+         U mp_printf
+         U mp_raise_OSError
+         U mp_raise_ValueError
+         U mp_state_ctx
+         U mp_stream_close
+         U mp_stream_write
+         U mp_type_fun_builtin_var
+00000000 T mp_uos_deactivate
+00000000 t mp_uos_dupterm
+00000000 R mp_uos_dupterm_obj
+00000000 T mp_uos_dupterm_poll
+00000000 T mp_uos_dupterm_rx_chr
+00000000 T mp_uos_dupterm_tx_strn
+         U nlr_pop
+         U nlr_push_tail
+
+build/lib/embed/abort_.o:
+00000002 t $LCFI0
+00000000 T abort_
+         U mp_raise_msg
+         U mp_type_RuntimeError
+
+build/lib/utils/printf.o:
+
+build/build/frozen_mpy.o:
+00000000 r const_obj_upip__lt_module_gt__0
+00000000 r const_obj_upip__lt_module_gt__1
+00000000 r const_obj_upip__lt_module_gt__cleanup_0
+00000000 r const_obj_upip__lt_module_gt__get_pkg_metadata_0
+00000000 r const_obj_upip__lt_module_gt__help_0
+00000000 r const_obj_upip__lt_module_gt__help_1
+00000000 r const_obj_upip__lt_module_gt__help_2
+00000000 r const_obj_upip__lt_module_gt__install_0
+00000000 r const_obj_upip__lt_module_gt__install_1
+00000000 r const_obj_upip__lt_module_gt__install_pkg_0
+00000000 r const_obj_upip__lt_module_gt__install_tar_0
+00000000 r const_obj_upip__lt_module_gt__install_tar_1
+00000000 r const_obj_upip__lt_module_gt__main_0
+00000000 r const_obj_upip__lt_module_gt__main_1
+00000000 r const_obj_upip__lt_module_gt__url_open_0
+00000000 r const_obj_upip__lt_module_gt__url_open_1
+00000000 r const_obj_upip__lt_module_gt__url_open_2
+00000000 r const_obj_upip__lt_module_gt__url_open_3
+00000000 r const_obj_upip__lt_module_gt__url_open_4
+00000000 r const_obj_upip__lt_module_gt__url_open_5
+00000000 r const_obj_upip__lt_module_gt__url_open_6
+00000000 r const_obj_upip__lt_module_gt__url_open_7
+00000000 r const_obj_upip__lt_module_gt__url_open_8
+00000000 r const_obj_upip_utarfile__lt_module_gt__FileSection_read_0
+00000000 r const_obj_upip_utarfile__lt_module_gt__TarInfo___str___0
+00000000 r const_table_data_blink__lt_module_gt_
+00000000 r const_table_data_blink__lt_module_gt__blink
+00000000 r const_table_data_network__lt_module_gt_
+00000000 r const_table_data_network__lt_module_gt__WWAN
+00000000 r const_table_data_network__lt_module_gt__WWAN_active
+00000000 r const_table_data_network__lt_module_gt__WWAN_connect
+00000000 r const_table_data_network__lt_module_gt__WWAN_disconnect
+00000000 r const_table_data_network__lt_module_gt__WWAN_ifconfig
+00000000 r const_table_data_network__lt_module_gt__WWAN_isconnected
+00000000 r const_table_data_network__lt_module_gt__WWAN___new__
+00000000 r const_table_data_upip__lt_module_gt_
+00000000 r const_table_data_upip__lt_module_gt__cleanup
+00000000 r const_table_data_upip__lt_module_gt__expandhome
+00000000 r const_table_data_upip__lt_module_gt__fatal
+00000000 r const_table_data_upip__lt_module_gt__get_pkg_metadata
+00000000 r const_table_data_upip__lt_module_gt__help
+00000000 r const_table_data_upip__lt_module_gt__install
+00000000 r const_table_data_upip__lt_module_gt__install_pkg
+00000000 r const_table_data_upip__lt_module_gt__install_tar
+00000000 r const_table_data_upip__lt_module_gt__main
+00000000 r const_table_data_upip__lt_module_gt___makedirs
+00000000 r const_table_data_upip__lt_module_gt__op_basename
+00000000 r const_table_data_upip__lt_module_gt__op_split
+00000000 r const_table_data_upip__lt_module_gt__save_file
+00000000 r const_table_data_upip__lt_module_gt__url_open
+00000000 r const_table_data_upip_utarfile__lt_module_gt_
+00000000 r const_table_data_upip_utarfile__lt_module_gt__FileSection
+00000000 r const_table_data_upip_utarfile__lt_module_gt__FileSection___init__
+00000000 r const_table_data_upip_utarfile__lt_module_gt__FileSection_read
+00000000 r const_table_data_upip_utarfile__lt_module_gt__FileSection_readinto
+00000000 r const_table_data_upip_utarfile__lt_module_gt__FileSection_skip
+00000000 r const_table_data_upip_utarfile__lt_module_gt__roundup
+00000000 r const_table_data_upip_utarfile__lt_module_gt__TarFile
+00000000 r const_table_data_upip_utarfile__lt_module_gt__TarFile_extractfile
+00000000 r const_table_data_upip_utarfile__lt_module_gt__TarFile___init__
+00000000 r const_table_data_upip_utarfile__lt_module_gt__TarFile___iter__
+00000000 r const_table_data_upip_utarfile__lt_module_gt__TarFile___next__
+00000000 r const_table_data_upip_utarfile__lt_module_gt__TarFile_next
+00000000 r const_table_data_upip_utarfile__lt_module_gt__TarInfo
+00000000 r const_table_data_upip_utarfile__lt_module_gt__TarInfo___str__
+00000000 r fun_data_blink__lt_module_gt_
+00000000 r fun_data_blink__lt_module_gt__blink
+00000000 r fun_data__boot__lt_module_gt_
+00000000 r fun_data_network__lt_module_gt_
+00000000 r fun_data_network__lt_module_gt__WWAN
+00000000 r fun_data_network__lt_module_gt__WWAN_active
+00000000 r fun_data_network__lt_module_gt__WWAN_connect
+00000000 r fun_data_network__lt_module_gt__WWAN_disconnect
+00000000 r fun_data_network__lt_module_gt__WWAN_ifconfig
+00000000 r fun_data_network__lt_module_gt__WWAN_isconnected
+00000000 r fun_data_network__lt_module_gt__WWAN___new__
+00000000 r fun_data_upip__lt_module_gt_
+00000000 r fun_data_upip__lt_module_gt__cleanup
+00000000 r fun_data_upip__lt_module_gt__expandhome
+00000000 r fun_data_upip__lt_module_gt__fatal
+00000000 r fun_data_upip__lt_module_gt__get_install_path
+00000000 r fun_data_upip__lt_module_gt__get_pkg_metadata
+00000000 r fun_data_upip__lt_module_gt__help
+00000000 r fun_data_upip__lt_module_gt__install
+00000000 r fun_data_upip__lt_module_gt__install_pkg
+00000000 r fun_data_upip__lt_module_gt__install_tar
+00000000 r fun_data_upip__lt_module_gt__main
+00000000 r fun_data_upip__lt_module_gt___makedirs
+00000000 r fun_data_upip__lt_module_gt__NotFoundError
+00000000 r fun_data_upip__lt_module_gt__op_basename
+00000000 r fun_data_upip__lt_module_gt__op_split
+00000000 r fun_data_upip__lt_module_gt__save_file
+00000000 r fun_data_upip__lt_module_gt__url_open
+00000000 r fun_data_upip_utarfile__lt_module_gt_
+00000000 r fun_data_upip_utarfile__lt_module_gt__FileSection
+00000000 r fun_data_upip_utarfile__lt_module_gt__FileSection___init__
+00000000 r fun_data_upip_utarfile__lt_module_gt__FileSection_read
+00000000 r fun_data_upip_utarfile__lt_module_gt__FileSection_readinto
+00000000 r fun_data_upip_utarfile__lt_module_gt__FileSection_skip
+00000000 r fun_data_upip_utarfile__lt_module_gt__roundup
+00000000 r fun_data_upip_utarfile__lt_module_gt__TarFile
+00000000 r fun_data_upip_utarfile__lt_module_gt__TarFile_extractfile
+00000000 r fun_data_upip_utarfile__lt_module_gt__TarFile___init__
+00000000 r fun_data_upip_utarfile__lt_module_gt__TarFile___iter__
+00000000 r fun_data_upip_utarfile__lt_module_gt__TarFile___next__
+00000000 r fun_data_upip_utarfile__lt_module_gt__TarFile_next
+00000000 r fun_data_upip_utarfile__lt_module_gt__TarInfo
+00000000 r fun_data_upip_utarfile__lt_module_gt__TarInfo___str__
+00000000 R mp_frozen_mpy_content
+00000000 R mp_frozen_mpy_names
+         U mp_qstr_const_pool
+00000000 R mp_qstr_frozen_const_pool
+         U mp_type_bytes
+         U mp_type_str
+00000000 R raw_code_blink__lt_module_gt_
+00000000 r raw_code_blink__lt_module_gt__blink
+00000000 R raw_code__boot__lt_module_gt_
+00000000 R raw_code_network__lt_module_gt_
+00000000 r raw_code_network__lt_module_gt__WWAN
+00000000 r raw_code_network__lt_module_gt__WWAN_active
+00000000 r raw_code_network__lt_module_gt__WWAN_connect
+00000000 r raw_code_network__lt_module_gt__WWAN_disconnect
+00000000 r raw_code_network__lt_module_gt__WWAN_ifconfig
+00000000 r raw_code_network__lt_module_gt__WWAN_isconnected
+00000000 r raw_code_network__lt_module_gt__WWAN___new__
+00000000 R raw_code_upip__lt_module_gt_
+00000000 r raw_code_upip__lt_module_gt__cleanup
+00000000 r raw_code_upip__lt_module_gt__expandhome
+00000000 r raw_code_upip__lt_module_gt__fatal
+00000000 r raw_code_upip__lt_module_gt__get_install_path
+00000000 r raw_code_upip__lt_module_gt__get_pkg_metadata
+00000000 r raw_code_upip__lt_module_gt__help
+00000000 r raw_code_upip__lt_module_gt__install
+00000000 r raw_code_upip__lt_module_gt__install_pkg
+00000000 r raw_code_upip__lt_module_gt__install_tar
+00000000 r raw_code_upip__lt_module_gt__main
+00000000 r raw_code_upip__lt_module_gt___makedirs
+00000000 r raw_code_upip__lt_module_gt__NotFoundError
+00000000 r raw_code_upip__lt_module_gt__op_basename
+00000000 r raw_code_upip__lt_module_gt__op_split
+00000000 r raw_code_upip__lt_module_gt__save_file
+00000000 r raw_code_upip__lt_module_gt__url_open
+00000000 R raw_code_upip_utarfile__lt_module_gt_
+00000000 r raw_code_upip_utarfile__lt_module_gt__FileSection
+00000000 r raw_code_upip_utarfile__lt_module_gt__FileSection___init__
+00000000 r raw_code_upip_utarfile__lt_module_gt__FileSection_read
+00000000 r raw_code_upip_utarfile__lt_module_gt__FileSection_readinto
+00000000 r raw_code_upip_utarfile__lt_module_gt__FileSection_skip
+00000000 r raw_code_upip_utarfile__lt_module_gt__roundup
+00000000 r raw_code_upip_utarfile__lt_module_gt__TarFile
+00000000 r raw_code_upip_utarfile__lt_module_gt__TarFile_extractfile
+00000000 r raw_code_upip_utarfile__lt_module_gt__TarFile___init__
+00000000 r raw_code_upip_utarfile__lt_module_gt__TarFile___iter__
+00000000 r raw_code_upip_utarfile__lt_module_gt__TarFile___next__
+00000000 r raw_code_upip_utarfile__lt_module_gt__TarFile_next
+00000000 r raw_code_upip_utarfile__lt_module_gt__TarInfo
+00000000 r raw_code_upip_utarfile__lt_module_gt__TarInfo___str__
+
+build/main.o:
+00000024 t $L60
+00000002 t $LCFI0
+00000002 t $LCFI13
+00000002 t $LCFI16
+00000002 t $LCFI18
+00000002 t $LCFI20
+00000002 t $LCFI3
+00000002 t $LCFI5
+00000002 t $LCFI9
+00000000 T AppMainTask
+         U Buffer_Init
+00000000 T do_str
+00000000 T EventDispatch
+0000000c C fifoBuffer
+00000800 C fifoBufferData
+00000000 T gc_collect
+         U gc_collect_end
+         U gc_collect_root
+         U gc_collect_start
+         U gc_helper_get_regs_and_sp
+         U gc_init
+         U gc_sweep_all
+         U g_InterfaceVtbl
+00000000 b heap
+00000000 T _Main
+00000000 B mainTaskHandle
+00000000 T MicroPyTask
+00000000 B microPyTaskHandle
+         U modcellular_init0
+         U modcellular_notify_act
+         U modcellular_notify_act_failed
+         U modcellular_notify_att
+         U modcellular_notify_att_failed
+         U modcellular_notify_call_hangup
+         U modcellular_notify_call_incoming
+         U modcellular_notify_cell_info
+         U modcellular_notify_deact
+         U modcellular_notify_dereg
+         U modcellular_notify_det
+         U modcellular_notify_no_sim
+         U modcellular_notify_ntwlist
+         U modcellular_notify_reg_denied
+         U modcellular_notify_reg_home
+         U modcellular_notify_reg_roaming
+         U modcellular_notify_reg_searching
+         U modcellular_notify_signal
+         U modcellular_notify_sim_drop
+         U modcellular_notify_sms_error
+         U modcellular_notify_sms_list
+         U modcellular_notify_sms_receipt
+         U modcellular_notify_sms_sent
+         U modgps_init0
+         U modgps_notify_gps_update
+         U modmachine_init0
+         U modmachine_notify_power_on
+         U moduos_init0
+00000000 T mp_allocate_heap
+         U mp_call_function_0
+         U mp_compile
+         U mp_deinit
+         U mp_fatal_error
+         U mp_hal_delay_us
+         U mp_hal_stdout_tx_str
+         U mp_handle_pending
+         U mp_init
+         U mp_lexer_new_from_str_len
+         U mp_obj_list_append
+         U mp_obj_list_init
+         U mp_obj_print_exception
+         U mp_parse
+         U mp_plat_print
+         U mp_stack_ctrl_init
+         U mp_stack_set_limit
+         U mp_stack_set_top
+         U mp_state_ctx
+00000000 T nlr_jump_fail
+         U nlr_pop
+         U nlr_push_tail
+         U pyexec_file_if_exists
+         U pyexec_friendly_repl
+         U pyexec_frozen_module
+         U pyexec_mode_kind
+         U pyexec_raw_repl
+00000000 b stack_top
+         U strlen
+
+build/posix_helpers.o:
+00000002 t $LCFI0
+00000002 t $LCFI2
+00000002 t $LCFI4
+00000004 t $LCFI6
+00000000 T calloc
+00000000 T free
+         U gc_alloc
+         U gc_free
+         U gc_realloc
+00000000 T htonl
+00000000 T malloc
+00000000 T ntohl
+00000000 T realloc
+
+build/fatal.o:
+00000002 t $LCFI0
+         U Assert
+         U g_InterfaceVtbl
+00000000 T mp_fatal_error
+00000000 r msg1
+00000000 r msg2
+00000000 r msg3
+00000000 r msg_heap_init
+00000000 r msg_nlr_jump_fail
+00000000 r msg_unknown
+         U strlen
+00000010 C var
+
+build/uart.o:
+0000000a t $LCFI0
+00000004 t $LCFI12
+00000002 t $LCFI14
+00000002 t $LCFI18
+00000002 t $LCFI4
+00000002 t $LCFI6
+00000002 t $LCFI8
+         U g_InterfaceVtbl
+         U mp_hal_ticks_us
+         U mp_interrupt_char
+         U mp_keyboard_interrupt
+00000100 C uart1_ringbuf_array
+00000100 C uart2_ringbuf_array
+         U uart_attached_to_dupterm
+00000000 T uart_close
+00000000 t uart_config
+00000000 D uart_dev
+00000000 T uart_get_rxbuf_len
+00000000 T uart_init
+00000000 r uart_port
+00000000 D uart_ringbuf
+00000000 D uart_ringbuf_array
+00000000 T uart_rx_any
+00000000 T uart_rx_char
+00000000 t uart_rx_intr_handler
+00000000 T uart_rx_wait
+00000000 T uart_set_rxbuf
+00000000 T uart_setup
+00000000 T uart_tx_any_room
+00000000 T uart_tx_one_char
+
+build/help.o:
+00000000 R gprs_a9_help_text
+
+build/modmachine.o:
+00000002 t $LCFI0
+00000004 t $LCFI11
+00000002 t $LCFI14
+00000002 t $LCFI16
+00000002 t $LCFI19
+00000002 t $LCFI2
+00000002 t $LCFI21
+00000002 t $LCFI4
+00000002 t $LCFI6
+00000004 t $LCFI8
+         U g_InterfaceVtbl
+         U machine_adc_type
+00000000 r machine_module_globals
+00000000 r machine_module_globals_table
+         U machine_pin_type
+00000000 t modmachine_get_input_voltage
+00000000 r modmachine_get_input_voltage_obj
+00000000 T modmachine_init0
+00000000 T modmachine_notify_power_on
+00000000 t modmachine_off
+00000000 r modmachine_off_obj
+         U modmachine_pin_init0
+00000000 t modmachine_power_on_cause
+00000000 r modmachine_power_on_cause_obj
+00000000 t modmachine_reset
+00000000 r modmachine_reset_obj
+00000000 t modmachine_set_idle
+00000000 r modmachine_set_idle_obj
+00000000 t modmachine_set_min_freq
+00000000 r modmachine_set_min_freq_obj
+         U modmachine_uart_init0
+00000000 t modmachine_watchdog_off
+00000000 r modmachine_watchdog_off_obj
+00000000 t modmachine_watchdog_on
+00000000 r modmachine_watchdog_on_obj
+00000000 t modmachine_watchdog_reset
+00000000 r modmachine_watchdog_reset_obj
+         U mp_const_none_obj
+         U mp_machine_soft_spi_type
+00000000 R mp_module_machine
+         U mp_obj_get_int
+         U mp_obj_new_int
+         U mp_obj_new_tuple
+         U mp_raise_ValueError
+         U mp_type_dict
+         U mp_type_fun_builtin_0
+         U mp_type_fun_builtin_1
+         U mp_type_module
+00000000 D powerOnCause
+         U pyb_uart_type
+
+build/machine_pin.o:
+00000002 t $LCFI0
+00000002 t $LCFI11
+00000002 t $LCFI13
+00000002 t $LCFI15
+00000002 t $LCFI17
+00000002 t $LCFI21
+00000002 t $LCFI23
+00000002 t $LCFI25
+00000002 t $LCFI28
+00000004 t $LCFI3
+00000002 t $LCFI31
+00000002 t $LCFI33
+00000002 t $LCFI7
+00000002 t $LCFI9
+00000000 r allowed_args.6198
+         U g_InterfaceVtbl
+00000000 t machine_pin_call
+00000000 R machine_pin_init_obj
+00000000 r machine_pin_locals_dict
+00000000 r machine_pin_locals_dict_table
+00000000 r machine_pin_obj
+00000000 t machine_pin_obj_init
+00000000 T machine_pin_obj_init_helper
+00000000 t machine_pin_print
+00000000 R machine_pin_type
+00000000 t machine_pin_value
+00000000 r machine_pin_value_obj
+00000000 T modmachine_pin_init0
+         U mp_arg_check_num_sig
+         U mp_arg_parse_all
+         U mp_const_none_obj
+00000000 T mp_hal_get_pin_obj
+00000000 T mp_hal_pin_input
+00000000 T mp_hal_pin_output
+00000000 T mp_hal_pin_read
+00000000 T mp_hal_pin_write
+         U mp_map_init_fixed_table
+         U mp_obj_get_int
+         U mp_obj_get_type
+         U mp_obj_is_true
+00000000 T mp_pin_make_new
+         U mp_printf
+         U mp_raise_ValueError
+         U mp_type_dict
+         U mp_type_fun_builtin_var
+         U mp_type_type
+00000000 T pin_init
+00000000 t pin_ioctl
+00000000 r pin_pin_p
+
+build/mphalport.o:
+00000002 t $LCFI0
+00000002 t $LCFI10
+00000002 t $LCFI14
+00000002 t $LCFI18
+00000002 t $LCFI2
+00000002 t $LCFI20
+00000002 t $LCFI23
+00000002 t $LCFI4
+00000002 t $LCFI6
+         U __divdf3
+         U __fixunsdfsi
+         U __floatsidf
+         U __floatunsidf
+         U g_InterfaceVtbl
+         U __ltdf2
+00000000 T mp_hal_delay_ms
+00000000 T mp_hal_delay_us
+00000000 T mp_hal_delay_us_fast
+00000000 T mp_hal_stdin_rx_chr
+00000000 T mp_hal_stdout_tx_str
+00000000 T mp_hal_stdout_tx_strn
+00000000 T mp_hal_stdout_tx_strn_cooked
+00000000 T mp_hal_ticks_ms
+00000000 T mp_hal_ticks_us
+         U mp_handle_pending
+         U mp_uos_dupterm_rx_chr
+         U mp_uos_dupterm_tx_strn
+         U __muldf3
+         U strlen
+00000008 C uart_attached_to_dupterm
+
+build/moduos.o:
+00000002 t $LCFI0
+00000002 t $LCFI12
+00000002 t $LCFI16
+00000002 t $LCFI18
+00000002 t $LCFI20
+00000002 t $LCFI22
+00000002 t $LCFI24
+00000002 t $LCFI26
+00000004 t $LCFI28
+00000002 t $LCFI30
+00000002 t $LCFI33
+00000002 t $LCFI36
+00000002 t $LCFI39
+00000002 t $LCFI4
+00000002 t $LCFI43
+00000002 t $LCFI46
+00000002 t $LCFI49
+00000002 t $LCFI52
+00000002 t $LCFI56
+00000002 t $LCFI59
+00000002 t $LCFI8
+00000000 T ensure_exists
+00000000 T ensure_is_dir
+00000000 T ensure_is_file
+00000000 T ensure_not_a_directory
+00000000 T ensure_not_a_file
+00000000 T ensure_not_exists
+         U g_InterfaceVtbl
+00000000 t internal_flash_ilistdir_it_iternext
+00000000 r internal_flash_locals_dict
+00000000 r internal_flash_locals_dict_table
+         U internal_flash_open_obj
+00000000 T maybe_raise_FSError
+         U m_malloc
+00000000 T moduos_init0
+00000000 T moduos_internal_flash_chdir
+00000000 R moduos_internal_flash_chdir_obj
+00000000 R moduos_internal_flash_chdir_static_class_obj
+00000000 T moduos_internal_flash_getcwd
+00000000 R moduos_internal_flash_getcwd_obj
+00000000 R moduos_internal_flash_getcwd_static_class_obj
+00000000 T moduos_internal_flash_ilistdir
+00000000 R moduos_internal_flash_ilistdir_obj
+00000000 R moduos_internal_flash_ilistdir_static_class_obj
+00000000 T moduos_internal_flash_mkdir
+00000000 R moduos_internal_flash_mkdir_obj
+00000000 R moduos_internal_flash_mkdir_static_class_obj
+00000000 T moduos_internal_flash_mount
+00000000 R moduos_internal_flash_mount_obj
+00000000 R moduos_internal_flash_mount_static_class_obj
+00000000 R moduos_internal_flash_open_static_class_obj
+00000000 T moduos_internal_flash_remove
+00000000 R moduos_internal_flash_remove_obj
+00000000 R moduos_internal_flash_remove_static_class_obj
+00000000 T moduos_internal_flash_rename
+00000000 R moduos_internal_flash_rename_obj
+00000000 R moduos_internal_flash_rename_static_class_obj
+00000000 T moduos_internal_flash_rmdir
+00000000 R moduos_internal_flash_rmdir_obj
+00000000 R moduos_internal_flash_rmdir_static_class_obj
+00000000 T moduos_internal_flash_stat
+00000000 R moduos_internal_flash_stat_obj
+00000000 R moduos_internal_flash_stat_static_class_obj
+00000000 T moduos_internal_flash_statvfs
+00000000 R moduos_internal_flash_statvfs_obj
+00000000 R moduos_internal_flash_statvfs_static_class_obj
+00000000 r moduos_internal_flash_type
+00000000 T moduos_internal_flash_umount
+00000000 R moduos_internal_flash_umount_obj
+00000000 R moduos_internal_flash_umount_static_class_obj
+         U mp_const_none_obj
+         U mp_fat_vfs_type
+         U mp_obj_get_int
+         U mp_obj_get_type
+         U mp_obj_new_int
+         U mp_obj_new_str
+         U mp_obj_new_str_from_vstr
+         U mp_obj_new_tuple
+         U mp_obj_str_get_str
+         U mp_plat_print
+         U mp_printf
+         U mp_raise_OSError
+         U mp_type_attrtuple
+         U mp_type_bytes
+         U mp_type_dict
+         U mp_type_fun_builtin_0
+         U mp_type_fun_builtin_1
+         U mp_type_fun_builtin_2
+         U mp_type_fun_builtin_var
+         U mp_type_module
+         U mp_type_polymorph_iter
+         U mp_type_staticmethod
+         U mp_type_str
+         U mp_type_type
+         U mp_uos_dupterm_obj
+         U mp_vfs_chdir_obj
+         U mp_vfs_getcwd_obj
+         U mp_vfs_ilistdir_obj
+         U mp_vfs_listdir_obj
+         U mp_vfs_mkdir_obj
+         U mp_vfs_mount_obj
+         U mp_vfs_remove_obj
+         U mp_vfs_rename_obj
+         U mp_vfs_rmdir_obj
+         U mp_vfs_stat_obj
+         U mp_vfs_statvfs_obj
+         U mp_vfs_umount_obj
+00000000 T os_dupterm
+00000000 r os_dupterm_obj
+00000000 r os_module_globals
+00000000 r os_module_globals_table
+00000000 t os_uname
+00000000 r os_uname_info_fields
+00000000 r os_uname_info_machine_obj
+00000000 r os_uname_info_nodename_obj
+00000000 r os_uname_info_obj
+00000000 r os_uname_info_release_obj
+00000000 r os_uname_info_sysname_obj
+00000000 r os_uname_info_version_obj
+00000000 r os_uname_obj
+00000000 t os_urandom
+00000000 r os_urandom_obj
+00000000 T path_exists
+         U pyb_uart_type
+         U rng_get
+         U strlen
+00000000 T translate_io_errno
+         U uart_attached_to_dupterm
+00000000 R uos_module
+         U vstr_init_len
+
+build/modutime.o:
+00000002 t $LCFI0
+00000002 t $LCFI4
+00000002 t $LCFI6
+         U g_InterfaceVtbl
+         U mp_const_none_obj
+         U mp_obj_get_array
+         U mp_obj_get_int
+         U mp_obj_new_exception_msg_varg
+         U mp_obj_new_int
+         U mp_obj_new_int_from_uint
+         U mp_obj_new_tuple
+         U mp_type_dict
+         U mp_type_fun_builtin_0
+         U mp_type_fun_builtin_1
+         U mp_type_fun_builtin_var
+         U mp_type_module
+         U mp_type_TypeError
+         U mp_utime_sleep_ms_obj
+         U mp_utime_sleep_obj
+         U mp_utime_sleep_us_obj
+         U mp_utime_ticks_add_obj
+         U mp_utime_ticks_cpu_obj
+         U mp_utime_ticks_diff_obj
+         U mp_utime_ticks_ms_obj
+         U mp_utime_ticks_us_obj
+         U nlr_jump
+00000000 t time_localtime
+00000000 r time_localtime_obj
+00000000 t time_mktime
+00000000 r time_mktime_obj
+00000000 r time_module_globals
+00000000 r time_module_globals_table
+00000000 t time_time
+00000000 R time_time_obj
+         U timeutils_mktime
+         U timeutils_seconds_since_2000_to_struct_time
+00000000 R utime_module
+
+build/rng.o:
+00000002 t $LCFI0
+00000000 d glob_seed
+00000000 T rand_r
+00000000 T rng_get
+
+build/fatfs_port.o:
+00000002 t $LCFI0
+00000000 T get_fattime
+         U g_InterfaceVtbl
+         U timeutils_seconds_since_2000_to_struct_time
+
+build/modchip.o:
+00000002 t $LCFI0
+00000002 t $LCFI10
+00000002 t $LCFI2
+00000002 t $LCFI6
+00000000 R chip_module
+00000000 r chip_module_globals
+00000000 r chip_module_globals_table
+         U g_InterfaceVtbl
+         U memcpy
+00000000 t modchip_chip_flash_erase
+00000000 r modchip_chip_flash_erase_obj
+00000000 t modchip_chip_flash_read
+00000000 r modchip_chip_flash_read_obj
+00000000 t modchip_chip_flash_size
+00000000 r modchip_chip_flash_size_obj
+00000000 t modchip_chip_flash_user_start
+00000000 r modchip_chip_flash_user_start_obj
+00000000 t modchip_chip_flash_write
+00000000 r modchip_chip_flash_write_obj
+         U mp_const_none_obj
+         U mp_get_buffer_raise
+         U mp_obj_get_int
+         U mp_obj_new_int_from_uint
+         U mp_raise_OSError
+         U mp_type_dict
+         U mp_type_fun_builtin_0
+         U mp_type_fun_builtin_1
+         U mp_type_fun_builtin_2
+         U mp_type_module
+
+build/file_io.o:
+00000004 t $LCFI0
+00000002 t $LCFI10
+00000002 t $LCFI13
+00000002 t $LCFI17
+00000002 t $LCFI2
+00000002 t $LCFI21
+00000002 t $LCFI25
+00000002 t $LCFI6
+00000000 r allowed_args.6404
+00000000 t file_obj___exit__
+00000000 r file_obj___exit___obj
+00000000 r file_open_args
+         U g_InterfaceVtbl
+00000000 r internal_flash_fileio_stream_p
+00000000 t internal_flash_file_obj_ioctl
+00000000 t internal_flash_file_obj_make_new
+00000000 t internal_flash_file_obj_print
+00000000 t internal_flash_file_obj_read
+00000000 t internal_flash_file_obj_write
+00000000 t internal_flash_file_open
+00000000 T internal_flash_open
+00000000 R internal_flash_open_obj
+00000000 r internal_flash_textio_stream_p
+         U maybe_raise_FSError
+         U m_malloc_with_finaliser
+         U mp_arg_parse_all
+         U mp_arg_parse_all_kw_array
+         U mp_const_none_obj
+         U mp_identity_getiter
+         U mp_identity_obj
+         U mp_obj_get_type_str
+         U mp_obj_str_get_str
+         U mp_printf
+         U mp_raise_OSError
+         U mp_raise_ValueError
+         U mp_stream_close
+         U mp_stream_close_obj
+         U mp_stream_flush_obj
+         U mp_stream_readinto_obj
+         U mp_stream_read_obj
+         U mp_stream_seek_obj
+         U mp_stream_tell_obj
+         U mp_stream_unbuffered_iter
+         U mp_stream_unbuffered_readline_obj
+         U mp_stream_unbuffered_readlines_obj
+         U mp_stream_write_obj
+         U mp_type_dict
+         U mp_type_fun_builtin_var
+00000000 R mp_type_internal_flash_fileio
+00000000 R mp_type_internal_flash_textio
+         U mp_type_type
+         U translate_io_errno
+00000000 r vfs_fat_rawfile_locals_dict
+00000000 r vfs_fat_rawfile_locals_dict_table
+
+build/modcellular.o:
+00000002 t $LCFI0
+00000002 t $LCFI10
+00000002 t $LCFI102
+00000002 t $LCFI105
+0000000a t $LCFI14
+00000002 t $LCFI15
+00000002 t $LCFI17
+00000002 t $LCFI2
+00000002 t $LCFI21
+00000002 t $LCFI23
+00000002 t $LCFI26
+00000002 t $LCFI28
+00000002 t $LCFI31
+00000002 t $LCFI35
+00000018 t $LCFI39
+00000006 t $LCFI40
+00000002 t $LCFI42
+00000002 t $LCFI46
+00000002 t $LCFI5
+00000016 t $LCFI50
+00000002 t $LCFI51
+00000002 t $LCFI55
+00000002 t $LCFI58
+00000002 t $LCFI61
+00000002 t $LCFI64
+00000002 t $LCFI66
+00000002 t $LCFI69
+00000002 t $LCFI7
+00000002 t $LCFI73
+00000002 t $LCFI75
+00000002 t $LCFI79
+00000002 t $LCFI81
+00000002 t $LCFI85
+00000002 t $LCFI89
+00000002 t $LCFI92
+00000002 t $LCFI94
+00000002 t $LCFI98
+00000000 r allowed_args.6470
+00000000 T bitsum
+         U Buffer_Gets
+         U Buffer_Init
+         U Buffer_Puts
+         U Buffer_Size
+00000000 r C.19.6297
+00000000 B calls_incoming_now
+00000000 B calls_incoming_now_flag
+0000000c C calls_missed
+00000100 C calls_missed_buffer
+00000080 C cells
+00000000 B cells_n
+00000000 R cellular_module
+         U free
+00000000 T get_flight_mode
+         U g_InterfaceVtbl
+00000000 T __is_attached
+         U malloc
+         U memcpy
+         U m_malloc
+         U m_malloc_with_finaliser
+00000000 t modcellular_agps_station_data
+00000000 r modcellular_agps_station_data_obj
+00000000 t modcellular_call
+00000000 r modcellular_call_obj
+00000000 t modcellular_dial
+00000000 r modcellular_dial_obj
+00000000 t modcellular_flight_mode
+00000000 r modcellular_flight_mode_obj
+00000000 t modcellular_get_iccid
+00000000 r modcellular_get_iccid_obj
+00000000 t modcellular_get_imei
+00000000 r modcellular_get_imei_obj
+00000000 t modcellular_get_imsi
+00000000 r modcellular_get_imsi_obj
+00000000 t modcellular_get_network_status
+00000000 r modcellular_get_network_status_obj
+00000000 t modcellular_get_signal_quality
+00000000 r modcellular_get_signal_quality_obj
+00000000 t modcellular_gprs
+00000000 r modcellular_gprs_obj
+00000000 T modcellular_init0
+00000000 t modcellular_is_network_registered
+00000000 r modcellular_is_network_registered_obj
+00000000 t modcellular_is_roaming
+00000000 r modcellular_is_roaming_obj
+00000000 t modcellular_is_sim_present
+00000000 r modcellular_is_sim_present_obj
+00000000 t modcellular_network_status_changed
+00000000 r modcellular_network_status_changed_obj
+00000000 T modcellular_notify_act
+00000000 T modcellular_notify_act_failed
+00000000 T modcellular_notify_att
+00000000 T modcellular_notify_att_failed
+00000000 T modcellular_notify_call_hangup
+00000000 T modcellular_notify_call_incoming
+00000000 T modcellular_notify_cell_info
+00000000 T modcellular_notify_deact
+00000000 T modcellular_notify_dereg
+00000000 T modcellular_notify_det
+00000000 T modcellular_notify_no_sim
+00000000 T modcellular_notify_ntwlist
+00000000 T modcellular_notify_reg_denied
+00000000 T modcellular_notify_reg_home
+00000000 T modcellular_notify_reg_roaming
+00000000 T modcellular_notify_reg_searching
+00000000 T modcellular_notify_signal
+00000000 T modcellular_notify_sim_drop
+00000000 T modcellular_notify_sms_error
+00000000 T modcellular_notify_sms_list
+00000000 T modcellular_notify_sms_receipt
+00000000 T modcellular_notify_sms_sent
+00000000 t modcellular_poll_network_exception
+00000000 r modcellular_poll_network_exception_obj
+00000000 t modcellular_register
+00000000 r modcellular_register_obj
+00000000 t modcellular_reset
+00000000 r modcellular_reset_obj
+00000000 t modcellular_scan
+00000000 r modcellular_scan_obj
+00000000 t modcellular_set_bands
+00000000 r modcellular_set_bands_obj
+00000000 t modcellular_sms_attr
+00000000 t modcellular_sms_list
+00000000 r modcellular_sms_list_obj
+00000000 r modcellular_sms_list_static_class_obj
+00000000 T modcellular_sms_make_new
+00000000 t modcellular_sms_poll
+00000000 r modcellular_sms_poll_obj
+00000000 r modcellular_sms_poll_static_class_obj
+00000000 t modcellular_sms_print
+00000000 t modcellular_sms_send
+00000000 R modcellular_sms_send_obj
+00000000 r modcellular_sms_type
+00000000 t modcellular_sms_withdraw
+00000000 R modcellular_sms_withdraw_obj
+00000000 t modcellular_stations
+00000000 r modcellular_stations_obj
+         U mp_arg_parse_all_kw_array
+         U mp_const_false_obj
+         U mp_const_none_obj
+         U mp_const_true_obj
+         U mp_convert_member_lookup
+         U mp_hal_delay_ms
+         U mp_hal_ticks_ms
+00000000 r mp_module_cellular_globals
+00000000 r mp_module_cellular_globals_table
+         U mp_obj_exception_attr
+         U mp_obj_exception_make_new
+         U mp_obj_exception_print
+         U mp_obj_get_int
+         U mp_obj_get_type
+         U mp_obj_is_true
+         U mp_obj_list_append
+         U mp_obj_new_bytearray
+         U mp_obj_new_int
+         U mp_obj_new_list
+         U mp_obj_new_str
+         U mp_obj_new_tuple
+         U mp_obj_str_get_str
+         U mp_plat_print
+         U mp_printf
+00000000 T mp_raise_CellularError
+         U mp_raise_msg
+         U mp_raise_ValueError
+         U mp_type_bytearray
+00000000 R mp_type_CellularError
+         U mp_type_dict
+         U mp_type_fun_builtin_0
+         U mp_type_fun_builtin_1
+         U mp_type_fun_builtin_var
+         U mp_type_module
+         U mp_type_OSError
+         U mp_type_RuntimeError
+         U mp_type_staticmethod
+         U mp_type_str
+         U mp_type_type
+         U mp_warning
+00000000 B network_exception
+00000000 B network_list_buffer
+00000000 B network_list_buffer_len
+00000000 B network_signal_quality
+00000000 B network_signal_rx_level
+00000000 B network_status
+00000000 B network_status_updated
+00000000 B sms_list_buffer
+00000000 B sms_list_buffer_count
+00000000 r sms_locals_dict
+00000000 r sms_locals_dict_table
+00000000 B sms_received_count
+00000000 B sms_send_flag
+         U strlen
+
+build/modgps.o:
+00000002 t $LCFI0
+00000002 t $LCFI12
+00000002 t $LCFI16
+00000002 t $LCFI18
+00000002 t $LCFI2
+00000002 t $LCFI21
+00000002 t $LCFI25
+00000002 t $LCFI4
+00000002 t $LCFI6
+00000002 t $LCFI8
+         U __adddf3
+         U __divdf3
+         U __fixunsdfsi
+         U __floatsidf
+         U __floatunsidf
+         U g_InterfaceVtbl
+         U Gps_GetInfo
+         U GPS_GetVersion
+00000000 B gpsInfo
+         U GPS_Init
+00000000 R gps_module
+         U GPS_Update
+00000000 t modgps_get_firmware_version
+00000000 r modgps_get_firmware_version_obj
+00000000 t modgps_get_last_location
+00000000 r modgps_get_last_location_obj
+00000000 t modgps_get_location
+00000000 r modgps_get_location_obj
+00000000 t modgps_get_satellites
+00000000 r modgps_get_satellites_obj
+00000000 T modgps_init0
+00000000 T modgps_notify_gps_update
+00000000 t modgps_off
+00000000 r modgps_off_obj
+00000000 t modgps_on
+00000000 r modgps_on_obj
+00000000 t modgps_time
+00000000 r modgps_time_obj
+         U mp_const_none_obj
+00000000 r mp_module_gps_globals
+00000000 r mp_module_gps_globals_table
+         U mp_obj_exception_attr
+         U mp_obj_exception_make_new
+         U mp_obj_exception_print
+         U mp_obj_get_int
+         U mp_obj_new_float
+         U mp_obj_new_int
+         U mp_obj_new_int_from_uint
+         U mp_obj_new_str
+         U mp_obj_new_tuple
+00000000 T mp_raise_GPSError
+         U mp_raise_msg
+         U mp_type_dict
+         U mp_type_fun_builtin_0
+         U mp_type_fun_builtin_var
+00000000 R mp_type_GPSError
+         U mp_type_module
+         U mp_type_OSError
+         U mp_type_type
+         U __muldf3
+         U strlen
+         U timeutils_mktime
+
+build/modusocket.o:
+00000004 t $LCFI0
+00000002 t $LCFI10
+00000002 t $LCFI12
+00000002 t $LCFI16
+00000002 t $LCFI20
+00000002 t $LCFI24
+00000002 t $LCFI28
+00000002 t $LCFI31
+00000002 t $LCFI34
+00000002 t $LCFI36
+00000002 t $LCFI38
+00000002 t $LCFI4
+00000002 t $LCFI40
+00000002 t $LCFI42
+00000002 t $LCFI44
+00000004 t $LCFI46
+00000002 t $LCFI50
+00000002 t $LCFI54
+00000002 t $LCFI56
+00000002 t $LCFI59
+00000002 t $LCFI63
+00000002 t $LCFI67
+00000004 t $LCFI7
+00000002 t $LCFI71
+00000004 t $LCFI73
+00000002 t $LCFI75
+00000002 t $LCFI79
+00000002 t $LCFI82
+00000000 r allowed_args.6279
+00000000 r allowed_args.6813
+00000000 t exception_from_errno
+         U __fixunsdfdi
+00000000 t getaddrinfo
+00000000 r getaddrinfo_obj
+00000000 t get_local_ip
+00000000 r get_local_ip_obj
+         U g_InterfaceVtbl
+         U m_malloc_with_finaliser
+00000000 t modusocket_get_num_open
+00000000 r modusocket_get_num_open_obj
+00000000 t modusocket_inet_ntop
+00000000 r modusocket_inet_ntop_obj
+00000000 t modusocket_inet_pton
+00000000 r modusocket_inet_pton_obj
+         U mp_arg_parse_all
+         U mp_arg_parse_all_kw_array
+         U mp_const_none_obj
+         U mp_get_buffer_raise
+         U mp_handle_pending
+00000000 r mp_module_usocket_globals
+00000000 r mp_module_usocket_globals_table
+         U mp_obj_get_array
+         U mp_obj_get_float
+         U mp_obj_get_int
+         U mp_obj_is_true
+         U mp_obj_new_int
+         U mp_obj_new_int_from_uint
+         U mp_obj_new_list
+         U mp_obj_new_str
+         U mp_obj_new_str_from_vstr
+         U mp_obj_new_tuple
+         U mp_obj_str_get_str
+         U mp_plat_print
+         U mp_printf
+         U mp_raise_NotImplementedError
+         U mp_raise_OSError
+         U mp_raise_ValueError
+         U mp_stream_close_obj
+         U mp_stream_readinto_obj
+         U mp_stream_read_obj
+         U mp_stream_unbuffered_readline_obj
+         U mp_stream_write_obj
+         U mp_type_bytes
+         U mp_type_dict
+         U mp_type_fun_builtin_0
+         U mp_type_fun_builtin_1
+         U mp_type_fun_builtin_2
+         U mp_type_fun_builtin_3
+         U mp_type_fun_builtin_var
+         U mp_type_module
+         U mp_type_type
+         U __muldf3
+         U netutils_format_inet_addr
+         U netutils_parse_inet_addr
+00000000 B num_sockets_open
+00000000 t socket_accept
+00000000 r socket_accept_obj
+00000000 t socket_bind
+00000000 r socket_bind_obj
+00000000 t socket_connect
+00000000 r socket_connect_obj
+00000000 T _socket_getaddrinfo
+00000000 t _socket_getaddrinfo2
+00000000 t socket_listen
+00000000 r socket_listen_obj
+00000000 r socket_locals_dict
+00000000 r socket_locals_dict_table
+00000000 t socket_makefile
+00000000 r socket_makefile_obj
+00000000 T socket_make_new
+00000000 t _socket_read_data
+00000000 t socket_recv
+00000000 T _socket_recvfrom
+00000000 t socket_recvfrom
+00000000 r socket_recvfrom_obj
+00000000 r socket_recv_obj
+00000000 T _socket_send
+00000000 t socket_send
+00000000 t socket_sendall
+00000000 r socket_sendall_obj
+00000000 r socket_send_obj
+00000000 t socket_sendto
+00000000 r socket_sendto_obj
+00000000 t socket_setblocking
+00000000 r socket_setblocking_obj
+00000000 t socket_setsockopt
+00000000 r socket_setsockopt_obj
+00000000 T _socket_settimeout
+00000000 t socket_settimeout
+00000000 r socket_settimeout_obj
+00000000 t socket_stream_ioctl
+00000000 r socket_stream_p
+00000000 t socket_stream_read
+00000000 t socket_stream_write
+00000000 r socket_type
+         U strlen
+         U __udivdi3
+00000000 R usocket_module
+         U vstr_init_len
+
+build/modi2c.o:
+00000002 t $LCFI0
+00000002 t $LCFI10
+00000002 t $LCFI14
+00000002 t $LCFI18
+00000002 t $LCFI2
+00000002 t $LCFI22
+00000002 t $LCFI4
+00000004 t $LCFI8
+00000000 r CSWTCH.28
+         U g_InterfaceVtbl
+00000000 r i2c_globals_table
+00000000 R i2c_module
+00000000 t modi2c_close
+00000000 r modi2c_close_obj
+00000000 t modi2c_init
+00000000 r modi2c_init_obj
+00000000 t modi2c_mem_receive
+00000000 r modi2c_mem_receive_obj
+00000000 t modi2c_mem_transmit
+00000000 r modi2c_mem_transmit_obj
+00000000 T modi2c_private_get_I2C_FREQ
+00000000 T modi2c_private_get_I2C_ID
+00000000 T modi2c_private_throw_I2C_Error
+00000000 t modi2c_receive
+00000000 r modi2c_receive_obj
+00000000 t modi2c_transmit
+00000000 r modi2c_transmit_obj
+         U mp_const_none_obj
+         U mp_get_buffer_raise
+00000000 r mp_module_i2c_globals
+         U mp_obj_exception_attr
+         U mp_obj_exception_make_new
+         U mp_obj_exception_print
+         U mp_obj_get_int
+         U mp_obj_new_str_from_vstr
+00000000 T mp_raise_I2CError
+         U mp_raise_msg
+         U mp_type_bytes
+         U mp_type_dict
+         U mp_type_fun_builtin_var
+00000000 R mp_type_I2CError
+         U mp_type_module
+         U mp_type_OSError
+         U mp_type_type
+         U vstr_init_len
+
+build/modst7735.o:
+00000002 t $LCFI0
+00000002 t $LCFI10
+00000002 t $LCFI14
+00000004 t $LCFI18
+00000002 t $LCFI20
+00000002 t $LCFI23
+00000002 t $LCFI26
+00000002 t $LCFI3
+00000002 t $LCFI30
+00000002 t $LCFI34
+0000000c t $LCFI38
+00000002 t $LCFI39
+00000002 t $LCFI42
+00000002 t $LCFI46
+00000002 t $LCFI5
+00000004 t $LCFI50
+00000002 t $LCFI52
+00000002 t $LCFI56
+00000002 t $LCFI60
+00000002 t $LCFI64
+00000002 t $LCFI68
+00000002 t $LCFI7
+00000000 r allowed_args.6323
+00000000 T box_overlap
+00000000 r font_petme128_8x8
+         U memcpy
+         U m_malloc
+00000000 t modst7735_display_blit
+00000000 R modst7735_display_blit_obj
+00000000 t modst7735_display_fill
+00000000 R modst7735_display_fill_obj
+00000000 t modst7735_display_fill_rect
+00000000 r modst7735_display_fill_rect_obj
+00000000 t modst7735_display_init
+00000000 R modst7735_display_init_obj
+00000000 r modst7735_display_locals_dict
+00000000 r modst7735_display_locals_dict_table
+00000000 T modst7735_display_make_new
+00000000 t modst7735_display_mode
+00000000 R modst7735_display_mode_obj
+00000000 t modst7735_display_pixel
+00000000 r modst7735_display_pixel_obj
+00000000 t modst7735_display_print
+00000000 t modst7735_display_rect
+00000000 r modst7735_display_rect_obj
+00000000 t modst7735_display_text
+00000000 r modst7735_display_text_obj
+00000000 r modst7735_display_type
+         U mp_arg_parse_all_kw_array
+         U mp_const_none_obj
+         U mp_hal_delay_us_fast
+         U mp_hal_get_pin_obj
+         U mp_hal_pin_write
+         U mp_machine_soft_spi_type
+00000000 r mp_modst7735_globals
+00000000 r mp_modst7735_globals_table
+         U mp_obj_get_int
+         U mp_obj_str_get_str
+         U mp_printf
+         U mp_raise_ValueError
+         U mp_soft_spi_transfer
+         U mp_type_dict
+         U mp_type_framebuf
+         U mp_type_fun_builtin_1
+         U mp_type_fun_builtin_2
+         U mp_type_fun_builtin_3
+         U mp_type_fun_builtin_var
+         U mp_type_module
+         U mp_type_type
+00000000 T _seq_call
+00000000 T _seq_comm
+00000000 T _seq_data
+00000000 T _seq_data_continue
+00000000 T _seq_data_end
+00000000 T _seq_data_start
+00000000 T _seq_madctl
+00000000 T _seq_ppix
+00000000 T _seq_reset
+00000000 T _seq_window
+00000000 R st7735_module
+
+build/machine_adc.o:
+00000002 t $LCFI0
+00000002 t $LCFI2
+00000002 t $LCFI4
+00000002 t $LCFI8
+         U g_InterfaceVtbl
+00000000 d machine_adc_0
+00000000 d machine_adc_1
+00000000 t machine_adc___del__
+00000000 r machine_adc___del___obj
+00000000 r machine_adc_locals_dict
+00000000 r machine_adc_locals_dict_table
+00000000 T machine_adc_make_new
+00000000 T machine_adc_print
+00000000 t machine_adc_read
+00000000 r machine_adc_read_obj
+00000000 R machine_adc_type
+         U mp_arg_check_num_sig
+         U mp_const_none_obj
+         U mp_obj_get_int
+         U mp_obj_new_exception_msg_varg
+         U mp_printf
+         U mp_raise_msg
+         U mp_type_dict
+         U mp_type_fun_builtin_1
+         U mp_type_RuntimeError
+         U mp_type_type
+         U mp_type_ValueError
+         U nlr_jump
+
+build/machine_uart.o:
+00000002 t $LCFI0
+00000002 t $LCFI10
+00000002 t $LCFI14
+00000002 t $LCFI18
+00000002 t $LCFI2
+00000002 t $LCFI22
+00000002 t $LCFI24
+00000002 t $LCFI28
+00000002 t $LCFI6
+00000000 r allowed_args.6274
+         U g_InterfaceVtbl
+         U m_malloc
+00000000 T modmachine_uart_init0
+         U mp_arg_check_num_sig
+         U mp_arg_parse_all
+         U mp_const_none_obj
+         U mp_hal_get_pin_obj
+         U mp_identity_getiter
+         U mp_map_init_fixed_table
+         U mp_obj_get_int
+         U mp_obj_new_exception_msg_varg
+         U mp_printf
+         U mp_raise_ValueError
+         U mp_state_ctx
+         U mp_stream_close_obj
+         U mp_stream_readinto_obj
+         U mp_stream_read_obj
+         U mp_stream_unbuffered_iter
+         U mp_stream_unbuffered_readline_obj
+         U mp_stream_write_obj
+         U mp_type_dict
+         U mp_type_fun_builtin_1
+         U mp_type_fun_builtin_var
+         U mp_type_type
+         U mp_type_ValueError
+         U nlr_jump
+         U os_dupterm
+00000000 r _parity_name
+00000000 t pyb_uart_any
+00000000 r pyb_uart_any_obj
+00000000 t pyb_uart_init
+00000000 t pyb_uart_init_helper
+00000000 R pyb_uart_init_obj
+00000000 t pyb_uart_ioctl
+00000000 r pyb_uart_locals_dict
+00000000 r pyb_uart_locals_dict_table
+00000000 t pyb_uart_make_new
+00000000 t pyb_uart_print
+00000000 t pyb_uart_read
+00000000 R pyb_uart_type
+00000000 t pyb_uart_write
+         U uart_attached_to_dupterm
+         U uart_close
+         U uart_dev
+         U uart_get_rxbuf_len
+         U uart_ringbuf_array
+         U uart_rx_any
+         U uart_rx_char
+         U uart_rx_wait
+         U uart_set_rxbuf
+         U uart_setup
+00000000 r uart_stream_p
+         U uart_tx_any_room
+         U uart_tx_one_char
+
+build/lib/mp-readline/readline.o:
+0000025e t $L45
+00000236 t $L46
+00000286 t $L47
+00000274 t $L48
+00000222 t $L49
+000001dc t $L52
+0000019c t $L53
+00000002 t $LCFI0
+00000004 t $LCFI10
+00000002 t $LCFI12
+00000002 t $LCFI15
+00000002 t $LCFI19
+00000002 t $LCFI21
+00000002 t $LCFI4
+00000004 t $LCFI8
+         U g_InterfaceVtbl
+         U memcpy
+         U memset
+         U m_malloc_maybe
+00000000 t mp_hal_move_cursor_back
+         U mp_hal_stdin_rx_chr
+         U mp_hal_stdout_tx_str
+         U mp_hal_stdout_tx_strn
+         U mp_plat_print
+         U mp_repl_autocomplete
+         U mp_state_ctx
+00000000 T readline
+00000000 t readline_auto_indent
+00000000 T readline_init
+00000000 T readline_init0
+00000000 T readline_note_newline
+00000000 T readline_process_char
+00000000 T readline_push_history
+00000000 b rl
+         U strcmp
+         U strlen
+         U vstr_add_str
+         U vstr_add_strn
+         U vstr_cut_out_bytes
+         U vstr_cut_tail_bytes
+         U vstr_ins_byte
+         U vstr_ins_char
+         U vstr_null_terminated_str
+
+build/lib/utils/pyexec.o:
+0000000e t $L46
+00000010 t $L62
+00000002 t $LCFI0
+00000002 t $LCFI11
+00000002 t $LCFI14
+00000002 t $LCFI17
+00000002 t $LCFI2
+00000002 t $LCFI6
+00000002 t $LCFI9
+         U gc_collect
+         U gc_dump_info
+         U g_InterfaceVtbl
+         U mp_call_function_0
+         U mp_compile
+         U mp_const_none_obj
+         U mp_find_frozen_module
+         U mp_frozen_stat
+         U mp_hal_set_interrupt_char
+         U mp_hal_stdin_rx_chr
+         U mp_hal_stdout_tx_str
+         U mp_hal_stdout_tx_strn
+         U mp_hal_ticks_ms
+         U mp_lexer_new_from_file
+         U mp_lexer_new_from_str_len
+         U mp_make_function_from_raw_code
+         U mp_obj_get_int
+         U mp_obj_is_subclass_fast
+         U mp_obj_print_exception
+         U mp_parse
+         U mp_plat_print
+         U mp_repl_continue_with_input
+         U mp_state_ctx
+         U mp_type_fun_builtin_1
+         U mp_type_SystemExit
+         U mp_vfs_import_stat
+         U nlr_pop
+         U nlr_push_tail
+00000000 t parse_compile_execute
+00000000 T pyb_set_repl_info
+00000000 R pyb_set_repl_info_obj
+00000000 T pyexec_file
+00000000 T pyexec_file_if_exists
+00000000 T pyexec_friendly_repl
+00000000 T pyexec_frozen_module
+00000000 D pyexec_mode_kind
+00000000 T pyexec_raw_repl
+00000000 B pyexec_system_exit
+         U qstr_pool_info
+         U readline
+00000000 b repl_display_debugging_info
+         U strlen
+         U vstr_add_byte
+         U vstr_clear
+         U vstr_init
+         U vstr_null_terminated_str
+
+build/lib/utils/interrupt_char.o:
+00000002 t $LCFI0
+00000000 T mp_hal_set_interrupt_char
+00000000 D mp_interrupt_char
+00000000 T mp_keyboard_interrupt
+         U mp_obj_exception_clear_traceback
+         U mp_state_ctx
+
+build/lib/utils/sys_stdio_mphal.o:
+00000002 t $LCFI0
+00000002 t $LCFI11
+00000002 t $LCFI14
+00000002 t $LCFI3
+00000002 t $LCFI7
+         U mp_const_none_obj
+         U mp_hal_stdin_rx_chr
+         U mp_hal_stdout_tx_strn
+         U mp_hal_stdout_tx_strn_cooked
+         U mp_identity_getiter
+         U mp_identity_obj
+         U mp_printf
+         U mp_stream_readinto_obj
+         U mp_stream_read_obj
+         U mp_stream_unbuffered_iter
+         U mp_stream_unbuffered_readline_obj
+         U mp_stream_unbuffered_readlines_obj
+         U mp_stream_write_obj
+00000000 R mp_sys_stderr_obj
+00000000 R mp_sys_stdin_obj
+00000000 R mp_sys_stdout_obj
+         U mp_type_dict
+         U mp_type_fun_builtin_var
+         U mp_type_type
+00000000 r stdio_buffer_obj
+00000000 r stdio_buffer_obj_stream_p
+00000000 r stdio_buffer_obj_type
+00000000 t stdio_buffer_read
+00000000 t stdio_buffer_write
+00000000 t stdio_ioctl
+00000000 r stdio_locals_dict
+00000000 r stdio_locals_dict_table
+00000000 t stdio_obj___exit__
+00000000 r stdio_obj___exit___obj
+00000000 T stdio_obj_print
+00000000 r stdio_obj_stream_p
+00000000 r stdio_obj_type
+00000000 t stdio_read
+00000000 t stdio_write
+
+build/lib/timeutils/timeutils.o:
+00000002 t $LCFI0
+00000002 t $LCFI10
+00000002 t $LCFI14
+00000004 t $LCFI3
+00000004 t $LCFI6
+00000000 r days_in_month.5615
+00000000 r days_since_jan1
+00000000 T timeutils_days_in_month
+00000000 T timeutils_is_leap_year
+00000000 T timeutils_mktime
+00000000 T timeutils_seconds_since_2000
+00000000 T timeutils_seconds_since_2000_to_struct_time
+00000000 T timeutils_year_day
+
+build/lib/netutils/netutils.o:
+00000002 t $LCFI0
+00000002 t $LCFI11
+00000002 t $LCFI4
+00000002 t $LCFI8
+         U g_InterfaceVtbl
+         U mp_obj_get_array_fixed_n
+         U mp_obj_get_int
+         U mp_obj_new_int
+         U mp_obj_new_str
+         U mp_obj_new_tuple
+         U mp_obj_str_get_data
+         U mp_raise_ValueError
+00000000 T netutils_format_inet_addr
+00000000 T netutils_format_ipv4_addr
+00000000 T netutils_parse_inet_addr
+00000000 T netutils_parse_ipv4_addr
+
+build/lib/oofatfs/ff.o:
+00000002 t $LCFI0
+00000002 t $LCFI100
+00000002 t $LCFI104
+00000002 t $LCFI108
+00000002 t $LCFI112
+00000002 t $LCFI116
+00000002 t $LCFI12
+00000002 t $LCFI120
+00000002 t $LCFI124
+00000002 t $LCFI128
+00000002 t $LCFI132
+00000002 t $LCFI136
+00000002 t $LCFI140
+00000002 t $LCFI144
+00000002 t $LCFI148
+00000002 t $LCFI15
+00000002 t $LCFI152
+00000002 t $LCFI156
+00000002 t $LCFI160
+00000002 t $LCFI19
+00000002 t $LCFI23
+00000002 t $LCFI27
+00000002 t $LCFI31
+00000002 t $LCFI35
+00000002 t $LCFI39
+00000002 t $LCFI4
+00000004 t $LCFI43
+00000002 t $LCFI45
+00000004 t $LCFI49
+00000002 t $LCFI53
+00000002 t $LCFI57
+00000002 t $LCFI61
+00000002 t $LCFI65
+00000002 t $LCFI69
+00000002 t $LCFI73
+00000002 t $LCFI77
+00000002 t $LCFI8
+00000002 t $LCFI81
+00000002 t $LCFI85
+00000002 t $LCFI89
+00000002 t $LCFI92
+00000002 t $LCFI96
+00000000 t check_fs
+00000000 t chk_chr
+00000000 t clst2sect
+00000000 t create_chain
+00000000 r cst32.6608
+00000000 r cst.6607
+00000000 t dbc_1st
+00000000 t dir_clear
+00000000 t dir_find
+00000000 t dir_next
+00000000 t dir_register
+00000000 t dir_remove
+00000000 t dir_sdi
+         U disk_ioctl
+         U disk_read
+         U disk_write
+00000000 r ExCvt
+00000000 T f_chdir
+00000000 T f_chmod
+00000000 T f_close
+00000000 T f_closedir
+         U ff_oem2uni
+         U ff_uni2oem
+         U ff_wtoupper
+00000000 T f_getcwd
+00000000 T f_getfree
+00000000 t find_volume
+00000000 T f_lseek
+00000000 T f_mkdir
+00000000 T f_mkfs
+00000000 T f_mount
+00000000 t follow_path
+00000000 T f_open
+00000000 T f_opendir
+00000000 T f_read
+00000000 T f_readdir
+00000000 T f_rename
+00000000 b Fsid
+00000000 T f_stat
+00000000 T f_sync
+00000000 T f_truncate
+00000000 T f_umount
+00000000 T f_unlink
+00000000 T f_utime
+00000000 T f_write
+00000000 t get_fat
+         U get_fattime
+00000000 t get_fileinfo
+00000000 t ld_clust
+00000000 t ld_dword
+00000000 t ld_word
+00000000 b LfnBuf
+00000000 r LfnOfs
+         U memcmp
+         U memcpy
+         U memset
+00000000 t move_window
+00000000 t put_fat
+00000000 t remove_chain
+00000000 t st_clust
+00000000 t st_dword
+00000000 t st_word
+00000000 t sum_sfn
+00000000 t sync_fs
+00000000 t sync_window
+00000000 t T.184
+00000000 t validate
+
+build/lib/oofatfs/ffunicode.o:
+00000000 r cvt1.3985
+00000000 r cvt2.3986
+00000000 T ff_oem2uni
+00000000 T ff_uni2oem
+00000000 T ff_wtoupper
+00000000 r uc437
+
+build/gchelper.o:
+00000000 T gc_helper_get_regs_and_sp
+
+build/lib/axtls/ssl/asn1.o:
+00000044 t $L18
+00000038 t $L25
+00000052 t $L28
+000000ae t $L36
+0000014e t $L51
+00000072 t $L54
+00000050 t $L77
+00000084 t $L81
+00000004 t $LCFI0
+00000002 t $LCFI11
+00000002 t $LCFI15
+00000004 t $LCFI19
+00000004 t $LCFI2
+00000002 t $LCFI21
+00000002 t $LCFI25
+00000002 t $LCFI29
+00000002 t $LCFI33
+00000002 t $LCFI37
+00000002 t $LCFI4
+00000002 t $LCFI41
+00000002 t $LCFI45
+00000002 t $LCFI7
+00000000 T asn1_get_big_int
+00000000 T asn1_get_bit_string_as_int
+00000000 T asn1_get_bool
+00000000 T asn1_get_int
+00000000 T asn1_get_private_key
+00000000 t asn1_get_utc_time
+00000000 T asn1_name
+00000000 T asn1_next_obj
+00000000 T asn1_public_key
+00000000 T asn1_signature_type
+00000000 T asn1_skip_obj
+00000000 T asn1_validity
+00000000 T asn1_version
+         U free
+00000000 r g_dn_types
+00000000 T get_asn1_length
+         U g_InterfaceVtbl
+         U malloc
+         U memcmp
+         U memcpy
+         U memset
+         U RNG_custom_init
+         U RSA_priv_key_new
+         U RSA_pub_key_new
+00000000 r sig_oid_prefix
+00000000 r sig_sha1WithRSAEncrypt
+00000000 r sig_sha256
+00000000 r sig_sha384
+00000000 r sig_sha512
+
+build/lib/axtls/ssl/loader.o:
+00000042 t $L14
+00000002 t $LCFI0
+00000002 t $LCFI3
+00000002 t $LCFI7
+         U add_cert
+         U add_private_key
+00000000 r C.8.4285
+         U calloc
+00000000 r default_private_key.4265
+         U free
+00000000 T load_key_certs
+         U malloc
+         U memcpy
+00000000 T ssl_obj_free
+00000000 T ssl_obj_load
+00000000 T ssl_obj_memory_load
+
+build/lib/axtls/ssl/tls1.o:
+000000c4 t $L111
+00000018 t $L163
+0000009e t $L175
+0000029e t $L295
+000000ec t $L35
+00000002 t $LCFI0
+00000002 t $LCFI11
+00000002 t $LCFI14
+00000002 t $LCFI18
+00000002 t $LCFI2
+00000002 t $LCFI22
+0000000a t $LCFI26
+00000002 t $LCFI27
+00000002 t $LCFI31
+0000000a t $LCFI33
+00000002 t $LCFI36
+00000004 t $LCFI40
+00000002 t $LCFI43
+00000002 t $LCFI47
+00000002 t $LCFI51
+00000002 t $LCFI53
+00000002 t $LCFI56
+00000002 t $LCFI6
+00000002 t $LCFI60
+00000002 t $LCFI64
+00000002 t $LCFI68
+00000002 t $LCFI72
+00000002 t $LCFI76
+00000002 t $LCFI79
+00000002 t $LCFI8
+00000002 t $LCFI83
+00000002 t $LCFI87
+00000002 t $LCFI91
+00000002 t $LCFI95
+00000002 t $LCFI99
+00000000 T add_cert
+00000000 t add_hmac_digest
+00000000 T add_packet
+00000000 T add_private_key
+         U AES_cbc_decrypt
+         U AES_cbc_encrypt
+         U AES_convert_key
+         U AES_set_key
+         U asn1_get_private_key
+00000000 r axtls_version.5380
+00000000 T basic_read
+         U calloc
+00000000 r cipher_info
+00000000 r client_finished
+00000000 t crypt_new
+00000000 r CSWTCH.78
+00000000 T disposable_free
+00000000 T disposable_new
+         U do_client_connect
+         U do_clnt_handshake
+         U do_svr_handshake
+00000000 T finished_digest
+         U free
+00000000 r g_chg_cipher_spec_pkt
+00000000 T generate_master_secret
+         U get_random
+00000000 r g_hello_request
+         U g_InterfaceVtbl
+         U hmac_sha256
+         U load_key_certs
+         U malloc
+         U MD5_Final
+         U MD5_Init
+         U MD5_Update
+         U memcmp
+         U memcpy
+         U memset
+         U mp_stream_errno
+         U mp_stream_posix_read
+         U mp_stream_posix_write
+00000000 T process_certificate
+00000000 T process_finished
+         U RNG_initialize
+         U RNG_terminate
+         U RSA_free
+00000000 T send_alert
+00000000 T send_certificate
+00000000 T send_change_cipher_spec
+00000000 T send_finished
+00000000 T send_packet
+00000000 r server_finished
+00000000 t set_key_block
+         U SHA1_Final
+         U SHA1_Init
+         U SHA1_Update
+         U sha256_final
+         U sha256_init
+         U sha256_update
+00000000 T ssl_ctx_free
+00000000 T ssl_ctx_new
+00000000 T ssl_display_error
+00000000 T ssl_ext_free
+00000000 T ssl_ext_new
+00000000 T ssl_find
+00000000 T ssl_free
+00000000 T ssl_get_cipher_id
+00000000 T ssl_get_config
+00000000 T ssl_get_session_id
+00000000 T ssl_get_session_id_size
+00000000 T ssl_handshake_status
+         U ssl_hmac_md5
+         U ssl_hmac_sha1
+00000000 T ssl_new
+00000000 R ssl_prot_prefs
+00000000 T ssl_read
+00000000 T ssl_renegotiate
+00000000 T ssl_version
+00000000 T ssl_write
+         U strcpy
+         U strlen
+00000000 t T.80
+         U x509_free
+         U x509_new
+
+build/lib/axtls/ssl/tls1_svr.o:
+00000002 t $LCFI0
+00000004 t $LCFI4
+00000002 t $LCFI8
+         U disposable_free
+00000000 T do_svr_handshake
+         U generate_master_secret
+         U get_random
+00000000 r g_hello_done
+         U memcpy
+00000000 t process_client_key_xchg
+         U process_finished
+         U RSA_decrypt
+         U send_certificate
+         U send_packet
+         U ssl_new
+         U ssl_prot_prefs
+00000000 T ssl_server_new
+
+build/lib/axtls/ssl/tls1_clnt.o:
+00000204 t $L49
+00000002 t $LCFI0
+00000002 t $LCFI12
+00000002 t $LCFI4
+00000002 t $LCFI8
+         U disposable_free
+         U disposable_new
+00000000 T do_client_connect
+00000000 T do_clnt_handshake
+         U finished_digest
+00000000 r g_asn1_sha256
+         U generate_master_secret
+         U get_random
+         U g_InterfaceVtbl
+00000000 r g_sig_alg
+         U memcpy
+         U process_certificate
+         U process_finished
+         U RSA_encrypt
+         U send_certificate
+         U send_change_cipher_spec
+00000000 t send_client_key_xchg
+         U send_finished
+         U send_packet
+00000000 T ssl_client_new
+         U ssl_new
+         U ssl_prot_prefs
+         U ssl_read
+         U strlen
+         U strncpy
+
+build/lib/axtls/ssl/x509.o:
+000000ce t $L15
+00000002 t $LCFI0
+00000002 t $LCFI4
+         U asn1_name
+         U asn1_next_obj
+         U asn1_public_key
+         U asn1_signature_type
+         U asn1_skip_obj
+         U asn1_validity
+         U asn1_version
+         U calloc
+00000000 r CSWTCH.5
+         U free
+         U RSA_free
+00000000 T x509_display_error
+00000000 T x509_free
+00000000 T x509_new
+
+build/lib/axtls/crypto/aes.o:
+00000002 t $LCFI0
+00000002 t $LCFI11
+00000002 t $LCFI15
+00000002 t $LCFI19
+00000002 t $LCFI3
+00000002 t $LCFI7
+00000000 T AES_cbc_decrypt
+00000000 T AES_cbc_encrypt
+00000000 T AES_convert_key
+00000000 T AES_decrypt
+00000000 T AES_encrypt
+00000000 r aes_isbox
+00000000 r aes_sbox
+00000000 T AES_set_key
+00000000 t AES_xtime
+         U htonl
+         U memcpy
+         U ntohl
+00000000 r Rcon
+
+build/lib/axtls/crypto/bigint.o:
+00000052 t $L35
+00000002 t $LCFI0
+00000002 t $LCFI10
+00000002 t $LCFI13
+00000004 t $LCFI17
+00000002 t $LCFI20
+00000002 t $LCFI23
+00000002 t $LCFI27
+00000002 t $LCFI31
+00000002 t $LCFI35
+0000000e t $LCFI39
+00000002 t $LCFI4
+00000002 t $LCFI43
+00000002 t $LCFI46
+00000002 t $LCFI50
+00000002 t $LCFI54
+00000002 t $LCFI58
+00000002 t $LCFI6
+00000002 t $LCFI62
+00000002 t $LCFI65
+00000002 t $LCFI69
+         U abort_
+00000000 t alloc
+00000000 T bi_add
+00000000 T bi_clear_cache
+00000000 T bi_clone
+00000000 T bi_compare
+00000000 T bi_copy
+00000000 T bi_depermanent
+00000000 T bi_divide
+00000000 T bi_export
+00000000 T bi_free
+00000000 T bi_free_mod
+00000000 T bi_import
+00000000 T bi_initialize
+00000000 t bi_int_multiply
+00000000 T bi_mod_power
+00000000 T bi_multiply
+00000000 T bi_permanent
+00000000 T bi_set_mod
+00000000 T bi_subtract
+00000000 T bi_terminate
+         U calloc
+00000000 t exp_bit_is_one
+         U free
+00000000 T int_to_bi
+         U malloc
+         U memcpy
+         U memset
+00000000 t more_comps
+         U realloc
+00000000 t trim
+         U __udivdi3
+         U __umoddi3
+
+build/lib/axtls/crypto/crypto_misc.o:
+00000002 t $LCFI0
+00000002 t $LCFI4
+00000002 t $LCFI8
+         U AES_cbc_encrypt
+         U AES_set_key
+00000000 b entropy_pool
+00000000 T get_random
+00000000 T get_random_NZ
+         U g_InterfaceVtbl
+         U MD5_Final
+         U MD5_Init
+         U MD5_Update
+         U memcpy
+         U rand_r
+00000000 T RNG_custom_init
+00000000 T RNG_initialize
+00000000 T RNG_terminate
+00000000 R unsupported_str
+
+build/lib/axtls/crypto/hmac.o:
+00000002 t $LCFI0
+00000002 t $LCFI4
+00000002 t $LCFI8
+00000000 T hmac_sha256
+         U MD5_Final
+         U MD5_Init
+         U MD5_Update
+         U memcpy
+         U memset
+         U SHA1_Final
+         U SHA1_Init
+         U SHA1_Update
+         U sha256_final
+         U sha256_init
+         U sha256_update
+00000000 T ssl_hmac_md5
+00000000 T ssl_hmac_sha1
+
+build/lib/axtls/crypto/md5.o:
+00000002 t $LCFI0
+00000002 t $LCFI4
+00000002 t $LCFI8
+00000000 t Encode
+00000000 T MD5_Final
+00000000 T MD5_Init
+00000000 t MD5Transform
+00000000 T MD5_Update
+         U memcpy
+00000000 r PADDING
+00000000 r round1_s.3851
+00000000 r round_ac.3850
+00000000 r round_order.3852
+
+build/lib/axtls/crypto/rsa.o:
+00000002 t $LCFI0
+00000006 t $LCFI10
+00000002 t $LCFI13
+00000002 t $LCFI17
+00000002 t $LCFI2
+00000002 t $LCFI21
+00000002 t $LCFI4
+00000002 t $LCFI8
+         U bi_clear_cache
+         U bi_depermanent
+         U bi_export
+         U bi_free
+         U bi_free_mod
+         U bi_import
+         U bi_initialize
+         U bi_mod_power
+         U bi_permanent
+         U bi_set_mod
+         U bi_terminate
+         U calloc
+         U free
+         U get_random_NZ
+         U memcpy
+         U memset
+00000000 T RSA_decrypt
+00000000 T RSA_encrypt
+00000000 T RSA_free
+00000000 T RSA_private
+00000000 T RSA_priv_key_new
+00000000 T RSA_pub_key_new
+00000000 T RSA_public
+
+build/lib/axtls/crypto/sha1.o:
+00000002 t $LCFI0
+00000002 t $LCFI3
+00000002 t $LCFI7
+         U memset
+00000000 T SHA1_Final
+00000000 T SHA1_Init
+00000000 t SHA1ProcessMessageBlock
+00000000 T SHA1_Update
+
+build/drivers/bus/softspi.o:
+00000002 t $LCFI0
+00000002 t $LCFI4
+         U mp_hal_delay_us_fast
+         U mp_hal_pin_input
+         U mp_hal_pin_output
+         U mp_hal_pin_read
+         U mp_hal_pin_write
+00000000 T mp_soft_spi_ioctl
+00000000 R mp_soft_spi_proto
+00000000 T mp_soft_spi_transfer
+
+../../extmod/crypto-algorithms/sha256.o:
+00000002 t $LCFI0
+00000002 t $LCFI3
+00000002 t $LCFI7
+00000000 r k
+         U memset
+00000000 T sha256_final
+00000000 T sha256_init
+00000000 t sha256_transform
+00000000 T sha256_update

From dec0c829dbee8afd28352ea43f7e139f9418ba52 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sun, 23 Feb 2020 21:00:14 +0100
Subject: [PATCH 3433/3533] Add ssl alias

---
 ports/gprs_a9/mpconfigport.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ports/gprs_a9/mpconfigport.h b/ports/gprs_a9/mpconfigport.h
index 5f8d7cb096c18..f31ee966324ff 100644
--- a/ports/gprs_a9/mpconfigport.h
+++ b/ports/gprs_a9/mpconfigport.h
@@ -210,7 +210,8 @@ extern const struct _mp_obj_module_t st7735_module;
 #if MICROPY_PY_USSL
 #define SSL_BUILTIN_MODULE_WEAK_LINKS    { MP_OBJ_NEW_QSTR(MP_QSTR_ssl), (mp_obj_t)&mp_module_ussl }, \
     { MP_OBJ_NEW_QSTR(MP_QSTR_hashlib), (mp_obj_t)(&mp_module_uhashlib) }, \
-    { MP_OBJ_NEW_QSTR(MP_QSTR_cryptolib), (mp_obj_t)(&mp_module_ucryptolib) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_cryptolib), (mp_obj_t)(&mp_module_ucryptolib) }, \
+    { MP_OBJ_NEW_QSTR(MP_QSTR_ssl), (mp_obj_t)(&mp_module_ussl) },
 #else
 #define SSL_BUILTIN_MODULE_WEAK_LINKS
 #endif

From 1e5e1ad9c0fcecba05f6f3b9f45bd3d7dd2e76f7 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Thu, 13 Feb 2020 18:44:32 +0100
Subject: [PATCH 3434/3533] Attempt fixing #28 by patching csdk elf

---
 ports/gprs_a9/build-libcsdk.sh                  |   9 +++++++++
 .../libcsdk-patches/SW_V2129_csdk.elf.patch     | Bin 0 -> 17773 bytes
 ports/gprs_a9/libcsdk-patches/md5               |   1 +
 3 files changed, 10 insertions(+)
 create mode 100644 ports/gprs_a9/libcsdk-patches/SW_V2129_csdk.elf.patch
 create mode 100644 ports/gprs_a9/libcsdk-patches/md5

diff --git a/ports/gprs_a9/build-libcsdk.sh b/ports/gprs_a9/build-libcsdk.sh
index 92abe0ece0b46..d10111485747c 100755
--- a/ports/gprs_a9/build-libcsdk.sh
+++ b/ports/gprs_a9/build-libcsdk.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 ######################## 1 ################################
 # check path
@@ -19,6 +20,13 @@ fi
 
 ###########################################################
 
+function patch_elf()
+{
+    echo ">> Patching elf"
+    rsync --read-batch=libcsdk-patches/SW_V2129_csdk.elf.patch ../../lib/GPRS_C_SDK/platform/csdk/debug/SW_V2129_csdk.elf
+    md5sum -c --quiet libcsdk-patches/md5
+}
+
 function generate_CSDK_lib()
 {
     echo ">> Generate CSDK lib now"
@@ -38,5 +46,6 @@ function generate_CSDK_lib()
     cd ${curr_path_abs}
 }
 
+patch_elf
 generate_CSDK_lib
 
diff --git a/ports/gprs_a9/libcsdk-patches/SW_V2129_csdk.elf.patch b/ports/gprs_a9/libcsdk-patches/SW_V2129_csdk.elf.patch
new file mode 100644
index 0000000000000000000000000000000000000000..ff157d4a56288c30aaa91face2562bc6674f028e
GIT binary patch
literal 17773
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

literal 0
HcmV?d00001

diff --git a/ports/gprs_a9/libcsdk-patches/md5 b/ports/gprs_a9/libcsdk-patches/md5
new file mode 100644
index 0000000000000..9483d8668efee
--- /dev/null
+++ b/ports/gprs_a9/libcsdk-patches/md5
@@ -0,0 +1 @@
+c744a97cdac8dce5dc2b88b7d4022e22  ../../lib/GPRS_C_SDK/platform/csdk/debug/SW_V2129_csdk.elf

From 1e1047c922cf2ab34078bd8e504d41616f419a38 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Fri, 14 Feb 2020 11:35:54 +0100
Subject: [PATCH 3435/3533] Attempt fixing #28 by patching csdk lod

---
 ports/gprs_a9/build-libcsdk.sh                  |   7 ++++---
 .../libcsdk-patches/SW_V2129_csdk.lod.patch     | Bin 0 -> 12795 bytes
 ports/gprs_a9/libcsdk-patches/md5               |   1 +
 3 files changed, 5 insertions(+), 3 deletions(-)
 create mode 100644 ports/gprs_a9/libcsdk-patches/SW_V2129_csdk.lod.patch

diff --git a/ports/gprs_a9/build-libcsdk.sh b/ports/gprs_a9/build-libcsdk.sh
index d10111485747c..16245aad6fb1d 100755
--- a/ports/gprs_a9/build-libcsdk.sh
+++ b/ports/gprs_a9/build-libcsdk.sh
@@ -20,10 +20,11 @@ fi
 
 ###########################################################
 
-function patch_elf()
+function apply_patches()
 {
-    echo ">> Patching elf"
+    echo ">> Patching platform elf and lod"
     rsync --read-batch=libcsdk-patches/SW_V2129_csdk.elf.patch ../../lib/GPRS_C_SDK/platform/csdk/debug/SW_V2129_csdk.elf
+    rsync --read-batch=libcsdk-patches/SW_V2129_csdk.lod.patch ../../lib/GPRS_C_SDK/platform/csdk/debug/SW_V2129_csdk.lod
     md5sum -c --quiet libcsdk-patches/md5
 }
 
@@ -46,6 +47,6 @@ function generate_CSDK_lib()
     cd ${curr_path_abs}
 }
 
-patch_elf
+apply_patches
 generate_CSDK_lib
 
diff --git a/ports/gprs_a9/libcsdk-patches/SW_V2129_csdk.lod.patch b/ports/gprs_a9/libcsdk-patches/SW_V2129_csdk.lod.patch
new file mode 100644
index 0000000000000000000000000000000000000000..b87d4b3037ca66efe2157f5a78a2351404a4a8d3
GIT binary patch
literal 12795
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

literal 0
HcmV?d00001

diff --git a/ports/gprs_a9/libcsdk-patches/md5 b/ports/gprs_a9/libcsdk-patches/md5
index 9483d8668efee..888efb3dba604 100644
--- a/ports/gprs_a9/libcsdk-patches/md5
+++ b/ports/gprs_a9/libcsdk-patches/md5
@@ -1 +1,2 @@
 c744a97cdac8dce5dc2b88b7d4022e22  ../../lib/GPRS_C_SDK/platform/csdk/debug/SW_V2129_csdk.elf
+00ba911bb6613d300c4b2ffeeeb70528  ../../lib/GPRS_C_SDK/platform/csdk/debug/SW_V2129_csdk.lod

From 6593f389fb985f601f9c26ca09b21758cdf7cda1 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Fri, 14 Feb 2020 23:08:33 +0100
Subject: [PATCH 3436/3533] Add information on contributions

[skip ci]
---
 ports/gprs_a9/CONTRIBUTING.md | 84 +++++++++++++++++++++++++++++++++++
 ports/gprs_a9/README.md       |  4 ++
 2 files changed, 88 insertions(+)
 create mode 100644 ports/gprs_a9/CONTRIBUTING.md

diff --git a/ports/gprs_a9/CONTRIBUTING.md b/ports/gprs_a9/CONTRIBUTING.md
new file mode 100644
index 0000000000000..5c0179f5ef30f
--- /dev/null
+++ b/ports/gprs_a9/CONTRIBUTING.md
@@ -0,0 +1,84 @@
+## Contributing
+
+Useful information for maintaining this port.
+
+### General information
+
+TODO
+
+### Fixing bugs in CSDK
+
+The underlying API (CSDK) is [published](https://github.com/Ai-Thinker-Open/GPRS_C_SDK) ([fork](https://github.com/pulkin/GPRS_C_SDK)) without source code.
+It wraps another level of RDA8955 chip API which can be found in [source codes of the AT firmware](https://github.com/cherryding1/RDA8955_W17.44_IDH?).
+
+API is physically located in [another repo](https://github.com/Ai-Thinker-Open/GPRS-C-SDK-LIB/tree/master) with 2 versions of blobs: [debug](https://github.com/Ai-Thinker-Open/GPRS-C-SDK-LIB/tree/master/debug) and [release](https://github.com/Ai-Thinker-Open/GPRS-C-SDK-LIB/tree/master/release).
+Each version includes 2 files: `SW_V2129_csdk.elf` and `SW_V2129_csdk.lod`.
+The `elf` file is used for linking only: the actual firmware is located in `lod` file.
+
+Following is the procedure used for fixing #28 "Supplying parameters for `cellular.gprs` with one or two characters leads to module halt":
+
+1. Disassemble `SW_V2129_csdk.elf` using `ghidra`.
+   It is important to supply the disassembler proper function signatures which can be found [here](https://github.com/Ai-Thinker-Open/GPRS_C_SDK/blob/master/include/sdk_init.h) (CSDK) and [here](https://github.com/cherryding1/RDA8955_W17.44_IDH/blob/master/soft/platform/service/include/cfw.h) (RDA8995).
+2. Locate functions `Network_StartActive` and `ApiPdpContextToCFWPdpContext`.
+   The issue is inside function `ApiPdpContextToCFWPdpContext`: it copies APN, username and password into a `struct` used by the RDA8955 chip API.
+   However, instructions at addresses `88185a14`, `88185a16`, `88185a18`, and `88185a1a` zero-out first four bytes of the new username string which may have not be allocated if username is one- or two-char string.
+   This might have been caused by the type mismatch: `int * new_user = OS_Malloc(strlen(old_user) + 1); new_user[0] = 0;` (`char` should be instead of `int`).
+3. To fix it, the `sb` (store byte) instruction can be replaced by `nop` (no operation) at last 3 addresses.
+   The same has to be performed at addresses `88185a48`, `88185a4a`, `88185a4c` (password) and `88185a76`, `88185a78`, `88185a7a` (APN).
+   Unfortunately, `ghidra` fails at re-compiling MIPS `elf` files: radare2 can be used instead `r2 -a mips -b 32 -w SW_V2129_csdk.elf`
+4. Finally, the corresponding `SW_V2129_csdk.lod` has to be re-generated.
+   In this simple case `SW_V2129_csdk.lod` can be opened as a text file and searched for signatures such as "c280c281c282c283" (4 buggy operations: the byte order is reversed, newlines have to be adjusted).
+   Afterwards, the checksum has to be fixed: this can be done by running micropython build and copying the checksum from the error message.
+
+#### Disassembly
+
+`elf` is a standard ELF file with MIPS 32-bit arch.
+The `debug` version can be analyzed gracefully by [ghidra](https://ghidra-sre.org/) and, probably, most other decompilers.
+
+*Note: micropython is currently compiled against `debug` version.*
+
+#### Generating `lod` from `elf`
+
+*Note: this is not a working recipe.*
+
+It is possible to produce `lod` from `elf` file by running the following:
+```bash
+cd micropython/lib
+csdtk42-linux/bin/mips-elf-objcopy \
+    --input-target=elf32-littlemips \
+    --output-target=srec \
+    GPRS_C_SDK/platform/csdk/debug/SW_V2129_csdk.elf \
+    GPRS_C_SDK/platform/csdk/debug/SW_V2129_csdk.srec
+csdtk42-linux/bin/srecmap -c \
+    GPRS_C_SDK/platform/compilation/8955_map_cfg \
+    -m rom \
+    -b targetgen \
+    GPRS_C_SDK/platform/csdk/debug/SW_V2129_csdk.srec \
+    GPRS_C_SDK/platform/csdk/debug/SW_V2129 \
+    1>/dev/null
+```
+The file `targetgen` can be extracted by opening `SW_V2129_csdk.lod` in a text editor.
+```
+XCV_MODEL:=xcv_8955
+PA_MODEL:=pasw_rda6625
+FLSH_MODEL:=flsh_spi32m
+FLASH_SIZE:=0x400000
+RAM_SIZE:=0x00265000
+RAM_PHY_SIZE:=0x00400000
+RAM_EXTAPP_SIZE:=0
+FLASH_EXTAPP_SIZE:=0
+CALIB_BASE:=0x3FA000
+FACT_SETTINGS_BASE:=0x3FE000
+CODE_BASE:=0x00000000
+USER_DATA_BASE:=0x00361000
+USER_DATA_SIZE:=0x00099000
+USER_BASE:=0x00240000
+USER_SIZE:=0x00100000
+BOOT_SECTOR:=0x00000000
+PM_MODEL:=pmu_8955
+FM_MODEL:=rdafm_8955
+```
+This produces a file `SW_V2129bcpurom.lod`.
+
+**TODO**: the produced file is different from the original `SW_V2129_csdk.lod`: this procedure has to be refined.
+
diff --git a/ports/gprs_a9/README.md b/ports/gprs_a9/README.md
index 68c21ec6ccf80..5299d8855b127 100644
--- a/ports/gprs_a9/README.md
+++ b/ports/gprs_a9/README.md
@@ -2,6 +2,10 @@
 [![Build Status](https://dev.azure.com/gpulkin/micropython/_apis/build/status/pulkin.micropython?branchName=master)](https://dev.azure.com/gpulkin/micropython/_build/latest?definitionId=1&branchName=master)
 [![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=2RZCNXCUCP4YG&source=url)
 
+## Contribute
+
+See [CONTRIBUTE.md](CONTRIBUTE.md) or use the donate button.
+
 ## The module
 
 ![A9G](https://raw.githubusercontent.com/Ai-Thinker-Open/GPRS_C_SDK/master/doc/assets/pudding_pin.png)

From 22125aab42b775d4c2162e00cbdc8c905bbd4778 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Fri, 14 Feb 2020 23:13:45 +0100
Subject: [PATCH 3437/3533] Fix reference

---
 ports/gprs_a9/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/gprs_a9/README.md b/ports/gprs_a9/README.md
index 5299d8855b127..bbb8d1adfaab3 100644
--- a/ports/gprs_a9/README.md
+++ b/ports/gprs_a9/README.md
@@ -4,7 +4,7 @@
 
 ## Contribute
 
-See [CONTRIBUTE.md](CONTRIBUTE.md) or use the donate button.
+See [CONTRIBUTING.md](CONTRIBUTING.md) or use the donate button.
 
 ## The module
 

From 37b79afb9db28afdc894d5683008b0f1a8de3862 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Mon, 24 Feb 2020 16:30:59 +0100
Subject: [PATCH 3438/3533] Remove unnecessary delay in main loop

---
 ports/gprs_a9/main.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/ports/gprs_a9/main.c b/ports/gprs_a9/main.c
index 2c626c07cd8f9..4f2b13b17978a 100644
--- a/ports/gprs_a9/main.c
+++ b/ports/gprs_a9/main.c
@@ -220,8 +220,6 @@ void MicroPyTask(void *pData) {
                 break;
             }
         }
-        MICROPY_EVENT_POLL_HOOK
-        OS_SleepUs(1);
     }
 
 #if MICROPY_ENABLE_GC
@@ -351,8 +349,8 @@ void EventDispatch(API_Event_t* pEvent)
         // UART
         // ====
         case API_EVENT_ID_UART_RECEIVED:
-            Trace(1,"UART%d received:%d,%s",pEvent->param1,pEvent->param2,pEvent->pParam1);
-            /*if(pEvent->param1 == UART1)
+            /*Trace(1,"UART%d received:%d,%s",pEvent->param1,pEvent->param2,pEvent->pParam1);
+            if(pEvent->param1 == UART1)
             {
                 MicroPy_Event_t* event = (MicroPy_Event_t*)OS_Malloc(sizeof(MicroPy_Event_t));
                 if(!event)

From a60b144dae1722001dfdde9bbc048015f0bb1479 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Mon, 24 Feb 2020 16:32:51 +0100
Subject: [PATCH 3439/3533] fix (some of) uart issues

---
 ports/gprs_a9/uart.c | 4 ++--
 ports/gprs_a9/uart.h | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ports/gprs_a9/uart.c b/ports/gprs_a9/uart.c
index b8619a2256ccb..f17926a28aa66 100644
--- a/ports/gprs_a9/uart.c
+++ b/ports/gprs_a9/uart.c
@@ -65,7 +65,7 @@ UART_Config_t uart_dev[] = {
         .stopBits = UART_STOP_BITS_1,
         .parity = UART_PARITY_NONE,
         .rxCallback = uart_rx_intr_handler,
-        .useEvent = true,
+        .useEvent = false,
     },
     {
         .baudRate = UART_BAUD_RATE_115200,
@@ -73,7 +73,7 @@ UART_Config_t uart_dev[] = {
         .stopBits = UART_STOP_BITS_1,
         .parity = UART_PARITY_NONE,
         .rxCallback = uart_rx_intr_handler,
-        .useEvent = true,
+        .useEvent = false,
     }
 };
 
diff --git a/ports/gprs_a9/uart.h b/ports/gprs_a9/uart.h
index 4a051f345e88a..edd302a9ec70b 100644
--- a/ports/gprs_a9/uart.h
+++ b/ports/gprs_a9/uart.h
@@ -6,7 +6,7 @@
 #include "api_hal_uart.h"
 
 #define UART_NPORTS (2)
-#define UART_STATIC_RXBUF_LEN (256)
+#define UART_STATIC_RXBUF_LEN (2048)
 
 void uart_set_rxbuf(uint8_t uart, uint8_t *buf, int len);
 int uart_get_rxbuf_len(uint8_t uart);

From 2813287dd1062517967493b5fb79f0f1981850d7 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Mon, 24 Feb 2020 19:57:53 +0100
Subject: [PATCH 3440/3533] Fix errno for the internal file system

---
 ports/gprs_a9/file_io.c      |  11 ++--
 ports/gprs_a9/moduos.c       | 117 ++---------------------------------
 ports/gprs_a9/moduos.h       |   1 -
 ports/gprs_a9/ram_pointers.h |  31 ++++++++++
 4 files changed, 42 insertions(+), 118 deletions(-)
 create mode 100644 ports/gprs_a9/ram_pointers.h

diff --git a/ports/gprs_a9/file_io.c b/ports/gprs_a9/file_io.c
index caf14fb30a620..a625ed9b3133a 100644
--- a/ports/gprs_a9/file_io.c
+++ b/ports/gprs_a9/file_io.c
@@ -26,6 +26,7 @@
  * THE SOFTWARE.
  */
 #include "moduos.h"
+#include "ram_pointers.h"
 
 #include <string.h>
 
@@ -56,7 +57,7 @@ STATIC mp_uint_t internal_flash_file_obj_read(mp_obj_t self_in, void *buf, mp_ui
     internal_flash_file_obj_t *self = MP_OBJ_TO_PTR(self_in);
     int32_t ret = API_FS_Read(self->fd, buf, size);
     if (ret < 0) {
-        *errcode = translate_io_errno(ret);
+        *errcode = internal_flash_vfs_errno;
         return MP_STREAM_ERROR;
     }
     return (mp_uint_t) ret;
@@ -69,7 +70,7 @@ STATIC mp_uint_t internal_flash_file_obj_write(mp_obj_t self_in, const void *buf
     internal_flash_file_obj_t *self = MP_OBJ_TO_PTR(self_in);
     int32_t ret = API_FS_Write(self->fd, (uint8_t*) buf, size);
     if (ret < 0) {
-        *errcode = translate_io_errno(ret);
+        *errcode = internal_flash_vfs_errno;
         return MP_STREAM_ERROR;
     }
     if (ret != size) {
@@ -111,7 +112,7 @@ STATIC mp_uint_t internal_flash_file_obj_ioctl(mp_obj_t o_in, mp_uint_t request,
         }
 
         if (ret < 0) {
-            *errcode = translate_io_errno((int) ret);
+            *errcode = internal_flash_vfs_errno;
             return MP_STREAM_ERROR;
         }
 
@@ -121,7 +122,7 @@ STATIC mp_uint_t internal_flash_file_obj_ioctl(mp_obj_t o_in, mp_uint_t request,
     } else if (request == MP_STREAM_FLUSH) {
         uint32_t ret = API_FS_Flush(self->fd);
         if (ret < 0) {
-            *errcode = translate_io_errno(ret);
+            *errcode = internal_flash_vfs_errno;
             return MP_STREAM_ERROR;
         }
         return 0;
@@ -131,7 +132,7 @@ STATIC mp_uint_t internal_flash_file_obj_ioctl(mp_obj_t o_in, mp_uint_t request,
         if (self->fd > 0) {
             int32_t ret = API_FS_Close(self->fd);
             if (ret < 0) {
-                *errcode = translate_io_errno(ret);
+                *errcode = internal_flash_vfs_errno;
                 return MP_STREAM_ERROR;
             } else
                 self->fd = 0;
diff --git a/ports/gprs_a9/moduos.c b/ports/gprs_a9/moduos.c
index e4713b357cfb6..935abaf736151 100644
--- a/ports/gprs_a9/moduos.c
+++ b/ports/gprs_a9/moduos.c
@@ -30,6 +30,7 @@
 
 #include "moduos.h"
 #include "modmachine.h"
+#include "ram_pointers.h"
 
 #include <string.h>
 
@@ -51,115 +52,9 @@
 
 extern const mp_obj_type_t mp_fat_vfs_type;
 
-mp_int_t translate_io_errno(int err) {
-    switch (err) {
-        case ERR_FS_IS_DIRECTORY:
-            return MP_EISDIR;
-        case ERR_FS_NOT_DIRECTORY:
-            return MP_ENOTDIR;
-        case ERR_FS_NO_DIR_ENTRY:
-            return MP_ENOENT;
-        case ERR_FS_OPERATION_NOT_GRANTED:
-            return MP_EIO; // TODO: translate better?
-        case ERR_FS_DIR_NOT_EMPTY:
-            return MP_EBUSY; // TODO: translate better?
-        case ERR_FS_FDS_MAX:
-            return MP_EIO; // TODO: translate better?
-        case ERR_FS_PROCESS_FILE_MAX:
-            return MP_EMFILE;
-        case ERR_FS_FILE_EXIST:
-            return MP_EEXIST;
-        case ERR_FS_NO_BASENAME:
-            return MP_ENOENT;
-        case ERR_FS_BAD_FD:
-            return MP_EBADF;
-        case ERR_FS_NO_MORE_FILES:
-            return MP_ENOENT; // TODO: translate better?
-        case ERR_FS_HAS_MOUNTED:
-            return MP_EEXIST; // TODO: translate better?
-        case ERR_FS_MOUNTED_FS_MAX:
-            return MP_EMFILE;
-        case ERR_FS_UNKNOWN_FILESYSTEM:
-            return MP_EIO;
-        case ERR_FS_INVALID_DIR_ENTRY:
-            return MP_EPERM; // TODO: translate better?
-        case ERR_FS_INVALID_PARAMETER:
-            return MP_EINVAL;
-        case ERR_FS_NOT_SUPPORT:
-            return MP_EIO;
-        case ERR_FS_UNMOUNT_FAILED:
-            return MP_EBUSY;
-        case ERR_FS_NO_MORE_MEMORY:
-            return MP_ENOMEM;
-        case ERR_FS_DEVICE_NOT_REGISTER:
-            return MP_ENXIO;
-        case ERR_FS_DISK_FULL:
-            return MP_ENOSPC;
-        case ERR_FS_NOT_FORMAT:
-            return MP_EIO;
-        case ERR_FS_HAS_FORMATED:
-            return MP_EIO;
-        case ERR_FS_NOT_FIND_SB:
-            return MP_EIO;
-        case ERR_FS_DEVICE_BUSY:
-            return MP_EBUSY;
-        case ERR_FS_OPEN_DEV_FAILED:
-            return MP_EIO;
-        case ERR_FS_ROOT_FULL:
-            return MP_EIO; // TODO: wtf is this?
-        case ERR_FS_ACCESS_REG_FAILED:
-            return MP_EIO; // TODO: poor translation here.
-        case ERR_FS_PATHNAME_PARSE_FAILED:
-            return MP_EINVAL;
-        case ERR_FS_READ_DIR_FAILED:
-            return MP_EIO;
-        case ERR_FS_MOUNT_READ_ROOT_INODE_FAILED:
-            return MP_EIO;
-        case ERR_FS_INVALID_DEV_NUMBER:
-            return MP_ENODEV;
-        case ERR_FS_RENAME_DIFF_PATH:
-            return MP_EISDIR;
-        case ERR_FS_FORMAT_MOUNTING_DEVICE:
-            return MP_EBUSY;
-        case ERR_FS_DATA_DESTROY:
-            return MP_EIO;
-        case ERR_FS_READ_SECTOR_FAILED:
-            return MP_EIO;
-        case ERR_FS_WRITE_SECTOR_FAILED:
-            return MP_EIO;
-        case ERR_FS_READ_FILE_EXCEED:
-            return MP_EIO;
-        case ERR_FS_WRITE_FILE_EXCEED:
-            return MP_EIO;
-        case ERR_FS_FILE_TOO_MORE:
-            return MP_EINVAL;
-        case ERR_FS_FILE_NOT_EXIST:
-            return MP_ENOENT;
-        case ERR_FS_DEVICE_DIFF:
-            return MP_EACCES;
-        case ERR_FS_GET_DEV_INFO_FAILED:
-            return MP_EIO;
-        case ERR_FS_NO_MORE_SB_ITEM:
-            return MP_EIO;
-        case ERR_FS_NOT_MOUNT:
-            return MP_ENXIO;
-        case ERR_FS_NAME_BUFFER_TOO_SHORT:
-            return MP_EINVAL;
-        case ERR_FS_NOT_REGULAR:
-            return MP_EACCES;
-        case ERR_FS_VOLLAB_IS_NULL:
-            return MP_EACCES;
-        default:
-            return 0;
-    }
-}
-
-int maybe_raise_FSError(int errno) {
-    if (errno < -4200000)
-        mp_raise_OSError(translate_io_errno(errno));
-    if (errno < 0)
-        mp_raise_OSError(MP_EIO);
-    return errno;
+int maybe_raise_FSError(int x) {
+    if (x < 0) mp_raise_OSError(internal_flash_vfs_errno);
+    return x;
 }
 
 char path_exists(const char* path) {
@@ -213,9 +108,7 @@ void ensure_exists(const char* path) {
 }
 
 void moduos_init0() {
-    int errno;
-    if ((errno = API_FS_ChangeDir("/")))
-        mp_printf(&mp_plat_print, "Warning: moduos_init0 failed to chdir to /, error code: %d\n", translate_io_errno(errno));
+    API_FS_ChangeDir("/");
 }
 
 STATIC const qstr os_uname_info_fields[] = {
diff --git a/ports/gprs_a9/moduos.h b/ports/gprs_a9/moduos.h
index 77e0b416bdd49..3dd568ec6e09f 100644
--- a/ports/gprs_a9/moduos.h
+++ b/ports/gprs_a9/moduos.h
@@ -37,5 +37,4 @@ mp_obj_t os_dupterm(size_t n_args, const mp_obj_t *args);
 
 MP_DECLARE_CONST_FUN_OBJ_KW(internal_flash_open_obj);
 int maybe_raise_FSError(int errno);
-int translate_io_errno(int errno);
 
diff --git a/ports/gprs_a9/ram_pointers.h b/ports/gprs_a9/ram_pointers.h
new file mode 100644
index 0000000000000..ceb514deacd1a
--- /dev/null
+++ b/ports/gprs_a9/ram_pointers.h
@@ -0,0 +1,31 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * Development of the code in this file was sponsored by Microbric Pty Ltd
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2020 pulkin
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+// This file is a fucking shame and it may work only with a particular SDK version
+#define internal_flash_vfs_errno (*((volatile int *) 0x820a0c14))
+

From ef404847fb5aba0ba5a7ae9e4508be0678374268 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Fri, 28 Feb 2020 22:48:40 +0100
Subject: [PATCH 3441/3533] Typo

---
 ports/gprs_a9/modgps.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/gprs_a9/modgps.c b/ports/gprs_a9/modgps.c
index bb22740ba4df2..904bedeff35f9 100644
--- a/ports/gprs_a9/modgps.c
+++ b/ports/gprs_a9/modgps.c
@@ -204,7 +204,7 @@ STATIC mp_obj_t modgps_time(void) {
 STATIC MP_DEFINE_CONST_FUN_OBJ_0(modgps_time_obj, modgps_time);
 
 STATIC const mp_map_elem_t mp_module_gps_globals_table[] = {
-    { MP_OBJ_NEW_QSTR(MP_QSTR___name__i), MP_OBJ_NEW_QSTR(MP_QSTR_gps) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR___name__), MP_OBJ_NEW_QSTR(MP_QSTR_gps) },
 
     { MP_OBJ_NEW_QSTR(MP_QSTR_GPSError), (mp_obj_t)MP_ROM_PTR(&mp_type_GPSError) },
 

From f2664317f7e1dc36017a355564fbb93ae6704026 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Fri, 28 Feb 2020 22:53:19 +0100
Subject: [PATCH 3442/3533] Remove temp file

---
 ports/gprs_a9/nm.txt | 7852 ------------------------------------------
 1 file changed, 7852 deletions(-)
 delete mode 100644 ports/gprs_a9/nm.txt

diff --git a/ports/gprs_a9/nm.txt b/ports/gprs_a9/nm.txt
deleted file mode 100644
index cfb908fbdd918..0000000000000
--- a/ports/gprs_a9/nm.txt
+++ /dev/null
@@ -1,7852 +0,0 @@
-
-build/py/mpstate.o:
-0000023c C mp_state_ctx
-
-build/py/nlr.o:
-         U mp_state_ctx
-00000000 T nlr_pop
-00000000 T nlr_push_tail
-
-build/py/nlrx86.o:
-
-build/py/nlrx64.o:
-
-build/py/nlrthumb.o:
-
-build/py/nlrxtensa.o:
-
-build/py/nlrsetjmp.o:
-00000002 t $LCFI0
-         U g_InterfaceVtbl
-         U mp_state_ctx
-00000000 T nlr_jump
-         U nlr_jump_fail
-
-build/py/malloc.o:
-00000002 t $LCFI0
-00000002 t $LCFI10
-00000002 t $LCFI12
-00000002 t $LCFI15
-00000004 t $LCFI2
-00000002 t $LCFI4
-00000002 t $LCFI7
-         U gc_alloc
-         U gc_free
-         U gc_realloc
-00000000 T m_free
-00000000 T m_malloc
-00000000 T m_malloc0
-         U m_malloc_fail
-00000000 T m_malloc_maybe
-00000000 T m_malloc_with_finaliser
-00000000 T m_realloc
-00000000 T m_realloc_maybe
-
-build/py/gc.o:
-000000da t $L150
-00000002 t $LCFI0
-00000002 t $LCFI10
-00000002 t $LCFI14
-00000002 t $LCFI16
-00000010 t $LCFI20
-00000004 t $LCFI24
-00000002 t $LCFI28
-00000002 t $LCFI3
-00000002 t $LCFI32
-00000008 t $LCFI36
-00000002 t $LCFI38
-00000002 t $LCFI7
-00000000 T gc_alloc
-         U gc_collect
-00000000 T gc_collect_end
-00000000 T gc_collect_root
-00000000 T gc_collect_start
-00000000 T gc_dump_alloc_table
-00000000 T gc_dump_info
-00000000 T gc_free
-00000000 T gc_info
-00000000 T gc_init
-00000000 T gc_is_locked
-00000000 T gc_lock
-00000000 t gc_mark_subtree
-00000000 T gc_nbytes
-00000000 T gc_realloc
-00000000 T gc_sweep_all
-00000000 T gc_unlock
-         U g_InterfaceVtbl
-         U memcpy
-         U memset
-         U mp_call_function_1_protected
-         U mp_load_method_maybe
-         U mp_plat_print
-         U mp_printf
-         U mp_print_str
-         U mp_sched_lock
-         U mp_sched_unlock
-         U mp_state_ctx
-         U mp_type_array
-         U mp_type_bytearray
-         U mp_type_bytes
-         U mp_type_dict
-         U mp_type_float
-         U mp_type_fun_bc
-         U mp_type_list
-         U mp_type_module
-         U mp_type_str
-         U mp_type_tuple
-
-build/py/pystack.o:
-
-build/py/qstr.o:
-00000002 t $LCFI0
-00000004 t $LCFI13
-00000002 t $LCFI17
-00000002 t $LCFI2
-00000002 t $LCFI21
-00000002 t $LCFI25
-00000002 t $LCFI4
-00000002 t $LCFI6
-00000002 t $LCFI9
-00000000 t find_qstr
-         U gc_nbytes
-         U g_InterfaceVtbl
-         U memcmp
-         U memcpy
-         U m_malloc_fail
-         U m_malloc_maybe
-         U mp_plat_print
-         U mp_printf
-00000000 R mp_qstr_const_pool
-         U mp_qstr_frozen_const_pool
-         U mp_state_ctx
-         U m_realloc_maybe
-00000000 T qstr_compute_hash
-00000000 T qstr_data
-00000000 T qstr_dump_data
-00000000 T qstr_find_strn
-00000000 T qstr_from_str
-00000000 T qstr_from_strn
-00000000 T qstr_hash
-00000000 T qstr_init
-00000000 T qstr_len
-00000000 T qstr_pool_info
-00000000 T qstr_str
-         U strlen
-
-build/py/vstr.o:
-00000002 t $LCFI0
-00000002 t $LCFI10
-00000002 t $LCFI14
-00000002 t $LCFI18
-00000002 t $LCFI2
-00000002 t $LCFI22
-00000002 t $LCFI26
-00000002 t $LCFI29
-00000002 t $LCFI31
-00000002 t $LCFI35
-00000002 t $LCFI38
-00000002 t $LCFI4
-00000002 t $LCFI41
-00000002 t $LCFI44
-00000002 t $LCFI47
-00000002 t $LCFI50
-00000002 t $LCFI54
-00000002 t $LCFI58
-00000002 t $LCFI61
-00000002 t $LCFI65
-00000002 t $LCFI68
-00000002 t $LCFI8
-         U g_InterfaceVtbl
-         U memmove
-         U m_free
-         U m_malloc
-         U mp_raise_msg
-         U mp_type_RuntimeError
-         U mp_vprintf
-         U m_realloc
-         U strlen
-00000000 t T.17
-00000000 T vstr_add_byte
-00000000 T vstr_add_char
-00000000 T vstr_add_len
-00000000 T vstr_add_str
-00000000 T vstr_add_strn
-00000000 T vstr_clear
-00000000 T vstr_cut_head_bytes
-00000000 T vstr_cut_out_bytes
-00000000 T vstr_cut_tail_bytes
-00000000 t vstr_ensure_extra
-00000000 T vstr_extend
-00000000 T vstr_free
-00000000 T vstr_hint_size
-00000000 T vstr_init
-00000000 T vstr_init_fixed_buf
-00000000 T vstr_init_len
-00000000 T vstr_init_print
-00000000 T vstr_ins_byte
-00000000 T vstr_ins_char
-00000000 T vstr_new
-00000000 T vstr_null_terminated_str
-00000000 T vstr_printf
-00000000 T vstr_vprintf
-
-build/py/mpprint.o:
-00000002 t $LCFI0
-00000002 t $LCFI10
-00000002 t $LCFI13
-00000002 t $LCFI17
-00000002 t $LCFI21
-00000002 t $LCFI23
-00000002 t $LCFI4
-00000002 t $LCFI8
-         U g_InterfaceVtbl
-         U m_free
-         U mp_format_float
-         U mp_hal_stdout_tx_strn_cooked
-         U mp_obj_get_int
-         U mp_obj_int_formatted
-         U mp_obj_int_sign
-00000000 R mp_plat_print
-00000000 T mp_printf
-00000000 T mp_print_float
-00000000 t mp_print_int
-00000000 T mp_print_mp_int
-00000000 T mp_print_str
-00000000 T mp_print_strn
-         U mp_type_int
-00000000 T mp_vprintf
-00000000 r pad_spaces
-00000000 r pad_zeroes
-00000000 t plat_print_strn
-         U qstr_data
-         U strlen
-
-build/py/unicode.o:
-00000002 t $LCFI0
-00000002 t $LCFI3
-00000000 r attr
-00000000 T unichar_isalpha
-00000000 T unichar_isdigit
-00000000 T unichar_isident
-00000000 T unichar_islower
-00000000 T unichar_isspace
-00000000 T unichar_isupper
-00000000 T unichar_isxdigit
-00000000 T unichar_tolower
-00000000 T unichar_toupper
-00000000 T unichar_xdigit_value
-00000000 T utf8_charlen
-00000000 T utf8_check
-00000000 T utf8_get_char
-00000000 T utf8_next_char
-00000000 T utf8_ptr_to_index
-
-build/py/mpz.o:
-00000002 t $LCFI0
-00000002 t $LCFI10
-00000002 t $LCFI102
-00000002 t $LCFI105
-00000002 t $LCFI109
-00000002 t $LCFI113
-00000002 t $LCFI117
-00000002 t $LCFI121
-00000002 t $LCFI14
-00000004 t $LCFI18
-00000002 t $LCFI21
-00000002 t $LCFI25
-00000002 t $LCFI29
-00000002 t $LCFI3
-00000002 t $LCFI32
-00000002 t $LCFI34
-00000002 t $LCFI38
-00000002 t $LCFI42
-00000002 t $LCFI46
-00000002 t $LCFI50
-00000002 t $LCFI54
-00000002 t $LCFI58
-00000002 t $LCFI6
-00000004 t $LCFI62
-00000002 t $LCFI66
-00000002 t $LCFI70
-00000002 t $LCFI74
-0000001e t $LCFI78
-00000002 t $LCFI80
-00000002 t $LCFI83
-00000002 t $LCFI87
-00000002 t $LCFI91
-00000002 t $LCFI95
-00000002 t $LCFI99
-         U __adddf3
-         U __ashldi3
-         U __floatsidf
-         U g_InterfaceVtbl
-         U __lshrdi3
-         U memcpy
-         U memset
-         U m_free
-         U m_malloc
-00000000 t mpn_add
-00000000 t mpn_cmp
-00000000 t mpn_remove_trailing_zeros
-00000000 t mpn_shr
-00000000 t mpn_sub
-00000000 t mpn_xor_neg
-00000000 T mpz_abs_inpl
-00000000 T mpz_add_inpl
-00000000 T mpz_and_inpl
-00000000 T mpz_as_bytes
-00000000 T mpz_as_float
-00000000 T mpz_as_int_checked
-00000000 T mpz_as_str_inpl
-00000000 T mpz_as_uint_checked
-00000000 t mpz_clone
-00000000 T mpz_cmp
-00000000 T mpz_deinit
-00000000 T mpz_divmod_inpl
-00000000 t mpz_free
-00000000 T mpz_hash
-00000000 T mpz_init_fixed_from_int
-00000000 T mpz_init_from_int
-00000000 T mpz_init_zero
-00000000 T mpz_mul_inpl
-00000000 t mpz_need_dig
-00000000 T mpz_neg_inpl
-00000000 T mpz_not_inpl
-00000000 T mpz_or_inpl
-00000000 T mpz_pow3_inpl
-00000000 T mpz_pow_inpl
-00000000 T mpz_set
-00000000 T mpz_set_from_bytes
-00000000 T mpz_set_from_float
-00000000 T mpz_set_from_int
-00000000 T mpz_set_from_ll
-00000000 T mpz_set_from_str
-00000000 T mpz_shl_inpl
-00000000 T mpz_shr_inpl
-00000000 T mpz_sub_inpl
-00000000 T mpz_xor_inpl
-         U m_realloc
-         U __muldf3
-         U strlen
-
-build/py/reader.o:
-00000002 t $LCFI0
-00000002 t $LCFI4
-         U m_free
-         U m_malloc
-00000000 t mp_reader_mem_close
-00000000 t mp_reader_mem_readbyte
-00000000 T mp_reader_new_mem
-
-build/py/lexer.o:
-00000002 t $LCFI0
-00000002 t $LCFI10
-00000002 t $LCFI12
-00000002 t $LCFI14
-00000002 t $LCFI17
-00000002 t $LCFI20
-00000002 t $LCFI24
-00000002 t $LCFI28
-00000002 t $LCFI3
-00000002 t $LCFI31
-00000002 t $LCFI6
-00000000 t indent_top
-00000000 t is_char
-00000000 t is_char_and
-00000000 t is_char_following
-00000000 t is_char_or
-00000000 t is_char_or3
-00000000 t is_digit
-00000000 t is_end
-00000000 t is_head_of_identifier
-00000000 t is_letter
-00000000 t is_physical_newline
-00000000 t is_string_or_bytes
-         U m_free
-         U m_malloc
-00000000 T mp_lexer_free
-00000000 T mp_lexer_new
-00000000 T mp_lexer_new_from_file
-00000000 T mp_lexer_new_from_str_len
-00000000 T mp_lexer_to_next
-         U mp_raise_NotImplementedError
-         U mp_reader_new_file
-         U mp_reader_new_mem
-         U mp_state_ctx
-         U m_realloc
-00000000 t next_char
-         U qstr_from_str
-00000000 t skip_whitespace
-         U strcmp
-00000000 r tok_enc_kind
-00000000 r tok_kw
-         U unichar_isalpha
-         U unichar_isdigit
-         U unichar_isspace
-         U unichar_isxdigit
-         U unichar_xdigit_value
-         U vstr_add_byte
-         U vstr_add_char
-         U vstr_clear
-         U vstr_cut_tail_bytes
-         U vstr_init
-         U vstr_null_terminated_str
-
-build/py/parse.o:
-00000412 t $L172
-000002e8 t $L194
-00000002 t $LCFI0
-00000002 t $LCFI10
-00000002 t $LCFI14
-00000002 t $LCFI18
-00000002 t $LCFI22
-00000008 t $LCFI26
-00000002 t $LCFI3
-00000002 t $LCFI30
-00000006 t $LCFI34
-00000002 t $LCFI38
-00000002 t $LCFI7
-00000000 r CSWTCH.98
-         U g_InterfaceVtbl
-00000000 t make_node_const_object
-         U m_free
-         U m_malloc
-         U mp_binary_op
-00000000 r mp_constants_map
-00000000 r mp_constants_table
-         U mp_lexer_free
-         U mp_lexer_to_next
-         U mp_load_method_maybe
-         U mp_map_deinit
-         U mp_map_init
-         U mp_map_lookup
-         U mp_module_uctypes
-         U mp_module_uerrno
-         U mp_obj_exception_add_traceback
-         U mp_obj_int_sign
-         U mp_obj_new_exception_msg
-         U mp_obj_new_str_copy
-00000000 T mp_parse
-00000000 T mp_parse_node_extract_list
-00000000 T mp_parse_node_get_int_maybe
-00000000 T mp_parse_node_is_const_false
-00000000 T mp_parse_node_is_const_true
-00000000 t mp_parse_node_new_small_int_checked
-         U mp_parse_num_decimal
-         U mp_parse_num_integer
-00000000 T mp_parse_tree_clear
-         U mp_type_bytes
-         U mp_type_IndentationError
-         U mp_type_int
-         U mp_type_str
-         U mp_type_SyntaxError
-         U mp_unary_op
-         U m_realloc
-         U m_realloc_maybe
-         U nlr_jump
-00000000 t parser_alloc
-00000000 t peek_result
-00000000 t pop_result
-00000000 t push_result_node
-00000000 t push_result_rule
-00000000 t push_result_token
-00000000 t push_rule
-00000000 t push_rule_from_arg
-         U qstr_find_strn
-         U qstr_from_strn
-         U qstr_str
-00000000 r rule_act_table
-00000000 r rule_arg_combined_table
-00000000 r rule_arg_offset_table
-00000000 r token_to_op.7570
-
-build/py/scope.o:
-00000002 t $LCFI0
-00000002 t $LCFI10
-00000002 t $LCFI13
-00000002 t $LCFI2
-00000002 t $LCFI6
-         U g_InterfaceVtbl
-         U m_free
-         U m_malloc
-         U m_malloc0
-         U mp_emit_glue_new_raw_code
-         U m_realloc
-00000000 T scope_check_to_close_over
-00000000 T scope_find
-00000000 T scope_find_global
-00000000 T scope_find_or_add_id
-00000000 T scope_free
-00000000 T scope_new
-00000000 r scope_simple_name_table
-
-build/py/compile.o:
-00000228 t $L107
-000001d6 t $L132
-00000216 t $L135
-0000004a t $L176
-0000003e t $L195
-00000172 t $L362
-00000166 t $L373
-00000100 t $L423
-0000007e t $L448
-00000082 t $L464
-000000d0 t $L474
-00000166 t $L536
-00000002 t $LCFI0
-00000002 t $LCFI101
-00000002 t $LCFI105
-00000002 t $LCFI109
-00000002 t $LCFI11
-00000002 t $LCFI113
-00000002 t $LCFI117
-00000002 t $LCFI121
-00000002 t $LCFI124
-00000002 t $LCFI128
-00000002 t $LCFI132
-00000002 t $LCFI136
-00000002 t $LCFI14
-00000002 t $LCFI140
-00000002 t $LCFI144
-00000002 t $LCFI148
-00000002 t $LCFI151
-00000002 t $LCFI153
-00000002 t $LCFI157
-00000002 t $LCFI16
-00000002 t $LCFI161
-00000006 t $LCFI163
-00000002 t $LCFI167
-00000002 t $LCFI171
-00000002 t $LCFI174
-00000002 t $LCFI177
-00000002 t $LCFI180
-00000002 t $LCFI184
-00000002 t $LCFI188
-00000002 t $LCFI192
-00000002 t $LCFI196
-00000002 t $LCFI199
-00000002 t $LCFI20
-00000002 t $LCFI203
-00000002 t $LCFI207
-00000002 t $LCFI211
-00000002 t $LCFI215
-00000002 t $LCFI218
-00000002 t $LCFI22
-00000002 t $LCFI221
-00000002 t $LCFI225
-00000002 t $LCFI229
-00000002 t $LCFI233
-00000002 t $LCFI237
-00000002 t $LCFI241
-00000002 t $LCFI245
-00000008 t $LCFI249
-00000002 t $LCFI253
-00000002 t $LCFI257
-00000002 t $LCFI26
-00000002 t $LCFI261
-00000002 t $LCFI265
-00000002 t $LCFI269
-00000002 t $LCFI273
-00000002 t $LCFI28
-00000002 t $LCFI30
-00000002 t $LCFI32
-00000002 t $LCFI34
-00000002 t $LCFI36
-00000002 t $LCFI38
-00000002 t $LCFI4
-00000002 t $LCFI42
-00000002 t $LCFI46
-00000002 t $LCFI50
-00000002 t $LCFI54
-00000002 t $LCFI58
-00000002 t $LCFI6
-00000002 t $LCFI62
-00000002 t $LCFI66
-00000002 t $LCFI69
-00000002 t $LCFI73
-00000002 t $LCFI77
-00000002 t $LCFI8
-00000002 t $LCFI80
-00000002 t $LCFI84
-00000002 t $LCFI86
-00000002 t $LCFI90
-00000002 t $LCFI93
-00000002 t $LCFI97
-00000000 t apply_to_single_or_list
-00000000 t c_assign
-00000000 t c_assign_tuple
-00000000 t c_del_stmt
-00000000 t check_for_doc_string
-00000000 t c_if_cond
-00000000 t close_over_variables_etc
-00000000 t compile_assert_stmt
-00000000 t compile_async_stmt
-00000000 t compile_async_with_stmt_helper
-00000000 t compile_atom_brace
-00000000 t compile_atom_brace_helper
-00000000 t compile_atom_bracket
-00000000 t compile_atom_expr_await
-00000000 t compile_atom_expr_normal
-00000000 t compile_atom_paren
-00000000 t compile_await_object_method
-00000000 t compile_binary_op
-00000000 t compile_break_cont_stmt
-00000000 t compile_classdef
-00000000 t compile_classdef_helper
-00000000 t compile_comparison
-00000000 t compile_comprehension
-00000000 t compile_const_object
-00000000 t compile_decorated
-00000000 t compile_decrease_except_level
-00000000 t compile_delete_id
-00000000 t compile_del_stmt
-00000000 t compile_dictorsetmaker_item
-00000000 t compile_dotted_as_name
-00000000 t compile_error_set_line
-00000000 t compile_expr_stmt
-00000000 t compile_factor_2
-00000000 t compile_for_stmt
-00000000 t compile_funcdef
-00000000 t compile_funcdef_helper
-00000000 t compile_funcdef_lambdef
-00000000 t compile_funcdef_lambdef_param
-00000000 r compile_function
-00000000 t compile_generic_all_nodes
-00000000 t compile_generic_tuple
-00000000 t compile_global_nonlocal_stmt
-00000000 t compile_if_stmt
-00000000 t compile_import_from
-00000000 t compile_import_name
-00000000 t compile_increase_except_level
-00000000 t compile_lambdef
-00000000 t compile_load_id
-00000000 t compile_node
-00000000 t compile_not_test_2
-00000000 t compile_or_and_test
-00000000 t compile_power
-00000000 t compile_raise_stmt
-00000000 t compile_return_stmt
-00000000 t compile_scope
-00000000 t compile_scope_comp_iter
-00000000 t compile_scope_func_lambda_param
-00000000 t compile_scope_func_param
-00000000 t compile_scope_lambda_param
-00000000 t compile_star_expr
-00000000 t compile_store_id
-00000000 t compile_subscript
-00000000 t compile_syntax_error
-00000000 t compile_term
-00000000 t compile_test_if_expr
-00000000 t compile_trailer_bracket
-00000000 t compile_trailer_paren
-00000000 t compile_trailer_paren_helper
-00000000 t compile_trailer_period
-00000000 t compile_try_except
-00000000 t compile_try_finally
-00000000 t compile_try_stmt
-00000000 t compile_while_stmt
-00000000 t compile_with_stmt
-00000000 t compile_with_stmt_helper
-00000000 t compile_yield_expr
-00000000 t compile_yield_from
-00000000 t compile_yield_stmt
-00000000 t comp_next_label
-00000000 r CSWTCH.238
-00000000 r CSWTCH.241
-00000000 t c_tuple
-00000000 t do_import_name
-         U emit_bc_free
-         U emit_bc_new
-         U emit_bc_set_max_num_labels
-         U g_InterfaceVtbl
-         U memcpy
-         U memset
-         U m_malloc
-00000000 T mp_compile
-         U mp_const_none_obj
-         U mp_emit_bc_adjust_stack_size
-         U mp_emit_bc_attr
-         U mp_emit_bc_binary_op
-         U mp_emit_bc_build
-         U mp_emit_bc_call_function
-         U mp_emit_bc_call_method
-         U mp_emit_bc_dup_top
-         U mp_emit_bc_dup_top_two
-         U mp_emit_bc_end_except_handler
-         U mp_emit_bc_end_finally
-         U mp_emit_bc_end_pass
-         U mp_emit_bc_for_iter
-         U mp_emit_bc_for_iter_end
-         U mp_emit_bc_get_iter
-         U mp_emit_bc_import
-         U mp_emit_bc_jump
-         U mp_emit_bc_jump_if_or_pop
-         U mp_emit_bc_label_assign
-         U mp_emit_bc_last_emit_was_return_value
-         U mp_emit_bc_load_build_class
-         U mp_emit_bc_load_const_obj
-         U mp_emit_bc_load_const_small_int
-         U mp_emit_bc_load_const_str
-         U mp_emit_bc_load_const_tok
-         U mp_emit_bc_load_global
-         U mp_emit_bc_load_local
-         U mp_emit_bc_load_method
-         U mp_emit_bc_load_null
-         U mp_emit_bc_make_closure
-         U mp_emit_bc_make_function
-         U mp_emit_bc_method_table_delete_id_ops
-         U mp_emit_bc_method_table_load_id_ops
-         U mp_emit_bc_method_table_store_id_ops
-         U mp_emit_bc_pop_except_jump
-         U mp_emit_bc_pop_jump_if
-         U mp_emit_bc_pop_top
-         U mp_emit_bc_raise_varargs
-         U mp_emit_bc_return_value
-         U mp_emit_bc_rot_three
-         U mp_emit_bc_rot_two
-         U mp_emit_bc_set_source_line
-         U mp_emit_bc_setup_block
-         U mp_emit_bc_start_except_handler
-         U mp_emit_bc_start_pass
-         U mp_emit_bc_store_comp
-         U mp_emit_bc_store_map
-         U mp_emit_bc_subscr
-         U mp_emit_bc_unary_op
-         U mp_emit_bc_unpack_ex
-         U mp_emit_bc_unpack_sequence
-         U mp_emit_bc_unwind_jump
-         U mp_emit_bc_with_cleanup
-         U mp_emit_bc_yield
-         U mp_emit_common_get_id_for_modification
-         U mp_emit_common_id_op
-         U mp_make_function_from_raw_code
-         U mp_obj_exception_add_traceback
-         U mp_obj_new_bytes
-         U mp_obj_new_exception_msg
-         U mp_parse_node_extract_list
-         U mp_parse_node_is_const_false
-         U mp_parse_node_is_const_true
-         U mp_parse_tree_clear
-         U mp_state_ctx
-         U mp_type_SyntaxError
-         U nlr_jump
-         U qstr_data
-         U qstr_from_strn
-         U qstr_len
-         U scope_check_to_close_over
-         U scope_find
-         U scope_find_global
-         U scope_find_or_add_id
-         U scope_free
-         U scope_new
-00000000 t scope_new_and_link
-
-build/py/emitcommon.o:
-00000002 t $LCFI0
-00000002 t $LCFI4
-         U g_InterfaceVtbl
-00000000 T mp_emit_common_get_id_for_modification
-00000000 T mp_emit_common_id_op
-         U scope_find
-         U scope_find_or_add_id
-
-build/py/emitbc.o:
-00000002 t $LCFI0
-00000002 t $LCFI100
-00000004 t $LCFI102
-00000004 t $LCFI104
-00000002 t $LCFI106
-00000002 t $LCFI11
-0000000c t $LCFI110
-00000004 t $LCFI112
-00000004 t $LCFI114
-00000002 t $LCFI116
-00000004 t $LCFI118
-00000002 t $LCFI120
-00000008 t $LCFI122
-00000002 t $LCFI124
-00000002 t $LCFI128
-00000004 t $LCFI13
-00000004 t $LCFI130
-00000002 t $LCFI132
-00000002 t $LCFI134
-00000006 t $LCFI136
-00000002 t $LCFI138
-00000002 t $LCFI140
-00000002 t $LCFI144
-00000002 t $LCFI147
-00000002 t $LCFI149
-00000004 t $LCFI151
-00000004 t $LCFI154
-00000002 t $LCFI157
-00000004 t $LCFI159
-00000002 t $LCFI161
-00000002 t $LCFI163
-00000002 t $LCFI166
-00000002 t $LCFI17
-00000002 t $LCFI170
-00000002 t $LCFI173
-00000002 t $LCFI176
-00000002 t $LCFI178
-00000002 t $LCFI180
-00000002 t $LCFI182
-00000002 t $LCFI186
-00000006 t $LCFI190
-00000002 t $LCFI21
-00000002 t $LCFI24
-00000002 t $LCFI28
-00000002 t $LCFI32
-00000004 t $LCFI36
-00000002 t $LCFI38
-00000002 t $LCFI4
-00000002 t $LCFI42
-00000002 t $LCFI46
-00000002 t $LCFI50
-00000002 t $LCFI54
-00000002 t $LCFI58
-00000002 t $LCFI62
-00000002 t $LCFI64
-00000002 t $LCFI66
-00000002 t $LCFI68
-00000006 t $LCFI70
-00000012 t $LCFI72
-00000002 t $LCFI74
-00000002 t $LCFI76
-0000000a t $LCFI78
-00000002 t $LCFI8
-0000000a t $LCFI80
-00000006 t $LCFI82
-00000002 t $LCFI84
-00000002 t $LCFI86
-00000004 t $LCFI88
-00000002 t $LCFI90
-00000002 t $LCFI92
-00000002 t $LCFI95
-00000002 t $LCFI97
-00000000 t emit_bc_call_function_method_helper
-00000000 T emit_bc_free
-00000000 T emit_bc_new
-00000000 T emit_bc_set_max_num_labels
-00000000 t emit_get_cur_to_write_bytecode
-00000000 t emit_get_cur_to_write_code_info
-00000000 t emit_write_bytecode_byte
-00000000 t emit_write_bytecode_byte_const
-00000000 t emit_write_bytecode_byte_qstr
-00000000 t emit_write_bytecode_byte_raw_code
-00000000 t emit_write_bytecode_byte_signed_label
-00000000 t emit_write_bytecode_byte_uint
-00000000 t emit_write_bytecode_byte_unsigned_label
-00000000 t emit_write_bytecode_raw_byte
-00000000 t emit_write_code_info_byte
-00000000 t emit_write_code_info_qstr
-00000000 t emit_write_code_info_uint
-00000000 t emit_write_uint
-         U g_InterfaceVtbl
-         U memset
-         U m_free
-         U m_malloc
-         U m_malloc0
-         U mp_const_ellipsis_obj
-00000000 T mp_emit_bc_adjust_stack_size
-00000000 T mp_emit_bc_attr
-00000000 T mp_emit_bc_binary_op
-00000000 T mp_emit_bc_build
-00000000 T mp_emit_bc_call_function
-00000000 T mp_emit_bc_call_method
-00000000 T mp_emit_bc_delete_global
-00000000 T mp_emit_bc_delete_local
-00000000 T mp_emit_bc_dup_top
-00000000 T mp_emit_bc_dup_top_two
-00000000 T mp_emit_bc_end_except_handler
-00000000 T mp_emit_bc_end_finally
-00000000 T mp_emit_bc_end_pass
-00000000 T mp_emit_bc_for_iter
-00000000 T mp_emit_bc_for_iter_end
-00000000 T mp_emit_bc_get_iter
-00000000 T mp_emit_bc_import
-00000000 T mp_emit_bc_jump
-00000000 T mp_emit_bc_jump_if_or_pop
-00000000 T mp_emit_bc_label_assign
-00000000 T mp_emit_bc_last_emit_was_return_value
-00000000 T mp_emit_bc_load_build_class
-00000000 T mp_emit_bc_load_const_obj
-00000000 T mp_emit_bc_load_const_small_int
-00000000 T mp_emit_bc_load_const_str
-00000000 T mp_emit_bc_load_const_tok
-00000000 T mp_emit_bc_load_global
-00000000 T mp_emit_bc_load_local
-00000000 T mp_emit_bc_load_method
-00000000 T mp_emit_bc_load_null
-00000000 T mp_emit_bc_make_closure
-00000000 T mp_emit_bc_make_function
-00000000 R mp_emit_bc_method_table_delete_id_ops
-00000000 R mp_emit_bc_method_table_load_id_ops
-00000000 R mp_emit_bc_method_table_store_id_ops
-00000000 T mp_emit_bc_pop_except_jump
-00000000 T mp_emit_bc_pop_jump_if
-00000000 T mp_emit_bc_pop_top
-00000000 T mp_emit_bc_raise_varargs
-00000000 T mp_emit_bc_return_value
-00000000 T mp_emit_bc_rot_three
-00000000 T mp_emit_bc_rot_two
-00000000 T mp_emit_bc_set_source_line
-00000000 T mp_emit_bc_setup_block
-00000000 T mp_emit_bc_start_except_handler
-00000000 T mp_emit_bc_start_pass
-00000000 T mp_emit_bc_store_comp
-00000000 T mp_emit_bc_store_global
-00000000 T mp_emit_bc_store_local
-00000000 T mp_emit_bc_store_map
-00000000 T mp_emit_bc_subscr
-00000000 T mp_emit_bc_unary_op
-00000000 T mp_emit_bc_unpack_ex
-00000000 T mp_emit_bc_unpack_sequence
-00000000 T mp_emit_bc_unwind_jump
-00000000 T mp_emit_bc_with_cleanup
-00000000 T mp_emit_bc_yield
-         U mp_emit_glue_assign_bytecode
-         U mp_state_ctx
-00000000 t T.56
-
-build/py/asmbase.o:
-
-build/py/asmx64.o:
-
-build/py/emitnx64.o:
-
-build/py/asmx86.o:
-
-build/py/emitnx86.o:
-
-build/py/asmthumb.o:
-
-build/py/emitnthumb.o:
-
-build/py/emitinlinethumb.o:
-
-build/py/asmarm.o:
-
-build/py/emitnarm.o:
-
-build/py/asmxtensa.o:
-
-build/py/emitnxtensa.o:
-
-build/py/emitinlinextensa.o:
-
-build/py/formatfloat.o:
-00000002 t $LCFI0
-         U __eqdf2
-         U __fixdfsi
-         U __floatsidf
-         U __gedf2
-         U g_InterfaceVtbl
-00000000 r g_neg_pow
-00000000 r g_pos_pow
-         U __gtdf2
-         U __ledf2
-         U __ltdf2
-00000000 T mp_format_float
-         U __muldf3
-         U __nedf2
-         U __subdf3
-
-build/py/parsenumbase.o:
-00000068 t $L2
-00000002 t $LCFI0
-00000000 T mp_parse_num_base
-
-build/py/parsenum.o:
-00000358 t $L32
-000000da t $L83
-000000ae t $L86
-00000002 t $LCFI0
-00000004 t $LCFI3
-00000002 t $LCFI7
-         U __adddf3
-         U __divdf3
-         U __extendsfdf2
-         U __floatsidf
-         U __floatunsidf
-         U __ltdf2
-         U mp_obj_exception_add_traceback
-         U mp_obj_new_complex
-         U mp_obj_new_exception_msg
-         U mp_obj_new_exception_msg_varg
-         U mp_obj_new_float
-         U mp_obj_new_int_from_str_len
-         U mp_parse_num_base
-00000000 T mp_parse_num_decimal
-00000000 T mp_parse_num_integer
-         U mp_raise_ValueError
-         U mp_small_int_mul_overflow
-         U mp_type_SyntaxError
-         U mp_type_ValueError
-         U __muldf3
-         U nlr_jump
-         U pow
-00000000 t raise_exc
-         U __truncdfsf2
-         U unichar_isspace
-
-build/py/emitglue.o:
-00000002 t $LCFI0
-00000006 t $LCFI4
-00000002 t $LCFI8
-         U g_InterfaceVtbl
-         U m_malloc0
-00000000 T mp_emit_glue_assign_bytecode
-00000000 T mp_emit_glue_new_raw_code
-00000000 T mp_make_closure_from_raw_code
-00000000 T mp_make_function_from_raw_code
-         U mp_obj_new_closure
-         U mp_obj_new_fun_bc
-         U mp_type_dict
-         U mp_type_gen_wrap
-         U mp_type_tuple
-
-build/py/persistentcode.o:
-00000002 t $LCFI0
-00000002 t $LCFI10
-00000002 t $LCFI14
-00000002 t $LCFI18
-00000002 t $LCFI2
-00000002 t $LCFI21
-00000002 t $LCFI24
-00000002 t $LCFI6
-         U g_InterfaceVtbl
-00000000 t load_qstr
-00000000 t load_raw_code
-         U memmove
-         U m_free
-         U m_malloc
-         U mp_const_ellipsis_obj
-         U mp_emit_glue_assign_bytecode
-         U mp_emit_glue_new_raw_code
-         U mp_obj_new_str_from_vstr
-         U mp_opcode_format
-         U mp_parse_num_decimal
-         U mp_parse_num_integer
-         U mp_raise_ValueError
-00000000 T mp_raw_code_load
-00000000 T mp_raw_code_load_file
-00000000 T mp_raw_code_load_mem
-         U mp_reader_new_file
-         U mp_reader_new_mem
-         U mp_type_bytes
-         U mp_type_str
-         U qstr_from_strn
-00000000 t read_byte
-00000000 t read_bytes
-00000000 t read_uint
-         U vstr_init_len
-
-build/py/runtime.o:
-00000016 t $L115
-0000030c t $L320
-0000037a t $L324
-00000232 t $L328
-00000002 t $LCFI0
-00000002 t $LCFI10
-00000002 t $LCFI102
-00000002 t $LCFI106
-0000000a t $LCFI110
-0000000a t $LCFI112
-0000000c t $LCFI114
-0000000c t $LCFI116
-00000002 t $LCFI118
-00000002 t $LCFI12
-00000002 t $LCFI122
-00000002 t $LCFI15
-00000002 t $LCFI17
-00000006 t $LCFI2
-00000002 t $LCFI21
-00000004 t $LCFI24
-00000002 t $LCFI28
-00000002 t $LCFI32
-00000002 t $LCFI36
-00000002 t $LCFI4
-00000002 t $LCFI40
-00000002 t $LCFI44
-00000002 t $LCFI47
-00000002 t $LCFI49
-00000002 t $LCFI53
-00000002 t $LCFI56
-00000002 t $LCFI59
-00000002 t $LCFI6
-00000002 t $LCFI62
-00000002 t $LCFI66
-00000002 t $LCFI68
-00000004 t $LCFI70
-00000002 t $LCFI72
-00000002 t $LCFI76
-00000002 t $LCFI8
-00000002 t $LCFI80
-00000002 t $LCFI84
-00000002 t $LCFI88
-00000004 t $LCFI90
-00000002 t $LCFI94
-00000002 t $LCFI98
-00000000 t checked_fun_call
-         U __divdf3
-         U __floatsidf
-         U gc_is_locked
-         U g_InterfaceVtbl
-         U memcpy
-         U m_free
-         U m_malloc
-00000000 T m_malloc_fail
-00000000 T mp_binary_op
-         U mp_binary_op_method_name
-         U mp_builtin___build_class___obj
-         U mp_builtin___import__
-         U mp_builtin_next_obj
-00000000 T mp_call_function_0
-00000000 T mp_call_function_1
-00000000 T mp_call_function_2
-00000000 T mp_call_function_n_kw
-00000000 T mp_call_method_n_kw
-00000000 T mp_call_method_n_kw_var
-         U mp_compile
-         U mp_const_empty_tuple_obj
-         U mp_const_false_obj
-         U mp_const_none_obj
-         U mp_const_true_obj
-00000000 T mp_convert_member_lookup
-00000000 T mp_deinit
-00000000 T mp_delete_global
-00000000 T mp_delete_name
-00000000 T mp_getiter
-         U mp_identity_getiter
-00000000 T mp_import_all
-00000000 T mp_import_from
-00000000 T mp_import_name
-00000000 T mp_init
-         U mp_init_emergency_exception_buf
-00000000 T mp_iternext
-00000000 T mp_iternext_allow_raise
-00000000 T mp_load_attr
-00000000 T mp_load_build_class
-00000000 T mp_load_global
-00000000 T mp_load_method
-00000000 T mp_load_method_maybe
-00000000 T mp_load_method_protected
-00000000 T mp_load_name
-00000000 T mp_make_raise_obj
-         U mp_map_lookup
-         U mp_module_builtins_globals
-00000000 R mp_module___main__
-         U mp_obj_complex_binary_op
-         U mp_obj_dict_delete
-         U mp_obj_dict_init
-         U mp_obj_dict_len
-         U mp_obj_dict_store
-         U mp_obj_equal
-         U mp_obj_exception_match
-         U mp_obj_float_binary_op
-         U mp_obj_gen_resume
-         U mp_obj_get_array
-         U mp_obj_get_type
-         U mp_obj_get_type_str
-         U mp_obj_is_exception_instance
-         U mp_obj_is_exception_type
-         U mp_obj_is_package
-         U mp_obj_is_subclass_fast
-         U mp_obj_is_true
-         U mp_obj_list_append
-         U mp_obj_list_set_len
-         U mp_obj_new_bound_meth
-         U mp_obj_new_exception
-         U mp_obj_new_exception_arg1
-         U mp_obj_new_exception_msg
-         U mp_obj_new_exception_msg_varg
-         U mp_obj_new_float
-         U mp_obj_new_getitem_iter
-         U mp_obj_new_int
-         U mp_obj_new_int_from_ll
-         U mp_obj_new_list
-         U mp_obj_new_tuple
-         U mp_obj_str_binary_op
-         U mp_obj_str_get_data
-         U mp_obj_str_get_qstr
-         U mp_obj_str_get_str
-         U mp_obj_str_intern_checked
-         U mp_parse
-00000000 T mp_parse_compile_execute
-00000000 T mp_raise_msg
-00000000 T mp_raise_NotImplementedError
-00000000 T mp_raise_OSError
-00000000 T mp_raise_recursion_depth
-00000000 T mp_raise_TypeError
-00000000 T mp_raise_ValueError
-00000000 T mp_resume
-         U mp_small_int_floor_divide
-         U mp_small_int_modulo
-         U mp_small_int_mul_overflow
-         U mp_stack_check
-         U mp_state_ctx
-00000000 T mp_store_attr
-00000000 T mp_store_global
-00000000 T mp_store_name
-         U mp_type_AttributeError
-00000000 r mp_type_checked_fun
-         U mp_type_classmethod
-         U mp_type_complex
-         U mp_type_dict
-         U mp_type_float
-         U mp_type_fun_builtin_0
-         U mp_type_fun_builtin_1
-         U mp_type_fun_builtin_2
-         U mp_type_fun_builtin_3
-         U mp_type_fun_builtin_var
-         U mp_type_GeneratorExit
-         U mp_type_gen_instance
-         U mp_type_ImportError
-         U mp_type_KeyboardInterrupt
-         U mp_type_list
-         U mp_type_MemoryError
-         U mp_type_module
-         U mp_type_NameError
-         U mp_type_NotImplementedError
-         U mp_type_OSError
-         U mp_type_RuntimeError
-         U mp_type_staticmethod
-         U mp_type_StopIteration
-         U mp_type_tuple
-         U mp_type_type
-         U mp_type_TypeError
-         U mp_type_ValueError
-         U mp_type_ZeroDivisionError
-00000000 T mp_unary_op
-         U mp_unary_op_method_name
-00000000 T mp_unpack_ex
-00000000 T mp_unpack_sequence
-         U m_realloc
-         U nlr_jump
-         U nlr_pop
-         U nlr_push_tail
-         U qstr_compute_hash
-         U qstr_data
-         U qstr_from_strn
-         U qstr_hash
-         U qstr_init
-         U qstr_len
-         U qstr_str
-
-build/py/runtime_utils.o:
-00000002 t $LCFI0
-00000002 t $LCFI3
-         U g_InterfaceVtbl
-         U mp_call_function_1
-00000000 T mp_call_function_1_protected
-         U mp_call_function_2
-00000000 T mp_call_function_2_protected
-         U mp_obj_print_exception
-         U mp_plat_print
-         U nlr_pop
-         U nlr_push_tail
-
-build/py/scheduler.o:
-00000002 t $LCFI0
-00000008 t $LCFI2
-         U mp_call_function_1_protected
-00000000 T mp_handle_pending
-00000000 T mp_handle_pending_tail
-00000000 T mp_sched_lock
-00000000 T mp_sched_schedule
-00000000 T mp_sched_unlock
-         U mp_state_ctx
-         U nlr_jump
-
-build/py/nativeglue.o:
-
-build/py/stackctrl.o:
-00000002 t $LCFI0
-00000004 t $LCFI1
-00000002 t $LCFI2
-         U mp_raise_recursion_depth
-00000000 T mp_stack_check
-00000000 T mp_stack_ctrl_init
-00000000 T mp_stack_set_limit
-00000000 T mp_stack_set_top
-00000000 T mp_stack_usage
-         U mp_state_ctx
-
-build/py/argcheck.o:
-00000002 t $LCFI0
-00000002 t $LCFI10
-00000002 t $LCFI2
-00000002 t $LCFI4
-00000002 t $LCFI6
-         U g_InterfaceVtbl
-00000000 T mp_arg_check_num_sig
-00000000 T mp_arg_error_terse_mismatch
-00000000 T mp_arg_error_unimpl_kw
-00000000 T mp_arg_parse_all
-00000000 T mp_arg_parse_all_kw_array
-         U mp_map_init_fixed_table
-         U mp_map_lookup
-         U mp_obj_get_int
-         U mp_obj_is_true
-         U mp_obj_new_exception_msg_varg
-         U mp_raise_NotImplementedError
-         U mp_raise_TypeError
-         U mp_type_TypeError
-         U nlr_jump
-
-build/py/warning.o:
-00000002 t $LCFI0
-00000002 t $LCFI3
-00000000 T mp_emitter_warning
-         U mp_plat_print
-         U mp_print_str
-         U mp_vprintf
-00000000 T mp_warning
-
-build/py/profile.o:
-
-build/py/map.o:
-00000002 t $LCFI0
-00000002 t $LCFI13
-00000002 t $LCFI17
-00000002 t $LCFI20
-00000002 t $LCFI23
-00000002 t $LCFI27
-00000002 t $LCFI3
-00000002 t $LCFI6
-00000002 t $LCFI9
-00000000 t get_hash_alloc_greater_or_equal_to
-         U g_InterfaceVtbl
-00000000 r hash_allocation_sizes
-         U memmove
-         U memset
-         U m_free
-         U m_malloc0
-00000000 R mp_const_empty_map
-00000000 T mp_map_clear
-00000000 T mp_map_deinit
-00000000 T mp_map_init
-00000000 T mp_map_init_fixed_table
-00000000 T mp_map_lookup
-00000000 t mp_map_rehash
-         U mp_obj_equal
-00000000 T mp_set_clear
-00000000 T mp_set_init
-00000000 T mp_set_lookup
-00000000 t mp_set_rehash
-00000000 T mp_set_remove_first
-         U mp_type_str
-         U mp_unary_op
-         U m_realloc
-         U qstr_hash
-
-build/py/obj.o:
-00000002 t $LCFI0
-00000004 t $LCFI12
-00000004 t $LCFI14
-00000004 t $LCFI17
-00000004 t $LCFI20
-00000004 t $LCFI22
-00000002 t $LCFI24
-00000002 t $LCFI28
-00000002 t $LCFI3
-00000002 t $LCFI31
-00000002 t $LCFI35
-00000004 t $LCFI39
-00000002 t $LCFI41
-00000002 t $LCFI43
-00000002 t $LCFI47
-00000004 t $LCFI5
-00000002 t $LCFI50
-00000004 t $LCFI54
-00000002 t $LCFI56
-00000004 t $LCFI59
-00000002 t $LCFI63
-00000004 t $LCFI8
-         U __floatsidf
-         U g_InterfaceVtbl
-         U mp_const_false_obj
-         U mp_const_none_obj
-         U mp_const_true_obj
-00000000 T mp_generic_unary_op
-00000000 T mp_get_buffer
-00000000 T mp_get_buffer_raise
-00000000 T mp_get_index
-00000000 T mp_identity
-00000000 T mp_identity_getiter
-00000000 R mp_identity_obj
-         U mp_obj_complex_get
-00000000 T mp_obj_equal
-         U mp_obj_exception_get_traceback
-         U mp_obj_float_get
-00000000 T mp_obj_get_array
-00000000 T mp_obj_get_array_fixed_n
-00000000 T mp_obj_get_complex
-00000000 T mp_obj_get_float
-00000000 T mp_obj_get_float_maybe
-00000000 T mp_obj_get_int
-00000000 T mp_obj_get_int_maybe
-00000000 T mp_obj_get_int_truncated
-00000000 T mp_obj_get_type
-00000000 T mp_obj_get_type_str
-00000000 T mp_obj_id
-         U mp_obj_instance_call
-         U mp_obj_instance_is_callable
-         U mp_obj_int_as_float_impl
-         U mp_obj_int_get_checked
-         U mp_obj_int_get_truncated
-00000000 T mp_obj_is_callable
-         U mp_obj_is_exception_instance
-00000000 T mp_obj_is_true
-00000000 T mp_obj_len
-00000000 T mp_obj_len_maybe
-         U mp_obj_list_get
-         U mp_obj_new_exception_msg_varg
-         U mp_obj_new_int
-         U mp_obj_new_int_from_uint
-00000000 T mp_obj_print
-00000000 T mp_obj_print_exception
-00000000 T mp_obj_print_helper
-         U mp_obj_str_equal
-00000000 T mp_obj_subscr
-         U mp_obj_tuple_get
-         U mp_printf
-         U mp_print_str
-         U mp_raise_TypeError
-         U mp_stack_check
-         U mp_sys_stdout_print
-         U mp_type_bytes
-         U mp_type_complex
-         U mp_type_float
-         U mp_type_fun_builtin_1
-         U mp_type_IndexError
-         U mp_type_int
-         U mp_type_list
-         U mp_type_str
-         U mp_type_tuple
-         U mp_type_TypeError
-         U mp_type_ValueError
-         U mp_unary_op
-         U mp_warning
-         U nlr_jump
-         U qstr_str
-
-build/py/objarray.o:
-0000006e t $L98
-00000002 t $LCFI0
-00000002 t $LCFI12
-00000002 t $LCFI16
-00000002 t $LCFI20
-00000002 t $LCFI24
-00000008 t $LCFI28
-00000002 t $LCFI32
-00000002 t $LCFI36
-00000004 t $LCFI4
-00000002 t $LCFI40
-00000002 t $LCFI42
-00000002 t $LCFI46
-00000002 t $LCFI50
-00000002 t $LCFI54
-00000004 t $LCFI8
-00000000 t array_append
-00000000 r array_append_obj
-00000000 t array_binary_op
-00000000 t array_construct
-00000000 t array_extend
-00000000 r array_extend_obj
-00000000 t array_get_buffer
-00000000 t array_iterator_new
-00000000 t array_it_iternext
-00000000 r array_it_type
-00000000 r array_locals_dict
-00000000 r array_locals_dict_table
-00000000 t array_make_new
-00000000 t array_new
-00000000 t array_print
-00000000 t array_subscr
-00000000 t array_unary_op
-00000000 t bytearray_make_new
-         U bytes_decode_obj
-         U find_subbytes
-         U g_InterfaceVtbl
-         U memcpy
-         U memmove
-00000000 t memoryview_make_new
-         U memset
-         U m_malloc
-         U mp_arg_check_num_sig
-         U mp_binary_get_size
-         U mp_binary_get_val_array
-         U mp_binary_set_val_array
-         U mp_const_false_obj
-         U mp_const_none_obj
-         U mp_const_true_obj
-         U mp_get_buffer
-         U mp_get_buffer_raise
-         U mp_get_index
-         U mp_getiter
-         U mp_identity_getiter
-         U mp_iternext
-         U mp_obj_get_int
-         U mp_obj_len_maybe
-00000000 T mp_obj_new_bytearray
-00000000 T mp_obj_new_bytearray_by_ref
-00000000 T mp_obj_new_memoryview
-         U mp_obj_print_helper
-         U mp_obj_str_get_str
-         U mp_printf
-         U mp_print_str
-         U mp_raise_NotImplementedError
-         U mp_raise_ValueError
-         U mp_seq_cmp_bytes
-         U mp_seq_get_fast_slice_indexes
-         U mp_str_print_quoted
-00000000 R mp_type_array
-00000000 R mp_type_bytearray
-         U mp_type_bytes
-         U mp_type_dict
-         U mp_type_float
-         U mp_type_fun_builtin_2
-         U mp_type_int
-00000000 R mp_type_memoryview
-         U mp_type_slice
-         U mp_type_type
-         U m_realloc
-
-build/py/objattrtuple.o:
-00000004 t $LCFI0
-00000002 t $LCFI10
-00000002 t $LCFI2
-00000002 t $LCFI6
-         U m_malloc
-00000000 t mp_obj_attrtuple_attr
-00000000 t mp_obj_attrtuple_print
-00000000 T mp_obj_attrtuple_print_helper
-00000000 T mp_obj_new_attrtuple
-         U mp_obj_print_helper
-         U mp_obj_tuple_binary_op
-         U mp_obj_tuple_getiter
-         U mp_obj_tuple_subscr
-         U mp_obj_tuple_unary_op
-         U mp_printf
-         U mp_print_str
-00000000 R mp_type_attrtuple
-         U mp_type_type
-
-build/py/objbool.o:
-00000002 t $LCFI0
-00000002 t $LCFI2
-00000002 t $LCFI4
-00000002 t $LCFI8
-00000000 t bool_binary_op
-00000000 t bool_make_new
-00000000 t bool_print
-00000000 t bool_unary_op
-         U mp_arg_check_num_sig
-         U mp_binary_op
-00000000 R mp_const_false_obj
-00000000 R mp_const_true_obj
-         U mp_obj_is_true
-         U mp_print_str
-00000000 R mp_type_bool
-         U mp_type_type
-         U mp_unary_op
-
-build/py/objboundmeth.o:
-00000002 t $LCFI0
-00000002 t $LCFI10
-00000004 t $LCFI4
-00000002 t $LCFI6
-00000000 t bound_meth_attr
-00000000 t bound_meth_call
-         U memcpy
-         U m_free
-         U m_malloc
-         U m_malloc_maybe
-         U mp_call_function_n_kw
-00000000 T mp_call_method_self_n_kw
-         U mp_load_method_maybe
-00000000 T mp_obj_new_bound_meth
-00000000 r mp_type_bound_meth
-         U mp_type_type
-
-build/py/objcell.o:
-00000002 t $LCFI0
-         U m_malloc
-00000000 T mp_obj_cell_get
-00000000 T mp_obj_cell_set
-00000000 T mp_obj_new_cell
-00000000 r mp_type_cell
-         U mp_type_type
-
-build/py/objclosure.o:
-00000002 t $LCFI0
-00000002 t $LCFI4
-00000000 t closure_call
-00000000 R closure_type
-         U memcpy
-         U m_free
-         U m_malloc
-         U mp_call_function_n_kw
-00000000 T mp_obj_new_closure
-         U mp_type_type
-
-build/py/objcomplex.o:
-000000b2 t $L74
-00000004 t $LCFI0
-00000002 t $LCFI11
-00000002 t $LCFI15
-00000002 t $LCFI19
-00000002 t $LCFI23
-00000002 t $LCFI27
-00000004 t $LCFI4
-00000002 t $LCFI7
-         U __adddf3
-         U atan2
-00000000 t complex_attr
-00000000 t complex_binary_op
-00000000 t complex_make_new
-00000000 t complex_print
-00000000 t complex_unary_op
-         U cos
-         U __divdf3
-         U __eqdf2
-         U exp
-         U __fixdfsi
-         U __gedf2
-         U g_InterfaceVtbl
-         U log
-         U m_malloc
-         U mp_arg_check_num_sig
-         U mp_const_false_obj
-         U mp_const_true_obj
-         U mp_format_float
-00000000 T mp_obj_complex_binary_op
-00000000 T mp_obj_complex_get
-         U mp_obj_get_complex
-         U mp_obj_get_float
-00000000 T mp_obj_new_complex
-         U mp_obj_new_float
-         U mp_obj_str_get_data
-         U mp_parse_num_decimal
-         U mp_printf
-         U mp_print_str
-         U mp_raise_msg
-         U mp_raise_TypeError
-00000000 R mp_type_complex
-         U mp_type_str
-         U mp_type_type
-         U mp_type_ZeroDivisionError
-         U __muldf3
-         U __nedf2
-         U sin
-         U sqrt
-         U __subdf3
-
-build/py/objdeque.o:
-00000002 t $LCFI0
-00000002 t $LCFI2
-00000002 t $LCFI4
-00000000 r deque_append_obj
-00000000 r deque_locals_dict
-00000000 r deque_locals_dict_table
-00000000 t deque_make_new
-00000000 t deque_popleft
-00000000 r deque_popleft_obj
-00000000 t deque_unary_op
-         U m_malloc
-         U m_malloc0
-         U mp_arg_check_num_sig
-         U mp_const_empty_tuple_obj
-         U mp_const_false_obj
-         U mp_const_none_obj
-         U mp_const_true_obj
-00000000 t mp_obj_deque_append
-         U mp_obj_get_int
-         U mp_raise_msg
-         U mp_raise_ValueError
-00000000 R mp_type_deque
-         U mp_type_dict
-         U mp_type_fun_builtin_1
-         U mp_type_fun_builtin_2
-         U mp_type_IndexError
-         U mp_type_type
-
-build/py/objdict.o:
-00000002 t $LCFI0
-00000002 t $LCFI10
-00000002 t $LCFI13
-00000002 t $LCFI17
-00000002 t $LCFI19
-00000002 t $LCFI23
-00000002 t $LCFI27
-00000002 t $LCFI31
-00000002 t $LCFI33
-00000002 t $LCFI35
-00000002 t $LCFI37
-00000002 t $LCFI4
-00000002 t $LCFI40
-00000002 t $LCFI43
-00000002 t $LCFI46
-00000002 t $LCFI50
-00000002 t $LCFI53
-00000002 t $LCFI57
-00000002 t $LCFI59
-00000002 t $LCFI6
-00000002 t $LCFI63
-00000002 t $LCFI65
-00000002 t $LCFI68
-00000002 t $LCFI72
-00000002 t $LCFI76
-00000002 t $LCFI8
-00000000 t dict_binary_op
-00000000 t dict_clear
-00000000 r dict_clear_obj
-00000000 t dict_copy
-00000000 r dict_copy_obj
-00000000 t dict_fromkeys
-00000000 r dict_fromkeys_fun_obj
-00000000 r dict_fromkeys_obj
-00000000 t dict_get
-00000000 t dict_get_helper
-00000000 t dict_getiter
-00000000 r dict_get_obj
-00000000 t dict_items
-00000000 r dict_items_obj
-00000000 t dict_iter_next
-00000000 t dict_keys
-00000000 r dict_keys_obj
-00000000 r dict_locals_dict
-00000000 r dict_locals_dict_table
-00000000 t dict_make_new
-00000000 t dict_pop
-00000000 t dict_popitem
-00000000 r dict_popitem_obj
-00000000 r dict_pop_obj
-00000000 t dict_print
-00000000 t dict_setdefault
-00000000 r dict_setdefault_obj
-00000000 t dict_subscr
-00000000 t dict_unary_op
-00000000 t dict_update
-00000000 r dict_update_obj
-00000000 t dict_values
-00000000 r dict_values_obj
-00000000 t dict_view
-00000000 t dict_view_binary_op
-00000000 t dict_view_getiter
-00000000 t dict_view_it_iternext
-00000000 r dict_view_it_type
-00000000 t dict_view_print
-00000000 r dict_view_type
-         U memcpy
-         U m_malloc
-         U mp_arg_check_num_sig
-         U mp_const_false_obj
-         U mp_const_none_obj
-         U mp_const_true_obj
-00000000 r mp_dict_view_names
-00000000 t mp_ensure_not_fixed
-         U mp_getiter
-         U mp_identity_getiter
-         U mp_iternext
-         U mp_map_clear
-         U mp_map_init
-         U mp_map_init_fixed_table
-         U mp_map_lookup
-00000000 T mp_obj_dict_delete
-00000000 T mp_obj_dict_get
-00000000 T mp_obj_dict_init
-00000000 T mp_obj_dict_len
-00000000 T mp_obj_dict_store
-         U mp_obj_equal
-         U mp_obj_len_maybe
-00000000 T mp_obj_new_dict
-         U mp_obj_new_exception_arg1
-         U mp_obj_new_tuple
-         U mp_obj_print_helper
-         U mp_obj_str_binary_op
-         U mp_op_delitem_obj
-         U mp_op_getitem_obj
-         U mp_op_setitem_obj
-         U mp_printf
-         U mp_print_str
-         U mp_raise_msg
-         U mp_raise_TypeError
-         U mp_raise_ValueError
-         U mp_type_classmethod
-00000000 R mp_type_dict
-         U mp_type_fun_builtin_1
-         U mp_type_fun_builtin_var
-         U mp_type_KeyError
-00000000 R mp_type_ordereddict
-         U mp_type_type
-         U nlr_jump
-
-build/py/objenumerate.o:
-00000004 t $LCFI0
-00000002 t $LCFI3
-00000000 r allowed_args.5941
-00000000 t enumerate_iternext
-00000000 t enumerate_make_new
-         U g_InterfaceVtbl
-         U m_malloc
-         U mp_arg_parse_all_kw_array
-         U mp_getiter
-         U mp_identity_getiter
-         U mp_iternext
-         U mp_obj_new_tuple
-00000000 R mp_type_enumerate
-         U mp_type_type
-
-build/py/objexcept.o:
-00000002 t $LCFI0
-00000004 t $LCFI11
-00000002 t $LCFI13
-00000002 t $LCFI15
-00000002 t $LCFI19
-00000002 t $LCFI23
-00000002 t $LCFI26
-00000002 t $LCFI3
-00000002 t $LCFI30
-00000002 t $LCFI34
-00000002 t $LCFI38
-00000002 t $LCFI42
-00000006 t $LCFI46
-00000002 t $LCFI50
-00000002 t $LCFI7
-00000004 t $LCFI9
-00000000 t exc_add_strn
-         U g_InterfaceVtbl
-         U memcpy
-         U m_free
-         U m_malloc
-         U m_malloc_maybe
-00000000 T mp_alloc_emergency_exception_buf
-         U mp_arg_check_num_sig
-         U mp_const_empty_tuple_obj
-         U mp_const_none_obj
-         U mp_errno_to_str
-00000000 T mp_init_emergency_exception_buf
-00000000 T mp_obj_exception_add_traceback
-00000000 T mp_obj_exception_attr
-00000000 T mp_obj_exception_clear_traceback
-00000000 T mp_obj_exception_get_traceback
-00000000 T mp_obj_exception_get_value
-00000000 T mp_obj_exception_make_new
-00000000 T mp_obj_exception_match
-00000000 T mp_obj_exception_print
-         U mp_obj_get_int
-         U mp_obj_get_type
-00000000 T mp_obj_is_exception_instance
-00000000 T mp_obj_is_exception_type
-         U mp_obj_is_subclass_fast
-00000000 T mp_obj_new_exception
-00000000 T mp_obj_new_exception_arg1
-00000000 T mp_obj_new_exception_args
-00000000 T mp_obj_new_exception_msg
-00000000 T mp_obj_new_exception_msg_varg
-         U mp_obj_print_helper
-         U mp_obj_tuple_print
-         U mp_printf
-         U mp_print_str
-         U mp_state_ctx
-00000000 R mp_type_ArithmeticError
-00000000 R mp_type_AssertionError
-00000000 R mp_type_AttributeError
-00000000 R mp_type_BaseException
-00000000 R mp_type_EOFError
-00000000 R mp_type_Exception
-00000000 R mp_type_GeneratorExit
-00000000 R mp_type_ImportError
-00000000 R mp_type_IndentationError
-00000000 R mp_type_IndexError
-00000000 R mp_type_KeyboardInterrupt
-00000000 R mp_type_KeyError
-00000000 R mp_type_LookupError
-00000000 R mp_type_MemoryError
-00000000 R mp_type_NameError
-00000000 R mp_type_NotImplementedError
-00000000 R mp_type_OSError
-00000000 R mp_type_OverflowError
-00000000 R mp_type_RuntimeError
-00000000 R mp_type_StopAsyncIteration
-00000000 R mp_type_StopIteration
-         U mp_type_str
-00000000 R mp_type_SyntaxError
-00000000 R mp_type_SystemExit
-00000000 R mp_type_TimeoutError
-         U mp_type_tuple
-         U mp_type_type
-00000000 R mp_type_TypeError
-00000000 R mp_type_UnicodeError
-00000000 R mp_type_ValueError
-00000000 R mp_type_ZeroDivisionError
-         U mp_vprintf
-         U m_realloc_maybe
-         U qstr_compute_hash
-         U qstr_str
-         U strlen
-
-build/py/objfilter.o:
-00000002 t $LCFI0
-00000002 t $LCFI3
-00000000 t filter_iternext
-00000000 t filter_make_new
-         U m_malloc
-         U mp_arg_check_num_sig
-         U mp_call_function_n_kw
-         U mp_const_none_obj
-         U mp_getiter
-         U mp_identity_getiter
-         U mp_iternext
-         U mp_obj_is_true
-00000000 R mp_type_filter
-         U mp_type_type
-
-build/py/objfloat.o:
-000000ac t $L85
-00000004 t $LCFI0
-00000002 t $LCFI11
-00000002 t $LCFI15
-00000002 t $LCFI19
-00000002 t $LCFI23
-00000002 t $LCFI27
-00000002 t $LCFI3
-00000002 t $LCFI7
-         U __adddf3
-         U __divdf3
-         U __eqdf2
-         U __fixdfsi
-00000000 t float_binary_op
-00000000 t float_make_new
-00000000 t float_print
-00000000 t float_unary_op
-         U floor
-         U fmod
-         U __gedf2
-         U g_InterfaceVtbl
-         U __gtdf2
-         U __ledf2
-         U __ltdf2
-         U m_malloc
-         U mp_arg_check_num_sig
-         U mp_const_false_obj
-00000000 R mp_const_float_e_obj
-00000000 R mp_const_float_pi_obj
-         U mp_const_true_obj
-         U mp_format_float
-         U mp_get_buffer
-         U mp_obj_complex_binary_op
-00000000 T mp_obj_float_binary_op
-00000000 t mp_obj_float_divmod
-00000000 T mp_obj_float_get
-         U mp_obj_get_float
-         U mp_obj_get_float_maybe
-00000000 T mp_obj_new_float
-         U mp_obj_new_tuple
-         U mp_parse_num_decimal
-         U mp_print_str
-         U mp_raise_msg
-         U mp_type_complex
-00000000 R mp_type_float
-         U mp_type_type
-         U mp_type_ZeroDivisionError
-         U __muldf3
-         U __nedf2
-         U pow
-         U strchr
-         U __subdf3
-
-build/py/objfun.o:
-00000002 t $LCFI0
-00000002 t $LCFI11
-00000004 t $LCFI15
-00000002 t $LCFI19
-00000002 t $LCFI2
-00000008 t $LCFI23
-00000004 t $LCFI25
-00000004 t $LCFI29
-00000004 t $LCFI33
-00000004 t $LCFI37
-00000004 t $LCFI4
-00000002 t $LCFI7
-00000000 t fun_bc_call
-00000000 t fun_bc_print
-00000000 t fun_builtin_0_call
-00000000 t fun_builtin_1_call
-00000000 t fun_builtin_2_call
-00000000 t fun_builtin_3_call
-00000000 t fun_builtin_var_call
-         U g_InterfaceVtbl
-         U memcpy
-         U m_free
-         U m_malloc
-         U m_malloc_maybe
-         U mp_arg_check_num_sig
-         U mp_decode_uint_skip
-         U mp_decode_uint_value
-         U mp_execute_bytecode
-         U mp_generic_unary_op
-         U mp_map_init_fixed_table
-00000000 T mp_obj_code_get_name
-00000000 T mp_obj_fun_bc_attr
-00000000 T mp_obj_fun_get_name
-00000000 T mp_obj_new_fun_bc
-         U mp_printf
-         U mp_setup_code_state
-         U mp_stack_check
-         U mp_state_ctx
-00000000 R mp_type_fun_bc
-00000000 R mp_type_fun_builtin_0
-00000000 R mp_type_fun_builtin_1
-00000000 R mp_type_fun_builtin_2
-00000000 R mp_type_fun_builtin_3
-00000000 R mp_type_fun_builtin_var
-         U mp_type_tuple
-         U mp_type_type
-         U nlr_jump
-00000000 t T.30
-
-build/py/objgenerator.o:
-00000002 t $LCFI0
-00000002 t $LCFI10
-00000002 t $LCFI14
-00000002 t $LCFI17
-00000002 t $LCFI19
-00000002 t $LCFI2
-00000002 t $LCFI21
-00000002 t $LCFI23
-00000002 t $LCFI6
-00000000 t gen_instance_close
-00000000 r gen_instance_close_obj
-00000000 t gen_instance_iternext
-00000000 r gen_instance_locals_dict
-00000000 r gen_instance_locals_dict_table
-00000000 t gen_instance_pend_throw
-00000000 r gen_instance_pend_throw_obj
-00000000 t gen_instance_print
-00000000 t gen_instance_send
-00000000 r gen_instance_send_obj
-00000000 t gen_instance_throw
-00000000 r gen_instance_throw_obj
-00000000 t gen_resume_and_raise
-00000000 t gen_wrap_call
-         U m_malloc
-         U mp_const_empty_tuple_obj
-00000000 R mp_const_GeneratorExit_obj
-         U mp_const_none_obj
-         U mp_decode_uint_skip
-         U mp_decode_uint_value
-         U mp_execute_bytecode
-         U mp_generic_unary_op
-         U mp_identity_getiter
-         U mp_obj_fun_bc_attr
-         U mp_obj_fun_get_name
-00000000 T mp_obj_gen_resume
-         U mp_obj_get_type
-         U mp_obj_is_subclass_fast
-         U mp_obj_new_exception
-         U mp_obj_new_exception_args
-         U mp_obj_new_exception_msg
-         U mp_printf
-         U mp_raise_msg
-         U mp_raise_TypeError
-         U mp_raise_ValueError
-         U mp_setup_code_state
-         U mp_stack_check
-         U mp_state_ctx
-         U mp_type_dict
-         U mp_type_fun_builtin_1
-         U mp_type_fun_builtin_2
-         U mp_type_fun_builtin_var
-         U mp_type_GeneratorExit
-00000000 R mp_type_gen_instance
-00000000 R mp_type_gen_wrap
-         U mp_type_RuntimeError
-         U mp_type_StopIteration
-         U mp_type_type
-         U nlr_jump
-
-build/py/objgetitemiter.o:
-00000002 t $LCFI0
-         U g_InterfaceVtbl
-00000000 t it_iternext
-00000000 r it_type
-         U mp_call_method_n_kw
-         U mp_identity_getiter
-00000000 T mp_obj_new_getitem_iter
-         U mp_type_IndexError
-         U mp_type_StopIteration
-         U mp_type_type
-         U nlr_jump
-         U nlr_pop
-         U nlr_push_tail
-
-build/py/objint.o:
-00000002 t $LCFI0
-00000004 t $LCFI10
-00000002 t $LCFI14
-00000002 t $LCFI18
-00000002 t $LCFI22
-00000002 t $LCFI26
-00000002 t $LCFI4
-00000008 t $LCFI8
-         U __fixdfsi
-         U __fpclassify
-         U g_InterfaceVtbl
-00000000 t int_from_bytes
-00000000 r int_from_bytes_fun_obj
-00000000 r int_from_bytes_obj
-00000000 r int_locals_dict
-00000000 r int_locals_dict_table
-00000000 t int_to_bytes
-00000000 r int_to_bytes_obj
-00000000 r log_base2_floor
-         U memset
-         U m_free
-         U m_malloc
-         U mp_arg_check_num_sig
-         U mp_binary_op
-         U mp_binary_set_int
-         U mp_const_false_obj
-         U mp_const_true_obj
-         U mp_get_buffer_raise
-00000000 T mp_int_format_size
-         U mp_obj_float_get
-         U mp_obj_get_int
-         U mp_obj_int_binary_op
-00000000 T mp_obj_int_binary_op_extra_cases
-00000000 T mp_obj_int_formatted
-         U mp_obj_int_formatted_impl
-         U mp_obj_int_from_bytes_impl
-00000000 t mp_obj_int_make_new
-         U mp_obj_int_new_mpz
-00000000 T mp_obj_int_print
-         U mp_obj_int_to_bytes_impl
-         U mp_obj_int_unary_op
-         U mp_obj_new_exception_msg
-00000000 T mp_obj_new_int_from_float
-         U mp_obj_new_int_from_uint
-         U mp_obj_new_str_from_vstr
-         U mp_obj_str_binary_op
-         U mp_obj_str_get_data
-         U mp_parse_num_integer
-         U mp_print_str
-         U mp_raise_ValueError
-         U mp_type_bytes
-         U mp_type_classmethod
-         U mp_type_dict
-         U mp_type_float
-         U mp_type_fun_builtin_var
-00000000 R mp_type_int
-         U mp_type_list
-         U mp_type_OverflowError
-         U mp_type_tuple
-         U mp_type_type
-         U mp_unary_op
-         U mpz_set_from_float
-         U nlr_jump
-         U strlen
-         U vstr_init_len
-
-build/py/objint_longlong.o:
-
-build/py/objint_mpz.o:
-00000174 t $L81
-00000004 t $LCFI0
-00000004 t $LCFI10
-00000002 t $LCFI14
-00000006 t $LCFI16
-00000002 t $LCFI20
-00000004 t $LCFI24
-00000004 t $LCFI26
-00000004 t $LCFI3
-00000002 t $LCFI30
-00000008 t $LCFI34
-00000004 t $LCFI36
-00000002 t $LCFI40
-00000002 t $LCFI44
-00000002 t $LCFI48
-00000004 t $LCFI5
-00000004 t $LCFI7
-         U __divdf3
-         U g_InterfaceVtbl
-00000000 r maxsize_dig
-         U memset
-         U m_malloc
-         U mp_const_false_obj
-         U mp_const_true_obj
-         U mp_int_format_size
-00000000 R mp_maxsize_obj
-00000000 t mp_mpz_for_int
-         U mp_obj_complex_binary_op
-         U mp_obj_float_binary_op
-00000000 T mp_obj_int_as_float_impl
-00000000 T mp_obj_int_binary_op
-         U mp_obj_int_binary_op_extra_cases
-00000000 T mp_obj_int_formatted_impl
-00000000 T mp_obj_int_from_bytes_impl
-00000000 T mp_obj_int_get_checked
-00000000 T mp_obj_int_get_truncated
-00000000 T mp_obj_int_new_mpz
-00000000 T mp_obj_int_pow3
-00000000 T mp_obj_int_sign
-00000000 T mp_obj_int_to_bytes_impl
-00000000 T mp_obj_int_unary_op
-         U mp_obj_new_float
-00000000 T mp_obj_new_int
-00000000 T mp_obj_new_int_from_ll
-00000000 T mp_obj_new_int_from_str_len
-00000000 T mp_obj_new_int_from_uint
-00000000 T mp_obj_new_int_from_ull
-         U mp_obj_new_tuple
-         U mp_raise_msg
-         U mp_raise_TypeError
-         U mp_raise_ValueError
-         U mp_type_complex
-         U mp_type_float
-         U mp_type_int
-         U mp_type_OverflowError
-         U mp_type_ZeroDivisionError
-         U mpz_abs_inpl
-         U mpz_add_inpl
-         U mpz_and_inpl
-         U mpz_as_bytes
-         U mpz_as_float
-         U mpz_as_int_checked
-         U mpz_as_str_inpl
-         U mpz_cmp
-         U mpz_deinit
-         U mpz_divmod_inpl
-         U mpz_hash
-         U mpz_init_fixed_from_int
-         U mpz_init_from_int
-         U mpz_init_zero
-         U mpz_mul_inpl
-         U mpz_neg_inpl
-         U mpz_not_inpl
-         U mpz_or_inpl
-         U mpz_pow3_inpl
-         U mpz_pow_inpl
-         U mpz_set_from_bytes
-         U mpz_set_from_ll
-         U mpz_set_from_str
-         U mpz_shl_inpl
-         U mpz_shr_inpl
-         U mpz_sub_inpl
-         U mpz_xor_inpl
-
-build/py/objlist.o:
-0000000c t $LCFI0
-00000002 t $LCFI10
-00000002 t $LCFI12
-00000002 t $LCFI15
-00000002 t $LCFI19
-00000002 t $LCFI2
-00000002 t $LCFI23
-00000002 t $LCFI27
-00000004 t $LCFI31
-00000002 t $LCFI35
-00000002 t $LCFI37
-00000002 t $LCFI41
-00000002 t $LCFI44
-00000002 t $LCFI48
-00000002 t $LCFI52
-00000002 t $LCFI54
-00000002 t $LCFI58
-00000002 t $LCFI6
-00000002 t $LCFI62
-00000002 t $LCFI66
-00000002 t $LCFI70
-00000000 r allowed_args.6360
-         U g_InterfaceVtbl
-00000000 r list_append_obj
-00000000 t list_binary_op
-00000000 t list_clear
-00000000 r list_clear_obj
-00000000 t list_copy
-00000000 r list_copy_obj
-00000000 t list_count
-00000000 r list_count_obj
-00000000 t list_extend
-00000000 t list_extend_from_iter
-00000000 r list_extend_obj
-00000000 t list_getiter
-00000000 t list_index
-00000000 r list_index_obj
-00000000 t list_insert
-00000000 r list_insert_obj
-00000000 t list_it_iternext
-00000000 r list_locals_dict
-00000000 r list_locals_dict_table
-00000000 t list_make_new
-00000000 t list_new
-00000000 t list_pop
-00000000 r list_pop_obj
-00000000 t list_print
-00000000 r list_remove_obj
-00000000 t list_reverse
-00000000 r list_reverse_obj
-00000000 r list_sort_obj
-00000000 t list_subscr
-00000000 t list_unary_op
-         U memcpy
-         U memmove
-         U memset
-         U m_malloc
-         U mp_arg_check_num_sig
-         U mp_arg_parse_all
-         U mp_binary_op
-         U mp_call_function_1
-         U mp_const_false_obj
-         U mp_const_none_obj
-         U mp_const_true_obj
-         U mp_get_index
-         U mp_getiter
-         U mp_iternext
-         U mp_obj_get_array
-         U mp_obj_get_int_maybe
-00000000 T mp_obj_list_append
-00000000 T mp_obj_list_get
-00000000 T mp_obj_list_init
-00000000 T mp_obj_list_remove
-00000000 T mp_obj_list_set_len
-00000000 T mp_obj_list_sort
-00000000 T mp_obj_list_store
-00000000 T mp_obj_new_list
-         U mp_obj_print_helper
-         U mp_print_str
-00000000 t mp_quicksort
-         U mp_raise_msg
-         U mp_raise_NotImplementedError
-         U mp_seq_cmp_objs
-         U mp_seq_count_obj
-         U mp_seq_extract_slice
-         U mp_seq_get_fast_slice_indexes
-         U mp_seq_index_obj
-         U mp_seq_multiply
-         U mp_stack_check
-         U mp_type_dict
-         U mp_type_fun_builtin_1
-         U mp_type_fun_builtin_2
-         U mp_type_fun_builtin_3
-         U mp_type_fun_builtin_var
-         U mp_type_IndexError
-00000000 R mp_type_list
-         U mp_type_polymorph_iter
-         U mp_type_slice
-         U mp_type_type
-         U m_realloc
-
-build/py/objmap.o:
-00000002 t $LCFI0
-00000002 t $LCFI4
-00000000 t map_iternext
-00000000 t map_make_new
-         U m_free
-         U m_malloc
-         U mp_arg_check_num_sig
-         U mp_call_function_n_kw
-         U mp_getiter
-         U mp_identity_getiter
-         U mp_iternext
-00000000 R mp_type_map
-         U mp_type_type
-
-build/py/objmodule.o:
-00000002 t $LCFI0
-00000002 t $LCFI11
-00000002 t $LCFI15
-00000002 t $LCFI19
-00000002 t $LCFI3
-00000002 t $LCFI7
-         U cellular_module
-         U chip_module
-         U gps_module
-         U i2c_module
-         U m_malloc
-00000000 t module_attr
-00000000 t module_print
-00000000 R mp_builtin_module_map
-00000000 r mp_builtin_module_table
-00000000 R mp_builtin_module_weak_links_map
-00000000 r mp_builtin_module_weak_links_table
-         U mp_call_method_n_kw
-         U mp_load_method_maybe
-         U mp_map_lookup
-         U mp_module_array
-         U mp_module_builtins
-         U mp_module_builtins_globals
-00000000 T mp_module_call_init
-         U mp_module_cmath
-         U mp_module_collections
-         U mp_module_framebuf
-         U mp_module_gc
-00000000 T mp_module_get
-         U mp_module_io
-         U mp_module_machine
-         U mp_module___main__
-         U mp_module_math
-         U mp_module_micropython
-00000000 T mp_module_register
-         U mp_module_sys
-         U mp_module_ubinascii
-         U mp_module_uctypes
-         U mp_module_uerrno
-         U mp_module_uhashlib
-         U mp_module_uheapq
-         U mp_module_ujson
-         U mp_module_urandom
-         U mp_module_ure
-         U mp_module_uselect
-         U mp_module_ussl
-         U mp_module_ustruct
-         U mp_module_utimeq
-         U mp_module_uzlib
-         U mp_obj_dict_delete
-         U mp_obj_dict_store
-         U mp_obj_new_dict
-00000000 T mp_obj_new_module
-         U mp_obj_str_get_str
-         U mp_printf
-         U mp_state_ctx
-00000000 R mp_type_module
-         U mp_type_type
-         U st7735_module
-         U uos_module
-         U usocket_module
-         U utime_module
-
-build/py/objobject.o:
-00000004 t $LCFI0
-00000002 t $LCFI2
-         U m_malloc
-         U mp_arg_check_num_sig
-         U mp_const_none_obj
-         U mp_obj_instance_make_new
-         U mp_obj_new_instance
-         U mp_raise_TypeError
-         U mp_type_dict
-         U mp_type_fun_builtin_1
-00000000 R mp_type_object
-         U mp_type_staticmethod
-         U mp_type_type
-00000000 t object___init__
-00000000 r object___init___obj
-00000000 r object_locals_dict
-00000000 r object_locals_dict_table
-00000000 t object_make_new
-00000000 t object___new__
-00000000 r object___new___fun_obj
-00000000 r object___new___obj
-
-build/py/objpolyiter.o:
-00000002 t $LCFI0
-         U mp_identity_getiter
-00000000 R mp_type_polymorph_iter
-         U mp_type_type
-00000000 t polymorph_it_iternext
-
-build/py/objproperty.o:
-00000002 t $LCFI0
-00000002 t $LCFI12
-00000002 t $LCFI4
-00000002 t $LCFI8
-00000000 r allowed_args.5943
-         U memcpy
-         U m_malloc
-         U mp_arg_parse_all_kw_array
-         U mp_const_none_obj
-00000000 T mp_obj_property_get
-         U mp_type_dict
-         U mp_type_fun_builtin_2
-00000000 R mp_type_property
-         U mp_type_type
-00000000 t property_deleter
-00000000 r property_deleter_obj
-00000000 t property_getter
-00000000 r property_getter_obj
-00000000 r property_locals_dict
-00000000 r property_locals_dict_table
-00000000 t property_make_new
-00000000 t property_setter
-00000000 r property_setter_obj
-
-build/py/objnone.o:
-00000002 t $LCFI0
-00000000 R mp_const_none_obj
-         U mp_generic_unary_op
-         U mp_print_str
-00000000 R mp_type_NoneType
-         U mp_type_type
-00000000 t none_print
-
-build/py/objnamedtuple.o:
-00000004 t $LCFI0
-00000002 t $LCFI12
-00000002 t $LCFI16
-00000002 t $LCFI4
-00000002 t $LCFI8
-         U memcpy
-         U memset
-         U m_malloc
-00000000 R mp_namedtuple_obj
-         U mp_obj_attrtuple_print_helper
-         U mp_obj_get_array
-00000000 T mp_obj_namedtuple_find_field
-         U mp_obj_new_exception_msg_varg
-00000000 T mp_obj_new_namedtuple_base
-         U mp_obj_new_tuple
-         U mp_obj_str_get_qstr
-         U mp_obj_str_split
-         U mp_obj_tuple_binary_op
-         U mp_obj_tuple_getiter
-         U mp_obj_tuple_subscr
-         U mp_obj_tuple_unary_op
-         U mp_printf
-         U mp_raise_msg
-         U mp_type_AttributeError
-         U mp_type_fun_builtin_2
-         U mp_type_str
-         U mp_type_tuple
-         U mp_type_type
-         U mp_type_TypeError
-00000000 t namedtuple_attr
-00000000 t namedtuple_make_new
-00000000 t namedtuple_print
-00000000 t new_namedtuple_type
-         U nlr_jump
-
-build/py/objrange.o:
-00000002 t $LCFI0
-00000002 t $LCFI10
-00000002 t $LCFI14
-00000002 t $LCFI3
-00000004 t $LCFI7
-         U m_malloc
-         U mp_arg_check_num_sig
-         U mp_const_false_obj
-         U mp_const_true_obj
-         U mp_get_index
-         U mp_identity_getiter
-         U mp_obj_get_int
-         U mp_obj_new_int
-         U mp_printf
-         U mp_print_str
-         U mp_raise_ValueError
-         U mp_seq_get_fast_slice_indexes
-00000000 R mp_type_range
-         U mp_type_slice
-         U mp_type_type
-00000000 t range_attr
-00000000 t range_getiter
-00000000 t range_it_iternext
-00000000 r range_it_type
-00000000 t range_len
-00000000 t range_make_new
-00000000 t range_print
-00000000 t range_subscr
-00000000 t range_unary_op
-
-build/py/objreversed.o:
-00000002 t $LCFI0
-00000002 t $LCFI2
-         U m_malloc
-         U mp_arg_check_num_sig
-         U mp_call_method_n_kw
-         U mp_identity_getiter
-         U mp_load_method_maybe
-         U mp_obj_get_int
-         U mp_obj_len
-         U mp_obj_subscr
-00000000 R mp_type_reversed
-         U mp_type_type
-00000000 t reversed_iternext
-00000000 t reversed_make_new
-
-build/py/objset.o:
-00000002 t $LCFI0
-00000002 t $LCFI10
-00000002 t $LCFI14
-00000002 t $LCFI18
-00000002 t $LCFI2
-00000002 t $LCFI22
-00000002 t $LCFI25
-00000002 t $LCFI27
-00000002 t $LCFI31
-00000002 t $LCFI35
-00000002 t $LCFI37
-00000002 t $LCFI4
-00000004 t $LCFI40
-00000002 t $LCFI44
-00000002 t $LCFI46
-00000002 t $LCFI48
-00000002 t $LCFI50
-00000002 t $LCFI54
-00000002 t $LCFI56
-00000002 t $LCFI58
-00000002 t $LCFI6
-00000002 t $LCFI62
-00000002 t $LCFI66
-00000004 t $LCFI70
-00000002 t $LCFI72
-00000002 t $LCFI74
-00000004 t $LCFI78
-00000000 r frozenset_locals_dict
-00000000 r frozenset_locals_dict_table
-00000000 t is_set_or_frozenset
-         U memcpy
-         U m_free
-         U m_malloc
-         U mp_arg_check_num_sig
-         U mp_const_false_obj
-         U mp_const_none_obj
-         U mp_const_true_obj
-         U mp_getiter
-         U mp_iternext
-         U mp_obj_new_exception_arg1
-00000000 T mp_obj_new_set
-         U mp_obj_print_helper
-00000000 T mp_obj_set_store
-         U mp_op_contains_obj
-         U mp_print_str
-         U mp_raise_msg
-         U mp_set_clear
-         U mp_set_init
-         U mp_set_lookup
-         U mp_set_remove_first
-         U mp_type_dict
-00000000 R mp_type_frozenset
-         U mp_type_fun_builtin_1
-         U mp_type_fun_builtin_2
-         U mp_type_fun_builtin_var
-         U mp_type_KeyError
-         U mp_type_polymorph_iter
-00000000 R mp_type_set
-         U mp_type_type
-         U mp_unary_op
-         U nlr_jump
-00000000 t set_add
-00000000 r set_add_obj
-00000000 t set_binary_op
-00000000 t set_clear
-00000000 r set_clear_obj
-00000000 t set_copy
-00000000 r set_copy_obj
-00000000 t set_diff
-00000000 t set_diff_int
-00000000 r set_diff_obj
-00000000 t set_diff_update
-00000000 r set_diff_update_obj
-00000000 t set_discard
-00000000 r set_discard_obj
-00000000 t set_getiter
-00000000 t set_intersect
-00000000 t set_intersect_int
-00000000 r set_intersect_obj
-00000000 t set_intersect_update
-00000000 r set_intersect_update_obj
-00000000 t set_isdisjoint
-00000000 r set_isdisjoint_obj
-00000000 t set_issubset
-00000000 t set_issubset_internal
-00000000 r set_issubset_obj
-00000000 t set_issuperset
-00000000 r set_issuperset_obj
-00000000 t set_it_iternext
-00000000 r set_locals_dict
-00000000 r set_locals_dict_table
-00000000 t set_make_new
-00000000 t set_pop
-00000000 r set_pop_obj
-00000000 t set_print
-00000000 t set_remove
-00000000 r set_remove_obj
-00000000 t set_symmetric_difference
-00000000 r set_symmetric_difference_obj
-00000000 t set_symmetric_difference_update
-00000000 r set_symmetric_difference_update_obj
-00000000 t set_unary_op
-00000000 t set_union
-00000000 r set_union_obj
-00000000 t set_update
-00000000 t set_update_int
-00000000 r set_update_obj
-
-build/py/objsingleton.o:
-00000002 t $LCFI0
-00000000 R mp_const_ellipsis_obj
-00000000 R mp_const_notimplemented_obj
-         U mp_printf
-00000000 R mp_type_singleton
-         U mp_type_type
-00000000 t singleton_print
-
-build/py/objslice.o:
-00000004 t $LCFI0
-00000002 t $LCFI4
-00000002 t $LCFI8
-         U g_InterfaceVtbl
-         U m_malloc
-00000000 T mp_obj_new_slice
-         U mp_obj_print_helper
-00000000 T mp_obj_slice_get
-         U mp_print_str
-00000000 R mp_type_slice
-         U mp_type_type
-00000000 t slice_attr
-00000000 t slice_print
-
-build/py/objstr.o:
-000000c6 t $L224
-0000010a t $L410
-000001ec t $L692
-00000002 t $LCFI0
-00000004 t $LCFI102
-00000002 t $LCFI104
-00000002 t $LCFI106
-00000004 t $LCFI110
-00000004 t $LCFI112
-00000004 t $LCFI114
-00000002 t $LCFI116
-00000002 t $LCFI120
-00000002 t $LCFI124
-00000002 t $LCFI128
-00000004 t $LCFI13
-00000002 t $LCFI132
-00000002 t $LCFI136
-00000006 t $LCFI138
-00000002 t $LCFI142
-00000002 t $LCFI144
-00000002 t $LCFI146
-00000006 t $LCFI150
-00000002 t $LCFI154
-00000002 t $LCFI158
-00000002 t $LCFI160
-00000002 t $LCFI164
-00000002 t $LCFI168
-00000006 t $LCFI17
-00000002 t $LCFI172
-00000002 t $LCFI176
-00000006 t $LCFI21
-00000002 t $LCFI25
-00000002 t $LCFI27
-00000002 t $LCFI29
-00000002 t $LCFI3
-00000002 t $LCFI31
-00000002 t $LCFI33
-00000002 t $LCFI35
-00000006 t $LCFI37
-00000006 t $LCFI40
-00000002 t $LCFI42
-00000002 t $LCFI46
-00000008 t $LCFI50
-00000002 t $LCFI54
-00000002 t $LCFI58
-00000002 t $LCFI6
-00000004 t $LCFI62
-00000004 t $LCFI66
-00000004 t $LCFI68
-00000004 t $LCFI70
-00000002 t $LCFI72
-00000008 t $LCFI74
-00000002 t $LCFI76
-00000002 t $LCFI78
-00000006 t $LCFI80
-00000002 t $LCFI82
-00000004 t $LCFI86
-00000002 t $LCFI88
-00000002 t $LCFI9
-00000008 t $LCFI92
-00000002 t $LCFI94
-00000002 t $LCFI98
-00000000 r allowed_args.6676
-00000000 t arg_looks_integer
-00000000 t arg_looks_numeric
-00000000 t bad_implicit_conversion
-00000000 t bytes_decode
-00000000 R bytes_decode_obj
-00000000 t bytes_it_iternext
-00000000 t bytes_make_new
-00000000 t bytes_subscr
-00000000 T find_subbytes
-         U g_InterfaceVtbl
-00000000 t isalignment
-         U memcmp
-         U memcpy
-         U memmove
-         U memset
-         U m_malloc
-         U mp_arg_check_num_sig
-         U mp_arg_error_unimpl_kw
-         U mp_arg_parse_all
-00000000 R mp_const_empty_bytes_obj
-         U mp_const_false_obj
-         U mp_const_none_obj
-         U mp_const_true_obj
-         U mp_get_buffer
-         U mp_get_buffer_raise
-         U mp_get_index
-         U mp_getiter
-         U mp_iternext
-         U mp_map_lookup
-         U mp_obj_dict_get
-         U mp_obj_float_get
-         U mp_obj_get_array
-         U mp_obj_get_float
-         U mp_obj_get_int
-         U mp_obj_get_int_maybe
-         U mp_obj_get_type
-         U mp_obj_get_type_str
-         U mp_obj_len_maybe
-         U mp_obj_list_append
-00000000 T mp_obj_new_bytes
-00000000 t mp_obj_new_bytes_iterator
-         U mp_obj_new_exception_arg1
-         U mp_obj_new_exception_msg_varg
-         U mp_obj_new_int_from_float
-         U mp_obj_new_list
-00000000 T mp_obj_new_str
-00000000 T mp_obj_new_str_copy
-00000000 T mp_obj_new_str_from_vstr
-00000000 T mp_obj_new_str_of_type
-00000000 T mp_obj_new_str_via_qstr
-         U mp_obj_new_tuple
-         U mp_obj_print_helper
-00000000 T mp_obj_str_binary_op
-00000000 T mp_obj_str_equal
-00000000 T mp_obj_str_format
-00000000 t mp_obj_str_format_helper
-00000000 T mp_obj_str_get_buffer
-00000000 T mp_obj_str_get_data
-00000000 T mp_obj_str_get_qstr
-00000000 T mp_obj_str_get_str
-00000000 T mp_obj_str_intern
-00000000 T mp_obj_str_intern_checked
-00000000 T mp_obj_str_make_new
-00000000 T mp_obj_str_split
-         U mp_obj_tuple_get
-         U mp_printf
-         U mp_print_float
-         U mp_print_mp_int
-         U mp_print_str
-         U mp_print_strn
-         U mp_raise_msg
-         U mp_raise_NotImplementedError
-         U mp_raise_TypeError
-         U mp_raise_ValueError
-         U mp_seq_cmp_bytes
-         U mp_seq_get_fast_slice_indexes
-         U mp_seq_multiply
-         U mp_stack_check
-00000000 T mp_str_print_json
-00000000 T mp_str_print_quoted
-         U mp_type_bool
-00000000 R mp_type_bytes
-         U mp_type_dict
-         U mp_type_float
-         U mp_type_fun_builtin_1
-         U mp_type_fun_builtin_2
-         U mp_type_fun_builtin_var
-         U mp_type_IndexError
-         U mp_type_int
-         U mp_type_KeyError
-         U mp_type_list
-         U mp_type_polymorph_iter
-         U mp_type_slice
-         U mp_type_str
-         U mp_type_tuple
-         U mp_type_type
-         U mp_type_TypeError
-         U mp_type_UnicodeError
-         U mp_type_ValueError
-         U m_realloc
-         U __muldf3
-         U nlr_jump
-         U qstr_compute_hash
-         U qstr_data
-         U qstr_find_strn
-         U qstr_from_strn
-         U qstr_hash
-         U qstr_len
-00000000 r str8_locals_dict
-00000000 r str8_locals_dict_table
-00000000 t str_caseconv
-00000000 t str_center
-00000000 R str_center_obj
-         U strchr
-00000000 t str_count
-00000000 R str_count_obj
-00000000 t str_encode
-00000000 R str_encode_obj
-00000000 t str_endswith
-00000000 R str_endswith_obj
-00000000 t str_find
-00000000 t str_finder
-00000000 R str_find_obj
-00000000 R str_format_obj
-00000000 t str_index
-00000000 R str_index_obj
-         U str_index_to_ptr
-00000000 t str_isalpha
-00000000 R str_isalpha_obj
-00000000 t str_isdigit
-00000000 R str_isdigit_obj
-00000000 t str_islower
-00000000 R str_islower_obj
-00000000 t str_isspace
-00000000 R str_isspace_obj
-00000000 t str_isupper
-00000000 R str_isupper_obj
-00000000 t str_join
-00000000 R str_join_obj
-00000000 t str_lower
-00000000 R str_lower_obj
-00000000 t str_lstrip
-00000000 R str_lstrip_obj
-00000000 t str_partition
-00000000 t str_partitioner
-00000000 R str_partition_obj
-00000000 t str_print
-00000000 t str_replace
-00000000 R str_replace_obj
-00000000 t str_rfind
-00000000 R str_rfind_obj
-00000000 t str_rindex
-00000000 R str_rindex_obj
-00000000 t str_rpartition
-00000000 R str_rpartition_obj
-00000000 t str_rsplit
-00000000 R str_rsplit_obj
-00000000 t str_rstrip
-00000000 R str_rstrip_obj
-00000000 t str_splitlines
-00000000 R str_splitlines_obj
-00000000 R str_split_obj
-00000000 t str_startswith
-00000000 R str_startswith_obj
-00000000 t str_strip
-00000000 R str_strip_obj
-00000000 t str_to_int
-00000000 t str_uni_istype
-00000000 t str_uni_strip
-00000000 t str_upper
-00000000 R str_upper_obj
-         U unichar_isalpha
-         U unichar_isdigit
-         U unichar_islower
-         U unichar_isspace
-         U unichar_isupper
-         U unichar_tolower
-         U unichar_toupper
-         U utf8_charlen
-         U utf8_check
-         U utf8_next_char
-         U utf8_ptr_to_index
-         U vstr_add_byte
-         U vstr_clear
-         U vstr_init
-         U vstr_init_len
-         U vstr_init_print
-         U vstr_null_terminated_str
-00000000 r whitespace.7009
-
-build/py/objstrunicode.o:
-00000002 t $LCFI0
-00000002 t $LCFI11
-00000002 t $LCFI15
-00000006 t $LCFI4
-00000006 t $LCFI7
-         U g_InterfaceVtbl
-         U mp_const_false_obj
-         U mp_const_none_obj
-         U mp_const_true_obj
-         U mp_get_index
-         U mp_obj_get_int_maybe
-         U mp_obj_get_type
-         U mp_obj_get_type_str
-         U mp_obj_new_exception_msg_varg
-00000000 t mp_obj_new_str_iterator
-         U mp_obj_new_str_of_type
-         U mp_obj_new_str_via_qstr
-         U mp_obj_slice_get
-         U mp_obj_str_binary_op
-         U mp_obj_str_get_buffer
-         U mp_obj_str_make_new
-         U mp_printf
-         U mp_print_str
-         U mp_raise_msg
-         U mp_raise_NotImplementedError
-         U mp_str_print_json
-         U mp_type_bytes
-         U mp_type_dict
-         U mp_type_IndexError
-         U mp_type_polymorph_iter
-         U mp_type_slice
-00000000 R mp_type_str
-         U mp_type_type
-         U mp_type_TypeError
-         U nlr_jump
-         U qstr_data
-         U str_center_obj
-         U str_count_obj
-         U str_encode_obj
-         U str_endswith_obj
-         U str_find_obj
-         U str_format_obj
-         U str_index_obj
-00000000 T str_index_to_ptr
-         U str_isalpha_obj
-         U str_isdigit_obj
-         U str_islower_obj
-         U str_isspace_obj
-         U str_isupper_obj
-00000000 t str_it_iternext
-         U str_join_obj
-         U str_lower_obj
-         U str_lstrip_obj
-         U str_partition_obj
-         U str_replace_obj
-         U str_rfind_obj
-         U str_rindex_obj
-         U str_rpartition_obj
-         U str_rsplit_obj
-         U str_rstrip_obj
-         U str_splitlines_obj
-         U str_split_obj
-         U str_startswith_obj
-         U str_strip_obj
-00000000 t str_subscr
-00000000 r struni_locals_dict
-00000000 r struni_locals_dict_table
-         U str_upper_obj
-00000000 t uni_print
-00000000 t uni_unary_op
-         U utf8_charlen
-         U utf8_get_char
-         U utf8_next_char
-
-build/py/objstringio.o:
-00000004 t $LCFI0
-00000002 t $LCFI11
-00000002 t $LCFI15
-00000002 t $LCFI19
-00000002 t $LCFI2
-00000002 t $LCFI23
-00000002 t $LCFI4
-00000002 t $LCFI7
-00000000 r bytesio_stream_p
-00000000 t check_stringio_is_open
-         U memcpy
-         U memset
-         U m_malloc
-         U mp_get_buffer_raise
-         U mp_identity_getiter
-         U mp_identity_obj
-         U mp_obj_get_int
-         U mp_obj_new_str_of_type
-         U mp_obj_str_binary_op
-         U mp_printf
-         U mp_raise_ValueError
-         U mp_stream_close
-         U mp_stream_close_obj
-         U mp_stream_flush_obj
-         U mp_stream_readinto_obj
-         U mp_stream_read_obj
-         U mp_stream_seek_obj
-         U mp_stream_unbuffered_iter
-         U mp_stream_unbuffered_readline_obj
-         U mp_stream_write_obj
-         U mp_type_bytes
-00000000 R mp_type_bytesio
-         U mp_type_dict
-         U mp_type_fun_builtin_1
-         U mp_type_fun_builtin_var
-         U mp_type_int
-         U mp_type_str
-00000000 R mp_type_stringio
-         U mp_type_type
-00000000 t stringio___exit__
-00000000 r stringio___exit___obj
-00000000 t stringio_getvalue
-00000000 r stringio_getvalue_obj
-00000000 t stringio_ioctl
-00000000 r stringio_locals_dict
-00000000 r stringio_locals_dict_table
-00000000 t stringio_make_new
-00000000 t stringio_print
-00000000 t stringio_read
-00000000 r stringio_stream_p
-00000000 t stringio_write
-         U vstr_add_len
-         U vstr_free
-         U vstr_init_fixed_buf
-         U vstr_new
-
-build/py/objtuple.o:
-00000002 t $LCFI0
-00000002 t $LCFI11
-00000002 t $LCFI15
-00000002 t $LCFI19
-00000002 t $LCFI2
-00000002 t $LCFI23
-00000002 t $LCFI27
-00000002 t $LCFI31
-00000002 t $LCFI4
-00000004 t $LCFI8
-         U g_InterfaceVtbl
-         U memcpy
-         U m_free
-         U m_malloc
-         U mp_arg_check_num_sig
-00000000 R mp_const_empty_tuple_obj
-         U mp_const_false_obj
-         U mp_const_true_obj
-         U mp_get_index
-         U mp_getiter
-         U mp_instance_cast_to_native_base
-         U mp_iternext
-         U mp_obj_get_int_maybe
-         U mp_obj_get_type
-         U mp_obj_is_subclass_fast
-00000000 T mp_obj_new_tuple
-         U mp_obj_print_helper
-00000000 T mp_obj_tuple_binary_op
-00000000 T mp_obj_tuple_del
-00000000 T mp_obj_tuple_get
-00000000 T mp_obj_tuple_getiter
-00000000 t mp_obj_tuple_make_new
-00000000 T mp_obj_tuple_print
-00000000 T mp_obj_tuple_subscr
-00000000 T mp_obj_tuple_unary_op
-         U mp_print_str
-         U mp_raise_NotImplementedError
-         U mp_seq_cmp_objs
-         U mp_seq_count_obj
-         U mp_seq_get_fast_slice_indexes
-         U mp_seq_index_obj
-         U mp_seq_multiply
-         U mp_type_dict
-         U mp_type_fun_builtin_2
-         U mp_type_fun_builtin_var
-         U mp_type_polymorph_iter
-         U mp_type_slice
-00000000 R mp_type_tuple
-         U mp_type_type
-         U mp_unary_op
-         U m_realloc
-00000000 t tuple_count
-00000000 r tuple_count_obj
-00000000 t tuple_index
-00000000 r tuple_index_obj
-00000000 t tuple_it_iternext
-00000000 r tuple_locals_dict
-00000000 r tuple_locals_dict_table
-
-build/py/objtype.o:
-000001ce t $L258
-0000000c t $L278
-00000002 t $LCFI0
-00000002 t $LCFI102
-00000002 t $LCFI106
-00000002 t $LCFI12
-00000002 t $LCFI16
-00000004 t $LCFI19
-00000002 t $LCFI23
-00000004 t $LCFI25
-00000002 t $LCFI27
-00000002 t $LCFI31
-00000002 t $LCFI35
-00000002 t $LCFI39
-00000002 t $LCFI4
-00000002 t $LCFI43
-00000002 t $LCFI46
-00000002 t $LCFI48
-00000004 t $LCFI52
-00000004 t $LCFI56
-00000002 t $LCFI60
-00000002 t $LCFI62
-00000002 t $LCFI64
-00000002 t $LCFI66
-00000002 t $LCFI70
-00000002 t $LCFI74
-00000002 t $LCFI78
-00000002 t $LCFI8
-00000002 t $LCFI82
-00000002 t $LCFI86
-00000006 t $LCFI90
-00000002 t $LCFI94
-00000002 t $LCFI98
-00000000 t check_for_special_accessors
-         U g_InterfaceVtbl
-00000000 t instance_binary_op
-00000000 t instance_count_native_bases
-00000000 t instance_get_buffer
-00000000 t instance_getiter
-00000000 t instance_print
-00000000 t instance_subscr
-00000000 t instance_unary_op
-         U memcpy
-         U m_free
-         U m_malloc
-         U m_malloc0
-         U mp_arg_check_num_sig
-         U mp_binary_op
-00000000 R mp_binary_op_method_name
-00000000 t mp_builtin_isinstance
-00000000 R mp_builtin_isinstance_obj
-00000000 t mp_builtin_issubclass
-00000000 R mp_builtin_issubclass_obj
-         U mp_call_function_1
-         U mp_call_function_n_kw
-         U mp_call_method_n_kw
-         U mp_call_method_self_n_kw
-         U mp_const_false_obj
-         U mp_const_none_obj
-         U mp_const_notimplemented_obj
-         U mp_const_true_obj
-         U mp_convert_member_lookup
-         U mp_generic_unary_op
-00000000 T mp_instance_cast_to_native_base
-         U mp_load_method
-         U mp_load_method_maybe
-         U mp_load_method_protected
-00000000 T mp_load_super_method
-         U mp_map_init
-         U mp_map_lookup
-00000000 t mp_obj_class_lookup
-         U mp_obj_dict_store
-         U mp_obj_exception_make_new
-         U mp_obj_get_int_truncated
-         U mp_obj_get_type
-         U mp_obj_get_type_str
-00000000 t mp_obj_instance_attr
-00000000 T mp_obj_instance_call
-00000000 t mp_obj_instance_get_call
-00000000 T mp_obj_instance_is_callable
-00000000 T mp_obj_instance_make_new
-00000000 t mp_obj_is_subclass
-00000000 T mp_obj_is_subclass_fast
-         U mp_obj_new_dict
-         U mp_obj_new_exception_msg_varg
-00000000 T mp_obj_new_instance
-00000000 T mp_obj_new_type
-         U mp_obj_print_helper
-         U mp_obj_property_get
-         U mp_obj_str_get_qstr
-         U mp_obj_subscr
-         U mp_obj_tuple_get
-         U mp_printf
-         U mp_print_str
-         U mp_raise_msg
-         U mp_raise_TypeError
-         U mp_type_AttributeError
-00000000 R mp_type_classmethod
-         U mp_type_dict
-         U mp_type_fun_builtin_2
-         U mp_type_fun_builtin_var
-         U mp_type_int
-         U mp_type_object
-         U mp_type_property
-00000000 R mp_type_staticmethod
-00000000 R mp_type_super
-         U mp_type_tuple
-00000000 R mp_type_type
-         U mp_type_TypeError
-         U mp_unary_op
-00000000 R mp_unary_op_method_name
-00000000 t native_base_init_wrapper
-00000000 r native_base_init_wrapper_obj
-         U nlr_jump
-         U qstr_str
-00000000 t static_class_method_make_new
-00000000 t super_attr
-00000000 t super_make_new
-00000000 t super_print
-00000000 r to_check.6592
-00000000 t type_attr
-00000000 t type_call
-00000000 t type_make_new
-00000000 t type_print
-
-build/py/objzip.o:
-00000002 t $LCFI0
-00000002 t $LCFI4
-         U m_malloc
-         U mp_arg_check_num_sig
-         U mp_getiter
-         U mp_identity_getiter
-         U mp_iternext
-         U mp_obj_new_tuple
-         U mp_obj_tuple_del
-         U mp_type_type
-00000000 R mp_type_zip
-00000000 t zip_iternext
-00000000 t zip_make_new
-
-build/py/opmethods.o:
-00000002 t $LCFI0
-00000002 t $LCFI10
-00000002 t $LCFI4
-00000002 t $LCFI7
-         U mp_obj_get_type
-00000000 R mp_op_contains_obj
-00000000 R mp_op_delitem_obj
-00000000 R mp_op_getitem_obj
-00000000 R mp_op_setitem_obj
-         U mp_type_fun_builtin_2
-         U mp_type_fun_builtin_3
-00000000 t op_contains
-00000000 t op_delitem
-00000000 t op_getitem
-00000000 t op_setitem
-
-build/py/sequence.o:
-00000002 t $LCFI0
-00000004 t $LCFI12
-00000002 t $LCFI16
-00000002 t $LCFI20
-00000004 t $LCFI24
-00000002 t $LCFI4
-00000002 t $LCFI8
-         U memcmp
-         U memcpy
-         U mp_binary_op
-         U mp_const_none_obj
-         U mp_const_true_obj
-         U mp_get_index
-         U mp_obj_equal
-         U mp_obj_get_int
-         U mp_obj_get_type
-         U mp_obj_list_append
-         U mp_obj_new_list
-         U mp_obj_slice_get
-         U mp_raise_ValueError
-00000000 T mp_seq_cmp_bytes
-00000000 T mp_seq_cmp_objs
-00000000 T mp_seq_count_obj
-00000000 T mp_seq_extract_slice
-00000000 T mp_seq_get_fast_slice_indexes
-00000000 T mp_seq_index_obj
-00000000 T mp_seq_multiply
-
-build/py/stream.o:
-00000074 t $L68
-00000002 t $LCFI0
-00000002 t $LCFI10
-00000002 t $LCFI12
-00000002 t $LCFI14
-00000002 t $LCFI16
-00000002 t $LCFI18
-00000002 t $LCFI20
-00000002 t $LCFI24
-00000002 t $LCFI28
-00000002 t $LCFI30
-00000002 t $LCFI34
-00000002 t $LCFI38
-00000002 t $LCFI4
-00000002 t $LCFI41
-00000002 t $LCFI45
-00000002 t $LCFI48
-00000002 t $LCFI52
-00000002 t $LCFI56
-00000002 t $LCFI58
-00000002 t $LCFI6
-00000002 t $LCFI60
-00000002 t $LCFI8
-         U mp_const_none_obj
-         U mp_get_buffer
-         U mp_get_buffer_raise
-00000000 T mp_get_stream_raise
-         U mp_obj_get_int
-         U mp_obj_get_int_truncated
-         U mp_obj_get_type
-         U mp_obj_is_true
-         U mp_obj_list_append
-         U mp_obj_new_int
-         U mp_obj_new_int_from_uint
-         U mp_obj_new_list
-         U mp_obj_new_str_from_vstr
-         U mp_raise_msg
-         U mp_raise_OSError
-00000000 T mp_stream_close
-00000000 R mp_stream_close_obj
-00000004 C mp_stream_errno
-00000000 R mp_stream_flush_obj
-00000000 R mp_stream_ioctl_obj
-00000000 T mp_stream_posix_fsync
-00000000 T mp_stream_posix_lseek
-00000000 T mp_stream_posix_read
-00000000 T mp_stream_posix_write
-00000000 R mp_stream_read1_obj
-00000000 R mp_stream_readinto_obj
-00000000 R mp_stream_read_obj
-00000000 T mp_stream_rw
-00000000 R mp_stream_seek_obj
-00000000 R mp_stream_tell_obj
-00000000 T mp_stream_unbuffered_iter
-00000000 R mp_stream_unbuffered_readline_obj
-00000000 R mp_stream_unbuffered_readlines_obj
-00000000 T mp_stream_write
-00000000 R mp_stream_write1_obj
-00000000 T mp_stream_write_adaptor
-00000000 R mp_stream_write_obj
-         U mp_type_bytes
-         U mp_type_fun_builtin_1
-         U mp_type_fun_builtin_2
-         U mp_type_fun_builtin_var
-         U mp_type_OSError
-         U mp_type_str
-00000000 t stream_flush
-00000000 t stream_ioctl
-00000000 t stream_read
-00000000 t stream_read1
-00000000 t stream_read_generic
-00000000 t stream_readinto
-00000000 t stream_seek
-00000000 t stream_tell
-00000000 t stream_unbuffered_readline
-00000000 t stream_unbuffered_readlines
-00000000 t stream_write1_method
-00000000 t stream_write_method
-         U vstr_add_len
-         U vstr_clear
-         U vstr_cut_tail_bytes
-         U vstr_extend
-         U vstr_init
-         U vstr_init_len
-
-build/py/binary.o:
-00000004 t $LCFI0
-0000000a t $LCFI10
-00000002 t $LCFI12
-00000002 t $LCFI16
-00000002 t $LCFI20
-0000000a t $LCFI3
-00000002 t $LCFI6
-0000000a t $LCFI8
-00000000 r CSWTCH.66
-00000000 r CSWTCH.67
-00000000 r CSWTCH.70
-00000000 r CSWTCH.71
-         U __extendsfdf2
-         U __floatsidf
-         U __floatsisf
-         U memcpy
-         U memset
-00000000 T mp_binary_get_int
-00000000 T mp_binary_get_size
-00000000 T mp_binary_get_val
-00000000 T mp_binary_get_val_array
-00000000 T mp_binary_set_int
-00000000 T mp_binary_set_val
-00000000 T mp_binary_set_val_array
-00000000 T mp_binary_set_val_array_from_int
-         U mp_obj_get_float
-         U mp_obj_get_int
-         U mp_obj_int_to_bytes_impl
-         U mp_obj_new_float
-         U mp_obj_new_int
-         U mp_obj_new_int_from_ll
-         U mp_obj_new_int_from_uint
-         U mp_obj_new_int_from_ull
-         U mp_obj_new_str
-         U mp_raise_ValueError
-         U mp_type_int
-         U strlen
-         U __truncdfsf2
-
-build/py/builtinimport.o:
-00000002 t $LCFI0
-00000002 t $LCFI13
-00000002 t $LCFI17
-00000002 t $LCFI21
-00000002 t $LCFI3
-00000002 t $LCFI6
-00000002 t $LCFI9
-00000000 t chop_component
-00000000 t do_execute_raw_code
-00000000 t do_load
-         U g_InterfaceVtbl
-         U memcpy
-         U m_malloc
-00000000 T mp_builtin___import__
-00000000 R mp_builtin___import___obj
-         U mp_builtin_module_weak_links_map
-         U mp_call_function_0
-         U mp_const_false_obj
-         U mp_const_none_obj
-         U mp_find_frozen_module
-         U mp_frozen_stat
-00000000 t mp_import_stat_any
-         U mp_lexer_new_from_file
-         U mp_load_method_maybe
-         U mp_make_function_from_raw_code
-         U mp_map_lookup
-         U mp_module_call_init
-         U mp_module_get
-         U mp_obj_dict_get
-         U mp_obj_dict_store
-00000000 T mp_obj_is_package
-         U mp_obj_list_get
-         U mp_obj_new_exception_msg_varg
-         U mp_obj_new_module
-         U mp_obj_new_str
-         U mp_obj_str_get_data
-         U mp_obj_str_get_qstr
-         U mp_parse_compile_execute
-         U mp_raise_ValueError
-         U mp_raw_code_load_file
-         U mp_state_ctx
-         U mp_store_attr
-         U mp_type_fun_builtin_var
-         U mp_type_ImportError
-         U mp_vfs_import_stat
-         U nlr_jump
-         U nlr_pop
-         U nlr_push_tail
-         U qstr_from_str
-         U qstr_from_strn
-         U qstr_str
-00000000 t stat_dir_or_file
-00000000 t stat_file_py_or_mpy
-         U strchr
-         U vstr_add_char
-         U vstr_add_str
-         U vstr_add_strn
-         U vstr_init_fixed_buf
-         U vstr_ins_byte
-         U vstr_null_terminated_str
-
-build/py/builtinevex.o:
-00000002 t $LCFI0
-00000002 t $LCFI10
-00000002 t $LCFI4
-00000002 t $LCFI6
-00000002 t $LCFI8
-00000000 t eval_exec_helper
-         U g_InterfaceVtbl
-         U m_malloc
-00000000 t mp_builtin_compile
-00000000 R mp_builtin_compile_obj
-00000000 t mp_builtin_eval
-00000000 R mp_builtin_eval_obj
-00000000 t mp_builtin_exec
-00000000 t mp_builtin_execfile
-00000000 R mp_builtin_execfile_obj
-00000000 R mp_builtin_exec_obj
-         U mp_call_function_0
-         U mp_const_none_obj
-         U mp_lexer_new_from_file
-         U mp_lexer_new_from_str_len
-         U mp_obj_str_get_data
-         U mp_obj_str_get_qstr
-         U mp_parse_compile_execute
-         U mp_raise_TypeError
-         U mp_raise_ValueError
-         U mp_state_ctx
-00000000 r mp_type_code
-         U mp_type_dict
-         U mp_type_fun_bc
-         U mp_type_fun_builtin_var
-         U mp_type_type
-         U nlr_jump
-         U nlr_pop
-         U nlr_push_tail
-
-build/py/builtinhelp.o:
-00000002 t $LCFI0
-00000002 t $LCFI4
-         U gprs_a9_help_text
-00000000 t mp_builtin_help
-00000000 R mp_builtin_help_obj
-         U mp_builtin_module_map
-         U mp_builtin_module_weak_links_map
-         U mp_const_empty_map
-         U mp_const_none_obj
-         U mp_frozen_mpy_names
-00000000 t mp_help_add_from_map
-00000000 R mp_help_default_text
-         U mp_obj_get_type
-         U mp_obj_list_append
-         U mp_obj_list_get
-         U mp_obj_list_sort
-         U mp_obj_new_list
-         U mp_obj_new_str
-         U mp_obj_print
-         U mp_obj_str_get_str
-         U mp_printf
-         U mp_print_str
-         U mp_sys_stdout_print
-         U mp_type_fun_builtin_var
-         U mp_type_module
-         U mp_type_type
-         U strlen
-
-build/py/modarray.o:
-00000000 R mp_module_array
-00000000 r mp_module_array_globals
-00000000 r mp_module_array_globals_table
-         U mp_type_array
-         U mp_type_dict
-         U mp_type_module
-
-build/py/modbuiltins.o:
-00000002 t $LCFI0
-00000002 t $LCFI12
-00000002 t $LCFI15
-00000002 t $LCFI17
-00000002 t $LCFI19
-00000004 t $LCFI21
-00000002 t $LCFI23
-00000002 t $LCFI27
-00000002 t $LCFI3
-00000002 t $LCFI30
-00000002 t $LCFI33
-00000002 t $LCFI37
-00000004 t $LCFI41
-00000002 t $LCFI44
-00000002 t $LCFI48
-00000002 t $LCFI50
-00000002 t $LCFI54
-00000002 t $LCFI56
-00000002 t $LCFI6
-00000002 t $LCFI60
-00000002 t $LCFI62
-00000002 t $LCFI64
-00000002 t $LCFI67
-00000002 t $LCFI69
-00000002 t $LCFI71
-00000002 t $LCFI75
-00000002 t $LCFI77
-00000002 t $LCFI79
-00000002 t $LCFI8
-00000002 t $LCFI81
-00000000 r allowed_args.6938
-         U __divdf3
-         U __floatsidf
-         U g_InterfaceVtbl
-         U mp_arg_parse_all
-         U mp_binary_op
-00000000 t mp_builtin_abs
-00000000 R mp_builtin_abs_obj
-00000000 t mp_builtin_all
-00000000 R mp_builtin_all_obj
-00000000 t mp_builtin_any
-00000000 R mp_builtin_any_obj
-00000000 t mp_builtin_bin
-00000000 R mp_builtin_bin_obj
-00000000 t mp_builtin___build_class__
-00000000 R mp_builtin___build_class___obj
-00000000 t mp_builtin_callable
-00000000 R mp_builtin_callable_obj
-00000000 t mp_builtin_chr
-00000000 R mp_builtin_chr_obj
-         U mp_builtin_compile_obj
-00000000 t mp_builtin_delattr
-00000000 R mp_builtin_delattr_obj
-00000000 t mp_builtin_dir
-00000000 R mp_builtin_dir_obj
-00000000 t mp_builtin_divmod
-00000000 R mp_builtin_divmod_obj
-         U mp_builtin_eval_obj
-         U mp_builtin_execfile_obj
-         U mp_builtin_exec_obj
-00000000 t mp_builtin_getattr
-00000000 R mp_builtin_getattr_obj
-00000000 t mp_builtin_globals
-00000000 R mp_builtin_globals_obj
-00000000 t mp_builtin_hasattr
-00000000 R mp_builtin_hasattr_obj
-00000000 t mp_builtin_hash
-00000000 R mp_builtin_hash_obj
-         U mp_builtin_help_obj
-00000000 t mp_builtin_hex
-00000000 R mp_builtin_hex_obj
-00000000 R mp_builtin_id_obj
-         U mp_builtin___import___obj
-00000000 t mp_builtin_input
-00000000 R mp_builtin_input_obj
-         U mp_builtin_isinstance_obj
-         U mp_builtin_issubclass_obj
-00000000 t mp_builtin_iter
-00000000 R mp_builtin_iter_obj
-00000000 R mp_builtin_len_obj
-00000000 t mp_builtin_locals
-00000000 R mp_builtin_locals_obj
-00000000 t mp_builtin_max
-00000000 R mp_builtin_max_obj
-00000000 t mp_builtin_min
-00000000 t mp_builtin_min_max
-00000000 R mp_builtin_min_obj
-00000000 t mp_builtin_next
-00000000 R mp_builtin_next_obj
-00000000 t mp_builtin_oct
-00000000 R mp_builtin_oct_obj
-00000000 t mp_builtin_ord
-00000000 R mp_builtin_ord_obj
-00000000 t mp_builtin_pow
-00000000 R mp_builtin_pow_obj
-00000000 t mp_builtin_print
-00000000 R mp_builtin_print_obj
-00000000 t mp_builtin___repl_print__
-00000000 R mp_builtin___repl_print___obj
-00000000 t mp_builtin_repr
-00000000 R mp_builtin_repr_obj
-00000000 t mp_builtin_round
-00000000 R mp_builtin_round_obj
-00000000 t mp_builtin_setattr
-00000000 R mp_builtin_setattr_obj
-00000000 t mp_builtin_sorted
-00000000 R mp_builtin_sorted_obj
-00000000 t mp_builtin_sum
-00000000 R mp_builtin_sum_obj
-         U mp_call_function_0
-         U mp_call_function_1
-         U mp_call_function_n_kw
-         U mp_call_method_n_kw
-         U mp_const_ellipsis_obj
-         U mp_const_false_obj
-         U mp_const_none_obj
-         U mp_const_notimplemented_obj
-         U mp_const_true_obj
-         U mp_getiter
-         U mp_get_stream_raise
-         U mp_iternext
-         U mp_iternext_allow_raise
-         U mp_load_method
-         U mp_load_method_maybe
-         U mp_load_method_protected
-         U mp_map_lookup
-00000000 R mp_module_builtins
-00000000 R mp_module_builtins_globals
-00000000 r mp_module_builtins_globals_table
-         U mp_obj_cell_set
-         U mp_obj_get_float
-         U mp_obj_get_int
-         U mp_obj_get_type
-         U mp_obj_id
-         U mp_obj_int_pow3
-         U mp_obj_is_callable
-         U mp_obj_is_true
-         U mp_obj_len
-         U mp_obj_list_append
-         U mp_obj_list_sort
-         U mp_obj_new_bound_meth
-         U mp_obj_new_dict
-         U mp_obj_new_exception
-         U mp_obj_new_exception_msg_varg
-         U mp_obj_new_float
-         U mp_obj_new_int
-         U mp_obj_new_int_from_float
-         U mp_obj_new_list
-         U mp_obj_new_str_from_vstr
-         U mp_obj_new_str_via_qstr
-         U mp_obj_new_tuple
-         U mp_obj_print
-         U mp_obj_print_helper
-         U mp_obj_str_format
-         U mp_obj_str_get_data
-         U mp_obj_str_get_qstr
-         U mp_print_str
-         U mp_raise_TypeError
-         U mp_raise_ValueError
-         U mp_state_ctx
-         U mp_store_attr
-         U mp_stream_write_adaptor
-         U mp_sys_stdout_obj
-         U mp_sys_stdout_print
-         U mp_type_ArithmeticError
-         U mp_type_AssertionError
-         U mp_type_AttributeError
-         U mp_type_BaseException
-         U mp_type_bool
-         U mp_type_bytearray
-         U mp_type_bytes
-         U mp_type_classmethod
-         U mp_type_complex
-         U mp_type_dict
-         U mp_type_enumerate
-         U mp_type_EOFError
-         U mp_type_Exception
-         U mp_type_filter
-         U mp_type_float
-         U mp_type_frozenset
-         U mp_type_fun_builtin_0
-         U mp_type_fun_builtin_1
-         U mp_type_fun_builtin_2
-         U mp_type_fun_builtin_3
-         U mp_type_fun_builtin_var
-         U mp_type_GeneratorExit
-         U mp_type_ImportError
-         U mp_type_IndentationError
-         U mp_type_IndexError
-         U mp_type_int
-         U mp_type_KeyboardInterrupt
-         U mp_type_KeyError
-         U mp_type_list
-         U mp_type_LookupError
-         U mp_type_map
-         U mp_type_MemoryError
-         U mp_type_memoryview
-         U mp_type_module
-         U mp_type_NameError
-         U mp_type_NotImplementedError
-         U mp_type_object
-         U mp_type_OSError
-         U mp_type_OverflowError
-         U mp_type_property
-         U mp_type_range
-         U mp_type_reversed
-         U mp_type_RuntimeError
-         U mp_type_set
-         U mp_type_slice
-         U mp_type_staticmethod
-         U mp_type_StopAsyncIteration
-         U mp_type_StopIteration
-         U mp_type_str
-         U mp_type_super
-         U mp_type_SyntaxError
-         U mp_type_SystemExit
-         U mp_type_tuple
-         U mp_type_type
-         U mp_type_TypeError
-         U mp_type_UnicodeError
-         U mp_type_ValueError
-         U mp_type_ZeroDivisionError
-         U mp_type_zip
-         U mp_unary_op
-         U mp_vfs_open_obj
-         U __muldf3
-         U nearbyint
-         U nlr_jump
-         U pow
-         U readline
-         U utf8_charlen
-         U utf8_get_char
-         U vstr_init
-         U vstr_init_print
-
-build/py/modcollections.o:
-00000000 R mp_module_collections
-00000000 r mp_module_collections_globals
-00000000 r mp_module_collections_globals_table
-         U mp_namedtuple_obj
-         U mp_type_deque
-         U mp_type_dict
-         U mp_type_module
-         U mp_type_ordereddict
-
-build/py/modgc.o:
-00000002 t $LCFI0
-00000002 t $LCFI2
-00000002 t $LCFI4
-00000002 t $LCFI6
-         U gc_collect
-00000000 R gc_collect_obj
-00000000 t gc_disable
-00000000 R gc_disable_obj
-00000000 t gc_enable
-00000000 R gc_enable_obj
-         U gc_info
-00000000 t gc_isenabled
-00000000 R gc_isenabled_obj
-00000000 t gc_mem_alloc
-00000000 R gc_mem_alloc_obj
-00000000 t gc_mem_free
-00000000 R gc_mem_free_obj
-00000000 t gc_threshold
-00000000 R gc_threshold_obj
-         U mp_const_false_obj
-         U mp_const_none_obj
-         U mp_const_true_obj
-00000000 R mp_module_gc
-00000000 r mp_module_gc_globals
-00000000 r mp_module_gc_globals_table
-         U mp_obj_get_int
-         U mp_obj_new_int
-         U mp_state_ctx
-         U mp_type_dict
-         U mp_type_fun_builtin_0
-         U mp_type_fun_builtin_var
-         U mp_type_module
-00000000 t py_gc_collect
-
-build/py/modio.o:
-00000002 t $LCFI0
-00000002 t $LCFI11
-00000002 t $LCFI15
-00000002 t $LCFI17
-00000002 t $LCFI19
-00000004 t $LCFI3
-00000002 t $LCFI7
-00000000 t bufwriter_flush
-00000000 r bufwriter_flush_obj
-00000000 r bufwriter_locals_dict
-00000000 r bufwriter_locals_dict_table
-00000000 t bufwriter_make_new
-00000000 r bufwriter_stream_p
-00000000 r bufwriter_type
-00000000 t bufwriter_write
-         U g_InterfaceVtbl
-00000000 t iobase_ioctl
-00000000 t iobase_make_new
-00000000 r iobase_p
-00000000 t iobase_read
-00000000 t iobase_read_write
-00000000 r iobase_singleton
-00000000 t iobase_write
-         U memcpy
-         U m_malloc
-         U mp_arg_check_num_sig
-         U mp_call_method_n_kw
-         U mp_const_none_obj
-         U mp_load_method
-00000000 R mp_module_io
-00000000 r mp_module_io_globals
-00000000 r mp_module_io_globals_table
-         U mp_obj_get_int
-         U mp_obj_new_int_from_uint
-         U mp_raise_OSError
-         U mp_stream_rw
-         U mp_stream_write_obj
-         U mp_type_bytearray
-         U mp_type_bytesio
-         U mp_type_dict
-         U mp_type_fun_builtin_1
-00000000 r mp_type_iobase
-         U mp_type_module
-         U mp_type_stringio
-         U mp_type_type
-         U mp_type_vfs_fat_fileio
-         U mp_type_vfs_fat_textio
-         U mp_vfs_open_obj
-
-build/py/modmath.o:
-00000002 t $LCFI0
-00000002 t $LCFI11
-00000002 t $LCFI13
-00000002 t $LCFI17
-00000002 t $LCFI19
-00000002 t $LCFI21
-00000002 t $LCFI23
-00000002 t $LCFI25
-00000002 t $LCFI27
-00000002 t $LCFI29
-00000002 t $LCFI3
-00000002 t $LCFI31
-00000002 t $LCFI33
-00000002 t $LCFI35
-00000002 t $LCFI37
-00000002 t $LCFI39
-00000002 t $LCFI41
-00000002 t $LCFI43
-00000002 t $LCFI45
-00000002 t $LCFI47
-00000002 t $LCFI49
-00000002 t $LCFI5
-00000002 t $LCFI51
-00000002 t $LCFI53
-00000002 t $LCFI55
-00000002 t $LCFI57
-00000002 t $LCFI59
-00000002 t $LCFI61
-00000002 t $LCFI65
-00000002 t $LCFI67
-00000002 t $LCFI69
-00000002 t $LCFI7
-00000002 t $LCFI71
-00000002 t $LCFI73
-00000006 t $LCFI75
-00000002 t $LCFI77
-00000002 t $LCFI80
-00000002 t $LCFI82
-00000002 t $LCFI84
-00000002 t $LCFI86
-00000002 t $LCFI9
-         U acos
-         U acosh
-         U asin
-         U asinh
-         U atan
-         U atan2
-         U atanh
-         U ceil
-00000000 t copysign_func
-         U cos
-         U cosh
-         U __divdf3
-         U __eqdf2
-         U erf
-         U erfc
-         U exp
-         U expm1
-00000000 t fabs_func
-         U floor
-         U fmod
-         U frexp
-         U ldexp
-         U __ledf2
-         U lgamma
-         U log
-         U log10
-         U log2
-00000000 t math_error
-00000000 t math_generic_1
-00000000 t math_generic_2
-         U modf
-         U mp_const_false_obj
-         U mp_const_float_e_obj
-         U mp_const_float_pi_obj
-         U mp_const_true_obj
-00000000 t mp_math_acos
-00000000 t mp_math_acosh
-00000000 r mp_math_acosh_obj
-00000000 r mp_math_acos_obj
-00000000 t mp_math_asin
-00000000 t mp_math_asinh
-00000000 r mp_math_asinh_obj
-00000000 r mp_math_asin_obj
-00000000 t mp_math_atan
-00000000 t mp_math_atan2
-00000000 r mp_math_atan2_obj
-00000000 t mp_math_atanh
-00000000 r mp_math_atanh_obj
-00000000 r mp_math_atan_obj
-00000000 t mp_math_ceil
-00000000 r mp_math_ceil_obj
-00000000 t mp_math_copysign
-00000000 r mp_math_copysign_obj
-00000000 t mp_math_cos
-00000000 t mp_math_cosh
-00000000 r mp_math_cosh_obj
-00000000 r mp_math_cos_obj
-00000000 t mp_math_degrees
-00000000 r mp_math_degrees_obj
-00000000 t mp_math_erf
-00000000 t mp_math_erfc
-00000000 r mp_math_erfc_obj
-00000000 r mp_math_erf_obj
-00000000 t mp_math_exp
-00000000 t mp_math_expm1
-00000000 r mp_math_expm1_obj
-00000000 r mp_math_exp_obj
-00000000 t mp_math_fabs
-00000000 r mp_math_fabs_obj
-00000000 t mp_math_floor
-00000000 r mp_math_floor_obj
-00000000 t mp_math_fmod
-00000000 r mp_math_fmod_obj
-00000000 t mp_math_frexp
-00000000 r mp_math_frexp_obj
-00000000 t mp_math_gamma
-00000000 r mp_math_gamma_obj
-00000000 t mp_math_isfinite
-00000000 r mp_math_isfinite_obj
-00000000 t mp_math_isinf
-00000000 r mp_math_isinf_obj
-00000000 t mp_math_isnan
-00000000 r mp_math_isnan_obj
-00000000 t mp_math_ldexp
-00000000 r mp_math_ldexp_obj
-00000000 t mp_math_lgamma
-00000000 r mp_math_lgamma_obj
-00000000 t mp_math_log
-00000000 t mp_math_log10
-00000000 r mp_math_log10_obj
-00000000 t mp_math_log2
-00000000 r mp_math_log2_obj
-00000000 r mp_math_log_obj
-00000000 t mp_math_modf
-00000000 r mp_math_modf_obj
-00000000 t mp_math_pow
-00000000 r mp_math_pow_obj
-00000000 t mp_math_radians
-00000000 r mp_math_radians_obj
-00000000 t mp_math_sin
-00000000 t mp_math_sinh
-00000000 r mp_math_sinh_obj
-00000000 r mp_math_sin_obj
-00000000 t mp_math_sqrt
-00000000 r mp_math_sqrt_obj
-00000000 t mp_math_tan
-00000000 t mp_math_tanh
-00000000 r mp_math_tanh_obj
-00000000 r mp_math_tan_obj
-00000000 t mp_math_trunc
-00000000 r mp_math_trunc_obj
-00000000 R mp_module_math
-00000000 r mp_module_math_globals
-00000000 r mp_module_math_globals_table
-         U mp_obj_get_float
-         U mp_obj_get_int
-         U mp_obj_new_float
-         U mp_obj_new_int
-         U mp_obj_new_int_from_float
-         U mp_obj_new_tuple
-         U mp_raise_msg
-         U mp_raise_ValueError
-         U mp_type_dict
-         U mp_type_fun_builtin_1
-         U mp_type_fun_builtin_2
-         U mp_type_fun_builtin_var
-         U mp_type_module
-         U mp_type_ZeroDivisionError
-         U __muldf3
-         U __nedf2
-         U pow
-         U sin
-         U sinh
-         U sqrt
-         U tan
-         U tanh
-         U tgamma
-         U trunc
-
-build/py/modcmath.o:
-00000002 t $LCFI0
-00000002 t $LCFI12
-00000002 t $LCFI16
-00000002 t $LCFI20
-00000002 t $LCFI24
-00000002 t $LCFI28
-00000002 t $LCFI30
-00000002 t $LCFI4
-00000002 t $LCFI8
-         U __adddf3
-         U atan2
-         U cos
-         U cosh
-         U exp
-         U log
-         U log10
-00000000 t mp_cmath_cos
-00000000 r mp_cmath_cos_obj
-00000000 t mp_cmath_exp
-00000000 r mp_cmath_exp_obj
-00000000 t mp_cmath_log
-00000000 t mp_cmath_log10
-00000000 r mp_cmath_log10_obj
-00000000 r mp_cmath_log_obj
-00000000 t mp_cmath_phase
-00000000 r mp_cmath_phase_obj
-00000000 t mp_cmath_polar
-00000000 r mp_cmath_polar_obj
-00000000 t mp_cmath_rect
-00000000 r mp_cmath_rect_obj
-00000000 t mp_cmath_sin
-00000000 r mp_cmath_sin_obj
-00000000 t mp_cmath_sqrt
-00000000 r mp_cmath_sqrt_obj
-         U mp_const_float_e_obj
-         U mp_const_float_pi_obj
-00000000 R mp_module_cmath
-00000000 r mp_module_cmath_globals
-00000000 r mp_module_cmath_globals_table
-         U mp_obj_get_complex
-         U mp_obj_get_float
-         U mp_obj_new_complex
-         U mp_obj_new_float
-         U mp_obj_new_tuple
-         U mp_type_dict
-         U mp_type_fun_builtin_1
-         U mp_type_fun_builtin_2
-         U mp_type_module
-         U __muldf3
-         U pow
-         U sin
-         U sinh
-         U sqrt
-
-build/py/modmicropython.o:
-00000002 t $LCFI0
-00000002 t $LCFI11
-00000002 t $LCFI13
-00000002 t $LCFI16
-00000002 t $LCFI2
-00000002 t $LCFI5
-00000002 t $LCFI7
-00000002 t $LCFI9
-         U gc_dump_alloc_table
-         U gc_dump_info
-         U gc_lock
-         U gc_unlock
-         U mp_alloc_emergency_exception_buf
-00000000 r mp_alloc_emergency_exception_buf_obj
-         U mp_const_none_obj
-         U mp_hal_set_interrupt_char
-         U mp_identity_obj
-00000000 t mp_micropython_heap_lock
-00000000 r mp_micropython_heap_lock_obj
-00000000 t mp_micropython_heap_unlock
-00000000 r mp_micropython_heap_unlock_obj
-00000000 t mp_micropython_kbd_intr
-00000000 r mp_micropython_kbd_intr_obj
-00000000 T mp_micropython_mem_info
-00000000 r mp_micropython_mem_info_obj
-00000000 t mp_micropython_opt_level
-00000000 r mp_micropython_opt_level_obj
-00000000 t mp_micropython_qstr_info
-00000000 r mp_micropython_qstr_info_obj
-00000000 t mp_micropython_schedule
-00000000 r mp_micropython_schedule_obj
-00000000 t mp_micropython_stack_use
-00000000 r mp_micropython_stack_use_obj
-00000000 R mp_module_micropython
-00000000 r mp_module_micropython_globals
-00000000 r mp_module_micropython_globals_table
-         U mp_obj_get_int
-         U mp_plat_print
-         U mp_printf
-         U mp_raise_msg
-         U mp_sched_schedule
-         U mp_stack_usage
-         U mp_state_ctx
-         U mp_type_dict
-         U mp_type_fun_builtin_0
-         U mp_type_fun_builtin_1
-         U mp_type_fun_builtin_2
-         U mp_type_fun_builtin_var
-         U mp_type_module
-         U mp_type_RuntimeError
-         U qstr_dump_data
-         U qstr_pool_info
-
-build/py/modstruct.o:
-00000002 t $LCFI0
-00000002 t $LCFI12
-00000002 t $LCFI16
-00000002 t $LCFI18
-00000002 t $LCFI22
-00000002 t $LCFI4
-00000002 t $LCFI8
-00000000 t calc_size_items
-00000000 t get_fmt_num
-00000000 t get_fmt_type
-         U memcpy
-         U memset
-         U mp_binary_get_size
-         U mp_binary_get_val
-         U mp_binary_set_val
-         U mp_const_none_obj
-         U mp_get_buffer_raise
-00000000 r mp_module_struct_globals
-00000000 r mp_module_struct_globals_table
-00000000 R mp_module_ustruct
-         U mp_obj_get_int
-         U mp_obj_new_bytes
-         U mp_obj_new_str_from_vstr
-         U mp_obj_new_tuple
-         U mp_obj_str_get_str
-         U mp_parse_num_integer
-         U mp_raise_ValueError
-         U mp_type_bytes
-         U mp_type_dict
-         U mp_type_fun_builtin_1
-         U mp_type_fun_builtin_var
-         U mp_type_module
-00000000 t struct_calcsize
-00000000 R struct_calcsize_obj
-00000000 t struct_pack
-00000000 t struct_pack_into
-00000000 t struct_pack_into_internal
-00000000 R struct_pack_into_obj
-00000000 R struct_pack_obj
-00000000 t struct_unpack_from
-00000000 R struct_unpack_from_obj
-         U unichar_isdigit
-         U vstr_init_len
-
-build/py/modsys.o:
-00000002 t $LCFI0
-00000002 t $LCFI3
-00000000 r impl_fields
-         U mp_const_none_obj
-         U mp_get_stream_raise
-         U mp_maxsize_obj
-00000000 R mp_module_sys
-00000000 r mp_module_sys_globals
-00000000 r mp_module_sys_globals_table
-         U mp_obj_new_exception
-         U mp_obj_new_exception_arg1
-         U mp_obj_print_exception
-         U mp_state_ctx
-         U mp_stream_write_adaptor
-00000000 t mp_sys_exit
-00000000 R mp_sys_exit_obj
-00000000 r mp_sys_implementation_obj
-00000000 r mp_sys_implementation_version_info_obj
-00000000 t mp_sys_print_exception
-00000000 R mp_sys_print_exception_obj
-         U mp_sys_stderr_obj
-         U mp_sys_stdin_obj
-         U mp_sys_stdout_obj
-00000000 R mp_sys_stdout_print
-00000000 r mp_sys_version_info_obj
-         U mp_type_attrtuple
-         U mp_type_dict
-         U mp_type_fun_builtin_var
-         U mp_type_module
-         U mp_type_str
-         U mp_type_SystemExit
-         U mp_type_tuple
-         U nlr_jump
-00000000 r platform_obj
-00000000 r version_obj
-
-build/py/moduerrno.o:
-00000002 t $LCFI0
-00000000 r errorcode_dict
-00000000 r errorcode_table
-00000000 T mp_errno_to_str
-         U mp_map_lookup
-00000000 R mp_module_uerrno
-00000000 r mp_module_uerrno_globals
-00000000 r mp_module_uerrno_globals_table
-         U mp_type_dict
-         U mp_type_module
-
-build/py/modthread.o:
-
-build/py/vm.o:
-00000b0a t $L100
-00000b40 t $L103
-00000b7a t $L108
-00000baa t $L110
-00000be2 t $L112
-00000c12 t $L114
-00000c42 t $L116
-00000c8c t $L118
-000004c0 t $L12
-00000cbe t $L120
-00000cfe t $L122
-00000d36 t $L124
-00000d72 t $L126
-0000007a t $L129
-000004e8 t $L13
-00000dae t $L133
-00000280 t $L141
-0000029c t $L143
-00000510 t $L15
-00000322 t $L154
-0000043c t $L155
-000003fc t $L156
-00000418 t $L157
-00000376 t $L158
-000003a2 t $L159
-0000051c t $L16
-000003bc t $L160
-000003e0 t $L161
-00000354 t $L162
-00000386 t $L18
-00000f54 t $L20
-00000538 t $L21
-00000558 t $L23
-00000570 t $L24
-00000592 t $L25
-000005a8 t $L26
-000005ca t $L27
-000005ec t $L28
-000005fc t $L29
-00000612 t $L30
-00000636 t $L32
-0000065e t $L34
-0000067e t $L35
-0000069e t $L36
-000006c4 t $L37
-000006de t $L38
-0000010e t $L4
-00000702 t $L40
-00000732 t $L42
-0000074a t $L43
-0000076c t $L44
-00000778 t $L45
-0000078e t $L46
-00000796 t $L47
-000007a6 t $L48
-000007c0 t $L49
-0000046a t $L5
-000007ce t $L50
-000007f0 t $L51
-00000818 t $L52
-00000840 t $L53
-0000085c t $L55
-00000878 t $L57
-000008d8 t $L58
-00000934 t $L64
-00000954 t $L65
-00000476 t $L7
-000000bc t $L70
-000000bc t $L71
-000009a4 t $L74
-00000484 t $L8
-000009ca t $L81
-000009da t $L82
-00000a04 t $L84
-00000a38 t $L89
-00000490 t $L9
-00000a56 t $L91
-00000a80 t $L93
-00000aaa t $L95
-00000ace t $L97
-00000ae0 t $L98
-00000002 t $LCFI0
-00000000 r entry_table.6100
-         U g_InterfaceVtbl
-         U mp_binary_op
-         U mp_call_function_n_kw
-         U mp_call_method_n_kw
-         U mp_call_method_n_kw_var
-         U mp_const_false_obj
-         U mp_const_GeneratorExit_obj
-         U mp_const_none_obj
-         U mp_const_true_obj
-         U mp_decode_uint_skip
-         U mp_decode_uint_value
-         U mp_delete_global
-         U mp_delete_name
-00000000 T mp_execute_bytecode
-         U mp_getiter
-         U mp_handle_pending_tail
-         U mp_import_all
-         U mp_import_from
-         U mp_import_name
-         U mp_iternext_allow_raise
-         U mp_load_attr
-         U mp_load_build_class
-         U mp_load_global
-         U mp_load_method
-         U mp_load_name
-         U mp_load_super_method
-         U mp_make_closure_from_raw_code
-         U mp_make_function_from_raw_code
-         U mp_make_raise_obj
-         U mp_obj_cell_get
-         U mp_obj_cell_set
-         U mp_obj_dict_store
-         U mp_obj_exception_add_traceback
-         U mp_obj_exception_get_value
-         U mp_obj_exception_match
-         U mp_obj_get_type
-         U mp_obj_is_exception_instance
-         U mp_obj_is_subclass_fast
-         U mp_obj_is_true
-         U mp_obj_list_append
-         U mp_obj_new_dict
-         U mp_obj_new_exception_msg
-         U mp_obj_new_list
-         U mp_obj_new_set
-         U mp_obj_new_slice
-         U mp_obj_new_tuple
-         U mp_obj_set_store
-         U mp_obj_subscr
-         U mp_resume
-         U mp_state_ctx
-         U mp_store_attr
-         U mp_store_global
-         U mp_store_name
-         U mp_type_GeneratorExit
-         U mp_type_NameError
-         U mp_type_NotImplementedError
-         U mp_type_RuntimeError
-         U mp_type_StopIteration
-         U mp_unary_op
-         U mp_unpack_ex
-         U mp_unpack_sequence
-         U mp_warning
-         U nlr_pop
-         U nlr_push_tail
-
-build/py/bc.o:
-000001c6 t $L42
-00000002 t $LCFI0
-00000002 t $LCFI2
-00000004 t $LCFI4
-00000002 t $LCFI6
-00000000 t fun_pos_args_mismatch
-         U memset
-         U mp_const_empty_tuple_obj
-00000000 T mp_decode_uint
-00000000 T mp_decode_uint_skip
-00000000 T mp_decode_uint_value
-         U mp_map_lookup
-         U mp_obj_dict_store
-         U mp_obj_new_cell
-         U mp_obj_new_dict
-         U mp_obj_new_exception_msg_varg
-         U mp_obj_new_tuple
-00000000 T mp_opcode_format
-         U mp_raise_TypeError
-00000000 T mp_setup_code_state
-         U mp_type_TypeError
-         U nlr_jump
-00000000 r opcode_format_table
-
-build/py/showbc.o:
-
-build/py/repl.o:
-00000002 t $LCFI0
-00000002 t $LCFI4
-00000002 t $LCFI6
-00000000 r import_str.6186
-         U memcmp
-         U mp_load_method_protected
-         U mp_module___main__
-         U mp_printf
-         U mp_print_str
-00000000 T mp_repl_autocomplete
-00000000 T mp_repl_continue_with_input
-         U mp_state_ctx
-         U qstr_data
-         U qstr_find_strn
-         U strncmp
-00000000 t str_startswith_word
-         U unichar_isalpha
-         U unichar_isdigit
-         U unichar_isident
-
-build/py/smallint.o:
-00000000 T mp_small_int_floor_divide
-00000000 T mp_small_int_modulo
-00000000 T mp_small_int_mul_overflow
-
-build/py/frozenmod.o:
-00000002 t $LCFI0
-00000002 t $LCFI4
-         U memcmp
-00000000 T mp_find_frozen_module
-         U mp_frozen_mpy_content
-         U mp_frozen_mpy_names
-00000000 T mp_frozen_stat
-         U strlen
-
-build/extmod/moductypes.o:
-00000002 t $LCFI0
-00000002 t $LCFI13
-00000006 t $LCFI16
-00000004 t $LCFI2
-00000002 t $LCFI20
-00000002 t $LCFI22
-00000002 t $LCFI24
-00000002 t $LCFI28
-00000002 t $LCFI32
-00000002 t $LCFI35
-00000002 t $LCFI39
-00000002 t $LCFI43
-00000002 t $LCFI45
-00000002 t $LCFI49
-00000002 t $LCFI6
-00000002 t $LCFI9
-00000000 r CSWTCH.87
-         U __extendsfdf2
-00000000 t get_aligned
-         U g_InterfaceVtbl
-         U m_malloc
-         U mp_arg_check_num_sig
-         U mp_binary_get_int
-         U mp_binary_get_val
-         U mp_binary_set_int
-         U mp_binary_set_val
-         U mp_get_buffer_raise
-00000000 R mp_module_uctypes
-00000000 r mp_module_uctypes_globals
-00000000 r mp_module_uctypes_globals_table
-         U mp_obj_dict_get
-         U mp_obj_get_float
-         U mp_obj_get_int
-         U mp_obj_get_int_truncated
-         U mp_obj_int_get_truncated
-         U mp_obj_len
-         U mp_obj_new_bytearray_by_ref
-         U mp_obj_new_bytes
-         U mp_obj_new_exception_msg
-         U mp_obj_new_float
-         U mp_obj_new_int
-         U mp_obj_new_int_from_ll
-         U mp_obj_new_int_from_uint
-         U mp_obj_new_int_from_ull
-         U mp_printf
-         U mp_raise_TypeError
-         U mp_type_bytearray
-         U mp_type_dict
-         U mp_type_fun_builtin_1
-         U mp_type_fun_builtin_2
-         U mp_type_fun_builtin_var
-         U mp_type_IndexError
-         U mp_type_module
-         U mp_type_ordereddict
-         U mp_type_tuple
-         U mp_type_type
-         U nlr_jump
-00000000 t set_aligned
-00000000 t syntax_error
-         U __truncdfsf2
-00000000 r type2char.6235
-00000000 r type2char.6254
-00000000 t uctypes_get_buffer
-00000000 t uctypes_struct_addressof
-00000000 R uctypes_struct_addressof_obj
-00000000 t uctypes_struct_agg_size
-00000000 t uctypes_struct_attr
-00000000 t uctypes_struct_attr_op
-00000000 t uctypes_struct_bytearray_at
-00000000 R uctypes_struct_bytearray_at_obj
-00000000 t uctypes_struct_bytes_at
-00000000 R uctypes_struct_bytes_at_obj
-00000000 t uctypes_struct_make_new
-00000000 t uctypes_struct_print
-00000000 t uctypes_struct_size
-00000000 t uctypes_struct_sizeof
-00000000 r uctypes_struct_sizeof_obj
-00000000 t uctypes_struct_subscr
-00000000 r uctypes_struct_type
-00000000 t uctypes_struct_unary_op
-
-build/extmod/modujson.o:
-000001d4 t $L34
-00000336 t $L9
-00000002 t $LCFI0
-00000002 t $LCFI13
-00000002 t $LCFI3
-00000002 t $LCFI7
-00000002 t $LCFI9
-00000000 t mod_ujson_dump
-00000000 r mod_ujson_dump_obj
-00000000 t mod_ujson_dumps
-00000000 r mod_ujson_dumps_obj
-00000000 t mod_ujson_load
-00000000 r mod_ujson_load_obj
-00000000 t mod_ujson_loads
-00000000 r mod_ujson_loads_obj
-         U mp_const_false_obj
-         U mp_const_none_obj
-         U mp_const_true_obj
-         U mp_get_buffer_raise
-         U mp_get_stream_raise
-00000000 R mp_module_ujson
-00000000 r mp_module_ujson_globals
-00000000 r mp_module_ujson_globals_table
-         U mp_obj_dict_store
-         U mp_obj_get_type
-         U mp_obj_list_append
-         U mp_obj_list_init
-         U mp_obj_new_dict
-         U mp_obj_new_list
-         U mp_obj_new_str
-         U mp_obj_new_str_from_vstr
-         U mp_obj_print_helper
-         U mp_parse_num_decimal
-         U mp_parse_num_integer
-         U mp_raise_OSError
-         U mp_raise_ValueError
-         U mp_stream_write_adaptor
-         U mp_type_dict
-         U mp_type_fun_builtin_1
-         U mp_type_fun_builtin_2
-         U mp_type_list
-         U mp_type_module
-         U mp_type_str
-         U mp_type_stringio
-00000000 t ujson_stream_next
-         U unichar_isdigit
-         U unichar_isspace
-         U vstr_add_byte
-         U vstr_add_char
-         U vstr_clear
-         U vstr_init
-         U vstr_init_print
-
-build/extmod/modure.o:
-00000032 t $L206
-00000002 t $LCFI0
-00000002 t $LCFI10
-00000002 t $LCFI14
-00000002 t $LCFI16
-00000002 t $LCFI2
-00000002 t $LCFI20
-00000002 t $LCFI22
-00000004 t $LCFI26
-00000004 t $LCFI28
-00000002 t $LCFI30
-00000002 t $LCFI34
-00000002 t $LCFI38
-00000002 t $LCFI4
-00000002 t $LCFI42
-00000002 t $LCFI44
-00000002 t $LCFI48
-00000002 t $LCFI52
-00000004 t $LCFI56
-00000004 t $LCFI58
-00000002 t $LCFI6
-00000000 t _compilecode
-         U g_InterfaceVtbl
-00000000 t match_group
-00000000 R match_group_obj
-00000000 r match_locals_dict
-00000000 r match_locals_dict_table
-00000000 t match_print
-00000000 r match_type
-         U memmove
-         U memset
-         U m_free
-         U m_malloc
-00000000 t mod_re_compile
-00000000 R mod_re_compile_obj
-00000000 t mod_re_exec
-00000000 t mod_re_match
-00000000 R mod_re_match_obj
-00000000 t mod_re_search
-00000000 R mod_re_search_obj
-00000000 t mod_re_sub
-00000000 R mod_re_sub_obj
-         U mp_call_function_1
-         U mp_const_none_obj
-00000000 r mp_module_re_globals
-00000000 r mp_module_re_globals_table
-00000000 R mp_module_ure
-         U mp_obj_get_int
-         U mp_obj_get_type
-         U mp_obj_is_callable
-         U mp_obj_list_append
-         U mp_obj_new_exception_arg1
-         U mp_obj_new_list
-         U mp_obj_new_str_from_vstr
-         U mp_obj_new_str_of_type
-         U mp_obj_str_get_data
-         U mp_obj_str_get_str
-         U mp_printf
-         U mp_raise_NotImplementedError
-         U mp_raise_ValueError
-         U mp_stack_check
-         U mp_type_dict
-         U mp_type_fun_builtin_2
-         U mp_type_fun_builtin_var
-         U mp_type_IndexError
-         U mp_type_module
-         U mp_type_type
-         U nlr_jump
-00000000 T _re1_5_classmatch
-00000000 T re1_5_compilecode
-00000000 T _re1_5_namedclassmatch
-00000000 T re1_5_recursiveloopprog
-00000000 T re1_5_sizecode
-00000000 t recursiveloop
-00000000 r re_locals_dict
-00000000 r re_locals_dict_table
-00000000 t re_match
-00000000 R re_match_obj
-00000000 t re_print
-00000000 t re_search
-00000000 R re_search_obj
-00000000 t re_split
-00000000 R re_split_obj
-00000000 t re_sub
-00000000 t re_sub_helper
-00000000 R re_sub_obj
-00000000 r re_type
-00000000 t ure_exec
-         U vstr_add_byte
-         U vstr_add_strn
-         U vstr_init
-
-build/extmod/moduzlib.o:
-00000082 t $L167
-000000de t $L184
-0000001a t $L67
-00000002 t $LCFI0
-00000002 t $LCFI13
-00000002 t $LCFI16
-00000002 t $LCFI2
-00000002 t $LCFI20
-00000002 t $LCFI24
-00000004 t $LCFI28
-00000002 t $LCFI32
-00000002 t $LCFI36
-00000002 t $LCFI40
-00000002 t $LCFI44
-00000006 t $LCFI48
-00000002 t $LCFI5
-00000002 t $LCFI51
-00000002 t $LCFI53
-00000002 t $LCFI57
-00000002 t $LCFI61
-00000002 t $LCFI65
-00000002 t $LCFI67
-00000002 t $LCFI9
-00000000 R clcidx
-00000000 r decompio_locals_dict
-00000000 r decompio_locals_dict_table
-00000000 t decompio_make_new
-00000000 t decompio_read
-00000000 r decompio_stream_p
-00000000 r decompio_type
-00000000 R dist_base
-00000000 R dist_bits
-00000000 R length_base
-00000000 R length_bits
-         U memset
-         U m_free
-         U m_malloc
-00000000 t mod_uzlib_decompress
-00000000 r mod_uzlib_decompress_obj
-         U mp_arg_check_num_sig
-         U mp_get_buffer_raise
-         U mp_get_stream_raise
-00000000 R mp_module_uzlib
-00000000 r mp_module_uzlib_globals
-00000000 r mp_module_uzlib_globals_table
-         U mp_obj_get_int
-         U mp_obj_new_bytearray_by_ref
-         U mp_obj_new_exception
-         U mp_obj_new_exception_arg1
-         U mp_raise_OSError
-         U mp_raise_ValueError
-         U mp_stream_readinto_obj
-         U mp_stream_read_obj
-         U mp_stream_unbuffered_readline_obj
-         U mp_type_dict
-         U mp_type_EOFError
-         U mp_type_fun_builtin_var
-         U mp_type_module
-         U mp_type_type
-         U mp_type_ValueError
-         U m_realloc
-         U nlr_jump
-00000000 t read_src_stream
-00000000 t tinf_build_tree
-00000000 r tinf_crc32tab
-00000000 t tinf_decode_symbol
-00000000 t tinf_decode_trees
-00000000 T tinf_get_be_uint32
-00000000 t tinf_getbit
-00000000 T tinf_get_le_uint32
-00000000 T tinf_get_uint16
-00000000 t tinf_read_bits
-00000000 T tinf_skip_bytes
-00000000 T uzlib_adler32
-00000000 T uzlib_crc32
-00000000 T uzlib_get_byte
-00000000 T uzlib_gzip_parse_header
-00000000 T uzlib_init
-00000000 T uzlib_uncompress
-00000000 T uzlib_uncompress_chksum
-00000000 T uzlib_uncompress_init
-00000000 T uzlib_zlib_parse_header
-
-build/extmod/moduheapq.o:
-00000004 t $LCFI0
-00000002 t $LCFI10
-00000002 t $LCFI14
-00000002 t $LCFI17
-00000002 t $LCFI2
-00000002 t $LCFI6
-00000000 t mod_uheapq_heapify
-00000000 r mod_uheapq_heapify_obj
-00000000 t mod_uheapq_heappop
-00000000 r mod_uheapq_heappop_obj
-00000000 t mod_uheapq_heappush
-00000000 r mod_uheapq_heappush_obj
-         U mp_binary_op
-         U mp_const_false_obj
-         U mp_const_none_obj
-         U mp_const_true_obj
-00000000 R mp_module_uheapq
-00000000 r mp_module_uheapq_globals
-00000000 r mp_module_uheapq_globals_table
-         U mp_obj_list_append
-         U mp_obj_new_exception_msg
-         U mp_raise_TypeError
-         U mp_type_dict
-         U mp_type_fun_builtin_1
-         U mp_type_fun_builtin_2
-         U mp_type_IndexError
-         U mp_type_list
-         U mp_type_module
-         U nlr_jump
-00000000 t uheapq_get_heap
-00000000 t uheapq_heap_siftdown
-00000000 t uheapq_heap_siftup
-
-build/extmod/modutimeq.o:
-00000002 t $LCFI0
-00000002 t $LCFI10
-00000002 t $LCFI14
-00000002 t $LCFI2
-00000002 t $LCFI6
-         U memcpy
-         U memset
-         U m_malloc
-00000000 t mod_utimeq_heappop
-00000000 r mod_utimeq_heappop_obj
-00000000 t mod_utimeq_heappush
-00000000 r mod_utimeq_heappush_obj
-00000000 t mod_utimeq_peektime
-00000000 r mod_utimeq_peektime_obj
-         U mp_arg_check_num_sig
-         U mp_const_false_obj
-         U mp_const_none_obj
-         U mp_const_true_obj
-00000000 R mp_module_utimeq
-00000000 r mp_module_utimeq_globals
-00000000 r mp_module_utimeq_globals_table
-         U mp_obj_get_int
-         U mp_obj_new_exception_msg
-         U mp_raise_msg
-         U mp_raise_TypeError
-         U mp_type_dict
-         U mp_type_fun_builtin_1
-         U mp_type_fun_builtin_2
-         U mp_type_fun_builtin_var
-         U mp_type_IndexError
-         U mp_type_list
-         U mp_type_module
-         U mp_type_type
-         U nlr_jump
-00000000 t T.28
-00000000 t time_less_than
-00000000 t utimeq_get_heap
-00000000 b utimeq_id
-00000000 r utimeq_locals_dict
-00000000 r utimeq_locals_dict_table
-00000000 t utimeq_make_new
-00000000 r utimeq_type
-00000000 t utimeq_unary_op
-
-build/extmod/moduhashlib.o:
-00000002 t $LCFI0
-00000002 t $LCFI10
-00000002 t $LCFI14
-00000002 t $LCFI18
-00000002 t $LCFI3
-00000002 t $LCFI7
-00000000 r k
-         U memset
-         U m_malloc
-         U mp_arg_check_num_sig
-         U mp_const_none_obj
-         U mp_get_buffer_raise
-00000000 R mp_module_uhashlib
-00000000 r mp_module_uhashlib_globals
-00000000 r mp_module_uhashlib_globals_table
-         U mp_obj_new_str_from_vstr
-         U mp_type_bytes
-         U mp_type_dict
-         U mp_type_fun_builtin_1
-         U mp_type_fun_builtin_2
-         U mp_type_module
-         U mp_type_type
-00000000 T sha256_final
-00000000 T sha256_init
-00000000 t sha256_transform
-00000000 T sha256_update
-00000000 t uhashlib_sha256_digest
-00000000 r uhashlib_sha256_digest_obj
-00000000 r uhashlib_sha256_locals_dict
-00000000 r uhashlib_sha256_locals_dict_table
-00000000 t uhashlib_sha256_make_new
-00000000 r uhashlib_sha256_type
-00000000 t uhashlib_sha256_update
-00000000 r uhashlib_sha256_update_obj
-         U vstr_init_len
-
-build/extmod/moducryptolib.o:
-
-build/extmod/modubinascii.o:
-00000002 t $LCFI0
-00000002 t $LCFI10
-00000002 t $LCFI14
-00000002 t $LCFI4
-00000002 t $LCFI6
-00000000 T mod_binascii_a2b_base64
-00000000 R mod_binascii_a2b_base64_obj
-00000000 T mod_binascii_b2a_base64
-00000000 R mod_binascii_b2a_base64_obj
-00000000 T mod_binascii_crc32
-00000000 R mod_binascii_crc32_obj
-00000000 T mod_binascii_hexlify
-00000000 R mod_binascii_hexlify_obj
-00000000 T mod_binascii_unhexlify
-00000000 R mod_binascii_unhexlify_obj
-         U mp_const_empty_bytes_obj
-         U mp_get_buffer_raise
-00000000 r mp_module_binascii_globals
-00000000 r mp_module_binascii_globals_table
-00000000 R mp_module_ubinascii
-         U mp_obj_get_int_truncated
-         U mp_obj_new_int_from_uint
-         U mp_obj_new_str_from_vstr
-         U mp_obj_str_get_str
-         U mp_raise_ValueError
-         U mp_type_bytes
-         U mp_type_dict
-         U mp_type_fun_builtin_1
-         U mp_type_fun_builtin_var
-         U mp_type_module
-         U unichar_isxdigit
-         U unichar_xdigit_value
-         U uzlib_crc32
-         U vstr_init
-         U vstr_init_len
-
-build/extmod/virtpin.o:
-00000002 t $LCFI0
-00000002 t $LCFI2
-00000000 T mp_virtual_pin_read
-00000000 T mp_virtual_pin_write
-
-build/extmod/machine_mem.o:
-00000002 t $LCFI0
-00000002 t $LCFI3
-00000002 t $LCFI7
-00000000 R machine_mem16_obj
-00000000 R machine_mem32_obj
-00000000 R machine_mem8_obj
-00000000 t machine_mem_get_addr
-00000000 t machine_mem_print
-00000000 t machine_mem_subscr
-00000000 R machine_mem_type
-         U mp_const_none_obj
-         U mp_obj_get_int_truncated
-         U mp_obj_int_get_truncated
-         U mp_obj_new_exception_msg_varg
-         U mp_obj_new_int
-         U mp_printf
-         U mp_type_type
-         U mp_type_ValueError
-         U nlr_jump
-
-build/extmod/machine_pinbase.o:
-00000002 t $LCFI0
-00000000 R machine_pinbase_type
-         U mp_call_method_n_kw
-         U mp_const_false_obj
-         U mp_const_true_obj
-         U mp_load_method
-         U mp_obj_get_int
-         U mp_type_type
-00000000 T pinbase_ioctl
-00000000 t pinbase_make_new
-00000000 r pinbase_pin_p
-00000000 r pinbase_singleton
-
-build/extmod/machine_signal.o:
-000000da t $L33
-00000002 t $LCFI0
-00000002 t $LCFI11
-00000002 t $LCFI13
-00000002 t $LCFI2
-00000002 t $LCFI4
-00000002 t $LCFI7
-00000000 R machine_signal_type
-         U memcpy
-         U m_malloc
-         U mp_arg_check_num_sig
-         U mp_const_none_obj
-         U mp_obj_is_true
-         U mp_pin_make_new
-         U mp_raise_TypeError
-         U mp_type_dict
-         U mp_type_fun_builtin_1
-         U mp_type_fun_builtin_var
-         U mp_type_type
-         U mp_virtual_pin_read
-         U mp_virtual_pin_write
-00000000 t signal_call
-00000000 t signal_ioctl
-00000000 r signal_locals_dict
-00000000 r signal_locals_dict_table
-00000000 t signal_make_new
-00000000 t signal_off
-00000000 r signal_off_obj
-00000000 t signal_on
-00000000 r signal_on_obj
-00000000 r signal_pin_p
-00000000 t signal_value
-00000000 r signal_value_obj
-
-build/extmod/machine_pulse.o:
-
-build/extmod/machine_i2c.o:
-
-build/extmod/machine_spi.o:
-00000002 t $LCFI0
-00000002 t $LCFI10
-00000002 t $LCFI13
-00000002 t $LCFI16
-00000002 t $LCFI2
-00000002 t $LCFI20
-00000002 t $LCFI24
-00000002 t $LCFI28
-00000002 t $LCFI4
-00000002 t $LCFI6
-00000002 t $LCFI8
-00000000 r allowed_args.6291
-00000000 r allowed_args.6334
-00000000 t baudrate_to_delay_half
-00000000 t machine_spi_deinit
-00000000 r machine_spi_deinit_obj
-00000000 t machine_spi_init
-00000000 r machine_spi_init_obj
-00000000 r machine_spi_locals_dict_table
-         U memset
-         U m_malloc
-         U mp_arg_parse_all
-         U mp_arg_parse_all_kw_array
-         U mp_const_none_obj
-         U mp_get_buffer_raise
-         U mp_hal_get_pin_obj
-00000000 t mp_machine_soft_spi_init
-00000000 R mp_machine_soft_spi_p
-00000000 t mp_machine_soft_spi_print
-00000000 t mp_machine_soft_spi_transfer
-00000000 R mp_machine_soft_spi_type
-00000000 R mp_machine_spi_locals_dict
-00000000 T mp_machine_spi_make_new
-00000000 t mp_machine_spi_read
-00000000 t mp_machine_spi_readinto
-00000000 R mp_machine_spi_readinto_obj
-00000000 R mp_machine_spi_read_obj
-00000000 t mp_machine_spi_transfer
-00000000 t mp_machine_spi_write
-00000000 R mp_machine_spi_write_obj
-00000000 t mp_machine_spi_write_readinto
-00000000 R mp_machine_spi_write_readinto_obj
-         U mp_obj_get_int
-         U mp_obj_new_str_from_vstr
-         U mp_printf
-         U mp_raise_ValueError
-         U mp_soft_spi_ioctl
-         U mp_soft_spi_transfer
-         U mp_type_bytes
-         U mp_type_dict
-         U mp_type_fun_builtin_1
-         U mp_type_fun_builtin_2
-         U mp_type_fun_builtin_3
-         U mp_type_fun_builtin_var
-         U mp_type_type
-         U vstr_init_len
-
-build/extmod/modussl_axtls.o:
-00000002 t $LCFI0
-00000002 t $LCFI12
-00000002 t $LCFI15
-00000002 t $LCFI19
-00000002 t $LCFI4
-00000002 t $LCFI8
-00000000 r allowed_args.6852
-         U g_InterfaceVtbl
-         U memcpy
-         U m_malloc
-00000000 t mod_ssl_wrap_socket
-00000000 r mod_ssl_wrap_socket_obj
-         U mp_arg_parse_all
-         U mp_call_method_n_kw
-         U mp_const_none_obj
-         U mp_load_method
-00000000 r mp_module_ssl_globals
-00000000 r mp_module_ssl_globals_table
-00000000 R mp_module_ussl
-         U mp_obj_is_true
-         U mp_obj_str_get_data
-         U mp_obj_str_get_str
-         U mp_printf
-         U mp_raise_OSError
-         U mp_raise_ValueError
-         U mp_stream_close_obj
-         U mp_stream_readinto_obj
-         U mp_stream_read_obj
-         U mp_stream_unbuffered_readline_obj
-         U mp_stream_write_obj
-         U mp_type_dict
-         U mp_type_fun_builtin_2
-         U mp_type_fun_builtin_var
-         U mp_type_module
-         U mp_type_type
-         U ssl_client_new
-         U ssl_ctx_free
-         U ssl_ctx_new
-         U ssl_display_error
-         U ssl_ext_new
-         U ssl_free
-         U ssl_handshake_status
-         U ssl_obj_memory_load
-         U ssl_read
-         U ssl_server_new
-         U ssl_write
-00000000 t ussl_socket_ioctl
-00000000 r ussl_socket_locals_dict
-00000000 r ussl_socket_locals_dict_table
-00000000 t ussl_socket_print
-00000000 t ussl_socket_read
-00000000 t ussl_socket_setblocking
-00000000 r ussl_socket_setblocking_obj
-00000000 r ussl_socket_stream_p
-00000000 r ussl_socket_type
-00000000 t ussl_socket_write
-
-build/extmod/modussl_mbedtls.o:
-
-build/extmod/modurandom.o:
-00000088 t $L32
-00000002 t $LCFI0
-00000002 t $LCFI10
-00000002 t $LCFI14
-00000002 t $LCFI16
-00000002 t $LCFI19
-00000002 t $LCFI23
-00000002 t $LCFI27
-00000002 t $LCFI29
-00000002 t $LCFI3
-00000002 t $LCFI7
-         U __adddf3
-00000000 t mod_urandom_choice
-00000000 r mod_urandom_choice_obj
-00000000 t mod_urandom_getrandbits
-00000000 r mod_urandom_getrandbits_obj
-00000000 t mod_urandom_randint
-00000000 r mod_urandom_randint_obj
-00000000 t mod_urandom_random
-00000000 r mod_urandom_random_obj
-00000000 t mod_urandom_randrange
-00000000 r mod_urandom_randrange_obj
-00000000 t mod_urandom_seed
-00000000 r mod_urandom_seed_obj
-00000000 t mod_urandom_uniform
-00000000 r mod_urandom_uniform_obj
-         U mp_const_none_obj
-00000000 R mp_module_urandom
-00000000 r mp_module_urandom_globals
-00000000 r mp_module_urandom_globals_table
-         U mp_obj_get_float
-         U mp_obj_get_int
-         U mp_obj_get_int_truncated
-         U mp_obj_len
-         U mp_obj_new_exception
-         U mp_obj_new_float
-         U mp_obj_new_int
-         U mp_obj_new_int_from_uint
-         U mp_obj_subscr
-         U mp_raise_ValueError
-         U mp_type_dict
-         U mp_type_fun_builtin_0
-         U mp_type_fun_builtin_1
-         U mp_type_fun_builtin_2
-         U mp_type_fun_builtin_var
-         U mp_type_IndexError
-         U mp_type_module
-         U __muldf3
-         U nlr_jump
-         U __subdf3
-00000000 t yasmarang
-00000000 d yasmarang_d
-00000000 b yasmarang_dat
-00000000 t yasmarang_float
-00000000 d yasmarang_n
-00000000 d yasmarang_pad
-00000000 t yasmarang_randbelow
-
-build/extmod/moduselect.o:
-00000002 t $LCFI0
-00000002 t $LCFI13
-00000002 t $LCFI17
-00000002 t $LCFI21
-00000002 t $LCFI25
-00000002 t $LCFI28
-00000002 t $LCFI3
-00000002 t $LCFI32
-00000002 t $LCFI36
-00000002 t $LCFI5
-00000002 t $LCFI9
-         U __fixunssfsi
-         U __gesf2
-         U g_InterfaceVtbl
-         U m_malloc
-         U mp_const_none_obj
-         U mp_get_stream_raise
-         U mp_hal_ticks_ms
-         U mp_handle_pending
-         U mp_identity_getiter
-         U mp_map_deinit
-         U mp_map_init
-         U mp_map_lookup
-00000000 r mp_module_select_globals
-00000000 r mp_module_select_globals_table
-00000000 R mp_module_uselect
-         U mp_obj_get_array
-         U mp_obj_get_float
-         U mp_obj_get_int
-         U mp_obj_id
-         U mp_obj_new_list
-         U mp_obj_new_tuple
-         U mp_raise_OSError
-00000000 R mp_select_poll_obj
-00000000 R mp_select_select_obj
-         U mp_type_dict
-         U mp_type_fun_builtin_0
-         U mp_type_fun_builtin_2
-         U mp_type_fun_builtin_3
-         U mp_type_fun_builtin_var
-         U mp_type_module
-00000000 r mp_type_poll
-         U mp_type_type
-         U __mulsf3
-00000000 t poll_ipoll
-00000000 R poll_ipoll_obj
-00000000 t poll_iternext
-00000000 r poll_locals_dict
-00000000 r poll_locals_dict_table
-00000000 t poll_map_add
-00000000 t poll_map_poll
-00000000 t poll_modify
-00000000 R poll_modify_obj
-00000000 t poll_poll
-00000000 t poll_poll_internal
-00000000 R poll_poll_obj
-00000000 t poll_register
-00000000 R poll_register_obj
-00000000 t poll_unregister
-00000000 R poll_unregister_obj
-00000000 t select_poll
-00000000 t select_select
-         U __truncdfsf2
-
-build/extmod/moduwebsocket.o:
-
-build/extmod/modwebrepl.o:
-
-build/extmod/modframebuf.o:
-00000002 t $LCFI0
-00000002 t $LCFI10
-0000000a t $LCFI14
-00000002 t $LCFI16
-00000004 t $LCFI2
-00000002 t $LCFI20
-00000002 t $LCFI24
-00000002 t $LCFI28
-00000002 t $LCFI32
-00000002 t $LCFI36
-00000002 t $LCFI40
-00000002 t $LCFI44
-00000002 t $LCFI48
-00000002 t $LCFI5
-00000002 t $LCFI52
-00000002 t $LCFI55
-00000002 t $LCFI59
-00000002 t $LCFI63
-00000002 t $LCFI67
-00000002 t $LCFI71
-00000004 t $LCFI8
-00000000 t fill_rect
-00000000 r font_petme128_8x8
-00000000 r formats
-00000000 t framebuf_blit
-00000000 r framebuf_blit_obj
-00000000 t framebuf_fill
-00000000 r framebuf_fill_obj
-00000000 t framebuf_fill_rect
-00000000 r framebuf_fill_rect_obj
-00000000 t framebuf_get_buffer
-00000000 t framebuf_hline
-00000000 r framebuf_hline_obj
-00000000 t framebuf_line
-00000000 r framebuf_line_obj
-00000000 r framebuf_locals_dict
-00000000 r framebuf_locals_dict_table
-00000000 t framebuf_make_new
-00000000 r framebuf_module_globals
-00000000 r framebuf_module_globals_table
-00000000 t framebuf_pixel
-00000000 r framebuf_pixel_obj
-00000000 t framebuf_rect
-00000000 r framebuf_rect_obj
-00000000 t framebuf_scroll
-00000000 r framebuf_scroll_obj
-00000000 t framebuf_text
-00000000 r framebuf_text_obj
-00000000 t framebuf_vline
-00000000 r framebuf_vline_obj
-00000000 t gs2_hmsb_fill_rect
-00000000 t gs2_hmsb_getpixel
-00000000 t gs2_hmsb_setpixel
-00000000 t gs4_hmsb_fill_rect
-00000000 t gs4_hmsb_getpixel
-00000000 t gs4_hmsb_setpixel
-00000000 t gs8_fill_rect
-00000000 t gs8_getpixel
-00000000 t gs8_setpixel
-00000000 t legacy_framebuffer1
-00000000 r legacy_framebuffer1_obj
-         U memset
-         U m_malloc
-00000000 t mono_horiz_fill_rect
-00000000 t mono_horiz_getpixel
-00000000 t mono_horiz_setpixel
-         U mp_arg_check_num_sig
-         U mp_const_none_obj
-         U mp_get_buffer_raise
-00000000 R mp_module_framebuf
-         U mp_obj_get_int
-         U mp_obj_str_get_str
-         U mp_raise_ValueError
-         U mp_type_dict
-00000000 R mp_type_framebuf
-         U mp_type_fun_builtin_2
-         U mp_type_fun_builtin_3
-         U mp_type_fun_builtin_var
-         U mp_type_module
-         U mp_type_type
-00000000 t mvlsb_fill_rect
-00000000 t mvlsb_getpixel
-00000000 t mvlsb_setpixel
-00000000 t rgb565_fill_rect
-00000000 t rgb565_getpixel
-00000000 t rgb565_setpixel
-00000000 t setpixel
-
-build/extmod/vfs.o:
-00000002 t $LCFI0
-00000006 t $LCFI12
-00000002 t $LCFI16
-00000002 t $LCFI20
-00000002 t $LCFI24
-00000002 t $LCFI26
-00000002 t $LCFI29
-00000002 t $LCFI32
-00000002 t $LCFI36
-00000002 t $LCFI39
-00000002 t $LCFI4
-00000002 t $LCFI42
-00000002 t $LCFI46
-00000002 t $LCFI50
-00000002 t $LCFI53
-00000002 t $LCFI56
-00000002 t $LCFI60
-00000002 t $LCFI8
-00000000 r allowed_args.6569
-00000000 r allowed_args.6659
-         U g_InterfaceVtbl
-00000000 t lookup_path
-         U memcmp
-         U memcpy
-         U m_malloc
-         U mp_arg_parse_all
-         U mp_call_method_n_kw
-         U mp_const_false_obj
-         U mp_const_none_obj
-         U mp_fat_vfs_type
-         U mp_iternext
-         U mp_load_method
-         U mp_load_method_maybe
-         U mp_obj_get_array_fixed_n
-         U mp_obj_get_int
-         U mp_obj_get_type
-         U mp_obj_list_append
-         U mp_obj_new_list
-         U mp_obj_new_str
-         U mp_obj_new_str_from_vstr
-         U mp_obj_new_str_of_type
-         U mp_obj_new_tuple
-         U mp_obj_str_get_data
-         U mp_obj_str_get_str
-         U mp_obj_subscr
-         U mp_raise_OSError
-         U mp_state_ctx
-         U mp_type_bytes
-         U mp_type_fun_builtin_0
-         U mp_type_fun_builtin_1
-         U mp_type_fun_builtin_2
-         U mp_type_fun_builtin_var
-         U mp_type_polymorph_iter
-         U mp_type_str
-00000000 T mp_vfs_chdir
-00000000 R mp_vfs_chdir_obj
-00000000 T mp_vfs_getcwd
-00000000 R mp_vfs_getcwd_obj
-00000000 T mp_vfs_ilistdir
-00000000 t mp_vfs_ilistdir_it_iternext
-00000000 R mp_vfs_ilistdir_obj
-00000000 T mp_vfs_import_stat
-00000000 T mp_vfs_listdir
-00000000 R mp_vfs_listdir_obj
-00000000 T mp_vfs_lookup_path
-00000000 T mp_vfs_mkdir
-00000000 R mp_vfs_mkdir_obj
-00000000 T mp_vfs_mount
-00000000 R mp_vfs_mount_obj
-00000000 T mp_vfs_open
-00000000 R mp_vfs_open_obj
-00000000 t mp_vfs_proxy_call
-00000000 T mp_vfs_remove
-00000000 R mp_vfs_remove_obj
-00000000 T mp_vfs_rename
-00000000 R mp_vfs_rename_obj
-00000000 T mp_vfs_rmdir
-00000000 R mp_vfs_rmdir_obj
-00000000 T mp_vfs_stat
-00000000 R mp_vfs_stat_obj
-00000000 T mp_vfs_statvfs
-00000000 R mp_vfs_statvfs_obj
-00000000 T mp_vfs_umount
-00000000 R mp_vfs_umount_obj
-         U nlr_pop
-         U nlr_push_tail
-         U strcmp
-         U strlen
-         U strncmp
-         U vstr_add_str
-         U vstr_add_strn
-         U vstr_init
-
-build/extmod/vfs_reader.o:
-00000002 t $LCFI0
-00000002 t $LCFI3
-00000002 t $LCFI7
-         U m_free
-         U m_malloc
-         U mp_const_empty_map
-         U mp_obj_new_str
-         U mp_raise_OSError
-00000000 T mp_reader_new_file
-00000000 t mp_reader_vfs_close
-00000000 t mp_reader_vfs_readbyte
-         U mp_stream_close
-         U mp_stream_rw
-         U mp_vfs_open
-         U strlen
-
-build/extmod/vfs_posix.o:
-
-build/extmod/vfs_posix_file.o:
-
-build/extmod/vfs_fat.o:
-00000002 t $LCFI0
-00000002 t $LCFI11
-00000002 t $LCFI15
-00000002 t $LCFI19
-00000002 t $LCFI23
-00000002 t $LCFI25
-00000002 t $LCFI27
-00000002 t $LCFI30
-00000002 t $LCFI33
-00000002 t $LCFI36
-0000000e t $LCFI4
-00000002 t $LCFI40
-00000002 t $LCFI44
-00000002 t $LCFI48
-00000002 t $LCFI5
-0000000c t $LCFI52
-00000002 t $LCFI8
-00000000 t fat_vfs_chdir
-00000000 r fat_vfs_chdir_obj
-00000000 t fat_vfs_getcwd
-00000000 r fat_vfs_getcwd_obj
-00000000 t fat_vfs_ilistdir_func
-00000000 r fat_vfs_ilistdir_obj
-00000000 t fat_vfs_import_stat
-00000000 r fat_vfs_locals_dict
-00000000 r fat_vfs_locals_dict_table
-00000000 t fat_vfs_make_new
-00000000 t fat_vfs_mkdir
-00000000 r fat_vfs_mkdir_obj
-00000000 t fat_vfs_mkfs
-00000000 r fat_vfs_mkfs_fun_obj
-00000000 r fat_vfs_mkfs_obj
-         U fat_vfs_open_obj
-00000000 r fat_vfs_proto
-00000000 t fat_vfs_remove
-00000000 t fat_vfs_remove_internal
-00000000 r fat_vfs_remove_obj
-00000000 t fat_vfs_rename
-00000000 r fat_vfs_rename_obj
-00000000 t fat_vfs_rmdir
-00000000 r fat_vfs_rmdir_obj
-00000000 t fat_vfs_stat
-00000000 r fat_vfs_stat_obj
-00000000 t fat_vfs_statvfs
-00000000 r fat_vfs_statvfs_obj
-00000000 r fat_vfs_umount_obj
-         U f_chdir
-         U f_closedir
-         U f_getcwd
-         U f_getfree
-         U f_mkdir
-         U f_mkfs
-         U f_mount
-         U f_opendir
-         U f_readdir
-         U f_rename
-         U fresult_to_errno_table
-         U f_stat
-         U f_unlink
-         U g_InterfaceVtbl
-         U m_malloc
-         U mp_arg_check_num_sig
-         U mp_const_none_obj
-00000000 R mp_fat_vfs_type
-         U mp_load_method
-         U mp_load_method_maybe
-         U mp_obj_get_type
-         U mp_obj_is_true
-         U mp_obj_new_bytes
-         U mp_obj_new_int_from_uint
-         U mp_obj_new_str
-         U mp_obj_new_tuple
-         U mp_obj_str_get_str
-         U mp_raise_OSError
-         U mp_type_bytes
-         U mp_type_dict
-         U mp_type_fun_builtin_1
-         U mp_type_fun_builtin_2
-         U mp_type_fun_builtin_3
-         U mp_type_fun_builtin_var
-         U mp_type_polymorph_iter
-         U mp_type_staticmethod
-         U mp_type_type
-00000000 t mp_vfs_fat_ilistdir_it_iternext
-         U strlen
-         U timeutils_seconds_since_2000
-00000000 t vfs_fat_mount
-00000000 r vfs_fat_mount_obj
-00000000 t vfs_fat_umount
-
-build/extmod/vfs_fat_diskio.o:
-00000002 t $LCFI0
-00000002 t $LCFI4
-00000002 t $LCFI8
-00000000 t disk_get_device
-00000000 T disk_ioctl
-00000000 T disk_read
-00000000 T disk_write
-         U mp_call_method_n_kw
-         U mp_const_none_obj
-         U mp_obj_get_int
-         U mp_type_bytearray
-00000000 r op_map.6650
-
-build/extmod/vfs_fat_file.o:
-00000004 t $LCFI0
-00000002 t $LCFI10
-00000002 t $LCFI13
-00000002 t $LCFI17
-00000002 t $LCFI19
-00000002 t $LCFI2
-00000002 t $LCFI23
-00000002 t $LCFI6
-00000000 t fatfs_builtin_open_self
-00000000 R fat_vfs_open_obj
-         U f_close
-00000000 t file_obj___exit__
-00000000 r file_obj___exit___obj
-00000000 t file_obj_ioctl
-00000000 t file_obj_make_new
-00000000 t file_obj_print
-00000000 t file_obj_read
-00000000 t file_obj_write
-00000000 t file_open
-00000000 r file_open_args
-         U f_lseek
-         U f_open
-         U f_read
-00000000 R fresult_to_errno_table
-         U f_sync
-         U f_write
-         U g_InterfaceVtbl
-         U m_free
-         U m_malloc_with_finaliser
-         U mp_arg_parse_all_kw_array
-         U mp_const_none_obj
-         U mp_identity_getiter
-         U mp_identity_obj
-         U mp_obj_get_type_str
-         U mp_obj_str_get_str
-         U mp_printf
-         U mp_raise_OSError
-         U mp_stream_close
-         U mp_stream_close_obj
-         U mp_stream_flush_obj
-         U mp_stream_readinto_obj
-         U mp_stream_read_obj
-         U mp_stream_seek_obj
-         U mp_stream_tell_obj
-         U mp_stream_unbuffered_iter
-         U mp_stream_unbuffered_readline_obj
-         U mp_stream_unbuffered_readlines_obj
-         U mp_stream_write_obj
-         U mp_type_dict
-         U mp_type_fun_builtin_3
-         U mp_type_fun_builtin_var
-         U mp_type_type
-00000000 R mp_type_vfs_fat_fileio
-00000000 R mp_type_vfs_fat_textio
-00000000 r vfs_fat_fileio_stream_p
-00000000 r vfs_fat_rawfile_locals_dict
-00000000 r vfs_fat_rawfile_locals_dict_table
-00000000 r vfs_fat_textio_stream_p
-
-build/extmod/utime_mphal.o:
-00000002 t $LCFI0
-00000002 t $LCFI11
-00000002 t $LCFI13
-00000002 t $LCFI2
-00000002 t $LCFI5
-00000002 t $LCFI7
-00000002 t $LCFI9
-         U __fixunsdfsi
-         U g_InterfaceVtbl
-         U mp_const_none_obj
-         U mp_hal_delay_ms
-         U mp_hal_delay_us
-         U mp_hal_ticks_ms
-         U mp_hal_ticks_us
-         U mp_obj_get_float
-         U mp_obj_get_int
-         U mp_type_fun_builtin_0
-         U mp_type_fun_builtin_1
-         U mp_type_fun_builtin_2
-00000000 R mp_utime_sleep_ms_obj
-00000000 R mp_utime_sleep_obj
-00000000 R mp_utime_sleep_us_obj
-00000000 R mp_utime_ticks_add_obj
-00000000 R mp_utime_ticks_cpu_obj
-00000000 R mp_utime_ticks_diff_obj
-00000000 R mp_utime_ticks_ms_obj
-00000000 R mp_utime_ticks_us_obj
-         U __muldf3
-00000000 t time_sleep
-00000000 t time_sleep_ms
-00000000 t time_sleep_us
-00000000 t time_ticks_add
-00000000 t time_ticks_cpu
-00000000 t time_ticks_diff
-00000000 t time_ticks_ms
-00000000 t time_ticks_us
-
-build/extmod/uos_dupterm.o:
-00000002 t $LCFI0
-00000002 t $LCFI12
-00000002 t $LCFI16
-00000002 t $LCFI4
-00000004 t $LCFI8
-         U g_InterfaceVtbl
-         U mp_const_none_obj
-         U mp_get_stream_raise
-         U mp_interrupt_char
-         U mp_keyboard_interrupt
-         U mp_obj_get_int
-         U mp_obj_print_exception
-         U mp_plat_print
-         U mp_printf
-         U mp_raise_OSError
-         U mp_raise_ValueError
-         U mp_state_ctx
-         U mp_stream_close
-         U mp_stream_write
-         U mp_type_fun_builtin_var
-00000000 T mp_uos_deactivate
-00000000 t mp_uos_dupterm
-00000000 R mp_uos_dupterm_obj
-00000000 T mp_uos_dupterm_poll
-00000000 T mp_uos_dupterm_rx_chr
-00000000 T mp_uos_dupterm_tx_strn
-         U nlr_pop
-         U nlr_push_tail
-
-build/lib/embed/abort_.o:
-00000002 t $LCFI0
-00000000 T abort_
-         U mp_raise_msg
-         U mp_type_RuntimeError
-
-build/lib/utils/printf.o:
-
-build/build/frozen_mpy.o:
-00000000 r const_obj_upip__lt_module_gt__0
-00000000 r const_obj_upip__lt_module_gt__1
-00000000 r const_obj_upip__lt_module_gt__cleanup_0
-00000000 r const_obj_upip__lt_module_gt__get_pkg_metadata_0
-00000000 r const_obj_upip__lt_module_gt__help_0
-00000000 r const_obj_upip__lt_module_gt__help_1
-00000000 r const_obj_upip__lt_module_gt__help_2
-00000000 r const_obj_upip__lt_module_gt__install_0
-00000000 r const_obj_upip__lt_module_gt__install_1
-00000000 r const_obj_upip__lt_module_gt__install_pkg_0
-00000000 r const_obj_upip__lt_module_gt__install_tar_0
-00000000 r const_obj_upip__lt_module_gt__install_tar_1
-00000000 r const_obj_upip__lt_module_gt__main_0
-00000000 r const_obj_upip__lt_module_gt__main_1
-00000000 r const_obj_upip__lt_module_gt__url_open_0
-00000000 r const_obj_upip__lt_module_gt__url_open_1
-00000000 r const_obj_upip__lt_module_gt__url_open_2
-00000000 r const_obj_upip__lt_module_gt__url_open_3
-00000000 r const_obj_upip__lt_module_gt__url_open_4
-00000000 r const_obj_upip__lt_module_gt__url_open_5
-00000000 r const_obj_upip__lt_module_gt__url_open_6
-00000000 r const_obj_upip__lt_module_gt__url_open_7
-00000000 r const_obj_upip__lt_module_gt__url_open_8
-00000000 r const_obj_upip_utarfile__lt_module_gt__FileSection_read_0
-00000000 r const_obj_upip_utarfile__lt_module_gt__TarInfo___str___0
-00000000 r const_table_data_blink__lt_module_gt_
-00000000 r const_table_data_blink__lt_module_gt__blink
-00000000 r const_table_data_network__lt_module_gt_
-00000000 r const_table_data_network__lt_module_gt__WWAN
-00000000 r const_table_data_network__lt_module_gt__WWAN_active
-00000000 r const_table_data_network__lt_module_gt__WWAN_connect
-00000000 r const_table_data_network__lt_module_gt__WWAN_disconnect
-00000000 r const_table_data_network__lt_module_gt__WWAN_ifconfig
-00000000 r const_table_data_network__lt_module_gt__WWAN_isconnected
-00000000 r const_table_data_network__lt_module_gt__WWAN___new__
-00000000 r const_table_data_upip__lt_module_gt_
-00000000 r const_table_data_upip__lt_module_gt__cleanup
-00000000 r const_table_data_upip__lt_module_gt__expandhome
-00000000 r const_table_data_upip__lt_module_gt__fatal
-00000000 r const_table_data_upip__lt_module_gt__get_pkg_metadata
-00000000 r const_table_data_upip__lt_module_gt__help
-00000000 r const_table_data_upip__lt_module_gt__install
-00000000 r const_table_data_upip__lt_module_gt__install_pkg
-00000000 r const_table_data_upip__lt_module_gt__install_tar
-00000000 r const_table_data_upip__lt_module_gt__main
-00000000 r const_table_data_upip__lt_module_gt___makedirs
-00000000 r const_table_data_upip__lt_module_gt__op_basename
-00000000 r const_table_data_upip__lt_module_gt__op_split
-00000000 r const_table_data_upip__lt_module_gt__save_file
-00000000 r const_table_data_upip__lt_module_gt__url_open
-00000000 r const_table_data_upip_utarfile__lt_module_gt_
-00000000 r const_table_data_upip_utarfile__lt_module_gt__FileSection
-00000000 r const_table_data_upip_utarfile__lt_module_gt__FileSection___init__
-00000000 r const_table_data_upip_utarfile__lt_module_gt__FileSection_read
-00000000 r const_table_data_upip_utarfile__lt_module_gt__FileSection_readinto
-00000000 r const_table_data_upip_utarfile__lt_module_gt__FileSection_skip
-00000000 r const_table_data_upip_utarfile__lt_module_gt__roundup
-00000000 r const_table_data_upip_utarfile__lt_module_gt__TarFile
-00000000 r const_table_data_upip_utarfile__lt_module_gt__TarFile_extractfile
-00000000 r const_table_data_upip_utarfile__lt_module_gt__TarFile___init__
-00000000 r const_table_data_upip_utarfile__lt_module_gt__TarFile___iter__
-00000000 r const_table_data_upip_utarfile__lt_module_gt__TarFile___next__
-00000000 r const_table_data_upip_utarfile__lt_module_gt__TarFile_next
-00000000 r const_table_data_upip_utarfile__lt_module_gt__TarInfo
-00000000 r const_table_data_upip_utarfile__lt_module_gt__TarInfo___str__
-00000000 r fun_data_blink__lt_module_gt_
-00000000 r fun_data_blink__lt_module_gt__blink
-00000000 r fun_data__boot__lt_module_gt_
-00000000 r fun_data_network__lt_module_gt_
-00000000 r fun_data_network__lt_module_gt__WWAN
-00000000 r fun_data_network__lt_module_gt__WWAN_active
-00000000 r fun_data_network__lt_module_gt__WWAN_connect
-00000000 r fun_data_network__lt_module_gt__WWAN_disconnect
-00000000 r fun_data_network__lt_module_gt__WWAN_ifconfig
-00000000 r fun_data_network__lt_module_gt__WWAN_isconnected
-00000000 r fun_data_network__lt_module_gt__WWAN___new__
-00000000 r fun_data_upip__lt_module_gt_
-00000000 r fun_data_upip__lt_module_gt__cleanup
-00000000 r fun_data_upip__lt_module_gt__expandhome
-00000000 r fun_data_upip__lt_module_gt__fatal
-00000000 r fun_data_upip__lt_module_gt__get_install_path
-00000000 r fun_data_upip__lt_module_gt__get_pkg_metadata
-00000000 r fun_data_upip__lt_module_gt__help
-00000000 r fun_data_upip__lt_module_gt__install
-00000000 r fun_data_upip__lt_module_gt__install_pkg
-00000000 r fun_data_upip__lt_module_gt__install_tar
-00000000 r fun_data_upip__lt_module_gt__main
-00000000 r fun_data_upip__lt_module_gt___makedirs
-00000000 r fun_data_upip__lt_module_gt__NotFoundError
-00000000 r fun_data_upip__lt_module_gt__op_basename
-00000000 r fun_data_upip__lt_module_gt__op_split
-00000000 r fun_data_upip__lt_module_gt__save_file
-00000000 r fun_data_upip__lt_module_gt__url_open
-00000000 r fun_data_upip_utarfile__lt_module_gt_
-00000000 r fun_data_upip_utarfile__lt_module_gt__FileSection
-00000000 r fun_data_upip_utarfile__lt_module_gt__FileSection___init__
-00000000 r fun_data_upip_utarfile__lt_module_gt__FileSection_read
-00000000 r fun_data_upip_utarfile__lt_module_gt__FileSection_readinto
-00000000 r fun_data_upip_utarfile__lt_module_gt__FileSection_skip
-00000000 r fun_data_upip_utarfile__lt_module_gt__roundup
-00000000 r fun_data_upip_utarfile__lt_module_gt__TarFile
-00000000 r fun_data_upip_utarfile__lt_module_gt__TarFile_extractfile
-00000000 r fun_data_upip_utarfile__lt_module_gt__TarFile___init__
-00000000 r fun_data_upip_utarfile__lt_module_gt__TarFile___iter__
-00000000 r fun_data_upip_utarfile__lt_module_gt__TarFile___next__
-00000000 r fun_data_upip_utarfile__lt_module_gt__TarFile_next
-00000000 r fun_data_upip_utarfile__lt_module_gt__TarInfo
-00000000 r fun_data_upip_utarfile__lt_module_gt__TarInfo___str__
-00000000 R mp_frozen_mpy_content
-00000000 R mp_frozen_mpy_names
-         U mp_qstr_const_pool
-00000000 R mp_qstr_frozen_const_pool
-         U mp_type_bytes
-         U mp_type_str
-00000000 R raw_code_blink__lt_module_gt_
-00000000 r raw_code_blink__lt_module_gt__blink
-00000000 R raw_code__boot__lt_module_gt_
-00000000 R raw_code_network__lt_module_gt_
-00000000 r raw_code_network__lt_module_gt__WWAN
-00000000 r raw_code_network__lt_module_gt__WWAN_active
-00000000 r raw_code_network__lt_module_gt__WWAN_connect
-00000000 r raw_code_network__lt_module_gt__WWAN_disconnect
-00000000 r raw_code_network__lt_module_gt__WWAN_ifconfig
-00000000 r raw_code_network__lt_module_gt__WWAN_isconnected
-00000000 r raw_code_network__lt_module_gt__WWAN___new__
-00000000 R raw_code_upip__lt_module_gt_
-00000000 r raw_code_upip__lt_module_gt__cleanup
-00000000 r raw_code_upip__lt_module_gt__expandhome
-00000000 r raw_code_upip__lt_module_gt__fatal
-00000000 r raw_code_upip__lt_module_gt__get_install_path
-00000000 r raw_code_upip__lt_module_gt__get_pkg_metadata
-00000000 r raw_code_upip__lt_module_gt__help
-00000000 r raw_code_upip__lt_module_gt__install
-00000000 r raw_code_upip__lt_module_gt__install_pkg
-00000000 r raw_code_upip__lt_module_gt__install_tar
-00000000 r raw_code_upip__lt_module_gt__main
-00000000 r raw_code_upip__lt_module_gt___makedirs
-00000000 r raw_code_upip__lt_module_gt__NotFoundError
-00000000 r raw_code_upip__lt_module_gt__op_basename
-00000000 r raw_code_upip__lt_module_gt__op_split
-00000000 r raw_code_upip__lt_module_gt__save_file
-00000000 r raw_code_upip__lt_module_gt__url_open
-00000000 R raw_code_upip_utarfile__lt_module_gt_
-00000000 r raw_code_upip_utarfile__lt_module_gt__FileSection
-00000000 r raw_code_upip_utarfile__lt_module_gt__FileSection___init__
-00000000 r raw_code_upip_utarfile__lt_module_gt__FileSection_read
-00000000 r raw_code_upip_utarfile__lt_module_gt__FileSection_readinto
-00000000 r raw_code_upip_utarfile__lt_module_gt__FileSection_skip
-00000000 r raw_code_upip_utarfile__lt_module_gt__roundup
-00000000 r raw_code_upip_utarfile__lt_module_gt__TarFile
-00000000 r raw_code_upip_utarfile__lt_module_gt__TarFile_extractfile
-00000000 r raw_code_upip_utarfile__lt_module_gt__TarFile___init__
-00000000 r raw_code_upip_utarfile__lt_module_gt__TarFile___iter__
-00000000 r raw_code_upip_utarfile__lt_module_gt__TarFile___next__
-00000000 r raw_code_upip_utarfile__lt_module_gt__TarFile_next
-00000000 r raw_code_upip_utarfile__lt_module_gt__TarInfo
-00000000 r raw_code_upip_utarfile__lt_module_gt__TarInfo___str__
-
-build/main.o:
-00000024 t $L60
-00000002 t $LCFI0
-00000002 t $LCFI13
-00000002 t $LCFI16
-00000002 t $LCFI18
-00000002 t $LCFI20
-00000002 t $LCFI3
-00000002 t $LCFI5
-00000002 t $LCFI9
-00000000 T AppMainTask
-         U Buffer_Init
-00000000 T do_str
-00000000 T EventDispatch
-0000000c C fifoBuffer
-00000800 C fifoBufferData
-00000000 T gc_collect
-         U gc_collect_end
-         U gc_collect_root
-         U gc_collect_start
-         U gc_helper_get_regs_and_sp
-         U gc_init
-         U gc_sweep_all
-         U g_InterfaceVtbl
-00000000 b heap
-00000000 T _Main
-00000000 B mainTaskHandle
-00000000 T MicroPyTask
-00000000 B microPyTaskHandle
-         U modcellular_init0
-         U modcellular_notify_act
-         U modcellular_notify_act_failed
-         U modcellular_notify_att
-         U modcellular_notify_att_failed
-         U modcellular_notify_call_hangup
-         U modcellular_notify_call_incoming
-         U modcellular_notify_cell_info
-         U modcellular_notify_deact
-         U modcellular_notify_dereg
-         U modcellular_notify_det
-         U modcellular_notify_no_sim
-         U modcellular_notify_ntwlist
-         U modcellular_notify_reg_denied
-         U modcellular_notify_reg_home
-         U modcellular_notify_reg_roaming
-         U modcellular_notify_reg_searching
-         U modcellular_notify_signal
-         U modcellular_notify_sim_drop
-         U modcellular_notify_sms_error
-         U modcellular_notify_sms_list
-         U modcellular_notify_sms_receipt
-         U modcellular_notify_sms_sent
-         U modgps_init0
-         U modgps_notify_gps_update
-         U modmachine_init0
-         U modmachine_notify_power_on
-         U moduos_init0
-00000000 T mp_allocate_heap
-         U mp_call_function_0
-         U mp_compile
-         U mp_deinit
-         U mp_fatal_error
-         U mp_hal_delay_us
-         U mp_hal_stdout_tx_str
-         U mp_handle_pending
-         U mp_init
-         U mp_lexer_new_from_str_len
-         U mp_obj_list_append
-         U mp_obj_list_init
-         U mp_obj_print_exception
-         U mp_parse
-         U mp_plat_print
-         U mp_stack_ctrl_init
-         U mp_stack_set_limit
-         U mp_stack_set_top
-         U mp_state_ctx
-00000000 T nlr_jump_fail
-         U nlr_pop
-         U nlr_push_tail
-         U pyexec_file_if_exists
-         U pyexec_friendly_repl
-         U pyexec_frozen_module
-         U pyexec_mode_kind
-         U pyexec_raw_repl
-00000000 b stack_top
-         U strlen
-
-build/posix_helpers.o:
-00000002 t $LCFI0
-00000002 t $LCFI2
-00000002 t $LCFI4
-00000004 t $LCFI6
-00000000 T calloc
-00000000 T free
-         U gc_alloc
-         U gc_free
-         U gc_realloc
-00000000 T htonl
-00000000 T malloc
-00000000 T ntohl
-00000000 T realloc
-
-build/fatal.o:
-00000002 t $LCFI0
-         U Assert
-         U g_InterfaceVtbl
-00000000 T mp_fatal_error
-00000000 r msg1
-00000000 r msg2
-00000000 r msg3
-00000000 r msg_heap_init
-00000000 r msg_nlr_jump_fail
-00000000 r msg_unknown
-         U strlen
-00000010 C var
-
-build/uart.o:
-0000000a t $LCFI0
-00000004 t $LCFI12
-00000002 t $LCFI14
-00000002 t $LCFI18
-00000002 t $LCFI4
-00000002 t $LCFI6
-00000002 t $LCFI8
-         U g_InterfaceVtbl
-         U mp_hal_ticks_us
-         U mp_interrupt_char
-         U mp_keyboard_interrupt
-00000100 C uart1_ringbuf_array
-00000100 C uart2_ringbuf_array
-         U uart_attached_to_dupterm
-00000000 T uart_close
-00000000 t uart_config
-00000000 D uart_dev
-00000000 T uart_get_rxbuf_len
-00000000 T uart_init
-00000000 r uart_port
-00000000 D uart_ringbuf
-00000000 D uart_ringbuf_array
-00000000 T uart_rx_any
-00000000 T uart_rx_char
-00000000 t uart_rx_intr_handler
-00000000 T uart_rx_wait
-00000000 T uart_set_rxbuf
-00000000 T uart_setup
-00000000 T uart_tx_any_room
-00000000 T uart_tx_one_char
-
-build/help.o:
-00000000 R gprs_a9_help_text
-
-build/modmachine.o:
-00000002 t $LCFI0
-00000004 t $LCFI11
-00000002 t $LCFI14
-00000002 t $LCFI16
-00000002 t $LCFI19
-00000002 t $LCFI2
-00000002 t $LCFI21
-00000002 t $LCFI4
-00000002 t $LCFI6
-00000004 t $LCFI8
-         U g_InterfaceVtbl
-         U machine_adc_type
-00000000 r machine_module_globals
-00000000 r machine_module_globals_table
-         U machine_pin_type
-00000000 t modmachine_get_input_voltage
-00000000 r modmachine_get_input_voltage_obj
-00000000 T modmachine_init0
-00000000 T modmachine_notify_power_on
-00000000 t modmachine_off
-00000000 r modmachine_off_obj
-         U modmachine_pin_init0
-00000000 t modmachine_power_on_cause
-00000000 r modmachine_power_on_cause_obj
-00000000 t modmachine_reset
-00000000 r modmachine_reset_obj
-00000000 t modmachine_set_idle
-00000000 r modmachine_set_idle_obj
-00000000 t modmachine_set_min_freq
-00000000 r modmachine_set_min_freq_obj
-         U modmachine_uart_init0
-00000000 t modmachine_watchdog_off
-00000000 r modmachine_watchdog_off_obj
-00000000 t modmachine_watchdog_on
-00000000 r modmachine_watchdog_on_obj
-00000000 t modmachine_watchdog_reset
-00000000 r modmachine_watchdog_reset_obj
-         U mp_const_none_obj
-         U mp_machine_soft_spi_type
-00000000 R mp_module_machine
-         U mp_obj_get_int
-         U mp_obj_new_int
-         U mp_obj_new_tuple
-         U mp_raise_ValueError
-         U mp_type_dict
-         U mp_type_fun_builtin_0
-         U mp_type_fun_builtin_1
-         U mp_type_module
-00000000 D powerOnCause
-         U pyb_uart_type
-
-build/machine_pin.o:
-00000002 t $LCFI0
-00000002 t $LCFI11
-00000002 t $LCFI13
-00000002 t $LCFI15
-00000002 t $LCFI17
-00000002 t $LCFI21
-00000002 t $LCFI23
-00000002 t $LCFI25
-00000002 t $LCFI28
-00000004 t $LCFI3
-00000002 t $LCFI31
-00000002 t $LCFI33
-00000002 t $LCFI7
-00000002 t $LCFI9
-00000000 r allowed_args.6198
-         U g_InterfaceVtbl
-00000000 t machine_pin_call
-00000000 R machine_pin_init_obj
-00000000 r machine_pin_locals_dict
-00000000 r machine_pin_locals_dict_table
-00000000 r machine_pin_obj
-00000000 t machine_pin_obj_init
-00000000 T machine_pin_obj_init_helper
-00000000 t machine_pin_print
-00000000 R machine_pin_type
-00000000 t machine_pin_value
-00000000 r machine_pin_value_obj
-00000000 T modmachine_pin_init0
-         U mp_arg_check_num_sig
-         U mp_arg_parse_all
-         U mp_const_none_obj
-00000000 T mp_hal_get_pin_obj
-00000000 T mp_hal_pin_input
-00000000 T mp_hal_pin_output
-00000000 T mp_hal_pin_read
-00000000 T mp_hal_pin_write
-         U mp_map_init_fixed_table
-         U mp_obj_get_int
-         U mp_obj_get_type
-         U mp_obj_is_true
-00000000 T mp_pin_make_new
-         U mp_printf
-         U mp_raise_ValueError
-         U mp_type_dict
-         U mp_type_fun_builtin_var
-         U mp_type_type
-00000000 T pin_init
-00000000 t pin_ioctl
-00000000 r pin_pin_p
-
-build/mphalport.o:
-00000002 t $LCFI0
-00000002 t $LCFI10
-00000002 t $LCFI14
-00000002 t $LCFI18
-00000002 t $LCFI2
-00000002 t $LCFI20
-00000002 t $LCFI23
-00000002 t $LCFI4
-00000002 t $LCFI6
-         U __divdf3
-         U __fixunsdfsi
-         U __floatsidf
-         U __floatunsidf
-         U g_InterfaceVtbl
-         U __ltdf2
-00000000 T mp_hal_delay_ms
-00000000 T mp_hal_delay_us
-00000000 T mp_hal_delay_us_fast
-00000000 T mp_hal_stdin_rx_chr
-00000000 T mp_hal_stdout_tx_str
-00000000 T mp_hal_stdout_tx_strn
-00000000 T mp_hal_stdout_tx_strn_cooked
-00000000 T mp_hal_ticks_ms
-00000000 T mp_hal_ticks_us
-         U mp_handle_pending
-         U mp_uos_dupterm_rx_chr
-         U mp_uos_dupterm_tx_strn
-         U __muldf3
-         U strlen
-00000008 C uart_attached_to_dupterm
-
-build/moduos.o:
-00000002 t $LCFI0
-00000002 t $LCFI12
-00000002 t $LCFI16
-00000002 t $LCFI18
-00000002 t $LCFI20
-00000002 t $LCFI22
-00000002 t $LCFI24
-00000002 t $LCFI26
-00000004 t $LCFI28
-00000002 t $LCFI30
-00000002 t $LCFI33
-00000002 t $LCFI36
-00000002 t $LCFI39
-00000002 t $LCFI4
-00000002 t $LCFI43
-00000002 t $LCFI46
-00000002 t $LCFI49
-00000002 t $LCFI52
-00000002 t $LCFI56
-00000002 t $LCFI59
-00000002 t $LCFI8
-00000000 T ensure_exists
-00000000 T ensure_is_dir
-00000000 T ensure_is_file
-00000000 T ensure_not_a_directory
-00000000 T ensure_not_a_file
-00000000 T ensure_not_exists
-         U g_InterfaceVtbl
-00000000 t internal_flash_ilistdir_it_iternext
-00000000 r internal_flash_locals_dict
-00000000 r internal_flash_locals_dict_table
-         U internal_flash_open_obj
-00000000 T maybe_raise_FSError
-         U m_malloc
-00000000 T moduos_init0
-00000000 T moduos_internal_flash_chdir
-00000000 R moduos_internal_flash_chdir_obj
-00000000 R moduos_internal_flash_chdir_static_class_obj
-00000000 T moduos_internal_flash_getcwd
-00000000 R moduos_internal_flash_getcwd_obj
-00000000 R moduos_internal_flash_getcwd_static_class_obj
-00000000 T moduos_internal_flash_ilistdir
-00000000 R moduos_internal_flash_ilistdir_obj
-00000000 R moduos_internal_flash_ilistdir_static_class_obj
-00000000 T moduos_internal_flash_mkdir
-00000000 R moduos_internal_flash_mkdir_obj
-00000000 R moduos_internal_flash_mkdir_static_class_obj
-00000000 T moduos_internal_flash_mount
-00000000 R moduos_internal_flash_mount_obj
-00000000 R moduos_internal_flash_mount_static_class_obj
-00000000 R moduos_internal_flash_open_static_class_obj
-00000000 T moduos_internal_flash_remove
-00000000 R moduos_internal_flash_remove_obj
-00000000 R moduos_internal_flash_remove_static_class_obj
-00000000 T moduos_internal_flash_rename
-00000000 R moduos_internal_flash_rename_obj
-00000000 R moduos_internal_flash_rename_static_class_obj
-00000000 T moduos_internal_flash_rmdir
-00000000 R moduos_internal_flash_rmdir_obj
-00000000 R moduos_internal_flash_rmdir_static_class_obj
-00000000 T moduos_internal_flash_stat
-00000000 R moduos_internal_flash_stat_obj
-00000000 R moduos_internal_flash_stat_static_class_obj
-00000000 T moduos_internal_flash_statvfs
-00000000 R moduos_internal_flash_statvfs_obj
-00000000 R moduos_internal_flash_statvfs_static_class_obj
-00000000 r moduos_internal_flash_type
-00000000 T moduos_internal_flash_umount
-00000000 R moduos_internal_flash_umount_obj
-00000000 R moduos_internal_flash_umount_static_class_obj
-         U mp_const_none_obj
-         U mp_fat_vfs_type
-         U mp_obj_get_int
-         U mp_obj_get_type
-         U mp_obj_new_int
-         U mp_obj_new_str
-         U mp_obj_new_str_from_vstr
-         U mp_obj_new_tuple
-         U mp_obj_str_get_str
-         U mp_plat_print
-         U mp_printf
-         U mp_raise_OSError
-         U mp_type_attrtuple
-         U mp_type_bytes
-         U mp_type_dict
-         U mp_type_fun_builtin_0
-         U mp_type_fun_builtin_1
-         U mp_type_fun_builtin_2
-         U mp_type_fun_builtin_var
-         U mp_type_module
-         U mp_type_polymorph_iter
-         U mp_type_staticmethod
-         U mp_type_str
-         U mp_type_type
-         U mp_uos_dupterm_obj
-         U mp_vfs_chdir_obj
-         U mp_vfs_getcwd_obj
-         U mp_vfs_ilistdir_obj
-         U mp_vfs_listdir_obj
-         U mp_vfs_mkdir_obj
-         U mp_vfs_mount_obj
-         U mp_vfs_remove_obj
-         U mp_vfs_rename_obj
-         U mp_vfs_rmdir_obj
-         U mp_vfs_stat_obj
-         U mp_vfs_statvfs_obj
-         U mp_vfs_umount_obj
-00000000 T os_dupterm
-00000000 r os_dupterm_obj
-00000000 r os_module_globals
-00000000 r os_module_globals_table
-00000000 t os_uname
-00000000 r os_uname_info_fields
-00000000 r os_uname_info_machine_obj
-00000000 r os_uname_info_nodename_obj
-00000000 r os_uname_info_obj
-00000000 r os_uname_info_release_obj
-00000000 r os_uname_info_sysname_obj
-00000000 r os_uname_info_version_obj
-00000000 r os_uname_obj
-00000000 t os_urandom
-00000000 r os_urandom_obj
-00000000 T path_exists
-         U pyb_uart_type
-         U rng_get
-         U strlen
-00000000 T translate_io_errno
-         U uart_attached_to_dupterm
-00000000 R uos_module
-         U vstr_init_len
-
-build/modutime.o:
-00000002 t $LCFI0
-00000002 t $LCFI4
-00000002 t $LCFI6
-         U g_InterfaceVtbl
-         U mp_const_none_obj
-         U mp_obj_get_array
-         U mp_obj_get_int
-         U mp_obj_new_exception_msg_varg
-         U mp_obj_new_int
-         U mp_obj_new_int_from_uint
-         U mp_obj_new_tuple
-         U mp_type_dict
-         U mp_type_fun_builtin_0
-         U mp_type_fun_builtin_1
-         U mp_type_fun_builtin_var
-         U mp_type_module
-         U mp_type_TypeError
-         U mp_utime_sleep_ms_obj
-         U mp_utime_sleep_obj
-         U mp_utime_sleep_us_obj
-         U mp_utime_ticks_add_obj
-         U mp_utime_ticks_cpu_obj
-         U mp_utime_ticks_diff_obj
-         U mp_utime_ticks_ms_obj
-         U mp_utime_ticks_us_obj
-         U nlr_jump
-00000000 t time_localtime
-00000000 r time_localtime_obj
-00000000 t time_mktime
-00000000 r time_mktime_obj
-00000000 r time_module_globals
-00000000 r time_module_globals_table
-00000000 t time_time
-00000000 R time_time_obj
-         U timeutils_mktime
-         U timeutils_seconds_since_2000_to_struct_time
-00000000 R utime_module
-
-build/rng.o:
-00000002 t $LCFI0
-00000000 d glob_seed
-00000000 T rand_r
-00000000 T rng_get
-
-build/fatfs_port.o:
-00000002 t $LCFI0
-00000000 T get_fattime
-         U g_InterfaceVtbl
-         U timeutils_seconds_since_2000_to_struct_time
-
-build/modchip.o:
-00000002 t $LCFI0
-00000002 t $LCFI10
-00000002 t $LCFI2
-00000002 t $LCFI6
-00000000 R chip_module
-00000000 r chip_module_globals
-00000000 r chip_module_globals_table
-         U g_InterfaceVtbl
-         U memcpy
-00000000 t modchip_chip_flash_erase
-00000000 r modchip_chip_flash_erase_obj
-00000000 t modchip_chip_flash_read
-00000000 r modchip_chip_flash_read_obj
-00000000 t modchip_chip_flash_size
-00000000 r modchip_chip_flash_size_obj
-00000000 t modchip_chip_flash_user_start
-00000000 r modchip_chip_flash_user_start_obj
-00000000 t modchip_chip_flash_write
-00000000 r modchip_chip_flash_write_obj
-         U mp_const_none_obj
-         U mp_get_buffer_raise
-         U mp_obj_get_int
-         U mp_obj_new_int_from_uint
-         U mp_raise_OSError
-         U mp_type_dict
-         U mp_type_fun_builtin_0
-         U mp_type_fun_builtin_1
-         U mp_type_fun_builtin_2
-         U mp_type_module
-
-build/file_io.o:
-00000004 t $LCFI0
-00000002 t $LCFI10
-00000002 t $LCFI13
-00000002 t $LCFI17
-00000002 t $LCFI2
-00000002 t $LCFI21
-00000002 t $LCFI25
-00000002 t $LCFI6
-00000000 r allowed_args.6404
-00000000 t file_obj___exit__
-00000000 r file_obj___exit___obj
-00000000 r file_open_args
-         U g_InterfaceVtbl
-00000000 r internal_flash_fileio_stream_p
-00000000 t internal_flash_file_obj_ioctl
-00000000 t internal_flash_file_obj_make_new
-00000000 t internal_flash_file_obj_print
-00000000 t internal_flash_file_obj_read
-00000000 t internal_flash_file_obj_write
-00000000 t internal_flash_file_open
-00000000 T internal_flash_open
-00000000 R internal_flash_open_obj
-00000000 r internal_flash_textio_stream_p
-         U maybe_raise_FSError
-         U m_malloc_with_finaliser
-         U mp_arg_parse_all
-         U mp_arg_parse_all_kw_array
-         U mp_const_none_obj
-         U mp_identity_getiter
-         U mp_identity_obj
-         U mp_obj_get_type_str
-         U mp_obj_str_get_str
-         U mp_printf
-         U mp_raise_OSError
-         U mp_raise_ValueError
-         U mp_stream_close
-         U mp_stream_close_obj
-         U mp_stream_flush_obj
-         U mp_stream_readinto_obj
-         U mp_stream_read_obj
-         U mp_stream_seek_obj
-         U mp_stream_tell_obj
-         U mp_stream_unbuffered_iter
-         U mp_stream_unbuffered_readline_obj
-         U mp_stream_unbuffered_readlines_obj
-         U mp_stream_write_obj
-         U mp_type_dict
-         U mp_type_fun_builtin_var
-00000000 R mp_type_internal_flash_fileio
-00000000 R mp_type_internal_flash_textio
-         U mp_type_type
-         U translate_io_errno
-00000000 r vfs_fat_rawfile_locals_dict
-00000000 r vfs_fat_rawfile_locals_dict_table
-
-build/modcellular.o:
-00000002 t $LCFI0
-00000002 t $LCFI10
-00000002 t $LCFI102
-00000002 t $LCFI105
-0000000a t $LCFI14
-00000002 t $LCFI15
-00000002 t $LCFI17
-00000002 t $LCFI2
-00000002 t $LCFI21
-00000002 t $LCFI23
-00000002 t $LCFI26
-00000002 t $LCFI28
-00000002 t $LCFI31
-00000002 t $LCFI35
-00000018 t $LCFI39
-00000006 t $LCFI40
-00000002 t $LCFI42
-00000002 t $LCFI46
-00000002 t $LCFI5
-00000016 t $LCFI50
-00000002 t $LCFI51
-00000002 t $LCFI55
-00000002 t $LCFI58
-00000002 t $LCFI61
-00000002 t $LCFI64
-00000002 t $LCFI66
-00000002 t $LCFI69
-00000002 t $LCFI7
-00000002 t $LCFI73
-00000002 t $LCFI75
-00000002 t $LCFI79
-00000002 t $LCFI81
-00000002 t $LCFI85
-00000002 t $LCFI89
-00000002 t $LCFI92
-00000002 t $LCFI94
-00000002 t $LCFI98
-00000000 r allowed_args.6470
-00000000 T bitsum
-         U Buffer_Gets
-         U Buffer_Init
-         U Buffer_Puts
-         U Buffer_Size
-00000000 r C.19.6297
-00000000 B calls_incoming_now
-00000000 B calls_incoming_now_flag
-0000000c C calls_missed
-00000100 C calls_missed_buffer
-00000080 C cells
-00000000 B cells_n
-00000000 R cellular_module
-         U free
-00000000 T get_flight_mode
-         U g_InterfaceVtbl
-00000000 T __is_attached
-         U malloc
-         U memcpy
-         U m_malloc
-         U m_malloc_with_finaliser
-00000000 t modcellular_agps_station_data
-00000000 r modcellular_agps_station_data_obj
-00000000 t modcellular_call
-00000000 r modcellular_call_obj
-00000000 t modcellular_dial
-00000000 r modcellular_dial_obj
-00000000 t modcellular_flight_mode
-00000000 r modcellular_flight_mode_obj
-00000000 t modcellular_get_iccid
-00000000 r modcellular_get_iccid_obj
-00000000 t modcellular_get_imei
-00000000 r modcellular_get_imei_obj
-00000000 t modcellular_get_imsi
-00000000 r modcellular_get_imsi_obj
-00000000 t modcellular_get_network_status
-00000000 r modcellular_get_network_status_obj
-00000000 t modcellular_get_signal_quality
-00000000 r modcellular_get_signal_quality_obj
-00000000 t modcellular_gprs
-00000000 r modcellular_gprs_obj
-00000000 T modcellular_init0
-00000000 t modcellular_is_network_registered
-00000000 r modcellular_is_network_registered_obj
-00000000 t modcellular_is_roaming
-00000000 r modcellular_is_roaming_obj
-00000000 t modcellular_is_sim_present
-00000000 r modcellular_is_sim_present_obj
-00000000 t modcellular_network_status_changed
-00000000 r modcellular_network_status_changed_obj
-00000000 T modcellular_notify_act
-00000000 T modcellular_notify_act_failed
-00000000 T modcellular_notify_att
-00000000 T modcellular_notify_att_failed
-00000000 T modcellular_notify_call_hangup
-00000000 T modcellular_notify_call_incoming
-00000000 T modcellular_notify_cell_info
-00000000 T modcellular_notify_deact
-00000000 T modcellular_notify_dereg
-00000000 T modcellular_notify_det
-00000000 T modcellular_notify_no_sim
-00000000 T modcellular_notify_ntwlist
-00000000 T modcellular_notify_reg_denied
-00000000 T modcellular_notify_reg_home
-00000000 T modcellular_notify_reg_roaming
-00000000 T modcellular_notify_reg_searching
-00000000 T modcellular_notify_signal
-00000000 T modcellular_notify_sim_drop
-00000000 T modcellular_notify_sms_error
-00000000 T modcellular_notify_sms_list
-00000000 T modcellular_notify_sms_receipt
-00000000 T modcellular_notify_sms_sent
-00000000 t modcellular_poll_network_exception
-00000000 r modcellular_poll_network_exception_obj
-00000000 t modcellular_register
-00000000 r modcellular_register_obj
-00000000 t modcellular_reset
-00000000 r modcellular_reset_obj
-00000000 t modcellular_scan
-00000000 r modcellular_scan_obj
-00000000 t modcellular_set_bands
-00000000 r modcellular_set_bands_obj
-00000000 t modcellular_sms_attr
-00000000 t modcellular_sms_list
-00000000 r modcellular_sms_list_obj
-00000000 r modcellular_sms_list_static_class_obj
-00000000 T modcellular_sms_make_new
-00000000 t modcellular_sms_poll
-00000000 r modcellular_sms_poll_obj
-00000000 r modcellular_sms_poll_static_class_obj
-00000000 t modcellular_sms_print
-00000000 t modcellular_sms_send
-00000000 R modcellular_sms_send_obj
-00000000 r modcellular_sms_type
-00000000 t modcellular_sms_withdraw
-00000000 R modcellular_sms_withdraw_obj
-00000000 t modcellular_stations
-00000000 r modcellular_stations_obj
-         U mp_arg_parse_all_kw_array
-         U mp_const_false_obj
-         U mp_const_none_obj
-         U mp_const_true_obj
-         U mp_convert_member_lookup
-         U mp_hal_delay_ms
-         U mp_hal_ticks_ms
-00000000 r mp_module_cellular_globals
-00000000 r mp_module_cellular_globals_table
-         U mp_obj_exception_attr
-         U mp_obj_exception_make_new
-         U mp_obj_exception_print
-         U mp_obj_get_int
-         U mp_obj_get_type
-         U mp_obj_is_true
-         U mp_obj_list_append
-         U mp_obj_new_bytearray
-         U mp_obj_new_int
-         U mp_obj_new_list
-         U mp_obj_new_str
-         U mp_obj_new_tuple
-         U mp_obj_str_get_str
-         U mp_plat_print
-         U mp_printf
-00000000 T mp_raise_CellularError
-         U mp_raise_msg
-         U mp_raise_ValueError
-         U mp_type_bytearray
-00000000 R mp_type_CellularError
-         U mp_type_dict
-         U mp_type_fun_builtin_0
-         U mp_type_fun_builtin_1
-         U mp_type_fun_builtin_var
-         U mp_type_module
-         U mp_type_OSError
-         U mp_type_RuntimeError
-         U mp_type_staticmethod
-         U mp_type_str
-         U mp_type_type
-         U mp_warning
-00000000 B network_exception
-00000000 B network_list_buffer
-00000000 B network_list_buffer_len
-00000000 B network_signal_quality
-00000000 B network_signal_rx_level
-00000000 B network_status
-00000000 B network_status_updated
-00000000 B sms_list_buffer
-00000000 B sms_list_buffer_count
-00000000 r sms_locals_dict
-00000000 r sms_locals_dict_table
-00000000 B sms_received_count
-00000000 B sms_send_flag
-         U strlen
-
-build/modgps.o:
-00000002 t $LCFI0
-00000002 t $LCFI12
-00000002 t $LCFI16
-00000002 t $LCFI18
-00000002 t $LCFI2
-00000002 t $LCFI21
-00000002 t $LCFI25
-00000002 t $LCFI4
-00000002 t $LCFI6
-00000002 t $LCFI8
-         U __adddf3
-         U __divdf3
-         U __fixunsdfsi
-         U __floatsidf
-         U __floatunsidf
-         U g_InterfaceVtbl
-         U Gps_GetInfo
-         U GPS_GetVersion
-00000000 B gpsInfo
-         U GPS_Init
-00000000 R gps_module
-         U GPS_Update
-00000000 t modgps_get_firmware_version
-00000000 r modgps_get_firmware_version_obj
-00000000 t modgps_get_last_location
-00000000 r modgps_get_last_location_obj
-00000000 t modgps_get_location
-00000000 r modgps_get_location_obj
-00000000 t modgps_get_satellites
-00000000 r modgps_get_satellites_obj
-00000000 T modgps_init0
-00000000 T modgps_notify_gps_update
-00000000 t modgps_off
-00000000 r modgps_off_obj
-00000000 t modgps_on
-00000000 r modgps_on_obj
-00000000 t modgps_time
-00000000 r modgps_time_obj
-         U mp_const_none_obj
-00000000 r mp_module_gps_globals
-00000000 r mp_module_gps_globals_table
-         U mp_obj_exception_attr
-         U mp_obj_exception_make_new
-         U mp_obj_exception_print
-         U mp_obj_get_int
-         U mp_obj_new_float
-         U mp_obj_new_int
-         U mp_obj_new_int_from_uint
-         U mp_obj_new_str
-         U mp_obj_new_tuple
-00000000 T mp_raise_GPSError
-         U mp_raise_msg
-         U mp_type_dict
-         U mp_type_fun_builtin_0
-         U mp_type_fun_builtin_var
-00000000 R mp_type_GPSError
-         U mp_type_module
-         U mp_type_OSError
-         U mp_type_type
-         U __muldf3
-         U strlen
-         U timeutils_mktime
-
-build/modusocket.o:
-00000004 t $LCFI0
-00000002 t $LCFI10
-00000002 t $LCFI12
-00000002 t $LCFI16
-00000002 t $LCFI20
-00000002 t $LCFI24
-00000002 t $LCFI28
-00000002 t $LCFI31
-00000002 t $LCFI34
-00000002 t $LCFI36
-00000002 t $LCFI38
-00000002 t $LCFI4
-00000002 t $LCFI40
-00000002 t $LCFI42
-00000002 t $LCFI44
-00000004 t $LCFI46
-00000002 t $LCFI50
-00000002 t $LCFI54
-00000002 t $LCFI56
-00000002 t $LCFI59
-00000002 t $LCFI63
-00000002 t $LCFI67
-00000004 t $LCFI7
-00000002 t $LCFI71
-00000004 t $LCFI73
-00000002 t $LCFI75
-00000002 t $LCFI79
-00000002 t $LCFI82
-00000000 r allowed_args.6279
-00000000 r allowed_args.6813
-00000000 t exception_from_errno
-         U __fixunsdfdi
-00000000 t getaddrinfo
-00000000 r getaddrinfo_obj
-00000000 t get_local_ip
-00000000 r get_local_ip_obj
-         U g_InterfaceVtbl
-         U m_malloc_with_finaliser
-00000000 t modusocket_get_num_open
-00000000 r modusocket_get_num_open_obj
-00000000 t modusocket_inet_ntop
-00000000 r modusocket_inet_ntop_obj
-00000000 t modusocket_inet_pton
-00000000 r modusocket_inet_pton_obj
-         U mp_arg_parse_all
-         U mp_arg_parse_all_kw_array
-         U mp_const_none_obj
-         U mp_get_buffer_raise
-         U mp_handle_pending
-00000000 r mp_module_usocket_globals
-00000000 r mp_module_usocket_globals_table
-         U mp_obj_get_array
-         U mp_obj_get_float
-         U mp_obj_get_int
-         U mp_obj_is_true
-         U mp_obj_new_int
-         U mp_obj_new_int_from_uint
-         U mp_obj_new_list
-         U mp_obj_new_str
-         U mp_obj_new_str_from_vstr
-         U mp_obj_new_tuple
-         U mp_obj_str_get_str
-         U mp_plat_print
-         U mp_printf
-         U mp_raise_NotImplementedError
-         U mp_raise_OSError
-         U mp_raise_ValueError
-         U mp_stream_close_obj
-         U mp_stream_readinto_obj
-         U mp_stream_read_obj
-         U mp_stream_unbuffered_readline_obj
-         U mp_stream_write_obj
-         U mp_type_bytes
-         U mp_type_dict
-         U mp_type_fun_builtin_0
-         U mp_type_fun_builtin_1
-         U mp_type_fun_builtin_2
-         U mp_type_fun_builtin_3
-         U mp_type_fun_builtin_var
-         U mp_type_module
-         U mp_type_type
-         U __muldf3
-         U netutils_format_inet_addr
-         U netutils_parse_inet_addr
-00000000 B num_sockets_open
-00000000 t socket_accept
-00000000 r socket_accept_obj
-00000000 t socket_bind
-00000000 r socket_bind_obj
-00000000 t socket_connect
-00000000 r socket_connect_obj
-00000000 T _socket_getaddrinfo
-00000000 t _socket_getaddrinfo2
-00000000 t socket_listen
-00000000 r socket_listen_obj
-00000000 r socket_locals_dict
-00000000 r socket_locals_dict_table
-00000000 t socket_makefile
-00000000 r socket_makefile_obj
-00000000 T socket_make_new
-00000000 t _socket_read_data
-00000000 t socket_recv
-00000000 T _socket_recvfrom
-00000000 t socket_recvfrom
-00000000 r socket_recvfrom_obj
-00000000 r socket_recv_obj
-00000000 T _socket_send
-00000000 t socket_send
-00000000 t socket_sendall
-00000000 r socket_sendall_obj
-00000000 r socket_send_obj
-00000000 t socket_sendto
-00000000 r socket_sendto_obj
-00000000 t socket_setblocking
-00000000 r socket_setblocking_obj
-00000000 t socket_setsockopt
-00000000 r socket_setsockopt_obj
-00000000 T _socket_settimeout
-00000000 t socket_settimeout
-00000000 r socket_settimeout_obj
-00000000 t socket_stream_ioctl
-00000000 r socket_stream_p
-00000000 t socket_stream_read
-00000000 t socket_stream_write
-00000000 r socket_type
-         U strlen
-         U __udivdi3
-00000000 R usocket_module
-         U vstr_init_len
-
-build/modi2c.o:
-00000002 t $LCFI0
-00000002 t $LCFI10
-00000002 t $LCFI14
-00000002 t $LCFI18
-00000002 t $LCFI2
-00000002 t $LCFI22
-00000002 t $LCFI4
-00000004 t $LCFI8
-00000000 r CSWTCH.28
-         U g_InterfaceVtbl
-00000000 r i2c_globals_table
-00000000 R i2c_module
-00000000 t modi2c_close
-00000000 r modi2c_close_obj
-00000000 t modi2c_init
-00000000 r modi2c_init_obj
-00000000 t modi2c_mem_receive
-00000000 r modi2c_mem_receive_obj
-00000000 t modi2c_mem_transmit
-00000000 r modi2c_mem_transmit_obj
-00000000 T modi2c_private_get_I2C_FREQ
-00000000 T modi2c_private_get_I2C_ID
-00000000 T modi2c_private_throw_I2C_Error
-00000000 t modi2c_receive
-00000000 r modi2c_receive_obj
-00000000 t modi2c_transmit
-00000000 r modi2c_transmit_obj
-         U mp_const_none_obj
-         U mp_get_buffer_raise
-00000000 r mp_module_i2c_globals
-         U mp_obj_exception_attr
-         U mp_obj_exception_make_new
-         U mp_obj_exception_print
-         U mp_obj_get_int
-         U mp_obj_new_str_from_vstr
-00000000 T mp_raise_I2CError
-         U mp_raise_msg
-         U mp_type_bytes
-         U mp_type_dict
-         U mp_type_fun_builtin_var
-00000000 R mp_type_I2CError
-         U mp_type_module
-         U mp_type_OSError
-         U mp_type_type
-         U vstr_init_len
-
-build/modst7735.o:
-00000002 t $LCFI0
-00000002 t $LCFI10
-00000002 t $LCFI14
-00000004 t $LCFI18
-00000002 t $LCFI20
-00000002 t $LCFI23
-00000002 t $LCFI26
-00000002 t $LCFI3
-00000002 t $LCFI30
-00000002 t $LCFI34
-0000000c t $LCFI38
-00000002 t $LCFI39
-00000002 t $LCFI42
-00000002 t $LCFI46
-00000002 t $LCFI5
-00000004 t $LCFI50
-00000002 t $LCFI52
-00000002 t $LCFI56
-00000002 t $LCFI60
-00000002 t $LCFI64
-00000002 t $LCFI68
-00000002 t $LCFI7
-00000000 r allowed_args.6323
-00000000 T box_overlap
-00000000 r font_petme128_8x8
-         U memcpy
-         U m_malloc
-00000000 t modst7735_display_blit
-00000000 R modst7735_display_blit_obj
-00000000 t modst7735_display_fill
-00000000 R modst7735_display_fill_obj
-00000000 t modst7735_display_fill_rect
-00000000 r modst7735_display_fill_rect_obj
-00000000 t modst7735_display_init
-00000000 R modst7735_display_init_obj
-00000000 r modst7735_display_locals_dict
-00000000 r modst7735_display_locals_dict_table
-00000000 T modst7735_display_make_new
-00000000 t modst7735_display_mode
-00000000 R modst7735_display_mode_obj
-00000000 t modst7735_display_pixel
-00000000 r modst7735_display_pixel_obj
-00000000 t modst7735_display_print
-00000000 t modst7735_display_rect
-00000000 r modst7735_display_rect_obj
-00000000 t modst7735_display_text
-00000000 r modst7735_display_text_obj
-00000000 r modst7735_display_type
-         U mp_arg_parse_all_kw_array
-         U mp_const_none_obj
-         U mp_hal_delay_us_fast
-         U mp_hal_get_pin_obj
-         U mp_hal_pin_write
-         U mp_machine_soft_spi_type
-00000000 r mp_modst7735_globals
-00000000 r mp_modst7735_globals_table
-         U mp_obj_get_int
-         U mp_obj_str_get_str
-         U mp_printf
-         U mp_raise_ValueError
-         U mp_soft_spi_transfer
-         U mp_type_dict
-         U mp_type_framebuf
-         U mp_type_fun_builtin_1
-         U mp_type_fun_builtin_2
-         U mp_type_fun_builtin_3
-         U mp_type_fun_builtin_var
-         U mp_type_module
-         U mp_type_type
-00000000 T _seq_call
-00000000 T _seq_comm
-00000000 T _seq_data
-00000000 T _seq_data_continue
-00000000 T _seq_data_end
-00000000 T _seq_data_start
-00000000 T _seq_madctl
-00000000 T _seq_ppix
-00000000 T _seq_reset
-00000000 T _seq_window
-00000000 R st7735_module
-
-build/machine_adc.o:
-00000002 t $LCFI0
-00000002 t $LCFI2
-00000002 t $LCFI4
-00000002 t $LCFI8
-         U g_InterfaceVtbl
-00000000 d machine_adc_0
-00000000 d machine_adc_1
-00000000 t machine_adc___del__
-00000000 r machine_adc___del___obj
-00000000 r machine_adc_locals_dict
-00000000 r machine_adc_locals_dict_table
-00000000 T machine_adc_make_new
-00000000 T machine_adc_print
-00000000 t machine_adc_read
-00000000 r machine_adc_read_obj
-00000000 R machine_adc_type
-         U mp_arg_check_num_sig
-         U mp_const_none_obj
-         U mp_obj_get_int
-         U mp_obj_new_exception_msg_varg
-         U mp_printf
-         U mp_raise_msg
-         U mp_type_dict
-         U mp_type_fun_builtin_1
-         U mp_type_RuntimeError
-         U mp_type_type
-         U mp_type_ValueError
-         U nlr_jump
-
-build/machine_uart.o:
-00000002 t $LCFI0
-00000002 t $LCFI10
-00000002 t $LCFI14
-00000002 t $LCFI18
-00000002 t $LCFI2
-00000002 t $LCFI22
-00000002 t $LCFI24
-00000002 t $LCFI28
-00000002 t $LCFI6
-00000000 r allowed_args.6274
-         U g_InterfaceVtbl
-         U m_malloc
-00000000 T modmachine_uart_init0
-         U mp_arg_check_num_sig
-         U mp_arg_parse_all
-         U mp_const_none_obj
-         U mp_hal_get_pin_obj
-         U mp_identity_getiter
-         U mp_map_init_fixed_table
-         U mp_obj_get_int
-         U mp_obj_new_exception_msg_varg
-         U mp_printf
-         U mp_raise_ValueError
-         U mp_state_ctx
-         U mp_stream_close_obj
-         U mp_stream_readinto_obj
-         U mp_stream_read_obj
-         U mp_stream_unbuffered_iter
-         U mp_stream_unbuffered_readline_obj
-         U mp_stream_write_obj
-         U mp_type_dict
-         U mp_type_fun_builtin_1
-         U mp_type_fun_builtin_var
-         U mp_type_type
-         U mp_type_ValueError
-         U nlr_jump
-         U os_dupterm
-00000000 r _parity_name
-00000000 t pyb_uart_any
-00000000 r pyb_uart_any_obj
-00000000 t pyb_uart_init
-00000000 t pyb_uart_init_helper
-00000000 R pyb_uart_init_obj
-00000000 t pyb_uart_ioctl
-00000000 r pyb_uart_locals_dict
-00000000 r pyb_uart_locals_dict_table
-00000000 t pyb_uart_make_new
-00000000 t pyb_uart_print
-00000000 t pyb_uart_read
-00000000 R pyb_uart_type
-00000000 t pyb_uart_write
-         U uart_attached_to_dupterm
-         U uart_close
-         U uart_dev
-         U uart_get_rxbuf_len
-         U uart_ringbuf_array
-         U uart_rx_any
-         U uart_rx_char
-         U uart_rx_wait
-         U uart_set_rxbuf
-         U uart_setup
-00000000 r uart_stream_p
-         U uart_tx_any_room
-         U uart_tx_one_char
-
-build/lib/mp-readline/readline.o:
-0000025e t $L45
-00000236 t $L46
-00000286 t $L47
-00000274 t $L48
-00000222 t $L49
-000001dc t $L52
-0000019c t $L53
-00000002 t $LCFI0
-00000004 t $LCFI10
-00000002 t $LCFI12
-00000002 t $LCFI15
-00000002 t $LCFI19
-00000002 t $LCFI21
-00000002 t $LCFI4
-00000004 t $LCFI8
-         U g_InterfaceVtbl
-         U memcpy
-         U memset
-         U m_malloc_maybe
-00000000 t mp_hal_move_cursor_back
-         U mp_hal_stdin_rx_chr
-         U mp_hal_stdout_tx_str
-         U mp_hal_stdout_tx_strn
-         U mp_plat_print
-         U mp_repl_autocomplete
-         U mp_state_ctx
-00000000 T readline
-00000000 t readline_auto_indent
-00000000 T readline_init
-00000000 T readline_init0
-00000000 T readline_note_newline
-00000000 T readline_process_char
-00000000 T readline_push_history
-00000000 b rl
-         U strcmp
-         U strlen
-         U vstr_add_str
-         U vstr_add_strn
-         U vstr_cut_out_bytes
-         U vstr_cut_tail_bytes
-         U vstr_ins_byte
-         U vstr_ins_char
-         U vstr_null_terminated_str
-
-build/lib/utils/pyexec.o:
-0000000e t $L46
-00000010 t $L62
-00000002 t $LCFI0
-00000002 t $LCFI11
-00000002 t $LCFI14
-00000002 t $LCFI17
-00000002 t $LCFI2
-00000002 t $LCFI6
-00000002 t $LCFI9
-         U gc_collect
-         U gc_dump_info
-         U g_InterfaceVtbl
-         U mp_call_function_0
-         U mp_compile
-         U mp_const_none_obj
-         U mp_find_frozen_module
-         U mp_frozen_stat
-         U mp_hal_set_interrupt_char
-         U mp_hal_stdin_rx_chr
-         U mp_hal_stdout_tx_str
-         U mp_hal_stdout_tx_strn
-         U mp_hal_ticks_ms
-         U mp_lexer_new_from_file
-         U mp_lexer_new_from_str_len
-         U mp_make_function_from_raw_code
-         U mp_obj_get_int
-         U mp_obj_is_subclass_fast
-         U mp_obj_print_exception
-         U mp_parse
-         U mp_plat_print
-         U mp_repl_continue_with_input
-         U mp_state_ctx
-         U mp_type_fun_builtin_1
-         U mp_type_SystemExit
-         U mp_vfs_import_stat
-         U nlr_pop
-         U nlr_push_tail
-00000000 t parse_compile_execute
-00000000 T pyb_set_repl_info
-00000000 R pyb_set_repl_info_obj
-00000000 T pyexec_file
-00000000 T pyexec_file_if_exists
-00000000 T pyexec_friendly_repl
-00000000 T pyexec_frozen_module
-00000000 D pyexec_mode_kind
-00000000 T pyexec_raw_repl
-00000000 B pyexec_system_exit
-         U qstr_pool_info
-         U readline
-00000000 b repl_display_debugging_info
-         U strlen
-         U vstr_add_byte
-         U vstr_clear
-         U vstr_init
-         U vstr_null_terminated_str
-
-build/lib/utils/interrupt_char.o:
-00000002 t $LCFI0
-00000000 T mp_hal_set_interrupt_char
-00000000 D mp_interrupt_char
-00000000 T mp_keyboard_interrupt
-         U mp_obj_exception_clear_traceback
-         U mp_state_ctx
-
-build/lib/utils/sys_stdio_mphal.o:
-00000002 t $LCFI0
-00000002 t $LCFI11
-00000002 t $LCFI14
-00000002 t $LCFI3
-00000002 t $LCFI7
-         U mp_const_none_obj
-         U mp_hal_stdin_rx_chr
-         U mp_hal_stdout_tx_strn
-         U mp_hal_stdout_tx_strn_cooked
-         U mp_identity_getiter
-         U mp_identity_obj
-         U mp_printf
-         U mp_stream_readinto_obj
-         U mp_stream_read_obj
-         U mp_stream_unbuffered_iter
-         U mp_stream_unbuffered_readline_obj
-         U mp_stream_unbuffered_readlines_obj
-         U mp_stream_write_obj
-00000000 R mp_sys_stderr_obj
-00000000 R mp_sys_stdin_obj
-00000000 R mp_sys_stdout_obj
-         U mp_type_dict
-         U mp_type_fun_builtin_var
-         U mp_type_type
-00000000 r stdio_buffer_obj
-00000000 r stdio_buffer_obj_stream_p
-00000000 r stdio_buffer_obj_type
-00000000 t stdio_buffer_read
-00000000 t stdio_buffer_write
-00000000 t stdio_ioctl
-00000000 r stdio_locals_dict
-00000000 r stdio_locals_dict_table
-00000000 t stdio_obj___exit__
-00000000 r stdio_obj___exit___obj
-00000000 T stdio_obj_print
-00000000 r stdio_obj_stream_p
-00000000 r stdio_obj_type
-00000000 t stdio_read
-00000000 t stdio_write
-
-build/lib/timeutils/timeutils.o:
-00000002 t $LCFI0
-00000002 t $LCFI10
-00000002 t $LCFI14
-00000004 t $LCFI3
-00000004 t $LCFI6
-00000000 r days_in_month.5615
-00000000 r days_since_jan1
-00000000 T timeutils_days_in_month
-00000000 T timeutils_is_leap_year
-00000000 T timeutils_mktime
-00000000 T timeutils_seconds_since_2000
-00000000 T timeutils_seconds_since_2000_to_struct_time
-00000000 T timeutils_year_day
-
-build/lib/netutils/netutils.o:
-00000002 t $LCFI0
-00000002 t $LCFI11
-00000002 t $LCFI4
-00000002 t $LCFI8
-         U g_InterfaceVtbl
-         U mp_obj_get_array_fixed_n
-         U mp_obj_get_int
-         U mp_obj_new_int
-         U mp_obj_new_str
-         U mp_obj_new_tuple
-         U mp_obj_str_get_data
-         U mp_raise_ValueError
-00000000 T netutils_format_inet_addr
-00000000 T netutils_format_ipv4_addr
-00000000 T netutils_parse_inet_addr
-00000000 T netutils_parse_ipv4_addr
-
-build/lib/oofatfs/ff.o:
-00000002 t $LCFI0
-00000002 t $LCFI100
-00000002 t $LCFI104
-00000002 t $LCFI108
-00000002 t $LCFI112
-00000002 t $LCFI116
-00000002 t $LCFI12
-00000002 t $LCFI120
-00000002 t $LCFI124
-00000002 t $LCFI128
-00000002 t $LCFI132
-00000002 t $LCFI136
-00000002 t $LCFI140
-00000002 t $LCFI144
-00000002 t $LCFI148
-00000002 t $LCFI15
-00000002 t $LCFI152
-00000002 t $LCFI156
-00000002 t $LCFI160
-00000002 t $LCFI19
-00000002 t $LCFI23
-00000002 t $LCFI27
-00000002 t $LCFI31
-00000002 t $LCFI35
-00000002 t $LCFI39
-00000002 t $LCFI4
-00000004 t $LCFI43
-00000002 t $LCFI45
-00000004 t $LCFI49
-00000002 t $LCFI53
-00000002 t $LCFI57
-00000002 t $LCFI61
-00000002 t $LCFI65
-00000002 t $LCFI69
-00000002 t $LCFI73
-00000002 t $LCFI77
-00000002 t $LCFI8
-00000002 t $LCFI81
-00000002 t $LCFI85
-00000002 t $LCFI89
-00000002 t $LCFI92
-00000002 t $LCFI96
-00000000 t check_fs
-00000000 t chk_chr
-00000000 t clst2sect
-00000000 t create_chain
-00000000 r cst32.6608
-00000000 r cst.6607
-00000000 t dbc_1st
-00000000 t dir_clear
-00000000 t dir_find
-00000000 t dir_next
-00000000 t dir_register
-00000000 t dir_remove
-00000000 t dir_sdi
-         U disk_ioctl
-         U disk_read
-         U disk_write
-00000000 r ExCvt
-00000000 T f_chdir
-00000000 T f_chmod
-00000000 T f_close
-00000000 T f_closedir
-         U ff_oem2uni
-         U ff_uni2oem
-         U ff_wtoupper
-00000000 T f_getcwd
-00000000 T f_getfree
-00000000 t find_volume
-00000000 T f_lseek
-00000000 T f_mkdir
-00000000 T f_mkfs
-00000000 T f_mount
-00000000 t follow_path
-00000000 T f_open
-00000000 T f_opendir
-00000000 T f_read
-00000000 T f_readdir
-00000000 T f_rename
-00000000 b Fsid
-00000000 T f_stat
-00000000 T f_sync
-00000000 T f_truncate
-00000000 T f_umount
-00000000 T f_unlink
-00000000 T f_utime
-00000000 T f_write
-00000000 t get_fat
-         U get_fattime
-00000000 t get_fileinfo
-00000000 t ld_clust
-00000000 t ld_dword
-00000000 t ld_word
-00000000 b LfnBuf
-00000000 r LfnOfs
-         U memcmp
-         U memcpy
-         U memset
-00000000 t move_window
-00000000 t put_fat
-00000000 t remove_chain
-00000000 t st_clust
-00000000 t st_dword
-00000000 t st_word
-00000000 t sum_sfn
-00000000 t sync_fs
-00000000 t sync_window
-00000000 t T.184
-00000000 t validate
-
-build/lib/oofatfs/ffunicode.o:
-00000000 r cvt1.3985
-00000000 r cvt2.3986
-00000000 T ff_oem2uni
-00000000 T ff_uni2oem
-00000000 T ff_wtoupper
-00000000 r uc437
-
-build/gchelper.o:
-00000000 T gc_helper_get_regs_and_sp
-
-build/lib/axtls/ssl/asn1.o:
-00000044 t $L18
-00000038 t $L25
-00000052 t $L28
-000000ae t $L36
-0000014e t $L51
-00000072 t $L54
-00000050 t $L77
-00000084 t $L81
-00000004 t $LCFI0
-00000002 t $LCFI11
-00000002 t $LCFI15
-00000004 t $LCFI19
-00000004 t $LCFI2
-00000002 t $LCFI21
-00000002 t $LCFI25
-00000002 t $LCFI29
-00000002 t $LCFI33
-00000002 t $LCFI37
-00000002 t $LCFI4
-00000002 t $LCFI41
-00000002 t $LCFI45
-00000002 t $LCFI7
-00000000 T asn1_get_big_int
-00000000 T asn1_get_bit_string_as_int
-00000000 T asn1_get_bool
-00000000 T asn1_get_int
-00000000 T asn1_get_private_key
-00000000 t asn1_get_utc_time
-00000000 T asn1_name
-00000000 T asn1_next_obj
-00000000 T asn1_public_key
-00000000 T asn1_signature_type
-00000000 T asn1_skip_obj
-00000000 T asn1_validity
-00000000 T asn1_version
-         U free
-00000000 r g_dn_types
-00000000 T get_asn1_length
-         U g_InterfaceVtbl
-         U malloc
-         U memcmp
-         U memcpy
-         U memset
-         U RNG_custom_init
-         U RSA_priv_key_new
-         U RSA_pub_key_new
-00000000 r sig_oid_prefix
-00000000 r sig_sha1WithRSAEncrypt
-00000000 r sig_sha256
-00000000 r sig_sha384
-00000000 r sig_sha512
-
-build/lib/axtls/ssl/loader.o:
-00000042 t $L14
-00000002 t $LCFI0
-00000002 t $LCFI3
-00000002 t $LCFI7
-         U add_cert
-         U add_private_key
-00000000 r C.8.4285
-         U calloc
-00000000 r default_private_key.4265
-         U free
-00000000 T load_key_certs
-         U malloc
-         U memcpy
-00000000 T ssl_obj_free
-00000000 T ssl_obj_load
-00000000 T ssl_obj_memory_load
-
-build/lib/axtls/ssl/tls1.o:
-000000c4 t $L111
-00000018 t $L163
-0000009e t $L175
-0000029e t $L295
-000000ec t $L35
-00000002 t $LCFI0
-00000002 t $LCFI11
-00000002 t $LCFI14
-00000002 t $LCFI18
-00000002 t $LCFI2
-00000002 t $LCFI22
-0000000a t $LCFI26
-00000002 t $LCFI27
-00000002 t $LCFI31
-0000000a t $LCFI33
-00000002 t $LCFI36
-00000004 t $LCFI40
-00000002 t $LCFI43
-00000002 t $LCFI47
-00000002 t $LCFI51
-00000002 t $LCFI53
-00000002 t $LCFI56
-00000002 t $LCFI6
-00000002 t $LCFI60
-00000002 t $LCFI64
-00000002 t $LCFI68
-00000002 t $LCFI72
-00000002 t $LCFI76
-00000002 t $LCFI79
-00000002 t $LCFI8
-00000002 t $LCFI83
-00000002 t $LCFI87
-00000002 t $LCFI91
-00000002 t $LCFI95
-00000002 t $LCFI99
-00000000 T add_cert
-00000000 t add_hmac_digest
-00000000 T add_packet
-00000000 T add_private_key
-         U AES_cbc_decrypt
-         U AES_cbc_encrypt
-         U AES_convert_key
-         U AES_set_key
-         U asn1_get_private_key
-00000000 r axtls_version.5380
-00000000 T basic_read
-         U calloc
-00000000 r cipher_info
-00000000 r client_finished
-00000000 t crypt_new
-00000000 r CSWTCH.78
-00000000 T disposable_free
-00000000 T disposable_new
-         U do_client_connect
-         U do_clnt_handshake
-         U do_svr_handshake
-00000000 T finished_digest
-         U free
-00000000 r g_chg_cipher_spec_pkt
-00000000 T generate_master_secret
-         U get_random
-00000000 r g_hello_request
-         U g_InterfaceVtbl
-         U hmac_sha256
-         U load_key_certs
-         U malloc
-         U MD5_Final
-         U MD5_Init
-         U MD5_Update
-         U memcmp
-         U memcpy
-         U memset
-         U mp_stream_errno
-         U mp_stream_posix_read
-         U mp_stream_posix_write
-00000000 T process_certificate
-00000000 T process_finished
-         U RNG_initialize
-         U RNG_terminate
-         U RSA_free
-00000000 T send_alert
-00000000 T send_certificate
-00000000 T send_change_cipher_spec
-00000000 T send_finished
-00000000 T send_packet
-00000000 r server_finished
-00000000 t set_key_block
-         U SHA1_Final
-         U SHA1_Init
-         U SHA1_Update
-         U sha256_final
-         U sha256_init
-         U sha256_update
-00000000 T ssl_ctx_free
-00000000 T ssl_ctx_new
-00000000 T ssl_display_error
-00000000 T ssl_ext_free
-00000000 T ssl_ext_new
-00000000 T ssl_find
-00000000 T ssl_free
-00000000 T ssl_get_cipher_id
-00000000 T ssl_get_config
-00000000 T ssl_get_session_id
-00000000 T ssl_get_session_id_size
-00000000 T ssl_handshake_status
-         U ssl_hmac_md5
-         U ssl_hmac_sha1
-00000000 T ssl_new
-00000000 R ssl_prot_prefs
-00000000 T ssl_read
-00000000 T ssl_renegotiate
-00000000 T ssl_version
-00000000 T ssl_write
-         U strcpy
-         U strlen
-00000000 t T.80
-         U x509_free
-         U x509_new
-
-build/lib/axtls/ssl/tls1_svr.o:
-00000002 t $LCFI0
-00000004 t $LCFI4
-00000002 t $LCFI8
-         U disposable_free
-00000000 T do_svr_handshake
-         U generate_master_secret
-         U get_random
-00000000 r g_hello_done
-         U memcpy
-00000000 t process_client_key_xchg
-         U process_finished
-         U RSA_decrypt
-         U send_certificate
-         U send_packet
-         U ssl_new
-         U ssl_prot_prefs
-00000000 T ssl_server_new
-
-build/lib/axtls/ssl/tls1_clnt.o:
-00000204 t $L49
-00000002 t $LCFI0
-00000002 t $LCFI12
-00000002 t $LCFI4
-00000002 t $LCFI8
-         U disposable_free
-         U disposable_new
-00000000 T do_client_connect
-00000000 T do_clnt_handshake
-         U finished_digest
-00000000 r g_asn1_sha256
-         U generate_master_secret
-         U get_random
-         U g_InterfaceVtbl
-00000000 r g_sig_alg
-         U memcpy
-         U process_certificate
-         U process_finished
-         U RSA_encrypt
-         U send_certificate
-         U send_change_cipher_spec
-00000000 t send_client_key_xchg
-         U send_finished
-         U send_packet
-00000000 T ssl_client_new
-         U ssl_new
-         U ssl_prot_prefs
-         U ssl_read
-         U strlen
-         U strncpy
-
-build/lib/axtls/ssl/x509.o:
-000000ce t $L15
-00000002 t $LCFI0
-00000002 t $LCFI4
-         U asn1_name
-         U asn1_next_obj
-         U asn1_public_key
-         U asn1_signature_type
-         U asn1_skip_obj
-         U asn1_validity
-         U asn1_version
-         U calloc
-00000000 r CSWTCH.5
-         U free
-         U RSA_free
-00000000 T x509_display_error
-00000000 T x509_free
-00000000 T x509_new
-
-build/lib/axtls/crypto/aes.o:
-00000002 t $LCFI0
-00000002 t $LCFI11
-00000002 t $LCFI15
-00000002 t $LCFI19
-00000002 t $LCFI3
-00000002 t $LCFI7
-00000000 T AES_cbc_decrypt
-00000000 T AES_cbc_encrypt
-00000000 T AES_convert_key
-00000000 T AES_decrypt
-00000000 T AES_encrypt
-00000000 r aes_isbox
-00000000 r aes_sbox
-00000000 T AES_set_key
-00000000 t AES_xtime
-         U htonl
-         U memcpy
-         U ntohl
-00000000 r Rcon
-
-build/lib/axtls/crypto/bigint.o:
-00000052 t $L35
-00000002 t $LCFI0
-00000002 t $LCFI10
-00000002 t $LCFI13
-00000004 t $LCFI17
-00000002 t $LCFI20
-00000002 t $LCFI23
-00000002 t $LCFI27
-00000002 t $LCFI31
-00000002 t $LCFI35
-0000000e t $LCFI39
-00000002 t $LCFI4
-00000002 t $LCFI43
-00000002 t $LCFI46
-00000002 t $LCFI50
-00000002 t $LCFI54
-00000002 t $LCFI58
-00000002 t $LCFI6
-00000002 t $LCFI62
-00000002 t $LCFI65
-00000002 t $LCFI69
-         U abort_
-00000000 t alloc
-00000000 T bi_add
-00000000 T bi_clear_cache
-00000000 T bi_clone
-00000000 T bi_compare
-00000000 T bi_copy
-00000000 T bi_depermanent
-00000000 T bi_divide
-00000000 T bi_export
-00000000 T bi_free
-00000000 T bi_free_mod
-00000000 T bi_import
-00000000 T bi_initialize
-00000000 t bi_int_multiply
-00000000 T bi_mod_power
-00000000 T bi_multiply
-00000000 T bi_permanent
-00000000 T bi_set_mod
-00000000 T bi_subtract
-00000000 T bi_terminate
-         U calloc
-00000000 t exp_bit_is_one
-         U free
-00000000 T int_to_bi
-         U malloc
-         U memcpy
-         U memset
-00000000 t more_comps
-         U realloc
-00000000 t trim
-         U __udivdi3
-         U __umoddi3
-
-build/lib/axtls/crypto/crypto_misc.o:
-00000002 t $LCFI0
-00000002 t $LCFI4
-00000002 t $LCFI8
-         U AES_cbc_encrypt
-         U AES_set_key
-00000000 b entropy_pool
-00000000 T get_random
-00000000 T get_random_NZ
-         U g_InterfaceVtbl
-         U MD5_Final
-         U MD5_Init
-         U MD5_Update
-         U memcpy
-         U rand_r
-00000000 T RNG_custom_init
-00000000 T RNG_initialize
-00000000 T RNG_terminate
-00000000 R unsupported_str
-
-build/lib/axtls/crypto/hmac.o:
-00000002 t $LCFI0
-00000002 t $LCFI4
-00000002 t $LCFI8
-00000000 T hmac_sha256
-         U MD5_Final
-         U MD5_Init
-         U MD5_Update
-         U memcpy
-         U memset
-         U SHA1_Final
-         U SHA1_Init
-         U SHA1_Update
-         U sha256_final
-         U sha256_init
-         U sha256_update
-00000000 T ssl_hmac_md5
-00000000 T ssl_hmac_sha1
-
-build/lib/axtls/crypto/md5.o:
-00000002 t $LCFI0
-00000002 t $LCFI4
-00000002 t $LCFI8
-00000000 t Encode
-00000000 T MD5_Final
-00000000 T MD5_Init
-00000000 t MD5Transform
-00000000 T MD5_Update
-         U memcpy
-00000000 r PADDING
-00000000 r round1_s.3851
-00000000 r round_ac.3850
-00000000 r round_order.3852
-
-build/lib/axtls/crypto/rsa.o:
-00000002 t $LCFI0
-00000006 t $LCFI10
-00000002 t $LCFI13
-00000002 t $LCFI17
-00000002 t $LCFI2
-00000002 t $LCFI21
-00000002 t $LCFI4
-00000002 t $LCFI8
-         U bi_clear_cache
-         U bi_depermanent
-         U bi_export
-         U bi_free
-         U bi_free_mod
-         U bi_import
-         U bi_initialize
-         U bi_mod_power
-         U bi_permanent
-         U bi_set_mod
-         U bi_terminate
-         U calloc
-         U free
-         U get_random_NZ
-         U memcpy
-         U memset
-00000000 T RSA_decrypt
-00000000 T RSA_encrypt
-00000000 T RSA_free
-00000000 T RSA_private
-00000000 T RSA_priv_key_new
-00000000 T RSA_pub_key_new
-00000000 T RSA_public
-
-build/lib/axtls/crypto/sha1.o:
-00000002 t $LCFI0
-00000002 t $LCFI3
-00000002 t $LCFI7
-         U memset
-00000000 T SHA1_Final
-00000000 T SHA1_Init
-00000000 t SHA1ProcessMessageBlock
-00000000 T SHA1_Update
-
-build/drivers/bus/softspi.o:
-00000002 t $LCFI0
-00000002 t $LCFI4
-         U mp_hal_delay_us_fast
-         U mp_hal_pin_input
-         U mp_hal_pin_output
-         U mp_hal_pin_read
-         U mp_hal_pin_write
-00000000 T mp_soft_spi_ioctl
-00000000 R mp_soft_spi_proto
-00000000 T mp_soft_spi_transfer
-
-../../extmod/crypto-algorithms/sha256.o:
-00000002 t $LCFI0
-00000002 t $LCFI3
-00000002 t $LCFI7
-00000000 r k
-         U memset
-00000000 T sha256_final
-00000000 T sha256_init
-00000000 t sha256_transform
-00000000 T sha256_update

From 7bb5ce6a0a80829c49b2e2d5c695c004c8a39a26 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sun, 1 Mar 2020 00:58:29 +0100
Subject: [PATCH 3443/3533] Swap lat lon in gps

---
 ports/gprs_a9/modgps.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/gprs_a9/modgps.c b/ports/gprs_a9/modgps.c
index 904bedeff35f9..137bcb3bb5c7a 100644
--- a/ports/gprs_a9/modgps.c
+++ b/ports/gprs_a9/modgps.c
@@ -147,8 +147,8 @@ STATIC mp_obj_t modgps_get_last_location(void) {
     temp = (int)(gpsInfo->rmc.longitude.value/gpsInfo->rmc.longitude.scale/100);
     double longitude = temp+(double)(gpsInfo->rmc.longitude.value - temp*gpsInfo->rmc.longitude.scale*100)/gpsInfo->rmc.longitude.scale/60.0;
     mp_obj_t tuple[2] = {
-        mp_obj_new_float(longitude),
         mp_obj_new_float(latitude),
+        mp_obj_new_float(longitude),
     };
     return mp_obj_new_tuple(2, tuple);
 }

From 7556babf43f76a52b880b9ab503325c634ea2c57 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sun, 1 Mar 2020 16:03:52 +0100
Subject: [PATCH 3444/3533] Add unix port to Azure builds

---
 azure-pipelines.yml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index bd59a4307d629..683539deedb05 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -111,6 +111,12 @@ stages:
         make $(MAKEOPTS) -C ports/unix test
         (cd tests && MICROPY_CPYTHON3=python3 MICROPY_MICROPYTHON=../ports/unix/micropython ./run-perfbench.py 1000 1000)
       displayName: 'Build'
+
+    - task: PublishPipelineArtifact@1
+      displayName: 'Collect the build'
+      inputs:
+        targetPath: '$(Build.Repository.LocalPath)/ports/unix/micropython'
+        artifact: 'build_unix'
   
   - job: port_unix_nanbox
     displayName: 'unix nanbox port build and tests'
@@ -427,6 +433,8 @@ stages:
         rm -rf $(Build.BinariesDirectory)/build_gprs_a9
         mv $(Build.BinariesDirectory)/build_esp8266/*.bin $(Build.BinariesDirectory)
         rm -rf $(Build.BinariesDirectory)/build_esp8266
+        mv $(Build.BinariesDirectory)/build_unix/micropython $(Build.BinariesDirectory)
+        rm -rf $(Build.BinariesDirectory)/build_unix
       displayName: 'Sort and filter binaries'
 
     - task: GitHubRelease@0
@@ -448,6 +456,10 @@ stages:
           Firmware files
           --------------
 
+          - **unix**
+
+          - [micropython](https://github.com/$(GITHUB_MICROPY_REPO)/releases/download/$(GITHUB_RELEASE_TAG)/micropython)
+
           - **gprs_a9**
 
             Burn instructions: use [cooltools](https://ai-thinker-open.github.io/GPRS_C_SDK_DOC/en/c-sdk/burn-debug.html)

From 25c3325e42f81ae2f846051fac23993b7e22efb2 Mon Sep 17 00:00:00 2001
From: sebi5361 <sebastien.krut@gmail.com>
Date: Thu, 5 Mar 2020 19:31:31 +0100
Subject: [PATCH 3445/3533] Fixing soft reset doesn't clear the watchdog

---
 ports/gprs_a9/modmachine.c | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/ports/gprs_a9/modmachine.c b/ports/gprs_a9/modmachine.c
index 98ff997c51ca0..bb049355e3de5 100644
--- a/ports/gprs_a9/modmachine.c
+++ b/ports/gprs_a9/modmachine.c
@@ -40,8 +40,17 @@
 #include "api_hal_watchdog.h"
 #include "api_hal_adc.h"
 
+STATIC mp_obj_t modmachine_watchdog_off(void) {
+    // ========================================
+    // Disarms the hardware watchdog.
+    // ========================================
+    WatchDog_Close();
+    return mp_const_none;
+}
+
 void modmachine_init0(void) {
     PM_SetSysMinFreq(PM_SYS_FREQ_312M);
+    modmachine_watchdog_off();
     modmachine_pin_init0();
     modmachine_uart_init0();
 }
@@ -180,14 +189,6 @@ STATIC mp_obj_t modmachine_watchdog_on(mp_obj_t timeout) {
 
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(modmachine_watchdog_on_obj, modmachine_watchdog_on);
 
-STATIC mp_obj_t modmachine_watchdog_off(void) {
-    // ========================================
-    // Disarms the hardware watchdog.
-    // ========================================
-    WatchDog_Close();
-    return mp_const_none;
-}
-
 STATIC MP_DEFINE_CONST_FUN_OBJ_0(modmachine_watchdog_off_obj, modmachine_watchdog_off);
 
 STATIC mp_obj_t modmachine_watchdog_reset(void) {

From 64c8c647e19de2c8051e49cc099e270fb2d058a5 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sat, 7 Mar 2020 17:09:45 +0100
Subject: [PATCH 3446/3533] Fix module layout

---
 ports/gprs_a9/modmachine.c | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/ports/gprs_a9/modmachine.c b/ports/gprs_a9/modmachine.c
index bb049355e3de5..c73fbd82b43de 100644
--- a/ports/gprs_a9/modmachine.c
+++ b/ports/gprs_a9/modmachine.c
@@ -40,13 +40,7 @@
 #include "api_hal_watchdog.h"
 #include "api_hal_adc.h"
 
-STATIC mp_obj_t modmachine_watchdog_off(void) {
-    // ========================================
-    // Disarms the hardware watchdog.
-    // ========================================
-    WatchDog_Close();
-    return mp_const_none;
-}
+STATIC mp_obj_t modmachine_watchdog_off(void);
 
 void modmachine_init0(void) {
     PM_SetSysMinFreq(PM_SYS_FREQ_312M);
@@ -189,6 +183,14 @@ STATIC mp_obj_t modmachine_watchdog_on(mp_obj_t timeout) {
 
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(modmachine_watchdog_on_obj, modmachine_watchdog_on);
 
+STATIC mp_obj_t modmachine_watchdog_off(void) {
+    // ========================================
+    // Disarms the hardware watchdog.
+    // ========================================
+    WatchDog_Close();
+    return mp_const_none;
+}
+
 STATIC MP_DEFINE_CONST_FUN_OBJ_0(modmachine_watchdog_off_obj, modmachine_watchdog_off);
 
 STATIC mp_obj_t modmachine_watchdog_reset(void) {

From 03f72a7c6ee1c80c2b85c678abac5c4a7f6ffba0 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sat, 7 Mar 2020 17:23:47 +0100
Subject: [PATCH 3447/3533] A more consistent initialization in case
 modgps_close changes

---
 ports/gprs_a9/modgps.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ports/gprs_a9/modgps.c b/ports/gprs_a9/modgps.c
index 137bcb3bb5c7a..b46c689dcd1fd 100644
--- a/ports/gprs_a9/modgps.c
+++ b/ports/gprs_a9/modgps.c
@@ -43,8 +43,10 @@
 #include "minmea.h"
 #include "time.h"
 
+STATIC mp_obj_t modgps_off(void);
+
 void modgps_init0(void) {
-    GPS_Close();
+    modgps_off();
 }
 
 // ------

From af9da77a594e375a6e44f92fae8ad855e0fcb809 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sun, 15 Mar 2020 16:44:01 +0100
Subject: [PATCH 3448/3533] Add information on issues

---
 ports/gprs_a9/CONTRIBUTING.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ports/gprs_a9/CONTRIBUTING.md b/ports/gprs_a9/CONTRIBUTING.md
index 5c0179f5ef30f..249967fab42d8 100644
--- a/ports/gprs_a9/CONTRIBUTING.md
+++ b/ports/gprs_a9/CONTRIBUTING.md
@@ -1,6 +1,7 @@
 ## Contributing
 
-Useful information for maintaining this port.
+Besides reporting and fixing bugs, there is a number of issues suitable for new-commers, please consult **Issues** on github.
+This file includes some useful information for maintaining this port.
 
 ### General information
 

From 4a8a00b007dbd46c6cd332d89465385187edc7b6 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Thu, 19 Mar 2020 23:53:00 +0100
Subject: [PATCH 3449/3533] No-gc setup fix

---
 ports/gprs_a9/mpconfigport.h  |  2 +-
 ports/gprs_a9/posix_helpers.c | 31 ++++++++++++++++++++++++++++---
 2 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/ports/gprs_a9/mpconfigport.h b/ports/gprs_a9/mpconfigport.h
index f31ee966324ff..6d6e291de6627 100644
--- a/ports/gprs_a9/mpconfigport.h
+++ b/ports/gprs_a9/mpconfigport.h
@@ -36,7 +36,7 @@
 #define MICROPY_LONGINT_IMPL                (MICROPY_LONGINT_IMPL_MPZ)
 #define MICROPY_FLOAT_IMPL                  (MICROPY_FLOAT_IMPL_DOUBLE)
 #define MICROPY_MODULE_FROZEN_MPY           (1)
-#define MICROPY_ENABLE_FINALISER            (1)
+#define MICROPY_ENABLE_FINALISER            (MICROPY_ENABLE_GC)
 #define MICROPY_STACK_CHECK                 (1)
 #define MICROPY_ENABLE_EMERGENCY_EXCEPTION_BUF (1)
 #define MICROPY_KBD_EXCEPTION               (1)
diff --git a/ports/gprs_a9/posix_helpers.c b/ports/gprs_a9/posix_helpers.c
index 284966e86f393..d4eb41e3bf056 100644
--- a/ports/gprs_a9/posix_helpers.c
+++ b/ports/gprs_a9/posix_helpers.c
@@ -6,6 +6,10 @@
 #include "py/gc.h"
 #include <sdk_init.h>
 
+#if MICROPY_ENABLE_GC
+
+#include "py/gc.h"
+
 void *malloc(size_t size) {
     void *p = gc_alloc(size, false);
     if (p == NULL) {
@@ -14,12 +18,11 @@ void *malloc(size_t size) {
     }
     return p;
 }
+
 void free(void *ptr) {
     gc_free(ptr);
 }
-void *calloc(size_t nmemb, size_t size) {
-    return malloc(nmemb * size);
-}
+
 void *realloc(void *ptr, size_t size) {
     void *p = gc_realloc(ptr, size, true);
     if (p == NULL) {
@@ -29,6 +32,28 @@ void *realloc(void *ptr, size_t size) {
     return p;
 }
 
+#else
+
+#include "api_os.h"
+
+void *malloc(size_t size) {
+    return OS_Malloc(size);
+}
+
+void free(void *ptr) {
+    return OS_Free(ptr);
+}
+
+void *realloc(void *ptr, size_t size) {
+    return OS_Realloc(ptr, size);
+}
+
+#endif
+
+void *calloc(size_t nmemb, size_t size) {
+    return malloc(nmemb * size);
+}
+
 #undef htonl
 #undef ntohl
 uint32_t ntohl(uint32_t netlong) {

From 47b2e85420dd1292436421bcc83bd93cadc12058 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Thu, 26 Mar 2020 20:09:29 +0100
Subject: [PATCH 3450/3533] Comment out unused stuff

---
 ports/gprs_a9/main.c         | 5 +++--
 ports/gprs_a9/mpconfigport.h | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/ports/gprs_a9/main.c b/ports/gprs_a9/main.c
index 4f2b13b17978a..8858d62a2f2ad 100644
--- a/ports/gprs_a9/main.c
+++ b/ports/gprs_a9/main.c
@@ -91,7 +91,8 @@ typedef struct
 extern mp_uint_t gc_helper_get_regs_and_sp(mp_uint_t*);
 
 #if MICROPY_ENABLE_COMPILER
-void do_str(const char *src, mp_parse_input_kind_t input_kind) {
+/*void do_str(const char *src, mp_parse_input_kind_t input_kind) {
+    mp_printf(&mp_plat_print, "do_str %s\n", src);
     nlr_buf_t nlr;
     if (nlr_push(&nlr) == 0) {
         mp_lexer_t *lex = mp_lexer_new_from_str_len(MP_QSTR__lt_stdin_gt_, src, strlen(src), 0);
@@ -104,7 +105,7 @@ void do_str(const char *src, mp_parse_input_kind_t input_kind) {
         // uncaught exception
         mp_obj_print_exception(&mp_plat_print, (mp_obj_t)nlr.ret_val);
     }
-}
+}*/
 #endif
 
 STATIC void *stack_top;
diff --git a/ports/gprs_a9/mpconfigport.h b/ports/gprs_a9/mpconfigport.h
index 6d6e291de6627..b93d925102d5b 100644
--- a/ports/gprs_a9/mpconfigport.h
+++ b/ports/gprs_a9/mpconfigport.h
@@ -261,7 +261,7 @@ typedef long mp_off_t;
 #define MP_PLAT_PRINT_STRN(str, len) mp_hal_stdout_tx_strn_cooked(str, len)
 
 // We need to provide a declaration/definition of alloca()
-#include <stdlib.h>
+// #include <stdlib.h>
 
 #define MICROPY_MPHALPORT_H "mphalport.h"
 #define MICROPY_HW_BOARD_NAME   "A9/A9G module"

From dc3e2893a21c2acead40fdf7932510bf20125fd6 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Thu, 26 Mar 2020 20:46:16 +0100
Subject: [PATCH 3451/3533] Close #46

---
 ports/gprs_a9/mphalport.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ports/gprs_a9/mphalport.c b/ports/gprs_a9/mphalport.c
index f9e7b8dd3ef58..8ca2d170ee72a 100644
--- a/ports/gprs_a9/mphalport.c
+++ b/ports/gprs_a9/mphalport.c
@@ -51,7 +51,8 @@ int mp_hal_stdin_rx_chr(void) {
         if (c != -1) {
             return c;
         }
-        OS_SleepUs(1);
+        // This has to be sufficiently large to perform background tasks
+        OS_Sleep(10);
     }
 }
 

From 8550955e96fd18d46de0aeeeffd23989f5b3ccae Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Fri, 27 Mar 2020 23:42:49 +0100
Subject: [PATCH 3452/3533] Make debug messages in trace complete

---
 ports/gprs_a9/main.c | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/ports/gprs_a9/main.c b/ports/gprs_a9/main.c
index 8858d62a2f2ad..755278929b1ff 100644
--- a/ports/gprs_a9/main.c
+++ b/ports/gprs_a9/main.c
@@ -422,6 +422,10 @@ void _Main(void)
 
 
 #if MICROPY_DEBUG_VERBOSE
+
+char trace_debug_buffer[64];
+size_t trace_debug_buffer_len = 0;
+
 int DEBUG_printf(const char *fmt, ...) {
     va_list ap;
     va_start(ap, fmt);
@@ -431,14 +435,20 @@ int DEBUG_printf(const char *fmt, ...) {
 }
 
 STATIC void debug_print_strn(void *env, const char *str, size_t len) {
-    (void)env;
-    char p[len+1];
-    // char* p =  (char*)OS_Malloc(len+1);
-    // if(!p)
-    //     return;
-    memcpy(p,str,len);
-    p[len] = 0;
-    Trace(2,p);
+    (void) env;
+
+    for (size_t i=0; i<len; i++) {
+
+        if (trace_debug_buffer_len == sizeof(trace_debug_buffer) - 1 || str[i] == '\n') {
+            // flush
+            Trace(2, trace_debug_buffer);
+            memset(trace_debug_buffer, 0, sizeof(trace_debug_buffer));
+            trace_debug_buffer_len = 0;
+        }
+
+        if (str[i] != '\n') trace_debug_buffer[trace_debug_buffer_len++] = str[i];
+
+    }
 }
 
 const mp_print_t mp_debug_print = {NULL, debug_print_strn};

From 372012c2df911532a98f64f96680a7c901a20544 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Fri, 27 Mar 2020 23:57:36 +0100
Subject: [PATCH 3453/3533] Add traccar example

---
 ports/gprs_a9/examples/example_51_traccar.py | 29 ++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 ports/gprs_a9/examples/example_51_traccar.py

diff --git a/ports/gprs_a9/examples/example_51_traccar.py b/ports/gprs_a9/examples/example_51_traccar.py
new file mode 100644
index 0000000000000..dcec8f1d605b1
--- /dev/null
+++ b/ports/gprs_a9/examples/example_51_traccar.py
@@ -0,0 +1,29 @@
+# Micropython a9g example
+# Source: https://github.com/pulkin/micropython
+# Author: sebi5361
+# Demonstrates how to interface with traccar
+
+# Get online
+import cellular
+import gps
+import socket
+
+ID = 76548 # Same arbitrary number as in Traccar
+url = "demo.traccar.org"
+port = 5055
+
+cellular.gprs("internet", "", "")
+
+gps.on()
+loc = gps.get_location()
+
+s = socket.socket()
+s.connect((url, port))
+s.send(bytes('POST /?id={}&lat={}&lon={} HTTP/1.1\r\nHost: {}:{}\r\n\r\n'.format(ID, loc[0], loc[1], url, port), 'utf8'))
+rsp = s.recv(50)
+s.close()
+gps.off()
+cellular.gprs(False)
+
+assert rsp == b'HTTP/1.1 200 OK\r\ncontent-length: 0\r\n\r\n'
+

From 516aaf21f21b4164ea0bae559a6b82bd427b7014 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Fri, 27 Mar 2020 23:57:48 +0100
Subject: [PATCH 3454/3533] Add example README

---
 ports/gprs_a9/examples/README.md | 83 ++++++++++++++++++++++++++++++++
 1 file changed, 83 insertions(+)
 create mode 100644 ports/gprs_a9/examples/README.md

diff --git a/ports/gprs_a9/examples/README.md b/ports/gprs_a9/examples/README.md
new file mode 100644
index 0000000000000..34ee79a68eedd
--- /dev/null
+++ b/ports/gprs_a9/examples/README.md
@@ -0,0 +1,83 @@
+Examples for micropython on a9g
+===============================
+
+`example_01_blink.py`
+---------------------
+
+Blinks the built-in blue LED on the pudding board connected to GPIO 27.
+
+Keywords: gpio, machine, blink, hello world
+
+Modules: `machine`, `time`
+
+`example_05_watchdog.py`
+------------------------
+
+Arms the hardware watchdog and sleeps until hard reset.
+
+Keywords: watchdog, hardware, reset
+
+Modules: `machine`, `time`
+
+`example_20_gps.py`
+-------------------
+
+Displays current GPS location and visible satellites.
+
+Keywords: GPS
+
+Modules: `gps`
+
+`example_20_gps.py`
+-------------------
+
+Displays current location determined by cell tower identifiers using [agps](https://github.com/pulkin/mpy-agps).
+
+Keywords: GPS, aGPS
+
+Modules: `cellular`, `agps` (external), `upip`
+
+`example_30_network.py`
+-----------------------
+
+Tests connection to the internet by running a raw HTTP request.
+
+Keywords: internet, TCP, HTTP, GPRS
+
+Modules: `cellular`, `socket`
+
+`example_31_ssl.py`
+-------------------
+
+Test an encrypted SSL HTTP request.
+
+Keywords: HTTPS, SSL, encryption
+
+Modules: `cellular`, `socket`, `ssl`
+
+`example_32_http.py`
+--------------------
+
+Performs a simple URL request using `urequests` from [micropython-lib](https://github.com/micropython/micropython-lib).
+
+Keywords: URL, requests, HTTP, HTTPS
+
+Modules: `cellular`, `urequests` (external), `upip`
+
+`example_50_mqtt.py`
+--------------------
+
+Reports location to a test MQTT server via cellular connection using `umqtt` from [micropython-lib](https://github.com/micropython/micropython-lib).
+
+Keywords: MQTT, GPS, track
+
+Modules: `cellular`, `umqtt` (external), `gps`, `upip`
+
+`example_51_traccar.py`
+
+Reports location to [traccar](https://www.traccar.org/) online service using a simple POST request without external libraries.
+
+Keywords: GPS, track, traccar
+
+Modules: `cellular`, `gps`, `socket`
+

From 39b2dd7a6638da7c5141f2ff61076d66e2b09082 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sat, 28 Mar 2020 00:04:08 +0100
Subject: [PATCH 3455/3533] Edit README

[ci skip]
---
 ports/gprs_a9/examples/README.md | 44 +++++++++++++-------------------
 1 file changed, 18 insertions(+), 26 deletions(-)

diff --git a/ports/gprs_a9/examples/README.md b/ports/gprs_a9/examples/README.md
index 34ee79a68eedd..c9a0c33c5a48f 100644
--- a/ports/gprs_a9/examples/README.md
+++ b/ports/gprs_a9/examples/README.md
@@ -1,83 +1,75 @@
 Examples for micropython on a9g
 ===============================
 
-`example_01_blink.py`
----------------------
+[example_01_blink.py](example_01_blink.py)
 
 Blinks the built-in blue LED on the pudding board connected to GPIO 27.
 
-Keywords: gpio, machine, blink, hello world
+Keywords: **gpio, machine, blink, hello world**
 
 Modules: `machine`, `time`
 
-`example_05_watchdog.py`
-------------------------
+[example_05_watchdog.py](example_05_watchdog.py)
 
 Arms the hardware watchdog and sleeps until hard reset.
 
-Keywords: watchdog, hardware, reset
+Keywords: **watchdog, hardware, reset**
 
 Modules: `machine`, `time`
 
-`example_20_gps.py`
--------------------
+[example_20_gps.py](example_20_gps.py)
 
 Displays current GPS location and visible satellites.
 
-Keywords: GPS
+Keywords: **GPS**
 
 Modules: `gps`
 
-`example_20_gps.py`
--------------------
+[example_21_agps.py](example_21_agps.py)
 
 Displays current location determined by cell tower identifiers using [agps](https://github.com/pulkin/mpy-agps).
 
-Keywords: GPS, aGPS
+Keywords: **GPS, aGPS**
 
 Modules: `cellular`, `agps` (external), `upip`
 
-`example_30_network.py`
------------------------
+[example_30_network.py](example_30_network.py)
 
 Tests connection to the internet by running a raw HTTP request.
 
-Keywords: internet, TCP, HTTP, GPRS
+Keywords: **internet, TCP, HTTP, GPRS, connection**
 
 Modules: `cellular`, `socket`
 
-`example_31_ssl.py`
--------------------
+[example_31_ssl.py](example_31_ssl.py)
 
 Test an encrypted SSL HTTP request.
 
-Keywords: HTTPS, SSL, encryption
+Keywords: **HTTPS, SSL, encryption**
 
 Modules: `cellular`, `socket`, `ssl`
 
-`example_32_http.py`
---------------------
+[example_32_http.py](example_32_http.py)
 
 Performs a simple URL request using `urequests` from [micropython-lib](https://github.com/micropython/micropython-lib).
 
-Keywords: URL, requests, HTTP, HTTPS
+Keywords: **URL, requests, HTTP, HTTPS**
 
 Modules: `cellular`, `urequests` (external), `upip`
 
-`example_50_mqtt.py`
---------------------
+[example_50_mqtt.py](example_50_mqtt.py)
 
 Reports location to a test MQTT server via cellular connection using `umqtt` from [micropython-lib](https://github.com/micropython/micropython-lib).
 
-Keywords: MQTT, GPS, track
+Keywords: **MQTT, GPS, track**
 
 Modules: `cellular`, `umqtt` (external), `gps`, `upip`
 
-`example_51_traccar.py`
+[example_51_traccar.py](example_51_traccar.py)
 
 Reports location to [traccar](https://www.traccar.org/) online service using a simple POST request without external libraries.
 
-Keywords: GPS, track, traccar
+Keywords: **GPS, track, traccar**
 
 Modules: `cellular`, `gps`, `socket`
 

From d70a021f58ac642c27b06440b624d2e2ff949297 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sat, 28 Mar 2020 16:52:20 +0100
Subject: [PATCH 3456/3533] Use pointer for errno

---
 ports/gprs_a9/file_io.c      | 10 +++++-----
 ports/gprs_a9/moduos.c       |  2 +-
 ports/gprs_a9/modusocket.c   | 11 +++--------
 ports/gprs_a9/modusocket.h   |  1 -
 ports/gprs_a9/ram_pointers.h |  2 +-
 5 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/ports/gprs_a9/file_io.c b/ports/gprs_a9/file_io.c
index a625ed9b3133a..04f64e2ea79e8 100644
--- a/ports/gprs_a9/file_io.c
+++ b/ports/gprs_a9/file_io.c
@@ -57,7 +57,7 @@ STATIC mp_uint_t internal_flash_file_obj_read(mp_obj_t self_in, void *buf, mp_ui
     internal_flash_file_obj_t *self = MP_OBJ_TO_PTR(self_in);
     int32_t ret = API_FS_Read(self->fd, buf, size);
     if (ret < 0) {
-        *errcode = internal_flash_vfs_errno;
+        *errcode = errno;
         return MP_STREAM_ERROR;
     }
     return (mp_uint_t) ret;
@@ -70,7 +70,7 @@ STATIC mp_uint_t internal_flash_file_obj_write(mp_obj_t self_in, const void *buf
     internal_flash_file_obj_t *self = MP_OBJ_TO_PTR(self_in);
     int32_t ret = API_FS_Write(self->fd, (uint8_t*) buf, size);
     if (ret < 0) {
-        *errcode = internal_flash_vfs_errno;
+        *errcode = errno;
         return MP_STREAM_ERROR;
     }
     if (ret != size) {
@@ -112,7 +112,7 @@ STATIC mp_uint_t internal_flash_file_obj_ioctl(mp_obj_t o_in, mp_uint_t request,
         }
 
         if (ret < 0) {
-            *errcode = internal_flash_vfs_errno;
+            *errcode = errno;
             return MP_STREAM_ERROR;
         }
 
@@ -122,7 +122,7 @@ STATIC mp_uint_t internal_flash_file_obj_ioctl(mp_obj_t o_in, mp_uint_t request,
     } else if (request == MP_STREAM_FLUSH) {
         uint32_t ret = API_FS_Flush(self->fd);
         if (ret < 0) {
-            *errcode = internal_flash_vfs_errno;
+            *errcode = errno;
             return MP_STREAM_ERROR;
         }
         return 0;
@@ -132,7 +132,7 @@ STATIC mp_uint_t internal_flash_file_obj_ioctl(mp_obj_t o_in, mp_uint_t request,
         if (self->fd > 0) {
             int32_t ret = API_FS_Close(self->fd);
             if (ret < 0) {
-                *errcode = internal_flash_vfs_errno;
+                *errcode = errno;
                 return MP_STREAM_ERROR;
             } else
                 self->fd = 0;
diff --git a/ports/gprs_a9/moduos.c b/ports/gprs_a9/moduos.c
index 935abaf736151..7230aef168a2d 100644
--- a/ports/gprs_a9/moduos.c
+++ b/ports/gprs_a9/moduos.c
@@ -53,7 +53,7 @@
 extern const mp_obj_type_t mp_fat_vfs_type;
 
 int maybe_raise_FSError(int x) {
-    if (x < 0) mp_raise_OSError(internal_flash_vfs_errno);
+    if (x < 0) mp_raise_OSError(errno);
     return x;
 }
 
diff --git a/ports/gprs_a9/modusocket.c b/ports/gprs_a9/modusocket.c
index f212ac4f5d762..afd1b5b4324f7 100644
--- a/ports/gprs_a9/modusocket.c
+++ b/ports/gprs_a9/modusocket.c
@@ -41,6 +41,7 @@
 #include "lib/netutils/netutils.h"
 
 #include "api_network.h"
+#include "ram_pointers.h"
 
 #include "stdio.h"
 
@@ -237,7 +238,7 @@ STATIC mp_obj_t socket_connect(mp_obj_t self_in, mp_obj_t ipv4) {
     MP_THREAD_GIL_ENTER();
 
     if (r < 0) {
-        exception_from_errno(LWIP_ERRNO());
+        exception_from_errno(errno);
     }
 
     return mp_const_none;
@@ -253,7 +254,6 @@ int _socket_send(socket_obj_t *sock, const char *data, size_t datalen) {
         int r = LWIP_WRITE(sock->fd, data + sentlen, datalen - sentlen);
         MP_THREAD_GIL_ENTER();
 
-        int errno = LWIP_ERRNO();
         if (r < 0 && errno != EWOULDBLOCK) exception_from_errno(errno);
         if (r > 0) sentlen += r;
         check_for_exceptions();
@@ -337,7 +337,6 @@ STATIC mp_uint_t _socket_read_data(mp_obj_t self_in, void *buf, size_t size, str
 
         if (r == 0) sock->peer_closed = true;
         if (r >= 0) return r;
-        int errno = LWIP_ERRNO();
         if (errno != EWOULDBLOCK) {
             *errcode = errno;
             return MP_STREAM_ERROR;
@@ -400,7 +399,6 @@ STATIC mp_obj_t socket_sendto(mp_obj_t self_in, mp_obj_t bytes, mp_obj_t address
         int ret = LWIP_SENDTO(self->fd, bufinfo.buf, bufinfo.len, 0, (struct sockaddr*)&to, sizeof(to));
         MP_THREAD_GIL_ENTER();
         if (ret > 0) return mp_obj_new_int_from_uint(ret);
-        int errno = LWIP_ERRNO();
         if (ret == -1 && errno != EWOULDBLOCK) {
             exception_from_errno(errno);
         }
@@ -452,7 +450,6 @@ STATIC mp_obj_t socket_setsockopt(size_t n_args, const mp_obj_t *args) {
             int val = mp_obj_get_int(args[3]);
             int ret = LWIP_SETSOCKOPT(self->fd, SOL_SOCKET, opt, &val, sizeof(int));
             if (ret != 0) {
-                int errno = LWIP_ERRNO();
                 exception_from_errno(errno);
             }
             break;
@@ -531,7 +528,6 @@ STATIC mp_uint_t socket_stream_write(mp_obj_t self_in, const void *buf, mp_uint_
         int r = LWIP_WRITE(sock->fd, buf, size);
         MP_THREAD_GIL_ENTER();
         if (r > 0) return r;
-        int errno = LWIP_ERRNO();
         if (r < 0 && errno != EWOULDBLOCK) { *errcode = errno; return MP_STREAM_ERROR; }
         check_for_exceptions();
     }
@@ -568,7 +564,7 @@ STATIC mp_uint_t socket_stream_ioctl(mp_obj_t self_in, mp_uint_t request, uintpt
         if (socket->fd >= 0) {
             int ret = LWIP_CLOSE(socket->fd);
             if (ret != 0) {
-                *errcode = LWIP_ERRNO();
+                *errcode = errno;
                 return MP_STREAM_ERROR;
             }
             socket->fd = -1;
@@ -722,7 +718,6 @@ STATIC mp_obj_t getaddrinfo(size_t n_args, const mp_obj_t *pos_args, mp_map_t *k
 
     struct sockaddr_in res;
     if (_socket_getaddrinfo2(host, port, &res) < 0) {
-        int errno = LWIP_ERRNO();
         exception_from_errno(errno);
     }
 
diff --git a/ports/gprs_a9/modusocket.h b/ports/gprs_a9/modusocket.h
index de288d112e213..36d14ff030384 100644
--- a/ports/gprs_a9/modusocket.h
+++ b/ports/gprs_a9/modusocket.h
@@ -61,7 +61,6 @@
 #define LWIP_IP4ADDR_ATON         CSDK_FUNC(ip4addr_aton)
 #define LWIP_STRERR               CSDK_FUNC(lwip_strerr)
 #define LWIP_ERR_TO_ERRNO         CSDK_FUNC(err_to_errno)
-#define LWIP_ERRNO                CSDK_FUNC(Socket_GetLastError)
 
 #define DNS_GetHostByName2        CSDK_FUNC(DNS_GetHostByName2)
 
diff --git a/ports/gprs_a9/ram_pointers.h b/ports/gprs_a9/ram_pointers.h
index ceb514deacd1a..a92de7d77c15f 100644
--- a/ports/gprs_a9/ram_pointers.h
+++ b/ports/gprs_a9/ram_pointers.h
@@ -27,5 +27,5 @@
  */
 
 // This file is a fucking shame and it may work only with a particular SDK version
-#define internal_flash_vfs_errno (*((volatile int *) 0x820a0c14))
+#define errno (*((volatile int *) 0x820a0c14))
 

From e88bcfc75bfc5e11b6677d39a266044874b10264 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sat, 28 Mar 2020 21:43:15 +0100
Subject: [PATCH 3457/3533] Fix some socket exceptions

---
 ports/gprs_a9/modusocket.c | 63 +++++++++++++++++++++++---------------
 1 file changed, 38 insertions(+), 25 deletions(-)

diff --git a/ports/gprs_a9/modusocket.c b/ports/gprs_a9/modusocket.c
index afd1b5b4324f7..bba47b6713d5c 100644
--- a/ports/gprs_a9/modusocket.c
+++ b/ports/gprs_a9/modusocket.c
@@ -72,6 +72,7 @@ typedef struct _socket_obj_t {
     uint8_t type;
     uint8_t proto;
     bool peer_closed;
+    bool peer_opened;
     unsigned int retries;
 } socket_obj_t;
 
@@ -140,6 +141,7 @@ mp_obj_t socket_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw,
     socket_obj_t *self = m_new_obj_with_finaliser(socket_obj_t);
     self->base.type = type;
     self->peer_closed = false;
+    self->peer_opened = false;
 
     switch (args[ARG_af].u_int) {
         case AF_INET:
@@ -230,6 +232,11 @@ STATIC mp_obj_t socket_connect(mp_obj_t self_in, mp_obj_t ipv4) {
     // ========================================
     socket_obj_t *self = MP_OBJ_TO_PTR(self_in);
 
+    // handicap fix of #50: check if connected and raise 106 EISCONN in this case
+    if (self->peer_opened) {
+        mp_raise_OSError(EISCONN);
+    }
+
     struct sockaddr_in res;
     _socket_getaddrinfo(ipv4, &res);
 
@@ -241,6 +248,8 @@ STATIC mp_obj_t socket_connect(mp_obj_t self_in, mp_obj_t ipv4) {
         exception_from_errno(errno);
     }
 
+    self->peer_opened = true;
+
     return mp_const_none;
 }
 
@@ -299,44 +308,48 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(socket_sendall_obj, &socket_sendall);
 // XXX this can end up waiting a very long time if the content is dribbled in one character
 // at a time, as the timeout resets each time a recvfrom succeeds ... this is probably not
 // good behaviour.
-STATIC mp_uint_t _socket_read_data(mp_obj_t self_in, void *buf, size_t size, struct sockaddr *from, socklen_t *from_len, int *errcode) {
+STATIC mp_uint_t _socket_read_data(mp_obj_t self_in, void *buf, size_t size,
+    struct sockaddr *from, socklen_t *from_len, int *errcode) {
     socket_obj_t *sock = MP_OBJ_TO_PTR(self_in);
 
     // If the peer closed the connection then the lwIP socket API will only return "0" once
-    // from lwip_recvfrom_r and then block on subsequent calls.  To emulate POSIX behaviour,
+    // from lwip_recvfrom and then block on subsequent calls.  To emulate POSIX behaviour,
     // which continues to return "0" for each call on a closed socket, we set a flag when
     // the peer closed the socket.
     if (sock->peer_closed) {
         return 0;
     }
 
-    struct fd_set fds;
-    struct timeval timeout = {12, 0};
-    FD_ZERO(&fds);
-    FD_SET(sock->fd, &fds);
+    if (!sock->peer_opened) {
+        mp_raise_OSError(ENOTCONN);
+    }
 
     // XXX Would be nicer to use RTC to handle timeouts
     for (int i = 0; i <= sock->retries; ++i) {
-
-        int r = -1;
-        switch (LWIP_SELECT(sock->fd + 1, &fds, NULL, NULL, &timeout)) {
-            case -1:
-                // An error is set already, proceed to raising it
-                break;
-            case 0:
-                continue;
-            default:
-                if (FD_ISSET(sock->fd, &fds)) {
-                    MP_THREAD_GIL_EXIT();
-                    r = LWIP_RECVFROM(sock->fd, buf, size, 0, from, from_len);
-                    MP_THREAD_GIL_ENTER();
-                } else {
-                    continue;
-                }
+        // Poll the socket to see if it has waiting data and only release the GIL if it doesn't.
+        // This ensures higher performance in the case of many small reads, eg for readline.
+        bool release_gil;
+        {
+            fd_set rfds;
+            FD_ZERO(&rfds);
+            FD_SET(sock->fd, &rfds);
+            struct timeval timeout = { .tv_sec = 0, .tv_usec = 0 };
+            int r = LWIP_SELECT(sock->fd + 1, &rfds, NULL, NULL, &timeout);
+            release_gil = r != 1;
+        }
+        if (release_gil) {
+            MP_THREAD_GIL_EXIT();
+        }
+        int r = LWIP_RECVFROM(sock->fd, buf, size, 0, from, from_len);
+        if (release_gil) {
+            MP_THREAD_GIL_ENTER();
+        }
+        if (r == 0) {
+            sock->peer_closed = true;
+        }
+        if (r >= 0) {
+            return r;
         }
-
-        if (r == 0) sock->peer_closed = true;
-        if (r >= 0) return r;
         if (errno != EWOULDBLOCK) {
             *errcode = errno;
             return MP_STREAM_ERROR;

From 58b45f4787dd88710e495971cf9f7ae25e872faa Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Tue, 31 Mar 2020 23:00:33 +0200
Subject: [PATCH 3458/3533] Switch to a simpler patching script in python

---
 ports/gprs_a9/Makefile                        |   3 +-
 ports/gprs_a9/build-libcsdk.sh                |   6 +-
 .../libcsdk-patches/SW_V2129_csdk.elf.patch   | Bin 17773 -> 0 bytes
 .../libcsdk-patches/SW_V2129_csdk.lod.patch   | Bin 12795 -> 0 bytes
 ports/gprs_a9/libcsdk-patches/md5             |   2 -
 ports/gprs_a9/libcsdk-patches/patch-lod.py    |  72 ++++++++++++++++++
 6 files changed, 75 insertions(+), 8 deletions(-)
 delete mode 100644 ports/gprs_a9/libcsdk-patches/SW_V2129_csdk.elf.patch
 delete mode 100644 ports/gprs_a9/libcsdk-patches/SW_V2129_csdk.lod.patch
 delete mode 100644 ports/gprs_a9/libcsdk-patches/md5
 create mode 100755 ports/gprs_a9/libcsdk-patches/patch-lod.py

diff --git a/ports/gprs_a9/Makefile b/ports/gprs_a9/Makefile
index 248e7a539349d..b0a3b38503674 100644
--- a/ports/gprs_a9/Makefile
+++ b/ports/gprs_a9/Makefile
@@ -7,8 +7,6 @@ include ../../py/mkenv.mk
 CSDTK_PATH = ${PATH_MICROPY}/lib/csdtk42-linux
 # mips-elf-* compiler libraries
 export LD_LIBRARY_PATH=$(CSDTK_PATH)/lib:$(CSDTK_PATH)/mingw32/usr/lib
-# TODO: integrate this
-$(shell ./build-libcsdk.sh)
 
 include ${CSDK_PATH}/platform/csdk/memd.def
 include ${CSDK_PATH}/platform/chip/defs/8955_base.def
@@ -194,6 +192,7 @@ all: lod
 lod: ${HEX}
 	$(Q)$(MAKE) targetgen
 	$(Q)$(SRECMAP_TOOL) -c ${MAP_CFG_FILE} -m ${FLSH_MODEL} -b ${TARGET_FILE} ${HEX} ${LODBASE} ${STDOUT_NULL}
+	@echo "$(shell ./build-libcsdk.sh)"
 	$(Q)python $(LODCOMBINE_TOOL) merge --platform $(PLATFORM_LOD_FILE) --app $(LOD_FILE) --out $(WITH_PLT_LOD_FILE)
 	$(ECHO) "BUILD OK"
 
diff --git a/ports/gprs_a9/build-libcsdk.sh b/ports/gprs_a9/build-libcsdk.sh
index 16245aad6fb1d..2cb9ee25072c6 100755
--- a/ports/gprs_a9/build-libcsdk.sh
+++ b/ports/gprs_a9/build-libcsdk.sh
@@ -22,10 +22,8 @@ fi
 
 function apply_patches()
 {
-    echo ">> Patching platform elf and lod"
-    rsync --read-batch=libcsdk-patches/SW_V2129_csdk.elf.patch ../../lib/GPRS_C_SDK/platform/csdk/debug/SW_V2129_csdk.elf
-    rsync --read-batch=libcsdk-patches/SW_V2129_csdk.lod.patch ../../lib/GPRS_C_SDK/platform/csdk/debug/SW_V2129_csdk.lod
-    md5sum -c --quiet libcsdk-patches/md5
+    echo ">> patching csdk lod"
+    ./libcsdk-patches/patch-lod.py ../../lib/GPRS_C_SDK/platform/csdk/debug/SW_V2129_csdk.lod
 }
 
 function generate_CSDK_lib()
diff --git a/ports/gprs_a9/libcsdk-patches/SW_V2129_csdk.elf.patch b/ports/gprs_a9/libcsdk-patches/SW_V2129_csdk.elf.patch
deleted file mode 100644
index ff157d4a56288c30aaa91face2562bc6674f028e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 17773
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

diff --git a/ports/gprs_a9/libcsdk-patches/SW_V2129_csdk.lod.patch b/ports/gprs_a9/libcsdk-patches/SW_V2129_csdk.lod.patch
deleted file mode 100644
index b87d4b3037ca66efe2157f5a78a2351404a4a8d3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12795
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

diff --git a/ports/gprs_a9/libcsdk-patches/md5 b/ports/gprs_a9/libcsdk-patches/md5
deleted file mode 100644
index 888efb3dba604..0000000000000
--- a/ports/gprs_a9/libcsdk-patches/md5
+++ /dev/null
@@ -1,2 +0,0 @@
-c744a97cdac8dce5dc2b88b7d4022e22  ../../lib/GPRS_C_SDK/platform/csdk/debug/SW_V2129_csdk.elf
-00ba911bb6613d300c4b2ffeeeb70528  ../../lib/GPRS_C_SDK/platform/csdk/debug/SW_V2129_csdk.lod
diff --git a/ports/gprs_a9/libcsdk-patches/patch-lod.py b/ports/gprs_a9/libcsdk-patches/patch-lod.py
new file mode 100755
index 0000000000000..d9d19a68f2496
--- /dev/null
+++ b/ports/gprs_a9/libcsdk-patches/patch-lod.py
@@ -0,0 +1,72 @@
+#!/usr/bin/env python
+import sys, re
+
+fname, = sys.argv[1:]
+nop = "0065"
+patch_list = {
+    0x08185a14: ("Issue 28 -- user name", bytes.fromhex('c0c2c1c2c2c2c3c2'), bytes.fromhex('c0c2' + (nop * 3))),
+    0x08185a46: ("Issue 28 -- password", bytes.fromhex('a0c2a1c2a2c2a3c2'), bytes.fromhex('a0c2' + (nop * 3))),
+    0x08185a74: ("Issue 28 -- APN", bytes.fromhex('80c281c282c283c2'), bytes.fromhex('80c2' + (nop * 3))),
+    0x0817aa3e: ("Issue 50 -- double socket.connect", bytes.fromhex('701836ea'), bytes.fromhex(nop * 2)),
+}
+keys_l = sorted(patch_list.keys())
+
+address = None
+patching_in_progress = None
+patching_now = None
+checksum = 0
+data = []
+
+with open(fname, 'r') as f:
+    for n, line in enumerate(f):
+        if line.startswith("#"):
+            if line.startswith("#checksum"):
+                data.append(f"#checksum={checksum:08x}\n")
+            else:
+                data.append(line)  # Comment line
+        elif line.startswith("@"):
+            address = int(line[1:], 16)
+            data.append(line)
+        else:
+            line_bytes = bytes.fromhex(line)[::-1]
+            address_to = address + len(line_bytes)
+            for address_p, (name, old, new) in patch_list.items():
+                address_p_to = address_p + len(old)
+                address_o = max(address, address_p)
+                address_o_to = min(address_to, address_p_to)
+                if address_o < address_o_to:
+                    if patching_in_progress is None:
+                        patching_in_progress = address_p
+                        print(f"{name} @ 0x{address_p:08x}")
+                    elif patching_in_progress != address_p:
+                        raise RuntimeError(f"Failed to patch 0x{patching_in_progress:08x}: overlapping addresses")
+                    current_patch = line_bytes[address_o - address:address_o_to - address]
+                    old_patch = old[address_o - address_p:address_o_to - address_p]
+                    new_patch = new[address_o - address_p:address_o_to - address_p]
+                    if old_patch != new_patch:
+                        if new_patch == current_patch:
+                            if patching_now in (None, False):
+                                print("  .", end=" ")
+                                patching_now = False
+                            else:
+                                raise RuntimeError(f"Failed to patch 0x{patching_in_progress:08x}: data mismatch")
+                        elif old_patch == current_patch:
+                            if patching_now in (None, True):
+                                print("  ✓", end=" ")
+                                patching_now = True
+                                line_bytes = line_bytes[:address_o - address] + new_patch + line_bytes[address_o_to - address:]
+                            else:
+                                raise RuntimeError(f"Failed to patch 0x{patching_in_progress:08x}: data mismatch")
+                        else:
+                            raise RuntimeError(f"Failed to patch 0x{patching_in_progress:08x}: data mismatch")
+                        print(f"{address_o - address_p:d}:{address_o_to - address_p:d}")
+                    if address_o_to == address_p_to:
+                        patching_in_progress = None
+                        patching_now = None
+            address = address_to
+            checksum += int.from_bytes(line_bytes, 'little')
+            checksum = checksum & 0xFFFFFFFF
+            data.append(line_bytes[::-1].hex()+"\n")
+with open(fname, 'w') as f:
+    f.write(''.join(data))
+print("Done")

From 1a26c914fe5918e3bf4922dcab4032f83a26a4ff Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Tue, 31 Mar 2020 23:01:36 +0200
Subject: [PATCH 3459/3533] Remove the workaround of #50 in favor of patched
 libcsdk

---
 ports/gprs_a9/modusocket.c | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/ports/gprs_a9/modusocket.c b/ports/gprs_a9/modusocket.c
index bba47b6713d5c..921b66e6c026a 100644
--- a/ports/gprs_a9/modusocket.c
+++ b/ports/gprs_a9/modusocket.c
@@ -72,7 +72,6 @@ typedef struct _socket_obj_t {
     uint8_t type;
     uint8_t proto;
     bool peer_closed;
-    bool peer_opened;
     unsigned int retries;
 } socket_obj_t;
 
@@ -141,7 +140,6 @@ mp_obj_t socket_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw,
     socket_obj_t *self = m_new_obj_with_finaliser(socket_obj_t);
     self->base.type = type;
     self->peer_closed = false;
-    self->peer_opened = false;
 
     switch (args[ARG_af].u_int) {
         case AF_INET:
@@ -232,11 +230,6 @@ STATIC mp_obj_t socket_connect(mp_obj_t self_in, mp_obj_t ipv4) {
     // ========================================
     socket_obj_t *self = MP_OBJ_TO_PTR(self_in);
 
-    // handicap fix of #50: check if connected and raise 106 EISCONN in this case
-    if (self->peer_opened) {
-        mp_raise_OSError(EISCONN);
-    }
-
     struct sockaddr_in res;
     _socket_getaddrinfo(ipv4, &res);
 
@@ -248,8 +241,6 @@ STATIC mp_obj_t socket_connect(mp_obj_t self_in, mp_obj_t ipv4) {
         exception_from_errno(errno);
     }
 
-    self->peer_opened = true;
-
     return mp_const_none;
 }
 
@@ -320,10 +311,6 @@ STATIC mp_uint_t _socket_read_data(mp_obj_t self_in, void *buf, size_t size,
         return 0;
     }
 
-    if (!sock->peer_opened) {
-        mp_raise_OSError(ENOTCONN);
-    }
-
     // XXX Would be nicer to use RTC to handle timeouts
     for (int i = 0; i <= sock->retries; ++i) {
         // Poll the socket to see if it has waiting data and only release the GIL if it doesn't.

From e8f3bfa8a77ceb5954f1ce79c07fb619cfed5d66 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Tue, 31 Mar 2020 23:02:58 +0200
Subject: [PATCH 3460/3533] chip.flash_user_start() -> chip.USER_OFFSET

---
 ports/gprs_a9/modchip.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/ports/gprs_a9/modchip.c b/ports/gprs_a9/modchip.c
index 8686007e306b8..0a64065e7a252 100644
--- a/ports/gprs_a9/modchip.c
+++ b/ports/gprs_a9/modchip.c
@@ -83,11 +83,6 @@ STATIC mp_obj_t modchip_chip_flash_size(void) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_0(modchip_chip_flash_size_obj, modchip_chip_flash_size);
 
-STATIC mp_obj_t modchip_chip_flash_user_start(void) {
-    return MP_OBJ_NEW_SMALL_INT(0x390000);
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(modchip_chip_flash_user_start_obj, modchip_chip_flash_user_start);
-
 STATIC const mp_rom_map_elem_t chip_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_chip) },
 
@@ -95,7 +90,8 @@ STATIC const mp_rom_map_elem_t chip_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_flash_write), MP_ROM_PTR(&modchip_chip_flash_write_obj) },
     { MP_ROM_QSTR(MP_QSTR_flash_erase), MP_ROM_PTR(&modchip_chip_flash_erase_obj) },
     { MP_ROM_QSTR(MP_QSTR_flash_size), MP_ROM_PTR(&modchip_chip_flash_size_obj) },
-    { MP_ROM_QSTR(MP_QSTR_flash_user_start), MP_ROM_PTR(&modchip_chip_flash_user_start_obj) },
+
+    { MP_ROM_QSTR(MP_QSTR_USER_OFFSET), MP_ROM_INT(0x00390000) },
 };
 
 STATIC MP_DEFINE_CONST_DICT(chip_module_globals, chip_module_globals_table);

From 9946249bf782dde4b8e13a53980fed5cc038d083 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Tue, 31 Mar 2020 23:10:14 +0200
Subject: [PATCH 3461/3533] Fix the build by compiling libcsdk earlier

---
 ports/gprs_a9/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/gprs_a9/Makefile b/ports/gprs_a9/Makefile
index b0a3b38503674..ecc09444d36e2 100644
--- a/ports/gprs_a9/Makefile
+++ b/ports/gprs_a9/Makefile
@@ -192,7 +192,6 @@ all: lod
 lod: ${HEX}
 	$(Q)$(MAKE) targetgen
 	$(Q)$(SRECMAP_TOOL) -c ${MAP_CFG_FILE} -m ${FLSH_MODEL} -b ${TARGET_FILE} ${HEX} ${LODBASE} ${STDOUT_NULL}
-	@echo "$(shell ./build-libcsdk.sh)"
 	$(Q)python $(LODCOMBINE_TOOL) merge --platform $(PLATFORM_LOD_FILE) --app $(LOD_FILE) --out $(WITH_PLT_LOD_FILE)
 	$(ECHO) "BUILD OK"
 
@@ -207,6 +206,7 @@ ${BIN}: $(OBJ)
 	-Map ${MAP}
 
 bin: ${BIN}
+	@echo "$(shell ./build-libcsdk.sh)"
 	$(Q)${MKDIR} -p ${BIN_PATH}
 	$(Q)${CP} -f ${BIN} ${BIN_PATH}
 	$(Q)${CP} -f ${PLATFORM_ELF_PATH} ${BIN_PATH}

From 321942de464a42f86a1a62ec32aa20aef6774f0c Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Tue, 31 Mar 2020 23:24:17 +0200
Subject: [PATCH 3462/3533] Fix the build by compiling libcsdk even earlier

---
 ports/gprs_a9/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/gprs_a9/Makefile b/ports/gprs_a9/Makefile
index ecc09444d36e2..50f9a20d7d422 100644
--- a/ports/gprs_a9/Makefile
+++ b/ports/gprs_a9/Makefile
@@ -196,6 +196,7 @@ lod: ${HEX}
 	$(ECHO) "BUILD OK"
 
 ${BIN}: $(OBJ)
+	@echo "$(shell ./build-libcsdk.sh)"
 	$(ECHO) "LINK $@"
 	$(Q)test -f ${LD_FILE} && chmod +w ${LD_FILE} || echo ""
 	$(Q)${LDPP} ${LDPPFLAGS} ${LD_SRC} > ${LD_FILE}
@@ -206,7 +207,6 @@ ${BIN}: $(OBJ)
 	-Map ${MAP}
 
 bin: ${BIN}
-	@echo "$(shell ./build-libcsdk.sh)"
 	$(Q)${MKDIR} -p ${BIN_PATH}
 	$(Q)${CP} -f ${BIN} ${BIN_PATH}
 	$(Q)${CP} -f ${PLATFORM_ELF_PATH} ${BIN_PATH}

From 0d8f4862b7e2248170aecef816c1eb1baeb2fe84 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Tue, 31 Mar 2020 23:32:31 +0200
Subject: [PATCH 3463/3533] Specify python3 for automatic builds explicitly

---
 azure-pipelines.yml                        | 2 +-
 ports/gprs_a9/libcsdk-patches/patch-lod.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 683539deedb05..c2d308c06c07f 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -400,7 +400,7 @@ stages:
 
     - script: |
         sudo apt-get update
-        sudo apt-get install build-essential gcc-multilib g++-multilib libzip-dev zlib1g lib32z1
+        sudo apt-get install build-essential gcc-multilib g++-multilib libzip-dev zlib1g lib32z1 python3
       displayName: 'Install dependencies'
   
     - script: |
diff --git a/ports/gprs_a9/libcsdk-patches/patch-lod.py b/ports/gprs_a9/libcsdk-patches/patch-lod.py
index d9d19a68f2496..d4b72bf281e3d 100755
--- a/ports/gprs_a9/libcsdk-patches/patch-lod.py
+++ b/ports/gprs_a9/libcsdk-patches/patch-lod.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 import sys, re
 
 fname, = sys.argv[1:]

From 9eaf67317b5eb6719b24da18dd294d07b01cffd3 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Tue, 31 Mar 2020 23:44:59 +0200
Subject: [PATCH 3464/3533] Attempt fixing patching in automatic builds

---
 ports/gprs_a9/libcsdk-patches/patch-lod.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/gprs_a9/libcsdk-patches/patch-lod.py b/ports/gprs_a9/libcsdk-patches/patch-lod.py
index d4b72bf281e3d..fb1fa243702ec 100755
--- a/ports/gprs_a9/libcsdk-patches/patch-lod.py
+++ b/ports/gprs_a9/libcsdk-patches/patch-lod.py
@@ -28,7 +28,7 @@
             address = int(line[1:], 16)
             data.append(line)
         else:
-            line_bytes = bytes.fromhex(line)[::-1]
+            line_bytes = bytes.fromhex(line[:-1])[::-1]
             address_to = address + len(line_bytes)
             for address_p, (name, old, new) in patch_list.items():
                 address_p_to = address_p + len(old)

From 72be9bced860059dd99f02aaeab99c0b554934cb Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Wed, 8 Apr 2020 22:28:06 +0200
Subject: [PATCH 3465/3533] Remove f-strings for compatibility reasons

---
 ports/gprs_a9/libcsdk-patches/patch-lod.py | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/ports/gprs_a9/libcsdk-patches/patch-lod.py b/ports/gprs_a9/libcsdk-patches/patch-lod.py
index fb1fa243702ec..8dfd1c1907632 100755
--- a/ports/gprs_a9/libcsdk-patches/patch-lod.py
+++ b/ports/gprs_a9/libcsdk-patches/patch-lod.py
@@ -21,7 +21,7 @@
     for n, line in enumerate(f):
         if line.startswith("#"):
             if line.startswith("#checksum"):
-                data.append(f"#checksum={checksum:08x}\n")
+                data.append("#checksum={:08x}\n".format(checksum))
             else:
                 data.append(line)  # Comment line
         elif line.startswith("@"):
@@ -37,9 +37,9 @@
                 if address_o < address_o_to:
                     if patching_in_progress is None:
                         patching_in_progress = address_p
-                        print(f"{name} @ 0x{address_p:08x}")
+                        print("{} @ 0x{:08x}".format(name, address_p))
                     elif patching_in_progress != address_p:
-                        raise RuntimeError(f"Failed to patch 0x{patching_in_progress:08x}: overlapping addresses")
+                        raise RuntimeError("Failed to patch 0x{:08x}: overlapping addresses".format(patching_in_progress))
                     current_patch = line_bytes[address_o - address:address_o_to - address]
                     old_patch = old[address_o - address_p:address_o_to - address_p]
                     new_patch = new[address_o - address_p:address_o_to - address_p]
@@ -49,17 +49,17 @@
                                 print("  .", end=" ")
                                 patching_now = False
                             else:
-                                raise RuntimeError(f"Failed to patch 0x{patching_in_progress:08x}: data mismatch")
+                                raise RuntimeError("Failed to patch 0x{:08x}: data mismatch".format(patching_in_progress))
                         elif old_patch == current_patch:
                             if patching_now in (None, True):
                                 print("  ✓", end=" ")
                                 patching_now = True
                                 line_bytes = line_bytes[:address_o - address] + new_patch + line_bytes[address_o_to - address:]
                             else:
-                                raise RuntimeError(f"Failed to patch 0x{patching_in_progress:08x}: data mismatch")
+                                raise RuntimeError("Failed to patch 0x{:08x}: data mismatch".format(patching_in_progress))
                         else:
-                            raise RuntimeError(f"Failed to patch 0x{patching_in_progress:08x}: data mismatch")
-                        print(f"{address_o - address_p:d}:{address_o_to - address_p:d}")
+                            raise RuntimeError("Failed to patch 0x{:08x}: data mismatch".format(patching_in_progress))
+                        print("{:d}:{:d}".format(address_o - address_p, address_o_to - address_p))
                     if address_o_to == address_p_to:
                         patching_in_progress = None
                         patching_now = None
@@ -70,3 +70,4 @@
 with open(fname, 'w') as f:
     f.write(''.join(data))
 print("Done")
+

From 12d36b2138f97b1f27044965e893ec3bf5fe4bc6 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sat, 2 May 2020 21:33:35 +0200
Subject: [PATCH 3466/3533] Add machine.RTC

---
 ports/gprs_a9/Makefile      |   3 +-
 ports/gprs_a9/machine_rtc.c | 101 ++++++++++++++++++++++++++++++++++++
 ports/gprs_a9/modmachine.c  |   1 +
 ports/gprs_a9/modmachine.h  |   1 +
 4 files changed, 105 insertions(+), 1 deletion(-)
 create mode 100644 ports/gprs_a9/machine_rtc.c

diff --git a/ports/gprs_a9/Makefile b/ports/gprs_a9/Makefile
index 50f9a20d7d422..ccddc7e9a585e 100644
--- a/ports/gprs_a9/Makefile
+++ b/ports/gprs_a9/Makefile
@@ -142,7 +142,8 @@ SRC_C = \
 	modi2c.c \
 	modst7735.c \
 	machine_adc.c \
-	machine_uart.c
+	machine_uart.c \
+	machine_rtc.c
 
 
 LIB_SRC_C = $(addprefix lib/,\
diff --git a/ports/gprs_a9/machine_rtc.c b/ports/gprs_a9/machine_rtc.c
new file mode 100644
index 0000000000000..f99118fbae056
--- /dev/null
+++ b/ports/gprs_a9/machine_rtc.c
@@ -0,0 +1,101 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2015 Josef Gajdusek
+ * Copyright (c) 2020 pulkin
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+#include "time.h"
+#include "errno.h"
+
+#include "py/runtime.h"
+#include "modmachine.h"
+
+typedef struct _pyb_rtc_obj_t {
+    mp_obj_base_t base;
+} pyb_rtc_obj_t;
+
+// singleton RTC object
+STATIC const pyb_rtc_obj_t pyb_rtc_obj = {{&pyb_rtc_type}};
+
+void mp_hal_rtc_init(void) {
+}
+
+STATIC mp_obj_t pyb_rtc_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
+    // check arguments
+    mp_arg_check_num(n_args, n_kw, 0, 0, false);
+
+    // return constant object
+    return (mp_obj_t)&pyb_rtc_obj;
+}
+
+STATIC mp_obj_t pyb_rtc_datetime(size_t n_args, const mp_obj_t *args) {
+    if (n_args == 1) {
+        // Get time
+        RTC_Time_t tm;
+        if (!TIME_GetRtcTime(&tm))
+            mp_raise_OSError(EIO);
+        mp_obj_t tuple[8] = {
+            mp_obj_new_int(tm.year),
+            mp_obj_new_int(tm.month),
+            mp_obj_new_int(tm.day),
+            mp_obj_new_int(0),
+            mp_obj_new_int(tm.hour),
+            mp_obj_new_int(tm.minute),
+            mp_obj_new_int(tm.second),
+            mp_obj_new_int(0)
+        };
+
+        return mp_obj_new_tuple(8, tuple);
+    } else {
+        // Set time
+        mp_obj_t *items;
+        mp_obj_get_array_fixed_n(args[1], 8, &items);
+
+        RTC_Time_t tm;
+        tm.year = mp_obj_get_int(items[0]);
+        tm.month = mp_obj_get_int(items[1]);
+        tm.day = mp_obj_get_int(items[2]);
+        tm.hour = mp_obj_get_int(items[4]);
+        tm.minute = mp_obj_get_int(items[5]);
+        tm.second = mp_obj_get_int(items[6]);
+
+        if (!TIME_SetRtcTime(&tm))
+            mp_raise_OSError(EIO);
+
+        return mp_const_none;
+    }
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pyb_rtc_datetime_obj, 1, 2, pyb_rtc_datetime);
+
+STATIC const mp_rom_map_elem_t pyb_rtc_locals_dict_table[] = {
+    { MP_ROM_QSTR(MP_QSTR_datetime), MP_ROM_PTR(&pyb_rtc_datetime_obj) },
+};
+STATIC MP_DEFINE_CONST_DICT(pyb_rtc_locals_dict, pyb_rtc_locals_dict_table);
+
+const mp_obj_type_t pyb_rtc_type = {
+    { &mp_type_type },
+    .name = MP_QSTR_RTC,
+    .make_new = pyb_rtc_make_new,
+    .locals_dict = (mp_obj_dict_t*)&pyb_rtc_locals_dict,
+};
+
diff --git a/ports/gprs_a9/modmachine.c b/ports/gprs_a9/modmachine.c
index c73fbd82b43de..40082c022a66f 100644
--- a/ports/gprs_a9/modmachine.c
+++ b/ports/gprs_a9/modmachine.c
@@ -208,6 +208,7 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_Pin), MP_ROM_PTR(&machine_pin_type) },
     { MP_ROM_QSTR(MP_QSTR_ADC), MP_ROM_PTR(&machine_adc_type) },
     { MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&pyb_uart_type) },
+    { MP_ROM_QSTR(MP_QSTR_RTC), MP_ROM_PTR(&pyb_rtc_type) },
     { MP_OBJ_NEW_QSTR(MP_QSTR_reset), (mp_obj_t)&modmachine_reset_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_set_idle), (mp_obj_t)&modmachine_set_idle_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_set_min_freq), (mp_obj_t)&modmachine_set_min_freq_obj },
diff --git a/ports/gprs_a9/modmachine.h b/ports/gprs_a9/modmachine.h
index b4fddcd87db71..abcfc12559758 100644
--- a/ports/gprs_a9/modmachine.h
+++ b/ports/gprs_a9/modmachine.h
@@ -43,6 +43,7 @@ typedef struct _pyb_uart_obj_t {
 extern const mp_obj_type_t machine_pin_type;
 extern const mp_obj_type_t machine_adc_type;
 extern const mp_obj_type_t pyb_uart_type;
+extern const mp_obj_type_t pyb_rtc_type;
 extern Power_On_Cause_t powerOnCause;
 
 void modmachine_pin_init0(void);

From eb3f8501497868b10c8db55fcdee48f53c018ca7 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Tue, 5 May 2020 00:44:46 +0200
Subject: [PATCH 3467/3533] readme: add mention of RTC

---
 ports/gprs_a9/README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/gprs_a9/README.md b/ports/gprs_a9/README.md
index bbb8d1adfaab3..bbf63b26a2885 100644
--- a/ports/gprs_a9/README.md
+++ b/ports/gprs_a9/README.md
@@ -74,6 +74,7 @@ blink.blink(1)
 - [ ] PWM: `machine.PWM`
 - [x] UART: `machine.UART` (hw)
 - [x] SPI: `machine.SPI` (sw)
+- [x] RTC: `machine.RTC`
 - [x] I2C: `i2c` (hw)
 - [x] Cellular misc (IMEI, ICCID, ...): `cellular`
 - [x] GPS: `gps`

From dd8bcf12b1ab7fe9073fcd838271127d855b0629 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Tue, 5 May 2020 00:45:54 +0200
Subject: [PATCH 3468/3533] cellular: add on_status_event

---
 ports/gprs_a9/modcellular.c | 66 ++++++++++++++++++++-----------------
 1 file changed, 35 insertions(+), 31 deletions(-)

diff --git a/ports/gprs_a9/modcellular.c b/ports/gprs_a9/modcellular.c
index 1ab95508118b8..d7d9f1554f45f 100644
--- a/ports/gprs_a9/modcellular.c
+++ b/ports/gprs_a9/modcellular.c
@@ -81,6 +81,7 @@ uint8_t network_exception = NTW_NO_EXC;
 uint8_t network_status_updated = 0;
 uint8_t network_signal_quality = 0;
 uint8_t network_signal_rx_level = 0;
+mp_obj_t network_status_callback = NULL;
 
 // Count SMS received
 uint16_t sms_received_count = 0;
@@ -200,80 +201,69 @@ NORETURN void mp_raise_CellularError(const char *msg) {
 // Notify
 // ------
 
-void modcellular_notify_no_sim(API_Event_t* event) {
-    network_status = 0;
+void modcellular_network_status_update(uint8_t new_status, uint8_t new_exception) {
+    if (new_exception) network_exception = new_exception;
+    network_status = new_status;
     network_status_updated = 1;
-    network_exception = NTW_EXC_NOSIM;
+    if (network_status_callback) mp_sched_schedule(network_status_callback, mp_obj_new_int(network_status));
+}
+
+void modcellular_notify_no_sim(API_Event_t* event) {
+    modcellular_network_status_update(0, NTW_EXC_NOSIM);
 }
 
 void modcellular_notify_sim_drop(API_Event_t* event) {
-    network_status = 0;
-    network_status_updated = 1;
-    network_exception = NTW_EXC_SIM_DROP;
+    modcellular_network_status_update(0, NTW_EXC_SIM_DROP);
 }
 
 // Register
 
 void modcellular_notify_reg_home(API_Event_t* event) {
-    network_status = NTW_REG_BIT;
-    network_status_updated = 1;
+    modcellular_network_status_update(NTW_REG_BIT, 0);
 }
 
 void modcellular_notify_reg_roaming(API_Event_t* event) {
-    network_status = NTW_REG_BIT | NTW_ROAM_BIT;
-    network_status_updated = 1;
+    modcellular_network_status_update(NTW_REG_BIT | NTW_ROAM_BIT, 0);
 }
 
 void modcellular_notify_reg_searching(API_Event_t* event) {
-    network_status = NTW_REG_PROGRESS_BIT;
-    network_status_updated = 1;
+    modcellular_network_status_update(NTW_REG_PROGRESS_BIT, 0);
 }
 
 void modcellular_notify_reg_denied(API_Event_t* event) {
-    network_status = 0;
-    network_status_updated = 1;
-    network_exception = NTW_EXC_REG_DENIED;
+    modcellular_network_status_update(0, NTW_EXC_REG_DENIED);
 }
 
 void modcellular_notify_dereg(API_Event_t* event) {
-    network_status = 0;
-    network_status_updated = 1;
+    modcellular_network_status_update(0, 0);
 }
 
 // Attach
 
 void modcellular_notify_det(API_Event_t* event) {
-    network_status &= ~NTW_ATT_BIT;
-    network_status_updated = 1;
+    modcellular_network_status_update(network_status & ~NTW_ATT_BIT, 0);
 }
 
 void modcellular_notify_att_failed(API_Event_t* event) {
-    network_status &= ~NTW_ATT_BIT;
-    network_status_updated = 1;
-    network_exception = NTW_EXC_ATT_FAILED;
+    modcellular_network_status_update(network_status & ~NTW_ATT_BIT, NTW_EXC_ATT_FAILED);
 }
 
 void modcellular_notify_att(API_Event_t* event) {
-    network_status |= NTW_ATT_BIT;
-    network_status_updated = 1;
+    modcellular_network_status_update(network_status | NTW_ATT_BIT, 0);
 }
 
 // Activate
 
 void modcellular_notify_deact(API_Event_t* event) {
-    network_status &= ~NTW_ACT_BIT;
-    network_status_updated = 1;
+    modcellular_network_status_update(network_status & ~NTW_ACT_BIT, 0);
 }
 
 void modcellular_notify_act_failed(API_Event_t* event) {
-    network_status &= ~NTW_ACT_BIT;
-    network_status_updated = 1;
-    network_exception = NTW_EXC_ACT_FAILED;
+    modcellular_network_status_update(network_status & ~NTW_ACT_BIT, NTW_EXC_ACT_FAILED);
 }
 
 void modcellular_notify_act(API_Event_t* event) {
-    network_status |= NTW_ACT_BIT;
-    network_status_updated = 1;
+    modcellular_network_status_update(network_status | NTW_ACT_BIT, 0);
 }
 
 // Networks
@@ -1208,6 +1198,19 @@ STATIC mp_obj_t modcellular_reset(void) {
 
 STATIC MP_DEFINE_CONST_FUN_OBJ_0(modcellular_reset_obj, modcellular_reset);
 
+STATIC mp_obj_t modcellular_on_status_event(mp_obj_t callable) {
+    // ========================================
+    // Sets a callback on status event.
+    // Args:
+    //     callback (Callable): a callback to
+    //     execute on status event.
+    // ========================================
+    network_status_callback = callable;
+    return mp_const_none;
+}
+
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(modcellular_on_status_event_obj, modcellular_on_status_event);
+
 STATIC const mp_map_elem_t mp_module_cellular_globals_table[] = {
     { MP_OBJ_NEW_QSTR(MP_QSTR___name__), MP_OBJ_NEW_QSTR(MP_QSTR_cellular) },
 
@@ -1235,6 +1238,7 @@ STATIC const mp_map_elem_t mp_module_cellular_globals_table[] = {
     { MP_OBJ_NEW_QSTR(MP_QSTR_stations), (mp_obj_t)&modcellular_stations_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_agps_station_data), (mp_obj_t)&modcellular_agps_station_data_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_reset), (mp_obj_t)&modcellular_reset_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_on_status_event), (mp_obj_t)&modcellular_on_status_event_obj },
 
     { MP_ROM_QSTR(MP_QSTR_NETWORK_FREQ_BAND_GSM_900P), MP_ROM_INT(NETWORK_FREQ_BAND_GSM_900P) },
     { MP_ROM_QSTR(MP_QSTR_NETWORK_FREQ_BAND_GSM_900E), MP_ROM_INT(NETWORK_FREQ_BAND_GSM_900E) },

From 05c674dad10b61adb830395d1d3927af7638f46e Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Tue, 5 May 2020 00:46:30 +0200
Subject: [PATCH 3469/3533] main: add mp_handle_pending in the main loop

---
 ports/gprs_a9/mphalport.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/gprs_a9/mphalport.c b/ports/gprs_a9/mphalport.c
index 8ca2d170ee72a..fb85f693c4658 100644
--- a/ports/gprs_a9/mphalport.c
+++ b/ports/gprs_a9/mphalport.c
@@ -53,6 +53,7 @@ int mp_hal_stdin_rx_chr(void) {
         }
         // This has to be sufficiently large to perform background tasks
         OS_Sleep(10);
+        mp_handle_pending();
     }
 }
 

From d177d2aff53ff1eeffd69e9ecbdc30a287bd708b Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Tue, 5 May 2020 00:48:34 +0200
Subject: [PATCH 3470/3533] readme: add on_network_event

[ci skip]
---
 ports/gprs_a9/README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/gprs_a9/README.md b/ports/gprs_a9/README.md
index bbf63b26a2885..558f0a6d4bdac 100644
--- a/ports/gprs_a9/README.md
+++ b/ports/gprs_a9/README.md
@@ -144,6 +144,7 @@ The purpose of this module is to have an access to high-level networking (SMS, G
 * `gprs([apn: {str, bool}[, user: str, pass: str]])` (bool): activate (3 arguments), deactivate (`gprs(False)`) or obtain the status of GPRS (on/off) if no arguments supplied;
 * `call()` (list[str], [str, None]): calls missed (1st output) and the incoming call number or `None` if no incoming calls at the moment (2nd output);
 * `dial(tn: {str, bool})`: dial a telephone number if string is supplied or hang up a call if `False`;
+* `on_status_event(callback: Callable)`: sets a callback for network status change;
 
 ### `usocket` ###
 

From 89f73c200eedaeefffeba2a99f55ebc8aae63d78 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Tue, 5 May 2020 01:02:26 +0200
Subject: [PATCH 3471/3533] cellular: fix callback

---
 ports/gprs_a9/modcellular.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/gprs_a9/modcellular.c b/ports/gprs_a9/modcellular.c
index d7d9f1554f45f..56b7a1900c265 100644
--- a/ports/gprs_a9/modcellular.c
+++ b/ports/gprs_a9/modcellular.c
@@ -81,7 +81,7 @@ uint8_t network_exception = NTW_NO_EXC;
 uint8_t network_status_updated = 0;
 uint8_t network_signal_quality = 0;
 uint8_t network_signal_rx_level = 0;
-mp_obj_t network_status_callback = NULL;
+mp_obj_t network_status_callback = mp_const_none;
 
 // Count SMS received
 uint16_t sms_received_count = 0;
@@ -205,7 +205,7 @@ void modcellular_network_status_update(uint8_t new_status, uint8_t new_exception
     if (new_exception) network_exception = new_exception;
     network_status = new_status;
     network_status_updated = 1;
-    if (network_status_callback) mp_sched_schedule(network_status_callback, mp_obj_new_int(network_status));
+    if (network_status_callback && network_status_callback != mp_const_none) mp_sched_schedule(network_status_callback, mp_obj_new_int(network_status));
 }
 
 void modcellular_notify_no_sim(API_Event_t* event) {

From 30cbebb382e4125c43f49ae61dc0bcfe72f45e6e Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Tue, 5 May 2020 20:20:06 +0200
Subject: [PATCH 3472/3533] cellular: remove network_status_changed

---
 ports/gprs_a9/modcellular.c | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/ports/gprs_a9/modcellular.c b/ports/gprs_a9/modcellular.c
index 56b7a1900c265..063350a26426e 100644
--- a/ports/gprs_a9/modcellular.c
+++ b/ports/gprs_a9/modcellular.c
@@ -78,7 +78,6 @@
 // Tracks the status on the network
 uint8_t network_status = 0;
 uint8_t network_exception = NTW_NO_EXC;
-uint8_t network_status_updated = 0;
 uint8_t network_signal_quality = 0;
 uint8_t network_signal_rx_level = 0;
 mp_obj_t network_status_callback = mp_const_none;
@@ -132,7 +131,6 @@ NORETURN void mp_raise_CellularError(const char *msg);
 
 void modcellular_init0(void) {
     // Reset statuses
-    network_status_updated = 0;
     network_exception = NTW_NO_EXC;
     sms_received_count = 0;
     cells_n = 0;
@@ -204,7 +202,6 @@ NORETURN void mp_raise_CellularError(const char *msg) {
 void modcellular_network_status_update(uint8_t new_status, uint8_t new_exception) {
     if (new_exception) network_exception = new_exception;
     network_status = new_status;
-    network_status_updated = 1;
     if (network_status_callback && network_status_callback != mp_const_none) mp_sched_schedule(network_status_callback, mp_obj_new_int(network_status));
 }
 
@@ -703,19 +700,6 @@ STATIC mp_obj_t modcellular_is_sim_present(void) {
 
 STATIC MP_DEFINE_CONST_FUN_OBJ_0(modcellular_is_sim_present_obj, modcellular_is_sim_present);
 
-STATIC mp_obj_t modcellular_network_status_changed(void) {
-    // ========================================
-    // Checks whether the network status was updated.
-    // Returns:
-    //     True if it was updated since the last check.
-    // ========================================
-    uint8_t result = network_status_updated;
-    network_status_updated = 0;
-    return mp_obj_new_bool(result);
-}
-
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(modcellular_network_status_changed_obj, modcellular_network_status_changed);
-
 STATIC mp_obj_t modcellular_poll_network_exception(void) {
     // ========================================
     // Checks whether network exception occurred since the last check.
@@ -1220,7 +1204,6 @@ STATIC const mp_map_elem_t mp_module_cellular_globals_table[] = {
 
     { MP_OBJ_NEW_QSTR(MP_QSTR_get_imei), (mp_obj_t)&modcellular_get_imei_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_get_signal_quality), (mp_obj_t)&modcellular_get_signal_quality_obj },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_network_status_changed), (mp_obj_t)&modcellular_network_status_changed_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_poll_network_exception), (mp_obj_t)&modcellular_poll_network_exception_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_get_network_status), (mp_obj_t)&modcellular_get_network_status_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_is_sim_present), (mp_obj_t)&modcellular_is_sim_present_obj },

From 796a732b21b8c35df12f327c8aa742209e009085 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Tue, 5 May 2020 22:07:58 +0200
Subject: [PATCH 3473/3533] cellular: remove SMS.poll in favor of on_sms
 callback

---
 ports/gprs_a9/README.md     |  3 ++-
 ports/gprs_a9/modcellular.c | 40 +++++++++++++++++--------------------
 2 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/ports/gprs_a9/README.md b/ports/gprs_a9/README.md
index 558f0a6d4bdac..3411b6a372bb1 100644
--- a/ports/gprs_a9/README.md
+++ b/ports/gprs_a9/README.md
@@ -121,7 +121,7 @@ The purpose of this module is to have an access to high-level networking (SMS, G
   * `.sent` (bool): sent message if `True`, not sent message if `False` or unknown status if `None`;
   * `.send()`: sends a message;
   * `.withdraw()`: withdraws SMS from SIM storage;
-  * `.poll()` (int) [staticmethod]: the number of new SMS received;
+  * ~~`.poll()` (int) [staticmethod]: the number of new SMS received~~ use `on_sms` instead;
   * `.list()` (list) [staticmethod]: all SMS from the SIM card;
 * `CellularError(message: str)`
 * `get_imei()` (str): the International Mobile Equipment Identity (IMEI) number;
@@ -145,6 +145,7 @@ The purpose of this module is to have an access to high-level networking (SMS, G
 * `call()` (list[str], [str, None]): calls missed (1st output) and the incoming call number or `None` if no incoming calls at the moment (2nd output);
 * `dial(tn: {str, bool})`: dial a telephone number if string is supplied or hang up a call if `False`;
 * `on_status_event(callback: Callable)`: sets a callback for network status change;
+* `on_sms(callback: Callable)`: sets a callback for SMS;
 
 ### `usocket` ###
 
diff --git a/ports/gprs_a9/modcellular.c b/ports/gprs_a9/modcellular.c
index 063350a26426e..ddba7c03773a9 100644
--- a/ports/gprs_a9/modcellular.c
+++ b/ports/gprs_a9/modcellular.c
@@ -82,8 +82,8 @@ uint8_t network_signal_quality = 0;
 uint8_t network_signal_rx_level = 0;
 mp_obj_t network_status_callback = mp_const_none;
 
-// Count SMS received
-uint16_t sms_received_count = 0;
+// SMS received
+mp_obj_t sms_callback = mp_const_none;
 
 // SMS send flag
 uint8_t sms_send_flag = 0;
@@ -132,7 +132,6 @@ NORETURN void mp_raise_CellularError(const char *msg);
 void modcellular_init0(void) {
     // Reset statuses
     network_exception = NTW_NO_EXC;
-    sms_received_count = 0;
     cells_n = 0;
 
     // Incoming calls buffer
@@ -298,7 +297,8 @@ void modcellular_notify_sms_error(API_Event_t* event) {
 }
 
 void modcellular_notify_sms_receipt(API_Event_t* event) {
-    sms_received_count ++;
+    if (sms_callback && sms_callback != mp_const_none)
+        mp_sched_schedule(sms_callback, mp_const_none);
 }
 
 // Signal level
@@ -511,20 +511,6 @@ STATIC mp_obj_t modcellular_sms_list(void) {
 STATIC MP_DEFINE_CONST_FUN_OBJ_0(modcellular_sms_list_obj, modcellular_sms_list);
 STATIC MP_DEFINE_CONST_STATICMETHOD_OBJ(modcellular_sms_list_static_class_obj, MP_ROM_PTR(&modcellular_sms_list_obj));
 
-STATIC mp_obj_t modcellular_sms_poll(void) {
-    // ========================================
-    // Polls new SMS.
-    // Returns:
-    //     The number of SMS received.
-    // ========================================
-    mp_obj_t result = mp_obj_new_int(sms_received_count);
-    sms_received_count = 0;
-    return result;
-}
-
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(modcellular_sms_poll_obj, modcellular_sms_poll);
-STATIC MP_DEFINE_CONST_STATICMETHOD_OBJ(modcellular_sms_poll_static_class_obj, MP_ROM_PTR(&modcellular_sms_poll_obj));
-
 STATIC void modcellular_sms_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
     // ========================================
     // SMS.[attr]
@@ -559,9 +545,6 @@ STATIC void modcellular_sms_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
         // .list[static]
         } else if (attr == MP_QSTR_list) {
             mp_convert_member_lookup(self_in, mp_obj_get_type(self_in), (mp_obj_t)MP_ROM_PTR(&modcellular_sms_list_static_class_obj), dest);
-        // .poll[static]
-        } else if (attr == MP_QSTR_poll) {
-            mp_convert_member_lookup(self_in, mp_obj_get_type(self_in), (mp_obj_t)MP_ROM_PTR(&modcellular_sms_poll_static_class_obj), dest);
         }
     }
 }
@@ -586,7 +569,6 @@ STATIC const mp_rom_map_elem_t sms_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_send), MP_ROM_PTR(&modcellular_sms_send_obj) },
     { MP_ROM_QSTR(MP_QSTR_withdraw), MP_ROM_PTR(&modcellular_sms_withdraw_obj) },
     { MP_ROM_QSTR(MP_QSTR_list), MP_ROM_PTR(&modcellular_sms_list_static_class_obj) },
-    { MP_ROM_QSTR(MP_QSTR_poll), MP_ROM_PTR(&modcellular_sms_poll_static_class_obj) },
 };
 
 STATIC MP_DEFINE_CONST_DICT(sms_locals_dict, sms_locals_dict_table);
@@ -1195,6 +1177,19 @@ STATIC mp_obj_t modcellular_on_status_event(mp_obj_t callable) {
 
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(modcellular_on_status_event_obj, modcellular_on_status_event);
 
+STATIC mp_obj_t modcellular_on_sms(mp_obj_t callable) {
+    // ========================================
+    // Sets a callback on SMS (receive).
+    // Args:
+    //     callback (Callable): a callback to
+    //     execute on SMS receive.
+    // ========================================
+    sms_callback = callable;
+    return mp_const_none;
+}
+
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(modcellular_on_sms_obj, modcellular_on_sms);
+
 STATIC const mp_map_elem_t mp_module_cellular_globals_table[] = {
     { MP_OBJ_NEW_QSTR(MP_QSTR___name__), MP_OBJ_NEW_QSTR(MP_QSTR_cellular) },
 
@@ -1222,6 +1217,7 @@ STATIC const mp_map_elem_t mp_module_cellular_globals_table[] = {
     { MP_OBJ_NEW_QSTR(MP_QSTR_agps_station_data), (mp_obj_t)&modcellular_agps_station_data_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_reset), (mp_obj_t)&modcellular_reset_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_on_status_event), (mp_obj_t)&modcellular_on_status_event_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_on_sms), (mp_obj_t)&modcellular_on_sms_obj },
 
     { MP_ROM_QSTR(MP_QSTR_NETWORK_FREQ_BAND_GSM_900P), MP_ROM_INT(NETWORK_FREQ_BAND_GSM_900P) },
     { MP_ROM_QSTR(MP_QSTR_NETWORK_FREQ_BAND_GSM_900E), MP_ROM_INT(NETWORK_FREQ_BAND_GSM_900E) },

From 9b8fba723ad169a5ef23d888c5f77522ea15b590 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Tue, 5 May 2020 22:24:59 +0200
Subject: [PATCH 3474/3533] cellular: add constants SMS_SENT, SMS_RECEIVED for
 the callback

---
 ports/gprs_a9/README.md     | 4 ++--
 ports/gprs_a9/modcellular.c | 9 ++++++++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/ports/gprs_a9/README.md b/ports/gprs_a9/README.md
index 3411b6a372bb1..9e9ed0bf63771 100644
--- a/ports/gprs_a9/README.md
+++ b/ports/gprs_a9/README.md
@@ -144,8 +144,8 @@ The purpose of this module is to have an access to high-level networking (SMS, G
 * `gprs([apn: {str, bool}[, user: str, pass: str]])` (bool): activate (3 arguments), deactivate (`gprs(False)`) or obtain the status of GPRS (on/off) if no arguments supplied;
 * `call()` (list[str], [str, None]): calls missed (1st output) and the incoming call number or `None` if no incoming calls at the moment (2nd output);
 * `dial(tn: {str, bool})`: dial a telephone number if string is supplied or hang up a call if `False`;
-* `on_status_event(callback: Callable)`: sets a callback for network status change;
-* `on_sms(callback: Callable)`: sets a callback for SMS;
+* `on_status_event(callback: Callable)`: sets a callback for network status change. The callback is called with a single integer constant indicating the new network state;
+* `on_sms(callback: Callable)`: sets a callback on SMS sent or received. The callback is called with a single integer constant `SMS_SENT` or `SMS_RECEIVED`;
 
 ### `usocket` ###
 
diff --git a/ports/gprs_a9/modcellular.c b/ports/gprs_a9/modcellular.c
index ddba7c03773a9..42086c1f6c5be 100644
--- a/ports/gprs_a9/modcellular.c
+++ b/ports/gprs_a9/modcellular.c
@@ -62,6 +62,9 @@
 #define NTW_EXC_ACT_FAILED 0x06
 #define NTW_EXC_SMS_DROP 0x07
 
+#define SMS_SENT 1
+#define SMS_RECEIVED 2
+
 #define MAX_NUMBER_LEN 16
 #define MAX_CALLS_MISSED 15
 #define MAX_CELLS 8
@@ -290,6 +293,8 @@ void modcellular_notify_sms_list(API_Event_t* event) {
 
 void modcellular_notify_sms_sent(API_Event_t* event) {
     sms_send_flag = 1;
+    if (sms_callback && sms_callback != mp_const_none)
+        mp_sched_schedule(sms_callback, mp_obj_new_int(SMS_SENT));
 }
 
 void modcellular_notify_sms_error(API_Event_t* event) {
@@ -298,7 +303,7 @@ void modcellular_notify_sms_error(API_Event_t* event) {
 
 void modcellular_notify_sms_receipt(API_Event_t* event) {
     if (sms_callback && sms_callback != mp_const_none)
-        mp_sched_schedule(sms_callback, mp_const_none);
+        mp_sched_schedule(sms_callback, mp_obj_new_int(SMS_RECEIVED));
 }
 
 // Signal level
@@ -1235,6 +1240,8 @@ STATIC const mp_map_elem_t mp_module_cellular_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_NETWORK_MODE_AUTO),        MP_ROM_INT(NETWORK_REGISTER_MODE_AUTO)        },
     { MP_ROM_QSTR(MP_QSTR_NETWORK_MODE_MANUAL_AUTO), MP_ROM_INT(NETWORK_REGISTER_MODE_MANUAL_AUTO) },
     
+    { MP_ROM_QSTR(MP_QSTR_SMS_SENT), MP_ROM_INT(SMS_SENT) },
+    { MP_ROM_QSTR(MP_QSTR_SMS_RECEIVED), MP_ROM_INT(SMS_RECEIVED) },
 };
 
 STATIC MP_DEFINE_CONST_DICT(mp_module_cellular_globals, mp_module_cellular_globals_table);

From 053c8032a98cb91064e86b0f93e8d0774ab9b6fd Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Tue, 5 May 2020 22:38:19 +0200
Subject: [PATCH 3475/3533] cellular: reset callbacks

---
 ports/gprs_a9/modcellular.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ports/gprs_a9/modcellular.c b/ports/gprs_a9/modcellular.c
index 42086c1f6c5be..fa4760cd34595 100644
--- a/ports/gprs_a9/modcellular.c
+++ b/ports/gprs_a9/modcellular.c
@@ -133,6 +133,10 @@ NORETURN void mp_raise_CellularError(const char *msg);
 // ----
 
 void modcellular_init0(void) {
+    // Reset callbacks
+    network_status_callback = mp_const_none;
+    sms_callback = mp_const_none;
+
     // Reset statuses
     network_exception = NTW_NO_EXC;
     cells_n = 0;

From 7a9afbb98618a8f008f23138b92d9ae90b63dfc2 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Wed, 6 May 2020 23:20:19 +0200
Subject: [PATCH 3476/3533] cellular: add events and SMS examples

---
 ports/gprs_a9/examples/README.md              | 16 ++++++++++
 .../examples/example_40_network_events.py     | 27 +++++++++++++++++
 ports/gprs_a9/examples/example_41_sms.py      | 30 +++++++++++++++++++
 3 files changed, 73 insertions(+)
 create mode 100644 ports/gprs_a9/examples/example_40_network_events.py
 create mode 100644 ports/gprs_a9/examples/example_41_sms.py

diff --git a/ports/gprs_a9/examples/README.md b/ports/gprs_a9/examples/README.md
index c9a0c33c5a48f..d629406601506 100644
--- a/ports/gprs_a9/examples/README.md
+++ b/ports/gprs_a9/examples/README.md
@@ -57,6 +57,22 @@ Keywords: **URL, requests, HTTP, HTTPS**
 
 Modules: `cellular`, `urequests` (external), `upip`
 
+[example_40_network_events.py](example_40_network_events.py)
+
+Demonstrates how to track GSM network events.
+
+Keywords: **GSM, connect, flight mode**
+
+Modules: `cellular`
+
+[example_41_sms.py](example_41_sms.py)
+
+Demonstrates how to send and receive SMS.
+
+Keywords: **SMS**
+
+Modules: `cellular`
+
 [example_50_mqtt.py](example_50_mqtt.py)
 
 Reports location to a test MQTT server via cellular connection using `umqtt` from [micropython-lib](https://github.com/micropython/micropython-lib).
diff --git a/ports/gprs_a9/examples/example_40_network_events.py b/ports/gprs_a9/examples/example_40_network_events.py
new file mode 100644
index 0000000000000..e29cda33394b1
--- /dev/null
+++ b/ports/gprs_a9/examples/example_40_network_events.py
@@ -0,0 +1,27 @@
+# Micropython a9g example
+# Source: https://github.com/pulkin/micropython
+# Author: pulkin
+# Demonstrates how to track GSM status
+import cellular
+import time
+
+cellular.flight_mode(True)
+
+global flag
+flag = 0
+
+def evt_handler(status):
+    global flag
+    print("Network status changed to", status)
+    flag = status
+
+cellular.on_status_event(evt_handler)
+
+print("Doing something important ...")
+cellular.flight_mode(False)
+while flag == 0:
+    time.sleep(1)
+
+print("Online!")
+cellular.on_status_event(None)
+
diff --git a/ports/gprs_a9/examples/example_41_sms.py b/ports/gprs_a9/examples/example_41_sms.py
new file mode 100644
index 0000000000000..75d0062e7e7f6
--- /dev/null
+++ b/ports/gprs_a9/examples/example_41_sms.py
@@ -0,0 +1,30 @@
+# Micropython a9g example
+# Source: https://github.com/pulkin/micropython
+# Author: pulkin
+# Demonstrates how to send and receive SMS
+import cellular
+import time
+
+global flag
+flag = 1
+
+def sms_handler(evt):
+    global flag
+    if evt == cellular.SMS_SENT:
+        print("SMS sent")
+
+    elif evt == cellular.SMS_RECEIVED:
+        print("SMS received, attempting to read ...")
+        ls = cellular.SMS.list()
+        print(ls[-1])
+        flag = 0
+
+cellular.on_sms(sms_handler)
+cellular.SMS("8800", "asd").send()
+
+print("Doing something important ...")
+while flag:
+    time.sleep(1)
+
+print("Done!")
+

From 08919288f444c4e390462e4318669e47103b487d Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sat, 9 May 2020 23:24:15 +0200
Subject: [PATCH 3477/3533] readme: remove obsolete

---
 ports/gprs_a9/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/gprs_a9/README.md b/ports/gprs_a9/README.md
index 9e9ed0bf63771..b56bb2c467a2c 100644
--- a/ports/gprs_a9/README.md
+++ b/ports/gprs_a9/README.md
@@ -127,7 +127,7 @@ The purpose of this module is to have an access to high-level networking (SMS, G
 * `get_imei()` (str): the International Mobile Equipment Identity (IMEI) number;
 * `get_iccid()` (str): the Integrated Circuit Card ID (ICCID) number of the inserted SIM card;
 * `get_imsi()` (str): the International Mobile Subscriber Identity (IMSI) number of the inserted SIM card;
-* `network_status_changed()` (bool): indicates whether the network status changed since the last check;
+* ~~`network_status_changed()` (bool): indicates whether the network status changed since the last check~~ use `on_status_event` instead;
 * `get_network_status()` (int): cellular network status encoded in an integer. **TODO**: Provide bit-wise specs;
 * `poll_network_exception()`: polls the network exception and raises it, if any;
 * `is_sim_present()` (bool): checks whether a SIM card is present;

From eee7c25fd1c0a31f636a16eeb2f2666fd67c23d4 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sat, 9 May 2020 23:25:03 +0200
Subject: [PATCH 3478/3533] mp_handle_pending -> MICROPY_EVENT_POLL_HOOK

---
 ports/gprs_a9/modusocket.c | 2 +-
 ports/gprs_a9/mphalport.c  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ports/gprs_a9/modusocket.c b/ports/gprs_a9/modusocket.c
index 921b66e6c026a..c97bc14bd34a5 100644
--- a/ports/gprs_a9/modusocket.c
+++ b/ports/gprs_a9/modusocket.c
@@ -58,7 +58,7 @@ NORETURN static void exception_from_errno(int _errno) {
 }
 
 static inline void check_for_exceptions(void) {
-    mp_handle_pending();
+    MICROPY_EVENT_POLL_HOOK
 }
 
 // -------
diff --git a/ports/gprs_a9/mphalport.c b/ports/gprs_a9/mphalport.c
index fb85f693c4658..1c5ed4a10953b 100644
--- a/ports/gprs_a9/mphalport.c
+++ b/ports/gprs_a9/mphalport.c
@@ -53,7 +53,7 @@ int mp_hal_stdin_rx_chr(void) {
         }
         // This has to be sufficiently large to perform background tasks
         OS_Sleep(10);
-        mp_handle_pending();
+        MICROPY_EVENT_POLL_HOOK
     }
 }
 
@@ -96,7 +96,7 @@ void mp_hal_delay_ms(uint32_t ms) {
     uint32_t start = clock();
     while (clock() - start < ms * CLOCKS_PER_MSEC) {
         OS_Sleep(1);
-        mp_handle_pending();
+        MICROPY_EVENT_POLL_HOOK
     }
 }
 

From e46a02e9d4baca4a620ae9a717c5988c7fdc7598 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sat, 9 May 2020 23:25:53 +0200
Subject: [PATCH 3479/3533] cellular: add optional timeout for gprs #15

---
 ports/gprs_a9/README.md     |  2 +-
 ports/gprs_a9/modcellular.c | 11 +++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/ports/gprs_a9/README.md b/ports/gprs_a9/README.md
index b56bb2c467a2c..b1a8e39d9359d 100644
--- a/ports/gprs_a9/README.md
+++ b/ports/gprs_a9/README.md
@@ -141,7 +141,7 @@ The purpose of this module is to have an access to high-level networking (SMS, G
 * `stations()` (list): a list of nearby stations: `(mcc, mnc, lac, cell_id, bsic, rx_full, rx_sub, arfcn)`: all ints;
 * `agps_station_data()` (int, int, list): a convenience function returning `(mcc, mnc, [(lac, cell_id, signal_strength), ...])` for use in agps location: all ints;
 * `reset()`: resets network settings to defaults. Disconnects GPRS;
-* `gprs([apn: {str, bool}[, user: str, pass: str]])` (bool): activate (3 arguments), deactivate (`gprs(False)`) or obtain the status of GPRS (on/off) if no arguments supplied;
+* `gprs([apn: {str, bool}[, user: str, pass: str[, timeout: int]]])` (bool): activate (3 or 4 arguments), deactivate (`gprs(False)`) or obtain the status of GPRS (on/off) if no arguments supplied;
 * `call()` (list[str], [str, None]): calls missed (1st output) and the incoming call number or `None` if no incoming calls at the moment (2nd output);
 * `dial(tn: {str, bool})`: dial a telephone number if string is supplied or hang up a call if `False`;
 * `on_status_event(callback: Callable)`: sets a callback for network status change. The callback is called with a single integer constant indicating the new network state;
diff --git a/ports/gprs_a9/modcellular.c b/ports/gprs_a9/modcellular.c
index fa4760cd34595..c3d58d2e749ca 100644
--- a/ports/gprs_a9/modcellular.c
+++ b/ports/gprs_a9/modcellular.c
@@ -882,6 +882,8 @@ STATIC mp_obj_t modcellular_gprs(size_t n_args, const mp_obj_t *args) {
     //     or False if GPRS shutdown requested.
     //     user (str): username;
     //     pass (str): password;
+    //     timeout (int): time to wait until
+    //     connected;
     // Returns:
     //     True if GPRS is active, False
     //     otherwise.
@@ -903,10 +905,12 @@ STATIC mp_obj_t modcellular_gprs(size_t n_args, const mp_obj_t *args) {
             WAIT_UNTIL(!(network_status & NTW_ACT_BIT), TIMEOUT_GPRS_ACTIVATION, 100, mp_raise_CellularError("Network context deactivation timeout"));
         }
 
-    } else if (n_args == 3) {
+    } else if (n_args == 3 || n_args == 4) {
         const char* c_apn = mp_obj_str_get_str(args[0]);
         const char* c_user = mp_obj_str_get_str(args[1]);
         const char* c_pass = mp_obj_str_get_str(args[2]);
+        mp_int_t timeout = TIMEOUT_GPRS_ACTIVATION;
+        if (n_args == 4) timeout = mp_obj_get_int(args[3]);
 
         if (network_status & NTW_ACT_BIT) {
             mp_raise_CellularError("GPRS is already on");
@@ -920,12 +924,11 @@ STATIC mp_obj_t modcellular_gprs(size_t n_args, const mp_obj_t *args) {
             memcpy(context.userName, c_user, MIN(strlen(c_user) + 1, sizeof(context.userName)));
             memcpy(context.userPasswd, c_pass, MIN(strlen(c_pass) + 1, sizeof(context.userPasswd)));
 
-            
             if (!Network_StartActive(context)) {
                 mp_raise_CellularError("Cannot initiate context activation");
                 return mp_const_none;
             }
-            WAIT_UNTIL(network_status & NTW_ACT_BIT, TIMEOUT_GPRS_ACTIVATION, 100, mp_raise_CellularError("Network context activation timeout"));
+            if (timeout) WAIT_UNTIL(network_status & NTW_ACT_BIT, timeout, 100, mp_raise_CellularError("Network context activation timeout"));
         }
 
     } else if (n_args != 0) {
@@ -935,7 +938,7 @@ STATIC mp_obj_t modcellular_gprs(size_t n_args, const mp_obj_t *args) {
     return mp_obj_new_bool(network_status & NTW_ACT_BIT);
 }
 
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(modcellular_gprs_obj, 0, 3, modcellular_gprs);
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(modcellular_gprs_obj, 0, 4, modcellular_gprs);
 
 STATIC mp_obj_t modcellular_scan(void) {
     // ========================================

From 6f580361ee0fb414cad51054ffaa59f9124652c2 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sat, 9 May 2020 23:26:14 +0200
Subject: [PATCH 3480/3533] examples: fix typo in comments

---
 ports/gprs_a9/examples/example_32_http.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/gprs_a9/examples/example_32_http.py b/ports/gprs_a9/examples/example_32_http.py
index 634b902df4d22..dfa85fd1b2bc4 100644
--- a/ports/gprs_a9/examples/example_32_http.py
+++ b/ports/gprs_a9/examples/example_32_http.py
@@ -7,7 +7,7 @@
 import cellular
 cellular.gprs("internet", "", "")
 
-# Import mqtt (download client if necessary)
+# Import requests (download if necessary)
 try:
     import urequests
 except ImportError:

From 4bf33cbcf85c99ebf1b5efe0b3a7994dd763a117 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sat, 9 May 2020 23:26:28 +0200
Subject: [PATCH 3481/3533] examples: add event-driven GPRS

---
 ports/gprs_a9/examples/README.md              |  8 ++++++
 .../examples/example_42_event_driven_gprs.py  | 28 +++++++++++++++++++
 2 files changed, 36 insertions(+)
 create mode 100644 ports/gprs_a9/examples/example_42_event_driven_gprs.py

diff --git a/ports/gprs_a9/examples/README.md b/ports/gprs_a9/examples/README.md
index d629406601506..7e8e4862a5968 100644
--- a/ports/gprs_a9/examples/README.md
+++ b/ports/gprs_a9/examples/README.md
@@ -73,6 +73,14 @@ Keywords: **SMS**
 
 Modules: `cellular`
 
+[example_42_event_driven_gprs.py](example_42_event_driven_gprs.py)
+
+Demonstrates how to connect and download in the background using events.
+
+Keywords: **GPRS, background, connection**
+
+Modules: `cellular`, `socket`
+
 [example_50_mqtt.py](example_50_mqtt.py)
 
 Reports location to a test MQTT server via cellular connection using `umqtt` from [micropython-lib](https://github.com/micropython/micropython-lib).
diff --git a/ports/gprs_a9/examples/example_42_event_driven_gprs.py b/ports/gprs_a9/examples/example_42_event_driven_gprs.py
new file mode 100644
index 0000000000000..cae7cc5e0b887
--- /dev/null
+++ b/ports/gprs_a9/examples/example_42_event_driven_gprs.py
@@ -0,0 +1,28 @@
+# Micropython a9g example
+# Source: https://github.com/pulkin/micropython
+# Author: pulkin
+# Demonstrates how to connect to GPRS automatically in event-driven non-blocking manner
+import cellular
+import socket
+
+host = "httpstat.us"
+port = 80
+message = "GET /200 HTTP/1.1\r\nHost: {}\r\nConnection: close\r\n\r\n"
+
+def handler(status):
+    if cellular.gprs():
+        s = socket.socket()
+        s.connect((host, port))
+        s.write(message.format(host))
+        print(s.read(256))
+        s.close()
+        cellular.on_status_event(None)
+        cellular.gprs(False)
+        print("Done")
+    else:
+        print("Skipping status " + str(status))
+
+cellular.on_status_event(handler)
+cellular.gprs("internet", "", "", False)
+print("Submitted")
+

From 83250b7888ab440aaecd780f9064273eb96af9d1 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sun, 10 May 2020 13:17:48 +0200
Subject: [PATCH 3482/3533] cellular: replace call -> on_call

---
 ports/gprs_a9/README.md     |   3 +-
 ports/gprs_a9/modcellular.c | 100 +++++++++++++++++++++---------------
 2 files changed, 60 insertions(+), 43 deletions(-)

diff --git a/ports/gprs_a9/README.md b/ports/gprs_a9/README.md
index b1a8e39d9359d..b6cff1973596b 100644
--- a/ports/gprs_a9/README.md
+++ b/ports/gprs_a9/README.md
@@ -142,10 +142,11 @@ The purpose of this module is to have an access to high-level networking (SMS, G
 * `agps_station_data()` (int, int, list): a convenience function returning `(mcc, mnc, [(lac, cell_id, signal_strength), ...])` for use in agps location: all ints;
 * `reset()`: resets network settings to defaults. Disconnects GPRS;
 * `gprs([apn: {str, bool}[, user: str, pass: str[, timeout: int]]])` (bool): activate (3 or 4 arguments), deactivate (`gprs(False)`) or obtain the status of GPRS (on/off) if no arguments supplied;
-* `call()` (list[str], [str, None]): calls missed (1st output) and the incoming call number or `None` if no incoming calls at the moment (2nd output);
+* ~~`call()` (list[str], [str, None]): calls missed (1st output) and the incoming call number or `None` if no incoming calls at the moment (2nd output)~~ use `on_call` instead;
 * `dial(tn: {str, bool})`: dial a telephone number if string is supplied or hang up a call if `False`;
 * `on_status_event(callback: Callable)`: sets a callback for network status change. The callback is called with a single integer constant indicating the new network state;
 * `on_sms(callback: Callable)`: sets a callback on SMS sent or received. The callback is called with a single integer constant `SMS_SENT` or `SMS_RECEIVED`;
+* `on_call(callback: Callable)`: sets a callback on call events (incoming, hangup, etc.);
 
 ### `usocket` ###
 
diff --git a/ports/gprs_a9/modcellular.c b/ports/gprs_a9/modcellular.c
index c3d58d2e749ca..943cf7d072c8a 100644
--- a/ports/gprs_a9/modcellular.c
+++ b/ports/gprs_a9/modcellular.c
@@ -62,6 +62,14 @@
 #define NTW_EXC_ACT_FAILED 0x06
 #define NTW_EXC_SMS_DROP 0x07
 
+#define NTW_EXC_CALL_NO_DIAL_TONE 0x10
+#define NTW_EXC_CALL_BUSY 0x11
+#define NTW_EXC_CALL_NO_ANSWER 0x12
+#define NTW_EXC_CALL_NO_CARRIER 0x13
+#define NTW_EXC_CALL_TIMEOUT 0x14
+#define NTW_EXC_CALL_INPROGRESS 0x15
+#define NTW_EXC_CALL_UNKNOWN 0x16
+
 #define SMS_SENT 1
 #define SMS_RECEIVED 2
 
@@ -116,11 +124,7 @@ int8_t cells_n = 0;
 // -----------
 // Vars: Calls
 // -----------
-
-Buffer_t calls_missed;
-uint8_t calls_missed_buffer[MAX_NUMBER_LEN * (MAX_CALLS_MISSED + 1)];
-uint8_t calls_incoming_now[MAX_NUMBER_LEN] = {0};
-uint8_t calls_incoming_now_flag = 0;
+mp_obj_t call_callback = mp_const_none;
 
 // SMS parsing
 STATIC mp_obj_t modcellular_sms_from_record(SMS_Message_Info_t* record);
@@ -136,14 +140,12 @@ void modcellular_init0(void) {
     // Reset callbacks
     network_status_callback = mp_const_none;
     sms_callback = mp_const_none;
+    call_callback = mp_const_none;
 
     // Reset statuses
     network_exception = NTW_NO_EXC;
     cells_n = 0;
 
-    // Incoming calls buffer
-    Buffer_Init(&calls_missed, calls_missed_buffer, sizeof(calls_missed_buffer));
-
     uint8_t status;
 
     // Deactivate
@@ -320,19 +322,15 @@ void modcellular_notify_signal(API_Event_t* event) {
 // Calls
 
 void modcellular_notify_call_incoming(API_Event_t* event) {
-    if (strlen((char*) event->pParam1) > MAX_NUMBER_LEN - 1) {
-        event->pParam1[MAX_NUMBER_LEN] = 0;
-    }
-    uint8_t l = strlen((char*) event->pParam1);
-    memcpy(calls_incoming_now, event->pParam1, l + 1);
-    calls_incoming_now_flag = true;
+    if (call_callback && call_callback != mp_const_none)
+        mp_sched_schedule(call_callback, mp_obj_new_str((char*) event->pParam1, strlen((char*) event->pParam1)));
 }
 
 void modcellular_notify_call_hangup(API_Event_t* event) {
-    if (event->param1) {
-        Buffer_Puts(&calls_missed, calls_incoming_now, MAX_NUMBER_LEN);
-        calls_incoming_now_flag = false;
-    }
+    if (event->param2)
+        network_exception = (uint8_t) event->param2 + 0x0F;
+    if (call_callback && call_callback != mp_const_none)
+        mp_sched_schedule(call_callback, mp_obj_new_bool(event->param1));
 }
 
 // Base stations
@@ -730,6 +728,34 @@ STATIC mp_obj_t modcellular_poll_network_exception(void) {
             mp_raise_CellularError("SMS message was discarded due to a timeout or a wrong SMS storage information");
             break;
 
+        case NTW_EXC_CALL_NO_DIAL_TONE:
+            mp_raise_CellularError("No dial tone");
+            break;
+
+        case NTW_EXC_CALL_BUSY:
+            mp_raise_CellularError("Line is busy");
+            break;
+        
+        case NTW_EXC_CALL_NO_ANSWER:
+            mp_raise_CellularError("No answer");
+            break;
+
+        case NTW_EXC_CALL_NO_CARRIER:
+            mp_raise_CellularError("No carrier");
+            break;
+
+        case NTW_EXC_CALL_TIMEOUT:
+            mp_raise_CellularError("Call timeout");
+            break;
+
+        case NTW_EXC_CALL_INPROGRESS:
+            mp_raise_CellularError("Link is being built");
+            break;
+
+        case NTW_EXC_CALL_UNKNOWN:
+            mp_raise_CellularError("Call: unknown error");
+            break;
+
         case NTW_NO_EXC:
             break;
 
@@ -1044,29 +1070,6 @@ STATIC mp_obj_t modcellular_register(size_t n_args, const mp_obj_t *args) {
 
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(modcellular_register_obj, 0, 2, modcellular_register);
 
-STATIC mp_obj_t modcellular_call(void) {
-    // ========================================
-    // Incoming call number.
-    // ========================================
-    mp_obj_t tuple[Buffer_Size(&calls_missed) / MAX_NUMBER_LEN];
-    char tel_n[MAX_NUMBER_LEN];
-
-    for (int i=0; i<sizeof(tuple) / sizeof(mp_obj_t); i++) {
-        Buffer_Gets(&calls_missed, (uint8_t*) tel_n, MAX_NUMBER_LEN);
-        tuple[i] = mp_obj_new_str(tel_n, strlen(tel_n));
-    }
-
-    mp_obj_t items[2] = {
-        mp_obj_new_list(sizeof(tuple) / sizeof(mp_obj_t), tuple),
-        mp_const_none,
-    };
-    if (calls_incoming_now_flag)
-        items[1] = mp_obj_new_str((char*) calls_incoming_now, strlen((char*) calls_incoming_now));
-    return mp_obj_new_tuple(sizeof(items) / sizeof(mp_obj_t), items);
-}
-
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(modcellular_call_obj, modcellular_call);
-
 STATIC mp_obj_t modcellular_dial(mp_obj_t tn_in) {
     // ========================================
     // Dial a number.
@@ -1202,6 +1205,19 @@ STATIC mp_obj_t modcellular_on_sms(mp_obj_t callable) {
 
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(modcellular_on_sms_obj, modcellular_on_sms);
 
+STATIC mp_obj_t modcellular_on_call(mp_obj_t callable) {
+    // ========================================
+    // Sets a callback on incoming calls.
+    // Args:
+    //     callback (Callable): a callback to
+    //     execute on incoming call.
+    // ========================================
+    call_callback = callable;
+    return mp_const_none;
+}
+
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(modcellular_on_call_obj, modcellular_on_call);
+
 STATIC const mp_map_elem_t mp_module_cellular_globals_table[] = {
     { MP_OBJ_NEW_QSTR(MP_QSTR___name__), MP_OBJ_NEW_QSTR(MP_QSTR_cellular) },
 
@@ -1223,13 +1239,13 @@ STATIC const mp_map_elem_t mp_module_cellular_globals_table[] = {
     { MP_OBJ_NEW_QSTR(MP_QSTR_gprs), (mp_obj_t)&modcellular_gprs_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_scan), (mp_obj_t)&modcellular_scan_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_register), (mp_obj_t)&modcellular_register_obj },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_call), (mp_obj_t)&modcellular_call_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_dial), (mp_obj_t)&modcellular_dial_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_stations), (mp_obj_t)&modcellular_stations_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_agps_station_data), (mp_obj_t)&modcellular_agps_station_data_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_reset), (mp_obj_t)&modcellular_reset_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_on_status_event), (mp_obj_t)&modcellular_on_status_event_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_on_sms), (mp_obj_t)&modcellular_on_sms_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_on_call), (mp_obj_t)&modcellular_on_call_obj },
 
     { MP_ROM_QSTR(MP_QSTR_NETWORK_FREQ_BAND_GSM_900P), MP_ROM_INT(NETWORK_FREQ_BAND_GSM_900P) },
     { MP_ROM_QSTR(MP_QSTR_NETWORK_FREQ_BAND_GSM_900E), MP_ROM_INT(NETWORK_FREQ_BAND_GSM_900E) },

From 2b4785e3f3633b802d3ce2bcba9d6063f9147da8 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sun, 10 May 2020 15:19:27 +0200
Subject: [PATCH 3483/3533] cellular: remove CellularError, add timeout for
 GPRS shutdown

---
 ports/gprs_a9/README.md     |   3 +-
 ports/gprs_a9/modcellular.c | 209 +++++++++++++-----------------------
 ports/gprs_a9/modcellular.h |   2 +-
 3 files changed, 80 insertions(+), 134 deletions(-)

diff --git a/ports/gprs_a9/README.md b/ports/gprs_a9/README.md
index b6cff1973596b..8cb55c0eed3b8 100644
--- a/ports/gprs_a9/README.md
+++ b/ports/gprs_a9/README.md
@@ -112,6 +112,7 @@ The purpose of this module is to have an access to high-level networking (SMS, G
 * `NETWORK_FREQ_BAND_GSM_900P`, `NETWORK_FREQ_BAND_GSM_900E`, `NETWORK_FREQ_BAND_GSM_850`, `NETWORK_FREQ_BAND_DCS_1800`, `NETWORK_FREQ_BAND_PCS_1900`, `NETWORK_FREQ_BANDS_ALL`: frequencies;
 * `OPERATOR_STATUS_UNKNOWN`, `OPERATOR_STATUS_AVAILABLE`, `OPERATOR_STATUS_CURRENT`, `OPERATOR_STATUS_DISABLED`: operator statuses;
 * `NETWORK_MODE_MANUAL`, `NETWORK_MODE_AUTO`, `NETWORK_MODE_MANUAL_AUTO`: network registration modes;
+* `ENOSIM`, `EREGD`, `ESMSSEND`, `ESMSDROP`, `ESIMDROP`, `EATTACHMENT`, `EACTIVATION`, `ENODIALTONE`, `EBUSY`, `ENOANSWER`, `ENOCARRIER`, `ECALLTIMEOUT`, `ECALLINPROGRESS`, `ECALLUNKNOWN`: extended codes for `OSError`s raised by the module;
 * `SMS(phone_number: str, message: str)`: handles SMS messages;
   * `.phone_number` (str): phone number (sender or destination);
   * `.message` (str): message contents;
@@ -123,7 +124,7 @@ The purpose of this module is to have an access to high-level networking (SMS, G
   * `.withdraw()`: withdraws SMS from SIM storage;
   * ~~`.poll()` (int) [staticmethod]: the number of new SMS received~~ use `on_sms` instead;
   * `.list()` (list) [staticmethod]: all SMS from the SIM card;
-* `CellularError(message: str)`
+* ~~`CellularError(message: str)`~~ `OSError`, `ValueError`, `RuntimeError` are used instead;
 * `get_imei()` (str): the International Mobile Equipment Identity (IMEI) number;
 * `get_iccid()` (str): the Integrated Circuit Card ID (ICCID) number of the inserted SIM card;
 * `get_imsi()` (str): the International Mobile Subscriber Identity (IMSI) number of the inserted SIM card;
diff --git a/ports/gprs_a9/modcellular.c b/ports/gprs_a9/modcellular.c
index 943cf7d072c8a..2659ffa3061b9 100644
--- a/ports/gprs_a9/modcellular.c
+++ b/ports/gprs_a9/modcellular.c
@@ -44,8 +44,8 @@
 #include "api_network.h"
 #include "api_inc_network.h"
 
-#include "buffer.h"
 #include "time.h"
+#include "py/mperrno.h"
 
 #define NTW_REG_BIT 0x01
 #define NTW_ROAM_BIT 0x02
@@ -54,21 +54,21 @@
 #define NTW_ACT_BIT 0x10
 
 #define NTW_NO_EXC 0
-#define NTW_EXC_NOSIM 0x01
-#define NTW_EXC_REG_DENIED 0x02
-#define NTW_EXC_SMS_SEND 0x03
-#define NTW_EXC_SIM_DROP 0x04
-#define NTW_EXC_ATT_FAILED 0x05
-#define NTW_EXC_ACT_FAILED 0x06
-#define NTW_EXC_SMS_DROP 0x07
-
-#define NTW_EXC_CALL_NO_DIAL_TONE 0x10
-#define NTW_EXC_CALL_BUSY 0x11
-#define NTW_EXC_CALL_NO_ANSWER 0x12
-#define NTW_EXC_CALL_NO_CARRIER 0x13
-#define NTW_EXC_CALL_TIMEOUT 0x14
-#define NTW_EXC_CALL_INPROGRESS 0x15
-#define NTW_EXC_CALL_UNKNOWN 0x16
+#define NTW_EXC_NOSIM 0x6E01
+#define NTW_EXC_REG_DENIED 0x6E02
+#define NTW_EXC_SMS_SEND 0x6E03
+#define NTW_EXC_SIM_DROP 0x6E04
+#define NTW_EXC_ATT_FAILED 0x6E05
+#define NTW_EXC_ACT_FAILED 0x6E06
+#define NTW_EXC_SMS_DROP 0x6E07
+
+#define NTW_EXC_CALL_NO_DIAL_TONE 0x6E10
+#define NTW_EXC_CALL_BUSY 0x6E11
+#define NTW_EXC_CALL_NO_ANSWER 0x6E12
+#define NTW_EXC_CALL_NO_CARRIER 0x6E13
+#define NTW_EXC_CALL_TIMEOUT 0x6E14
+#define NTW_EXC_CALL_INPROGRESS 0x6E15
+#define NTW_EXC_CALL_UNKNOWN 0x6E16
 
 #define SMS_SENT 1
 #define SMS_RECEIVED 2
@@ -88,7 +88,7 @@
 
 // Tracks the status on the network
 uint8_t network_status = 0;
-uint8_t network_exception = NTW_NO_EXC;
+uint16_t network_exception = NTW_NO_EXC;
 uint8_t network_signal_quality = 0;
 uint8_t network_signal_rx_level = 0;
 mp_obj_t network_status_callback = mp_const_none;
@@ -130,8 +130,6 @@ mp_obj_t call_callback = mp_const_none;
 STATIC mp_obj_t modcellular_sms_from_record(SMS_Message_Info_t* record);
 STATIC mp_obj_t modcellular_sms_from_raw(uint8_t* header, uint32_t header_length, uint8_t* content, uint32_t content_length);
 
-NORETURN void mp_raise_CellularError(const char *msg);
-
 // ----
 // Init
 // ----
@@ -197,17 +195,15 @@ void modcellular_init0(void) {
 // Exceptions
 // ----------
 
-MP_DEFINE_EXCEPTION(CellularError, OSError)
-
-NORETURN void mp_raise_CellularError(const char *msg) {
-    mp_raise_msg(&mp_type_CellularError, msg);
+NORETURN void mp_raise_RuntimeError(const char *msg) {
+    mp_raise_msg(&mp_type_RuntimeError, msg);
 }
 
 // ------
 // Notify
 // ------
 
-void modcellular_network_status_update(uint8_t new_status, uint8_t new_exception) {
+void modcellular_network_status_update(uint8_t new_status, uint16_t new_exception) {
     if (new_exception) network_exception = new_exception;
     network_status = new_status;
     if (network_status_callback && network_status_callback != mp_const_none) mp_sched_schedule(network_status_callback, mp_obj_new_int(network_status));
@@ -431,10 +427,8 @@ STATIC mp_obj_t modcellular_sms_send(mp_obj_t self_in) {
 
     sms_obj_t *self = MP_OBJ_TO_PTR(self_in);
 
-    if (self->status != 0) {
-        mp_raise_CellularError("A message with non-zero status cannot be sent");
-        return mp_const_none;
-    }
+    if (self->status != 0)
+        mp_raise_ValueError("A message with non-zero status cannot be sent");
 
     const char* destination_c = mp_obj_str_get_str(self->phone_number);
     const char* message_c = mp_obj_str_get_str(self->message);
@@ -442,16 +436,13 @@ STATIC mp_obj_t modcellular_sms_send(mp_obj_t self_in) {
     uint8_t* unicode = NULL;
     uint32_t unicodeLen;
 
-    if (!SMS_LocalLanguage2Unicode((uint8_t*)message_c, strlen(message_c), CHARSET_UTF_8, &unicode, &unicodeLen)) {
-        mp_raise_CellularError("Failed to convert to Unicode before sending SMS");
-        return mp_const_none;
-    }
+    if (!SMS_LocalLanguage2Unicode((uint8_t*)message_c, strlen(message_c), CHARSET_UTF_8, &unicode, &unicodeLen))
+        mp_raise_ValueError("Failed to convert to Unicode before sending SMS");
 
     sms_send_flag = 0;
     if (!SMS_SendMessage(destination_c, unicode, unicodeLen, SIM0)) {
         OS_Free(unicode);
-        mp_raise_CellularError("Failed to submit SMS message for sending");
-        return mp_const_none;
+        mp_raise_ValueError("Failed to submit SMS message for sending");
     }
     OS_Free(unicode);
     WAIT_UNTIL(sms_send_flag, TIMEOUT_SMS_SEND, 100, mp_warning(NULL, "Failed to send SMS. The module will continue attempting sending it"));
@@ -470,12 +461,12 @@ STATIC mp_obj_t modcellular_sms_withdraw(mp_obj_t self_in) {
     sms_obj_t *self = MP_OBJ_TO_PTR(self_in);
 
     if (self->index == 0 || self->status == 0) {
-        mp_raise_CellularError("Cannot withdraw SMS with zero index/status");
+        mp_raise_ValueError("Cannot withdraw SMS with zero index/status");
         return mp_const_none;
     }
 
     if (!SMS_DeleteMessage(self->index, SMS_STATUS_ALL, SMS_STORAGE_SIM_CARD)) {
-        mp_raise_CellularError("Failed to withdraw SMS");
+        mp_raise_ValueError("Failed to withdraw SMS");
         return mp_const_none;
     }
 
@@ -691,76 +682,17 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_0(modcellular_is_sim_present_obj, modcellular_is_
 
 STATIC mp_obj_t modcellular_poll_network_exception(void) {
     // ========================================
-    // Checks whether network exception occurred since the last check.
-    // Returns:
-    //    An integer representing network exception.
+    // Raises a last network exception.
     // ========================================
     uint8_t e = network_exception;
     network_exception = NTW_NO_EXC;
 
     switch (e) {
-
-        case NTW_EXC_NOSIM:
-            mp_raise_CellularError("No SIM card inserted");
-            break;
-
-        case NTW_EXC_REG_DENIED:
-            mp_raise_CellularError("Failed to register on the cellular network");
-            break;
-
-        case NTW_EXC_SMS_SEND:
-            mp_raise_CellularError("SMS was not sent");
-            break;
-
-        case NTW_EXC_SIM_DROP:
-            mp_raise_CellularError("SIM card dropped");
-            break;
-
-        case NTW_EXC_ATT_FAILED:
-            mp_raise_CellularError("Failed to attach to the cellular network");
-            break;
-
-        case NTW_EXC_ACT_FAILED:
-            mp_raise_CellularError("Failed to activate the cellular network");
-            break;
-
-        case NTW_EXC_SMS_DROP:
-            mp_raise_CellularError("SMS message was discarded due to a timeout or a wrong SMS storage information");
-            break;
-
-        case NTW_EXC_CALL_NO_DIAL_TONE:
-            mp_raise_CellularError("No dial tone");
-            break;
-
-        case NTW_EXC_CALL_BUSY:
-            mp_raise_CellularError("Line is busy");
-            break;
-        
-        case NTW_EXC_CALL_NO_ANSWER:
-            mp_raise_CellularError("No answer");
-            break;
-
-        case NTW_EXC_CALL_NO_CARRIER:
-            mp_raise_CellularError("No carrier");
-            break;
-
-        case NTW_EXC_CALL_TIMEOUT:
-            mp_raise_CellularError("Call timeout");
-            break;
-
-        case NTW_EXC_CALL_INPROGRESS:
-            mp_raise_CellularError("Link is being built");
-            break;
-
-        case NTW_EXC_CALL_UNKNOWN:
-            mp_raise_CellularError("Call: unknown error");
-            break;
-
         case NTW_NO_EXC:
             break;
 
         default:
-            mp_raise_msg(&mp_type_RuntimeError, "Unknown network exception occurred");
+            mp_raise_OSError(e);
             break;
 
     }
@@ -815,7 +747,7 @@ STATIC mp_obj_t modcellular_get_iccid(void) {
     if (SIM_GetICCID((uint8_t*)iccid))
         return mp_obj_new_str(iccid, strlen(iccid));
     else {
-        mp_raise_CellularError("No ICCID data available");
+        mp_raise_RuntimeError("No ICCID data available");
         return mp_const_none;
     }
 }
@@ -833,7 +765,7 @@ STATIC mp_obj_t modcellular_get_imsi(void) {
     if (SIM_GetIMSI((uint8_t*)imsi))
         return mp_obj_new_str(imsi, strlen(imsi));
     else {
-        mp_raise_CellularError("No IMSI data available");
+        mp_raise_RuntimeError("No IMSI data available");
         return mp_const_none;
     }
 }
@@ -844,7 +776,7 @@ bool get_flight_mode(void) {
     // Polls flight mode
     bool flag;
     if (!Network_GetFlightMode(&flag)) {
-        mp_raise_CellularError("Failed to retrieve flight mode status");
+        mp_raise_RuntimeError("Failed to retrieve flight mode status");
     }
     return !flag;  // By fact, the meaning of the output is inverse
 }
@@ -859,10 +791,10 @@ STATIC mp_obj_t modcellular_flight_mode(size_t n_args, const mp_obj_t *args) {
     if (n_args == 1) {
         mp_int_t set_flag = mp_obj_get_int(args[0]);
         if (!Network_SetFlightMode(set_flag)) {
-            mp_raise_CellularError("Failed to set flight mode status");
+            mp_raise_RuntimeError("Failed to set flight mode status");
             return mp_const_none;
         }
-        WAIT_UNTIL(set_flag == get_flight_mode(), TIMEOUT_FLIGHT_MODE, 100, mp_raise_CellularError("Flight mode change timeout"));
+        WAIT_UNTIL(set_flag == get_flight_mode(), TIMEOUT_FLIGHT_MODE, 100, mp_raise_OSError(MP_ETIMEDOUT));
     }
     return mp_obj_new_bool(get_flight_mode());
 }
@@ -878,12 +810,12 @@ STATIC mp_obj_t modcellular_set_bands(size_t n_args, const mp_obj_t *args) {
     // ========================================
     if (n_args == 0) {
         if (!Network_SetFrequencyBand(BANDS_ALL)) {
-            mp_raise_CellularError("Failed to reset 2G GSM bands");
+            mp_raise_RuntimeError("Failed to reset 2G GSM bands");
             return mp_const_none;
         }
     } else if (n_args == 1) {
         if (!Network_SetFrequencyBand(mp_obj_get_int(args[0]))) {
-            mp_raise_CellularError("Failed to set 2G GSM bands");
+            mp_raise_RuntimeError("Failed to set 2G GSM bands");
             return mp_const_none;
         }
     }
@@ -916,19 +848,21 @@ STATIC mp_obj_t modcellular_gprs(size_t n_args, const mp_obj_t *args) {
     // ========================================
     REQUIRES_NETWORK_REGISTRATION;
 
-    if (n_args == 1) {
+    if (n_args == 1 || n_args == 2) {
         mp_int_t flag = mp_obj_get_int(args[0]);
         if (flag != 0) {
             mp_raise_ValueError("Unkown integer argument supplied, zero (or False) expected");
             return mp_const_none;
         }
+        mp_int_t timeout = TIMEOUT_GPRS_ACTIVATION;
+        if (n_args == 2) timeout = mp_obj_get_int(args[1]);
 
         if (network_status & NTW_ACT_BIT) {
             if (!Network_StartDeactive(1)) {
-                mp_raise_CellularError("Cannot initiate context deactivation");
+                mp_raise_RuntimeError("Cannot initiate context deactivation");
                 return mp_const_none;
             }
-            WAIT_UNTIL(!(network_status & NTW_ACT_BIT), TIMEOUT_GPRS_ACTIVATION, 100, mp_raise_CellularError("Network context deactivation timeout"));
+            WAIT_UNTIL(!(network_status & NTW_ACT_BIT), timeout, 100, mp_raise_OSError(MP_ETIMEDOUT));
         }
 
     } else if (n_args == 3 || n_args == 4) {
@@ -939,10 +873,10 @@ STATIC mp_obj_t modcellular_gprs(size_t n_args, const mp_obj_t *args) {
         if (n_args == 4) timeout = mp_obj_get_int(args[3]);
 
         if (network_status & NTW_ACT_BIT) {
-            mp_raise_CellularError("GPRS is already on");
+            mp_raise_ValueError("GPRS is already on");
             return mp_const_none;
         }
-        WAIT_UNTIL(__is_attached(), TIMEOUT_GPRS_ATTACHMENT, 100, mp_raise_CellularError("Network is not attached: try resetting"));
+        WAIT_UNTIL(__is_attached(), TIMEOUT_GPRS_ATTACHMENT, 100, mp_raise_RuntimeError("Network is not attached: try resetting"));
 
         if (!(network_status & NTW_ACT_BIT)) {
             Network_PDP_Context_t context;
@@ -950,11 +884,9 @@ STATIC mp_obj_t modcellular_gprs(size_t n_args, const mp_obj_t *args) {
             memcpy(context.userName, c_user, MIN(strlen(c_user) + 1, sizeof(context.userName)));
             memcpy(context.userPasswd, c_pass, MIN(strlen(c_pass) + 1, sizeof(context.userPasswd)));
 
-            if (!Network_StartActive(context)) {
-                mp_raise_CellularError("Cannot initiate context activation");
-                return mp_const_none;
-            }
-            if (timeout) WAIT_UNTIL(network_status & NTW_ACT_BIT, timeout, 100, mp_raise_CellularError("Network context activation timeout"));
+            if (!Network_StartActive(context))
+                mp_raise_RuntimeError("Cannot initiate context activation");
+            if (timeout) WAIT_UNTIL(network_status & NTW_ACT_BIT, timeout, 100, mp_raise_OSError(MP_ETIMEDOUT));
         }
 
     } else if (n_args != 0) {
@@ -972,10 +904,10 @@ STATIC mp_obj_t modcellular_scan(void) {
     // ========================================
     network_list_buffer = NULL;
     if (!Network_GetAvailableOperatorReq()) {
-        mp_raise_CellularError("Failed to poll available operators");
+        mp_raise_RuntimeError("Failed to poll available operators");
         return mp_const_none;
     }
-    WAIT_UNTIL(network_list_buffer != NULL, TIMEOUT_LIST_OPERATORS, 100, mp_raise_CellularError("Network list timeout"));
+    WAIT_UNTIL(network_list_buffer != NULL, TIMEOUT_LIST_OPERATORS, 100, mp_raise_OSError(MP_ETIMEDOUT));
 
     mp_obj_t items[network_list_buffer_len];
     for (int i=0; i < network_list_buffer_len; i++) {
@@ -983,7 +915,7 @@ STATIC mp_obj_t modcellular_scan(void) {
         // Name
         uint8_t *op_name;
         if (!Network_GetOperatorNameById(network_list_buffer[i].operatorId, &op_name)) {
-            mp_raise_CellularError("Failed to poll operator name");
+            mp_raise_RuntimeError("Failed to poll operator name");
             return mp_const_none;
         }
 
@@ -1014,10 +946,10 @@ STATIC mp_obj_t modcellular_register(size_t n_args, const mp_obj_t *args) {
         }
 
         if (!Network_DeRegister()) {
-            mp_raise_CellularError("Failed to request deregistration");
+            mp_raise_RuntimeError("Failed to request deregistration");
             return mp_const_none;
         }
-        WAIT_UNTIL(!(network_status & NTW_REG_BIT), TIMEOUT_REG, 100, mp_raise_CellularError("De-registration timeout"));
+        WAIT_UNTIL(!(network_status & NTW_REG_BIT), TIMEOUT_REG, 100, mp_raise_OSError(MP_ETIMEDOUT));
 
     } else if (n_args == 2) {
         mp_obj_array_t *op_id = MP_OBJ_TO_PTR(args[0]);
@@ -1039,23 +971,23 @@ STATIC mp_obj_t modcellular_register(size_t n_args, const mp_obj_t *args) {
         }
 
         if (!Network_Register((uint8_t*) op_id->items, (Network_Register_Mode_t) op_mode)) {
-            mp_raise_CellularError("Failed to request network registration");
+            mp_raise_RuntimeError("Failed to request network registration");
             return mp_const_none;
         }
-        WAIT_UNTIL(network_status & NTW_REG_BIT, TIMEOUT_REG, 100, mp_raise_CellularError("Registration timeout"));
+        WAIT_UNTIL(network_status & NTW_REG_BIT, TIMEOUT_REG, 100, mp_raise_OSError(MP_ETIMEDOUT));
     }
 
     uint8_t op_id[6];
     Network_Register_Mode_t op_mode;
 
     if (!Network_GetCurrentOperator(op_id, &op_mode)) {
-        mp_raise_CellularError("Failed to poll current operator");
+        mp_raise_RuntimeError("Failed to poll current operator");
         return mp_const_none;
     }
 
     uint8_t *op_name;
     if (!Network_GetOperatorNameById(op_id, &op_name)) {
-        mp_raise_CellularError("Failed to poll operator name");
+        mp_raise_RuntimeError("Failed to poll operator name");
         return mp_const_none;
     }
 
@@ -1080,13 +1012,13 @@ STATIC mp_obj_t modcellular_dial(mp_obj_t tn_in) {
     if (mp_obj_is_str(tn_in)) {
         const char* tn = mp_obj_str_get_str(tn_in);
         if (!CALL_Dial(tn)) {
-            mp_raise_CellularError("Failed to initiate an outgoing call");
+            mp_raise_RuntimeError("Failed to initiate an outgoing call");
         }
         return mp_const_none;
     } else {
         if (!mp_obj_is_true(tn_in)) {
             if (!CALL_HangUp()) {
-                mp_raise_CellularError("Failed to hangup call");
+                mp_raise_RuntimeError("Failed to hangup call");
             }
         } else {
             mp_raise_ValueError("The argument must be a string or False");
@@ -1103,10 +1035,10 @@ STATIC mp_obj_t modcellular_stations(void) {
     // ========================================
     cells_n = -1;
     if (!Network_GetCellInfoRequst()) {
-        mp_raise_CellularError("Failed to poll base stations");
+        mp_raise_RuntimeError("Failed to poll base stations");
         return mp_const_none;
     }
-    WAIT_UNTIL(cells_n >= 0, TIMEOUT_STATIONS, 100, mp_raise_CellularError("Station poll timeout"));
+    WAIT_UNTIL(cells_n >= 0, TIMEOUT_STATIONS, 100, mp_raise_OSError(MP_ETIMEDOUT));
 
     mp_obj_t stations[cells_n];
     for (int i=0; i<cells_n; i++) {
@@ -1135,13 +1067,13 @@ STATIC mp_obj_t modcellular_agps_station_data(void) {
     // ========================================
     cells_n = -1;
     if (!Network_GetCellInfoRequst()) {
-        mp_raise_CellularError("Failed to poll base stations");
+        mp_raise_RuntimeError("Failed to poll base stations");
         return mp_const_none;
     }
-    WAIT_UNTIL(cells_n >= 0, TIMEOUT_STATIONS, 100, mp_raise_CellularError("Station poll timeout"));
+    WAIT_UNTIL(cells_n >= 0, TIMEOUT_STATIONS, 100, mp_raise_OSError(MP_ETIMEDOUT));
 
     if (cells_n == 0) {
-        mp_raise_CellularError("No station data available");
+        mp_raise_RuntimeError("No station data available");
         return mp_const_none;
     }
 
@@ -1221,8 +1153,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(modcellular_on_call_obj, modcellular_on_call);
 STATIC const mp_map_elem_t mp_module_cellular_globals_table[] = {
     { MP_OBJ_NEW_QSTR(MP_QSTR___name__), MP_OBJ_NEW_QSTR(MP_QSTR_cellular) },
 
-    { MP_OBJ_NEW_QSTR(MP_QSTR_CellularError), (mp_obj_t)MP_ROM_PTR(&mp_type_CellularError) },
-
     { MP_OBJ_NEW_QSTR(MP_QSTR_SMS), (mp_obj_t)MP_ROM_PTR(&modcellular_sms_type) },
 
     { MP_OBJ_NEW_QSTR(MP_QSTR_get_imei), (mp_obj_t)&modcellular_get_imei_obj },
@@ -1265,6 +1195,21 @@ STATIC const mp_map_elem_t mp_module_cellular_globals_table[] = {
     
     { MP_ROM_QSTR(MP_QSTR_SMS_SENT), MP_ROM_INT(SMS_SENT) },
     { MP_ROM_QSTR(MP_QSTR_SMS_RECEIVED), MP_ROM_INT(SMS_RECEIVED) },
+
+    { MP_ROM_QSTR(MP_QSTR_ENOSIM), MP_ROM_INT(NTW_EXC_NOSIM) },
+    { MP_ROM_QSTR(MP_QSTR_EREGD), MP_ROM_INT(NTW_EXC_REG_DENIED) },
+    { MP_ROM_QSTR(MP_QSTR_ESMSSEND), MP_ROM_INT(NTW_EXC_SMS_SEND) },
+    { MP_ROM_QSTR(MP_QSTR_ESMSDROP), MP_ROM_INT(NTW_EXC_SMS_DROP) },
+    { MP_ROM_QSTR(MP_QSTR_ESIMDROP), MP_ROM_INT(NTW_EXC_SIM_DROP) },
+    { MP_ROM_QSTR(MP_QSTR_EATTACHMENT), MP_ROM_INT(NTW_EXC_ATT_FAILED) },
+    { MP_ROM_QSTR(MP_QSTR_EACTIVATION), MP_ROM_INT(NTW_EXC_ACT_FAILED) },
+    { MP_ROM_QSTR(MP_QSTR_ENODIALTONE), MP_ROM_INT(NTW_EXC_CALL_NO_DIAL_TONE) },
+    { MP_ROM_QSTR(MP_QSTR_EBUSY), MP_ROM_INT(NTW_EXC_CALL_BUSY) },
+    { MP_ROM_QSTR(MP_QSTR_ENOANSWER), MP_ROM_INT(NTW_EXC_CALL_NO_ANSWER) },
+    { MP_ROM_QSTR(MP_QSTR_ENOCARRIER), MP_ROM_INT(NTW_EXC_CALL_NO_CARRIER) },
+    { MP_ROM_QSTR(MP_QSTR_ECALLTIMEOUT), MP_ROM_INT(NTW_EXC_CALL_TIMEOUT) },
+    { MP_ROM_QSTR(MP_QSTR_ECALLINPROGRESS), MP_ROM_INT(NTW_EXC_CALL_INPROGRESS) },
+    { MP_ROM_QSTR(MP_QSTR_ECALLUNKNOWN), MP_ROM_INT(NTW_EXC_CALL_UNKNOWN) },
 };
 
 STATIC MP_DEFINE_CONST_DICT(mp_module_cellular_globals, mp_module_cellular_globals_table);
diff --git a/ports/gprs_a9/modcellular.h b/ports/gprs_a9/modcellular.h
index 38c693dd23722..c240f687562db 100644
--- a/ports/gprs_a9/modcellular.h
+++ b/ports/gprs_a9/modcellular.h
@@ -72,6 +72,6 @@ void modcellular_notify_call_hangup(API_Event_t* event);
 #define TIMEOUT_REG 10000
 #define TIMEOUT_STATIONS 2000
 
-#define REQUIRES_NETWORK_REGISTRATION do {if (!network_status) {mp_raise_CellularError("Network is not available: is SIM card inserted?"); return mp_const_none;}} while(0)
+#define REQUIRES_NETWORK_REGISTRATION do {if (!network_status) {mp_raise_RuntimeError("Network is not available: is SIM card inserted?"); return mp_const_none;}} while(0)
 #define REQUIRES_VALID_SMS_STATUS(bits) do {if (bitsum(bits) != 1) {return mp_const_none;}} while(0)
 #define WAIT_UNTIL(condition, timeout_ms, step_ms, raise) do {uint32_t __time = mp_hal_ticks_ms(); while (mp_hal_ticks_ms() - __time < (timeout_ms) && !(condition)) mp_hal_delay_ms(step_ms); if (!(condition)) {raise;}} while (0)

From afcde6334896952cca932b85dd0e2d780dc1b06e Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sun, 10 May 2020 15:23:51 +0200
Subject: [PATCH 3484/3533] readme: improve markup

[skip ci]
---
 ports/gprs_a9/README.md | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/ports/gprs_a9/README.md b/ports/gprs_a9/README.md
index 8cb55c0eed3b8..fad25c537199a 100644
--- a/ports/gprs_a9/README.md
+++ b/ports/gprs_a9/README.md
@@ -109,10 +109,16 @@ Provides cellular functionality.
 As usual, the original API does not give access to radio-level and low-level functionality such as controlling the registration on the cellular network: these are performed in the background automatically.
 The purpose of this module is to have an access to high-level networking (SMS, GPRS, calls) as well as to read the status of various components of cellular networking.
 
+#### Constants
+
 * `NETWORK_FREQ_BAND_GSM_900P`, `NETWORK_FREQ_BAND_GSM_900E`, `NETWORK_FREQ_BAND_GSM_850`, `NETWORK_FREQ_BAND_DCS_1800`, `NETWORK_FREQ_BAND_PCS_1900`, `NETWORK_FREQ_BANDS_ALL`: frequencies;
 * `OPERATOR_STATUS_UNKNOWN`, `OPERATOR_STATUS_AVAILABLE`, `OPERATOR_STATUS_CURRENT`, `OPERATOR_STATUS_DISABLED`: operator statuses;
 * `NETWORK_MODE_MANUAL`, `NETWORK_MODE_AUTO`, `NETWORK_MODE_MANUAL_AUTO`: network registration modes;
+* `SMS_SENT`, `SMS_RECEIVED`: constants for event handler `on_sms`;
 * `ENOSIM`, `EREGD`, `ESMSSEND`, `ESMSDROP`, `ESIMDROP`, `EATTACHMENT`, `EACTIVATION`, `ENODIALTONE`, `EBUSY`, `ENOANSWER`, `ENOCARRIER`, `ECALLTIMEOUT`, `ECALLINPROGRESS`, `ECALLUNKNOWN`: extended codes for `OSError`s raised by the module;
+
+#### Classes
+
 * `SMS(phone_number: str, message: str)`: handles SMS messages;
   * `.phone_number` (str): phone number (sender or destination);
   * `.message` (str): message contents;
@@ -125,6 +131,9 @@ The purpose of this module is to have an access to high-level networking (SMS, G
   * ~~`.poll()` (int) [staticmethod]: the number of new SMS received~~ use `on_sms` instead;
   * `.list()` (list) [staticmethod]: all SMS from the SIM card;
 * ~~`CellularError(message: str)`~~ `OSError`, `ValueError`, `RuntimeError` are used instead;
+
+#### Methods
+
 * `get_imei()` (str): the International Mobile Equipment Identity (IMEI) number;
 * `get_iccid()` (str): the Integrated Circuit Card ID (ICCID) number of the inserted SIM card;
 * `get_imsi()` (str): the International Mobile Subscriber Identity (IMSI) number of the inserted SIM card;

From cfcbfb23ed607ff88147f3b0b4bf08cb4d46243e Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sun, 10 May 2020 15:26:01 +0200
Subject: [PATCH 3485/3533] readme: move obsolete entries to the bottom

---
 ports/gprs_a9/README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ports/gprs_a9/README.md b/ports/gprs_a9/README.md
index fad25c537199a..0415df37a6648 100644
--- a/ports/gprs_a9/README.md
+++ b/ports/gprs_a9/README.md
@@ -128,8 +128,8 @@ The purpose of this module is to have an access to high-level networking (SMS, G
   * `.sent` (bool): sent message if `True`, not sent message if `False` or unknown status if `None`;
   * `.send()`: sends a message;
   * `.withdraw()`: withdraws SMS from SIM storage;
-  * ~~`.poll()` (int) [staticmethod]: the number of new SMS received~~ use `on_sms` instead;
   * `.list()` (list) [staticmethod]: all SMS from the SIM card;
+  * ~~`.poll()` (int) [staticmethod]: the number of new SMS received~~ use `on_sms` instead;
 * ~~`CellularError(message: str)`~~ `OSError`, `ValueError`, `RuntimeError` are used instead;
 
 #### Methods
@@ -137,7 +137,6 @@ The purpose of this module is to have an access to high-level networking (SMS, G
 * `get_imei()` (str): the International Mobile Equipment Identity (IMEI) number;
 * `get_iccid()` (str): the Integrated Circuit Card ID (ICCID) number of the inserted SIM card;
 * `get_imsi()` (str): the International Mobile Subscriber Identity (IMSI) number of the inserted SIM card;
-* ~~`network_status_changed()` (bool): indicates whether the network status changed since the last check~~ use `on_status_event` instead;
 * `get_network_status()` (int): cellular network status encoded in an integer. **TODO**: Provide bit-wise specs;
 * `poll_network_exception()`: polls the network exception and raises it, if any;
 * `is_sim_present()` (bool): checks whether a SIM card is present;
@@ -152,11 +151,12 @@ The purpose of this module is to have an access to high-level networking (SMS, G
 * `agps_station_data()` (int, int, list): a convenience function returning `(mcc, mnc, [(lac, cell_id, signal_strength), ...])` for use in agps location: all ints;
 * `reset()`: resets network settings to defaults. Disconnects GPRS;
 * `gprs([apn: {str, bool}[, user: str, pass: str[, timeout: int]]])` (bool): activate (3 or 4 arguments), deactivate (`gprs(False)`) or obtain the status of GPRS (on/off) if no arguments supplied;
-* ~~`call()` (list[str], [str, None]): calls missed (1st output) and the incoming call number or `None` if no incoming calls at the moment (2nd output)~~ use `on_call` instead;
 * `dial(tn: {str, bool})`: dial a telephone number if string is supplied or hang up a call if `False`;
 * `on_status_event(callback: Callable)`: sets a callback for network status change. The callback is called with a single integer constant indicating the new network state;
 * `on_sms(callback: Callable)`: sets a callback on SMS sent or received. The callback is called with a single integer constant `SMS_SENT` or `SMS_RECEIVED`;
 * `on_call(callback: Callable)`: sets a callback on call events (incoming, hangup, etc.);
+* ~~`network_status_changed()` (bool): indicates whether the network status changed since the last check~~ use `on_status_event` instead;
+* ~~`call()` (list[str], [str, None]): calls missed (1st output) and the incoming call number or `None` if no incoming calls at the moment (2nd output)~~ use `on_call` instead;
 
 ### `usocket` ###
 

From 860cf8aade695548e2d0168d9585f36c038e8dc5 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sun, 10 May 2020 15:36:06 +0200
Subject: [PATCH 3486/3533] cellular: skip raising exception if timeout is zero

---
 ports/gprs_a9/modcellular.c | 2 +-
 ports/gprs_a9/modcellular.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/gprs_a9/modcellular.c b/ports/gprs_a9/modcellular.c
index 2659ffa3061b9..54797c6d84bbf 100644
--- a/ports/gprs_a9/modcellular.c
+++ b/ports/gprs_a9/modcellular.c
@@ -886,7 +886,7 @@ STATIC mp_obj_t modcellular_gprs(size_t n_args, const mp_obj_t *args) {
 
             if (!Network_StartActive(context))
                 mp_raise_RuntimeError("Cannot initiate context activation");
-            if (timeout) WAIT_UNTIL(network_status & NTW_ACT_BIT, timeout, 100, mp_raise_OSError(MP_ETIMEDOUT));
+            WAIT_UNTIL(network_status & NTW_ACT_BIT, timeout, 100, mp_raise_OSError(MP_ETIMEDOUT));
         }
 
     } else if (n_args != 0) {
diff --git a/ports/gprs_a9/modcellular.h b/ports/gprs_a9/modcellular.h
index c240f687562db..f4458657fa82d 100644
--- a/ports/gprs_a9/modcellular.h
+++ b/ports/gprs_a9/modcellular.h
@@ -74,4 +74,4 @@ void modcellular_notify_call_hangup(API_Event_t* event);
 
 #define REQUIRES_NETWORK_REGISTRATION do {if (!network_status) {mp_raise_RuntimeError("Network is not available: is SIM card inserted?"); return mp_const_none;}} while(0)
 #define REQUIRES_VALID_SMS_STATUS(bits) do {if (bitsum(bits) != 1) {return mp_const_none;}} while(0)
-#define WAIT_UNTIL(condition, timeout_ms, step_ms, raise) do {uint32_t __time = mp_hal_ticks_ms(); while (mp_hal_ticks_ms() - __time < (timeout_ms) && !(condition)) mp_hal_delay_ms(step_ms); if (!(condition)) {raise;}} while (0)
+#define WAIT_UNTIL(condition, timeout_ms, step_ms, raise) if (timeout_ms) do {uint32_t __time = mp_hal_ticks_ms(); while (mp_hal_ticks_ms() - __time < (timeout_ms) && !(condition)) mp_hal_delay_ms(step_ms); if (!(condition)) {raise;}} while (0)

From 80e2859709f561d76419533edb349b08835317b3 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Wed, 27 May 2020 22:39:03 +0200
Subject: [PATCH 3487/3533] remove st7735

---
 ports/gprs_a9/Makefile       |   1 -
 ports/gprs_a9/README.md      |  14 +-
 ports/gprs_a9/modst7735.c    | 592 -----------------------------------
 ports/gprs_a9/modst7735.h    |  22 --
 ports/gprs_a9/mpconfigport.h |   2 -
 5 files changed, 2 insertions(+), 629 deletions(-)
 delete mode 100644 ports/gprs_a9/modst7735.c
 delete mode 100644 ports/gprs_a9/modst7735.h

diff --git a/ports/gprs_a9/Makefile b/ports/gprs_a9/Makefile
index ccddc7e9a585e..9c46d3cd6a4fe 100644
--- a/ports/gprs_a9/Makefile
+++ b/ports/gprs_a9/Makefile
@@ -140,7 +140,6 @@ SRC_C = \
 	modgps.c \
 	modusocket.c \
 	modi2c.c \
-	modst7735.c \
 	machine_adc.c \
 	machine_uart.c \
 	machine_rtc.c
diff --git a/ports/gprs_a9/README.md b/ports/gprs_a9/README.md
index 0415df37a6648..a2b9af9495a06 100644
--- a/ports/gprs_a9/README.md
+++ b/ports/gprs_a9/README.md
@@ -99,9 +99,8 @@ See [examples](examples) folder.
 4. [`gps`](#gps): everything related to GPS and assisted positioning
 5. [`machine`](#machine): hardware and power control
 6. [`i2c`](#i2c): i2c implementation
-7. [`st7735`](#ST7735): ST7735 over software SPI display implementation **to be removed**
-8. [Other modules](#Misc)
-9. [Notes](#Notes)
+7. [Other modules](#Misc)
+8. [Notes](#Notes)
 
 ### `cellular`
 
@@ -247,15 +246,6 @@ Provides i2c functionality
 * `mem_receive(id: int, slave_address: int, memory_address: int, memory_size: int, data_length: int, timeout: int = I2C_DEFAULT_TIME_OUT)` (bytes): reads memory data;
 * `mem_transmit(id: int, slave_address: int, memory_address: int, memory_size: int, data: bytes, timeout: int = I2C_DEFAULT_TIME_OUT)` writes data to memory;
 
-### `st7735`
-
-ST7735 displays over software SPI.
-
-* `Display(spi: SPI, dc: Pin, reset: Pin, cs: Pin, width: int, height: int)`: a [framebuffer](https://docs.micropython.org/en/latest/library/framebuf.html) class for displays.
-  In addition to drawing routines (the 565 color format is used), implements this:
-  * `init()`: runs display initialization;
-  * `mode(rotation: int, rgb_bgr: bool)`: sets the display rotation and color order;
-
 ## Misc ##
 
 Built into the firmware:
diff --git a/ports/gprs_a9/modst7735.c b/ports/gprs_a9/modst7735.c
deleted file mode 100644
index 907db95f18a7f..0000000000000
--- a/ports/gprs_a9/modst7735.c
+++ /dev/null
@@ -1,592 +0,0 @@
-/*
- * This file is part of the MicroPython project, http://micropython.org/
- *
- * Development of the code in this file was sponsored by Microbric Pty Ltd
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2019 pulkin
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#include "modst7735.h"
-#include "font_petme128_8x8.h"
-
-#include "extmod/machine_spi.h"
-#include "extmod/modframebuf.h"
-
-#include "py/obj.h"
-#include "py/runtime.h"
-
-#define PIXEL_BUF_SMALL_SIZE 16
-
-typedef struct _st7735_display_obj_t {
-    mp_obj_base_t base;
-    mp_soft_spi_obj_t spi;
-    mp_hal_pin_obj_t dc;
-    mp_hal_pin_obj_t reset;
-    mp_hal_pin_obj_t cs;
-    uint16_t width;
-    uint16_t height;
-    uint16_t offset_x;
-    uint16_t offset_y;
-} st7735_display_obj_t;
-
-extern void mp_hal_pin_write(mp_hal_pin_obj_t pin_id, int value);
-extern mp_hal_pin_obj_t mp_hal_get_pin_obj(mp_obj_t pin_in);
-extern void mp_hal_delay_us_fast(uint32_t us);
-
-void _seq_reset(st7735_display_obj_t *self) {
-    mp_hal_pin_write(self->dc, GPIO_LEVEL_LOW);
-    mp_hal_pin_write(self->reset, GPIO_LEVEL_HIGH);
-    mp_hal_delay_us_fast(500);
-    mp_hal_pin_write(self->reset, GPIO_LEVEL_LOW);
-    mp_hal_delay_us_fast(500);
-    mp_hal_pin_write(self->reset, GPIO_LEVEL_HIGH);
-    mp_hal_delay_us_fast(500);
-}
-
-void _seq_comm(st7735_display_obj_t *self, uint8_t cmd) {
-    mp_hal_pin_write(self->dc, GPIO_LEVEL_LOW);
-    mp_hal_pin_write(self->cs, GPIO_LEVEL_LOW);
-    mp_soft_spi_transfer(&self->spi, 1, &cmd, NULL);
-    mp_hal_pin_write(self->cs, GPIO_LEVEL_HIGH);
-}
-
-void _seq_data_start(st7735_display_obj_t *self) {
-    mp_hal_pin_write(self->dc, GPIO_LEVEL_HIGH);
-    mp_hal_pin_write(self->cs, GPIO_LEVEL_LOW);
-}
-
-void _seq_data_continue(st7735_display_obj_t *self, uint8_t *data, uint32_t data_len) {
-    mp_soft_spi_transfer(&self->spi, data_len, data, NULL);
-}
-
-void _seq_data_end(st7735_display_obj_t *self) {
-    mp_hal_pin_write(self->cs, GPIO_LEVEL_HIGH);
-}
-
-void _seq_data(st7735_display_obj_t *self, uint8_t *data, uint32_t data_len) {
-    _seq_data_start(self);
-    _seq_data_continue(self, data, data_len);
-    _seq_data_end(self);
-}
-
-void _seq_call(st7735_display_obj_t *self, uint8_t cmd, uint8_t *data, uint32_t data_len, uint32_t delay) {
-    _seq_comm(self, cmd);
-    if (data != NULL)
-        _seq_data(self, data, data_len);
-    mp_hal_delay_us_fast(delay);
-}
-
-void _seq_madctl(st7735_display_obj_t *self, uint8_t rotation, uint8_t rgb) {
-    uint8_t arg;
-    if (rgb) arg = 0x00; else arg = 0x08;
-    switch (rotation) {
-        case 0:
-            arg = arg | 0;
-            break;
-        case 1:
-            arg = arg | 0x60;
-            break;
-        case 2:
-            arg = arg | 0xC0;
-            break;
-        case 3:
-            arg = arg | 0xA0;
-            break;
-    }
-    _seq_call(self, MADCTL, &arg, 1, 0);
-}
-
-void _seq_window(st7735_display_obj_t *self, uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1) {
-
-    uint8_t d[4];
-    x0 += self->offset_x * 0x0101;
-    y0 += self->offset_y * 0x0101;
-    x1 += self->offset_x * 0x0101;
-    y1 += self->offset_y * 0x0101;
-    d[0] = (x0 >> 8) & 0xFF; d[1] = x0 & 0xFF; d[2] = (x1 >> 8) & 0xFF; d[3] = x1 & 0xFF;
-    _seq_call(self, CASET, (uint8_t*) d, 4, 0);
-    d[0] = (y0 >> 8) & 0xFF; d[1] = y0 & 0xFF; d[2] = (y1 >> 8) & 0xFF; d[3] = y1 & 0xFF;
-    _seq_call(self, RASET, (uint8_t*) d, 4, 0);
-}
-
-void _seq_ppix(st7735_display_obj_t *self, uint16_t x, uint16_t y, uint16_t rgb) {
-    _seq_window(self, x, y, x, y);
-    _seq_call(self, RAMWR, (uint8_t*) &rgb, 2, 0);
-}
-
-uint8_t box_overlap(st7735_display_obj_t *self, mp_int_t *x, mp_int_t *y, mp_int_t *w, mp_int_t *h) {
-    mp_int_t x1 = *x;
-    mp_int_t y1 = *y;
-    mp_int_t x2 = *x + *w;
-    mp_int_t y2 = *y + *h;
-
-    mp_int_t t = MAX(x1, x2);
-    x1 = MIN(x1, x2);
-    x2 = t;
-
-    t = MAX(y1, y2);
-    y1 = MIN(y1, y2);
-    y2 = t;
-    
-    uint8_t result = 0;
-
-    if (x1>=0 && x1 < self->width) result += 1;
-    if (y1>=0 && y1 < self->height) result += 2;
-    if (x2>=0 && x2 < self->width) result += 4;
-    if (y2>=0 && y2 < self->height) result += 8;
-
-    x1 = MAX(x1, 0);
-    x2 = MIN(x2, self->width);
-
-    y1 = MAX(y1, 0);
-    y2 = MIN(y2, self->height);
-
-    *x = x1;
-    *y = y1;
-    *w = x2 - x1;
-    *h = y2 - y1;
-
-    if (*w < 0 || *h < 0) {
-        *w = 0;
-        *h = 0;
-    }
-
-    return result;
-}
-
-mp_obj_t modst7735_display_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
-    // ========================================
-    // ST7735 display class.
-    // Args:
-    //    spi (SPI)
-    //    dc (int)
-    //    reset (int)
-    //    cs (int)
-    //    width (int)
-    //    height (int)
-    // ========================================
-
-    enum { ARG_spi, ARG_dc, ARG_reset, ARG_cs, ARG_width, ARG_height, ARG_offset_x, ARG_offset_y };
-    static const mp_arg_t allowed_args[] = {
-        { MP_QSTR_spi,   MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
-        { MP_QSTR_dc,    MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
-        { MP_QSTR_reset, MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
-        { MP_QSTR_cs,    MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
-        { MP_QSTR_width, MP_ARG_INT, {.u_int = 128} },
-        { MP_QSTR_height, MP_ARG_INT, {.u_int = 128} },
-        { MP_QSTR_offset_x, MP_ARG_INT, {.u_int = 2} },
-        { MP_QSTR_offset_y, MP_ARG_INT, {.u_int = 1} },
-    };
-
-    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
-    mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
-
-    if (!mp_obj_is_type(args[ARG_spi].u_obj, &mp_machine_soft_spi_type)) {
-        mp_raise_ValueError("Soft SPI expected");
-        return mp_const_none;
-    }
-    mp_machine_soft_spi_obj_t *spi_obj = MP_OBJ_TO_PTR(args[ARG_spi].u_obj);
-
-    st7735_display_obj_t *self = m_new_obj(st7735_display_obj_t);
-    self->base.type = type;
-    
-    self->spi = spi_obj->spi;
-    self->dc = mp_hal_get_pin_obj(args[ARG_dc].u_obj);
-    self->reset = mp_hal_get_pin_obj(args[ARG_reset].u_obj);
-    self->cs = mp_hal_get_pin_obj(args[ARG_cs].u_obj);
-    self->width = args[ARG_width].u_int;
-    self->height = args[ARG_height].u_int;
-    self->offset_x = args[ARG_offset_x].u_int;
-    self->offset_y = args[ARG_offset_y].u_int;
-    return MP_OBJ_FROM_PTR(self);
-}
-
-static void modst7735_display_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
-    // ========================================
-    // display.__str__()
-    // ========================================
-    st7735_display_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    mp_printf(print, "display(%d, %d, %d, %d, %d)",
-        self->spi.sck, self->spi.mosi, self->dc, self->reset, self->cs
-    );
-}
-
-STATIC mp_obj_t modst7735_display_mode(mp_obj_t self_in, mp_obj_t rotation_in, mp_obj_t rgb_in) {
-    // ========================================
-    // Display mode.
-    // Args:
-    //     rotation (int)
-    //     rgb (int)
-    // ========================================
-    st7735_display_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    mp_int_t rotation = mp_obj_get_int(rotation_in);
-    mp_int_t rgb = mp_obj_get_int(rgb_in);
-    _seq_madctl(self, rotation, rgb);
-    return mp_const_none;
-}
-
-MP_DEFINE_CONST_FUN_OBJ_3(modst7735_display_mode_obj, &modst7735_display_mode);
-
-STATIC mp_obj_t modst7735_display_init(mp_obj_t self_in) {
-    // ========================================
-    // Initialize the display.
-    // ========================================
-
-    st7735_display_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    uint8_t d[16];
-
-    //???
-    mp_hal_pin_write(self->spi.sck, GPIO_LEVEL_LOW);
-    mp_hal_pin_write(self->cs, GPIO_LEVEL_HIGH);
-
-    _seq_reset(self);
-    
-    _seq_call(self, SWRESET, NULL, 0, 150);  // Software reset.
-    _seq_call(self, SLPOUT, NULL, 0, 500);  // Out of sleep mode.
-
-    d[0] = 0x01; d[1] = 0x2C; d[2] = 0x2D;
-    _seq_call(self, FRMCTR1, d, 3, 0);  // Frame rate control.
-    _seq_call(self, FRMCTR2, d, 3, 0);  // Frame rate control.
-
-    d[3] = 0x01; d[4] = 0x2C; d[5] = 0x2D;
-    _seq_call(self, FRMCTR3, d, 6, 10);  // Frame rate control.
-
-    d[0] = 0x07;
-    _seq_call(self, INVCTR, d, 1, 0);  // Display inversion control
-
-    d[0] = 0xA2; d[1] = 0x02; d[2] = 0x84;
-    _seq_call(self, PWCTR1, d, 3, 0);  // Power control
-
-    d[0] = 0xC5;
-    _seq_call(self, PWCTR2, d, 1, 0);  // Power control
-
-    d[0] = 0x0A; d[1] = 0x00;
-    _seq_call(self, PWCTR3, d, 2, 0);  // Power control
-
-    d[0] = 0x8A; d[1] = 0x2A;
-    _seq_call(self, PWCTR4, d, 2, 0);  // Power control
-
-    d[0] = 0x8A; d[1] = 0xEE;
-    _seq_call(self, PWCTR5, d, 2, 0);  // Power control
-
-    d[0] = 0x0E;
-    _seq_call(self, VMCTR1, d, 1, 0);  // Power control
-
-    _seq_comm(self, INVOFF);
-
-    _seq_madctl(self, 0, 0);
-
-    d[0] = 0x05;
-    _seq_call(self, COLMOD, d, 1, 0);
-
-    _seq_window(self, 0, 0, self->width - 1, self->height - 1);
-
-    d[0] = 0x0F; d[1] = 0x1A; d[2] = 0x0F; d[3] = 0x18;
-    d[4] = 0x2F; d[5] = 0x28; d[6] = 0x20; d[7] = 0x22;
-    d[8] = 0x1F; d[9] = 0x1B; d[10] = 0x23; d[11] = 0x37;
-    d[12] = 0x00; d[13] = 0x07; d[14] = 0x02; d[15] = 0x10;
-    _seq_call(self, GMCTRP1, d, 16, 0);
-
-    d[0] = 0x0F; d[1] = 0x1B; d[2] = 0x0F; d[3] = 0x17;
-    d[4] = 0x33; d[5] = 0x2C; d[6] = 0x29; d[7] = 0x2E;
-    d[8] = 0x30; d[9] = 0x30; d[10] = 0x39; d[11] = 0x3F;
-    d[12] = 0x00; d[13] = 0x07; d[14] = 0x03; d[15] = 0x10;
-    _seq_call(self, GMCTRN1, d, 16, 10);
-
-    _seq_call(self, DISPON, NULL, 0, 100);
-
-    _seq_call(self, NORON, NULL, 0, 10); // Normal display on.
-
-    mp_hal_pin_write(self->cs, 1);
-
-    d[0] = 0x08;
-    _seq_call(self, MADCTL, d, 1, 0);
-
-    return mp_const_none;
-}
-
-MP_DEFINE_CONST_FUN_OBJ_1(modst7735_display_init_obj, &modst7735_display_init);
-
-STATIC mp_obj_t modst7735_display_blit(size_t n_args, const mp_obj_t *args) {
-    // ========================================
-    // Display framebuffer.
-    // Args:
-    //     data (FrameBuffer): a proper FrameBuffer in 565 format;
-    // ========================================
-    (void) n_args;
-
-    st7735_display_obj_t *self = MP_OBJ_TO_PTR(args[0]);
-    if (!mp_obj_is_type(args[1], &mp_type_framebuf)) {
-        mp_raise_ValueError("FrameBuffer expected");
-        return mp_const_none;
-    }
-    mp_obj_framebuf_t *fb = MP_OBJ_TO_PTR(args[1]);
-    mp_int_t x = mp_obj_get_int(args[2]);
-    mp_int_t y = mp_obj_get_int(args[3]);
-
-    if (x < 0 || x + fb->width > self->width || y < 0 || y + fb->height > self->height) {
-        mp_raise_ValueError("Framebuffer is outside of the display");
-        return mp_const_none;
-    }
-
-    if (fb->format != FRAMEBUF_RGB565) {
-        mp_raise_ValueError("RGB565 framebuffer expected");
-        return mp_const_none;
-    }
-
-    _seq_window(self, x, y, x + fb->width - 1, y + fb->height - 1);
-    _seq_comm(self, RAMWR);
-
-    uint16_t buf[PIXEL_BUF_SMALL_SIZE];
-    uint16_t* fbuf = (uint16_t*) fb->buf;
-
-    _seq_data_start(self);
-    for (int i=0; i<fb->width*fb->height; i+=PIXEL_BUF_SMALL_SIZE) {
-        for (int j=0; j<MIN(PIXEL_BUF_SMALL_SIZE, fb->width*fb->height-i); j++)
-            buf[j] = (fbuf[i+j] >> 8) | (fbuf[i+j] << 8);
-        _seq_data_continue(self, (uint8_t*) buf, 2*MIN(PIXEL_BUF_SMALL_SIZE, fb->width*fb->height-i));
-    }
-
-    _seq_data_end(self);
-    
-    return mp_const_none;
-}
-
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(modst7735_display_blit_obj, 4, 4, &modst7735_display_blit);
-
-STATIC mp_obj_t modst7735_display_fill_rect(size_t n_args, const mp_obj_t *args) {
-    // ========================================
-    // Uniform rectangle fill.
-    // Args:
-    //    x (int)
-    //    y (int)
-    //    width (int)
-    //    height (int)
-    //    color (int)
-    // ========================================
-    (void) n_args;
-
-    st7735_display_obj_t *self = MP_OBJ_TO_PTR(args[0]);
-    mp_int_t x = mp_obj_get_int(args[1]);
-    mp_int_t y = mp_obj_get_int(args[2]);
-    mp_int_t width = mp_obj_get_int(args[3]);
-    mp_int_t height = mp_obj_get_int(args[4]);
-    mp_int_t col = mp_obj_get_int(args[5]) & 0xFFFF;
-
-    box_overlap(self, &x, &y, &width, &height);
-
-    if (width == 0 || height == 0) return mp_const_none;
-
-    _seq_window(self, (uint16_t) x, (uint16_t) y, (uint16_t) x + width - 1, (uint16_t) y + height - 1);
-    _seq_comm(self, RAMWR);
-
-    uint16_t buf[PIXEL_BUF_SMALL_SIZE];
-    for (int i=0; i<PIXEL_BUF_SMALL_SIZE; i++)
-        buf[i] = (col >> 8) | (col << 8);
-
-    _seq_data_start(self);
-    for (int i=0; i<width*height; i+=PIXEL_BUF_SMALL_SIZE) {
-        _seq_data_continue(self, (uint8_t*) buf, 2*MIN(PIXEL_BUF_SMALL_SIZE, width*height-i));
-    }
-
-    _seq_data_end(self);
-
-    return mp_const_none;
-}
-
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(modst7735_display_fill_rect_obj, 6, 6, modst7735_display_fill_rect);
-
-STATIC mp_obj_t modst7735_display_rect(size_t n_args, const mp_obj_t *args) {
-    // ========================================
-    // Draw rectangle.
-    // Args:
-    //    x (int)
-    //    y (int)
-    //    width (int)
-    //    height (int)
-    //    color (int)
-    // ========================================
-    (void) n_args;
-
-    st7735_display_obj_t *self = MP_OBJ_TO_PTR(args[0]);
-    mp_int_t x = mp_obj_get_int(args[1]);
-    mp_int_t y = mp_obj_get_int(args[2]);
-    mp_int_t width = mp_obj_get_int(args[3]);
-    mp_int_t height = mp_obj_get_int(args[4]);
-    mp_int_t col = mp_obj_get_int(args[5]) & 0xFFFF;
-
-    uint8_t lines = box_overlap(self, &x, &y, &width, &height);
-
-    if (width == 0 || height == 0) return mp_const_none;
-
-    uint16_t buf[MAX(width, height)];
-    for (int i=0; i<sizeof(buf) / sizeof(uint16_t); i++)
-        buf[i] = (col >> 8) | (col << 8);
-
-    if (lines & 2) {
-        _seq_window(self, (uint16_t) x, (uint16_t) y, (uint16_t) x + width - 1, (uint16_t) y);
-        _seq_call(self, RAMWR, (uint8_t*) buf, 2 * width, 0);
-    }
-    if (lines & 8) {
-        _seq_window(self, (uint16_t) x, (uint16_t) y + height - 1, (uint16_t) x + width - 1, (uint16_t) y + height - 1);
-        _seq_call(self, RAMWR, (uint8_t*) buf, 2 * width, 0);
-    }
-    if (lines & 1) {
-        _seq_window(self, (uint16_t) x, (uint16_t) y, (uint16_t) x, (uint16_t) y + height - 1);
-        _seq_call(self, RAMWR, (uint8_t*) buf, 2 * height, 0);
-    }
-    if (lines & 4) {
-        _seq_window(self, (uint16_t) x + width - 1, (uint16_t) y, (uint16_t) x + width - 1, (uint16_t) y + height - 1);
-        _seq_call(self, RAMWR, (uint8_t*) buf, 2 * height, 0);
-    }
-
-    return mp_const_none;
-}
-
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(modst7735_display_rect_obj, 6, 6, modst7735_display_rect);
-
-STATIC mp_obj_t modst7735_display_fill(mp_obj_t self_in, mp_obj_t color_in) {
-    // ========================================
-    // Uniform fill.
-    // Args:
-    //     color (int)
-    // ========================================
-    st7735_display_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    mp_int_t col = mp_obj_get_int(color_in) & 0xFFFF;
-
-    _seq_window(self, 0, 0, self->width-1, self->height-1);
-    _seq_comm(self, RAMWR);
-
-    uint16_t buf[PIXEL_BUF_SMALL_SIZE];
-    for (int i=0; i<PIXEL_BUF_SMALL_SIZE; i++)
-        buf[i] = (col >> 8) | (col << 8);
-
-    _seq_data_start(self);
-    for (int i=0; i<self->width*self->height; i+=PIXEL_BUF_SMALL_SIZE) {
-        _seq_data_continue(self, (uint8_t*) buf, 2*MIN(PIXEL_BUF_SMALL_SIZE, self->width*self->height-i));
-    }
-    _seq_data_end(self);
-
-    return mp_const_none;
-}
-
-MP_DEFINE_CONST_FUN_OBJ_2(modst7735_display_fill_obj, &modst7735_display_fill);
-
-STATIC mp_obj_t modst7735_display_pixel(size_t n_args, const mp_obj_t *args) {
-    // ========================================
-    // Draw rectangle.
-    // Args:
-    //    x (int)
-    //    y (int)
-    //    color (int)
-    // ========================================
-    (void) n_args;
-
-    st7735_display_obj_t *self = MP_OBJ_TO_PTR(args[0]);
-    mp_int_t x = mp_obj_get_int(args[1]);
-    mp_int_t y = mp_obj_get_int(args[2]);
-    mp_int_t col = mp_obj_get_int(args[3]) & 0xFFFF;
-
-    if (x >= 0 && y >= 0 && x < self->width && y < self->height) {
-        col = (col >> 8) | (col << 8);
-        _seq_ppix(self, x, y, col);
-    }
-
-    return mp_const_none;
-}
-
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(modst7735_display_pixel_obj, 4, 4, modst7735_display_pixel);
-
-STATIC mp_obj_t modst7735_display_text(size_t n_args, const mp_obj_t *args) {
-    // extract arguments
-    st7735_display_obj_t *self = MP_OBJ_TO_PTR(args[0]);
-    const char *str = mp_obj_str_get_str(args[1]);
-    mp_int_t x0 = mp_obj_get_int(args[2]);
-    mp_int_t y0 = mp_obj_get_int(args[3]);
-    mp_int_t col = 0xFFFF;
-    if (n_args >= 5) {
-        col = mp_obj_get_int(args[4]);
-    }
-    col = col & 0xFFFF;
-
-    // loop over chars
-    for (; *str; ++str) {
-        // get char and make sure its in range of font
-        int chr = *(uint8_t*)str;
-        if (chr < 32 || chr > 127) {
-            chr = 127;
-        }
-        // get char data
-        const char* chr_data = &font_petme128_8x8[(chr - 32) * 8];
-        // loop over char data
-        for (int j = 0; j < 8; j++, x0++) {
-            if (0 <= x0 && x0 < self->width) { // clip x
-                uint8_t vline_data = chr_data[j]; // each byte is a column of 8 pixels, LSB at top
-                for (int y = y0; vline_data; vline_data >>= 1, y++) { // scan over vertical column
-                    if (vline_data & 1) { // only draw if pixel set
-                        if (0 <= y && y < self->height) { // clip y
-                            _seq_ppix(self, x0, y, col);
-                        }
-                    }
-                }
-            }
-        }
-    }
-    return mp_const_none;
-}
-
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(modst7735_display_text_obj, 4, 5, modst7735_display_text);
-
-STATIC const mp_rom_map_elem_t modst7735_display_locals_dict_table[] = {
-    { MP_ROM_QSTR(MP_QSTR_mode), MP_ROM_PTR(&modst7735_display_mode_obj) },
-    { MP_ROM_QSTR(MP_QSTR_init), MP_ROM_PTR(&modst7735_display_init_obj) },
-    { MP_ROM_QSTR(MP_QSTR_rect), MP_ROM_PTR(&modst7735_display_rect_obj) },
-    { MP_ROM_QSTR(MP_QSTR_fill_rect), MP_ROM_PTR(&modst7735_display_fill_rect_obj) },
-    { MP_ROM_QSTR(MP_QSTR_fill), MP_ROM_PTR(&modst7735_display_fill_obj) },
-    { MP_ROM_QSTR(MP_QSTR_blit), MP_ROM_PTR(&modst7735_display_blit_obj) },
-    { MP_ROM_QSTR(MP_QSTR_pixel), MP_ROM_PTR(&modst7735_display_pixel_obj) },
-    { MP_ROM_QSTR(MP_QSTR_text), MP_ROM_PTR(&modst7735_display_text_obj) },
-};
-
-STATIC MP_DEFINE_CONST_DICT(modst7735_display_locals_dict, modst7735_display_locals_dict_table);
-
-STATIC const mp_obj_type_t modst7735_display_type = {
-    { &mp_type_type },
-    .name=MP_QSTR_Display,
-    .make_new=modst7735_display_make_new,
-    .print=modst7735_display_print,
-    .locals_dict=(mp_obj_dict_t*) &modst7735_display_locals_dict,
-};
-
-STATIC const mp_map_elem_t mp_modst7735_globals_table[] = {
-    { MP_OBJ_NEW_QSTR(MP_QSTR___name__), MP_OBJ_NEW_QSTR(MP_QSTR_st7735) },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_Display), (mp_obj_t)MP_ROM_PTR(&modst7735_display_type) },
-};
-
-STATIC MP_DEFINE_CONST_DICT(mp_modst7735_globals, mp_modst7735_globals_table);
-
-const mp_obj_module_t st7735_module = {
-    .base = { &mp_type_module },
-    .globals = (mp_obj_dict_t*) &mp_modst7735_globals,
-};
-
diff --git a/ports/gprs_a9/modst7735.h b/ports/gprs_a9/modst7735.h
deleted file mode 100644
index 7ea8a756d1c48..0000000000000
--- a/ports/gprs_a9/modst7735.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#define SWRESET 0x01
-#define SLPOUT  0x11
-#define NORON  0x13
-#define INVOFF 0x20
-#define DISPON 0x29
-#define CASET 0x2A
-#define RASET 0x2B
-#define RAMWR 0x2C
-#define MADCTL 0x36
-#define COLMOD 0x3A
-#define FRMCTR1 0xB1
-#define FRMCTR2 0xB2
-#define FRMCTR3 0xB3
-#define INVCTR 0xB4
-#define PWCTR1 0xC0
-#define PWCTR2 0xC1
-#define PWCTR3 0xC2
-#define PWCTR4 0xC3
-#define PWCTR5 0xC4
-#define VMCTR1 0xC5
-#define GMCTRP1 0xE0
-#define GMCTRN1 0xE1
diff --git a/ports/gprs_a9/mpconfigport.h b/ports/gprs_a9/mpconfigport.h
index b93d925102d5b..e0dec4b728d49 100644
--- a/ports/gprs_a9/mpconfigport.h
+++ b/ports/gprs_a9/mpconfigport.h
@@ -205,7 +205,6 @@ extern const struct _mp_obj_module_t cellular_module;
 extern const struct _mp_obj_module_t gps_module;
 extern const struct _mp_obj_module_t usocket_module;
 extern const struct _mp_obj_module_t i2c_module;
-extern const struct _mp_obj_module_t st7735_module;
 
 #if MICROPY_PY_USSL
 #define SSL_BUILTIN_MODULE_WEAK_LINKS    { MP_OBJ_NEW_QSTR(MP_QSTR_ssl), (mp_obj_t)&mp_module_ussl }, \
@@ -225,7 +224,6 @@ extern const struct _mp_obj_module_t st7735_module;
     { MP_OBJ_NEW_QSTR(MP_QSTR_gps), (mp_obj_t)&gps_module }, \
     { MP_OBJ_NEW_QSTR(MP_QSTR_usocket), (mp_obj_t)&usocket_module }, \
     { MP_OBJ_NEW_QSTR(MP_QSTR_i2c), (mp_obj_t)&i2c_module }, \
-    { MP_OBJ_NEW_QSTR(MP_QSTR_st7735), (mp_obj_t)&st7735_module }, \
 
 #define MICROPY_PORT_BUILTIN_MODULE_WEAK_LINKS \
     { MP_OBJ_NEW_QSTR(MP_QSTR_binascii), (mp_obj_t)&mp_module_ubinascii }, \

From a115cc5fd43c51f4851f7f64e9ef64593112e706 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Thu, 28 May 2020 00:25:37 +0200
Subject: [PATCH 3488/3533] update patches for the new csdk

---
 ports/gprs_a9/build-libcsdk.sh             | 2 +-
 ports/gprs_a9/libcsdk-patches/patch-lod.py | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ports/gprs_a9/build-libcsdk.sh b/ports/gprs_a9/build-libcsdk.sh
index 2cb9ee25072c6..4455cc80fd48d 100755
--- a/ports/gprs_a9/build-libcsdk.sh
+++ b/ports/gprs_a9/build-libcsdk.sh
@@ -23,7 +23,7 @@ fi
 function apply_patches()
 {
     echo ">> patching csdk lod"
-    ./libcsdk-patches/patch-lod.py ../../lib/GPRS_C_SDK/platform/csdk/debug/SW_V2129_csdk.lod
+    ./libcsdk-patches/patch-lod.py ../../lib/GPRS_C_SDK/platform/csdk/debug/SW_V2131_csdk.lod
 }
 
 function generate_CSDK_lib()
diff --git a/ports/gprs_a9/libcsdk-patches/patch-lod.py b/ports/gprs_a9/libcsdk-patches/patch-lod.py
index 8dfd1c1907632..7bd7c8d241a15 100755
--- a/ports/gprs_a9/libcsdk-patches/patch-lod.py
+++ b/ports/gprs_a9/libcsdk-patches/patch-lod.py
@@ -4,10 +4,10 @@
 fname, = sys.argv[1:]
 nop = "0065"
 patch_list = {
-    0x08185a14: ("Issue 28 -- user name", bytes.fromhex('c0c2c1c2c2c2c3c2'), bytes.fromhex('c0c2' + (nop * 3))),
-    0x08185a46: ("Issue 28 -- password", bytes.fromhex('a0c2a1c2a2c2a3c2'), bytes.fromhex('a0c2' + (nop * 3))),
-    0x08185a74: ("Issue 28 -- APN", bytes.fromhex('80c281c282c283c2'), bytes.fromhex('80c2' + (nop * 3))),
-    0x0817aa3e: ("Issue 50 -- double socket.connect", bytes.fromhex('701836ea'), bytes.fromhex(nop * 2)),
+    0x08187034: ("Issue 28 -- user name (ApiPdpContextToCFWPdpContext)", bytes.fromhex('c0c2c1c2c2c2c3c2'), bytes.fromhex('c0c2' + (nop * 3))),
+    0x08187066: ("Issue 28 -- password (ApiPdpContextToCFWPdpContext)", bytes.fromhex('a0c2a1c2a2c2a3c2'), bytes.fromhex('a0c2' + (nop * 3))),
+    0x08187094: ("Issue 28 -- APN (ApiPdpContextToCFWPdpContext)", bytes.fromhex('80c281c282c283c2'), bytes.fromhex('80c2' + (nop * 3))),
+    0x0817c05a: ("Issue 50 -- double socket.connect (tcp_connect)", bytes.fromhex('7018ccec'), bytes.fromhex(nop * 2)),
 }
 keys_l = sorted(patch_list.keys())
 

From 2b01cc7b102ab1d16b93a7950bd060f6f5be5c68 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Thu, 28 May 2020 00:26:00 +0200
Subject: [PATCH 3489/3533] update errno for the new csdk

---
 ports/gprs_a9/ram_pointers.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/gprs_a9/ram_pointers.h b/ports/gprs_a9/ram_pointers.h
index a92de7d77c15f..bb8c1fdab3dd9 100644
--- a/ports/gprs_a9/ram_pointers.h
+++ b/ports/gprs_a9/ram_pointers.h
@@ -27,5 +27,5 @@
  */
 
 // This file is a fucking shame and it may work only with a particular SDK version
-#define errno (*((volatile int *) 0x820a0c14))
+#define errno (*((volatile int *) 0x820a0cb0))
 

From 85027f2372c9b5855156ed3e6c6086550a5678a4 Mon Sep 17 00:00:00 2001
From: arlucio <arlucio.dev@gmail.com>
Date: Mon, 25 May 2020 12:08:29 -0700
Subject: [PATCH 3490/3533] Added last version of a9_gprs submodules, including
 new csdtk42 version.

---
 .gitmodules | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitmodules b/.gitmodules
index 097689b0a6215..bee11ab9364f6 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -29,7 +29,7 @@
 	url = https://github.com/hathach/tinyusb
 [submodule "lib/mynewt-nimble"]
 	path = lib/mynewt-nimble
-	url = https://github.com/micropython/mynewt-nimble.git
+	url = https://github.com/apache/mynewt-nimble.git
 [submodule "lib/btstack"]
 	path = lib/btstack
 	url = https://github.com/bluekitchen/btstack.git

From 6230572edff7c34147ee43c47397cdc7d6c1f166 Mon Sep 17 00:00:00 2001
From: arlucio <arlucio.dev@gmail.com>
Date: Mon, 25 May 2020 13:10:30 -0700
Subject: [PATCH 3491/3533] created boards/manifest.py deleted files and lines
 related to modst7735 and blink added uasyncio fix confliting types for
 'mp_handle_pending' related problems cleanup of weak_links related lines as
 explained in this commit:
 https://github.com/micropython/micropython/commit/d2384efa809953152c57cbda4c339dfbaa64cf29#diff-b9499fc8ad5b9793822626f6befdb1b6

---
 ports/gprs_a9/Makefile                 | 39 +++++++-----------
 ports/gprs_a9/boards/manifest.py       |  4 ++
 ports/gprs_a9/modules/blink.py         | 12 ------
 ports/gprs_a9/modules/upip.py          |  1 -
 ports/gprs_a9/modules/upip_utarfile.py |  1 -
 ports/gprs_a9/mpconfigport.h           | 57 +++++++-------------------
 6 files changed, 33 insertions(+), 81 deletions(-)
 create mode 100644 ports/gprs_a9/boards/manifest.py
 delete mode 100644 ports/gprs_a9/modules/blink.py
 delete mode 120000 ports/gprs_a9/modules/upip.py
 delete mode 120000 ports/gprs_a9/modules/upip_utarfile.py

diff --git a/ports/gprs_a9/Makefile b/ports/gprs_a9/Makefile
index 9c46d3cd6a4fe..72110df05be70 100644
--- a/ports/gprs_a9/Makefile
+++ b/ports/gprs_a9/Makefile
@@ -1,4 +1,4 @@
-mkfile_path := $(abspath $(lastword $(MAKEFILE_LIST)))  #获�当�正在执行的makefile的�对路径
+mkfile_path := $(abspath $(lastword $(MAKEFILE_LIST)))  
 PATH_CURR := $(strip $(patsubst %/, %, $(dir ${mkfile_path})))
 PATH_MICROPY := $(strip $(patsubst %/ports/, %, $(dir ${PATH_CURR})))
 CSDK_PATH := ${PATH_MICROPY}/lib/GPRS_C_SDK
@@ -25,14 +25,20 @@ $(info Compile Version:$(CFG_RELEASE))
 # qstr definitions (must come before including py.mk)
 QSTR_DEFS = qstrdefsport.h
 
-
-
 #############################################
 
+# MicroPython feature configurations
+MICROPY_PY_USSL = 1
+MICROPY_SSL_AXTLS = 1
+AXTLS_DEFS_EXTRA = -Dabort=abort_ -include time.h -DRT_MAX_PLAIN_LENGTH=1024 -DRT_EXTRA=4096
 
-FROZEN_MPY_DIR ?= modules
+FROZEN_MANIFEST ?= boards/manifest.py
+
+# include py core make definitions
+include $(TOP)/py/py.mk
 
 #############################################
+
 CROSS_COMPILE = $(CSDTK_PATH)/bin/mips-elf-
 MAKE = make
 LD  := $(CROSS_COMPILE)ld
@@ -86,14 +92,9 @@ LDFLAGS	+= -L${LIBGCC_PATH} -lgcc
 LDFLAGS += --warn-common  --error-unresolved-symbols 
 FULL_SRC_OBJECTS := 
 LD_OPTIONAL_OBJECTS := 
-########################################3###
+
 INC += -I.
 INC += -I$(TOP)
-# INC += -I$(TOP)/lib/axtls/crypto
-# INC += -I$(TOP)/lib/axtls/ssl
-# INC += -I$(TOP)/extmod/axtls-include
-# INC += -I$(TOP)/extmod/crypto-algorithms
-# INC += -I$(TOP)/lib/netutils
 INC += -I$(BUILD_PATH_ABS)
 INC += -I${CSDK_PATH}/include \
        -I${CSDK_PATH}/include/std_inc \
@@ -119,8 +120,6 @@ CFLAGS += $(CFLAGS_MOD)
 
 ASFLAGS = --warn -EL -march=xcpu -mtune=xcpu
 
-LIBS =
-
 SRC_C = \
 	main.c \
 	posix_helpers.c \
@@ -147,11 +146,11 @@ SRC_C = \
 
 LIB_SRC_C = $(addprefix lib/,\
 	mp-readline/readline.c \
+	netutils/netutils.c \
+	timeutils/timeutils.c \
 	utils/pyexec.c \
 	utils/interrupt_char.c \
 	utils/sys_stdio_mphal.c \
-	timeutils/timeutils.c \
-	netutils/netutils.c \
 	)
 
 LIB_SRC_C += \
@@ -165,12 +164,6 @@ DRIVERS_SRC_C = $(addprefix drivers/,\
 SRC_S = \
 	gchelper.s
 
-MICROPY_PY_USSL = 1
-MICROPY_SSL_AXTLS = 1
-AXTLS_DEFS_EXTRA = -Dabort=abort_ -include time.h -DRT_MAX_PLAIN_LENGTH=1024 -DRT_EXTRA=4096
-# include py core make definitions
-include $(TOP)/py/py.mk
-
 OBJ_MP =
 OBJ_MP += $(PY_O)
 OBJ_MP += $(addprefix $(BUILD)/, $(SRC_C:.c=.o))
@@ -246,8 +239,4 @@ targetgen:
 	@${ECHO} "#############################################"    >> $(TARGET_FILE)
 
 
-
-
-
-
-include $(TOP)/py/mkrules.mk
+include $(TOP)/py/mkrules.mk
\ No newline at end of file
diff --git a/ports/gprs_a9/boards/manifest.py b/ports/gprs_a9/boards/manifest.py
new file mode 100644
index 0000000000000..b10022332dd53
--- /dev/null
+++ b/ports/gprs_a9/boards/manifest.py
@@ -0,0 +1,4 @@
+freeze("$(PORT_DIR)/modules")
+freeze("$(MPY_DIR)/tools", ("upip.py", "upip_utarfile.py"))
+freeze("$(MPY_DIR)/ports/esp8266/modules", "ntptime.py")
+include("$(MPY_DIR)/extmod/uasyncio/manifest.py")
diff --git a/ports/gprs_a9/modules/blink.py b/ports/gprs_a9/modules/blink.py
deleted file mode 100644
index 9867110cc14de..0000000000000
--- a/ports/gprs_a9/modules/blink.py
+++ /dev/null
@@ -1,12 +0,0 @@
-import machine
-import time
-
-def blink(interval):
-    print("blink")
-    led = machine.Pin(27, machine.Pin.OUT, 0)
-    value = 1
-    while True:
-        led.value(value)
-        time.sleep(interval)
-        value = 0 if (value==1) else 1
-
diff --git a/ports/gprs_a9/modules/upip.py b/ports/gprs_a9/modules/upip.py
deleted file mode 120000
index 130eb69016485..0000000000000
--- a/ports/gprs_a9/modules/upip.py
+++ /dev/null
@@ -1 +0,0 @@
-../../../tools/upip.py
\ No newline at end of file
diff --git a/ports/gprs_a9/modules/upip_utarfile.py b/ports/gprs_a9/modules/upip_utarfile.py
deleted file mode 120000
index d9653d6a60808..0000000000000
--- a/ports/gprs_a9/modules/upip_utarfile.py
+++ /dev/null
@@ -1 +0,0 @@
-../../../tools/upip_utarfile.py
\ No newline at end of file
diff --git a/ports/gprs_a9/mpconfigport.h b/ports/gprs_a9/mpconfigport.h
index e0dec4b728d49..2a6f85033a89e 100644
--- a/ports/gprs_a9/mpconfigport.h
+++ b/ports/gprs_a9/mpconfigport.h
@@ -1,3 +1,6 @@
+// Options to control how MicroPython is built for this port,
+// overriding defaults in py/mpconfig.h.
+
 #ifndef __MPCONFIGPORT_H
 #define __MPCONFIGPORT_H
 
@@ -8,15 +11,15 @@
 // options to control how MicroPython is built
 
 
-#define MICROPY_DEBUG_VERBOSE       (0)
-#define MICROPY_DEBUG_PRINTER       (&mp_debug_print)
+#define MICROPY_DEBUG_VERBOSE               (0)
+#define MICROPY_DEBUG_PRINTER               (&mp_debug_print)
 
 
-#define MICROPY_OBJ_REPR            (MICROPY_OBJ_REPR_A)
-#define MICROPY_NLR_SETJMP          (1)
+#define MICROPY_OBJ_REPR                    (MICROPY_OBJ_REPR_A)
+#define MICROPY_NLR_SETJMP                  (1)
 
 // memory allocation policies
-#define MICROPY_ALLOC_PATH_MAX      (256)
+#define MICROPY_ALLOC_PATH_MAX              (256)
 
 
 // compiler configuration
@@ -30,6 +33,7 @@
 #define MICROPY_OPT_MPZ_BITWISE             (1)
 
 // Python internal features
+#define MICROPY_PY_SYS_EXC_INFO             (1)
 #define MICROPY_ENABLE_COMPILER             (1)
 #define MICROPY_REPL_EVENT_DRIVEN           (0)
 #define MICROPY_ENABLE_GC                   (1)
@@ -78,6 +82,7 @@
 #define MICROPY_PY_BUILTINS_SET             (1)
 #define MICROPY_PY_BUILTINS_SLICE           (1)
 #define MICROPY_PY_BUILTINS_SLICE_ATTRS     (1)
+#define MICROPY_PY_BUILTINS_SLICE_INDICES   (1)
 #define MICROPY_PY_BUILTINS_FROZENSET       (1)
 #define MICROPY_PY_BUILTINS_PROPERTY        (1)
 #define MICROPY_PY_BUILTINS_RANGE_ATTRS     (1)
@@ -129,6 +134,7 @@
 
 
 // extended modules
+#define MICROPY_PY_UASYNCIO                 (1)
 #define MICROPY_PY_UCTYPES                  (1)
 #define MICROPY_PY_UZLIB                    (1)
 #define MICROPY_PY_UJSON                    (1)
@@ -160,10 +166,7 @@
 // #define MICROPY_SSL_AXTLS                   (1)
 // #define MICROPY_SSL_MBEDTLS                 (1)
 // #define MICROPY_PY_USSL_FINALISER           (1)
-// #define MICROPY_PY_WEBSOCKET                (1)
-// #define MICROPY_PY_WEBREPL                  (1)
 #define MICROPY_PY_FRAMEBUF                 (1)
-// #define MICROPY_PY_USOCKET_EVENTS           (MICROPY_PY_WEBREPL)
 
 
 // fatfs configuration
@@ -206,15 +209,6 @@ extern const struct _mp_obj_module_t gps_module;
 extern const struct _mp_obj_module_t usocket_module;
 extern const struct _mp_obj_module_t i2c_module;
 
-#if MICROPY_PY_USSL
-#define SSL_BUILTIN_MODULE_WEAK_LINKS    { MP_OBJ_NEW_QSTR(MP_QSTR_ssl), (mp_obj_t)&mp_module_ussl }, \
-    { MP_OBJ_NEW_QSTR(MP_QSTR_hashlib), (mp_obj_t)(&mp_module_uhashlib) }, \
-    { MP_OBJ_NEW_QSTR(MP_QSTR_cryptolib), (mp_obj_t)(&mp_module_ucryptolib) }, \
-    { MP_OBJ_NEW_QSTR(MP_QSTR_ssl), (mp_obj_t)(&mp_module_ussl) },
-#else
-#define SSL_BUILTIN_MODULE_WEAK_LINKS
-#endif
-
 #define MICROPY_PORT_BUILTIN_MODULES \
     { MP_OBJ_NEW_QSTR(MP_QSTR_machine), (mp_obj_t)&mp_module_machine }, \
     { MP_OBJ_NEW_QSTR(MP_QSTR_uos), (mp_obj_t)&uos_module }, \
@@ -225,22 +219,6 @@ extern const struct _mp_obj_module_t i2c_module;
     { MP_OBJ_NEW_QSTR(MP_QSTR_usocket), (mp_obj_t)&usocket_module }, \
     { MP_OBJ_NEW_QSTR(MP_QSTR_i2c), (mp_obj_t)&i2c_module }, \
 
-#define MICROPY_PORT_BUILTIN_MODULE_WEAK_LINKS \
-    { MP_OBJ_NEW_QSTR(MP_QSTR_binascii), (mp_obj_t)&mp_module_ubinascii }, \
-    { MP_OBJ_NEW_QSTR(MP_QSTR_collections), (mp_obj_t)&mp_module_collections }, \
-    { MP_OBJ_NEW_QSTR(MP_QSTR_errno), (mp_obj_t)&mp_module_uerrno }, \
-    { MP_OBJ_NEW_QSTR(MP_QSTR_heapq), (mp_obj_t)&mp_module_uheapq }, \
-    { MP_OBJ_NEW_QSTR(MP_QSTR_io), (mp_obj_t)&mp_module_io }, \
-    { MP_OBJ_NEW_QSTR(MP_QSTR_json), (mp_obj_t)&mp_module_ujson }, \
-    { MP_OBJ_NEW_QSTR(MP_QSTR_os), (mp_obj_t)&uos_module }, \
-    { MP_OBJ_NEW_QSTR(MP_QSTR_socket), (mp_obj_t)&usocket_module }, \
-    { MP_OBJ_NEW_QSTR(MP_QSTR_time), (mp_obj_t)&utime_module }, \
-    { MP_OBJ_NEW_QSTR(MP_QSTR_random), (mp_obj_t)&mp_module_urandom }, \
-    { MP_OBJ_NEW_QSTR(MP_QSTR_re), (mp_obj_t)&mp_module_ure }, \
-    { MP_OBJ_NEW_QSTR(MP_QSTR_struct), (mp_obj_t)&mp_module_ustruct }, \
-    { MP_OBJ_NEW_QSTR(MP_QSTR_zlib), (mp_obj_t)&mp_module_uzlib }, \
-    SSL_BUILTIN_MODULE_WEAK_LINKS \
-
 // type definitions for the specific machine
 
 #define MICROPY_MAKE_POINTER_CALLABLE(p) ((void*)((mp_uint_t)(p) | 1))
@@ -258,15 +236,11 @@ typedef long mp_off_t;
 
 #define MP_PLAT_PRINT_STRN(str, len) mp_hal_stdout_tx_strn_cooked(str, len)
 
-// We need to provide a declaration/definition of alloca()
-// #include <stdlib.h>
-
 #define MICROPY_MPHALPORT_H "mphalport.h"
 #define MICROPY_HW_BOARD_NAME   "A9/A9G module"
 #define MICROPY_HW_MCU_NAME     "RDA8955"
 #define MICROPY_PY_SYS_PLATFORM "gprs_a9"
 
-
 #define MP_STATE_PORT MP_STATE_VM
 
 #define MICROPY_PORT_ROOT_POINTERS \
@@ -278,17 +252,16 @@ typedef long mp_off_t;
 #if MICROPY_PY_THREAD
 #define MICROPY_EVENT_POLL_HOOK \
     do { \
-        extern void mp_handle_pending(void); \
-        mp_handle_pending(); \
-        MICROPY_PY_USOCKET_EVENTS_HANDLER \
+        extern void mp_handle_pending(bool); \
+        mp_handle_pending(true); \
         MP_THREAD_GIL_EXIT(); \
         MP_THREAD_GIL_ENTER(); \
     } while (0);
 #else
 #define MICROPY_EVENT_POLL_HOOK \
     do { \
-        extern void mp_handle_pending(void); \
-        mp_handle_pending(); \
+        extern void mp_handle_pending(bool); \
+        mp_handle_pending(true); \
     } while (0);
 #endif
 

From 309e534573e4c80ee084e4615b40f19a9e0adebf Mon Sep 17 00:00:00 2001
From: arlucio <arlucio.dev@gmail.com>
Date: Mon, 25 May 2020 13:15:37 -0700
Subject: [PATCH 3492/3533] Changed &mp_const_none_obj to &mp_const_none_obj as
 explained in this commit:
 https://github.com/micropython/micropython/commit/09376f0e47b3ab4a5a2a3c2c768ff913e1835cc8

---
 ports/gprs_a9/file_io.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ports/gprs_a9/file_io.c b/ports/gprs_a9/file_io.c
index 04f64e2ea79e8..64c09e8b5cc05 100644
--- a/ports/gprs_a9/file_io.c
+++ b/ports/gprs_a9/file_io.c
@@ -147,9 +147,9 @@ STATIC mp_uint_t internal_flash_file_obj_ioctl(mp_obj_t o_in, mp_uint_t request,
 }
 
 STATIC const mp_arg_t file_open_args[] = {
-    { MP_QSTR_file, MP_ARG_OBJ | MP_ARG_REQUIRED, {.u_rom_obj = MP_ROM_PTR(&mp_const_none_obj)} },
+    { MP_QSTR_file, MP_ARG_OBJ | MP_ARG_REQUIRED, {.u_rom_obj = MP_ROM_PTR(MP_ROM_NONE)} },
     { MP_QSTR_mode, MP_ARG_OBJ, {.u_obj = MP_OBJ_NEW_QSTR(MP_QSTR_r)} },
-    { MP_QSTR_encoding, MP_ARG_OBJ | MP_ARG_KW_ONLY, {.u_rom_obj = MP_ROM_PTR(&mp_const_none_obj)} },
+    { MP_QSTR_encoding, MP_ARG_OBJ | MP_ARG_KW_ONLY, {.u_rom_obj = MP_ROM_PTR(MP_ROM_NONE)} },
 };
 
 #define FILE_OPEN_NUM_ARGS MP_ARRAY_SIZE(file_open_args)
@@ -263,10 +263,10 @@ mp_obj_t internal_flash_open(size_t n_args, const mp_obj_t *pos_args, mp_map_t *
     // TODO: binary mode
     enum { ARG_file, ARG_mode, ARG_encoding };
     static const mp_arg_t allowed_args[] = {
-        { MP_QSTR_file, MP_ARG_OBJ | MP_ARG_REQUIRED, {.u_rom_obj = MP_ROM_PTR(&mp_const_none_obj)} },
+        { MP_QSTR_file, MP_ARG_OBJ | MP_ARG_REQUIRED, {.u_rom_obj = MP_ROM_PTR(MP_ROM_NONE)} },
         { MP_QSTR_mode, MP_ARG_OBJ, {.u_rom_obj = MP_ROM_QSTR(MP_QSTR_r)} },
         { MP_QSTR_buffering, MP_ARG_INT, {.u_int = -1} },
-        { MP_QSTR_encoding, MP_ARG_OBJ, {.u_rom_obj = MP_ROM_PTR(&mp_const_none_obj)} },
+        { MP_QSTR_encoding, MP_ARG_OBJ, {.u_rom_obj = MP_ROM_PTR(MP_ROM_NONE)} },
     };
 
     // parse args

From aec610a1c1ff57559f8dfd2f861232af05d9b3ce Mon Sep 17 00:00:00 2001
From: arlucio <arlucio.dev@gmail.com>
Date: Mon, 25 May 2020 13:18:21 -0700
Subject: [PATCH 3493/3533] Fix errors related to posix functions and errno
 (reverting changes ath this file at upstream)

---
 py/stream.c | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/py/stream.c b/py/stream.c
index 36325e7d414a6..94e57de8b382d 100644
--- a/py/stream.c
+++ b/py/stream.c
@@ -514,12 +514,13 @@ MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_stream_ioctl_obj, 2, 3, stream_ioctl);
  * POSIX-compatible software to work with MicroPython streams.
  */
 
+int mp_stream_errno;
 #include <errno.h>
 
 ssize_t mp_stream_posix_write(void *stream, const void *buf, size_t len) {
     mp_obj_base_t *o = stream;
-    const mp_stream_p_t *stream_p = MP_OBJ_TYPE_GET_SLOT(o->type, protocol);
-    mp_uint_t out_sz = stream_p->write(MP_OBJ_FROM_PTR(stream), buf, len, &errno);
+    const mp_stream_p_t *stream_p = o->type->protocol;
+    mp_uint_t out_sz = stream_p->write(MP_OBJ_FROM_PTR(stream), buf, len, &mp_stream_errno);
     if (out_sz == MP_STREAM_ERROR) {
         return -1;
     } else {
@@ -529,8 +530,8 @@ ssize_t mp_stream_posix_write(void *stream, const void *buf, size_t len) {
 
 ssize_t mp_stream_posix_read(void *stream, void *buf, size_t len) {
     mp_obj_base_t *o = stream;
-    const mp_stream_p_t *stream_p = MP_OBJ_TYPE_GET_SLOT(o->type, protocol);
-    mp_uint_t out_sz = stream_p->read(MP_OBJ_FROM_PTR(stream), buf, len, &errno);
+    const mp_stream_p_t *stream_p = o->type->protocol;
+    mp_uint_t out_sz = stream_p->read(MP_OBJ_FROM_PTR(stream), buf, len, &mp_stream_errno);
     if (out_sz == MP_STREAM_ERROR) {
         return -1;
     } else {
@@ -544,7 +545,7 @@ off_t mp_stream_posix_lseek(void *stream, off_t offset, int whence) {
     struct mp_stream_seek_t seek_s;
     seek_s.offset = offset;
     seek_s.whence = whence;
-    mp_uint_t res = stream_p->ioctl(MP_OBJ_FROM_PTR(stream), MP_STREAM_SEEK, (mp_uint_t)(uintptr_t)&seek_s, &errno);
+    mp_uint_t res = stream_p->ioctl(MP_OBJ_FROM_PTR(stream), MP_STREAM_SEEK, (mp_uint_t)(uintptr_t)&seek_s, &mp_stream_errno);
     if (res == MP_STREAM_ERROR) {
         return -1;
     }
@@ -553,12 +554,12 @@ off_t mp_stream_posix_lseek(void *stream, off_t offset, int whence) {
 
 int mp_stream_posix_fsync(void *stream) {
     mp_obj_base_t *o = stream;
-    const mp_stream_p_t *stream_p = MP_OBJ_TYPE_GET_SLOT(o->type, protocol);
-    mp_uint_t res = stream_p->ioctl(MP_OBJ_FROM_PTR(stream), MP_STREAM_FLUSH, 0, &errno);
+    const mp_stream_p_t *stream_p = o->type->protocol;
+    mp_uint_t res = stream_p->ioctl(MP_OBJ_FROM_PTR(stream), MP_STREAM_FLUSH, 0, &mp_stream_errno);
     if (res == MP_STREAM_ERROR) {
         return -1;
     }
     return res;
 }
 
-#endif
+#endif
\ No newline at end of file

From b8601fc9b3600d9dfd2bd91c2f749c4328117fb9 Mon Sep 17 00:00:00 2001
From: arlucio <arlucio.dev@gmail.com>
Date: Mon, 25 May 2020 13:29:29 -0700
Subject: [PATCH 3494/3533] Not necessary to patch lod anymore as we are using
 the new csdk version

---
 ports/gprs_a9/build-libcsdk.sh             |  8 ---
 ports/gprs_a9/libcsdk-patches/patch-lod.py | 73 ----------------------
 2 files changed, 81 deletions(-)
 delete mode 100755 ports/gprs_a9/libcsdk-patches/patch-lod.py

diff --git a/ports/gprs_a9/build-libcsdk.sh b/ports/gprs_a9/build-libcsdk.sh
index 4455cc80fd48d..0379f16178d97 100755
--- a/ports/gprs_a9/build-libcsdk.sh
+++ b/ports/gprs_a9/build-libcsdk.sh
@@ -20,12 +20,6 @@ fi
 
 ###########################################################
 
-function apply_patches()
-{
-    echo ">> patching csdk lod"
-    ./libcsdk-patches/patch-lod.py ../../lib/GPRS_C_SDK/platform/csdk/debug/SW_V2131_csdk.lod
-}
-
 function generate_CSDK_lib()
 {
     echo ">> Generate CSDK lib now"
@@ -45,6 +39,4 @@ function generate_CSDK_lib()
     cd ${curr_path_abs}
 }
 
-apply_patches
 generate_CSDK_lib
-
diff --git a/ports/gprs_a9/libcsdk-patches/patch-lod.py b/ports/gprs_a9/libcsdk-patches/patch-lod.py
deleted file mode 100755
index 7bd7c8d241a15..0000000000000
--- a/ports/gprs_a9/libcsdk-patches/patch-lod.py
+++ /dev/null
@@ -1,73 +0,0 @@
-#!/usr/bin/env python3
-import sys, re
-
-fname, = sys.argv[1:]
-nop = "0065"
-patch_list = {
-    0x08187034: ("Issue 28 -- user name (ApiPdpContextToCFWPdpContext)", bytes.fromhex('c0c2c1c2c2c2c3c2'), bytes.fromhex('c0c2' + (nop * 3))),
-    0x08187066: ("Issue 28 -- password (ApiPdpContextToCFWPdpContext)", bytes.fromhex('a0c2a1c2a2c2a3c2'), bytes.fromhex('a0c2' + (nop * 3))),
-    0x08187094: ("Issue 28 -- APN (ApiPdpContextToCFWPdpContext)", bytes.fromhex('80c281c282c283c2'), bytes.fromhex('80c2' + (nop * 3))),
-    0x0817c05a: ("Issue 50 -- double socket.connect (tcp_connect)", bytes.fromhex('7018ccec'), bytes.fromhex(nop * 2)),
-}
-keys_l = sorted(patch_list.keys())
-
-address = None
-patching_in_progress = None
-patching_now = None
-checksum = 0
-data = []
-
-with open(fname, 'r') as f:
-    for n, line in enumerate(f):
-        if line.startswith("#"):
-            if line.startswith("#checksum"):
-                data.append("#checksum={:08x}\n".format(checksum))
-            else:
-                data.append(line)  # Comment line
-        elif line.startswith("@"):
-            address = int(line[1:], 16)
-            data.append(line)
-        else:
-            line_bytes = bytes.fromhex(line[:-1])[::-1]
-            address_to = address + len(line_bytes)
-            for address_p, (name, old, new) in patch_list.items():
-                address_p_to = address_p + len(old)
-                address_o = max(address, address_p)
-                address_o_to = min(address_to, address_p_to)
-                if address_o < address_o_to:
-                    if patching_in_progress is None:
-                        patching_in_progress = address_p
-                        print("{} @ 0x{:08x}".format(name, address_p))
-                    elif patching_in_progress != address_p:
-                        raise RuntimeError("Failed to patch 0x{:08x}: overlapping addresses".format(patching_in_progress))
-                    current_patch = line_bytes[address_o - address:address_o_to - address]
-                    old_patch = old[address_o - address_p:address_o_to - address_p]
-                    new_patch = new[address_o - address_p:address_o_to - address_p]
-                    if old_patch != new_patch:
-                        if new_patch == current_patch:
-                            if patching_now in (None, False):
-                                print("  .", end=" ")
-                                patching_now = False
-                            else:
-                                raise RuntimeError("Failed to patch 0x{:08x}: data mismatch".format(patching_in_progress))
-                        elif old_patch == current_patch:
-                            if patching_now in (None, True):
-                                print("  ✓", end=" ")
-                                patching_now = True
-                                line_bytes = line_bytes[:address_o - address] + new_patch + line_bytes[address_o_to - address:]
-                            else:
-                                raise RuntimeError("Failed to patch 0x{:08x}: data mismatch".format(patching_in_progress))
-                        else:
-                            raise RuntimeError("Failed to patch 0x{:08x}: data mismatch".format(patching_in_progress))
-                        print("{:d}:{:d}".format(address_o - address_p, address_o_to - address_p))
-                    if address_o_to == address_p_to:
-                        patching_in_progress = None
-                        patching_now = None
-            address = address_to
-            checksum += int.from_bytes(line_bytes, 'little')
-            checksum = checksum & 0xFFFFFFFF
-            data.append(line_bytes[::-1].hex()+"\n")
-with open(fname, 'w') as f:
-    f.write(''.join(data))
-print("Done")
-

From 5583c49015709327656d0ce6fc06965c14b846ea Mon Sep 17 00:00:00 2001
From: arlucio <arlucio.dev@gmail.com>
Date: Mon, 25 May 2020 13:51:37 -0700
Subject: [PATCH 3495/3533] Fix errors related to posix functions and errno
 (reverting changes ath this file at upstream)

---
 extmod/extmod.mk | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/extmod/extmod.mk b/extmod/extmod.mk
index 08138ead56a17..827482a29ade0 100644
--- a/extmod/extmod.mk
+++ b/extmod/extmod.mk
@@ -111,10 +111,8 @@ ifeq ($(MICROPY_PY_USSL),1)
 CFLAGS_EXTMOD += -DMICROPY_PY_USSL=1
 ifeq ($(MICROPY_SSL_AXTLS),1)
 AXTLS_DIR = lib/axtls
-GIT_SUBMODULES += $(AXTLS_DIR)
-CFLAGS_EXTMOD += -DMICROPY_SSL_AXTLS=1 -I$(TOP)/lib/axtls/ssl -I$(TOP)/lib/axtls/crypto -I$(TOP)/extmod/axtls-include
-$(BUILD)/$(AXTLS_DIR)/%.o: CFLAGS += -Wno-all -Wno-unused-parameter -Wno-uninitialized -Wno-sign-compare -Wno-old-style-definition -Dmp_stream_errno=errno $(AXTLS_DEFS_EXTRA)
-SRC_THIRDPARTY_C += $(addprefix $(AXTLS_DIR)/,\
+$(BUILD)/$(AXTLS_DIR)/%.o: CFLAGS += -Wno-all -Wno-unused-parameter -Wno-uninitialized -Wno-sign-compare -Wno-old-style-definition $(AXTLS_DEFS_EXTRA)
+SRC_MOD += $(addprefix $(AXTLS_DIR)/,\
 	ssl/asn1.c \
 	ssl/loader.c \
 	ssl/tls1.c \

From 7ce4df94c65247b5b77bf8b1a643fd80565d5744 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sun, 14 Jun 2020 22:54:25 +0200
Subject: [PATCH 3496/3533] fix single-script test

---
 ports/gprs_a9/frozentest.py | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/ports/gprs_a9/frozentest.py b/ports/gprs_a9/frozentest.py
index b9dc631aa0042..ae98e55386278 100644
--- a/ports/gprs_a9/frozentest.py
+++ b/ports/gprs_a9/frozentest.py
@@ -298,9 +298,6 @@
     print("SMS")
     print("----------------")
 
-    sms_received = cel.SMS.poll()
-    print("SMS received count:", sms_received)
-
     sms_list = cel.SMS.list()
     print("SMS:", sms_list)
     assert len(sms_list) > 0
@@ -322,9 +319,9 @@
         # LEBARA NL credentials
         assert cel.gprs("internet", "", "")
 
-        cb = cel.network_status_changed()
-        print("Status changed:", cb, "->", cel.get_network_status())
-        assert cb
+        status = cel.get_network_status()
+        print("Status:", status)
+        assert status == 17
 
         import socket as sock
         loc_ip = sock.get_local_ip()

From e70a865b21614880366f42858a5209641e7b46e9 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sun, 14 Jun 2020 22:54:42 +0200
Subject: [PATCH 3497/3533] add a full module list to README

---
 ports/gprs_a9/README.md | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/ports/gprs_a9/README.md b/ports/gprs_a9/README.md
index a2b9af9495a06..54cfa6d2b32ed 100644
--- a/ports/gprs_a9/README.md
+++ b/ports/gprs_a9/README.md
@@ -93,6 +93,25 @@ See [examples](examples) folder.
 
 ## API
 
+Full module list
+```python
+>>> help('modules')
+__main__          math              ubinascii         urandom
+_boot             micropython       ucollections      ure
+_uasyncio         network           ucryptolib        uselect
+builtins          ntptime           uctypes           usocket
+cellular          sys               uerrno            ussl
+chip              uarray            uhashlib          ustruct
+cmath             uasyncio/__init__ uheapq            utime
+framebuf          uasyncio/core     uio               utimeq
+gc                uasyncio/event    ujson             uzlib
+gps               uasyncio/funcs    uos
+i2c               uasyncio/lock     upip
+machine           uasyncio/stream   upip_utarfile
+```
+
+Featured:
+
 1. [`cellular`](#cellular), `network`: SMS, calls, connectivity
 2. [`usocket`](#usocket): sockets over GPRS
 3. [`ssl`](#ussl): SSL over sockets

From e0f9daab9b8395c8e9901aa76a88b7a5115b9d93 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sun, 14 Jun 2020 22:57:49 +0200
Subject: [PATCH 3498/3533] remove unnecessary builds from azure

---
 azure-pipelines.yml | 342 --------------------------------------------
 1 file changed, 342 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index c2d308c06c07f..7c1d484934615 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -8,251 +8,6 @@ stages:
 - stage: build
   displayName: 'Test and build'
   jobs:
-  - job: port_stm32
-    displayName: 'stm32 port build'
-    pool:
-      vmImage: 'ubuntu-latest'
-  
-    steps:
-    - checkout: self
-
-    - script: git submodule update --init lib/lwip lib/mbedtls lib/stm32lib
-      displayName: 'Checkout submodules'
-
-    - script: |
-        sudo add-apt-repository -y ppa:team-gcc-arm-embedded/ppa
-        sudo apt-get update -qq || true
-        sudo apt-get install gcc-arm-embedded
-        sudo apt-get install libnewlib-arm-none-eabi
-        arm-none-eabi-gcc --version
-      displayName: 'Install dependencies'
-  
-    - script: |
-        make $(MAKEOPTS) -C mpy-cross
-        make $(MAKEOPTS) -C ports/stm32
-        make $(MAKEOPTS) -C ports/stm32 BOARD=PYBV11 MICROPY_PY_WIZNET5K=5200 MICROPY_PY_CC3K=1
-        make ${MAKEOPTS} -C ports/stm32 BOARD=PYBD_SF2
-        make ${MAKEOPTS} -C ports/stm32 BOARD=STM32F769DISC CFLAGS_EXTRA='-DMICROPY_PY_THREAD=1'
-        make $(MAKEOPTS) -C ports/stm32 BOARD=STM32L476DISC
-        make ${MAKEOPTS} -C ports/stm32/mboot BOARD=PYBD_SF6
-      displayName: 'Build'
-  
-  - job: port_qemu_arm
-    displayName: 'qemu-arm port build and tests'
-    pool:
-      vmImage: 'ubuntu-latest'
-  
-    steps:
-    - checkout: self
-  
-    - script: |
-        sudo apt-get update
-        sudo apt-get install gcc-arm-none-eabi
-        sudo apt-get install libnewlib-arm-none-eabi
-        sudo apt-get install qemu-system
-        arm-none-eabi-gcc --version
-        qemu-system-arm --version
-      displayName: 'Install dependencies'
-  
-    - script: |
-        make $(MAKEOPTS) -C mpy-cross
-        make $(MAKEOPTS) -C ports/qemu-arm -f Makefile.test test
-      displayName: 'Build'
-  
-  - job: test_unix
-    displayName: 'unix coverage build and tests'
-    pool:
-      vmImage: 'ubuntu-latest'
-  
-    steps:
-    - checkout: self
-      submodules: recursive
-
-    - script: git submodule update --init lib/axtls lib/berkeley-db-1.xx lib/libffi
-      displayName: 'Checkout submodules'
-  
-    - script: |
-        sudo pip install cpp-coveralls
-        gcc --version
-        python3 --version
-      displayName: 'Install dependencies'
-  
-    - script: |
-        make $(MAKEOPTS) -C mpy-cross
-        make $(MAKEOPTS) -C ports/unix deplibs
-        make $(MAKEOPTS) -C ports/unix coverage
-        # run the main test suite
-        (cd tests && MICROPY_CPYTHON3=python3 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests)
-        (cd tests && MICROPY_CPYTHON3=python3 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests -d thread)
-        (cd tests && MICROPY_CPYTHON3=python3 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests --emit native)
-        (cd tests && MICROPY_CPYTHON3=python3 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests --via-mpy -d basics float micropython)
-        (cd tests && MICROPY_CPYTHON3=python3 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests --via-mpy --emit native -d basics float micropython)
-        # test when input script comes from stdin
-        cat tests/basics/0prelim.py | ports/unix/micropython_coverage | grep -q 'abc'
-        # run coveralls coverage analysis (try to, even if some builds/tests failed)
-        # (cd ports/unix && coveralls --root ../.. --build-root . --gcov $(which gcov) --gcov-options '\-o build-coverage/' --include py --include extmod)
-      displayName: 'Test'
-  
-  - job: port_unix
-    displayName: 'unix port build and tests'
-    pool:
-      vmImage: 'ubuntu-latest'
-  
-    steps:
-    - checkout: self
-
-    - script: git submodule update --init lib/axtls lib/berkeley-db-1.xx lib/libffi
-      displayName: 'Checkout submodules'
-  
-    - script: |
-        make $(MAKEOPTS) -C mpy-cross
-        make $(MAKEOPTS) -C ports/unix deplibs
-        make $(MAKEOPTS) -C ports/unix
-        make $(MAKEOPTS) -C ports/unix test
-        (cd tests && MICROPY_CPYTHON3=python3 MICROPY_MICROPYTHON=../ports/unix/micropython ./run-perfbench.py 1000 1000)
-      displayName: 'Build'
-
-    - task: PublishPipelineArtifact@1
-      displayName: 'Collect the build'
-      inputs:
-        targetPath: '$(Build.Repository.LocalPath)/ports/unix/micropython'
-        artifact: 'build_unix'
-  
-  - job: port_unix_nanbox
-    displayName: 'unix nanbox port build and tests'
-    pool:
-      vmImage: 'ubuntu-latest'
-  
-    steps:
-    - checkout: self
-
-    - script: git submodule update --init lib/axtls lib/berkeley-db-1.xx lib/libffi
-      displayName: 'Checkout submodules'
-  
-    - script: |
-        sudo dpkg --add-architecture i386
-        sudo apt-get update
-        sudo apt-get install gcc-multilib libffi-dev:i386
-      displayName: 'Install dependencies'
-  
-    - script: |
-        make $(MAKEOPTS) -C mpy-cross
-        make $(MAKEOPTS) -C ports/unix deplibs
-        make $(MAKEOPTS) -C ports/unix nanbox
-        (cd tests && MICROPY_CPYTHON3=python3 MICROPY_MICROPYTHON=../ports/unix/micropython_nanbox ./run-tests)
-      displayName: 'Build'
-  
-  - job: port_unix_stackless
-    displayName: 'unix stackless port build and tests with clang'
-    pool:
-      vmImage: 'ubuntu-latest'
-  
-    steps:
-    - checkout: self
-
-    - script: git submodule update --init lib/axtls lib/berkeley-db-1.xx lib/libffi
-      displayName: 'Checkout submodules'
-
-    - script: |
-        sudo apt-get install clang
-      displayName: 'Install dependencies'
-  
-    - script: |
-        make ${MAKEOPTS} -C mpy-cross CC=clang
-        make ${MAKEOPTS} -C ports/unix CC=clang CFLAGS_EXTRA="-DMICROPY_STACKLESS=1 -DMICROPY_STACKLESS_STRICT=1"
-        make ${MAKEOPTS} -C ports/unix CC=clang test
-      displayName: 'Build'
-
-  - job: port_unix_systrace
-    displayName: 'unix port with sys.settrace build and tests'
-    pool:
-      vmImage: 'ubuntu-latest'
-  
-    steps:
-    - checkout: self
-  
-    - script: |
-        make ${MAKEOPTS} -C mpy-cross
-        make ${MAKEOPTS} -C ports/unix MICROPY_PY_BTREE=0 MICROPY_PY_FFI=0 MICROPY_PY_USSL=0 CFLAGS_EXTRA="-DMICROPY_PY_SYS_SETTRACE=1" test
-        make ${MAKEOPTS} -C ports/unix clean
-        make ${MAKEOPTS} -C ports/unix MICROPY_PY_BTREE=0 MICROPY_PY_FFI=0 MICROPY_PY_USSL=0 CFLAGS_EXTRA="-DMICROPY_STACKLESS=1 -DMICROPY_STACKLESS_STRICT=1 -DMICROPY_PY_SYS_SETTRACE=1" test
-      displayName: 'Build'
-  
-  - job: port_mingw
-    displayName: 'windows port build via mingw'
-    pool:
-      vmImage: 'ubuntu-latest'
-  
-    steps:
-    - checkout: self
-  
-    - script: |
-        sudo apt-get install gcc-mingw-w64
-      displayName: 'Install dependencies'
-  
-    - script: |
-        make $(MAKEOPTS) -C mpy-cross
-        make $(MAKEOPTS) -C ports/windows CROSS_COMPILE=i686-w64-mingw32-
-      displayName: 'Build'
-  
-  - job: port_esp32_idfv3
-    displayName: 'esp32 port build IDF v3'
-    pool:
-      vmImage: 'ubuntu-latest'
-  
-    steps:
-    - checkout: self
-
-    - script: git submodule update --init lib/berkeley-db-1.xx
-      displayName: 'Checkout submodules'
-  
-    - script: |
-        sudo apt-get install python-pip python3-pip
-        sudo pip3 install 'pyparsing<2.4'
-        sudo pip install pyserial
-        wget https://dl.espressif.com/dl/xtensa-esp32-elf-linux64-1.22.0-80-g6c4433a-5.2.0.tar.gz
-        zcat xtensa-esp32-elf-linux64-1.22.0-80-g6c4433a-5.2.0.tar.gz | tar x
-        git clone https://github.com/espressif/esp-idf.git
-        git -C esp-idf checkout $(grep "ESPIDF_SUPHASH_V3 :=" ports/esp32/Makefile | cut -d " " -f 3)
-        git -C esp-idf submodule update --init components/json/cJSON components/esp32/lib components/esptool_py/esptool components/expat/expat components/lwip/lwip components/mbedtls/mbedtls components/micro-ecc/micro-ecc components/nghttp/nghttp2
-      displayName: 'Install dependencies and toolchain'
-  
-    - script: |
-        export PATH=$(pwd)/xtensa-esp32-elf/bin:$PATH
-        export IDF_PATH=$(pwd)/esp-idf
-        make ${MAKEOPTS} -C mpy-cross
-        make ${MAKEOPTS} -C ports/esp32 ESPIDF=$(pwd)/esp-idf
-      displayName: 'Build'
-  
-  - job: port_esp32_idfv4
-    displayName: 'esp32 port build IDF v4'
-    pool:
-      vmImage: 'ubuntu-latest'
-  
-    steps:
-    - checkout: self
-
-    - script: git submodule update --init lib/berkeley-db-1.xx
-      displayName: 'Checkout submodules'
-  
-    - script: |
-        sudo apt-get install python-pip python3-pip
-        sudo pip3 install 'pyparsing<2.4'
-        sudo pip install pyserial
-        wget https://dl.espressif.com/dl/xtensa-esp32-elf-linux64-1.22.0-80-g6c4433a-5.2.0.tar.gz
-        zcat xtensa-esp32-elf-linux64-1.22.0-80-g6c4433a-5.2.0.tar.gz | tar x
-        git clone https://github.com/espressif/esp-idf.git
-        git -C esp-idf checkout $(grep "ESPIDF_SUPHASH_V4 :=" ports/esp32/Makefile | cut -d " " -f 3)
-        git -C esp-idf submodule update --init components/esp_wifi/lib_esp32 components/esptool_py/esptool components/lwip/lwip components/mbedtls/mbedtls
-      displayName: 'Install dependencies and toolchain'
-  
-    - script: |
-        export PATH=$(pwd)/xtensa-esp32-elf/bin:$PATH
-        export IDF_PATH=$(pwd)/esp-idf
-        make ${MAKEOPTS} -C mpy-cross
-        make ${MAKEOPTS} -C ports/esp32 ESPIDF=$(pwd)/esp-idf
-      displayName: 'Build'
-  
   - job: port_esp8266
     displayName: 'esp8266 port build'
     pool:
@@ -290,103 +45,6 @@ stages:
         targetPath: '$(Build.Repository.LocalPath)/ports/esp8266/build'
         artifact: 'build_esp8266'
   
-  - job: port_nrf
-    displayName: 'nrf port build'
-    pool:
-      vmImage: 'ubuntu-latest'
-  
-    steps:
-    - checkout: self
-  
-    - script: git submodule update --init lib/nrfx
-      displayName: 'Checkout submodules'
-
-    - script: |
-        sudo apt-get install gcc-arm-none-eabi
-        sudo apt-get install libnewlib-arm-none-eabi
-        arm-none-eabi-gcc --version
-      displayName: 'Install dependencies'
-  
-    - script: |
-        make ${MAKEOPTS} -C ports/nrf
-      displayName: 'Build'
-  
-  - job: port_bare_arm
-    displayName: 'bare-arm and minimal ports build'
-    pool:
-      vmImage: 'ubuntu-latest'
-  
-    steps:
-    - checkout: self
-  
-    - script: |
-        sudo apt-get install gcc-arm-none-eabi
-        sudo apt-get install libnewlib-arm-none-eabi
-        arm-none-eabi-gcc --version
-      displayName: 'Install dependencies'
-  
-    - script: |
-        make ${MAKEOPTS} -C ports/bare-arm
-        make ${MAKEOPTS} -C ports/minimal CROSS=1 build/firmware.bin
-        ls -l ports/minimal/build/firmware.bin
-        tools/check_code_size.sh
-      displayName: 'Build'
-  
-  - job: port_cc3200
-    displayName: 'cc3200 port build'
-    pool:
-      vmImage: 'ubuntu-latest'
-  
-    steps:
-    - checkout: self
-  
-    - script: |
-        sudo apt-get install gcc-arm-none-eabi
-        sudo apt-get install libnewlib-arm-none-eabi
-      displayName: 'Install dependencies'
-  
-    - script: |
-        make ${MAKEOPTS} -C ports/cc3200 BTARGET=application BTYPE=release
-        make ${MAKEOPTS} -C ports/cc3200 BTARGET=bootloader  BTYPE=release
-      displayName: 'Build'
-  
-  - job: port_samd
-    displayName: 'samd port build'
-    pool:
-      vmImage: 'ubuntu-latest'
-  
-    steps:
-    - checkout: self
-
-    - script: git submodule update --init lib/asf4 lib/tinyusb
-      displayName: 'Checkout submodules'
-  
-    - script: |
-        sudo apt-get install gcc-arm-none-eabi
-        sudo apt-get install libnewlib-arm-none-eabi
-      displayName: 'Install dependencies'
-  
-    - script: |
-        make ${MAKEOPTS} -C ports/samd
-      displayName: 'Build'
-  
-  - job: port_teensy
-    displayName: 'teensy port build'
-    pool:
-      vmImage: 'ubuntu-latest'
-  
-    steps:
-    - checkout: self
-  
-    - script: |
-        sudo apt-get install gcc-arm-none-eabi
-        sudo apt-get install libnewlib-arm-none-eabi
-      displayName: 'Install dependencies'
-  
-    - script: |
-        make ${MAKEOPTS} -C ports/teensy
-      displayName: 'Build'
-  
   - job: port_gprs_a9
     displayName: 'gprs_a9 build'
     pool:

From bb98a517d72dfdc1e11d756ac20baadccda0257c Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sun, 14 Jun 2020 23:03:55 +0200
Subject: [PATCH 3499/3533] update esp8266 build in azure

---
 azure-pipelines.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 7c1d484934615..09d070d788413 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -16,9 +16,6 @@ stages:
     steps:
     - checkout: self
 
-    - script: git submodule update --init lib/axtls lib/berkeley-db-1.xx
-      displayName: 'Checkout submodules'
-  
     - script: |
         sudo apt-get install python-pip python3-pip
         sudo pip3 install pyparsing
@@ -30,6 +27,7 @@ stages:
     - script: |
         export PATH=$(pwd)/xtensa-lx106-elf/bin:$PATH
         make ${MAKEOPTS} -C mpy-cross
+        make ${MAKEOPTS} -C ports/esp8266 submodules
         make ${MAKEOPTS} -C ports/esp8266
       displayName: 'Build'
 

From 2bd110e80658cba1051722270299dac265f2bb64 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sun, 14 Jun 2020 23:13:19 +0200
Subject: [PATCH 3500/3533] fix esp8266 azure build

---
 azure-pipelines.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 09d070d788413..3434139fc8683 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -40,7 +40,7 @@ stages:
     - task: PublishPipelineArtifact@1
       displayName: 'Collect the build'
       inputs:
-        targetPath: '$(Build.Repository.LocalPath)/ports/esp8266/build'
+        targetPath: '$(Build.Repository.LocalPath)/ports/esp8266/build-GENERIC'
         artifact: 'build_esp8266'
   
   - job: port_gprs_a9

From 77066263f4b28f9383f8c56b8932ca7812bad696 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sun, 14 Jun 2020 23:16:47 +0200
Subject: [PATCH 3501/3533] fix esp8266 azure build

---
 azure-pipelines.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 3434139fc8683..f543b0272df68 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -32,7 +32,7 @@ stages:
       displayName: 'Build'
 
     - script: |
-        cd ports/esp8266/build
+        cd ports/esp8266/build-GENERIC
         find . \! -name '*.bin' -delete
         cd -
       displayName: 'Cleanup build before publishing'

From 616a7465755f33c8b28d6585bfaf257e028573c6 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sun, 21 Jun 2020 17:32:07 +0200
Subject: [PATCH 3502/3533] add ussd

---
 ports/gprs_a9/README.md                   |   1 +
 ports/gprs_a9/examples/example_43_ussd.py |   8 ++
 ports/gprs_a9/main.c                      |  14 +++
 ports/gprs_a9/modcellular.c               | 107 +++++++++++++++++++++-
 ports/gprs_a9/modcellular.h               |   5 +
 5 files changed, 131 insertions(+), 4 deletions(-)
 create mode 100644 ports/gprs_a9/examples/example_43_ussd.py

diff --git a/ports/gprs_a9/README.md b/ports/gprs_a9/README.md
index 54cfa6d2b32ed..57a5114afc1d4 100644
--- a/ports/gprs_a9/README.md
+++ b/ports/gprs_a9/README.md
@@ -170,6 +170,7 @@ The purpose of this module is to have an access to high-level networking (SMS, G
 * `reset()`: resets network settings to defaults. Disconnects GPRS;
 * `gprs([apn: {str, bool}[, user: str, pass: str[, timeout: int]]])` (bool): activate (3 or 4 arguments), deactivate (`gprs(False)`) or obtain the status of GPRS (on/off) if no arguments supplied;
 * `dial(tn: {str, bool})`: dial a telephone number if string is supplied or hang up a call if `False`;
+* `ussd(code: str[, timeout: int])` (int, str): USSD request. Unless zero timeout specified, returns USSD response option code and the response text;
 * `on_status_event(callback: Callable)`: sets a callback for network status change. The callback is called with a single integer constant indicating the new network state;
 * `on_sms(callback: Callable)`: sets a callback on SMS sent or received. The callback is called with a single integer constant `SMS_SENT` or `SMS_RECEIVED`;
 * `on_call(callback: Callable)`: sets a callback on call events (incoming, hangup, etc.);
diff --git a/ports/gprs_a9/examples/example_43_ussd.py b/ports/gprs_a9/examples/example_43_ussd.py
new file mode 100644
index 0000000000000..1182283b7f990
--- /dev/null
+++ b/ports/gprs_a9/examples/example_43_ussd.py
@@ -0,0 +1,8 @@
+# Micropython a9g example
+# Source: https://github.com/pulkin/micropython
+# Author: pulkin
+# Demonstrates how to perform USSD request
+import cellular
+
+print(cellular.ussd("*149#"))
+
diff --git a/ports/gprs_a9/main.c b/ports/gprs_a9/main.c
index 755278929b1ff..012029e09e2e3 100644
--- a/ports/gprs_a9/main.c
+++ b/ports/gprs_a9/main.c
@@ -347,6 +347,20 @@ void EventDispatch(API_Event_t* pEvent)
             modcellular_notify_call_hangup(pEvent);
             break;
 
+        // USSD
+        // ====
+        case API_EVENT_ID_USSD_SEND_SUCCESS:
+            modcellular_notify_ussd_sent(pEvent);
+            break;
+
+        case API_EVENT_ID_USSD_SEND_FAIL:
+            modcellular_notify_ussd_failed(pEvent);
+            break;
+
+        case API_EVENT_ID_USSD_IND:
+            modcellular_notify_incoming_ussd(pEvent);
+            break;
+
         // UART
         // ====
         case API_EVENT_ID_UART_RECEIVED:
diff --git a/ports/gprs_a9/modcellular.c b/ports/gprs_a9/modcellular.c
index 54797c6d84bbf..8df8c3b9fd591 100644
--- a/ports/gprs_a9/modcellular.c
+++ b/ports/gprs_a9/modcellular.c
@@ -39,10 +39,12 @@
 #include "api_info.h"
 #include "api_sim.h"
 #include "api_sms.h"
+#include "api_ss.h"
 #include "api_call.h"
 #include "api_os.h"
 #include "api_network.h"
 #include "api_inc_network.h"
+#include "api_charset.h"
 
 #include "time.h"
 #include "py/mperrno.h"
@@ -61,6 +63,7 @@
 #define NTW_EXC_ATT_FAILED 0x6E05
 #define NTW_EXC_ACT_FAILED 0x6E06
 #define NTW_EXC_SMS_DROP 0x6E07
+#define NTW_EXC_USSD_SEND 0x6E08
 
 #define NTW_EXC_CALL_NO_DIAL_TONE 0x6E10
 #define NTW_EXC_CALL_BUSY 0x6E11
@@ -93,11 +96,10 @@ uint8_t network_signal_quality = 0;
 uint8_t network_signal_rx_level = 0;
 mp_obj_t network_status_callback = mp_const_none;
 
-// SMS received
-mp_obj_t sms_callback = mp_const_none;
-
 // SMS send flag
 uint8_t sms_send_flag = 0;
+uint8_t ussd_send_flag = 0;
+mp_obj_t ussd_response = mp_const_none;
 
 // -------------------
 // Vars: SMS retrieval
@@ -107,6 +109,12 @@ uint8_t sms_send_flag = 0;
 mp_obj_list_t *sms_list_buffer = NULL;
 uint8_t sms_list_buffer_count = 0;
 
+// SMS received
+mp_obj_t sms_callback = mp_const_none;
+
+// USSD received
+mp_obj_t ussd_callback = mp_const_none;
+
 // ---------------------------
 // Vars: Network operator list
 // ---------------------------
@@ -124,12 +132,14 @@ int8_t cells_n = 0;
 // -----------
 // Vars: Calls
 // -----------
-mp_obj_t call_callback = mp_const_none;
 
 // SMS parsing
 STATIC mp_obj_t modcellular_sms_from_record(SMS_Message_Info_t* record);
 STATIC mp_obj_t modcellular_sms_from_raw(uint8_t* header, uint32_t header_length, uint8_t* content, uint32_t content_length);
 
+// Incoming call
+mp_obj_t call_callback = mp_const_none;
+
 // ----
 // Init
 // ----
@@ -139,6 +149,7 @@ void modcellular_init0(void) {
     network_status_callback = mp_const_none;
     sms_callback = mp_const_none;
     call_callback = mp_const_none;
+    ussd_callback = mp_const_none;
 
     // Reset statuses
     network_exception = NTW_NO_EXC;
@@ -329,6 +340,36 @@ void modcellular_notify_call_hangup(API_Event_t* event) {
         mp_sched_schedule(call_callback, mp_obj_new_bool(event->param1));
 }
 
+// USSD
+
+mp_obj_t decode_ussd(API_Event_t* event) {
+    USSD_Type_t* incoming = (USSD_Type_t*) event->pParam1;
+    char code[incoming->usdStringSize + 1];
+    int len = GSM_7BitTo8Bit(incoming->usdString, (uint8_t*) code, incoming->usdStringSize);
+
+    mp_obj_t tuple[2] = {
+        mp_obj_new_int(incoming->option),
+        mp_obj_new_str(code, len),
+    };
+    return mp_obj_new_tuple(2, tuple);
+}
+
+void modcellular_notify_ussd_sent(API_Event_t* event) {
+    ussd_send_flag = 1;
+    ussd_response = decode_ussd(event);
+    if (ussd_callback && ussd_callback != mp_const_none)
+        mp_sched_schedule(ussd_callback, ussd_response);
+}
+
+void modcellular_notify_ussd_failed(API_Event_t* event) {
+    network_exception = NTW_EXC_USSD_SEND;
+}
+
+void modcellular_notify_incoming_ussd(API_Event_t* event) {
+    if (ussd_callback && ussd_callback != mp_const_none)
+        mp_sched_schedule(ussd_callback, decode_ussd(event));
+}
+
 // Base stations
 
 void modcellular_notify_cell_info(API_Event_t* event) {
@@ -1029,6 +1070,49 @@ STATIC mp_obj_t modcellular_dial(mp_obj_t tn_in) {
 
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(modcellular_dial_obj, modcellular_dial);
 
+STATIC mp_obj_t modcellular_ussd(size_t n_args, const mp_obj_t *args) {
+    // ========================================
+    // USSD request.
+    // Args:
+    //     code (str): the request;
+    //     timeout (int, optional): timeout in ms;
+    // Returns:
+    //     USSD response for non-zero timeouts.
+    // ========================================
+    REQUIRES_NETWORK_REGISTRATION;
+
+    mp_int_t timeout = TIMEOUT_USSD_RESPONSE;
+    if (n_args == 2)
+        timeout = mp_obj_get_int(args[1]);
+
+    const char* code = mp_obj_str_get_str(args[0]);
+    uint8_t code7[2 * strlen(code) + 1];
+    int len = GSM_8BitTo7Bit((const uint8_t*) code, code7, strlen(code));
+
+    USSD_Type_t ussd;
+    ussd.usdString = (uint8_t*) code7;
+    ussd.usdStringSize = len;
+    ussd.option = 3;
+    ussd.dcs = 0x0F;
+
+    ussd_send_flag = 0;
+    ussd_response = mp_const_none;
+    int result = SS_SendUSSD(ussd);
+    if (result)
+        mp_raise_ValueError("Failed to submit USSD");
+
+    if (timeout == 0)
+        return mp_const_none;
+
+    WAIT_UNTIL(ussd_send_flag, timeout, 100, mp_raise_OSError(MP_ETIMEDOUT));
+    mp_obj_t rtn = ussd_response;
+    ussd_send_flag = 0;
+    ussd_response = 0;
+    return rtn;
+}
+
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(modcellular_ussd_obj, 1, 2, modcellular_ussd);
+
 STATIC mp_obj_t modcellular_stations(void) {
     // ========================================
     // Polls base stations.
@@ -1150,6 +1234,19 @@ STATIC mp_obj_t modcellular_on_call(mp_obj_t callable) {
 
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(modcellular_on_call_obj, modcellular_on_call);
 
+STATIC mp_obj_t modcellular_on_ussd(mp_obj_t callable) {
+    // ========================================
+    // Sets a callback on USSD.
+    // Args:
+    //     callback (Callable): a callback to
+    //     execute on incoming USSD.
+    // ========================================
+    ussd_callback = callable;
+    return mp_const_none;
+}
+
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(modcellular_on_ussd_obj, modcellular_on_ussd);
+
 STATIC const mp_map_elem_t mp_module_cellular_globals_table[] = {
     { MP_OBJ_NEW_QSTR(MP_QSTR___name__), MP_OBJ_NEW_QSTR(MP_QSTR_cellular) },
 
@@ -1170,12 +1267,14 @@ STATIC const mp_map_elem_t mp_module_cellular_globals_table[] = {
     { MP_OBJ_NEW_QSTR(MP_QSTR_scan), (mp_obj_t)&modcellular_scan_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_register), (mp_obj_t)&modcellular_register_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_dial), (mp_obj_t)&modcellular_dial_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_ussd), (mp_obj_t)&modcellular_ussd_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_stations), (mp_obj_t)&modcellular_stations_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_agps_station_data), (mp_obj_t)&modcellular_agps_station_data_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_reset), (mp_obj_t)&modcellular_reset_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_on_status_event), (mp_obj_t)&modcellular_on_status_event_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_on_sms), (mp_obj_t)&modcellular_on_sms_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_on_call), (mp_obj_t)&modcellular_on_call_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_on_ussd), (mp_obj_t)&modcellular_on_ussd_obj },
 
     { MP_ROM_QSTR(MP_QSTR_NETWORK_FREQ_BAND_GSM_900P), MP_ROM_INT(NETWORK_FREQ_BAND_GSM_900P) },
     { MP_ROM_QSTR(MP_QSTR_NETWORK_FREQ_BAND_GSM_900E), MP_ROM_INT(NETWORK_FREQ_BAND_GSM_900E) },
diff --git a/ports/gprs_a9/modcellular.h b/ports/gprs_a9/modcellular.h
index f4458657fa82d..f0f999e0e3fbc 100644
--- a/ports/gprs_a9/modcellular.h
+++ b/ports/gprs_a9/modcellular.h
@@ -63,6 +63,10 @@ void modcellular_notify_cell_info(API_Event_t* event);
 void modcellular_notify_call_incoming(API_Event_t* event);
 void modcellular_notify_call_hangup(API_Event_t* event);
 
+void modcellular_notify_ussd_sent(API_Event_t* event);
+void modcellular_notify_ussd_failed(API_Event_t* event);
+void modcellular_notify_incoming_ussd(API_Event_t* event);
+
 #define TIMEOUT_SMS_LIST 10000
 #define TIMEOUT_SMS_SEND 10000
 #define TIMEOUT_GPRS_ATTACHMENT 15000
@@ -71,6 +75,7 @@ void modcellular_notify_call_hangup(API_Event_t* event);
 #define TIMEOUT_LIST_OPERATORS 15000
 #define TIMEOUT_REG 10000
 #define TIMEOUT_STATIONS 2000
+#define TIMEOUT_USSD_RESPONSE 5000
 
 #define REQUIRES_NETWORK_REGISTRATION do {if (!network_status) {mp_raise_RuntimeError("Network is not available: is SIM card inserted?"); return mp_const_none;}} while(0)
 #define REQUIRES_VALID_SMS_STATUS(bits) do {if (bitsum(bits) != 1) {return mp_const_none;}} while(0)

From ba31b1e1d1ac199efd3d03f7869ce773e0a67f09 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sun, 21 Jun 2020 17:38:00 +0200
Subject: [PATCH 3503/3533] update example index

[skip CI]
---
 ports/gprs_a9/examples/README.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/ports/gprs_a9/examples/README.md b/ports/gprs_a9/examples/README.md
index 7e8e4862a5968..ae54d613539ff 100644
--- a/ports/gprs_a9/examples/README.md
+++ b/ports/gprs_a9/examples/README.md
@@ -81,6 +81,14 @@ Keywords: **GPRS, background, connection**
 
 Modules: `cellular`, `socket`
 
+[example_43_ussd.py](example_43_ussd.py)
+
+Demonstrates how to preform a simple USSD request.
+
+Keywords: **USSD**
+
+Modules: `cellular`
+
 [example_50_mqtt.py](example_50_mqtt.py)
 
 Reports location to a test MQTT server via cellular connection using `umqtt` from [micropython-lib](https://github.com/micropython/micropython-lib).

From 7c66330ca6b61f4edeab69db7f2cfaeef810f906 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sun, 9 Aug 2020 17:57:13 +0200
Subject: [PATCH 3504/3533] gps, cellular: use the same timeout macro

---
 ports/gprs_a9/modcellular.c |  1 +
 ports/gprs_a9/modcellular.h |  2 +-
 ports/gprs_a9/modgps.c      | 14 ++++----------
 ports/gprs_a9/timeout.h     |  4 ++++
 4 files changed, 10 insertions(+), 11 deletions(-)
 create mode 100644 ports/gprs_a9/timeout.h

diff --git a/ports/gprs_a9/modcellular.c b/ports/gprs_a9/modcellular.c
index 8df8c3b9fd591..4fe5c58361320 100644
--- a/ports/gprs_a9/modcellular.c
+++ b/ports/gprs_a9/modcellular.c
@@ -28,6 +28,7 @@
 
 #include "modcellular.h"
 #include "mphalport.h"
+#include "timeout.h"
 
 #include "py/nlr.h"
 #include "py/obj.h"
diff --git a/ports/gprs_a9/modcellular.h b/ports/gprs_a9/modcellular.h
index f0f999e0e3fbc..8a6c913294892 100644
--- a/ports/gprs_a9/modcellular.h
+++ b/ports/gprs_a9/modcellular.h
@@ -79,4 +79,4 @@ void modcellular_notify_incoming_ussd(API_Event_t* event);
 
 #define REQUIRES_NETWORK_REGISTRATION do {if (!network_status) {mp_raise_RuntimeError("Network is not available: is SIM card inserted?"); return mp_const_none;}} while(0)
 #define REQUIRES_VALID_SMS_STATUS(bits) do {if (bitsum(bits) != 1) {return mp_const_none;}} while(0)
-#define WAIT_UNTIL(condition, timeout_ms, step_ms, raise) if (timeout_ms) do {uint32_t __time = mp_hal_ticks_ms(); while (mp_hal_ticks_ms() - __time < (timeout_ms) && !(condition)) mp_hal_delay_ms(step_ms); if (!(condition)) {raise;}} while (0)
+
diff --git a/ports/gprs_a9/modgps.c b/ports/gprs_a9/modgps.c
index b46c689dcd1fd..4e5a79350d201 100644
--- a/ports/gprs_a9/modgps.c
+++ b/ports/gprs_a9/modgps.c
@@ -27,6 +27,7 @@
  */
 
 #include "modgps.h"
+#include "timeout.h"
 
 #include "py/nlr.h"
 #include "py/obj.h"
@@ -43,6 +44,8 @@
 #include "minmea.h"
 #include "time.h"
 
+#include "py/mperrno.h"
+
 STATIC mp_obj_t modgps_off(void);
 
 void modgps_init0(void) {
@@ -93,16 +96,7 @@ STATIC mp_obj_t modgps_on(size_t n_args, const mp_obj_t *arg) {
     gpsInfo->rmc.longitude.value = 0;
     GPS_Init();
     GPS_Open(NULL);
-    clock_t time = clock();
-    while (clock() - time < timeout) {
-        if (gpsInfo->rmc.latitude.value != 0) {
-            break;
-        }
-        OS_Sleep(100);
-    }
-    if (gpsInfo->rmc.latitude.value == 0) {
-        mp_raise_GPSError("Failed to start GPS");
-    }
+    WAIT_UNTIL(gpsInfo->rmc.latitude.value, timeout, 100, mp_raise_OSError(MP_ETIMEDOUT));
     return mp_const_none;
 }
 
diff --git a/ports/gprs_a9/timeout.h b/ports/gprs_a9/timeout.h
new file mode 100644
index 0000000000000..60b9efebd0f7f
--- /dev/null
+++ b/ports/gprs_a9/timeout.h
@@ -0,0 +1,4 @@
+#include "mphalport.h"
+
+#define WAIT_UNTIL(condition, timeout_ms, step_ms, raise) if (timeout_ms) do {uint32_t __time = mp_hal_ticks_ms(); while (mp_hal_ticks_ms() - __time < (timeout_ms) && !(condition)) mp_hal_delay_ms(step_ms); if (!(condition)) {raise;}} while (0)
+

From 0753dccb2094bb968ab2170f95627ab42b5fa1f6 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sun, 9 Aug 2020 18:31:10 +0200
Subject: [PATCH 3505/3533] gps: remove GPSError

---
 ports/gprs_a9/README.md |  2 +-
 ports/gprs_a9/modgps.c  | 14 +-------------
 ports/gprs_a9/modgps.h  |  7 +++----
 3 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/ports/gprs_a9/README.md b/ports/gprs_a9/README.md
index 57a5114afc1d4..1a0faa7c546b5 100644
--- a/ports/gprs_a9/README.md
+++ b/ports/gprs_a9/README.md
@@ -229,7 +229,7 @@ Provides SSL over GPRS sockets (axtls).
 Provides the GPS functionality.
 This is only available in the A9G module where GPS is a separate chip connected via UART2.
 
-* `GPSError(message: str)`
+* ~~`GPSError(message: str)`~~ OSError used instead
 * `on()`: turns the GPS on;
 * `off()`: turns the GPS off;
 * `get_firmware_version()` (str): retrieves the firmware version;
diff --git a/ports/gprs_a9/modgps.c b/ports/gprs_a9/modgps.c
index 4e5a79350d201..b2a2f621e9af4 100644
--- a/ports/gprs_a9/modgps.c
+++ b/ports/gprs_a9/modgps.c
@@ -62,16 +62,6 @@ void modgps_notify_gps_update(API_Event_t* event) {
     GPS_Update(event->pParam1,event->param1);
 }
 
-// ----------
-// Exceptions
-// ----------
-
-MP_DEFINE_EXCEPTION(GPSError, OSError)
-
-NORETURN void mp_raise_GPSError(const char *msg) {
-    mp_raise_msg(&mp_type_GPSError, msg);
-}
-
 // -------
 // Methods
 // -------
@@ -122,7 +112,7 @@ STATIC mp_obj_t modgps_get_firmware_version(void) {
     // ========================================
     char buffer[300];
     if (!GPS_GetVersion(buffer, 150)) {
-        mp_raise_GPSError("Failed to get the firmware version: did you run gps.on()?");
+        mp_raise_ValueError("No firmware info");
         return mp_const_none;
     }
     return mp_obj_new_str(buffer, strlen(buffer));
@@ -202,8 +192,6 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_0(modgps_time_obj, modgps_time);
 STATIC const mp_map_elem_t mp_module_gps_globals_table[] = {
     { MP_OBJ_NEW_QSTR(MP_QSTR___name__), MP_OBJ_NEW_QSTR(MP_QSTR_gps) },
 
-    { MP_OBJ_NEW_QSTR(MP_QSTR_GPSError), (mp_obj_t)MP_ROM_PTR(&mp_type_GPSError) },
-
     { MP_OBJ_NEW_QSTR(MP_QSTR_on), (mp_obj_t)&modgps_on_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_off), (mp_obj_t)&modgps_off_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_get_firmware_version), (mp_obj_t)&modgps_get_firmware_version_obj },
diff --git a/ports/gprs_a9/modgps.h b/ports/gprs_a9/modgps.h
index 22bcf0cefe106..6aa2d2b4e37fc 100644
--- a/ports/gprs_a9/modgps.h
+++ b/ports/gprs_a9/modgps.h
@@ -29,12 +29,11 @@
 #include "api_event.h"
 #include "gps_parse.h"
 #include "py/obj.h"
-
-extern const mp_obj_type_t mp_type_CellularError;
+#include "py/mperrno.h"
 
 void modgps_init0(void);
 void modgps_notify_gps_update(API_Event_t* event);
 
 #define DEFAULT_GPS_TIMEOUT 5
-#define REQUIRES_VALID_GPS_INFO do { if (!gpsInfo) {mp_raise_GPSError("No GPS data available: did you run gps.on()?"); return mp_const_none;}} while(0)
-#define REQUIRES_GPS_ON do { if (!GPS_IsOpen()) {mp_raise_GPSError("GPS is off"); return mp_const_none;}} while(0)
+#define REQUIRES_VALID_GPS_INFO do { if (!gpsInfo) {mp_raise_OSError(MP_EPERM); return mp_const_none;}} while(0)
+#define REQUIRES_GPS_ON do { if (!GPS_IsOpen()) {mp_raise_OSError(MP_EPERM); return mp_const_none;}} while(0)

From e6bee9101076e0e7d725fbef6b3fc411911e13d0 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Mon, 10 Aug 2020 19:44:41 +0200
Subject: [PATCH 3506/3533] gps: add nmea_data

---
 ports/gprs_a9/README.md |  16 +++-
 ports/gprs_a9/modgps.c  | 166 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 181 insertions(+), 1 deletion(-)

diff --git a/ports/gprs_a9/README.md b/ports/gprs_a9/README.md
index 1a0faa7c546b5..f4c97ae683329 100644
--- a/ports/gprs_a9/README.md
+++ b/ports/gprs_a9/README.md
@@ -236,7 +236,21 @@ This is only available in the A9G module where GPS is a separate chip connected
 * `get_location()` (longitude: float, latitude: float): retrieves the current GPS location;
 * `get_last_location()` (longitude: float, latitude: float): retrieves the last known GPS location without polling the GPS module;
 * `get_satellites()` (tracked: int, visible: int): the numbers of satellites in operation;
-* `time()` (int): the number of seconds since the epoch (2000). Use `time.localtime` for converting it into date/time values (this conversion may result in `OverflowError` until the GPS module starts reading meaningful satellite data).
+* `time()` (int): the number of seconds since the epoch (2000). Use `time.localtime` for converting it into date/time values (this conversion may result in `OverflowError` until the GPS module starts reading meaningful satellite data);
+* `nmea_data()` (tuple): all NMEA data parsed: `(rmc, (gsa[0], ...), gga, gll, gst, (gsv[0], ...), vtg, zda)`:
+  - RMC: `(time: int, valid: bool, latitude, longitude, speed, course, variation: float)`;
+  - GSA: `(mode: int, fix_type: int, satellite_prn: bytearray, pdop, hdop, vdop: float)`;
+  - GGA: `(time_of_day: int, latitude, longitude: float, fix_quality, satellites_tracked: int, hdop, altitude: float, altitude_units: int, height: float, height_units: int, dgps_age: float)`;
+  - GLL: `(latitude, longitude: float, time_of_day, status, mode: int)`;
+  - GST: `(time_of_day: int, rms_deviation, ...: float)`;
+  - GSV: `(total_messages, message_nr, total_satellites: int, satellite_info[4]: (nr, elevation, azimuth, snr: int))`;
+  - VTG: `(true_track_degrees, magnetic_track_degrees, speed_knots, speed_kph: float, faa_mode: int)`;
+  - ZDAL `(time, hour_offset, minute_offset: int)`.
+
+  Latitudes and longitudes are in degrees `x100`.
+  Time is given in seconds since the epoch or since `00:00` today.
+  Status flags `mode`, `status` are ASCII indexes.
+  For more info (units, etc) please consult the [minmea](https://github.com/kosma/minmea) project.
 
 ### `machine`
 
diff --git a/ports/gprs_a9/modgps.c b/ports/gprs_a9/modgps.c
index b2a2f621e9af4..bca68a3598875 100644
--- a/ports/gprs_a9/modgps.c
+++ b/ports/gprs_a9/modgps.c
@@ -189,6 +189,171 @@ STATIC mp_obj_t modgps_time(void) {
 
 STATIC MP_DEFINE_CONST_FUN_OBJ_0(modgps_time_obj, modgps_time);
 
+STATIC mp_obj_t _get_time(struct minmea_date date, struct minmea_time time) {
+    mp_uint_t result = timeutils_mktime(date.year + 2000, date.month, date.day, time.hours, time.minutes, time.seconds);
+    // Note: the module may report dates between 1980 and 2000 as well: they will be mapped onto the time frame 2080-2100
+    return mp_obj_new_int_from_uint(result);
+}
+
+STATIC mp_obj_t _get_float(struct minmea_float f) {
+    return mp_obj_new_float(minmea_tofloat(&f));
+}
+
+STATIC mp_obj_t _get_prn(int* prn) {
+    uint8_t prn_u[12];
+    for (int i = 0; i < 12; i++) prn_u[i] = prn[i];
+    return mp_obj_new_bytearray(sizeof(prn), prn);
+}
+
+STATIC mp_obj_t _get_sat_info(struct minmea_sat_info s) {
+    mp_obj_t tuple[4] = {
+        mp_obj_new_int(s.nr),
+        mp_obj_new_int(s.elevation),
+        mp_obj_new_int(s.azimuth),
+        mp_obj_new_int(s.snr),
+    };
+    return mp_obj_new_tuple(sizeof(tuple) / sizeof(mp_obj_t), tuple);
+}
+
+STATIC mp_obj_t _get_rmc(struct minmea_sentence_rmc s) {
+    mp_obj_t tuple[7] = {
+        _get_time(s.date, s.time),
+        mp_obj_new_bool(s.valid),
+        _get_float(s.latitude),
+        _get_float(s.longitude),
+        _get_float(s.speed),
+        _get_float(s.course),
+        _get_float(s.variation),
+    };
+    return mp_obj_new_tuple(sizeof(tuple) / sizeof(mp_obj_t), tuple);
+}
+
+STATIC mp_obj_t _get_gsa(struct minmea_sentence_gsa s) {
+    mp_obj_t tuple[6] = {
+        mp_obj_new_int_from_uint(s.mode),
+        mp_obj_new_int(s.fix_type),
+        _get_prn(s.sats),
+        _get_float(s.pdop),
+        _get_float(s.hdop),
+        _get_float(s.vdop),
+    };
+    return mp_obj_new_tuple(sizeof(tuple) / sizeof(mp_obj_t), tuple);
+}
+
+STATIC mp_obj_t _get_gga(struct minmea_sentence_gga s) {
+    struct minmea_date no_date = {1, 1, 0};
+
+    mp_obj_t tuple[11] = {
+        _get_time(no_date, s.time),
+        _get_float(s.latitude),
+        _get_float(s.longitude),
+        mp_obj_new_int(s.fix_quality),
+        mp_obj_new_int(s.satellites_tracked),
+        _get_float(s.hdop),
+        _get_float(s.altitude),
+        mp_obj_new_int_from_uint(s.altitude_units),
+        _get_float(s.height),
+        mp_obj_new_int_from_uint(s.height_units),
+        _get_float(s.dgps_age),
+    };
+    return mp_obj_new_tuple(sizeof(tuple) / sizeof(mp_obj_t), tuple);
+}
+
+STATIC mp_obj_t _get_gll(struct minmea_sentence_gll s) {
+    struct minmea_date no_date = {1, 1, 0};
+
+    mp_obj_t tuple[5] = {
+        _get_float(s.latitude),
+        _get_float(s.longitude),
+        _get_time(no_date, s.time),
+        mp_obj_new_int_from_uint(s.status),
+        mp_obj_new_int_from_uint(s.mode),
+    };
+    return mp_obj_new_tuple(sizeof(tuple) / sizeof(mp_obj_t), tuple);
+}
+
+STATIC mp_obj_t _get_gst(struct minmea_sentence_gst s) {
+    struct minmea_date no_date = {1, 1, 0};
+
+    mp_obj_t tuple[8] = {
+        _get_time(no_date, s.time),
+        _get_float(s.rms_deviation),
+        _get_float(s.semi_major_deviation),
+        _get_float(s.semi_minor_deviation),
+        _get_float(s.semi_major_orientation),
+        _get_float(s.latitude_error_deviation),
+        _get_float(s.longitude_error_deviation),
+        _get_float(s.altitude_error_deviation),
+    };
+    return mp_obj_new_tuple(sizeof(tuple) / sizeof(mp_obj_t), tuple);
+}
+
+STATIC mp_obj_t _get_gsv(struct minmea_sentence_gsv s) {
+    mp_obj_t sat_info_tuple[4];
+    for (int i = 0; i < 4; i++)
+        sat_info_tuple[i] = _get_sat_info(s.sats[i]);
+
+    mp_obj_t tuple[4] = {
+        mp_obj_new_int(s.total_msgs),
+        mp_obj_new_int(s.msg_nr),
+        mp_obj_new_int(s.total_sats),
+        mp_obj_new_tuple(4, sat_info_tuple),
+    };
+    return mp_obj_new_tuple(sizeof(tuple) / sizeof(mp_obj_t), tuple);
+}
+
+STATIC mp_obj_t _get_vtg(struct minmea_sentence_vtg s) {
+    mp_obj_t tuple[5] = {
+        _get_float(s.true_track_degrees),
+        _get_float(s.magnetic_track_degrees),
+        _get_float(s.speed_knots),
+        _get_float(s.speed_kph),
+        mp_obj_new_int_from_uint((uint8_t) s.faa_mode),
+    };
+    return mp_obj_new_tuple(sizeof(tuple) / sizeof(mp_obj_t), tuple);
+}
+
+STATIC mp_obj_t _get_zda(struct minmea_sentence_zda s) {
+    mp_obj_t tuple[3] = {
+        _get_time(s.date, s.time),
+        mp_obj_new_int(s.hour_offset),
+        mp_obj_new_int(s.minute_offset),
+    };
+    return mp_obj_new_tuple(sizeof(tuple) / sizeof(mp_obj_t), tuple);
+}
+
+STATIC mp_obj_t modgps_nmea_data(void) {
+    // ========================================
+    // NMEA data in a tuple.
+    // Returns:
+    //     A tuple with rmc, gsa, gga, gll,
+    //     gst, gsv, vtg and zda messages.
+    // ========================================
+    REQUIRES_GPS_ON;
+
+    mp_obj_t gsa_tuple[GPS_PARSE_MAX_GSA_NUMBER];
+    for (int i = 0; i < GPS_PARSE_MAX_GSA_NUMBER; i++)
+        gsa_tuple[i] = _get_gsa(gpsInfo->gsa[i]);
+
+    mp_obj_t gsv_tuple[GPS_PARSE_MAX_GSV_NUMBER];
+    for (int i = 0; i < GPS_PARSE_MAX_GSV_NUMBER; i++)
+        gsv_tuple[i] = _get_gsv(gpsInfo->gsv[i]);
+
+    mp_obj_t tuple[8] = {
+        _get_rmc(gpsInfo->rmc),
+        mp_obj_new_tuple(GPS_PARSE_MAX_GSA_NUMBER, gsa_tuple),
+        _get_gga(gpsInfo->gga),
+        _get_gll(gpsInfo->gll),
+        _get_gst(gpsInfo->gst),
+        mp_obj_new_tuple(GPS_PARSE_MAX_GSV_NUMBER, gsv_tuple),
+        _get_vtg(gpsInfo->vtg),
+        _get_zda(gpsInfo->zda),
+    };
+    return mp_obj_new_tuple(sizeof(tuple) / sizeof(mp_obj_t), tuple);
+}
+
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(modgps_nmea_data_obj, modgps_nmea_data);
+
 STATIC const mp_map_elem_t mp_module_gps_globals_table[] = {
     { MP_OBJ_NEW_QSTR(MP_QSTR___name__), MP_OBJ_NEW_QSTR(MP_QSTR_gps) },
 
@@ -199,6 +364,7 @@ STATIC const mp_map_elem_t mp_module_gps_globals_table[] = {
     { MP_OBJ_NEW_QSTR(MP_QSTR_get_last_location), (mp_obj_t)&modgps_get_last_location_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_get_satellites), (mp_obj_t)&modgps_get_satellites_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_time), (mp_obj_t)&modgps_time_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_nmea_data), (mp_obj_t)&modgps_nmea_data_obj },
 };
 
 STATIC MP_DEFINE_CONST_DICT(mp_module_gps_globals, mp_module_gps_globals_table);

From 4c9ed6ec0bf4fe9275a6d30f639e60bf77dfbef2 Mon Sep 17 00:00:00 2001
From: pulkin <gpulkin@gmail.com>
Date: Wed, 24 Jun 2020 00:27:40 +0200
Subject: [PATCH 3507/3533] add discord badge

[skip ci]
---
 ports/gprs_a9/README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/gprs_a9/README.md b/ports/gprs_a9/README.md
index f4c97ae683329..7b325d5bac688 100644
--- a/ports/gprs_a9/README.md
+++ b/ports/gprs_a9/README.md
@@ -1,5 +1,6 @@
 [![Build Status](https://travis-ci.org/pulkin/micropython.svg?branch=master)](https://travis-ci.org/pulkin/micropython)
 [![Build Status](https://dev.azure.com/gpulkin/micropython/_apis/build/status/pulkin.micropython?branchName=master)](https://dev.azure.com/gpulkin/micropython/_build/latest?definitionId=1&branchName=master)
+[![Chat](https://img.shields.io/discord/725112070798049291)](https://discord.com/channels/725112070798049291)
 [![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=2RZCNXCUCP4YG&source=url)
 
 ## Contribute

From ab7c8efdc9b4d16b88bba764702ab63b422afbd5 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sat, 29 Aug 2020 23:00:58 +0200
Subject: [PATCH 3508/3533] cellular: add timeout to sms_send

---
 ports/gprs_a9/README.md     |  2 +-
 ports/gprs_a9/modcellular.c | 15 +++++++++++----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/ports/gprs_a9/README.md b/ports/gprs_a9/README.md
index 7b325d5bac688..dab026e99389b 100644
--- a/ports/gprs_a9/README.md
+++ b/ports/gprs_a9/README.md
@@ -145,7 +145,7 @@ The purpose of this module is to have an access to high-level networking (SMS, G
   * `.inbox` (bool): incoming message if `True`, outgoing message if `False` or unknown status if `None`;
   * `.unread` (bool): unread message if `True`, previously read message if `False` or unknown status if `None`;
   * `.sent` (bool): sent message if `True`, not sent message if `False` or unknown status if `None`;
-  * `.send()`: sends a message;
+  * `.send(timeout: int)`: sends a message;
   * `.withdraw()`: withdraws SMS from SIM storage;
   * `.list()` (list) [staticmethod]: all SMS from the SIM card;
   * ~~`.poll()` (int) [staticmethod]: the number of new SMS received~~ use `on_sms` instead;
diff --git a/ports/gprs_a9/modcellular.c b/ports/gprs_a9/modcellular.c
index 4fe5c58361320..9944eee1e250c 100644
--- a/ports/gprs_a9/modcellular.c
+++ b/ports/gprs_a9/modcellular.c
@@ -461,13 +461,19 @@ STATIC mp_obj_t modcellular_sms_sent(mp_obj_t self_in) {
     return mp_obj_new_bool(!(s | SMS_STATUS_UNSENT));
 }
 
-STATIC mp_obj_t modcellular_sms_send(mp_obj_t self_in) {
+STATIC mp_obj_t modcellular_sms_send(size_t n_args, const mp_obj_t *args) {
     // ========================================
     // Sends an SMS messsage.
+    // Args:
+    //     timeout (int): optional timeout in ms;
     // ========================================
     REQUIRES_NETWORK_REGISTRATION;
 
-    sms_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    mp_int_t timeout = TIMEOUT_SMS_SEND;
+    if (n_args == 2)
+        timeout = mp_obj_get_int(args[1]);
+
+    sms_obj_t *self = MP_OBJ_TO_PTR(args[0]);
 
     if (self->status != 0)
         mp_raise_ValueError("A message with non-zero status cannot be sent");
@@ -487,13 +493,14 @@ STATIC mp_obj_t modcellular_sms_send(mp_obj_t self_in) {
         mp_raise_ValueError("Failed to submit SMS message for sending");
     }
     OS_Free(unicode);
-    WAIT_UNTIL(sms_send_flag, TIMEOUT_SMS_SEND, 100, mp_warning(NULL, "Failed to send SMS. The module will continue attempting sending it"));
+
+    WAIT_UNTIL(sms_send_flag, timeout, 100, mp_warning(NULL, "Failed to send SMS immidiately. The module will continue attempts sending it"));
 
     sms_send_flag = 0;
     return mp_const_none;
 }
 
-MP_DEFINE_CONST_FUN_OBJ_1(modcellular_sms_send_obj, &modcellular_sms_send);
+MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(modcellular_sms_send_obj, 1, 2, modcellular_sms_send);
 
 STATIC mp_obj_t modcellular_sms_withdraw(mp_obj_t self_in) {
     // ========================================

From d167104478198d3b6a0a52cfc3d30d43a94335ef Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sat, 29 Aug 2020 23:20:28 +0200
Subject: [PATCH 3509/3533] cellular: add SMS.get_storage_size

---
 ports/gprs_a9/README.md     |  1 +
 ports/gprs_a9/modcellular.c | 23 +++++++++++++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/ports/gprs_a9/README.md b/ports/gprs_a9/README.md
index dab026e99389b..7f4d531831be4 100644
--- a/ports/gprs_a9/README.md
+++ b/ports/gprs_a9/README.md
@@ -148,6 +148,7 @@ The purpose of this module is to have an access to high-level networking (SMS, G
   * `.send(timeout: int)`: sends a message;
   * `.withdraw()`: withdraws SMS from SIM storage;
   * `.list()` (list) [staticmethod]: all SMS from the SIM card;
+  * `.get_storage_size()` (int, int) [staticmethod]: number of active SMS records and total storage size;
   * ~~`.poll()` (int) [staticmethod]: the number of new SMS received~~ use `on_sms` instead;
 * ~~`CellularError(message: str)`~~ `OSError`, `ValueError`, `RuntimeError` are used instead;
 
diff --git a/ports/gprs_a9/modcellular.c b/ports/gprs_a9/modcellular.c
index 9944eee1e250c..dc8a779a57c1b 100644
--- a/ports/gprs_a9/modcellular.c
+++ b/ports/gprs_a9/modcellular.c
@@ -558,6 +558,26 @@ STATIC mp_obj_t modcellular_sms_list(void) {
 STATIC MP_DEFINE_CONST_FUN_OBJ_0(modcellular_sms_list_obj, modcellular_sms_list);
 STATIC MP_DEFINE_CONST_STATICMETHOD_OBJ(modcellular_sms_list_static_class_obj, MP_ROM_PTR(&modcellular_sms_list_obj));
 
+STATIC mp_obj_t modcellular_sms_get_storage_size(void) {
+    // ========================================
+    // Retrieves SMS storage size.
+    // Returns:
+    //     Storage used and total size as ints.
+    // ========================================
+    SMS_Storage_Info_t storage;
+
+    SMS_GetStorageInfo(&storage, SMS_STORAGE_SIM_CARD);
+
+    mp_obj_t tuple[2] = {
+        mp_obj_new_int(storage.used),
+        mp_obj_new_int(storage.total),
+    };
+    return mp_obj_new_tuple(2, tuple);
+}
+
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(modcellular_sms_get_storage_size_obj, modcellular_sms_get_storage_size);
+STATIC MP_DEFINE_CONST_STATICMETHOD_OBJ(modcellular_sms_get_storage_size_static_class_obj, MP_ROM_PTR(&modcellular_sms_get_storage_size_obj));
+
 STATIC void modcellular_sms_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
     // ========================================
     // SMS.[attr]
@@ -592,6 +612,9 @@ STATIC void modcellular_sms_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
         // .list[static]
         } else if (attr == MP_QSTR_list) {
             mp_convert_member_lookup(self_in, mp_obj_get_type(self_in), (mp_obj_t)MP_ROM_PTR(&modcellular_sms_list_static_class_obj), dest);
+        // .get_storage_size[static]
+        } else if (attr == MP_QSTR_get_storage_size) {
+            mp_convert_member_lookup(self_in, mp_obj_get_type(self_in), (mp_obj_t)MP_ROM_PTR(&modcellular_sms_get_storage_size_static_class_obj), dest);
         }
     }
 }

From 4d68e42510d4c2df4155c6ad411cca7906a4da38 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sat, 29 Aug 2020 23:44:57 +0200
Subject: [PATCH 3510/3533] py: define ATOMIC macros

---
 ports/gprs_a9/mpconfigport.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ports/gprs_a9/mpconfigport.h b/ports/gprs_a9/mpconfigport.h
index 2a6f85033a89e..d3d0cbb24b324 100644
--- a/ports/gprs_a9/mpconfigport.h
+++ b/ports/gprs_a9/mpconfigport.h
@@ -8,6 +8,8 @@
 #include <stdint.h>
 #include <unistd.h>
 
+#include "api_sys.h"
+
 // options to control how MicroPython is built
 
 
@@ -63,6 +65,8 @@
 #define MICROPY_ENABLE_SCHEDULER            (1)
 #define MICROPY_SCHEDULER_DEPTH             (8)
 #define MICROPY_COMP_CONST                  (1)
+#define MICROPY_BEGIN_ATOMIC_SECTION()      SYS_EnterCriticalSection()
+#define MICROPY_END_ATOMIC_SECTION(state)   SYS_ExitCriticalSection(state)
 
 // MCU definition
 #define MP_ENDIANNESS_LITTLE                (1)

From be1bc9fcab41101ceb299866e9c7d849f0d76521 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Mon, 7 Sep 2020 01:07:24 +0200
Subject: [PATCH 3511/3533] readme: add a note about memory card

[skip ci]
---
 ports/gprs_a9/README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/gprs_a9/README.md b/ports/gprs_a9/README.md
index 7f4d531831be4..eedde3f83057f 100644
--- a/ports/gprs_a9/README.md
+++ b/ports/gprs_a9/README.md
@@ -296,4 +296,5 @@ Available platform-specific modules (not installed by default):
 
 * The module halts on fatal errors; create an empty file `.reboot_on_fatal` if a reboot is desired
 * The size of micropython heap is roughly 512 Kb. 400k can be realistically allocated right after hard reset.
+* The external memory card is [mounted under `/t`](https://ai-thinker-open.github.io/GPRS_C_SDK_DOC/en/c-sdk/function-api/file-system.html).
 

From 6e108dba3a8e3a744ae98697ce9d82cd2fbfb43e Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Mon, 7 Sep 2020 01:10:13 +0200
Subject: [PATCH 3512/3533] cellular: add missing SMS.get_storage_size

---
 ports/gprs_a9/modcellular.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/gprs_a9/modcellular.c b/ports/gprs_a9/modcellular.c
index dc8a779a57c1b..cc7e563a3d2ff 100644
--- a/ports/gprs_a9/modcellular.c
+++ b/ports/gprs_a9/modcellular.c
@@ -639,6 +639,7 @@ STATIC const mp_rom_map_elem_t sms_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_send), MP_ROM_PTR(&modcellular_sms_send_obj) },
     { MP_ROM_QSTR(MP_QSTR_withdraw), MP_ROM_PTR(&modcellular_sms_withdraw_obj) },
     { MP_ROM_QSTR(MP_QSTR_list), MP_ROM_PTR(&modcellular_sms_list_static_class_obj) },
+    { MP_ROM_QSTR(MP_QSTR_get_storage_size), MP_ROM_PTR(&modcellular_sms_get_storage_size_static_class_obj) },
 };
 
 STATIC MP_DEFINE_CONST_DICT(sms_locals_dict, sms_locals_dict_table);

From 4265a9b8276bb67ea3b033f37dbfb96ac1d689c4 Mon Sep 17 00:00:00 2001
From: oxid <oxid@yandex-team.ru>
Date: Tue, 1 Sep 2020 18:10:51 +0300
Subject: [PATCH 3513/3533] deleting sms by index (useful for cleaning up whole
 memory)

---
 ports/gprs_a9/modcellular.c | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/ports/gprs_a9/modcellular.c b/ports/gprs_a9/modcellular.c
index cc7e563a3d2ff..a4bb3c13f51bf 100644
--- a/ports/gprs_a9/modcellular.c
+++ b/ports/gprs_a9/modcellular.c
@@ -526,6 +526,29 @@ STATIC mp_obj_t modcellular_sms_withdraw(mp_obj_t self_in) {
 
 MP_DEFINE_CONST_FUN_OBJ_1(modcellular_sms_withdraw_obj, &modcellular_sms_withdraw);
 
+STATIC mp_obj_t modcellular_sms_delete_by_index(mp_obj_t index) {
+    // ========================================
+    // Deletes an sms message by its index.
+    // ========================================
+
+    mp_int_t int_index = mp_obj_get_int(index);
+
+    if (!int_index) {
+        mp_raise_ValueError("Cannot delete SMS with zero index");
+        return mp_const_none;
+    }
+
+    if (!SMS_DeleteMessage(int_index, SMS_STATUS_ALL, SMS_STORAGE_SIM_CARD)) {
+        mp_raise_ValueError("Failed to delete SMS");
+        return mp_const_none;
+    }
+
+    return mp_const_none;
+}
+
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(modcellular_sms_delete_by_index_obj, modcellular_sms_delete_by_index);
+STATIC MP_DEFINE_CONST_STATICMETHOD_OBJ(modcellular_sms_delete_by_index_static_class_obj, MP_ROM_PTR(&modcellular_sms_delete_by_index_obj));
+
 STATIC mp_obj_t modcellular_sms_list(void) {
     // ========================================
     // Lists SMS messages.
@@ -615,6 +638,9 @@ STATIC void modcellular_sms_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
         // .get_storage_size[static]
         } else if (attr == MP_QSTR_get_storage_size) {
             mp_convert_member_lookup(self_in, mp_obj_get_type(self_in), (mp_obj_t)MP_ROM_PTR(&modcellular_sms_get_storage_size_static_class_obj), dest);
+        // .delete_by_index[static]
+        } else if (attr == MP_QSTR_delete_by_index) {
+            mp_convert_member_lookup(self_in, mp_obj_get_type(self_in), (mp_obj_t)MP_ROM_PTR(&modcellular_sms_delete_by_index_static_class_obj), dest);
         }
     }
 }

From 6027992eb57618ef1f69b84dbcd9645b4d5ba778 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Mon, 7 Sep 2020 01:22:04 +0200
Subject: [PATCH 3514/3533] cellular: SMS.delete_by_index ->
 SMS._withdraw_by_index

---
 ports/gprs_a9/modcellular.c | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/ports/gprs_a9/modcellular.c b/ports/gprs_a9/modcellular.c
index a4bb3c13f51bf..95aca3a39abbd 100644
--- a/ports/gprs_a9/modcellular.c
+++ b/ports/gprs_a9/modcellular.c
@@ -526,28 +526,30 @@ STATIC mp_obj_t modcellular_sms_withdraw(mp_obj_t self_in) {
 
 MP_DEFINE_CONST_FUN_OBJ_1(modcellular_sms_withdraw_obj, &modcellular_sms_withdraw);
 
-STATIC mp_obj_t modcellular_sms_delete_by_index(mp_obj_t index) {
+STATIC mp_obj_t modcellular_sms__withdraw_by_index(mp_obj_t index) {
     // ========================================
-    // Deletes an sms message by its index.
+    // Withdraw an sms message by its index.
+    // Args:
+    //     index (int): the index of the SMS;
     // ========================================
 
     mp_int_t int_index = mp_obj_get_int(index);
 
     if (!int_index) {
-        mp_raise_ValueError("Cannot delete SMS with zero index");
+        mp_raise_ValueError("Cannot withdraw SMS with zero index");
         return mp_const_none;
     }
 
     if (!SMS_DeleteMessage(int_index, SMS_STATUS_ALL, SMS_STORAGE_SIM_CARD)) {
-        mp_raise_ValueError("Failed to delete SMS");
+        mp_raise_ValueError("Failed to withdraw SMS");
         return mp_const_none;
     }
 
     return mp_const_none;
 }
 
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(modcellular_sms_delete_by_index_obj, modcellular_sms_delete_by_index);
-STATIC MP_DEFINE_CONST_STATICMETHOD_OBJ(modcellular_sms_delete_by_index_static_class_obj, MP_ROM_PTR(&modcellular_sms_delete_by_index_obj));
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(modcellular_sms__withdraw_by_index_obj, modcellular_sms__withdraw_by_index);
+STATIC MP_DEFINE_CONST_STATICMETHOD_OBJ(modcellular_sms__withdraw_by_index_static_class_obj, MP_ROM_PTR(&modcellular_sms__withdraw_by_index_obj));
 
 STATIC mp_obj_t modcellular_sms_list(void) {
     // ========================================
@@ -638,9 +640,9 @@ STATIC void modcellular_sms_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
         // .get_storage_size[static]
         } else if (attr == MP_QSTR_get_storage_size) {
             mp_convert_member_lookup(self_in, mp_obj_get_type(self_in), (mp_obj_t)MP_ROM_PTR(&modcellular_sms_get_storage_size_static_class_obj), dest);
-        // .delete_by_index[static]
-        } else if (attr == MP_QSTR_delete_by_index) {
-            mp_convert_member_lookup(self_in, mp_obj_get_type(self_in), (mp_obj_t)MP_ROM_PTR(&modcellular_sms_delete_by_index_static_class_obj), dest);
+        // ._withdraw_by_index[static]
+        } else if (attr == MP_QSTR__withdraw_by_index) {
+            mp_convert_member_lookup(self_in, mp_obj_get_type(self_in), (mp_obj_t)MP_ROM_PTR(&modcellular_sms__withdraw_by_index_static_class_obj), dest);
         }
     }
 }
@@ -666,6 +668,7 @@ STATIC const mp_rom_map_elem_t sms_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_withdraw), MP_ROM_PTR(&modcellular_sms_withdraw_obj) },
     { MP_ROM_QSTR(MP_QSTR_list), MP_ROM_PTR(&modcellular_sms_list_static_class_obj) },
     { MP_ROM_QSTR(MP_QSTR_get_storage_size), MP_ROM_PTR(&modcellular_sms_get_storage_size_static_class_obj) },
+    { MP_ROM_QSTR(MP_QSTR__withdraw_by_index), MP_ROM_PTR(&modcellular_sms__withdraw_by_index_static_class_obj) },
 };
 
 STATIC MP_DEFINE_CONST_DICT(sms_locals_dict, sms_locals_dict_table);

From 4cc0867bcc118eb4c36d438354a3a4c4e5f47b73 Mon Sep 17 00:00:00 2001
From: oxid <oxid@yandex-team.ru>
Date: Tue, 1 Sep 2020 18:36:58 +0300
Subject: [PATCH 3515/3533] Handler for incoming sms

---
 ports/gprs_a9/modcellular.c | 49 ++++++++++++++++++++++++++++++++++++-
 1 file changed, 48 insertions(+), 1 deletion(-)

diff --git a/ports/gprs_a9/modcellular.c b/ports/gprs_a9/modcellular.c
index 95aca3a39abbd..ba1f5499dd5fd 100644
--- a/ports/gprs_a9/modcellular.c
+++ b/ports/gprs_a9/modcellular.c
@@ -112,6 +112,8 @@ uint8_t sms_list_buffer_count = 0;
 
 // SMS received
 mp_obj_t sms_callback = mp_const_none;
+mp_obj_t new_sms_callback = mp_const_none;
+
 
 // USSD received
 mp_obj_t ussd_callback = mp_const_none;
@@ -316,8 +318,39 @@ void modcellular_notify_sms_error(API_Event_t* event) {
 }
 
 void modcellular_notify_sms_receipt(API_Event_t* event) {
-    if (sms_callback && sms_callback != mp_const_none)
+    if (sms_callback && sms_callback != mp_const_none) {
         mp_sched_schedule(sms_callback, mp_obj_new_int(SMS_RECEIVED));
+    }
+
+    if (new_sms_callback && new_sms_callback != mp_const_none) {
+        SMS_Encode_Type_t encodeType = event->param1;
+        uint32_t content_length = event->param2;
+        uint8_t* header = event->pParam1;
+        uint8_t* content = event->pParam2;
+
+        uint8_t* gbk = NULL;
+        uint32_t gbkLen = 0;
+
+        if (encodeType == SMS_ENCODE_TYPE_UNICODE) {
+            if (!SMS_Unicode2LocalLanguage(content,content_length,CHARSET_UTF_8,&gbk,&gbkLen)) {
+                 mp_raise_ValueError("Failed to convert sms to Unicode");
+            }
+        }
+        else {
+            gbk = content;
+            gbkLen = content_length;
+        }
+
+//     '"+79169542243",,"2020/08/11,23:25:26+03",145,17,0,2,"+79168960438",145,12\r\n', '\u041f\u0440\u0438\u0432\u0435\u0442'
+
+        mp_obj_t sms = modcellular_sms_from_raw(header, strlen(header), gbk, gbkLen);
+
+        if (encodeType == SMS_ENCODE_TYPE_UNICODE) {
+            OS_Free(gbk);
+        }
+
+        mp_sched_schedule(new_sms_callback, sms);
+    }
 }
 
 // Signal level
@@ -1282,6 +1315,19 @@ STATIC mp_obj_t modcellular_on_sms(mp_obj_t callable) {
 
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(modcellular_on_sms_obj, modcellular_on_sms);
 
+STATIC mp_obj_t modcellular_on_new_sms(mp_obj_t callable) {
+    // ========================================
+    // Sets a callback on SMS (receive).
+    // Args:
+    //     callback (Callable): a callback to
+    //     execute on SMS receive.
+    // ========================================
+    new_sms_callback = callable;
+    return mp_const_none;
+}
+
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(modcellular_on_new_sms_obj, modcellular_on_new_sms);
+
 STATIC mp_obj_t modcellular_on_call(mp_obj_t callable) {
     // ========================================
     // Sets a callback on incoming calls.
@@ -1334,6 +1380,7 @@ STATIC const mp_map_elem_t mp_module_cellular_globals_table[] = {
     { MP_OBJ_NEW_QSTR(MP_QSTR_reset), (mp_obj_t)&modcellular_reset_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_on_status_event), (mp_obj_t)&modcellular_on_status_event_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_on_sms), (mp_obj_t)&modcellular_on_sms_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_on_new_sms), (mp_obj_t)&modcellular_on_new_sms_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_on_call), (mp_obj_t)&modcellular_on_call_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_on_ussd), (mp_obj_t)&modcellular_on_ussd_obj },
 

From 5d475089a022d82823b31d0a4d2bc602a2ee4792 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sat, 12 Sep 2020 23:18:43 +0200
Subject: [PATCH 3516/3533] cellular: join on_sms and on_new_sms

---
 ports/gprs_a9/README.md     |  4 ++--
 ports/gprs_a9/modcellular.c | 27 ++-------------------------
 2 files changed, 4 insertions(+), 27 deletions(-)

diff --git a/ports/gprs_a9/README.md b/ports/gprs_a9/README.md
index eedde3f83057f..fe0e0e48940bd 100644
--- a/ports/gprs_a9/README.md
+++ b/ports/gprs_a9/README.md
@@ -133,7 +133,7 @@ The purpose of this module is to have an access to high-level networking (SMS, G
 * `NETWORK_FREQ_BAND_GSM_900P`, `NETWORK_FREQ_BAND_GSM_900E`, `NETWORK_FREQ_BAND_GSM_850`, `NETWORK_FREQ_BAND_DCS_1800`, `NETWORK_FREQ_BAND_PCS_1900`, `NETWORK_FREQ_BANDS_ALL`: frequencies;
 * `OPERATOR_STATUS_UNKNOWN`, `OPERATOR_STATUS_AVAILABLE`, `OPERATOR_STATUS_CURRENT`, `OPERATOR_STATUS_DISABLED`: operator statuses;
 * `NETWORK_MODE_MANUAL`, `NETWORK_MODE_AUTO`, `NETWORK_MODE_MANUAL_AUTO`: network registration modes;
-* `SMS_SENT`, `SMS_RECEIVED`: constants for event handler `on_sms`;
+* `SMS_SENT`: constant for event handler `on_sms`;
 * `ENOSIM`, `EREGD`, `ESMSSEND`, `ESMSDROP`, `ESIMDROP`, `EATTACHMENT`, `EACTIVATION`, `ENODIALTONE`, `EBUSY`, `ENOANSWER`, `ENOCARRIER`, `ECALLTIMEOUT`, `ECALLINPROGRESS`, `ECALLUNKNOWN`: extended codes for `OSError`s raised by the module;
 
 #### Classes
@@ -174,7 +174,7 @@ The purpose of this module is to have an access to high-level networking (SMS, G
 * `dial(tn: {str, bool})`: dial a telephone number if string is supplied or hang up a call if `False`;
 * `ussd(code: str[, timeout: int])` (int, str): USSD request. Unless zero timeout specified, returns USSD response option code and the response text;
 * `on_status_event(callback: Callable)`: sets a callback for network status change. The callback is called with a single integer constant indicating the new network state;
-* `on_sms(callback: Callable)`: sets a callback on SMS sent or received. The callback is called with a single integer constant `SMS_SENT` or `SMS_RECEIVED`;
+* `on_sms(callback: Callable)`: sets a callback on SMS sent or received. The callback is called with a single integer constant `SMS_SENT` indicating a sent SMS or with an `SMS` object for received SMS;
 * `on_call(callback: Callable)`: sets a callback on call events (incoming, hangup, etc.);
 * ~~`network_status_changed()` (bool): indicates whether the network status changed since the last check~~ use `on_status_event` instead;
 * ~~`call()` (list[str], [str, None]): calls missed (1st output) and the incoming call number or `None` if no incoming calls at the moment (2nd output)~~ use `on_call` instead;
diff --git a/ports/gprs_a9/modcellular.c b/ports/gprs_a9/modcellular.c
index ba1f5499dd5fd..59e7910fc4480 100644
--- a/ports/gprs_a9/modcellular.c
+++ b/ports/gprs_a9/modcellular.c
@@ -75,7 +75,6 @@
 #define NTW_EXC_CALL_UNKNOWN 0x6E16
 
 #define SMS_SENT 1
-#define SMS_RECEIVED 2
 
 #define MAX_NUMBER_LEN 16
 #define MAX_CALLS_MISSED 15
@@ -112,7 +111,6 @@ uint8_t sms_list_buffer_count = 0;
 
 // SMS received
 mp_obj_t sms_callback = mp_const_none;
-mp_obj_t new_sms_callback = mp_const_none;
 
 
 // USSD received
@@ -319,10 +317,6 @@ void modcellular_notify_sms_error(API_Event_t* event) {
 
 void modcellular_notify_sms_receipt(API_Event_t* event) {
     if (sms_callback && sms_callback != mp_const_none) {
-        mp_sched_schedule(sms_callback, mp_obj_new_int(SMS_RECEIVED));
-    }
-
-    if (new_sms_callback && new_sms_callback != mp_const_none) {
         SMS_Encode_Type_t encodeType = event->param1;
         uint32_t content_length = event->param2;
         uint8_t* header = event->pParam1;
@@ -341,15 +335,13 @@ void modcellular_notify_sms_receipt(API_Event_t* event) {
             gbkLen = content_length;
         }
 
-//     '"+79169542243",,"2020/08/11,23:25:26+03",145,17,0,2,"+79168960438",145,12\r\n', '\u041f\u0440\u0438\u0432\u0435\u0442'
-
-        mp_obj_t sms = modcellular_sms_from_raw(header, strlen(header), gbk, gbkLen);
+        mp_obj_t sms = modcellular_sms_from_raw(header, strlen((char*) header), gbk, gbkLen);
 
         if (encodeType == SMS_ENCODE_TYPE_UNICODE) {
             OS_Free(gbk);
         }
 
-        mp_sched_schedule(new_sms_callback, sms);
+        mp_sched_schedule(sms_callback, sms);
     }
 }
 
@@ -1315,19 +1307,6 @@ STATIC mp_obj_t modcellular_on_sms(mp_obj_t callable) {
 
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(modcellular_on_sms_obj, modcellular_on_sms);
 
-STATIC mp_obj_t modcellular_on_new_sms(mp_obj_t callable) {
-    // ========================================
-    // Sets a callback on SMS (receive).
-    // Args:
-    //     callback (Callable): a callback to
-    //     execute on SMS receive.
-    // ========================================
-    new_sms_callback = callable;
-    return mp_const_none;
-}
-
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(modcellular_on_new_sms_obj, modcellular_on_new_sms);
-
 STATIC mp_obj_t modcellular_on_call(mp_obj_t callable) {
     // ========================================
     // Sets a callback on incoming calls.
@@ -1380,7 +1359,6 @@ STATIC const mp_map_elem_t mp_module_cellular_globals_table[] = {
     { MP_OBJ_NEW_QSTR(MP_QSTR_reset), (mp_obj_t)&modcellular_reset_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_on_status_event), (mp_obj_t)&modcellular_on_status_event_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_on_sms), (mp_obj_t)&modcellular_on_sms_obj },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_on_new_sms), (mp_obj_t)&modcellular_on_new_sms_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_on_call), (mp_obj_t)&modcellular_on_call_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_on_ussd), (mp_obj_t)&modcellular_on_ussd_obj },
 
@@ -1401,7 +1379,6 @@ STATIC const mp_map_elem_t mp_module_cellular_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_NETWORK_MODE_MANUAL_AUTO), MP_ROM_INT(NETWORK_REGISTER_MODE_MANUAL_AUTO) },
     
     { MP_ROM_QSTR(MP_QSTR_SMS_SENT), MP_ROM_INT(SMS_SENT) },
-    { MP_ROM_QSTR(MP_QSTR_SMS_RECEIVED), MP_ROM_INT(SMS_RECEIVED) },
 
     { MP_ROM_QSTR(MP_QSTR_ENOSIM), MP_ROM_INT(NTW_EXC_NOSIM) },
     { MP_ROM_QSTR(MP_QSTR_EREGD), MP_ROM_INT(NTW_EXC_REG_DENIED) },

From 624b5290837f05850c6eed2894fd71524427ba02 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sat, 12 Sep 2020 23:38:45 +0200
Subject: [PATCH 3517/3533] cellular: a more consistent SMS constructor

---
 ports/gprs_a9/modcellular.c | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/ports/gprs_a9/modcellular.c b/ports/gprs_a9/modcellular.c
index 59e7910fc4480..3c7cc8c301ffa 100644
--- a/ports/gprs_a9/modcellular.c
+++ b/ports/gprs_a9/modcellular.c
@@ -411,7 +411,7 @@ typedef struct _sms_obj_t {
     mp_obj_base_t base;
     uint8_t index;
     uint8_t status;
-    uint8_t phone_number_type;
+    uint8_t pn_type;
     mp_obj_t phone_number;
     mp_obj_t message;
 } sms_obj_t;
@@ -424,10 +424,13 @@ mp_obj_t modcellular_sms_make_new(const mp_obj_type_t *type, size_t n_args, size
     //     message (str): message contents;
     // ========================================
 
-    enum { ARG_phone_number, ARG_message };
+    enum { ARG_phone_number, ARG_message, ARG_pn_type, ARG_index, ARG_status };
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_phone_number, MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
         { MP_QSTR_message, MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
+        { MP_QSTR_pn_type, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 0} }, 
+        { MP_QSTR_index, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 0} }, 
+        { MP_QSTR_status, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 0} }, 
     };
 
     mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
@@ -435,10 +438,9 @@ mp_obj_t modcellular_sms_make_new(const mp_obj_type_t *type, size_t n_args, size
 
     sms_obj_t *self = m_new_obj(sms_obj_t);
     self->base.type = type;
-    self->index = 0;
-    self->status = 0;
-    // TODO: fix the following
-    self->phone_number_type = 0;
+    self->index = args[ARG_index].u_int;
+    self->status = args[ARG_status].u_int;
+    self->pn_type = args[ARG_pn_type].u_int;
     self->phone_number = args[ARG_phone_number].u_obj;
     self->message = args[ARG_message].u_obj;
     return MP_OBJ_FROM_PTR(self);
@@ -677,14 +679,12 @@ STATIC void modcellular_sms_print(const mp_print_t *print, mp_obj_t self_in, mp_
     // SMS.__str__()
     // ========================================
     sms_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    mp_printf(print, "SMS(\"%s\"(%s), \"%s\", 0x%02x, #%d)",
+    mp_printf(print, "SMS(\"%s\", \"%s\", pn_type=%d, index=%d, status=%d)",
             mp_obj_str_get_str(self->phone_number),
-            self->phone_number_type == SMS_NUMBER_TYPE_UNKNOWN ? "unk" :
-            self->phone_number_type == SMS_NUMBER_TYPE_INTERNATIONAL ? "int" :
-            self->phone_number_type == SMS_NUMBER_TYPE_NATIONAL ? "loc" : "???",
             mp_obj_str_get_str(self->message),
-            self->status,
-            self->index
+            self->pn_type,
+            self->index,
+            self->status
     );
 }
 
@@ -721,7 +721,7 @@ STATIC mp_obj_t modcellular_sms_from_record(SMS_Message_Info_t* record) {
     self->base.type = &modcellular_sms_type;
     self->index = record->index;
     self->status = (uint8_t)record->status;
-    self->phone_number_type = (uint8_t)record->phoneNumberType;
+    self->pn_type = (uint8_t)record->phoneNumberType;
     self->phone_number = mp_obj_new_str((char*)record->phoneNumber + 1, SMS_PHONE_NUMBER_MAX_LEN - 1);
     self->message = mp_obj_new_str((char*)record->data, record->dataLen);
     return MP_OBJ_FROM_PTR(self);
@@ -755,7 +755,7 @@ STATIC mp_obj_t modcellular_sms_from_raw(uint8_t* header, uint32_t header_length
     self->base.type = &modcellular_sms_type;
     self->index = 0;
     self->status = 0;
-    self->phone_number_type = 0;
+    self->pn_type = 0;
     self->phone_number = mp_obj_new_str((char*)header + 1, i - 1);
     self->message = mp_obj_new_str((char*)content, content_length);
     return MP_OBJ_FROM_PTR(self);

From 09b8c2ee2b614c6d6c05d09f94db38a28d512bfb Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sat, 12 Sep 2020 23:47:53 +0200
Subject: [PATCH 3518/3533] cellular: rename SMS status -> purpose

---
 ports/gprs_a9/modcellular.c | 46 ++++++++++++++++++-------------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/ports/gprs_a9/modcellular.c b/ports/gprs_a9/modcellular.c
index 3c7cc8c301ffa..a39e72684f8e6 100644
--- a/ports/gprs_a9/modcellular.c
+++ b/ports/gprs_a9/modcellular.c
@@ -409,11 +409,11 @@ void modcellular_notify_cell_info(API_Event_t* event) {
 
 typedef struct _sms_obj_t {
     mp_obj_base_t base;
-    uint8_t index;
-    uint8_t status;
-    uint8_t pn_type;
     mp_obj_t phone_number;
     mp_obj_t message;
+    uint8_t pn_type;
+    uint8_t index;
+    uint8_t purpose;
 } sms_obj_t;
 
 mp_obj_t modcellular_sms_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
@@ -424,13 +424,13 @@ mp_obj_t modcellular_sms_make_new(const mp_obj_type_t *type, size_t n_args, size
     //     message (str): message contents;
     // ========================================
 
-    enum { ARG_phone_number, ARG_message, ARG_pn_type, ARG_index, ARG_status };
+    enum { ARG_phone_number, ARG_message, ARG_pn_type, ARG_index, ARG_purpose };
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_phone_number, MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
         { MP_QSTR_message, MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
         { MP_QSTR_pn_type, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 0} }, 
         { MP_QSTR_index, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 0} }, 
-        { MP_QSTR_status, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 0} }, 
+        { MP_QSTR_purpose, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 0} }, 
     };
 
     mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
@@ -438,11 +438,11 @@ mp_obj_t modcellular_sms_make_new(const mp_obj_type_t *type, size_t n_args, size
 
     sms_obj_t *self = m_new_obj(sms_obj_t);
     self->base.type = type;
-    self->index = args[ARG_index].u_int;
-    self->status = args[ARG_status].u_int;
-    self->pn_type = args[ARG_pn_type].u_int;
     self->phone_number = args[ARG_phone_number].u_obj;
     self->message = args[ARG_message].u_obj;
+    self->pn_type = args[ARG_pn_type].u_int;
+    self->index = args[ARG_index].u_int;
+    self->purpose = args[ARG_purpose].u_int;
     return MP_OBJ_FROM_PTR(self);
 }
 
@@ -459,7 +459,7 @@ STATIC mp_obj_t modcellular_sms_inbox(mp_obj_t self_in) {
     //     True if inbox.
     // ========================================
     sms_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    uint8_t s = self->status;
+    uint8_t s = self->purpose;
     REQUIRES_VALID_SMS_STATUS(s);
     return mp_obj_new_bool(s & (SMS_STATUS_READ | SMS_STATUS_UNREAD));
 }
@@ -471,7 +471,7 @@ STATIC mp_obj_t modcellular_sms_unread(mp_obj_t self_in) {
     //     True if unread.
     // ========================================
     sms_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    uint8_t s = self->status;
+    uint8_t s = self->purpose;
     REQUIRES_VALID_SMS_STATUS(s);
     return mp_obj_new_bool(s & SMS_STATUS_UNREAD);
 }
@@ -483,7 +483,7 @@ STATIC mp_obj_t modcellular_sms_sent(mp_obj_t self_in) {
     //     True if it was sent.
     // ========================================
     sms_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    uint8_t s = self->status;
+    uint8_t s = self->purpose;
     REQUIRES_VALID_SMS_STATUS(s);
     return mp_obj_new_bool(!(s | SMS_STATUS_UNSENT));
 }
@@ -502,8 +502,8 @@ STATIC mp_obj_t modcellular_sms_send(size_t n_args, const mp_obj_t *args) {
 
     sms_obj_t *self = MP_OBJ_TO_PTR(args[0]);
 
-    if (self->status != 0)
-        mp_raise_ValueError("A message with non-zero status cannot be sent");
+    if (self->purpose != 0)
+        mp_raise_ValueError("A message with non-zero purpose cannot be sent");
 
     const char* destination_c = mp_obj_str_get_str(self->phone_number);
     const char* message_c = mp_obj_str_get_str(self->message);
@@ -536,8 +536,8 @@ STATIC mp_obj_t modcellular_sms_withdraw(mp_obj_t self_in) {
 
     sms_obj_t *self = MP_OBJ_TO_PTR(self_in);
 
-    if (self->index == 0 || self->status == 0) {
-        mp_raise_ValueError("Cannot withdraw SMS with zero index/status");
+    if (self->index == 0 || self->purpose == 0) {
+        mp_raise_ValueError("Cannot withdraw SMS with zero index/purpose");
         return mp_const_none;
     }
 
@@ -546,7 +546,7 @@ STATIC mp_obj_t modcellular_sms_withdraw(mp_obj_t self_in) {
         return mp_const_none;
     }
 
-    self->status = 0;
+    self->purpose = 0;
     self->index = 0;
     return mp_const_none;
 }
@@ -643,9 +643,9 @@ STATIC void modcellular_sms_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
         // .message
         } else if (attr == MP_QSTR_message) {
             dest[0] = self->message;
-        // .status
-        } else if (attr == MP_QSTR_status) {
-            dest[0] = mp_obj_new_int(self->status);
+        // .purpose
+        } else if (attr == MP_QSTR_purpose) {
+            dest[0] = mp_obj_new_int(self->purpose);
         // .inbox
         } else if (attr == MP_QSTR_inbox) {
             dest[0] = modcellular_sms_inbox(self_in);
@@ -679,12 +679,12 @@ STATIC void modcellular_sms_print(const mp_print_t *print, mp_obj_t self_in, mp_
     // SMS.__str__()
     // ========================================
     sms_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    mp_printf(print, "SMS(\"%s\", \"%s\", pn_type=%d, index=%d, status=%d)",
+    mp_printf(print, "SMS(\"%s\", \"%s\", pn_type=%d, index=%d, purpose=%d)",
             mp_obj_str_get_str(self->phone_number),
             mp_obj_str_get_str(self->message),
             self->pn_type,
             self->index,
-            self->status
+            self->purpose
     );
 }
 
@@ -720,7 +720,7 @@ STATIC mp_obj_t modcellular_sms_from_record(SMS_Message_Info_t* record) {
     sms_obj_t *self = m_new_obj_with_finaliser(sms_obj_t);
     self->base.type = &modcellular_sms_type;
     self->index = record->index;
-    self->status = (uint8_t)record->status;
+    self->purpose = (uint8_t)record->status;
     self->pn_type = (uint8_t)record->phoneNumberType;
     self->phone_number = mp_obj_new_str((char*)record->phoneNumber + 1, SMS_PHONE_NUMBER_MAX_LEN - 1);
     self->message = mp_obj_new_str((char*)record->data, record->dataLen);
@@ -754,7 +754,7 @@ STATIC mp_obj_t modcellular_sms_from_raw(uint8_t* header, uint32_t header_length
     sms_obj_t *self = m_new_obj_with_finaliser(sms_obj_t);
     self->base.type = &modcellular_sms_type;
     self->index = 0;
-    self->status = 0;
+    self->purpose = 0;
     self->pn_type = 0;
     self->phone_number = mp_obj_new_str((char*)header + 1, i - 1);
     self->message = mp_obj_new_str((char*)content, content_length);

From 7769fd0f441fe64ce9a92f96b8f3e03d8152bf1e Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sat, 12 Sep 2020 23:54:27 +0200
Subject: [PATCH 3519/3533] cellular: add pn_type and index as readable fields

---
 ports/gprs_a9/modcellular.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/ports/gprs_a9/modcellular.c b/ports/gprs_a9/modcellular.c
index a39e72684f8e6..0e83714b048db 100644
--- a/ports/gprs_a9/modcellular.c
+++ b/ports/gprs_a9/modcellular.c
@@ -643,6 +643,12 @@ STATIC void modcellular_sms_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
         // .message
         } else if (attr == MP_QSTR_message) {
             dest[0] = self->message;
+        // .pn_type
+        } else if (attr == MP_QSTR_pn_type) {
+            dest[0] = mp_obj_new_int(self->pn_type);
+        // .index
+        } else if (attr == MP_QSTR_index) {
+            dest[0] = mp_obj_new_int(self->index);
         // .purpose
         } else if (attr == MP_QSTR_purpose) {
             dest[0] = mp_obj_new_int(self->purpose);

From 9d80323fd84478df9a80ebcd0413c4faabc0f140 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sun, 13 Sep 2020 00:13:39 +0200
Subject: [PATCH 3520/3533] cellular: remove several SMS functions in favor of
 read-only fields

---
 ports/gprs_a9/README.md     | 11 ++++---
 ports/gprs_a9/modcellular.c | 63 +++++++------------------------------
 2 files changed, 18 insertions(+), 56 deletions(-)

diff --git a/ports/gprs_a9/README.md b/ports/gprs_a9/README.md
index fe0e0e48940bd..5639f7deb0c7a 100644
--- a/ports/gprs_a9/README.md
+++ b/ports/gprs_a9/README.md
@@ -138,13 +138,14 @@ The purpose of this module is to have an access to high-level networking (SMS, G
 
 #### Classes
 
-* `SMS(phone_number: str, message: str)`: handles SMS messages;
+* `SMS(phone_number: str, message: str[, pn_type: int, index: int, purpose: int])`: handles SMS messages;
   * `.phone_number` (str): phone number (sender or destination);
   * `.message` (str): message contents;
-  * `.status` (int): integer with status bits;
-  * `.inbox` (bool): incoming message if `True`, outgoing message if `False` or unknown status if `None`;
-  * `.unread` (bool): unread message if `True`, previously read message if `False` or unknown status if `None`;
-  * `.sent` (bool): sent message if `True`, not sent message if `False` or unknown status if `None`;
+  * `.purpose` (int): integer with purpose/status bits;
+  * `.is_inbox` (bool): indicates incoming message;
+  * `.is_read` (bool): indicates message was previously read;
+  * `.is_unread` (bool): indicates unread message;
+  * `.is_unsent` (bool): indicates unsent message;
   * `.send(timeout: int)`: sends a message;
   * `.withdraw()`: withdraws SMS from SIM storage;
   * `.list()` (list) [staticmethod]: all SMS from the SIM card;
diff --git a/ports/gprs_a9/modcellular.c b/ports/gprs_a9/modcellular.c
index 0e83714b048db..ec99f2d1889bd 100644
--- a/ports/gprs_a9/modcellular.c
+++ b/ports/gprs_a9/modcellular.c
@@ -446,48 +446,6 @@ mp_obj_t modcellular_sms_make_new(const mp_obj_type_t *type, size_t n_args, size
     return MP_OBJ_FROM_PTR(self);
 }
 
-uint8_t bitsum(uint32_t i) {
-     i = i - ((i >> 1) & 0x55555555);
-     i = (i & 0x33333333) + ((i >> 2) & 0x33333333);
-     return (((i + (i >> 4)) & 0x0F0F0F0F) * 0x01010101) >> 24;
-}
-
-STATIC mp_obj_t modcellular_sms_inbox(mp_obj_t self_in) {
-    // ========================================
-    // Determines if SMS is inbox or outbox.
-    // Returns:
-    //     True if inbox.
-    // ========================================
-    sms_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    uint8_t s = self->purpose;
-    REQUIRES_VALID_SMS_STATUS(s);
-    return mp_obj_new_bool(s & (SMS_STATUS_READ | SMS_STATUS_UNREAD));
-}
-
-STATIC mp_obj_t modcellular_sms_unread(mp_obj_t self_in) {
-    // ========================================
-    // Determines if SMS is unread.
-    // Returns:
-    //     True if unread.
-    // ========================================
-    sms_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    uint8_t s = self->purpose;
-    REQUIRES_VALID_SMS_STATUS(s);
-    return mp_obj_new_bool(s & SMS_STATUS_UNREAD);
-}
-
-STATIC mp_obj_t modcellular_sms_sent(mp_obj_t self_in) {
-    // ========================================
-    // Determines if SMS was sent.
-    // Returns:
-    //     True if it was sent.
-    // ========================================
-    sms_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    uint8_t s = self->purpose;
-    REQUIRES_VALID_SMS_STATUS(s);
-    return mp_obj_new_bool(!(s | SMS_STATUS_UNSENT));
-}
-
 STATIC mp_obj_t modcellular_sms_send(size_t n_args, const mp_obj_t *args) {
     // ========================================
     // Sends an SMS messsage.
@@ -652,15 +610,18 @@ STATIC void modcellular_sms_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
         // .purpose
         } else if (attr == MP_QSTR_purpose) {
             dest[0] = mp_obj_new_int(self->purpose);
-        // .inbox
-        } else if (attr == MP_QSTR_inbox) {
-            dest[0] = modcellular_sms_inbox(self_in);
-        // .unread
-        } else if (attr == MP_QSTR_unread) {
-            dest[0] = modcellular_sms_unread(self_in);
-        // .sent
-        } else if (attr == MP_QSTR_sent) {
-            dest[0] = modcellular_sms_sent(self_in);
+        // .is_inbox
+        } else if (attr == MP_QSTR_is_inbox) {
+            dest[0] = mp_obj_new_bool(self->purpose & (SMS_STATUS_READ | SMS_STATUS_UNREAD));
+        // .is_read
+        } else if (attr == MP_QSTR_is_read) {
+            dest[0] = mp_obj_new_bool(self->purpose & SMS_STATUS_READ);
+        // .is_unread
+        } else if (attr == MP_QSTR_is_unread) {
+            dest[0] = mp_obj_new_bool(self->purpose & SMS_STATUS_UNREAD);
+        // .is_unsent
+        } else if (attr == MP_QSTR_is_unsent) {
+            dest[0] = mp_obj_new_bool(self->purpose & SMS_STATUS_UNSENT);
         // .send
         } else if (attr == MP_QSTR_send) {
             mp_convert_member_lookup(self_in, mp_obj_get_type(self_in), (mp_obj_t)MP_ROM_PTR(&modcellular_sms_send_obj), dest);

From 2d024afc7f58168ca2209395761f400a24cfc74d Mon Sep 17 00:00:00 2001
From: Ubaldo Porcheddu <ubaldo@eja.it>
Date: Wed, 9 Sep 2020 15:36:17 +0100
Subject: [PATCH 3521/3533] add power key handler

---
 ports/gprs_a9/main.c       |  8 ++++++++
 ports/gprs_a9/modmachine.c | 27 +++++++++++++++++++++++++++
 ports/gprs_a9/modmachine.h |  2 ++
 3 files changed, 37 insertions(+)

diff --git a/ports/gprs_a9/main.c b/ports/gprs_a9/main.c
index 012029e09e2e3..bec8b8b79eb55 100644
--- a/ports/gprs_a9/main.c
+++ b/ports/gprs_a9/main.c
@@ -242,6 +242,14 @@ void EventDispatch(API_Event_t* pEvent)
             modmachine_notify_power_on(pEvent);
             break;
 
+        case API_EVENT_ID_KEY_DOWN:
+            modmachine_notify_power_key_down(pEvent);
+            break;
+        
+        case API_EVENT_ID_KEY_UP:
+            modmachine_notify_power_key_up(pEvent);
+            break;
+
         // Network
         // =======
 
diff --git a/ports/gprs_a9/modmachine.c b/ports/gprs_a9/modmachine.c
index 40082c022a66f..2fa1071a255b0 100644
--- a/ports/gprs_a9/modmachine.c
+++ b/ports/gprs_a9/modmachine.c
@@ -41,12 +41,14 @@
 #include "api_hal_adc.h"
 
 STATIC mp_obj_t modmachine_watchdog_off(void);
+STATIC mp_obj_t power_key = mp_const_none;
 
 void modmachine_init0(void) {
     PM_SetSysMinFreq(PM_SYS_FREQ_312M);
     modmachine_watchdog_off();
     modmachine_pin_init0();
     modmachine_uart_init0();
+    power_key = mp_const_none;
 }
 
 // ------
@@ -203,6 +205,30 @@ STATIC mp_obj_t modmachine_watchdog_reset(void) {
 
 STATIC MP_DEFINE_CONST_FUN_OBJ_0(modmachine_watchdog_reset_obj, modmachine_watchdog_reset);
 
+void modmachine_notify_power_key_down(API_Event_t* event) {
+    if (power_key && power_key != mp_const_none) {
+        mp_sched_schedule(power_key, mp_obj_new_int(1));
+    }
+}
+ 
+void modmachine_notify_power_key_up(API_Event_t* event) {
+    if (power_key && power_key != mp_const_none) {
+        mp_sched_schedule(power_key, mp_obj_new_int(0));
+    }
+}
+
+STATIC mp_obj_t modmachine_on_power_key(mp_obj_t callable) {
+    // ========================================
+    // Sets a callback on power key press.
+    // Args:
+    //     callback (Callable): a callback to
+    //     execute on power key press.
+    // ========================================
+    power_key = callable;
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(modmachine_on_power_key_obj, modmachine_on_power_key);
+
 STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_umachine) },
     { MP_ROM_QSTR(MP_QSTR_Pin), MP_ROM_PTR(&machine_pin_type) },
@@ -213,6 +239,7 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     { MP_OBJ_NEW_QSTR(MP_QSTR_set_idle), (mp_obj_t)&modmachine_set_idle_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_set_min_freq), (mp_obj_t)&modmachine_set_min_freq_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_power_on_cause), (mp_obj_t)&modmachine_power_on_cause_obj },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_on_power_key), (mp_obj_t)&modmachine_on_power_key_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_off), (mp_obj_t)&modmachine_off_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_get_input_voltage), (mp_obj_t)&modmachine_get_input_voltage_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_watchdog_on), (mp_obj_t)&modmachine_watchdog_on_obj },
diff --git a/ports/gprs_a9/modmachine.h b/ports/gprs_a9/modmachine.h
index abcfc12559758..2cd34d5a4cea0 100644
--- a/ports/gprs_a9/modmachine.h
+++ b/ports/gprs_a9/modmachine.h
@@ -51,3 +51,5 @@ void modmachine_uart_init0(void);
 void modmachine_init0(void);
 
 void modmachine_notify_power_on(API_Event_t* event);
+void modmachine_notify_power_key_down(API_Event_t* event);
+void modmachine_notify_power_key_up(API_Event_t* event);
\ No newline at end of file

From 62c8ecd9bc89d78e6c1e59f111332eb42efb2679 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sun, 13 Sep 2020 00:34:04 +0200
Subject: [PATCH 3522/3533] machine, cellular: post-merge cleanup

---
 ports/gprs_a9/modcellular.h |  1 -
 ports/gprs_a9/modmachine.c  | 24 ++++++++++++------------
 ports/gprs_a9/modmachine.h  |  3 ++-
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/ports/gprs_a9/modcellular.h b/ports/gprs_a9/modcellular.h
index 8a6c913294892..5e9c3f5e3aa1c 100644
--- a/ports/gprs_a9/modcellular.h
+++ b/ports/gprs_a9/modcellular.h
@@ -78,5 +78,4 @@ void modcellular_notify_incoming_ussd(API_Event_t* event);
 #define TIMEOUT_USSD_RESPONSE 5000
 
 #define REQUIRES_NETWORK_REGISTRATION do {if (!network_status) {mp_raise_RuntimeError("Network is not available: is SIM card inserted?"); return mp_const_none;}} while(0)
-#define REQUIRES_VALID_SMS_STATUS(bits) do {if (bitsum(bits) != 1) {return mp_const_none;}} while(0)
 
diff --git a/ports/gprs_a9/modmachine.c b/ports/gprs_a9/modmachine.c
index 2fa1071a255b0..c95bacc0b4751 100644
--- a/ports/gprs_a9/modmachine.c
+++ b/ports/gprs_a9/modmachine.c
@@ -61,6 +61,18 @@ void modmachine_notify_power_on(API_Event_t* event) {
     powerOnCause = event->param1;
 }
 
+void modmachine_notify_power_key_down(API_Event_t* event) {
+    if (power_key && power_key != mp_const_none) {
+        mp_sched_schedule(power_key, mp_obj_new_int(1));
+    }
+}
+ 
+void modmachine_notify_power_key_up(API_Event_t* event) {
+    if (power_key && power_key != mp_const_none) {
+        mp_sched_schedule(power_key, mp_obj_new_int(0));
+    }
+}
+
 // -------
 // Methods
 // -------
@@ -205,18 +217,6 @@ STATIC mp_obj_t modmachine_watchdog_reset(void) {
 
 STATIC MP_DEFINE_CONST_FUN_OBJ_0(modmachine_watchdog_reset_obj, modmachine_watchdog_reset);
 
-void modmachine_notify_power_key_down(API_Event_t* event) {
-    if (power_key && power_key != mp_const_none) {
-        mp_sched_schedule(power_key, mp_obj_new_int(1));
-    }
-}
- 
-void modmachine_notify_power_key_up(API_Event_t* event) {
-    if (power_key && power_key != mp_const_none) {
-        mp_sched_schedule(power_key, mp_obj_new_int(0));
-    }
-}
-
 STATIC mp_obj_t modmachine_on_power_key(mp_obj_t callable) {
     // ========================================
     // Sets a callback on power key press.
diff --git a/ports/gprs_a9/modmachine.h b/ports/gprs_a9/modmachine.h
index 2cd34d5a4cea0..24e275eaac6ab 100644
--- a/ports/gprs_a9/modmachine.h
+++ b/ports/gprs_a9/modmachine.h
@@ -52,4 +52,5 @@ void modmachine_init0(void);
 
 void modmachine_notify_power_on(API_Event_t* event);
 void modmachine_notify_power_key_down(API_Event_t* event);
-void modmachine_notify_power_key_up(API_Event_t* event);
\ No newline at end of file
+void modmachine_notify_power_key_up(API_Event_t* event);
+

From 3a0056b34340d0510e108915125b6e5e4f8459ad Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sun, 13 Sep 2020 00:48:59 +0200
Subject: [PATCH 3523/3533] readme: add new API

[skip ci]
---
 ports/gprs_a9/README.md | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/ports/gprs_a9/README.md b/ports/gprs_a9/README.md
index 5639f7deb0c7a..83df02471651a 100644
--- a/ports/gprs_a9/README.md
+++ b/ports/gprs_a9/README.md
@@ -259,7 +259,12 @@ This is only available in the A9G module where GPS is a separate chip connected
 
 Provides power-related functions: power, watchdogs.
 
-* `POWER_ON_CAUSE_ALARM`, `POWER_ON_CAUSE_CHARGE`, `POWER_ON_CAUSE_EXCEPTION`, `POWER_ON_CAUSE_KEY`, `POWER_ON_CAUSE_MAX`, `POWER_ON_CAUSE_RESET`: power-on flags;
+#### Constants
+
+* `POWER_ON_CAUSE_ALARM`, `POWER_ON_CAUSE_CHARGE`, `POWER_ON_CAUSE_EXCEPTION`, `POWER_ON_CAUSE_KEY`, `POWER_ON_CAUSE_MAX`, `POWER_ON_CAUSE_RESET`: power-on flags.
+
+#### Methods
+
 * `reset()`: hard-resets the module;
 * `off()`: powers the module down. **TODO**: By fact, hard-resets the module, at least when USB-powered. Figure out what's wrong;
 * `idle()`: tunes the clock rate down and turns off peripherials;
@@ -268,6 +273,7 @@ Provides power-related functions: power, watchdogs.
 * `watchdog_on(timeout: int)`: arms the hardware watchdog with a timeout in seconds;
 * `watchdog_off()`: disarms the hardware watchdog;
 * `watchdog_reset()`: resets the timer on the hardware watchdog;
+* `on_power_key(callback: Callable)`: sets a callback `function(is_power_key_down: bool)` on power key events.
   
 ### `i2c`
 

From b687cee7e10578af8239734bf1b5a941d5c0ab2b Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sun, 13 Sep 2020 00:50:20 +0200
Subject: [PATCH 3524/3533] machine: change int->bool for on_power_key callback

---
 ports/gprs_a9/modmachine.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/ports/gprs_a9/modmachine.c b/ports/gprs_a9/modmachine.c
index c95bacc0b4751..cfefffe3dbf83 100644
--- a/ports/gprs_a9/modmachine.c
+++ b/ports/gprs_a9/modmachine.c
@@ -41,14 +41,14 @@
 #include "api_hal_adc.h"
 
 STATIC mp_obj_t modmachine_watchdog_off(void);
-STATIC mp_obj_t power_key = mp_const_none;
+STATIC mp_obj_t power_key_callback = mp_const_none;
 
 void modmachine_init0(void) {
     PM_SetSysMinFreq(PM_SYS_FREQ_312M);
     modmachine_watchdog_off();
     modmachine_pin_init0();
     modmachine_uart_init0();
-    power_key = mp_const_none;
+    power_key_callback = mp_const_none;
 }
 
 // ------
@@ -62,14 +62,14 @@ void modmachine_notify_power_on(API_Event_t* event) {
 }
 
 void modmachine_notify_power_key_down(API_Event_t* event) {
-    if (power_key && power_key != mp_const_none) {
-        mp_sched_schedule(power_key, mp_obj_new_int(1));
+    if (power_key_callback && power_key_callback != mp_const_none) {
+        mp_sched_schedule(power_key_callback, mp_obj_new_bool(1));
     }
 }
  
 void modmachine_notify_power_key_up(API_Event_t* event) {
-    if (power_key && power_key != mp_const_none) {
-        mp_sched_schedule(power_key, mp_obj_new_int(0));
+    if (power_key_callback && power_key_callback != mp_const_none) {
+        mp_sched_schedule(power_key_callback, mp_obj_new_bool(0));
     }
 }
 
@@ -224,7 +224,7 @@ STATIC mp_obj_t modmachine_on_power_key(mp_obj_t callable) {
     //     callback (Callable): a callback to
     //     execute on power key press.
     // ========================================
-    power_key = callable;
+    power_key_callback = callable;
     return mp_const_none;
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(modmachine_on_power_key_obj, modmachine_on_power_key);

From 522ab5657e0355d1041fba3d87b68488d2ef3e34 Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Sun, 13 Sep 2020 00:57:33 +0200
Subject: [PATCH 3525/3533] readme: adjustments

---
 ports/gprs_a9/README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ports/gprs_a9/README.md b/ports/gprs_a9/README.md
index 83df02471651a..008983ee59b69 100644
--- a/ports/gprs_a9/README.md
+++ b/ports/gprs_a9/README.md
@@ -174,9 +174,9 @@ The purpose of this module is to have an access to high-level networking (SMS, G
 * `gprs([apn: {str, bool}[, user: str, pass: str[, timeout: int]]])` (bool): activate (3 or 4 arguments), deactivate (`gprs(False)`) or obtain the status of GPRS (on/off) if no arguments supplied;
 * `dial(tn: {str, bool})`: dial a telephone number if string is supplied or hang up a call if `False`;
 * `ussd(code: str[, timeout: int])` (int, str): USSD request. Unless zero timeout specified, returns USSD response option code and the response text;
-* `on_status_event(callback: Callable)`: sets a callback for network status change. The callback is called with a single integer constant indicating the new network state;
-* `on_sms(callback: Callable)`: sets a callback on SMS sent or received. The callback is called with a single integer constant `SMS_SENT` indicating a sent SMS or with an `SMS` object for received SMS;
-* `on_call(callback: Callable)`: sets a callback on call events (incoming, hangup, etc.);
+* `on_status_event(callback: Callable)`: sets a callback `function(status: int)` for network status change;
+* `on_sms(callback: Callable)`: sets a callback `function(sms_or_status)` on SMS sent or received;;
+* `on_call(callback: Callable)`: sets a callback `function(number_or_hangup)` on call events (incoming, hangup, etc.);
 * ~~`network_status_changed()` (bool): indicates whether the network status changed since the last check~~ use `on_status_event` instead;
 * ~~`call()` (list[str], [str, None]): calls missed (1st output) and the incoming call number or `None` if no incoming calls at the moment (2nd output)~~ use `on_call` instead;
 

From 3553a2e2c87829edb94c48e328c92c1e1132b60b Mon Sep 17 00:00:00 2001
From: Artem <gpulkin@gmail.com>
Date: Mon, 14 Sep 2020 20:37:50 +0200
Subject: [PATCH 3526/3533] readme: community chat badge #85

[skip ci]
---
 ports/gprs_a9/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/gprs_a9/README.md b/ports/gprs_a9/README.md
index 008983ee59b69..e6dba1df7e4f5 100644
--- a/ports/gprs_a9/README.md
+++ b/ports/gprs_a9/README.md
@@ -1,6 +1,6 @@
 [![Build Status](https://travis-ci.org/pulkin/micropython.svg?branch=master)](https://travis-ci.org/pulkin/micropython)
 [![Build Status](https://dev.azure.com/gpulkin/micropython/_apis/build/status/pulkin.micropython?branchName=master)](https://dev.azure.com/gpulkin/micropython/_build/latest?definitionId=1&branchName=master)
-[![Chat](https://img.shields.io/discord/725112070798049291)](https://discord.com/channels/725112070798049291)
+[![Community chat](https://img.shields.io/badge/chat-telegram-0088cc.svg)](https://t.me/joinchat/CCukvxYGJQDKLjWyaCaaMg)
 [![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=2RZCNXCUCP4YG&source=url)
 
 ## Contribute

From 5bf9aaaa138c47c31649bbb5f6505eb6ef820fec Mon Sep 17 00:00:00 2001
From: Artem Pulkin <gpulkin@gmail.com>
Date: Tue, 19 Apr 2022 14:38:47 +0200
Subject: [PATCH 3527/3533] build: fix #109

---
 ports/gprs_a9/build-libcsdk.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ports/gprs_a9/build-libcsdk.sh b/ports/gprs_a9/build-libcsdk.sh
index 0379f16178d97..ed65159a5b47a 100755
--- a/ports/gprs_a9/build-libcsdk.sh
+++ b/ports/gprs_a9/build-libcsdk.sh
@@ -39,4 +39,6 @@ function generate_CSDK_lib()
     cd ${curr_path_abs}
 }
 
+apply_patches
 generate_CSDK_lib
+

From 009b1a41dbbd43901f0302a40367af7ab7bea95d Mon Sep 17 00:00:00 2001
From: Danil Ruban <druban@sequans.com>
Date: Sat, 25 Feb 2023 00:48:51 +0100
Subject: [PATCH 3528/3533] builds OK

---
 ports/gprs_a9/Makefile           | 24 ++++++++++++-------
 ports/gprs_a9/boards/manifest.py |  4 +---
 ports/gprs_a9/build-libcsdk.sh   |  2 +-
 ports/gprs_a9/fatfs_port.c       |  2 +-
 ports/gprs_a9/file_io.c          | 40 ++++++++++++++++----------------
 ports/gprs_a9/machine_adc.c      | 15 ++++++------
 ports/gprs_a9/machine_pin.c      | 19 ++++++++-------
 ports/gprs_a9/machine_rtc.c      | 15 +++++++-----
 ports/gprs_a9/machine_uart.c     | 33 +++++++++++++++-----------
 ports/gprs_a9/main.c             |  7 +++++-
 ports/gprs_a9/modcellular.c      | 18 +++++++-------
 ports/gprs_a9/modgps.c           |  2 +-
 ports/gprs_a9/modi2c.c           |  4 ++--
 ports/gprs_a9/moduos.c           | 14 ++++++-----
 ports/gprs_a9/modusocket.c       | 21 ++++++++++-------
 ports/gprs_a9/modutime.c         |  2 +-
 ports/gprs_a9/mpconfigport.h     | 15 ++----------
 ports/gprs_a9/mphalport.h        |  2 +-
 ports/gprs_a9/uart.c             |  8 +++++--
 py/obj.h                         | 11 +++++----
 py/stream.c                      | 17 +++++++-------
 21 files changed, 150 insertions(+), 125 deletions(-)

diff --git a/ports/gprs_a9/Makefile b/ports/gprs_a9/Makefile
index 72110df05be70..ecd0b5bd05dd8 100644
--- a/ports/gprs_a9/Makefile
+++ b/ports/gprs_a9/Makefile
@@ -28,14 +28,15 @@ QSTR_DEFS = qstrdefsport.h
 #############################################
 
 # MicroPython feature configurations
-MICROPY_PY_USSL = 1
-MICROPY_SSL_AXTLS = 1
-AXTLS_DEFS_EXTRA = -Dabort=abort_ -include time.h -DRT_MAX_PLAIN_LENGTH=1024 -DRT_EXTRA=4096
+# MICROPY_PY_USSL = 1
+# MICROPY_SSL_AXTLS = 1
+# AXTLS_DEFS_EXTRA = -Dabort=abort_ -include time.h -DRT_MAX_PLAIN_LENGTH=1024 -DRT_EXTRA=4096
 
 FROZEN_MANIFEST ?= boards/manifest.py
 
 # include py core make definitions
 include $(TOP)/py/py.mk
+include $(TOP)/extmod/extmod.mk
 
 #############################################
 
@@ -104,7 +105,7 @@ INC += -I${CSDK_PATH}/include \
 	   -I${CSDK_PATH}/libs/gps/minmea/src 
 
 CFLAGS = $(INC) -Wshadow \
-		  -std=gnu99 \
+          -std=gnu99 \
           -Os -g -fno-inline-small-functions -fno-inline-functions -fno-align-functions -fno-align-jumps -fno-align-loops -fno-align-labels \
           -msoft-float \
           -Wunused-function \
@@ -117,6 +118,7 @@ CFLAGS = $(INC) -Wshadow \
           -fwide-exec-charset=UTF-16LE -fshort-wchar \
 		  -mips16 
 CFLAGS += $(CFLAGS_MOD)
+CFLAGS += $(CFLAGS_THIRDPARTY)
 
 ASFLAGS = --warn -EL -march=xcpu -mtune=xcpu
 
@@ -144,13 +146,16 @@ SRC_C = \
 	machine_rtc.c
 
 
-LIB_SRC_C = $(addprefix lib/,\
-	mp-readline/readline.c \
+LIB_SRC_C = 
+
+SHARED_SRC_C = $(addprefix shared/,\
+	libc/__errno.c \
 	netutils/netutils.c \
+	readline/readline.c \
+	runtime/interrupt_char.c \
+	runtime/pyexec.c \
+	runtime/sys_stdio_mphal.c \
 	timeutils/timeutils.c \
-	utils/pyexec.c \
-	utils/interrupt_char.c \
-	utils/sys_stdio_mphal.c \
 	)
 
 LIB_SRC_C += \
@@ -169,6 +174,7 @@ OBJ_MP += $(PY_O)
 OBJ_MP += $(addprefix $(BUILD)/, $(SRC_C:.c=.o))
 
 OBJ = $(OBJ_MP) $(PY_CORE_O)
+OBJ += $(addprefix $(BUILD_PATH)/, $(SHARED_SRC_C:.c=.o))
 OBJ += $(addprefix $(BUILD_PATH)/, $(LIB_SRC_C:.c=.o))
 OBJ += $(addprefix $(BUILD_PATH)/, $(SRC_S:.s=.o))
 OBJ += $(addprefix $(BUILD_PATH)/, $(SRC_MOD:.c=.o))
diff --git a/ports/gprs_a9/boards/manifest.py b/ports/gprs_a9/boards/manifest.py
index b10022332dd53..ffa72a2860378 100644
--- a/ports/gprs_a9/boards/manifest.py
+++ b/ports/gprs_a9/boards/manifest.py
@@ -1,4 +1,2 @@
 freeze("$(PORT_DIR)/modules")
-freeze("$(MPY_DIR)/tools", ("upip.py", "upip_utarfile.py"))
-freeze("$(MPY_DIR)/ports/esp8266/modules", "ntptime.py")
-include("$(MPY_DIR)/extmod/uasyncio/manifest.py")
+require("bundle-networking")
diff --git a/ports/gprs_a9/build-libcsdk.sh b/ports/gprs_a9/build-libcsdk.sh
index ed65159a5b47a..058bc04c74853 100755
--- a/ports/gprs_a9/build-libcsdk.sh
+++ b/ports/gprs_a9/build-libcsdk.sh
@@ -39,6 +39,6 @@ function generate_CSDK_lib()
     cd ${curr_path_abs}
 }
 
-apply_patches
+# apply_patches
 generate_CSDK_lib
 
diff --git a/ports/gprs_a9/fatfs_port.c b/ports/gprs_a9/fatfs_port.c
index a2d340a0353d1..a362fac4ef0b9 100644
--- a/ports/gprs_a9/fatfs_port.c
+++ b/ports/gprs_a9/fatfs_port.c
@@ -28,7 +28,7 @@
 
 #include "time.h"
 #include "lib/oofatfs/ff.h"
-#include "lib/timeutils/timeutils.h"
+#include "shared/timeutils/timeutils.h"
 
 DWORD get_fattime(void) {
     struct timeval tv;
diff --git a/ports/gprs_a9/file_io.c b/ports/gprs_a9/file_io.c
index 64c09e8b5cc05..59caede83d9a5 100644
--- a/ports/gprs_a9/file_io.c
+++ b/ports/gprs_a9/file_io.c
@@ -226,16 +226,16 @@ STATIC const mp_stream_p_t internal_flash_fileio_stream_p = {
     .ioctl = internal_flash_file_obj_ioctl,
 };
 
-const mp_obj_type_t mp_type_internal_flash_fileio = {
-    { &mp_type_type },
-    .name = MP_QSTR_FileIO,
-    .print = internal_flash_file_obj_print,
-    .make_new = internal_flash_file_obj_make_new,
-    .getiter = mp_identity_getiter,
-    .iternext = mp_stream_unbuffered_iter,
-    .protocol = &internal_flash_fileio_stream_p,
-    .locals_dict = (mp_obj_dict_t*)&vfs_fat_rawfile_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    mp_type_internal_flash_fileio,
+    MP_QSTR_FileIO,
+    MP_TYPE_FLAG_NONE,
+    print, internal_flash_file_obj_print,
+    make_new, internal_flash_file_obj_make_new,
+    protocol, &internal_flash_fileio_stream_p,
+    locals_dict, &vfs_fat_rawfile_locals_dict
+    );
+
 #endif
 
 STATIC const mp_stream_p_t internal_flash_textio_stream_p = {
@@ -245,16 +245,16 @@ STATIC const mp_stream_p_t internal_flash_textio_stream_p = {
     .is_text = true,
 };
 
-const mp_obj_type_t mp_type_internal_flash_textio = {
-    { &mp_type_type },
-    .name = MP_QSTR_TextIOWrapper,
-    .print = internal_flash_file_obj_print,
-    .make_new = internal_flash_file_obj_make_new,
-    .getiter = mp_identity_getiter,
-    .iternext = mp_stream_unbuffered_iter,
-    .protocol = &internal_flash_textio_stream_p,
-    .locals_dict = (mp_obj_dict_t*)&vfs_fat_rawfile_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    mp_type_internal_flash_textio,
+    MP_QSTR_TextIOWrapper,
+    MP_TYPE_FLAG_NONE,
+    print, internal_flash_file_obj_print,
+    make_new, internal_flash_file_obj_make_new,
+    protocol, &internal_flash_textio_stream_p,
+    locals_dict, &vfs_fat_rawfile_locals_dict
+);
+
 
 mp_obj_t internal_flash_open(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     // ========================================
diff --git a/ports/gprs_a9/machine_adc.c b/ports/gprs_a9/machine_adc.c
index 6ce0d3248d23b..9443ad51be352 100644
--- a/ports/gprs_a9/machine_adc.c
+++ b/ports/gprs_a9/machine_adc.c
@@ -101,11 +101,12 @@ STATIC const mp_rom_map_elem_t machine_adc_locals_dict_table[] = {
 
 STATIC MP_DEFINE_CONST_DICT(machine_adc_locals_dict, machine_adc_locals_dict_table);
 
-const mp_obj_type_t machine_adc_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_ADC,
-    .print = machine_adc_print,
-    .make_new = machine_adc_make_new,
-    .locals_dict = (mp_obj_dict_t*)&machine_adc_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    machine_adc_type,
+    MP_QSTR_ADC,
+    MP_TYPE_FLAG_NONE,
+    print, machine_adc_print,
+    make_new, machine_adc_make_new,
+    locals_dict, &machine_adc_locals_dict
+);
 
diff --git a/ports/gprs_a9/machine_pin.c b/ports/gprs_a9/machine_pin.c
index 342195d7ab229..9566f39220182 100644
--- a/ports/gprs_a9/machine_pin.c
+++ b/ports/gprs_a9/machine_pin.c
@@ -256,15 +256,16 @@ STATIC const mp_pin_p_t pin_pin_p = {
   .ioctl = pin_ioctl,
 };
 
-const mp_obj_type_t machine_pin_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_Pin,
-    .print = machine_pin_print,
-    .make_new = mp_pin_make_new,
-    .call = machine_pin_call,
-    .protocol = &pin_pin_p,
-    .locals_dict = (mp_obj_t)&machine_pin_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    machine_pin_type,
+    MP_QSTR_Pin,
+    MP_TYPE_FLAG_NONE,
+    make_new, mp_pin_make_new,
+    print, machine_pin_print,
+    call, machine_pin_call,
+    protocol, &pin_pin_p,
+    locals_dict, &machine_pin_locals_dict
+);
 
 void mp_hal_pin_input(mp_hal_pin_obj_t pin_id) {
     const machine_pin_obj_t *self = &machine_pin_obj[pin_id];
diff --git a/ports/gprs_a9/machine_rtc.c b/ports/gprs_a9/machine_rtc.c
index f99118fbae056..34bcf604ed5a6 100644
--- a/ports/gprs_a9/machine_rtc.c
+++ b/ports/gprs_a9/machine_rtc.c
@@ -92,10 +92,13 @@ STATIC const mp_rom_map_elem_t pyb_rtc_locals_dict_table[] = {
 };
 STATIC MP_DEFINE_CONST_DICT(pyb_rtc_locals_dict, pyb_rtc_locals_dict_table);
 
-const mp_obj_type_t pyb_rtc_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_RTC,
-    .make_new = pyb_rtc_make_new,
-    .locals_dict = (mp_obj_dict_t*)&pyb_rtc_locals_dict,
-};
+
+MP_DEFINE_CONST_OBJ_TYPE(
+    pyb_rtc_type,
+    MP_QSTR_RTC,
+    MP_TYPE_FLAG_NONE,
+    make_new, pyb_rtc_make_new,
+    locals_dict, &pyb_rtc_locals_dict
+);
+
 
diff --git a/ports/gprs_a9/machine_uart.c b/ports/gprs_a9/machine_uart.c
index 5413ab6ccd9b1..dc315664771e2 100644
--- a/ports/gprs_a9/machine_uart.c
+++ b/ports/gprs_a9/machine_uart.c
@@ -43,6 +43,7 @@ STATIC const char *_parity_name[] = {"None", "1", "0"};
 // ----
 // Init
 // ----
+STATIC mp_obj_t pyb_uart_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args);
 
 void modmachine_uart_init0(void) {
     UART_Close(UART2);
@@ -55,7 +56,7 @@ void modmachine_uart_init0(void) {
     mp_obj_t args[2];
     args[0] = MP_OBJ_NEW_SMALL_INT(0);
     args[1] = MP_OBJ_NEW_SMALL_INT(115200);
-    args[0] = pyb_uart_type.make_new(&pyb_uart_type, 2, 0, args);
+    args[0] = pyb_uart_make_new(&pyb_uart_type, 2, 0, args);
     args[1] = MP_OBJ_NEW_SMALL_INT(1);
     // extern mp_obj_t mp_os_dupterm(size_t n_args, const mp_obj_t *args);
     os_dupterm(2, args);
@@ -75,6 +76,9 @@ STATIC void pyb_uart_print(const mp_print_t *print, mp_obj_t self_in, mp_print_k
         self->stop, uart_get_rxbuf_len(self->uart_id) - 1, self->timeout, self->timeout_char);
 }
 
+static uint8_t* uart_rxbuf[2];
+
+
 STATIC void pyb_uart_init_helper(pyb_uart_obj_t *self, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     // ========================================
     // Prepares UART.
@@ -200,10 +204,10 @@ STATIC void pyb_uart_init_helper(pyb_uart_obj_t *self, size_t n_args, const mp_o
         uint8_t *buf;
         if (len <= UART_STATIC_RXBUF_LEN) {
             buf = uart_ringbuf_array[self->uart_id];
-            MP_STATE_PORT(uart_rxbuf[self->uart_id]) = NULL; // clear any old pointer
+            uart_rxbuf[self->uart_id] = NULL; // clear any old pointer
         } else {
             buf = m_new(uint8_t, len);
-            MP_STATE_PORT(uart_rxbuf[self->uart_id]) = buf; // retain root pointer
+            uart_rxbuf[self->uart_id] = buf; // retain root pointer
         }
         uart_set_rxbuf(self->uart_id, buf, len);
     }
@@ -394,13 +398,16 @@ STATIC const mp_stream_p_t uart_stream_p = {
     .is_text = false,
 };
 
-const mp_obj_type_t pyb_uart_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_UART,
-    .print = pyb_uart_print,
-    .make_new = pyb_uart_make_new,
-    .getiter = mp_identity_getiter,
-    .iternext = mp_stream_unbuffered_iter,
-    .protocol = &uart_stream_p,
-    .locals_dict = (mp_obj_dict_t*)&pyb_uart_locals_dict,
-};
+MP_DEFINE_CONST_OBJ_TYPE(
+    pyb_uart_type,
+    MP_QSTR_UART,
+    MP_TYPE_FLAG_NONE,
+    print, pyb_uart_print,
+    make_new, pyb_uart_make_new,
+    protocol, &uart_stream_p,
+    locals_dict, &pyb_uart_locals_dict
+);
+
+MP_REGISTER_ROOT_POINTER(const char * readline_hist[8]);
+MP_REGISTER_ROOT_POINTER(uint8_t* uart_rxbuf[2]);
+
diff --git a/ports/gprs_a9/main.c b/ports/gprs_a9/main.c
index bec8b8b79eb55..3fd5c0e7169e6 100644
--- a/ports/gprs_a9/main.c
+++ b/ports/gprs_a9/main.c
@@ -38,7 +38,7 @@
 #include "py/stackctrl.h"
 #include "py/mpstate.h"
 #include "py/mphal.h"
-#include "lib/utils/pyexec.h"
+#include "shared/runtime/pyexec.h"
 
 #include "stdbool.h"
 #include "api_os.h"
@@ -108,6 +108,11 @@ extern mp_uint_t gc_helper_get_regs_and_sp(mp_uint_t*);
 }*/
 #endif
 
+
+void __builtin_unreachable (void) {
+
+}
+
 STATIC void *stack_top;
 
 void gc_collect(void) {
diff --git a/ports/gprs_a9/modcellular.c b/ports/gprs_a9/modcellular.c
index ec99f2d1889bd..708dc416ad43f 100644
--- a/ports/gprs_a9/modcellular.c
+++ b/ports/gprs_a9/modcellular.c
@@ -665,14 +665,16 @@ STATIC const mp_rom_map_elem_t sms_locals_dict_table[] = {
 
 STATIC MP_DEFINE_CONST_DICT(sms_locals_dict, sms_locals_dict_table);
 
-STATIC const mp_obj_type_t modcellular_sms_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_SMS,
-    .make_new = modcellular_sms_make_new,
-    .print = modcellular_sms_print,
-    .attr = modcellular_sms_attr,
-    .locals_dict = (mp_obj_dict_t*)&sms_locals_dict,
-};
+
+STATIC MP_DEFINE_CONST_OBJ_TYPE(
+    modcellular_sms_type,
+    MP_QSTR_SMS,
+    MP_TYPE_FLAG_NONE,
+    print, modcellular_sms_print,
+    make_new, modcellular_sms_make_new,
+    attr, modcellular_sms_attr,
+    locals_dict, &sms_locals_dict
+);
 
 // -------
 // Private
diff --git a/ports/gprs_a9/modgps.c b/ports/gprs_a9/modgps.c
index bca68a3598875..da988726e9853 100644
--- a/ports/gprs_a9/modgps.c
+++ b/ports/gprs_a9/modgps.c
@@ -34,7 +34,7 @@
 #include "py/runtime.h"
 #include "py/binary.h"
 #include "py/objexcept.h"
-#include "lib/timeutils/timeutils.h"
+#include "shared/timeutils/timeutils.h"
 
 #include "api_gps.h"
 #include "api_os.h"
diff --git a/ports/gprs_a9/modi2c.c b/ports/gprs_a9/modi2c.c
index a6af059378f3a..1ade53b903b8a 100644
--- a/ports/gprs_a9/modi2c.c
+++ b/ports/gprs_a9/modi2c.c
@@ -148,7 +148,7 @@ STATIC mp_obj_t modi2c_receive(size_t n_args, const mp_obj_t *arg) {
         I2C_Error_t error = I2C_Receive(id, slave_address, (uint8_t*)vstr.buf, vstr.len, timeout);
         modi2c_private_throw_I2C_Error(error);
 
-        return mp_obj_new_str_from_vstr(&mp_type_bytes, &vstr);
+        return mp_obj_new_str_from_vstr(&vstr);
     }
 }
 
@@ -194,7 +194,7 @@ STATIC mp_obj_t modi2c_mem_receive(size_t n_args, const mp_obj_t *arg) {
         I2C_Error_t error = I2C_ReadMem(id, slave_address, memory_address, memory_size, (uint8_t*)vstr.buf, vstr.len, timeout);
         modi2c_private_throw_I2C_Error(error);
 
-        return mp_obj_new_str_from_vstr(&mp_type_bytes, &vstr);
+        return mp_obj_new_str_from_vstr(&vstr);
     }
 }
 
diff --git a/ports/gprs_a9/moduos.c b/ports/gprs_a9/moduos.c
index 7230aef168a2d..3605ce2ddac35 100644
--- a/ports/gprs_a9/moduos.c
+++ b/ports/gprs_a9/moduos.c
@@ -158,7 +158,7 @@ STATIC mp_obj_t os_urandom(mp_obj_t num) {
         vstr.buf[i] = r;
         r >>= 8;
     }
-    return mp_obj_new_str_from_vstr(&mp_type_bytes, &vstr);
+    return mp_obj_new_str_from_vstr(&vstr);
 }
 
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(os_urandom_obj, os_urandom);
@@ -408,11 +408,13 @@ STATIC const mp_rom_map_elem_t internal_flash_locals_dict_table[] = {
 
 STATIC MP_DEFINE_CONST_DICT(internal_flash_locals_dict, internal_flash_locals_dict_table);
 
-STATIC const mp_obj_type_t moduos_internal_flash_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_internal_flash,
-    .locals_dict = (mp_obj_dict_t*)&internal_flash_locals_dict,
-};
+
+STATIC MP_DEFINE_CONST_OBJ_TYPE(
+    moduos_internal_flash_type,
+    MP_QSTR_internal_flash,
+    MP_TYPE_FLAG_NONE,
+    locals_dict, &internal_flash_locals_dict
+    );
 
 mp_obj_t os_dupterm(size_t n_args, const mp_obj_t *args) {
     // ========================================
diff --git a/ports/gprs_a9/modusocket.c b/ports/gprs_a9/modusocket.c
index c97bc14bd34a5..6f25fecf76885 100644
--- a/ports/gprs_a9/modusocket.c
+++ b/ports/gprs_a9/modusocket.c
@@ -38,7 +38,7 @@
 #include "py/objexcept.h"
 #include "py/mperrno.h"
 #include "py/stream.h"
-#include "lib/netutils/netutils.h"
+#include "shared/netutils/netutils.h"
 
 #include "api_network.h"
 #include "ram_pointers.h"
@@ -360,7 +360,7 @@ mp_obj_t _socket_recvfrom(mp_obj_t self_in, mp_obj_t len_in, struct sockaddr *fr
     }
 
     vstr.len = r;
-    return mp_obj_new_str_from_vstr(&mp_type_bytes, &vstr);
+    return mp_obj_new_str_from_vstr(&vstr);
 }
 
 STATIC mp_obj_t socket_recv(mp_obj_t self_in, mp_obj_t bufsize) {
@@ -607,13 +607,16 @@ STATIC const mp_stream_p_t socket_stream_p = {
     .ioctl = socket_stream_ioctl,
 };
 
-STATIC const mp_obj_type_t socket_type = {
-    { &mp_type_type },
-    .name = MP_QSTR_socket,
-    .make_new = socket_make_new,
-    .protocol = &socket_stream_p,
-    .locals_dict = (mp_obj_dict_t*)&socket_locals_dict,
-};
+
+STATIC MP_DEFINE_CONST_OBJ_TYPE(
+    socket_type,
+    MP_QSTR_socket,
+    MP_TYPE_FLAG_NONE,
+    make_new, socket_make_new,
+    protocol, &socket_stream_p,
+    locals_dict, &socket_locals_dict
+);
+
 
 // -------
 // Methods
diff --git a/ports/gprs_a9/modutime.c b/ports/gprs_a9/modutime.c
index 0ebc0466a4527..94f2d4d010300 100644
--- a/ports/gprs_a9/modutime.c
+++ b/ports/gprs_a9/modutime.c
@@ -31,7 +31,7 @@
 #include "time.h"
 
 #include "py/runtime.h"
-#include "lib/timeutils/timeutils.h"
+#include "shared/timeutils/timeutils.h"
 #include "extmod/utime_mphal.h"
 
 STATIC mp_obj_t time_localtime(size_t n_args, const mp_obj_t *args) {
diff --git a/ports/gprs_a9/mpconfigport.h b/ports/gprs_a9/mpconfigport.h
index d3d0cbb24b324..674563f43b491 100644
--- a/ports/gprs_a9/mpconfigport.h
+++ b/ports/gprs_a9/mpconfigport.h
@@ -8,6 +8,7 @@
 #include <stdint.h>
 #include <unistd.h>
 
+
 #include "api_sys.h"
 
 // options to control how MicroPython is built
@@ -128,7 +129,6 @@
 #define MICROPY_PY_SYS_MODULES              (1)
 #define MICROPY_PY_SYS_EXIT                 (1)
 #define MICROPY_PY_SYS_STDFILES             (1)
-#define MICROPY_PY_SYS_STDIO_BUFFER         (1)
 #define MICROPY_PY_UERRNO                   (1)
 #define MICROPY_PY_USELECT                  (1)
 #define MICROPY_PY_UTIME_MP_HAL             (1)
@@ -170,7 +170,7 @@
 // #define MICROPY_SSL_AXTLS                   (1)
 // #define MICROPY_SSL_MBEDTLS                 (1)
 // #define MICROPY_PY_USSL_FINALISER           (1)
-#define MICROPY_PY_FRAMEBUF                 (1)
+#define MICROPY_PY_FRAMEBUF                 (0)
 
 
 // fatfs configuration
@@ -186,13 +186,6 @@
 #define MICROPY_VFS_FAT                     (1)
 #define MICROPY_READER_VFS                  (1)
 
-// use vfs's functions for import stat and builtin open
-#ifdef MICROPY_VFS
-#define mp_import_stat mp_vfs_import_stat
-#define mp_builtin_open mp_vfs_open
-#define mp_builtin_open_obj mp_vfs_open_obj
-#endif
-
 // emitters
 #define MICROPY_PERSISTENT_CODE_LOAD        (1)
 
@@ -247,10 +240,6 @@ typedef long mp_off_t;
 
 #define MP_STATE_PORT MP_STATE_VM
 
-#define MICROPY_PORT_ROOT_POINTERS \
-    const char *readline_hist[8]; \
-    byte *uart_rxbuf[2];
-
 #include "csdk_config.h"
 
 #if MICROPY_PY_THREAD
diff --git a/ports/gprs_a9/mphalport.h b/ports/gprs_a9/mphalport.h
index 88fa782291dbd..390a2d2b62754 100644
--- a/ports/gprs_a9/mphalport.h
+++ b/ports/gprs_a9/mphalport.h
@@ -31,7 +31,7 @@
 
 #include "stdint.h"
 #include "stdbool.h"
-#include "lib/utils/interrupt_char.h"
+#include "shared/runtime/interrupt_char.h"
 #include "time.h"
 #include "py/obj.h"
 #include "uart.h"
diff --git a/ports/gprs_a9/uart.c b/ports/gprs_a9/uart.c
index f17926a28aa66..cdd4c76bf2966 100644
--- a/ports/gprs_a9/uart.c
+++ b/ports/gprs_a9/uart.c
@@ -32,6 +32,7 @@
 #include <string.h>
 
 #include "py/ringbuf.h"
+#include "py/runtime.h"
 
 #include "api_hal_uart.h"
 
@@ -82,7 +83,10 @@ UART_Config_t uart_dev[] = {
 // -----------------------
 
 void soft_reset(void);
-void mp_keyboard_interrupt(void);
+
+void mp_keyboard_interrupt(void) {
+    mp_raise_type(&mp_type_KeyboardInterrupt);
+}
 
 static bool uart_config(uint8_t uart) {
     // Updates the configuration of UART port
@@ -174,7 +178,7 @@ void uart_set_rxbuf(uint8_t uart, uint8_t *buf, int len) {
 // Task-based UART interface
 /*
 #include "py/obj.h"
-#include "lib/utils/pyexec.h"
+#include "shared/runtime/pyexec.h"
 
 #if MICROPY_REPL_EVENT_DRIVEN
 void uart_task_handler(os_event_t *evt) {
diff --git a/py/obj.h b/py/obj.h
index 8a0a256708f24..ce417dc46c73e 100644
--- a/py/obj.h
+++ b/py/obj.h
@@ -911,11 +911,14 @@ void *mp_obj_malloc_helper(size_t num_bytes, const mp_obj_type_t *type);
 // Type checks are split to a separate, constant result macro. This is so it doesn't hinder the compilers's
 // optimizations (other tricks like using ({ expr; exper; }) or (exp, expr, expr) in mp_obj_is_type() result
 // in missed optimizations)
+
+#define _assert(a) (assert(a))
+
 #define mp_type_assert_not_bool_int_str_nonetype(t) (                                     \
-    MP_STATIC_ASSERT_NOT_MSC((t) != &mp_type_bool), assert((t) != &mp_type_bool),         \
-    MP_STATIC_ASSERT_NOT_MSC((t) != &mp_type_int), assert((t) != &mp_type_int),           \
-    MP_STATIC_ASSERT_NOT_MSC((t) != &mp_type_str), assert((t) != &mp_type_str),           \
-    MP_STATIC_ASSERT_NOT_MSC((t) != &mp_type_NoneType), assert((t) != &mp_type_NoneType), \
+    MP_STATIC_ASSERT_NOT_MSC((t) != &mp_type_bool), _assert((t) != &mp_type_bool),         \
+    MP_STATIC_ASSERT_NOT_MSC((t) != &mp_type_int), _assert((t) != &mp_type_int),           \
+    MP_STATIC_ASSERT_NOT_MSC((t) != &mp_type_str), _assert((t) != &mp_type_str),           \
+    MP_STATIC_ASSERT_NOT_MSC((t) != &mp_type_NoneType), _assert((t) != &mp_type_NoneType), \
     1)
 
 #define mp_obj_is_type(o, t) (mp_type_assert_not_bool_int_str_nonetype(t) && mp_obj_is_exact_type(o, t))
diff --git a/py/stream.c b/py/stream.c
index 94e57de8b382d..bca8d465f552e 100644
--- a/py/stream.c
+++ b/py/stream.c
@@ -514,13 +514,14 @@ MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_stream_ioctl_obj, 2, 3, stream_ioctl);
  * POSIX-compatible software to work with MicroPython streams.
  */
 
-int mp_stream_errno;
 #include <errno.h>
 
+extern int errno;
+
 ssize_t mp_stream_posix_write(void *stream, const void *buf, size_t len) {
     mp_obj_base_t *o = stream;
-    const mp_stream_p_t *stream_p = o->type->protocol;
-    mp_uint_t out_sz = stream_p->write(MP_OBJ_FROM_PTR(stream), buf, len, &mp_stream_errno);
+    const mp_stream_p_t *stream_p = MP_OBJ_TYPE_GET_SLOT(o->type, protocol);
+    mp_uint_t out_sz = stream_p->write(MP_OBJ_FROM_PTR(stream), buf, len, &errno);
     if (out_sz == MP_STREAM_ERROR) {
         return -1;
     } else {
@@ -530,8 +531,8 @@ ssize_t mp_stream_posix_write(void *stream, const void *buf, size_t len) {
 
 ssize_t mp_stream_posix_read(void *stream, void *buf, size_t len) {
     mp_obj_base_t *o = stream;
-    const mp_stream_p_t *stream_p = o->type->protocol;
-    mp_uint_t out_sz = stream_p->read(MP_OBJ_FROM_PTR(stream), buf, len, &mp_stream_errno);
+    const mp_stream_p_t *stream_p = MP_OBJ_TYPE_GET_SLOT(o->type, protocol);
+    mp_uint_t out_sz = stream_p->read(MP_OBJ_FROM_PTR(stream), buf, len, &errno);
     if (out_sz == MP_STREAM_ERROR) {
         return -1;
     } else {
@@ -545,7 +546,7 @@ off_t mp_stream_posix_lseek(void *stream, off_t offset, int whence) {
     struct mp_stream_seek_t seek_s;
     seek_s.offset = offset;
     seek_s.whence = whence;
-    mp_uint_t res = stream_p->ioctl(MP_OBJ_FROM_PTR(stream), MP_STREAM_SEEK, (mp_uint_t)(uintptr_t)&seek_s, &mp_stream_errno);
+    mp_uint_t res = stream_p->ioctl(MP_OBJ_FROM_PTR(stream), MP_STREAM_SEEK, (mp_uint_t)(uintptr_t)&seek_s, &errno);
     if (res == MP_STREAM_ERROR) {
         return -1;
     }
@@ -554,8 +555,8 @@ off_t mp_stream_posix_lseek(void *stream, off_t offset, int whence) {
 
 int mp_stream_posix_fsync(void *stream) {
     mp_obj_base_t *o = stream;
-    const mp_stream_p_t *stream_p = o->type->protocol;
-    mp_uint_t res = stream_p->ioctl(MP_OBJ_FROM_PTR(stream), MP_STREAM_FLUSH, 0, &mp_stream_errno);
+    const mp_stream_p_t *stream_p = MP_OBJ_TYPE_GET_SLOT(o->type, protocol);
+    mp_uint_t res = stream_p->ioctl(MP_OBJ_FROM_PTR(stream), MP_STREAM_FLUSH, 0, &errno);
     if (res == MP_STREAM_ERROR) {
         return -1;
     }

From 793284f2861e7d5c53d933cf27d0a6bf494068d5 Mon Sep 17 00:00:00 2001
From: Danil Ruban <druban@sequans.com>
Date: Sat, 25 Feb 2023 04:01:27 +0100
Subject: [PATCH 3529/3533] fix registering ports

---
 .gitignore                   |  1 +
 ports/gprs_a9/modcellular.c  |  2 ++
 ports/gprs_a9/modchip.c      |  1 +
 ports/gprs_a9/modgps.c       |  2 ++
 ports/gprs_a9/modi2c.c       |  2 ++
 ports/gprs_a9/modmachine.c   |  4 ++--
 ports/gprs_a9/moduos.c       |  2 ++
 ports/gprs_a9/modusocket.c   |  2 ++
 ports/gprs_a9/modutime.c     |  2 ++
 ports/gprs_a9/mpconfigport.h | 22 ++--------------------
 10 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2d20cb18970e8..6278ad69572b2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,3 +23,4 @@ user.props
 
 # MacOS desktop metadata files
 .DS_Store
+.vscode/settings.json
diff --git a/ports/gprs_a9/modcellular.c b/ports/gprs_a9/modcellular.c
index 708dc416ad43f..0e134803892a5 100644
--- a/ports/gprs_a9/modcellular.c
+++ b/ports/gprs_a9/modcellular.c
@@ -1371,3 +1371,5 @@ const mp_obj_module_t cellular_module = {
     .base = { &mp_type_module },
     .globals = (mp_obj_dict_t*)&mp_module_cellular_globals,
 };
+
+MP_REGISTER_MODULE(MP_QSTR_cellular, cellular_module);
\ No newline at end of file
diff --git a/ports/gprs_a9/modchip.c b/ports/gprs_a9/modchip.c
index 0a64065e7a252..ba05f3b68d328 100644
--- a/ports/gprs_a9/modchip.c
+++ b/ports/gprs_a9/modchip.c
@@ -101,3 +101,4 @@ const mp_obj_module_t chip_module = {
     .globals = (mp_obj_dict_t*)&chip_module_globals,
 };
 
+MP_REGISTER_MODULE(MP_QSTR_chip, chip_module);
\ No newline at end of file
diff --git a/ports/gprs_a9/modgps.c b/ports/gprs_a9/modgps.c
index da988726e9853..4287364d06739 100644
--- a/ports/gprs_a9/modgps.c
+++ b/ports/gprs_a9/modgps.c
@@ -373,3 +373,5 @@ const mp_obj_module_t gps_module = {
     .base = { &mp_type_module },
     .globals = (mp_obj_dict_t*)&mp_module_gps_globals,
 };
+
+MP_REGISTER_MODULE(MP_QSTR_gps, gps_module);
\ No newline at end of file
diff --git a/ports/gprs_a9/modi2c.c b/ports/gprs_a9/modi2c.c
index 1ade53b903b8a..d6cbdd09d7d4d 100644
--- a/ports/gprs_a9/modi2c.c
+++ b/ports/gprs_a9/modi2c.c
@@ -246,3 +246,5 @@ const mp_obj_module_t i2c_module = {
     .base = { &mp_type_module },
     .globals = (mp_obj_dict_t*)&mp_module_i2c_globals,
 };
+
+MP_REGISTER_MODULE(MP_QSTR_i2c, i2c_module);
\ No newline at end of file
diff --git a/ports/gprs_a9/modmachine.c b/ports/gprs_a9/modmachine.c
index cfefffe3dbf83..e8c5d40d947c0 100644
--- a/ports/gprs_a9/modmachine.c
+++ b/ports/gprs_a9/modmachine.c
@@ -245,7 +245,7 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
     { MP_OBJ_NEW_QSTR(MP_QSTR_watchdog_on), (mp_obj_t)&modmachine_watchdog_on_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_watchdog_off), (mp_obj_t)&modmachine_watchdog_off_obj },
     { MP_OBJ_NEW_QSTR(MP_QSTR_watchdog_reset), (mp_obj_t)&modmachine_watchdog_reset_obj },
-    #if MICROPY_PY_MACHINE_SPI
+    #if MICROPY_PY_MACHINE_SPI && MICROPY_PY_MACHINE_SOFTSPI
     { MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&mp_machine_soft_spi_type) },
     #endif
 
@@ -293,4 +293,4 @@ const mp_obj_module_t mp_module_machine = {
     .globals = (mp_obj_dict_t*)&machine_module_globals,
 };
 
-
+MP_REGISTER_MODULE(MP_QSTR_machine, mp_module_machine);
diff --git a/ports/gprs_a9/moduos.c b/ports/gprs_a9/moduos.c
index 3605ce2ddac35..23fb0d4914fdf 100644
--- a/ports/gprs_a9/moduos.c
+++ b/ports/gprs_a9/moduos.c
@@ -464,3 +464,5 @@ const mp_obj_module_t uos_module = {
     .base = { &mp_type_module },
     .globals = (mp_obj_dict_t*)&os_module_globals,
 };
+
+MP_REGISTER_MODULE(MP_QSTR_uos, uos_module);
\ No newline at end of file
diff --git a/ports/gprs_a9/modusocket.c b/ports/gprs_a9/modusocket.c
index 6f25fecf76885..dd9c8b3032990 100644
--- a/ports/gprs_a9/modusocket.c
+++ b/ports/gprs_a9/modusocket.c
@@ -818,3 +818,5 @@ const mp_obj_module_t usocket_module = {
     .base = { &mp_type_module },
     .globals = (mp_obj_dict_t*)&mp_module_usocket_globals,
 };
+
+MP_REGISTER_MODULE(MP_QSTR_usocket, usocket_module);
\ No newline at end of file
diff --git a/ports/gprs_a9/modutime.c b/ports/gprs_a9/modutime.c
index 94f2d4d010300..0eee8a92dd258 100644
--- a/ports/gprs_a9/modutime.c
+++ b/ports/gprs_a9/modutime.c
@@ -100,3 +100,5 @@ const mp_obj_module_t utime_module = {
     .base = { &mp_type_module },
     .globals = (mp_obj_dict_t*)&time_module_globals,
 };
+
+MP_REGISTER_MODULE(MP_QSTR_utime, utime_module);
\ No newline at end of file
diff --git a/ports/gprs_a9/mpconfigport.h b/ports/gprs_a9/mpconfigport.h
index 674563f43b491..61fee8f2cd610 100644
--- a/ports/gprs_a9/mpconfigport.h
+++ b/ports/gprs_a9/mpconfigport.h
@@ -161,12 +161,13 @@
 // #define MICROPY_PY_MACHINE_PULSE            (1)
 // #define MICROPY_PY_MACHINE_I2C              (1)
 #define MICROPY_PY_MACHINE_SPI              (1)
+#define MICROPY_PY_MACHINE_SOFTSPI          (1)
 // #define MICROPY_PY_MACHINE_SPI_MSB          (1)
 // #define MICROPY_PY_MACHINE_SPI_LSB          (1)
 // #define MICROPY_PY_MACHINE_SPI_MAKE_NEW     machine_hw_spi_make_new
 #define MICROPY_HW_SOFTSPI_MIN_DELAY        (0)
 #define MICROPY_HW_SOFTSPI_MAX_BAUDRATE     (500000)
-// #define MICROPY_PY_USSL                     (1)
+#define MICROPY_PY_USSL                     (1)
 // #define MICROPY_SSL_AXTLS                   (1)
 // #define MICROPY_SSL_MBEDTLS                 (1)
 // #define MICROPY_PY_USSL_FINALISER           (1)
@@ -196,25 +197,6 @@
     { MP_OBJ_NEW_QSTR(MP_QSTR_input), (mp_obj_t)&mp_builtin_input_obj }, \
     { MP_OBJ_NEW_QSTR(MP_QSTR_open), (mp_obj_t)&mp_builtin_open_obj },
 
-// extra built in modules to add to the list of known ones
-extern const struct _mp_obj_module_t mp_module_machine;
-extern const struct _mp_obj_module_t uos_module;
-extern const struct _mp_obj_module_t utime_module;
-extern const struct _mp_obj_module_t chip_module;
-extern const struct _mp_obj_module_t cellular_module;
-extern const struct _mp_obj_module_t gps_module;
-extern const struct _mp_obj_module_t usocket_module;
-extern const struct _mp_obj_module_t i2c_module;
-
-#define MICROPY_PORT_BUILTIN_MODULES \
-    { MP_OBJ_NEW_QSTR(MP_QSTR_machine), (mp_obj_t)&mp_module_machine }, \
-    { MP_OBJ_NEW_QSTR(MP_QSTR_uos), (mp_obj_t)&uos_module }, \
-    { MP_OBJ_NEW_QSTR(MP_QSTR_utime), (mp_obj_t)&utime_module }, \
-    { MP_OBJ_NEW_QSTR(MP_QSTR_chip), (mp_obj_t)&chip_module }, \
-    { MP_OBJ_NEW_QSTR(MP_QSTR_cellular), (mp_obj_t)&cellular_module }, \
-    { MP_OBJ_NEW_QSTR(MP_QSTR_gps), (mp_obj_t)&gps_module }, \
-    { MP_OBJ_NEW_QSTR(MP_QSTR_usocket), (mp_obj_t)&usocket_module }, \
-    { MP_OBJ_NEW_QSTR(MP_QSTR_i2c), (mp_obj_t)&i2c_module }, \
 
 // type definitions for the specific machine
 

From 581a158ddaeadd34edf1ea1efb7c3a3644beaafb Mon Sep 17 00:00:00 2001
From: Danil Ruban <druban@sequans.com>
Date: Sat, 25 Feb 2023 15:07:37 +0100
Subject: [PATCH 3530/3533] mbdetls (which was overrided with system mbedtls)

---
 ports/gprs_a9/Makefile                 |  18 +-
 ports/gprs_a9/mbedtls/mbedtls_config.h |  63 +++++++
 ports/gprs_a9/mbedtls/mbedtls_port.c   | 238 +++++++++++++++++++++++++
 ports/gprs_a9/mpconfigport.h           |   3 -
 4 files changed, 316 insertions(+), 6 deletions(-)
 create mode 100644 ports/gprs_a9/mbedtls/mbedtls_config.h
 create mode 100644 ports/gprs_a9/mbedtls/mbedtls_port.c

diff --git a/ports/gprs_a9/Makefile b/ports/gprs_a9/Makefile
index ecd0b5bd05dd8..b393f28a7deb0 100644
--- a/ports/gprs_a9/Makefile
+++ b/ports/gprs_a9/Makefile
@@ -28,7 +28,8 @@ QSTR_DEFS = qstrdefsport.h
 #############################################
 
 # MicroPython feature configurations
-# MICROPY_PY_USSL = 1
+MICROPY_PY_USSL = 1
+MICROPY_SSL_MBEDTLS = 1
 # MICROPY_SSL_AXTLS = 1
 # AXTLS_DEFS_EXTRA = -Dabort=abort_ -include time.h -DRT_MAX_PLAIN_LENGTH=1024 -DRT_EXTRA=4096
 
@@ -38,6 +39,14 @@ FROZEN_MANIFEST ?= boards/manifest.py
 include $(TOP)/py/py.mk
 include $(TOP)/extmod/extmod.mk
 
+SRC_C =
+
+ifeq ($(MICROPY_SSL_MBEDTLS),1)
+GIT_SUBMODULES += lib/mbedtls
+INC += -I$(TOP)/$(MBEDTLS_DIR)/include
+SRC_C += mbedtls/mbedtls_port.c
+endif
+
 #############################################
 
 CROSS_COMPILE = $(CSDTK_PATH)/bin/mips-elf-
@@ -99,10 +108,11 @@ INC += -I$(TOP)
 INC += -I$(BUILD_PATH_ABS)
 INC += -I${CSDK_PATH}/include \
        -I${CSDK_PATH}/include/std_inc \
+	   -I$(CSDTK_PATH)/sys-include \
 	   -I${CSDK_PATH}/include/api_inc \
 	   -I${CSDK_PATH}/libs/utils/include \
 	   -I${CSDK_PATH}/libs/gps/include \
-	   -I${CSDK_PATH}/libs/gps/minmea/src 
+	   -I${CSDK_PATH}/libs/gps/minmea/src
 
 CFLAGS = $(INC) -Wshadow \
           -std=gnu99 \
@@ -117,12 +127,14 @@ CFLAGS = $(INC) -Wshadow \
           -G0 -Wall -march=xcpu -mtune=xcpu -Wa,-march=xcpu,-mtune=xcpu -EL -mexplicit-relocs -fweb -frename-registers -mmemcpy -mmips-tfile -nostartfiles -nostdlib -nostdinc -nodefaultlibs -c -pipe \
           -fwide-exec-charset=UTF-16LE -fshort-wchar \
 		  -mips16 
+
 CFLAGS += $(CFLAGS_MOD)
+CFLAGS += $(CFLAGS_EXTMOD)
 CFLAGS += $(CFLAGS_THIRDPARTY)
 
 ASFLAGS = --warn -EL -march=xcpu -mtune=xcpu
 
-SRC_C = \
+SRC_C += \
 	main.c \
 	posix_helpers.c \
 	fatal.c \
diff --git a/ports/gprs_a9/mbedtls/mbedtls_config.h b/ports/gprs_a9/mbedtls/mbedtls_config.h
new file mode 100644
index 0000000000000..93960c74176bc
--- /dev/null
+++ b/ports/gprs_a9/mbedtls/mbedtls_config.h
@@ -0,0 +1,63 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2018-2019 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+#ifndef MICROPY_INCLUDED_MBEDTLS_CONFIG_H
+#define MICROPY_INCLUDED_MBEDTLS_CONFIG_H
+
+// Set mbedtls configuration
+#define MBEDTLS_CIPHER_MODE_CTR // needed for MICROPY_PY_UCRYPTOLIB_CTR
+
+// Set mbedtls configuration
+#define MBEDTLS_ECP_NIST_OPTIM
+#define MBEDTLS_KEY_EXCHANGE_ECDHE_RSA_ENABLED
+
+// Enable mbedtls modules
+#define MBEDTLS_GCM_C
+#define MBEDTLS_HAVE_TIME
+#define MBEDTLS_HAVE_TIME_DATE
+
+// Time hook
+#include <time.h>
+
+#define MBEDTLS_PLATFORM_TIME_MACRO TIME_GetTime
+
+#undef MBEDTLS_FS_IO
+#undef MBEDTLS_HAVE_ASM
+#undef MBEDTLS_AESNI_C
+
+#ifndef SIZE_MAX
+#define SIZE_MAX ((size_t) -1)
+#endif
+
+#ifndef UINT64_MAX
+#define UINT64_MAX ((uint64_t) -1)
+#endif
+
+
+
+// Include common mbedtls configuration.
+#include "extmod/mbedtls/mbedtls_config_common.h"
+
+#endif /* MICROPY_INCLUDED_MBEDTLS_CONFIG_H */
diff --git a/ports/gprs_a9/mbedtls/mbedtls_port.c b/ports/gprs_a9/mbedtls/mbedtls_port.c
new file mode 100644
index 0000000000000..8a0e9b3316cce
--- /dev/null
+++ b/ports/gprs_a9/mbedtls/mbedtls_port.c
@@ -0,0 +1,238 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2019 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+#include <py/mpconfig.h>
+#include <time.h>
+#include <stdint.h>
+#include <stddef.h>
+
+#define SECONDSPERDAY (24*60*60)
+#define SECONDSPERHOUR (60*60)
+#define DIFFDAYS (3 * DAYSPER100YEARS + 17 * DAYSPER4YEARS + 1 * DAYSPERYEAR)
+#define DAYSPERYEAR 365
+#define DAYSPER4YEARS (4*DAYSPERYEAR+1)
+#define DAYSPER100YEARS (25*DAYSPER4YEARS-1)
+#define DAYSPER400YEARS (4*DAYSPER100YEARS+1)
+#define LEAPDAY 59
+
+unsigned int g_monthdays[13] = {0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334, 365};
+unsigned int g_lpmonthdays[13] = {0, 31, 60, 91, 121, 152, 182, 213, 244, 274, 305, 335, 366};
+  
+static long dst_begin = 0;
+static long dst_end = 0;
+static long _dstbias = 0;
+
+typedef uint64_t __time64_t;
+
+static inline long leapyears_passed(long days)
+{
+    long quadcenturies, centuries, quadyears;
+    quadcenturies = days / DAYSPER400YEARS;
+    days -= quadcenturies;
+    centuries = days / DAYSPER100YEARS;
+    days += centuries;
+    quadyears = days / DAYSPER4YEARS;
+    return quadyears - centuries + quadcenturies;
+}
+ 
+static inline long leapdays_passed(long days)
+{
+    return leapyears_passed(days + DAYSPERYEAR - LEAPDAY + 1);
+}
+ 
+static inline long years_passed(long days)
+{
+    return (days - leapdays_passed(days)) / 365;
+}
+
+struct tm *
+_gmtime_worker(struct tm *ptm, __time64_t time, int do_dst)
+{
+    unsigned int days, daystoyear, dayinyear, leapdays, leapyears, years, month;
+    unsigned int secondinday, secondinhour;
+    unsigned int *padays;
+ 
+    if (time < 0)
+    {
+        return 0;
+    }
+ 
+    /* Divide into date and time */
+    days = (unsigned int)(time / SECONDSPERDAY);
+    secondinday = time % SECONDSPERDAY;
+ 
+    /* Shift to days from 1.1.1601 */
+    days += DIFFDAYS;
+ 
+    /* Calculate leap days passed till today */
+    leapdays = leapdays_passed(days);
+ 
+    /* Calculate number of full leap years passed */
+    leapyears = leapyears_passed(days);
+ 
+    /* Are more leap days passed than leap years? */
+    if (leapdays > leapyears)
+    {
+        /* Yes, we're in a leap year */
+        padays = g_lpmonthdays;
+    }
+    else
+    {
+        /* No, normal year */
+        padays = g_monthdays;
+    }
+ 
+    /* Calculate year */
+    years = (days - leapdays) / 365;
+    ptm->tm_year = years - 299;
+ 
+    /* Calculate number of days till 1.1. of this year */
+    daystoyear = years * 365 + leapyears;
+ 
+    /* Calculate the day in this year */
+    dayinyear = days - daystoyear;
+ 
+    /* Shall we do DST corrections? */
+    ptm->tm_isdst = 0;
+    if (do_dst)
+    {
+        int yeartime = dayinyear * SECONDSPERDAY + secondinday ;
+        if (yeartime >= dst_begin && yeartime <= dst_end) // FIXME! DST in winter
+        {
+            time -= _dstbias;
+            days = (unsigned int)(time / SECONDSPERDAY + DIFFDAYS);
+            dayinyear = days - daystoyear;
+            ptm->tm_isdst = 1;
+        }
+    }
+ 
+    ptm->tm_yday = dayinyear;
+ 
+    /* dayinyear < 366 => terminates with i <= 11 */
+    for (month = 0; dayinyear >= padays[month+1]; month++)
+        ;
+ 
+    /* Set month and day in month */
+    ptm->tm_mon = month;
+    ptm->tm_mday = 1 + dayinyear - padays[month];
+ 
+    /* Get weekday */
+    ptm->tm_wday = (days + 1) % 7;
+ 
+    /* Calculate hour and second in hour */
+    ptm->tm_hour = secondinday / SECONDSPERHOUR;
+    secondinhour = secondinday % SECONDSPERHOUR;
+ 
+    /* Calculate minute and second */
+    ptm->tm_min = secondinhour / 60;
+    ptm->tm_sec = secondinhour % 60;
+ 
+    return ptm;
+}
+
+struct tm *
+_gmtime64(const __time64_t * ptime)
+{
+    /* Validate parameters */
+    if (!ptime || *ptime < 0)
+    {
+        return NULL;
+    }
+
+    static struct tm time_buffer;
+    return _gmtime_worker(&time_buffer, *ptime, 0);
+}
+
+struct tm *
+gmtime(const time_t * ptime)
+{
+    __time64_t time64;
+ 
+    if (!ptime) {
+        return NULL;
+    }
+
+    time64 = *ptime;
+    return _gmtime64(&time64);
+}
+
+#ifdef MICROPY_SSL_MBEDTLS
+
+#include "mbedtls_config.h"
+
+#include "shared/timeutils/timeutils.h"
+
+extern uint8_t rosc_random_u8(size_t cycles);
+
+#define POLY (0x2d0000)
+
+static bool bit(uint8_t *d, uint8_t b)
+{
+    return (d[b >> 3] & (1 << (b & 7))) == (1 << (b & 7));
+}
+
+static uint32_t rng_val = 0x12345678;
+
+static uint8_t rnd_u8(size_t cycles)
+{
+    while (cycles) {
+        uint32_t x = 1;
+        for (uint8_t i = 0; i < 32; i++)
+        {
+            if (POLY & (1 << i))
+            {
+                x ^= bit((uint8_t *)&rng_val, i);
+            }
+        }
+        rng_val = rng_val >> 1;
+        rng_val |= x << 31;
+        cycles -= 1;
+    }
+
+    return rng_val;
+}
+
+static uint32_t rnd_u32(void)
+{
+    uint32_t value = 0;
+    for (size_t i = 0; i < 4; ++i)
+    {
+        value = value << 8 | rosc_random_u8(32);
+    }
+    return value;
+}
+
+int mbedtls_hardware_poll(void *data, unsigned char *output, size_t len, size_t *olen)
+{
+    *olen = len;
+    for (size_t i = 0; i < len; i++)
+    {
+        output[i] = rnd_u8(8);
+    }
+    return 0;
+}
+
+
+#endif
diff --git a/ports/gprs_a9/mpconfigport.h b/ports/gprs_a9/mpconfigport.h
index 61fee8f2cd610..2623a733af88d 100644
--- a/ports/gprs_a9/mpconfigport.h
+++ b/ports/gprs_a9/mpconfigport.h
@@ -167,9 +167,6 @@
 // #define MICROPY_PY_MACHINE_SPI_MAKE_NEW     machine_hw_spi_make_new
 #define MICROPY_HW_SOFTSPI_MIN_DELAY        (0)
 #define MICROPY_HW_SOFTSPI_MAX_BAUDRATE     (500000)
-#define MICROPY_PY_USSL                     (1)
-// #define MICROPY_SSL_AXTLS                   (1)
-// #define MICROPY_SSL_MBEDTLS                 (1)
 // #define MICROPY_PY_USSL_FINALISER           (1)
 #define MICROPY_PY_FRAMEBUF                 (0)
 

From 9d8d54f98b0f703c11c6b871bf83526073642cb0 Mon Sep 17 00:00:00 2001
From: Danil Ruban <druban@sequans.com>
Date: Tue, 28 Feb 2023 13:37:26 +0100
Subject: [PATCH 3531/3533] axtls version

---
 lib/axtls                        |  2 +-
 ports/gprs_a9/Makefile           | 19 +++++++++++++++----
 ports/gprs_a9/boards/manifest.py |  7 +++++++
 ports/gprs_a9/mpconfigport.h     |  3 +++
 ports/gprs_a9/posix_helpers.c    | 10 +++++++---
 5 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/lib/axtls b/lib/axtls
index 43a6e6bd3bbc0..09ab65effa1a8 160000
--- a/lib/axtls
+++ b/lib/axtls
@@ -1 +1 @@
-Subproject commit 43a6e6bd3bbc03dc501e16b89fba0ef042ed3ea0
+Subproject commit 09ab65effa1a85a77419284341423f798da670f0
diff --git a/ports/gprs_a9/Makefile b/ports/gprs_a9/Makefile
index b393f28a7deb0..60663fd2d489d 100644
--- a/ports/gprs_a9/Makefile
+++ b/ports/gprs_a9/Makefile
@@ -29,9 +29,9 @@ QSTR_DEFS = qstrdefsport.h
 
 # MicroPython feature configurations
 MICROPY_PY_USSL = 1
-MICROPY_SSL_MBEDTLS = 1
-# MICROPY_SSL_AXTLS = 1
-# AXTLS_DEFS_EXTRA = -Dabort=abort_ -include time.h -DRT_MAX_PLAIN_LENGTH=1024 -DRT_EXTRA=4096
+# MICROPY_SSL_MBEDTLS = 1
+MICROPY_SSL_AXTLS = 1
+AXTLS_DEFS_EXTRA = -Dabort=abort_ -include time.h -DRT_MAX_PLAIN_LENGTH=1024 -DRT_EXTRA=4096
 
 FROZEN_MANIFEST ?= boards/manifest.py
 
@@ -41,12 +41,24 @@ include $(TOP)/extmod/extmod.mk
 
 SRC_C =
 
+GIT_SUBMODULES += lib/micropython-lib
+
 ifeq ($(MICROPY_SSL_MBEDTLS),1)
 GIT_SUBMODULES += lib/mbedtls
 INC += -I$(TOP)/$(MBEDTLS_DIR)/include
 SRC_C += mbedtls/mbedtls_port.c
 endif
 
+ifeq ($(MICROPY_SSL_AXTLS),1)
+GIT_SUBMODULES += lib/axtls
+INC += -I$(TOP)/$(AXTLS_DIR)/crypto
+INC += -I$(TOP)/$(AXTLS_DIR)/ssl
+INC += -I$(TOP)/extmod/axtls-include
+INC += -I$(TOP)/lib/crypto-algorithms
+
+CFLAGS_EXTMOD += -DMICROPY_SSL_AXTLS=1 -Wno-all -Wno-unused-parameter -Wno-uninitialized -Wno-sign-compare -Wno-old-style-definition $(AXTLS_DEFS_EXTRA)
+endif
+
 #############################################
 
 CROSS_COMPILE = $(CSDTK_PATH)/bin/mips-elf-
@@ -108,7 +120,6 @@ INC += -I$(TOP)
 INC += -I$(BUILD_PATH_ABS)
 INC += -I${CSDK_PATH}/include \
        -I${CSDK_PATH}/include/std_inc \
-	   -I$(CSDTK_PATH)/sys-include \
 	   -I${CSDK_PATH}/include/api_inc \
 	   -I${CSDK_PATH}/libs/utils/include \
 	   -I${CSDK_PATH}/libs/gps/include \
diff --git a/ports/gprs_a9/boards/manifest.py b/ports/gprs_a9/boards/manifest.py
index ffa72a2860378..8bb52df113407 100644
--- a/ports/gprs_a9/boards/manifest.py
+++ b/ports/gprs_a9/boards/manifest.py
@@ -1,2 +1,9 @@
 freeze("$(PORT_DIR)/modules")
 require("bundle-networking")
+require("umqtt.robust")
+require("umqtt.simple")
+require("mip")
+require("ntptime")
+require("urequests")
+require("webrepl")
+
diff --git a/ports/gprs_a9/mpconfigport.h b/ports/gprs_a9/mpconfigport.h
index 2623a733af88d..268b729df0838 100644
--- a/ports/gprs_a9/mpconfigport.h
+++ b/ports/gprs_a9/mpconfigport.h
@@ -135,6 +135,9 @@
 #define MICROPY_PY_THREAD                   (0)
 #define MICROPY_PY_THREAD_GIL               (0)
 #define MICROPY_PY_THREAD_GIL_VM_DIVISOR    (32)
+#define MICROPY_PY_FSTRINGS                 (1)
+#define MICROPY_PY_REVERSE_SPECIAL_METHODS  (1)
+#define MICROPY_PY_BUILTINS_BYTES_HEX       (1)
 
 
 // extended modules
diff --git a/ports/gprs_a9/posix_helpers.c b/ports/gprs_a9/posix_helpers.c
index d4eb41e3bf056..89d814172ae3f 100644
--- a/ports/gprs_a9/posix_helpers.c
+++ b/ports/gprs_a9/posix_helpers.c
@@ -1,20 +1,24 @@
 #include <stdint.h>
 #include <stdio.h>
-#include <errno.h>
+
 #include <sys/time.h>
 #include "py/mphal.h"
 #include "py/gc.h"
 #include <sdk_init.h>
+#include <stdint.h>
+#include "errno.h"
 
 #if MICROPY_ENABLE_GC
 
+int errno;
+
 #include "py/gc.h"
 
 void *malloc(size_t size) {
     void *p = gc_alloc(size, false);
     if (p == NULL) {
         // POSIX requires ENOMEM to be set in case of error
-        // errno = ENOMEM;
+        errno = ENOMEM;
     }
     return p;
 }
@@ -27,7 +31,7 @@ void *realloc(void *ptr, size_t size) {
     void *p = gc_realloc(ptr, size, true);
     if (p == NULL) {
         // POSIX requires ENOMEM to be set in case of error
-        // errno = ENOMEM;
+        errno = ENOMEM;
     }
     return p;
 }

From eacaf3704643e2f209b5ec0c2c20a54aa25bd3bb Mon Sep 17 00:00:00 2001
From: Danil Ruban <druban@sequans.com>
Date: Tue, 7 Mar 2023 21:57:42 +0100
Subject: [PATCH 3532/3533] minor fixes

---
 lib/micropython-lib          |  2 +-
 ports/gprs_a9/modcellular.c  |  2 +-
 ports/gprs_a9/modgps.c       | 10 +++++++++-
 ports/gprs_a9/mpconfigport.h |  2 +-
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/lib/micropython-lib b/lib/micropython-lib
index c1526d2d1eb68..23018a86bfb1f 160000
--- a/lib/micropython-lib
+++ b/lib/micropython-lib
@@ -1 +1 @@
-Subproject commit c1526d2d1eb68c4c3b0ff8940b012c98a80301f1
+Subproject commit 23018a86bfb1f3f590dd7cddfd0467eef1062166
diff --git a/ports/gprs_a9/modcellular.c b/ports/gprs_a9/modcellular.c
index 0e134803892a5..49500699eccfa 100644
--- a/ports/gprs_a9/modcellular.c
+++ b/ports/gprs_a9/modcellular.c
@@ -1046,7 +1046,7 @@ STATIC mp_obj_t modcellular_register(size_t n_args, const mp_obj_t *args) {
             return mp_const_none;
         }
         WAIT_UNTIL(!(network_status & NTW_REG_BIT), TIMEOUT_REG, 100, mp_raise_OSError(MP_ETIMEDOUT));
-
+        return mp_const_none;
     } else if (n_args == 2) {
         mp_obj_array_t *op_id = MP_OBJ_TO_PTR(args[0]);
         mp_int_t op_mode = mp_obj_get_int(args[1]);
diff --git a/ports/gprs_a9/modgps.c b/ports/gprs_a9/modgps.c
index 4287364d06739..2baf735045a62 100644
--- a/ports/gprs_a9/modgps.c
+++ b/ports/gprs_a9/modgps.c
@@ -181,8 +181,12 @@ STATIC mp_obj_t modgps_time(void) {
 
     struct minmea_date date = gpsInfo->rmc.date;
     struct minmea_time time = gpsInfo->rmc.time;
-
+#if !MICROPY_EPOCH_IS_1970
     mp_uint_t result = timeutils_mktime(date.year + 2000, date.month, date.day, time.hours, time.minutes, time.seconds);
+#else
+    mp_uint_t result = timeutils_mktime(date.year + 1970, date.month, date.day, time.hours, time.minutes, time.seconds);
+#endif
+
     // Note: the module may report dates between 1980 and 2000 as well: they will be mapped onto the time frame 2080-2100
     return mp_obj_new_int_from_uint(result);
 }
@@ -190,7 +194,11 @@ STATIC mp_obj_t modgps_time(void) {
 STATIC MP_DEFINE_CONST_FUN_OBJ_0(modgps_time_obj, modgps_time);
 
 STATIC mp_obj_t _get_time(struct minmea_date date, struct minmea_time time) {
+#if !MICROPY_EPOCH_IS_1970
+    mp_uint_t result = timeutils_mktime(date.year + 2000, date.month, date.day, time.hours, time.minutes, time.seconds);
+#else
     mp_uint_t result = timeutils_mktime(date.year + 2000, date.month, date.day, time.hours, time.minutes, time.seconds);
+#endif
     // Note: the module may report dates between 1980 and 2000 as well: they will be mapped onto the time frame 2080-2100
     return mp_obj_new_int_from_uint(result);
 }
diff --git a/ports/gprs_a9/mpconfigport.h b/ports/gprs_a9/mpconfigport.h
index 268b729df0838..42ef647ca5a14 100644
--- a/ports/gprs_a9/mpconfigport.h
+++ b/ports/gprs_a9/mpconfigport.h
@@ -138,7 +138,7 @@
 #define MICROPY_PY_FSTRINGS                 (1)
 #define MICROPY_PY_REVERSE_SPECIAL_METHODS  (1)
 #define MICROPY_PY_BUILTINS_BYTES_HEX       (1)
-
+#define MICROPY_EPOCH_IS_1970               (1)
 
 // extended modules
 #define MICROPY_PY_UASYNCIO                 (1)

From ab4dc3584b6fd6994644fee1a98cf9cfe0437cce Mon Sep 17 00:00:00 2001
From: Danil Ruban <intx82@gmail.com>
Date: Tue, 14 Jan 2025 18:01:06 +0100
Subject: [PATCH 3533/3533] AXTLS changes has been lost in time

---
 README.md              | 8 ++++----
 lib/axtls              | 2 +-
 lib/berkeley-db-1.xx   | 2 +-
 lib/btstack            | 2 +-
 lib/cyw43-driver       | 2 +-
 lib/fsp                | 2 +-
 lib/libffi             | 2 +-
 lib/libhydrogen        | 2 +-
 lib/lwip               | 2 +-
 lib/mbedtls            | 2 +-
 lib/mynewt-nimble      | 2 +-
 lib/nrfx               | 2 +-
 lib/nxp_driver         | 2 +-
 lib/pico-sdk           | 2 +-
 lib/stm32lib           | 2 +-
 lib/tinyusb            | 2 +-
 lib/wiznet5k           | 2 +-
 ports/gprs_a9/Makefile | 8 ++++----
 18 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/README.md b/README.md
index 3006aeb23a5a6..3cadd871bc1d6 100644
--- a/README.md
+++ b/README.md
@@ -1,13 +1,13 @@
-[![CI badge](https://github.com/micropython/micropython/workflows/unix%20port/badge.svg)](https://github.com/micropython/micropython/actions?query=branch%3Amaster+event%3Apush) [![codecov](https://codecov.io/gh/micropython/micropython/branch/master/graph/badge.svg?token=I92PfD05sD)](https://codecov.io/gh/micropython/micropython)
+
+
 Important
 ---------
 
 This repo is only for porting micropython to the GPS+GSM modules A9 and A9G.
-[Go to the port page](https://github.com/pulkin/micropython/tree/master/ports/gprs_a9) or [visit the MicroPython project page.](https://micropython.org/)
+[Go to the port page](https://github.com/intx82/micropython_a9_gprs/tree/master/ports/gprs_a9) or [visit the MicroPython project page.](https://micropython.org/)
 
-The build status displays that of the original repo.
+## Please read following port readme first - https://github.com/intx82/micropython_a9_gprs/blob/master/ports/gprs_a9/README.md
 
-[![Build Status](https://travis-ci.org/micropython/micropython.png?branch=master)](https://travis-ci.org/micropython/micropython) [![Coverage Status](https://coveralls.io/repos/micropython/micropython/badge.png?branch=master)](https://coveralls.io/r/micropython/micropython?branch=master)
 
 The MicroPython project
 =======================
diff --git a/lib/axtls b/lib/axtls
index 09ab65effa1a8..0d60045e7abc5 160000
--- a/lib/axtls
+++ b/lib/axtls
@@ -1 +1 @@
-Subproject commit 09ab65effa1a85a77419284341423f798da670f0
+Subproject commit 0d60045e7abc5b67bc25a3b1fd72dd3f6e86436d
diff --git a/lib/berkeley-db-1.xx b/lib/berkeley-db-1.xx
index 35aaec4418ad7..7b31cae3c0892 160000
--- a/lib/berkeley-db-1.xx
+++ b/lib/berkeley-db-1.xx
@@ -1 +1 @@
-Subproject commit 35aaec4418ad78628a3b935885dd189d41ce779b
+Subproject commit 7b31cae3c0892a7fca2089cb0354a4920c98c413
diff --git a/lib/btstack b/lib/btstack
index c8b9823f68c6a..565100c1cae73 160000
--- a/lib/btstack
+++ b/lib/btstack
@@ -1 +1 @@
-Subproject commit c8b9823f68c6af0fa52e2c4e009aba4dbf257232
+Subproject commit 565100c1cae73dc1c5f9b239953dbdd14ae283d3
diff --git a/lib/cyw43-driver b/lib/cyw43-driver
index 38238aefb6f59..cf924bb04c898 160000
--- a/lib/cyw43-driver
+++ b/lib/cyw43-driver
@@ -1 +1 @@
-Subproject commit 38238aefb6f59ce92681d83aa47d3a48d77b2f6e
+Subproject commit cf924bb04c8984675ca0fc2178f082e404e048c3
diff --git a/lib/fsp b/lib/fsp
index 55bffd3a71cbe..21e946ba20a3a 160000
--- a/lib/fsp
+++ b/lib/fsp
@@ -1 +1 @@
-Subproject commit 55bffd3a71cbeed2104cf30e7a39b641d8c1ff48
+Subproject commit 21e946ba20a3a25737ad7d8808596a4771d0671a
diff --git a/lib/libffi b/lib/libffi
index e9de7e35f2339..9186672c7a0ff 160000
--- a/lib/libffi
+++ b/lib/libffi
@@ -1 +1 @@
-Subproject commit e9de7e35f2339598b16cbb375f9992643ed81209
+Subproject commit 9186672c7a0ffa2328b37545deb21aa0802f3e4f
diff --git a/lib/libhydrogen b/lib/libhydrogen
index 5c5d513093075..a4c8d265de1db 160000
--- a/lib/libhydrogen
+++ b/lib/libhydrogen
@@ -1 +1 @@
-Subproject commit 5c5d513093075f7245ea522101b17c50aa579af2
+Subproject commit a4c8d265de1dbecbe46892e88c72837d2dc53f86
diff --git a/lib/lwip b/lib/lwip
index 159e31b689577..fbd597e4500bb 160000
--- a/lib/lwip
+++ b/lib/lwip
@@ -1 +1 @@
-Subproject commit 159e31b689577dbf69cf0683bbaffbd71fa5ee10
+Subproject commit fbd597e4500bbd51c8872f1ab11e50dba075f291
diff --git a/lib/mbedtls b/lib/mbedtls
index 3f8d78411a26e..99d82166a33ac 160000
--- a/lib/mbedtls
+++ b/lib/mbedtls
@@ -1 +1 @@
-Subproject commit 3f8d78411a26e833db18d9fbde0e2f0baeda87f0
+Subproject commit 99d82166a33ac0f60e4a2dd8c649758aa33da648
diff --git a/lib/mynewt-nimble b/lib/mynewt-nimble
index 97ce3eacaaa79..cf947cd5ae3fc 160000
--- a/lib/mynewt-nimble
+++ b/lib/mynewt-nimble
@@ -1 +1 @@
-Subproject commit 97ce3eacaaa79e8ed6cf71717149ced4f5328ee7
+Subproject commit cf947cd5ae3fcab858f6adcc288dd3f2630fb9db
diff --git a/lib/nrfx b/lib/nrfx
index 7513fc9d5c10d..85c444ee0b762 160000
--- a/lib/nrfx
+++ b/lib/nrfx
@@ -1 +1 @@
-Subproject commit 7513fc9d5c10dc28b25bf2bb6ff0ba66cb2a3c3d
+Subproject commit 85c444ee0b76272d8a074b82845f04e92b3253c4
diff --git a/lib/nxp_driver b/lib/nxp_driver
index b618cb1d521cc..72fa6068dbfb6 160000
--- a/lib/nxp_driver
+++ b/lib/nxp_driver
@@ -1 +1 @@
-Subproject commit b618cb1d521cc9e133bdcd0fca154dee2d925dfe
+Subproject commit 72fa6068dbfb6080272227f589352f6da6627fdb
diff --git a/lib/pico-sdk b/lib/pico-sdk
index f396d05f8252d..95ea6acad1311 160000
--- a/lib/pico-sdk
+++ b/lib/pico-sdk
@@ -1 +1 @@
-Subproject commit f396d05f8252d4670d4ea05c8b7ac938ef0cd381
+Subproject commit 95ea6acad131124694cda1c162c52cd30e0aece0
diff --git a/lib/stm32lib b/lib/stm32lib
index 668d7a9e54aea..7fa907474db6c 160000
--- a/lib/stm32lib
+++ b/lib/stm32lib
@@ -1 +1 @@
-Subproject commit 668d7a9e54aea98f8fe8a858eac1d3daa80fa824
+Subproject commit 7fa907474db6c25a2bb8c180c6b8704b3a1d08d2
diff --git a/lib/tinyusb b/lib/tinyusb
index 393492823ce03..2495563600f1c 160000
--- a/lib/tinyusb
+++ b/lib/tinyusb
@@ -1 +1 @@
-Subproject commit 393492823ce037a2e46d367d61fad1235859af2e
+Subproject commit 2495563600f1cd2220d740895fad701dd48f1fb6
diff --git a/lib/wiznet5k b/lib/wiznet5k
index 0803fc519ad72..ce4a7b6d07541 160000
--- a/lib/wiznet5k
+++ b/lib/wiznet5k
@@ -1 +1 @@
-Subproject commit 0803fc519ad7227e841287fb3638d6c8b2f111a1
+Subproject commit ce4a7b6d07541bf0ba9f91e369276b38faa619bd
diff --git a/ports/gprs_a9/Makefile b/ports/gprs_a9/Makefile
index 60663fd2d489d..a8500113aa9d4 100644
--- a/ports/gprs_a9/Makefile
+++ b/ports/gprs_a9/Makefile
@@ -28,10 +28,10 @@ QSTR_DEFS = qstrdefsport.h
 #############################################
 
 # MicroPython feature configurations
-MICROPY_PY_USSL = 1
-# MICROPY_SSL_MBEDTLS = 1
-MICROPY_SSL_AXTLS = 1
-AXTLS_DEFS_EXTRA = -Dabort=abort_ -include time.h -DRT_MAX_PLAIN_LENGTH=1024 -DRT_EXTRA=4096
+#MICROPY_PY_USSL = 1
+#MICROPY_SSL_MBEDTLS = 1
+# MICROPY_SSL_AXTLS = 1
+#AXTLS_DEFS_EXTRA = -Dabort=abort_ -include time.h -DRT_MAX_PLAIN_LENGTH=1024 -DRT_EXTRA=4096
 
 FROZEN_MANIFEST ?= boards/manifest.py